diff --git a/.clang-format b/.clang-format
index 940f22994b8f7..11054457bc365 100644
--- a/.clang-format
+++ b/.clang-format
@@ -99,6 +99,7 @@ IndentCaseLabels: false
 IndentGotoLabels: false
 IndentWidth: 8
 InsertBraces: true
+InsertNewlineAtEOF: true
 SpaceBeforeInheritanceColon: False
 SpaceBeforeParens: ControlStatementsExceptControlMacros
 SortIncludes: Never
diff --git a/.github/ISSUE_TEMPLATE/007_ext-source.md b/.github/ISSUE_TEMPLATE/007_ext-source.md
index 835450cd507e0..2b6eb4cebb9f5 100644
--- a/.github/ISSUE_TEMPLATE/007_ext-source.md
+++ b/.github/ISSUE_TEMPLATE/007_ext-source.md
@@ -49,6 +49,15 @@ required to maintain ...)
 Why is this the right component to solve it (e.g., SQLite is small,
 easy to use, and has a very liberal license.)
 
+## Security
+
+Does this component include any cryptographic functionality?
+If so, please describe the cryptographic algorithms and protocols used.
+
+How does this component handle security vulnerabilities and updates?
+Are there any known vulnerabilities in this component? If so, please
+provide details and references to any CVEs or security advisories.
+
 ## Dependencies
 
 What other components does this package depend on?
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index ba2dedb99e499..ffbaf1a6b622b 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -11,9 +11,9 @@ updates:
 At this time, with the latest release of v4.0, the supported
 versions are:
 
-  - v4.0: Current release
-  - v3.7: Prior release and Current LTS
-  - v2.7: Prior LTS
+  - v4.1: Current release
+  - v4.0: Prior release
+  - v3.7: Current LTS
 
 ## Reporting process
 
diff --git a/.github/codeql/codeql-actions-config.yml b/.github/codeql/codeql-actions-config.yml
new file mode 100644
index 0000000000000..4076bfd99c5aa
--- /dev/null
+++ b/.github/codeql/codeql-actions-config.yml
@@ -0,0 +1,2 @@
+paths:
+  - .github
diff --git a/.github/codeql/codeql-js-config.yml b/.github/codeql/codeql-js-config.yml
new file mode 100644
index 0000000000000..6503a1fa80c91
--- /dev/null
+++ b/.github/codeql/codeql-js-config.yml
@@ -0,0 +1,2 @@
+paths:
+  - doc
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a880296ea6d58..fc85287baa7a0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,4 +1,5 @@
 version: 2
+enable-beta-ecosystems: true
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -11,3 +12,15 @@ updates:
       actions-deps:
         patterns:
           - "*"
+
+  - package-ecosystem: "uv"
+    directory: "/doc"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "ci: doc: "
+    labels: []
+    groups:
+      doc-deps:
+        patterns:
+          - "*"
diff --git a/.github/workflows/assigner.yml b/.github/workflows/assigner.yml
index be3696c4d3055..3e5988fc698cf 100644
--- a/.github/workflows/assigner.yml
+++ b/.github/workflows/assigner.yml
@@ -15,23 +15,36 @@ on:
     types:
     - labeled
 
+permissions:
+  contents: read
+
 jobs:
   assignment:
     name: Pull Request Assignment
     if: github.event.pull_request.draft == false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    permissions:
+      pull-requests: write # to add assignees to pull requests
+      issues: write        # to add assignees to issues
 
     steps:
-    - name: Install Python dependencies
-      run: |
-        pip install -U PyGithub>=1.55 west
-
     - name: Check out source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+    - name: Set up Python
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      with:
+        python-version: 3.12
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
+
+    - name: Install Python packages
+      run: |
+        pip install -r scripts/requirements-actions.txt --require-hashes
 
     - name: Run assignment script
       env:
-        GITHUB_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         FLAGS="-v"
         FLAGS+=" -o ${{ github.event.repository.owner.login }}"
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 5e28332c2a2d2..3ecf66b17da9c 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -7,10 +7,17 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   backport:
     name: Backport
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write       # to create/push backport branches
+      pull-requests: write  # to create backport PRs
+      issues: write         # to add labels to issue created if backport fails
     # Only react to merged PRs for security reasons.
     # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
     if: >
@@ -24,8 +31,8 @@ jobs:
       )
     steps:
       - name: Backport
-        uses: zephyrproject-rtos/action-backport@v2.0.3-3
+        uses: zephyrproject-rtos/action-backport@7e74f601d11eaca577742445e87775b5651a965f # v2.0.3-3
         with:
-          github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           issue_labels: Backport
           labels_template: '["Backport"]'
diff --git a/.github/workflows/backport_issue_check.yml b/.github/workflows/backport_issue_check.yml
index 2d2c4fda6a8b8..a285113aad209 100644
--- a/.github/workflows/backport_issue_check.yml
+++ b/.github/workflows/backport_issue_check.yml
@@ -10,29 +10,41 @@ on:
     branches:
       - v*-branch
 
+permissions:
+  contents: read
+
 jobs:
   backport:
     name: Backport Issue Check
     concurrency:
       group: backport-issue-check-${{ github.ref }}
       cancel-in-progress: true
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
+    permissions:
+      issues: read # to check if associated issue exists for backport
 
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
 
-      - name: Install Python dependencies
+      - name: Install Python packages
         run: |
-          pip install -U pygithub
+          pip install -r scripts/requirements-actions.txt --require-hashes
 
       - name: Run backport issue checker
         env:
-          GITHUB_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           ./scripts/release/list_backports.py \
-            -o ${{ github.event.repository.owner.login }} \
-            -r ${{ github.event.repository.name }} \
-            -b ${{ github.event.pull_request.base.ref }} \
-            -p ${{ github.event.pull_request.number }}
+          -o ${{ github.event.repository.owner.login }} \
+          -r ${{ github.event.repository.name }} \
+          -b ${{ github.event.pull_request.base.ref }} \
+          -p ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/bsim-tests-publish.yaml b/.github/workflows/bsim-tests-publish.yaml
index 5a4fbc0b39fff..1cb30f2cfa9ed 100644
--- a/.github/workflows/bsim-tests-publish.yaml
+++ b/.github/workflows/bsim-tests-publish.yaml
@@ -5,20 +5,26 @@ on:
     workflows: ["BabbleSim Tests"]
     types:
       - completed
+
+permissions:
+  contents: read
+
 jobs:
   bsim-test-results:
     name: "Publish BabbleSim Test Results"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.event.workflow_run.conclusion != 'skipped'
+    permissions:
+      checks: write # to create the check run entry with test results
 
     steps:
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v8
+        uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
         with:
           run_id: ${{ github.event.workflow_run.id }}
 
       - name: Publish BabbleSim Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
         with:
           check_name: BabbleSim Test Results
           comment_mode: off
diff --git a/.github/workflows/bsim-tests.yaml b/.github/workflows/bsim-tests.yaml
index 66d47c68a1c24..ed6ca0c766137 100644
--- a/.github/workflows/bsim-tests.yaml
+++ b/.github/workflows/bsim-tests.yaml
@@ -27,6 +27,10 @@ on:
       - "include/zephyr/net/ieee802154*"
       - "drivers/serial/*nrfx*"
       - "tests/drivers/uart/**"
+      - '!**.rst'
+
+permissions:
+  contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -45,6 +49,9 @@ jobs:
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       EDTT_PATH: ../tools/edtt
+    permissions:
+      checks: write # to create the check run entry with test results
+
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -67,7 +74,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
 
@@ -91,7 +98,7 @@ jobs:
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
 
       - name: Check common triggering files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3
         id: check-common-files
         with:
           files: |
@@ -110,7 +117,7 @@ jobs:
             modules/hal_nordic/**
 
       - name: Check if Bluethooth files changed
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3
         id: check-bluetooth-files
         with:
           files: |
@@ -119,7 +126,7 @@ jobs:
             subsys/bluetooth/
 
       - name: Check if Networking files changed
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3
         id: check-networking-files
         with:
           files: |
@@ -132,7 +139,7 @@ jobs:
             include/zephyr/net/ieee802154*
 
       - name: Check if UART files changed
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3
         id: check-uart-files
         with:
           files: |
@@ -172,13 +179,12 @@ jobs:
 
       - name: Merge Test Results
         run: |
-          pip install junitparser junit2html
           junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
           junit2html junit.xml junit.html
 
       - name: Upload Unit Test Results in HTML
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: HTML Unit Test Results
           if-no-files-found: ignore
@@ -186,7 +192,7 @@ jobs:
             junit.html
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
         with:
           check_name: Bsim Test Results
           files: "junit.xml"
@@ -194,7 +200,7 @@ jobs:
 
       - name: Upload Event Details
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: event
           path: |
diff --git a/.github/workflows/bug_snapshot.yaml b/.github/workflows/bug_snapshot.yaml
index f10dc718b6eb2..e4cc5b7fddabd 100644
--- a/.github/workflows/bug_snapshot.yaml
+++ b/.github/workflows/bug_snapshot.yaml
@@ -13,19 +13,30 @@ on:
   # Run daily at 14:05
   - cron: '5 14 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   make_bugs_pickle:
     name: Make bugs pickle
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository_owner == 'zephyrproject-rtos'
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+    - name: Set up Python
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      with:
+        python-version: 3.12
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
 
-    - name: Install Python dependencies
+    - name: Install Python packages
       run: |
-        pip install -U pygithub
+        pip install -r scripts/requirements-actions.txt --require-hashes
+
 
     - name: Snapshot bugs
       env:
@@ -41,7 +52,7 @@ jobs:
         echo "BUGS_PICKLE_PATH=${BUGS_PICKLE_PATH}" >> ${GITHUB_ENV}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
       with:
         aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml
new file mode 100644
index 0000000000000..2e085c2bb3602
--- /dev/null
+++ b/.github/workflows/clang.yaml
@@ -0,0 +1,180 @@
+name: Build with Clang/LLVM
+on:
+  push:
+    branches:
+      - main
+      - v*-branch
+      - collab-*
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  clang-build:
+    if: github.repository_owner == 'zephyrproject-rtos'
+    runs-on:
+      group: zephyr-runner-v2-linux-x64-4xlarge
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
+      options: '--entrypoint /bin/bash'
+    strategy:
+      fail-fast: false
+      matrix:
+        subset: [1, 2]
+    env:
+      CCACHE_DIR: /node-cache/ccache-zephyr
+      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
+      CCACHE_REMOTE_ONLY: "true"
+      CCACHE_IGNOREOPTIONS: '-specs=* --specs=*'
+      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
+      BASE_REF: ${{ github.base_ref }}
+    steps:
+      - name: Apply container owner mismatch workaround
+        run: |
+          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
+          #        match the container user UID because of the way GitHub
+          #        Actions runner is implemented. Remove this workaround when
+          #        GitHub comes up with a fundamental fix for this problem.
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+      - name: Print cloud service information
+        run: |
+          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
+          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
+          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
+
+      - name: Clone cached Zephyr repository
+        continue-on-error: true
+        run: |
+          git clone --shared /repo-cache/zephyrproject/zephyr .
+          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
+
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Environment Setup
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          git config --global user.email "bot@zephyrproject.org"
+          git config --global user.name "Zephyr Bot"
+          rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
+          git clean -f -d
+          git log  --pretty=oneline | head -n 10
+          west init -l . || true
+          west config --global update.narrow true
+          west config manifest.group-filter -- +ci,+optional
+          # In some cases modules are left in a state where they can't be
+          # updated (i.e. when we cancel a job and the builder is killed),
+          # So first retry to update, if that does not work, remove all modules
+          # and start over. (Workaround until we implement more robust module
+          # west caching).
+          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
+
+          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+
+      - name: Check Environment
+        run: |
+          cmake --version
+          ${LLVM_TOOLCHAIN_PATH}/bin/clang --version
+          gcc --version
+          ls -la
+
+      - name: Set up ccache
+        run: |
+          mkdir -p ${CCACHE_DIR}
+          ccache -M 10G
+          ccache -p
+          ccache -z -s -vv
+
+      - name: Update BabbleSim to manifest revision
+        run: |
+          export BSIM_VERSION=$( west list bsim -f {revision} )
+          echo "Manifest points to bsim sha $BSIM_VERSION"
+          cd /opt/bsim_west/bsim
+          git fetch -n origin ${BSIM_VERSION}
+          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
+          west update
+          make everything -s -j 8
+
+      - name: Run Tests with Twister
+        id: twister
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=llvm
+
+          ./scripts/twister -p native_sim --no-detailed-test-id --force-color --inline-logs -M -N -v --retry-failed 2 \
+            -T tests --subset ${{matrix.subset}}/2 -j 16
+
+      - name: Print ccache stats
+        if: always()
+        run: |
+          ccache -s -vv
+
+      - name: Upload Unit Test Results
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: Unit Test Results (Subset ${{ matrix.subset }})
+          path: |
+            twister-out/twister.xml
+            twister-out/twister.json
+          if-no-files-found: ignore
+
+  clang-build-results:
+    name: "Publish Unit Tests Results"
+    needs: clang-build
+    runs-on: ubuntu-24.04
+    permissions:
+      checks: write # to create GitHub annotations
+    if: (success() || failure())
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        with:
+          path: artifacts
+
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+
+      - name: Install Python packages
+        run: |
+          pip install -r scripts/requirements-actions.txt --require-hashes
+
+      - name: Merge Test Results
+        run: |
+          junitparser merge artifacts/*/twister.xml junit.xml
+          junit2html junit.xml junit-clang.html
+
+      - name: Upload Unit Test Results in HTML
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: HTML Unit Test Results
+          if-no-files-found: ignore
+          path: |
+            junit-clang.html
+
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
+        if: always()
+        with:
+          check_name: Unit Test Results
+          files: "**/twister.xml"
+          comment_mode: off
diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
index 5707610ae87b9..74ca259c91fa2 100644
--- a/.github/workflows/codecov.yaml
+++ b/.github/workflows/codecov.yaml
@@ -4,6 +4,9 @@ on:
   schedule:
     - cron: '25 06,18 * * *'
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
@@ -61,10 +64,21 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
 
+      - name: Set up Python
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+
+      - name: Install Python packages
+        run: |
+          pip install -r scripts/requirements-actions.txt --require-hashes
+
       - name: west setup
         run: |
           west init -l . || true
@@ -85,24 +99,13 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
-      - name: Update BabbleSim to manifest revision
-        run: |
-          export BSIM_VERSION=$( west list bsim -f {revision} )
-          echo "Manifest points to bsim sha $BSIM_VERSION"
-          cd /opt/bsim_west/bsim
-          git fetch -n origin ${BSIM_VERSION}
-          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
       - name: Run Tests with Twister (Push)
         continue-on-error: true
         run: |
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           mkdir -p coverage/reports
-          pip install gcovr==6.0
-          ./scripts/twister -E ${{matrix.normalized}}-testplan.json
+          ./scripts/twister --save-tests ${{matrix.normalized}}-testplan.json
           ls -la
           ./scripts/twister \
             -i --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage \
@@ -121,7 +124,7 @@ jobs:
 
       - name: Upload Coverage Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: Coverage Data (Subset ${{ matrix.normalized }})
           path: |
@@ -131,18 +134,29 @@ jobs:
   codecov-results:
     name: "Publish Coverage Results"
     needs: codecov
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     # the codecov job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
 
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+
+      - name: Install Python packages
+        run: |
+          pip install -r scripts/requirements-actions.txt --require-hashes
+
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           path: coverage/reports
 
@@ -182,7 +196,6 @@ jobs:
       - name: Merge coverage files
         run: |
           pushd ./coverage/reports
-          pip install gcovr==6.0
           gcovr ${{ steps.get-coverage-files.outputs.mergefiles }}  --merge-mode-functions=separate --json merged.json
           gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --cobertura merged.xml
           popd
@@ -198,7 +211,6 @@ jobs:
       - name: Generate Coverage Report
         if: always()
         run: |
-          pip install xlsxwriter ijson
           python3 ./scripts/ci/coverage/coverage_analysis.py \
             -t native_sim-testplan.json \
             -m MAINTAINERS.yml \
@@ -209,7 +221,7 @@ jobs:
 
       - name: Upload Merged Coverage Results and Report
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: Coverage Data and report
           path: |
@@ -220,7 +232,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: always()
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           env_vars: OS,PYTHON
           fail_ci_if_error: false
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 0000000000000..f9295f68cd719
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,58 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches:
+      - main
+      - v*-branch
+      - collab-*
+  schedule:
+    - cron: '34 16 * * 3'
+  pull_request:
+    branches:
+      - main
+      - v*-branch
+      - collab-*
+
+permissions:
+  contents: read
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-24.04
+    permissions:
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: python
+            build-mode: none
+          - language: actions
+            build-mode: none
+            config: ./.github/codeql/codeql-actions-config.yml
+          - language: javascript-typescript
+            build-mode: none
+            config: ./.github/codeql/codeql-js-config.yml
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          queries: security-extended
+          config-file: ${{ matrix.config }}
+
+      - if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo "nothing yet"
+          exit 0
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/coding_guidelines.yml b/.github/workflows/coding_guidelines.yml
index 81c20b372d9a7..cf3d7182f18f5 100644
--- a/.github/workflows/coding_guidelines.yml
+++ b/.github/workflows/coding_guidelines.yml
@@ -2,27 +2,30 @@ name: Coding Guidelines
 
 on: pull_request
 
+permissions:
+  contents: read
+
 jobs:
   compliance_job:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Run coding guidelines checks on patch series (PR)
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
-    - name: cache-pip
-      uses: actions/cache@v4
+    - name: Set up Python
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/coding_guidelines.yml') }}
+        python-version: 3.12
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
 
-    - name: Install python dependencies
+    - name: Install Python packages
       run: |
-        pip install unidiff
-        pip install sh
+        pip install -r scripts/requirements-actions.txt --require-hashes
 
     - name: Install Packages
       run: |
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index 1875de7cb7e8e..12f2601c01642 100644
--- a/.github/workflows/compliance.yml
+++ b/.github/workflows/compliance.yml
@@ -8,9 +8,12 @@ on:
     - reopened
     - synchronize
 
+permissions:
+  contents: read
+
 jobs:
   check_compliance:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Run compliance checks on patch series (PR)
     steps:
     - name: Update PATH for west
@@ -18,7 +21,7 @@ jobs:
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
@@ -41,20 +44,15 @@ jobs:
         git log  --pretty=oneline | head -n 10
 
     - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.11
-
-    - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/compliance.yml') }}
+        python-version: 3.12
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
 
-    - name: Install python dependencies
+    - name: Install Python packages
       run: |
-        pip install -r scripts/requirements-compliance.txt
-        pip install west
+        pip install -r scripts/requirements-actions.txt --require-hashes
 
     - name: west setup
       run: |
@@ -62,14 +60,6 @@ jobs:
         west config manifest.group-filter -- +ci,-optional
         west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
 
-    - name: Check for PR description
-      if: ${{ github.event.pull_request.body == '' }}
-      continue-on-error: true
-      id: pr_description
-      run: |
-        echo "Pull request description cannot be empty."
-        exit 1
-
     - name: Run Compliance Tests
       continue-on-error: true
       id: compliance
@@ -82,11 +72,15 @@ jobs:
         git log  --pretty=oneline | head -n 10
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
-        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat \
-        -c origin/${BASE_REF}..
+        excludes="-e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat"
+        # The signed-off-by check for dependabot should be skipped
+        if [ "${{ github.actor }}" == "dependabot[bot]" ]; then
+          excludes="$excludes -e Identity"
+        fi
+        ./scripts/ci/check_compliance.py --annotate $excludes -c origin/${BASE_REF}..
 
     - name: upload-results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       continue-on-error: true
       with:
         name: compliance.xml
diff --git a/.github/workflows/daily_test_version.yml b/.github/workflows/daily_test_version.yml
index 3a43ac643008d..02eef3c776f6f 100644
--- a/.github/workflows/daily_test_version.yml
+++ b/.github/workflows/daily_test_version.yml
@@ -10,28 +10,38 @@ on:
     branches:
     - refs/tags/*
 
+permissions:
+  contents: read
+
 jobs:
   get_version:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
         aws-region: us-east-1
 
-    - name: install-pip
-      run: |
-        pip install gitpython
-
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         fetch-depth: 0
 
+    - name: Set up Python
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      with:
+        python-version: 3.12
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
+
+    - name: Install Python packages
+      run: |
+        pip install -r scripts/requirements-actions.txt --require-hashes
+
     - name: Upload to AWS S3
       run: |
         python3 scripts/ci/version_mgr.py --update .
diff --git a/.github/workflows/devicetree_checks.yml b/.github/workflows/devicetree_checks.yml
index 345eb5b7db08e..00a498bbc4594 100644
--- a/.github/workflows/devicetree_checks.yml
+++ b/.github/workflows/devicetree_checks.yml
@@ -20,6 +20,9 @@ on:
     - 'scripts/dts/**'
     - '.github/workflows/devicetree_checks.yml'
 
+permissions:
+  contents: read
+
 jobs:
   devicetree-checks:
     name: Devicetree script tests
@@ -30,39 +33,19 @@ jobs:
         os: [ubuntu-22.04, macos-14, windows-2022]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
         python-version: ${{ matrix.python-version }}
-    - name: cache-pip-linux
-      if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: cache-pip-mac
-      if: startsWith(runner.os, 'macOS')
-      uses: actions/cache@v4
-      with:
-        path: ~/Library/Caches/pip
-        # Trailing '-' was just to get a different cache name
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}-
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}-
-    - name: cache-pip-win
-      if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v4
-      with:
-        path: ~\AppData\Local\pip\Cache
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: install python dependencies
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
+
+    - name: Install Python packages
       run: |
-        pip install pytest pyyaml tox
+        pip install -r scripts/requirements-actions.txt --require-hashes
+
     - name: run tox
       working-directory: scripts/dts/python-devicetree
       run: |
diff --git a/.github/workflows/do_not_merge.yml b/.github/workflows/do_not_merge.yml
deleted file mode 100644
index 8d90efa981de0..0000000000000
--- a/.github/workflows/do_not_merge.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Do Not Merge
-
-on:
-  pull_request:
-    types: [synchronize, opened, reopened, labeled, unlabeled]
-
-jobs:
-  do-not-merge:
-    name: Prevent Merging
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check for label
-        if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
-                contains(github.event.*.labels.*.name, 'DNM (manifest)') ||
-                contains(github.event.*.labels.*.name, 'TSC') ||
-                contains(github.event.*.labels.*.name, 'Architecture Review') ||
-                contains(github.event.*.labels.*.name, 'dev-review') }}
-        run: |
-          echo "Pull request is labeled as 'DNM', 'TSC', 'Architecture Review' or 'dev-review'."
-          echo "This workflow fails so that the pull request cannot be merged."
-          exit 1
diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
index d263c1c80b6e2..144f872e5f588 100644
--- a/.github/workflows/doc-build.yml
+++ b/.github/workflows/doc-build.yml
@@ -11,33 +11,28 @@ on:
     - v*
   pull_request:
 
+permissions:
+  contents: read
+
 env:
-  # NOTE: west docstrings will be extracted from the version listed here
-  WEST_VERSION: 1.2.0
-  # The latest CMake available directly with apt is 3.18, but we need >=3.20
-  # so we fetch that through pip.
-  CMAKE_VERSION: 3.20.5
   DOXYGEN_VERSION: 1.12.0
-  # Job count is set to 2 less than the vCPU count of 16 because the total available RAM is 32GiB
-  # and each sphinx-build process may use more than 2GiB of RAM.
-  JOB_COUNT: 14
+  DOXYGEN_MD5SUM: fd96a5defa535dfe2e987b46540844a4
+  JOB_COUNT: 4
 
 jobs:
   doc-file-check:
     name: Check for doc changes
-    runs-on: ubuntu-22.04
-    if: >
-      github.repository_owner == 'zephyrproject-rtos'
+    runs-on: ubuntu-24.04
     outputs:
       file_check: ${{ steps.check-doc-files.outputs.any_modified }}
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
     - name: Check if Documentation related files changed
-      uses: tj-actions/changed-files@v45
+      uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3
       id: check-doc-files
       with:
         files: |
@@ -48,7 +43,6 @@ jobs:
           kernel/include/kernel_arch_interface.h
           lib/libc/**
           subsys/testsuite/ztest/include/**
-          tests/
           **/Kconfig*
           west.yml
           scripts/dts/
@@ -61,9 +55,8 @@ jobs:
     name: "Documentation Build (HTML)"
     needs: [doc-file-check]
     if: >
-      github.repository_owner == 'zephyrproject-rtos' &&
-        ( needs.doc-file-check.outputs.file_check == 'true' || github.event_name != 'pull_request' )
-    runs-on: ubuntu-22.04
+      needs.doc-file-check.outputs.file_check == 'true' || github.event_name != 'pull_request'
+    runs-on: ubuntu-24.04
     timeout-minutes: 90
     concurrency:
       group: doc-build-html-${{ github.ref }}
@@ -75,15 +68,21 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y wget python3-pip git ninja-build graphviz lcov
         wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
+        echo "${DOXYGEN_MD5SUM}  doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz" | md5sum -c
+        if [ $? -ne 0 ]; then
+          echo "Failed to verify doxygen tarball"
+          exit 1
+        fi
         sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
         echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
         echo "${HOME}/.local/bin" >> $GITHUB_PATH
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
+        path: zephyr
 
     - name: Rebase
       if: github.event_name == 'pull_request'
@@ -91,6 +90,7 @@ jobs:
       env:
         BASE_REF: ${{ github.base_ref }}
         PR_HEAD: ${{ github.event.pull_request.head.sha }}
+      working-directory: zephyr
       run: |
         git config --global user.email "actions@zephyrproject.org"
         git config --global user.name "Github Actions"
@@ -100,25 +100,27 @@ jobs:
         git clean -f -d
         git log --graph --oneline HEAD...${PR_HEAD}
 
-    - name: cache-pip
-      uses: actions/cache@v4
+    - name: Set up Python
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
-        path: ~/.cache/pip
-        key: pip-${{ hashFiles('doc/requirements.txt') }}
+        python-version: 3.12
+        cache: pip
+        cache-dependency-path: doc/requirements.txt
 
-    - name: install-pip
-      run: |
-        pip install -r doc/requirements.txt
-        pip install west==${WEST_VERSION}
-        pip install cmake==${CMAKE_VERSION}
-        pip install coverxygen
+    - name: Setup Zephyr project
+      uses: zephyrproject-rtos/action-zephyr-setup@f7b70269a8eb01f70c8e710891e4c94972a2f6b4 # v1.0.6
+      with:
+        app-path: zephyr
+        toolchains: 'all'
 
-    - name: west setup
+    - name: install-pip
+      working-directory: zephyr
       run: |
-        west init -l .
+        pip install -r doc/requirements.txt --require-hashes
 
     - name: build-docs
       shell: bash
+      working-directory: zephyr
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
           DOC_TAG="release"
@@ -144,22 +146,23 @@ jobs:
         genhtml --no-function-coverage --no-branch-coverage new.info -o coverage-report
 
     - name: compress-docs
+      working-directory: zephyr
       run: |
         tar --use-compress-program="xz -T0" -cf html-output.tar.xz --exclude html/_sources --exclude html/doxygen/xml --directory=doc/_build html
         tar --use-compress-program="xz -T0" -cf api-output.tar.xz --directory=doc/_build html/doxygen/html
         tar --use-compress-program="xz -T0" -cf api-coverage.tar.xz coverage-report
 
     - name: upload-build
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: html-output
-        path: html-output.tar.xz
+        path: zephyr/html-output.tar.xz
 
     - name: upload-api-coverage
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: api-coverage
-        path: api-coverage.tar.xz
+        path: zephyr/api-coverage.tar.xz
 
     - name: process-pr
       if: github.event_name == 'pull_request'
@@ -176,7 +179,7 @@ jobs:
         echo "API Coverage Report will be available shortly at: ${API_COVERAGE_URL}" >> $GITHUB_STEP_SUMMARY
 
     - name: upload-pr-number
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       if: github.event_name == 'pull_request'
       with:
         name: pr_num
@@ -186,52 +189,56 @@ jobs:
     name: "Documentation Build (PDF)"
     needs: [doc-file-check]
     if: |
-      github.event_name != 'pull_request' &&
-      github.repository_owner == 'zephyrproject-rtos'
-    runs-on: ubuntu-22.04
-    container: texlive/texlive:latest
+      github.event_name != 'pull_request'
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     concurrency:
       group: doc-build-pdf-${{ github.ref }}
       cancel-in-progress: true
 
     steps:
-    - name: Apply container owner mismatch workaround
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
     - name: checkout
-      uses: actions/checkout@v4
-
-    - name: install-pkgs
-      run: |
-        apt-get update
-        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin imagemagick
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        path: zephyr
 
-    - name: cache-pip
-      uses: actions/cache@v4
+    - name: Set up Python
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
-        path: ~/.cache/pip
-        key: pip-${{ hashFiles('doc/requirements.txt') }}
+        python-version: 3.12
+        cache: pip
+        cache-dependency-path: doc/requirements.txt
 
-    - name: setup-venv
+    - name: install-pkgs
       run: |
-        python3 -m venv .venv
-        . .venv/bin/activate
-        echo PATH=$PATH >> $GITHUB_ENV
+        sudo apt-get update
+        sudo apt-get install --no-install-recommends graphviz librsvg2-bin \
+          texlive-latex-base texlive-latex-extra latexmk \
+          texlive-fonts-recommended texlive-fonts-extra texlive-xetex \
+          imagemagick fonts-noto xindy
+        wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
+        echo "${DOXYGEN_MD5SUM}  doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz" | md5sum -c
+        if [ $? -ne 0 ]; then
+          echo "Failed to verify doxygen tarball"
+          exit 1
+        fi
+        sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
+        echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
 
-    - name: install-pip
-      run: |
-        pip install -r doc/requirements.txt
-        pip install west==${WEST_VERSION}
-        pip install cmake==${CMAKE_VERSION}
+    - name: Setup Zephyr project
+      uses: zephyrproject-rtos/action-zephyr-setup@f7b70269a8eb01f70c8e710891e4c94972a2f6b4 # v1.0.6
+      with:
+        app-path: zephyr
+        toolchains: 'arm-zephyr-eabi'
 
-    - name: west setup
+    - name: install-pip-pkgs
+      working-directory: zephyr
       run: |
-        west init -l .
+        pip install -r doc/requirements.txt --require-hashes
 
     - name: build-docs
       shell: bash
+      working-directory: zephyr
       continue-on-error: true
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
@@ -247,13 +254,13 @@ jobs:
 
     - name: upload-build
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: pdf-output
         if-no-files-found: ignore
         path: |
-          doc/_build/latex/zephyr.pdf
-          doc/_build/latex/zephyr.log
+          zephyr/doc/_build/latex/zephyr.pdf
+          zephyr/doc/_build/latex/zephyr.log
 
   doc-build-status-check:
     if: always()
diff --git a/.github/workflows/doc-publish-pr.yml b/.github/workflows/doc-publish-pr.yml
index d75bcad785616..54ac20d6ad46a 100644
--- a/.github/workflows/doc-publish-pr.yml
+++ b/.github/workflows/doc-publish-pr.yml
@@ -10,10 +10,13 @@ on:
     types:
     - completed
 
+permissions:
+  contents: read
+
 jobs:
   doc-publish:
     name: Publish Documentation
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: |
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&
@@ -22,7 +25,7 @@ jobs:
     steps:
     - name: Download artifacts
       id: download-artifacts
-      uses: dawidd6/action-download-artifact@v8
+      uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
       with:
         workflow: doc-build.yml
         run_id: ${{ github.event.workflow_run.id }}
@@ -30,7 +33,7 @@ jobs:
 
     - name: Load PR number
       if: steps.download-artifacts.outputs.found_artifact == 'true'
-      uses: actions/github-script@v7
+      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       with:
         script: |
           let fs = require("fs");
@@ -40,7 +43,7 @@ jobs:
     - name: Check PR number
       if: steps.download-artifacts.outputs.found_artifact == 'true'
       id: check-pr
-      uses: carpentries/actions/check-valid-pr@v0.14.0
+      uses: carpentries/actions/check-valid-pr@e27aa6c531dadd357d2aa4c9a21e90849e23e963 # v0.14.0
       with:
         pr: ${{ env.PR_NUM }}
         sha: ${{ github.event.workflow_run.head_sha }}
@@ -63,7 +66,7 @@ jobs:
 
     - name: Configure AWS Credentials
       if: steps.download-artifacts.outputs.found_artifact == 'true'
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
       with:
         aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/doc-publish.yml b/.github/workflows/doc-publish.yml
index 89349ed669730..89afeb4ed1b90 100644
--- a/.github/workflows/doc-publish.yml
+++ b/.github/workflows/doc-publish.yml
@@ -13,10 +13,13 @@ on:
     types:
     - completed
 
+permissions:
+  contents: read
+
 jobs:
   doc-publish:
     name: Publish Documentation
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: |
       github.event.workflow_run.event != 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&
@@ -24,7 +27,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: dawidd6/action-download-artifact@v8
+      uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
       with:
         workflow: doc-build.yml
         run_id: ${{ github.event.workflow_run.id }}
@@ -37,7 +40,7 @@ jobs:
         fi
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
       with:
         aws-access-key-id: ${{ vars.AWS_DOCS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_DOCS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/errno.yml b/.github/workflows/errno.yml
index d3fe1b0dcae40..a035936216f58 100644
--- a/.github/workflows/errno.yml
+++ b/.github/workflows/errno.yml
@@ -6,9 +6,12 @@ on:
       - 'lib/libc/minimal/include/errno.h'
       - 'scripts/ci/errno.py'
 
+permissions:
+  contents: read
+
 jobs:
   check-errno:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: ghcr.io/zephyrproject-rtos/ci:v0.27.4
 
@@ -22,7 +25,7 @@ jobs:
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Environment Setup
         run: |
diff --git a/.github/workflows/footprint-tracking.yml b/.github/workflows/footprint-tracking.yml
index 78f761cb545c4..c974b0ded252b 100644
--- a/.github/workflows/footprint-tracking.yml
+++ b/.github/workflows/footprint-tracking.yml
@@ -16,6 +16,9 @@ on:
       # same commit
       - 'v*'
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
@@ -58,14 +61,24 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y python3-venv
-          pip install -U gitpython
 
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+
+      - name: Install Python packages
+        run: |
+            pip install -r scripts/requirements-actions.txt --require-hashes
+
       - name: Environment Setup
         run: |
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
@@ -77,7 +90,7 @@ jobs:
           west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
         with:
           aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
@@ -94,7 +107,6 @@ jobs:
         run: |
           python3 -m venv .venv
           . .venv/bin/activate
-          pip install awscli
           aws s3 sync  --quiet footprint_data/ s3://testing.zephyrproject.org/footprint_data/
 
       - name: Transform Footprint data to Twister JSON reports
@@ -113,7 +125,6 @@ jobs:
           ELASTICSEARCH_INDEX: ${{ vars.FOOTPRINT_TRACKING_INDEX }}
         run: |
           shopt -s globstar
-          pip install -U elasticsearch
           run_date=`date --iso-8601=minutes`
           python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
             --flatten footprint \
diff --git a/.github/workflows/greet_first_time_contributor.yml b/.github/workflows/greet_first_time_contributor.yml
index 5f62c03d6def9..ae69fd5cc012a 100644
--- a/.github/workflows/greet_first_time_contributor.yml
+++ b/.github/workflows/greet_first_time_contributor.yml
@@ -6,14 +6,20 @@ on:
   pull_request_target:
     types: [opened, closed]
 
+permissions:
+  contents: read
+
 jobs:
   check_for_first_interaction:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
+    permissions:
+      pull-requests: write # to comment on pull requests
+      issues: write        # to comment on issues
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: zephyrproject-rtos/action-first-interaction@v1.1.1-zephyr-5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: zephyrproject-rtos/action-first-interaction@58853996b1ac504b8e0f6964301f369d2bb22e5c # v1.1.1+zephyr.6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/hello_world_multiplatform.yaml b/.github/workflows/hello_world_multiplatform.yaml
index f267688b1f0a5..8fb8b11597b04 100644
--- a/.github/workflows/hello_world_multiplatform.yaml
+++ b/.github/workflows/hello_world_multiplatform.yaml
@@ -16,6 +16,9 @@ on:
       - '.github/workflows/hello_world_multiplatform.yaml'
       - 'SDK_VERSION'
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
@@ -29,7 +32,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: zephyr
           fetch-depth: 0
@@ -51,12 +54,12 @@ jobs:
           git log --graph --oneline HEAD...${PR_HEAD}
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
         with:
           python-version: 3.11
 
       - name: Setup Zephyr project
-        uses: zephyrproject-rtos/action-zephyr-setup@v1
+        uses: zephyrproject-rtos/action-zephyr-setup@f7b70269a8eb01f70c8e710891e4c94972a2f6b4 # v1.0.6
         with:
           app-path: zephyr
           toolchains: all
@@ -74,7 +77,7 @@ jobs:
 
       - name: Upload artifacts
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           if-no-files-found: ignore
           path:
diff --git a/.github/workflows/issue_count.yml b/.github/workflows/issue_count.yml
index 7d6ed6dfc3e28..0ab24ef5f6471 100644
--- a/.github/workflows/issue_count.yml
+++ b/.github/workflows/issue_count.yml
@@ -4,6 +4,9 @@ on:
   schedule:
   - cron: '*/10 * * * *'
 
+permissions:
+  contents: read
+
 env:
   OUTPUT_FILE_NAME: IssuesReport.md
   COMMITTER_EMAIL: actions@github.com
@@ -14,7 +17,7 @@ env:
 jobs:
   track-issues:
     name: "Collect Issue Stats"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
@@ -27,7 +30,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install discount
 
-    - uses: brcrista/summarize-issues@v4
+    - uses: brcrista/summarize-issues@54c549b7d38b7db39e5c6e06fd9617e12e5c3491 # v4
       with:
         title: 'Issues Report for ${{ github.repository }}'
         configPath: 'issues-report-config.json'
@@ -35,14 +38,14 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: upload-stats
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       continue-on-error: true
       with:
         name: ${{ env.OUTPUT_FILE_NAME }}
         path: ${{ env.OUTPUT_FILE_NAME }}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/license_check.yml b/.github/workflows/license_check.yml
index 7d2d083faae0e..212c76366598d 100644
--- a/.github/workflows/license_check.yml
+++ b/.github/workflows/license_check.yml
@@ -2,22 +2,25 @@ name: Scancode
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   scancode_job:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Scan code for licenses
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         fetch-depth: 0
     - name: Scan the code
       id: scancode
-      uses: zephyrproject-rtos/action_scancode@v4
+      uses: zephyrproject-rtos/action_scancode@23ef91ce31cd4b954366a7b71eea47520da9b380 # v4
       with:
         directory-to-scan: 'scan/'
     - name: Artifact Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: scancode
         path: ./artifacts
diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
index 8cfd17695afc5..fdd6f75e38cfd 100644
--- a/.github/workflows/manifest.yml
+++ b/.github/workflows/manifest.yml
@@ -2,33 +2,49 @@ name: Manifest
 on:
   pull_request_target:
 
+permissions:
+  contents: read
+
 jobs:
   contribs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    permissions:
+      pull-requests: write # to create/update pull request comments
     name: Manifest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: zephyrproject/zephyr
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
 
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+
+      - name: Install Python packages
+        run: |
+          cd zephyrproject/zephyr
+          pip install -r scripts/requirements-actions.txt --require-hashes
+
       - name: west setup
         env:
           BASE_REF: ${{ github.base_ref }}
         working-directory: zephyrproject/zephyr
         run: |
-          pip install west
           git config --global user.email "you@example.com"
           git config --global user.name "Your Name"
           west init -l . || true
 
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.7.0
+        uses: zephyrproject-rtos/action-manifest@cb8f6fba6f20b5f8649bd573e80a7583a239894c # v1.7.0
         with:
-          github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           manifest-path: 'west.yml'
           checkout-path: 'zephyrproject/zephyr'
           use-tree-checkout: 'true'
diff --git a/.github/workflows/pinned-gh-actions.yml b/.github/workflows/pinned-gh-actions.yml
new file mode 100644
index 0000000000000..12ca596322190
--- /dev/null
+++ b/.github/workflows/pinned-gh-actions.yml
@@ -0,0 +1,19 @@
+name: Check SHA-pinned GitHub Actions
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+
+permissions:
+  contents: read
+
+jobs:
+  check-sha-pinned-actions:
+    name: Verify GitHub Actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Ensure SHA pinned actions
+        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@4830be28ce81da52ec70d65c552a7403821d98d4 # v3.0.23
diff --git a/.github/workflows/pr_metadata_check.yml b/.github/workflows/pr_metadata_check.yml
new file mode 100644
index 0000000000000..3564c6352c8fe
--- /dev/null
+++ b/.github/workflows/pr_metadata_check.yml
@@ -0,0 +1,40 @@
+name: PR Metadata Check
+
+on:
+  pull_request:
+    types:
+      - synchronize
+      - opened
+      - reopened
+      - labeled
+      - unlabeled
+      - edited
+
+permissions:
+  contents: read
+
+jobs:
+  do-not-merge:
+    name: Prevent Merging
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check for label
+        if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
+                contains(github.event.*.labels.*.name, 'DNM (manifest)') ||
+                contains(github.event.*.labels.*.name, 'TSC') ||
+                contains(github.event.*.labels.*.name, 'Architecture Review') ||
+                contains(github.event.*.labels.*.name, 'dev-review') }}
+        run: |
+          echo "Pull request is labeled as 'DNM', 'TSC', 'Architecture Review' or 'dev-review'."
+          echo "This workflow fails so that the pull request cannot be merged."
+          exit 1
+
+  empty_pr_description:
+    if: ${{ github.event.pull_request.body == '' }}
+    name: PR Description
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check for PR description
+        run: |
+          echo "Pull request description cannot be empty."
+          exit 1
diff --git a/.github/workflows/pylib_tests.yml b/.github/workflows/pylib_tests.yml
index bf9d828921224..29cfd1a52730f 100644
--- a/.github/workflows/pylib_tests.yml
+++ b/.github/workflows/pylib_tests.yml
@@ -19,6 +19,9 @@ on:
     - 'scripts/pylib/build_helpers/**'
     - '.github/workflows/pylib_tests.yml'
 
+permissions:
+  contents: read
+
 jobs:
   pylib-tests:
     name: Misc. Pylib Unit Tests
@@ -26,25 +29,21 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
         python-version: ${{ matrix.python-version }}
-    - name: cache-pip-linux
-      if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: install-packages
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
+
+    - name: Install Python packages
       run: |
-        pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
+        pip install -r scripts/requirements-actions.txt --require-hashes
     - name: Run pytest for build_helpers
       env:
         ZEPHYR_BASE: ./
diff --git a/.github/workflows/ready-to-merge.yml b/.github/workflows/ready-to-merge.yml
index 897a604452217..01f08e8a4b671 100644
--- a/.github/workflows/ready-to-merge.yml
+++ b/.github/workflows/ready-to-merge.yml
@@ -7,6 +7,9 @@ on:
         type: string
         required: true
 
+permissions:
+  contents: read
+
 jobs:
   all_jobs_passed:
     name: all jobs passed
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c7e71324c1d25..91f4037a2e2cc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,11 +6,16 @@ on:
       - 'v*'
       - '!v*rc*'
 
+permissions:
+  contents: read
+
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write # to create GitHub release entry
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
 
@@ -21,12 +26,12 @@ jobs:
           echo "TRIMMED_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@v5
+        uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0
         with:
           args: spdx -o zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
 
       - name: upload-results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         continue-on-error: true
         with:
           name: zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
@@ -38,7 +43,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
+        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -50,7 +55,7 @@ jobs:
 
       - name: Upload Release Assets
         id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index e2325da0a4ac6..d54e76cdcb8c5 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -29,12 +29,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -47,7 +47,7 @@ jobs:
       # uploads of run results in SARIF format to the repository Actions tab.
       # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
       - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif
@@ -56,6 +56,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/scripts_tests.yml b/.github/workflows/scripts_tests.yml
index 06e12ada528cb..0664dbcebc569 100644
--- a/.github/workflows/scripts_tests.yml
+++ b/.github/workflows/scripts_tests.yml
@@ -19,6 +19,9 @@ on:
       - 'scripts/build/**'
       - '.github/workflows/scripts_tests.yml'
 
+permissions:
+  contents: read
+
 jobs:
   scripts-tests:
     name: Scripts tests
@@ -26,10 +29,10 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: [ubuntu-20.04]
+        os: [ubuntu-24.04]
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -49,22 +52,15 @@ jobs:
           git log --graph --oneline HEAD...${PR_HEAD}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
 
-      - name: cache-pip-linux
-        if: startsWith(runner.os, 'Linux')
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-          restore-keys: |
-            ${{ runner.os }}-pip-${{ matrix.python-version }}
-
-      - name: install-packages
+      - name: Install Python packages
         run: |
-          pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
+          pip install -r scripts/requirements-actions.txt --require-hashes
 
       - name: Run pytest
         env:
diff --git a/.github/workflows/stale-workflow-queue-cleanup.yml b/.github/workflows/stale-workflow-queue-cleanup.yml
index ec1a4cc716fbb..f40d5b928da8a 100644
--- a/.github/workflows/stale-workflow-queue-cleanup.yml
+++ b/.github/workflows/stale-workflow-queue-cleanup.yml
@@ -7,6 +7,9 @@ on:
   # everyday at 15:00
   - cron: '0 15 * * *'
 
+permissions:
+  contents: read
+
 concurrency:
   group: stale-workflow-queue-cleanup
   cancel-in-progress: true
@@ -14,11 +17,13 @@ concurrency:
 jobs:
   cleanup:
     name: Cleanup
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    permissions:
+      actions: write # to delete stale workflow runs
 
     steps:
     - name: Delete stale queued workflow runs
-      uses: MajorScruffy/delete-old-workflow-runs@v0.3.0
+      uses: MajorScruffy/delete-old-workflow-runs@78b5af714fefaefdf74862181c467b061782719e # v0.3.0
       with:
         repository: ${{ github.repository }}
         # Remove any workflow runs in "queued" state for more than 1 day
diff --git a/.github/workflows/stale_issue.yml b/.github/workflows/stale_issue.yml
index f71e485ff8eea..ec59d2641d90e 100644
--- a/.github/workflows/stale_issue.yml
+++ b/.github/workflows/stale_issue.yml
@@ -3,13 +3,20 @@ on:
   schedule:
   - cron: "16 00 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   stale:
     name: Find Stale issues and PRs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
+    permissions:
+      pull-requests: write # to comment on stale pull requests
+      issues: write        # to comment on stale issues
+
     steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
       with:
         stale-pr-message: 'This pull request has been marked as stale because it has been open (more
           than) 60 days with no activity. Remove the stale label or add a comment saying that you
diff --git a/.github/workflows/stats_merged_prs.yml b/.github/workflows/stats_merged_prs.yml
index 0f86958e47b7b..bb79f77280177 100644
--- a/.github/workflows/stats_merged_prs.yml
+++ b/.github/workflows/stats_merged_prs.yml
@@ -6,13 +6,28 @@ on:
       - main
       - v*-branch
     types: [closed]
+
+permissions:
+  contents: read
+
 jobs:
   record_merged:
     if: github.event.pull_request.merged == true && github.repository == 'zephyrproject-rtos/zephyr'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+      - name: Install Python packages
+        run: |
+          pip install -r scripts/requirements-actions.txt --require-hashes
+
       - name: PR event
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -20,5 +35,4 @@ jobs:
           ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
           PR_STAT_ES_INDEX: ${{ vars.PR_STAT_ES_INDEX }}
         run: |
-          pip install pygithub elasticsearch
           python3 ./scripts/ci/stats/merged_prs.py --pull-request ${{ github.event.pull_request.number }} --repo ${{ github.repository }}
diff --git a/.github/workflows/twister-prep.yaml b/.github/workflows/twister-prep.yaml
deleted file mode 100644
index 51bc771059d69..0000000000000
--- a/.github/workflows/twister-prep.yaml
+++ /dev/null
@@ -1,147 +0,0 @@
-name: Prepare For a Twister Run
-
-on:
-  workflow_call:
-    outputs:
-      subset:
-        description: subset
-        value: ${{ jobs.prep_push.outputs.subset != '' && jobs.prep_push.outputs.subset ||  jobs.prep_pr.outputs.subset }}
-      size:
-        description: size
-        value: ${{ jobs.prep_push.outputs.size != '' && jobs.prep_push.outputs.size || jobs.prep_pr.outputs.size }}
-      fullrun:
-        description: fullrun
-        value: ${{ jobs.prep_push.outputs.fullrun != '' && jobs.prep_push.outputs.fullrun || jobs.prep_pr.outputs.size }}
-
-jobs:
-  prep_pr:
-    if: github.repository_owner == 'zephyrproject-rtos' && github.event_name == 'pull_request_target'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
-      options: '--entrypoint /bin/bash'
-    outputs:
-      subset: ${{ steps.output-services.outputs.subset }}
-      size: ${{ steps.output-services.outputs.size }}
-      fullrun: ${{ steps.output-services.outputs.fullrun }}
-    env:
-      MATRIX_SIZE: 10
-      PUSH_MATRIX_SIZE: 20
-      DAILY_MATRIX_SIZE: 80
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TESTS_PER_BUILDER: 700
-      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
-      BASE_REF: ${{ github.base_ref }}
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Environment Setup
-        run: |
-          git config --global user.email "bot@zephyrproject.org"
-          git config --global user.name "Zephyr Bot"
-          rm -fr ".git/rebase-apply"
-          rm -fr ".git/rebase-merge"
-          git rebase origin/${BASE_REF}
-          git clean -f -d
-          git log  --pretty=oneline | head -n 10
-          west init -l . || true
-          west config manifest.group-filter -- +ci,+optional
-          west config --global update.narrow true
-          west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
-          west forall -c 'git reset --hard HEAD'
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Generate Test Plan with Twister
-        id: test-plan
-        run: |
-          export ZEPHYR_BASE=${PWD}
-          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --no-detailed-test-id --pull-request -t $TESTS_PER_BUILDER
-          if [ -s .testplan ]; then
-            cat .testplan >> $GITHUB_ENV
-          else
-            echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
-          fi
-          rm -f testplan.json .testplan
-
-      - name: Determine matrix size
-        id: output-services
-        run: |
-          if [ -n "${TWISTER_NODES}" ]; then
-            subset="[$(seq -s',' 1 ${TWISTER_NODES})]"
-          else
-            subset="[$(seq -s',' 1 ${MATRIX_SIZE})]"
-          fi
-          size=${TWISTER_NODES}
-
-          echo "subset=${subset}" >> $GITHUB_OUTPUT
-          echo "size=${size}" >> $GITHUB_OUTPUT
-          echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
-
-  prep_push:
-    if: github.repository_owner == 'zephyrproject-rtos' && (github.event_name == 'push' || github.event_name == 'schedule')
-    runs-on: ubuntu-22.04
-    outputs:
-      subset: ${{ steps.output-services.outputs.subset }}
-      size: ${{ steps.output-services.outputs.size }}
-      fullrun: ${{ steps.output-services.outputs.fullrun }}
-    env:
-      MATRIX_SIZE: 10
-      PUSH_MATRIX_SIZE: 20
-      DAILY_MATRIX_SIZE: 80
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TESTS_PER_BUILDER: 700
-      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
-      BASE_REF: ${{ github.base_ref }}
-    steps:
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Determine matrix size
-        id: output-services
-        run: |
-          if [ "${{github.event_name}}" = "push" ]; then
-            subset="[$(seq -s',' 1 ${PUSH_MATRIX_SIZE})]"
-            size=${MATRIX_SIZE}
-          elif [ "${{github.event_name}}" = "schedule" -a "${{github.repository}}" = "zephyrproject-rtos/zephyr" ]; then
-            subset="[$(seq -s',' 1 ${DAILY_MATRIX_SIZE})]"
-            size=${DAILY_MATRIX_SIZE}
-          else
-            size=0
-          fi
-
-          echo "subset=${subset}" >> $GITHUB_OUTPUT
-          echo "size=${size}" >> $GITHUB_OUTPUT
-          echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/twister-publish.yaml b/.github/workflows/twister-publish.yaml
index 77078f8fdbcb3..ceac5a7736bfa 100644
--- a/.github/workflows/twister-publish.yaml
+++ b/.github/workflows/twister-publish.yaml
@@ -8,26 +8,38 @@ on:
     types:
       - completed
 
+permissions:
+  contents: read
+
 jobs:
   upload-to-elasticsearch:
     if: |
       github.repository == 'zephyrproject-rtos/zephyr' &&
-      github.event.workflow_run.event != 'pull_request_target'
+      github.event.workflow_run.event != 'pull_request'
     env:
       ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
       ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       # Needed for elasticearch and upload script
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+      - name: Install Python packages
+        run: |
+          pip install -r scripts/requirements-actions.txt --require-hashes
 
       - name: Download Artifacts
         id: download-artifacts
-        uses: dawidd6/action-download-artifact@v8
+        uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
         with:
           path: artifacts
           workflow: twister.yml
@@ -37,7 +49,6 @@ jobs:
       - name: Upload to elasticsearch
         if: steps.download-artifacts.outputs.found_artifact == 'true'
         run: |
-          pip install elasticsearch
           # set run date on upload to get consistent and unified data across the matrix.
           run_date=`date --iso-8601=minutes`
           if [ "${{github.event.workflow_run.event}}" = "push" ]; then
diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml
index 668813b5c5199..946cfff778e4f 100644
--- a/.github/workflows/twister.yaml
+++ b/.github/workflows/twister.yaml
@@ -6,14 +6,17 @@ on:
       - main
       - v*-branch
       - collab-*
-  pull_request_target:
+  pull_request:
     branches:
       - main
       - v*-branch
       - collab-*
   schedule:
-    # Run at 03:00 UTC on every Sunday
-    - cron: '0 3 * * 0'
+    # Run at 17:00 UTC on every Saturday
+    - cron: '0 17 * * 6'
+
+permissions:
+  contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -21,7 +24,102 @@ concurrency:
 
 jobs:
   twister-build-prep:
-    uses: ./.github/workflows/twister-prep.yaml
+    if: github.repository_owner == 'zephyrproject-rtos'
+    runs-on: ubuntu-24.04
+    outputs:
+      subset: ${{ steps.output-services.outputs.subset }}
+      size: ${{ steps.output-services.outputs.size }}
+      fullrun: ${{ steps.output-services.outputs.fullrun }}
+    env:
+      MATRIX_SIZE: 10
+      PUSH_MATRIX_SIZE: 20
+      WEEKLY_MATRIX_SIZE: 200
+      BSIM_OUT_PATH: /opt/bsim/
+      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      TESTS_PER_BUILDER: 900
+      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
+      BASE_REF: ${{ github.base_ref }}
+    steps:
+      - name: Checkout
+        if: github.event_name == 'pull_request'
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+          path: zephyr
+          persist-credentials: false
+
+      - name: Set up Python
+        if: github.event_name == 'pull_request'
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+
+      - name: install-packages
+        working-directory: zephyr
+        if: github.event_name == 'pull_request'
+        run: |
+          pip install -r scripts/requirements-actions.txt --require-hashes
+
+      - name: Setup Zephyr project
+        if: github.event_name == 'pull_request'
+        uses: zephyrproject-rtos/action-zephyr-setup@f7b70269a8eb01f70c8e710891e4c94972a2f6b4 # v1.0.6
+        with:
+          app-path: zephyr
+          toolchains: all
+
+      - name: Environment Setup
+        working-directory: zephyr
+        if: github.event_name == 'pull_request'
+        run: |
+          git config --global user.email "bot@zephyrproject.org"
+          git config --global user.name "Zephyr Bot"
+          rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
+          git rebase origin/${BASE_REF}
+          git clean -f -d
+          git log  --pretty=oneline | head -n 10
+
+      - name: Generate Test Plan with Twister
+        working-directory: zephyr
+        if: github.event_name == 'pull_request'
+        id: test-plan
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --no-detailed-test-id --pull-request -t $TESTS_PER_BUILDER
+          if [ -s .testplan ]; then
+            cat .testplan >> $GITHUB_ENV
+          else
+            echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
+          fi
+          rm -f testplan.json .testplan
+
+      - name: Determine matrix size
+        id: output-services
+        run: |
+          if [ "${{github.event_name}}" = "push" ]; then
+            subset="[$(seq -s',' 1 ${PUSH_MATRIX_SIZE})]"
+            size=${MATRIX_SIZE}
+          elif [ "${{github.event_name}}" = "pull_request" ]; then
+            if [ -n "${TWISTER_NODES}" ]; then
+              subset="[$(seq -s',' 1 ${TWISTER_NODES})]"
+            else
+              subset="[$(seq -s',' 1 ${MATRIX_SIZE})]"
+            fi
+            size=${TWISTER_NODES}
+          elif [ "${{github.event_name}}" = "schedule" -a "${{github.repository}}" = "zephyrproject-rtos/zephyr" ]; then
+            subset="[$(seq -s',' 1 ${WEEKLY_MATRIX_SIZE})]"
+            size=${WEEKLY_MATRIX_SIZE}
+          else
+            size=0
+          fi
+
+          echo "subset=${subset}" >> $GITHUB_OUTPUT
+          echo "size=${size}" >> $GITHUB_OUTPUT
+          echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
 
   twister-build:
     runs-on:
@@ -44,10 +142,10 @@ jobs:
       CCACHE_IGNOREOPTIONS: '-specs=* --specs=*'
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TWISTER_COMMON: '--no-detailed-test-id --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
-      WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered'
-      PR_OPTIONS: ' --clobber-output --integration'
-      PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered'
+      TWISTER_COMMON: ' --test-config tests/test_config_ci.yaml --no-detailed-test-id --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
+      WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered -j 32'
+      PR_OPTIONS: ' --clobber-output --integration -j 16'
+      PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered -j 16'
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
       LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
@@ -73,7 +171,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -81,7 +179,7 @@ jobs:
 
       - name: Environment Setup
         run: |
-          if [ "${{github.event_name}}" = "pull_request_target" ]; then
+          if [ "${{github.event_name}}" = "pull_request" ]; then
             git config --global user.email "bot@zephyrproject.org"
             git config --global user.name "Zephyr Builder"
             rm -fr ".git/rebase-apply"
@@ -143,7 +241,7 @@ jobs:
             fi
           fi
 
-      - if: github.event_name == 'pull_request_target'
+      - if: github.event_name == 'pull_request'
         name: Run Tests with Twister (Pull Request)
         id: run_twister_pr
         run: |
@@ -180,7 +278,7 @@ jobs:
 
       - name: Upload Unit Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: Unit Test Results (Subset ${{ matrix.subset }})
           if-no-files-found: ignore
@@ -202,7 +300,7 @@ jobs:
 
       - if: matrix.subset == 1 && github.event_name == 'push'
         name: Upload the list of Python packages
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: Frozen PIP package set
           path: |
@@ -212,41 +310,53 @@ jobs:
     name: "Publish Unit Tests Results"
     needs:
       - twister-build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    permissions:
+      checks: write # to create the check run entry with Twister test results
     # the build-and-test job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
       - name: Check out source code
-        if: needs.twister-build.result == 'failure'
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
 
+      - name: Set up Python
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        with:
+          python-version: 3.12
+          cache: pip
+          cache-dependency-path: scripts/requirements-actions.txt
+
+      - name: Install Python packages
+        run: |
+          pip install -r scripts/requirements-actions.txt --require-hashes
+
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           path: artifacts
 
       - name: Merge Test Results
         run: |
-          pip install junitparser junit2html
           junitparser merge artifacts/*/*/twister.xml junit.xml
           junit2html junit.xml junit.html
 
-      - name: Upload Unit Test Results in HTML
+      - name: Upload Unit Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: HTML Unit Test Results
+          name: Unit Test Results
           if-no-files-found: ignore
           path: |
             junit.html
+            junit.xml
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
         with:
           check_name: Unit Test Results
           files: "**/twister.xml"
@@ -263,7 +373,7 @@ jobs:
 
       - name: Upload Twister Analysis Results
         if: needs.twister-build.result == 'failure'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: Twister Analysis Results
           if-no-files-found: ignore
diff --git a/.github/workflows/twister_tests.yml b/.github/workflows/twister_tests.yml
index 66409bce8763c..394936a29aa3e 100644
--- a/.github/workflows/twister_tests.yml
+++ b/.github/workflows/twister_tests.yml
@@ -26,6 +26,9 @@ on:
     - '.github/workflows/twister_tests.yml'
     - 'scripts/schemas/twister/'
 
+permissions:
+  contents: read
+
 jobs:
   twister-tests:
     name: Twister Unit Tests
@@ -33,25 +36,22 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
         python-version: ${{ matrix.python-version }}
-    - name: cache-pip-linux
-      if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: install-packages
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
+
+    - name: Install Python packages
       run: |
-        pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt -r scripts/requirements-run-test.txt
+        pip install -r scripts/requirements-actions.txt --require-hashes
+
     - name: Run pytest for twisterlib
       env:
         ZEPHYR_BASE: ./
diff --git a/.github/workflows/twister_tests_blackbox.yml b/.github/workflows/twister_tests_blackbox.yml
index cd24a2a39aea6..1e9303e24dd3c 100644
--- a/.github/workflows/twister_tests_blackbox.yml
+++ b/.github/workflows/twister_tests_blackbox.yml
@@ -15,66 +15,51 @@ on:
     - 'scripts/tests/twister_blackbox/**'
     - '.github/workflows/twister_tests_blackbox.yml'
 
+permissions:
+  contents: read
+
 jobs:
   twister-tests:
     name: Twister Black Box Tests
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: [ubuntu-22.04]
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.27.4
-
     steps:
-    - name: Apply Container Owner Mismatch Workaround
-      run: |
-        # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-        #        match the container user UID because of the way GitHub
-        #        Actions runner is implemented. Remove this workaround when
-        #        GitHub comes up with a fundamental fix for this problem.
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
     - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Environment Setup
-      run: |
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-        west init -l . || true
-        # we do not depend on any hals, tools or bootloader, save some time and space...
-        west config manifest.group-filter -- -hal,-tools,-bootloader,-babblesim
-        west config manifest.project-filter -- -nrf_hw_models
-        west config --global update.narrow true
-        west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
-        west forall -c 'git reset --hard HEAD'
-
-        echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        path: zephyr
+        fetch-depth: 0
 
     - name: Set Up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
         python-version: ${{ matrix.python-version }}
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
 
-    - name: Go Into Venv
-      shell: bash
+    - name: install-packages
+      working-directory: zephyr
       run: |
-        python3 -m pip install --user virtualenv
-        python3 -m venv env
-        source env/bin/activate
-        echo "$(which python)"
+        pip install -r scripts/requirements-actions.txt --require-hashes
+        sudo apt-get update -y
+        sudo apt-get install -y lcov
 
-    - name: Install Packages
-      run: |
-        python3 -m pip install -U -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt -r scripts/requirements-run-test.txt
+    - name: Setup Zephyr project
+      uses: zephyrproject-rtos/action-zephyr-setup@f7b70269a8eb01f70c8e710891e4c94972a2f6b4 # v1.0.6
+      with:
+        app-path: zephyr
+        toolchains: all
 
     - name: Run Pytest For Twister Black Box Tests
+      working-directory: zephyr
       shell: bash
       env:
         ZEPHYR_BASE: ./
         ZEPHYR_TOOLCHAIN_VARIANT: zephyr
       run: |
+        export ZEPHYR_SDK_INSTALL_DIR=${{ github.workspace }}/zephyr-sdk
         echo "Run twister tests"
         source zephyr-env.sh
-        PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox
+        PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox/
diff --git a/.github/workflows/west_cmds.yml b/.github/workflows/west_cmds.yml
index dc75c7578cc64..1756664303d8d 100644
--- a/.github/workflows/west_cmds.yml
+++ b/.github/workflows/west_cmds.yml
@@ -23,8 +23,11 @@ on:
     - 'scripts/west_commands/**'
     - '.github/workflows/west_cmds.yml'
 
+permissions:
+  contents: read
+
 jobs:
-  west-commnads:
+  west-commands:
     name: West Command Tests
     runs-on: ${{ matrix.os }}
     strategy:
@@ -33,43 +36,24 @@ jobs:
         os: [ubuntu-22.04, macos-14, windows-2022]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
         python-version: ${{ matrix.python-version }}
-    - name: cache-pip-linux
-      if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: cache-pip-mac
-      if: startsWith(runner.os, 'macOS')
-      uses: actions/cache@v4
-      with:
-        path: ~/Library/Caches/pip
-        # Trailing '-' was just to get a different cache name
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}-
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}-
-    - name: cache-pip-win
-      if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v4
-      with:
-        path: ~\AppData\Local\pip\Cache
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: install pytest
+        cache: pip
+        cache-dependency-path: scripts/requirements-actions.txt
+
+    - name: Install Python packages
       run: |
-        pip install pytest west pyelftools canopen natsort progress mypy intelhex psutil ply pyserial anytree junitparser
+        pip install -r scripts/requirements-actions.txt --require-hashes
+
     - name: run pytest-win
       if: runner.os == 'Windows'
       run: |
         python ./scripts/west_commands/run_tests.py
+
     - name: run pytest-mac-linux
       if: runner.os != 'Windows'
       run: |
diff --git a/.gitlint b/.gitlint
index e83edce6b6e65..16e9bdca9aaae 100644
--- a/.gitlint
+++ b/.gitlint
@@ -59,3 +59,7 @@ ignore-merge-commits=false
 # By specifying this rule, developers can only change the file when they explicitly reference
 # it in the commit message.
 #files=gitlint/rules.py,README.md
+
+[ignore-by-author-name]
+regex=^dependabot\[bot\]$
+ignore=all
diff --git a/.ruff-excludes.toml b/.ruff-excludes.toml
index 269a0c9fcf171..276bdcdd546ce 100644
--- a/.ruff-excludes.toml
+++ b/.ruff-excludes.toml
@@ -436,24 +436,10 @@
     "UP035",    # https://docs.astral.sh/ruff/rules/deprecated-import
 ]
 "./scripts/dts/python-devicetree/src/devicetree/dtlib.py" = [
-    "E701",     # https://docs.astral.sh/ruff/rules/multiple-statements-on-one-line-colon
-    "I001",     # https://docs.astral.sh/ruff/rules/unsorted-imports
-    "SIM201",   # https://docs.astral.sh/ruff/rules/negate-equal-op
     "UP007",    # https://docs.astral.sh/ruff/rules/non-pep604-annotation
-    "UP035",    # https://docs.astral.sh/ruff/rules/deprecated-import
-    "UP037",    # https://docs.astral.sh/ruff/rules/quoted-annotation
 ]
 "./scripts/dts/python-devicetree/src/devicetree/edtlib.py" = [
-    "B904",     # https://docs.astral.sh/ruff/rules/raise-without-from-inside-except
-    "B905",     # https://docs.astral.sh/ruff/rules/zip-without-explicit-strict
-    "E713",     # https://docs.astral.sh/ruff/rules/not-in-test
-    "I001",     # https://docs.astral.sh/ruff/rules/unsorted-imports
-    "SIM102",   # https://docs.astral.sh/ruff/rules/collapsible-if
-    "SIM118",   # https://docs.astral.sh/ruff/rules/in-dict-keys
     "UP007",    # https://docs.astral.sh/ruff/rules/non-pep604-annotation
-    "UP015",    # https://docs.astral.sh/ruff/rules/redundant-open-modes
-    "UP035",    # https://docs.astral.sh/ruff/rules/deprecated-import
-    "UP037",    # https://docs.astral.sh/ruff/rules/quoted-annotation
 ]
 "./scripts/dts/python-devicetree/src/devicetree/grutils.py" = [
     "E501",     # https://docs.astral.sh/ruff/rules/line-too-long
@@ -828,14 +814,6 @@
     "I001",     # https://docs.astral.sh/ruff/rules/unsorted-imports
     "UP026",    # https://docs.astral.sh/ruff/rules/deprecated-mock-import
 ]
-"./scripts/tests/twister/test_config_parser.py" = [
-    "B017",     # https://docs.astral.sh/ruff/rules/assert-raises-exception
-    "B033",     # https://docs.astral.sh/ruff/rules/duplicate-value
-    "E501",     # https://docs.astral.sh/ruff/rules/line-too-long
-    "I001",     # https://docs.astral.sh/ruff/rules/unsorted-imports
-    "SIM117",   # https://docs.astral.sh/ruff/rules/multiple-with-statements
-    "UP026",    # https://docs.astral.sh/ruff/rules/deprecated-mock-import
-]
 "./scripts/tests/twister/test_data/mixins/test_to_ignore.py" = [
     "B011",     # https://docs.astral.sh/ruff/rules/assert-false
 ]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16a471ae6ee64..779c533a809ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,15 @@ set(ZEPHYR_CURRENT_LINKER_PASS 0)
 set(ZEPHYR_CURRENT_LINKER_CMD    linker_zephyr_pre${ZEPHYR_CURRENT_LINKER_PASS}.cmd)
 set(ZEPHYR_LINK_STAGE_EXECUTABLE zephyr_pre${ZEPHYR_CURRENT_LINKER_PASS})
 
+# Make kconfig variables available to the linker script generator
+zephyr_linker_include_generated(KCONFIG ${CMAKE_CURRENT_BINARY_DIR}/.config)
+
+# The linker generator also needs sections.h to be able to access e.g. _APP_SMEM_SECTION_NAME
+# for linkerscripts that do not support c-preprocessing.
+zephyr_linker_include_generated(HEADER ${ZEPHYR_BASE}/include/zephyr/linker/sections.h)
+
+zephyr_linker_include_var(VAR CMAKE_VERBOSE_MAKEFILE VALUE ${CMAKE_VERBOSE_MAKEFILE})
+
 # ZEPHYR_PREBUILT_EXECUTABLE is used outside of this file, therefore keep the
 # existing variable to allow slowly cleanup of linking stage handling.
 # Three stage linking active: pre0 -> pre1 -> final, this will correspond to `pre1`
@@ -174,13 +183,17 @@ endif()
 
 # @Intent: Set compiler flags to detect general stack overflows across all functions
 if(CONFIG_STACK_CANARIES)
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,security_canaries>)
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,security_canaries>>")
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,security_canaries>>")
 elseif(CONFIG_STACK_CANARIES_STRONG)
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,security_canaries_strong>)
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,security_canaries_strong>>")
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,security_canaries_strong>>")
 elseif(CONFIG_STACK_CANARIES_ALL)
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,security_canaries_all>)
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,security_canaries_all>>")
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,security_canaries_all>>")
 elseif(CONFIG_STACK_CANARIES_EXPLICIT)
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,security_canaries_explicit>)
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,security_canaries_explicit>>")
+  zephyr_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,security_canaries_explitic>>")
 endif()
 
 # @Intent: Obtain compiler optimizations flags and store in variables
@@ -227,7 +240,8 @@ SOC_* symbol.")
 endif()
 
 # Apply the final optimization flag(s)
-zephyr_compile_options(${OPTIMIZATION_FLAG})
+zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${OPTIMIZATION_FLAG}>)
+zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${OPTIMIZATION_FLAG}>)
 
 if(CONFIG_LTO)
   zephyr_compile_options($<TARGET_PROPERTY:compiler,optimization_lto>)
@@ -315,7 +329,9 @@ if(CONFIG_CODING_GUIDELINE_CHECK)
 endif()
 
 # @Intent: Set compiler specific macro inclusion of AUTOCONF_H
-zephyr_compile_options("SHELL: $<TARGET_PROPERTY:compiler,imacros> ${AUTOCONF_H}")
+zephyr_compile_options("SHELL: $<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,imacros> ${AUTOCONF_H}>")
+zephyr_compile_options("SHELL: $<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,imacros> ${AUTOCONF_H}>")
+zephyr_compile_options("SHELL: $<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,imacros> ${AUTOCONF_H}>")
 
 if(CONFIG_COMPILER_FREESTANDING)
   # @Intent: Set compiler specific flag for bare metal freestanding option
@@ -360,7 +376,9 @@ zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,required>
 # @Intent: Enforce standard integer type correspondence to match Zephyr usage.
 # (must be after compiler specific flags)
 if(CONFIG_ENFORCE_ZEPHYR_STDINT)
-  zephyr_compile_options("SHELL: $<TARGET_PROPERTY:compiler,imacros> ${ZEPHYR_BASE}/include/zephyr/toolchain/zephyr_stdint.h")
+  zephyr_compile_options("SHELL:$<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,imacros> ${ZEPHYR_BASE}/include/zephyr/toolchain/zephyr_stdint.h>")
+  zephyr_compile_options("SHELL:$<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,imacros> ${ZEPHYR_BASE}/include/zephyr/toolchain/zephyr_stdint.h>")
+  zephyr_compile_options("SHELL:$<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,imacros> ${ZEPHYR_BASE}/include/zephyr/toolchain/zephyr_stdint.h>")
 endif()
 
 # Common toolchain-agnostic assembly flags
@@ -926,6 +944,8 @@ add_custom_target(${DEVICE_API_LD_TARGET}
                           ${DEVICE_API_LINKER_SECTIONS_CMAKE}
 )
 
+zephyr_linker_include_generated(CMAKE ${DEVICE_API_LINKER_SECTIONS_CMAKE})
+
 # Add a pseudo-target that is up-to-date when all generated headers
 # are up-to-date.
 
@@ -1118,8 +1138,6 @@ elseif(DEFINED BOARD_LINKER_SCRIPT)
   set(LINKER_SCRIPT ${BOARD_LINKER_SCRIPT})
 elseif(DEFINED SOC_LINKER_SCRIPT)
   set(LINKER_SCRIPT ${SOC_LINKER_SCRIPT})
-else()
-  find_package(Deprecated COMPONENTS SEARCHED_LINKER_SCRIPT)
 endif()
 
 if(NOT EXISTS ${LINKER_SCRIPT})
@@ -1127,14 +1145,20 @@ if(NOT EXISTS ${LINKER_SCRIPT})
 endif()
 
 if(CONFIG_USERSPACE)
-  set(APP_SMEM_ALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_aligned.ld")
-  set(APP_SMEM_UNALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_unaligned.ld")
+  if(CONFIG_CMAKE_LINKER_GENERATOR)
+    set(APP_SMEM_LD_EXT "cmake")
+  else()
+    set(APP_SMEM_LD_EXT "ld")
+  endif()
+
+  set(APP_SMEM_ALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_aligned.${APP_SMEM_LD_EXT}")
+  set(APP_SMEM_UNALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_unaligned.${APP_SMEM_LD_EXT}")
 
   if(CONFIG_LINKER_USE_PINNED_SECTION)
     set(APP_SMEM_PINNED_ALIGNED_LD
-        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_aligned.ld")
+        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_aligned.${APP_SMEM_LD_EXT}")
     set(APP_SMEM_PINNED_UNALIGNED_LD
-        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_unaligned.ld")
+        "${PROJECT_BINARY_DIR}/include/generated/app_smem_pinned_unaligned.${APP_SMEM_LD_EXT}")
 
     if(NOT CONFIG_LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT)
       # The libc partition may hold symbols that are required during boot process,
@@ -1199,9 +1223,11 @@ if(CONFIG_USERSPACE)
 
   set(APP_SMEM_UNALIGNED_LIB app_smem_unaligned_output_obj_renamed_lib)
   list(APPEND LINKER_PASS_${ZEPHYR_CURRENT_LINKER_PASS}_DEFINE "LINKER_APP_SMEM_UNALIGNED")
-endif()
 
-if (CONFIG_USERSPACE)
+  foreach(dep ${APP_SMEM_UNALIGNED_LD} ${APP_SMEM_PINNED_UNALIGNED_LD})
+    zephyr_linker_include_generated(CMAKE ${dep} PASS LINKER_APP_SMEM_UNALIGNED)
+  endforeach()
+
   add_custom_command(
     OUTPUT ${APP_SMEM_ALIGNED_LD} ${APP_SMEM_PINNED_ALIGNED_LD}
     COMMAND ${PYTHON_EXECUTABLE}
@@ -1221,6 +1247,9 @@ if (CONFIG_USERSPACE)
     COMMAND_EXPAND_LISTS
     COMMENT "Generating app_smem_aligned linker section"
     )
+    foreach(dep ${APP_SMEM_ALIGNED_LD} ${APP_SMEM_PINNED_ALIGNED_LD})
+      zephyr_linker_include_generated(CMAKE ${dep} PASS NOT LINKER_APP_SMEM_UNALIGNED)
+    endforeach()
 endif()
 
 if(CONFIG_USERSPACE)
@@ -1328,6 +1357,13 @@ if(CONFIG_USERSPACE)
     DEPENDS
     ${KOBJECT_LINKER_HEADER_DATA}
   )
+
+  # gen_kobject_placeholders.py generates linker-kobject-prebuild-data.h,
+  # linker-kobject-prebuild-priv-stacks.h and linker-kobject-prebuild-rodata.h
+  foreach(ext "-data.h" "-priv-stacks.h" "-rodata.h")
+    string(REGEX REPLACE "-data.h$" ${ext} file ${KOBJECT_LINKER_HEADER_DATA})
+    zephyr_linker_include_generated(HEADER ${file} PASS LINKER_ZEPHYR_PREBUILT LINKER_ZEPHYR_FINAL)
+  endforeach()
 endif()
 
 if(CONFIG_USERSPACE OR CONFIG_DEVICE_DEPS)
@@ -2220,46 +2256,57 @@ if((CMAKE_BUILD_TYPE IN_LIST build_types) AND (NOT NO_BUILD_TYPE_WARNING))
 endif()
 
 # Extension Development Kit (EDK) generation.
-set(llext_edk_file ${PROJECT_BINARY_DIR}/${CONFIG_LLEXT_EDK_NAME}.tar.xz)
+if(CONFIG_LLEXT_EDK)
+  if(CONFIG_LLEXT_EDK_FORMAT_TAR_XZ)
+    set(llext_edk_extension "tar.xz")
+  elseif(CONFIG_LLEXT_EDK_FORMAT_TAR_ZSTD)
+    set(llext_edk_extension "tar.Z")
+  elseif(CONFIG_LLEXT_EDK_FORMAT_ZIP)
+    set(llext_edk_extension "zip")
+  else()
+    message(FATAL_ERROR "Unsupported LLEXT_EDK_FORMAT choice")
+  endif()
+  set(llext_edk_file ${PROJECT_BINARY_DIR}/${CONFIG_LLEXT_EDK_NAME}.${llext_edk_extension})
 
-# TODO maybe generate flags for C CXX ASM
-zephyr_get_compile_definitions_for_lang(C zephyr_defs)
-zephyr_get_compile_options_for_lang(C zephyr_flags)
+  # TODO maybe generate flags for C CXX ASM
+  zephyr_get_compile_definitions_for_lang(C zephyr_defs)
+  zephyr_get_compile_options_for_lang(C zephyr_flags)
 
-# Filter out non LLEXT and LLEXT_EDK flags - and add required ones
-llext_filter_zephyr_flags(LLEXT_REMOVE_FLAGS ${zephyr_flags} llext_filt_flags)
-llext_filter_zephyr_flags(LLEXT_EDK_REMOVE_FLAGS ${llext_filt_flags} llext_filt_flags)
+  # Filter out non LLEXT and LLEXT_EDK flags - and add required ones
+  llext_filter_zephyr_flags(LLEXT_REMOVE_FLAGS ${zephyr_flags} llext_filt_flags)
+  llext_filter_zephyr_flags(LLEXT_EDK_REMOVE_FLAGS ${llext_filt_flags} llext_filt_flags)
 
-set(llext_edk_cflags ${zephyr_defs} -DLL_EXTENSION_BUILD)
-list(APPEND llext_edk_cflags ${llext_filt_flags})
-list(APPEND llext_edk_cflags ${LLEXT_APPEND_FLAGS})
-list(APPEND llext_edk_cflags ${LLEXT_EDK_APPEND_FLAGS})
+  set(llext_edk_cflags ${zephyr_defs} -DLL_EXTENSION_BUILD)
+  list(APPEND llext_edk_cflags ${llext_filt_flags})
+  list(APPEND llext_edk_cflags ${LLEXT_APPEND_FLAGS})
+  list(APPEND llext_edk_cflags ${LLEXT_EDK_APPEND_FLAGS})
 
-build_info(llext-edk file PATH ${llext_edk_file})
-build_info(llext-edk cflags VALUE ${llext_edk_cflags})
-build_info(llext-edk include-dirs VALUE "$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>")
+  build_info(llext-edk file PATH ${llext_edk_file})
+  build_info(llext-edk cflags VALUE ${llext_edk_cflags})
+  build_info(llext-edk include-dirs VALUE "$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>")
 
-add_custom_command(
+  add_custom_command(
     OUTPUT ${llext_edk_file}
     # Regenerate syscalls in case CONFIG_LLEXT_EDK_USERSPACE_ONLY
     COMMAND ${CMAKE_COMMAND}
-        -E make_directory edk/include/generated/zephyr
+      -E make_directory edk/include/generated/zephyr
     COMMAND
-        ${PYTHON_EXECUTABLE}
-        ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
-        --json-file        ${syscalls_json}                     # Read this file
-        --base-output      edk/include/generated/zephyr/syscalls           # Write to this dir
-        --syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file
-        --syscall-list     ${edk_syscall_list_h}
-        $<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only>
-        ${SYSCALL_LONG_REGISTERS_ARG}
-        ${SYSCALL_SPLIT_TIMEOUT_ARG}
+      ${PYTHON_EXECUTABLE}
+      ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
+      --json-file        ${syscalls_json}                     # Read this file
+      --base-output      edk/include/generated/zephyr/syscalls           # Write to this dir
+      --syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file
+      --syscall-list     ${edk_syscall_list_h}
+      $<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only>
+      ${SYSCALL_LONG_REGISTERS_ARG}
+      ${SYSCALL_SPLIT_TIMEOUT_ARG}
     COMMAND ${CMAKE_COMMAND}
         -P ${ZEPHYR_BASE}/cmake/llext-edk.cmake
     DEPENDS ${logical_target_for_zephyr_elf} build_info_yaml_saved
     COMMAND_EXPAND_LISTS
-)
-add_custom_target(llext-edk DEPENDS ${llext_edk_file})
+  )
+  add_custom_target(llext-edk DEPENDS ${llext_edk_file})
+endif()
 
 # @Intent: Set compiler specific flags for standard C/C++ includes
 # Done at the very end, so any other system includes which may
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000000..54110c3f9a546
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,4 @@
+# Instead of the CODEOWNERS file, The Zephyr Project uses a custom format.
+# See MAINTAINERS.yml for details.
+#
+# DO NOT EDIT THIS FILE.
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 2d8031260ced6..6791e2d90420c 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -621,6 +621,13 @@ config MISRA_SANE
 	  standard for safety reasons.  Specifically variable length
 	  arrays are not permitted (and gcc will enforce this).
 
+config TOOLCHAIN_SUPPORTS_VLA_IN_STATEMENTS
+	bool
+	default y
+	help
+	  Hidden symbol to state if the toolchain can handle vla in
+	  statements.
+
 endmenu
 
 choice
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 251006cbafb45..3731470db07e5 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -182,6 +182,7 @@ ARM arch:
     - MaureenHelm
     - stephanosio
     - bbolen
+    - ithinuel
   files:
     - arch/arm/
     - arch/arm/core/offsets/
@@ -202,6 +203,9 @@ ARM64 arch:
     - npitre
     - povergoing
     - sgrrzhf
+    - wearyzen
+    - ithinuel
+    - JiafeiPan
   files:
     - arch/arm64/
     - include/zephyr/arch/arm64/
@@ -218,6 +222,8 @@ ARM Platforms:
   status: maintained
   maintainers:
     - wearyzen
+  collaborators:
+    - ithinuel
   files:
     - boards/arm/mps*/
     - boards/arm/v2m_*/
@@ -293,6 +299,7 @@ BeagleBoard Platforms:
     - ayush1325
     - con-pax
     - vaishnavachath
+    - glneo
   files:
     - boards/beagle/
   labels:
@@ -358,9 +365,9 @@ Bluetooth Controller:
     - carlescufi
     - thoh-ot
     - ppryga
-    - mtpr-ot
     - wopu-ot
     - erbr-ot
+    - Tronil
   files:
     - doc/connectivity/bluetooth/bluetooth-ctlr-arch.rst
     - doc/connectivity/bluetooth/img/ctlr*
@@ -432,6 +439,7 @@ Bluetooth Host:
     - subsys/bluetooth/host/iso_internal.h
     - subsys/bluetooth/host/shell/iso.c
     - tests/bluetooth/audio/
+    - tests/bluetooth/classic/
     - tests/bluetooth/controller/
     - tests/bluetooth/mesh*/
     - tests/bluetooth/qualification/
@@ -520,11 +528,15 @@ Bluetooth Classic:
     - lylezhu2012
   collaborators:
     - jhedberg
+    - MarkWangChinese
+    - gzh-terry
+    - makeshi
   files:
     - doc/connectivity/bluetooth/shell/classic/a2dp.rst
     - subsys/bluetooth/common/
     - subsys/bluetooth/host/classic/
     - include/zephyr/bluetooth/classic/
+    - tests/bluetooth/classic/
   labels:
     - "area: Bluetooth Classic"
     - "area: Bluetooth"
@@ -874,7 +886,6 @@ Demand Paging:
 Device Driver Model:
   status: maintained
   maintainers:
-    - gmarull
     - tbursztyka
   collaborators:
     - dcpleung
@@ -966,6 +977,7 @@ Display drivers:
   collaborators:
     - jfischer-no
     - danieldegrasse
+    - VynDragon
   files:
     - drivers/display/
     - dts/bindings/display/
@@ -1021,9 +1033,9 @@ Documentation:
 Documentation Infrastructure:
   status: maintained
   maintainers:
-    - gmarull
     - kartben
   collaborators:
+    - gmarull
     - carlescufi
     - nashif
   files:
@@ -1408,12 +1420,13 @@ Release Notes:
     - drivers.espi
 
 "Drivers: Ethernet":
-  status: odd fixes
+  status: maintained
+  maintainers:
+    - maass-hamburg
   collaborators:
     - decsny
     - lmajewski
     - pdgendt
-    - maass-hamburg
   files:
     - drivers/ethernet/
     - include/zephyr/dt-bindings/ethernet/
@@ -1642,6 +1655,9 @@ Release Notes:
   status: maintained
   maintainers:
     - carlocaione
+  collaborators:
+    - wearyzen
+    - ithinuel
   files:
     - include/zephyr/drivers/mbox.h
     - drivers/mbox/
@@ -1764,24 +1780,6 @@ Release Notes:
   tests:
     - drivers.ipm
 
-"Drivers: kscan":
-  status: maintained
-  maintainers:
-    - albertofloyd
-  collaborators:
-    - VenkatKotakonda
-  files:
-    - drivers/kscan/
-    - include/zephyr/drivers/kscan.h
-    - samples/drivers/kscan/
-    - tests/drivers/kscan/
-    - dts/bindings/kscan/
-    - doc/hardware/peripherals/kscan.rst
-  labels:
-    - "area: Kscan"
-  tests:
-    - drivers.kscan
-
 "Drivers: LED":
   status: maintained
   maintainers:
@@ -1823,7 +1821,6 @@ Release Notes:
 "Drivers: MFD":
   status: odd fixes
   collaborators:
-    - gmarull
     - aasinclair
   files:
     - drivers/mfd/
@@ -1934,8 +1931,8 @@ Release Notes:
     - samples.drivers.peci
 
 "Drivers: Pin Control":
-  status: maintained
-  maintainers:
+  status: odd fixes
+  collaborators:
     - gmarull
   files:
     - doc/hardware/pinctrl/
@@ -2071,7 +2068,7 @@ Release Notes:
   labels:
     - "area: Sensors"
   tests:
-    - drivers.sensors
+    - drivers.sensor
 
 "Drivers: SMBus":
   status: maintained
@@ -2116,12 +2113,15 @@ Release Notes:
     - dipakgmx
     - fabiobaltieri
     - faxe1008
+    - jbehrensnx
   files:
     - drivers/stepper/
     - include/zephyr/drivers/stepper.h
     - dts/bindings/stepper/
     - doc/hardware/peripherals/stepper.rst
+    - samples/drivers/stepper/
     - tests/drivers/build_all/stepper/
+    - tests/drivers/stepper/
   labels:
     - "area: Stepper"
   tests:
@@ -2307,11 +2307,9 @@ EC Host Commands:
 Xen Platform:
   status: maintained
   maintainers:
-    - povergoing
+    - firscity
   collaborators:
-    - SgrrZhf
     - lorc
-    - firscity
     - luca-fancellu
   files:
     - include/zephyr/xen/
@@ -2392,8 +2390,6 @@ Input:
   status: maintained
   maintainers:
     - fabiobaltieri
-  collaborators:
-    - gmarull
   files:
     - doc/services/input/
     - drivers/input/
@@ -2751,6 +2747,21 @@ Modem:
   tests:
     - modem
 
+NEORV32 platform:
+  status: maintained
+  maintainers:
+    - henrikbrixandersen
+  files:
+    - boards/others/neorv32/
+    - drivers/*/*neorv32*
+    - dts/bindings/*/*neorv32*
+    - soc/neorv32/
+    - tests/boards/neorv32/
+  labels:
+    - "platform: NEORV32"
+  tests:
+    - boards.neorv32
+
 OSDP:
   status: maintained
   maintainers:
@@ -2796,7 +2807,7 @@ hawkBit:
   tests:
     - sample.net.updatehub
 
-Native POSIX/Sim and POSIX arch:
+Native_sim and POSIX arch:
   status: maintained
   maintainers:
     - aescolar
@@ -2819,7 +2830,7 @@ Native POSIX/Sim and POSIX arch:
   labels:
     - "area: native port"
   description: >-
-    POSIX architecture and SOC, native_posix & native_sim boards, and related drivers
+    POSIX architecture and SOC, native_sim boards, and related drivers
   tests:
     - boards.native_sim
 
@@ -2851,7 +2862,6 @@ Networking:
     - include/zephyr/net/ieee802154*.h
     - include/zephyr/net/ptp.h
     - include/zephyr/net/wifi*.h
-    - include/zephyr/net/buf.h
     - include/zephyr/net/dhcpv4*.h
     - include/zephyr/net/http/
     - samples/net/gptp/
@@ -2904,7 +2914,6 @@ Networking:
     - jukkar
   files:
     - doc/services/net_buf/
-    - include/zephyr/net/buf.h
     - include/zephyr/net_buf.h
     - lib/net_buf/
     - tests/lib/net_buf/
@@ -3243,6 +3252,7 @@ RISCV arch:
     - carlocaione
     - npitre
     - ycsin
+    - VynDragon
   files:
     - arch/riscv/
     - boards/enjoydigital/litex_vexriscv/
@@ -3352,7 +3362,7 @@ Settings:
     - subsys/settings/
     - tests/subsys/settings/
     - samples/subsys/settings/
-    - doc/services/settings/
+    - doc/services/storage/settings/
   labels:
     - "area: Settings"
   tests:
@@ -3445,19 +3455,23 @@ ADI Platforms:
     - microbuilder
   files:
     - boards/adi/
+    - boards/shields/eval*ardz/
     - boards/shields/pmod_acl/
     - drivers/*/*max*
     - drivers/*/*max*/
     - drivers/dac/dac_ltc*
     - drivers/ethernet/eth_adin*
+    - drivers/ethernet/phy/phy_adin*
     - drivers/mdio/mdio_adin*
-    - drivers/regulator/regulator_adp5360*
     - drivers/sensor/adi/
+    - drivers/stepper/adi_tmc/
     - dts/arm/adi/
     - dts/bindings/*/adi,*
     - dts/bindings/*/lltc,*
     - dts/bindings/*/maxim,*
     - soc/adi/
+  files-regex:
+    - ^drivers/(adc|dac|gpio|mfd|regulator)/.*adp?\d+
   labels:
     - "platform: ADI"
 
@@ -3473,7 +3487,6 @@ GD32 Platforms:
   maintainers:
     - nandojve
   collaborators:
-    - gmarull
     - soburi
     - cameled
   files:
@@ -3573,9 +3586,15 @@ Raspberry Pi Pico Platforms:
     - threeeights
     - ajf58
   files:
-    - boards/raspberrypi/
+    - boards/raspberrypi/rpi_pico*/
     - boards/adafruit/kb2040/
+    - boards/adafruit/macropad_rp2040/
+    - boards/adafruit/qt_py_rp2040/
+    - boards/pimoroni/pico_plus2/
+    - boards/seeed/xiao_rp2040/
     - boards/sparkfun/pro_micro_rp2040/
+    - boards/waveshare/rp2040_zero/
+    - boards/wiznet/w5500_evb_pico*/
     - dts/arm/raspberrypi/rpi_pico/
     - dts/bindings/*/raspberrypi,pico*
     - drivers/*/*rpi_pico
@@ -3599,8 +3618,11 @@ Silabs Platforms:
     - dts/arm/silabs/
     - dts/bindings/*/silabs*
     - drivers/*/*gecko*
-    - drivers/bluetooth/hci/hci_silabs_*
     - drivers/*/*silabs*
+    - drivers/*/*siwx91x*
+    - drivers/*/*/*silabs*
+    - drivers/*/*/*siwx91x*
+    - tests/boards/silabs/
   labels:
     - "platform: Silabs"
 
@@ -3888,7 +3910,7 @@ NXP Platforms (Robotics Products):
     - boards/nxp/rddrone_fmuk66/
     - boards/nxp/mr_canhubk3/
   labels:
-    - "platform: NXP"
+    - "platform: NXP Robotics"
   description: NXP Robotics Module Platform Products
 
 Microchip MEC Platforms:
@@ -3965,6 +3987,19 @@ nRF Platforms:
   labels:
     - "platform: nRF"
 
+Octavo Systems Platforms:
+  status: maintained
+  maintainers:
+    - fkokosinski
+    - tgorochowik
+  collaborators:
+    - kgugala
+  files:
+    - boards/oct/
+    - soc/oct/
+  labels:
+    - "platform: Octavo Systems"
+
 OpenTitan Platforms:
   status: maintained
   maintainers:
@@ -4022,6 +4057,7 @@ Renesas RA Platforms:
   collaborators:
     - duynguyenxa
     - thaoluonguw
+    - thenguyenyf
   files:
     - boards/arduino/uno_r4/
     - boards/renesas/*ra*/
@@ -4030,6 +4066,7 @@ Renesas RA Platforms:
     - dts/arm/renesas/ra/
     - dts/bindings/*/*renesas,ra*
     - soc/renesas/ra/
+    - samples/boards/renesas/
   labels:
     - "platform: Renesas RA"
   description: >-
@@ -4040,8 +4077,8 @@ Renesas RZ Platforms:
   status: maintained
   maintainers:
     - tgorochowik
-  collaborators:
     - binhnguyen2434
+  collaborators:
     - nhutnguyenkc
   files:
     - boards/renesas/rz*/
@@ -4051,7 +4088,6 @@ Renesas RZ Platforms:
     - dts/arm/renesas/rz/
     - dts/bindings/*/*rzt2m*
     - dts/bindings/*/*renesas,rz*
-    - soc/renesas/rzt2m/
     - soc/renesas/rz/
   labels:
     - "platforms: Renesas RZ"
@@ -4219,6 +4255,7 @@ TI K3 Platforms:
   collaborators:
     - gramsay0
     - dnltz
+    - glneo
   files:
     - boards/ti/*am62*/
     - drivers/*/*davinci*
@@ -4332,14 +4369,26 @@ Secure storage:
     - tomi-font
   files:
     - subsys/secure_storage/
+    - include/zephyr/psa/
     - samples/psa/
-    - doc/services/secure_storage.rst
+    - doc/services/storage/secure_storage/index.rst
     - tests/subsys/secure_storage/
   labels:
     - "area: Secure storage"
   tests:
     - psa.secure_storage
 
+Sensry Platforms:
+  status: maintained
+  maintainers:
+    - tswaehn
+  files:
+    - boards/sensry/
+  files-regex:
+    - .*sy1xx.*
+  labels:
+    - "platform: sensry"
+
 Storage:
   status: odd fixes
   files:
@@ -4407,8 +4456,13 @@ Task Watchdog:
 TDK Sensors:
   status: maintained
   maintainers:
+    - afontaine-invn
+    - rbuisson-invn
+  collaborators:
     - teburd
     - MaureenHelm
+    - sriccardi-invn
+    - gjabouley-invn
   files:
     - drivers/sensor/tdk/
   labels:
@@ -4471,6 +4525,18 @@ TDK Sensors:
   labels:
     - "area: Toolchains"
 
+"Toolchain IAR":
+  status: maintained
+  maintainers:
+    - RobinKastberg
+  files:
+    - cmake/*/iar/
+    - include/zephyr/toolchain/iar.h
+    - include/zephyr/toolchain/iar/*
+    - lib/libc/iar/*
+  labels:
+    - "area: Toolchains"
+
 "Toolchain oneApi":
   status: maintained
   maintainers:
@@ -4772,6 +4838,7 @@ West:
     - wearyzen
   collaborators:
     - tomi-font
+    - ithinuel
   files: []
   labels:
     - "area: CMSIS_6"
@@ -4868,6 +4935,8 @@ West:
   maintainers:
     - kristofer-jonsson-arm
     - wearyzen
+  collaborators:
+    - ithinuel
   files:
     - drivers/misc/ethos_u/
     - modules/hal_ethos_u/
@@ -4879,7 +4948,6 @@ West:
   maintainers:
     - nandojve
   collaborators:
-    - gmarull
     - soburi
   files:
     - modules/hal_gigadevice/
@@ -4946,9 +5014,6 @@ West:
     - bperseghetti
   files:
     - modules/hal_nxp/
-    - modules/Kconfig.imx
-    - modules/Kconfig.mcux
-    - modules/Kconfig.nxp_s32
   labels:
     - "platform: NXP"
 
@@ -5073,6 +5138,8 @@ West:
   maintainers:
     - nzmichaelh
     - kholia
+  collaborators:
+    - VynDragon
   files:
     - modules/hal_wch/
 
@@ -5200,6 +5267,7 @@ West:
     - wearyzen
     - valeriosetti
     - tomi-font
+    - ithinuel
   files:
     - modules/mbedtls/
     - tests/crypto/mbedtls/
@@ -5351,7 +5419,9 @@ West:
     - "area: Audio"
 
 "West project: tflite-micro":
-  status: odd fixes
+  status: maintained
+  maintainers:
+    - XenuIsWatching
   collaborators:
     - laurenmurphyx64
   files:
@@ -5390,6 +5460,7 @@ West:
     - wearyzen
     - valeriosetti
     - tomi-font
+    - ithinuel
   files:
     - modules/trusted-firmware-m/
     - samples/tfm_integration/
@@ -5407,6 +5478,7 @@ West:
   collaborators:
     - Vge0rge
     - wearyzen
+    - ithinuel
   files: []
   labels:
     - "area: TF-M"
@@ -5419,6 +5491,7 @@ West:
   collaborators:
     - carlocaione
     - wearyzen
+    - ithinuel
   files:
     - modules/trusted-firmware-a/
   labels:
@@ -5431,6 +5504,7 @@ West:
   collaborators:
     - Vge0rge
     - wearyzen
+    - ithinuel
   files: []
   labels:
     - "area: TF-M"
@@ -5602,6 +5676,22 @@ Peregrine Platforms:
   labels:
     - "platform: Peregrine"
 
+WCH Platforms:
+  status: maintained
+  maintainers:
+    - nzmichaelh
+    - kholia
+  collaborators:
+    - VynDragon
+  files:
+    - boards/wch/
+    - dts/riscv/wch/
+    - soc/wch/
+    - drivers/*/*wch*
+    - dts/bindings/*/wch,*
+  labels:
+    - "platform: WinChipHead"
+
 # This area is to be converted to a subarea
 Testing with Renode:
   status: odd fixes
@@ -5612,8 +5702,8 @@ Testing with Renode:
     - cmake/emu/renode.cmake
     - soc/renode/
     - boards/renode/
-    - boards/**/*/support/*.repl
-    - boards/**/*/support/*.resc
+    - boards/*/*/support/*.repl
+    - boards/*/*/support/*.resc
   labels:
     - "area: Renode"
 
diff --git a/VERSION b/VERSION
index b170abf44be15..9749142466ba2 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1,5 @@
 VERSION_MAJOR = 4
-VERSION_MINOR = 0
+VERSION_MINOR = 1
 PATCHLEVEL = 99
 VERSION_TWEAK = 0
 EXTRAVERSION =
diff --git a/arch/Kconfig b/arch/Kconfig
index 94e9a540a08e2..d8b44324819bd 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -8,7 +8,7 @@
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
 
-source "$(ARCH_DIR)/Kconfig.$(HWM_SCHEME)"
+source "$(KCONFIG_BINARY_DIR)/arch/Kconfig"
 
 # ToDo: Generate a Kconfig.arch for loading of additional arch in HWMv2.
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
@@ -317,7 +317,7 @@ config PRIVILEGED_STACK_SIZE
 	int "Size of privileged stack"
 	default 2048 if EMUL
 	default 1024
-	depends on ARCH_HAS_USERSPACE
+	depends on USERSPACE
 	help
 	  This option sets the privileged stack region size that will be used
 	  in addition to the user mode thread stack.  During normal execution,
@@ -331,14 +331,14 @@ config KOBJECT_TEXT_AREA
 	default 512 if NO_OPTIMIZATIONS
 	default 512 if STACK_CANARIES && RISCV
 	default 256
-	depends on ARCH_HAS_USERSPACE
+	depends on USERSPACE
 	help
 	  Size of kernel object text area. Used in linker script.
 
 config KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT
 	int "Reserve extra kobject data area (in percentage)"
 	default 100
-	depends on ARCH_HAS_USERSPACE
+	depends on USERSPACE
 	help
 	  Multiplication factor used to calculate the size of placeholder to
 	  reserve space for kobject metadata hash table. The hash table is
@@ -352,7 +352,7 @@ config KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT
 config KOBJECT_RODATA_AREA_EXTRA_BYTES
 	int "Reserve extra bytes for kobject rodata area"
 	default 16
-	depends on ARCH_HAS_USERSPACE
+	depends on USERSPACE
 	help
 	  Reserve a few more bytes for the RODATA region for kobject metadata.
 	  This is to account for the uncertainty of tables generated by gperf.
@@ -1134,9 +1134,9 @@ config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 config ARCH_HAS_CUSTOM_SWAP_TO_MAIN
 	bool
 	help
-	  It's possible that an architecture port cannot use _Swap() to swap to
-	  the _main() thread, but instead must do something custom. It must
-	  enable this option in that case.
+	  It's possible that an architecture port cannot use z_swap_unlocked()
+	  to swap to the main thread (bg_thread_main), but instead must do
+	  something custom. It must enable this option in that case.
 
 config ARCH_HAS_CUSTOM_BUSY_WAIT
 	bool
diff --git a/arch/Kconfig.v1 b/arch/Kconfig.v1
deleted file mode 100644
index d76acba59a3e1..0000000000000
--- a/arch/Kconfig.v1
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Note: $ARCH might be a glob pattern
-source "$(ARCH_DIR)/$(ARCH)/Kconfig"
diff --git a/arch/Kconfig.v2 b/arch/Kconfig.v2
deleted file mode 100644
index 19db8d4624657..0000000000000
--- a/arch/Kconfig.v2
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-
-# SPDX-License-Identifier: Apache-2.0
-
-source "$(KCONFIG_BINARY_DIR)/arch/Kconfig"
diff --git a/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c b/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c
index 6ba748b34558b..f33bd638d7704 100644
--- a/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c
+++ b/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c
@@ -8,14 +8,6 @@
 
 __weak void *__dso_handle;
 
-int __cxa_atexit(void (*destructor)(void *), void *objptr, void *dso)
-{
-	ARG_UNUSED(destructor);
-	ARG_UNUSED(objptr);
-	ARG_UNUSED(dso);
-	return 0;
-}
-
 int atexit(void (*function)(void))
 {
 	return 0;
diff --git a/arch/arc/core/elf.c b/arch/arc/core/elf.c
index 9f9f1073431a0..db2a74e164ef3 100644
--- a/arch/arc/core/elf.c
+++ b/arch/arc/core/elf.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/llext/elf.h>
 #include <zephyr/llext/llext.h>
+#include <zephyr/llext/llext_internal.h>
 #include <zephyr/llext/loader.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
@@ -31,12 +32,32 @@ LOG_MODULE_REGISTER(elf, CONFIG_LLEXT_LOG_LEVEL);
  * https://github.com/foss-for-synopsys-dwc-arc-processors/arc-ABI-manual/blob/master/ARCv2_ABI.pdf
  * https://github.com/zephyrproject-rtos/binutils-gdb
  */
-int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc, uintptr_t sym_base_addr, const char *sym_name,
-		      uintptr_t load_bias)
+int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *rel,
+		      const elf_shdr_t *shdr)
 {
 	int ret = 0;
-	uint32_t insn = UNALIGNED_GET((uint32_t *)loc);
 	uint32_t value;
+	const uintptr_t loc = llext_get_reloc_instruction_location(ldr, ext, shdr->sh_info, rel);
+	uint32_t insn = UNALIGNED_GET((uint32_t *)loc);
+	elf_sym_t sym;
+	uintptr_t sym_base_addr;
+	const char *sym_name;
+
+	ret = llext_read_symbol(ldr, ext, rel, &sym);
+
+	if (ret != 0) {
+		LOG_ERR("Could not read symbol from binary!");
+		return ret;
+	}
+
+	sym_name = llext_symbol_name(ldr, ext, &sym);
+
+	ret = llext_lookup_symbol(ldr, ext, &sym_base_addr, rel, &sym, sym_name, shdr);
+
+	if (ret != 0) {
+		LOG_ERR("Could not find symbol %s!", sym_name);
+		return ret;
+	}
 
 	sym_base_addr += rel->r_addend;
 
diff --git a/arch/arm/core/cortex_a_r/Kconfig b/arch/arm/core/cortex_a_r/Kconfig
index 409968ca6c7cf..a6176bbe5c094 100644
--- a/arch/arm/core/cortex_a_r/Kconfig
+++ b/arch/arm/core/cortex_a_r/Kconfig
@@ -13,6 +13,15 @@
 # CPU_AARCH32_CORTEX_A / if CPU_AARCH32_CORTEX_R blocks so they are not
 # exposed if one selects a different ARM Cortex Family (Cortex-M).
 
+config CPU_CORTEX_A7
+	bool
+	select CPU_AARCH32_CORTEX_A
+	select ARMV7_A
+	select CPU_HAS_ICACHE
+	select CPU_HAS_DCACHE
+	help
+	  This option signifies the use of a Cortex-A7 CPU.
+
 config CPU_CORTEX_A9
 	bool
 	select CPU_AARCH32_CORTEX_A
@@ -82,6 +91,8 @@ config CPU_CORTEX_R5
 	select CPU_AARCH32_CORTEX_R
 	select ARMV7_R
 	select ARMV7_R_FP if CPU_HAS_FPU
+	select CPU_HAS_ICACHE
+	select CPU_HAS_DCACHE
 	help
 	  This option signifies the use of a Cortex-R5 CPU
 
diff --git a/arch/arm/core/cortex_a_r/cache.c b/arch/arm/core/cortex_a_r/cache.c
index 31cf27a08e645..07c5b32bf327e 100644
--- a/arch/arm/core/cortex_a_r/cache.c
+++ b/arch/arm/core/cortex_a_r/cache.c
@@ -208,7 +208,13 @@ int arch_icache_flush_range(void *start_addr, size_t size)
 
 int arch_icache_invd_range(void *start_addr, size_t size)
 {
-	return -ENOTSUP;
+	/* Cortex A/R do have the ICIMVAU operation to selectively invalidate
+	 * the instruction cache, but not currently supported by CMSIS.
+	 * For now, invalidate the entire cache.
+	 */
+	L1C_InvalidateICacheAll();
+
+	return 0;
 }
 
 int arch_icache_flush_and_invd_range(void *start_addr, size_t size)
diff --git a/arch/arm/core/cortex_a_r/exc.S b/arch/arm/core/cortex_a_r/exc.S
index 78414fcd0a193..ecf7bab57f091 100644
--- a/arch/arm/core/cortex_a_r/exc.S
+++ b/arch/arm/core/cortex_a_r/exc.S
@@ -237,6 +237,28 @@ SECTION_SUBSEC_FUNC(TEXT, __exc, z_arm_data_abort)
 	b z_arm_exc_exit
 
 #else
+
+GTEXT(z_arm_cortex_ar_exit_exc)
+SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_cortex_ar_exit_exc)
+
+	/* Note:
+	 * This function is expected to be *always* called with
+	 * processor mode set to MODE_SYS.
+	 */
+
+	/* decrement exception depth */
+	get_cpu r2
+	ldrb r1, [r2, #_cpu_offset_to_exc_depth]
+	sub r1, r1, #1
+	strb r1, [r2, #_cpu_offset_to_exc_depth]
+
+	/*
+	 * Restore r0-r3, r12, lr, lr_und and spsr_und from the exception stack
+	 * and return to the current thread.
+	 */
+	pop {r0-r3, r12, lr}
+	rfeia sp!
+
 /**
  * @brief Undefined instruction exception handler
  *
diff --git a/arch/arm/core/cortex_a_r/fault.c b/arch/arm/core/cortex_a_r/fault.c
index daf1d2345ca06..eac07cbf9b25b 100644
--- a/arch/arm/core/cortex_a_r/fault.c
+++ b/arch/arm/core/cortex_a_r/fault.c
@@ -100,6 +100,59 @@ static uint32_t dump_fault(uint32_t status, uint32_t addr)
 		reason = K_ERR_ARM_UNSUPPORTED_EXCLUSIVE_ACCESS_FAULT;
 		LOG_ERR("Unsupported Exclusive Access Fault @ 0x%08x", addr);
 		break;
+#elif defined(CONFIG_ARMV7_A)
+	case FSR_FS_PERMISSION_FAULT_2ND_LEVEL:
+		reason = K_ERR_ARM_PERMISSION_FAULT_2ND_LEVEL;
+		LOG_ERR("2nd Level Permission Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_ACCESS_FLAG_FAULT_1ST_LEVEL:
+		reason = K_ERR_ARM_ACCESS_FLAG_FAULT_1ST_LEVEL;
+		LOG_ERR("1st Level Access Flag Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_ACCESS_FLAG_FAULT_2ND_LEVEL:
+		reason = K_ERR_ARM_ACCESS_FLAG_FAULT_2ND_LEVEL;
+		LOG_ERR("2nd Level Access Flag Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_CACHE_MAINTENANCE_INSTRUCTION_FAULT:
+		reason = K_ERR_ARM_CACHE_MAINTENANCE_INSTRUCTION_FAULT;
+		LOG_ERR("Cache Maintenance Instruction Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_TRANSLATION_FAULT:
+		reason = K_ERR_ARM_TRANSLATION_FAULT;
+		LOG_ERR("1st Level Translation Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_TRANSLATION_FAULT_2ND_LEVEL:
+		reason = K_ERR_ARM_TRANSLATION_FAULT_2ND_LEVEL;
+		LOG_ERR("2nd Level Translation Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_DOMAIN_FAULT_1ST_LEVEL:
+		reason = K_ERR_ARM_DOMAIN_FAULT_1ST_LEVEL;
+		LOG_ERR("1st Level Domain Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_DOMAIN_FAULT_2ND_LEVEL:
+		reason = K_ERR_ARM_DOMAIN_FAULT_2ND_LEVEL;
+		LOG_ERR("2nd Level Domain Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_1ST_LEVEL:
+		reason = K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_1ST_LEVEL;
+		LOG_ERR("1st Level Synchronous External Abort Translation Table @ 0x%08x", addr);
+		break;
+	case FSR_FS_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL:
+		reason = K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL;
+		LOG_ERR("2nd Level Synchronous External Abort Translation Table @ 0x%08x", addr);
+		break;
+	case FSR_FS_TLB_CONFLICT_FAULT:
+		reason = K_ERR_ARM_TLB_CONFLICT_FAULT;
+		LOG_ERR("Table Conflict Fault @ 0x%08x", addr);
+		break;
+	case FSR_FS_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL:
+		reason = K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL;
+		LOG_ERR("1st Level Synchronous Parity Error Translation Table @ 0x%08x", addr);
+		break;
+	case FSR_FS_SYNC_PARITY_ERROR_TRANSLATION_TABLE_2ND_LEVEL:
+		reason = K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_2ND_LEVEL;
+		LOG_ERR("2nd Level Synchronous Parity Error Translation Table @ 0x%08x", addr);
+		break;
 #else
 	case FSR_FS_BACKGROUND_FAULT:
 		reason = K_ERR_ARM_BACKGROUND_FAULT;
diff --git a/arch/arm/core/cortex_a_r/irq_manage.c b/arch/arm/core/cortex_a_r/irq_manage.c
index 48c9ede3327bb..5303d1d71785e 100644
--- a/arch/arm/core/cortex_a_r/irq_manage.c
+++ b/arch/arm/core/cortex_a_r/irq_manage.c
@@ -33,6 +33,14 @@ extern void z_arm_reserved(void);
  * Generic Interrupt Controller (GIC) and therefore the architecture interrupt
  * control functions are mapped to the GIC driver interface.
  *
+ * When GIC is used together with other interrupt controller for
+ * multi-level interrupts support (i.e. CONFIG_MULTI_LEVEL_INTERRUPTS
+ * is enabled), the architecture interrupt control functions are mapped
+ * to the SoC layer in `include/arch/arm/irq.h`.
+ * The exported arm interrupt control functions which are wrappers of
+ * GIC control could be used for SoC to do level 1 irq control to implement SoC
+ * layer interrupt control functions.
+ *
  * When a custom interrupt controller is used (i.e.
  * CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER is enabled), the architecture
  * interrupt control functions are mapped to the SoC layer in
@@ -40,17 +48,17 @@ extern void z_arm_reserved(void);
  */
 
 #if !defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
-void arch_irq_enable(unsigned int irq)
+void arm_irq_enable(unsigned int irq)
 {
 	arm_gic_irq_enable(irq);
 }
 
-void arch_irq_disable(unsigned int irq)
+void arm_irq_disable(unsigned int irq)
 {
 	arm_gic_irq_disable(irq);
 }
 
-int arch_irq_is_enabled(unsigned int irq)
+int arm_irq_is_enabled(unsigned int irq)
 {
 	return arm_gic_irq_is_enabled(irq);
 }
@@ -65,10 +73,11 @@ int arch_irq_is_enabled(unsigned int irq)
  * priority levels which are reserved: three for various types of exceptions,
  * and possibly one additional to support zero latency interrupts.
  */
-void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
+void arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	arm_gic_irq_set_priority(irq, prio, flags);
 }
+
 #endif /* !CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
 
 void z_arm_fatal_error(unsigned int reason, const struct arch_esf *esf);
diff --git a/arch/arm/core/cortex_a_r/reboot.c b/arch/arm/core/cortex_a_r/reboot.c
index b5cea619f0932..d721baceda23c 100644
--- a/arch/arm/core/cortex_a_r/reboot.c
+++ b/arch/arm/core/cortex_a_r/reboot.c
@@ -28,16 +28,13 @@ static inline void relocate_vector_table(void)
 
 #else
 
-#if defined(__GNUC__)
 /*
  * GCC can detect if memcpy is passed a NULL argument, however one of
  * the cases of relocate_vector_table() it is valid to pass NULL, so we
  * suppress the warning for this case.  We need to do this before
  * string.h is included to get the declaration of memcpy.
  */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnonnull"
-#endif /* __GNUC__ */
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_NONNULL)
 
 #include <string.h>
 
@@ -53,9 +50,7 @@ void __weak relocate_vector_table(void)
 #endif
 }
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_NONNULL)
 
 #endif /* !CONFIG_AARCH32_ARMV8_R */
 
diff --git a/arch/arm/core/cortex_a_r/semihost.c b/arch/arm/core/cortex_a_r/semihost.c
index ff5e443759ba9..1467dbca3a4b2 100644
--- a/arch/arm/core/cortex_a_r/semihost.c
+++ b/arch/arm/core/cortex_a_r/semihost.c
@@ -19,10 +19,10 @@ long semihost_exec(enum semihost_instr instr, void *args)
 	register long ret __asm__ ("r0");
 
 	if (IS_ENABLED(CONFIG_ISA_THUMB2)) {
-		__asm__ __volatile__ ("svc 0xab"
+		__asm__ volatile ("svc 0xab"
 				      : "=r" (ret) : "r" (r0), "r" (r1) : "memory");
 	} else {
-		__asm__ __volatile__ ("svc 0x123456"
+		__asm__ volatile ("svc 0x123456"
 				      : "=r" (ret) : "r" (r0), "r" (r1) : "memory");
 	}
 	return ret;
diff --git a/arch/arm/core/cortex_a_r/swap_helper.S b/arch/arm/core/cortex_a_r/swap_helper.S
index a41e1ab5942fe..04b19f0b046b2 100644
--- a/arch/arm/core/cortex_a_r/swap_helper.S
+++ b/arch/arm/core/cortex_a_r/swap_helper.S
@@ -423,5 +423,9 @@ valid_syscall_id:
 
 GTEXT(z_arm_cortex_r_svc)
 SECTION_FUNC(TEXT, z_arm_cortex_r_svc)
+    .cfi_sections .debug_frame
+    .cfi_startproc simple
+    .cfi_def_cfa 13, 0x0
     svc #_SVC_CALL_CONTEXT_SWITCH
     bx lr
+    .cfi_endproc
diff --git a/arch/arm/core/cortex_a_r/vector_table.S b/arch/arm/core/cortex_a_r/vector_table.S
index e74b6a41c8d6b..d5d95272548fd 100644
--- a/arch/arm/core/cortex_a_r/vector_table.S
+++ b/arch/arm/core/cortex_a_r/vector_table.S
@@ -35,27 +35,3 @@ SECTION_SUBSEC_FUNC(exc_vector_table,_vector_table_section,_vector_table)
 #else
 	ldr pc,=z_irq_spurious
 #endif
-
-
-#ifdef CONFIG_USE_SWITCH
-GTEXT(z_arm_cortex_ar_exit_exc)
-SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_cortex_ar_exit_exc)
-
-	/* Note:
-	 * This function is expected to be *always* called with
-	 * processor mode set to MODE_SYS.
-	 */
-
-	/* decrement exception depth */
-	get_cpu r2
-	ldrb r1, [r2, #_cpu_offset_to_exc_depth]
-	sub r1, r1, #1
-	strb r1, [r2, #_cpu_offset_to_exc_depth]
-
-	/*
-	 * Restore r0-r3, r12, lr, lr_und and spsr_und from the exception stack
-	 * and return to the current thread.
-	 */
-	pop {r0-r3, r12, lr}
-	rfeia sp!
-#endif
diff --git a/arch/arm/core/cortex_m/cmse/arm_core_cmse.c b/arch/arm/core/cortex_m/cmse/arm_core_cmse.c
index aac96472ecf4f..163a9d0cdd205 100644
--- a/arch/arm/core/cortex_m/cmse/arm_core_cmse.c
+++ b/arch/arm/core/cortex_m/cmse/arm_core_cmse.c
@@ -9,7 +9,7 @@
 
 int arm_cmse_mpu_region_get(uint32_t addr)
 {
-	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
+	cmse_address_info_t addr_info = cmse_TT((void *)addr);
 
 	if (addr_info.flags.mpu_region_valid) {
 		return addr_info.flags.mpu_region;
@@ -40,8 +40,7 @@ int arm_cmse_addr_readwrite_ok(uint32_t addr, int force_npriv)
 	return arm_cmse_addr_read_write_ok(addr, force_npriv, 1);
 }
 
-static int arm_cmse_addr_range_read_write_ok(uint32_t addr, uint32_t size,
-	int force_npriv, int rw)
+static int arm_cmse_addr_range_read_write_ok(uint32_t addr, uint32_t size, int force_npriv, int rw)
 {
 	int flags = 0;
 
@@ -74,10 +73,10 @@ int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npr
 
 int arm_cmse_mpu_nonsecure_region_get(uint32_t addr)
 {
-	cmse_address_info_t addr_info =	cmse_TTA((void *)addr);
+	cmse_address_info_t addr_info = cmse_TTA((void *)addr);
 
 	if (addr_info.flags.mpu_region_valid) {
-		return  addr_info.flags.mpu_region;
+		return addr_info.flags.mpu_region;
 	}
 
 	return -EINVAL;
@@ -85,7 +84,7 @@ int arm_cmse_mpu_nonsecure_region_get(uint32_t addr)
 
 int arm_cmse_sau_region_get(uint32_t addr)
 {
-	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
+	cmse_address_info_t addr_info = cmse_TT((void *)addr);
 
 	if (addr_info.flags.sau_region_valid) {
 		return addr_info.flags.sau_region;
@@ -96,7 +95,7 @@ int arm_cmse_sau_region_get(uint32_t addr)
 
 int arm_cmse_idau_region_get(uint32_t addr)
 {
-	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
+	cmse_address_info_t addr_info = cmse_TT((void *)addr);
 
 	if (addr_info.flags.idau_region_valid) {
 		return addr_info.flags.idau_region;
@@ -107,13 +106,12 @@ int arm_cmse_idau_region_get(uint32_t addr)
 
 int arm_cmse_addr_is_secure(uint32_t addr)
 {
-	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
+	cmse_address_info_t addr_info = cmse_TT((void *)addr);
 
 	return addr_info.flags.secure;
 }
 
-static int arm_cmse_addr_nonsecure_read_write_ok(uint32_t addr,
-	int force_npriv, int rw)
+static int arm_cmse_addr_nonsecure_read_write_ok(uint32_t addr, int force_npriv, int rw)
 {
 	cmse_address_info_t addr_info;
 	if (force_npriv) {
@@ -122,8 +120,7 @@ static int arm_cmse_addr_nonsecure_read_write_ok(uint32_t addr,
 		addr_info = cmse_TTA((void *)addr);
 	}
 
-	return rw ? addr_info.flags.nonsecure_readwrite_ok :
-		addr_info.flags.nonsecure_read_ok;
+	return rw ? addr_info.flags.nonsecure_readwrite_ok : addr_info.flags.nonsecure_read_ok;
 }
 
 int arm_cmse_addr_nonsecure_read_ok(uint32_t addr, int force_npriv)
@@ -137,7 +134,7 @@ int arm_cmse_addr_nonsecure_readwrite_ok(uint32_t addr, int force_npriv)
 }
 
 static int arm_cmse_addr_range_nonsecure_read_write_ok(uint32_t addr, uint32_t size,
-	int force_npriv, int rw)
+						       int force_npriv, int rw)
 {
 	int flags = CMSE_NONSECURE;
 
@@ -156,18 +153,14 @@ static int arm_cmse_addr_range_nonsecure_read_write_ok(uint32_t addr, uint32_t s
 	}
 }
 
-int arm_cmse_addr_range_nonsecure_read_ok(uint32_t addr, uint32_t size,
-	int force_npriv)
+int arm_cmse_addr_range_nonsecure_read_ok(uint32_t addr, uint32_t size, int force_npriv)
 {
-	return arm_cmse_addr_range_nonsecure_read_write_ok(addr, size,
-		force_npriv, 0);
+	return arm_cmse_addr_range_nonsecure_read_write_ok(addr, size, force_npriv, 0);
 }
 
-int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
-	int force_npriv)
+int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size, int force_npriv)
 {
-	return arm_cmse_addr_range_nonsecure_read_write_ok(addr, size,
-		force_npriv, 1);
+	return arm_cmse_addr_range_nonsecure_read_write_ok(addr, size, force_npriv, 1);
 }
 
 #endif /* CONFIG_ARM_SECURE_FIRMWARE */
diff --git a/arch/arm/core/cortex_m/coredump.c b/arch/arm/core/cortex_m/coredump.c
index c688c91d9819d..ddb539c4e34ef 100644
--- a/arch/arm/core/cortex_m/coredump.c
+++ b/arch/arm/core/cortex_m/coredump.c
@@ -7,31 +7,31 @@
 #include <string.h>
 #include <zephyr/debug/coredump.h>
 
-#define ARCH_HDR_VER			2
+#define ARCH_HDR_VER 2
 
 uint32_t z_arm_coredump_fault_sp;
 
 struct arm_arch_block {
 	struct {
-		uint32_t	r0;
-		uint32_t	r1;
-		uint32_t	r2;
-		uint32_t	r3;
-		uint32_t	r12;
-		uint32_t	lr;
-		uint32_t	pc;
-		uint32_t	xpsr;
-		uint32_t	sp;
+		uint32_t r0;
+		uint32_t r1;
+		uint32_t r2;
+		uint32_t r3;
+		uint32_t r12;
+		uint32_t lr;
+		uint32_t pc;
+		uint32_t xpsr;
+		uint32_t sp;
 
 		/* callee registers - optionally collected in V2 */
-		uint32_t	r4;
-		uint32_t	r5;
-		uint32_t	r6;
-		uint32_t	r7;
-		uint32_t	r8;
-		uint32_t	r9;
-		uint32_t	r10;
-		uint32_t	r11;
+		uint32_t r4;
+		uint32_t r5;
+		uint32_t r6;
+		uint32_t r7;
+		uint32_t r8;
+		uint32_t r9;
+		uint32_t r10;
+		uint32_t r11;
 	} r;
 } __packed;
 
@@ -76,12 +76,12 @@ void arch_coredump_info_dump(const struct arch_esf *esf)
 
 #if defined(CONFIG_EXTRA_EXCEPTION_INFO)
 	if (esf->extra_info.callee) {
-		arch_blk.r.r4  = esf->extra_info.callee->v1;
-		arch_blk.r.r5  = esf->extra_info.callee->v2;
-		arch_blk.r.r6  = esf->extra_info.callee->v3;
-		arch_blk.r.r7  = esf->extra_info.callee->v4;
-		arch_blk.r.r8  = esf->extra_info.callee->v5;
-		arch_blk.r.r9  = esf->extra_info.callee->v6;
+		arch_blk.r.r4 = esf->extra_info.callee->v1;
+		arch_blk.r.r5 = esf->extra_info.callee->v2;
+		arch_blk.r.r6 = esf->extra_info.callee->v3;
+		arch_blk.r.r7 = esf->extra_info.callee->v4;
+		arch_blk.r.r8 = esf->extra_info.callee->v5;
+		arch_blk.r.r9 = esf->extra_info.callee->v6;
 		arch_blk.r.r10 = esf->extra_info.callee->v7;
 		arch_blk.r.r11 = esf->extra_info.callee->v8;
 	}
diff --git a/arch/arm/core/cortex_m/cpu_idle.c b/arch/arm/core/cortex_m/cpu_idle.c
index 5f373a88c9d55..47eff95090a8d 100644
--- a/arch/arm/core/cortex_m/cpu_idle.c
+++ b/arch/arm/core/cortex_m/cpu_idle.c
@@ -30,27 +30,31 @@ void z_arm_cpu_idle_init(void)
 #if defined(CONFIG_ARM_ON_EXIT_CPU_IDLE)
 #define ON_EXIT_IDLE_HOOK SOC_ON_EXIT_CPU_IDLE
 #else
-#define ON_EXIT_IDLE_HOOK do {} while (false)
+#define ON_EXIT_IDLE_HOOK                                                                          \
+	do {                                                                                       \
+	} while (false)
 #endif
 
 #if defined(CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK)
-#define SLEEP_IF_ALLOWED(wait_instr) do { \
-	/* Skip the wait instr if on_enter_cpu_idle returns false */ \
-	if (z_arm_on_enter_cpu_idle()) { \
-		/* Wait for all memory transaction to complete */ \
-		/* before entering low power state. */ \
-		__DSB(); \
-		wait_instr(); \
-		/* Inline the macro provided by SoC-specific code */ \
-		ON_EXIT_IDLE_HOOK; \
-	} \
-} while (false)
+#define SLEEP_IF_ALLOWED(wait_instr)                                                               \
+	do {                                                                                       \
+		/* Skip the wait instr if on_enter_cpu_idle returns false */                       \
+		if (z_arm_on_enter_cpu_idle()) {                                                   \
+			/* Wait for all memory transaction to complete */                          \
+			/* before entering low power state. */                                     \
+			__DSB();                                                                   \
+			wait_instr();                                                              \
+			/* Inline the macro provided by SoC-specific code */                       \
+			ON_EXIT_IDLE_HOOK;                                                         \
+		}                                                                                  \
+	} while (false)
 #else
-#define SLEEP_IF_ALLOWED(wait_instr) do { \
-	__DSB(); \
-	wait_instr(); \
-	ON_EXIT_IDLE_HOOK; \
-} while (false)
+#define SLEEP_IF_ALLOWED(wait_instr)                                                               \
+	do {                                                                                       \
+		__DSB();                                                                           \
+		wait_instr();                                                                      \
+		ON_EXIT_IDLE_HOOK;                                                                 \
+	} while (false)
 #endif
 
 #ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
@@ -94,6 +98,9 @@ void arch_cpu_idle(void)
 
 	SLEEP_IF_ALLOWED(__WFI);
 
+#if defined(CONFIG_TRACING)
+	sys_trace_idle_exit();
+#endif
 	__enable_irq();
 	__ISB();
 }
@@ -133,6 +140,10 @@ void arch_cpu_atomic_idle(unsigned int key)
 
 	SLEEP_IF_ALLOWED(__WFE);
 
+#if defined(CONFIG_TRACING)
+	sys_trace_idle_exit();
+#endif
+
 	arch_irq_unlock(key);
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 	__enable_irq();
diff --git a/arch/arm/core/cortex_m/debug.c b/arch/arm/core/cortex_m/debug.c
index 61fb681453507..47141d913dd14 100644
--- a/arch/arm/core/cortex_m/debug.c
+++ b/arch/arm/core/cortex_m/debug.c
@@ -35,7 +35,7 @@ bool z_arm_debug_monitor_event_error_check(void)
 			printk("Null-pointer exception?\n");
 		}
 		__ASSERT((DWT->FUNCTION0 & DWT_FUNCTION_MATCHED_Msk) == 0,
-			"MATCHED flag should have been cleared on read.");
+			 "MATCHED flag should have been cleared on read.");
 
 		return true;
 	}
@@ -55,8 +55,8 @@ bool z_arm_debug_monitor_event_error_check(void)
  * so we add a build assert that catches it.
  */
 BUILD_ASSERT(!(CONFIG_CORTEX_M_NULL_POINTER_EXCEPTION_PAGE_SIZE &
-	(CONFIG_CORTEX_M_NULL_POINTER_EXCEPTION_PAGE_SIZE - 1)),
-	"the size of the partition must be power of 2");
+	       (CONFIG_CORTEX_M_NULL_POINTER_EXCEPTION_PAGE_SIZE - 1)),
+	     "the size of the partition must be power of 2");
 
 int z_arm_debug_enable_null_pointer_detection(void)
 {
@@ -81,20 +81,12 @@ int z_arm_debug_enable_null_pointer_detection(void)
 	DWT->COMP0 = 0;
 	DWT->COMP1 = CONFIG_CORTEX_M_NULL_POINTER_EXCEPTION_PAGE_SIZE - 1;
 
-	DWT->FUNCTION0 =
-		((0x4 << DWT_FUNCTION_MATCH_Pos) & DWT_FUNCTION_MATCH_Msk)
-		|
-		((0x1 << DWT_FUNCTION_ACTION_Pos) & DWT_FUNCTION_ACTION_Msk)
-		|
-		((0x0 << DWT_FUNCTION_DATAVSIZE_Pos) & DWT_FUNCTION_DATAVSIZE_Msk)
-		;
-	DWT->FUNCTION1 =
-		((0x7 << DWT_FUNCTION_MATCH_Pos) & DWT_FUNCTION_MATCH_Msk)
-		|
-		((0x1 << DWT_FUNCTION_ACTION_Pos) & DWT_FUNCTION_ACTION_Msk)
-		|
-		((0x0 << DWT_FUNCTION_DATAVSIZE_Pos) & DWT_FUNCTION_DATAVSIZE_Msk)
-		;
+	DWT->FUNCTION0 = ((0x4 << DWT_FUNCTION_MATCH_Pos) & DWT_FUNCTION_MATCH_Msk) |
+			 ((0x1 << DWT_FUNCTION_ACTION_Pos) & DWT_FUNCTION_ACTION_Msk) |
+			 ((0x0 << DWT_FUNCTION_DATAVSIZE_Pos) & DWT_FUNCTION_DATAVSIZE_Msk);
+	DWT->FUNCTION1 = ((0x7 << DWT_FUNCTION_MATCH_Pos) & DWT_FUNCTION_MATCH_Msk) |
+			 ((0x1 << DWT_FUNCTION_ACTION_Pos) & DWT_FUNCTION_ACTION_Msk) |
+			 ((0x0 << DWT_FUNCTION_DATAVSIZE_Pos) & DWT_FUNCTION_DATAVSIZE_Msk);
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 
 	/* ASSERT that we have the comparator needed for the implementation */
@@ -106,13 +98,10 @@ int z_arm_debug_enable_null_pointer_detection(void)
 	/* Use comparator 0, R/W access check */
 	DWT->COMP0 = 0;
 
-	DWT->FUNCTION0 = (0x7 << DWT_FUNCTION_FUNCTION_Pos) &
-		DWT_FUNCTION_FUNCTION_Msk;
-
+	DWT->FUNCTION0 = (0x7 << DWT_FUNCTION_FUNCTION_Pos) & DWT_FUNCTION_FUNCTION_Msk;
 
 	/* Set mask according to the desired size */
-	DWT->MASK0 = 32 - __builtin_clzl(
-		CONFIG_CORTEX_M_NULL_POINTER_EXCEPTION_PAGE_SIZE - 1);
+	DWT->MASK0 = 32 - __builtin_clzl(CONFIG_CORTEX_M_NULL_POINTER_EXCEPTION_PAGE_SIZE - 1);
 #endif
 
 	return 0;
diff --git a/arch/arm/core/cortex_m/fault.c b/arch/arm/core/cortex_m/fault.c
index 56d5be60f4cc0..27ce260dad535 100644
--- a/arch/arm/core/cortex_m/fault.c
+++ b/arch/arm/core/cortex_m/fault.c
@@ -22,7 +22,7 @@
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #if defined(CONFIG_PRINTK) || defined(CONFIG_LOG)
-#define PR_EXC(...) LOG_ERR(__VA_ARGS__)
+#define PR_EXC(...)              LOG_ERR(__VA_ARGS__)
 #define STORE_xFAR(reg_var, reg) uint32_t reg_var = (uint32_t)reg
 #else
 #define PR_EXC(...)
@@ -36,8 +36,8 @@ LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 #endif
 
 #if defined(CONFIG_ARM_MPU) && defined(CONFIG_CPU_HAS_NXP_SYSMPU)
-#define EMN(edr)   (((edr) & SYSMPU_EDR_EMN_MASK) >> SYSMPU_EDR_EMN_SHIFT)
-#define EACD(edr)  (((edr) & SYSMPU_EDR_EACD_MASK) >> SYSMPU_EDR_EACD_SHIFT)
+#define EMN(edr)  (((edr) & SYSMPU_EDR_EMN_MASK) >> SYSMPU_EDR_EMN_SHIFT)
+#define EACD(edr) (((edr) & SYSMPU_EDR_EACD_MASK) >> SYSMPU_EDR_EACD_SHIFT)
 #endif
 
 /* Integrity signature for an ARMv8-M implementation */
@@ -54,15 +54,12 @@ LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 /* helpers to access memory/bus/usage faults */
-#define SCB_CFSR_MEMFAULTSR \
-	(uint32_t)((SCB->CFSR & SCB_CFSR_MEMFAULTSR_Msk) \
-		   >> SCB_CFSR_MEMFAULTSR_Pos)
-#define SCB_CFSR_BUSFAULTSR \
-	(uint32_t)((SCB->CFSR & SCB_CFSR_BUSFAULTSR_Msk) \
-		   >> SCB_CFSR_BUSFAULTSR_Pos)
-#define SCB_CFSR_USGFAULTSR \
-	(uint32_t)((SCB->CFSR & SCB_CFSR_USGFAULTSR_Msk) \
-		   >> SCB_CFSR_USGFAULTSR_Pos)
+#define SCB_CFSR_MEMFAULTSR                                                                        \
+	(uint32_t)((SCB->CFSR & SCB_CFSR_MEMFAULTSR_Msk) >> SCB_CFSR_MEMFAULTSR_Pos)
+#define SCB_CFSR_BUSFAULTSR                                                                        \
+	(uint32_t)((SCB->CFSR & SCB_CFSR_BUSFAULTSR_Msk) >> SCB_CFSR_BUSFAULTSR_Pos)
+#define SCB_CFSR_USGFAULTSR                                                                        \
+	(uint32_t)((SCB->CFSR & SCB_CFSR_USGFAULTSR_Msk) >> SCB_CFSR_USGFAULTSR_Pos)
 #endif /* CONFIG_ARMV7_M_ARMV8_M_MAINLINE */
 
 /**
@@ -103,8 +100,8 @@ static void fault_show(const struct arch_esf *esf, int fault)
 	PR_EXC("Fault! EXC #%d", fault);
 
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	PR_EXC("MMFSR: 0x%x, BFSR: 0x%x, UFSR: 0x%x", SCB_CFSR_MEMFAULTSR,
-	       SCB_CFSR_BUSFAULTSR, SCB_CFSR_USGFAULTSR);
+	PR_EXC("MMFSR: 0x%x, BFSR: 0x%x, UFSR: 0x%x", SCB_CFSR_MEMFAULTSR, SCB_CFSR_BUSFAULTSR,
+	       SCB_CFSR_USGFAULTSR);
 #if defined(CONFIG_ARM_SECURE_FIRMWARE)
 	PR_EXC("SFSR: 0x%x", SAU->SFSR);
 #endif /* CONFIG_ARM_SECURE_FIRMWARE */
@@ -127,9 +124,7 @@ static void fault_show(const struct arch_esf *esf, int fault)
 #ifdef CONFIG_USERSPACE
 Z_EXC_DECLARE(z_arm_user_string_nlen);
 
-static const struct z_exc_handle exceptions[] = {
-	Z_EXC_HANDLE(z_arm_user_string_nlen)
-};
+static const struct z_exc_handle exceptions[] = {Z_EXC_HANDLE(z_arm_user_string_nlen)};
 #endif
 
 /* Perform an assessment whether an MPU fault shall be
@@ -146,12 +141,12 @@ static bool memory_fault_recoverable(struct arch_esf *esf, bool synchronous)
 		uint32_t end = (uint32_t)exceptions[i].end & ~0x1U;
 
 #if defined(CONFIG_NULL_POINTER_EXCEPTION_DETECTION_DWT)
-	/* Non-synchronous exceptions (e.g. DebugMonitor) may have
-	 * allowed PC to continue to the next instruction.
-	 */
-	end += (synchronous) ? 0x0 : 0x4;
+		/* Non-synchronous exceptions (e.g. DebugMonitor) may have
+		 * allowed PC to continue to the next instruction.
+		 */
+		end += (synchronous) ? 0x0 : 0x4;
 #else
-	ARG_UNUSED(synchronous);
+		ARG_UNUSED(synchronous);
 #endif
 		if (esf->basic.pc >= start && esf->basic.pc < end) {
 			esf->basic.pc = (uint32_t)(exceptions[i].fixup);
@@ -168,8 +163,7 @@ static bool memory_fault_recoverable(struct arch_esf *esf, bool synchronous)
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 
 #if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
-uint32_t z_check_thread_stack_fail(const uint32_t fault_addr,
-	const uint32_t psp);
+uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp);
 #endif /* CONFIG_MPU_STACK_GUARD || defined(CONFIG_USERSPACE) */
 
 /**
@@ -180,8 +174,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr,
  *
  * @return error code to identify the fatal error reason
  */
-static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
-			      bool *recoverable)
+static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault, bool *recoverable)
 {
 	uint32_t reason = K_ERR_ARM_MEM_GENERIC;
 	uint32_t mmfar = -EINVAL;
@@ -191,7 +184,7 @@ static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
 	if ((SCB->CFSR & SCB_CFSR_MSTKERR_Msk) != 0) {
 		reason = K_ERR_ARM_MEM_STACKING;
 		PR_FAULT_INFO("  Stacking error (context area might be"
-			" not valid)");
+			      " not valid)");
 	}
 	if ((SCB->CFSR & SCB_CFSR_MUNSTKERR_Msk) != 0) {
 		reason = K_ERR_ARM_MEM_UNSTACKING;
@@ -226,8 +219,7 @@ static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
 #if defined(CONFIG_ARMV7_M_ARMV8_M_FP)
 	if ((SCB->CFSR & SCB_CFSR_MLSPERR_Msk) != 0) {
 		reason = K_ERR_ARM_MEM_FP_LAZY_STATE_PRESERVATION;
-		PR_FAULT_INFO(
-			"  Floating-point lazy state preservation error");
+		PR_FAULT_INFO("  Floating-point lazy state preservation error");
 	}
 #endif /* CONFIG_ARMV7_M_ARMV8_M_FP */
 
@@ -244,8 +236,7 @@ static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
 	 * Data Access Violation errors may or may not be caused by
 	 * thread stack overflows.
 	 */
-	if ((SCB->CFSR & SCB_CFSR_MSTKERR_Msk) ||
-		(SCB->CFSR & SCB_CFSR_DACCVIOL_Msk)) {
+	if ((SCB->CFSR & SCB_CFSR_MSTKERR_Msk) || (SCB->CFSR & SCB_CFSR_DACCVIOL_Msk)) {
 #if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
 		/* MemManage Faults are always banked between security
 		 * states. Therefore, we can safely assume the fault
@@ -265,8 +256,8 @@ static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
 		 * handle the case of 'mmfar' holding the -EINVAL value.
 		 */
 		if (SCB->ICSR & SCB_ICSR_RETTOBASE_Msk) {
-			uint32_t min_stack_ptr = z_check_thread_stack_fail(mmfar,
-				((uint32_t) &esf[0]));
+			uint32_t min_stack_ptr =
+				z_check_thread_stack_fail(mmfar, ((uint32_t)&esf[0]));
 
 			if (min_stack_ptr) {
 				/* When MemManage Stacking Error has occurred,
@@ -299,14 +290,14 @@ static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
 				reason = K_ERR_STACK_CHK_FAIL;
 			} else {
 				__ASSERT(!(SCB->CFSR & SCB_CFSR_MSTKERR_Msk),
-					"Stacking error not a stack fail\n");
+					 "Stacking error not a stack fail\n");
 			}
 		}
 #else
-	(void)mmfar;
-	__ASSERT(!(SCB->CFSR & SCB_CFSR_MSTKERR_Msk),
-		"Stacking or Data Access Violation error "
-		"without stack guard, user-mode or null-pointer detection\n");
+		(void)mmfar;
+		__ASSERT(!(SCB->CFSR & SCB_CFSR_MSTKERR_Msk),
+			 "Stacking or Data Access Violation error "
+			 "without stack guard, user-mode or null-pointer detection\n");
 #endif /* CONFIG_MPU_STACK_GUARD || CONFIG_USERSPACE */
 	}
 
@@ -408,13 +399,10 @@ static int bus_fault(struct arch_esf *esf, int from_hard_fault, bool *recoverabl
 
 			PR_FAULT_INFO("  NXP MPU error, port %d", i);
 			PR_FAULT_INFO("    Mode: %s, %s Address: 0x%x",
-			       edr & BIT(2) ? "Supervisor" : "User",
-			       edr & BIT(1) ? "Data" : "Instruction",
-			       ear);
-			PR_FAULT_INFO(
-					"    Type: %s, Master: %d, Regions: 0x%x",
-			       edr & BIT(0) ? "Write" : "Read",
-			       EMN(edr), EACD(edr));
+				      edr & BIT(2) ? "Supervisor" : "User",
+				      edr & BIT(1) ? "Data" : "Instruction", ear);
+			PR_FAULT_INFO("    Type: %s, Master: %d, Regions: 0x%x",
+				      edr & BIT(0) ? "Write" : "Read", EMN(edr), EACD(edr));
 
 			/* When stack protection is enabled, we need to assess
 			 * if the memory violation error is a stack corruption.
@@ -437,8 +425,7 @@ static int bus_fault(struct arch_esf *esf, int from_hard_fault, bool *recoverabl
 				 */
 				if (SCB->ICSR & SCB_ICSR_RETTOBASE_Msk) {
 					uint32_t min_stack_ptr =
-						z_check_thread_stack_fail(ear,
-							((uint32_t) &esf[0]));
+						z_check_thread_stack_fail(ear, ((uint32_t)&esf[0]));
 
 					if (min_stack_ptr) {
 						/* When BusFault Stacking Error
@@ -468,16 +455,14 @@ static int bus_fault(struct arch_esf *esf, int from_hard_fault, bool *recoverabl
 						 */
 						__set_PSP(min_stack_ptr);
 
-						reason =
-							K_ERR_STACK_CHK_FAIL;
+						reason = K_ERR_STACK_CHK_FAIL;
 						break;
 					}
 				}
 #else
 				(void)ear;
 				__ASSERT(0,
-					"Stacking error without stack guard"
-					"or User-mode support");
+					 "Stacking error without stack guard or User-mode support");
 #endif /* CONFIG_MPU_STACK_GUARD || CONFIG_USERSPACE */
 			}
 		}
@@ -617,8 +602,7 @@ static void debug_monitor(struct arch_esf *esf, bool *recoverable)
 {
 	*recoverable = false;
 
-	PR_FAULT_INFO(
-		"***** Debug monitor exception *****");
+	PR_FAULT_INFO("***** Debug monitor exception *****");
 
 #if defined(CONFIG_NULL_POINTER_EXCEPTION_DETECTION_DWT)
 	if (!z_arm_debug_monitor_event_error_check()) {
@@ -675,7 +659,7 @@ static inline bool z_arm_is_synchronous_svc(struct arch_esf *esf)
 #endif /* ARMV6_M_ARMV8_M_BASELINE && !ARMV8_M_BASELINE */
 
 	if (((fault_insn & 0xff00) == _SVC_OPCODE) &&
-		((fault_insn & 0x00ff) == _SVC_CALL_RUNTIME_EXCEPT)) {
+	    ((fault_insn & 0x00ff) == _SVC_CALL_RUNTIME_EXCEPT)) {
 		return true;
 	}
 #undef _SVC_OPCODE
@@ -759,13 +743,11 @@ static uint32_t hard_fault(struct arch_esf *esf, bool *recoverable)
 			reason = secure_fault(esf);
 #endif /* CONFIG_ARM_SECURE_FIRMWARE */
 		} else {
-			__ASSERT(0,
-			"Fault escalation without FSR info");
+			__ASSERT(0, "Fault escalation without FSR info");
 		}
 	} else {
-		__ASSERT(0,
-		"HardFault without HFSR info"
-		" Shall never occur");
+		__ASSERT(0, "HardFault without HFSR info"
+			    " Shall never occur");
 	}
 #else
 #error Unknown ARM architecture
@@ -786,8 +768,7 @@ static void reserved_exception(const struct arch_esf *esf, int fault)
 	ARG_UNUSED(esf);
 
 	PR_FAULT_INFO("***** %s %d) *****",
-	       fault < 16 ? "Reserved Exception (" : "Spurious interrupt (IRQ ",
-	       fault - 16);
+		      fault < 16 ? "Reserved Exception (" : "Spurious interrupt (IRQ ", fault - 16);
 }
 
 /* Handler function for ARM fault conditions. */
@@ -802,7 +783,7 @@ static uint32_t fault_handle(struct arch_esf *esf, int fault, bool *recoverable)
 		reason = hard_fault(esf, recoverable);
 		break;
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
-	/* HardFault is raised for all fault conditions on ARMv6-M. */
+		/* HardFault is raised for all fault conditions on ARMv6-M. */
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 	case 4:
 		reason = mem_manage_fault(esf, 0, recoverable);
@@ -860,7 +841,7 @@ static void secure_stack_dump(const struct arch_esf *secure_esf)
 	uint32_t sec_ret_addr;
 #if defined(CONFIG_ARMV7_M_ARMV8_M_FP)
 	if ((*top_of_sec_stack == INTEGRITY_SIGNATURE_STD) ||
-		(*top_of_sec_stack == INTEGRITY_SIGNATURE_EXT)) {
+	    (*top_of_sec_stack == INTEGRITY_SIGNATURE_EXT)) {
 #else
 	if (*top_of_sec_stack == INTEGRITY_SIGNATURE) {
 #endif /* CONFIG_ARMV7_M_ARMV8_M_FP */
@@ -879,7 +860,6 @@ static void secure_stack_dump(const struct arch_esf *secure_esf)
 		sec_ret_addr = *top_of_sec_stack;
 	}
 	PR_FAULT_INFO("  S instruction address:  0x%x", sec_ret_addr);
-
 }
 #define SECURE_STACK_DUMP(esf) secure_stack_dump(esf)
 #else
@@ -900,15 +880,14 @@ static void secure_stack_dump(const struct arch_esf *secure_esf)
  * @return ESF pointer on success, otherwise return NULL
  */
 static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_return,
-	bool *nested_exc)
+				       bool *nested_exc)
 {
 	bool alternative_state_exc = false;
 	struct arch_esf *ptr_esf = NULL;
 
 	*nested_exc = false;
 
-	if ((exc_return & EXC_RETURN_INDICATOR_PREFIX) !=
-			EXC_RETURN_INDICATOR_PREFIX) {
+	if ((exc_return & EXC_RETURN_INDICATOR_PREFIX) != EXC_RETURN_INDICATOR_PREFIX) {
 		/* Invalid EXC_RETURN value. This is a fatal error. */
 		return NULL;
 	}
@@ -988,8 +967,7 @@ static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_
 	/* The processor has a single execution state.
 	 * We verify that the Thread mode is using PSP.
 	 */
-	if ((exc_return & EXC_RETURN_MODE_THREAD) &&
-		(!(exc_return & EXC_RETURN_SPSEL_PROCESS))) {
+	if ((exc_return & EXC_RETURN_MODE_THREAD) && (!(exc_return & EXC_RETURN_SPSEL_PROCESS))) {
 		PR_EXC("SPSEL in thread mode does not indicate PSP");
 		return NULL;
 	}
@@ -998,7 +976,7 @@ static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_
 	if (!alternative_state_exc) {
 		if (exc_return & EXC_RETURN_MODE_THREAD) {
 			/* Returning to thread mode */
-			ptr_esf =  (struct arch_esf *)psp;
+			ptr_esf = (struct arch_esf *)psp;
 
 		} else {
 			/* Returning to handler mode */
@@ -1041,8 +1019,7 @@ static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_
  * @param callee_regs Callee-saved registers (R4-R11, PSP)
  *
  */
-void z_arm_fault(uint32_t msp, uint32_t psp, uint32_t exc_return,
-	_callee_saved_t *callee_regs)
+void z_arm_fault(uint32_t msp, uint32_t psp, uint32_t exc_return, _callee_saved_t *callee_regs)
 {
 	uint32_t reason = K_ERR_CPU_EXCEPTION;
 	int fault = SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk;
@@ -1060,9 +1037,8 @@ void z_arm_fault(uint32_t msp, uint32_t psp, uint32_t exc_return,
 	/* Retrieve the Exception Stack Frame (ESF) to be supplied
 	 * as argument to the remainder of the fault handling process.
 	 */
-	 esf = get_esf(msp, psp, exc_return, &nested_exc);
-	__ASSERT(esf != NULL,
-		"ESF could not be retrieved successfully. Shall never occur.");
+	esf = get_esf(msp, psp, exc_return, &nested_exc);
+	__ASSERT(esf != NULL, "ESF could not be retrieved successfully. Shall never occur.");
 
 	z_arm_set_fault_sp(esf, exc_return);
 
@@ -1080,11 +1056,8 @@ void z_arm_fault(uint32_t msp, uint32_t psp, uint32_t exc_return,
 	 * so we only copy the fields before those.
 	 */
 	memcpy(&esf_copy, esf, offsetof(struct arch_esf, extra_info));
-	esf_copy.extra_info = (struct __extra_esf_info) {
-		.callee = callee_regs,
-		.exc_return = exc_return,
-		.msp = msp
-	};
+	esf_copy.extra_info = (struct __extra_esf_info){
+		.callee = callee_regs, .exc_return = exc_return, .msp = msp};
 #endif /* CONFIG_EXTRA_EXCEPTION_INFO */
 
 	/* Overwrite stacked IPSR to mark a nested exception,
diff --git a/arch/arm/core/cortex_m/fpu.c b/arch/arm/core/cortex_m/fpu.c
index a9c964d14d1a7..b937d725c2834 100644
--- a/arch/arm/core/cortex_m/fpu.c
+++ b/arch/arm/core/cortex_m/fpu.c
@@ -23,11 +23,10 @@ void z_arm_save_fp_context(struct fpu_ctx_full *buffer)
 
 	if (CONTROL & CONTROL_FPCA_Msk) {
 		/* Store caller-saved and callee-saved FP registers. */
-		__asm__ volatile(
-			"vstmia %0, {s0-s15}\n"
-			"vstmia %1, {s16-s31}\n"
-			:: "r" (buffer->caller_saved), "r" (buffer->callee_saved) :
-		);
+		__asm__ volatile("vstmia %0, {s0-s15}\n"
+				 "vstmia %1, {s16-s31}\n" ::"r"(buffer->caller_saved),
+				 "r"(buffer->callee_saved)
+				 :);
 
 		buffer->fpscr = __get_FPSCR();
 		buffer->ctx_saved = true;
@@ -55,11 +54,10 @@ void z_arm_restore_fp_context(const struct fpu_ctx_full *buffer)
 		/* Restore FP state. */
 		__set_FPSCR(buffer->fpscr);
 
-		__asm__ volatile(
-			"vldmia %0, {s0-s15}\n"
-			"vldmia %1, {s16-s31}\n"
-			:: "r" (buffer->caller_saved), "r" (buffer->callee_saved) :
-		);
+		__asm__ volatile("vldmia %0, {s0-s15}\n"
+				 "vldmia %1, {s16-s31}\n" ::"r"(buffer->caller_saved),
+				 "r"(buffer->callee_saved)
+				 :);
 	}
 #endif
 }
diff --git a/arch/arm/core/cortex_m/irq_init.c b/arch/arm/core/cortex_m/irq_init.c
index b6b128e3368ff..edd1f519677cb 100644
--- a/arch/arm/core/cortex_m/irq_init.c
+++ b/arch/arm/core/cortex_m/irq_init.c
@@ -27,7 +27,12 @@ void z_arm_interrupt_init(void)
 {
 	int irq = 0;
 
+/* CONFIG_2ND_LVL_ISR_TBL_OFFSET could be treated as total number of level1 interrupts */
+#if defined(CONFIG_MULTI_LEVEL_INTERRUPTS) && defined(CONFIG_2ND_LVL_ISR_TBL_OFFSET)
+	for (; irq < CONFIG_2ND_LVL_ISR_TBL_OFFSET; irq++) {
+#else
 	for (; irq < CONFIG_NUM_IRQS; irq++) {
+#endif
 		NVIC_SetPriority((IRQn_Type)irq, _IRQ_PRIO_OFFSET);
 	}
 }
diff --git a/arch/arm/core/cortex_m/irq_manage.c b/arch/arm/core/cortex_m/irq_manage.c
index cc62386e8acad..6d1c8917c4dce 100644
--- a/arch/arm/core/cortex_m/irq_manage.c
+++ b/arch/arm/core/cortex_m/irq_manage.c
@@ -28,23 +28,42 @@
 
 extern void z_arm_reserved(void);
 
-#define NUM_IRQS_PER_REG 32
+#define NUM_IRQS_PER_REG  32
 #define REG_FROM_IRQ(irq) (irq / NUM_IRQS_PER_REG)
 #define BIT_FROM_IRQ(irq) (irq % NUM_IRQS_PER_REG)
 
+/*
+ * For Cortex-M core, the default interrupt controller is the ARM
+ * NVIC and therefore the architecture interrupt control functions
+ * are mapped to the NVIC driver interface.
+ *
+ * When NVIC is used together with other interrupt controller for
+ * multi-level interrupts support (i.e. CONFIG_MULTI_LEVEL_INTERRUPTS
+ * is enabled), the architecture interrupt control functions are mapped
+ * to the SoC layer in `include/arch/arm/irq.h`.
+ * The exported arm interrupt control functions which are wrappers of
+ * NVIC control could be used for SoC to do level 1 irq control to implement SoC
+ * layer interrupt control functions.
+ *
+ * When a custom interrupt controller is used (i.e.
+ * CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER is enabled), the architecture
+ * interrupt control functions are mapped to the SoC layer in
+ * `include/arch/arm/irq.h`.
+ */
+
 #if !defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
 
-void arch_irq_enable(unsigned int irq)
+void arm_irq_enable(unsigned int irq)
 {
 	NVIC_EnableIRQ((IRQn_Type)irq);
 }
 
-void arch_irq_disable(unsigned int irq)
+void arm_irq_disable(unsigned int irq)
 {
 	NVIC_DisableIRQ((IRQn_Type)irq);
 }
 
-int arch_irq_is_enabled(unsigned int irq)
+int arm_irq_is_enabled(unsigned int irq)
 {
 	return NVIC->ISER[REG_FROM_IRQ(irq)] & BIT(BIT_FROM_IRQ(irq));
 }
@@ -58,7 +77,7 @@ int arch_irq_is_enabled(unsigned int irq)
  * of priority levels is a little complex, as there are some hardware
  * priority levels which are reserved.
  */
-void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
+void arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	/* The kernel may reserve some of the highest priority levels.
 	 * So we offset the requested priority level with the number
@@ -87,8 +106,7 @@ void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 	 */
 	__ASSERT(prio <= (BIT(NUM_IRQ_PRIO_BITS) - 1),
 		 "invalid priority %d for %d irq! values must be less than %lu\n",
-		 prio - _IRQ_PRIO_OFFSET, irq,
-		 BIT(NUM_IRQ_PRIO_BITS) - (_IRQ_PRIO_OFFSET));
+		 prio - _IRQ_PRIO_OFFSET, irq, BIT(NUM_IRQ_PRIO_BITS) - (_IRQ_PRIO_OFFSET));
 	NVIC_SetPriority((IRQn_Type)irq, prio);
 }
 
@@ -141,7 +159,6 @@ void _arch_isr_direct_pm(void)
 #else
 #error Unknown ARM architecture
 #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
-
 }
 #endif
 
@@ -165,8 +182,7 @@ void _arch_isr_direct_pm(void)
  *
  * @return The resulting target state of the given IRQ
  */
-irq_target_state_t irq_target_state_set(unsigned int irq,
-	irq_target_state_t irq_target_state)
+irq_target_state_t irq_target_state_set(unsigned int irq, irq_target_state_t irq_target_state)
 {
 	uint32_t result;
 
@@ -217,7 +233,7 @@ int irq_target_state_is_secure(unsigned int irq)
  * - Bits corresponding to un-implemented interrupts are RES0, so writes
  *   will be ignored.
  *
-*/
+ */
 void irq_target_state_set_all_non_secure(void)
 {
 	int i;
@@ -241,8 +257,8 @@ void irq_target_state_set_all_non_secure(void)
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 #ifdef CONFIG_GEN_ISR_TABLES
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
-			     void (*routine)(const void *parameter),
-			     const void *parameter, uint32_t flags)
+			     void (*routine)(const void *parameter), const void *parameter,
+			     uint32_t flags)
 {
 	z_isr_install(irq, routine, parameter);
 	z_arm_irq_priority_set(irq, priority, flags);
diff --git a/arch/arm/core/cortex_m/isr_wrapper.c b/arch/arm/core/cortex_m/isr_wrapper.c
index 46aac160c3bf9..f75963c413f7b 100644
--- a/arch/arm/core/cortex_m/isr_wrapper.c
+++ b/arch/arm/core/cortex_m/isr_wrapper.c
@@ -68,7 +68,7 @@ void _isr_wrapper(void)
 #if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
 	int32_t irq_number = z_soc_irq_get_active();
 #else
-	/* _sw_isr_table does not map the expections, only the interrupts. */
+	/* _sw_isr_table does not map the exceptions, only the interrupts. */
 	int32_t irq_number = __get_IPSR();
 #endif
 	irq_number -= 16;
diff --git a/arch/arm/core/cortex_m/pm_s2ram.S b/arch/arm/core/cortex_m/pm_s2ram.S
index 4b43fb8d74f91..3e797c749c328 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.S
+++ b/arch/arm/core/cortex_m/pm_s2ram.S
@@ -178,9 +178,7 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Mark entering suspend to RAM.
 	 */
-	mov 	r1, lr
-	bl 	pm_s2ram_mark_set
-	mov	lr, r1
+	bl pm_s2ram_mark_set
 
 	/*
 	 * Call the system_off function passed as parameter. This should never
@@ -199,9 +197,7 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
 	 * Reset the marking of suspend to RAM, return is ignored.
 	 */
-	mov 	r1, lr
-	bl	pm_s2ram_mark_check_and_clear
-	mov 	lr, r1
+	bl pm_s2ram_mark_check_and_clear
 
 	/* Move the stored return value of system_off back to r0,
 	 * setting it as return value for this function.
@@ -216,13 +212,16 @@ GTEXT(arch_pm_s2ram_resume)
 SECTION_FUNC(TEXT, arch_pm_s2ram_resume)
 	/*
 	 * Check if reset occurred after suspending to RAM.
+	 * Store LR to ensure we can continue boot when we are not suspended
+	 * to RAM. In addition to LR, R0 is pushed too, to ensure "SP mod 8 = 0",
+	 * as stated by ARM rule 6.2.1.2 for AAPCS32.
 	 */
-	mov 	r1, lr
-	bl 	pm_s2ram_mark_check_and_clear
-	mov 	lr, r1
-	cmp     r0, #0x1
-	beq     .L_resume
-	bx      lr
+	push    {r0, lr}
+	bl      pm_s2ram_mark_check_and_clear
+	cmp	r0, #0x1
+	pop     {r0, lr}
+	beq	.L_resume
+	bx	lr
 
 .L_resume:
 	/*
diff --git a/arch/arm/core/cortex_m/pm_s2ram.c b/arch/arm/core/cortex_m/pm_s2ram.c
index b7fe5d9b62601..2657d48dc32a1 100644
--- a/arch/arm/core/cortex_m/pm_s2ram.c
+++ b/arch/arm/core/cortex_m/pm_s2ram.c
@@ -22,44 +22,20 @@ __noinit _cpu_context_t _cpu_context;
  */
 static __noinit uint32_t marker;
 
-void __attribute__((naked)) pm_s2ram_mark_set(void)
+void pm_s2ram_mark_set(void)
 {
-	__asm__ volatile(
-		/* Set the marker to MAGIC value */
-		"str	%[_magic_val], [%[_marker]]\n"
-
-		"bx	lr\n"
-		:
-		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
-		: "r1", "r4", "memory");
+	marker = MAGIC;
 }
 
-bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
+bool pm_s2ram_mark_check_and_clear(void)
 {
-	__asm__ volatile(
-		/* Set return value to 0 */
-		"mov	r0, #0\n"
-
-		/* Check the marker */
-		"ldr	r3, [%[_marker]]\n"
-		"cmp	r3, %[_magic_val]\n"
-		"bne	exit\n"
-
-		/*
-		 * Reset the marker
-		 */
-		"str	r0, [%[_marker]]\n"
+	if (marker == MAGIC) {
+		marker = 0;
 
-		/*
-		 * Set return value to 1
-		 */
-		"mov	r0, #1\n"
+		return true;
+	}
 
-		"exit:\n"
-		"bx lr\n"
-		:
-		: [_magic_val] "r"(MAGIC), [_marker] "r"(&marker)
-		: "r0", "r1", "r3", "r4", "memory");
+	return false;
 }
 
 #endif /* CONFIG_PM_S2RAM_CUSTOM_MARKING */
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
index ae59960584ce2..ec43970c17cf4 100644
--- a/arch/arm/core/cortex_m/prep_c.c
+++ b/arch/arm/core/cortex_m/prep_c.c
@@ -23,22 +23,18 @@
 #include <zephyr/platform/hooks.h>
 #include <zephyr/arch/cache.h>
 
-#if defined(__GNUC__)
 /*
  * GCC can detect if memcpy is passed a NULL argument, however one of
  * the cases of relocate_vector_table() it is valid to pass NULL, so we
  * suppress the warning for this case.  We need to do this before
  * string.h is included to get the declaration of memcpy.
  */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnonnull"
-#endif
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_NONNULL)
 
 #include <string.h>
 
 #if defined(CONFIG_SW_VECTOR_RELAY) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
-Z_GENERIC_SECTION(.vt_pointer_section) __attribute__((used))
-void *_vector_table_pointer;
+Z_GENERIC_SECTION(.vt_pointer_section) __attribute__((used)) void *_vector_table_pointer;
 #endif
 
 #ifdef CONFIG_CPU_CORTEX_M_HAS_VTOR
@@ -52,7 +48,7 @@ void *_vector_table_pointer;
 #define VTOR_MASK SCB_VTOR_TBLOFF_Msk
 #endif
 
-static inline void relocate_vector_table(void)
+void __weak relocate_vector_table(void)
 {
 	SCB->VTOR = VECTOR_ADDRESS & VTOR_MASK;
 	barrier_dsync_fence_full();
@@ -64,8 +60,8 @@ static inline void relocate_vector_table(void)
 
 void __weak relocate_vector_table(void)
 {
-#if defined(CONFIG_XIP) && (CONFIG_FLASH_BASE_ADDRESS != 0) || \
-    !defined(CONFIG_XIP) && (CONFIG_SRAM_BASE_ADDRESS != 0)
+#if defined(CONFIG_XIP) && (CONFIG_FLASH_BASE_ADDRESS != 0) ||                                     \
+	!defined(CONFIG_XIP) && (CONFIG_SRAM_BASE_ADDRESS != 0)
 	size_t vector_size = (size_t)_vector_end - (size_t)_vector_start;
 	(void)memcpy(VECTOR_ADDRESS, _vector_start, vector_size);
 #elif defined(CONFIG_SW_VECTOR_RELAY) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
@@ -73,9 +69,7 @@ void __weak relocate_vector_table(void)
 #endif
 }
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_NONNULL)
 
 #endif /* CONFIG_CPU_CORTEX_M_HAS_VTOR */
 
@@ -100,7 +94,7 @@ static inline void z_arm_floating_point_init(void)
 #else
 	/* Privileged access only */
 	SCB->CPACR |= CPACR_CP10_PRIV_ACCESS | CPACR_CP11_PRIV_ACCESS;
-#endif /* CONFIG_USERSPACE */
+#endif  /* CONFIG_USERSPACE */
 	/*
 	 * Upon reset, the FPU Context Control Register is 0xC0000000
 	 * (both Automatic and Lazy state preservation is enabled).
@@ -170,7 +164,7 @@ static inline void z_arm_floating_point_init(void)
 	 *
 	 * If CONFIG_INIT_ARCH_HW_AT_BOOT is set, CONTROL is cleared at reset.
 	 */
-#if (!defined(CONFIG_FPU) || !defined(CONFIG_FPU_SHARING)) && \
+#if (!defined(CONFIG_FPU) || !defined(CONFIG_FPU_SHARING)) &&                                      \
 	(!defined(CONFIG_INIT_ARCH_HW_AT_BOOT))
 
 	__set_CONTROL(__get_CONTROL() & (~(CONTROL_FPCA_Msk)));
diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/cortex_m/reset.S
index 742a3fe3d6500..c3f9362eca85d 100644
--- a/arch/arm/core/cortex_m/reset.S
+++ b/arch/arm/core/cortex_m/reset.S
@@ -21,6 +21,7 @@ _ASM_FILE_PROLOGUE
 GTEXT(z_arm_reset)
 GTEXT(z_early_memset)
 GDATA(z_interrupt_stacks)
+GDATA(z_main_stack)
 #if defined(CONFIG_DEBUG_THREAD_INFO)
 GDATA(z_sys_post_kernel)
 #endif
@@ -29,7 +30,6 @@ GTEXT(soc_reset_hook)
 #endif
 #if defined(CONFIG_INIT_ARCH_HW_AT_BOOT)
 GTEXT(z_arm_init_arch_hw_at_boot)
-GDATA(z_main_stack)
 #endif
 #if defined(CONFIG_PM_S2RAM)
 GTEXT(arch_pm_s2ram_resume)
@@ -83,9 +83,44 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
 #endif /* CONFIG_INIT_ARCH_HW_AT_BOOT */
 
 #if defined(CONFIG_PM_S2RAM)
+    /*
+     * Temporarily set MSP to interrupt stack so that arch_pm_s2ram_resume can
+     * use stack for calling pm_s2ram_mark_check_and_clear.
+     * This is safe because suspend never being called from an ISR ensures that
+     * interrupt stack was not live during suspend.
+     * Note:
+     * if resuming from suspend, MSP is restored from cpu context
+     * if not resuming, MSP will be set back to z_main_stack for proper init
+     * And, apart from arch_pm_s2ram_resume being able to use the stack for
+     * a short while, there is no change in behavior in either of the paths.
+     */
+    ldr r0, =z_interrupt_stacks + CONFIG_ISR_STACK_SIZE + MPU_GUARD_ALIGN_AND_SIZE
+    msr msp, r0
+
     bl arch_pm_s2ram_resume
 #endif /* CONFIG_PM_S2RAM */
 
+    /*
+     * MSP needs to be set to main stack for following scenarios:
+     * - If CONFIG_PM_S2RAM is enabled, MSP is set to z_interrupt_stacks
+     *   for resume functions to make use of a stack. However,
+     *   if the device was not suspended and if resume functions return,
+     *   MSP needs to be set back to z_main_stack to ensure proper
+     *   initialization.
+     * - If CONFIG_PM_S2RAM is not enabled but CONFIG_INIT_ARCH_HW_AT_BOOT is,
+     *   MSP needs to be set to z_main_stack for proper initialization in case
+     *   device was loaded through chain loading or a debugger, as the initial
+     *   value of MSP would be anything that the previous image loaded.
+     * - If CONFIG_INIT_STACKS is enabled, we need to ensure MSP is not set
+     *   to z_interrupt_stacks, so we set it to z_main_stack.
+     *
+     * Since these scenarios cover most of the cases, we set MSP to
+     * z_main_stack here.
+     *
+     */
+    ldr r0, =z_main_stack + CONFIG_MAIN_STACK_SIZE
+    msr msp, r0
+
     /* Note: Make sure that variables like z_sys_post_kernel
      *       are set after the call to arch_pm_s2ram_resume
      *       to avoid any issues with suspend/resume path.
@@ -110,8 +145,6 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
     str r0, [r1]
     dsb
 #endif /* CONFIG_CPU_HAS_ARM_MPU */
-    ldr r0, =z_main_stack + CONFIG_MAIN_STACK_SIZE
-    msr msp, r0
 
     /* Initialize core architecture registers and system blocks */
     bl z_arm_init_arch_hw_at_boot
diff --git a/arch/arm/core/cortex_m/scb.c b/arch/arm/core/cortex_m/scb.c
index a511a8de9b1be..957c66dcc9f50 100644
--- a/arch/arm/core/cortex_m/scb.c
+++ b/arch/arm/core/cortex_m/scb.c
@@ -55,8 +55,7 @@ void z_arm_clear_arm_mpu_config(void)
 {
 	int i;
 
-	int num_regions =
-		((MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos);
+	int num_regions = ((MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos);
 
 	for (i = 0; i < num_regions; i++) {
 		ARM_MPU_ClrRegion(i);
@@ -90,7 +89,7 @@ void z_arm_clear_arm_mpu_config(void)
  */
 void z_arm_init_arch_hw_at_boot(void)
 {
-    /* Disable interrupts */
+	/* Disable interrupts */
 	__disable_irq();
 
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
diff --git a/arch/arm/core/cortex_m/semihost.c b/arch/arm/core/cortex_m/semihost.c
index 2a8c6d55a0515..51ecd1f478c1c 100644
--- a/arch/arm/core/cortex_m/semihost.c
+++ b/arch/arm/core/cortex_m/semihost.c
@@ -9,11 +9,10 @@
 
 long semihost_exec(enum semihost_instr instr, void *args)
 {
-	register unsigned int r0 __asm__ ("r0") = instr;
-	register void *r1 __asm__ ("r1") = args;
-	register int ret __asm__ ("r0");
+	register unsigned int r0 __asm__("r0") = instr;
+	register void *r1 __asm__("r1") = args;
+	register int ret __asm__("r0");
 
-	__asm__ __volatile__ ("bkpt 0xab"
-			      : "=r" (ret) : "r" (r0), "r" (r1) : "memory");
+	__asm__ volatile("bkpt 0xab" : "=r"(ret) : "r"(r0), "r"(r1) : "memory");
 	return ret;
 }
diff --git a/arch/arm/core/cortex_m/thread.c b/arch/arm/core/cortex_m/thread.c
index c88fd8e41a0fe..f1fc2019d9c43 100644
--- a/arch/arm/core/cortex_m/thread.c
+++ b/arch/arm/core/cortex_m/thread.c
@@ -22,15 +22,14 @@
 #include <cmsis_core.h>
 
 #if (MPU_GUARD_ALIGN_AND_SIZE_FLOAT > MPU_GUARD_ALIGN_AND_SIZE)
-#define FP_GUARD_EXTRA_SIZE	(MPU_GUARD_ALIGN_AND_SIZE_FLOAT - \
-				 MPU_GUARD_ALIGN_AND_SIZE)
+#define FP_GUARD_EXTRA_SIZE (MPU_GUARD_ALIGN_AND_SIZE_FLOAT - MPU_GUARD_ALIGN_AND_SIZE)
 #else
-#define FP_GUARD_EXTRA_SIZE	0
+#define FP_GUARD_EXTRA_SIZE 0
 #endif
 
 #ifndef EXC_RETURN_FTYPE
 /* bit [4] allocate stack for floating-point context: 0=done 1=skipped  */
-#define EXC_RETURN_FTYPE           (0x00000010UL)
+#define EXC_RETURN_FTYPE (0x00000010UL)
 #endif
 
 /* Default last octet of EXC_RETURN, for threads that have not run yet.
@@ -58,9 +57,8 @@ K_THREAD_STACK_DECLARE(z_main_stack, CONFIG_MAIN_STACK_SIZE);
  * addresses, we have to unset it manually before storing it in the 'pc' field
  * of the ESF.
  */
-void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
-		     char *stack_ptr, k_thread_entry_t entry,
-		     void *p1, void *p2, void *p3)
+void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack, char *stack_ptr,
+		     k_thread_entry_t entry, void *p1, void *p2, void *p3)
 {
 	struct __basic_sf *iframe;
 
@@ -105,8 +103,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	iframe->a3 = (uint32_t)p2;
 	iframe->a4 = (uint32_t)p3;
 
-	iframe->xpsr =
-		0x01000000UL; /* clear all, thumb bit is 1, even if RO */
+	iframe->xpsr = 0x01000000UL; /* clear all, thumb bit is 1, even if RO */
 
 	thread->callee_saved.psp = (uint32_t)iframe;
 	thread->arch.basepri = 0;
@@ -131,52 +128,42 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	 */
 }
 
-#if defined(CONFIG_MPU_STACK_GUARD) && defined(CONFIG_FPU) \
-	&& defined(CONFIG_FPU_SHARING)
+#if defined(CONFIG_MPU_STACK_GUARD) && defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 
-static inline void z_arm_thread_stack_info_adjust(struct k_thread *thread,
-	bool use_large_guard)
+static inline void z_arm_thread_stack_info_adjust(struct k_thread *thread, bool use_large_guard)
 {
 	if (use_large_guard) {
 		/* Switch to use a large MPU guard if not already. */
-		if ((thread->arch.mode &
-			Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) == 0) {
+		if ((thread->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) == 0) {
 			/* Default guard size is used. Update required. */
 			thread->arch.mode |= Z_ARM_MODE_MPU_GUARD_FLOAT_Msk;
 #if defined(CONFIG_USERSPACE)
 			if (thread->arch.priv_stack_start) {
 				/* User thread */
-				thread->arch.priv_stack_start +=
-					FP_GUARD_EXTRA_SIZE;
+				thread->arch.priv_stack_start += FP_GUARD_EXTRA_SIZE;
 			} else
 #endif /* CONFIG_USERSPACE */
 			{
 				/* Privileged thread */
-				thread->stack_info.start +=
-					FP_GUARD_EXTRA_SIZE;
-				thread->stack_info.size -=
-					FP_GUARD_EXTRA_SIZE;
+				thread->stack_info.start += FP_GUARD_EXTRA_SIZE;
+				thread->stack_info.size -= FP_GUARD_EXTRA_SIZE;
 			}
 		}
 	} else {
 		/* Switch to use the default MPU guard size if not already. */
-		if ((thread->arch.mode &
-			Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
+		if ((thread->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
 			/* Large guard size is used. Update required. */
 			thread->arch.mode &= ~Z_ARM_MODE_MPU_GUARD_FLOAT_Msk;
 #if defined(CONFIG_USERSPACE)
 			if (thread->arch.priv_stack_start) {
 				/* User thread */
-				thread->arch.priv_stack_start -=
-					FP_GUARD_EXTRA_SIZE;
+				thread->arch.priv_stack_start -= FP_GUARD_EXTRA_SIZE;
 			} else
 #endif /* CONFIG_USERSPACE */
 			{
 				/* Privileged thread */
-				thread->stack_info.start -=
-					FP_GUARD_EXTRA_SIZE;
-				thread->stack_info.size +=
-					FP_GUARD_EXTRA_SIZE;
+				thread->stack_info.start -= FP_GUARD_EXTRA_SIZE;
+				thread->stack_info.size += FP_GUARD_EXTRA_SIZE;
 			}
 		}
 	}
@@ -190,7 +177,7 @@ static inline void z_arm_thread_stack_info_adjust(struct k_thread *thread,
 uint32_t z_arm_mpu_stack_guard_and_fpu_adjust(struct k_thread *thread)
 {
 	if (((thread->base.user_options & K_FP_REGS) != 0) ||
-		((thread->arch.mode_exc_return & EXC_RETURN_FTYPE) == 0)) {
+	    ((thread->arch.mode_exc_return & EXC_RETURN_FTYPE) == 0)) {
 		/* The thread has been pre-tagged (at creation or later) with
 		 * K_FP_REGS, i.e. it is expected to be using the FPU registers
 		 * (if not already). Activate lazy stacking and program a large
@@ -226,13 +213,11 @@ uint32_t z_arm_mpu_stack_guard_and_fpu_adjust(struct k_thread *thread)
 #endif
 
 #ifdef CONFIG_USERSPACE
-FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
-					void *p1, void *p2, void *p3)
+FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry, void *p1, void *p2, void *p3)
 {
 
 	/* Set up privileged stack before entering user mode */
-	_current->arch.priv_stack_start =
-		(uint32_t)z_priv_stack_find(_current->stack_obj);
+	_current->arch.priv_stack_start = (uint32_t)z_priv_stack_find(_current->stack_obj);
 #if defined(CONFIG_MPU_STACK_GUARD)
 #if defined(CONFIG_THREAD_STACK_INFO)
 	/* We're dropping to user mode which means the guard area is no
@@ -256,21 +241,19 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	 */
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	_current->arch.priv_stack_start +=
-		((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
-		MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
+		((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0)
+			? MPU_GUARD_ALIGN_AND_SIZE_FLOAT
+			: MPU_GUARD_ALIGN_AND_SIZE;
 #else
 	_current->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 #endif /* CONFIG_MPU_STACK_GUARD */
 
-	z_arm_userspace_enter(user_entry, p1, p2, p3,
-			     (uint32_t)_current->stack_info.start,
-			     _current->stack_info.size -
-			     _current->stack_info.delta);
+	z_arm_userspace_enter(user_entry, p1, p2, p3, (uint32_t)_current->stack_info.start,
+			      _current->stack_info.size - _current->stack_info.delta);
 	CODE_UNREACHABLE;
 }
 
-
 bool z_arm_thread_is_in_user_mode(void)
 {
 	uint32_t value;
@@ -311,14 +294,12 @@ void configure_builtin_stack_guard(struct k_thread *thread)
 	 * than the default thread stack (ensured by design).
 	 */
 	uint32_t guard_start =
-		((thread->arch.priv_stack_start) &&
-			(__get_PSP() >= thread->arch.priv_stack_start)) ?
-		(uint32_t)thread->arch.priv_stack_start :
-		(uint32_t)thread->stack_obj;
+		((thread->arch.priv_stack_start) && (__get_PSP() >= thread->arch.priv_stack_start))
+			? (uint32_t)thread->arch.priv_stack_start
+			: (uint32_t)thread->stack_obj;
 
 	__ASSERT(thread->stack_info.start == ((uint32_t)thread->stack_obj),
-		"stack_info.start does not point to the start of the"
-		"thread allocated area.");
+		 "stack_info.start does not point to the start of the thread allocated area.");
 #else
 	uint32_t guard_start = thread->stack_info.start;
 #endif
@@ -332,13 +313,11 @@ void configure_builtin_stack_guard(struct k_thread *thread)
 
 #if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
 
-#define IS_MPU_GUARD_VIOLATION(guard_start, guard_len, fault_addr, stack_ptr) \
-	((fault_addr != -EINVAL) ? \
-	((fault_addr >= guard_start) && \
-	(fault_addr < (guard_start + guard_len)) && \
-	(stack_ptr < (guard_start + guard_len))) \
-	: \
-	(stack_ptr < (guard_start + guard_len)))
+#define IS_MPU_GUARD_VIOLATION(guard_start, guard_len, fault_addr, stack_ptr)                      \
+	((fault_addr != -EINVAL)                                                                   \
+		 ? ((fault_addr >= guard_start) && (fault_addr < (guard_start + guard_len)) &&     \
+		    (stack_ptr < (guard_start + guard_len)))                                       \
+		 : (stack_ptr < (guard_start + guard_len)))
 
 /**
  * @brief Assess occurrence of current thread's stack corruption
@@ -386,11 +365,10 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 	}
 #endif
 
-#if (defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)) && \
-	defined(CONFIG_MPU_STACK_GUARD)
-	uint32_t guard_len =
-		((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
-		MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
+#if (defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)) && defined(CONFIG_MPU_STACK_GUARD)
+	uint32_t guard_len = ((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0)
+				     ? MPU_GUARD_ALIGN_AND_SIZE_FLOAT
+				     : MPU_GUARD_ALIGN_AND_SIZE;
 #else
 	/* If MPU_STACK_GUARD is not enabled, the guard length is
 	 * effectively zero. Stack overflows may be detected only
@@ -404,10 +382,8 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 		/* User thread */
 		if (z_arm_thread_is_in_user_mode() == false) {
 			/* User thread in privilege mode */
-			if (IS_MPU_GUARD_VIOLATION(
-				thread->arch.priv_stack_start - guard_len,
-					guard_len,
-				fault_addr, psp)) {
+			if (IS_MPU_GUARD_VIOLATION(thread->arch.priv_stack_start - guard_len,
+						   guard_len, fault_addr, psp)) {
 				/* Thread's privilege stack corruption */
 				return thread->arch.priv_stack_start;
 			}
@@ -419,26 +395,21 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 		}
 	} else {
 		/* Supervisor thread */
-		if (IS_MPU_GUARD_VIOLATION(thread->stack_info.start -
-				guard_len,
-				guard_len,
-				fault_addr, psp)) {
+		if (IS_MPU_GUARD_VIOLATION(thread->stack_info.start - guard_len, guard_len,
+					   fault_addr, psp)) {
 			/* Supervisor thread stack corruption */
 			return thread->stack_info.start;
 		}
 	}
 #else /* CONFIG_USERSPACE */
 #if defined(CONFIG_MULTITHREADING)
-	if (IS_MPU_GUARD_VIOLATION(thread->stack_info.start - guard_len,
-			guard_len,
-			fault_addr, psp)) {
+	if (IS_MPU_GUARD_VIOLATION(thread->stack_info.start - guard_len, guard_len, fault_addr,
+				   psp)) {
 		/* Thread stack corruption */
 		return thread->stack_info.start;
 	}
 #else
-	if (IS_MPU_GUARD_VIOLATION((uint32_t)z_main_stack,
-			guard_len,
-			fault_addr, psp)) {
+	if (IS_MPU_GUARD_VIOLATION((uint32_t)z_main_stack, guard_len, fault_addr, psp)) {
 		/* Thread stack corruption */
 		return (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
 	}
@@ -572,23 +543,23 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr,
 	 * When calling arch_irq_unlock_outlined, LR is lost which is fine since
 	 * we do not intend to return after calling z_thread_entry.
 	 */
-	__asm__ volatile (
-	"mov   r4,  %0\n"	/* force _main to be stored in a register */
-	"msr   PSP, %1\n"	/* __set_PSP(stack_ptr) */
-
-	"movs  r0,  #0\n"	/* arch_irq_unlock(0) */
-	"ldr   r3, =arch_irq_unlock_outlined\n"
-	"blx   r3\n"
-
-	"mov   r0, r4\n"	/* z_thread_entry(_main, NULL, NULL, NULL) */
-	"movs  r1, #0\n"
-	"movs  r2, #0\n"
-	"movs  r3, #0\n"
-	"ldr   r4, =z_thread_entry\n"
-	"bx    r4\n"		/* We don’t intend to return, so there is no need to link. */
-	:
-	: "r" (_main), "r" (stack_ptr)
-	: "r0", "r1", "r2", "r3", "r4", "ip", "lr", "memory");
+	__asm__ volatile("mov   r4,  %0\n" /* force _main to be stored in a register */
+			 "msr   PSP, %1\n" /* __set_PSP(stack_ptr) */
+
+			 "movs  r0,  #0\n" /* arch_irq_unlock(0) */
+			 "ldr   r3, =arch_irq_unlock_outlined\n"
+			 "blx   r3\n"
+
+			 "mov   r0, r4\n" /* z_thread_entry(_main, NULL, NULL, NULL) */
+			 "movs  r1, #0\n"
+			 "movs  r2, #0\n"
+			 "movs  r3, #0\n"
+			 "ldr   r4, =z_thread_entry\n"
+			 /* We don’t intend to return, so there is no need to link. */
+			 "bx    r4\n"
+			 :
+			 : "r"(_main), "r"(stack_ptr)
+			 : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "memory");
 
 	CODE_UNREACHABLE;
 }
@@ -597,7 +568,7 @@ __used void arch_irq_unlock_outlined(unsigned int key)
 {
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 	__enable_fault_irq(); /* alters FAULTMASK */
-	__enable_irq(); /* alters PRIMASK */
+	__enable_irq();       /* alters PRIMASK */
 #endif
 	arch_irq_unlock(key);
 }
@@ -609,14 +580,13 @@ __used unsigned int arch_irq_lock_outlined(void)
 
 #if !defined(CONFIG_MULTITHREADING)
 
-FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
-	k_thread_entry_t main_entry, void *p1, void *p2, void *p3)
+FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(k_thread_entry_t main_entry, void *p1,
+							  void *p2, void *p3)
 {
 	z_arm_prepare_switch_to_main();
 
 	/* Set PSP to the highest address of the main stack. */
-	char *psp =	K_THREAD_STACK_BUFFER(z_main_stack) +
-		K_THREAD_STACK_SIZEOF(z_main_stack);
+	char *psp = K_THREAD_STACK_BUFFER(z_main_stack) + K_THREAD_STACK_SIZEOF(z_main_stack);
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 	char *psplim = (K_THREAD_STACK_BUFFER(z_main_stack));
@@ -636,31 +606,31 @@ FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
 	 * with the thread entry process.
 	 */
 
-	__asm__ volatile (
+	__asm__ volatile(
 #ifdef CONFIG_BUILTIN_STACK_GUARD
-	"msr  PSPLIM, %[_psplim]\n" /* __set_PSPLIM(_psplim) */
+		"msr  PSPLIM, %[_psplim]\n" /* __set_PSPLIM(_psplim) */
 #endif
-	"msr  PSP, %[_psp]\n"       /* __set_PSP(psp) */
-	"mov r0, #0\n"
-	"ldr r1, =arch_irq_unlock_outlined\n"
-	"blx r1\n"
-
-	"mov r0, %[_p1]\n"
-	"mov r1, %[_p2]\n"
-	"mov r2, %[_p3]\n"
-	"blx  %[_main_entry]\n"     /* main_entry(p1, p2, p3) */
-
-	"ldr r0, =arch_irq_lock_outlined\n"
-	"blx r0\n"
-	"loop: b loop\n\t"    /* while (true); */
-	:
-	: [_p1]"r" (p1), [_p2]"r" (p2), [_p3]"r" (p3),
-	  [_psp]"r" (psp), [_main_entry]"r" (main_entry)
+		"msr  PSP, %[_psp]\n" /* __set_PSP(psp) */
+		"movs r0, #0\n"
+		"ldr r1, =arch_irq_unlock_outlined\n"
+		"blx r1\n"
+
+		"mov r0, %[_p1]\n"
+		"mov r1, %[_p2]\n"
+		"mov r2, %[_p3]\n"
+		"blx  %[_main_entry]\n" /* main_entry(p1, p2, p3) */
+
+		"ldr r0, =arch_irq_lock_outlined\n"
+		"blx r0\n"
+		"loop: b loop\n\t" /* while (true); */
+		:
+		: [_p1] "r"(p1), [_p2] "r"(p2), [_p3] "r"(p3), [_psp] "r"(psp),
+		  [_main_entry] "r"(main_entry)
 #ifdef CONFIG_BUILTIN_STACK_GUARD
-	, [_psplim]"r" (psplim)
+			  ,
+		  [_psplim] "r"(psplim)
 #endif
-	: "r0", "r1", "r2", "ip", "lr"
-	);
+		: "r0", "r1", "r2", "ip", "lr");
 
 	CODE_UNREACHABLE; /* LCOV_EXCL_LINE */
 }
diff --git a/arch/arm/core/cortex_m/timing.c b/arch/arm/core/cortex_m/timing.c
index 6cb157552ace2..2ce7f64552ba5 100644
--- a/arch/arm/core/cortex_m/timing.c
+++ b/arch/arm/core/cortex_m/timing.c
@@ -73,7 +73,6 @@ static inline uint64_t z_arm_dwt_freq_get(void)
 		} while ((dcyc == 0) || (ddwt == 0));
 
 		dwt_frequency = (cyc_freq * ddwt) / dcyc;
-
 	}
 	return dwt_frequency;
 #endif /* CONFIG_SOC_FAMILY_NORDIC_NRF */
@@ -100,8 +99,7 @@ timing_t arch_timing_counter_get(void)
 	return (timing_t)z_arm_dwt_get_cycles();
 }
 
-uint64_t arch_timing_cycles_get(volatile timing_t *const start,
-				volatile timing_t *const end)
+uint64_t arch_timing_cycles_get(volatile timing_t *const start, volatile timing_t *const end)
 {
 	return ((uint32_t)*end - (uint32_t)*start);
 }
diff --git a/arch/arm/core/cortex_m/tz/CMakeLists.txt b/arch/arm/core/cortex_m/tz/CMakeLists.txt
index 19c67476e40ee..aac4f65161941 100644
--- a/arch/arm/core/cortex_m/tz/CMakeLists.txt
+++ b/arch/arm/core/cortex_m/tz/CMakeLists.txt
@@ -2,7 +2,10 @@
 
 # '-mcmse' enables the generation of code for the Secure state of the ARMv8-M
 # Security Extensions. This option is required when building a Secure firmware.
-zephyr_compile_options_ifdef(CONFIG_ARM_SECURE_FIRMWARE -mcmse)
+
+zephyr_compile_options_ifdef(CONFIG_ARM_SECURE_FIRMWARE $<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,cmse>>)
+zephyr_compile_options_ifdef(CONFIG_ARM_SECURE_FIRMWARE $<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,cmse>>)
+zephyr_compile_options_ifdef(CONFIG_ARM_SECURE_FIRMWARE $<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,cmse>>)
 
 if(CONFIG_ARM_FIRMWARE_HAS_SECURE_ENTRY_FUNCS)
 
diff --git a/arch/arm/core/elf.c b/arch/arm/core/elf.c
index 5fdc5471a6bbc..d44e7dd2e2c2b 100644
--- a/arch/arm/core/elf.c
+++ b/arch/arm/core/elf.c
@@ -7,6 +7,7 @@
 
 #include <zephyr/llext/elf.h>
 #include <zephyr/llext/llext.h>
+#include <zephyr/llext/llext_internal.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
 
@@ -316,11 +317,32 @@ static void thm_movs_handler(elf_word reloc_type, uint32_t loc,
  * Do NOT mix them with not 'Thumb instructions' in the below switch/case: they are not
  * intended to work together.
  */
-int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc, uintptr_t sym_base_addr,
-			const char *sym_name, uintptr_t load_bias)
+int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *rel,
+		      const elf_shdr_t *shdr)
 {
 	int ret = 0;
 	elf_word reloc_type = ELF32_R_TYPE(rel->r_info);
+	const uintptr_t load_bias = (uintptr_t)ext->mem[LLEXT_MEM_TEXT];
+	const uintptr_t loc = llext_get_reloc_instruction_location(ldr, ext, shdr->sh_info, rel);
+	elf_sym_t sym;
+	uintptr_t sym_base_addr;
+	const char *sym_name;
+
+	ret = llext_read_symbol(ldr, ext, rel, &sym);
+
+	if (ret != 0) {
+		LOG_ERR("Could not read symbol from binary!");
+		return ret;
+	}
+
+	sym_name = llext_symbol_name(ldr, ext, &sym);
+
+	ret = llext_lookup_symbol(ldr, ext, &sym_base_addr, rel, &sym, sym_name, shdr);
+
+	if (ret != 0) {
+		LOG_ERR("Could not find symbol %s!", sym_name);
+		return ret;
+	}
 
 	LOG_DBG("%d %lx %lx %s", reloc_type, loc, sym_base_addr, sym_name);
 
diff --git a/arch/arm/core/mmu/arm_mmu.c b/arch/arm/core/mmu/arm_mmu.c
index 4b398eb2d16e8..62ef1492557c7 100644
--- a/arch/arm/core/mmu/arm_mmu.c
+++ b/arch/arm/core/mmu/arm_mmu.c
@@ -805,10 +805,10 @@ int z_arm_mmu_init(void)
 	}
 
 	/* Clear TTBR1 */
-	__asm__ __volatile__("mcr p15, 0, %0, c2, c0, 1" : : "r"(reg_val));
+	__asm__ volatile("mcr p15, 0, %0, c2, c0, 1" : : "r"(reg_val));
 
 	/* Write TTBCR: EAE, security not yet relevant, N[2:0] = 0 */
-	__asm__ __volatile__("mcr p15, 0, %0, c2, c0, 2"
+	__asm__ volatile("mcr p15, 0, %0, c2, c0, 2"
 			     : : "r"(reg_val));
 
 	/* Write TTBR0 */
diff --git a/arch/arm/core/mpu/Kconfig b/arch/arm/core/mpu/Kconfig
index 67baee979c9bd..ff48692ec65fe 100644
--- a/arch/arm/core/mpu/Kconfig
+++ b/arch/arm/core/mpu/Kconfig
@@ -1,6 +1,7 @@
 # Memory Protection Unit (MPU) configuration options
 
 # Copyright (c) 2017 Linaro Limited
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 if CPU_HAS_MPU
@@ -68,6 +69,15 @@ config CUSTOM_SECTION_MIN_ALIGN_SIZE
 	  size is configured by users, it must also respect the power of
 	  two regulation if hardware requires.
 
+config ARM_MPU_PXN
+	bool
+	depends on ARMV8_1_M_MAINLINE
+	help
+	  Enable support for Armv8.1-m MPU's Privileged Execute Never (PXN) attr.
+	  An MPU region marked with PXN attribute can only be executed from an
+	  unprivileged mode and executing such region from privileged mode will
+	  result in a Memory Management fault.
+
 endif # ARM_MPU
 
 endif # CPU_HAS_MPU
diff --git a/arch/arm/core/mpu/arm_core_mpu.c b/arch/arm/core/mpu/arm_core_mpu.c
index dde98c0b07fa8..03d02e9b6ea97 100644
--- a/arch/arm/core/mpu/arm_core_mpu.c
+++ b/arch/arm/core/mpu/arm_core_mpu.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017 Linaro Limited.
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -64,53 +65,61 @@ extern char __ram_text_reloc_size[];
 
 static const struct z_arm_mpu_partition static_regions[] = {
 #if defined(CONFIG_COVERAGE_GCOV) && defined(CONFIG_USERSPACE)
-		{
+	{
 		/* GCOV code coverage accounting area. Needs User permissions
 		 * to function
 		 */
 		.start = (uint32_t)&__gcov_bss_start,
 		.size = (uint32_t)&__gcov_bss_size,
 		.attr = K_MEM_PARTITION_P_RW_U_RW,
-		},
+	},
 #endif /* CONFIG_COVERAGE_GCOV && CONFIG_USERSPACE */
 #if defined(CONFIG_NOCACHE_MEMORY)
-		{
+	{
 		/* Special non-cacheable RAM area */
 		.start = (uint32_t)&_nocache_ram_start,
 		.size = (uint32_t)&_nocache_ram_size,
 		.attr = K_MEM_PARTITION_P_RW_U_NA_NOCACHE,
-		},
+	},
 #endif /* CONFIG_NOCACHE_MEMORY */
 #if defined(CONFIG_ARCH_HAS_RAMFUNC_SUPPORT)
-		{
+	{
 		/* Special RAM area for program text */
 		.start = (uint32_t)&__ramfunc_start,
 		.size = (uint32_t)&__ramfunc_size,
+#if defined(CONFIG_ARM_MPU_PXN) && defined(CONFIG_USERSPACE)
+		.attr = K_MEM_PARTITION_P_R_U_RX,
+#else
 		.attr = K_MEM_PARTITION_P_RX_U_RX,
-		},
+#endif
+	},
 #endif /* CONFIG_ARCH_HAS_RAMFUNC_SUPPORT */
 #if defined(CONFIG_CODE_DATA_RELOCATION_SRAM)
-		{
+	{
 		/* RAM area for relocated text */
 		.start = (uint32_t)&__ram_text_reloc_start,
 		.size = (uint32_t)&__ram_text_reloc_size,
+#if defined(CONFIG_ARM_MPU_PXN) && defined(CONFIG_USERSPACE)
+		.attr = K_MEM_PARTITION_P_R_U_RX,
+#else
 		.attr = K_MEM_PARTITION_P_RX_U_RX,
-		},
+#endif
+	},
 #endif /* CONFIG_CODE_DATA_RELOCATION_SRAM */
 #if !defined(CONFIG_MULTITHREADING) && defined(CONFIG_MPU_STACK_GUARD)
-		/* Main stack MPU guard to detect overflow.
-		 * Note:
-		 * FPU_SHARING and USERSPACE are not supported features
-		 * under CONFIG_MULTITHREADING=n, so the MPU guard (if
-		 * exists) is reserved aside of CONFIG_MAIN_STACK_SIZE
-		 * and there is no requirement for larger guard area (FP
-		 * context is not stacked).
-		 */
-		{
-			.start = (uint32_t)z_main_stack,
-			.size = (uint32_t)MPU_GUARD_ALIGN_AND_SIZE,
-			.attr = K_MEM_PARTITION_P_RO_U_NA,
-		},
+	/* Main stack MPU guard to detect overflow.
+	 * Note:
+	 * FPU_SHARING and USERSPACE are not supported features
+	 * under CONFIG_MULTITHREADING=n, so the MPU guard (if
+	 * exists) is reserved aside of CONFIG_MAIN_STACK_SIZE
+	 * and there is no requirement for larger guard area (FP
+	 * context is not stacked).
+	 */
+	{
+		.start = (uint32_t)z_main_stack,
+		.size = (uint32_t)MPU_GUARD_ALIGN_AND_SIZE,
+		.attr = K_MEM_PARTITION_P_RO_U_NA,
+	},
 #endif /* !CONFIG_MULTITHREADING && CONFIG_MPU_STACK_GUARD */
 };
 
diff --git a/arch/arm/core/mpu/arm_mpu.c b/arch/arm/core/mpu/arm_mpu.c
index bec7b18a4f2c2..f9a5397da4644 100644
--- a/arch/arm/core/mpu/arm_mpu.c
+++ b/arch/arm/core/mpu/arm_mpu.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017 Linaro Limited.
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -93,7 +94,7 @@ static int region_allocate_and_init(const uint8_t index,
 						    (reg).dt_addr,	\
 						    (reg).dt_size,	\
 						    _ATTR)
-
+#ifdef CONFIG_MEM_ATTR
 /* This internal function programs the MPU regions defined in the DT when using
  * the `zephyr,memory-attr = <( DT_MEM_ARM(...) )>` property.
  */
@@ -111,6 +112,11 @@ static int mpu_configure_regions_from_dt(uint8_t *reg_index)
 		case DT_MEM_ARM_MPU_RAM:
 			region_conf = _BUILD_REGION_CONF(region[idx], REGION_RAM_ATTR);
 			break;
+#ifdef CONFIG_ARM_MPU_PXN
+		case DT_MEM_ARM_MPU_RAM_PXN:
+			region_conf = _BUILD_REGION_CONF(region[idx], REGION_RAM_ATTR_PXN);
+			break;
+#endif
 #ifdef REGION_RAM_NOCACHE_ATTR
 		case DT_MEM_ARM_MPU_RAM_NOCACHE:
 			region_conf = _BUILD_REGION_CONF(region[idx], REGION_RAM_NOCACHE_ATTR);
@@ -158,7 +164,7 @@ static int mpu_configure_regions_from_dt(uint8_t *reg_index)
 
 	return 0;
 }
-
+#endif /* CONFIG_MEM_ATTR */
 /* This internal function programs an MPU region
  * of a given configuration at a given MPU index.
  */
@@ -459,13 +465,13 @@ int z_arm_mpu_init(void)
 
 	/* Update the number of programmed MPU regions. */
 	static_regions_num = mpu_config.num_regions;
-
+#ifdef CONFIG_MEM_ATTR
 	/* DT-defined MPU regions. */
 	if (mpu_configure_regions_from_dt(&static_regions_num) == -EINVAL) {
 		__ASSERT(0, "Failed to allocate MPU regions from DT\n");
 		return -EINVAL;
 	}
-
+#endif /* CONFIG_MEM_ATTR */
 	/* Clear all regions before enabling MPU */
 	for (int i = static_regions_num; i < get_num_regions(); i++) {
 		mpu_clear_region(i);
diff --git a/arch/arm/core/mpu/arm_mpu_v8_internal.h b/arch/arm/core/mpu/arm_mpu_v8_internal.h
index 51ab093d17c55..0716c017ff964 100644
--- a/arch/arm/core/mpu/arm_mpu_v8_internal.h
+++ b/arch/arm/core/mpu/arm_mpu_v8_internal.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2017 Linaro Limited.
  * Copyright (c) 2018 Nordic Semiconductor ASA.
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -158,6 +159,7 @@ static void mpu_set_region(uint32_t rnr, uint32_t rbar, uint32_t rlar)
 static void region_init(const uint32_t index,
 	const struct arm_mpu_region *region_conf)
 {
+	/* clang-format off */
 	mpu_set_region(
 		/* RNR */
 		index,
@@ -170,7 +172,11 @@ static void region_init(const uint32_t index,
 		| ((region_conf->attr.mair_idx << MPU_RLAR_AttrIndx_Pos)
 			& MPU_RLAR_AttrIndx_Msk)
 		| MPU_RLAR_EN_Msk
+#ifdef CONFIG_ARM_MPU_PXN
+		| ((region_conf->attr.pxn << MPU_RLAR_PXN_Pos) & MPU_RLAR_PXN_Msk)
+#endif
 	);
+	/* clang-format on */
 
 	LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x",
 			index, region_conf->base, region_conf->attr.rbar,
@@ -279,6 +285,9 @@ static inline void mpu_region_get_access_attr(const uint32_t index,
 		(MPU_RBAR_XN_Msk | MPU_RBAR_AP_Msk | MPU_RBAR_SH_Msk);
 	attr->mair_idx = (mpu_get_rlar() & MPU_RLAR_AttrIndx_Msk) >>
 		MPU_RLAR_AttrIndx_Pos;
+#ifdef CONFIG_ARM_MPU_PXN
+	attr->pxn = (mpu_get_rlar() & MPU_RLAR_PXN_Msk) >> MPU_RLAR_PXN_Pos;
+#endif
 }
 
 static inline void mpu_region_get_conf(const uint32_t index,
@@ -313,6 +322,9 @@ static inline void get_region_attr_from_mpu_partition_info(
 		(MPU_RBAR_XN_Msk | MPU_RBAR_AP_Msk | MPU_RBAR_SH_Msk);
 	p_attr->mair_idx = attr->mair_idx;
 	p_attr->r_limit = REGION_LIMIT_ADDR(base, size);
+#ifdef CONFIG_ARM_MPU_PXN
+	p_attr->pxn = attr->pxn;
+#endif
 }
 
 #if defined(CONFIG_USERSPACE)
diff --git a/arch/arm/core/mpu/nxp_mpu.c b/arch/arm/core/mpu/nxp_mpu.c
index b0fe24c6bf617..ae893086901ce 100644
--- a/arch/arm/core/mpu/nxp_mpu.c
+++ b/arch/arm/core/mpu/nxp_mpu.c
@@ -151,7 +151,7 @@ static int region_allocate_and_init(const uint8_t index,
 				  .end  = (reg).dt_addr + (reg).dt_size,	\
 				  .attr = _ATTR,				\
 				}
-
+#ifdef CONFIG_MEM_ATTR
 /* This internal function programs the MPU regions defined in the DT when using
  * the `zephyr,memory-attr = <( DT_MEM_ARM(...) )>` property.
  */
@@ -198,7 +198,7 @@ static int mpu_configure_regions_from_dt(uint8_t *reg_index)
 
 	return 0;
 }
-
+#endif /* CONFIG_MEM_ATTR */
 /**
  * This internal function is utilized by the MPU driver to combine a given
  * region attribute configuration and size and fill-in a driver-specific
@@ -700,13 +700,13 @@ int z_arm_mpu_init(void)
 
 	/* Update the number of programmed MPU regions. */
 	static_regions_num = mpu_config.num_regions;
-
+#ifdef CONFIG_MEM_ATTR
 	/* DT-defined MPU regions. */
 	if (mpu_configure_regions_from_dt(&static_regions_num) == -EINVAL) {
 		__ASSERT(0, "Failed to allocate MPU regions from DT\n");
 		return -EINVAL;
 	}
-
+#endif /* CONFIG_MEM_ATTR */
 	arm_core_mpu_enable();
 
 	return 0;
diff --git a/arch/arm/core/tls.c b/arch/arm/core/tls.c
index 9b731286c7da8..0dc21285a916d 100644
--- a/arch/arm/core/tls.c
+++ b/arch/arm/core/tls.c
@@ -40,8 +40,10 @@ size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 	stack_ptr -= z_tls_data_size();
 	z_tls_copy(stack_ptr);
 
+#ifndef __IAR_SYSTEMS_ICC__
 	/* Skip two pointers due to toolchain */
 	stack_ptr -= sizeof(uintptr_t) * 2;
+#endif
 
 	/*
 	 * Set thread TLS pointer which is used in
diff --git a/arch/arm/include/cortex_m/cmse.h b/arch/arm/include/cortex_m/cmse.h
index ff5e5120d8d39..ca997220dbd16 100644
--- a/arch/arm/include/cortex_m/cmse.h
+++ b/arch/arm/include/cortex_m/cmse.h
@@ -139,7 +139,7 @@ int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npr
  * where typeof is used instead of __typeof__)
  */
 #ifndef typeof
-#define typeof  __typeof__
+#define typeof __typeof__
 #endif
 
 /**
@@ -157,8 +157,7 @@ int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npr
  *
  * @return p_obj if object is readable, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_READ_OK(p_obj) \
-	cmse_check_pointed_object(p_obj, CMSE_MPU_READ)
+#define ARM_CMSE_OBJECT_READ_OK(p_obj) cmse_check_pointed_object(p_obj, CMSE_MPU_READ)
 
 /**
  * @brief Read accessibility of an object (nPRIV mode)
@@ -175,7 +174,7 @@ int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npr
  *
  * @return p_obj if object is readable, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_UNPRIV_READ_OK(p_obj) \
+#define ARM_CMSE_OBJECT_UNPRIV_READ_OK(p_obj)                                                      \
 	cmse_check_pointed_object(p_obj, CMSE_MPU_UNPRIV | CMSE_MPU_READ)
 
 /**
@@ -193,8 +192,7 @@ int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npr
  *
  * @return p_obj if object is Read and Writable, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_READWRITE_OK(p_obj) \
-	cmse_check_pointed_object(p_obj, CMSE_MPU_READWRITE)
+#define ARM_CMSE_OBJECT_READWRITE_OK(p_obj) cmse_check_pointed_object(p_obj, CMSE_MPU_READWRITE)
 
 /**
  * @brief Read and Write accessibility of an object (nPRIV mode)
@@ -211,7 +209,7 @@ int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npr
  *
  * @return p_obj if object is Read and Writable, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_UNPRIV_READWRITE_OK(p_obj) \
+#define ARM_CMSE_OBJECT_UNPRIV_READWRITE_OK(p_obj)                                                 \
 	cmse_check_pointed_object(p_obj, CMSE_MPU_UNPRIV | CMSE_MPU_READWRITE)
 
 #if defined(CONFIG_ARM_SECURE_FIRMWARE)
@@ -231,7 +229,7 @@ int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npr
  * @param addr The address for which the MPU region is requested
  *
  * @return a valid MPU region number or -EINVAL
-  */
+ */
 int arm_cmse_mpu_nonsecure_region_get(uint32_t addr);
 
 /**
@@ -249,7 +247,7 @@ int arm_cmse_mpu_nonsecure_region_get(uint32_t addr);
  * @param addr The address for which the SAU region is requested
  *
  * @return a valid SAU region number or -EINVAL
-  */
+ */
 int arm_cmse_sau_region_get(uint32_t addr);
 
 /**
@@ -267,7 +265,7 @@ int arm_cmse_sau_region_get(uint32_t addr);
  * @param addr The address for which the IDAU region is requested
  *
  * @return a valid IDAU region number or -EINVAL
-  */
+ */
 int arm_cmse_idau_region_get(uint32_t addr);
 
 /**
@@ -342,8 +340,7 @@ int arm_cmse_addr_nonsecure_readwrite_ok(uint32_t addr, int force_npriv);
  *
  * @return 1 if address range is readable, 0 otherwise.
  */
-int arm_cmse_addr_range_nonsecure_read_ok(uint32_t addr, uint32_t size,
-	int force_npriv);
+int arm_cmse_addr_range_nonsecure_read_ok(uint32_t addr, uint32_t size, int force_npriv);
 
 /**
  * @brief Non-Secure Read and Write accessibility of an address range
@@ -365,8 +362,7 @@ int arm_cmse_addr_range_nonsecure_read_ok(uint32_t addr, uint32_t size,
  *
  * @return 1 if address range is readable, 0 otherwise.
  */
-int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
-	int force_npriv);
+int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size, int force_npriv);
 
 /**
  * @brief Non-Secure Read accessibility of an object
@@ -383,7 +379,7 @@ int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
  *
  * @return p_obj if object is readable from Non-Secure state, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_NONSECURE_READ_OK(p_obj) \
+#define ARM_CMSE_OBJECT_NONSECURE_READ_OK(p_obj)                                                   \
 	cmse_check_pointed_object(p_obj, CMSE_NONSECURE | CMSE_MPU_READ)
 
 /**
@@ -401,9 +397,8 @@ int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
  *
  * @return p_obj if object is readable from Non-Secure state, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_NONSECURE_UNPRIV_READ_OK(p_obj) \
-	cmse_check_pointed_object(p_obj, \
-		CMSE_NONSECURE | CMSE_MPU_UNPRIV | CMSE_MPU_READ)
+#define ARM_CMSE_OBJECT_NONSECURE_UNPRIV_READ_OK(p_obj)                                            \
+	cmse_check_pointed_object(p_obj, CMSE_NONSECURE | CMSE_MPU_UNPRIV | CMSE_MPU_READ)
 
 /**
  * @brief Non-Secure Read and Write accessibility of an object
@@ -420,7 +415,7 @@ int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
  *
  * @return p_obj if object is Non-Secure Read and Writable, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_NONSECURE_READWRITE_OK(p_obj) \
+#define ARM_CMSE_OBJECT_NONSECURE_READWRITE_OK(p_obj)                                              \
 	cmse_check_pointed_object(p_obj, CMSE_NONSECURE | CMSE_MPU_READWRITE)
 
 /**
@@ -438,9 +433,8 @@ int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
  *
  * @return p_obj if object is Non-Secure Read and Writable, NULL otherwise.
  */
-#define ARM_CMSE_OBJECT_NON_SECURE_UNPRIV_READWRITE_OK(p_obj) \
-	cmse_check_pointed_object(p_obj, \
-			CMSE_NONSECURE | CMSE_MPU_UNPRIV | CMSE_MPU_READWRITE)
+#define ARM_CMSE_OBJECT_NON_SECURE_UNPRIV_READWRITE_OK(p_obj)                                      \
+	cmse_check_pointed_object(p_obj, CMSE_NONSECURE | CMSE_MPU_UNPRIV | CMSE_MPU_READWRITE)
 
 #endif /* CONFIG_ARM_SECURE_FIRMWARE */
 
diff --git a/arch/arm/include/cortex_m/dwt.h b/arch/arm/include/cortex_m/dwt.h
index ed0df44dfde56..947b35dca92e8 100644
--- a/arch/arm/include/cortex_m/dwt.h
+++ b/arch/arm/include/cortex_m/dwt.h
@@ -64,7 +64,7 @@ static inline void dwt_access(bool ena)
 			}
 		}
 	}
-#else /* CONFIG_CPU_CORTEX_M7 */
+#else  /* CONFIG_CPU_CORTEX_M7 */
 	ARG_UNUSED(ena);
 #endif /* CONFIG_CPU_CORTEX_M7 */
 }
@@ -103,9 +103,8 @@ static inline int z_arm_dwt_init_cycle_counter(void)
 	/* Assert that the cycle counter is indeed implemented.
 	 * The field is called NOCYCCNT. So 1 means there is no cycle counter.
 	 */
-	__ASSERT((DWT->CTRL & DWT_CTRL_NOCYCCNT_Msk) == 0,
-		"DWT implements no cycle counter. "
-		"Cannot be used for cycle counting\n");
+	__ASSERT((DWT->CTRL & DWT_CTRL_NOCYCCNT_Msk) == 0, "DWT implements no cycle counter. "
+							   "Cannot be used for cycle counting\n");
 
 	return 0;
 }
@@ -148,7 +147,7 @@ static inline void z_arm_dwt_enable_debug_monitor(void)
 	 * assert that the CPU is in normal mode.
 	 */
 	__ASSERT((CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk) == 0,
-		"Cannot enable DBM when CPU is in Debug mode\n");
+		 "Cannot enable DBM when CPU is in Debug mode\n");
 
 #if defined(CONFIG_ARMV8_M_SE) && !defined(CONFIG_ARM_NONSECURE_FIRMWARE)
 	/*
@@ -158,8 +157,7 @@ static inline void z_arm_dwt_enable_debug_monitor(void)
 	 * when enabling the DebugMonitor exception, assert that
 	 * it is not targeting the Non Secure domain.
 	 */
-	__ASSERT((CoreDebug->DEMCR & DCB_DEMCR_SDME_Msk) != 0,
-		"DebugMonitor targets Non-Secure\n");
+	__ASSERT((CoreDebug->DEMCR & DCB_DEMCR_SDME_Msk) != 0, "DebugMonitor targets Non-Secure\n");
 #endif
 
 	/* The DebugMonitor handler priority is set already
diff --git a/arch/arm/include/cortex_m/exception.h b/arch/arm/include/cortex_m/exception.h
index c021d59d76411..0800a16436f16 100644
--- a/arch/arm/include/cortex_m/exception.h
+++ b/arch/arm/include/cortex_m/exception.h
@@ -37,7 +37,7 @@ extern volatile irq_offload_routine_t offload_routine;
 /* Writes to the AIRCR must be accompanied by a write of the value 0x05FA
  * to the Vector Key field, otherwise the writes are ignored.
  */
-#define AIRCR_VECT_KEY_PERMIT_WRITE 0x05FAUL
+#define AIRCR_VECT_KEY_PERMIT_WRITE            0x05FAUL
 
 /* Exception Return (EXC_RETURN) is provided in LR upon exception entry.
  * It is used to perform an exception return and to detect possible state
@@ -47,45 +47,44 @@ extern volatile irq_offload_routine_t offload_routine;
 /* Prefix. Indicates that this is an EXC_RETURN value.
  * This field reads as 0b11111111.
  */
-#define EXC_RETURN_INDICATOR_PREFIX     (0xFF << 24)
+#define EXC_RETURN_INDICATOR_PREFIX            (0xFF << 24)
 /* bit[0]: Exception Secure. The security domain the exception was taken to. */
-#define EXC_RETURN_EXCEPTION_SECURE_Pos 0
-#define EXC_RETURN_EXCEPTION_SECURE_Msk \
-		BIT(EXC_RETURN_EXCEPTION_SECURE_Pos)
+#define EXC_RETURN_EXCEPTION_SECURE_Pos        0
+#define EXC_RETURN_EXCEPTION_SECURE_Msk        BIT(EXC_RETURN_EXCEPTION_SECURE_Pos)
 #define EXC_RETURN_EXCEPTION_SECURE_Non_Secure 0
-#define EXC_RETURN_EXCEPTION_SECURE_Secure EXC_RETURN_EXCEPTION_SECURE_Msk
+#define EXC_RETURN_EXCEPTION_SECURE_Secure     EXC_RETURN_EXCEPTION_SECURE_Msk
 /* bit[2]: Stack Pointer selection. */
-#define EXC_RETURN_SPSEL_Pos 2
-#define EXC_RETURN_SPSEL_Msk BIT(EXC_RETURN_SPSEL_Pos)
-#define EXC_RETURN_SPSEL_MAIN 0
-#define EXC_RETURN_SPSEL_PROCESS EXC_RETURN_SPSEL_Msk
+#define EXC_RETURN_SPSEL_Pos                   2
+#define EXC_RETURN_SPSEL_Msk                   BIT(EXC_RETURN_SPSEL_Pos)
+#define EXC_RETURN_SPSEL_MAIN                  0
+#define EXC_RETURN_SPSEL_PROCESS               EXC_RETURN_SPSEL_Msk
 /* bit[3]: Mode. Indicates the Mode that was stacked from. */
-#define EXC_RETURN_MODE_Pos 3
-#define EXC_RETURN_MODE_Msk BIT(EXC_RETURN_MODE_Pos)
-#define EXC_RETURN_MODE_HANDLER 0
-#define EXC_RETURN_MODE_THREAD EXC_RETURN_MODE_Msk
+#define EXC_RETURN_MODE_Pos                    3
+#define EXC_RETURN_MODE_Msk                    BIT(EXC_RETURN_MODE_Pos)
+#define EXC_RETURN_MODE_HANDLER                0
+#define EXC_RETURN_MODE_THREAD                 EXC_RETURN_MODE_Msk
 /* bit[4]: Stack frame type. Indicates whether the stack frame is a standard
  * integer only stack frame or an extended floating-point stack frame.
  */
-#define EXC_RETURN_STACK_FRAME_TYPE_Pos 4
-#define EXC_RETURN_STACK_FRAME_TYPE_Msk BIT(EXC_RETURN_STACK_FRAME_TYPE_Pos)
-#define EXC_RETURN_STACK_FRAME_TYPE_EXTENDED 0
-#define EXC_RETURN_STACK_FRAME_TYPE_STANDARD EXC_RETURN_STACK_FRAME_TYPE_Msk
+#define EXC_RETURN_STACK_FRAME_TYPE_Pos        4
+#define EXC_RETURN_STACK_FRAME_TYPE_Msk        BIT(EXC_RETURN_STACK_FRAME_TYPE_Pos)
+#define EXC_RETURN_STACK_FRAME_TYPE_EXTENDED   0
+#define EXC_RETURN_STACK_FRAME_TYPE_STANDARD   EXC_RETURN_STACK_FRAME_TYPE_Msk
 /* bit[5]: Default callee register stacking. Indicates whether the default
  * stacking rules apply, or whether the callee registers are already on the
  * stack.
  */
-#define EXC_RETURN_CALLEE_STACK_Pos 5
-#define EXC_RETURN_CALLEE_STACK_Msk BIT(EXC_RETURN_CALLEE_STACK_Pos)
-#define EXC_RETURN_CALLEE_STACK_SKIPPED 0
-#define EXC_RETURN_CALLEE_STACK_DEFAULT EXC_RETURN_CALLEE_STACK_Msk
+#define EXC_RETURN_CALLEE_STACK_Pos            5
+#define EXC_RETURN_CALLEE_STACK_Msk            BIT(EXC_RETURN_CALLEE_STACK_Pos)
+#define EXC_RETURN_CALLEE_STACK_SKIPPED        0
+#define EXC_RETURN_CALLEE_STACK_DEFAULT        EXC_RETURN_CALLEE_STACK_Msk
 /* bit[6]: Secure or Non-secure stack. Indicates whether a Secure or
  * Non-secure stack is used to restore stack frame on exception return.
  */
-#define EXC_RETURN_RETURN_STACK_Pos 6
-#define EXC_RETURN_RETURN_STACK_Msk BIT(EXC_RETURN_RETURN_STACK_Pos)
-#define EXC_RETURN_RETURN_STACK_Non_Secure 0
-#define EXC_RETURN_RETURN_STACK_Secure EXC_RETURN_RETURN_STACK_Msk
+#define EXC_RETURN_RETURN_STACK_Pos            6
+#define EXC_RETURN_RETURN_STACK_Msk            BIT(EXC_RETURN_RETURN_STACK_Pos)
+#define EXC_RETURN_RETURN_STACK_Non_Secure     0
+#define EXC_RETURN_RETURN_STACK_Secure         EXC_RETURN_RETURN_STACK_Msk
 
 /*
  * The current executing vector is found in the IPSR register. All
@@ -170,8 +169,8 @@ static ALWAYS_INLINE void z_arm_exc_setup(void)
 #endif /* CONFIG_ARM_SECURE_FIRMWARE */
 
 	/* Enable Usage, Mem, & Bus Faults */
-	SCB->SHCSR |= SCB_SHCSR_USGFAULTENA_Msk | SCB_SHCSR_MEMFAULTENA_Msk |
-		      SCB_SHCSR_BUSFAULTENA_Msk;
+	SCB->SHCSR |=
+		SCB_SHCSR_USGFAULTENA_Msk | SCB_SHCSR_MEMFAULTENA_Msk | SCB_SHCSR_BUSFAULTENA_Msk;
 #if defined(CONFIG_ARM_SECURE_FIRMWARE)
 	/* Enable Secure Fault */
 	SCB->SHCSR |= SCB_SHCSR_SECUREFAULTENA_Msk;
@@ -180,25 +179,21 @@ static ALWAYS_INLINE void z_arm_exc_setup(void)
 #endif /* CONFIG_ARM_SECURE_FIRMWARE */
 #endif /* CONFIG_CPU_CORTEX_M_HAS_PROGRAMMABLE_FAULT_PRIOS */
 
-#if defined(CONFIG_ARM_SECURE_FIRMWARE) && \
-	!defined(CONFIG_ARM_SECURE_BUSFAULT_HARDFAULT_NMI)
+#if defined(CONFIG_ARM_SECURE_FIRMWARE) && !defined(CONFIG_ARM_SECURE_BUSFAULT_HARDFAULT_NMI)
 	/* Set NMI, Hard, and Bus Faults as Non-Secure.
 	 * NMI and Bus Faults targeting the Secure state will
 	 * escalate to a SecureFault or SecureHardFault.
 	 */
 	SCB->AIRCR =
-		(SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk)))
-		| SCB_AIRCR_BFHFNMINS_Msk
-		| ((AIRCR_VECT_KEY_PERMIT_WRITE << SCB_AIRCR_VECTKEY_Pos) &
-			SCB_AIRCR_VECTKEY_Msk);
+		(SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk))) | SCB_AIRCR_BFHFNMINS_Msk |
+		((AIRCR_VECT_KEY_PERMIT_WRITE << SCB_AIRCR_VECTKEY_Pos) & SCB_AIRCR_VECTKEY_Msk);
 	/* Note: Fault conditions that would generate a SecureFault
 	 * in a PE with the Main Extension instead generate a
 	 * SecureHardFault in a PE without the Main Extension.
 	 */
 #endif /* ARM_SECURE_FIRMWARE && !ARM_SECURE_BUSFAULT_HARDFAULT_NMI */
 
-#if defined(CONFIG_CPU_CORTEX_M_HAS_SYSTICK) && \
-	!defined(CONFIG_CORTEX_M_SYSTICK)
+#if defined(CONFIG_CPU_CORTEX_M_HAS_SYSTICK) && !defined(CONFIG_CORTEX_M_SYSTICK)
 	/* SoC implements SysTick, but the system does not use it
 	 * as driver for system timing. However, the SysTick IRQ is
 	 * always enabled, so we must ensure the interrupt priority
@@ -208,7 +203,6 @@ static ALWAYS_INLINE void z_arm_exc_setup(void)
 	 */
 	NVIC_SetPriority(SysTick_IRQn, _EXC_IRQ_DEFAULT_PRIO);
 #endif /* CPU_CORTEX_M_HAS_SYSTICK && ! CORTEX_M_SYSTICK */
-
 }
 
 /**
@@ -221,9 +215,7 @@ static ALWAYS_INLINE void z_arm_clear_faults(void)
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 	/* Reset all faults */
-	SCB->CFSR = SCB_CFSR_USGFAULTSR_Msk |
-		    SCB_CFSR_MEMFAULTSR_Msk |
-		    SCB_CFSR_BUSFAULTSR_Msk;
+	SCB->CFSR = SCB_CFSR_USGFAULTSR_Msk | SCB_CFSR_MEMFAULTSR_Msk | SCB_CFSR_BUSFAULTSR_Msk;
 
 	/* Clear all Hard Faults - HFSR is write-one-to-clear */
 	SCB->HFSR = 0xffffffff;
@@ -253,7 +245,7 @@ static ALWAYS_INLINE void z_arm_set_fault_sp(const struct arch_esf *esf, uint32_
 	 * registers if necessary
 	 */
 	if ((exc_return & EXC_RETURN_STACK_FRAME_TYPE_STANDARD) ==
-			EXC_RETURN_STACK_FRAME_TYPE_EXTENDED) {
+	    EXC_RETURN_STACK_FRAME_TYPE_EXTENDED) {
 		z_arm_coredump_fault_sp += sizeof(esf->fpu);
 	}
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
diff --git a/arch/arm/include/cortex_m/kernel_arch_func.h b/arch/arm/include/cortex_m/kernel_arch_func.h
index 2a24103a32de0..5abe5870762cf 100644
--- a/arch/arm/include/cortex_m/kernel_arch_func.h
+++ b/arch/arm/include/cortex_m/kernel_arch_func.h
@@ -61,26 +61,21 @@ static ALWAYS_INLINE void arch_kernel_init(void)
 #endif /* CONFIG_SOC_PER_CORE_INIT_HOOK */
 }
 
-static ALWAYS_INLINE void
-arch_thread_return_value_set(struct k_thread *thread, unsigned int value)
+static ALWAYS_INLINE void arch_thread_return_value_set(struct k_thread *thread, unsigned int value)
 {
 	thread->arch.swap_return_value = value;
 }
 
 #if !defined(CONFIG_MULTITHREADING)
-extern FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
-	k_thread_entry_t main_func,
-	void *p1, void *p2, void *p3);
+extern FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(k_thread_entry_t main_func,
+								 void *p1, void *p2, void *p3);
 
-#define ARCH_SWITCH_TO_MAIN_NO_MULTITHREADING \
-	z_arm_switch_to_main_no_multithreading
+#define ARCH_SWITCH_TO_MAIN_NO_MULTITHREADING z_arm_switch_to_main_no_multithreading
 
 #endif /* !CONFIG_MULTITHREADING */
 
-extern FUNC_NORETURN void z_arm_userspace_enter(k_thread_entry_t user_entry,
-					       void *p1, void *p2, void *p3,
-					       uint32_t stack_end,
-					       uint32_t stack_start);
+extern FUNC_NORETURN void z_arm_userspace_enter(k_thread_entry_t user_entry, void *p1, void *p2,
+						void *p3, uint32_t stack_end, uint32_t stack_start);
 
 extern void z_arm_fatal_error(unsigned int reason, const struct arch_esf *esf);
 
@@ -102,7 +97,6 @@ static ALWAYS_INLINE int arch_swap(unsigned int key)
 	return _current->arch.swap_return_value;
 }
 
-
 #endif /* _ASMLANGUAGE */
 
 #ifdef __cplusplus
diff --git a/arch/arm/include/cortex_m/stack.h b/arch/arm/include/cortex_m/stack.h
index feeaf719a88e0..6b534a3ea5b1a 100644
--- a/arch/arm/include/cortex_m/stack.h
+++ b/arch/arm/include/cortex_m/stack.h
@@ -26,8 +26,7 @@
 extern "C" {
 #endif
 
-K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_MAX_NUM_CPUS,
-			     CONFIG_ISR_STACK_SIZE);
+K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_MAX_NUM_CPUS, CONFIG_ISR_STACK_SIZE);
 
 /**
  *
@@ -39,9 +38,8 @@ K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_MAX_NUM_CPUS,
  */
 static ALWAYS_INLINE void z_arm_interrupt_stack_setup(void)
 {
-	uint32_t msp =
-		(uint32_t)(K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0])) +
-			   K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]);
+	uint32_t msp = (uint32_t)(K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0])) +
+		       K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]);
 
 	__set_MSP(msp);
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
diff --git a/arch/arm/include/cortex_m/tz_ns.h b/arch/arm/include/cortex_m/tz_ns.h
index 51ed5eb1ca9fe..dd6dcb4c22e56 100644
--- a/arch/arm/include/cortex_m/tz_ns.h
+++ b/arch/arm/include/cortex_m/tz_ns.h
@@ -46,24 +46,18 @@
  *                  the functions have been called. This instruction must leave
  *                  r0-r3 unmodified.
  */
-#define __TZ_WRAP_FUNC_RAW(preface, name, postface, store_lr, load_lr) \
-		__asm__ volatile( \
-			".global "#preface"; .type "#preface", %function"); \
-		__asm__ volatile( \
-			".global "#name"; .type "#name", %function"); \
-		__asm__ volatile( \
-			".global "#postface"; .type "#postface", %function"); \
-		__asm__ volatile( \
-			store_lr "\n\t" \
-			"push {r0-r3}\n\t" \
-			"bl " #preface "\n\t" \
-			"pop {r0-r3}\n\t" \
-			"bl " #name " \n\t" \
-			"push {r0-r3}\n\t" \
-			"bl " #postface "\n\t" \
-			"pop {r0-r3}\n\t" \
-			load_lr "\n\t" \
-			::);
+#define __TZ_WRAP_FUNC_RAW(preface, name, postface, store_lr, load_lr)                             \
+	__asm__ volatile(".global " #preface "; .type " #preface ", %function");                   \
+	__asm__ volatile(".global " #name "; .type " #name ", %function");                         \
+	__asm__ volatile(".global " #postface "; .type " #postface ", %function");                 \
+	__asm__ volatile(store_lr "\n\t"                                                           \
+				  "push {r0-r3}\n\t"                                               \
+				  "bl " #preface "\n\t"                                            \
+				  "pop {r0-r3}\n\t"                                                \
+				  "bl " #name "\n\t"                                               \
+				  "push {r0-r3}\n\t"                                               \
+				  "bl " #postface "\n\t"                                           \
+				  "pop {r0-r3}\n\t" load_lr "\n\t" ::);
 
 /**
  * @brief Macro for "sandwiching" a function call (@p name) in two other calls
@@ -98,10 +92,8 @@
  *
  * See @ref __TZ_WRAP_FUNC_RAW for more information.
  */
-#define __TZ_WRAP_FUNC(preface, name, postface) \
-	__TZ_WRAP_FUNC_RAW(preface, name, postface, "push {r4, lr}", \
-			"pop {r4, pc}")
-
+#define __TZ_WRAP_FUNC(preface, name, postface)                                                    \
+	__TZ_WRAP_FUNC_RAW(preface, name, postface, "push {r4, lr}", "pop {r4, pc}")
 
 #ifdef CONFIG_ARM_FIRMWARE_USES_SECURE_ENTRY_FUNCS
 /**
@@ -130,10 +122,10 @@
  * @param ...   The rest of the signature of the function. This must be the same
  *              signature as the corresponding NS entry function.
  */
-#define TZ_THREAD_SAFE_NONSECURE_ENTRY_FUNC(name, ret, nsc_name, ...) \
-	ret __attribute__((naked)) name(__VA_ARGS__) \
-	{ \
-		__TZ_WRAP_FUNC(k_sched_lock, nsc_name, k_sched_unlock); \
+#define TZ_THREAD_SAFE_NONSECURE_ENTRY_FUNC(name, ret, nsc_name, ...)                              \
+	ret __attribute__((naked)) name(__VA_ARGS__)                                               \
+	{                                                                                          \
+		__TZ_WRAP_FUNC(k_sched_lock, nsc_name, k_sched_unlock);                            \
 	}
 
 #endif /* CONFIG_ARM_FIRMWARE_USES_SECURE_ENTRY_FUNCS */
diff --git a/arch/arm64/core/cortex_r/arm_mpu.c b/arch/arm64/core/cortex_r/arm_mpu.c
index 2bd6d265c9a9e..3053d90cb75f6 100644
--- a/arch/arm64/core/cortex_r/arm_mpu.c
+++ b/arch/arm64/core/cortex_r/arm_mpu.c
@@ -196,7 +196,7 @@ static ALWAYS_INLINE void region_init(const uint32_t index,
 				  .limit = (reg).dt_addr + (reg).dt_size,	\
 				  .attr  = _ATTR,				\
 				}
-
+#ifdef CONFIG_MEM_ATTR
 /* This internal function programs the MPU regions defined in the DT when using
  * the `zephyr,memory-attr = <( DT_MEM_ARM(...) )>` property.
  */
@@ -247,7 +247,7 @@ static int mpu_configure_regions_from_dt(uint8_t *reg_index)
 
 	return 0;
 }
-
+#endif /* CONFIG_MEM_ATTR */
 /*
  * @brief MPU default configuration
  *
@@ -303,13 +303,13 @@ FUNC_NO_STACK_PROTECTOR void z_arm64_mm_init(bool is_primary_core)
 
 	/* Update the number of programmed MPU regions. */
 	tmp_static_num = mpu_config.num_regions;
-
+#ifdef CONFIG_MEM_ATTR
 	/* DT-defined MPU regions. */
 	if (mpu_configure_regions_from_dt(&tmp_static_num) == -EINVAL) {
 		__ASSERT(0, "Failed to allocate MPU regions from DT\n");
 		return;
 	}
-
+#endif
 	arm_core_mpu_enable();
 
 	if (!is_primary_core) {
diff --git a/arch/arm64/core/elf.c b/arch/arm64/core/elf.c
index 66e9f21fc06f8..c60c99fad46a6 100644
--- a/arch/arm64/core/elf.c
+++ b/arch/arm64/core/elf.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/llext/elf.h>
 #include <zephyr/llext/llext.h>
+#include <zephyr/llext/llext_internal.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/byteorder.h>
@@ -430,12 +431,32 @@ static int imm_reloc_handler(elf_rela_t *rel, elf_word reloc_type, uintptr_t loc
  * @retval -ENOTSUP Unsupported relocation
  * @retval -ENOEXEC Invalid relocation
  */
-int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc, uintptr_t sym_base_addr, const char *sym_name,
-		      uintptr_t load_bias)
+int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *rel,
+		      const elf_shdr_t *shdr)
 {
 	int ret = 0;
 	bool overflow_check = true;
 	elf_word reloc_type = ELF_R_TYPE(rel->r_info);
+	const uintptr_t loc = llext_get_reloc_instruction_location(ldr, ext, shdr->sh_info, rel);
+	elf_sym_t sym;
+	uintptr_t sym_base_addr;
+	const char *sym_name;
+
+	ret = llext_read_symbol(ldr, ext, rel, &sym);
+
+	if (ret != 0) {
+		LOG_ERR("Could not read symbol from binary!");
+		return ret;
+	}
+
+	sym_name = llext_symbol_name(ldr, ext, &sym);
+
+	ret = llext_lookup_symbol(ldr, ext, &sym_base_addr, rel, &sym, sym_name, shdr);
+
+	if (ret != 0) {
+		LOG_ERR("Could not find symbol %s!", sym_name);
+		return ret;
+	}
 
 	switch (reloc_type) {
 	case R_ARM_NONE:
diff --git a/arch/arm64/core/fatal.c b/arch/arm64/core/fatal.c
index 7955b6f7d6d16..e7480c9de15aa 100644
--- a/arch/arm64/core/fatal.c
+++ b/arch/arm64/core/fatal.c
@@ -17,9 +17,11 @@
 #include <zephyr/drivers/pm_cpu_ops.h>
 #include <zephyr/arch/common/exc_handle.h>
 #include <zephyr/kernel.h>
+#include <zephyr/linker/linker-defs.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/poweroff.h>
 #include <kernel_arch_func.h>
+#include <kernel_arch_interface.h>
 
 #include "paging.h"
 
@@ -201,6 +203,33 @@ static void esf_dump(const struct arch_esf *esf)
 #ifdef CONFIG_ARCH_STACKWALK
 typedef bool (*arm64_stacktrace_cb)(void *cookie, unsigned long addr, void *fp);
 
+static bool is_address_mapped(uint64_t *addr)
+{
+	uintptr_t *phys = NULL;
+
+	if (*addr == 0U)
+		return false;
+
+	/* Check alignment. */
+	if ((*addr & (sizeof(uint32_t) - 1U)) != 0U)
+		return false;
+
+	return !arch_page_phys_get((void *) addr, phys);
+}
+
+static bool is_valid_jump_address(uint64_t *addr)
+{
+	if (*addr == 0U)
+		return false;
+
+	/* Check alignment. */
+	if ((*addr & (sizeof(uint32_t) - 1U)) != 0U)
+		return false;
+
+	return ((*addr >= (uint64_t)__text_region_start) &&
+		(*addr <= (uint64_t)(__text_region_end)));
+}
+
 static void walk_stackframe(arm64_stacktrace_cb cb, void *cookie, const struct arch_esf *esf,
 			    int max_frames)
 {
@@ -234,7 +263,11 @@ static void walk_stackframe(arm64_stacktrace_cb cb, void *cookie, const struct a
 	}
 
 	for (int i = 0; (fp != NULL) && (i < max_frames); i++) {
+		if (!is_address_mapped(fp))
+			break;
 		lr = fp[1];
+		if (!is_valid_jump_address(&lr))
+			break;
 		if (!cb(cookie, lr, fp)) {
 			break;
 		}
@@ -414,8 +447,6 @@ void z_arm64_fatal_error(unsigned int reason, struct arch_esf *esf)
 #endif /* CONFIG_EXCEPTION_DEBUG */
 
 	z_fatal_error(reason, esf);
-
-	CODE_UNREACHABLE;
 }
 
 /**
diff --git a/arch/arm64/core/reset.S b/arch/arm64/core/reset.S
index a01139ad70091..235156f9a1c8c 100644
--- a/arch/arm64/core/reset.S
+++ b/arch/arm64/core/reset.S
@@ -58,9 +58,10 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__reset_prep_c)
 	b	out
 #endif /* CONFIG_ARMV8_R */
 2:
-	/* Disable alignment fault checking */
+	/* Disable alignment fault checking, disable D-Cache, I-Cache, MMU for safety */
 	mrs	x0, sctlr_el2
-	bic	x0, x0, SCTLR_A_BIT
+	mov	x1, #(SCTLR_A_BIT | SCTLR_C_BIT | SCTLR_M_BIT | SCTLR_I_BIT)
+	bic	x0, x0, x1
 	msr	sctlr_el2, x0
 	isb
 
diff --git a/arch/arm64/core/thread.c b/arch/arm64/core/thread.c
index 18f49945eda49..c48672a5f0761 100644
--- a/arch/arm64/core/thread.c
+++ b/arch/arm64/core/thread.c
@@ -30,7 +30,7 @@
  *   privileged portion of the user stack without touching SP_EL0. This portion
  *   is marked as not user accessible in the MMU/MPU.
  *
- * - a stack guard region will be added bellow the kernel stack when
+ * - a stack guard region will be added below the kernel stack when
  *   ARM64_STACK_PROTECTION is enabled. In this case, SP_EL0 will always point
  *   to the safe exception stack in the kernel space. For the kernel thread,
  *   SP_EL0 will not change always pointing to safe exception stack. For the
diff --git a/arch/arm64/core/vector_table.S b/arch/arm64/core/vector_table.S
index 632304b70299e..1c2f4218ff1ac 100644
--- a/arch/arm64/core/vector_table.S
+++ b/arch/arm64/core/vector_table.S
@@ -63,7 +63,7 @@ _ASM_FILE_PROLOGUE
 	stp	x12, x13, [sp, ___esf_t_x12_x13_OFFSET]
 	stp	x14, x15, [sp, ___esf_t_x14_x15_OFFSET]
 #ifdef CONFIG_ARM64_SAFE_EXCEPTION_STACK
-	/* The expection from el1 does not need to save x16, x17, x18 and lr */
+	/* The exception from el1 does not need to save x16, x17, x18 and lr */
 	.if	\el == el0
 #endif
 	stp	x16, x17, [sp, ___esf_t_x16_x17_OFFSET]
diff --git a/arch/common/CMakeLists.txt b/arch/common/CMakeLists.txt
index e79b7cd0abfa6..6f84bb9635123 100644
--- a/arch/common/CMakeLists.txt
+++ b/arch/common/CMakeLists.txt
@@ -56,12 +56,21 @@ zephyr_linker_sources_ifdef(CONFIG_GEN_IRQ_VECTOR_TABLE
 )
 
 if(CONFIG_GEN_ISR_TABLES)
-  zephyr_linker_section(NAME .intList VMA IDT_LIST LMA IDT_LIST NOINPUT PASS NOT LINKER_ZEPHYR_FINAL)
-  zephyr_linker_section_configure(SECTION .intList KEEP INPUT ".irq_info" FIRST)
-  zephyr_linker_section_configure(SECTION .intList KEEP INPUT ".intList")
-
-  zephyr_linker_section_configure(SECTION /DISCARD/ KEEP INPUT ".irq_info" PASS LINKER_ZEPHYR_FINAL)
-  zephyr_linker_section_configure(SECTION /DISCARD/ KEEP INPUT ".intList"  PASS LINKER_ZEPHYR_FINAL)
+  # IAR Toolchain is having problems with discarding .intList
+  # This will always keep .intList in a harmless location
+  # until we can implement a proper DISCARD.
+  if(ZEPHYR_TOOLCHAIN_VARIANT STREQUAL "iar")
+    zephyr_linker_section(NAME .intList GROUP RODATA_REGION NOINPUT)
+    zephyr_linker_section_configure(SECTION .intList KEEP INPUT ".irq_info" FIRST)
+    zephyr_linker_section_configure(SECTION .intList KEEP INPUT ".intList")
+  else()
+    zephyr_linker_section(NAME .intList VMA IDT_LIST LMA IDT_LIST NOINPUT PASS NOT LINKER_ZEPHYR_FINAL)
+    zephyr_linker_section_configure(SECTION .intList KEEP INPUT ".irq_info" FIRST)
+    zephyr_linker_section_configure(SECTION .intList KEEP INPUT ".intList")
+
+    zephyr_linker_section_configure(SECTION /DISCARD/ KEEP INPUT ".irq_info" PASS LINKER_ZEPHYR_FINAL)
+    zephyr_linker_section_configure(SECTION /DISCARD/ KEEP INPUT ".intList"  PASS LINKER_ZEPHYR_FINAL)
+  endif()
 endif()
 
 zephyr_linker_sources_ifdef(CONFIG_ARCH_HAS_RAMFUNC_SUPPORT
diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt
index 8dfc696bc6d5f..21b6bf7f197d0 100644
--- a/arch/posix/CMakeLists.txt
+++ b/arch/posix/CMakeLists.txt
@@ -75,6 +75,10 @@ if (CONFIG_NATIVE_APPLICATION)
   zephyr_compile_options(
     -include ${ZEPHYR_BASE}/arch/posix/include/posix_cheats.h
   )
+  # About this -include directive: The reason to do it this way, is because in this
+  # manner it is transparent to the application. Otherwise posix_cheats.h needs to
+  # be included in all the applications' files which define main( ), and in any
+  # app file which uses any of the APIs renamed in that header.
 elseif (CONFIG_NATIVE_LIBRARY)
   zephyr_compile_options(
     -fvisibility=hidden
@@ -146,14 +150,6 @@ if (CONFIG_NATIVE_APPLICATION)
   )
 endif()
 
-# About the -include directive: The reason to do it this way, is because in this
-# manner it is transparent to the application. Otherwise posix_cheats.h needs to
-# be included in all the applications' files which define main( ), and in any
-# app file which uses the pthreads like API provided by Zephyr
-# ( include/posix/pthread.h / kernel/pthread.c ) [And any future API added to
-# Zephyr which will clash with the native POSIX API] . It would also need to
-# be included in a few zephyr kernel files.
-
 #
 # Support for the LLVM Sanitizer toolchain instrumentation frameworks
 # (supported by current gcc's as well)
@@ -199,4 +195,5 @@ if(NOT ${LLVM_SANITIZERS_ARG} STREQUAL "")
   target_compile_options(native_simulator INTERFACE ${LLVM_SANITIZERS_ARG})
 endif()
 
+include(natsim_optional.cmake)
 add_subdirectory(core)
diff --git a/arch/posix/Kconfig b/arch/posix/Kconfig
index 1ed79b38976d8..f7ed30cf175e6 100644
--- a/arch/posix/Kconfig
+++ b/arch/posix/Kconfig
@@ -3,7 +3,7 @@
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-menu "POSIX (native) Options"
+menu "Native (POSIX) Architecture Options"
 	depends on ARCH_POSIX
 
 config ARCH
@@ -27,7 +27,7 @@ config ARCH_POSIX_LIBFUZZER
 	help
 	  Build as an LLVM libfuzzer target. Requires
 	  support from the toolchain (currently only clang works, and
-	  only on native_{posix,sim}[//64]), and should normally be used in
+	  only on native_sim[//64]), and should normally be used in
 	  concert with some of CONFIG_ASAN/UBSAN/MSAN for validation.
 	  The application needs to implement the
 	  LLVMFuzzerTestOneInput() entry point, which runs in the host
@@ -41,4 +41,6 @@ config ARCH_POSIX_TRAP_ON_FATAL
 	  Raise a SIGTRAP signal on fatal error before exiting.
 	  This automatically suspends the target if a debugger is attached.
 
+rsource "Kconfig.natsim_optional"
+
 endmenu
diff --git a/arch/posix/Kconfig.natsim_optional b/arch/posix/Kconfig.natsim_optional
new file mode 100644
index 0000000000000..4ec8dcdc4a559
--- /dev/null
+++ b/arch/posix/Kconfig.natsim_optional
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config NATIVE_USE_NSI_ERRNO
+	bool
+	help
+	  Build the native simulator nsi_errno component with the Zephyr embedded code.
+	  This component allows translating errno values from/to the embedded libC to/from the host libC.
diff --git a/arch/posix/include/posix_cheats.h b/arch/posix/include/posix_cheats.h
index d8307df0ef8d3..fa62dc2a2aaac 100644
--- a/arch/posix/include/posix_cheats.h
+++ b/arch/posix/include/posix_cheats.h
@@ -16,8 +16,8 @@
  * If you do see a link error telling you that zap_something is undefined, it is
  * likely that you forgot to select the corresponding Zephyr POSIX API.
  *
- * This header is included automatically when targeting some POSIX ARCH boards
- * (for ex. native_posix).
+ * This header is included automatically when targeting old POSIX ARCH boards
+ * based on the CONFIG_NATIVE_APPLICATION architecture.
  * It will be included in _all_ Zephyr and application source files
  * (it is passed with the option "-include" to the compiler call)
  *
@@ -34,7 +34,7 @@
 
 /*
  * Normally main() is the main entry point of a C executable.
- * When compiling for native_posix, the Zephyr "application" is not the actual
+ * When compiling using CONFIG_NATIVE_APPLICATION, the Zephyr "application" is not the actual
  * entry point of the executable but something the Zephyr OS calls during
  * boot.
  * Therefore we need to rename this application main something else, so
@@ -58,7 +58,7 @@ extern "C" int _posix_zephyr_main(void);
 /*
  * The defines below in this header exist only to enable the Zephyr POSIX API
  * (include/posix/), and applications using it, to be compiled on top of
- * native_posix.
+ * the deprecated CONFIG_NATIVE_APPLICATION targets.
  *
  * Without this header, both the Zephyr POSIX API functions and the equivalent
  * host OS functions would have the same name. This would result in the linker
@@ -72,8 +72,8 @@ extern "C" int _posix_zephyr_main(void);
  * into something which is unlikely to collide with other real functions
  * (Any unlikely string would have done)
  *
- * If you want to link an external library together with Zephyr code for the
- * native_posix target, where that external library calls into the Zephyr
+ * If you want to link an external library together with Zephyr code for a
+ * CONFIG_NATIVE_APPLICATION based target, where that external library calls into the Zephyr
  * POSIX API, you may want to include this header when compiling that library,
  * or rename the calls to match the ones in the defines below.
  */
diff --git a/arch/posix/include/posix_core.h b/arch/posix/include/posix_core.h
index 983f80a3abd2f..8f72a267389b9 100644
--- a/arch/posix/include/posix_core.h
+++ b/arch/posix/include/posix_core.h
@@ -31,10 +31,9 @@ typedef struct {
 	 * Note: If more elements are added to this structure, remember to
 	 * update ARCH_POSIX_RECOMMENDED_STACK_SIZE in the configuration.
 	 *
-	 * Currently there are 4 pointers + 2 ints, on a 32-bit native posix
-	 * implementation this will result in 24 bytes ( 4*4 + 2*4).
-	 * For a 64-bit implementation the recommended stack size will be
-	 * 40 bytes ( 4*8 + 2*4 ).
+	 * Currently there are 4 pointers + 2 ints, on a 32-bit build this will result in 24 bytes
+	 * (4*4 + 2*4).
+	 * For a 64-bit build the recommended stack size will be 40 bytes ( 4*8 + 2*4 ).
 	 */
 } posix_thread_status_t;
 
diff --git a/arch/posix/natsim_optional.cmake b/arch/posix/natsim_optional.cmake
new file mode 100644
index 0000000000000..e2f3d5f0eb3aa
--- /dev/null
+++ b/arch/posix/natsim_optional.cmake
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Selection of optional components provided by the native simulator
+
+if(CONFIG_NATIVE_USE_NSI_ERRNO)
+  zephyr_library()
+
+  zephyr_library_sources(${NSI_DIR}/common/src/nsi_errno.c)
+endif()
diff --git a/arch/riscv/core/cpu_idle.c b/arch/riscv/core/cpu_idle.c
index 413b911a53e31..6991da4090528 100644
--- a/arch/riscv/core/cpu_idle.c
+++ b/arch/riscv/core/cpu_idle.c
@@ -12,6 +12,7 @@ void arch_cpu_idle(void)
 {
 	sys_trace_idle();
 	__asm__ volatile("wfi");
+	sys_trace_idle_exit();
 	irq_unlock(MSTATUS_IEN);
 }
 #endif
@@ -21,6 +22,7 @@ void arch_cpu_atomic_idle(unsigned int key)
 {
 	sys_trace_idle();
 	__asm__ volatile("wfi");
+	sys_trace_idle_exit();
 	irq_unlock(key);
 }
 #endif
diff --git a/arch/riscv/core/elf.c b/arch/riscv/core/elf.c
index e0630876dd4c6..2ae4b50d132bf 100644
--- a/arch/riscv/core/elf.c
+++ b/arch/riscv/core/elf.c
@@ -8,6 +8,9 @@
  */
 #include <zephyr/llext/elf.h>
 #include <zephyr/llext/llext.h>
+#include <zephyr/llext/llext_internal.h>
+#include <zephyr/llext/loader.h>
+
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
 
@@ -59,7 +62,133 @@ static inline int riscv_relocation_fits(long long jump_target, long long max_dis
 	return 0;
 }
 
-static long long last_u_type_jump_target;
+static size_t riscv_last_rel_idx;
+
+/**
+ * @brief On RISC-V, PC-relative relocations (PCREL_LO12_I, PCREL_LO12_S) do not refer to
+ * the actual symbol. Instead, they refer to the location of a different instruction in the
+ * same section, which has a PCREL_HI20 relocation. The relocation offset is then computed based
+ * on the location and symbol from the HI20 relocation. 20 bits from the offset go into the
+ * instruction that has the HI20 relocation, and 12 bits go into the PCREL_LO12 instruction.
+ *
+ * @param[in] ldr llext loader
+ * @param[in] ext current extension
+ * @param[in] pcrel_lo12 the elf relocation structure for the PCREL_LO12I/S relocation.
+ * @param[in] shdr ELF section header for the relocation
+ * @param[in] sym ELF symbol for PCREL_LO12I
+ * @param[out] link_addr_out computed link address
+ *
+ */
+static int llext_riscv_find_sym_pcrel(struct llext_loader *ldr, struct llext *ext,
+				      const elf_rela_t *pcrel_lo12, const elf_shdr_t *shdr,
+				      const elf_sym_t *sym, intptr_t *link_addr_out)
+{
+	int ret;
+	elf_rela_t candidate;
+	uintptr_t candidate_loc;
+	elf_word reloc_type;
+	elf_sym_t candidate_sym;
+	uintptr_t link_addr;
+	const char *symbol_name;
+	int iteration_start = riscv_last_rel_idx;
+	bool is_first = true;
+	const elf_word rel_cnt = shdr->sh_size / shdr->sh_entsize;
+	const uintptr_t sect_base = (uintptr_t)llext_loaded_sect_ptr(ldr, ext, shdr->sh_info);
+	bool found_candidate = false;
+
+	if (iteration_start >= rel_cnt) {
+		/* value left over from a different section */
+		iteration_start = 0;
+	}
+
+	reloc_type = ELF32_R_TYPE(pcrel_lo12->r_info);
+
+	if (reloc_type != R_RISCV_PCREL_LO12_I && reloc_type != R_RISCV_PCREL_LO12_S) {
+		/* this function does not apply - the symbol is already correct */
+		return 0;
+	}
+
+	for (int i = iteration_start; i != iteration_start || is_first; i++) {
+
+		is_first = false;
+
+		/* get each relocation entry */
+		ret = llext_seek(ldr, shdr->sh_offset + i * shdr->sh_entsize);
+		if (ret != 0) {
+			return ret;
+		}
+
+		ret = llext_read(ldr, &candidate, shdr->sh_entsize);
+		if (ret != 0) {
+			return ret;
+		}
+
+		/* FIXME currently, RISC-V relocations all fit in ELF_32_R_TYPE */
+		reloc_type = ELF32_R_TYPE(candidate.r_info);
+
+		candidate_loc = sect_base + candidate.r_offset;
+
+		/*
+		 * RISC-V ELF specification: "value" of the symbol for the PCREL_LO12 relocation
+		 * is actually the offset of the PCREL_HI20 relocation instruction from section
+		 * start
+		 */
+		if (candidate.r_offset == sym->st_value && reloc_type == R_RISCV_PCREL_HI20) {
+			found_candidate = true;
+
+			/*
+			 * start here in next iteration
+			 * it is fairly likely (albeit not guaranteed) that we require PCREL_HI20
+			 * relocations in order
+			 * we can safely write this even if an error occurs after the loop -
+			 * in that case,we can safely abort the execution anyway
+			 */
+			riscv_last_rel_idx = i;
+
+			break;
+		}
+
+		if (i + 1 >= rel_cnt) {
+			/* wrap around and search in previously processed indices as well */
+			i = -1;
+		}
+	}
+
+	if (!found_candidate) {
+		LOG_ERR("Could not find R_RISCV_PCREL_HI20 relocation for "
+			"R_RISCV_PCREL_LO12 relocation!");
+		return -ENOEXEC;
+	}
+
+	/* we found a match - need to compute the relocation for this instruction */
+	/* lower 12 bits go to the PCREL_LO12 relocation */
+
+	/* get corresponding / "actual" symbol */
+	ret = llext_seek(ldr, ldr->sects[LLEXT_MEM_SYMTAB].sh_offset +
+			 ELF_R_SYM(candidate.r_info) * sizeof(elf_sym_t));
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = llext_read(ldr, &candidate_sym, sizeof(elf_sym_t));
+	if (ret != 0) {
+		return ret;
+	}
+
+	symbol_name = llext_symbol_name(ldr, ext, &candidate_sym);
+
+	ret = llext_lookup_symbol(ldr, ext, &link_addr, &candidate, &candidate_sym,
+				  symbol_name, shdr);
+
+	if (ret != 0) {
+		return ret;
+	}
+
+	*link_addr_out = (intptr_t)(link_addr + candidate.r_addend - candidate_loc); /* S + A - P */
+
+	/* found the matching entry */
+	return 0;
+}
 
 /**
  * @brief RISC-V specific function for relocating partially linked ELF binaries
@@ -68,11 +197,32 @@ static long long last_u_type_jump_target;
  * https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc
  *
  */
-int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc_unsigned, uintptr_t sym_base_addr_unsigned,
-		      const char *sym_name, uintptr_t load_bias)
+int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *rel,
+		      const elf_shdr_t *shdr)
 {
 	/* FIXME currently, RISC-V relocations all fit in ELF_32_R_TYPE */
 	elf_word reloc_type = ELF32_R_TYPE(rel->r_info);
+	const uintptr_t load_bias = (uintptr_t)ext->mem[LLEXT_MEM_TEXT];
+	const uintptr_t loc_unsigned = llext_get_reloc_instruction_location(ldr, ext,
+									    shdr->sh_info, rel);
+	elf_sym_t sym;
+	uintptr_t sym_base_addr_unsigned;
+	const char *sym_name;
+	int ret;
+
+	ret = llext_read_symbol(ldr, ext, rel, &sym);
+	if (ret != 0) {
+		LOG_ERR("Could not read symbol from binary!");
+		return ret;
+	}
+
+	sym_name = llext_symbol_name(ldr, ext, &sym);
+	ret = llext_lookup_symbol(ldr, ext, &sym_base_addr_unsigned, rel, &sym, sym_name, shdr);
+
+	if (ret != 0) {
+		LOG_ERR("Could not find symbol %s!", sym_name);
+		return ret;
+	}
 	/*
 	 * The RISC-V specification uses the following symbolic names for the relocations:
 	 *
@@ -99,7 +249,22 @@ int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc_unsigned, uintptr_t sym_bas
 	long long original_imm8, jump_target;
 	int16_t compressed_imm8;
 	__typeof__(rel->r_addend) target_alignment = 1;
-	const intptr_t sym_base_addr = (intptr_t)sym_base_addr_unsigned;
+	intptr_t sym_base_addr = (intptr_t)sym_base_addr_unsigned;
+
+	/*
+	 * For HI20/LO12 ("PCREL") relocation pairs, we need a helper function to
+	 * determine the address for the LO12 relocation, as it depends on the
+	 * value in the HI20 relocation.
+	 */
+	ret = llext_riscv_find_sym_pcrel(ldr, ext, rel, shdr, &sym, &sym_base_addr);
+
+	if (ret != 0) {
+		LOG_ERR("Failed to resolve RISC-V PCREL relocation for symbol %s at %p "
+			"with base address %p load address %p type %" PRIu64,
+			sym_name, (void *)loc, (void *)sym_base_addr, (void *)load_bias,
+			(uint64_t)reloc_type);
+		return ret;
+	}
 
 	LOG_DBG("Relocating symbol %s at %p with base address %p load address %p type %" PRIu64,
 		sym_name, (void *)loc, (void *)sym_base_addr, (void *)load_bias,
@@ -176,43 +341,32 @@ int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc_unsigned, uintptr_t sym_bas
 			UNALIGNED_PUT(modified_operand, loc32);
 		}
 
-		last_u_type_jump_target = jump_target;
-
 		return riscv_relocation_fits(jump_target, RISCV_MAX_JUMP_DISTANCE_U_PLUS_I_TYPE,
 					     reloc_type);
 	case R_RISCV_PCREL_LO12_I:
-		/* need the same jump target as preceding U-type relocation */
-		if (last_u_type_jump_target == 0) {
-			LOG_ERR("R_RISCV_PCREL_LO12_I relocation without preceding U-type "
-				"relocation!");
-			return -ENOEXEC;
-		}
+		/*
+		 * Jump target is resolved in llext_riscv_find_sym_pcrel in llext_link.c
+		 * as it depends on other relocations.
+		 */
 		modified_operand = UNALIGNED_GET(loc32);
-		jump_target = last_u_type_jump_target; /* S - P */
-		last_u_type_jump_target = 0;
-		imm8 = jump_target;
+		imm8 = (int32_t)sym_base_addr; /* already computed */
 		modified_operand = R_RISCV_CLEAR_ITYPE_IMM8(modified_operand);
 		modified_operand = R_RISCV_SET_ITYPE_IMM8(modified_operand, imm8);
 		UNALIGNED_PUT(modified_operand, loc32);
-		return riscv_relocation_fits(jump_target, RISCV_MAX_JUMP_DISTANCE_U_PLUS_I_TYPE,
-					     reloc_type);
+		/* we have checked that this fits with the associated relocation */
 		break;
 	case R_RISCV_PCREL_LO12_S:
-		/* need the same jump target as preceding U-type relocation */
-		if (last_u_type_jump_target == 0) {
-			LOG_ERR("R_RISCV_PCREL_LO12_I relocation without preceding U-type "
-				"relocation!");
-			return -ENOEXEC;
-		}
+		/*
+		 * Jump target is resolved in llext_riscv_find_sym_pcrel in llext_link.c
+		 * as it depends on other relocations.
+		 */
 		modified_operand = UNALIGNED_GET(loc32);
-		jump_target = last_u_type_jump_target; /* S - P */
-		last_u_type_jump_target = 0;
-		imm8 = jump_target;
+		imm8 = (int32_t)sym_base_addr; /* already computed */
 		modified_operand = R_RISCV_CLEAR_STYPE_IMM8(modified_operand);
 		modified_operand = R_RISCV_SET_STYPE_IMM8(modified_operand, imm8);
 		UNALIGNED_PUT(modified_operand, loc32);
-		return riscv_relocation_fits(jump_target, RISCV_MAX_JUMP_DISTANCE_U_PLUS_I_TYPE,
-					     reloc_type);
+		/* we have checked that this fits with the associated relocation */
+		break;
 	case R_RISCV_HI20:
 		jump_target = sym_base_addr + rel->r_addend; /* S + A */
 		modified_operand = UNALIGNED_GET(loc32);
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c947c0afc1b83..a9a883a3104f6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -83,6 +83,7 @@ config X86_64
 	select X86_MMX
 	select X86_SSE
 	select X86_SSE2
+	select ARCH_HAS_DIRECTED_IPIS if !X2APIC
 
 menu "x86 Features"
 
diff --git a/arch/x86/core/CMakeLists.txt b/arch/x86/core/CMakeLists.txt
index e8055c6fae277..abbc052a62472 100644
--- a/arch/x86/core/CMakeLists.txt
+++ b/arch/x86/core/CMakeLists.txt
@@ -21,6 +21,8 @@ zephyr_library_sources_ifdef(CONFIG_X86_MMU x86_mmu.c)
 zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.c)
 zephyr_library_sources_ifdef(CONFIG_ARCH_CACHE cache.c)
 
+zephyr_library_sources_ifdef(CONFIG_DYNAMIC_BOOTARGS bootargs.c)
+
 zephyr_library_sources_ifdef(CONFIG_X86_VERY_EARLY_CONSOLE early_serial.c)
 
 zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE tls.c)
diff --git a/arch/x86/core/bootargs.c b/arch/x86/core/bootargs.c
new file mode 100644
index 0000000000000..5ae4c2b0f9503
--- /dev/null
+++ b/arch/x86/core/bootargs.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Cadence Design Systems, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#if defined(CONFIG_MULTIBOOT_INFO)
+
+__pinned_noinit char multiboot_cmdline[CONFIG_BOOTARGS_ARGS_BUFFER_SIZE];
+
+const char *get_bootargs(void)
+{
+	return multiboot_cmdline;
+}
+
+#elif defined(CONFIG_X86_EFI)
+
+__pinned_noinit char efi_bootargs[CONFIG_BOOTARGS_ARGS_BUFFER_SIZE];
+
+const char *get_bootargs(void)
+{
+	return efi_bootargs;
+}
+
+#endif
diff --git a/arch/x86/core/efi.c b/arch/x86/core/efi.c
index 64faeb9efa533..e5470e6d8a364 100644
--- a/arch/x86/core/efi.c
+++ b/arch/x86/core/efi.c
@@ -18,10 +18,6 @@ static uint64_t __aligned(64) efi_stack[1024];
 
 struct efi_boot_arg *efi;
 
-#ifdef CONFIG_DYNAMIC_BOOTARGS
-__pinned_noinit char efi_bootargs[CONFIG_BOOTARGS_ARGS_BUFFER_SIZE];
-#endif
-
 void *efi_get_acpi_rsdp(void)
 {
 	if (efi == NULL) {
@@ -173,10 +169,3 @@ int arch_printk_char_out(int c)
 	return efi_console_putchar(c);
 }
 #endif
-
-#ifdef CONFIG_DYNAMIC_BOOTARGS
-const char *get_bootargs(void)
-{
-	return efi_bootargs;
-}
-#endif /* CONFIG_DYNAMIC_BOOTARGS */
diff --git a/arch/x86/core/ia32/float.c b/arch/x86/core/ia32/float.c
index c89bf7accd5a1..9b6f4daa18e06 100644
--- a/arch/x86/core/ia32/float.c
+++ b/arch/x86/core/ia32/float.c
@@ -194,7 +194,7 @@ void z_float_enable(struct k_thread *thread, unsigned int options)
 	 * must be preserved).
 	 */
 
-	fp_owner = _kernel.current_fp;
+	fp_owner = _kernel.cpus[0].arch.fpu_owner;
 	if (fp_owner != NULL) {
 		if ((fp_owner->arch.flags & X86_THREAD_FLAG_ALL) != 0) {
 			FpCtxSave(fp_owner);
@@ -215,7 +215,7 @@ void z_float_enable(struct k_thread *thread, unsigned int options)
 		 * (The FP context is "live" in hardware, not saved in TCS.)
 		 */
 
-		_kernel.current_fp = thread;
+		_kernel.cpus[0].arch.fpu_owner = thread;
 	} else {
 		/*
 		 * When enabling FP support for someone else, assign ownership
@@ -230,7 +230,7 @@ void z_float_enable(struct k_thread *thread, unsigned int options)
 			 * to its original state.
 			 */
 
-			_kernel.current_fp = thread;
+			_kernel.cpus[0].arch.fpu_owner = thread;
 			z_FpAccessDisable();
 		} else {
 			/*
@@ -280,10 +280,10 @@ int z_float_disable(struct k_thread *thread)
 
 	if (thread == _current) {
 		z_FpAccessDisable();
-		_kernel.current_fp = (struct k_thread *)0;
+		_kernel.cpus[0].arch.fpu_owner = (struct k_thread *)0;
 	} else {
-		if (_kernel.current_fp == thread) {
-			_kernel.current_fp = (struct k_thread *)0;
+		if (_kernel.cpus[0].arch.fpu_owner == thread) {
+			_kernel.cpus[0].arch.fpu_owner = (struct k_thread *)0;
 		}
 	}
 
diff --git a/arch/x86/core/ia32/swap.S b/arch/x86/core/ia32/swap.S
index af104fdff478b..6103e4bbe5382 100644
--- a/arch/x86/core/ia32/swap.S
+++ b/arch/x86/core/ia32/swap.S
@@ -50,7 +50,7 @@
  * Floating point registers are handled using a lazy save/restore mechanism
  * since it's expected relatively few threads will be created with the
  * K_FP_REGS or K_SSE_REGS option bits.  The kernel data structure maintains a
- * 'current_fp' field to keep track of the thread that "owns" the floating
+ * 'fpu_owner' field to keep track of the thread that "owns" the floating
  * point registers.  Floating point registers consist of ST0->ST7 (x87 FPU and
  * MMX registers) and XMM0 -> XMM7.
  *
@@ -176,7 +176,7 @@ SECTION_FUNC(PINNED_TEXT, arch_swap)
 	 * If so, there there is no need to restore the floating point context.
 	 */
 
-	movl	_kernel_offset_to_current_fp(%edi), %ebx
+	movl	_kernel_offset_to_fpu_owner(%edi), %ebx
 	cmpl	%ebx, %eax
 	je	restoreContext_NoFloatSwap
 
@@ -265,7 +265,7 @@ restoreContext_NoFloatRestore:
 
 	/* record that the incoming thread "owns" the floating point registers */
 
-	movl	%eax, _kernel_offset_to_current_fp(%edi)
+	movl	%eax, _kernel_offset_to_fpu_owner(%edi)
 
 
 	/*
diff --git a/arch/x86/core/intel64/smp.c b/arch/x86/core/intel64/smp.c
index 1e0aeb3e443aa..90bd9724667ff 100644
--- a/arch/x86/core/intel64/smp.c
+++ b/arch/x86/core/intel64/smp.c
@@ -38,3 +38,16 @@ void arch_sched_broadcast_ipi(void)
 {
 	z_loapic_ipi(0, LOAPIC_ICR_IPI_OTHERS, CONFIG_SCHED_IPI_VECTOR);
 }
+
+void arch_sched_directed_ipi(uint32_t cpu_bitmap)
+{
+	unsigned int num_cpus = arch_num_cpus();
+
+	for (unsigned int i = 0; i < num_cpus; i++) {
+		if ((cpu_bitmap & BIT(i)) == 0) {
+			continue;
+		}
+
+		z_loapic_ipi(i, LOAPIC_ICR_IPI_SPECIFIC, CONFIG_SCHED_IPI_VECTOR);
+	}
+}
diff --git a/arch/x86/core/multiboot.c b/arch/x86/core/multiboot.c
index b6112b75f82ec..06d03c7b80714 100644
--- a/arch/x86/core/multiboot.c
+++ b/arch/x86/core/multiboot.c
@@ -11,15 +11,6 @@
 
 struct multiboot_info multiboot_info;
 
-#ifdef CONFIG_DYNAMIC_BOOTARGS
-__pinned_noinit char multiboot_cmdline[CONFIG_BOOTARGS_ARGS_BUFFER_SIZE];
-
-const char *get_bootargs(void)
-{
-	return multiboot_cmdline;
-}
-#endif /* CONFIG_DYNAMIC_BOOTARGS */
-
 /*
  * called very early in the boot process to fetch data out of the multiboot
  * info struct. we need to grab the relevant data before any dynamic memory
diff --git a/arch/x86/core/offsets/ia32_offsets.c b/arch/x86/core/offsets/ia32_offsets.c
index 2dfbb5c38ef28..dcbf3d7d6806e 100644
--- a/arch/x86/core/offsets/ia32_offsets.c
+++ b/arch/x86/core/offsets/ia32_offsets.c
@@ -33,6 +33,12 @@
 GEN_OFFSET_SYM(_thread_arch_t, excNestCount);
 #endif
 
+#if defined(CONFIG_FPU_SHARING)
+GEN_OFFSET_SYM(_kernel_t, cpus);
+GEN_OFFSET_SYM(_cpu_t, arch);
+GEN_OFFSET_SYM(_cpu_arch_t, fpu_owner);
+#endif
+
 #ifdef CONFIG_USERSPACE
 GEN_OFFSET_SYM(_thread_arch_t, psp);
 #ifndef CONFIG_X86_COMMON_PAGE_TABLE
diff --git a/arch/x86/include/ia32/offsets_short_arch.h b/arch/x86/include/ia32/offsets_short_arch.h
index cb5cdb218f0ae..b818cf60b550b 100644
--- a/arch/x86/include/ia32/offsets_short_arch.h
+++ b/arch/x86/include/ia32/offsets_short_arch.h
@@ -14,6 +14,9 @@
 #define _kernel_offset_to_isf \
 	(___kernel_t_arch_OFFSET + ___kernel_arch_t_isf_OFFSET)
 
+#define _kernel_offset_to_fpu_owner \
+	(___kernel_t_cpus_OFFSET + ___cpu_t_arch_OFFSET + ___cpu_arch_t_fpu_owner_OFFSET)
+
 /* end - kernel */
 
 /* threads */
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index b69d8bcf02b2b..19ce69b011bb1 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -169,7 +169,6 @@ config XTENSA_MMU
 	bool "Xtensa MMU Support"
 	select MMU
 	select ARCH_MEM_DOMAIN_SYNCHRONOUS_API if USERSPACE
-	select XTENSA_SMALL_VECTOR_TABLE_ENTRY
 	select KERNEL_VM_USE_CUSTOM_MEM_RANGE_CHECK if XTENSA_RPO_CACHE
 	select CURRENT_THREAD_USE_NO_TLS if USERSPACE
 	help
@@ -223,12 +222,6 @@ config XTENSA_MMU_DOUBLE_MAP
 	  This option specifies that the memory is mapped in two
 	  distinct region, cached and uncached.
 
-	config XTENSA_INVALIDATE_MEM_DOMAIN_TLB_ON_SWAP
-		bool
-		help
-		  This invalidates all TLBs referred by the incoming thread's
-		  memory domain when swapping page tables.
-
 config PRIVILEGED_STACK_SIZE
 	# Must be multiple of CONFIG_MMU_PAGE_SIZE
 	default 4096
diff --git a/arch/xtensa/core/CMakeLists.txt b/arch/xtensa/core/CMakeLists.txt
index 7d7e260ca0b08..f3a4419f32c67 100644
--- a/arch/xtensa/core/CMakeLists.txt
+++ b/arch/xtensa/core/CMakeLists.txt
@@ -73,13 +73,19 @@ else()
   set(MAY_NEED_SYSCALL_SCRATCH_REG false)
 endif()
 
+if(CONFIG_KERNEL_COHERENCE AND NOT CONFIG_SCHED_CPU_MASK_PIN_ONLY)
+  set(NEED_FLUSH_SCRATCH_REG true)
+else()
+  set(NEED_FLUSH_SCRATCH_REG false)
+endif()
+
 # Generates a list of device-specific scratch register choices
 set(ZSR_H ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/zsr.h)
 add_custom_command(OUTPUT ${ZSR_H} DEPENDS ${CORE_ISA_DM}
   COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen_zsr.py
                                $<$<BOOL:${CONFIG_XTENSA_MMU}>:--mmu>
                                $<$<BOOL:${MAY_NEED_SYSCALL_SCRATCH_REG}>:--syscall-scratch>
-                               $<$<BOOL:${CONFIG_KERNEL_COHERENCE}>:--coherence>
+                               $<$<BOOL:${NEED_FLUSH_SCRATCH_REG}>:--flush-reg>
                                ${CORE_ISA_DM} ${ZSR_H})
 add_custom_target(zsr_h DEPENDS ${ZSR_H})
 add_dependencies(zephyr_interface zsr_h)
diff --git a/arch/xtensa/core/elf.c b/arch/xtensa/core/elf.c
index 17337f4a7bc6f..6b83a9c0c612c 100644
--- a/arch/xtensa/core/elf.c
+++ b/arch/xtensa/core/elf.c
@@ -34,13 +34,18 @@ LOG_MODULE_DECLARE(llext, CONFIG_LLEXT_LOG_LEVEL);
 
 static void xtensa_elf_relocate(struct llext_loader *ldr, struct llext *ext,
 				const elf_rela_t *rel, uintptr_t addr,
-				uint8_t *loc, int type, uint32_t stb)
+				uint8_t *loc, int type, uint32_t stb,
+				const struct llext_load_param *ldr_parm)
 {
 	elf_word *got_entry = (elf_word *)loc;
 
 	switch (type) {
 	case R_XTENSA_RELATIVE:
-		;
+		if (ldr_parm->pre_located) {
+			/* Relative relocations are already correct in the pre-located case */
+			break;
+		}
+
 		/* Relocate a local symbol: Xtensa specific. Seems to only be used with PIC */
 		unsigned int sh_ndx;
 
@@ -146,7 +151,8 @@ void arch_elf_relocate_local(struct llext_loader *ldr, struct llext *ext, const
 		sh_addr = ldr->sects[LLEXT_MEM_TEXT].sh_addr;
 	}
 
-	xtensa_elf_relocate(ldr, ext, rel, sh_addr, rel_addr, type, ELF_ST_BIND(sym->st_info));
+	xtensa_elf_relocate(ldr, ext, rel, sh_addr, rel_addr, type, ELF_ST_BIND(sym->st_info),
+			    ldr_parm);
 }
 
 /**
@@ -163,5 +169,5 @@ void arch_elf_relocate_global(struct llext_loader *ldr, struct llext *ext, const
 	}
 
 	xtensa_elf_relocate(ldr, ext, rel, (uintptr_t)link_addr, rel_addr, type,
-			    ELF_ST_BIND(sym->st_info));
+			    ELF_ST_BIND(sym->st_info), NULL);
 }
diff --git a/arch/xtensa/core/gen_zsr.py b/arch/xtensa/core/gen_zsr.py
index 6d9a228303f38..8cb8a713019e3 100755
--- a/arch/xtensa/core/gen_zsr.py
+++ b/arch/xtensa/core/gen_zsr.py
@@ -14,8 +14,8 @@
 def parse_args():
     parser = argparse.ArgumentParser(allow_abbrev=False)
 
-    parser.add_argument("--coherence", action="store_true",
-                        help="Enable scratch registers for CONFIG_KERNEL_COHERENCE")
+    parser.add_argument("--flush-reg", action="store_true",
+                        help="Enable scratch register ZSR_FLUSH for cache flushing")
     parser.add_argument("--mmu", action="store_true",
                         help="Enable scratch registers for MMU usage")
     parser.add_argument("--syscall-scratch", action="store_true",
@@ -32,7 +32,7 @@ def parse_args():
 NEEDED = ["A0SAVE", "CPU"]
 if args.mmu:
     NEEDED += ["DBLEXC", "DEPC_SAVE", "EXCCAUSE_SAVE"]
-if args.coherence:
+if args.flush_reg:
     NEEDED += ["FLUSH"]
 
 coreisa = args.coreisa
diff --git a/arch/xtensa/core/mmu.c b/arch/xtensa/core/mmu.c
index c1073ac0247a7..dd20136427a09 100644
--- a/arch/xtensa/core/mmu.c
+++ b/arch/xtensa/core/mmu.c
@@ -16,37 +16,33 @@ BUILD_ASSERT((CONFIG_PRIVILEGED_STACK_SIZE > 0) &&
 
 #define ASID_INVALID 0
 
-struct tlb_regs {
-	uint32_t rasid;
-	uint32_t ptevaddr;
-	uint32_t ptepin_as;
-	uint32_t ptepin_at;
-	uint32_t vecpin_as;
-	uint32_t vecpin_at;
-};
-
-static void compute_regs(uint32_t user_asid, uint32_t *l1_page, struct tlb_regs *regs)
+extern uint32_t *xtensa_kernel_ptables;
+
+void xtensa_mmu_compute_domain_regs(struct arch_mem_domain *domain)
 {
 	uint32_t vecbase = XTENSA_RSR("VECBASE");
+	uint32_t *l1_page = domain->ptables;
+	uint32_t user_asid = domain->asid;
 
 	__ASSERT_NO_MSG((((uint32_t)l1_page) & 0xfff) == 0);
 	__ASSERT_NO_MSG((user_asid == 0) || ((user_asid > 2) &&
 				(user_asid < XTENSA_MMU_SHARED_ASID)));
 
 	/* We don't use ring 1, ring 0 ASID must be 1 */
-	regs->rasid = (XTENSA_MMU_SHARED_ASID << 24) |
-		      (user_asid << 16) | 0x000201;
+	domain->reg_asid = (XTENSA_MMU_SHARED_ASID << 24) |
+				(user_asid << 16) | 0x000201;
 
 	/* Derive PTEVADDR from ASID so each domain gets its own PTE area */
-	regs->ptevaddr = CONFIG_XTENSA_MMU_PTEVADDR + user_asid * 0x400000;
+	domain->reg_ptevaddr = CONFIG_XTENSA_MMU_PTEVADDR + user_asid * 0x400000;
 
 	/* The ptables code doesn't add the mapping for the l1 page itself */
-	l1_page[XTENSA_MMU_L1_POS(regs->ptevaddr)] =
+	l1_page[XTENSA_MMU_L1_POS(domain->reg_ptevaddr)] =
 		(uint32_t)l1_page | XTENSA_MMU_PAGE_TABLE_ATTR;
 
-	regs->ptepin_at = (uint32_t)l1_page;
-	regs->ptepin_as = XTENSA_MMU_PTE_ENTRY_VADDR(regs->ptevaddr, regs->ptevaddr)
-			  | XTENSA_MMU_PTE_WAY;
+	domain->reg_ptepin_at = (uint32_t)l1_page;
+	domain->reg_ptepin_as = XTENSA_MMU_PTE_ENTRY_VADDR(domain->reg_ptevaddr,
+							   domain->reg_ptevaddr)
+				| XTENSA_MMU_PTE_WAY;
 
 	/* Pin mapping for refilling the vector address into the ITLB
 	 * (for handling TLB miss exceptions). Note: this is NOT an
@@ -58,9 +54,10 @@ static void compute_regs(uint32_t user_asid, uint32_t *l1_page, struct tlb_regs
 	 */
 	uint32_t vb_pte = l1_page[XTENSA_MMU_L1_POS(vecbase)];
 
-	regs->vecpin_at = vb_pte;
-	regs->vecpin_as = XTENSA_MMU_PTE_ENTRY_VADDR(regs->ptevaddr, vecbase)
-			  | XTENSA_MMU_VECBASE_WAY;
+	domain->reg_vecpin_at = vb_pte;
+	domain->reg_vecpin_as = XTENSA_MMU_PTE_ENTRY_VADDR(domain->reg_ptevaddr,
+							   vecbase)
+				| XTENSA_MMU_VECBASE_WAY;
 }
 
 /* Switch to a new page table.  There are four items we have to set in
@@ -78,18 +75,8 @@ static void compute_regs(uint32_t user_asid, uint32_t *l1_page, struct tlb_regs
  * couldn't think of a way to do the alignment statically that also
  * interoperated well with inline assembly).
  */
-void xtensa_set_paging(uint32_t user_asid, uint32_t *l1_page)
+void xtensa_mmu_set_paging(struct arch_mem_domain *domain)
 {
-	/* Optimization note: the registers computed here are pure
-	 * functions of the two arguments.  With a minor API tweak,
-	 * they could be cached in e.g. a thread struct instead of
-	 * being recomputed.  This is called on context switch paths
-	 * and is performance-sensitive.
-	 */
-	struct tlb_regs regs;
-
-	compute_regs(user_asid, l1_page, &regs);
-
 	__asm__ volatile("j 1f\n"
 			 ".align 16\n" /* enough for 5 insns */
 			 "1:\n"
@@ -98,12 +85,12 @@ void xtensa_set_paging(uint32_t user_asid, uint32_t *l1_page)
 			 "wdtlb %2, %3\n"
 			 "wdtlb %4, %5\n"
 			 "isync"
-			 :: "r"(regs.ptevaddr), "r"(regs.rasid),
-			    "r"(regs.ptepin_at), "r"(regs.ptepin_as),
-			    "r"(regs.vecpin_at), "r"(regs.vecpin_as));
+			 :: "r"(domain->reg_ptevaddr), "r"(domain->reg_asid),
+			    "r"(domain->reg_ptepin_at), "r"(domain->reg_ptepin_as),
+			    "r"(domain->reg_vecpin_at), "r"(domain->reg_vecpin_as));
 }
 
-/* This is effectively the same algorithm from xtensa_set_paging(),
+/* This is effectively the same algorithm from xtensa_mmu_set_paging(),
  * but it also disables the hardware-initialized 512M TLB entries in
  * way 6 (because the hardware disallows duplicate TLB mappings).  For
  * instruction fetches this produces a critical ordering constraint:
@@ -121,12 +108,19 @@ void xtensa_set_paging(uint32_t user_asid, uint32_t *l1_page)
  * asm for correctness.  The other 13 entries get invalidated in a C
  * loop at the end.
  */
-void xtensa_init_paging(uint32_t *l1_page)
+void xtensa_mmu_init_paging(void)
 {
 	extern char z_xt_init_pc; /* defined in asm below */
-	struct tlb_regs regs;
 	unsigned int initial_rasid;
 
+	/* When this is called in xtensa_mmu_init(), the default memory
+	 * domain struct has not been initialized, and memory domains
+	 * are not ready to be used. So we need a local copy of
+	 * struct arch_mem_domain to store the register values to be
+	 * programmed into hardware.
+	 */
+	struct arch_mem_domain domain;
+
 	/* The initial rasid after hardware initialization is 0x04030201.
 	 * 1 is hardwired to ring 0, other slots must be different
 	 * from each other and must not be 0.
@@ -146,10 +140,12 @@ void xtensa_init_paging(uint32_t *l1_page)
 	sys_cache_data_flush_and_invd_all();
 #endif
 
-	compute_regs(ASID_INVALID, l1_page, &regs);
+	domain.asid = ASID_INVALID;
+	domain.ptables = xtensa_kernel_ptables;
+	xtensa_mmu_compute_domain_regs(&domain);
 
-	uint32_t idtlb_pte = (regs.ptevaddr & 0xe0000000) | XCHAL_SPANNING_WAY;
-	uint32_t idtlb_stk = (((uint32_t)&regs) & ~0xfff) | XCHAL_SPANNING_WAY;
+	uint32_t idtlb_pte = (domain.reg_ptevaddr & 0xe0000000) | XCHAL_SPANNING_WAY;
+	uint32_t idtlb_stk = (((uint32_t)&domain) & ~0xfff) | XCHAL_SPANNING_WAY;
 	uint32_t iitlb_pc  = (((uint32_t)&z_xt_init_pc) & ~0xfff) | XCHAL_SPANNING_WAY;
 
 	/* Note: the jump is mostly pedantry, as it's almost
@@ -171,9 +167,9 @@ void xtensa_init_paging(uint32_t *l1_page)
 			 "isync\n"
 			 "iitlb %8\n" /* invalidate pc */
 			 "isync\n" /* <--- traps a ITLB miss */
-			 :: "r"(regs.ptevaddr), "r"(initial_rasid),
-			    "r"(regs.ptepin_at), "r"(regs.ptepin_as),
-			    "r"(regs.vecpin_at), "r"(regs.vecpin_as),
+			 :: "r"(domain.reg_ptevaddr), "r"(initial_rasid),
+			    "r"(domain.reg_ptepin_at), "r"(domain.reg_ptepin_as),
+			    "r"(domain.reg_vecpin_at), "r"(domain.reg_vecpin_as),
 			    "r"(idtlb_pte), "r"(idtlb_stk), "r"(iitlb_pc));
 
 	/* Invalidate the remaining (unused by this function)
diff --git a/arch/xtensa/core/offsets/offsets.c b/arch/xtensa/core/offsets/offsets.c
index 69df38275bf6b..f0b75c999cc69 100644
--- a/arch/xtensa/core/offsets/offsets.c
+++ b/arch/xtensa/core/offsets/offsets.c
@@ -67,8 +67,22 @@ GEN_OFFSET_SYM(_xtensa_irq_bsa_t, hifi);
 
 #ifdef CONFIG_USERSPACE
 GEN_OFFSET_SYM(_thread_arch_t, psp);
+GEN_OFFSET_SYM(_thread_arch_t, return_ps);
+GEN_OFFSET_SYM(_thread_t, switch_handle);
 #ifdef CONFIG_XTENSA_MMU
 GEN_OFFSET_SYM(_thread_arch_t, ptables);
+
+GEN_OFFSET_SYM(_thread_t, mem_domain_info);
+GEN_OFFSET_SYM(_mem_domain_info_t, mem_domain);
+GEN_OFFSET_SYM(k_mem_domain_t, arch);
+
+GEN_OFFSET_SYM(arch_mem_domain_t, reg_asid);
+GEN_OFFSET_SYM(arch_mem_domain_t, reg_ptevaddr);
+GEN_OFFSET_SYM(arch_mem_domain_t, reg_ptepin_as);
+GEN_OFFSET_SYM(arch_mem_domain_t, reg_ptepin_at);
+GEN_OFFSET_SYM(arch_mem_domain_t, reg_vecpin_as);
+GEN_OFFSET_SYM(arch_mem_domain_t, reg_vecpin_at);
+
 #endif
 #ifdef CONFIG_XTENSA_MPU
 GEN_OFFSET_SYM(_thread_arch_t, mpu_map);
diff --git a/arch/xtensa/core/prep_c.c b/arch/xtensa/core/prep_c.c
index 6dbab69f50f5f..771ad7e423077 100644
--- a/arch/xtensa/core/prep_c.c
+++ b/arch/xtensa/core/prep_c.c
@@ -44,10 +44,12 @@ void z_prep_c(void)
 	 */
 	sys_cache_data_flush_and_invd_all();
 
+#if !defined(CONFIG_SCHED_CPU_MASK_PIN_ONLY)
 	/* Our cache top stash location might have junk in it from a
 	 * pre-boot environment.  Must be zero or valid!
 	 */
 	XTENSA_WSR(ZSR_FLUSH_STR, 0);
+#endif
 #endif
 
 	cpu0->nested = 0;
diff --git a/arch/xtensa/core/ptables.c b/arch/xtensa/core/ptables.c
index c02ecc64b0dbe..fa7d4fb0f703b 100644
--- a/arch/xtensa/core/ptables.c
+++ b/arch/xtensa/core/ptables.c
@@ -157,17 +157,6 @@ static const struct xtensa_mmu_range mmu_zephyr_ranges[] = {
 	},
 };
 
-static inline uint32_t *thread_page_tables_get(const struct k_thread *thread)
-{
-#ifdef CONFIG_USERSPACE
-	if ((thread->base.user_options & K_USER) != 0U) {
-		return thread->arch.ptables;
-	}
-#endif
-
-	return xtensa_kernel_ptables;
-}
-
 /**
  * @brief Check if the page table entry is illegal.
  *
@@ -250,18 +239,25 @@ static void map_memory_range(const uint32_t start, const uint32_t end,
 static void map_memory(const uint32_t start, const uint32_t end,
 		       const uint32_t attrs)
 {
-	map_memory_range(start, end, attrs);
-
 #ifdef CONFIG_XTENSA_MMU_DOUBLE_MAP
+	uint32_t uc_attrs = attrs & ~XTENSA_MMU_PTE_ATTR_CACHED_MASK;
+	uint32_t c_attrs = attrs | XTENSA_MMU_CACHED_WB;
+
 	if (sys_cache_is_ptr_uncached((void *)start)) {
+		map_memory_range(start, end, uc_attrs);
+
 		map_memory_range(POINTER_TO_UINT(sys_cache_cached_ptr_get((void *)start)),
-			POINTER_TO_UINT(sys_cache_cached_ptr_get((void *)end)),
-			attrs | XTENSA_MMU_CACHED_WB);
+			POINTER_TO_UINT(sys_cache_cached_ptr_get((void *)end)),	c_attrs);
 	} else if (sys_cache_is_ptr_cached((void *)start)) {
+		map_memory_range(start, end, c_attrs);
+
 		map_memory_range(POINTER_TO_UINT(sys_cache_uncached_ptr_get((void *)start)),
-			POINTER_TO_UINT(sys_cache_uncached_ptr_get((void *)end)), attrs);
-	}
+			POINTER_TO_UINT(sys_cache_uncached_ptr_get((void *)end)), uc_attrs);
+	} else
 #endif
+	{
+		map_memory_range(start, end, attrs);
+	}
 }
 
 static void xtensa_init_page_tables(void)
@@ -313,7 +309,7 @@ void xtensa_mmu_init(void)
 {
 	xtensa_init_page_tables();
 
-	xtensa_init_paging(xtensa_kernel_ptables);
+	xtensa_mmu_init_paging();
 
 	/*
 	 * This is used to determine whether we are faulting inside double
@@ -328,7 +324,7 @@ void xtensa_mmu_init(void)
 void xtensa_mmu_reinit(void)
 {
 	/* First initialize the hardware */
-	xtensa_init_paging(xtensa_kernel_ptables);
+	xtensa_mmu_init_paging();
 
 #ifdef CONFIG_USERSPACE
 	struct k_thread *thread = _current_cpu->current;
@@ -337,7 +333,7 @@ void xtensa_mmu_reinit(void)
 
 
 	/* Set the page table for current context */
-	xtensa_set_paging(domain->asid, domain->ptables);
+	xtensa_mmu_set_paging(domain);
 #endif /* CONFIG_USERSPACE */
 
 	arch_xtensa_mmu_post_init(_current_cpu->id == 0);
@@ -706,7 +702,7 @@ void xtensa_mmu_tlb_shootdown(void)
 			 */
 			struct arch_mem_domain *domain =
 				&(thread->mem_domain_info.mem_domain->arch);
-			xtensa_set_paging(domain->asid, (uint32_t *)thread_ptables);
+			xtensa_mmu_set_paging(domain);
 		}
 
 	}
@@ -725,6 +721,15 @@ void xtensa_mmu_tlb_shootdown(void)
 
 #ifdef CONFIG_USERSPACE
 
+static inline uint32_t *thread_page_tables_get(const struct k_thread *thread)
+{
+	if ((thread->base.user_options & K_USER) != 0U) {
+		return thread->arch.ptables;
+	}
+
+	return xtensa_kernel_ptables;
+}
+
 static inline uint32_t *alloc_l1_table(void)
 {
 	uint16_t idx;
@@ -833,6 +838,7 @@ int arch_mem_domain_init(struct k_mem_domain *domain)
 	sys_slist_append(&xtensa_domain_list, &domain->arch.node);
 
 end:
+	xtensa_mmu_compute_domain_regs(&domain->arch);
 	ret = 0;
 
 err:
@@ -995,7 +1001,9 @@ int arch_mem_domain_thread_add(struct k_thread *thread)
 	 * the current thread running.
 	 */
 	if (thread == _current_cpu->current) {
-		xtensa_set_paging(domain->arch.asid, thread->arch.ptables);
+		struct arch_mem_domain *arch_domain = &(domain->arch);
+
+		xtensa_mmu_set_paging(arch_domain);
 	}
 
 #if CONFIG_MP_MAX_NUM_CPUS > 1
@@ -1114,26 +1122,4 @@ int arch_buffer_validate(const void *addr, size_t size, int write)
 	return mem_buffer_validate(addr, size, write, XTENSA_MMU_USER_RING);
 }
 
-void xtensa_swap_update_page_tables(struct k_thread *incoming)
-{
-	uint32_t *ptables = incoming->arch.ptables;
-	struct arch_mem_domain *domain =
-		&(incoming->mem_domain_info.mem_domain->arch);
-
-	xtensa_set_paging(domain->asid, ptables);
-
-#ifdef CONFIG_XTENSA_INVALIDATE_MEM_DOMAIN_TLB_ON_SWAP
-	struct k_mem_domain *mem_domain = incoming->mem_domain_info.mem_domain;
-
-	for (int idx = 0; idx < mem_domain->num_partitions; idx++) {
-		struct k_mem_partition *part = &mem_domain->partitions[idx];
-		uintptr_t end = part->start + part->size;
-
-		for (uintptr_t addr = part->start; addr < end; addr += CONFIG_MMU_PAGE_SIZE) {
-			xtensa_dtlb_vaddr_invalidate((void *)addr);
-		}
-	}
-#endif
-}
-
 #endif /* CONFIG_USERSPACE */
diff --git a/arch/xtensa/core/syscall_helper.c b/arch/xtensa/core/syscall_helper.c
index f9673e67814c8..9e14a560e7e19 100644
--- a/arch/xtensa/core/syscall_helper.c
+++ b/arch/xtensa/core/syscall_helper.c
@@ -25,7 +25,7 @@ uintptr_t xtensa_syscall_helper_args_6(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a8 __asm__("%a8") = arg5;
 	register uintptr_t a9 __asm__("%a9") = arg6;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4),
 			   "r" (a5), "r" (a8), "r" (a9)
@@ -45,7 +45,7 @@ uintptr_t xtensa_syscall_helper_args_5(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a5 __asm__("%a5") = arg4;
 	register uintptr_t a8 __asm__("%a8") = arg5;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4),
 			   "r" (a5), "r" (a8)
@@ -64,7 +64,7 @@ uintptr_t xtensa_syscall_helper_args_4(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a4 __asm__("%a4") = arg3;
 	register uintptr_t a5 __asm__("%a5") = arg4;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4),
 			   "r" (a5)
@@ -73,61 +73,6 @@ uintptr_t xtensa_syscall_helper_args_4(uintptr_t arg1, uintptr_t arg2,
 	return a2;
 }
 
-uintptr_t xtensa_syscall_helper_args_3(uintptr_t arg1, uintptr_t arg2,
-				       uintptr_t arg3, uintptr_t call_id)
-{
-	register uintptr_t a2 __asm__("%a2") = call_id;
-	register uintptr_t a6 __asm__("%a6") = arg1;
-	register uintptr_t a3 __asm__("%a3") = arg2;
-	register uintptr_t a4 __asm__("%a4") = arg3;
-
-	__asm__ volatile("syscall\n\t"
-			 : "=r" (a2)
-			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4)
-			 : "memory");
-
-	return a2;
-}
-
-uintptr_t xtensa_syscall_helper_args_2(uintptr_t arg1, uintptr_t arg2,
-				       uintptr_t call_id)
-{
-	register uintptr_t a2 __asm__("%a2") = call_id;
-	register uintptr_t a6 __asm__("%a6") = arg1;
-	register uintptr_t a3 __asm__("%a3") = arg2;
-
-	__asm__ volatile("syscall\n\t"
-			 : "=r" (a2)
-			 : "r" (a2), "r" (a6), "r" (a3)
-			 : "memory");
-
-	return a2;
-}
-
-uintptr_t xtensa_syscall_helper_args_1(uintptr_t arg1, uintptr_t call_id)
-{
-	register uintptr_t a2 __asm__("%a2") = call_id;
-	register uintptr_t a6 __asm__("%a6") = arg1;
-
-	__asm__ volatile("syscall\n\t"
-			 : "=r" (a2)
-			 : "r" (a2), "r" (a6)
-			 : "memory");
-
-	return a2;
-}
-
-uintptr_t xtensa_syscall_helper_args_0(uintptr_t call_id)
-{
-	register uintptr_t a2 __asm__("%a2") = call_id;
-
-	__asm__ volatile("syscall\n\t"
-			 : "=r" (a2)
-			 : "r" (a2)
-			 : "memory");
-
-	return a2;
-}
 #endif /* CONFIG_XTENSA_SYSCALL_USE_HELPER */
 
 #if XCHAL_HAVE_THREADPTR == 0
diff --git a/arch/xtensa/core/thread.c b/arch/xtensa/core/thread.c
index f9b8179173d4e..2bf1a7e11d379 100644
--- a/arch/xtensa/core/thread.c
+++ b/arch/xtensa/core/thread.c
@@ -42,11 +42,7 @@ static void *init_stack(struct k_thread *thread, int *stack_top,
 	void *ret;
 	_xtensa_irq_stack_frame_a11_t *frame;
 #ifdef CONFIG_USERSPACE
-	struct xtensa_thread_stack_header *header =
-		(struct xtensa_thread_stack_header *)thread->stack_obj;
-
-	thread->arch.psp = header->privilege_stack +
-		sizeof(header->privilege_stack);
+	thread->arch.psp = NULL;
 #endif
 
 	/* Not-a-cpu ID Ensures that the first time this is run, the
@@ -70,26 +66,19 @@ static void *init_stack(struct k_thread *thread, int *stack_top,
 
 	(void)memset(frame, 0, bsasz);
 
-	frame->bsa.ps = PS_WOE | PS_UM | PS_CALLINC(1);
 #ifdef CONFIG_USERSPACE
-	if ((thread->base.user_options & K_USER) == K_USER) {
-#ifdef CONFIG_INIT_STACKS
-		/* setup_thread_stack() does not initialize the architecture specific
-		 * privileged stack. So we need to do it manually here as this function
-		 * is called by arch_new_thread() via z_setup_new_thread() after
-		 * setup_thread_stack() but before thread starts running.
-		 *
-		 * Note that only user threads have privileged stacks and kernel
-		 * only threads do not.
-		 */
-		(void)memset(&header->privilege_stack[0], 0xaa, sizeof(header->privilege_stack));
-#endif
+	/* _restore_context uses this instead of frame->bsa.ps to
+	 * restore PS value.
+	 */
+	thread->arch.return_ps = PS_WOE | PS_UM | PS_CALLINC(1);
 
+	if ((thread->base.user_options & K_USER) == K_USER) {
 		frame->bsa.pc = (uintptr_t)arch_user_mode_enter;
 	} else {
 		frame->bsa.pc = (uintptr_t)z_thread_entry;
 	}
 #else
+	frame->bsa.ps = PS_WOE | PS_UM | PS_CALLINC(1);
 	frame->bsa.pc = (uintptr_t)z_thread_entry;
 #endif
 
@@ -159,6 +148,30 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	struct k_thread *current = _current;
 	size_t stack_end;
 
+	struct xtensa_thread_stack_header *header =
+		(struct xtensa_thread_stack_header *)current->stack_obj;
+
+	current->arch.psp = header->privilege_stack +
+		sizeof(header->privilege_stack);
+
+#ifdef CONFIG_INIT_STACKS
+	/* setup_thread_stack() does not initialize the architecture specific
+	 * privileged stack. So we need to do it manually here as this function
+	 * is called by arch_new_thread() via z_setup_new_thread() after
+	 * setup_thread_stack() but before thread starts running.
+	 *
+	 * Note that only user threads have privileged stacks and kernel
+	 * only threads do not.
+	 */
+	(void)memset(&header->privilege_stack[0], 0xaa, sizeof(header->privilege_stack));
+
+#endif
+
+#ifdef CONFIG_KERNEL_COHERENCE
+	sys_cache_data_flush_and_invd_range(&header->privilege_stack[0],
+					    sizeof(header->privilege_stack));
+#endif
+
 	/* Transition will reset stack pointer to initial, discarding
 	 * any old context since this is a one-way operation
 	 */
diff --git a/arch/xtensa/core/userspace.S b/arch/xtensa/core/userspace.S
index 3db5d8cea8d6b..be143ed1f3a4e 100644
--- a/arch/xtensa/core/userspace.S
+++ b/arch/xtensa/core/userspace.S
@@ -53,6 +53,12 @@ _is_user_context_return:
 _not_checking_user_context:
 	rsr a2, ZSR_SYSCALL_SCRATCH
 #endif
+
+	/* Need to disable any interrupts while we are saving
+	 * register content to avoid any interferences.
+	 */
+	rsil a0, 0xf
+
 	rsr a0, ZSR_CPU
 	l32i a0, a0, ___cpu_t_current_OFFSET
 	l32i a0, a0, _thread_offset_to_psp
@@ -65,21 +71,27 @@ _not_checking_user_context:
 	rsr a2, ZSR_A0SAVE
 	s32i a2, a0, ___xtensa_irq_bsa_t_a0_OFFSET
 	rsr.ps a2
-	movi a3, ~PS_OWB_MASK
+	movi a3, ~PS_OWB_MASK & ~PS_EXCM_MASK
 	and a2, a2, a3
 	s32i a2, a0, ___xtensa_irq_bsa_t_ps_OFFSET
-	rsr.epc1 a2
-	s32i a2, a0, ___xtensa_irq_bsa_t_pc_OFFSET
 
-#if XCHAL_HAVE_NMI
-	movi a2, PS_WOE|PS_INTLEVEL(XCHAL_NMILEVEL)
-#elif XCHAL_HAVE_INTERRUPTS
-	movi a2, PS_WOE|PS_INTLEVEL(XCHAL_NUM_INTLEVELS)
-#else
-#error Xtensa core with no interrupt support is used
-#endif
+	/* Manipulate PC where we will return to after syscall.
+	 * This is needed as syscall will stash the PC where
+	 * the syscall instruction locates, instead of
+	 * the instruction after it. We need to increment it to
+	 * execute the next instruction when we return.
+	 * The instruction size is 3 bytes, so lets just add it.
+	 */
+	rsr.epc1 a3
+	addi a3, a3, 3
+	s32i a3, a0, ___xtensa_irq_bsa_t_pc_OFFSET
+
+	/* Need to setup PS so we can spill all registers.
+	 * EXCM and RING bits need to be cleared as CPU
+	 * needs to run in kernel and non-exception modes
+	 * for window rotation to work.
+	 */
 	rsr.ps a3
-	or a3, a3, a2
 	movi a2, ~(PS_EXCM | PS_RING_MASK)
 	and a3, a3, a2
 	wsr.ps a3
@@ -95,34 +107,7 @@ _not_checking_user_context:
 
 	mov a1, a0
 
-	l32i a3, a1, ___xtensa_irq_bsa_t_pc_OFFSET
-#if XCHAL_HAVE_LOOPS
-	/* If the syscall instruction was the last instruction in the body of
-	 * a zero-overhead loop, and the loop will execute again, decrement
-	 * the loop count and resume execution at the head of the loop.
-	 */
-	rsr.lend a2
-	addi a3, a3, 3
-	bne a2, a3, end_loop
-	rsr.lcount a2
-	beqz a2, end_loop
-	addi a2, a2, -1
-	wsr.lcount a2
-	rsr.lbeg a3
-end_loop:
-#else
-	/* EPC1 (and now a3) contains the address that invoked syscall.
-	 * We need to increment it to execute the next instruction when
-	 * we return. The instruction size is 3 bytes, so lets just add it.
-	 */
-	addi a3, a3, 3
-#endif
-	s32i a3, a1, ___xtensa_irq_bsa_t_pc_OFFSET
-	ODD_REG_SAVE
-
-#if defined(CONFIG_XTENSA_HIFI_SHARING)
-	call0 _xtensa_hifi_save
-#endif
+	ODD_REG_SAVE a0, a1
 
 	call0 xtensa_save_high_regs
 
@@ -134,8 +119,7 @@ end_loop:
 _id_ok:
 	/* Find the function handler for the given syscall id. */
 	movi a3, _k_syscall_table
-	slli a2, a2, 2
-	add a2, a2, a3
+	addx4 a2, a2, a3
 	l32i a2, a2, 0
 
 #if XCHAL_HAVE_THREADPTR
@@ -173,12 +157,14 @@ _id_ok:
 
 	/* Stack frame pointer is the 7th argument to z_mrsh_*()
 	 * as ssf, and must be put on stack to be consumed.
+	 *
+	 * Subtract 16 bytes as stack needs to be 16-byte aligned.
 	 */
 	mov a3, a1
-	addi a1, a1, -4
+	addi a1, a1, -16
 	s32i a3, a1, 0
 
-	l32i a3, a1, 4
+	l32i a3, a1, 16
 	l32i a7, a3, ___xtensa_irq_bsa_t_a3_OFFSET
 
 
@@ -195,7 +181,7 @@ _id_ok:
 	 * actual the stack frame. So restoration of registers
 	 * can be done properly when finishing syscalls.
 	 */
-	addi a1, a1, 4
+	addi a1, a1, 16
 
 	/* copy return value. Lets put it in the top of stack
 	 * because registers will be clobbered in
@@ -204,25 +190,13 @@ _id_ok:
 	l32i a3, a1, 0
 	s32i a6, a3, ___xtensa_irq_bsa_t_a2_OFFSET
 
-	j _syscall_returned
-
 _syscall_returned:
+	/* Disable interrupts as we are restoring context. */
+	rsil a0, 0xf
+
 	call0 xtensa_restore_high_regs
 
-	l32i a3, a1, ___xtensa_irq_bsa_t_sar_OFFSET
-	wsr a3, SAR
-#if XCHAL_HAVE_LOOPS
-	l32i a3, a1, ___xtensa_irq_bsa_t_lbeg_OFFSET
-	wsr a3, LBEG
-	l32i a3, a1, ___xtensa_irq_bsa_t_lend_OFFSET
-	wsr a3, LEND
-	l32i a3, a1, ___xtensa_irq_bsa_t_lcount_OFFSET
-	wsr a3, LCOUNT
-#endif
-#if XCHAL_HAVE_S32C1I
-	l32i a3, a1, ___xtensa_irq_bsa_t_scompare1_OFFSET
-	wsr a3, SCOMPARE1
-#endif
+	ODD_REG_RESTORE a3, a1
 
 #if XCHAL_HAVE_THREADPTR
 #ifdef CONFIG_THREAD_LOCAL_STORAGE
@@ -231,18 +205,14 @@ _syscall_returned:
 	add a0, a3, a0
 	movi a3, 1
 	s32i a3, a0, 0
-#else
-	rsr a3, ZSR_CPU
-	l32i a3, a3, ___cpu_t_current_OFFSET
-	wur.THREADPTR a3
 #endif
 #endif /* XCHAL_HAVE_THREADPTR */
 
 	l32i a3, a1, ___xtensa_irq_bsa_t_ps_OFFSET
-	wsr.ps a3
+	wsr.ZSR_EPS a3
 
 	l32i a3, a1, ___xtensa_irq_bsa_t_pc_OFFSET
-	wsr.epc1 a3
+	wsr.ZSR_EPC a3
 
 	l32i a0, a1, ___xtensa_irq_bsa_t_a0_OFFSET
 	l32i a2, a1, ___xtensa_irq_bsa_t_a2_OFFSET
@@ -251,7 +221,7 @@ _syscall_returned:
 	l32i a1, a1, ___xtensa_irq_bsa_t_scratch_OFFSET
 	rsync
 
-	rfe
+	rfi ZSR_RFI_LEVEL
 
 _bad_syscall:
 	movi a2, K_SYSCALL_BAD
@@ -300,7 +270,7 @@ xtensa_userspace_enter:
 
 	l32i a6, a1, 24
 #ifdef CONFIG_XTENSA_MMU
-	call4 xtensa_swap_update_page_tables
+	SWAP_PAGE_TABLE a6, a3, a7
 #endif
 #ifdef CONFIG_XTENSA_MPU
 	call4 xtensa_mpu_map_write
@@ -331,8 +301,11 @@ xtensa_userspace_enter:
 	/* Go back to user stack */
 	l32i a1, a1, 4
 
+	/* Disabling interrupts as we need to use ZSR_EPC and ZSR_EPS */
+	rsil a0, 0xf
+
 	movi a0, z_thread_entry
-	wsr.epc2 a0
+	wsr.ZSR_EPC a0
 
 	/* Configuring PS register.
 	 * We have to set callinc as well, since the called
@@ -346,9 +319,9 @@ xtensa_userspace_enter:
 	movi a0, PS_WOE|PS_CALLINC(1)|PS_UM|PS_RING(1)
 #endif
 
-	wsr a0, EPS2
+	wsr.ZSR_EPS a0
 
 	/* Wipe out a0 (thre is no return from this function */
 	movi a0, 0
 
-	rfi 2
+	rfi ZSR_RFI_LEVEL
diff --git a/arch/xtensa/core/xtensa_asm2_util.S b/arch/xtensa/core/xtensa_asm2_util.S
index 11b18013033c0..6892831f52ac8 100644
--- a/arch/xtensa/core/xtensa_asm2_util.S
+++ b/arch/xtensa/core/xtensa_asm2_util.S
@@ -153,9 +153,34 @@ _restore_context:
 
 	l32i a0, a1, ___xtensa_irq_bsa_t_pc_OFFSET
 	wsr a0, ZSR_EPC
+
+#ifdef CONFIG_USERSPACE
+	/* When restoring context via xtensa_switch and
+	 * returning from non-nested interrupts, we use
+	 * the stashed PS value in the thread struct
+	 * instead of the one in the thread stack.
+	 * Both scenarios will have nested value of 0.
+	 */
+	rsr.ZSR_CPU a2
+	l32i a0, a2, ___cpu_t_nested_OFFSET
+	bnez a0, _restore_ps_from_stack
+
+	l32i a0, a2, ___cpu_t_current_OFFSET
+	l32i a0, a0, _thread_offset_to_return_ps
+	wsr a0, ZSR_EPS
+
+	j _restore_ps_after
+
+_restore_ps_from_stack:
+#endif
+
 	l32i a0, a1, ___xtensa_irq_bsa_t_ps_OFFSET
 	wsr a0, ZSR_EPS
 
+#ifdef CONFIG_USERSPACE
+_restore_ps_after:
+#endif
+
 #if XCHAL_HAVE_FP && defined(CONFIG_CPU_HAS_FPU) && defined(CONFIG_FPU_SHARING)
 	FPU_REG_RESTORE
 #endif
@@ -165,25 +190,8 @@ _restore_context:
 	call0 _xtensa_hifi_load
 #endif
 
-	l32i a0, a1, ___xtensa_irq_bsa_t_sar_OFFSET
-	wsr a0, SAR
-#if XCHAL_HAVE_LOOPS
-	l32i a0, a1, ___xtensa_irq_bsa_t_lbeg_OFFSET
-	wsr a0, LBEG
-	l32i a0, a1, ___xtensa_irq_bsa_t_lend_OFFSET
-	wsr a0, LEND
-	l32i a0, a1, ___xtensa_irq_bsa_t_lcount_OFFSET
-	wsr a0, LCOUNT
-#endif
-#if XCHAL_HAVE_S32C1I
-	l32i a0, a1, ___xtensa_irq_bsa_t_scompare1_OFFSET
-	wsr a0, SCOMPARE1
-#endif
-#if XCHAL_HAVE_THREADPTR && \
-	(defined(CONFIG_USERSPACE) || defined(CONFIG_THREAD_LOCAL_STORAGE))
-	l32i a0, a1, ___xtensa_irq_bsa_t_threadptr_OFFSET
-	wur a0, THREADPTR
-#endif
+	ODD_REG_RESTORE a0, a1
+
 	rsync
 
 	l32i a0, a1, ___xtensa_irq_bsa_t_a0_OFFSET
@@ -232,7 +240,31 @@ xtensa_arch_kernel_oops_epc:
 .global xtensa_switch
 .align 4
 xtensa_switch:
+#ifdef CONFIG_USERSPACE
+	entry a1, 32
+
+	s32i a4, a1, 0
+	s32i a5, a1, 4
+	s32i a6, a1, 8
+	s32i a7, a1, 12
+
+	rsr a6, ZSR_CPU
+	l32i a6, a6, ___cpu_t_current_OFFSET
+#ifdef CONFIG_XTENSA_MMU
+	SWAP_PAGE_TABLE a6, a4, a7
+#endif
+#ifdef CONFIG_XTENSA_MPU
+	call4 xtensa_mpu_map_write
+#endif
+
+	l32i a7, a1, 12
+	l32i a6, a1, 8
+	l32i a5, a1, 4
+	l32i a4, a1, 0
+#else
 	entry a1, 16
+#endif
+
 	SPILL_ALL_WINDOWS
 	addi a1, a1, -___xtensa_irq_bsa_t_SIZEOF
 
@@ -245,11 +277,27 @@ xtensa_switch:
 	s32i a0, a1, ___xtensa_irq_bsa_t_a0_OFFSET
 	s32i a2, a1, ___xtensa_irq_bsa_t_a2_OFFSET
 	s32i a3, a1, ___xtensa_irq_bsa_t_a3_OFFSET
-	ODD_REG_SAVE
+	ODD_REG_SAVE a0, a1
+
+#if XCHAL_HAVE_FP && defined(CONFIG_CPU_HAS_FPU) && defined(CONFIG_FPU_SHARING)
+	FPU_REG_SAVE
+#endif
 
 	/* Stash our PS register contents and a "restore" PC. */
 	rsr a0, PS
 	s32i a0, a1, ___xtensa_irq_bsa_t_ps_OFFSET
+
+#ifdef CONFIG_USERSPACE
+	/* Backtrack to the head of thread struct and
+	 * then store the PS value to be restored in
+	 * the architecture specific section.
+	 * This will be used to restore PS instead of
+	 * the one stashed inside stack.
+	 */
+	addi a3, a3, -___thread_t_switch_handle_OFFSET
+	s32i a0, a3, _thread_offset_to_return_ps
+#endif
+
 	movi a0, _switch_restore_pc
 	s32i a0, a1, ___xtensa_irq_bsa_t_pc_OFFSET
 
@@ -260,10 +308,11 @@ xtensa_switch:
 	/* Now the high registers */
 	call0 xtensa_save_high_regs
 
-#ifdef CONFIG_KERNEL_COHERENCE
+#if defined(CONFIG_KERNEL_COHERENCE) && !defined(CONFIG_SCHED_CPU_MASK_PIN_ONLY)
 	/* Flush the stack.  The top of stack was stored for us by
 	 * arch_cohere_stacks().  It can be NULL for a dummy thread.
 	 */
+	rsync
 	rsr a0, ZSR_FLUSH
 	beqz a0, noflush
 	mov a3, a1
@@ -282,21 +331,6 @@ noflush:
 	l32i a3, a2, ___xtensa_irq_bsa_t_a3_OFFSET
 	s32i a1, a3, 0
 
-#ifdef CONFIG_USERSPACE
-	/* Switch page tables */
-	rsr a6, ZSR_CPU
-	l32i a6, a6, ___cpu_t_current_OFFSET
-#ifdef CONFIG_XTENSA_MMU
-	call4 xtensa_swap_update_page_tables
-#endif
-#ifdef CONFIG_XTENSA_MPU
-	call4 xtensa_mpu_map_write
-#endif
-
-	l32i a2, a3, 0
-	l32i a2, a2, 0
-#endif
-
 	/* Switch stack pointer and restore.  The jump to
 	 * _restore_context does not return as such, but we arrange
 	 * for the restored "next" address to be immediately after for
diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h
index 5e735dedffff7..8e0641f9d4beb 100644
--- a/arch/xtensa/include/kernel_arch_func.h
+++ b/arch/xtensa/include/kernel_arch_func.h
@@ -39,23 +39,119 @@ static ALWAYS_INLINE void arch_switch(void *switch_to, void **switched_from)
 }
 
 #ifdef CONFIG_KERNEL_COHERENCE
+/**
+ * @brief Invalidate cache between two stack addresses.
+ *
+ * This invalidates the cache lines between two stack addresses,
+ * beginning with the cache line including the start address, up to
+ * but not including the cache line containing the end address.
+ * Not invalidating the last cache line is due to the usage in
+ * arch_cohere_stacks() where it invalidates the unused portion of
+ * stack. If the stack pointer happens to be in the middle of
+ * a cache line, the cache line containing the stack pointer
+ * address will be flushed, and then immediately invalidated.
+ * If we are swapping back into the same thread (e.g. after
+ * handling interrupt), that cache line, being invalidated, needs
+ * to be retrieved from main memory. This creates unnecessary
+ * data move between main memory and cache.
+ *
+ * @param s_addr Starting address of memory region to have cache invalidated.
+ * @param e_addr Ending address of memory region to have cache invalidated.
+ */
+static ALWAYS_INLINE void xtensa_cohere_stacks_cache_invd(size_t s_addr, size_t e_addr)
+{
+	const size_t first = ROUND_DOWN(s_addr, XCHAL_DCACHE_LINESIZE);
+	const size_t last = ROUND_DOWN(e_addr, XCHAL_DCACHE_LINESIZE);
+	size_t line;
+
+	for (line = first; line < last; line += XCHAL_DCACHE_LINESIZE) {
+		__asm__ volatile("dhi %0, 0" :: "r"(line));
+	}
+}
+
+/**
+ * @brief Flush cache between two stack addresses.
+ *
+ * This flushes the cache lines between two stack addresses,
+ * beginning with the cache line including the start address,
+ * and ending with the cache line including the end address.
+ * Note that, contrary to xtensa_cohere_stacks_cache_invd(),
+ * the last cache line will be flushed instead of being
+ * ignored.
+ *
+ * @param s_addr Starting address of memory region to have cache invalidated.
+ * @param e_addr Ending address of memory region to have cache invalidated.
+ */
+static ALWAYS_INLINE void xtensa_cohere_stacks_cache_flush(size_t s_addr, size_t e_addr)
+{
+	const size_t first = ROUND_DOWN(s_addr, XCHAL_DCACHE_LINESIZE);
+	const size_t last = ROUND_UP(e_addr, XCHAL_DCACHE_LINESIZE);
+	size_t line;
+
+	for (line = first; line < last; line += XCHAL_DCACHE_LINESIZE) {
+		__asm__ volatile("dhwb %0, 0" :: "r"(line));
+	}
+}
+
+/**
+ * @brief Flush and invalidate cache between two stack addresses.
+ *
+ * This flushes the cache lines between two stack addresses,
+ * beginning with the cache line including the start address,
+ * and ending with the cache line including the end address.
+ * Note that, contrary to xtensa_cohere_stacks_cache_invd(),
+ * the last cache line will be flushed and invalidated instead
+ * of being ignored.
+ *
+ * @param s_addr Starting address of memory region to have cache manipulated.
+ * @param e_addr Ending address of memory region to have cache manipulated.
+ */
+static ALWAYS_INLINE void xtensa_cohere_stacks_cache_flush_invd(size_t s_addr, size_t e_addr)
+{
+	const size_t first = ROUND_DOWN(s_addr, XCHAL_DCACHE_LINESIZE);
+	const size_t last = ROUND_UP(e_addr, XCHAL_DCACHE_LINESIZE);
+	size_t line;
+
+	for (line = first; line < last; line += XCHAL_DCACHE_LINESIZE) {
+		__asm__ volatile("dhwbi %0, 0" :: "r"(line));
+	}
+}
+
 static ALWAYS_INLINE void arch_cohere_stacks(struct k_thread *old_thread,
 					     void *old_switch_handle,
 					     struct k_thread *new_thread)
 {
+#ifdef CONFIG_SCHED_CPU_MASK_PIN_ONLY
+	ARG_UNUSED(old_thread);
+	ARG_UNUSED(old_switch_handle);
+	ARG_UNUSED(new_thread);
+
+	/* This kconfig option ensures that a living thread will never
+	 * be executed in a different CPU so we can safely return without
+	 * invalidate and/or flush threads cache.
+	 */
+	return;
+#endif /* CONFIG_SCHED_CPU_MASK_PIN_ONLY */
+
+#if !defined(CONFIG_SCHED_CPU_MASK_PIN_ONLY)
 	int32_t curr_cpu = _current_cpu->id;
 
 	size_t ostack = old_thread->stack_info.start;
-	size_t osz    = old_thread->stack_info.size;
+	size_t oend   = ostack + old_thread->stack_info.size;
 	size_t osp    = (size_t) old_switch_handle;
 
 	size_t nstack = new_thread->stack_info.start;
-	size_t nsz    = new_thread->stack_info.size;
+	size_t nend   = nstack + new_thread->stack_info.size;
 	size_t nsp    = (size_t) new_thread->switch_handle;
 
-	int zero = 0;
+	uint32_t flush_end = 0;
+
+#ifdef CONFIG_USERSPACE
+	/* End of old_thread privileged stack. */
+	void *o_psp_end = old_thread->arch.psp;
+#endif
 
-	__asm__ volatile("wsr %0, " ZSR_FLUSH_STR :: "r"(zero));
+	__asm__ volatile("wsr %0, " ZSR_FLUSH_STR :: "r"(flush_end));
 
 	if (old_switch_handle != NULL) {
 		int32_t a0save;
@@ -66,14 +162,6 @@ static ALWAYS_INLINE void arch_cohere_stacks(struct k_thread *old_thread,
 				 : "=r"(a0save));
 	}
 
-	/* The following option ensures that a living thread will never
-	 * be executed in a different CPU so we can safely return without
-	 * invalidate and/or flush threads cache.
-	 */
-	if (IS_ENABLED(CONFIG_SCHED_CPU_MASK_PIN_ONLY)) {
-		return;
-	}
-
 	/* The "live" area (the region between the switch handle,
 	 * which is the stack pointer, and the top of the stack
 	 * memory) of the inbound stack needs to be invalidated if we
@@ -88,7 +176,7 @@ static ALWAYS_INLINE void arch_cohere_stacks(struct k_thread *old_thread,
 	 * automatically overwritten as needed.
 	 */
 	if (curr_cpu != new_thread->arch.last_cpu) {
-		sys_cache_data_invd_range((void *)nsp, (nstack + nsz) - nsp);
+		xtensa_cohere_stacks_cache_invd(nsp, nend);
 	}
 	old_thread->arch.last_cpu = curr_cpu;
 
@@ -116,8 +204,13 @@ static ALWAYS_INLINE void arch_cohere_stacks(struct k_thread *old_thread,
 	 * to the stack top stashed in a special register.
 	 */
 	if (old_switch_handle != NULL) {
-		sys_cache_data_flush_range((void *)osp, (ostack + osz) - osp);
-		sys_cache_data_invd_range((void *)ostack, osp - ostack);
+#ifdef CONFIG_USERSPACE
+		if (o_psp_end == NULL)
+#endif
+		{
+			xtensa_cohere_stacks_cache_flush(osp, oend);
+			xtensa_cohere_stacks_cache_invd(ostack, osp);
+		}
 	} else {
 		/* When in a switch, our current stack is the outbound
 		 * stack.  Flush the single line containing the stack
@@ -128,13 +221,58 @@ static ALWAYS_INLINE void arch_cohere_stacks(struct k_thread *old_thread,
 		 */
 		__asm__ volatile("mov %0, a1" : "=r"(osp));
 		osp -= 16;
-		sys_cache_data_flush_range((void *)osp, 1);
-		sys_cache_data_invd_range((void *)ostack, osp - ostack);
+		xtensa_cohere_stacks_cache_flush(osp, osp + 16);
 
-		uint32_t end = ostack + osz;
+#ifdef CONFIG_USERSPACE
+		if (o_psp_end == NULL)
+#endif
+		{
+			xtensa_cohere_stacks_cache_invd(ostack, osp);
 
-		__asm__ volatile("wsr %0, " ZSR_FLUSH_STR :: "r"(end));
+			flush_end = oend;
+		}
 	}
+
+#ifdef CONFIG_USERSPACE
+	/* User threads need a bit more processing due to having
+	 * privileged stack for handling syscalls. The privileged
+	 * stack always immediately precedes the thread stack.
+	 *
+	 * Note that, with userspace enabled, we need to swap
+	 * page table during context switch via function calls.
+	 * This means that the stack is being actively used
+	 * unlike the non-userspace case mentioned above.
+	 * Therefore we need to set ZSR_FLUSH_STR to make sure
+	 * we flush the cached data in the stack.
+	 */
+	if (o_psp_end != NULL) {
+		/* Start of old_thread privileged stack.
+		 *
+		 * struct xtensa_thread_stack_header wholly contains
+		 * a array for the privileged stack, so we can use
+		 * its size to calculate where the start is.
+		 */
+		size_t o_psp_start = (size_t)o_psp_end - sizeof(struct xtensa_thread_stack_header);
+
+		if ((osp >= ostack) && (osp < oend)) {
+			/* osp in user stack. */
+			xtensa_cohere_stacks_cache_invd(o_psp_start, osp);
+
+			flush_end = oend;
+		} else if ((osp >= o_psp_start) && (osp < ostack)) {
+			/* osp in privileged stack. */
+			xtensa_cohere_stacks_cache_flush(ostack, oend);
+			xtensa_cohere_stacks_cache_invd(o_psp_start, osp);
+
+			flush_end = (size_t)old_thread->arch.psp;
+		}
+	}
+#endif /* CONFIG_USERSPACE */
+
+	flush_end = ROUND_DOWN(flush_end, XCHAL_DCACHE_LINESIZE);
+	__asm__ volatile("wsr %0, " ZSR_FLUSH_STR :: "r"(flush_end));
+
+#endif /* !CONFIG_SCHED_CPU_MASK_PIN_ONLY */
 }
 #endif
 
diff --git a/arch/xtensa/include/offsets_short_arch.h b/arch/xtensa/include/offsets_short_arch.h
index f19750dc0ac8b..80ece2b1dee30 100644
--- a/arch/xtensa/include/offsets_short_arch.h
+++ b/arch/xtensa/include/offsets_short_arch.h
@@ -12,8 +12,33 @@
 #define _thread_offset_to_psp \
 	(___thread_t_arch_OFFSET + ___thread_arch_t_psp_OFFSET)
 
+#define _thread_offset_to_return_ps \
+	(___thread_t_arch_OFFSET + ___thread_arch_t_return_ps_OFFSET)
+
 #define _thread_offset_to_ptables \
 	(___thread_t_arch_OFFSET + ___thread_arch_t_ptables_OFFSET)
+
+#define _thread_offset_to_mem_domain \
+	(___thread_t_mem_domain_info_OFFSET + ___mem_domain_info_t_mem_domain_OFFSET)
+
+#define _k_mem_domain_offset_to_arch_reg_asid \
+	(__k_mem_domain_t_arch_OFFSET + __arch_mem_domain_t_reg_asid_OFFSET)
+
+#define _k_mem_domain_offset_to_arch_reg_ptevaddr \
+	(__k_mem_domain_t_arch_OFFSET + __arch_mem_domain_t_reg_ptevaddr_OFFSET)
+
+#define _k_mem_domain_offset_to_arch_reg_ptepin_as \
+	(__k_mem_domain_t_arch_OFFSET + __arch_mem_domain_t_reg_ptepin_as_OFFSET)
+
+#define _k_mem_domain_offset_to_arch_reg_ptepin_at \
+	(__k_mem_domain_t_arch_OFFSET + __arch_mem_domain_t_reg_ptepin_at_OFFSET)
+
+#define _k_mem_domain_offset_to_arch_reg_vecpin_as \
+	(__k_mem_domain_t_arch_OFFSET + __arch_mem_domain_t_reg_vecpin_as_OFFSET)
+
+#define _k_mem_domain_offset_to_arch_reg_vecpin_at \
+	(__k_mem_domain_t_arch_OFFSET + __arch_mem_domain_t_reg_vecpin_at_OFFSET)
+
 #endif /* CONFIG_USERSPACE */
 
 #endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/xtensa/include/xtensa_asm2_context.h b/arch/xtensa/include/xtensa_asm2_context.h
index d5593d7adbc89..ac13a611c67f0 100644
--- a/arch/xtensa/include/xtensa_asm2_context.h
+++ b/arch/xtensa/include/xtensa_asm2_context.h
@@ -80,6 +80,68 @@
 #include <stdint.h>
 #include <zephyr/toolchain.h>
 
+/* Stack needs to aligned on 16-bytes as mentioned on Xtensa ISA.
+ * So we pad _xtensa_irq_bsa_t to achieve that. The followings
+ * are see how much space is taken depending on features enabled.
+ */
+
+#if XCHAL_HAVE_FP && defined(CONFIG_CPU_HAS_FPU) && defined(CONFIG_FPU_SHARING)
+# define _BSA_PADDING_FPU		(sizeof(uintptr_t) * 18U)
+#else
+# define _BSA_PADDING_FPU		(0)
+#endif
+
+#if defined(CONFIG_XTENSA_HIFI_SHARING)
+# define _BSA_PADDING_HIFI		(XCHAL_CP1_SA_SIZE + XCHAL_CP1_SA_ALIGN)
+#else
+# define _BSA_PADDING_HIFI		(0)
+#endif
+
+#if XCHAL_HAVE_THREADPTR
+# define _BSA_PADDING_THREADPTR		(sizeof(uintptr_t))
+#else
+# define _BSA_PADDING_THREADPTR		(0)
+#endif
+
+#if XCHAL_HAVE_S32C1I
+# define _BSA_PADDING_S32C1I		(sizeof(uintptr_t))
+#else
+# define _BSA_PADDING_S32C1I		(0)
+#endif
+
+#if XCHAL_HAVE_LOOPS
+# define _BSA_PADDING_LOOPS		(sizeof(uintptr_t) * 3U)
+#else
+# define _BSA_PADDING_LOOPS		(0)
+#endif
+
+/* Must have fields regardless of features. */
+#define _BSA_PADDING_COMMON		(sizeof(uintptr_t) * 12U)
+
+/* Raw size by adding up all the above. */
+#define _BSA_PADDING_BASE_SIZE		\
+	(_BSA_PADDING_FPU + \
+	 _BSA_PADDING_HIFI + \
+	 _BSA_PADDING_THREADPTR + \
+	 _BSA_PADDING_S32C1I + \
+	 _BSA_PADDING_LOOPS + \
+	 _BSA_PADDING_COMMON)
+
+/* Each stack frame always has a pointer to BSA so we add
+ * that (+4) to the BSA size before padding the BSA to have
+ * size aligned on 16 bytes. Each group of high registers to
+ * be saved (totally 3 groups) consists of 4 registers which
+ * are 16 bytes already. So each type of stack frame
+ * (A[3, 7, 11, 15]) do not need any further padding as long
+ * as the BSA struct is of correct size.
+ */
+#define _BSA_PADDING_PADDED_SIZE	\
+	((((_BSA_PADDING_BASE_SIZE + 4) + 15) / 16 * 16) - 4)
+
+/* How many extra bytes needed. */
+#define _BSA_PADDING_NEEDED		\
+	(_BSA_PADDING_PADDED_SIZE - _BSA_PADDING_BASE_SIZE)
+
 /**
  * Base Save Area (BSA) during interrupt.
  *
@@ -147,6 +209,8 @@ struct xtensa_irq_base_save_area {
 	uintptr_t a2;
 	uintptr_t a3;
 
+	uintptr_t padding[_BSA_PADDING_NEEDED / sizeof(uintptr_t)];
+
 	uintptr_t caller_a0;
 	uintptr_t caller_a1;
 	uintptr_t caller_a2;
@@ -155,6 +219,16 @@ struct xtensa_irq_base_save_area {
 
 typedef struct xtensa_irq_base_save_area _xtensa_irq_bsa_t;
 
+#undef _BSA_PADDING_NEEDED
+#undef _BSA_PADDING_PADDED_SIZE
+#undef _BSA_PADDING_BASE_SIZE
+#undef _BSA_PADDING_COMMON
+#undef _BSA_PADDING_LOOPS
+#undef _BSA_PADDING_S32C1I
+#undef _BSA_PADDING_THREADPTR
+#undef _BSA_PADDING_HIFI
+#undef _BSA_PADDING_FPU
+
 /**
  * Raw interrupt stack frame.
  *
diff --git a/arch/xtensa/include/xtensa_asm2_s.h b/arch/xtensa/include/xtensa_asm2_s.h
index 150df82c35cb6..198f04f80e838 100644
--- a/arch/xtensa/include/xtensa_asm2_s.h
+++ b/arch/xtensa/include/xtensa_asm2_s.h
@@ -11,6 +11,7 @@
 #include "xtensa_asm2_context.h"
 
 #include <zephyr/offsets.h>
+#include <offsets_short.h>
 
 /* Assembler header!  This file contains macros designed to be included
  * only by the assembler.
@@ -156,134 +157,111 @@
  * ODD_REG_SAVE
  *
  * Stashes the oddball shift/loop context registers in the base save
- * area pointed to by the current stack pointer.  On exit, A0 will
- * have been modified but A2/A3 have not, and the shift/loop
- * instructions can be used freely (though note loops don't work in
- * exceptions for other reasons!).
+ * area pointed to by the register specified by parameter BSA_PTR.
+ * On exit, the scratch register specified by parameter SCRATCH_REG
+ * will have been modified, and the shift/loop instructions can be
+ * used freely (though note loops don't work in exceptions for other
+ * reasons!).
  *
  * Does not populate or modify the PS/PC save locations.
  */
-.macro ODD_REG_SAVE
-	rsr.sar a0
-	s32i a0, a1, ___xtensa_irq_bsa_t_sar_OFFSET
+.macro ODD_REG_SAVE SCRATCH_REG, BSA_PTR
+	rsr.sar \SCRATCH_REG
+	s32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_sar_OFFSET
 #if XCHAL_HAVE_LOOPS
-	rsr.lbeg a0
-	s32i a0, a1, ___xtensa_irq_bsa_t_lbeg_OFFSET
-	rsr.lend a0
-	s32i a0, a1, ___xtensa_irq_bsa_t_lend_OFFSET
-	rsr.lcount a0
-	s32i a0, a1, ___xtensa_irq_bsa_t_lcount_OFFSET
+	rsr.lbeg \SCRATCH_REG
+	s32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_lbeg_OFFSET
+	rsr.lend \SCRATCH_REG
+	s32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_lend_OFFSET
+	rsr.lcount \SCRATCH_REG
+	s32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_lcount_OFFSET
 #endif
-	rsr.exccause a0
-	s32i a0, a1, ___xtensa_irq_bsa_t_exccause_OFFSET
+	rsr.exccause \SCRATCH_REG
+	s32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_exccause_OFFSET
 #if XCHAL_HAVE_S32C1I
-	rsr.scompare1 a0
-	s32i a0, a1, ___xtensa_irq_bsa_t_scompare1_OFFSET
+	rsr.scompare1 \SCRATCH_REG
+	s32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_scompare1_OFFSET
 #endif
 #if XCHAL_HAVE_THREADPTR && \
 	(defined(CONFIG_USERSPACE) || defined(CONFIG_THREAD_LOCAL_STORAGE))
-	rur.THREADPTR a0
-	s32i a0, a1, ___xtensa_irq_bsa_t_threadptr_OFFSET
-#endif
-#if XCHAL_HAVE_FP && defined(CONFIG_CPU_HAS_FPU) && defined(CONFIG_FPU_SHARING)
-	FPU_REG_SAVE
+	rur.THREADPTR \SCRATCH_REG
+	s32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_threadptr_OFFSET
 #endif
 
 .endm
 
-#ifdef CONFIG_XTENSA_MMU
 /*
- * CALC_PTEVADDR_BASE
+ * ODD_REG_RESTORE
  *
- * This calculates the virtual address of the first PTE page
- * (PTEVADDR base, the one mapping 0x00000000) so that we can
- * use this to obtain the virtual address of the PTE page we are
- * interested in. This can be obtained via
- * (1 << CONFIG_XTENSA_MMU_PTEVADDR_SHIFT).
+ * Restores the oddball shift/loop context registers in the base save
+ * area pointed to by the register specified by parameter BSA_PTR.
+ * On exit, the scratch register specified by parameter SCRATCH_REG
+ * will have been modified.
  *
- * Note that this is done this way is to avoid any TLB
- * miss if we are to use l32r to load the PTEVADDR base.
- * If the page containing the PTEVADDR base address is
- * not in TLB, we will need to handle the TLB miss which
- * we are trying to avoid here.
- *
- * @param ADDR_REG Register to store the calculated
- *                 PTEVADDR base address.
- *
- * @note The content of ADDR_REG will be modified.
- *       Save and restore it around this macro usage.
+ * Does not restore the PS/PC save locations.
  */
-.macro CALC_PTEVADDR_BASE ADDR_REG
-	movi \ADDR_REG, 1
-	slli \ADDR_REG, \ADDR_REG, CONFIG_XTENSA_MMU_PTEVADDR_SHIFT
+.macro ODD_REG_RESTORE SCRATCH_REG, BSA_PTR
+	l32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_sar_OFFSET
+	wsr.sar \SCRATCH_REG
+#if XCHAL_HAVE_LOOPS
+	l32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_lbeg_OFFSET
+	wsr.lbeg \SCRATCH_REG
+	l32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_lend_OFFSET
+	wsr.lend \SCRATCH_REG
+	l32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_lcount_OFFSET
+	wsr.lcount \SCRATCH_REG
+#endif
+	l32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_exccause_OFFSET
+	wsr.exccause \SCRATCH_REG
+#if XCHAL_HAVE_S32C1I
+	l32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_scompare1_OFFSET
+	wsr.scompare1 \SCRATCH_REG
+#endif
+#if XCHAL_HAVE_THREADPTR && \
+	(defined(CONFIG_USERSPACE) || defined(CONFIG_THREAD_LOCAL_STORAGE))
+	l32i \SCRATCH_REG, \BSA_PTR, ___xtensa_irq_bsa_t_threadptr_OFFSET
+	wur.THREADPTR \SCRATCH_REG
+#endif
+
 .endm
 
+#if defined(CONFIG_XTENSA_MMU) && defined(CONFIG_USERSPACE)
 /*
- * PRELOAD_PTEVADDR
+ * SWAP_PAGE_TABLE
  *
- * This preloads the page table entries for a 4MB region to avoid TLB
- * misses. This 4MB region is mapped via a page (4KB) of page table
- * entries (PTE). Each entry is 4 bytes mapping a 4KB region. Each page,
- * then, has 1024 entries mapping a 4MB region. Filling TLB entries is
- * automatically done via hardware, as long as the PTE page associated
- * with a particular address is also in TLB. If the PTE page is not in
- * TLB, an exception will be raised that must be handled. This TLB miss
- * is problematic when we are in the middle of dealing with another
- * exception or handling an interrupt. So we need to put the PTE page
- * into TLB by simply do a load operation.
+ * This swaps the page tables by using the pre-computed register values
+ * inside the architecture-specific memory domain struct.
  *
- * @param ADDR_REG Register containing the target address
- * @param PTEVADDR_BASE_REG Register containing the PTEVADDR base
+ * THREAD_PTR_REG is input containing pointer to the incoming thread struct.
+ * SC1_REG and SC2_REG are scratch registers.
  *
- * @note Both the content of ADDR_REG will be modified.
- *       Save and restore it around this macro usage.
+ * Note that all THREAD_PTR_REG, SC1_REG and SC2_REG are all clobbered.
+ * Restore the thread pointer after this if necessary.
  */
-.macro PRELOAD_PTEVADDR ADDR_REG, PTEVADDR_BASE_REG
-	/*
-	 * Calculate the offset to first PTE page of all memory.
-	 *
-	 * Every page (4KB) of page table entries contains
-	 * 1024 entires (as each entry is 4 bytes). Each entry
-	 * maps one 4KB page. So one page of entries maps 4MB of
-	 * memory.
-	 *
-	 * 1. We need to find the virtual address of the PTE page
-	 *    having the page table entry mapping the address in
-	 *    register ADDR_REG. To do this, we first need to find
-	 *    the offset of this PTE page from the first PTE page
-	 *    (the one mapping memory 0x00000000):
-	 *    a. Find the beginning address of the 4KB page
-	 *       containing address in ADDR_REG. This can simply
-	 *       be done by discarding 11 bits (or shifting right
-	 *	 and then left 12 bits).
-	 *    b. Since each PTE page contains 1024 entries,
-	 *	 we divide the address obtained in step (a) by
-	 *       further dividing it by 1024 (shifting right and
-	 *       then left 10 bits) to obtain the offset of
-	 *       the PTE page.
-	 *
-	 *    Step (a) and (b) can be obtained together so that
-	 *    we can shift right 22 bits, and then shift left
-	 *    12 bits.
-	 *
-	 * 2. Once we have combine the results from step (1) and
-	 *    PTEVADDR_BASE_REG to get the virtual address of
-	 *    the PTE page.
-	 *
-	 * 3. Do a l32i to force the PTE page to be in TLB.
-	 */
+.macro SWAP_PAGE_TABLE THREAD_PTR_REG, SC1_REG, SC2_REG
+	l32i \THREAD_PTR_REG, \THREAD_PTR_REG, _thread_offset_to_mem_domain
+
+	j _swap_page_table_\@
+
+.align 16
+_swap_page_table_\@:
+	l32i \SC1_REG, \THREAD_PTR_REG, _k_mem_domain_offset_to_arch_reg_ptevaddr
+	l32i \SC2_REG, \THREAD_PTR_REG, _k_mem_domain_offset_to_arch_reg_asid
+	wsr \SC1_REG, PTEVADDR
+	wsr \SC2_REG, RASID
 
-	/* Step 1 */
-	srli \ADDR_REG, \ADDR_REG, 22
-	slli \ADDR_REG, \ADDR_REG, 12
+	l32i \SC1_REG, \THREAD_PTR_REG, _k_mem_domain_offset_to_arch_reg_ptepin_as
+	l32i \SC2_REG, \THREAD_PTR_REG, _k_mem_domain_offset_to_arch_reg_ptepin_at
+	wdtlb \SC2_REG, \SC1_REG
 
-	/* Step 2 */
-	add \ADDR_REG, \ADDR_REG, \PTEVADDR_BASE_REG
+	l32i \SC1_REG, \THREAD_PTR_REG, _k_mem_domain_offset_to_arch_reg_vecpin_as
+	l32i \SC2_REG, \THREAD_PTR_REG, _k_mem_domain_offset_to_arch_reg_vecpin_at
+	wdtlb \SC2_REG, \SC1_REG
 
-	/* Step 3 */
-	l32i \ADDR_REG, \ADDR_REG, 0
+	isync
 .endm
-#endif /* CONFIG_XTENSA_MMU */
+
+#endif /* CONFIG_XTENSA_MMU && CONFIG_USERSPACE */
 
 /*
  * CROSS_STACK_CALL
@@ -353,16 +331,26 @@
  * the context save handle in A1 as it's first argument.
  */
 .macro CROSS_STACK_CALL
-	mov a6, a3		/* place "new sp" in the next frame's A2 */
-	mov a10, a1             /* pass "context handle" in 2nd frame's A2 */
-	mov a3, a1		/* stash it locally in A3 too */
-	mov a11, a2		/* handler in 2nd frame's A3, next frame's A7 */
+	/* Since accessing A4-A11 may trigger window overflows so
+	 * we need to setup A0 and A1 correctly before putting
+	 * the function arguments for the next two callx4 into
+	 * A6, A10 and A11. So stach the "context handle" into
+	 * ZSR_EPC, which is usable for now similar to ZSR_EPS.
+	 */
+	wsr.ZSR_EPC a1
+	rsync
 
 	/* Recover the interrupted SP from the BSA */
 	l32i a1, a1, 0
 	l32i a0, a1, ___xtensa_irq_bsa_t_a0_OFFSET
 	addi a1, a1, ___xtensa_irq_bsa_t_SIZEOF
 
+	mov a6, a3		/* place "new sp" in the next frame's A2 */
+
+	rsr.ZSR_EPC a3		/* restore saved "context handle" in A3 */
+	mov a10, a3             /* pass "context handle" in 2nd frame's A2 */
+	mov a11, a2		/* handler in 2nd frame's A3, next frame's A7 */
+
 	call4 _xstack_call0_\@
 	mov a1, a3		/* restore original SP */
 	mov a2, a6		/* copy return value */
@@ -377,16 +365,46 @@ _xstack_call0_\@:
 	mov a1, a2
 	rsr.ZSR_EPS a2
 	wsr.ps a2
-	call4 _xstack_call1_\@
+
+#ifdef CONFIG_USERSPACE
+	/* Save "context handle" in A3 as we need it to determine
+	 * if we need to swap page table later.
+	 */
+	mov a3, a6
+#endif
+
+	callx4 a7		/* call handler */
 	mov a2, a6		/* copy return value */
-	retw
-.align 4
-_xstack_call1_\@:
-	/* Remember the handler is going to do our ENTRY, so the
-	 * handler pointer is still in A6 (not A2) even though this is
-	 * after the second CALL4.
+
+#ifdef CONFIG_USERSPACE
+	rsil a6, XCHAL_NUM_INTLEVELS
+
+	/* If "next" handle to be restored is the same as
+	 * the current handle, there is no need to swap page
+	 * tables or MPU entries since we will return to
+	 * the same thread that was interrupted.
+	 */
+	beq a2, a3, _xstack_skip_table_swap_\@
+
+	/* Need to switch page tables because the "next" handle
+	 * returned above is not the same handle as we started
+	 * with. This means we are being restored to another
+	 * thread.
 	 */
-	jx a7
+	rsr a6, ZSR_CPU
+	l32i a6, a6, ___cpu_t_current_OFFSET
+
+#ifdef CONFIG_XTENSA_MMU
+	SWAP_PAGE_TABLE a6, a3, a7
+#endif
+#ifdef CONFIG_XTENSA_MPU
+	call4 xtensa_mpu_map_write
+#endif
+
+_xstack_skip_table_swap_\@:
+#endif /* CONFIG_USERSPACE */
+
+	retw
 _xstack_returned_\@:
 .endm
 
@@ -409,7 +427,11 @@ _xstack_returned_\@:
 	 */
 	s32i a2, a1, ___xtensa_irq_bsa_t_scratch_OFFSET
 
-	ODD_REG_SAVE
+	ODD_REG_SAVE a0, a1
+
+#if XCHAL_HAVE_FP && defined(CONFIG_CPU_HAS_FPU) && defined(CONFIG_FPU_SHARING)
+	FPU_REG_SAVE
+#endif
 
 #if defined(CONFIG_XTENSA_HIFI_SHARING)
 	call0 _xtensa_hifi_save    /* Save HiFi registers */
@@ -430,6 +452,23 @@ _xstack_returned_\@:
 	wur.THREADPTR a0
 #endif /* XCHAL_HAVE_THREADPTR && CONFIG_USERSPACE */
 
+	/* Setting up the cross stack call below has states where the
+	 * resulting frames are invalid/non-reentrant, so we can't
+	 * allow nested interrupts.  But we do need EXCM unmasked, as
+	 * we use CALL/ENTRY instructions in the process and need to
+	 * handle exceptions to spill caller/interruptee frames.  Use
+	 * PS.INTLEVEL at maximum to mask all interrupts and stash the
+	 * current value in our designated EPS register (which is
+	 * guaranteed unused across the call)
+	 */
+	rsil a0, 0xf
+
+	/* Since we are unmasking EXCM, we need to set RING bits to kernel
+	 * mode, otherwise we won't be able to run the exception handler in C.
+	 */
+	movi a3, ~(PS_EXCM_MASK) & ~(PS_RING_MASK)
+	and a0, a0, a3
+
 #ifdef CONFIG_XTENSA_INTERRUPT_NONPREEMPTABLE
 
 	/* Setting the interrupt mask to the max non-debug level
@@ -437,12 +476,11 @@ _xstack_returned_\@:
 	 * high level interrupts until processing of that lower level
 	 * interrupt has completed.
 	 */
-	rsr.ps a0
 	movi a3, ~(PS_INTLEVEL_MASK)
 	and a0, a0, a3
 	movi a3, PS_INTLEVEL(ZSR_RFI_LEVEL)
 	or a0, a0, a3
-	wsr.ps a0
+	wsr.ZSR_EPS a0
 
 #else
 
@@ -458,35 +496,20 @@ _xstack_returned_\@:
 	 * argument and expand two versions of this handler.  An
 	 * optimization FIXME, I guess.
 	 */
-	rsr.ps a0
 	movi a3, PS_INTLEVEL_MASK
-	and a0, a0, a3
-	bnez a0, _not_l1
-	rsr.ps a0
+	and a3, a0, a3
+	bnez a3, _not_l1
+
+	/* interrupt masking is zero, so no need to zero it before OR-ing. */
 	movi a3, PS_INTLEVEL(1)
 	or a0, a0, a3
-	wsr.ps a0
 
 _not_l1:
+	wsr.ZSR_EPS a0
 #endif /* CONFIG_XTENSA_INTERRUPT_NONPREEMPTABLE */
 
-	/* Setting up the cross stack call below has states where the
-	 * resulting frames are invalid/non-reentrant, so we can't
-	 * allow nested interrupts.  But we do need EXCM unmasked, as
-	 * we use CALL/ENTRY instructions in the process and need to
-	 * handle exceptions to spill caller/interruptee frames.  Use
-	 * PS.INTLEVEL at maximum to mask all interrupts and stash the
-	 * current value in our designated EPS register (which is
-	 * guaranteed unused across the call)
-	 */
-	rsil a0, 0xf
-
-	/* Since we are unmasking EXCM, we need to set RING bits to kernel
-	 * mode, otherwise we won't be able to run the exception handler in C.
-	 */
-	movi a3, ~(PS_EXCM_MASK) & ~(PS_RING_MASK)
-	and a0, a0, a3
-	wsr.ZSR_EPS a0
+	movi a3, PS_INTLEVEL(0xf)
+	or a0, a0, a3
 	wsr.ps a0
 	rsync
 
@@ -536,52 +559,48 @@ _do_call_\@:
 	 */
 	beq a6, a1, _restore_\@
 
-#ifndef CONFIG_USERSPACE
+#if !defined(CONFIG_KERNEL_COHERENCE) || \
+    (defined(CONFIG_KERNEL_COHERENCE) && defined(CONFIG_SCHED_CPU_MASK_PIN_ONLY))
 	l32i a1, a1, 0
 	l32i a0, a1, ___xtensa_irq_bsa_t_a0_OFFSET
 	addi a1, a1, ___xtensa_irq_bsa_t_SIZEOF
-#ifndef CONFIG_KERNEL_COHERENCE
+
 	/* When using coherence, the registers of the interrupted
 	 * context got spilled upstream in arch_cohere_stacks()
 	 */
 	SPILL_ALL_WINDOWS
 #endif
 
-	/* Restore A1 stack pointer from "next" handle. */
-	mov a1, a6
-#else
-	/* With userspace, we cannot simply restore A1 stack pointer
-	 * at this pointer because we need to swap page tables to
-	 * the incoming thread, and we do not want to call that
-	 * function with thread's stack. So we stash the new stack
-	 * pointer into A2 first, then move it to A1 after we have
-	 * swapped the page table.
-	 */
-	mov a2, a6
+#if defined(CONFIG_KERNEL_COHERENCE) && \
+	defined(CONFIG_USERSPACE) && \
+	!defined(CONFIG_SCHED_CPU_MASK_PIN_ONLY)
 
-	/* Need to switch page tables because the "next" handle
-	 * returned above is not the same handle as we started
-	 * with. This means we are being restored to another
-	 * thread.
+	/* With userspace enabled, we need to swap page table via function calls
+	 * above after returning from syscall handler above in CROSS_STACK_CALL.
+	 * This means that the stack is being actively used, and so we need to
+	 * flush the cached data in stack.
 	 */
-	rsr a6, ZSR_CPU
-	l32i a6, a6, ___cpu_t_current_OFFSET
 
-#ifdef CONFIG_XTENSA_MMU
-	call4 xtensa_swap_update_page_tables
-#endif
-#ifdef CONFIG_XTENSA_MPU
-	call4 xtensa_mpu_map_write
-#endif
-	l32i a1, a1, 0
-	l32i a0, a1, ___xtensa_irq_bsa_t_a0_OFFSET
-	addi a1, a1, ___xtensa_irq_bsa_t_SIZEOF
+	movi a2, 0
+	xsr.ZSR_FLUSH a2
+	beqz a2, _excint_noflush_\@
 
-	SPILL_ALL_WINDOWS
+	rsr.ZSR_CPU a3
+	l32i a3, a3, \NEST_OFF
+	bnez a3, _excint_noflush_\@
 
-	/* Moved stashed stack pointer to A1 to restore stack. */
-	mov a1, a2
-#endif
+	mov a3, a1
+
+_excint_flushloop_\@:
+	dhwb a3, 0
+	addi a3, a3, XCHAL_DCACHE_LINESIZE
+	blt a3, a2, _excint_flushloop_\@
+
+_excint_noflush_\@:
+#endif /* CONFIG_KERNEL_COHERENCE && CONFIG_USERSPACE && !CONFIG_SCHED_CPU_MASK_PIN_ONLY */
+
+	/* Restore A1 stack pointer from "next" handle. */
+	mov a1, a6
 
 _restore_\@:
 	j _restore_context
@@ -706,6 +725,25 @@ _Level\LVL\()Vector:
 	s32i a0, a1, ___xtensa_irq_bsa_t_ps_OFFSET
 .endif
 
+#ifdef CONFIG_USERSPACE
+	/* When restoring context via xtensa_switch and
+	 * returning from non-nested interrupts, we will be
+	 * using the stashed PS value in the thread struct
+	 * instead of the one in the thread stack. Both of
+	 * these scenarios will have nested value of 0.
+	 * So when nested value is zero, we store the PS
+	 * value into thread struct.
+	 */
+	rsr.ZSR_CPU a3
+	l32i a2, a3, ___cpu_t_nested_OFFSET
+	bnez a2, _excint_skip_ps_save_to_thread_\LVL
+
+	l32i a2, a3, ___cpu_t_current_OFFSET
+	s32i a0, a2, _thread_offset_to_return_ps
+
+_excint_skip_ps_save_to_thread_\LVL:
+#endif
+
 	rsr.epc\LVL a0
 	s32i a0, a1, ___xtensa_irq_bsa_t_pc_OFFSET
 
diff --git a/arch/xtensa/include/xtensa_mmu_priv.h b/arch/xtensa/include/xtensa_mmu_priv.h
index 608cbac9c4652..b4491ff0bc30b 100644
--- a/arch/xtensa/include/xtensa_mmu_priv.h
+++ b/arch/xtensa/include/xtensa_mmu_priv.h
@@ -14,6 +14,7 @@
 #include <xtensa/config/core-isa.h>
 #include <zephyr/toolchain.h>
 #include <zephyr/sys/util_macro.h>
+#include <zephyr/arch/xtensa/arch.h>
 
 /**
  * @defgroup xtensa_mmu_internal_apis Xtensa Memory Management Unit (MMU) Internal APIs
@@ -509,18 +510,22 @@ static inline void xtensa_dtlb_vaddr_invalidate(void *vaddr)
 
 /**
  * @brief Tell hardware to use a page table very first time after boot.
- *
- * @param l1_page Pointer to the page table to be used.
  */
-void xtensa_init_paging(uint32_t *l1_page);
+void xtensa_mmu_init_paging(void);
 
 /**
  * @brief Switch to a new page table.
  *
- * @param asid The ASID of the memory domain associated with the incoming page table.
- * @param l1_page Page table to be switched to.
+ * @param domain Architecture-specific memory domain data.
+ */
+void xtensa_mmu_set_paging(struct arch_mem_domain *domain);
+
+/**
+ * @brief Computer the necessary register values when changing page tables.
+ *
+ * @param domain Architecture-specific memory domain data.
  */
-void xtensa_set_paging(uint32_t asid, uint32_t *l1_page);
+void xtensa_mmu_compute_domain_regs(struct arch_mem_domain *domain);
 
 /**
  * @}
diff --git a/boards/01space/esp32c3_042_oled/doc/index.rst b/boards/01space/esp32c3_042_oled/doc/index.rst
index 29fcfc7861502..801e8651cfa67 100644
--- a/boards/01space/esp32c3_042_oled/doc/index.rst
+++ b/boards/01space/esp32c3_042_oled/doc/index.rst
@@ -34,31 +34,7 @@ It features:
 Supported Features
 ==================
 
-The 01space ESP32C3 0.42 OLED board configuration supports the following hardware features:
-
-+-----------+------------+------------------+
-| Interface | Controller | Driver/Component |
-+===========+============+==================+
-| PMP       | on-chip    | arch/riscv       |
-+-----------+------------+------------------+
-| INTMTRX   | on-chip    | intc_esp32c3     |
-+-----------+------------+------------------+
-| PINMUX    | on-chip    | pinctrl_esp32    |
-+-----------+------------+------------------+
-| USB UART  | on-chip    | serial_esp32_usb |
-+-----------+------------+------------------+
-| GPIO      | on-chip    | gpio_esp32       |
-+-----------+------------+------------------+
-| UART      | on-chip    | uart_esp32       |
-+-----------+------------+------------------+
-| I2C       | on-chip    | i2c_esp32        |
-+-----------+------------+------------------+
-| SPI       | on-chip    | spi_esp32_spim   |
-+-----------+------------+------------------+
-| RADIO     | on-chip    | Bluetooth        |
-+-----------+------------+------------------+
-| DISPLAY   | off-chip   | display          |
-+-----------+------------+------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -91,6 +67,8 @@ retrieve those files.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Standalone application
 ======================
 
diff --git a/boards/Kconfig b/boards/Kconfig
index 40e8e5006e129..71b3b9571ad24 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -2,8 +2,7 @@
 
 config BOARD
 	string
-	# When using hw model v2, then the board is inherited from CMake.
-	default "$(BOARD)" if "$(HWM_SCHEME)" = "v2"
+	default "$(BOARD)"
 	help
 	  This option holds the name of the board and is used to locate the files
 	  related to the board in the source tree (under boards/).
@@ -53,7 +52,7 @@ config NET_DRIVERS
 	  When building for a qemu target then NET_DRIVERS will be default
 	  enabled to allow for easy use of SLIP or PPP
 
-rsource "Kconfig.$(HWM_SCHEME)"
+rsource "Kconfig.v2"
 
 # Parse shields references
 # Don't do it as a menuconfig, as shield selection is a CMake feature.
diff --git a/boards/Kconfig.v1 b/boards/Kconfig.v1
deleted file mode 100644
index c98bd27d2db85..0000000000000
--- a/boards/Kconfig.v1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2022 Nordic Semiconductor ASA
-
-# SPDX-License-Identifier: Apache-2.0
-
-# In HWMv1 the KCONFIG_BOARD_DIR points directly to the BOARD_DIR.
-# Set the BOARD_DIR variable for backwards compatibility to legacy hardware model.
-BOARD_DIR := $(KCONFIG_BOARD_DIR)
-
-choice
-	prompt "Board Selection"
-
-source "$(KCONFIG_BOARD_DIR)/Kconfig.board"
-
-endchoice
diff --git a/boards/aconno/acn52832/board.cmake b/boards/aconno/acn52832/board.cmake
index ddd57ab8839aa..69caa8667e3ad 100644
--- a/boards/aconno/acn52832/board.cmake
+++ b/boards/aconno/acn52832/board.cmake
@@ -2,5 +2,7 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
+
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/acrn/acrn/Kconfig b/boards/acrn/acrn/Kconfig
index 7d7b97605a46c..857bd34707501 100644
--- a/boards/acrn/acrn/Kconfig
+++ b/boards/acrn/acrn/Kconfig
@@ -1,17 +1,9 @@
-# Copyright (c) 2019-2024 Intel Corporation
+# Copyright (c) 2019-2025 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_ACRN
+config ACRN_COMMON
 	bool
+	default y if BOARD_ACRN || BOARD_ACRN_EHL_CRB || BOARD_ACRN_ADL_CRB
 	select CPU_HAS_FPU
 	select X86_64
-	help
-	  "ACRN User OS"
-
-config BOARD_ACRN_EHL_CRB
-	bool
-	select CPU_HAS_FPU
-	select X86_64
-	help
-	  "ACRN User OS on ElkhartLake CRB"
diff --git a/boards/acrn/acrn/Kconfig.acrn_adl_crb b/boards/acrn/acrn/Kconfig.acrn_adl_crb
new file mode 100644
index 0000000000000..c105411cede57
--- /dev/null
+++ b/boards/acrn/acrn/Kconfig.acrn_adl_crb
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ACRN_ADL_CRB
+	select SOC_ATOM
diff --git a/boards/acrn/acrn/acrn_adl_crb.dts b/boards/acrn/acrn/acrn_adl_crb.dts
new file mode 100644
index 0000000000000..c13054d38912f
--- /dev/null
+++ b/boards/acrn/acrn/acrn_adl_crb.dts
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "acrn.dts"
diff --git a/boards/acrn/acrn/acrn_adl_crb.yaml b/boards/acrn/acrn/acrn_adl_crb.yaml
new file mode 100644
index 0000000000000..4bb5438c97cdd
--- /dev/null
+++ b/boards/acrn/acrn/acrn_adl_crb.yaml
@@ -0,0 +1,11 @@
+identifier: acrn_adl_crb
+name: ACRN on ADL configuration
+type: mcu
+arch: x86
+toolchain:
+  - zephyr
+ram: 8192
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/acrn/acrn/acrn_adl_crb_defconfig b/boards/acrn/acrn/acrn_adl_crb_defconfig
new file mode 100644
index 0000000000000..de5dfe547e78a
--- /dev/null
+++ b/boards/acrn/acrn/acrn_adl_crb_defconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_PIC_DISABLE=y
+CONFIG_LOAPIC=y
+CONFIG_X2APIC=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1500000000
+CONFIG_BUILD_OUTPUT_BIN=y
+CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN=n
+CONFIG_KERNEL_VM_SIZE=0x5000000
+CONFIG_APIC_TSC_DEADLINE_TIMER=y
diff --git a/boards/acrn/acrn/board.yml b/boards/acrn/acrn/board.yml
index dce367c0f96a5..6efec2b876e85 100644
--- a/boards/acrn/acrn/board.yml
+++ b/boards/acrn/acrn/board.yml
@@ -8,4 +8,9 @@ boards:
   - name: acrn_ehl_crb
     full_name: ACRN on EHL hypervisor
     socs:
-      - name: elkhart_lake
+      - name: atom
+
+  - name: acrn_adl_crb
+    full_name: ACRN Hypervisor on ADL
+    socs:
+      - name: atom
diff --git a/boards/actinius/icarus/board.cmake b/boards/actinius/icarus/board.cmake
index 9c0c33243af67..91aec43ebb51b 100644
--- a/boards/actinius/icarus/board.cmake
+++ b/boards/actinius/icarus/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/actinius/icarus_bee/board.cmake b/boards/actinius/icarus_bee/board.cmake
index 9c0c33243af67..91aec43ebb51b 100644
--- a/boards/actinius/icarus_bee/board.cmake
+++ b/boards/actinius/icarus_bee/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/actinius/icarus_som/board.cmake b/boards/actinius/icarus_som/board.cmake
index 9c0c33243af67..91aec43ebb51b 100644
--- a/boards/actinius/icarus_som/board.cmake
+++ b/boards/actinius/icarus_som/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/actinius/icarus_som_dk/board.cmake b/boards/actinius/icarus_som_dk/board.cmake
index 9c0c33243af67..91aec43ebb51b 100644
--- a/boards/actinius/icarus_som_dk/board.cmake
+++ b/boards/actinius/icarus_som_dk/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/adafruit/feather_esp32s2/CMakeLists.txt b/boards/adafruit/feather_esp32s2/CMakeLists.txt
new file mode 100644
index 0000000000000..218a0602483ab
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/CMakeLists.txt
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(board.c)
diff --git a/boards/adafruit/feather_esp32s2/Kconfig b/boards/adafruit/feather_esp32s2/Kconfig
new file mode 100644
index 0000000000000..272e4c39ee9f3
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/Kconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2023 Google, LLC
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096
+
+config BOARD_NEEDS_LATE_HOOK
+	bool
+	default y if BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT || BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT_REVERSE
+	select BOARD_LATE_INIT_HOOK
diff --git a/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2 b/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2
new file mode 100644
index 0000000000000..63f45c11300ec
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ADAFRUIT_FEATHER_ESP32S2
+	select SOC_ESP32S2_R2
diff --git a/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2_tft b/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2_tft
new file mode 100644
index 0000000000000..e54cad03d4221
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2_tft
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT
+	select SOC_ESP32S2_R2
diff --git a/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2_tft_reverse b/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2_tft_reverse
new file mode 100644
index 0000000000000..1d470f8749063
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/Kconfig.adafruit_feather_esp32s2_tft_reverse
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT_REVERSE
+	select SOC_ESP32S2_R2
diff --git a/boards/adafruit/feather_esp32s2/Kconfig.defconfig b/boards/adafruit/feather_esp32s2/Kconfig.defconfig
new file mode 100644
index 0000000000000..734863a6654b1
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/Kconfig.defconfig
@@ -0,0 +1,28 @@
+# Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT || BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT_REVERSE
+
+if DISPLAY
+
+choice ST7789V_PIXEL_FORMAT
+	default ST7789V_RGB565
+endchoice
+
+if LVGL
+
+config LV_Z_BITS_PER_PIXEL
+	default 16
+
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_16
+endchoice
+
+config LV_COLOR_16_SWAP
+	default y
+
+endif # LVGL
+
+endif # DISPLAY
+
+endif # BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT || BOARD_ADAFRUIT_FEATHER_ESP32S2_TFT_REVERSE
diff --git a/boards/adafruit/feather_esp32s2/Kconfig.sysbuild b/boards/adafruit/feather_esp32s2/Kconfig.sysbuild
new file mode 100644
index 0000000000000..3a2d17ac5cfd0
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_NONE
+endchoice
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2-pinctrl.dtsi b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2-pinctrl.dtsi
new file mode 100644
index 0000000000000..a6c67847bbb3f
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2-pinctrl.dtsi
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <dt-bindings/pinctrl/esp32s2-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/esp32s2-gpio-sigmap.h>
+
+&pinctrl {
+	/*  Debug TX (DBG) - This is the hardware UART debug pin */
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO43>;
+			output-high;
+		};
+	};
+
+	uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TX_GPIO39>;
+			output-high;
+		};
+
+		group2 {
+			pinmux = <UART1_RX_GPIO38>;
+			bias-pull-up;
+		};
+	};
+
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_MISO_GPIO37>,
+				 <SPIM2_SCLK_GPIO36>,
+				 <SPIM2_CSEL_GPIO7>;
+		};
+
+		group2 {
+			pinmux = <SPIM2_MOSI_GPIO35>;
+			output-low;
+		};
+	};
+
+	spim3_ws2812_led: spim3_ws2812_led {
+		group1 {
+			pinmux = <SPIM3_MOSI_GPIO33>;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO3>,
+				 <I2C0_SCL_GPIO4>;
+			drive-open-drain;
+			output-high;
+		};
+	};
+
+	twai_default: twai_default {
+		group1 {
+			pinmux = <TWAI_TX_GPIO5>,
+				 <TWAI_RX_GPIO6>;
+		};
+	};
+};
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2.dts b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2.dts
new file mode 100644
index 0000000000000..e7e3f8efb7b50
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2.dts
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include "adafruit_feather_esp32s2_common.dtsi"
+#include "feather_connector.dtsi"
+
+/ {
+	model = "Adafruit Feather ESP32-S2";
+	compatible = "espressif,esp32s2";
+};
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_B.overlay b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_B.overlay
new file mode 100644
index 0000000000000..096357d93eb77
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_B.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	/*
+	 * On-board transistor powers I2C pull-ups and external devices connected
+	 * via the STEMMA QT connector.
+	 */
+	i2c_reg: i2c_reg {
+		label = "I2C Power";
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+		startup-delay-us = <10>;
+	};
+};
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_B.yaml b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_B.yaml
new file mode 100644
index 0000000000000..7246420988f85
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_B.yaml
@@ -0,0 +1,20 @@
+identifier: adafruit_feather_esp32s2@B
+name: Adafruit Feather ESP32-S2 Rev B
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+vendor: adafruit
+testing:
+  ignore_tags:
+    - bluetooth
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_C.overlay b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_C.overlay
new file mode 100644
index 0000000000000..94550a53acda4
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_C.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	/*
+	 * On-board regulator powers I2C pull-ups and external devices connected
+	 * via the STEMMA QT connector.
+	 */
+	i2c_reg: i2c_reg {
+		label = "I2C Power";
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <10>;
+	};
+};
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_C.yaml b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_C.yaml
new file mode 100644
index 0000000000000..86ca59f5965d4
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_C.yaml
@@ -0,0 +1,20 @@
+identifier: adafruit_feather_esp32s2@C
+name: Adafruit Feather ESP32-S2 Rev C
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+vendor: adafruit
+testing:
+  ignore_tags:
+    - bluetooth
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_common.dtsi b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_common.dtsi
new file mode 100644
index 0000000000000..257ea650a298b
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_common.dtsi
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <espressif/esp32s2/esp32s2.dtsi>
+#include <espressif/esp32s2/esp32s2_wroom.dtsi>
+#include "adafruit_feather_esp32s2-pinctrl.dtsi"
+#include <espressif/partitions_0x1000_default.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <dt-bindings/led/led.h>
+#include <dt-bindings/led/worldsemi_ws2812c.h>
+#include <zephyr/dt-bindings/mipi_dbi/mipi_dbi.h>
+
+/ {
+	compatible = "espressif,esp32s2";
+
+	chosen {
+		zephyr,sram = &sram1;
+		/*
+		 * uart1 is used as the default uart for zephyr,console and zephyr,shell,
+		 * because USB-OTG is until now not supported and USB-CDC is not available
+		 * for ESP32-S2.
+		 * See issue #29394 - ESP32 development overview
+		 * To use uart1 a FTDI-USB-RS232 or similar needs to be connected to the RX/TX pins.
+		 * See feather_connector.dtsi
+		 */
+		zephyr,console = &uart1;
+		zephyr,shell-uart = &uart1;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	aliases {
+		led0 = &led0;
+		i2c-0 = &i2c0;
+		sw0 = &user_button;
+		led-strip = &led_strip;
+		watchdog0 = &wdt0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		status = "okay";
+
+		led0: led_0 {
+			label = "Red-LED";
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		status = "okay";
+
+		user_button: user_button {
+			label = "BOOT Button";
+			gpios = <&gpio0 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+
+	neopixel_power_enable {
+		gpio-hog;
+		gpios = <21 GPIO_ACTIVE_HIGH>;
+		output-high;
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&timer0 {
+	status = "okay";
+};
+
+&timer1 {
+	status = "okay";
+};
+
+&timer2 {
+	status = "okay";
+};
+
+&timer3 {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim2_default>;
+	pinctrl-names = "default";
+};
+
+&spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim3_ws2812_led>;
+	pinctrl-names = "default";
+
+	line-idle-low;
+
+	led_strip: ws2812@0 {
+		compatible = "worldsemi,ws2812-spi";
+
+		/* WS2812 */
+		reg = <0>;
+		spi-max-frequency = <6400000>;
+		chain-length = <1>;
+		spi-cpha;
+		spi-one-frame = <WS2812C_ONE_FRAME>; /* 11110000: 625ns high and 625ns low */
+		spi-zero-frame = <WS2812C_ZERO_FRAME>; /* 11000000: 312.5ns high and 937.5ns low */
+		color-mapping = <LED_COLOR_ID_GREEN>,
+				<LED_COLOR_ID_RED>,
+				<LED_COLOR_ID_BLUE>;
+	};
+};
+
+&twai {
+	pinctrl-0 = <&twai_default>;
+	pinctrl-names = "default";
+};
+
+&wdt0 {
+	status = "okay";
+};
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_defconfig b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_defconfig
new file mode 100644
index 0000000000000..d8fbaa879257b
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_defconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft.dts b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft.dts
new file mode 100644
index 0000000000000..c57ebdc8b8b97
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft.dts
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include "adafruit_feather_esp32s2_common.dtsi"
+#include "feather_connector_tft.dtsi"
+
+/ {
+	model = "Adafruit Feather ESP32-S2 TFT";
+	compatible = "espressif,esp32s2";
+
+	chosen {
+		zephyr,display = &st7789v_tft;
+	};
+
+	aliases {
+		backlight = &led1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		status = "okay";
+
+		led1: led_1 {
+			label = "TFT Backlight";
+			gpios = <&gpio1 45 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	/*
+	 * On-board regulator powers I2C pull-ups and external devices connected
+	 * via the STEMMA QT connector.
+	 */
+	i2c_reg: i2c_reg {
+		label = "I2C Power";
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <10>;
+	};
+
+	mipi_dbi {
+		compatible = "zephyr,mipi-dbi-spi";
+		spi-dev = <&spi2>;
+		dc-gpios = <&gpio1 39 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio1 40 GPIO_ACTIVE_LOW>;
+		write-only;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		st7789v_tft: st7789v_tft@0 {
+			compatible = "sitronix,st7789v";
+			status = "disabled";
+
+			/* Also powered by i2c_reg */
+			power-domains = <&i2c_reg>;
+
+			mipi-max-frequency = <DT_FREQ_M(20)>;
+			reg = <0>;
+			width = <135>;
+			height = <240>;
+			x-offset = <52>;
+			y-offset = <40>;
+			vcom = <0x20>;
+			gctrl = <0x35>;
+			vrhs = <0x0b>;
+			vdvs = <0x20>;
+			mdac = <0x08>;
+			gamma = <0x01>;
+			colmod = <0x55>;
+			lcm = <0x2c>;
+			porch-param = [0c 0c 00 33 33];
+			cmd2en-param = [5a 69 02 01];
+			pwctrl1-param = [a4 a1];
+			pvgam-param = [70 2C 2E 15 10 09 48 33 53 0B 19 18 20 25];
+			nvgam-param = [70 2C 2E 15 10 09 48 33 53 0B 19 18 20 25];
+			ram-param = [00 F0];
+			rgb-param = [40 02 14];
+			mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
+		};
+	};
+};
+
+&gpio0 {
+	status = "okay";
+
+	neopixel_power_enable {
+		gpio-hog;
+		gpios = <34 GPIO_ACTIVE_HIGH>;
+		output-high;
+	};
+};
+
+&pinctrl {
+	uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TX_GPIO1>;
+			output-high;
+		};
+
+		group2 {
+			pinmux = <UART1_RX_GPIO2>;
+			bias-pull-up;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO42>,
+				 <I2C0_SCL_GPIO41>;
+			drive-open-drain;
+			output-high;
+		};
+	};
+};
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft.yaml b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft.yaml
new file mode 100644
index 0000000000000..99ca5778e7a03
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft.yaml
@@ -0,0 +1,21 @@
+identifier: adafruit_feather_esp32s2_tft
+name: Adafruit ESP32-S2 TFT Feather
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+  - display
+vendor: adafruit
+testing:
+  ignore_tags:
+    - bluetooth
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_defconfig b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_defconfig
new file mode 100644
index 0000000000000..d8fbaa879257b
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_defconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse.dts b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse.dts
new file mode 100644
index 0000000000000..fbb4b0993ae1c
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse.dts
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include "adafruit_feather_esp32s2_common.dtsi"
+#include "feather_connector.dtsi"
+
+/ {
+	model = "Adafruit Feather ESP32-S2 TFT Reverse";
+	compatible = "espressif,esp32s2";
+
+	chosen {
+		zephyr,display = &st7789v_tft;
+	};
+
+	aliases {
+		backlight = &led1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		status = "okay";
+
+		led1: led_1 {
+			label = "TFT Backlight";
+			gpios = <&gpio1 45 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		status = "okay";
+
+		d1_button: d1_button {
+			label = "D1 Button";
+			gpios = <&gpio0 1 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+
+		d2_button: d2_button {
+			label = "D3 Button";
+			gpios = <&gpio0 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_3>;
+		};
+	};
+
+	i2c_reg: i2c_reg {
+		label = "TFT I2C Power";
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <10>;
+	};
+
+	mipi_dbi {
+		compatible = "zephyr,mipi-dbi-spi";
+		spi-dev = <&spi2>;
+		dc-gpios = <&gpio1 40 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio1 41 GPIO_ACTIVE_LOW>;
+		write-only;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		st7789v_tft: st7789v_tft@0 {
+			compatible = "sitronix,st7789v";
+			status = "disabled";
+
+			/* Also powered by i2c_reg */
+			power-domains = <&i2c_reg>;
+
+			mipi-max-frequency = <DT_FREQ_M(20)>;
+			reg = <0>;
+			width = <135>;
+			height = <240>;
+			x-offset = <52>;
+			y-offset = <40>;
+			vcom = <0x20>;
+			gctrl = <0x35>;
+			vrhs = <0x0b>;
+			vdvs = <0x20>;
+			mdac = <0x08>;
+			gamma = <0x01>;
+			colmod = <0x55>;
+			lcm = <0x2c>;
+			porch-param = [0c 0c 00 33 33];
+			cmd2en-param = [5a 69 02 01];
+			pwctrl1-param = [a4 a1];
+			pvgam-param = [70 2C 2E 15 10 09 48 33 53 0B 19 18 20 25];
+			nvgam-param = [70 2C 2E 15 10 09 48 33 53 0B 19 18 20 25];
+			ram-param = [00 F0];
+			rgb-param = [40 02 14];
+			mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
+		};
+	};
+};
+
+&pinctrl {
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_MISO_GPIO37>,
+				 <SPIM2_SCLK_GPIO36>,
+				 <SPIM2_CSEL_GPIO42>;
+		};
+
+		group2 {
+			pinmux = <SPIM2_MOSI_GPIO35>;
+			output-low;
+		};
+	};
+};
+
+&i2c0 {
+	max17048: max17048@36 {
+		compatible = "maxim,max17048";
+		status = "disabled";
+		reg = <0x36 >;
+		power-domains = <&i2c_reg>;
+	};
+};
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse.yaml b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse.yaml
new file mode 100644
index 0000000000000..f5c673e211bef
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse.yaml
@@ -0,0 +1,22 @@
+identifier: adafruit_feather_esp32s2_tft_reverse/esp32s2
+name: Adafruit ESP32-S2 TFT Feather Reverse
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+  - display
+  - fuel_gauge
+vendor: adafruit
+testing:
+  ignore_tags:
+    - bluetooth
diff --git a/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse_defconfig b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse_defconfig
new file mode 100644
index 0000000000000..d8fbaa879257b
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/adafruit_feather_esp32s2_tft_reverse_defconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/adafruit/feather_esp32s2/board.c b/boards/adafruit/feather_esp32s2/board.c
new file mode 100644
index 0000000000000..e7f65a4ba537a
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/board.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Automatically turns on backlight if display is configured, i.e. display DT
+ * node has status okay.
+ */
+
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
+
+#define DISPLAY_NODE DT_CHOSEN(zephyr_display)
+
+#if DT_NODE_HAS_STATUS(DISPLAY_NODE, okay)
+static const struct gpio_dt_spec backlight = GPIO_DT_SPEC_GET(DT_ALIAS(backlight), gpios);
+#endif
+
+void board_late_init_hook(void)
+{
+#if DT_NODE_HAS_STATUS(DISPLAY_NODE, okay)
+	if (gpio_is_ready_dt(&backlight)) {
+		gpio_pin_configure_dt(&backlight, GPIO_OUTPUT_ACTIVE);
+	}
+#endif
+}
diff --git a/boards/adafruit/feather_esp32s2/board.cmake b/boards/adafruit/feather_esp32s2/board.cmake
new file mode 100644
index 0000000000000..2f04d1fe8861e
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/board.cmake
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
+  set(OPENOCD OPENOCD-NOTFOUND)
+endif()
+find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
+
+include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/adafruit/feather_esp32s2/board.yml b/boards/adafruit/feather_esp32s2/board.yml
new file mode 100644
index 0000000000000..fda3bf5e8556b
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/board.yml
@@ -0,0 +1,22 @@
+boards:
+- name: adafruit_feather_esp32s2
+  full_name: Adafruit Feather ESP32S2
+  vendor: adafruit
+  socs:
+  - name: esp32s2
+  revision:
+    format: "letter"
+    default: "C"
+    revisions:
+    - name: "B"
+    - name: "C"
+- name: adafruit_feather_esp32s2_tft
+  full_name: Adafruit Feather ESP32S2 TFT
+  vendor: adafruit
+  socs:
+  - name: esp32s2
+- name: adafruit_feather_esp32s2_tft_reverse
+  full_name: Adafruit Feather ESP32S2 TFT Reverse
+  vendor: adafruit
+  socs:
+  - name: esp32s2
diff --git a/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2.rst b/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2.rst
new file mode 100644
index 0000000000000..a5fb76324d985
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2.rst
@@ -0,0 +1,358 @@
+.. zephyr:board:: adafruit_feather_esp32s2
+
+Overview
+********
+
+The Adafruit Feather ESP32-S2 boards are ESP32-S2 development boards in the
+Feather standard layout, sharing peripheral placement with other devices labeled
+as Feathers or FeatherWings. The board is equipped with an ESP32-S2 mini module,
+a LiPo battery charger, a fuel gauge, a USB-C and `SparkFun Qwiic`_-compatible
+`STEMMA QT`_ connector for the I2C bus.
+
+Hardware
+********
+
+- ESP32-S2 mini module, featuring the 240MHz Tensilica processor
+- 320KB SRAM, 4MB flash + 2MB PSRAM
+- USB-C directly connected to the ESP32-S2 for USB
+- LiPo connector and built-in battery charging when powered via USB-C
+- LC709203 or MAX17048 fuel gauge for battery voltage and state-of-charge reporting
+- Built-in NeoPixel indicator RGB LED
+- STEMMA QT connector for I2C devices, with switchable power for low-power mode
+
+.. note::
+
+   - The `Adafruit ESP32-S2 Feather with BME280 Sensor`_ is the same board as the
+     `Adafruit ESP32-S2 Feather`_ but with an already equipped BME280 Sensor, but is not
+     stated as a separate board, instead the BME280 needs to be added via a devicetree
+     overlay. All boards, except the `Adafruit ESP32-S2 Feather with BME280 Sensor`_ have a
+     space for it, but will not be shipped with.
+   - As of May 31, 2023 - Adafruit has changed the battery monitor chip from the
+     now-discontinued LC709203 to the MAX17048. Check the back silkscreen of your Feather to
+     see which chip you have.
+   - For the MAX17048 a driver in zephyr exists and is supported, but needs to be added via
+     a devicetree overlay.
+   - For the LC709203 a driver does'nt exists yet and the fuel gauge for boards with this IC
+     is not available.
+   - For the `Adafruit ESP32-S2 Feather`_ there are two different Revisions ``rev B`` and
+     ``rev C``. The ``rev C`` board has revised the power circuitry for the NeoPixel and I2C
+     QT port. Instead of a transistor the ``rev C`` has a LDO regulator. To enable the
+     NeoPixel and I2C QT port on ``rev B`` boards ``GPIO7`` (``i2c_reg``) needs to be set to
+     LOW and on ``rev C`` boards it needs to be set HIGH.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+.. note::
+   USB-OTG is until now not supported see `ESP32 development overview`_. To see a serial output
+   a FTDI-USB-RS232 or similar needs to be connected to the RX/TX pins on the feather connector.
+
+Connections and IOs
+===================
+
+The `Adafruit ESP32-S2 Feather`_ User Guide has detailed information about the board including
+pinouts and the schematic.
+
+- `Adafruit ESP32-S2 Feather Pinouts`_
+- `Adafruit ESP32-S2 Feather Schematic`_
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi binary blobs in order work. Run the command below
+to retrieve those files.
+
+.. code-block:: console
+
+   west update
+   west blobs fetch hal_espressif
+
+Building & Flashing
+*******************
+
+Simple boot
+===========
+
+The board could be loaded using the single binary image, without 2nd stage
+bootloader. It is the default option when building the application without
+additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+==================
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be built (and flashed) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+========
+
+The sysbuild makes possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32 SoC.
+
+To build the sample application using sysbuild use the command:
+
+**Rev B**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2@B
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+**Rev C**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2@C
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+   build/
+   ├── hello_world
+   │   └── zephyr
+   │       ├── zephyr.elf
+   │       └── zephyr.bin
+   ├── mcuboot
+   │    └── zephyr
+   │       ├── zephyr.elf
+   │       └── zephyr.bin
+   └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild` documentation.
+
+Manual build
+============
+
+During the development cycle, it is intended to build & flash as quickly possible.
+For that reason, images can be built one at a time using traditional build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flash at least once.
+
+Build and flash applications as usual:
+
+**Rev B**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2@B
+   :goals: build
+
+**Rev C**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2@C
+   :goals: build
+
+The usual ``flash`` target will work. Here is an example for the :zephyr:code-sample:`hello_world`
+application.
+
+To enter ROM bootloader mode, hold down ``boot-button`` while clicking reset button.
+When in the ROM bootloader, you can upload code and query the chip using ``west flash``.
+
+
+**Rev B**
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/hello_world
+      :board: adafruit_feather_esp32s2@B
+      :goals: flash
+
+**Rev C**
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/hello_world
+      :board: adafruit_feather_esp32s2@C
+      :goals: flash
+
+After the flashing you will receive most likely this Error:
+
+.. code-block:: console
+
+   WARNING: ESP32-S2FNR2 (revision v0.0) chip was placed into download mode using GPIO0.
+   esptool.py can not exit the download mode over USB. To run the app, reset the chip manually.
+   To suppress this note, set --after option to 'no_reset'.
+   FATAL ERROR: command exited with status 1: ...
+
+As stated in the Warning-Message ``esptool`` can't reset the board by itself and this message
+can be ignored and the board needs to be reseted via the Reset-Button manually.
+
+Open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has been manually reseted and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! adafruit_feather_esp32s2
+
+Debugging
+*********
+
+ESP32-S2 support on OpenOCD is available at `OpenOCD`_.
+
+ESP32-S2 has a built-in JTAG circuitry and can be debugged without any
+additional chip. Only an USB cable connected to the D+/D- pins is necessary.
+
+Further documentation can be obtained from the SoC vendor
+in `JTAG debugging for ESP32-S2`_.
+
+You can debug an application in the usual way. Here is an example for
+the :zephyr:code-sample:`hello_world` application.
+
+**Rev B**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2@B
+   :goals: debug
+
+**Rev C**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2@C
+   :goals: debug
+
+Testing the On-Board-LED
+************************
+
+There is a sample available to verify that the LEDs on the board are
+functioning correctly with Zephyr:
+
+**Rev B**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: adafruit_feather_esp32s2@B
+   :goals: build flash
+
+**Rev C**
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: adafruit_feather_esp32s2@C
+   :goals: build flash
+
+Testing the NeoPixel
+********************
+
+There is a sample available to verify that the NeoPixel on the board are
+functioning correctly with Zephyr:
+
+**Rev B**
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/drivers/led/led_strip
+      :board: adafruit_feather_esp32s2@B
+      :goals: build flash
+
+**Rev C**
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/drivers/led/led_strip
+      :board: adafruit_feather_esp32s2@C
+      :goals: build flash
+
+Testing the Fuel Gauge (MAX17048)
+*********************************
+
+There is a sample available to verify that the MAX17048 fuel gauge on the board are
+functioning correctly with Zephyr:
+
+.. note::
+   As of May 31, 2023 Adafruit changed the battery monitor chip from the now-discontinued LC709203
+   to the MAX17048.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/fuel_gauge/max17048/
+   :board: adafruit_feather_esp32s2@C
+   :goals: build flash
+
+Testing Wi-Fi
+*************
+
+There is a sample available to verify that the Wi-Fi on the board are
+functioning correctly with Zephyr:
+
+.. note::
+   The Prerequisites must be met before testing Wi-Fi.
+
+**Rev B**
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/net/wifi/shell
+      :board: adafruit_feather_esp32s2@B
+      :goals: build flash
+
+**Rev C**
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/net/wifi/shell
+      :board: adafruit_feather_esp32s2@C
+      :goals: build flash
+
+References
+**********
+
+.. target-notes::
+
+.. _`Adafruit ESP32-S2 Feather`: https://www.adafruit.com/product/5000
+.. _`Adafruit ESP32-S2 Feather with BME280 Sensor`: https://www.adafruit.com/product/5303
+.. _`OpenOCD`: https://github.com/openocd-org/openocd
+.. _`ESP32 development overview`: https://github.com/zephyrproject-rtos/zephyr/issues/29394#issuecomment-2635037831
+.. _`Adafruit ESP32-S2 Feather Pinouts`: https://learn.adafruit.com/adafruit-esp32-s2-feather/pinouts
+.. _`Adafruit ESP32-S2 Feather Schematic`: https://learn.adafruit.com/adafruit-esp32-s2-feather/downloads
+.. _`SparkFun Qwiic`: https://www.sparkfun.com/qwiic
+.. _`STEMMA QT`: https://learn.adafruit.com/introducing-adafruit-stemma-qt
+.. _`JTAG debugging for ESP32-S2`: https://docs.espressif.com/projects/esp-idf/en/stable/esp32s2/api-guides/jtag-debugging/index.html
diff --git a/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2_tft.rst b/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2_tft.rst
new file mode 100644
index 0000000000000..6f44363ca4b59
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2_tft.rst
@@ -0,0 +1,296 @@
+.. zephyr:board:: adafruit_feather_esp32s2_tft
+
+Overview
+********
+
+The Adafruit Feather ESP32-S2 boards are ESP32-S2 development boards in the
+Feather standard layout, sharing peripheral placement with other devices labeled
+as Feathers or FeatherWings. The board is equipped with an ESP32-S2 mini module,
+a LiPo battery charger, a fuel gauge, a USB-C and `SparkFun Qwiic`_-compatible
+`STEMMA QT`_ connector for the I2C bus.
+
+Hardware
+********
+
+- ESP32-S2 mini module, featuring the 240MHz Tensilica processor
+- 320KB SRAM, 4MB flash + 2MB PSRAM
+- USB-C directly connected to the ESP32-S2 for USB
+- LiPo connector and built-in battery charging when powered via USB-C
+- LC709203 or MAX17048 fuel gauge for battery voltage and state-of-charge reporting
+- Charging indicator LED, user LED, reset and boot buttons.
+- Built-in NeoPixel indicator RGB LED
+- STEMMA QT connector for I2C devices, with switchable power for low-power mode
+- 240x135 pixel IPS TFT color display with 1.14" diagonal and ST7789 chipset
+
+.. note::
+
+   - The board has a space for a BME280, but will not be shipped with.
+   - As of May 31, 2023 - Adafruit has changed the battery monitor chip from the
+     now-discontinued LC709203 to the MAX17048. Check the back silkscreen of your Feather to
+     see which chip you have.
+   - For the MAX17048 a driver in zephyr exists and is supported, but needs to be added via
+     a devicetree overlay.
+   - For the LC709203 a driver does'nt exists yet and the fuel gauge for boards with this IC
+     is not available.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+.. note::
+   USB-OTG is until now not supported see `ESP32 development overview`_. To see a serial output
+   a FTDI-USB-RS232 or similar needs to be connected to the RX/TX pins on the feather connector.
+
+Connections and IOs
+===================
+
+The `Adafruit ESP32-S2 TFT Feather`_ User Guide has detailed information about the board including
+pinouts and the schematic.
+
+- `Adafruit ESP32-S2 TFT Feather Pinouts`_
+- `Adafruit ESP32-S2 TFT Feather Schematic`_
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi binary blobs in order work. Run the command below
+to retrieve those files.
+
+.. code-block:: console
+
+   west update
+   west blobs fetch hal_espressif
+
+Building & Flashing
+*******************
+
+Simple boot
+===========
+
+The board could be loaded using the single binary image, without 2nd stage
+bootloader. It is the default option when building the application without
+additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+==================
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be built (and flashed) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+========
+
+The sysbuild makes possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32 SoC.
+
+To build the sample application using sysbuild use the command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+   build/
+   ├── hello_world
+   │   └── zephyr
+   │       ├── zephyr.elf
+   │       └── zephyr.bin
+   ├── mcuboot
+   │    └── zephyr
+   │       ├── zephyr.elf
+   │       └── zephyr.bin
+   └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild` documentation.
+
+Manual build
+============
+
+During the development cycle, it is intended to build & flash as quickly possible.
+For that reason, images can be built one at a time using traditional build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flash at least once.
+
+Build and flash applications as usual:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft
+   :goals: build
+
+The usual ``flash`` target will work. Here is an example for the :zephyr:code-sample:`hello_world`
+application.
+
+To enter ROM bootloader mode, hold down ``boot-button`` while clicking reset button.
+When in the ROM bootloader, you can upload code and query the chip using ``west flash``.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft
+   :goals: flash
+
+After the flashing you will receive most likely this Error:
+
+.. code-block:: console
+
+   WARNING: ESP32-S2FNR2 (revision v0.0) chip was placed into download mode using GPIO0.
+   esptool.py can not exit the download mode over USB. To run the app, reset the chip manually.
+   To suppress this note, set --after option to 'no_reset'.
+   FATAL ERROR: command exited with status 1: ...
+
+As stated in the Warning-Message ``esptool`` can't reset the board by itself and this message
+can be ignored and the board needs to be reseted via the Reset-Button manually.
+
+Open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has been manually reseted and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! adafruit_feather_esp32s2_tft
+
+Debugging
+*********
+
+ESP32-S2 support on OpenOCD is available at `OpenOCD`_.
+
+ESP32-S2 has a built-in JTAG circuitry and can be debugged without any
+additional chip. Only an USB cable connected to the D+/D- pins is necessary.
+
+Further documentation can be obtained from the SoC vendor
+in `JTAG debugging for ESP32-S2`_.
+
+You can debug an application in the usual way. Here is an example for
+the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft
+   :goals: debug
+
+Testing the On-Board-LED
+************************
+
+There is a sample available to verify that the LEDs on the board are
+functioning correctly with Zephyr:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: adafruit_feather_esp32s2_tft
+   :goals: build flash
+
+Testing the NeoPixel
+********************
+
+There is a sample available to verify that the NeoPixel on the board are
+functioning correctly with Zephyr:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/drivers/led/led_strip
+   :board: adafruit_feather_esp32s2_tft
+   :goals: build flash
+
+Testing the TFT
+***************
+
+.. note::
+   To activate the backlight of the display ``GPIO45`` (``backlight``) needs to be set to HIGH.
+   This will be done automatically via ``board_late_init_hook()``.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/display/lvgl
+   :board: adafruit_feather_esp32s2_tft
+   :goals: build flash
+
+Testing the Fuel Gauge (MAX17048)
+*********************************
+
+There is a sample available to verify that the MAX17048 fuel gauge on the board are
+functioning correctly with Zephyr:
+
+.. note::
+   As of May 31, 2023 Adafruit changed the battery monitor chip from the now-discontinued LC709203
+   to the MAX17048.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/fuel_gauge/max17048/
+   :board: adafruit_feather_esp32s2_tft
+   :goals: build flash
+
+Testing Wi-Fi
+*************
+
+There is a sample available to verify that the Wi-Fi on the board are
+functioning correctly with Zephyr:
+
+.. note::
+   The Prerequisites must be met before testing Wi-Fi.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/net/wifi/shell
+   :board: adafruit_feather_esp32s2_tft
+   :goals: build flash
+
+References
+**********
+
+.. target-notes::
+
+.. _`Adafruit ESP32-S2 TFT Feather`: https://www.adafruit.com/product/5300
+.. _`OpenOCD`: https://github.com/openocd-org/openocd
+.. _`ESP32 development overview`: https://github.com/zephyrproject-rtos/zephyr/issues/29394#issuecomment-2635037831
+.. _`Adafruit ESP32-S2 TFT Feather Pinouts`: https://learn.adafruit.com/adafruit-esp32-s2-tft-feather/pinouts
+.. _`Adafruit ESP32-S2 TFT Feather Schematic`: https://learn.adafruit.com/adafruit-esp32-s2-tft-feather/downloads
+.. _`SparkFun Qwiic`: https://www.sparkfun.com/qwiic
+.. _`STEMMA QT`: https://learn.adafruit.com/introducing-adafruit-stemma-qt
+.. _`JTAG debugging for ESP32-S2`: https://docs.espressif.com/projects/esp-idf/en/stable/esp32s2/api-guides/jtag-debugging/index.html
diff --git a/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2_tft_reverse.rst b/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2_tft_reverse.rst
new file mode 100644
index 0000000000000..fcbb635220591
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/doc/adafruit_feather_esp32s2_tft_reverse.rst
@@ -0,0 +1,293 @@
+.. zephyr:board:: adafruit_feather_esp32s2_tft_reverse
+
+Overview
+********
+
+The Adafruit Feather ESP32-S2 boards are ESP32-S2 development boards in the
+Feather standard layout, sharing peripheral placement with other devices labeled
+as Feathers or FeatherWings. The board is equipped with an ESP32-S2 mini module,
+a LiPo battery charger, a fuel gauge, a USB-C and `SparkFun Qwiic`_-compatible
+`STEMMA QT`_ connector for the I2C bus.
+
+Hardware
+********
+
+- ESP32-S2 mini module, featuring the 240MHz Tensilica processor
+- 320KB SRAM, 4MB flash + 2MB PSRAM
+- USB-C directly connected to the ESP32-S2 for USB
+- LiPo connector and built-in battery charging when powered via USB-C
+- LC709203 or MAX17048 fuel gauge for battery voltage and state-of-charge reporting
+- Charging indicator LED, user LED, reset and boot buttons and has 2 additional buttons.
+- Built-in NeoPixel indicator RGB LED
+- 240x135 pixel IPS TFT color display with 1.14" diagonal and ST7789 chipset.
+
+.. note::
+
+   - The board has a space for a BME280, but will not be shipped with.
+   - For the MAX17048 a driver in zephyr exists and is supported, but needs to be added via
+     a devicetree overlay.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+.. note::
+   USB-OTG is until now not supported see `ESP32 development overview`_. To see a serial output
+   a FTDI-USB-RS232 or similar needs to be connected to the RX/TX pins on the feather connector.
+
+Connections and IOs
+===================
+
+The `Adafruit ESP32-S2 Reverse TFT Feather`_ User Guide has detailed information about the board
+including pinouts and the schematic.
+
+- `Adafruit ESP32-S2 Reverse TFT Feather Pinouts`_
+- `Adafruit ESP32-S2 Reverse TFT Feather Schematic`_
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi binary blobs in order work. Run the command below
+to retrieve those files.
+
+.. code-block:: console
+
+   west update
+   west blobs fetch hal_espressif
+
+Building & Flashing
+*******************
+
+Simple boot
+===========
+
+The board could be loaded using the single binary image, without 2nd stage
+bootloader. It is the default option when building the application without
+additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+==================
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be built (and flashed) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+========
+
+The sysbuild makes possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32 SoC.
+
+To build the sample application using sysbuild use the command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+   build/
+   ├── hello_world
+   │   └── zephyr
+   │       ├── zephyr.elf
+   │       └── zephyr.bin
+   ├── mcuboot
+   │    └── zephyr
+   │       ├── zephyr.elf
+   │       └── zephyr.bin
+   └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild` documentation.
+
+Manual build
+============
+
+During the development cycle, it is intended to build & flash as quickly possible.
+For that reason, images can be built one at a time using traditional build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flash at least once.
+
+Build and flash applications as usual:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: build
+
+The usual ``flash`` target will work. Here is an example for the :zephyr:code-sample:`hello_world`
+application.
+
+To enter ROM bootloader mode, hold down ``boot-button`` while clicking reset button.
+When in the ROM bootloader, you can upload code and query the chip using ``west flash``.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: flash
+
+After the flashing you will receive most likely this Error:
+
+.. code-block:: console
+
+   WARNING: ESP32-S2FNR2 (revision v0.0) chip was placed into download mode using GPIO0.
+   esptool.py can not exit the download mode over USB. To run the app, reset the chip manually.
+   To suppress this note, set --after option to 'no_reset'.
+   FATAL ERROR: command exited with status 1: ...
+
+As stated in the Warning-Message ``esptool`` can't reset the board by itself and this message
+can be ignored and the board needs to be reseted via the Reset-Button manually.
+
+Open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has been manually reseted and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! adafruit_feather_esp32s2_tft_reverse
+
+Debugging
+*********
+
+ESP32-S2 support on OpenOCD is available at `OpenOCD`_.
+
+ESP32-S2 has a built-in JTAG circuitry and can be debugged without any
+additional chip. Only an USB cable connected to the D+/D- pins is necessary.
+
+Further documentation can be obtained from the SoC vendor
+in `JTAG debugging for ESP32-S2`_.
+
+You can debug an application in the usual way. Here is an example for
+the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: debug
+
+Testing the On-Board-LED
+************************
+
+There is a sample available to verify that the LEDs on the board are
+functioning correctly with Zephyr:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: build flash
+
+Testing the NeoPixel
+********************
+
+There is a sample available to verify that the NeoPixel on the board are
+functioning correctly with Zephyr:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/drivers/led/led_strip
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: build flash
+
+Testing the TFT
+***************
+
+There is a sample available to verify that the TFT on the board are
+functioning correctly with Zephyr:
+
+.. note::
+   To activated the backlight of the display ``GPIO45`` (``backlight``) needs to be set to HIGH.
+   This will be done automatically via ``board_late_init_hook()``.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/display/lvgl
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: build flash
+
+Testing the Fuel Gauge (MAX17048)
+*********************************
+
+There is a sample available to verify that the MAX17048 fuel gauge on the board are
+functioning correctly with Zephyr:
+
+.. note::
+   As of May 31, 2023 Adafruit changed the battery monitor chip from the now-discontinued LC709203
+   to the MAX17048.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/fuel_gauge/max17048/
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: build flash
+
+Testing Wi-Fi
+*************
+
+There is a sample available to verify that the Wi-Fi on the board are
+functioning correctly with Zephyr:
+
+.. note::
+   The Prerequisites must be met before testing Wi-Fi.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/net/wifi/shell
+   :board: adafruit_feather_esp32s2_tft_reverse
+   :goals: build flash
+
+References
+**********
+
+.. target-notes::
+
+.. _`Adafruit ESP32-S2 Reverse TFT Feather`: https://www.adafruit.com/product/5345
+.. _`OpenOCD`: https://github.com/openocd-org/openocd
+.. _`ESP32 development overview`: https://github.com/zephyrproject-rtos/zephyr/issues/29394#issuecomment-2635037831
+.. _`Adafruit ESP32-S2 Reverse TFT Feather Pinouts`: https://learn.adafruit.com/esp32-s2-reverse-tft-feather/pinouts
+.. _`Adafruit ESP32-S2 Reverse TFT Feather Schematic`: https://learn.adafruit.com/esp32-s2-reverse-tft-feather/downloads
+.. _`SparkFun Qwiic`: https://www.sparkfun.com/qwiic
+.. _`STEMMA QT`: https://learn.adafruit.com/introducing-adafruit-stemma-qt
+.. _`JTAG debugging for ESP32-S2`: https://docs.espressif.com/projects/esp-idf/en/stable/esp32s2/api-guides/jtag-debugging/index.html
diff --git a/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2.webp b/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2.webp
new file mode 100644
index 0000000000000..b63d6c73977c6
Binary files /dev/null and b/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2.webp differ
diff --git a/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2_tft.webp b/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2_tft.webp
new file mode 100644
index 0000000000000..a1b9d091218e6
Binary files /dev/null and b/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2_tft.webp differ
diff --git a/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2_tft_reverse.webp b/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2_tft_reverse.webp
new file mode 100644
index 0000000000000..8b607c89f858f
Binary files /dev/null and b/boards/adafruit/feather_esp32s2/doc/img/adafruit_feather_esp32s2_tft_reverse.webp differ
diff --git a/boards/adafruit/feather_esp32s2/feather_connector.dtsi b/boards/adafruit/feather_esp32s2/feather_connector.dtsi
new file mode 100644
index 0000000000000..8414fbbfb106c
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/feather_connector.dtsi
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020 Richard Osterloh <richard.osterloh@gmail.com>
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	feather_header: connector {
+		compatible = "adafruit-feather-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map =
+			<0 0 &gpio0 18 0>,	/* A0 */
+			<1 0 &gpio0 17 0>,	/* A1 */
+			<2 0 &gpio0 16 0>,	/* A2 */
+			<3 0 &gpio0 15 0>,	/* A3 */
+			<4 0 &gpio0 14 0>,	/* A4 */
+			<5 0 &gpio0 8 0>,	/* A5 */
+			<6 0 &gpio1 36 0>,	/* SCK */
+			<7 0 &gpio1 35 0>,	/* MOSI */
+			<8 0 &gpio1 37 0>,	/* MISO */
+			<9 0 &gpio1 38 0>,	/* RX */
+			<10 0 &gpio1 39 0>,	/* TX */
+			<11 0 &gpio1 43 0>,	/* DB */
+			<12 0 &gpio1 3 0>,	/* SDA */
+			<13 0 &gpio1 4 0>,	/* SCL */
+			<14 0 &gpio0 5 0>,	/* D5 */
+			<15 0 &gpio0 6 0>,	/* D6 */
+			<16 0 &gpio0 9 0>,	/* D9 */
+			<17 0 &gpio0 10 0>,	/* D10 */
+			<18 0 &gpio0 11 0>,	/* D11 */
+			<19 0 &gpio0 12 0>,	/* D12 */
+			<20 0 &gpio0 13 0>;	/* D13 */
+	};
+};
+
+feather_serial: &uart1 {};
+feather_i2c: &i2c0 {};
+feather_spi: &spi2 {};
diff --git a/boards/adafruit/feather_esp32s2/feather_connector_tft.dtsi b/boards/adafruit/feather_esp32s2/feather_connector_tft.dtsi
new file mode 100644
index 0000000000000..3a2eb8c3e0da8
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/feather_connector_tft.dtsi
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020 Richard Osterloh <richard.osterloh@gmail.com>
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ * Copyright (c) 2025 Philipp Steiner <philipp.steiner@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	feather_header: connector {
+		compatible = "adafruit-feather-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map =
+			<0 0 &gpio0 18 0>,	/* A0 */
+			<1 0 &gpio0 17 0>,	/* A1 */
+			<2 0 &gpio0 16 0>,	/* A2 */
+			<3 0 &gpio0 15 0>,	/* A3 */
+			<4 0 &gpio0 14 0>,	/* A4 */
+			<5 0 &gpio0 8 0>,	/* A5 */
+			<6 0 &gpio1 36 0>,	/* SCK */
+			<7 0 &gpio1 35 0>,	/* MOSI */
+			<8 0 &gpio1 37 0>,	/* MISO */
+			<9 0 &gpio0 2 0>,	/* RX */
+			<10 0 &gpio0 1 0>,	/* TX */
+			<11 0 &gpio1 43 0>,	/* DB */
+			<12 0 &gpio1 42 0>,	/* SDA */
+			<13 0 &gpio1 41 0>,	/* SCL */
+			<14 0 &gpio0 5 0>,	/* D5 */
+			<15 0 &gpio0 6 0>,	/* D6 */
+			<16 0 &gpio0 9 0>,	/* D9 */
+			<17 0 &gpio0 10 0>,	/* D10 */
+			<18 0 &gpio0 11 0>,	/* D11 */
+			<19 0 &gpio0 12 0>,	/* D12 */
+			<20 0 &gpio0 13 0>;	/* D13 */
+	};
+};
+
+feather_serial: &uart1 {};
+feather_i2c: &i2c0 {};
+feather_spi: &spi2 {};
diff --git a/boards/adafruit/feather_esp32s2/support/openocd.cfg b/boards/adafruit/feather_esp32s2/support/openocd.cfg
new file mode 100644
index 0000000000000..2f740b4a36ab1
--- /dev/null
+++ b/boards/adafruit/feather_esp32s2/support/openocd.cfg
@@ -0,0 +1,7 @@
+set ESP_RTOS none
+set ESP32_ONLYCPU 1
+
+# Source the JTAG interface configuration file
+source [find interface/esp_usb_jtag.cfg]
+# Source the ESP32-S3 configuration file
+source [find target/esp32s3.cfg]
diff --git a/boards/adafruit/feather_esp32s3/Kconfig b/boards/adafruit/feather_esp32s3/Kconfig
new file mode 100644
index 0000000000000..e56e7f846c47e
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/Kconfig
@@ -0,0 +1,10 @@
+# Adafruit Feather ESP32-S3 board configuration
+
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096 if BOARD_ADAFRUIT_FEATHER_ESP32S3_ESP32S3_PROCPU
+	default 256 if BOARD_ADAFRUIT_FEATHER_ESP32S3_ESP32S3_APPCPU
diff --git a/boards/adafruit/feather_esp32s3/Kconfig.adafruit_feather_esp32s3 b/boards/adafruit/feather_esp32s3/Kconfig.adafruit_feather_esp32s3
new file mode 100644
index 0000000000000..a96fe92930821
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/Kconfig.adafruit_feather_esp32s3
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ADAFRUIT_FEATHER_ESP32S3
+	select SOC_ESP32S3_WROOM_N8
+	select SOC_ESP32S3_PROCPU if BOARD_ADAFRUIT_FEATHER_ESP32S3_ESP32S3_PROCPU
+	select SOC_ESP32S3_APPCPU if BOARD_ADAFRUIT_FEATHER_ESP32S3_ESP32S3_APPCPU
diff --git a/boards/adafruit/feather_esp32s3/Kconfig.sysbuild b/boards/adafruit/feather_esp32s3/Kconfig.sysbuild
new file mode 100644
index 0000000000000..8d3acb9e11d7c
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_NONE
+endchoice
diff --git a/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3-pinctrl.dtsi b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3-pinctrl.dtsi
new file mode 100644
index 0000000000000..dc41eaae5412e
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3-pinctrl.dtsi
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <dt-bindings/pinctrl/esp32s3-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/esp32s3-gpio-sigmap.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO43>;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART0_RX_GPIO44>;
+			bias-pull-up;
+		};
+	};
+
+	uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TX_GPIO39>;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO38>;
+			bias-pull-up;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO3>,
+				 <I2C0_SCL_GPIO4>;
+			drive-open-drain;
+			output-high;
+		};
+	};
+
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_MISO_GPIO37>,
+				 <SPIM2_SCLK_GPIO36>,
+				 <SPIM2_CSEL_GPIO10>;
+		};
+		group2 {
+			pinmux = <SPIM2_MOSI_GPIO35>;
+			output-low;
+		};
+	};
+
+	spim3_default: spim3_default {
+		group1 {
+			pinmux = <SPIM3_MOSI_GPIO33>;
+		};
+	};
+
+	twai_default: twai_default {
+		group1 {
+			pinmux = <TWAI_TX_GPIO5>,
+				 <TWAI_RX_GPIO6>;
+		};
+	};
+};
diff --git a/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu.dts b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu.dts
new file mode 100644
index 0000000000000..8b9f9953792ec
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu.dts
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_wroom_n8.dtsi>
+#include <espressif/partitions_0x0_amp.dtsi>
+#include "adafruit_feather_esp32s3-pinctrl.dtsi"
+
+/ {
+	model = "Adafruit Feather ESP32S3 APPCPU";
+	compatible = "adafruit,feather_esp32s3", "espressif,esp32s3";
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,ipc_shm = &shm0;
+		zephyr,ipc = &ipm0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_appcpu_partition;
+	};
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&ipm0 {
+	status = "okay";
+};
diff --git a/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu.yaml b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu.yaml
new file mode 100644
index 0000000000000..329bcd7fa92ce
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu.yaml
@@ -0,0 +1,27 @@
+identifier: adafruit_feather_esp32s3/esp32s3/appcpu
+name: Adafruit Feather ESP32-S3 APPCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - uart
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+    - flash
+    - cpp
+    - posix
+    - watchdog
+    - logging
+    - kernel
+    - pm
+    - gpio
+    - crypto
+    - eeprom
+    - heap
+    - cmsis_rtos
+    - jwt
+    - zdsp
+vendor: adafruit
diff --git a/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu_defconfig b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu_defconfig
new file mode 100644
index 0000000000000..9abf2ff0430ab
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_appcpu_defconfig
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu.dts b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu.dts
new file mode 100644
index 0000000000000..b745820ddaa09
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu.dts
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_wroom_n8.dtsi>
+#include <espressif/partitions_0x0_amp.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/input/esp32-touch-sensor-input.h>
+#include <zephyr/dt-bindings/led/led.h>
+#include "feather_connector.dtsi"
+#include "adafruit_feather_esp32s3-pinctrl.dtsi"
+
+/ {
+	model = "Adafruit Feather ESP32S3 PROCPU";
+	compatible = "adafruit,feather_esp32s3", "espressif,esp32s3";
+
+	aliases {
+		i2c-0 = &i2c0;
+		watchdog0 = &wdt0;
+	};
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		uart-0 = &uart0;
+		sw0 = &button0;
+		led0 = &led0;
+		led-strip = &led_strip;
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+		button0: button_0 {
+			gpios = <&gpio0 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "BOOT Button";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led0: led_0 {
+			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	/*
+	 * The neopixel on this board has its positive side hooked up to a GPIO
+	 * pin rather than a positive voltage rail to save on power.
+	 */
+	neopixel_pwr: neopixel_pwr {
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+	};
+
+	/*
+	 * On-board regulator powers I2C pull-ups and external devices connected
+	 * via the STEMMA QT connector.
+	 */
+	i2c_reg: i2c_reg {
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&usb_serial {
+	status = "disabled";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&touch {
+	debounce-interval-ms = <30>;
+	href-microvolt = <2700000>;
+	lref-microvolt = <500000>;
+	href-atten-microvolt = <1000000>;
+	filter-mode = <ESP32_TOUCH_FILTER_MODE_IIR_16>;
+	filter-debounce-cnt = <1>;
+	filter-noise-thr = <ESP32_TOUCH_FILTER_NOISE_THR_4_8TH>;
+	filter-jitter-step = <4>;
+	filter-smooth-level = <ESP32_TOUCH_FILTER_SMOOTH_MODE_IIR_2>;
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+
+	max17048: max17048@36 {
+		compatible = "maxim,max17048";
+		status = "okay";
+		reg = <0x36>;
+
+		/*
+		 * The MAX17048 itself is directly powered by the battery, not
+		 * through the on-board regulator. However using this device
+		 * requires I2C pull-ups powered by the regulator.
+		 */
+		power-domains = <&i2c_reg>;
+	};
+};
+
+&spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim2_default>;
+	pinctrl-names = "default";
+};
+
+&spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim3_default>;
+	pinctrl-names = "default";
+
+	/* Workaround to support WS2812 driver */
+	line-idle-low;
+
+	led_strip: ws2812@0 {
+		compatible = "worldsemi,ws2812-spi";
+		power-domains = <&neopixel_pwr>;
+
+		/* SPI */
+		reg = <0>; /* ignored, but necessary for SPI bindings */
+		spi-max-frequency = <6400000>;
+
+		/* WS2812 */
+		chain-length = <1>;
+		spi-cpha;
+		spi-one-frame = <0xf0>;  /* 625 ns high and 625 ns low */
+		spi-zero-frame = <0xc0>; /* 312.5 ns high and 937.5 ns low */
+		color-mapping = <LED_COLOR_ID_GREEN
+				 LED_COLOR_ID_RED
+				 LED_COLOR_ID_BLUE>;
+	};
+};
+
+&twai {
+	pinctrl-0 = <&twai_default>;
+	pinctrl-names = "default";
+};
+
+&timer0 {
+	status = "disabled";
+};
+
+&timer1 {
+	status = "disabled";
+};
+
+&timer2 {
+	status = "disabled";
+};
+
+&timer3 {
+	status = "disabled";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu.yaml b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu.yaml
new file mode 100644
index 0000000000000..6ca1ba6ae3c1c
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu.yaml
@@ -0,0 +1,22 @@
+identifier: adafruit_feather_esp32s3/esp32s3/procpu
+name: Adafruit Feather ESP32-S3 PROCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - i2c
+  - spi
+  - can
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+  - input
+  - feather_serial
+  - feather_i2c
+  - feather_spi
+vendor: adafruit
diff --git a/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu_defconfig b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu_defconfig
new file mode 100644
index 0000000000000..d789bab1824a6
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/adafruit_feather_esp32s3_procpu_defconfig
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MAIN_STACK_SIZE=2048
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/adafruit/feather_esp32s3/board.cmake b/boards/adafruit/feather_esp32s3/board.cmake
new file mode 100644
index 0000000000000..2f04d1fe8861e
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/board.cmake
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
+  set(OPENOCD OPENOCD-NOTFOUND)
+endif()
+find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
+
+include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/adafruit/feather_esp32s3/board.yml b/boards/adafruit/feather_esp32s3/board.yml
new file mode 100644
index 0000000000000..89db0bb116cc7
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: adafruit_feather_esp32s3
+  full_name: Adafruit Feather ESP32S3
+  vendor: adafruit
+  socs:
+  - name: esp32s3
diff --git a/boards/adafruit/feather_esp32s3/doc/img/adafruit_feather_esp32s3.webp b/boards/adafruit/feather_esp32s3/doc/img/adafruit_feather_esp32s3.webp
new file mode 100644
index 0000000000000..5d6575dca1170
Binary files /dev/null and b/boards/adafruit/feather_esp32s3/doc/img/adafruit_feather_esp32s3.webp differ
diff --git a/boards/adafruit/feather_esp32s3/doc/index.rst b/boards/adafruit/feather_esp32s3/doc/index.rst
new file mode 100644
index 0000000000000..17332ba68fab6
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/doc/index.rst
@@ -0,0 +1,281 @@
+.. zephyr:board:: adafruit_feather_esp32s3
+
+Overview
+********
+
+The Adafruit Feather ESP32-S3 is an ESP32-S3 development board in the Feather
+standard layout, sharing peripheral placement with other devices labeled as
+Feathers or FeatherWings. The board is equipped with an ESP32-S3 mini module, a
+LiPo battery charger, a fuel gauge, a USB-C and Qwiic/STEMMA-QT connector. For
+more information, check `Adafruit Feather ESP32-S3`_.
+
+Hardware
+********
+
+- ESP32-S3 mini module, featuring the dual core 32-bit Xtensa Microprocessor
+  (Tensilica LX7), running at up to 240MHz
+- 512KB SRAM and either 8MB flash or 4MB flash + 2MB PSRAM, depending on the
+  module variant
+- USB-C directly connected to the ESP32-S3 for USB/UART and JTAG debugging
+- LiPo connector and built-in battery charging when powered via USB-C
+- MAX17048 fuel gauge for battery voltage and state-of-charge reporting
+- Charging indicator LED, user LED, reset and boot buttons
+- Built-in NeoPixel indicator RGB LED
+- STEMMA QT connector for I2C devices, with switchable power for low-power mode
+
+Asymmetric Multiprocessing (AMP)
+================================
+
+The ESP32-S3 SoC allows 2 different applications to be executed in asymmetric
+multiprocessing. Due to its dual-core architecture, each core can be enabled to
+execute customized tasks in stand-alone mode and/or exchanging data over OpenAMP
+framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
+
+For more information, check the datasheet at `ESP32-S3 Datasheet`_.
+
+Supported Features
+==================
+
+The current ``adafruit_feather_esp32s3`` board supports the following hardware
+features:
+
++------------+------------+-------------------------------------+
+| Interface  | Controller | Driver/Component                    |
++============+============+=====================================+
+| UART       | on-chip    | serial port                         |
++------------+------------+-------------------------------------+
+| GPIO       | on-chip    | gpio                                |
++------------+------------+-------------------------------------+
+| PINMUX     | on-chip    | pinmux                              |
++------------+------------+-------------------------------------+
+| USB-JTAG   | on-chip    | hardware interface                  |
++------------+------------+-------------------------------------+
+| SPI Master | on-chip    | spi                                 |
++------------+------------+-------------------------------------+
+| TWAI/CAN   | on-chip    | can                                 |
++------------+------------+-------------------------------------+
+| ADC        | on-chip    | adc                                 |
++------------+------------+-------------------------------------+
+| Timers     | on-chip    | counter                             |
++------------+------------+-------------------------------------+
+| Watchdog   | on-chip    | watchdog                            |
++------------+------------+-------------------------------------+
+| TRNG       | on-chip    | entropy                             |
++------------+------------+-------------------------------------+
+| LEDC       | on-chip    | pwm                                 |
++------------+------------+-------------------------------------+
+| MCPWM      | on-chip    | pwm                                 |
++------------+------------+-------------------------------------+
+| PCNT       | on-chip    | qdec                                |
++------------+------------+-------------------------------------+
+| GDMA       | on-chip    | dma                                 |
++------------+------------+-------------------------------------+
+| USB-CDC    | on-chip    | serial                              |
++------------+------------+-------------------------------------+
+| Wi-Fi      | on-chip    |                                     |
++------------+------------+-------------------------------------+
+| Bluetooth  | on-chip    |                                     |
++------------+------------+-------------------------------------+
+
+Connections and IOs
+===================
+
+The `Adafruit Feather ESP32-S3 User Guide`_ has detailed information about the
+board including `pinouts`_ and the `schematic`_.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the
+command below to retrieve those files.
+
+.. code-block:: console
+
+   west blobs fetch hal_espressif
+
+.. note::
+
+   It is recommended running the command above after :file:`west update`.
+
+Building & Flashing
+===================
+
+Simple boot
+-----------
+
+The board could be loaded using the single binary image, without 2nd stage
+bootloader. It is the default option when building the application without
+additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+------------------
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be build (and flash) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+--------
+
+The sysbuild makes possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32-S3 SoC.
+
+To build the sample application using sysbuild use the command:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3/esp32s3/procpu
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32-S3 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+  build/
+  ├── hello_world
+  │   └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  ├── mcuboot
+  │    └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild`
+documentation.
+
+Manual build
+------------
+
+During the development cycle, it is intended to build & flash as quickly
+possible. For that reason, images can be build one at a time using traditional
+build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flash at least once.
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3/esp32s3/procpu
+   :goals: build
+
+The usual ``flash`` target will work with the ``adafruit_feather_esp32s3`` board
+. Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3/esp32s3/procpu
+   :goals: flash
+
+Open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has automatically reset and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! adafruit_feather_esp32s3
+
+Debugging
+=========
+
+ESP32-S3 support on OpenOCD is available upstream as of version 0.12.0. Download
+and install OpenOCD from `OpenOCD`_.
+
+ESP32-S3 has a built-in JTAG circuitry and can be debugged without any
+additional chip. Only an USB cable connected to the D+/D- pins is necessary.
+
+Further documentation can be obtained from the SoC vendor in `JTAG debugging
+for ESP32-S3`_.
+
+Here is an example for building the :zephyr:code-sample:`hello_world`
+application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3/esp32s3/procpu
+   :goals: build flash
+
+You can debug an application in the usual way. Here is an example for the
+:zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3/esp32s3/procpu
+   :goals: debug
+
+References
+**********
+
+.. target-notes::
+
+.. _`Adafruit Feather ESP32-S3`:
+   https://www.adafruit.com/product/5323
+
+.. _`OpenOCD`:
+   https://github.com/openocd-org/openocd
+
+.. _`JTAG debugging for ESP32-S3`:
+   https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-guides/jtag-debugging/
+
+.. _Adafruit Feather ESP32-S3 User Guide:
+   https://learn.adafruit.com/adafruit-esp32-s3-feather
+
+.. _pinouts:
+   https://learn.adafruit.com/adafruit-esp32-s3-feather/pinouts
+
+.. _schematic:
+   https://learn.adafruit.com/adafruit-esp32-s3-feather/downloads
+
+.. _ESP32-S3 Datasheet:
+   https://www.espressif.com/sites/default/files/documentation/esp32-s3-wroom-1_wroom-1u_datasheet_en.pdf
+
+.. _ESP32 Technical Reference Manual:
+   https://www.espressif.com/sites/default/files/documentation/esp32-s3_technical_reference_manual_en.pdf
diff --git a/boards/adafruit/feather_esp32s3/feather_connector.dtsi b/boards/adafruit/feather_esp32s3/feather_connector.dtsi
new file mode 100644
index 0000000000000..49671be660cdf
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/feather_connector.dtsi
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020 Richard Osterloh <richard.osterloh@gmail.com>
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	feather_header: connector {
+		compatible = "adafruit-feather-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio0 18 0>,	/* A0 */
+			   <1 0 &gpio0 17 0>,	/* A1 */
+			   <2 0 &gpio0 16 0>,	/* A2 */
+			   <3 0 &gpio0 15 0>,	/* A3 */
+			   <4 0 &gpio0 14 0>,	/* A4 */
+			   <5 0 &gpio0 8 0>,	/* A5 */
+			   <6 0 &gpio1 36 0>,	/* SCK */
+			   <7 0 &gpio1 35 0>,	/* MOSI */
+			   <8 0 &gpio1 37 0>,	/* MISO */
+			   <9 0 &gpio1 38 0>,	/* RX */
+			   <10 0 &gpio1 39 0>,	/* TX */
+			   <11 0 &gpio1 44 0>,	/* DB */
+			   <12 0 &gpio0 3 0>,	/* SDA */
+			   <13 0 &gpio0 4 0>,	/* SCL */
+			   <14 0 &gpio0 5 0>,	/* D5 */
+			   <15 0 &gpio0 6 0>,	/* D6 */
+			   <16 0 &gpio0 9 0>,	/* D9 */
+			   <17 0 &gpio0 10 0>,	/* D10 */
+			   <18 0 &gpio0 11 0>,	/* D11 */
+			   <19 0 &gpio0 12 0>,	/* D12 */
+			   <20 0 &gpio0 13 0>;	/* D13 */
+	};
+};
+
+feather_serial: &uart1 {};
+feather_i2c: &i2c0 {};
+feather_spi: &spi2 {};
diff --git a/boards/adafruit/feather_esp32s3/support/openocd.cfg b/boards/adafruit/feather_esp32s3/support/openocd.cfg
new file mode 100644
index 0000000000000..2f740b4a36ab1
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3/support/openocd.cfg
@@ -0,0 +1,7 @@
+set ESP_RTOS none
+set ESP32_ONLYCPU 1
+
+# Source the JTAG interface configuration file
+source [find interface/esp_usb_jtag.cfg]
+# Source the ESP32-S3 configuration file
+source [find target/esp32s3.cfg]
diff --git a/boards/adafruit/feather_esp32s3_tft/CMakeLists.txt b/boards/adafruit/feather_esp32s3_tft/CMakeLists.txt
new file mode 100644
index 0000000000000..218a0602483ab
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/CMakeLists.txt
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(board.c)
diff --git a/boards/adafruit/feather_esp32s3_tft/Kconfig b/boards/adafruit/feather_esp32s3_tft/Kconfig
new file mode 100644
index 0000000000000..86f1012ae0d95
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/Kconfig
@@ -0,0 +1,10 @@
+# Adafruit Feather ESP32S3 board configuration
+
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096 if BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT_ESP32S3_PROCPU
+	default 256 if BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT_ESP32S3_APPCPU
diff --git a/boards/adafruit/feather_esp32s3_tft/Kconfig.adafruit_feather_esp32s3_tft b/boards/adafruit/feather_esp32s3_tft/Kconfig.adafruit_feather_esp32s3_tft
new file mode 100644
index 0000000000000..cd78387ff8876
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/Kconfig.adafruit_feather_esp32s3_tft
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT
+	select SOC_ESP32S3_WROOM_N8
+	select SOC_ESP32S3_PROCPU if BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT_ESP32S3_PROCPU
+	select SOC_ESP32S3_APPCPU if BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT_ESP32S3_APPCPU
diff --git a/boards/adafruit/feather_esp32s3_tft/Kconfig.defconfig b/boards/adafruit/feather_esp32s3_tft/Kconfig.defconfig
new file mode 100644
index 0000000000000..2c3e9c9cfa768
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/Kconfig.defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT_ESP32S3_PROCPU
+
+if DISPLAY
+
+config BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT
+	select BOARD_LATE_INIT_HOOK
+
+choice ST7789V_PIXEL_FORMAT
+	default ST7789V_RGB565
+endchoice
+
+if LVGL
+
+config LV_Z_BITS_PER_PIXEL
+	default 16
+
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_16
+endchoice
+
+config LV_COLOR_16_SWAP
+	default y
+
+endif # LVGL
+
+endif # DISPLAY
+
+endif # BOARD_ADAFRUIT_FEATHER_ESP32S3_TFT_PROCPU
diff --git a/boards/adafruit/feather_esp32s3_tft/Kconfig.sysbuild b/boards/adafruit/feather_esp32s3_tft/Kconfig.sysbuild
new file mode 100644
index 0000000000000..8d3acb9e11d7c
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_NONE
+endchoice
diff --git a/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft-pinctrl.dtsi b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft-pinctrl.dtsi
new file mode 100644
index 0000000000000..0cf040eeb87d1
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft-pinctrl.dtsi
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <dt-bindings/pinctrl/esp32s3-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/esp32s3-gpio-sigmap.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO43>;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART0_RX_GPIO44>;
+			bias-pull-up;
+		};
+	};
+
+	uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TX_GPIO1>;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO2>;
+			bias-pull-up;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO42>,
+				 <I2C0_SCL_GPIO41>;
+			drive-open-drain;
+			output-high;
+		};
+	};
+
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_MISO_GPIO37>,
+				 <SPIM2_SCLK_GPIO36>,
+				 <SPIM2_CSEL_GPIO7>;
+		};
+		group2 {
+			pinmux = <SPIM2_MOSI_GPIO35>;
+			output-low;
+		};
+	};
+
+	spim3_default: spim3_default {
+		group1 {
+			pinmux = <SPIM3_MOSI_GPIO33>;
+		};
+	};
+
+	twai_default: twai_default {
+		group1 {
+			pinmux = <TWAI_TX_GPIO5>,
+				 <TWAI_RX_GPIO6>;
+		};
+	};
+};
diff --git a/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu.dts b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu.dts
new file mode 100644
index 0000000000000..f4662f4b0a3ee
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu.dts
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_wroom_n8.dtsi>
+#include <espressif/partitions_0x0_amp.dtsi>
+#include "adafruit_feather_esp32s3_tft-pinctrl.dtsi"
+
+/ {
+	model = "Adafruit Feather ESP32S3 TFT APPCPU";
+	compatible = "adafruit,feather_esp32s3_tft", "espressif,esp32s3";
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,ipc_shm = &shm0;
+		zephyr,ipc = &ipm0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_appcpu_partition;
+	};
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&ipm0 {
+	status = "okay";
+};
diff --git a/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu.yaml b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu.yaml
new file mode 100644
index 0000000000000..baed9f8ff70d1
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu.yaml
@@ -0,0 +1,27 @@
+identifier: adafruit_feather_esp32s3_tft/esp32s3/appcpu
+name: Adafruit Feather ESP32-S3 TFT APPCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - uart
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+    - flash
+    - cpp
+    - posix
+    - watchdog
+    - logging
+    - kernel
+    - pm
+    - gpio
+    - crypto
+    - eeprom
+    - heap
+    - cmsis_rtos
+    - jwt
+    - zdsp
+vendor: adafruit
diff --git a/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu_defconfig b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu_defconfig
new file mode 100644
index 0000000000000..9abf2ff0430ab
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_appcpu_defconfig
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu.dts b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu.dts
new file mode 100644
index 0000000000000..b09b6262aa1e9
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu.dts
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_wroom_n8.dtsi>
+#include <espressif/partitions_0x0_amp.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/input/esp32-touch-sensor-input.h>
+#include <zephyr/dt-bindings/led/led.h>
+#include <zephyr/dt-bindings/mipi_dbi/mipi_dbi.h>
+#include "feather_connector.dtsi"
+#include "adafruit_feather_esp32s3_tft-pinctrl.dtsi"
+
+/ {
+	model = "Adafruit Feather ESP32S3 TFT PROCPU";
+	compatible = "adafruit,feather_esp32s3_tft", "espressif,esp32s3";
+
+	aliases {
+		i2c-0 = &i2c0;
+		watchdog0 = &wdt0;
+	};
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
+		zephyr,display = &st7789v_tft;
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		uart-0 = &uart0;
+		sw0 = &button0;
+		led0 = &led0;
+		led-strip = &led_strip;
+		backlight = &led1;
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+		button0: button_0 {
+			gpios = <&gpio0 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "BOOT Button";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led0: led_0 {
+			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+		};
+		led1: led_1 {
+			gpios = <&gpio1 45 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	/*
+	 * The neopixel on this board has its positive side hooked up to a GPIO
+	 * pin rather than a positive voltage rail to save on power.
+	 */
+	neopixel_pwr: neopixel_pwr {
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio1 34 GPIO_ACTIVE_HIGH>;
+	};
+
+	/*
+	 * On-board regulator powers I2C pull-ups and external devices connected
+	 * via the STEMMA QT connector.
+	 */
+	i2c_reg: i2c_reg {
+		compatible = "power-domain-gpio";
+		#power-domain-cells = <0>;
+		enable-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+	};
+
+	mipi_dbi {
+		compatible = "zephyr,mipi-dbi-spi";
+		spi-dev = <&spi2>;
+		dc-gpios = <&gpio1 39 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio1 40 GPIO_ACTIVE_LOW>;
+		write-only;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		st7789v_tft: st7789v_tft@0 {
+			compatible = "sitronix,st7789v";
+			status = "disabled";
+
+			/* Also powered by i2c_reg */
+			power-domains = <&i2c_reg>;
+
+			mipi-max-frequency = <DT_FREQ_M(20)>;
+			reg = <0>;
+			width = <135>;
+			height = <240>;
+			x-offset = <52>;
+			y-offset = <40>;
+			vcom = <0x20>;
+			gctrl = <0x35>;
+			vrhs = <0x0b>;
+			vdvs = <0x20>;
+			mdac = <0x08>;
+			gamma = <0x01>;
+			colmod = <0x55>;
+			lcm = <0x2c>;
+			porch-param = [0c 0c 00 33 33];
+			cmd2en-param = [5a 69 02 01];
+			pwctrl1-param = [a4 a1];
+			pvgam-param = [70 2C 2E 15 10 09 48 33 53 0B 19 18 20 25];
+			nvgam-param = [70 2C 2E 15 10 09 48 33 53 0B 19 18 20 25];
+			ram-param = [00 F0];
+			rgb-param = [40 02 14];
+			mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
+		};
+	};
+};
+
+&usb_serial {
+	status = "disabled";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&touch {
+	debounce-interval-ms = <30>;
+	href-microvolt = <2700000>;
+	lref-microvolt = <500000>;
+	href-atten-microvolt = <1000000>;
+	filter-mode = <ESP32_TOUCH_FILTER_MODE_IIR_16>;
+	filter-debounce-cnt = <1>;
+	filter-noise-thr = <ESP32_TOUCH_FILTER_NOISE_THR_4_8TH>;
+	filter-jitter-step = <4>;
+	filter-smooth-level = <ESP32_TOUCH_FILTER_SMOOTH_MODE_IIR_2>;
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+
+	max17048: max17048@36 {
+		compatible = "maxim,max17048";
+		status = "okay";
+		reg = <0x36>;
+
+		/*
+		 * The MAX17048 itself is directly powered by the battery, not
+		 * through the on-board regulator. However using this device
+		 * requires I2C pull-ups powered by the regulator.
+		 */
+		power-domains = <&i2c_reg>;
+	};
+};
+
+&spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim2_default>;
+	pinctrl-names = "default";
+};
+
+&spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim3_default>;
+	pinctrl-names = "default";
+
+	/* Workaround to support WS2812 driver */
+	line-idle-low;
+
+	led_strip: ws2812@0 {
+		compatible = "worldsemi,ws2812-spi";
+		power-domains = <&neopixel_pwr>;
+
+		/* SPI */
+		reg = <0>; /* ignored, but necessary for SPI bindings */
+		spi-max-frequency = <6400000>;
+
+		/* WS2812 */
+		chain-length = <1>;
+		spi-cpha;
+		spi-one-frame = <0xf0>;  /* 625 ns high and 625 ns low */
+		spi-zero-frame = <0xc0>; /* 312.5 ns high and 937.5 ns low */
+		color-mapping = <LED_COLOR_ID_GREEN
+				 LED_COLOR_ID_RED
+				 LED_COLOR_ID_BLUE>;
+	};
+};
+
+&twai {
+	pinctrl-0 = <&twai_default>;
+	pinctrl-names = "default";
+};
+
+&timer0 {
+	status = "disabled";
+};
+
+&timer1 {
+	status = "disabled";
+};
+
+&timer2 {
+	status = "disabled";
+};
+
+&timer3 {
+	status = "disabled";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu.yaml b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu.yaml
new file mode 100644
index 0000000000000..bed1ac8ba70fc
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu.yaml
@@ -0,0 +1,23 @@
+identifier: adafruit_feather_esp32s3_tft/esp32s3/procpu
+name: Adafruit Feather ESP32-S3 TFT PROCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - i2c
+  - spi
+  - can
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+  - input
+  - feather_serial
+  - feather_i2c
+  - feather_spi
+  - display
+vendor: adafruit
diff --git a/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu_defconfig b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu_defconfig
new file mode 100644
index 0000000000000..d789bab1824a6
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/adafruit_feather_esp32s3_tft_procpu_defconfig
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MAIN_STACK_SIZE=2048
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/adafruit/feather_esp32s3_tft/board.c b/boards/adafruit/feather_esp32s3_tft/board.c
new file mode 100644
index 0000000000000..88aa3b0b35447
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/board.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Automatically turns on backlight if display is configured, i.e. display DT
+ * node has status okay.
+ */
+
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
+
+#define DISPLAY_NODE DT_CHOSEN(zephyr_display)
+
+#if DT_NODE_HAS_STATUS(DISPLAY_NODE, okay)
+static const struct gpio_dt_spec backlight = GPIO_DT_SPEC_GET(DT_ALIAS(backlight), gpios);
+#endif
+
+void board_late_init_hook(void)
+{
+#if DT_NODE_HAS_STATUS(DISPLAY_NODE, okay)
+	if (gpio_is_ready_dt(&backlight)) {
+		gpio_pin_configure_dt(&backlight, GPIO_OUTPUT_ACTIVE);
+	}
+#endif
+}
diff --git a/boards/adafruit/feather_esp32s3_tft/board.cmake b/boards/adafruit/feather_esp32s3_tft/board.cmake
new file mode 100644
index 0000000000000..2f04d1fe8861e
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/board.cmake
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
+  set(OPENOCD OPENOCD-NOTFOUND)
+endif()
+find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
+
+include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/adafruit/feather_esp32s3_tft/board.yml b/boards/adafruit/feather_esp32s3_tft/board.yml
new file mode 100644
index 0000000000000..86f7b9293c892
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: adafruit_feather_esp32s3_tft
+  full_name: Adafruit Feather ESP32S3 TFT
+  vendor: adafruit
+  socs:
+  - name: esp32s3
diff --git a/boards/adafruit/feather_esp32s3_tft/doc/img/adafruit_feather_esp32s3_tft.webp b/boards/adafruit/feather_esp32s3_tft/doc/img/adafruit_feather_esp32s3_tft.webp
new file mode 100644
index 0000000000000..796170908e7e3
Binary files /dev/null and b/boards/adafruit/feather_esp32s3_tft/doc/img/adafruit_feather_esp32s3_tft.webp differ
diff --git a/boards/adafruit/feather_esp32s3_tft/doc/index.rst b/boards/adafruit/feather_esp32s3_tft/doc/index.rst
new file mode 100644
index 0000000000000..f46daa99688af
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/doc/index.rst
@@ -0,0 +1,284 @@
+.. zephyr:board:: adafruit_feather_esp32s3_tft
+
+Overview
+********
+
+The Adafruit Feather ESP32-S3 TFT is an ESP32-S3 development board in the
+Feather standard layout, sharing peripheral placement with other devices labeled
+as Feathers or FeatherWings. The board is equipped with an ESP32-S3 mini module,
+a LiPo battery charger, a fuel gauge, a USB-C and Qwiic/STEMMA-QT connector.
+Compared to the base model, this TFT variant additionally comes with a 240x135
+pixel IPS TFT color display. For more information, check
+`Adafruit Feather ESP32-S3 TFT`_.
+
+Hardware
+********
+
+- ESP32-S3 mini module, featuring the dual core 32-bit Xtensa Microprocessor
+  (Tensilica LX7), running at up to 240MHz
+- 512KB SRAM and either 8MB flash or 4MB flash + 2MB PSRAM, depending on the
+  module variant
+- USB-C directly connected to the ESP32-S3 for USB/UART and JTAG debugging
+- LiPo connector and built-in battery charging when powered via USB-C
+- MAX17048 fuel gauge for battery voltage and state-of-charge reporting
+- Charging indicator LED, user LED, reset and boot buttons
+- Built-in NeoPixel indicator RGB LED
+- STEMMA QT connector for I2C devices, with switchable power for low-power mode
+- 240x135 pixel IPS TFT color display with 1.14" diagonal and ST7789 chipset
+
+Asymmetric Multiprocessing (AMP)
+================================
+
+The ESP32-S3 SoC allows 2 different applications to be executed in asymmetric
+multiprocessing. Due to its dual-core architecture, each core can be enabled to
+execute customized tasks in stand-alone mode and/or exchanging data over OpenAMP
+framework. See :zephyr:code-sample-category:`ipc` folder as code reference.
+
+For more information, check the datasheet at `ESP32-S3 Datasheet`_.
+
+Supported Features
+==================
+
+The current ``adafruit_feather_esp32s3_tft`` board supports the following
+hardware features:
+
++------------+------------+-------------------------------------+
+| Interface  | Controller | Driver/Component                    |
++============+============+=====================================+
+| UART       | on-chip    | serial port                         |
++------------+------------+-------------------------------------+
+| GPIO       | on-chip    | gpio                                |
++------------+------------+-------------------------------------+
+| PINMUX     | on-chip    | pinmux                              |
++------------+------------+-------------------------------------+
+| USB-JTAG   | on-chip    | hardware interface                  |
++------------+------------+-------------------------------------+
+| SPI Master | on-chip    | spi                                 |
++------------+------------+-------------------------------------+
+| TWAI/CAN   | on-chip    | can                                 |
++------------+------------+-------------------------------------+
+| ADC        | on-chip    | adc                                 |
++------------+------------+-------------------------------------+
+| Timers     | on-chip    | counter                             |
++------------+------------+-------------------------------------+
+| Watchdog   | on-chip    | watchdog                            |
++------------+------------+-------------------------------------+
+| TRNG       | on-chip    | entropy                             |
++------------+------------+-------------------------------------+
+| LEDC       | on-chip    | pwm                                 |
++------------+------------+-------------------------------------+
+| MCPWM      | on-chip    | pwm                                 |
++------------+------------+-------------------------------------+
+| PCNT       | on-chip    | qdec                                |
++------------+------------+-------------------------------------+
+| GDMA       | on-chip    | dma                                 |
++------------+------------+-------------------------------------+
+| USB-CDC    | on-chip    | serial                              |
++------------+------------+-------------------------------------+
+| Wi-Fi      | on-chip    |                                     |
++------------+------------+-------------------------------------+
+| Bluetooth  | on-chip    |                                     |
++------------+------------+-------------------------------------+
+
+Connections and IOs
+===================
+
+The `Adafruit Feather ESP32-S3 TFT User Guide`_ has detailed information about
+the board including `pinouts`_ and the `schematic`_.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the
+command below to retrieve those files.
+
+.. code-block:: console
+
+   west blobs fetch hal_espressif
+
+.. note::
+
+   It is recommended running the command above after :file:`west update`.
+
+Building & Flashing
+===================
+
+Simple boot
+-----------
+
+The board could be loaded using the single binary image, without 2nd stage
+bootloader. It is the default option when building the application without
+additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+------------------
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be build (and flash) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+--------
+
+The sysbuild makes possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32-S3 SoC.
+
+To build the sample application using sysbuild use the command:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3_tft/esp32s3/procpu
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32-S3 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+  build/
+  ├── hello_world
+  │   └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  ├── mcuboot
+  │    └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild`
+documentation.
+
+Manual build
+------------
+
+During the development cycle, it is intended to build & flash as quickly
+possible. For that reason, images can be build one at a time using traditional
+build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flash at least once.
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3_tft/esp32s3/procpu
+   :goals: build
+
+The usual ``flash`` target will work with the ``adafruit_feather_esp32s3_tft``
+board. Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3_tft/esp32s3/procpu
+   :goals: flash
+
+Open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has automatically reset and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! adafruit_feather_esp32s3_tft
+
+Debugging
+=========
+
+ESP32-S3 support on OpenOCD is available upstream as of version 0.12.0. Download
+and install OpenOCD from `OpenOCD`_.
+
+ESP32-S3 has a built-in JTAG circuitry and can be debugged without any
+additional chip. Only an USB cable connected to the D+/D- pins is necessary.
+
+Further documentation can be obtained from the SoC vendor in `JTAG debugging
+for ESP32-S3`_.
+
+Here is an example for building the :zephyr:code-sample:`hello_world`
+application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3_tft/esp32s3/procpu
+   :goals: build flash
+
+You can debug an application in the usual way. Here is an example for the
+:zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: adafruit_feather_esp32s3_tft/esp32s3/procpu
+   :goals: debug
+
+References
+**********
+
+.. target-notes::
+
+.. _`Adafruit Feather ESP32-S3 TFT`:
+   https://www.adafruit.com/product/5483
+
+.. _`OpenOCD`:
+   https://github.com/openocd-org/openocd
+
+.. _`JTAG debugging for ESP32-S3`:
+   https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-guides/jtag-debugging/
+
+.. _Adafruit Feather ESP32-S3 TFT User Guide:
+   https://learn.adafruit.com/adafruit-esp32-s3-tft-feather
+
+.. _pinouts:
+   https://learn.adafruit.com/adafruit-esp32-s3-tft-feather/pinouts
+
+.. _schematic:
+   https://learn.adafruit.com/adafruit-esp32-s3-tft-feather/downloads
+
+.. _ESP32-S3 Datasheet:
+   https://www.espressif.com/sites/default/files/documentation/esp32-s3-wroom-1_wroom-1u_datasheet_en.pdf
+
+.. _ESP32 Technical Reference Manual:
+   https://www.espressif.com/sites/default/files/documentation/esp32-s3_technical_reference_manual_en.pdf
diff --git a/boards/adafruit/feather_esp32s3_tft/feather_connector.dtsi b/boards/adafruit/feather_esp32s3_tft/feather_connector.dtsi
new file mode 100644
index 0000000000000..9a4dd731e8ca9
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/feather_connector.dtsi
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020 Richard Osterloh <richard.osterloh@gmail.com>
+ * Copyright (c) 2024 Leon Rinkel <leon@rinkel.me>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	feather_header: connector {
+		compatible = "adafruit-feather-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio0 18 0>,	/* A0 */
+			   <1 0 &gpio0 17 0>,	/* A1 */
+			   <2 0 &gpio0 16 0>,	/* A2 */
+			   <3 0 &gpio0 15 0>,	/* A3 */
+			   <4 0 &gpio0 14 0>,	/* A4 */
+			   <5 0 &gpio0 8 0>,	/* A5 */
+			   <6 0 &gpio1 36 0>,	/* SCK */
+			   <7 0 &gpio1 35 0>,	/* MOSI */
+			   <8 0 &gpio1 37 0>,	/* MISO */
+			   <9 0 &gpio0 2 0>,	/* RX */
+			   <10 0 &gpio0 1 0>,	/* TX */
+			   <11 0 &gpio1 44 0>,	/* DB */
+			   <12 0 &gpio1 42 0>,	/* SDA */
+			   <13 0 &gpio1 41 0>,	/* SCL */
+			   <14 0 &gpio0 5 0>,	/* D5 */
+			   <15 0 &gpio0 6 0>,	/* D6 */
+			   <16 0 &gpio0 9 0>,	/* D9 */
+			   <17 0 &gpio0 10 0>,	/* D10 */
+			   <18 0 &gpio0 11 0>,	/* D11 */
+			   <19 0 &gpio0 12 0>,	/* D12 */
+			   <20 0 &gpio0 13 0>;	/* D13 */
+	};
+};
+
+feather_serial: &uart1 {};
+feather_i2c: &i2c0 {};
+feather_spi: &spi2 {};
diff --git a/boards/adafruit/feather_esp32s3_tft/support/openocd.cfg b/boards/adafruit/feather_esp32s3_tft/support/openocd.cfg
new file mode 100644
index 0000000000000..2f740b4a36ab1
--- /dev/null
+++ b/boards/adafruit/feather_esp32s3_tft/support/openocd.cfg
@@ -0,0 +1,7 @@
+set ESP_RTOS none
+set ESP32_ONLYCPU 1
+
+# Source the JTAG interface configuration file
+source [find interface/esp_usb_jtag.cfg]
+# Source the ESP32-S3 configuration file
+source [find target/esp32s3.cfg]
diff --git a/boards/adafruit/feather_m0_basic_proto/doc/index.rst b/boards/adafruit/feather_m0_basic_proto/doc/index.rst
index 20d1cd4750aba..69abd4bb9accd 100644
--- a/boards/adafruit/feather_m0_basic_proto/doc/index.rst
+++ b/boards/adafruit/feather_m0_basic_proto/doc/index.rst
@@ -23,35 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The adafruit_feather_m0_basic_proto board configuration supports the
-following hardware features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| NVIC      | on-chip    | Nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | Systick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial port                              |
-+-----------+------------+------------------------------------------+
-| I2C       | on-chip    | Inter-Integrated Circuit                 |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface port         |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/adafruit/feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -96,6 +68,8 @@ serial port that echos characters back to the host PC.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Adafruit Feather M0 Basic Proto ships with a BOSSA compatible
 SAM-BA bootloader.  The bootloader can be entered by quickly tapping
 the reset button twice.
diff --git a/boards/adafruit/feather_m0_lora/doc/index.rst b/boards/adafruit/feather_m0_lora/doc/index.rst
index 7a3e9fc78bf5a..1e85f48b1f547 100644
--- a/boards/adafruit/feather_m0_lora/doc/index.rst
+++ b/boards/adafruit/feather_m0_lora/doc/index.rst
@@ -24,37 +24,7 @@ Hardware
 Supported Features
 ==================
 
-The adafruit_feather_m0_lora board configuration supports the
-following hardware features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| NVIC      | on-chip    | Nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | Systick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial port                              |
-+-----------+------------+------------------------------------------+
-| I2C       | on-chip    | Inter-Integrated Circuit                 |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface port         |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| RADIO     | SPI        | LoRa radio                               |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/adafruit/feather_m0_lora/adafruit_feather_m0_lora_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -105,6 +75,8 @@ version, 433MHz or 900MHz is supported.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Adafruit Feather M0 with LoRa ships with a BOSSA compatible
 SAM-BA bootloader.  The bootloader can be entered by quickly tapping
 the reset button twice.
diff --git a/boards/adafruit/feather_m4_express/doc/index.rst b/boards/adafruit/feather_m4_express/doc/index.rst
index a4178626eeec0..a44c75808aa6c 100644
--- a/boards/adafruit/feather_m4_express/doc/index.rst
+++ b/boards/adafruit/feather_m4_express/doc/index.rst
@@ -23,39 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The ``adafruit_feather_m4_express`` board target supports the following
-hardware features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| TRNG      | on-chip    | True Random Number Generator             |
-+-----------+------------+------------------------------------------+
-| HWINFO    | on-chip    | Unique 128 bit serial number             |
-+-----------+------------+------------------------------------------+
-| RTC       | on-chip    | Real-Time Counter                        |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog Timer                           |
-+-----------+------------+------------------------------------------+
-| PWM       | on-chip    | PWM                                      |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/adafruit/feather_m4_express/adafruit_feather_m4_express_defconfig`.
+.. zephyr:board-supported-hw::
 
 Zephyr can use the default Cortex-M SYSTICK timer or the SAM0 specific RTC.
 To use the RTC, set :code:`CONFIG_CORTEX_M_SYSTICK=n` and set
@@ -105,6 +73,8 @@ serial port that echos characters back to the host PC.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Feather ships with a the BOSSA compatible UF2 bootloader.  The
 bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/adafruit/feather_nrf52840/doc/index.rst b/boards/adafruit/feather_nrf52840/doc/index.rst
index 6f2477e673ffe..b136a30ba49f6 100644
--- a/boards/adafruit/feather_nrf52840/doc/index.rst
+++ b/boards/adafruit/feather_nrf52840/doc/index.rst
@@ -58,43 +58,7 @@ Hardware
 Supported Features
 ==================
 
-The Adafruit Feather nRF52840 board configuration supports the
-following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -129,6 +93,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adafruit/feather_stm32f405/doc/index.rst b/boards/adafruit/feather_stm32f405/doc/index.rst
index 0cc6c327760f3..656f96f8a8f9e 100644
--- a/boards/adafruit/feather_stm32f405/doc/index.rst
+++ b/boards/adafruit/feather_stm32f405/doc/index.rst
@@ -26,29 +26,7 @@ Hardware
 Supported Features
 ==================
 
-The Adafruit Feather STM32F405 board configuration supports the
-following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| USB       | on-chip    | USB device           |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -86,6 +64,8 @@ dedicated to the 2 MB SPI Flash chip.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 DFU-Util programming is supported through Zephyr by default. Set up
 of the built in DFU-Util bootloader is possible by following the
 `instructions on the Learn website`_.
diff --git a/boards/adafruit/grand_central_m4_express/doc/index.rst b/boards/adafruit/grand_central_m4_express/doc/index.rst
index 4bab888996724..d85b2e922e024 100644
--- a/boards/adafruit/grand_central_m4_express/doc/index.rst
+++ b/boards/adafruit/grand_central_m4_express/doc/index.rst
@@ -21,37 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The adafruit_grand_central_m4_express board configuration supports the following
-hardware features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| NVIC      | on-chip    | Nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | SysTick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports, User LED                      |
-+-----------+------------+------------------------------------------+
-| UART      | on-chip    | Serial ports, Console                    |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | SPI ports, microSDHC slot                |
-+-----------+------------+------------------------------------------+
-| TRNG      | on-chip    | True Random Number Generator             |
-+-----------+------------+------------------------------------------+
-| RTC       | on-chip    | Real-Time Counter                        |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog Timer                           |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/adafruit/grand_central_m4_express/adafruit_grand_central_m4_express_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -95,6 +65,8 @@ serial port that echos characters back to the host PC.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Grand Central ships with a BOSSA compatible UF2 bootloader.
 The bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/adafruit/itsybitsy/board.cmake b/boards/adafruit/itsybitsy/board.cmake
index 6366e4775eccb..54b79bdf74b49 100644
--- a/boards/adafruit/itsybitsy/board.cmake
+++ b/boards/adafruit/itsybitsy/board.cmake
@@ -3,6 +3,7 @@
 include(${ZEPHYR_BASE}/boards/common/bossac.board.cmake)
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/adafruit/itsybitsy/doc/index.rst b/boards/adafruit/itsybitsy/doc/index.rst
index 3fbcb918adb40..3dac6fea3b86c 100644
--- a/boards/adafruit/itsybitsy/doc/index.rst
+++ b/boards/adafruit/itsybitsy/doc/index.rst
@@ -40,45 +40,7 @@ Hardware
 Supported Features
 ==================
 
-The Adafruit ItsyBitsy nRF52840 board configuration supports the
-following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| QSPI(M)   | on-chip    | nor                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -124,6 +86,9 @@ your board. The button and LED definitions can be found in
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 The ItsyBitsy ships with the BOSSA compatible UF2 bootloader.  The
 bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/adafruit/itsybitsy_m4_express/doc/index.rst b/boards/adafruit/itsybitsy_m4_express/doc/index.rst
index 31e19cb8a992c..19b5cdf290660 100644
--- a/boards/adafruit/itsybitsy_m4_express/doc/index.rst
+++ b/boards/adafruit/itsybitsy_m4_express/doc/index.rst
@@ -22,41 +22,7 @@ Hardware
 Supported Features
 ==================
 
-The adafruit_itsybitsy_m4_express board configuration supports the following
-hardware features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| NVIC      | on-chip    | Nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| TRNG      | on-chip    | True Random Number Generator             |
-+-----------+------------+------------------------------------------+
-| HWINFO    | on-chip    | Unique 128 bit serial number             |
-+-----------+------------+------------------------------------------+
-| RTC       | on-chip    | Real-Time Counter                        |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog Timer                           |
-+-----------+------------+------------------------------------------+
-| PWM       | on-chip    | PWM                                      |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/adafruit/itsybitsy_m4_express/adafruit_itsybitsy_m4_express_defconfig`.
+.. zephyr:board-supported-hw::
 
 Zephyr can use the default Cortex-M SYSTICK timer or the SAM0 specific RTC.
 To use the RTC, set :code:`CONFIG_CORTEX_M_SYSTICK=n` and set
@@ -106,6 +72,8 @@ serial port that echos characters back to the host PC.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The ItsyBitsy ships with a the BOSSA compatible UF2 bootloader.  The
 bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/adafruit/kb2040/doc/index.rst b/boards/adafruit/kb2040/doc/index.rst
index f1b5d998dc83a..0db8c71653e15 100644
--- a/boards/adafruit/kb2040/doc/index.rst
+++ b/boards/adafruit/kb2040/doc/index.rst
@@ -27,54 +27,7 @@ Hardware
 Supported Features
 ==================
 
-The adafruit_kb2040 board configuration supports the following
-hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v6m-nvic`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - USB Device
-     - :kconfig:option:`CONFIG_USB_DEVICE_STACK`
-     - :dtcompatible:`raspberrypi,pico-usbd`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - Watchdog Timer (WDT)
-     - :kconfig:option:`CONFIG_WATCHDOG`
-     - :dtcompatible:`raspberrypi,pico-watchdog`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - Flash
-     - :kconfig:option:`CONFIG_FLASH`
-     - :dtcompatible:`raspberrypi,pico-flash`
-   * - Clock controller
-     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
-     - :dtcompatible:`raspberrypi,pico-clock-controller`
-   * - UART (PIO)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart-pio`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -99,6 +52,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adafruit/macropad_rp2040/doc/index.rst b/boards/adafruit/macropad_rp2040/doc/index.rst
index 7f2e78418cd8e..74f9e14fa1d5b 100644
--- a/boards/adafruit/macropad_rp2040/doc/index.rst
+++ b/boards/adafruit/macropad_rp2040/doc/index.rst
@@ -30,63 +30,13 @@ Hardware
 Supported Features
 ******************
 
-The ``adafruit_macropad_rp2040`` board target supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v6m-nvic`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - USB Device
-     - :kconfig:option:`CONFIG_USB_DEVICE_STACK`
-     - :dtcompatible:`raspberrypi,pico-usbd`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - Watchdog Timer (WDT)
-     - :kconfig:option:`CONFIG_WATCHDOG`
-     - :dtcompatible:`raspberrypi,pico-watchdog`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - Flash
-     - :kconfig:option:`CONFIG_FLASH`
-     - :dtcompatible:`raspberrypi,pico-flash-controller`
-   * - UART (PIO)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart-pio`
-   * - Display
-     - :kconfig:option:`CONFIG_DISPLAY`
-     - :dtcompatible:`sinowealth,sh1106`
-   * - LED Strip (12 pixels)
-     - :kconfig:option:`CONFIG_LED_STRIP`
-     - :dtcompatible:`worldsemi,ws2812-rpi_pico-pio`
-   * - Rotary Encoder
-     - :kconfig:option:`CONFIG_INPUT`
-     - :dtcompatible:`gpio-qdec`
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``adafruit_macropad_rp2040`` board target can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/adafruit/nrf52_adafruit_feather/board.cmake b/boards/adafruit/nrf52_adafruit_feather/board.cmake
index 4ddbcf66fbee9..ca39352246427 100644
--- a/boards/adafruit/nrf52_adafruit_feather/board.cmake
+++ b/boards/adafruit/nrf52_adafruit_feather/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/adafruit/nrf52_adafruit_feather/doc/index.rst b/boards/adafruit/nrf52_adafruit_feather/doc/index.rst
index c84bc73f62bd3..4e318acd79350 100644
--- a/boards/adafruit/nrf52_adafruit_feather/doc/index.rst
+++ b/boards/adafruit/nrf52_adafruit_feather/doc/index.rst
@@ -35,29 +35,7 @@ Hardware
 Supported Features
 ==================
 
-The nRF52 Adafruit Feather board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTT       | on-chip    | console              |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -80,6 +58,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The ``nrf52_adafruit_feather`` board is available in two different versions:
 
 - `Adafruit Feather nRF52 Pro with myNewt Bootloader`_
diff --git a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_appcpu_psram.overlay b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_appcpu_psram.overlay
index ac1ec4af1b19c..58eaee33a2b54 100644
--- a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_appcpu_psram.overlay
+++ b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_appcpu_psram.overlay
@@ -27,8 +27,7 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
 
 #include <espressif/partitions_0x0_amp.dtsi>
diff --git a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu.dts b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu.dts
index ac757645e5b57..5d8b14a96a61f 100644
--- a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu.dts
+++ b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu.dts
@@ -42,6 +42,15 @@
 			zephyr,code = <INPUT_KEY_0>;
 		};
 	};
+
+	stemma_connector: stemma_connector {
+		compatible = "stemma-qt-connector";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio1 7 0>,
+			   <1 0 &gpio1 8 0>;
+	};
 };
 
 &usb_serial {
diff --git a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu_psram.overlay b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu_psram.overlay
index 5ab0be63c3ffb..cd9ca5f1dcf0f 100644
--- a/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu_psram.overlay
+++ b/boards/adafruit/qt_py_esp32s3/adafruit_qt_py_esp32s3_procpu_psram.overlay
@@ -27,8 +27,7 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
 
 #include <espressif/partitions_0x0_amp.dtsi>
diff --git a/boards/adafruit/qt_py_esp32s3/doc/index.rst b/boards/adafruit/qt_py_esp32s3/doc/index.rst
index 1c1f6e04eeeca..8ad715a673c0d 100644
--- a/boards/adafruit/qt_py_esp32s3/doc/index.rst
+++ b/boards/adafruit/qt_py_esp32s3/doc/index.rst
@@ -32,47 +32,7 @@ numerous peripherals.
 Supported Features
 ==================
 
-Current Zephyr's Adafruit QT Py ESP32-S3 board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| I2S        | on-chip    | i2s                                 |
-+------------+------------+-------------------------------------+
-| TWAI/CAN   | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Prerequisites
 -------------
@@ -91,6 +51,8 @@ command below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
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 3f87e4188b228..a6eaf30bbe6c9 100644
--- a/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts
+++ b/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts
@@ -27,6 +27,15 @@
 		watchdog0 = &wdt0;
 		led-strip = &ws2812;
 	};
+
+	stemma_connector: stemma_connector {
+		compatible = "stemma-qt-connector";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio0 23 0>,
+			   <1 0 &gpio0 22 0>;
+	};
 };
 
 &flash0 {
diff --git a/boards/adafruit/qt_py_rp2040/doc/index.rst b/boards/adafruit/qt_py_rp2040/doc/index.rst
index 0db8b4e403480..253ab615ac298 100644
--- a/boards/adafruit/qt_py_rp2040/doc/index.rst
+++ b/boards/adafruit/qt_py_rp2040/doc/index.rst
@@ -27,51 +27,7 @@ Hardware
 Supported Features
 ==================
 
-The adafruit_qt_py_rp2040 board configuration supports the following
-hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v6m-nvic`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - USB Device
-     - :kconfig:option:`CONFIG_USB_DEVICE_STACK`
-     - :dtcompatible:`raspberrypi,pico-usbd`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - Watchdog Timer (WDT)
-     - :kconfig:option:`CONFIG_WATCHDOG`
-     - :dtcompatible:`raspberrypi,pico-watchdog`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - Flash
-     - :kconfig:option:`CONFIG_FLASH`
-     - :dtcompatible:`raspberrypi,pico-flash`
-   * - UART (PIO)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart-pio`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -98,6 +54,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adafruit/trinket_m0/doc/index.rst b/boards/adafruit/trinket_m0/doc/index.rst
index 224f9aa4c6ded..ceaa0fd0ca2b3 100644
--- a/boards/adafruit/trinket_m0/doc/index.rst
+++ b/boards/adafruit/trinket_m0/doc/index.rst
@@ -21,35 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The adafruit_trinket_m0 board configuration supports the following hardware
-features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| NVIC      | on-chip    | nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| PWM       | on-chip    | Pulse Width Modulation                   |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/adafruit/trinket_m0/adafruit_trinket_m0_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -98,6 +70,8 @@ serial port that echos characters back to the host PC.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Trinket M0 ships the BOSSA compatible UF2 bootloader.  The
 bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/adi/ad_swiot1l_sl/Kconfig.ad_swiot1l_sl b/boards/adi/ad_swiot1l_sl/Kconfig.ad_swiot1l_sl
new file mode 100644
index 0000000000000..b8b2e0fed8164
--- /dev/null
+++ b/boards/adi/ad_swiot1l_sl/Kconfig.ad_swiot1l_sl
@@ -0,0 +1,7 @@
+# AD-SWIOT1L-SL board configuration
+
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_AD_SWIOT1L_SL
+	select SOC_MAX32650
diff --git a/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl.dts b/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl.dts
new file mode 100644
index 0000000000000..d46ad87c1cf9e
--- /dev/null
+++ b/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl.dts
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <adi/max32/max32650.dtsi>
+#include <adi/max32/max32650-pinctrl.dtsi>
+#include <zephyr/dt-bindings/gpio/adi-max32-gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Analog Devices AD-SWIOT1L-SL";
+	compatible = "adi,ad_swiot1l_sl";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led_1 {
+			gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
+			label = "Red LED";
+		};
+
+		led2: led_2 {
+			gpios = <&gpio2 14 GPIO_ACTIVE_HIGH>;
+			label = "Green LED";
+		};
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		led0 = &led1;
+		led1 = &led2;
+	};
+};
+
+&uart0 {
+	pinctrl-0 = <&uart0_tx_p2_12 &uart0_rx_p2_11>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	data-bits = <8>;
+	parity = "none";
+	status = "okay";
+};
+
+&clk_ipo {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
diff --git a/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl.yaml b/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl.yaml
new file mode 100644
index 0000000000000..495481a989db0
--- /dev/null
+++ b/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl.yaml
@@ -0,0 +1,13 @@
+identifier: ad_swiot1l_sl
+name: ad_swiot1l_sl
+vendor: adi
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - serial
+ram: 1024
+flash: 3072
diff --git a/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl_defconfig b/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl_defconfig
new file mode 100644
index 0000000000000..9428e5334a08f
--- /dev/null
+++ b/boards/adi/ad_swiot1l_sl/ad_swiot1l_sl_defconfig
@@ -0,0 +1,16 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable UART
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/boards/adi/ad_swiot1l_sl/board.cmake b/boards/adi/ad_swiot1l_sl/board.cmake
new file mode 100644
index 0000000000000..716d812146114
--- /dev/null
+++ b/boards/adi/ad_swiot1l_sl/board.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=MAX32650" "--reset-after-load")
+
+include(${ZEPHYR_BASE}/boards/common/openocd-adi-max32.boards.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/adi/ad_swiot1l_sl/board.yml b/boards/adi/ad_swiot1l_sl/board.yml
new file mode 100644
index 0000000000000..f458ef3b9e896
--- /dev/null
+++ b/boards/adi/ad_swiot1l_sl/board.yml
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board:
+  name: ad_swiot1l_sl
+  full_name: AD-SWIOT1L-SL
+  vendor: adi
+  socs:
+    - name: max32650
diff --git a/boards/adi/ad_swiot1l_sl/doc/img/ad_swiot1l_sl.webp b/boards/adi/ad_swiot1l_sl/doc/img/ad_swiot1l_sl.webp
new file mode 100644
index 0000000000000..6b734dc80b45a
Binary files /dev/null and b/boards/adi/ad_swiot1l_sl/doc/img/ad_swiot1l_sl.webp differ
diff --git a/boards/adi/ad_swiot1l_sl/doc/index.rst b/boards/adi/ad_swiot1l_sl/doc/index.rst
new file mode 100644
index 0000000000000..42ef89a467ff5
--- /dev/null
+++ b/boards/adi/ad_swiot1l_sl/doc/index.rst
@@ -0,0 +1,107 @@
+.. zephyr:board:: ad_swiot1l_sl
+
+Overview
+********
+The AD-SWIOT1L-SL is a complete hardware and software platform for prototyping intelligent,
+secure, network-capable field devices, with applications in factory automation, process
+control, and intelligent buildings.
+
+The Zephyr port is running on the MAX32650 MCU.
+
+Hardware
+********
+
+- MAX32650 MCU:
+
+  - Ultra-Efficient Microcontroller for Battery-Powered Applications
+
+    - 120MHz Arm Cortex-M4 Processor with FPU
+    - SmartDMA Provides Background Memory Transfers with Programmable Data Processing
+    - 120MHz High-Speed and 50MHz Low-Power Oscillators
+    - 7.3728MHz Low-Power Oscillators
+    - 32.768kHz and RTC Clock (Requires External Crystal)
+    - 8kHz, Always-On, Ultra-Low-Power Oscillator
+    - 3MB Internal Flash, 1MB Internal SRAM
+    - 104μW/MHz Executing from Cache at 1.1V
+    - Five Low-Power Modes: Active, Sleep, Background, Deep Sleep, and Backup
+    - 1.8V and 3.3V I/O with No Level Translators
+
+  - Scalable Cached External Memory Interfaces:
+
+    - 120MB/s HyperBus/Xccela DDR Interface
+    - SPIXF/SPIXR for External Flash/RAM Expansion
+    - 240Mbps SDHC/eMMC/SDIO/microSD Interface
+
+  - Optimal Peripheral Mix Provides Platform Scalability
+
+    - 16-Channel DMA
+    - Three SPI Master (60MHz)/Slave (48MHz)
+    - One QuadSPI Master (60MHz)/Slave (48MHz)
+    - Up to Three 4Mbaud UARTs with Flow Control
+    - Two 1MHz I2C Master/Slave
+    - I2S Slave
+    - Four-Channel, 7.8ksps, 10-Bit Delta-Sigma ADC
+    - USB 2.0 Hi-Speed Device Interface with PHY
+    - 16 Pulse Train Generators
+    - Six 32-Bit Timers with 8mA High Drive
+    - 1-Wire® Master
+
+  - Trust Protection Unit (TPU) for IP/Data Security
+
+    - Modular Arithmetic Accelerator (MAA), True Random Number Generator (TRNG)
+    - Secure Nonvolatile Key Storage, SHA-256, AES-128/192/256
+    - Memory Decryption Integrity Unit, Secure Boot ROM
+
+- External devices connected to the AD-SWIOT1L-SL:
+
+  - On-Board HyperRAM
+  - On-Board QSPI Flash
+  - MAXQ1065 Ultralow Power Cryptographic Controller with ChipDNA
+  - ADIN1110 Robust, Industrial, Low Power 10BASE-T1L Ethernet MAC-PHY
+  - 2-Pin external power supply terminal block (24V DC)
+  - ADP1032 high performance, isolated micropower management unit (PMU)
+  - SWD 10-Pin Header
+  - On-Board 3.3V, 1.8V, and 1.1V voltage regulators
+  - AD74413R Quad-channel, Software Configurable I/O
+  - MAX14906 Quad-channel, Industrial Digital I/O
+  - Two general-purpose LEDs
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+The MAX32650 MCU can be flashed by connecting an external debug probe to the
+SWD port. SWD debug can be accessed through the Cortex 10-pin connector, J3.
+Logic levels are fixed to VDDIO (1.8V).
+
+Once the debug probe is connected to your host computer, then you can simply run the
+``west flash`` command to write a firmware image into flash.
+
+.. note::
+
+   This board uses OpenOCD as the default debug interface. You can also use
+   a Segger J-Link with Segger's native tooling by overriding the runner,
+   appending ``--runner jlink`` to your ``west`` command(s). The J-Link should
+   be connected to the standard 2*5 pin debug connector (J3) using an
+   appropriate adapter board and cable
+
+Debugging
+=========
+Please refer to the `Flashing`_ section and run the ``west debug`` command
+instead of ``west flash``.
+
+References
+**********
+
+- `AD-SWIOT1L-SL web page`_
+
+.. _AD-SWIOT1L-SL web page:
+   https://www.analog.com/en/resources/evaluation-hardware-and-software/evaluation-boards-kits/AD-SWIOT1L-SL.html
diff --git a/boards/adi/apard32690/doc/index.rst b/boards/adi/apard32690/doc/index.rst
index edd879bd3ddc3..318d34b361e9f 100644
--- a/boards/adi/apard32690/doc/index.rst
+++ b/boards/adi/apard32690/doc/index.rst
@@ -87,32 +87,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on APARD32690.
-
-+-----------+------------+------------------------------------+
-| Interface | Controller | Driver/Component                   |
-+===========+============+====================================+
-| NVIC      | on-chip    | nested vector interrupt controller |
-+-----------+------------+------------------------------------+
-| SYSTICK   | on-chip    | systick                            |
-+-----------+------------+------------------------------------+
-| CLOCK     | on-chip    | clock and reset control            |
-+-----------+------------+------------------------------------+
-| GPIO      | on-chip    | gpio                               |
-+-----------+------------+------------------------------------+
-| UART      | on-chip    | serial                             |
-+-----------+------------+------------------------------------+
-| SPI       | on-chip    | spi                                |
-+-----------+------------+------------------------------------+
-| ADIN1110  | spi        | ADIN1110 10BASE-T1L mac/phy        |
-+-----------+------------+------------------------------------+
-| TRNG      | on-chip    | entropy                            |
-+-----------+------------+------------------------------------+
-| Timer     | on-chip    | counter                            |
-+-----------+------------+------------------------------------+
-| W1        | on-chip    | one wire master                    |
-+-----------+------------+------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -182,6 +157,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/eval_adin1110ebz/doc/index.rst b/boards/adi/eval_adin1110ebz/doc/index.rst
index 4f38e78faf0f5..ed1db60a4ee07 100644
--- a/boards/adi/eval_adin1110ebz/doc/index.rst
+++ b/boards/adi/eval_adin1110ebz/doc/index.rst
@@ -38,43 +38,7 @@ https://wiki.analog.com/resources/eval/user-guides/eval-adin1110ebz-user-guide
 Supported Features
 ==================
 
-The ADI adi_eval_adin1110ebz board configuration supports the
-following hardware features:
-
-+--------------+------------+-------------------------------------+
-| Interface    | Controller | Driver/Component                    |
-+==============+============+=====================================+
-| NVIC         | on-chip    | nested vector interrupt controller  |
-+--------------+------------+-------------------------------------+
-| UART         | on-chip    | serial port-polling;                |
-|              |            | serial port-interrupt               |
-+--------------+------------+-------------------------------------+
-| PINMUX       | on-chip    | pinmux                              |
-+--------------+------------+-------------------------------------+
-| GPIO         | on-chip    | gpio                                |
-+--------------+------------+-------------------------------------+
-| I2C          | on-chip    | i2c                                 |
-+--------------+------------+-------------------------------------+
-| SPI          | on-chip    | spi                                 |
-+--------------+------------+-------------------------------------+
-| PWM          | on-chip    | pwm                                 |
-+--------------+------------+-------------------------------------+
-| WATCHDOG     | on-chip    | independent watchdog                |
-+--------------+------------+-------------------------------------+
-| ADIN1110     | spi        | adin1110 10BASE-T1L mac/phy         |
-+--------------+------------+-------------------------------------+
-| FT232        | uart       | usb-uart                            |
-+--------------+------------+-------------------------------------+
-| ADT7422      | i2c        | temperature sensor                  |
-+--------------+------------+-------------------------------------+
-| ISS66WVE4M16 | fmc        | 8MB PSRAM                           |
-+--------------+------------+-------------------------------------+
-
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/adi/eval_adin1110ebz/adi_eval_adin1110ebz_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -119,6 +83,8 @@ to a FT232, so available through Micro USB connector. Default settings are 11520
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/eval_adin2111ebz/doc/index.rst b/boards/adi/eval_adin2111ebz/doc/index.rst
index 7579c85b0cd2c..9c65a86ce369a 100644
--- a/boards/adi/eval_adin2111ebz/doc/index.rst
+++ b/boards/adi/eval_adin2111ebz/doc/index.rst
@@ -46,39 +46,7 @@ https://wiki.analog.com/resources/eval/user-guides/eval-adin2111ebz-user-guide
 Supported Features
 ==================
 
-The ADI adi_eval_adin2111ebz board configuration supports the
-following hardware features:
-
-+--------------+------------+-------------------------------------+
-| Interface    | Controller | Driver/Component                    |
-+==============+============+=====================================+
-| NVIC         | on-chip    | nested vector interrupt controller  |
-+--------------+------------+-------------------------------------+
-| UART         | on-chip    | serial port-polling;                |
-|              |            | serial port-interrupt               |
-+--------------+------------+-------------------------------------+
-| PINMUX       | on-chip    | pinmux                              |
-+--------------+------------+-------------------------------------+
-| GPIO         | on-chip    | gpio                                |
-+--------------+------------+-------------------------------------+
-| I2C          | on-chip    | i2c                                 |
-+--------------+------------+-------------------------------------+
-| SPI          | on-chip    | spi                                 |
-+--------------+------------+-------------------------------------+
-| PWM          | on-chip    | pwm                                 |
-+--------------+------------+-------------------------------------+
-| WATCHDOG     | on-chip    | independent watchdog                |
-+--------------+------------+-------------------------------------+
-| ADIN2111     | spi        | adin2111 10BASE-T1L mac/phy         |
-+--------------+------------+-------------------------------------+
-| FT232        | uart       | usb-uart                            |
-+--------------+------------+-------------------------------------+
-
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/adi/eval_adin2111ebz/adi_eval_adin2111ebz_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -120,6 +88,8 @@ Same UART1 TX and RX cmos signals are available before the FT232, at P9 connecto
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32650evkit/Kconfig.max32650evkit b/boards/adi/max32650evkit/Kconfig.max32650evkit
new file mode 100644
index 0000000000000..accb9f0e0f31b
--- /dev/null
+++ b/boards/adi/max32650evkit/Kconfig.max32650evkit
@@ -0,0 +1,7 @@
+# MAX32650EVKIT boards configuration
+
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MAX32650EVKIT
+	select SOC_MAX32650
diff --git a/boards/adi/max32650evkit/board.cmake b/boards/adi/max32650evkit/board.cmake
new file mode 100644
index 0000000000000..716d812146114
--- /dev/null
+++ b/boards/adi/max32650evkit/board.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=MAX32650" "--reset-after-load")
+
+include(${ZEPHYR_BASE}/boards/common/openocd-adi-max32.boards.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/adi/max32650evkit/board.yml b/boards/adi/max32650evkit/board.yml
new file mode 100644
index 0000000000000..24e70315fb5e4
--- /dev/null
+++ b/boards/adi/max32650evkit/board.yml
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board:
+  name: max32650evkit
+  full_name: MAX32650EVKIT
+  vendor: adi
+  socs:
+    - name: max32650
diff --git a/boards/adi/max32650evkit/doc/img/max32650evkit.webp b/boards/adi/max32650evkit/doc/img/max32650evkit.webp
new file mode 100644
index 0000000000000..1300e5e44b910
Binary files /dev/null and b/boards/adi/max32650evkit/doc/img/max32650evkit.webp differ
diff --git a/boards/adi/max32650evkit/doc/index.rst b/boards/adi/max32650evkit/doc/index.rst
new file mode 100644
index 0000000000000..d66d875a782c7
--- /dev/null
+++ b/boards/adi/max32650evkit/doc/index.rst
@@ -0,0 +1,103 @@
+.. zephyr:board:: max32650evkit
+
+Overview
+********
+The MAX32650 evaluation kit (EV kit) provides a platform for evaluating the
+capabilities of the MAX32650 ultra-low power memory-scalable microcontroller
+designed specifically for high performance battery powered applications.
+
+The Zephyr port is running on the MAX32650 MCU.
+
+Hardware
+********
+
+- MAX32650 MCU:
+
+  - Ultra Efficient Microcontroller for Battery-Powered Applications
+
+    - 120MHz Arm Cortex-M4 with FPU
+    - SmartDMA Provides Background Memory Transfers with Programmable Data Processing
+    - 120MHz High-Speed and 50MHz Low-Power Oscillators
+    - 7.3728MHz Low Power Oscillators
+    - 32.768kHz and RTC Clock (Requires External Crystal)
+    - 8kHz, Always-on, Ultra-Low-Power Oscillator
+    - 3MB Internal Flash, 1MB Internal SRAM
+    - 104µW/MHz Executing from Cache at 1.1V
+    - Five Low-Power Modes: Active, Sleep, Background, Deep-Sleep, and Backup
+    - 1.8V and 3.3V I/O with No Level Translators
+    - Programming and Debugging
+
+  - Scalable Cached External Memory Interfaces
+
+    - 120MB/s HyperBus/Xccela DDR Interface
+    - SPIXF/SPIXR for External Flash/RAM Expansion
+    - 240Mbps SDHC/eMMC/SDIO/microSD Interface
+
+  - Optimal Peripheral Mix Provides Platform Scalability
+
+    - 16-Channel DMA
+    - Three SPI Master (60MHz)/Slave (48MHz)
+    - One QuadSPI Master (60MHz)/Slave (48MHz)
+    - Up to Three 4Mbaud UARTs with Flow Control
+    - Two 1MHz I2C Master/Slave
+    - I2S Slave
+    - Four-Channel, 7.8ksps, 10-bit Delta-Sigma ADC
+    - USB 2.0 Hi-Speed Device Interface with PHY
+    - 16 Pulse Train Generators
+    - Six 32-bit Timers with 8mA Hi-Drive
+    - 1-Wire® Master
+
+  - Trust Protection Unit (TPU) for IP/Data and Security
+
+    - Modular Arithmetic Accelerator (MAA), True Random Number Generator (TRNG)
+    - Secure Nonvolatile Key Storage, SHA-256, AES-128/192/256
+    - Memory Decryption Integrity Unit, Secure Boot ROM
+
+- External devices connected to the MAX32650EVKIT:
+
+  - 3.5in 320 x 240 Color TFT Display
+  - 64MB HyperRAM
+  - 64MB XIP Flash
+  - 1MB XIP RAM
+  - USB 2.0 Micro B
+  - Two General-Purpose LEDs and Two GeneralPurpose Pushbutton Switches
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+The MAX32650 MCU can be flashed by connecting an external debug probe to the
+SWD port. SWD debug can be accessed through the Cortex 10-pin connector, J3.
+Logic levels are fixed to VDDIO (1.8V).
+
+Once the debug probe is connected to your host computer, then you can simply run the
+``west flash`` command to write a firmware image into flash.
+
+.. note::
+
+   This board uses OpenOCD as the default debug interface. You can also use
+   a Segger J-Link with Segger's native tooling by overriding the runner,
+   appending ``--runner jlink`` to your ``west`` command(s). The J-Link should
+   be connected to the standard 2*5 pin debug connector (J3) using an
+   appropriate adapter board and cable
+
+Debugging
+=========
+Please refer to the `Flashing`_ section and run the ``west debug`` command
+instead of ``west flash``.
+
+References
+**********
+
+- `MAX32650EVKIT web page`_
+
+.. _MAX32650EVKIT web page:
+   https://www.analog.com/en/resources/evaluation-hardware-and-software/evaluation-boards-kits/max32650-evkit.html
diff --git a/boards/adi/max32650evkit/max32650evkit.dts b/boards/adi/max32650evkit/max32650evkit.dts
new file mode 100644
index 0000000000000..2292bfd8b8ac4
--- /dev/null
+++ b/boards/adi/max32650evkit/max32650evkit.dts
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <adi/max32/max32650.dtsi>
+#include <adi/max32/max32650-pinctrl.dtsi>
+#include <zephyr/dt-bindings/gpio/adi-max32-gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Analog Devices MAX32650EVKIT";
+	compatible = "adi,max32650evkit";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led_1 {
+			gpios = <&gpio2 25 GPIO_ACTIVE_HIGH>;
+			label = "Red LED";
+		};
+
+		led2: led_2 {
+			gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
+			label = "Green LED";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		pb1: pb1 {
+			gpios = <&gpio2 28 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW2";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		pb2: pb2 {
+			gpios = <&gpio2 30 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW3";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		led0 = &led1;
+		led1 = &led2;
+	};
+};
+
+&uart0 {
+	pinctrl-0 = <&uart0_tx_p2_12 &uart0_rx_p2_11>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	data-bits = <8>;
+	parity = "none";
+	status = "okay";
+};
+
+&clk_ipo {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
diff --git a/boards/adi/max32650evkit/max32650evkit.yaml b/boards/adi/max32650evkit/max32650evkit.yaml
new file mode 100644
index 0000000000000..8e3ced3c43711
--- /dev/null
+++ b/boards/adi/max32650evkit/max32650evkit.yaml
@@ -0,0 +1,13 @@
+identifier: max32650evkit
+name: max32650evkit
+vendor: adi
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - serial
+ram: 1024
+flash: 3072
diff --git a/boards/adi/max32650evkit/max32650evkit_defconfig b/boards/adi/max32650evkit/max32650evkit_defconfig
new file mode 100644
index 0000000000000..9428e5334a08f
--- /dev/null
+++ b/boards/adi/max32650evkit/max32650evkit_defconfig
@@ -0,0 +1,16 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable UART
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/boards/adi/max32650fthr/Kconfig.max32650fthr b/boards/adi/max32650fthr/Kconfig.max32650fthr
new file mode 100644
index 0000000000000..cf8acafe85d82
--- /dev/null
+++ b/boards/adi/max32650fthr/Kconfig.max32650fthr
@@ -0,0 +1,7 @@
+# MAX32650FTHR board configuration
+
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MAX32650FTHR
+	select SOC_MAX32650
diff --git a/boards/adi/max32650fthr/board.cmake b/boards/adi/max32650fthr/board.cmake
new file mode 100644
index 0000000000000..716d812146114
--- /dev/null
+++ b/boards/adi/max32650fthr/board.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=MAX32650" "--reset-after-load")
+
+include(${ZEPHYR_BASE}/boards/common/openocd-adi-max32.boards.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/adi/max32650fthr/board.yml b/boards/adi/max32650fthr/board.yml
new file mode 100644
index 0000000000000..46dee2be23394
--- /dev/null
+++ b/boards/adi/max32650fthr/board.yml
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board:
+  name: max32650fthr
+  full_name: MAX32650FTHR
+  vendor: adi
+  socs:
+    - name: max32650
diff --git a/boards/adi/max32650fthr/doc/img/max32650fthr.webp b/boards/adi/max32650fthr/doc/img/max32650fthr.webp
new file mode 100644
index 0000000000000..065de009e8cfa
Binary files /dev/null and b/boards/adi/max32650fthr/doc/img/max32650fthr.webp differ
diff --git a/boards/adi/max32650fthr/doc/index.rst b/boards/adi/max32650fthr/doc/index.rst
new file mode 100644
index 0000000000000..de4a139081d9b
--- /dev/null
+++ b/boards/adi/max32650fthr/doc/index.rst
@@ -0,0 +1,102 @@
+.. zephyr:board:: max32650fthr
+
+Overview
+********
+The MAX32650FTHR evaluation kit provides a platform for evaluating the capabilities
+of the MAX32650 ultra-low-power memory-scalable microcontroller designed specifically
+for high-performance, battery-powered applications.
+
+The Zephyr port is running on the MAX32650 MCU.
+
+Hardware
+********
+
+- MAX32650 MCU:
+
+  - Ultra Efficient Microcontroller for Battery-Powered Applications
+
+    - 120MHz Arm Cortex-M4 with FPU
+    - SmartDMA Provides Background Memory Transfers with Programmable Data Processing
+    - 120MHz High-Speed and 50MHz Low-Power Oscillators
+    - 7.3728MHz Low Power Oscillators
+    - 32.768kHz and RTC Clock (Requires External Crystal)
+    - 8kHz, Always-on, Ultra-Low-Power Oscillator
+    - 3MB Internal Flash, 1MB Internal SRAM
+    - 104µW/MHz Executing from Cache at 1.1V
+    - Five Low-Power Modes: Active, Sleep, Background, Deep-Sleep, and Backup
+    - 1.8V and 3.3V I/O with No Level Translators
+    - Programming and Debugging
+
+  - Scalable Cached External Memory Interfaces
+
+    - 120MB/s HyperBus/Xccela DDR Interface
+    - SPIXF/SPIXR for External Flash/RAM Expansion
+    - 240Mbps SDHC/eMMC/SDIO/microSD Interface
+
+  - Optimal Peripheral Mix Provides Platform Scalability
+
+    - 16-Channel DMA
+    - Three SPI Master (60MHz)/Slave (48MHz)
+    - One QuadSPI Master (60MHz)/Slave (48MHz)
+    - Up to Three 4Mbaud UARTs with Flow Control
+    - Two 1MHz I2C Master/Slave
+    - I2S Slave
+    - Four-Channel, 7.8ksps, 10-bit Delta-Sigma ADC
+    - USB 2.0 Hi-Speed Device Interface with PHY
+    - 16 Pulse Train Generators
+    - Six 32-bit Timers with 8mA Hi-Drive
+    - 1-Wire® Master
+
+  - Trust Protection Unit (TPU) for IP/Data and Security
+
+    - Modular Arithmetic Accelerator (MAA), True Random Number Generator (TRNG)
+    - Secure Nonvolatile Key Storage, SHA-256, AES-128/192/256
+    - Memory Decryption Integrity Unit, Secure Boot ROM
+
+- External devices connected to the MAX32650FTHR:
+
+   - Battery Connector and Charging Circuit
+   - Micro-SD Card Interface
+   - USB 2.0 Full-Speed Device Interface
+   - MAX11261 6-Channel, 24-Bit, 16ksps, ADC
+   - Adafruit® Feather Board Compatible
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+The MAX32650 MCU can be flashed by connecting an external debug probe to the
+SWD port. SWD debug can be accessed through the Cortex 10-pin connector, J5.
+Logic levels are fixed to VDDIO (1.8V).
+
+Once the debug probe is connected to your host computer, then you can simply run the
+``west flash`` command to write a firmware image into flash.
+
+.. note::
+
+   This board uses OpenOCD as the default debug interface. You can also use
+   a Segger J-Link with Segger's native tooling by overriding the runner,
+   appending ``--runner jlink`` to your ``west`` command(s). The J-Link should
+   be connected to the standard 2*5 pin debug connector (J5) using an
+   appropriate adapter board and cable
+
+Debugging
+=========
+Please refer to the `Flashing`_ section and run the ``west debug`` command
+instead of ``west flash``.
+
+References
+**********
+
+- `MAX32650FTHR web page`_
+
+.. _MAX32650FTHR web page:
+   https://www.analog.com/en/resources/evaluation-hardware-and-software/evaluation-boards-kits/max32650fthr.html
diff --git a/boards/adi/max32650fthr/max32650fthr.dts b/boards/adi/max32650fthr/max32650fthr.dts
new file mode 100644
index 0000000000000..b471e2523ce0f
--- /dev/null
+++ b/boards/adi/max32650fthr/max32650fthr.dts
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <adi/max32/max32650.dtsi>
+#include <adi/max32/max32650-pinctrl.dtsi>
+#include <zephyr/dt-bindings/gpio/adi-max32-gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Analog Devices MAX32650FTHR";
+	compatible = "adi,max32650fthr";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led_1 {
+			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+			label = "Red LED";
+		};
+
+		led2: led_2 {
+			gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+			label = "Green LED";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		pb1: pb1 {
+			gpios = <&gpio1 19 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW2";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		pb2: pb2 {
+			gpios = <&gpio1 21 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW3";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		led0 = &led1;
+		led1 = &led2;
+	};
+};
+
+&uart0 {
+	pinctrl-0 = <&uart0_tx_p2_12 &uart0_rx_p2_11>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	data-bits = <8>;
+	parity = "none";
+	status = "okay";
+};
+
+&clk_ipo {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
diff --git a/boards/adi/max32650fthr/max32650fthr.yaml b/boards/adi/max32650fthr/max32650fthr.yaml
new file mode 100644
index 0000000000000..f967621e7020c
--- /dev/null
+++ b/boards/adi/max32650fthr/max32650fthr.yaml
@@ -0,0 +1,13 @@
+identifier: max32650fthr
+name: max32650fthr
+vendor: adi
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - serial
+ram: 1024
+flash: 3072
diff --git a/boards/adi/max32650fthr/max32650fthr_defconfig b/boards/adi/max32650fthr/max32650fthr_defconfig
new file mode 100644
index 0000000000000..9428e5334a08f
--- /dev/null
+++ b/boards/adi/max32650fthr/max32650fthr_defconfig
@@ -0,0 +1,16 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable UART
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/boards/adi/max32655evkit/doc/index.rst b/boards/adi/max32655evkit/doc/index.rst
index 1dce1fbad6ecc..9c72155a4d90f 100644
--- a/boards/adi/max32655evkit/doc/index.rst
+++ b/boards/adi/max32655evkit/doc/index.rst
@@ -69,41 +69,7 @@ Hardware
 Supported Features
 ==================
 
-Below are the interfaces supported by Zephyr on MAX32655EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -161,6 +127,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32655fthr/doc/index.rst b/boards/adi/max32655fthr/doc/index.rst
index bc3f191c19b13..648133f2142f1 100644
--- a/boards/adi/max32655fthr/doc/index.rst
+++ b/boards/adi/max32655fthr/doc/index.rst
@@ -82,39 +82,7 @@ Hardware
 Supported Features
 ==================
 
-Below are the interfaces supported by Zephyr on MAX32655FTHR.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Push Buttons
 ************
@@ -184,6 +152,8 @@ used as a user LED.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32660evsys/Kconfig.max32660evsys b/boards/adi/max32660evsys/Kconfig.max32660evsys
new file mode 100644
index 0000000000000..2e93639776153
--- /dev/null
+++ b/boards/adi/max32660evsys/Kconfig.max32660evsys
@@ -0,0 +1,7 @@
+# MAX32660EVSYS boards configuration
+
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MAX32660EVSYS
+	select SOC_MAX32660
diff --git a/boards/adi/max32660evsys/board.cmake b/boards/adi/max32660evsys/board.cmake
new file mode 100644
index 0000000000000..617eecca8f8ea
--- /dev/null
+++ b/boards/adi/max32660evsys/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+include(${ZEPHYR_BASE}/boards/common/openocd-adi-max32.boards.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/adi/max32660evsys/board.yml b/boards/adi/max32660evsys/board.yml
new file mode 100644
index 0000000000000..5e7e264b04c83
--- /dev/null
+++ b/boards/adi/max32660evsys/board.yml
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+board:
+  name: max32660evsys
+  full_name: MAX32660EVSYS
+  vendor: adi
+  socs:
+    - name: max32660
diff --git a/boards/adi/max32660evsys/doc/img/max32660evsys.webp b/boards/adi/max32660evsys/doc/img/max32660evsys.webp
new file mode 100644
index 0000000000000..b3043a033a249
Binary files /dev/null and b/boards/adi/max32660evsys/doc/img/max32660evsys.webp differ
diff --git a/boards/adi/max32660evsys/doc/index.rst b/boards/adi/max32660evsys/doc/index.rst
new file mode 100644
index 0000000000000..c556fcbfeb9a9
--- /dev/null
+++ b/boards/adi/max32660evsys/doc/index.rst
@@ -0,0 +1,111 @@
+.. zephyr:board:: max32660evsys
+
+Overview
+********
+The MAX32660 evaluation system offers a compact development platform that
+provides access to all the features of the MAX32660 in a tiny, easy to
+use board. A MAX32625PICO-based debug adapter comes attached to the main
+board. It can be snapped free when programming is complete. The debug
+module supports an optional 10-pin Arm® Cortex® debug connector for DAPLink
+functionality. Combined measurements are 0.65in x 2.2in, while the main board
+alone measures 0.65in x 0.95in. External connections terminate in a dual-row
+header footprint compatible with both thru-hole and SMT applications. This
+board provides a powerful processing subsystem in a very small space that
+can be easily integrated into a variety of applications.
+
+The Zephyr port is running on the MAX32660 MCU.
+
+Hardware
+********
+
+- MAX32660 MCU:
+
+  - High-Efficiency Microcontroller for Wearable Devices
+
+     - Internal Oscillator Operates Up to 96MHz
+     - 256KB Flash Memory
+     - 96KB SRAM, Optionally Preserved in Lowest Power Backup Mode
+     - 16KB Instruction Cache
+     - Memory Protection Unit (MPU)
+     - Low 1.1V VCORE Supply Voltage
+     - 3.6V GPIO Operating Range
+     - Internal LDO Provides Operation from Single Supply
+     - Wide Operating Temperature: -40°C to +105°C
+
+  - Power Management Maximizes Uptime for Battery Applications
+
+     - 85µA/MHz Active Executing from Flash
+     - 2µA Full Memory Retention Power in Backup Mode at VDD = 1.8V
+     - 450nA Ultra-Low Power RTC at VDD=1.8V
+     - Internal 80kHz Ring Oscillator
+
+  - Optimal Peripheral Mix Provides Platform Scalability
+
+     - Up to 14 General-Purpose I/O Pins
+     - Up to Two SPI
+     - I2S
+     - Up to Two UARTs
+     - Up to Two I2C, 3.4Mbps High Speed
+     - Four-Channel Standard DMA Controller
+     - Three 32-Bit Timers
+     - Watchdog Timer
+     - CMOS-Level 32.768kHz RTC Output
+
+- Benefits and Features of MAX32660-EVSYS:
+
+  - DIP Breakout Board
+
+     - 100mil Pitch Dual Inline Pin Headers
+     - Breadboard Compatible
+
+  - Integrated Peripherals
+
+     - Red Indicator LED
+     - User Pushbutton
+
+  - MAX32625PICO-Based Debug Adapter
+
+     - CMSIS-DAP SWD Debugger
+     - Virtual UART Console
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+
+An Arm® debug access port (DAP) provides an external interface for debugging during application
+development. The DAP is a standard Arm CoreSight® serial wire debug port, uses a two-pin serial
+interface (SWDCLK and SWDIO), and is accessed through 10-pin header (J4).
+
+Once the debug probe is connected to your host computer, then you can simply run the
+``west flash`` command to write a firmware image into flash.
+
+.. note::
+
+   This board uses OpenOCD as the default debug interface. You can also use
+   a Segger J-Link with Segger's native tooling by overriding the runner,
+   appending ``--runner jlink`` to your ``west`` command(s). The J-Link should
+   be connected to the standard 2*5 pin debug connector (J3) using an
+   appropriate adapter board and cable.
+
+Debugging
+=========
+
+Please refer to the `Flashing`_ section and run the ``west debug`` command
+instead of ``west flash``.
+
+References
+**********
+
+- `MAX32660EVSYS web page`_
+
+.. _MAX32660EVSYS web page:
+   https://www.analog.com/en/resources/evaluation-hardware-and-software/evaluation-boards-kits/max32660-evsys.html
diff --git a/boards/adi/max32660evsys/max32660evsys.dts b/boards/adi/max32660evsys/max32660evsys.dts
new file mode 100644
index 0000000000000..f06645f94a1e8
--- /dev/null
+++ b/boards/adi/max32660evsys/max32660evsys.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <adi/max32/max32660.dtsi>
+#include <adi/max32/max32660-pinctrl.dtsi>
+#include <zephyr/dt-bindings/gpio/adi-max32-gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Analog Devices MAX32660EVSYS";
+	compatible = "adi,max32660evsys";
+
+	chosen {
+		zephyr,console = &uart1;
+		zephyr,shell-uart = &uart1;
+		zephyr,sram = &sram2;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led_1 {
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			label = "Red LED";
+		};
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		led0 = &led1;
+	};
+
+};
+
+&uart1 {
+	pinctrl-0 = <&uart1_tx_p0_10 &uart1_rx_p0_11>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	data-bits = <8>;
+	parity = "none";
+	status = "okay";
+};
+
+&clk_ipo {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
diff --git a/boards/adi/max32660evsys/max32660evsys.yaml b/boards/adi/max32660evsys/max32660evsys.yaml
new file mode 100644
index 0000000000000..da963ef091c68
--- /dev/null
+++ b/boards/adi/max32660evsys/max32660evsys.yaml
@@ -0,0 +1,13 @@
+identifier: max32660evsys
+name: max32660evsys
+vendor: adi
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - serial
+ram: 96
+flash: 256
diff --git a/boards/adi/max32660evsys/max32660evsys_defconfig b/boards/adi/max32660evsys/max32660evsys_defconfig
new file mode 100644
index 0000000000000..9428e5334a08f
--- /dev/null
+++ b/boards/adi/max32660evsys/max32660evsys_defconfig
@@ -0,0 +1,16 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable UART
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/boards/adi/max32662evkit/doc/index.rst b/boards/adi/max32662evkit/doc/index.rst
index 249c6b4aeaf48..cc3d42c03a98f 100644
--- a/boards/adi/max32662evkit/doc/index.rst
+++ b/boards/adi/max32662evkit/doc/index.rst
@@ -75,39 +75,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32662EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -201,6 +169,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32662evkit/max32662evkit.dts b/boards/adi/max32662evkit/max32662evkit.dts
index 5f204b91bef5e..e8cdc4ddb947b 100644
--- a/boards/adi/max32662evkit/max32662evkit.dts
+++ b/boards/adi/max32662evkit/max32662evkit.dts
@@ -149,5 +149,5 @@
 	status = "okay";
 	pinctrl-0 = <&spi1a_mosi_p0_8 &spi1a_sck_p0_17>;
 	pinctrl-names = "default";
-	cs-gpios = <&gpio0 18 (GPIO_ACTIVE_LOW | MAX32_VSEL_VDDIOH)>;
+	cs-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
 };
diff --git a/boards/adi/max32666evkit/doc/index.rst b/boards/adi/max32666evkit/doc/index.rst
index 96b43693653f1..1569615621db3 100644
--- a/boards/adi/max32666evkit/doc/index.rst
+++ b/boards/adi/max32666evkit/doc/index.rst
@@ -86,40 +86,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32666EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -288,6 +255,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32666fthr/doc/index.rst b/boards/adi/max32666fthr/doc/index.rst
index b65325f380e9b..5136bf589866f 100644
--- a/boards/adi/max32666fthr/doc/index.rst
+++ b/boards/adi/max32666fthr/doc/index.rst
@@ -91,41 +91,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32666FTHR.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -208,6 +174,8 @@ JH4 Pinout
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.dts b/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.dts
index 02b45bda3db55..5aa45a1c5ce2a 100644
--- a/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.dts
+++ b/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.dts
@@ -55,6 +55,7 @@
 		led2 = &led3;
 		sw0 = &pb1;
 		watchdog0 = &wdt0;
+		sdhc0 = &sdhc0;
 	};
 
 	/* Used for accessing other pins */
@@ -134,3 +135,56 @@
 	pinctrl-0 = <&owm_io_p0_12>;
 	pinctrl-names = "default";
 };
+
+&sdhc0 {
+	pinctrl-0 = <&sdhc_dat3_p1_0 &sdhc_cmd_p1_1 &sdhc_dat0_p1_2 &sdhc_clk_p1_3
+		&sdhc_dat1_p1_4 &sdhc_dat2_p1_5	&sdhc_wp_p1_6 &sdhc_cdn_p1_7>;
+		pinctrl-names = "default";
+};
+
+&sdhc_dat3_p1_0 {
+	power-source = <MAX32_VSEL_VDDIO>;
+	drive-strength = <1>;
+};
+
+&sdhc_cmd_p1_1 {
+	power-source = <MAX32_VSEL_VDDIO>;
+	drive-strength = <1>;
+};
+
+&sdhc_dat0_p1_2 {
+	power-source = <MAX32_VSEL_VDDIOH>;
+	drive-strength = <1>;
+};
+
+&sdhc_clk_p1_3 {
+	power-source = <MAX32_VSEL_VDDIOH>;
+	drive-strength = <1>;
+};
+
+&sdhc_dat1_p1_4 {
+	power-source = <MAX32_VSEL_VDDIOH>;
+	drive-strength = <1>;
+};
+
+&sdhc_dat2_p1_5 {
+	power-source = <MAX32_VSEL_VDDIOH>;
+	drive-strength = <1>;
+};
+
+&sdhc_wp_p1_6 {
+	power-source = <MAX32_VSEL_VDDIOH>;
+	drive-strength = <1>;
+};
+
+&sdhc_cdn_p1_7 {
+	power-source = <MAX32_VSEL_VDDIOH>;
+	drive-strength = <1>;
+};
+
+&sdhc0 {
+	status = "okay";
+	mmc {
+		status = "okay";
+	};
+};
diff --git a/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.yaml b/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.yaml
index 71024815819aa..9b924a56a6d0c 100644
--- a/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.yaml
+++ b/boards/adi/max32666fthr/max32666fthr_max32666_cpu0.yaml
@@ -20,5 +20,6 @@ supported:
   - pwm
   - w1
   - flash
+  - sdhc
 ram: 560
 flash: 1024
diff --git a/boards/adi/max32670evkit/doc/index.rst b/boards/adi/max32670evkit/doc/index.rst
index 3fefd9e4119b2..4f5b57da3a675 100644
--- a/boards/adi/max32670evkit/doc/index.rst
+++ b/boards/adi/max32670evkit/doc/index.rst
@@ -84,37 +84,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32670EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -178,6 +148,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32672evkit/doc/index.rst b/boards/adi/max32672evkit/doc/index.rst
index b4b63a8550a72..745adcd8a7208 100644
--- a/boards/adi/max32672evkit/doc/index.rst
+++ b/boards/adi/max32672evkit/doc/index.rst
@@ -77,40 +77,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32672EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -312,11 +279,9 @@ The I2C ports can independently pulled up to V_AUX (3.3V default) through JP4 (I
 Programming and Debugging
 *************************
 
-The IC can be reset by pushbutton SW1.
-
+.. zephyr:board-supported-runners::
 
-Programming and Debugging
-*************************
+The IC can be reset by pushbutton SW1.
 
 Flashing
 ========
diff --git a/boards/adi/max32672evkit/max32672evkit.dts b/boards/adi/max32672evkit/max32672evkit.dts
index 581a9723c1dbe..737b2e3337099 100644
--- a/boards/adi/max32672evkit/max32672evkit.dts
+++ b/boards/adi/max32672evkit/max32672evkit.dts
@@ -154,7 +154,7 @@
 	status = "okay";
 	pinctrl-0 = <&spi0a_mosi_p0_3 &spi0a_miso_p0_2 &spi0a_sck_p0_4>;
 	pinctrl-names = "default";
-	cs-gpios = <&gpio0 5 (GPIO_ACTIVE_LOW | MAX32_VSEL_VDDIOH)>;
+	cs-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
 };
 
 &rtc_counter {
diff --git a/boards/adi/max32672fthr/doc/index.rst b/boards/adi/max32672fthr/doc/index.rst
index e4d387728f4e0..c772136a8bda0 100644
--- a/boards/adi/max32672fthr/doc/index.rst
+++ b/boards/adi/max32672fthr/doc/index.rst
@@ -83,40 +83,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32672FTHR.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -197,6 +164,8 @@ J7 Pinout
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32675evkit/doc/index.rst b/boards/adi/max32675evkit/doc/index.rst
index 4028d8bc8e43c..6c66e204e0cdb 100644
--- a/boards/adi/max32675evkit/doc/index.rst
+++ b/boards/adi/max32675evkit/doc/index.rst
@@ -68,33 +68,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32675EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -370,6 +344,8 @@ respectively. If the pushbutton is pressed, the attached port pin is pulled low.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32680evkit/doc/index.rst b/boards/adi/max32680evkit/doc/index.rst
index 10def1215cb8f..a3c7d909efdba 100644
--- a/boards/adi/max32680evkit/doc/index.rst
+++ b/boards/adi/max32680evkit/doc/index.rst
@@ -87,39 +87,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32680EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -136,9 +104,9 @@ Connections and IOs
 |           |               |               |                                                                                                  |
 +-----------+---------------+---------------+--------------------------------------------------------------------------------------------------+
 | JP2       | REF0P         | +-----------+ |  +-------------------------------------------------------------------------------+               |
-|           |               | | 2-1       | |  | Connects the external high-precision voltage refernce to REF0P.               |               |
+|           |               | | 2-1       | |  | Connects the external high-precision voltage reference to REF0P.              |               |
 |           |               | +-----------+ |  +-------------------------------------------------------------------------------+               |
-|           |               | | 2-3       | |  | Connects the internal voltage refernce to REF0P.                              |               |
+|           |               | | 2-3       | |  | Connects the internal voltage reference to REF0P.                             |               |
 |           |               | +-----------+ |  +-------------------------------------------------------------------------------+               |
 |           |               |               |                                                                                                  |
 +-----------+---------------+---------------+--------------------------------------------------------------------------------------------------+
@@ -164,9 +132,9 @@ Connections and IOs
 |           |               |               |                                                                                                  |
 +-----------+---------------+---------------+--------------------------------------------------------------------------------------------------+
 | JP6       | REF1P         | +-----------+ |  +-------------------------------------------------------------------------------+               |
-|           |               | | 2-1       | |  | Connects the external high-precision voltage refernce to REF1P.               |               |
+|           |               | | 2-1       | |  | Connects the external high-precision voltage reference to REF1P.              |               |
 |           |               | +-----------+ |  +-------------------------------------------------------------------------------+               |
-|           |               | | 2-3       | |  | Connects the internal voltage refernce to REF1P.                              |               |
+|           |               | | 2-3       | |  | Connects the internal voltage reference to REF1P.                             |               |
 |           |               | +-----------+ |  +-------------------------------------------------------------------------------+               |
 |           |               |               |                                                                                                  |
 +-----------+---------------+---------------+--------------------------------------------------------------------------------------------------+
@@ -319,6 +287,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32680evkit/max32680evkit_max32680_m4.dts b/boards/adi/max32680evkit/max32680evkit_max32680_m4.dts
index 4547da3459df6..d3459098a11af 100644
--- a/boards/adi/max32680evkit/max32680evkit_max32680_m4.dts
+++ b/boards/adi/max32680evkit/max32680evkit_max32680_m4.dts
@@ -163,7 +163,7 @@
 	status = "okay";
 	pinctrl-0 = <&spi0a_mosi_p0_5 &spi0a_miso_p0_6 &spi0a_sck_p0_7>;
 	pinctrl-names = "default";
-	cs-gpios = <&gpio0 4 (GPIO_ACTIVE_LOW | MAX32_VSEL_VDDIOH)>;
+	cs-gpios = <&gpio0 4 (GPIO_ACTIVE_LOW | MAX32_GPIO_VSEL_VDDIOH)>;
 };
 
 &w1 {
diff --git a/boards/adi/max32690evkit/doc/index.rst b/boards/adi/max32690evkit/doc/index.rst
index ab484d1e32e81..796bbeb18398f 100644
--- a/boards/adi/max32690evkit/doc/index.rst
+++ b/boards/adi/max32690evkit/doc/index.rst
@@ -91,42 +91,7 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32690EVKIT.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -276,6 +241,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max32690evkit/max32690evkit_max32690_m4.dts b/boards/adi/max32690evkit/max32690evkit_max32690_m4.dts
index d04a91852cdfb..132f29f304174 100644
--- a/boards/adi/max32690evkit/max32690evkit_max32690_m4.dts
+++ b/boards/adi/max32690evkit/max32690evkit_max32690_m4.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024 Analog Devices, Inc.
+ * Copyright (c) 2023-2025 Analog Devices, Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -167,3 +167,7 @@
 &rtc_counter {
 	status = "okay";
 };
+
+zephyr_udc0: &usbhs {
+	status = "okay";
+};
diff --git a/boards/adi/max32690evkit/max32690evkit_max32690_m4.yaml b/boards/adi/max32690evkit/max32690evkit_max32690_m4.yaml
index 150225890e2a8..8278d3fe168b0 100644
--- a/boards/adi/max32690evkit/max32690evkit_max32690_m4.yaml
+++ b/boards/adi/max32690evkit/max32690evkit_max32690_m4.yaml
@@ -20,5 +20,6 @@ supported:
   - pwm
   - w1
   - flash
+  - usbd
 ram: 1024
 flash: 3072
diff --git a/boards/adi/max32690fthr/doc/index.rst b/boards/adi/max32690fthr/doc/index.rst
index ad133537417d2..ffbc67d93207b 100644
--- a/boards/adi/max32690fthr/doc/index.rst
+++ b/boards/adi/max32690fthr/doc/index.rst
@@ -63,31 +63,13 @@ Hardware
 Supported Features
 ==================
 
-Below interfaces are supported by Zephyr on MAX32690FTHR.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max78000evkit/doc/img/max78000evkit_img1.webp b/boards/adi/max78000evkit/doc/img/max78000evkit.webp
similarity index 100%
rename from boards/adi/max78000evkit/doc/img/max78000evkit_img1.webp
rename to boards/adi/max78000evkit/doc/img/max78000evkit.webp
diff --git a/boards/adi/max78000evkit/doc/index.rst b/boards/adi/max78000evkit/doc/index.rst
index fb9c2fc8bcd8a..18986d881cf7e 100644
--- a/boards/adi/max78000evkit/doc/index.rst
+++ b/boards/adi/max78000evkit/doc/index.rst
@@ -11,10 +11,6 @@ to SPI bridge provides rapid access to onboard memory, allowing large networks o
 
 The Zephyr port is running on the MAX78000 MCU.
 
-.. image:: img/max78000evkit_img1.webp
-   :align: center
-   :alt: MAX78000 EVKIT
-
 Hardware
 ********
 
@@ -59,43 +55,7 @@ Hardware
 Supported Features
 ==================
 
-The ``max78000evkit/max78000/m4`` board target supports the following interfaces:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | real time clock                     |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+--------------------------------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -275,6 +235,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max78000evkit/max78000evkit_max78000_m4.yaml b/boards/adi/max78000evkit/max78000evkit_max78000_m4.yaml
index f974a60c9959b..5f7f522504112 100644
--- a/boards/adi/max78000evkit/max78000evkit_max78000_m4.yaml
+++ b/boards/adi/max78000evkit/max78000evkit_max78000_m4.yaml
@@ -6,7 +6,6 @@ arch: arm
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - adc
   - counter
diff --git a/boards/adi/max78000fthr/doc/img/max78000fthr_img1.webp b/boards/adi/max78000fthr/doc/img/max78000fthr.webp
similarity index 100%
rename from boards/adi/max78000fthr/doc/img/max78000fthr_img1.webp
rename to boards/adi/max78000fthr/doc/img/max78000fthr.webp
diff --git a/boards/adi/max78000fthr/doc/index.rst b/boards/adi/max78000fthr/doc/index.rst
index fee925ffae88f..1960a00257ed9 100644
--- a/boards/adi/max78000fthr/doc/index.rst
+++ b/boards/adi/max78000fthr/doc/index.rst
@@ -12,10 +12,6 @@ platform for quick proof-of-concepts and early software development to enhance t
 
 The Zephyr port is running on the MAX78000 MCU.
 
-.. image:: img/max78000fthr_img1.webp
-   :align: center
-   :alt: MAX78000 FTHR
-
 Hardware
 ********
 
@@ -60,43 +56,7 @@ Hardware
 Supported Features
 ==================
 
-The ``max78000fthr/max78000/m4`` board target supports the following interfaces:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | real time clock                     |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+--------------------------------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -178,6 +138,8 @@ J4 Pinout
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/max78000fthr/max78000fthr_max78000_m4.yaml b/boards/adi/max78000fthr/max78000fthr_max78000_m4.yaml
index f649928b1bacf..116fa9051c584 100644
--- a/boards/adi/max78000fthr/max78000fthr_max78000_m4.yaml
+++ b/boards/adi/max78000fthr/max78000fthr_max78000_m4.yaml
@@ -6,7 +6,6 @@ arch: arm
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - adc
   - counter
diff --git a/boards/adi/max78002evkit/doc/index.rst b/boards/adi/max78002evkit/doc/index.rst
index 9a9d11a930759..ffb55415bf43d 100644
--- a/boards/adi/max78002evkit/doc/index.rst
+++ b/boards/adi/max78002evkit/doc/index.rst
@@ -81,41 +81,7 @@ Hardware
 Supported Features
 ==================
 
-The ``max78002evkit/max78002/m4`` board target supports the following interfaces:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma controller                      |
-+-----------+------------+-------------------------------------+
-| Watchdog  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| Timer     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| W1        | on-chip    | one wire master                     |
-+-----------+------------+-------------------------------------+
-| Flash     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -442,6 +408,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/adi/sdp_k1/doc/index.rst b/boards/adi/sdp_k1/doc/index.rst
index 680852f53dd91..d684c53374c9e 100644
--- a/boards/adi/sdp_k1/doc/index.rst
+++ b/boards/adi/sdp_k1/doc/index.rst
@@ -65,23 +65,7 @@ More information about STM32F469NI can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f469i_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/adi/sdp_k1/adi_sdp_k1_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -119,6 +103,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The ADI SDP-K1 be programmed over USB using the DAPLink firmware running on an
 embedded NXP Freescale microcontroller or a 10-pin ``DEBUG`` header connected
 to a STLINK debugger.
diff --git a/boards/alientek/pandora_stm32l475/doc/index.rst b/boards/alientek/pandora_stm32l475/doc/index.rst
index d976ee7740f17..671570b64099b 100644
--- a/boards/alientek/pandora_stm32l475/doc/index.rst
+++ b/boards/alientek/pandora_stm32l475/doc/index.rst
@@ -85,44 +85,7 @@ The STM32L475VE SoC provides the following hardware features:
 Supported Features
 ==================
 
-The Zephyr stm32l475ve_pandora board configuration supports the following hardware features:
-
-+-----------+------------+----------------------------------------------+
-| Interface | Controller | Driver/Component                             |
-+===========+============+==============================================+
-| NVIC      | on-chip    | nested vector interrupt controller           |
-+-----------+------------+----------------------------------------------+
-| UART      | on-chip    | serial port-polling;                         |
-|           |            | serial port-interrupt                        |
-+-----------+------------+----------------------------------------------+
-| PINMUX    | on-chip    | pinmux                                       |
-+-----------+------------+----------------------------------------------+
-| GPIO      | on-chip    | gpio                                         |
-+-----------+------------+----------------------------------------------+
-| I2C       | on-chip    | I2C-AHT10(Temperature and humidity sensor)   |
-|           |            | I2C-ICM2068(light environment sensor)        |
-+-----------+------------+----------------------------------------------+
-| I2S       | on-chip    | I2S-ES8388(Audio Decoder)                    |
-+-----------+------------+----------------------------------------------+
-| USB       | on-chip    | I2S-OTG                                      |
-+-----------+------------+----------------------------------------------+
-| SDIO      | on-chip    | SDIO-AP6181(WIFI)                            |
-+-----------+------------+----------------------------------------------+
-| SPI       | on-chip    | LCD-TFT                                      |
-+-----------+------------+----------------------------------------------+
-| QSPI NOR  | on-chip    | flash                                        |
-+-----------+------------+----------------------------------------------+
-| IR-RX/TX  | on-board   | Infrared Receiver(38Khz)/Transmitter         |
-+-----------+------------+----------------------------------------------+
-| STLINK-V2 | on-board   | STLINK-V2 Debugger                           |
-+-----------+------------+----------------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/alientek/pandora_stm32l475/pandora_stm32l475_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -158,6 +121,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/altr/max10/doc/index.rst b/boards/altr/max10/doc/index.rst
index 0c16aa329e8e6..1e5064b0f0d7f 100644
--- a/boards/altr/max10/doc/index.rst
+++ b/boards/altr/max10/doc/index.rst
@@ -130,6 +130,8 @@ in the SDK:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/ambiq/apollo3_evb/apollo3_evb-pinctrl.dtsi b/boards/ambiq/apollo3_evb/apollo3_evb-pinctrl.dtsi
index 26cf5e58063ea..39db2783c37a9 100644
--- a/boards/ambiq/apollo3_evb/apollo3_evb-pinctrl.dtsi
+++ b/boards/ambiq/apollo3_evb/apollo3_evb-pinctrl.dtsi
@@ -125,7 +125,7 @@
 			pinmux = <NCE19_P19>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <0>;
+			ambiq,nce-src = <0>;
 			ambiq,iom-num = <6>;
 		};
 	};
diff --git a/boards/ambiq/apollo3_evb/apollo3_evb.dts b/boards/ambiq/apollo3_evb/apollo3_evb.dts
index bea88a5c3b91b..b6cf18bc1c6ad 100644
--- a/boards/ambiq/apollo3_evb/apollo3_evb.dts
+++ b/boards/ambiq/apollo3_evb/apollo3_evb.dts
@@ -139,21 +139,25 @@
 	status = "okay";
 };
 
-&spi0 {
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-names = "default";
-	cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
-	clock-frequency = <DT_FREQ_M(1)>;
-	status = "okay";
+&iom0 {
+	spi0: spi {
+		pinctrl-0 = <&spi0_default>;
+		pinctrl-names = "default";
+		cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
+		clock-frequency = <DT_FREQ_M(1)>;
+		status = "okay";
+	};
 };
 
-&i2c3 {
-	pinctrl-0 = <&i2c3_default>;
-	pinctrl-names = "default";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	scl-gpios = <&gpio32_63 10 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	sda-gpios = <&gpio32_63 11 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	status = "okay";
+&iom3 {
+	i2c3: i2c {
+		pinctrl-0 = <&i2c3_default>;
+		pinctrl-names = "default";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		scl-gpios = <&gpio32_63 10 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		sda-gpios = <&gpio32_63 11 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		status = "okay";
+	};
 };
 
 &counter0 {
diff --git a/boards/ambiq/apollo3_evb/apollo3_evb_connector.dtsi b/boards/ambiq/apollo3_evb/apollo3_evb_connector.dtsi
index 77e22c5bbb50c..7a6ad127efa21 100644
--- a/boards/ambiq/apollo3_evb/apollo3_evb_connector.dtsi
+++ b/boards/ambiq/apollo3_evb/apollo3_evb_connector.dtsi
@@ -63,5 +63,5 @@
 	};
 };
 
-ambiq_spi0: &spi0 {};
-ambiq_i2c3: &i2c3 {};
+ambiq_spi0: &iom0 {};
+ambiq_i2c3: &iom3 {};
diff --git a/boards/ambiq/apollo3_evb/doc/index.rst b/boards/ambiq/apollo3_evb/doc/index.rst
index 429d973d37810..c8d56b0443b48 100644
--- a/boards/ambiq/apollo3_evb/doc/index.rst
+++ b/boards/ambiq/apollo3_evb/doc/index.rst
@@ -21,34 +21,13 @@ For more information about the Apollo3 Blue SoC and Apollo3 Blue EVB board:
 Supported Features
 ==================
 
-The Apollo3 Blue EVB board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| STIMER    | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | bluetooth                           |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-``boards/arm/apollo3_evb/apollo3_evb_defconfig``.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 Flashing an application
 -----------------------
 
diff --git a/boards/ambiq/apollo3p_evb/apollo3p_evb-pinctrl.dtsi b/boards/ambiq/apollo3p_evb/apollo3p_evb-pinctrl.dtsi
index 3eea582a37248..f8821a4c2f83b 100644
--- a/boards/ambiq/apollo3p_evb/apollo3p_evb-pinctrl.dtsi
+++ b/boards/ambiq/apollo3p_evb/apollo3p_evb-pinctrl.dtsi
@@ -126,7 +126,7 @@
 			drive-push-pull;
 			drive-strength = "0.5";
 			ambiq,iom-mspi = <0>;
-			ambiq,iom-nce-module = <0>;
+			ambiq,nce-src = <0>;
 			ambiq,iom-num = <0>;
 		};
 	};
@@ -147,7 +147,7 @@
 			drive-push-pull;
 			drive-strength = "0.5";
 			ambiq,iom-mspi = <0>;
-			ambiq,iom-nce-module = <0>;
+			ambiq,nce-src = <0>;
 			ambiq,iom-num = <1>;
 		};
 	};
@@ -164,7 +164,7 @@
 			drive-push-pull;
 			drive-strength = "0.5";
 			ambiq,iom-mspi = <0>;
-			ambiq,iom-nce-module = <0>;
+			ambiq,nce-src = <0>;
 			ambiq,iom-num = <2>;
 		};
 	};
diff --git a/boards/ambiq/apollo3p_evb/apollo3p_evb.dts b/boards/ambiq/apollo3p_evb/apollo3p_evb.dts
index 56b9ec15fec9f..a40767bd37118 100644
--- a/boards/ambiq/apollo3p_evb/apollo3p_evb.dts
+++ b/boards/ambiq/apollo3p_evb/apollo3p_evb.dts
@@ -117,21 +117,25 @@
 	status = "okay";
 };
 
-&spi0 {
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-names = "default";
-	cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
-	clock-frequency = <DT_FREQ_M(1)>;
-	status = "okay";
+&iom0 {
+	spi0: spi {
+		pinctrl-0 = <&spi0_default>;
+		pinctrl-names = "default";
+		cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
+		clock-frequency = <DT_FREQ_M(1)>;
+		status = "okay";
+	};
 };
 
-&i2c3 {
-	pinctrl-0 = <&i2c3_default>;
-	pinctrl-names = "default";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	scl-gpios = <&gpio32_63 10 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	sda-gpios = <&gpio32_63 11 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	status = "okay";
+&iom3 {
+	i2c3: i2c {
+		pinctrl-0 = <&i2c3_default>;
+		pinctrl-names = "default";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		scl-gpios = <&gpio32_63 10 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		sda-gpios = <&gpio32_63 11 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		status = "okay";
+	};
 };
 
 &counter0 {
diff --git a/boards/ambiq/apollo3p_evb/apollo3p_evb_connector.dtsi b/boards/ambiq/apollo3p_evb/apollo3p_evb_connector.dtsi
index fc85edb4a6328..73b8d42e107d8 100644
--- a/boards/ambiq/apollo3p_evb/apollo3p_evb_connector.dtsi
+++ b/boards/ambiq/apollo3p_evb/apollo3p_evb_connector.dtsi
@@ -88,5 +88,5 @@
 	};
 };
 
-ambiq_spi0: &spi0 {};
-ambiq_i2c3: &i2c3 {};
+ambiq_spi0: &iom0 {};
+ambiq_i2c3: &iom3 {};
diff --git a/boards/ambiq/apollo3p_evb/doc/index.rst b/boards/ambiq/apollo3p_evb/doc/index.rst
index a5f848c4f2c2d..1aa477d785d3c 100644
--- a/boards/ambiq/apollo3p_evb/doc/index.rst
+++ b/boards/ambiq/apollo3p_evb/doc/index.rst
@@ -21,34 +21,13 @@ For more information about the Apollo3 Blue Plus SoC and Apollo3 Blue Plus EVB b
 Supported Features
 ==================
 
-The Apollo3 Blue Plus EVB board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| STIMER    | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | bluetooth                           |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-``boards/arm/apollo3p_evb/apollo3p_evb_defconfig``.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 Flashing an application
 -----------------------
 
diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
index 63595ffddbd57..2bcd67ff17ca2 100644
--- a/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
+++ b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
@@ -19,6 +19,9 @@ config MAIN_STACK_SIZE
 config BT_BUF_ACL_TX_COUNT
 	default 14
 
+config BT_BUF_EVT_RX_COUNT
+	default 15
+
 config BT_BUF_CMD_TX_SIZE
 	default $(UINT8_MAX)
 
diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi
index f8c20b0fad982..2cf596eadcd9f 100644
--- a/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi
+++ b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb-pinctrl.dtsi
@@ -128,7 +128,7 @@
 			pinmux = <NCE57_P57>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <32>;
+			ambiq,nce-src = <32>;
 		};
 	};
 	mspi1_default: mspi1_default{
@@ -141,7 +141,7 @@
 			pinmux = <NCE56_P56>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <34>;
+			ambiq,nce-src = <34>;
 		};
 	};
 	mspi2_default: mspi2_default{
@@ -154,7 +154,7 @@
 			pinmux = <NCE52_P52>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <36>;
+			ambiq,nce-src = <36>;
 		};
 	};
 
diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts
index 1a94e0e25cadd..a4e8fdd6b439c 100644
--- a/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts
+++ b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts
@@ -89,27 +89,33 @@
 	status = "okay";
 };
 
-&i2c0 {
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-names = "default";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	scl-gpios = <&gpio0_31 5 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	sda-gpios = <&gpio0_31 6 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	status = "okay";
+&iom0 {
+	i2c0: i2c {
+		pinctrl-0 = <&i2c0_default>;
+		pinctrl-names = "default";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		scl-gpios = <&gpio0_31 5 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		sda-gpios = <&gpio0_31 6 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		status = "okay";
+	};
 };
 
-&spi1 {
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-names = "default";
-	cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
-	clock-frequency = <DT_FREQ_M(1)>;
-	status = "okay";
+&iom1 {
+	spi1: spi {
+		pinctrl-0 = <&spi1_default>;
+		pinctrl-names = "default";
+		cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
+		clock-frequency = <DT_FREQ_M(1)>;
+		status = "okay";
+	};
 };
 
-&spi4 {
-	pinctrl-0 = <&spi4_default>;
-	pinctrl-names = "default";
-	status = "okay";
+&iom4 {
+	spi4: spi {
+		pinctrl-0 = <&spi4_default>;
+		pinctrl-names = "default";
+		status = "okay";
+	};
 };
 
 &mspi0 {
diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/doc/index.rst b/boards/ambiq/apollo4p_blue_kxr_evb/doc/index.rst
index 81158fba6dbf9..b6e891ef53f3b 100644
--- a/boards/ambiq/apollo4p_blue_kxr_evb/doc/index.rst
+++ b/boards/ambiq/apollo4p_blue_kxr_evb/doc/index.rst
@@ -23,40 +23,13 @@ For more information about the Apollo4 Blue Plus SoC and Apollo4 Blue Plus KXR E
 Supported Features
 ==================
 
-The Apollo4 Blue Plus KXR EVB board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| STIMER    | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C(M)    | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | bluetooth                           |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb_defconfig`
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 Flashing an application
 -----------------------
 
diff --git a/boards/ambiq/apollo4p_evb/apollo4p_evb-pinctrl.dtsi b/boards/ambiq/apollo4p_evb/apollo4p_evb-pinctrl.dtsi
index dbbb233485e9f..ccfdfd72974ef 100644
--- a/boards/ambiq/apollo4p_evb/apollo4p_evb-pinctrl.dtsi
+++ b/boards/ambiq/apollo4p_evb/apollo4p_evb-pinctrl.dtsi
@@ -142,7 +142,7 @@
 			pinmux = <NCE57_P57>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <32>;
+			ambiq,nce-src = <32>;
 		};
 	};
 	mspi1_default: mspi1_default{
@@ -155,7 +155,7 @@
 			pinmux = <NCE56_P56>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <34>;
+			ambiq,nce-src = <34>;
 		};
 	};
 	mspi2_default: mspi2_default{
@@ -168,7 +168,28 @@
 			pinmux = <NCE0_P0>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <36>;
+			ambiq,nce-src = <36>;
+		};
+	};
+	sdio0_default: sdio0_default {
+		group0 {
+			pinmux = <SDIF_DAT1_P85>,
+				 <SDIF_DAT3_P87>,
+				 <SDIF_DAT4_P79>,
+				 <SDIF_DAT5_P80>,
+				 <SDIF_DAT6_P81>,
+				 <SDIF_DAT7_P82>;
+				 drive-strength = "1.0";
+		};
+		group1 {
+			pinmux =
+				 <SDIF_DAT0_P84>,
+				 <SDIF_DAT2_P86>,
+				 <SDIF_CMD_P83>,
+				 <SDIF_CLKOUT_P88>;
+				 drive-strength = "1.0";
+				 bias-pull-up;
+				 ambiq,pull-up-ohms = <12000>;
 		};
 	};
 };
diff --git a/boards/ambiq/apollo4p_evb/apollo4p_evb.dts b/boards/ambiq/apollo4p_evb/apollo4p_evb.dts
index a37974d10b91e..cdac604591c0e 100644
--- a/boards/ambiq/apollo4p_evb/apollo4p_evb.dts
+++ b/boards/ambiq/apollo4p_evb/apollo4p_evb.dts
@@ -26,6 +26,7 @@
 		sw0 = &button0;
 		sw1 = &button1;
 		rtc = &rtc0;
+		sdhc0 = &sdio0;
 	};
 
 	leds {
@@ -94,21 +95,25 @@
 	status = "okay";
 };
 
-&iom0_i2c {
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-names = "default";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	scl-gpios = <&gpio0_31 5 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	sda-gpios = <&gpio0_31 6 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
-	status = "okay";
+&iom0 {
+	i2c0: i2c {
+		pinctrl-0 = <&i2c0_default>;
+		pinctrl-names = "default";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		scl-gpios = <&gpio0_31 5 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		sda-gpios = <&gpio0_31 6 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		status = "okay";
+	};
 };
 
-&iom1_spi {
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-names = "default";
-	cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
-	clock-frequency = <1000000>;
-	status = "okay";
+&iom1 {
+	spi1: spi {
+		pinctrl-0 = <&spi1_default>;
+		pinctrl-names = "default";
+		cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
+		clock-frequency = <1000000>;
+		status = "okay";
+	};
 };
 
 &mspi0 {
@@ -150,6 +155,19 @@
 	clk-source = <3>;
 };
 
+&sdio0 {
+	pinctrl-0 = <&sdio0_default>;
+	pinctrl-names = "default";
+	txdelay = <0>;
+	rxdelay = <0>;
+	status = "okay";
+	mmc {
+		compatible = "zephyr,mmc-disk";
+		disk-name = "SD2";
+		status = "okay";
+	};
+};
+
 zephyr_udc0: &usb {
 	vddusb33-gpios = <&gpio96_127 7 (GPIO_PULL_UP)>;
 	vddusb0p9-gpios = <&gpio96_127 5 (GPIO_PULL_UP)>;
diff --git a/boards/ambiq/apollo4p_evb/apollo4p_evb_connector.dtsi b/boards/ambiq/apollo4p_evb/apollo4p_evb_connector.dtsi
index e083db991e24d..690ed85437de7 100644
--- a/boards/ambiq/apollo4p_evb/apollo4p_evb_connector.dtsi
+++ b/boards/ambiq/apollo4p_evb/apollo4p_evb_connector.dtsi
@@ -118,4 +118,4 @@
 	};
 };
 
-spi1: &iom1_spi {};
+ambiq_spi1: &iom1 {};
diff --git a/boards/ambiq/apollo4p_evb/doc/index.rst b/boards/ambiq/apollo4p_evb/doc/index.rst
index d2cc43e5bb41a..ab8ccfd456a5b 100644
--- a/boards/ambiq/apollo4p_evb/doc/index.rst
+++ b/boards/ambiq/apollo4p_evb/doc/index.rst
@@ -22,36 +22,13 @@ For more information about the Apollo4 Plus SoC and Apollo4P EVB board:
 Supported Features
 ==================
 
-The Apollo4P EVB board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| STIMER    | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C(M)    | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/ambiq/apollo4p_evb/apollo4p_evb_defconfig`
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 Flashing an application
 -----------------------
 
diff --git a/boards/amd/acp_6_0_adsp/acp_6_0_acp_adsp.dts b/boards/amd/acp_6_0_adsp/acp_6_0_adsp.dts
similarity index 100%
rename from boards/amd/acp_6_0_adsp/acp_6_0_acp_adsp.dts
rename to boards/amd/acp_6_0_adsp/acp_6_0_adsp.dts
diff --git a/boards/amd/acp_6_0_adsp/doc/index.rst b/boards/amd/acp_6_0_adsp/doc/index.rst
index fcc9221eafc27..2812516f28ef7 100644
--- a/boards/amd/acp_6_0_adsp/doc/index.rst
+++ b/boards/amd/acp_6_0_adsp/doc/index.rst
@@ -26,15 +26,7 @@ Hardware
 Supported Features
 ==================
 
-The following hardware features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| I2S       | on-chip    | I2S controller                      |
-+-----------+------------+-------------------------------------+
-| DMIC(PDM) | on-chip    | PDM controller                      |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -77,6 +69,8 @@ The bottom three variables are specific to acp_6_0.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/amd/kv260_r5/doc/index.rst b/boards/amd/kv260_r5/doc/index.rst
index 9383dbd9df616..d939718e58aa4 100644
--- a/boards/amd/kv260_r5/doc/index.rst
+++ b/boards/amd/kv260_r5/doc/index.rst
@@ -19,20 +19,7 @@ Hardware
 Supported Features
 ==================
 
-The following hardware features are supported:
-
-+--------------+------------+----------------------+
-| Interface    | Controller | Driver/Component     |
-+==============+============+======================+
-| GIC          | on-chip    | generic interrupt    |
-|              |            | controller           |
-+--------------+------------+----------------------+
-| TTC          | on-chip    | system timer         |
-+--------------+------------+----------------------+
-| UART         | on-chip    | serial port          |
-+--------------+------------+----------------------+
-
-The kernel currently does not support other hardware features on this platform.
+.. zephyr:board-supported-hw::
 
 Devices
 ========
@@ -68,6 +55,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Currently the best way to run this sample is by loading it through remoteproc
 from the APU, running Linux, to the RPU, assuming the target board has a compatible
 Linux kernel.
diff --git a/boards/amd/kv260_r5/kv260_r5.dts b/boards/amd/kv260_r5/kv260_r5.dts
index 85fb1c2689179..53ec1923e5d0c 100644
--- a/boards/amd/kv260_r5/kv260_r5.dts
+++ b/boards/amd/kv260_r5/kv260_r5.dts
@@ -19,6 +19,17 @@
 		zephyr,shell-uart = &uart1;
 		zephyr,ocm = &ocm;
 	};
+
+	aliases {
+		eeprom-0 = &eeprom0;
+		eeprom-1 = &eeprom1;
+	};
+
+	i2c_ref_clk: i2c_ref_clk {
+		compatible = "fixed-clock";
+		clock-frequency = <100000000>;
+		#clock-cells = <0>;
+	};
 };
 
 &uart1 {
@@ -35,3 +46,29 @@
 &psgpio {
 	status = "okay";
 };
+
+&i2c1 {
+	status = "okay";
+	clocks = <&i2c_ref_clk>;
+	clock-frequency = <400000>;
+
+	eeprom0: eeprom@50 {
+		compatible = "st,24c64", "atmel,at24";
+		reg = <0x50>;
+		size = <DT_SIZE_K(8)>;
+		pagesize = <32>;
+		address-width = <16>;
+		timeout = <5>;
+		read-only;
+	};
+
+	eeprom1: eeprom@51 {
+		compatible = "st,24c64", "atmel,at24";
+		reg = <0x51>;
+		size = <DT_SIZE_K(8)>;
+		pagesize = <32>;
+		address-width = <16>;
+		timeout = <5>;
+		read-only;
+	};
+};
diff --git a/boards/amd/kv260_r5/kv260_r5.yaml b/boards/amd/kv260_r5/kv260_r5.yaml
index 9cc92025e91e2..aa13a0350d58b 100644
--- a/boards/amd/kv260_r5/kv260_r5.yaml
+++ b/boards/amd/kv260_r5/kv260_r5.yaml
@@ -5,6 +5,10 @@ toolchain:
   - zephyr
 ram: 65536
 flash: 32768
+supported:
+  - i2c
+  - eeprom
+  - gpio
 testing:
   ignore_tags:
     - net
diff --git a/boards/amd/kv260_r5/kv260_r5_defconfig b/boards/amd/kv260_r5/kv260_r5_defconfig
index 4b86de20d6b92..f1bfa8f670740 100644
--- a/boards/amd/kv260_r5/kv260_r5_defconfig
+++ b/boards/amd/kv260_r5/kv260_r5_defconfig
@@ -13,5 +13,9 @@ CONFIG_UART_CONSOLE=y
 # Enable serial port
 CONFIG_UART_XLNX_PS=y
 
+# Enable I2C, EEPROM
+CONFIG_I2C=y
+CONFIG_EEPROM=y
+
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_ARM_MPU=y
diff --git a/boards/amd/versalnet_rpu/Kconfig.versalnet_rpu b/boards/amd/versalnet_rpu/Kconfig.versalnet_rpu
new file mode 100644
index 0000000000000..192725829dbaa
--- /dev/null
+++ b/boards/amd/versalnet_rpu/Kconfig.versalnet_rpu
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config BOARD_VERSALNET_RPU
+	select SOC_AMD_VERSALNET_RPU
diff --git a/boards/amd/versalnet_rpu/board.cmake b/boards/amd/versalnet_rpu/board.cmake
new file mode 100644
index 0000000000000..a624cc396d3c9
--- /dev/null
+++ b/boards/amd/versalnet_rpu/board.cmake
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include(${ZEPHYR_BASE}/boards/common/xsdb.board.cmake)
diff --git a/boards/amd/versalnet_rpu/board.yml b/boards/amd/versalnet_rpu/board.yml
new file mode 100644
index 0000000000000..6135a69a6ab13
--- /dev/null
+++ b/boards/amd/versalnet_rpu/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: versalnet_rpu
+  full_name: Versal NET RPU development board
+  vendor: amd
+  socs:
+  - name: amd_versalnet_rpu
diff --git a/boards/amd/versalnet_rpu/doc/index.rst b/boards/amd/versalnet_rpu/doc/index.rst
new file mode 100644
index 0000000000000..35d3ea5f22df7
--- /dev/null
+++ b/boards/amd/versalnet_rpu/doc/index.rst
@@ -0,0 +1,75 @@
+.. zephyr:board:: versalnet_rpu
+
+Overview
+********
+This configuration provides support for the RPU(R52), real-time processing unit on Xilinx
+Versal Net SOC, it can operate as following:
+
+* Two independent R52 cores with their own TCMs (tightly coupled memories)
+* Or as a single dual lock step unit with the TCM.
+
+This processing unit is based on an ARM Cortex-R52 CPU, it also enables the following devices:
+
+* ARM GIC v3 Interrupt Controller
+* Global Timer Counter
+* SBSA UART
+
+Hardware
+********
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Devices
+========
+System Timer
+------------
+
+This board configuration uses a system timer tick frequency of 100 MHz.
+
+Serial Port
+-----------
+
+This board configuration uses a single serial communication channel with the
+on-chip UART0.
+
+Memories
+--------
+
+Although Flash, DDR and OCM memory regions are defined in the DTS file,
+all the code plus data of the application will be loaded in the sram0 region,
+which points to the DDR memory. The ocm0 memory area is currently available
+for usage, although nothing is placed there by default.
+
+Known Problems or Limitations
+==============================
+
+The following platform features are unsupported:
+
+* Only the first core of the R52 subsystem is supported.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Build and flash in the usual way. Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: versalnet_rpu
+   :goals: build flash
+
+You should see the following message on the console:
+
+.. code-block:: console
+
+   Hello World!
+
+
+References
+**********
+
+1. ARMv8-R Architecture Reference Manual (ARM DDI 0568A.c ID110520)
+2. Cortex-R52 and Cortex-R52F Technical Reference Manual (ARM DDI r1p4 100026_0104_01_en)
diff --git a/boards/amd/versalnet_rpu/support/xsdb.cfg b/boards/amd/versalnet_rpu/support/xsdb.cfg
new file mode 100644
index 0000000000000..087ed4c85c113
--- /dev/null
+++ b/boards/amd/versalnet_rpu/support/xsdb.cfg
@@ -0,0 +1,44 @@
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+proc load_image args  {
+	set elf_file [lindex $args 0]
+
+	if { [info exists ::env(HW_SERVER_URL)] } {
+		connect -url $::env(HW_SERVER_URL)
+	} else {
+		connect
+	}
+
+	after 100
+	targets -set -nocase -filter {name =~ "Versal*"}
+	after 100
+	rst -system
+	after 100
+
+	if { [info exists ::env(PDI_FILE_PATH)] } {
+		device program $::env(PDI_FILE_PATH)
+	} else {
+		puts "Error: env variable PDI_FILE_PATH is not set"
+		exit
+	}
+
+	after 100
+	targets -set -nocase -filter {name =~ "DPC"}
+	after 100
+	# Configure timestamp generator to run global timer gracefully
+	# Ideally these registers should be set from bootloader (cdo)
+	mwr -force 0xeb5b0000 0x1
+	mwr -force 0xeb5b0020 100000000
+	after 100
+
+	targets -set -nocase -filter {name =~ "*Cortex-R52 #0.0"}
+	rst -proc
+	after 100
+	dow -force $elf_file
+	con
+	exit
+}
+
+load_image {*}$argv
diff --git a/boards/amd/versalnet_rpu/versalnet_rpu.dts b/boards/amd/versalnet_rpu/versalnet_rpu.dts
new file mode 100644
index 0000000000000..73d034e20cb6a
--- /dev/null
+++ b/boards/amd/versalnet_rpu/versalnet_rpu.dts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <arm/xilinx/versalnet_r52.dtsi>
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,ocm = &ocm;
+	};
+};
+
+&cpu0 {
+	 clock-frequency = <100000000>;
+};
+
+&soc {
+	sram0: memory@0 {
+		compatible = "mmio-sram";
+		reg = <0x00000 DT_SIZE_M(2048)>;
+	};
+};
+
+&ocm {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <115200>;
+	clock-frequency = <100000000>;
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	clock-frequency = <100000000>;
+};
diff --git a/boards/amd/versalnet_rpu/versalnet_rpu.yaml b/boards/amd/versalnet_rpu/versalnet_rpu.yaml
new file mode 100644
index 0000000000000..eccdf0ae37b5d
--- /dev/null
+++ b/boards/amd/versalnet_rpu/versalnet_rpu.yaml
@@ -0,0 +1,10 @@
+identifier: versalnet_rpu
+name: AMD Development board for Versal NET RPU
+arch: arm
+toolchain:
+  - zephyr
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+vendor: amd
diff --git a/boards/amd/versalnet_rpu/versalnet_rpu_defconfig b/boards/amd/versalnet_rpu/versalnet_rpu_defconfig
new file mode 100644
index 0000000000000..4aec6a299f379
--- /dev/null
+++ b/boards/amd/versalnet_rpu/versalnet_rpu_defconfig
@@ -0,0 +1,9 @@
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable serial port
+CONFIG_UART_PL011=y
diff --git a/boards/andestech/adp_xc7k_ae350/doc/index.rst b/boards/andestech/adp_xc7k_ae350/doc/index.rst
index 3e290dd2f284b..42767445c55c7 100644
--- a/boards/andestech/adp_xc7k_ae350/doc/index.rst
+++ b/boards/andestech/adp_xc7k_ae350/doc/index.rst
@@ -1,7 +1,4 @@
-.. _adp_xc7k_ae350:
-
-Andes ADP-XC7K AE350
-####################
+.. zephyr:board:: adp_xc7k
 
 Overview
 ********
@@ -52,40 +49,7 @@ The ADP-XC7K AE350 platform provides following hardware components:
 Supported Features
 ==================
 
-The ``adp_xc7k/ae350`` board configuration supports the following hardware features:
-
-+----------------+------------+----------------------+
-| Interface      | Controller | Driver/Component     |
-+================+============+======================+
-| PLIC           | on-chip    | interrupt_controller |
-+----------------+------------+----------------------+
-| RISC-V Machine | on-chip    | timer                |
-| Timer          |            |                      |
-+----------------+------------+----------------------+
-| GPIO           | on-chip    | gpio                 |
-+----------------+------------+----------------------+
-| UART           | on-chip    | serial               |
-+----------------+------------+----------------------+
-| COUNTER        | on-chip    | counter              |
-+----------------+------------+----------------------+
-| SPI            | on-chip    | spi                  |
-+----------------+------------+----------------------+
-| I2C            | on-chip    | i2c                  |
-+----------------+------------+----------------------+
-| EEPROM         | on-chip    | eeprom               |
-+----------------+------------+----------------------+
-| FLASH          | on-chip    | flash                |
-+----------------+------------+----------------------+
-| HWINFO         | on-chip    | syscon               |
-+----------------+------------+----------------------+
-| MAILBOX        | on-chip    | mbox                 |
-+----------------+------------+----------------------+
-| DMA            | on-chip    | dma                  |
-+----------------+------------+----------------------+
-| WATCHDOG       | on-chip    | wdt                  |
-+----------------+------------+----------------------+
-
-Other hardware features are not supported yet.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -206,6 +170,8 @@ settings are 115200 8N1.
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 For debugging zephyr applications or burning them into a flash, you will need to
 connect Andes ICE from host computer to ADP-XC7K board and execute the
 Andes ICE management software, ICEman, on this host computer.
diff --git a/boards/antmicro/index.rst b/boards/antmicro/index.rst
index 34beaee93d25d..d7393218659c9 100644
--- a/boards/antmicro/index.rst
+++ b/boards/antmicro/index.rst
@@ -1,7 +1,7 @@
 .. _boards-antmicro:
 
 Antmicro
-###
+########
 
 .. toctree::
    :maxdepth: 1
diff --git a/boards/antmicro/myra_sip_baseboard/doc/index.rst b/boards/antmicro/myra_sip_baseboard/doc/index.rst
index ee33397e453de..0eb273c524557 100644
--- a/boards/antmicro/myra_sip_baseboard/doc/index.rst
+++ b/boards/antmicro/myra_sip_baseboard/doc/index.rst
@@ -116,48 +116,7 @@ Other board's peripherals:
 Supported Features
 ------------------
 
-The Zephyr ``myra_sip_baseboard`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling; serial         |
-|           |            | port-interrupt                      |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac controller                      |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-| NVS       | on-chip    | nvs                                 |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| FDCAN1    | on-chip    | can controller                      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 -------------------
@@ -213,6 +172,8 @@ settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``myra_sip_baseboard`` board target can be built and flashed in the usual way (see :ref:`build_an_application` and :ref:`application_run` for more details).
 
 Flashing
diff --git a/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.dts b/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.dts
index e2d011fddf01a..fc815cd352b82 100644
--- a/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.dts
+++ b/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.dts
@@ -55,6 +55,7 @@
 		volt-sensor0 = &vref;
 		volt-sensor1 = &vbat;
 		rtc = &rtc;
+		eeprom-0 = &mb85rs1mt;
 	};
 };
 
diff --git a/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.yaml b/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.yaml
index 5979e67fd174c..77fe8017c5d8a 100644
--- a/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.yaml
+++ b/boards/antmicro/myra_sip_baseboard/myra_sip_baseboard.yaml
@@ -19,6 +19,7 @@ supported:
   - can
   - rtc
   - sensors
+  - eeprom
 testing:
   timeout_multiplier: 3
   renode:
diff --git a/boards/arduino/due/arduino_due-pinctrl.dtsi b/boards/arduino/due/arduino_due-pinctrl.dtsi
index 08f369eed7dc2..410df4f7eea4a 100644
--- a/boards/arduino/due/arduino_due-pinctrl.dtsi
+++ b/boards/arduino/due/arduino_due-pinctrl.dtsi
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <dt-bindings/pinctrl/sam3XXh-pinctrl.h>
+#include <dt-bindings/pinctrl/sam3XXe-pinctrl.h>
 
 &pinctrl {
 	twi0_default: twi0_default {
@@ -53,10 +53,25 @@
 		};
 	};
 
+	spi0_default: spi0_default {
+		group1 {
+			pinmux = <PA25A_SPI0_MISO>,
+				 <PA26A_SPI0_MOSI>,
+				 <PA27A_SPI0_SPCK>;
+		};
+	};
+
 	pwm0_default: pwm0_default {
 		group1 {
 			pinmux = <PC4B_PWM_PWML1>,
 				 <PC5B_PWM_PWMH1>;
 		};
 	};
+
+	adc0_default: adc0_default {
+		group1 {
+			pinmux = <PA24X_ADC_AD6>,
+				 <PA16X_ADC_AD7>;
+		};
+	};
 };
diff --git a/boards/arduino/due/arduino_due.dts b/boards/arduino/due/arduino_due.dts
index bbfc92b110c7c..0e9c4693abe41 100644
--- a/boards/arduino/due/arduino_due.dts
+++ b/boards/arduino/due/arduino_due.dts
@@ -4,6 +4,7 @@
 
 #include <atmel/sam3x.dtsi>
 #include "arduino_due-pinctrl.dtsi"
+#include "arduino_r3_connector.dtsi"
 
 / {
 	model = "Arduino Due with an Atmel SAM3X8E SoC";
@@ -57,6 +58,13 @@
 	pinctrl-names = "default";
 };
 
+&spi0 {
+	status = "okay";
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-names = "default";
+	cs-gpios = <&pioa 28 GPIO_ACTIVE_LOW>;
+};
+
 &uart {
 	status = "okay";
 	current-speed = <115200>;
diff --git a/boards/arduino/due/arduino_due.yaml b/boards/arduino/due/arduino_due.yaml
index b8beeac60c925..12f9ba82ad431 100644
--- a/boards/arduino/due/arduino_due.yaml
+++ b/boards/arduino/due/arduino_due.yaml
@@ -8,6 +8,7 @@ toolchain:
 flash: 512
 ram: 96
 supported:
+  - adc
   - arduino_i2c
   - gpio
   - watchdog
diff --git a/boards/arduino/due/arduino_r3_connector.dtsi b/boards/arduino/due/arduino_r3_connector.dtsi
new file mode 100644
index 0000000000000..16fcfa2674fce
--- /dev/null
+++ b/boards/arduino/due/arduino_r3_connector.dtsi
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = < 0 0 &pioa 16 0>,	/* A0 */
+			   < 1 0 &pioa 24 0>,	/* A1 */
+			   < 2 0 &pioa 23 0>,	/* A2 */
+			   < 3 0 &pioa 22 0>,	/* A3 */
+			   < 4 0 &pioa  6 0>,	/* A4 */
+			   < 5 0 &pioa  4 0>,	/* A5 */
+			   < 6 0 &pioa  8 0>,	/* D0 */
+			   < 7 0 &pioa  9 0>,	/* D1 */
+			   < 8 0 &piob 25 0>,	/* D2 */
+			   < 9 0 &pioc 28 0>,	/* D3 */
+			   <10 0 &pioa 29 0>,	/* D4 */
+			   <11 0 &pioc 25 0>,	/* D5 */
+			   <12 0 &pioc 24 0>,	/* D6 */
+			   <13 0 &pioc 23 0>,	/* D7 */
+			   <14 0 &pioc 22 0>,	/* D8 */
+			   <15 0 &pioc 21 0>,	/* D9 */
+			   <16 0 &pioa 28 0>,	/* D10 */
+			   <17 0 &piod  7 0>,	/* D11 */
+			   <18 0 &piod  8 0>,	/* D12 */
+			   <19 0 &piob 27 0>,	/* D13 */
+			   <20 0 &pioa 17 0>,	/* D20 */
+			   <21 0 &pioa 18 0>;	/* D21 */
+	};
+};
diff --git a/boards/arduino/due/doc/index.rst b/boards/arduino/due/doc/index.rst
index e1eda346744cc..9bce2aa68e3bc 100644
--- a/boards/arduino/due/doc/index.rst
+++ b/boards/arduino/due/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_due:
-
-Arduino Due
-###########
+.. zephyr:board:: arduino_due
 
 Overview
 ********
@@ -23,41 +20,17 @@ the processor.
 .. note::
    This configuration is not supported by Arduino.
 
-.. image:: img/arduino_due.jpg
-     :align: center
-     :alt: Arduino Due
-
 Hardware
 ********
+
 Supported Features
 ==================
 
-The arduino_due board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| Watchdog  | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features are not currently supported by the Zephyr kernel.
+.. zephyr:board-supported-hw::
+
 See `Arduino Due website`_ and `Atmel SAM3X8E Datasheet`_ for a complete
 list of Arduino Due board hardware features.
 
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/arduino/due/arduino_due_defconfig`.
-
 .. note::
    For I2C, pull-up resistors are required for using SCL1 and SDA1 (near IO13).
 
@@ -131,6 +104,8 @@ default, is utilizing this controller.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts b/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts
index 5d6e0dd7d883c..7505ba0f2df7a 100644
--- a/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts
+++ b/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts
@@ -252,3 +252,9 @@ zephyr_udc0: &usbotg_fs {
 	pinctrl-0 = <&usb_otg_fs_dm_pa11 &usb_otg_fs_dp_pa12>;
 	pinctrl-names = "default";
 };
+
+/* alias used by display shields */
+zephyr_mipi_dsi: &mipi_dsi {};
+
+/* alias used by LCD display shields */
+zephyr_lcd_controller: &ltdc {};
diff --git a/boards/arduino/giga_r1/doc/index.rst b/boards/arduino/giga_r1/doc/index.rst
index 696844a71fabb..508f6363151cd 100644
--- a/boards/arduino/giga_r1/doc/index.rst
+++ b/boards/arduino/giga_r1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_giga_r1_board:
-
-Arduino GIGA R1 WiFi
-####################
+.. zephyr:board:: arduino_giga_r1
 
 Overview
 ********
@@ -22,10 +19,6 @@ The board features:
 - Audio jack
 - ATECC608A secure element
 
-.. image:: img/arduino_giga_r1.jpg
-     :align: center
-     :alt: Arduino GIGA R1 WiFi
-
 More information about the board, including the datasheet, pinout and
 schematics, can be found at the `Arduino GIGA website`_.
 
@@ -38,39 +31,7 @@ More information about STM32H747XIH6 can be found here:
 Supported Features
 ==================
 
-The current Zephyr ``arduino_giga_r1_m7`` board configuration supports the
-following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| IPM       | on-chip    | virtual mailbox based on HSEM       |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| QSPI      | on-chip    | QSPI flash                          |
-+-----------+------------+-------------------------------------+
-| RADIO     | Murata 1DX | WiFi and Bluetooth module           |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr port.
+.. zephyr:board-supported-hw::
 
 Fetch Binary Blobs
 ******************
@@ -102,6 +63,8 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``arduino_giga_r1`` board should be built per core target,
 using either ``arduino_giga_r1/stm32h747xx/m7`` or ``arduino_giga_r1/stm32h747xx/m4`` as the target.
 
diff --git a/boards/arduino/mkrzero/doc/index.rst b/boards/arduino/mkrzero/doc/index.rst
index b6f92d9693025..3e52815213177 100644
--- a/boards/arduino/mkrzero/doc/index.rst
+++ b/boards/arduino/mkrzero/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_mkrzero:
-
-Arduino MKR Zero
-####################
+.. zephyr:board:: arduino_mkrzero
 
 Overview
 ********
@@ -9,10 +6,6 @@ Overview
 The Arduino MKR Zero built with smaller MKR form factor and powered by Atmel's SAMD21 MCU.
 This board come with microSD card holder that allows you to play with music files with no extra hardware.
 
-.. image:: img/arduino_mkrzero.jpg
-     :align: center
-     :alt: Arduino MKR Zero
-
 Hardware
 ********
 
@@ -27,46 +20,7 @@ Hardware
 Supported Features
 ==================
 
-The arduino_mkrzero board configuration supports the following hardware
-features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| ADC       | on-chip    | Analog to digital converter              |
-+-----------+------------+------------------------------------------+
-| COUNTER   | on-chip    | Pulse counter                            |
-+-----------+------------+------------------------------------------+
-| DMA       | on-chip    | Direct memory access unit                |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| HWINFO    | on-chip    | Hardware info and serial number          |
-+-----------+------------+------------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| PWM       | on-chip    | Pulse Width Modulation                   |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| I2C       | on-chip    | Inter-Integrated Circuit ports           |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/arduino/mkrzero/arduino_mkrzero_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -124,6 +78,8 @@ Arduino MKR Zero, the DAC is available on pin A0.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Arduino MKR Zero ships the BOSSA compatible bootloader.  The
 bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/arduino/nano_33_ble/doc/index.rst b/boards/arduino/nano_33_ble/doc/index.rst
index 2b5ede0ea114f..753209f349dea 100644
--- a/boards/arduino/nano_33_ble/doc/index.rst
+++ b/boards/arduino/nano_33_ble/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_nano_33_ble:
-
-Arduino Nano 33 BLE (Sense)
-#################################
+.. zephyr:board:: arduino_nano_33_ble
 
 Overview
 ********
@@ -11,58 +8,13 @@ nRF52840 ARM Cortex-M4F CPU. Arduino sells 2 variants of the board, the
 plain `BLE`_ type and the `BLE Sense`_ type. The "Sense" variant is distinguished by
 the inclusion of more sensors, but otherwise both variants are the same.
 
-.. image:: img/arduino_nano_33_ble_sense.jpg
-     :align: center
-     :alt: Arduino Nano 33 BLE (Sense variant)
-
-The Sense variant of the board
-
 Hardware
 ********
 
 Supported Features
 ==================
 
-The package is configured to support the following hardware:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C0      | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| I2C1      | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-Notably, this includes the PDM (microphone) interface.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -77,6 +29,8 @@ as ``pull-up-gpios``.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board requires the Arduino variant of bossac. You will not
 be able to flash with the bossac included with the zephyr-sdk, or
 using shumatech's mainline build.
diff --git a/boards/arduino/nano_33_iot/doc/index.rst b/boards/arduino/nano_33_iot/doc/index.rst
index 419c02a5ceac3..14c76bc9e25e6 100644
--- a/boards/arduino/nano_33_iot/doc/index.rst
+++ b/boards/arduino/nano_33_iot/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_nano_33_iot:
-
-Arduino Nano 33 IOT
-###################
+.. zephyr:board:: arduino_nano_33_iot
 
 Overview
 ********
@@ -9,10 +6,6 @@ Overview
 The Arduino Nano 33 IOT is a small form factor development board with USB,
 Wifi, Bluetooth, a 6 axis IMU, and secure element.
 
-.. image:: img/nano_33_iot.jpg
-     :align: center
-     :alt: Arduino Nano 33 IOT
-
 Hardware
 ********
 
@@ -28,43 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The arduino_nano_33_iot board configuration supports the following hardware
-features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| ADC       | on-chip    | Analog to digital converter              |
-+-----------+------------+------------------------------------------+
-| COUNTER   | on-chip    | Pulse counter                            |
-+-----------+------------+------------------------------------------+
-| DMA       | on-chip    | Direct memory access unit                |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| HWINFO    | on-chip    | Hardware info and serial number          |
-+-----------+------------+------------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| PWM       | on-chip    | Pulse Width Modulation                   |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/arduino/nano_33_iot/arduino_nano_33_iot_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -109,6 +66,8 @@ serial port that echos characters back to the host PC.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Nano 33 IOT ships the BOSSA compatible UF2 bootloader.  The
 bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/arduino/nicla_sense_me/doc/index.rst b/boards/arduino/nicla_sense_me/doc/index.rst
index 1bf984f23f4fb..826fb2f42013f 100644
--- a/boards/arduino/nicla_sense_me/doc/index.rst
+++ b/boards/arduino/nicla_sense_me/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_nicla_sense_me:
-
-Arduino Nicla Sense ME
-######################
+.. zephyr:board:: arduino_nicla_sense_me
 
 Overview
 ********
@@ -10,12 +7,6 @@ nrf52832 ARM Cortex-M4F CPU. The board houses 4 low power industrial grade senso
 that can measure rotation, acceleration, pressure, humidity, temperature, air quality
 and CO2 levels.
 
-.. figure:: arduino_nicla_sense_me.jpg
-   :align: center
-   :alt: Arduino Nicla Sense ME
-
-   Arduino Nicla Sense ME (Credit: Arduino)
-
 Hardware
 ********
 
@@ -39,35 +30,7 @@ Hardware
 Supported Features
 ==================
 
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M/S)  | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth Low Energy |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -85,6 +48,8 @@ For more details please refer to the `datasheet`_, `full pinout`_ and the `schem
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``arduino_nicla_sense_me`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/arduino/nicla_vision/doc/index.rst b/boards/arduino/nicla_vision/doc/index.rst
index 73b2d7cd7337e..f9cc62c6ee17e 100644
--- a/boards/arduino/nicla_vision/doc/index.rst
+++ b/boards/arduino/nicla_vision/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_nicla_vision_board:
-
-Arduino Nicla Vision
-####################
+.. zephyr:board:: arduino_nicla_vision
 
 Overview
 ********
@@ -38,53 +35,7 @@ More information about STM32H747GAII6 can be found here:
 Supported Features
 ==================
 
-The current Zephyr ``arduino_nicla_vision/stm32h747xx/m7`` board configuration supports the
-following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DCMI      | on-chip    | Parallel Camera interface           |
-+-----------+------------+-------------------------------------+
-| IPM       | on-chip    | virtual mailbox based on HSEM       |
-+-----------+------------+-------------------------------------+
-| RADIO     | Murata 1DX | WiFi and Bluetooth module           |
-+-----------+------------+-------------------------------------+
-
-And the ``arduino_nicla_vision/stm32h747xx/m4`` has the following
-support from Zephyr:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr port.
+.. zephyr:board-supported-hw::
 
 Fetch Binary Blobs
 ******************
@@ -116,6 +67,8 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``arduino_nicla_vision`` board should be built per core target,
 using either ``arduino_nicla_vision/stm32h747xx/m7`` or ``arduino_nicla_vision/stm32h747xx/m4`` as the target.
 
diff --git a/boards/arduino/opta/arduino_opta_stm32h747xx_m7.dts b/boards/arduino/opta/arduino_opta_stm32h747xx_m7.dts
index d1b63e91e52cf..9580656581fb2 100644
--- a/boards/arduino/opta/arduino_opta_stm32h747xx_m7.dts
+++ b/boards/arduino/opta/arduino_opta_stm32h747xx_m7.dts
@@ -107,6 +107,8 @@ zephyr_udc0: &usbotg_fs {
 		&eth_txd0_pg13
 	>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 	status = "okay";
 };
 
@@ -115,9 +117,8 @@ zephyr_udc0: &usbotg_fs {
 	pinctrl-names = "default";
 	status = "okay";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
diff --git a/boards/arduino/opta/doc/index.rst b/boards/arduino/opta/doc/index.rst
index 8c6aa78848717..4b131659355d0 100644
--- a/boards/arduino/opta/doc/index.rst
+++ b/boards/arduino/opta/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_opta_m4_board:
-
-Arduino OPTA
-############
+.. zephyr:board:: arduino_opta
 
 Overview
 ********
@@ -31,10 +28,6 @@ Additionally, the device features:
 - 8 x analog inputs
 - 4 x isolated relay outputs
 
-.. image:: img/arduino_opta.jpeg
-     :align: center
-     :alt: ARDUINO-OPTA
-
 More information about the board can be found at the `ARDUINO-OPTA website`_.
 More information about STM32H747XIH6 can be found here:
 
@@ -45,55 +38,7 @@ More information about STM32H747XIH6 can be found here:
 Supported Features
 ==================
 
-The ``arduino_opta/stm32h747xx/m7`` board target
-supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| IPM       | on-chip    | virtual mailbox based on HSEM       |
-+-----------+------------+-------------------------------------+
-| USB       | on-board   | usb-fs                              |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-board   | eth                                 |
-+-----------+------------+-------------------------------------+
-| RS485     | on-board   | uart                                |
-+-----------+------------+-------------------------------------+
-
-The ``arduino_opta/stm32h747xx/m4`` board target
-supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| IPM       | on-chip    | virtual mailbox based on HSEM       |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration per core can be found in the defconfig files:
-:zephyr_file:`boards/arduino/opta/arduino_opta_stm32h747xx_m4_defconfig` and
-:zephyr_file:`boards/arduino/opta/arduino_opta_stm32h747xx_m7_defconfig`.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -153,6 +98,8 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``arduino_opta`` use the regular Zephyr build commands.
 See :ref:`build_an_application` for more information about application builds.
 
diff --git a/boards/arduino/opta/dts/bindings/gpio-power-switches.yaml b/boards/arduino/opta/dts/bindings/gpio-power-switches.yaml
index 580288b2382ae..8036df3c65e45 100644
--- a/boards/arduino/opta/dts/bindings/gpio-power-switches.yaml
+++ b/boards/arduino/opta/dts/bindings/gpio-power-switches.yaml
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  This allows to define a group of relays (like in the original Opta)
-  or other kinds of power switches controlled by a GPIO. Each power
-  switch is defined in a child node of the gpio-power-switches node.
+  Group of relays (like in the original Opta) or other kinds of power switches controlled by a GPIO.
+
+  Each power switch is defined in a child node of the gpio-power-switches node.
 
 compatible: "gpio-power-switches"
 
diff --git a/boards/arduino/portenta_h7/Kconfig.defconfig b/boards/arduino/portenta_h7/Kconfig.defconfig
index b2a4abd35e733..3a59127ffa711 100644
--- a/boards/arduino/portenta_h7/Kconfig.defconfig
+++ b/boards/arduino/portenta_h7/Kconfig.defconfig
@@ -5,6 +5,9 @@ if BOARD_ARDUINO_PORTENTA_H7
 
 if NETWORKING
 
+config REGULATOR
+	default y
+
 config NET_L2_ETHERNET
 	default y
 
diff --git a/boards/arduino/portenta_h7/arduino_portenta_h7-common.dtsi b/boards/arduino/portenta_h7/arduino_portenta_h7-common.dtsi
index 7a61e830e5267..d7489b77d261f 100644
--- a/boards/arduino/portenta_h7/arduino_portenta_h7-common.dtsi
+++ b/boards/arduino/portenta_h7/arduino_portenta_h7-common.dtsi
@@ -209,17 +209,33 @@
 	};
 };
 
+&rng {
+	status = "okay";
+};
+
 &mac {
 	pinctrl-0 = < &eth_ref_clk_pa1
-		      &eth_mdio_pa2
 		      &eth_crs_dv_pa7
-		      &eth_mdc_pc1
 		      &eth_rxd0_pc4
 		      &eth_rxd1_pc5
 		      &eth_tx_en_pg11
 		      &eth_txd1_pg12
 		      &eth_txd0_pg13 >;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+	status = "okay";
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 zephyr_udc0: &usbotg_hs {
diff --git a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7.dts b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7.dts
index 3a3745c5a7d57..001d8509059e2 100644
--- a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7.dts
+++ b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7.dts
@@ -86,6 +86,54 @@
 
 &i2c1 {
 	status = "okay";
+
+	pf1550: pmic@8 {
+		status = "okay";
+		reg = <0x8>;
+		compatible = "nxp,pf1550";
+
+		pmic_regulators: regulators {
+			status = "okay";
+			compatible = "nxp,pf1550-regulator";
+			pf1550_sw1: BUCK1 {
+				regulator-init-microvolt = <3000000>;
+				regulator-boot-on;
+			};
+			pf1550_sw2: BUCK2 {
+				regulator-init-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+			pf1550_sw3: BUCK3 {
+				regulator-init-microvolt = <3300000>;
+				regulator-init-microamp = <2000000>;
+				regulator-boot-on;
+			};
+			pf1550_ldo1: LDO1 {
+				regulator-init-microvolt = <1000000>;
+				regulator-boot-on;
+			};
+			pf1550_ldo2: LDO2 {
+				regulator-init-microvolt = <1800000>;
+				regulator-boot-on;
+			};
+			pf1550_ldo3: LDO3 {
+				regulator-init-microvolt = <1200000>;
+				regulator-boot-on;
+			};
+		};
+
+		pmic_charger: charger {
+			status = "okay";
+			compatible = "nxp,pf1550-charger";
+			constant-charge-current-max-microamp = <100000>;
+			constant-charge-voltage-max-microvolt = <4200000>;
+			pf1550,int-gpios = <&gpiok 0 0>;
+			pf1550,led-behaviour = "manual-off";
+			pf1550,system-voltage-min-threshold-microvolt = <3500000>;
+			pf1550,thermistor-monitoring-mode = "thermistor";
+			pf1550,vbus-current-limit-microamp = <1500000>;
+		};
+	};
 };
 
 /* Only one should be enabled */
diff --git a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7.yaml b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7.yaml
deleted file mode 100644
index e4179c6e5b9c6..0000000000000
--- a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-identifier: arduino_portenta_h7/stm32h747xx/m7
-name: Arduino Portenta H7 (M7)
-type: mcu
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-ram: 512
-flash: 1024
-supported:
-  - gpio
-vendor: arduino
diff --git a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_1_0_0.yaml b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_1_0_0.yaml
new file mode 100644
index 0000000000000..7dc36b141900d
--- /dev/null
+++ b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_1_0_0.yaml
@@ -0,0 +1,18 @@
+identifier: arduino_portenta_h7@1.0.0/stm32h747xx/m7
+name: Arduino Portenta H7 (M7) rev. 1.0.0
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 512
+flash: 1024
+supported:
+  - gpio
+  - netif:eth
+  - i2c
+  - spi
+  - qspi
+  - memc
+  - usb_device
+vendor: arduino
diff --git a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_4_10_0.yaml b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_4_10_0.yaml
new file mode 100644
index 0000000000000..456ae5871e3b0
--- /dev/null
+++ b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_4_10_0.yaml
@@ -0,0 +1,19 @@
+identifier: arduino_portenta_h7@4.10.0/stm32h747xx/m7
+name: Arduino Portenta H7 (M7) rev. 4.10.0
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 512
+flash: 1024
+supported:
+  - gpio
+  - netif:eth
+  - i2c
+  - spi
+  - qspi
+  - memc
+  - usb_cdc
+  - usb_device
+vendor: arduino
diff --git a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig
index acc978d70c986..a67b6f27c0017 100644
--- a/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig
+++ b/boards/arduino/portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Enable the internal SMPS regulator
-CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
+CONFIG_POWER_SUPPLY_SMPS_1V8_SUPPLIES_LDO=y
 
 # Enable GPIO
 CONFIG_GPIO=y
diff --git a/boards/arduino/portenta_h7/doc/index.rst b/boards/arduino/portenta_h7/doc/index.rst
index 2d1d167065e7a..85d3212a616b7 100644
--- a/boards/arduino/portenta_h7/doc/index.rst
+++ b/boards/arduino/portenta_h7/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_portenta_h7_board:
-
-Arduino Portenta H7
-###################
+.. zephyr:board:: arduino_portenta_h7
 
 Overview
 ********
@@ -19,12 +16,6 @@ Additionally, the board features:
 - USB OTG FS
 - 3 color user LEDs
 
-.. image:: img/arduino_portenta_h7.jpeg
-     :width: 500px
-     :align: center
-     :height: 325px
-     :alt: ARDUINO_PORTENTA_H7
-
 More information about the board can be found at the `ARDUINO_PORTENTA_H7 website`_.
 More information about STM32H747XIH6 can be found here:
 
@@ -35,40 +26,7 @@ More information about STM32H747XIH6 can be found here:
 Supported Features
 ==================
 
-The current Zephyr arduino_portenta_h7 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| IPM       | on-chip    | virtual mailbox based on HSEM       |
-+-----------+------------+-------------------------------------+
-| EXTFLASH  | on-chip    | qspi                                |
-+-----------+------------+-------------------------------------+
-| SDRAM     | on-chip    | sdram                               |
-+-----------+------------+-------------------------------------+
-| USB       | on-board   | usb-hs                              |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-board   | eth                                 |
-+-----------+------------+-------------------------------------+
-| RADIO     | Murata 1DX | WiFi and Bluetooth module           |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
+.. zephyr:board-supported-hw::
 
 The high precision low speed external (LSE) clock is only fully supported on
 boards with hardware revision 4.10 or greater. By default the internal source
@@ -108,7 +66,9 @@ two cores. This is done in 3 ways:
   to avoid potential concurrent access issues.
 
 Building and Flashing
-*************************
+*********************
+
+.. zephyr:board-supported-runners::
 
 Applications for the ``arduino_portenta_h7`` board should be built per core target,
 using either ``arduino_portenta_h7_m7`` or ``arduino_portenta_h7_m4`` as the target.
diff --git a/boards/arduino/uno_r4/Kconfig.arduino_uno_r4 b/boards/arduino/uno_r4/Kconfig.arduino_uno_r4
new file mode 100644
index 0000000000000..67a9f951d67f1
--- /dev/null
+++ b/boards/arduino/uno_r4/Kconfig.arduino_uno_r4
@@ -0,0 +1,5 @@
+# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ARDUINO_UNO_R4
+	select SOC_R7FA4M1AB3CFM
diff --git a/boards/arduino/uno_r4/Kconfig.arduino_uno_r4_minima b/boards/arduino/uno_r4/Kconfig.arduino_uno_r4_minima
deleted file mode 100644
index 2fae481238c0b..0000000000000
--- a/boards/arduino/uno_r4/Kconfig.arduino_uno_r4_minima
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_ARDUINO_UNO_R4_MINIMA
-	select SOC_R7FA4M1AB3CFM
diff --git a/boards/arduino/uno_r4/Kconfig.arduino_uno_r4_wifi b/boards/arduino/uno_r4/Kconfig.arduino_uno_r4_wifi
deleted file mode 100644
index 840ead804a420..0000000000000
--- a/boards/arduino/uno_r4/Kconfig.arduino_uno_r4_wifi
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2024 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_ARDUINO_UNO_R4_WIFI
-	select SOC_R7FA4M1AB3CFM
diff --git a/boards/arduino/uno_r4/arduino_uno_r4-pinctrl.dtsi b/boards/arduino/uno_r4/arduino_uno_r4-pinctrl.dtsi
new file mode 100644
index 0000000000000..b54c4d8cfbb61
--- /dev/null
+++ b/boards/arduino/uno_r4/arduino_uno_r4-pinctrl.dtsi
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci2_default: sci2_default {
+		group1 {
+			/* tx */
+			psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 2)>;
+			drive-strength = "medium";
+		};
+		group2 {
+			/* rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 1)>;
+		};
+	};
+
+	iic1_default: iic1_default {
+		group1 {
+			/* SCL1 SDA1 */
+			psels = <RA_PSEL(RA_PSEL_I2C, 1, 0)>,
+				<RA_PSEL(RA_PSEL_I2C, 1, 1)>;
+			drive-strength = "medium";
+		};
+	};
+
+	adc0_default: adc0_default {
+		group1 {
+			/* input */
+			psels = <RA_PSEL(RA_PSEL_ADC, 0,  9)>,
+				<RA_PSEL(RA_PSEL_ADC, 0,  0)>,
+				<RA_PSEL(RA_PSEL_ADC, 0,  1)>,
+				<RA_PSEL(RA_PSEL_ADC, 0,  2)>;
+			renesas,analog-enable;
+		};
+	};
+
+	pwm7_default: pwm7_default {
+		group1 {
+			/* GTIOC7A GTIOC7B */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 3, 4)>,
+				<RA_PSEL(RA_PSEL_GPT1, 3, 3)>;
+		};
+	};
+};
diff --git a/boards/arduino/uno_r4/arduino_uno_r4.dts b/boards/arduino/uno_r4/arduino_uno_r4.dts
new file mode 100644
index 0000000000000..09ce3664f1d95
--- /dev/null
+++ b/boards/arduino/uno_r4/arduino_uno_r4.dts
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <renesas/ra/ra4/r7fa4m1ab3cfm.dtsi>
+#include "arduino_uno_r4-pinctrl.dtsi"
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/adc/adc.h>
+
+/ {
+	model = "Arduino Uno R4 Board";
+	compatible = "renesas,ra4m1", "renesas,ra";
+
+	chosen {
+		zephyr,console = &uart2;
+		zephyr,shell-uart = &uart2;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,entropy = &trng;
+		zephyr,code-partition = &code_partition;
+	};
+};
+
+&sci2 {
+	status = "okay";
+	pinctrl-0 = <&sci2_default>;
+	pinctrl-names = "default";
+	interrupts = <0 1>, <1 1>, <2 1>, <3 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+
+	uart2: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
+&ioport1 {
+	status = "okay";
+};
+
+&adc0 {
+	status = "okay";
+	pinctrl-0 = <&adc0_default>;
+	pinctrl-names = "default";
+};
+
+&port_irq0 {
+	interrupts = <27 12>;
+	status = "okay";
+};
+
+&port_irq1 {
+	interrupts = <28 12>;
+	status = "okay";
+};
+
+&trng {
+	status = "okay";
+};
+
+&pwm7 {
+	pinctrl-0 = <&pwm7_default>;
+	pinctrl-names = "default";
+	interrupts = <8 1>, <9 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+};
+
+&iic1 {
+	pinctrl-0 = <&iic1_default>;
+	pinctrl-names = "default";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	clock-frequency = <DT_FREQ_M(1)>;
+	interrupts = <10 1>, <11 1>, <12 1>, <13 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "bootloader";
+			reg = <0x00000000 0x4000>;
+			read-only;
+		};
+
+		code_partition: partition@4000 {
+			label = "code";
+			reg = <0x4000 0x3C000>;
+			read-only;
+		};
+	};
+};
+
+&hoco {
+	status = "okay";
+	clock-frequency = <48000000>;
+};
+
+&pclkblock {
+	clocks = <&hoco>;
+};
+
+&iclk {
+	div = <1>;
+};
+
+&pclka {
+	div = <1>;
+};
+
+&pclkb {
+	div = <2>;
+};
+
+&pclkc {
+	div = <1>;
+};
+
+&pclkd {
+	div = <1>;
+};
+
+&fclk {
+	div = <2>;
+};
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_common.dtsi b/boards/arduino/uno_r4/arduino_uno_r4_common.dtsi
deleted file mode 100644
index f9fff37eaabfa..0000000000000
--- a/boards/arduino/uno_r4/arduino_uno_r4_common.dtsi
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <renesas/ra/r7fa4m1ab3cfm.dtsi>
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	model = "Arduino Uno R4 Board";
-	compatible = "renesas,r7fa4m1ab3cfm";
-
-	chosen {
-		zephyr,console = &uart2;
-		zephyr,shell-uart = &uart2;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &code_partition;
-	};
-};
-
-&sci2 {
-	status = "okay";
-	pinctrl-0 = <&sci2_default>;
-	pinctrl-names = "default";
-	uart2: uart {
-		current-speed = <115200>;
-		status = "okay";
-	};
-};
-
-&ioport1 {
-	status = "okay";
-};
-
-&flash0 {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@0 {
-			label = "bootloader";
-			reg = <0x00000000 0x4000>;
-			read-only;
-		};
-
-		code_partition: partition@4000 {
-			label = "code";
-			reg = <0x4000 0x3C000>;
-			read-only;
-		};
-	};
-};
-
-&fcu {
-	status = "okay";
-};
-
-&hoco {
-	status = "okay";
-	clock-frequency = <48000000>;
-};
-
-&pclkblock {
-	clocks = <&hoco>;
-};
-
-&iclk {
-	div = <1>;
-};
-
-&pclka {
-	div = <1>;
-};
-
-&pclkb {
-	div = <2>;
-};
-
-&pclkc {
-	div = <1>;
-};
-
-&pclkd {
-	div = <1>;
-};
-
-&fclk {
-	div = <2>;
-};
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_defconfig b/boards/arduino/uno_r4/arduino_uno_r4_defconfig
new file mode 100644
index 0000000000000..17e5527427464
--- /dev/null
+++ b/boards/arduino/uno_r4/arduino_uno_r4_defconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_minima-pinctrl.dtsi b/boards/arduino/uno_r4/arduino_uno_r4_minima-pinctrl.dtsi
index 863d9e6030af4..63940405a7d86 100644
--- a/boards/arduino/uno_r4/arduino_uno_r4_minima-pinctrl.dtsi
+++ b/boards/arduino/uno_r4/arduino_uno_r4_minima-pinctrl.dtsi
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
-
 &pinctrl {
-	sci2_default: sci2_default {
+	spi1_default: spi1_default {
 		group1 {
-			/* tx */
-			psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 2)>;
-			drive-strength = "medium";
-		};
-		group2 {
-			/* rx */
-			psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 1)>;
+			/* MOSI MISO RSPCK SSL */
+			psels = <RA_PSEL(RA_PSEL_SPI, 1,  9)>,
+				<RA_PSEL(RA_PSEL_SPI, 1, 10)>,
+				<RA_PSEL(RA_PSEL_SPI, 1, 11)>,
+				<RA_PSEL(RA_PSEL_SPI, 1, 12)>;
 		};
 	};
 };
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_minima.dts b/boards/arduino/uno_r4/arduino_uno_r4_minima.dts
deleted file mode 100644
index d80ca6d4f1fcd..0000000000000
--- a/boards/arduino/uno_r4/arduino_uno_r4_minima.dts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include "arduino_uno_r4_common.dtsi"
-#include "arduino_uno_r4_minima-pinctrl.dtsi"
-
-/ {
-	model = "Arduino Uno R4 Minima";
-
-	leds {
-		compatible = "gpio-leds";
-		led: led {
-			gpios = <&ioport1 11 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	aliases {
-		led0 = &led;
-	};
-
-	arduino_header: connector {
-		compatible = "arduino-header-r3";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map = <0 0 &ioport0 14 0>,   /* A0 */
-			   <1 0 &ioport0 0 0>,    /* A1 */
-			   <2 0 &ioport0 1 0>,    /* A2 */
-			   <3 0 &ioport0 2 0>,    /* A3 */
-			   <4 0 &ioport1 1 0>,    /* A4 */
-			   <5 0 &ioport1 0 0>,    /* A5 */
-			   <6 0 &ioport3 1 0>,    /* D0 */
-			   <7 0 &ioport3 2 0>,    /* D1 */
-			   <8 0 &ioport1 5 0>,    /* D2 */
-			   <9 0 &ioport1 4 0>,    /* D3 */
-			   <10 0 &ioport1 3 0>,   /* D4 */
-			   <11 0 &ioport1 2 0>,   /* D5 */
-			   <12 0 &ioport1 6 0>,   /* D6 */
-			   <13 0 &ioport1 7 0>,   /* D7 */
-			   <14 0 &ioport3 4 0>,   /* D8 */
-			   <15 0 &ioport3 3 0>,   /* D9 */
-			   <16 0 &ioport1 12 0>,  /* D10 */
-			   <17 0 &ioport1 9 0>,   /* D11 */
-			   <18 0 &ioport1 10 0>,  /* D12 */
-			   <19 0 &ioport1 11 0>,  /* D13 */
-			   <20 0 &ioport1 1 0>,   /* D14 */
-			   <21 0 &ioport1 0 0>;   /* D15 */
-	};
-};
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_minima.overlay b/boards/arduino/uno_r4/arduino_uno_r4_minima.overlay
new file mode 100644
index 0000000000000..504b159737234
--- /dev/null
+++ b/boards/arduino/uno_r4/arduino_uno_r4_minima.overlay
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "arduino_uno_r4_minima-pinctrl.dtsi"
+
+#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	model = "Arduino Uno R4 Minima";
+
+	leds {
+		compatible = "gpio-leds";
+		led: led {
+			gpios = <&arduino_header ARDUINO_HEADER_R3_D13 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	pwm_leds {
+		compatible = "pwm-leds";
+		status = "disabled";
+		pwm_led: pwm_led {
+			pwms = <&arduino_pwm ARDUINO_HEADER_R3_D13 PWM_MSEC(1) PWM_POLARITY_NORMAL>;
+			label = "PWM_LED";
+		};
+	};
+
+	aliases {
+		led0 = &led;
+		pwm-led0 = &pwm_led;
+	};
+
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <ARDUINO_HEADER_R3_A0 0 &ioport0 14 0>,
+			   <ARDUINO_HEADER_R3_A1 0 &ioport0 0 0>,
+			   <ARDUINO_HEADER_R3_A2 0 &ioport0 1 0>,
+			   <ARDUINO_HEADER_R3_A3 0 &ioport0 2 0>,
+			   <ARDUINO_HEADER_R3_A4 0 &ioport1 1 0>,
+			   <ARDUINO_HEADER_R3_A5 0 &ioport1 0 0>,
+			   <ARDUINO_HEADER_R3_D0 0 &ioport3 1 0>,
+			   <ARDUINO_HEADER_R3_D1 0 &ioport3 2 0>,
+			   <ARDUINO_HEADER_R3_D2 0 &ioport1 5 0>,
+			   <ARDUINO_HEADER_R3_D3 0 &ioport1 4 0>,
+			   <ARDUINO_HEADER_R3_D4 0 &ioport1 3 0>,
+			   <ARDUINO_HEADER_R3_D5 0 &ioport1 2 0>,
+			   <ARDUINO_HEADER_R3_D6 0 &ioport1 6 0>,
+			   <ARDUINO_HEADER_R3_D7 0 &ioport1 7 0>,
+			   <ARDUINO_HEADER_R3_D8 0 &ioport3 4 0>,
+			   <ARDUINO_HEADER_R3_D9 0 &ioport3 3 0>,
+			   <ARDUINO_HEADER_R3_D10 0 &ioport1 12 0>,
+			   <ARDUINO_HEADER_R3_D11 0 &ioport1 9 0>,
+			   <ARDUINO_HEADER_R3_D12 0 &ioport1 10 0>,
+			   <ARDUINO_HEADER_R3_D13 0 &ioport1 11 0>,
+			   <ARDUINO_HEADER_R3_D14 0 &ioport1 1 0>,
+			   <ARDUINO_HEADER_R3_D15 0 &ioport1 0 0>;
+	};
+
+	arduino_adc: analog-connector {
+		compatible = "arduino,uno-adc";
+		#io-channel-cells = <1>;
+		io-channel-map = <ARDUINO_HEADER_R3_A0 &adc0 9>,        /* P009 = CH09 */
+				 <ARDUINO_HEADER_R3_A1 &adc0 0>,        /* P000 = CH00 */
+				 <ARDUINO_HEADER_R3_A2 &adc0 1>,        /* P001 = CH01 */
+				 <ARDUINO_HEADER_R3_A3 &adc0 2>,        /* P002 = CH02 */
+				 <ARDUINO_HEADER_R3_A4 &adc0 21>,       /* P101 = CH21 */
+				 <ARDUINO_HEADER_R3_A5 &adc0 22>;       /* P100 = CH22 */
+	};
+
+	arduino_pwm: connector-pwm {
+		compatible = "arduino-header-pwm";
+		#pwm-cells = <3>;
+		pwm-map = <ARDUINO_HEADER_R3_D2 0 0 &pwm1 0 0 0>,       /* P105 = GPT1_A */
+			  <ARDUINO_HEADER_R3_D3 0 0 &pwm1 1 0 0>,       /* P104 = GPT1_B */
+			  <ARDUINO_HEADER_R3_D4 0 0 &pwm2 0 0 0>,       /* P103 = GPT2 A */
+			  <ARDUINO_HEADER_R3_D5 0 0 &pwm2 1 0 0>,       /* P102 = GPT2_B */
+			  <ARDUINO_HEADER_R3_D6 0 0 &pwm0 1 0 0>,       /* P106 = GPT0_B */
+			  <ARDUINO_HEADER_R3_D7 0 0 &pwm0 0 0 0>,       /* P107 = GPT0_A */
+			  <ARDUINO_HEADER_R3_D8 0 0 &pwm7 0 0 0>,       /* P304 = GPT7_A */
+			  <ARDUINO_HEADER_R3_D9 0 0 &pwm7 1 0 0>,       /* P303 = GPT7_B */
+			  <ARDUINO_HEADER_R3_D10 0 0 &pwm3 1 0 0>,      /* P112 = GPT3_B */
+			  <ARDUINO_HEADER_R3_D13 0 0 &pwm3 0 0 0>;      /* P111 = GPT3_A */
+		pwm-map-mask = <0xffffffff 0x0 0x0>;
+		pwm-map-pass-thru = <0x0 0xffffffff 0xffffffff>;
+	};
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-names = "default";
+	interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
+arduino_i2c: &iic1 {};
+arduino_spi: &spi1 {};
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_minima.yaml b/boards/arduino/uno_r4/arduino_uno_r4_minima.yaml
index b106de02aa7a8..7e60cd09528f8 100644
--- a/boards/arduino/uno_r4/arduino_uno_r4_minima.yaml
+++ b/boards/arduino/uno_r4/arduino_uno_r4_minima.yaml
@@ -1,4 +1,4 @@
-identifier: arduino_uno_r4_minima
+identifier: arduino_uno_r4@minima
 name: Arduino Uno R4 Minima
 type: mcu
 arch: arm
@@ -7,5 +7,8 @@ toolchain:
   - gnuarmemb
 ram: 32
 supported:
+  - adc
   - gpio
+  - pwm
+  - spi
   - uart
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_minima_defconfig b/boards/arduino/uno_r4/arduino_uno_r4_minima_defconfig
deleted file mode 100644
index 3c655ea376e89..0000000000000
--- a/boards/arduino/uno_r4/arduino_uno_r4_minima_defconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
-
-CONFIG_BUILD_OUTPUT_HEX=y
-
-# Enable UART driver
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-CONFIG_CLOCK_CONTROL=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_wifi-pinctrl.dtsi b/boards/arduino/uno_r4/arduino_uno_r4_wifi-pinctrl.dtsi
index 9add47e472363..47f94cc3a0eb9 100644
--- a/boards/arduino/uno_r4/arduino_uno_r4_wifi-pinctrl.dtsi
+++ b/boards/arduino/uno_r4/arduino_uno_r4_wifi-pinctrl.dtsi
@@ -4,18 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
-
 &pinctrl {
-	sci2_default: sci2_default {
+	iic0_default: iic0_default {
 		group1 {
-			/* tx */
-			psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 2)>;
+			/* SCL0 SDA0 */
+			psels = <RA_PSEL(RA_PSEL_I2C, 4, 0)>,
+				<RA_PSEL(RA_PSEL_I2C, 4, 1)>;
 			drive-strength = "medium";
 		};
-		group2 {
-			/* rx */
-			psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 1)>;
+	};
+
+	spi0_default: spi0_default {
+		group1 {
+			/* MOSI MISO RSPCK SSL */
+			psels = <RA_PSEL(RA_PSEL_SPI, 4, 11)>,
+				<RA_PSEL(RA_PSEL_SPI, 4, 10)>,
+				<RA_PSEL(RA_PSEL_SPI, 1,  2)>,
+				<RA_PSEL(RA_PSEL_SPI, 1,  3)>;
 		};
 	};
 };
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_wifi.dts b/boards/arduino/uno_r4/arduino_uno_r4_wifi.dts
deleted file mode 100644
index a3a2019990ebc..0000000000000
--- a/boards/arduino/uno_r4/arduino_uno_r4_wifi.dts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2024 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include "arduino_uno_r4_common.dtsi"
-#include "arduino_uno_r4_wifi-pinctrl.dtsi"
-
-/ {
-	model = "Arduino Uno R4 WiFi";
-
-	leds {
-		compatible = "gpio-leds";
-		led: led {
-			gpios = <&ioport1 2 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	aliases {
-		led0 = &led;
-	};
-
-	arduino_header: connector {
-		compatible = "arduino-header-r3";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map = <0 0 &ioport0 14 0>,   /* A0 */
-			   <1 0 &ioport0 0 0>,    /* A1 */
-			   <2 0 &ioport0 1 0>,    /* A2 */
-			   <3 0 &ioport0 2 0>,    /* A3 */
-			   <4 0 &ioport1 1 0>,    /* A4 */
-			   <5 0 &ioport1 0 0>,    /* A5 */
-			   <6 0 &ioport3 1 0>,    /* D0 */
-			   <7 0 &ioport3 2 0>,    /* D1 */
-			   <8 0 &ioport1 4 0>,    /* D2 */
-			   <9 0 &ioport1 5 0>,    /* D3 */
-			   <10 0 &ioport1 6 0>,   /* D4 */
-			   <11 0 &ioport1 7 0>,   /* D5 */
-			   <12 0 &ioport1 11 0>,  /* D6 */
-			   <13 0 &ioport1 12 0>,  /* D7 */
-			   <14 0 &ioport3 4 0>,   /* D8 */
-			   <15 0 &ioport3 3 0>,   /* D9 */
-			   <16 0 &ioport1 3 0>,   /* D10 */
-			   <17 0 &ioport4 11 0>,  /* D11 */
-			   <18 0 &ioport4 10 0>,  /* D12 */
-			   <19 0 &ioport1 2 0>,   /* D13 */
-			   <20 0 &ioport1 1 0>,   /* D14 */
-			   <21 0 &ioport1 0 0>;   /* D15 */
-	};
-};
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_wifi.overlay b/boards/arduino/uno_r4/arduino_uno_r4_wifi.overlay
new file mode 100644
index 0000000000000..f411487d080dc
--- /dev/null
+++ b/boards/arduino/uno_r4/arduino_uno_r4_wifi.overlay
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2024 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "arduino_uno_r4_wifi-pinctrl.dtsi"
+
+#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	model = "Arduino Uno R4 WiFi";
+
+	leds {
+		compatible = "gpio-leds";
+		led: led {
+			gpios = <&arduino_header ARDUINO_HEADER_R3_D13 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	pwm_leds {
+		compatible = "pwm-leds";
+		status = "disabled";
+		pwm_led: pwm_led {
+			pwms = <&arduino_pwm ARDUINO_HEADER_R3_D13 PWM_MSEC(1) PWM_POLARITY_NORMAL>;
+			label = "PWM_LED";
+		};
+	};
+
+	aliases {
+		led0 = &led;
+		pwm-led0 = &pwm_led;
+	};
+
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <ARDUINO_HEADER_R3_A0 0 &ioport0 14 0>,
+			   <ARDUINO_HEADER_R3_A1 0 &ioport0 0 0>,
+			   <ARDUINO_HEADER_R3_A2 0 &ioport0 1 0>,
+			   <ARDUINO_HEADER_R3_A3 0 &ioport0 2 0>,
+			   <ARDUINO_HEADER_R3_A4 0 &ioport1 1 0>,
+			   <ARDUINO_HEADER_R3_A5 0 &ioport1 0 0>,
+			   <ARDUINO_HEADER_R3_D0 0 &ioport3 1 0>,
+			   <ARDUINO_HEADER_R3_D1 0 &ioport3 2 0>,
+			   <ARDUINO_HEADER_R3_D2 0 &ioport1 4 0>,
+			   <ARDUINO_HEADER_R3_D3 0 &ioport1 5 0>,
+			   <ARDUINO_HEADER_R3_D4 0 &ioport1 6 0>,
+			   <ARDUINO_HEADER_R3_D5 0 &ioport1 7 0>,
+			   <ARDUINO_HEADER_R3_D6 0 &ioport1 11 0>,
+			   <ARDUINO_HEADER_R3_D7 0 &ioport1 12 0>,
+			   <ARDUINO_HEADER_R3_D8 0 &ioport3 4 0>,
+			   <ARDUINO_HEADER_R3_D9 0 &ioport3 3 0>,
+			   <ARDUINO_HEADER_R3_D10 0 &ioport1 3 0>,
+			   <ARDUINO_HEADER_R3_D11 0 &ioport4 11 0>,
+			   <ARDUINO_HEADER_R3_D12 0 &ioport4 10 0>,
+			   <ARDUINO_HEADER_R3_D13 0 &ioport1 2 0>,
+			   <ARDUINO_HEADER_R3_D14 0 &ioport1 1 0>,
+			   <ARDUINO_HEADER_R3_D15 0 &ioport1 0 0>;
+	};
+
+	arduino_adc: analog-connector {
+		compatible = "arduino,uno-adc";
+		#io-channel-cells = <1>;
+		io-channel-map = <ARDUINO_HEADER_R3_A0 &adc0 9>,        /* P009 = CH09 */
+				 <ARDUINO_HEADER_R3_A1 &adc0 0>,        /* P000 = CH00 */
+				 <ARDUINO_HEADER_R3_A2 &adc0 1>,        /* P001 = CH01 */
+				 <ARDUINO_HEADER_R3_A3 &adc0 2>,        /* P002 = CH02 */
+				 <ARDUINO_HEADER_R3_A4 &adc0 21>,       /* P101 = CH21 */
+				 <ARDUINO_HEADER_R3_A5 &adc0 22>;       /* P100 = CH22 */
+	};
+
+	arduino_pwm: connector-pwm {
+		compatible = "arduino-header-pwm";
+		#pwm-cells = <3>;
+		pwm-map = <ARDUINO_HEADER_R3_D2 0 0 &pwm1 1 0 0>,       /* P104 = GPT1_B */
+			  <ARDUINO_HEADER_R3_D3 0 0 &pwm1 0 0 0>,       /* P105 = GPT1_A */
+			  <ARDUINO_HEADER_R3_D4 0 0 &pwm0 1 0 0>,       /* P106 = GPT0 B */
+			  <ARDUINO_HEADER_R3_D5 0 0 &pwm0 0 0 0>,       /* P107 = GPT0_A */
+			  <ARDUINO_HEADER_R3_D6 0 0 &pwm3 0 0 0>,       /* P111 = GPT3_A */
+			  <ARDUINO_HEADER_R3_D7 0 0 &pwm3 1 0 0>,       /* P112 = GPT3_B */
+			  <ARDUINO_HEADER_R3_D8 0 0 &pwm7 0 0 0>,       /* P304 = GPT7_A */
+			  <ARDUINO_HEADER_R3_D9 0 0 &pwm7 1 0 0>,       /* P303 = GPT7_B */
+			  <ARDUINO_HEADER_R3_D10 0 0 &pwm2 0 0 0>,      /* P103 = GPT2_A */
+			  <ARDUINO_HEADER_R3_D11 0 0 &pwm6 0 0 0>,      /* P411 = GPT6_A */
+			  <ARDUINO_HEADER_R3_D12 0 0 &pwm6 1 0 0>,      /* P410 = GPT6_B */
+			  <ARDUINO_HEADER_R3_D13 0 0 &pwm2 1 0 0>;      /* P102 = GPT2_B */
+		pwm-map-mask = <0xffffffff 0x0 0x0>;
+		pwm-map-pass-thru = <0x0 0xffffffff 0xffffffff>;
+	};
+};
+
+&spi0 {
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-names = "default";
+	interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
+&iic0 {
+	pinctrl-0 = <&iic0_default>;
+	pinctrl-names = "default";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	clock-frequency = <DT_FREQ_M(1)>;
+	interrupts = <14 1>, <15 1>, <16 1>, <17 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
+qwiic_i2c: &iic0 {};
+arduino_i2c: &iic1 {};
+arduino_spi: &spi0 {};
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_wifi.yaml b/boards/arduino/uno_r4/arduino_uno_r4_wifi.yaml
index 30d3dfb89bc4e..e2e101e93abc0 100644
--- a/boards/arduino/uno_r4/arduino_uno_r4_wifi.yaml
+++ b/boards/arduino/uno_r4/arduino_uno_r4_wifi.yaml
@@ -1,4 +1,4 @@
-identifier: arduino_uno_r4_wifi
+identifier: arduino_uno_r4@wifi
 name: Arduino Uno R4 WiFi
 type: mcu
 arch: arm
@@ -7,5 +7,8 @@ toolchain:
   - gnuarmemb
 ram: 32
 supported:
+  - adc
   - gpio
+  - pwm
+  - spi
   - uart
diff --git a/boards/arduino/uno_r4/arduino_uno_r4_wifi_defconfig b/boards/arduino/uno_r4/arduino_uno_r4_wifi_defconfig
deleted file mode 100644
index 48137e86d7ac2..0000000000000
--- a/boards/arduino/uno_r4/arduino_uno_r4_wifi_defconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2024 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
-
-CONFIG_BUILD_OUTPUT_HEX=y
-
-# Enable UART driver
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable GPIO
-CONFIG_GPIO=y
-
-CONFIG_CLOCK_CONTROL=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
diff --git a/boards/arduino/uno_r4/board.yml b/boards/arduino/uno_r4/board.yml
index 9c168c300c223..ee0f51c47d4fd 100644
--- a/boards/arduino/uno_r4/board.yml
+++ b/boards/arduino/uno_r4/board.yml
@@ -1,11 +1,12 @@
-boards:
-  - name: arduino_uno_r4_minima
-    full_name: Arduino UNO R4 Minima
-    vendor: arduino
-    socs:
-      - name: r7fa4m1ab3cfm
-  - name: arduino_uno_r4_wifi
-    full_name: Arduino UNO R4 WiFi
-    vendor: arduino
-    socs:
-      - name: r7fa4m1ab3cfm
+board:
+  name: arduino_uno_r4
+  full_name: Arduino UNO R4 Minima/WiFi
+  vendor: arduino
+  revision:
+    format: custom
+    default: "minima"
+    revisions:
+      - name: "minima"
+      - name: "wifi"
+  socs:
+    - name: r7fa4m1ab3cfm
diff --git a/boards/arduino/uno_r4/doc/img/arduino_uno_r4_minima.webp b/boards/arduino/uno_r4/doc/img/arduino_uno_r4_minima.webp
new file mode 100644
index 0000000000000..c42a9e389e422
Binary files /dev/null and b/boards/arduino/uno_r4/doc/img/arduino_uno_r4_minima.webp differ
diff --git a/boards/arduino/uno_r4/doc/index.rst b/boards/arduino/uno_r4/doc/index.rst
index 1b2b28385bae4..71dcd0d94e487 100644
--- a/boards/arduino/uno_r4/doc/index.rst
+++ b/boards/arduino/uno_r4/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_uno_r4:
-
-Arduino UNO R4
-##############
+.. zephyr:board:: arduino_uno_r4
 
 Overview
 ********
@@ -23,20 +20,13 @@ Hardware
 Supported Features
 ==================
 
-The Arduino UNO R4 Minima/Wifi  board configuration supports the following
-hardware features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| UART      | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
+.. zephyr:board-supported-hw::
 
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Debug adapter
 =============
 
@@ -60,12 +50,12 @@ Here is an example for building and flashing the :zephyr:code-sample:`blinky` ap
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/blinky
-   :board: arduino_uno_r4_minima
+   :board: arduino_uno_r4@minima
    :goals: build flash
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/blinky
-   :board: arduino_uno_r4_wifi
+   :board: arduino_uno_r4@wifi
    :goals: build flash
 
 Debugging
@@ -77,13 +67,13 @@ Also, see the instructions specific to the debug server that you use.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/blinky
-   :board: arduino_uno_r4_minima
+   :board: arduino_uno_r4@minima
    :maybe-skip-config:
    :goals: debug
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/blinky
-   :board: arduino_uno_r4_wifi
+   :board: arduino_uno_r4@wifi
    :maybe-skip-config:
    :goals: debug
 
diff --git a/boards/arduino/uno_r4/revision.cmake b/boards/arduino/uno_r4/revision.cmake
new file mode 100644
index 0000000000000..f148e05dd0abb
--- /dev/null
+++ b/boards/arduino/uno_r4/revision.cmake
@@ -0,0 +1,8 @@
+set(BOARD_REVISIONS "minima" "wifi")
+if(NOT DEFINED BOARD_REVISION)
+  set(BOARD_REVISION "minima")
+else()
+  if(NOT BOARD_REVISION IN_LIST BOARD_REVISIONS)
+    message(FATAL_ERROR "${BOARD_REVISION} is not a valid revision for arduino_uno_r4. Accepted revisions: ${BOARD_REVISIONS}")
+  endif()
+endif()
diff --git a/boards/arduino/zero/doc/index.rst b/boards/arduino/zero/doc/index.rst
index 9e665aa75cd8e..150c864b3f950 100644
--- a/boards/arduino/zero/doc/index.rst
+++ b/boards/arduino/zero/doc/index.rst
@@ -1,7 +1,4 @@
-.. _arduino_zero:
-
-Arduino/Genuino Zero
-####################
+.. zephyr:board:: arduino_zero
 
 Overview
 ********
@@ -10,10 +7,6 @@ The Arduino Zero is a maker-friendly development board with
 Atmel’s Embedded Debugger (EDBG), which provides a full
 debug interface without the need for additional hardware.
 
-.. image:: img/arduino_zero.jpg
-     :align: center
-     :alt: Arduino Zero
-
 Hardware
 ********
 
@@ -28,37 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The arduino_zero board configuration supports the following hardware
-features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| NVIC      | on-chip    | nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| PWM       | on-chip    | Pulse Width Modulation                   |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| DAC       | on-chip    | Digital to analogue converter            |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/arduino/zero/arduino_zero_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -111,6 +74,8 @@ Arduino Zero, the DAC is available on pin A0.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Arduino Zero comes with a Atmel Embedded Debugger (EDBG).  This
 provides a debug interface to the SAMD21 chip and is supported by
 OpenOCD.
diff --git a/boards/arm/fvp_baser_aemv8r/doc/aarch32.rst b/boards/arm/fvp_baser_aemv8r/doc/aarch32.rst
index 8fcc4d07b0ec9..080d316e6b783 100644
--- a/boards/arm/fvp_baser_aemv8r/doc/aarch32.rst
+++ b/boards/arm/fvp_baser_aemv8r/doc/aarch32.rst
@@ -82,7 +82,7 @@ Arm FVP emulated environment, for example, with the :zephyr:code-sample:`synchro
 .. zephyr-app-commands::
    :zephyr-app: samples/synchronization
    :host-os: unix
-   :board: fvp_baser_aemv8r_aarch32
+   :board: fvp_baser_aemv8r/fvp_aemv8r_aarch32
    :goals: build
 
 This will build an image with the synchronization sample app.
diff --git a/boards/arm/fvp_baser_aemv8r/doc/aarch64.rst b/boards/arm/fvp_baser_aemv8r/doc/aarch64.rst
index 724ee182cc9a6..0f9a28d0a8107 100644
--- a/boards/arm/fvp_baser_aemv8r/doc/aarch64.rst
+++ b/boards/arm/fvp_baser_aemv8r/doc/aarch64.rst
@@ -91,7 +91,7 @@ Arm FVP emulated environment, for example, with the :zephyr:code-sample:`synchro
 .. zephyr-app-commands::
    :zephyr-app: samples/synchronization
    :host-os: unix
-   :board: fvp_baser_aemv8r
+   :board: fvp_baser_aemv8r/fvp_aemv8r_aarch64
    :goals: build
 
 This will build an image with the synchronization sample app.
diff --git a/boards/arm/mps2/CMakeLists.txt b/boards/arm/mps2/CMakeLists.txt
index 2f6cea861c66c..7a2209df8f894 100644
--- a/boards/arm/mps2/CMakeLists.txt
+++ b/boards/arm/mps2/CMakeLists.txt
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_library()
-zephyr_library_sources(pinmux.c)
-
 if(CONFIG_BOARD_MPS2_AN521_CPU1 AND NOT CONFIG_OPENAMP)
   # Building a firmware image for CPU1: this requires a binary
   # for CPU0, which will boot the device and wake up CPU1.
diff --git a/boards/arm/mps2/board.cmake b/boards/arm/mps2/board.cmake
index b52e1958cf4e2..98e34a997487b 100644
--- a/boards/arm/mps2/board.cmake
+++ b/boards/arm/mps2/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 
 if(CONFIG_BOARD_MPS2_AN385)
   set(SUPPORTED_EMU_PLATFORMS qemu armfvp)
@@ -48,6 +48,8 @@ elseif(CONFIG_BOARD_MPS2_AN521_CPU0 OR CONFIG_BOARD_MPS2_AN521_CPU0_NS OR CONFIG
     # TF-M (Secure) & Zephyr (Non Secure) image (when running
     # in-tree tests).
     set(QEMU_KERNEL_OPTION "-device;loader,file=${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
+
+    set(ARMFVP_FLAGS ${ARMFVP_FLAGS} -a ${APPLICATION_BINARY_DIR}/zephyr/tfm_merged.hex)
   elseif(CONFIG_OPENAMP)
     set(QEMU_EXTRA_FLAGS "-device;loader,file=${REMOTE_ZEPHYR_DIR}/zephyr.elf")
   elseif(CONFIG_BOARD_MPS2_AN521_CPU1)
diff --git a/boards/arm/mps2/mps2-pinctrl.dtsi b/boards/arm/mps2/mps2-pinctrl.dtsi
new file mode 100644
index 0000000000000..da259040e9754
--- /dev/null
+++ b/boards/arm/mps2/mps2-pinctrl.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-mps2-pinctrl.h>
+
+&pinctrl {
+	/omit-if-no-ref/  uart3_default: uart3_default {
+		group1 {
+			pinmux = <UART3_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART3_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	 /omit-if-no-ref/ uart4_default: uart4_default {
+		 group1 {
+			 pinmux = <UART4_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART4_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi0_default: spi0_default {
+		group1 {
+			pinmux = <SPI3_SCK_EXP>, <SPI3_SS_EXP>,
+				  <SPI3_MOSI_EXP>;
+		};
+		group2 {
+			pinmux = <SPI3_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi1_default: spi1_default {
+		group1 {
+			pinmux = <SPI4_SCK_EXP>, <SPI4_SS_EXP>,
+				 <SPI4_MOSI_EXP>;
+		};
+		group2 {
+			pinmux = <SPI4_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon0_default: sbcon0_default {
+		group1 {
+			pinmux = <SBCON2_SCL_EXP>, <SBCON2_SDA_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon1_default: sbcon1_default {
+		group1 {
+			pinmux = <SBCON3_SCL_EXP>, <SBCON3_SDA_EXP>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/arm/mps2/mps2_an383.yaml b/boards/arm/mps2/mps2_an383.yaml
index c7e2ae8ba3fb0..249225737754a 100644
--- a/boards/arm/mps2/mps2_an383.yaml
+++ b/boards/arm/mps2/mps2_an383.yaml
@@ -8,7 +8,6 @@ simulation:
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - counter
   - netif:serial-net
diff --git a/boards/arm/mps2/mps2_an386.yaml b/boards/arm/mps2/mps2_an386.yaml
index c241948ce498e..f71e166e683d4 100644
--- a/boards/arm/mps2/mps2_an386.yaml
+++ b/boards/arm/mps2/mps2_an386.yaml
@@ -8,7 +8,6 @@ simulation:
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - counter
   - gpio
diff --git a/boards/arm/mps2/mps2_an500.yaml b/boards/arm/mps2/mps2_an500.yaml
index 243fc64083df2..cc4c713d799f9 100644
--- a/boards/arm/mps2/mps2_an500.yaml
+++ b/boards/arm/mps2/mps2_an500.yaml
@@ -8,7 +8,6 @@ simulation:
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - counter
   - gpio
diff --git a/boards/arm/mps2/mps2_an521-common.dtsi b/boards/arm/mps2/mps2_an521-common.dtsi
index 5b1959ff5fe38..b96f1144982a1 100644
--- a/boards/arm/mps2/mps2_an521-common.dtsi
+++ b/boards/arm/mps2/mps2_an521-common.dtsi
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Linaro Limited
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -112,6 +113,8 @@ uart3: uart@203000 {
 	interrupt-names = "tx", "rx";
 	clocks = <&sysclk>;
 	current-speed = <115200>;
+	pinctrl-0 = <&uart3_default>;
+	pinctrl-names = "default";
 };
 
 uart4: uart@204000 {
@@ -121,6 +124,8 @@ uart4: uart@204000 {
 	interrupt-names = "tx", "rx";
 	clocks = <&sysclk>;
 	current-speed = <115200>;
+	pinctrl-0 = <&uart4_default>;
+	pinctrl-names = "default";
 };
 
 i2c_touch: i2c@207000 {
@@ -145,6 +150,8 @@ i2c_shield0: i2c@20c000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x20c000 0x1000>;
+	pinctrl-0 = <&sbcon0_default>;
+	pinctrl-names = "default";
 };
 
 i2c_shield1: i2c@20d000 {
@@ -153,10 +160,12 @@ i2c_shield1: i2c@20d000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x20d000 0x1000>;
+	pinctrl-0 = <&sbcon1_default>;
+	pinctrl-names = "default";
 };
 
 gpio_led0: mps2_fpgaio@302000 {
-	compatible = "arm,mps2-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x302000 0x4>;
 	gpio-controller;
@@ -165,16 +174,17 @@ gpio_led0: mps2_fpgaio@302000 {
 };
 
 gpio_button: mps2_fpgaio@302008 {
-	compatible = "arm,mps2-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x302008 0x4>;
 	gpio-controller;
 	#gpio-cells = <1>;
 	ngpios = <2>;
+	direction-input;
 };
 
 gpio_misc: mps2_fpgaio@30204c {
-	compatible = "arm,mps2-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x30204c 0x4>;
 	gpio-controller;
@@ -189,3 +199,8 @@ eth0: eth@2000000 {
 	reg = <0x2000000 0x100000>;
 	interrupts = <48 3>;
 };
+
+pinctrl: pinctrl {
+	compatible = "arm,mps2-pinctrl";
+	status = "okay";
+};
diff --git a/boards/arm/mps2/mps2_an521_cpu0.dts b/boards/arm/mps2/mps2_an521_cpu0.dts
index 2bb956645cafa..532384377da5e 100644
--- a/boards/arm/mps2/mps2_an521_cpu0.dts
+++ b/boards/arm/mps2/mps2_an521_cpu0.dts
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2019 Linaro Limited
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -128,3 +129,5 @@
 &uart1 {
 	status = "okay";
 };
+
+#include "mps2-pinctrl.dtsi"
diff --git a/boards/arm/mps2/mps2_an521_cpu0.yaml b/boards/arm/mps2/mps2_an521_cpu0.yaml
index 2e73e6b113abc..e511285c190f4 100644
--- a/boards/arm/mps2/mps2_an521_cpu0.yaml
+++ b/boards/arm/mps2/mps2_an521_cpu0.yaml
@@ -15,7 +15,6 @@ supported:
 testing:
   default: true
   ignore_tags:
-    - drivers
     - bluetooth
     - net
     - timer
diff --git a/boards/arm/mps2/mps2_an521_cpu0_ns.dts b/boards/arm/mps2/mps2_an521_cpu0_ns.dts
index e2b24cd9ba571..d67718fcc59af 100644
--- a/boards/arm/mps2/mps2_an521_cpu0_ns.dts
+++ b/boards/arm/mps2/mps2_an521_cpu0_ns.dts
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2019 Linaro Limited
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -142,3 +143,4 @@
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
+#include "mps2-pinctrl.dtsi"
diff --git a/boards/arm/mps2/mps2_an521_cpu1.dts b/boards/arm/mps2/mps2_an521_cpu1.dts
index 311694ca39997..24b39b50978b2 100644
--- a/boards/arm/mps2/mps2_an521_cpu1.dts
+++ b/boards/arm/mps2/mps2_an521_cpu1.dts
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2019 Linaro Limited
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -144,3 +145,5 @@
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
+
+#include "mps2-pinctrl.dtsi"
diff --git a/boards/arm/mps2/mps2_base.dtsi b/boards/arm/mps2/mps2_base.dtsi
index 4d8106aa9126b..021373fac43a1 100644
--- a/boards/arm/mps2/mps2_base.dtsi
+++ b/boards/arm/mps2/mps2_base.dtsi
@@ -1,4 +1,4 @@
-/* Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com> */
+/* Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com> */
 /* SPDX-License-Identifier: Apache-2.0 */
 
 / {
@@ -145,6 +145,8 @@
 			interrupt-names = "tx", "rx";
 			clocks = <&sysclk>;
 			current-speed = <115200>;
+			pinctrl-0 = <&uart3_default>;
+			pinctrl-names = "default";
 		};
 
 		wdog0: wdog@40008000 {
@@ -160,6 +162,8 @@
 			interrupt-names = "tx", "rx";
 			clocks = <&sysclk>;
 			current-speed = <115200>;
+			pinctrl-0 = <&uart4_default>;
+			pinctrl-names = "default";
 		};
 
 		gpio0: gpio@40010000 {
@@ -225,6 +229,8 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x40029000 0x1000>;
+			pinctrl-0 = <&sbcon0_default>;
+			pinctrl-names = "default";
 		};
 
 		i2c_shield1: i2c@4002a000 {
@@ -233,10 +239,12 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x4002a000 0x1000>;
+			pinctrl-0 = <&sbcon1_default>;
+			pinctrl-names = "default";
 		};
 
 		gpio_led0: mps2_fpgaio@40028000 {
-			compatible = "arm,mps2-fpgaio-gpio";
+			compatible = "arm,mmio32-gpio";
 			reg = <0x40028000 0x4>;
 			gpio-controller;
 			#gpio-cells = <1>;
@@ -244,23 +252,31 @@
 		};
 
 		gpio_button: mps2_fpgaio@40028008 {
-			compatible = "arm,mps2-fpgaio-gpio";
+			compatible = "arm,mmio32-gpio";
 			reg = <0x40028008 0x4>;
 			gpio-controller;
 			#gpio-cells = <1>;
 			ngpios = <2>;
+			direction-input;
 		};
 
 		gpio_misc: mps2_fpgaio@4002804c {
-			compatible = "arm,mps2-fpgaio-gpio";
+			compatible = "arm,mmio32-gpio";
 			reg = <0x4002804c 0x4>;
 			gpio-controller;
 			#gpio-cells = <1>;
 			ngpios = <10>;
 		};
 	};
+
+	pinctrl: pinctrl {
+		compatible = "arm,mps2-pinctrl";
+		status = "okay";
+	};
 };
 
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
+
+#include "mps2-pinctrl.dtsi"
diff --git a/boards/arm/mps2/pinmux.c b/boards/arm/mps2/pinmux.c
deleted file mode 100644
index 6cf9398307286..0000000000000
--- a/boards/arm/mps2/pinmux.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2016 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/device.h>
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <soc.h>
-#include <zephyr/sys/sys_io.h>
-#include <zephyr/drivers/gpio/gpio_cmsdk_ahb.h>
-
-/**
- * @brief Pinmux driver for ARM MPS2 AN385 Board
- *
- * The ARM MPS2 AN385 Board has 4 GPIO controllers. These controllers
- * are responsible for pin muxing, input/output, pull-up, etc.
- *
- * All GPIO controller pins are exposed via the following sequence of pin
- * numbers:
- *   Pins  0 -  15 are for GPIO0
- *   Pins 16 -  31 are for GPIO1
- *   Pins 32 -  47 are for GPIO2
- *   Pins 48 -  51 are for GPIO3
- *
- * For the GPIO controllers configuration ARM MPS2 AN385 Board follows the
- * Arduino compliant pin out.
- */
-
-#define CMSDK_AHB_GPIO0_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio0)))
-#define CMSDK_AHB_GPIO1_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio1)))
-#define CMSDK_AHB_GPIO2_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio2)))
-#define CMSDK_AHB_GPIO3_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio3)))
-
-/*
- * This is the mapping from the ARM MPS2 AN385 Board pins to GPIO
- * controllers.
- *
- * D0 : EXT_0
- * D1 : EXT_4
- * D2 : EXT_2
- * D3 : EXT_3
- * D4 : EXT_1
- * D5 : EXT_6
- * D6 : EXT_7
- * D7 : EXT_8
- * D8 : EXT_9
- * D9 : EXT_10
- * D10 : EXT_12
- * D11 : EXT_13
- * D12 : EXT_14
- * D13 : EXT_11
- * D14 : EXT_15
- * D15 : EXT_5
- * D16 : EXT_16
- * D17 : EXT_17
- * D18 : EXT_18
- * D19 : EXT_19
- * D20 : EXT_20
- * D21 : EXT_21
- * D22 : EXT_22
- * D23 : EXT_23
- * D24 : EXT_24
- * D25 : EXT_25
- * D26 : EXT_26
- * D27 : EXT_30
- * D28 : EXT_28
- * D29 : EXT_29
- * D30 : EXT_27
- * D31 : EXT_32
- * D32 : EXT_33
- * D33 : EXT_34
- * D34 : EXT_35
- * D35 : EXT_36
- * D36 : EXT_38
- * D37 : EXT_39
- * D38 : EXT_40
- * D39 : EXT_44
- * D40 : EXT_41
- * D41 : EXT_31
- * D42 : EXT_37
- * D43 : EXT_42
- * D44 : EXT_43
- * D45 : EXT_45
- * D46 : EXT_46
- * D47 : EXT_47
- * D48 : EXT_48
- * D49 : EXT_49
- * D50 : EXT_50
- * D51 : EXT_51
- *
- * UART_3_RX : D0
- * UART_3_TX : D1
- * SPI_3_CS : D10
- * SPI_3_MOSI : D11
- * SPI_3_MISO : D12
- * SPI_3_SCLK : D13
- * I2C_3_SDA : D14
- * I2C_3_SCL : D15
- * UART_4_RX : D26
- * UART_4_TX : D30
- * SPI_4_CS : D36
- * SPI_4_MOSI : D37
- * SPI_4_MISO : D38
- * SPI_4_SCK : D39
- * I2C_4_SDA : D40
- * I2C_4_SCL : D41
- *
- */
-static void arm_mps2_pinmux_defaults(void)
-{
-	uint32_t gpio_0 = 0U;
-	uint32_t gpio_1 = 0U;
-	uint32_t gpio_2 = 0U;
-
-	/* Set GPIO Alternate Functions */
-
-	gpio_0 = (1<<0)   /* Shield 0 UART 3 RXD */
-	       | (1<<4)   /* Shield 0 UART 3 TXD */
-	       | (1<<5)   /* Shield 0 I2C SCL SBCON2 */
-	       | (1<<15)  /* Shield 0 I2C SDA SBCON2 */
-	       | (1<<11)  /* Shield 0 SPI 3 SCK */
-	       | (1<<12)  /* Shield 0 SPI 3 SS */
-	       | (1<<13)  /* Shield 0 SPI 3 MOSI */
-	       | (1<<14); /* Shield 0 SPI 3 MISO */
-
-	CMSDK_AHB_GPIO0_DEV->altfuncset = gpio_0;
-
-	gpio_1 = (1<<10) /* Shield 1 UART 4 RXD */
-	       | (1<<14) /* Shield 1 UART 4 TXD */
-	       | (1<<15) /* Shield 1 I2C SCL SBCON3 */
-	       | (1<<0)  /* ADC SPI 2 SS */
-	       | (1<<1)  /* ADC SPI 2 MISO */
-	       | (1<<2)  /* ADC SPI 2 MOSI */
-	       | (1<<3)  /* ADC SPI 2 SCK */
-	       | (1<<5)  /* USER BUTTON 0 */
-	       | (1<<6); /* USER BUTTON 1 */
-
-	CMSDK_AHB_GPIO1_DEV->altfuncset = gpio_1;
-
-	gpio_2 = (1<<9)   /* Shield 1 I2C SDA SBCON3 */
-	       | (1<<6)   /* Shield 1 SPI 4 SS */
-	       | (1<<7)   /* Shield 1 SPI 4 MOSI */
-	       | (1<<8)   /* Shield 1 SPI 4 MISO */
-	       | (1<<12); /* Shield 1 SPI 4 SCK */
-
-	CMSDK_AHB_GPIO2_DEV->altfuncset = gpio_2;
-}
-
-static int arm_mps2_pinmux_init(void)
-{
-
-	arm_mps2_pinmux_defaults();
-
-	return 0;
-}
-
-SYS_INIT(arm_mps2_pinmux_init, PRE_KERNEL_1,
-	 CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/boards/arm/mps3/Kconfig.defconfig b/boards/arm/mps3/Kconfig.defconfig
index 4ce6cf0c910b9..014b80f307fb3 100644
--- a/boards/arm/mps3/Kconfig.defconfig
+++ b/boards/arm/mps3/Kconfig.defconfig
@@ -1,5 +1,5 @@
 # Copyright (c) 2018-2021 Linaro Limited
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_MPS3_CORSTONE300_AN547 || BOARD_MPS3_CORSTONE300_AN552 || BOARD_MPS3_CORSTONE300_FVP || BOARD_MPS3_CORSTONE310_AN555 || BOARD_MPS3_CORSTONE310_FVP
@@ -19,4 +19,14 @@ config UART_INTERRUPT_DRIVEN
 
 endif # SERIAL
 
+if ROMSTART_RELOCATION_ROM && (BOARD_MPS3_CORSTONE310_AN555 || BOARD_MPS3_CORSTONE310_FVP)
+
+config ROMSTART_REGION_ADDRESS
+	default $(dt_nodelabel_reg_addr_hex,itcm)
+
+config ROMSTART_REGION_SIZE
+	default $(dt_nodelabel_reg_size_hex,itcm,0,k)
+
+endif
+
 endif
diff --git a/boards/arm/mps3/board.cmake b/boards/arm/mps3/board.cmake
index ca090a832fc80..e6204c4c2eabd 100644
--- a/boards/arm/mps3/board.cmake
+++ b/boards/arm/mps3/board.cmake
@@ -1,5 +1,5 @@
 # Copyright (c) 2021 Linaro
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 # The FVP variant must be used to enable Ethos-U55 NPU support, but QEMU also
@@ -37,6 +37,10 @@ elseif(CONFIG_BOARD_MPS3_CORSTONE310_FVP OR CONFIG_BOARD_MPS3_CORSTONE310_FVP_NS
     set(ARMFVP_FLAGS
       # default is '0x11000000' but should match cpu<i>.INITSVTOR which is 0.
       -C mps3_board.sse300.iotss3_systemcontrol.INITSVTOR_RST=0
+      # default is 0x8, this change is needed since we split flash into itcm
+      # and sram and it reduces the number of available mpu regions causing a
+      # few MPU tests to fail.
+      -C cpu0.MPU_S=16
     )
   endif()
 endif()
@@ -48,6 +52,8 @@ if (CONFIG_BUILD_WITH_TFM)
   # TF-M (Secure) & Zephyr (Non Secure) image (when running
   # in-tree tests).
   set(QEMU_KERNEL_OPTION "-device;loader,file=${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
+
+  set(ARMFVP_FLAGS ${ARMFVP_FLAGS} -a ${APPLICATION_BINARY_DIR}/zephyr/tfm_merged.hex)
 endif()
 
 # FVP Parameters
diff --git a/boards/arm/mps3/mps3-pinctrl.dtsi b/boards/arm/mps3/mps3-pinctrl.dtsi
new file mode 100644
index 0000000000000..17b143ae6442c
--- /dev/null
+++ b/boards/arm/mps3/mps3-pinctrl.dtsi
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-mps3-pinctrl.h>
+
+&pinctrl {
+	/omit-if-no-ref/  uart3_default: uart3_default {
+		group1 {
+			pinmux = <UART3_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART3_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ uart4_default: uart4_default {
+		group1 {
+			pinmux = <UART4_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART4_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi3_default: spi3_default {
+		group1 {
+			pinmux = <SPI3_SS_EXP>, <SPI3_MOSI_EXP>,
+				 <SPI3_SCK_EXP>;
+		};
+
+		group2 {
+			pinmux = <SPI3_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi4_default: spi4_default {
+		group1 {
+			pinmux = <SPI4_SS_EXP>, <SPI4_MOSI_EXP>, <SPI4_SCK_EXP>;
+		};
+
+		group2 {
+			pinmux = <SPI4_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon2_default: sbcon2_default {
+		group1 {
+			pinmux = <SBCON2_SDA_EXP>, <SBCON2_SCL_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon3_default: sbcon3_default {
+		group1 {
+			pinmux = <SBCON3_SDA_EXP>, <SBCON3_SCL_EXP>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/arm/mps3/mps3_common.dtsi b/boards/arm/mps3/mps3_common.dtsi
index 798af2633103f..3348101bc7236 100644
--- a/boards/arm/mps3/mps3_common.dtsi
+++ b/boards/arm/mps3/mps3_common.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -104,3 +104,4 @@
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
+#include "mps3-pinctrl.dtsi"
diff --git a/boards/arm/mps3/mps3_common_soc_peripheral.dtsi b/boards/arm/mps3/mps3_common_soc_peripheral.dtsi
index 6fd5c7acd4024..d46f6c602cf10 100644
--- a/boards/arm/mps3/mps3_common_soc_peripheral.dtsi
+++ b/boards/arm/mps3/mps3_common_soc_peripheral.dtsi
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019-2021 Linaro Limited
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -85,6 +85,8 @@ spi_shield0: spi@9203000 {
 	clocks = <&sysclk>;
 	#address-cells = <1>;
 	#size-cells = <0>;
+	pinctrl-0 = <&spi3_default>;
+	pinctrl-names = "default";
 };
 
 spi_shield1: spi@9204000 {
@@ -95,6 +97,8 @@ spi_shield1: spi@9204000 {
 	clocks = <&sysclk>;
 	#address-cells = <1>;
 	#size-cells = <0>;
+	pinctrl-0 = <&spi4_default>;
+	pinctrl-names = "default";
 };
 
 i2c_shield0: i2c@9205000 {
@@ -103,6 +107,8 @@ i2c_shield0: i2c@9205000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x9205000 0x1000>;
+	pinctrl-0 = <&sbcon2_default>;
+	pinctrl-names = "default";
 };
 
 i2c_shield1: i2c@9206000 {
@@ -111,6 +117,8 @@ i2c_shield1: i2c@9206000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x9206000 0x1000>;
+	pinctrl-0 = <&sbcon3_default>;
+	pinctrl-names = "default";
 };
 
 i2c_ddr4_eeprom: i2c@9208000 {
@@ -122,7 +130,7 @@ i2c_ddr4_eeprom: i2c@9208000 {
 };
 
 gpio_led0: mps3_fpgaio@9302000 {
-	compatible = "arm,mps3-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x9302000 0x4>;
 	gpio-controller;
@@ -131,16 +139,17 @@ gpio_led0: mps3_fpgaio@9302000 {
 };
 
 gpio_button: mps3_fpgaio@9302008 {
-	compatible = "arm,mps3-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x9302008 0x4>;
 	gpio-controller;
 	#gpio-cells = <1>;
 	ngpios = <2>;
+	direction-input;
 };
 
 gpio_misc: mps3_fpgaio@930204c {
-	compatible = "arm,mps3-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x930204c 0x4>;
 	gpio-controller;
@@ -182,6 +191,8 @@ uart3: uart@9306000 {
 	interrupt-names = "tx", "rx";
 	clocks = <&sysclk>;
 	current-speed = <115200>;
+	pinctrl-0 = <&uart3_default>;
+	pinctrl-names = "default";
 };
 
 uart4: uart@9307000 {
@@ -191,6 +202,8 @@ uart4: uart@9307000 {
 	interrupt-names = "tx", "rx";
 	clocks = <&sysclk>;
 	current-speed = <115200>;
+	pinctrl-0 = <&uart4_default>;
+	pinctrl-names = "default";
 };
 
 uart5: uart@9308000 {
@@ -202,3 +215,8 @@ uart5: uart@9308000 {
 	clocks = <&sysclk>;
 	current-speed = <115200>;
 };
+
+pinctrl: pinctrl {
+	compatible = "arm,mps3-pinctrl";
+	status = "okay";
+};
diff --git a/boards/arm/mps3/mps3_corstone300_an547.dts b/boards/arm/mps3/mps3_corstone300_an547.dts
index ae71ddf72825a..55188180f0cf0 100644
--- a/boards/arm/mps3/mps3_corstone300_an547.dts
+++ b/boards/arm/mps3/mps3_corstone300_an547.dts
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2021 Linaro Limited
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -11,7 +11,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-an547";
@@ -95,3 +94,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone300_an547.yaml b/boards/arm/mps3/mps3_corstone300_an547.yaml
index 27d74d8c571b6..b63d2b1211ce7 100644
--- a/boards/arm/mps3/mps3_corstone300_an547.yaml
+++ b/boards/arm/mps3/mps3_corstone300_an547.yaml
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2019-2021 Linaro Limited
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,6 +20,7 @@ toolchain:
 supported:
   - gpio
 testing:
+  default: true
   ignore_tags:
     - drivers
     - bluetooth
diff --git a/boards/arm/mps3/mps3_corstone300_an547_ns.dts b/boards/arm/mps3/mps3_corstone300_an547_ns.dts
index 5a4e0031946c8..9540682e37b2b 100644
--- a/boards/arm/mps3/mps3_corstone300_an547_ns.dts
+++ b/boards/arm/mps3/mps3_corstone300_an547_ns.dts
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2021 Linaro Limited
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -11,7 +11,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-an547";
@@ -100,3 +99,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone300_an552.dts b/boards/arm/mps3/mps3_corstone300_an552.dts
index 7c7ec8d02a5c9..51aabcda2fa49 100644
--- a/boards/arm/mps3/mps3_corstone300_an552.dts
+++ b/boards/arm/mps3/mps3_corstone300_an552.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-an552";
@@ -94,3 +93,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone300_an552_ns.dts b/boards/arm/mps3/mps3_corstone300_an552_ns.dts
index 17e9d259bca9d..7b8bab99ff6dc 100644
--- a/boards/arm/mps3/mps3_corstone300_an552_ns.dts
+++ b/boards/arm/mps3/mps3_corstone300_an552_ns.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-an552";
@@ -99,3 +98,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone300_fvp.dts b/boards/arm/mps3/mps3_corstone300_fvp.dts
index eff11378c6166..886b8d7762911 100644
--- a/boards/arm/mps3/mps3_corstone300_fvp.dts
+++ b/boards/arm/mps3/mps3_corstone300_fvp.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-fvp";
@@ -94,3 +93,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone300_fvp.yaml b/boards/arm/mps3/mps3_corstone300_fvp.yaml
index 07c8c8a131e11..e6cb88bc5a748 100644
--- a/boards/arm/mps3/mps3_corstone300_fvp.yaml
+++ b/boards/arm/mps3/mps3_corstone300_fvp.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: mps3/corstone300/fvp
@@ -16,8 +16,8 @@ toolchain:
 supported:
   - gpio
 testing:
+  default: true
   ignore_tags:
-    - drivers
     - bluetooth
     - net
     - timer
diff --git a/boards/arm/mps3/mps3_corstone300_fvp_ns.dts b/boards/arm/mps3/mps3_corstone300_fvp_ns.dts
index 8a9704cae3a8c..d2be764eb5020 100644
--- a/boards/arm/mps3/mps3_corstone300_fvp_ns.dts
+++ b/boards/arm/mps3/mps3_corstone300_fvp_ns.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-fvp";
@@ -99,3 +98,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone310_an555.dts b/boards/arm/mps3/mps3_corstone310_an555.dts
index f16aff58eae82..47c2a9626a813 100644
--- a/boards/arm/mps3/mps3_corstone310_an555.dts
+++ b/boards/arm/mps3/mps3_corstone310_an555.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-an555";
@@ -20,8 +19,8 @@
 	chosen {
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
-		zephyr,sram = &dtcm;
-		zephyr,flash = &itcm;
+		zephyr,sram = &sram;
+		zephyr,flash = &isram;
 	};
 
 	cpus {
@@ -94,3 +93,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone310_an555_defconfig b/boards/arm/mps3/mps3_corstone310_an555_defconfig
index f5607f3da4c2f..cfea436df56a4 100644
--- a/boards/arm/mps3/mps3_corstone310_an555_defconfig
+++ b/boards/arm/mps3/mps3_corstone310_an555_defconfig
@@ -1,4 +1,4 @@
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_RUNTIME_NMI=y
@@ -15,3 +15,5 @@ CONFIG_SERIAL=y
 
 # Build a Secure firmware image
 CONFIG_TRUSTED_EXECUTION_SECURE=y
+# ROMSTART_REGION address and size are defined in Kconfig.defconfig
+CONFIG_ROMSTART_RELOCATION_ROM=y
diff --git a/boards/arm/mps3/mps3_corstone310_an555_ns.dts b/boards/arm/mps3/mps3_corstone310_an555_ns.dts
index 786ca6d9eb16d..4a910777e113b 100644
--- a/boards/arm/mps3/mps3_corstone310_an555_ns.dts
+++ b/boards/arm/mps3/mps3_corstone310_an555_ns.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-an555";
@@ -99,3 +98,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone310_fvp.dts b/boards/arm/mps3/mps3_corstone310_fvp.dts
index 6ad45b5f97352..585a7297d72c1 100644
--- a/boards/arm/mps3/mps3_corstone310_fvp.dts
+++ b/boards/arm/mps3/mps3_corstone310_fvp.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-fvp";
@@ -20,8 +19,8 @@
 	chosen {
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
-		zephyr,sram = &dtcm;
-		zephyr,flash = &itcm;
+		zephyr,sram = &sram;
+		zephyr,flash = &isram;
 	};
 
 	cpus {
@@ -94,3 +93,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/mps3/mps3_corstone310_fvp.yaml b/boards/arm/mps3/mps3_corstone310_fvp.yaml
index be08cf95aca2b..7259d65a2389c 100644
--- a/boards/arm/mps3/mps3_corstone310_fvp.yaml
+++ b/boards/arm/mps3/mps3_corstone310_fvp.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: mps3/corstone310/fvp
@@ -16,6 +16,7 @@ toolchain:
 supported:
   - gpio
 testing:
+  default: true
   ignore_tags:
     - drivers
     - bluetooth
diff --git a/boards/arm/mps3/mps3_corstone310_fvp_defconfig b/boards/arm/mps3/mps3_corstone310_fvp_defconfig
index f5607f3da4c2f..cfea436df56a4 100644
--- a/boards/arm/mps3/mps3_corstone310_fvp_defconfig
+++ b/boards/arm/mps3/mps3_corstone310_fvp_defconfig
@@ -1,4 +1,4 @@
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_RUNTIME_NMI=y
@@ -15,3 +15,5 @@ CONFIG_SERIAL=y
 
 # Build a Secure firmware image
 CONFIG_TRUSTED_EXECUTION_SECURE=y
+# ROMSTART_REGION address and size are defined in Kconfig.defconfig
+CONFIG_ROMSTART_RELOCATION_ROM=y
diff --git a/boards/arm/mps3/mps3_corstone310_fvp_ns.dts b/boards/arm/mps3/mps3_corstone310_fvp_ns.dts
index acc9b5fb737e3..9cd73ee3959fa 100644
--- a/boards/arm/mps3/mps3_corstone310_fvp_ns.dts
+++ b/boards/arm/mps3/mps3_corstone310_fvp_ns.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ * Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 #include <mem.h>
-#include "mps3_common.dtsi"
 
 / {
 	compatible = "arm,mps3-fvp";
@@ -99,3 +98,4 @@
 		};
 	};
 };
+#include "mps3_common.dtsi"
diff --git a/boards/arm/v2m_beetle/CMakeLists.txt b/boards/arm/v2m_beetle/CMakeLists.txt
deleted file mode 100644
index 9bc25bae4c64e..0000000000000
--- a/boards/arm/v2m_beetle/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library()
-zephyr_library_sources(pinmux.c)
diff --git a/boards/arm/v2m_beetle/pinmux.c b/boards/arm/v2m_beetle/pinmux.c
deleted file mode 100644
index 856239761b806..0000000000000
--- a/boards/arm/v2m_beetle/pinmux.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2016 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/device.h>
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <soc.h>
-#include <zephyr/sys/sys_io.h>
-#include <zephyr/drivers/gpio/gpio_cmsdk_ahb.h>
-
-/**
- * @brief Pinmux driver for ARM V2M Beetle Board
- *
- * The ARM V2M Beetle Board has 4 GPIO controllers. These controllers
- * are responsible for pin muxing, input/output, pull-up, etc.
- *
- * The GPIO controllers 2 and 3 are reserved and therefore not exposed by
- * this driver.
- *
- * All GPIO controller exposed pins are exposed via the following sequence of
- * pin numbers:
- *   Pins  0 -  15 are for GPIO0
- *   Pins 16 -  31 are for GPIO1
- *
- * For the exposed GPIO controllers ARM V2M Beetle Board follows the Arduino
- * compliant pin out.
- */
-
-#define CMSDK_AHB_GPIO0_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio0)))
-#define CMSDK_AHB_GPIO1_DEV \
-	((volatile struct gpio_cmsdk_ahb *)DT_REG_ADDR(DT_NODELABEL(gpio1)))
-
-/*
- * This is the mapping from the ARM V2M Beetle Board pins to GPIO
- * controllers.
- *
- * D0 : P0_0
- * D1 : P0_1
- * D2 : P0_2
- * D3 : P0_3
- * D4 : P0_4
- * D5 : P0_5
- * D6 : P0_6
- * D7 : P0_7
- * D8 : P0_8
- * D9 : P0_9
- * D10 : P0_10
- * D11 : P0_11
- * D12 : P0_12
- * D13 : P0_13
- * D14 : P0_14
- * D15 : P0_15
- * D16 : P1_0
- * D17 : P1_1
- * D18 : P1_2
- * D19 : P1_3
- * D20 : P1_4
- * D21 : P1_5
- * D22 : P1_6
- * D23 : P1_7
- * D24 : P1_8
- * D25 : P1_9
- * D26 : P1_10
- * D27 : P1_11
- * D28 : P1_12
- * D29 : P1_13
- * D30 : P1_14
- * D31 : P1_15
- *
- * UART_0_RX : D0
- * UART_0_TX : D1
- * SPI_0_CS : D10
- * SPI_0_MOSI : D11
- * SPI_0_MISO : D12
- * SPI_0_SCLK : D13
- * I2C_0_SCL : D14
- * I2C_0_SDA : D15
- * UART_1_RX : D16
- * UART_1_TX : D17
- * SPI_1_CS : D18
- * SPI_1_MOSI : D19
- * SPI_1_MISO : D20
- * SPI_1_SCK : D21
- * I2C_1_SDA : D22
- * I2C_1_SCL : D23
- *
- */
-static void arm_v2m_beetle_pinmux_defaults(void)
-{
-	uint32_t gpio_0 = 0U;
-	uint32_t gpio_1 = 0U;
-
-	/* Set GPIO Alternate Functions */
-
-	gpio_0 = (1<<0); /* Shield 0 UART 0 RXD */
-	gpio_0 |= (1<<1); /* Shield 0 UART 0 TXD */
-	gpio_0 |= (1<<14); /* Shield 0 I2C SDA SBCON2 */
-	gpio_0 |= (1<<15); /* Shield 0 I2C SCL SBCON2 */
-	gpio_0 |= (1<<10); /* Shield 0 SPI_3 nCS */
-	gpio_0 |= (1<<11); /* Shield 0 SPI_3 MOSI */
-	gpio_0 |= (1<<12); /* Shield 0 SPI_3 MISO */
-	gpio_0 |= (1<<13); /* Shield 0 SPI_3 SCK */
-
-	CMSDK_AHB_GPIO0_DEV->altfuncset = gpio_0;
-
-	gpio_1 = (1<<0); /* UART 1 RXD */
-	gpio_1 |= (1<<1); /* UART 1 TXD */
-	gpio_1 |= (1<<6); /* Shield 1 I2C SDA */
-	gpio_1 |= (1<<7); /* Shield 1 I2C SCL */
-	gpio_1 |= (1<<2); /* ADC SPI_1 nCS */
-	gpio_1 |= (1<<3); /* ADC SPI_1 MOSI */
-	gpio_1 |= (1<<4); /* ADC SPI_1 MISO */
-	gpio_1 |= (1<<5); /* ADC SPI_1 SCK */
-
-	gpio_1 |= (1<<8); /* QSPI CS 2 */
-	gpio_1 |= (1<<9); /* QSPI CS 1 */
-	gpio_1 |= (1<<10); /* QSPI IO 0 */
-	gpio_1 |= (1<<11); /* QSPI IO 1 */
-	gpio_1 |= (1<<12); /* QSPI IO 2 */
-	gpio_1 |= (1<<13); /* QSPI IO 3 */
-	gpio_1 |= (1<<14); /* QSPI SCK */
-
-	CMSDK_AHB_GPIO1_DEV->altfuncset = gpio_1;
-
-	/* Set the ARD_PWR_EN GPIO1[15] as an output */
-	CMSDK_AHB_GPIO1_DEV->outenableset |= (0x1 << 15);
-	/* Set on 3v3 (for ARDUINO HDR compliance) */
-	CMSDK_AHB_GPIO1_DEV->data |= (0x1 << 15);
-}
-
-static int arm_v2m_beetle_pinmux_init(void)
-{
-
-	arm_v2m_beetle_pinmux_defaults();
-
-	return 0;
-}
-
-SYS_INIT(arm_v2m_beetle_pinmux_init, PRE_KERNEL_1,
-	CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/boards/arm/v2m_beetle/v2m_beetle-pinctrl.dtsi b/boards/arm/v2m_beetle/v2m_beetle-pinctrl.dtsi
new file mode 100644
index 0000000000000..3bd342daac9a1
--- /dev/null
+++ b/boards/arm/v2m_beetle/v2m_beetle-pinctrl.dtsi
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-v2m_beetle-pinctrl.h>
+
+&pinctrl {
+	/omit-if-no-ref/  uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART0_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART1_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi0_default: spi0_default {
+		group1 {
+			pinmux = <SPI0_SS_EXP>, <SPI0_MOSI_EXP>, <SPI0_SCK_EXP>;
+		};
+		group2 {
+			pinmux = <SPI0_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi1_default: spi1_default {
+		group1 {
+			pinmux = <SPI1_SCK_EXP>, <SPI1_SS_EXP>, <SPI0_MOSI_EXP>;
+
+		};
+		group2 {
+			pinmux = <SPI1_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon0_default: sbcon0_default {
+		group1 {
+			pinmux = <SBCON0_SDA_EXP>, <SBCON0_SCL_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon1_default: sbcon1_default {
+		group1 {
+			pinmux = <SBCON1_SDA_EXP>, <SBCON1_SCL_EXP>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/arm/v2m_beetle/v2m_beetle.dts b/boards/arm/v2m_beetle/v2m_beetle.dts
index abb2687701c6e..8e8dc71872afb 100644
--- a/boards/arm/v2m_beetle/v2m_beetle.dts
+++ b/boards/arm/v2m_beetle/v2m_beetle.dts
@@ -74,6 +74,8 @@
 			interrupts = <0 3>;
 			clocks = <&sysclk &syscon>;
 			current-speed = <115200>;
+			pinctrl-0 = <&uart0_default>;
+			pinctrl-names = "default";
 		};
 
 		uart1: uart@40005000 {
@@ -82,6 +84,8 @@
 			interrupts = <2 3>;
 			clocks = <&sysclk &syscon>;
 			current-speed = <115200>;
+			pinctrl-0 = <&uart1_default>;
+			pinctrl-names = "default";
 		};
 
 		wdog0: wdog@40008000 {
@@ -131,9 +135,15 @@
 			reg = <0x4001f000 0x1000>;
 			#clock-cells = <0>;
 		};
+
+		pinctrl: pinctrl {
+			compatible = "arm,mps3-pinctrl";
+			status = "okay";
+		};
 	};
 };
 
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
+#include "v2m_beetle-pinctrl.dtsi"
diff --git a/boards/aspeed/ast1030_evb/doc/index.rst b/boards/aspeed/ast1030_evb/doc/index.rst
index 1c23d7d2644ff..1faa0185e27fa 100644
--- a/boards/aspeed/ast1030_evb/doc/index.rst
+++ b/boards/aspeed/ast1030_evb/doc/index.rst
@@ -26,22 +26,7 @@ Hardware
 Supported Features
 ==================
 
-The following features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr (at the moment)
-
-The default configuration can be found in
-:zephyr_file:`boards/aspeed/ast1030_evb/ast1030_evb_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -63,6 +48,8 @@ UART5 is configured for serial logs.  The default serial setup is 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board comes with a JTAG port which facilitates debugging using a single physical connection.
 
 Flashing
diff --git a/boards/atmarktechno/degu_evk/board.cmake b/boards/atmarktechno/degu_evk/board.cmake
index 33b72c2e9693e..028127e8ef024 100644
--- a/boards/atmarktechno/degu_evk/board.cmake
+++ b/boards/atmarktechno/degu_evk/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/atmel/sam/sam4e_xpro/doc/index.rst b/boards/atmel/sam/sam4e_xpro/doc/index.rst
index 1069727aa6c8f..fe51eaf3f9043 100644
--- a/boards/atmel/sam/sam4e_xpro/doc/index.rst
+++ b/boards/atmel/sam/sam4e_xpro/doc/index.rst
@@ -27,45 +27,7 @@ Hardware
 Supported Features
 ==================
 
-The sam4e_xpro board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| AFEC      | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | hwinfo                              |
-+-----------+------------+-------------------------------------+
-| HSMCI     | on-chip    | sdhc                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam/sam4e_xpro/sam4e_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -89,6 +51,8 @@ chip.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing the Zephyr project onto SAM4E MCU requires the `OpenOCD tool`_.
 By default a factory new SAM4E chip will boot SAM-BA boot loader located in
 the ROM, not the flashed image. This is determined by the value of GPNVM1
diff --git a/boards/atmel/sam/sam4l_ek/doc/index.rst b/boards/atmel/sam/sam4l_ek/doc/index.rst
index f958a54051549..899498f61a539 100644
--- a/boards/atmel/sam/sam4l_ek/doc/index.rst
+++ b/boards/atmel/sam/sam4l_ek/doc/index.rst
@@ -49,38 +49,7 @@ Hardware
 Supported Features
 ==================
 
-The sam4l_ek board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique 120 bit serial number        |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| TWIM      | on-chip    | i2c master port-interrupt           |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb device                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam/sam4l_ek/sam4l_ek_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -104,6 +73,8 @@ between all others headers and RS-485 port.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM4L-EK board have a Segger Embedded Debugger Unit
 `J-Link OB <https://www.segger.com/jlink-ob.html>`_.  This provides a debug
 interface to the SAM4LC4C chip. You can use Ozone or JLink to communicate with
diff --git a/boards/atmel/sam/sam4s_xplained/doc/index.rst b/boards/atmel/sam/sam4s_xplained/doc/index.rst
index 792c407da8cdc..6f39a88367ada 100644
--- a/boards/atmel/sam/sam4s_xplained/doc/index.rst
+++ b/boards/atmel/sam/sam4s_xplained/doc/index.rst
@@ -23,45 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The sam4s_xplained board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| SMC       | on-chip    | memc (PSRAM)                        |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam/sam4s_xplained/sam4s_xplained_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -86,6 +48,8 @@ The section flashing uses the UART from the Segger USB debug connection.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM4S Xplained board comes with Segger
 `J-Link OB <https://www.segger.com/jlink-ob.html>`_. This provides a debug
 interface to the SAM4S16C chip. You can use Ozone or JLink to communicate with
diff --git a/boards/atmel/sam/sam_e70_xplained/doc/index.rst b/boards/atmel/sam/sam_e70_xplained/doc/index.rst
index 6c8164391768f..659f793049d54 100644
--- a/boards/atmel/sam/sam_e70_xplained/doc/index.rst
+++ b/boards/atmel/sam/sam_e70_xplained/doc/index.rst
@@ -27,53 +27,7 @@ Hardware
 Supported Features
 ==================
 
-The sam_e70_xplained board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| AFEC      | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CAN FD    | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| XDMAC     | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam/sam_e70_xplained/sam_e70_xplained_same70q21_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -96,6 +50,8 @@ chip.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing the Zephyr project onto SAM E70 MCU requires the `OpenOCD tool`_.
 Support for Atmel SAM E microcontroller series was added in OpenOCD release
 0.10.0, which was added in Zephyr SDK 0.9.2.
diff --git a/boards/atmel/sam/sam_v71_xult/doc/index.rst b/boards/atmel/sam/sam_v71_xult/doc/index.rst
index cb7ecbfda4398..d58c6ded861e2 100644
--- a/boards/atmel/sam/sam_v71_xult/doc/index.rst
+++ b/boards/atmel/sam/sam_v71_xult/doc/index.rst
@@ -33,53 +33,7 @@ Hardware
 Supported Features
 ==================
 
-The sam_v71_xplained_ultra board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| AFEC      | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CAN FD    | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| XDMAC     | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam/sam_v71_xult/sam_v71_xult_samv71q21_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -102,6 +56,8 @@ for the console and is available as a Virtual COM Port via EDBG USB chip.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing the Zephyr project onto SAM V71 MCU requires the `OpenOCD tool`_.
 By default a factory new SAM V71 chip will boot the `SAM-BA`_ boot loader
 located in the ROM, not the flashed image. This is determined by the value
diff --git a/boards/atmel/sam0/samc21n_xpro/doc/index.rst b/boards/atmel/sam0/samc21n_xpro/doc/index.rst
index 678e3afa45300..094f75631ea01 100644
--- a/boards/atmel/sam0/samc21n_xpro/doc/index.rst
+++ b/boards/atmel/sam0/samc21n_xpro/doc/index.rst
@@ -25,53 +25,7 @@ Hardware
 Supported Features
 ==================
 
-The samc21n_xpro board configuration supports the following hardware
-features:
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - NVIC
-      - on-chip
-      - nested vector interrupt controller
-    * - Flash
-      - on-chip
-      - Can be used with LittleFS to store files
-    * - SYSTICK
-      - on-chip
-      - systick
-    * - WDT
-      - on-chip
-      - Watchdog
-    * - ADC
-      - on-chip
-      - Analog to Digital Converter
-    * - GPIO
-      - on-chip
-      - I/O ports
-    * - PWM
-      - on-chip
-      - Pulse Width Modulation
-    * - USART
-      - on-chip
-      - Serial ports
-    * - I2C
-      - on-chip
-      - I2C ports
-    * - SPI
-      - on-chip
-      - Serial Peripheral Interface ports
-    * - CAN
-      - on-chip
-      - CAN ports
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam0/samc21n_xpro/samc21n_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -129,6 +83,8 @@ driven by TCC2 instead of by GPIO.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM C21N Xplained Pro comes with a Atmel Embedded Debugger (EDBG). This
 provides a debug interface to the SAMC21 chip and is supported by
 OpenOCD.
diff --git a/boards/atmel/sam0/samd20_xpro/doc/index.rst b/boards/atmel/sam0/samd20_xpro/doc/index.rst
index 6127a37aff685..f374a15dad3e7 100644
--- a/boards/atmel/sam0/samd20_xpro/doc/index.rst
+++ b/boards/atmel/sam0/samd20_xpro/doc/index.rst
@@ -23,47 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The samd20_xpro board configuration supports the following hardware
-features:
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - NVIC
-      - on-chip
-      - nested vector interrupt controller
-    * - Flash
-      - on-chip
-      - Can be used with LittleFS to store files
-    * - SYSTICK
-      - on-chip
-      - systick
-    * - WDT
-      - on-chip
-      - Watchdog
-    * - ADC
-      - on-chip
-      - Analog to Digital Converter
-    * - GPIO
-      - on-chip
-      - I/O ports
-    * - USART
-      - on-chip
-      - Serial ports
-    * - I2C
-      - on-chip
-      - I2C ports
-    * - SPI
-      - on-chip
-      - Serial Peripheral Interface ports
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam0/samd20_xpro/samd20_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -93,6 +53,8 @@ SERCOM0 is available on the EXT1 connector.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM D20 Xplained Pro comes with a Atmel Embedded Debugger (EDBG).  This
 provides a debug interface to the SAMD20 chip and is supported by
 OpenOCD.
diff --git a/boards/atmel/sam0/samd21_xpro/doc/index.rst b/boards/atmel/sam0/samd21_xpro/doc/index.rst
index 057d6d80b8de4..a7b2245e15862 100644
--- a/boards/atmel/sam0/samd21_xpro/doc/index.rst
+++ b/boards/atmel/sam0/samd21_xpro/doc/index.rst
@@ -23,53 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The samd21_xpro board configuration supports the following hardware
-features:
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - NVIC
-      - on-chip
-      - nested vector interrupt controller
-    * - Flash
-      - on-chip
-      - Can be used with LittleFS to store files
-    * - SYSTICK
-      - on-chip
-      - systick
-    * - WDT
-      - on-chip
-      - Watchdog
-    * - ADC
-      - on-chip
-      - Analog to Digital Converter
-    * - GPIO
-      - on-chip
-      - I/O ports
-    * - PWM
-      - on-chip
-      - Pulse Width Modulation
-    * - USART
-      - on-chip
-      - Serial ports
-    * - I2C
-      - on-chip
-      - I2C ports
-    * - SPI
-      - on-chip
-      - Serial Peripheral Interface ports
-    * - USB
-      - on-chip
-      - Universal Serial Bus device ports
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam0/samd21_xpro/samd21_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -134,6 +88,8 @@ SERCOM5 is connected to an 8 megabit SPI flash.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM D21 Xplained Pro comes with a Atmel Embedded Debugger (EDBG).  This
 provides a debug interface to the SAMD21 chip and is supported by
 OpenOCD.
diff --git a/boards/atmel/sam0/same54_xpro/doc/index.rst b/boards/atmel/sam0/same54_xpro/doc/index.rst
index 61b127d7a1b50..3e76b6492d372 100644
--- a/boards/atmel/sam0/same54_xpro/doc/index.rst
+++ b/boards/atmel/sam0/same54_xpro/doc/index.rst
@@ -3,7 +3,7 @@
 Overview
 ********
 
-The SAM E54 Xplained Pro evaluation kit is ideal for evaluation and
+The `SAM E54 Xplained Pro Evaluation Kit`_ is ideal for evaluation and
 prototyping with the SAM E54 Cortex®-M4F processor-based
 microcontrollers. The kit includes Atmel’s Embedded Debugger (EDBG),
 which provides a full debug interface without the need for additional
@@ -36,61 +36,7 @@ Hardware
 Supported Features
 ==================
 
-The same54_xpro board configuration supports the following hardware
-features:
-
-+---------------+------------+----------------------------+
-| Interface     | Controller | Driver/Component           |
-+===============+============+============================+
-| ADC           | on-chip    | adc                        |
-+---------------+------------+----------------------------+
-| DAC           | on-chip    | dac                        |
-+---------------+------------+----------------------------+
-| DMAC          | on-chip    | dma                        |
-+---------------+------------+----------------------------+
-| EEPROM        | i2c        | eeprom, EUI-48 MAC Address |
-+---------------+------------+----------------------------+
-| EIC           | on-chip    | interrupt_controller       |
-+---------------+------------+----------------------------+
-| GMAC          | on-chip    | ethernet, mdio             |
-+---------------+------------+----------------------------+
-| GPIO          | on-chip    | gpio                       |
-+---------------+------------+----------------------------+
-| MPU           | on-chip    | arch/arm                   |
-+---------------+------------+----------------------------+
-| NVIC          | on-chip    | arch/arm                   |
-+---------------+------------+----------------------------+
-| NVMCTRL       | on-chip    | flash                      |
-+---------------+------------+----------------------------+
-| PORT          | on-chip    | pinctrl                    |
-+---------------+------------+----------------------------+
-| RTC           | on-chip    | timer                      |
-+---------------+------------+----------------------------+
-| SERCOM I2C    | on-chip    | i2c                        |
-+---------------+------------+----------------------------+
-| SERCOM SPI    | on-chip    | spi                        |
-+---------------+------------+----------------------------+
-| SERCOM USART  | on-chip    | serial, console            |
-+---------------+------------+----------------------------+
-| Serial Number | on-chip    | hwinfo                     |
-+---------------+------------+----------------------------+
-| SYSTICK       | on-chip    | timer                      |
-+---------------+------------+----------------------------+
-| TC            | on-chip    | counter                    |
-+---------------+------------+----------------------------+
-| TCC           | on-chip    | counter, pwm               |
-+---------------+------------+----------------------------+
-| TRNG          | on-chip    | entropy                    |
-+---------------+------------+----------------------------+
-| USB           | on-chip    | usb                        |
-+---------------+------------+----------------------------+
-| WDT           | on-chip    | watchdog                   |
-+---------------+------------+----------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam0/same54_xpro/same54_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -98,8 +44,9 @@ Pin Mapping
 The SAM E54 Xplained Pro evaluation kit has 4 GPIO controllers. These
 controllers are responsible for pin muxing, input/output, pull-up, etc.
 
-For more details please refer to `SAM D5x/E5x Family Datasheet`_ and the `SAM E54
-Xplained Pro Schematic`_.
+For more details please refer to `SAM D5x/E5x Family Datasheet (Web)`_, the `SAM E54
+Xplained Pro Schematic (Blue PCB)`_, or `SAM E54
+Xplained Pro Schematic (Red PCB)`_.
 
 .. image:: img/ATSAME54-XPRO-pinout.jpg
      :align: center
@@ -165,6 +112,8 @@ Authentication device.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM E54 Xplained Pro comes with a Atmel Embedded Debugger (EDBG).  This
 provides a debug interface to the SAME54 chip and is supported by
 OpenOCD.
@@ -213,11 +162,17 @@ References
 
 .. target-notes::
 
-.. _Microchip website:
-    http://www.microchip.com/DevelopmentTools/ProductDetails.aspx?PartNO=ATSAME54-XPRO
+.. _SAM E54 Xplained Pro Evaluation Kit:
+    https://www.microchip.com/en-us/development-tool/ATSAME54-XPRO
+
+.. _SAM D5x/E5x Family Datasheet (Web):
+    https://onlinedocs.microchip.com/oxy/GUID-AA358083-AEED-4BA8-8511-9F986D3390A5-en-US-2/index.html
+
+.. _Sam D5x/E5x Family Datasheet (PDF):
+    https://ww1.microchip.com/downloads/aemDocuments/documents/OTH/ProductDocuments/UserGuides/70005321A.pdf
 
-.. _SAM D5x/E5x Family Datasheet:
-    http://ww1.microchip.com/downloads/en/DeviceDoc/60001507C.pdf
+.. _SAM E54 Xplained Pro Schematic (Blue PCB):
+    https://ww1.microchip.com/downloads/aemDocuments/documents/OTH/ProductDocuments/BoardDesignFiles/SAM-E54-Xplained-Pro-Design-Documentation-Rev9.zip
 
-.. _SAM E54 Xplained Pro Schematic:
-    http://ww1.microchip.com/downloads/en/DeviceDoc/SAME54-Xplained-Pro_Design-Documentation.zip
+.. _SAM E54 Xplained Pro Schematic (Red PCB):
+   https://ww1.microchip.com/downloads/aemDocuments/documents/OTH/ProductDocuments/BoardDesignFiles/SAM-E54-Xplained-Pro-Design-Documentation-Rev11.zip
diff --git a/boards/atmel/sam0/saml21_xpro/doc/index.rst b/boards/atmel/sam0/saml21_xpro/doc/index.rst
index b92e1bf09a70c..90ee26760882e 100644
--- a/boards/atmel/sam0/saml21_xpro/doc/index.rst
+++ b/boards/atmel/sam0/saml21_xpro/doc/index.rst
@@ -23,50 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The saml21_xpro board configuration supports the following hardware
-features:
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - NVIC
-      - on-chip
-      - nested vector interrupt controller
-    * - Flash
-      - on-chip
-      - Can be used with LittleFS to store files
-    * - SYSTICK
-      - on-chip
-      - systick
-    * - WDT
-      - on-chip
-      - Watchdog
-    * - GPIO
-      - on-chip
-      - I/O ports
-    * - PWM
-      - on-chip
-      - Pulse Width Modulation
-    * - USART
-      - on-chip
-      - Serial ports
-    * - I2C
-      - on-chip
-      - I2C ports
-    * - SPI
-      - on-chip
-      - Serial Peripheral Interface ports
-    * - TRNG
-      - on-chip
-      - True Random Number Generator
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam0/saml21_xpro/saml21_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -136,6 +93,8 @@ The SAML21 MCU has 6 SERCOM based SPIs, with two configured as SPI in this BSP.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM L21 Xplained Pro comes with a Atmel Embedded Debugger (EDBG).  This
 provides a debug interface to the SAML21 chip and is supported by
 OpenOCD.
diff --git a/boards/atmel/sam0/samr21_xpro/doc/index.rst b/boards/atmel/sam0/samr21_xpro/doc/index.rst
index e04b4d7a711fb..94db3100c6ee5 100644
--- a/boards/atmel/sam0/samr21_xpro/doc/index.rst
+++ b/boards/atmel/sam0/samr21_xpro/doc/index.rst
@@ -23,33 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The samr21_xpro board configuration supports the following hardware
-features:
-
-+-----------+------------+--------------------------------------+
-| Interface | Controller | Driver/Component                     |
-+===========+============+======================================+
-| NVIC      | on-chip    | nested vector interrupt controller   |
-+-----------+------------+--------------------------------------+
-| SYSTICK   | on-chip    | systick                              |
-+-----------+------------+--------------------------------------+
-| WDT       | on-chip    | Watchdog                             |
-+-----------+------------+--------------------------------------+
-| GPIO      | on-chip    | I/O ports                            |
-+-----------+------------+--------------------------------------+
-| PWM       | on-chip    | Pulse Width Modulation               |
-+-----------+------------+--------------------------------------+
-| USART     | on-chip    | Serial ports                         |
-+-----------+------------+--------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports    |
-+-----------+------------+--------------------------------------+
-| I2C       | on-chip    | I2C Peripheral Interface ports       |
-+-----------+------------+--------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam0/samr21_xpro/samr21_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -160,6 +134,8 @@ echo demo. More information at :zephyr:code-sample:`sockets-echo-server` and
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM R21 Xplained Pro comes with a Atmel Embedded Debugger (EDBG).  This
 provides a debug interface to the SAMR21 chip and is supported by
 OpenOCD.
diff --git a/boards/atmel/sam0/samr34_xpro/doc/index.rst b/boards/atmel/sam0/samr34_xpro/doc/index.rst
index 4a38544be350f..001233e118088 100644
--- a/boards/atmel/sam0/samr34_xpro/doc/index.rst
+++ b/boards/atmel/sam0/samr34_xpro/doc/index.rst
@@ -28,63 +28,7 @@ Hardware
 Supported Features
 ==================
 
-The samr34_xpro board configuration supports the following hardware
-features:
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - NVIC
-      - on-chip
-      - nested vector interrupt controller
-    * - Flash
-      - on-chip
-      - Can be used with LittleFS to store files
-    * - SYSTICK
-      - on-chip
-      - systick
-    * - WDT
-      - on-chip
-      - Watchdog
-    * - GPIO
-      - on-chip
-      - I/O ports
-    * - PWM
-      - on-chip
-      - Pulse Width Modulation
-    * - USART
-      - on-chip
-      - Serial ports
-    * - I2C
-      - on-chip
-      - I2C ports
-    * - SPI
-      - on-chip
-      - Serial Peripheral Interface ports
-    * - TRNG
-      - on-chip
-      - True Random Number Generator
-
-The following hardware features are supported by Zephyr, but not yet fully
-supported by the SOC:
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - LoRa Radio
-      - on-chip
-      - Internal SX1276 LoRa Radio
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/atmel/sam0/samr34_xpro/samr34_xpro_defconfig`.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -150,6 +94,8 @@ The SAMR34 MCU has 6 SERCOM based SPIs, with two configured as SPI in this BSP.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM R34 Xplained Pro comes with a Atmel Embedded Debugger (EDBG).  This
 provides a debug interface to the SAMR34 chip and is supported by
 OpenOCD.
diff --git a/boards/bbc/microbit/board.cmake b/boards/bbc/microbit/board.cmake
index b6bae59502cb0..aad2286503c56 100644
--- a/boards/bbc/microbit/board.cmake
+++ b/boards/bbc/microbit/board.cmake
@@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf51")
 set(OPENOCD_NRF5_INTERFACE "cmsis-dap")
 
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/bbc/microbit/doc/index.rst b/boards/bbc/microbit/doc/index.rst
index 1d829d89a89ae..9224cd4f24da7 100644
--- a/boards/bbc/microbit/doc/index.rst
+++ b/boards/bbc/microbit/doc/index.rst
@@ -13,13 +13,6 @@ magnetometer sensors, Bluetooth and USB connectivity, a display consisting of
 external battery pack. The device inputs and outputs are through five ring
 connectors that are part of the 23-pin edge connector.
 
-* :abbr:`NVIC (Nested Vectored Interrupt Controller)`
-* :abbr:`RTC (nRF RTC System Clock)`
-* UART
-* GPIO
-* FLASH
-* RADIO (Bluetooth Low Energy)
-
 More information about the board can be found at the `microbit website`_.
 
 Hardware
@@ -39,29 +32,13 @@ The micro:bit has the following physical features:
 Supported Features
 ==================
 
-The bbc_microbit board configuration supports the following nRF51
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/bbc/microbit_v2/board.cmake b/boards/bbc/microbit_v2/board.cmake
index c94ffa1630696..0dd45ff28f76d 100644
--- a/boards/bbc/microbit_v2/board.cmake
+++ b/boards/bbc/microbit_v2/board.cmake
@@ -9,6 +9,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52")
 # in which case the following line should be removed to default back to "jlink" OpenOCD interface
 set(OPENOCD_NRF5_INTERFACE "cmsis-dap")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/bbc/microbit_v2/doc/index.rst b/boards/bbc/microbit_v2/doc/index.rst
index 62c3cee2252c3..24fbaf5d2a36d 100644
--- a/boards/bbc/microbit_v2/doc/index.rst
+++ b/boards/bbc/microbit_v2/doc/index.rst
@@ -33,29 +33,13 @@ The micro:bit-v2 has the following physical features:
 Supported Features
 ==================
 
-The bbc_microbit_v2 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/bcdevices/plt_demo_v2/board.cmake b/boards/bcdevices/plt_demo_v2/board.cmake
index 2935563797340..ebf0cf5bffa94 100644
--- a/boards/bcdevices/plt_demo_v2/board.cmake
+++ b/boards/bcdevices/plt_demo_v2/board.cmake
@@ -4,6 +4,7 @@ set(OPENOCD_NRF5_SUBFAMILY "nrf52")
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/bcdevices/plt_demo_v2/doc/index.rst b/boards/bcdevices/plt_demo_v2/doc/index.rst
index 646e5c9202507..cdab9ada052e4 100644
--- a/boards/bcdevices/plt_demo_v2/doc/index.rst
+++ b/boards/bcdevices/plt_demo_v2/doc/index.rst
@@ -41,40 +41,7 @@ Hardware
 Supported Features
 ==================
 
-The Blue Clover PLT Demo V2 board configuration supports the
-following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -105,6 +72,8 @@ NFC
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``blueclover_plt_demo_v2/nrf52832`` board configuration
 can be built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
diff --git a/boards/beagle/beagleconnect_freedom/doc/index.rst b/boards/beagle/beagleconnect_freedom/doc/index.rst
index 8bf3bf4e6e60d..3fac0a1f08dea 100644
--- a/boards/beagle/beagleconnect_freedom/doc/index.rst
+++ b/boards/beagle/beagleconnect_freedom/doc/index.rst
@@ -24,41 +24,7 @@ GPIO expander.
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| HWINFO    | on-chip    | hwinfo               |
-+-----------+------------+----------------------+
-| I2C       | off-chip   | OPT3001              |
-+-----------+------------+----------------------+
-| I2C       | off-chip   | HDC2010              |
-+-----------+------------+----------------------+
-| I2C       | off-chip   | BCF_BRIDGE_MCU       |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | ieee802154           |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
diff --git a/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst b/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
index 24665eafce18e..7f38c4589c737 100644
--- a/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
+++ b/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
@@ -55,23 +55,7 @@ BeaglePlay ARM Cortex-A53 CPUs typically run Linux, while the CC1352P7 Cortex-M4
 Supported Features
 ==================
 
-The ``beagleplay/cc1352p7`` board target supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | ieee802154           |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -137,6 +121,8 @@ CC1352 reset is connected to AM62 GPIO0_14.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/beagle/pocketbeagle_2/Kconfig.pocketbeagle_2 b/boards/beagle/pocketbeagle_2/Kconfig.pocketbeagle_2
new file mode 100644
index 0000000000000..b154f4e2e4e2b
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/Kconfig.pocketbeagle_2
@@ -0,0 +1,8 @@
+# BeagleBoard.org PocketBeagle 2
+#
+# Copyright (c) 2025 Ayush Singh, BeagleBoard.org Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_POCKETBEAGLE_2
+	select SOC_AM6232_M4 if BOARD_POCKETBEAGLE_2_AM6232_M4
diff --git a/boards/beagle/pocketbeagle_2/board.cmake b/boards/beagle/pocketbeagle_2/board.cmake
new file mode 100644
index 0000000000000..d1f7b9aff412b
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/board.cmake
@@ -0,0 +1,10 @@
+# BeagleBoard.org PocketBeagle 2
+#
+# Copyright (c) 2025 Ayush Singh, BeagleBoard.org Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_SOC_AM6232_M4)
+  board_runner_args(openocd "--no-init" "--no-halt" "--no-targets" "--gdb-client-port=3339")
+  include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+endif()
diff --git a/boards/beagle/pocketbeagle_2/board.yml b/boards/beagle/pocketbeagle_2/board.yml
new file mode 100644
index 0000000000000..03f54cde3bb1c
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/board.yml
@@ -0,0 +1,12 @@
+board:
+  name: pocketbeagle_2
+  full_name: PocketBeagle 2
+  vendor: beagle
+  socs:
+    - name: am6232
+  revision:
+    format: custom
+    exact: true
+    default: "A0"
+    revisions:
+      - name: "A0"
diff --git a/boards/beagle/pocketbeagle_2/doc/img/pocketbeagle_2.webp b/boards/beagle/pocketbeagle_2/doc/img/pocketbeagle_2.webp
new file mode 100644
index 0000000000000..34ecf2d1e0004
Binary files /dev/null and b/boards/beagle/pocketbeagle_2/doc/img/pocketbeagle_2.webp differ
diff --git a/boards/beagle/pocketbeagle_2/doc/index.rst b/boards/beagle/pocketbeagle_2/doc/index.rst
new file mode 100644
index 0000000000000..ecd9542919c90
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/doc/index.rst
@@ -0,0 +1,121 @@
+.. zephyr:board:: pocketbeagle_2
+
+Overview
+********
+
+PocketBeagle 2 is a computational platform powered by TI AM62x SoC (there are two
+revisions, AM6232 and AM6254).
+
+The board configuration provides support for the ARM Cortex-M4F MCU core.
+
+See the `PocketBeagle 2 Product Page`_ for details.
+
+Hardware
+********
+PocketBeagle 2 features the TI AM62x SoC based around an Arm Cortex-A53 multicore
+cluster with an Arm Cortex-M4F microcontroller, Imagination Technologies AXE-1-16
+graphics processor (from revision A1) and TI programmable real-time unit subsystem
+microcontroller cluster coprocessors.
+
+Zephyr is ported to run on the M4F core and the following listed hardware
+specifications are used:
+
+- Low-power ARM Cortex-M4F
+- Memory
+
+   - 256KB of SRAM
+   - 512MB of DDR4
+
+Currently supported PocketBeagle 2 revisions:
+
+- A0: Comes wth SOC AM6232
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Devices
+========
+System Clock
+------------
+
+This board configuration uses a system clock frequency of 400 MHz.
+
+DDR RAM
+-------
+
+The board has 512MB of DDR RAM available. This board configuration
+allocates Zephyr 4kB of RAM (only for resource table: 0x9CC00000 to 0x9CC00400).
+
+Serial Port
+-----------
+
+This board configuration uses a single serial communication channel with the
+MCU domain UART (MCU_UART0, i.e. P2.05 as RX and P2.07 as TX).
+
+SD Card
+*******
+
+Download BeagleBoard.org's official `BeagleBoard Imaging Utility`_ to create bootable
+SD-card with the Linux distro image. This will boot Linux on the A53 application
+cores. These cores will then load the Zephyr binary on the M4 core using remoteproc.
+
+Flashing
+********
+
+The board supports remoteproc using the OpenAMP resource table.
+
+The testing requires the binary to be copied to the SD card to allow the A53 cores to load it while booting using remoteproc.
+
+To test the M4F core, we build the :zephyr:code-sample:`hello_world` sample with the following command.
+
+.. zephyr-app-commands::
+   :board: pocketbeagle_2/am6232/m4
+   :zephyr-app: samples/hello_world
+   :goals: build
+
+This builds the program and the binary is present in the :file:`build/zephyr` directory as
+:file:`zephyr.elf`.
+
+We now copy this binary onto the SD card in the :file:`/lib/firmware` directory and name it as
+:file:`am62-mcu-m4f0_0-fw`.
+
+.. code-block:: console
+
+   # Mount the SD card at sdcard for example
+   sudo mount /dev/sdX sdcard
+   # copy the elf to the /lib/firmware directory
+   sudo cp --remove-destination zephyr.elf sdcard/lib/firmware/am62-mcu-m4f0_0-fw
+
+The SD card can now be used for booting. The binary will now be loaded onto the M4F core on boot.
+
+The binary will run and print Hello world to the MCU_UART0 port.
+
+Debugging
+*********
+
+The board supports debugging M4 core from the A53 cores running Linux. Since the target needs
+superuser privilege, openocd needs to be launched seperately for now:
+
+.. code-block:: console
+
+   sudo openocd -f board/ti_am625_swd_native.cfg
+
+
+Start debugging
+
+.. zephyr-app-commands::
+   :goals: debug
+
+References
+**********
+
+* `PocketBeagle 2 Product Page`_
+* `Documentation <https://docs.beagleboard.org/boards/pocketbeagle-2/index.html>`_
+
+.. _PocketBeagle 2 Product Page:
+   https://www.beagleboard.org/boards/pocketbeagle-2
+
+.. _BeagleBoard Imaging Utility:
+   https://github.com/beagleboard/bb-imager-rs/releases
diff --git a/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4-pinctrl.dtsi b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4-pinctrl.dtsi
new file mode 100644
index 0000000000000..7f54984345a2a
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4-pinctrl.dtsi
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Ayush Singh, BeagleBoard.org Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/ti-k3-pinctrl.h>
+
+&pinctrl {
+	mcu_uart0_rx_default: mcu_uart0_rx_default {
+		pinmux = <K3_PINMUX(0x0014, PIN_INPUT, MUX_MODE_0)>;
+	};
+
+	mcu_uart0_tx_default: mcu_uart0_tx_default {
+		pinmux = <K3_PINMUX(0x0018, PIN_OUTPUT, MUX_MODE_0)>;
+	};
+};
diff --git a/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4.dts b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4.dts
new file mode 100644
index 0000000000000..6b1c256976b50
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4.dts
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025 Ayush Singh, BeagleBoard.org Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <ti/am62x_m4.dtsi>
+#include "pocketbeagle_2_am6232_m4-pinctrl.dtsi"
+
+/ {
+	model = "BeagleBoard.org PocketBeagle 2";
+	compatible = "beagle,pocketbeagle_2_m4";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,ipc = &ipc0;
+		zephyr,ipc_shm = &ddr0;
+		zephyr,sram1 = &ddr1;
+	};
+
+	cpus {
+		cpu@0 {
+			status = "okay";
+			clock-frequency = <400000000>;
+		};
+	};
+
+	ddr0: memory@9cb00000 {
+		compatible = "mmio-sram";
+		reg = <0x9cb00000 DT_SIZE_M(1)>;
+	};
+
+	rsc_table: memory@9cc00000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x9cc00000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RSC_TABLE";
+	};
+
+	ddr1: memory@9cc01000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x9cc01000 (DT_SIZE_M(15) - DT_SIZE_K(4))>;
+		zephyr,memory-region = "DDR";
+	};
+
+	ipc0: ipc {
+		compatible = "zephyr,mbox-ipm";
+		mboxes = <&mbox0 0>, <&mbox0 1>;
+		mbox-names = "tx", "rx";
+	};
+};
+
+&uart0 {
+	current-speed = <115200>;
+	pinctrl-0 = <&mcu_uart0_rx_default &mcu_uart0_tx_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4.yaml b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4.yaml
new file mode 100644
index 0000000000000..fc258c2e383d9
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4.yaml
@@ -0,0 +1,10 @@
+identifier: pocketbeagle_2/am6232/m4
+name: BeagleBoard.org PocketBeagle 2
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+ram: 192
+vendor: beagle
+supported:
+  - uart
diff --git a/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4_defconfig b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4_defconfig
new file mode 100644
index 0000000000000..02a9f623a2714
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_m4_defconfig
@@ -0,0 +1,18 @@
+# BeagleBoard.org PocketBeagle 2
+#
+# Copyright (c) 2025 Ayush Singh, BeagleBoard.org Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Platform Configuration
+CONFIG_CORTEX_M_SYSTICK=y
+
+# Zephyr Kernel Configuration
+CONFIG_XIP=n
+
+# Serial Driver
+CONFIG_SERIAL=y
+
+# Enable Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/beagle/pocketbeagle_2/revision.cmake b/boards/beagle/pocketbeagle_2/revision.cmake
new file mode 100644
index 0000000000000..f7698f24bf31e
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/revision.cmake
@@ -0,0 +1,10 @@
+set(BOARD_REVISIONS "A0")
+
+# If BOARD_REVISION not set, use the default revision
+if(NOT DEFINED BOARD_REVISION)
+  set(BOARD_REVISION ${LIST_BOARD_REVISION_DEFAULT})
+endif()
+
+if(NOT BOARD_REVISION IN_LIST BOARD_REVISIONS)
+  message(FATAL_ERROR "${BOARD_REVISION} is not a valid revision for PocketBeagle 2. Accepted revisions: ${BOARD_REVISIONS}")
+endif()
diff --git a/boards/beagle/pocketbeagle_2/support/openocd.cfg b/boards/beagle/pocketbeagle_2/support/openocd.cfg
new file mode 100644
index 0000000000000..f0cff3f9e2db6
--- /dev/null
+++ b/boards/beagle/pocketbeagle_2/support/openocd.cfg
@@ -0,0 +1,7 @@
+# BeagleBoard.org PocketBeagle 2
+#
+# Copyright (c) 2025 Ayush Singh, BeagleBoard.org Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+source [find board/ti_am625_swd_native.cfg]
diff --git a/boards/blues/cygnet/Kconfig.cygnet b/boards/blues/cygnet/Kconfig.cygnet
new file mode 100644
index 0000000000000..f907d27024bac
--- /dev/null
+++ b/boards/blues/cygnet/Kconfig.cygnet
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Blues
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_CYGNET
+	select SOC_STM32L433XX
diff --git a/boards/blues/cygnet/Kconfig.defconfig b/boards/blues/cygnet/Kconfig.defconfig
new file mode 100644
index 0000000000000..898cdfcf29a79
--- /dev/null
+++ b/boards/blues/cygnet/Kconfig.defconfig
@@ -0,0 +1,12 @@
+# STM32L433CC Cygnet board configuration
+
+# Copyright (c) 2025 Blues
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_CYGNET
+
+config SPI_STM32_INTERRUPT
+	default y
+	depends on SPI
+
+endif # BOARD_CYGNET
diff --git a/boards/blues/cygnet/board.cmake b/boards/blues/cygnet/board.cmake
new file mode 100644
index 0000000000000..3f2cb76285919
--- /dev/null
+++ b/boards/blues/cygnet/board.cmake
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# keep first
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
+board_runner_args(jlink "--device=STM32L433CC" "--speed=4000")
+
+# keep first
+include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/blues/cygnet/board.yml b/boards/blues/cygnet/board.yml
new file mode 100644
index 0000000000000..4341ee22c8e2f
--- /dev/null
+++ b/boards/blues/cygnet/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: cygnet
+  full_name: Cygnet
+  vendor: blues
+  socs:
+    - name: stm32l433xx
diff --git a/boards/blues/cygnet/cygnet.dts b/boards/blues/cygnet/cygnet.dts
new file mode 100644
index 0000000000000..00fd5282bd2e7
--- /dev/null
+++ b/boards/blues/cygnet/cygnet.dts
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2025 Blues
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/l4/stm32l433Xc.dtsi>
+#include <st/l4/stm32l433c(b-c)ux-pinctrl.dtsi>
+#include "feather_connector.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Blues Cygnet";
+	compatible = "blues,cygnet";
+
+	chosen {
+		zephyr,console = &lpuart1;
+		zephyr,shell-uart = &lpuart1;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+
+		user_led: led_0 {
+			gpios = <&gpioa 8 GPIO_ACTIVE_HIGH>;
+			label = "User LED";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		user_button: button {
+			gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
+			label = "User Button";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	aliases {
+		led0 = &user_led;
+		sw0 = &user_button;
+	};
+};
+
+&clk_lsi {
+	status = "okay";
+};
+
+&clk_hsi {
+	status = "okay";
+};
+
+&pll {
+	div-m = <1>;
+	mul-n = <20>;
+	div-p = <7>;
+	div-q = <2>;
+	div-r = <4>;
+	clocks = <&clk_hsi>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(80)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+};
+
+&lpuart1 {
+	pinctrl-0 = <&lpuart1_tx_pb11 &lpuart1_rx_pb10>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&usart1 {
+	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_sck_pa5 &spi1_miso_pa6 &spi1_mosi_pb5>;
+	pinctrl-names = "default";
+	cs-gpios = <&gpiob 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+	status = "okay";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_scl_pb6 &i2c1_sda_pb7>;
+	pinctrl-names = "default";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	status = "okay";
+};
+
+&timers2 {
+	status = "okay";
+
+	pwm2: pwm {
+		status = "okay";
+		pinctrl-0 = <&tim2_ch1_pa0>;
+		pinctrl-names = "default";
+	};
+};
+
+&can1 {
+	pinctrl-0 = <&can1_rx_pb8 &can1_tx_pb9>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&rtc {
+	clocks = <&rcc STM32_CLOCK_BUS_APB1 0x10000000>,
+		 <&rcc STM32_SRC_LSI RTC_SEL(2)>;
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/*
+		 * Reserve the final 16 KiB for file system partition
+		 */
+		storage_partition: partition@3c000 {
+			label = "storage";
+			reg = <0x0003c000 DT_SIZE_K(16)>;
+		};
+	};
+};
diff --git a/boards/blues/cygnet/cygnet.yaml b/boards/blues/cygnet/cygnet.yaml
new file mode 100644
index 0000000000000..88af7f3d91d36
--- /dev/null
+++ b/boards/blues/cygnet/cygnet.yaml
@@ -0,0 +1,22 @@
+identifier: cygnet
+name: Blues Cygnet
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+ram: 64
+flash: 256
+supported:
+  - nvs
+  - can
+  - spi
+  - i2c
+  - pwm
+  - gpio
+  - counter
+  - feather_serial
+  - feather_i2c
+  - feather_spi
+vendor: blues
diff --git a/boards/blues/cygnet/cygnet_defconfig b/boards/blues/cygnet/cygnet_defconfig
new file mode 100644
index 0000000000000..674354645c175
--- /dev/null
+++ b/boards/blues/cygnet/cygnet_defconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/blues/cygnet/doc/img/cygnet-pinout.webp b/boards/blues/cygnet/doc/img/cygnet-pinout.webp
new file mode 100644
index 0000000000000..9499bcaa82eb5
Binary files /dev/null and b/boards/blues/cygnet/doc/img/cygnet-pinout.webp differ
diff --git a/boards/blues/cygnet/doc/img/cygnet.webp b/boards/blues/cygnet/doc/img/cygnet.webp
new file mode 100644
index 0000000000000..a1355669cb22f
Binary files /dev/null and b/boards/blues/cygnet/doc/img/cygnet.webp differ
diff --git a/boards/blues/cygnet/doc/index.rst b/boards/blues/cygnet/doc/index.rst
new file mode 100644
index 0000000000000..8283eb15db69e
--- /dev/null
+++ b/boards/blues/cygnet/doc/index.rst
@@ -0,0 +1,204 @@
+.. zephyr:board:: cygnet
+
+Overview
+********
+
+The Blues Cygnet board features an ARM Cortex-M4 based STM32L433CC MCU
+with a wide range of connectivity support and configurations. Here are
+some highlights of the Cygnet board:
+
+- STM32L4 microcontroller in LQFP48 package
+- Adafruit Feather connector
+- User LED
+- User push-button
+- USB Type-C connector
+
+More information about the board can be found at the `Blues Cygnet website`_.
+
+Hardware
+********
+
+The STM32L433CC SoC provides the following hardware IPs:
+
+- Ultra-low-power with FlexPowerControl (down to 28 nA Standby mode and 84
+  |micro| A/MHz run mode)
+- Core: ARM |reg| 32-bit Cortex |reg| -M4 CPU with FPU, frequency up to 80 MHz,
+  100DMIPS/1.25DMIPS/MHz (Dhrystone 2.1)
+- Clock Sources:
+
+  - 32 kHz crystal oscillator for RTC (LSE)
+  - Internal 16 MHz factory-trimmed RC ( |plusminus| 1%)
+  - Internal low-power 32 kHz RC ( |plusminus| 5%)
+  - Internal multispeed 100 kHz to 48 MHz oscillator, auto-trimmed by
+    LSE (better than |plusminus| 0.25 % accuracy)
+  - 2 PLLs for system clock, USB, audio, ADC
+
+- RTC with HW calendar, alarms and calibration
+- 11x timers:
+
+  - 1x 16-bit advanced motor-control
+  - 1x 32-bit and 2x 16-bit general purpose
+  - 2x 16-bit basic
+  - 2x low-power 16-bit timers (available in Stop mode)
+  - 2x watchdogs
+  - SysTick timer
+
+- Up to 21 fast I/Os, most 5 V-tolerant
+- Memories
+
+  - Up to 256 KB single bank Flash, proprietary code readout protection
+  - 64 KB of SRAM including 16 KB with hardware parity check
+
+- Rich analog peripherals (independent supply)
+
+  - 1x 12-bit ADC 5 MSPS, up to 16-bit with hardware oversampling, 200
+    |micro| A/MSPS
+  - 2x 12-bit DAC output channels, low-power sample and hold
+  - 1x operational amplifiers with built-in PGA
+  - 2x ultra-low-power comparators
+
+- 17x communication interfaces
+
+  - USB 2.0 full-speed crystal less solution with LPM and BCD
+  - 1x SAI (serial audio interface)
+  - 3x I2C FM+(1 Mbit/s), SMBus/PMBus
+  - 4x USARTs (ISO 7816, LIN, IrDA, modem)
+  - 1x LPUART (Stop 2 wake-up)
+  - 3x SPIs (and 1x Quad SPI)
+  - CAN (2.0B Active)
+
+- 14-channel DMA controller
+- True random number generator
+- CRC calculation unit, 96-bit unique ID
+- Development support: serial wire debug (SWD), JTAG, Embedded Trace Macrocell*
+
+More information about STM32L433CC can be found here:
+
+- `STM32L433CC on www.st.com`_
+- `STM32L432 reference manual`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+.. note:: CAN feature requires a CAN transceiver.
+
+Connections and IOs
+===================
+
+The Cygnet board has 6 GPIO controllers. These controllers are responsible for pin muxing,
+input/output, pull-up, etc.
+
+Available pins
+--------------
+.. image:: img/cygnet-pinout.webp
+   :align: center
+   :alt: Cygnet Pinout
+
+For more details please refer to `Blues Cygnet User Manual`_.
+
+Default Zephyr Peripheral Mapping
+---------------------------------
+
+- LPUART_1_TX : PB11
+- LPUART_1_RX : PB10
+- UART_1_TX : PA9
+- UART_1_RX : PA10
+- I2C_1_SCL : PB6
+- I2C_1_SDA : PB7
+- PWM_2_CH1 : PA0
+- SPI_1: SCK/MISO/MOSI : PA5/PA6/PB5
+
+System Clock
+------------
+
+The Cygnet board System Clock could be driven by internal or external oscillator,
+as well as main PLL clock. By default System clock is driven by PLL clock at 80MHz,
+driven by 16MHz high speed internal oscillator.
+
+Serial Port
+-----------
+
+The Cygnet board has 4 U(S)ARTs and 1 LPUART. The Zephyr console output is assigned
+to LPUART1. Default settings are 115200 8N1.
+
+
+Programming and Debugging
+*************************
+
+The Cygnet board requires an ST-LINK embedded debug tool in order to be programmed and debugged.
+
+Applications for the ``cygnet`` board configuration can be built and
+flashed in the usual way (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Flashing
+========
+
+The board is configured to be flashed using west `STM32CubeProgrammer`_ runner,
+so its :ref:`installation <stm32cubeprog-flash-host-tools>` is required.
+
+Alternatively, OpenOCD or JLink can also be used to flash the board using
+the ``--runner`` (or ``-r``) option:
+
+.. code-block:: console
+
+   $ west flash --runner openocd
+   $ west flash --runner jlink
+
+Flashing an application to Cygnet
+---------------------------------
+
+Connect the Cygnet to the ST-LINK debugger, then run a serial host program to connect with your Cygnet board.
+
+.. code-block:: console
+
+   $ picocom /dev/ttyACM0 -b 115200
+
+Now build and flash an application. Here is an example for
+:zephyr:code-sample:`hello_world`.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: cygnet
+   :goals: build flash
+
+You should see the following message on the console:
+
+.. code-block:: console
+
+   $ Hello World! cygnet
+
+
+Debugging
+=========
+
+You can debug an application in the usual way.  Here is an example for the
+:zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: cygnet
+   :maybe-skip-config:
+   :goals: debug
+
+References
+**********
+
+.. target-notes::
+
+.. _Blues Cygnet website:
+   https://www.blues.dev/
+
+.. _Blues Cygnet User Manual:
+   https://dev.blues.io/feather-mcus/cygnet/cygnet-introduction/
+
+.. _STM32L433CC on www.st.com:
+   https://www.st.com/en/microcontrollers-microprocessors/stm32l433cc.html
+
+.. _STM32L432 reference manual:
+   https://www.st.com/resource/en/reference_manual/dm00151940.pdf
+
+.. _STM32CubeProgrammer:
+   https://www.st.com/en/development-tools/stm32cubeprog.html
diff --git a/boards/blues/cygnet/feather_connector.dtsi b/boards/blues/cygnet/feather_connector.dtsi
new file mode 100644
index 0000000000000..da08fb458847d
--- /dev/null
+++ b/boards/blues/cygnet/feather_connector.dtsi
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025 Blues Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	feather_header: connector {
+		compatible = "adafruit-feather-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpioa 0 0>,	/* A0 */
+					<1 0 &gpioa 1 0>,	/* A1 */
+					<2 0 &gpioa 2 0>,	/* A2 */
+					<3 0 &gpioa 3 0>,	/* A3 */
+					<4 0 &gpiob 1 0>,	/* A4 */
+					<5 0 &gpioa 7 0>,	/* A5 */
+					<6 0 &gpioa 5 0>,	/* SCK */
+					<7 0 &gpiob 5 0>,	/* MOSI */
+					<8 0 &gpioa 6 0>,	/* MISO */
+					<9 0 &gpioa 10 0>,	/* RX */
+					<10 0 &gpioa 9 0>,	/* TX */
+					<11 0 &gpiob 1 0>,	/* D4 */
+					<12 0 &gpiob 7 0>,	/* SDA */
+					<13 0 &gpiob 6 0>,	/* SCL */
+					<14 0 &gpiob 8 0>,	/* D5 */
+					<15 0 &gpiob 9 0>,	/* D6 */
+					<16 0 &gpiob 14 0>,	/* D9 */
+					<17 0 &gpiob 13 0>,	/* D10 */
+					<18 0 &gpiob 0 0>,	/* D11 */
+					<19 0 &gpiob 15 0>,	/* D12 */
+					<20 0 &gpiob 4 0>;	/* D13 */
+	};
+};
+
+feather_serial: &usart1 {};
+feather_i2c: &i2c1 {};
+feather_spi: &spi1 {};
diff --git a/boards/blues/cygnet/support/openocd.cfg b/boards/blues/cygnet/support/openocd.cfg
new file mode 100644
index 0000000000000..cd566c1fa1c97
--- /dev/null
+++ b/boards/blues/cygnet/support/openocd.cfg
@@ -0,0 +1,7 @@
+source [find interface/stlink.cfg]
+
+transport select hla_swd
+
+source [find target/stm32l4x.cfg]
+
+reset_config srst_only
diff --git a/boards/blues/swan_r5/doc/index.rst b/boards/blues/swan_r5/doc/index.rst
index 51212bd4c6420..0c2c796abd4cf 100644
--- a/boards/blues/swan_r5/doc/index.rst
+++ b/boards/blues/swan_r5/doc/index.rst
@@ -85,37 +85,7 @@ More information about Swan can be found here:
 Supported Features
 ==================
 
-The Zephyr Swan board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/blues/swan_r5/swan_r5_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -189,6 +159,8 @@ assigned to LPUART.  Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Connect Swan to your host computer using the USB port.
 Then build and flash an application. Here is an example for the
 :zephyr:code-sample:`hello_world` application.
diff --git a/boards/bytesatwork/bytesensi_l/bytesensi_l.dts b/boards/bytesatwork/bytesensi_l/bytesensi_l.dts
index 2054d6bd2e2e7..b3be00fc171e2 100644
--- a/boards/bytesatwork/bytesensi_l/bytesensi_l.dts
+++ b/boards/bytesatwork/bytesensi_l/bytesensi_l.dts
@@ -93,15 +93,15 @@
 		int-gpios = <&gpio0 25 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 	};
 
-	temperature_sensor: tmp116@4a {
+	temperature_sensor: tmp11x@4a {
 		status = "okay";
-		compatible = "ti,tmp116";
+		compatible = "ti,tmp11x";
 		reg = <0x4a>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		eeprom: ti_tmp116_eeprom@0 {
-			compatible = "ti,tmp116-eeprom";
+		eeprom: ti_tmp11x_eeprom@0 {
+			compatible = "ti,tmp11x-eeprom";
 			reg = <0x0>;
 			read-only;
 		};
diff --git a/boards/bytesatwork/bytesensi_l/doc/index.rst b/boards/bytesatwork/bytesensi_l/doc/index.rst
index d1b220a778b94..35e402497edcc 100644
--- a/boards/bytesatwork/bytesensi_l/doc/index.rst
+++ b/boards/bytesatwork/bytesensi_l/doc/index.rst
@@ -12,33 +12,7 @@ Hardware
 Supported Features
 ==================
 
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GPS       | u-blox     | gnss                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RADIO     | Semtech    | LoRa                 |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -121,6 +95,8 @@ External GPS Antenna @ J3
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 The byteSENSI-L board can be flashed with the SEGGER JLink programmer.
diff --git a/boards/circuitdojo/feather/board.cmake b/boards/circuitdojo/feather/board.cmake
index 9c0c33243af67..91aec43ebb51b 100644
--- a/boards/circuitdojo/feather/board.cmake
+++ b/boards/circuitdojo/feather/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/common/esp32.board.cmake b/boards/common/esp32.board.cmake
index cfe7b7683fc1d..4669c2e620bea 100644
--- a/boards/common/esp32.board.cmake
+++ b/boards/common/esp32.board.cmake
@@ -13,4 +13,4 @@ board_runner_args(openocd  --gdb-init "thb main")
 set(ESP_IDF_PATH ${ZEPHYR_HAL_ESPRESSIF_MODULE_DIR})
 assert(ESP_IDF_PATH "ESP_IDF_PATH is not set")
 
-board_finalize_runner_args(esp32 "--esp-idf-path=${ESP_IDF_PATH}")
+board_runner_args(esp32 "--esp-idf-path=${ESP_IDF_PATH}")
diff --git a/boards/common/openocd-adi-max32.boards.cmake b/boards/common/openocd-adi-max32.boards.cmake
index 93409dd6901f8..c231f5ad1cf2b 100644
--- a/boards/common/openocd-adi-max32.boards.cmake
+++ b/boards/common/openocd-adi-max32.boards.cmake
@@ -3,33 +3,22 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Default cmsis-dap, it will be overwritten below if requires
-set(MAX32_INTERFACE_CFG "cmsis-dap.cfg")
+if(CONFIG_ARCH STREQUAL "riscv")
+  set(MAX32_TARGET_CFG "${CONFIG_SOC}_riscv.cfg")
+  set(MAX32_INTERFACE_CFG "olimex-arm-usb-ocd-h.cfg")
+else()
+  set(MAX32_TARGET_CFG "${CONFIG_SOC}.cfg")
+  set(MAX32_INTERFACE_CFG "cmsis-dap.cfg")
+endif()
 
-if(CONFIG_SOC_MAX32655_M4)
-  set(MAX32_TARGET_CFG "max32655.cfg")
-elseif(CONFIG_SOC_MAX32662)
-  set(MAX32_TARGET_CFG "max32662.cfg")
-elseif(CONFIG_SOC_MAX32666)
+# MAX32666 share the same target configuration file with MAX32665
+if(CONFIG_SOC_MAX32666)
   set(MAX32_TARGET_CFG "max32665.cfg")
-elseif(CONFIG_SOC_MAX32670)
-  set(MAX32_TARGET_CFG "max32670.cfg")
-elseif(CONFIG_SOC_MAX32672)
-  set(MAX32_TARGET_CFG "max32672.cfg")
-elseif(CONFIG_SOC_MAX32675)
-  set(MAX32_TARGET_CFG "max32675.cfg")
-elseif(CONFIG_SOC_MAX32680_M4)
-  set(MAX32_TARGET_CFG "max32680.cfg")
-elseif(CONFIG_SOC_MAX32690_M4)
-  set(MAX32_TARGET_CFG "max32690.cfg")
-elseif(CONFIG_SOC_MAX78000_M4)
-  set(MAX32_TARGET_CFG "max78000.cfg")
-elseif(CONFIG_SOC_MAX78002_M4)
-  set(MAX32_TARGET_CFG "max78002.cfg")
 endif()
 
 board_runner_args(openocd --cmd-pre-init "source [find interface/${MAX32_INTERFACE_CFG}]")
 board_runner_args(openocd --cmd-pre-init "source [find target/${MAX32_TARGET_CFG}]")
+board_runner_args(openocd "--target-handle=_CHIPNAME.cpu")
 
 if(CONFIG_SOC_FAMILY_MAX32_M4)
   board_runner_args(openocd --cmd-pre-init "allow_low_pwr_dbg")
diff --git a/boards/common/rfp.board.cmake b/boards/common/rfp.board.cmake
new file mode 100644
index 0000000000000..afce0c8019cc4
--- /dev/null
+++ b/boards/common/rfp.board.cmake
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_set_flasher_ifnset(rfp)
+
+board_finalize_runner_args(rfp)
diff --git a/boards/contextualelectronics/abc/board.cmake b/boards/contextualelectronics/abc/board.cmake
index 261663eef4e27..1482c471b4cd9 100644
--- a/boards/contextualelectronics/abc/board.cmake
+++ b/boards/contextualelectronics/abc/board.cmake
@@ -3,6 +3,7 @@
 set(OPENOCD_NRF5_SUBFAMILY "nrf52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/contextualelectronics/abc/doc/index.rst b/boards/contextualelectronics/abc/doc/index.rst
index d7f12bc4738cd..02ddb9689e5f5 100644
--- a/boards/contextualelectronics/abc/doc/index.rst
+++ b/boards/contextualelectronics/abc/doc/index.rst
@@ -35,38 +35,8 @@ is 32.768 kHz. The frequency of the main clock is 32 MHz.
 Supported Features
 ==================
 
-The contextualelectronics_abc board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M)    | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| Modem     | on-board   | quectel_bg9x         |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `ABC Board website`_ for more details on this board, and
 `Nordic Semiconductor Infocenter`_ for a complete list of SoC
 features.
@@ -74,6 +44,8 @@ features.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``contextualelectronics_abc`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
diff --git a/boards/croxel/croxel_cx1825/board.cmake b/boards/croxel/croxel_cx1825/board.cmake
index f95878945bedf..506a133984038 100644
--- a/boards/croxel/croxel_cx1825/board.cmake
+++ b/boards/croxel/croxel_cx1825/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/croxel/croxel_cx1825/doc/index.rst b/boards/croxel/croxel_cx1825/doc/index.rst
index ab88c4dd4321d..cee944d5f97a8 100644
--- a/boards/croxel/croxel_cx1825/doc/index.rst
+++ b/boards/croxel/croxel_cx1825/doc/index.rst
@@ -46,12 +46,7 @@ Hardware
 Supported Features
 ==================
 
-- Discrete LEDs (red and green)
-- Buttons (User and Reset)
-- Sensors (Accelerometer, Light, Temperature and Humidity, Pressure and Hall-Effect sensors)
-- Beeper
-- Radio (Bluetooth, IEEE 802.15.4)
-- SOC peripherals (ADC, Clock, Flash, GPIO, I2C, MPU, NVIC, PWM, Radio, RTC, SPI, USB, WDT)
+.. zephyr:board-supported-hw::
 
 Future Feature Support
 ======================
@@ -81,6 +76,8 @@ Digital Inputs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``croxel_cx1825/nrf52840`` board configuration
 can be built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
diff --git a/boards/ct/ctcc/board.cmake b/boards/ct/ctcc/board.cmake
index 11d0511404b1a..65f36c72e6c85 100644
--- a/boards/ct/ctcc/board.cmake
+++ b/boards/ct/ctcc/board.cmake
@@ -3,6 +3,7 @@
 if(CONFIG_BOARD_CTCC_NRF52840)
   board_runner_args(nrfjprog "--softreset")
   board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+  include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 elseif(CONFIG_BOARD_CTCC_NRF9161 OR CONFIG_BOARD_CTCC_NRF9161_NS)
@@ -14,6 +15,7 @@ elseif(CONFIG_BOARD_CTCC_NRF9161 OR CONFIG_BOARD_CTCC_NRF9161_NS)
   endif()
   board_runner_args(nrfjprog "--softreset")
   board_runner_args(pyocd "--target=nrf9161" "--frequency=4000000")
+  include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 endif()
diff --git a/boards/ct/ctcc/doc/index.rst b/boards/ct/ctcc/doc/index.rst
index 97780246a742c..5a890893c230f 100644
--- a/boards/ct/ctcc/doc/index.rst
+++ b/boards/ct/ctcc/doc/index.rst
@@ -57,63 +57,7 @@ Hardware
 Supported Features
 ==================
 
-The ``ctcc/nrf52840`` board target supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The ``ctcc/nrf9161`` board target supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| FLASH     | external   | spi                  |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | LTE-M/NB-IoT,        |
-|           |            | DECT NR\+            |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -137,6 +81,8 @@ nRF9161:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for ``ctcc`` boards can be
 built in the usual way (see :ref:`build_an_application` for more details).
 
diff --git a/boards/cypress/cy8ckit_062_ble/doc/index.rst b/boards/cypress/cy8ckit_062_ble/doc/index.rst
index 01ad4696ea23b..8a5090a5ed4ab 100644
--- a/boards/cypress/cy8ckit_062_ble/doc/index.rst
+++ b/boards/cypress/cy8ckit_062_ble/doc/index.rst
@@ -1,7 +1,4 @@
-.. _cy8ckit_062_ble:
-
-INFINEON PSOC 63 BLE Pioneer Kit
-################################
+.. zephyr:board:: cy8ckit_062_ble
 
 Overview
 ********
@@ -30,10 +27,6 @@ enabling you to emulate a BLE host on your computer.
 The Cortex-M0+ is a primary core on the board's SoC. It starts first and
 enables the CM4 core.
 
-.. image:: img/cy8ckit-062-ble.jpg
-     :align: center
-     :alt: CY8CKIT_062_BLE
-
 1. Battery charging indicator (LED6)
 2. USB PD output voltage availability indicator (LED7)
 3. KitProg2 USB Type-C connector (J10)
@@ -147,6 +140,8 @@ To get the OpenOCD package, it is required that you
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The CY8CKIT-062-BLE includes an onboard programmer/debugger (KitProg2) with
 mass storage programming to provide debugging, flash programming, and serial
 communication over USB. There are also PSOC 6 program and debug headers J11
diff --git a/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst b/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst
index a0ad601ad6334..dc201ecc7a78c 100644
--- a/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst
+++ b/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst
@@ -1,7 +1,4 @@
-.. _cy8ckit_062_wifi_bt:
-
-INFINEON PSOC 6 WiFi-BT Pioneer Kit
-###################################
+.. zephyr:board:: cy8ckit_062_wifi_bt
 
 Overview
 ********
@@ -23,10 +20,6 @@ The PSOC 6 WiFi-BT Pioneer board offers compatibility with Arduino shields.
 The Cortex-M0+ is a primary core on the board's SoC. It starts first and
 enables the CM4 core.
 
-.. image:: img/cy8ckit_062_wifi_bt_m0.jpg
-     :align: center
-     :alt: CY8CKIT_062_WIFI_BT
-
 1. USB PD output voltage availability indicator (LED7)
 2. Battery charging indicator (LED6)
 3. KitProg2 USB Type-C connector (J10)
@@ -134,6 +127,8 @@ To get the OpenOCD package, it is required that you
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The CY8CKIT-062-WiFi-BT includes an onboard programmer/debugger (KitProg2) with
 mass storage programming to provide debugging, flash programming, and serial
 communication over USB. There are also PSOC 6 program and debug headers J11
diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
index 78a960ec2e4ae..1dd7b14a629b5 100644
--- a/boards/deprecated.cmake
+++ b/boards/deprecated.cmake
@@ -16,6 +16,15 @@
 set(adafruit_feather_DEPRECATED
     adafruit_feather_nrf52840/nrf52840
 )
+set(arduino_uno_r4_minima_DEPRECATED
+    arduino_uno_r4@minima
+)
+set(arduino_uno_r4_wifi_DEPRECATED
+    arduino_uno_r4@wifi
+)
+set(esp32c6_devkitc_DEPRECATED
+    esp32c6_devkitc/esp32c6/hpcore
+)
 set(qemu_xtensa_DEPRECATED
     qemu_xtensa/dc233c
 )
@@ -37,3 +46,9 @@ set(mimxrt1060_evk_DEPRECATED
 set(mimxrt1060_evkb_DEPRECATED
     mimxrt1060_evk@B/mimxrt1062/qspi
 )
+set(neorv32_DEPRECATED
+    neorv32/neorv32/up5kdemo
+)
+set(xiao_esp32c6_DEPRECATED
+    xiao_esp32c6/esp32c6/hpcore
+)
diff --git a/boards/dptechnics/walter/doc/index.rst b/boards/dptechnics/walter/doc/index.rst
index c77e266f52be1..eb5dc5e3d50f2 100644
--- a/boards/dptechnics/walter/doc/index.rst
+++ b/boards/dptechnics/walter/doc/index.rst
@@ -58,47 +58,7 @@ Form factor
 Supported Features
 ==================
 
-Current Zephyr's Walter board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI/CAN   | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Cellular   | on-board   | modem_cellular                      |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Prerequisites
 -------------
@@ -117,6 +77,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/dptechnics/walter/walter_esp32s3_procpu.dts b/boards/dptechnics/walter/walter_esp32s3_procpu.dts
index 8d864885e0f00..0568d597960b1 100644
--- a/boards/dptechnics/walter/walter_esp32s3_procpu.dts
+++ b/boards/dptechnics/walter/walter_esp32s3_procpu.dts
@@ -49,6 +49,7 @@
 		status = "okay";
 		compatible = "sqn,gm02s";
 		mdm-reset-gpios = <&gpio1 13 (GPIO_OPEN_DRAIN | GPIO_ACTIVE_LOW)>;
+		mdm-wake-gpios = <&gpio1 14 (GPIO_OPEN_SOURCE | GPIO_ACTIVE_HIGH)>;
 	};
 };
 
@@ -120,3 +121,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/dragino/lsn50/doc/index.rst b/boards/dragino/lsn50/doc/index.rst
index 999c809a90f41..d5981b51817b4 100644
--- a/boards/dragino/lsn50/doc/index.rst
+++ b/boards/dragino/lsn50/doc/index.rst
@@ -78,24 +78,7 @@ More information about STM32L072CZ can be found here:
 Supported Features
 ==================
 
-The Zephyr Dragino LSN50 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/dragino/lsn50/dragino_lsn50_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -130,6 +113,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``dragino_lsn50`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/dragino/nbsn95/doc/index.rst b/boards/dragino/nbsn95/doc/index.rst
index c18bb7eee4019..c99e6c87bdcdb 100644
--- a/boards/dragino/nbsn95/doc/index.rst
+++ b/boards/dragino/nbsn95/doc/index.rst
@@ -77,24 +77,7 @@ More information about STM32L072CZ can be found here:
 Supported Features
 ==================
 
-The Zephyr Dragino NBSN95 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/dragino/nbsn95/dragino_nbsn95_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -129,6 +112,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``dragino_nbsn95`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/ebyte/e73_tbb/board.cmake b/boards/ebyte/e73_tbb/board.cmake
index f99446d144d06..5db65eede593d 100644
--- a/boards/ebyte/e73_tbb/board.cmake
+++ b/boards/ebyte/e73_tbb/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ebyte/e73_tbb/doc/index.rst b/boards/ebyte/e73_tbb/doc/index.rst
index 5d1327e322c7c..68bd2608dc91d 100644
--- a/boards/ebyte/e73_tbb/doc/index.rst
+++ b/boards/ebyte/e73_tbb/doc/index.rst
@@ -39,42 +39,8 @@ and solder NFC antenna using NFC_ANT connector.
 Supported Features
 ==================
 
-The ebyte_e73_tbb/nrf52832 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features are not supported by the Zephyr kernel.
+.. zephyr:board-supported-hw::
+
 See `E73-TBB website`_ and `Nordic Semiconductor Infocenter`_
 for a complete list of nRF52832 hardware features.
 
@@ -169,6 +135,8 @@ NFC_ANT
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/electronut/nrf52840_blip/doc/index.rst b/boards/electronut/nrf52840_blip/doc/index.rst
index 03dfff0bf5666..376412e4d4070 100644
--- a/boards/electronut/nrf52840_blip/doc/index.rst
+++ b/boards/electronut/nrf52840_blip/doc/index.rst
@@ -34,43 +34,7 @@ is 32 MHz.
 Supported Features
 ==================
 
-The nrf52840_blip board configuration supports the following
-hardware features currently:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -116,6 +80,8 @@ MicroSD is connected to these pins, and CS pin is connected to P0.17.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf52840_blip`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details); The onboard Black Magic
diff --git a/boards/electronut/nrf52840_papyr/board.cmake b/boards/electronut/nrf52840_papyr/board.cmake
index 65580b0fef534..3ca8757d61325 100644
--- a/boards/electronut/nrf52840_papyr/board.cmake
+++ b/boards/electronut/nrf52840_papyr/board.cmake
@@ -2,4 +2,5 @@
 
 board_runner_args(nrfjprog "--softreset")
 include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/boards/electronut/nrf52840_papyr/doc/nrf52840_papyr.rst b/boards/electronut/nrf52840_papyr/doc/nrf52840_papyr.rst
index 391175eebc261..f674496b02186 100644
--- a/boards/electronut/nrf52840_papyr/doc/nrf52840_papyr.rst
+++ b/boards/electronut/nrf52840_papyr/doc/nrf52840_papyr.rst
@@ -36,41 +36,7 @@ is 32 MHz.
 Supported Features
 ==================
 
-The nrf52840_papyr board configuration supports the following
-hardware features currently:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -123,6 +89,8 @@ Other pins used by the e-paper display are:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf52840_papyr`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details); Black Magic
diff --git a/boards/element14/warp7/doc/index.rst b/boards/element14/warp7/doc/index.rst
index d0940f5271ac9..016681c30ab0c 100644
--- a/boards/element14/warp7/doc/index.rst
+++ b/boards/element14/warp7/doc/index.rst
@@ -68,33 +68,7 @@ For more information about the i.MX7 SoC and WaRP7, see these references:
 Supported Features
 ==================
 
-The WaRP7 configuration supports the following hardware features on the
-Cortex M4 Core:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | fxos8700 trigger;                   |
-|           |            | fxas21002 polling;                  |
-|           |            | fxas21002 trigger;                  |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/element14/warp7/warp7_mcimx7d_m4_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -136,6 +110,8 @@ the number 6 is used in the mikroBUS connector.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The WaRP7 doesn't have QSPI flash for the M4 and it needs to be started by
 the A7 core. The A7 core is responsible to load the M4 binary application into
 the RAM, put the M4 in reset, set the M4 Program Counter and Stack Pointer, and
diff --git a/boards/ene/kb1200_evb/doc/index.rst b/boards/ene/kb1200_evb/doc/index.rst
index 6558b8dad5457..2bd60859af771 100644
--- a/boards/ene/kb1200_evb/doc/index.rst
+++ b/boards/ene/kb1200_evb/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ene_kb1200_evb:
-
-ENE KB1200_EVB
-##############
+.. zephyr:board:: kb1200_evb
 
 Overview
 ********
@@ -24,38 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The following features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc controller                      |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port/controller                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PMU       | on-chip    | power management                    |
-+-----------+------------+-------------------------------------+
-| PSL       | on-chip    | power switch logic                  |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pulse width modulator               |
-+-----------+------------+-------------------------------------+
-| TACH      | on-chip    | tachometer sensor                   |
-+-----------+------------+-------------------------------------+
-| SER       | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr (at the moment)
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -67,6 +33,8 @@ See Processor clock control register (refer 5.1 General Configuration)
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/enjoydigital/litex_vexriscv/doc/index.rst b/boards/enjoydigital/litex_vexriscv/doc/index.rst
index f9764907eb449..bd47c381a73b7 100644
--- a/boards/enjoydigital/litex_vexriscv/doc/index.rst
+++ b/boards/enjoydigital/litex_vexriscv/doc/index.rst
@@ -1,7 +1,4 @@
-.. _litex-vexriscv:
-
-LiteX VexRiscv
-##############
+.. zephyr:board:: litex_vexriscv
 
 LiteX VexRiscv is an example of a system on a chip (SoC) that consists of
 a `VexRiscv processor <https://github.com/SpinalHDL/VexRiscv>`_
@@ -20,10 +17,6 @@ LiteX VexRiscv SoC implementation generated for the
 <https://store.digilentinc.com/arty-a7-artix-7-fpga-development-board-for-makers-and-hobbyists>`_
 or `SDI-MIPI Video Converter <https://github.com/antmicro/sdi-mipi-video-converter>`_.
 
-.. image:: img/litex_vexriscv.jpg
-   :align: center
-   :alt: LiteX VexRiscv on Digilent Arty 35T Board
-
 LiteX is based on
 `Migen <https://m-labs.hk/gateware/migen/>`_/`MiSoC SoC builder <https://github.com/m-labs/misoc>`_
 and provides ready-made system components such as buses, streams, interconnects,
@@ -49,6 +42,11 @@ using the
 `Zephyr on LiteX VexRiscv <https://github.com/litex-hub/zephyr-on-litex-vexriscv>`_
 reference platform. You can also use the official LiteX SoC Builder.
 
+Supported Features
+******************
+
+.. zephyr:board-supported-hw::
+
 Bitstream generation
 ********************
 
diff --git a/boards/enjoydigital/litex_vexriscv/litex_vexriscv.dts b/boards/enjoydigital/litex_vexriscv/litex_vexriscv.dts
index 19f56f8b2897f..cb3082619031c 100644
--- a/boards/enjoydigital/litex_vexriscv/litex_vexriscv.dts
+++ b/boards/enjoydigital/litex_vexriscv/litex_vexriscv.dts
@@ -72,6 +72,10 @@
 	status = "okay";
 };
 
+&i2c1 {
+	status = "okay";
+};
+
 &pwm0 {
 	status = "okay";
 };
diff --git a/boards/espressif/esp32_devkitc_wroom/doc/index.rst b/boards/espressif/esp32_devkitc_wroom/doc/index.rst
index 228660a603aa7..9b5bc1c6baf85 100644
--- a/boards/espressif/esp32_devkitc_wroom/doc/index.rst
+++ b/boards/espressif/esp32_devkitc_wroom/doc/index.rst
@@ -50,45 +50,7 @@ and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:
 Supported Features
 ==================
 
-Current Zephyr's ESP32-DevKitC-WROOM board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| DAC        | on-chip    | dac                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 ===================
@@ -110,6 +72,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom-pinctrl.dtsi b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom-pinctrl.dtsi
index b1f03780559bb..1089af3047e8c 100644
--- a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom-pinctrl.dtsi
+++ b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2022-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -74,5 +74,35 @@
 			output-high;
 		};
 	};
+
+	i2s0_default: i2s0_default {
+		group1 {
+			pinmux = <I2S0_O_WS_GPIO5>,
+				 <I2S0_O_BCK_GPIO6>,
+				 <I2S0_O_SD_GPIO7>,
+				 <I2S0_I_WS_GPIO15>,
+				 <I2S0_I_BCK_GPIO16>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S0_I_SD_GPIO17>;
+			input-enable;
+		};
+	};
+
+	i2s1_default: i2s1_default {
+		group1 {
+			pinmux = <I2S1_O_WS_GPIO8>,
+				 <I2S1_O_BCK_GPIO3>,
+				 <I2S1_O_SD_GPIO9>,
+				 <I2S1_I_WS_GPIO10>,
+				 <I2S1_I_BCK_GPIO11>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S1_I_SD_GPIO12>;
+			input-enable;
+		};
+	};
 };
 
diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts
index 783a8f2a7f7bf..e9d5e2855ab07 100644
--- a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts
+++ b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2023-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -89,6 +89,18 @@
 	pinctrl-names = "default";
 };
 
+&i2s0 {
+	pinctrl-0 = <&i2s0_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&i2s1 {
+	pinctrl-0 = <&i2s1_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
 &spi2 {
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -132,3 +144,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml
index 7bc3c8feb55f7..c3e9af32006fb 100644
--- a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml
+++ b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml
@@ -9,6 +9,7 @@ supported:
   - dac
   - gpio
   - i2c
+  - i2s
   - watchdog
   - uart
   - nvs
diff --git a/boards/espressif/esp32_devkitc_wrover/doc/index.rst b/boards/espressif/esp32_devkitc_wrover/doc/index.rst
index cf1fb64f32f2c..5bab845c93887 100644
--- a/boards/espressif/esp32_devkitc_wrover/doc/index.rst
+++ b/boards/espressif/esp32_devkitc_wrover/doc/index.rst
@@ -50,45 +50,7 @@ and/or exchanging data over OpenAMP framework. See :zephyr:code-sample-category:
 Supported Features
 ==================
 
-Current Zephyr's ESP32-DevKitC-WROVER board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| DAC        | on-chip    | dac                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 ===================
@@ -110,6 +72,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover-pinctrl.dtsi b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover-pinctrl.dtsi
index f4f51cce98aec..dbfd9d07b803d 100644
--- a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover-pinctrl.dtsi
+++ b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2022-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -74,4 +74,34 @@
 			output-high;
 		};
 	};
+
+	i2s0_default: i2s0_default {
+		group1 {
+			pinmux = <I2S0_O_WS_GPIO5>,
+				 <I2S0_O_BCK_GPIO6>,
+				 <I2S0_O_SD_GPIO7>,
+				 <I2S0_I_WS_GPIO15>,
+				 <I2S0_I_BCK_GPIO16>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S0_I_SD_GPIO17>;
+			input-enable;
+		};
+	};
+
+	i2s1_default: i2s1_default {
+		group1 {
+			pinmux = <I2S1_O_WS_GPIO8>,
+				 <I2S1_O_BCK_GPIO3>,
+				 <I2S1_O_SD_GPIO9>,
+				 <I2S1_I_WS_GPIO10>,
+				 <I2S1_I_BCK_GPIO11>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S1_I_SD_GPIO12>;
+			input-enable;
+		};
+	};
 };
diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts
index 33f0f3f134b3a..c91a717811314 100644
--- a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts
+++ b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2023-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -89,6 +89,18 @@
 	pinctrl-names = "default";
 };
 
+&i2s0 {
+	pinctrl-0 = <&i2s0_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&i2s1 {
+	pinctrl-0 = <&i2s1_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
 &spi2 {
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -128,3 +140,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml
index 62e40f71e9373..32de7a52bd3c2 100644
--- a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml
+++ b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml
@@ -9,6 +9,7 @@ supported:
   - dac
   - gpio
   - i2c
+  - i2s
   - watchdog
   - uart
   - nvs
diff --git a/boards/espressif/esp32_ethernet_kit/doc/index.rst b/boards/espressif/esp32_ethernet_kit/doc/index.rst
index 7233284d31413..22a942989fdae 100644
--- a/boards/espressif/esp32_ethernet_kit/doc/index.rst
+++ b/boards/espressif/esp32_ethernet_kit/doc/index.rst
@@ -34,6 +34,13 @@ features FTDI FT2232H chip - an advanced multi-interface USB bridge.
 This chip enables to use JTAG for direct debugging of ESP32 through the
 USB interface without a separate JTAG debugger.
 
+Hardware
+********
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
 
 Functionality Overview
 ======================
@@ -425,6 +432,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi
index 3e30654db8b8e..1b6bd6b701cc0 100644
--- a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi
+++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Grant Ramsay <grant.ramsay@hotmail.com>
+ * Copyright (c) 2022-2025 Grant Ramsay <grant.ramsay@hotmail.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -40,4 +40,33 @@
 		};
 	};
 
+	i2s0_default: i2s0_default {
+		group1 {
+			pinmux = <I2S0_O_WS_GPIO5>,
+				 <I2S0_O_BCK_GPIO6>,
+				 <I2S0_O_SD_GPIO7>,
+				 <I2S0_I_WS_GPIO15>,
+				 <I2S0_I_BCK_GPIO16>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S0_I_SD_GPIO17>;
+			input-enable;
+		};
+	};
+
+	i2s1_default: i2s1_default {
+		group1 {
+			pinmux = <I2S1_O_WS_GPIO8>,
+				 <I2S1_O_BCK_GPIO3>,
+				 <I2S1_O_SD_GPIO9>,
+				 <I2S1_I_WS_GPIO10>,
+				 <I2S1_I_BCK_GPIO11>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S1_I_SD_GPIO12>;
+			input-enable;
+		};
+	};
 };
diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts
index 799c17ad84955..bf2fbbd6d3a7e 100644
--- a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts
+++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Grant Ramsay <grant.ramsay@hotmail.com>
+ * Copyright (c) 2022-2025 Grant Ramsay <grant.ramsay@hotmail.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -43,6 +43,18 @@
 	status = "okay";
 };
 
+&i2s0 {
+	pinctrl-0 = <&i2s0_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&i2s1 {
+	pinctrl-0 = <&i2s1_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
 &spi2 {
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -89,3 +101,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml
index fb3c3cdd704af..f6fd5a5f410ca 100644
--- a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml
+++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml
@@ -10,4 +10,5 @@ supported:
   - uart
   - nvs
   - pwm
+  - i2s
 vendor: espressif
diff --git a/boards/espressif/esp32c3_devkitc/doc/index.rst b/boards/espressif/esp32c3_devkitc/doc/index.rst
index a57d0be26235a..eae08a6b8fccd 100644
--- a/boards/espressif/esp32c3_devkitc/doc/index.rst
+++ b/boards/espressif/esp32c3_devkitc/doc/index.rst
@@ -42,41 +42,7 @@ manual at `ESP32-C3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-C3-DevKitC board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -98,6 +64,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts b/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts
index 86326fcc077f0..ec61f303a6c6d 100644
--- a/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts
+++ b/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts
@@ -97,3 +97,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32c3_devkitm/doc/index.rst b/boards/espressif/esp32c3_devkitm/doc/index.rst
index 24eb23bc7b8a7..d4fcb4e1713a1 100644
--- a/boards/espressif/esp32c3_devkitm/doc/index.rst
+++ b/boards/espressif/esp32c3_devkitm/doc/index.rst
@@ -42,41 +42,7 @@ manual at `ESP32-C3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-C3-Devkitm board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -98,6 +64,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts
index 25bd583daee3d..2e1b41edfc198 100644
--- a/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts
+++ b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts
@@ -103,3 +103,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32c3_rust/doc/index.rst b/boards/espressif/esp32c3_rust/doc/index.rst
index a6f41a01866c6..144b6948b85ec 100644
--- a/boards/espressif/esp32c3_rust/doc/index.rst
+++ b/boards/espressif/esp32c3_rust/doc/index.rst
@@ -42,41 +42,7 @@ manual at `ESP32-C3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-C3-DevKit-RUST board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 I2C Peripherals
 ===============
@@ -143,6 +109,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32c3_rust/esp32c3_rust.dts b/boards/espressif/esp32c3_rust/esp32c3_rust.dts
index 867fa84adcf63..9c931e91f5784 100644
--- a/boards/espressif/esp32c3_rust/esp32c3_rust.dts
+++ b/boards/espressif/esp32c3_rust/esp32c3_rust.dts
@@ -128,3 +128,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32c6_devkitc/Kconfig b/boards/espressif/esp32c6_devkitc/Kconfig
index c6a99b1032dc7..e24ba970a9bbc 100644
--- a/boards/espressif/esp32c6_devkitc/Kconfig
+++ b/boards/espressif/esp32c6_devkitc/Kconfig
@@ -3,4 +3,5 @@
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
-	default 4096
+	default 4096 if BOARD_ESP32C6_DEVKITC_ESP32C6_HPCORE
+	default 256 if BOARD_ESP32C6_DEVKITC_ESP32C6_LPCORE
diff --git a/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc b/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc
index 4bd1fce4efc33..9b30251fea4f7 100644
--- a/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc
+++ b/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc
@@ -5,3 +5,5 @@
 
 config BOARD_ESP32C6_DEVKITC
 	select SOC_ESP32_C6_WROOM_1U_N8
+	select SOC_ESP32C6_HPCORE if BOARD_ESP32C6_DEVKITC_ESP32C6_HPCORE
+	select SOC_ESP32C6_LPCORE if BOARD_ESP32C6_DEVKITC_ESP32C6_LPCORE
diff --git a/boards/espressif/esp32c6_devkitc/doc/index.rst b/boards/espressif/esp32c6_devkitc/doc/index.rst
index ab81b187d746a..ee0f04afaa776 100644
--- a/boards/espressif/esp32c6_devkitc/doc/index.rst
+++ b/boards/espressif/esp32c6_devkitc/doc/index.rst
@@ -84,43 +84,7 @@ manual at `ESP32-C6 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-C6-DevKitC board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -142,6 +106,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
@@ -183,7 +149,7 @@ To build the sample application using sysbuild use the command:
 .. zephyr-app-commands::
    :tool: west
    :zephyr-app: samples/hello_world
-   :board: esp32c6_devkitc
+   :board: esp32c6_devkitc/esp32c6/hpcore
    :goals: build
    :west-args: --sysbuild
    :compact:
@@ -232,7 +198,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32c6_devkitc
+   :board: esp32c6_devkitc/esp32c6/hpcore
    :goals: build
 
 The usual ``flash`` target will work with the ``esp32c6_devkitc`` board
@@ -241,7 +207,7 @@ application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32c6_devkitc
+   :board: esp32c6_devkitc/esp32c6/hpcore
    :goals: flash
 
 Open the serial monitor using the following command:
@@ -256,7 +222,7 @@ message in the monitor:
 .. code-block:: console
 
    ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
-   Hello World! esp32c6_devkitc
+   Hello World! esp32c6_devkitc/esp32c6/hpcore
 
 Debugging
 *********
@@ -273,7 +239,7 @@ Here is an example for building the :zephyr:code-sample:`hello_world` applicatio
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32c6_devkitc
+   :board: esp32c6_devkitc/esp32c6/hpcore
    :goals: build flash
    :gen-args: -DOPENOCD=<path/to/bin/openocd> -DOPENOCD_DEFAULT_PATH=<path/to/openocd/share/openocd/scripts>
 
@@ -281,9 +247,32 @@ You can debug an application in the usual way. Here is an example for the :zephy
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32c6_devkitc
+   :board: esp32c6_devkitc/esp32c6/hpcore
    :goals: debug
 
+Low-Power CPU (LP CORE)
+***********************
+
+The ESP32-C6 SoC has two RISC-V cores: the High-Performance Core (HP CORE) and the Low-Power Core (LP CORE).
+The LP Core features ultra low power consumption, an interrupt controller, a debug module and a system bus
+interface for memory and peripheral access.
+
+The LP Core is in sleep mode by default. It has two application scenarios:
+
+- Power insensitive scenario: When the High-Performance CPU (HP Core) is active, the LP Core can assist the HP CPU with some speed and efficiency-insensitive controls and computations.
+- Power sensitive scenario: When the HP CPU is in the power-down state to save power, the LP Core can be woken up to handle some external wake-up events.
+
+For more information, check the datasheet at `ESP32-C6 Datasheet`_ or the technical reference
+manual at `ESP32-C6 Technical Reference Manual`_.
+
+The LP Core support is fully integrated with :ref:`sysbuild`. The user can enable the LP Core by adding
+the following configuration to the project:
+
+.. code:: cfg
+
+   CONFIG_ULP_COPROC_ENABLED=y
+
+See :zephyr:code-sample-category:`lp-core` folder as code reference.
 
 References
 **********
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts
deleted file mode 100644
index 896ae30530cc9..0000000000000
--- a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <espressif/esp32c6/esp32c6_wroom_n8.dtsi>
-#include "esp32c6_devkitc-pinctrl.dtsi"
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-#include <espressif/partitions_0x0_default.dtsi>
-
-/ {
-	model = "esp32c6_devkitc";
-	compatible = "espressif,esp32c6";
-
-	chosen {
-		zephyr,sram = &sramhp;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &slot0_partition;
-	};
-
-	aliases {
-		sw0 = &user_button1;
-		watchdog0 = &wdt0;
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		user_button1: button_1 {
-			label = "User SW1";
-			gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
-			zephyr,code = <INPUT_KEY_0>;
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-names = "default";
-};
-
-&trng0 {
-	status = "okay";
-};
-
-&i2c0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-names = "default";
-};
-
-&spi2 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	status = "okay";
-	pinctrl-0 = <&spim2_default>;
-	pinctrl-names = "default";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&wdt0 {
-	status = "okay";
-};
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml
deleted file mode 100644
index 95385596d9de6..0000000000000
--- a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-identifier: esp32c6_devkitc
-name: ESP32-C6
-vendor: espressif
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-supported:
-  - adc
-  - gpio
-  - watchdog
-  - uart
-  - dma
-  - pwm
-  - spi
-  - counter
-  - entropy
-  - i2c
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc-pinctrl.dtsi b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore-pinctrl.dtsi
similarity index 100%
rename from boards/espressif/esp32c6_devkitc/esp32c6_devkitc-pinctrl.dtsi
rename to boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore-pinctrl.dtsi
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.dts b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.dts
new file mode 100644
index 0000000000000..ef8dbea59b387
--- /dev/null
+++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.dts
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <espressif/esp32c6/esp32c6_wroom_n8.dtsi>
+#include "esp32c6_devkitc_hpcore-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <espressif/partitions_0x0_default.dtsi>
+
+/ {
+	model = "esp32c6_devkitc HP Core";
+	compatible = "espressif,esp32c6";
+
+	chosen {
+		zephyr,sram = &sramhp;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	aliases {
+		sw0 = &user_button1;
+		watchdog0 = &wdt0;
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		user_button1: button_1 {
+			label = "User SW1";
+			gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+};
+
+&spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim2_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.yaml b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.yaml
new file mode 100644
index 0000000000000..6eed11176b057
--- /dev/null
+++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.yaml
@@ -0,0 +1,21 @@
+identifier: esp32c6_devkitc/esp32c6/hpcore
+name: ESP32-C6-DevKitC HP Core
+vendor: espressif
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+supported:
+  - adc
+  - gpio
+  - watchdog
+  - uart
+  - dma
+  - pwm
+  - spi
+  - counter
+  - entropy
+  - i2c
+testing:
+  ignore_tags:
+    - bluetooth
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_defconfig b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore_defconfig
similarity index 100%
rename from boards/espressif/esp32c6_devkitc/esp32c6_devkitc_defconfig
rename to boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore_defconfig
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.dts b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.dts
new file mode 100644
index 0000000000000..739781e692b55
--- /dev/null
+++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32c6/esp32c6_lpcore_wroom_n4.dtsi>
+#include <espressif/partitions_0x0_default.dtsi>
+
+/ {
+	model = "Espressif ESP32C6-DevkitC LPCORE";
+	compatible = "espressif,esp32c6";
+
+	chosen {
+		zephyr,sram = &sramlp;
+		zephyr,code-partition = &slot0_lpcore_partition;
+		zephyr,console = &lp_uart;
+		zephyr,shell-uart = &lp_uart;
+	};
+};
+
+&lp_uart {
+	status = "okay";
+	current-speed = <115200>;
+};
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.yaml b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.yaml
new file mode 100644
index 0000000000000..49e25bcdba0af
--- /dev/null
+++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.yaml
@@ -0,0 +1,19 @@
+identifier: esp32c6_devkitc/esp32c6/lpcore
+name: ESP32-C6-DevKitC LP Core
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+supported:
+  - cpu
+  - uart
+  - serial
+testing:
+  only_tags:
+    - introduction
+  ignore_tags:
+    - kernel
+    - posix
+    - chre
+    - cpp
+vendor: espressif
diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore_defconfig b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore_defconfig
new file mode 100644
index 0000000000000..42ee26028f93d
--- /dev/null
+++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore_defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+# Memory protection
+CONFIG_THREAD_STACK_INFO=n
+CONFIG_THREAD_CUSTOM_DATA=n
+
+# Boot
+CONFIG_BOOT_BANNER=n
+
+# Console
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_PRINTK=n
+CONFIG_CBPRINTF_NANO=y
+
+# Build
+CONFIG_SIZE_OPTIMIZATIONS=y
diff --git a/boards/espressif/esp32s2_devkitc/doc/index.rst b/boards/espressif/esp32s2_devkitc/doc/index.rst
index e5cb0ff6191dd..63bf3eca409b1 100644
--- a/boards/espressif/esp32s2_devkitc/doc/index.rst
+++ b/boards/espressif/esp32s2_devkitc/doc/index.rst
@@ -41,39 +41,7 @@ manual at `ESP32-S2 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-S2-devkitc board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| DAC        | on-chip    | dac                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 ===================
@@ -95,6 +63,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc-pinctrl.dtsi b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc-pinctrl.dtsi
index 756aaf9b5b729..434260d9486ea 100644
--- a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc-pinctrl.dtsi
+++ b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -65,4 +65,19 @@
 		};
 	};
 
+	i2s0_default: i2s0_default {
+		group1 {
+			pinmux = <I2S0_MCLK_GPIO4>,
+				 <I2S0_O_WS_GPIO5>,
+				 <I2S0_O_BCK_GPIO6>,
+				 <I2S0_O_SD_GPIO7>,
+				 <I2S0_I_WS_GPIO15>,
+				 <I2S0_I_BCK_GPIO16>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S0_I_SD_GPIO17>;
+			input-enable;
+		};
+	};
 };
diff --git a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts
index f60ce264843fb..337a63b6b56d5 100644
--- a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts
+++ b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -96,6 +96,12 @@
 	pinctrl-names = "default";
 };
 
+&i2s0 {
+	pinctrl-0 = <&i2s0_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
 &trng0 {
 	status = "okay";
 };
@@ -123,3 +129,7 @@
 &dac {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.yaml b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.yaml
index 44a6f971e3b74..b3598a28d9c04 100644
--- a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.yaml
+++ b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.yaml
@@ -9,6 +9,7 @@ supported:
   - dac
   - gpio
   - i2c
+  - i2s
   - watchdog
   - uart
   - nvs
@@ -19,4 +20,7 @@ supported:
   - input
   - can
   - dma
+testing:
+  ignore_tags:
+    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32s2_saola/doc/index.rst b/boards/espressif/esp32s2_saola/doc/index.rst
index a2ad776acfed5..d86a986b5e632 100644
--- a/boards/espressif/esp32s2_saola/doc/index.rst
+++ b/boards/espressif/esp32s2_saola/doc/index.rst
@@ -41,39 +41,7 @@ manual at `ESP32-S2 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-S2-Saola board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| DAC        | on-chip    | dac                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 ===================
@@ -95,6 +63,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32s2_saola/esp32s2_saola-pinctrl.dtsi b/boards/espressif/esp32s2_saola/esp32s2_saola-pinctrl.dtsi
index 7ab4fc6711945..5b402c838cfa9 100644
--- a/boards/espressif/esp32s2_saola/esp32s2_saola-pinctrl.dtsi
+++ b/boards/espressif/esp32s2_saola/esp32s2_saola-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2022-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -65,4 +65,19 @@
 		};
 	};
 
+	i2s0_default: i2s0_default {
+		group1 {
+			pinmux = <I2S0_MCLK_GPIO4>,
+				 <I2S0_O_WS_GPIO5>,
+				 <I2S0_O_BCK_GPIO6>,
+				 <I2S0_O_SD_GPIO7>,
+				 <I2S0_I_WS_GPIO15>,
+				 <I2S0_I_BCK_GPIO16>;
+			output-enable;
+		};
+		group2 {
+			pinmux = <I2S0_I_SD_GPIO17>;
+			input-enable;
+		};
+	};
 };
diff --git a/boards/espressif/esp32s2_saola/esp32s2_saola.dts b/boards/espressif/esp32s2_saola/esp32s2_saola.dts
index 88490f1d551c4..23249ceb3f645 100644
--- a/boards/espressif/esp32s2_saola/esp32s2_saola.dts
+++ b/boards/espressif/esp32s2_saola/esp32s2_saola.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2021-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -96,6 +96,12 @@
 	pinctrl-names = "default";
 };
 
+&i2s0 {
+	pinctrl-0 = <&i2s0_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
 &trng0 {
 	status = "okay";
 };
@@ -119,3 +125,7 @@
 &wdt0 {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32s2_saola/esp32s2_saola.yaml b/boards/espressif/esp32s2_saola/esp32s2_saola.yaml
index bebe2a293a8a8..e8a37ffd2edca 100644
--- a/boards/espressif/esp32s2_saola/esp32s2_saola.yaml
+++ b/boards/espressif/esp32s2_saola/esp32s2_saola.yaml
@@ -9,6 +9,7 @@ supported:
   - dac
   - gpio
   - i2c
+  - i2s
   - watchdog
   - uart
   - nvs
@@ -17,4 +18,7 @@ supported:
   - counter
   - entropy
   - input
+testing:
+  ignore_tags:
+    - bluetooth
 vendor: espressif
diff --git a/boards/espressif/esp32s3_devkitc/doc/index.rst b/boards/espressif/esp32s3_devkitc/doc/index.rst
index 008b64fecae7e..4d5b07797a2e9 100644
--- a/boards/espressif/esp32s3_devkitc/doc/index.rst
+++ b/boards/espressif/esp32s3_devkitc/doc/index.rst
@@ -81,41 +81,7 @@ manual at `ESP32-S3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-S3-DevKitC board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI/CAN   | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Prerequisites
 -------------
@@ -134,6 +100,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts
index 48806ab5a4c71..a7dec600f4336 100644
--- a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts
+++ b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts
@@ -147,3 +147,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32s3_devkitm/doc/index.rst b/boards/espressif/esp32s3_devkitm/doc/index.rst
index ada774ec2a1e6..044a3a6a6607b 100644
--- a/boards/espressif/esp32s3_devkitm/doc/index.rst
+++ b/boards/espressif/esp32s3_devkitm/doc/index.rst
@@ -81,41 +81,7 @@ manual at `ESP32-S3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-S3-DevKitM board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI/CAN   | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Prerequisites
 -------------
@@ -134,6 +100,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts
index 89c5b8c164182..c468871e25e38 100644
--- a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts
+++ b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts
@@ -147,3 +147,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32s3_eye/doc/index.rst b/boards/espressif/esp32s3_eye/doc/index.rst
index 662c4e5199877..e7b7643cbba1f 100644
--- a/boards/espressif/esp32s3_eye/doc/index.rst
+++ b/boards/espressif/esp32s3_eye/doc/index.rst
@@ -17,6 +17,11 @@ ESP32-S3-WROOM-1 module, camera, SD card slot, digital microphone, USB port, and
 and the sub board (ESP32-S3-EYE-SUB) that contains an LCD display.
 The main board and sub board are connected through pin headers.
 
+Supported Features
+------------------
+
+.. zephyr:board-supported-hw::
+
 Block Diagram
 -------------
 
@@ -130,6 +135,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 -----------
 
diff --git a/boards/espressif/esp32s3_eye/esp32s3_eye_procpu.dts b/boards/espressif/esp32s3_eye/esp32s3_eye_procpu.dts
index 1b2afa8b83af0..7391ad2357e42 100644
--- a/boards/espressif/esp32s3_eye/esp32s3_eye_procpu.dts
+++ b/boards/espressif/esp32s3_eye/esp32s3_eye_procpu.dts
@@ -204,3 +204,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp8684_devkitm/doc/index.rst b/boards/espressif/esp8684_devkitm/doc/index.rst
index 79c7294615034..c5e00b5b5b449 100644
--- a/boards/espressif/esp8684_devkitm/doc/index.rst
+++ b/boards/espressif/esp8684_devkitm/doc/index.rst
@@ -46,33 +46,7 @@ For detailed information check `ESP8684 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP8684-DevKitM board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 For a getting started user guide, please check `ESP8684-DevKitM User Guide`_.
 
@@ -96,6 +70,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts b/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts
index a6a76ac4756bc..8081d955c8fdc 100644
--- a/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts
+++ b/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts
@@ -60,3 +60,7 @@
 &timer0 {
 	status = "disabled";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/espressif/esp_wrover_kit/doc/index.rst b/boards/espressif/esp_wrover_kit/doc/index.rst
index 96f1c0570c2d8..0c5a2ee8dd4e6 100644
--- a/boards/espressif/esp_wrover_kit/doc/index.rst
+++ b/boards/espressif/esp_wrover_kit/doc/index.rst
@@ -441,45 +441,7 @@ Turn the Power Switch to ON, the 5V Power On LED should light up.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-Wrover-Kit board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| DAC        | on-chip    | dac                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 ===================
@@ -501,6 +463,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts
index 614bd1ec54f54..552829c4c5264 100644
--- a/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts
+++ b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts
@@ -218,3 +218,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi
index 2fc651230f454..b85e3d03dc2d7 100644
--- a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi
+++ b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi
@@ -57,5 +57,5 @@
 	reg = <0x20040000 0x30000>;
 };
 
-/* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+/* Include shared RAM configuration file */
+#include "bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi"
diff --git a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi
index 1f5fc0bb3405a..ce2e145d58753 100644
--- a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi
+++ b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi
@@ -63,5 +63,5 @@
 	};
 };
 
-/* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+/* Include shared RAM configuration file */
+#include "bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi"
diff --git a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi
new file mode 100644
index 0000000000000..fbb059494c36b
--- /dev/null
+++ b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ * Copyright (c) 2021 Laird Connectivity
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Default shared SRAM planning when building for BL5340 DVK.
+ * This file is included by both nRF5340 CPUAPP (Application MCU)
+ * and nRF5340 CPUNET (Network MCU).
+ * - 64 kB SRAM allocated as Shared memory (sram0_shared)
+ * - Region defined after the image SRAM of Application MCU
+ */
+
+/ {
+	chosen {
+		/* shared memory reserved for the inter-processor communication */
+		zephyr,ipc_shm = &sram0_shared;
+	};
+
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		sram0_shared: memory@20070000 {
+			/* SRAM allocated to shared memory */
+			reg = <0x20070000 0x10000>;
+		};
+	};
+};
diff --git a/boards/ezurio/bl5340_dvk/board.cmake b/boards/ezurio/bl5340_dvk/board.cmake
index 15aec8e6a36df..41a597dead84d 100644
--- a/boards/ezurio/bl5340_dvk/board.cmake
+++ b/boards/ezurio/bl5340_dvk/board.cmake
@@ -16,6 +16,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
   set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bl5340_dvk/doc/index.rst b/boards/ezurio/bl5340_dvk/doc/index.rst
index b19a0516c30d2..35ce806fc5359 100644
--- a/boards/ezurio/bl5340_dvk/doc/index.rst
+++ b/boards/ezurio/bl5340_dvk/doc/index.rst
@@ -56,78 +56,8 @@ is 32MHz.
 Supported Features
 ==================
 
-The ``bl5340_dvk/nrf5340/cpuapp`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| QSPI(M)   | on-chip    | nor                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The ``bl5340_dvk/nrf5340/cpunet`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `Nordic Semiconductor Infocenter`_
 for a complete list of hardware features.
 
@@ -261,6 +191,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The BL5340's application core supports the Armv8-M Security Extension.
 Applications built for the ``bl5340_dvk/nrf5340/cpuapp`` board by default
 boot in the Secure state.
diff --git a/boards/ezurio/bl652_dvk/board.cmake b/boards/ezurio/bl652_dvk/board.cmake
index 9449b78cd4711..29682197edc8f 100644
--- a/boards/ezurio/bl652_dvk/board.cmake
+++ b/boards/ezurio/bl652_dvk/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bl652_dvk/doc/bl652_dvk.rst b/boards/ezurio/bl652_dvk/doc/bl652_dvk.rst
index 27ec3f929288c..cdceadb2a34b6 100644
--- a/boards/ezurio/bl652_dvk/doc/bl652_dvk.rst
+++ b/boards/ezurio/bl652_dvk/doc/bl652_dvk.rst
@@ -43,42 +43,8 @@ Hardware
 Supported Features
 ==================
 
-The BL652 DVK board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `BL652 Module Website`_.
 
 Connections and IOs
@@ -196,6 +162,8 @@ J32/J22 Digital I/O
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/ezurio/bl653_dvk/board.cmake b/boards/ezurio/bl653_dvk/board.cmake
index 12b0d2996be7b..a19979a7e27b4 100644
--- a/boards/ezurio/bl653_dvk/board.cmake
+++ b/boards/ezurio/bl653_dvk/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/bl653_dvk/doc/bl653_dvk.rst b/boards/ezurio/bl653_dvk/doc/bl653_dvk.rst
index e4de59757e853..811ce96a51789 100644
--- a/boards/ezurio/bl653_dvk/doc/bl653_dvk.rst
+++ b/boards/ezurio/bl653_dvk/doc/bl653_dvk.rst
@@ -33,45 +33,8 @@ Hardware
 Supported Features
 ==================
 
-The BL653 DVK board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `BL653 website`_
 for a complete list of BL653 Development Kit board hardware features.
 
@@ -98,6 +61,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``bl653_dvk`` board configuration can be built, flashed,
 and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/ezurio/bl654_dvk/bl654_dvk_nrf52840_pa.dts b/boards/ezurio/bl654_dvk/bl654_dvk_nrf52840_pa.dts
index d826a466bfd32..ee5d7260fa4e0 100644
--- a/boards/ezurio/bl654_dvk/bl654_dvk_nrf52840_pa.dts
+++ b/boards/ezurio/bl654_dvk/bl654_dvk_nrf52840_pa.dts
@@ -9,7 +9,8 @@
 
 / {
 	/* Information from Nordic SDK-Based Application Development and SKY66112 datasheet */
-	sky66112_fem: fem {
+	nrf_radio_fem: fem {
+		status = "okay";
 		compatible = "generic-fem-two-ctrl-pins";
 		ctx-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 		crx-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
@@ -21,5 +22,5 @@
 };
 
 &radio {
-	fem = <&sky66112_fem>;
+	fem = <&nrf_radio_fem>;
 };
diff --git a/boards/ezurio/bl654_dvk/board.cmake b/boards/ezurio/bl654_dvk/board.cmake
index a99f3ce869322..32b02a35258b5 100644
--- a/boards/ezurio/bl654_dvk/board.cmake
+++ b/boards/ezurio/bl654_dvk/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bl654_dvk/doc/bl654_dvk.rst b/boards/ezurio/bl654_dvk/doc/bl654_dvk.rst
index 5a59932df25aa..30e238665871b 100644
--- a/boards/ezurio/bl654_dvk/doc/bl654_dvk.rst
+++ b/boards/ezurio/bl654_dvk/doc/bl654_dvk.rst
@@ -44,45 +44,8 @@ Hardware
 Supported Features
 ==================
 
-The BL654 DVK board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `BL654 website`_
 for a complete list of BL654 Development Kit board hardware features.
 
@@ -109,6 +72,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``bl654_dvk`` board configuration can be built, flashed,
 and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/ezurio/bl654_sensor_board/board.cmake b/boards/ezurio/bl654_sensor_board/board.cmake
index c1ca3bd12cf69..170466978324c 100644
--- a/boards/ezurio/bl654_sensor_board/board.cmake
+++ b/boards/ezurio/bl654_sensor_board/board.cmake
@@ -4,5 +4,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bl654_sensor_board/doc/bl654_sensor_board.rst b/boards/ezurio/bl654_sensor_board/doc/bl654_sensor_board.rst
index 373e9bf1bdcbb..605b5eb8c7fbb 100644
--- a/boards/ezurio/bl654_sensor_board/doc/bl654_sensor_board.rst
+++ b/boards/ezurio/bl654_sensor_board/doc/bl654_sensor_board.rst
@@ -40,43 +40,7 @@ Hardware
 Supported Features
 ==================
 
-The BL654 Sensor Board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
-See the `BL654 website`_ for a complete list of BL654 module hardware features.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -119,6 +83,8 @@ be blobbed.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``bl654_sensor_board`` board configuration can be built,
 flashed, and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running. An external
diff --git a/boards/ezurio/bl654_usb/doc/bl654_usb.rst b/boards/ezurio/bl654_usb/doc/bl654_usb.rst
index 33bf2a554dda3..04ac5759753f5 100644
--- a/boards/ezurio/bl654_usb/doc/bl654_usb.rst
+++ b/boards/ezurio/bl654_usb/doc/bl654_usb.rst
@@ -36,35 +36,8 @@ Hardware
 Supported Features
 ==================
 
-The BL654 USB board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `BL654 website`_
 for a complete list of BL654 USB adapter hardware features.
 
@@ -92,6 +65,8 @@ Zephyr console output is available as follows:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``bl654_usb`` board configuration can be
 built in the usual way (see :ref:`build_an_application` for more details). The
 ``bl654_usb`` board cannot be used for debugging. The compatible BL654 DVK
diff --git a/boards/ezurio/bt510/board.cmake b/boards/ezurio/bt510/board.cmake
index c1ca3bd12cf69..170466978324c 100644
--- a/boards/ezurio/bt510/board.cmake
+++ b/boards/ezurio/bt510/board.cmake
@@ -4,5 +4,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/bt510/doc/bt510.rst b/boards/ezurio/bt510/doc/bt510.rst
index fdfd9312ffeb0..74b4c48703cfe 100644
--- a/boards/ezurio/bt510/doc/bt510.rst
+++ b/boards/ezurio/bt510/doc/bt510.rst
@@ -36,39 +36,7 @@ Hardware
 Supported Features
 ==================
 
-The BT510 Sensor supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -116,6 +84,8 @@ The BT510 incorporates an I2C Silabs SI7055 temperature sensor. Refer to the `Si
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``bt510`` board configuration can be built, flashed, and
 debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/ezurio/bt610/board.cmake b/boards/ezurio/bt610/board.cmake
index 0a2feda9ee2e6..4d421a07db61c 100644
--- a/boards/ezurio/bt610/board.cmake
+++ b/boards/ezurio/bt610/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/bt610/doc/bt610.rst b/boards/ezurio/bt610/doc/bt610.rst
index 0ae62035a48b7..afa138eac63d6 100644
--- a/boards/ezurio/bt610/doc/bt610.rst
+++ b/boards/ezurio/bt610/doc/bt610.rst
@@ -40,43 +40,7 @@ Hardware
 Supported Features
 ==================
 
-The BT610 Sensor supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| QSPI      | on-chip    | qspi                 |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M)    | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 .. figure:: img/bt610_board.jpg
      :align: center
@@ -473,6 +437,8 @@ Required pins are as follows.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``bt610`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details); however, the standard
diff --git a/boards/ezurio/mg100/board.cmake b/boards/ezurio/mg100/board.cmake
index 790ab533b4a46..4a350c831677b 100644
--- a/boards/ezurio/mg100/board.cmake
+++ b/boards/ezurio/mg100/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/mg100/doc/index.rst b/boards/ezurio/mg100/doc/index.rst
index 5f66c65e1478c..b2baed38724a0 100644
--- a/boards/ezurio/mg100/doc/index.rst
+++ b/boards/ezurio/mg100/doc/index.rst
@@ -49,47 +49,7 @@ Hardware
 Supported Features
 ==================
 
-The MG100 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| QSPI      | on-chip    | qspi/MX25R64(8MB)    |
-+-----------+------------+----------------------+
-| LIS3DH    | I2C(M)     | sensor/lis3dh        |
-+-----------+------------+----------------------+
-| HL7800    | UART       | HL7800 modem driver  |
-+-----------+------------+----------------------+
-| SDMMC     | SPI(M)     | SD Card via SPI      |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 See `MG100 website`_ for a complete list
 of MG100 hardware features.
@@ -149,6 +109,8 @@ SPI MISO = P0.12
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``mg100`` board configuration can be
 built and flashed in the usual way. (see :ref:`build_an_application`
 and :ref:`application_run` for more details)
diff --git a/boards/ezurio/pinnacle_100_dvk/board.cmake b/boards/ezurio/pinnacle_100_dvk/board.cmake
index d5f3c19d78448..829cac0ce82a4 100644
--- a/boards/ezurio/pinnacle_100_dvk/board.cmake
+++ b/boards/ezurio/pinnacle_100_dvk/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/ezurio/pinnacle_100_dvk/doc/index.rst b/boards/ezurio/pinnacle_100_dvk/doc/index.rst
index 71511d8dfc815..d9f8b260efd2b 100644
--- a/boards/ezurio/pinnacle_100_dvk/doc/index.rst
+++ b/boards/ezurio/pinnacle_100_dvk/doc/index.rst
@@ -52,49 +52,7 @@ Hardware
 Supported Features
 ==================
 
-The Pinnacle 100 development board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| QSPI      | on-chip    | qspi/MX25R64(8MB)    |
-+-----------+------------+----------------------+
-| BME680    | I2C(M)     | sensor/bme680        |
-+-----------+------------+----------------------+
-| HL7800    | UART       | HL7800 modem driver  |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 See `Pinnacle 100 website`_ for a complete list
 of Pinnacle 100 Development Kit hardware features.
@@ -122,6 +80,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``pinnacle_100_dvk`` board configuration can be
 built and flashed in the usual way. (see :ref:`build_an_application`
 and :ref:`application_run` for more details)
diff --git a/boards/ezurio/rm1xx_dvk/board.cmake b/boards/ezurio/rm1xx_dvk/board.cmake
index 677dc6bdf2b18..1f0cea559d116 100644
--- a/boards/ezurio/rm1xx_dvk/board.cmake
+++ b/boards/ezurio/rm1xx_dvk/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF51")
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ezurio/rm1xx_dvk/doc/index.rst b/boards/ezurio/rm1xx_dvk/doc/index.rst
index 8462f92c1b25a..ebb994540ebad 100644
--- a/boards/ezurio/rm1xx_dvk/doc/index.rst
+++ b/boards/ezurio/rm1xx_dvk/doc/index.rst
@@ -48,40 +48,8 @@ is 16MHz.
 Supported Features
 ==================
 
-The rm1xx_dvk board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `Nordic Semiconductor Infocenter`_
 for a complete list of hardware features.
 
@@ -125,6 +93,8 @@ Refer to the `Semtech SX1272 datasheet`_ for further details.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/fanke/fk743m5_xih6/Kconfig.fk743m5_xih6 b/boards/fanke/fk743m5_xih6/Kconfig.fk743m5_xih6
new file mode 100644
index 0000000000000..b429435dd0964
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/Kconfig.fk743m5_xih6
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 zack jiang, Honbo He <hehongbo918@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FK743M5_XIH6
+	select SOC_STM32H743XX
diff --git a/boards/fanke/fk743m5_xih6/board.cmake b/boards/fanke/fk743m5_xih6/board.cmake
new file mode 100644
index 0000000000000..10170d65424f5
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/board.cmake
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(openocd --target-handle=_CHIPNAME.cpu0)
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
+board_runner_args(jlink "--device=STM32H743XI" "--speed=4000")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/fanke/fk743m5_xih6/board.yml b/boards/fanke/fk743m5_xih6/board.yml
new file mode 100644
index 0000000000000..b6a9f42f25d79
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: fk743m5_xih6
+  full_name: FK743M5-XIH6
+  vendor: fanke
+  socs:
+    - name: stm32h743xx
diff --git a/boards/fanke/fk743m5_xih6/doc/img/fk743m5_xih6.webp b/boards/fanke/fk743m5_xih6/doc/img/fk743m5_xih6.webp
new file mode 100644
index 0000000000000..733b0efc806be
Binary files /dev/null and b/boards/fanke/fk743m5_xih6/doc/img/fk743m5_xih6.webp differ
diff --git a/boards/fanke/fk743m5_xih6/doc/index.rst b/boards/fanke/fk743m5_xih6/doc/index.rst
new file mode 100644
index 0000000000000..0c7dbbfbe44ec
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/doc/index.rst
@@ -0,0 +1,131 @@
+.. zephyr:board:: fk743m5_xih6
+
+Overview
+********
+
+The FK743M5-XIH6 core board by FANKE Technology Co., Ltd. is an advanced microcontroller
+platform based on the STMicroelectronics Arm® Cortex®-M7 core STM32H743XIH6 microcontroller.
+This board is an ideal solution for developers looking to create high-performance
+applications, leveraging its robust capabilities and support for sophisticated display
+and image processing technologies.
+
+The FK743M5-XIH6 is designed as a reference design for user application development before
+transitioning to the final product, significantly simplifying the development process.
+Its wide range of hardware features, including advanced display and image processing capabilities,
+allowing for comprehensive evaluation and testing of peripherals and functionalities.
+
+Hardware
+********
+
+FK743M5-XIH6 provides the following hardware components:
+
+- STM32H743XI in 265-TFBGA package
+- ARM 32-bit Cortex-M7 CPU with FPU
+- 480 MHz max CPU frequency
+- 2048 KB Flash
+- 1 MB SRAM: 192 Kbytes TCM RAM (64 Kbytes ITCM RAM + 128 Kbytes DTCM RAM), 864 Kbytes user SRAM, and 4 Kbytes SRAM in Backup domain
+- Main clock: External 25MHz crystal oscillator.
+- RTC: 32.768kHz crystal oscillator.
+- high-resolution timers(2.1 ns max resolution, 1)
+- 32-bit timers(2)
+- 16-bit timers(17)
+- 1 reset button, and 1 BOOT button
+- 1 user LED
+- External 64-Mbit QSPI (W25Q64) NOR Flash memory.
+- USB OTG Full Speed and High Speed(1)
+- 1 micro SD card
+- 1 DCMI camera interface
+- 1 SPI LCD interface
+- SWD and serial port accessibility through a pin header
+- Bring out 83 IO ports
+
+More information about STM32H743XI can be found here:
+
+- `STM32H743XI on www.st.com`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Pin Mapping
+===========
+
+FK743M5-XIH6 board has 5 GPIO controllers. These controllers are responsible for pin muxing,
+input/output, pull-up, etc.
+
+Default Zephyr Peripheral Mapping
+---------------------------------
+
+The FK743M5-XIH6 board is configured as follows
+
+- UART_1 TX/RX : PA9/PA10 (available on the header pins)
+- User LED (blue) : PC13
+- SPI5 NCS/CLK/MOSI : PE11/PE12/PE14 (SPI LCD)
+- QuadSPI NCS/CLK/IO0/IO1/IO2/IO3 : PG6/PF10/PF8/PF9/PF7/PF6 (NOR Flash)
+- USB DM/DP : PA11/PA12
+
+System Clock
+============
+
+The FK743M5-XIH6 System Clock could be driven by an internal or external oscillator,
+as well as by the main PLL clock. By default the system clock is driven by the PLL clock at 480MHz,
+driven by an 25MHz external crystal oscillator.
+
+Serial Port
+===========
+
+The Zephyr console output is assigned to UART1. The default communication settings are 115200 8N1.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``fk743m5_xih6`` board target can be built and flashed in the usual
+way (see :ref:`build_an_application` and :ref:`application_run` for more details).
+
+Flashing
+========
+
+The FK743M5-XIH6 board does not include an on-board debugger. As a result, it requires
+an external debugger, such as ST-Link, for programming and debugging purposes.
+
+The board provides header pins for the Serial Wire Debug (SWD) interface.
+
+Flashing an application to FK743M5-XIH6
+---------------------------------------
+
+To begin, connect the ST-Link Debug Programmer to the FK743M5-XIH6 board using the SWD
+interface. Next, connect the ST-Link to your host computer via a USB port.
+Once this setup is complete, you can proceed to build and flash your application to the board
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: fk743m5_xih6
+   :goals: build flash
+
+Run a serial host program to connect with your board:
+
+.. code-block:: console
+
+   $ minicom -D /dev/ttyACM0 -b 115200
+
+Then, press the RESET button, you should see the following message:
+
+.. code-block:: console
+
+   Hello World! fk743m5_xih6
+
+Debugging
+=========
+
+This current Zephyr port does not support debugging.
+
+References
+**********
+
+.. target-notes::
+.. _STM32H743XI on www.st.com: https://www.st.com/en/microcontrollers/stm32h743xi.html
diff --git a/boards/fanke/fk743m5_xih6/fk743m5_xih6.dts b/boards/fanke/fk743m5_xih6/fk743m5_xih6.dts
new file mode 100644
index 0000000000000..93f9cd88847e6
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/fk743m5_xih6.dts
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2025 zack jiang, Honbo He <hehongbo918@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/h7/stm32h743Xi.dtsi>
+#include <st/h7/stm32h743xihx-pinctrl.dtsi>
+
+/ {
+	model = "FANKE FK743M5-XIH6 board";
+	compatible = "fanke,fk743m5-xih6";
+
+	chosen {
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		user_led: led_0 {
+			gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
+			label = "User LED";
+		};
+	};
+
+	aliases {
+		led0 = &user_led;
+	};
+};
+
+&clk_hsi48 {
+	status = "okay";
+};
+
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(25)>;
+	status = "okay";
+};
+
+&pll {
+	div-m = <5>;
+	mul-n = <192>;
+	div-p = <2>;
+	div-q = <4>;
+	div-r = <4>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&pll3 {
+	div-m = <5>;
+	mul-n = <192>;
+	div-p = <2>;
+	div-q = <20>;
+	div-r = <99>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(480)>;
+	d1cpre = <1>;
+	hpre = <2>;
+	d1ppre = <2>;
+	d2ppre1 = <2>;
+	d2ppre2 = <2>;
+	d3ppre = <2>;
+};
+
+&quadspi {
+	pinctrl-0 = <&quadspi_bk1_io0_pf8 &quadspi_bk1_io1_pf9
+		     &quadspi_bk1_io2_pf7 &quadspi_bk1_io3_pf6
+		     &quadspi_clk_pf10 &quadspi_bk1_ncs_pg6>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	/* Winbond external flash */
+	w25q64_qspi: qspi-nor-flash@90000000 {
+		compatible = "st,stm32-qspi-nor";
+		reg = <0x90000000 DT_SIZE_M(8)>; /* 64 Mbits */
+		qspi-max-frequency = <40000000>;
+		status = "okay";
+		spi-bus-width = <4>;
+		writeoc = "PP_1_1_4";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			storage_partition: partition@0 {
+				label = "storage";
+				reg = <0x00000000 DT_SIZE_M(8)>;
+			};
+		};
+	};
+};
+
+&usart1 {
+	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&backup_sram {
+	status = "okay";
+};
+
+&rng {
+	status = "okay";
+};
diff --git a/boards/fanke/fk743m5_xih6/fk743m5_xih6.yaml b/boards/fanke/fk743m5_xih6/fk743m5_xih6.yaml
new file mode 100644
index 0000000000000..932fcb5f3f444
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/fk743m5_xih6.yaml
@@ -0,0 +1,16 @@
+identifier: fk743m5_xih6
+name: FANKE FK743M5-XIH6
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 1024
+flash: 2048
+supported:
+  - uart
+  - gpio
+  - spi
+  - backup_sram
+  - qspi
+vendor: fanke
diff --git a/boards/fanke/fk743m5_xih6/fk743m5_xih6_defconfig b/boards/fanke/fk743m5_xih6/fk743m5_xih6_defconfig
new file mode 100644
index 0000000000000..13a1289e51c4f
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/fk743m5_xih6_defconfig
@@ -0,0 +1,18 @@
+# Copyright (c) zack jiang, Honbo He <hehongbo918@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable UART
+CONFIG_SERIAL=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
diff --git a/boards/fanke/fk743m5_xih6/support/openocd.cfg b/boards/fanke/fk743m5_xih6/support/openocd.cfg
new file mode 100644
index 0000000000000..4ea6d13db0ba1
--- /dev/null
+++ b/boards/fanke/fk743m5_xih6/support/openocd.cfg
@@ -0,0 +1,25 @@
+# Copyright (c) zack jiang, Honbo He <hehongbo918@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+source [find interface/stlink-dap.cfg]
+transport select "dapdirect_swd"
+
+set WORKAREASIZE 0x8000
+
+set CHIPNAME STM32H743XI
+set BOARDNAME FK743M5-XIH6
+
+source [find target/stm32h7x.cfg]
+
+# Enable debug when in low power modes
+set ENABLE_LOW_POWER 1
+
+# Stop Watchdog counters when halt
+set STOP_WATCHDOG 1
+
+# Reset configuration
+# use hardware reset, connect under reset
+# connect_assert_srst needed if low power mode application running (WFI...)
+reset_config srst_only srst_nogate connect_assert_srst
+set CONNECT_UNDER_RESET 1
+set CORE_RESET 0
diff --git a/boards/fanke/fk750m1_vbt6/doc/index.rst b/boards/fanke/fk750m1_vbt6/doc/index.rst
index 6a558bddc0873..f5340f336b6be 100644
--- a/boards/fanke/fk750m1_vbt6/doc/index.rst
+++ b/boards/fanke/fk750m1_vbt6/doc/index.rst
@@ -46,35 +46,7 @@ More information about STM32H750VB can be found here:
 Supported Features
 ==================
 
-The Zephyr ``fk750m1_vbt6`` board target supports the following hardware
-features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| FLASH       | on-chip    | flash memory                        |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| RNG         | on-chip    | True Random number generator        |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| SPI         | on-chip    | spi bus                             |
-+-------------+------------+-------------------------------------+
-| QUADSPI     | on-chip    | quadspi                             |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration per core can be found in
-:zephyr_file:`boards/fanke/fk750m1_vbt6/fk750m1_vbt6_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -108,6 +80,8 @@ The Zephyr console output is assigned to UART1. The default communication settin
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``fk750m1_vbt6`` board target can be built and flashed in the usual
 way (see :ref:`build_an_application` and :ref:`application_run` for more details).
 
diff --git a/boards/firefly/roc_rk3568_pc/doc/index.rst b/boards/firefly/roc_rk3568_pc/doc/index.rst
index bd55e747c5197..e26092db5766b 100644
--- a/boards/firefly/roc_rk3568_pc/doc/index.rst
+++ b/boards/firefly/roc_rk3568_pc/doc/index.rst
@@ -42,18 +42,7 @@ has frequency up to 2.0GHz. Zephyr OS is ported to run on it.
 Supported Features
 ==================
 
-The Zephyr roc_rk3568_pc board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| GIC-v3    | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| ARM TIMER | on-chip    | system clock                        |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Devices
 ========
@@ -72,6 +61,8 @@ CPU's UART2.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use U-Boot to load the zephyr.bin to the memory and kick it:
 
 .. code-block:: console
diff --git a/boards/franzininho/esp32s2_franzininho/doc/index.rst b/boards/franzininho/esp32s2_franzininho/doc/index.rst
index 47f223b83ca28..bdbc20574ecdb 100644
--- a/boards/franzininho/esp32s2_franzininho/doc/index.rst
+++ b/boards/franzininho/esp32s2_franzininho/doc/index.rst
@@ -47,6 +47,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.dts b/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.dts
index 2b182b569cbe7..f5e6429233ac2 100644
--- a/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.dts
+++ b/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.dts
@@ -111,3 +111,7 @@
 &wdt0 {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.yaml b/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.yaml
index da3da1bdc3ace..4fc82a2f23d76 100644
--- a/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.yaml
+++ b/boards/franzininho/esp32s2_franzininho/esp32s2_franzininho.yaml
@@ -14,4 +14,5 @@ supported:
 testing:
   ignore_tags:
     - heap
+    - bluetooth
 vendor: franzininho
diff --git a/boards/fysetc/ucan/doc/index.rst b/boards/fysetc/ucan/doc/index.rst
index f9b4b53809f84..725d87e62a4d4 100644
--- a/boards/fysetc/ucan/doc/index.rst
+++ b/boards/fysetc/ucan/doc/index.rst
@@ -16,28 +16,7 @@ drawings are available in the `UCAN GitHub repository`_.
 Supported Features
 ==================
 
-The ``ucan`` board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB                                 |
-+-----------+------------+-------------------------------------+
-| CAN1      | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/fysetc/ucan/ucan_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -48,6 +27,8 @@ configured to provide a system clock of 48 MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/gaisler/generic_leon3/doc/index.rst b/boards/gaisler/generic_leon3/doc/index.rst
index 9f7781f3e2119..0dde96f2fc763 100644
--- a/boards/gaisler/generic_leon3/doc/index.rst
+++ b/boards/gaisler/generic_leon3/doc/index.rst
@@ -17,6 +17,8 @@ M2GL-EVAL-KIT.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/gaisler/gr716a_mini/doc/index.rst b/boards/gaisler/gr716a_mini/doc/index.rst
index 0f72330610554..77cf723119212 100644
--- a/boards/gaisler/gr716a_mini/doc/index.rst
+++ b/boards/gaisler/gr716a_mini/doc/index.rst
@@ -26,6 +26,8 @@ if enabled in GRMON, is preserved.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/gardena/sgrm/doc/index.rst b/boards/gardena/sgrm/doc/index.rst
index 40d05a9f4f340..5b0da0a61c735 100644
--- a/boards/gardena/sgrm/doc/index.rst
+++ b/boards/gardena/sgrm/doc/index.rst
@@ -24,24 +24,7 @@ Hardware
 Supported Features
 ==================
 
-The ``sgrm`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -77,6 +60,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/gd/gd32a503v_eval/doc/index.rst b/boards/gd/gd32a503v_eval/doc/index.rst
index 8fcec05bdc34d..27e715227a709 100644
--- a/boards/gd/gd32a503v_eval/doc/index.rst
+++ b/boards/gd/gd32a503v_eval/doc/index.rst
@@ -39,47 +39,7 @@ For more information about the GD32A503 SoC and GD32A503V-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v8m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - PINMUX
-     - :kconfig:option:`CONFIG_PINCTRL`
-     - :dtcompatible:`gd,gd32-pinctrl-af`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`gd,gd32-adc`
-   * - DAC
-     - :kconfig:option:`CONFIG_DAC`
-     - :dtcompatible:`gd,gd32-dac`
-   * - FMC
-     - N/A
-     - :dtcompatible:`gd,gd32-flash-controller`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`gd,gd32-spi`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -90,6 +50,8 @@ is UART0 at PIN-72 and PIN-73.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before program your board make sure to configure boot setting and serial port.
 The default serial port is USART0.
 
diff --git a/boards/gd/gd32e103v_eval/doc/index.rst b/boards/gd/gd32e103v_eval/doc/index.rst
index 382bed8c7de0f..49d6f799199d5 100644
--- a/boards/gd/gd32e103v_eval/doc/index.rst
+++ b/boards/gd/gd32e103v_eval/doc/index.rst
@@ -43,24 +43,7 @@ For more information about the GD32E103 SoC and GD32E103V-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v7m-nvic`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -71,6 +54,8 @@ is UART0 at PIN-9 and PIN-10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before program your board make sure to configure boot setting and serial port.
 The default serial port is USART0.  This port uses header JP-5/6 to route
 signals between USB VBUS/ID and USART J2.
diff --git a/boards/gd/gd32e507v_start/doc/index.rst b/boards/gd/gd32e507v_start/doc/index.rst
index a8b8f7a946969..68eaf60ef49dc 100644
--- a/boards/gd/gd32e507v_start/doc/index.rst
+++ b/boards/gd/gd32e507v_start/doc/index.rst
@@ -30,34 +30,7 @@ For more information about the GD32E507 SoC and GD32E507V-START board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v8m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-
-Other peripherals may be used if shields are connected to the board.
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -69,6 +42,8 @@ virtual COM port via the CN3 USB connector.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot jumpers as
 follows:
 
diff --git a/boards/gd/gd32e507z_eval/doc/index.rst b/boards/gd/gd32e507z_eval/doc/index.rst
index 610562b3eae22..f43863fbadb32 100644
--- a/boards/gd/gd32e507z_eval/doc/index.rst
+++ b/boards/gd/gd32e507z_eval/doc/index.rst
@@ -40,32 +40,7 @@ For more information about the GD32E507 SoC and GD32E507Z-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v8m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -77,6 +52,8 @@ virtual COM port via the J1 USB connector.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot jumpers as
 follows:
 
diff --git a/boards/gd/gd32f350r_eval/doc/index.rst b/boards/gd/gd32f350r_eval/doc/index.rst
index 2c7ad72635279..e30ab453690ef 100644
--- a/boards/gd/gd32f350r_eval/doc/index.rst
+++ b/boards/gd/gd32f350r_eval/doc/index.rst
@@ -35,29 +35,7 @@ For more information about the GD32F350 SoC and GD32F350R-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v7m-nvic`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - PINMUX
-     - :kconfig:option:`CONFIG_PINCTRL`
-     - :dtcompatible:`gd,gd32-pinctrl-af`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`gd,gd32-adc`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -68,6 +46,8 @@ is USART0 with TX connected at PA9 and RX at PA10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot and serial jumpers as follows:
 
 - J4:  Select 2-3 for both (labeled as ``L``)
diff --git a/boards/gd/gd32f403z_eval/doc/index.rst b/boards/gd/gd32f403z_eval/doc/index.rst
index d304094a3e76e..7d2ca320ca7b0 100644
--- a/boards/gd/gd32f403z_eval/doc/index.rst
+++ b/boards/gd/gd32f403z_eval/doc/index.rst
@@ -43,27 +43,7 @@ For more information about the GD32F403 SoC and GD32F403Z-Eval board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| EXTI      | on-chip    | EXTI interrupt        |
-|           |            | controller            |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | gpio                  |
-+-----------+------------+-----------------------+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| PWM       | on-chip    | PWM                   |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port-polling   |
-+-----------+------------+-----------------------+
-| ADC       | on-chip    | ADC                   |
-+-----------+------------+-----------------------+
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -74,6 +54,8 @@ is UART0 at PIN-9 and PIN-10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before program your board make sure to configure boot setting and serial port.
 The default serial port is USART0.  This port uses header JP-5/6 to route
 signals between USB VBUS/ID and USART J2.
diff --git a/boards/gd/gd32f407v_start/doc/index.rst b/boards/gd/gd32f407v_start/doc/index.rst
index 68332eb51b8de..615659bf8209a 100644
--- a/boards/gd/gd32f407v_start/doc/index.rst
+++ b/boards/gd/gd32f407v_start/doc/index.rst
@@ -30,34 +30,7 @@ For more information about the GD32F407 SoC and GD32F407V-START board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v7m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-
-Other peripherals may be used if shields are connected to the board.
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -68,6 +41,8 @@ is USART0 with TX connected at PB6 and RX at PB7.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot jumpers as
 follows:
 
diff --git a/boards/gd/gd32f450i_eval/doc/index.rst b/boards/gd/gd32f450i_eval/doc/index.rst
index d342cc9774d0b..05b2c20ba7a65 100644
--- a/boards/gd/gd32f450i_eval/doc/index.rst
+++ b/boards/gd/gd32f450i_eval/doc/index.rst
@@ -43,44 +43,7 @@ For more information about the GD32F450 SoC and GD32F450I-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v7m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - DAC
-     - :kconfig:option:`CONFIG_DAC`
-     - :dtcompatible:`gd,gd32-dac`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`gd,gd32-i2c`
-   * - EEPROM
-     - :kconfig:option:`CONFIG_EEPROM`
-     - :dtcompatible:`atmel,at24`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`gd,gd32-adc`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -91,6 +54,8 @@ is USART0 with TX connected at PA9 and RX at PA10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot and serial jumpers
 as follows:
 
diff --git a/boards/gd/gd32f450v_start/doc/index.rst b/boards/gd/gd32f450v_start/doc/index.rst
index 36870e0c6674c..6105b6afc16b5 100644
--- a/boards/gd/gd32f450v_start/doc/index.rst
+++ b/boards/gd/gd32f450v_start/doc/index.rst
@@ -30,34 +30,7 @@ For more information about the GD32F450 SoC and GD32F450V-START board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v8m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-
-Other peripherals may be used if shields are connected to the board.
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -70,6 +43,8 @@ UART-USB adapter.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot jumpers as
 follows:
 
diff --git a/boards/gd/gd32f450z_eval/doc/index.rst b/boards/gd/gd32f450z_eval/doc/index.rst
index 5a8d8b74763e9..7b012d1ddb2cc 100644
--- a/boards/gd/gd32f450z_eval/doc/index.rst
+++ b/boards/gd/gd32f450z_eval/doc/index.rst
@@ -41,41 +41,7 @@ For more information about the GD32F450 SoC and GD32F450Z-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v7m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - DAC
-     - :kconfig:option:`CONFIG_DAC`
-     - :dtcompatible:`gd,gd32-dac`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`gd,gd32-i2c`
-   * - EEPROM
-     - :kconfig:option:`CONFIG_EEPROM`
-     - :dtcompatible:`atmel,at24`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -86,6 +52,8 @@ is USART0 with TX connected at PA9 and RX at PA10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot and serial jumpers
 as follows:
 
diff --git a/boards/gd/gd32f470i_eval/doc/index.rst b/boards/gd/gd32f470i_eval/doc/index.rst
index 1a8865f4d06fd..4c90c4d3f1249 100644
--- a/boards/gd/gd32f470i_eval/doc/index.rst
+++ b/boards/gd/gd32f470i_eval/doc/index.rst
@@ -42,44 +42,7 @@ For more information about the GD32F470 SoC and GD32F470I-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v7m-nvic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - DAC
-     - :kconfig:option:`CONFIG_DAC`
-     - :dtcompatible:`gd,gd32-dac`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`gd,gd32-i2c`
-   * - EEPROM
-     - :kconfig:option:`CONFIG_EEPROM`
-     - :dtcompatible:`atmel,at24`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`gd,gd32-spi`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -90,6 +53,8 @@ is USART0 with TX connected at PA9 and RX at PA10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot and serial jumpers
 as follows:
 
diff --git a/boards/gd/gd32l233r_eval/doc/index.rst b/boards/gd/gd32l233r_eval/doc/index.rst
index d677085625606..d025a2bf96e9e 100644
--- a/boards/gd/gd32l233r_eval/doc/index.rst
+++ b/boards/gd/gd32l233r_eval/doc/index.rst
@@ -34,35 +34,7 @@ For more information about the GD32L233 SoC and GD32L233R-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - EXTI
-     - :kconfig:option:`CONFIG_GD32_EXTI`
-     - :dtcompatible:`gd,gd32-exti`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v8m-nvic`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - PINMUX
-     - :kconfig:option:`CONFIG_PINCTRL`
-     - :dtcompatible:`gd,gd32-pinctrl-af`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`gd,gd32-adc`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -74,6 +46,8 @@ CH04E serial connector with Mini-USB.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Using J-Link
 =============
 
diff --git a/boards/gd/gd32vf103c_starter/doc/index.rst b/boards/gd/gd32vf103c_starter/doc/index.rst
index 40b22fa18c5af..a443dbde5f3cb 100644
--- a/boards/gd/gd32vf103c_starter/doc/index.rst
+++ b/boards/gd/gd32vf103c_starter/doc/index.rst
@@ -30,29 +30,7 @@ For more information about the GD32VF103 SoC and GD32VF103C-STARTER board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - Machine timer
-     - :kconfig:option:`CONFIG_RISCV_MACHINE_TIMER`
-     - :dtcompatible:`riscv,machine-timer`
-   * - Nuclei ECLIC Interrupt Controller
-     - :kconfig:option:`CONFIG_NUCLEI_ECLIC`
-     - :dtcompatible:`nuclei,eclic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -63,6 +41,8 @@ TX connected at PA9 and RX at PA10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot and serial jumpers
 as follows:
 
diff --git a/boards/gd/gd32vf103v_eval/doc/index.rst b/boards/gd/gd32vf103v_eval/doc/index.rst
index 773262c8eabee..2f8dd496f615e 100644
--- a/boards/gd/gd32vf103v_eval/doc/index.rst
+++ b/boards/gd/gd32vf103v_eval/doc/index.rst
@@ -37,32 +37,7 @@ For more information about the GD32VF103 SoC and GD32VF103V-EVAL board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - Machine timer
-     - :kconfig:option:`CONFIG_RISCV_MACHINE_TIMER`
-     - :dtcompatible:`riscv,machine-timer`
-   * - Nuclei ECLIC Interrupt Controller
-     - :kconfig:option:`CONFIG_NUCLEI_ECLIC`
-     - :dtcompatible:`nuclei,eclic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`gd,gd32-adc`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -73,6 +48,8 @@ is USART0 with TX connected at PA9 and RX at PA10.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before programming your board make sure to configure boot and serial jumpers
 as follows:
 
diff --git a/boards/google/dragonclaw/doc/index.rst b/boards/google/dragonclaw/doc/index.rst
index 3f717a84341f9..ed5c8c1113592 100644
--- a/boards/google/dragonclaw/doc/index.rst
+++ b/boards/google/dragonclaw/doc/index.rst
@@ -26,6 +26,8 @@ Peripherial Mapping
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build application as usual for the ``dragonclaw`` board, and flash
 using μServo or an external J-Link connected to J4. If μServo is used, please
 follow the `Chromium EC Flashing Documentation`_.
diff --git a/boards/google/icetower/doc/index.rst b/boards/google/icetower/doc/index.rst
index 45ecb81be2dcd..7106102f718fe 100644
--- a/boards/google/icetower/doc/index.rst
+++ b/boards/google/icetower/doc/index.rst
@@ -26,6 +26,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build application as usual for the ``google_icetower`` board, and flash
 using μServo or an external J-Link connected to J4. If μServo is used, please
 follow the `Chromium EC Flashing Documentation`_.
diff --git a/boards/google/quincy/doc/index.rst b/boards/google/quincy/doc/index.rst
index 12dc09329ca49..ec960007ec8bc 100644
--- a/boards/google/quincy/doc/index.rst
+++ b/boards/google/quincy/doc/index.rst
@@ -26,6 +26,8 @@ Peripheral Mapping
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build application as usual for the ``google_quincy`` board target, and flash
 using μServo or an external J-Link connected to J4. If μServo is used, please
 follow the `Chromium EC Flashing Documentation`_ and
diff --git a/boards/google/twinkie_v2/doc/index.rst b/boards/google/twinkie_v2/doc/index.rst
index 3ba2f42e2672c..89450cf04ffa3 100644
--- a/boards/google/twinkie_v2/doc/index.rst
+++ b/boards/google/twinkie_v2/doc/index.rst
@@ -14,22 +14,7 @@ Hardware
 Supported Features
 ==================
 
-The following features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/google/twinkie_v2/google_twinkie_v2_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -45,6 +30,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build application as usual for the ``google_twinkie_v2`` board, and flash
 using dfu-util or J-Link.
 
diff --git a/boards/hardkernel/odroid_go/doc/index.rst b/boards/hardkernel/odroid_go/doc/index.rst
index 0963435fa3d45..3c14c9c23b0f8 100644
--- a/boards/hardkernel/odroid_go/doc/index.rst
+++ b/boards/hardkernel/odroid_go/doc/index.rst
@@ -51,23 +51,7 @@ External Connector
 Supported Features
 ==================
 
-The Zephyr odroid_go board configuration supports the following hardware
-features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| SPI        | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -89,6 +73,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/hardkernel/odroid_go/odroid_go_procpu.dts b/boards/hardkernel/odroid_go/odroid_go_procpu.dts
index 386627ff3583b..38510fbeadfd2 100644
--- a/boards/hardkernel/odroid_go/odroid_go_procpu.dts
+++ b/boards/hardkernel/odroid_go/odroid_go_procpu.dts
@@ -174,3 +174,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/heltec/heltec_wifi_lora32_v2/doc/index.rst b/boards/heltec/heltec_wifi_lora32_v2/doc/index.rst
index c4987a76b8fc7..abe91f4ca90d2 100644
--- a/boards/heltec/heltec_wifi_lora32_v2/doc/index.rst
+++ b/boards/heltec/heltec_wifi_lora32_v2/doc/index.rst
@@ -39,6 +39,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts
index c641e773e0725..426a7a1337874 100644
--- a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts
+++ b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts
@@ -115,5 +115,9 @@
 	status = "okay";
 };
 
+&wifi {
+	status = "okay";
+};
+
 /* Required by the ssd1306_128x64 shield which enables the OLED display */
 arduino_i2c: &i2c0 {};
diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/doc/index.rst b/boards/heltec/heltec_wireless_stick_lite_v3/doc/index.rst
index 4f6430965e5a4..431f83d41ebeb 100644
--- a/boards/heltec/heltec_wireless_stick_lite_v3/doc/index.rst
+++ b/boards/heltec/heltec_wireless_stick_lite_v3/doc/index.rst
@@ -20,13 +20,8 @@ The main hardware features are:
 
 Supported Features
 ==================
-- LoRa via SPI
-- UART0 (USB Serial via CP2102)
-- UART1
-- I2C
-- CAN (optional, need to enable)
-- PWM LED
-- User Switch / Button
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -146,6 +141,8 @@ below to retrieve those files.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts
index 9e02e3db483cc..631d873cd10bb 100644
--- a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts
+++ b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts
@@ -176,3 +176,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/holyiot/yj16019/board.cmake b/boards/holyiot/yj16019/board.cmake
index 4ffa4da957837..6de15b50c2965 100644
--- a/boards/holyiot/yj16019/board.cmake
+++ b/boards/holyiot/yj16019/board.cmake
@@ -1,4 +1,5 @@
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/holyiot/yj16019/doc/index.rst b/boards/holyiot/yj16019/doc/index.rst
index 86575a0838bcd..867fbdf88a6e2 100644
--- a/boards/holyiot/yj16019/doc/index.rst
+++ b/boards/holyiot/yj16019/doc/index.rst
@@ -30,34 +30,7 @@ The nRF52832 of the Holyiot YJ-16019 is clocked by an external crystal with a fr
 Supported Features
 ==================
 
-The holyiot_yj16019 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -71,6 +44,8 @@ LED and push button
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``holyiot_yj16019`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details); however, an external
diff --git a/boards/iar/index.rst b/boards/iar/index.rst
new file mode 100644
index 0000000000000..3cc895fdb5553
--- /dev/null
+++ b/boards/iar/index.rst
@@ -0,0 +1,10 @@
+.. _boards-iar:
+
+IAR
+###
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/iar/stm32f429ii_aca/Kconfig.stm32f429ii_aca b/boards/iar/stm32f429ii_aca/Kconfig.stm32f429ii_aca
new file mode 100644
index 0000000000000..f04f3979a7ea2
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/Kconfig.stm32f429ii_aca
@@ -0,0 +1,6 @@
+# Copyright (c) 2016 Linaro Limited.
+# Copyright (c) 2025 IAR Systems.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_STM32F429II_ACA
+	select SOC_STM32F429XX
diff --git a/boards/iar/stm32f429ii_aca/board.cmake b/boards/iar/stm32f429ii_aca/board.cmake
new file mode 100644
index 0000000000000..1d0b4be283d68
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/board.cmake
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=STM32F429II" "--speed=4000")
+board_runner_args(pyocd "--target=stm32f429xi")
+board_runner_args(pyocd "--flash-opt=-O reset_type=hw")
+board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset")
+
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/iar/stm32f429ii_aca/board.yml b/boards/iar/stm32f429ii_aca/board.yml
new file mode 100644
index 0000000000000..67419bb50680e
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: stm32f429ii_aca
+  full_name: STM32F429II-ACA
+  vendor: iar
+  socs:
+    - name: stm32f429xx
diff --git a/boards/iar/stm32f429ii_aca/doc/img/stm32f429ii_aca.webp b/boards/iar/stm32f429ii_aca/doc/img/stm32f429ii_aca.webp
new file mode 100644
index 0000000000000..1ce5bb76c168f
Binary files /dev/null and b/boards/iar/stm32f429ii_aca/doc/img/stm32f429ii_aca.webp differ
diff --git a/boards/iar/stm32f429ii_aca/doc/index.rst b/boards/iar/stm32f429ii_aca/doc/index.rst
new file mode 100644
index 0000000000000..cc95c94a0ff54
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/doc/index.rst
@@ -0,0 +1,138 @@
+.. zephyr:board:: stm32f429ii_aca
+
+Overview
+********
+
+The IAR STM32F429II-ACA evaluation board features an ARM Cortex-M4 based STM32F429II MCU.
+Here are some highlights of the STM32F429II-ACA board:
+
+- STM32 microcontroller in LQFP144 package
+- JTAG/SWD debugger/programmer interface
+- Flexible board power supply
+
+  - JTAG/SWD connector
+  - USB HS connector
+
+- 3x user push-buttons and 1x RESET push-button
+- Open-close switch and on-auto-off switch
+- 2x capacitive touch panels
+- USB OTG with mini-USB connector
+- Small speaker
+- Trimmer potentiometer
+- Nine LEDs
+
+  - 1x power LED
+  - 3x car traffic light LEDs
+  - 2x pedestrian traffic light LEDs
+  - 1x car interior light LED
+  - 2x user LEDs
+
+Schematics for the board can be found `here <stm32f429ii-aca-schematics_>`_
+
+Hardware
+********
+
+The STM32F429II-ACA evaluation board provides the following hardware components:
+
+- STM32F429II in LQFP144 package
+- ARM |reg| 32-bit Cortex |reg| -M4 CPU with FPU
+- 180 MHz max CPU frequency
+- VDD from 1.8 V to 3.6 V
+- 2 MB Internal Flash
+- 4 Mbit External Flash
+- 256+4 KB SRAM including 64-KB of core coupled memory
+- GPIO with external interrupt capability
+- 12-bit ADC
+- 12-bit DAC
+- RTC
+- General Purpose Timers
+- I2C
+- SPI
+- USB 2.0 OTG HS/FS with dedicated DMA, on-chip full-speed PHY and ULPI
+- CRC calculation unit
+- True random number generator
+- DMA Controller
+
+More information about STM32F429II can be found here:
+
+- `STM32F429II on www.st.com`_
+- `STM32F429 Reference Manual`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+- I2C_1_SCL : PB8
+- I2C_1_SDA : PB7
+- I2C_2_SCL : PH4
+- I2C_2_SDA : PH5
+- SPI_5_NSS : PF6
+- SPI_5_SCK : PF7
+- SPI_5_MISO : PF8
+- SPI_5_MOSI : PF9
+- OTG_HS_ID : PB12
+- OTG_HS_DM : PB14
+- OTG_HS_DP : PB15
+
+Serial Port
+===========
+
+By default, the STM32F429II-ACA evaluation board has no physical serial port available.
+The board has up to 8 UARTs, of which none are used.
+
+USB Port
+========
+
+The STM32F429II-ACA evaluation board has a USB HS capable Mini-USB port. It is connected to the on-chip
+OTG_HS peripheral.
+
+Programming and Debugging
+*************************
+
+Applications for the ``stm32f429ii_aca`` board configuration can be built
+and flashed in the usual way (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Flashing
+========
+
+In order to flash this board using west, an external debug probe such as a Segger J-Link
+has to be connected through the JTAG/SWD connector on the board.
+By default, the board is set to be flashed using the jlink runner.
+Alternatively, openocd, or pyocd can also be used as runners to flash the board using
+the ``--runner`` (or ``-r``) option:
+
+.. code-block:: console
+
+   $ west flash --runner openocd
+   $ west flash --runner pyocd
+
+First, connect the STM32F429II-ACA evaluation board to your host computer using
+your debug probe through the JTAG/SWD connector to prepare it for flashing.
+Then build and flash your application.
+
+Here is an example for the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: stm32f429ii_aca
+   :goals: build flash
+
+LED0 should then begin to blink continuously with a 1-second delay.
+
+References
+**********
+
+.. target-notes::
+
+.. _stm32f429ii-aca-schematics:
+   https://iar.my.salesforce.com/sfc/p/#30000000YATY/a/Qx000000vZVh/EzlIqYKIBVXN8PN4Q8MgtowSZrR_vZarwLiNJXw7UJw
+
+.. _STM32F429II on www.st.com:
+   https://www.st.com/en/microcontrollers-microprocessors/stm32f429ii.html
+
+.. _STM32F429 Reference Manual:
+   https://www.st.com/content/ccc/resource/technical/document/reference_manual/3d/6d/5a/66/b4/99/40/d4/DM00031020.pdf/files/DM00031020.pdf/jcr:content/translations/en.DM00031020.pdf
diff --git a/boards/iar/stm32f429ii_aca/stm32f429ii_aca.dts b/boards/iar/stm32f429ii_aca/stm32f429ii_aca.dts
new file mode 100644
index 0000000000000..ff7635b676d35
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/stm32f429ii_aca.dts
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2017 Linaro Limited
+ * Copyright (c) 2024 STMicroelectronics
+ * Copyright (c) 2025 IAR Systems
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/f4/stm32f429Xi.dtsi>
+#include <st/f4/stm32f429iitx-pinctrl.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "IAR STM32F429II-ACA board";
+	compatible = "iar,stm32f429ii-aca";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,ccm = &ccm0;
+	};
+
+	sdram2: sdram@d0000000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		device_type = "memory";
+		reg = <0xd0000000 DT_SIZE_M(8)>;
+		zephyr,memory-region = "SDRAM2";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		traffic_red_led: led_0 {
+			gpios = <&gpioa 4 GPIO_ACTIVE_LOW>;
+			label = "LED0";
+		};
+
+		traffic_yellow_led: led_1 {
+			gpios = <&gpiod 4 GPIO_ACTIVE_LOW>;
+			label = "LED1";
+		};
+
+		traffic_green_led: led_2 {
+			gpios = <&gpiod 5 GPIO_ACTIVE_LOW>;
+			label = "LED2";
+		};
+
+		car_led: led_3 {
+			gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;
+			label = "LED3";
+		};
+
+		pedestrian_red_led: led_4 {
+			gpios = <&gpiod 7 GPIO_ACTIVE_LOW>;
+			label = "LED4";
+		};
+
+		pedestrian_green_led: led_5 {
+			gpios = <&gpiod 11 GPIO_ACTIVE_LOW>;
+			label = "LED5";
+		};
+
+		user_led_1: led_6 {
+			gpios = <&gpiod 12 GPIO_ACTIVE_LOW>;
+			label = "LED6";
+		};
+
+		user_led_2: led_7 {
+			gpios = <&gpiod 13 GPIO_ACTIVE_LOW>;
+			label = "LED7";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		button0: button_0 {
+			label = "BUT0";
+			gpios = <&gpioa 0 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		button1: button_1 {
+			label = "BUT1";
+			gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+
+		button2: button_2 {
+			label = "BUT2";
+			gpios = <&gpiog 9 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_2>;
+		};
+
+		open_close_switch: switch_0 {
+			label = "OPEN/CLOSE SWITCH";
+			gpios = <&gpioi 11 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_3>;
+		};
+
+		interior_light_switch_on: switch_1 {
+			label = "ON";
+			gpios = <&gpioi 10 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_4>;
+		};
+
+		interior_light_switch_auto: switch_2 {
+			label = "AUTO";
+			gpios = <&gpioi 9 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_5>;
+		};
+
+		interior_light_switch_off: switch_3 {
+			label = "OFF";
+			gpios = <&gpioi 8 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_6>;
+		};
+
+		cap_button0: cap_button_0 {
+			label = "CAP_BUT0";
+			gpios = <&gpioh 6 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_7>;
+		};
+
+		cap_button1: cap_button_1 {
+			label = "CAP_BUT1";
+			gpios = <&gpioh 7 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_8>;
+		};
+	};
+
+	aliases {
+		led0 = &traffic_red_led;
+		led1 = &traffic_yellow_led;
+		led2 = &traffic_green_led;
+		led3 = &car_led;
+		led4 = &pedestrian_red_led;
+		led5 = &pedestrian_green_led;
+		led6 = &user_led_1;
+		led7 = &user_led_2;
+		sw0 = &button0;
+		sw1 = &button1;
+		sw2 = &button2;
+		sw3 = &open_close_switch;
+		sw4 = &interior_light_switch_on;
+		sw5 = &interior_light_switch_auto;
+		sw6 = &interior_light_switch_off;
+		sw7 = &cap_button0;
+		sw8 = &cap_button1;
+	};
+};
+
+&clk_lsi {
+	status = "okay";
+};
+
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(8)>;
+	status = "okay";
+};
+
+&pll {
+	div-m = <8>;
+	mul-n = <336>;
+	div-p = <2>;
+	div-q = <7>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(168)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <4>;
+	apb2-prescaler = <2>;
+};
+
+&rtc {
+	clocks = <&rcc STM32_CLOCK_BUS_APB1 0x10000000>,
+		 <&rcc STM32_SRC_LSI RTC_SEL(2)>;
+	status = "okay";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_scl_pb8 &i2c1_sda_pb7>;
+	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>;
+};
+
+
+&spi5 {
+	pinctrl-0 = <&spi5_nss_pf6 &spi5_sck_pf7
+		     &spi5_miso_pf8 &spi5_mosi_pf9>;
+	pinctrl-names = "default";
+	status = "okay";
+	cs-gpios = <&gpioc 2 GPIO_ACTIVE_LOW>;
+};
+
+&fmc {
+	status = "okay";
+	pinctrl-0 = <&fmc_nbl0_pe0 &fmc_nbl1_pe1
+		     &fmc_sdclk_pg8 &fmc_sdnwe_pc0 &fmc_sdcke0_pc3
+		     &fmc_sdne0_pc2 &fmc_sdnras_pf11 &fmc_sdncas_pg15
+		     &fmc_a0_pf0 &fmc_a1_pf1 &fmc_a2_pf2 &fmc_a3_pf3
+		     &fmc_a4_pf4 &fmc_a5_pf5 &fmc_a6_pf12 &fmc_a7_pf13
+		     &fmc_a8_pf14 &fmc_a9_pf15 &fmc_a10_pg0 &fmc_a11_pg1
+		     &fmc_a12_pg2 &fmc_a13_pg3 &fmc_a14_pg4 &fmc_a15_pg5
+		     &fmc_d0_pd14 &fmc_d1_pd15 &fmc_d2_pd0 &fmc_d3_pd1
+		     &fmc_d4_pe7 &fmc_d5_pe8 &fmc_d6_pe9 &fmc_d7_pe10
+		     &fmc_d8_pe11 &fmc_d9_pe12 &fmc_d10_pe13 &fmc_d11_pe14
+		     &fmc_d12_pe15 &fmc_d13_pd8 &fmc_d14_pd9 &fmc_d15_pd10>;
+	pinctrl-names = "default";
+
+	sdram {
+		status = "okay";
+
+		power-up-delay = <100>;
+		num-auto-refresh = <1>;
+		mode-register = <0>;
+		refresh-rate = <1386>;
+
+		bank@1 {
+			reg = <1>;
+
+			st,sdram-control = <STM32_FMC_SDRAM_NC_8
+					    STM32_FMC_SDRAM_NR_12
+					    STM32_FMC_SDRAM_MWID_16
+					    STM32_FMC_SDRAM_NB_4
+					    STM32_FMC_SDRAM_CAS_2
+					    STM32_FMC_SDRAM_SDCLK_PERIOD_3
+					    STM32_FMC_SDRAM_RBURST_DISABLE
+					    STM32_FMC_SDRAM_RPIPE_1>;
+			st,sdram-timing = <2 7 4 7 2 2 2>;
+		};
+	};
+};
+
+&adc2 {
+	compatible = "st,stm32f4-adc", "st,stm32-adc";
+	pinctrl-0 = <&adc2_in6_pa6>;
+	pinctrl-names = "default";
+	st,adc-prescaler = <2>;
+	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@6 {
+		reg = <6>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};
+
+&dac1 {
+	pinctrl-0 = <&dac_out2_pa5>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+zephyr_udc0: &usbotg_hs {
+	pinctrl-0 = <&usb_otg_hs_dm_pb14 &usb_otg_hs_dp_pb15 &usb_otg_hs_id_pb12>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/iar/stm32f429ii_aca/stm32f429ii_aca.yaml b/boards/iar/stm32f429ii_aca/stm32f429ii_aca.yaml
new file mode 100644
index 0000000000000..b430c8f5d9bf0
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/stm32f429ii_aca.yaml
@@ -0,0 +1,15 @@
+identifier: stm32f429ii_aca
+name: IAR STM32F429II ACA
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - iar
+ram: 192
+flash: 2048
+supported:
+  - counter
+  - i2c
+  - spi
+vendor: iar
diff --git a/boards/iar/stm32f429ii_aca/stm32f429ii_aca_defconfig b/boards/iar/stm32f429ii_aca/stm32f429ii_aca_defconfig
new file mode 100644
index 0000000000000..75a3154c8fb16
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/stm32f429ii_aca_defconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable GPIO
+CONFIG_GPIO=y
diff --git a/boards/iar/stm32f429ii_aca/support/openocd.cfg b/boards/iar/stm32f429ii_aca/support/openocd.cfg
new file mode 100644
index 0000000000000..fa1360a714323
--- /dev/null
+++ b/boards/iar/stm32f429ii_aca/support/openocd.cfg
@@ -0,0 +1,17 @@
+source [find interface/cmsis-dap.cfg]
+
+set CHIPNAME STM32F429IITx
+set BOARDNAME STM32F429II-ACA
+
+source [find target/stm32f4x.cfg]
+
+$_TARGETNAME configure -event gdb-attach {
+	echo "Debugger attaching: halting execution"
+	reset halt
+	gdb_breakpoint_override hard
+}
+
+$_TARGETNAME configure -event gdb-detach {
+	echo "Debugger detaching: resuming execution"
+	resume
+}
diff --git a/boards/index.rst b/boards/index.rst
index 0643a355e590d..9b83276abbfeb 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -24,6 +24,10 @@ this page <boards-shields>`.
      single field, selecting multiple options (such as two architectures) will show boards matching
      **either** option.
 
+   * The list of supported hardware features for each board is automatically generated using
+     information from the Devicetree. It may not be reflecting the full list of supported features
+     since some of them may not be enabled by default.
+
    * Can't find your exact board? Don't worry! If a similar board with the same or a closely related
      MCU exists, you can use it as a :ref:`starting point <create-your-board-directory>` for adding
      support for your own board.
diff --git a/boards/infineon/cy8ckit_062s2_ai/doc/index.rst b/boards/infineon/cy8ckit_062s2_ai/doc/index.rst
index 8395bcd98ce6c..a7c2ad2f4f62e 100644
--- a/boards/infineon/cy8ckit_062s2_ai/doc/index.rst
+++ b/boards/infineon/cy8ckit_062s2_ai/doc/index.rst
@@ -28,31 +28,7 @@ For more information about the CY8C624ABZI-S2D44 MCU SoC and CY8CKIT-062S2-AI bo
 Supported Features
 ==================
 
-The ``cy8ckit_062s2_ai/cy8c624abzi_s2d44`` board target supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | GPIO                  |
-+-----------+------------+-----------------------+
-| PINCTRL   | on-chip    | pin control           |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port-polling;  |
-|           |            | serial port-interrupt |
-+-----------+------------+-----------------------+
-| WATCHDOG  | on-chip    | watchdog              |
-+-----------+------------+-----------------------+
-
-
-The default configuration can be found in the defconfig and dts files:
-
-  - :zephyr_file:`boards/infineon/cy8ckit_062s2_ai/cy8ckit_062s2_ai_defconfig`
-  - :zephyr_file:`boards/infineon/cy8ckit_062s2_ai/cy8ckit_062s2_ai.dts`
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -87,6 +63,8 @@ Here is an example for building the :zephyr:code-sample:`blinky` sample applicat
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The CY8CKIT-062S2-AI board includes an onboard programmer/debugger (`KitProg3`_)
 to provide debugging, flash programming, and serial communication over USB.
 Flash and debug commands use OpenOCD and require a custom Infineon OpenOCD version,
diff --git a/boards/infineon/cy8ckit_062s4/doc/index.rst b/boards/infineon/cy8ckit_062s4/doc/index.rst
index b5e3e39cc1d84..8a1efe9fe282e 100644
--- a/boards/infineon/cy8ckit_062s4/doc/index.rst
+++ b/boards/infineon/cy8ckit_062s4/doc/index.rst
@@ -24,25 +24,7 @@ Hardware
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| PINCTRL   | on-chip    | pin control           |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port-polling;  |
-+-----------+------------+-----------------------+
-
-
-The default configuration can be found in the Kconfig
-
-:zephyr_file:`boards/infineon/cy8ckit_062s4/cy8ckit_062s4_defconfig`
+.. zephyr:board-supported-hw::
 
 Clock Configuration
 ===================
@@ -77,6 +59,8 @@ Here is an example for building the :zephyr:code-sample:`blinky` sample applicat
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The CY8CKIT-062S4 includes an onboard programmer/debugger (`KitProg3`_) to provide debugging, flash programming, and serial communication over USB. Flash and debug commands use OpenOCD and require a custom Infineon OpenOCD version, that supports KitProg3, to be installed.
 
 Infineon OpenOCD Installation
diff --git a/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig b/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig
index 063b782a33f97..54183d73c1ccb 100644
--- a/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig
+++ b/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig
@@ -20,6 +20,3 @@ CONFIG_GPIO=y
 
 # Enable clock controller
 CONFIG_CLOCK_CONTROL=y
-
-# Main Stack Size
-CONFIG_MAIN_STACK_SIZE=2048
diff --git a/boards/infineon/cy8cproto_062_4343w/doc/index.rst b/boards/infineon/cy8cproto_062_4343w/doc/index.rst
index f04c28e5d00a7..c4696ca8d866f 100644
--- a/boards/infineon/cy8cproto_062_4343w/doc/index.rst
+++ b/boards/infineon/cy8cproto_062_4343w/doc/index.rst
@@ -49,27 +49,7 @@ Kit Contents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | GPIO                  |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port-polling;  |
-|           |            | serial port-interrupt |
-+-----------+------------+-----------------------+
-
-
-The default configuration can be found in the Kconfig
-
-:zephyr_file:`boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig`
-
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -105,6 +85,8 @@ Here is an example for building the :zephyr:code-sample:`blinky` sample applicat
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The CY8CPROTO-062-4343W includes an onboard programmer/debugger (`KitProg3`_) to provide debugging, flash programming, and serial communication over USB. Flash and debug commands use OpenOCD and require a custom Infineon OpenOCD version, that supports KitProg3, to be installed.
 
 Infineon OpenOCD Installation
diff --git a/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig b/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig
index 0cbfa3b2e658b..51c814073a308 100644
--- a/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig
+++ b/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig
@@ -22,8 +22,5 @@ CONFIG_GPIO=y
 # Enable clock controller
 CONFIG_CLOCK_CONTROL=y
 
-# Main Stack Size
-CONFIG_MAIN_STACK_SIZE=2048
-
 # Add catcm0p sleep images for CM0 Devices
 CONFIG_SOC_PSOC6_CM0P_IMAGE_SLEEP=y
diff --git a/boards/infineon/cy8cproto_063_ble/doc/index.rst b/boards/infineon/cy8cproto_063_ble/doc/index.rst
index 90623b80382e7..f3c8326051371 100644
--- a/boards/infineon/cy8cproto_063_ble/doc/index.rst
+++ b/boards/infineon/cy8cproto_063_ble/doc/index.rst
@@ -22,38 +22,7 @@ For more information about the PSOC 63 BLE MCU SoC and CY8CPROTO-063-BLE board:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | GPIO                  |
-+-----------+------------+-----------------------+
-| PINCTRL   | on-chip    | pin control           |
-+-----------+------------+-----------------------+
-| SPI       | on-chip    | SPI                   |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port-polling;  |
-|           |            | serial port-interrupt |
-+-----------+------------+-----------------------+
-| I2C       | on-chip    | I2C                   |
-+-----------+------------+-----------------------+
-| PWM       | on-chip    | PWM                   |
-+-----------+------------+-----------------------+
-| Counter   | on-chip    | Counter               |
-+-----------+------------+-----------------------+
-| Bluetooth | on-chip    | Bluetooth             |
-+-----------+------------+-----------------------+
-
-
-The default configuration can be found in the Kconfig
-
-:zephyr_file:`boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig`
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -89,6 +58,8 @@ Here is an example for building the :zephyr:code-sample:`blinky` sample applicat
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The CY8CPROTO-063-BLE includes an onboard programmer/debugger (`KitProg3`_) to provide debugging, flash programming, and serial communication over USB. Flash and debug commands use OpenOCD and require a custom Infineon OpenOCD version, that supports KitProg3, to be installed.
 
 Infineon OpenOCD Installation
diff --git a/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig b/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig
index 156152944b6a8..c59deaae71c2b 100644
--- a/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig
+++ b/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig
@@ -20,8 +20,5 @@ CONFIG_GPIO=y
 # Enable clock controller
 CONFIG_CLOCK_CONTROL=y
 
-# Main Stack Size
-CONFIG_MAIN_STACK_SIZE=2048
-
 # Enable code/data relocation to move SMIF driver into RAM
 CONFIG_CODE_DATA_RELOCATION=y
diff --git a/boards/infineon/cyw920829m2evk_02/doc/index.rst b/boards/infineon/cyw920829m2evk_02/doc/index.rst
index d4c5193c3820d..0dd56962c1500 100644
--- a/boards/infineon/cyw920829m2evk_02/doc/index.rst
+++ b/boards/infineon/cyw920829m2evk_02/doc/index.rst
@@ -36,26 +36,7 @@ Kit Contents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | GPIO                  |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port-polling;  |
-|           |            | serial port-interrupt |
-+-----------+------------+-----------------------+
-
-
-The default configuration can be found in the Kconfig
-
-:zephyr_file:`boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig`
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -88,6 +69,8 @@ Here is an example for building the :zephyr:code-sample:`blinky` sample applicat
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The CYW920829M2EVK-02 includes an onboard programmer/debugger (`KitProg3`_) to provide debugging, flash programming, and serial communication over USB. Flash and debug commands use OpenOCD and require a custom Infineon OpenOCD version, that supports KitProg3, to be installed.
 
 The CYW920829M2EVK-02 supports RTT via a SEGGER JLink device, under the target name cyw20829_tm. This can be enabled for an application by building with the rtt-console snippet or setting the following config values: CONFIG_UART_CONSOLE=n, CONFIG_RTT_CONSOLE=y, and CONFIG_USE_SEGGER_RTT=y.
diff --git a/boards/infineon/xmc45_relax_kit/doc/index.rst b/boards/infineon/xmc45_relax_kit/doc/index.rst
index bfad619aedc35..5d89d5e2dbd1c 100644
--- a/boards/infineon/xmc45_relax_kit/doc/index.rst
+++ b/boards/infineon/xmc45_relax_kit/doc/index.rst
@@ -22,50 +22,9 @@ Details on the Relax Kit development board can be found in the `Relax Kit User M
 Supported Features
 ==================
 
-* The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 120MHz.
-
-The Relax Kit development board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port           |
-+-----------+------------+-----------------------+
-| SPI       | on-chip    | spi                   |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | gpio                  |
-+-----------+------------+-----------------------+
-| FLASH     | on-chip    | flash                 |
-+-----------+------------+-----------------------+
-| ADC       | on-chip    | adc                   |
-+-----------+------------+-----------------------+
-| DMA       | on-chip    | dma                   |
-+-----------+------------+-----------------------+
-| PWM       | on-chip    | pwm                   |
-+-----------+------------+-----------------------+
-| WATCHDOG  | on-chip    | watchdog              |
-+-----------+------------+-----------------------+
-| MDIO      | on-chip    | mdio                  |
-+-----------+------------+-----------------------+
-| ETHERNET  | on-chip    | ethernet              |
-+-----------+------------+-----------------------+
-| PTP       | on-chip    | ethernet              |
-+-----------+------------+-----------------------+
-| RTC       | on-chip    | rtc                   |
-+-----------+------------+-----------------------+
-
-More details about the supported peripherals are available in `XMC4500 TRM`_
-
-The default configuration can be found in the Kconfig
-
-:zephyr_file:`boards/infineon/xmc45_relax_kit/xmc45_relax_kit_defconfig`
-
-Other hardware features are not currently supported by the Zephyr kernel.
+.. zephyr:board-supported-hw::
+
+The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 120MHz.
 
 Build hello world sample
 ************************
@@ -78,6 +37,9 @@ Here is an example for building the :zephyr:code-sample:`hello_world` sample app
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 West Commands
 =============
 Here is an example for the :zephyr:code-sample:`hello_world` application.
diff --git a/boards/infineon/xmc47_relax_kit/doc/index.rst b/boards/infineon/xmc47_relax_kit/doc/index.rst
index d5796afd7ea85..09aa90843a03d 100644
--- a/boards/infineon/xmc47_relax_kit/doc/index.rst
+++ b/boards/infineon/xmc47_relax_kit/doc/index.rst
@@ -27,47 +27,9 @@ Details on the Relax Kit development board can be found in the `Relax Kit User M
 Supported Features
 ==================
 
-The Relax Kit development board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port           |
-+-----------+------------+-----------------------+
-| SPI       | on-chip    | spi                   |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | gpio                  |
-+-----------+------------+-----------------------+
-| FLASH     | on-chip    | flash                 |
-+-----------+------------+-----------------------+
-| ADC       | on-chip    | adc                   |
-+-----------+------------+-----------------------+
-| DMA       | on-chip    | dma                   |
-+-----------+------------+-----------------------+
-| PWM       | on-chip    | pwm                   |
-+-----------+------------+-----------------------+
-| WATCHDOG  | on-chip    | watchdog              |
-+-----------+------------+-----------------------+
-| MDIO      | on-chip    | mdio                  |
-+-----------+------------+-----------------------+
-| ETHERNET  | on-chip    | ethernet              |
-+-----------+------------+-----------------------+
-| PTP       | on-chip    | ethernet              |
-+-----------+------------+-----------------------+
-| RTC       | on-chip    | rtc                   |
-+-----------+------------+-----------------------+
+.. zephyr:board-supported-hw::
 
 More details about the supported peripherals are available in `XMC4700 TRM`_
-Other hardware features are not currently supported by the Zephyr kernel.
-
-The default configuration can be found in the Kconfig
-
-:zephyr_file:`boards/infineon/xmc47_relax_kit/xmc47_relax_kit_defconfig`
 
 Build hello world sample
 ************************
@@ -80,6 +42,9 @@ Here is an example for building the :zephyr:code-sample:`hello_world` sample app
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 West Commands
 =============
 Here is an example for the :zephyr:code-sample:`hello_world` application.
diff --git a/boards/innblue/innblue21/board.cmake b/boards/innblue/innblue21/board.cmake
index 12afc83afe364..641562c24c499 100644
--- a/boards/innblue/innblue21/board.cmake
+++ b/boards/innblue/innblue21/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/innblue/innblue21/doc/index.rst b/boards/innblue/innblue21/doc/index.rst
index bafb7d9911a4a..6a923bc969a33 100644
--- a/boards/innblue/innblue21/doc/index.rst
+++ b/boards/innblue/innblue21/doc/index.rst
@@ -20,34 +20,7 @@ The following parts are built into the board:
 Supported Features
 ==================
 
-The innblue21 board configuration supports the following
-hardware (as of nRF9160) features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -77,6 +50,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 innblue21 supports the Armv8m Security Extension, and by default boots
 in the Secure state.
 
diff --git a/boards/innblue/innblue22/board.cmake b/boards/innblue/innblue22/board.cmake
index 12afc83afe364..641562c24c499 100644
--- a/boards/innblue/innblue22/board.cmake
+++ b/boards/innblue/innblue22/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/innblue/innblue22/doc/index.rst b/boards/innblue/innblue22/doc/index.rst
index 9e84c4691dfa0..d87a7b222a81f 100644
--- a/boards/innblue/innblue22/doc/index.rst
+++ b/boards/innblue/innblue22/doc/index.rst
@@ -20,34 +20,7 @@ The following parts are built into the board:
 Supported Features
 ==================
 
-The innblue22 board configuration supports the following
-hardware (as of nRF9160) features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -77,6 +50,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 innblue22 supports the Armv8m Security Extension, and by default boots
 in the Secure state.
 
diff --git a/boards/intel/adl/Kconfig.defconfig b/boards/intel/adl/Kconfig.defconfig
index 3a6bcaf9ce02a..4e3f649a205dd 100644
--- a/boards/intel/adl/Kconfig.defconfig
+++ b/boards/intel/adl/Kconfig.defconfig
@@ -7,10 +7,10 @@ config BUILD_OUTPUT_STRIPPED
 config MP_MAX_NUM_CPUS
 	default 2
 
-# TSC on this board is 1.9 GHz, HPET and APIC are 19.2 MHz
+# TSC on this board is 1.5 GHz, HPET and APIC are 19.2 MHz
 config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 1900000000 if APIC_TSC_DEADLINE_TIMER
-	default 1900000000 if APIC_TIMER_TSC
+	default 1500000000 if APIC_TSC_DEADLINE_TIMER
+	default 1500000000 if APIC_TIMER_TSC
 	default 19200000
 
 if APIC_TIMER
diff --git a/boards/intel/adsp/Kconfig.defconfig b/boards/intel/adsp/Kconfig.defconfig
index eafedb0c550e6..8c804c48c7508 100644
--- a/boards/intel/adsp/Kconfig.defconfig
+++ b/boards/intel/adsp/Kconfig.defconfig
@@ -8,3 +8,18 @@ config DAI_SSP_HAS_POWER_CONTROL
 	def_bool y
 
 endif
+
+if BOARD_INTEL_ADSP
+
+config MAIN_STACK_SIZE
+	default 2048 if BOARD_INTEL_ADSP_CAVS25
+	default 2048 if BOARD_INTEL_ADSP_CAVS25_TGPH
+	default 2048 if BOARD_INTEL_ADSP_ACE15_MTPM
+	default 2048 if BOARD_INTEL_ADSP_ACE15_MTPM_SIM
+	default 2048 if BOARD_INTEL_ADSP_ACE20_LNL
+	default 2048 if BOARD_INTEL_ADSP_ACE20_LNL_SIM
+	default 4096 if BOARD_INTEL_ADSP_ACE30
+	default 4096 if BOARD_INTEL_ADSP_ACE30_PTL
+	default 4096 if BOARD_INTEL_ADSP_ACE30_PTL_SIM
+
+endif # BOARD_INTEL_ADSP
diff --git a/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig b/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig
index 2237dfb963a20..9c0d2ca0cda6e 100644
--- a/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig
+++ b/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=2048
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
diff --git a/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig b/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig
index 7a0513272345a..8c36c0e39dda9 100644
--- a/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig
+++ b/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=2048
-
 CONFIG_INTEL_ADSP_SIM=y
 CONFIG_INTEL_ADSP_SIM_NO_SECONDARY_CORE_FLOW=y
 
diff --git a/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig b/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig
index 3d897eb967321..4f2503e2afcfb 100644
--- a/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig
+++ b/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=2048
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
diff --git a/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig b/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig
index 5f03e403e3c70..6acb302da0b7c 100644
--- a/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig
+++ b/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_INTEL_ADSP_SIM=y
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
diff --git a/boards/intel/adsp/intel_adsp_ace30_defconfig b/boards/intel/adsp/intel_adsp_ace30_defconfig
index 913d2a8c3e3a9..85f377409f7e0 100644
--- a/boards/intel/adsp/intel_adsp_ace30_defconfig
+++ b/boards/intel/adsp/intel_adsp_ace30_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=4096
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig b/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig
index 913d2a8c3e3a9..85f377409f7e0 100644
--- a/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig
+++ b/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=4096
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig b/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig
index 429223286bf0c..5373f0c0bf841 100644
--- a/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig
+++ b/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=2048
-
 CONFIG_INTEL_ADSP_SIM=y
 CONFIG_INTEL_ADSP_SIM_NO_SECONDARY_CORE_FLOW=y
 
diff --git a/boards/intel/adsp/intel_adsp_cavs25_defconfig b/boards/intel/adsp/intel_adsp_cavs25_defconfig
index 24443bce131fb..37aab5b06d447 100644
--- a/boards/intel/adsp/intel_adsp_cavs25_defconfig
+++ b/boards/intel/adsp/intel_adsp_cavs25_defconfig
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=2048
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
diff --git a/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig b/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig
index 7e79840a033cc..d842740df75c1 100644
--- a/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig
+++ b/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_MAIN_STACK_SIZE=2048
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 
diff --git a/boards/intel/btl/CMakeLists.txt b/boards/intel/btl/CMakeLists.txt
new file mode 100644
index 0000000000000..ee5e7343e8377
--- /dev/null
+++ b/boards/intel/btl/CMakeLists.txt
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Create an EFI image
+if(CONFIG_BUILD_OUTPUT_EFI)
+  set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/arch/x86/zefi/zefi.py
+    -c ${CMAKE_C_COMPILER}
+    -o ${CMAKE_OBJCOPY}
+    -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
+    -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
+    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+  )
+endif()
diff --git a/boards/intel/btl/Kconfig.defconfig b/boards/intel/btl/Kconfig.defconfig
new file mode 100644
index 0000000000000..177c7c1f0d2ba
--- /dev/null
+++ b/boards/intel/btl/Kconfig.defconfig
@@ -0,0 +1,71 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+
+config BUILD_OUTPUT_STRIPPED
+	default y
+
+config MP_MAX_NUM_CPUS
+	default 2
+
+# TSC on this board is 2.9 GHz, HPET is 19.2 MHz
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 2900000000 if APIC_TSC_DEADLINE_TIMER
+	default 2900000000 if APIC_TIMER_TSC
+	default 19200000
+
+if APIC_TIMER
+
+config APIC_TIMER_IRQ
+	default 24
+
+endif
+
+if APIC_TIMER_TSC
+
+config APIC_TIMER_TSC_M
+	default 3
+
+config APIC_TIMER_TSC_N
+	default 249
+
+endif
+
+config ACPI
+	default y
+
+if ACPI
+
+config HEAP_MEM_POOL_ADD_SIZE_ACPI
+	default 64000000
+
+config MAIN_STACK_SIZE
+	default 320000
+
+if SHELL
+
+config SHELL_STACK_SIZE
+	default 320000
+
+endif # SHELL
+
+endif # ACPI
+
+if DMA
+
+config DMA_64BIT
+	default y
+
+config DMA_DW_HW_LLI
+	default n
+
+config DMA_DW_CHANNEL_COUNT
+	default 2
+
+endif
+
+config UART_NS16550_INTEL_LPSS_DMA
+	default y if BOARD_INTEL_BTL_S_CRB
+
+config HAS_COVERAGE_SUPPORT
+	default y
diff --git a/boards/intel/btl/Kconfig.intel_btl_s_crb b/boards/intel/btl/Kconfig.intel_btl_s_crb
new file mode 100644
index 0000000000000..19f802f0c31cc
--- /dev/null
+++ b/boards/intel/btl/Kconfig.intel_btl_s_crb
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_INTEL_BTL_S_CRB
+	select SOC_RAPTOR_LAKE
diff --git a/boards/intel/btl/board.cmake b/boards/intel/btl/board.cmake
new file mode 100644
index 0000000000000..6b01bab2aeea8
--- /dev/null
+++ b/boards/intel/btl/board.cmake
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_set_flasher_ifnset(misc-flasher)
+board_finalize_runner_args(misc-flasher)
diff --git a/boards/intel/btl/board.yml b/boards/intel/btl/board.yml
new file mode 100644
index 0000000000000..f3b6dd2e2f81a
--- /dev/null
+++ b/boards/intel/btl/board.yml
@@ -0,0 +1,6 @@
+boards:
+  - name: intel_btl_s_crb
+    full_name: Bartlett Lake P CRB
+    vendor: intel
+    socs:
+      - name: raptor_lake
diff --git a/boards/intel/btl/doc/index.rst b/boards/intel/btl/doc/index.rst
new file mode 100644
index 0000000000000..239a679eb893a
--- /dev/null
+++ b/boards/intel/btl/doc/index.rst
@@ -0,0 +1,57 @@
+.. zephyr:board:: intel_btl_s_crb
+
+Overview
+********
+Bartlett Lake processor is a 64-bit multi-core processor built on Intel 7 process
+Technology. Bartlett Lake is based on a Hybrid architecture, utilizing
+P-cores for performance and E-Cores for efficiency.
+
+The S-Processor line is a 2-Chip Platform that includes the Processor Die and
+Platform Controller Hub (PCH-S) Die in the Package.
+
+For more information about Raptor Lake Processor lines, P-cores, and E-cores
+please refer to `BTL`_.
+
+This board configuration enables kernel support for the Bartlett Lake S boards.
+
+Hardware
+********
+
+.. zephyr:board-supported-hw::
+
+General information about the board can be found at the `BTL`_ website.
+
+Connections and IOs
+===================
+
+Refer to the `BTL`_ website for more information.
+
+Programming and Debugging
+*************************
+Use the following procedures for booting an image for an Bartlett Lake S CRB board.
+
+.. contents::
+   :depth: 1
+   :local:
+   :backlinks: top
+
+Build Zephyr application
+========================
+
+#. Build a Zephyr application; for instance, to build the ``hello_world``
+   application for Bartlett Lake S CRB:
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/hello_world
+      :board: intel_btl_s_crb
+      :goals: build
+
+   .. note::
+
+      A Zephyr EFI image file named :file:`zephyr.efi` is automatically
+      created in the build directory after the application is built.
+
+.. include:: ../../../intel/common/efi_boot.rst
+   :start-after: start_include_here
+
+.. _BTL: https://www.intel.com/content/www/us/en/secure/content-details/839635/bartlett-lake-s-processor-external-design-specification-eds-for-edge-platforms.html?DocID=839635
diff --git a/boards/intel/btl/intel_btl_s_crb.dts b/boards/intel/btl/intel_btl_s_crb.dts
new file mode 100644
index 0000000000000..3ae2d4592c8df
--- /dev/null
+++ b/boards/intel/btl/intel_btl_s_crb.dts
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <mem.h>
+
+#define DT_DRAM_SIZE		DT_SIZE_M(2048)
+
+#include <intel/bartlett_lake_s.dtsi>
+
+/ {
+	model = "intel_btl_s_crb";
+	compatible = "intel,bartlett-lake-crb";
+
+	chosen {
+		zephyr,sram = &dram0;
+		zephyr,console = &uart_ec_0;
+		zephyr,shell-uart = &uart_ec_0;
+	};
+
+	aliases {
+		watchdog0 = &tco_wdt;
+		rtc = &rtc;
+	};
+};
+
+&uart_ec_0 {
+	status = "okay";
+};
+
+&rtc {
+	status = "okay";
+};
diff --git a/boards/intel/btl/intel_btl_s_crb.yaml b/boards/intel/btl/intel_btl_s_crb.yaml
new file mode 100644
index 0000000000000..a569213d394ae
--- /dev/null
+++ b/boards/intel/btl/intel_btl_s_crb.yaml
@@ -0,0 +1,15 @@
+identifier: intel_btl_s_crb
+name: Bartlett Lake S CRB
+type: mcu
+arch: x86
+toolchain:
+  - zephyr
+ram: 2048
+supported:
+  - acpi
+  - smp
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+vendor: intel
diff --git a/boards/intel/btl/intel_btl_s_crb_defconfig b/boards/intel/btl/intel_btl_s_crb_defconfig
new file mode 100644
index 0000000000000..853850deb12c5
--- /dev/null
+++ b/boards/intel/btl/intel_btl_s_crb_defconfig
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_PIC_DISABLE=y
+CONFIG_LOAPIC=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_NS16550=y
+CONFIG_UART_NS16550_VARIANT_NS16750=y
+CONFIG_UART_CONSOLE=y
+CONFIG_X2APIC=y
+CONFIG_SMP=y
+CONFIG_BUILD_OUTPUT_EFI=y
diff --git a/boards/intel/rpl/Kconfig.defconfig b/boards/intel/rpl/Kconfig.defconfig
index 4eb5d8c3126c7..6478c25f658e5 100644
--- a/boards/intel/rpl/Kconfig.defconfig
+++ b/boards/intel/rpl/Kconfig.defconfig
@@ -8,12 +8,26 @@ config BUILD_OUTPUT_STRIPPED
 config MP_MAX_NUM_CPUS
 	default 2
 
-# TSC on this board is 1.9 GHz, HPET and APIC are 19.2 MHz
+if BOARD_INTEL_RPL_S_CRB
+
+# TSC on this board is 2.4 GHz for RPL-S, HPET and APIC are 19.2 MHz
 config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 1900000000 if APIC_TSC_DEADLINE_TIMER
-	default 1900000000 if APIC_TIMER_TSC
+	default 2400000000 if APIC_TSC_DEADLINE_TIMER
+	default 2400000000 if APIC_TIMER_TSC
 	default 19200000
 
+endif #BOARD_INTEL_RPL_S_CRB
+
+if BOARD_INTEL_RPL_P_CRB
+
+# TSC on this board is 1.8 GHz for RPL-P, HPET and APIC are 19.2 MHz
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 1800000000 if APIC_TSC_DEADLINE_TIMER
+	default 1800000000 if APIC_TIMER_TSC
+	default 19200000
+
+endif #BOARD_INTEL_RPL_P_CRB
+
 if APIC_TIMER
 config APIC_TIMER_IRQ
 	default 24
diff --git a/boards/ite/it515xx_evb/Kconfig.defconfig b/boards/ite/it515xx_evb/Kconfig.defconfig
new file mode 100644
index 0000000000000..e5033cdd7c321
--- /dev/null
+++ b/boards/ite/it515xx_evb/Kconfig.defconfig
@@ -0,0 +1,17 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_IT515XX_EVB
+
+if PM
+
+config PM_DEVICE
+	default y
+
+choice PM_POLICY
+	default PM_POLICY_CUSTOM
+endchoice
+
+endif # PM
+
+endif # BOARD_IT515XX_EVB
diff --git a/boards/ite/it515xx_evb/Kconfig.it515xx_evb b/boards/ite/it515xx_evb/Kconfig.it515xx_evb
new file mode 100644
index 0000000000000..123837216ab8b
--- /dev/null
+++ b/boards/ite/it515xx_evb/Kconfig.it515xx_evb
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_IT515XX_EVB
+	select SOC_IT51526AW
diff --git a/boards/ite/it515xx_evb/board.yml b/boards/ite/it515xx_evb/board.yml
new file mode 100644
index 0000000000000..d4c7074979fa7
--- /dev/null
+++ b/boards/ite/it515xx_evb/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: it515xx_evb
+  full_name: IT51XXX series
+  vendor: ite
+  socs:
+    - name: it51526aw
diff --git a/boards/ite/it515xx_evb/doc/index.rst b/boards/ite/it515xx_evb/doc/index.rst
new file mode 100644
index 0000000000000..cdd3ad54735bf
--- /dev/null
+++ b/boards/ite/it515xx_evb/doc/index.rst
@@ -0,0 +1,163 @@
+.. zephyr:board:: it515xx_evb
+
+Overview
+********
+
+The IT51XXX is a 32-bit RISC-V microcontroller.
+And a highly integrated embedded controller with system functions.
+It is suitable for mobile system applications. The picture below is
+the IT51526 development board (also known as it515xx_evb) and its debug card.
+
+.. figure:: it515xx_evb_and_debug_card.webp
+     :align: center
+     :alt: IT51526 EVB
+
+To find out more about ITE, visit our World Wide Web at:`ITE's website`_
+
+Hardware
+********
+The IT51XXX series contains different chip types(ex, it51526, it51527),
+and they support different hardware features.
+Listing the IT51526 hardware features as following:
+
+- RISC-V RV32IMC instruction set
+- 4KB instruction cache size
+- 128KB SRAM in total
+- Built-in 32.768 kHz clock generator
+- Embedded Flash, 512K/1024K-byte e-flash
+- eSPI, SPI, BRAM, KBC, PECI, UART
+- GPIO, PWM, ADC, INTC, WUC, Timer, Watchdog, KB scan, JTAG
+- Support 3 Voltage Comparator
+- Support Cryptographic Engine
+- 9 SMBus hosts, 3 targets, with 12 SMBus channels, compatible with I2C
+- I3C host: Support two I3C controllers, compliant with the MIPI I3C v1.0 SEPC.
+- Two-wire serial interface up to 12.5MHz using Push-Pull.
+- Support SDR, IBI, Hot-Join.
+- I3C target: Support SDR, FIFO co-use DLM. Support Push-Pull output.
+
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and debugging on it51526
+************************************
+
+In order to upload the application to the device,
+you'll need our flash tool and Download board.
+You can get them at: `ITE's website`_.
+
+Wiring
+=======
+#. Connect the Download Board to your host computer using the USB cable.
+
+#. Connect the it515xx_evb to the evolution motherboard.
+
+#. Connect the Download Board J5 to J38(GPC1 & GPC2) on the evolution motherboard.
+
+#. Connect the USB to UART wire to UART0 connector on the evolution motherboard.
+
+   .. image:: it515xx_evb_wiring.webp
+        :align: center
+        :alt: it515xx_evb wiring
+
+   .. note:: Be careful during connection!
+    Use separate wires to connect I2C pins with pins on the it515xx_evb board.
+    Wiring connection is described in the table below.
+
+    +-------------+---------------+
+    |   J5        | it515xx_evb   |
+    |   Connector | J38 Connector |
+    +=============+===============+
+    |      2      |      C1       |
+    +-------------+---------------+
+    |      3      |      C2       |
+    +-------------+---------------+
+    |      4      |      GND      |
+    +-------------+---------------+
+
+    For USB to UART cable, connect the evolution motherboard as below:
+
+    +-------------+---------------+
+    | USB to UART | Evolution     |
+    | cable       | motherboard   |
+    |             | UART0         |
+    |             | Connector     |
+    +=============+===============+
+    |     USB     |     UART0     |
+    +-------------+---------------+
+
+Building
+========
+
+#. Build :zephyr:code-sample:`hello_world` application as you would normally do
+   (see :`Zephyr Getting Started Guide`_):.
+
+   .. zephyr-app-commands::
+      :board: it515xx_evb
+      :zephyr-app: samples/hello_world
+      :goals: build
+
+#. The file :file:`zephyr.bin` will be created by west.
+
+Flashing
+========
+
+Windows
+--------
+
+Use the winflash tool to program a zephyr application
+to the it515xx board flash.
+
+#. Flashing steps as described in the link: `Flashing steps`_.
+
+#. Turn on the it515xx_evb board switch, you should see ``"Hello World! it515xx_evb"``
+   sent by the board. If you don't see this message, press the Reset button and the
+   message should appear.
+
+Ubuntu
+--------
+
+#. Run your favorite terminal program to listen for output.
+   Under Linux the terminal should be :code:`/dev/ttyUSB0`. Do not close it.
+
+   For example:
+
+   .. code-block:: console
+
+      $ minicom -D /dev/ttyUSB0 -b 115200
+
+#. Open a second terminal window and use the Linux flash tool to flash your board.
+
+   .. code-block:: console
+
+      $ sudo ~/itetool/ite -f build/zephyr/zephyr.bin
+
+   .. note:: The source code of ITE tool can be downloaded here:
+    https://www.ite.com.tw/upload/2024_01_23/6_20240123162336wu55j1Rjm4.bz2
+
+#. Split first and second terminal windows to view both of them.
+   You should see ``"Hello World! it515xx_evb"`` in the first terminal window.
+   If you don't see this message, press the Reset button and the message should appear.
+
+Debugging
+=========
+
+it515xx_evb board can be debugged by connecting USB to UART. We can write commands and
+read messages through minicom in the Ubuntu terminal.
+
+Troubleshooting
+===============
+
+#. If the flash tool reports a failure, re-plug the 8390 Download board or
+   power cycle the it515xx_evb board and try again.
+
+References
+==========
+
+.. target-notes::
+
+.. _ITE's website: https://www.ite.com.tw/en
+.. _Zephyr Getting Started Guide: https://docs.zephyrproject.org/latest/getting_started/index.html
+.. _Flashing steps: https://docs.zephyrproject.org/latest/boards/ite/it82xx2_evb/doc/index.html#flashing
diff --git a/boards/ite/it515xx_evb/doc/it515xx_evb_and_debug_card.webp b/boards/ite/it515xx_evb/doc/it515xx_evb_and_debug_card.webp
new file mode 100644
index 0000000000000..d6d81db1aea6d
Binary files /dev/null and b/boards/ite/it515xx_evb/doc/it515xx_evb_and_debug_card.webp differ
diff --git a/boards/ite/it515xx_evb/doc/it515xx_evb_wiring.webp b/boards/ite/it515xx_evb/doc/it515xx_evb_wiring.webp
new file mode 100644
index 0000000000000..c942044b55626
Binary files /dev/null and b/boards/ite/it515xx_evb/doc/it515xx_evb_wiring.webp differ
diff --git a/boards/ite/it515xx_evb/it515xx_evb.dts b/boards/ite/it515xx_evb/it515xx_evb.dts
new file mode 100644
index 0000000000000..df5e0b3e83c60
--- /dev/null
+++ b/boards/ite/it515xx_evb/it515xx_evb.dts
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <ite/it51xxx.dtsi>
+#include <ite/it51xxx-pinctrl-map.dtsi>
+
+/ {
+	model = "IT515XX EV-Board";
+	compatible = "ite,it515xx-evb";
+
+	aliases {
+		led0 = &led0;
+		watchdog0 = &twd0;
+	};
+
+	chosen {
+		zephyr,console = &uart1;
+		zephyr,shell-uart = &uart1;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,flash-controller = &flashctrl;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led_0 {
+			gpios = <&gpioc 0 GPIO_ACTIVE_HIGH>;
+			label = "Green LED";
+		};
+	};
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <115200>;
+	clock-frequency = <1843200>;
+	pinctrl-0 = <&uart1_rx_gpc7_default
+		     &uart1_tx_gpe6_default>;
+	pinctrl-names = "default";
+};
+
+&ite_uart1_wrapper {
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot0_partition: partition@0 {
+			label = "image-0";
+			reg = <0x00000000 DT_SIZE_K(128)>;
+		};
+
+		slot1_partition: partition@20000 {
+			label = "image-1";
+			reg = <0x00020000 DT_SIZE_K(128)>;
+		};
+
+		storage_partition: partition@40000 {
+			label = "storage";
+			reg = <0x00040000 DT_SIZE_K(256)>;
+		};
+	};
+};
+
+&kbd {
+	status = "okay";
+	pinctrl-0 = <&ksi0_default
+		     &ksi1_default
+		     &ksi2_default
+		     &ksi3_default
+		     &ksi4_default
+		     &ksi5_default
+		     &ksi6_default
+		     &ksi7_default
+		     &kso0_default
+		     &kso1_default
+		     &kso2_default
+		     &kso3_default
+		     &kso4_default
+		     &kso5_default
+		     &kso6_default
+		     &kso7_default
+		     &kso8_default
+		     &kso9_default
+		     &kso10_default
+		     &kso11_default
+		     &kso12_default
+		     &kso13_default
+		     &kso14_default
+		     &kso15_default>;
+	pinctrl-names = "default";
+	row-size = <8>;
+	col-size = <16>;
+};
diff --git a/boards/ite/it515xx_evb/it515xx_evb.yaml b/boards/ite/it515xx_evb/it515xx_evb.yaml
new file mode 100644
index 0000000000000..cddae71d22d71
--- /dev/null
+++ b/boards/ite/it515xx_evb/it515xx_evb.yaml
@@ -0,0 +1,14 @@
+identifier: it515xx_evb
+name: ITE IT51XXX EVB
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+ram: 128
+supported:
+  - flash
+  - gpio
+  - pinctrl
+  - pm
+  - uart
+vendor: ite
diff --git a/boards/ite/it515xx_evb/it515xx_evb_defconfig b/boards/ite/it515xx_evb/it515xx_evb_defconfig
new file mode 100644
index 0000000000000..b14dac07519d2
--- /dev/null
+++ b/boards/ite/it515xx_evb/it515xx_evb_defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+# General Kernel Options
+CONFIG_XIP=y
+
+# UART Driver
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Console Driver
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# GPIO Driver
+CONFIG_GPIO=y
+
+# Clock Driver
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/ite/it82xx2_evb/Kconfig.defconfig b/boards/ite/it82xx2_evb/Kconfig.defconfig
deleted file mode 100644
index a106a9d61514c..0000000000000
--- a/boards/ite/it82xx2_evb/Kconfig.defconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2023 ITE Corporation. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_IT82XX2_EVB
-
-config INPUT
-	default y if KSCAN
-
-endif
diff --git a/boards/ite/it82xx2_evb/doc/index.rst b/boards/ite/it82xx2_evb/doc/index.rst
index d31b989f225c0..938264879b8e6 100644
--- a/boards/ite/it82xx2_evb/doc/index.rst
+++ b/boards/ite/it82xx2_evb/doc/index.rst
@@ -1,7 +1,4 @@
-.. _it82xx2_evb:
-
-ITE IT82XX2 series
-######################
+.. zephyr:board:: it82xx2_evb
 
 Overview
 ********
@@ -40,63 +37,8 @@ Listing the IT82202 hardware features as following:
 
 Supported Features
 ==================
-currently supports the following hardware features:
-
-.. list-table:: Supported Features
-   :header-rows: 1
-   :widths: auto
-
-   * - Interface
-     - Controller
-     - Driver/Component
-   * - NVIC
-     - on-chip
-     - interrupt controller
-   * - FLASH
-     - on-chip
-     - flash controller
-   * - PINCTRL
-     - on-chip
-     - pin controller
-   * - ESPI
-     - on-chip
-     - espi
-   * - PECI
-     - on-chip
-     - peci
-   * - UART
-     - on-chip
-     - serial
-   * - GPIO
-     - on-chip
-     - gpio
-   * - PWM
-     - on-chip
-     - pwm
-   * - ADC
-     - on-chip
-     - adc
-   * - TIMER
-     - on-chip
-     - timer
-   * - WATCHDOG
-     - on-chip
-     - watchdog
-   * - KSCAN
-     - on-chip
-     - kscan
-   * - SENSOR
-     - on-chip
-     - voltage comparator
-   * - I2C
-     - on-chip
-     - i2c
-
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the
-:zephyr_file:`boards/ite/it82xx2_evb/it82xx2_evb_defconfig` Kconfig file.
+
+.. zephyr:board-supported-hw::
 
 Programming and debugging on it82202
 ************************************
diff --git a/boards/ite/it82xx2_evb/it82xx2_evb.dts b/boards/ite/it82xx2_evb/it82xx2_evb.dts
index 29e8ad721c88d..3aa16d53df1cc 100644
--- a/boards/ite/it82xx2_evb/it82xx2_evb.dts
+++ b/boards/ite/it82xx2_evb/it82xx2_evb.dts
@@ -17,7 +17,6 @@
 		i2c-0 = &i2c0;
 		peci-0 = &peci0;
 		led0 = &led0;
-		kscan0 = &kscan_input;
 		watchdog0 = &twd0;
 		pwm-0 = &pwm0;
 	};
@@ -30,7 +29,6 @@
 		zephyr,flash = &flash0;
 		zephyr,flash-controller = &flashctrl;
 		zephyr,code-partition = &slot0_partition;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	leds {
@@ -196,10 +194,6 @@
 	pinctrl-names = "default";
 	row-size = <8>;
 	col-size = <16>;
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
 
 &peci0 {
diff --git a/boards/ite/it82xx2_evb/it82xx2_evb.yaml b/boards/ite/it82xx2_evb/it82xx2_evb.yaml
index 505c2d7d9101e..e4e0b9742647a 100644
--- a/boards/ite/it82xx2_evb/it82xx2_evb.yaml
+++ b/boards/ite/it82xx2_evb/it82xx2_evb.yaml
@@ -15,7 +15,6 @@ supported:
   - gpio
   - usb_device
   - i2c
-  - kscan
   - pm
   - pwm
   - tach
diff --git a/boards/ite/it82xx2_evb/it82xx2_evb_defconfig b/boards/ite/it82xx2_evb/it82xx2_evb_defconfig
index 2b174670d4836..2a244e464eba1 100644
--- a/boards/ite/it82xx2_evb/it82xx2_evb_defconfig
+++ b/boards/ite/it82xx2_evb/it82xx2_evb_defconfig
@@ -18,8 +18,3 @@ CONFIG_UART_CONSOLE=y
 
 # GPIO Driver
 CONFIG_GPIO=y
-
-# Power Management
-CONFIG_PM=y
-CONFIG_PM_DEVICE=y
-CONFIG_PM_POLICY_CUSTOM=y
diff --git a/boards/ite/it8xxx2_evb/Kconfig.defconfig b/boards/ite/it8xxx2_evb/Kconfig.defconfig
index 57fc0404475f4..0c81c35776244 100644
--- a/boards/ite/it8xxx2_evb/Kconfig.defconfig
+++ b/boards/ite/it8xxx2_evb/Kconfig.defconfig
@@ -14,7 +14,4 @@ endchoice
 
 endif # PM
 
-config INPUT
-	default y if KSCAN
-
 endif # BOARD_IT8XXX2_EVB
diff --git a/boards/ite/it8xxx2_evb/doc/index.rst b/boards/ite/it8xxx2_evb/doc/index.rst
index 0e215fddf7efa..751294a77b683 100644
--- a/boards/ite/it8xxx2_evb/doc/index.rst
+++ b/boards/ite/it8xxx2_evb/doc/index.rst
@@ -1,7 +1,4 @@
-.. _it8xxx2_evb:
-
-ITE IT8XXX2 series
-######################
+.. zephyr:board:: it8xxx2_evb
 
 Overview
 ********
@@ -37,42 +34,8 @@ Listing the IT81302 hardware features as following:
 
 Supported Features
 ==================
-currently supports the following hardware features:
-
-.. list-table:: Supported Features
-   :header-rows: 1
-   :widths: auto
-
-   * - Interface
-     - Controller
-     - Driver/Component
-   * - NVIC
-     - on-chip
-     - interrupt controller
-   * - TIMER
-     - on-chip
-     - timer
-   * - UART
-     - on-chip
-     - serial
-   * - GPIO
-     - on-chip
-     - gpio
-   * - ADC
-     - on-chip
-     - adc
-   * - I2C
-     - on-chip
-     - i2c
-   * - KSCAN
-     - on-chip
-     - kscan
-
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the
-:zephyr_file:`boards/ite/it8xxx2_evb/it8xxx2_evb_defconfig` Kconfig file.
+
+.. zephyr:board-supported-hw::
 
 Hardware reworks
 ****************
diff --git a/boards/ite/it8xxx2_evb/it8xxx2_evb.dts b/boards/ite/it8xxx2_evb/it8xxx2_evb.dts
index 0ee42f981f084..59b4af711c9fa 100644
--- a/boards/ite/it8xxx2_evb/it8xxx2_evb.dts
+++ b/boards/ite/it8xxx2_evb/it8xxx2_evb.dts
@@ -17,7 +17,6 @@
 		i2c-0 = &i2c0;
 		peci-0 = &peci0;
 		led0 = &led0;
-		kscan0 = &kscan_input;
 		watchdog0 = &twd0;
 		pwm-0 = &pwm0;
 	};
@@ -30,7 +29,6 @@
 		zephyr,flash = &flash0;
 		zephyr,flash-controller = &flashctrl;
 		zephyr,code-partition = &slot0_partition;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	leds {
@@ -180,10 +178,6 @@
 	pinctrl-names = "default";
 	row-size = <8>;
 	col-size = <16>;
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
 &peci0 {
 	status = "okay";
diff --git a/boards/ite/it8xxx2_evb/it8xxx2_evb.yaml b/boards/ite/it8xxx2_evb/it8xxx2_evb.yaml
index 0a57a0937f7cf..31ef24d2811a1 100644
--- a/boards/ite/it8xxx2_evb/it8xxx2_evb.yaml
+++ b/boards/ite/it8xxx2_evb/it8xxx2_evb.yaml
@@ -13,7 +13,6 @@ supported:
   - gpio
   - adc
   - i2c
-  - kscan
   - pwm
   - watchdog
 vendor: ite
diff --git a/boards/khadas/edge2/doc/index.rst b/boards/khadas/edge2/doc/index.rst
index 337ff3aa24e50..f0ac6de53f8e8 100644
--- a/boards/khadas/edge2/doc/index.rst
+++ b/boards/khadas/edge2/doc/index.rst
@@ -17,23 +17,7 @@ See `Hardware details`_
 Supported Features
 ==================
 
-The ``khadas_edge2`` board target supports the following
-hardware features:
-
-+-----------+------------+--------------------------------------+
-| Interface | Controller | Driver/Component                     |
-+===========+============+======================================+
-| GIC-600   | on-chip    | GICv3 interrupt controller           |
-+-----------+------------+--------------------------------------+
-| ARM TIMER | on-chip    | System Clock                         |
-+-----------+------------+--------------------------------------+
-| UART      | on-chip    | Synopsys DesignWare 8250 serial port |
-+-----------+------------+--------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in (NON-SMP)
-:zephyr_file:`boards/khadas/edge2/khadas_edge2_defconfig`
+.. zephyr:board-supported-hw::
 
 There are multiple serial ports on the board: Zephyr is using
 uart2 as serial console.
@@ -41,6 +25,8 @@ uart2 as serial console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use the following configuration to run basic Zephyr applications and
 kernel tests on Khadas Edge2 board. For example, with the :zephyr:code-sample:`hello_world`:
 
diff --git a/boards/khadas/edgev/doc/index.rst b/boards/khadas/edgev/doc/index.rst
index 82294c07e994c..b645563e5b2a4 100644
--- a/boards/khadas/edgev/doc/index.rst
+++ b/boards/khadas/edgev/doc/index.rst
@@ -13,23 +13,7 @@ See <https://docs.khadas.com/linux/edge/Hardware.html#Edge-V-1>
 Supported Features
 ==================
 
-Khadas Edge-V board default configuration supports the following
-hardware features:
-
-+-----------+------------+--------------------------------------+
-| Interface | Controller | Driver/Component                     |
-+===========+============+======================================+
-| GIC-500   | on-chip    | GICv3 interrupt controller           |
-+-----------+------------+--------------------------------------+
-| ARM TIMER | on-chip    | System Clock                         |
-+-----------+------------+--------------------------------------+
-| UART      | on-chip    | Synopsys DesignWare 8250 serial port |
-+-----------+------------+--------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in (NON-SMP)
-:zephyr_file:`boards/khadas/edgev/khadas_edgev_defconfig`
+.. zephyr:board-supported-hw::
 
 There are multiple serial ports on the board: Zephyr is using
 uart2 as serial console.
@@ -37,6 +21,8 @@ uart2 as serial console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use the following configuration to run basic Zephyr applications and
 kernel tests on Khadas Edge-V board. For example, with the :zephyr:code-sample:`hello_world`:
 
diff --git a/boards/kincony/kincony_kc868_a32/doc/index.rst b/boards/kincony/kincony_kc868_a32/doc/index.rst
index d88eec584c670..6a001bbfdd8e4 100644
--- a/boards/kincony/kincony_kc868_a32/doc/index.rst
+++ b/boards/kincony/kincony_kc868_a32/doc/index.rst
@@ -40,6 +40,8 @@ below to retrieve those files.
 Building & Flashing
 -------------------
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/kws/common/pico_spe-pinctrl-common.dtsi b/boards/kws/common/pico_spe-pinctrl-common.dtsi
new file mode 100644
index 0000000000000..bfdcff973f9fb
--- /dev/null
+++ b/boards/kws/common/pico_spe-pinctrl-common.dtsi
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 KWS Computersysteme Gmbh
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_P0>;
+		};
+
+		group2 {
+			pinmux = <UART0_RX_P1>;
+			input-enable;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_P4>, <I2C0_SCL_P5>;
+			input-enable;
+			input-schmitt-enable;
+		};
+	};
+
+	i2c1_default: i2c1_default {
+		group1 {
+			pinmux = <I2C1_SDA_P6>, <I2C1_SCL_P7>;
+			input-enable;
+			input-schmitt-enable;
+		};
+	};
+
+	spi0_default: spi0_default {
+		group1 {
+			pinmux = <SPI0_CSN_P17>, <SPI0_SCK_P18>, <SPI0_TX_P19>;
+		};
+
+		group2 {
+			pinmux = <SPI0_RX_P16>;
+			input-enable;
+		};
+	};
+
+	spi1_default: spi1_default {
+		group1 {
+			pinmux = <SPI1_CSN_P13>, <SPI1_SCK_P10>, <SPI1_TX_P11>;
+		};
+
+		group2 {
+			pinmux = <SPI1_RX_P12>;
+			input-enable;
+		};
+	};
+
+	pwm_ch4b_default: pwm_ch4b_default {
+		group1 {
+			pinmux = <PWM_4B_P25>;
+		};
+	};
+
+	adc_default: adc_default {
+		group1 {
+			pinmux = <ADC_CH0_P26>, <ADC_CH1_P27>, <ADC_CH2_P28>, <ADC_CH3_P29>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/kws/index.rst b/boards/kws/index.rst
new file mode 100644
index 0000000000000..0f8fc102b9457
--- /dev/null
+++ b/boards/kws/index.rst
@@ -0,0 +1,10 @@
+.. _boards-kws:
+
+KWS Computersysteme Gmbh
+########################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/kws/pico2_spe/Kconfig.defconfig b/boards/kws/pico2_spe/Kconfig.defconfig
new file mode 100644
index 0000000000000..3daadffce7882
--- /dev/null
+++ b/boards/kws/pico2_spe/Kconfig.defconfig
@@ -0,0 +1,34 @@
+# Copyright (c) 2025 KWS Computersysteme Gmbh
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_PICO2_SPE
+
+if I2C_DW
+
+config I2C_DW_CLOCK_SPEED
+	default 125
+
+endif # I2C_DW
+
+config USB_SELF_POWERED
+	default n
+
+config PHY_INIT_PRIORITY
+	default 82
+	depends on NET_L2_ETHERNET && ETH_DRIVER
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+if ETH_LAN865X
+
+config NET_IF_MAX_IPV4_COUNT
+	default 2
+
+endif # ETH_LAN865X
+
+endif # NETWORKING
+
+endif # BOARD_PICO2_SPE
diff --git a/boards/kws/pico2_spe/Kconfig.pico2_spe b/boards/kws/pico2_spe/Kconfig.pico2_spe
new file mode 100644
index 0000000000000..9487cc1d81011
--- /dev/null
+++ b/boards/kws/pico2_spe/Kconfig.pico2_spe
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 KWS Computersysteme Gmbh
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_PICO2_SPE
+	select SOC_RP2350A_M33 if BOARD_PICO2_SPE_RP2350A_M33
diff --git a/boards/kws/pico2_spe/board.cmake b/boards/kws/pico2_spe/board.cmake
new file mode 100644
index 0000000000000..feae063129ac7
--- /dev/null
+++ b/boards/kws/pico2_spe/board.cmake
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
+	set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
+endif()
+
+board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
+board_runner_args(openocd --cmd-pre-init "source [find target/rp2350.cfg]")
+
+# The adapter speed is expected to be set by interface configuration.
+# The Raspberry Pi's OpenOCD fork doesn't, so match their documentation at
+# https://www.raspberrypi.com/documentation/microcontrollers/debug-probe.html#debugging-with-swd
+board_runner_args(openocd --cmd-pre-init "set_adapter_speed_if_not_set 5000")
+
+board_runner_args(uf2 "--board-id=RP2350")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
diff --git a/boards/kws/pico2_spe/board.yml b/boards/kws/pico2_spe/board.yml
new file mode 100644
index 0000000000000..e292243d1b01c
--- /dev/null
+++ b/boards/kws/pico2_spe/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: pico2_spe
+  full_name: Pico2-SPE
+  vendor: kws
+  socs:
+  - name: rp2350a
diff --git a/boards/kws/pico2_spe/doc/img/pico2_spe.webp b/boards/kws/pico2_spe/doc/img/pico2_spe.webp
new file mode 100644
index 0000000000000..1cf931ddf991b
Binary files /dev/null and b/boards/kws/pico2_spe/doc/img/pico2_spe.webp differ
diff --git a/boards/kws/pico2_spe/doc/index.rst b/boards/kws/pico2_spe/doc/index.rst
new file mode 100644
index 0000000000000..48bccacea8679
--- /dev/null
+++ b/boards/kws/pico2_spe/doc/index.rst
@@ -0,0 +1,59 @@
+.. zephyr:board:: pico2_spe
+
+Overview
+********
+
+The Pico2-SPE is a small, low-cost, versatile boards from
+KWS Computersysteme Gmbh. They are equipped with an RP2350a SoC, an on-board LED,
+a USB connector, an SWD interface. The Pico2-SPE additionally contains an
+Microchip LAN8651 10Base-T1S module. The USB bootloader allows the
+ability to flash without any adapter, in a drag-and-drop manner.
+It is also possible to flash and debug the boards with their SWD interface,
+using an external adapter.
+
+Hardware
+********
+
+- Dual Cortex-M33 or Hazard3 processors at up to 150MHz
+- 520KB of SRAM, and 4MB of on-board flash memory
+- USB 1.1 with device and host support
+- Low-power sleep and dormant modes
+- Drag-and-drop programming using mass storage over USB
+- 26 multi-function GPIO pins including 3 that can be used for ADC
+- 1 SPI, 2 I2C, 2 UART, 3 12-bit 500ksps Analogue to Digital - Converter (ADC), 24 controllable PWM channels
+- 2 Timer with 4 alarms, 1 AON Timer
+- Temperature sensor
+- Microchip LAN8651 10Base-T1S
+- 3 Programmable IO (PIO) blocks, 12 state machines total for custom peripheral support
+
+  - Flexible, user-programmable high-speed IO
+  - Can emulate interfaces such as SD Card and VGA
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+The default pin mapping is unchanged from the Pico-SPE.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+As with the Pico-SPE, the SWD interface can be used to program and debug the
+device, e.g. using OpenOCD with the `Raspberry Pi Debug Probe <https://www.raspberrypi.com/documentation/microcontrollers/debug-probe.html>`_ .
+
+References
+**********
+
+.. _Getting Started with Pico-SPE-Series:
+   https://kws-computer.de/go/pico-spe-getting-started
+
+.. _Pico2-SPE Documentation:
+   https://kws-computer.de/go/pico2-spe-datasheet
+
+.. target-notes::
diff --git a/boards/kws/pico2_spe/pico2_spe-pinctrl.dtsi b/boards/kws/pico2_spe/pico2_spe-pinctrl.dtsi
new file mode 100644
index 0000000000000..889f287c642a7
--- /dev/null
+++ b/boards/kws/pico2_spe/pico2_spe-pinctrl.dtsi
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 KWS Computersysteme Gmbh
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/rpi-pico-rp2350a-pinctrl.h>
+
+#include "../common/pico_spe-pinctrl-common.dtsi"
diff --git a/boards/kws/pico2_spe/pico2_spe.dtsi b/boards/kws/pico2_spe/pico2_spe.dtsi
new file mode 100644
index 0000000000000..87211d91effb4
--- /dev/null
+++ b/boards/kws/pico2_spe/pico2_spe.dtsi
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2025 KWS Computersysteme Gmbh
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <freq.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+
+#include "pico2_spe-pinctrl.dtsi"
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,code-partition = &code_partition;
+	};
+
+	aliases {
+		watchdog0 = &wdt0;
+	};
+
+	pico_header: connector {
+		compatible = "raspberrypi,pico-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio0 0 0>,	/* GP0 */
+			<1 0 &gpio0 1 0>,	/* GP1 */
+			<2 0 &gpio0 2 0>,	/* GP2 */
+			<3 0 &gpio0 3 0>,	/* GP3 */
+			<4 0 &gpio0 4 0>,	/* GP4 */
+			<5 0 &gpio0 5 0>,	/* GP5 */
+			<6 0 &gpio0 6 0>,	/* GP6 */
+			<7 0 &gpio0 7 0>,	/* GP7 */
+			<8 0 &gpio0 8 0>,	/* GP8 */
+			<9 0 &gpio0 9 0>,	/* GP9 */
+			<10 0 &gpio0 10 0>,	/* GP10 */
+			<11 0 &gpio0 11 0>,	/* GP11 */
+			<12 0 &gpio0 12 0>,	/* GP12 */
+			<13 0 &gpio0 13 0>,	/* GP13 */
+			<14 0 &gpio0 14 0>,	/* GP14 */
+			<15 0 &gpio0 15 0>,	/* GP15 */
+			<16 0 &gpio0 16 0>,	/* GP16 */
+			<17 0 &gpio0 17 0>,	/* GP17 */
+			<18 0 &gpio0 18 0>,	/* GP18 */
+			<19 0 &gpio0 19 0>,	/* GP19 */
+			<20 0 &gpio0 20 0>,	/* GP20 */
+			<21 0 &gpio0 21 0>,	/* GP21 */
+			<22 0 &gpio0 22 0>,	/* GP22 */
+			<26 0 &gpio0 26 0>,	/* GP26 */
+			<27 0 &gpio0 27 0>,	/* GP27 */
+			<28 0 &gpio0 28 0>;	/* GP28 */
+	};
+};
+
+&flash0 {
+	reg = <0x10000000 DT_SIZE_M(4)>;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Reserved memory for an image definition block. The block is much
+		 * smaller than 256 bytes, but in practice the linker places the vector
+		 * table at a much larger alignment offset.
+		 */
+		image_def: partition@0 {
+			label = "image_def";
+			reg = <0x00000000 0x100>;
+			read-only;
+		};
+
+		/*
+		 * Usable flash. Starts at 0x100, after the image definition block.
+		 * The partition size is 4MB minus the 0x100 bytes taken by the
+		 * image definition.
+		 */
+		code_partition: partition@100 {
+			label = "code-partition";
+			reg = <0x100 (DT_SIZE_M(4) - 0x100)>;
+			read-only;
+		};
+	};
+};
+
+&uart0 {
+	current-speed = <115200>;
+	status = "okay";
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&spi1 {
+	clock-frequency = <DT_FREQ_M(25)>;
+	status = "okay";
+	pinctrl-0 = <&spi1_default>;
+		pinctrl-names = "default";
+	cs-gpios = <&pico_header 13 GPIO_ACTIVE_LOW>;
+
+	lan8651: lan865x@0 {
+		compatible = "microchip,lan865x";
+		reg = <0x0>;
+		spi-max-frequency = <DT_FREQ_M(25)>;
+		int-gpios = <&gpio0 21 (GPIO_ACTIVE_LOW)>;
+		rst-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+		status = "okay";
+
+		local-mac-address = [ CA 2F B7 10 23 79];
+
+		lan865x_mdio: lan865x_mdio {
+			compatible = "microchip,lan865x-mdio";
+			status = "okay";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			ethernet-phy@0 {
+				compatible = "microchip,t1s-phy";
+				reg = <0x0>;
+				plca-enable;
+				plca-node-id = <0>;
+				plca-node-count = <8>;
+				plca-burst-count = <0>;
+				plca-burst-timer = <0x80>;
+				plca-to-timer = <0x20>;
+				status = "okay";
+			};
+		};
+	};
+};
+
+&i2c0 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&adc {
+	pinctrl-0 = <&adc_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&pwm {
+	pinctrl-0 = <&pwm_ch4b_default>;
+	pinctrl-names = "default";
+	divider-int-0 = <255>;
+};
+
+&timer0 {
+	status = "okay";
+};
+
+zephyr_udc0: &usbd {
+	status = "okay";
+};
+
+pico_serial: &uart0 {};
diff --git a/boards/kws/pico2_spe/pico2_spe_rp2350a_m33.dts b/boards/kws/pico2_spe/pico2_spe_rp2350a_m33.dts
new file mode 100644
index 0000000000000..4bebd86dbd0c7
--- /dev/null
+++ b/boards/kws/pico2_spe/pico2_spe_rp2350a_m33.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 KWS Computersysteme Gmbh
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+/* The build system assumes that there's a cpucluster-specific file.
+ *
+ * This file provides composition of the device tree:
+ * 1. The common features of the SoC
+ * 2. Core-specific configuration.
+ * 3. Board-specific configuration.
+ */
+#include <raspberrypi/rpi_pico/rp2350a.dtsi>
+#include <raspberrypi/rpi_pico/m33.dtsi>
+
+/* there's nothing specific to the Cortex-M33 cores vs the (not yet
+ * implemented) Hazard3 cores.
+ */
+#include "pico2_spe.dtsi"
diff --git a/boards/kws/pico2_spe/pico2_spe_rp2350a_m33.yaml b/boards/kws/pico2_spe/pico2_spe_rp2350a_m33.yaml
new file mode 100644
index 0000000000000..acdaeafe3a6b0
--- /dev/null
+++ b/boards/kws/pico2_spe/pico2_spe_rp2350a_m33.yaml
@@ -0,0 +1,20 @@
+identifier: pico2_spe/rp2350a/m33
+name: KWS Pico2 SinglePairEthernet
+type: mcu
+arch: arm
+flash: 4096
+ram: 520
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - adc
+  - clock
+  - counter
+  - dma
+  - gpio
+  - hwinfo
+  - i2c
+  - pwm
+  - spi
+  - uart
diff --git a/boards/kws/pico2_spe/pico2_spe_rp2350a_m33_defconfig b/boards/kws/pico2_spe/pico2_spe_rp2350a_m33_defconfig
new file mode 100644
index 0000000000000..8bd68e3511391
--- /dev/null
+++ b/boards/kws/pico2_spe/pico2_spe_rp2350a_m33_defconfig
@@ -0,0 +1,14 @@
+# This configuration is orthogonal to whether the Cortex-M33 or Hazard3 cores
+# are in use, but Zephyr does not support providing a qualifier-agnostic
+# _defconfig file.
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_BUILD_OUTPUT_UF2=y
+CONFIG_CLOCK_CONTROL=y
+CONFIG_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_RESET=y
+CONFIG_SERIAL=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=150000000
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_USE_DT_CODE_PARTITION=y
diff --git a/boards/kws/pico2_spe/support/openocd.cfg b/boards/kws/pico2_spe/support/openocd.cfg
new file mode 100644
index 0000000000000..82666bb53314c
--- /dev/null
+++ b/boards/kws/pico2_spe/support/openocd.cfg
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+# Checking and set 'adapter speed'.
+# Set the adaptor speed, if unset, and given as an argument.
+proc set_adapter_speed_if_not_set { speed } {
+	puts "checking adapter speed..."
+	if { [catch {adapter speed} ret] } {
+		adapter speed $speed
+	}
+}
diff --git a/boards/kws/pico_spe/Kconfig b/boards/kws/pico_spe/Kconfig
new file mode 100644
index 0000000000000..e1a877543e64a
--- /dev/null
+++ b/boards/kws/pico_spe/Kconfig
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 KWS Computersysteme Gmbh
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_PICO_SPE
+	select RP2_FLASH_W25Q080
diff --git a/boards/kws/pico_spe/Kconfig.defconfig b/boards/kws/pico_spe/Kconfig.defconfig
new file mode 100644
index 0000000000000..4f5d509016333
--- /dev/null
+++ b/boards/kws/pico_spe/Kconfig.defconfig
@@ -0,0 +1,34 @@
+# Copyright (c) 2024 KWS Computersysteme Gmbh
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_PICO_SPE
+
+if I2C_DW
+
+config I2C_DW_CLOCK_SPEED
+	default 125
+
+endif # I2C_DW
+
+config USB_SELF_POWERED
+	default n
+
+config PHY_INIT_PRIORITY
+	default 82
+	depends on NET_L2_ETHERNET && ETH_DRIVER
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+if ETH_LAN865X
+
+config NET_IF_MAX_IPV4_COUNT
+	default 2
+
+endif # ETH_LAN865X
+
+endif # NETWORKING
+
+endif # BOARD_PICO_SPE
diff --git a/boards/kws/pico_spe/Kconfig.pico_spe b/boards/kws/pico_spe/Kconfig.pico_spe
new file mode 100644
index 0000000000000..1ecb279b3f66e
--- /dev/null
+++ b/boards/kws/pico_spe/Kconfig.pico_spe
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 KWS Computersysteme Gmbh
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_PICO_SPE
+	select SOC_RP2040
diff --git a/boards/kws/pico_spe/board.cmake b/boards/kws/pico_spe/board.cmake
new file mode 100644
index 0000000000000..ff6f71a2c50af
--- /dev/null
+++ b/boards/kws/pico_spe/board.cmake
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# This configuration allows selecting what debug adapter debugging Pico-SPE
+# by a command-line argument.
+# It is mainly intended to support both the 'picoprobe' and 'raspberrypi-swd'
+# adapter described in "Getting started with Raspberry Pi Pico".
+# And any other SWD debug adapter might also be usable with this configuration.
+
+# Set RPI_PICO_DEBUG_ADAPTER to select debug adapter by command-line arguments.
+# e.g.) west build -b pico_spe -- -DRPI_PICO_DEBUG_ADAPTER=raspberrypi-swd
+# The value is treated as a part of an interface file name that
+# the debugger's configuration file.
+# The value must be the 'stem' part of the name of one of the files
+# in the openocd interface configuration file.
+# The setting is store to CMakeCache.txt.
+if("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
+	set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
+endif()
+
+board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
+board_runner_args(openocd --cmd-pre-init "transport select swd")
+board_runner_args(openocd --cmd-pre-init "source [find target/rp2040.cfg]")
+
+# The adapter speed is expected to be set by interface configuration.
+# But if not so, set 2000 to adapter speed.
+board_runner_args(openocd --cmd-pre-init "set_adapter_speed_if_not_set 2000")
+
+board_runner_args(jlink "--device=RP2040_M0_0")
+board_runner_args(uf2 "--board-id=RPI-RP2")
+board_runner_args(pyocd "--target=rp2040")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
\ No newline at end of file
diff --git a/boards/kws/pico_spe/board.yml b/boards/kws/pico_spe/board.yml
new file mode 100644
index 0000000000000..5d80b878c0b30
--- /dev/null
+++ b/boards/kws/pico_spe/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: pico_spe
+  full_name: Pico-SPE
+  vendor: kws
+  socs:
+  - name: rp2040
diff --git a/boards/kws/pico_spe/doc/img/pico_spe.webp b/boards/kws/pico_spe/doc/img/pico_spe.webp
new file mode 100644
index 0000000000000..00e143500b49c
Binary files /dev/null and b/boards/kws/pico_spe/doc/img/pico_spe.webp differ
diff --git a/boards/kws/pico_spe/doc/index.rst b/boards/kws/pico_spe/doc/index.rst
new file mode 100644
index 0000000000000..3246d36a972a6
--- /dev/null
+++ b/boards/kws/pico_spe/doc/index.rst
@@ -0,0 +1,235 @@
+.. zephyr:board:: pico_spe
+
+Overview
+********
+
+The Pico-SPE is a small, low-cost, versatile boards from
+KWS Computersysteme Gmbh. They are equipped with an RP2040 SoC, an on-board LED,
+a USB connector, an SWD interface. The Pico-SPE additionally contains an
+Microchip LAN8651 10Base-T1S module. The USB bootloader allows the
+ability to flash without any adapter, in a drag-and-drop manner.
+It is also possible to flash and debug the boards with their SWD interface,
+using an external adapter.
+
+Hardware
+********
+- Dual core Arm Cortex-M0+ processor running up to 133MHz
+- 264KB on-chip SRAM
+- 16MB on-board QSPI flash with XIP capabilities
+- 16 GPIO pins
+- 3 Analog inputs
+- 2 UART peripherals
+- 2 I2C controllers
+- 16 PWM channels
+- USB 1.1 controller (host/device)
+- 8 Programmable I/O (PIO) for custom peripherals
+- On-board LED
+- 1 Watchdog timer peripheral
+- Microchip LAN8651 10Base-T1S
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Pin Mapping
+===========
+
+The peripherals of the RP2040 SoC can be routed to various pins on the board.
+The configuration of these routes can be modified through DTS. Please refer to
+the datasheet to see the possible routings for each peripheral.
+
+External pin mapping on the Pico-SPE is identical to the Pico, but note that internal
+RP2040 GPIO lines 10, 11, 12, 13, 20, 21 are routed to the Microchip LAN8651 on the
+Pico-SPE.
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+
+.. rst-class:: rst-columns
+
+- UART0_TX : P0
+- UART0_RX : P1
+- I2C0_SDA : P4
+- I2C0_SCL : P5
+- I2C1_SDA : P6
+- I2C1_SCL : P7
+- ADC_CH0 : P26
+- ADC_CH1 : P27
+- ADC_CH2 : P28
+
+Programmable I/O (PIO)
+**********************
+The RP2040 SoC comes with two PIO periherals. These are two simple
+co-processors that are designed for I/O operations. The PIOs run
+a custom instruction set, generated from a custom assembly language.
+PIO programs are assembled using :command:`pioasm`, a tool provided by Raspberry Pi.
+
+Zephyr does not (currently) assemble PIO programs. Rather, they should be
+manually assembled and embedded in source code. An example of how this is done
+can be found at :zephyr_file:`drivers/serial/uart_rpi_pico_pio.c`.
+
+Sample: SPI via PIO
+====================
+
+The :zephyr:code-sample:`bme280` sample includes a
+demonstration of using the PIO SPI driver to communicate with an
+environmental sensor.  The PIO SPI driver supports using any
+combination of GPIO pins for an SPI bus, as well as allowing up to
+four independent SPI buses on a single board (using the two SPI
+devices as well as both PIO devices).
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+
+Using SEGGER JLink
+------------------
+
+You can Flash the pico_spe with a SEGGER JLink debug probe as described in
+:ref:`Building, Flashing and Debugging <west-flashing>`.
+
+Here is an example of building and flashing the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: pico_spe
+   :goals: build
+
+.. code-block:: bash
+
+  west flash --runner jlink
+
+Using OpenOCD
+-------------
+
+To use CMSIS-DAP, you must configure **udev**.
+
+Create a file in /etc/udev.rules.d with any name, and write the line below.
+
+.. code-block:: bash
+
+   ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="000c", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+This example is valid for the case that the user joins to ``plugdev`` groups.
+
+The Pico-SPE has an SWD interface that can be used to program
+and debug the on board RP2040. This interface can be utilized by OpenOCD.
+To use it with the RP2040, OpenOCD version 0.12.0 or later is needed.
+
+If you are using a Debian based system (including RaspberryPi OS, Ubuntu. and more),
+using the `pico_setup.sh`_ script is a convenient way to set up the forked version of OpenOCD.
+
+Depending on the interface used (such as JLink), you might need to
+checkout to a branch that supports this interface, before proceeding.
+Build and install OpenOCD as described in the README.
+
+Here is an example of building and flashing the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: pico_spe
+   :goals: build flash
+   :gen-args: -DOPENOCD=/usr/local/bin/openocd -DOPENOCD_DEFAULT_PATH=/usr/local/share/openocd/scripts -DRPI_PICO_DEBUG_ADAPTER=cmsis-dap
+
+Set the environment variables **OPENOCD** to :file:`/usr/local/bin/openocd`
+and **OPENOCD_DEFAULT_PATH** to :file:`/usr/local/share/openocd/scripts`. This should work
+with the OpenOCD that was installed with the default configuration.
+This configuration also works with an environment that is set up by the `pico_setup.sh`_ script.
+
+**RPI_PICO_DEBUG_ADAPTER** specifies what debug adapter is used for debugging.
+
+If **RPI_PICO_DEBUG_ADAPTER** was not assigned, ``cmsis-dap`` is used by default.
+The other supported adapters are ``raspberrypi-swd``, ``jlink`` and ``blackmagicprobe``.
+How to connect ``cmsis-dap`` and ``raspberrypi-swd`` is described in `Getting Started with Pico-SPE-Series`_.
+Any other SWD debug adapter maybe also work with this configuration.
+
+The value of **RPI_PICO_DEBUG_ADAPTER** is cached, so it can be omitted from
+``west flash`` and ``west debug`` if it was previously set while running
+``west build``.
+
+**RPI_PICO_DEBUG_ADAPTER** is used in an argument to OpenOCD as ``"source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]"``.
+Thus, **RPI_PICO_DEBUG_ADAPTER** needs to be assigned the file name of the debug adapter.
+
+You can also flash the board with the following
+command that directly calls OpenOCD (assuming a SEGGER JLink adapter is used):
+
+.. code-block:: console
+
+   $ openocd -f interface/jlink.cfg -c 'transport select swd' -f target/rp2040.cfg -c "adapter speed 2000" -c 'targets rp2040.core0' -c 'program path/to/zephyr.elf verify reset exit'
+
+Using UF2
+---------
+
+If you don't have an SWD adapter, you can flash the Pico-SPE with
+a UF2 file. By default, building an app for this board will generate a
+:file:`build/zephyr/zephyr.uf2` file. If the Pico is powered on with the ``BOOTSEL``
+button pressed, it will appear on the host as a mass storage device. The
+UF2 file should be drag-and-dropped to the device, which will flash the Pico.
+
+Debugging
+=========
+
+The SWD interface can also be used to debug the board. To achieve this, you can
+either use SEGGER JLink or OpenOCD.
+
+Using SEGGER JLink
+------------------
+
+Use a SEGGER JLink debug probe and follow the instruction in
+:ref:`Building, Flashing and Debugging<west-debugging>`.
+
+
+Using OpenOCD
+-------------
+
+Install OpenOCD as described for flashing the board.
+
+Here is an example for debugging the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: pico_spe
+   :maybe-skip-config:
+   :goals: debug
+   :gen-args: -DOPENOCD=/usr/local/bin/openocd -DOPENOCD_DEFAULT_PATH=/usr/local/share/openocd/scripts -DRPI_PICO_DEBUG_ADAPTER=raspberrypi-swd
+
+As with flashing, you can specify the debug adapter by specifying **RPI_PICO_DEBUG_ADAPTER**
+at ``west build`` time. No needs to specify it at ``west debug`` time.
+
+You can also debug with OpenOCD and gdb launching from command-line.
+Run the following command:
+
+.. code-block:: console
+
+   $ openocd -f interface/jlink.cfg -c 'transport select swd' -f target/rp2040.cfg -c "adapter speed 2000" -c 'targets rp2040.core0'
+
+On another terminal, run:
+
+.. code-block:: console
+
+   $ gdb-multiarch
+
+Inside gdb, run:
+
+.. code-block:: console
+
+   (gdb) tar ext :3333
+   (gdb) file path/to/zephyr.elf
+
+You can then start debugging the board.
+
+.. target-notes::
+
+.. _pico_setup.sh:
+   https://raw.githubusercontent.com/raspberrypi/pico-setup/master/pico_setup.sh
+
+.. _Getting Started with Pico-SPE-Series:
+   https://kws-computer.de/go/pico-spe-getting-started
+
+.. _Pico-SPE Documentation:
+   https://kws-computer.de/go/pico-spe-datasheet
diff --git a/boards/kws/pico_spe/pico_spe-pinctrl.dtsi b/boards/kws/pico_spe/pico_spe-pinctrl.dtsi
new file mode 100644
index 0000000000000..ba6d29bb19b9c
--- /dev/null
+++ b/boards/kws/pico_spe/pico_spe-pinctrl.dtsi
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 KWS Computersysteme Gmbh
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/rpi-pico-rp2040-pinctrl.h>
+
+#include "../common/pico_spe-pinctrl-common.dtsi"
diff --git a/boards/kws/pico_spe/pico_spe.dts b/boards/kws/pico_spe/pico_spe.dts
new file mode 100644
index 0000000000000..5a4e89ead5819
--- /dev/null
+++ b/boards/kws/pico_spe/pico_spe.dts
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2024 KWS Computersysteme Gmbh
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <freq.h>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
+#include <zephyr/dt-bindings/dma/rpi-pico-dma-rp2040.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+
+#include "pico_spe-pinctrl.dtsi"
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,flash-controller = &ssi;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,code-partition = &code_partition;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led_0 {
+			gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
+			label = "LED";
+		};
+	};
+
+	pwm_leds {
+		compatible = "pwm-leds";
+		status = "disabled";
+
+		pwm_led0: pwm_led_0 {
+			pwms = <&pwm 9 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM_LED";
+		};
+	};
+
+	aliases {
+		led0 = &led0;
+		pwm-led0 = &pwm_led0;
+		rtc = &rtc;
+		watchdog0 = &wdt0;
+	};
+
+	pico_header: connector {
+		compatible = "raspberrypi,pico-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio0 0 0>,	/* GP0 */
+			<1 0 &gpio0 1 0>,	/* GP1 */
+			<2 0 &gpio0 2 0>,	/* GP2 */
+			<3 0 &gpio0 3 0>,	/* GP3 */
+			<4 0 &gpio0 4 0>,	/* GP4 */
+			<5 0 &gpio0 5 0>,	/* GP5 */
+			<6 0 &gpio0 6 0>,	/* GP6 */
+			<7 0 &gpio0 7 0>,	/* GP7 */
+			<8 0 &gpio0 8 0>,	/* GP8 */
+			<9 0 &gpio0 9 0>,	/* GP9 */
+			<10 0 &gpio0 10 0>,	/* GP10 */
+			<11 0 &gpio0 11 0>,	/* GP11 */
+			<12 0 &gpio0 12 0>,	/* GP12 */
+			<13 0 &gpio0 13 0>,	/* GP13 */
+			<14 0 &gpio0 14 0>,	/* GP14 */
+			<15 0 &gpio0 15 0>,	/* GP15 */
+			<16 0 &gpio0 16 0>,	/* GP16 */
+			<17 0 &gpio0 17 0>,	/* GP17 */
+			<18 0 &gpio0 18 0>,	/* GP18 */
+			<19 0 &gpio0 19 0>,	/* GP19 */
+			<20 0 &gpio0 20 0>,	/* GP20 */
+			<21 0 &gpio0 21 0>,	/* GP21 */
+			<22 0 &gpio0 22 0>,	/* GP22 */
+			<26 0 &gpio0 26 0>,	/* GP26 */
+			<27 0 &gpio0 27 0>,	/* GP27 */
+			<28 0 &gpio0 28 0>;	/* GP28 */
+	};
+};
+
+&flash0 {
+	reg = <0x10000000 DT_SIZE_M(2)>;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Reserved memory for the second stage bootloader */
+		second_stage_bootloader: partition@0 {
+			label = "second_stage_bootloader";
+			reg = <0x00000000 0x100>;
+			read-only;
+		};
+
+		/*
+		 * Usable flash. Starts at 0x100, after the bootloader. The partition
+		 * size is 2MB minus the 0x100 bytes taken by the bootloader.
+		 */
+		code_partition: partition@100 {
+			label = "code-partition";
+			reg = <0x100 (DT_SIZE_M(2) - 0x100)>;
+			read-only;
+		};
+	};
+};
+
+&uart0 {
+	current-speed = <115200>;
+	status = "okay";
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&i2c0 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	status = "okay";
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+	clock-frequency = <I2C_BITRATE_FAST>;
+};
+
+&spi1 {
+	clock-frequency = <DT_FREQ_M(25)>;
+	status = "okay";
+	pinctrl-0 = <&spi1_default>;
+		pinctrl-names = "default";
+	cs-gpios = <&pico_header 13 GPIO_ACTIVE_LOW>;
+
+	lan8651: lan865x@0 {
+		compatible = "microchip,lan865x";
+		reg = <0x0>;
+		spi-max-frequency = <DT_FREQ_M(25)>;
+		int-gpios = <&gpio0 21 (GPIO_ACTIVE_LOW)>;
+		rst-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+		status = "okay";
+		local-mac-address = [ CA 2F B7 10 23 78];
+
+		lan865x_mdio: lan865x_mdio {
+			compatible = "microchip,lan865x-mdio";
+			status = "okay";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			ethernet-phy@0 {
+				compatible = "microchip,t1s-phy";
+				reg = <0x0>;
+				plca-enable;
+				plca-node-id = <0>;
+				plca-node-count = <8>;
+				plca-burst-count = <0>;
+				plca-burst-timer = <0x80>;
+				plca-to-timer = <0x20>;
+				status = "okay";
+			};
+		};
+	};
+};
+
+&timer {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&rtc {
+	clocks = <&clocks RPI_PICO_CLKID_CLK_RTC>;
+	status = "okay";
+};
+
+&adc {
+	status = "okay";
+	pinctrl-0 = <&adc_default>;
+	pinctrl-names = "default";
+};
+
+zephyr_udc0: &usbd {
+	status = "okay";
+};
+
+&pwm {
+	pinctrl-0 = <&pwm_ch4b_default>;
+	pinctrl-names = "default";
+};
+
+&vreg {
+	regulator-always-on;
+	regulator-allowed-modes = <REGULATOR_RPI_PICO_MODE_NORMAL>;
+};
+
+pico_spi: &spi1 {};
+pico_i2c0: &i2c0 {};
+pico_i2c1: &i2c1 {};
+pico_serial: &uart0 {};
diff --git a/boards/kws/pico_spe/pico_spe.yaml b/boards/kws/pico_spe/pico_spe.yaml
new file mode 100644
index 0000000000000..c0b383270f571
--- /dev/null
+++ b/boards/kws/pico_spe/pico_spe.yaml
@@ -0,0 +1,23 @@
+identifier: pico_spe
+name: KWS Pico SinglePairEthernet
+type: mcu
+arch: arm
+flash: 2048
+ram: 264
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - uart
+  - gpio
+  - adc
+  - i2c
+  - spi
+  - hwinfo
+  - watchdog
+  - pwm
+  - flash
+  - dma
+  - counter
+  - clock
diff --git a/boards/kws/pico_spe/pico_spe_defconfig b/boards/kws/pico_spe/pico_spe_defconfig
new file mode 100644
index 0000000000000..df003531af9c8
--- /dev/null
+++ b/boards/kws/pico_spe/pico_spe_defconfig
@@ -0,0 +1,11 @@
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_USE_DT_CODE_PARTITION=y
+CONFIG_BUILD_OUTPUT_UF2=y
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_RESET=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/kws/pico_spe/support/openocd.cfg b/boards/kws/pico_spe/support/openocd.cfg
new file mode 100644
index 0000000000000..34ab592b1861d
--- /dev/null
+++ b/boards/kws/pico_spe/support/openocd.cfg
@@ -0,0 +1,11 @@
+# Copyright (c) 2022 Tokita, Hiroshi <tokita.hiroshi@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+# Checking and set 'adapter speed'.
+# Set the adaptor speed, if unset, and given as an argument.
+proc set_adapter_speed_if_not_set { speed } {
+	puts "checking adapter speed..."
+	if { [catch {adapter speed} ret] } {
+		adapter speed $speed
+	}
+}
diff --git a/boards/lilygo/tdongle_s3/Kconfig b/boards/lilygo/tdongle_s3/Kconfig
new file mode 100644
index 0000000000000..2da6bfecb7c9d
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096 if BOARD_TDONGLE_S3_ESP32S3_PROCPU
+	default 256 if BOARD_TDONGLE_S3_ESP32S3_APPCPU
diff --git a/boards/lilygo/tdongle_s3/Kconfig.sysbuild b/boards/lilygo/tdongle_s3/Kconfig.sysbuild
new file mode 100644
index 0000000000000..420778b68b241
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_NONE
+endchoice
diff --git a/boards/lilygo/tdongle_s3/Kconfig.tdongle_s3 b/boards/lilygo/tdongle_s3/Kconfig.tdongle_s3
new file mode 100644
index 0000000000000..12f013272e00c
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/Kconfig.tdongle_s3
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_TDONGLE_S3
+	select SOC_ESP32S3_WROOM_N16R8
+	select SOC_ESP32S3_PROCPU if BOARD_TDONGLE_S3_ESP32S3_PROCPU
+	select SOC_ESP32S3_APPCPU if BOARD_TDONGLE_S3_ESP32S3_APPCPU
diff --git a/boards/lilygo/tdongle_s3/board.cmake b/boards/lilygo/tdongle_s3/board.cmake
new file mode 100644
index 0000000000000..57d1a920ecd36
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/board.cmake
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
+  set(OPENOCD OPENOCD-NOTFOUND)
+endif()
+find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
+
+include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/lilygo/tdongle_s3/board.yml b/boards/lilygo/tdongle_s3/board.yml
new file mode 100644
index 0000000000000..ad92d0100c941
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: tdongle_s3
+  full_name: T-Dongle S3
+  vendor: lilygo
+  socs:
+  - name: esp32s3
diff --git a/boards/lilygo/tdongle_s3/doc/img/tdongle_s3.webp b/boards/lilygo/tdongle_s3/doc/img/tdongle_s3.webp
new file mode 100644
index 0000000000000..b970f6b1b8d9c
Binary files /dev/null and b/boards/lilygo/tdongle_s3/doc/img/tdongle_s3.webp differ
diff --git a/boards/lilygo/tdongle_s3/doc/index.rst b/boards/lilygo/tdongle_s3/doc/index.rst
new file mode 100644
index 0000000000000..b90f5a214172c
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/doc/index.rst
@@ -0,0 +1,189 @@
+.. zephyr:board:: tdongle_s3
+
+Overview
+********
+
+Lilygo T-Dongle S3 is an IoT mini development board based on the
+Espressif ESP32-S3 WiFi/Bluetooth dual-mode chip.
+
+It features the following integrated components:
+
+- ESP32-S3 chip (240MHz dual core, Bluetooth 5, WiFi)
+- On-board antenna and IPEX connector
+- USB-A connector with integrated TF Card slot
+- MX 1.25mm 2-pin battery connector
+- APA102 RGB LED
+- JST SH 1.0mm 4-pin UART connector
+- Transparent plastic case
+
+Functional Description
+**********************
+This board is based on the ESP32-S3 with 16MB of flash, WiFi and BLE support. It
+has an USB-A port for programming and debugging, integrated battery charging
+and an on-board antenna. The fitted U.FL external antenna connector can be
+enabled by moving a 0-ohm resistor.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Start Application Development
+*****************************
+
+Before powering up your Lilygo T-Dongle T8-S3, please make sure that the board is in good
+condition with no obvious signs of damage.
+
+System requirements
+*******************
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the command
+below to retrieve those files.
+
+.. code-block:: console
+
+   west blobs fetch hal_espressif
+
+.. note::
+
+   It is recommended running the command above after :file:`west update`.
+
+Building & Flashing
+*******************
+
+.. zephyr:board-supported-runners::
+
+Simple boot
+===========
+
+The board could be loaded using a single binary image, without 2nd stage bootloader.
+It is the default option when building the application without additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+==================
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be built (and flashed) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code-block:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+========
+
+The sysbuild makes it possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32 SoC.
+
+To build the sample application using sysbuild use the command:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: tdongle_s3/esp32s3/procpu
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+  build/
+  ├── hello_world
+  │   └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  ├── mcuboot
+  │    └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild` documentation.
+
+Manual build
+============
+
+During the development cycle, it is intended to build & flash as quickly possible.
+For that reason, images can be built one at a time using traditional build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flashed at least once.
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: tdongle_s3/esp32s3/procpu
+   :goals: build
+
+The usual ``flash`` target will work with the ``tdongle_s3`` board target.
+Here is an example for the :zephyr:code-sample:`hello_world`
+application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: tdongle_s3/esp32s3/procpu
+   :goals: flash
+
+The default baud rate for the Lilygo T-Dongle S3 is set to 1500000bps. If experiencing issues when flashing,
+try using different values by using ``--esp-baud-rate <BAUD>`` option during
+``west flash`` (e.g. ``west flash --esp-baud-rate 115200``).
+
+You can also open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has automatically reset and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! tdongle_s3/esp32s3/procpu
+
+References
+**********
+
+.. target-notes::
+
+.. _`Lilygo T-Dongle S3 schematic`: https://github.com/Xinyuan-LilyGO/T-Dongle-S3/blob/main/shcematic/T-Dongle-S3.pdf
+.. _`Lilygo github repo`: https://github.com/Xinyuan-LilyGO/T-Dongle-S3.git
+.. _`ESP32-S3 Datasheet`: https://github.com/Xinyuan-LilyGO/T-Dongle-S3/blob/main/doc/esp32-s3_datasheet_en.pdf
+.. _`ESP32-S3 Technical Reference Manual`: https://github.com/Xinyuan-LilyGO/T-Dongle-S3/blob/main/doc/esp32-s3_technical_reference_manual_en.pdf
+.. _`OpenOCD ESP32`: https://github.com/espressif/openocd-esp32/releases
+.. _`JTAG debugging for ESP32-S3`: https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-guides/jtag-debugging/
diff --git a/boards/lilygo/tdongle_s3/support/openocd.cfg b/boards/lilygo/tdongle_s3/support/openocd.cfg
new file mode 100644
index 0000000000000..0b2c4909fe0e0
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/support/openocd.cfg
@@ -0,0 +1,7 @@
+set ESP_RTOS none
+set ESP32_ONLYCPU 1
+
+source [find interface/esp_usb_jtag.cfg]
+
+source [find target/esp32s3.cfg]
+adapter_khz 5000
diff --git a/boards/lilygo/tdongle_s3/tdongle_s3-pinctrl.dtsi b/boards/lilygo/tdongle_s3/tdongle_s3-pinctrl.dtsi
new file mode 100644
index 0000000000000..a4bff2af2d280
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/tdongle_s3-pinctrl.dtsi
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <dt-bindings/pinctrl/esp32s3-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/esp32s3-gpio-sigmap.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO43>;
+			output-high;
+		};
+
+		group2 {
+			pinmux = <UART0_RX_GPIO44>;
+			bias-pull-up;
+		};
+	};
+
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_SCLK_GPIO5>,
+					 <SPIM2_CSEL_GPIO4>,
+					 <SPIM2_MOSI_GPIO3>;
+		};
+	};
+
+	spim3_default: spim3_default {
+		group1 {
+			pinmux = <SPIM3_SCLK_GPIO39>,
+					 <SPIM3_MOSI_GPIO40>;
+		};
+	};
+
+	sdhc0_default: sdhc0_default {
+		group1 {
+			pinmux = <SDHC0_CLKOUT_GPIO12>,
+					 <SDHC0_CMD_GPIO16>,
+					 <SDHC0_DATA0_GPIO14>,
+					 <SDHC0_DATA1_GPIO17>,
+					 <SDHC0_DATA2_GPIO21>,
+					 <SDHC0_DATA3_GPIO18>;
+			bias-pull-up;
+			output-high;
+		};
+	};
+};
diff --git a/boards/lilygo/tdongle_s3/tdongle_s3_appcpu.dts b/boards/lilygo/tdongle_s3/tdongle_s3_appcpu.dts
new file mode 100644
index 0000000000000..2d2422e11a9ef
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/tdongle_s3_appcpu.dts
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_appcpu.dtsi>
+#include <espressif/partitions_0x0_amp.dtsi>
+
+/ {
+	model = "TDONGLE S3 APPCPU";
+	compatible = "espressif,esp32s3";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,ipc_shm = &shm0;
+		zephyr,ipc = &ipm0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_appcpu_partition;
+	};
+};
+
+&flash0 {
+	reg = <0x0 DT_SIZE_M(4)>;
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&ipm0 {
+	status = "okay";
+};
diff --git a/boards/lilygo/tdongle_s3/tdongle_s3_appcpu.yaml b/boards/lilygo/tdongle_s3/tdongle_s3_appcpu.yaml
new file mode 100644
index 0000000000000..b9bea7145c3e8
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/tdongle_s3_appcpu.yaml
@@ -0,0 +1,27 @@
+identifier: tdongle_s3/esp32s3/appcpu
+name: LILYGO T-DONGLE S3 APPCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - uart
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+    - flash
+    - cpp
+    - posix
+    - watchdog
+    - logging
+    - kernel
+    - pm
+    - gpio
+    - crypto
+    - eeprom
+    - heap
+    - cmsis_rtos
+    - jwt
+    - zdsp
+vendor: lilygo
diff --git a/boards/lilygo/tdongle_s3/tdongle_s3_appcpu_defconfig b/boards/lilygo/tdongle_s3/tdongle_s3_appcpu_defconfig
new file mode 100644
index 0000000000000..6087787aad3d9
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/tdongle_s3_appcpu_defconfig
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/lilygo/tdongle_s3/tdongle_s3_procpu.dts b/boards/lilygo/tdongle_s3/tdongle_s3_procpu.dts
new file mode 100644
index 0000000000000..d325c30273b88
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/tdongle_s3_procpu.dts
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_wroom_n16r8.dtsi>
+#include "tdongle_s3-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/mipi_dbi/mipi_dbi.h>
+#include <espressif/partitions_0x0_amp.dtsi>
+#include <zephyr/dt-bindings/led/led.h>
+
+/ {
+	model = "TDONGLE S3 PROCPU";
+	compatible = "espressif,esp32s3";
+
+	aliases {
+		watchdog0 = &wdt0;
+		sdhc0 = &sdhc0;
+		uart-0 = &uart0;
+		sw0 = &button0;
+		led-strip = &apa102;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		/* console can be UART or USB CDC */
+		/* zephyr,console = &uart0; */
+		/* zephyr,shell-uart = &uart0; */
+		zephyr,console = &usb_serial;
+		zephyr,shell-uart = &usb_serial;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
+		zephyr,display = &st7735r;
+		zephyr,sdhc = &sdhc0;
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+		status = "okay";
+
+		button0: button_0 {
+			gpios = <&gpio0 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "BOOT Button";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	mipi_dbi {
+		compatible = "zephyr,mipi-dbi-spi";
+		/* Enable D/C line for 4wire mode */
+		dc-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+		spi-dev = <&spi2>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		write-only;
+		status = "okay";
+
+		st7735r: st7735r@0 {
+			compatible = "sitronix,st7735r";
+			mipi-max-frequency = <20000000>;
+			mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
+			reg = <0>;
+			width = <160>;
+			height = <80>;
+			inversion-on;
+			rgb-is-inverted;
+			madctl = <0xBE>;
+			x-offset = <1>;
+			y-offset = <26>;
+			gamctrp1 = [02 1c 07 12 37 32 29 2d 29 25 2B 39 00 01 03 10];
+			gamctrn1 = [03 1d 07 06 2E 2C 29 2D 2E 2E 37 3F 00 00 02 10];
+			te-delay = <0x0A>;
+			vmctr1 = <0x0E>;
+			colmod = <0x05>;
+			caset = [00 02 00 81];
+			raset = [00 01 00 A0];
+			status = "okay";
+		};
+	};
+};
+
+&uart0 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	cs-gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+	pinctrl-0 = <&spim2_default>;
+	pinctrl-names = "default";
+	clock-frequency = <20000000>;
+	status = "okay";
+};
+
+&spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-0 = <&spim3_default>;
+	pinctrl-names = "default";
+	clock-frequency = <20000000>;
+	status = "okay";
+
+	apa102: apa102@0 {
+		compatible = "apa,apa102";
+		reg = <0>;
+		spi-max-frequency = <24000000>;
+		chain-length = <1>;
+		color-mapping = <LED_COLOR_ID_RED
+						 LED_COLOR_ID_BLUE
+						 LED_COLOR_ID_GREEN>;
+		status = "okay";
+	};
+};
+
+&usb_serial {
+	status = "okay";
+};
+
+&timer0 {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&esp32_bt_hci {
+	status = "okay";
+};
+
+&sdhc {
+	sdhc0: sdhc@0 {
+		pinctrl-0 = <&sdhc0_default>;
+		pinctrl-names = "default";
+		power-delay-ms = <100>;
+		max-bus-freq = <52000000>;
+		bus-width = <4>;
+		status = "okay";
+
+		mmc {
+			compatible = "zephyr,sdmmc-disk";
+			disk-name = "SD";
+			status = "okay";
+		};
+	};
+};
diff --git a/boards/lilygo/tdongle_s3/tdongle_s3_procpu.yaml b/boards/lilygo/tdongle_s3/tdongle_s3_procpu.yaml
new file mode 100644
index 0000000000000..5b01812a0bfd1
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/tdongle_s3_procpu.yaml
@@ -0,0 +1,22 @@
+identifier: tdongle_s3/esp32s3/procpu
+name: TDONGLE S3 PROCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - i2c
+  - i2s
+  - spi
+  - can
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+  - input
+  - video
+  - display
+vendor: lilygo
diff --git a/boards/lilygo/tdongle_s3/tdongle_s3_procpu_defconfig b/boards/lilygo/tdongle_s3/tdongle_s3_procpu_defconfig
new file mode 100644
index 0000000000000..fbb8fd6b9109c
--- /dev/null
+++ b/boards/lilygo/tdongle_s3/tdongle_s3_procpu_defconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Stefan Golinschi <stefan.golinschi@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/lilygo/ttgo_lora32/doc/index.rst b/boards/lilygo/ttgo_lora32/doc/index.rst
index fa6613d7414dc..1b662bb030c32 100644
--- a/boards/lilygo/ttgo_lora32/doc/index.rst
+++ b/boards/lilygo/ttgo_lora32/doc/index.rst
@@ -15,39 +15,13 @@ It's available in two versions supporting two different frequency ranges and fea
 
 Some of the ESP32 I/O pins are accessible on the board's pin headers.
 
-Functional Description
-**********************
-
-The following table below describes the key components, interfaces, and controls
-of the Lilygo TTGO LoRa32 board.
-
-.. _SX127x: https://www.semtech.com/products/wireless-rf/lora-connect/sx1276#documentation
-.. _ESP32-PICO-D4: https://www.espressif.com/sites/default/files/documentation/esp32-pico-d4_datasheet_en.pdf
-.. _SSD1306: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
-
-+------------------+-------------------------------------------------------------------------+
-| Key Component    | Description                                                             |
-+==================+=========================================================================+
-| ESP32-PICO-D4    | This `ESP32-PICO-D4`_ module provides complete Wi-Fi and Bluetooth      |
-|                  | functionalities and integrates a 4-MB SPI flash.                        |
-+------------------+-------------------------------------------------------------------------+
-| Diagnostic LED   | One user LED connected to the GPIO pin.                                 |
-+------------------+-------------------------------------------------------------------------+
-| USB Port         | USB interface. Power supply for the board as well as the                |
-|                  | serial communication interface between a computer and the board.        |
-|                  | Micro-USB type connector.                                               |
-+------------------+-------------------------------------------------------------------------+
-| Power Switch     | Sliding power switch.                                                   |
-+------------------+-------------------------------------------------------------------------+
-| OLED display     | Built-in OLED display \(`SSD1306`_, 0.96", 128x64 px\) controlled       |
-|                  | by I2C interface                                                        |
-+------------------+-------------------------------------------------------------------------+
-| SX1276/SX1278    | LoRa radio frontend chip, connected via SPI.                            |
-|                  | Use SX1276 for 433MHz and SX1276 for 868/915/923MHz.                    |
-+------------------+-------------------------------------------------------------------------+
-| TF card slot     | TF card slot wired to the SDHC interface of the MCU.                    |
-+------------------+-------------------------------------------------------------------------+
+Hardware
+********
+
+Supported Features
+==================
 
+.. zephyr:board-supported-hw::
 
 Start Application Development
 *****************************
@@ -61,7 +35,7 @@ System requirements
 Prerequisites
 =============
 
-Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the command
+Espressif HAL requires WiFi and Bluetooth binary blobs in order to work. Run the command
 below to retrieve those files.
 
 .. code-block:: console
@@ -75,10 +49,12 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
-The board could be loaded using the single binary image, without 2nd stage bootloader.
+The board could be loaded using a single binary image, without 2nd stage bootloader.
 It is the default option when building the application without additional configuration.
 
 .. note::
@@ -108,7 +84,7 @@ There are two options to be used when building an application:
 Sysbuild
 ========
 
-The sysbuild makes possible to build and flash all necessary images needed to
+The sysbuild makes it possible to build and flash all necessary images needed to
 bootstrap the board with the ESP32-PICO-D4 SoC.
 
 To build the sample application using sysbuild use the command:
@@ -193,7 +169,7 @@ message in the monitor:
 .. code-block:: console
 
    ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
-   Hello World! ttgo_lora32
+   Hello World! ttgo_lora32/esp32/procpu
 
 Code samples
 ============
@@ -218,3 +194,5 @@ Related Documents
 - `ESP32-PICO-D4 Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-pico-d4_datasheet_en.pdf>`_ (PDF)
 - `ESP32 Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf>`_ (PDF)
 - `ESP32 Hardware Reference <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/hw-reference/index.html>`_
+- `SX127x Datasheet <https://www.semtech.com/products/wireless-rf/lora-connect/sx1276#documentation>`_
+- `SSD1306 Datasheet <https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf>`_ (PDF)
diff --git a/boards/lilygo/ttgo_lora32/ttgo_lora32_esp32_procpu.dts b/boards/lilygo/ttgo_lora32/ttgo_lora32_esp32_procpu.dts
index 6ae0dbeb0152e..42c3391f387d8 100644
--- a/boards/lilygo/ttgo_lora32/ttgo_lora32_esp32_procpu.dts
+++ b/boards/lilygo/ttgo_lora32/ttgo_lora32_esp32_procpu.dts
@@ -148,3 +148,7 @@
 		};
 	};
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/lilygo/ttgo_t7v1_5/doc/index.rst b/boards/lilygo/ttgo_t7v1_5/doc/index.rst
index 13f5107cd80e5..57d12645c9aed 100644
--- a/boards/lilygo/ttgo_t7v1_5/doc/index.rst
+++ b/boards/lilygo/ttgo_t7v1_5/doc/index.rst
@@ -13,38 +13,17 @@ It features the following integrated components:
 - JST GH 2-pin battery connector
 - LED
 
-Functional Description
-**********************
+Hardware
+********
+
 This board is based on the ESP32-WROVER-E module with 4MB of flash (there
 are models 16MB as well), WiFi and BLE support. It has a Micro-USB port for
 programming and debugging, integrated battery charging and an on-board antenna.
 
-Connections and IOs
-===================
+Supported Features
+==================
 
-The ``ttgo_t7v1_5/esp32/procpu`` board target supports the following hardware features:
-
-+-----------+------------+------------------+
-| Interface | Controller | Driver/Component |
-+===========+============+==================+
-| CPU       | ESP32      | arch/xtensa      |
-+-----------+------------+------------------+
-| GPIO      | on-chip    | gpio_esp32       |
-+-----------+------------+------------------+
-| UART      | on-chip    | uart_esp32       |
-+-----------+------------+------------------+
-| I2C       | on-chip    | i2c_esp32        |
-+-----------+------------+------------------+
-| SPI       | on-chip    | spi_esp32_spim   |
-+-----------+------------+------------------+
-| LoRa      | SX1276     | lora_sx127x      |
-+-----------+------------+------------------+
-| WiFi      | on-chip    | wifi_esp32       |
-+-----------+------------+------------------+
-| BLE       | on-chip    | bluetooth_esp32  |
-+-----------+------------+------------------+
-| Flash     | on-chip    | flash_esp32      |
-+-----------+------------+------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -52,7 +31,7 @@ System requirements
 Prerequisites
 =============
 
-Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the command
+Espressif HAL requires WiFi and Bluetooth binary blobs in order to work. Run the command
 below to retrieve those files.
 
 .. code-block:: console
@@ -66,10 +45,12 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
-The board could be loaded using the single binary image, without 2nd stage bootloader.
+The board could be loaded using a single binary image, without 2nd stage bootloader.
 It is the default option when building the application without additional configuration.
 
 .. note::
@@ -80,7 +61,7 @@ MCUboot bootloader
 ==================
 
 User may choose to use MCUboot bootloader instead. In that case the bootloader
-must be build (and flash) at least once.
+must be built (and flashed) at least once.
 
 There are two options to be used when building an application:
 
@@ -92,14 +73,14 @@ There are two options to be used when building an application:
    User can select the MCUboot bootloader by adding the following line
    to the board default configuration file.
 
-   .. code:: cfg
+   .. code-block:: cfg
 
       CONFIG_BOOTLOADER_MCUBOOT=y
 
 Sysbuild
 ========
 
-The sysbuild makes possible to build and flash all necessary images needed to
+The sysbuild makes it possible to build and flash all necessary images needed to
 bootstrap the board with the ESP32 SoC.
 
 To build the sample application using sysbuild use the command:
@@ -142,7 +123,7 @@ Manual build
 ============
 
 During the development cycle, it is intended to build & flash as quickly possible.
-For that reason, images can be build one at a time using traditional build.
+For that reason, images can be built one at a time using traditional build.
 
 The instructions following are relevant for both manual build and sysbuild.
 The only difference is the structure of the build directory.
diff --git a/boards/lilygo/ttgo_t8c3/doc/index.rst b/boards/lilygo/ttgo_t8c3/doc/index.rst
index 4179528b6af57..33cab6415243e 100644
--- a/boards/lilygo/ttgo_t8c3/doc/index.rst
+++ b/boards/lilygo/ttgo_t8c3/doc/index.rst
@@ -14,39 +14,18 @@ It features the following integrated components:
 - JST GH 2-pin battery connector
 - LED
 
-Functional Description
-**********************
+Hardware
+********
+
 This board is based on the ESP32-C3 with 4MB of flash, WiFi and BLE support. It
 has an USB-C port for programming and debugging, integrated battery charging
 and an on-board antenna. The fitted U.FL external antenna connector can be
 enabled by moving a 0-ohm resistor.
 
-Connections and IOs
-===================
+Supported Features
+==================
 
-The ``ttgo_t8c3`` board target supports the following hardware features:
-
-+-----------+------------+------------------+
-| Interface | Controller | Driver/Component |
-+===========+============+==================+
-| PMP       | on-chip    | arch/riscv       |
-+-----------+------------+------------------+
-| INTMTRX   | on-chip    | intc_esp32c3     |
-+-----------+------------+------------------+
-| PINMUX    | on-chip    | pinctrl_esp32    |
-+-----------+------------+------------------+
-| USB UART  | on-chip    | serial_esp32_usb |
-+-----------+------------+------------------+
-| GPIO      | on-chip    | gpio_esp32       |
-+-----------+------------+------------------+
-| UART      | on-chip    | uart_esp32       |
-+-----------+------------+------------------+
-| I2C       | on-chip    | i2c_esp32        |
-+-----------+------------+------------------+
-| SPI       | on-chip    | spi_esp32_spim   |
-+-----------+------------+------------------+
-| TWAI      | on-chip    | can_esp32_twai   |
-+-----------+------------+------------------+
+.. zephyr:board-supported-hw::
 
 Start Application Development
 *****************************
@@ -60,7 +39,7 @@ System requirements
 Prerequisites
 =============
 
-Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the command
+Espressif HAL requires WiFi and Bluetooth binary blobs in order to work. Run the command
 below to retrieve those files.
 
 .. code-block:: console
@@ -74,10 +53,12 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
-The board could be loaded using the single binary image, without 2nd stage bootloader.
+The board could be loaded using a single binary image, without 2nd stage bootloader.
 It is the default option when building the application without additional configuration.
 
 .. note::
@@ -107,7 +88,7 @@ There are two options to be used when building an application:
 Sysbuild
 ========
 
-The sysbuild makes possible to build and flash all necessary images needed to
+The sysbuild makes it possible to build and flash all necessary images needed to
 bootstrap the board with the ESP32-C3 SoC.
 
 To build the sample application using sysbuild use the command:
diff --git a/boards/lilygo/ttgo_t8s3/doc/index.rst b/boards/lilygo/ttgo_t8s3/doc/index.rst
index 09455ed19a605..fb29b2e5f7b60 100644
--- a/boards/lilygo/ttgo_t8s3/doc/index.rst
+++ b/boards/lilygo/ttgo_t8s3/doc/index.rst
@@ -15,51 +15,18 @@ It features the following integrated components:
 - JST SH 1.0mm 4-pin UART connector
 - SD card slot
 
-Functional Description
-**********************
+Hardware
+********
+
 This board is based on the ESP32-S3 with 16MB of flash, WiFi and BLE support. It
 has an USB-C port for programming and debugging, integrated battery charging
 and an on-board antenna. The fitted U.FL external antenna connector can be
 enabled by moving a 0-ohm resistor.
 
-Connections and IOs
-===================
-
-The ``ttgo_t8s3`` board target supports the following hardware features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi, sdmmc                          |
-+------------+------------+-------------------------------------+
-| TWAI/CAN   | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
 
 Start Application Development
 *****************************
@@ -73,7 +40,7 @@ System requirements
 Prerequisites
 =============
 
-Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the command
+Espressif HAL requires WiFi and Bluetooth binary blobs in order to work. Run the command
 below to retrieve those files.
 
 .. code-block:: console
@@ -87,10 +54,12 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
-The board could be loaded using the single binary image, without 2nd stage bootloader.
+The board could be loaded using a single binary image, without 2nd stage bootloader.
 It is the default option when building the application without additional configuration.
 
 .. note::
@@ -120,7 +89,7 @@ There are two options to be used when building an application:
 Sysbuild
 ========
 
-The sysbuild makes possible to build and flash all necessary images needed to
+The sysbuild makes it possible to build and flash all necessary images needed to
 bootstrap the board with the ESP32 SoC.
 
 To build the sample application using sysbuild use the command:
diff --git a/boards/lilygo/ttgo_t8s3/ttgo_t8s3_procpu.dts b/boards/lilygo/ttgo_t8s3/ttgo_t8s3_procpu.dts
index a034a9cb49a4e..0bc8b8470922f 100644
--- a/boards/lilygo/ttgo_t8s3/ttgo_t8s3_procpu.dts
+++ b/boards/lilygo/ttgo_t8s3/ttgo_t8s3_procpu.dts
@@ -144,3 +144,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/lilygo/ttgo_tbeam/Kconfig b/boards/lilygo/ttgo_tbeam/Kconfig
new file mode 100644
index 0000000000000..c52379f257a07
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096 if BOARD_TTGO_TBEAM_ESP32_PROCPU
+	default 256 if BOARD_TTGO_TBEAM_ESP32_APPCPU
diff --git a/boards/lilygo/ttgo_tbeam/Kconfig.sysbuild b/boards/lilygo/ttgo_tbeam/Kconfig.sysbuild
new file mode 100644
index 0000000000000..3a2d17ac5cfd0
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_NONE
+endchoice
diff --git a/boards/lilygo/ttgo_tbeam/Kconfig.ttgo_tbeam b/boards/lilygo/ttgo_tbeam/Kconfig.ttgo_tbeam
new file mode 100644
index 0000000000000..3b3202cf8e427
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/Kconfig.ttgo_tbeam
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Lothar Felten <lothar.felten@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_TTGO_TBEAM
+	select SOC_ESP32_PICO_D4
+	select SOC_ESP32_PROCPU if BOARD_TTGO_TBEAM_ESP32_PROCPU
+	select SOC_ESP32_APPCPU if BOARD_TTGO_TBEAM_ESP32_APPCPU
diff --git a/boards/lilygo/ttgo_tbeam/board.cmake b/boards/lilygo/ttgo_tbeam/board.cmake
new file mode 100644
index 0000000000000..91b3caa2c75d5
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/board.cmake
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
+  set(OPENOCD OPENOCD-NOTFOUND)
+endif()
+find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
+
+include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+
+# the default ESP32 baud rate is not supported
+board_runner_args(esp32 "--esp-baud-rate=1500000")
diff --git a/boards/lilygo/ttgo_tbeam/board.yml b/boards/lilygo/ttgo_tbeam/board.yml
new file mode 100644
index 0000000000000..fad0e34cdcad8
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: ttgo_tbeam
+  full_name: TTGO TBeam
+  vendor: lilygo
+  socs:
+  - name: esp32
diff --git a/boards/lilygo/ttgo_tbeam/doc/img/ttgo_tbeam.webp b/boards/lilygo/ttgo_tbeam/doc/img/ttgo_tbeam.webp
new file mode 100644
index 0000000000000..eb488921e4a59
Binary files /dev/null and b/boards/lilygo/ttgo_tbeam/doc/img/ttgo_tbeam.webp differ
diff --git a/boards/lilygo/ttgo_tbeam/doc/index.rst b/boards/lilygo/ttgo_tbeam/doc/index.rst
new file mode 100644
index 0000000000000..fa6082abaa29d
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/doc/index.rst
@@ -0,0 +1,204 @@
+.. zephyr:board:: ttgo_tbeam
+
+Overview
+********
+
+The Lilygo TTGO TBeam, is an ESP32-based development board for LoRa applications.
+
+It's available in two versions supporting two different frequency ranges and features the following integrated components:
+
+- ESP32-PICO-D4 chip (240MHz dual core, 600 DMIPS, 520KB SRAM, Wi-Fi)
+- SSD1306, 128x64 px, 0.96" screen (optional)
+- SX1278 (433MHz) or SX1276 (868/915/923MHz) LoRa radio frontend (optional, with SMA or IPEX connector)
+- NEO-6M or NEO-M8N GNSS module
+- X-Powers AXP2101 PMIC
+- JST GH 2-pin battery connector
+- 18650 Li-Ion battery clip
+
+Some of the ESP32 I/O pins are accessible on the board's pin headers.
+
+Hardware
+********
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Start Application Development
+*****************************
+
+Before powering up your Lilygo TTGO TBeam, please make sure that the board is in good
+condition with no obvious signs of damage.
+
+System requirements
+*******************
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi and Bluetooth binary blobs in order to work. Run the command
+below to retrieve those files.
+
+.. code-block:: console
+
+   west blobs fetch hal_espressif
+
+.. note::
+
+   It is recommended running the command above after :file:`west update`.
+
+Building & Flashing
+*******************
+
+.. zephyr:board-supported-runners::
+
+Simple boot
+===========
+
+The board could be loaded using a single binary image, without 2nd stage bootloader.
+It is the default option when building the application without additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+==================
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be built (and flashed) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code-block:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+========
+
+The sysbuild makes it possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32-PICO-D4 SoC.
+
+To build the sample application using sysbuild use the command:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: ttgo_tbeam/esp32/procpu
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32-PICO-D4 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+  build/
+  ├── hello_world
+  │   └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  ├── mcuboot
+  │    └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild` documentation.
+
+Manual build
+============
+
+During the development cycle, it is intended to build & flash as quickly possible.
+For that reason, images can be built one at a time using traditional build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flash at least once.
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: ttgo_tbeam/esp32/procpu
+   :goals: build
+
+The usual ``flash`` target will work with the ``ttgo_tbeam`` board target.
+Here is an example for the :zephyr:code-sample:`hello_world`
+application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: ttgo_tbeam/esp32/procpu
+   :goals: flash
+
+The default baud rate for the Lilygo TTGO TBeam is set to 1500000bps. If experiencing issues when flashing,
+try using different values by using ``--esp-baud-rate <BAUD>`` option during
+``west flash`` (e.g. ``west flash --esp-baud-rate 115200``).
+
+You can also open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has automatically reset and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! ttgo_tbeam/esp32/procpu
+
+Code samples
+============
+
+The following sample applications will work out of the box with this board:
+
+* :zephyr:code-sample:`lora-send`
+* :zephyr:code-sample:`lora-receive`
+* :zephyr:code-sample:`gnss`
+* :zephyr:code-sample:`wifi-shell`
+* :zephyr:code-sample:`character-frame-buffer`
+* :zephyr:code-sample:`blinky`
+
+Debugging
+*********
+
+Lilygo TTGO TBeam debugging is not supported due to pinout limitations.
+
+Related Documents
+*****************
+- `Lilygo TTGO TBeam schematic <https://github.com/Xinyuan-LilyGO/LilyGo-LoRa-Series/blob/master/schematic/LilyGo_TBeam_V1.2.pdf>`_ (PDF)
+- `Lilygo TTGO TBeam documentation <https://www.lilygo.cc/products/t-beam-v1-1-esp32-lora-module>`_
+- `Lilygo github repo <https://github.com/Xinyuan-LilyGo>`_
+- `ESP32-PICO-D4 Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-pico-d4_datasheet_en.pdf>`_ (PDF)
+- `ESP32 Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf>`_ (PDF)
+- `ESP32 Hardware Reference <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/hw-reference/index.html>`_
+- `SX127x Datasheet <https://www.semtech.com/products/wireless-rf/lora-connect/sx1276#documentation>`_
+- `SSD1306 Datasheet <https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf>`_ (PDF)
+- `NEO-6M Datasheet <https://content.u-blox.com/sites/default/files/products/documents/NEO-6_DataSheet_%28GPS.G6-HW-09005%29.pdf>`_ (PDF)
+- `NEO-N8M Datasheet <https://content.u-blox.com/sites/default/files/NEO-M8-FW3_DataSheet_UBX-15031086.pdf>`_ (PDF)
diff --git a/boards/lilygo/ttgo_tbeam/support/openocd.cfg b/boards/lilygo/ttgo_tbeam/support/openocd.cfg
new file mode 100644
index 0000000000000..338e6e4e6eae9
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/support/openocd.cfg
@@ -0,0 +1,5 @@
+set ESP_RTOS none
+set ESP32_ONLYCPU 1
+
+source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find target/esp32.cfg]
diff --git a/boards/lilygo/ttgo_tbeam/ttgo_tbeam-pinctrl.dtsi b/boards/lilygo/ttgo_tbeam/ttgo_tbeam-pinctrl.dtsi
new file mode 100644
index 0000000000000..a8a93a72bf8fb
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/ttgo_tbeam-pinctrl.dtsi
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2024 Lothar Felten <lothar.felten@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <dt-bindings/pinctrl/esp32-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/esp32-gpio-sigmap.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO1>;
+			output-high;
+		};
+
+		group2 {
+			pinmux = <UART0_RX_GPIO3>;
+			bias-pull-up;
+		};
+	};
+
+	uart1_default: uart1_default {
+		group1 {
+			pinmux = <UART1_TX_GPIO12>;
+			output-high;
+		};
+
+		group2 {
+			pinmux = <UART1_RX_GPIO34>;
+			bias-pull-up;
+		};
+	};
+
+	spim3_default: spim3_default {
+		group1 {
+			pinmux = <SPIM3_MISO_GPIO19>,
+				 <SPIM3_SCLK_GPIO5>;
+		};
+
+		group2 {
+			pinmux = <SPIM3_MOSI_GPIO27>;
+			output-low;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO21>,
+				 <I2C0_SCL_GPIO22>;
+			bias-pull-up;
+			drive-open-drain;
+			output-high;
+		};
+	};
+};
diff --git a/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu.dts b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu.dts
new file mode 100644
index 0000000000000..3547f3e351ae4
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu.dts
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32/esp32_appcpu.dtsi>
+#include <espressif/partitions_0x1000_amp.dtsi>
+
+/ {
+	model = "TTGO TBeam APPCPU";
+	compatible = "espressif,esp32";
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,ipc_shm = &shm0;
+		zephyr,ipc = &ipm0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_appcpu_partition;
+	};
+};
+
+&ipm0 {
+	status = "okay";
+};
+
+&trng0 {
+	status = "okay";
+};
diff --git a/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu.yaml b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu.yaml
new file mode 100644
index 0000000000000..8eca6127690f4
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu.yaml
@@ -0,0 +1,28 @@
+identifier: ttgo_tbeam/esp32/appcpu
+name: TTGO TBeam APPCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - uart
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+    - flash
+    - cpp
+    - posix
+    - watchdog
+    - logging
+    - kernel
+    - pm
+    - gpio
+    - crypto
+    - eeprom
+    - heap
+    - cmsis_rtos
+    - jwt
+    - zdsp
+    - gnss
+vendor: lilygo
diff --git a/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu_defconfig b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu_defconfig
new file mode 100644
index 0000000000000..48546641cadd6
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_appcpu_defconfig
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu.dts b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu.dts
new file mode 100644
index 0000000000000..43143525fb54d
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu.dts
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2024 Lothar Felten <lothar.felten@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32/esp32_pico_d4.dtsi>
+#include "ttgo_tbeam-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <espressif/partitions_0x1000_amp.dtsi>
+
+/ {
+	model = "TTGO TBeam PROCPU";
+	compatible = "lilygo,ttgo-tbeam";
+
+	aliases {
+		led0 = &red_led;
+		uart-0 = &uart0;
+		i2c-0 = &i2c0;
+		watchdog0 = &wdt0;
+		lora0 = &lora0;
+		gnss = &gnss;
+		regulator0 = &axp2101;
+	};
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,display = &ssd1306_128x64;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		red_led: led_0 {
+			gpios =  <&gpio0 4 GPIO_ACTIVE_HIGH>;
+			label = "Red - LED0";
+		};
+	};
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <9600>;
+	pinctrl-0 = <&uart1_default>;
+	pinctrl-names = "default";
+
+	gnss: gnss-nmea-generic {
+		compatible = "gnss-nmea-generic";
+	};
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	sda-gpios = <&gpio0 21 GPIO_OPEN_DRAIN>;
+	scl-gpios = <&gpio0 22 GPIO_OPEN_DRAIN>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+
+	ssd1306_128x64: ssd1306@3c {
+		compatible = "solomon,ssd1306fb";
+		reg = <0x3c>;
+		width = <128>;
+		height = <64>;
+		segment-offset = <0>;
+		page-offset = <0>;
+		display-offset = <0>;
+		multiplex-ratio = <63>;
+		segment-remap;
+		com-invdir;
+		prechargep = <0x22>;
+	};
+
+	axp2101: axp2101@34 {
+		status = "okay";
+		reg = <0x34>;
+		compatible = "x-powers,axp2101";
+		regulator {
+			compatible = "x-powers,axp2101-regulator";
+
+			vdd_mcu: DCDC1 {
+				regulator-min-microvolt = <3200000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			vdd_lora: ALDO2 {
+				regulator-min-microvolt = <2900000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			vdd_gnss: ALDO3 {
+				regulator-min-microvolt = <2700000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-boot-on;
+			};
+		};
+	};
+};
+
+&spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim3_default>;
+	pinctrl-names = "default";
+	cs-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+
+	lora0: lora@0 {
+		compatible = "semtech,sx1276";
+		reg = <0>;
+		reset-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
+		dio-gpios =
+			/* SX1276 D0 -> GPIO26 */
+			<&gpio0 26 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+			/* SX1276 D1 -> GPIO33 */
+			<&gpio1 1 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>,
+			/* SX1276 D2 -> GPIO32 */
+			<&gpio1 0 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+		spi-max-frequency = <1000000>;
+		power-amplifier-output = "pa-boost";
+	};
+};
+
+&timer0 {
+	status = "okay";
+};
+
+&timer1 {
+	status = "okay";
+};
+
+&timer2 {
+	status = "okay";
+};
+
+&timer3 {
+	status = "okay";
+};
+
+&trng0 {
+	status = "okay";
+};
diff --git a/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu.yaml b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu.yaml
new file mode 100644
index 0000000000000..6d2fe9c703a59
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu.yaml
@@ -0,0 +1,22 @@
+identifier: ttgo_tbeam/esp32/procpu
+name: TTGO TBeam PROCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - i2c
+  - spi
+  - watchdog
+  - uart
+  - pinmux
+  - display
+  - lora
+  - nvs
+  - gnss
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+vendor: lilygo
diff --git a/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu_defconfig b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu_defconfig
new file mode 100644
index 0000000000000..6b1097cdb389a
--- /dev/null
+++ b/boards/lilygo/ttgo_tbeam/ttgo_tbeam_esp32_procpu_defconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+CONFIG_GPIO=y
+CONFIG_MFD=y
+CONFIG_REGULATOR=y
diff --git a/boards/lilygo/ttgo_toiplus/Kconfig b/boards/lilygo/ttgo_toiplus/Kconfig
new file mode 100644
index 0000000000000..c6a99b1032dc7
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096
diff --git a/boards/lilygo/ttgo_toiplus/Kconfig.sysbuild b/boards/lilygo/ttgo_toiplus/Kconfig.sysbuild
new file mode 100644
index 0000000000000..3a2d17ac5cfd0
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_NONE
+endchoice
diff --git a/boards/lilygo/ttgo_toiplus/Kconfig.ttgo_toiplus b/boards/lilygo/ttgo_toiplus/Kconfig.ttgo_toiplus
new file mode 100644
index 0000000000000..ddca709de7ad2
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/Kconfig.ttgo_toiplus
@@ -0,0 +1,5 @@
+# Copyright 2025 aisuneko icecat <iceneko@protonmail.ch>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_TTGO_TOIPLUS
+	select SOC_ESP32C3_FN4
diff --git a/boards/lilygo/ttgo_toiplus/board.cmake b/boards/lilygo/ttgo_toiplus/board.cmake
new file mode 100644
index 0000000000000..2f04d1fe8861e
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/board.cmake
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
+  set(OPENOCD OPENOCD-NOTFOUND)
+endif()
+find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
+
+include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/lilygo/ttgo_toiplus/board.yml b/boards/lilygo/ttgo_toiplus/board.yml
new file mode 100644
index 0000000000000..e5295b2bec226
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: ttgo_toiplus
+  full_name: TTGO T-OI-PLUS
+  vendor: lilygo
+  socs:
+  - name: esp32c3
diff --git a/boards/lilygo/ttgo_toiplus/doc/img/ttgo_toiplus.webp b/boards/lilygo/ttgo_toiplus/doc/img/ttgo_toiplus.webp
new file mode 100644
index 0000000000000..115cc04fa29fd
Binary files /dev/null and b/boards/lilygo/ttgo_toiplus/doc/img/ttgo_toiplus.webp differ
diff --git a/boards/lilygo/ttgo_toiplus/doc/index.rst b/boards/lilygo/ttgo_toiplus/doc/index.rst
new file mode 100644
index 0000000000000..3ea6b50446fa3
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/doc/index.rst
@@ -0,0 +1,199 @@
+.. zephyr:board:: ttgo_toiplus
+
+Overview
+********
+
+Lilygo TTGO T-OI-PLUS is an mini IoT development board based on
+Espressif's ESP32-C3 WiFi/Bluetooth dual-mode chip.
+
+It features the following integrated components:
+
+- ESP32-C3 SoC (RISC-V 160MHz single core, 400KB SRAM, Wi-Fi, Bluetooth)
+- on board Grove connector
+- USB-C connector for power and communication (on board serial)
+- optional 18340 Li-ion battery holder
+- LED
+
+Functional Description
+**********************
+This board is based on the ESP32-C3 with 4MB of flash, WiFi and BLE support. It
+has an USB-C port for programming and debugging, integrated battery charging
+and an Grove connector.
+
+Connections and IOs
+===================
+
+.. zephyr:board-supported-hw::
+
+(Note: the above UART interface also supports connecting through USB.)
+
+Start Application Development
+*****************************
+
+Before powering up your Lilygo TTGO T-OI-PLUS, please make sure that the board is in good
+condition with no obvious signs of damage.
+
+System requirements
+*******************
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the command
+below to retrieve those files.
+
+.. code-block:: console
+
+   west blobs fetch hal_espressif
+
+.. note::
+
+   It is recommended running the command above after :file:`west update`.
+
+Building & Flashing
+*******************
+
+Simple boot
+===========
+
+The board could be loaded using the single binary image, without 2nd stage bootloader.
+It is the default option when building the application without additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+==================
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be built (and flashed) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+========
+
+The sysbuild makes possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32-C3 SoC.
+
+To build the sample application using sysbuild use the command:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: ttgo_toiplus
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32-C3 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+  build/
+  ├── hello_world
+  │   └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  ├── mcuboot
+  │    └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-build and re-flash
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild` documentation.
+
+Manual build
+============
+
+During the development cycle, it is intended to build & flash as quickly possible.
+For that reason, images can be built one at a time using traditional build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flash at least once.
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: ttgo_toiplus
+   :goals: build
+
+The usual ``flash`` target will work with the ``ttgo_toiplus`` board target.
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: ttgo_toiplus
+   :goals: flash
+
+You can also open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has automatically reset and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! ttgo_toiplus
+
+Sample applications
+===================
+
+The following samples will run out of the box on the TTGO T-OI-PLUS board.
+
+To build the blinky sample:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/basic/blinky
+   :board: ttgo_toiplus
+   :goals: build
+
+To build the bluetooth beacon sample:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/bluetooth/beacon
+   :board: ttgo_toiplus
+   :goals: build
+
+
+Related Documents
+*****************
+.. _`Lilygo TTGO T-OI-PLUS schematic`: https://github.com/Xinyuan-LilyGO/LilyGo-T-OI-PLUS/blob/main/schematic/T-OI_PLUS_Schematic.pdf
+.. _`Lilygo github repo`: https://github.com/Xinyuan-LilyGO
+.. _`Espressif ESP32-C3 datasheet`: https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf
+.. _`Espressif ESP32-C3 technical reference manual`: https://www.espressif.com/sites/default/files/documentation/esp32-c3_technical_reference_manual_en.pdf
+.. _`OpenOCD ESP32`: https://github.com/espressif/openocd-esp32/releases
diff --git a/boards/lilygo/ttgo_toiplus/support/openocd.cfg b/boards/lilygo/ttgo_toiplus/support/openocd.cfg
new file mode 100644
index 0000000000000..02754ff2a73c1
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/support/openocd.cfg
@@ -0,0 +1,6 @@
+set ESP_RTOS none
+
+source [find interface/esp_usb_jtag.cfg]
+
+source [find target/esp32c3.cfg]
+adapter_khz 5000
diff --git a/boards/lilygo/ttgo_toiplus/ttgo_toiplus-pinctrl.dtsi b/boards/lilygo/ttgo_toiplus/ttgo_toiplus-pinctrl.dtsi
new file mode 100644
index 0000000000000..874d3c94639bd
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/ttgo_toiplus-pinctrl.dtsi
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 Lothar Felten <lothar.felten@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <dt-bindings/pinctrl/esp32c3-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/esp32c3-gpio-sigmap.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_GPIO21>;
+			output-high;
+		};
+
+		group2 {
+			pinmux = <UART0_RX_GPIO20>;
+			bias-pull-up;
+		};
+	};
+
+	spim2_default: spim2_default {
+		group1 {
+			pinmux = <SPIM2_MISO_GPIO5>,
+				 <SPIM2_SCLK_GPIO4>;
+		};
+
+		/* GPIO6 is CS */
+
+		group2 {
+			pinmux = <SPIM2_MOSI_GPIO7>;
+			output-low;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_GPIO2>,
+				 <I2C0_SCL_GPIO8>;
+			bias-pull-up;
+			drive-open-drain;
+			output-high;
+		};
+	};
+
+	twai_default: twai_default {
+		group1 {
+			pinmux = <TWAI_TX_GPIO0>,
+				 <TWAI_RX_GPIO10>;
+		};
+	};
+};
diff --git a/boards/lilygo/ttgo_toiplus/ttgo_toiplus.dts b/boards/lilygo/ttgo_toiplus/ttgo_toiplus.dts
new file mode 100644
index 0000000000000..6db7d4c16e6fe
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/ttgo_toiplus.dts
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2025 aisuneko icecat <iceneko@protonmail.ch>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <espressif/esp32c3/esp32c3_common.dtsi>
+#include "ttgo_toiplus-pinctrl.dtsi"
+#include <espressif/partitions_0x0_default.dtsi>
+
+/ {
+	model = "Lilygo TTGO T-OI-PLUS";
+	compatible = "lilygo,ttgo-toiplus";
+
+	aliases {
+		led0 = &green_led;
+		i2c-0 = &i2c0;
+		watchdog0 = &wdt0;
+	};
+
+	chosen {
+		zephyr,sram = &sram1;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
+		zephyr,canbus = &twai;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		green_led: led_0 {
+			gpios =  <&gpio0 3 GPIO_ACTIVE_HIGH>;
+			label = "Green - LED0";
+		};
+	};
+};
+
+&flash0 {
+	reg = <0x0 DT_SIZE_M(4)>;
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim2_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&timer0 {
+	status = "okay";
+};
+
+&timer1 {
+	status = "okay";
+};
+
+&twai {
+	status = "okay";
+	pinctrl-0 = <&twai_default>;
+	pinctrl-names = "default";
+};
+
+&wifi {
+	status = "okay";
+};
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/lilygo/ttgo_toiplus/ttgo_toiplus.yaml b/boards/lilygo/ttgo_toiplus/ttgo_toiplus.yaml
new file mode 100644
index 0000000000000..746472787cb24
--- /dev/null
+++ b/boards/lilygo/ttgo_toiplus/ttgo_toiplus.yaml
@@ -0,0 +1,14 @@
+identifier: ttgo_toiplus
+name: TTGO T-OI-PLUS
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - i2c
+  - spi
+  - uart
+  - watchdog
+  - can
+vendor: lilygo
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6_defconfig b/boards/lilygo/ttgo_toiplus/ttgo_toiplus_defconfig
similarity index 100%
rename from boards/seeed/xiao_esp32c6/xiao_esp32c6_defconfig
rename to boards/lilygo/ttgo_toiplus/ttgo_toiplus_defconfig
diff --git a/boards/lilygo/twatch_s3/Kconfig b/boards/lilygo/twatch_s3/Kconfig
new file mode 100644
index 0000000000000..8d5a48cfc2c61
--- /dev/null
+++ b/boards/lilygo/twatch_s3/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096 if BOARD_TWATCH_S3_ESP32S3_PROCPU
+	default 256 if BOARD_TWATCH_S3_ESP32S3_APPCPU
diff --git a/boards/lilygo/twatch_s3/Kconfig.defconfig b/boards/lilygo/twatch_s3/Kconfig.defconfig
new file mode 100644
index 0000000000000..f7e4f32af3924
--- /dev/null
+++ b/boards/lilygo/twatch_s3/Kconfig.defconfig
@@ -0,0 +1,17 @@
+# Copyright 2025 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+if DISPLAY
+
+choice ST7789V_PIXEL_FORMAT
+	default ST7789V_BGR565
+endchoice
+
+if LVGL
+
+config LV_COLOR_16_SWAP
+	default y
+
+endif # LVGL
+
+endif # DISPLAY
diff --git a/boards/lilygo/twatch_s3/Kconfig.sysbuild b/boards/lilygo/twatch_s3/Kconfig.sysbuild
new file mode 100644
index 0000000000000..7d37de9b1aabc
--- /dev/null
+++ b/boards/lilygo/twatch_s3/Kconfig.sysbuild
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_NONE
+endchoice
diff --git a/boards/lilygo/twatch_s3/Kconfig.twatch_s3 b/boards/lilygo/twatch_s3/Kconfig.twatch_s3
new file mode 100644
index 0000000000000..338ccb6bec903
--- /dev/null
+++ b/boards/lilygo/twatch_s3/Kconfig.twatch_s3
@@ -0,0 +1,7 @@
+# Copyright 2025 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_TWATCH_S3
+	select SOC_ESP32S3_WROOM_N16R8
+	select SOC_ESP32S3_PROCPU if BOARD_TWATCH_S3_ESP32S3_PROCPU
+	select SOC_ESP32S3_APPCPU if BOARD_TWATCH_S3_ESP32S3_APPCPU
diff --git a/boards/lilygo/twatch_s3/board.cmake b/boards/lilygo/twatch_s3/board.cmake
new file mode 100644
index 0000000000000..2f04d1fe8861e
--- /dev/null
+++ b/boards/lilygo/twatch_s3/board.cmake
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
+  set(OPENOCD OPENOCD-NOTFOUND)
+endif()
+find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
+
+include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/lilygo/twatch_s3/board.yml b/boards/lilygo/twatch_s3/board.yml
new file mode 100644
index 0000000000000..e894af0d251c6
--- /dev/null
+++ b/boards/lilygo/twatch_s3/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: twatch_s3
+  full_name: T-Watch S3
+  vendor: lilygo
+  socs:
+  - name: esp32s3
diff --git a/boards/lilygo/twatch_s3/doc/img/twatch_s3.webp b/boards/lilygo/twatch_s3/doc/img/twatch_s3.webp
new file mode 100644
index 0000000000000..b79ef6813171a
Binary files /dev/null and b/boards/lilygo/twatch_s3/doc/img/twatch_s3.webp differ
diff --git a/boards/lilygo/twatch_s3/doc/index.rst b/boards/lilygo/twatch_s3/doc/index.rst
new file mode 100644
index 0000000000000..3dc07e37673ea
--- /dev/null
+++ b/boards/lilygo/twatch_s3/doc/index.rst
@@ -0,0 +1,198 @@
+.. zephyr:board:: twatch_s3
+
+Overview
+********
+
+LILYGO T-Watch S3 is an ESP32-S3 based smartwatch with the following features:
+
+- ESP32-S3-R8 chip
+
+   - Dual core Xtensa LX-7 up to 240MHz
+   - 8 MB of integrated PSRAM
+   - Bluetooth LE v5.0
+   - Wi-Fi 802.11 b/g/n
+
+- 16 MB external QSPI flash (Winbond W25Q128JWPIQ)
+- Power Management Unit (X-Powers AXP2101) which provides
+
+   - Regulators (DC-DCs and LDOs)
+   - Battery charging
+   - Fuel gauge
+
+- 470 mAh battery
+- RTC (NXP PCF8563)
+- Haptic (Texas Instruments DRV2605)
+- Accelerometer (Bosch BMA423)
+- 240x240 pixels LCD with touchscreen
+
+   - ST7789V LCD Controller
+   - Focaltech FT5336 touch sensor
+
+- Microphone (Knowles SPM1423HM4H-B)
+- LoRA radio (Semtech SX1262)
+- Audio amplifier (Maxim MAX98357A)
+
+The board features a single micro USB connector which can be used for serial
+flashing, debugging and console thanks to the integrated JTAG support in the
+chip.
+
+It does not have any GPIO that can easily be connected to something external.
+There is only 1 physical button which is connected to the PMU and it's used
+to turn on/off the device.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Building & Flashing
+*******************
+
+.. zephyr:board-supported-runners::
+
+Prerequisites
+=============
+
+Espressif HAL requires WiFi and Bluetooth binary blobs in order to work. Run the command
+below to retrieve those files.
+
+.. code-block:: console
+
+   west blobs fetch hal_espressif
+
+.. note::
+
+   It is recommended running the command above after :file:`west update`.
+
+Simple boot
+===========
+
+The board could be loaded using a single binary image, without 2nd stage bootloader.
+It is the default option when building the application without additional configuration.
+
+.. note::
+
+   Simple boot does not provide any security features nor OTA updates.
+
+MCUboot bootloader
+==================
+
+User may choose to use MCUboot bootloader instead. In that case the bootloader
+must be built (and flashed) at least once.
+
+There are two options to be used when building an application:
+
+1. Sysbuild
+2. Manual build
+
+.. note::
+
+   User can select the MCUboot bootloader by adding the following line
+   to the board default configuration file.
+
+   .. code-block:: cfg
+
+      CONFIG_BOOTLOADER_MCUBOOT=y
+
+Sysbuild
+--------
+
+The sysbuild makes it possible to build and flash all necessary images needed to
+bootstrap the board with the ESP32 SoC.
+
+To build the sample application using sysbuild, use the command:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: twatch_s3/esp32s3/procpu
+   :goals: build
+   :west-args: --sysbuild
+   :compact:
+
+By default, the ESP32-S3 sysbuild creates bootloader (MCUboot) and application
+images. But it can be configured to create other kind of images.
+
+Build directory structure created by sysbuild is different from traditional
+Zephyr build. Output is structured by the domain subdirectories:
+
+.. code-block::
+
+  build/
+  ├── hello_world
+  │   └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  ├── mcuboot
+  │    └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
+  └── domains.yaml
+
+.. note::
+
+   With ``--sysbuild`` option the bootloader will be re-built and re-flashed
+   every time the pristine build is used.
+
+For more information about the system build please read the :ref:`sysbuild` documentation.
+
+Manual build
+------------
+
+During the development cycle, it is intended to build & flash as quickly as possible.
+For that reason, images can be built one at a time using traditional build.
+
+The instructions following are relevant for both manual build and sysbuild.
+The only difference is the structure of the build directory.
+
+.. note::
+
+   Remember that bootloader (MCUboot) needs to be flashed at least once.
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: twatch_s3/esp32s3/procpu
+   :goals: build
+
+The usual ``flash`` target will work with the ``twatch_s3`` board target
+configuration. Here is an example for the :zephyr:code-sample:`hello_world`
+application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: twatch_s3/esp32s3/procpu
+   :goals: flash
+
+The default baud rate is set to 1500000bps. If experiencing issues when flashing,
+try using different values by using ``--esp-baud-rate <BAUD>`` option during
+``west flash`` (e.g. ``west flash --esp-baud-rate 115200``).
+
+You can also open the serial monitor using the following command:
+
+.. code-block:: shell
+
+   west espressif monitor
+
+After the board has automatically reset and booted, you should see the following
+message in the monitor:
+
+.. code-block:: console
+
+   ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
+   Hello World! twatch_s3/esp32s3/procpu
+
+References
+**********
+
+.. target-notes::
+
+.. _`Lilygo Twatch S3 schematic`: https://github.com/Xinyuan-LilyGO/TTGO_TWatch_Library/blob/t-watch-s3/schematic/T_WATCH_S3.pdf
+.. _`Lilygo T-Watch S3 repo`: https://github.com/Xinyuan-LilyGO/TTGO_TWatch_Library/tree/t-watch-s3
+.. _`Lilygo T-Watch Deps repo`: https://github.com/Xinyuan-LilyGO/T-Watch-Deps
+.. _`ESP32-S3 Datasheet`: https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf
+.. _`ESP32-S3 Technical Reference Manual`: https://www.espressif.com/sites/default/files/documentation/esp32-c3_technical_reference_manual_en.pdf
+.. _`OpenOCD ESP32`: https://github.com/espressif/openocd-esp32/releases
+.. _`JTAG debugging for ESP32-S3`: https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-guides/jtag-debugging/
diff --git a/boards/lilygo/twatch_s3/support/openocd.cfg b/boards/lilygo/twatch_s3/support/openocd.cfg
new file mode 100644
index 0000000000000..0b2c4909fe0e0
--- /dev/null
+++ b/boards/lilygo/twatch_s3/support/openocd.cfg
@@ -0,0 +1,7 @@
+set ESP_RTOS none
+set ESP32_ONLYCPU 1
+
+source [find interface/esp_usb_jtag.cfg]
+
+source [find target/esp32s3.cfg]
+adapter_khz 5000
diff --git a/boards/lilygo/twatch_s3/twatch_s3-pinctrl.dtsi b/boards/lilygo/twatch_s3/twatch_s3-pinctrl.dtsi
new file mode 100644
index 0000000000000..b62a16f797a85
--- /dev/null
+++ b/boards/lilygo/twatch_s3/twatch_s3-pinctrl.dtsi
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <dt-bindings/pinctrl/esp32s3-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/esp32s3-gpio-sigmap.h>
+
+&pinctrl {
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SCL_GPIO11>,
+				 <I2C0_SDA_GPIO10>;
+			drive-open-drain;
+			output-high;
+		};
+	};
+
+	i2c1_default: i2c1_default {
+		group1 {
+			pinmux = <I2C1_SCL_GPIO40>,
+				 <I2C1_SDA_GPIO39>;
+			drive-open-drain;
+			output-high;
+		};
+	};
+
+	spim3_default: spim3_default {
+		group1 {
+			pinmux = <SPIM3_SCLK_GPIO18>,
+				 <SPIM3_CSEL_GPIO12>;
+		};
+
+		group2 {
+			pinmux = <SPIM3_MOSI_GPIO13>;
+			output-low;
+		};
+	};
+
+	ledc0_default: ledc0_default {
+		group1 {
+			pinmux = <LEDC_CH0_GPIO45>;
+			output-enable;
+		};
+	};
+};
diff --git a/boards/lilygo/twatch_s3/twatch_s3_appcpu.dts b/boards/lilygo/twatch_s3/twatch_s3_appcpu.dts
new file mode 100644
index 0000000000000..35d19fc17b1ca
--- /dev/null
+++ b/boards/lilygo/twatch_s3/twatch_s3_appcpu.dts
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_r8.dtsi>
+#include <espressif/partitions_0x0_amp_16M.dtsi>
+
+/ {
+	model = "T-Watch S3 APPCPU";
+	compatible = "espressif,esp32s3";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,ipc_shm = &shm0;
+		zephyr,ipc = &ipm0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_appcpu_partition;
+	};
+};
+
+&flash0 {
+	reg = <0x0 DT_SIZE_M(16)>;
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&ipm0 {
+	status = "okay";
+};
diff --git a/boards/lilygo/twatch_s3/twatch_s3_appcpu.yaml b/boards/lilygo/twatch_s3/twatch_s3_appcpu.yaml
new file mode 100644
index 0000000000000..e834a090c9fc9
--- /dev/null
+++ b/boards/lilygo/twatch_s3/twatch_s3_appcpu.yaml
@@ -0,0 +1,27 @@
+identifier: twatch_s3/esp32s3/appcpu
+name: T-Watch S3 APPCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - uart
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+    - flash
+    - cpp
+    - posix
+    - watchdog
+    - logging
+    - kernel
+    - pm
+    - gpio
+    - crypto
+    - eeprom
+    - heap
+    - cmsis_rtos
+    - jwt
+    - zdsp
+vendor: lilygo
diff --git a/boards/lilygo/twatch_s3/twatch_s3_appcpu_defconfig b/boards/lilygo/twatch_s3/twatch_s3_appcpu_defconfig
new file mode 100644
index 0000000000000..48546641cadd6
--- /dev/null
+++ b/boards/lilygo/twatch_s3/twatch_s3_appcpu_defconfig
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/lilygo/twatch_s3/twatch_s3_procpu.dts b/boards/lilygo/twatch_s3/twatch_s3_procpu.dts
new file mode 100644
index 0000000000000..b78676a8b0a0b
--- /dev/null
+++ b/boards/lilygo/twatch_s3/twatch_s3_procpu.dts
@@ -0,0 +1,282 @@
+/*
+ * Copyright (c) 2025 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32s3/esp32s3_r8.dtsi>
+#include "twatch_s3-pinctrl.dtsi"
+#include <espressif/partitions_0x0_amp_16M.dtsi>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+
+/ {
+	model = "T-Watch S3 PROCPU";
+	compatible = "espressif,esp32s3";
+
+	aliases {
+		i2c-0 = &i2c0;
+		i2c-1 = &i2c1;
+		watchdog0 = &wdt0;
+		rtc = &pfc8563_rtc;
+		pwm-led0 = &backlight_pwm;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,console = &usb_serial;
+		zephyr,shell-uart = &usb_serial;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
+		zephyr,display = &st7789v;
+		zephyr,touch = &ft5336;
+		zephyr,ipc_shm = &shm0;
+		zephyr,ipc = &ipm0;
+	};
+
+	mipi_dbi {
+		compatible = "zephyr,mipi-dbi-spi";
+		dc-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+		spi-dev = <&spi3>;
+		write-only;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		st7789v: st7789v@0 {
+			compatible = "sitronix,st7789v";
+			mipi-max-frequency = <20000000>;
+			mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
+			reg = <0>;
+			width = <240>;
+			height = <240>;
+			x-offset = <0>;
+			y-offset = <80>;
+			mdac = <0xc8>;
+			ram-param = [00 e0];
+			colmod = <0x55>;
+			porch-param = [0c 0c 00 33 33];
+			gctrl = <0x35>;
+			vcom = <0x28>;
+			lcm = <0x0c>;
+			vrhs = <0x10>;
+			vdvs = <0x20>;
+			pwctrl1-param = [a4 a1];
+			pvgam-param = [d0 00 02 07 0a 28 32 44 42 06 0e 12 14 17];
+			nvgam-param = [d0 00 02 07 0a 28 31 54 47 0e 1c 17 1b 1e];
+			/* Values below are not set by the eTFT_SPI driver from
+			 * LilyGO. Therefore let's keep ST7789V values.
+			 */
+			gamma = <0x01>;
+			cmd2en-param = [5a 69 02 00];
+			rgb-param = [40 02 14];
+		};
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+
+		backlight_pwm: pwm_0 {
+			label = "LCD backlight PWM";
+			pwms = <&ledc0 0 PWM_HZ(100) PWM_POLARITY_NORMAL>;
+		};
+	};
+
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336>;
+		swap-xy;
+	};
+};
+
+&ledc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&ledc0_default>;
+	pinctrl-names = "default";
+
+	channel0@0 {
+		reg = <0x0>;
+		timer = <0>;
+	};
+};
+
+&spi3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim3_default>;
+	pinctrl-names = "default";
+};
+
+&i2c0 {
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	pfc8563_rtc: pfc8563@51 {
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+		status = "okay";
+	};
+
+	bma423: bma423@19 {
+		compatible = "bosch,bma4xx";
+		reg = <0x19>;
+		status = "okay";
+		int1-gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+	};
+
+	haptic: drv2605@5a {
+		compatible = "ti,drv2605";
+		reg = <0x5a>;
+		status = "okay";
+		actuator-mode = "ERM";
+	};
+
+	axp2101@34 {
+		compatible = "x-powers,axp2101";
+		reg = <0x34>;
+
+		charger {
+			compatible = "x-powers,axp2101-charger";
+			constant-charge-current-max-microamp = <300000>;
+			constant-charge-voltage-max-microvolt = <4200000>;
+			charge-term-current-microamp = <100000>;
+			vbackup-enable;
+		};
+
+		regulators {
+			compatible = "x-powers,axp2101-regulator";
+
+			dcdc1 {
+				regulator-min-microvolt = <3300000>;
+				regulator-init-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+
+			dcdc2 {
+				regulator-boot-off;
+			};
+
+			dcdc3 {
+				regulator-min-microvolt = <3300000>;
+				regulator-init-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+
+			dcdc4 {
+				regulator-boot-off;
+			};
+
+			dcdc5 {
+				regulator-boot-off;
+			};
+
+			aldo1 {
+				regulator-min-microvolt = <3300000>;
+				regulator-init-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+
+			aldo2 {
+				regulator-min-microvolt = <3300000>;
+				regulator-init-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+
+			aldo3 {
+				regulator-min-microvolt = <3300000>;
+				regulator-init-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+
+			aldo4 {
+				regulator-min-microvolt = <3300000>;
+				regulator-init-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+
+			bldo1 {
+				regulator-boot-off;
+			};
+
+			bldo2 {
+				regulator-min-microvolt = <3300000>;
+				regulator-init-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+			};
+
+			cplusldo {
+				regulator-boot-off;
+			};
+
+			dldo1 {
+				regulator-boot-off;
+			};
+
+			dldo2 {
+				regulator-boot-off;
+			};
+		};
+	};
+};
+
+&i2c1 {
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	ft5336: ft5336@38 {
+		compatible = "focaltech,ft5336";
+		reg = <0x38>;
+		int-gpios = <&gpio0 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+		reset-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&usb_serial {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&esp32_bt_hci {
+	status = "okay";
+};
+
+&flash0 {
+	reg = <0x0 DT_SIZE_M(16)>;
+};
+
+&timer0 {
+	status = "okay";
+};
+
+&ipm0 {
+	status = "okay";
+};
diff --git a/boards/lilygo/twatch_s3/twatch_s3_procpu.yaml b/boards/lilygo/twatch_s3/twatch_s3_procpu.yaml
new file mode 100644
index 0000000000000..975c4750ac09f
--- /dev/null
+++ b/boards/lilygo/twatch_s3/twatch_s3_procpu.yaml
@@ -0,0 +1,19 @@
+identifier: twatch_s3/esp32s3/procpu
+name: T-Watch S3 PROCPU
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - entropy
+  - pwm
+  - dma
+  - input
+  - video
+  - rtc
+vendor: lilygo
diff --git a/boards/lilygo/twatch_s3/twatch_s3_procpu_defconfig b/boards/lilygo/twatch_s3/twatch_s3_procpu_defconfig
new file mode 100644
index 0000000000000..d8fbaa879257b
--- /dev/null
+++ b/boards/lilygo/twatch_s3/twatch_s3_procpu_defconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/boards/lowrisc/opentitan_earlgrey/doc/index.rst b/boards/lowrisc/opentitan_earlgrey/doc/index.rst
index b91c0700def27..bfc13c1218165 100644
--- a/boards/lowrisc/opentitan_earlgrey/doc/index.rst
+++ b/boards/lowrisc/opentitan_earlgrey/doc/index.rst
@@ -1,7 +1,4 @@
-.. _opentitan_earlgrey:
-
-OpenTitan Earl Grey
-###################
+.. zephyr:board:: opentitan_earlgrey
 
 Overview
 ********
@@ -51,6 +48,8 @@ Other hardware features are not yet supported on Zephyr porting.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 First, build and install Verilator as described in the `OpenTitan Verilator
 Setup`_ guide .
 
diff --git a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.dtsi b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.dtsi
index f000b61f3162e..1b0a13b77dfeb 100644
--- a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.dtsi
+++ b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.dtsi
@@ -96,3 +96,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core.dtsi b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core.dtsi
index 43ee4b452646f..fc3c57e1b9f0d 100644
--- a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core.dtsi
+++ b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core.dtsi
@@ -107,3 +107,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/m5stack_atom_lite/doc/index.rst b/boards/m5stack/m5stack_atom_lite/doc/index.rst
index 87e56a236774b..9b84f801fd6f7 100644
--- a/boards/m5stack/m5stack_atom_lite/doc/index.rst
+++ b/boards/m5stack/m5stack_atom_lite/doc/index.rst
@@ -16,39 +16,7 @@ It features the following integrated components:
 Supported Features
 ==================
 
-The Zephyr m5stack_atom_lite board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Start Application Development
 *****************************
@@ -76,6 +44,8 @@ below to retrieve those files.
 Building & Flashing
 -------------------
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.dts b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.dts
index 012c2b1f8fe7e..226b1d1a00407 100644
--- a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.dts
+++ b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.dts
@@ -147,3 +147,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/m5stack_atoms3/doc/index.rst b/boards/m5stack/m5stack_atoms3/doc/index.rst
index 1b863cb08be5e..9cedbfb51805a 100644
--- a/boards/m5stack/m5stack_atoms3/doc/index.rst
+++ b/boards/m5stack/m5stack_atoms3/doc/index.rst
@@ -18,39 +18,7 @@ It features the following integrated components:
 Supported Features
 ==================
 
-The Zephyr m5stack_atoms3 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Start Application Development
 *****************************
@@ -78,6 +46,8 @@ below to retrieve those files.
 Building & Flashing
 -------------------
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.dts b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.dts
index ed96340740748..bb81fbbb39ff9 100644
--- a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.dts
+++ b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.dts
@@ -158,3 +158,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/m5stack_atoms3_lite/doc/index.rst b/boards/m5stack/m5stack_atoms3_lite/doc/index.rst
index 23af62d96e670..8403358be1e4f 100644
--- a/boards/m5stack/m5stack_atoms3_lite/doc/index.rst
+++ b/boards/m5stack/m5stack_atoms3_lite/doc/index.rst
@@ -16,39 +16,7 @@ It features the following integrated components:
 Supported Features
 ==================
 
-The Zephyr m5stack_atoms3_lite board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Start Application Development
 *****************************
@@ -76,6 +44,8 @@ below to retrieve those files.
 Building & Flashing
 -------------------
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.dts b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.dts
index c5884a846a156..60bc3d6429a24 100644
--- a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.dts
+++ b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.dts
@@ -117,3 +117,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/m5stack_core2/Kconfig.defconfig b/boards/m5stack/m5stack_core2/Kconfig.defconfig
index c90a78870ba0e..1999b90c5b8d8 100644
--- a/boards/m5stack/m5stack_core2/Kconfig.defconfig
+++ b/boards/m5stack/m5stack_core2/Kconfig.defconfig
@@ -14,7 +14,7 @@ config GPIO_HOGS_INIT_PRIORITY
 config MFD_INIT_PRIORITY
 	default 70
 
-config REGULATOR_AXP192_INIT_PRIORITY
+config REGULATOR_AXP192_AXP2101_INIT_PRIORITY
 	default 71
 
 config GPIO_AXP192_INIT_PRIORITY
diff --git a/boards/m5stack/m5stack_core2/doc/index.rst b/boards/m5stack/m5stack_core2/doc/index.rst
index 9855ef1de5994..fb21227767c44 100644
--- a/boards/m5stack/m5stack_core2/doc/index.rst
+++ b/boards/m5stack/m5stack_core2/doc/index.rst
@@ -104,39 +104,7 @@ These voltages can be controlled via regulator api.
 Supported Features
 ==================
 
-The Zephyr m5stack_core2 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Start Application Development
 *****************************
@@ -164,6 +132,8 @@ below to retrieve those files.
 Building & Flashing
 -------------------
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts b/boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts
index 554e1885488e2..172fb1c6c5df5 100644
--- a/boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts
+++ b/boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts
@@ -87,8 +87,7 @@
 };
 
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "disabled";
+	size = <DT_SIZE_M(8)>;
 };
 
 &uart0 {
@@ -191,7 +190,7 @@
 	ft5336_touch: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
-		int-gpios = <&gpio1 7 0>;
+		int-gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
 	};
 };
 
@@ -253,3 +252,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_procpu_defconfig b/boards/m5stack/m5stack_core2/m5stack_core2_procpu_defconfig
index 22e46419ab62b..0fcad2e5e26d2 100644
--- a/boards/m5stack/m5stack_core2/m5stack_core2_procpu_defconfig
+++ b/boards/m5stack/m5stack_core2/m5stack_core2_procpu_defconfig
@@ -1,11 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_ESP_HEAP_MEM_POOL_REGION_1_SIZE=0
-
 CONFIG_GPIO=y
-
 CONFIG_REGULATOR=y
-
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
diff --git a/boards/m5stack/m5stack_cores3/doc/index.rst b/boards/m5stack/m5stack_cores3/doc/index.rst
index d9025e3f6d8af..2fdd042c38e67 100644
--- a/boards/m5stack/m5stack_cores3/doc/index.rst
+++ b/boards/m5stack/m5stack_cores3/doc/index.rst
@@ -52,6 +52,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/m5stack/m5stack_cores3/m5stack_cores3_procpu_common.dtsi b/boards/m5stack/m5stack_cores3/m5stack_cores3_procpu_common.dtsi
index 1f0bf306dfca1..842c8afcc5f09 100644
--- a/boards/m5stack/m5stack_cores3/m5stack_cores3_procpu_common.dtsi
+++ b/boards/m5stack/m5stack_cores3/m5stack_cores3_procpu_common.dtsi
@@ -156,3 +156,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/m5stack_stamps3/doc/index.rst b/boards/m5stack/m5stack_stamps3/doc/index.rst
index 3762fd49b1cba..4e006eca8a397 100644
--- a/boards/m5stack/m5stack_stamps3/doc/index.rst
+++ b/boards/m5stack/m5stack_stamps3/doc/index.rst
@@ -134,6 +134,8 @@ below to retrieve those files.
 Building & Flashing
 -------------------
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.dts b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.dts
index f2733a5719548..d2aa01fa61c75 100644
--- a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.dts
+++ b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.dts
@@ -156,3 +156,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/m5stickc_plus/Kconfig.defconfig b/boards/m5stack/m5stickc_plus/Kconfig.defconfig
index 86819dba82d3a..9399c4d1f328c 100644
--- a/boards/m5stack/m5stickc_plus/Kconfig.defconfig
+++ b/boards/m5stack/m5stickc_plus/Kconfig.defconfig
@@ -11,7 +11,7 @@ config GPIO_HOGS_INIT_PRIORITY
 config MFD_INIT_PRIORITY
 	default 70
 
-config REGULATOR_AXP192_INIT_PRIORITY
+config REGULATOR_AXP192_AXP2101_INIT_PRIORITY
 	default 71
 
 config GPIO_AXP192_INIT_PRIORITY
diff --git a/boards/m5stack/m5stickc_plus/doc/index.rst b/boards/m5stack/m5stickc_plus/doc/index.rst
index f40e21fbd5e63..e6e65a3e1d8f1 100644
--- a/boards/m5stack/m5stickc_plus/doc/index.rst
+++ b/boards/m5stack/m5stickc_plus/doc/index.rst
@@ -84,6 +84,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.dts b/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.dts
index 6b1a2dd8ba216..2a85c2c0353d1 100644
--- a/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.dts
+++ b/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.dts
@@ -218,3 +218,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/m5stack/stamp_c3/doc/index.rst b/boards/m5stack/stamp_c3/doc/index.rst
index a953b595b2c79..704bacc6cad90 100644
--- a/boards/m5stack/stamp_c3/doc/index.rst
+++ b/boards/m5stack/stamp_c3/doc/index.rst
@@ -11,30 +11,7 @@ For more details see the `M5Stack STAMP-C3`_ page.
 Supported Features
 ==================
 
-The STAMP-C3 board configuration supports the following hardware features:
-
-+-----------+------------+------------------+
-| Interface | Controller | Driver/Component |
-+===========+============+==================+
-| PMP       | on-chip    | arch/riscv       |
-+-----------+------------+------------------+
-| INTMTRX   | on-chip    | intc_esp32c3     |
-+-----------+------------+------------------+
-| PINMUX    | on-chip    | pinctrl_esp32    |
-+-----------+------------+------------------+
-| USB UART  | on-chip    | serial_esp32_usb |
-+-----------+------------+------------------+
-| GPIO      | on-chip    | gpio_esp32       |
-+-----------+------------+------------------+
-| UART      | on-chip    | uart_esp32       |
-+-----------+------------+------------------+
-| I2C       | on-chip    | i2c_esp32        |
-+-----------+------------+------------------+
-| SPI       | on-chip    | spi_esp32_spim   |
-+-----------+------------+------------------+
-| TWAI      | on-chip    | can_esp32_twai   |
-+-----------+------------+------------------+
-
+.. zephyr:board-supported-hw::
 
 Prerequisites
 *************
@@ -53,6 +30,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/m5stack/stamp_c3/stamp_c3.dts b/boards/m5stack/stamp_c3/stamp_c3.dts
index cbd3a3fdd92dd..800ae9f36c05a 100644
--- a/boards/m5stack/stamp_c3/stamp_c3.dts
+++ b/boards/m5stack/stamp_c3/stamp_c3.dts
@@ -96,3 +96,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/madmachine/mm_feather/doc/index.rst b/boards/madmachine/mm_feather/doc/index.rst
index 7c1b985fc7013..c717db21baa9f 100644
--- a/boards/madmachine/mm_feather/doc/index.rst
+++ b/boards/madmachine/mm_feather/doc/index.rst
@@ -44,33 +44,7 @@ Hardware
 Supported Features
 ==================
 
-The mm_feather board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | I2S                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -166,8 +140,10 @@ The Swift ID is not the same as the Zephyr driver ID.
 +-----------+---------------+----------+---------------+----------+---------------+
 
 
-Programming and Flash
-*************************
+Programming and Flashing
+************************
+
+.. zephyr:board-supported-runners::
 
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/madmachine/mm_feather/mm_feather.dts b/boards/madmachine/mm_feather/mm_feather.dts
index 0b655edd1c292..ea9dd21d797a9 100644
--- a/boards/madmachine/mm_feather/mm_feather.dts
+++ b/boards/madmachine/mm_feather/mm_feather.dts
@@ -56,6 +56,7 @@
 
 
 &flexspi {
+	status = "okay";
 	reg = <0x402a8000 0x4000>, <0x60000000 DT_SIZE_M(8)>;
 	is25wp064: is25wp064@0 {
 		compatible = "nxp,imx-flexspi-nor";
diff --git a/boards/madmachine/mm_swiftio/doc/index.rst b/boards/madmachine/mm_swiftio/doc/index.rst
index 6845fa1fa3602..80cff7d6c96f2 100644
--- a/boards/madmachine/mm_swiftio/doc/index.rst
+++ b/boards/madmachine/mm_swiftio/doc/index.rst
@@ -26,31 +26,7 @@ Hardware
 Supported Features
 ==================
 
-The mm_swiftio board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -166,10 +142,12 @@ The Swift ID is not the same as the Zephyr driver ID.
 +-----------+---------------+----------+---------------+----------+---------------+
 
 
-Programming and Flash
-*************************
+Programming and Flashing
+************************
+
+.. zephyr:board-supported-runners::
 
-Build  applications as usual (see :ref:`build_an_application` for more details).
+Build applications as usual (see :ref:`build_an_application` for more details).
 
 Configuring a Debug Probe
 =========================
diff --git a/boards/madmachine/mm_swiftio/mm_swiftio.dts b/boards/madmachine/mm_swiftio/mm_swiftio.dts
index cbdf85c3c12e6..814c448c1d86a 100644
--- a/boards/madmachine/mm_swiftio/mm_swiftio.dts
+++ b/boards/madmachine/mm_swiftio/mm_swiftio.dts
@@ -56,6 +56,7 @@
 
 
 &flexspi {
+	status = "okay";
 	reg = <0x402a8000 0x4000>, <0x60000000 DT_SIZE_M(8)>;
 	is25wp064: is25wp064@0 {
 		compatible = "nxp,imx-flexspi-nor";
diff --git a/boards/makerbase/mks_canable_v20/doc/index.rst b/boards/makerbase/mks_canable_v20/doc/index.rst
index 0a86e6fa6fcc1..abc27df5189e7 100644
--- a/boards/makerbase/mks_canable_v20/doc/index.rst
+++ b/boards/makerbase/mks_canable_v20/doc/index.rst
@@ -30,27 +30,7 @@ More information about STM32G431KB can be found here:
 Supported Features
 ==================
 
-The Zephyr ``mks_canable_v20`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | universal-serial-bus                |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FDCAN     | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/makerbase/mks_canable_v20/mks_canable_v20_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -84,6 +64,8 @@ The FDCAN1 peripheral is driven by PLLQ, which has 80 MHz frequency.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 MKS CANable V2.0 board includes an SWDIO debug connector header J4.
 
 .. note::
diff --git a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake
index 1f43fd93827bd..895ec1a36bd93 100644
--- a/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake
+++ b/boards/makerdiary/nrf52840_mdk_usb_dongle/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/makerdiary/nrf52840_mdk_usb_dongle/doc/index.rst b/boards/makerdiary/nrf52840_mdk_usb_dongle/doc/index.rst
index ac4743c77488c..83b5621bee84b 100644
--- a/boards/makerdiary/nrf52840_mdk_usb_dongle/doc/index.rst
+++ b/boards/makerdiary/nrf52840_mdk_usb_dongle/doc/index.rst
@@ -3,24 +3,40 @@
 Overview
 ********
 
-The nRF52840 MDK USB Dongle is a small and low-cost development platform enabled
-by the nRF5240 multiprotocol SoC in a convenient USB dongle form factor.
+The nRF52840 MDK USB Dongle is a small and low-cost development platform
+enabled by the nRF52840 multiprotocol SoC in a convenient USB dongle
+form factor.
 
-The design features a programmable user button, RGB LED, up to 12 GPIOs and 2.4G
-Chip antenna on board. It can be used as a low-cost
-Bluetooth5/Tread/802.15.4/ANT/2.4GHz multiprotocol node or development
-board. Alternatively the USB Dongle can be used as a Network Co-Processor(NCP)
-with a simple connection to a PC or other USB enabled device.
+Hardware
+********
+
+The design features:
+
+* Programmable user button
+* RGB LED
+* Up to 12 GPIOs
+* 2.4 GHz chip antenna
 
-See `nrf52840-mdk-usb-dongle website`_ for more information about the development
-board and `nRF52840 website`_ for the official reference on the IC itself.
+The USB Dongle can be used as:
 
+* A low-cost Bluetooth 5/Thread/802.15.4/ANT/2.4GHz multiprotocol node
+* A development board
+* A Network Co-Processor (NCP) with a simple connection to a PC or other USB enabled device
+
+For more information:
+
+* See the `nrf52840-mdk-usb-dongle website`_ for details about the development board
+* See the `nRF52840 website`_ for the official reference on the IC itself
+* See the `nrf52840-mdk-usb-dongle pinout diagram`_ for details about the pin usage of the board
 
 References
 **********
+
 .. target-notes::
 
 .. _nRF52840 website:
    https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52840
 .. _nrf52840-mdk-usb-dongle website:
    https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/
+.. _nrf52840-mdk-usb-dongle pinout diagram:
+    https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/assets/attachments/nrf52840-mdk-usb-dongle-pinout_v1_1.pdf
diff --git a/boards/mediatek/mt8186/afe-mt8186.dts b/boards/mediatek/mt8186/afe-mt8186.dts
index c4d16826b81d4..e6bd2ac557ccc 100644
--- a/boards/mediatek/mt8186/afe-mt8186.dts
+++ b/boards/mediatek/mt8186/afe-mt8186.dts
@@ -1,7 +1,7 @@
 	afe_dl1: afe_dl1 {
 		compatible = "mediatek,afe";
-		afe_name = "DL1";
-		dai_id = <0>;
+		afe-name = "DL1";
+		dai-id = <0>;
 		downlink;
 		base = <0x11210050 0x11210054>;
 		cur = <0x11210058 0x1121005c>;
@@ -14,8 +14,8 @@
 
 	afe_dl2: afe_dl2 {
 		compatible = "mediatek,afe";
-		afe_name = "DL2";
-		dai_id = <1>;
+		afe-name = "DL2";
+		dai-id = <1>;
 		downlink;
 		base = <0x1121006c 0x11210070>;
 		cur = <0x11210074 0x11210078>;
@@ -28,22 +28,22 @@
 
 	afe_ul1: afe_ul1 {
 		compatible = "mediatek,afe";
-		afe_name = "UL1";
-		dai_id = <2>;
+		afe-name = "UL1";
+		dai-id = <2>;
 		base = <0x11210378 0x1121037c>;
 		cur = <0x11210380 0x11210384>;
 		end = <0x11210388 0x1121038c>;
 		fs = <0x11210374 24 4>;
 		mono = <0x11210374 8 1>;
-		quad_ch = <0x11210374 11 1>;
+		quad-ch = <0x11210374 11 1>;
 		enable = <0x11210010 31 1>;
 		hd = <0x11210374 0 1>;
 	};
 
 	afe_ul2: afe_ul2 {
 		compatible = "mediatek,afe";
-		afe_name = "UL2";
-		dai_id = <3>;
+		afe-name = "UL2";
+		dai-id = <3>;
 		base = <0x11210860 0x11210864>;
 		cur = <0x11210868 0x1121086c>;
 		end = <0x11210870 0x11210874>;
diff --git a/boards/mediatek/mt8188/afe-mt8188.dts b/boards/mediatek/mt8188/afe-mt8188.dts
index 41daf54f62c79..fbe47f5a2b4dd 100644
--- a/boards/mediatek/mt8188/afe-mt8188.dts
+++ b/boards/mediatek/mt8188/afe-mt8188.dts
@@ -1,7 +1,7 @@
 	afe_dl2: afe_dl2 {
 		compatible = "mediatek,afe";
-		afe_name = "DL2";
-		dai_id = <0>;
+		afe-name = "DL2";
+		dai-id = <0>;
 		downlink;
 		base = <0x00000000 0x10b11250>;
 		cur = <0x00000000 0x10b11254>;
@@ -11,14 +11,14 @@
 		hd = <0x10b1125c 5 1>;
 		msb = <0x10b1192c 18 1>;
 		msb2 = <0x10b11930 18 1>;
-		agent_disable = <0x10b10014 18 1>;
-		ch_num = <0x10b1125c 0 5>;
+		agent-disable = <0x10b10014 18 1>;
+		ch-num = <0x10b1125c 0 5>;
 	};
 
 	afe_dl3: afe_dl3 {
 		compatible = "mediatek,afe";
-		afe_name = "DL3";
-		dai_id = <1>;
+		afe-name = "DL3";
+		dai-id = <1>;
 		downlink;
 		base = <0x00000000 0x10b11260>;
 		cur = <0x00000000 0x10b11264>;
@@ -28,40 +28,40 @@
 		hd = <0x10b1126c 5 1>;
 		msb = <0x10b1192c 19 1>;
 		msb2 = <0x10b11930 19 1>;
-		agent_disable = <0x10b10014 19 1>;
-		ch_num = <0x10b1126c 0 5>;
+		agent-disable = <0x10b10014 19 1>;
+		ch-num = <0x10b1126c 0 5>;
 	};
 
 	afe_ul4: afe_ul4 {
 		compatible = "mediatek,afe";
-		afe_name = "UL4";
-		dai_id = <2>;
+		afe-name = "UL4";
+		dai-id = <2>;
 		base = <0x00000000 0x10b11330>;
 		cur = <0x00000000 0x10b11334>;
 		end = <0x00000000 0x10b11338>;
 		fs = <0x10b115a8 15 5>;
 		mono = <0x10b1133c 1 1>;
-		int_odd = <0x10b1133c 0 1>;
+		int-odd = <0x10b1133c 0 1>;
 		enable = <0x10b11200 4 1>;
 		hd = <0x10b1133c 5 1>;
 		msb = <0x10b1192c 3 1>;
 		msb2 = <0x10b11930 3 1>;
-		agent_disable = <0x10b10014 3 1>;
+		agent-disable = <0x10b10014 3 1>;
 	};
 
 	afe_ul5: afe_ul5 {
 		compatible = "mediatek,afe";
-		afe_name = "UL5";
-		dai_id = <3>;
+		afe-name = "UL5";
+		dai-id = <3>;
 		base = <0x00000000 0x10b11340>;
 		cur = <0x00000000 0x10b11344>;
 		end = <0x00000000 0x10b11348>;
 		fs = <0x10b115a8 20 5>;
 		mono = <0x10b1134c 1 1>;
-		int_odd = <0x10b1134c 0 1>;
+		int-odd = <0x10b1134c 0 1>;
 		enable = <0x10b11200 5 1>;
 		hd = <0x10b1134c 5 1>;
 		msb = <0x10b1192c 4 1>;
 		msb2 = <0x10b11930 4 1>;
-		agent_disable = <0x10b10014 4 1>;
+		agent-disable = <0x10b10014 4 1>;
 	};
diff --git a/boards/mediatek/mt8195/afe-mt8195.dts b/boards/mediatek/mt8195/afe-mt8195.dts
index f51f1a783e362..37b335754df4d 100644
--- a/boards/mediatek/mt8195/afe-mt8195.dts
+++ b/boards/mediatek/mt8195/afe-mt8195.dts
@@ -1,7 +1,7 @@
 	afe_dl2: afe_dl2 {
 		compatible = "mediatek,afe";
-		afe_name = "DL2";
-		dai_id = <0>;
+		afe-name = "DL2";
+		dai-id = <0>;
 		downlink;
 		base = <0x00000000 0x10891250>;
 		cur = <0x00000000 0x10891254>;
@@ -11,14 +11,14 @@
 		hd = <0x1089125c 5 1>;
 		msb = <0x1089192c 18 1>;
 		msb2 = <0x10891930 18 1>;
-		agent_disable = <0x10890014 18 1>;
-		ch_num = <0x1089125c 0 5>;
+		agent-disable = <0x10890014 18 1>;
+		ch-num = <0x1089125c 0 5>;
 	};
 
 	afe_dl3: afe_dl3 {
 		compatible = "mediatek,afe";
-		afe_name = "DL3";
-		dai_id = <1>;
+		afe-name = "DL3";
+		dai-id = <1>;
 		downlink;
 		base = <0x00000000 0x10891260>;
 		cur = <0x00000000 0x10891264>;
@@ -28,14 +28,14 @@
 		hd = <0x1089126c 5 1>;
 		msb = <0x1089192c 19 1>;
 		msb2 = <0x10891930 19 1>;
-		agent_disable = <0x10890014 19 1>;
-		ch_num = <0x1089126c 0 5>;
+		agent-disable = <0x10890014 19 1>;
+		ch-num = <0x1089126c 0 5>;
 	};
 
 	afe_ul4: afe_ul4 {
 		compatible = "mediatek,afe";
-		afe_name = "UL4";
-		dai_id = <2>;
+		afe-name = "UL4";
+		dai-id = <2>;
 		base = <0x00000000 0x10891330>;
 		cur = <0x00000000 0x10891334>;
 		end = <0x00000000 0x10891338>;
@@ -45,13 +45,13 @@
 		hd = <0x1089133c 5 1>;
 		msb = <0x1089192c 3 1>;
 		msb2 = <0x10891930 3 1>;
-		agent_disable = <0x10890014 3 1>;
+		agent-disable = <0x10890014 3 1>;
 	};
 
 	afe_ul5: afe_ul5 {
 		compatible = "mediatek,afe";
-		afe_name = "UL5";
-		dai_id = <3>;
+		afe-name = "UL5";
+		dai-id = <3>;
 		base = <0x00000000 0x10891340>;
 		cur = <0x00000000 0x10891344>;
 		end = <0x00000000 0x10891348>;
@@ -61,5 +61,5 @@
 		hd = <0x1089134c 5 1>;
 		msb = <0x1089192c 4 1>;
 		msb2 = <0x10891930 4 1>;
-		agent_disable = <0x10890014 4 1>;
+		agent-disable = <0x10890014 4 1>;
 	};
diff --git a/boards/mediatek/mt8196/afe-mt8196.dts b/boards/mediatek/mt8196/afe-mt8196.dts
index fba314a61e37d..a28d9f658e168 100644
--- a/boards/mediatek/mt8196/afe-mt8196.dts
+++ b/boards/mediatek/mt8196/afe-mt8196.dts
@@ -1,7 +1,7 @@
 	afe_dl1: afe_dl1 {
 		compatible = "mediatek,afe";
-		afe_name = "DL1";
-		dai_id = <1>;
+		afe-name = "DL1";
+		dai-id = <1>;
 		downlink;
 		base = <0x1a114470 0x1a114474>;
 		cur = <0x1a114478 0x1a11447c>;
@@ -14,8 +14,8 @@
 
 	afe_dl_24ch: afe_dl_24ch {
 		compatible = "mediatek,afe";
-		afe_name = "DL_24CH";
-		dai_id = <0>;
+		afe-name = "DL_24CH";
+		dai-id = <0>;
 		downlink;
 		base = <0x1a114620 0x1a114624>;
 		cur = <0x1a114628 0x1a11462c>;
@@ -23,13 +23,13 @@
 		fs = <0x1a114640 8 5>;
 		enable = <0x1a114640 31 1>;
 		hd = <0x1a114640 0 1>;
-		ch_num = <0x1a114640 24 6>;
+		ch-num = <0x1a114640 24 6>;
 	};
 
 	afe_ul0: afe_ul0 {
 		compatible = "mediatek,afe";
-		afe_name = "UL0";
-		dai_id = <2>;
+		afe-name = "UL0";
+		dai-id = <2>;
 		base = <0x1a114d60 0x1a114d64>;
 		cur = <0x1a114d68 0x1a114d6c>;
 		end = <0x1a114d70 0x1a114d74>;
@@ -41,8 +41,8 @@
 
 	afe_ul1: afe_ul1 {
 		compatible = "mediatek,afe";
-		afe_name = "UL1";
-		dai_id = <3>;
+		afe-name = "UL1";
+		dai-id = <3>;
 		base = <0x1a114d90 0x1a114d94>;
 		cur = <0x1a114d98 0x1a114d9c>;
 		end = <0x1a114da0 0x1a114da4>;
@@ -54,8 +54,8 @@
 
 	afe_ul2: afe_ul2 {
 		compatible = "mediatek,afe";
-		afe_name = "UL2";
-		dai_id = <4>;
+		afe-name = "UL2";
+		dai-id = <4>;
 		base = <0x1a114dc0 0x1a114dc4>;
 		cur = <0x1a114dc8 0x1a114dcc>;
 		end = <0x1a114dd0 0x1a114dd4>;
diff --git a/boards/microchip/ev11l78a/doc/index.rst b/boards/microchip/ev11l78a/doc/index.rst
index 95d05add0c0e4..15661123062ab 100644
--- a/boards/microchip/ev11l78a/doc/index.rst
+++ b/boards/microchip/ev11l78a/doc/index.rst
@@ -20,51 +20,10 @@ Hardware
 Supported Features
 ==================
 
-The ev11l78a board configuration supports the following hardware
-features:
-
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - NVIC
-      - on-chip
-      - nested vector interrupt controller
-    * - Flash
-      - on-chip
-      - Can be used with LittleFS to store files
-    * - SYSTICK
-      - on-chip
-      - systick
-    * - WDT
-      - on-chip
-      - Watchdog
-    * - ADC
-      - on-chip
-      - Analog to Digital Converter
-    * - GPIO
-      - on-chip
-      - I/O ports
-    * - USART
-      - on-chip
-      - Serial ports
-    * - I2C
-      - on-chip
-      - I2C ports
-    * - SPI
-      - on-chip
-      - Serial Peripheral Interface ports
-
-Other hardware features are not currently supported by Zephyr.
+.. zephyr:board-supported-hw::
 
 Refer to the `EV11L78A Schematics`_ for a detailed hardware diagram.
 
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/microchip/ev11l78a/ev11l78a_defconfig`.
-
 Serial Port
 ===========
 
diff --git a/boards/microchip/m2gl025_miv/doc/index.rst b/boards/microchip/m2gl025_miv/doc/index.rst
index 88a4fa2b9512a..d48d0bebcab33 100644
--- a/boards/microchip/m2gl025_miv/doc/index.rst
+++ b/boards/microchip/m2gl025_miv/doc/index.rst
@@ -11,6 +11,8 @@ More information can be found on
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/microchip/mec1501modular_assy6885/Kconfig.defconfig b/boards/microchip/mec1501modular_assy6885/Kconfig.defconfig
index 0ca8a90ad4846..0b7eb516d7e8e 100644
--- a/boards/microchip/mec1501modular_assy6885/Kconfig.defconfig
+++ b/boards/microchip/mec1501modular_assy6885/Kconfig.defconfig
@@ -3,40 +3,11 @@
 
 if BOARD_MEC1501MODULAR_ASSY6885
 
-config INPUT
-	default y if KSCAN
-
 #PS/2 driver is compiled in terms of this flag.
 config ESPI_PERIPHERAL_8042_KBC
 	default y
 	depends on ESPI_XEC
 
-if RTOS_TIMER
-
-# XEC RTOS timer HW frequency is fixed at 32768
-# The driver requires tickless mode and ticks per
-# second to be 32768 for accurate operation.
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 32768
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 32768
-
-endif # RTOS_TIMER
-
-if !RTOS_TIMER
-
-# If RTOS timer is not enabled we use ARM Cortex-M
-# SYSTICK. SYSTICK frequency is 48MHz divided by
-# SOC_MEC1501_PROC_CLK_DIV.
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 48000000
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 1000
-
 if ESPI
 
 config ESPI_PERIPHERAL_UART_SOC_MAPPING
@@ -44,6 +15,4 @@ config ESPI_PERIPHERAL_UART_SOC_MAPPING
 
 endif # ESPI
 
-endif # RTOS_TIMER
-
 endif # BOARD_MEC1501MODULAR_ASSY6885
diff --git a/boards/microchip/mec1501modular_assy6885/doc/index.rst b/boards/microchip/mec1501modular_assy6885/doc/index.rst
index 910ba104da130..8a65f87136033 100644
--- a/boards/microchip/mec1501modular_assy6885/doc/index.rst
+++ b/boards/microchip/mec1501modular_assy6885/doc/index.rst
@@ -45,44 +45,7 @@ For more information about the SOC please see the `MEC152x Reference Manual`_
 Supported Features
 ==================
 
-The mec1501modular_assy6885 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| ESPI      | on-chip    | espi                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RTOS      | on-chip    | timer                               |
-+-----------+------------+-------------------------------------+
-| TIMER     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PS2       | on-chip    | ps2                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr (at the moment)
-
-The default configuration can be found in the
-:zephyr_file:`boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885_defconfig`
-Kconfig file.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -225,6 +188,8 @@ Jumper location map
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Setup
 =====
 
diff --git a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.dts b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.dts
index c259a7a44cdcf..7c5c131cf52a5 100644
--- a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.dts
+++ b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.dts
@@ -17,7 +17,6 @@
 		zephyr,sram = &sram0;
 		zephyr,console = &uart1;
 		zephyr,flash = &flash0;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	aliases {
@@ -26,7 +25,6 @@
 
 		i2c0 = &i2c_smb_0;
 		i2c1 = &i2c_smb_1;
-		kscan0 = &kscan_input;
 		watchdog0 = &wdog;
 	};
 };
@@ -70,9 +68,9 @@
 
 &espi0 {
 	status = "okay";
-	io_girq = <19>;
-	vw_girqs = <24 25>;
-	pc_girq = <15>;
+	io-girq = <19>;
+	vw-girqs = <24 25>;
+	pc-girq = <15>;
 	pinctrl-0 = < &espi_reset_n_gpio061 &espi_cs_n_gpio066
 		  &espi_alert_n_gpio063 &espi_clk_gpio065
 		  &espi_io0_gpio070 &espi_io1_gpio071
@@ -120,10 +118,6 @@
 	pinctrl-names = "default", "sleep";
 	row-size = <8>;
 	col-size = <16>;
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
 
 &peci0 {
diff --git a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.yaml b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.yaml
index d78477f825f43..da7c46a8a545b 100644
--- a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.yaml
+++ b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885.yaml
@@ -21,6 +21,5 @@ supported:
   - i2c
   - pwm
   - watchdog
-  - kscan
   - tach
 vendor: microchip
diff --git a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885_defconfig b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885_defconfig
index 3039d18174eb9..164cb7182e764 100644
--- a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885_defconfig
+++ b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885_defconfig
@@ -7,12 +7,9 @@
 # Make sure external power management setup is as indicated in documentation
 CONFIG_SOC_MEC1501_VTR3_1_8V=y
 CONFIG_SOC_MEC1501_VCI_PINS_AS_GPIOS=n
-CONFIG_RTOS_TIMER=y
 
 CONFIG_CLOCK_CONTROL=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_GPIO=y
-
-CONFIG_PM=y
diff --git a/boards/microchip/mec15xxevb_assy6853/Kconfig.defconfig b/boards/microchip/mec15xxevb_assy6853/Kconfig.defconfig
index 229ba41dff778..01a7081bcf412 100644
--- a/boards/microchip/mec15xxevb_assy6853/Kconfig.defconfig
+++ b/boards/microchip/mec15xxevb_assy6853/Kconfig.defconfig
@@ -3,40 +3,8 @@
 
 if BOARD_MEC15XXEVB_ASSY6853
 
-config INPUT
-	default y if KSCAN
-
 config ESPI_XEC
 	default y
 	depends on ESPI
 
-if RTOS_TIMER
-
-# XEC RTOS timer HW frequency is fixed at 32768
-# The driver requires tickless mode and ticks per
-# second to be 32768 for accurate operation.
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 32768
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 32768
-
-endif # RTOS_TIMER
-
-if !RTOS_TIMER
-
-# If RTOS timer is not enabled we use ARM Cortex-M
-# SYSTICK. SYSTICK frequency is 48MHz divided by
-# SOC_MEC1501_PROC_CLK_DIV.
-#
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 48000000
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 1000
-
-endif # RTOS_TIMER
-
 endif # BOARD_MEC15XXEVB_ASSY6853
diff --git a/boards/microchip/mec15xxevb_assy6853/doc/index.rst b/boards/microchip/mec15xxevb_assy6853/doc/index.rst
index c712d74b563db..9a3c9e22aeb2f 100644
--- a/boards/microchip/mec15xxevb_assy6853/doc/index.rst
+++ b/boards/microchip/mec15xxevb_assy6853/doc/index.rst
@@ -42,38 +42,7 @@ For more information about the SOC's please see `MEC152x Reference Manual`_
 Supported Features
 ==================
 
-The mec15xxevb_assy6853 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PS/2      | on-chip    | ps2                                 |
-+-----------+------------+-------------------------------------+
-| KSCAN     | on-chip    | kscan                               |
-+-----------+------------+-------------------------------------+
-| TACH      | on-chip    | tachometer                          |
-+-----------+------------+-------------------------------------+
-
-
-
-
-Other hardware features are not currently supported by Zephyr (at the moment)
-
-The default configuration can be found in the
-:zephyr_file:`boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig` Kconfig file.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -233,6 +202,8 @@ in reference section below.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Setup
 =====
 #. If you use Dediprog SF100 programmer, then setup it.
diff --git a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.dts b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.dts
index 161536c867def..fbc1aa677af0a 100644
--- a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.dts
+++ b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.dts
@@ -16,7 +16,6 @@
 		zephyr,sram = &sram0;
 		zephyr,console = &uart2;
 		zephyr,flash = &flash0;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	aliases {
@@ -29,7 +28,6 @@
 		i2c-0 = &i2c_smb_0;
 		i2c1 = &i2c_smb_1;
 		i2c7 = &i2c_smb_2;
-		kscan0 = &kscan_input;
 		watchdog0 = &wdog;
 	};
 
@@ -123,9 +121,9 @@
 
 &espi0 {
 	status = "okay";
-	io_girq = <19>;
-	vw_girqs = <24 25>;
-	pc_girq = <15>;
+	io-girq = <19>;
+	vw-girqs = <24 25>;
+	pc-girq = <15>;
 	pinctrl-0 = < &espi_reset_n_gpio061 &espi_cs_n_gpio066
 		  &espi_alert_n_gpio063 &espi_clk_gpio065
 		  &espi_io0_gpio070 &espi_io1_gpio071
@@ -177,10 +175,6 @@
 	pinctrl-names = "default", "sleep";
 	row-size = <8>;
 	col-size = <16>;
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
 
 &peci0 {
@@ -192,8 +186,8 @@
 
 &spi0 {
 	status = "okay";
-	port_sel = <0>;
-	chip_select = <0>;
+	port-sel = <0>;
+	chip-select = <0>;
 	lines = <1>;
 	pinctrl-0 = < &shd_cs0_n_gpio055
 		      &shd_clk_gpio056
diff --git a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.yaml b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.yaml
index 8b8190d20d81e..afd985cb020b8 100644
--- a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.yaml
+++ b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853.yaml
@@ -21,5 +21,4 @@ supported:
   - i2c
   - pwm
   - watchdog
-  - kscan
 vendor: microchip
diff --git a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig
index 51e8498df60ed..731a1c2d63fe8 100644
--- a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig
+++ b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853_defconfig
@@ -5,13 +5,9 @@
 #
 
 CONFIG_SOC_MEC1501_VTR3_1_8V=y
-CONFIG_RTOS_TIMER=y
 
 CONFIG_CLOCK_CONTROL=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_GPIO=y
-
-# power management stuff
-CONFIG_PM=y
diff --git a/boards/microchip/mec172xevb_assy6906/Kconfig.defconfig b/boards/microchip/mec172xevb_assy6906/Kconfig.defconfig
deleted file mode 100644
index 2c93b83e744df..0000000000000
--- a/boards/microchip/mec172xevb_assy6906/Kconfig.defconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2021 Microchip Technology Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_MEC172XEVB_ASSY6906
-
-config INPUT
-	default y if KSCAN
-
-if RTOS_TIMER
-
-# XEC RTOS timer HW frequency is fixed at 32768 Hz.
-# The driver requires tickless mode and ticks per second to be 32768 for
-# accurate operation.
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 32768
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 32768
-
-endif # RTOS_TIMER
-
-if !RTOS_TIMER
-
-# If RTOS timer is not enabled we use ARM Cortex-M
-# SYSTICK. SYSTICK frequency is 96 MHz divided down by the MEC172x PCR
-# processor clock divider register. We assume PCR processor clock divider
-# is set to 1. Refer to SOC_MEC_PROC_CLK_DIV
-#
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 96000000
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 1000
-
-endif # RTOS_TIMER
-
-endif # BOARD_MEC172XEVB_ASSY6906
diff --git a/boards/microchip/mec172xevb_assy6906/doc/index.rst b/boards/microchip/mec172xevb_assy6906/doc/index.rst
index 0671beb414364..b05c4d5bd3ff5 100644
--- a/boards/microchip/mec172xevb_assy6906/doc/index.rst
+++ b/boards/microchip/mec172xevb_assy6906/doc/index.rst
@@ -36,37 +36,7 @@ For more information about the SOC's please see `MEC172x Reference Manual`_
 Supported Features
 ==================
 
-The mec172xevb_assy6906 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PS/2      | on-chip    | ps2                                 |
-+-----------+------------+-------------------------------------+
-| KSCAN     | on-chip    | kscan                               |
-+-----------+------------+-------------------------------------+
-| TACH      | on-chip    | tachometer                          |
-+-----------+------------+-------------------------------------+
-| RPMFAN    | on-chip    | Fan speed controller                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the
-:zephyr_file:`boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906_defconfig` Kconfig file.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -260,6 +230,8 @@ NOTE: ``JP121 3-4`` on base board also needs to be loaded.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Setup
 =====
 
diff --git a/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts b/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts
index 076e84eda6002..bc2ad391664a1 100644
--- a/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts
+++ b/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts
@@ -233,10 +233,6 @@
 	pinctrl-names = "default", "sleep";
 	row-size = <8>;
 	col-size = <16>;
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
 
 &ksi0_gpio017 {
diff --git a/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906_defconfig b/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906_defconfig
index d1aeaeaac581f..f2b72ae4282f4 100644
--- a/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906_defconfig
+++ b/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906_defconfig
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_RTOS_TIMER=y
-
 CONFIG_CLOCK_CONTROL=y
 CONFIG_GPIO=y
 CONFIG_SERIAL=y
diff --git a/boards/microchip/mec172xmodular_assy6930/CMakeLists.txt b/boards/microchip/mec172xmodular_assy6930/CMakeLists.txt
index 92626f6319fb0..6e36ea0dec8e4 100644
--- a/boards/microchip/mec172xmodular_assy6930/CMakeLists.txt
+++ b/boards/microchip/mec172xmodular_assy6930/CMakeLists.txt
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library()
-
 #Allow users to pre-specify the tool using '-DMEC172X_SPI_GEN=<path-to-tool>/toolname'
 if (NOT DEFINED MEC172X_SPI_GEN)
   set(MEC172X_SPI_GEN $ENV{MEC172X_SPI_GEN})
diff --git a/boards/microchip/mec172xmodular_assy6930/Kconfig.defconfig b/boards/microchip/mec172xmodular_assy6930/Kconfig.defconfig
deleted file mode 100644
index c3487f561e992..0000000000000
--- a/boards/microchip/mec172xmodular_assy6930/Kconfig.defconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2022 Microchip Technology Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_MEC172XMODULAR_ASSY6930
-
-config INPUT
-	default y if KSCAN
-
-if RTOS_TIMER
-
-# XEC RTOS timer HW frequency is fixed at 32768 Hz.
-# The driver requires tickless mode and ticks per second to be 32768 for
-# accurate operation.
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 32768
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 32768
-
-endif # RTOS_TIMER
-
-if !RTOS_TIMER
-
-# If RTOS timer is not enabled we use ARM Cortex-M
-# SYSTICK. SYSTICK frequency is 96 MHz divided down by the MEC172x PCR
-# processor clock divider register. We assume PCR processor clock divider
-# is set to 1. Refer to SOC_MEC_PROC_CLK_DIV
-#
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 96000000
-
-config SYS_CLOCK_TICKS_PER_SEC
-	default 1000
-
-endif # RTOS_TIMER
-
-endif # BOARD_MEC172XMODULAR_ASSY6930
diff --git a/boards/microchip/mec172xmodular_assy6930/doc/mec172xmodular_assy6930.rst b/boards/microchip/mec172xmodular_assy6930/doc/mec172xmodular_assy6930.rst
index a6bc75fc8fb89..18441232c41fc 100644
--- a/boards/microchip/mec172xmodular_assy6930/doc/mec172xmodular_assy6930.rst
+++ b/boards/microchip/mec172xmodular_assy6930/doc/mec172xmodular_assy6930.rst
@@ -46,36 +46,7 @@ The board is powered through the +5V USB micro-A connector or from the MECC conn
 Supported Features
 ==================
 
-The mec172xmodular_assy6930 (Rev. B) board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PS/2      | on-chip    | ps2                                 |
-+-----------+------------+-------------------------------------+
-| KSCAN     | on-chip    | kscan                               |
-+-----------+------------+-------------------------------------+
-| TACH      | on-chip    | tachometer                          |
-+-----------+------------+-------------------------------------+
-| RPMFAN    | on-chip    | Fan speed controller                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr (at the moment)
-
-The default configuration can be found in the
-:zephyr_file:`boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930_defconfig` Kconfig file.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -150,6 +121,8 @@ or Master Attached Flash (MAF).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Setup
 =====
 
diff --git a/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts b/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts
index 24d600dd04043..e5d7e888baacb 100644
--- a/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts
+++ b/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts
@@ -211,10 +211,6 @@
 	pinctrl-names = "default", "sleep";
 	row-size = <8>;
 	col-size = <16>;
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
 
 &ksi0_gpio017 {
diff --git a/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930_defconfig b/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930_defconfig
index c191b0b1555ed..ec6ae819151f2 100644
--- a/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930_defconfig
+++ b/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930_defconfig
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_RTOS_TIMER=y
-
 CONFIG_CLOCK_CONTROL=y
 CONFIG_GPIO=y
 CONFIG_SERIAL=y
diff --git a/boards/microchip/mec_assy6941/CMakeLists.txt b/boards/microchip/mec_assy6941/CMakeLists.txt
new file mode 100644
index 0000000000000..84b859f1f1764
--- /dev/null
+++ b/boards/microchip/mec_assy6941/CMakeLists.txt
@@ -0,0 +1,59 @@
+#
+# Copyright (c) 2025 Microchip Technology Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if(CONFIG_SOC_SERIES_MEC174X)
+  set(PART_PREFIX mec174x)
+elseif(CONFIG_SOC_SERIES_MEC175X)
+  set(PART_PREFIX mec175x)
+else()
+  message(NOTICE "Unknown SoC series! No SPI image will be generated")
+endif()
+
+if(DEFINED ENV{MEC5_SPI_GEN})
+  # Grab it from environment variable if defined
+  set(MEC5_SPI_GEN $ENV{MEC5_SPI_GEN})
+else()
+  # Else find the tool in PATH
+  if(CMAKE_HOST_APPLE)
+    # CMAKE_HOST_UNIX is also true for Apple,
+    # but there is no tool for Apple. So
+    # we need to skip it.
+    message(NOTICE "There is no SPI image generation tool for MacOS.")
+  elseif(CMAKE_HOST_UNIX)
+    set(MEC5_SPI_GEN_FILENAME ${PART_PREFIX}_spi_gen_linux_x86_64)
+  elseif(CMAKE_HOST_WIN32)
+    set(MEC5_SPI_GEN_FILENAME ${PART_PREFIX}_spi_gen.exe)
+  endif()
+
+  find_file(MEC5_SPI_GEN_FINDFILE ${MEC5_SPI_GEN_FILENAME})
+  if(MEC5_SPI_GEN_FINDFILE STREQUAL MEC5_SPI_GEN_FINDFILE-NOTFOUND)
+    message(WARNING "Microchip SPI Image Generation tool (${MEC5_SPI_GEN_FILENAME}) is not available. SPI Image will not be generated.")
+  else()
+    set(MEC5_SPI_GEN ${MEC5_SPI_GEN_FINDFILE})
+  endif()
+
+  unset(MEC5_SPI_GEN_FINDFILE)
+  unset(MEC5_SPI_GEN_FILENAME)
+endif()
+
+if(DEFINED MEC5_SPI_GEN)
+  if(DEFINED ENV{MEC5_SPI_CFG})
+    set(MEC5_SPI_CFG $ENV{MEC5_SPI_CFG})
+  else()
+    set(MEC5_SPI_CFG ${BOARD_DIR}/support/${PART_PREFIX}_spi_cfg.txt)
+  endif()
+
+  set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+    COMMAND ${MEC5_SPI_GEN}
+    -i ${MEC5_SPI_CFG}
+    -o ${PROJECT_BINARY_DIR}/${SPI_IMAGE_NAME}
+  )
+
+  unset(MEC5_SPI_GEN)
+  unset(MEC5_SPI_CFG)
+endif()
+
+unset(PART_PREFIX)
diff --git a/boards/microchip/mec_assy6941/Kconfig.mec_assy6941 b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941
new file mode 100644
index 0000000000000..85a094ac8d1d7
--- /dev/null
+++ b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MEC_ASSY6941
+	select SOC_MEC1743_QLJ if BOARD_MEC_ASSY6941_MEC1743_QLJ
+	select SOC_MEC1743_QSZ if BOARD_MEC_ASSY6941_MEC1743_QSZ
+	select SOC_MEC1753_QLJ if BOARD_MEC_ASSY6941_MEC1753_QLJ
+	select SOC_MEC1753_QSZ if BOARD_MEC_ASSY6941_MEC1753_QSZ
diff --git a/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1743_qlj b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1743_qlj
new file mode 100644
index 0000000000000..b58c53c2bcc56
--- /dev/null
+++ b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1743_qlj
@@ -0,0 +1,5 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MEC_ASSY6941_MEC1743_QLJ
+	select SOC_MEC1743_QLJ
diff --git a/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1743_qsz b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1743_qsz
new file mode 100644
index 0000000000000..951583698bddb
--- /dev/null
+++ b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1743_qsz
@@ -0,0 +1,5 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MEC_ASSY6941_MEC1743_QSZ
+	select SOC_MEC1743_QSZ
diff --git a/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1753_qlj b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1753_qlj
new file mode 100644
index 0000000000000..0ea3dbcffa4b5
--- /dev/null
+++ b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1753_qlj
@@ -0,0 +1,5 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MEC_ASSY6941_MEC1753_QLJ
+	select SOC_MEC1753_QLJ
diff --git a/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1753_qsz b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1753_qsz
new file mode 100644
index 0000000000000..2d631fca2807d
--- /dev/null
+++ b/boards/microchip/mec_assy6941/Kconfig.mec_assy6941_mec1753_qsz
@@ -0,0 +1,5 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MEC_ASSY6941_MEC1753_QSZ
+	select SOC_MEC1753_QSZ
diff --git a/boards/microchip/mec_assy6941/board.cmake b/boards/microchip/mec_assy6941/board.cmake
new file mode 100644
index 0000000000000..840168650d460
--- /dev/null
+++ b/boards/microchip/mec_assy6941/board.cmake
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: Apache-2.0
+
+set(SPI_IMAGE_NAME spi_image.bin)
+
+board_set_flasher_ifnset(dediprog)
+
+# --vcc=0 - use 3.5V to flash
+board_finalize_runner_args(dediprog
+  "--spi-image=${PROJECT_BINARY_DIR}/${SPI_IMAGE_NAME}"
+  "--vcc=0"
+)
+
+# This allows a custom script to be used for flashing the SPI chip.
+include(${ZEPHYR_BASE}/boards/common/misc.board.cmake)
diff --git a/boards/microchip/mec_assy6941/board.yml b/boards/microchip/mec_assy6941/board.yml
new file mode 100644
index 0000000000000..2849b6b8a08f1
--- /dev/null
+++ b/boards/microchip/mec_assy6941/board.yml
@@ -0,0 +1,9 @@
+board:
+  name: mec_assy6941
+  full_name: MEC17xxEVB ASSY6941
+  vendor: microchip
+  socs:
+  - name: mec1743_qlj
+  - name: mec1743_qsz
+  - name: mec1753_qlj
+  - name: mec1753_qsz
diff --git a/boards/microchip/mec_assy6941/doc/index.rst b/boards/microchip/mec_assy6941/doc/index.rst
new file mode 100644
index 0000000000000..da25d132cef0c
--- /dev/null
+++ b/boards/microchip/mec_assy6941/doc/index.rst
@@ -0,0 +1,394 @@
+.. zephyr:board:: mec_assy6941
+
+Overview
+********
+
+The MEC5 Assembly 6941 EVB kit is a development platform to evaluate the Microchip
+MEC174x and MEC175x series microcontrollers. This board requires a CPU daughter card:
+DC 176WFBGA DC ASSY 6942 for MEC1743Q-LJ or MEC1753Q-LJ (176-pin package)
+
+Hardware
+********
+
+- MEC174xQ-LJ/SZ or MEC175xQ-LJ/SZ ARM Cortex-M4 Processor
+- 480 KB total SRAM (416 KB code, 64 KB data) and 128 KB boot ROM
+- Keyboard interface
+- ADC & GPIO headers
+- Four DB9 UART connectors
+- FAN0, FAN1, FAN2 headers
+- FAN PWM interface
+- JTAG/SWD, ETM and MCHP Trace ports
+- PECI interface 3.0
+- I2C voltage translator
+- 10 SMBUS headers
+- VCI interface
+- Two Hardware Driven PS/2 Port
+- eSPI header
+- 2 Sockets for SPI NOR chips
+- One reset and VCC_PWRDGD pushbuttons
+- One external PCA9555 I/O port with jumper selectable I2C address.
+- One external LTC2489 delta-sigma ADC with jumper selectable I2C address.
+- Board power jumper selectable from +5V 2.1mm/5.5mm barrel connector or USB Micro A connector.
+- MEC175x has one I3C Host controller and one I3C secondary controller each with multiple ports.
+
+For more information about the MEC174x please see `MEC174x Data Brief`_
+For more information about the MEC175x please see `MEC175x Data Brief`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+This evaluation board kit is comprised of the following HW blocks:
+
+- MEC174x EVB ASSY 6941 Rev B
+- MEC174x 176WFBGA SOLDER DC ASSY 6942 with MEC1743Q-LJ or MEC1753Q-LJ silicon
+- SPI DONGLE ASSY 6791
+
+System Clock
+============
+
+The MEC174x/MEC175x MCU is configured to use the 96Mhz internal oscillator with the
+on-chip PLL to generate a resulting EC clock rate of 96 MHz. See Processor clock
+control register in chapter 4 "4.0 POWER, CLOCKS, and RESETS" of the data sheet in
+the references at the end of this document.
+
+Serial Port
+===========
+
+UART1 is configured for serial logs.
+
+Jumper settings
+***************
+
+Please follow the jumper settings below to properly demo this
+board. Advanced users may deviate from this recommendation.
+
+Jumper settings for EVB Assy 6941 Rev B
+=======================================
+
+Power-related jumpers
+---------------------
+
+If you wish to power from +5V power brick, then connect to barrel connector ``P1``
+(5.5mm OD, 2.1mm ID) and set the jumper ``J1 5-6``.
+
+If you wish to power from the Host USB micro-USB type A/B connector ``J62``, move the
+jumper to ``J1 9-10`` ``J59 1-2`` and ``J61 1-2``.
+
+
+.. note:: A single jumper is required in ``J1``.
+
+Required power jumpers on:
+
+	* ``JP42 1-2``, ``JP43 1-2``, ``JP45 1-2``, ``JP47 1-2``, ``JP48 1-2``
+	* ``JP50 1-2``, ``JP53 1-2``, ``JP56 1-2``, ``JP58 1-2``, ``JP60 1-2``
+	* ``JP62 1-2``, ``JP65 1-2``, ``JP66 1-2``, ``JP68 1-2``
+
+Select board +3.3V_STBY for:
+
+	* ``JP161 1-2``  VBAT_CHIP power rail
+	* ``J67 1-2``    VCHIP_VTR_REG power rail
+	* ``JP157 1-2``  VCHIP_VTR_PLL power rail
+	* ``JP158 1-2``  VCHIP_VTR_ANALOG power rail
+	* ``JP159 1-2``  VCHIP_VTR1 power rail
+
+VCHIP_VTR2 power rail can be +3.3V or +1.8V affecting the pins on VTR2.
+NOTE: QSPI shared port pins are on the VTR2 power rail.
+Select one only:
+
+	* ``J68 1-2`` VTR2 is connected to +3.3V_STBY
+	* ``J68 3-4`` VTR2 is connected to +1.8V_STBY
+
+VCHIP_VTR3 power rail in normal operation is connected to +1.8V.
+	* ``JP160 1-2`` VTR3 is connected to +1.8V_STBY
+
+Jumper selection for VCC_PWRGD
+VCC_PWRGD is connected to a 4.75K pull-up to VTR1, switch S1 to ground it,
+and reset generator U2.
+
+	* ``JP17 3x7 19-20``
+	* ``JP19 3x6 8-9``
+	* ``JP36 1-2``
+	* ``JP34 1-2``
+
+Jumper selection for nRESET_IN
+nRESET_IN is connected to a 4.75K pull-up to VTR1, switch S2 to ground it,
+and reset generator U3.
+
+	* ``JP37 1-2``
+	* ``JP35 1-2``
+
+Boot-ROM Straps
+---------------
+
+These jumpers configure MEC174x/MEC175x Boot-ROM straps.
+
+	* ``JP1 1-2`` UART_BSTRAP Normal Boot
+	* ``JP2 1-2`` CR_STRAP Normal Boot
+	* ``JP3 2-3`` JTAG_STRAP JTAG/SWD interface is not held in reset
+	* ``JP4 2-3`` CMP_STRAP GPIO207 is available as a GPIO
+	* ``JP5 1-2`` PWRGD_STRAP
+	* ``JP7 1-2`` BSS_STRAP Select eSPI CAF vs G3 if enabled in OTP
+	* ``JP8 1-2`` BSS_STRAP Default BSS_STRAP. Select load from Shared SPI
+	* ``JP6 1-2`` VTR2_STRAP
+	* ``JP9 1-2`` CRISIS_RECOVERY_STRAP
+
+Peripheral Routing Jumpers
+--------------------------
+
+UART0 to P19A DB9(top)
+
+	* ``JP89 No jumper`` RS-232 transceiver U8 not in reset.
+	* ``JP21 2-3, 8-9`` Select UART0_TX and UART0_RX from GPIOs.
+	* ``JP22 1-2, 4-5`` Select UART0_TX and UART0_RX to U8.
+
+UART1 to P19B DB9(bottom)
+
+	* ``JP90 No jumper`` RS-232 transceiver U9 not in reset.
+	* ``JP91 1-2, 4-5`` Connect UART1_TX and UART1_RX to U9.
+	* ``JP24 2-3, 5-6`` Select UART1_TX and UART1_RX from GPIOs.
+
+Shared SPI on J18 2x10 header.
+
+	* ``JP18 14-15`` Select SHD_nCS0.
+	* ``JP18 17-18`` Select SHD_CLK.
+	* ``JP18 2-3`` Select SHD_IO0.
+	* ``JP18 5-6`` Select SHD_IO1.
+	* ``JP18 8-9`` Select SHD_IO2(nWP).
+	* ``JP18 11-12`` Select SHD_IO3(nHOLD).
+
+Second chip select for accessing SPI dongle flash U7.
+	* ``JP18 20-12`` Select SHD_nCS1.
+
+JTAG/SWD ARM JTAG 2x10 J29.
+
+	* ``JP80 1-2`` No jumper. This jumper holds JTAG/SWD interface in reset.
+	* ``JP12 2-3`` Select JTAG_TDO or SWO.
+	* ``JP12 5-6`` Select JTAG_TDI Not required for ARM SWD.
+	* ``JP12 8-9`` Select JTAG_TMS or SWDIO.
+	* ``JP12 11-12`` Select JTAG_CLK or SWCLK.
+
+NOTE:
+ARM SWD is a two pin interface using JTAG_TMS as a bidirectional I/O pin and JTAG_CLK.
+The ARM Serial Wire Output Trace feature is on a third pin, JTAG_TDO.
+Configuration options are:
+
+	1. 4-pin JTAG or SWD plus SWO. Connect all four JP12 jumpers shown above.
+	2. 2-pin SWD plus SWO. Connect JP12 jumpers for JTAG_TDO, JTAG_TMS, and JTAG_CLK. JTAG_TDI is available to use as GPIO145.
+	3. 2-pin SWD only. Connect JP12 jumpers for JTAG_TMS and JTAG_CLK. JTAG_TDI and JTAG_TDO are available as GPIO145 and GPIO146 respectively
+
+Jumper settings for MEC174x/MEC175x 176WFBGA Socket DC Assy 6942 Rev A0p1
+=========================================================================
+
+The jumper configuration explained above covers the base board. The ASSY
+6942 MEC174x/MEC175x CPU board provides capability for an optional, external 32KHz
+clock source. The card includes a 32KHz crystal oscillator. The card can
+also be configured to use an external 50% duty cycle 32KHz source on the
+XTAL2/32KHZ_IN pin. Note, firmware must set the MEC174x/MEC175x clock enable
+register to select the external source matching the jumper settings. If
+using the MEC174x/MEC175x internal silicon oscillator then the 32K jumper settings
+are don't cares. ``JP1`` on DC is for scoping test clock outputs. Please
+refer to the schematic in reference section below.
+
+Parallel 32KHz crystal configuration
+------------------------------------
+``JP1 1x2 ON``
+``JP2 1x3 2-3``
+
+External 32KHz 50% duty cycle configuration
+-------------------------------------------
+``JP1 1x2 NC``
+``JP2 1x3 1-2``
+
+NOTE: EVB ``JP117 3-4`` Connects 32KHz OSC U15 output to DC.
+
+Building
+========
+
+#. Build :zephyr:code-sample:'hello_world` application as you normally do.
+
+#. The file :file:`spi_image.bin` will be created if the build system
+   can find the image generation tool. This binary image can be used
+   to flash the SPI chip.
+
+Programming and Debugging
+=========================
+
+Setup
+=====
+
+#. Example programming the SPI flash on the Assy6791 SPI dongle.
+
+#. We use a low cost USB-to-GPIO device based on the FTDI FT232H device.
+
+   The FT232H device used here is the `AdaFruit FT232H`_
+   The AdaFruit FT232H supports both 5V and 3.3V parts.
+
+   The linux flashrom tool supports FT232H USB-to-GPIO used as an SPI programmer.
+
+   .. code-block:: console
+
+      $ sudo /usr/sbin/flashrom -V -p ft2232_spi:type=232H,divisor=30 -w spi_image.bin
+
+#. Clone the `MEC174x SPI Image Gen`_ or `MEC175x SPI Image Gen`_ repository or download the
+   files within that directory.
+
+#. Make the image generation available for Zephyr, by making the tool
+   searchable by path, or by setting an environment variable
+   ``MEC5_SPI_GEN``, for example:
+
+   .. code-block:: console
+
+      export MEC5_SPI_GEN=<path to tool>/mec174x_spi_gen_linux_x86_64
+      or
+      export MEC5_SPI_GEN=<path to tool>/mec175x_spi_gen_linux_x86_64
+
+
+#. The default configuration file is mec174x_spi_cfg.txt or mec175x_spi_cfg.txt located in
+   ${BOARD_DIR}/support. If needed, a custom SPI image configuration file can be specified
+   to override the default one.
+
+   .. code-block:: console
+
+      export MEC5_SPI_CFG=custom_spi_cfg.txt
+
+Wiring
+========
+
+#. Connect the SPI Dongle ASSY 6791 to ``J18`` in the EVB.
+
+   .. image:: spi_dongle_assy6791.webp
+        :align: center
+        :alt: SPI DONGLE ASSY 6791 Connected
+
+#. IMPORTANT: Temporarily remove the jumper from JP87 to isolate SPI dongle power from EVB power rails.
+   This will prevent the SPI programmer from back driving voltage to the EVB.
+
+#. Connect programmer to the header J6 on the Assy6791 board, it will flash the SPI NOR chip
+   ``U3``.
+
+   .. note:: The AdaFruit FT232H board supports +5V or +3.3V SPI flash devices. It has
+    separate +3V and +5V pins. You should connect the appropriate voltage rail to the
+    Assy6791 flash dongle's J6-1 power pin.  It is recommended to remove the Assy6791
+    dongle from the EVB when flashing. If the dongle is attached to an unpowered EVB then
+    then the SPI programmer will back drive all the components. Back driving voltage can
+    be avoided by removing the jumper on EVB JP87 disconnecting VTR1/VTR2 from the 2x10
+    header J18.
+
+    +------------+---------------+
+    |  AdaFruit  |  Assy6791     |
+    |  Connector |  J6 Connector |
+    +============+===============+
+    |  3V or 5V  |       1       |
+    +------------+---------------+
+    |    GND     |       2       |
+    +------------+---------------+
+    |    D3      |       3       |
+    +------------+---------------+
+    |    D0      |       4       |
+    +------------+---------------+
+    |    D2      |       6       |
+    +------------+---------------+
+    |    D1      |       5       |
+    +------------+---------------+
+
+#. The AdaFruit FT232H has USB type-C connector. Connect it to your
+   development system with the appropriate USB cable. The FT232H board and
+   Assy6791 dongle will be powered.
+
+
+Flashing
+========
+
+#. Run your favorite terminal program
+
+#. Flash the SPI image created by Microchip SPI image generator during the
+   zephyr build process. The divisor option flashrom passes to the linux
+   FT232 driver divides down the 60 MHz SPI clock.  You can read the current
+   SPI image by changing the '-w' option to '-r'.
+
+   .. code-block:: console
+
+      $ sudo /usr/sbin/flashrom -V -p ft2232_spi:type=232H,divisor=30 -w spi_image.bin
+
+
+#. When flashrom completes.
+   Disconnect USB cable to remove power from the AdaFruit FT232H programmer.
+   Disconnect FT232H from Assy6791 dongle.
+   Replace the jumper on EVB JP87.
+
+# Power on the EVB.
+
+#. You should see ``"Hello World! <board name>"`` in the first terminal window.
+   If you don't see this message, press the Reset button and the message should appear.
+
+Debugging
+=========
+
+This board comes with a Cortex ETM port which facilitates tracing and debugging
+using a single physical connection.  In addition, it comes with sockets for
+JTAG only sessions.
+
+Troubleshooting
+===============
+
+#. In case you don't see your application running, please make sure ``LED1`` and ``LED2``
+   are lit. If one of these is off, then check the power-related jumpers again.
+
+#. If you suspect the SPI image was not programmed remove the SPI dongle from the EVB
+   and try flashing it again.
+
+PCA9555 Enabling
+================
+#. To enable PCA9555PW and test the I2C on mec172xevb_assy6906, additional works are needed:
+
+   As the I2C slave device NXP pca95xx on mec172xevb_assy6906 is connected to I2C00 port,
+   however, I2C00 port is shared with UART2 RS232 to TTL converter used to catch serial log,
+   so it's not possible to use UART2 and I2C00 port simultaneously. We need to change to use
+   I2C01 port by making some jumpers setting as below:
+
+    +---------+---------+------------------------------------------+
+    |  Pin 1  | Pin 2   |                Comment                   |
+    +=========+=========+==========================================+
+    | JP49.1  | JP49.2  | Connect PCA9555 VCC to +3.3V_STBY        |
+    +---------+---------+------------------------------------------+
+    | JP53.1  | JP53.2  | Select address 0100b, which means 0x26   |
+    +---------+---------+------------------------------------------+
+    | JP12.13 | JP12.14 | Connect I2C01_SDA from CPU to header J20 |
+    +---------+---------+------------------------------------------+
+    | JP12.4  | JP12.5  | Connect I2C01_SCL from CPU to header J20 |
+    +---------+---------+------------------------------------------+
+    | JP77.7  | JP77.8  | External pull-up for I2C01_SDA           |
+    +---------+---------+------------------------------------------+
+    | JP77.9  | JP77.10 | External pull-up for I2C01_SCL           |
+    +---------+---------+------------------------------------------+
+    | JP58.1  | JP20.1  | Connect NXP PCA9555 SCL to I2C01         |
+    +---------+---------+------------------------------------------+
+    | JP58.3  | JP20.3  | Connect NXP PCA9555 SDA to I2C01         |
+    +---------+---------+------------------------------------------+
+
+References
+**********
+
+.. target-notes::
+
+.. _MEC174x Data Brief:
+    https://github.com/MicrochipTech/CPGZephyrDocs/blob/main/MEC174x/MEC174x_DataBrief.pdf
+.. _MEC175x Data Brief:
+    https://github.com/MicrochipTech/CPGZephyrDocs/blob/main/MEC175x/MEC175x_DataBrief.pdf
+.. _EVB Schematic:
+    https://github.com/MicrochipTech/CPGZephyrDocs/blob/main/schematics/EVB_Assy6941.pdf
+.. _SOC Daughter Card Schematic:
+    https://github.com/MicrochipTech/CPGZephyrDocs/blob/main/schematics/MEC174x_176WFBGA_DC_6942.pdf
+.. _SPI Dongle Schematic:
+    https://github.com/MicrochipTech/CPGZephyrDocs/blob/main/schematics/SPI_Flash_and_EEPROM_Dongle_Assy6791_Rev_B1p0.pdf
+.. _MEC174x SPI Image Gen:
+    https://github.com/MicrochipTech/CPGZephyrDocs/tree/main/MEC174x/SPI_image_gen
+.. _MEC175x SPI Image Gen:
+    https://github.com/MicrochipTech/CPGZephyrDocs/tree/main/MEC175x/SPI_image_gen
+.. _AdaFruit FT232H:
+    https://www.adafruit.com/product/2264
diff --git a/boards/microchip/mec_assy6941/doc/mec_assy6941_evb.webp b/boards/microchip/mec_assy6941/doc/mec_assy6941_evb.webp
new file mode 100644
index 0000000000000..950e721cea87a
Binary files /dev/null and b/boards/microchip/mec_assy6941/doc/mec_assy6941_evb.webp differ
diff --git a/boards/microchip/mec_assy6941/doc/spi_dongle_assy6791.webp b/boards/microchip/mec_assy6941/doc/spi_dongle_assy6791.webp
new file mode 100644
index 0000000000000..f71375f869051
Binary files /dev/null and b/boards/microchip/mec_assy6941/doc/spi_dongle_assy6791.webp differ
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts
new file mode 100644
index 0000000000000..a2b52bd505c38
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, Microchip Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <microchip/mec5_mec1743qlj.dtsi>
+#include <microchip/mec5/mec1743qlj-a0-pinctrl.dtsi>
+
+/ {
+	model = "Microchip MEC ASSY6941 MEC1743-QLJ evaluation board";
+	compatible = "microchip,mec_assy6941-mec1743_qlj";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart1;
+		rtimer-busy-wait-timer = &timer5;
+	};
+
+	power-states {
+		idle: idle {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-idle";
+			min-residency-us = <1000000>;
+		};
+
+		suspend_to_ram: suspend_to_ram {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-ram";
+			min-residency-us = <2000000>;
+		};
+	};
+};
+
+&cpu0 {
+	clock-frequency = <96000000>;
+	status = "okay";
+	cpu-power-states = <&idle &suspend_to_ram>;
+};
+
+/* Disable ARM SysTick kernel timer driver */
+&systick {
+	status = "disabled";
+};
+
+/* Enable MCHP kernel timer driver using 32KHz RTOS timer and 1MHz basic timer */
+&rtimer {
+	compatible = "microchip,mec5-ktimer";
+	status = "okay";
+};
+
+/* We chose 32-bit basic timer 5 for use by ktimer */
+&timer5 {
+	status = "okay";
+};
+
+&uart1 {
+	compatible = "microchip,mec5-uart";
+	status = "okay";
+	clock-frequency = <1843200>;
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_tx_gpio170 &uart1_rx_gpio171>;
+	pinctrl-names = "default";
+};
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.yaml b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.yaml
new file mode 100644
index 0000000000000..cfdc0564d2ffc
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.yaml
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2025, Microchip Technology Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: mec_assy6941/mec1743_qlj
+name: MEC174X EVB ASSY 6941 with MEC1743-QLJ
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 60
+flash: 416
+supported:
+  - gpio
+  - pinctrl
+  - i2c
+  - spi
+testing:
+  binaries:
+    - spi_image.bin
+  ignore_tags:
+    - bluetooth
+    - net
+vendor: microchip
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj_defconfig b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj_defconfig
new file mode 100644
index 0000000000000..47eaa31ebd3f6
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj_defconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_GPIO=y
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts
new file mode 100644
index 0000000000000..fc4eb98d5685e
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, Microchip Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <microchip/mec5_mec1743qlj.dtsi>
+#include <microchip/mec5/mec1743qlj-a0-pinctrl.dtsi>
+
+/ {
+	model = "Microchip MEC ASSY6941 MEC1743-QSZ evaluation board";
+	compatible = "microchip,mec_assy6941-mec1743_qsz";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart1;
+		rtimer-busy-wait-timer = &timer5;
+	};
+
+	power-states {
+		idle: idle {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-idle";
+			min-residency-us = <1000000>;
+		};
+
+		suspend_to_ram: suspend_to_ram {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-ram";
+			min-residency-us = <2000000>;
+		};
+	};
+};
+
+&cpu0 {
+	clock-frequency = <96000000>;
+	status = "okay";
+	cpu-power-states = <&idle &suspend_to_ram>;
+};
+
+/* Disable ARM SysTick kernel timer driver */
+&systick {
+	status = "disabled";
+};
+
+/* Enable MCHP kernel timer driver using 32KHz RTOS timer and 1MHz basic timer */
+&rtimer {
+	compatible = "microchip,mec5-ktimer";
+	status = "okay";
+};
+
+/* We chose 32-bit basic timer 5 for use by ktimer */
+&timer5 {
+	status = "okay";
+};
+
+&uart1 {
+	compatible = "microchip,mec5-uart";
+	status = "okay";
+	clock-frequency = <1843200>;
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_tx_gpio170 &uart1_rx_gpio171>;
+	pinctrl-names = "default";
+};
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.yaml b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.yaml
new file mode 100644
index 0000000000000..ae39df56b0465
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.yaml
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2025, Microchip Technology Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: mec_assy6941/mec1743_qsz
+name: MEC174X EVB ASSY 6941 with MEC1743-QSZ
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 60
+flash: 416
+supported:
+  - gpio
+  - pinctrl
+  - i2c
+  - spi
+testing:
+  binaries:
+    - spi_image.bin
+  ignore_tags:
+    - bluetooth
+    - net
+vendor: microchip
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz_defconfig b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz_defconfig
new file mode 100644
index 0000000000000..47eaa31ebd3f6
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz_defconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_GPIO=y
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts
new file mode 100644
index 0000000000000..1187fef8a072a
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, Microchip Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <microchip/mec5_mec1753qlj.dtsi>
+#include <microchip/mec5/mec1753qlj-a0-pinctrl.dtsi>
+
+/ {
+	model = "Microchip MEC ASSY6941 MEC1753-QLJ evaluation board";
+	compatible = "microchip,mec_assy6941-mec1753_qlj";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart1;
+		rtimer-busy-wait-timer = &timer5;
+	};
+
+	power-states {
+		idle: idle {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-idle";
+			min-residency-us = <1000000>;
+		};
+
+		suspend_to_ram: suspend_to_ram {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-ram";
+			min-residency-us = <2000000>;
+		};
+	};
+};
+
+&cpu0 {
+	clock-frequency = <96000000>;
+	status = "okay";
+	cpu-power-states = <&idle &suspend_to_ram>;
+};
+
+/* Disable ARM SysTick kernel timer driver */
+&systick {
+	status = "disabled";
+};
+
+/* Enable MCHP kernel timer driver using 32KHz RTOS timer and 1MHz basic timer */
+&rtimer {
+	compatible = "microchip,mec5-ktimer";
+	status = "okay";
+};
+
+/* We chose 32-bit basic timer 5 for use by ktimer */
+&timer5 {
+	status = "okay";
+};
+
+&uart1 {
+	compatible = "microchip,mec5-uart";
+	status = "okay";
+	clock-frequency = <1843200>;
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_tx_gpio170 &uart1_rx_gpio171>;
+	pinctrl-names = "default";
+};
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.yaml b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.yaml
new file mode 100644
index 0000000000000..ad4578718f43b
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.yaml
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2025, Microchip Technology Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: mec_assy6941/mec1753_qlj
+name: MEC174X EVB ASSY 6941 with MEC1753-QLJ
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 60
+flash: 416
+supported:
+  - gpio
+  - pinctrl
+  - i2c
+  - spi
+testing:
+  binaries:
+    - spi_image.bin
+  ignore_tags:
+    - bluetooth
+    - net
+vendor: microchip
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj_defconfig b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj_defconfig
new file mode 100644
index 0000000000000..47eaa31ebd3f6
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj_defconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_GPIO=y
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts
new file mode 100644
index 0000000000000..b2e7c570cc6ea
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, Microchip Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <microchip/mec5_mec1753qsz.dtsi>
+#include <microchip/mec5/mec1753qsz-a0-pinctrl.dtsi>
+
+/ {
+	model = "Microchip MEC ASSY6941 MEC1753-QSZ evaluation board";
+	compatible = "microchip,mec_assy6941-mec1753_qsz";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart1;
+		rtimer-busy-wait-timer = &timer5;
+	};
+
+	power-states {
+		idle: idle {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-idle";
+			min-residency-us = <1000000>;
+		};
+
+		suspend_to_ram: suspend_to_ram {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-ram";
+			min-residency-us = <2000000>;
+		};
+	};
+};
+
+&cpu0 {
+	clock-frequency = <96000000>;
+	status = "okay";
+	cpu-power-states = <&idle &suspend_to_ram>;
+};
+
+/* Disable ARM SysTick kernel timer driver */
+&systick {
+	status = "disabled";
+};
+
+/* Enable MCHP kernel timer driver using 32KHz RTOS timer and 1MHz basic timer */
+&rtimer {
+	compatible = "microchip,mec5-ktimer";
+	status = "okay";
+};
+
+/* We chose 32-bit basic timer 5 for use by ktimer */
+&timer5 {
+	status = "okay";
+};
+
+&uart1 {
+	compatible = "microchip,mec5-uart";
+	status = "okay";
+	clock-frequency = <1843200>;
+	current-speed = <115200>;
+	pinctrl-0 = <&uart1_tx_gpio170 &uart1_rx_gpio171>;
+	pinctrl-names = "default";
+};
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.yaml b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.yaml
new file mode 100644
index 0000000000000..d825e2177d89c
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.yaml
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2025, Microchip Technology Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: mec_assy6941/mec1753_qsz
+name: MEC174X EVB ASSY 6941 with MEC1753-QSZ
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 60
+flash: 416
+supported:
+  - gpio
+  - pinctrl
+  - i2c
+  - spi
+testing:
+  binaries:
+    - spi_image.bin
+  ignore_tags:
+    - bluetooth
+    - net
+vendor: microchip
diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz_defconfig b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz_defconfig
new file mode 100644
index 0000000000000..47eaa31ebd3f6
--- /dev/null
+++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz_defconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, Microchip Technology Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_GPIO=y
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/microchip/mec_assy6941/support/mec174x_spi_cfg.txt b/boards/microchip/mec_assy6941/support/mec174x_spi_cfg.txt
new file mode 100644
index 0000000000000..62ddf14369118
--- /dev/null
+++ b/boards/microchip/mec_assy6941/support/mec174x_spi_cfg.txt
@@ -0,0 +1,51 @@
+; MEC174x SPI Image Generator configuration file
+[SPI]
+SPISizeMegabits = 128
+
+[DEVICE]
+TagAddr0 = 0
+TagAddr1 = 0
+; BoardID is used by a Boot-ROM feature named PlatformID. By default PlatformID
+; is disabled. If PlatformID is enabled in OTP Boot-ROM will check the image
+; BoardID value with an OTP PlatformID value. Load is aborted if the ID's do
+; not match.
+BoardID = 0x316
+
+[IMAGE "0"]
+ImageLocation = 0x2000
+SpiFreqMHz = 24
+SpiReadCommand = slow
+SpiDriveStrength = 4
+SpiSlewFast = false
+SpiSignalControl = 0x00
+IMG1BinFile = zephyr.bin
+ImageRevision = 0
+FwOffset = 0
+IMG1LoadAddress = 0xB0000
+IMG1EntryAddress = 0
+UseECDSA = false
+AuthenticateKeySelt = 5
+AutoKeyRevEn = true
+KeyRevPermission = 0xff
+AutoRollBackProtEn = false
+RollbackProtPerm031000 = 0
+RollbackProtPerm063032 = 0
+RollbackProtPerm095063 = 0
+RollbackProtPerm127096 = 0
+ECDSAPrivKeyFile = ECC384r.pem
+ECDSAPrivKeyPassword = MCHPECC384r
+FwEncrypt = false
+AesGenECPubKeyFile = ECC384r_crt.pem
+TagBuildNumber= 0
+Comp0ProgDrvStrenEN = false
+Comp0WritCmdTotByts = 0
+Comp0ReadCmdByte = 0
+Comp0WritCmdByte = 0
+Comp0DrvValue = 0
+Comp0DrvMask = 0
+Comp1ProgDrvStrenEN = false
+Comp1WritCmdTotByts = 0
+Comp1ReadCmdByte = 0
+Comp1WritCmdByte = 0
+Comp1DrvValue = 0
+Comp1DrvMask = 0
diff --git a/boards/microchip/mec_assy6941/support/mec175x_spi_cfg.txt b/boards/microchip/mec_assy6941/support/mec175x_spi_cfg.txt
new file mode 100644
index 0000000000000..b7428492fc6b7
--- /dev/null
+++ b/boards/microchip/mec_assy6941/support/mec175x_spi_cfg.txt
@@ -0,0 +1,52 @@
+; MEC175x SPI Image Generator configuration file
+[SPI]
+SPISizeMegabits = 128
+
+[DEVICE]
+DeviceSel = A
+TagAddr0 = 0
+TagAddr1 = 0
+; BoardID is used by a Boot-ROM feature named PlatformID. By default PlatformID
+; is disabled. If PlatformID is enabled in OTP Boot-ROM will check the image
+; BoardID value with an OTP PlatformID value. Load is aborted if the ID's do
+; not match.
+BoardID = 0x316
+
+[IMAGE "0"]
+ImageLocation = 0x2000
+SpiFreqMHz = 24
+SpiReadCommand = slow
+SpiDriveStrength = 4
+SpiSlewFast = false
+SpiSignalControl = 0x00
+IMG1BinFile = zephyr.bin
+ImageRevision = 0
+FwOffset = 0
+IMG1LoadAddress = 0xB0000
+IMG1EntryAddress = 0
+UseECDSA = false
+AuthenticateKeySelt = 5
+AutoKeyRevEn = true
+KeyRevPermission = 0xff
+AutoRollBackProtEn = false
+RollbackProtPerm031000 = 0
+RollbackProtPerm063032 = 0
+RollbackProtPerm095063 = 0
+RollbackProtPerm127096 = 0
+ECDSAPrivKeyFile = ECC384r.pem
+ECDSAPrivKeyPassword = MCHPECC384r
+FwEncrypt = false
+AesGenECPubKeyFile = ECC384r_crt.pem
+TagBuildNumber= 0
+Comp0ProgDrvStrenEN = false
+Comp0WritCmdTotByts = 0
+Comp0ReadCmdByte = 0
+Comp0WritCmdByte = 0
+Comp0DrvValue = 0
+Comp0DrvMask = 0
+Comp1ProgDrvStrenEN = false
+Comp1WritCmdTotByts = 0
+Comp1ReadCmdByte = 0
+Comp1WritCmdByte = 0
+Comp1DrvValue = 0
+Comp1DrvMask = 0
diff --git a/boards/microchip/mpfs_icicle/Kconfig.defconfig b/boards/microchip/mpfs_icicle/Kconfig.defconfig
new file mode 100644
index 0000000000000..8c630afbfc01f
--- /dev/null
+++ b/boards/microchip/mpfs_icicle/Kconfig.defconfig
@@ -0,0 +1,10 @@
+# Copyright 2025 Google LLC
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_MPFS_ICICLE
+
+choice SPI_NOR_SFDP
+	default SPI_NOR_SFDP_RUNTIME
+endchoice
+
+endif
diff --git a/boards/microchip/mpfs_icicle/doc/index.rst b/boards/microchip/mpfs_icicle/doc/index.rst
index ee5d07b5bda0d..12c57e62029ef 100644
--- a/boards/microchip/mpfs_icicle/doc/index.rst
+++ b/boards/microchip/mpfs_icicle/doc/index.rst
@@ -10,6 +10,8 @@ More information can be found on the `Microchip website <https://www.microchip.c
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_e51.yaml b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_e51.yaml
index 3518a70f8d8ff..c9b5fe171375a 100644
--- a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_e51.yaml
+++ b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_e51.yaml
@@ -9,5 +9,4 @@ testing:
   ignore_tags:
     - net
     - bluetooth
-    - flash
 vendor: microchip
diff --git a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54.yaml b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54.yaml
index 9599b13e1c5c8..6a4b1c782653a 100644
--- a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54.yaml
+++ b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54.yaml
@@ -9,5 +9,4 @@ testing:
   ignore_tags:
     - net
     - bluetooth
-    - flash
 vendor: microchip
diff --git a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_defconfig b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_defconfig
index c40256dbf73d1..daee5c31bb818 100644
--- a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_defconfig
+++ b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_defconfig
@@ -14,3 +14,4 @@ CONFIG_RV_BOOT_HART=1
 # GPIO driver options
 CONFIG_GPIO=y
 CONFIG_I2C=y
+CONFIG_MP_MAX_NUM_CPUS=1
diff --git a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_smp.yaml b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_smp.yaml
index 6118303c24678..ab9d74860e492 100644
--- a/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_smp.yaml
+++ b/boards/microchip/mpfs_icicle/mpfs_icicle_polarfire_u54_smp.yaml
@@ -9,5 +9,4 @@ testing:
   ignore_tags:
     - net
     - bluetooth
-    - flash
 vendor: microchip
diff --git a/boards/mikroe/clicker_2/doc/mikroe_clicker_2.rst b/boards/mikroe/clicker_2/doc/mikroe_clicker_2.rst
index a33f76d8beba2..3541b8165e631 100644
--- a/boards/mikroe/clicker_2/doc/mikroe_clicker_2.rst
+++ b/boards/mikroe/clicker_2/doc/mikroe_clicker_2.rst
@@ -21,31 +21,8 @@ to the microcontroller.
 
 Supported Features
 ==================
-The Zephyr MikroE Clicker 2 configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in
-:zephyr_file:`boards/mikroe/clicker_2/mikroe_clicker_2_defconfig`
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -59,6 +36,9 @@ For connections on the edge connectors, please refer to `Clicker 2 for STM32 Use
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 Applications for the ``mikroe_clicker_2`` board configuration can
 be built and flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/mikroe/clicker_ra4m1/doc/index.rst b/boards/mikroe/clicker_ra4m1/doc/index.rst
index 56099ee6f4294..88a005f03ff07 100644
--- a/boards/mikroe/clicker_ra4m1/doc/index.rst
+++ b/boards/mikroe/clicker_ra4m1/doc/index.rst
@@ -18,30 +18,13 @@ development board see the `Clicker RA4M1 website`_.
 Supported Features
 ==================
 
-The Zephyr Mikroe Clicker RA4M1 configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO output                         |
-|           |            | GPIO input                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1_defconfig`.
+.. zephyr:board-supported-hw::
 
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building & Flashing
 ===================
 
diff --git a/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1-pinctrl.dtsi b/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1-pinctrl.dtsi
new file mode 100644
index 0000000000000..d2bd43dfa190c
--- /dev/null
+++ b/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1-pinctrl.dtsi
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Ian Morris
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci0_default: sci0_default {
+		group1 {
+			/* tx */
+			psels = <RA_PSEL(RA_PSEL_SCI_0, 4, 11)>;
+		};
+
+		group2 {
+			/* rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_0, 4, 10)>;
+		};
+	};
+
+	iic1_default: iic1_default {
+		group1 {
+			/* SCL1 SDA1 */
+			psels = <RA_PSEL(RA_PSEL_I2C, 2, 5)>,
+			<RA_PSEL(RA_PSEL_I2C, 2, 6)>;
+			drive-strength = "medium";
+		};
+	};
+
+	spi0_default: spi0_default {
+		group1 {
+			/* MISO MOSI RSPCK SSL */
+			psels = <RA_PSEL(RA_PSEL_SPI, 1, 0)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 1)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 2)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 3)>;
+		};
+	};
+};
diff --git a/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1.dts b/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1.dts
index 5a626a783648d..d5fea8287b327 100644
--- a/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1.dts
+++ b/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1.dts
@@ -5,14 +5,15 @@
  */
 
 /dts-v1/;
-#include <renesas/ra/r7fa4m1ab3cfm.dtsi>
+#include <renesas/ra/ra4/r7fa4m1ab3cfm.dtsi>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
-#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
+
+#include "mikroe_clicker_ra4m1-pinctrl.dtsi"
 
 / {
 	model = "Mikroe Clicker RA4M1";
-	compatible = "renesas,r7fa4m1ab3cfm";
+	compatible = "renesas,ra4m1", "renesas,ra";
 
 	chosen {
 		zephyr,console = &uart0;
@@ -27,6 +28,7 @@
 			gpios = <&ioport4 9 GPIO_ACTIVE_HIGH>;
 			label = "User LED 1";
 		};
+
 		ld2: led_2 {
 			gpios = <&ioport4 8 GPIO_ACTIVE_HIGH>;
 			label = "User LED 2";
@@ -40,6 +42,12 @@
 			label = "User Button 1";
 			zephyr,code = <INPUT_KEY_0>;
 		};
+
+		btn2: button_2 {
+			gpios = <&ioport3 1 GPIO_ACTIVE_LOW>;
+			label = "User Button 2";
+			zephyr,code = <INPUT_KEY_1>;
+		};
 	};
 
 	mikrobus_header: mikrobus-connector {
@@ -69,19 +77,7 @@
 		led0 = &ld1;
 		led1 = &ld2;
 		sw0 = &btn1;
-	};
-};
-
-&pinctrl {
-	sci0_default: sci0_default {
-		group1 {
-			/* tx */
-			psels = <RA_PSEL(RA_PSEL_SCI_0, 4, 11)>;
-		};
-		group2 {
-			/* rx */
-			psels = <RA_PSEL(RA_PSEL_SCI_0, 4, 10)>;
-		};
+		sw1 = &btn2;
 	};
 };
 
@@ -95,6 +91,25 @@
 	};
 };
 
+&iic1 {
+	pinctrl-0 = <&iic1_default>;
+	pinctrl-names = "default";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	clock-frequency = <DT_FREQ_K(400)>;
+	interrupts = <10 1>, <11 1>, <12 1>, <13 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
+&spi0 {
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-names = "default";
+	interrupts = <23 1>, <24 1>, <25 1>, <26 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
 &ioport0 {
 	status = "okay";
 };
@@ -115,7 +130,13 @@
 	status = "okay";
 };
 
-&fcu {
+&port_irq6 {
+	interrupts = <28 12>;
+	status = "okay";
+};
+
+&port_irq9 {
+	interrupts = <27 12>;
 	status = "okay";
 };
 
@@ -129,6 +150,7 @@
 };
 
 &iclk {
+	clock-frequency = <12000000>;
 	div = <1>;
 };
 
@@ -151,3 +173,7 @@
 &fclk {
 	div = <2>;
 };
+
+mikrobus_serial: &uart0 {};
+mikrobus_i2c: &iic1 {};
+mikrobus_spi: &spi0 {};
diff --git a/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1_defconfig b/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1_defconfig
index 2e434ba45ea3c..1c187cb544cd2 100644
--- a/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1_defconfig
+++ b/boards/mikroe/clicker_ra4m1/mikroe_clicker_ra4m1_defconfig
@@ -1,10 +1,6 @@
 # Copyright (c) 2024 Ian Morris
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
-
-CONFIG_BUILD_OUTPUT_HEX=y
-
 # Enable uart driver
 CONFIG_SERIAL=y
 
@@ -14,6 +10,3 @@ CONFIG_UART_CONSOLE=y
 
 # Enable GPIO
 CONFIG_GPIO=y
-
-# Enable Clocks
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/mikroe/mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst b/boards/mikroe/mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst
index 02208b66bf329..02504c3bc9a33 100644
--- a/boards/mikroe/mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst
+++ b/boards/mikroe/mini_m4_for_stm32/doc/mikroe_mini_m4_for_stm32.rst
@@ -49,37 +49,7 @@ The board can be flashed by using STLinkV2 with the following connections.
 Supported Features
 ==================
 
-The MINI-M4 for STM32 board configuration supports the following hardware
-features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CRYP      | on-chip    | crypto               |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | PWM                  |
-+-----------+------------+----------------------+
-| USB       | on-chip    | USB                  |
-+-----------+------------+----------------------+
-
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in
-:zephyr_file:`boards/mikroe/mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig`
+.. zephyr:board-supported-hw::
 
 Serial Port
 ===========
@@ -89,6 +59,8 @@ The Zephyr console output is assigned to USART2. Default settings are 115200 8N1
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``mikroe_mini_m4_for_stm32`` board configuration can
 be built and flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/mikroe/stm32_m4_clicker/doc/index.rst b/boards/mikroe/stm32_m4_clicker/doc/index.rst
index 8bddfd3f7aaa9..77f52fa96bf98 100644
--- a/boards/mikroe/stm32_m4_clicker/doc/index.rst
+++ b/boards/mikroe/stm32_m4_clicker/doc/index.rst
@@ -18,37 +18,13 @@ board see the `STM32 M4 Clicker website`_.
 Supported Features
 ==================
 
-The ``mikroe_stm32_m4_clicker`` board target supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO output                         |
-|           |            | GPIO input                          |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features have not yet been enabled for this board.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/mikroe/stm32_m4_clicker/mikroe_stm32_m4_clicker_defconfig`.
+.. zephyr:board-supported-hw::
 
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building & Flashing
 ===================
 
diff --git a/boards/mxchip/az3166_iotdevkit/doc/index.rst b/boards/mxchip/az3166_iotdevkit/doc/index.rst
index 230073f829556..8ea178b7f9306 100644
--- a/boards/mxchip/az3166_iotdevkit/doc/index.rst
+++ b/boards/mxchip/az3166_iotdevkit/doc/index.rst
@@ -34,25 +34,7 @@ The MXChip AZ3166 IoT DevKit has the following physical features:
 Supported Features
 ==================
 
-The az3166_iotdevkit board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vector        |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 .. note::
 
@@ -61,6 +43,8 @@ hardware features:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/native/doc/arch_soc.rst b/boards/native/doc/arch_soc.rst
index 8906001f17763..6b6a5a5e10eb2 100644
--- a/boards/native/doc/arch_soc.rst
+++ b/boards/native/doc/arch_soc.rst
@@ -53,8 +53,8 @@ This port is designed and tested to run in Linux.
 
 .. note::
 
-   You must have the 32-bit C library installed in your system
-   (in Ubuntu 16.04 install the gcc-multilib package)
+   To build for the 32bit targets you must have the 32-bit C library installed in your system
+   (in Debian/Ubuntu this is provided by the ``gcc-multilib`` package).
 
 .. note::
 
@@ -306,7 +306,7 @@ Architecture and design
 
 .. note::
 
-   This section does not describe anymore the old :ref:`native_posix<native_posix>` or
+   This section does not describe anymore the old
    :kconfig:option:`CONFIG_NATIVE_APPLICATION` based architecture.
    It only describes the new native simulator based architecture used by targets built with the
    :kconfig:option:`CONFIG_NATIVE_LIBRARY` option.
diff --git a/boards/native/native_posix/CMakeLists.txt b/boards/native/native_posix/CMakeLists.txt
deleted file mode 100644
index b86941cc85428..0000000000000
--- a/boards/native/native_posix/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (c) 2017 Oticon A/S
-
-zephyr_library()
-
-zephyr_library_compile_definitions(NO_POSIX_CHEATS)
-zephyr_library_compile_definitions(_POSIX_C_SOURCE=200809L _XOPEN_SOURCE=600 _XOPEN_SOURCE_EXTENDED)
-
-zephyr_library_sources(
-	hw_models_top.c
-	timer_model.c
-	native_rtc.c
-	irq_handler.c
-	irq_ctrl.c
-	main.c
-	tracing.c
-	cmdline_common.c
-	cmdline.c
-	cpu_wait.c
-	hw_counter.c
-	)
-
-zephyr_library_include_directories(
-  ${ZEPHYR_BASE}/kernel/include
-  ${ZEPHYR_BASE}/arch/posix/include
-  )
-
-if(CONFIG_HAS_SDL)
-	add_subdirectory(${ZEPHYR_BASE}/boards/native/common/sdl/ ${CMAKE_CURRENT_BINARY_DIR}/sdl)
-endif()
-
-zephyr_ld_options(
-  -lm
-)
diff --git a/boards/native/native_posix/Kconfig b/boards/native/native_posix/Kconfig
deleted file mode 100644
index b629778f4cbca..0000000000000
--- a/boards/native/native_posix/Kconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2017 Oticon A/S
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NATIVE_POSIX
-	bool
-	imply NATIVE_POSIX_TIMER
-	select POSIX_ARCH_CONSOLE
-	select NATIVE_APPLICATION
-	select 64BIT if BOARD_NATIVE_POSIX_NATIVE_64
-	help
-	  Native POSIX
-	  Will produce a console Linux process which can be executed natively.
-	  It provides some minimal needed models:
-	  An interrupt controller, timer (system tick), and redirects kernel prints to
-	  stdout.
-
-if BOARD_NATIVE_POSIX
-
-comment "Native POSIX options"
-
-config NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME
-	bool "Slow down execution to real time"
-	default n if ARCH_POSIX_LIBFUZZER
-	default y if BT_USERCHAN || !TEST
-	help
-	  When selected the execution of the process will be slowed down to real time.
-	  (if there is a lot of load it may be slower than real time)
-	  If deselected, the process will run as fast as possible.
-	  Note that this only decouples simulated time from real/wall time. In either
-	  case the zephyr kernel and application cannot tell the difference unless they
-	  interact with some other driver/device which runs at real time.
-
-source "boards/native/common/sdl/Kconfig"
-
-endif # BOARD_NATIVE_POSIX
diff --git a/boards/native/native_posix/Kconfig.defconfig b/boards/native/native_posix/Kconfig.defconfig
deleted file mode 100644
index 2d896061f7835..0000000000000
--- a/boards/native/native_posix/Kconfig.defconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2017 Oticon A/S
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NATIVE_POSIX
-
-config BOARD_DEPRECATED_RELEASE
-	default "v4.2.0"
-
-config BUILD_OUTPUT_BIN
-	default n
-
-config BUILD_OUTPUT_EXE
-	default y
-
-config OUTPUT_PRINT_MEMORY_USAGE
-	default n
-
-if NETWORKING
-
-config NET_L2_ETHERNET
-	default y if !NET_LOOPBACK && !NET_TEST
-
-config ETH_NATIVE_POSIX
-	default y if NET_L2_ETHERNET && ETH_DRIVER
-
-endif # NETWORKING
-
-if CONSOLE
-
-config POSIX_ARCH_CONSOLE
-	default y if !SERIAL
-
-config UART_CONSOLE
-	default y if SERIAL
-
-endif # CONSOLE
-
-endif # BOARD_NATIVE_POSIX
diff --git a/boards/native/native_posix/Kconfig.native_posix b/boards/native/native_posix/Kconfig.native_posix
deleted file mode 100644
index cb7c03889c425..0000000000000
--- a/boards/native/native_posix/Kconfig.native_posix
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NATIVE_POSIX
-	select SOC_POSIX
diff --git a/boards/native/native_posix/board.cmake b/boards/native/native_posix/board.cmake
deleted file mode 100644
index c3f7c89918dd9..0000000000000
--- a/boards/native/native_posix/board.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (c) 2017 Oticon A/S
-
-set(SUPPORTED_EMU_PLATFORMS native)
-
-board_set_debugger_ifnset(native)
-board_set_flasher_ifnset(native)
-board_finalize_runner_args(native)
diff --git a/boards/native/native_posix/board.yml b/boards/native/native_posix/board.yml
deleted file mode 100644
index 07defd4185bfc..0000000000000
--- a/boards/native/native_posix/board.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-boards:
-- name: native_posix
-  full_name: Native POSIX execution (native_posix)
-  vendor: zephyr
-  socs:
-  - name: native
-    variants:
-    - name: "64"
diff --git a/boards/native/native_posix/board_irq.h b/boards/native/native_posix/board_irq.h
deleted file mode 100644
index 21c29768c8ef7..0000000000000
--- a/boards/native/native_posix/board_irq.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef BOARDS_POSIX_NATIVE_POSIX_BOARD_IRQ_H
-#define BOARDS_POSIX_NATIVE_POSIX_BOARD_IRQ_H
-
-#include "../common/irq/board_irq.h"
-
-#endif /* BOARDS_POSIX_NATIVE_POSIX_BOARD_IRQ_H */
diff --git a/boards/native/native_posix/board_soc.h b/boards/native/native_posix/board_soc.h
deleted file mode 100644
index 572617a073650..0000000000000
--- a/boards/native/native_posix/board_soc.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * @file Extra definitions provided by the board to soc.h
- *
- * Background:
- * The POSIX ARCH/SOC/board layering is different than in normal archs
- * The "SOC" does not provide almost any of the typical SOC functionality
- * but that is left for the "board" to define it
- * Device code may rely on the soc.h defining some things (like the interrupts
- * numbers)
- * Therefore this file is included from the inf_clock soc.h to allow a board
- * to define that kind of SOC related snippets
- */
-
-#ifndef _POSIX_SP_BOARD_SOC_H
-#define _POSIX_SP_BOARD_SOC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TIMER_TICK_IRQ 0
-#define OFFLOAD_SW_IRQ 1
-#define COUNTER_EVENT_IRQ 2
-
-/*
- * This interrupt will awake the CPU if IRQs are not locked,
- * This interrupt does not have an associated status bit or handler
- */
-#define PHONY_WEAK_IRQ 0xFFFE
-/*
- * This interrupt will awake the CPU even if IRQs are locked,
- * This interrupt does not have an associated status bit or handler
- * (the lock is only ignored when the interrupt is raised from the HW models,
- * SW threads should not try to use this)
- */
-#define PHONY_HARD_IRQ 0xFFFF
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _POSIX_SP_BOARD_SOC_H */
diff --git a/boards/native/native_posix/cmdline.c b/boards/native/native_posix/cmdline.c
deleted file mode 100644
index aa0ef1e697488..0000000000000
--- a/boards/native/native_posix/cmdline.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include "cmdline_common.h"
-#include <zephyr/types.h>
-#include "hw_models_top.h"
-#include "timer_model.h"
-#include "cmdline.h"
-#include <zephyr/toolchain.h>
-#include <zephyr/arch/posix/posix_trace.h>
-#include "native_tracing.h"
-
-static int s_argc, test_argc;
-static char **s_argv, **test_argv;
-
-static struct args_struct_t *args_struct;
-static int used_args;
-static int args_aval;
-#define ARGS_ALLOC_CHUNK_SIZE 20
-
-void native_cleanup_cmd_line(void)
-{
-	if (args_struct != NULL) { /* LCOV_EXCL_BR_LINE */
-		free(args_struct);
-		args_struct = NULL;
-	}
-}
-
-/**
- * Add a set of command line options to the program.
- *
- * Each option to be added is described in one entry of the input <args>
- * This input must be terminated with an entry containing ARG_TABLE_ENDMARKER.
- */
-void native_add_command_line_opts(struct args_struct_t *args)
-{
-	int count = 0;
-
-	while (args[count].option != NULL) {
-		count++;
-	}
-	count++; /*for the end marker*/
-
-	if (used_args + count >= args_aval) {
-		int growby = count;
-		/* reallocs are expensive let's do them only in big chunks */
-		if (growby < ARGS_ALLOC_CHUNK_SIZE) {
-			growby = ARGS_ALLOC_CHUNK_SIZE;
-		}
-
-		struct args_struct_t *new_args_struct = realloc(args_struct,
-				      (args_aval + growby)*
-				      sizeof(struct args_struct_t));
-		args_aval += growby;
-		/* LCOV_EXCL_START */
-		if (new_args_struct == NULL) {
-			posix_print_error_and_exit("Could not allocate memory");
-		} else {
-			args_struct = new_args_struct;
-		}
-		/* LCOV_EXCL_STOP */
-	}
-
-	memcpy(&args_struct[used_args], args,
-		count*sizeof(struct args_struct_t));
-
-	used_args += count - 1;
-	/*
-	 * -1 as the end marker should be overwritten next time something
-	 * is added
-	 */
-}
-
-void native_add_testargs_option(void)
-{
-	static struct args_struct_t testargs_options[] = {
-		/*
-		 * Fields:
-		 * manual, mandatory, switch,
-		 * option_name, var_name ,type,
-		 * destination, callback,
-		 * description
-		 */
-		{true, false, false,
-		"testargs", "arg", 'l',
-		(void *)NULL, NULL,
-		"Any argument that follows will be ignored by the top level, "
-		"and made available for possible tests"},
-		ARG_TABLE_ENDMARKER};
-
-	native_add_command_line_opts(testargs_options);
-}
-
-static void print_invalid_opt_error(char *argv)
-{
-	posix_print_error_and_exit("Incorrect option '%s'. Did you misspell it?"
-				   " Is that feature supported in this build?"
-				   "\n",
-				   argv);
-
-}
-
-/**
- * Handle possible command line arguments.
- *
- * We also store them for later use by possible test applications
- */
-void native_handle_cmd_line(int argc, char *argv[])
-{
-	int i;
-
-	native_add_tracing_options();
-	native_add_testargs_option();
-
-	s_argv = argv;
-	s_argc = argc;
-
-	cmd_args_set_defaults(args_struct);
-
-	for (i = 1; i < argc; i++) {
-
-		if ((cmd_is_option(argv[i], "testargs", 0))) {
-			test_argc = argc - i - 1;
-			test_argv = &argv[i+1];
-			break;
-		}
-
-		if (!cmd_parse_one_arg(argv[i], args_struct)) {
-			cmd_print_switches_help(args_struct);
-			print_invalid_opt_error(argv[i]);
-		}
-	}
-}
-
-/**
- * The application/test can use this function to inspect all the command line
- * arguments
- */
-void native_get_cmd_line_args(int *argc, char ***argv)
-{
-	*argc = s_argc;
-	*argv = s_argv;
-}
-
-/**
- * The application/test can use this function to inspect the command line
- * arguments received after --testargs
- */
-void native_get_test_cmd_line_args(int *argc, char ***argv)
-{
-	*argc = test_argc;
-	*argv = test_argv;
-}
diff --git a/boards/native/native_posix/cmdline.h b/boards/native/native_posix/cmdline.h
deleted file mode 100644
index 05d445ddd1b7e..0000000000000
--- a/boards/native/native_posix/cmdline.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NATIVE_POSIX_CMDLINE_H
-#define _NATIVE_POSIX_CMDLINE_H
-
-#include "cmdline_common.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void native_handle_cmd_line(int argc, char *argv[]);
-void native_get_cmd_line_args(int *argc, char ***argv);
-void native_get_test_cmd_line_args(int *argc, char ***argv);
-void native_add_command_line_opts(struct args_struct_t *args);
-void native_cleanup_cmd_line(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NATIVE_POSIX_CMDLINE_H */
diff --git a/boards/native/native_posix/cmdline_common.c b/boards/native/native_posix/cmdline_common.c
deleted file mode 100644
index 8723505658ac8..0000000000000
--- a/boards/native/native_posix/cmdline_common.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <string.h>
-#include <strings.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <zephyr/arch/posix/posix_trace.h>
-#include "posix_board_if.h"
-#include <zephyr/types.h>
-#include "cmdline_common.h"
-
-/**
- * Check if <arg> is the option <option>
- * The accepted syntax is:
- *   * For options without a value following:
- *       [-[-]]<option>
- *   * For options with value:
- *       [-[-]]<option>{:|=}<value>
- *
- * Returns 0 if it is not, or a number > 0 if it is.
- * The returned number is the number of characters it went through
- * to find the end of the option including the ':' or '=' character in case of
- * options with value
- */
-int cmd_is_option(const char *arg, const char *option, int with_value)
-{
-	int of = 0;
-	size_t to_match_len = strlen(option);
-
-	if (arg[of] == '-') {
-		of++;
-	}
-	if (arg[of] == '-') {
-		of++;
-	}
-
-	if (!with_value) {
-		if (strcmp(&arg[of], option) != 0) {
-			return 0;
-		} else {
-			return of + to_match_len;
-		}
-	}
-
-	while (!(arg[of] == 0 && *option == 0)) {
-		if (*option == 0) {
-			if ((arg[of] == ':') || (arg[of] == '=')) {
-				of++;
-				break;
-			}
-			return 0;
-		}
-		if (arg[of] != *option) {
-			return 0;
-		}
-		of++;
-		option++;
-	}
-
-	if (arg[of] == 0) { /* we need a value to follow */
-		posix_print_error_and_exit("Incorrect option syntax '%s'. The "
-					   "value should follow the options. "
-					   "For example --ratio=3\n",
-					   arg);
-	}
-	return of;
-}
-
-/**
- * Return 1 if <arg> matches an accepted help option.
- * 0 otherwise
- *
- * Valid help options are [-[-]]{?|h|help}
- * with the h or help in any case combination
- */
-int cmd_is_help_option(const char *arg)
-{
-	if (arg[0] == '-') {
-		arg++;
-	}
-	if (arg[0] == '-') {
-		arg++;
-	}
-	if ((strcasecmp(arg, "?") == 0) ||
-	    (strcasecmp(arg, "h") == 0) ||
-	    (strcasecmp(arg, "help") == 0)) {
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-#define CMD_TYPE_ERROR "Coding error: type %c not understood"
-#define CMD_ERR_BOOL_SWI "Programming error: I only know how to "\
-	"automatically read boolean switches\n"
-
-/**
- * Read out a the value following an option from str, and store it into
- * <dest>
- * <type> indicates the type of parameter (and type of dest pointer)
- *   'b' : boolean
- *   's' : string (char *)
- *   'u' : 32 bit unsigned integer
- *   'U' : 64 bit unsigned integer
- *   'i' : 32 bit signed integer
- *   'I' : 64 bit signed integer
- *   'd' : *double* float
- *
- * Note: list type ('l') cannot be handled by this function and must always be
- *       manual
- *
- *  <long_d> is the long name of the option
- */
-void cmd_read_option_value(const char *str, void *dest, const char type,
-			   const char *option)
-{
-	int error = 0;
-	char *endptr = NULL;
-
-	switch (type) {
-	case 'b':
-		if (strcasecmp(str, "false") == 0) {
-			*(bool *)dest = false;
-			endptr = (char *)str + 5;
-		} else if (strcmp(str, "0") == 0) {
-			*(bool *)dest = false;
-			endptr = (char *)str + 1;
-		} else if (strcasecmp(str, "true") == 0) {
-			*(bool *)dest = true;
-			endptr = (char *)str + 4;
-		} else if (strcmp(str, "1") == 0) {
-			*(bool *)dest = true;
-			endptr = (char *)str + 1;
-		} else {
-			error = 1;
-		}
-		break;
-	case 's':
-		*(char **)dest = (char *)str;
-		endptr = (char *)str + strlen(str);
-		break;
-	case 'u':
-		*(uint32_t *)dest = strtoul(str, &endptr, 0);
-		break;
-	case 'U':
-		*(uint64_t *)dest = strtoull(str, &endptr, 0);
-		break;
-	case 'i':
-		*(int32_t *)dest = strtol(str, &endptr, 0);
-		break;
-	case 'I':
-		*(int64_t *)dest = strtoll(str, &endptr, 0);
-		break;
-	case 'd':
-		*(double *)dest = strtod(str, &endptr);
-		break;
-	default:
-		posix_print_error_and_exit(CMD_TYPE_ERROR, type);
-		/* Unreachable */
-		break;
-	}
-
-	if (!error && endptr && *endptr != 0) {
-		error = 1;
-	}
-
-	if (error) {
-		posix_print_error_and_exit("Error reading value of %s '%s'. Use"
-					   " --help for usage information\n",
-					   option, str);
-	}
-}
-
-/**
- * Initialize existing dest* to defaults based on type
- */
-void cmd_args_set_defaults(struct args_struct_t args_struct[])
-{
-	int count = 0;
-
-	while (args_struct[count].option != NULL) {
-
-		if (args_struct[count].dest == NULL) {
-			count++;
-			continue;
-		}
-
-		switch (args_struct[count].type) {
-		case 0: /* does not have storage */
-			break;
-		case 'b':
-			*(bool *)args_struct[count].dest = false;
-			break;
-		case 's':
-			*(char **)args_struct[count].dest = NULL;
-			break;
-		case 'u':
-			*(uint32_t *)args_struct[count].dest = UINT32_MAX;
-			break;
-		case 'U':
-			*(uint64_t *)args_struct[count].dest = UINT64_MAX;
-			break;
-		case 'i':
-			*(int32_t *)args_struct[count].dest = INT32_MAX;
-			break;
-		case 'I':
-			*(int64_t *)args_struct[count].dest = INT64_MAX;
-			break;
-		case 'd':
-			*(double *)args_struct[count].dest = (double)NAN;
-			break;
-		default:
-			posix_print_error_and_exit(CMD_TYPE_ERROR,
-						   args_struct[count].type);
-			break;
-		}
-		count++;
-	}
-}
-
-/**
- * For the help messages:
- * Generate a string containing how the option described by <args_s_el>
- * should be used
- *
- * The string is saved in <buf> which has been allocated <size> bytes by the
- * caller
- */
-static void cmd_gen_switch_syntax(char *buf, int size,
-				  struct args_struct_t *args_s_el)
-{
-	int ret = 0;
-
-	if (size <= 0) {
-		return;
-	}
-
-	if (args_s_el->is_mandatory == false) {
-		*buf++ = '[';
-		size--;
-	}
-
-	if (args_s_el->is_switch == true) {
-		ret = snprintf(buf, size, "-%s", args_s_el->option);
-	} else {
-		if (args_s_el->type != 'l') {
-			ret = snprintf(buf, size, "-%s=<%s>",
-					args_s_el->option, args_s_el->name);
-		} else {
-			ret = snprintf(buf, size, "-%s <%s>...",
-					args_s_el->option, args_s_el->name);
-		}
-	}
-
-	if (ret < 0) {
-		posix_print_error_and_exit("Unexpected error in %s %i\n",
-					   __FILE__, __LINE__);
-	}
-	if (size - ret < 0) {
-		/*
-		 * If we run out of space we can just stop,
-		 * this is not critical
-		 */
-		return;
-	}
-	buf += ret;
-	size -= ret;
-
-	if (args_s_el->is_mandatory == false) {
-		snprintf(buf, size, "] ");
-	} else {
-		snprintf(buf, size, " ");
-	}
-}
-
-/**
- * Print short list of available switches
- */
-void cmd_print_switches_help(struct args_struct_t args_struct[])
-{
-	int count = 0;
-	int printed_in_line = strlen(_HELP_SWITCH) + 1;
-
-	fprintf(stdout, "%s ", _HELP_SWITCH);
-
-	while (args_struct[count].option != NULL) {
-		char stringy[_MAX_STRINGY_LEN];
-
-		cmd_gen_switch_syntax(stringy, _MAX_STRINGY_LEN,
-				      &args_struct[count]);
-
-		if (printed_in_line + strlen(stringy) > _MAX_LINE_WIDTH) {
-			fprintf(stdout, "\n");
-			printed_in_line = 0;
-		}
-
-		fprintf(stdout, "%s", stringy);
-		printed_in_line += strlen(stringy);
-		count++;
-	}
-
-	fprintf(stdout, "\n");
-}
-
-/**
- * Print the long help message of the program
- */
-void cmd_print_long_help(struct args_struct_t args_struct[])
-{
-	int ret;
-	int count = 0;
-	int printed_in_line = 0;
-	char stringy[_MAX_STRINGY_LEN];
-
-	cmd_print_switches_help(args_struct);
-
-	fprintf(stdout, "\n %-*s:%s\n", _LONG_HELP_ALIGN-1,
-		_HELP_SWITCH, _HELP_DESCR);
-
-	while (args_struct[count].option != NULL) {
-		int printed_right;
-		char *toprint;
-		int total_to_print;
-
-		cmd_gen_switch_syntax(stringy, _MAX_STRINGY_LEN,
-				      &args_struct[count]);
-
-		ret = fprintf(stdout, " %-*s:", _LONG_HELP_ALIGN-1, stringy);
-		printed_in_line = ret;
-		printed_right = 0;
-		toprint = args_struct[count].descript;
-		total_to_print = strlen(toprint);
-		ret = fprintf(stdout, "%.*s\n",
-				_MAX_LINE_WIDTH - printed_in_line,
-				&toprint[printed_right]);
-		printed_right += ret - 1;
-
-		while (printed_right < total_to_print) {
-			fprintf(stdout, "%*s", _LONG_HELP_ALIGN, "");
-			ret = fprintf(stdout, "%.*s\n",
-				      _MAX_LINE_WIDTH - _LONG_HELP_ALIGN,
-				      &toprint[printed_right]);
-			printed_right += ret - 1;
-		}
-		count++;
-	}
-	fprintf(stdout, "\n");
-	fprintf(stdout, "Note that which options are available depends on the "
-		"enabled features/drivers\n\n");
-}
-
-/*
- * <argv> matched the argument described in <arg_element>
- *
- * If arg_element->dest points to a place to store a possible value, read it
- * If there is a callback registered, call it after
- */
-static void cmd_handle_this_matched_arg(char *argv, int offset,
-					struct args_struct_t *arg_element)
-{
-	if (arg_element->dest != NULL) {
-		if (arg_element->is_switch) {
-			if (arg_element->type == 'b') {
-				*(bool *)arg_element->dest = true;
-			} else {
-				posix_print_error_and_exit(CMD_ERR_BOOL_SWI);
-			}
-		} else { /* if not a switch we need to read its value */
-			cmd_read_option_value(&argv[offset],
-					      arg_element->dest,
-					      arg_element->type,
-					      arg_element->option);
-		}
-	}
-
-	if (arg_element->call_when_found) {
-		arg_element->call_when_found(argv, offset);
-	}
-}
-
-/**
- * Try to find if this argument is in the list (and it is not manual)
- * if it does, try to parse it, set its dest accordingly, and return true
- * if it is not found, return false
- */
-bool cmd_parse_one_arg(char *argv, struct args_struct_t args_struct[])
-{
-	int count = 0;
-	int ret;
-
-	if (cmd_is_help_option(argv)) {
-		cmd_print_long_help(args_struct);
-		posix_exit(0);
-	}
-
-	while (args_struct[count].option != NULL) {
-		if (args_struct[count].manual) {
-			count++;
-			continue;
-		}
-		ret = cmd_is_option(argv, args_struct[count].option,
-				    !args_struct[count].is_switch);
-		if (ret) {
-			cmd_handle_this_matched_arg(argv,
-						    ret,
-						    &args_struct[count]);
-			return true;
-		}
-		count++;
-	}
-	return false;
-}
diff --git a/boards/native/native_posix/cmdline_common.h b/boards/native/native_posix/cmdline_common.h
deleted file mode 100644
index bf33599f2a72d..0000000000000
--- a/boards/native/native_posix/cmdline_common.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef _CMDLINE_COMMON_H
-#define _CMDLINE_COMMON_H
-
-#include <stdbool.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define _MAX_LINE_WIDTH 100 /*Total width of the help message*/
-/* Horizontal alignment of the 2nd column of the help message */
-#define _LONG_HELP_ALIGN 30
-
-#define _MAXOPT_SWITCH_LEN  32 /* Maximum allowed length for a switch name */
-#define _MAXOPT_NAME_LEN    32 /* Maximum allowed length for a variable name */
-
-#define _HELP_SWITCH  "[-h] [--h] [--help] [-?]"
-#define _HELP_DESCR   "Display this help"
-
-#define _MAX_STRINGY_LEN (_MAXOPT_SWITCH_LEN + _MAXOPT_NAME_LEN + 2 + 1 + 2 + 1)
-
-
-/**
- * Prototype for a callback function when an option is found:
- * inputs:
- *  argv: Whole argv[i] option as received in main
- *  offset: Offset to the end of the option string
- *          (including a possible ':' or '=')
- *  If the option had a value, it would be placed in &argv[offset]
- */
-typedef void (*option_found_callback_f)(char *argv, int offset);
-
-/*
- * Structure defining each command line option
- */
-struct args_struct_t {
-	/*
-	 * if manual is set cmd_args_parse*() will ignore it except for
-	 * displaying it the help messages and initializing <dest> to its
-	 * default
-	 */
-	bool manual;
-	/* For help messages, should it be wrapped in "[]" */
-	bool is_mandatory;
-	/* It is just a switch: it does not have something to store after */
-	bool is_switch;
-	/* Option name we search for: --<option> */
-	char *option;
-	/*
-	 * Name of the option destination in the help messages:
-	 * "--<option>=<name>"
-	 */
-	char *name;
-	/* Type of option (see cmd_read_option_value()) */
-	char type;
-	/* Pointer to where the read value will be stored (may be NULL) */
-	void *dest;
-	/* Optional callback to be called when the switch is found */
-	option_found_callback_f call_when_found;
-	/* Long description for the help messages */
-	char *descript;
-};
-
-#define ARG_TABLE_ENDMARKER \
-	{false, false, false, NULL, NULL, 0, NULL, NULL, NULL}
-
-int cmd_is_option(const char *arg, const char *option, int with_value);
-int cmd_is_help_option(const char *arg);
-void cmd_read_option_value(const char *str, void *dest, const char type,
-			   const char *option);
-void cmd_args_set_defaults(struct args_struct_t args_struct[]);
-bool cmd_parse_one_arg(char *argv, struct args_struct_t args_struct[]);
-void cmd_print_switches_help(struct args_struct_t args_struct[]);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CMDLINE_COMMON_H */
diff --git a/boards/native/native_posix/cpu_wait.c b/boards/native/native_posix/cpu_wait.c
deleted file mode 100644
index c6464bcf7ead6..0000000000000
--- a/boards/native/native_posix/cpu_wait.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2020 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdbool.h>
-#include "timer_model.h"
-#include <zephyr/arch/posix/posix_soc_if.h>
-#include <posix_board_if.h>
-#include <posix_soc.h>
-
-/**
- * Replacement to the kernel k_busy_wait()
- * Will block this thread (and therefore the whole Zephyr) during usec_to_wait
- *
- * Note that interrupts may be received in the meanwhile and that therefore this
- * thread may lose context.
- * Therefore the wait time may be considerably longer.
- *
- * All this function ensures is that it will return after usec_to_wait or later.
- *
- * This special arch_busy_wait() is necessary due to how the POSIX arch/SOC INF
- * models a CPU. Conceptually it could be thought as if the MCU was running
- * at an infinitely high clock, and therefore no simulated time passes while
- * executing instructions(*1).
- * Therefore to be able to busy wait this function does the equivalent of
- * programming a dedicated timer which will raise a non-maskable interrupt,
- * and halting the CPU.
- *
- * (*1) In reality simulated time is simply not advanced just due to the "MCU"
- * running. Meaning, the SW running on the MCU is assumed to take 0 time.
- */
-void arch_busy_wait(uint32_t usec_to_wait)
-{
-	uint64_t time_end = hwm_get_time() + usec_to_wait;
-
-	while (hwm_get_time() < time_end) {
-		/*
-		 * There may be wakes due to other interrupts including
-		 * other threads calling arch_busy_wait
-		 */
-		hwtimer_wake_in_time(time_end);
-		posix_halt_cpu();
-	}
-}
-
-/**
- * Will block this thread (and therefore the whole Zephyr) during usec_to_waste
- *
- * Very similar to arch_busy_wait(), but if an interrupt or context switch
- * occurs this function will continue waiting after, ensuring that
- * usec_to_waste are spent in this context, irrespectively of how much more
- * time would be spent on interrupt handling or possible switched-in tasks.
- *
- * Can be used to emulate code execution time.
- */
-void posix_cpu_hold(uint32_t usec_to_waste)
-{
-	uint64_t time_start;
-	int64_t to_wait = usec_to_waste;
-
-	while (to_wait > 0) {
-		/*
-		 * There may be wakes due to other interrupts or nested calls to
-		 * cpu_hold in interrupt handlers
-		 */
-		time_start = hwm_get_time();
-		hwtimer_wake_in_time(time_start + to_wait);
-		posix_change_cpu_state_and_wait(true);
-		to_wait -= hwm_get_time() - time_start;
-
-		posix_irq_handler();
-	}
-}
diff --git a/boards/native/native_posix/doc/index.rst b/boards/native/native_posix/doc/index.rst
deleted file mode 100644
index ea53463a7ff0f..0000000000000
--- a/boards/native/native_posix/doc/index.rst
+++ /dev/null
@@ -1,96 +0,0 @@
-.. _native_posix:
-
-Native POSIX execution (native_posix)
-#######################################
-
-.. contents::
-   :depth: 1
-   :backlinks: entry
-   :local:
-
-Overview
-********
-
-.. warning::
-   ``native_posix`` is deprecated in favour of :ref:`native_sim<native_sim>`, and will be removed
-   in the 4.2 release.
-
-.. note::
-   For native_posix users, if needed, :ref:`native_sim<native_sim>` includes a compatibility mode
-   :kconfig:option:`CONFIG_NATIVE_SIM_NATIVE_POSIX_COMPAT`,
-   which will set its configuration to mimic a native_posix-like configuration.
-
-``native_posix`` is the predecessor of :ref:`native_sim<native_sim>`.
-Just like with :ref:`native_sim<native_sim>` you can build your Zephyr application
-with the Zephyr kernel, creating a normal Linux executable with your host tooling,
-and can debug and instrument it like any other Linux program.
-
-But unlike with :ref:`native_sim<native_sim>` you are limited to only using the host C library.
-:ref:`native_sim<native_sim>` supports all ``native_posix`` use cases.
-
-This board does not intend to simulate any particular HW, but it provides
-a few peripherals such as an Ethernet driver, display, UART, etc., to enable
-developing and testing application code which would require them.
-This board supports the same :ref:`peripherals<native_sim_peripherals>`
-:ref:`and backends as native_sim<native_sim_backends>`.
-
-.. _native_posix_deps:
-
-Host system dependencies
-************************
-
-Please check the
-:ref:`Posix Arch Dependencies<posix_arch_deps>`
-
-.. _native_important_limitations:
-
-Important limitations
-*********************
-
-This board inherits
-:ref:`the limitations of its architecture<posix_arch_limitations>`
-
-Moreover, being limited to build only with the host C library, it is not possible to build
-applications with the :ref:`Zephyr POSIX OS abstraction<posix_support>`, as there would be symbol
-collisions between the host OS and this abstraction layer.
-
-.. _native_posix_how_to_use:
-
-How to use it
-*************
-
-To build, simply specify the ``native_posix`` board as target:
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :host-os: unix
-   :board: native_posix
-   :goals: build
-   :compact:
-
-Now you have a Linux executable, ``./build/zephyr/zephyr.exe``, you can use just like any
-other Linux program.
-
-You can run, debug, build it with sanitizers or with coverage just like with
-:ref:`native_sim<native_sim>`.
-Please check :ref:`native_sim's how to<native_sim_how_to_use>` for more info.
-
-.. _native_posix32_64:
-
-32 and 64bit versions
-*********************
-
-Just like :ref:`native_sim<native_sim>`, ``native_posix`` comes with two targets:
-A 32 bit and 64 bit version.
-The 32 bit version, ``native_posix``, is the default target, which will compile
-your code for the ILP32 ABI (i386 in a x86 or x86_64 system) where pointers
-and longs are 32 bits.
-This mimics the ABI of most embedded systems Zephyr targets,
-and is therefore normally best to test and debug your code, as some bugs are
-dependent on the size of pointers and longs.
-This target requires either a 64 bit system with multilib support installed or
-one with a 32bit userspace.
-
-The 64 bit version, ``native_posix/native/64``, compiles your code targeting the
-LP64 ABI (x86-64 in x86 systems), where pointers and longs are 64 bits.
-You can use this target if you cannot compile or run 32 bit binaries.
diff --git a/boards/native/native_posix/hw_counter.c b/boards/native/native_posix/hw_counter.c
deleted file mode 100644
index eb02fd0080798..0000000000000
--- a/boards/native/native_posix/hw_counter.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2020 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include "hw_models_top.h"
-#include "board_soc.h"
-#include "board_irq.h"
-#include "irq_ctrl.h"
-
-uint64_t hw_counter_timer;
-
-static bool counter_running;
-static uint64_t counter_value;
-static uint64_t counter_target;
-static uint64_t counter_period;
-static uint64_t counter_wrap;
-
-/**
- * Initialize the counter with prescaler of HW
- */
-void hw_counter_init(void)
-{
-	hw_counter_timer = NEVER;
-	counter_target = NEVER;
-	counter_value = 0;
-	counter_running = false;
-	counter_period = NEVER;
-	counter_wrap = NEVER;
-}
-
-void hw_counter_triggered(void)
-{
-	if (!counter_running) {
-		hw_counter_timer = NEVER;
-		return;
-	}
-
-	hw_counter_timer = hwm_get_time() + counter_period;
-	counter_value = (counter_value + 1) % counter_wrap;
-
-	if (counter_value == counter_target) {
-		hw_irq_ctrl_set_irq(COUNTER_EVENT_IRQ);
-	}
-}
-
-/**
- * Configures the counter period.
- * The counter will be incremented every 'period' microseconds.
- */
-void hw_counter_set_period(uint64_t period)
-{
-	counter_period = period;
-}
-
-/*
- * Set the count value at which the counter will wrap
- * The counter will count up to  (counter_wrap-1), i.e.:
- * 0, 1, 2,.., (counter_wrap - 1), 0
- */
-void hw_counter_set_wrap_value(uint64_t wrap_value)
-{
-	counter_wrap = wrap_value;
-}
-
-/**
- * Starts the counter. It must be previously configured with
- * hw_counter_set_period() and hw_counter_set_target().
- */
-void hw_counter_start(void)
-{
-	if (counter_running) {
-		return;
-	}
-
-	counter_running = true;
-
-	hw_counter_timer = hwm_get_time() + counter_period;
-	hwm_find_next_timer();
-}
-
-/**
- * Stops the counter at current value.
- * On the next call to hw_counter_start, the counter will
- * start from the value at which it was stopped.
- */
-void hw_counter_stop(void)
-{
-	counter_running = false;
-	hw_counter_timer = NEVER;
-	hwm_find_next_timer();
-}
-
-bool hw_counter_is_started(void)
-{
-	return counter_running;
-}
-
-/**
- * Returns the current counter value.
- */
-uint64_t hw_counter_get_value(void)
-{
-	return counter_value;
-}
-
-/**
- * Resets the counter value.
- */
-void hw_counter_reset(void)
-{
-	counter_value = 0;
-}
-
-/**
- * Configures the counter to generate an interrupt
- * when its count value reaches target.
- */
-void hw_counter_set_target(uint64_t target)
-{
-	counter_target = target;
-}
diff --git a/boards/native/native_posix/hw_counter.h b/boards/native/native_posix/hw_counter.h
deleted file mode 100644
index efbb7e39e293f..0000000000000
--- a/boards/native/native_posix/hw_counter.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2020 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NATIVE_POSIX_HW_COUNTER_H
-#define _NATIVE_POSIX_HW_COUNTER_H
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void hw_counter_init(void);
-void hw_counter_triggered(void);
-
-void hw_counter_set_period(uint64_t period);
-void hw_counter_set_target(uint64_t counter_target);
-void hw_counter_set_wrap_value(uint64_t wrap_value);
-void hw_counter_start(void);
-void hw_counter_stop(void);
-bool hw_counter_is_started(void);
-uint64_t hw_counter_get_value(void);
-void hw_counter_reset(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NATIVE_POSIX_HW_COUNTER_H */
diff --git a/boards/native/native_posix/hw_models_top.c b/boards/native/native_posix/hw_models_top.c
deleted file mode 100644
index ba2f7d6584c32..0000000000000
--- a/boards/native/native_posix/hw_models_top.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Reduced set of HW models sufficient to run some of the sample apps
- * and regression tests
- */
-
-#include <stdint.h>
-#include <signal.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include "hw_models_top.h"
-#include "timer_model.h"
-#include "irq_ctrl.h"
-#include "posix_board_if.h"
-#include "hw_counter.h"
-#include <zephyr/arch/posix/posix_soc_if.h>
-#include "posix_arch_internal.h"
-#include <zephyr/sys/util.h>
-
-
-static uint64_t simu_time; /* The actual time as known by the HW models */
-static uint64_t end_of_time = NEVER; /* When will this device stop */
-
-/* List of HW model timers: */
-extern uint64_t hw_timer_timer; /* When should this timer_model be called */
-extern uint64_t irq_ctrl_timer;
-extern uint64_t hw_counter_timer;
-
-static enum {
-	HWTIMER = 0,
-	IRQCNT,
-	HW_COUNTER,
-	NUMBER_OF_TIMERS,
-	NONE
-} next_timer_index = NONE;
-
-static uint64_t *Timer_list[NUMBER_OF_TIMERS] = {
-	&hw_timer_timer,
-	&irq_ctrl_timer,
-	&hw_counter_timer,
-};
-
-static uint64_t next_timer_time;
-
-/* Have we received a SIGTERM or SIGINT */
-static volatile sig_atomic_t signaled_end;
-
-/**
- * Handler for SIGTERM and SIGINT
- */
-void hwm_signal_end_handler(int sig)
-{
-	signaled_end = 1;
-}
-
-/**
- * Set the handler for SIGTERM and SIGINT which will cause the
- * program to exit gracefully when they are received the 1st time
- *
- * Note that our handler only sets a variable indicating the signal was
- * received, and in each iteration of the hw main loop this variable is
- * evaluated.
- * If for some reason (the program is stuck) we never evaluate it, the program
- * would never exit.
- * Therefore we set SA_RESETHAND: This way, the 2nd time the signal is received
- * the default handler would be called to terminate the program no matter what.
- *
- * Note that SA_RESETHAND requires either _POSIX_C_SOURCE>=200809L or
- * _XOPEN_SOURCE>=500
- */
-void hwm_set_sig_handler(void)
-{
-	struct sigaction act;
-
-	act.sa_handler = hwm_signal_end_handler;
-	PC_SAFE_CALL(sigemptyset(&act.sa_mask));
-
-	act.sa_flags = SA_RESETHAND;
-
-	PC_SAFE_CALL(sigaction(SIGTERM, &act, NULL));
-	PC_SAFE_CALL(sigaction(SIGINT, &act, NULL));
-}
-
-
-static void hwm_sleep_until_next_timer(void)
-{
-	if (next_timer_time >= simu_time) { /* LCOV_EXCL_BR_LINE */
-		simu_time = next_timer_time;
-	} else {
-		/* LCOV_EXCL_START */
-		posix_print_warning("next_timer_time corrupted (%"PRIu64"<= %"
-				PRIu64", timer idx=%i)\n",
-				(uint64_t)next_timer_time,
-				(uint64_t)simu_time,
-				next_timer_index);
-		/* LCOV_EXCL_STOP */
-	}
-
-	if (signaled_end || (simu_time > end_of_time)) {
-		posix_print_trace("\nStopped at %.3Lfs\n",
-				((long double)simu_time)/1.0e6L);
-		posix_exit(0);
-	}
-}
-
-
-/**
- * Find in between all timers which is the next one
- * and update  next_timer_* accordingly
- */
-void hwm_find_next_timer(void)
-{
-	next_timer_index = 0;
-	next_timer_time  = *Timer_list[0];
-
-	for (unsigned int i = 1; i < NUMBER_OF_TIMERS ; i++) {
-		if (next_timer_time > *Timer_list[i]) {
-			next_timer_index = i;
-			next_timer_time = *Timer_list[i];
-		}
-	}
-}
-
-/**
- * Execute the next scheduled HW event/timer
- */
-void hwm_one_event(void)
-{
-	hwm_sleep_until_next_timer();
-
-	switch (next_timer_index) { /* LCOV_EXCL_BR_LINE */
-	case HWTIMER:
-		hwtimer_timer_reached();
-		break;
-	case IRQCNT:
-		hw_irq_ctrl_timer_triggered();
-		break;
-	case HW_COUNTER:
-		hw_counter_triggered();
-		break;
-	default:
-		/* LCOV_EXCL_START */
-		posix_print_error_and_exit(
-					   "next_timer_index corrupted\n");
-		break;
-		/* LCOV_EXCL_STOP */
-	}
-
-	hwm_find_next_timer();
-}
-
-/**
- * Set the simulated time when the process will stop
- */
-void hwm_set_end_of_time(uint64_t new_end_of_time)
-{
-	end_of_time = new_end_of_time;
-}
-
-/**
- * Return the current time as known by the device
- */
-uint64_t hwm_get_time(void)
-{
-	return simu_time;
-}
-
-uint64_t posix_get_hw_cycle(void)
-{
-	return hwm_get_time();
-}
-
-/**
- * Function to initialize the HW models
- */
-void hwm_init(void)
-{
-	hwm_set_sig_handler();
-	hwtimer_init();
-	hw_counter_init();
-	hw_irq_ctrl_init();
-
-	hwm_find_next_timer();
-}
-
-/**
- * Function to free any resources allocated by the HW models
- * Note that this function needs to be designed so it is possible
- * to call it more than once during cleanup
- */
-void hwm_cleanup(void)
-{
-	hwtimer_cleanup();
-	hw_irq_ctrl_cleanup();
-}
diff --git a/boards/native/native_posix/hw_models_top.h b/boards/native/native_posix/hw_models_top.h
deleted file mode 100644
index ea50d0f949c7b..0000000000000
--- a/boards/native/native_posix/hw_models_top.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NATIVE_POSIX_HW_MODELS_H
-#define _NATIVE_POSIX_HW_MODELS_H
-
-#include <zephyr/types.h>
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NEVER UINT64_MAX
-#define NSI_NEVER UINT64_MAX
-
-void hwm_one_event(void);
-void hwm_init(void);
-void hwm_cleanup(void);
-void hwm_set_end_of_time(uint64_t new_end_of_time);
-uint64_t hwm_get_time(void);
-void hwm_find_next_timer(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NATIVE_POSIX_HW_MODELS_H */
diff --git a/boards/native/native_posix/irq_ctrl.c b/boards/native/native_posix/irq_ctrl.c
deleted file mode 100644
index 6524e5123a432..0000000000000
--- a/boards/native/native_posix/irq_ctrl.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * HW IRQ controller model
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "hw_models_top.h"
-#include "irq_ctrl.h"
-#include "irq_handler.h"
-#include <zephyr/arch/posix/arch.h> /* for find_lsb_set() */
-#include "board_soc.h"
-#include "posix_soc.h"
-#include <zephyr/types.h>
-
-uint64_t irq_ctrl_timer = NEVER;
-
-
-static uint64_t irq_status;  /* pending interrupts */
-static uint64_t irq_premask; /* interrupts before the mask */
-
-/*
- * Mask of which interrupts will actually cause the cpu to vector into its
- * irq handler
- * If an interrupt is masked in this way, it will be pending in the premask in
- * case it is enabled later before clearing it.
- * If the irq_mask enables and interrupt pending in irq_premask, it will cause
- * the controller to raise the interrupt immediately
- */
-static uint64_t irq_mask;
-
-/*
- * Interrupts lock/disable. When set, interrupts are registered
- * (in the irq_status) but do not awake the cpu. if when unlocked,
- * irq_status != 0 an interrupt will be raised immediately
- */
-static bool irqs_locked;
-static bool lock_ignore; /* For the hard fake IRQ, temporarily ignore lock */
-
-static uint8_t irq_prio[N_IRQS]; /* Priority of each interrupt */
-/* note that prio = 0 == highest, prio=255 == lowest */
-
-static int currently_running_prio = 256; /* 255 is the lowest prio interrupt */
-
-void hw_irq_ctrl_init(void)
-{
-	irq_mask = 0U; /* Let's assume all interrupts are disable at boot */
-	irq_premask = 0U;
-	irqs_locked = false;
-	lock_ignore = false;
-
-	for (int i = 0 ; i < N_IRQS; i++) {
-		irq_prio[i] = 255U;
-	}
-}
-
-void hw_irq_ctrl_cleanup(void)
-{
-	/* Nothing to be done */
-}
-
-void hw_irq_ctrl_set_cur_prio(int new)
-{
-	currently_running_prio = new;
-}
-
-int hw_irq_ctrl_get_cur_prio(void)
-{
-	return currently_running_prio;
-}
-
-void hw_irq_ctrl_prio_set(unsigned int irq, unsigned int prio)
-{
-	irq_prio[irq] = prio;
-}
-
-uint8_t hw_irq_ctrl_get_prio(unsigned int irq)
-{
-	return irq_prio[irq];
-}
-
-/**
- * Get the currently pending highest priority interrupt which has a priority
- * higher than a possibly currently running interrupt
- *
- * If none, return -1
- */
-int hw_irq_ctrl_get_highest_prio_irq(void)
-{
-	if (irqs_locked) {
-		return -1;
-	}
-
-	uint64_t hw_irq_status = hw_irq_ctrl_get_irq_status();
-	int winner = -1;
-	int winner_prio = 256;
-
-	while (hw_irq_status != 0U) {
-		int irq_nbr = find_lsb_set(hw_irq_status) - 1;
-
-		hw_irq_status &= ~((uint64_t) 1 << irq_nbr);
-		if ((winner_prio > (int)irq_prio[irq_nbr])
-		   && (currently_running_prio > (int)irq_prio[irq_nbr])) {
-			winner = irq_nbr;
-			winner_prio = irq_prio[irq_nbr];
-		}
-	}
-	return winner;
-}
-
-
-uint32_t hw_irq_ctrl_get_current_lock(void)
-{
-	return irqs_locked;
-}
-
-uint32_t hw_irq_ctrl_change_lock(uint32_t new_lock)
-{
-	uint32_t previous_lock = irqs_locked;
-
-	irqs_locked = new_lock;
-
-	if ((previous_lock == true) && (new_lock == false)) {
-		if (irq_status != 0U) {
-			posix_irq_handler_im_from_sw();
-		}
-	}
-	return previous_lock;
-}
-
-uint64_t hw_irq_ctrl_get_irq_status(void)
-{
-	return irq_status;
-}
-
-void hw_irq_ctrl_clear_all_enabled_irqs(void)
-{
-	irq_status  = 0U;
-	irq_premask &= ~irq_mask;
-}
-
-void hw_irq_ctrl_clear_all_irqs(void)
-{
-	irq_status  = 0U;
-	irq_premask = 0U;
-}
-
-void hw_irq_ctrl_disable_irq(unsigned int irq)
-{
-	irq_mask &= ~((uint64_t)1<<irq);
-}
-
-int hw_irq_ctrl_is_irq_enabled(unsigned int irq)
-{
-	return (irq_mask & ((uint64_t)1 << irq))?1:0;
-}
-
-uint64_t hw_irq_ctrl_get_irq_mask(void)
-{
-	return irq_mask;
-}
-
-void hw_irq_ctrl_clear_irq(unsigned int irq)
-{
-	irq_status  &= ~((uint64_t)1<<irq);
-	irq_premask &= ~((uint64_t)1<<irq);
-}
-
-
-/**
- * Enable an interrupt
- *
- * This function may only be called from SW threads
- *
- * If the enabled interrupt is pending, it will immediately vector to its
- * interrupt handler and continue (maybe with some swap() before)
- */
-void hw_irq_ctrl_enable_irq(unsigned int irq)
-{
-	irq_mask |= ((uint64_t)1<<irq);
-	if (irq_premask & ((uint64_t)1<<irq)) { /* if IRQ is pending */
-		hw_irq_ctrl_raise_im_from_sw(irq);
-	}
-}
-
-
-static inline void hw_irq_ctrl_irq_raise_prefix(unsigned int irq)
-{
-	if (irq < N_IRQS) {
-		irq_premask |= ((uint64_t)1<<irq);
-
-		if (irq_mask & (1 << irq)) {
-			irq_status |= ((uint64_t)1<<irq);
-		}
-	} else if (irq == PHONY_HARD_IRQ) {
-		lock_ignore = true;
-	}
-}
-
-/**
- * Set/Raise an interrupt
- *
- * This function is meant to be used by either the SW manual IRQ raising
- * or by HW which wants the IRQ to be raised in one delta cycle from now
- */
-void hw_irq_ctrl_set_irq(unsigned int irq)
-{
-	hw_irq_ctrl_irq_raise_prefix(irq);
-	if ((irqs_locked == false) || (lock_ignore)) {
-		/*
-		 * Awake CPU in 1 delta
-		 * Note that we awake the CPU even if the IRQ is disabled
-		 * => we assume the CPU is always idling in a WFE() like
-		 * instruction and the CPU is allowed to awake just with the irq
-		 * being marked as pending
-		 */
-		irq_ctrl_timer = hwm_get_time();
-		hwm_find_next_timer();
-	}
-}
-
-
-
-static void irq_raising_from_hw_now(void)
-{
-	/*
-	 * We always awake the CPU even if the IRQ was masked,
-	 * but not if irqs are locked unless this is due to a
-	 * PHONY_HARD_IRQ
-	 */
-	if ((irqs_locked == false) || (lock_ignore)) {
-		lock_ignore = false;
-		posix_interrupt_raised();
-	}
-}
-
-/**
- * Set/Raise an interrupt immediately.
- * Like hw_irq_ctrl_set_irq() but awake immediately the CPU instead of in
- * 1 delta cycle
- *
- * Call only from HW threads
- */
-void hw_irq_ctrl_raise_im(unsigned int irq)
-{
-	hw_irq_ctrl_irq_raise_prefix(irq);
-	irq_raising_from_hw_now();
-}
-
-/**
- * Like hw_irq_ctrl_raise_im() but for SW threads
- *
- * Call only from SW threads
- */
-void hw_irq_ctrl_raise_im_from_sw(unsigned int irq)
-{
-	hw_irq_ctrl_irq_raise_prefix(irq);
-
-	if (irqs_locked == false) {
-		posix_irq_handler_im_from_sw();
-	}
-}
-
-void hw_irq_ctrl_timer_triggered(void)
-{
-	irq_ctrl_timer = NEVER;
-	irq_raising_from_hw_now();
-}
diff --git a/boards/native/native_posix/irq_ctrl.h b/boards/native/native_posix/irq_ctrl.h
deleted file mode 100644
index cd5dcbea066d9..0000000000000
--- a/boards/native/native_posix/irq_ctrl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NATIVE_POSIX_IRQ_CTRL_H
-#define _NATIVE_POSIX_IRQ_CTRL_H
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void hw_irq_ctrl_init(void);
-void hw_irq_ctrl_cleanup(void);
-void hw_irq_ctrl_timer_triggered(void);
-
-void hw_irq_ctrl_set_cur_prio(int new);
-int hw_irq_ctrl_get_cur_prio(void);
-
-void hw_irq_ctrl_prio_set(unsigned int irq, unsigned int prio);
-uint8_t hw_irq_ctrl_get_prio(unsigned int irq);
-
-int hw_irq_ctrl_get_highest_prio_irq(void);
-uint32_t hw_irq_ctrl_get_current_lock(void);
-uint32_t hw_irq_ctrl_change_lock(uint32_t new_lock);
-uint64_t hw_irq_ctrl_get_irq_status(void);
-void hw_irq_ctrl_disable_irq(unsigned int irq);
-int hw_irq_ctrl_is_irq_enabled(unsigned int irq);
-void hw_irq_ctrl_clear_irq(unsigned int irq);
-void hw_irq_ctrl_enable_irq(unsigned int irq);
-void hw_irq_ctrl_set_irq(unsigned int irq);
-void hw_irq_ctrl_raise_im(unsigned int irq);
-void hw_irq_ctrl_raise_im_from_sw(unsigned int irq);
-
-
-#define N_IRQS 32
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NATIVE_POSIX_IRQ_CTRL_H */
diff --git a/boards/native/native_posix/irq_handler.c b/boards/native/native_posix/irq_handler.c
deleted file mode 100644
index 206bf319d4ad5..0000000000000
--- a/boards/native/native_posix/irq_handler.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright (c) 2014 Wind River Systems, Inc.
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SW side of the IRQ handling
- */
-
-#include <stdint.h>
-#include "irq_handler.h"
-#include <zephyr/irq_offload.h>
-#include <zephyr/kernel_structs.h>
-#include "kernel_internal.h"
-#include "kswap.h"
-#include "irq_ctrl.h"
-#include "posix_core.h"
-#include "board_soc.h"
-#include <zephyr/sw_isr_table.h>
-#include "soc.h"
-#include <zephyr/tracing/tracing.h>
-
-typedef void (*normal_irq_f_ptr)(const void *);
-typedef int (*direct_irq_f_ptr)(void);
-
-typedef struct _isr_list isr_table_entry_t;
-static isr_table_entry_t irq_vector_table[N_IRQS] = { { 0 } };
-
-static int currently_running_irq = -1;
-
-static inline void vector_to_irq(int irq_nbr, int *may_swap)
-{
-	sys_trace_isr_enter();
-
-	if (irq_vector_table[irq_nbr].func == NULL) { /* LCOV_EXCL_BR_LINE */
-		/* LCOV_EXCL_START */
-		posix_print_error_and_exit("Received irq %i without a "
-					"registered handler\n",
-					irq_nbr);
-		/* LCOV_EXCL_STOP */
-	} else {
-		if (irq_vector_table[irq_nbr].flags & ISR_FLAG_DIRECT) {
-			*may_swap |= ((direct_irq_f_ptr)
-					irq_vector_table[irq_nbr].func)();
-		} else {
-#ifdef CONFIG_PM
-			posix_irq_check_idle_exit();
-#endif
-			((normal_irq_f_ptr)irq_vector_table[irq_nbr].func)
-					(irq_vector_table[irq_nbr].param);
-			*may_swap = 1;
-		}
-	}
-
-	sys_trace_isr_exit();
-}
-
-/**
- * When an interrupt is raised, this function is called to handle it and, if
- * needed, swap to a re-enabled thread
- *
- * Note that even that this function is executing in a Zephyr thread,  it is
- * effectively the model of the interrupt controller passing context to the IRQ
- * handler and therefore its priority handling
- */
-void posix_irq_handler(void)
-{
-	uint64_t irq_lock;
-	int irq_nbr;
-	static int may_swap;
-
-	irq_lock = hw_irq_ctrl_get_current_lock();
-
-	if (irq_lock) {
-		/* "spurious" wakes can happen with interrupts locked */
-		return;
-	}
-
-	if (_kernel.cpus[0].nested == 0) {
-		may_swap = 0;
-	}
-
-	_kernel.cpus[0].nested++;
-
-	while ((irq_nbr = hw_irq_ctrl_get_highest_prio_irq()) != -1) {
-		int last_current_running_prio = hw_irq_ctrl_get_cur_prio();
-		int last_running_irq = currently_running_irq;
-
-		hw_irq_ctrl_set_cur_prio(hw_irq_ctrl_get_prio(irq_nbr));
-		hw_irq_ctrl_clear_irq(irq_nbr);
-
-		currently_running_irq = irq_nbr;
-		vector_to_irq(irq_nbr, &may_swap);
-		currently_running_irq = last_running_irq;
-
-		hw_irq_ctrl_set_cur_prio(last_current_running_prio);
-	}
-
-	_kernel.cpus[0].nested--;
-
-	/* Call swap if all the following is true:
-	 * 1) may_swap was enabled
-	 * 2) We are not nesting irq_handler calls (interrupts)
-	 * 3) Next thread to run in the ready queue is not this thread
-	 */
-	if (may_swap
-		&& (hw_irq_ctrl_get_cur_prio() == 256)
-		&& (_kernel.ready_q.cache) && (_kernel.ready_q.cache != _current)) {
-
-		(void)z_swap_irqlock(irq_lock);
-	}
-}
-
-/**
- * Thru this function the IRQ controller can raise an immediate  interrupt which
- * will interrupt the SW itself
- * (this function should only be called from the HW model code, from SW threads)
- */
-void posix_irq_handler_im_from_sw(void)
-{
-	/*
-	 * if a higher priority interrupt than the possibly currently running is
-	 * pending we go immediately into irq_handler() to vector into its
-	 * handler
-	 */
-	if (hw_irq_ctrl_get_highest_prio_irq() != -1) {
-		if (!posix_is_cpu_running()) { /* LCOV_EXCL_BR_LINE */
-			/* LCOV_EXCL_START */
-			posix_print_error_and_exit("programming error: %s "
-					"called from a HW model thread\n",
-					__func__);
-			/* LCOV_EXCL_STOP */
-		}
-		posix_irq_handler();
-	}
-}
-
-/**
- * @brief Disable all interrupts on the CPU
- *
- * This routine disables interrupts.  It can be called from either interrupt,
- * task or fiber level.  This routine returns an architecture-dependent
- * lock-out key representing the "interrupt disable state" prior to the call;
- * this key can be passed to irq_unlock() to re-enable interrupts.
- *
- * The lock-out key should only be used as the argument to the irq_unlock()
- * API. It should never be used to manually re-enable interrupts or to inspect
- * or manipulate the contents of the source register.
- *
- * This function can be called recursively: it will return a key to return the
- * state of interrupt locking to the previous level.
- *
- * WARNINGS
- * Invoking a kernel routine with interrupts locked may result in
- * interrupts being re-enabled for an unspecified period of time.  If the
- * called routine blocks, interrupts will be re-enabled while another
- * thread executes, or while the system is idle.
- *
- * The "interrupt disable state" is an attribute of a thread.  Thus, if a
- * fiber or task disables interrupts and subsequently invokes a kernel
- * routine that causes the calling thread to block, the interrupt
- * disable state will be restored when the thread is later rescheduled
- * for execution.
- *
- * @return An architecture-dependent lock-out key representing the
- * "interrupt disable state" prior to the call.
- *
- */
-unsigned int posix_irq_lock(void)
-{
-	return hw_irq_ctrl_change_lock(true);
-}
-
-/**
- * @brief Enable all interrupts on the CPU
- *
- * This routine re-enables interrupts on the CPU.  The @a key parameter is a
- * board-dependent lock-out key that is returned by a previous invocation of
- * board_irq_lock().
- *
- * This routine can be called from either interrupt, task or fiber level.
- */
-void posix_irq_unlock(unsigned int key)
-{
-	hw_irq_ctrl_change_lock(key);
-}
-
-void posix_irq_full_unlock(void)
-{
-	hw_irq_ctrl_change_lock(false);
-}
-
-void posix_irq_enable(unsigned int irq)
-{
-	hw_irq_ctrl_enable_irq(irq);
-}
-
-void posix_irq_disable(unsigned int irq)
-{
-	hw_irq_ctrl_disable_irq(irq);
-}
-
-int posix_irq_is_enabled(unsigned int irq)
-{
-	return hw_irq_ctrl_is_irq_enabled(irq);
-}
-
-int posix_get_current_irq(void)
-{
-	return currently_running_irq;
-}
-
-/**
- * Configure a static interrupt.
- *
- * posix_isr_declare will populate the interrupt table table with the
- * interrupt's parameters, the vector table and the software ISR table.
- *
- * We additionally set the priority in the interrupt controller at
- * runtime.
- *
- * @param irq_p IRQ line number
- * @param flags [plug it directly (1), or as a SW managed interrupt (0)]
- * @param isr_p Interrupt service routine
- * @param isr_param_p ISR parameter
- * @param flags_p IRQ options
- */
-void posix_isr_declare(unsigned int irq_p, int flags, void isr_p(const void *),
-		       const void *isr_param_p)
-{
-	if (irq_p >= N_IRQS) {
-		posix_print_error_and_exit("Attempted to configure not existent interrupt %u\n",
-					   irq_p);
-		return;
-	}
-	irq_vector_table[irq_p].irq   = irq_p;
-	irq_vector_table[irq_p].func  = isr_p;
-	irq_vector_table[irq_p].param = isr_param_p;
-	irq_vector_table[irq_p].flags = flags;
-}
-
-/**
- * @internal
- *
- * @brief Set an interrupt's priority
- *
- * Lower values take priority over higher values.
- */
-void posix_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
-{
-	if (irq >= N_IRQS) {
-		posix_print_error_and_exit("Attempted to configure not existent interrupt %u\n",
-					   irq);
-		return;
-	}
-	hw_irq_ctrl_prio_set(irq, prio);
-}
-
-/**
- * Similar to ARM's NVIC_SetPendingIRQ
- * set a pending IRQ from SW
- *
- * Note that this will interrupt immediately if the interrupt is not masked and
- * IRQs are not locked, and this interrupt has higher priority than a possibly
- * currently running interrupt
- */
-void posix_sw_set_pending_IRQ(unsigned int IRQn)
-{
-	hw_irq_ctrl_raise_im_from_sw(IRQn);
-}
-
-/**
- * Similar to ARM's NVIC_ClearPendingIRQ
- * clear a pending irq from SW
- */
-void posix_sw_clear_pending_IRQ(unsigned int IRQn)
-{
-	hw_irq_ctrl_clear_irq(IRQn);
-}
-
-#ifdef CONFIG_IRQ_OFFLOAD
-/**
- * Storage for functions offloaded to IRQ
- */
-static void (*off_routine)(const void *);
-static const void *off_parameter;
-
-/**
- * IRQ handler for the SW interrupt assigned to irq_offload()
- */
-static void offload_sw_irq_handler(const void *a)
-{
-	ARG_UNUSED(a);
-	off_routine(off_parameter);
-}
-
-/**
- * @brief Run a function in interrupt context
- *
- * Raise the SW IRQ assigned to handled this
- */
-void posix_irq_offload(void (*routine)(const void *), const void *parameter)
-{
-	off_routine = routine;
-	off_parameter = parameter;
-	posix_isr_declare(OFFLOAD_SW_IRQ, 0, offload_sw_irq_handler, NULL);
-	posix_irq_enable(OFFLOAD_SW_IRQ);
-	posix_sw_set_pending_IRQ(OFFLOAD_SW_IRQ);
-	posix_irq_disable(OFFLOAD_SW_IRQ);
-}
-#endif /* CONFIG_IRQ_OFFLOAD */
diff --git a/boards/native/native_posix/irq_handler.h b/boards/native/native_posix/irq_handler.h
deleted file mode 100644
index 3425182369dde..0000000000000
--- a/boards/native/native_posix/irq_handler.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NATIVE_POSIX_IRQ_HANDLER_H
-#define _NATIVE_POSIX_IRQ_HANDLER_H
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-void posix_irq_handler_im_from_sw(void);
-void posix_sw_set_pending_IRQ(unsigned int IRQn);
-void posix_sw_clear_pending_IRQ(unsigned int IRQn);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NATIVE_POSIX_IRQ_HANDLER_H */
diff --git a/boards/native/native_posix/main.c b/boards/native/native_posix/main.c
deleted file mode 100644
index f68f4dbf0e38b..0000000000000
--- a/boards/native/native_posix/main.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * The basic principle of operation is:
- *   No asynchronous behavior, no indeterminism.
- *   If you run the same thing 20 times, you get exactly the same result 20
- *   times.
- *   It does not matter if you are running from console, or in a debugger
- *   and you go for lunch in the middle of the debug session.
- *
- * This is achieved as follows:
- *  The execution of native_posix is decoupled from the underlying host and its
- *  peripherals (unless set otherwise).
- *  In general, time in native_posix is simulated.
- *
- * But, native_posix can also be linked if desired to the underlying host,
- * e.g.:You can use the provided Ethernet TAP driver, or a host BLE controller.
- *
- * In this case, the no-indeterminism principle is lost. Runs of native_posix
- * will depend on the host load and the interactions with those real host
- * peripherals.
- *
- */
-
-#include <stdio.h>
-#include <soc.h>
-#include "hw_models_top.h"
-#include <stdlib.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/time_units.h>
-#include "cmdline.h"
-#include "irq_ctrl.h"
-
-void posix_exit(int exit_code)
-{
-	static int max_exit_code;
-
-	max_exit_code = MAX(exit_code, max_exit_code);
-	/*
-	 * posix_soc_clean_up may not return if this is called from a SW thread,
-	 * but instead it would get posix_exit() recalled again
-	 * ASAP from the HW thread
-	 */
-	posix_soc_clean_up();
-	hwm_cleanup();
-	native_cleanup_cmd_line();
-	exit(max_exit_code);
-}
-
-/**
- * Run all early native_posix initialization steps, including command
- * line parsing and CPU start, until we are ready to let the HW models
- * run via hwm_one_event()
- */
-void posix_init(int argc, char *argv[])
-{
-	/*
-	 * Let's ensure that even if we are redirecting to a file, we get stdout
-	 * and stderr line buffered (default for console)
-	 * Note that glibc ignores size. But just in case we set a reasonable
-	 * number in case somebody tries to compile against a different library
-	 */
-	setvbuf(stdout, NULL, _IOLBF, 512);
-	setvbuf(stderr, NULL, _IOLBF, 512);
-
-	run_native_tasks(_NATIVE_PRE_BOOT_1_LEVEL);
-
-	native_handle_cmd_line(argc, argv);
-
-	run_native_tasks(_NATIVE_PRE_BOOT_2_LEVEL);
-
-	hwm_init();
-
-	run_native_tasks(_NATIVE_PRE_BOOT_3_LEVEL);
-
-	posix_boot_cpu();
-
-	run_native_tasks(_NATIVE_FIRST_SLEEP_LEVEL);
-}
-
-/**
- * Execute the simulator for at least the specified timeout, then
- * return.  Note that this does not affect event timing, so the "next
- * event" may be significantly after the request if the hardware has
- * not been configured to e.g. send an interrupt when expected.
- */
-void posix_exec_for(uint64_t us)
-{
-	uint64_t start = hwm_get_time();
-
-	do {
-		hwm_one_event();
-	} while (hwm_get_time() < (start + us));
-}
-
-#ifndef CONFIG_ARCH_POSIX_LIBFUZZER
-
-/**
- * This is the actual host process main routine.  The Zephyr
- * application's main() is renamed via preprocessor trickery to avoid
- * collisions.
- *
- * Not used when building fuzz cases, as libfuzzer has its own main()
- * and calls the "OS" through a per-case fuzz test entry point.
- */
-int main(int argc, char *argv[])
-{
-	posix_init(argc, argv);
-	while (true) {
-		hwm_one_event();
-	}
-
-	/* This line should be unreachable */
-	return 1; /* LCOV_EXCL_LINE */
-}
-
-#endif
diff --git a/boards/native/native_posix/native_posix.dts b/boards/native/native_posix/native_posix.dts
deleted file mode 100644
index 74a3c30049b5c..0000000000000
--- a/boards/native/native_posix/native_posix.dts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "../native_sim/native_sim.dts"
diff --git a/boards/native/native_posix/native_posix.yaml b/boards/native/native_posix/native_posix.yaml
deleted file mode 100644
index 28601c1647e65..0000000000000
--- a/boards/native/native_posix/native_posix.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-identifier: native_posix
-name: Native 32-bit POSIX port
-type: native
-simulation:
-  - name: native
-arch: posix
-ram: 65536
-flash: 65536
-toolchain:
-  - host
-  - llvm
-supported:
-  - can
-  - counter
-  - display
-  - dma
-  - eeprom
-  - netif:eth
-  - usb_device
-  - adc
-  - i2c
-  - spi
-  - gpio
-  - rtc
-vendor: zephyr
diff --git a/boards/native/native_posix/native_posix_64.dts b/boards/native/native_posix/native_posix_64.dts
deleted file mode 100644
index 74a3c30049b5c..0000000000000
--- a/boards/native/native_posix/native_posix_64.dts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "../native_sim/native_sim.dts"
diff --git a/boards/native/native_posix/native_posix_64_defconfig b/boards/native/native_posix/native_posix_64_defconfig
deleted file mode 100644
index b0033eda61f9b..0000000000000
--- a/boards/native/native_posix/native_posix_64_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_CONSOLE=y
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
diff --git a/boards/native/native_posix/native_posix_defconfig b/boards/native/native_posix/native_posix_defconfig
deleted file mode 100644
index b0033eda61f9b..0000000000000
--- a/boards/native/native_posix/native_posix_defconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_CONSOLE=y
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
diff --git a/boards/native/native_posix/native_posix_native_64.yaml b/boards/native/native_posix/native_posix_native_64.yaml
deleted file mode 100644
index 5510fc9ac5095..0000000000000
--- a/boards/native/native_posix/native_posix_native_64.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-identifier: native_posix/native/64
-name: Native 64-bit POSIX port
-type: native
-simulation:
-  - name: native
-arch: posix
-ram: 65536
-flash: 65536
-toolchain:
-  - host
-  - llvm
-supported:
-  - can
-  - counter
-  - display
-  - dma
-  - eeprom
-  - netif:eth
-  - usb_device
-  - adc
-  - gpio
-  - rtc
-vendor: zephyr
diff --git a/boards/native/native_posix/native_rtc.c b/boards/native/native_posix/native_rtc.c
deleted file mode 100644
index efdd7752e1c6b..0000000000000
--- a/boards/native/native_posix/native_rtc.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * API to the native_posix (Real) Time Clock
- */
-
-#include "native_rtc.h"
-#include "hw_models_top.h"
-#include "timer_model.h"
-#include <zephyr/arch/posix/posix_trace.h>
-
-/**
- * Return the (simulation) time in microseconds
- * where clock_type is one of RTC_CLOCK_*
- */
-uint64_t native_rtc_gettime_us(int clock_type)
-{
-	if (clock_type == RTC_CLOCK_BOOT) {
-		return hwm_get_time();
-	} else if (clock_type == RTC_CLOCK_REALTIME) { /* RTC_CLOCK_REALTIME */
-		return hwtimer_get_simu_rtc_time();
-	} else if (clock_type == RTC_CLOCK_PSEUDOHOSTREALTIME) {
-		uint32_t nsec;
-		uint64_t sec;
-
-		hwtimer_get_pseudohost_rtc_time(&nsec, &sec);
-		return sec * 1000000UL + nsec / 1000U;
-	}
-
-	posix_print_error_and_exit("Unknown clock source %i\n",
-				   clock_type);
-	return 0;
-}
-
-/**
- * Similar to POSIX clock_gettime()
- * get the simulation time split in nsec and seconds
- * where clock_type is one of RTC_CLOCK_*
- */
-void native_rtc_gettime(int clock_type, uint32_t *nsec, uint64_t *sec)
-{
-	if (clock_type == RTC_CLOCK_BOOT || clock_type == RTC_CLOCK_REALTIME) {
-		uint64_t us = native_rtc_gettime_us(clock_type);
-		*nsec = (us % 1000000UL) * 1000U;
-		*sec  = us / 1000000UL;
-	} else { /* RTC_CLOCK_PSEUDOHOSTREALTIME */
-		hwtimer_get_pseudohost_rtc_time(nsec, sec);
-	}
-}
-
-/**
- * Offset the real time clock by a number of microseconds.
- * Note that this only affects the RTC_CLOCK_REALTIME and
- * RTC_CLOCK_PSEUDOHOSTREALTIME clocks.
- */
-void native_rtc_offset(int64_t delta_us)
-{
-	hwtimer_adjust_rtc_offset(delta_us);
-}
-
-/**
- * Adjust the speed of the clock source by a multiplicative factor
- */
-void native_rtc_adjust_clock(double clock_correction)
-{
-	hwtimer_adjust_rt_ratio(clock_correction);
-}
diff --git a/boards/native/native_posix/native_rtc.h b/boards/native/native_posix/native_rtc.h
deleted file mode 100644
index c17395448af8b..0000000000000
--- a/boards/native/native_posix/native_rtc.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief API to the native_posix (Real) Time Clock
- */
-
-
-#ifndef _NATIVE_POSIX_RTC_H
-#define _NATIVE_POSIX_RTC_H
-
-#include "hw_models_top.h"
-#include <stdbool.h>
-#include <zephyr/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Types of clocks this RTC provides:
- */
-/** Time since boot, cannot be offset. Microsecond resolution */
-#define RTC_CLOCK_BOOT               0
-/** Persistent clock, can be offset. Microsecond resolution */
-#define RTC_CLOCK_REALTIME           1
-/**
- * Pseudo-host real time clock (Please see documentation).
- * Nanosecond resolution
- */
-#define RTC_CLOCK_PSEUDOHOSTREALTIME 2
-
-/**
- * @brief Get the value of a clock in microseconds
- *
- * @param clock_type Which clock to measure from
- *
- * @return Number of microseconds
- */
-uint64_t native_rtc_gettime_us(int clock_type);
-
-/**
- * @brief Get the value of a clock split in nsec and seconds
- *
- * @param clock_type Which clock to measure from
- * @param nsec Pointer to store the nanoseconds
- * @param nsec Pointer to store the seconds
- */
-void native_rtc_gettime(int clock_type, uint32_t *nsec, uint64_t *sec);
-
-/**
- * @brief Offset the real time clock by a number of microseconds.
- * Note that this only affects the RTC_CLOCK_REALTIME and
- * RTC_CLOCK_PSEUDOHOSTREALTIME clocks.
- *
- * @param delta_us Number of microseconds to offset. The value is added to all
- * offsetable clocks.
- */
-void native_rtc_offset(int64_t delta_us);
-
-/**
- * @brief Adjust the speed of the clock source by a multiplicative factor
- *
- * @param clock_correction Factor by which to correct the clock speed
- */
-void native_rtc_adjust_clock(double clock_correction);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NATIVE_POSIX_RTC_H */
diff --git a/boards/native/native_posix/native_tracing.h b/boards/native/native_posix/native_tracing.h
deleted file mode 100644
index 6c84c78a4aa1f..0000000000000
--- a/boards/native/native_posix/native_tracing.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef NATIVE_TRACING_H
-#define NATIVE_TRACING_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void native_add_tracing_options(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NATIVE_TRACING_H */
diff --git a/boards/native/native_posix/timer_model.c b/boards/native/native_posix/timer_model.c
deleted file mode 100644
index 4927d1028c40c..0000000000000
--- a/boards/native/native_posix/timer_model.c
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * This provides a model of:
- *  - A system tick
- *  - A real time clock
- *  - A one shot HW timer which can be used to awake the CPU at a given time
- *  - The clock source for all of this, and therefore for native_posix
- *
- * Please see doc/board.rst for more information, specially sections:
- *  About time in native_posix
- *  Peripherals:
- *	Clock source, system tick and timer
- *	Real time clock
- */
-
-#include <stdint.h>
-#include <time.h>
-#include <stdbool.h>
-#include <math.h>
-#include "hw_models_top.h"
-#include "irq_ctrl.h"
-#include "board_soc.h"
-#include <zephyr/types.h>
-#include <zephyr/arch/posix/posix_trace.h>
-#include <zephyr/sys/util.h>
-#include "cmdline.h"
-#include "posix_native_task.h"
-
-#define DEBUG_NP_TIMER 0
-
-#if DEBUG_NP_TIMER
-
-/**
- * Helper function to convert a 64 bit time in microseconds into a string.
- * The format will always be: hh:mm:ss.ssssss\0
- *
- * Note: the caller has to allocate the destination buffer (at least 17 chars)
- */
-#include <stdio.h>
-static char *us_time_to_str(char *dest, uint64_t time)
-{
-	if (time != NEVER) {
-		unsigned int hour;
-		unsigned int minute;
-		unsigned int second;
-		unsigned int us;
-
-		hour   = (time / 3600U / 1000000U) % 24;
-		minute = (time / 60U / 1000000U) % 60;
-		second = (time / 1000000U) % 60;
-		us     = time % 1000000;
-
-		sprintf(dest, "%02u:%02u:%02u.%06u", hour, minute, second, us);
-	} else {
-		sprintf(dest, " NEVER/UNKNOWN ");
-
-	}
-	return dest;
-}
-#endif
-
-uint64_t hw_timer_timer;
-
-uint64_t hw_timer_tick_timer;
-uint64_t hw_timer_awake_timer;
-
-static uint64_t tick_p; /* Period of the ticker */
-static int64_t silent_ticks;
-
-static bool real_time_mode =
-#if defined(CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME)
-	true;
-#else
-	false;
-#endif
-
-static bool reset_rtc; /*"Reset" the RTC on boot*/
-
-/*
- * When this executable started running, this value shall not be changed after
- * boot
- */
-static uint64_t boot_time;
-
-/*
- * Ratio of the simulated clock to the real host time
- * For ex. a clock_ratio = 1+100e-6 means the simulated time is 100ppm faster
- * than real time
- */
-static double clock_ratio = 1.0;
-
-#if DEBUG_NP_TIMER
-/*
- * Offset of the simulated time vs the real host time due to drift/clock ratio
- * until "last_radj_*time"
- *
- * A positive value means simulated time is ahead of the host time
- *
- * This variable is only kept for debugging purposes
- */
-static int64_t last_drift_offset;
-#endif
-
-/*
- * Offsets of the RTC relative to the hardware models simu_time
- * "simu_time" == simulated time which starts at 0 on boot
- */
-static int64_t rtc_offset;
-
-/* Last host/real time when the ratio was adjusted */
-static uint64_t last_radj_rtime;
-/* Last simulated time when the ratio was adjusted */
-static uint64_t last_radj_stime;
-
-extern uint64_t posix_get_hw_cycle(void);
-
-void hwtimer_set_real_time_mode(bool new_rt)
-{
-	real_time_mode = new_rt;
-}
-
-static void hwtimer_update_timer(void)
-{
-	hw_timer_timer = MIN(hw_timer_tick_timer, hw_timer_awake_timer);
-}
-
-static inline void host_clock_gettime(struct timespec *tv)
-{
-#if defined(CLOCK_MONOTONIC_RAW)
-	clock_gettime(CLOCK_MONOTONIC_RAW, tv);
-#else
-	clock_gettime(CLOCK_MONOTONIC, tv);
-#endif
-}
-
-uint64_t get_host_us_time(void)
-{
-	struct timespec tv;
-
-	host_clock_gettime(&tv);
-	return (uint64_t)tv.tv_sec * 1e6 + tv.tv_nsec / 1000;
-}
-
-void hwtimer_init(void)
-{
-	silent_ticks = 0;
-	hw_timer_tick_timer = NEVER;
-	hw_timer_awake_timer = NEVER;
-	hwtimer_update_timer();
-	if (real_time_mode) {
-		boot_time = get_host_us_time();
-		last_radj_rtime = boot_time;
-		last_radj_stime = 0U;
-	}
-	if (!reset_rtc) {
-		struct timespec tv;
-		uint64_t realhosttime;
-
-		clock_gettime(CLOCK_REALTIME, &tv);
-		realhosttime = (uint64_t)tv.tv_sec * 1e6 + tv.tv_nsec / 1000;
-
-		rtc_offset += realhosttime;
-	}
-}
-
-void hwtimer_cleanup(void)
-{
-
-}
-
-/**
- * Enable the HW timer tick interrupts with a period <period> in microseconds
- */
-void hwtimer_enable(uint64_t period)
-{
-	tick_p = period;
-	hw_timer_tick_timer = hwm_get_time() + tick_p;
-	hwtimer_update_timer();
-	hwm_find_next_timer();
-}
-
-static void hwtimer_tick_timer_reached(void)
-{
-	if (real_time_mode) {
-		uint64_t expected_rt = (hw_timer_tick_timer - last_radj_stime)
-				    / clock_ratio
-				    + last_radj_rtime;
-		uint64_t real_time = get_host_us_time();
-
-		int64_t diff = expected_rt - real_time;
-
-#if DEBUG_NP_TIMER
-		char es[30];
-		char rs[30];
-
-		us_time_to_str(es, expected_rt - boot_time);
-		us_time_to_str(rs, real_time - boot_time);
-		printf("tick @%5llims: diff = expected_rt - real_time = "
-			"%5lli = %s - %s\n",
-			hw_timer_tick_timer/1000U, diff, es, rs);
-#endif
-
-		if (diff > 0) { /* we need to slow down */
-			struct timespec requested_time;
-			struct timespec remaining;
-
-			requested_time.tv_sec  = diff / 1e6;
-			requested_time.tv_nsec = (diff -
-						 requested_time.tv_sec*1e6)*1e3;
-
-			(void) nanosleep(&requested_time, &remaining);
-		}
-	}
-
-	hw_timer_tick_timer += tick_p;
-	hwtimer_update_timer();
-
-	if (silent_ticks > 0) {
-		silent_ticks -= 1;
-	} else {
-		hw_irq_ctrl_set_irq(TIMER_TICK_IRQ);
-	}
-}
-
-static void hwtimer_awake_timer_reached(void)
-{
-	hw_timer_awake_timer = NEVER;
-	hwtimer_update_timer();
-	hw_irq_ctrl_set_irq(PHONY_HARD_IRQ);
-}
-
-void hwtimer_timer_reached(void)
-{
-	uint64_t Now = hw_timer_timer;
-
-	if (hw_timer_awake_timer == Now) {
-		hwtimer_awake_timer_reached();
-	}
-
-	if (hw_timer_tick_timer == Now) {
-		hwtimer_tick_timer_reached();
-	}
-}
-
-/**
- * The timer HW will awake the CPU (without an interrupt) at least when <time>
- * comes (it may awake it earlier)
- *
- * If there was a previous request for an earlier time, the old one will prevail
- *
- * This is meant for k_busy_wait() like functionality
- */
-void hwtimer_wake_in_time(uint64_t time)
-{
-	if (hw_timer_awake_timer > time) {
-		hw_timer_awake_timer = time;
-		hwtimer_update_timer();
-		hwm_find_next_timer();
-	}
-}
-
-/**
- * The kernel wants to skip the next sys_ticks tick interrupts
- * If sys_ticks == 0, the next interrupt will be raised.
- */
-void hwtimer_set_silent_ticks(int64_t sys_ticks)
-{
-	silent_ticks = sys_ticks;
-}
-
-int64_t hwtimer_get_pending_silent_ticks(void)
-{
-	return silent_ticks;
-}
-
-
-/**
- * During boot set the real time clock simulated time not start
- * from the real host time
- */
-void hwtimer_reset_rtc(void)
-{
-	reset_rtc = true;
-}
-
-/**
- * Set a time offset (microseconds) of the RTC simulated time
- * Note: This should not be used after starting
- */
-void hwtimer_set_rtc_offset(int64_t offset)
-{
-	rtc_offset = offset;
-}
-
-/**
- * Set the ratio of the simulated time to host (real) time.
- * Note: This should not be used after starting
- */
-void hwtimer_set_rt_ratio(double ratio)
-{
-	clock_ratio = ratio;
-}
-
-/**
- * Increase or decrease the RTC simulated time by offset_delta
- */
-void hwtimer_adjust_rtc_offset(int64_t offset_delta)
-{
-	rtc_offset += offset_delta;
-}
-
-/**
- * Adjust the ratio of the simulated time by a factor
- */
-void hwtimer_adjust_rt_ratio(double ratio_correction)
-{
-	uint64_t current_stime = hwm_get_time();
-	int64_t s_diff = current_stime - last_radj_stime;
-	/* Accumulated real time drift time since last adjustment: */
-
-	last_radj_rtime += s_diff / clock_ratio;
-	last_radj_stime = current_stime;
-
-#if DEBUG_NP_TIMER
-	char ct[30];
-	int64_t r_drift = (long double)(clock_ratio-1.0)/(clock_ratio)*s_diff;
-
-	last_drift_offset += r_drift;
-	us_time_to_str(ct, current_stime);
-
-	printf("%s(): @%s, s_diff= %llius after last adjust\n"
-		" during which we drifted %.3fms\n"
-		" total acc drift (last_drift_offset) = %.3fms\n"
-		" last_radj_rtime = %.3fms (+%.3fms )\n"
-		" Ratio adjusted to %f\n",
-		__func__, ct, s_diff,
-		r_drift/1000.0,
-		last_drift_offset/1000.0,
-		last_radj_rtime/1000.0,
-		s_diff/clock_ratio/1000.0,
-		clock_ratio*ratio_correction);
-#endif
-
-	clock_ratio *= ratio_correction;
-}
-
-/**
- * Return the current simulated RTC time in microseconds
- */
-int64_t hwtimer_get_simu_rtc_time(void)
-{
-	return hwm_get_time() + rtc_offset;
-}
-
-
-/**
- * Return a version of the host time which would have drifted as if the host
- * real time clock had been running from the native_posix clock, and adjusted
- * both in rate and in offsets as the native_posix has been.
- *
- * Note that this time may be significantly ahead of the simulated time
- * (the time the Zephyr kernel thinks it is).
- * This will be the case in general if native_posix is not able to run at or
- * faster than real time.
- */
-void hwtimer_get_pseudohost_rtc_time(uint32_t *nsec, uint64_t *sec)
-{
-	/*
-	 * Note: long double has a 64bits mantissa in x86.
-	 * Therefore to avoid loss of precision after 500 odd years into
-	 * the epoch, we first calculate the offset from the last adjustment
-	 * time split in us and ns. So we keep the full precision for 500 odd
-	 * years after the last clock ratio adjustment (or native_posix boot,
-	 * whichever is latest).
-	 * Meaning, we will still start to loose precision after 500 off
-	 * years of runtime without a clock ratio adjustment, but that really
-	 * should not be much of a problem, given that the ns lower digits are
-	 * pretty much noise anyhow.
-	 * (So, all this is a huge overkill)
-	 *
-	 * The operation below in plain is just:
-	 *   st = (rt - last_rt_adj_time)*ratio + last_dt_adj_time
-	 * where st = simulated time
-	 *       rt = real time
-	 *       last_rt_adj_time = time (real) when the last ratio
-	 *			    adjustment took place
-	 *       last_st_adj_time = time (simulated) when the last ratio
-	 *			    adjustment took place
-	 *       ratio = ratio between simulated time and real time
-	 */
-	struct timespec tv;
-
-	host_clock_gettime(&tv);
-
-	uint64_t rt_us = (uint64_t)tv.tv_sec * 1000000ULL + tv.tv_nsec / 1000;
-	uint32_t rt_ns = tv.tv_nsec % 1000;
-
-	long double drt_us = (long double)rt_us - last_radj_rtime;
-	long double drt_ns = drt_us * 1000.0L + (long double)rt_ns;
-	long double st = drt_ns * (long double)clock_ratio +
-			 (long double)(last_radj_stime + rtc_offset) * 1000.0L;
-
-	*nsec = fmodl(st, 1e9L);
-	*sec = st / 1e9L;
-}
-
-static struct {
-	double stop_at;
-	double rtc_offset;
-	double rt_drift;
-	double rt_ratio;
-} args;
-
-static void cmd_stop_at_found(char *argv, int offset)
-{
-	ARG_UNUSED(offset);
-	if (args.stop_at < 0) {
-		posix_print_error_and_exit("Error: stop-at must be positive "
-					   "(%s)\n", argv);
-	}
-	hwm_set_end_of_time(args.stop_at*1e6);
-}
-
-static void cmd_realtime_found(char *argv, int offset)
-{
-	ARG_UNUSED(argv);
-	ARG_UNUSED(offset);
-	hwtimer_set_real_time_mode(true);
-}
-
-static void cmd_no_realtime_found(char *argv, int offset)
-{
-	ARG_UNUSED(argv);
-	ARG_UNUSED(offset);
-	hwtimer_set_real_time_mode(false);
-}
-
-static void cmd_rtcoffset_found(char *argv, int offset)
-{
-	ARG_UNUSED(argv);
-	ARG_UNUSED(offset);
-	hwtimer_set_rtc_offset(args.rtc_offset*1e6);
-}
-
-static void cmd_rt_drift_found(char *argv, int offset)
-{
-	ARG_UNUSED(argv);
-	ARG_UNUSED(offset);
-	if (!(args.rt_drift > -1)) {
-		posix_print_error_and_exit("The drift needs to be > -1. "
-					  "Please use --help for more info\n");
-	}
-	args.rt_ratio = args.rt_drift + 1;
-	hwtimer_set_rt_ratio(args.rt_ratio);
-}
-
-static void cmd_rt_ratio_found(char *argv, int offset)
-{
-	ARG_UNUSED(argv);
-	ARG_UNUSED(offset);
-	if ((args.rt_ratio <= 0)) {
-		posix_print_error_and_exit("The ratio needs to be > 0. "
-					  "Please use --help for more info\n");
-	}
-	hwtimer_set_rt_ratio(args.rt_ratio);
-}
-
-static void cmd_rtcreset_found(char *argv, int offset)
-{
-	ARG_UNUSED(argv);
-	ARG_UNUSED(offset);
-	hwtimer_reset_rtc();
-}
-
-static void native_add_time_options(void)
-{
-	static struct args_struct_t timer_options[] = {
-		/*
-		 * Fields:
-		 * manual, mandatory, switch,
-		 * option_name, var_name ,type,
-		 * destination, callback,
-		 * description
-		 */
-		{false, false, true,
-		"rt", "", 'b',
-		NULL, cmd_realtime_found,
-		"Slow down the execution to the host real time, "
-		"or a ratio of it (see --rt-ratio below)"},
-
-		{false, false, true,
-		"no-rt", "", 'b',
-		NULL, cmd_no_realtime_found,
-		"Do NOT slow down the execution to real time, but advance "
-		"Zephyr's time as fast as possible and decoupled from the host "
-		"time"},
-
-		{false, false, false,
-		"rt-drift", "dratio", 'd',
-		(void *)&args.rt_drift, cmd_rt_drift_found,
-		"Drift of the simulated clock relative to the host real time. "
-		"Normally this would be set to a value of a few ppm (e.g. 50e-6"
-		") "
-		"This option has no effect in non real time mode"
-		},
-
-		{false, false, false,
-		"rt-ratio", "ratio", 'd',
-		(void *)&args.rt_ratio, cmd_rt_ratio_found,
-		"Relative speed of the simulated time vs real time. "
-		"For ex. set to 2 to have simulated time pass at double the "
-		"speed of real time. "
-		"Note that both rt-drift & rt-ratio adjust the same clock "
-		"speed, and therefore it does not make sense to use them "
-		"simultaneously. "
-		"This option has no effect in non real time mode"
-		},
-
-		{false, false, false,
-		"rtc-offset", "time_offset", 'd',
-		(void *)&args.rtc_offset, cmd_rtcoffset_found,
-		"At boot offset the RTC clock by this amount of seconds"
-		},
-
-		{false, false, true,
-		"rtc-reset", "", 'b',
-		NULL, cmd_rtcreset_found,
-		"Start the simulated real time clock at 0. Otherwise it starts "
-		"matching the value provided by the host real time clock"},
-
-		{false, false, false,
-		 "stop_at", "time", 'd',
-		(void *)&args.stop_at, cmd_stop_at_found,
-		"In simulated seconds, when to stop automatically"},
-
-		ARG_TABLE_ENDMARKER};
-
-	native_add_command_line_opts(timer_options);
-}
-
-NATIVE_TASK(native_add_time_options, PRE_BOOT_1, 1);
diff --git a/boards/native/native_posix/timer_model.h b/boards/native/native_posix/timer_model.h
deleted file mode 100644
index 2c782d69daa29..0000000000000
--- a/boards/native/native_posix/timer_model.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NATIVE_POSIX_TIMER_MODEL_H
-#define _NATIVE_POSIX_TIMER_MODEL_H
-
-#include "hw_models_top.h"
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void hwtimer_init(void);
-void hwtimer_cleanup(void);
-void hwtimer_set_real_time_mode(bool new_rt);
-void hwtimer_timer_reached(void);
-void hwtimer_wake_in_time(uint64_t time);
-void hwtimer_set_silent_ticks(int64_t sys_ticks);
-void hwtimer_enable(uint64_t period);
-int64_t hwtimer_get_pending_silent_ticks(void);
-
-void hwtimer_reset_rtc(void);
-void hwtimer_set_rtc_offset(int64_t offset);
-void hwtimer_set_rt_ratio(double ratio);
-
-void hwtimer_adjust_rtc_offset(int64_t offset_delta);
-void hwtimer_adjust_rt_ratio(double ratio_correction);
-int64_t hwtimer_get_simu_rtc_time(void);
-void hwtimer_get_pseudohost_rtc_time(uint32_t *nsec, uint64_t *sec);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NATIVE_POSIX_TIMER_MODEL_H */
diff --git a/boards/native/native_posix/tracing.c b/boards/native/native_posix/tracing.c
deleted file mode 100644
index 5a0c4ec89d806..0000000000000
--- a/boards/native/native_posix/tracing.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2017 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Functions to print errors and traces
- */
-
-#include <stdlib.h> /* for exit */
-#include <stdio.h>  /* for printfs */
-#include <stdarg.h> /* for va args */
-#include <unistd.h>
-#include "soc.h"
-#include "posix_board_if.h"
-#include "cmdline.h"
-
-void posix_vprint_error_and_exit(const char *format, va_list vargs)
-{
-	vfprintf(stderr, format, vargs);
-	posix_exit(1);
-}
-
-void posix_vprint_warning(const char *format, va_list vargs)
-{
-	vfprintf(stderr, format, vargs);
-}
-
-void posix_vprint_trace(const char *format, va_list vargs)
-{
-	vfprintf(stdout, format, vargs);
-}
-
-void posix_print_error_and_exit(const char *format, ...)
-{
-	va_list variable_args;
-
-	va_start(variable_args, format);
-	posix_vprint_error_and_exit(format, variable_args);
-	va_end(variable_args);
-}
-
-void posix_print_warning(const char *format, ...)
-{
-	va_list variable_args;
-
-	va_start(variable_args, format);
-	vfprintf(stderr, format, variable_args);
-	va_end(variable_args);
-}
-
-void posix_print_trace(const char *format, ...)
-{
-	va_list variable_args;
-
-	va_start(variable_args, format);
-	vfprintf(stdout, format, variable_args);
-	va_end(variable_args);
-}
-
-/**
- * Are stdout and stderr connected to a tty
- * 0  = no
- * 1  = yes
- * -1 = we do not know yet
- * Indexed 0:stdout, 1:stderr
- */
-static int is_a_tty[2] = {-1, -1};
-
-void trace_disable_color(char *argv, int offset)
-{
-	is_a_tty[0] = 0;
-	is_a_tty[1] = 0;
-}
-
-void trace_enable_color(char *argv, int offset)
-{
-	is_a_tty[0] = -1;
-	is_a_tty[1] = -1;
-
-}
-
-void trace_force_color(char *argv, int offset)
-{
-	is_a_tty[0] = 1;
-	is_a_tty[1] = 1;
-}
-
-int posix_trace_over_tty(int file_number)
-{
-	return is_a_tty[file_number];
-}
-
-static void decide_about_color(void)
-{
-	if (is_a_tty[0] == -1) {
-		is_a_tty[0] = isatty(STDOUT_FILENO);
-	}
-	if (is_a_tty[1] == -1) {
-		is_a_tty[1] = isatty(STDERR_FILENO);
-	}
-}
-
-NATIVE_TASK(decide_about_color, PRE_BOOT_2, 0);
-
-void native_add_tracing_options(void)
-{
-	static struct args_struct_t trace_options[] = {
-		/*
-		 * Fields:
-		 * manual, mandatory, switch,
-		 * option_name, var_name ,type,
-		 * destination, callback,
-		 * description
-		 */
-		{ false, false, true,
-		"color", "color", 'b',
-		NULL, trace_enable_color,
-		"(default) Enable color in traces if printing to console"},
-		{ false, false, true,
-		"no-color", "no-color", 'b',
-		NULL, trace_disable_color,
-		"Disable color in traces even if printing to console"},
-		{ false, false, true,
-		"force-color", "force-color", 'b',
-		NULL, trace_force_color,
-		"Enable color in traces even if printing to files/pipes"},
-		ARG_TABLE_ENDMARKER};
-
-	native_add_command_line_opts(trace_options);
-}
diff --git a/boards/native/native_sim/Kconfig b/boards/native/native_sim/Kconfig
index fc84adda149f9..4ecdbf702f58a 100644
--- a/boards/native/native_sim/Kconfig
+++ b/boards/native/native_sim/Kconfig
@@ -5,7 +5,7 @@ config BOARD_NATIVE_SIM
 	bool
 	select POSIX_ARCH_CONSOLE
 	select NATIVE_LIBRARY
-	select NATIVE_POSIX_TIMER
+	select NATIVE_SIM_TIMER
 	select 64BIT if BOARD_NATIVE_SIM_NATIVE_64
 	imply BOARD_NATIVE_POSIX if NATIVE_SIM_NATIVE_POSIX_COMPAT
 	help
@@ -45,6 +45,7 @@ config BOARD_NATIVE_POSIX
 config NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME
 	bool "Slow down execution to real time (native_posix compat)"
 	select NATIVE_SIM_SLOWDOWN_TO_REAL_TIME
+	select DEPRECATED
 	help
 	  Transitional option which allows applications which targeted native_posix
 	  to set the correct native_sim option (CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)
diff --git a/boards/native/native_sim/Kconfig.defconfig b/boards/native/native_sim/Kconfig.defconfig
index c74a9fe041e34..5e1724b44130f 100644
--- a/boards/native/native_sim/Kconfig.defconfig
+++ b/boards/native/native_sim/Kconfig.defconfig
@@ -17,7 +17,7 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y if !NET_LOOPBACK && !NET_TEST
 
-config ETH_NATIVE_POSIX
+config ETH_NATIVE_TAP
 	default y if NET_L2_ETHERNET && ETH_DRIVER
 
 endif # NETWORKING
diff --git a/boards/native/native_sim/cmdline.c b/boards/native/native_sim/cmdline.c
index 0cab99d283270..e1395aa8da684 100644
--- a/boards/native/native_sim/cmdline.c
+++ b/boards/native/native_sim/cmdline.c
@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * To support native_posix drivers or tests which register their own arguments
- * we provide the same API as in native_posix
- */
-
 #include "nsi_cmdline.h"
 
 void native_add_command_line_opts(struct args_struct_t *args)
diff --git a/boards/native/native_sim/cmdline.h b/boards/native/native_sim/cmdline.h
index acf46d1ce26f7..cb4465192e147 100644
--- a/boards/native/native_sim/cmdline.h
+++ b/boards/native/native_sim/cmdline.h
@@ -15,8 +15,8 @@ extern "C" {
 #endif
 
 /*
- * To support native_posix drivers or tests which register their own arguments
- * we provide a header with the same name as in native_posix
+ * API provided by native_sim for drivers or tests which want to register their own command line
+ * arguments
  */
 void native_get_cmd_line_args(int *argc, char ***argv);
 void native_get_test_cmd_line_args(int *argc, char ***argv);
diff --git a/boards/native/native_sim/cmdline_common.h b/boards/native/native_sim/cmdline_common.h
index c645caadc0098..b8e7692fa527f 100644
--- a/boards/native/native_sim/cmdline_common.h
+++ b/boards/native/native_sim/cmdline_common.h
@@ -6,6 +6,9 @@
 #ifndef BOARDS_POSIX_NATIVE_SIM_CMDLINE_COMMON_H
 #define BOARDS_POSIX_NATIVE_SIM_CMDLINE_COMMON_H
 
+#warning "This transitional header is now deprecated and will be removed by v4.4. "\
+	 "Use nsi_cmdline.h instead."
+
 /*
  * To support native_posix drivers which register their own arguments
  * we provide a header with the same name as in native_posix
diff --git a/boards/native/native_sim/doc/index.rst b/boards/native/native_sim/doc/index.rst
index 5e8ec87935ced..8cdffc325267a 100644
--- a/boards/native/native_sim/doc/index.rst
+++ b/boards/native/native_sim/doc/index.rst
@@ -26,7 +26,7 @@ See `Peripherals`_ for more information.
 
 .. note::
 
-   | ``native_sim`` is an evolution of the older :ref:`native_posix<native_posix>`.
+   | ``native_sim`` is an evolution of its predecessor ``native_posix``.
    | Some components, code, options names, and documentation will still use the old native_posix
      names. But all components which worked with native_posix will work with native_sim.
 
@@ -310,10 +310,10 @@ The following peripherals are currently provided with this board:
 **UART/Serial**
    Two optional native UART drivers are available:
 
-   **PTTY driver (UART_NATIVE_POSIX)**
-      With this driver, one or two Zephyr UART devices can be created. These
+   **PTY driver (UART_NATIVE_PTY)**
+      With this driver, Zephyr UART devices can be created. These
       can be connected to the Linux process stdin/stdout or a newly created
-      pseudo-tty. For more information refer to the section `PTTY UART`_.
+      pseudo-tty. For more information refer to the section `PTY UART`_.
 
    **TTY driver (UART_NATIVE_TTY)**
       An UART driver for interacting with host-attached serial port devices
@@ -469,7 +469,7 @@ The following peripherals are currently provided with this board:
   Some more information can be found in :ref:`the emulators page <emul_flash_simu_brief>`.
 
   The flash content can be accessed from the host system, as explained in the
-  `Host based flash access`_ section.
+  `Host (FUSE) filesystem access`_ section.
 
 **Input events**
   Two optional native input drivers are available:
@@ -510,44 +510,46 @@ The following peripherals are currently provided with this board:
 
 .. _native_ptty_uart:
 
-PTTY UART
+PTY UART
 =========
 
-This driver can be configured with :kconfig:option:`CONFIG_UART_NATIVE_POSIX`
-to instantiate up to two UARTs. By default only one UART is enabled.
-With :kconfig:option:`CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE`
-you can enable the second one.
-
-For the first UART, it can link it to a new
-pseudoterminal (i.e. :file:`/dev/pts{<nbr>}`), or map the UART input and
-output to the executable's ``stdin`` and ``stdout``.
-This is chosen by selecting either
-:kconfig:option:`CONFIG_NATIVE_UART_0_ON_OWN_PTY` or
-:kconfig:option:`CONFIG_NATIVE_UART_0_ON_STDINOUT`
-For interactive use with the :ref:`shell_api`, choose the first (OWN_PTY) option.
-The second (STDINOUT) option can be used with the shell for automated
-testing, such as when piping other processes' output to control it.
-This is because the shell subsystem expects access to a raw terminal,
+This driver is automatically enabled when devicetree contains nodes with the
+``"zephyr,native-pty-uart"`` compatible property and ``okay`` status and
+:kconfig:option:`CONFIG_SERIAL` is set.
+By default one ready UART of this type is setup in DTS, but any number can be enabled as desired.
+
+Normally these UARTs are connected to new pseudoterminals PTYs, i.e. :file:`/dev/pts{<nbr>}`,
+but it is also possible to map one of them to the executable's ``stdin`` and ``stdout``.
+This can be done in two ways, either with the command line option ``--<uart_name>_stdinout``
+(where ``<uart_name>`` is the UART DTS node name), or, for the first PTY UART instance by chosing
+:kconfig:option:`CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT` instead of the default
+:kconfig:option:`CONFIG_UART_NATIVE_PTY_0_ON_OWN_PTY`.
+For interactive use with the :ref:`shell_api`, it is recommended to choose the PTY option.
+The ``STDINOUT`` option can be used for automated testing, such as when piping other processes'
+output to control it. This is because the shell subsystem expects access to a raw terminal,
 which (by default) a normal Linux terminal is not.
 
-When :kconfig:option:`CONFIG_NATIVE_UART_0_ON_OWN_PTY` is chosen, the name of the
-newly created UART pseudo-terminal will be displayed in the console.
-If you want to interact with it manually, you should attach a terminal emulator
-to it. This can be done, for example with the command:
+When a UART is connected to a new PTY, the name of the newly created UART pseudo-terminal will be
+displayed in the console.
+If you want to interact with it manually, you should attach a terminal emulator to it.
+This can be done, for example with the command:
 
 .. code-block:: console
 
-   $ xterm -e screen /dev/<ttyn> &
+   $ xterm -e screen /dev/<ptyn> &
+   # Or if you prefer gnome-terminal:
+   $ gnome-terminal -- screen /dev/<ptyn> &
 
-where :file:`/dev/tty{<n>}` should be replaced with the actual TTY device.
+where :file:`/dev/{<ptyn>}` should be replaced with the actual PTY device.
 
-You may also chose to automatically attach a terminal emulator to the first UART
-by passing the command line option ``-attach_uart`` to the executable.
-The command used for attaching to the new shell can be set with the command line
-option ``-attach_uart_cmd=<"cmd">``. Where the default command is given by
-:kconfig:option:`CONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD`.
-Note that the default command assumes both ``xterm`` and ``screen`` are
-installed in the system.
+You may also chose to automatically attach a terminal emulator to any of these UARTs.
+To automatically attach one to all these UARTs, pass the command line option ``-attach_uart`` to the
+executable. To automatically attach one to a single UART use ``-<uart_name>_attach_uart``
+The command used for attaching to the new shell can be set for all UARTs with the command line
+option ``-attach_uart_cmd=<"cmd">``, or for each individual UART with
+``-<uart_name>_attach_uart_cmd``. Where the default command is given by
+:kconfig:option:`CONFIG_UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD`.
+Note that the default command assumes both ``xterm`` and ``screen`` are installed in the system.
 
 This driver only supports poll mode. Interrupt and async mode are not supported.
 Neither runtime configuration or line control are supported.
@@ -557,9 +559,8 @@ Neither runtime configuration or line control are supported.
 TTY UART
 ========
 
-With this driver an application can use the polling UART API (``uart_poll_out``,
-``uart_poll_in``) to write and read characters to and from a connected serial
-port device.
+With this driver an application can use the polling and interrupt based UART APIs to write and read
+characters to and from a connected serial port device.
 
 This driver is automatically enabled when a devicetree contains a node
 with ``"zephyr,native-tty-uart"`` compatible property and ``okay`` status, such
@@ -612,7 +613,7 @@ development by integrating more seamlessly with the host operating system:
   redirect any :c:func:`printk` write to the native host application's
   ``stdout``.
 
-  This driver is selected by default if the `PTTY UART`_ is not compiled in.
+  This driver is selected by default if no UART driver is compiled in.
   Otherwise :kconfig:option:`CONFIG_UART_CONSOLE` will be set to select the UART as
   console backend.
 
@@ -646,21 +647,18 @@ All :ref:`available HW emulators <emulators>` can be used with native_sim.
 
 .. _native_fuse_flash:
 
-Host based flash access
-***********************
+Host (FUSE) filesystem access
+*****************************
 
-If a flash device is present, the file system partitions on the flash
-device can be exposed through the host file system by enabling
-:kconfig:option:`CONFIG_FUSE_FS_ACCESS`. This option enables a FUSE
-(File system in User space) layer that maps the Zephyr file system calls to
-the required UNIX file system calls, and provides access to the flash file
-system partitions with normal operating system commands such as ``cd``,
-``ls`` and ``mkdir``.
+When building Zephyr with a filesystem, the device partitions can be exposed through the host file
+system by enabling :kconfig:option:`CONFIG_FUSE_FS_ACCESS`. This option enables a FUSE
+(File system in User space) layer that mounts the simulated embedded filesystem in the host
+filesystem, maps the Zephyr file system calls to the required UNIX file system calls, and provides
+access to its partitions with normal operating system commands such as ``cd``, ``ls`` and ``mkdir``.
 
 By default the partitions are exposed through the directory :file:`flash/` in the
 current working directory. This directory can be changed via the command line
-option ``--flash-mount``. As this directory operates as a mount point for FUSE
-you have to ensure that it exists before starting the native_sim board.
+option ``--flash-mount``.
 
 On exit, the native_sim board application will take care of unmounting the
 directory. In the unfortunate case that the native_sim board application
@@ -698,16 +696,16 @@ host libC (:kconfig:option:`CONFIG_EXTERNAL_LIBC`):
    :header: Driver class, driver name, driver kconfig, libC choices
 
      ADC, ADC emul, :kconfig:option:`CONFIG_ADC_EMUL`, All
-     Bluetooth, :ref:`Userchan <nsim_bt_host_cont>`, :kconfig:option:`CONFIG_BT_USERCHAN`, Host libC
+     Bluetooth, :ref:`Userchan <nsim_bt_host_cont>`, :kconfig:option:`CONFIG_BT_USERCHAN`, Host and pico libC
      CAN, CAN native Linux, :kconfig:option:`CONFIG_CAN_NATIVE_LINUX`, All
      Console backend, :ref:`POSIX arch console <nsim_back_console>`, :kconfig:option:`CONFIG_POSIX_ARCH_CONSOLE`, All
      Display, :ref:`Display SDL <nsim_per_disp_sdl>`, :kconfig:option:`CONFIG_SDL_DISPLAY`, All
-     Entropy, :ref:`Native posix entropy <nsim_per_entr>`, :kconfig:option:`CONFIG_FAKE_ENTROPY_NATIVE_POSIX`, All
+     Entropy, :ref:`Native simulator entropy <nsim_per_entr>`, :kconfig:option:`CONFIG_FAKE_ENTROPY_NATIVE_SIM`, All
      EEPROM, EEPROM simulator, :kconfig:option:`CONFIG_EEPROM_SIMULATOR`, All
      EEPROM, EEPROM emulator, :kconfig:option:`CONFIG_EEPROM_EMULATOR`, All
-     Ethernet, :ref:`Eth native_posix <nsim_per_ethe>`, :kconfig:option:`CONFIG_ETH_NATIVE_POSIX`, All
+     Ethernet, :ref:`Eth native_tap <nsim_per_ethe>`, :kconfig:option:`CONFIG_ETH_NATIVE_TAP`, All
      Flash, :ref:`Flash simulator <nsim_per_flash_simu>`, :kconfig:option:`CONFIG_FLASH_SIMULATOR`, All
-     Flash, :ref:`Host based flash access <native_fuse_flash>`, :kconfig:option:`CONFIG_FUSE_FS_ACCESS`, Host libC
+     FUSE, :ref:`Host based filesystem access <native_fuse_flash>`, :kconfig:option:`CONFIG_FUSE_FS_ACCESS`, All
      GPIO, GPIO emulator, :kconfig:option:`CONFIG_GPIO_EMUL`, All
      GPIO, SDL GPIO emulator, :kconfig:option:`CONFIG_GPIO_EMUL_SDL`, All
      I2C, I2C emulator, :kconfig:option:`CONFIG_I2C_EMUL`, All
@@ -716,9 +714,9 @@ host libC (:kconfig:option:`CONFIG_EXTERNAL_LIBC`):
      Logger backend, :ref:`Native backend <nsim_back_logger>`, :kconfig:option:`CONFIG_LOG_BACKEND_NATIVE_POSIX`, All
      Offloaded sockets, :ref:`nsim_per_offloaded_sockets`, :kconfig:option:`CONFIG_NET_NATIVE_OFFLOADED_SOCKETS`, All
      RTC, RTC emul, :kconfig:option:`CONFIG_RTC_EMUL`, All
-     Serial, :ref:`UART native posix/PTTY <native_ptty_uart>`, :kconfig:option:`CONFIG_UART_NATIVE_POSIX`, All
+     Serial, :ref:`UART native PTY <native_ptty_uart>`, :kconfig:option:`CONFIG_UART_NATIVE_PTY`, All
      Serial, :ref:`UART native TTY <native_tty_uart>`, :kconfig:option:`CONFIG_UART_NATIVE_TTY`, All
      SPI, SPI emul, :kconfig:option:`CONFIG_SPI_EMUL`, All
-     System tick, Native_posix timer, :kconfig:option:`CONFIG_NATIVE_POSIX_TIMER`, All
+     System tick, Native_sim timer, :kconfig:option:`CONFIG_NATIVE_SIM_TIMER`, All
      Tracing, :ref:`Posix tracing backend <nsim_back_trace>`, :kconfig:option:`CONFIG_TRACING_BACKEND_POSIX`, All
      USB, :ref:`USB native posix <nsim_per_usb>`, :kconfig:option:`CONFIG_USB_NATIVE_POSIX`, Host libC
diff --git a/boards/native/native_sim/native_posix_compat.h b/boards/native/native_sim/native_posix_compat.h
index 6c943606f3fb4..f545f4173fe78 100644
--- a/boards/native/native_sim/native_posix_compat.h
+++ b/boards/native/native_sim/native_posix_compat.h
@@ -15,6 +15,9 @@
 #ifndef BOARDS_POSIX_NATIVE_SIM_NATIVE_POSIX_COMPAT_H
 #define BOARDS_POSIX_NATIVE_SIM_NATIVE_POSIX_COMPAT_H
 
+#warning "This transitional header is now deprecated and will be removed by v4.4. "\
+	 "Use nsi_hw_scheduler.h instead."
+
 #include <stdint.h>
 #include <zephyr/toolchain.h>
 #include "nsi_hw_scheduler.h"
diff --git a/boards/native/native_sim/native_sim.dts b/boards/native/native_sim/native_sim.dts
index 162fcf074577a..4ab4ef76f4150 100644
--- a/boards/native/native_sim/native_sim.dts
+++ b/boards/native/native_sim/native_sim.dts
@@ -54,7 +54,7 @@
 		#size-cells = <0>;
 
 		cpu0: cpu@0 {
-			compatible = "zephyr,native-posix-cpu";
+			compatible = "zephyr,native-sim-cpu";
 			reg = <0>;
 		};
 	};
@@ -147,7 +147,7 @@
 
 	uart0: uart {
 		status = "okay";
-		compatible = "zephyr,native-posix-uart";
+		compatible = "zephyr,native-pty-uart";
 		/* Dummy current-speed entry to comply with serial
 		 * DTS binding
 		 */
@@ -155,8 +155,8 @@
 	};
 
 	uart1: uart_1 {
-		status = "okay";
-		compatible = "zephyr,native-posix-uart";
+		status = "disabled";
+		compatible = "zephyr,native-pty-uart";
 		/* Dummy current-speed entry to comply with serial
 		 * DTS binding
 		 */
@@ -165,12 +165,12 @@
 
 	rng: rng {
 		status = "okay";
-		compatible = "zephyr,native-posix-rng";
+		compatible = "zephyr,native-sim-rng";
 	};
 
 	counter0: counter {
 		status = "okay";
-		compatible = "zephyr,native-posix-counter";
+		compatible = "zephyr,native-sim-counter";
 	};
 
 	gpio0: gpio_emul {
@@ -196,6 +196,7 @@
 
 	input_sdl_touch: input-sdl-touch {
 		compatible = "zephyr,input-sdl-touch";
+		display = <&sdl_dc>;
 	};
 
 	can_loopback0: can_loopback0 {
diff --git a/boards/native/native_sim/timer_model.h b/boards/native/native_sim/timer_model.h
index a159ef444f11b..b12a4991f174b 100644
--- a/boards/native/native_sim/timer_model.h
+++ b/boards/native/native_sim/timer_model.h
@@ -7,6 +7,9 @@
 #ifndef BOARDS_POSIX_NATIVE_SIM_TIMER_MODEL_H
 #define BOARDS_POSIX_NATIVE_SIM_TIMER_MODEL_H
 
+#warning "This transitional header is now deprecated and will be removed by v4.4. "\
+	 "Use nsi_timer_model.h instead."
+
 /*
  * To support the native_posix timer driver
  * we provide a header with the same name as in native_posix
diff --git a/boards/native/nrf_bsim/common/cmdline.h b/boards/native/nrf_bsim/common/cmdline.h
index 004d6202b536d..a84f048d09470 100644
--- a/boards/native/nrf_bsim/common/cmdline.h
+++ b/boards/native/nrf_bsim/common/cmdline.h
@@ -20,7 +20,7 @@
 #ifndef BOARDS_POSIX_NRF_BSIM_CMDLINE_H
 #define BOARDS_POSIX_NRF_BSIM_CMDLINE_H
 
-#include "../../native_posix/cmdline_common.h"
+#include "../../../native/src/include/nsi_cmdline.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
index 3b5275455033c..6ad96b9d6dc10 100644
--- a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
+++ b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst
@@ -90,6 +90,4 @@ ARM's TrustZone is not modeled in this board. This means that:
   can be labeled as restricted for secure or non secure access.
 * TF-M cannot be used.
 
-Note that the CRACEN peripheral is not modeled.
 As crypto library, Mbed TLS can be used with its SW crypto backend.
-As entropy driver, the :dtcompatible:`zephyr,native-posix-rng` is enabled by default.
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
index 2cf31d1df597e..35a052b78081e 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts
@@ -29,7 +29,6 @@
 		/delete-node/ memory@20000000;
 		/delete-node/ memory@2002f000;
 		peripheral@50000000 {
-			/delete-node/ spi@4a000;
 			/delete-node/ vpr@4c000;
 			/delete-node/ mailbox@0;
 			/delete-node/ interrupt-controller@f0000000;
@@ -83,8 +82,8 @@
 	};
 };
 
-&uart00 {
-	/delete-property/ clocks;
+&spi00 {
+	status = "disabled";
 };
 
 &uart20 {
diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp_defconfig b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp_defconfig
index c8f804a2005b6..0fde4e01b5838 100644
--- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp_defconfig
+++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp_defconfig
@@ -6,5 +6,3 @@ CONFIG_NO_OPTIMIZATIONS=y
 
 # Start SYSCOUNTER on driver init
 CONFIG_NRF_GRTC_START_SYSCOUNTER=y
-
-CONFIG_FAKE_ENTROPY_NATIVE_POSIX_SEED_BY_DEFAULT=n
diff --git a/boards/nordic/nrf21540dk/board.cmake b/boards/nordic/nrf21540dk/board.cmake
index f95878945bedf..1ebf652634f45 100644
--- a/boards/nordic/nrf21540dk/board.cmake
+++ b/boards/nordic/nrf21540dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf21540dk/doc/index.rst b/boards/nordic/nrf21540dk/doc/index.rst
index 7ed102b2b6114..06c4e26de78e7 100644
--- a/boards/nordic/nrf21540dk/doc/index.rst
+++ b/boards/nordic/nrf21540dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf21540dk_nrf52840:
-
-nRF21540 DK
-###########
+.. zephyr:board:: nrf21540dk
 
 Overview
 ********
@@ -25,12 +22,6 @@ The CPU provides support for the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf21540dk_nrf52840.jpg
-     :align: center
-     :alt: nRF21540 DK
-
-     nRF21540 DK (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the `nRF21540 website`_.
 `nRF21540 Product Specification`_ contains the processor's and front end
 module's information and the datasheet.
@@ -44,45 +35,8 @@ of the slow clock is 32.768 kHz. The frequency of the main clock is 32 MHz.
 Supported Features
 ==================
 
-The nrf21540dk/nrf52840 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF52840 Product Specification`_ and `nRF21540 DK Hardware guide`_
 for a complete list of nRF21540 Development Kit board hardware features.
 
@@ -122,6 +76,8 @@ Front End Module
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf21540dk/nrf52840`` board configuration can be built,
 flashed, and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/nordic/nrf51dk/board.cmake b/boards/nordic/nrf51dk/board.cmake
index 1b08d95310ea4..b971cd7fb6b5d 100644
--- a/boards/nordic/nrf51dk/board.cmake
+++ b/boards/nordic/nrf51dk/board.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf51dk/doc/img/nrf51dk_nrf51822.jpg b/boards/nordic/nrf51dk/doc/img/nrf51dk.jpg
similarity index 100%
rename from boards/nordic/nrf51dk/doc/img/nrf51dk_nrf51822.jpg
rename to boards/nordic/nrf51dk/doc/img/nrf51dk.jpg
diff --git a/boards/nordic/nrf51dk/doc/index.rst b/boards/nordic/nrf51dk/doc/index.rst
index 8cae453e2ed6f..7058df1ed5740 100644
--- a/boards/nordic/nrf51dk/doc/index.rst
+++ b/boards/nordic/nrf51dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf51dk_nrf51822:
-
-nRF51 DK
-########
+.. zephyr:board:: nrf51dk
 
 Overview
 ********
@@ -22,12 +19,6 @@ Semiconductor nRF51822 ARM Cortex-M0 CPU and the following devices:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf51dk_nrf51822.jpg
-     :align: center
-     :alt: nRF51 DK
-
-     nRF51 DK (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the
 `nRF51 DK website`_. The `nRF51 Development Kit User Guide`_
 contains the processor's information and the datasheet.
@@ -43,38 +34,8 @@ is 16 MHz.
 Supported Features
 ==================
 
-The nrf51dk/nrf51822 board configuration supports the following nRF51
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF51 DK website`_ and `nRF51 Development Kit User Guide`_
 for a complete list of nRF51 Development Kit board hardware features.
 
@@ -101,6 +62,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/nordic/nrf51dongle/board.cmake b/boards/nordic/nrf51dongle/board.cmake
index 86ac5ef3be686..3bdb9b702c1ae 100644
--- a/boards/nordic/nrf51dongle/board.cmake
+++ b/boards/nordic/nrf51dongle/board.cmake
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf51dongle/doc/img/nrf51dongle_nrf51822.jpg b/boards/nordic/nrf51dongle/doc/img/nrf51dongle.jpg
similarity index 100%
rename from boards/nordic/nrf51dongle/doc/img/nrf51dongle_nrf51822.jpg
rename to boards/nordic/nrf51dongle/doc/img/nrf51dongle.jpg
diff --git a/boards/nordic/nrf51dongle/doc/index.rst b/boards/nordic/nrf51dongle/doc/index.rst
index 63f288e23fcc8..62a938511e9bc 100644
--- a/boards/nordic/nrf51dongle/doc/index.rst
+++ b/boards/nordic/nrf51dongle/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf51dongle_nrf51422:
-
-nRF51 Dongle
-############
+.. zephyr:board:: nrf51dongle
 
 Overview
 ********
@@ -22,12 +19,6 @@ Semiconductor nRF51822 ARM Cortex-M0 CPU and the following devices:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf51dongle_nrf51822.jpg
-     :align: center
-     :alt: nRF51 Dongle
-
-     nRF51 Dongle (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the
 `nRF51 Dongle website`_. The `Nordic Semiconductor TechDocs`_
 contains the processor's information and the datasheet.
@@ -43,38 +34,8 @@ is 16 MHz.
 Supported Features
 ==================
 
-The nrf51dongle/nrf51822 board configuration supports the following nRF51
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF51 Dongle website`_ and `Nordic Semiconductor TechDocs`_
 for a complete list of nRF51 Dongle hardware features.
 
@@ -96,6 +57,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/nordic/nrf52833dk/board.cmake b/boards/nordic/nrf52833dk/board.cmake
index f8c71dc56944b..554146fe5445c 100644
--- a/boards/nordic/nrf52833dk/board.cmake
+++ b/boards/nordic/nrf52833dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf52833dk/doc/index.rst b/boards/nordic/nrf52833dk/doc/index.rst
index ed057bbc93cbf..847fef754a5fe 100644
--- a/boards/nordic/nrf52833dk/doc/index.rst
+++ b/boards/nordic/nrf52833dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf52833dk_nrf52833:
-
-nRF52833 DK
-###########
+.. zephyr:board:: nrf52833dk
 
 Overview
 ********
@@ -41,45 +38,8 @@ is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf52833dk/nrf52833`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF52833 DK website`_ and `nRF52833 DK Hardware guide`_
 for a complete list of nRF52833 Development Kit board hardware features.
 
@@ -106,6 +66,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf52833dk/nrf52833`` board configuration can be built,
 flashed, and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
@@ -206,36 +168,24 @@ In the table 7.1.1 'aQFN73 ball assignments' select the pins marked
 'General purpose I/O'.  Note that pins marked as 'low frequency I/O only' can only be used
 in under-10KHz applications. They are not suitable for 115200 speed of UART.
 
-References
-**********
-
-.. target-notes::
-
-.. _nRF52833 DK website: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52833-DK
-.. _nRF52833 Product Specification: https://docs.nordicsemi.com/bundle/ps_nrf52833/page/keyfeatures_html5.html
-.. _J-Link Software and documentation pack: https://www.segger.com/jlink-software.html
-.. _nRF52833 DK Hardware guide: https://docs.nordicsemi.com/bundle/ug_nrf52833_dk/page/UG/dk/intro.html
-
-.. _nrf52833dk_nrf52820:
-
 nRF52820 emulation on nRF52833 DK
-#################################
-
-Overview
-********
+*********************************
 
-The ``nrf52833dk/nrf52820`` board is a modified version of the
-:ref:`nrf52833dk_nrf52833` that enforces the limitations imposed by the nRF52820
+The ``nrf52833dk/nrf52820`` board variant is a modified version of the
+:zephyr:board:`nrf52833dk` that enforces the limitations imposed by the nRF52820
 IC, which is a variant of the original nRF52833. Since Nordic does not offer a
 development kit for the nRF52820 you can use this board to develop for this IC
 while using the nRF52833 Development Kit (PCA10100).
 
-See :ref:`nrf52833dk_nrf52833` for more information about the development board
-and `nRF52820 website`_ for the official reference on the IC itself.
+See `nRF52820 website`_ for the official reference on the IC itself.
 
 References
 **********
 
 .. target-notes::
 
+.. _nRF52833 DK website: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52833-DK
+.. _nRF52833 Product Specification: https://docs.nordicsemi.com/bundle/ps_nrf52833/page/keyfeatures_html5.html
+.. _J-Link Software and documentation pack: https://www.segger.com/jlink-software.html
+.. _nRF52833 DK Hardware guide: https://docs.nordicsemi.com/bundle/ug_nrf52833_dk/page/UG/dk/intro.html
 .. _nRF52820 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52820
diff --git a/boards/nordic/nrf52840dk/board.cmake b/boards/nordic/nrf52840dk/board.cmake
index f95878945bedf..1ebf652634f45 100644
--- a/boards/nordic/nrf52840dk/board.cmake
+++ b/boards/nordic/nrf52840dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf52840dk/doc/index.rst b/boards/nordic/nrf52840dk/doc/index.rst
index 7c948d7cffd82..1c7c30449f9ef 100644
--- a/boards/nordic/nrf52840dk/doc/index.rst
+++ b/boards/nordic/nrf52840dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf52840dk_nrf52840:
-
-nRF52840 DK
-###########
+.. zephyr:board:: nrf52840dk
 
 Overview
 ********
@@ -25,12 +22,6 @@ Nordic Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf52840dk_nrf52840.jpg
-     :align: center
-     :alt: nRF52840 DK
-
-     nRF52840 DK (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the `nRF52840 DK website`_.
 `nRF52840 Product Specification`_ contains the processor's information
 and the datasheet.
@@ -45,45 +36,8 @@ is 32.768 kHz. The frequency of the main clock is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf52840dk/nrf52840`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF52840 DK website`_ and `nRF52840 DK Hardware guide`_
 for a complete list of nRF52840 Development Kit board hardware features.
 
@@ -110,6 +64,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf52840dk/nrf52840`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -216,27 +172,15 @@ in under-10KHz applications. They are not suitable for 115200 speed of UART.
 .. _nrf52840dk_nrf52811:
 
 nRF52811 emulation on nRF52840 DK
-#################################
-
-Overview
-********
+*********************************
 
 The ``nrf52840dk/nrf52811`` board variant is a modified version of the
-:ref:`nrf52840dk_nrf52840` that enforces the limitations imposed by the nRF52811
+:zephyr:board:`nrf52840dk` that enforces the limitations imposed by the nRF52811
 IC, which is a variant of the original nRF52840. Since Nordic does not offer a
 development kit for the nRF52811 you can use this board to develop for this IC
 while using the nRF52840 Development Kit (PCA10056).
 
-See :ref:`nrf52840dk_nrf52840` for more information about the development board
-and `nRF52811 website`_ for the official reference on the IC itself.
-
-
-References
-**********
-
-.. target-notes::
-
-.. _nRF52811 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52811
+See `nRF52811 website`_ for the official reference on the IC itself.
 
 References
 **********
diff --git a/boards/nordic/nrf52840dongle/board.cmake b/boards/nordic/nrf52840dongle/board.cmake
index 1f43fd93827bd..895ec1a36bd93 100644
--- a/boards/nordic/nrf52840dongle/board.cmake
+++ b/boards/nordic/nrf52840dongle/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nordic/nrf52840dongle/doc/img/nrf52840dongle_nrf52840.jpg b/boards/nordic/nrf52840dongle/doc/img/nrf52840dongle.jpg
similarity index 100%
rename from boards/nordic/nrf52840dongle/doc/img/nrf52840dongle_nrf52840.jpg
rename to boards/nordic/nrf52840dongle/doc/img/nrf52840dongle.jpg
diff --git a/boards/nordic/nrf52840dongle/doc/index.rst b/boards/nordic/nrf52840dongle/doc/index.rst
index db2e7d70de0bd..95ec7a34288ae 100644
--- a/boards/nordic/nrf52840dongle/doc/index.rst
+++ b/boards/nordic/nrf52840dongle/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf52840dongle_nrf52840:
-
-nRF52840 Dongle
-###############
+.. zephyr:board:: nrf52840dongle
 
 Overview
 ********
@@ -24,12 +21,6 @@ Semiconductor nRF52840 ARM Cortex-M4F CPU and the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf52840dongle_nrf52840.jpg
-     :align: center
-     :alt: nRF52840 Dongle
-
-     nRF52840 Dongle
-
 More information about the board can be found at the
 `nRF52840 Dongle website`_. The `nRF52840 Dongle guide`_
 contains the processor's information and the datasheet.
@@ -45,43 +36,8 @@ is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf52840dongle/nrf52840`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF52840 Dongle website`_ and `nRF52840 Dongle Hardware description`_
 for a complete list of nRF52840 Dongle board hardware features.
 
@@ -105,6 +61,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf52840dongle/nrf52840`` board configuration can be
 built in the usual way (see :ref:`build_an_application` for more details).
 
diff --git a/boards/nordic/nrf52dk/board.cmake b/boards/nordic/nrf52dk/board.cmake
index f5b4011822a46..f0434e838623c 100644
--- a/boards/nordic/nrf52dk/board.cmake
+++ b/boards/nordic/nrf52dk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/nrf52dk/doc/index.rst b/boards/nordic/nrf52dk/doc/index.rst
index 61349e8d31c2b..6d3c8c0635691 100644
--- a/boards/nordic/nrf52dk/doc/index.rst
+++ b/boards/nordic/nrf52dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf52dk_nrf52832:
-
-nRF52 DK
-########
+.. zephyr:board:: nrf52dk
 
 Overview
 ********
@@ -25,12 +22,6 @@ the following devices:
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf52dk_nrf52832.jpg
-     :align: center
-     :alt: nRF52 DK
-
-     nRF52 DK (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the
 `nRF52 DK website`_. `nRF52832 Product Specification`_
 contains the processor's information and the datasheet.
@@ -46,42 +37,8 @@ is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf52dk/nrf52832`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF52 DK website`_ and `nRF52832 Product Specification`_
 for a complete list of nRF52 Development Kit board hardware features.
 
@@ -348,6 +305,8 @@ P5/P11
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
@@ -397,59 +356,38 @@ You can build and flash the examples to make sure Zephyr is running correctly on
 your board. The button and LED definitions can be found in
 :zephyr_file:`boards/nordic/nrf52dk/nrf52dk_nrf52832.dts`.
 
-References
-**********
-
-.. target-notes::
-
-.. _nRF52 DK website: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52-DK
-.. _nRF52832 Product Specification: https://docs.nordicsemi.com/bundle/ps_nrf52832/page/nrf52832_ps.html
-
 .. _nrf52dk_nrf52805:
 
 nRF52805 emulation on nRF52 DK
-##############################
-
-Overview
-********
+******************************
 
-The ``nrf52dk/nrf52805`` board is a modified version of the :ref:`nrf52dk_nrf52832`
+The ``nrf52dk/nrf52805`` board is a modified version of the :zephyr:board:`nrf52dk`
 that enforces the limitations imposed by the nRF52805 IC, which is a
 cost-reduced variant of the original nRF52832. Since Nordic does not offer a
 development kit for the nRF52805, you can use this board to develop for this
 IC while using the nRF52 Development Kit (PCA10040).
 
-See :ref:`nrf52dk_nrf52832` for more information about the development board and
-`nRF52805 website`_ for the official reference on the IC itself.
-
-References
-**********
-
-.. target-notes::
-
-.. _nRF52805 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52805
+See `nRF52805 website`_ for the official reference on the IC itself.
 
 .. _nrf52dk_nrf52810:
 
 nRF52810 emulation on nRF52 DK
-##############################
+******************************
 
-Overview
-********
-
-The ``nrf52dk/nrf52810`` board is a modified version of the :ref:`nrf52dk_nrf52832`
+The ``nrf52dk/nrf52810`` board variant is a modified version of the :zephyr:board:`nrf52dk`
 that enforces the limitations imposed by the nRF52810 IC, which is a
 cost-reduced variant of the original nRF52832. Since Nordic does not offer a
 development kit for the nRF52810 you can use this board to develop for this
 IC while using the nRF52 Development Kit (PCA10040).
 
-See :ref:`nrf52dk_nrf52832` for more information about the development board and
-`nRF52810 website`_ for the official reference on the IC itself.
-
+See `nRF52810 website`_ for the official reference on the IC itself.
 
 References
 **********
 
 .. target-notes::
 
+.. _nRF52 DK website: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52-DK
+.. _nRF52832 Product Specification: https://docs.nordicsemi.com/bundle/ps_nrf52832/page/nrf52832_ps.html
+.. _nRF52805 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52805
 .. _nRF52810 website: https://www.nordicsemi.com/Products/Low-power-short-range-wireless/nRF52810
diff --git a/boards/nordic/nrf5340_audio_dk/board.cmake b/boards/nordic/nrf5340_audio_dk/board.cmake
index b44ece9b7e5c0..cfbdc3ff52b73 100644
--- a/boards/nordic/nrf5340_audio_dk/board.cmake
+++ b/boards/nordic/nrf5340_audio_dk/board.cmake
@@ -10,6 +10,6 @@ elseif(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf5340_audio_dk/doc/index.rst b/boards/nordic/nrf5340_audio_dk/doc/index.rst
index f7b23c0d6de63..239e2846b143c 100644
--- a/boards/nordic/nrf5340_audio_dk/doc/index.rst
+++ b/boards/nordic/nrf5340_audio_dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf5340_audio_dk_nrf5340:
-
-nRF5340 Audio DK
-################
+.. zephyr:board:: nrf5340_audio_dk
 
 Overview
 ********
@@ -31,10 +28,6 @@ The nRF5340 Audio DK comes with the following hardware features:
 * Stereo analog input using 3.5 mm jack
 * USB soundcard capability
 
-.. figure:: img/nrf5340_audio_dk.jpg
-     :align: center
-     :alt: nRF5340 DK
-
 More information about the board can be found at the `nRF5340 Audio DK website`_. The `nRF5340 Audio DK hardware guide`_
 contains the processor's information and the datasheet.
 
@@ -59,13 +52,17 @@ the datasheet.
 Supported Features
 ==================
 
-See :ref:`nrf5340dk_nrf5340` and `nRF5340 Audio DK hardware guide`_
+.. zephyr:board-supported-hw::
+
+See :zephyr:board:`nrf5340dk` and `nRF5340 Audio DK hardware guide`_
 for a complete list of nRF5340 Audio DK board hardware features.
 
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
@@ -84,7 +81,7 @@ applications as usual (:ref:`build_an_application` and
 
    .. code-block:: console
 
-      west flash -H -r nrfjprog --skip-rebuild
+      west flash -H -r nrfutil --skip-rebuild
 
 .. note::
 
diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_ns.yaml
index efa82f669a00e..9f189ce164e83 100644
--- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_ns.yaml
+++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_ns.yaml
@@ -15,3 +15,4 @@ supported:
   - watchdog
   - usb_device
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf5340dk/board.cmake b/boards/nordic/nrf5340dk/board.cmake
index 306f1d7e4fbd5..3634697dd7701 100644
--- a/boards/nordic/nrf5340dk/board.cmake
+++ b/boards/nordic/nrf5340dk/board.cmake
@@ -16,6 +16,6 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf5340dk/doc/index.rst b/boards/nordic/nrf5340dk/doc/index.rst
index 9aa3f79180b1d..e896701d55631 100644
--- a/boards/nordic/nrf5340dk/doc/index.rst
+++ b/boards/nordic/nrf5340dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf5340dk_nrf5340:
-
-nRF5340 DK
-##########
+.. zephyr:board:: nrf5340dk
 
 Overview
 ********
@@ -40,12 +37,6 @@ nRF5340 SoC provides support for the following devices:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf5340dk.jpg
-     :align: center
-     :alt: nRF5340 DK
-
-     nRF5340 DK (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the
 `nRF5340 DK website`_.
 The `nRF5340 DK Product Specification`_
@@ -62,76 +53,8 @@ is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf5340dk/nrf5340/cpuapp`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The ``nrf5340dk/nrf5340/cpunet`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF5340 DK Product Specification`_
 for a complete list of nRF5340 DK board hardware features.
 
@@ -168,6 +91,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 nRF5340 application core supports the Armv8-M Security Extension.
 Applications built for the ``nrf5340dk/nrf5340/cpuapp`` board by default
 boot in the Secure state.
@@ -269,7 +194,7 @@ applications as usual (:ref:`build_an_application` and
 
    .. code-block:: console
 
-      west flash -H -r nrfjprog --skip-rebuild
+      west flash -H -r nrfutil --skip-rebuild
 
 .. note::
 
diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
index 0f7463dc3e126..eaf2b54853106 100644
--- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
+++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml
@@ -8,6 +8,10 @@ toolchain:
 ram: 192
 flash: 192
 supported:
+  - arduino_gpio
+  - arduino_i2c
+  - arduino_serial
+  - arduino_spi
   - i2c
   - pwm
   - watchdog
diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
index 268722f5fe56d..60c9345eb045b 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -17,3 +17,13 @@ config MAX_THREAD_BYTES
 	default 3 if USERSPACE
 
 endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
+
+if BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON
+
+config ROM_START_OFFSET
+	default 0x800 if BOOTLOADER_MCUBOOT
+
+config FLASH_LOAD_OFFSET
+	default 0x2c000 if !USE_DT_CODE_PARTITION
+
+endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON
diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index 62ad7a0d21c19..de513858e9c58 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -2,9 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54H20DK
-	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
+	select SOC_NRF54H20_CPUAPP if (BOARD_NRF54H20DK_NRF54H20_CPUAPP || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON)
 	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
 	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
 				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP)
 	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
 				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP)
+	select SOC_NRF54H20_IRON if BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON
diff --git a/boards/nordic/nrf54h20dk/board.cmake b/boards/nordic/nrf54h20dk/board.cmake
index 80963356dc989..5ad6557c00343 100644
--- a/boards/nordic/nrf54h20dk/board.cmake
+++ b/boards/nordic/nrf54h20dk/board.cmake
@@ -2,8 +2,9 @@
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 
-if(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD)
-  if(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP)
+if(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD
+    OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON)
+  if(CONFIG_SOC_NRF54H20_CPUAPP)
     set(JLINKSCRIPTFILE ${CMAKE_CURRENT_LIST_DIR}/support/nrf54h20_cpuapp.JLinkScript)
   else()
     set(JLINKSCRIPTFILE ${CMAKE_CURRENT_LIST_DIR}/support/nrf54h20_cpurad.JLinkScript)
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 2d3d40c20e0bb..2009cc6130b69 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -9,6 +9,8 @@ board:
       cpucluster: cpuppr
     - name: xip
       cpucluster: cpuflpr
+    - name: iron
+      cpucluster: cpuapp
   revision:
     format: major.minor.patch
     default: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/doc/index.rst b/boards/nordic/nrf54h20dk/doc/index.rst
index 43a92673e39e9..a15e0872dc914 100644
--- a/boards/nordic/nrf54h20dk/doc/index.rst
+++ b/boards/nordic/nrf54h20dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf54h20dk_nrf54h20:
-
-nRF54H20 DK
-###########
+.. zephyr:board:: nrf54h20dk
 
 Overview
 ********
@@ -59,49 +56,7 @@ nRF54H20 DK has two crystal oscillators:
 Supported Features
 ==================
 
-The ``nrf54h20dk/nrf54h20/cpuapp`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GRTC      | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The ``nrf54h20dk/nrf54h20/cpurad`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GRTC      | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -126,6 +81,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    When first using the nRF54H20 DK, you must program the `nRF54H20 SoC binaries`_ on the development kit.
    To do so, follow the bring up steps instructions on the `Getting started with the nRF54H20 DK`_ documentation.
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi
index 0c5307c4c8c25..b0cb997de9477 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-common.dtsi
@@ -16,3 +16,6 @@
 &lfxo {
 	status = "okay";
 };
+
+/* Get a node label for wi-fi spi to use in shield files */
+wifi_spi: &spi130 {};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
index 8392389c0ad67..f293740255400 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -7,44 +7,44 @@
 
 / {
 	reserved-memory {
-		cpurad_ram0x_region: memory@2f010000 {
+		cpuapp_ram0x_region: memory@2f010000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(4)>;
+			reg = <0x2f010000 DT_SIZE_K(260)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f010000 0x1000>;
+			ranges = <0x0 0x2f010000 0x41000>;
 
-			cpusec_cpurad_ipc_shm: memory@0 {
+			cpusec_cpuapp_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpurad_cpusec_ipc_shm: memory@800 {
+			cpuapp_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
+
+			cpuapp_data: memory@1000 {
+				reg = <0x1000 DT_SIZE_K(256)>;
+			};
 		};
 
-		cpuapp_ram0x_region: memory@2f011000 {
+		cpurad_ram0x_region: memory@2f051000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f011000 DT_SIZE_K(260)>;
+			reg = <0x2f051000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f011000 0x41000>;
+			ranges = <0x0 0x2f051000 0x1000>;
 
-			cpusec_cpuapp_ipc_shm: memory@0 {
+			cpusec_cpurad_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpuapp_cpusec_ipc_shm: memory@800 {
+			cpurad_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
-
-			cpuapp_data: memory@1000 {
-				reg = <0x1000 DT_SIZE_K(256)>;
-			};
 		};
 
 		etr_buf_ram0x_region: memory@2f0be000 {
@@ -174,6 +174,15 @@
 			zephyr,memory-region = "DMA_RAM3x_RAD";
 			zephyr,memory-attr = <( DT_MEM_DMA )>;
 		};
+
+		xip_region: memory@60000000 {
+			compatible = "nordic,owned-memory";
+			reg = <0x60000000 0x20000000>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x60000000 0x20000000>;
+		};
 	};
 };
 
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
index 79ac2c6b7ad7c..f62df87dfe269 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
@@ -73,12 +73,37 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
+		group1 {
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
+		};
+	};
+
 	/omit-if-no-ref/ can120_default: can120_default {
 		group1 {
 			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
@@ -98,4 +123,19 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ grtc_default: grtc_default {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 1)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 95d557bf944de..65515b1dd4e8d 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -143,16 +143,11 @@
 };
 
 &cpusec_cpuapp_ipc {
-	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpuapp_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpuapp_ipc_shm>;
 };
 
-&cpusec_bellboard {
-	status = "okay";
-};
-
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "rx", "tx";
@@ -256,15 +251,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -277,6 +272,17 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+		t-reset-pulse = <10000>;
+		t-reset-recovery = <35000>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
new file mode 100644
index 0000000000000..79fea7a01c577
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_cpuapp.dts"
+
+/delete-node/&cpurad_rx_partitions;
+/delete-node/&cpuapp_rx_partitions;
+/delete-node/&cpusec_cpuapp_ipc;
+
+/* This is not yet an exhaustive memory map, and contain only a minimum required to boot
+ * the application core.
+ */
+
+/ {
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,uart-mcumgr = &uart136;
+	};
+};
+
+&mram1x {
+	cpuapp_rx_partitions: cpuapp-rx-partitions {
+		compatible = "nordic,owned-partitions", "fixed-partitions";
+		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@2c000 {
+			label = "mcuboot";
+			reg = <0x2c000 DT_SIZE_K(64)>;
+		};
+
+		slot0_partition: partition@3c000 {
+			label = "image-0";
+			reg = <0x3c000 DT_SIZE_K(200)>;
+		};
+
+		slot1_partition: partition@6E000 {
+			label = "image-1";
+			reg = <0x6E000 DT_SIZE_K(200)>;
+		};
+
+		cpuppr_code_partition: partition@a4000 {
+			reg = <0xa4000 DT_SIZE_K(64)>;
+		};
+
+		cpuflpr_code_partition: partition@b4000 {
+			reg = <0xb4000 DT_SIZE_K(48)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml
new file mode 100644
index 0000000000000..eefca56fe0c36
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_0_9_0.yaml
@@ -0,0 +1,25 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpuapp/iron
+name: nRF54H20-DK-nRF54H20-Application (IRONside compatible) (revision 0.9.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 256
+flash: 480
+supported:
+  - adc
+  - can
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - retained_mem
+  - spi
+  - watchdog
+  - usbd
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_defconfig b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_defconfig
new file mode 100644
index 0000000000000..01f3bec393219
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron_defconfig
@@ -0,0 +1,29 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# MPU-based null-pointer dereferencing detection cannot be applied
+# as the (0x0 - 0x400) region is unmapped for this target.
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable cache
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_EXTERNAL_CACHE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# UICR generation is not supported, and when reintroduced will not use nrf-regtool.
+CONFIG_NRF_REGTOOL_GENERATE_UICR=n
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 49ca847873f74..383512caaf3d2 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -59,16 +59,11 @@
 };
 
 &cpusec_cpurad_ipc {
-	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpurad_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpurad_ipc_shm>;
 };
 
-&cpusec_bellboard {
-	status = "okay";
-};
-
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "tx", "rx";
diff --git a/boards/nordic/nrf54l09pdk/Kconfig.defconfig b/boards/nordic/nrf54l09pdk/Kconfig.defconfig
index 44589c9b35b75..f6c1efe188bf1 100644
--- a/boards/nordic/nrf54l09pdk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l09pdk/Kconfig.defconfig
@@ -3,9 +3,6 @@
 
 if BOARD_NRF54L09PDK_NRF54L09_CPUAPP
 
-config BT_CTLR
-	default BT
-
 config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 
diff --git a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
index bc6aa67628183..6fbd4a89c8f08 100644
--- a/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
+++ b/boards/nordic/nrf54l09pdk/Kconfig.nrf54l09pdk
@@ -3,3 +3,4 @@
 
 config BOARD_NRF54L09PDK
 	select SOC_NRF54L09_ENGA_CPUAPP if BOARD_NRF54L09PDK_NRF54L09_CPUAPP
+	select SOC_NRF54L09_ENGA_CPUFLPR if BOARD_NRF54L09PDK_NRF54L09_CPUFLPR
diff --git a/boards/nordic/nrf54l09pdk/board.cmake b/boards/nordic/nrf54l09pdk/board.cmake
index 5d36ac00a3e72..89977a4cef6c6 100644
--- a/boards/nordic/nrf54l09pdk/board.cmake
+++ b/boards/nordic/nrf54l09pdk/board.cmake
@@ -1,7 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+if(CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP)
+  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+elseif(CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR)
+  board_runner_args(jlink "--speed=4000")
+endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l09pdk/doc/index.rst b/boards/nordic/nrf54l09pdk/doc/index.rst
index 77169e8e52b57..4d5d9e3b3a93e 100644
--- a/boards/nordic/nrf54l09pdk/doc/index.rst
+++ b/boards/nordic/nrf54l09pdk/doc/index.rst
@@ -1,8 +1,5 @@
 .. zephyr:board:: nrf54l09pdk
 
-nRF54L09 PDK
-############
-
 Overview
 ********
 
@@ -36,29 +33,13 @@ internal or external capacitors.
 Supported Features
 ==================
 
-The ``nrf54l09pdk/nrf54l09/cpuapp`` board target supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| RRAM      | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GRTC      | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf54l09pdk/nrf54l09/cpuapp`` board target can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
index 769b776aa1f9e..f1e9ee9afd855 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi
@@ -60,3 +60,15 @@
 	pinctrl-1 = <&uart20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
index 83aa91d8a34a1..ac08b201f9304 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi
@@ -21,4 +21,27 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp.yaml b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp.yaml
index 76e072b60618b..6edd22f0a418a 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp.yaml
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp.yaml
@@ -14,3 +14,4 @@ flash: 200
 supported:
   - counter
   - gpio
+  - watchdog
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp_defconfig b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp_defconfig
index 02796a1361ef9..80996ce11adec 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp_defconfig
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp_defconfig
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
 
 # Enable hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
new file mode 100644
index 0000000000000..3a1e3c7dd518d
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l09_enga_cpuflpr.dtsi>
+#include "nrf54l09pdk_nrf54l09-common.dtsi"
+
+/ {
+	model = "Nordic nRF54L09 PDK nRF54L09 FLPR MCU";
+	compatible = "nordic,nrf54l09pdk_nrf54l09-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(48)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
new file mode 100644
index 0000000000000..01e5c9ffbee61
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l09pdk/nrf54l09/cpuflpr
+name: nRF54L09-PDK-nRF54L09-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 48
+flash: 48
+supported:
+  - counter
+  - gpio
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
new file mode 100644
index 0000000000000..90cf13bdee5eb
--- /dev/null
+++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig
@@ -0,0 +1,17 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
diff --git a/boards/nordic/nrf54l15dk/Kconfig b/boards/nordic/nrf54l15dk/Kconfig
new file mode 100644
index 0000000000000..bf64dd32293dc
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/Kconfig
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# nRF54L15 DK board configuration
+
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
+
+DT_NRF_MPC := $(dt_nodelabel_path,nrf_mpc)
+
+config NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default $(dt_node_int_prop_hex,$(DT_NRF_MPC),override-granularity)
+	help
+	  This defines the flash region size from the TrustZone perspective.
+	  It is used when configuring the TrustZone and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TrustZone without depending
+	  on peripheral-specific symbols.
+
+config NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default $(dt_node_int_prop_hex,$(DT_NRF_MPC),override-granularity)
+	help
+	  This defines the RAM region size from the TrustZone perspective.
+	  It is used when configuring the TrustZone and when setting alignments
+	  requirements for the partitions.
+	  This abstraction allows us to configure TrustZone without depending
+	  on peripheral specific symbols.
+
+endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 639cbccf3f409..9628b1fdf963e 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -1,6 +1,10 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
+
 if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	BOARD_NRF54L15DK_NRF54L15_CPUAPP
 
@@ -9,3 +13,21 @@ config ROM_START_OFFSET
 
 endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
+
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
+
+config BT_CTLR
+	default BT
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y
+
+endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
diff --git a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
index 25472cfff6c47..c7ae2fff59626 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
+++ b/boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk
@@ -3,7 +3,7 @@
 
 config BOARD_NRF54L15DK
 	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
-	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
-	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
+	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
+	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP
diff --git a/boards/nordic/nrf54l15dk/board.cmake b/boards/nordic/nrf54l15dk/board.cmake
index 6f615c5350513..03383155d98d2 100644
--- a/boards/nordic/nrf54l15dk/board.cmake
+++ b/boards/nordic/nrf54l15dk/board.cmake
@@ -3,10 +3,20 @@
 
 if(CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP OR CONFIG_SOC_NRF54L15_CPUAPP)
 	board_runner_args(jlink "--device=nRF54L15_M33" "--speed=4000")
-elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR CONFIG_SOC_NRF54L15_CPUFLPR)
+elseif(CONFIG_SOC_NRF54L15_CPUFLPR)
+  board_runner_args(jlink "--device=nRF54L15_RV32")
+elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR)
   set(JLINKSCRIPTFILE ${CMAKE_CURRENT_LIST_DIR}/support/nrf54l_05_10_15_cpuflpr.JLinkScript)
   board_runner_args(jlink "--device=RISC-V" "--speed=4000" "-if SW" "--tool-opt=-jlinkscriptfile ${JLINKSCRIPTFILE}")
 endif()
 
+if(CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS OR CONFIG_BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
+endif()
+
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l15dk/board.yml b/boards/nordic/nrf54l15dk/board.yml
index f1a873cc35f42..8d97ef356a91a 100644
--- a/boards/nordic/nrf54l15dk/board.yml
+++ b/boards/nordic/nrf54l15dk/board.yml
@@ -3,9 +3,51 @@ board:
   full_name: nRF54L15 DK
   vendor: nordic
   socs:
-  - name: nrf54l05
-  - name: nrf54l10
-  - name: nrf54l15
-    variants:
-    - name: xip
-      cpucluster: cpuflpr
+    - name: nrf54l05
+    - name: nrf54l10
+      variants:
+        - name: ns
+          cpucluster: cpuapp
+    - name: nrf54l15
+      variants:
+        - name: xip
+          cpucluster: cpuflpr
+        - name: ns
+          cpucluster: cpuapp
+runners:
+  run_once:
+    '--recover':
+      - runners:
+          - nrfjprog
+          - nrfutil
+        run: first
+        groups:
+          - boards:
+              - nrf54l15dk/nrf54l15/cpuapp
+              - nrf54l15dk/nrf54l15/cpuapp/ns
+              - nrf54l15dk/nrf54l15/cpuflpr
+              - nrf54l15dk/nrf54l15/cpuflpr/xip
+    '--erase':
+      - runners:
+          - nrfjprog
+          - jlink
+          - nrfutil
+        run: first
+        groups:
+          - boards:
+              - nrf54l15dk/nrf54l15/cpuapp
+              - nrf54l15dk/nrf54l15/cpuapp/ns
+              - nrf54l15dk/nrf54l15/cpuflpr
+              - nrf54l15dk/nrf54l15/cpuflpr/xip
+    '--reset':
+      - runners:
+          - nrfjprog
+          - jlink
+          - nrfutil
+        run: last
+        groups:
+          - boards:
+              - nrf54l15dk/nrf54l15/cpuapp
+              - nrf54l15dk/nrf54l15/cpuapp/ns
+              - nrf54l15dk/nrf54l15/cpuflpr
+              - nrf54l15dk/nrf54l15/cpuflpr/xip
diff --git a/boards/nordic/nrf54l15dk/doc/index.rst b/boards/nordic/nrf54l15dk/doc/index.rst
index 6d0617746af3a..cab58e2d21be2 100644
--- a/boards/nordic/nrf54l15dk/doc/index.rst
+++ b/boards/nordic/nrf54l15dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf54l15dk_nrf54l15:
-
-nRF54L15 DK
-############
+.. zephyr:board:: nrf54l15dk
 
 Overview
 ********
@@ -29,12 +26,6 @@ nRF54L15 Arm Cortex-M33 CPU and the following devices:
 * :abbr:`UARTE (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/nrf54l15dk_nrf54l15.webp
-     :align: center
-     :alt: nRF54L15 DK
-
-     nRF54L15 DK (Credit: Nordic Semiconductor)
-
 Hardware
 ********
 
@@ -49,62 +40,26 @@ internal or external capacitors.
 Supported Features
 ==================
 
-The ``nrf54l15dk/nrf54l15/cpuapp`` board target configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GRTC      | on-chip    | counter              |
-+-----------+------------+----------------------+
-| MEMCONF   | on-chip    | retained_mem         |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RRAM      | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SAADC     | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| TWIM      | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf54l15dk/nrf54l15/cpuapp`` board target can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
 building and running.
 
 Applications for the ``nrf54l15dk/nrf54l15/cpuflpr`` board target need
-to be built as multicore configuration with code snippet called ``vpr_launcher``
-for the application core.
+to be built using sysbuild to include the ``vpr_launcher`` image for the application core.
 
 Enter the following command to compile ``hello_world`` for the FLPR core:
 
 .. code-block:: console
 
-   west build -p -b nrf54l15dk/nrf54l15/cpuflpr --sysbuild -- -DSB_VPR_LAUNCHER=y
+   west build -p -b nrf54l15dk/nrf54l15/cpuflpr --sysbuild
 
 
 Flashing
@@ -152,43 +107,39 @@ Testing the LEDs and buttons in the nRF54L15 DK
 Test the nRF54L15 DK with a :zephyr:code-sample:`blinky` sample.
 
 
-.. _nRF54L15 website: https://www.nordicsemi.com/Products/nRF54L15
-.. _nRF54L15 documentation: https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/app_dev/device_guides/nrf54l/index.html
-
 .. _nrf54l15dk_nrf54l05:
 
 nRF54L05 emulation on nRF54L15 DK
-#################################
-
-Overview
-********
+*********************************
 
-The ``nrf54l15dk/nrf54l05`` board is a modified version of the :ref:`nrf54l15dk_nrf54l15`
+The ``nrf54l15dk/nrf54l05`` board is a modified version of the :zephyr:board:`nrf54l15dk`
 that enforces the limitations imposed by the nRF54L05 IC, which is a
 cost-reduced variant of the original nRF54L15. Since Nordic does not offer a
 development kit for the nRF54L05, you can use this board to develop for this
 IC while using the nRF54L15 Development Kit (PCA10156).
 
-See :ref:`nrf54l15dk_nrf54l15` for more information about the development board and
-`nRF54L05 website`_ for the official reference on the IC itself.
+See `nRF54L05 website`_ for the official reference on the IC itself.
 
-.. _nRF54L05 website: https://www.nordicsemi.com/Products/nRF54L05
 
 .. _nrf54l15dk_nrf54l10:
 
 nRF54L10 emulation on nRF54L15 DK
-#################################
+*********************************
 
-Overview
-********
-
-The ``nrf54l15dk/nrf54l10`` board is a modified version of the :ref:`nrf54l15dk_nrf54l15`
+The ``nrf54l15dk/nrf54l10`` board is a modified version of the :zephyr:board:`nrf54l15dk`
 that enforces the limitations imposed by the nRF54L10 IC, which is a
 cost-reduced variant of the original nRF54L15. Since Nordic does not offer a
 development kit for the nRF54L10 you can use this board to develop for this
 IC while using the nRF54L15 Development Kit (PCA10156).
 
-See :ref:`nrf54l15dk_nrf54l15` for more information about the development board and
-`nRF54L10 website`_ for the official reference on the IC itself.
+See `nRF54L10 website`_ for the official reference on the IC itself.
+
+References
+**********
 
+.. target-notes::
+
+.. _nRF54L15 website: https://www.nordicsemi.com/Products/nRF54L15
+.. _nRF54L15 documentation: https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/app_dev/device_guides/nrf54l/index.html
+.. _nRF54L05 website: https://www.nordicsemi.com/Products/nRF54L05
 .. _nRF54L10 website: https://www.nordicsemi.com/Products/nRF54L10
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
index 33cfebb55d6e6..6a40af0ee95d7 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi
@@ -98,3 +98,6 @@
 	pinctrl-1 = <&pwm20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+/* Get a node label for wi-fi spi to use in shield files */
+wifi_spi: &spi22 {};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
index 02796a1361ef9..80996ce11adec 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
 
 # Enable hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
index 1ae6be3e9e9c0..020fdd16af2f0 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts
@@ -35,29 +35,39 @@
 		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
+
 		boot_partition: partition@0 {
 			label = "mcuboot";
 			reg = <0x0 DT_SIZE_K(64)>;
 		};
+
 		slot0_partition: partition@10000 {
 			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(230)>;
+			reg = <0x10000 DT_SIZE_K(224)>;
 		};
-		slot0_ns_partition: partition@49800 {
+
+		slot0_ns_partition: partition@48000 {
 			label = "image-0-nonsecure";
-			reg = <0x49800 DT_SIZE_K(230)>;
+			reg = <0x48000 DT_SIZE_K(224)>;
 		};
-		slot1_partition: partition@83000 {
+
+		slot1_partition: partition@80000 {
 			label = "image-1";
-			reg = <0x83000 DT_SIZE_K(230)>;
+			reg = <0x80000 DT_SIZE_K(224)>;
 		};
-		slot1_ns_partition: partition@bc800 {
+
+		slot1_ns_partition: partition@b8000 {
 			label = "image-1-nonsecure";
-			reg = <0xbc800 DT_SIZE_K(230)>;
+			reg = <0xb8000 DT_SIZE_K(224)>;
 		};
-		storage_partition: partition@f6000 {
+
+		/* 32K from 0xf0000 to 0xf7fff reserved for TF-M partitions */
+
+		storage_partition: partition@f8000 {
 			label = "storage";
-			reg = <0xf6000 DT_SIZE_K(38)>;
+			reg = <0xf8000 DT_SIZE_K(28)>;
 		};
+
+		/* 2K from 0xff000 to 0xff7ff unused */
 	};
 };
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
index 02796a1361ef9..80996ce11adec 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
 
 # Enable hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts
new file mode 100644
index 0000000000000..f1aa851ed2d9a
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#define USE_NON_SECURE_ADDRESS_MAP 1
+
+#include <nordic/nrf54l10_cpuapp.dtsi>
+#include "nrf54l_05_10_15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "nordic,nrf54l15dk_nrf54l10-cpuapp";
+	model = "Nordic nRF54L15 DK nRF54L10 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,sram = &sram0_ns;
+		zephyr,entropy = &psa_rng;
+	};
+
+	/delete-node/ rng;
+
+	psa_rng: psa-rng {
+		status = "okay";
+	};
+};
+
+/ {
+	/*
+	 * Default SRAM planning when building for nRF54L10 with ARM TrustZone-M support.
+	 * - Lowest 96 kB SRAM allocated to Secure image (sram0_s).
+	 * - Upper 96 kB SRAM allocated to Non-Secure image (sram0_ns).
+	 *
+	 * nRF54L10 has 192 kB of volatile memory (SRAM) but the last 42kB are reserved for
+	 * the FLPR MCU.
+	 * This static layout needs to be the same with the upstream TF-M layout in the
+	 * header flash_layout.h of the relevant platform. Any updates in the layout
+	 * needs to happen both in the flash_layout.h and in this file at the same time.
+	 */
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		sram0_s: image_s@20000000 {
+			/* Secure image memory */
+			reg = <0x20000000 DT_SIZE_K(72)>;
+		};
+
+		sram0_ns: image_ns@20012000 {
+			/* Non-Secure image memory */
+			reg = <0x20012000 DT_SIZE_K(72)>;
+		};
+	};
+};
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		/* nRF54L10 has 1022 kB of non volatile memory (RRAM) but the
+		 * last 62kB are reserved for the FLPR MCU.
+		 *
+		 * This static layout needs to be the same with the upstream TF-M layout in the
+		 * header flash_layout.h of the relevant platform. Any updates in the layout
+		 * needs to happen both in the flash_layout.h and in this file at the same time.
+		 */
+		slot0_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0000000 DT_SIZE_K(384)>;
+		};
+
+		tfm_ps_partition: partition@60000 {
+			label = "tfm-ps";
+			reg = <0x00060000 DT_SIZE_K(16)>;
+		};
+
+		tfm_its_partition: partition@64000 {
+			label = "tfm-its";
+			reg = <0x00064000 DT_SIZE_K(16)>;
+		};
+
+		tfm_otp_partition: partition@68000 {
+			label = "tfm-otp";
+			reg = <0x00068000 DT_SIZE_K(8)>;
+		};
+
+		slot0_ns_partition: partition@6A000 {
+			label = "image-0-nonsecure";
+			reg = <0x0006A000 DT_SIZE_K(504)>;
+		};
+
+		storage_partition: partition@E8000 {
+			label = "storage";
+			reg = <0x000E8000 DT_SIZE_K(32)>;
+		};
+	};
+};
+
+&uart30 {
+	/* Disable so that TF-M can use this UART */
+	status = "disabled";
+};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.yaml
new file mode 100644
index 0000000000000..9f42daedf4e35
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l15dk/nrf54l10/cpuapp/ns
+name: nRF54l15-DK-nRF54l10-Application-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - zephyr
+ram: 192
+flash: 1022
+supported:
+  - adc
+  - gpio
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - adc
+  - i2s
+vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig
new file mode 100644
index 0000000000000..1d759be671ca7
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig
@@ -0,0 +1,36 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_ARM_MPU=y
+CONFIG_HW_STACK_PROTECTION=y
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# Don't enable the cache in the non-secure image as it is a
+# secure-only peripheral on 54l
+CONFIG_CACHE_MANAGEMENT=n
+CONFIG_EXTERNAL_CACHE=n
+
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_GPIO=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y
+
+# Disable TFM BL2 since it is not supported
+CONFIG_TFM_BL2=n
+
+# Support for silence logging is not supported at the moment
+# Tracked by: NCSDK-31930
+CONFIG_TFM_LOG_LEVEL_SILENCE=n
+
+# The oscillators are configured as secure and cannot be configured
+# from the non secure application directly. This needs to be set
+# otherwise nrfx will try to configure them, resulting in a bus
+# fault.
+CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml
index a8c4fe549072c..3fbfefe01a394 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml
@@ -14,6 +14,7 @@ flash: 324
 supported:
   - adc
   - counter
+  - dmic
   - gpio
   - i2c
   - pwm
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_defconfig
index 02796a1361ef9..80996ce11adec 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_defconfig
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_defconfig
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
 
 # Enable hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
new file mode 100644
index 0000000000000..3a7ca70eaedf1
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#define USE_NON_SECURE_ADDRESS_MAP 1
+
+#include <nordic/nrf54l15_cpuapp.dtsi>
+#include "nrf54l_05_10_15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "nordic,nrf54l15dk_nrf54l15-cpuapp";
+	model = "Nordic nRF54L15 DK nRF54L15 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,sram = &sram0_ns;
+		zephyr,entropy = &psa_rng;
+	};
+
+	/delete-node/ rng;
+
+	psa_rng: psa-rng {
+		status = "okay";
+	};
+};
+
+/ {
+	/*
+	 * Default SRAM planning when building for nRF54L15 with ARM TrustZone-M support
+	 * - Lowest 80 kB SRAM allocated to Secure image (sram0_s).
+	 * - Upper 80 kB SRAM allocated to Non-Secure image (sram0_ns).
+	 *
+	 * nRF54L15 has 256 kB of volatile memory (SRAM) but the last 96kB are reserved for
+	 * the FLPR MCU.
+	 * This static layout needs to be the same with the upstream TF-M layout in the
+	 * header flash_layout.h of the relevant platform. Any updates in the layout
+	 * needs to happen both in the flash_layout.h and in this file at the same time.
+	 */
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		sram0_s: image_s@20000000 {
+			/* Secure image memory */
+			reg = <0x20000000 DT_SIZE_K(80)>;
+		};
+
+		sram0_ns: image_ns@20014000 {
+			/* Non-Secure image memory */
+			reg = <0x20014000 DT_SIZE_K(80)>;
+		};
+	};
+};
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the
+		 * last 96kB are reserved for the FLPR MCU.
+		 *
+		 * This static layout needs to be the same with the upstream TF-M layout in the
+		 * header flash_layout.h of the relevant platform. Any updates in the layout
+		 * needs to happen both in the flash_layout.h and in this file at the same time.
+		 */
+		slot0_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0000000 DT_SIZE_K(512)>;
+		};
+
+		tfm_ps_partition: partition@80000 {
+			label = "tfm-ps";
+			reg = <0x00080000 DT_SIZE_K(16)>;
+		};
+
+		tfm_its_partition: partition@84000 {
+			label = "tfm-its";
+			reg = <0x00084000 DT_SIZE_K(16)>;
+		};
+
+		tfm_otp_partition: partition@88000 {
+			label = "tfm-otp";
+			reg = <0x00088000 DT_SIZE_K(8)>;
+		};
+
+		slot0_ns_partition: partition@8A000 {
+			label = "image-0-nonsecure";
+			reg = <0x0008A000 DT_SIZE_K(844)>;
+		};
+
+		storage_partition: partition@15D000 {
+			label = "storage";
+			reg = <0x00015D000 DT_SIZE_K(32)>;
+		};
+	};
+};
+
+&uart30 {
+	/* Disable so that TF-M can use this UART */
+	status = "disabled";
+
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
new file mode 100644
index 0000000000000..43bd7c8f2445c
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l15dk/nrf54l15/cpuapp/ns
+name: nRF54l15-DK-nRF54l15-Application-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - zephyr
+ram: 256
+flash: 1524
+supported:
+  - adc
+  - gpio
+  - i2c
+  - spi
+  - counter
+  - watchdog
+  - adc
+  - i2s
+vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
new file mode 100644
index 0000000000000..1d759be671ca7
--- /dev/null
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
@@ -0,0 +1,36 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_ARM_MPU=y
+CONFIG_HW_STACK_PROTECTION=y
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# Don't enable the cache in the non-secure image as it is a
+# secure-only peripheral on 54l
+CONFIG_CACHE_MANAGEMENT=n
+CONFIG_EXTERNAL_CACHE=n
+
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_GPIO=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y
+
+# Disable TFM BL2 since it is not supported
+CONFIG_TFM_BL2=n
+
+# Support for silence logging is not supported at the moment
+# Tracked by: NCSDK-31930
+CONFIG_TFM_LOG_LEVEL_SILENCE=n
+
+# The oscillators are configured as secure and cannot be configured
+# from the non secure application directly. This needs to be set
+# otherwise nrfx will try to configure them, resulting in a bus
+# fault.
+CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
index 0b6e2056a82e1..6b7457a2818d7 100644
--- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
+++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi
@@ -77,4 +77,19 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ grtc_default: grtc_default {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
index 09809ff737426..3ac84ee1ea3dc 100644
--- a/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
+++ b/boards/nordic/nrf54l20pdk/Kconfig.nrf54l20pdk
@@ -3,3 +3,4 @@
 
 config BOARD_NRF54L20PDK
 	select SOC_NRF54L20_ENGA_CPUAPP if BOARD_NRF54L20PDK_NRF54L20_CPUAPP
+	select SOC_NRF54L20_ENGA_CPUFLPR if BOARD_NRF54L20PDK_NRF54L20_CPUFLPR
diff --git a/boards/nordic/nrf54l20pdk/board.cmake b/boards/nordic/nrf54l20pdk/board.cmake
index 5d36ac00a3e72..3bb4e5201986f 100644
--- a/boards/nordic/nrf54l20pdk/board.cmake
+++ b/boards/nordic/nrf54l20pdk/board.cmake
@@ -1,7 +1,11 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+if(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUAPP)
+  board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
+elseif(CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUFLPR)
+  board_runner_args(jlink "--speed=4000")
+endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf54l20pdk/doc/index.rst b/boards/nordic/nrf54l20pdk/doc/index.rst
index aaed616eccef1..847380d4db641 100644
--- a/boards/nordic/nrf54l20pdk/doc/index.rst
+++ b/boards/nordic/nrf54l20pdk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf54l20pdk_nrf54l20:
-
-nRF54L20 PDK
-############
+.. zephyr:board:: nrf54l20pdk
 
 Overview
 ********
@@ -36,35 +33,24 @@ internal or external capacitors.
 Supported Features
 ==================
 
-The ``nrf54l20pdk/nrf54l20/cpuapp`` board target configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| RRAM      | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GRTC      | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf54l20pdk/nrf54l20/cpuapp`` board target can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
 building and running.
 
+Applications for the ``nrf54l20pdk/nrf54l20/cpuflpr`` board target need
+to be built using sysbuild to include the ``vpr_launcher`` image for the application core.
+
+Enter the following command to compile ``hello_world`` for the FLPR core::
+ west build -p -b nrf54l20pdk/nrf54l20/cpuflpr --sysbuild
+
 Flashing
 ========
 
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index 0d3c1fe98e999..457694d42143d 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -27,11 +27,6 @@
 	status = "okay";
 };
 
-&hfpll {
-	/* For now use 64 MHz clock for CPU and fast peripherals. */
-	clock-frequency = <DT_FREQ_M(64)>;
-};
-
 &lfxo {
 	load-capacitors = "internal";
 	load-capacitance-femtofarad = <15500>;
@@ -74,6 +69,10 @@
 			label = "image-1-nonsecure";
 			reg = <0x160c00 DT_SIZE_K(449)>;
 		};
+		storage_partition: partition@1d1000 {
+			label = "storage";
+			reg = <0x1d1000 DT_SIZE_K(36)>;
+		};
 	};
 };
 
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
index c188cd39e93da..6eb67fe1bb3f3 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi
@@ -27,6 +27,19 @@
 		};
 	};
 
+	pwmleds {
+		compatible = "pwm-leds";
+		/*
+		 * PWM signal can be exposed on GPIO pin only within same domain.
+		 * There is only one domain which contains both PWM and GPIO:
+		 * PWM20/21/22 and GPIO Port P1/P3.
+		 * Only LEDs connected to P1/P3 can work with PWM, for example LED1.
+		 */
+		pwm_led1: pwm_led_1 {
+			pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 		button0: button_0 {
@@ -56,6 +69,7 @@
 		led1 = &led1;
 		led2 = &led2;
 		led3 = &led3;
+		pwm-led0 = &pwm_led1;
 		sw0 = &button0;
 		sw1 = &button1;
 		sw2 = &button2;
@@ -70,3 +84,22 @@
 	pinctrl-1 = <&uart20_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+&pwm20 {
+	status = "okay";
+	pinctrl-0 = <&pwm20_default>;
+	pinctrl-1 = <&pwm20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
index 83aa91d8a34a1..b70be2bfa5eb9 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi
@@ -21,4 +21,40 @@
 			low-power-enable;
 		};
 	};
+
+	/omit-if-no-ref/ pwm20_default: pwm20_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 7)>;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 7)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
index 4cabfbc4eec6c..94ff06e7bbe77 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
@@ -12,7 +12,11 @@ sysbuild: true
 ram: 512
 flash: 449
 supported:
+  - adc
   - counter
+  - dmic
   - gpio
   - i2c
+  - pwm
+  - spi
   - watchdog
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp_defconfig b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp_defconfig
index 02796a1361ef9..80996ce11adec 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp_defconfig
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp_defconfig
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
 
 # Enable hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
-
-# MPU-based null-pointer dereferencing detection cannot
-# be applied as the (0x0 - 0x400) is unmapped for this target.
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-# Enable Cache
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-# Start SYSCOUNTER on driver init
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
new file mode 100644
index 0000000000000..ea3c5d6ff6a65
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.dts
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l20_enga_cpuflpr.dtsi>
+#include "nrf54l20pdk_nrf54l20-common.dtsi"
+
+/ {
+	model = "Nordic nRF54L20 PDK nRF54L20 FLPR MCU";
+	compatible = "nordic,nrf54l20pdk_nrf54l20-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
new file mode 100644
index 0000000000000..9535e42f71dc9
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr.yaml
@@ -0,0 +1,16 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54l20pdk/nrf54l20/cpuflpr
+name: nRF54L20-PDK-nRF54L20-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 64
+flash: 64
+supported:
+  - counter
+  - gpio
+  - watchdog
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
new file mode 100644
index 0000000000000..90cf13bdee5eb
--- /dev/null
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuflpr_defconfig
@@ -0,0 +1,17 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index 51730b54e6f68..569825110346b 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -7,5 +7,6 @@ elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf7002dk/doc/index.rst b/boards/nordic/nrf7002dk/doc/index.rst
index 3e3153c376f60..ff9d7c754711b 100644
--- a/boards/nordic/nrf7002dk/doc/index.rst
+++ b/boards/nordic/nrf7002dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf7002dk_nrf5340:
-
-nRF7002 DK
-##########
+.. zephyr:board:: nrf7002dk
 
 Overview
 ********
@@ -28,12 +25,6 @@ The ``nrf7002dk/nrf5340/cpuapp`` board target provides support for the applicati
 nRF5340 SoC. The ``nrf7002dk/nrf5340/cpunet`` board target provides support for the network
 core on the nRF5340 SoC.
 
-.. figure:: img/nrf7002dk.jpg
-   :align: center
-   :alt: nRF7002 DK
-
-   nRF7002 DK (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the
 `nRF7002 DK website`_.
 The `nRF7002 DK Product Specification`_
@@ -53,78 +44,8 @@ Hardware
 Supported features
 ------------------
 
-The ``nrf7002dk/nrf5340/cpuapp`` board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| RADIO     | nrf7002    | Wi-Fi 6 (802.11ax)   |
-+-----------+------------+----------------------+
-| QSPI      | on-chip    | qspi                 |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The ``nrf7002dk/nrf5340/cpunet`` board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `nRF7002 DK Product Specification`_
 for a complete list of nRF7002 DK board hardware features.
 
@@ -173,6 +94,8 @@ The following security components are available:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The nRF5340 application core supports the Armv8-M Security Extension.
 Applications built for the ``nrf7002dk/nrf5340/cpuapp`` board boot by default in the
 secure state.
diff --git a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
index 8a54d6da416c6..f0c0f082d9926 100644
--- a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
+++ b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
@@ -134,6 +134,11 @@
 	status = "okay";
 };
 
+&lfxo {
+	load-capacitors = "internal";
+	load-capacitance-picofarad = <7>;
+};
+
 &adc {
 	status = "okay";
 };
diff --git a/boards/nordic/nrf9131ek/board.cmake b/boards/nordic/nrf9131ek/board.cmake
index d67464ff5ae36..204c8af33fc55 100644
--- a/boards/nordic/nrf9131ek/board.cmake
+++ b/boards/nordic/nrf9131ek/board.cmake
@@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
 endif()
 
 board_runner_args(jlink "--device=nRF9131_xxCA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9131ek/doc/index.rst b/boards/nordic/nrf9131ek/doc/index.rst
index 236f6b396fc2a..98bf55e3d6d85 100644
--- a/boards/nordic/nrf9131ek/doc/index.rst
+++ b/boards/nordic/nrf9131ek/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf9131ek_nrf9131:
-
-nRF9131 EK
-##########
+.. zephyr:board:: nrf9131ek
 
 Overview
 ********
@@ -26,12 +23,6 @@ Cortex-M33F CPU with ARMv8-M Security Extension and the following devices:
 * :abbr:`WDT (Watchdog Timer)`
 * :abbr:`IDAU (Implementation Defined Attribution Unit)`
 
-.. figure:: img/nrf9131ek_nrf9131.webp
-     :align: center
-     :alt: nRF9131 EK
-
-     nRF9131 EK (Credit: Nordic Semiconductor)
-
 The `Nordic Semiconductor TechDocs`_ will soon
 contain the processor's information and the datasheet.
 
@@ -46,40 +37,7 @@ is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf9131ek/nrf9131`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -110,6 +68,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 ``nrf9131ek/nrf9131`` supports the Armv8m Security Extension, and by default boots
 in the Secure state.
 
diff --git a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_ns.yaml b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_ns.yaml
index 82aa310fe2cc8..69d0260b101d5 100644
--- a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_ns.yaml
+++ b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_ns.yaml
@@ -12,3 +12,5 @@ supported:
   - pwm
   - watchdog
   - netif:modem
+vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9151dk/board.cmake b/boards/nordic/nrf9151dk/board.cmake
index dc898e054b4f2..02b6c782c0ab0 100644
--- a/boards/nordic/nrf9151dk/board.cmake
+++ b/boards/nordic/nrf9151dk/board.cmake
@@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
 endif()
 
 board_runner_args(jlink "--device=nRF9151_xxCA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9151dk/doc/index.rst b/boards/nordic/nrf9151dk/doc/index.rst
index 2365de529f7eb..a688062d2dd4a 100644
--- a/boards/nordic/nrf9151dk/doc/index.rst
+++ b/boards/nordic/nrf9151dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf9151dk_nrf9151:
-
-nRF9151 DK
-##########
+.. zephyr:board:: nrf9151dk
 
 Overview
 ********
@@ -39,50 +36,7 @@ is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf9151dk/nrf9151`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| FLASH     | external   | spi                  |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GPIO      | external   | i2c                  |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | nRF53      | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-
-.. _nrf9151dk_additional_hardware:
-
-Other hardware features have not been enabled yet for this board.
-See the `nRF9151 website`_ for more information.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -117,6 +71,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 ``nrf9151dk/nrf9151`` supports the Armv8m Security Extension, and by default boots
 in the Secure state.
 
diff --git a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_ns.yaml b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_ns.yaml
index 7ab511f711628..a52bd42810500 100644
--- a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_ns.yaml
+++ b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_ns.yaml
@@ -17,3 +17,4 @@ supported:
   - watchdog
   - netif:modem
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9160dk/board.cmake b/boards/nordic/nrf9160dk/board.cmake
index 8bb0e6881830a..678cfbe5c17a6 100644
--- a/boards/nordic/nrf9160dk/board.cmake
+++ b/boards/nordic/nrf9160dk/board.cmake
@@ -10,13 +10,13 @@ if(CONFIG_BOARD_NRF9160DK_NRF9160 OR CONFIG_BOARD_NRF9160DK_NRF9160_NS)
   endif()
 
   board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
-  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 elseif(CONFIG_BOARD_NRF9160DK_NRF52840)
   board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
-  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
   include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
 endif()
diff --git a/boards/nordic/nrf9161dk/board.cmake b/boards/nordic/nrf9161dk/board.cmake
index 6581b63965897..5130159e744fc 100644
--- a/boards/nordic/nrf9161dk/board.cmake
+++ b/boards/nordic/nrf9161dk/board.cmake
@@ -9,5 +9,6 @@ if(CONFIG_TFM_FLASH_MERGED_BINARY)
 endif()
 
 board_runner_args(jlink "--device=nRF9161_xxCA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/nrf9161dk/doc/index.rst b/boards/nordic/nrf9161dk/doc/index.rst
index bb9d4eebbe4f6..00e2e702823e5 100644
--- a/boards/nordic/nrf9161dk/doc/index.rst
+++ b/boards/nordic/nrf9161dk/doc/index.rst
@@ -1,7 +1,4 @@
-.. _nrf9161dk_nrf9161:
-
-nRF9161 DK
-##########
+.. zephyr:board:: nrf9161dk
 
 Overview
 ********
@@ -41,49 +38,10 @@ is 32 MHz.
 Supported Features
 ==================
 
-The ``nrf9161dk/nrf9161`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| FLASH     | external   | spi                  |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GPIO      | external   | i2c                  |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | nRF53      | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
+.. zephyr:board-supported-hw::
 
 .. _nrf9161dk_additional_hardware:
 
-Other hardware features have not been enabled yet for this board.
 See `nRF9161 DK website`_ and `nRF9161 Product Specification`_
 for a complete list of nRF9161 DK board hardware features.
 
@@ -120,6 +78,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 ``nrf9161dk/nrf9161`` supports the Armv8m Security Extension, and by default boots
 in the Secure state.
 
diff --git a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_7_0.yaml b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_7_0.yaml
index 4d4a07965d6bc..806f2c73ea2fb 100644
--- a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_7_0.yaml
+++ b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_7_0.yaml
@@ -17,3 +17,4 @@ supported:
   - watchdog
   - netif:modem
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_9_0.yaml b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_9_0.yaml
index f08145b5cbcb7..9a71f59a18bff 100644
--- a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_9_0.yaml
+++ b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_ns_0_9_0.yaml
@@ -17,3 +17,4 @@ supported:
   - watchdog
   - netif:modem
 vendor: nordic
+sysbuild: true
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
index 48067a7052c33..709fda74f89fb 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
@@ -54,16 +54,34 @@
 	/omit-if-no-ref/ exmif_default: exmif_default {
 		group1 {
 			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
 				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
-				<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 			nordic,drive-mode = <NRF_DRIVE_H0H1>;
 		};
 	};
 
-	/omit-if-no-ref/ can120_default: can120_default {
+	/omit-if-no-ref/ exmif_sleep: exmif_sleep {
 		group1 {
-			psels = <NRF_PSEL(CAN_RX, 9, 4)>,
-				<NRF_PSEL(CAN_TX, 9, 5)>;
+			low-power-enable;
+			psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+				<NRF_PSEL(EXMIF_CS0, 6, 3)>,
+				<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
+				<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+				<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
+				<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
+				<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
+				<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
+				<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
+				<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
+				<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
 		};
 	};
 
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index a380ac7473aad..31502189d3f8e 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -27,7 +27,6 @@
 		zephyr,ieee802154 = &cpuapp_ieee802154;
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,canbus = &can120;
 	};
 
 	aliases {
@@ -243,15 +242,15 @@ ipc0: &cpuapp_cpurad_ipc {
 };
 
 &exmif {
-	cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&exmif_default>;
-	pinctrl-names = "default";
+	pinctrl-1 = <&exmif_sleep>;
+	pinctrl-names = "default", "sleep";
 	status = "okay";
+
 	mx25uw63: mx25uw6345g@0 {
-		compatible = "jedec,spi-nor";
+		compatible = "jedec,mspi-nor";
 		status = "disabled";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(48)>;
 		jedec-id = [c2 84 37];
 		sfdp-bfp = [
 			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
@@ -264,6 +263,17 @@ ipc0: &cpuapp_cpurad_ipc {
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <30000>;
+		reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
+		t-reset-pulse = <10000>;
+		t-reset-recovery = <35000>;
+
+		mspi-max-frequency = <DT_FREQ_M(50)>;
+		mspi-io-mode = "MSPI_IO_MODE_OCTAL";
+		mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
+		mspi-hardware-ce-num = <1>;
+		mspi-cpp-mode = "MSPI_CPP_MODE_0";
+		mspi-endian = "MSPI_BIG_ENDIAN";
+		mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
 	};
 };
 
@@ -275,16 +285,6 @@ zephyr_udc0: &usbhs {
 	status = "okay";
 };
 
-&canpll {
-	status = "okay";
-};
-
-&can120 {
-	status = "okay";
-	pinctrl-0 = <&can120_default>;
-	pinctrl-names = "default";
-};
-
 &pwm130 {
 	status = "okay";
 	pinctrl-0 = <&pwm130_default>;
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml
index fc718eb1c8ecb..d4bc799100dd2 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml
@@ -13,7 +13,6 @@ ram: 512
 flash: 1024
 supported:
   - adc
-  - can
   - counter
   - gpio
   - i2c
diff --git a/boards/nordic/thingy52/board.cmake b/boards/nordic/thingy52/board.cmake
index ee8654406105a..aa639b72df136 100644
--- a/boards/nordic/thingy52/board.cmake
+++ b/boards/nordic/thingy52/board.cmake
@@ -2,7 +2,7 @@
 
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/nordic/thingy52/doc/img/thingy52_nrf52832.jpg b/boards/nordic/thingy52/doc/img/thingy52.jpg
similarity index 100%
rename from boards/nordic/thingy52/doc/img/thingy52_nrf52832.jpg
rename to boards/nordic/thingy52/doc/img/thingy52.jpg
diff --git a/boards/nordic/thingy52/doc/index.rst b/boards/nordic/thingy52/doc/index.rst
index bef78aa2ed6db..b40b7f79df430 100644
--- a/boards/nordic/thingy52/doc/index.rst
+++ b/boards/nordic/thingy52/doc/index.rst
@@ -1,7 +1,4 @@
-.. _thingy52_nrf52832:
-
-Thingy:52
-#########
+.. zephyr:board:: thingy52
 
 .. warning::
 
@@ -34,12 +31,6 @@ processor, a set of environmental sensors, a pushbutton, and two RGB LEDs.
 * :abbr:`UART (Universal asynchronous receiver-transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/thingy52_nrf52832.jpg
-     :align: center
-     :alt: nRF52 Thingy:52
-
-     nRF52 Thingy:52 (Credit: Nordic Semiconductor)
-
 More information about the board can be found at the `nRF52 DK website`_. The
 `Nordic Thingy:52 guide`_ contains the processor's information and the
 datasheet.
@@ -61,46 +52,7 @@ Thingy:52 has the following features:
 Supported Features
 ==================
 
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| Gas       | on-board   | ccs811               |
-| Sensor    |            |                      |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| GPIO Exp  | on-board   | sx1509b              |
-+-----------+------------+----------------------+
-| Humidity  | on-board   | hts221               |
-| and Temp  |            |                      |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| Pressure  | on-board   | lps22hb_press        |
-| and Temp  |            |                      |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -348,6 +300,8 @@ CCS811
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
@@ -362,7 +316,7 @@ Thingy:52 does not have an on-board J-Link debug IC as some other nRF5
 development boards, however, instructions from the :ref:`nordic_segger` page
 also apply to this board, with the additional step of connecting an external
 debugger. A development board with a Debug out connector such as the
-:ref:`nrf52dk_nrf52832` can be used as a debugger with Thingy:52.
+:zephyr:board:`nrf52dk` can be used as a debugger with Thingy:52.
 
 Testing board features
 **********************
diff --git a/boards/nordic/thingy53/board.cmake b/boards/nordic/thingy53/board.cmake
index dc63ca3189509..916d982b65cce 100644
--- a/boards/nordic/thingy53/board.cmake
+++ b/boards/nordic/thingy53/board.cmake
@@ -6,6 +6,6 @@ elseif(CONFIG_BOARD_THINGY53_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nordic/thingy53/doc/index.rst b/boards/nordic/thingy53/doc/index.rst
index f82626e16842c..a3f49c06c93d4 100644
--- a/boards/nordic/thingy53/doc/index.rst
+++ b/boards/nordic/thingy53/doc/index.rst
@@ -1,7 +1,4 @@
-.. _thingy53_nrf5340:
-
-Thingy:53
-#########
+.. zephyr:board:: thingy53
 
 Overview
 ********
@@ -25,9 +22,19 @@ support for the network core on the nRF5340 SoC.
 The `Nordic Thingy:53 Hardware guide`_ contains the processor's information and
 the datasheet.
 
+Hardware
+********
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
@@ -41,7 +48,7 @@ Thingy:53 does not have an on-board J-Link debug IC as some other nRF5
 development boards, however, instructions from the :ref:`nordic_segger` page
 also apply to this board, with the additional step of connecting an external
 debugger. A development board with a Debug out connector such as the
-:ref:`nrf5340dk_nrf5340` can be used as a debugger with Thingy:53.
+:zephyr:board:`nrf5340dk` can be used as a debugger with Thingy:53.
 
 References
 **********
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpuapp.yaml b/boards/nordic/thingy53/thingy53_nrf5340_cpuapp.yaml
index c5b5c71d3d62c..568512216bdfb 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpuapp.yaml
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpuapp.yaml
@@ -8,6 +8,7 @@ toolchain:
 ram: 448
 flash: 1024
 supported:
+  - ble
   - gpio
   - i2c
   - pwm
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpuapp_ns.yaml b/boards/nordic/thingy53/thingy53_nrf5340_cpuapp_ns.yaml
index 8d9787515e6a0..e672b5080c4b0 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpuapp_ns.yaml
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpuapp_ns.yaml
@@ -15,3 +15,4 @@ supported:
   - usb_device
   - netif:openthread
 vendor: nordic
+sysbuild: true
diff --git a/boards/norik/octopus_io_board/board.cmake b/boards/norik/octopus_io_board/board.cmake
index e1ae7b4e9b237..9440e9893ea95 100644
--- a/boards/norik/octopus_io_board/board.cmake
+++ b/boards/norik/octopus_io_board/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/norik/octopus_io_board/doc/index.rst b/boards/norik/octopus_io_board/doc/index.rst
index 088a3b936d38f..52238ee0b6647 100644
--- a/boards/norik/octopus_io_board/doc/index.rst
+++ b/boards/norik/octopus_io_board/doc/index.rst
@@ -47,6 +47,11 @@ and in the `Octopus IO-Board Documentation`_.
 Hardware
 ********
 
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
 Connections and IOs
 ===================
 
@@ -86,6 +91,8 @@ The board also has multiple built-in test points for measuring current consumpti
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Norik Octopus IO-Board can be programmed and debugged using the Tag-Connect TC2030-IDC 6-pin connector or 6-pin SWD pinheader.
 
 Building an application
diff --git a/boards/norik/octopus_som/board.cmake b/boards/norik/octopus_som/board.cmake
index e1ae7b4e9b237..9440e9893ea95 100644
--- a/boards/norik/octopus_som/board.cmake
+++ b/boards/norik/octopus_som/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/norik/octopus_som/doc/index.rst b/boards/norik/octopus_som/doc/index.rst
index 1d3790a04d701..5bbf484599d47 100644
--- a/boards/norik/octopus_som/doc/index.rst
+++ b/boards/norik/octopus_som/doc/index.rst
@@ -32,42 +32,10 @@ in the `Octopus SoM Documentation`_.
 Hardware
 ********
 
-The ``octopus_som/nrf9160`` and ``octopus_som/nrf9160/ns`` board targets support the
-following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| ACCEL     | Analog     | adxl362              |
-+-----------+------------+----------------------+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -91,6 +59,8 @@ SIM select switch
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Norik Octopus SoM can be programmed and debugged using the exposed SWD pins.
 
 Building an application
diff --git a/boards/nuvoton/npcm400_evb/doc/index.rst b/boards/nuvoton/npcm400_evb/doc/index.rst
index 93c91eb474adc..48758a08cb600 100644
--- a/boards/nuvoton/npcm400_evb/doc/index.rst
+++ b/boards/nuvoton/npcm400_evb/doc/index.rst
@@ -26,33 +26,7 @@ Hardware
 Supported Features
 ==================
 
-The following features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc controller                      |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port/controller                 |
-+-----------+------------+-------------------------------------+
-| I3C       | on-chip    | i3c port/controller                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nuvoton/npcm400_evb/npcm400_evb_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -67,6 +41,8 @@ UART0 is configured for serial logs. The default serial setup is 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board comes with a Cortex ETM port which facilitates tracing and debugging
 using a single physical connection. In addition, it comes with sockets for
 JTAG-only sessions.
diff --git a/boards/nuvoton/npcx4m8f_evb/Kconfig.defconfig b/boards/nuvoton/npcx4m8f_evb/Kconfig.defconfig
index 4bd26c0d34858..f7c7cc5430af7 100644
--- a/boards/nuvoton/npcx4m8f_evb/Kconfig.defconfig
+++ b/boards/nuvoton/npcx4m8f_evb/Kconfig.defconfig
@@ -3,6 +3,3 @@
 
 config SYS_CLOCK_TICKS_PER_SEC
 	default 1000
-
-config INPUT
-	default y if KSCAN
diff --git a/boards/nuvoton/npcx4m8f_evb/doc/index.rst b/boards/nuvoton/npcx4m8f_evb/doc/index.rst
index 1fd1e7ae5d97a..1f941510cb8bf 100644
--- a/boards/nuvoton/npcx4m8f_evb/doc/index.rst
+++ b/boards/nuvoton/npcx4m8f_evb/doc/index.rst
@@ -21,42 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The following features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc controller                      |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port/controller                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PM        | on-chip    | power management                    |
-+-----------+------------+-------------------------------------+
-| PSL       | on-chip    | power switch logic                  |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pulse width modulator               |
-+-----------+------------+-------------------------------------+
-| TACH      | on-chip    | tachometer sensor                   |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr (at the moment)
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -78,6 +43,8 @@ UART1 is configured for serial logs.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board comes with a Cortex ETM port which facilitates tracing and debugging
 using a single physical connection. In addition, it comes with sockets for
 JTAG-only sessions.
diff --git a/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.dts b/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.dts
index e175105a7e18a..6c0e8cc23b419 100644
--- a/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.dts
+++ b/boards/nuvoton/npcx4m8f_evb/npcx4m8f_evb.dts
@@ -16,8 +16,8 @@
 	chosen {
 		zephyr,sram = &sram0;
 		zephyr,console = &uart1;
+		zephyr,shell-uart = &uart1;
 		zephyr,flash = &flash0;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	aliases {
@@ -27,7 +27,6 @@
 		i2c-0 = &i2c0_0;
 		watchdog0 = &twd0;
 		peci-0 = &peci0;
-		kscan0 = &kscan_input;
 	};
 
 	leds-pwm {
@@ -113,10 +112,6 @@
 	row-size = <8>;
 	col-size = <13>;
 	status = "okay";
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
 
 &i3c0 {
diff --git a/boards/nuvoton/npcx7m6fb_evb/Kconfig.defconfig b/boards/nuvoton/npcx7m6fb_evb/Kconfig.defconfig
index 91a81edc3531a..824959461942a 100644
--- a/boards/nuvoton/npcx7m6fb_evb/Kconfig.defconfig
+++ b/boards/nuvoton/npcx7m6fb_evb/Kconfig.defconfig
@@ -3,6 +3,3 @@
 
 config SYS_CLOCK_TICKS_PER_SEC
 	default 1000
-
-config INPUT
-	default y if KSCAN
diff --git a/boards/nuvoton/npcx7m6fb_evb/doc/index.rst b/boards/nuvoton/npcx7m6fb_evb/doc/index.rst
index 2dc8382d737b8..b4e5f67ea0244 100644
--- a/boards/nuvoton/npcx7m6fb_evb/doc/index.rst
+++ b/boards/nuvoton/npcx7m6fb_evb/doc/index.rst
@@ -21,28 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The following features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr (at the moment)
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nuvoton/npcx7m6fb_evb/npcx7m6fb_evb_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -65,6 +44,8 @@ UART1 is configured for serial logs.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board comes with a Cortex ETM port which facilitates tracing and debugging
 using a single physical connection.  In addition, it comes with sockets for
 JTAG only sessions.
diff --git a/boards/nuvoton/npcx7m6fb_evb/npcx7m6fb_evb.dts b/boards/nuvoton/npcx7m6fb_evb/npcx7m6fb_evb.dts
index 34a8cc9de74d5..3857262528fbd 100644
--- a/boards/nuvoton/npcx7m6fb_evb/npcx7m6fb_evb.dts
+++ b/boards/nuvoton/npcx7m6fb_evb/npcx7m6fb_evb.dts
@@ -15,8 +15,8 @@
 	chosen {
 		zephyr,sram = &sram0;
 		zephyr,console = &uart1;
+		zephyr,shell-uart = &uart1;
 		zephyr,flash = &flash0;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	aliases {
@@ -28,8 +28,6 @@
 		i2c-0 = &i2c0_0;
 		watchdog0 = &twd0;
 		peci-0 = &peci0;
-		/* For kscan test suites */
-		kscan0 = &kscan_input;
 	};
 
 	pwmleds {
@@ -117,8 +115,4 @@
 	row-size = <8>;
 	col-size = <6>;
 	status = "okay";
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
diff --git a/boards/nuvoton/npcx9m6f_evb/Kconfig.defconfig b/boards/nuvoton/npcx9m6f_evb/Kconfig.defconfig
index 3004ce803d467..2114a4ad349f1 100644
--- a/boards/nuvoton/npcx9m6f_evb/Kconfig.defconfig
+++ b/boards/nuvoton/npcx9m6f_evb/Kconfig.defconfig
@@ -3,6 +3,3 @@
 
 config SYS_CLOCK_TICKS_PER_SEC
 	default 1000
-
-config INPUT
-	default y if KSCAN
diff --git a/boards/nuvoton/npcx9m6f_evb/doc/index.rst b/boards/nuvoton/npcx9m6f_evb/doc/index.rst
index 2e9ac2e368be3..0b8ef7d9f0693 100644
--- a/boards/nuvoton/npcx9m6f_evb/doc/index.rst
+++ b/boards/nuvoton/npcx9m6f_evb/doc/index.rst
@@ -21,42 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The following features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc controller                      |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port/controller                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PM        | on-chip    | power management                    |
-+-----------+------------+-------------------------------------+
-| PSL       | on-chip    | power switch logic                  |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pulse width modulator               |
-+-----------+------------+-------------------------------------+
-| TACH      | on-chip    | tachometer sensor                   |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr (at the moment)
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -79,6 +44,8 @@ UART1 is configured for serial logs.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board comes with a Cortex ETM port which facilitates tracing and debugging
 using a single physical connection. In addition, it comes with sockets for
 JTAG-only sessions.
diff --git a/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.dts b/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.dts
index fe186dca26207..08eaf3e3ee1cc 100644
--- a/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.dts
+++ b/boards/nuvoton/npcx9m6f_evb/npcx9m6f_evb.dts
@@ -15,8 +15,8 @@
 	chosen {
 		zephyr,sram = &sram0;
 		zephyr,console = &uart1;
+		zephyr,shell-uart = &uart1;
 		zephyr,flash = &flash0;
-		zephyr,keyboard-scan = &kscan_input;
 	};
 
 	aliases {
@@ -31,8 +31,6 @@
 		/* For watchdog sample */
 		watchdog0 = &twd0;
 		peci-0 = &peci0;
-		/* For kscan test suites */
-		kscan0 = &kscan_input;
 	};
 
 	leds-pwm {
@@ -136,8 +134,4 @@
 	row-size = <8>;
 	col-size = <13>;
 	status = "okay";
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
diff --git a/boards/nuvoton/numaker_m2l31ki/doc/index.rst b/boards/nuvoton/numaker_m2l31ki/doc/index.rst
index 98838ae7e1d1b..a91bdc3277823 100644
--- a/boards/nuvoton/numaker_m2l31ki/doc/index.rst
+++ b/boards/nuvoton/numaker_m2l31ki/doc/index.rst
@@ -24,30 +24,17 @@ More information about the board can be found at the `NuMaker M2L31KI User Manua
 Supported Features
 ==================
 
-* The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 72MHz.
+.. zephyr:board-supported-hw::
 
-The development board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port           |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | gpio                  |
-+-----------+------------+-----------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
+The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 72MHz.
 
 More details about the supported peripherals are available in `M2L31 TRM`_
-Other hardware features are not currently supported by the Zephyr kernel.
 
 Building and Flashing
 *********************
+
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/nuvoton/numaker_m55m1/Kconfig b/boards/nuvoton/numaker_m55m1/Kconfig
new file mode 100644
index 0000000000000..4e60a55a2180e
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/Kconfig
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Nuvoton NuMaker M55M1 board configuration
+#
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+
+config BOARD_NUMAKER_M55M1
+	select SOC_FLASH_NUMAKER
diff --git a/boards/nuvoton/numaker_m55m1/Kconfig.defconfig b/boards/nuvoton/numaker_m55m1/Kconfig.defconfig
new file mode 100644
index 0000000000000..923a86f8dfc1e
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/Kconfig.defconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Nuvoton NuMaker M55M1 board configuration
+#
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+
+if BOARD_NUMAKER_M55M1
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y if !MODEM
+
+endif # NETWORKING
+
+endif # BOARD_NUMAKER_M55M1
diff --git a/boards/nuvoton/numaker_m55m1/Kconfig.numaker_m55m1 b/boards/nuvoton/numaker_m55m1/Kconfig.numaker_m55m1
new file mode 100644
index 0000000000000..fef8d1e066294
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/Kconfig.numaker_m55m1
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Nuvoton NuMaker M55M1 board configuration
+#
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+
+config BOARD_NUMAKER_M55M1
+	select SOC_M55M1XXX
diff --git a/boards/nuvoton/numaker_m55m1/board.cmake b/boards/nuvoton/numaker_m55m1/board.cmake
new file mode 100644
index 0000000000000..834a265466e1b
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/board.cmake
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(pyocd "--target=m55m1h2ljae")
+
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/nuvoton/numaker_m55m1/board.yml b/boards/nuvoton/numaker_m55m1/board.yml
new file mode 100644
index 0000000000000..4b378e461c6ea
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: numaker_m55m1
+  full_name: NUMAKER M55M1
+  vendor: nuvoton
+  socs:
+  - name: m55m1xxx
diff --git a/boards/nuvoton/numaker_m55m1/doc/index.rst b/boards/nuvoton/numaker_m55m1/doc/index.rst
new file mode 100644
index 0000000000000..d1b37b22e3711
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/doc/index.rst
@@ -0,0 +1,78 @@
+.. zephyr:board:: numaker_m55m1
+
+Overview
+********
+
+The NuMaker M55M1 is an Internet of Things (IoT) application focused platform
+specially developed by Nuvoton. The NuMaker-M55M1 is based on the NuMicro® M55M1
+series MCU with ARM® -Cortex®-M55 core.
+
+Features
+========
+- 32-bit Arm Cortex®-M55 M55M1H2LJAE MCU
+- Core clock up to 220 MHz
+- 2 MB embedded Dual Bank Flash and 1344 KB SRAM
+- 128 KB DTCM and 64 KB ITCM
+- USB 2.0 Full-Speed OTG / Device
+- USB 1.1 Host
+- Arduino UNO compatible interface
+- One push-button is for reset
+- Two LEDs: one is for power indication and the other is for user-defined
+- On-board NU-Link2 ICE debugger/programmer with SWD connector
+
+More information about the board can be found at the `NuMaker M55M1 User Manual`_.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 220 MHz.
+
+More details about the supported peripherals are available in `M55M1 TRM`_
+
+Building and Flashing
+*********************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+On board debugger Nu-link2 can emulate UART0 as a virtual COM port over usb,
+To enable this, set ISW1 DIP switch 1-3 (TXD RXD VOM) to ON.
+Connect the NuMaker-M55M1 to your host computer using the USB port, then
+run a serial host program to connect with your board. For example:
+
+.. code-block:: console
+
+   $ minicom -D /dev/ttyACM0
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: numaker_m55m1
+   :goals: flash
+
+Debugging
+=========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: numaker_m55m1
+   :goals: debug
+
+Step through the application in your debugger.
+
+References
+**********
+
+.. target-notes::
+
+.. _NuMaker M55M1 User Manual:
+   https://www.nuvoton.com/products/microcontrollers/arm-cortex-m55-mcus/m55m1-series/
+.. _M55M1 TRM:
+   https://www.nuvoton.com/products/microcontrollers/arm-cortex-m55-mcus/m55m1-series/
diff --git a/boards/nuvoton/numaker_m55m1/doc/m55m1.webp b/boards/nuvoton/numaker_m55m1/doc/m55m1.webp
new file mode 100644
index 0000000000000..63acf0ab0b91a
Binary files /dev/null and b/boards/nuvoton/numaker_m55m1/doc/m55m1.webp differ
diff --git a/boards/nuvoton/numaker_m55m1/numaker_m55m1-pinctrl.dtsi b/boards/nuvoton/numaker_m55m1/numaker_m55m1-pinctrl.dtsi
new file mode 100644
index 0000000000000..9139b82417e1d
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/numaker_m55m1-pinctrl.dtsi
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "pinctrl/m55m1h2l-pinctrl.h"
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group0 {
+			pinmux = <PB12MFP_UART0_RXD>,
+				 <PB13MFP_UART0_TXD>;
+		};
+	};
+
+	/* TX/RX/RTS/CTS/RST --> D1/D0/A2/A3/D2 --> PB3/PB2/PB8/PB9/PC9 */
+	uart1_default: uart1_default {
+		group0 {
+			pinmux = <PB9MFP_UART1_nCTS>,
+				 <PB8MFP_UART1_nRTS>,
+				 <PB2MFP_UART1_RXD>,
+				 <PB3MFP_UART1_TXD>,
+				 <PC9MFP_GPIO>;
+		};
+	};
+
+	/* EMAC multi-function pins for MDIO, TX, REFCLK, RX pins */
+	emac_default: emac_default {
+		group0 {
+			pinmux = <PE8MFP_EMAC0_RMII_MDC>,
+				 <PE9MFP_EMAC0_RMII_MDIO>,
+				 <PC8MFP_EMAC0_RMII_REFCLK>,
+				 <PC7MFP_EMAC0_RMII_RXD0>,
+				 <PC6MFP_EMAC0_RMII_RXD1>,
+				 <PA7MFP_EMAC0_RMII_CRSDV>,
+				 <PA6MFP_EMAC0_RMII_RXERR>;
+		};
+		group1 {
+			pinmux = <PE10MFP_EMAC0_RMII_TXD0>,
+				 <PE11MFP_EMAC0_RMII_TXD1>,
+				 <PE12MFP_EMAC0_RMII_TXEN>;
+				 slew-rate = "fast";
+		};
+	};
+};
diff --git a/boards/nuvoton/numaker_m55m1/numaker_m55m1.dts b/boards/nuvoton/numaker_m55m1/numaker_m55m1.dts
new file mode 100644
index 0000000000000..edfb4bcc0a6d5
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/numaker_m55m1.dts
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nuvoton/m55m1h2l.dtsi>
+#include "numaker_m55m1-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Nuvoton NuMaker M55M1 board";
+	compatible = "nuvoton,numaker-m55m1";
+
+	aliases {
+		led0 = &green_led;
+		led1 = &yellow_led;
+	};
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,sram = &sram0;
+		zephyr,dtcm = &dtcm;
+		zephyr,itcm = &itcm;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		green_led: led_0 {
+			gpios = <&gpiod 5 GPIO_ACTIVE_LOW>;
+			label = "User LD0";
+		};
+
+		yellow_led: led_1 {
+			gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;
+			label = "User LD1";
+		};
+	};
+};
+
+&gpiod {
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 0x8000>;
+		};
+
+		slot0_partition: partition@8000 {
+			label = "image-0";
+			reg = <0x8000 0xf8000>;
+		};
+
+		slot1_partition: partition@100000 {
+			label = "image-1";
+			reg = <0x100000 0xf8000>;
+		};
+
+		storage_partition: partition@1f8000 {
+			label = "storage";
+			reg = <0x1f8000 0x8000>;
+		};
+	};
+};
+
+&sram0 {
+	reg = <0x20100000 DT_SIZE_K(1344)>;
+};
+
+&uart0 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&emac {
+	pinctrl-0 = <&emac_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/nuvoton/numaker_m55m1/numaker_m55m1.yaml b/boards/nuvoton/numaker_m55m1/numaker_m55m1.yaml
new file mode 100644
index 0000000000000..2563989c8ef7a
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/numaker_m55m1.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: numaker_m55m1
+name: NUVOTON NUMAKER-M55M1 Kit
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 1536
+flash: 2048
+supported:
+  - gpio
+vendor: nuvoton
diff --git a/boards/nuvoton/numaker_m55m1/numaker_m55m1_defconfig b/boards/nuvoton/numaker_m55m1/numaker_m55m1_defconfig
new file mode 100644
index 0000000000000..a1f6ad9e5ecaf
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/numaker_m55m1_defconfig
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_GPIO=y
+
+# Enable system clock controller driver
+CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NUMAKER_SCC=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=220000000
+
+# Enable UART driver
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable FMC
+CONFIG_FLASH=y
diff --git a/boards/nuvoton/numaker_m55m1/support/openocd.cfg b/boards/nuvoton/numaker_m55m1/support/openocd.cfg
new file mode 100644
index 0000000000000..c393f756c4def
--- /dev/null
+++ b/boards/nuvoton/numaker_m55m1/support/openocd.cfg
@@ -0,0 +1,2 @@
+source [find interface/nulink.cfg]
+source [find target/numicro.cfg]
diff --git a/boards/nuvoton/numaker_pfm_m467/doc/index.rst b/boards/nuvoton/numaker_pfm_m467/doc/index.rst
index 70d4cba1ec078..622a84c9eb936 100644
--- a/boards/nuvoton/numaker_pfm_m467/doc/index.rst
+++ b/boards/nuvoton/numaker_pfm_m467/doc/index.rst
@@ -27,30 +27,17 @@ More information about the board can be found at the `PFM M467 User Manual`_.
 Supported Features
 ==================
 
-* The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 200MHz.
+.. zephyr:board-supported-hw::
 
-The development board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port           |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | gpio                  |
-+-----------+------------+-----------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
+The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 200MHz.
 
 More details about the supported peripherals are available in `M460 TRM`_
-Other hardware features are not currently supported by the Zephyr kernel.
 
 Building and Flashing
 *********************
+
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/nuvoton/numaker_pfm_m487/doc/index.rst b/boards/nuvoton/numaker_pfm_m487/doc/index.rst
index ce0e583bf301f..78dbcaeb43290 100644
--- a/boards/nuvoton/numaker_pfm_m487/doc/index.rst
+++ b/boards/nuvoton/numaker_pfm_m487/doc/index.rst
@@ -29,25 +29,11 @@ More information about the board can be found at the `PFM M487 User Manual`_.
 Supported Features
 ==================
 
-* The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 192MHz.
+.. zephyr:board-supported-hw::
 
-The development board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port           |
-+-----------+------------+-----------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
+The on-board 12-MHz crystal allows the device to run at its maximum operating speed of 192MHz.
 
 More details about the supported peripherals are available in `M480 TRM`_
-Other hardware features are not currently supported by the Zephyr kernel.
 
 Building and Flashing
 *********************
diff --git a/boards/nxp/common/board-footer.rst b/boards/nxp/common/board-footer.rst
new file mode 100644
index 0000000000000..98edbdf62819e
--- /dev/null
+++ b/boards/nxp/common/board-footer.rst
@@ -0,0 +1,32 @@
+:orphan:
+
+.. nxp-board-footer
+
+Support Resources for Zephyr
+============================
+- `NXP Zephyr Downstream Software Development Kit`_
+- `MCUXpresso for VS Code`_, `wiki`_ documentation and `Zephyr lab guides`_
+- `NXP Zephyr Knowledge Hub`_
+- `NXP’s Zephyr landing page`_  (including training resources)
+- `NXP Support Community forum for Zephyr`_
+
+.. _NXP Zephyr Downstream Software Development Kit:
+   https://github.com/nxp-zephyr/nxp-zsdk
+
+.. _MCUXpresso for VS Code:
+   https://www.nxp.com/design/design-center/software/embedded-software/mcuxpresso-for-visual-studio-code:MCUXPRESSO-VSC?tid=vanMCUXPRESSO-VSC
+
+.. _wiki:
+   https://github.com/nxp-mcuxpresso/vscode-for-mcux/wiki
+
+.. _Zephyr lab guides:
+   https://github.com/nxp-mcuxpresso/vscode-for-mcux/wiki/Training-Zephyr-Getting-Started
+
+.. _NXP Zephyr Knowledge Hub:
+   https://community.nxp.com/t5/Zephyr-Project-Knowledge-Base/Zephyr-Knowledge-Hub/ta-p/2008548
+
+.. _NXP’s Zephyr landing page:
+   https://nxp.com/zephyr
+
+.. _NXP Support Community forum for Zephyr:
+   https://community.nxp.com/t5/Zephyr-Project/bd-p/Zephyr-Project
diff --git a/boards/nxp/frdm_k22f/doc/index.rst b/boards/nxp/frdm_k22f/doc/index.rst
index ef2420ac0f48b..fa8762225ae1c 100644
--- a/boards/nxp/frdm_k22f/doc/index.rst
+++ b/boards/nxp/frdm_k22f/doc/index.rst
@@ -50,55 +50,15 @@ For more information about the K22F SoC and FRDM-K22F board:
 Supported Features
 ==================
 
-The frdm_k22f board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`frdm_k64f`, which is the superset board in NXP's Kinetis K series.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the frdm_k64f board may have additional features
-already supported, which can also be re-used on this frdm_k22f board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | fxos8700 trigger                    |
-+-----------+------------+-------------------------------------+
-| RNGA      | on-chip    | entropy;                            |
-|           |            | random                              |
-+-----------+------------+-------------------------------------+
-| FTFE      | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-:zephyr_file:`boards/nxp/frdm_k22f/frdm_k22f_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`frdm_k64f`, which is the superset board in NXP's Kinetis K series.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the frdm_k64f board may have additional features
+   already supported, which can also be re-used on this frdm_k22f board.
 
 Connections and IOs
 ===================
@@ -168,6 +128,8 @@ Only USB device function is supported in Zephyr at the moment.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -277,6 +239,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v2.0.0 *****
    Hello World! frdm_k22f
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-K22F Website:
    https://www.nxp.com/support/developer-resources/evaluation-and-development-boards/freedom-development-boards/mcu-boards/nxp-freedom-development-platform-for-kinetis-k22-mcus:FRDM-K22F
 
diff --git a/boards/nxp/frdm_k64f/doc/index.rst b/boards/nxp/frdm_k64f/doc/index.rst
index 192398674c7a7..6ac28c0682c05 100644
--- a/boards/nxp/frdm_k64f/doc/index.rst
+++ b/boards/nxp/frdm_k64f/doc/index.rst
@@ -54,62 +54,9 @@ Supported Features
 NXP considers the FRDM-K64F as the superset board for the Kinetis K
 series of MCUs.  This board is a focus for NXP's Full Platform Support for
 Zephyr, to better enable the entire Kinetis K series.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The frdm_k64f board
-configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | fxos8700 trigger                    |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| RNGA      | on-chip    | entropy;                            |
-|           |            | random                              |
-+-----------+------------+-------------------------------------+
-| FTFE      | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| PIT       | on-chip    | pit                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/frdm_k64f/frdm_k64f_defconfig`
-
-Other hardware features are not currently supported by the port.
+this board with new support for Zephyr features.
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -223,6 +170,8 @@ use the CAN bus, an external CAN bus transceiver must be connected to ``PTB18``
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -358,6 +307,9 @@ of pyocd commands:
    Resetting target
    >>> quit
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-K64F Website:
    https://www.nxp.com/support/developer-resources/evaluation-and-development-boards/freedom-development-boards/mcu-boards/freedom-development-platform-for-kinetis-k64-k63-and-k24-mcus:FRDM-K64F
 
diff --git a/boards/nxp/frdm_k82f/doc/index.rst b/boards/nxp/frdm_k82f/doc/index.rst
index 4693e0dd244d0..d775fae90d46a 100644
--- a/boards/nxp/frdm_k82f/doc/index.rst
+++ b/boards/nxp/frdm_k82f/doc/index.rst
@@ -51,59 +51,15 @@ For more information about the K82F SoC and FRDM-K82F board:
 Supported Features
 ==================
 
-The frdm_k82f board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`frdm_k64f`, which is the superset board in NXP's Kinetis K series.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the frdm_k64f board may have additional features
-already supported, which can also be re-used on this frdm_k82f board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| FLASH     | off-chip   | QSPI flash                          |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | fxos8700 trigger                    |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FTFA      | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| PIT       | on-chip    | pit                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/frdm_k82f/frdm_k82f_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`frdm_k64f`, which is the superset board in NXP's Kinetis K series.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the frdm_k64f board may have additional features
+   already supported, which can also be re-used on this frdm_k82f board.
 
 System Clock
 ============
@@ -127,6 +83,8 @@ Only USB device function is supported in Zephyr at the moment.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -220,6 +178,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-xxx-gxxxxxxxxxxxx *****
    Hello World! frdm_k82f
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-K82F Website:
    https://www.nxp.com/design/development-boards/freedom-development-boards/mcu-boards/freedom-development-platform-for-kinetis-k82-k81-and-k80-mcus:FRDM-K82F
 
diff --git a/boards/nxp/frdm_ke15z/doc/index.rst b/boards/nxp/frdm_ke15z/doc/index.rst
index c8d155be6fb02..fceb5e8eee1da 100644
--- a/boards/nxp/frdm_ke15z/doc/index.rst
+++ b/boards/nxp/frdm_ke15z/doc/index.rst
@@ -32,26 +32,7 @@ these NXP reference documents:
 Supported Features
 ==================
 
-The frdm_ke15z board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | uart polling;                       |
-|           |            | uart interrupt                      |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/frdm_ke15z/frdm_ke15z_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -66,6 +47,8 @@ The KE15 SoC has three UARTs. UART1 is configured for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -155,6 +138,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v3.6.0-xxx-gxxxxxxxxxxxx *****
    Hello World! frdm_ke15z
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _KE1XZ SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/ke-series-arm-cortex-m4-m0-plus/ke1xz-arm-cortex-m0-plus-5v-main-stream-mcu-with-nxp-touch-and-can-control:KE1xZ
 
diff --git a/boards/nxp/frdm_ke17z/doc/index.rst b/boards/nxp/frdm_ke17z/doc/index.rst
index 3f9f7aa30497f..61dc98249b276 100644
--- a/boards/nxp/frdm_ke17z/doc/index.rst
+++ b/boards/nxp/frdm_ke17z/doc/index.rst
@@ -34,43 +34,7 @@ these NXP reference documents:
 Supported Features
 ==================
 
-The frdm_ke17z board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINCTRL   | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | uart                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| FTM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | sensor                              |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/frdm_ke17z/frdm_ke17z_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -85,6 +49,8 @@ The KE17Z SoC has three UARTs. UART0 is configured for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -180,6 +146,9 @@ should see the following message in the terminal:
    *** Booting Zephyr OS build xxxxxxxxxxxx ***
    Hello World! frdm_ke17z/mke17z7
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-KE17Z Website:
    https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/freedom-development-platform-for-72mhz-ke17z-ke13z-ke12z-mcus:FRDM-KE17Z
 
diff --git a/boards/nxp/frdm_ke17z512/doc/index.rst b/boards/nxp/frdm_ke17z512/doc/index.rst
index 09ac1d95c67b5..09253e01ab414 100644
--- a/boards/nxp/frdm_ke17z512/doc/index.rst
+++ b/boards/nxp/frdm_ke17z512/doc/index.rst
@@ -35,44 +35,7 @@ these NXP reference documents:
 Supported Features
 ==================
 
-The frdm_ke17z512 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | uart polling;                       |
-|           |            | uart interrupt                      |
-+-----------+------------+-------------------------------------+
-| FTM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | I2C                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | sensor                              |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-``boards/nxp/frdm_ke17z512/frdm_ke17z512_defconfig``.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -87,6 +50,8 @@ The KE17Z9 SoC has three LPUARTs. UART2 is configured for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -176,6 +141,9 @@ should see the following message in the terminal:
    *** Booting Zephyr OS build v3.6.0-xxxx-gxxxxxxxxxxxx ***
    Hello World! frdm_ke17z512/mke17z9
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-KE17Z512 Website:
    https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-96-mhz-ke17z-ke13z-ke12z-with-512-kb-flash-mcus:FRDM-KE17Z512
 
diff --git a/boards/nxp/frdm_kl25z/doc/index.rst b/boards/nxp/frdm_kl25z/doc/index.rst
index 134f577ce1e87..c0bab35ead0e3 100644
--- a/boards/nxp/frdm_kl25z/doc/index.rst
+++ b/boards/nxp/frdm_kl25z/doc/index.rst
@@ -30,35 +30,7 @@ For more information about the KL25Z SoC and FRDM-KL25Z board:
 Supported Features
 ==================
 
-The frdm_kl25z board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/frdm_kl25z/frdm_kl25z_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -108,6 +80,8 @@ Only USB device function is supported in Zephyr at the moment.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -214,6 +188,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-rc1 *****
    Hello World! frdm_kl25z
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-KL25Z Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/kinetis-cortex-m-mcus/l-seriesultra-low-powerm0-plus/freedom-development-platform-for-kinetis-kl14-kl15-kl24-kl25-mcus:FRDM-KL25Z
 
diff --git a/boards/nxp/frdm_kw41z/doc/index.rst b/boards/nxp/frdm_kw41z/doc/index.rst
index 20b8368710623..fe7f65999cccc 100644
--- a/boards/nxp/frdm_kw41z/doc/index.rst
+++ b/boards/nxp/frdm_kw41z/doc/index.rst
@@ -45,46 +45,7 @@ For more information about the KW41Z SoC and FRDM-KW41Z board:
 Supported Features
 ==================
 
-The frdm_kw41z board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling:                   |
-|           |            | fxos8700 trigger                    |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | tpm                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FTFA      | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/frdm_kw41z/frdm_kw41z_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -138,6 +99,8 @@ The KW41Z SoC has one UART, which is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -227,6 +190,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-rc1 *****
    Hello World! frdm_kw41z
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-KW41Z Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/kinetis-cortex-m-mcus/w-serieswireless-conn.m0-plus-m4/freedom-development-kit-for-kinetis-kw41z-31z-21z-mcus:FRDM-KW41Z
 
diff --git a/boards/nxp/frdm_mcxa153/CMakeLists.txt b/boards/nxp/frdm_mcxa153/CMakeLists.txt
new file mode 100644
index 0000000000000..c06b9273965c0
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/CMakeLists.txt
@@ -0,0 +1,8 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_library()
+zephyr_library_sources(board.c)
diff --git a/boards/nxp/frdm_mcxa153/Kconfig b/boards/nxp/frdm_mcxa153/Kconfig
new file mode 100644
index 0000000000000..4fdb500ab32b0
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/Kconfig
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXA153
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/frdm_mcxa153/Kconfig.frdm_mcxa153 b/boards/nxp/frdm_mcxa153/Kconfig.frdm_mcxa153
new file mode 100644
index 0000000000000..f9747b70d32a0
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/Kconfig.frdm_mcxa153
@@ -0,0 +1,6 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXA153
+	select SOC_MCXA153 if BOARD_FRDM_MCXA153
+	select SOC_PART_NUMBER_MCXA153VLH
diff --git a/boards/nxp/frdm_mcxa153/board.c b/boards/nxp/frdm_mcxa153/board.c
new file mode 100644
index 0000000000000..b6ededcb5721a
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/board.c
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <fsl_clock.h>
+#include <fsl_spc.h>
+#include <soc.h>
+
+/* Core clock frequency: 96MHz */
+#define CLOCK_INIT_CORE_CLOCK            960000000U
+#define BOARD_BOOTCLOCKFRO96M_CORE_CLOCK 960000000U
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+void board_early_init_hook(void)
+{
+	uint32_t coreFreq;
+	spc_active_mode_core_ldo_option_t ldoOption;
+	spc_sram_voltage_config_t sramOption;
+
+	/* Get the CPU Core frequency */
+	coreFreq = CLOCK_GetCoreSysClkFreq();
+
+	/* The flow of increasing voltage and frequency */
+	if (coreFreq <= BOARD_BOOTCLOCKFRO96M_CORE_CLOCK) {
+		/* Set the LDO_CORE VDD regulator level */
+		ldoOption.CoreLDOVoltage = kSPC_CoreLDO_NormalVoltage;
+		ldoOption.CoreLDODriveStrength = kSPC_CoreLDO_NormalDriveStrength;
+		(void)SPC_SetActiveModeCoreLDORegulatorConfig(SPC0, &ldoOption);
+		/* Configure Flash to support different voltage level and frequency */
+		FMU0->FCTRL =
+			(FMU0->FCTRL & ~((uint32_t)FMU_FCTRL_RWSC_MASK)) | (FMU_FCTRL_RWSC(0x2U));
+		/* Specifies the operating voltage for the SRAM's read/write timing margin */
+		sramOption.operateVoltage = kSPC_sramOperateAt1P1V;
+		sramOption.requestVoltageUpdate = true;
+		(void)SPC_SetSRAMOperateVoltage(SPC0, &sramOption);
+	}
+
+	CLOCK_SetupFROHFClocking(CLOCK_INIT_CORE_CLOCK); /*!< Enable FRO HF(96MHz) output */
+
+	CLOCK_SetupFRO12MClocking(); /*!< Setup FRO12M clock */
+
+	CLOCK_AttachClk(kFRO_HF_to_MAIN_CLK); /* !< Switch MAIN_CLK to FRO_HF */
+
+	/* The flow of decreasing voltage and frequency */
+	if (coreFreq > BOARD_BOOTCLOCKFRO96M_CORE_CLOCK) {
+		/* Configure Flash to support different voltage level and frequency */
+		FMU0->FCTRL =
+			(FMU0->FCTRL & ~((uint32_t)FMU_FCTRL_RWSC_MASK)) | (FMU_FCTRL_RWSC(0x2U));
+		/* Specifies the operating voltage for the SRAM's read/write timing margin */
+		sramOption.operateVoltage = kSPC_sramOperateAt1P1V;
+		sramOption.requestVoltageUpdate = true;
+		(void)SPC_SetSRAMOperateVoltage(SPC0, &sramOption);
+		/* Set the LDO_CORE VDD regulator level */
+		ldoOption.CoreLDOVoltage = kSPC_CoreLDO_NormalVoltage;
+		ldoOption.CoreLDODriveStrength = kSPC_CoreLDO_NormalDriveStrength;
+		(void)SPC_SetActiveModeCoreLDORegulatorConfig(SPC0, &ldoOption);
+	}
+
+	/*!< Set up clock selectors - Attach clocks to the peripheries */
+
+	/*!< Set up dividers */
+	CLOCK_SetClockDiv(kCLOCK_DivAHBCLK, 1U);     /* !< Set AHBCLKDIV divider to value 1 */
+	CLOCK_SetClockDiv(kCLOCK_DivFRO_HF_DIV, 1U); /* !< Set FROHFDIV divider to value 1 */
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(edma0))
+	RESET_ReleasePeripheralReset(kDMA_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+	RESET_ReleasePeripheralReset(kGPIO0_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO0);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+	RESET_ReleasePeripheralReset(kGPIO1_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO1);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+	RESET_ReleasePeripheralReset(kGPIO2_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO2);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+	RESET_ReleasePeripheralReset(kGPIO3_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO3);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART0, 1u);
+	CLOCK_AttachClk(kFRO12M_to_LPUART0);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART1, 1u);
+	CLOCK_AttachClk(kFRO12M_to_LPUART1);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART2, 1u);
+	CLOCK_AttachClk(kFRO12M_to_LPUART2);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
+	RESET_ReleasePeripheralReset(kPORT0_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
+	RESET_ReleasePeripheralReset(kPORT1_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
+	RESET_ReleasePeripheralReset(kPORT2_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
+	RESET_ReleasePeripheralReset(kPORT3_RST_SHIFT_RSTn);
+#endif
+
+	/* Set SystemCoreClock variable. */
+	SystemCoreClock = CLOCK_INIT_CORE_CLOCK;
+}
diff --git a/boards/nxp/frdm_mcxa153/board.cmake b/boards/nxp/frdm_mcxa153/board.cmake
new file mode 100644
index 0000000000000..ca3da9f828902
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/board.cmake
@@ -0,0 +1,13 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+board_runner_args(jlink "--device=MCXA153")
+board_runner_args(linkserver "--device=MCXA153:FRDM-MCXA153")
+board_runner_args(pyocd "--target=mcxA153")
+
+include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nxp/frdm_mcxa153/board.yml b/boards/nxp/frdm_mcxa153/board.yml
new file mode 100644
index 0000000000000..6a2fb603b3d87
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: frdm_mcxa153
+  full_name: FRDM-MCXA153
+  vendor: nxp
+  socs:
+  - name: mcxa153
diff --git a/boards/nxp/frdm_mcxa153/doc/frdm_mcxa153.webp b/boards/nxp/frdm_mcxa153/doc/frdm_mcxa153.webp
new file mode 100644
index 0000000000000..715ddf843ebbc
Binary files /dev/null and b/boards/nxp/frdm_mcxa153/doc/frdm_mcxa153.webp differ
diff --git a/boards/nxp/frdm_mcxa153/doc/index.rst b/boards/nxp/frdm_mcxa153/doc/index.rst
new file mode 100644
index 0000000000000..13105e605f9e7
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/doc/index.rst
@@ -0,0 +1,181 @@
+.. zephyr:board:: frdm_mcxa153
+
+Overview
+********
+
+FRDM-MCXA153 are compact and scalable development boards for rapid prototyping of
+MCX A14x and A15x MCUs. They offer industry standard headers for easy access
+to the MCU's I/Os, integrated open-standard serial interfaces, external flash
+memory and an on-board MCU-Link debugger. Additional tools like NXP's Expansion
+Board Hub for add-on boards and the Application Code Hub for software examples
+are available through the MCUXpresso Developer Experience.
+
+Hardware
+********
+
+- MCX-A153 Arm Cortex-M33 microcontroller running at 96 MHz
+- 128KB dual-bank on chip Flash
+- 32 KB RAM
+- USB full-speed with on-chip FS PHY. USB Type-C connectors
+- 1x I3C
+- On-board MCU-Link debugger with CMSIS-DAP
+- Arduino Header, mikroBUS
+
+For more information about the MCX-A153 SoC and FRDM-MCXA153 board, see:
+
+- `MCX-A153 SoC Website`_
+- `MCX-A153 Datasheet`_
+- `MCX-A153 Reference Manual`_
+- `FRDM-MCXA153 Website`_
+- `FRDM-MCXA153 User Guide`_
+- `FRDM-MCXA153 Board User Manual`_
+- `FRDM-MCXA153 Schematics`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+The MCX-A153 SoC has 4 gpio controllers and has pinmux registers which
+can be used to configure the functionality of a pin.
+
++------------+-----------------+----------------------------+
+| Name       | Function        | Usage                      |
++============+=================+============================+
+| PIO0_2     | UART            | UART RX                    |
++------------+-----------------+----------------------------+
+| PIO0_3     | UART            | UART TX                    |
++------------+-----------------+----------------------------+
+
+System Clock
+============
+
+The MCX-A153 SoC is configured to use FRO running at 96MHz as a source for
+the system clock.
+
+Serial Port
+===========
+
+The FRDM-MCXA153 SoC has 3 LPUART interfaces for serial communication.
+LPUART 0 is configured as UART for the console.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Configuring a Debug Probe
+=========================
+
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the MCU-Link CMSIS-DAP Onboard Debug Probe.
+
+Using LinkServer
+----------------
+
+Linkserver is the default runner for this board, and supports the factory
+default MCU-Link firmware. Follow the instructions in
+:ref:`mcu-link-cmsis-onboard-debug-probe` to reprogram the default MCU-Link
+firmware. This only needs to be done if the default onboard debug circuit
+firmware was changed. To put the board in ``ISP mode`` to program the firmware,
+short jumper JP8.
+
+Using J-Link
+------------
+
+There are two options. The onboard debug circuit can be updated with Segger
+J-Link firmware by following the instructions in
+:ref:`mcu-link-jlink-onboard-debug-probe`.
+To be able to program the firmware, you need to put the board in ``ISP mode``
+by shorting the jumper JP8.
+The second option is to attach a :ref:`jlink-external-debug-probe` to the
+10-pin SWD connector (J18) of the board. Additionally, the jumper JP20 must
+be shorted.
+For both options use the ``-r jlink`` option with west to use the jlink runner.
+
+.. code-block:: console
+
+   west flash -r jlink
+
+Configuring a Console
+=====================
+
+Connect a USB cable from your PC to J15, and use the serial terminal of your choice
+(minicom, putty, etc.) with the following settings:
+
+- Speed: 115200
+- Data: 8 bits
+- Parity: None
+- Stop bits: 1
+
+Flashing
+========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxa153
+   :goals: flash
+
+Open a serial terminal, reset the board (press the RESET button), and you should
+see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4478-ge6c3a42f5f52 ***
+   Hello World! frdm_mcxa3/mcxa153
+
+Debugging
+=========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxa153/mcxa153
+   :goals: debug
+
+Open a serial terminal, step through the application in your debugger, and you
+should see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4478-ge6c3a42f5f52 ***
+   Hello World! frdm_mcxa153/mcxa153
+
+Troubleshooting
+===============
+
+.. include:: ../../common/segger-ecc-systemview.rst
+   :start-after: segger-ecc-systemview
+
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
+.. _MCX-A153 SoC Website:
+   https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-a-series-microcontrollers/mcx-a13x-14x-15x-mcus-with-arm-cortex-m33-scalable-device-options-low-power-and-intelligent-peripherals:MCX-A13X-A14X-A15X
+
+.. _MCX-A153 Datasheet:
+   https://www.nxp.com/docs/en/data-sheet/MCXAP64M96FS3.pdf
+
+.. _MCX-A153 Reference Manual:
+   https://www.nxp.com/webapp/Download?colCode=MCXAP64M96FS3RM
+
+.. _FRDM-MCXA153 Website:
+   https://www.nxp.com/design/design-center/development-boards-and-designs/FRDM-MCXA153
+
+.. _FRDM-MCXA153 User Guide:
+   https://www.nxp.com/document/guide/getting-started-with-frdm-mcxa153:GS-FRDM-MCXAXX
+
+.. _FRDM-MCXA153 Board User Manual:
+   https://www.nxp.com/docs/en/user-manual/UM12012.pdf
+
+.. _FRDM-MCXA153 Schematics:
+   https://www.nxp.com/webapp/Download?colCode=SPF-90829_A1
diff --git a/boards/nxp/frdm_mcxa153/frdm_mcxa153-pinctrl.dtsi b/boards/nxp/frdm_mcxa153/frdm_mcxa153-pinctrl.dtsi
new file mode 100644
index 0000000000000..97f195b9c5cf1
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/frdm_mcxa153-pinctrl.dtsi
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#include <nxp/mcx/MCXA153VLH-pinctrl.h>
+
+&pinctrl {
+	pinmux_lpuart0: pinmux_lpuart0 {
+		group0 {
+			pinmux = <LPUART0_RXD_P0_2>,
+				<LPUART0_TXD_P0_3>;
+			drive-strength = "low";
+			slew-rate = "fast";
+			input-enable;
+		};
+	};
+
+	pinmux_lpuart2: pinmux_lpuart2 {
+		group0 {
+			pinmux = <LPUART2_RXD_P3_14>,
+				<LPUART2_TXD_P3_15>;
+			drive-strength = "low";
+			slew-rate = "fast";
+			input-enable;
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxa153/frdm_mcxa153.dts b/boards/nxp/frdm_mcxa153/frdm_mcxa153.dts
new file mode 100644
index 0000000000000..3ab90983c24a9
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/frdm_mcxa153.dts
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_mcxa153.dtsi>
+#include "frdm_mcxa153-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "NXP FRDM_MCXA153 board";
+	compatible = "nxp,mcxa153", "nxp,mcx";
+
+	aliases{
+		led0 = &red_led;
+		led1 = &green_led;
+		led2 = &blue_led;
+		sw0 = &user_button_2;
+		sw1 = &user_button_3;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash;
+		zephyr,flash-controller = &fmu;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,console = &lpuart0;
+		zephyr,shell-uart = &lpuart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		red_led: led_0 {
+			gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
+			label = "Red LED";
+		};
+
+		green_led: led_1 {
+			gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
+			label = "Green LED";
+		};
+
+		blue_led: led_2 {
+			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+			label = "Blue LED";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		user_button_2: button_2 {
+			label = "User SW2";
+			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		user_button_3: button_3 {
+			label = "User SW3";
+			gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+};
+
+&flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(32)>;
+			read-only;
+		};
+		slot0_partition: partition@8000 {
+			label = "image-0";
+			reg = <0x00008000 DT_SIZE_K(40)>;
+		};
+		slot1_partition: partition@12000 {
+			label = "image-1";
+			reg = <0x00012000 DT_SIZE_K(40)>;
+		};
+		storage_partition: partition@1C000 {
+			label = "storage";
+			reg = <0x0001C000 DT_SIZE_K(16)>;
+		};
+	};
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
+
+&lpuart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart0>;
+	pinctrl-names = "default";
+};
diff --git a/boards/nxp/frdm_mcxa153/frdm_mcxa153.yaml b/boards/nxp/frdm_mcxa153/frdm_mcxa153.yaml
new file mode 100644
index 0000000000000..f607a093f63c8
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/frdm_mcxa153.yaml
@@ -0,0 +1,21 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: frdm_mcxa153
+name: NXP FRDM MCXA153
+type: mcu
+arch: arm
+ram: 24
+flash: 128
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - dma
+  - flash
+  - gpio
+  - uart
+vendor: nxp
diff --git a/boards/nxp/frdm_mcxa153/frdm_mcxa153_defconfig b/boards/nxp/frdm_mcxa153/frdm_mcxa153_defconfig
new file mode 100644
index 0000000000000..a630917318fa8
--- /dev/null
+++ b/boards/nxp/frdm_mcxa153/frdm_mcxa153_defconfig
@@ -0,0 +1,11 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_GPIO=y
diff --git a/boards/nxp/frdm_mcxa156/Kconfig b/boards/nxp/frdm_mcxa156/Kconfig
index 23271bc179f97..f71a70e94ea4d 100644
--- a/boards/nxp/frdm_mcxa156/Kconfig
+++ b/boards/nxp/frdm_mcxa156/Kconfig
@@ -1,8 +1,5 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_INIT_PRIORITY
-	int "Board initialization priority"
-	default 1
-	help
-	  Board initialization priority.
+config BOARD_FRDM_MCXA156
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/frdm_mcxa156/board.c b/boards/nxp/frdm_mcxa156/board.c
index 6c2da318025f8..6a479bf30869e 100644
--- a/boards/nxp/frdm_mcxa156/board.c
+++ b/boards/nxp/frdm_mcxa156/board.c
@@ -15,7 +15,7 @@
 /* System clock frequency. */
 extern uint32_t SystemCoreClock;
 
-static int frdm_mcxa156_init(void)
+void board_early_init_hook(void)
 {
 	uint32_t coreFreq;
 	spc_active_mode_core_ldo_option_t ldoOption;
@@ -165,6 +165,12 @@ static int frdm_mcxa156_init(void)
 	CLOCK_AttachClk(kFRO_HF_to_FLEXIO0);
 #endif
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i3c0))
+	/* Attach FRO_HF_DIV clock to I3C, 96MHz / 4 = 24MHz. */
+	CLOCK_SetClockDiv(kCLOCK_DivI3C0_FCLK, 4U);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_I3C0FCLK);
+#endif
+
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpadc0))
 	CLOCK_SetClockDiv(kCLOCK_DivADC0, 1u);
 	CLOCK_AttachClk(kFRO12M_to_ADC0);
@@ -199,13 +205,15 @@ static int frdm_mcxa156_init(void)
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi0))
+	/* Configure input clock to be able to reach the datasheet specified band rate. */
 	CLOCK_SetClockDiv(kCLOCK_DivLPSPI0, 1u);
-	CLOCK_AttachClk(kFRO12M_to_LPSPI0);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_LPSPI0);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpspi1))
+	/* Configure input clock to be able to reach the datasheet specified band rate. */
 	CLOCK_SetClockDiv(kCLOCK_DivLPSPI1, 1u);
-	CLOCK_AttachClk(kFRO12M_to_LPSPI1);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_LPSPI1);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lptmr0))
@@ -238,8 +246,4 @@ static int frdm_mcxa156_init(void)
 
 	/* Set SystemCoreClock variable. */
 	SystemCoreClock = CLOCK_INIT_CORE_CLOCK;
-
-	return 0;
 }
-
-SYS_INIT(frdm_mcxa156_init, PRE_KERNEL_1, CONFIG_BOARD_INIT_PRIORITY);
diff --git a/boards/nxp/frdm_mcxa156/doc/index.rst b/boards/nxp/frdm_mcxa156/doc/index.rst
index 8ca81d53e7921..01bcd2dbf5eed 100644
--- a/boards/nxp/frdm_mcxa156/doc/index.rst
+++ b/boards/nxp/frdm_mcxa156/doc/index.rst
@@ -34,63 +34,7 @@ For more information about the MCX-A156 SoC and FRDM-MCXA156 board, see:
 Supported Features
 ==================
 
-The FRDM-MCXA156 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CTIMER    | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| FLEXCAN   | on-chip    | CAN                                 |
-+-----------+------------+-------------------------------------+
-| FLEXIO    | on-chip    | flexio                              |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | flexio; MIPI-DBI. Tested with       |
-|           |            | :ref:`lcd_par_s035`                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| LPCMP     | on-chip    | sensor(comparator)                  |
-+-----------+------------+-------------------------------------+
-| LPSPI     | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-Targets available
-==================
-
-The default configuration file
-:zephyr_file:`boards/nxp/frdm_mcxa156/frdm_mcxa156_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -121,6 +65,8 @@ LPUART 0 is configured as UART for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -210,6 +156,9 @@ Troubleshooting
 .. include:: ../../common/segger-ecc-systemview.rst
    :start-after: segger-ecc-systemview
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MCX-A156 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-a-series-microcontrollers/mcx-a13x-14x-15x-mcus-with-arm-cortex-m33-scalable-device-options-low-power-and-intelligent-peripherals:MCX-A13X-A14X-A15X
 
diff --git a/boards/nxp/frdm_mcxa156/frdm_mcxa156-pinctrl.dtsi b/boards/nxp/frdm_mcxa156/frdm_mcxa156-pinctrl.dtsi
index 1ab107e4f4c3b..319d698ba7dfd 100644
--- a/boards/nxp/frdm_mcxa156/frdm_mcxa156-pinctrl.dtsi
+++ b/boards/nxp/frdm_mcxa156/frdm_mcxa156-pinctrl.dtsi
@@ -89,6 +89,22 @@
 			drive-strength = "low";
 		};
 	};
+	pinmux_i3c0: pinmux_i3c0 {
+		group0 {
+			pinmux = <I3C0_SDA_P0_16>,
+				<I3C0_SCL_P0_17>;
+			slew-rate = "fast";
+			drive-strength = "low";
+			input-enable;
+			bias-pull-up;
+		};
+		group1 {
+			pinmux = <I3C0_PUR_P1_11>;
+			slew-rate = "fast";
+			drive-strength = "low";
+			input-enable;
+		};
+	};
 	pinmux_lpadc0: pinmux_lpadc0 {
 		group0 {
 			pinmux = <ADC0_A0_P2_0>,
diff --git a/boards/nxp/frdm_mcxa156/frdm_mcxa156.dts b/boards/nxp/frdm_mcxa156/frdm_mcxa156.dts
index 8d8c07fe7ceb2..50698489641d9 100644
--- a/boards/nxp/frdm_mcxa156/frdm_mcxa156.dts
+++ b/boards/nxp/frdm_mcxa156/frdm_mcxa156.dts
@@ -9,6 +9,7 @@
 #include <nxp/nxp_mcxa156.dtsi>
 #include "frdm_mcxa156-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <freq.h>
 
 / {
 	model = "NXP FRDM_MCXA156 board";
@@ -23,6 +24,7 @@
 		pwm-0 = &flexpwm0_pwm0;
 		mcuboot-button0 = &user_button_2;
 		watchdog0 = &wwdt0;
+		ambient-temp0 = &p3t1755;
 	};
 
 	chosen {
@@ -165,6 +167,22 @@ zephyr_mipi_dbi_parallel: &flexio0_lcd {
 	pinctrl-names = "default";
 };
 
+&i3c0 {
+	status = "okay";
+	pinctrl-0 = <&pinmux_i3c0>;
+	pinctrl-names = "default";
+
+	i2c-scl-hz = <DT_FREQ_K(400)>;
+	i3c-scl-hz = <DT_FREQ_M(4)>;
+	i3c-od-scl-hz = <DT_FREQ_K(1500)>;
+
+	p3t1755: p3t1755@4800000236152a0090 {
+		compatible = "nxp,p3t1755";
+		reg = <0x48 0x0236 0x152a0090>;
+		status = "okay";
+	};
+};
+
 &lpadc0 {
 	status = "okay";
 	pinctrl-0 = <&pinmux_lpadc0>;
diff --git a/boards/nxp/frdm_mcxa156/frdm_mcxa156.yaml b/boards/nxp/frdm_mcxa156/frdm_mcxa156.yaml
index 24b7f6d8c7e8c..df74238b2fa2d 100644
--- a/boards/nxp/frdm_mcxa156/frdm_mcxa156.yaml
+++ b/boards/nxp/frdm_mcxa156/frdm_mcxa156.yaml
@@ -22,6 +22,7 @@ supported:
   - dac
   - dma
   - i2c
+  - i3c
   - pwm
   - spi
   - usb_device
diff --git a/boards/nxp/frdm_mcxa156/frdm_mcxa156_defconfig b/boards/nxp/frdm_mcxa156/frdm_mcxa156_defconfig
index 393d38123660c..cff11a6ec9e61 100644
--- a/boards/nxp/frdm_mcxa156/frdm_mcxa156_defconfig
+++ b/boards/nxp/frdm_mcxa156/frdm_mcxa156_defconfig
@@ -10,3 +10,4 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_GPIO=y
 CONFIG_LPADC_DO_OFFSET_CALIBRATION=y
+CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/boards/nxp/frdm_mcxa166/CMakeLists.txt b/boards/nxp/frdm_mcxa166/CMakeLists.txt
new file mode 100644
index 0000000000000..c06b9273965c0
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/CMakeLists.txt
@@ -0,0 +1,8 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_library()
+zephyr_library_sources(board.c)
diff --git a/boards/nxp/frdm_mcxa166/Kconfig b/boards/nxp/frdm_mcxa166/Kconfig
new file mode 100644
index 0000000000000..64334d8cb8272
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/Kconfig
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXA166
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/frdm_mcxa166/Kconfig.frdm_mcxa166 b/boards/nxp/frdm_mcxa166/Kconfig.frdm_mcxa166
new file mode 100644
index 0000000000000..442f61f27c69f
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/Kconfig.frdm_mcxa166
@@ -0,0 +1,6 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXA166
+	select SOC_MCXA166
+	select SOC_PART_NUMBER_MCXA166VLQ
diff --git a/boards/nxp/frdm_mcxa166/board.c b/boards/nxp/frdm_mcxa166/board.c
new file mode 100644
index 0000000000000..86909b65599e9
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/board.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2024-2025  NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <fsl_clock.h>
+#include <fsl_spc.h>
+#include <soc.h>
+
+/* Core clock frequency: 180MHz */
+#define CLOCK_INIT_CORE_CLOCK               180000000U
+#define BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK 180000000U
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+void board_early_init_hook(void)
+{
+	uint32_t coreFreq;
+	spc_active_mode_core_ldo_option_t ldoOption;
+	spc_sram_voltage_config_t sramOption;
+
+	/* Get the CPU Core frequency */
+	coreFreq = CLOCK_GetCoreSysClkFreq();
+
+	/* The flow of increasing voltage and frequency */
+	if (coreFreq <= BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK) {
+		/* Set the LDO_CORE VDD regulator level */
+		ldoOption.CoreLDOVoltage = kSPC_CoreLDO_OverDriveVoltage;
+		ldoOption.CoreLDODriveStrength = kSPC_CoreLDO_NormalDriveStrength;
+		(void)SPC_SetActiveModeCoreLDORegulatorConfig(SPC0, &ldoOption);
+		/* Configure Flash to support different voltage level and frequency */
+		FMU0->FCTRL =
+			(FMU0->FCTRL & ~((uint32_t)FMU_FCTRL_RWSC_MASK)) | (FMU_FCTRL_RWSC(0x4U));
+		/* Specifies the operating voltage for the SRAM's read/write timing margin */
+		sramOption.operateVoltage = kSPC_sramOperateAt1P2V;
+		sramOption.requestVoltageUpdate = true;
+		(void)SPC_SetSRAMOperateVoltage(SPC0, &sramOption);
+	}
+
+	/*!< Set up system dividers */
+	CLOCK_SetClockDiv(kCLOCK_DivAHBCLK, 1U); /* !< Set SYSCON.AHBCLKDIV divider to value 1 */
+	CLOCK_SetClockDiv(kCLOCK_DivFRO_HF, 1U); /* !< Set SYSCON.FROHFDIV divider to value 1 */
+	CLOCK_SetupFROHFClocking(BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK); /*!< Enable FRO HF */
+	CLOCK_SetupFRO12MClocking();             /*!< Setup FRO12M clock */
+
+	CLOCK_AttachClk(kFRO_HF_to_MAIN_CLK); /* !< Switch MAIN_CLK to kFRO_HF */
+
+	/* The flow of decreasing voltage and frequency */
+	if (coreFreq > BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK) {
+		/* Configure Flash to support different voltage level and frequency */
+		FMU0->FCTRL =
+			(FMU0->FCTRL & ~((uint32_t)FMU_FCTRL_RWSC_MASK)) | (FMU_FCTRL_RWSC(0x4U));
+		/* Specifies the operating voltage for the SRAM's read/write timing margin */
+		sramOption.operateVoltage = kSPC_sramOperateAt1P2V;
+		sramOption.requestVoltageUpdate = true;
+		(void)SPC_SetSRAMOperateVoltage(SPC0, &sramOption);
+		/* Set the LDO_CORE VDD regulator level */
+		ldoOption.CoreLDOVoltage = kSPC_CoreLDO_OverDriveVoltage;
+		ldoOption.CoreLDODriveStrength = kSPC_CoreLDO_NormalDriveStrength;
+		(void)SPC_SetActiveModeCoreLDORegulatorConfig(SPC0, &ldoOption);
+	}
+
+	/*!< Set up clock selectors - Attach clocks to the peripheries */
+	CLOCK_AttachClk(kCPU_CLK_to_TRACE); /* !< Switch TRACE to CPU_CLK */
+
+	/*!< Set up dividers */
+	CLOCK_SetClockDiv(kCLOCK_DivFRO_LF, 1U); /* !< Set SYSCON.FROLFDIV divider to value 1 */
+	CLOCK_SetClockDiv(kCLOCK_DivWWDT0, 1U);  /* !< Set MRCC.WWDT0_CLKDIV divider to value 1 */
+	CLOCK_SetClockDiv(kCLOCK_DivTRACE, 2U);  /* !< Set MRCC.TRACE_CLKDIV divider to value 2 */
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
+	RESET_ReleasePeripheralReset(kPORT0_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT0);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
+	RESET_ReleasePeripheralReset(kPORT1_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT1);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
+	RESET_ReleasePeripheralReset(kPORT2_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT2);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
+	RESET_ReleasePeripheralReset(kPORT3_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT3);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porte))
+	RESET_ReleasePeripheralReset(kPORT4_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT4);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+	RESET_ReleasePeripheralReset(kGPIO0_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO0);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+	RESET_ReleasePeripheralReset(kGPIO1_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO1);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+	RESET_ReleasePeripheralReset(kGPIO2_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO2);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+	RESET_ReleasePeripheralReset(kGPIO3_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO3);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
+	RESET_ReleasePeripheralReset(kGPIO4_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO4);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART0, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART0);
+	RESET_ReleasePeripheralReset(kLPUART0_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART1, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART1);
+	RESET_ReleasePeripheralReset(kLPUART1_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART2, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART2);
+	RESET_ReleasePeripheralReset(kLPUART2_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart3))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART3, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART3);
+	RESET_ReleasePeripheralReset(kLPUART3_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart4))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART4, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART4);
+	RESET_ReleasePeripheralReset(kLPUART4_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(edma0))
+	RESET_ReleasePeripheralReset(kDMA0_RST_SHIFT_RSTn);
+#endif
+	/* Set SystemCoreClock variable. */
+	SystemCoreClock = CLOCK_INIT_CORE_CLOCK;
+}
diff --git a/boards/nxp/frdm_mcxa166/board.cmake b/boards/nxp/frdm_mcxa166/board.cmake
new file mode 100644
index 0000000000000..f82d580a8413a
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/board.cmake
@@ -0,0 +1,13 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+board_runner_args(jlink "--device=MCXA166")
+board_runner_args(linkserver "--device=MCXA166:FRDM-MCXA166")
+board_runner_args(pyocd "--target=mcxA166")
+
+include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nxp/frdm_mcxa166/board.yml b/boards/nxp/frdm_mcxa166/board.yml
new file mode 100644
index 0000000000000..5a1b42e98c1a0
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: frdm_mcxa166
+  full_name: FRDM-MCXA166
+  vendor: nxp
+  socs:
+  - name: mcxa166
diff --git a/boards/nxp/frdm_mcxa166/doc/frdm_mcxa166.webp b/boards/nxp/frdm_mcxa166/doc/frdm_mcxa166.webp
new file mode 100644
index 0000000000000..0c6808e3f8ebe
Binary files /dev/null and b/boards/nxp/frdm_mcxa166/doc/frdm_mcxa166.webp differ
diff --git a/boards/nxp/frdm_mcxa166/doc/index.rst b/boards/nxp/frdm_mcxa166/doc/index.rst
new file mode 100644
index 0000000000000..16f0245349fd8
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/doc/index.rst
@@ -0,0 +1,178 @@
+.. zephyr:board:: frdm_mcxa166
+
+Overview
+********
+
+FRDM-MCXA166 are compact and scalable development boards for rapid prototyping of
+MCX A16X MCUs. They offer industry standard headers for easy access to the MCUs I/Os,
+integrated open-standard serial interfaces and an on-board MCU-Link debugger.
+MCX A Series are high-performance, low-power microcontrollers with MAU,SmartDMA and performance efficiency.
+
+Hardware
+********
+
+- MCX-A166 Arm Cortex-M33 microcontroller running at 180 MHz
+- 1MB dual-bank on chip Flash
+- 256 KB RAM
+- 1x FlexCAN with FD, 1x RGB LED, 3x SW buttons
+- On-board MCU-Link debugger with CMSIS-DAP
+- Arduino Header, SmartDMA/Camera Header, mikroBUS
+
+For more information about the MCX-A166 SoC and FRDM-MCXA166 board, see:
+
+- `MCX-A166 SoC Website`_
+- `MCX-A166 Datasheet`_
+- `MCX-A166 Reference Manual`_
+- `FRDM-MCXA166 Website`_
+- `FRDM-MCXA166 User Guide`_
+- `FRDM-MCXA166 Board User Manual`_
+- `FRDM-MCXA166 Schematics`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+The MCX-A166 SoC has 6 gpio controllers and has pinmux registers which
+can be used to configure the functionality of a pin.
+
++------------+-----------------+----------------------------+
+| Name       | Function        | Usage                      |
++============+=================+============================+
+| PIO2_3     | UART            | UART RX                    |
++------------+-----------------+----------------------------+
+| PIO2_2     | UART            | UART TX                    |
++------------+-----------------+----------------------------+
+
+System Clock
+============
+
+The MCX-A166 SoC is configured to use FRO running at 180MHz as a source for
+the system clock.
+
+Serial Port
+===========
+
+The FRDM-MCXA166 SoC has 6 LPUART  interfaces for serial communication.
+LPUART 2 is configured as UART for the console.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Configuring a Debug Probe
+=========================
+
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the MCU-Link CMSIS-DAP Onboard Debug Probe.
+
+Using LinkServer
+----------------
+
+Linkserver is the default runner for this board, and supports the factory
+default MCU-Link firmware. Follow the instructions in
+:ref:`mcu-link-cmsis-onboard-debug-probe` to reprogram the default MCU-Link
+firmware. This only needs to be done if the default onboard debug circuit
+firmware was changed. To put the board in ``ISP mode`` to program the firmware,
+short jumper JP4.
+
+Using J-Link
+------------
+
+There are two options. The onboard debug circuit can be updated with Segger
+J-Link firmware by following the instructions in
+:ref:`mcu-link-jlink-onboard-debug-probe`.
+To be able to program the firmware, you need to put the board in ``ISP mode``
+by shortening the jumper JP4.
+The second option is to attach a :ref:`jlink-external-debug-probe` to the
+10-pin SWD connector (J14) of the board. Additionally, the jumper JP6 must
+be shorted.
+For both options use the ``-r jlink`` option with west to use the jlink runner.
+
+.. code-block:: console
+
+   west flash -r jlink
+
+Configuring a Console
+=====================
+
+Connect a USB cable from your PC to J15, and use the serial terminal of your choice
+(minicom, putty, etc.) with the following settings:
+
+- Speed: 115200
+- Data: 8 bits
+- Parity: None
+- Stop bits: 1
+
+Flashing
+========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxa166
+   :goals: flash
+
+Open a serial terminal, reset the board (press the RESET button), and you should
+see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4478-ge6c3a42f5f52 ***
+   Hello World! frdm_mcxa166/mcxa166
+
+Debugging
+=========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxa166/mcxa166
+   :goals: debug
+
+Open a serial terminal, step through the application in your debugger, and you
+should see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4478-ge6c3a42f5f52 ***
+   Hello World! frdm_mcxa166/mcxa166
+
+Troubleshooting
+===============
+
+.. include:: ../../common/segger-ecc-systemview.rst
+   :start-after: segger-ecc-systemview
+
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
+.. _MCX-A166 SoC Website:
+   https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-a-series-microcontrollers/mcx-a13x-14x-15x-mcus-with-arm-cortex-m33-scalable-device-options-low-power-and-intelligent-peripherals:MCX-A13X-A14X-A15X
+
+.. _MCX-A166 Datasheet:
+   https://www.nxp.com/docs/en/data-sheet/MCXAP100M96FS6.pdf
+
+.. _MCX-A166 Reference Manual:
+   https://www.nxp.com/webapp/Download?colCode=MCXAP100M96FS6RM
+
+.. _FRDM-MCXA166 Website:
+   https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-a144-5-6-a154-5-6-mcus:FRDM-MCXA166
+
+.. _FRDM-MCXA166 User Guide:
+   https://www.nxp.com/document/guide/getting-started-with-frdm-mcxa166:GS-FRDM-MCXA166
+
+.. _FRDM-MCXA166 Board User Manual:
+   https://www.nxp.com/docs/en/user-manual/UM12121.pdf
+
+.. _FRDM-MCXA166 Schematics:
+   https://www.nxp.com/webapp/Download?colCode=SPF-90841
diff --git a/boards/nxp/frdm_mcxa166/frdm_mcxa166-pinctrl.dtsi b/boards/nxp/frdm_mcxa166/frdm_mcxa166-pinctrl.dtsi
new file mode 100644
index 0000000000000..ed6e8de8186dd
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/frdm_mcxa166-pinctrl.dtsi
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#include <nxp/mcx/MCXA166VLQ-pinctrl.h>
+
+&pinctrl {
+	pinmux_lpuart2: pinmux_lpuart2 {
+		group0 {
+			pinmux = <LPUART2_RXD_P2_3>,
+				<LPUART2_TXD_P2_2>;
+			drive-strength = "low";
+			slew-rate = "fast";
+			input-enable;
+		};
+	};
+
+	pinmux_lpuart3: pinmux_lpuart3 {
+		group0 {
+			pinmux = <LPUART3_RXD_P4_2>,
+				<LPUART3_TXD_P4_5>;
+			drive-strength = "low";
+			slew-rate = "fast";
+			input-enable;
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxa166/frdm_mcxa166.dts b/boards/nxp/frdm_mcxa166/frdm_mcxa166.dts
new file mode 100644
index 0000000000000..3a07ecb2fa565
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/frdm_mcxa166.dts
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_mcxa166.dtsi>
+#include "frdm_mcxa166-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "NXP FRDM_MCXA166 board";
+	compatible = "nxp,mcxa166", "nxp,mcx";
+
+	aliases{
+		led0 = &red_led;
+		led1 = &green_led;
+		led2 = &red_led;
+		sw0 = &user_button_2;
+		sw1 = &user_button_3;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash;
+		zephyr,flash-controller = &fmu;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,console = &lpuart2;
+		zephyr,shell-uart = &lpuart2;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		red_led: led_0 {
+			gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
+			label = "Red LED";
+		};
+
+		green_led: led_1 {
+			gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
+			label = "Green LED";
+		};
+
+		blue_led: led_2 {
+			gpios = <&gpio3 21 GPIO_ACTIVE_LOW>;
+			label = "Blue LED";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		user_button_2: button_2 {
+			label = "User SW2";
+			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		user_button_3: button_3 {
+			label = "User SW3";
+			gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+};
+
+&porta {
+	status = "okay";
+};
+
+&portb {
+	status = "okay";
+};
+
+&portc {
+	status = "okay";
+};
+
+&portd {
+	status = "okay";
+};
+
+&porte {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
+
+&gpio4 {
+	status = "okay";
+};
+
+&lpuart2 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart2>;
+	pinctrl-names = "default";
+};
+
+&flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(64)>;
+			read-only;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x00010000 DT_SIZE_K(400)>;
+		};
+		slot1_partition: partition@74000 {
+			label = "image-1";
+			reg = <0x00074000 DT_SIZE_K(400)>;
+		};
+		storage_partition: partition@d8000 {
+			label = "storage";
+			reg = <0x000d8000 DT_SIZE_K(112)>;
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxa166/frdm_mcxa166.yaml b/boards/nxp/frdm_mcxa166/frdm_mcxa166.yaml
new file mode 100644
index 0000000000000..93ce63ee9bdbf
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/frdm_mcxa166.yaml
@@ -0,0 +1,20 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: frdm_mcxa166
+name: NXP FRDM MCXA166
+type: mcu
+arch: arm
+ram: 240
+flash: 1024
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - uart
+  - flash
+vendor: nxp
diff --git a/boards/nxp/frdm_mcxa166/frdm_mcxa166_defconfig b/boards/nxp/frdm_mcxa166/frdm_mcxa166_defconfig
new file mode 100644
index 0000000000000..a630917318fa8
--- /dev/null
+++ b/boards/nxp/frdm_mcxa166/frdm_mcxa166_defconfig
@@ -0,0 +1,11 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_GPIO=y
diff --git a/boards/nxp/frdm_mcxa276/CMakeLists.txt b/boards/nxp/frdm_mcxa276/CMakeLists.txt
new file mode 100644
index 0000000000000..c06b9273965c0
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/CMakeLists.txt
@@ -0,0 +1,8 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_library()
+zephyr_library_sources(board.c)
diff --git a/boards/nxp/frdm_mcxa276/Kconfig b/boards/nxp/frdm_mcxa276/Kconfig
new file mode 100644
index 0000000000000..74b18017bc28b
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/Kconfig
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXA276
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/frdm_mcxa276/Kconfig.frdm_mcxa276 b/boards/nxp/frdm_mcxa276/Kconfig.frdm_mcxa276
new file mode 100644
index 0000000000000..632f03c4d0ffc
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/Kconfig.frdm_mcxa276
@@ -0,0 +1,6 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_MCXA276
+	select SOC_MCXA276
+	select SOC_PART_NUMBER_MCXA276VLQ
diff --git a/boards/nxp/frdm_mcxa276/board.c b/boards/nxp/frdm_mcxa276/board.c
new file mode 100644
index 0000000000000..86909b65599e9
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/board.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2024-2025  NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <fsl_clock.h>
+#include <fsl_spc.h>
+#include <soc.h>
+
+/* Core clock frequency: 180MHz */
+#define CLOCK_INIT_CORE_CLOCK               180000000U
+#define BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK 180000000U
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+void board_early_init_hook(void)
+{
+	uint32_t coreFreq;
+	spc_active_mode_core_ldo_option_t ldoOption;
+	spc_sram_voltage_config_t sramOption;
+
+	/* Get the CPU Core frequency */
+	coreFreq = CLOCK_GetCoreSysClkFreq();
+
+	/* The flow of increasing voltage and frequency */
+	if (coreFreq <= BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK) {
+		/* Set the LDO_CORE VDD regulator level */
+		ldoOption.CoreLDOVoltage = kSPC_CoreLDO_OverDriveVoltage;
+		ldoOption.CoreLDODriveStrength = kSPC_CoreLDO_NormalDriveStrength;
+		(void)SPC_SetActiveModeCoreLDORegulatorConfig(SPC0, &ldoOption);
+		/* Configure Flash to support different voltage level and frequency */
+		FMU0->FCTRL =
+			(FMU0->FCTRL & ~((uint32_t)FMU_FCTRL_RWSC_MASK)) | (FMU_FCTRL_RWSC(0x4U));
+		/* Specifies the operating voltage for the SRAM's read/write timing margin */
+		sramOption.operateVoltage = kSPC_sramOperateAt1P2V;
+		sramOption.requestVoltageUpdate = true;
+		(void)SPC_SetSRAMOperateVoltage(SPC0, &sramOption);
+	}
+
+	/*!< Set up system dividers */
+	CLOCK_SetClockDiv(kCLOCK_DivAHBCLK, 1U); /* !< Set SYSCON.AHBCLKDIV divider to value 1 */
+	CLOCK_SetClockDiv(kCLOCK_DivFRO_HF, 1U); /* !< Set SYSCON.FROHFDIV divider to value 1 */
+	CLOCK_SetupFROHFClocking(BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK); /*!< Enable FRO HF */
+	CLOCK_SetupFRO12MClocking();             /*!< Setup FRO12M clock */
+
+	CLOCK_AttachClk(kFRO_HF_to_MAIN_CLK); /* !< Switch MAIN_CLK to kFRO_HF */
+
+	/* The flow of decreasing voltage and frequency */
+	if (coreFreq > BOARD_BOOTCLOCKFROHF180M_CORE_CLOCK) {
+		/* Configure Flash to support different voltage level and frequency */
+		FMU0->FCTRL =
+			(FMU0->FCTRL & ~((uint32_t)FMU_FCTRL_RWSC_MASK)) | (FMU_FCTRL_RWSC(0x4U));
+		/* Specifies the operating voltage for the SRAM's read/write timing margin */
+		sramOption.operateVoltage = kSPC_sramOperateAt1P2V;
+		sramOption.requestVoltageUpdate = true;
+		(void)SPC_SetSRAMOperateVoltage(SPC0, &sramOption);
+		/* Set the LDO_CORE VDD regulator level */
+		ldoOption.CoreLDOVoltage = kSPC_CoreLDO_OverDriveVoltage;
+		ldoOption.CoreLDODriveStrength = kSPC_CoreLDO_NormalDriveStrength;
+		(void)SPC_SetActiveModeCoreLDORegulatorConfig(SPC0, &ldoOption);
+	}
+
+	/*!< Set up clock selectors - Attach clocks to the peripheries */
+	CLOCK_AttachClk(kCPU_CLK_to_TRACE); /* !< Switch TRACE to CPU_CLK */
+
+	/*!< Set up dividers */
+	CLOCK_SetClockDiv(kCLOCK_DivFRO_LF, 1U); /* !< Set SYSCON.FROLFDIV divider to value 1 */
+	CLOCK_SetClockDiv(kCLOCK_DivWWDT0, 1U);  /* !< Set MRCC.WWDT0_CLKDIV divider to value 1 */
+	CLOCK_SetClockDiv(kCLOCK_DivTRACE, 2U);  /* !< Set MRCC.TRACE_CLKDIV divider to value 2 */
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porta))
+	RESET_ReleasePeripheralReset(kPORT0_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT0);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portb))
+	RESET_ReleasePeripheralReset(kPORT1_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT1);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portc))
+	RESET_ReleasePeripheralReset(kPORT2_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT2);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(portd))
+	RESET_ReleasePeripheralReset(kPORT3_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT3);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(porte))
+	RESET_ReleasePeripheralReset(kPORT4_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GatePORT4);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio0))
+	RESET_ReleasePeripheralReset(kGPIO0_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO0);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio1))
+	RESET_ReleasePeripheralReset(kGPIO1_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO1);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio2))
+	RESET_ReleasePeripheralReset(kGPIO2_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO2);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio3))
+	RESET_ReleasePeripheralReset(kGPIO3_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO3);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpio4))
+	RESET_ReleasePeripheralReset(kGPIO4_RST_SHIFT_RSTn);
+	CLOCK_EnableClock(kCLOCK_GateGPIO4);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart0))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART0, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART0);
+	RESET_ReleasePeripheralReset(kLPUART0_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART1, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART1);
+	RESET_ReleasePeripheralReset(kLPUART1_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART2, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART2);
+	RESET_ReleasePeripheralReset(kLPUART2_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart3))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART3, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART3);
+	RESET_ReleasePeripheralReset(kLPUART3_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart4))
+	CLOCK_SetClockDiv(kCLOCK_DivLPUART4, 1u);
+	CLOCK_AttachClk(kFRO_LF_DIV_to_LPUART4);
+	RESET_ReleasePeripheralReset(kLPUART4_RST_SHIFT_RSTn);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(edma0))
+	RESET_ReleasePeripheralReset(kDMA0_RST_SHIFT_RSTn);
+#endif
+	/* Set SystemCoreClock variable. */
+	SystemCoreClock = CLOCK_INIT_CORE_CLOCK;
+}
diff --git a/boards/nxp/frdm_mcxa276/board.cmake b/boards/nxp/frdm_mcxa276/board.cmake
new file mode 100644
index 0000000000000..21bb9b2cd36e9
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/board.cmake
@@ -0,0 +1,13 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+board_runner_args(jlink "--device=MCXA276")
+board_runner_args(linkserver "--device=MCXA276:FRDM-MCXA276")
+board_runner_args(pyocd "--target=mcxA276")
+
+include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nxp/frdm_mcxa276/board.yml b/boards/nxp/frdm_mcxa276/board.yml
new file mode 100644
index 0000000000000..5d06ed143477a
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: frdm_mcxa276
+  full_name: FRDM-MCXA276
+  vendor: nxp
+  socs:
+  - name: mcxa276
diff --git a/boards/nxp/frdm_mcxa276/doc/frdm_mcxa276.webp b/boards/nxp/frdm_mcxa276/doc/frdm_mcxa276.webp
new file mode 100644
index 0000000000000..34489d4c08a1f
Binary files /dev/null and b/boards/nxp/frdm_mcxa276/doc/frdm_mcxa276.webp differ
diff --git a/boards/nxp/frdm_mcxa276/doc/index.rst b/boards/nxp/frdm_mcxa276/doc/index.rst
new file mode 100644
index 0000000000000..c176de8b82cec
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/doc/index.rst
@@ -0,0 +1,181 @@
+.. zephyr:board:: frdm_mcxa276
+
+Overview
+********
+
+FRDM-MCXA276 are compact and scalable development boards for rapid prototyping of
+MCX A27X MCUs. They offer industry standard headers for easy access to the MCUs I/Os,
+integrated open-standard serial interfaces and an on-board MCU-Link debugger.
+MCX A Series are high-performance, low-power microcontrollers with MAU,SmartDMA and performance efficiency.
+
+Hardware
+********
+
+- MCX-A276 Arm Cortex-M33 microcontroller running at 180 MHz
+- 1MB dual-bank on chip Flash
+- 256 KB RAM
+- 1x FlexCAN with FD, 1x RGB LED, 3x SW buttons
+- On-board MCU-Link debugger with CMSIS-DAP
+- Arduino Header, SmartDMA/Camera Header, mikroBUS
+
+For more information about the MCX-A276 SoC and FRDM-MCXA276 board, see:
+
+- `MCX-A276 SoC Website`_
+- `MCX-A276 Datasheet`_
+- `MCX-A276 Reference Manual`_
+- `FRDM-MCXA276 Website`_
+- `FRDM-MCXA276 User Guide`_
+- `FRDM-MCXA276 Board User Manual`_
+- `FRDM-MCXA276 Schematics`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+The MCX-A276 SoC has 6 gpio controllers and has pinmux registers which
+can be used to configure the functionality of a pin.
+
++------------+-----------------+----------------------------+
+| Name       | Function        | Usage                      |
++============+=================+============================+
+| PIO2_3     | UART            | UART RX                    |
++------------+-----------------+----------------------------+
+| PIO2_2     | UART            | UART TX                    |
++------------+-----------------+----------------------------+
+
+System Clock
+============
+
+The MCX-A276 SoC is configured to use FRO running at 180MHz as a source for
+the system clock.
+
+Serial Port
+===========
+
+The FRDM-MCXA276 SoC has 6 LPUART  interfaces for serial communication.
+LPUART 2 is configured as UART for the console.
+
+Programming and Debugging
+*************************
+
+Build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Configuring a Debug Probe
+=========================
+
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the MCU-Link CMSIS-DAP Onboard Debug Probe.
+
+Using LinkServer
+----------------
+
+Linkserver is the default runner for this board, and supports the factory
+default MCU-Link firmware. Follow the instructions in
+:ref:`mcu-link-cmsis-onboard-debug-probe` to reprogram the default MCU-Link
+firmware. This only needs to be done if the default onboard debug circuit
+firmware was changed. To put the board in ``ISP mode`` to program the firmware,
+short jumper JP4.
+
+Using J-Link
+------------
+
+There are two options. The onboard debug circuit can be updated with Segger
+J-Link firmware by following the instructions in
+:ref:`mcu-link-jlink-onboard-debug-probe`.
+To be able to program the firmware, you need to put the board in ``ISP mode``
+by shortening the jumper JP4.
+The second option is to attach a :ref:`jlink-external-debug-probe` to the
+10-pin SWD connector (J14) of the board. Additionally, the jumper JP6 must
+be shorted.
+For both options use the ``-r jlink`` option with west to use the jlink runner.
+
+.. code-block:: console
+
+   west flash -r jlink
+
+Configuring a Console
+=====================
+
+Connect a USB cable from your PC to J15, and use the serial terminal of your choice
+(minicom, putty, etc.) with the following settings:
+
+- Speed: 115200
+- Data: 8 bits
+- Parity: None
+- Stop bits: 1
+
+Programming and Debugging
+=========================
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxa276
+   :goals: flash
+
+Open a serial terminal, reset the board (press the RESET button), and you should
+see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4478-ge6c3a42f5f52 ***
+   Hello World! frdm_mcxa276/mcxa276
+
+Debugging
+=========
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: frdm_mcxa276/mcxa276
+   :goals: debug
+
+Open a serial terminal, step through the application in your debugger, and you
+should see the following message in the terminal:
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v3.6.0-4478-ge6c3a42f5f52 ***
+   Hello World! frdm_mcxa276/mcxa276
+
+Troubleshooting
+===============
+
+.. include:: ../../common/segger-ecc-systemview.rst
+   :start-after: segger-ecc-systemview
+
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
+.. _MCX-A276 SoC Website:
+   https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-a-series-microcontrollers/mcx-a13x-14x-15x-mcus-with-arm-cortex-m33-scalable-device-options-low-power-and-intelligent-peripherals:MCX-A13X-A14X-A15X
+
+.. _MCX-A276 Datasheet:
+   https://www.nxp.com/docs/en/data-sheet/MCXAP100M96FS6.pdf
+
+.. _MCX-A276 Reference Manual:
+   https://www.nxp.com/webapp/Download?colCode=MCXAP100M96FS6RM
+
+.. _FRDM-MCXA276 Website:
+   https://www.nxp.com/design/design-center/development-boards-and-designs/general-purpose-mcus/frdm-development-board-for-mcx-a144-5-6-a154-5-6-mcus:FRDM-MCXA276
+
+.. _FRDM-MCXA276 User Guide:
+   https://www.nxp.com/document/guide/getting-started-with-frdm-mcxa276:GS-FRDM-MCXA276
+
+.. _FRDM-MCXA276 Board User Manual:
+   https://www.nxp.com/docs/en/user-manual/UM12121.pdf
+
+.. _FRDM-MCXA276 Schematics:
+   https://www.nxp.com/webapp/Download?colCode=SPF-90841
diff --git a/boards/nxp/frdm_mcxa276/frdm_mcxa276-pinctrl.dtsi b/boards/nxp/frdm_mcxa276/frdm_mcxa276-pinctrl.dtsi
new file mode 100644
index 0000000000000..4eb700d76b29e
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/frdm_mcxa276-pinctrl.dtsi
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#include <nxp/mcx/MCXA276VLQ-pinctrl.h>
+
+&pinctrl {
+	pinmux_lpuart2: pinmux_lpuart2 {
+		group0 {
+			pinmux = <LPUART2_RXD_P2_3>,
+				<LPUART2_TXD_P2_2>;
+			drive-strength = "low";
+			slew-rate = "fast";
+			input-enable;
+		};
+	};
+
+	pinmux_lpuart3: pinmux_lpuart3 {
+		group0 {
+			pinmux = <LPUART3_RXD_P4_2>,
+				<LPUART3_TXD_P4_5>;
+			drive-strength = "low";
+			slew-rate = "fast";
+			input-enable;
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxa276/frdm_mcxa276.dts b/boards/nxp/frdm_mcxa276/frdm_mcxa276.dts
new file mode 100644
index 0000000000000..0ac367bbf6f75
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/frdm_mcxa276.dts
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_mcxa276.dtsi>
+#include "frdm_mcxa276-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "NXP FRDM_MCXA276 board";
+	compatible = "nxp,mcxa276", "nxp,mcx";
+
+	aliases{
+		led0 = &red_led;
+		led1 = &green_led;
+		led2 = &red_led;
+		sw0 = &user_button_2;
+		sw1 = &user_button_3;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash;
+		zephyr,flash-controller = &fmu;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,console = &lpuart2;
+		zephyr,shell-uart = &lpuart2;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		red_led: led_0 {
+			gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
+			label = "Red LED";
+		};
+
+		green_led: led_1 {
+			gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
+			label = "Green LED";
+		};
+
+		blue_led: led_2 {
+			gpios = <&gpio3 21 GPIO_ACTIVE_LOW>;
+			label = "Blue LED";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		user_button_2: button_2 {
+			label = "User SW2";
+			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		user_button_3: button_3 {
+			label = "User SW3";
+			gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+};
+
+&porta {
+	status = "okay";
+};
+
+&portb {
+	status = "okay";
+};
+
+&portc {
+	status = "okay";
+};
+
+&portd {
+	status = "okay";
+};
+
+&porte {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
+
+&gpio4 {
+	status = "okay";
+};
+
+&lpuart2 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart2>;
+	pinctrl-names = "default";
+};
+
+&flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(64)>;
+			read-only;
+		};
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x00010000 DT_SIZE_K(400)>;
+		};
+		slot1_partition: partition@74000 {
+			label = "image-1";
+			reg = <0x00074000 DT_SIZE_K(400)>;
+		};
+		storage_partition: partition@d8000 {
+			label = "storage";
+			reg = <0x000d8000 DT_SIZE_K(112)>;
+		};
+	};
+};
diff --git a/boards/nxp/frdm_mcxa276/frdm_mcxa276.yaml b/boards/nxp/frdm_mcxa276/frdm_mcxa276.yaml
new file mode 100644
index 0000000000000..065b8c89164ad
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/frdm_mcxa276.yaml
@@ -0,0 +1,20 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: frdm_mcxa276
+name: NXP FRDM MCXA276
+type: mcu
+arch: arm
+ram: 240
+flash: 1024
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - uart
+  - flash
+vendor: nxp
diff --git a/boards/nxp/frdm_mcxa276/frdm_mcxa276_defconfig b/boards/nxp/frdm_mcxa276/frdm_mcxa276_defconfig
new file mode 100644
index 0000000000000..a630917318fa8
--- /dev/null
+++ b/boards/nxp/frdm_mcxa276/frdm_mcxa276_defconfig
@@ -0,0 +1,11 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_GPIO=y
diff --git a/boards/nxp/frdm_mcxc242/Kconfig.defconfig b/boards/nxp/frdm_mcxc242/Kconfig.defconfig
new file mode 100644
index 0000000000000..6028882b5429d
--- /dev/null
+++ b/boards/nxp/frdm_mcxc242/Kconfig.defconfig
@@ -0,0 +1,16 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if BOARD_FRDM_MCXC242
+
+if USB_CDC_ACM
+
+config USB_CDC_ACM_RINGBUF_SIZE
+	default 256
+
+endif #USB_CDC_ACM
+
+endif #BOARD_FRDM_MCXC242
diff --git a/boards/nxp/frdm_mcxc242/doc/index.rst b/boards/nxp/frdm_mcxc242/doc/index.rst
index ceaa1cc8af58f..1c2286ca7dcff 100644
--- a/boards/nxp/frdm_mcxc242/doc/index.rst
+++ b/boards/nxp/frdm_mcxc242/doc/index.rst
@@ -38,47 +38,7 @@ these references:
 Supported Features
 ==================
 
-The ``frdm_mcxc242`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling                 |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PIT       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-
-
-Targets available
-==================
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/frdm_mcxc242/frdm_mcxc242_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -129,6 +89,8 @@ The MCXC242 LPUART0 is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -212,6 +174,9 @@ should see the following message in the terminal:
    *** Booting Zephyr OS build v3.6.0-4475-gfa5bd8bb098e ***
    Hello World! frdm_mcxc242/mcxc242
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MCX C14x/24x/44x Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-c-series-microcontrollers/mcx-c14x-24x-44x-mcus-with-arm-cortex-m0-plus-entry-level-mcus-with-usb-segment-lcd-and-classical-peripherals:MCX-C14x-24x-44x
 
diff --git a/boards/nxp/frdm_mcxc444/doc/index.rst b/boards/nxp/frdm_mcxc444/doc/index.rst
index 891fdce5c86f6..28cde8b45b94e 100644
--- a/boards/nxp/frdm_mcxc444/doc/index.rst
+++ b/boards/nxp/frdm_mcxc444/doc/index.rst
@@ -37,47 +37,7 @@ these references:
 Supported Features
 ==================
 
-The ``frdm_mcxc444`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PIT       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-
-
-Targets available
-==================
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/frdm_mcxc444/frdm_mcxc444_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -124,6 +84,8 @@ The MCXC444 LPUART0 is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -207,6 +169,9 @@ should see the following message in the terminal:
    *** Booting Zephyr OS build v3.6.0-4475-gfa5bd8bb098e ***
    Hello World! frdm_mcxc444/mcxc444
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MCX C14x/24x/44x Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-c-series-microcontrollers/mcx-c14x-24x-44x-mcus-with-arm-cortex-m0-plus-entry-level-mcus-with-usb-segment-lcd-and-classical-peripherals:MCX-C14x-24x-44x
 
diff --git a/boards/nxp/frdm_mcxn236/Kconfig b/boards/nxp/frdm_mcxn236/Kconfig
index 23271bc179f97..db8c981eda9e8 100644
--- a/boards/nxp/frdm_mcxn236/Kconfig
+++ b/boards/nxp/frdm_mcxn236/Kconfig
@@ -1,8 +1,5 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
-
-config BOARD_INIT_PRIORITY
-	int "Board initialization priority"
-	default 1
-	help
-	  Board initialization priority.
+#
+config BOARD_FRDM_MCXN236
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/frdm_mcxn236/Kconfig.defconfig b/boards/nxp/frdm_mcxn236/Kconfig.defconfig
new file mode 100644
index 0000000000000..919727e5e7e2c
--- /dev/null
+++ b/boards/nxp/frdm_mcxn236/Kconfig.defconfig
@@ -0,0 +1,13 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_FRDM_MCXN236
+
+if BOOTLOADER_MCUBOOT
+choice MCUBOOT_BOOTLOADER_MODE
+	# Board only supports MCUBoot via "upgrade only" method:
+	default MCUBOOT_BOOTLOADER_MODE_OVERWRITE_ONLY
+endchoice
+endif #BOOTLOADER_MCUBOOT
+
+endif
diff --git a/boards/nxp/frdm_mcxn236/Kconfig.sysbuild b/boards/nxp/frdm_mcxn236/Kconfig.sysbuild
new file mode 100644
index 0000000000000..d7364d0356b50
--- /dev/null
+++ b/boards/nxp/frdm_mcxn236/Kconfig.sysbuild
@@ -0,0 +1,6 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+choice MCUBOOT_MODE
+	default MCUBOOT_MODE_OVERWRITE_ONLY
+endchoice
diff --git a/boards/nxp/frdm_mcxn236/board.c b/boards/nxp/frdm_mcxn236/board.c
index 0f26f85724246..fff4c085a96e5 100644
--- a/boards/nxp/frdm_mcxn236/board.c
+++ b/boards/nxp/frdm_mcxn236/board.c
@@ -12,7 +12,7 @@
 #include "usb_phy.h"
 #include "usb.h"
 
-/* USB PHY condfiguration */
+/* USB PHY configuration */
 #define BOARD_USB_PHY_D_CAL     0x04U
 #define BOARD_USB_PHY_TXCAL45DP 0x07U
 #define BOARD_USB_PHY_TXCAL45DM 0x07U
@@ -57,7 +57,7 @@ void power_mode_od(void)
 	SPC_SetSRAMOperateVoltage(SPC0, &cfg);
 }
 
-static int frdm_mcxn236_init(void)
+void board_early_init_hook(void)
 {
 	enable_lpcac();
 
@@ -119,23 +119,27 @@ static int frdm_mcxn236_init(void)
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm1))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom1Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM1);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM1);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm2))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom2Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM2);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm3))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom3Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM3);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM3);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm4))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom4Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM4);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm5))
@@ -301,8 +305,4 @@ static int frdm_mcxn236_init(void)
 
 	/* Set SystemCoreClock variable. */
 	SystemCoreClock = CLOCK_INIT_CORE_CLOCK;
-
-	return 0;
 }
-
-SYS_INIT(frdm_mcxn236_init, PRE_KERNEL_1, CONFIG_BOARD_INIT_PRIORITY);
diff --git a/boards/nxp/frdm_mcxn236/board.cmake b/boards/nxp/frdm_mcxn236/board.cmake
index 705a6443526d8..da7dfb17a86bd 100644
--- a/boards/nxp/frdm_mcxn236/board.cmake
+++ b/boards/nxp/frdm_mcxn236/board.cmake
@@ -6,16 +6,6 @@
 
 board_runner_args(jlink "--device=MCXN236" "--reset-after-load")
 board_runner_args(linkserver  "--device=MCXN236:FRDM-MCXN236")
-board_runner_args(linkserver  "--core=cm33_core0")
-board_runner_args(linkserver  "--override=/device/memory/1/flash-driver=MCXNxxx_S.cfx")
-board_runner_args(linkserver  "--override=/device/memory/1/location=0x10000000")
-# Linkserver v1.4.85 and earlier do not include the secure regions in the
-# MCXN236 memory map, so we add them here
-board_runner_args(linkserver "--override=/device/memory/-=\{\"location\":\"0x30000000\",\
-                               \"size\":\"0x00040000\",\"type\":\"RAM\"\}")
-# Define region for peripherals
-board_runner_args(linkserver "--override=/device/memory/-=\{\"location\":\"0x50000000\",\
-                               \"size\":\"0x00140000\",\"type\":\"RAM\"\}")
 
 # Pyocd support added with the NXP.MCXN236_DFP.17.0.0.pack CMSIS Pack
 board_runner_args(pyocd "--target=mcxn236")
diff --git a/boards/nxp/frdm_mcxn236/doc/index.rst b/boards/nxp/frdm_mcxn236/doc/index.rst
index 48052ad4e56e3..91fe9514ebbf2 100644
--- a/boards/nxp/frdm_mcxn236/doc/index.rst
+++ b/boards/nxp/frdm_mcxn236/doc/index.rst
@@ -35,63 +35,7 @@ For more information about the MCX-N236 SoC and FRDM-MCXN236 board, see:
 Supported Features
 ==================
 
-The FRDM-MCXN236 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| I3C       | on-chip    | i3c                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| VREF      | on-chip    | regulator                           |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| USBHS     | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| LPCMP     | on-chip    | sensor(comparator)                  |
-+-----------+------------+-------------------------------------+
-| FLEXCAN   | on-chip    | CAN                                 |
-+-----------+------------+-------------------------------------+
-| FLEXIO    | on-chip    | flexio                              |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | flexio; MIPI-DBI. Tested with       |
-|           |            | :ref:`lcd_par_s035`                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| MRT       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Targets available
-==================
-
-The default configuration file
-:zephyr_file:`boards/nxp/frdm_mcxn236/frdm_mcxn236_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -122,6 +66,8 @@ Flexcomm 4 is configured as UART for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -211,6 +157,9 @@ Troubleshooting
 .. include:: ../../common/segger-ecc-systemview.rst
    :start-after: segger-ecc-systemview
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MCX-N236 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-n-series-microcontrollers/mcx-n23x-highly-integrated-mcus-with-on-chip-accelerators-intelligent-peripherals-and-advanced-security:MCX-N23X
 
diff --git a/boards/nxp/frdm_mcxn236/frdm_mcxn236.dtsi b/boards/nxp/frdm_mcxn236/frdm_mcxn236.dtsi
index 26515a7879755..8223342b4140c 100644
--- a/boards/nxp/frdm_mcxn236/frdm_mcxn236.dtsi
+++ b/boards/nxp/frdm_mcxn236/frdm_mcxn236.dtsi
@@ -15,6 +15,7 @@
 		led2 = &blue_led;
 		sw0 = &user_button_2;
 		sw1 = &user_button_3;
+		mcuboot-button0 = &user_button_2;
 	};
 
 	leds {
@@ -115,20 +116,28 @@ nxp_8080_touch_panel_i2c: &flexcomm2_lpi2c2 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 
+		/*
+		 * Partition sizes must be aligned
+		 * to the flash memory sector size of 8KB.
+		 */
 		boot_partition: partition@0 {
 			label = "mcuboot";
-			reg = <0x00000000 DT_SIZE_K(64)>;
+			reg = <0x00000000 DT_SIZE_K(80)>;
 		};
-		/* Note slot 0 has one additional sector,
-		 * this is intended for use with the swap move algorithm
+		/* For the MCUBoot "upgrade only" method,
+		 * the slot sizes must be equal.
 		 */
-		slot0_partition: partition@10000 {
+		slot0_partition: partition@14000 {
 			label = "image-0";
-			reg = <0x00010000 DT_SIZE_K(480)>;
+			reg = <0x00014000 DT_SIZE_K(440)>;
 		};
-		slot1_partition: partition@88000 {
+		slot1_partition: partition@84000 {
 			label = "image-1";
-			reg = <0x0088000 DT_SIZE_K(472)>;
+			reg = <0x0084000 DT_SIZE_K(440)>;
+		};
+		storage_partition: partition@F0000 {
+			label = "storage";
+			reg = <0x000F0000 DT_SIZE_K(64)>;
 		};
 	};
 };
diff --git a/boards/nxp/frdm_mcxn947/Kconfig b/boards/nxp/frdm_mcxn947/Kconfig
index 23271bc179f97..2e1614f868ba9 100644
--- a/boards/nxp/frdm_mcxn947/Kconfig
+++ b/boards/nxp/frdm_mcxn947/Kconfig
@@ -1,8 +1,5 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_INIT_PRIORITY
-	int "Board initialization priority"
-	default 1
-	help
-	  Board initialization priority.
+config BOARD_FRDM_MCXN947
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/frdm_mcxn947/board.c b/boards/nxp/frdm_mcxn947/board.c
index fafaf3e406824..c1384e6c183ae 100644
--- a/boards/nxp/frdm_mcxn947/board.c
+++ b/boards/nxp/frdm_mcxn947/board.c
@@ -12,7 +12,7 @@
 #include "usb_phy.h"
 #include "usb.h"
 
-/* USB PHY condfiguration */
+/* USB PHY configuration */
 #define BOARD_USB_PHY_D_CAL     (0x04U)
 #define BOARD_USB_PHY_TXCAL45DP (0x07U)
 #define BOARD_USB_PHY_TXCAL45DM (0x07U)
@@ -84,7 +84,7 @@ __ramfunc static void enable_cache64(void)
 }
 #endif
 
-static int frdm_mcxn947_init(void)
+void board_early_init_hook(void)
 {
 	power_mode_od();
 
@@ -148,23 +148,33 @@ static int frdm_mcxn947_init(void)
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm1))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom1Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM1);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM1);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm2))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom2Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM2);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm3))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
+	CLOCK_SetClkDiv(kCLOCK_DivFlexcom3Clk, 1u);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM3);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm4))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom4Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM4);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(flexcomm7))
+	/* Configure input clock to be able to reach the datasheet specified SPI band rate. */
 	CLOCK_SetClkDiv(kCLOCK_DivFlexcom7Clk, 1u);
-	CLOCK_AttachClk(kFRO12M_to_FLEXCOMM7);
+	CLOCK_AttachClk(kFRO_HF_DIV_to_FLEXCOMM7);
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(os_timer))
@@ -394,8 +404,4 @@ static int frdm_mcxn947_init(void)
 
 	/* Set SystemCoreClock variable. */
 	SystemCoreClock = CLOCK_INIT_CORE_CLOCK;
-
-	return 0;
 }
-
-SYS_INIT(frdm_mcxn947_init, PRE_KERNEL_1, CONFIG_BOARD_INIT_PRIORITY);
diff --git a/boards/nxp/frdm_mcxn947/doc/index.rst b/boards/nxp/frdm_mcxn947/doc/index.rst
index 83406f023bca0..285a521c3698c 100644
--- a/boards/nxp/frdm_mcxn947/doc/index.rst
+++ b/boards/nxp/frdm_mcxn947/doc/index.rst
@@ -37,73 +37,7 @@ For more information about the MCX-N947 SoC and FRDM-MCXN947 board, see:
 Supported Features
 ==================
 
-The FRDM-MCXN947 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| I3C       | on-chip    | i3c                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| ENET QOS  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SCTimer   | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| CTIMER    | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| USDHC     | on-chip    | sdhc                                |
-+-----------+------------+-------------------------------------+
-| VREF      | on-chip    | regulator                           |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| USBHS     | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| LPCMP     | on-chip    | sensor(comparator)                  |
-+-----------+------------+-------------------------------------+
-| FLEXCAN   | on-chip    | CAN                                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| FLEXIO    | on-chip    | flexio                              |
-+-----------+------------+-------------------------------------+
-| SAI       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | flexio; MIPI-DBI. Tested with       |
-|           |            | :ref:`lcd_par_s035`                 |
-+-----------+------------+-------------------------------------+
-| MRT       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Dual Core samples
 *****************
@@ -111,9 +45,9 @@ Dual Core samples
 +-----------+-------------------+----------------------+
 | Core      | Boot Address      | Comment              |
 +===========+===================+======================+
-| CPU0      | 0x10000000[1856K] | primary core flash   |
+| CPU0      | 0x10000000[2048K] | primary core flash   |
 +-----------+-------------------+----------------------+
-| CPU1      | 0x101d0000[192K]  | secondary core flash |
+| CPU1      | 0x1010a000[984K]  | secondary core flash |
 +-----------+-------------------+----------------------+
 
 +----------+------------------+-----------------------+
@@ -178,6 +112,8 @@ Flexcomm 4 is configured as UART for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -331,6 +267,9 @@ Troubleshooting
 .. include:: ../../common/segger-ecc-systemview.rst
    :start-after: segger-ecc-systemview
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MCX-N947 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/mcx-arm-cortex-m/mcx-n-series-microcontrollers/mcx-n94x-54x-highly-integrated-multicore-mcus-with-on-chip-accelerators-intelligent-peripherals-and-advanced-security:MCX-N94X-N54X
 
diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947-pinctrl.dtsi b/boards/nxp/frdm_mcxn947/frdm_mcxn947-pinctrl.dtsi
index 83b496c635d26..b2597191d55a1 100644
--- a/boards/nxp/frdm_mcxn947/frdm_mcxn947-pinctrl.dtsi
+++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947-pinctrl.dtsi
@@ -31,6 +31,18 @@
 		};
 	};
 
+	pinmux_flexcomm3_lpi2c: pinmux_flexcomm3_lpi2c {
+		group0 {
+			pinmux = <FC3_P0_PIO1_0>,
+				<FC3_P1_PIO1_1>;
+			slew-rate = "fast";
+			drive-strength = "low";
+			input-enable;
+			bias-pull-up;
+			drive-open-drain;
+		};
+	};
+
 	pinmux_flexcomm7_lpi2c: pimux_flexcomm7_lpi2c {
 		group0 {
 			pinmux = <FC7_P0_PIO3_2>,
diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi b/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi
index ee965dfef1a2e..3ebc13c0e9a99 100644
--- a/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi
+++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi
@@ -162,15 +162,11 @@ nxp_8080_touch_panel_i2c: &flexcomm2_lpi2c2 {
 		 */
 		slot0_partition: partition@14000 {
 			label = "image-0";
-			reg = <0x00014000 DT_SIZE_K(888)>;
+			reg = <0x00014000 DT_SIZE_K(984)>;
 		};
-		slot1_partition: partition@F2000 {
+		slot1_partition: partition@10A000 {
 			label = "image-1";
-			reg = <0x000F2000 DT_SIZE_K(888)>;
-		};
-		cpu1_partition: partition@1D0000 {
-			label = "cpu1-image";
-			reg = <0x001D0000 DT_SIZE_K(192)>;
+			reg = <0x0010A000 DT_SIZE_K(984)>;
 		};
 		/* storage_partition is placed in WINBOND flash memory*/
 	};
diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0.dtsi b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0.dtsi
index ec2880077b34b..d74efb27ac64e 100644
--- a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0.dtsi
+++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu0.dtsi
@@ -27,7 +27,7 @@
 		zephyr,console = &flexcomm4_lpuart4;
 		zephyr,shell-uart = &flexcomm4_lpuart4;
 		zephyr,canbus = &flexcan0;
-		zephyr,code-cpu1-partition = &cpu1_partition;
+		zephyr,code-cpu1-partition = &slot1_partition;
 	};
 
 	aliases{
diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.dts b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.dts
index 456c94239fa56..78fc22c12a713 100644
--- a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.dts
+++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.dts
@@ -21,7 +21,7 @@
 		zephyr,sram = &sramg;
 		zephyr,flash = &flash;
 		zephyr,flash-controller = &fmu;
-		zephyr,code-partition = &cpu1_partition;
+		zephyr,code-partition = &slot1_partition;
 		zephyr,console = &flexcomm2_lpuart2;
 		zephyr,shell-uart = &flexcomm2_lpuart2;
 	};
diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.yaml b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.yaml
index 352e6ebc514e3..62335a40f84ac 100644
--- a/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.yaml
+++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947_mcxn947_cpu1.yaml
@@ -13,7 +13,6 @@ flash: 200
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - dma
   - gpio
diff --git a/boards/nxp/frdm_mcxw71/doc/index.rst b/boards/nxp/frdm_mcxw71/doc/index.rst
index 0169c52eff72a..525ad8cdcf5d3 100644
--- a/boards/nxp/frdm_mcxw71/doc/index.rst
+++ b/boards/nxp/frdm_mcxw71/doc/index.rst
@@ -32,44 +32,7 @@ For more information about the MCXW71 SoC and FRDM-MCXW71 board, see:
 Supported Features
 ==================
 
-The ``frdm_mcxw71`` board target in Zephyr currently supports the following features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| LPUART    | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| LPI2C     | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| LPSPI     | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| FMU       | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| WDOG32    | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| BLE       | on-chip    | Bluetooth                           |
-+-----------+------------+-------------------------------------+
-| FLEXCAN   | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| VREF      | on-chip    | regulator                           |
-+-----------+------------+-------------------------------------+
-| LPADC     | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Fetch Binary Blobs
 ******************
@@ -84,6 +47,8 @@ achieved by running the following command:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -130,8 +95,26 @@ Connect a USB cable from your PC to J10, and use the serial terminal of your cho
 - Parity: None
 - Stop bits: 1
 
-Flashing
-========
+Application Building
+====================
+
+Openthread applications
+-----------------------
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/net/sockets/echo_server
+   :board: frdm_mcxw71
+   :goals: build
+   :gen-args: -DEXTRA_CONF_FILE=overlay-ot.conf
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/net/sockets/echo_client
+   :board: frdm_mcxw71
+   :goals: build
+   :gen-args: -DEXTRA_CONF_FILE=overlay-ot.conf
+
+Application Flashing
+====================
 
 Here is an example for the :zephyr:code-sample:`hello_world` application.
 
@@ -166,15 +149,17 @@ should see the following message in the terminal:
    *** Booting Zephyr OS build v3.7.0-xxx-xxxx ***
    Hello World! frdm_mcxw71/mcxw716c
 
-Bluetooth
-=========
+NBU Flashing
+============
 
 BLE functionality requires to fetch binary blobs, so make sure to follow
 the ``Fetch Binary Blobs`` section first.
 
 Two images must be written to the board: one for the host (CM33) and one for the NBU (CM3).
-- To flash the application (CM33) refer to the ``Flashing`` section above.
-- To flash the NBU, follow the instructions below:
+
+- To flash the application (CM33) refer to the ``Application Flashing`` section above.
+
+- To flash the ``NBU Flashing``, follow the instructions below:
 
    * Install ``blhost`` from NXP's website. This is the tool that will allow you to flash the NBU.
    * Enter ISP mode. To boot the MCU in ISP mode, follow these steps:
@@ -184,17 +169,39 @@ Two images must be written to the board: one for the host (CM33) and one for the
       - Reconnect any external power supply, if needed.
    * Use the following command to flash NBU file:
 
-.. code-block:: console
+.. tabs::
 
-   # On Windows
-   blhost.exe -p COMxx -- receive-sb-file mcxw71_nbu_ble.sb3
+   .. group-tab:: BLE NBU - Windows
 
-   # On Linux
-   ./blhost -p /dev/ttyxx -- receive-sb-file mcxw71_nbu_ble.sb3
+      .. code-block:: console
+         :caption: Flash BLE only NBU on Windows
+
+         blhost.exe -p COMxx -- receive-sb-file mcxw71_nbu_ble.sb3
+
+   .. group-tab:: BLE NBU - Linux
+
+      .. code-block:: console
+         :caption: Flash BLE only NBU on Linux
+
+         ./blhost -p /dev/ttyxx -- receive-sb-file mcxw71_nbu_ble.sb3
+
+   .. group-tab:: DYN NBU - Windows
+
+      .. code-block:: console
+         :caption: Flash Dynamic NBU (BLE + 15.4) on Windows
+
+         blhost.exe -p COMxx -- receive-sb-file mcxw71_nbu_ble_15_4_dyn.sb3
+
+   .. group-tab:: DYN NBU - Linux
+
+      .. code-block:: console
+         :caption: Flash Dynamic NBU (BLE + 15.4) on Linux
+
+         ./blhost -p /dev/ttyxx -- receive-sb-file mcxw71_nbu_ble_15_4_dyn.sb3
 
 Please consider changing ``COMxx`` on Windows or ``ttyxx`` on Linux to the serial port used by your board.
 
-The NBU file can be found in : ``<zephyr workspace>/modules/hal/nxp/zephyr/blobs/mcxw71/mcxw71_nbu_ble.sb3``
+The NBU files can be found in : ``<zephyr workspace>/modules/hal/nxp/zephyr/blobs/mcxw71/`` folder.
 
 For more details:
 
@@ -210,6 +217,9 @@ Troubleshooting
 .. include:: ../../common/segger-ecc-systemview.rst
    :start-after: segger-ecc-systemview
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts b/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
index bfde56f818066..9948163023989 100644
--- a/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
+++ b/boards/nxp/frdm_mcxw71/frdm_mcxw71.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -30,6 +30,7 @@
 		zephyr,uart-pipe = &lpuart0;
 		zephyr,canbus = &flexcan0;
 		zephyr,uart-mcumgr = &lpuart0;
+		zephyr,bt-c2h-uart = &lpuart0;
 	};
 
 	user_led {
@@ -56,7 +57,7 @@
 		compatible = "gpio-keys";
 		user_button_0: button_0 {
 			label = "User SW2";
-			gpios = <&gpioc 6 GPIO_ACTIVE_LOW>;
+			gpios = <&gpioc 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 			zephyr,code = <INPUT_KEY_0>;
 			status = "okay";
 		};
@@ -67,6 +68,10 @@
 	status = "okay";
 };
 
+&gpiob {
+	status = "okay";
+};
+
 &gpioc {
 	status = "okay";
 };
@@ -89,6 +94,12 @@
 	status = "okay";
 	pinctrl-0 = <&pinmux_lpi2c1>;
 	pinctrl-names = "default";
+
+	accelerometer: accelerometer@19 {
+		status = "okay";
+		compatible = "nxp,fxls8974";
+		reg = <0x19>;
+	};
 };
 
 &lpspi1 {
diff --git a/boards/nxp/frdm_mcxw72/doc/index.rst b/boards/nxp/frdm_mcxw72/doc/index.rst
index ad4cfc0530038..56f84381b1edb 100644
--- a/boards/nxp/frdm_mcxw72/doc/index.rst
+++ b/boards/nxp/frdm_mcxw72/doc/index.rst
@@ -27,38 +27,13 @@ For more information about the MCXW72 SoC and FRDM-MCXW72 board, see:
 Supported Features
 ==================
 
-The ``frdm_mcxw72`` board target in Zephyr currently supports the following features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| LPUART    | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| LPSPI     | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| FLEXCAN   | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -147,6 +122,9 @@ Troubleshooting
 .. include:: ../../common/segger-ecc-systemview.rst
    :start-after: segger-ecc-systemview
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.dts b/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.dts
index 914e0f9dfd64d..b9981c6f9b3a0 100644
--- a/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.dts
+++ b/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,6 +7,7 @@
 
 #include <nxp/nxp_mcxw72.dtsi>
 #include "frdm_mcxw72-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {
 	model = "NXP FRDM-MCXW72 board";
@@ -16,6 +17,7 @@
 		blue-pwm-led = &blue_pwm_led;
 		green-pwm-led = &green_pwm_led;
 		red-pwm-led = &red_pwm_led;
+		sw0 = &user_button_0;
 	};
 
 	chosen {
@@ -27,6 +29,7 @@
 		zephyr,shell-uart = &lpuart1;
 		zephyr,uart-pipe = &lpuart0;
 		zephyr,canbus = &flexcan0;
+		zephyr,bt-c2h-uart = &lpuart0;
 	};
 
 	user_led {
@@ -48,12 +51,25 @@
 			pwms = <&tpm0 2 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		user_button_0: button_0 {
+			label = "User SW2";
+			gpios = <&gpioc 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			zephyr,code = <INPUT_KEY_0>;
+			status = "okay";
+		};
+	};
 };
 
 &gpioa {
 	status = "okay";
 };
 
+&gpiob {
+	status = "okay";
+};
 
 &gpioc {
 	status = "okay";
@@ -80,11 +96,11 @@
 		#size-cells = <1>;
 
 		code_partition: partition@0 {
-			reg = <0x0 DT_SIZE_K(67)>;
+			reg = <0x0 DT_SIZE_K(2032)>;
 		};
 
-		storage_partition: partition@10c00 {
-			reg = <0x10c00 DT_SIZE_K(1981)>;
+		storage_partition: partition@1FC000 {
+			reg = <0x1FC000 DT_SIZE_K(16)>;
 		};
 	};
 };
@@ -133,4 +149,10 @@
 	status = "okay";
 	pinctrl-0 = <&pinmux_lpi2c1>;
 	pinctrl-names = "default";
+
+	accelerometer: accelerometer@19 {
+		status = "okay";
+		compatible = "nxp,fxls8974";
+		reg = <0x19>;
+	};
 };
diff --git a/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.yaml b/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.yaml
index 3d881e5cd4f32..b41068a1c998d 100644
--- a/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.yaml
+++ b/boards/nxp/frdm_mcxw72/frdm_mcxw72_mcxw727c_cpu0.yaml
@@ -7,7 +7,6 @@ flash: 2048
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - adc
   - can
diff --git a/boards/nxp/frdm_rw612/CMakeLists.txt b/boards/nxp/frdm_rw612/CMakeLists.txt
index a2a0b1227353d..74480e24ba927 100644
--- a/boards/nxp/frdm_rw612/CMakeLists.txt
+++ b/boards/nxp/frdm_rw612/CMakeLists.txt
@@ -1,15 +1,23 @@
 #
-# Copyright 2022-2023 NXP
+# Copyright 2022-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
+zephyr_library()
+zephyr_library_sources(init.c)
+
 if(CONFIG_NXP_RW6XX_BOOT_HEADER)
   zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
-  zephyr_library()
   # 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.
   # See MCUXpresso config tools for making a correct one.
   zephyr_library_sources(W25Q512JVFIQ_FCB.c)
 endif()
+
+if (CONFIG_DT_HAS_NXP_ENET_MAC_ENABLED AND CONFIG_XTAL32K)
+	message(FATAL_ERROR "Ethernet and external 32K clock source are "
+		"mutually exclusive on FRDM_RW612 due to shared PCB nets "
+		"between the ethernet PHY and the external oscillator")
+endif()
diff --git a/boards/nxp/frdm_rw612/Kconfig b/boards/nxp/frdm_rw612/Kconfig
new file mode 100644
index 0000000000000..274f00c1db2d1
--- /dev/null
+++ b/boards/nxp/frdm_rw612/Kconfig
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_FRDM_RW612
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/frdm_rw612/Kconfig.defconfig b/boards/nxp/frdm_rw612/Kconfig.defconfig
index 89d264de12310..26d9acb9209c8 100644
--- a/boards/nxp/frdm_rw612/Kconfig.defconfig
+++ b/boards/nxp/frdm_rw612/Kconfig.defconfig
@@ -1,6 +1,6 @@
 # FRDM_RW612 board
 
-# Copyright 2024 NXP
+# Copyright 2024-25 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_FRDM_RW612
@@ -8,4 +8,28 @@ if BOARD_FRDM_RW612
 config NET_L2_ETHERNET
 	default y if DT_HAS_NXP_ENET_MAC_ENABLED && NETWORKING
 
+if LVGL
+
+# Enable DMA for LCDIC
+config MIPI_DBI_NXP_LCDIC_DMA
+	default y if MIPI_DBI
+
+# Increase descriptor count. LVGL will allocate a 30KB buffer,
+# and the SPI driver sets up RX and TX side. Since LPC DMA has
+# 1KB limit per descriptor, we need 60
+config DMA_MCUX_LPC_NUMBER_OF_DESCRIPTORS
+	default 60
+
+config LV_Z_FLUSH_THREAD
+	default y
+
+endif # LVGL
+
+if COUNTER_MCUX_LPC_RTC_1HZ
+
+config XTAL32K
+	default y
+
+endif # COUNTER_MCUX_LPC_RTC_1HZ
+
 endif # BOARD_FRDM_RW612
diff --git a/boards/nxp/frdm_rw612/doc/index.rst b/boards/nxp/frdm_rw612/doc/index.rst
index 1bd6b5191a573..a45d32d4cda52 100644
--- a/boards/nxp/frdm_rw612/doc/index.rst
+++ b/boards/nxp/frdm_rw612/doc/index.rst
@@ -23,62 +23,17 @@ Hardware
 Supported Features
 ==================
 
-+-----------+------------+-----------------------------------+
-| Interface | Controller | Driver/Component                  |
-+===========+============+===================================+
-| NVIC      | on-chip    | nested vector interrupt controller|
-+-----------+------------+-----------------------------------+
-| SYSTICK   | on-chip    | systick                           |
-+-----------+------------+-----------------------------------+
-| MCI_IOMUX | on-chip    | pinmux                            |
-+-----------+------------+-----------------------------------+
-| GPIO      | on-chip    | gpio                              |
-+-----------+------------+-----------------------------------+
-| USART     | on-chip    | serial                            |
-+-----------+------------+-----------------------------------+
-| DMA       | on-chip    | dma                               |
-+-----------+------------+-----------------------------------+
-| SPI       | on-chip    | spi                               |
-+-----------+------------+-----------------------------------+
-| I2C       | on-chip    | i2c                               |
-+-----------+------------+-----------------------------------+
-| TRNG      | on-chip    | entropy                           |
-+-----------+------------+-----------------------------------+
-| WWDT      | on-chip    | watchdog                          |
-+-----------+------------+-----------------------------------+
-| USBOTG    | on-chip    | usb                               |
-+-----------+------------+-----------------------------------+
-| CTIMER    | on-chip    | counter                           |
-+-----------+------------+-----------------------------------+
-| SCTIMER   | on-chip    | pwm                               |
-+-----------+------------+-----------------------------------+
-| MRT       | on-chip    | counter                           |
-+-----------+------------+-----------------------------------+
-| OS_TIMER  | on-chip    | os timer                          |
-+-----------+------------+-----------------------------------+
-| PM        | on-chip    | power management; uses SoC Power  |
-|           |            | Modes 1 and 2                     |
-+-----------+------------+-----------------------------------+
-| BLE       | on-chip    | Bluetooth                         |
-+-----------+------------+-----------------------------------+
-| ADC       | on-chip    | adc                               |
-+-----------+------------+-----------------------------------+
-| DAC       | on-chip    | dac                               |
-+-----------+------------+-----------------------------------+
-| ENET      | on-chip    | ethernet                          |
-+-----------+------------+-----------------------------------+
-| Wi-Fi     | on-chip    | Wi-Fi                             |
-+-----------+------------+-----------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-   :zephyr_file:`boards/nxp/frdm_rw612/frdm_rw612_defconfig`
-
-Other hardware features are not currently supported
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   Power modes 1, 2 and 3 are supported when using System Power Management.
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -185,6 +140,20 @@ frdm_rw612 platform supports the monolithic feature. The required binary blob
 ``<zephyr workspace>/modules/hal/nxp/zephyr/blobs/rw61x_sb_wifi_a2.bin`` will be linked
 with the application image directly, forming one single monolithic image.
 
+RTC Sub-Second Counter
+======================
+
+To use the RTC sub-second counter which is clocked at a 32kHZ rate, make the
+following modifications to the board hardware:
+
+1. Move the short on SJ21 from 1 and 2 to short 2 and 3.
+2. Move the short on SJ22 from 1 and 2 to short 2 and 3.
+
+After this change, the ENET will stop functioning on the board.
+
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 Resources
 *********
 
diff --git a/boards/nxp/frdm_rw612/frdm_rw612-pinctrl.dtsi b/boards/nxp/frdm_rw612/frdm_rw612-pinctrl.dtsi
index 12ecaa90f404b..b54f0aa7e9166 100644
--- a/boards/nxp/frdm_rw612/frdm_rw612-pinctrl.dtsi
+++ b/boards/nxp/frdm_rw612/frdm_rw612-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 NXP
+ * Copyright 2022-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -60,4 +60,23 @@
 			slew-rate = "normal";
 		};
 	};
+
+	pinmux_lcdic: pinmux_lcdic {
+		group0 {
+			pinmux = <IO_MUX_LCD_SPI_IO44
+				IO_MUX_LCD_SPI_IO45
+				IO_MUX_LCD_SPI_IO46
+				IO_MUX_LCD_SPI_IO47
+				IO_MUX_LCD_SPI_IO48
+				IO_MUX_LCD_SPI_IO49>;
+			slew-rate = "ultra";
+		};
+	};
+
+	pinmux_flexcomm1_i2s: pinmux_flexcomm1_i2s {
+		group0 {
+			pinmux = <IO_MUX_FC1_I2S>;
+			slew-rate = "normal";
+		};
+	};
 };
diff --git a/boards/nxp/frdm_rw612/frdm_rw612.yaml b/boards/nxp/frdm_rw612/frdm_rw612.yaml
index 6ec0eb9bd5172..59697fc6cbffb 100644
--- a/boards/nxp/frdm_rw612/frdm_rw612.yaml
+++ b/boards/nxp/frdm_rw612/frdm_rw612.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright 2022-2024 NXP
+# Copyright 2022-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -18,6 +18,7 @@ supported:
   - dma
   - spi
   - i2c
+  - i2s
   - entropy
   - usb_device
   - watchdog
diff --git a/boards/nxp/frdm_rw612/frdm_rw612_common.dtsi b/boards/nxp/frdm_rw612/frdm_rw612_common.dtsi
index 0989d83ea3802..cf039cd59e72c 100644
--- a/boards/nxp/frdm_rw612/frdm_rw612_common.dtsi
+++ b/boards/nxp/frdm_rw612/frdm_rw612_common.dtsi
@@ -5,6 +5,7 @@
  */
 
 #include "frdm_rw612-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {
 	model = "nxp,frdm_rw612";
@@ -15,6 +16,8 @@
 		usart-0 = &flexcomm3;
 		i2c-0 = &flexcomm2;
 		pwm-0 = &sctimer;
+		sw0 = &user_button_0;
+		ambient-temp0 = &p3t1755;
 	};
 
 	chosen {
@@ -30,9 +33,28 @@
 	leds {
 		compatible = "gpio-leds";
 		green_led: led_1 {
-			gpios = <&hsgpio0 12 0>;
+			gpios = <&hsgpio0 12 GPIO_ACTIVE_LOW>;
 		};
 	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		user_button_0: button_0 {
+			label = "User SW2";
+			gpios = <&hsgpio0 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			zephyr,code = <INPUT_KEY_0>;
+			status = "okay";
+		};
+	};
+
+	nxp_lcd_pmod_connector: lcd-pmod-connector {
+		compatible = "nxp,lcd-pmod";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xfffffff0>;
+		gpio-map-pass-thru = <0 0xf>;
+		gpio-map = <10  0 &hsgpio1 12 0>,  /* Pin 10, LCD and touch reset */
+			   <12  0 &hsgpio0 18 0>;  /* Pin 11, LCD touch INT */
+	};
 };
 
 &flexcomm3 {
@@ -175,6 +197,7 @@
 &os_timer {
 	status = "okay";
 	wakeup-source;
+	deep-sleep-counter = <&rtc_highres>;
 };
 
 &systick {
@@ -195,6 +218,12 @@
 	pinctrl-names = "default";
 };
 
+/* RTC is the wakeup source for PM modes 3,4 */
+&rtc_highres {
+	status = "okay";
+	wakeup-source;
+};
+
 &nbu {
 	status = "okay";
 	wakeup-source;
@@ -227,4 +256,20 @@ arduino_i2c: &flexcomm2 {
 	#size-cells = <0>;
 	pinctrl-0 = <&pinmux_flexcomm2_i2c>;
 	pinctrl-names = "default";
+
+	p3t1755: p3t1755@48 {
+		compatible = "nxp,p3t1755";
+		reg = <0x48>;
+		status = "okay";
+	};
+};
+
+zephyr_mipi_dbi_spi: &lcdic {
+	status = "okay";
+	pinctrl-0 = <&pinmux_lcdic>;
+	pinctrl-names = "default";
+};
+
+nxp_pmod_touch_panel_i2c: &arduino_i2c {
+	status = "okay";
 };
diff --git a/boards/nxp/frdm_rw612/init.c b/boards/nxp/frdm_rw612/init.c
new file mode 100644
index 0000000000000..44c05ad3efeb2
--- /dev/null
+++ b/boards/nxp/frdm_rw612/init.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2022, 2024-25 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/pm/pm.h>
+#include <fsl_power.h>
+#include <fsl_common.h>
+
+static void frdm_rw612_power_init_config(void)
+{
+	power_init_config_t initCfg = {
+		/* VCORE AVDD18 supplied from iBuck on FRDM board. */
+		.iBuck = true,
+		/* CAU_SOC_SLP_REF_CLK is needed for LPOSC. */
+		.gateCauRefClk = false,
+	};
+
+	POWER_InitPowerConfig(&initCfg);
+}
+
+#if CONFIG_PM
+static void frdm_rw612_pm_state_exit(enum pm_state state)
+{
+	switch (state) {
+	case PM_STATE_STANDBY:
+		frdm_rw612_power_init_config();
+		break;
+	default:
+		break;
+	}
+}
+#endif
+
+void board_early_init_hook(void)
+{
+	frdm_rw612_power_init_config();
+
+#if CONFIG_PM
+	static struct pm_notifier frdm_rw612_pm_notifier = {
+		.state_exit = frdm_rw612_pm_state_exit,
+	};
+
+	pm_notifier_register(&frdm_rw612_pm_notifier);
+#endif
+
+#ifdef CONFIG_I2S_TEST_SEPARATE_DEVICES
+	/*
+	 * Eventually this code should not be here
+	 * but should be configured by some SYSCTL node
+	 */
+
+	/* Set shared signal set 0 SCK, WS from Transmit I2S - Flexcomm1 */
+	SYSCTL1->SHAREDCTRLSET[0] = SYSCTL1_SHAREDCTRLSET_SHAREDSCKSEL(1) |
+				SYSCTL1_SHAREDCTRLSET_SHAREDWSSEL(1);
+
+	/* Select Data in from Transmit I2S - Flexcomm 1 */
+	SYSCTL1->SHAREDCTRLSET[0] |= SYSCTL1_SHAREDCTRLSET_SHAREDDATASEL(1);
+	/* Enable Transmit I2S - Flexcomm 1 for Shared Data Out */
+	SYSCTL1->SHAREDCTRLSET[0] |= SYSCTL1_SHAREDCTRLSET_FC1DATAOUTEN(1);
+
+	/* Set Receive I2S - Flexcomm 0 SCK, WS from shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[0] = SYSCTL1_FCCTRLSEL_SCKINSEL(1) |
+				SYSCTL1_FCCTRLSEL_WSINSEL(1);
+
+	/* Set Transmit I2S - Flexcomm 1 SCK, WS from shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[1] = SYSCTL1_FCCTRLSEL_SCKINSEL(1) |
+				SYSCTL1_FCCTRLSEL_WSINSEL(1);
+
+	/* Select Receive I2S - Flexcomm 0 Data in from shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[0] |= SYSCTL1_FCCTRLSEL_DATAINSEL(1);
+	/* Select Transmit I2S - Flexcomm 1 Data out to shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[1] |= SYSCTL1_FCCTRLSEL_DATAOUTSEL(1);
+#endif /* CONFIG_I2S_TEST_SEPARATE_DEVICES */
+}
diff --git a/boards/nxp/hexiwear/doc/index.rst b/boards/nxp/hexiwear/doc/index.rst
index 6f47bddf00d33..225921966cabf 100644
--- a/boards/nxp/hexiwear/doc/index.rst
+++ b/boards/nxp/hexiwear/doc/index.rst
@@ -501,6 +501,9 @@ you should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-rc1 *****
    Hello World! hexiwear
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _KW40Z Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/kinetis-cortex-m-mcus/w-serieswireless-conn.m0-plus-m4/kinetis-kw40z-2.4-ghz-dual-mode-ble-and-802.15.4-wireless-radio-microcontroller-mcu-based-on-arm-cortex-m0-plus-core:KW40Z
 
diff --git a/boards/nxp/imx8mm_evk/doc/index.rst b/boards/nxp/imx8mm_evk/doc/index.rst
index f234d8feef94a..3c2a8540aba4c 100644
--- a/boards/nxp/imx8mm_evk/doc/index.rst
+++ b/boards/nxp/imx8mm_evk/doc/index.rst
@@ -42,60 +42,11 @@ More information about the board can be found at the
 Supported Features
 ==================
 
-The Zephyr imx8mm_evk board for Cortex-A53 configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| GIC-v3    | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| ARM TIMER | on-chip    | system clock                        |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RDC       | on-chip    | Resource Domain Controller          |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | timer                               |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet port                       |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO ports                          |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | I2C bus                             |
-+-----------+------------+-------------------------------------+
-
-The Zephyr imx8mm_evk board for Cortex-M4 supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO output                         |
-|           |            | GPIO input                          |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/imx8mm_evk/imx8mm_evk_mimx8mm6_m4_defconfig`
-
-It is recommended to disable peripherals used by the M4 core on the Linux host.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   It is recommended to disable peripherals used by the M4 core on the Linux host.
 
 Devices
 ========
@@ -115,6 +66,8 @@ CPU's UART4. This is used for the M4 and A53 core targets.
 Programming and Debugging (A53)
 *******************************
 
+.. zephyr:board-supported-runners::
+
 U-Boot "cpu" command is used to load and kick Zephyr to Cortex-A secondary Core, Currently
 it is supported in : `Real-Time Edge U-Boot`_ (use the branch "uboot_vxxxx.xx-y.y.y,
 xxxx.xx is uboot version and y.y.y is Real-Time Edge Software version, for example
@@ -249,8 +202,8 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS build zephyr-v2.0.0-1859-g292afe8533c0 *****
    Hello World! imx8mm_evk
 
-References
-==========
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _NXP website:
    https://www.nxp.com/design/development-boards/i.mx-evaluation-and-development-boards/evaluation-kit-for-thebr-i.mx-8m-mini-applications-processor:8MMINILPD4-EVK
diff --git a/boards/nxp/imx8mn_evk/doc/index.rst b/boards/nxp/imx8mn_evk/doc/index.rst
index e488a9a887689..3102e2a159ba4 100644
--- a/boards/nxp/imx8mn_evk/doc/index.rst
+++ b/boards/nxp/imx8mn_evk/doc/index.rst
@@ -42,32 +42,7 @@ More information about the board can be found at the
 Supported Features
 ==================
 
-The Zephyr mimx8mn_evk board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| GIC-v3    | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| ARM TIMER | on-chip    | system clock                        |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RDC       | on-chip    | Resource Domain Controller          |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | timer                               |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet port                       |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO ports                          |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | I2C bus                             |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Devices
 ========
@@ -85,6 +60,8 @@ CPU's UART4.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 U-Boot "cpu" command is used to load and kick Zephyr to Cortex-A secondary Core, Currently
 it has been supported in latest U-Boot version by `patch serials`_.
 
@@ -138,8 +115,8 @@ Use Jailhouse hypervisor, after root cell linux is up:
     #jailhouse cell load 1 zephyr.bin -a 0x93c00000
     #jailhouse cell start 1
 
-References
-==========
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _NXP website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/evaluation-kit-for-the-i-mx-8m-nano-applications-processor:8MNANOD4-EVK
diff --git a/boards/nxp/imx8mp_evk/doc/index.rst b/boards/nxp/imx8mp_evk/doc/index.rst
index 935647045d423..70f1470081311 100644
--- a/boards/nxp/imx8mp_evk/doc/index.rst
+++ b/boards/nxp/imx8mp_evk/doc/index.rst
@@ -42,48 +42,7 @@ More information about the board can be found at the
 Supported Features
 ==================
 
-The Zephyr mimx8mp_evk_a53 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| GIC-v3    | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| ARM TIMER | on-chip    | system clock                        |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RDC       | on-chip    | Resource Domain Controller          |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet port                       |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO ports                          |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | I2C bus                             |
-+-----------+------------+-------------------------------------+
-
-The Zephyr mimx8mp_evk_m7 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Devices
 ========
@@ -103,6 +62,8 @@ CPU's UART4.
 Programming and Debugging (A53)
 *******************************
 
+.. zephyr:board-supported-runners::
+
 U-Boot "cpu" command is used to load and kick Zephyr to Cortex-A secondary Core, Currently
 it is supported in : `Real-Time Edge U-Boot`_ (use the branch "uboot_vxxxx.xx-y.y.y,
 xxxx.xx is uboot version and y.y.y is Real-Time Edge Software version, for example
@@ -323,8 +284,8 @@ should see the following message in the terminal:
    *** Booting Zephyr OS build v2.7.99-1310-g2801bf644a91  ***
    Hello World! imx8mp_evk
 
-References
-==========
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _NXP website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/evaluation-kit-for-the-i-mx-8m-plus-applications-processor:8MPLUSLPD4-EVK
diff --git a/boards/nxp/imx8mq_evk/doc/index.rst b/boards/nxp/imx8mq_evk/doc/index.rst
index 6022aeb66678a..fe3e417321b4e 100644
--- a/boards/nxp/imx8mq_evk/doc/index.rst
+++ b/boards/nxp/imx8mq_evk/doc/index.rst
@@ -40,28 +40,7 @@ More information about the board can be found at the
 Supported Features
 ==================
 
-The Zephyr mimx8mq_evk board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/imx8mq_evk/imx8mq_evk_mimx8mq6_m4_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -91,6 +70,8 @@ the remaining are not used/tested.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The MIMX8MQ EVK board doesn't have QSPI flash for the M4 and it needs
 to be started by the A53 core. The A53 core is responsible to load the M4 binary
 application into the RAM, put the M4 in reset, set the M4 Program Counter and
@@ -198,8 +179,8 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS build zephyr-v2.6.99-30942-g6ee70bd22058 *****
    Hello World! imx8mq_evk
 
-References
-==========
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _NXP website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/evaluation-kit-for-the-i-mx-8m-applications-processor:MCIMX8M-EVK
diff --git a/boards/nxp/imx91_evk/doc/index.rst b/boards/nxp/imx91_evk/doc/index.rst
index a292670b80e9b..be734dfb1ce14 100644
--- a/boards/nxp/imx91_evk/doc/index.rst
+++ b/boards/nxp/imx91_evk/doc/index.rst
@@ -53,21 +53,7 @@ that can operate at speeds of up to 1.4 GHz.
 Supported Features
 ==================
 
-The ``imx91_evk`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| GIC-v3    | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| ARM TIMER | on-chip    | system clock                        |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Devices
 ========
@@ -118,11 +104,5 @@ display the following console output:
     thread_a: Hello World from cpu 0 on imx91_evk!
     thread_b: Hello World from cpu 0 on imx91_evk!
 
-References
-==========
-
-More information can refer to NXP official website:
-`NXP website`_.
-
-.. _NXP website:
-   https://www.nxp.com/products/i.MX91
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
diff --git a/boards/nxp/imx93_evk/doc/index.rst b/boards/nxp/imx93_evk/doc/index.rst
index d410cd5dd2600..84b90410539b1 100644
--- a/boards/nxp/imx93_evk/doc/index.rst
+++ b/boards/nxp/imx93_evk/doc/index.rst
@@ -45,53 +45,7 @@ Cortex®-M33 core. Zephyr OS is ported to run on one of the Cortex®-A55 core.
 Supported Features
 ==================
 
-The Zephyr mimx93_evk board Cortex-A Core configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| GIC-v4    | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| ARM TIMER | on-chip    | system clock                        |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | TPM Counter                         |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet port                       |
-+-----------+------------+-------------------------------------+
-
-The Zephyr imx93_evk board Cortex-M33 configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | GPIO                                |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Devices
 ========
@@ -162,6 +116,8 @@ Note: The overlay only supports ``mimx9352/a55``, but can be extended to support
 Programming and Debugging (A55)
 *******************************
 
+.. zephyr:board-supported-runners::
+
 U-Boot "cpu" command is used to load and kick Zephyr to Cortex-A secondary Core, Currently
 it is supported in : `Real-Time Edge U-Boot`_ (use the branch "uboot_vxxxx.xx-y.y.y,
 xxxx.xx is uboot version and y.y.y is Real-Time Edge Software version, for example
@@ -383,3 +339,6 @@ This board has been designed for SOF so it's only intended to be used with SOF.
 
 TODO: document the SOF build process for this board. For now, the support for
 i.MX93 is still in review and has yet to merged on SOF side.
+
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
diff --git a/boards/nxp/imx95_evk/CMakeLists.txt b/boards/nxp/imx95_evk/CMakeLists.txt
index 4b24695474302..19302b77d01a3 100644
--- a/boards/nxp/imx95_evk/CMakeLists.txt
+++ b/boards/nxp/imx95_evk/CMakeLists.txt
@@ -11,3 +11,6 @@ if (CONFIG_SOF AND CONFIG_BOARD_IMX95_EVK_MIMX9596_M7_DDR)
     DEPENDS ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}
   )
 endif()
+
+zephyr_library()
+zephyr_library_sources(board.c)
diff --git a/boards/nxp/imx95_evk/board.c b/boards/nxp/imx95_evk/board.c
new file mode 100644
index 0000000000000..477bcc38f6ae9
--- /dev/null
+++ b/boards/nxp/imx95_evk/board.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/devicetree.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <soc.h>
+
+static int board_init(void)
+{
+#if defined(CONFIG_ETH_NXP_IMX_NETC) && (DT_CHILD_NUM_STATUS_OKAY(DT_NODELABEL(netc)) != 0)
+	/* Port 0 to 2 protocol configure: RGMII, RGMII, XGMII */
+	BLK_CTRL_NETCMIX->CFG_LINK_MII_PROT = 0x00000522;
+	BLK_CTRL_NETCMIX->CFG_LINK_PCS_PROT_2 = 0x00000040;
+
+	/* Unlock the IERB. It will warm reset whole NETC. */
+	NETC_PRIV->NETCRR &= ~NETC_PRIV_NETCRR_LOCK_MASK;
+	while ((NETC_PRIV->NETCRR & NETC_PRIV_NETCRR_LOCK_MASK) != 0U) {
+	}
+
+	/* Lock the IERB. */
+	NETC_PRIV->NETCRR |= NETC_PRIV_NETCRR_LOCK_MASK;
+	while ((NETC_PRIV->NETCSR & NETC_PRIV_NETCSR_STATE_MASK) != 0U) {
+	}
+#endif
+	return 0;
+}
+
+/*
+ * Because platform is using ARM SCMI, drivers like scmi, mbox etc. are
+ * initialized during PRE_KERNEL_1. Common init hooks is not able to use.
+ * SoC early init and board early init could be run during PRE_KERNEL_2 instead.
+ */
+SYS_INIT(board_init, PRE_KERNEL_2, 10);
diff --git a/boards/nxp/imx95_evk/doc/index.rst b/boards/nxp/imx95_evk/doc/index.rst
index 71762c3ed5e6f..75aba8fd01d0b 100644
--- a/boards/nxp/imx95_evk/doc/index.rst
+++ b/boards/nxp/imx95_evk/doc/index.rst
@@ -73,46 +73,7 @@ Hardware
 Supported Features
 ==================
 
-The Zephyr ``imx95_evk/mimx9596/m7`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | tpm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-The Zephyr ``imx95_evk/mimx9596/a55`` and ``imx95_evk/mimx9596/a55/smp`` board targets support
-the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| GIC-v4    | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| ARM TIMER | on-chip    | system clock                        |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | tpm                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System Clock
 ------------
@@ -141,10 +102,19 @@ SPI
 The EVK board need to be reworked to solder R1217/R1218/R1219/R1220 with 0R resistances.
 SPI1 on J35 is enabled for M7.
 
+Ethernet
+--------
+
+NETC driver supports to manage the Physical Station Interface (PSI).
+The first ENET1 port could be enabled for M7 by west build option
+``-DEXTRA_DTC_OVERLAY_FILE=enetc_psi0.overlay``.
+
 
 Programming and Debugging (A55)
 *******************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests,
 for example, with the :zephyr:code-sample:`synchronization` sample:
 
@@ -293,11 +263,8 @@ while, for the ``imx95_evk/mimx9596/m7/ddr`` board, you should get the following
 .. _MCUX SDK release:
    https://mcuxpresso.nxp.com/
 
-References
-==========
-
-More information can refer to NXP official website:
-`NXP website`_.
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _NXP website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors/i-mx-95-applications-processor-family-high-performance-safety-enabled-platform-with-eiq-neutron-npu:iMX95
diff --git a/boards/nxp/imx95_evk/dts/enetc_psi0.overlay b/boards/nxp/imx95_evk/dts/enetc_psi0.overlay
new file mode 100644
index 0000000000000..2e24f5ff94b72
--- /dev/null
+++ b/boards/nxp/imx95_evk/dts/enetc_psi0.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&emdio {
+	status = "okay";
+
+	phy0: phy@1 {
+		status = "okay";
+	};
+};
+
+&enetc_psi0 {
+	status = "okay";
+};
diff --git a/boards/nxp/imx95_evk/imx95_evk-pinctrl.dtsi b/boards/nxp/imx95_evk/imx95_evk-pinctrl.dtsi
index 5d2811389708e..607e84753d88c 100644
--- a/boards/nxp/imx95_evk/imx95_evk-pinctrl.dtsi
+++ b/boards/nxp/imx95_evk/imx95_evk-pinctrl.dtsi
@@ -6,6 +6,42 @@
 #include <nxp/nxp_imx/mimx9596avzxn-pinctrl.dtsi>
 
 &pinctrl {
+	emdio_default: emdio_default {
+		group1 {
+			pinmux = <&iomuxc_enet1_mdc_netc_mdc_netc_mdc>,
+				<&iomuxc_enet1_mdio_netc_mdio_netc_mdio>;
+			bias-pull-down;
+			slew-rate = "slightly_fast";
+			drive-strength = "x6";
+		};
+	};
+
+	eth0_default: eth0_default {
+		group1 {
+			pinmux = <&iomuxc_enet1_rx_ctl_eth_rgmii_rx_ctl_eth0_rgmii_rx_ctl>,
+				<&iomuxc_enet1_rd0_eth_rgmii_rd_eth0_rgmii_rd0>,
+				<&iomuxc_enet1_rd1_eth_rgmii_rd_eth0_rgmii_rd1>,
+				<&iomuxc_enet1_rd2_eth_rgmii_rd_eth0_rgmii_rd2>,
+				<&iomuxc_enet1_rd3_eth_rgmii_rd_eth0_rgmii_rd3>,
+				<&iomuxc_enet1_tx_ctl_eth_rgmii_tx_ctl_eth0_rgmii_tx_ctl>,
+				<&iomuxc_enet1_td0_eth_rgmii_td_eth0_rgmii_td0>,
+				<&iomuxc_enet1_td1_eth_rgmii_td_eth0_rgmii_td1>,
+				<&iomuxc_enet1_td2_eth_rgmii_td_eth0_rgmii_td2>,
+				<&iomuxc_enet1_td3_eth_rgmii_td_eth0_rgmii_td3>;
+			bias-pull-down;
+			slew-rate = "slightly_fast";
+			drive-strength = "x6";
+		};
+		group2 {
+			pinmux = <&iomuxc_enet1_rxc_eth_rgmii_rx_clk_eth0_rgmii_rx_clk>,
+				<&iomuxc_enet1_txc_eth_rgmii_tx_clk_eth0_rgmii_tx_clk>;
+			bias-pull-down;
+			slew-rate = "fast";
+			drive-strength = "x6";
+		};
+
+	};
+
 	lpi2c5_default: lpi2c5_default {
 		group0 {
 			pinmux = <&iomuxc_gpio_io23_lpi2c_scl_lpi2c5_scl>,
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.dts b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.dts
index 62997746f44f6..d4aff0f100de9 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.dts
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -47,6 +47,18 @@
 	};
 };
 
+&lpi2c5 {
+	pinctrl-0 = <&lpi2c5_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&lpi2c7 {
+	pinctrl-0 = <&lpi2c7_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &lpuart1 {
 	status = "okay";
 	current-speed = <115200>;
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml
index 410193135e807..a4597d08db33a 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml
@@ -13,6 +13,7 @@ toolchain:
   - cross-compile
 ram: 1024
 supported:
-  - uart
   - counter
+  - i2c
+  - uart
 vendor: nxp
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.dts b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.dts
index cdb7edf2f7449..3dec65cf98379 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.dts
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -29,6 +29,18 @@
 	};
 };
 
+&lpi2c5 {
+	pinctrl-0 = <&lpi2c5_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&lpi2c7 {
+	pinctrl-0 = <&lpi2c7_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &lpuart1 {
 	status = "okay";
 	current-speed = <115200>;
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml
index 33f570bd53ade..5b048d8fa7783 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml
@@ -13,7 +13,8 @@ toolchain:
   - cross-compile
 ram: 1024
 supported:
+  - counter
+  - i2c
   - smp
   - uart
-  - counter
 vendor: nxp
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.dts b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.dts
index f2c74a1278649..cdc053f5c94a4 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.dts
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.dts
@@ -23,6 +23,27 @@
 	};
 };
 
+&emdio {
+	pinctrl-0 = <&emdio_default>;
+	pinctrl-names = "default";
+	status = "disabled";
+
+	phy0: phy@1 {
+		compatible = "realtek,rtl8211f";
+		reg = <0x1>;
+		status = "disabled";
+	};
+};
+
+&enetc_psi0 {
+	local-mac-address = [00 00 00 01 02 00];
+	pinctrl-0 = <&eth0_default>;
+	pinctrl-names = "default";
+	phy-handle = <&phy0>;
+	phy-connection-type = "rgmii";
+	status = "disabled";
+};
+
 &lpi2c5 {
 	pinctrl-0 = <&lpi2c5_default>;
 	pinctrl-names = "default";
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.yaml b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.yaml
index 428cf60cb088c..50cd837eb7b8c 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.yaml
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7.yaml
@@ -18,4 +18,5 @@ supported:
   - i2c
   - pwm
   - spi
+  - netif:eth
 vendor: nxp
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_ddr_defconfig b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_ddr_defconfig
index f89de52c0365c..effcdb5e4d48b 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_ddr_defconfig
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_ddr_defconfig
@@ -17,6 +17,7 @@ CONFIG_CONSOLE=y
 CONFIG_MBOX=y
 CONFIG_MBOX_INIT_PRIORITY=0
 CONFIG_ARM_SCMI=y
+CONFIG_ARM_SCMI_NXP_VENDOR_EXTENSIONS=y
 
 # kernel-related configurations
 CONFIG_XIP=n
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_defconfig b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_defconfig
index 180973c667f4e..338c3ea662aa7 100644
--- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_defconfig
+++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_m7_defconfig
@@ -13,3 +13,4 @@ CONFIG_XIP=y
 CONFIG_MBOX=y
 CONFIG_MBOX_INIT_PRIORITY=0
 CONFIG_ARM_SCMI=y
+CONFIG_ARM_SCMI_NXP_VENDOR_EXTENSIONS=y
diff --git a/boards/nxp/lpcxpresso11u68/doc/index.rst b/boards/nxp/lpcxpresso11u68/doc/index.rst
index 4fe74d245c83f..5ab49c3df481e 100644
--- a/boards/nxp/lpcxpresso11u68/doc/index.rst
+++ b/boards/nxp/lpcxpresso11u68/doc/index.rst
@@ -42,30 +42,7 @@ More information can be found here:
 Supported Features
 ==================
 
-The lpcxpresso11U68 supports the following features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c master/slave controller         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port interrupt               |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-
-Other hardware is not yet supported on Zephyr.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -94,6 +71,8 @@ The IOCON controller can be used to configure the LPC11U68 pins.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
@@ -140,6 +119,9 @@ References
 - `LPCXPRESSO11U68 Website`_
 - `LPCXPRESSO11U68 Schematics`_
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC11UXX SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1100-cortex-m0-plus-m0/scalable-entry-level-32-bit-microcontroller-mcu-based-on-arm-cortex-m0-plus-and-cortex-m0-cores:LPC11U00
 
diff --git a/boards/nxp/lpcxpresso51u68/doc/index.rst b/boards/nxp/lpcxpresso51u68/doc/index.rst
index 3246a9f939304..da86141884147 100644
--- a/boards/nxp/lpcxpresso51u68/doc/index.rst
+++ b/boards/nxp/lpcxpresso51u68/doc/index.rst
@@ -31,30 +31,7 @@ More information can be found here:
 Supported Features
 ==================
 
-The lpcxpresso51u68 support the following features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c master/slave controller         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | SPI master                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware is not yet supported on Zephyr.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -90,6 +67,8 @@ The IOCON controller can be used to configure the LPC51U68 pins.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -156,6 +135,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS build zephyr-v2.6.0-934-g4c438c0c7d13 *****
    Hello World! lpcxpresso51u68
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC51U68 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/high-performance-power-efficient-and-cost-sensitive-arm-cortex-m0-plus-mcus:LPC51U68
 
diff --git a/boards/nxp/lpcxpresso54114/doc/index.rst b/boards/nxp/lpcxpresso54114/doc/index.rst
index 410a052b43311..84b9bf44c2d87 100644
--- a/boards/nxp/lpcxpresso54114/doc/index.rst
+++ b/boards/nxp/lpcxpresso54114/doc/index.rst
@@ -40,37 +40,7 @@ For more information about the LPC54114 SoC and LPCXPRESSO54114 board:
 Supported Features
 ==================
 
-The lpcxpresso54114 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| IAP       | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration for each core can be found in the defconfig files:
-
-- :zephyr_file:`boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m4_defconfig`
-- :zephyr_file:`boards/nxp/lpcxpresso54114/lpcxpresso54114_lpc54114_m0_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -120,6 +90,8 @@ configured as USART for the console and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -192,6 +164,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-rc1 *****
    Hello World! lpcxpresso54114_m4
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC54114 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc54000-series-cortex-m4-mcus/low-power-microcontrollers-mcus-based-on-arm-cortex-m4-cores-with-optional-cortex-m0-plus-co-processor:LPC541XX
 
diff --git a/boards/nxp/lpcxpresso55s06/board.cmake b/boards/nxp/lpcxpresso55s06/board.cmake
index a6df50bba7333..305ed963f21c9 100644
--- a/boards/nxp/lpcxpresso55s06/board.cmake
+++ b/boards/nxp/lpcxpresso55s06/board.cmake
@@ -8,5 +8,5 @@
 board_runner_args(linkserver  "--device=LPC55S06:LPCXpresso55S06")
 board_runner_args(jlink "--device=LPC55S06" "--reset-after-load")
 
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nxp/lpcxpresso55s06/doc/index.rst b/boards/nxp/lpcxpresso55s06/doc/index.rst
index a4f5234aa70a4..61c9c681023ef 100644
--- a/boards/nxp/lpcxpresso55s06/doc/index.rst
+++ b/boards/nxp/lpcxpresso55s06/doc/index.rst
@@ -36,40 +36,15 @@ For more information about the LPC55S06 SoC and LPCXPresso55S06 board, see:
 Supported Features
 ==================
 
-The lpcxpresso55s06 board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`lpcxpresso55s69` , which is the superset board in NXP's LPC55xx series.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the lpcxpresso55s69 board may have additional features
-already supported, which can also be re-used on this lpcxpresso55s06 board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | entropy;                            |
-|           |            | random                              |
-+-----------+------------+-------------------------------------+
-| IAP       | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently enabled.
-
-Currently available targets for this board are:
-
-- *lpcxpresso55s06*
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`lpcxpresso55s69` , which is the superset board in NXP's LPC55xx series.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the lpcxpresso55s69 board may have additional features
+   already supported, which can also be re-used on this lpcxpresso55s06 board:
 
 Connections and IOs
 ===================
@@ -114,25 +89,25 @@ and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
 
 Configuring a Debug Probe
 =========================
 
-A debug probe is used for both flashing and debugging the board. This
-board is configured by default to use the LPC-Link2 CMSIS-DAP Onboard
-Debug Probe, however the :ref:`pyocd-debug-host-tools` does not yet
-support the LPC55S06 so you must reconfigure the board for one of the
-J-Link debug probe instead.
+LinkServer is the default runner for this board.
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the integrated :ref:`mcu-link-onboard-debug-probe`
+in the CMSIS-DAP mode. To use this probe with Zephyr, you need to install the
+:ref:`linkserver-debug-host-tools` and make sure they are in your search path.
+Refer to the detailed overview about :ref:`application_debugging` for additional
+information.
 
-First install the :ref:`jlink-debug-host-tools` and make sure they are
-in your search path.
-
-Then follow the instructions in
-:ref:`lpclink2-jlink-onboard-debug-probe` to program the J-Link
-firmware. Please make sure you have the latest firmware for this
-board.
+The integrated MCU-Link hardware can also be used as a J-Link probe with a
+firmware update, as described in :ref:`mcu-link-jlink-onboard-debug-probe`.
+The :ref:`jlink-debug-host-tools` should be available in this case.
 
 Configuring a Console
 =====================
@@ -182,6 +157,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS zephyr-v3.0.0 *****
    Hello World! lpcxpresso55s06
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC55S06 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc5500-cortex-m33/lpc550x-s0x-baseline-arm-cortex-m33-based-microcontroller-family:LPC550x
 
diff --git a/boards/nxp/lpcxpresso55s16/board.cmake b/boards/nxp/lpcxpresso55s16/board.cmake
index f1a6370b01fe5..45ca5dcfe1cf3 100644
--- a/boards/nxp/lpcxpresso55s16/board.cmake
+++ b/boards/nxp/lpcxpresso55s16/board.cmake
@@ -9,6 +9,6 @@ board_runner_args(linkserver  "--device=LPC55S16:LPCXpresso55S16")
 board_runner_args(jlink "--device=LPC55S16" "--reset-after-load")
 board_runner_args(pyocd "--target=lpc55s16")
 
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nxp/lpcxpresso55s16/doc/index.rst b/boards/nxp/lpcxpresso55s16/doc/index.rst
index f38fd083c8a3b..f164238247e9a 100644
--- a/boards/nxp/lpcxpresso55s16/doc/index.rst
+++ b/boards/nxp/lpcxpresso55s16/doc/index.rst
@@ -41,50 +41,15 @@ For more information about the LPC55S16 SoC and LPCXPresso55S16 board, see:
 Supported Features
 ==================
 
-The lpcxpresso55s16 board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`lpcxpresso55s69` , which is the superset board in NXP's LPC55xx series.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the lpcxpresso55s69 board may have additional features
-already supported, which can also be re-used on this lpcxpresso55s16 board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 trigger                    |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | canbus                              |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | entropy;                            |
-|           |            | random                              |
-+-----------+------------+-------------------------------------+
-| IAP       | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently enabled.
-
-Currently available targets for this board are:
-
-- *lpcxpresso55s16*
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`lpcxpresso55s69` , which is the superset board in NXP's LPC55xx series.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the lpcxpresso55s69 board may have additional features
+   already supported, which can also be re-used on this lpcxpresso55s16 board.
 
 Connections and IOs
 ===================
@@ -149,25 +114,25 @@ configured for I2C, and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
 
 Configuring a Debug Probe
 =========================
 
-A debug probe is used for both flashing and debugging the board. This
-board is configured by default to use the LPC-Link2 CMSIS-DAP Onboard
-Debug Probe, however the :ref:`pyocd-debug-host-tools` does not yet
-support the LPC55S16 so you must reconfigure the board for one of the
-J-Link debug probe instead.
+LinkServer is the default runner for this board.
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the integrated :ref:`mcu-link-onboard-debug-probe`
+in the CMSIS-DAP mode. To use this probe with Zephyr, you need to install the
+:ref:`linkserver-debug-host-tools` and make sure they are in your search path.
+Refer to the detailed overview about :ref:`application_debugging` for additional
+information.
 
-First install the :ref:`jlink-debug-host-tools` and make sure they are
-in your search path.
-
-Then follow the instructions in
-:ref:`lpclink2-jlink-onboard-debug-probe` to program the J-Link
-firmware. Please make sure you have the latest firmware for this
-board.
+The integrated MCU-Link hardware can also be used as a J-Link probe with a
+firmware update, as described in :ref:`mcu-link-jlink-onboard-debug-probe`.
+The :ref:`jlink-debug-host-tools` should be available in this case.
 
 Configuring a Console
 =====================
@@ -217,6 +182,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS zephyr-v2.2.0 *****
    Hello World! lpcxpresso55s16
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC55S16 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc5500-cortex-m33/lpc551x-s1x-baseline-arm-cortex-m33-based-microcontroller-family:LPC551X-S1X
 
diff --git a/boards/nxp/lpcxpresso55s28/board.cmake b/boards/nxp/lpcxpresso55s28/board.cmake
index 933e3815a8c92..0a6ea8e61fe19 100644
--- a/boards/nxp/lpcxpresso55s28/board.cmake
+++ b/boards/nxp/lpcxpresso55s28/board.cmake
@@ -8,6 +8,6 @@ board_runner_args(linkserver  "--device=LPC55S28:LPCXpresso55S28")
 board_runner_args(pyocd "--target=lpc55s28")
 board_runner_args(jlink "--device=LPC55S28" "--reset-after-load")
 
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nxp/lpcxpresso55s28/doc/index.rst b/boards/nxp/lpcxpresso55s28/doc/index.rst
index b0cea1547bed2..ca86f0fe9b350 100644
--- a/boards/nxp/lpcxpresso55s28/doc/index.rst
+++ b/boards/nxp/lpcxpresso55s28/doc/index.rst
@@ -41,47 +41,15 @@ For more information about the LPC55S28 SoC and LPCXPresso55S28 board, see:
 Supported Features
 ==================
 
-The lpcxpresso55s28 board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`lpcxpresso55s69` , which is the superset board in NXP's LPC55xx series.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the lpcxpresso55s69 board may have additional features
-already supported, which can also be re-used on this lpcxpresso55s28 board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WWDT      | on-chip    | windowed watchdog timer             |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | entropy;                            |
-|           |            | random                              |
-+-----------+------------+-------------------------------------+
-| IAP       | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently enabled.
-
-The default configuration file
-:zephyr_file:`boards/nxp/lpcxpresso55s28/lpcxpresso55s28_defconfig`
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`lpcxpresso55s69` , which is the superset board in NXP's LPC55xx series.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the lpcxpresso55s69 board may have additional features
+   already supported, which can also be re-used on this board.
 
 Connections and IOs
 ===================
@@ -133,15 +101,25 @@ configured as USART for the console and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
 
 Configuring a Debug Probe
 =========================
 
-A debug probe is used for both flashing and debugging the board. This
-board is configured by default to use the LPC-Link2 CMSIS-DAP Onboard
-Debug Probe.
+LinkServer is the default runner for this board.
+A debug probe is used for both flashing and debugging the board. This board is
+configured by default to use the integrated :ref:`mcu-link-onboard-debug-probe`
+in the CMSIS-DAP mode. To use this probe with Zephyr, you need to install the
+:ref:`linkserver-debug-host-tools` and make sure they are in your search path.
+Refer to the detailed overview about :ref:`application_debugging` for additional
+information.
+
+The integrated MCU-Link hardware can also be used as a J-Link probe with a
+firmware update, as described in :ref:`mcu-link-jlink-onboard-debug-probe`.
+The :ref:`jlink-debug-host-tools` should be available in this case.
 
 Configuring a Console
 =====================
@@ -190,6 +168,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS zephyr-v2.4.0 *****
    Hello World! lpcxpresso55s28
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC55S28 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc5500-cortex-m33/lpc552x-s2x-mainstream-arm-cortex-m33-based-microcontroller-family:LPC552x-S2x
 
diff --git a/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.yaml b/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.yaml
index 5f98a3ebeb3eb..1892da06e8f9b 100644
--- a/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.yaml
+++ b/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.yaml
@@ -8,8 +8,8 @@ identifier: lpcxpresso55s28
 name: NXP LPCXpresso55S28
 type: mcu
 arch: arm
-ram: 64
-flash: 256
+ram: 192
+flash: 512
 toolchain:
   - zephyr
   - gnuarmemb
diff --git a/boards/nxp/lpcxpresso55s36/board.cmake b/boards/nxp/lpcxpresso55s36/board.cmake
index d1a92d0164d0e..b1e16906bd56e 100644
--- a/boards/nxp/lpcxpresso55s36/board.cmake
+++ b/boards/nxp/lpcxpresso55s36/board.cmake
@@ -8,6 +8,6 @@ board_runner_args(linkserver  "--device=LPC55S36:LPCXpresso55S36")
 board_runner_args(jlink "--device=LPC55S36" "--reset-after-load")
 board_runner_args(pyocd "--target=lpc55s36")
 
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/nxp/lpcxpresso55s36/doc/index.rst b/boards/nxp/lpcxpresso55s36/doc/index.rst
index f361f1ea79697..0811bb00dc683 100644
--- a/boards/nxp/lpcxpresso55s36/doc/index.rst
+++ b/boards/nxp/lpcxpresso55s36/doc/index.rst
@@ -14,7 +14,7 @@ Hardware
 ********
 
 - LPC55S36 Arm® Cortex®-M33 microcontroller running at up to 150 MHz
-- 256 KB flash and 96 KB SRAM on-chip
+- 256 KB flash and 112 KB SRAM on-chip
 - LPC-Link2 debug high speed USB probe with VCOM port
 - I2C and SPI USB bridging to the LPC device via LPC-Link2 probe
 - MikroElektronika Click expansion option
@@ -43,43 +43,11 @@ Supported Features
 NXP considers the LPCXpresso55S36 as a superset board for the LPC55(S)3x
 family of MCUs.  This board is a focus for NXP's Full Platform Support for
 Zephyr, to better enable the entire LPC55(S)3x family.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The lpcxpresso55s36 board
-configuration supports the hardware features below.  Another similar superset
+this board with new support for Zephyr features.  Another similar superset
 board is the :zephyr:board:`lpcxpresso55s69`, and that board may have additional features
-already supported, which can also be re-used on this lpcxpresso55s36 board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | canbus                              |
-+-----------+------------+-------------------------------------+
-| IAP       | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| USB FS    | on-chip    | USB Full Speed device               |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently enabled.
-
-Currently available targets for this board are:
-
-- *lpcxpresso55s36*
+already supported, which can also be re-used on this lpcxpresso55s36 board.
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -153,18 +121,20 @@ remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
 
 Configuring a Debug Probe
 =========================
 
+LinkServer is the default runner for this board.
 A debug probe is used for both flashing and debugging the board. This board is
 configured by default to use the integrated :ref:`mcu-link-onboard-debug-probe`
 in the CMSIS-DAP mode. To use this probe with Zephyr, you need to install the
 :ref:`linkserver-debug-host-tools` and make sure they are in your search path.
-Then, use the ``linkserver`` runner option to flash and debug the board. Refer
-to the detailed overview about :ref:`application_debugging` for additional
+Refer to the detailed overview about :ref:`application_debugging` for additional
 information.
 
 The integrated MCU-Link hardware can also be used as a J-Link probe with a
@@ -219,6 +189,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS zephyr-v2.2.0 *****
    Hello World! lpcxpresso55s36
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC55S36 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc5500-cortex-m33/lpc553x-s3x-advanced-analog-armcortex-m33-based-mcu-family:LPC553x
 
diff --git a/boards/nxp/lpcxpresso55s36/lpcxpresso55s36.yaml b/boards/nxp/lpcxpresso55s36/lpcxpresso55s36.yaml
index 660145eaf23af..c5e4f7154a425 100644
--- a/boards/nxp/lpcxpresso55s36/lpcxpresso55s36.yaml
+++ b/boards/nxp/lpcxpresso55s36/lpcxpresso55s36.yaml
@@ -8,8 +8,8 @@ identifier: lpcxpresso55s36
 name: NXP LPCXpresso55S36
 type: mcu
 arch: arm
-ram: 96
-flash: 256
+ram: 112
+flash: 246
 toolchain:
   - zephyr
   - gnuarmemb
diff --git a/boards/nxp/lpcxpresso55s69/Kconfig b/boards/nxp/lpcxpresso55s69/Kconfig
new file mode 100644
index 0000000000000..160ff5a7121ab
--- /dev/null
+++ b/boards/nxp/lpcxpresso55s69/Kconfig
@@ -0,0 +1,5 @@
+# Copyright 2024-2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_LPCXPRESSO55S69
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/lpcxpresso55s69/board.c b/boards/nxp/lpcxpresso55s69/board.c
index 9908b589b9825..f3c367e570bc8 100644
--- a/boards/nxp/lpcxpresso55s69/board.c
+++ b/boards/nxp/lpcxpresso55s69/board.c
@@ -8,7 +8,7 @@
 #include <fsl_common.h>
 #include <soc.h>
 
-static int lpcxpresso_55s69_board_init(void)
+void board_early_init_hook(void)
 {
 
 #if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm6), nxp_lpc_i2s, okay)) && \
@@ -47,8 +47,4 @@ static int lpcxpresso_55s69_board_init(void)
 #endif
 
 #endif
-
-	return 0;
 }
-
-SYS_INIT(lpcxpresso_55s69_board_init,  PRE_KERNEL_1, 0);
diff --git a/boards/nxp/lpcxpresso55s69/doc/index.rst b/boards/nxp/lpcxpresso55s69/doc/index.rst
index 8e1a41e11fc6b..2214ba3206cd5 100644
--- a/boards/nxp/lpcxpresso55s69/doc/index.rst
+++ b/boards/nxp/lpcxpresso55s69/doc/index.rst
@@ -44,58 +44,9 @@ Supported Features
 NXP considers the LPCXpresso55S69 as the superset board for the LPC55xx
 series of MCUs.  This board is a focus for NXP's Full Platform Support for
 Zephyr, to better enable the entire LPC55xx series.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The lpcxpresso55s69 board
-configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WWDT      | on-chip    | windowed watchdog timer             |
-+-----------+------------+-------------------------------------+
-| TrustZone | on-chip    | Trusted Firmware-M                  |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| MAILBOX   | on-chip    | ipm                                 |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| USB HS    | on-chip    | USB High Speed device               |
-+-----------+------------+-------------------------------------+
-| USB FS    | on-chip    | USB Full Speed device               |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | entropy;                            |
-|           |            | random                              |
-+-----------+------------+-------------------------------------+
-| IAP       | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| SDIF      | on-chip    | sdhc                                |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma (on CPU0)                       |
-+-----------+------------+-------------------------------------+
+this board with new support for Zephyr features.
+
+.. zephyr:board-supported-hw::
 
 Targets available
 ==================
@@ -267,6 +218,8 @@ configured as USART for the console and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -275,32 +228,15 @@ Configuring a Debug Probe
 
 LinkServer is the default runner for this board.
 A debug probe is used for both flashing and debugging the board. This board is
-configured by default to use the LPC-Link2 CMSIS-DAP Onboard Debug Probe,
-however the :ref:`pyocd-debug-host-tools` does not yet support this probe so you
-must reconfigure the board for one of the following debug probes instead.
-
-:ref:`lpclink2-jlink-onboard-debug-probe`
------------------------------------------
-
-Install the :ref:`jlink-debug-host-tools` and make sure they are in your search
-path.
-
-Follow the instructions in :ref:`lpclink2-jlink-onboard-debug-probe` to program
-the J-Link firmware. Please make sure you have the latest firmware for this
-board.
+configured by default to use the integrated :ref:`mcu-link-onboard-debug-probe`
+in the CMSIS-DAP mode. To use this probe with Zephyr, you need to install the
+:ref:`linkserver-debug-host-tools` and make sure they are in your search path.
+Refer to the detailed overview about :ref:`application_debugging` for additional
+information.
 
-:ref:`lpclink2-cmsis-onboard-debug-probe`
------------------------------------------
-
-        1. Install the :ref:`linkserver-debug-host-tools` and make sure they are in your search path.
-        2. To update the debug firmware, please follow the instructions on `LPCXPRESSO55S69 Debug Firmware`_
-
-:ref:`opensda-daplink-onboard-debug-probe`
-------------------------------------------
-
-PyOCD support for this board is ongoing and not yet available.
-To use DAPLink's flash memory programming on this board, follow the instructions
-for `updating LPCXpresso firmware`_.
+The integrated MCU-Link hardware can also be used as a J-Link probe with a
+firmware update, as described in :ref:`mcu-link-jlink-onboard-debug-probe`.
+The :ref:`jlink-debug-host-tools` should be available in this case.
 
 Configuring a Console
 =====================
@@ -375,6 +311,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS zephyr-v1.14.0 *****
    Hello World! lpcxpresso55s69
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _LPC55S69 SoC Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc5500-cortex-m33/high-efficiency-arm-cortex-m33-based-microcontroller-family:LPC55S6x
 
diff --git a/boards/nxp/ls1046ardb/doc/index.rst b/boards/nxp/ls1046ardb/doc/index.rst
index 28ad3259ed065..f22f54552e170 100644
--- a/boards/nxp/ls1046ardb/doc/index.rst
+++ b/boards/nxp/ls1046ardb/doc/index.rst
@@ -47,39 +47,18 @@ LS1046A RDB boards supports the following features:
 Supported Features
 ==================
 
-NXP LS1046A RDB board default configuration supports the following
-hardware features:
+.. zephyr:board-supported-hw::
 
-+-----------+------------+--------------------------------------+
-| Interface | Controller | Driver/Component                     |
-+===========+============+======================================+
-| GIC-400   | on-chip    | GICv2 interrupt controller           |
-+-----------+------------+--------------------------------------+
-| ARM TIMER | on-chip    | System Clock                         |
-+-----------+------------+--------------------------------------+
-| UART      | on-chip    | NS16550 compatible serial port       |
-+-----------+------------+--------------------------------------+
+.. note::
 
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in the defconfig file for NON-SMP:
-
-    :zephyr_file:`boards/nxp/ls1046ardb/ls1046ardb_ls1046a_defconfig`
-
-Or for SMP running on all four CPU Cores:
-
-	:zephyr_file:`boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_4cores_defconfig`
-
-Or for SMP running on 2 CPU Cores (Core2 and Core3):
-
-	:zephyr_file:`boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_defconfig`
-
-There are two serial port on the board: uart1 and uart2, Zephyr is using
-uart2 as serial console.
+   There are two serial ports on the board: uart1 and uart2. Zephyr is using
+   uart2 as serial console.
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use the following configuration to run basic Zephyr applications and
 kernel tests on LS1046A RDB board. For example, with the :zephyr:code-sample:`synchronization` sample:
 
@@ -204,6 +183,9 @@ Debugging
 LS1046A RDB board includes one JTAG connector on board, connect it to
 CodeWarrior TAP for debugging.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 ==========
 
diff --git a/boards/nxp/mcxw72_evk/doc/index.rst b/boards/nxp/mcxw72_evk/doc/index.rst
index 9bfd25da4e536..6cb8885094b80 100644
--- a/boards/nxp/mcxw72_evk/doc/index.rst
+++ b/boards/nxp/mcxw72_evk/doc/index.rst
@@ -27,38 +27,23 @@ For more information about the MCXW72 SoC and MCXW72-EVK board, see:
 Supported Features
 ==================
 
-The ``mcxw72_evk`` board in Zephyr currently supports the following features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| LPUART    | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| FLEXCAN   | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
+
+Fetch Binary Blobs
+******************
+
+To support Bluetooth, mcxw72_evk requires fetching binary blobs, which can be
+achieved by running the following command:
+
+.. code-block:: console
+
+   west blobs fetch hal_nxp
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -141,12 +126,30 @@ should see the following message in the terminal:
    *** Booting Zephyr OS build v3.7.0-xxx-xxxx ***
    Hello World! mcxw72_evk/mcxw727c/cpu0
 
+Bluetooth
+=========
+
+BLE functionality requires to fetch binary blobs, so make sure to follow
+the ``Fetch Binary Blobs`` section first.
+
+Two images must be written to the board: one for the host (CM33 core0) and one for the NBU (CM33 core1).
+- To flash the application (CM33) refer to the ``Flashing`` section above.
+- To flash the NBU, follow the instructions below:
+
+.. code-block:: console
+
+	JLinkExe -device MCXW727C_CORE1 -if SWD -speed 4000 -autoconnect 1
+	J-Link>loadbin <path to nbu blob file> 0x0
+
 Troubleshooting
 ===============
 
 .. include:: ../../common/segger-ecc-systemview.rst
    :start-after: segger-ecc-systemview
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.dts b/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.dts
index 9ca8151c29522..41e634bfecfdc 100644
--- a/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.dts
+++ b/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,6 +7,7 @@
 
 #include <nxp/nxp_mcxw72.dtsi>
 #include "mcxw72_evk-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {
 	model = "NXP MCXW72-EVK board";
@@ -16,6 +17,7 @@
 		blue-pwm-led = &blue_pwm_led;
 		green-pwm-led = &green_pwm_led;
 		red-pwm-led = &red_pwm_led;
+		sw0 = &user_button_0;
 	};
 
 	chosen {
@@ -27,6 +29,7 @@
 		zephyr,shell-uart = &lpuart1;
 		zephyr,uart-pipe = &lpuart0;
 		zephyr,canbus = &flexcan0;
+		zephyr,bt-c2h-uart = &lpuart0;
 	};
 
 	user_led {
@@ -48,12 +51,25 @@
 			pwms = <&tpm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
 		};
 	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		user_button_0: button_0 {
+			label = "User SW3";
+			gpios = <&gpioc 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			zephyr,code = <INPUT_KEY_0>;
+			status = "okay";
+		};
+	};
 };
 
 &gpioa {
 	status = "okay";
 };
 
+&gpiob {
+	status = "okay";
+};
 
 &gpioc {
 	status = "okay";
@@ -80,11 +96,11 @@
 		#size-cells = <1>;
 
 		code_partition: partition@0 {
-			reg = <0x0 DT_SIZE_K(67)>;
+			reg = <0x0 DT_SIZE_K(2032)>;
 		};
 
-		storage_partition: partition@10c00 {
-			reg = <0x10c00 DT_SIZE_K(1981)>;
+		storage_partition: partition@1FC000 {
+			reg = <0x1FC000 DT_SIZE_K(16)>;
 		};
 	};
 };
@@ -133,6 +149,12 @@
 	status = "okay";
 	pinctrl-0 = <&pinmux_lpi2c1>;
 	pinctrl-names = "default";
+
+	accelerometer: accelerometer@19 {
+		status = "okay";
+		compatible = "nxp,fxls8974";
+		reg = <0x19>;
+	};
 };
 
 &rtc {
diff --git a/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.yaml b/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.yaml
index d3841b6fe308c..f3f9a54cf1da3 100644
--- a/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.yaml
+++ b/boards/nxp/mcxw72_evk/mcxw72_evk_mcxw727c_cpu0.yaml
@@ -7,7 +7,6 @@ flash: 2048
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - adc
   - can
diff --git a/boards/nxp/mimxrt1010_evk/CMakeLists.txt b/boards/nxp/mimxrt1010_evk/CMakeLists.txt
index 260448d63c76a..8c1028b5f3699 100644
--- a/boards/nxp/mimxrt1010_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1010_evk/CMakeLists.txt
@@ -20,7 +20,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
     zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
     zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
     set(RT1010_BOARD_DIR
-      "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1010")
+      "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1010")
     zephyr_library_sources(${RT1010_BOARD_DIR}/xip/evkmimxrt1010_flexspi_nor_config.c)
     zephyr_library_include_directories(${RT1010_BOARD_DIR}/xip)
   endif()
diff --git a/boards/nxp/mimxrt1010_evk/doc/index.rst b/boards/nxp/mimxrt1010_evk/doc/index.rst
index 7b2d5d8c5ef9a..66809750946ea 100644
--- a/boards/nxp/mimxrt1010_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1010_evk/doc/index.rst
@@ -52,7 +52,7 @@ This platform has the following external memories:
 +--------------------+------------+-------------------------------------+
 | Device             | Controller | Status                              |
 +====================+============+=====================================+
-| AT25SF128A         | FLEXSPI    | Enabled via flash configurationn    |
+| AT25SF128A         | FLEXSPI    | Enabled via flash configuration     |
 |                    |            | block, which sets up FLEXSPI at     |
 |                    |            | boot time.                          |
 +--------------------+------------+-------------------------------------+
@@ -60,44 +60,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1010_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1010_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| PIT       | on-chip    | pit                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1010_evk/mimxrt1010_evk_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk`, which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1010_evk board:
 
 Connections and I/Os
 ====================
@@ -152,6 +123,8 @@ and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board supports 3 debug host tools. Please install your preferred host
 tool, then follow the instructions in `Configuring a Debug Probe`_ to
 configure the board appropriately.
@@ -208,6 +181,8 @@ see the following message in the terminal:
 
     Hello World! mimxrt1010_evk
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _MIMXRT1010-EVK Website:
    https://www.nxp.com/MIMXRT1010-EVK
diff --git a/boards/nxp/mimxrt1015_evk/CMakeLists.txt b/boards/nxp/mimxrt1015_evk/CMakeLists.txt
index 115153b462b1d..599383f6aaef9 100644
--- a/boards/nxp/mimxrt1015_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1015_evk/CMakeLists.txt
@@ -19,7 +19,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
     zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
     zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
     set(RT1015_BOARD_DIR
-      "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1015")
+      "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1015")
     zephyr_library_sources(${RT1015_BOARD_DIR}/xip/evkmimxrt1015_flexspi_nor_config.c)
     zephyr_library_include_directories(${RT1015_BOARD_DIR}/xip)
   endif()
diff --git a/boards/nxp/mimxrt1015_evk/doc/index.rst b/boards/nxp/mimxrt1015_evk/doc/index.rst
index a4bf7bf6756e1..dcfe584a5ba23 100644
--- a/boards/nxp/mimxrt1015_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1015_evk/doc/index.rst
@@ -52,7 +52,7 @@ This platform has the following external memories:
 +--------------------+------------+-------------------------------------+
 | Device             | Controller | Status                              |
 +====================+============+=====================================+
-| AT25SF128A         | FLEXSPI    | Enabled via flash configurationn    |
+| AT25SF128A         | FLEXSPI    | Enabled via flash configuration     |
 |                    |            | block, which sets up FLEXSPI at     |
 |                    |            | boot time.                          |
 +--------------------+------------+-------------------------------------+
@@ -60,42 +60,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1015_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1015_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1015_evk/mimxrt1015_evk_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1015_evk board.
 
 Connections and I/Os
 ====================
@@ -154,6 +127,8 @@ and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board supports 3 debug host tools. Please install your preferred host
 tool, then follow the instructions in `Configuring a Debug Probe`_ to
 configure the board appropriately.
@@ -211,6 +186,8 @@ see the following message in the terminal:
     ***** Booting Zephyr OS v1.14.0-rc1-1297-g312d75f2459e *****
     Hello World! mimxrt1015_evk
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _MIMXRT1015-EVK Website:
    https://www.nxp.com/support/developer-resources/run-time-software/i.mx-developer-resources/i.mx-rt1015-evaluation-kit:MIMXRT1015-EVK
diff --git a/boards/nxp/mimxrt1020_evk/CMakeLists.txt b/boards/nxp/mimxrt1020_evk/CMakeLists.txt
index 63a6d289e6d93..56275e10ce7f4 100644
--- a/boards/nxp/mimxrt1020_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1020_evk/CMakeLists.txt
@@ -13,7 +13,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
      "update your flash configuration or device configuration data blocks")
   endif()
   set(RT1020_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1020")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1020")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1020 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1020_evk/Kconfig.defconfig b/boards/nxp/mimxrt1020_evk/Kconfig.defconfig
index 9c2251e2e609b..e632fbf465165 100644
--- a/boards/nxp/mimxrt1020_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1020_evk/Kconfig.defconfig
@@ -16,9 +16,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y
 
-config ETH_MCUX_PHY_RESET
-	default y
-
 endif # NETWORKING
 
 endif # BOARD_MIMXRT1020_EVK
diff --git a/boards/nxp/mimxrt1020_evk/doc/index.rst b/boards/nxp/mimxrt1020_evk/doc/index.rst
index 88e62be8b9e82..ab3a9fd7a2a49 100644
--- a/boards/nxp/mimxrt1020_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1020_evk/doc/index.rst
@@ -64,7 +64,7 @@ This platform has the following external memories:
 |                |            | data block, which sets up SEMC at   |
 |                |            | boot time                           |
 +----------------+------------+-------------------------------------+
-| IS25LP064A     | FLEXSPI    | Enabled via flash configurationn    |
+| IS25LP064A     | FLEXSPI    | Enabled via flash configuration     |
 |                |            | block, which sets up FLEXSPI at     |
 |                |            | boot time                           |
 +----------------+------------+-------------------------------------+
@@ -72,50 +72,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1020_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1020_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | QSPI flash                          |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SDHC      | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1020_evk/mimxrt1020_evk_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1020_evk board.
 
 Connections and I/Os
 ====================
@@ -212,6 +177,8 @@ remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board supports 3 debug host tools. Please install your preferred host
 tool, then follow the instructions in `Configuring a Debug Probe`_ to
 configure the board appropriately.
@@ -287,6 +254,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-rc1 *****
    Hello World! mimxrt1020_evk
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1020-EVK Website:
    https://www.nxp.com/support/developer-resources/run-time-software/i.mx-developer-resources/i.mx-rt1020-evaluation-kit:MIMXRT1020-EVK
 
diff --git a/boards/nxp/mimxrt1024_evk/CMakeLists.txt b/boards/nxp/mimxrt1024_evk/CMakeLists.txt
index 229a396bcf6af..82d756716ea1a 100644
--- a/boards/nxp/mimxrt1024_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1024_evk/CMakeLists.txt
@@ -13,7 +13,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
      "update your flash configuration or device configuration data blocks")
   endif()
   set(RT1024_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1024")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1024")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1024 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1024_evk/Kconfig.defconfig b/boards/nxp/mimxrt1024_evk/Kconfig.defconfig
index f9bc8cbfe608b..8e84a3543aa1f 100644
--- a/boards/nxp/mimxrt1024_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1024_evk/Kconfig.defconfig
@@ -20,13 +20,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y
 
-if ETH_MCUX
-
-config ETH_MCUX_PHY_RESET
-	default y
-
-endif # ETH_MCUX
-
 endif # NETWORKING
 
 endif # BOARD_MIMXRT1024_EVK
diff --git a/boards/nxp/mimxrt1024_evk/doc/index.rst b/boards/nxp/mimxrt1024_evk/doc/index.rst
index 62a5a987128ac..2a8cc0b6819cd 100644
--- a/boards/nxp/mimxrt1024_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1024_evk/doc/index.rst
@@ -73,54 +73,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1024_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1024_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | QSPI flash                          |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | reset cause                         |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1024_evk/mimxrt1024_evk_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1024_evk board.
 
 Connections and I/Os
 ====================
@@ -199,6 +160,8 @@ remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board supports 3 debug host tools. Please install your preferred host
 tool, then follow the instructions in `Configuring a Debug Probe`_ to
 configure the board appropriately.
@@ -270,6 +233,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v2.4.0-rc1 *****
    Hello World! mimxrt1024_evk
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1024-EVK Website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1024-evaluation-kit:MIMXRT1024-EVK
 
diff --git a/boards/nxp/mimxrt1040_evk/CMakeLists.txt b/boards/nxp/mimxrt1040_evk/CMakeLists.txt
index e5e2d4d414091..53079848c6c58 100644
--- a/boards/nxp/mimxrt1040_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1040_evk/CMakeLists.txt
@@ -18,7 +18,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
      "update your flash configuration or device configuration data blocks")
   endif()
   set(RT1040_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1040")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1040")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1040 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1040_evk/doc/index.rst b/boards/nxp/mimxrt1040_evk/doc/index.rst
index 8ec0834b47b24..db592aa16e8c2 100644
--- a/boards/nxp/mimxrt1040_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1040_evk/doc/index.rst
@@ -74,7 +74,7 @@ This platform has the following external memories:
 |                |            | data block, which sets up SEMC at   |
 |                |            | boot time                           |
 +----------------+------------+-------------------------------------+
-| W25Q64JVSSIQ   | FLEXSPI    | Enabled via flash configurationn    |
+| W25Q64JVSSIQ   | FLEXSPI    | Enabled via flash configuration     |
 |                |            | block, which sets up FLEXSPI at     |
 |                |            | boot time. Supported for XIP only.  |
 +----------------+------------+-------------------------------------+
@@ -82,49 +82,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1040_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1040_evk board:
-
-+-----------+------------+-------------------------------------------------+
-| Interface | Controller | Driver/Component                                |
-+===========+============+=================================================+
-| NVIC      | on-chip    | nested vector interrupt controller              |
-+-----------+------------+-------------------------------------------------+
-| SYSTICK   | on-chip    | systick                                         |
-+-----------+------------+-------------------------------------------------+
-| GPIO      | on-chip    | gpio                                            |
-+-----------+------------+-------------------------------------------------+
-| UART      | on-chip    | serial port-polling;                            |
-|           |            | serial port-interrupt                           |
-+-----------+------------+-------------------------------------------------+
-| PWM       | on-chip    | pwm                                             |
-+-----------+------------+-------------------------------------------------+
-| ADC       | on-chip    | adc                                             |
-+-----------+------------+-------------------------------------------------+
-| SPI       | on-chip    | spi                                             |
-+-----------+------------+-------------------------------------------------+
-| DMA       | on-chip    | dma                                             |
-+-----------+------------+-------------------------------------------------+
-| I2C       | on-chip    | i2c                                             |
-+-----------+------------+-------------------------------------------------+
-| GPT       | on-chip    | gpt                                             |
-+-----------+------------+-------------------------------------------------+
-| DISPLAY   | on-chip    | eLCDIF. Tested with                             |
-|           |            | :ref:`rk043fn02h_ct`, and                       |
-|           |            | :ref:`rk043fn66hs_ctg` shields                  |
-+-----------+------------+-------------------------------------------------+
-| UART      | NXP IW61x  | M.2 WIFI/BT module                              |
-|           |            | (select :kconfig:option:`CONFIG_BT_NXP_NW612`)  |
-+-----------+------------+-------------------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1040_evk/mimxrt1040_evk_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1040_evk board.
 
 Connections and IOs
 ===================
@@ -206,6 +172,8 @@ that run the command:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board supports 3 debug host tools. Please install your preferred host
 tool, then follow the instructions in `Configuring a Debug Probe`_ to
 configure the board appropriately.
@@ -352,6 +320,8 @@ the M.2 WiFi module is interfering with the debug signals
 To resolve this, you may remove the M.2 WiFi module from the board when
 flashing or debugging it, or remove jumper J80.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
 
 .. _MIMXRT1040-EVK Website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1040-evaluation-kit:MIMXRT1040-EVK
diff --git a/boards/nxp/mimxrt1050_evk/CMakeLists.txt b/boards/nxp/mimxrt1050_evk/CMakeLists.txt
index 597a64852cf0a..2782a277c9a24 100644
--- a/boards/nxp/mimxrt1050_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1050_evk/CMakeLists.txt
@@ -24,7 +24,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
     set(FLASH_CONF evkbimxrt1050_flexspi_nor_config.c)
   endif()
   set(RT1050_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkbimxrt1050")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkbimxrt1050")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1050 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1050_evk/Kconfig.defconfig b/boards/nxp/mimxrt1050_evk/Kconfig.defconfig
index 90fc7a76598f5..1e93c2ec04979 100644
--- a/boards/nxp/mimxrt1050_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1050_evk/Kconfig.defconfig
@@ -16,13 +16,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y
 
-if ETH_MCUX
-
-config ETH_MCUX_PHY_RESET
-	default y
-
-endif # ETH_MCUX
-
 endif # NETWORKING
 
 endif # BOARD_MIMXRT1050_EVK
diff --git a/boards/nxp/mimxrt1050_evk/doc/index.rst b/boards/nxp/mimxrt1050_evk/doc/index.rst
index 379498dd33b68..3c2fcc2fec752 100644
--- a/boards/nxp/mimxrt1050_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1050_evk/doc/index.rst
@@ -87,7 +87,7 @@ This platform has the following external memories:
 |                    |            | data block, which sets up SEMC at   |
 |                    |            | boot time                           |
 +--------------------+------------+-------------------------------------+
-| S26KS512SDPBHI020  | FLEXSPI    | Enabled via flash configurationn    |
+| S26KS512SDPBHI020  | FLEXSPI    | Enabled via flash configuration     |
 |                    |            | block, which sets up FLEXSPI at     |
 |                    |            | boot time.                          |
 +--------------------+------------+-------------------------------------+
@@ -95,52 +95,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1050_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1050_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | eLCDIF. Tested with                 |
-|           |            | :ref:`rk043fn02h_ct`, and           |
-|           |            | :ref:`rk043fn66hs_ctg` shields      |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SDHC      | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1050_evk/mimxrt1050_evk_hyperflash_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1050_evk board.
 
 Connections and IOs
 ===================
@@ -312,6 +275,8 @@ depending on which flash to set as ``zephyr,flash``:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Newer revisions of this board use :ref:`lpc-link2-onboard-debug-probe`,
    while older revisions use the :ref:`opensda-onboard-debug-probe`.
@@ -449,6 +414,9 @@ For more details, please see the following `NXP i.MXRT1050 A0 to A1 Migration Gu
 
 Current Zephyr build supports the new MIMXRT1050-EVKB
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1050-EVK Website:
    https://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/i.mx-applications-processors/i.mx-rt-series/i.mx-rt1050-evaluation-kit:MIMXRT1050-EVK
 
diff --git a/boards/nxp/mimxrt1060_evk/CMakeLists.txt b/boards/nxp/mimxrt1060_evk/CMakeLists.txt
index 29263b8b55596..1bce9631ef484 100644
--- a/boards/nxp/mimxrt1060_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1060_evk/CMakeLists.txt
@@ -33,7 +33,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
     set(BOARD_NAME evkbmimxrt1060)
   endif()
   set(RT1060_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/${BOARD_NAME}")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/${BOARD_NAME}")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1060 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1060_evk/Kconfig.defconfig b/boards/nxp/mimxrt1060_evk/Kconfig.defconfig
index bc06c96f7b80a..6caa52d0af21a 100644
--- a/boards/nxp/mimxrt1060_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1060_evk/Kconfig.defconfig
@@ -16,13 +16,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y
 
-if ETH_MCUX
-
-config ETH_MCUX_PHY_RESET
-	default y
-
-endif # ETH_MCUX
-
 endif # NETWORKING
 
 endif # BOARD_MIMXRT1060_EVK
diff --git a/boards/nxp/mimxrt1060_evk/doc/index.rst b/boards/nxp/mimxrt1060_evk/doc/index.rst
index 372aaea085e56..3f2265cb6a9be 100644
--- a/boards/nxp/mimxrt1060_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1060_evk/doc/index.rst
@@ -87,7 +87,7 @@ This platform has the following external memories:
 |                    |            | data block, which sets up SEMC at   |
 |                    |            | boot time                           |
 +--------------------+------------+-------------------------------------+
-| IS42S16160J        | FLEXSPI    | Enabled via flash configurationn    |
+| IS42S16160J        | FLEXSPI    | Enabled via flash configuration     |
 |                    |            | block, which sets up FLEXSPI at     |
 |                    |            | boot time.                          |
 +--------------------+------------+-------------------------------------+
@@ -95,64 +95,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1060_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1060_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | eLCDIF. Tested with                 |
-|           |            | :ref:`rk043fn02h_ct`, and           |
-|           |            | :ref:`rk043fn66hs_ctg` shields      |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | QSPI flash                          |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SDHC      | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| SAI       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| PIT       | on-chip    | pit                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1060_evk board.
 
 Connections and I/Os
 ====================
@@ -352,6 +303,8 @@ depending on which flash to set as ``zephyr,flash``:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board supports 3 debug host tools. Please install your preferred host
 tool, then follow the instructions in `Configuring a Debug Probe`_ to
 configure the board appropriately.
@@ -510,6 +463,9 @@ If the west flash or debug commands fail, and the command hangs while executing
 runners.jlink, confirm the J-Link debug probe is configured, powered, and
 connected to the EVK properly.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1060-EVK Website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1060-evaluation-kit:MIMXRT1060-EVKB
 
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi
index e8d4716aab7ce..2a26160c2a259 100644
--- a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi
+++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi
@@ -268,7 +268,6 @@ arduino_spi: &lpspi1 {
 	dma-names = "rx", "tx";
 	pinctrl-0 = <&pinmux_lpspi3>;
 	pinctrl-names = "default";
-
 };
 
 &sai1 {
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.yaml
index 3f19dd54721f5..2a1c331164722 100644
--- a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.yaml
+++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.yaml
@@ -11,7 +11,6 @@ arch: arm
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 ram: 32768
 flash: 8192
 supported:
diff --git a/boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt b/boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt
index 70f8df6e741ad..40e22e4176b36 100644
--- a/boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt
+++ b/boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt
@@ -14,7 +14,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
     set(BOARD_NAME evkbimxrt1050)
   endif()
   set(RT1062_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/${BOARD_NAME}")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/${BOARD_NAME}")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1050 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1062_fmurt6/doc/index.rst b/boards/nxp/mimxrt1062_fmurt6/doc/index.rst
index 25dd714bf73b5..c93a2738fa602 100644
--- a/boards/nxp/mimxrt1062_fmurt6/doc/index.rst
+++ b/boards/nxp/mimxrt1062_fmurt6/doc/index.rst
@@ -68,56 +68,15 @@ these references:
 Supported Features
 ==================
 
-The mimxrt1062_fmurt6 board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1060_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | QSPI hyper flash                    |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1064_evk` , which is the superset board in NXP's i.MX RT10xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1064_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1060_evk board.
 
 Connections and I/Os
 ====================
@@ -244,6 +203,8 @@ The MIMXRT1062 SoC has eight UARTs. ``LPUART7`` is configured for the console,
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -336,6 +297,9 @@ If the west flash or debug commands fail, and the command hangs while executing
 runners.jlink, confirm the J-Link debug probe is configured, powered, and
 connected to the FMURT6 properly.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1062-FMURT6 Website:
    https://www.nxp.com/part/RDDRONE-FMURT6#
 
diff --git a/boards/nxp/mimxrt1064_evk/CMakeLists.txt b/boards/nxp/mimxrt1064_evk/CMakeLists.txt
index 7d2f7effa1079..0d05739708353 100644
--- a/boards/nxp/mimxrt1064_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1064_evk/CMakeLists.txt
@@ -18,7 +18,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
      "update your flash configuration or device configuration data blocks")
   endif()
   set(RT1064_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1064")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1064")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1064 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1064_evk/Kconfig.defconfig b/boards/nxp/mimxrt1064_evk/Kconfig.defconfig
index 6454f9b6329c2..d212ccfdfddfc 100644
--- a/boards/nxp/mimxrt1064_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1064_evk/Kconfig.defconfig
@@ -16,13 +16,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y
 
-if ETH_MCUX
-
-config ETH_MCUX_PHY_RESET
-	default y
-
-endif # ETH_MCUX
-
 endif # NETWORKING
 
 endif # BOARD_MIMXRT1064_EVK
diff --git a/boards/nxp/mimxrt1064_evk/doc/index.rst b/boards/nxp/mimxrt1064_evk/doc/index.rst
index 865b1c2764fc8..6ef06dfd77db7 100644
--- a/boards/nxp/mimxrt1064_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1064_evk/doc/index.rst
@@ -94,62 +94,9 @@ Supported Features
 NXP considers the MIMXRT1064-EVK as the superset board for the i.MX RT10xx
 family of MCUs.  This board is a focus for NXP's Full Platform Support for
 Zephyr, to better enable the entire RT10xx family.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The mimxrt1064_evk board
-configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | eLCDIF. Tested with                 |
-|           |            | :ref:`rk043fn02h_ct`, and           |
-|           |            | :ref:`rk043fn66hs_ctg` shields      |
-+-----------+------------+-------------------------------------+
-| VIDEO     | on-chip    | video, using CSI                    |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | QSPI flash                          |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SDHC      | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1064_evk/mimxrt1064_evk_defconfig`
-
-Other hardware features are not currently supported by the port.
+this board with new support for Zephyr features.
+
+.. zephyr:board-supported-hw::
 
 Connections and I/Os
 ====================
@@ -310,6 +257,8 @@ and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board supports 3 debug host tools. Please install your preferred host
 tool, then follow the instructions in `Configuring a Debug Probe`_ to
 configure the board appropriately.
@@ -437,6 +386,9 @@ If the west flash or debug commands fail, and the command hangs while executing
 runners.jlink, confirm the J-Link debug probe is configured, powered, and
 connected to the EVK properly.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1064-EVK Website:
    https://www.nxp.com/support/developer-resources/run-time-software/i.mx-developer-resources/mimxrt1064-evk-i.mx-rt1064-evaluation-kit:MIMXRT1064-EVK
 
diff --git a/boards/nxp/mimxrt1160_evk/CMakeLists.txt b/boards/nxp/mimxrt1160_evk/CMakeLists.txt
index 928a9693df79b..97fb4c3e12cc2 100644
--- a/boards/nxp/mimxrt1160_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1160_evk/CMakeLists.txt
@@ -13,7 +13,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
      "update your flash configuration or device configuration data blocks")
   endif()
   set(RT1160_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1160")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1160")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1160 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1160_evk/Kconfig.defconfig b/boards/nxp/mimxrt1160_evk/Kconfig.defconfig
index d4743f1db068e..392674479f894 100644
--- a/boards/nxp/mimxrt1160_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1160_evk/Kconfig.defconfig
@@ -36,9 +36,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y if CPU_CORTEX_M7 # No cache memory support is required for driver
 
-config ETH_MCUX_PHY_RESET
-	default y
-
 endif # NETWORKING
 
 endif # BOARD_MIMXRT1160_EVK
diff --git a/boards/nxp/mimxrt1160_evk/doc/index.rst b/boards/nxp/mimxrt1160_evk/doc/index.rst
index b0d513ec8bde5..1d97c49f0a479 100644
--- a/boards/nxp/mimxrt1160_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1160_evk/doc/index.rst
@@ -83,7 +83,7 @@ This platform has the following external memories:
 |                    |            | data block, which sets up SEMC at   |
 |                    |            | boot time                           |
 +--------------------+------------+-------------------------------------+
-| IS25WP128          | FLEXSPI    | Enabled via flash configurationn    |
+| IS25WP128          | FLEXSPI    | Enabled via flash configuration     |
 |                    |            | block, which sets up FLEXSPI at     |
 |                    |            | boot time.                          |
 +--------------------+------------+-------------------------------------+
@@ -91,64 +91,15 @@ This platform has the following external memories:
 Supported Features
 ==================
 
-The mimxrt1160_evk board configuration supports the hardware features listed
-below.  For additional features not yet supported, please also refer to the
-:zephyr:board:`mimxrt1170_evk` , which is the superset board in NXP's i.MX RT11xx family.
-NXP prioritizes enabling the superset board with NXP's Full Platform Support for
-Zephyr.  Therefore, the mimxrt1170_evk board may have additional features
-already supported, which can also be re-used on this mimxrt1160_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | flexcan                             |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB Device                          |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| CAAM RNG  | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| PIT       | on-chip    | pit                                 |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | eLCDIF; MIPI-DSI. Tested with       |
-|           |            | :ref:`rk055hdmipi4m`,               |
-|           |            | :ref:`rk055hdmipi4ma0`,             |
-|           |            | and :ref:`g1120b0mipi` shields      |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
+.. note::
+
+   For additional features not yet supported, please also refer to the
+   :zephyr:board:`mimxrt1170_evk` , which is the superset board in NXP's i.MX RT11xx family.
+   NXP prioritizes enabling the superset board with NXP's Full Platform Support for
+   Zephyr.  Therefore, the mimxrt1170_evk board may have additional features
+   already supported, which can also be re-used on this mimxrt1160_evk board:
 
 Connections and I/Os
 ====================
@@ -239,6 +190,8 @@ remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -362,6 +315,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v2.4.0-xxxx-xxxxxxxxxxxxx *****
    Hello World! mimxrt1160_evk
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1160-EVK Website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1160-evaluation-kit:MIMXRT1160-EVK
 
diff --git a/boards/nxp/mimxrt1170_evk/CMakeLists.txt b/boards/nxp/mimxrt1170_evk/CMakeLists.txt
index e87e07401d077..5b845eb090eb8 100644
--- a/boards/nxp/mimxrt1170_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1170_evk/CMakeLists.txt
@@ -18,7 +18,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
     set(RT1170_BOARD_NAME "evkbmimxrt1170")
   endif()
   set(RT1170_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/${RT1170_BOARD_NAME}")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/${RT1170_BOARD_NAME}")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1170 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1170_evk/Kconfig.defconfig b/boards/nxp/mimxrt1170_evk/Kconfig.defconfig
index 3dcd48449bd9b..b28654c32966b 100644
--- a/boards/nxp/mimxrt1170_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1170_evk/Kconfig.defconfig
@@ -39,9 +39,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y if CPU_CORTEX_M7 # No cache memory support is required for driver
 
-config ETH_MCUX_PHY_RESET
-	default y
-
 endif # NETWORKING
 
 endif
diff --git a/boards/nxp/mimxrt1170_evk/board.yml b/boards/nxp/mimxrt1170_evk/board.yml
index 4a6a25318b01e..fce50aef20b3a 100644
--- a/boards/nxp/mimxrt1170_evk/board.yml
+++ b/boards/nxp/mimxrt1170_evk/board.yml
@@ -6,7 +6,7 @@ board:
     - name: mimxrt1176
   revision:
     format: "letter"
-    default: "A"
+    default: "B"
     revisions:
       - name: "A"
       - name: "B"
diff --git a/boards/nxp/mimxrt1170_evk/doc/index.rst b/boards/nxp/mimxrt1170_evk/doc/index.rst
index 549ef41b1088c..71b1335fbda16 100644
--- a/boards/nxp/mimxrt1170_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1170_evk/doc/index.rst
@@ -102,77 +102,9 @@ Supported Features
 
 NXP considers the MIMXRT1170-EVK as the superset board for the i.MX RT11xx
 family of MCUs.  This board is a focus for NXP's Full Platform Support for
-Zephyr, to better enable the entire RT11xx family.  NXP prioritizes enabling
-this board with new support for Zephyr features. Note that this table
-covers two boards: the RT1170 EVK (``mimxrt1170_evk//cm7/cm4``), and
-RT1170 EVKB (``mimxrt1170_evk@B//cm7/cm4``)
-
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| Interface | Controller | Driver/Component                               | RT1170 EVK      | RT1170 EVKB     |
-+===========+============+================================================+=================+=================+
-| NVIC      | on-chip    | nested vector interrupt controller             | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| SYSTICK   | on-chip    | systick                                        | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| GPIO      | on-chip    | gpio                                           | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| COUNTER   | on-chip    | gpt                                            | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| TIMER     | on-chip    | gpt                                            | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| CAN       | on-chip    | flexcan                                        | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| SPI       | on-chip    | spi                                            | Supported (M7)  | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| I2C       | on-chip    | i2c                                            | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| PWM       | on-chip    | pwm                                            | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| ADC       | on-chip    | adc                                            | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| UART      | on-chip    | serial port-polling;                           | Supported       | Supported       |
-|           |            | serial port-interrupt;                         |                 |                 |
-|           |            | serial port-async                              |                 |                 |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| DMA       | on-chip    | dma                                            | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| WATCHDOG  | on-chip    | watchdog                                       | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| ENET      | on-chip    | ethernet - 10/100M                             | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| ENET1G    | on-chip    | ethernet - 10/100/1000M                        | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| SAI       | on-chip    | i2s                                            | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| USB       | on-chip    | USB Device                                     | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| HWINFO    | on-chip    | Unique device serial number                    | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| DISPLAY   | on-chip    | eLCDIF; MIPI-DSI. Tested with                  | Supported (M7)  | Supported (M7)  |
-|           |            | :ref:`rk055hdmipi4m`,                          |                 |                 |
-|           |            | :ref:`rk055hdmipi4ma0`,                        |                 |                 |
-|           |            | and :ref:`g1120b0mipi` shields                 |                 |                 |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| ACMP      | on-chip    | sensor                                         | Supported       | Supported       |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| CAAM RNG  | on-chip    | entropy                                        | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| FLEXSPI   | on-chip    | flash programming                              | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| SDHC      | on-chip    | SD host controller                             | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| PIT       | on-chip    | pit                                            | Supported (M7)  | Supported (M7)  |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| VIDEO     | on-chip    | CSI; MIPI CSI-2 Rx. Tested with                | Supported (M7)  | Supported (M7)  |
-|           |            | :ref:`nxp_btb44_ov5640` shield                 |                 |                 |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-| UART      | NXP IW61x  | M.2 WIFI/BT module                             | Unsupported     | Supported (M7)  |
-|           |            | (select :kconfig:option:`CONFIG_BT_NXP_NW612`) |                 |                 |
-+-----------+------------+------------------------------------------------+-----------------+-----------------+
-
-The default configuration can be found in the defconfig files:
-:zephyr_file:`boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_defconfig`
-:zephyr_file:`boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_defconfig`
+Zephyr, to better enable the entire RT11xx family.
+
+.. zephyr:board-supported-hw::
 
 Connections and I/Os
 ====================
@@ -315,6 +247,8 @@ that run the command:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -454,6 +388,16 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v3.4.0-xxxx-xxxxxxxxxxxxx *****
    Hello World! mimxrt1170_evk
 
+ENET1G Driver
+=============
+
+Current default of ethernet driver is to use 100M Ethernet instance ENET.
+To use the 1G Ethernet instance ENET1G, include the overlay to west build with
+the option ``-DEXTRA_DTC_OVERLAY_FILE=nxp,enet1g.overlay`` instead.
+
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1170-EVK Website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1170-evaluation-kit:MIMXRT1170-EVK
 
@@ -480,10 +424,3 @@ should see the following message in the terminal:
 
 .. _NXP MCUXpresso for Visual Studio Code:
 	https://www.nxp.com/design/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-for-visual-studio-code:MCUXPRESSO-VSC
-
-ENET1G Driver
-=============
-
-Current default of ethernet driver is to use 100M Ethernet instance ENET.
-To use the 1G Ethernet instance ENET1G, include the overlay to west build with
-the option ``-DEXTRA_DTC_OVERLAY_FILE=nxp,enet1g.overlay`` instead.
diff --git a/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.yaml b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.yaml
index 4d9cee2f0d331..dd213e258bfff 100644
--- a/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.yaml
+++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt1170_evk/mimxrt1176/cm4
+identifier: mimxrt1170_evk@A/mimxrt1176/cm4
 name: NXP MIMXRT1170-EVK CM4
 type: mcu
 arch: arm
diff --git a/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.yaml b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.yaml
index 409b60732a253..976b0e71f124d 100644
--- a/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.yaml
+++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt1170_evk/mimxrt1176/cm7
+identifier: mimxrt1170_evk@A/mimxrt1176/cm7
 name: NXP MIMXRT1170-EVK CM7
 type: mcu
 arch: arm
diff --git a/boards/nxp/mimxrt1180_evk/CMakeLists.txt b/boards/nxp/mimxrt1180_evk/CMakeLists.txt
index 1fbff93311635..d1df93939c793 100644
--- a/boards/nxp/mimxrt1180_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt1180_evk/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
      "update your flash configuration or device configuration data blocks")
   endif()
   set(RT1180_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1180")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1180")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1180 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/mimxrt1180_evk/Kconfig b/boards/nxp/mimxrt1180_evk/Kconfig
new file mode 100644
index 0000000000000..af3247b1354b2
--- /dev/null
+++ b/boards/nxp/mimxrt1180_evk/Kconfig
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MIMXRT1180_EVK
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/mimxrt1180_evk/Kconfig.defconfig b/boards/nxp/mimxrt1180_evk/Kconfig.defconfig
index a71be9a7729ae..2724201d047fb 100644
--- a/boards/nxp/mimxrt1180_evk/Kconfig.defconfig
+++ b/boards/nxp/mimxrt1180_evk/Kconfig.defconfig
@@ -1,6 +1,6 @@
 # MIMXRT1180-EVK board
 
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_MIMXRT1180_EVK
@@ -12,6 +12,19 @@ config EXTERNAL_MEM_CONFIG_DATA
 config NXP_IMX_EXTERNAL_HYPERRAM
 	default y if CPU_CORTEX_M33
 
-config BOARD_EARLY_INIT_HOOK
+if SECOND_CORE_MCUX && BOARD_MIMXRT1180_EVK_MIMXRT1189_CM7
+
+config BUILD_OUTPUT_INFO_HEADER
 	default y
+
+DT_CHOSEN_IMAGE_M7 = nxp,m7-partition
+
+# Adjust the offset of the output image if building for RT18xx SOC
+config BUILD_OUTPUT_ADJUST_LMA
+	default "($(dt_chosen_reg_addr_hex,$(DT_CHOSEN_IMAGE_M7)) + \
+	$(dt_node_reg_addr_hex,/soc/spi@425e0000,1)) - \
+	$(dt_node_reg_addr_hex,/soc/itcm@0)"
+
+endif
+
 endif # BOARD_MIMXRT1180_EVK
diff --git a/boards/nxp/mimxrt1180_evk/board.cmake b/boards/nxp/mimxrt1180_evk/board.cmake
index 409077e41d4b3..71701f8a6c0c2 100644
--- a/boards/nxp/mimxrt1180_evk/board.cmake
+++ b/boards/nxp/mimxrt1180_evk/board.cmake
@@ -1,15 +1,15 @@
 #
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
 set(RT1180_BOARD_DIR
-"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1180")
+"${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1180")
 # Note1: Suggest developers use Secure Provisioning Tool(SPT) to download RT1180 image
 # SPT can be downloaded on NXP web: https://www.nxp.com/design/design-center/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-secure-provisioning-tool:MCUXPRESSO-SECURE-PROVISIONING
 # Details about the usage of SPT on MIMXRT1180-EVK board can be referred on chapter 7 of getting start with Mcuxpresso SDK for MIMXRT1180-EVK doc in SDK package.
-if(CONFIG_SOC_MIMXRT1189_CM33)
+if(CONFIG_SOC_MIMXRT1189_CM33 OR CONFIG_SECOND_CORE_MCUX)
 board_runner_args(linkserver  "--device=MIMXRT1189xxxxx:MIMXRT1180-EVK")
 board_runner_args(jlink "--device=MIMXRT1189xxx8_M33" "--reset-after-load" "--tool-opt=-jlinkscriptfile ${RT1180_BOARD_DIR}/jlinkscript/evkmimxrt1180_cm33.jlinkscript")
 elseif(CONFIG_SOC_MIMXRT1189_CM7)
diff --git a/boards/nxp/mimxrt1180_evk/doc/index.rst b/boards/nxp/mimxrt1180_evk/doc/index.rst
index 32505399167ca..217ad1e07e8a0 100644
--- a/boards/nxp/mimxrt1180_evk/doc/index.rst
+++ b/boards/nxp/mimxrt1180_evk/doc/index.rst
@@ -70,7 +70,7 @@ This platform has the following external memories:
 |                    |            | data block, which sets up SEMC at   |
 |                    |            | boot time                           |
 +--------------------+------------+-------------------------------------+
-| W25Q128JWSIQ       | FLEXSPI    | Enabled via flash configurationn    |
+| W25Q128JWSIQ       | FLEXSPI    | Enabled via flash configuration     |
 |                    |            | block, which sets up FLEXSPI at     |
 |                    |            | boot time.                          |
 +--------------------+------------+-------------------------------------+
@@ -81,61 +81,9 @@ Supported Features
 NXP considers the MIMXRT1180-EVK as the superset board for the i.MX RT118x
 family of MCUs.  This board is a focus for NXP's Full Platform Support for
 Zephyr, to better enable the entire RT118x family.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The mimxrt1180_evk board
-configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| QTMR      | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | sensor                              |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| NETC      | on-chip    | dsa, ethernet, mdio                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | tpm                                 |
-+-----------+------------+-------------------------------------+
-| I3C       | on-chip    | i3c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| RTWDOG    | on-chip    | rtwdog                              |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33_defconfig`
-
-Other hardware features are not currently supported by the port.
+this board with new support for Zephyr features.
 
+.. zephyr:board-supported-hw::
 
 Connections and I/Os
 ====================
@@ -149,9 +97,13 @@ The MIMXRT1180 SoC has six pairs of pinmux/gpio controllers.
 +---------------+-----------------+---------------------------+
 | GPIO_AD_27    | GPIO            | LED                       |
 +---------------+-----------------+---------------------------+
-| GPIO_AON_08   | LPUART1_TX      | UART Console              |
+| GPIO_AON_08   | LPUART1_TX      | UART Console M33 core     |
 +---------------+-----------------+---------------------------+
-| GPIO_AON_09   | LPUART1_RX      | UART Console              |
+| GPIO_AON_09   | LPUART1_RX      | UART Console M33 core     |
++---------------+---------------------------------------------+
+| GPIO_AON_19   | LPUART12_TX     | UART Console M7 core      |
++---------------+-----------------+---------------------------+
+| GPIO_AON_20   | LPUART12_RX     | UART Console M7 core      |
 +---------------+-----------------+---------------------------+
 | GPIO_SD_B1_00 | SPI1_CS0        | spi                       |
 +---------------+---------------------------------------------+
@@ -160,7 +112,10 @@ The MIMXRT1180 SoC has six pairs of pinmux/gpio controllers.
 | GPIO_SD_B1_02 | SPI1_SDO        | spi                       |
 +---------------+---------------------------------------------+
 | GPIO_SD_B1_03 | SPI1_SDI        | spi                       |
-+---------------+---------------------------------------------+
++---------------+-----------------+---------------------------+
+
+UART for M7 core is connected to USB-to-UART J60 connector.
+Or user can use open JP7 Jumper to enable second UART on MCU LINK J53 connector.
 
 System Clock
 ============
@@ -172,8 +127,8 @@ running at 792MHz
 Serial Port
 ===========
 
-The MIMXRT1180 SoC has 12 UARTs. One is configured for the console and the
-remaining are not used.
+The MIMXRT1180 SoC has 12 UARTs. LPUART1 is configured for the CM33 console, the LPUART12 is
+configured for the CM7 console core and the remaining are not used.
 
 Ethernet
 ========
@@ -211,6 +166,8 @@ DSA master port. DSA master port support is TODO work.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -253,6 +210,16 @@ When debugging cm33 core, need to ensure the SW5 on "0100" mode.
 When debugging cm7 core, need to ensure the SW5 on "0001" mode.
 (Only support run cm7 image when debugging due to default boot core on board is cm33 core)
 
+Dual Core samples Debugging
+***************************
+
+When debugging dual core samples, need to ensure the SW5 on "0100" mode.
+The CM33 core is responsible for copying and starting the CM7.
+To debug the CM7 it is useful to put infinite while loop either in reset vector or
+into main function and attach via debugger to CM7 core.
+
+CM7 core can be started again only after reset, so after flashing ensure to reset board.
+
 Configuring a Console
 =====================
 
@@ -310,6 +277,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v3.7.0-xxx-xxxxxxxxxxxxx *****
    Hello World! mimxrt1180_evk/mimxrt1189/cm33
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT1180-EVK Website:
    https://www.nxp.com/design/design-center/development-boards-and-designs/i-mx-evaluation-and-development-boards/i-mx-rt1180-evaluation-kit:MIMXRT1180-EVK
 
diff --git a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk-pinctrl.dtsi b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk-pinctrl.dtsi
index 9dbff25e09e84..a0ee4993f68b9 100644
--- a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk-pinctrl.dtsi
+++ b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  * SPDX-License-Identifier: Apache-2.0
  *
  */
@@ -155,6 +155,29 @@
 		};
 	};
 
+	pinmux_lpuart12: pinmux_lpuart12 {
+		group0 {
+			pinmux = <&iomuxc_aon_gpio_aon_20_lpuart12_rxd>,
+				<&iomuxc_aon_gpio_aon_19_lpuart12_txd>;
+			drive-strength = "high";
+			slew-rate = "fast";
+		};
+	};
+
+	pinmux_lpuart12_sleep: pinmux_lpuart12_sleep {
+		group0 {
+			pinmux = <&iomuxc_aon_gpio_aon_20_lpuart12_rxd>;
+			drive-strength = "high";
+			bias-pull-up;
+			slew-rate = "fast";
+		};
+		group1 {
+			pinmux = <&iomuxc_aon_gpio_aon_19_lpuart12_txd>;
+			drive-strength = "high";
+			slew-rate = "fast";
+		};
+	};
+
 	pinmux_lpuart3: pinmux_lpuart3 {
 		group0 {
 			pinmux = <&iomuxc_gpio_ad_14_lpuart3_rxd>,
@@ -267,4 +290,61 @@
 			drive-strength = "high";
 		};
 	};
+
+	pinmux_usdhc1: pinmux_usdhc1 {
+		group0 {
+			pinmux = <&iomuxc_gpio_sd_b1_00_usdhc1_cmd>,
+				<&iomuxc_gpio_sd_b1_01_usdhc1_clk>,
+				<&iomuxc_gpio_sd_b1_02_usdhc1_data0>,
+				<&iomuxc_gpio_sd_b1_03_usdhc1_data1>,
+				<&iomuxc_gpio_sd_b1_04_usdhc1_data2>,
+				<&iomuxc_gpio_sd_b1_05_usdhc1_data3>;
+			bias-pull-up;
+			input-enable;
+		};
+		group1 {
+			pinmux = <&iomuxc_gpio_ad_34_usdhc1_vselect>,
+				<&iomuxc_gpio_ad_15_gpio4_io15>;
+			drive-strength = "high";
+			bias-pull-down;
+			slew-rate = "fast";
+		};
+		group2 {
+			pinmux = <&iomuxc_gpio_ad_14_gpio4_io14>;
+			drive-strength = "high";
+			bias-pull-up;
+			slew-rate = "fast";
+		};
+	};
+
+	/* removes pull on dat3 for card detect */
+	pinmux_usdhc1_dat3_nopull: pinmux_usdhc1_dat3_nopull {
+		group0 {
+			pinmux = <&iomuxc_gpio_sd_b1_05_usdhc1_data3>;
+			bias-disable;
+			input-enable;
+		};
+		group1 {
+			pinmux = <&iomuxc_gpio_sd_b1_00_usdhc1_cmd>,
+				<&iomuxc_gpio_sd_b1_01_usdhc1_clk>,
+				<&iomuxc_gpio_sd_b1_02_usdhc1_data0>,
+				<&iomuxc_gpio_sd_b1_03_usdhc1_data1>,
+				<&iomuxc_gpio_sd_b1_04_usdhc1_data2>;
+			bias-pull-up;
+			input-enable;
+		};
+		group2 {
+			pinmux = <&iomuxc_gpio_ad_34_usdhc1_vselect>,
+				<&iomuxc_gpio_ad_15_gpio4_io15>;
+			drive-strength = "high";
+			bias-pull-down;
+			slew-rate = "fast";
+		};
+		group3 {
+			pinmux = <&iomuxc_gpio_ad_14_gpio4_io14>;
+			drive-strength = "high";
+			bias-pull-up;
+			slew-rate = "fast";
+		};
+	};
 };
diff --git a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk.dtsi b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk.dtsi
index 8b26a005810e0..8da2b53518594 100644
--- a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk.dtsi
+++ b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,6 +12,7 @@
 		led0 = &green_led;
 		sw0 = &user_button;
 		pwm-led0 = &green_pwm_led;
+		sdhc0 = &usdhc1;
 	};
 
 	leds {
@@ -19,7 +20,7 @@
 		green_led: led-1 {
 			gpios = <&gpio4 27 GPIO_ACTIVE_HIGH>;
 			label = "User LED D6";
-	    };
+		};
 	};
 
 	gpio_keys {
@@ -143,6 +144,14 @@
 	pinctrl-names = "default", "sleep";
 };
 
+&lpuart12 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart12>;
+	pinctrl-1 = <&pinmux_lpuart12_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
 &lpuart3 {
 	pinctrl-0 = <&pinmux_lpuart3>;
 	pinctrl-1 = <&pinmux_lpuart3_sleep>;
@@ -261,3 +270,18 @@ p3t1755dp_ard_i2c_interface: &lpi2c2 {};
 	pinctrl-0 = <&pinmux_lpspi3>;
 	pinctrl-names = "default";
 };
+
+&usdhc1 {
+	status = "okay";
+	detect-dat3;
+	no-1-8-v;
+	pwr-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>;
+	pinctrl-0 = <&pinmux_usdhc1>;
+	pinctrl-1 = <&pinmux_usdhc1_dat3_nopull>;
+	pinctrl-names = "default", "nopull";
+	sdmmc {
+		compatible = "zephyr,sdmmc-disk";
+		disk-name = "SD";
+		status = "okay";
+	};
+};
diff --git a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts
index 8143c05525816..528c2f4357b28 100644
--- a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts
+++ b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts
@@ -85,3 +85,15 @@ zephyr_udc0: &usb1 {
 	tx-cal-45-dp-ohms = <6>;
 	tx-cal-45-dm-ohms = <6>;
 };
+
+zephyr_udc1: &usb2{
+	status = "okay";
+	phy-handle = <&usbphy2>;
+};
+
+&usbphy2 {
+	status = "okay";
+	tx-d-cal = <7>;
+	tx-cal-45-dp-ohms = <6>;
+	tx-cal-45-dm-ohms = <6>;
+};
diff --git a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.yaml b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.yaml
index 50e7ae40e454f..5af46ebc6919a 100644
--- a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.yaml
+++ b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.yaml
@@ -20,6 +20,7 @@ supported:
   - flash
   - gpio
   - i2c
+  - mbox
   - netif:eth
   - pwm
   - uart
@@ -27,5 +28,6 @@ supported:
   - dma
   - spi
   - watchdog
-  - usb_device
+  - usbd
+  - sdhc
 vendor: nxp
diff --git a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.dts b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.dts
index 2bc79fbca2cca..c6a3499c778b8 100644
--- a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.dts
+++ b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,19 +15,24 @@
 
 	chosen {
 		zephyr,sram = &dtcm;
+		zephyr,dtcm = &dtcm;
+		zephyr,itcm = &itcm;
 		zephyr,flash-controller = &w25q128jw;
 		zephyr,flash = &itcm;
-		zephyr,console = &lpuart1;
-		zephyr,shell-uart = &lpuart1;
+		zephyr,console = &lpuart12;
+		zephyr,shell-uart = &lpuart12;
 		zephyr,canbus = &flexcan3;
+		nxp,m7-partition = &slot1_partition;
 	};
-};
 
-&enetc_psi0 {
-	status = "disabled";
+	hyperram0: memory@04000000 {
+		/* Winbond W957A8MFYA5K */
+		device_type = "memory";
+		reg = <0x04000000 DT_SIZE_M(8)>;
+	};
 };
 
-&lpuart1 {
+&lpuart12 {
 	status = "okay";
 	current-speed = <115200>;
 };
@@ -79,3 +84,15 @@ zephyr_udc0: &usb1 {
 	tx-cal-45-dp-ohms = <6>;
 	tx-cal-45-dm-ohms = <6>;
 };
+
+zephyr_udc1: &usb2{
+	status = "okay";
+	phy-handle = <&usbphy2>;
+};
+
+&usbphy2 {
+	status = "okay";
+	tx-d-cal = <7>;
+	tx-cal-45-dp-ohms = <6>;
+	tx-cal-45-dm-ohms = <6>;
+};
diff --git a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.yaml b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.yaml
index 5366ba8f9aff1..34b0b8d79610d 100644
--- a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.yaml
+++ b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm7.yaml
@@ -17,12 +17,14 @@ supported:
   - adc
   - can
   - counter
+  - dma
   - flash
   - gpio
   - i2c
-  - pwm
-  - uart
   - i3c
-  - dma
+  - mbox
+  - pwm
+  - sdhc
   - spi
+  - uart
 vendor: nxp
diff --git a/boards/nxp/mimxrt595_evk/CMakeLists.txt b/boards/nxp/mimxrt595_evk/CMakeLists.txt
index 79cb85e066495..9cea226cf29bb 100644
--- a/boards/nxp/mimxrt595_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt595_evk/CMakeLists.txt
@@ -22,7 +22,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_compile_definitions(BOOT_HEADER_ENABLE=1)
   zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
   set(RT595_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt595")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt595")
   zephyr_library_sources(${RT595_BOARD_DIR}/flash_config/flash_config.c)
   zephyr_library_include_directories(${RT595_BOARD_DIR}/flash_config)
 endif()
diff --git a/boards/nxp/mimxrt595_evk/Kconfig b/boards/nxp/mimxrt595_evk/Kconfig
index c97c859f16dd5..33b997c251836 100644
--- a/boards/nxp/mimxrt595_evk/Kconfig
+++ b/boards/nxp/mimxrt595_evk/Kconfig
@@ -1,12 +1,9 @@
-# Copyright 2022, NXP
+# Copyright 2022, 2025 NXP
 # Copyright (c) 2023 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_INIT_PRIORITY
-	int "Board initialization priority"
-	default 45
-	help
-	  Board initialization priority.
+config BOARD_MIMXRT595_EVK
+	select BOARD_EARLY_INIT_HOOK if BOARD_MIMXRT595_EVK_MIMXRT595S_CM33
 
 DT_ADSP_RESET_MEM := $(dt_nodelabel_path,adsp_reset)
 DT_ADSP_DATA_MEM := $(dt_nodelabel_path,adsp_data)
diff --git a/boards/nxp/mimxrt595_evk/board.c b/boards/nxp/mimxrt595_evk/board.c
index ecb6cbcd129c4..4c4e7f65cd658 100644
--- a/boards/nxp/mimxrt595_evk/board.c
+++ b/boards/nxp/mimxrt595_evk/board.c
@@ -263,7 +263,7 @@ __ramfunc int32_t power_manager_set_profile(uint32_t power_profile)
 
 #endif /* CONFIG_REGULATOR */
 
-static int mimxrt595_evk_init(void)
+void board_early_init_hook(void)
 {
 	/* Set the correct voltage range according to the board. */
 	power_pad_vrange_t vrange = {
@@ -352,7 +352,6 @@ static int mimxrt595_evk_init(void)
 	INPUTMUX_EnableSignal(INPUTMUX,
 			kINPUTMUX_I3c1TxToDmac1Ch31RequestEna, true);
 #endif /* dma1 */
-	INPUTMUX_Deinit(INPUTMUX);
 
 #ifdef CONFIG_REBOOT
 	/*
@@ -386,8 +385,6 @@ static int mimxrt595_evk_init(void)
 		rd_trim_96 = CLKCTL0->FRO_RDTRIM;
 		sc_trim_96 = sc_trim_192;
 	}
-
-	return 0;
 }
 
 
@@ -418,5 +415,3 @@ SYS_INIT(board_config_pmic, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY);
  */
 SYS_INIT(init_psram_framebufs, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY);
 #endif
-
-SYS_INIT(mimxrt595_evk_init, PRE_KERNEL_1, CONFIG_BOARD_INIT_PRIORITY);
diff --git a/boards/nxp/mimxrt595_evk/doc/index.rst b/boards/nxp/mimxrt595_evk/doc/index.rst
index 899d777a6ffda..07bc895051c08 100644
--- a/boards/nxp/mimxrt595_evk/doc/index.rst
+++ b/boards/nxp/mimxrt595_evk/doc/index.rst
@@ -54,67 +54,11 @@ Supported Features
 NXP considers the MIMXRT595-EVK as a superset board for the i.MX RT5xx
 family of MCUs.  This board is a focus for NXP's Full Platform Support for
 Zephyr, to better enable the entire RT5xx family.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The mimxrt595_evk board
-configuration supports the hardware features below.  Another very similar
+this board with new support for Zephyr features.  Another very similar
 board is the :zephyr:board:`mimxrt685_evk`, and that board may have additional features
-already supported, which can also be re-used on this mimxrt595_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| OS_TIMER  | on-chip    | os timer                            |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CTIMER    | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | OctalSPI Flash                      |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PM        | on-chip    | power management; uses SoC sleep,   |
-|           |            | deep sleep and deep-powerdown modes |
-+-----------+------------+-------------------------------------+
-| SDHC      | on-chip    | disk access (works with eMMC & SD)  |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | LCDIF; MIPI-DSI. Tested with        |
-|           |            | :ref:`rk055hdmipi4m`,               |
-|           |            | :ref:`rk055hdmipi4ma0`, and         |
-|           |            | :ref:`g1120b0mipi` display shields  |
-+-----------+------------+-------------------------------------+
-| DMIC      | on-chip    | dmic                                |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-   :zephyr_file:`boards/nxp/mimxrt595_evk/mimxrt595_evk_mimxrt595s_cm33_defconfig`
-
-Other hardware features are not currently supported by the port.
+already supported, which can also be re-used on this mimxrt595_evk board.
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -187,6 +131,8 @@ this document: `Getting Started with Xplorer for EVK-MIMXRT595`_
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -303,6 +249,9 @@ steps:
 
 #. Reset by pressing SW3
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT595-EVK Website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt595-evaluation-kit:MIMXRT595-EVK
 
diff --git a/boards/nxp/mimxrt685_evk/CMakeLists.txt b/boards/nxp/mimxrt685_evk/CMakeLists.txt
index c08b123bdc16c..53eb5a6e13ee1 100644
--- a/boards/nxp/mimxrt685_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt685_evk/CMakeLists.txt
@@ -21,7 +21,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_compile_definitions(BOOT_HEADER_ENABLE=1)
   zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
   set(RT685_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt685")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt685")
   zephyr_library_sources(${RT685_BOARD_DIR}/flash_config/flash_config.c)
   zephyr_library_include_directories(${RT685_BOARD_DIR}/flash_config)
 endif()
diff --git a/boards/nxp/mimxrt685_evk/Kconfig b/boards/nxp/mimxrt685_evk/Kconfig
index 593dcf929c6f8..88f3b34861be4 100644
--- a/boards/nxp/mimxrt685_evk/Kconfig
+++ b/boards/nxp/mimxrt685_evk/Kconfig
@@ -1,8 +1,6 @@
+# Copyright 2025 NXP
 # Copyright (c) 2022 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_INIT_PRIORITY
-	int "Board initialization priority"
-	default 45
-	help
-	  Board initialization priority.
+config BOARD_MIMXRT685_EVK
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/mimxrt685_evk/doc/index.rst b/boards/nxp/mimxrt685_evk/doc/index.rst
index ebd1d9c1d31d3..6acc0cbdc6cd7 100644
--- a/boards/nxp/mimxrt685_evk/doc/index.rst
+++ b/boards/nxp/mimxrt685_evk/doc/index.rst
@@ -50,62 +50,11 @@ Supported Features
 NXP considers the MIMXRT685-EVK as a superset board for the i.MX RT6xx
 family of MCUs.  This board is a focus for NXP's Full Platform Support for
 Zephyr, to better enable the entire RT6xx family.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The mimxrt685_evk board
-configuration supports the hardware features below.  Another very similar
+this board with new support for Zephyr features.  Another very similar
 board is the :zephyr:board:`mimxrt595_evk`, and that board may have additional features
-already supported, which can also be re-used on this mimxrt685_evk board:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| OS_TIMER  | on-chip    | os timer                            |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | OctalSPI Flash                      |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| SDHC      | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CTIMER    | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt685_evk/mimxrt685_evk_mimxrt685s_cm33_defconfig`
-
-Other hardware features are not currently supported by the port.
+already supported, which can also be re-used on this mimxrt685_evk board.
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -208,6 +157,8 @@ configured as USART for the console and the remaining are not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -343,6 +294,9 @@ steps:
 
 #. Reset by pressing SW3
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _MIMXRT685-EVK Website:
    https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt600-evaluation-kit:MIMXRT685-EVK
 
diff --git a/boards/nxp/mimxrt685_evk/init.c b/boards/nxp/mimxrt685_evk/init.c
index 8c0cd0878811c..f2f6755aafa8c 100644
--- a/boards/nxp/mimxrt685_evk/init.c
+++ b/boards/nxp/mimxrt685_evk/init.c
@@ -7,7 +7,7 @@
 #include <zephyr/devicetree.h>
 #include <fsl_device_registers.h>
 
-static int mimxrt685_evk_init(void)
+void board_early_init_hook(void)
 {
 
 /* flexcomm1 and flexcomm3 are configured to loopback the TX signal to RX */
@@ -54,8 +54,4 @@ static int mimxrt685_evk_init(void)
 	 */
 	 OCOTP->OTP_SHADOW[97] = 0x314000;
 #endif /* CONFIG_REBOOT */
-
-	return 0;
 }
-
-SYS_INIT(mimxrt685_evk_init, PRE_KERNEL_1, CONFIG_BOARD_INIT_PRIORITY);
diff --git a/boards/nxp/mimxrt700_evk/CMakeLists.txt b/boards/nxp/mimxrt700_evk/CMakeLists.txt
index e13f3a2679630..32c47fe3d9519 100644
--- a/boards/nxp/mimxrt700_evk/CMakeLists.txt
+++ b/boards/nxp/mimxrt700_evk/CMakeLists.txt
@@ -22,7 +22,7 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_compile_definitions(BOOT_HEADER_ENABLE=1)
   zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
   set(RT7XX_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/mimxrt700evk")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/mimxrt700evk")
   zephyr_library_sources(${RT7XX_BOARD_DIR}/flash_config/flash_config.c)
   zephyr_library_include_directories(${RT7XX_BOARD_DIR}/flash_config)
 endif()
diff --git a/boards/nxp/mimxrt700_evk/Kconfig b/boards/nxp/mimxrt700_evk/Kconfig
new file mode 100644
index 0000000000000..26c1304745295
--- /dev/null
+++ b/boards/nxp/mimxrt700_evk/Kconfig
@@ -0,0 +1,7 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MIMXRT700_EVK
+	select BOARD_EARLY_INIT_HOOK if \
+		BOARD_MIMXRT700_EVK_MIMXRT798S_CM33_CPU0 || \
+		BOARD_MIMXRT700_EVK_MIMXRT798S_CM33_CPU1
diff --git a/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk b/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk
index af33cfc734b4e..1e27338890b5f 100644
--- a/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk
+++ b/boards/nxp/mimxrt700_evk/Kconfig.mimxrt700_evk
@@ -1,7 +1,9 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MIMXRT700_EVK
 	select SOC_MIMXRT798S_CM33_CPU0 if BOARD_MIMXRT700_EVK_MIMXRT798S_CM33_CPU0
 	select SOC_MIMXRT798S_CM33_CPU1 if BOARD_MIMXRT700_EVK_MIMXRT798S_CM33_CPU1
+	select SOC_MIMXRT798S_HIFI4 if BOARD_MIMXRT700_EVK_MIMXRT798S_HIFI4
+	select SOC_MIMXRT798S_HIFI1 if BOARD_MIMXRT700_EVK_MIMXRT798S_HIFI1
 	select SOC_PART_NUMBER_MIMXRT798SGFOA
diff --git a/boards/nxp/mimxrt700_evk/board.c b/boards/nxp/mimxrt700_evk/board.c
index 2e9609dfd6e35..8804b1548cd81 100644
--- a/boards/nxp/mimxrt700_evk/board.c
+++ b/boards/nxp/mimxrt700_evk/board.c
@@ -394,6 +394,53 @@ void board_early_init_hook(void)
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(ctimer7), okay)
 	SET_UP_CTIMER_CLOCK(7);
 #endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(lpadc0), okay)
+	CLOCK_AttachClk(kFRO1_DIV1_to_SENSE_MAIN);
+	CLOCK_AttachClk(kSENSE_BASE_to_ADC);
+	CLOCK_SetClkDiv(kCLOCK_DivAdcClk, 1U);
+#endif
+
+#if (DT_NODE_HAS_STATUS(DT_NODELABEL(os_timer_cpu0), okay) || \
+		DT_NODE_HAS_STATUS(DT_NODELABEL(os_timer_cpu1), okay))
+	CLOCK_AttachClk(kLPOSC_to_OSTIMER);
+	CLOCK_SetClkDiv(kCLOCK_DivOstimerClk, 1U);
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb0)) && CONFIG_UDC_NXP_EHCI
+	/* Power on COM VDDN domain for USB */
+	POWER_DisablePD(kPDRUNCFG_DSR_VDDN_COM);
+
+	/* Power on usb ram array as need, powered USB0RAM array*/
+	POWER_DisablePD(kPDRUNCFG_APD_USB0_SRAM);
+	POWER_DisablePD(kPDRUNCFG_PPD_USB0_SRAM);
+	/* Apply the config */
+	POWER_ApplyPD();
+	/* disable the read and write gate */
+	SYSCON4->USB0_MEM_CTRL |= (SYSCON4_USB0_MEM_CTRL_MEM_WIG_MASK |
+				   SYSCON4_USB0_MEM_CTRL_MEM_RIG_MASK |
+				   SYSCON4_USB0_MEM_CTRL_MEM_STDBY_MASK);
+	/* Enable the USBPHY0 CLOCK */
+	SYSCON4->USBPHY0_CLK_ACTIVE |= SYSCON4_USBPHY0_CLK_ACTIVE_IPG_CLK_ACTIVE_MASK;
+	CLOCK_AttachClk(k32KHZ_WAKE_to_USB);
+	CLOCK_AttachClk(kOSC_CLK_to_USB_24MHZ);
+	CLOCK_EnableClock(kCLOCK_Usb0);
+	CLOCK_EnableClock(kCLOCK_UsbphyRef);
+	RESET_PeripheralReset(kUSB0_RST_SHIFT_RSTn);
+	RESET_PeripheralReset(kUSBPHY0_RST_SHIFT_RSTn);
+	CLOCK_EnableUsbhs0PhyPllClock(kCLOCK_Usbphy480M,
+				DT_PROP_BY_PHANDLE(DT_NODELABEL(usb0), clocks, clock_frequency));
+	CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M,
+				DT_PROP_BY_PHANDLE(DT_NODELABEL(usb0), clocks, clock_frequency));
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(wwdt0))
+	CLOCK_AttachClk(kLPOSC_to_WWDT0);
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sc_timer), okay)
+	CLOCK_AttachClk(kFRO0_DIV6_to_SCT);
+#endif
 }
 
 static void GlikeyWriteEnable(GLIKEY_Type *base, uint8_t idx)
diff --git a/boards/nxp/mimxrt700_evk/board.cmake b/boards/nxp/mimxrt700_evk/board.cmake
index 2ea53e1674115..800d65c1ead20 100644
--- a/boards/nxp/mimxrt700_evk/board.cmake
+++ b/boards/nxp/mimxrt700_evk/board.cmake
@@ -13,8 +13,6 @@ elseif(CONFIG_SOC_MIMXRT798S_CM33_CPU1)
   board_runner_args(jlink "--device=MIMXRT798S_M33_1")
   board_runner_args(linkserver  "--device=MIMXRT798S:MIMXRT700-EVK")
   board_runner_args(linkserver  "--core=cm33_core1")
-else()
-  message(FATAL_ERROR "Requested core is not supported")
 endif()
 
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/nxp/mimxrt700_evk/doc/index.rst b/boards/nxp/mimxrt700_evk/doc/index.rst
index 4d0235df93276..a231927bbaf40 100644
--- a/boards/nxp/mimxrt700_evk/doc/index.rst
+++ b/boards/nxp/mimxrt700_evk/doc/index.rst
@@ -3,26 +3,31 @@
 Overview
 ********
 
-The new i.MX RT700 CPU architecture is composed of a high-performance main compute subsystem,
+The new i.MX RT700 CPU architecture is composed of a high-performance main-compute subsystem,
 a secondary “always-on” sense-compute subsystem and specialized coprocessors.
 
-The main compute subsystem uses a 325 MHz capable Arm® Cortex®-M33 (CM33).
-Similar to the i.MX RT600 crossover MCU, the i.MX RT700 includes a Cadence Tensilica® HiFi 4 DSP.
-The HiFi 4 is a high performance DSP core based upon a Very Long Instruction Word (VLIW) architecture,
+The main-compute subsystem has a primary Arm® Cortex®-M33 running at 325 MHz, with an integrated
+Cadence® Tensilica® HiFi 4 DSP for more demanding DSP and audio processing tasks.
+The sense-compute subsystem has a second Arm® Cortex®-M33 and an integrated Cadence® Tensilica®
+HiFi 1 DSP. This removes the need for an external sensor hub, reducing system design complexity,
+footprint and BOM costs.
+
+The HiFi4 is a high performance DSP core based upon a Very Long Instruction Word (VLIW) architecture,
 which is capable of processing up to eight 32x16 MACs per instruction cycle. It can be used for offloading
 high-performance numerical tasks such as audio and image processing and supports both fixed-point and
 floating-point operations.
 
+The i.MX RT700 also features NXP’s eIQ Neutron NPU, enabled with the eIQ machine learning software
+development environment.
+
 Hardware
 ********
 
 - Main Compute Subsystem:
-
    - Arm Cortex-M33 up to 325 MHz
    - HiFi 4 DSP up to 325 MHz
    - eIQ Neutron NPU up to 325 MHz
 - Sense Compute Subsystem:
-
    - Arm Cortex-M33 up to 250 MHz
    - HiFi 1 DSP up to 250 MHz
 - 7.5 MB on-chip SRAM
@@ -49,43 +54,11 @@ Supported Features
 ==================
 
 NXP considers the MIMXRT700-EVK as a superset board for the i.MX RT7xx
-family of MCUs.  This board is a focus for NXP's Full Platform Support for
-Zephyr, to better enable the entire RT7xx family.  NXP prioritizes enabling
-this board with new support for Zephyr features.  The ``mimxrt700_evk/mimxrt798s
-/cm33_cpu0`` and ``mimxrt700_evk/mimxrt798s/cm33_cpu1`` board targets support
-the hardware features below.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CTIMER    | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| MRT       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-   :zephyr_file:`boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0_defconfig`
-   :zephyr_file:`boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1_defconfig`
-
-Other hardware features are not currently supported by the port.
+family of MCUs. This board is a focus for NXP's Full Platform Support for
+Zephyr, to better enable the entire RT7xx family. NXP prioritizes enabling
+this board with new support for Zephyr features.
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -127,9 +100,39 @@ System Clock
 The MIMXRT700 EVK is configured to use the Systick
 as a source for the system clock.
 
+HiFi1 DSP Core
+==================
+
+One can build a Zephyr application for the i.MX RT700 HiFi 1  DSP core by targeting the HiFi 1
+SOC. Xtensa toolchain supporting RT700 DSP cores is included in Zephyr SDK.
+
+To build the hello_world sample for the i.MX RT700 HiFi 1 DSP core:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: mimxrt700_evk/mimxrt798s/hifi1
+   :goals: build
+
+HiFi4 DSP Core
+==================
+
+One can build a Zephyr application for the i.MX RT700 HiFi 4  DSP core by targeting the HiFi 4
+SOC. Xtensa toolchain supporting RT700 DSP cores is included in Zephyr SDK.
+
+To build the hello_world sample for the i.MX RT700 HiFi 4 DSP core:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: mimxrt700_evk/mimxrt798s/hifi4
+   :goals: build
+
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -207,6 +210,9 @@ should see the following message in the terminal:
    *** Booting Zephyr OS v3.7.0 ***
    Hello World! mimxrt700_evk/mimxrt798s/cm33_cpu0
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _i.MX RT700 Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/i-mx-rt-crossover-mcus/i-mx-rt700-crossover-mcu-with-arm-cortex-m33-npu-dsp-and-gpu-cores:i.MX-RT700
 
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk-pinctrl.dtsi b/boards/nxp/mimxrt700_evk/mimxrt700_evk-pinctrl.dtsi
index b056ee4ce0e2d..80054f5b477ae 100644
--- a/boards/nxp/mimxrt700_evk/mimxrt700_evk-pinctrl.dtsi
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk-pinctrl.dtsi
@@ -65,4 +65,23 @@
 			slew-rate = "slow";
 		};
 	};
+
+	pinmux_lpadc0: pinmux_lpadc0 {
+		group0 {
+			pinmux = <ADC0_CH0_PIO10_0>,
+				<ADC0_CH1_PIO10_2>;
+			slew-rate = "normal";
+			drive-strength = "normal";
+			nxp,analog-mode;
+		};
+	};
+
+	pinmux_sctimer: pinmux_sctimer {
+		group0 {
+			pinmux = <SCT0_IN0_PIO0_0>;
+			slew-rate = "normal";
+			drive-strength = "normal";
+			input-enable;
+		};
+	};
 };
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.dts b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.dts
index ff01df4cd61f6..198db2560d3de 100644
--- a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.dts
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.dts
@@ -20,6 +20,8 @@
 		led1 = &blue_led;
 		sw0 = &user_button_1;
 		sw1 = &user_button_2;
+		watchdog0 = &wwdt0;
+		pwm-0 = &sc_timer;
 	};
 
 	chosen {
@@ -65,8 +67,14 @@
 	status = "okay";
 };
 
-&systick {
+/*
+ * RT700-EVK board cm33_cpu0 uses OS timer as the kernel timer
+ * In case we need to switch to SYSTICK timer, then
+ * replace &os_timer with &systick
+ */
+&os_timer_cpu0 {
 	status = "okay";
+	wakeup-source;
 };
 
 &flexcomm0{
@@ -111,6 +119,12 @@
 	status = "okay";
 };
 
+&lpadc0 {
+	status = "okay";
+	pinctrl-0 = <&pinmux_lpadc0>;
+	pinctrl-names = "default";
+};
+
 &blue_led {
 	status = "okay";
 };
@@ -119,6 +133,12 @@
 	status = "okay";
 };
 
+&sc_timer {
+	status = "okay";
+	pinctrl-0 = <&pinmux_sctimer>;
+	pinctrl-names = "default";
+};
+
 &xspi0 {
 	status = "okay";
 
@@ -135,4 +155,20 @@
 	};
 };
 
+zephyr_udc0: &usb0 {
+	status = "okay";
+	phy-handle = <&usbphy>;
+};
+
+&usbphy {
+	status = "okay";
+	tx-d-cal = <7>;
+	tx-cal-45-dp-ohms = <6>;
+	tx-cal-45-dm-ohms = <6>;
+};
+
+&wwdt0 {
+	status = "okay";
+};
+
 p3t1755dp_ard_i2c_interface: &flexcomm8_lpi2c8 {};
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.yaml b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.yaml
index bde30fefb28f7..10b049b8277d8 100644
--- a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.yaml
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0.yaml
@@ -19,4 +19,7 @@ supported:
   - i2c
   - uart
   - spi
+  - adc
+  - usb_device
+  - watchdog
 vendor: nxp
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0_defconfig b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0_defconfig
index 9c7cb03806289..2e0bfcbd83e09 100644
--- a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0_defconfig
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu0_defconfig
@@ -12,7 +12,6 @@ CONFIG_GPIO=y
 
 CONFIG_ARM_MPU=y
 CONFIG_HW_STACK_PROTECTION=y
-CONFIG_BOARD_EARLY_INIT_HOOK=y
 
 # Enable TrustZone-M
 CONFIG_TRUSTED_EXECUTION_SECURE=y
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.dts b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.dts
index dba2f9d889ba2..92ecdc41aafb0 100644
--- a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.dts
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -50,8 +50,20 @@
 	status = "okay";
 };
 
-&systick {
+&lpadc0 {
 	status = "okay";
+	pinctrl-0 = <&pinmux_lpadc0>;
+	pinctrl-names = "default";
+};
+
+/*
+ * RT700-EVK board cm33_cpu1 uses OS timer as the kernel timer
+ * In case we need to switch to SYSTICK timer, then
+ * replace &os_timer with &systick
+ */
+&os_timer_cpu1 {
+	status = "okay";
+	wakeup-source;
 };
 
 &flexcomm19{
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.yaml b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.yaml
index cfc78e3a57f7f..38c45ae9027ed 100644
--- a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.yaml
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1.yaml
@@ -17,4 +17,5 @@ supported:
   - counter
   - gpio
   - uart
+  - adc
 vendor: nxp
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1_defconfig b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1_defconfig
index a7a0f73244a15..29cdb5d3cfd47 100644
--- a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1_defconfig
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_cm33_cpu1_defconfig
@@ -12,7 +12,6 @@ CONFIG_GPIO=y
 
 CONFIG_ARM_MPU=y
 CONFIG_HW_STACK_PROTECTION=y
-CONFIG_BOARD_EARLY_INIT_HOOK=y
 
 # Enable TrustZone-M
 CONFIG_TRUSTED_EXECUTION_SECURE=y
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi1.dts b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi1.dts
new file mode 100644
index 0000000000000..6f1c5380db534
--- /dev/null
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi1.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_imxrt700_hifi1.dtsi>
+
+/ {
+	model = "NXP MIMXRT700-EVK HiFi1 DSP";
+	compatible = "nxp,mimxrt798s";
+
+	chosen {
+		zephyr,sram = &dtcm;
+	};
+};
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi1.yaml b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi1.yaml
new file mode 100644
index 0000000000000..7c3bee257ef93
--- /dev/null
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi1.yaml
@@ -0,0 +1,18 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: mimxrt700_evk/mimxrt798s/hifi1
+name: NXP MIMXRT700-EVK HiFi1
+type: mcu
+arch: xtensa
+toolchain:
+  - xcc
+  - xt-clang
+  - zephyr
+testing:
+  only_tags:
+    - kernel
+vendor: nxp
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi4.dts b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi4.dts
new file mode 100644
index 0000000000000..392a4c27a1d71
--- /dev/null
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi4.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nxp/nxp_imxrt700_hifi4.dtsi>
+
+/ {
+	model = "NXP MIMXRT700-EVK HiFi4 DSP";
+	compatible = "nxp,mimxrt798s";
+
+	chosen {
+		zephyr,sram = &dtcm;
+	};
+};
diff --git a/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi4.yaml b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi4.yaml
new file mode 100644
index 0000000000000..925a17ac4664e
--- /dev/null
+++ b/boards/nxp/mimxrt700_evk/mimxrt700_evk_mimxrt798s_hifi4.yaml
@@ -0,0 +1,18 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+identifier: mimxrt700_evk/mimxrt798s/hifi4
+name: NXP MIMXRT700-EVK HiFi4
+type: mcu
+arch: xtensa
+toolchain:
+  - xcc
+  - xt-clang
+  - zephyr
+testing:
+  only_tags:
+    - kernel
+vendor: nxp
diff --git a/boards/nxp/mr_canhubk3/doc/index.rst b/boards/nxp/mr_canhubk3/doc/index.rst
index fcb813b882d70..47dfdcc20b996 100644
--- a/boards/nxp/mr_canhubk3/doc/index.rst
+++ b/boards/nxp/mr_canhubk3/doc/index.rst
@@ -33,33 +33,7 @@ More information about the hardware and design resources can be found at
 Supported Features
 ==================
 
-The ``mr_canhubk3`` board configuration supports the following hardware features:
-
-============  ==========  ================================
-Interface     Controller  Driver/Component
-============  ==========  ================================
-SIUL2         on-chip     | pinctrl
-                          | gpio
-                          | external interrupt controller
-WKPU          on-chip     interrupt controller
-LPUART        on-chip     serial
-QSPI          on-chip     flash
-FLEXCAN       on-chip     can
-LPI2C         on-chip     i2c
-ADC SAR       on-chip     adc
-LPSPI         on-chip     spi
-WDT           FS26 SBC    watchdog
-SWT           on-chip     watchdog
-EMAC          on-chip     ethernet
-                          mdio
-eMIOS         on-chip     pwm
-EDMA          on-chip     dma
-FLEXIO PWM    on-chip     pwm
-STM           on-chip     counter
-============  ==========  ================================
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/nxp/mr_canhubk3/mr_canhubk3_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -275,15 +249,18 @@ The 100Base-T1 signals are available in connector ``P9`` and can be converted to
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``mr_canhubk3`` board can be built in the usual way as
 documented in :ref:`build_an_application`.
 
 This board configuration supports `Lauterbach TRACE32`_, `SEGGER J-Link`_ and `pyOCD`_
-West runners for flashing and debugging applications. Follow the steps described
-in :ref:`lauterbach-trace32-debug-host-tools`, :ref:`jlink-debug-host-tools` and
-:ref:`pyocd-debug-host-tools`,
-to setup the flash and debug host tools for these runners, respectively. The
-default runner is J-Link.
+West runners for flashing and debugging. Follow the steps described in
+:ref:`lauterbach-trace32-debug-host-tools`, :ref:`jlink-debug-host-tools` and
+:ref:`pyocd-debug-host-tools`, to set up the required host tools.
+The default runner is J-Link.
+
+If using TRACE32, ensure you have version >= 2024.09 installed.
 
 Flashing
 ========
@@ -326,6 +303,9 @@ Run the ``west debug`` command to start a GDB session using SEGGER J-Link.
 Alternatively, run ``west debug -r trace32`` or ``west debug -r pyocd``
 to launch the Lauterbach TRACE32 or pyOCD software debugging interface respectively.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/nxp/mr_canhubk3/support/startup.cmm b/boards/nxp/mr_canhubk3/support/startup.cmm
index 2a7194937a19a..736b9db68164b 100644
--- a/boards/nxp/mr_canhubk3/support/startup.cmm
+++ b/boards/nxp/mr_canhubk3/support/startup.cmm
@@ -51,7 +51,7 @@ TrOnchip.Set BUSERR OFF
 SYStem.Up
 
 ; Init SRAM
-DO ~~/demo/arm/hardware/s32k3/scripts/init_sram.cmm
+DO ~~/demo/arm/hardware/s32k3/misc/init_sram.cmm
 
 ; Only declares flash, does not execute flash programming
 DO ~~/demo/arm/flash/s32k3.cmm PREPAREONLY
@@ -97,7 +97,7 @@ IF ("&loadTo"=="flash")
 ELSE
 (
   ; Init ITCM
-  DO ~~/demo/arm/hardware/s32k3/scripts/init_itcm.cmm
+  DO ~~/demo/arm/hardware/s32k3/misc/init_itcm.cmm
 
   Data.LOAD.Elf &elfFile
 )
diff --git a/boards/nxp/rd_rw612_bga/CMakeLists.txt b/boards/nxp/rd_rw612_bga/CMakeLists.txt
index 1317c39df3102..e7ec1b7f3619c 100644
--- a/boards/nxp/rd_rw612_bga/CMakeLists.txt
+++ b/boards/nxp/rd_rw612_bga/CMakeLists.txt
@@ -1,9 +1,12 @@
 #
-# Copyright 2022-2023 NXP
+# Copyright 2022-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
+zephyr_library()
+zephyr_library_sources(init.c)
+
 if(CONFIG_NXP_RW6XX_BOOT_HEADER)
   if(NOT DEFINED CONFIG_BOARD_RD_RW612_BGA)
     message(WARNING "It appears you are using the board definition for "
@@ -12,6 +15,11 @@ if(CONFIG_NXP_RW6XX_BOOT_HEADER)
   endif()
   zephyr_compile_definitions(BOOT_HEADER_ENABLE=1)
   zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)
-  zephyr_library()
   zephyr_library_sources(MX25U51245GZ4I00_FCB.c)
 endif()
+
+if (CONFIG_DT_HAS_NXP_ENET_MAC_ENABLED AND CONFIG_XTAL32K)
+	message(FATAL_ERROR "Ethernet and external 32K clock source are "
+		"mutually exclusive on RD_RW612_BGA due to shared PCB nets "
+		"between the ethernet PHY and the external oscillator")
+endif()
diff --git a/boards/nxp/rd_rw612_bga/Kconfig b/boards/nxp/rd_rw612_bga/Kconfig
new file mode 100644
index 0000000000000..89e6c3a3f49ae
--- /dev/null
+++ b/boards/nxp/rd_rw612_bga/Kconfig
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RD_RW612_BGA
+	select BOARD_EARLY_INIT_HOOK
diff --git a/boards/nxp/rd_rw612_bga/Kconfig.defconfig b/boards/nxp/rd_rw612_bga/Kconfig.defconfig
index a0a6022de038c..e78a9fea422ca 100644
--- a/boards/nxp/rd_rw612_bga/Kconfig.defconfig
+++ b/boards/nxp/rd_rw612_bga/Kconfig.defconfig
@@ -1,6 +1,6 @@
 # RD_RW612_BGA board
 
-# Copyright 2022-2024 NXP
+# Copyright 2022-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_RD_RW612_BGA
@@ -37,4 +37,11 @@ config NET_L2_ETHERNET
 
 endif # DT_HAS_NXP_ENET_MAC_ENABLED && NETWORKING
 
+if COUNTER_MCUX_LPC_RTC_1HZ
+
+config XTAL32K
+	default y
+
+endif # COUNTER_MCUX_LPC_RTC_1HZ
+
 endif # BOARD_RD_RW612_BGA
diff --git a/boards/nxp/rd_rw612_bga/doc/index.rst b/boards/nxp/rd_rw612_bga/doc/index.rst
index 340dcccbd01b2..a755399e37eb0 100644
--- a/boards/nxp/rd_rw612_bga/doc/index.rst
+++ b/boards/nxp/rd_rw612_bga/doc/index.rst
@@ -23,65 +23,11 @@ Hardware
 Supported Features
 ==================
 
-+-----------+------------+-----------------------------------+
-| Interface | Controller | Driver/Component                  |
-+===========+============+===================================+
-| NVIC      | on-chip    | nested vector interrupt controller|
-+-----------+------------+-----------------------------------+
-| SYSTICK   | on-chip    | systick                           |
-+-----------+------------+-----------------------------------+
-| MCI_IOMUX | on-chip    | pinmux                            |
-+-----------+------------+-----------------------------------+
-| GPIO      | on-chip    | gpio                              |
-+-----------+------------+-----------------------------------+
-| USART     | on-chip    | serial                            |
-+-----------+------------+-----------------------------------+
-| DMA       | on-chip    | dma                               |
-+-----------+------------+-----------------------------------+
-| SPI       | on-chip    | spi                               |
-+-----------+------------+-----------------------------------+
-| I2C       | on-chip    | i2c                               |
-+-----------+------------+-----------------------------------+
-| FLEXSPI   | on-chip    | flash/memc                        |
-+-----------+------------+-----------------------------------+
-| TRNG      | on-chip    | entropy                           |
-+-----------+------------+-----------------------------------+
-| DMIC      | on-chip    | dmic                              |
-+-----------+------------+-----------------------------------+
-| LCDIC     | on-chip    | mipi-dbi                          |
-+-----------+------------+-----------------------------------+
-| WWDT      | on-chip    | watchdog                          |
-+-----------+------------+-----------------------------------+
-| USBOTG    | on-chip    | usb                               |
-+-----------+------------+-----------------------------------+
-| CTIMER    | on-chip    | counter                           |
-+-----------+------------+-----------------------------------+
-| SCTIMER   | on-chip    | pwm                               |
-+-----------+------------+-----------------------------------+
-| MRT       | on-chip    | counter                           |
-+-----------+------------+-----------------------------------+
-| OS_TIMER  | on-chip    | os timer                          |
-+-----------+------------+-----------------------------------+
-| PM        | on-chip    | power management; uses SoC Power  |
-|           |            | Modes 1 and 2                     |
-+-----------+------------+-----------------------------------+
-| BLE       | on-chip    | Bluetooth                         |
-+-----------+------------+-----------------------------------+
-| ADC       | on-chip    | adc                               |
-+-----------+------------+-----------------------------------+
-| DAC       | on-chip    | dac                               |
-+-----------+------------+-----------------------------------+
-| ENET      | on-chip    | ethernet                          |
-+-----------+------------+-----------------------------------+
-| Wi-Fi     | on-chip    | Wi-Fi                             |
-+-----------+------------+-----------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-   :zephyr_file:`boards/nxp/rd_rw612_bga/rd_rw612_bga_defconfig/`
-
-Other hardware features are not currently supported
+.. zephyr:board-supported-hw::
 
+.. note::
+
+   Power modes 1, 2 and 3 are supported when using System Power Management.
 
 Display Support
 ***************
@@ -148,6 +94,8 @@ achieved by running the following command:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -257,6 +205,9 @@ Remove resistors:
 
 Then, build for the board target ``rd_rw612_bga//ethernet``.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 Resources
 *********
 
diff --git a/boards/nxp/rd_rw612_bga/dts/goworld_16880_lcm.overlay b/boards/nxp/rd_rw612_bga/dts/goworld_16880_lcm.overlay
index 658778d373bce..9ee80d035289e 100644
--- a/boards/nxp/rd_rw612_bga/dts/goworld_16880_lcm.overlay
+++ b/boards/nxp/rd_rw612_bga/dts/goworld_16880_lcm.overlay
@@ -89,6 +89,6 @@
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		reset-gpios = <&hsgpio0 15 GPIO_ACTIVE_LOW>;
-		int-gpios = <&hsgpio0 11 GPIO_ACTIVE_HIGH>;
+		int-gpios = <&hsgpio0 11 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/boards/nxp/rd_rw612_bga/init.c b/boards/nxp/rd_rw612_bga/init.c
new file mode 100644
index 0000000000000..d3b8459495df4
--- /dev/null
+++ b/boards/nxp/rd_rw612_bga/init.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2022, 2024-25 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/pm/pm.h>
+#include <fsl_power.h>
+#include <fsl_common.h>
+
+static void rdrw61x_power_init_config(void)
+{
+	power_init_config_t initCfg = {
+		/* VCORE AVDD18 supplied from iBuck on RD board. */
+		.iBuck = true,
+		/* CAU_SOC_SLP_REF_CLK is needed for LPOSC. */
+		.gateCauRefClk = false,
+	};
+
+	POWER_InitPowerConfig(&initCfg);
+}
+
+#if CONFIG_PM
+static void rdrw61x_pm_state_exit(enum pm_state state)
+{
+	switch (state) {
+	case PM_STATE_STANDBY:
+		rdrw61x_power_init_config();
+		break;
+	default:
+		break;
+	}
+}
+#endif
+
+void board_early_init_hook(void)
+{
+	rdrw61x_power_init_config();
+
+#if CONFIG_PM
+	static struct pm_notifier rdrw61x_pm_notifier = {
+		.state_exit = rdrw61x_pm_state_exit,
+	};
+
+	pm_notifier_register(&rdrw61x_pm_notifier);
+#endif
+
+#ifdef CONFIG_I2S_TEST_SEPARATE_DEVICES
+	/*
+	 * Eventually this code should not be here
+	 * but should be configured by some SYSCTL node
+	 */
+
+	/* Set shared signal set 0 SCK, WS from Transmit I2S - Flexcomm1 */
+	SYSCTL1->SHAREDCTRLSET[0] = SYSCTL1_SHAREDCTRLSET_SHAREDSCKSEL(1) |
+				SYSCTL1_SHAREDCTRLSET_SHAREDWSSEL(1);
+
+	/* Select Data in from Transmit I2S - Flexcomm 1 */
+	SYSCTL1->SHAREDCTRLSET[0] |= SYSCTL1_SHAREDCTRLSET_SHAREDDATASEL(1);
+	/* Enable Transmit I2S - Flexcomm 1 for Shared Data Out */
+	SYSCTL1->SHAREDCTRLSET[0] |= SYSCTL1_SHAREDCTRLSET_FC1DATAOUTEN(1);
+
+	/* Set Receive I2S - Flexcomm 0 SCK, WS from shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[0] = SYSCTL1_FCCTRLSEL_SCKINSEL(1) |
+				SYSCTL1_FCCTRLSEL_WSINSEL(1);
+
+	/* Set Transmit I2S - Flexcomm 1 SCK, WS from shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[1] = SYSCTL1_FCCTRLSEL_SCKINSEL(1) |
+				SYSCTL1_FCCTRLSEL_WSINSEL(1);
+
+	/* Select Receive I2S - Flexcomm 0 Data in from shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[0] |= SYSCTL1_FCCTRLSEL_DATAINSEL(1);
+	/* Select Transmit I2S - Flexcomm 1 Data out to shared signal set 0 */
+	SYSCTL1->FCCTRLSEL[1] |= SYSCTL1_FCCTRLSEL_DATAOUTSEL(1);
+#endif /* CONFIG_I2S_TEST_SEPARATE_DEVICES */
+}
diff --git a/boards/nxp/rd_rw612_bga/rd_rw612_bga-pinctrl.dtsi b/boards/nxp/rd_rw612_bga/rd_rw612_bga-pinctrl.dtsi
index a82b286091a95..c98853fa49950 100644
--- a/boards/nxp/rd_rw612_bga/rd_rw612_bga-pinctrl.dtsi
+++ b/boards/nxp/rd_rw612_bga/rd_rw612_bga-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 NXP
+ * Copyright 2022-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -119,4 +119,11 @@
 			slew-rate = "normal";
 		};
 	};
+
+	pinmux_flexcomm1_i2s: pinmux_flexcomm1_i2s {
+		group0 {
+			pinmux = <IO_MUX_FC1_I2S>;
+			slew-rate = "normal";
+		};
+	};
 };
diff --git a/boards/nxp/rd_rw612_bga/rd_rw612_bga.dtsi b/boards/nxp/rd_rw612_bga/rd_rw612_bga.dtsi
index 8d8bd71cd61ae..4c050c63d91e5 100644
--- a/boards/nxp/rd_rw612_bga/rd_rw612_bga.dtsi
+++ b/boards/nxp/rd_rw612_bga/rd_rw612_bga.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 NXP
+ * Copyright 2022-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -270,6 +270,12 @@ nxp_8080_touch_panel_i2c: &arduino_i2c {
 	pinctrl-names = "default";
 };
 
+/* RTC is the wakeup source for PM modes 3,4 */
+&rtc_highres {
+	status = "okay";
+	wakeup-source;
+};
+
 &pmu {
 	reset-causes-en = <PMU_RESET_CM33_LOCKUP>,
 			  <PMU_RESET_ITRC>,
@@ -288,6 +294,7 @@ nxp_8080_touch_panel_i2c: &arduino_i2c {
 &os_timer {
 	status = "okay";
 	wakeup-source;
+	deep-sleep-counter = <&rtc_highres>;
 };
 
 &systick {
diff --git a/boards/nxp/rd_rw612_bga/rd_rw612_bga.yaml b/boards/nxp/rd_rw612_bga/rd_rw612_bga.yaml
index 6f319e7215d88..7e3402f7fc8a4 100644
--- a/boards/nxp/rd_rw612_bga/rd_rw612_bga.yaml
+++ b/boards/nxp/rd_rw612_bga/rd_rw612_bga.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright 2022-2024 NXP
+# Copyright 2022-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -24,6 +24,7 @@ supported:
   - gpio
   - hwinfo
   - i2c
+  - i2s
   - pwm
   - spi
   - usb_device
diff --git a/boards/nxp/rddrone_fmuk66/doc/index.rst b/boards/nxp/rddrone_fmuk66/doc/index.rst
index f83f310974b51..2e8c4c3a62b1a 100644
--- a/boards/nxp/rddrone_fmuk66/doc/index.rst
+++ b/boards/nxp/rddrone_fmuk66/doc/index.rst
@@ -36,51 +36,7 @@ For more information about the K64F SoC and FRDM-K64F board:
 Supported Features
 ==================
 
-The rddrone-fmuk66 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/rddrone_fmuk66/rddrone_fmuk66_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -105,6 +61,8 @@ Only USB device function is supported in Zephyr at the moment.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -170,6 +128,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v2.7.0 *****
    Hello World! rddrone-fmuk66
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _RDDRONE-FMUK66 Website:
 
 https://www.nxp.com/design/designs/px4-robotic-drone-vehicle-flight-management-unit-vmu-fmu-rddrone-fmuk66:RDDRONE-FMUK66
diff --git a/boards/nxp/s32z2xxdc2/doc/index.rst b/boards/nxp/s32z2xxdc2/doc/index.rst
index db6b713f47c24..6383dc8ad32a8 100644
--- a/boards/nxp/s32z2xxdc2/doc/index.rst
+++ b/boards/nxp/s32z2xxdc2/doc/index.rst
@@ -21,51 +21,7 @@ Information about the hardware and design resources can be found at
 Supported Features
 ==================
 
-The boards support the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| Arm GIC   | on-chip    | interrupt_controller                |
-+-----------+------------+-------------------------------------+
-| Arm Timer | on-chip    | timer                               |
-+-----------+------------+-------------------------------------+
-| LINFlexD  | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| MRU       | on-chip    | mbox                                |
-+-----------+------------+-------------------------------------+
-| NETC      | on-chip    | ethernet                            |
-|           |            |                                     |
-|           |            | mdio                                |
-+-----------+------------+-------------------------------------+
-| SIUL2     | on-chip    | pinctrl                             |
-|           |            |                                     |
-|           |            | gpio                                |
-|           |            |                                     |
-|           |            | external interrupt controller       |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| SWT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| CANEXCEL  | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| FLEXCAN   | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| SAR_ADC   | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| LPI2C     | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| EDMA      | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| DSPI      | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| eMIOS     | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| QSPI      | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -183,6 +139,8 @@ port A1. This board configuration selects it as the default flash controller.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``s32z2xxdc2`` boards can be built in the usual way as
 documented in :ref:`build_an_application`.
 
@@ -242,13 +200,11 @@ the terminal:
 
    Hello World! s32z2xxdc2
 
-To debug with Lauterbach TRACE32 softare run instead:
+To debug with Lauterbach TRACE32 software run instead:
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: s32z2xxdc2/s32z270/rtu0
-   :goals: build debug -r trace32
-   :compact:
+.. code-block:: console
+
+   west debug -r trace32
 
 Flashing
 ========
@@ -261,7 +217,8 @@ SRAM and run.
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
    :board: s32z2xxdc2/s32z270/rtu0
-   :goals: build flash -r trace32
+   :goals: build flash
+   :flash-args: -r trace32
    :compact:
 
 .. note::
@@ -273,11 +230,9 @@ SRAM and run.
 To imitate a similar behavior using NXP S32 Debug Probe runner, you can run the
 ``debug`` command with GDB in batch mode:
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: s32z2xxdc2/s32z270/rtu0
-   :goals: build debug --tool-opt='--batch'
-   :compact:
+.. code-block:: console
+
+   west debug --tool-opt='--batch'
 
 RTU and Core Configuration
 ==========================
@@ -334,11 +289,14 @@ line:
 
 .. code-block:: console
 
-   west debug --startup-args elfFile=<elf_path> rtu=<rtu_id> core=<core_id> lockstep=<yes/no>
+   west debug -r trace32 --startup-args elfFile=<elf_path> rtu=<rtu_id> core=<core_id> lockstep=<yes/no>
 
 Where ``<elf_path>`` is the path to the Zephyr application ELF in the output
 directory.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/nxp/twr_ke18f/doc/index.rst b/boards/nxp/twr_ke18f/doc/index.rst
index 5bdf3dcf51e88..87c412cad2813 100644
--- a/boards/nxp/twr_ke18f/doc/index.rst
+++ b/boards/nxp/twr_ke18f/doc/index.rst
@@ -37,52 +37,7 @@ these NXP reference documents:
 Supported Features
 ==================
 
-The twr_ke18f board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| I2C(M)    | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | trigger supported with H/W mods     |
-|           |            | explained below;                    |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | sensor                              |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/twr_ke18f/twr_ke18f_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -124,6 +79,8 @@ Finally, a trigger option must be enabled in Kconfig (either
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -217,6 +174,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-xxx-gxxxxxxxxxxxx *****
    Hello World! twr_ke18f
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _TWR-KE18F Website:
    https://www.nxp.com/TWR-KE18F
 
diff --git a/boards/nxp/twr_kv58f220m/doc/index.rst b/boards/nxp/twr_kv58f220m/doc/index.rst
index 69b5add3505f8..7c8b9e66865e9 100644
--- a/boards/nxp/twr_kv58f220m/doc/index.rst
+++ b/boards/nxp/twr_kv58f220m/doc/index.rst
@@ -34,39 +34,7 @@ these NXP reference documents:
 Supported Features
 ==================
 
-The twr_kv58f220m board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | fxos8700 trigger                    |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/nxp/twr_kv58f220m/twr_kv58f220m_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -95,6 +63,8 @@ the jumpers ``J2`` and ``J9``. A trigger option also must be enabled in Kconfig
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -172,6 +142,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-xxx-gxxxxxxxxxxxx *****
    Hello World! twr_kv58f220m
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _TWR-KV58F220M Website:
    https://www.nxp.com/TWR-KV58F220M
 
diff --git a/boards/nxp/ucans32k1sic/doc/index.rst b/boards/nxp/ucans32k1sic/doc/index.rst
index 8468d46669bb0..dec3549ba58d1 100644
--- a/boards/nxp/ucans32k1sic/doc/index.rst
+++ b/boards/nxp/ucans32k1sic/doc/index.rst
@@ -31,26 +31,7 @@ More information about the hardware and design resources can be found at
 Supported Features
 ==================
 
-The ``ucans32k1sic`` board configuration supports the following hardware features:
-
-============  ==========  ================================
-Interface     Controller  Driver/Component
-============  ==========  ================================
-SYSMPU        on-chip     mpu
-PORT          on-chip     pinctrl
-GPIO          on-chip     gpio
-LPUART        on-chip     serial
-LPI2C         on-chip     i2c
-LPSPI         on-chip     spi
-FTM           on-chip     pwm
-FlexCAN       on-chip     can
-Watchdog      on-chip     watchdog
-RTC           on-chip     counter
-ADC           on-chip     adc
-============  ==========  ================================
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/nxp/ucans32k1sic/ucans32k1sic_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -124,6 +105,8 @@ The Arm Cortex-M4F core is configured to run at 80 MHz (RUN mode).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ucans32k1sic`` board can be built in the usual way as
 documented in :ref:`build_an_application`.
 
@@ -173,6 +156,9 @@ Run the ``west debug`` command to start a GDB session using SEGGER J-Link.
 Alternatively, run ``west debug -r trace32`` to launch the Lauterbach TRACE32
 software debugging interface.
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/nxp/usb_kw24d512/doc/index.rst b/boards/nxp/usb_kw24d512/doc/index.rst
index 4706d94cc0d23..b08d14da8e4e0 100644
--- a/boards/nxp/usb_kw24d512/doc/index.rst
+++ b/boards/nxp/usb_kw24d512/doc/index.rst
@@ -33,42 +33,7 @@ For more information about the KW2xD SiP and USB-KW24D512 board:
 Supported Features
 ==================
 
-The USB-KW24D512 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| RNGA      | on-chip    | entropy;                            |
-|           |            | random                              |
-+-----------+------------+-------------------------------------+
-| FTFL      | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/usb_kw24d512/usb_kw24d512_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -129,6 +94,8 @@ can only be used in device mode.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -208,6 +175,9 @@ you should see the following message in the terminal:
    ***** Booting Zephyr OS v1.14.0-rc1 *****
    Hello World! usb_kw24d512
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _USB-KW24D512 Website:
    https://www.nxp.com/products/processors-and-microcontrollers/arm-based-processors-and-mcus/kinetis-cortex-m-mcus/w-serieswireless-conn.m0-plus-m4/ieee-802.15.4-packet-sniffer-usb-dongle-form-factor:USB-KW24D512
 
diff --git a/boards/nxp/vmu_rt1170/CMakeLists.txt b/boards/nxp/vmu_rt1170/CMakeLists.txt
index 2a12ecb361136..dc909c81c8113 100644
--- a/boards/nxp/vmu_rt1170/CMakeLists.txt
+++ b/boards/nxp/vmu_rt1170/CMakeLists.txt
@@ -7,7 +7,7 @@
 if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_library()
   set(RT1170_BOARD_DIR
-    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1170")
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/boards/evkmimxrt1170")
   if(CONFIG_BOOT_FLEXSPI_NOR)
     # Include flash configuration block for RT1170 EVK from NXP's HAL.
     # This configuration block may need modification if another flash chip is
diff --git a/boards/nxp/vmu_rt1170/Kconfig.defconfig b/boards/nxp/vmu_rt1170/Kconfig.defconfig
index 7c62ad7ecde84..35cd885fe664d 100644
--- a/boards/nxp/vmu_rt1170/Kconfig.defconfig
+++ b/boards/nxp/vmu_rt1170/Kconfig.defconfig
@@ -17,7 +17,7 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y if CPU_CORTEX_M7 # No cache memory support is required for driver
 
-config ETH_MCUX_RMII_EXT_CLK
+config ETH_NXP_ENET_RMII_EXT_CLK
 	default y
 
 endif # NETWORKING
diff --git a/boards/nxp/vmu_rt1170/doc/index.rst b/boards/nxp/vmu_rt1170/doc/index.rst
index 4b5d72f9ba9ba..30d627b6f8153 100644
--- a/boards/nxp/vmu_rt1170/doc/index.rst
+++ b/boards/nxp/vmu_rt1170/doc/index.rst
@@ -69,60 +69,9 @@ Supported Features
 ==================
 
 VMU-RT1170 is a "Vehicle Management Unit" based on the general i.MX RT1170
-family of processors. The VMU RT1170 board configuration supports the
-following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | flexcan                             |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | flexpwm, qtmr                       |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| GPT       | on-chip    | gpt                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| ENET      | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| SAI       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB Device                          |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique device serial number         |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | sensor                              |
-+-----------+------------+-------------------------------------+
-| CAAM RNG  | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| FLEXSPI   | on-chip    | flash programming                   |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/nxp/vmu_rt1170/vmu_rt1170_mimxrt1176_cm7_defconfig`
-
-Other hardware features are not currently supported by the port.
+family of processors.
+
+.. zephyr:board-supported-hw::
 
 Connections and I/Os
 ====================
@@ -469,6 +418,8 @@ The MIMXRT1170 SoC has 12 UARTs.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
@@ -532,6 +483,9 @@ should see the following message in the terminal:
    ***** Booting Zephyr OS v3.4.0-xxxx-xxxxxxxxxxxxx *****
    Hello World! vmu_rt1170
 
+.. include:: ../../common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _VMU RT1170 Schematics:
    https://github.com/CogniPilot/NXP-VMU_RT117x-HW
 
diff --git a/boards/oct/index.rst b/boards/oct/index.rst
new file mode 100644
index 0000000000000..6fe0a5434eb4b
--- /dev/null
+++ b/boards/oct/index.rst
@@ -0,0 +1,10 @@
+.. _boards-octavo:
+
+Octavo
+######
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/oct/osd32mp1_brk/Kconfig.defconfig b/boards/oct/osd32mp1_brk/Kconfig.defconfig
new file mode 100644
index 0000000000000..7ca8f045d0a44
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/Kconfig.defconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_OSD32MP1_BRK
+
+config SPI_STM32_INTERRUPT
+	default y
+	depends on SPI
+
+config CLOCK_STM32_HSE_CLOCK
+	default 24000000
+
+endif # BOARD_OSD32MP1_BRK
diff --git a/boards/oct/osd32mp1_brk/Kconfig.osd32mp1_brk b/boards/oct/osd32mp1_brk/Kconfig.osd32mp1_brk
new file mode 100644
index 0000000000000..3aeb8d038ad3e
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/Kconfig.osd32mp1_brk
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_OSD32MP1_BRK
+	select SOC_OSD32MP15X
diff --git a/boards/oct/osd32mp1_brk/board.cmake b/boards/oct/osd32mp1_brk/board.cmake
new file mode 100644
index 0000000000000..4ff51e763b6a4
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/board.cmake
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+
+board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd.cfg")
diff --git a/boards/oct/osd32mp1_brk/board.yml b/boards/oct/osd32mp1_brk/board.yml
new file mode 100644
index 0000000000000..b553a86737ecd
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: osd32mp1_brk
+  full_name: OSD32MP1-BRK
+  vendor: oct
+  socs:
+    - name: osd32mp15x
diff --git a/boards/oct/osd32mp1_brk/doc/img/osd32mp1_brk.webp b/boards/oct/osd32mp1_brk/doc/img/osd32mp1_brk.webp
new file mode 100644
index 0000000000000..3cbd534c79b3a
Binary files /dev/null and b/boards/oct/osd32mp1_brk/doc/img/osd32mp1_brk.webp differ
diff --git a/boards/oct/osd32mp1_brk/doc/osd32mp1_brk.rst b/boards/oct/osd32mp1_brk/doc/osd32mp1_brk.rst
new file mode 100644
index 0000000000000..f20a21d1740f6
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/doc/osd32mp1_brk.rst
@@ -0,0 +1,310 @@
+.. zephyr:board:: osd32mp1_brk
+
+Overview
+********
+
+The OSD32MP1-BRK development board by Octavo Systems integrates the OSD32MP15x
+System-in-Package (SiP), which contains a multicore STM32MP157F microprocessor.
+Zephyr OS is ported to run on the Cortex®-M4 core of the STM32MP157F.
+
+- Common features:
+
+  - OSD32MP15x SiP:
+
+    - STM32MP15x microprocessor:
+
+      - Dual-core Arm® Cortex®-A7 up to 800 MHz, 32 bits
+      - Cortex®-M4 up to 209 MHz, 32 bits
+      - Embedded SRAM (448 Kbytes) for Cortex®-M4.
+
+    - 512MB DDR3 memory
+    - STPMIC1A Power Management
+    - Integrated 4kB EEPROM
+    - MEMS oscillator
+    - Over 100 passive components
+
+  - Small form factor:
+
+    - Dimensions: 75 mm x 46 mm (3 in x 1.8 in)
+    - Breadboard-compatible with access to 106 I/Os via two 2x30 100-mil headers
+
+  - Built-in features:
+
+    - μUSB
+    - ST-Link header
+    - UART
+    - μSD card slot
+    - 32 kHz crystal
+    - User LEDs and reset button
+    - 4 Layer Design
+    - No Back Side Components
+
+For a detailed list of features, visit the `OSD32MP1-BRK product page`_.
+
+Hardware
+********
+
+The OSD32MP15x SiP in integration with the STM32MP17 SoC provides the following hardware capabilities:
+
+- Core:
+
+  - 32-bit dual-core Arm® Cortex®-A7
+
+    - L1 32-Kbyte I / 32-Kbyte D for each core
+    - 256-Kbyte unified level 2 cache
+    - Arm® NEON™ and Arm® TrustZone®
+
+  - 32-bit Arm® Cortex®-M4 with FPU/MPU
+
+    - Up to 209 MHz (Up to 703 CoreMark®)
+
+- Memories:
+
+  - 512 MB DDR3L memory (on SiP)
+  - 708 Kbytes of internal SRAM:
+
+    - 256 KB AXI SYSRAM
+    - 384 KB AHB SRAM
+    - 64 KB AHB SRAM in backup domain
+
+  - Dual mode Quad-SPI memory interface
+  - Flexible external memory controller with up to 16-bit data bus
+  - Integrated 4 KB EEPROM (on SiP)
+
+- Security/safety:
+
+  - Secure boot, TrustZone® peripherals with Cortex®-M4 resource isolation
+
+- Clock management:
+
+  - Internal oscillators:
+
+    - 64 MHz HSI oscillator
+    - 4 MHz CSI oscillator
+    - 32 kHz LSI oscillator
+
+  - External oscillators:
+
+    - 8-48 MHz HSE oscillator
+    - 32.768 kHz LSE oscillator
+
+  - 6 × PLLs with fractional mode
+  - MEMS oscillator (on SiP)
+
+- General-purpose input/outputs:
+
+  - Up to 176 I/O ports with interrupt capability
+  - 106 I/Os routed to expansion headers (on board)
+
+- Interconnect matrix
+
+- 3 DMA controllers
+
+- Communication peripherals:
+
+  - 6 × I2C FM+ (1 Mbit/s, SMBus/PMBus)
+  - 4 × UART + 4 × USART (12.5 Mbit/s, ISO7816 interface, LIN, IrDA, SPI slave)
+  - 6 × SPI (50 Mbit/s, including 3 with full duplex I2S audio class accuracy)
+  - 4 × SAI (stereo audio: I2S, PDM, SPDIF Tx)
+  - SPDIF Rx with 4 inputs
+  - HDMI-CEC interface
+  - MDIO Slave interface
+  - 3 × SDMMC up to 8-bit (SD / e•MMC™ / SDIO)
+  - 2 × CAN controllers supporting CAN FD protocol, TTCAN capability
+  - 2 × USB 2.0 high-speed Host+ 1 × USB 2.0 full-speed OTG simultaneously
+  - 10/100M or Gigabit Ethernet GMAC (IEEE 1588v2 hardware, MII/RMII/GMII/RGMI)
+  - 8- to 14-bit camera interface up to 140 Mbyte/s
+  - 6 analog peripherals
+  - 2 × ADCs with 16-bit max. resolution
+  - 1 × temperature sensor
+  - 2 × 12-bit D/A converters (1 MHz)
+  - 1 × digital filters for sigma delta modulator (DFSDM) with 8 channels/6
+    filters
+  - Internal or external ADC/DAC reference VREF+
+
+- Graphics:
+
+  - 3D GPU: Vivante® - OpenGL® ES 2.0
+  - LCD-TFT controller, up to 24-bit // RGB888, up to WXGA (1366 × 768) @60 fps
+  - MIPI® DSI 2 data lanes up to 1 GHz each
+
+- Timers:
+
+  - 2 × 32-bit timers with up to 4 IC/OC/PWM or pulse counter and quadrature
+    (incremental) encoder input
+  - 2 × 16-bit advanced motor control timers
+  - 10 × 16-bit general-purpose timers (including 2 basic timers without PWM)
+  - 5 × 16-bit low-power timers
+  - RTC with sub-second accuracy and hardware calendar
+  - 2 × 4 Cortex®-A7 system timers (secure, non-secure, virtual, hypervisor)
+  - 1 × SysTick Cortex®-M4 timer
+
+- Hardware acceleration:
+
+  - AES 128, 192, 256, TDES
+  - HASH (MD5, SHA-1, SHA224, SHA256), HMAC
+  - 2 × true random number generator (3 oscillators each)
+  - 2 × CRC calculation unit
+
+- Debug mode:
+
+  - Arm® CoreSight™ trace and debug: SWD and JTAG interfaces
+  - 8-Kbyte embedded trace buffer
+  - 3072-bit fuses including 96-bit unique ID, up to 1184-bit available for user
+
+More information about the hardware can be found here:
+
+- `STM32MP157F on www.st.com`_
+- `OSD32MP15x SiP documentation`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+OSD32MP1-BRK Board schematic is available here:
+`OSD32MP1-BRK schematics`_.
+
+OSD32MP1-BRK Board pin mapping is available here:
+`OSD32MP1-BRK default pin mapping`_.
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+
+- UART7 TX/RX: PA15/PB3 (default console)
+- I2C5 SCL/SDA: PA11/PA12
+- SPI4 SCK/MISO/MOSI: PE12/PE13/PE14
+
+System Clock
+------------
+
+The Cortex®-M4 Core is configured to run at a 209 MHz clock speed.
+This value must match the configured mlhclk_ck frequency.
+
+Serial Port
+-----------
+
+The Zephyr console output is assigned by default to the RAM console to be dumped
+by the Linux Remoteproc Framework on Cortex®-A7 core. To enable the USART2 console, modify
+the board's devicetree and the osd32mp1_brk_defconfig board file (or prj.conf project files)
+Default USART settings are 115200 8N1.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+The STM32MP157F doesn't have QSPI flash for Cortex®-M4 and it needs to be
+started by the Cortex®-A7 core. The Cortex®-A7 core is responsible for loading the
+Cortex®-M4 binary application into the RAM, and getting Cortex®-M4 out of reset.
+Cortex®-A7 can perform these steps at bootloader level or after the Linux
+system has booted.
+
+Cortex®-M4 can use up to 2 different RAMs. The program pointer starts at
+the 0x00000000 (RETRAM) address, and the vector table should be loaded at this address.
+The following table provides memory mappings for Cortex®-A7 and Cortex®-M4:
+
++------------+-----------------------+------------------------+----------------+
+| Region     | Cortex®-A7            | Cortex®-M4             | Size           |
++============+=======================+========================+================+
+| RETRAM     | 0x38000000-0x3800FFFF | 0x00000000-0x0000FFFF  | 64KB           |
++------------+-----------------------+------------------------+----------------+
+| MCUSRAM    | 0x10000000-0x1005FFFF | 0x10000000-0x1005FFFF  | 384KB          |
++------------+-----------------------+------------------------+----------------+
+| DDR        | 0xC0000000-0x20000000 |                        | 512MB          |
++------------+-----------------------+------------------------+----------------+
+
+Refer to following instructions to boot Zephyr on the Cortex®-M4 core:
+
+1. Download and install the Octavo OpenSTLinux distribution:
+   `OSD32MP1 OpenSTLinux`_.
+
+   (You can find more details about this process here: `OSD32MP1-BRK Getting Started`_)
+
+2. Build the Zephyr application:
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/hello_world
+      :board: osd32mp1_brk
+      :goals: build
+
+3. Transfer the built firmware to the board via USB RNDIS:
+
+   .. code-block:: console
+
+      scp build/zephyr/zephyr.elf root@192.168.7.1:/lib/firmware
+
+4. Boot Zephyr on the Cortex®-M4 core:
+
+   .. code-block:: console
+
+      ssh root@192.168.7.1
+      echo stop > /sys/class/remoteproc/remoteproc0/state
+      echo -n zephyr.elf > /sys/class/remoteproc/remoteproc0/firmware
+      echo start > /sys/class/remoteproc/remoteproc0/state
+      cat /sys/kernel/debug/remoteproc/remoteproc0/trace0
+
+   The console output should display:
+
+   .. code-block::
+
+      *** Booting Zephyr OS build v4.0.0 ***
+      Hello World! osd32mp1_brk/osd32mp15x
+
+
+Refer to `OSD32MP1-BRK Getting Started`_ and `stm32mp157 boot Cortex-M4 firmware`_ wiki page for more
+detailed instructions.
+
+Debugging
+=========
+
+You can debug an application using OpenOCD and GDB. The solution proposed below
+is based on attaching to preloaded firmware, which is available only for a Linux
+environment. The firmware must first be loaded by the Cortex®-A7. The developer
+then attaches the debugger to the running Zephyr using OpenOCD.
+
+The principle is to attach to the firmware already loaded by Linux.
+
+- Build the sample:
+
+  .. zephyr-app-commands::
+     :zephyr-app: samples/hello_world
+     :board: osd32mp1_brk
+     :goals: build
+
+- Copy the firmware on the target filesystem, load it and start it (`stm32mp157 boot Cortex-M4 firmware`_).
+- Attach to the target:
+
+  .. code-block:: console
+
+    west attach
+
+.. _OSD32MP1-BRK product page:
+   https://octavosystems.com/octavo_products/osd32mp1-brk/
+
+.. _OSD32MP1-BRK documentation:
+   https://octavosystems.com/docs/osd32mp15x-datasheet/
+
+.. _STM32MP157F on www.st.com:
+   https://www.st.com/en/microcontrollers-microprocessors/stm32mp157f.html
+
+.. _OSD32MP15x SiP documentation:
+   https://octavosystems.com/docs/osd32mp15x-datasheet/
+
+.. _OSD32MP1 OpenSTLinux:
+   https://octavosystems.com/files/osd32mp1-brk-openstlinux-v3-0/
+
+.. _OSD32MP1-BRK Getting Started:
+    https://octavosystems.com/app_notes/osd32mp1-brk-getting-started/
+
+.. _stm32mp157 boot Cortex-M4 firmware:
+   https://wiki.st.com/stm32mpu/index.php/Linux_remoteproc_framework_overview#How_to_use_the_framework
+
+.. _OSD32MP1-BRK schematics:
+   https://octavosystems.com/docs/osd32mp1-brk-schematics/
+
+.. _OSD32MP1-BRK default pin mapping:
+   https://octavosystems.com/octavosystems.com/wp-content/uploads/2020/05/Default-Pin-Mapping.pdf
diff --git a/boards/oct/osd32mp1_brk/osd32mp1_brk.dts b/boards/oct/osd32mp1_brk/osd32mp1_brk.dts
new file mode 100644
index 0000000000000..0ba685ec39833
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/osd32mp1_brk.dts
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <oct/osd32mp15x.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Octavo Systems OSD32MP1-BRK";
+	compatible = "oct,osd32mp1-brk";
+	chosen {
+		/*
+		 * By default, Zephyr console and shell are assigned to
+		 * remoteproc. To enable console and shell over UART, uncomment
+		 * following lines and set the correct config in
+		 * osd32mp1_brk_defconfig "Serial Port" section in Zephyr
+		 * board documentation.
+		 * zephyr,console = &usart2;
+		 * zephyr,shell-uart = &usart2;
+		 */
+		zephyr,flash = &retram;
+		zephyr,sram = &mcusram;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		green_led_2: led_1 {
+			label = "LED2_GRN";
+			gpios = <&gpioi 9 GPIO_ACTIVE_HIGH>;
+			status = "okay";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		user_button: button {
+			label = "User 1";
+			gpios = <&gpioa 14 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	aliases {
+		led0 = &green_led_2;
+		sw0 = &user_button;
+	};
+};
+
+&spi4_miso_pe13 {
+	slew-rate = "very-high-speed";
+};
+
+&usart2 {
+	pinctrl-0 = <&usart2_tx_pf5 &usart2_rx_pf4>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&uart7 {
+	pinctrl-0 = <&uart7_tx_pa15 &uart7_rx_pb3>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&i2c5 {
+	pinctrl-0 = <&i2c5_scl_pd1 &i2c5_sda_pd0>;
+	pinctrl-names = "default";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+};
+
+&uart7_tx_pa15 {
+	bias-disable;
+};
+
+&uart7_rx_pb3 {
+	bias-disable;
+};
+
+&usart2_tx_pf5 {
+	bias-disable;
+};
+
+&usart2_rx_pf4 {
+	bias-disable;
+};
diff --git a/boards/oct/osd32mp1_brk/osd32mp1_brk.yaml b/boards/oct/osd32mp1_brk/osd32mp1_brk.yaml
new file mode 100644
index 0000000000000..b9d5e0ab7e1f7
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/osd32mp1_brk.yaml
@@ -0,0 +1,22 @@
+identifier: osd32mp1_brk
+name: OSD32MP1-BRK
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - shell
+testing:
+  ignore_tags:
+    - cmsis_rtos_v2
+    - net
+    - mpu
+    - crypto
+    - aes
+    - cmm
+    - LED
+    - nfc
+ram: 256
+flash: 64
+vendor: oct
diff --git a/boards/oct/osd32mp1_brk/osd32mp1_brk_defconfig b/boards/oct/osd32mp1_brk/osd32mp1_brk_defconfig
new file mode 100644
index 0000000000000..755f96c194836
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/osd32mp1_brk_defconfig
@@ -0,0 +1,20 @@
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable UART driver
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Console (remote proc console by default)
+CONFIG_CONSOLE=y
+CONFIG_RAM_CONSOLE=y
+CONFIG_RAM_CONSOLE_BUFFER_SIZE=1024
+
+# UART console (overrides remote proc console)
+CONFIG_UART_CONSOLE=n
diff --git a/boards/oct/osd32mp1_brk/support/openocd.cfg b/boards/oct/osd32mp1_brk/support/openocd.cfg
new file mode 100644
index 0000000000000..c9f1013c691f6
--- /dev/null
+++ b/boards/oct/osd32mp1_brk/support/openocd.cfg
@@ -0,0 +1,6 @@
+source [find board/stm32mp15x_dk2.cfg]
+
+# By default the port 3333 is assigned for the Cortex-A debug. Disable them
+stm32mp15x.cpu0 configure -gdb-port disabled
+stm32mp15x.cpu1 configure -gdb-port disabled
+targets stm32mp15x.cm4
diff --git a/boards/olimex/lora_stm32wl_devkit/doc/olimex_lora_stm32wl_devkit.rst b/boards/olimex/lora_stm32wl_devkit/doc/olimex_lora_stm32wl_devkit.rst
index 1755c3cdc721e..197e940c3f23c 100644
--- a/boards/olimex/lora_stm32wl_devkit/doc/olimex_lora_stm32wl_devkit.rst
+++ b/boards/olimex/lora_stm32wl_devkit/doc/olimex_lora_stm32wl_devkit.rst
@@ -34,52 +34,13 @@ More information about the board and the module can be found here:
 Supported Features
 ==================
 
-The Zephyr Olimex LoRa STM32WL Dev Kit configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| MPU       | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | LoRa                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in:
-
-- :zephyr_file:`boards/olimex/lora_stm32wl_devkit/olimex_lora_stm32wl_devkit_defconfig`
-- :zephyr_file:`boards/olimex/lora_stm32wl_devkit/olimex_lora_stm32wl_devkit.dts`
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``olimex_lora_stm32wl_devkit`` board configuration can be built the
 usual way (see :ref:`build_an_application`).
 
diff --git a/boards/olimex/olimex_esp32_evb/doc/index.rst b/boards/olimex/olimex_esp32_evb/doc/index.rst
index 880e3933ab973..1f5ca0033fb30 100644
--- a/boards/olimex/olimex_esp32_evb/doc/index.rst
+++ b/boards/olimex/olimex_esp32_evb/doc/index.rst
@@ -41,46 +41,7 @@ these reference documents:
 Supported Features
 ******************
 
-The olimex_esp32_evb board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| EFUSE     | on-chip    | hwinfo, device ID                   |
-+-----------+------------+-------------------------------------+
-| FLASH     | module     | External flash                      |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | I2C                                 |
-+-----------+------------+-------------------------------------+
-| INTERRUPT | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| IO_MUX    | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| TIMG      | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| TWAI      | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | uart                                |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| WiFi      | on-chip    | WiFi                                |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/olimex/olimex_esp32_evb/olimex_esp32_evb_appcpu_defconfig`
-and
-:zephyr_file:`boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu_defconfig`
-
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -102,6 +63,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.dts b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.dts
index c39916c6de622..729a6e83a0b46 100644
--- a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.dts
+++ b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.dts
@@ -131,3 +131,7 @@ uext_spi: &spi2 {};
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/olimex/olimexino_stm32/doc/index.rst b/boards/olimex/olimexino_stm32/doc/index.rst
index af42d6b0ac189..76a4466ff1c51 100644
--- a/boards/olimex/olimexino_stm32/doc/index.rst
+++ b/boards/olimex/olimexino_stm32/doc/index.rst
@@ -14,33 +14,7 @@ information and the datasheet.
 Supported Features
 ==================
 
-The olimexino_stm32 board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------+
-| Interface | Controller | Driver/Component        |
-+===========+============+=========================+
-| NVIC      | on-chip    | nested vectored         |
-|           |            | interrupt controller    |
-+-----------+------------+-------------------------+
-| SYSTICK   | on-chip    | system clock            |
-+-----------+------------+-------------------------+
-| UART      | on-chip    | serial port             |
-+-----------+------------+-------------------------+
-| GPIO      | on-chip    | gpio                    |
-+-----------+------------+-------------------------+
-| I2C       | on-chip    | i2c                     |
-+-----------+------------+-------------------------+
-| SPI       | on-chip    | spi                     |
-+-----------+------------+-------------------------+
-| USB       | on-chip    | USB device              |
-+-----------+------------+-------------------------+
-| WATCHDOG  | on-chip    | independent watchdog    |
-+-----------+------------+-------------------------+
-| CAN       | on-chip    | Controller Area Network |
-+-----------+------------+-------------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -377,6 +351,8 @@ The default jumper settings for the OLIMEXIMO-STM32E are:
 Flashing Zephyr onto OLIMEXINO-STM32
 ************************************
 
+.. zephyr:board-supported-runners::
+
 Flashing the Zephyr kernel onto OLIMEXINO-STM32 requires the
 `stm32flash tool`_.
 
diff --git a/boards/olimex/stm32_e407/doc/index.rst b/boards/olimex/stm32_e407/doc/index.rst
index 98a698b3c1476..84bd6c1673eb1 100644
--- a/boards/olimex/stm32_e407/doc/index.rst
+++ b/boards/olimex/stm32_e407/doc/index.rst
@@ -17,27 +17,7 @@ information and the datasheet.
 Supported Features
 ==================
 
-The olimex_stm32_e407 board configuration supports the following
-hardware features:
-
-+------------+------------+----------------------+
-| Interface  | Controller | Driver/Component     |
-+============+============+======================+
-| NVIC       | on-chip    | nested vectored      |
-|            |            | interrupt controller |
-+------------+------------+----------------------+
-| SYSTICK    | on-chip    | system clock         |
-+------------+------------+----------------------+
-| UART       | on-chip    | serial port          |
-+------------+------------+----------------------+
-| GPIO       | on-chip    | gpio                 |
-+------------+------------+----------------------+
-| USB OTG FS | on-chip    | USB device           |
-+------------+------------+----------------------+
-| USB OTG HS | on-chip    | USB device           |
-+------------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -312,6 +292,9 @@ which can be set as high as 168 MHz.
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 The OLIMEX-STM32-E407 board does not include an embedded debug tool
 interface. You will need to use ST tools or an external JTAG probe.
 In the following examples a ST-Link V2 USB dongle is used.
diff --git a/boards/olimex/stm32_e407/olimex_stm32_e407.dts b/boards/olimex/stm32_e407/olimex_stm32_e407.dts
index 728380da88de1..897370a31f9c3 100644
--- a/boards/olimex/stm32_e407/olimex_stm32_e407.dts
+++ b/boards/olimex/stm32_e407/olimex_stm32_e407.dts
@@ -116,15 +116,26 @@ zephyr_udc0: &usbotg_hs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_col_pa3
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pg14>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
diff --git a/boards/olimex/stm32_h103/doc/index.rst b/boards/olimex/stm32_h103/doc/index.rst
index 3055207f476c7..fc5c9f4dcfa02 100644
--- a/boards/olimex/stm32_h103/doc/index.rst
+++ b/boards/olimex/stm32_h103/doc/index.rst
@@ -20,32 +20,7 @@ information and the datasheet.
 Supported Features
 ==================
 
-The OLIMEX STM32-H103 supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| USB       | on-chip    | USB device           |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -181,6 +156,8 @@ EXTENSION 2
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 This board does not include any embedded debug tool interface, instead you
 will have to use an external probe connected to the available 20-pin JTAG
 connector to program and debug the board. Both JTAG and SWD are supported.
diff --git a/boards/olimex/stm32_h405/doc/index.rst b/boards/olimex/stm32_h405/doc/index.rst
index 4d06e17c99173..22a35de4069af 100644
--- a/boards/olimex/stm32_h405/doc/index.rst
+++ b/boards/olimex/stm32_h405/doc/index.rst
@@ -17,32 +17,7 @@ information and the datasheet.
 Supported Features
 ==================
 
-The olimex_stm32_h405 board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------+
-| Interface | Controller | Driver/Component        |
-+===========+============+=========================+
-| NVIC      | on-chip    | nested vectored         |
-|           |            | interrupt controller    |
-+-----------+------------+-------------------------+
-| SYSTICK   | on-chip    | system clock            |
-+-----------+------------+-------------------------+
-| UART      | on-chip    | serial port             |
-+-----------+------------+-------------------------+
-| GPIO      | on-chip    | gpio                    |
-+-----------+------------+-------------------------+
-| USB       | on-chip    | USB device              |
-+-----------+------------+-------------------------+
-| WATCHDOG  | on-chip    | independent watchdog    |
-+-----------+------------+-------------------------+
-| COUNTER   | on-chip    | rtc                     |
-+-----------+------------+-------------------------+
-| RNG       | on-chip    | random number generator |
-+-----------+------------+-------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -149,6 +124,9 @@ which can be set as high as 168 MHz.
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 The OLIMEX-STM32-H405 board does not include an embedded debug tool
 interface. You will need to use ST tools or an external JTAG probe.
 In the following examples a ST-Link V2 USB dongle is used.
diff --git a/boards/olimex/stm32_h407/doc/index.rst b/boards/olimex/stm32_h407/doc/index.rst
index 13ad7db8ce34e..8005208930d18 100644
--- a/boards/olimex/stm32_h407/doc/index.rst
+++ b/boards/olimex/stm32_h407/doc/index.rst
@@ -23,23 +23,7 @@ information and the datasheet.
 Supported Features
 ==================
 
-The olimex_stm32_h407 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -314,6 +298,9 @@ which can be set as high as 168 MHz.
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 The OLIMEX-STM32-H407 board does not include an embedded debug tool
 interface. You will need to use ST tools or an external JTAG probe.
 In the following examples the Olimex ARM-USB-OCD-H is used.
diff --git a/boards/olimex/stm32_p405/doc/index.rst b/boards/olimex/stm32_p405/doc/index.rst
index 87a3d409d59f0..18a0653ec49b3 100644
--- a/boards/olimex/stm32_p405/doc/index.rst
+++ b/boards/olimex/stm32_p405/doc/index.rst
@@ -17,23 +17,7 @@ information and the datasheet.
 Supported Features
 ==================
 
-The olimex_stm32_p405 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -200,6 +184,9 @@ which can be set as high as 168 MHz.
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 The OLIMEX-STM32-P405 board does not include an embedded debug tool
 interface. You will need to use ST tools or an external JTAG probe.
 In the following examples a ST-Link V2 USB dongle is used.
diff --git a/boards/openhwgroup/cv32a6_genesys_2/Kconfig.cv32a6_genesys_2 b/boards/openhwgroup/cv32a6_genesys_2/Kconfig.cv32a6_genesys_2
new file mode 100644
index 0000000000000..2d08387fb6ab9
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/Kconfig.cv32a6_genesys_2
@@ -0,0 +1,4 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+config BOARD_CV32A6_GENESYS_2
+	select SOC_CV32A6
diff --git a/boards/openhwgroup/cv32a6_genesys_2/board.cmake b/boards/openhwgroup/cv32a6_genesys_2/board.cmake
new file mode 100644
index 0000000000000..921ea08b8c76a
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/board.cmake
@@ -0,0 +1,8 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+board_runner_args(openocd "--config=${BOARD_DIR}/support/ariane.cfg")
+board_runner_args(openocd "--use-elf")
+board_runner_args(openocd "--verify")
+board_runner_args(openocd "--cmd-pre-init=riscv.cpu configure -work-area-phys 0x90000000 -work-area-size 16780000")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/openhwgroup/cv32a6_genesys_2/board.yml b/boards/openhwgroup/cv32a6_genesys_2/board.yml
new file mode 100644
index 0000000000000..64fbf0833829f
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/board.yml
@@ -0,0 +1,7 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+board:
+  name: cv32a6_genesys_2
+  vendor: openhwgroup
+  socs:
+    - name: cv32a6
diff --git a/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2.dts b/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2.dts
new file mode 100644
index 0000000000000..a6588c2aa4c9f
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2.dts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024 CISPA Helmholtz Center for Information Security gGmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <openhwgroup/cv32a6.dtsi>
+
+/ {
+	model = "Openhardwaregroup CV32A6 on Genesys 2";
+	compatible = "openhwgroup,cv32a6_genesys_2";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,sram = &memory0;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+};
+
+&clint {
+	status = "okay";
+};
+
+&mtimer {
+	status = "okay";
+};
+
+&eth {
+	local-mac-address = [00 18 3e 02 e3 7f];
+	status = "okay";
+};
+
+&xlnx_gpio {
+	status = "okay";
+};
diff --git a/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2.yaml b/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2.yaml
new file mode 100644
index 0000000000000..243237da98ff0
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2.yaml
@@ -0,0 +1,12 @@
+identifier: cv32a6_genesys_2
+name: OpenHW Group cv32a6 on Genesys 2
+type: mcu
+arch: riscv
+ram: 1048576
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - spi
+  - uart
+vendor: openhwgroup
diff --git a/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2_defconfig b/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2_defconfig
new file mode 100644
index 0000000000000..90772f73ca07e
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/cv32a6_genesys_2_defconfig
@@ -0,0 +1,9 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+CONFIG_INCLUDE_RESET_VECTOR=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_NS16550_ACCESS_WORD_ONLY=y
+CONFIG_CONSOLE_HANDLER=y
+CONFIG_XIP=n
diff --git a/boards/openhwgroup/cv32a6_genesys_2/doc/cv32a6_genesys_2.webp b/boards/openhwgroup/cv32a6_genesys_2/doc/cv32a6_genesys_2.webp
new file mode 100644
index 0000000000000..e78dc22136f3c
Binary files /dev/null and b/boards/openhwgroup/cv32a6_genesys_2/doc/cv32a6_genesys_2.webp differ
diff --git a/boards/openhwgroup/cv32a6_genesys_2/doc/index.rst b/boards/openhwgroup/cv32a6_genesys_2/doc/index.rst
new file mode 100644
index 0000000000000..85479edcb680f
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/doc/index.rst
@@ -0,0 +1,81 @@
+.. zephyr:board:: cv32a6_genesys_2
+
+Overview
+********
+
+The Digilent Genesys 2 board features a Xilinx Kintex-7 FPGA which can run various softcore CPUs.
+In this configuration, the Genesys 2 is configured with a 32-bit version of the CVA6 RISC-V CPU.
+The SoC is configured with a memory controller interfacing with the Genesys' DRAM, PLIC and CLINT
+interrupt controllers, a UART device interfacing with the Genesys' USB UART, a RISC-V compatible
+debug module that interfaces with the Genesys' FTDI (USB JTAG) chip, a Xilinx SPI interface
+interfacing with the Genesys' SD card slot and a Xilinx GPIO interfacing with the Genesys' LEDs
+and switches.
+The complete hardware sources (see first reference) in conjunction with
+instructions for compiling and loading the configuration onto the Genesys 2 are available.
+
+See the following references for more information:
+
+- `CVA6 documentation`_
+- `Genesys 2 Reference Manual`_
+- `Genesys 2 Schematic`_
+
+Hardware
+********
+
+- CVA6 CPU with RV32imac instruction sets with PLIC, CLINT interrupt controllers.
+- 1 GB DDR3 DRAM
+- 10/100/1000 Ethernet with copper interface, lowRISC Ethernet MAC
+- ns16550a-compatible USB UART, 115200 baud
+- RISCV debug module, connected via on-board FTDI (USB JTAG)
+- Xilinx SPI controller, connected to microSD slot
+- Xilinx GPIO, connected to 7 switches and LEDs
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+Loading the FPGA configuration
+==============================
+
+You need to build a bitstream with Xilinx Vivado and load it into the FPGA
+before you can load zephyr onto the board.
+Please refer to the CVA6 documentation for the required steps.
+This configuration is compatible with the following build targets:
+cv32a6_imac_sv0, cv32a6_imac_sv32, cv32a6_imafc_sv32, cv32a6_ima_sv32_fpga.
+
+Flashing
+========
+west flash is supported via the openocd runner.
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: cv32a6_genesys_2
+   :goals: build flash
+
+Debugging
+=========
+
+west debug, attach and debugserver commands are supported via the openocd runner.
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: cv32a6_genesys_2
+   :goals: build debug
+
+References
+**********
+
+.. _CVA6 documentation:
+   https://github.com/openhwgroup/cva6
+
+.. _Genesys 2 Reference Manual:
+   https://digilent.com/reference/programmable-logic/genesys-2/reference-manual
+
+.. _Genesys 2 Schematic:
+   https://digilent.com/reference/_media/reference/programmable-logic/genesys-2/genesys-2_sch.pdf
diff --git a/boards/openhwgroup/cv32a6_genesys_2/support/ariane.cfg b/boards/openhwgroup/cv32a6_genesys_2/support/ariane.cfg
new file mode 100644
index 0000000000000..9bece8fca9c55
--- /dev/null
+++ b/boards/openhwgroup/cv32a6_genesys_2/support/ariane.cfg
@@ -0,0 +1,49 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+# Based on the ariane.cfg from the cva6 project:
+# https://github.com/openhwgroup/cva6/blob/master/corev_apu/fpga/ariane.cfg
+adapter_khz     1000
+
+interface ftdi
+ftdi_vid_pid 0x0403 0x6010
+
+# Channel 1 is taken by Xilinx JTAG
+ftdi_channel 0
+
+# links:
+# http://openocd.org/doc-release/html/Debug-Adapter-Configuration.html
+#
+# Bit  MPSSE     FT2232    JTAG    Type   Description
+# Bit0 TCK       ADBUS0    TCK     Out    Clock Signal Output
+# Bit1 TDI       ADBUS1    TDI     Out    Serial Data Out
+# Bit2 TDO       ADBUS2    TDO     In     Serial Data In
+# Bit3 TMS       ADBUS3    TMS     Out    Select Signal Out
+# Bit4 GPIOL0    ADBUS4    nTRST   In/Out General Purpose I/O
+# this corresponds to the following in/out layout, with TMS initially set to 1
+ftdi_layout_init 0x0018 0x001b
+# we only have to specify nTRST, the others are assigned correctly by default
+ftdi_layout_signal nTRST -ndata 0x0010
+
+set _CHIPNAME riscv
+jtag newtap $_CHIPNAME cpu -irlen 5
+
+set _TARGETNAME $_CHIPNAME.cpu
+target create $_TARGETNAME riscv -chain-position $_TARGETNAME -coreid 0
+
+gdb_report_data_abort enable
+gdb_report_register_access_error enable
+
+riscv set_reset_timeout_sec 120
+riscv set_command_timeout_sec 120
+
+# prefer to use sba for system bus access
+riscv set_prefer_sba off
+
+# Try enabling address translation (only works for newer versions)
+if { [catch {riscv set_enable_virtual on} ] } {
+    echo "Warning: This version of OpenOCD does not support address translation. To debug on virtual addresses, please update to the latest version." }
+
+init
+halt
+echo "Ready for Remote Connections"
diff --git a/boards/openhwgroup/cv64a6_genesys_2/Kconfig.cv64a6_genesys_2 b/boards/openhwgroup/cv64a6_genesys_2/Kconfig.cv64a6_genesys_2
new file mode 100644
index 0000000000000..1a983093e994e
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/Kconfig.cv64a6_genesys_2
@@ -0,0 +1,4 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+config BOARD_CV64A6_GENESYS_2
+	select SOC_CV64A6_IMAFDC
diff --git a/boards/openhwgroup/cv64a6_genesys_2/board.cmake b/boards/openhwgroup/cv64a6_genesys_2/board.cmake
new file mode 100644
index 0000000000000..921ea08b8c76a
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/board.cmake
@@ -0,0 +1,8 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+board_runner_args(openocd "--config=${BOARD_DIR}/support/ariane.cfg")
+board_runner_args(openocd "--use-elf")
+board_runner_args(openocd "--verify")
+board_runner_args(openocd "--cmd-pre-init=riscv.cpu configure -work-area-phys 0x90000000 -work-area-size 16780000")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/openhwgroup/cv64a6_genesys_2/board.yml b/boards/openhwgroup/cv64a6_genesys_2/board.yml
new file mode 100644
index 0000000000000..293fab13c58f3
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/board.yml
@@ -0,0 +1,7 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+board:
+  name: cv64a6_genesys_2
+  vendor: openhwgroup
+  socs:
+    - name: cv64a6_imafdc
diff --git a/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2.dts b/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2.dts
new file mode 100644
index 0000000000000..eab1183221a8e
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2.dts
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024 CISPA Helmholtz Center for Information Security gGmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <openhwgroup/cv64a6.dtsi>
+
+/ {
+	model = "Openhardwaregroup CV64A6 on Genesys 2";
+	compatible = "openhwgroup,cv64a6_genesys_2";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,sram = &memory0;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+};
+
+&clint {
+	status = "okay";
+};
+
+&mtimer {
+	status = "okay";
+};
+
+&dma0 {
+	status = "disabled";
+};
+
+&eth {
+	local-mac-address = [00 18 3e 02 e3 7f];
+	status = "okay";
+};
+
+&xlnx_gpio {
+	status = "okay";
+};
diff --git a/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2.yaml b/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2.yaml
new file mode 100644
index 0000000000000..d54b2ec0ebfdf
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2.yaml
@@ -0,0 +1,12 @@
+identifier: cv64a6_genesys_2
+name: OpenHW Group cv64a6 on Genesys 2
+type: mcu
+arch: riscv
+ram: 1048576
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - spi
+  - uart
+vendor: openhwgroup
diff --git a/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2_defconfig b/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2_defconfig
new file mode 100644
index 0000000000000..90772f73ca07e
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/cv64a6_genesys_2_defconfig
@@ -0,0 +1,9 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+CONFIG_INCLUDE_RESET_VECTOR=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_NS16550_ACCESS_WORD_ONLY=y
+CONFIG_CONSOLE_HANDLER=y
+CONFIG_XIP=n
diff --git a/boards/openhwgroup/cv64a6_genesys_2/doc/cv64a6_genesys_2.webp b/boards/openhwgroup/cv64a6_genesys_2/doc/cv64a6_genesys_2.webp
new file mode 100644
index 0000000000000..e78dc22136f3c
Binary files /dev/null and b/boards/openhwgroup/cv64a6_genesys_2/doc/cv64a6_genesys_2.webp differ
diff --git a/boards/openhwgroup/cv64a6_genesys_2/doc/index.rst b/boards/openhwgroup/cv64a6_genesys_2/doc/index.rst
new file mode 100644
index 0000000000000..090332078de7a
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/doc/index.rst
@@ -0,0 +1,80 @@
+.. zephyr:board:: cv64a6_genesys_2
+
+Overview
+********
+
+The Digilent Genesys 2 board features a Xilinx Kintex-7 FPGA which can run various softcore CPUs.
+In this configuration, the Genesys 2 is configured with a 64-bit version of the CVA6 RISC-V CPU.
+The SoC is configured with a memory controller interfacing with the Genesys' DRAM, PLIC and CLINT
+interrupt controllers, a UART device interfacing with the Genesys' USB UART, a RISC-V compatible
+debug module that interfaces with the Genesys' FTDI (USB JTAG) chip, a Xilinx SPI interface
+interfacing with the Genesys' SD card slot and a Xilinx GPIO interfacing with the Genesys' LEDs
+and switches.
+The complete hardware sources (see first reference) in conjunction with
+instructions for compiling and loading the configuration onto the Genesys 2 are available.
+
+See the following references for more information:
+
+- `CVA6 documentation`_
+- `Genesys 2 Reference Manual`_
+- `Genesys 2 Schematic`_
+
+Hardware
+********
+
+- CVA6 CPU with RV64imafdc instruction sets and an SV39 MMU
+- 1 GB DDR3 DRAM
+- 10/100/1000 Ethernet with copper interface, lowRISC Ethernet MAC
+- ns16550a-compatible USB UART, 115200 baud
+- RISCV debug module, connected via on-board FTDI (USB JTAG)
+- Xilinx SPI controller, connected to microSD slot
+- Xilinx GPIO, connected to 7 switches and LEDs
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+Loading the FPGA configuration
+==============================
+
+You need to build a bitstream with Xilinx Vivado and load it into the FPGA
+before you can load zephyr onto the board.
+Please refer to the CVA6 documentation for the required steps.
+This configuration is compatible with the following build target: cv64a6_imafdc_sv39
+
+Flashing
+========
+west flash is supported via the openocd runner.
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: cv64a6_genesys_2
+   :goals: build flash
+
+Debugging
+=========
+
+west debug, attach and debugserver commands are supported via the openocd runner.
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: cv64a6_genesys_2
+   :goals: build debug
+
+References
+**********
+
+.. _CVA6 documentation:
+   https://github.com/openhwgroup/cva6
+
+.. _Genesys 2 Reference Manual:
+   https://digilent.com/reference/programmable-logic/genesys-2/reference-manual
+
+.. _Genesys 2 Schematic:
+   https://digilent.com/reference/_media/reference/programmable-logic/genesys-2/genesys-2_sch.pdf
diff --git a/boards/openhwgroup/cv64a6_genesys_2/support/ariane.cfg b/boards/openhwgroup/cv64a6_genesys_2/support/ariane.cfg
new file mode 100644
index 0000000000000..9bece8fca9c55
--- /dev/null
+++ b/boards/openhwgroup/cv64a6_genesys_2/support/ariane.cfg
@@ -0,0 +1,49 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+# Based on the ariane.cfg from the cva6 project:
+# https://github.com/openhwgroup/cva6/blob/master/corev_apu/fpga/ariane.cfg
+adapter_khz     1000
+
+interface ftdi
+ftdi_vid_pid 0x0403 0x6010
+
+# Channel 1 is taken by Xilinx JTAG
+ftdi_channel 0
+
+# links:
+# http://openocd.org/doc-release/html/Debug-Adapter-Configuration.html
+#
+# Bit  MPSSE     FT2232    JTAG    Type   Description
+# Bit0 TCK       ADBUS0    TCK     Out    Clock Signal Output
+# Bit1 TDI       ADBUS1    TDI     Out    Serial Data Out
+# Bit2 TDO       ADBUS2    TDO     In     Serial Data In
+# Bit3 TMS       ADBUS3    TMS     Out    Select Signal Out
+# Bit4 GPIOL0    ADBUS4    nTRST   In/Out General Purpose I/O
+# this corresponds to the following in/out layout, with TMS initially set to 1
+ftdi_layout_init 0x0018 0x001b
+# we only have to specify nTRST, the others are assigned correctly by default
+ftdi_layout_signal nTRST -ndata 0x0010
+
+set _CHIPNAME riscv
+jtag newtap $_CHIPNAME cpu -irlen 5
+
+set _TARGETNAME $_CHIPNAME.cpu
+target create $_TARGETNAME riscv -chain-position $_TARGETNAME -coreid 0
+
+gdb_report_data_abort enable
+gdb_report_register_access_error enable
+
+riscv set_reset_timeout_sec 120
+riscv set_command_timeout_sec 120
+
+# prefer to use sba for system bus access
+riscv set_prefer_sba off
+
+# Try enabling address translation (only works for newer versions)
+if { [catch {riscv set_enable_virtual on} ] } {
+    echo "Warning: This version of OpenOCD does not support address translation. To debug on virtual addresses, please update to the latest version." }
+
+init
+halt
+echo "Ready for Remote Connections"
diff --git a/boards/openhwgroup/index.rst b/boards/openhwgroup/index.rst
new file mode 100644
index 0000000000000..5ad2474d9b450
--- /dev/null
+++ b/boards/openhwgroup/index.rst
@@ -0,0 +1,10 @@
+.. _boards-openhwgroup:
+
+OpenHW Group
+############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/openisa/rv32m1_vega/doc/index.rst b/boards/openisa/rv32m1_vega/doc/index.rst
index d5cf180bb1bbf..97c2ba7b44ad2 100644
--- a/boards/openisa/rv32m1_vega/doc/index.rst
+++ b/boards/openisa/rv32m1_vega/doc/index.rst
@@ -59,59 +59,7 @@ Additional features:
 Supported Features
 ==================
 
-Zephyr's RI5CY configuration, ``rv32m1_vega/openisa_rv32m1/ri5cy``, currently supports
-the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| EVENT     | on-chip    | event unit interrupt controller     |
-+-----------+------------+-------------------------------------+
-| INTMUX    | on-chip    | level 2 interrupt controller        |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | lptmr-based system timer            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| I2C(M)    | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | fxos8700 trigger;                   |
-+-----------+------------+-------------------------------------+
-
-Zephyr's ZERO-RISCY configuration, ``rv32m1_vega/openisa_rv32m1/zero_riscy``, currently
-supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| EVENT     | on-chip    | event unit interrupt controller     |
-+-----------+------------+-------------------------------------+
-| INTMUX    | on-chip    | level 2 interrupt controller        |
-+-----------+------------+-------------------------------------+
-| LPTMR     | on-chip    | lptmr-based system timer            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| I2C(M)    | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| TPM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SENSOR    | off-chip   | fxos8700 polling;                   |
-|           |            | fxos8700 trigger;                   |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 BLE Software Link Layer experimental support
 ==================================================
@@ -337,6 +285,8 @@ default for console and logging.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. _rv32m1-programming-hw:
 
 .. important::
diff --git a/boards/others/black_f407ve/doc/index.rst b/boards/others/black_f407ve/doc/index.rst
index f6f088b399840..b15012459fcdf 100644
--- a/boards/others/black_f407ve/doc/index.rst
+++ b/boards/others/black_f407ve/doc/index.rst
@@ -81,40 +81,12 @@ More information about STM32F407VE SOC can be found here:
 Supported Features
 ==================
 
-The Zephyr black_f407ve board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note:: CAN feature requires CAN transceiver.
 	  Zephyr default configuration uses CAN_2 exclusively, as
 	  simultaneous use of CAN_1 and CAN_2 is not yet supported.
 
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/others/black_f407ve/black_f407ve_defconfig`
-
-
 Pin Mapping
 ===========
 
@@ -181,6 +153,8 @@ it to UART1 pins (PA9/PA10).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``black_f407ve`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/others/black_f407zg_pro/doc/index.rst b/boards/others/black_f407zg_pro/doc/index.rst
index ec7e6313c105f..db45dd7b539f8 100644
--- a/boards/others/black_f407zg_pro/doc/index.rst
+++ b/boards/others/black_f407zg_pro/doc/index.rst
@@ -78,40 +78,12 @@ More information about STM32F407ZG SOC can be found here:
 Supported Features
 ==================
 
-The Zephyr black_f407zg_pro board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note:: CAN feature requires CAN transceiver.
 	  Zephyr default configuration uses CAN_2 exclusively, as
 	  simultaneous use of CAN_1 and CAN_2 is not yet supported.
 
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/others/black_f407zg_pro/black_f407zg_pro_defconfig`
-
-
 Pin Mapping
 ===========
 
@@ -163,6 +135,8 @@ it to UART2 pins (PA2/PA3).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``black_f407zg_pro`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/others/canbardo/doc/index.rst b/boards/others/canbardo/doc/index.rst
index e0cccb91d9d2a..dfbb1b7f050bd 100644
--- a/boards/others/canbardo/doc/index.rst
+++ b/boards/others/canbardo/doc/index.rst
@@ -17,32 +17,7 @@ GitHub repository`_.
 Supported Features
 ==================
 
-The ``canbardo`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB                                 |
-+-----------+------------+-------------------------------------+
-| UART1     | on-chip    | serial console                      |
-+-----------+------------+-------------------------------------+
-| CAN0      | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-| CAN1      | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/others/canbardo/canbardo_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -53,6 +28,8 @@ MHz. The two CAN FD controllers have a core clock frequency of 80 MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/others/candlelight/doc/index.rst b/boards/others/candlelight/doc/index.rst
index ac61b2a5eed92..c81e927acaf8d 100644
--- a/boards/others/candlelight/doc/index.rst
+++ b/boards/others/candlelight/doc/index.rst
@@ -16,28 +16,7 @@ are available in the `candleLight GitHub repository`_.
 Supported Features
 ==================
 
-The ``candlelight`` board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB                                 |
-+-----------+------------+-------------------------------------+
-| CAN1      | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/others/candlelight/candlelight_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -48,6 +27,8 @@ configured to provide a system clock of 48 MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/others/candlelightfd/doc/index.rst b/boards/others/candlelightfd/doc/index.rst
index ea622f4db7287..935969ee37ad2 100644
--- a/boards/others/candlelightfd/doc/index.rst
+++ b/boards/others/candlelightfd/doc/index.rst
@@ -16,28 +16,7 @@ are available in the `candleLight FD GitHub repository`_.
 Supported Features
 ==================
 
-The ``candlelightfd/stm32g0b1xx`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB                                 |
-+-----------+------------+-------------------------------------+
-| CAN1      | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-| CAN2      | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/others/candlelightfd/candlelightfd_stm32g0b1xx_defconfig`.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -49,6 +28,8 @@ clock of 80 MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/others/esp32c3_supermini/doc/index.rst b/boards/others/esp32c3_supermini/doc/index.rst
index 7a7ff21dbd1e4..234129ef32c44 100644
--- a/boards/others/esp32c3_supermini/doc/index.rst
+++ b/boards/others/esp32c3_supermini/doc/index.rst
@@ -40,41 +40,7 @@ manual at `ESP32-C3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Currently Zephyr's ``esp32c3_supermini`` board target supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -96,6 +62,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/others/esp32c3_supermini/esp32c3_supermini.dts b/boards/others/esp32c3_supermini/esp32c3_supermini.dts
index 30470c1a90fbd..317494ca20039 100644
--- a/boards/others/esp32c3_supermini/esp32c3_supermini.dts
+++ b/boards/others/esp32c3_supermini/esp32c3_supermini.dts
@@ -89,3 +89,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/others/icev_wireless/doc/index.rst b/boards/others/icev_wireless/doc/index.rst
index 91c4ee1ff983e..f9168a1489013 100644
--- a/boards/others/icev_wireless/doc/index.rst
+++ b/boards/others/icev_wireless/doc/index.rst
@@ -28,32 +28,7 @@ For details on iCE40 hardware please refer to the following resources:
 Supported Features
 ==================
 
-The ICE-V Wireless board configuration supports the following hardware
-features:
-
-+-----------+------------+------------------+
-| Interface | Controller | Driver/Component |
-+===========+============+==================+
-| PMP       | on-chip    | arch/riscv       |
-+-----------+------------+------------------+
-| INTMTRX   | on-chip    | intc_esp32c3     |
-+-----------+------------+------------------+
-| PINMUX    | on-chip    | pinctrl_esp32    |
-+-----------+------------+------------------+
-| USB UART  | on-chip    | serial_esp32_usb |
-+-----------+------------+------------------+
-| GPIO      | on-chip    | gpio_esp32       |
-+-----------+------------+------------------+
-| UART      | on-chip    | uart_esp32       |
-+-----------+------------+------------------+
-| I2C       | on-chip    | i2c_esp32        |
-+-----------+------------+------------------+
-| SPI       | on-chip    | spi_esp32_spim   |
-+-----------+------------+------------------+
-| ADC       | on-chip    |                  |
-+-----------+------------+------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -83,6 +58,8 @@ below.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Programming and debugging for the ICE-V Wireless ESP32-C3 target is
 incredibly easy 🎉 following the steps below.
 
diff --git a/boards/others/icev_wireless/icev_wireless.dts b/boards/others/icev_wireless/icev_wireless.dts
index b91814c3b431a..3c0e725fe5336 100644
--- a/boards/others/icev_wireless/icev_wireless.dts
+++ b/boards/others/icev_wireless/icev_wireless.dts
@@ -97,3 +97,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/others/neorv32/CMakeLists.txt b/boards/others/neorv32/CMakeLists.txt
index ef15ed3fcc5cd..40e809dfb7087 100644
--- a/boards/others/neorv32/CMakeLists.txt
+++ b/boards/others/neorv32/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
 if((CONFIG_BOARD_NEORV32) AND (CONFIG_BUILD_OUTPUT_BIN))
@@ -18,7 +18,7 @@ if((CONFIG_BOARD_NEORV32) AND (CONFIG_BUILD_OUTPUT_BIN))
 
     set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
       COMMAND ${IMAGE_GEN}
-      ARGS -app_img
+      ARGS -app_vhd
       ${CONFIG_KERNEL_BIN_NAME}.bin
       ${CONFIG_KERNEL_BIN_NAME}.vhd
       ${PROJECT_BINARY_DIR}
diff --git a/boards/others/neorv32/Kconfig b/boards/others/neorv32/Kconfig
index 57e0edc10d66e..038c6c6cc8667 100644
--- a/boards/others/neorv32/Kconfig
+++ b/boards/others/neorv32/Kconfig
@@ -1,5 +1,19 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
+if BOARD_NEORV32_NEORV32_MINIMALBOOT
+
+config BOARD_NEORV32
+	select RISCV_ISA_RV32I
+	select ATOMIC_OPERATIONS_C
+
+endif # BOARD_NEORV32_NEORV32_MINIMALBOOT
+
+if BOARD_NEORV32_NEORV32_UP5KDEMO
+
 config BOARD_NEORV32
-	select SOC_NEORV32_V1_8_6 if "$(BOARD_REVISION)" = "1.8.6"
+	select RISCV_ISA_RV32I
+	select RISCV_ISA_EXT_M
+	select ATOMIC_OPERATIONS_C
+
+endif # BOARD_NEORV32_NEORV32_UP5KDEMO
diff --git a/boards/others/neorv32/board.cmake b/boards/others/neorv32/board.cmake
index b5088e8677ec9..56bb9fc1a380f 100644
--- a/boards/others/neorv32/board.cmake
+++ b/boards/others/neorv32/board.cmake
@@ -1,5 +1,10 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(openocd "--use-elf" "--cmd-reset-halt" "halt")
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+
+if("${BOARD_QUALIFIERS}" STREQUAL "/neorv32")
+  message(FATAL_ERROR "Please specify a variant for the neorv32 board "
+                      "(e.g. neorv32/neorv32/minimalboot or neorv32/neorv32/up5kdemo)")
+endif()
diff --git a/boards/others/neorv32/board.yml b/boards/others/neorv32/board.yml
index 9154d90e8a96d..2c3c6552cd894 100644
--- a/boards/others/neorv32/board.yml
+++ b/boards/others/neorv32/board.yml
@@ -2,10 +2,8 @@ board:
   name: neorv32
   full_name: NEORV32
   vendor: others
-  revision:
-    format: major.minor.patch
-    default: "1.8.6"
-    revisions:
-      - name: "1.8.6"
   socs:
     - name: neorv32
+      variants:
+        - name: "minimalboot"
+        - name: "up5kdemo"
diff --git a/boards/others/neorv32/doc/index.rst b/boards/others/neorv32/doc/index.rst
index 066377bbf2541..d9a76304c152c 100644
--- a/boards/others/neorv32/doc/index.rst
+++ b/boards/others/neorv32/doc/index.rst
@@ -13,91 +13,102 @@ For more information about the NEORV32, see the following websites:
 - `The NEORV32 RISC-V Processor Datasheet`_
 - `The NEORV32 RISC-V Processor User Guide`_
 
-The currently supported version is 1.8.6.
+The currently supported version is NEORV32 v1.11.2.
+
+Supported Board Targets
+=======================
+
+The following NEORV32 board targets are supported by Zephyr:
+
+- ``neorv32/neorv32/minimalboot``
+- ``neorv32/neorv32/up5kdemo``
+
+Each of these match one of the NEORV32 processor templates provided alongside the NEORV32 RTL.
+These board targets can be customized out-of-tree to match custom NEORV32 implementations using
+:ref:`board extensions <extend-board>` or :ref:`devicetree overlays <use-dt-overlays>`.
+
+.. zephyr:board-supported-hw::
 
 Supported Features
-==================
+******************
 
-The ``neorv32`` board configuration can be used a generic definition for NEORV32
-based boards. Customisation to fit custom NEORV32 implementations can be done
-using :ref:`devicetree overlays <use-dt-overlays>`.
-
-Zephyr currently supports the following hardware features of the NEORV32
-Processor (SoC):
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| INTC      | on-chip    | interrupt controller                |
-+-----------+------------+-------------------------------------+
-| MTIME     | on-chip    | system timer                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio, non-interrupt                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-
-The default board configuration for the NEORV32 Processor (SoC) can be found in
-the defconfig file: :file:`boards/riscv/neorv32/neorv32_defconfig`.
+The following NEORV32 features are supported by Zephyr. These are pre-configured for the supported
+board targets, but can be customized to match custom NEORV32 implementations.
 
 System Clock
 ============
 
-The default board configuration assumes a system clock of 100 MHz. The clock
-frequency can be overridden by changing the ``clock-frequency`` property of the
-``cpu0`` devicetree node.
+The default board configuration reads the system clock frequency from the NEORV32 SYSINFO module,
+which results in a small run-time overhead. If the clock frequency is known at build time, this
+behavior can be overridden by setting the ``clock-frequency`` property of the ``cpu0`` devicetree
+node.
 
 CPU
 ===
 
-The default board configuration assumes the NEORV32 CPU implementation has the
-following RISC-V ISA extensions enabled:
+The SoC configuration assumes the NEORV32 CPU implementation has the following RISC-V ISA extensions
+enabled:
 
-- C (Compresses Instructions)
-- M (Integer Multiplication and Division)
-- Zicsr (Control and Status Register (CSR) Instructions)
+- Zicntr (Extension for Base Counters and Timers)
+- Zicsr (Control and Status Register (CSR) Instructions, always enabled)
+- Zifencei (Instruction-fetch fence, always enabled)
+
+Other supported RISC-V ISA extensions must be enabled via Kconfig on the board level, and the
+``riscv,isa`` devicetree property of the ``cpu0`` node must be set accordingly.
+
+Core Local Interruptor
+======================
+
+The NEORV32 Core Local Interruptor (CLINT) and its machine timer (MTIMER) are supported but disabled
+by default. For NEORV32 SoC implementations supporting these, support can be enabled by setting
+the ``status`` properties of the ``clint`` and ``mtimer`` devicetree node to ``okay``.
 
 Internal Instruction Memory
 ===========================
 
-The default board configuration assumes the NEORV32 SoC implementation has a 64k
-byte internal instruction memory (IMEM) for code execution. The size of the
-instruction memory can be overridden by changing the ``reg`` property of the
-``imem`` devicetree node.
+The internal instruction memory (IMEM) for code execution is supported but disabled by default. For
+NEORV32 SoC implementations supporting IMEM, support can be enabled by setting the size via the
+``reg`` property of the ``imem`` devicetree node and setting its ``status`` property to ``okay``.
 
 Internal Data Memory
 ====================
 
-The default board configuration assumes the NEORV32 SoC implementation has a 32k
-byte internal data memory (DMEM). The size of the data memory can be overridden
-by changing the ``reg`` property of the ``dmem`` devicetree node.
+The internal data memory (DMEM) is supported but disabled by default. For NEORV32 SoC
+implementations supporting DMEM, support can be enabled by setting the size via the ``reg`` property
+of the ``dmem`` devicetree node and setting its ``status`` property to ``okay``.
 
 Serial Port
 ===========
 
-The default configuration assumes the NEORV32 SoC implements UART0 for use as
-system console.
+The NEORV32 serial ports (UART0 and UART1) are supported but disabled by default. For NEORV32 SoC
+implementations supporting either of the UARTs, support can be enabled by setting the ``status``
+properties of the ``uart0`` and/or ``uart1`` devicetree node to ``okay``.
 
 .. note::
+   The board targets provide a console on UART0 with a baud rate of 19200 to match that of the
+   standard NEORV32 bootloader. The baudrate can be changed by modifying the ``current-speed``
+   property of the ``uart0`` devicetree node.
 
-   The default configuration uses a baud rate of 19200 to match that of the
-   standard NEORV32 bootloader. The baudrate can be changed by modifying the
-   ``current-speed`` property of the ``uart0`` devicetree node.
+General Purpose Input/Output
+============================
+
+The NEORV32 GPIO port is supported but disabled by default. For NEORV32 SoC implementations
+supporting the GPIOs, support can be enabled by setting the ``status`` property of the ``gpio``
+devicetree node to ``okay``. The number of supported GPIOs can be set via the ``ngpios`` devicetree
+property.
 
 True Random-Number Generator
 ============================
 
-The True Random-Number Generator (TRNG) of the NEORV32 is supported, but
-disabled by default. For NEORV32 SoC implementations supporting the TRNG,
-support can be enabled by setting the ``status`` property of the ``trng``
-devicetree node to ``okay``.
+The True Random-Number Generator (TRNG) of the NEORV32 is supported, but disabled by default. For
+NEORV32 SoC implementations supporting the TRNG, support can be enabled by setting the ``status``
+property of the ``trng`` devicetree node to ``okay``.
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 First, configure the FPGA with the NEORV32 bitstream as described in the NEORV32
 user guide.
 
@@ -129,26 +140,26 @@ implementation with the On-Chip Debugger (OCD) and bootloader enabled.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: neorv32
+   :board: neorv32/neorv32/<variant>
    :goals: flash
 
 The default board configuration uses an :ref:`openocd-debug-host-tools`
 configuration similar to the example provided by the NEORV32 project. Other
-JTAGs can be used by providing further arguments when building. Here is an
-example for using the Flyswatter JTAG:
+JTAGs can be used by providing further arguments when flashing. Here is an
+example for using the Flyswatter JTAG @ 2 kHz:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: neorv32
+   :board: neorv32/neorv32/<variant>
    :goals: flash
-   :gen-args: -DBOARD_RUNNER_ARGS_openocd="--config;interface/ftdi/flyswatter.cfg;--config;neorv32.cfg;--cmd-pre-init;'adapter speed 2000'"
+   :flash-args: --config interface/ftdi/flyswatter.cfg --config neorv32.cfg --cmd-pre-init 'adapter speed 2000'
 
 After flashing, you should see message similar to the following in the terminal:
 
 .. code-block:: console
 
    *** Booting Zephyr OS build zephyr-vn.n.nn  ***
-   Hello World! neorv32
+   Hello World! neorv32/neorv32/<variant>
 
 Note, however, that the application was not persisted in flash memory by the
 above steps. It was merely written to internal block RAM in the FPGA. It will
@@ -167,7 +178,7 @@ can be passed at build time:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: neorv32
+   :board: neorv32/neorv32/<variant>
    :goals: build
    :gen-args: -DCMAKE_PROGRAM_PATH=<path/to/neorv32/sw/image_gen/>
 
@@ -186,7 +197,7 @@ Here is an example for the :zephyr:code-sample:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: neorv32
+   :board: neorv32/neorv32/<variant>
    :goals: debug
 
 Step through the application in your debugger, and you should see a message
@@ -195,7 +206,7 @@ similar to the following in the terminal:
 .. code-block:: console
 
    *** Booting Zephyr OS build zephyr-vn.n.nn  ***
-   Hello World! neorv32
+   Hello World! neorv32/neorv32/<variant>
 
 .. _The NEORV32 RISC-V Processor GitHub:
    https://github.com/stnolting/neorv32
diff --git a/boards/others/neorv32/doc/neorv32.png b/boards/others/neorv32/doc/neorv32.png
new file mode 100644
index 0000000000000..8bf84fd9529ae
Binary files /dev/null and b/boards/others/neorv32/doc/neorv32.png differ
diff --git a/boards/others/neorv32/neorv32.dts b/boards/others/neorv32/neorv32.dts
deleted file mode 100644
index ec78e301fb072..0000000000000
--- a/boards/others/neorv32/neorv32.dts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <neorv32.dtsi>
-#include <freq.h>
-#include <mem.h>
-
-/ {
-	model = "NEORV32";
-	compatible = "neorv32";
-
-	aliases {
-		led0 = &led0;
-		led1 = &led1;
-		led2 = &led2;
-		led3 = &led3;
-	};
-
-	chosen {
-		zephyr,flash = &imem;
-		zephyr,sram = &dmem;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-		zephyr,uart-pipe = &uart0;
-	};
-
-	soc {
-		imem: memory@0 {
-			compatible = "soc-nv-flash", "mmio-sram";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-
-		bootrom: memory@ffff0000 {
-			compatible = "soc-nv-flash", "mmio-sram";
-			reg = <0xffff0000 DT_SIZE_K(4)>;
-		};
-
-		dmem: memory@80000000 {
-			compatible = "mmio-sram";
-			reg = <0x80000000 DT_SIZE_K(32)>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		led0: led0 {
-			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-			label = "LED_0";
-		};
-
-		led1: led1 {
-			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-			label = "LED_1";
-		};
-
-		led2: led2 {
-			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
-			label = "LED_2";
-		};
-
-		led3: led3 {
-			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
-			label = "LED_3";
-		};
-	};
-};
-
-&cpu0 {
-	clock-frequency = <DT_FREQ_M(100)>;
-};
-
-&uart0 {
-	status = "okay";
-	current-speed = <19200>;
-};
-
-&gpio_lo {
-	status = "okay";
-};
-
-&gpio_hi {
-	status = "okay";
-};
diff --git a/boards/others/neorv32/neorv32.yaml b/boards/others/neorv32/neorv32.yaml
deleted file mode 100644
index 15c1dd875e8af..0000000000000
--- a/boards/others/neorv32/neorv32.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-identifier: neorv32
-name: NEORV32 Processor (SoC)
-type: mcu
-arch: riscv
-toolchain:
-  - cross-compile
-  - zephyr
-ram: 32
-flash: 64
-supported:
-  - gpio
diff --git a/boards/others/neorv32/neorv32_defconfig b/boards/others/neorv32/neorv32_defconfig
deleted file mode 100644
index 2642d046b500d..0000000000000
--- a/boards/others/neorv32/neorv32_defconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_NEORV32_ISA_C=y
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_GPIO=y
diff --git a/boards/others/neorv32/neorv32_neorv32_minimalboot.dts b/boards/others/neorv32/neorv32_neorv32_minimalboot.dts
new file mode 100644
index 0000000000000..8fd995f5c9b1d
--- /dev/null
+++ b/boards/others/neorv32/neorv32_neorv32_minimalboot.dts
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <neorv32.dtsi>
+#include <mem.h>
+
+/ {
+	model = "NEORV32 MinimalBoot";
+	compatible = "neorv32";
+
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		led2 = &led2;
+		led3 = &led3;
+	};
+
+	chosen {
+		zephyr,flash = &imem;
+		zephyr,sram = &dmem;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,uart-pipe = &uart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led0 {
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+			label = "LED_0";
+		};
+
+		led1: led1 {
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+			label = "LED_1";
+		};
+
+		led2: led2 {
+			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
+			label = "LED_2";
+		};
+
+		led3: led3 {
+			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
+			label = "LED_3";
+		};
+	};
+};
+
+&cpu0 {
+	riscv,isa = "rv32i_zicsr_zifencei";
+};
+
+&bootrom {
+	status = "okay";
+};
+
+&imem {
+	status = "okay";
+	reg = <0x0 DT_SIZE_K(64)>;
+};
+
+&dmem {
+	status = "okay";
+	reg = <0x80000000 DT_SIZE_K(64)>;
+};
+
+&clint {
+	status = "okay";
+};
+
+&mtimer {
+	status = "okay";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <19200>;
+};
+
+&gpio {
+	status = "okay";
+	ngpios = <4>;
+};
diff --git a/boards/others/neorv32/neorv32_neorv32_minimalboot.yaml b/boards/others/neorv32/neorv32_neorv32_minimalboot.yaml
new file mode 100644
index 0000000000000..88b24248d2288
--- /dev/null
+++ b/boards/others/neorv32/neorv32_neorv32_minimalboot.yaml
@@ -0,0 +1,11 @@
+identifier: neorv32/neorv32/minimalboot
+name: NEORV32 MinimalBoot
+type: mcu
+arch: riscv
+toolchain:
+  - cross-compile
+  - zephyr
+ram: 64
+flash: 64
+supported:
+  - gpio
diff --git a/boards/others/neorv32/neorv32_neorv32_minimalboot_defconfig b/boards/others/neorv32/neorv32_neorv32_minimalboot_defconfig
new file mode 100644
index 0000000000000..146b34dfc02ec
--- /dev/null
+++ b/boards/others/neorv32/neorv32_neorv32_minimalboot_defconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/boards/others/neorv32/neorv32_neorv32_up5kdemo.dts b/boards/others/neorv32/neorv32_neorv32_up5kdemo.dts
new file mode 100644
index 0000000000000..43046f9398e62
--- /dev/null
+++ b/boards/others/neorv32/neorv32_neorv32_up5kdemo.dts
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <neorv32.dtsi>
+#include <mem.h>
+
+/ {
+	model = "NEORV32 UP5KDemo";
+	compatible = "neorv32";
+
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		led2 = &led2;
+		led3 = &led3;
+	};
+
+	chosen {
+		zephyr,flash = &imem;
+		zephyr,sram = &dmem;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,uart-pipe = &uart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led0 {
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+			label = "LED_0";
+		};
+
+		led1: led1 {
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+			label = "LED_1";
+		};
+
+		led2: led2 {
+			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
+			label = "LED_2";
+		};
+
+		led3: led3 {
+			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
+			label = "LED_3";
+		};
+	};
+};
+
+&cpu0 {
+	riscv,isa = "rv32im_zicsr_zifencei";
+};
+
+&bootrom {
+	status = "okay";
+};
+
+&imem {
+	status = "okay";
+	reg = <0x0 DT_SIZE_K(64)>;
+};
+
+&dmem {
+	status = "okay";
+	reg = <0x80000000 DT_SIZE_K(64)>;
+};
+
+&clint {
+	status = "okay";
+};
+
+&mtimer {
+	status = "okay";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <19200>;
+};
+
+&gpio {
+	status = "okay";
+	ngpios = <32>;
+};
diff --git a/boards/others/neorv32/neorv32_neorv32_up5kdemo.yaml b/boards/others/neorv32/neorv32_neorv32_up5kdemo.yaml
new file mode 100644
index 0000000000000..273e702c57a3f
--- /dev/null
+++ b/boards/others/neorv32/neorv32_neorv32_up5kdemo.yaml
@@ -0,0 +1,11 @@
+identifier: neorv32/neorv32/up5kdemo
+name: NEORV32 UP5KDemo
+type: mcu
+arch: riscv
+toolchain:
+  - cross-compile
+  - zephyr
+ram: 64
+flash: 64
+supported:
+  - gpio
diff --git a/boards/others/neorv32/neorv32_neorv32_up5kdemo_defconfig b/boards/others/neorv32/neorv32_neorv32_up5kdemo_defconfig
new file mode 100644
index 0000000000000..e8abbc77864be
--- /dev/null
+++ b/boards/others/neorv32/neorv32_neorv32_up5kdemo_defconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/boards/others/neorv32/support/openocd.cfg b/boards/others/neorv32/support/openocd.cfg
index a857c8ba7c1ba..fc7e7462559f2 100644
--- a/boards/others/neorv32/support/openocd.cfg
+++ b/boards/others/neorv32/support/openocd.cfg
@@ -1,17 +1,15 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6010
-ftdi_channel 0
+adapter speed 1000
 
 if { [info exists _ZEPHYR_BOARD_SERIAL] } {
-    ftdi_serial $_ZEPHYR_BOARD_SERIAL
+    adapter serial $_ZEPHYR_BOARD_SERIAL
 }
 
-ftdi_layout_init 0x0038 0x003b
-
-adapter speed 1000
-ftdi_layout_signal nTRST -ndata 0x0010 -noe 0x0040
+ftdi vid_pid 0x0403 0x6010
+ftdi channel 0
+ftdi layout_init 0x0038 0x003b
 
 source [find neorv32.cfg]
diff --git a/boards/others/promicro_nrf52840/Kconfig.defconfig b/boards/others/promicro_nrf52840/Kconfig.defconfig
index 85e9768bccc82..58880f52c9ece 100644
--- a/boards/others/promicro_nrf52840/Kconfig.defconfig
+++ b/boards/others/promicro_nrf52840/Kconfig.defconfig
@@ -23,7 +23,4 @@ config FLASH_LOAD_OFFSET
 	default 0x1000
 	depends on BOARD_HAS_NRF5_BOOTLOADER && (MCUBOOT || !USE_DT_CODE_PARTITION)
 
-config BT_CTLR
-	default BT
-
 endif # BOARD_PROMICRO_NRF52840
diff --git a/boards/others/promicro_nrf52840/doc/index.rst b/boards/others/promicro_nrf52840/doc/index.rst
index 815b70a02c974..de0f284d63ada 100644
--- a/boards/others/promicro_nrf52840/doc/index.rst
+++ b/boards/others/promicro_nrf52840/doc/index.rst
@@ -35,41 +35,7 @@ Pinout and Schematic are available in the `Nice!Nano Documentation`_
 Supported Features
 ==================
 
-The ``promicro_nrf52840/nrf52840`` board target supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -82,6 +48,8 @@ LED
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``promicro_nrf52840/nrf52840`` board target can be
 built in the usual way (see :ref:`build_an_application` for more details).
 
diff --git a/boards/others/promicro_nrf52840/promicro_nrf52840-pinctrl.dtsi b/boards/others/promicro_nrf52840/promicro_nrf52840-pinctrl.dtsi
index d4e61141803b0..65e941475e0c1 100644
--- a/boards/others/promicro_nrf52840/promicro_nrf52840-pinctrl.dtsi
+++ b/boards/others/promicro_nrf52840/promicro_nrf52840-pinctrl.dtsi
@@ -68,13 +68,13 @@
 
 	pwm0_default: pwm0_default {
 		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 0, 17)>;
+			psels = <NRF_PSEL(PWM_OUT0, 0, 15)>;
 		};
 	};
 
 	pwm0_sleep: pwm0_sleep {
 		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 0, 17)>;
+			psels = <NRF_PSEL(PWM_OUT0, 0, 15)>;
 			low-power-enable;
 		};
 	};
diff --git a/boards/others/serpente/doc/index.rst b/boards/others/serpente/doc/index.rst
index 0894427ff3e29..3872360dabcb9 100644
--- a/boards/others/serpente/doc/index.rst
+++ b/boards/others/serpente/doc/index.rst
@@ -21,35 +21,7 @@ Hardware
 Supported Features
 ==================
 
-The Serpente board configuration supports the
-following hardware features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| NVIC      | on-chip    | nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| PWM       | on-chip    | Pulse Width Modulation                   |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/others/serpente/serpente_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -74,6 +46,8 @@ to the host PC.
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 The Serpente ships the BOSSA compatible UF2 bootloader. The bootloader
 can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/others/stm32_min_dev/doc/index.rst b/boards/others/stm32_min_dev/doc/index.rst
index 29d5a75b27e9f..8f37502cc014c 100644
--- a/boards/others/stm32_min_dev/doc/index.rst
+++ b/boards/others/stm32_min_dev/doc/index.rst
@@ -81,32 +81,7 @@ respectively.
 Supported Features
 ==================
 
-The stm32_min_dev board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| USB       | on-chip    | USB device           |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -145,6 +120,8 @@ variants respectively.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``stm32_min_dev@(blue|black)`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/others/stm32f030_demo/doc/index.rst b/boards/others/stm32f030_demo/doc/index.rst
index 84d619b38b0ff..751465ebf8108 100644
--- a/boards/others/stm32f030_demo/doc/index.rst
+++ b/boards/others/stm32f030_demo/doc/index.rst
@@ -31,29 +31,7 @@ Hardware
 Supported Features
 ==================
 
-The Zephyr stm32f030_demo board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/others/stm32f030_demo/stm32f030_demo_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -67,6 +45,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``stm32f030_demo`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/others/stm32f103_mini/doc/index.rst b/boards/others/stm32f103_mini/doc/index.rst
index 0377a9b5952ff..f7e5cfc3ffac6 100644
--- a/boards/others/stm32f103_mini/doc/index.rst
+++ b/boards/others/stm32f103_mini/doc/index.rst
@@ -42,41 +42,7 @@ More information about STM32F103RC can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f103_mini board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/others/stm32f103_mini/stm32f103_mini_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -113,6 +79,8 @@ The on-board 8MHz crystal is used to produce a 72MHz system clock with PLL.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``stm32f103_mini`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/others/stm32f401_mini/doc/index.rst b/boards/others/stm32f401_mini/doc/index.rst
index 5cfa267f7128b..e007f48c69413 100644
--- a/boards/others/stm32f401_mini/doc/index.rst
+++ b/boards/others/stm32f401_mini/doc/index.rst
@@ -35,35 +35,7 @@ hardware components:
 Supported Features
 ==================
 
-The Zephyr stm32f401_mini board configuration supports the following
-hardware features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| NVIC       | on-chip    | nested vector interrupt controller  |
-+------------+------------+-------------------------------------+
-| SYSTICK    | on-chip    | system clock                        |
-+------------+------------+-------------------------------------+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| FLASH      | on-chip    | flash                               |
-+------------+------------+-------------------------------------+
-| SPI        | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | ADC Controller                      |
-+------------+------------+-------------------------------------+
-| USB OTG FS | on-chip    | USB device                          |
-+------------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/others/stm32f401_mini/stm32f401_mini_defconfig`
+.. zephyr:board-supported-hw::
 
 Default Zephyr Peripheral Mapping:
 ----------------------------------
@@ -89,6 +61,8 @@ derived from HSE, and is set at 84MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 There are 2 main entry points for flashing STM32F4X SoCs, one using the ROM
 bootloader, and another by using the SWD debug port (which requires additional
 hardware). Flashing using the ROM bootloader requires a special activation
diff --git a/boards/panasonic/pan1770_evb/board.cmake b/boards/panasonic/pan1770_evb/board.cmake
index 73bcf6990b0eb..ff0e2b9f005ab 100644
--- a/boards/panasonic/pan1770_evb/board.cmake
+++ b/boards/panasonic/pan1770_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1770_evb/doc/index.rst b/boards/panasonic/pan1770_evb/doc/index.rst
index c518d4baa82d8..f1ba60117ac16 100644
--- a/boards/panasonic/pan1770_evb/doc/index.rst
+++ b/boards/panasonic/pan1770_evb/doc/index.rst
@@ -7,7 +7,7 @@ The PAN1770 Evaluation Board is a development tool for the PAN1770 module
 which is based on the nRF52840 chipset from Nordic Semiconductor.
 
 It is basically a clone of the official nRF52840 development kit (PCA10056)
-from Nordic Semiconductor. Please refer to :ref:`nrf52840dk_nrf52840` for
+from Nordic Semiconductor. Please refer to :zephyr:board:`nrf52840dk` for
 further information.
 
 You can find more information about the PAN1770 module and the PAN1770
@@ -42,6 +42,8 @@ The schematics for the PAN1770 Evaluation Board are available in the
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Please use the ``pan1770_evb`` board configuration when
 :ref:`build_an_application` and :ref:`application_run`.
 
diff --git a/boards/panasonic/pan1780_evb/board.cmake b/boards/panasonic/pan1780_evb/board.cmake
index 4137b27008079..f9c2bc7fd0644 100644
--- a/boards/panasonic/pan1780_evb/board.cmake
+++ b/boards/panasonic/pan1780_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1780_evb/doc/index.rst b/boards/panasonic/pan1780_evb/doc/index.rst
index aac1ce9bd836f..770c281128845 100644
--- a/boards/panasonic/pan1780_evb/doc/index.rst
+++ b/boards/panasonic/pan1780_evb/doc/index.rst
@@ -7,7 +7,7 @@ The PAN1780 Evaluation Board is a development tool for the PAN1780 module which
 is based on the nRF52840 chipset from Nordic Semiconductor.
 
 It is basically a clone of the official nRF52840 development kit (PCA10056)
-from Nordic Semiconductor. Please refer to :ref:`nrf52840dk_nrf52840` for
+from Nordic Semiconductor. Please refer to :zephyr:board:`nrf52840dk` for
 further information.
 
 You can find more information about the PAN1780 module and the PAN1780
@@ -41,6 +41,8 @@ The schematics for the PAN1780 Evaluation Board are available in the
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Please use the ``pan1780_evb`` board configuration when
 :ref:`build_an_application` and :ref:`application_run`.
 
diff --git a/boards/panasonic/pan1781_evb/board.cmake b/boards/panasonic/pan1781_evb/board.cmake
index 1710d8db44303..fe7bb7edcd8b6 100644
--- a/boards/panasonic/pan1781_evb/board.cmake
+++ b/boards/panasonic/pan1781_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52820" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1781_evb/doc/index.rst b/boards/panasonic/pan1781_evb/doc/index.rst
index e8dc75b84ecae..7f208839f4fd1 100644
--- a/boards/panasonic/pan1781_evb/doc/index.rst
+++ b/boards/panasonic/pan1781_evb/doc/index.rst
@@ -9,7 +9,7 @@ which is based on the nRF52820 chipset from Nordic Semiconductor.
 You can find more information about the PAN1781 module and the PAN1781
 evaluation board on the `product website`_.
 
-Please also refer to :ref:`nrf52833dk_nrf52820` for general information about
+Please also refer to :zephyr:board:`nrf52833dk` for general information about
 development kits for the nRF52820 from Nordic Semiconductor.
 
 The PAN1781 evaluation board is closely linked to these other evaluation
@@ -40,6 +40,8 @@ The schematics for the PAN1781 Evaluation Board are available in the
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Please use the ``pan1781_evb`` board configuration when
 :ref:`build_an_application` and :ref:`application_run`.
 
diff --git a/boards/panasonic/pan1782_evb/board.cmake b/boards/panasonic/pan1782_evb/board.cmake
index ecf22a84df9d2..8b03593870a62 100644
--- a/boards/panasonic/pan1782_evb/board.cmake
+++ b/boards/panasonic/pan1782_evb/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(jlink "--device=nrf52" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/panasonic/pan1782_evb/doc/index.rst b/boards/panasonic/pan1782_evb/doc/index.rst
index eb158172a88cb..d1385cc26ac36 100644
--- a/boards/panasonic/pan1782_evb/doc/index.rst
+++ b/boards/panasonic/pan1782_evb/doc/index.rst
@@ -9,7 +9,7 @@ which is based on the nRF52833 chipset from Nordic Semiconductor.
 You can find more information about the PAN1782 module and the PAN1782
 evaluation board on the `product website`_.
 
-Please also refer to :ref:`nrf52833dk_nrf52833` for general information about
+Please also refer to :zephyr:board:`nrf52833dk` for general information about
 development kits for the nRF52833 from Nordic Semiconductor.
 
 The PAN1782 evaluation board is closely linked to these other evaluation
@@ -40,6 +40,8 @@ The schematics for the PAN1782 Evaluation Board are available in the
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Please use the ``pan1782_evb`` board configuration when
 :ref:`build_an_application` and :ref:`application_run`.
 
diff --git a/boards/panasonic/pan1783/board.cmake b/boards/panasonic/pan1783/board.cmake
index 1a211bc95c9fb..0de36eb5bbc48 100644
--- a/boards/panasonic/pan1783/board.cmake
+++ b/boards/panasonic/pan1783/board.cmake
@@ -8,5 +8,6 @@ if(CONFIG_SOC_NRF5340_CPUNET_QKAA)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/panasonic/pan1783/doc/index.rst b/boards/panasonic/pan1783/doc/index.rst
index 72759be8d62ee..3f2a337f47c1a 100644
--- a/boards/panasonic/pan1783/doc/index.rst
+++ b/boards/panasonic/pan1783/doc/index.rst
@@ -50,6 +50,8 @@ of the `Panasonic Wireless Connectivity Development Hub`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Please use the ``pan1783_evb_cpuapp``, ``pan1783a_evb_cpuapp`` or
 ``pan1783a_pa_evb_cpuapp`` for application core and ``pan1783_evb_cpunet``,
 ``pan1783a_evb_cpunet`` or ``pan1783a_pa_evb_cpunet`` board configuration
diff --git a/boards/panasonic/panb511evb/Kconfig.defconfig b/boards/panasonic/panb511evb/Kconfig.defconfig
new file mode 100644
index 0000000000000..03c84b8f538ee
--- /dev/null
+++ b/boards/panasonic/panb511evb/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_PANB511EVB_NRF54L15_CPUAPP
+
+config ROM_START_OFFSET
+	default 0x800 if BOOTLOADER_MCUBOOT
+
+endif # BOARD_PANB511EVB_NRF54L15_CPUAPP
diff --git a/boards/panasonic/panb511evb/Kconfig.panb511evb b/boards/panasonic/panb511evb/Kconfig.panb511evb
new file mode 100644
index 0000000000000..2454aba6270c1
--- /dev/null
+++ b/boards/panasonic/panb511evb/Kconfig.panb511evb
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_PANB511EVB
+	select SOC_NRF54L15_CPUAPP if BOARD_PANB511EVB_NRF54L15_CPUAPP
+	select SOC_NRF54L15_CPUFLPR if BOARD_PANB511EVB_NRF54L15_CPUFLPR || \
+					    BOARD_PANB511EVB_NRF54L15_CPUFLPR_XIP
diff --git a/boards/panasonic/panb511evb/board.cmake b/boards/panasonic/panb511evb/board.cmake
new file mode 100644
index 0000000000000..3138d0b04d779
--- /dev/null
+++ b/boards/panasonic/panb511evb/board.cmake
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_SOC_NRF54L15_CPUAPP)
+  board_runner_args(jlink "--device=nRF54L15_M33" "--speed=4000")
+elseif(CONFIG_SOC_NRF54L15_CPUFLPR)
+  set(JLINKSCRIPTFILE ${CMAKE_CURRENT_LIST_DIR}/support/nrf54l15_cpuflpr.JLinkScript)
+  board_runner_args(jlink "--device=RISC-V" "--speed=4000" "-if SW" "--tool-opt=-jlinkscriptfile ${JLINKSCRIPTFILE}")
+endif()
+
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/panasonic/panb511evb/board.yml b/boards/panasonic/panb511evb/board.yml
new file mode 100644
index 0000000000000..a7e9a5901a4f5
--- /dev/null
+++ b/boards/panasonic/panb511evb/board.yml
@@ -0,0 +1,9 @@
+board:
+  name: panb511evb
+  full_name: PAN B511 Evaluation Board
+  vendor: panasonic
+  socs:
+  - name: nrf54l15
+    variants:
+    - name: xip
+      cpucluster: cpuflpr
diff --git a/boards/panasonic/panb511evb/doc/img/panb511evb.webp b/boards/panasonic/panb511evb/doc/img/panb511evb.webp
new file mode 100644
index 0000000000000..51748e65c8df5
Binary files /dev/null and b/boards/panasonic/panb511evb/doc/img/panb511evb.webp differ
diff --git a/boards/panasonic/panb511evb/doc/index.rst b/boards/panasonic/panb511evb/doc/index.rst
new file mode 100644
index 0000000000000..25920e774820d
--- /dev/null
+++ b/boards/panasonic/panb511evb/doc/index.rst
@@ -0,0 +1,46 @@
+.. zephyr:board:: panb511evb
+
+Overview
+********
+
+The PAN B511 Evaluation Board (panb511evb) is a development tool
+for the PAN B511 module which is based on the nRF54L15 chipset
+from Nordic Semiconductor.
+
+More information about the PAN B511 Module Variants and Evaluation Board can be found
+on the `product website`_.
+
+Usage
+*****
+
+You can find the `panb511evb user guide`_ for the PAN B511 Evaluation Board in the
+`Panasonic Wireless Connectivity Development Hub`_.
+
+The User Guide contains (amongst other things) detailed information about
+
+* pin mapping
+* powering options
+* breakout pin header interface
+* current consumption measurement
+* software development
+
+and other things.
+
+The schematics for the PANB511 Evaluation Boards are available in the
+`download section PANB511`_ of the `Panasonic Wireless Connectivity Development Hub`_.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``panb511evb/nrf54l15/cpuapp`` board target can
+be built, flashed, and debugged in the usual way. See
+:ref:`build_an_application` and :ref:`application_run` for more details on
+building and running.
+
+.. target-notes::
+.. _product website: https://industry.panasonic.eu/products/devices/wireless-connectivity/bluetooth-low-energy-modules
+.. _Panasonic Wireless Connectivity Development Hub: https://pideu.panasonic.de/development-hub/
+.. _panb511evb user guide: https://pideu.panasonic.de/development-hub/panb511/evaluation_board/user_guide/
+.. _download section PANB511: https://pideu.panasonic.de/development-hub/panb511/downloads/
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15-pinctrl.dtsi b/boards/panasonic/panb511evb/panb511evb_nrf54l15-pinctrl.dtsi
new file mode 100644
index 0000000000000..bc3a54459d978
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15-pinctrl.dtsi
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	/omit-if-no-ref/ uart20_default: uart20_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 1, 5)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart20_sleep: uart20_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RX, 1, 5)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 3)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 4)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 1)>,
+				<NRF_PSEL(UART_RX, 0, 2)>,
+				<NRF_PSEL(UART_RTS, 0, 3)>,
+				<NRF_PSEL(UART_CTS, 0, 4)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi00_default: spi00_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
+				<NRF_PSEL(SPIM_MISO, 2, 4)>;
+		};
+	};
+
+	/omit-if-no-ref/ spi00_sleep: spi00_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
+				<NRF_PSEL(SPIM_MISO, 2, 4)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_default: pwm20_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
+			low-power-enable;
+		};
+	};
+};
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_common.dtsi b/boards/panasonic/panb511evb/panb511evb_nrf54l15_common.dtsi
new file mode 100644
index 0000000000000..fc300f888b92a
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_common.dtsi
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "panb511evb_nrf54l15-pinctrl.dtsi"
+
+/ {
+	leds {
+		compatible = "gpio-leds";
+
+		evb_led1: evb_led_1 {
+			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+			label = "LED1 on EVB";
+		};
+
+		evb_led2: evb_led_2 {
+			gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+			label = "LED2 on EVB";
+		};
+
+		evb_led3: evb_led_3 {
+			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			label = "LED3 on EVB";
+		};
+
+		evb_led4: evb_led_4 {
+			gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
+			label = "LED4 on EVB";
+		};
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+
+		/*
+		 * PWM signal can be exposed on GPIO pin only within same domain.
+		 * There is only one domain which contains both PWM and GPIO:
+		 * PWM20/21/22 and GPIO Port P1.
+		 * Only LEDs connected to P1 can work with PWM, for example LED1.
+		 */
+		pwm_evb_led1: pwm_evb_led_1 {
+			pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		evb_sw1: evb_sw_1 {
+			gpios = <&gpio1 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW1 on EVB";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		evb_sw2: evb_sw_2 {
+			gpios = <&gpio1 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW2 on EVB";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+
+		evb_sw3: evb_sw_3 {
+			gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW3 on EVB";
+			zephyr,code = <INPUT_KEY_2>;
+		};
+
+		evb_sw4: evb_sw_4 {
+			gpios = <&gpio1 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "SW4 on EVB";
+			zephyr,code = <INPUT_KEY_3>;
+		};
+	};
+
+	mikrobus_header: mikrobus-connector {
+		compatible = "mikro-bus";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio1 6 0>,	/* AN */
+			/* Not a GPIO*/		/* RST */
+			<2 0 &gpio2 10 0>,	/* CS */
+			<3 0 &gpio2 6 0>,	/* SCK */
+			<4 0 &gpio2 9 0>,	/* MISO */
+			<5 0 &gpio2 8 0>,	/* MOSI */
+			/* +3.3V */
+			/* GND */
+			<6 0 &gpio1 15 0>,	/* PWM */
+			<7 0 &gpio2 7 0>,	/* INT */
+			<8 0 &gpio1 5 0>,	/* RX */
+			<9 0 &gpio1 4 0>,	/* TX */
+			<10 0 &gpio1 8 0>,	/* SCL */
+			<11 0 &gpio1 9 0>;	/* SDA */
+			/* +5V */
+			/* GND */
+	};
+
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio1 6 0>, /* A0 */
+			<1 0 &gpio1 7 0>, /* A1 */
+			<2 0 &gpio1 11 0>, /* A2 */
+			<3 0 &gpio1 12 0>, /* A3 */
+			<4 0 &gpio1 13 0>, /* A4 */
+			<5 0 &gpio1 14 0>, /* A5 */
+			<6 0 &gpio1 4 0>, /* D0 */
+			<7 0 &gpio1 5 0>, /* D1 */
+			<8 0 &gpio0 0 0>, /* D2 */
+			<9 0 &gpio1 2 0>, /* D3 */
+			<10 0 &gpio1 3 0>, /* D4 */
+			<11 0 &gpio1 10 0>, /* D5 */
+			<12 0 &gpio1 13 0>, /* D6 */
+			<13 0 &gpio1 14 0>, /* D7 */
+			<14 0 &gpio1 15 0>, /* D8 */
+			<15 0 &gpio2 7 0>, /* D9 */
+			<16 0 &gpio2 10 0>, /* D10 */
+			<17 0 &gpio2 8 0>, /* D11 */
+			<18 0 &gpio2 9 0>, /* D12 */
+			<19 0 &gpio2 6 0>, /* D13 */
+			<20 0 &gpio1 9 0>, /* D14 */
+			<21 0 &gpio1 8 0>; /* D15 */
+	};
+
+	arduino_adc: analog-connector {
+		compatible = "arduino,uno-adc";
+		#io-channel-cells = <1>;
+		io-channel-map = <0 &adc 0>,	/* A0 = P1.06 = AIN0 */
+			<1 &adc 1>,	/* A1 = P1.07 = AIN1 */
+			<2 &adc 2>,	/* A2 = P1.11 = AIN2 */
+			<3 &adc 3>,	/* A3 = P1.12 = AIN3 */
+			<4 &adc 4>,	/* A4 = P1.13 = AIN4 */
+			<5 &adc 5>;	/* A5 = P1.14 = AIN5 */
+	};
+
+	aliases {
+		led0 = &evb_led1;
+		led1 = &evb_led2;
+		led2 = &evb_led3;
+		led3 = &evb_led4;
+		pwm-led0 = &pwm_evb_led1;
+		sw0 = &evb_sw1;
+		sw1 = &evb_sw2;
+		sw2 = &evb_sw3;
+		sw3 = &evb_sw4;
+		watchdog0 = &wdt31;
+	};
+};
+
+&uart20 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&pwm20 {
+	status = "okay";
+	pinctrl-0 = <&pwm20_default>;
+	pinctrl-1 = <&pwm20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts
new file mode 100644
index 0000000000000..c79847a3b57b0
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <nordic/nrf54l15_cpuapp.dtsi>
+#include "panb511evb_nrf54l15_cpuapp_common.dtsi"
+
+/ {
+	compatible = "panasonic-industrial-devices-europe-gmbh,panb511evb-cpuapp";
+	model = "Panasonic PAN B511 EVB nRF54L15 Application MCU";
+
+	chosen {
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
+	};
+};
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(324)>;
+		};
+
+		slot0_ns_partition: partition@61000 {
+			label = "image-0-nonsecure";
+			reg = <0x61000 DT_SIZE_K(324)>;
+		};
+
+		slot1_partition: partition@b2000 {
+			label = "image-1";
+			reg = <0xb2000 DT_SIZE_K(324)>;
+		};
+
+		slot1_ns_partition: partition@103000 {
+			label = "image-1-nonsecure";
+			reg = <0x103000 DT_SIZE_K(324)>;
+		};
+
+		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
+		storage_partition: partition@15c000 {
+			label = "storage";
+			reg = <0x15c000 DT_SIZE_K(36)>;
+		};
+	};
+};
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml
new file mode 100644
index 0000000000000..b30e5ffa106b4
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: panb511evb/nrf54l15/cpuapp
+name: PANB511-EVB-nRF54l15-Application
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - zephyr
+sysbuild: true
+ram: 188
+flash: 324
+supported:
+  - adc
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - retained_mem
+  - spi
+  - watchdog
+  - i2s
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_common.dtsi b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_common.dtsi
new file mode 100644
index 0000000000000..bf7922d8069eb
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_common.dtsi
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* This file is common to the secure and non-secure domain */
+
+#include "panb511evb_nrf54l15_common.dtsi"
+
+/ {
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,uart-mcumgr = &uart30;
+		zephyr,bt-mon-uart = &uart30;
+		zephyr,bt-c2h-uart = &uart30;
+		zephyr,flash-controller = &rram_controller;
+		zephyr,flash = &cpuapp_rram;
+		zephyr,ieee802154 = &ieee802154;
+	};
+};
+
+&cpuapp_sram {
+	status = "okay";
+};
+
+&lfxo {
+	load-capacitors = "internal";
+	load-capacitance-femtofarad = <15500>;
+};
+
+&hfxo {
+	load-capacitors = "internal";
+	load-capacitance-femtofarad = <15000>;
+};
+
+&regulators {
+	status = "okay";
+};
+
+&vregmain {
+	status = "okay";
+	regulator-initial-mode = <NRF5X_REG_MODE_DCDC>;
+};
+
+&grtc {
+	owned-channels = <0 1 2 3 4 5 6 7 8 9 10 11>;
+	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
+	child-owned-channels = <3 4 7 8 9 10 11>;
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
+
+&radio {
+	status = "okay";
+};
+
+&ieee802154 {
+	status = "okay";
+};
+
+&temp {
+	status = "okay";
+};
+
+&clock {
+	status = "okay";
+};
+
+&spi00 {
+	status = "okay";
+	cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
+	pinctrl-0 = <&spi00_default>;
+	pinctrl-1 = <&spi00_sleep>;
+	pinctrl-names = "default", "sleep";
+
+	mx25r64: mx25r6435f@0 {
+		compatible = "jedec,spi-nor";
+		status = "okay";
+		reg = <0>;
+		spi-max-frequency = <8000000>;
+		jedec-id = [c2 28 17];
+		sfdp-bfp = [
+			e5 20 f1 ff  ff ff ff 03  44 eb 08 6b  08 3b 04 bb
+			ee ff ff ff  ff ff 00 ff  ff ff 00 ff  0c 20 0f 52
+			10 d8 00 ff  23 72 f5 00  82 ed 04 cc  44 83 48 44
+			30 b0 30 b0  f7 c4 d5 5c  00 be 29 ff  f0 d0 ff ff
+		];
+		size = <67108864>;
+		has-dpd;
+		t-enter-dpd = <10000>;
+		t-exit-dpd = <35000>;
+	};
+};
+
+&adc {
+	status = "okay";
+};
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_defconfig b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_defconfig
new file mode 100644
index 0000000000000..41648ab5b23b0
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_defconfig
@@ -0,0 +1,29 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# MPU-based null-pointer dereferencing detection cannot
+# be applied as the (0x0 - 0x400) is unmapped for this target.
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable Cache
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_EXTERNAL_CACHE=y
+
+# Start SYSCOUNTER on driver init
+CONFIG_NRF_GRTC_START_SYSCOUNTER=y
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr.dts b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr.dts
new file mode 100644
index 0000000000000..5a238b48a6ba1
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr.dts
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l15_cpuflpr.dtsi>
+#include "panb511evb_nrf54l15_common.dtsi"
+
+/ {
+	model = "Panasonic PAN B511 EVB nRF54L15 FLPR MCU";
+	compatible = "panasonic-industrial-devices-europe-gmbh,panb511evb-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart20;
+		zephyr,shell-uart = &uart20;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+	/* Size must be increased due to booting from SRAM */
+	reg = <0x20028000 DT_SIZE_K(96)>;
+	ranges = <0x0 0x20028000 0x18000>;
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(96)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+	status = "okay";
+};
+
+&uart20 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr.yaml b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr.yaml
new file mode 100644
index 0000000000000..481fcb00bd05d
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: panb511evb/nrf54l15/cpuflpr
+name: PANB511-EVB-nRF54L15-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 96
+flash: 96
+supported:
+  - counter
+  - gpio
+  - i2c
+  - spi
+  - watchdog
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_defconfig b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_defconfig
new file mode 100644
index 0000000000000..35618b20a6e63
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_defconfig
@@ -0,0 +1,17 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip.dts b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip.dts
new file mode 100644
index 0000000000000..f14f44e097597
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip.dts
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "panb511evb_nrf54l15_cpuflpr.dts"
+
+&cpuflpr_sram {
+	reg = <0x2002f000 DT_SIZE_K(68)>;
+	ranges = <0x0 0x2002f000 0x11000>;
+};
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip.yaml b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip.yaml
new file mode 100644
index 0000000000000..e54c5a7b9fdd6
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: panb511evb/nrf54l15/cpuflpr/xip
+name: PANB511-EVB-nRF54L15-Fast-Lightweight-Peripheral-Processor (RRAM XIP)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 68
+flash: 96
+supported:
+  - counter
+  - gpio
+  - i2c
+  - spi
+  - watchdog
diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip_defconfig b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip_defconfig
new file mode 100644
index 0000000000000..8f75855af3cd4
--- /dev/null
+++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuflpr_xip_defconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Execute from RRAM
+CONFIG_XIP=y
diff --git a/boards/panasonic/panb511evb/support/nrf54l15_cpuflpr.JLinkScript b/boards/panasonic/panb511evb/support/nrf54l15_cpuflpr.JLinkScript
new file mode 100644
index 0000000000000..1cf94ee52a4d0
--- /dev/null
+++ b/boards/panasonic/panb511evb/support/nrf54l15_cpuflpr.JLinkScript
@@ -0,0 +1,5 @@
+int InitTarget(void) {
+  // Base address where DMI registers can be found in the APB address space
+  JLINK_ExecCommand("CORESIGHT_SetCoreBaseAddr = 0x5004C400");
+  return 0;
+}
diff --git a/boards/particle/argon/board.cmake b/boards/particle/argon/board.cmake
index 93142011fe3c3..2295627b311a2 100644
--- a/boards/particle/argon/board.cmake
+++ b/boards/particle/argon/board.cmake
@@ -7,5 +7,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/particle/argon/doc/index.rst b/boards/particle/argon/doc/index.rst
index d0391a102a495..adc9dc6d2a294 100644
--- a/boards/particle/argon/doc/index.rst
+++ b/boards/particle/argon/doc/index.rst
@@ -37,31 +37,7 @@ It contains circuitry for LIPO usage and can be charged via the USB port.
 Supported Features
 ==================
 
-The particle_argon board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -118,6 +94,8 @@ UART
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``particle_argon`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
diff --git a/boards/particle/boron/board.cmake b/boards/particle/boron/board.cmake
index 93142011fe3c3..2295627b311a2 100644
--- a/boards/particle/boron/board.cmake
+++ b/boards/particle/boron/board.cmake
@@ -7,5 +7,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/particle/boron/doc/index.rst b/boards/particle/boron/doc/index.rst
index 73ece4387d678..fcdff03cc8fd4 100644
--- a/boards/particle/boron/doc/index.rst
+++ b/boards/particle/boron/doc/index.rst
@@ -37,31 +37,7 @@ It contains circuitry for LIPO usage and can be charged via the USB port.
 Supported Features
 ==================
 
-The particle_boron board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -114,6 +90,8 @@ UART
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``particle_boron`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
diff --git a/boards/particle/nrf51_blenano/doc/index.rst b/boards/particle/nrf51_blenano/doc/index.rst
index 5cedb0aa10011..36743f56656c4 100644
--- a/boards/particle/nrf51_blenano/doc/index.rst
+++ b/boards/particle/nrf51_blenano/doc/index.rst
@@ -15,25 +15,7 @@ is 32.768 kHz. The frequency of the main clock is 16 MHz.
 Supported Features
 ==================
 
-The nrf51_blenano board configuration supports the following nRF51
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ====================
@@ -58,6 +40,8 @@ More information about Nano and DAPLink can be found at the `RedBear Github`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf51_blenano`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/particle/nrf51_blenano/nrf51_blenano.dts b/boards/particle/nrf51_blenano/nrf51_blenano.dts
index f3e4dc8509c9e..8770c0b09ffdb 100644
--- a/boards/particle/nrf51_blenano/nrf51_blenano.dts
+++ b/boards/particle/nrf51_blenano/nrf51_blenano.dts
@@ -29,7 +29,7 @@
 	leds {
 		compatible = "gpio-leds";
 		led0: led_0 {
-			gpios = <&gpio0 19 0>;
+			gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
 			label = "LED";
 		};
 	};
diff --git a/boards/particle/nrf52_blenano2/doc/index.rst b/boards/particle/nrf52_blenano2/doc/index.rst
index 5fd77e80c6784..003378a166fe2 100644
--- a/boards/particle/nrf52_blenano2/doc/index.rst
+++ b/boards/particle/nrf52_blenano2/doc/index.rst
@@ -17,23 +17,8 @@ Hardware
 
 Supported Features
 ==================
-The BLE Nano v2 board configuration supports the following hardware features:
-
-+-----------+------------+--------------------------------------+
-| Interface | Controller |      Driver/Component                |
-+===========+============+======================================+
-| NVIC      | on-chip    | nested vectored interrupt controller |
-+-----------+------------+--------------------------------------+
-| UART      | on-chip    | serial port                          |
-+-----------+------------+--------------------------------------+
-| GPIO      | on-chip    | gpio                                 |
-+-----------+------------+--------------------------------------+
-| FLASH     | on-chip    | flash                                |
-+-----------+------------+--------------------------------------+
-| RADIO     | on-chip    | Bluetooth                            |
-+-----------+------------+--------------------------------------+
-| I2C       | on-chip    | i2c                                  |
-+-----------+------------+--------------------------------------+
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ====================
@@ -57,6 +42,8 @@ It also regulates 5V from USB to 3.3V via the onboard LDO to power Nano v2.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf52_blenano2`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/particle/xenon/board.cmake b/boards/particle/xenon/board.cmake
index bb9c46f26c122..e458fa5fd1c49 100644
--- a/boards/particle/xenon/board.cmake
+++ b/boards/particle/xenon/board.cmake
@@ -8,5 +8,6 @@ board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(nrfjprog "--softreset")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/particle/xenon/doc/index.rst b/boards/particle/xenon/doc/index.rst
index 795393b09f4e8..4f6cf37fcf4b2 100644
--- a/boards/particle/xenon/doc/index.rst
+++ b/boards/particle/xenon/doc/index.rst
@@ -36,31 +36,7 @@ It contains circuitry for LIPO usage and can be charged via the USB port.
 Supported Features
 ==================
 
-The particle_xenon board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -119,6 +95,8 @@ UART
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``particle_xenon`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
diff --git a/boards/peregrine/sam4l_wm400_cape/doc/index.rst b/boards/peregrine/sam4l_wm400_cape/doc/index.rst
index 95ed6d6db5edd..586c7cb5f8b8f 100644
--- a/boards/peregrine/sam4l_wm400_cape/doc/index.rst
+++ b/boards/peregrine/sam4l_wm400_cape/doc/index.rst
@@ -29,38 +29,7 @@ Hardware
 Supported Features
 ==================
 
-The ``sam4l_wm400_cape`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| HWINFO    | on-chip    | Unique 120 bit serial number        |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | ieee802154                          |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| TWIM      | on-chip    | i2c master port-interrupt           |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/peregrine/sam4l_wm400_cape/sam4l_wm400_cape_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -83,6 +52,8 @@ RS-232 onboard port or via USB device.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The SAM4L WM-400 Cape board has a 10-pin header to connect to a Segger JLink.
 Using the JLink is possible to program and debug the SAM4LC4B chip. The board
 came with a SAM-BA bootloader that only can be used to flash the software.
diff --git a/boards/phytec/phyboard_electra/phyboard_electra_am6442_m4.dts b/boards/phytec/phyboard_electra/phyboard_electra_am6442_m4.dts
index d19c5a62c923b..cc243d6243c55 100644
--- a/boards/phytec/phyboard_electra/phyboard_electra_am6442_m4.dts
+++ b/boards/phytec/phyboard_electra/phyboard_electra_am6442_m4.dts
@@ -17,7 +17,8 @@
 		zephyr,sram = &sram0;
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
-		zephyr,sram1 = &ddr0;
+		zephyr,ipc_shm = &ddr0;
+		zephyr,sram1 = &ddr1;
 	};
 
 	aliases {
@@ -31,9 +32,20 @@
 		};
 	};
 
-	ddr0:memory@a4100000 {
+	ddr0: memory@a4000000 {
+		compatible = "mmio-sram";
+		reg = <0xa4000000 DT_SIZE_M(1)>;
+	};
+
+	rsc_table: memory@a4100000 {
 		compatible = "zephyr,memory-region", "mmio-sram";
 		reg = <0xa4100000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RSC_TABLE";
+	};
+
+	ddr1: memory@a4101000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0xa4101000 (DT_SIZE_M(15) - DT_SIZE_K(4))>;
 		zephyr,memory-region = "DDR";
 	};
 
diff --git a/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.dts b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.dts
index 8112aeba41946..403277aea0670 100644
--- a/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.dts
+++ b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_m4.dts
@@ -17,7 +17,8 @@
 		zephyr,sram = &sram0;
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
-		zephyr,sram1 = &ddr0;
+		zephyr,ipc_shm = &ddr0;
+		zephyr,sram1 = &ddr1;
 	};
 
 	aliases {
@@ -31,9 +32,20 @@
 		};
 	};
 
-	ddr0:memory@9CC00000{
+	ddr0: memory@9cb00000 {
+		compatible = "mmio-sram";
+		reg = <0x9cb00000 DT_SIZE_M(1)>;
+	};
+
+	rsc_table: memory@9cc00000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x9cc00000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RSC_TABLE";
+	};
+
+	ddr1: memory@9cc01000 {
 		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x9CC00000 DT_SIZE_K(4)>;
+		reg = <0x9cc01000 (DT_SIZE_M(15) - DT_SIZE_K(4))>;
 		zephyr,memory-region = "DDR";
 	};
 
diff --git a/boards/pimoroni/index.rst b/boards/pimoroni/index.rst
new file mode 100644
index 0000000000000..3867af38c3ca8
--- /dev/null
+++ b/boards/pimoroni/index.rst
@@ -0,0 +1,10 @@
+.. _boards-pimoroni:
+
+Pimoroni Ltd.
+#############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/pimoroni/pico_plus2/Kconfig.defconfig b/boards/pimoroni/pico_plus2/Kconfig.defconfig
new file mode 100644
index 0000000000000..35cdf92705462
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_PICO_PLUS2
+
+config USB_SELF_POWERED
+	default n
+
+endif # BOARD_PICO_PLUS2
diff --git a/boards/pimoroni/pico_plus2/Kconfig.pico_plus2 b/boards/pimoroni/pico_plus2/Kconfig.pico_plus2
new file mode 100644
index 0000000000000..cd30fda60aeac
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/Kconfig.pico_plus2
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_PICO_PLUS2
+	select SOC_RP2350B_M33 if BOARD_PICO_PLUS2_RP2350B_M33
diff --git a/boards/pimoroni/pico_plus2/board.cmake b/boards/pimoroni/pico_plus2/board.cmake
new file mode 100644
index 0000000000000..6de42450d8927
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/board.cmake
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(openocd --cmd-pre-init "source [find interface/cmsis-dap.cfg]")
+board_runner_args(openocd --cmd-pre-init "source [find target/rp2350.cfg]")
+
+# The adapter speed is expected to be set by interface configuration.
+# The Raspberry Pi's OpenOCD fork doesn't, so match their documentation at
+# https://www.raspberrypi.com/documentation/microcontrollers/debug-probe.html#debugging-with-swd
+board_runner_args(openocd --cmd-pre-init "set_adapter_speed_if_not_set 5000")
+
+board_runner_args(uf2 "--board-id=RP2350")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
diff --git a/boards/pimoroni/pico_plus2/board.yml b/boards/pimoroni/pico_plus2/board.yml
new file mode 100644
index 0000000000000..71acca8e80e88
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: pico_plus2
+  full_name: Pimoroni Pico Plus2
+  vendor: pimoroni
+  socs:
+  - name: rp2350b
diff --git a/boards/pimoroni/pico_plus2/doc/img/pico_plus2.webp b/boards/pimoroni/pico_plus2/doc/img/pico_plus2.webp
new file mode 100644
index 0000000000000..4d4967b6a58d9
Binary files /dev/null and b/boards/pimoroni/pico_plus2/doc/img/pico_plus2.webp differ
diff --git a/boards/pimoroni/pico_plus2/doc/index.rst b/boards/pimoroni/pico_plus2/doc/index.rst
new file mode 100644
index 0000000000000..28f265e38988e
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/doc/index.rst
@@ -0,0 +1,61 @@
+.. zephyr:board:: pico_plus2
+
+Overview
+********
+
+The `Pimoroni Pico Plus 2`_ is a compact and versatile board featuring the Raspberry Pi RP2350B SoC.
+It includes USB Type-C, Qwiic/STEMMA QT connectors, SP/CE connectors, a debug connector,
+a reset button, and a BOOT button.
+
+Hardware
+********
+
+- Dual Cortex-M33 or Hazard3 processors at up to 150MHz
+- 520KB of SRAM, and 4MB of on-board flash memory
+- 16MB of on-board QSPI flash (supports XiP)
+- 8MB of PSRAM
+- USB 1.1 with device and host support
+- Low-power sleep and dormant modes
+- Drag-and-drop programming using mass storage over USB
+- 48 multi-function GPIO pins including 8 that can be used for ADC
+- 2 SPI, 2 I2C, 2 UART, 3 12-bit 500ksps Analogue to Digital - Converter (ADC), 24 controllable PWM channels
+- 2 Timer with 4 alarms, 1 AON Timer
+- Temperature sensor
+- 3 Programmable IO (PIO) blocks, 12 state machines total for custom peripheral support
+- USB-C connector for power, programming, and data transfer
+- Qwiic/STEMMA QT(Qw/ST) connector
+- SP/CE connector
+- 3-pin debug connector, this can use with `Raspberry Pi Debug Probe`_.
+- Reset button and BOOT button (BOOT button also usable as a user switch)
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+You can use peripherals that are made by using the PIO.
+See :ref:`rpi_pico_pio_based_features`
+
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+The overall explanation regarding flashing and debugging is the same as or ``rpi_pico``.
+See :ref:`rpi_pico_flashing_using_openocd` and :ref:`rpi_pico_flashing_using_uf2`
+in ``rpi_pico`` documentation.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: pico_plus2
+   :goals: build flash
+   :gen-args: -DOPENOCD=/usr/local/bin/openocd
+
+.. target-notes::
+
+.. _Pimoroni Pico Plus 2:
+  https://shop.pimoroni.com/products/pimoroni-pico-plus-2
+
+.. _Raspberry Pi Debug Probe:
+   https://www.raspberrypi.com/documentation/microcontrollers/debug-probe.html
diff --git a/boards/pimoroni/pico_plus2/pico_plus2-pinctrl.dtsi b/boards/pimoroni/pico_plus2/pico_plus2-pinctrl.dtsi
new file mode 100644
index 0000000000000..1a0112cb80bd9
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/pico_plus2-pinctrl.dtsi
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024 TOKITA Hiroshi
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/rpi-pico-rp2350b-pinctrl.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_P0>;
+		};
+
+		group2 {
+			pinmux = <UART0_RX_P1>;
+			input-enable;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_P4>, <I2C0_SCL_P5>;
+			input-enable;
+			input-schmitt-enable;
+		};
+	};
+
+	spi0_default: spi0_default {
+		group1 {
+			pinmux = <SPI0_CSN_P17>, <SPI0_SCK_P18>, <SPI0_TX_P19>;
+		};
+
+		group2 {
+			pinmux = <SPI0_RX_P16>;
+			input-enable;
+		};
+	};
+
+	pwm_ch4b_default: pwm_ch4b_default {
+		group1 {
+			pinmux = <PWM_4B_P25>;
+		};
+	};
+
+	adc_default: adc_default {
+		group1 {
+			pinmux = <ADC_CH0_P40>, <ADC_CH1_P41>, <ADC_CH2_P42>, <ADC_CH3_P43>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/pimoroni/pico_plus2/pico_plus2.dtsi b/boards/pimoroni/pico_plus2/pico_plus2.dtsi
new file mode 100644
index 0000000000000..f77ae33e0421c
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/pico_plus2.dtsi
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2024 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <freq.h>
+
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+#include "pico_plus2-pinctrl.dtsi"
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,code-partition = &code_partition;
+	};
+
+	aliases {
+		watchdog0 = &wdt0;
+		led0 = &led0;
+		pwm-led0 = &pwm_led0;
+		sw0 = &user_sw;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led_0 {
+			gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
+			label = "LED";
+		};
+	};
+
+	pwm_leds {
+		compatible = "pwm-leds";
+		status = "disabled";
+
+		pwm_led0: pwm_led_0 {
+			pwms = <&pwm 9 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM_LED";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		user_sw: user_sw {
+			gpios = <&gpio0_hi 13 (GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	pico_header: connector {
+		compatible = "raspberrypi,pico-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio0 0 0>,	/* GP0 */
+			<1 0 &gpio0 1 0>,	/* GP1 */
+			<2 0 &gpio0 2 0>,	/* GP2 */
+			<3 0 &gpio0 3 0>,	/* GP3 */
+			<4 0 &gpio0 4 0>,	/* GP4 */
+			<5 0 &gpio0 5 0>,	/* GP5 */
+			<6 0 &gpio0 6 0>,	/* GP6 */
+			<7 0 &gpio0 7 0>,	/* GP7 */
+			<8 0 &gpio0 8 0>,	/* GP8 */
+			<9 0 &gpio0 9 0>,	/* GP9 */
+			<10 0 &gpio0 10 0>,	/* GP10 */
+			<11 0 &gpio0 11 0>,	/* GP11 */
+			<12 0 &gpio0 12 0>,	/* GP12 */
+			<13 0 &gpio0 13 0>,	/* GP13 */
+			<14 0 &gpio0 14 0>,	/* GP14 */
+			<15 0 &gpio0 15 0>,	/* GP15 */
+			<16 0 &gpio0 16 0>,	/* GP16 */
+			<17 0 &gpio0 17 0>,	/* GP17 */
+			<18 0 &gpio0 18 0>,	/* GP18 */
+			<19 0 &gpio0 19 0>,	/* GP19 */
+			<20 0 &gpio0 20 0>,	/* GP20 */
+			<21 0 &gpio0 21 0>,	/* GP21 */
+			<22 0 &gpio0 22 0>,	/* GP22 */
+			<26 0 &gpio0 26 0>,	/* GP26 */
+			<27 0 &gpio0 27 0>,	/* GP27 */
+			<28 0 &gpio0 28 0>;	/* GP28 */
+	};
+};
+
+&flash0 {
+	reg = <0x10000000 DT_SIZE_M(16)>;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Reserved memory for an image definition block. The block is much
+		 * smaller than 256 bytes, but in practice the linker places the vector
+		 * table at a much larger alignment offset.
+		 */
+		image_def: partition@0 {
+			label = "image_def";
+			reg = <0x00000000 0x100>;
+			read-only;
+		};
+
+		/*
+		 * Usable flash. Starts at 0x100, after the image definition block.
+		 * The partition size is 16MB minus the 0x100 bytes taken by the
+		 * image definition.
+		 */
+		code_partition: partition@100 {
+			label = "code-partition";
+			reg = <0x100 (DT_SIZE_M(16) - 0x100)>;
+			read-only;
+		};
+	};
+};
+
+&uart0 {
+	current-speed = <115200>;
+	status = "okay";
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+gpio0_lo: &gpio0 {
+	status = "okay";
+};
+
+&gpio0_hi {
+	status = "okay";
+};
+
+&spi0 {
+	clock-frequency = <DT_FREQ_M(8)>;
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&i2c0 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&adc {
+	pinctrl-0 = <&adc_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&pwm {
+	pinctrl-0 = <&pwm_ch4b_default>;
+	pinctrl-names = "default";
+	divider-int-0 = <255>;
+};
+
+&timer0 {
+	status = "okay";
+};
+
+zephyr_udc0: &usbd {
+	status = "okay";
+};
+
+
+pico_spi: &spi0 {};
+pico_i2c0: &i2c0 {};
+pico_i2c1: &i2c1 {};
+pico_serial: &uart0 {};
+stemma_qt_i2c: &i2c0 {};
diff --git a/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33.dts b/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33.dts
new file mode 100644
index 0000000000000..425c2237f7350
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+/* The build system assumes that there's a cpucluster-specific file.
+ *
+ * This file provides composition of the device tree:
+ * 1. The common features of the SoC
+ * 2. Core-specific configuration.
+ * 3. Board-specific configuration.
+ */
+#include <raspberrypi/rpi_pico/rp2350b.dtsi>
+#include <raspberrypi/rpi_pico/m33.dtsi>
+
+/* there's nothing specific to the Cortex-M33 cores vs the (not yet
+ * implemented) Hazard3 cores.
+ */
+#include "pico_plus2.dtsi"
diff --git a/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33.yaml b/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33.yaml
new file mode 100644
index 0000000000000..a3ac06cff12c3
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33.yaml
@@ -0,0 +1,21 @@
+identifier: pico_plus2/rp2350b/m33
+name: Pimoroni Pico Plus 2 (Cortex-M33)
+type: mcu
+arch: arm
+flash: 16384
+ram: 8192
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - adc
+  - clock
+  - counter
+  - dma
+  - gpio
+  - hwinfo
+  - i2c
+  - pwm
+  - spi
+  - usbd
+  - uart
diff --git a/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33_defconfig b/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33_defconfig
new file mode 100644
index 0000000000000..8bd68e3511391
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/pico_plus2_rp2350b_m33_defconfig
@@ -0,0 +1,14 @@
+# This configuration is orthogonal to whether the Cortex-M33 or Hazard3 cores
+# are in use, but Zephyr does not support providing a qualifier-agnostic
+# _defconfig file.
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_BUILD_OUTPUT_UF2=y
+CONFIG_CLOCK_CONTROL=y
+CONFIG_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_RESET=y
+CONFIG_SERIAL=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=150000000
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_USE_DT_CODE_PARTITION=y
diff --git a/boards/pimoroni/pico_plus2/support/openocd.cfg b/boards/pimoroni/pico_plus2/support/openocd.cfg
new file mode 100644
index 0000000000000..82666bb53314c
--- /dev/null
+++ b/boards/pimoroni/pico_plus2/support/openocd.cfg
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+# Checking and set 'adapter speed'.
+# Set the adaptor speed, if unset, and given as an argument.
+proc set_adapter_speed_if_not_set { speed } {
+	puts "checking adapter speed..."
+	if { [catch {adapter speed} ret] } {
+		adapter speed $speed
+	}
+}
diff --git a/boards/pine64/pinetime_devkit0/doc/index.rst b/boards/pine64/pinetime_devkit0/doc/index.rst
index 097bbcf4a11a6..d6ab460723c24 100644
--- a/boards/pine64/pinetime_devkit0/doc/index.rst
+++ b/boards/pine64/pinetime_devkit0/doc/index.rst
@@ -110,6 +110,8 @@ basic button sample:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The PineTime Dev Kit comes with the back not glued down to allow it to be
 easily reprogrammed.
 
diff --git a/boards/pine64/pinetime_devkit0/pinetime_devkit0.yaml b/boards/pine64/pinetime_devkit0/pinetime_devkit0.yaml
index c99eb8986f3bd..10bee1f3d6b48 100644
--- a/boards/pine64/pinetime_devkit0/pinetime_devkit0.yaml
+++ b/boards/pine64/pinetime_devkit0/pinetime_devkit0.yaml
@@ -7,6 +7,4 @@ toolchain:
   - gnuarmemb
 ram: 64
 flash: 512
-supported:
-  - kscan:touch
 vendor: pine64
diff --git a/boards/qemu/arc/doc/index.rst b/boards/qemu/arc/doc/index.rst
index 1c38701b22ee2..ee73af20e9d00 100644
--- a/boards/qemu/arc/doc/index.rst
+++ b/boards/qemu/arc/doc/index.rst
@@ -63,6 +63,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample
 (note you may use ``qemu_arc/qemu_em``, ``qemu_arc/qemu_hs``,  ``qemu_arc/qemu_hs5x`` or
diff --git a/boards/qemu/cortex_a53/doc/index.rst b/boards/qemu/cortex_a53/doc/index.rst
index d6e2e307b0926..e56bbe27d1ed0 100644
--- a/boards/qemu/cortex_a53/doc/index.rst
+++ b/boards/qemu/cortex_a53/doc/index.rst
@@ -56,6 +56,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample:
 
diff --git a/boards/qemu/cortex_m0/doc/index.rst b/boards/qemu/cortex_m0/doc/index.rst
index e091ace42a7cd..543c5870dd40c 100644
--- a/boards/qemu/cortex_m0/doc/index.rst
+++ b/boards/qemu/cortex_m0/doc/index.rst
@@ -60,6 +60,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample:
 
diff --git a/boards/qemu/cortex_m3/doc/index.rst b/boards/qemu/cortex_m3/doc/index.rst
index 96eb19bc3753c..15562e066d985 100644
--- a/boards/qemu/cortex_m3/doc/index.rst
+++ b/boards/qemu/cortex_m3/doc/index.rst
@@ -66,6 +66,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample:
 
diff --git a/boards/qemu/cortex_r5/doc/index.rst b/boards/qemu/cortex_r5/doc/index.rst
index 9d385b5a57887..e717b14732f35 100644
--- a/boards/qemu/cortex_r5/doc/index.rst
+++ b/boards/qemu/cortex_r5/doc/index.rst
@@ -60,6 +60,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the
 QEMU emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample:
 
diff --git a/boards/qemu/kvm_arm64/doc/index.rst b/boards/qemu/kvm_arm64/doc/index.rst
index e1341211e463a..a69b1357bae39 100644
--- a/boards/qemu/kvm_arm64/doc/index.rst
+++ b/boards/qemu/kvm_arm64/doc/index.rst
@@ -48,6 +48,8 @@ CPU's UART0.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Refer to the qemu_cortex_a53 board instructions for this part.
 
 Debugging
diff --git a/boards/qemu/leon3/doc/index.rst b/boards/qemu/leon3/doc/index.rst
index 32a85ebbc5a0f..69db94575bed2 100644
--- a/boards/qemu/leon3/doc/index.rst
+++ b/boards/qemu/leon3/doc/index.rst
@@ -8,6 +8,8 @@ The LEON3 QEMU board configuration is used to emulate the LEON3 processor.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``qemu_leon3`` board configuration can be built and run in
 the usual way for emulated boards (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/qemu/malta/doc/index.rst b/boards/qemu/malta/doc/index.rst
index f10dcc8c8dfc6..8668ddc9cda29 100644
--- a/boards/qemu/malta/doc/index.rst
+++ b/boards/qemu/malta/doc/index.rst
@@ -54,6 +54,8 @@ with the FPGA UART2.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample:
 
diff --git a/boards/qemu/nios2/doc/index.rst b/boards/qemu/nios2/doc/index.rst
index 81717ab91b425..235b9b41be40f 100644
--- a/boards/qemu/nios2/doc/index.rst
+++ b/boards/qemu/nios2/doc/index.rst
@@ -70,6 +70,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample:
 
diff --git a/boards/qemu/riscv32/doc/index.rst b/boards/qemu/riscv32/doc/index.rst
index ef2e3f91623f1..69e003c21f80c 100644
--- a/boards/qemu/riscv32/doc/index.rst
+++ b/boards/qemu/riscv32/doc/index.rst
@@ -8,6 +8,8 @@ The RISCV32 QEMU board configuration is used to emulate the RISCV32 architecture
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``qemu_riscv32`` board configuration can be built and run in
 the usual way for emulated boards (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/qemu/riscv32/qemu_riscv32.yaml b/boards/qemu/riscv32/qemu_riscv32.yaml
index 8b0d348ee4f07..b6f258878a743 100644
--- a/boards/qemu/riscv32/qemu_riscv32.yaml
+++ b/boards/qemu/riscv32/qemu_riscv32.yaml
@@ -8,6 +8,8 @@ toolchain:
   - zephyr
 supported:
   - netif
+ram: 262144
+flash: 32768
 testing:
   default: true
   ignore_tags:
diff --git a/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.yaml b/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.yaml
index 2ff24d2b59653..ab001b71df14a 100644
--- a/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.yaml
+++ b/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.yaml
@@ -9,6 +9,8 @@ toolchain:
 supported:
   - netif
   - smp
+ram: 262144
+flash: 32768
 testing:
   default: true
   ignore_tags:
diff --git a/boards/qemu/riscv32_xip/doc/index.rst b/boards/qemu/riscv32_xip/doc/index.rst
index aea547ff75df2..759892d5e1489 100644
--- a/boards/qemu/riscv32_xip/doc/index.rst
+++ b/boards/qemu/riscv32_xip/doc/index.rst
@@ -8,6 +8,8 @@ The RISCV32 XIP QEMU board configuration is used to emulate the RISCV32 architec
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``qemu_riscv32_xip`` board configuration can be built and run in
 the usual way for emulated boards (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/qemu/riscv32e/doc/index.rst b/boards/qemu/riscv32e/doc/index.rst
index 6b47c3a363993..a45687eeb7d13 100644
--- a/boards/qemu/riscv32e/doc/index.rst
+++ b/boards/qemu/riscv32e/doc/index.rst
@@ -8,6 +8,8 @@ The RISCV32E QEMU board configuration is used to emulate the RISCV32 (RV32E) arc
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``qemu_riscv32e`` board configuration can be built and run in
 the usual way for emulated boards (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/qemu/riscv32e/qemu_riscv32e.yaml b/boards/qemu/riscv32e/qemu_riscv32e.yaml
index 475430c69d163..89fdcc478f75b 100644
--- a/boards/qemu/riscv32e/qemu_riscv32e.yaml
+++ b/boards/qemu/riscv32e/qemu_riscv32e.yaml
@@ -8,6 +8,8 @@ toolchain:
   - zephyr
 supported:
   - netif
+ram: 262144
+flash: 32768
 testing:
   default: true
   ignore_tags:
diff --git a/boards/qemu/riscv64/doc/index.rst b/boards/qemu/riscv64/doc/index.rst
index 79d4f6d155f70..884efce1f72ec 100644
--- a/boards/qemu/riscv64/doc/index.rst
+++ b/boards/qemu/riscv64/doc/index.rst
@@ -17,6 +17,8 @@ for more details.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``qemu_riscv64`` board configuration can be built and run in
 the usual way for emulated boards (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/qemu/riscv64/qemu_riscv64.yaml b/boards/qemu/riscv64/qemu_riscv64.yaml
index fc840e2988661..240ebcdbde92d 100644
--- a/boards/qemu/riscv64/qemu_riscv64.yaml
+++ b/boards/qemu/riscv64/qemu_riscv64.yaml
@@ -8,6 +8,8 @@ toolchain:
   - zephyr
 supported:
   - netif
+ram: 262144
+flash: 32768
 testing:
   default: true
   ignore_tags:
diff --git a/boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.yaml b/boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.yaml
index 914aec92c1ad0..ebcfb42e1f003 100644
--- a/boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.yaml
+++ b/boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.yaml
@@ -9,6 +9,8 @@ toolchain:
 supported:
   - netif
   - smp
+ram: 262144
+flash: 32768
 testing:
   default: true
   ignore_tags:
diff --git a/boards/qemu/x86/doc/index.rst b/boards/qemu/x86/doc/index.rst
index 98e0098d39a0d..3e6b147d2ab00 100644
--- a/boards/qemu/x86/doc/index.rst
+++ b/boards/qemu/x86/doc/index.rst
@@ -67,6 +67,8 @@ The following platform features are unsupported:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``qemu_x86`` board configuration can be built and run in
 the usual way for emulated boards (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/qemu/x86/qemu_x86_atom_nommu_defconfig b/boards/qemu/x86/qemu_x86_atom_nommu_defconfig
index 119a6dd2c3927..3215747a004d4 100644
--- a/boards/qemu/x86/qemu_x86_atom_nommu_defconfig
+++ b/boards/qemu/x86/qemu_x86_atom_nommu_defconfig
@@ -10,6 +10,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_X86_MMU=n
 CONFIG_DEBUG_INFO=y
-CONFIG_SCHED_DUMB=y
-CONFIG_WAITQ_DUMB=y
+CONFIG_SCHED_SIMPLE=y
+CONFIG_WAITQ_SIMPLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=n
diff --git a/boards/qemu/xtensa/Kconfig.defconfig b/boards/qemu/xtensa/Kconfig.defconfig
index c94da322385bc..1acc6ce8d4ecf 100644
--- a/boards/qemu/xtensa/Kconfig.defconfig
+++ b/boards/qemu/xtensa/Kconfig.defconfig
@@ -11,6 +11,7 @@ config IPM_CONSOLE_STACK_SIZE
 
 # Must match XCHAL_DCACHE_LINESIZE form core-isa.h
 config DCACHE_LINE_SIZE
+	default 4 if BOARD_QEMU_XTENSA_SAMPLE_CONTROLLER32_MPU
 	default 32
 
 endif # BOARD_QEMU_XTENSA
diff --git a/boards/qemu/xtensa/doc/index.rst b/boards/qemu/xtensa/doc/index.rst
index 741e0569b7f5b..0ad63fe7fdd74 100644
--- a/boards/qemu/xtensa/doc/index.rst
+++ b/boards/qemu/xtensa/doc/index.rst
@@ -9,6 +9,8 @@ configuration provides support for the Xtensa simulation environment.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample:
 
diff --git a/boards/qorvo/decawave_dwm1001_dev/doc/index.rst b/boards/qorvo/decawave_dwm1001_dev/doc/index.rst
index 491851f3075e2..108d245f9367c 100644
--- a/boards/qorvo/decawave_dwm1001_dev/doc/index.rst
+++ b/boards/qorvo/decawave_dwm1001_dev/doc/index.rst
@@ -15,6 +15,8 @@ official reference on the IC itself.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``decawave_dwm1001_dev`` board configuration can be built,
 flashed, and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/qorvo/decawave_dwm3001cdk/board.cmake b/boards/qorvo/decawave_dwm3001cdk/board.cmake
index f8c71dc56944b..554146fe5445c 100644
--- a/boards/qorvo/decawave_dwm3001cdk/board.cmake
+++ b/boards/qorvo/decawave_dwm3001cdk/board.cmake
@@ -2,8 +2,8 @@
 
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/qorvo/decawave_dwm3001cdk/doc/index.rst b/boards/qorvo/decawave_dwm3001cdk/doc/index.rst
index af592d110db37..588c2ec7a4a2e 100644
--- a/boards/qorvo/decawave_dwm3001cdk/doc/index.rst
+++ b/boards/qorvo/decawave_dwm3001cdk/doc/index.rst
@@ -15,6 +15,8 @@ itself, and `nRF52833 website`_ for the official reference on the IC itself.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``decawave_dwm3001cdk`` board target can be built, flashed,
 and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/quicklogic/quick_feather/doc/index.rst b/boards/quicklogic/quick_feather/doc/index.rst
index 1139464395689..8a8f1a4364daf 100644
--- a/boards/quicklogic/quick_feather/doc/index.rst
+++ b/boards/quicklogic/quick_feather/doc/index.rst
@@ -23,19 +23,7 @@ Detailed information about the board can be found in a `QuickFeather repository`
 Supported Features
 ==================
 
-The QuickFeather configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/quicklogic/quick_feather/quick_feather_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -45,6 +33,8 @@ Detailed information about pinouts is available in the `schematics document`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/rakwireless/rak11720/doc/index.rst b/boards/rakwireless/rak11720/doc/index.rst
index cae97f57c14cb..081753fbfd609 100644
--- a/boards/rakwireless/rak11720/doc/index.rst
+++ b/boards/rakwireless/rak11720/doc/index.rst
@@ -37,36 +37,13 @@ For more information about the RAK11720 stamp module:
 Supported Features
 ==================
 
-The RAK11720 module configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| SYSTICK   | on-chip    | systick              |
-+-----------+------------+----------------------+
-| STIMER    | on-chip    | stimer               |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | bluetooth            |
-+-----------+------------+----------------------+
-| RADIO     | on-board   | LoRa (SX1262)        |
-+-----------+------------+----------------------+
-
-The default configuration can be found in the defconfig file:
-``boards/rak/rak11720/rak11720_defconfig``.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 The RAK11720 board shall be connected to a Segger Embedded Debugger Unit
 `J-Link OB <https://www.segger.com/jlink-ob.html>`_. This provides a debug
 interface to the Apollo3 Blue chip. You can use JLink to communicate with
diff --git a/boards/rakwireless/rak11720/rak11720.dts b/boards/rakwireless/rak11720/rak11720.dts
index 828c676f0dd5f..6596d68996251 100644
--- a/boards/rakwireless/rak11720/rak11720.dts
+++ b/boards/rakwireless/rak11720/rak11720.dts
@@ -105,42 +105,48 @@
 	status = "okay";
 };
 
-&i2c2 {
-	compatible = "ambiq,i2c";
-	pinctrl-0 = <&i2c2_default>;
-	pinctrl-names = "default";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	status = "okay";
+&iom2 {
+	i2c2: i2c {
+		compatible = "ambiq,i2c";
+		pinctrl-0 = <&i2c2_default>;
+		pinctrl-names = "default";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		status = "okay";
+	};
 };
 
-&spi0 {
-	compatible = "ambiq,spi";
-	pinctrl-0 = <&spi0_default>;
-	pinctrl-names = "default";
-	cs-gpios = <&gpio0_31 1 GPIO_ACTIVE_LOW>;
-	clock-frequency = <DT_FREQ_M(1)>;
-	status = "okay";
+&iom0 {
+	spi0: spi {
+		compatible = "ambiq,spi";
+		pinctrl-0 = <&spi0_default>;
+		pinctrl-names = "default";
+		cs-gpios = <&gpio0_31 1 GPIO_ACTIVE_LOW>;
+		clock-frequency = <DT_FREQ_M(1)>;
+		status = "okay";
+	};
 };
 
-&spi1 {
-	compatible = "ambiq,spi";
-	status = "okay";
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-names = "default";
-	clock-frequency = <DT_FREQ_M(1)>;
-	cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
-
-	lora: lora@0 {
-		compatible = "semtech,sx1262";
-		reg = <0>;
-		reset-gpios = <&gpio0_31 17 GPIO_ACTIVE_LOW>;
-		busy-gpios = <&gpio0_31 16 GPIO_ACTIVE_HIGH>;
-		dio1-gpios = <&gpio0_31 15 GPIO_ACTIVE_HIGH>;
-		antenna-enable-gpios = <&gpio0_31 18 GPIO_ACTIVE_LOW>;
-		dio2-tx-enable;
-		dio3-tcxo-voltage = <SX126X_DIO3_TCXO_3V3>;
-		tcxo-power-startup-delay-ms = <5>;
-		spi-max-frequency = <DT_FREQ_M(1)>;
+&iom1 {
+	spi1: spi {
+		compatible = "ambiq,spi";
+		status = "okay";
+		pinctrl-0 = <&spi1_default>;
+		pinctrl-names = "default";
+		clock-frequency = <DT_FREQ_M(1)>;
+		cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
+
+		lora: lora@0 {
+			compatible = "semtech,sx1262";
+			reg = <0>;
+			reset-gpios = <&gpio0_31 17 GPIO_ACTIVE_LOW>;
+			busy-gpios = <&gpio0_31 16 GPIO_ACTIVE_HIGH>;
+			dio1-gpios = <&gpio0_31 15 GPIO_ACTIVE_HIGH>;
+			antenna-enable-gpios = <&gpio0_31 18 GPIO_ACTIVE_LOW>;
+			dio2-tx-enable;
+			dio3-tcxo-voltage = <SX126X_DIO3_TCXO_3V3>;
+			tcxo-power-startup-delay-ms = <5>;
+			spi-max-frequency = <DT_FREQ_M(1)>;
+		};
 	};
 };
 
diff --git a/boards/rakwireless/rak11720/rak11720_apollo3-pinctrl.dtsi b/boards/rakwireless/rak11720/rak11720_apollo3-pinctrl.dtsi
index dbfd0ab87969e..2f4d692a064b5 100644
--- a/boards/rakwireless/rak11720/rak11720_apollo3-pinctrl.dtsi
+++ b/boards/rakwireless/rak11720/rak11720_apollo3-pinctrl.dtsi
@@ -108,7 +108,7 @@
 			pinmux = <NCE19_P19>;
 			drive-push-pull;
 			drive-strength = "0.5";
-			ambiq,iom-nce-module = <0>;
+			ambiq,nce-src = <0>;
 			ambiq,iom-num = <6>;
 		};
 	};
diff --git a/boards/rakwireless/rak3172/doc/index.rst b/boards/rakwireless/rak3172/doc/index.rst
index 328dd433a8522..f251c41ace3eb 100644
--- a/boards/rakwireless/rak3172/doc/index.rst
+++ b/boards/rakwireless/rak3172/doc/index.rst
@@ -38,46 +38,13 @@ For more information about the RAK3172 stamp module:
 Supported Features
 ==================
 
-The ``rak3172`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| MPU       | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | LoRa                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/rakwireless/rak3172/rak3172_defconfig`.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 The RAK3172 board can be debugged and flashed with an external debug probe connected
 to the SWD pins.
 It can also be flashed via `pyOCD`_, but have to install an additional pack to support STM32WL.
diff --git a/boards/rakwireless/rak3172/rak3172.yaml b/boards/rakwireless/rak3172/rak3172.yaml
index b3d19a8284f37..75017423ed671 100644
--- a/boards/rakwireless/rak3172/rak3172.yaml
+++ b/boards/rakwireless/rak3172/rak3172.yaml
@@ -5,7 +5,6 @@ arch: arm
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 ram: 64
 flash: 256
 supported:
diff --git a/boards/rakwireless/rak4631/board.cmake b/boards/rakwireless/rak4631/board.cmake
index 2f2c24e0c2884..074044926bf0c 100644
--- a/boards/rakwireless/rak4631/board.cmake
+++ b/boards/rakwireless/rak4631/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/rakwireless/rak4631/doc/index.rst b/boards/rakwireless/rak4631/doc/index.rst
index 5d237f7bf71e8..ad14745fbbb9c 100644
--- a/boards/rakwireless/rak4631/doc/index.rst
+++ b/boards/rakwireless/rak4631/doc/index.rst
@@ -33,45 +33,7 @@ programming/debug interface.
 Supported Features
 ==================
 
-The ``rak4631/nrf52840`` board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RADIO     | on-board   | LoRa (SX1262)        |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The default board configuration can be found in
-:zephyr_file:`boards/rakwireless/rak4631/rak4631_nrf52840_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -85,6 +47,8 @@ LED
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The RAK4631 board shall be connected to a Segger Embedded Debugger Unit
 `J-Link OB <https://www.segger.com/jlink-ob.html>`_.  This provides a debug
 interface to the NRF52840 chip. You can use JLink to communicate with
diff --git a/boards/rakwireless/rak4631/rak4631_nrf52840.dts b/boards/rakwireless/rak4631/rak4631_nrf52840.dts
index c53ea837f010d..5c9b846edf6e6 100644
--- a/boards/rakwireless/rak4631/rak4631_nrf52840.dts
+++ b/boards/rakwireless/rak4631/rak4631_nrf52840.dts
@@ -119,7 +119,6 @@
 		reg = <0>;
 		reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
 		busy-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-		tx-enable-gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
 		rx-enable-gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 		dio1-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
 		dio2-tx-enable;
diff --git a/boards/rakwireless/rak5010/board.cmake b/boards/rakwireless/rak5010/board.cmake
index d91b58c847d8a..2a2216ee259c9 100644
--- a/boards/rakwireless/rak5010/board.cmake
+++ b/boards/rakwireless/rak5010/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/rakwireless/rak5010/doc/index.rst b/boards/rakwireless/rak5010/doc/index.rst
index 3ffc2b7f7124d..5c76ad0d9a2ff 100644
--- a/boards/rakwireless/rak5010/doc/index.rst
+++ b/boards/rakwireless/rak5010/doc/index.rst
@@ -1,8 +1,5 @@
 .. zephyr:board:: rak5010
 
-RAK5010
-#######
-
 Overview
 ********
 
@@ -44,42 +41,7 @@ Hardware
 Supported Features
 ==================
 
-The ``rak5010/nrf52840`` board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -93,6 +55,8 @@ LED
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The RAK5010 board shall be connected to a Segger Embedded Debugger Unit
 `J-Link OB <https://www.segger.com/jlink-ob.html>`_.  This provides a debug
 interface to the NRF52840 chip. You can use JLink to communicate with
diff --git a/boards/raspberrypi/rpi_4b/doc/index.rst b/boards/raspberrypi/rpi_4b/doc/index.rst
index 88862cf7f9fbc..b0c658faf2d3a 100644
--- a/boards/raspberrypi/rpi_4b/doc/index.rst
+++ b/boards/raspberrypi/rpi_4b/doc/index.rst
@@ -10,33 +10,14 @@ see <https://www.raspberrypi.com/documentation/computers/raspberry-pi.html>
 
 Supported Features
 ==================
-The Raspberry Pi 4 Model B board configuration supports the following
-hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - GIC-400
-     - N/A
-     - :dtcompatible:`arm,gic-v2`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`brcm,bcm2711-gpio`
-   * - UART (Mini UART)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`brcm,bcm2711-aux-uart`
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in
-:zephyr_file:`boards/raspberrypi/rpi_4b/rpi_4b_defconfig`
+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 TF Card
 =======
 
diff --git a/boards/raspberrypi/rpi_5/doc/index.rst b/boards/raspberrypi/rpi_5/doc/index.rst
index 6285e425c252e..e73e65570dbee 100644
--- a/boards/raspberrypi/rpi_5/doc/index.rst
+++ b/boards/raspberrypi/rpi_5/doc/index.rst
@@ -29,38 +29,15 @@ Hardware
 Supported Features
 ==================
 
-The Raspberry Pi 5 board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - GIC-400
-     - N/A
-     - :dtcompatible:`arm,gic-v2`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,rp1-gpio`
-   * - GPIO (Internal)
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`brcm,brcmstb-gpio`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`arm,pl011`
-   * - PCIE
-     - :kconfig:option:`CONFIG_PCIE`
-     - :dtcompatible:`brcm,brcmstb-pcie`
-
-Not all hardware features are supported yet. See `Raspberry Pi hardware`_ for the complete list of hardware features.
-
-The default configuration can be found in
-:zephyr_file:`boards/raspberrypi/rpi_5/rpi_5_defconfig`.
+.. zephyr:board-supported-hw::
+
+See `Raspberry Pi hardware`_ for the complete list of hardware features.
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Blinky
 ======
 
diff --git a/boards/raspberrypi/rpi_pico/doc/index.rst b/boards/raspberrypi/rpi_pico/doc/index.rst
index 43937c50bd972..b82b484f4f2ae 100644
--- a/boards/raspberrypi/rpi_pico/doc/index.rst
+++ b/boards/raspberrypi/rpi_pico/doc/index.rst
@@ -48,51 +48,7 @@ Hardware
 Supported Features
 ==================
 
-The ``rpi_pico`` board configuration supports the following
-hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v6m-nvic`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - USB Device
-     - :kconfig:option:`CONFIG_USB_DEVICE_STACK`
-     - :dtcompatible:`raspberrypi,pico-usbd`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - Watchdog Timer (WDT)
-     - :kconfig:option:`CONFIG_WATCHDOG`
-     - :dtcompatible:`raspberrypi,pico-watchdog`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - Flash
-     - :kconfig:option:`CONFIG_FLASH`
-     - :dtcompatible:`raspberrypi,pico-flash-controller`
-   * - Clock controller
-     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
-     - :dtcompatible:`raspberrypi,pico-clock-controller`
+.. zephyr:board-supported-hw::
 
 .. _rpi_pico_pin_mapping:
 
@@ -177,6 +133,8 @@ Raspberry Pi Pico's PIO is a programmable chip that can implement a variety of p
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``rpi_pico`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
@@ -249,7 +207,7 @@ The Raspberry Pi Pico has an SWD interface that can be used to program
 and debug the onboard SoC. This interface can be used with OpenOCD.
 To use it, OpenOCD version 0.12.0 or later is needed.
 
-If you are using a Debian based system (including RaspberryPi OS, Ubuntu. and more),
+If you are using a Debian based system (including Raspberry Pi OS, Ubuntu. and more),
 using the `pico_setup.sh`_ script is a convenient way to set up the forked version of OpenOCD.
 
 Here is an example of building and flashing the :zephyr:code-sample:`blinky` application.
diff --git a/boards/raspberrypi/rpi_pico/rpi_pico.yaml b/boards/raspberrypi/rpi_pico/rpi_pico.yaml
index 696d9971ab5f4..03e2673ce72ca 100644
--- a/boards/raspberrypi/rpi_pico/rpi_pico.yaml
+++ b/boards/raspberrypi/rpi_pico/rpi_pico.yaml
@@ -1,5 +1,5 @@
 identifier: rpi_pico
-name: RaspberryPi-Pico
+name: Raspberry Pi Pico
 type: mcu
 arch: arm
 flash: 2048
diff --git a/boards/raspberrypi/rpi_pico/rpi_pico_rp2040_w.yaml b/boards/raspberrypi/rpi_pico/rpi_pico_rp2040_w.yaml
index 8ebdd370b0abd..f06ac1ce74cf2 100644
--- a/boards/raspberrypi/rpi_pico/rpi_pico_rp2040_w.yaml
+++ b/boards/raspberrypi/rpi_pico/rpi_pico_rp2040_w.yaml
@@ -1,5 +1,5 @@
 identifier: rpi_pico/rp2040/w
-name: RaspberryPi-Pico-w
+name: Raspberry Pi Pico W
 type: mcu
 arch: arm
 flash: 2048
diff --git a/boards/raspberrypi/rpi_pico2/doc/index.rst b/boards/raspberrypi/rpi_pico2/doc/index.rst
index 1457a8b849e49..a6ed699a8203e 100644
--- a/boards/raspberrypi/rpi_pico2/doc/index.rst
+++ b/boards/raspberrypi/rpi_pico2/doc/index.rst
@@ -30,51 +30,7 @@ Hardware
 Supported Features
 ==================
 
-The ``rpi_pico2/rp2350a/m33`` board target supports the following
-hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v8m-nvic`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - Clock controller
-     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
-     - :dtcompatible:`raspberrypi,pico-clock-controller`
-   * - Counter
-     - :kconfig:option:`CONFIG_COUNTER`
-     - :dtcompatible:`raspberrypi,pico-timer`
-   * - DMA
-     - :kconfig:option:`CONFIG_DMA`
-     - :dtcompatible:`raspberrypi,pico-dma`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - UART (PIO)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart-pio`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -84,6 +40,8 @@ The default pin mapping is unchanged from the Pico 1 (see :ref:`rpi_pico_pin_map
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 As with the Pico 1, the SWD interface can be used to program and debug the
 device, e.g. using OpenOCD with the `Raspberry Pi Debug Probe <https://www.raspberrypi.com/documentation/microcontrollers/debug-probe.html>`_ .
 
diff --git a/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi b/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi
index 85cdb97e8457e..522413c94f1af 100644
--- a/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi
+++ b/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi
@@ -97,7 +97,7 @@
 	pinctrl-names = "default";
 };
 
-&gpio0 {
+gpio0_lo: &gpio0 {
 	status = "okay";
 };
 
@@ -137,6 +137,10 @@
 	status = "okay";
 };
 
+&wdt0 {
+	status = "okay";
+};
+
 zephyr_udc0: &usbd {
 	status = "okay";
 };
diff --git a/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml b/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml
index 810ab165f06e7..f83082393e076 100644
--- a/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml
+++ b/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml
@@ -18,3 +18,5 @@ supported:
   - pwm
   - spi
   - uart
+  - usbd
+  - watchdog
diff --git a/boards/raytac/mdbt50q_db_33/board.cmake b/boards/raytac/mdbt50q_db_33/board.cmake
index 51744ab31b9b1..f841bdde5045a 100644
--- a/boards/raytac/mdbt50q_db_33/board.cmake
+++ b/boards/raytac/mdbt50q_db_33/board.cmake
@@ -3,6 +3,7 @@
 
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/raytac/mdbt50q_db_33/doc/index.rst b/boards/raytac/mdbt50q_db_33/doc/index.rst
index fe10186965ed1..eadb5fad4d2d3 100644
--- a/boards/raytac/mdbt50q_db_33/doc/index.rst
+++ b/boards/raytac/mdbt50q_db_33/doc/index.rst
@@ -30,7 +30,7 @@ Hardware
 ********
 - Module Demo Board build by MDBT50Q-512K
 - Nordic nRF52833 SoC Solution
-- A recommnded 3rd-party module by Nordic Semiconductor.
+- A recommended 3rd-party module by Nordic Semiconductor.
 - BT5.2&BT5.1&BT5 Bluetooth Specification Cerified
 - Supports BT5 Long Range Features
 - Cerifications: FCC, IC, CE, Telec(MIC), KC, SRRC, NCC, RCM, WPC
@@ -44,52 +44,15 @@ Hardware
 - 3 User LEDs
 - 4 User buttons
 - 1 Mini USB connector for power supply and USB communication
-- SWD connector for FW programing
-- J-Link interface for FW programing
+- SWD connector for FW programming
+- J-Link interface for FW programming
 - UART interface for UART communication
 
 Supported Features
 ==================
 
-The raytac_mdbt50q_db_33/nrf52833 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `MDBT50Q-DB-33 website`_ and `MDBT50Q-DB-33 Specification`_
 for a complete list of Raytac MDBT50Q-DB-33 board hardware features.
 
@@ -121,6 +84,8 @@ UART
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``raytac_mdbt50q_db_33/nrf52833`` board configuration can be
 built, flashed, and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/raytac/mdbt50q_db_40/board.cmake b/boards/raytac/mdbt50q_db_40/board.cmake
index 667c8f5f999b7..8dc0bf1382bff 100644
--- a/boards/raytac/mdbt50q_db_40/board.cmake
+++ b/boards/raytac/mdbt50q_db_40/board.cmake
@@ -2,6 +2,7 @@
 
 board_runner_args(jlink "--device=nrf52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/raytac/mdbt50q_db_40/doc/index.rst b/boards/raytac/mdbt50q_db_40/doc/index.rst
index 5655d41e2294d..d656eb6e4c91c 100644
--- a/boards/raytac/mdbt50q_db_40/doc/index.rst
+++ b/boards/raytac/mdbt50q_db_40/doc/index.rst
@@ -30,7 +30,7 @@ Hardware
 ********
 - Module Demo Board build by MDBT50Q-1MV2
 - Nordic nRF52840 SoC Solution Version: 2
-- A recommnded 3rd-party module by Nordic Semiconductor.
+- A recommended 3rd-party module by Nordic Semiconductor.
 - BT5.2&BT5.1&BT5 Bluetooth Specification Cerified
 - Supports BT5 Long Range Features
 - Cerifications: FCC, IC, CE, Telec(MIC), KC, SRRC, NCC, RCM, WPC
@@ -44,54 +44,15 @@ Hardware
 - 3 User LEDs
 - 4 User buttons
 - 1 Mini USB connector for power supply and USB communication
-- SWD connector for FW programing
-- J-Link interface for FW programing
+- SWD connector for FW programming
+- J-Link interface for FW programming
 - UART interface for UART communication
 
 Supported Features
 ==================
 
-The raytac_mdbt50q_db_40/nrf52840 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| QSPI(M)   | on-chip    | qspi                 |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `MDBT50Q-DB-40 website`_ and `MDBT50Q-DB-40 Specification`_
 for a complete list of Raytac MDBT50Q-DB-40 board hardware features.
 
@@ -123,6 +84,8 @@ UART
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``raytac_mdbt50q_db_40/nrf52840`` board configuration can be
 built, flashed, and debugged in the usual way. See :ref:`build_an_application` and
 :ref:`application_run` for more details on building and running.
diff --git a/boards/raytac/mdbt53_db_40/board.cmake b/boards/raytac/mdbt53_db_40/board.cmake
index e181f29ca44ba..bedb125bb9de1 100644
--- a/boards/raytac/mdbt53_db_40/board.cmake
+++ b/boards/raytac/mdbt53_db_40/board.cmake
@@ -6,6 +6,6 @@ elseif(CONFIG_BOARD_RAYTAC_MDBT53_DB_40_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/raytac/mdbt53_db_40/doc/index.rst b/boards/raytac/mdbt53_db_40/doc/index.rst
index a429f7b1881a9..3b0e9b221be58 100644
--- a/boards/raytac/mdbt53_db_40/doc/index.rst
+++ b/boards/raytac/mdbt53_db_40/doc/index.rst
@@ -48,7 +48,7 @@ Hardware
 ********
 - Module Demo Board build by MDBT53-1M
 - Nordic nRF5340 SoC Solution
-- A recommnded 3rd-party module by Nordic Semiconductor.
+- A recommended 3rd-party module by Nordic Semiconductor.
 - Dual-core Arm® Cortex® M33
 - 1MB/256KB Flash Memory; 512kB/ 64kB RAM
 - Supports BT5 Long Range Features
@@ -64,79 +64,15 @@ Hardware
 - 4 User LEDs
 - 4 User buttons
 - 1 Mini USB connector for power supply
-- SWD connector for FW programing
-- J-Link interface for FW programing
+- SWD connector for FW programming
+- J-Link interface for FW programming
 - UART interface for UART communication
 
 Supported Features
 ==================
 
-The ``raytac_mdbt53_db_40_nrf5340/cpuapp`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| QSPI(M)   | on-chip    | nor                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The ``raytac_mdbt53_db_40_nrf5340/cpunet`` board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `MDBT53-DB-40 website`_ and `MDBT53-DB-40 Specification`_
 for a complete list of Raytac MDBT53-DB-40 board hardware features.
 
@@ -180,6 +116,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 nRF5340 application core supports the Armv8-M Security Extension.
 Applications built for the ``raytac_mdbt53_db_40/nrf5340/cpuapp`` board by
 default boot in the Secure state.
diff --git a/boards/raytac/mdbt53v_db_40/board.cmake b/boards/raytac/mdbt53v_db_40/board.cmake
index da45d8b8e838e..41501725bd55c 100644
--- a/boards/raytac/mdbt53v_db_40/board.cmake
+++ b/boards/raytac/mdbt53v_db_40/board.cmake
@@ -6,6 +6,6 @@ elseif(BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/raytac/mdbt53v_db_40/doc/index.rst b/boards/raytac/mdbt53v_db_40/doc/index.rst
index 834971e7c7db4..bd8584b78332a 100644
--- a/boards/raytac/mdbt53v_db_40/doc/index.rst
+++ b/boards/raytac/mdbt53v_db_40/doc/index.rst
@@ -47,7 +47,7 @@ Hardware
 ********
 - Module Demo Board build by MDBT53V-1M
 - Nordic nRF5340 SoC Solution
-- A recommnded 3rd-party module by Nordic Semiconductor.
+- A recommended 3rd-party module by Nordic Semiconductor.
 - Dual-core Arm® Cortex® M33
 - 1MB/256KB Flash Memory; 512kB/ 64kB RAM
 - Supports BT5 Long Range Features
@@ -64,74 +64,14 @@ Hardware
 - 1 User LEDs
 - 3 User buttons
 - 1 Mini USB connector for power supply
-- SWD connector for FW programing
-- J-Link interface for FW programing
+- SWD connector for FW programming
+- J-Link interface for FW programming
 
 Supported Features
 ==================
 
-The raytac_mdbt53v_db_40_nrf5340_cpuapp board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-The raytac_mdbt53v_db_40_nrf5340_cpunet board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UARTE     | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
+
 See `MDBT53V-DB-40 website`_ and `MDBT53V-DB-40 Specification`_
 for a complete list of Raytac MDBT53V-DB-40 board hardware features.
 
@@ -180,6 +120,8 @@ Security components
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 nRF5340 application core supports the Armv8-M Security Extension.
 Applications built for the raytac_mdbt53v_db_40_nrf5340_cpuapp board by
 default boot in the Secure state.
diff --git a/boards/realtek/rts5912_evb/doc/index.rst b/boards/realtek/rts5912_evb/doc/index.rst
index b9832e19ab7b0..a8bbc18b11b54 100644
--- a/boards/realtek/rts5912_evb/doc/index.rst
+++ b/boards/realtek/rts5912_evb/doc/index.rst
@@ -29,29 +29,13 @@ The board is powered through the +5V USB Type-C connector or adaptor.
 Supported Features
 ==================
 
-The ``rts5912_evb`` supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PINCTRL   | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| SCCON     | on-chip    | clock_control                       |
-+-----------+------------+-------------------------------------+
-| RTMR      | on-chip    | timer                               |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/realtek/rts5912_evb/rts5912_evb.dts b/boards/realtek/rts5912_evb/rts5912_evb.dts
index 1e22d6c4ace82..15d3b5357f1da 100644
--- a/boards/realtek/rts5912_evb/rts5912_evb.dts
+++ b/boards/realtek/rts5912_evb/rts5912_evb.dts
@@ -31,6 +31,32 @@
 	pinctrl-names = "default";
 };
 
+&kbd {
+	status = "okay";
+	pinctrl-0 = <&kso0_gpio041 &kso1_gpio042
+		     &kso2_gpio043 &kso3_gpio044
+		     &kso4_gpio045 &kso5_gpio046
+		     &kso6_gpio047 &kso7_gpio048
+		     &kso8_gpio049 &kso9_gpio050
+		     &kso10_gpio051 &kso11_gpio055
+		     &kso12_gpio056 &kso13_gpio057
+		     &kso14_gpio058 &kso15_gpio059
+		     &ksi0_gpio064 &ksi1_gpio065
+		     &ksi2_gpio066 &ksi3_gpio067
+		     &ksi4_gpio068 &ksi5_gpio069
+		     &ksi6_gpio070 &ksi7_gpio071>;
+	pinctrl-names = "default";
+	row-size = <8>;
+	col-size = <16>;
+};
+
 &swj_port {
 	status = "okay";
 };
+
+&tach0 {
+	status = "okay";
+	pinctrl-0 = <&tacho0_gpio052>;
+	pinctrl-names = "default";
+	pulses-per-round = <2>;
+};
diff --git a/boards/realtek/rts5912_evb/rts5912_evb_defconfig b/boards/realtek/rts5912_evb/rts5912_evb_defconfig
index 64454c374d597..d821f0279dd50 100644
--- a/boards/realtek/rts5912_evb/rts5912_evb_defconfig
+++ b/boards/realtek/rts5912_evb/rts5912_evb_defconfig
@@ -17,3 +17,6 @@ CONFIG_UART_CONSOLE=y
 
 # Enable GPIO
 CONFIG_GPIO=y
+
+# Input Driver
+CONFIG_INPUT=y
diff --git a/boards/renesas/da14695_dk_usb/doc/index.rst b/boards/renesas/da14695_dk_usb/doc/index.rst
index 84f5c772d8ace..bb53018666849 100644
--- a/boards/renesas/da14695_dk_usb/doc/index.rst
+++ b/boards/renesas/da14695_dk_usb/doc/index.rst
@@ -1,4 +1,4 @@
-.. _da14695_dk_usb:
+.. zephyr:board:: da14695_dk_usb
 
 DA14695 Development Kit USB
 ###########################
@@ -10,13 +10,6 @@ The DA14695 Development Kit USB is a low cost development board for DA14695.
 The development kit comes with an integrated debugger and an USB hub
 to have both the on-chip USB and the J-Link connected via a single port.
 
-.. figure:: da14695-00hqdevkt-u-usb-board.jpg
-     :width: 442px
-     :align: center
-     :alt: DA14695 Development Kit USB
-
-     DA14695 Development Kit USB (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
 
@@ -26,29 +19,7 @@ the sleep clock is 32768 Hz. The frequency of the system clock is 32 MHz.
 Supported Features
 ==================
 
-The _da14695_dk_usb board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-
-Other hardware features, including the Configurable MAC (CMAC) controller,
-are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 For more information about the DA14695 Development Kit see:
 
@@ -77,6 +48,8 @@ The pin connections are as follows:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``da14695_dk_usb`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
diff --git a/boards/renesas/da1469x_dk_pro/doc/index.rst b/boards/renesas/da1469x_dk_pro/doc/index.rst
index f45c1f333fefa..3c8b643b5b80f 100644
--- a/boards/renesas/da1469x_dk_pro/doc/index.rst
+++ b/boards/renesas/da1469x_dk_pro/doc/index.rst
@@ -1,4 +1,4 @@
-.. _da1469x_dk_pro:
+.. zephyr:board:: da1469x_dk_pro
 
 DA1469x Development Kit Pro
 ###########################
@@ -11,13 +11,6 @@ DA1469x ARM Cortex-M33 MCU family. The development kit consist of a motherboard
 with connectors and integrated debugger and an interchangeable daughterboard
 with an actual MCU (e.g. DA14695 or DA14699).
 
-.. figure:: da14695-00hqdevkt-board.jpg
-     :width: 442px
-     :align: center
-     :alt: DA14695 Development Kit Pro
-
-     DA14695 Development Kit Pro (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
 
@@ -27,29 +20,7 @@ the sleep clock is 32768 Hz. The frequency of the system clock is 32 MHz.
 Supported Features
 ==================
 
-The _da1469x_dk_pro board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-
-Other hardware features, including the Configurable MAC (CMAC) controller,
-are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 For more information about the DA14695 Development Kit see:
 
@@ -79,6 +50,8 @@ The pin connections are as follows:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``da1469x_dk_pro`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
diff --git a/boards/renesas/ek_ra2a1/doc/index.rst b/boards/renesas/ek_ra2a1/doc/index.rst
index 958b3ec3a0b7b..25f8d131212d9 100644
--- a/boards/renesas/ek_ra2a1/doc/index.rst
+++ b/boards/renesas/ek_ra2a1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra2a1:
-
-RA2A1 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra2a1
 
 Overview
 ********
@@ -31,12 +28,6 @@ Renesas RA2A1 Microcontroller Group has following features
 - Watchdog Timer
 - 49 Input/Output pins
 
-.. figure:: ek_ra2a1.webp
-	:align: center
-	:alt: RA2A1 Evaluation Kit
-
-	EK-RA2A1 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
 
@@ -64,40 +55,13 @@ EK-RA2A1 has following features.
 Supported Features
 ==================
 
-The Renesas EK-RA2A1 board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------+
-| Interface | Controller | Driver/components             |
-+===========+============+===============================+
-| PINCTRL   | on-chip    | pinctrl                       |
-+-----------+------------+-------------------------------+
-| CLOCK     | on-chip    | clock_control                 |
-+-----------+------------+-------------------------------+
-| GPIO      | on-chip    | gpio                          |
-+-----------+------------+-------------------------------+
-| UART      | on-chip    | uart                          |
-+-----------+------------+-------------------------------+
-| SPI       | on-chip    | spi                           |
-+-----------+------------+-------------------------------+
-| COUNTER   | on-chip    | counter                       |
-+-----------+------------+-------------------------------+
-| PWM       | on-chip    | pwm                           |
-+-----------+------------+-------------------------------+
-| ENTROPY   | on-chip    | entropy                       |
-+-----------+------------+-------------------------------+
-| I2C       | on-chip    | i2c                           |
-+-----------+------------+-------------------------------+
-| DAC       | on-chip    | dac                           |
-+-----------+------------+-------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/renesas/ek_ra2a1/ek_ra2a1_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building & Flashing
 ===================
 
diff --git a/boards/renesas/ek_ra2a1/ek_ra2a1.dts b/boards/renesas/ek_ra2a1/ek_ra2a1.dts
index 74b3fc3d57709..39d5d372cd96c 100644
--- a/boards/renesas/ek_ra2a1/ek_ra2a1.dts
+++ b/boards/renesas/ek_ra2a1/ek_ra2a1.dts
@@ -43,6 +43,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -115,3 +116,7 @@
 	pinctrl-names = "default";
 	status = "okay";
 };
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra2a1/ek_ra2a1.yaml b/boards/renesas/ek_ra2a1/ek_ra2a1.yaml
index 78000823a984d..9a6fd6f77489f 100644
--- a/boards/renesas/ek_ra2a1/ek_ra2a1.yaml
+++ b/boards/renesas/ek_ra2a1/ek_ra2a1.yaml
@@ -10,3 +10,5 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra2a1/ek_ra2a1_defconfig b/boards/renesas/ek_ra2a1/ek_ra2a1_defconfig
index 85bd6dcd4553d..15e3f1e271cf6 100644
--- a/boards/renesas/ek_ra2a1/ek_ra2a1_defconfig
+++ b/boards/renesas/ek_ra2a1/ek_ra2a1_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 TOKITA Hiroshi
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra2l1/Kconfig.ek_ra2l1 b/boards/renesas/ek_ra2l1/Kconfig.ek_ra2l1
new file mode 100644
index 0000000000000..53479a895c85a
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/Kconfig.ek_ra2l1
@@ -0,0 +1,5 @@
+# Copyright (c) 2021-2024 MUNIC SA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_EK_RA2L1
+	select SOC_R7FA2L1ABXXFP
diff --git a/boards/renesas/ek_ra2l1/board.cmake b/boards/renesas/ek_ra2l1/board.cmake
new file mode 100644
index 0000000000000..e39493b726b6a
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/board.cmake
@@ -0,0 +1,12 @@
+# Copyright (c) 2021-2024 MUNIC SA
+# SPDX-License-Identifier: Apache-2.0
+
+board_set_debugger_ifnset(jlink)
+board_set_flasher_ifnset(jlink)
+
+board_runner_args(jlink "--device=r7fa2l1ab")
+board_runner_args(pyocd "--target=r7fa2l1ab")
+
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/renesas/ek_ra2l1/board.yml b/boards/renesas/ek_ra2l1/board.yml
new file mode 100644
index 0000000000000..181a338410b97
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: ek_ra2l1
+  vendor: renesas
+  socs:
+  - name: r7fa2l1abxxfp
diff --git a/boards/renesas/ek_ra2l1/doc/ek_ra2l1.webp b/boards/renesas/ek_ra2l1/doc/ek_ra2l1.webp
new file mode 100644
index 0000000000000..54da291633055
Binary files /dev/null and b/boards/renesas/ek_ra2l1/doc/ek_ra2l1.webp differ
diff --git a/boards/renesas/ek_ra2l1/doc/index.rst b/boards/renesas/ek_ra2l1/doc/index.rst
new file mode 100644
index 0000000000000..15e08fd215ee2
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/doc/index.rst
@@ -0,0 +1,103 @@
+.. zephyr:board:: ek_ra2l1
+
+Overview
+********
+
+The EK-RA2L1 is an evaluation kit for Renesas RA2L1 Microcontroller Group.
+
+Renesas RA2L1 Microcontroller Group has following features
+
+- 48MHz, Arm Cortex-M23 core
+- 256kB or 128kB Code Flash, 8kB Data Flash, 32kB SRAM (divided on 2 equal areas
+  with- and without- ECC support)
+- SCI x 5
+- SPI x 2
+- I2C x 2
+- CAN x 1
+- 12-bit A/D Converter
+- 12-bit D/A Converter
+- Low-Power Analog Comparator x 2
+- Temperature Sensor
+- General PWM Timer 32-bit x 4
+- General PWM Timer 16-bit x 6
+- Low Power Asynchronous General-Purpose Timer x 2
+- Watchdog Timer (WDT)
+- Independent Watchdog Timer (IWDT)
+- up to 85 Input/Output pins (depends on the package type)
+
+Hardware
+********
+
+EK-RA2L1 has following features.
+
+- Native pin access through 1 x 40-pin and 3 x 20-pin male headers
+- MCU current measurement points for precision current consumption measurement
+- Multiple clock sources – Low-precision clocks are available internal to the MCU.
+  Additionally, MCU oscillator and sub-clock oscillator crystals,
+  20.000 MHz and 32,768 Hz, are provided for precision
+- SEGGER J-Link on-board programmer and debugger
+- Two Digilent Pmod (SPI and UART)
+- Three user LEDs (red, blue, green)
+- Power LED (white) indicating availability of regulated power
+- Debug LED (yellow) indicating the debug connection
+- Two user buttons
+- One reset button
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Building & Flashing
+===================
+
+You can build and flash an application with onboard J-Link debug adapter.
+:ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Here is an example for building and flashing the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: ek_ra2l1
+   :goals: build flash
+
+
+Debugging
+=========
+
+Debugging also can be done with onboard J-Link debug adapter.
+The following command is debugging the :zephyr:code-sample:`blinky` application.
+Also, see the instructions specific to the debug server that you use.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: ek_ra2l1
+   :maybe-skip-config:
+   :goals: debug
+
+Or you can use Segger Ozone (`Segger Ozone Download`_) for a visual debug interface
+
+Once downloaded and installed, open Segger Ozone and configure the debug project
+like so:
+
+* Target Device: R7FA2L1AB
+* Target Interface: SWD
+* Target Interface Speed: 4 MHz
+* Host Interface: USB
+* Program File: <path/to/your/build/zephyr.elf>
+
+
+References
+**********
+
+.. EK-RA2L1 Web site:
+   https://www.renesas.com/us/en/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra2l1-evaluation-kit-ra2l1-mcu-group
+
+.. _Segger Ozone Download:
+   https://www.segger.com/downloads/jlink#Ozone
diff --git a/boards/renesas/ek_ra2l1/ek_ra2l1-pinctrl.dtsi b/boards/renesas/ek_ra2l1/ek_ra2l1-pinctrl.dtsi
new file mode 100644
index 0000000000000..851d8543beea0
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/ek_ra2l1-pinctrl.dtsi
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci0_default: sci0_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_0, 4, 11)>,
+			<RA_PSEL(RA_PSEL_SCI_0, 4, 10)>;
+		};
+	};
+};
diff --git a/boards/renesas/ek_ra2l1/ek_ra2l1.dts b/boards/renesas/ek_ra2l1/ek_ra2l1.dts
new file mode 100644
index 0000000000000..546451d10acb5
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/ek_ra2l1.dts
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2021-2024 MUNIC SA
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * DTS for Renesas EK-RA2L1 eval. board
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <renesas/ra/ra2/ra2l1.dtsi>
+#include <renesas/ra/ra2/r7fa2l1xb.dtsi>
+#include <renesas/ra/ra2/r7fa2l1xxxxfp.dtsi>
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include "ek_ra2l1-pinctrl.dtsi"
+
+/ {
+	model = "Renesas EK-RA2L1";
+	compatible = "renesas,r7fa2l1abxxfp", "renesas,ra2l1";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led1 {
+			gpios = <&ioport5 3 GPIO_ACTIVE_HIGH>;
+			label = "LED1";
+		};
+	};
+
+	aliases {
+		led0 = &led1;
+		watchdog0 = &wdt;
+	};
+};
+
+&ioport5 {
+	status = "okay";
+};
+
+&sci0 {
+	pinctrl-0 = <&sci0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	uart0: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra2l1/ek_ra2l1.yaml b/boards/renesas/ek_ra2l1/ek_ra2l1.yaml
new file mode 100644
index 0000000000000..2ab8e436db35e
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/ek_ra2l1.yaml
@@ -0,0 +1,17 @@
+identifier: ek_ra2l1
+name: Renesas EK-RA2L1
+type: mcu
+arch: arm
+ram: 32
+flash: 256
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - flash
+  - watchdog
+vendor: renesas
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
diff --git a/boards/renesas/ek_ra2l1/ek_ra2l1_defconfig b/boards/renesas/ek_ra2l1/ek_ra2l1_defconfig
new file mode 100644
index 0000000000000..9c7ccf6a625cb
--- /dev/null
+++ b/boards/renesas/ek_ra2l1/ek_ra2l1_defconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2021-2024 MUNIC SA
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable Console
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
diff --git a/boards/renesas/ek_ra4e2/doc/index.rst b/boards/renesas/ek_ra4e2/doc/index.rst
index 979c2a0c0791a..06983955d9561 100644
--- a/boards/renesas/ek_ra4e2/doc/index.rst
+++ b/boards/renesas/ek_ra4e2/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra4e2:
-
-RA4E2 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra4e2
 
 Overview
 ********
@@ -16,6 +13,7 @@ The MCU in this series incorporates a high-performance Arm Cortex®-M33 core run
 100 MHz with the following features:
 
 **MCU Native Pin Access**
+
 - R7FA4E2B93CFM MCU (referred to as RA MCU)
 - 100 MHz, Arm® Cortex®-M33 core
 - 128 kB Code Flash, 40 kB SRAM
@@ -23,10 +21,11 @@ The MCU in this series incorporates a high-performance Arm Cortex®-M33 core run
 - Native pin access through 2 x 14-pin and 1 x 40-pin male headers
 - MCU current measurement points for precision current consumption measurement
 - Multiple clock sources - RA MCU oscillator and sub-clock oscillator crystals, providing precision
-20.000 MHz and 32,768 Hz reference clock. Additional low-precision clocks are available internal to the
-RA MCU
+  20.000 MHz and 32,768 Hz reference clock. Additional low-precision clocks are available internal to the
+  RA MCU
 
 **System Control and Ecosystem Access**
+
 - USB Full Speed Device (micro-AB connector)
 - Three 5 V input sources
 
@@ -61,15 +60,9 @@ RA MCU
 
 - CAN FD (3-pin header)
 
-.. figure:: ek_ra4e2.webp
-	:align: center
-	:alt: RA4E2 Evaluation Kit
-
-	EK-RA4E2 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detail Hardware feature for the RA4E2 MCU group can be found at `RA4E2 Group User's Manual Hardware`_
+Detailed hardware features for the RA4E2 MCU group can be found at `RA4E2 Group User's Manual Hardware`_
 
 .. figure:: ra4e2_block_diagram.webp
 	:width: 442px
@@ -78,44 +71,18 @@ Detail Hardware feature for the RA4E2 MCU group can be found at `RA4E2 Group Use
 
 	RA4E2 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail Hardware feature for the EK-RA4E2 MCU can be found at `EK-RA4E2 - User's Manual`_
+Detailed hardware features for the EK-RA4E2 MCU can be found at `EK-RA4E2 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA4E2 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra4e2`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -125,15 +92,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA4E2 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA4E2 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA4E2 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra4e2/ek_ra4e2.dts b/boards/renesas/ek_ra4e2/ek_ra4e2.dts
index 30c17db435969..923c73fabed76 100644
--- a/boards/renesas/ek_ra4e2/ek_ra4e2.dts
+++ b/boards/renesas/ek_ra4e2/ek_ra4e2.dts
@@ -59,6 +59,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 
 	transceiver0: can-phy0 {
@@ -187,3 +188,7 @@
 		};
 	};
 };
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra4e2/ek_ra4e2.yaml b/boards/renesas/ek_ra4e2/ek_ra4e2.yaml
index bceab6ca960ac..661dcd6c89d8d 100644
--- a/boards/renesas/ek_ra4e2/ek_ra4e2.yaml
+++ b/boards/renesas/ek_ra4e2/ek_ra4e2.yaml
@@ -10,3 +10,5 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra4e2/ek_ra4e2_defconfig b/boards/renesas/ek_ra4e2/ek_ra4e2_defconfig
index 93569c968fce1..770a30fc47db0 100644
--- a/boards/renesas/ek_ra4e2/ek_ra4e2_defconfig
+++ b/boards/renesas/ek_ra4e2/ek_ra4e2_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_CONSOLE=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra4l1/Kconfig.ek_ra4l1 b/boards/renesas/ek_ra4l1/Kconfig.ek_ra4l1
new file mode 100644
index 0000000000000..136246af8c750
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/Kconfig.ek_ra4l1
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_EK_RA4L1
+	select SOC_R7FA4L1BD4CFP
diff --git a/boards/renesas/ek_ra4l1/board.cmake b/boards/renesas/ek_ra4l1/board.cmake
new file mode 100644
index 0000000000000..ede2ff300bbcc
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/board.cmake
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R7FA4L1BD")
+
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/renesas/ek_ra4l1/board.yml b/boards/renesas/ek_ra4l1/board.yml
new file mode 100644
index 0000000000000..d2e6b1bf6cbf7
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: ek_ra4l1
+  full_name: RA4L1 Evaluation Kit
+  vendor: renesas
+  socs:
+  - name: r7fa4l1bd4cfp
diff --git a/boards/renesas/ek_ra4l1/doc/ek_ra4l1.webp b/boards/renesas/ek_ra4l1/doc/ek_ra4l1.webp
new file mode 100644
index 0000000000000..219105795b04a
Binary files /dev/null and b/boards/renesas/ek_ra4l1/doc/ek_ra4l1.webp differ
diff --git a/boards/renesas/ek_ra4l1/doc/index.rst b/boards/renesas/ek_ra4l1/doc/index.rst
new file mode 100644
index 0000000000000..d9d1a6ded0146
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/doc/index.rst
@@ -0,0 +1,124 @@
+.. zephyr:board:: ek_ra4l1
+
+Overview
+********
+
+The Renesas RA4L1 group of 32-bit microcontrollers (MCUs) uses the high-performance Arm
+Cortex®-M33 core. Share a common set of Renesas peripherals to facilitate design scalability
+and efficient platform-based product development.
+
+The MCU in this series incorporates a high-performance Arm Cortex®-M33 core running up to
+80 MHz with the following features:
+
+**MCU Native Pin Access**
+
+- R7FA4L1BD4CFP MCU (referred to as RA MCU)
+- 80 MHz, Arm® Cortex®-M33 core
+- 512 KB Code Flash, 64 KB SRAM
+- 100-pin LQFP package
+
+**System Control and Ecosystem Access**
+
+- USB Full Speed Host and Device (USB-C connector)
+- Three 5 V input sources
+
+  - USB (Debug, Full Speed)
+  - External power supply (using surface mount clamp test points and power input vias)
+
+- Three Debug modes
+
+  - Debug on-board (SWD)
+  - Debug in (SWD)
+  - Debug out (SWD, SW0 and JTAG)
+
+- User LEDs and buttons
+
+  - Three User LEDs (red, blue, green)
+  - Power LED (white) indicating availability of regulated power
+  - Debug LED (yellow) indicating the debug connection
+  - Two User buttons
+  - One Reset button
+
+- Five most popular ecosystems expansions
+
+	- 1 Seeed Grove® system (I3C) connector
+	- 1 Seeed Grove® system (I2C/Analog) connector
+	- 2 Digilent PmodTM (SPI, UART and I2C) connectors
+	- ArduinoTM (Uno R3) connector
+	- MikroElektronikaTM mikroBUS connector
+
+- MCU boot configuration jumper
+
+**Special Feature Access**
+
+- 256 Mb (32 MB) External QUAD-SPI Flash
+- CAN FD (3-pin header)
+- Segment LCD Board Interface (50-pin header)
+
+Hardware
+********
+
+Detailed hardware features can be found at:
+
+- RA4L1 MCU: `RA4L1 Group User's Manual Hardware`_
+- EK-RA4L1 board: `EK-RA4L1 - User's Manual`_
+
+Debug on-board:
+
+  - Connector Used: USB-C (J10)
+
++----------------+------+------+--------------------+------+--------------------------------------+
+| Debug Modes    | J6   | J6-A | J8                 | J9   | J29                                  |
++================+======+======+====================+======+======================================+
+| Debug on-board | Open | Open | Jumper on pins 1-2 | Open | Jumpers on pins 1-2, 3-4, 5-6, 7-8   |
++----------------+------+------+--------------------+------+--------------------------------------+
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``ek_ra4l1`` board configuration can be
+built, flashed, and debugged in the usual way. See
+:ref:`build_an_application` and :ref:`application_run` for more details on
+building and running.
+
+Flashing
+========
+
+Program can be flashed to EK-RA4L1 via the on-board SEGGER J-Link debugger.
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
+
+To flash the program to board
+
+1. Connect to J-Link OB via USB port to host PC
+
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA4L1 - User's Manual`_
+
+3. Execute west command
+
+  .. code-block:: console
+
+    west flash -r jlink
+
+References
+**********
+- `EK-RA4L1 Website`_
+- `RA4L1 MCU group Website`_
+
+.. _EK-RA4L1 Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra4l1-evaluation-kit-ra4l1-mcu-group
+
+.. _RA4L1 MCU group Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ra4l1-80mhz-arm-cortex-m33-based-low-power-mcu-trustzone-segment-lcd-controller-and-advanced-security
+
+.. _EK-RA4L1 - User's Manual:
+   https://www.renesas.com/en/document/mat/ek-ra4l1-v1-users-manual?r=25570359
+
+.. _RA4L1 Group User's Manual Hardware:
+   https://www.renesas.com/en/document/mah/ra4l1-group-users-manual-hardware?r=25568281
diff --git a/boards/renesas/ek_ra4l1/ek_ra4l1-pinctrl.dtsi b/boards/renesas/ek_ra4l1/ek_ra4l1-pinctrl.dtsi
new file mode 100644
index 0000000000000..23b0ff8bd6546
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/ek_ra4l1-pinctrl.dtsi
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci5_default: sci5_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_5, 5, 6)>,
+			<RA_PSEL(RA_PSEL_SCI_5, 5, 7)>;
+		};
+	};
+
+	spi0_default: spi0_default {
+		group1 {
+			/* MISO MOSI RSPCK SSL */
+			psels = <RA_PSEL(RA_PSEL_SPI, 1, 10)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 9)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 11)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 12)>;
+		};
+	};
+
+	adc0_default: adc0_default {
+		group1 {
+			/* input */
+			psels = <RA_PSEL(RA_PSEL_ADC, 0, 3)>;
+			renesas,analog-enable;
+		};
+	};
+
+	dac0_default: dac0_default {
+		group1 {
+			/* output */
+			psels = <RA_PSEL(RA_PSEL_DAC, 0, 4)>;
+			renesas,analog-enable;
+		};
+	};
+
+	pwm1_default: pwm1_default {
+		group1 {
+			/* GTIOC1A GTIOC1B */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 4, 5)>,
+				<RA_PSEL(RA_PSEL_GPT1, 4, 6)>;
+		};
+	};
+
+	iic0_default: iic0_default {
+		group1 {
+			/* SCL0 SDA0 */
+			psels = <RA_PSEL(RA_PSEL_I2C, 1, 1)>,
+			<RA_PSEL(RA_PSEL_I2C, 1, 0)>;
+			drive-strength = "medium";
+		};
+	};
+
+	canfd0_default: canfd0_default {
+		group1 {
+			/* CRX0 CTX0 */
+			psels = <RA_PSEL(RA_PSEL_CANFD, 1, 3)>,
+			<RA_PSEL(RA_PSEL_CANFD, 1, 2)>;
+			drive-strength = "high";
+		};
+	};
+};
diff --git a/boards/renesas/ek_ra4l1/ek_ra4l1.dts b/boards/renesas/ek_ra4l1/ek_ra4l1.dts
new file mode 100644
index 0000000000000..21c5eb62f805f
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/ek_ra4l1.dts
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <renesas/ra/ra4/r7fa4l1bd4cfp.dtsi>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/adc/adc.h>
+#include "ek_ra4l1-pinctrl.dtsi"
+
+/ {
+	model = "Renesas EK-RA4L1";
+	compatible = "renesas,ra4l1", "renesas,ra";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash-controller = &flash1;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart5;
+		zephyr,shell-uart = &uart5;
+		zephyr,canbus = &canfd0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led1 {
+			gpios = <&ioport6 9 GPIO_ACTIVE_HIGH>;
+			label = "LED1";
+		};
+
+		led2: led2 {
+			gpios = <&ioport6 10 GPIO_ACTIVE_HIGH>;
+			label = "LED2";
+		};
+
+		led3: led3 {
+			gpios = <&ioport6 1 GPIO_ACTIVE_HIGH>;
+			label = "LED3";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		button0: s1 {
+			gpios = <&ioport0 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button switch 1";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		button1: s2 {
+			gpios = <&ioport0 1 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button switch 2";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+	aliases {
+		led0 = &led1;
+		sw0 = &button0;
+		sw1 = &button1;
+		watchdog0 = &wdt;
+	};
+
+	transceiver0: can-phy0 {
+		compatible = "microchip,mcp2562fd", "can-transceiver-gpio";
+		standby-gpios = <&ioport1 6 GPIO_ACTIVE_LOW>;
+		max-bitrate = <5000000>;
+		#phy-cells = <0>;
+	};
+};
+
+&xtal {
+	clock-frequency = <DT_FREQ_M(8)>;
+	mosel = <0>;
+	#clock-cells = <0>;
+	status = "okay";
+};
+
+&subclk {
+	status = "okay";
+};
+
+&pll {
+	clocks = <&xtal>;
+	div = <1>;
+	mul = <10 0>;
+	status = "okay";
+};
+
+&canfdclk {
+	clocks = <&pll>;
+	div = <2>;
+	status = "okay";
+};
+
+&sci5 {
+	pinctrl-0 = <&sci5_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	uart5: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
+&ioport0 {
+	status = "okay";
+};
+
+&ioport1 {
+	status = "okay";
+};
+
+&ioport4 {
+	status = "okay";
+};
+
+&ioport5 {
+	status = "okay";
+};
+
+&ioport6 {
+	status = "okay";
+};
+
+&spi0 {
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&adc0 {
+	status = "okay";
+	pinctrl-0 = <&adc0_default>;
+	pinctrl-names = "default";
+};
+
+&dac0 {
+	pinctrl-0 = <&dac0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&port_irq6 {
+	interrupts = <14 12>;
+	status = "okay";
+};
+
+&port_irq7 {
+	interrupts = <15 12>;
+	status = "okay";
+};
+
+&pwm1 {
+	pinctrl-0 = <&pwm1_default>;
+	pinctrl-names = "default";
+	interrupts = <8 1>, <9 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+};
+
+&iic0 {
+	pinctrl-0 = <&iic0_default>;
+	pinctrl-names = "default";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	clock-frequency = <DT_FREQ_M(1)>;
+	interrupts = <10 1>, <11 1>, <12 1>, <13 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
+&canfd_global {
+	status = "okay";
+
+	canfd0 {
+		pinctrl-0 = <&canfd0_default>;
+		pinctrl-names = "default";
+		phys = <&transceiver0>;
+		rx-max-filters = <16>;
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra4l1/ek_ra4l1.yaml b/boards/renesas/ek_ra4l1/ek_ra4l1.yaml
new file mode 100644
index 0000000000000..1c50ba9907c91
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/ek_ra4l1.yaml
@@ -0,0 +1,14 @@
+identifier: ek_ra4l1
+name: Renesas EK-RA4L1
+type: mcu
+arch: arm
+ram: 64
+flash: 512
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - uart
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra4l1/ek_ra4l1_defconfig b/boards/renesas/ek_ra4l1/ek_ra4l1_defconfig
new file mode 100644
index 0000000000000..f26066de3e521
--- /dev/null
+++ b/boards/renesas/ek_ra4l1/ek_ra4l1_defconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable Console
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
diff --git a/boards/renesas/ek_ra4m1/doc/index.rst b/boards/renesas/ek_ra4m1/doc/index.rst
index 867dda46652e7..2baaeb98c33c2 100644
--- a/boards/renesas/ek_ra4m1/doc/index.rst
+++ b/boards/renesas/ek_ra4m1/doc/index.rst
@@ -1,8 +1,5 @@
 .. zephyr:board:: ek_ra4m1
 
-RA4M1 Evaluation Kit
-####################
-
 Overview
 ********
 
@@ -66,33 +63,13 @@ Detailed hardware features can be found at:
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr for the ``ek_ra4m1`` board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra4m1`` board can be built, flashed, and debugged
 in the usual way. See :ref:`build_an_application` and :ref:`application_run`
 for more details on building and running.
@@ -101,7 +78,7 @@ Flashing
 ========
 
 Program can be flashed to EK-RA4M1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
diff --git a/boards/renesas/ek_ra4m1/ek_ra4m1-pinctrl.dtsi b/boards/renesas/ek_ra4m1/ek_ra4m1-pinctrl.dtsi
index 49ea76613a0c2..50f97bd479620 100644
--- a/boards/renesas/ek_ra4m1/ek_ra4m1-pinctrl.dtsi
+++ b/boards/renesas/ek_ra4m1/ek_ra4m1-pinctrl.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -29,4 +29,29 @@
 			renesas,analog-enable;
 		};
 	};
+
+	dac0_default: dac0_default {
+		group1 {
+			/* output */
+			psels = <RA_PSEL(RA_PSEL_DAC, 0, 14)>;
+			renesas,analog-enable;
+		};
+	};
+
+	pwm1_default: pwm1_default {
+		group1 {
+			/* GTIOC1A GTIOC1B */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 4, 5)>,
+				<RA_PSEL(RA_PSEL_GPT1, 4, 6)>;
+		};
+	};
+
+	iic1_default: iic1_default {
+		group1 {
+			/* SCL1 SDA1 */
+			psels = <RA_PSEL(RA_PSEL_I2C, 1, 0)>,
+			<RA_PSEL(RA_PSEL_I2C, 2, 6)>;
+			drive-strength = "medium";
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra4m1/ek_ra4m1.dts b/boards/renesas/ek_ra4m1/ek_ra4m1.dts
index d93571828ab35..054adf4c92517 100644
--- a/boards/renesas/ek_ra4m1/ek_ra4m1.dts
+++ b/boards/renesas/ek_ra4m1/ek_ra4m1.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -20,6 +20,7 @@
 		zephyr,flash = &flash0;
 		zephyr,console = &uart1;
 		zephyr,shell-uart = &uart1;
+		zephyr,entropy = &trng;
 	};
 
 	leds {
@@ -44,6 +45,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -100,7 +102,40 @@
 	pinctrl-names = "default";
 };
 
+&dac0 {
+	pinctrl-0 = <&dac0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &port_irq0 {
 	interrupts = <27 12>;
 	status = "okay";
 };
+
+&trng {
+	status = "okay";
+};
+
+&pwm1 {
+	pinctrl-0 = <&pwm1_default>;
+	pinctrl-names = "default";
+	interrupts = <8 1>, <9 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+};
+
+&iic1 {
+	pinctrl-0 = <&iic1_default>;
+	pinctrl-names = "default";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	clock-frequency = <DT_FREQ_M(1)>;
+	interrupts = <10 1>, <11 1>, <12 1>, <13 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra4m1/ek_ra4m1.yaml b/boards/renesas/ek_ra4m1/ek_ra4m1.yaml
index 022f56df18d3b..1e624c9bda652 100644
--- a/boards/renesas/ek_ra4m1/ek_ra4m1.yaml
+++ b/boards/renesas/ek_ra4m1/ek_ra4m1.yaml
@@ -10,3 +10,5 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra4m2/doc/index.rst b/boards/renesas/ek_ra4m2/doc/index.rst
index 6d66b8ac1b3ff..3ce70ec23cdef 100644
--- a/boards/renesas/ek_ra4m2/doc/index.rst
+++ b/boards/renesas/ek_ra4m2/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra4m2:
-
-RA4M2 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra4m2
 
 Overview
 ********
@@ -17,17 +14,19 @@ The MCU in this series incorporates a high-performance Arm Cortex®-M33 core run
 100 MHz with the following features:
 
 **Renesas RA4M2 Microcontroller Group**
+
 - R7FA4M2AD3CFP
 - 100-pin LQFP package
 - 100 MHz Arm® Cortex®-M33 core
 - 512 kB Code Flash, 128 KB SRAM
 - Native pin access through 4 x 28-pin male headers
 - MCU current measurement points for precision current consumption measurement
--  Multiple clock sources - RA MCU oscillator and sub-clock oscillator crystals, providing
-precision 24.000 MHz and 32,768 Hz reference clock. Additional low-precision clocks are
-available internal to the RA MCU
+- Multiple clock sources - RA MCU oscillator and sub-clock oscillator crystals, providing
+  precision 24.000 MHz and 32,768 Hz reference clock. Additional low-precision clocks are
+  available internal to the RA MCU
 
 **System Control and Ecosystem Access**
+
 - USB Full Speed Host and Device (micro AB connector)
 - Three 5 V input sources
 
@@ -59,17 +58,12 @@ available internal to the RA MCU
 - MCU boot configuration jumper
 
 **Special Feature Access**
-- 32 MB (256 Mb) External Quad-SPI Flash
 
-.. figure:: ek_ra4m2.webp
-	:align: center
-	:alt: RA4M2 Evaluation Kit
-
-	EK-RA4M2 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
+- 32 MB (256 Mb) External Quad-SPI Flash
 
 Hardware
 ********
-Detail Hardware feature for the RA4M2 MCU group can be found at `RA4M2 Group User's Manual Hardware`_
+Detailed hardware features for the RA4M2 MCU group can be found at `RA4M2 Group User's Manual Hardware`_
 
 .. figure:: ra4m2_block_diagram.webp
 	:width: 442px
@@ -78,48 +72,18 @@ Detail Hardware feature for the RA4M2 MCU group can be found at `RA4M2 Group Use
 
 	RA4M2 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail Hardware feature for the EK-RA4M2 MCU can be found at `EK-RA4M2 - User's Manual`_
+Detailed hardware features for the EK-RA4M2 MCU can be found at `EK-RA4M2 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA4M2 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra4m2`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -129,15 +93,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA4M2 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA4M2 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA4M2 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra4m2/ek_ra4m2-pinctrl.dtsi b/boards/renesas/ek_ra4m2/ek_ra4m2-pinctrl.dtsi
index 205c1eb4f5ed2..97e386641c8ec 100644
--- a/boards/renesas/ek_ra4m2/ek_ra4m2-pinctrl.dtsi
+++ b/boards/renesas/ek_ra4m2/ek_ra4m2-pinctrl.dtsi
@@ -54,4 +54,12 @@
 			drive-strength = "medium";
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra4m2/ek_ra4m2.dts b/boards/renesas/ek_ra4m2/ek_ra4m2.dts
index acd5aed6b6a41..a3ade121275a5 100644
--- a/boards/renesas/ek_ra4m2/ek_ra4m2.dts
+++ b/boards/renesas/ek_ra4m2/ek_ra4m2.dts
@@ -58,6 +58,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -79,6 +80,19 @@
 	status = "okay";
 };
 
+&pll2 {
+	clocks = <&xtal>;
+	div = <2>;
+	mul = <20 0>;
+	status = "okay";
+};
+
+&uclk {
+	clocks = <&pll2>;
+	div = <5>;
+	status = "okay";
+};
+
 &sci0 {
 	pinctrl-0 = <&sci0_default>;
 	pinctrl-names = "default";
@@ -160,3 +174,17 @@
 &trng {
 	status = "okay";
 };
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra4m2/ek_ra4m2.yaml b/boards/renesas/ek_ra4m2/ek_ra4m2.yaml
index d61c6bf05fe82..74567cb24323b 100644
--- a/boards/renesas/ek_ra4m2/ek_ra4m2.yaml
+++ b/boards/renesas/ek_ra4m2/ek_ra4m2.yaml
@@ -10,3 +10,6 @@ toolchain:
 supported:
   - gpio
   - uart
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra4m2/ek_ra4m2_defconfig b/boards/renesas/ek_ra4m2/ek_ra4m2_defconfig
index 93569c968fce1..770a30fc47db0 100644
--- a/boards/renesas/ek_ra4m2/ek_ra4m2_defconfig
+++ b/boards/renesas/ek_ra4m2/ek_ra4m2_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_CONSOLE=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra4m3/doc/index.rst b/boards/renesas/ek_ra4m3/doc/index.rst
index b57781215e007..f4b3911d679fb 100644
--- a/boards/renesas/ek_ra4m3/doc/index.rst
+++ b/boards/renesas/ek_ra4m3/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra4m3:
-
-RA4M3 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra4m3
 
 Overview
 ********
@@ -18,6 +15,7 @@ The MCU in this series incorporates a high-performance Arm Cortex®-M33 core run
 100 MHz with the following features:
 
 **MCU Native Pin Access**
+
 - R7FA4M3AF3CFB
 - 100-pin LQFP package
 - 100 MHz Arm® Cortex®-M33 core
@@ -26,24 +24,23 @@ The MCU in this series incorporates a high-performance Arm Cortex®-M33 core run
 - Native pin access through 4 x 40-pin male headers
 - MCU and USB current measurement points for precision current consumption measurement
 - Multiple clock sources - RA MCU oscillator and sub-clock oscillator crystals, providing precision
-24.000 MHz and 32,768 Hz reference clock. Additional low-precision clocks are available internal to the
-RA MCU
+  24.000 MHz and 32,768 Hz reference clock. Additional low-precision clocks are available internal to the
+  RA MCU
 
 **System Control and Ecosystem Access**
+
 - USB Full Speed Host and Device (micro AB connector)
-- Three 5 V input sources
 
+- Three 5 V input sources
 	- USB (Debug, Full Speed)
 	- External power supply (using surface mount clamp test points and power input vias)
 
- Three Debug modes
-
+- Three Debug modes
 	- Debug on-board (SWD)
 	- Debug in (ETM, SWD, and JTAG)
 	- Debug out (SWD)
 
- User LEDs and buttons
-
+- User LEDs and buttons
 	- Three User LEDs (red, blue, green)
 	- Power LED (white) indicating availability of regulated power
 	- Debug LED (yellow) indicating the debug connection
@@ -51,7 +48,6 @@ RA MCU
 	- One Reset button
 
 - Five most popular ecosystems expansions
-
 	- 2 Seeed Grove® system (I2C/Analog) connectors
 	- SparkFun® Qwiic® connector
 	- 2 Digilent PmodTM (SPI and UART) connectors
@@ -63,15 +59,9 @@ RA MCU
 **Special Feature Access**
 - 32 MB (256 Mb) External Quad-SPI Flash
 
-.. figure:: ek_ra4m3.webp
-	:align: center
-	:alt: RA4M3 Evaluation Kit
-
-	EK-RA4M3 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detail Hardware feature for the RA4M3 MCU group can be found at `RA4M3 Group User's Manual Hardware`_
+Detailed hardware features for the RA4M3 MCU group can be found at `RA4M3 Group User's Manual Hardware`_
 
 .. figure:: ra4m3_block_diagram.webp
 	:width: 442px
@@ -80,48 +70,18 @@ Detail Hardware feature for the RA4M3 MCU group can be found at `RA4M3 Group Use
 
 	RA4M3 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail Hardware feature for the EK-RA4M3 MCU can be found at `EK-RA4M3 - User's Manual`_
+Detailed hardware features for the EK-RA4M3 MCU can be found at `EK-RA4M3 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA4M3 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra4m3`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -131,7 +91,7 @@ Flashing
 ========
 
 Program can be flashed to EK-RA4M3 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
diff --git a/boards/renesas/ek_ra4m3/ek_ra4m3-pinctrl.dtsi b/boards/renesas/ek_ra4m3/ek_ra4m3-pinctrl.dtsi
index f9b7c31fe47b8..0b574b13c5ffb 100644
--- a/boards/renesas/ek_ra4m3/ek_ra4m3-pinctrl.dtsi
+++ b/boards/renesas/ek_ra4m3/ek_ra4m3-pinctrl.dtsi
@@ -54,4 +54,12 @@
 			drive-strength = "medium";
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra4m3/ek_ra4m3.dts b/boards/renesas/ek_ra4m3/ek_ra4m3.dts
index e58e910cf0962..384da60afca1b 100644
--- a/boards/renesas/ek_ra4m3/ek_ra4m3.dts
+++ b/boards/renesas/ek_ra4m3/ek_ra4m3.dts
@@ -58,6 +58,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -79,6 +80,19 @@
 	status = "okay";
 };
 
+&pll2 {
+	clocks = <&xtal>;
+	div = <3>;
+	mul = <24 0>;
+	status = "okay";
+};
+
+&uclk {
+	clocks = <&pll2>;
+	div = <4>;
+	status = "okay";
+};
+
 &sci0 {
 	pinctrl-0 = <&sci0_default>;
 	pinctrl-names = "default";
@@ -160,3 +174,17 @@
 &trng {
 	status = "okay";
 };
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra4m3/ek_ra4m3.yaml b/boards/renesas/ek_ra4m3/ek_ra4m3.yaml
index e05b8e804da78..3035a25af53ca 100644
--- a/boards/renesas/ek_ra4m3/ek_ra4m3.yaml
+++ b/boards/renesas/ek_ra4m3/ek_ra4m3.yaml
@@ -10,3 +10,6 @@ toolchain:
 supported:
   - gpio
   - uart
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra4m3/ek_ra4m3_defconfig b/boards/renesas/ek_ra4m3/ek_ra4m3_defconfig
index 93569c968fce1..770a30fc47db0 100644
--- a/boards/renesas/ek_ra4m3/ek_ra4m3_defconfig
+++ b/boards/renesas/ek_ra4m3/ek_ra4m3_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=100000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_CONSOLE=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra4w1/doc/index.rst b/boards/renesas/ek_ra4w1/doc/index.rst
index c9501e3dc1d6e..89c92588b98e9 100644
--- a/boards/renesas/ek_ra4w1/doc/index.rst
+++ b/boards/renesas/ek_ra4w1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra4w1:
-
-RA4W1 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra4w1
 
 Overview
 ********
@@ -14,54 +11,56 @@ excellent reception performance. RA4W1 is geared towards IoT application requiri
 embedded RAM and low power consumption.
 
 **MCU Native Pin Access**
+
 - R7FA4W1AD2CNG
 - QFN-56 package
 - On-chip memory: 512-KB ROM, 96-KB RAM, 8-KB data flash memory
 
 **Power-supply voltage**
+
 - USB connector: 5-V input
 - Power-supply IC: 5-V input, 3.3-V output
 - External power-supply header*1: 3.3-V input, 2 pins x 1
 
 **Main clock**
+
 - Crystal oscillator (surface-mount technology (SMT)) for the main system clock
 - Crystal oscillator or ceramic resonator (lead type) for the main system clock
 
 **Sub-clock**
+
 - Crystal oscillator (SMT) for the sub-clock
 
 **Bluetooth Low Energy**
+
 - Bluetooth Low Energy (BLE) circuit x1
 - Range of frequency: 2402 to 2480 MHz
 - Maximum transmission output power: 4 dBm (in 4-dBm output mode)
 - Output variation: +2 dB
 
 **Push switches**
+
 - Reset switch x 1
 - User switch x 1
 
 **LED**
+
 - Power indicator: green x 1
 - User: green x 2
 - ACT LED: green x 1
 
-**Conetivity**
+**Connectivity**
+
 - Connector for an on-board emulator: USB Micro-B
 - Connector for a USB serial-conversion interface: USB Micro-B
 - Pmod™ connector: Angle type, 12 pins
 - Arduino™ UNO connectors
 
-- Emulator reset switch
-
-.. figure:: ek_ra4w1.webp
-	:align: center
-	:alt: RA4W1 Evaluation Kit
-
-	EK-RA4W1 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
+- Emulator reset switch: DIP switch x 1
 
 Hardware
 ********
-Detail Hardware feature for the RA4W1 MCU group can be found at `RA4W1 Group User's Manual Hardware`_
+Detailed Hardware features for the RA4W1 MCU group can be found at `RA4W1 Group User's Manual Hardware`_
 
 .. figure:: ra4w1_block_diagram.webp
 	:width: 442px
@@ -70,44 +69,18 @@ Detail Hardware feature for the RA4W1 MCU group can be found at `RA4W1 Group Use
 
 	RA4W1 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail Hardware feature for the EK-RA4W1 MCU can be found at `EK-RA4W1 - User's Manual`_
+Detailed Hardware features for the EK-RA4W1 MCU can be found at `EK-RA4W1 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA4W1 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra4w1`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -117,15 +90,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA4W1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA4W1 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA4W1 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra4w1/ek_ra4w1-pinctrl.dtsi b/boards/renesas/ek_ra4w1/ek_ra4w1-pinctrl.dtsi
index f0b48f12f95ba..93c32a1721e71 100644
--- a/boards/renesas/ek_ra4w1/ek_ra4w1-pinctrl.dtsi
+++ b/boards/renesas/ek_ra4w1/ek_ra4w1-pinctrl.dtsi
@@ -30,6 +30,14 @@
 		};
 	};
 
+	dac0_default: dac0_default {
+		group1 {
+			/* output */
+			psels = <RA_PSEL(RA_PSEL_DAC, 0, 14)>;
+			renesas,analog-enable;
+		};
+	};
+
 	pwm1_default: pwm1_default {
 		group1 {
 			/* GTIOC1A GTIOC1B */
diff --git a/boards/renesas/ek_ra4w1/ek_ra4w1.dts b/boards/renesas/ek_ra4w1/ek_ra4w1.dts
index 75637a7f0237b..7ab31de3e89eb 100644
--- a/boards/renesas/ek_ra4w1/ek_ra4w1.dts
+++ b/boards/renesas/ek_ra4w1/ek_ra4w1.dts
@@ -48,6 +48,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -89,6 +90,12 @@
 	pinctrl-names = "default";
 };
 
+&dac0 {
+	pinctrl-0 = <&dac0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &port_irq4 {
 	interrupts = <27 12>;
 	status = "okay";
@@ -112,3 +119,7 @@
 	interrupt-names = "rxi", "txi", "tei", "eri";
 	status = "okay";
 };
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra4w1/ek_ra4w1.yaml b/boards/renesas/ek_ra4w1/ek_ra4w1.yaml
index f31bcd0a7bc88..6d6decc81cdf1 100644
--- a/boards/renesas/ek_ra4w1/ek_ra4w1.yaml
+++ b/boards/renesas/ek_ra4w1/ek_ra4w1.yaml
@@ -10,3 +10,5 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra4w1/ek_ra4w1_defconfig b/boards/renesas/ek_ra4w1/ek_ra4w1_defconfig
index fb7c4482b2448..770a30fc47db0 100644
--- a/boards/renesas/ek_ra4w1/ek_ra4w1_defconfig
+++ b/boards/renesas/ek_ra4w1/ek_ra4w1_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_CONSOLE=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra6e2/doc/index.rst b/boards/renesas/ek_ra6e2/doc/index.rst
index 1e39eca3a14c1..3b476688eb3f9 100644
--- a/boards/renesas/ek_ra6e2/doc/index.rst
+++ b/boards/renesas/ek_ra6e2/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra6e2:
-
-RA6E2 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra6e2
 
 Overview
 ********
@@ -22,7 +19,7 @@ The key features of the EK-RA6E2 board are categorized in three groups as follow
 - MCU current measurement points for precision current consumption measurement
 - Multiple clock sources - RA6E2 MCU oscillator and sub-clock oscillator crystals,
   providing precision 20.000 MHz and 32,768 Hz reference clock.
-  Additional low precision clocks are avaialbe internal to the RA6E2 MCU
+  Additional low precision clocks are available internal to the RA6E2 MCU
 
 **System Control and Ecosystem Access**
 
@@ -61,15 +58,9 @@ The key features of the EK-RA6E2 board are categorized in three groups as follow
 - 16 Mb (128 Mb) External Quad-SPI Flash
 - CAN (3-pin header)
 
-.. figure:: ek_ra6e2.webp
-	:align: center
-	:alt: RA6E2 Evaluation Kit
-
-	EK-RA6E2 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6E2 MCU group can be found at `RA6E2 Group User's Manual Hardware`_
+Detailed hardware features for the RA6E2 MCU group can be found at `RA6E2 Group User's Manual Hardware`_
 
 .. figure:: ra6e2_block_diagram.webp
 	:width: 442px
@@ -78,44 +69,18 @@ Detailed hardware feature for the RA6E2 MCU group can be found at `RA6E2 Group U
 
 	RA6E2 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detailed hardware feature for the EK-RA6E2 MCU can be found at `EK-RA6E2 - User's Manual`_
+Detailed hardware features for the EK-RA6E2 MCU can be found at `EK-RA6E2 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA6E2 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra6e2`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -125,15 +90,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA6E2 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6E2 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6E2 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra6e2/ek_ra6e2.dts b/boards/renesas/ek_ra6e2/ek_ra6e2.dts
index f6fc4abe0680b..7d4911bb9da2a 100644
--- a/boards/renesas/ek_ra6e2/ek_ra6e2.dts
+++ b/boards/renesas/ek_ra6e2/ek_ra6e2.dts
@@ -60,6 +60,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -184,3 +185,7 @@
 		};
 	};
 };
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra6e2/ek_ra6e2.yaml b/boards/renesas/ek_ra6e2/ek_ra6e2.yaml
index dcb71bda519a1..dc2a982ccc33a 100644
--- a/boards/renesas/ek_ra6e2/ek_ra6e2.yaml
+++ b/boards/renesas/ek_ra6e2/ek_ra6e2.yaml
@@ -9,3 +9,5 @@ toolchain:
   - gnuarmemb
 supported:
   - gpio
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra6e2/ek_ra6e2_defconfig b/boards/renesas/ek_ra6e2/ek_ra6e2_defconfig
index 882cf699d986f..770a30fc47db0 100644
--- a/boards/renesas/ek_ra6e2/ek_ra6e2_defconfig
+++ b/boards/renesas/ek_ra6e2/ek_ra6e2_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=200000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_CONSOLE=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra6m1/doc/index.rst b/boards/renesas/ek_ra6m1/doc/index.rst
index 78ea7c4bffb45..0c91d3905e0a9 100644
--- a/boards/renesas/ek_ra6m1/doc/index.rst
+++ b/boards/renesas/ek_ra6m1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra6m1:
-
-RA6M1 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra6m1
 
 Overview
 ********
@@ -17,6 +14,7 @@ low power consumption.
 The key features of the EK-RA6M1 board are categorized in three groups as follow:
 
 **MCU Native Pin Access**
+
 - R7FA6M1AD3CFP
 - 100-pin LQFP package
 - 120 MHz Arm® Cortex®-M4 core with Floating Point Unit (FPU)
@@ -25,47 +23,42 @@ The key features of the EK-RA6M1 board are categorized in three groups as follow
 - 8 KB data flash memory
 
 **Connectivity**
+
 - A Device USB connector for the Main MCU
 - S124 MCU-based SEGGER J-Link® On-Board interface for debugging and programming of the
-RA6M1 MCU. A 10-pin JTAG/SWD interface is also provided for connecting optional external
-debuggers and programmers.
+  RA6M1 MCU. A 10-pin JTAG/SWD interface is also provided for connecting optional external
+  debuggers and programmers.
 - Two PMOD connectors, allowing use of appropriate PMOD compliant peripheral plug-in modules for
-rapid prototyping
+  rapid prototyping.
 - Pin headers for access to power and signals for the Main MCU
 
 **Multiple clock sources**
+
 - Main MCU oscillator crystals, providing precision 12.000 MHz and 32,768 Hz external reference
-clocks
+  clocks
 - Additional low-precision clocks are available internal to the Main MCU
 
 **General purpose I/O ports**
+
 - One jumper to allow measuring of Main MCU current
 - Copper jumpers on PCB bottom side for configuration and access to selected MCU signals
+
 **Operating voltage**
+
 - External 5 V input through the Debug USB connector supplies the on-board power regulator to power
-logic and interfaces on the board. External 5 V or 3.3 V may be also supplied through alternate
-locations on the board.
+  logic and interfaces on the board. External 5 V or 3.3 V may be also supplied through alternate
+  locations on the board.
 - A two-color board status LED indicating availability of regulated power and connection status of the J-Link
-interface.
+  interface.
 - A red User LED, controlled by the Main MCU firmware
 - A User Push-Button switch, User Capacitive Touch Button sensor, and an optional User Potentiometer,
-all of which are controlled by the Main MCU firmware
+  all of which are controlled by the Main MCU firmware
 - MCU reset push-button switch
 - MCU boot configuration jumper
 
-**Special Feature Access**
-
-- USB Full Speed Debug and Device (micro-AB connector)
-
-.. figure:: ek_ra6m1.webp
-	:align: center
-	:alt: RA6M1 Evaluation Kit
-
-	EK-RA6M1 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6M1 MCU group can be found at `RA6M1 Group User's Manual Hardware`_
+Detailed hardware features for the RA6M1 MCU group can be found at `RA6M1 Group User's Manual Hardware`_
 
 .. figure:: ra6m1_block_diagram.webp
 	:width: 442px
@@ -74,46 +67,18 @@ Detailed hardware feature for the RA6M1 MCU group can be found at `RA6M1 Group U
 
 	RA6M1 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detailed hardware feature for the EK-RA6M1 MCU can be found at `EK-RA6M1 - User's Manual`_
+Detailed hardware features for the EK-RA6M1 MCU can be found at `EK-RA6M1 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA6M1 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra6m1`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -123,15 +88,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA6M1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M1 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M1 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra6m1/ek_ra6m1-pinctrl.dtsi b/boards/renesas/ek_ra6m1/ek_ra6m1-pinctrl.dtsi
index bb51b310e29f3..87e76e218caea 100644
--- a/boards/renesas/ek_ra6m1/ek_ra6m1-pinctrl.dtsi
+++ b/boards/renesas/ek_ra6m1/ek_ra6m1-pinctrl.dtsi
@@ -54,4 +54,12 @@
 				<RA_PSEL(RA_PSEL_GPT1, 4, 6)>;
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra6m1/ek_ra6m1.dts b/boards/renesas/ek_ra6m1/ek_ra6m1.dts
index 0d0c9b8156ee8..00fd4ff32677c 100644
--- a/boards/renesas/ek_ra6m1/ek_ra6m1.dts
+++ b/boards/renesas/ek_ra6m1/ek_ra6m1.dts
@@ -45,6 +45,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -142,3 +143,23 @@
 		};
 	};
 };
+
+&uclk {
+	clocks = <&pll>;
+	div = <5>;
+	status = "okay";
+};
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra6m1/ek_ra6m1.yaml b/boards/renesas/ek_ra6m1/ek_ra6m1.yaml
index 92e8d569db224..d2aece1948e47 100644
--- a/boards/renesas/ek_ra6m1/ek_ra6m1.yaml
+++ b/boards/renesas/ek_ra6m1/ek_ra6m1.yaml
@@ -10,3 +10,6 @@ toolchain:
 supported:
   - gpio
   - uart
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra6m1/ek_ra6m1_defconfig b/boards/renesas/ek_ra6m1/ek_ra6m1_defconfig
index fb0bf97d8885b..35ed0307b9aa5 100644
--- a/boards/renesas/ek_ra6m1/ek_ra6m1_defconfig
+++ b/boards/renesas/ek_ra6m1/ek_ra6m1_defconfig
@@ -1,14 +1,9 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
-
 # Enable Console
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
diff --git a/boards/renesas/ek_ra6m2/doc/index.rst b/boards/renesas/ek_ra6m2/doc/index.rst
index 2e9d6a0612c35..8e135b2efaaa6 100644
--- a/boards/renesas/ek_ra6m2/doc/index.rst
+++ b/boards/renesas/ek_ra6m2/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra6m2:
-
-RA6M2 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra6m2
 
 Overview
 ********
@@ -20,7 +17,7 @@ The key features of the EK-RA6M2 board are categorized in three groups as follow
 - MCU and USB current measurement points for precision current consumption measurement
 - Multiple clock sources - RA6M2 MCU oscillator and sub-clock oscillator crystals,
   providing precision 12.000 MHz and 32,768 Hz reference clock.
-  Additional low precision clocks are avaialbe internal to the RA6M2 MCU
+  Additional low precision clocks are available internal to the RA6M2 MCU
 
 **System Control and Ecosystem Access**
 
@@ -51,15 +48,9 @@ The key features of the EK-RA6M2 board are categorized in three groups as follow
 
 - USB Full Speed Host and Device (micro-AB connector)
 
-.. figure:: ek_ra6m2.webp
-	:align: center
-	:alt: RA6M2 Evaluation Kit
-
-	EK-RA6M2 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6M2 MCU group can be found at `RA6M2 Group User's Manual Hardware`_
+Detailed hardware features for the RA6M2 MCU group can be found at `RA6M2 Group User's Manual Hardware`_
 
 .. figure:: ra6m2_block_diagram.webp
 	:width: 871px
@@ -68,46 +59,18 @@ Detailed hardware feature for the RA6M2 MCU group can be found at `RA6M2 Group U
 
 	RA6M2 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detailed hardware feature for the EK-RA6M2 MCU can be found at `EK-RA6M2 - User's Manual`_
+Detailed hardware features for the EK-RA6M2 MCU can be found at `EK-RA6M2 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA6M2 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra6m2`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -117,7 +80,7 @@ Flashing
 ========
 
 Program can be flashed to EK-RA6M2 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
diff --git a/boards/renesas/ek_ra6m2/ek_ra6m2-pinctrl.dtsi b/boards/renesas/ek_ra6m2/ek_ra6m2-pinctrl.dtsi
index b6c1265b43b2c..85a43362ea8c7 100644
--- a/boards/renesas/ek_ra6m2/ek_ra6m2-pinctrl.dtsi
+++ b/boards/renesas/ek_ra6m2/ek_ra6m2-pinctrl.dtsi
@@ -54,4 +54,12 @@
 				<RA_PSEL(RA_PSEL_GPT1, 4, 6)>;
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra6m2/ek_ra6m2.dts b/boards/renesas/ek_ra6m2/ek_ra6m2.dts
index 8932a511ab91f..46fcc3ad44281 100644
--- a/boards/renesas/ek_ra6m2/ek_ra6m2.dts
+++ b/boards/renesas/ek_ra6m2/ek_ra6m2.dts
@@ -45,6 +45,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -138,3 +139,23 @@
 		};
 	};
 };
+
+&uclk {
+	clocks = <&pll>;
+	div = <5>;
+	status = "okay";
+};
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra6m2/ek_ra6m2.yaml b/boards/renesas/ek_ra6m2/ek_ra6m2.yaml
index 3f3c049c5e563..a579a97b90dd2 100644
--- a/boards/renesas/ek_ra6m2/ek_ra6m2.yaml
+++ b/boards/renesas/ek_ra6m2/ek_ra6m2.yaml
@@ -9,3 +9,6 @@ toolchain:
   - gnuarmemb
 supported:
   - gpio
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra6m2/ek_ra6m2_defconfig b/boards/renesas/ek_ra6m2/ek_ra6m2_defconfig
index fb0bf97d8885b..35ed0307b9aa5 100644
--- a/boards/renesas/ek_ra6m2/ek_ra6m2_defconfig
+++ b/boards/renesas/ek_ra6m2/ek_ra6m2_defconfig
@@ -1,14 +1,9 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
-
 # Enable Console
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
diff --git a/boards/renesas/ek_ra6m3/Kconfig.defconfig b/boards/renesas/ek_ra6m3/Kconfig.defconfig
new file mode 100644
index 0000000000000..d8546450c2c4f
--- /dev/null
+++ b/boards/renesas/ek_ra6m3/Kconfig.defconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_EK_RA6M3
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+endif # NETWORKING
+
+endif # BOARD_EK_RA6M3
diff --git a/boards/renesas/ek_ra6m3/doc/index.rst b/boards/renesas/ek_ra6m3/doc/index.rst
index 61e427a7bee4c..76557710d1bfc 100644
--- a/boards/renesas/ek_ra6m3/doc/index.rst
+++ b/boards/renesas/ek_ra6m3/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra6m3:
-
-RA6M3 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra6m3
 
 Overview
 ********
@@ -20,7 +17,7 @@ The key features of the EK-RA6M3 board are categorized in three groups as follow
 - MCU and USB current measurement points for precision current consumption measurement
 - Multiple clock sources - RA6M3 MCU oscillator and sub-clock oscillator crystals,
   providing precision 24.000 MHz and 32,768 Hz reference clock.
-  Additional low precision clocks are avaialbe internal to the RA6M3 MCU
+  Additional low precision clocks are available internal to the RA6M3 MCU
 
 **System Control and Ecosystem Access**
 
@@ -59,15 +56,9 @@ The key features of the EK-RA6M3 board are categorized in three groups as follow
 - USB High Speed Host and Device (micro-AB connector)
 - 32 Mb (256 Mb) External Quad-SPI Flash
 
-.. figure:: ek_ra6m3.webp
-	:align: center
-	:alt: RA6M3 Evaluation Kit
-
-	EK-RA6M3 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6M3 MCU group can be found at `RA6M3 Group User's Manual Hardware`_
+Detailed hardware features for the RA6M3 MCU group can be found at `RA6M3 Group User's Manual Hardware`_
 
 .. figure:: ra6m3_block_diagram.webp
 	:width: 442px
@@ -76,48 +67,18 @@ Detailed hardware feature for the RA6M3 MCU group can be found at `RA6M3 Group U
 
 	RA6M3 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail hardware feature for the EK-RA6M3 MCU can be found at `EK-RA6M3 - User's Manual`_
+Detailed hardware features for the EK-RA6M3 MCU can be found at `EK-RA6M3 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA6M3 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| USBHS     | on-chip    | udc                  |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra6m3`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -127,15 +88,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA6M3 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M3 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M3 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra6m3/ek_ra6m3-pinctrl.dtsi b/boards/renesas/ek_ra6m3/ek_ra6m3-pinctrl.dtsi
index bd2e69903d8a1..b6236c0199a54 100644
--- a/boards/renesas/ek_ra6m3/ek_ra6m3-pinctrl.dtsi
+++ b/boards/renesas/ek_ra6m3/ek_ra6m3-pinctrl.dtsi
@@ -54,11 +54,35 @@
 		};
 	};
 
-	pwm1_default: pwm1_default {
+	pwm0_default: pwm0_default {
 		group1 {
-			/* GTIOC1A GTIOC1B */
-			psels = <RA_PSEL(RA_PSEL_GPT1, 4, 5)>,
-				<RA_PSEL(RA_PSEL_GPT1, 4, 6)>;
+			/* GTIOC0A GTIOC0B */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 4, 15)>,
+				<RA_PSEL(RA_PSEL_GPT1, 4, 14)>;
+		};
+	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 11, 1)>;
+			drive-strength = "high";
+		};
+	};
+
+	ether_default: ether_default {
+		group1 {
+			psels = <RA_PSEL(RA_PSEL_ETH_RMII, 4, 1)>, /* ET0_MDC */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 4, 2)>, /* ET0_MDIO */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 4, 5)>, /* RMII0_TXD_EN_B */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 4, 6)>, /* RMII0_TXD1_BR */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 7, 0)>, /* RMII0_TXD0_B */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 7, 1)>, /* REF50CK0_B */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 7, 2)>, /* RMII0_RXD0_B */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 7, 3)>, /* RMII0_RXD1_B */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 7, 4)>, /* RMII0_RX_ER_B */
+				<RA_PSEL(RA_PSEL_ETH_RMII, 7, 5)>; /* RMII0_CRS_DV_B */
+			drive-strength = "high";
 		};
 	};
 };
diff --git a/boards/renesas/ek_ra6m3/ek_ra6m3.dts b/boards/renesas/ek_ra6m3/ek_ra6m3.dts
index 1f19d1f103f5f..409f0549ff30b 100644
--- a/boards/renesas/ek_ra6m3/ek_ra6m3.dts
+++ b/boards/renesas/ek_ra6m3/ek_ra6m3.dts
@@ -59,6 +59,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -123,6 +124,12 @@
 	status ="okay";
 };
 
+&uclk {
+	clocks = <&pll>;
+	div = <5>;
+	status = "okay";
+};
+
 &usbhs {
 	pinctrl-0 = <&usbhs_default>;
 	pinctrl-names = "default";
@@ -159,8 +166,8 @@
 	status = "okay";
 };
 
-&pwm1 {
-	pinctrl-0 = <&pwm1_default>;
+&pwm0 {
+	pinctrl-0 = <&pwm0_default>;
 	pinctrl-names = "default";
 	interrupts = <63 1>, <64 1>;
 	interrupt-names = "gtioca", "overflow";
@@ -179,3 +186,31 @@
 		};
 	};
 };
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+};
+
+&wdt {
+	status = "okay";
+};
+
+&eth {
+	local-mac-address = [00 11 22 33 44 57];
+	status = "okay";
+	phy-handle = <&phy>;
+};
+
+&mdio {
+	pinctrl-0 = <&ether_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	phy: ethernet-phy@5 {
+		compatible = "ethernet-phy";
+		reg = <0>;
+		status = "okay";
+	};
+};
diff --git a/boards/renesas/ek_ra6m3/ek_ra6m3.yaml b/boards/renesas/ek_ra6m3/ek_ra6m3.yaml
index 50cc8737e921f..c66c24bc725ea 100644
--- a/boards/renesas/ek_ra6m3/ek_ra6m3.yaml
+++ b/boards/renesas/ek_ra6m3/ek_ra6m3.yaml
@@ -9,3 +9,6 @@ toolchain:
   - gnuarmemb
 supported:
   - gpio
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra6m3/ek_ra6m3_defconfig b/boards/renesas/ek_ra6m3/ek_ra6m3_defconfig
index 914980bc08c8c..791f9faca4092 100644
--- a/boards/renesas/ek_ra6m3/ek_ra6m3_defconfig
+++ b/boards/renesas/ek_ra6m3/ek_ra6m3_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra6m4/doc/index.rst b/boards/renesas/ek_ra6m4/doc/index.rst
index 526757e77b7c9..2dce8bb0fc632 100644
--- a/boards/renesas/ek_ra6m4/doc/index.rst
+++ b/boards/renesas/ek_ra6m4/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra6m4:
-
-RA6M4 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra6m4
 
 Overview
 ********
@@ -24,7 +21,7 @@ The key features of the EK-RA6M4 board are categorized in three groups as follow
 - MCU current measurement points for precision current consumption measurement
 - Multiple clock sources - RA6M4 MCU oscillator and sub-clock oscillator crystals,
   providing precision 24.000 MHz and 32,768 Hz reference clock.
-  Additional low precision clocks are avaialbe internal to the RA6M4 MCU
+  Additional low precision clocks are available internal to the RA6M4 MCU
 
 **System Control and Ecosystem Access**
 
@@ -64,15 +61,9 @@ The key features of the EK-RA6M4 board are categorized in three groups as follow
 - 32 Mb (256 Mb) External Quad-SPI Flash
 - 64 Mb (512 Mb) External Octo-SPI Flash
 
-.. figure:: ek_ra6m4.webp
-	:align: center
-	:alt: RA6M4 Evaluation Kit
-
-	EK-RA6M4 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6M4 MCU group can be found at `RA6M4 Group User's Manual Hardware`_
+Detailed hardware features for the RA6M4 MCU group can be found at `RA6M4 Group User's Manual Hardware`_
 
 .. figure:: ra6m4_block_diagram.webp
 	:width: 442px
@@ -81,48 +72,18 @@ Detailed hardware feature for the RA6M4 MCU group can be found at `RA6M4 Group U
 
 	RA6M4 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detailed hardware feature for the EK-RA6M4 MCU can be found at `EK-RA6M4 - User's Manual`_
+Detailed hardware features for the EK-RA6M4 MCU can be found at `EK-RA6M4 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA6M4 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra6m4`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -132,15 +93,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA6M4 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M4 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M4 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra6m4/ek_ra6m4-pinctrl.dtsi b/boards/renesas/ek_ra6m4/ek_ra6m4-pinctrl.dtsi
index df284f33df345..081e3a74621bf 100644
--- a/boards/renesas/ek_ra6m4/ek_ra6m4-pinctrl.dtsi
+++ b/boards/renesas/ek_ra6m4/ek_ra6m4-pinctrl.dtsi
@@ -12,6 +12,14 @@
 		};
 	};
 
+	sci7_default: sci7_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_7, 6, 13)>,
+			<RA_PSEL(RA_PSEL_SCI_7, 6, 14)>;
+		};
+	};
+
 	iic1_default: iic1_default {
 		group1 {
 			/* SCL1 SDA1 */
@@ -54,4 +62,12 @@
 				<RA_PSEL(RA_PSEL_GPT1, 4, 6)>;
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra6m4/ek_ra6m4.dts b/boards/renesas/ek_ra6m4/ek_ra6m4.dts
index 6356fa35491de..e8ab9b35966a7 100644
--- a/boards/renesas/ek_ra6m4/ek_ra6m4.dts
+++ b/boards/renesas/ek_ra6m4/ek_ra6m4.dts
@@ -41,6 +41,29 @@
 		};
 	};
 
+	mikrobus_header: mikrobus-connector {
+		compatible = "mikro-bus";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map =	<0 0 &ioport0 0 0>,	/* AN  */
+				<1 0 &ioport1 15 0>,	/* RST */
+				<2 0 &ioport2 5 0>,	/* CS   */
+				<3 0 &ioport2 4 0>,	/* SCK  */
+				<4 0 &ioport2 2 0>,	/* MISO */
+				<5 0 &ioport2 3 0>,	/* MOSI */
+							/* +3.3V */
+							/* GND */
+				<6 0 &ioport4 8 0>,	/* PWM  */
+				<7 0 &ioport4 9 0>,	/* INT  */
+				<8 0 &ioport6 14 0>,	/* RX   */
+				<9 0 &ioport6 13 0>,	/* TX   */
+				<10 0 &ioport5 12 0>,	/* SCL  */
+				<11 0 &ioport5 11 0>;	/* SDA  */
+							/* +5V */
+							/* GND */
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 		button0: s1 {
@@ -59,6 +82,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -72,6 +96,16 @@
 	};
 };
 
+&sci7 {
+	pinctrl-0 = <&sci7_default>;
+	pinctrl-names = "default";
+	status = "okay";
+	uart7: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
 &iic1 {
 	status = "okay";
 	#address-cells = <1>;
@@ -93,10 +127,26 @@
 	status = "okay";
 };
 
+&ioport1 {
+	status = "okay";
+};
+
+&ioport2 {
+	status = "okay";
+};
+
 &ioport4 {
 	status = "okay";
 };
 
+&ioport5 {
+	status = "okay";
+};
+
+&ioport6 {
+	status = "okay";
+};
+
 &xtal {
 	clock-frequency = <DT_FREQ_M(24)>;
 	mosel = <0>;
@@ -115,6 +165,13 @@
 	status = "okay";
 };
 
+&pll2 {
+	clocks = <&hoco>;
+	div = <2>;
+	mul = <24 0>;
+	status = "okay";
+};
+
 &pclka {
 	clocks = <&pll>;
 	div = <2>;
@@ -167,3 +224,27 @@
 &trng {
 	status = "okay";
 };
+
+&uclk {
+	clocks = <&pll2>;
+	div = <5>;
+	status = "okay";
+};
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+mikrobus_serial: &uart7 {};
+mikrobus_i2c: &iic1 {};
+mikrobus_spi: &spi0 {};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra6m4/ek_ra6m4.yaml b/boards/renesas/ek_ra6m4/ek_ra6m4.yaml
index d9488b99e8129..77c870f0327f5 100644
--- a/boards/renesas/ek_ra6m4/ek_ra6m4.yaml
+++ b/boards/renesas/ek_ra6m4/ek_ra6m4.yaml
@@ -9,3 +9,6 @@ toolchain:
   - gnuarmemb
 supported:
   - gpio
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra6m4/ek_ra6m4_defconfig b/boards/renesas/ek_ra6m4/ek_ra6m4_defconfig
index 7d9405d620489..791f9faca4092 100644
--- a/boards/renesas/ek_ra6m4/ek_ra6m4_defconfig
+++ b/boards/renesas/ek_ra6m4/ek_ra6m4_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=200000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/ek_ra6m5/doc/index.rst b/boards/renesas/ek_ra6m5/doc/index.rst
index 79340026186cd..4d3691ee6f968 100644
--- a/boards/renesas/ek_ra6m5/doc/index.rst
+++ b/boards/renesas/ek_ra6m5/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra6m5:
-
-RA6M5 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra6m5
 
 Overview
 ********
@@ -20,7 +17,7 @@ The key features of the EK-RA6M5 board are categorized in three groups as follow
 - MCU current measurement points for precision current consumption measurement
 - Multiple clock sources - RA6M5 MCU oscillator and sub-clock oscillator crystals,
   providing precision 24.000 MHz and 32,768 Hz reference clock.
-  Additional low precision clocks are avaialbe internal to the RA6M5 MCU
+  Additional low precision clocks are available internal to the RA6M5 MCU
 
 **System Control and Ecosystem Access**
 
@@ -62,15 +59,9 @@ The key features of the EK-RA6M5 board are categorized in three groups as follow
 - 64 Mb (512 Mb) External Octo-SPI Flash
 - CAN (3-pin header)
 
-.. figure:: ek_ra6m5.webp
-	:align: center
-	:alt: RA6M5 Evaluation Kit
-
-	EK-RA6M5 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6M5 MCU group can be found at `RA6M5 Group User's Manual Hardware`_
+Detailed hardware features for the RA6M5 MCU group can be found at `RA6M5 Group User's Manual Hardware`_
 
 .. figure:: ra6m5_block_diagram.webp
 	:width: 442px
@@ -79,50 +70,18 @@ Detailed hardware feature for the RA6M5 MCU group can be found at `RA6M5 Group U
 
 	RA6M5 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detailed hardware feature for the EK-RA6M5 MCU can be found at `EK-RA6M5 - User's Manual`_
+Detailed hardware features for the EK-RA6M5 MCU can be found at `EK-RA6M5 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA6M5 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| USBHS     | on-chip    | udc                  |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra6m5`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -132,15 +91,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA6M5 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M5 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA6M5 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra6m5/ek_ra6m5-pinctrl.dtsi b/boards/renesas/ek_ra6m5/ek_ra6m5-pinctrl.dtsi
index e5828ec9e7067..b279f0540ad1b 100644
--- a/boards/renesas/ek_ra6m5/ek_ra6m5-pinctrl.dtsi
+++ b/boards/renesas/ek_ra6m5/ek_ra6m5-pinctrl.dtsi
@@ -61,4 +61,12 @@
 				<RA_PSEL(RA_PSEL_GPT1, 4, 6)>;
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 11, 1)>;
+			drive-strength = "high";
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra6m5/ek_ra6m5.dts b/boards/renesas/ek_ra6m5/ek_ra6m5.dts
index 55f1eb43b5d21..47cfc8fcb485d 100644
--- a/boards/renesas/ek_ra6m5/ek_ra6m5.dts
+++ b/boards/renesas/ek_ra6m5/ek_ra6m5.dts
@@ -59,6 +59,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -111,6 +112,19 @@
 	status = "okay";
 };
 
+&pll2 {
+	clocks = <&xtal>;
+	div = <2>;
+	mul = <20 0>;
+	status = "okay";
+};
+
+&uclk {
+	clocks = <&pll2>;
+	div = <5>;
+	status = "okay";
+};
+
 &usbhs {
 	pinctrl-0 = <&usbhs_default>;
 	pinctrl-names = "default";
@@ -171,3 +185,13 @@
 &trng {
 	status = "okay";
 };
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+};
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/ek_ra6m5/ek_ra6m5.yaml b/boards/renesas/ek_ra6m5/ek_ra6m5.yaml
index 2f65bfb229d83..c3d21e8c3d51f 100644
--- a/boards/renesas/ek_ra6m5/ek_ra6m5.yaml
+++ b/boards/renesas/ek_ra6m5/ek_ra6m5.yaml
@@ -9,3 +9,6 @@ toolchain:
   - gnuarmemb
 supported:
   - gpio
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/ek_ra6m5/ek_ra6m5_defconfig b/boards/renesas/ek_ra6m5/ek_ra6m5_defconfig
index 6a9a032666e9a..35ed0307b9aa5 100644
--- a/boards/renesas/ek_ra6m5/ek_ra6m5_defconfig
+++ b/boards/renesas/ek_ra6m5/ek_ra6m5_defconfig
@@ -1,14 +1,9 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=200000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
-
 # Enable Console
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
diff --git a/boards/renesas/ek_ra8d1/Kconfig.defconfig b/boards/renesas/ek_ra8d1/Kconfig.defconfig
index db92a2bd46118..0c5143bf5977a 100644
--- a/boards/renesas/ek_ra8d1/Kconfig.defconfig
+++ b/boards/renesas/ek_ra8d1/Kconfig.defconfig
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Renesas Electronics Corporation
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_EK_RA8D1
@@ -10,11 +10,21 @@ config NET_L2_ETHERNET
 
 endif # NETWORKING
 
-if SHIELD_RTKMIPILCDB00000BE
+if DISPLAY
+
+if SHIELD_RTKMIPILCDB00000BE || SHIELD_RTK7EKA6M3B00001BU
 
 config MEMC
 	default y
 
+config RENESAS_RA_GLCDC_FRAME_BUFFER_SECTION
+	default ".sdram"
+	depends on RENESAS_RA_GLCDC
+
+endif # SHIELD_RTKMIPILCDB00000BE || SHIELD_RTK7EKA6M3B00001BU
+
+endif # DISPLAY
+
 if LVGL
 
 config LV_Z_VDB_CUSTOM_SECTION
@@ -22,6 +32,4 @@ config LV_Z_VDB_CUSTOM_SECTION
 
 endif # LVGL
 
-endif # SHIELD_RTKMIPILCDB00000BE
-
 endif # BOARD_EK_RA8D1
diff --git a/boards/renesas/ek_ra8d1/doc/index.rst b/boards/renesas/ek_ra8d1/doc/index.rst
index 4e0a8dd02db10..027f08a261d15 100644
--- a/boards/renesas/ek_ra8d1/doc/index.rst
+++ b/boards/renesas/ek_ra8d1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra8d1:
-
-RA8D1 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra8d1
 
 Overview
 ********
@@ -20,7 +17,7 @@ The key features of the EK-RA8D1 board are categorized in three groups as follow
 - MCU current measurement points for precision current consumption measurement
 - Multiple clock sources - RA8D1 MCU oscillator and sub-clock oscillator crystals,
   providing precision 20.000MHz and 32,768 Hz refeence clocks.
-  Additional low precision clocks are avaialbe internal to the RA8D1 MCU
+  Additional low precision clocks are available internal to the RA8D1 MCU
 
 **System Control and Ecosystem Access**
 
@@ -61,15 +58,9 @@ The key features of the EK-RA8D1 board are categorized in three groups as follow
 - 512 Mb (64 MB) External Octo-SPI Flash (present in the MCU Native Pin Access area of the EK-RA8D1 board)
 - CAN FD (3-pin header)
 
-.. figure:: ek_ra8d1.jpg
-	:align: center
-	:alt: RA8D1 Evaluation Kit
-
-	EK-RA8D1 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detail Hardware feature for the RA8D1 MCU group can be found at `RA8D1 Group User's Manual Hardware`_
+Detailed Hardware features for the RA8D1 MCU group can be found at `RA8D1 Group User's Manual Hardware`_
 
 .. figure:: ra8d1_block_diagram.png
 	:width: 442px
@@ -78,79 +69,57 @@ Detail Hardware feature for the RA8D1 MCU group can be found at `RA8D1 Group Use
 
 	RA8D1 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail Hardware feature for the EK-RA8D1 MCU can be found at `EK-RA8D1 - User's Manual`_
+Detailed Hardware features for the EK-RA8D1 MCU can be found at `EK-RA8D1 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA8D1 board:
-
-+--------------+------------+-----------------------------------+
-| Interface    | Controller | Driver/Component                  |
-+==============+============+===================================+
-| GPIO         | on-chip    | gpio                              |
-+--------------+------------+-----------------------------------+
-| MPU          | on-chip    | arch/arm                          |
-+--------------+------------+-----------------------------------+
-| NVIC         | on-chip    | arch/arm                          |
-+--------------+------------+-----------------------------------+
-| UART         | on-chip    | serial                            |
-+--------------+------------+-----------------------------------+
-| CLOCK        | on-chip    | clock control                     |
-+--------------+------------+-----------------------------------+
-| ENTROPY      | on-chip    | entropy                           |
-+--------------+------------+-----------------------------------+
-| SPI          | on-chip    | spi                               |
-+--------------+------------+-----------------------------------+
-| FLASH        | on-chip    | flash                             |
-+--------------+------------+-----------------------------------+
-| PWM          | on-chip    | pwm                               |
-+--------------+------------+-----------------------------------+
-| COUNTER      | on-chip    | counter                           |
-+--------------+------------+-----------------------------------+
-| CAN          | on-chip    | canfd                             |
-+--------------+------------+-----------------------------------+
-| I2C          | on-chip    | i2c                               |
-+--------------+------------+-----------------------------------+
-| USBHS        | on-chip    | udc                               |
-+--------------+------------+-----------------------------------+
-| DISPLAY      | on-chip    | LCDIF; MIPI-DSI. Tested with      |
-|              |            | :ref:`rtkmipilcdb00000be` shields |
-+--------------+------------+-----------------------------------+
-| ETHERNET     | on-chip    | ethernet                          |
-+--------------+------------+-----------------------------------+
-| ADC          | on-chip    | adc                               |
-+--------------+------------+-----------------------------------+
-| SDHC         | on-chip    | sdhc                              |
-+--------------+------------+-----------------------------------+
-| DAC          | on-chip    | dac                               |
-+--------------+------------+-----------------------------------+
-
-**Note:**
-
-- For using Ethernet on RA8D1 board please set switch SW1 as following configuration:
-
-+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-| SW1-1 PMOD1 | SW1-2 TRACE | SW1-3 CAMERA | SW1-4 ETHA | SW1-5 ETHB | SW1-6 GLCD | SW1-7 SDRAM | SW1-8 I3C |
-+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-|     OFF     |      OFF    |      OFF     |     OFF    |     ON     |      OFF   |      OFF    |     OFF   |
-+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-
-- For using SDHC channel 1 on RA8D1 board please set switch SW1 as following configuration:
-
-+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-| SW1-1 PMOD1 | SW1-2 TRACE | SW1-3 CAMERA | SW1-4 ETHA | SW1-5 ETHB | SW1-6 GLCD | SW1-7 SDRAM | SW1-8 I3C |
-+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-|     OFF     |      OFF    |      OFF     |     OFF    |     OFF    |      OFF   |      OFF    |     OFF   |
-+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-
-**CAUTION:** Do not enable SW1-4 and SW1-5 together
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   - For using Ethernet on RA8D1 board please set switch SW1 as following configuration:
+
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     | SW1-1 PMOD1 | SW1-2 TRACE | SW1-3 CAMERA | SW1-4 ETHA | SW1-5 ETHB | SW1-6 GLCD | SW1-7 SDRAM | SW1-8 I3C |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     |     OFF     |      OFF    |      OFF     |     OFF    |     ON     |      OFF   |      OFF    |     OFF   |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+
+   - For using SDHC channel 1 on RA8D1 board please set switch SW1 as following configuration:
+
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     | SW1-1 PMOD1 | SW1-2 TRACE | SW1-3 CAMERA | SW1-4 ETHA | SW1-5 ETHB | SW1-6 GLCD | SW1-7 SDRAM | SW1-8 I3C |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     |     OFF     |      OFF    |      OFF     |     OFF    |     OFF    |      OFF   |      OFF    |     OFF   |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+
+   - For using MIPI Graphics Expansion Port (J58) on RA8D1 board please set switch SW1 as following configuration:
+
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     | SW1-1 PMOD1 | SW1-2 TRACE | SW1-3 CAMERA | SW1-4 ETHA | SW1-5 ETHB | SW1-6 GLCD | SW1-7 SDRAM | SW1-8 I3C |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     |     OFF     |     OFF     |      OFF     |     OFF    |     OFF    |     ON     |     ON      |    OFF    |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+
+   - For using the Parallel Graphics Expansion Port (J57) with the Graphics Expansion Board supplied as part of the kit,
+     please set switch SW1 as following configuration:
+
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     | SW1-1 PMOD1 | SW1-2 TRACE | SW1-3 CAMERA | SW1-4 ETHA | SW1-5 ETHB | SW1-6 GLCD | SW1-7 SDRAM | SW1-8 I3C |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+     |     OFF     |     OFF     |      OFF     |     OFF    |     OFF    |     ON     |     ON      |    OFF    |
+     +-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
+
+.. warning::
+
+   Do not enable SW1-4 and SW1-5 together
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra8d1`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -163,15 +132,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA8D1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA8D1 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA8D1 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra8d1/ek_ra8d1-pinctrl.dtsi b/boards/renesas/ek_ra8d1/ek_ra8d1-pinctrl.dtsi
index ec6f0bd16dce3..ba342a635726a 100644
--- a/boards/renesas/ek_ra8d1/ek_ra8d1-pinctrl.dtsi
+++ b/boards/renesas/ek_ra8d1/ek_ra8d1-pinctrl.dtsi
@@ -16,6 +16,15 @@
 		};
 	};
 
+	sci4_default: sci4_default {
+		group1 {
+			/* sda scl */
+			psels = <RA_PSEL(RA_PSEL_SCI_4, 4, 15)>,<RA_PSEL(RA_PSEL_SCI_4, 4, 14)>;
+			drive-strength = "medium";
+			drive-open-drain;
+		};
+	};
+
 	spi1_default: spi1_default {
 		group1 {
 			/* MISO MOSI RSPCK SSL */
@@ -187,71 +196,6 @@
 		};
 	};
 
-	glcdc_default: glcdc_default {
-		group1 {
-			/* LCDC_TCON0 */
-			psels = <RA_PSEL(RA_PSEL_GLCDC, 8, 5)>,
-			/* LCDC_TCON1 */
-			<RA_PSEL(RA_PSEL_GLCDC, 8, 7)>,
-			/* LCDC_TCON2 */
-			<RA_PSEL(RA_PSEL_GLCDC, 5, 13)>,
-			/* LCDC_TCON3 */
-			<RA_PSEL(RA_PSEL_GLCDC, 5, 15)>,
-			/* LCDC_DATA00 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 14)>,
-			/* LCDC_DATA01 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 15)>,
-			/* LCDC_DATA02 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 10)>,
-			/* LCDC_DATA03 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 11)>,
-			/* LCDC_DATA04 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 12)>,
-			/* LCDC_DATA05 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 13)>,
-			/* LCDC_DATA06 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 4)>,
-			/* LCDC_DATA07 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 3)>,
-			/* LCDC_DATA08 */
-			<RA_PSEL(RA_PSEL_GLCDC, 9, 2)>,
-			/* LCDC_DATA09 */
-			<RA_PSEL(RA_PSEL_GLCDC, 2, 7)>,
-			/* LCDC_DATA10 */
-			<RA_PSEL(RA_PSEL_GLCDC, 7, 11)>,
-			/* LCDC_DATA11 */
-			<RA_PSEL(RA_PSEL_GLCDC, 7, 12)>,
-			/* LCDC_DATA12 */
-			<RA_PSEL(RA_PSEL_GLCDC, 7, 13)>,
-			/* LCDC_DATA13 */
-			<RA_PSEL(RA_PSEL_GLCDC, 7, 14)>,
-			/* LCDC_DATA14 */
-			<RA_PSEL(RA_PSEL_GLCDC, 7, 15)>,
-			/* LCDC_DATA15 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 7)>,
-			/* LCDC_DATA16 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 6)>,
-			/* LCDC_DATA17 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 5)>,
-			/* LCDC_DATA18 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 1)>,
-			/* LCDC_DATA19 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 4)>,
-			/* LCDC_DATA20 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 3)>,
-			/* LCDC_DATA21 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 2)>,
-			/* LCDC_DATA22 */
-			<RA_PSEL(RA_PSEL_GLCDC, 11, 0)>,
-			/* LCDC_DATA23 */
-			<RA_PSEL(RA_PSEL_GLCDC, 7, 7)>,
-			/* LCDC_CLK */
-			<RA_PSEL(RA_PSEL_GLCDC, 8, 6)>,
-			/* LCDC_EXTCLK */
-			<RA_PSEL(RA_PSEL_GLCDC, 5, 14)>;
-		};
-	};
-
 	/* NOTE: pins conflict with ether_default */
 	sdhc1_default: sdhc1_default {
 		group1 {
@@ -269,4 +213,61 @@
 			drive-strength = "highspeed-high";
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USBP USBN */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 8, 15)>,
+				<RA_PSEL(RA_PSEL_USBFS, 8, 14)>,
+				<RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_ivref0: acmphs_ivref0 {
+		group1 {
+			/* IVREF0 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 1)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_ivref1: acmphs_ivref1 {
+		group1 {
+			/* IVREF1 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 3)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp0: acmphs0_ivcmp0 {
+		group1 {
+			/* CH0 IVCMP0 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 10)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp2: acmphs0_ivcmp2 {
+		group1 {
+			/* CH0 IVCMP2 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 4)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp3: acmphs0_ivcmp3 {
+		group1 {
+			/* CH0 IVCMP3 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 6)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_vcout: acmphs_vcout {
+		group1 {
+			/* VCOUT */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS_VCOUT, 2, 8)>;
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra8d1/ek_ra8d1.dts b/boards/renesas/ek_ra8d1/ek_ra8d1.dts
index c4a51f71103e8..9fb7fec4dd167 100644
--- a/boards/renesas/ek_ra8d1/ek_ra8d1.dts
+++ b/boards/renesas/ek_ra8d1/ek_ra8d1.dts
@@ -82,6 +82,7 @@
 		sw0 = &button0;
 		sw1 = &button1;
 		mipi-dsi = &mipi_dsi;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -103,6 +104,8 @@
 	};
 
 	pllq {
+		div = <4>;
+		freq = <DT_FREQ_M(240)>;
 		status = "okay";
 	};
 
@@ -111,7 +114,6 @@
 	};
 };
 
-
 &sciclk {
 	clocks = <&pllp>;
 	div = <4>;
@@ -119,8 +121,8 @@
 };
 
 &canfdclk {
-	clocks = <&pll>;
-	div = <5>;
+	clocks = <&pllp>;
+	div = <6>;
 	status = "okay";
 };
 
@@ -130,6 +132,12 @@
 	status = "okay";
 };
 
+&uclk {
+	clocks = <&pllq>;
+	div = <5>;
+	status = "okay";
+};
+
 &ioport0 {
 	status = "okay";
 };
@@ -164,6 +172,17 @@
 	};
 };
 
+&sci4 {
+	pinctrl-0 = <&sci4_default>;
+	pinctrl-names = "default";
+
+	i2c4: i2c {
+		sda-output-delay = <300>;
+		noise-filter-clock-select = <1>;
+		bit-rate-modulation;
+	};
+};
+
 &trng {
 	status = "okay";
 };
@@ -290,13 +309,36 @@
 	};
 };
 
-zephyr_lcdif: &lcdif {
-	pinctrl-0 = <&glcdc_default>;
-	pinctrl-names = "default";
-};
+zephyr_lcdif: &lcdif {};
 
 zephyr_mipi_dsi: &mipi_dsi {};
 
-renesas_mipi_i2c: &iic1{};
+renesas_mipi_i2c: &iic1 {};
 
 pmod_sd_shield: &sdhc1 {};
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+};
+
+&wdt {
+	status = "okay";
+};
+
+&ulpt0 {
+	status = "okay";
+
+	timer {
+		status = "okay";
+	};
+};
+
+&ulpt1 {
+	status = "okay";
+
+	timer {
+		status = "okay";
+	};
+};
diff --git a/boards/renesas/ek_ra8d1/ek_ra8d1.yaml b/boards/renesas/ek_ra8d1/ek_ra8d1.yaml
index 2432f8ed657c6..15bb3fca1d644 100644
--- a/boards/renesas/ek_ra8d1/ek_ra8d1.yaml
+++ b/boards/renesas/ek_ra8d1/ek_ra8d1.yaml
@@ -10,3 +10,7 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+  - usbd
+  - display
+vendor: renesas
diff --git a/boards/renesas/ek_ra8d1/ek_ra8d1_defconfig b/boards/renesas/ek_ra8d1/ek_ra8d1_defconfig
index 1f67b94e7c110..35ed0307b9aa5 100644
--- a/boards/renesas/ek_ra8d1/ek_ra8d1_defconfig
+++ b/boards/renesas/ek_ra8d1/ek_ra8d1_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=480000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE=y
-CONFIG_CLOCK_CONTROL=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
diff --git a/boards/renesas/ek_ra8m1/doc/index.rst b/boards/renesas/ek_ra8m1/doc/index.rst
index c7afb0cd641b3..c5553bc608f9e 100644
--- a/boards/renesas/ek_ra8m1/doc/index.rst
+++ b/boards/renesas/ek_ra8m1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _ek_ra8m1:
-
-RA8M1 Evaluation Kit
-####################
+.. zephyr:board:: ek_ra8m1
 
 Overview
 ********
@@ -20,7 +17,7 @@ The key features of the EK-RA8M1 board are categorized in three groups as follow
 - MCU current measurement points for precision current consumption measurement
 - Multiple clock sources - RA8M1 MCU oscillator and sub-clock oscillator crystals,
   providing precision 20.000MHz and 32,768 Hz refeence clocks.
-  Additional low precision clocks are avaialbe internal to the RA8M1 MCU
+  Additional low precision clocks are available internal to the RA8M1 MCU
 
 **System Control and Ecosystem Access**
 
@@ -61,15 +58,9 @@ The key features of the EK-RA8M1 board are categorized in three groups as follow
 - 512 Mb (64 MB) External Octo-SPI Flash (present in the MCU Native Pin Access area of the EK-RA8M1 board)
 - CAN FD (3-pin header)
 
-.. figure:: ek_ra8m1.jpg
-	:align: center
-	:alt: RA8M1 Evaluation Kit
-
-	EK-RA8M1 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detail Hardware feature for the RA8M1 MCU group can be found at `RA8M1 Group User's Manual Hardware`_
+Detailed Hardware features for the RA8M1 MCU group can be found at `RA8M1 Group User's Manual Hardware`_
 
 .. figure:: ra8m1_block_diagram.jpg
 	:width: 442px
@@ -78,61 +69,23 @@ Detail Hardware feature for the RA8M1 MCU group can be found at `RA8M1 Group Use
 
 	RA8M1 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail Hardware feature for the EK-RA8M1 MCU can be found at `EK-RA8M1 - User's Manual`_
+Detailed Hardware features for the EK-RA8M1 MCU can be found at `EK-RA8M1 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for EK-RA8M1 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| CAN       | on-chip    | canfd                |
-+-----------+------------+----------------------+
-| USBHS     | on-chip    | udc                  |
-+-----------+------------+----------------------+
-| ETHERNET  | on-chip    | ethernet             |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| SDHC      | on-chip    | sdhc                 |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-**Note:**
-
-- For using Ethernet module on EK-RA8M1, remove jumper J61 to enable Ethernet B
-- For using SDHC driver on EK-RA8M1, remove jumper J61 to use with channel 0
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   - For using Ethernet module on EK-RA8M1, remove jumper J61 to enable Ethernet B
+   - For using SDHC driver on EK-RA8M1, remove jumper J61 to use with channel 0
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ek_ra8m1`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -145,15 +98,15 @@ Flashing
 ========
 
 Program can be flashed to EK-RA8M1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA8M1 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `EK-RA8M1 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/ek_ra8m1/ek_ra8m1-pinctrl.dtsi b/boards/renesas/ek_ra8m1/ek_ra8m1-pinctrl.dtsi
index 0aa9e44d5af55..e8a26e09905bd 100644
--- a/boards/renesas/ek_ra8m1/ek_ra8m1-pinctrl.dtsi
+++ b/boards/renesas/ek_ra8m1/ek_ra8m1-pinctrl.dtsi
@@ -16,6 +16,15 @@
 		};
 	};
 
+	sci1_default: sci1_default {
+		group1 {
+			/* sda scl */
+			psels = <RA_PSEL(RA_PSEL_SCI_1, 7, 7)>,<RA_PSEL(RA_PSEL_SCI_1, 7, 6)>;
+			drive-strength = "medium";
+			drive-open-drain;
+		};
+	};
+
 	sci2_default: sci2_default {
 		group1 {
 			/* tx */
@@ -146,4 +155,61 @@
 			drive-strength = "highspeed-high";
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USBP USBN */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 8, 15)>,
+				<RA_PSEL(RA_PSEL_USBFS, 8, 14)>,
+				<RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_ivref0: acmphs_ivref0 {
+		group1 {
+			/* IVREF0 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 1)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_ivref1: acmphs_ivref1 {
+		group1 {
+			/* IVREF1 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 3)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp0: acmphs0_ivcmp0 {
+		group1 {
+			/* CH0 IVCMP0 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 10)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp2: acmphs0_ivcmp2 {
+		group1 {
+			/* CH0 IVCMP2 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 4)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp3: acmphs0_ivcmp3 {
+		group1 {
+			/* CH0 IVCMP3 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 6)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_vcout: acmphs_vcout {
+		group1 {
+			/* VCOUT */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS_VCOUT, 2, 8)>;
+		};
+	};
 };
diff --git a/boards/renesas/ek_ra8m1/ek_ra8m1.dts b/boards/renesas/ek_ra8m1/ek_ra8m1.dts
index 551ca1ff7a928..e1c0848771867 100644
--- a/boards/renesas/ek_ra8m1/ek_ra8m1.dts
+++ b/boards/renesas/ek_ra8m1/ek_ra8m1.dts
@@ -112,6 +112,7 @@
 		led0 = &led1;
 		sw0 = &button0;
 		sw1 = &button1;
+		watchdog0 = &wdt;
 	};
 
 	transceiver0: can-phy0 {
@@ -140,6 +141,8 @@
 	};
 
 	pllq {
+		div = <4>;
+		freq = <DT_FREQ_M(240)>;
 		status = "okay";
 	};
 
@@ -156,7 +159,13 @@
 };
 
 &canfdclk {
-	clocks = <&pll>;
+	clocks = <&pllp>;
+	div = <6>;
+	status = "okay";
+};
+
+&uclk {
+	clocks = <&pllq>;
 	div = <5>;
 	status = "okay";
 };
@@ -211,6 +220,17 @@
 	};
 };
 
+&sci1 {
+	pinctrl-0 = <&sci1_default>;
+	pinctrl-names = "default";
+
+	i2c1: i2c {
+		sda-output-delay = <300>;
+		noise-filter-clock-select = <1>;
+		bit-rate-modulation;
+	};
+};
+
 &sci2 {
 	pinctrl-0 = <&sci2_default>;
 	pinctrl-names = "default";
@@ -355,3 +375,29 @@ pmod_header: &pmod1_header {};
 };
 
 pmod_sd_shield: &sdhc0 {};
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+};
+
+&wdt {
+	status = "okay";
+};
+
+&ulpt0 {
+	status = "okay";
+
+	timer {
+		status = "okay";
+	};
+};
+
+&ulpt1 {
+	status = "okay";
+
+	timer {
+		status = "okay";
+	};
+};
diff --git a/boards/renesas/ek_ra8m1/ek_ra8m1.yaml b/boards/renesas/ek_ra8m1/ek_ra8m1.yaml
index 28c7aa4296b7b..97d74ff416a8e 100644
--- a/boards/renesas/ek_ra8m1/ek_ra8m1.yaml
+++ b/boards/renesas/ek_ra8m1/ek_ra8m1.yaml
@@ -10,3 +10,6 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+  - usbd
+vendor: renesas
diff --git a/boards/renesas/ek_ra8m1/ek_ra8m1_defconfig b/boards/renesas/ek_ra8m1/ek_ra8m1_defconfig
index d20f50324687f..35ed0307b9aa5 100644
--- a/boards/renesas/ek_ra8m1/ek_ra8m1_defconfig
+++ b/boards/renesas/ek_ra8m1/ek_ra8m1_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=480000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/fpb_ra4e1/doc/index.rst b/boards/renesas/fpb_ra4e1/doc/index.rst
index 37b2b7550737a..eed107b32a6f6 100644
--- a/boards/renesas/fpb_ra4e1/doc/index.rst
+++ b/boards/renesas/fpb_ra4e1/doc/index.rst
@@ -1,8 +1,5 @@
 .. zephyr:board:: fpb_ra4e1
 
-RA4E1 Fast Prototyping Board
-############################
-
 Overview
 ********
 
@@ -61,41 +58,13 @@ Detailed hardware features can be found at:
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr for the ``fpb_ra4e1`` board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``fpb_ra4e1`` board can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -105,7 +74,7 @@ Flashing
 ========
 
 Program can be flashed to FPB-RA4E1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
diff --git a/boards/renesas/fpb_ra4e1/fpb_ra4e1-pinctrl.dtsi b/boards/renesas/fpb_ra4e1/fpb_ra4e1-pinctrl.dtsi
index 9607fc321d670..5cad33f94493a 100644
--- a/boards/renesas/fpb_ra4e1/fpb_ra4e1-pinctrl.dtsi
+++ b/boards/renesas/fpb_ra4e1/fpb_ra4e1-pinctrl.dtsi
@@ -39,6 +39,14 @@
 		};
 	};
 
+	dac0_default: dac0_default {
+		group1 {
+			/* output */
+			psels = <RA_PSEL(RA_PSEL_DAC, 0, 14)>;
+			renesas,analog-enable;
+		};
+	};
+
 	pwm1_default: pwm1_default {
 		group1 {
 			/* GTIOC1A GTIOC1B */
diff --git a/boards/renesas/fpb_ra4e1/fpb_ra4e1.dts b/boards/renesas/fpb_ra4e1/fpb_ra4e1.dts
index 76cc3779bb356..7a8396753b8aa 100644
--- a/boards/renesas/fpb_ra4e1/fpb_ra4e1.dts
+++ b/boards/renesas/fpb_ra4e1/fpb_ra4e1.dts
@@ -51,6 +51,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -119,6 +120,12 @@
 	pinctrl-names = "default";
 };
 
+&dac0 {
+	pinctrl-0 = <&dac0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &port_irq1 {
 	interrupts = <41 12>;
 	status = "okay";
@@ -148,3 +155,7 @@
 		};
 	};
 };
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/fpb_ra4e1/fpb_ra4e1.yaml b/boards/renesas/fpb_ra4e1/fpb_ra4e1.yaml
index 596ec974006b1..865a0ee3375ea 100644
--- a/boards/renesas/fpb_ra4e1/fpb_ra4e1.yaml
+++ b/boards/renesas/fpb_ra4e1/fpb_ra4e1.yaml
@@ -10,3 +10,5 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/fpb_ra6e1/doc/index.rst b/boards/renesas/fpb_ra6e1/doc/index.rst
index ac1f0aed2e044..7104db650db96 100644
--- a/boards/renesas/fpb_ra6e1/doc/index.rst
+++ b/boards/renesas/fpb_ra6e1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _fpb_ra6e1:
-
-RA6E1 Fast Prototyping Board
-############################
+.. zephyr:board:: fpb_ra6e1
 
 Overview
 ********
@@ -46,15 +43,9 @@ The key features of the FPB-RA6E1 board are categorized in three groups as follo
 
 - MCU boot configuration jumper
 
-.. figure:: fpb_ra6e1.webp
-	:align: center
-	:alt: RA6E1 Fast Prototyping Board
-
-	FPB-RA6E1 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6E1 MCU group can be found at `RA6E1 Group User's Manual Hardware`_
+Detailed hardware features for the RA6E1 MCU group can be found at `RA6E1 Group User's Manual Hardware`_
 
 .. figure:: ra6e1_block_diagram.webp
 	:width: 442px
@@ -63,46 +54,18 @@ Detailed hardware feature for the RA6E1 MCU group can be found at `RA6E1 Group U
 
 	RA6E1 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detailed hardware feature for the FPB-RA6E1 MCU can be found at `FPB-RA6E1 - User's Manual`_
+Detailed hardware features for the FPB-RA6E1 MCU can be found at `FPB-RA6E1 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for FPB-RA6E1 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``fpb_ra6e1`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -112,15 +75,15 @@ Flashing
 ========
 
 Program can be flashed to FPB-RA6E1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `FPB-RA6E1 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `FPB-RA6E1 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/fpb_ra6e1/fpb_ra6e1.dts b/boards/renesas/fpb_ra6e1/fpb_ra6e1.dts
index 5af5b73c63188..7b64e4422785e 100644
--- a/boards/renesas/fpb_ra6e1/fpb_ra6e1.dts
+++ b/boards/renesas/fpb_ra6e1/fpb_ra6e1.dts
@@ -49,6 +49,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -139,3 +140,7 @@
 &trng {
 	status = "okay";
 };
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/fpb_ra6e1/fpb_ra6e1.yaml b/boards/renesas/fpb_ra6e1/fpb_ra6e1.yaml
index 8942834aca56b..aaa08aa02e084 100644
--- a/boards/renesas/fpb_ra6e1/fpb_ra6e1.yaml
+++ b/boards/renesas/fpb_ra6e1/fpb_ra6e1.yaml
@@ -9,3 +9,5 @@ toolchain:
   - gnuarmemb
 supported:
   - gpio
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/fpb_ra6e1/fpb_ra6e1_defconfig b/boards/renesas/fpb_ra6e1/fpb_ra6e1_defconfig
index 4fd3e749468fa..770a30fc47db0 100644
--- a/boards/renesas/fpb_ra6e1/fpb_ra6e1_defconfig
+++ b/boards/renesas/fpb_ra6e1/fpb_ra6e1_defconfig
@@ -1,17 +1,11 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=200000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
-CONFIG_BUILD_OUTPUT_HEX=y
-
 # Enable Console
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_CONSOLE=y
 CONFIG_CONSOLE=y
-
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/fpb_ra6e2/doc/index.rst b/boards/renesas/fpb_ra6e2/doc/index.rst
index 3785387de8c25..abef15ced4ca6 100644
--- a/boards/renesas/fpb_ra6e2/doc/index.rst
+++ b/boards/renesas/fpb_ra6e2/doc/index.rst
@@ -1,7 +1,4 @@
-.. _fpb_ra6e2:
-
-RA6E2 Fast Prototyping Board
-############################
+.. zephyr:board:: fpb_ra6e2
 
 Overview
 ********
@@ -23,7 +20,7 @@ The key features of the FPB-RA6E2 board are categorized in three groups as follo
 - MCU current measurement point for precision current consumption measurement
 - Multiple clock sources - RA6E2 MCU oscillator and sub-clock oscillator crystals,
   providing precision 24.000 MHz and 32,768 Hz reference clock.
-  Additional low precision clocks are avaialbe internal to the RA6E2 MCU
+  Additional low precision clocks are available internal to the RA6E2 MCU
 
 **System Control and Ecosystem Access**
 
@@ -50,15 +47,9 @@ The key features of the FPB-RA6E2 board are categorized in three groups as follo
 
 - MCU boot configuration jumper
 
-.. figure:: fpb_ra6e2.webp
-	:align: center
-	:alt: RA6E2 Fast Prototyping Board
-
-	FPB-RA6E2 Board Functional Area Definitions (Credit: Renesas Electronics Corporation)
-
 Hardware
 ********
-Detailed hardware feature for the RA6E2 MCU group can be found at `RA6E2 Group User's Manual Hardware`_
+Detailed hardware features for the RA6E2 MCU group can be found at `RA6E2 Group User's Manual Hardware`_
 
 .. figure:: ra6e2_block_diagram.webp
 	:width: 442px
@@ -67,42 +58,18 @@ Detailed hardware feature for the RA6E2 MCU group can be found at `RA6E2 Group U
 
 	RA6E2 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detailed hardware feature for the FPB-RA6E2 MCU can be found at `FPB-RA6E2 - User's Manual`_
+Detailed hardware features for the FPB-RA6E2 MCU can be found at `FPB-RA6E2 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for FPB-RA6E2 board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| DAC       | on-chip    | dac                  |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``fpb_ra6e2`` board target configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -112,15 +79,15 @@ Flashing
 ========
 
 Program can be flashed to fpb-RA6E2 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `FPB-RA6E2 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `FPB-RA6E2 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/fpb_ra6e2/fpb_ra6e2.dts b/boards/renesas/fpb_ra6e2/fpb_ra6e2.dts
index 8ec8b80251c4f..60323b043e6aa 100644
--- a/boards/renesas/fpb_ra6e2/fpb_ra6e2.dts
+++ b/boards/renesas/fpb_ra6e2/fpb_ra6e2.dts
@@ -49,6 +49,7 @@
 		led0 = &led1;
 		led1 = &led2;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -129,3 +130,7 @@
 &trng {
 	status ="okay";
 };
+
+&wdt {
+	status = "okay";
+};
diff --git a/boards/renesas/fpb_ra6e2/fpb_ra6e2.yaml b/boards/renesas/fpb_ra6e2/fpb_ra6e2.yaml
index edd2002b2a3fa..0abf95dda5259 100644
--- a/boards/renesas/fpb_ra6e2/fpb_ra6e2.yaml
+++ b/boards/renesas/fpb_ra6e2/fpb_ra6e2.yaml
@@ -9,3 +9,5 @@ toolchain:
   - gnuarmemb
 supported:
   - gpio
+  - watchdog
+vendor: renesas
diff --git a/boards/renesas/fpb_ra6e2/fpb_ra6e2_defconfig b/boards/renesas/fpb_ra6e2/fpb_ra6e2_defconfig
index 882cf699d986f..770a30fc47db0 100644
--- a/boards/renesas/fpb_ra6e2/fpb_ra6e2_defconfig
+++ b/boards/renesas/fpb_ra6e2/fpb_ra6e2_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=200000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,6 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_CONSOLE=y
 CONFIG_CONSOLE=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/renesas/mck_ra8t1/board.yml b/boards/renesas/mck_ra8t1/board.yml
index b7897016bbe15..dcd1bd718409e 100644
--- a/boards/renesas/mck_ra8t1/board.yml
+++ b/boards/renesas/mck_ra8t1/board.yml
@@ -1,6 +1,6 @@
 board:
   name: mck_ra8t1
-  full_name: RA8T1 Evaluation Kit
+  full_name: RA8T1 Motor Control Kit
   vendor: renesas
   socs:
   - name: r7fa8t1ahecbd
diff --git a/boards/renesas/mck_ra8t1/doc/index.rst b/boards/renesas/mck_ra8t1/doc/index.rst
index b2ac68a698110..b8d6cdfddf1a5 100644
--- a/boards/renesas/mck_ra8t1/doc/index.rst
+++ b/boards/renesas/mck_ra8t1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _mcb_ra8t1:
-
-RA8T1 Evaluation Kit
-####################
+.. zephyr:board:: mck_ra8t1
 
 Overview
 ********
@@ -20,7 +17,7 @@ MCK-RA8T1 kit includes the items below:
 
 .. figure:: mck_ra8t1_product_contents.jpg
 	:align: center
-	:alt: RA8T1 Evaluation Kit
+	:alt: RA8T1 Motor Control Kit
 
 	MCK-RA8T1 product contents (Credit: Renesas Electronics Corporation)
 
@@ -54,12 +51,6 @@ The specifications of the CPU board are shown below:
 - Ethrnet connector
 - microSD card connector
 
-.. figure:: mck_ra8t1.jpg
-	:align: center
-	:alt: RA8T1 Evaluation Kit
-
-	CPU Board Layout (Credit: Renesas Electronics Corporation)
-
 **Onboard debugger**
 
 This product has the onboard debugger circuit, J-Link On-Board (hereinafter called “J-Link-OB”). You can
@@ -67,7 +58,7 @@ write a program (firmware) of RA8T1 with it.
 
 Hardware
 ********
-Detail Hardware feature for the RA8T1 MCU group can be found at `RA8T1 Group User's Manual Hardware`_
+Detailed Hardware features for the RA8T1 MCU group can be found at `RA8T1 Group User's Manual Hardware`_
 
 .. figure:: ra8t1_block_diagram.png
 	:width: 442px
@@ -76,56 +67,22 @@ Detail Hardware feature for the RA8T1 MCU group can be found at `RA8T1 Group Use
 
 	RA8T1 Block diagram (Credit: Renesas Electronics Corporation)
 
-Detail Hardware feature for the  MCB-RA8T1 board can be found at `MCB-RA8T1 - User's Manual`_
+Detailed Hardware features for the  MCB-RA8T1 board can be found at `MCB-RA8T1 - User's Manual`_
 
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr OS for MCB-RA8T1 board:
-
-+--------------+------------+----------------------+
-| Interface    | Controller | Driver/Component     |
-+==============+============+======================+
-| GPIO         | on-chip    | gpio                 |
-+--------------+------------+----------------------+
-| MPU          | on-chip    | arch/arm             |
-+--------------+------------+----------------------+
-| NVIC         | on-chip    | arch/arm             |
-+--------------+------------+----------------------+
-| UART         | on-chip    | serial               |
-+--------------+------------+----------------------+
-| CLOCK        | on-chip    | clock control        |
-+--------------+------------+----------------------+
-| ENTROPY      | on-chip    | entropy              |
-+--------------+------------+----------------------+
-| SPI          | on-chip    | spi                  |
-+--------------+------------+----------------------+
-| FLASH        | on-chip    | flash                |
-+--------------+------------+----------------------+
-| PWM          | on-chip    | pwm                  |
-+--------------+------------+----------------------+
-| COUNTER      | on-chip    | counter              |
-+--------------+------------+----------------------+
-| CAN          | on-chip    | canfd                |
-+--------------+------------+----------------------+
-| I2C          | on-chip    | i2c                  |
-+--------------+------------+----------------------+
-| ETHERNET     | on-chip    | ethernet             |
-+--------------+------------+----------------------+
-| ADC          | on-chip    | adc                  |
-+--------------+------------+----------------------+
-| SDHC         | on-chip    | sdhc                 |
-+--------------+------------+----------------------+
-| DAC          | on-chip    | dac                  |
-+--------------+------------+----------------------+
-
-**Note:** For using SDHC module on EK-RA8M1, Connect microSD Card to microSD Socket (CN12)
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
+
+.. note::
+
+   For using SDHC module on EK-RA8M1, Connect microSD Card to microSD Socket (CN12)
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``mcb_ra8t1`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -138,15 +95,15 @@ Flashing
 ========
 
 Program can be flashed to MCB-RA8T1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
-  1. Connect to J-Link OB via USB port to host PC
+1. Connect to J-Link OB via USB port to host PC
 
-  2. Make sure J-Link OB jumper is in default configuration as describe in `MCB-RA8T1 - User's Manual`_
+2. Make sure J-Link OB jumper is in default configuration as describe in `MCB-RA8T1 - User's Manual`_
 
-  3. Execute west command
+3. Execute west command
 
 	.. code-block:: console
 
diff --git a/boards/renesas/mck_ra8t1/mck_ra8t1-pinctrl.dtsi b/boards/renesas/mck_ra8t1/mck_ra8t1-pinctrl.dtsi
index fd4ab139aa4a0..e9d127f2dfd89 100644
--- a/boards/renesas/mck_ra8t1/mck_ra8t1-pinctrl.dtsi
+++ b/boards/renesas/mck_ra8t1/mck_ra8t1-pinctrl.dtsi
@@ -16,6 +16,15 @@
 		};
 	};
 
+	sci9_default: sci9_default {
+		group1 {
+			/* sda scl*/
+			psels = <RA_PSEL(RA_PSEL_SCI_9, 10, 14)>,<RA_PSEL(RA_PSEL_SCI_9, 10, 15)>;
+			drive-strength = "medium";
+			drive-open-drain;
+		};
+	};
+
 	spi0_default: spi0_default {
 		group1 {
 			/* MISO MOSI RSPCK SSL*/
@@ -103,4 +112,61 @@
 			drive-strength = "highspeed-high";
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USBP USBN */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 8, 15)>,
+				<RA_PSEL(RA_PSEL_USBFS, 8, 14)>,
+				<RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_ivref0: acmphs_ivref0 {
+		group1 {
+			/* IVREF0 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 1)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_ivref1: acmphs_ivref1 {
+		group1 {
+			/* IVREF1 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 3)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp0: acmphs0_ivcmp0 {
+		group1 {
+			/* CH0 IVCMP0 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 10)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp2: acmphs0_ivcmp2 {
+		group1 {
+			/* CH0 IVCMP2 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 4)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs0_ivcmp3: acmphs0_ivcmp3 {
+		group1 {
+			/* CH0 IVCMP3 */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS, 0, 6)>;
+			renesas,analog-enable;
+		};
+	};
+
+	/omit-if-no-ref/ acmphs_vcout: acmphs_vcout {
+		group1 {
+			/* VCOUT */
+			psels = <RA_PSEL(RA_PSEL_ACMPHS_VCOUT, 2, 8)>;
+		};
+	};
 };
diff --git a/boards/renesas/mck_ra8t1/mck_ra8t1.dts b/boards/renesas/mck_ra8t1/mck_ra8t1.dts
index 08be2e4d9963e..75cb5fc5c8e09 100644
--- a/boards/renesas/mck_ra8t1/mck_ra8t1.dts
+++ b/boards/renesas/mck_ra8t1/mck_ra8t1.dts
@@ -47,6 +47,7 @@
 	aliases {
 		led0 = &led1;
 		sdhc0 = &sdhc0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -68,6 +69,8 @@
 	};
 
 	pllq {
+		div = <4>;
+		freq = <DT_FREQ_M(240)>;
 		status = "okay";
 	};
 
@@ -83,7 +86,13 @@
 };
 
 &canfdclk {
-	clocks = <&pll>;
+	clocks = <&pllp>;
+	div = <6>;
+	status = "okay";
+};
+
+&uclk {
+	clocks = <&pllq>;
 	div = <5>;
 	status = "okay";
 };
@@ -110,6 +119,17 @@
 	};
 };
 
+&sci9 {
+	pinctrl-0 = <&sci9_default>;
+	pinctrl-names = "default";
+
+	i2c9: i2c {
+		sda-output-delay = <300>;
+		noise-filter-clock-select = <1>;
+		bit-rate-modulation;
+	};
+};
+
 &trng {
 	status = "okay";
 };
@@ -202,3 +222,33 @@
 		status = "okay";
 	};
 };
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
+
+&ulpt0 {
+	status = "okay";
+
+	timer {
+		status = "okay";
+	};
+};
+
+&ulpt1 {
+	status = "okay";
+
+	timer {
+		status = "okay";
+	};
+};
diff --git a/boards/renesas/mck_ra8t1/mck_ra8t1.yaml b/boards/renesas/mck_ra8t1/mck_ra8t1.yaml
index 52ef233d98f82..ca61ae119d094 100644
--- a/boards/renesas/mck_ra8t1/mck_ra8t1.yaml
+++ b/boards/renesas/mck_ra8t1/mck_ra8t1.yaml
@@ -10,3 +10,6 @@ toolchain:
 supported:
   - gpio
   - uart
+  - watchdog
+  - usbd
+vendor: renesas
diff --git a/boards/renesas/mck_ra8t1/mck_ra8t1_defconfig b/boards/renesas/mck_ra8t1/mck_ra8t1_defconfig
index 07c0ee5f1ca5a..35ed0307b9aa5 100644
--- a/boards/renesas/mck_ra8t1/mck_ra8t1_defconfig
+++ b/boards/renesas/mck_ra8t1/mck_ra8t1_defconfig
@@ -1,8 +1,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=480000000
-
 # Enable GPIO
 CONFIG_GPIO=y
 
@@ -11,7 +9,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE=y
-
-CONFIG_CLOCK_CONTROL=y
-
-CONFIG_BUILD_OUTPUT_HEX=y
diff --git a/boards/renesas/rza3ul_smarc/Kconfig.rza3ul_smarc b/boards/renesas/rza3ul_smarc/Kconfig.rza3ul_smarc
new file mode 100644
index 0000000000000..56e7567e7777d
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/Kconfig.rza3ul_smarc
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZA3UL_SMARC
+	select SOC_R9A07G063U02GBG
diff --git a/boards/renesas/rza3ul_smarc/board.cmake b/boards/renesas/rza3ul_smarc/board.cmake
new file mode 100644
index 0000000000000..f67ff5510ecc0
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R9A07G063U02GBG")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/renesas/rza3ul_smarc/board.yml b/boards/renesas/rza3ul_smarc/board.yml
new file mode 100644
index 0000000000000..d00b2df7af966
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: rza3ul_smarc
+  full_name: RZ/A3UL SMARC Evaluation Board Kit
+  vendor: renesas
+  socs:
+  - name: r9a07g063u02gbg
diff --git a/boards/renesas/rza3ul_smarc/doc/index.rst b/boards/renesas/rza3ul_smarc/doc/index.rst
new file mode 100644
index 0000000000000..e26850853abe8
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/doc/index.rst
@@ -0,0 +1,129 @@
+.. zephyr:board:: rza3ul_smarc
+
+Overview
+********
+
+The Renesas RZ/A3UL SMARC Evaluation Board Kit (RZ/A3UL-EVKIT) consists of a SMARC v2.1 module board and a carrier board.
+Two types of evaluation boards are available: QSPI version and Octal-SPI version. The QSPI version is supported.
+
+* Device: RZ/A3UL R9A07G063U02GBG
+
+  * Cortex-A55 Single
+  * BGA361pin, 13mmSq body, 0.5mm pitch
+  * Certified device in `Azure Certified Device Catalog <https://devicecatalog.azure.com/devices/5848d87b-5d3e-4c11-ad76-90612639b025>`_
+
+* SMARC v2.1 Module Board Functions
+
+  * Two types of evaluation boards are available:
+
+    * QSPI version: QSPI Serial Flash (Boot) + DDR4
+    * Octal-SPI version: Octa Flash (Boot) + OctaRAM + DDR4
+
+  * DDR4 SDRAM: 1GB x 1pc
+  * QSPI flash memory: 128Mb x 1pc `AT25QL128A <https://www.renesas.com/en/products/memory-logic/non-volatile-memory/spi-nor-flash/at25ql128a-128mbit-17v-minimum-spi-serial-flash-memory-dual-io-quad-io-and-qpi-support>`_ (QSPI version)
+  * Octa RAM memory: 512Mb x 1pc / Octa flash memory: 1Gb x 1pc (Octal-SPI version)
+  * eMMC memory: 64GB x 1pc
+  * The microSD card slot is implemented and used as an eSD for boot.
+  * 5-output clock oscillator `5P35023 <https://www.renesas.com/en/products/clocks-timing/clock-generation/programmable-clocks/5p35023-versaclock-3s-programmable-clock-generator>`_ implemented
+  * PMIC power supply `DA9062 <https://www.renesas.com/en/products/power-management/multi-channel-power-management-ics-pmics/da9062-pmic-designed-applications-requiring-85a>`_ implemented
+
+* Carrier Board Functions
+
+  * The FFC/FPC connector is mounted as standard for connection to high-speed serial interface for camera module.
+  * The Micro-HDMI connector via DSI/HDMI conversion module is mounted as standard for connection to high-speed serial interface for digital video module.
+  * The Micro-AB receptacle (ch0: USB2.0 OTG) and A receptacle (ch1: USB2.0 Host) are respectively mounted as standard for connection to USB interface.
+  * The RJ45 connector is mounted as standard for software development and evaluation using Ethernet.
+  * The audio codec is mounted as standard for advance development of audio system. The audio jack is implemented for connection to audio interface.
+  * The Micro-AB receptacles are implemented for connection to asynchronous serial port interface.
+  * The microSD card slot and two sockets for PMOD are implemented as an interface for RZ/A3UL peripheral functions.
+  * For power supply, a mounted USB Type-C receptacle supports the USB PD standard.
+
+Hardware
+********
+The Renesas RZ/A3UL MPU documentation can be found at `RZ/A3UL Group Website`_
+
+.. figure:: rza3ul_block_diagram.webp
+	:width: 600px
+	:align: center
+	:alt: RZ/A3UL group feature
+
+	RZ/A3UL block diagram (Credit: Renesas Electronics Corporation)
+
+Detailed hardware features for the board can be found at `RZA3UL-EVKIT Website`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+RZ/A3UL-EVKIT uses Initial Program Loader (IPL) to perform initial settings and copy the Zephyr image from flash to DDR SRAM for execution. It only needs to be written to flash once.
+
+There are two options to write IPL:
+
+1. (Recommended) Follow ''4. Tutorial: Your First RZ MPU Project - Blinky'' of `Getting Started with RZ/A Flexible Software Package`_
+   to start writing a blinky sample with FSP. The IPL will be written to flash by default in debugging time.
+
+2. Follow the `Initial Program Loader Application Note`_ to write the IPL separately. The minimal steps are described below.
+
+   a. Follow ''6. IPL development environment construction procedure'' to prepare the build environment.
+
+   b. Follow ''7. IPL build environment construction procedure'' to build Initial Program Loader.
+      If the build is successful, Initial Program Loader file will be generated in /build/a3ul/release/rza3ul_smarc_qspi_ipl.srec
+
+   c. Follow ''8.1 Create Debug Configuration'' to create a Debug configuration to run Initial Program Loader on the target board.
+
+   d. Follow ''8.2 Connection to SMARC EVK Board'' to setup target board with SW1 Debugger Enable (SW1-1 OFF) and Boot (1.8V) Mode (SW11[1:4]=OFF OFF OFF ON).
+
+   e. Follow ''8.4 Execution procedure of IPL'' to write Initial Program Loader to the target board.
+
+Applications for the ``rza3ul_smarc`` board can be built in the usual way as
+documented in :ref:`build_an_application`.
+
+Console
+=======
+The UART port is accessed by USB Type-mircoB port (CN14).
+
+Debugging
+=========
+
+It is possible to load and execute a Zephyr application binary on this board on the Cortex-A55 System Core
+from the DDR SDRAM, using ``JLink`` debugger (:ref:`jlink-debug-host-tools`).
+
+Here is an example for building and debugging with the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rza3ul_smarc
+   :goals: build debug
+
+Flashing
+========
+
+Zephyr application can be flashed to QSPI/Octal-SPI storage and then loaded by Initial Program Loader.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rza3ul_smarc
+   :goals: build flash
+
+References
+**********
+
+.. target-notes::
+
+.. _RZ/A3UL Group Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rza3ul-powerful-1ghz-64-bit-mpus-rtos-support-enables-high-definition-hmi-and-quick-startup?
+
+.. _RZA3UL-EVKIT Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rza3ul-evkit-rza3ul-evaluation-board-kit
+
+.. _Initial Program Loader Application Note:
+   https://github.com/renesas/rza-initial-program-loader/tree/main/application_note
+
+.. _Getting Started with RZ/A Flexible Software Package:
+   https://www.renesas.com/en/document/apn/rza-getting-started-flexible-software-package
diff --git a/boards/renesas/rza3ul_smarc/doc/rza3ul_block_diagram.webp b/boards/renesas/rza3ul_smarc/doc/rza3ul_block_diagram.webp
new file mode 100644
index 0000000000000..1eee3f8b4bc0d
Binary files /dev/null and b/boards/renesas/rza3ul_smarc/doc/rza3ul_block_diagram.webp differ
diff --git a/boards/renesas/rza3ul_smarc/doc/rza3ul_smarc.webp b/boards/renesas/rza3ul_smarc/doc/rza3ul_smarc.webp
new file mode 100644
index 0000000000000..91335d3057f1f
Binary files /dev/null and b/boards/renesas/rza3ul_smarc/doc/rza3ul_smarc.webp differ
diff --git a/boards/renesas/rza3ul_smarc/rza3ul_smarc-pinctrl.dtsi b/boards/renesas/rza3ul_smarc/rza3ul_smarc-pinctrl.dtsi
new file mode 100644
index 0000000000000..25e26032f6103
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/rza3ul_smarc-pinctrl.dtsi
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rza-common.h>
+
+&pinctrl {
+	/omit-if-no-ref/ scif0_pins: scif0 {
+		scif0-pinmux {
+			pinmux = <RZA_PINMUX(PORT_06, 3, 6)>, /* RXD */
+				 <RZA_PINMUX(PORT_06, 4, 6)>; /* TXD */
+			drive-strength = <1>;
+			slew-rate = "fast";
+		};
+	};
+};
diff --git a/boards/renesas/rza3ul_smarc/rza3ul_smarc.dts b/boards/renesas/rza3ul_smarc/rza3ul_smarc.dts
new file mode 100644
index 0000000000000..c3c0be4c817e0
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/rza3ul_smarc.dts
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/gpio/renesas-rz-gpio.h>
+#include <freq.h>
+#include <arm64/renesas/rz/rza/r9a07g063.dtsi>
+#include "rza3ul_smarc-pinctrl.dtsi"
+
+/ {
+	model = "Renesas RZ/A3UL SMARC";
+	compatible = "renesas,rza3ul-smarc";
+
+	chosen {
+		zephyr,sram = &ddr;
+		zephyr,flash = &spi_flash;
+		zephyr,console = &scif0;
+		zephyr,shell-uart = &scif0;
+		zephyr,code-partition= &slot0_partition;
+	};
+
+	ddr: memory@40200000 {
+		compatible ="zephyr,memory-region", "mmio-sram";
+		reg = <0x40200000 (DT_SIZE_M(1024) - 0x200000)>;
+		zephyr,memory-region = "DDR";
+	};
+
+	sram: memory@1e000 {
+		compatible ="zephyr,memory-region", "mmio-sram";
+		reg = <0x1e000 DT_SIZE_K(72)>;
+		zephyr,memory-region = "SRAM";
+	};
+
+	spi_flash: memory@20020000 {
+		compatible = "mmio-sram";
+		reg = <0x20020000 (DT_SIZE_M(16) - 0x20000)>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			header: partition@0 {
+				label = "header";
+				reg = <0x00000000 0x200>;
+				read-only;
+			};
+
+			slot0_partition: partition@200 {
+				label = "image-0";
+				reg = <0x00000200 (DT_SIZE_M(16)- 0x20200)>;
+				read-only;
+			};
+		};
+	};
+
+};
+
+&scif0 {
+	current-speed = <115200>;
+	pinctrl-0 = <&scif0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/renesas/rza3ul_smarc/rza3ul_smarc.yaml b/boards/renesas/rza3ul_smarc/rza3ul_smarc.yaml
new file mode 100644
index 0000000000000..2e7f9d53356ed
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/rza3ul_smarc.yaml
@@ -0,0 +1,13 @@
+identifier: rza3ul_smarc
+name: Cortex-A55 for Renesas RZ/A3UL SMARC
+type: mcu
+arch: arm64
+toolchain:
+  - zephyr
+  - cross-compile
+supported:
+  - uart
+  - gpio
+testing:
+  ignore_tags:
+    - bluetooth
diff --git a/boards/renesas/rza3ul_smarc/rza3ul_smarc_defconfig b/boards/renesas/rza3ul_smarc/rza3ul_smarc_defconfig
new file mode 100644
index 0000000000000..dd2f33248dd5a
--- /dev/null
+++ b/boards/renesas/rza3ul_smarc/rza3ul_smarc_defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+# MMU Options
+CONFIG_MAX_XLAT_TABLES=24
+
+# Cache Options
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_DCACHE_LINE_SIZE_DETECT=y
+CONFIG_ICACHE_LINE_SIZE_DETECT=y
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/renesas/rzg2l_smarc/Kconfig.rzg2l_smarc b/boards/renesas/rzg2l_smarc/Kconfig.rzg2l_smarc
new file mode 100644
index 0000000000000..5182ddce831a6
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/Kconfig.rzg2l_smarc
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZG2L_SMARC
+	select SOC_R9A07G044L23GBG
diff --git a/boards/renesas/rzg2l_smarc/board.cmake b/boards/renesas/rzg2l_smarc/board.cmake
new file mode 100644
index 0000000000000..a9ee8b37d8c04
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R9A07G044L23")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/renesas/rzg2l_smarc/board.yml b/boards/renesas/rzg2l_smarc/board.yml
new file mode 100644
index 0000000000000..c051acd5449a0
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: rzg2l_smarc
+  full_name: RZ/G2L SMARC Evaluation Board Kit
+  vendor: renesas
+  socs:
+  - name: r9a07g044l23gbg
diff --git a/boards/renesas/rzg2l_smarc/doc/index.rst b/boards/renesas/rzg2l_smarc/doc/index.rst
new file mode 100644
index 0000000000000..5af6b0d19bfc5
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/doc/index.rst
@@ -0,0 +1,158 @@
+.. zephyr:board:: rzg2l_smarc
+
+Overview
+********
+
+The Renesas RZ/G2L SMARC Evaluation Board Kit (RZ/G2L-EVKIT) consists of a SMARC v2.1 module board and a carrier board.
+
+* Device: RZ/G2L R9A07G044L23GBG
+
+  * Cortex-A55 Dual, Cortex-M33
+  * BGA551pin, 15mmSq body, 0.5mm pitch
+
+* SMARC v2.1 Module Board Functions
+
+  * DDR4 SDRAM: 2GB x 1pc
+  * QSPI flash memory: 512Mb x 1pc
+  * eMMC memory: 64GB x 1pc
+  * The microSD card slot is implemented and used as an eSD for boot
+  * 5-output clock oscillator `5P35023 <https://www.renesas.com/en/products/clocks-timing/clock-generation/programmable-clocks/5p35023-versaclock-3s-programmable-clock-generator>`_ implemented
+  * PMIC power supply `RAA215300 <https://www.renesas.com/en/products/power-management/multi-channel-power-management-ics-pmics/raa215300-high-performance-9-channel-pmic-supporting-ddr-memory-built-charger-and-rtc>`_ implemented
+
+* Carrier Board Functions
+
+  * The FFC/FPC connector is mounted as standard for connection to high-speed serial interface for camera module.
+  * The Micro-HDMI connector via DSI/HDMI conversion module is mounted as standard for connection to high-speed serial interface for digital video module.
+  * The Micro-AB receptacle (ch0: USB2.0 OTG) and A receptacle (ch1: USB2.0 Host) are respectively mounted as standard for connection to USB interface.
+  * The RJ45 connector is mounted as standard for software development and evaluation using Ethernet.
+  * The audio codec is mounted as standard for advance development of audio system. The audio jack is implemented for connection to audio interface.
+  * The Micro-AB receptacles are implemented for connection to asynchronous serial port interface.
+  * The microSD card slot and two sockets for PMOD are implemented as an interface for peripheral functions.
+  * For power supply, a mounted USB Type-C receptacle supports the USB PD standard.
+
+Hardware
+********
+
+The Renesas RZ/G2L MPU documentation can be found at `RZ/G2L Group Website`_
+
+.. figure:: rzg2l_block_diagram.webp
+	:width: 600px
+	:align: center
+	:alt: RZ/G2L group feature
+
+	RZ/G2L block diagram (Credit: Renesas Electronics Corporation)
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+Applications for the ``rzg2l_smarc`` board can be built in the usual way as
+documented in :ref:`build_an_application`.
+
+Console
+=======
+
+The UART port for Cortex-M33 System Core can be accessed by connecting `Pmod USBUART <https://store.digilentinc.com/pmod-usbuart-usb-to-uart-interface/>`_
+to the upper side of ``PMOD 1``.
+
+Debugging
+=========
+
+It is possible to load and execute a Zephyr application binary on
+this board on the Cortex-M33 System Core from
+the internal SRAM, using ``JLink`` debugger (:ref:`jlink-debug-host-tools`).
+
+Here is an example for building and debugging with the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzg2l_smarc/r9a07g044l23gbg/cm33
+   :goals: build debug
+
+Flashing
+========
+
+RZ/G2L-EVKIT is designed to start different systems on different cores.
+It uses Yocto as the build system to build Linux system and boot loaders
+to run Zephyr on Cortex-M33 with u-boot. The minimal steps are described below.
+
+1. Follow "2.2 Building Images" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to prepare the build environment.
+
+2. At step (4), follow step "2. Download Multi-OS Package" and "3. Add the layer for Multi-OS Package"
+   of "3.2 OpenAMP related stuff Integration for RZ/G2L, RZ/G2LC and RZ/G2UL" of `Release Note for RZ/G Multi-OS Package V2.0.2`_
+   to add the layer for Multi-OS Package.
+
+   .. code-block:: console
+
+      $ cd ~/rzg_vlp_<pkg ver>
+      $ unzip <Multi-OS Dir>/r01an5869ej0202-rzg-multi-os-pkg.zip
+      $ tar zxvf r01an5869ej0202-rzg-multi-os-pkg/meta-rz-features_multi-os_v2.0.2.tar.gz
+      $ bitbake-layers add-layer ../meta-rz-features/meta-rz-multi-os/meta-rzg2l
+
+3. Start the build:
+
+   .. code-block:: console
+
+      $ MACHINE=smarc-rzg2l bitbake core-image-minimal
+
+   The below necessary artifacts will be located in the build/tmp/deploy/images
+
+   +---------------+------------------------------------------------------+
+   | Artifacts     | File name                                            |
+   +===============+======================================================+
+   | Boot loader   | bl2_bp-smarc-rzg2l_pmic.srec                         |
+   |               |                                                      |
+   |               | fip-smarc-rzg2l_pmic.srec                            |
+   +---------------+------------------------------------------------------+
+   | Flash Writer  | Flash_Writer_SCIF_RZG2L_SMARC_PMIC_DDR4_2GB_1PCS.mot |
+   +---------------+------------------------------------------------------+
+
+4. Follow "4.2 Startup Procedure" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ for power supply and board setting
+   at SCIF download (SW11[1:4] = OFF, ON, OFF, ON) and (SW1[1:2] = ON, OFF)
+
+5. Follow "4.3 Download Flash Writer to RAM" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to download Flash Writer to RAM
+
+6. Follow "4.4 Write the Bootloader" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to write the boot loader
+   to the target board by using Flash Writer.
+
+7. Follow "4.5 Change Back to Normal Boot Mode" with switch setting (SW11[1:4] = OFF, OFF, OFF, ON) and (SW1[1:2] = ON, OFF)
+
+8. Follow "3. Preparing the SD Card" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to write files to the microSD Card
+
+9. Copy zephyr.bin file to microSD card
+
+10. Follow "4.4.2 CM33 Sample Program Invocation with u-boot" from the beginning to step 4 of `Release Note for RZ/G Multi-OS Package V2.0.2`_
+
+11. Execute the commands stated below on the console to start zephyr application with CM33 core.
+    Here, ''N'' stands for the partition number in which you stored zephyr.bin file.
+
+   .. code-block:: console
+
+      Hit any key to stop autoboot: 2
+      => dcache off
+      => mmc dev 1
+      => fatload mmc 1:N 0x00010000 zephyr.bin
+      => fatload mmc 1:N 0x40010000 zephyr.bin
+      => cm33 start_normal 0x00010000 0x40010000
+      => dcache on
+
+References
+**********
+
+.. target-notes::
+
+.. _RZ/G2L Group Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzg2l-general-purpose-mpu-dual-core-arm-cortex-a55-cpus-and-single-core-cortex-m33-cpu-3d-graphics-and
+
+.. _RZG2L-EVKIT Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzg2l-evkit-evaluation-board-kit-rzg2l-mpu
+
+.. _SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide:
+   https://www.renesas.com/en/document/gde/smarc-evk-rzg2l-rzg2lc-rzg2ul-linux-start-guide-rev105
+
+.. _Release Note for RZ/G Multi-OS Package V2.0.2:
+   https://www.renesas.com/us/en/document/rln/release-note-rzg-multi-os-package-v202
diff --git a/boards/renesas/rzg2l_smarc/doc/rzg2l_block_diagram.webp b/boards/renesas/rzg2l_smarc/doc/rzg2l_block_diagram.webp
new file mode 100644
index 0000000000000..eac9bafe7e379
Binary files /dev/null and b/boards/renesas/rzg2l_smarc/doc/rzg2l_block_diagram.webp differ
diff --git a/boards/renesas/rzg2l_smarc/doc/rzg2l_smarc.webp b/boards/renesas/rzg2l_smarc/doc/rzg2l_smarc.webp
new file mode 100644
index 0000000000000..d12ca0c1a3402
Binary files /dev/null and b/boards/renesas/rzg2l_smarc/doc/rzg2l_smarc.webp differ
diff --git a/boards/renesas/rzg2l_smarc/rzg2l_smarc-pinctrl.dtsi b/boards/renesas/rzg2l_smarc/rzg2l_smarc-pinctrl.dtsi
new file mode 100644
index 0000000000000..7990abe700e61
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/rzg2l_smarc-pinctrl.dtsi
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg2-common.h>
+
+&pinctrl {
+	/omit-if-no-ref/ scif0_pins: scif0 {
+		scif0-pinmux {
+			pinmux = <RZG_PINMUX(PORT_38, 0, 1)>, /* TXD */
+				 <RZG_PINMUX(PORT_38, 1, 1)>; /* RXD */
+		};
+	};
+
+	/omit-if-no-ref/ scif2_pins: scif2 {
+		scif2-pinmux {
+			pinmux = <RZG_PINMUX(PORT_48, 0, 1)>, /* TXD */
+				 <RZG_PINMUX(PORT_48, 1, 1)>; /* RXD */
+		};
+	};
+};
diff --git a/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33.dts b/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33.dts
new file mode 100644
index 0000000000000..7dc022ec4272e
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33.dts
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <arm/renesas/rz/rzg/r9a07g044.dtsi>
+#include "rzg2l_smarc-pinctrl.dtsi"
+
+/ {
+	model = "Renesas RZ/G2L SMARC";
+	compatible = "renesas,rzg2l-smarc";
+
+	chosen {
+		zephyr,sram = &ddr;
+		zephyr,console = &scif2;
+		zephyr,shell-uart = &scif2;
+	};
+
+	ddr: memory@60010000 {
+		compatible = "mmio-sram";
+		reg = <0x60010000 DT_SIZE_M(46)>;
+	};
+};
+
+&scif2 {
+	current-speed = <115200>;
+	pinctrl-0 = <&scif2_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33.yaml b/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33.yaml
new file mode 100644
index 0000000000000..f2f11f6f5d8c4
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33.yaml
@@ -0,0 +1,10 @@
+identifier: rzg2l_smarc/r9a07g044l23gbg/cm33
+name: Cortex-M33 for Renesas RZ/G2L SMARC
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - uart
+  - gpio
diff --git a/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33_defconfig b/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33_defconfig
new file mode 100644
index 0000000000000..c9dd44d6c7091
--- /dev/null
+++ b/boards/renesas/rzg2l_smarc/rzg2l_smarc_r9a07g044l23gbg_cm33_defconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/renesas/rzg2lc_smarc/Kconfig.rzg2lc_smarc b/boards/renesas/rzg2lc_smarc/Kconfig.rzg2lc_smarc
new file mode 100644
index 0000000000000..91b89b55e6bc1
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/Kconfig.rzg2lc_smarc
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZG2LC_SMARC
+	select SOC_R9A07G044C22GBG
diff --git a/boards/renesas/rzg2lc_smarc/board.cmake b/boards/renesas/rzg2lc_smarc/board.cmake
new file mode 100644
index 0000000000000..4d702170b6931
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R9A07G044C22")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/renesas/rzg2lc_smarc/board.yml b/boards/renesas/rzg2lc_smarc/board.yml
new file mode 100644
index 0000000000000..5a518a9f7a30f
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: rzg2lc_smarc
+  full_name: RZ/G2LC SMARC Evaluation Board Kit
+  vendor: renesas
+  socs:
+  - name: r9a07g044c22gbg
diff --git a/boards/renesas/rzg2lc_smarc/doc/index.rst b/boards/renesas/rzg2lc_smarc/doc/index.rst
new file mode 100644
index 0000000000000..ea2061fe3ccd9
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/doc/index.rst
@@ -0,0 +1,158 @@
+.. zephyr:board:: rzg2lc_smarc
+
+Overview
+********
+
+The Renesas RZ/G2LC SMARC Evaluation Board Kit (RZ/G2LC-EVKIT) consists of a SMARC v2.1 module board and a carrier board.
+
+* Device: RZ/G2LC R9A07G044C22GBG
+
+  * Cortex-A55 Dual, Cortex-M33
+  * BGA361pin, 13mmSq body, 0.5mm pitch
+
+* SMARC v2.1 Module Board Functions
+
+  * DDR4 SDRAM: 1GB x 1pc
+  * QSPI flash memory: 512Mb x 1pc
+  * eMMC memory: 64GB x 1pc
+  * The microSD card slot is implemented and used as an eSD for boot
+  * 5-output clock oscillator `5P35023 <https://www.renesas.com/en/products/clocks-timing/clock-generation/programmable-clocks/5p35023-versaclock-3s-programmable-clock-generator>`_ implemented
+  * PMIC power supply `RAA215300 <https://www.renesas.com/en/products/power-management/multi-channel-power-management-ics-pmics/raa215300-high-performance-9-channel-pmic-supporting-ddr-memory-built-charger-and-rtc>`_ implemented
+
+* Carrier Board Functions
+
+  * The FFC/FPC connector is mounted as standard for connection to high-speed serial interface for camera module.
+  * The Micro-HDMI connector via DSI/HDMI conversion module is mounted as standard for connection to high-speed serial interface for digital video module.
+  * The Micro-AB receptacle (ch0: USB2.0 OTG) and A receptacle (ch1: USB2.0 Host) are respectively mounted as standard for connection to USB interface.
+  * The RJ45 connector is mounted as standard for software development and evaluation using Ethernet.
+  * The audio codec is mounted as standard for advance development of audio system. The audio jack is implemented for connection to audio interface.
+  * The Micro-AB receptacles are implemented for connection to asynchronous serial port interface.
+  * The microSD card slot and two sockets for PMOD are implemented as an interface for peripheral functions.
+  * For power supply, a mounted USB Type-C receptacle supports the USB PD standard.
+
+Hardware
+********
+
+The Renesas RZ/G2LC MPU documentation can be found at `RZ/G2LC Group Website`_
+
+.. figure:: rzg2lc_block_diagram.webp
+	:width: 600px
+	:align: center
+	:alt: RZ/G2LC group feature
+
+	RZ/G2LC block diagram (Credit: Renesas Electronics Corporation)
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+Applications for the ``rzg2lc_smarc`` board can be built in the usual way as
+documented in :ref:`build_an_application`.
+
+Console
+=======
+
+The UART port for Cortex-M33 System Core can be accessed by connecting `Pmod USBUART <https://store.digilentinc.com/pmod-usbuart-usb-to-uart-interface/>`_
+to the upper side of ``PMOD 1``.
+
+Debugging
+=========
+
+It is possible to load and execute a Zephyr application binary on
+this board on the Cortex-M33 System Core from
+the internal SRAM, using ``JLink`` debugger (:ref:`jlink-debug-host-tools`).
+
+Here is an example for building and debugging with the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzg2lc_smarc/r9a07g044c22gbg/cm33
+   :goals: build debug
+
+Flashing
+========
+
+RZ/G2LC-EVKIT is designed to start different systems on different cores.
+It uses Yocto as the build system to build Linux system and boot loaders
+to run Zephyr on Cortex-M33 with u-boot. The minimal steps are described below.
+
+1. Follow "2.2 Building Images" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to prepare the build environment.
+
+2. At step (4), follow step "2. Download Multi-OS Package" and "3. Add the layer for Multi-OS Package"
+   of "3.2 OpenAMP related stuff Integration for RZ/G2L, RZ/G2LC and RZ/G2UL" of `Release Note for RZ/G Multi-OS Package V2.0.2`_
+   to add the layer for Multi-OS Package.
+
+   .. code-block:: console
+
+      $ cd ~/rzg_vlp_<pkg ver>
+      $ unzip <Multi-OS Dir>/r01an5869ej0202-rzg-multi-os-pkg.zip
+      $ tar zxvf r01an5869ej0202-rzg-multi-os-pkg/meta-rz-features_multi-os_v2.0.2.tar.gz
+      $ bitbake-layers add-layer ../meta-rz-features/meta-rz-multi-os/meta-rzg2l
+
+3. Start the build:
+
+   .. code-block:: console
+
+      $ MACHINE=smarc-rzg2lc bitbake core-image-minimal
+
+   The below necessary artifacts will be located in the build/tmp/deploy/images
+
+   +---------------+------------------------------------------------------+
+   | Artifacts     | File name                                            |
+   +===============+======================================================+
+   | Boot loader   | bl2_bp-smarc-rzg2lc.srec                             |
+   |               |                                                      |
+   |               | fip-smarc-rzg2lc.srec                                |
+   +---------------+------------------------------------------------------+
+   | Flash Writer  | Flash_Writer_SCIF_RZG2LC_SMARC_DDR4_1GB_1PCS.mot     |
+   +---------------+------------------------------------------------------+
+
+4. Follow "4.2 Startup Procedure" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ for power supply and board setting
+   at SCIF download (SW11[1:4] = OFF, ON, OFF, ON) and (SW1[1:2] = ON, OFF)
+
+5. Follow "4.3 Download Flash Writer to RAM" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to download Flash Writer to RAM
+
+6. Follow "4.4 Write the Bootloader" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to write the boot loader
+   to the target board by using Flash Writer.
+
+7. Follow "4.5 Change Back to Normal Boot Mode" with switch setting (SW11[1:4] = OFF, OFF, OFF, ON) and (SW1[1:2] = ON, OFF)
+
+8. Follow "3. Preparing the SD Card" of `SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide`_ to write files to the microSD Card
+
+9. Copy zephyr.bin file to microSD card
+
+10. Follow "4.4.2 CM33 Sample Program Invocation with u-boot" from the beginning to step 4 of `Release Note for RZ/G Multi-OS Package V2.0.2`_
+
+11. Execute the commands stated below on the console to start zephyr application with CM33 core.
+    Here, ''N'' stands for the partition number in which you stored zephyr.bin file.
+
+   .. code-block:: console
+
+      Hit any key to stop autoboot: 2
+      => dcache off
+      => mmc dev 1
+      => fatload mmc 1:N 0x00010000 zephyr.bin
+      => fatload mmc 1:N 0x40010000 zephyr.bin
+      => cm33 start_normal 0x00010000 0x40010000
+      => dcache on
+
+References
+**********
+
+.. target-notes::
+
+.. _RZ/G2LC Group Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzg2lc-general-purpose-mcus-dual-core-arm-cortex-a55-12ghz-cpus-and-single-core-arm-cortex-m33-200mhz-cpu
+
+.. _RZG2LC-EVKIT Website:
+  https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzg2lc-evkit-evaluation-board-kit-rzg2lc-mpu
+
+.. _SMARC EVK of RZ/G2L, RZ/G2LC, RZ/G2UL Linux Start-up Guide:
+   https://www.renesas.com/en/document/gde/smarc-evk-rzg2l-rzg2lc-rzg2ul-linux-start-guide-rev105
+
+.. _Release Note for RZ/G Multi-OS Package V2.0.2:
+   https://www.renesas.com/us/en/document/rln/release-note-rzg-multi-os-package-v202
diff --git a/boards/renesas/rzg2lc_smarc/doc/rzg2lc_block_diagram.webp b/boards/renesas/rzg2lc_smarc/doc/rzg2lc_block_diagram.webp
new file mode 100644
index 0000000000000..f5b97f75e8fac
Binary files /dev/null and b/boards/renesas/rzg2lc_smarc/doc/rzg2lc_block_diagram.webp differ
diff --git a/boards/renesas/rzg2lc_smarc/doc/rzg2lc_smarc.webp b/boards/renesas/rzg2lc_smarc/doc/rzg2lc_smarc.webp
new file mode 100644
index 0000000000000..e6abebed9f2ee
Binary files /dev/null and b/boards/renesas/rzg2lc_smarc/doc/rzg2lc_smarc.webp differ
diff --git a/boards/renesas/rzg2lc_smarc/rzg2lc_smarc-pinctrl.dtsi b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc-pinctrl.dtsi
new file mode 100644
index 0000000000000..ecae377d2a40f
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc-pinctrl.dtsi
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg2-common.h>
+
+&pinctrl {
+	/omit-if-no-ref/ scif0_pins: scif0 {
+		scif0-pinmux {
+			pinmux = <RZG_PINMUX(PORT_38, 0, 1)>, /* TXD */
+				 <RZG_PINMUX(PORT_38, 1, 1)>; /* RXD */
+		};
+	};
+
+	/omit-if-no-ref/ scif1_pins: scif1 {
+		scif1-pinmux {
+			pinmux = <RZG_PINMUX(PORT_40, 0, 1)>, /* TXD */
+				 <RZG_PINMUX(PORT_40, 1, 1)>; /* RXD */
+		};
+	};
+};
diff --git a/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33.dts b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33.dts
new file mode 100644
index 0000000000000..87db249d6f8d5
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33.dts
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <arm/renesas/rz/rzg/r9a07g044c.dtsi>
+#include "rzg2lc_smarc-pinctrl.dtsi"
+
+/ {
+	model = "Renesas RZ/G2LC SMARC";
+	compatible = "renesas,rzg2lc-smarc";
+
+	chosen {
+		zephyr,sram = &ddr;
+		zephyr,console = &scif1;
+		zephyr,shell-uart = &scif1;
+	};
+
+	ddr: memory@60010000 {
+		compatible = "mmio-sram";
+		reg = <0x60010000 DT_SIZE_M(46)>;
+	};
+};
+
+&scif1 {
+	current-speed = <115200>;
+	pinctrl-0 = <&scif1_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33.yaml b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33.yaml
new file mode 100644
index 0000000000000..5d0aac9cdb142
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33.yaml
@@ -0,0 +1,10 @@
+identifier: rzg2lc_smarc/r9a07g044c22gbg/cm33
+name: Cortex-M33 for Renesas RZ/G2LC SMARC
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - uart
+  - gpio
diff --git a/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33_defconfig b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33_defconfig
new file mode 100644
index 0000000000000..c9dd44d6c7091
--- /dev/null
+++ b/boards/renesas/rzg2lc_smarc/rzg2lc_smarc_r9a07g044c22gbg_cm33_defconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/renesas/rzg3s_smarc/doc/index.rst b/boards/renesas/rzg3s_smarc/doc/index.rst
index 51323862eb08a..d69f9686e2c1e 100644
--- a/boards/renesas/rzg3s_smarc/doc/index.rst
+++ b/boards/renesas/rzg3s_smarc/doc/index.rst
@@ -48,6 +48,13 @@ The Renesas RZ/G3S MPU documentation can be found at `RZ/G3S Group Website`_
 
 	RZ/G3S block diagram (Credit: Renesas Electronics Corporation)
 
+Multi-OS processing
+*******************
+
+The RZ/G3S-EVKIT allows different applications to be executed in RZ/G3S SoC. With its multi-core architecture,
+each core can operate independently to perform customized tasks or exchange data using the OpenAMP framework.
+Please see :zephyr:code-sample:`rz-openamp-linux-zephyr` sample for reference.
+
 Supported Features
 ==================
 
@@ -63,8 +70,14 @@ and the following hardware features:
 +-----------+------------+-------------------------------------+
 | PINCTRL   | on-chip    | pinctrl                             |
 +-----------+------------+-------------------------------------+
+| ADC       | on-chip    | adc                                 |
++-----------+------------+-------------------------------------+
 | GPIO      | on-chip    | gpio                                |
 +-----------+------------+-------------------------------------+
+| DMA       | on-chip    | dma                                 |
++-----------+------------+-------------------------------------+
+| I2C       | on-chip    | i2c                                 |
++-----------+------------+-------------------------------------+
 | UART      | on-chip    | serial                              |
 +-----------+------------+-------------------------------------+
 | GTM       | on-chip    | counter                             |
@@ -73,12 +86,18 @@ and the following hardware features:
 +-----------+------------+-------------------------------------+
 | INTC      | on-chip    | external interrupt controller       |
 +-----------+------------+-------------------------------------+
+| CLOCK     | on-chip    | clock control                       |
++-----------+------------+-------------------------------------+
+| MHU       | on-chip    | mbox                                |
++-----------+------------+-------------------------------------+
 
 Other hardware features are currently not supported by the port.
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 RZ/G3S-EVKIT is designed to start different systems on different cores.
 It uses Yocto as the build system to build Linux system and boot loaders
 to run BL2 TF-A on Cortex-A55 System Core before starting Zephyr. The minimal steps are described below.
diff --git a/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.dts b/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.dts
index 81210407ae4f4..1f2bd49c9b9e3 100644
--- a/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.dts
+++ b/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.dts
@@ -90,3 +90,7 @@
 &gpio18{
 	status = "okay";
 };
+
+&adc {
+	status = "okay";
+};
diff --git a/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.yaml b/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.yaml
index 1d4a4eeeae13b..ad2a7687a937f 100644
--- a/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.yaml
+++ b/boards/renesas/rzg3s_smarc/rzg3s_smarc_r9a08g045s33gbg_cm33.yaml
@@ -6,7 +6,10 @@ toolchain:
   - zephyr
   - gnuarmemb
 supported:
+  - adc
   - uart
+  - dma
+  - i2c
   - gpio
   - counter
   - pwm
diff --git a/boards/renesas/rzn2l_rsk/Kconfig.rzn2l_rsk b/boards/renesas/rzn2l_rsk/Kconfig.rzn2l_rsk
new file mode 100644
index 0000000000000..b4c2eef0c20c3
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/Kconfig.rzn2l_rsk
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZN2L_RSK
+	select SOC_R9A07G084M04GBG
diff --git a/boards/renesas/rzn2l_rsk/board.cmake b/boards/renesas/rzn2l_rsk/board.cmake
new file mode 100644
index 0000000000000..201aa741e4a75
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R9A07G084M04GBG")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/renesas/rzn2l_rsk/board.yml b/boards/renesas/rzn2l_rsk/board.yml
new file mode 100644
index 0000000000000..c4b44f1752338
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: rzn2l_rsk
+  full_name: Renesas Starter Kit+ for RZ/N2L
+  vendor: renesas
+  socs:
+  - name: r9a07g084m04gbg
diff --git a/boards/renesas/rzn2l_rsk/doc/index.rst b/boards/renesas/rzn2l_rsk/doc/index.rst
new file mode 100644
index 0000000000000..99ebe79943b29
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/doc/index.rst
@@ -0,0 +1,117 @@
+.. zephyr:board:: rzn2l_rsk
+
+Overview
+********
+
+Renesas Starter Kit+ for RZ/N2L is for evaluation or development using the RZ/N2L MPU.
+With the on-board emulator, you can start evaluation by simply connecting the bundled cable with
+your PC. This product has rich functional ICs such as Gigabit Ethernet PHY and Octal Flash,
+you can fully evaluate functions without an extension board.
+
+* On-board RZ/N2L MPU 225-pin (R9A07G084M04GBG)
+* Rich functional ICs such as Gigabit Ethernet PHY and Octal Flash are mounted,
+  so functions of target MPU can be fully evaluated
+* Generic interfaces such as Pmod/Grove/Qwiic/mikroBUS
+* Pin headers for external extension enable you to evaluate many use cases
+* Emulator circuit is mounted, and program debugging can be started by simply connecting USB cable
+  to PC (two USB cables are included, one for emulator and the other for power supply)
+* On-board memory components:
+
+  * SDRAM (256MBit)
+  * NOR Flash (256MBit)
+  * Octa Flash (512MBit)
+  * HyperRAM (64Mbit)
+  * QSPI Serial Flash (512Mbit)
+  * I2C EEPROM (32Kbit)
+
+* Communication interfaces include:
+
+  * Debug interfaces (J-Link OB, MIPI-10, MIPI-20)
+  * Ethernet
+  * CAN
+  * USB
+  * RS485
+  * UART
+  * I2C
+  * SPI
+
+Hardware
+********
+
+The Renesas RZ/N2L MPU documentation can be found at `RZ/N2L Group Website`_
+
+.. figure:: rzn2l_block_diagram.webp
+	:width: 500px
+	:align: center
+	:alt: RZ/N2L group feature
+
+	RZ/N2L block diagram (Credit: Renesas Electronics Corporation)
+
+Detailed hardware features for the board can be found at `RZ/N2L-RSK Website`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+By default, the board is configured for use with:
+
+* UART0 connected to the USB serial port (pins H15, G11),
+* UART3 connected to the PMOD Header (J25, pins E14, E15),
+* LEDs defined as ``led0``, ``led1``, ``led2`` and ``led3``,
+
+The Zephyr console uses UART0.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``rzn2l_rsk`` board can be
+built, flashed, and debugged in the usual way. See :ref:`build_an_application`
+and :ref:`application_run` for more details on building and running.
+
+To use J-Link OB on RSK+RZN2L,
+
+1. Open the jumper pin (J9) for switching the debug connection.
+
+2. Connect the micro-USB type-B to J-Link OB USB connector (J10), and then the LED4 is lighted.
+
+Console
+=======
+
+The UART port is accessed by USB-Serial port (CN16).
+
+Debugging
+=========
+
+Here is an example for building and debugging with the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzn2l_rsk
+   :goals: build debug
+
+Flashing
+=========
+
+Before using ``flash`` command, the board must be set to xSPI boot mode.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzn2l_rsk
+   :goals: build flash
+
+References
+**********
+
+.. target-notes::
+
+.. _RZ/N2L Group Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzn2l-integrated-tsn-compliant-3-port-gigabit-ethernet-switch-enables-various-industrial-applications
+
+.. _RZ/N2L-RSK Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzn2l-rsk-renesas-starter-kit-rzn2l
diff --git a/boards/renesas/rzn2l_rsk/doc/rzn2l_block_diagram.webp b/boards/renesas/rzn2l_rsk/doc/rzn2l_block_diagram.webp
new file mode 100644
index 0000000000000..215211d9b8ed2
Binary files /dev/null and b/boards/renesas/rzn2l_rsk/doc/rzn2l_block_diagram.webp differ
diff --git a/boards/renesas/rzn2l_rsk/doc/rzn2l_rsk.webp b/boards/renesas/rzn2l_rsk/doc/rzn2l_rsk.webp
new file mode 100644
index 0000000000000..a5ef4679e5a25
Binary files /dev/null and b/boards/renesas/rzn2l_rsk/doc/rzn2l_rsk.webp differ
diff --git a/boards/renesas/rzn2l_rsk/rzn2l_rsk-pinctrl.dtsi b/boards/renesas/rzn2l_rsk/rzn2l_rsk-pinctrl.dtsi
new file mode 100644
index 0000000000000..ab95fd84a7eff
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/rzn2l_rsk-pinctrl.dtsi
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzn-common.h>
+
+&pinctrl {
+	/omit-if-no-ref/ sci0_default: sci0_default {
+		sci0-pinmux {
+			pinmux = <RZN_PINMUX(PORT_16, 5, 1)>, /* TXD */
+				 <RZN_PINMUX(PORT_16, 6, 2)>; /* RXD */
+		};
+	};
+
+	/omit-if-no-ref/ sci3_default: sci3_default {
+		sci3-pinmux {
+			pinmux = <RZN_PINMUX(PORT_18, 0, 4)>, /* TXD */
+				 <RZN_PINMUX(PORT_17, 7, 4)>; /* RXD */
+		};
+	};
+
+	/omit-if-no-ref/ irq7_default: irq7_default {
+		irq7-pinmux {
+			pinmux = <RZN_PINMUX(PORT_16, 3, 0)>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/renesas/rzn2l_rsk/rzn2l_rsk.dts b/boards/renesas/rzn2l_rsk/rzn2l_rsk.dts
new file mode 100644
index 0000000000000..9ba2003c646bf
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/rzn2l_rsk.dts
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <arm/renesas/rz/rzn/r9a07g084.dtsi>
+#include "rzn2l_rsk-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Renesas Starter Kit+ for RZ/N2L";
+	compatible = "renesas,rzn2l-rsk";
+
+	chosen {
+		zephyr,sram = &atcm;
+		zephyr,flash = &xspi0_cs0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+	};
+
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		sw0 = &sw1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led0 {
+			gpios = <&gpio18 2 0>;
+			label = "led0";
+		};
+
+		led1: led1 {
+			gpios = <&gpio22 3 0>;
+			label = "led1";
+		};
+
+		led2: led2 {
+			gpios = <&gpio4 1 0>;
+			label = "led2";
+		};
+
+		led3: led3 {
+			gpios = <&gpio17 3 0>;
+			label = "led3";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		sw1: sw1 {
+			label = "sw1";
+			gpios = <&gpio16 3 0>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		sw2: sw2 {
+			label = "sw2";
+			gpios = <&gpio5 4 0>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+};
+
+&sci0 {
+	pinctrl-0 = <&sci0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	uart0: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
+&gpio18 {
+	status = "okay";
+};
+
+&gpio22 {
+	status = "okay";
+};
+
+&gpio4 {
+	status = "okay";
+};
+
+&gpio17 {
+	status = "okay";
+};
+
+&irq7 {
+	trigger-type = "falling";
+	pinctrl-0 = <&irq7_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&gpio16 {
+	irqs = <3 7>;
+	status = "okay";
+};
+
+&gpio5 {
+	status = "okay";
+};
diff --git a/boards/renesas/rzn2l_rsk/rzn2l_rsk.yaml b/boards/renesas/rzn2l_rsk/rzn2l_rsk.yaml
new file mode 100644
index 0000000000000..196b812a193da
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/rzn2l_rsk.yaml
@@ -0,0 +1,10 @@
+identifier: rzn2l_rsk
+name: Renesas Starter Kit+ for RZ/N2L
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+supported:
+  - uart
+  - gpio
+vendor: renesas
diff --git a/boards/renesas/rzn2l_rsk/rzn2l_rsk_defconfig b/boards/renesas/rzn2l_rsk/rzn2l_rsk_defconfig
new file mode 100644
index 0000000000000..11b00aa34ef47
--- /dev/null
+++ b/boards/renesas/rzn2l_rsk/rzn2l_rsk_defconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+# Enable UART driver
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Enable console
+CONFIG_CONSOLE=y
diff --git a/boards/renesas/rzt2l_rsk/Kconfig.rzt2l_rsk b/boards/renesas/rzt2l_rsk/Kconfig.rzt2l_rsk
new file mode 100644
index 0000000000000..2da42ee178119
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/Kconfig.rzt2l_rsk
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZT2L_RSK
+	select SOC_R9A07G074M04GBG
diff --git a/boards/renesas/rzt2l_rsk/board.cmake b/boards/renesas/rzt2l_rsk/board.cmake
new file mode 100644
index 0000000000000..75c233c25d097
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R9A07G074M04")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/renesas/rzt2l_rsk/board.yml b/boards/renesas/rzt2l_rsk/board.yml
new file mode 100644
index 0000000000000..d0bf007cf7b0d
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: rzt2l_rsk
+  full_name: Renesas Starter Kit+ for RZ/T2L
+  vendor: renesas
+  socs:
+  - name: r9a07g074m04gbg
diff --git a/boards/renesas/rzt2l_rsk/doc/index.rst b/boards/renesas/rzt2l_rsk/doc/index.rst
new file mode 100644
index 0000000000000..17cc1f61dd5f4
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/doc/index.rst
@@ -0,0 +1,115 @@
+.. zephyr:board:: rzt2l_rsk
+
+Overview
+********
+
+Renesas Starter Kit+ for RZ/T2L is an evaluation and development kit for the RZ/T2L MPU.
+By simply connecting the bundled cable to your PC, you can immediately start evaluation through an
+on-board emulator. This product contains rich functional ICs such as Gigabit Ethernet PHY and
+Octal Flash so you can evaluate various functions of the RZ/T2L without an extension board.
+
+* On-board RZ/T2L MPU 196-pin (R9A07G074M04GBG)
+* Rich functional ICs such as Gigabit Ethernet PHY and Octal Flash
+  so you can evaluate various functions of the RZ/T2L without an extension board
+* Generic interfaces such as Pmod/Grove/QWIIC/mikroBUS
+* Pin headers for external extension enable you to evaluate many use cases
+* Emulator circuit is mounted, and program debugging can be started by simply connecting USB cable
+  to PC (two USB cables are included, one for emulator and the other for power supply)
+* On-board memory components:
+
+  * Octa Flash (512MBit)
+  * HyperRAM (64Mbit)
+  * QSPI Serial Flash (128Mbit)
+  * I2C EEPROM (16Kbit)
+
+* Communication interfaces include:
+
+  * Debug interfaces (J-Link OB, MIPI-10, MIPI-20, Mictor-38)
+  * Ethernet
+  * CAN
+  * USB
+  * RS485
+  * UART
+  * I2C
+  * SPI
+
+Hardware
+********
+
+The Renesas RZ/T2L MPU documentation can be found at `RZ/T2L Group Website`_
+
+.. figure:: rzt2l_block_diagram.webp
+	:width: 500px
+	:align: center
+	:alt: RZ/T2L group feature
+
+	RZ/T2L block diagram (Credit: Renesas Electronics Corporation)
+
+Detailed hardware features for the board can be found at `RZ/T2L-RSK Website`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+By default, the board is configured for use with:
+
+* UART0 connected to the USB serial port (pins G12, G11),
+* UART2 connected to the PMOD Header (J25, pins M1, L2),
+* LEDs defined as ``led1`` and ``led3``,
+
+The Zephyr console uses UART0.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``rzt2l_rsk`` board can be
+built, flashed, and debugged in the usual way. See :ref:`build_an_application`
+and :ref:`application_run` for more details on building and running.
+
+To use J-Link OB on RSK+RZT2L,
+
+1. Open the jumper pin (J9) for switching the debug connection.
+
+2. Connect the micro-USB type-B to J-Link OB USB connector (J10), and then the LED6 is lighted.
+
+Console
+=======
+
+The UART port is accessed by USB-Serial port (CN16).
+
+Debugging
+=========
+
+Here is an example for building and debugging with the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzt2l_rsk
+   :goals: build debug
+
+Flashing
+=========
+
+Before using ``flash`` command, the board must be set to xSPI1 boot mode.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzt2l_rsk
+   :goals: build flash
+
+References
+**********
+
+.. target-notes::
+
+.. _RZ/T2L Group Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzt2l-high-performance-mpu-realizing-high-speed-and-high-precision-real-time-control-ethercat
+
+.. _RZ/T2L-RSK Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzt2l-rsk-renesas-starter-kit-rzt2l
diff --git a/boards/renesas/rzt2l_rsk/doc/rzt2l_block_diagram.webp b/boards/renesas/rzt2l_rsk/doc/rzt2l_block_diagram.webp
new file mode 100644
index 0000000000000..ec5cc0be48a9c
Binary files /dev/null and b/boards/renesas/rzt2l_rsk/doc/rzt2l_block_diagram.webp differ
diff --git a/boards/renesas/rzt2l_rsk/doc/rzt2l_rsk.webp b/boards/renesas/rzt2l_rsk/doc/rzt2l_rsk.webp
new file mode 100644
index 0000000000000..8f2df8c90d270
Binary files /dev/null and b/boards/renesas/rzt2l_rsk/doc/rzt2l_rsk.webp differ
diff --git a/boards/renesas/rzt2l_rsk/rzt2l_rsk-pinctrl.dtsi b/boards/renesas/rzt2l_rsk/rzt2l_rsk-pinctrl.dtsi
new file mode 100644
index 0000000000000..4f63c4a836788
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/rzt2l_rsk-pinctrl.dtsi
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzt-common.h>
+
+&pinctrl {
+	/omit-if-no-ref/ sci0_default: sci0_default {
+		sci0-pinmux {
+			pinmux = <RZT_PINMUX(PORT_16, 0, 2)>, /* TXD */
+				 <RZT_PINMUX(PORT_16, 1, 3)>; /* RXD */
+		};
+	};
+
+	/omit-if-no-ref/ irq7_default: irq7_default {
+		irq7-pinmux {
+			pinmux = <RZT_PINMUX(PORT_16, 3, 0)>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/renesas/rzt2l_rsk/rzt2l_rsk.dts b/boards/renesas/rzt2l_rsk/rzt2l_rsk.dts
new file mode 100644
index 0000000000000..00fe010130d06
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/rzt2l_rsk.dts
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <arm/renesas/rz/rzt/r9a07g074.dtsi>
+#include <freq.h>
+#include "rzt2l_rsk-pinctrl.dtsi"
+
+/ {
+	model = "Renesas Starter Kit+ for RZ/T2L";
+	compatible = "renesas,rzt2l-rsk";
+
+	chosen {
+		zephyr,sram = &atcm;
+		zephyr,flash = &xspi1_cs0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+	};
+
+	aliases {
+		led0 = &led1;
+		sw0 = &sw2;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led1 {
+			gpios = <&gpio17 6 0>;
+			label = "led1";
+		};
+
+		led3: led3 {
+			gpios = <&gpio18 1 0>;
+			label = "led3";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		sw1: sw1 {
+			label = "sw1";
+			gpios = <&gpio14 2 0>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		sw2: sw2 {
+			label = "sw2";
+			gpios = <&gpio16 3 0>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+};
+
+&sci0 {
+	pinctrl-0 = <&sci0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	uart0: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
+&gpio14 {
+	status = "okay";
+};
+
+&gpio16 {
+	irqs = <3 7>;
+	status = "okay";
+};
+
+&gpio17 {
+	status = "okay";
+};
+
+&gpio18 {
+	status = "okay";
+};
+
+&irq7 {
+	trigger-type = "falling";
+	pinctrl-0 = <&irq7_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/renesas/rzt2l_rsk/rzt2l_rsk.yaml b/boards/renesas/rzt2l_rsk/rzt2l_rsk.yaml
new file mode 100644
index 0000000000000..6bfd1397438cd
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/rzt2l_rsk.yaml
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: rzt2l_rsk
+name: Renesas Starter Kit+ for RZ/T2L
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+supported:
+  - uart
+  - gpio
+vendor: renesas
diff --git a/boards/renesas/rzt2l_rsk/rzt2l_rsk_defconfig b/boards/renesas/rzt2l_rsk/rzt2l_rsk_defconfig
new file mode 100644
index 0000000000000..11b00aa34ef47
--- /dev/null
+++ b/boards/renesas/rzt2l_rsk/rzt2l_rsk_defconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+# Enable UART driver
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Enable console
+CONFIG_CONSOLE=y
diff --git a/boards/renesas/rzt2m_rsk/Kconfig.rzt2m_rsk b/boards/renesas/rzt2m_rsk/Kconfig.rzt2m_rsk
new file mode 100644
index 0000000000000..42c03c3b5bd6f
--- /dev/null
+++ b/boards/renesas/rzt2m_rsk/Kconfig.rzt2m_rsk
@@ -0,0 +1,6 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZT2M_RSK
+	select SOC_R9A07G075M24GBG
diff --git a/boards/renesas/rzt2m_starterkit/board.cmake b/boards/renesas/rzt2m_rsk/board.cmake
similarity index 100%
rename from boards/renesas/rzt2m_starterkit/board.cmake
rename to boards/renesas/rzt2m_rsk/board.cmake
diff --git a/boards/renesas/rzt2m_rsk/board.yml b/boards/renesas/rzt2m_rsk/board.yml
new file mode 100644
index 0000000000000..2ef8c0a005eaf
--- /dev/null
+++ b/boards/renesas/rzt2m_rsk/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: rzt2m_rsk
+  full_name: Renesas Starter Kit+ for RZ/T2M
+  vendor: renesas
+  socs:
+  - name: r9a07g075m24gbg
diff --git a/boards/renesas/rzt2m_rsk/doc/index.rst b/boards/renesas/rzt2m_rsk/doc/index.rst
new file mode 100644
index 0000000000000..4beff6866a431
--- /dev/null
+++ b/boards/renesas/rzt2m_rsk/doc/index.rst
@@ -0,0 +1,106 @@
+.. zephyr:board:: rzt2m_rsk
+
+Overview
+********
+
+The Renesas Starter Kit+ for RZ/T2M is an evaluation and development kit for the RZ/T2M MPU.
+The board is powered through a 5V input via a DC Power Jack or USB Type-C Connector.
+
+* On-board RZ/T2M MPU 320-pin (R9A07G075M24GBG)
+* Rich functional ICs such as Gigabit Ethernet PHY and Octal Flash are mounted,
+  functions of target MPU can be fully evaluated
+* Generic interface such as Pmod/Grove/QWIIC/mikroBUS
+* The pin header enables users to freely combine with the user's hardware system and evaluate RZ/T2M
+* Emulator circuit is mounted, can start program debugging by simply connecting USB cable
+  to PC (two USB cables are bundled: one for emulator, and the other for power supply)
+* On-board memory components:
+
+  * SDRAM (256MBit)
+  * NOR Flash (256MBit)
+  * Octa Flash (512MBit)
+  * HyperRAM (512Mbit)
+  * QSPI Serial Flash (512Mbit)
+  * I2C EEPROM (32Kbit)
+
+* Communication interfaces include:
+
+  * Debug interfaces (J-Link OB, MIPI-10, MIPI-20)
+  * Ethernet
+  * CAN
+  * USB
+  * RS485
+  * UART
+  * I2C
+  * SPI
+
+Hardware
+********
+
+The Renesas RZ/T2M MPU documentation can be found at `RZT2M Product page`_
+
+.. figure:: rzt2m_block_diagram.webp
+	:width: 500px
+	:align: center
+	:alt: RZ/T2M group feature
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+By default, the board is configured for use with:
+
+* UART0 connected to the USB serial port (pins K18, K19),
+* UART3 connected to the PMOD Header (J25, pins H16, G20),
+* LEDs defined as ``led0``, ``led1``, ``led2`` and ``led3``,
+
+The Zephyr console uses UART0.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``rzt2m_rsk`` board can be built in the usual way as
+documented in :ref:`build_an_application`.
+
+To use J-Link OB on RSK+RZT2M,
+
+1. Open the jumper pin (J9) for switching the debug connection.
+
+2. Connect the micro-USB type-B to J-Link OB USB connector (J10), and then the LED4 is lighted.
+
+Console
+=======
+
+The UART port is accessed by USB-Serial port (CN16).
+
+Debugging
+=========
+
+Here is an example for building and debugging with the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzt2m_rsk/r9a07g075m24gbg/cr520
+   :goals: build debug
+
+Flashing
+=========
+
+Before using ``flash`` command, the board must be set to xSPI boot mode.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzt2m_rsk/r9a07g075m24gbg/cr520
+   :goals: build flash
+
+References
+**********
+
+.. target-notes::
+
+.. _RZT2M Product page: https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rz-mpus/rzt2m-high-performance-multi-function-mpu-realizing-high-speed-processing-and-high-precision-control
diff --git a/boards/renesas/rzt2m_rsk/doc/rzt2m_block_diagram.webp b/boards/renesas/rzt2m_rsk/doc/rzt2m_block_diagram.webp
new file mode 100644
index 0000000000000..7e2f23eb51aa1
Binary files /dev/null and b/boards/renesas/rzt2m_rsk/doc/rzt2m_block_diagram.webp differ
diff --git a/boards/renesas/rzt2m_rsk/doc/rzt2m_rsk.webp b/boards/renesas/rzt2m_rsk/doc/rzt2m_rsk.webp
new file mode 100644
index 0000000000000..85510da36e459
Binary files /dev/null and b/boards/renesas/rzt2m_rsk/doc/rzt2m_rsk.webp differ
diff --git a/boards/renesas/rzt2m_starterkit/doc/rzt2m_starterkit.png b/boards/renesas/rzt2m_rsk/doc/rzt2m_starterkit.png
similarity index 100%
rename from boards/renesas/rzt2m_starterkit/doc/rzt2m_starterkit.png
rename to boards/renesas/rzt2m_rsk/doc/rzt2m_starterkit.png
diff --git a/boards/renesas/rzt2m_rsk/rzt2m_rsk-pinctrl.dtsi b/boards/renesas/rzt2m_rsk/rzt2m_rsk-pinctrl.dtsi
new file mode 100644
index 0000000000000..3bb24fd431b1a
--- /dev/null
+++ b/boards/renesas/rzt2m_rsk/rzt2m_rsk-pinctrl.dtsi
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzt-common.h>
+
+&pinctrl {
+	/omit-if-no-ref/ sci0_default: sci0_default {
+		sci0-pinmux {
+			pinmux = <RZT_PINMUX(PORT_16, 5, 1)>, /* TXD */
+				 <RZT_PINMUX(PORT_16, 6, 2)>; /* RXD */
+		};
+	};
+
+	/omit-if-no-ref/ irq2_default: irq2_default{
+		irq2-pinmux{
+			pinmux = <RZT_PINMUX(PORT_10, 5, 0)>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520.dts b/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520.dts
new file mode 100644
index 0000000000000..18e5b7ddf905b
--- /dev/null
+++ b/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520.dts
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2023 Antmicro <www.antmicro.com>
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <arm/renesas/rz/rzt/r9a07g075.dtsi>
+#include "rzt2m_rsk-pinctrl.dtsi"
+
+/ {
+	model = "Renesas Starter Kit+ for RZ/T2M";
+	compatible = "renesas,rzt2m-rsk";
+
+	chosen {
+		zephyr,sram = &cpu0_atcm;
+		zephyr,flash = &xspi0_cs0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+	};
+
+	aliases {
+		led0 = &led0;
+		sw0 = &sw1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led0 {
+			gpios = <&gpio19 6 0>;
+			label = "led0";
+		};
+
+		led1: led1 {
+			gpios = <&gpio19 4 0>;
+			label = "led1";
+		};
+
+		led2: led2 {
+			gpios = <&gpio20 0 0>;
+			label = "led2";
+		};
+
+		led3: led3 {
+			gpios = <&gpio23 4 0>;
+			label = "led3";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		sw1: sw1 {
+			label = "sw1";
+			gpios = <&gpio10 5 0>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		sw2: sw2 {
+			label = "sw2";
+			gpios = <&gpio16 3 0>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+};
+
+&sci0 {
+	pinctrl-0 = <&sci0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	uart0: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
+&irq2 {
+	trigger-type = "falling";
+	pinctrl-0 = <&irq2_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&gpio10 {
+	irqs = <5 2>;
+	status = "okay";
+};
+
+&gpio16 {
+	status = "okay";
+};
+
+&gpio19 {
+	status = "okay";
+};
+
+&gpio20 {
+	status = "okay";
+};
+
+&gpio23 {
+	status = "okay";
+};
diff --git a/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520.yaml b/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520.yaml
new file mode 100644
index 0000000000000..2fbd50880f02a
--- /dev/null
+++ b/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: rzt2m_rsk/r9a07g075m24gbg/cr520
+name: Renesas Starter Kit+ for RZ/T2M
+type: mcu
+arch: arm
+ram: 2048
+toolchain:
+  - zephyr
+supported:
+  - uart
+  - gpio
+vendor: renesas
diff --git a/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520_defconfig b/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520_defconfig
new file mode 100644
index 0000000000000..6d9ab2f767963
--- /dev/null
+++ b/boards/renesas/rzt2m_rsk/rzt2m_rsk_r9a07g075m24gbg_cr520_defconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+# Enable UART driver
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Enable console
+CONFIG_CONSOLE=y
diff --git a/boards/renesas/rzt2m_starterkit/Kconfig.rzt2m_starter_kit b/boards/renesas/rzt2m_starterkit/Kconfig.rzt2m_starter_kit
deleted file mode 100644
index 83f98b5c90bed..0000000000000
--- a/boards/renesas/rzt2m_starterkit/Kconfig.rzt2m_starter_kit
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_RZT2M_STARTER_KIT
-	select SOC_RENESAS_RZT2M
diff --git a/boards/renesas/rzt2m_starterkit/board.yml b/boards/renesas/rzt2m_starterkit/board.yml
deleted file mode 100644
index 21be12a29b2e7..0000000000000
--- a/boards/renesas/rzt2m_starterkit/board.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-board:
-  name: rzt2m_starter_kit
-  full_name: Starter Kit+ for RZ/T2M
-  vendor: renesas
-  socs:
-  - name: renesas_rzt2m
diff --git a/boards/renesas/rzt2m_starterkit/doc/index.rst b/boards/renesas/rzt2m_starterkit/doc/index.rst
deleted file mode 100644
index 69f6c5327005a..0000000000000
--- a/boards/renesas/rzt2m_starterkit/doc/index.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-.. _rzt2m_starterkit:
-
-Renesas Starter Kit+ for RZ/T2M
-###############################
-
-Overview
-********
-
-The Renesas Starter Kit+ for RZ/T2M is an evaluation and development kit for the RZ/T2M MPU.
-The board is powered through a 5V input via a DC Power Jack or USB Type-C Connector.
-
-.. figure:: rzt2m_starterkit.png
-   :width: 800px
-   :align: center
-   :alt: Starter Kit+ for RZ/T2M
-
-   Starter Kit+ for RZ/T2M (Credit: Renesas)
-
-Hardware
-********
-
-The board utilizes the SoC of part no. R9A07G075M24GBG, with 2MB of RAM.
-
-It has several on-board memory components:
-
-* SDRAM (256MBit),
-* NOR Flash (256MBit),
-* Octa Flash (512MBit),
-* HyperRAM (512Mbit),
-* QSPI Serial Flash (512Mbit),
-* I2C EEPROM (32Kbit).
-
-The communication interfaces include:
-
-* Debug interfaces (J-Link, MIPI-10, MIPI-20),
-* Ethernet,
-* CAN,
-* USB,
-* RS485,
-* UART,
-* I2C,
-* SPI.
-
-Supported Features
-==================
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINCTRL   | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by the port.
-
-Connections and IOs
-===================
-
-By default, the board is configured for use with:
-
-* UART0 connected to the USB serial port (pins K18, K19),
-* UART3 connected to the PMOD Header (J25, pins H16, G20),
-* LEDs defined as ``led0``, ``led1``, ``led2`` and ``led3``,
-
-The Zephyr console uses UART0.
-
-Programming and Debugging
-*************************
-
-Debugging
-=========
-
-Connect to the board using the J-Link On-board USB connector.
-Use ``west`` to start the debug server:
-
-.. code-block:: console
-
-    west debugserver
-
-Connect GDB to the server and load an application:
-
-.. code-block::
-
-    target remote :2331
-    file build/zephyr/zephyr.elf
-    load
-
-References
-**********
-
-.. target-notes::
-
-.. _RZT2M Product page: https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rz-mpus/rzt2m-high-performance-multi-function-mpu-realizing-high-speed-processing-and-high-precision-control
diff --git a/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit.yaml b/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit.yaml
deleted file mode 100644
index 5d091d0fddb3b..0000000000000
--- a/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2023 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-identifier: rzt2m_starter_kit
-name: Renesas RZ/T2M Starter Kit+
-type: mcu
-arch: arm
-ram: 2048
-toolchain:
-  - zephyr
-supported:
-  - counter
-  - uart
-  - gpio
-vendor: renesas
diff --git a/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit_renesas_rzt2m.dts b/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit_renesas_rzt2m.dts
deleted file mode 100644
index 717c21c0cdaba..0000000000000
--- a/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit_renesas_rzt2m.dts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2023 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <dt-bindings/pinctrl/renesas-rzt2m-pinctrl.h>
-#include <arm/renesas/rz/rzt2m.dtsi>
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-
-/ {
-	model = "RZT/2M Starter Kit";
-	compatible = "renesas,rzt2m_starter_kit";
-
-	chosen {
-		zephyr,sram = &cpu0_atcm;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-	};
-
-	aliases {
-		led0 = &led0;
-		sw0 = &sw1;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		led0: led0 {
-			gpios = <&gpio19 6 0>;
-			label = "led0";
-		};
-		led1: led1 {
-			gpios = <&gpio19 4 0>;
-			label = "led1";
-		};
-		led2: led2 {
-			gpios = <&gpio20 0 0>;
-			label = "led2";
-		};
-		led3: led3 {
-			gpios = <&gpio23 4 0>;
-			label = "led3";
-		};
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		sw1: sw1 {
-			label = "sw1";
-			gpios = <&gpio10 5 0>;
-			zephyr,code = <INPUT_KEY_0>;
-		};
-		sw2: sw2 {
-			label = "sw2";
-			gpios = <&gpio16 3 0>;
-			zephyr,code = <INPUT_KEY_1>;
-		};
-	};
-};
-
-
-&pinctrl {
-	uart0_default: uart0_default {
-		group1 {
-			pinmux = <UART0TX_P16_5>;
-		};
-		group2 {
-			pinmux = <UART0RX_P16_6>;
-			input-enable;
-		};
-	};
-	uart3_default: uart3_default {
-		group1 {
-			pinmux = <UART3TX_P18_0>;
-		};
-		group2 {
-			pinmux = <UART3RX_P17_7>;
-			input-enable;
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-names = "default";
-};
-
-&uart3 {
-	status = "okay";
-	pinctrl-0 = <&uart3_default>;
-	pinctrl-names = "default";
-};
diff --git a/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit_renesas_rzt2m_defconfig b/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit_renesas_rzt2m_defconfig
deleted file mode 100644
index 18f0eb4aee7b8..0000000000000
--- a/boards/renesas/rzt2m_starterkit/rzt2m_starter_kit_renesas_rzt2m_defconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2023 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/boards/renesas/rzv2l_smarc/Kconfig.rzv2l_smarc b/boards/renesas/rzv2l_smarc/Kconfig.rzv2l_smarc
new file mode 100644
index 0000000000000..d294caf29eae5
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/Kconfig.rzv2l_smarc
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZV2L_SMARC
+	select SOC_R9A07G054L23GBG
diff --git a/boards/renesas/rzv2l_smarc/board.cmake b/boards/renesas/rzv2l_smarc/board.cmake
new file mode 100644
index 0000000000000..b2f27aac3e4f8
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R9A07G054L23")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/renesas/rzv2l_smarc/board.yml b/boards/renesas/rzv2l_smarc/board.yml
new file mode 100644
index 0000000000000..3c4840332745f
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: rzv2l_smarc
+  full_name: RZ/V2L SMARC Evaluation Board Kit
+  vendor: renesas
+  socs:
+  - name: r9a07g054l23gbg
diff --git a/boards/renesas/rzv2l_smarc/doc/index.rst b/boards/renesas/rzv2l_smarc/doc/index.rst
new file mode 100644
index 0000000000000..f190b44e21566
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/doc/index.rst
@@ -0,0 +1,167 @@
+.. zephyr:board:: rzv2l_smarc
+
+Overview
+********
+
+The Renesas RZ/V2L SMARC Evaluation Board Kit (RZ/V2L-EVKIT) consists of a SMARC v2.1 module board and a carrier board.
+
+* Device: RZ/V2L R9A07G054L23GBG
+
+  * Cortex-A55 Dual, Cortex-M33
+  * BGA551pin, 15mmSq body, 0.5mm pitch
+
+* SMARC v2.1 Module Board Functions
+
+  * DDR4 SDRAM: 2GB x 1pc
+  * QSPI flash memory: 512Mb x 1pc
+  * eMMC memory: 64GB x 1pc
+  * The microSD card slot is implemented and used as an eSD for boot
+  * 5-output clock oscillator `5P35023 <https://www.renesas.com/en/products/clocks-timing/clock-generation/programmable-clocks/5p35023-versaclock-3s-programmable-clock-generator>`_ implemented
+  * PMIC power supply `RAA215300 <https://www.renesas.com/en/products/power-management/multi-channel-power-management-ics-pmics/raa215300-high-performance-9-channel-pmic-supporting-ddr-memory-built-charger-and-rtc>`_ implemented
+
+* Carrier Board Functions
+
+  * The FFC/FPC connector is mounted as standard for connection to high-speed serial interface for camera module.
+  * The Micro-HDMI connector via DSI/HDMI conversion module is mounted as standard for connection to high-speed serial interface for digital video module.
+  * The Micro-AB receptacle (ch0: USB2.0 OTG) and A receptacle (ch1: USB2.0 Host) are respectively mounted as standard for connection to USB interface.
+  * The RJ45 connector is mounted as standard for software development and evaluation using Ethernet.
+  * The audio codec is mounted as standard for advance development of audio system. The audio jack is implemented for connection to audio interface.
+  * The CAN connector is implemented for connection to CAN-Bus interface.
+  * The Micro-AB receptacles are implemented for connection to asynchronous serial port interface.
+  * The microSD card slot and two sockets for PMOD are implemented as an interface for RZ/V2L peripheral functions.
+  * For power supply, a mounted USB Type-C receptacle supports the USB PD standard.
+
+* MIPI Camera Module
+
+  * MIPI Camera Module (MIPI CSI) is included. Image recognition processing can be used with images input with MIPI camera.
+
+Hardware
+********
+
+The Renesas RZ/V2L MPU documentation can be found at `RZ/V2L Group Website`_
+
+.. figure:: rzv2l_block_diagram.webp
+	:width: 600px
+	:align: center
+	:alt: RZ/V2L group feature
+
+	RZ/V2L block diagram (Credit: Renesas Electronics Corporation)
+
+Detailed hardware features for the board can be found at `RZV2L-EVKIT Website`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``rzv2l_smarc`` board can be built in the usual way as
+documented in :ref:`build_an_application`.
+
+Console
+=======
+
+The UART port for Cortex-M33 System Core can be accessed by connecting `Pmod USBUART <https://store.digilentinc.com/pmod-usbuart-usb-to-uart-interface/>`_
+to the upper side of ``PMOD 1``.
+
+Debugging
+=========
+
+It is possible to load and execute a Zephyr application binary on
+this board on the Cortex-M33 System Core from
+the internal SRAM, using ``JLink`` debugger (:ref:`jlink-debug-host-tools`).
+
+Here is an example for building and debugging with the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: rzv2l_smarc/r9a07g054l23gbg/cm33
+   :goals: build debug
+
+Flashing
+========
+
+RZ/V2L-EVKIT is designed to start different systems on different cores.
+It uses Yocto as the build system to build Linux system and boot loaders
+to run Zephyr on Cortex-M33 with u-boot. The minimal steps are described below.
+
+1. Follow ''2.2 Building Images'' of `SMARC EVK of RZ/V2L Linux Start-up Guide`_ to prepare the build environment.
+
+2. At step (4), follow step ''2. Download Multi-OS Package'' and ''3. Add the layer for Multi-OS Package''
+   of ''3.2 OpenAMP related stuff Integration for RZ/V2L'' of `RZ/V2L Quick Start Guide for RZ/V Multi-OS Package`_
+   to add the layer for Multi-OS Package.
+
+.. code-block:: console
+
+   $ cd ~/rzv_vlp_<pkg ver>
+   $ unzip <Multi-OS Dir>/r01an7254ej0300-rzv-multi-os-pkg.zip
+   $ tar zxvf r01an7254ej0300-rzv-multi-os-pkg/meta-rz-features_multi-os_v3.0.0.tar.gz
+   $ bitbake-layers add-layer ../meta-rz-features/meta-rz-multi-os/meta-rzv2l
+
+3. Start the build:
+
+.. code-block:: console
+
+   $ MACHINE=smarc-rzv2l bitbake core-image-minimal
+
+The below necessary artifacts will be located in the build/tmp/deploy/images
+
++---------------+------------------------------------------------------+
+| Artifacts     | File name                                            |
++===============+======================================================+
+| Boot loader   | bl2_bp-smarc-rzv2l_pmic.srec                         |
+|               |                                                      |
+|               | fip-smarc-rzv2l_pmic.srec                            |
++---------------+------------------------------------------------------+
+| Flash Writer  | Flash_Writer_SCIF_RZV2L_SMARC_PMIC_DDR4_2GB_1PCS.mot |
++---------------+------------------------------------------------------+
+
+4. Follow ''4.2 Startup Procedure'' of `SMARC EVK of RZ/V2L Linux Start-up Guide`_ for power supply and board setting
+   at SCIF download (SW11[1:4] = OFF, ON, OFF, ON) and (SW1[1:2] = ON, OFF)
+
+5. Follow ''4.3 Download Flash Writer to RAM'' of `SMARC EVK of RZ/V2L Linux Start-up Guide`_ to download Flash Writer to RAM
+
+6. Follow ''4.4 Write the Bootloader'' of `SMARC EVK of RZ/V2L Linux Start-up Guide`_ to write the boot loader
+   to the target board by using Flash Writer.
+
+7. Follow ''4.5 Change Back to Normal Boot Mode'' with switch setting (SW11[1:4] = OFF, OFF, OFF, ON) and (SW1[1:2] = ON, OFF)
+
+8. Follow ''3. Preparing the SD Card'' of `SMARC EVK of RZ/V2L Linux Start-up Guide`_ to write files to the microSD Card
+
+9. Copy zephyr.bin file to microSD card
+
+10. Follow "4.3.2 CM33 Sample Program Invocation with u-boot" from the beginning to step 4 of `RZ/V2L Quick Start Guide for RZ/V Multi-OS Package`_
+
+11. Execute the commands stated below on the console to start zephyr application with CM33 core.
+    Here, ''N'' stands for the partition number in which you stored zephyr.bin file.
+
+.. code-block:: console
+
+   Hit any key to stop autoboot: 2
+   => dcache off
+   => mmc dev 1
+   => fatload mmc 1:N 0x00010000 zephyr.bin
+   => fatload mmc 1:N 0x40010000 zephyr.bin
+   => cm33 start_normal 0x00010000 0x40010000
+   => dcache on
+
+References
+**********
+
+.. target-notes::
+
+.. _RZ/V2L Group Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzv2l-general-purpose-microprocessor-equipped-renesas-original-ai-accelerator-drp-ai-12ghz-dual-core-arm
+
+.. _RZV2L-EVKIT Website:
+   https://www.renesas.com/en/products/microcontrollers-microprocessors/rz-mpus/rzv2l-evkit-smarc-som-evaluation-kit-rzv2l-mpu-ai-accelerator
+
+.. _SMARC EVK of RZ/V2L Linux Start-up Guide:
+   https://www.renesas.com/en/document/gde/smarc-evk-rzv2l-linux-start-guide-rev104
+
+.. _RZ/V2L Quick Start Guide for RZ/V Multi-OS Package:
+   https://www.renesas.com/en/document/apn/rzv2l-quick-start-guide-rzv-multi-os-package-v300
diff --git a/boards/renesas/rzv2l_smarc/doc/rzv2l_block_diagram.webp b/boards/renesas/rzv2l_smarc/doc/rzv2l_block_diagram.webp
new file mode 100644
index 0000000000000..b3d0eaae918fe
Binary files /dev/null and b/boards/renesas/rzv2l_smarc/doc/rzv2l_block_diagram.webp differ
diff --git a/boards/renesas/rzv2l_smarc/doc/rzv2l_smarc.webp b/boards/renesas/rzv2l_smarc/doc/rzv2l_smarc.webp
new file mode 100644
index 0000000000000..bec47b8e601fc
Binary files /dev/null and b/boards/renesas/rzv2l_smarc/doc/rzv2l_smarc.webp differ
diff --git a/boards/renesas/rzv2l_smarc/rzv2l_smarc-pinctrl.dtsi b/boards/renesas/rzv2l_smarc/rzv2l_smarc-pinctrl.dtsi
new file mode 100644
index 0000000000000..3795c701c8fef
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/rzv2l_smarc-pinctrl.dtsi
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzv-common.h>
+
+&pinctrl {
+	/omit-if-no-ref/ scif2_pins: scif2 {
+		scif2-pinmux {
+			pinmux = <RZV_PINMUX(PORT_48, 0, 1)>, /* TXD */
+				 <RZV_PINMUX(PORT_48, 1, 1)>; /* RXD */
+		};
+	};
+};
diff --git a/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33.dts b/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33.dts
new file mode 100644
index 0000000000000..28b3f8dcfdc09
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33.dts
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/gpio/renesas-rz-gpio.h>
+#include <arm/renesas/rz/rzv/r9a07g054.dtsi>
+#include "rzv2l_smarc-pinctrl.dtsi"
+
+/ {
+	model = "Renesas RZ/V2L SMARC";
+	compatible = "renesas,rzv2l-smarc";
+
+	chosen {
+		zephyr,sram = &ddr;
+		zephyr,console = &scif2;
+		zephyr,shell-uart = &scif2;
+	};
+
+	ddr: memory@60010000 {
+		compatible = "mmio-sram";
+		reg = <0x60010000 DT_SIZE_M(46)>;
+	};
+};
+
+&scif2 {
+	current-speed = <115200>;
+	pinctrl-0 = <&scif2_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33.yaml b/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33.yaml
new file mode 100644
index 0000000000000..e3d17a6daf5ae
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33.yaml
@@ -0,0 +1,11 @@
+identifier: rzv2l_smarc/r9a07g054l23gbg/cm33
+name: Cortex-M33 for Renesas RZ/V2L SMARC
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - uart
+  - gpio
+vendor: renesas
diff --git a/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33_defconfig b/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33_defconfig
new file mode 100644
index 0000000000000..c9dd44d6c7091
--- /dev/null
+++ b/boards/renesas/rzv2l_smarc/rzv2l_smarc_r9a07g054l23gbg_cm33_defconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_XIP=n
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/renesas/voice_ra4e1/doc/index.rst b/boards/renesas/voice_ra4e1/doc/index.rst
index 846701d20fdf4..1b957560728c3 100644
--- a/boards/renesas/voice_ra4e1/doc/index.rst
+++ b/boards/renesas/voice_ra4e1/doc/index.rst
@@ -1,8 +1,5 @@
 .. zephyr:board:: voice_ra4e1
 
-RA4E1 Voice User Reference Kit
-##############################
-
 Overview
 ********
 
@@ -53,35 +50,13 @@ Detailed hardware features can be found at:
 Supported Features
 ==================
 
-The below features are currently supported on Zephyr for the ``voice_ra4e1`` board:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock control        |
-+-----------+------------+----------------------+
-| COUNTER   | on-chip    | counter              |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| ENTROPY   | on-chip    | entropy              |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``voice_ra4e1`` board can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
@@ -91,7 +66,7 @@ Flashing
 ========
 
 Program can be flashed to VOICE-RA4E1 via the on-board SEGGER J-Link debugger.
-SEGGER J-link's drivers are avaialbe at https://www.segger.com/downloads/jlink/
+SEGGER J-link's drivers are available at https://www.segger.com/downloads/jlink/
 
 To flash the program to board
 
diff --git a/boards/renesas/voice_ra4e1/voice_ra4e1-pinctrl.dtsi b/boards/renesas/voice_ra4e1/voice_ra4e1-pinctrl.dtsi
index 6968b20dadb6a..54d8881d3bbc4 100644
--- a/boards/renesas/voice_ra4e1/voice_ra4e1-pinctrl.dtsi
+++ b/boards/renesas/voice_ra4e1/voice_ra4e1-pinctrl.dtsi
@@ -11,4 +11,20 @@
 			<RA_PSEL(RA_PSEL_SCI_3, 4, 8)>;
 		};
 	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
+
+	dac0_default: dac0_default {
+		group1 {
+			/* output */
+			psels = <RA_PSEL(RA_PSEL_DAC, 0, 14)>;
+			renesas,analog-enable;
+		};
+	};
 };
diff --git a/boards/renesas/voice_ra4e1/voice_ra4e1.dts b/boards/renesas/voice_ra4e1/voice_ra4e1.dts
index cc01c703825cf..7cf9ec82e0142 100644
--- a/boards/renesas/voice_ra4e1/voice_ra4e1.dts
+++ b/boards/renesas/voice_ra4e1/voice_ra4e1.dts
@@ -46,6 +46,7 @@
 	aliases {
 		led0 = &led1;
 		sw0 = &button0;
+		watchdog0 = &wdt;
 	};
 };
 
@@ -60,6 +61,19 @@
 	status = "okay";
 };
 
+&pll2 {
+	clocks = <&hoco>;
+	div = <2>;
+	mul = <24 0>;
+	status = "okay";
+};
+
+&uclk {
+	clocks = <&pll2>;
+	div = <5>;
+	status = "okay";
+};
+
 &sci3 {
 	interrupts = <16 1>, <17 1>, <18 1>, <19 1>;
 	interrupt-names = "rxi", "txi", "tei", "eri";
@@ -110,3 +124,23 @@
 		};
 	};
 };
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+&wdt {
+	status = "okay";
+};
+
+&dac0 {
+	pinctrl-0 = <&dac0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/renesas/voice_ra4e1/voice_ra4e1.yaml b/boards/renesas/voice_ra4e1/voice_ra4e1.yaml
index fd64e1fff59e8..bd744cc553dd3 100644
--- a/boards/renesas/voice_ra4e1/voice_ra4e1.yaml
+++ b/boards/renesas/voice_ra4e1/voice_ra4e1.yaml
@@ -10,3 +10,6 @@ toolchain:
 supported:
   - gpio
   - uart
+  - usbd
+  - watchdog
+vendor: renesas
diff --git a/boards/renode/cortex_r8_virtual/doc/index.rst b/boards/renode/cortex_r8_virtual/doc/index.rst
index 8691724fceaf2..9b6e6f3ded0a5 100644
--- a/boards/renode/cortex_r8_virtual/doc/index.rst
+++ b/boards/renode/cortex_r8_virtual/doc/index.rst
@@ -12,6 +12,8 @@ to learn how to obtain Renode for your host.
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/renode/riscv32_virtual/doc/index.rst b/boards/renode/riscv32_virtual/doc/index.rst
index 478260d268955..67f087010dfe3 100644
--- a/boards/renode/riscv32_virtual/doc/index.rst
+++ b/boards/renode/riscv32_virtual/doc/index.rst
@@ -11,6 +11,8 @@ configurations that only exist in proprietary boards/SoCs to be tested in upstre
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/ruuvi/ruuvitag/board.cmake b/boards/ruuvi/ruuvitag/board.cmake
index fd74f07001622..e30d805406e64 100644
--- a/boards/ruuvi/ruuvitag/board.cmake
+++ b/boards/ruuvi/ruuvitag/board.cmake
@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/ruuvi/ruuvitag/doc/index.rst b/boards/ruuvi/ruuvitag/doc/index.rst
index 946b9549468ba..a9fb0017055ac 100644
--- a/boards/ruuvi/ruuvitag/doc/index.rst
+++ b/boards/ruuvi/ruuvitag/doc/index.rst
@@ -29,37 +29,7 @@ RuuviTag's have the following physical features:
 Supported Features
 ==================
 
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| Humidity, | on-board   | bme280               |
-| Temp & Air|            |                      |
-| Pressure  |            |                      |
-+-----------+------------+----------------------+
-| Acc       | on-board   | lis2dh12             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -129,6 +99,8 @@ P1 = TC2030 TagConnect (on RuuviTag Rev.B6)
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/sc/scobc_module1/doc/index.rst b/boards/sc/scobc_module1/doc/index.rst
index 52e8000b1b89a..264e27801ea25 100644
--- a/boards/sc/scobc_module1/doc/index.rst
+++ b/boards/sc/scobc_module1/doc/index.rst
@@ -58,6 +58,8 @@ respectively.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/seagate/faze/doc/index.rst b/boards/seagate/faze/doc/index.rst
index fbb0b5e00841e..f4d5f2317d1e8 100644
--- a/boards/seagate/faze/doc/index.rst
+++ b/boards/seagate/faze/doc/index.rst
@@ -1,7 +1,4 @@
-.. _faze:
-
-Seagate FireCuda Gaming SSD (FaZe) board
-########################################
+.. zephyr:board:: faze
 
 Overview
 ********
@@ -14,10 +11,6 @@ through I2C and GPIOs.
 
 This Zephyr port is running on the NXP LPC11U67 MCU.
 
-.. image:: firecuda-gaming-ssd.jpg
-   :align: center
-   :alt: Seagate FireCuda Gaming SSD
-
 Hardware
 ********
 
@@ -44,28 +37,7 @@ More information can be found here:
 Supported Features
 ==================
 
-All the hardware features available on the FaZe board are supported in Zephyr.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| IOCON     | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c master/slave controller         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port interrupt               |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -97,6 +69,8 @@ The IOCON controller can be used to configure the LPC11U67 pins.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/seagate/legend/board.yml b/boards/seagate/legend/board.yml
index a015c60bc4e3c..e4780925afee4 100644
--- a/boards/seagate/legend/board.yml
+++ b/boards/seagate/legend/board.yml
@@ -4,5 +4,10 @@ board:
   vendor: seagate
   revision:
     format: custom
+    default: "25hdd"
+    revisions:
+      - name: "25hdd"
+      - name: "25ssd"
+      - name: "35"
   socs:
     - name: stm32f070xb
diff --git a/boards/seagate/legend/doc/index.rst b/boards/seagate/legend/doc/index.rst
index 1156a792317c5..f265db5fb0d7e 100644
--- a/boards/seagate/legend/doc/index.rst
+++ b/boards/seagate/legend/doc/index.rst
@@ -1,7 +1,4 @@
-.. _legend:
-
-Legend
-######
+.. zephyr:board:: legend
 
 Overview
 ********
@@ -52,31 +49,7 @@ Hardware
 Supported Features
 ==================
 
-All the hardware features available on the Legend boards are supported by
-Zephyr.
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | clock and reset control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c master/slave controller         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| SPI flash | on-chip    | spi_nor                             |
-+-----------+------------+-------------------------------------+
-| LED strip | on-chip    | ws2812                              |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -112,6 +85,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/seco/stm32f3_seco_d23/doc/index.rst b/boards/seco/stm32f3_seco_d23/doc/index.rst
index 03e0bf82586bd..10517105ae743 100644
--- a/boards/seco/stm32f3_seco_d23/doc/index.rst
+++ b/boards/seco/stm32f3_seco_d23/doc/index.rst
@@ -50,35 +50,7 @@ More information about STM32F302VC can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f3_seco_d23 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | CAN                                 |
-+-----------+------------+-------------------------------------+
-| IWDG      | on-chip    | Independent WatchDoG                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -172,6 +144,8 @@ main processor (Rockchip PX30) and SPI2 is connected to CN39.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/seeed/lora_e5_dev_board/doc/lora_e5_dev_board.rst b/boards/seeed/lora_e5_dev_board/doc/lora_e5_dev_board.rst
index 9c2071abd4fb9..4d1b56175d62a 100644
--- a/boards/seeed/lora_e5_dev_board/doc/lora_e5_dev_board.rst
+++ b/boards/seeed/lora_e5_dev_board/doc/lora_e5_dev_board.rst
@@ -66,49 +66,7 @@ More information about LoRa-E5 STM32WLE5JC Module can be found here:
 Supported Features
 ==================
 
-The Zephyr LoRa-E5 Dev Board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| MPU       | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | LoRa                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in:
-
-- :zephyr_file:`boards/seeed/lora_e5_dev_board/lora_e5_dev_board_defconfig`
-- :zephyr_file:`boards/seeed/lora_e5_dev_board/lora_e5_dev_board.dts`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -196,6 +154,8 @@ By default System clock is driven by the MSI clock at 48MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``lora_e5_dev_board`` board configuration can be built the
 usual way (see :ref:`build_an_application`).
 
diff --git a/boards/seeed/lora_e5_mini/doc/index.rst b/boards/seeed/lora_e5_mini/doc/index.rst
index 05e94cdaf3ae1..a396bd4d991d9 100644
--- a/boards/seeed/lora_e5_mini/doc/index.rst
+++ b/boards/seeed/lora_e5_mini/doc/index.rst
@@ -56,48 +56,7 @@ More information about LoRa-E5 STM32WLE5JC Module can be found here:
 Supported Features
 ==================
 
-The Zephyr LoRa-E5 mini configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| MPU       | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | LoRa                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in:
-
-- :zephyr_file:`boards/seeed/lora_e5_mini/lora_e5_mini_defconfig`
-- :zephyr_file:`boards/seeed/lora_e5_mini/lora_e5_mini.dts`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -132,6 +91,8 @@ main PLL clock. By default System clock is driven by the MSI clock at 48MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``lora_e5_mini`` board configuration can be built the
 usual way (see :ref:`build_an_application`).
 
diff --git a/boards/seeed/seeeduino_xiao/doc/index.rst b/boards/seeed/seeeduino_xiao/doc/index.rst
index 7dc905e39b3b7..2f2d40bd250ee 100644
--- a/boards/seeed/seeeduino_xiao/doc/index.rst
+++ b/boards/seeed/seeeduino_xiao/doc/index.rst
@@ -18,41 +18,7 @@ Hardware
 Supported Features
 ==================
 
-The seeeduino_xiao board configuration supports the following hardware
-features:
-
-+-----------+------------+------------------------------------------+
-| Interface | Controller | Driver/Component                         |
-+===========+============+==========================================+
-| DMA       | on-chip    | Direct memory access                     |
-+-----------+------------+------------------------------------------+
-| DAC       | on-chip    | Digital to analogue converter            |
-+-----------+------------+------------------------------------------+
-| Flash     | on-chip    | Can be used with LittleFS to store files |
-+-----------+------------+------------------------------------------+
-| GPIO      | on-chip    | I/O ports                                |
-+-----------+------------+------------------------------------------+
-| HWINFO    | on-chip    | Hardware info                            |
-+-----------+------------+------------------------------------------+
-| I2C       | on-chip    | Inter-Integrated Circuit                 |
-+-----------+------------+------------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller       |
-+-----------+------------+------------------------------------------+
-| SPI       | on-chip    | Serial Peripheral Interface ports        |
-+-----------+------------+------------------------------------------+
-| SYSTICK   | on-chip    | systick                                  |
-+-----------+------------+------------------------------------------+
-| USART     | on-chip    | Serial ports                             |
-+-----------+------------+------------------------------------------+
-| USB       | on-chip    | USB device                               |
-+-----------+------------+------------------------------------------+
-| WDT       | on-chip    | Watchdog                                 |
-+-----------+------------+------------------------------------------+
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/seeed/seeeduino_xiao/seeeduino_xiao_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -104,6 +70,8 @@ the XIAO, the DAC is available on pin 0.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The XIAO ships the BOSSA compatible UF2 bootloader.  The bootloader can be
 entered by shorting the RST and GND pads twice.
 
diff --git a/boards/seeed/wio_terminal/doc/index.rst b/boards/seeed/wio_terminal/doc/index.rst
index 736d3cb6984c9..48632f64b6318 100644
--- a/boards/seeed/wio_terminal/doc/index.rst
+++ b/boards/seeed/wio_terminal/doc/index.rst
@@ -33,58 +33,7 @@ Hardware
 Supported Features
 ==================
 
-The wio_terminal board configuration supports the following hardware features:
-
-.. list-table::
-    :header-rows: 1
-
-    * - Interface
-      - Controller
-      - Driver / Component
-    * - NVIC
-      - on-chip
-      - Nested vector interrupt controller
-    * - Flash
-      - on-chip
-      - Can be used with LittleFS to store files
-    * - SYSTICK
-      - on-chip
-      - Systick
-    * - WDT
-      - on-chip
-      - Watchdog
-    * - GPIO
-      - on-chip
-      - I/O ports
-    * - USART
-      - on-chip
-      - Serial port
-    * - I2C
-      - on-chip
-      - Inter-Integrated Circuit
-    * - SPI
-      - on-chip
-      - Serial Peripheral Interface port
-    * - TRNG
-      - on-chip
-      - True Random Number Generator
-    * - HWINFO
-      - on-chip
-      - Unique 128 bit serial number
-    * - RTC
-      - on-chip
-      - Real-Time Counter
-    * - USB
-      - on-chip
-      - USB device
-    * - PWM
-      - on-chip
-      - PWM
-
-Other hardware features are not currently supported by Zephyr.
-
-The default configuration can be found in the Kconfig file
-:zephyr_file:`boards/seeed/wio_terminal/wio_terminal_defconfig`.
+.. zephyr:board-supported-hw::
 
 Zephyr can use the default Cortex-M SYSTICK timer or the SAM0 specific RTC.
 To use the RTC, set :kconfig:option:`CONFIG_CORTEX_M_SYSTICK=n` and set
@@ -120,6 +69,8 @@ characters back to the host PC.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Wio Terminal ships with an UF2 bootloader that is BOSSA compatible. The
 bootloader can be entered by quickly tapping the reset button twice.
 
diff --git a/boards/seeed/xiao_ble/board.cmake b/boards/seeed/xiao_ble/board.cmake
index a6aa2ac40a721..30caef5834877 100644
--- a/boards/seeed/xiao_ble/board.cmake
+++ b/boards/seeed/xiao_ble/board.cmake
@@ -4,6 +4,7 @@ board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 board_runner_args(uf2 "--board-id=Seeed_XIAO_nRF52840_Sense")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/seeed/xiao_ble/doc/index.rst b/boards/seeed/xiao_ble/doc/index.rst
index 831eb872a9da0..c36c5004a2f08 100644
--- a/boards/seeed/xiao_ble/doc/index.rst
+++ b/boards/seeed/xiao_ble/doc/index.rst
@@ -23,42 +23,7 @@ Hardware
 Supported Features
 ==================
 
-The xiao_ble board configuration supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash, QSPI flash    |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| USB       | on-chip    | usb                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -76,6 +41,8 @@ LED
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The XIAO BLE ships with the `Adafruit nRF52 Bootloader`_ which supports flashing
 using `UF2`_. Doing so allows easy flashing of new images, but does not support
 debugging the device. For debugging please use `External Debugger`_.
diff --git a/boards/seeed/xiao_esp32c3/doc/index.rst b/boards/seeed/xiao_esp32c3/doc/index.rst
index fa9811661a4bd..ef8bdb5a86e11 100644
--- a/boards/seeed/xiao_esp32c3/doc/index.rst
+++ b/boards/seeed/xiao_esp32c3/doc/index.rst
@@ -19,29 +19,7 @@ pinout.
 Supported Features
 ==================
 
-The XIAO ESP32C3 board configuration supports the following hardware features:
-
-+-----------+------------+------------------+
-| Interface | Controller | Driver/Component |
-+===========+============+==================+
-| PMP       | on-chip    | arch/riscv       |
-+-----------+------------+------------------+
-| INTMTRX   | on-chip    | intc_esp32c3     |
-+-----------+------------+------------------+
-| PINMUX    | on-chip    | pinctrl_esp32    |
-+-----------+------------+------------------+
-| USB UART  | on-chip    | serial_esp32_usb |
-+-----------+------------+------------------+
-| GPIO      | on-chip    | gpio_esp32       |
-+-----------+------------+------------------+
-| UART      | on-chip    | uart_esp32       |
-+-----------+------------+------------------+
-| I2C       | on-chip    | i2c_esp32        |
-+-----------+------------+------------------+
-| SPI       | on-chip    | spi_esp32_spim   |
-+-----------+------------+------------------+
-| TWAI      | on-chip    | can_esp32_twai   |
-+-----------+------------+------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -71,6 +49,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/seeed/xiao_esp32c6/Kconfig b/boards/seeed/xiao_esp32c6/Kconfig
index bc76c90de0696..c753069c633fd 100644
--- a/boards/seeed/xiao_esp32c6/Kconfig
+++ b/boards/seeed/xiao_esp32c6/Kconfig
@@ -3,4 +3,5 @@
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
-	default 4096
+	default 4096 if BOARD_XIAO_ESP32C6_ESP32C6_HPCORE
+	default 256 if BOARD_XIAO_ESP32C6_ESP32C6_LPCORE
diff --git a/boards/seeed/xiao_esp32c6/Kconfig.xiao_esp32c6 b/boards/seeed/xiao_esp32c6/Kconfig.xiao_esp32c6
index 34fc9fe1b5ea0..d86b021015dab 100644
--- a/boards/seeed/xiao_esp32c6/Kconfig.xiao_esp32c6
+++ b/boards/seeed/xiao_esp32c6/Kconfig.xiao_esp32c6
@@ -5,3 +5,5 @@
 
 config BOARD_XIAO_ESP32C6
 	select SOC_ESP32_C6_WROOM_1U_N4
+	select SOC_ESP32C6_HPCORE if BOARD_XIAO_ESP32C6_ESP32C6_HPCORE
+	select SOC_ESP32C6_LPCORE if BOARD_XIAO_ESP32C6_ESP32C6_LPCORE
diff --git a/boards/seeed/xiao_esp32c6/doc/index.rst b/boards/seeed/xiao_esp32c6/doc/index.rst
index 5e6865c5b0219..a1b93cc9c42dc 100644
--- a/boards/seeed/xiao_esp32c6/doc/index.rst
+++ b/boards/seeed/xiao_esp32c6/doc/index.rst
@@ -21,37 +21,7 @@ It is based on a standard XIAO 14 pin pinout.
 Supported Features
 ==================
 
-The Zephyr ``xiao_esp32c6`` board target supports the following hardware features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 The board uses a standard XIAO pinout, the default pin mapping is the following:
 
@@ -81,6 +51,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
@@ -122,12 +94,12 @@ To build the sample application using sysbuild use the command:
 .. zephyr-app-commands::
    :tool: west
    :zephyr-app: samples/hello_world
-   :board: xiao_esp32c6
+   :board: xiao_esp32c6/esp32c6/hpcore
    :goals: build
    :west-args: --sysbuild
    :compact:
 
-By default, the ESP32 sysbuild creates bootloader (MCUboot) and application
+By default, the ESP32-C6 sysbuild creates bootloader (MCUboot) and application
 images. But it can be configured to create other kind of images.
 
 Build directory structure created by sysbuild is different from traditional
@@ -171,7 +143,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: xiao_esp32c6
+   :board: xiao_esp32c6/esp32c6/hpcore
    :goals: build
 
 The usual ``flash`` target will work with the ``xiao_esp32c6`` board
@@ -180,7 +152,7 @@ application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: xiao_esp32c6
+   :board: xiao_esp32c6/esp32c6/hpcore
    :goals: flash
 
 Since the Zephyr console is by default on the ``usb_serial`` device, we use
@@ -196,7 +168,7 @@ message in the monitor:
 .. code-block:: console
 
    ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
-   Hello World! xiao_esp32c6/esp32c6
+   Hello World! xiao_esp32c6/esp32c6/hpcore
 
 Debugging
 *********
@@ -213,7 +185,7 @@ Here is an example for building the :zephyr:code-sample:`hello_world` applicatio
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: xiao_esp32c6
+   :board: xiao_esp32c6/esp32c6/hpcore
    :goals: build flash
    :gen-args: -DOPENOCD=<path/to/bin/openocd> -DOPENOCD_DEFAULT_PATH=<path/to/openocd/share/openocd/scripts>
 
@@ -221,7 +193,7 @@ You can debug an application in the usual way. Here is an example for the :zephy
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: xiao_esp32c6
+   :board: xiao_esp32c6/esp32c6/hpcore
    :goals: debug
 
 References
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6.dts b/boards/seeed/xiao_esp32c6/xiao_esp32c6.dts
deleted file mode 100644
index d155f5aa20141..0000000000000
--- a/boards/seeed/xiao_esp32c6/xiao_esp32c6.dts
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2024 Mario Paja
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <espressif/esp32c6/esp32c6_wroom_n4.dtsi>
-#include "xiao_esp32c6-pinctrl.dtsi"
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-#include <espressif/partitions_0x0_default.dtsi>
-#include "seeed_xiao_connector.dtsi"
-
-/ {
-	model = "Seeed XIAO ESP32C6";
-	compatible = "seeed,xiao-esp32c6";
-
-	chosen {
-		zephyr,sram = &sramhp;
-		zephyr,console = &usb_serial;
-		zephyr,shell-uart = &usb_serial;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &slot0_partition;
-	};
-
-	leds: leds {
-		compatible = "gpio-leds";
-		yellow_led: led_0 {
-			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
-			label = "User LED1";
-		};
-	};
-
-	aliases {
-		led0 = &yellow_led;
-		watchdog0 = &wdt0;
-	};
-
-};
-
-&trng0 {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&wdt0 {
-	status = "okay";
-};
-
-&usb_serial {
-	status = "okay";
-};
-
-&i2c0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c0_default>;
-	pinctrl-names = "default";
-};
-
-&spi2 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	status = "okay";
-	pinctrl-0 = <&spim2_default>;
-	pinctrl-names = "default";
-};
-
-&uart0 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&uart0_default>;
-	pinctrl-names = "default";
-};
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6.yaml b/boards/seeed/xiao_esp32c6/xiao_esp32c6.yaml
deleted file mode 100644
index 2f0a60ea7a7ed..0000000000000
--- a/boards/seeed/xiao_esp32c6/xiao_esp32c6.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-identifier: xiao_esp32c6
-name: XIAO ESP32C6
-type: mcu
-arch: riscv
-toolchain:
-  - zephyr
-supported:
-  - gpio
-  - watchdog
-  - uart
-  - dma
-  - spi
-  - entropy
-  - i2c
-  - xiao_gpio
-  - xiao_i2c
-  - xiao_serial
-  - xiao_spi
-testing:
-  ignore_tags:
-    - tracing
-vendor: seeed
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore.dts b/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore.dts
new file mode 100644
index 0000000000000..4789d7ccf761d
--- /dev/null
+++ b/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore.dts
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2024 Mario Paja
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <espressif/esp32c6/esp32c6_wroom_n4.dtsi>
+#include "xiao_esp32c6-pinctrl.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <espressif/partitions_0x0_default.dtsi>
+#include "seeed_xiao_connector.dtsi"
+
+/ {
+	model = "Seeed XIAO ESP32C6 HP Core";
+	compatible = "seeed,xiao-esp32c6";
+
+	chosen {
+		zephyr,sram = &sramhp;
+		zephyr,console = &usb_serial;
+		zephyr,shell-uart = &usb_serial;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+		yellow_led: led_0 {
+			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+			label = "User LED1";
+		};
+	};
+
+	aliases {
+		led0 = &yellow_led;
+		watchdog0 = &wdt0;
+	};
+
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+&usb_serial {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+};
+
+&spi2 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	pinctrl-0 = <&spim2_default>;
+	pinctrl-names = "default";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore.yaml b/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore.yaml
new file mode 100644
index 0000000000000..7108d35e99784
--- /dev/null
+++ b/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore.yaml
@@ -0,0 +1,23 @@
+identifier: xiao_esp32c6/esp32c6/hpcore
+name: XIAO ESP32C6 HP Core
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - watchdog
+  - uart
+  - dma
+  - spi
+  - entropy
+  - i2c
+  - xiao_gpio
+  - xiao_i2c
+  - xiao_serial
+  - xiao_spi
+testing:
+  ignore_tags:
+    - bluetooth
+    - tracing
+vendor: seeed
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore_defconfig b/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore_defconfig
new file mode 100644
index 0000000000000..187793c76e8cc
--- /dev/null
+++ b/boards/seeed/xiao_esp32c6/xiao_esp32c6_hpcore_defconfig
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore.dts b/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore.dts
new file mode 100644
index 0000000000000..4a2571598f6ef
--- /dev/null
+++ b/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32c6/esp32c6_lpcore_wroom_n4.dtsi>
+#include <espressif/partitions_0x0_default.dtsi>
+
+/ {
+	model = "Seeed XIAO ESP32C6 LP Core";
+	compatible = "seeed,xiao-esp32c6";
+
+	chosen {
+		zephyr,sram = &sramlp;
+		zephyr,code-partition = &slot0_lpcore_partition;
+	};
+};
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore.yaml b/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore.yaml
new file mode 100644
index 0000000000000..f2941054ba34d
--- /dev/null
+++ b/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore.yaml
@@ -0,0 +1,17 @@
+identifier: xiao_esp32c6/esp32c6/lpcore
+name: XIAO ESP32C6 LP Core
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+supported:
+  - cpu
+testing:
+  only_tags:
+    - introduction
+  ignore_tags:
+    - kernel
+    - posix
+    - chre
+    - cpp
+vendor: seeed
diff --git a/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore_defconfig b/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore_defconfig
new file mode 100644
index 0000000000000..13d59f76b7d2c
--- /dev/null
+++ b/boards/seeed/xiao_esp32c6/xiao_esp32c6_lpcore_defconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+# Memory protection
+CONFIG_THREAD_STACK_INFO=n
+CONFIG_THREAD_CUSTOM_DATA=n
+
+# Boot
+CONFIG_BOOT_BANNER=n
+
+# Console
+CONFIG_PRINTK=n
+
+# Build
+CONFIG_SIZE_OPTIMIZATIONS=y
diff --git a/boards/seeed/xiao_esp32s3/doc/index.rst b/boards/seeed/xiao_esp32s3/doc/index.rst
index afc3a7e231c74..1aacfe17bc44e 100644
--- a/boards/seeed/xiao_esp32s3/doc/index.rst
+++ b/boards/seeed/xiao_esp32s3/doc/index.rst
@@ -38,41 +38,7 @@ Additionally, Sense variant integrates a OV2640 camera sensor, microphone and sd
 Supported Features
 ==================
 
-Current Zephyr's XIAO ESP32S3 board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI/CAN   | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
-| LCD_CAM    | on-chip    | lcd_cam                             |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -102,6 +68,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_common.dtsi b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_common.dtsi
index 79860b2644701..bc5ee7e87c460 100644
--- a/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_common.dtsi
+++ b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_common.dtsi
@@ -94,3 +94,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/seeed/xiao_mg24/Kconfig.defconfig b/boards/seeed/xiao_mg24/Kconfig.defconfig
new file mode 100644
index 0000000000000..33f72abc0578c
--- /dev/null
+++ b/boards/seeed/xiao_mg24/Kconfig.defconfig
@@ -0,0 +1,37 @@
+# Copyright (c) 2020 Piotr Mienkowski
+# Copyright (c) 2020 TriaGnoSys GmbH
+# Copyright (c) 2025 Pete Johanson
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_XIAO_MG24
+
+config LOG_BACKEND_SWO_FREQ_HZ
+	default 875000
+	depends on LOG_BACKEND_SWO
+
+if SOC_GECKO_USE_RAIL
+
+config FPU
+	default y
+
+endif # SOC_GECKO_USE_RAIL
+
+if BT
+
+# Used to enable RF switch and selection
+config GPIO_HOGS
+	default y
+
+config FPU
+	default y
+
+config COMMON_LIBC_MALLOC_ARENA_SIZE
+	default 8192
+
+config MAIN_STACK_SIZE
+	default 3072 if PM
+	default 2304
+
+endif # BT
+
+endif # BOARD_XIAO_MG24
diff --git a/boards/seeed/xiao_mg24/Kconfig.xiao_mg24 b/boards/seeed/xiao_mg24/Kconfig.xiao_mg24
new file mode 100644
index 0000000000000..441384dd41695
--- /dev/null
+++ b/boards/seeed/xiao_mg24/Kconfig.xiao_mg24
@@ -0,0 +1,7 @@
+# Copyright (c) 2020 Piotr Mienkowski
+# Copyright (c) 2020 TriaGnoSys GmbH
+# Copyright (c) 2025 Pete Johanson
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_XIAO_MG24
+	select SOC_PART_NUMBER_EFR32MG24B220F1536IM48
diff --git a/boards/seeed/xiao_mg24/board.cmake b/boards/seeed/xiao_mg24/board.cmake
new file mode 100644
index 0000000000000..503f4a0a2e29f
--- /dev/null
+++ b/boards/seeed/xiao_mg24/board.cmake
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(openocd)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+
+board_runner_args(jlink "--device=EFR32MG24BxxxF1536")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/seeed/xiao_mg24/board.yml b/boards/seeed/xiao_mg24/board.yml
new file mode 100644
index 0000000000000..fe6e7c9452ebe
--- /dev/null
+++ b/boards/seeed/xiao_mg24/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: xiao_mg24
+  full_name: XIAO MG24
+  vendor: seeed
+  socs:
+    - name: efr32mg24b220f1536im48
diff --git a/boards/seeed/xiao_mg24/doc/index.rst b/boards/seeed/xiao_mg24/doc/index.rst
new file mode 100644
index 0000000000000..2625f5d0e583e
--- /dev/null
+++ b/boards/seeed/xiao_mg24/doc/index.rst
@@ -0,0 +1,119 @@
+.. zephyr:board:: xiao_mg24
+
+Overview
+********
+
+Seeed Studio XIAO MG24 is a mini development board based on Silicon Labs' MG24. XIAO MG24 is based
+on ARM Cortex-M33 core, 32-bit RISC architecture with a maximum clock speed of 78MHz, supporting DSP
+instructions and FPU floating-point operations, possessing powerful computing power, and built-in
+AL/ML hardware accelerator MVP, which can efficiently process AI/machine learning algorithms.
+Secondly, it has excellent RF performance, with a transmission power of up to+19.5 dBm and a
+reception sensitivity as low as -105.4 dBm. It supports multiple IoT and wireless transmission
+protocols such as Matter, Thread, Zigbee, Bluetooth LE 5.3,Bluetooth mesh etc.
+
+Hardware
+********
+
+- EFR32MG24B220F1536IM48 Mighty Gecko SoC
+- CPU core: ARM Cortex®-M33 with FPU
+- Flash memory: 1536 kB
+- RAM: 256 kB
+- Transmit power: up to +20 dBm
+- Operation frequency: 2.4 GHz
+- Crystals for LFXO (32.768 kHz) and HFXO (39 MHz).
+- 3.7v LiPo power and charge support
+- User and battery charge LEDs
+
+For more information about the EFR32MG24 SoC and XIAO MG24 board, refer to these
+documents:
+
+- `EFR32MG24 Website`_
+- `EFR32MG24 Datasheet`_
+- `EFR32xG24 Reference Manual`_
+- `XIAO MG24 Wiki`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+In the following table, the column **Name** contains Pin names. For example, PA2
+means Pin number 2 on PORTA, as used in the board's datasheets and manuals.
+
++-------+-------------+------------------+
+| Name  | Function    | Usage            |
++=======+=============+==================+
+| PA7   | GPIO        | LED0             |
++-------+-------------+------------------+
+| PA8   | USART0_TX   | UART Console TX  |
++-------+-------------+------------------+
+| PA9   | USART0_RX   | UART Console RX  |
++-------+-------------+------------------+
+
+The default configuration can be found in
+:zephyr_file:`boards/seeed/xiao_mg24/xiao_mg24_defconfig`
+
+System Clock
+============
+
+The EFR32MG24 SoC is configured to use the 39 MHz external oscillator on the
+board.
+
+Serial Port
+===========
+
+The EFR32MG24 SoC has one USART and two EUSARTs.
+USART0 is connected to the board controller and is used for the console.
+
+Programming and Debugging
+*************************
+
+The XIAO MG24 contains an SAMD11 with CMSIS-DAP, allowing flashing, debugging, logging, etc. over
+the USB port. Doing so requires a version of OpenOCD that includes support for the flash on the MG24
+MCU. Until those changes are included in stock OpenOCD, the version bundled with Arduino can be
+used, or can be installed from the `OpenOCD Arduino Fork`_. When flashing, debugging, etc. you may
+need to include ``--openocd=/usr/local/bin/openocd
+--openocd-search=/usr/local/share/openocd/scripts/`` options to the command.
+
+Flashing
+========
+
+Connect the XIAO MG24 board to your host computer using the USB port. A USB CDC ACM serial port
+should appear on the host, that can be used to view logs from the flashed application.
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: xiao_mg24
+   :goals: flash
+
+Open a serial terminal (minicom, putty, etc.) connecting to the UCB CDC ACM serial port.
+
+Reset the board and you should see the following message in the terminal:
+
+.. code-block:: console
+
+   Hello World! xiao_mg24
+
+
+.. _XIAO MG24 Wiki:
+   https://wiki.seeedstudio.com/xiao_mg24_getting_started/
+
+.. _BRD4187C User Guide:
+   https://www.silabs.com/documents/public/user-guides/ug526-brd4187c-user-guide.pdf
+
+.. _EFR32MG24 Website:
+   https://www.silabs.com/wireless/zigbee/efr32mg24-series-2-socs
+
+.. _EFR32MG24 Datasheet:
+   https://www.silabs.com/documents/public/data-sheets/efr32mg24-datasheet.pdf
+
+.. _EFR32xG24 Reference Manual:
+   https://www.silabs.com/documents/public/reference-manuals/brd4187c-rm.pdf
+
+.. _OpenOCD Arduino Fork:
+   https://github.com/facchinm/OpenOCD/tree/arduino-0.12.0-rtx5
diff --git a/boards/seeed/xiao_mg24/doc/xiao_mg24.webp b/boards/seeed/xiao_mg24/doc/xiao_mg24.webp
new file mode 100644
index 0000000000000..00821e38c1919
Binary files /dev/null and b/boards/seeed/xiao_mg24/doc/xiao_mg24.webp differ
diff --git a/boards/seeed/xiao_mg24/pre_dt_board.cmake b/boards/seeed/xiao_mg24/pre_dt_board.cmake
new file mode 100644
index 0000000000000..beb76b85552d1
--- /dev/null
+++ b/boards/seeed/xiao_mg24/pre_dt_board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2021 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+# SPI is implemented via usart so node name isn't spi@...
+list(APPEND EXTRA_DTC_FLAGS "-Wno-spi_bus_bridge")
diff --git a/boards/seeed/xiao_mg24/seeed_xiao_connector.dtsi b/boards/seeed/xiao_mg24/seeed_xiao_connector.dtsi
new file mode 100644
index 0000000000000..027f44c07ef89
--- /dev/null
+++ b/boards/seeed/xiao_mg24/seeed_xiao_connector.dtsi
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Peter Johanson
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	xiao_d: connector {
+		compatible = "seeed,xiao-gpio";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpioc 0 0>, /* D0 */
+			   <1 0 &gpioc 1 0>, /* D1 */
+			   <2 0 &gpioc 2 0>, /* D2 */
+			   <3 0 &gpioc 3 0>, /* D3 */
+			   <4 0 &gpioc 4 0>, /* D4 */
+			   <5 0 &gpioc 5 0>, /* D5 */
+			   <6 0 &gpioc 6 0>, /* D6 */
+			   <7 0 &gpioc 7 0>, /* D7 */
+			   <8 0 &gpioa 3 0>, /* D8 */
+			   <9 0 &gpioa 4 0>, /* D9 */
+			   <10 0 &gpioa 5 0>; /* D10 */
+	};
+};
+
+xiao_spi: &eusart1 {};
+
+xiao_serial: &eusart0 {};
+
+xiao_i2c: &i2c0 {};
diff --git a/boards/seeed/xiao_mg24/support/openocd.cfg b/boards/seeed/xiao_mg24/support/openocd.cfg
new file mode 100644
index 0000000000000..eed46c1687d6f
--- /dev/null
+++ b/boards/seeed/xiao_mg24/support/openocd.cfg
@@ -0,0 +1,25 @@
+if {[info exists env(OPENOCD_INTERFACE)]} {
+	set INTERFACE $env(OPENOCD_INTERFACE)
+} else {
+	# By default connect over Debug USB port using the CMSIS-DAP interface
+	set INTERFACE "cmsis-dap"
+}
+
+source [find interface/$INTERFACE.cfg]
+
+transport select swd
+
+set CHIPNAME efr32
+
+source [find target/efm32s2_g23.cfg]
+
+$_TARGETNAME configure -event gdb-attach {
+	echo "Debugger attaching: halting execution"
+	reset halt
+	gdb_breakpoint_override hard
+}
+
+$_TARGETNAME configure -event gdb-detach {
+	echo "Debugger detaching: resuming execution"
+	resume
+}
diff --git a/boards/seeed/xiao_mg24/xiao_mg24-pinctrl.dtsi b/boards/seeed/xiao_mg24/xiao_mg24-pinctrl.dtsi
new file mode 100644
index 0000000000000..a1930b8e78b5a
--- /dev/null
+++ b/boards/seeed/xiao_mg24/xiao_mg24-pinctrl.dtsi
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025 Pete Johanson
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dt-bindings/pinctrl/silabs/xg24-pinctrl.h>
+
+&pinctrl {
+	eusart0_default: eusart0_default {
+		group0 {
+			pins = <EUSART1_TX_PC6>;
+			drive-push-pull;
+			output-high;
+		};
+
+		group1 {
+			pins = <EUSART1_RX_PC7>;
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+
+	eusart1_default: eusart1_default {
+		group0 {
+			pins = <EUSART1_TX_PA5>, <EUSART1_SCLK_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+
+		group1 {
+			pins = <EUSART1_RX_PA4>;
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+
+	usart0_default: usart0_default {
+		group0 {
+			pins = <USART0_TX_PA8>;
+			drive-push-pull;
+			output-high;
+		};
+
+		group1 {
+			pins = <USART0_RX_PA9>;
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group0 {
+			pins = <I2C0_SCL_PC4>, <I2C0_SDA_PC5>;
+			drive-open-drain;
+			bias-pull-up;
+		};
+	};
+};
diff --git a/boards/seeed/xiao_mg24/xiao_mg24.dts b/boards/seeed/xiao_mg24/xiao_mg24.dts
new file mode 100644
index 0000000000000..24a2cc570ea1b
--- /dev/null
+++ b/boards/seeed/xiao_mg24/xiao_mg24.dts
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2025 Pete Johanson
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <silabs/efr32mg24b220f1536im48.dtsi>
+#include "xiao_mg24-pinctrl.dtsi"
+#include "seeed_xiao_connector.dtsi"
+
+/ {
+	model = "Seeed XIAO MG24";
+	compatible = "seeed,xiao_mg24", "silabs,efr32mg24";
+
+	chosen {
+		zephyr,console = &usart0;
+		zephyr,shell-uart = &usart0;
+		zephyr,uart-pipe = &usart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &bt_hci_silabs;
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		led0 = &led0;
+		watchdog0 = &wdog0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led_0 {
+			gpios = <&gpioa 7 GPIO_ACTIVE_LOW>;
+			label = "LED 0";
+		};
+	};
+};
+
+&cpu0 {
+	clock-frequency = <78000000>;
+};
+
+&pstate_em3 {
+	status = "disabled";
+};
+
+&hfxo {
+	status = "okay";
+	ctune = <95>;
+	precision = <50>;
+};
+
+&lfxo {
+	status = "okay";
+	ctune = <44>;
+	precision = <50>;
+};
+
+&hfrcodpll {
+	clock-frequency = <DT_FREQ_M(78)>;
+	clocks = <&hfxo>;
+	dpll-n = <3839>;
+	dpll-m = <1919>;
+	dpll-edge = "fall";
+	dpll-lock = "phase";
+	dpll-autorecover;
+};
+
+&em23grpaclk {
+	clocks = <&lfxo>;
+};
+
+&em4grpaclk {
+	clocks = <&lfxo>;
+};
+
+&sysrtcclk {
+	clocks = <&lfxo>;
+};
+
+&wdog0clk {
+	clocks = <&lfxo>;
+};
+
+&wdog1clk {
+	clocks = <&lfxo>;
+};
+
+&usart0 {
+	current-speed = <115200>;
+	pinctrl-0 = <&usart0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&eusart0 {
+	compatible = "silabs,eusart-uart";
+	pinctrl-0 = <&eusart0_default>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
+
+&eusart1 {
+	compatible = "silabs,eusart-spi";
+	pinctrl-0 = <&eusart1_default>;
+	pinctrl-names = "default";
+	cs-gpios = <&gpioc 7 GPIO_ACTIVE_LOW>;
+	clock-frequency = <4000000>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+};
+
+&i2c0 {
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+};
+
+&gpio {
+	location-swo = <0>;
+	status = "okay";
+};
+
+&gpioa {
+	status = "okay";
+};
+
+&gpiob {
+	status = "okay";
+
+	rf_sw: rf_sw {
+		gpio-hog;
+		gpios = <4 GPIO_ACTIVE_HIGH>;
+		output-low;
+	};
+
+	rf_sw_enable: rf_sw_enable {
+		gpio-hog;
+		gpios = <5 GPIO_ACTIVE_HIGH>;
+		output-high;
+	};
+};
+
+&gpioc {
+	status = "okay";
+
+};
+
+&gpiod {
+	status = "okay";
+};
+
+&wdog0 {
+	status = "okay";
+};
+
+&sysrtc0 {
+	status = "okay";
+};
+
+&se {
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Reserve 48 kB for the bootloader */
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(48)>;
+			read-only;
+		};
+
+		/* Reserve 720 kB for the application in slot 0 */
+		slot0_partition: partition@c000 {
+			label = "image-0";
+			reg = <0x0000c000 0x000B8000>;
+		};
+
+		/* Reserve 720 kB for the application in slot 1 */
+		slot1_partition: partition@C4000 {
+			label = "image-1";
+			reg = <0x000C0000 0x000B8000>;
+		};
+
+		/* Set 16 kB of storage at the end of the 1536 kB of flash */
+		storage_partition: partition@17c000 {
+			label = "storage";
+			reg = <0x0017c000 DT_SIZE_K(16)>;
+		};
+	};
+};
+
+&bt_hci_silabs {
+	status = "okay";
+};
diff --git a/boards/seeed/xiao_mg24/xiao_mg24.yaml b/boards/seeed/xiao_mg24/xiao_mg24.yaml
new file mode 100644
index 0000000000000..aaacd6892e8da
--- /dev/null
+++ b/boards/seeed/xiao_mg24/xiao_mg24.yaml
@@ -0,0 +1,20 @@
+identifier: xiao_mg24
+name: XIAO MG24
+type: mcu
+arch: arm
+ram: 256
+flash: 1536
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - bluetooth
+  - gpio
+  - uart
+  - dma
+  - watchdog
+  - comparator
+testing:
+  ignore_tags:
+    - pm
+vendor: seeed
diff --git a/boards/seeed/xiao_mg24/xiao_mg24_defconfig b/boards/seeed/xiao_mg24/xiao_mg24_defconfig
new file mode 100644
index 0000000000000..e70f8f5c5197d
--- /dev/null
+++ b/boards/seeed/xiao_mg24/xiao_mg24_defconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_ARM_MPU=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_GPIO=y
diff --git a/boards/seeed/xiao_ra4m1/Kconfig.xiao_ra4m1 b/boards/seeed/xiao_ra4m1/Kconfig.xiao_ra4m1
new file mode 100644
index 0000000000000..6c83b59817271
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/Kconfig.xiao_ra4m1
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Pete Johanson
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_XIAO_RA4M1
+	select SOC_R7FA4M1AB3CNE
diff --git a/boards/seeed/xiao_ra4m1/board.cmake b/boards/seeed/xiao_ra4m1/board.cmake
new file mode 100644
index 0000000000000..14102460aab6a
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/board.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Pete Johanson
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=R7FA4M1AB")
+board_runner_args(rfp "--device=RA")
+
+include(${ZEPHYR_BASE}/boards/common/rfp.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/seeed/xiao_ra4m1/board.yml b/boards/seeed/xiao_ra4m1/board.yml
new file mode 100644
index 0000000000000..7a3f7e6db23c9
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: xiao_ra4m1
+  full_name: XIAO RA4M1
+  vendor: seeed
+  socs:
+  - name: r7fa4m1ab3cne
diff --git a/boards/seeed/xiao_ra4m1/doc/index.rst b/boards/seeed/xiao_ra4m1/doc/index.rst
new file mode 100644
index 0000000000000..54806f46db481
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/doc/index.rst
@@ -0,0 +1,109 @@
+.. zephyr:board:: xiao_ra4m1
+
+Overview
+********
+
+The XIAO RA4M1 integrates Renesas' RA4M1 chip (32-bit ARM® Cortex®-M4 MCU up to 48 MHz) into the
+classic XIAO form factor. This development board offers 256KB Flash, 32KB SRAM, 8KB EEPROM, a USB
+2.0 connector, reset and boot buttons, 3 LEDs, a 14-bit A/D converter, a 12-bit D/A converter, and a
+CAN BUS interface. With onboard charging circuitry and low-power modes (as low as 45μA), it’s ideal
+for battery-powered applications. Sharing the same 32-bit RA4M1 microcontroller as the Arduino Uno
+R4, it's natively compatible with Arduino IDE and the extensive XIAO accessories, making it the
+perfect starting point for electronics projects.
+
+**Renesas RA4M1 Microcontroller Group**
+
+- R7FA4M1AB3CNE
+- 48-pin LQFP package
+- 48 MHz Arm® Cortex®-M4 core with Floating Point Unit (FPU)
+- 32 KB SRAM
+- 256 KB code flash memory
+- 8 KB data flash memory
+
+**Connectivity**
+
+- A Device USB connector for the Main MCU
+- Pin headers for access to power and signals
+- Bottom pads for access to signals, SWD, and battery hookup
+
+**Operating voltage**
+
+- External 5 V input through the Debug USB connector supplies the on-board power regulator to power
+  logic and interfaces on the board. External 5 V or 3.3 V may be also supplied through alternate
+  locations on the board.
+- An external 3.7 V LiPo battery can be connected and the board includes the ability to charge the
+  battery when 5 V power is supplied.
+- A yellow User LED, controlled by the Main MCU firmware
+- MCU reset push-button switch
+- MCU boot push-button switch
+
+Hardware
+********
+
+Detailed hardware features can be found at:
+
+- RA4M1 MCU: `RA4M1 Group User's Manual Hardware`_
+- XIOA RA4M1 board: `XIAO RA4M1 Website`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``xiao_ra4m1`` board can be built, flashed, and debugged
+in the usual way. See :ref:`build_an_application` and :ref:`application_run`
+for more details on building and running.
+
+Flashing
+========
+
+Program can be flashed to XIAO RA4M1 via the built in RA4 USB bootloader.
+
+To flash the program to board
+
+1. Connect the XIAO RA4M1 USB port to the host.
+
+2. Enter bootloader mode by holding the right Boot button, and tapping the left
+   Reset button. The Boot button needs to be held for a second or two after the
+   Reset has been released.
+
+3. Execute west command
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: xiao_ra4m1
+   :goals: build flash
+
+Debugging
+=========
+
+To debug on the XIAO RA4M1, connect an external debugger to the SWD pads on the
+bottom of the controller. Once completed, debugging can be performed using
+Zephyr's standard method (see :ref:`application_run`).
+The following sample demonstrates how to debug using JLink:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: xiao_ra4m1
+   :maybe-skip-config:
+   :goals: debug
+
+
+References
+**********
+- `XIAO RA4M1 Website`_
+- `RA4M1 MCU group Website`_
+
+.. _XIAO RA4M1 Website:
+   https://wiki.seeedstudio.com/getting_started_xiao_ra4m1/
+
+.. _RA4M1 MCU group Website:
+   https://www.renesas.com/us/en/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ra4m1-32-bit-microcontrollers-48mhz-arm-cortex-m4-and-lcd-controller-and-cap-touch-hmi
+
+.. _RA4M1 Group User's Manual Hardware:
+   https://www.renesas.com/us/en/document/mah/renesas-ra4m1-group-users-manual-hardware?r=1054146
diff --git a/boards/seeed/xiao_ra4m1/doc/xiao_ra4m1.webp b/boards/seeed/xiao_ra4m1/doc/xiao_ra4m1.webp
new file mode 100644
index 0000000000000..99c22da3b7b81
Binary files /dev/null and b/boards/seeed/xiao_ra4m1/doc/xiao_ra4m1.webp differ
diff --git a/boards/seeed/xiao_ra4m1/seeed_xiao_connector.dtsi b/boards/seeed/xiao_ra4m1/seeed_xiao_connector.dtsi
new file mode 100644
index 0000000000000..bd3ee8b68158d
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/seeed_xiao_connector.dtsi
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Pete Johanson
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	xiao_d: connector {
+		compatible = "seeed,xiao-gpio";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map
+			= <0 0 &ioport0 14 0>		/* D0 */
+			, <1 0 &ioport0 0 0>		/* D1 */
+			, <2 0 &ioport0 1 0>		/* D2 */
+			, <3 0 &ioport0 2 0>		/* D3 */
+			, <4 0 &ioport2 6 0>		/* D4 */
+			, <5 0 &ioport1 0 0>		/* D5 */
+			, <6 0 &ioport3 2 0>		/* D6 */
+			, <7 0 &ioport3 1 0>		/* D7 */
+			, <8 0 &ioport1 11 0>		/* D8 */
+			, <9 0 &ioport1 10 0>		/* D9 */
+			, <10 0 &ioport1 9 0>		/* D10 */
+			;
+	};
+};
+
+xiao_spi: &spi1 {};
+
+xiao_serial: &uart0 {};
diff --git a/boards/seeed/xiao_ra4m1/xiao_ra4m1-pinctrl.dtsi b/boards/seeed/xiao_ra4m1/xiao_ra4m1-pinctrl.dtsi
new file mode 100644
index 0000000000000..223c5284d3656
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/xiao_ra4m1-pinctrl.dtsi
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Peter Johanson
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci2_default: sci2_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_2, 3, 2)>,
+			<RA_PSEL(RA_PSEL_SCI_2, 3, 1)>;
+		};
+	};
+
+	spi1_default: spi1_default {
+		group1 {
+			/* MISO MOSI RSPCK */
+			psels = <RA_PSEL(RA_PSEL_SPI, 1, 10)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 9)>,
+			<RA_PSEL(RA_PSEL_SPI, 1, 11)>;
+		};
+	};
+
+	usbfs_default: usbfs_default {
+		group1 {
+			/* USB_VBUS */
+			psels = <RA_PSEL(RA_PSEL_USBFS, 4, 7)>;
+			drive-strength = "high";
+		};
+	};
+};
diff --git a/boards/seeed/xiao_ra4m1/xiao_ra4m1.dts b/boards/seeed/xiao_ra4m1/xiao_ra4m1.dts
new file mode 100644
index 0000000000000..1fb8d39353381
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/xiao_ra4m1.dts
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
+ * Copyright (c) 2025 Pete Johanson
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <renesas/ra/ra4/r7fa4m1ab3cne.dtsi>
+#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/adc/adc.h>
+#include <dt-bindings/input/input-event-codes.h>
+#include "xiao_ra4m1-pinctrl.dtsi"
+
+/ {
+	model = "Seeed XIAO-RA4M1";
+	compatible = "renesas,ra4m1", "renesas,ra";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,entropy = &trng;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led1: led1 {
+			gpios = <&ioport0 11 GPIO_ACTIVE_LOW>;
+			label = "LED1";
+		};
+	};
+
+	aliases {
+		led0 = &led1;
+		watchdog0 = &wdt;
+	};
+};
+
+&uclk {
+	clocks = <&hoco>;
+	div = <1>;
+	status = "okay";
+};
+
+&usbfs {
+	pinctrl-0 = <&usbfs_default>;
+	pinctrl-names = "default";
+	maximum-speed = "full-speed";
+	status = "okay";
+
+	zephyr_udc0: udc {
+		status = "okay";
+	};
+};
+
+&hoco {
+	status = "okay";
+	clock-frequency = <48000000>;
+};
+
+&pclkblock {
+	clocks = <&hoco>;
+};
+
+&iclk {
+	div = <1>;
+};
+
+&pclka {
+	div = <1>;
+};
+
+&pclkb {
+	div = <2>;
+};
+
+&pclkc {
+	div = <1>;
+};
+
+&pclkd {
+	div = <1>;
+};
+
+&fclk {
+	div = <2>;
+};
+
+&sci2 {
+	pinctrl-0 = <&sci2_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	uart0: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
+
+&ioport0 {
+	status = "okay";
+};
+
+&ioport1 {
+	status = "okay";
+};
+
+&ioport2 {
+	status = "okay";
+};
+
+&ioport4 {
+	status = "okay";
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&trng {
+	status = "okay";
+};
+
+&wdt {
+	status = "okay";
+};
+
+#include "seeed_xiao_connector.dtsi"
diff --git a/boards/seeed/xiao_ra4m1/xiao_ra4m1.yaml b/boards/seeed/xiao_ra4m1/xiao_ra4m1.yaml
new file mode 100644
index 0000000000000..97d6fa8518d32
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/xiao_ra4m1.yaml
@@ -0,0 +1,14 @@
+identifier: xiao_ra4m1
+name: Seeeduino XIAO RA4M1
+type: mcu
+arch: arm
+ram: 32
+flash: 256
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - uart
+  - watchdog
+vendor: renesas
diff --git a/boards/seeed/xiao_ra4m1/xiao_ra4m1_defconfig b/boards/seeed/xiao_ra4m1/xiao_ra4m1_defconfig
new file mode 100644
index 0000000000000..e83a94a3c6452
--- /dev/null
+++ b/boards/seeed/xiao_ra4m1/xiao_ra4m1_defconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Pete Johanson
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable Console
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
diff --git a/boards/seeed/xiao_rp2040/doc/index.rst b/boards/seeed/xiao_rp2040/doc/index.rst
index 0cf39c014c7fe..572ebb9c500c5 100644
--- a/boards/seeed/xiao_rp2040/doc/index.rst
+++ b/boards/seeed/xiao_rp2040/doc/index.rst
@@ -25,54 +25,7 @@ are 11 digital pins, 4 analog pins, 11 PWM Pins,1 I2C interface,
 Supported Features
 ==================
 
-The ``xiao_rp2040`` board target supports the following hardware
-features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v6m-nvic`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - USB Device
-     - :kconfig:option:`CONFIG_USB_DEVICE_STACK`
-     - :dtcompatible:`raspberrypi,pico-usbd`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - Watchdog Timer (WDT)
-     - :kconfig:option:`CONFIG_WATCHDOG`
-     - :dtcompatible:`raspberrypi,pico-watchdog`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - Flash
-     - :kconfig:option:`CONFIG_FLASH`
-     - :dtcompatible:`raspberrypi,pico-flash-controller`
-   * - Clock controller
-     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
-     - :dtcompatible:`raspberrypi,pico-clock-controller`
-   * - UART (PIO)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart-pio`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -108,6 +61,8 @@ The board uses a standard XIAO pinout, the default pin mapping is the following:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/seeed/xiao_rp2040/xiao_rp2040.dts b/boards/seeed/xiao_rp2040/xiao_rp2040.dts
index 98a700f242f36..c0f96c5fdabf6 100644
--- a/boards/seeed/xiao_rp2040/xiao_rp2040.dts
+++ b/boards/seeed/xiao_rp2040/xiao_rp2040.dts
@@ -78,6 +78,18 @@
 		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
+
+		/* Reserved memory for the second stage bootloader */
+		second_stage_bootloader: partition@0 {
+			label = "second_stage_bootloader";
+			reg = <0x00000000 0x100>;
+			read-only;
+		};
+
+		/*
+		 * Usable flash. Starts at 0x100, after the bootloader. The partition
+		 * size is 2MB minus the 0x100 bytes taken by the bootloader.
+		 */
 		code_partition: partition@100 {
 			label = "code";
 			reg = <0x100 (DT_SIZE_M(2) - 0x100)>;
diff --git a/boards/seeed/xiao_rp2040/xiao_rp2040.yaml b/boards/seeed/xiao_rp2040/xiao_rp2040.yaml
index a55cc0f361dd4..c91e45a1e2c97 100644
--- a/boards/seeed/xiao_rp2040/xiao_rp2040.yaml
+++ b/boards/seeed/xiao_rp2040/xiao_rp2040.yaml
@@ -3,7 +3,7 @@ name: XIAO RP2040
 type: mcu
 arch: arm
 flash: 2048
-ram: 256
+ram: 264
 toolchain:
   - zephyr
   - gnuarmemb
diff --git a/boards/segger/ip_k66f/Kconfig.defconfig b/boards/segger/ip_k66f/Kconfig.defconfig
index 06952ee070791..8d1d7ca0e2193 100644
--- a/boards/segger/ip_k66f/Kconfig.defconfig
+++ b/boards/segger/ip_k66f/Kconfig.defconfig
@@ -22,11 +22,8 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y
 
-config ETH_MCUX_RMII_EXT_CLK
-	default y if ETH_MCUX
-
-config ETH_MCUX_NO_PHY_SMI
-	default y if ETH_MCUX
+config ETH_NXP_ENET_RMII_EXT_CLK
+	default y
 
 endif # NETWORKING
 
diff --git a/boards/segger/ip_k66f/doc/index.rst b/boards/segger/ip_k66f/doc/index.rst
index 902802eb6d320..9c816768d1ef7 100644
--- a/boards/segger/ip_k66f/doc/index.rst
+++ b/boards/segger/ip_k66f/doc/index.rst
@@ -32,28 +32,7 @@ For more information about the K66F SoC and IP-K66F board:
 Supported Features
 ==================
 
-The ip_k66f board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/segger/ip_k66f/ip_k66f_defconfig`
+.. zephyr:board-supported-hw::
 
 Micrel/Microchip KSZ8794CNX Ethernet Switch is supported
 (see :zephyr:code-sample:`dsa` sample).
@@ -85,6 +64,8 @@ The K66F SoC has six UARTs. None of them are used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/segger/trb_stm32f407/doc/index.rst b/boards/segger/trb_stm32f407/doc/index.rst
index 0b90123c411ac..2d108bfc09ae4 100644
--- a/boards/segger/trb_stm32f407/doc/index.rst
+++ b/boards/segger/trb_stm32f407/doc/index.rst
@@ -19,28 +19,7 @@ and the datasheet.
 Supported Features
 ==================
 
-The SEGGER-TRB-STM32F407 board configuration supports the following
-hardware features:
-
-+------------+------------+------------------------------+
-| Interface  | Controller | Driver/Component             |
-+============+============+==============================+
-| NVIC       | on-chip    | nested vectored              |
-|            |            | interrupt controller         |
-+------------+------------+------------------------------+
-| SYSTICK    | on-chip    | system clock                 |
-+------------+------------+------------------------------+
-| GPIO       | on-chip    | gpio                         |
-+------------+------------+------------------------------+
-| WATCHDOG   | on-chip    | independent watchdog         |
-+------------+------------+------------------------------+
-| COUNTER    | on-chip    | rtc                          |
-+------------+------------+------------------------------+
-| RNG        | on-chip    | True Random number generator |
-+------------+------------+------------------------------+
-
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -91,6 +70,9 @@ master clock, which can be set as high as 168 MHz.
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 The SEGGER-TRB-STM32F407 board is specially designed to test the SEGGER
 Trace-Pro debuggers, so this example assumes a J-Trace or J-Link is used.
 
diff --git a/boards/sensry/ganymed_bob/board.cmake b/boards/sensry/ganymed_bob/board.cmake
new file mode 100644
index 0000000000000..876aa967780b2
--- /dev/null
+++ b/boards/sensry/ganymed_bob/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+board_set_flasher_ifnset(sy1xx)
+board_finalize_runner_args(sy1xx)
diff --git a/boards/sensry/ganymed_bob/doc/index.rst b/boards/sensry/ganymed_bob/doc/index.rst
index d8fdbee20eef8..0726dc771ec9f 100644
--- a/boards/sensry/ganymed_bob/doc/index.rst
+++ b/boards/sensry/ganymed_bob/doc/index.rst
@@ -1,7 +1,6 @@
-.. _ganymed_bob:
+.. zephyr:board:: ganymed_bob
 
-Ganymed Break-Out-Board (BOB)
-#############################
+.. _ganymed_bob:
 
 Overview
 ********
@@ -14,9 +13,10 @@ Overview
 The Ganymed board hardware provides support for the Ganymed sy1xx series IoT multicore
 RISC-V SoC with optional sensor level.
 
-The SoC has the following core features:
+Hardware
+********
 
-* 32-Bit RSIC-V 1+8-core processor, up to 500MHz
+* 32-Bit RISC-V 1+8-core processor, up to 500MHz
 
   * 1x Data Acquisition Unit
   * 8x Data Processing Unit
@@ -28,117 +28,91 @@ The SoC has the following core features:
 * 512 KB Global MRAM
 * 512 KB Secure MRAM
 * CLOCK
-* RAM
-* :abbr:`32x GPIO (General Purpose Input Output)`
-* :abbr:`4x TWIM (I2C-compatible two-wire interface with MicroDMA)`
-* 4x I2S
-* :abbr:`7x SPI (Serial Peripheral Interface with MicroDMA)`
-* :abbr:`3x UART (Universal receiver-transmitter with MicroDMA)`
-* :abbr:`1x TSN (Time sensitive networking ethernet MAC with MicroDMA)`
-* 1x CAN-FD
-* 3x ADC
+* Peripherals
+
+    * :abbr:`32x GPIO (General Purpose Input Output)`
+    * :abbr:`4x TWIM (I2C-compatible two-wire interface with MicroDMA)`
+    * 4x I2S
+    * :abbr:`7x SPI (Serial Peripheral Interface with MicroDMA)`
+    * :abbr:`3x UART (Universal receiver-transmitter with MicroDMA)`
+    * :abbr:`1x TSN (Time sensitive networking ethernet MAC with MicroDMA)`
+    * 1x CAN-FD
+    * 3x ADC
+* Power section for on-board power generation and power measurement (selectable)
+
+    * USB type-C
+    * external 5V power source
+* 40-pin JTAG connector (compatible to Olimex ARM-JTAG-OCD-H)
+* USB over FTDI (connected to UART0)
+* Header for all I/Os and configuration
 
-.. figure:: img/ganymed_bob_sy120_gbm.webp
-     :align: center
-     :alt: Ganymed Break-Out-Board (BOB) equipped with SY120 GBM
+* Assembly options for the SoC
 
-     Ganymed Break-Out-Board (BOB) equipped with SY120 GBM (Credit: Sensry)
+  * SY120-GBM - Generic Base Module without top level sensors
+  * SY120-GEN1 - Generic Module type 1 with top level sensors (see below)
 
-.. figure:: img/ganymed_bob_sy120_gen1.webp
-     :align: center
-     :alt: Ganymed Break-Out-Board (BOB) equipped with SY120 GEN1
+The ``ganymed-bob/sy120-gen1`` comes with additional on-board sensors.
 
-     Ganymed Break-Out-Board (BOB) equipped with SY120 GEN1 (Credit: Sensry)
+Supported Features
+==================
 
-Hardware
-********
+.. zephyr:board-supported-hw::
 
-The Ganymed BOB has:
+For more detailed description please refer to `Ganymed BreakOut Board Documentation`_
 
-* Assembly options for the SoC include
 
-  * SY120-GBM - Generic Base Module without top level sensors
-  * SY120-GEN1 - Generic Module type 1 with top level sensors (Bosch BME680 - SPI1 , Bosch BMA456 - SPI0, Bosch BMG250 - SPI2, STMicro MIS2DH - I2C0)
+Programming and Testing
+***********************
 
-* power section for on-board power generation and power measurement (selectable)
-* 40-pin JTAG connector (compatible to Olimex ARM-JTAG-OCD-H)
-* USB over FTDI (connected to UART0)
-* Header for I/Os and additional configuration
+.. zephyr:board-supported-runners::
 
-Supported Features
-==================
+Building
+========
 
-The ``ganymed-bob/sy120-gbm`` board supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| SAADC     | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| MRAM      | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| TWIM      | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| GRTC      | on-chip    | counter              |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| SPU       | on-chip    | system protection    |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| TSN       | on-chip    | ethernet MAC         |
-+-----------+------------+----------------------+
-| CAN       | on-chip    | CAN                  |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The ``ganymed-bob/sy120-gen1`` board includes all hardware features of the ``ganymed-bob/sy120-gbm`` board and comes additionally
-with these features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| BME680    | on-chip    | environment sensor   |
-+-----------+------------+----------------------+
-| BMA456    | on-chip    | acceleration sensor  |
-+-----------+------------+----------------------+
-| BMG250    | on-chip    | gyrosope sensor      |
-+-----------+------------+----------------------+
-| MIS2DH    | on-chip    | vibration sensor     |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-Power
-*****
-
-* USB type-C
-* external 5V power source
-
-Programming and Debugging
-*************************
-
-Applications for the ``ganymed-bob/sy120-gbm`` board can be
-built, flashed, and debugged in the usual way. See
+Applications for the ``ganymed_bob/sy120_gbm`` board can be
+built and flashed in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
 building and running.
 
-Testing the Ganymed BreakOut Board
-**********************************
+Building the :zephyr:code-sample:`hello_world` sample:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: ganymed_bob/sy120_gbm
+   :goals: build
+   :compact:
+
+
+Flashing
+========
+
+Test the Ganymed with a :zephyr:code-sample:`hello_world` sample.
+
+Flash the zephyr image:
 
-Test the Ganymed with a :zephyr:code-sample:`blinky` sample.
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :goals: flash
+   :west-args: --serial /dev/ttyUSB0
+   :compact:
+
+
+Testing
+=======
+
+Then attach a serial console, ex. minicom / picocom / putty; Reset the target.
 The sample output should be:
 
 .. code-block:: console
 
-    Hello World! ganymed-bob/sy120-gbm
+    Hello World! ganymed_bob/sy120_gbm
+
+
+References
+**********
+
+.. target-notes::
+
+.. _`Ganymed BreakOut Board Documentation`: https://docs.sensry.net/datasheets/sy120-bob/
diff --git a/boards/sensry/ganymed_bob/ganymed_bob_sy120-pinctrl.dtsi b/boards/sensry/ganymed_bob/ganymed_bob_sy120-pinctrl.dtsi
index eda591f7ef826..97649fe985f3a 100644
--- a/boards/sensry/ganymed_bob/ganymed_bob_sy120-pinctrl.dtsi
+++ b/boards/sensry/ganymed_bob/ganymed_bob_sy120-pinctrl.dtsi
@@ -55,6 +55,42 @@
 		bias-pull-up;
 	};
 
+	/* I2C Port 0 */
+	/omit-if-no-ref/ i2c0_scl: i2c0_scl {
+		pinmux = <SY1XX_I2C0_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c0_sda: i2c0_sda {
+		pinmux = <SY1XX_I2C0_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
+	/* I2C Port 1 */
+	/omit-if-no-ref/ i2c1_scl: i2c1_scl {
+		pinmux = <SY1XX_I2C1_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c1_sda: i2c1_sda {
+		pinmux = <SY1XX_I2C1_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
+	/* I2C Port 2 */
+	/omit-if-no-ref/ i2c2_scl: i2c2_scl {
+		pinmux = <SY1XX_I2C2_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c2_sda: i2c2_sda {
+		pinmux = <SY1XX_I2C2_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
+	/* I2C Port 3 */
+	/omit-if-no-ref/ i2c3_scl: i2c3_scl {
+		pinmux = <SY1XX_I2C3_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c3_sda: i2c3_sda {
+		pinmux = <SY1XX_I2C3_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
 	/* MDIO */
 	/omit-if-no-ref/ mdio_io: mdio_io {
 		pinmux = <SY1XX_RGMII0_PAD_CFG3 SY1XX_PAD(0)>;
@@ -137,6 +173,26 @@
 	pinctrl-names = "default";
 };
 
+&i2c0 {
+	pinctrl-0 = <&i2c0_scl &i2c0_sda>;
+	pinctrl-names = "default";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_scl &i2c1_sda>;
+	pinctrl-names = "default";
+};
+
+&i2c2 {
+	pinctrl-0 = <&i2c2_scl &i2c2_sda>;
+	pinctrl-names = "default";
+};
+
+&i2c3 {
+	pinctrl-0 = <&i2c3_scl &i2c3_sda>;
+	pinctrl-names = "default";
+};
+
 &eth0 {
 	pinctrl-0 = <&rgmii_rx_ctl &rgmii_rx_clk
 				 &rgmii_tx_ctl &rgmii_tx_clk
diff --git a/boards/sensry/ganymed_sk/Kconfig.ganymed_sk b/boards/sensry/ganymed_sk/Kconfig.ganymed_sk
new file mode 100644
index 0000000000000..fd1ea49b9017b
--- /dev/null
+++ b/boards/sensry/ganymed_sk/Kconfig.ganymed_sk
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_GANYMED_SK
+	select SOC_SY120_GBM if BOARD_GANYMED_SK_SY120_GBM
+	select SOC_SY120_GEN1 if BOARD_GANYMED_SK_SY120_GEN1
diff --git a/boards/sensry/ganymed_sk/board.cmake b/boards/sensry/ganymed_sk/board.cmake
new file mode 100644
index 0000000000000..876aa967780b2
--- /dev/null
+++ b/boards/sensry/ganymed_sk/board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+board_set_flasher_ifnset(sy1xx)
+board_finalize_runner_args(sy1xx)
diff --git a/boards/sensry/ganymed_sk/board.yml b/boards/sensry/ganymed_sk/board.yml
new file mode 100644
index 0000000000000..4bcdb1ff36226
--- /dev/null
+++ b/boards/sensry/ganymed_sk/board.yml
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+board:
+  name: ganymed_sk
+  full_name: Ganymed Starter Kit (SK)
+  vendor: sensry
+  socs:
+    - name: sy120_gbm
+    - name: sy120_gen1
diff --git a/boards/sensry/ganymed_sk/doc/img/ganymed_sk.webp b/boards/sensry/ganymed_sk/doc/img/ganymed_sk.webp
new file mode 100644
index 0000000000000..639a9136f3fa4
Binary files /dev/null and b/boards/sensry/ganymed_sk/doc/img/ganymed_sk.webp differ
diff --git a/boards/sensry/ganymed_sk/doc/index.rst b/boards/sensry/ganymed_sk/doc/index.rst
new file mode 100644
index 0000000000000..fbddec63913c7
--- /dev/null
+++ b/boards/sensry/ganymed_sk/doc/index.rst
@@ -0,0 +1,118 @@
+.. zephyr:board:: ganymed_sk
+
+.. _ganymed_sk:
+
+Overview
+********
+
+.. note::
+
+   All software for the Ganymed StarterKit (SK) is experimental and hardware availability
+   is restricted to the participants in the limited sampling program.
+
+The Ganymed board hardware provides support for the Ganymed sy1xx series IoT multicore
+RISC-V SoC with optional sensor level.
+
+Hardware
+********
+
+* 32-Bit RISC-V 1+8-core processor, up to 500MHz
+
+  * 1x Data Acquisition Unit
+  * 8x Data Processing Unit
+  * Event Bus
+  * MicroDMA
+
+* 4096 KB Global SRAM
+* 64 KB Secure SRAM
+* 512 KB Global MRAM
+* 512 KB Secure MRAM
+* CLOCK
+* Peripherals
+
+    * :abbr:`32x GPIO (General Purpose Input Output)`
+    * :abbr:`4x TWIM (I2C-compatible two-wire interface with MicroDMA)`
+    * 4x I2S
+    * :abbr:`7x SPI (Serial Peripheral Interface with MicroDMA)`
+    * :abbr:`3x UART (Universal receiver-transmitter with MicroDMA)`
+    * :abbr:`1x TSN (Time sensitive networking ethernet MAC with MicroDMA)`
+    * 1x CAN-FD
+    * 3x ADC
+* Power section for on-board power generation and power measurement (selectable)
+
+    * USB type-C
+    * external 5V power source
+* 40-pin JTAG connector (compatible to Olimex ARM-JTAG-OCD-H)
+* USB over FTDI (connected to UART0)
+* Header for all I/Os and configuration
+
+* Assembly options for the SoC
+
+  * SY120-GBM - Generic Base Module without top level sensors
+  * SY120-GEN1 - Generic Module type 1 with top level sensors (see below)
+
+The ``ganymed-sk/sy120-gen1`` comes with additional on-board sensors.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+For more detailed description please refer to `Ganymed StarterKit Board Documentation`_
+
+
+Programming and Testing
+***********************
+
+.. zephyr:board-supported-runners::
+
+Building
+========
+
+Applications for the ``ganymed_sk/sy120_gbm`` board can be
+built and flashed in the usual way. See
+:ref:`build_an_application` and :ref:`application_run` for more details on
+building and running.
+
+Building the :zephyr:code-sample:`hello_world` sample:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :board: ganymed_sk/sy120_gbm
+   :goals: build
+   :compact:
+
+
+Flashing
+========
+
+Test the Ganymed with a :zephyr:code-sample:`hello_world` sample.
+
+Flash the zephyr image:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: samples/hello_world
+   :goals: flash
+   :west-args: --dev-id /dev/ttyUSB0
+   :compact:
+
+
+Testing
+=======
+
+Then attach a serial console, ex. minicom / picocom / putty; Reset the target.
+The sample output should be:
+
+.. code-block:: console
+
+    Hello World! ganymed_sk/sy120_gbm
+
+
+References
+**********
+
+.. target-notes::
+
+.. _`Ganymed StarterKit Board Documentation`: https://docs.sensry.net/datasheets/sy120-bob/
diff --git a/boards/sensry/ganymed_sk/ganymed_sk_sy120-pinctrl.dtsi b/boards/sensry/ganymed_sk/ganymed_sk_sy120-pinctrl.dtsi
new file mode 100644
index 0000000000000..09a8fa16f8835
--- /dev/null
+++ b/boards/sensry/ganymed_sk/ganymed_sk_sy120-pinctrl.dtsi
@@ -0,0 +1,202 @@
+/* Copyright (c) 2025 sensry.io */
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include <zephyr/dt-bindings/pinctrl/sy1xx-pinctrl.h>
+
+&pinctrl {
+
+	/* UART0 */
+	/omit-if-no-ref/ uart0_tx: uart0_tx {
+		pinmux = <SY1XX_UART0_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ uart0_rx: uart0_rx {
+		pinmux = <SY1XX_UART0_PAD_CFG0 SY1XX_PAD(1)>;
+		input-enable;
+	};
+
+	/* UART1 */
+	/omit-if-no-ref/ uart1_tx: uart1_tx {
+		pinmux = <SY1XX_UART1_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ uart1_rx: uart1_rx {
+		pinmux = <SY1XX_UART1_PAD_CFG0 SY1XX_PAD(1)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ uart1_cts: uart1_cts {
+		pinmux = <SY1XX_UART1_PAD_CFG0 SY1XX_PAD(2)>;
+	};
+
+	/omit-if-no-ref/ uart1_rts: uart1_rts {
+		pinmux = <SY1XX_UART1_PAD_CFG0 SY1XX_PAD(3)>;
+		input-enable;
+		bias-pull-up;
+	};
+
+	/* UART2 */
+	/omit-if-no-ref/ uart2_tx: uart2_tx {
+		pinmux = <SY1XX_UART2_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ uart2_rx: uart2_rx {
+		pinmux = <SY1XX_UART2_PAD_CFG0 SY1XX_PAD(1)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ uart2_cts: uart2_cts {
+		pinmux = <SY1XX_UART2_PAD_CFG0 SY1XX_PAD(2)>;
+	};
+
+	/omit-if-no-ref/ uart2_rts: uart2_rts {
+		pinmux = <SY1XX_UART2_PAD_CFG0 SY1XX_PAD(3)>;
+		input-enable;
+		bias-pull-up;
+	};
+
+	/* I2C Port 0 */
+	/omit-if-no-ref/ i2c0_scl: i2c0_scl {
+		pinmux = <SY1XX_I2C0_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c0_sda: i2c0_sda {
+		pinmux = <SY1XX_I2C0_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
+	/* I2C Port 1 */
+	/omit-if-no-ref/ i2c1_scl: i2c1_scl {
+		pinmux = <SY1XX_I2C1_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c1_sda: i2c1_sda {
+		pinmux = <SY1XX_I2C1_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
+	/* I2C Port 2 */
+	/omit-if-no-ref/ i2c2_scl: i2c2_scl {
+		pinmux = <SY1XX_I2C2_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c2_sda: i2c2_sda {
+		pinmux = <SY1XX_I2C2_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
+	/* I2C Port 3 */
+	/omit-if-no-ref/ i2c3_scl: i2c3_scl {
+		pinmux = <SY1XX_I2C3_PAD_CFG0 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ i2c3_sda: i2c3_sda {
+		pinmux = <SY1XX_I2C3_PAD_CFG0 SY1XX_PAD(1)>;
+	};
+
+	/* MDIO */
+	/omit-if-no-ref/ mdio_io: mdio_io {
+		pinmux = <SY1XX_RGMII0_PAD_CFG3 SY1XX_PAD(0)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ mdio_clk: mdio_clk {
+		pinmux = <SY1XX_RGMII0_PAD_CFG3 SY1XX_PAD(1)>;
+	};
+
+	/* RGMII */
+	/omit-if-no-ref/ rgmii_rx_ctl: rgmii_rx_ctl {
+		pinmux = <SY1XX_RGMII0_PAD_CFG0 SY1XX_PAD(0)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ rgmii_rx_clk: rgmii_rx_clk {
+		pinmux = <SY1XX_RGMII0_PAD_CFG0 SY1XX_PAD(1)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ rgmii_tx_ctl: rgmii_tx_ctl {
+		pinmux = <SY1XX_RGMII0_PAD_CFG0 SY1XX_PAD(2)>;
+	};
+
+	/omit-if-no-ref/ rgmii_tx_clk: rgmii_tx_clk {
+		pinmux = <SY1XX_RGMII0_PAD_CFG0 SY1XX_PAD(3)>;
+	};
+
+	/omit-if-no-ref/ rgmii_txd0: rgmii_txd0 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG1 SY1XX_PAD(0)>;
+	};
+
+	/omit-if-no-ref/ rgmii_txd1: rgmii_txd1 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG1 SY1XX_PAD(1)>;
+	};
+
+	/omit-if-no-ref/ rgmii_txd2: rgmii_txd2 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG1 SY1XX_PAD(2)>;
+	};
+
+	/omit-if-no-ref/ rgmii_txd3: rgmii_txd3 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG1 SY1XX_PAD(3)>;
+	};
+
+	/omit-if-no-ref/ rgmii_rxd0: rgmii_rxd0 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG2 SY1XX_PAD(0)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ rgmii_rxd1: rgmii_rxd1 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG2 SY1XX_PAD(1)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ rgmii_rxd2: rgmii_rxd2 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG2 SY1XX_PAD(2)>;
+		input-enable;
+	};
+
+	/omit-if-no-ref/ rgmii_rxd3: rgmii_rxd3 {
+		pinmux = <SY1XX_RGMII0_PAD_CFG2 SY1XX_PAD(3)>;
+		input-enable;
+	};
+};
+
+
+&uart0 {
+	pinctrl-0 = <&uart0_tx &uart0_rx>;
+	pinctrl-names = "default";
+};
+
+&uart1 {
+	pinctrl-0 = <&uart1_tx &uart1_rx &uart1_cts &uart1_rts>;
+	pinctrl-names = "default";
+};
+
+&uart2 {
+	pinctrl-0 = <&uart2_tx &uart2_rx &uart2_cts &uart2_rts>;
+	pinctrl-names = "default";
+};
+
+&i2c0 {
+	pinctrl-0 = <&i2c0_scl &i2c0_sda>;
+	pinctrl-names = "default";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_scl &i2c1_sda>;
+	pinctrl-names = "default";
+};
+
+&i2c2 {
+	pinctrl-0 = <&i2c2_scl &i2c2_sda>;
+	pinctrl-names = "default";
+};
+
+&i2c3 {
+	pinctrl-0 = <&i2c3_scl &i2c3_sda>;
+	pinctrl-names = "default";
+};
+
+&eth0 {
+	pinctrl-0 = <&rgmii_rx_ctl &rgmii_rx_clk
+				 &rgmii_tx_ctl &rgmii_tx_clk
+				 &rgmii_txd0 &rgmii_txd1 &rgmii_txd2 &rgmii_txd3
+				 &rgmii_rxd0 &rgmii_rxd1 &rgmii_rxd2 &rgmii_rxd3>;
+	pinctrl-names = "default";
+};
diff --git a/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm.dts b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm.dts
new file mode 100644
index 0000000000000..b587927127cf2
--- /dev/null
+++ b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm.dts
@@ -0,0 +1,54 @@
+/* Copyright (c) 2025 sensry.io */
+/* SPDX-License-Identifier: Apache-2.0 */
+
+/dts-v1/;
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+#include <sensry/ganymed-sy1xx.dtsi>
+#include "ganymed_sk_sy120-pinctrl.dtsi"
+
+/ {
+	aliases {
+		led0 = &green_led;
+	};
+
+	chosen {
+		zephyr,code-partition = &l2_ram_text;
+		zephyr,sram = &l2_ram_data;
+
+		zephyr,console = &uart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		green_led: led_0 {
+			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+			label = "User LED";
+		};
+	};
+};
+
+&mdio0 {
+	status = "okay";
+
+	pinctrl-0 = <&mdio_clk &mdio_io>;
+	pinctrl-names = "default";
+
+	pyh0: phy@0b {
+		compatible = "microchip,vsc8541";
+		reg = <0x0b>;
+		status = "okay";
+
+		reset-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+
+		microchip,interface-type = "rgmii";
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	phy-handle = <&pyh0>;
+};
diff --git a/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm.yaml b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm.yaml
new file mode 100644
index 0000000000000..0c38ad787cbcc
--- /dev/null
+++ b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: ganymed_sk/sy120_gbm
+vendor: sensry
+name: Ganymed family starter kit board with SY120_GBM chip equipped
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - spi
+  - i2c
diff --git a/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm_defconfig b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm_defconfig
new file mode 100644
index 0000000000000..7162c610fc2ab
--- /dev/null
+++ b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gbm_defconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1.dts b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1.dts
new file mode 100644
index 0000000000000..b587927127cf2
--- /dev/null
+++ b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1.dts
@@ -0,0 +1,54 @@
+/* Copyright (c) 2025 sensry.io */
+/* SPDX-License-Identifier: Apache-2.0 */
+
+/dts-v1/;
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+#include <sensry/ganymed-sy1xx.dtsi>
+#include "ganymed_sk_sy120-pinctrl.dtsi"
+
+/ {
+	aliases {
+		led0 = &green_led;
+	};
+
+	chosen {
+		zephyr,code-partition = &l2_ram_text;
+		zephyr,sram = &l2_ram_data;
+
+		zephyr,console = &uart0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		green_led: led_0 {
+			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+			label = "User LED";
+		};
+	};
+};
+
+&mdio0 {
+	status = "okay";
+
+	pinctrl-0 = <&mdio_clk &mdio_io>;
+	pinctrl-names = "default";
+
+	pyh0: phy@0b {
+		compatible = "microchip,vsc8541";
+		reg = <0x0b>;
+		status = "okay";
+
+		reset-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+
+		microchip,interface-type = "rgmii";
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	phy-handle = <&pyh0>;
+};
diff --git a/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1.yaml b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1.yaml
new file mode 100644
index 0000000000000..ebf95cc42c215
--- /dev/null
+++ b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: ganymed_sk/sy120_gen1
+vendor: sensry
+name: Ganymed family starter kit board with SY120_GEN1 chip equipped
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+supported:
+  - gpio
+  - uart
+  - spi
+  - i2c
diff --git a/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1_defconfig b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1_defconfig
new file mode 100644
index 0000000000000..7162c610fc2ab
--- /dev/null
+++ b/boards/sensry/ganymed_sk/ganymed_sk_sy120_gen1_defconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/shields/adafruit_pca9685/adafruit_pca9685.overlay b/boards/shields/adafruit_pca9685/adafruit_pca9685.overlay
index 45c20a7283073..8707059f21a36 100644
--- a/boards/shields/adafruit_pca9685/adafruit_pca9685.overlay
+++ b/boards/shields/adafruit_pca9685/adafruit_pca9685.overlay
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <dt-bindings/pwm/pwm.h>
+
 &arduino_i2c {
 	status = "okay";
 
diff --git a/boards/shields/arduino_giga_display_shield/Kconfig.defconfig b/boards/shields/arduino_giga_display_shield/Kconfig.defconfig
new file mode 100644
index 0000000000000..67fc0f5a2f656
--- /dev/null
+++ b/boards/shields/arduino_giga_display_shield/Kconfig.defconfig
@@ -0,0 +1,27 @@
+# Copyright (c) 2025 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_ARDUINO_GIGA_DISPLAY_SHIELD
+
+if LVGL
+
+config INPUT
+	default y
+
+config LV_Z_BITS_PER_PIXEL
+	default 16
+
+config LV_DPI_DEF
+	default 128
+
+config LV_Z_FLUSH_THREAD
+	default y
+
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_16
+
+endchoice
+
+endif # LVGL
+
+endif # SHIELD_ARDUINO_GIGA_DISPLAY_SHIELD
diff --git a/boards/shields/arduino_giga_display_shield/Kconfig.shield b/boards/shields/arduino_giga_display_shield/Kconfig.shield
new file mode 100644
index 0000000000000..16714a397c941
--- /dev/null
+++ b/boards/shields/arduino_giga_display_shield/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_ARDUINO_GIGA_DISPLAY_SHIELD
+	def_bool $(shields_list_contains,arduino_giga_display_shield)
diff --git a/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.conf b/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.conf
new file mode 100644
index 0000000000000..881770e9f68d1
--- /dev/null
+++ b/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.conf
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MEMC=y
+CONFIG_STM32_LTDC_RGB565=y
+CONFIG_DISPLAY_INIT_PRIORITY=87
+CONFIG_STM32_LTDC_DISABLE_FMC_BANK1=y
+CONFIG_INPUT_GT911_INTERRUPT=y
+CONFIG_STM32_LTDC_FB_USE_SHARED_MULTI_HEAP=y
diff --git a/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.defconfig b/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.defconfig
new file mode 100644
index 0000000000000..d3a6c64d367d4
--- /dev/null
+++ b/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.defconfig
@@ -0,0 +1,22 @@
+# Copyright (c) 2025 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_ARDUINO_GIGA_DISPLAY_SHIELD
+
+if LVGL
+
+# Double frame buffer maintained by lvgl.
+config STM32_LTDC_FB_NUM
+	default 0
+
+config LV_Z_DOUBLE_VDB
+	default y
+
+config LV_Z_FULL_REFRESH
+	default y
+
+endchoice
+
+endif # LVGL
+
+endif # SHIELD_ARDUINO_GIGA_DISPLAY_SHIELD
diff --git a/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.overlay b/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.overlay
new file mode 100644
index 0000000000000..72fe8031f71f1
--- /dev/null
+++ b/boards/shields/arduino_giga_display_shield/boards/arduino_giga_r1_m7.overlay
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/display/panel.h>
+
+/ {
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&gt911>;
+	};
+
+	aliases {
+		accel0 = &gt911;
+	};
+
+	chosen {
+		zephyr,display = &zephyr_lcd_controller;
+		zephyr,touch = &gt911;
+	};
+};
+
+&sdram1 {
+	/* Frame buffer memory cache will cause screen flickering. */
+	zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>;
+};
+
+&zephyr_lcd_controller {
+	status = "okay";
+	ext-sdram = <&sdram1>;
+	width = <480>;
+	height = <800>;
+	def-back-color-red = <0>;
+	def-back-color-green = <0>;
+	def-back-color-blue = <0>;
+	pixel-format = <PANEL_PIXEL_FORMAT_RGB_565>;
+
+	disp-on-gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>;
+	bl-ctrl-gpios = <&gpiob 12 GPIO_ACTIVE_HIGH>;
+
+	/* sitronix, st7701 */
+	display-timings {
+		compatible = "zephyr,panel-timing";
+		hsync-active = <1>;
+		vsync-active = <0>;
+		de-active = <0>;
+		pixelclk-active = <0>;
+		hback-porch = <40>;
+		hsync-len = <32>;
+		hfront-porch = <8>;
+		vback-porch = <6>;
+		vsync-len = <8>;
+		vfront-porch = <9>;
+	};
+};
+
+/* ltdc uses pll3_r as pixel clock */
+&pll3 {
+	status = "okay";
+	clocks = <&clk_hse>;
+	div-m = <16>;
+	mul-n = <110>;
+	div-p = <2>;
+	div-q = <2>;
+	div-r = <4>; /* 27.5 MHz */
+};
+
+&zephyr_mipi_dsi {
+	status = "okay";
+
+	pll-ndiv = <125>;
+	pll-idf = <4>;
+	pll-odf = <0>;
+
+	de-active-high;
+	largest-packet-size = <0>;
+
+	phy-timings = <35 35 35 35 0 10>;
+};
+
+&i2c4 {
+	pinctrl-0 = <&i2c4_scl_pb6 &i2c4_sda_ph12>;
+	pinctrl-names = "default";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	status = "okay";
+
+	gt911: gt911@5d {
+		compatible = "goodix,gt911";
+		reg = <0x5d>;
+		alt-addr = <0x14>;
+		reset-gpios = <&gpioi 2 GPIO_ACTIVE_LOW>;
+		irq-gpios = <&gpioi 1 GPIO_ACTIVE_HIGH>;
+	};
+};
diff --git a/boards/shields/arduino_giga_display_shield/doc/img/ASX00039_00.default_1000x750.webp b/boards/shields/arduino_giga_display_shield/doc/img/ASX00039_00.default_1000x750.webp
new file mode 100644
index 0000000000000..b149f1535ce44
Binary files /dev/null and b/boards/shields/arduino_giga_display_shield/doc/img/ASX00039_00.default_1000x750.webp differ
diff --git a/boards/shields/arduino_giga_display_shield/doc/index.rst b/boards/shields/arduino_giga_display_shield/doc/index.rst
new file mode 100644
index 0000000000000..b2834b23520de
--- /dev/null
+++ b/boards/shields/arduino_giga_display_shield/doc/index.rst
@@ -0,0 +1,53 @@
+.. _arduino_giga_display_shield:
+
+Arduino GIGA Display Shield
+###########################
+
+Overview
+********
+
+The Arduino GIGA Display Shield is an extension for the Arduino GIGA R1 WiFi board.
+It provides a convenient way to add a display to your projects by offering connectors
+for various display modules, including DSI and DPI interfaces.
+Additionally, it exposes connectors for the camera interface and includes a microSD card slot.
+
+The front of the shield is equipped with the KD040WVFID026-01-C025A panel, a 3.97-inch
+TFT display with a resolution of 480*800 pixels. The panel also features a capacitive
+multi-touch screen with a GT911 controller accessible over I2C.
+
+The shield can be connected to the Arduino GIGA R1 WiFi board via the high-density connectors.
+
+More information about the shield can be found at `Arduino GIGA Display Shield website`_.
+
+.. figure:: img/ASX00039_00.default_1000x750.webp
+     :align: center
+
+     Arduino GIGA Display Shield
+
+Requirements
+************
+
+This shield can only be used with the Arduino GIGA R1 WiFi board, which provides the
+necessary connectors and interfaces for display and camera modules.
+The board must define node aliases for the required peripherals (e.g., I2C, SPI, DSI)
+to properly interface with the shield.
+
+Programming
+***********
+
+Include ``--shield arduino_giga_display_shield`` when you invoke ``west build``
+for projects utilizing this shield. For example:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/display/lvgl
+   :board: arduino_giga_r1_wifi
+   :shield: arduino_giga_display_shield
+   :goals: build
+
+References
+**********
+
+.. target-notes::
+
+.. _Arduino GIGA Display Shield website:
+   https://docs.arduino.cc/hardware/giga-display-shield/
diff --git a/boards/shields/arduino_giga_display_shield/giga_display_shield.overlay b/boards/shields/arduino_giga_display_shield/giga_display_shield.overlay
new file mode 100644
index 0000000000000..5da125332dbd7
--- /dev/null
+++ b/boards/shields/arduino_giga_display_shield/giga_display_shield.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&zephyr_mipi_dsi {
+	st7701: st7701@0 {
+		status = "okay";
+		compatible = "sitronix,st7701";
+		reg = <0x0>;
+		height = <800>;
+		width = <480>;
+		data-lanes = <2>;
+		pixel-format = <MIPI_DSI_PIXFMT_RGB565>;
+		rotation = <0>;
+		gip-e0 = [E0 00 00 02];
+		gip-e1 = [E1 08 00 0A 00 07 00 09 00 00 33 33];
+		gip-e2 = [E2 00 00 00 00 00 00 00 00 00 00 00 00 00];
+		gip-e3 = [E3 00 00 33 33];
+		gip-e4 = [E4 44 44];
+		gip-e5 = [E5 0E 60 A0 A0 10 60 A0 A0 0A 60 A0 A0 0C 60 A0 A0];
+		gip-e6 = [E6 00 00 33 33];
+		gip-e7 = [E7 44 44];
+		gip-e8 = [E8 0D 60 A0 A0 0F 60 A0 A0 09 60 A0 A0 0B 60 A0 A0];
+		gip-eb = [EB 02 01 E4 E4 44 00 40];
+		gip-ec = [EC 02 01];
+		gip-ed = [ED AB 89 76 54 01 FF FF FF FF FF FF 10 45 67 98 BA];
+		gip-ed = [ED AB 89 76 54 01 FF FF FF FF FF FF 10 45 67 98 BA];
+		pvgamctrl = [B0 40 C9 91 0D 12 07 02 09 09 1F 04 50 0F E4 29 DF];
+		nvgamctrl = [B1 40 CB D0 11 92 07 00 08 07 1C 06 53 12 63 EB DF];
+
+		display-timings {
+			compatible = "zephyr,panel-timing";
+			hsync-active = <1>;
+			vsync-active = <0>;
+			de-active = <0>;
+			pixelclk-active = <0>;
+			hback-porch = <40>;
+			hsync-len = <32>;
+			hfront-porch = <8>;
+			vback-porch = <6>;
+			vsync-len = <8>;
+			vfront-porch = <9>;
+		};
+	};
+};
diff --git a/boards/shields/eval_ad4052_ardz/Kconfig.shield b/boards/shields/eval_ad4052_ardz/Kconfig.shield
new file mode 100644
index 0000000000000..c53e991ee5a2a
--- /dev/null
+++ b/boards/shields/eval_ad4052_ardz/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_EVAL_AD4052_ARDZ
+	def_bool $(shields_list_contains,eval_ad4052_ardz)
diff --git a/boards/shields/eval_ad4052_ardz/boards/apard32690_max32690_m4.overlay b/boards/shields/eval_ad4052_ardz/boards/apard32690_max32690_m4.overlay
new file mode 100644
index 0000000000000..eadfaa8d4695c
--- /dev/null
+++ b/boards/shields/eval_ad4052_ardz/boards/apard32690_max32690_m4.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc4052_eval_ad4052_ardz 0>;
+	};
+};
diff --git a/boards/shields/eval_ad4052_ardz/doc/index.rst b/boards/shields/eval_ad4052_ardz/doc/index.rst
new file mode 100644
index 0000000000000..771920affdc3b
--- /dev/null
+++ b/boards/shields/eval_ad4052_ardz/doc/index.rst
@@ -0,0 +1,52 @@
+.. _eval_ad4052_ardz:
+
+EVAL-AD4052-ARDZ
+#################
+
+Overview
+********
+
+The EVAL-AD4052-ARDZ is a 16-Bit SAR ADC Arduino shield powered
+by the Analog Devices AD4052.
+
+Programming
+***********
+
+Set ``--shield eval_ad4052_ardz`` when you invoke ``west build``. For example:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/drivers/adc/
+   :board: apard32690/max32690/m4
+   :shield: eval_ad4052_ardz
+   :goals: build
+
+Requirements
+************
+
+This shield can only be used with a board which provides a configuration for
+Arduino connectors and defines node aliases for SPI and GPIO interfaces (see
+:ref:`shields` for more details).
+
+References
+**********
+
+- `EVAL-AD4052-ARDZ product page`_
+- `EVAL-AD4052-ARDZ user guide`_
+- `EVAL-AD4052-ARDZ schematic`_
+- `AD4052 product page`_
+- `AD4052 data sheet`_
+
+.. _EVAL-AD4052-ARDZ product page:
+   https://www.analog.com/en/resources/evaluation-hardware-and-software/evaluation-boards-kits/eval-ad4052-ardz.html#eb-overview
+
+.. _EVAL-AD4052-ARDZ user guide:
+   https://www.analog.com/media/en/technical-documentation/user-guides/eval-ad4050-ad4052-ug-2222.pdf
+
+.. _EVAL-AD4052-ARDZ schematic:
+   https://www.analog.com/media/en/evaluation-documentation/evaluation-design-files/eval-ad4052-ardz-designsupport-files.zip
+
+.. _AD4052 product page:
+   https://www.analog.com/en/products/ad4052.html
+
+.. _AD4052 data sheet:
+   https://www.analog.com/media/en/technical-documentation/data-sheets/ad4052-ad4058.pdf
diff --git a/boards/shields/eval_ad4052_ardz/eval_ad4052_ardz.overlay b/boards/shields/eval_ad4052_ardz/eval_ad4052_ardz.overlay
new file mode 100644
index 0000000000000..856bdf9877c9e
--- /dev/null
+++ b/boards/shields/eval_ad4052_ardz/eval_ad4052_ardz.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&arduino_spi {
+	status = "okay";
+
+	adc4052_eval_ad4052_ardz: adc4052@0 {
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(2)>;
+		gp1-gpios = <&arduino_header 14 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+		gp0-gpios = <&arduino_header 15 (GPIO_PULL_DOWN)>;
+		conversion-gpios = <&arduino_header 12 (GPIO_ACTIVE_HIGH | MAX32_GPIO_VSEL_VDDIOH)>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		#io-channel-cells = <1>;
+		status = "okay";
+		compatible = "adi,ad405x-adc";
+
+		channel@0 {
+			reg = <0>;
+			zephyr,gain = "ADC_GAIN_1";
+			zephyr,reference = "ADC_REF_INTERNAL";
+			zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+			zephyr,resolution = <16>;
+			zephyr,vref-mv = <2500>;
+		};
+	};
+};
diff --git a/boards/shields/frdm_cr20a/doc/index.rst b/boards/shields/frdm_cr20a/doc/index.rst
index 244d34df0bcdf..c03ae31155094 100644
--- a/boards/shields/frdm_cr20a/doc/index.rst
+++ b/boards/shields/frdm_cr20a/doc/index.rst
@@ -60,6 +60,9 @@ Set ``--shield frdm_cr20a`` when you invoke ``west build``. For example:
    :shield: frdm_cr20a
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-CR20A Website:
    https://www.nxp.com/support/developer-resources/evaluation-and-development-boards/freedom-development-boards/wireless-connectivy/freedom-development-board-for-mcr20a-wireless-transceiver:FRDM-CR20A
 
diff --git a/boards/shields/frdm_kw41z/doc/index.rst b/boards/shields/frdm_kw41z/doc/index.rst
index 6f471295e6207..f710197c64a62 100644
--- a/boards/shields/frdm_kw41z/doc/index.rst
+++ b/boards/shields/frdm_kw41z/doc/index.rst
@@ -64,6 +64,9 @@ host controller interface (HCI):
       :shield: frdm_kw41z
       :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/frdm_stbc_agm01/doc/index.rst b/boards/shields/frdm_stbc_agm01/doc/index.rst
index e477ba85e6453..3b7043ed594c2 100644
--- a/boards/shields/frdm_stbc_agm01/doc/index.rst
+++ b/boards/shields/frdm_stbc_agm01/doc/index.rst
@@ -60,6 +60,9 @@ Set ``--shield frdm_stbc_agm01`` when you invoke ``west build``. For example:
    :shield: frdm_stbc_agm01
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 .. _FRDM-STBC-AGM01 Website:
    https://www.nxp.com/design/development-boards/freedom-development-boards/sensors/sensor-toolbox-development-boards-for-a-9-axis-solution-using-fxas21002c-and-fxos8700cq:FRDM-STBC-AGM01
 
diff --git a/boards/shields/g1120b0mipi/doc/index.rst b/boards/shields/g1120b0mipi/doc/index.rst
index 8f23e7e43b53b..51287b6f3f147 100644
--- a/boards/shields/g1120b0mipi/doc/index.rst
+++ b/boards/shields/g1120b0mipi/doc/index.rst
@@ -59,6 +59,9 @@ example:
    :shield: g1120b0mipi
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/lcd_par_s035/Kconfig.shield b/boards/shields/lcd_par_s035/Kconfig.shield
index 4dba938831b0a..aef614a8b27bb 100644
--- a/boards/shields/lcd_par_s035/Kconfig.shield
+++ b/boards/shields/lcd_par_s035/Kconfig.shield
@@ -2,4 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SHIELD_LCD_PAR_S035
-	def_bool $(shields_list_contains,lcd_par_s035_8080)
+	def_bool $(shields_list_contains,lcd_par_s035_spi) ||\
+		$(shields_list_contains,lcd_par_s035_8080)
diff --git a/boards/shields/lcd_par_s035/boards/frdm_rw612.overlay b/boards/shields/lcd_par_s035/boards/frdm_rw612.overlay
new file mode 100644
index 0000000000000..0f7a831e66022
--- /dev/null
+++ b/boards/shields/lcd_par_s035/boards/frdm_rw612.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&lcdic {
+	/* Enable byte swapping */
+	nxp,swap-bytes;
+	/* Raise the timer0 ratio to enable longer reset delay */
+	nxp,timer0-ratio = <15>;
+	/* Lower timer1 ratio to enable shorter TE delay */
+	nxp,timer1-ratio = <0>;
+};
diff --git a/boards/shields/lcd_par_s035/doc/index.rst b/boards/shields/lcd_par_s035/doc/index.rst
index 6e29a798b5dfb..e7302e3fc1c37 100644
--- a/boards/shields/lcd_par_s035/doc/index.rst
+++ b/boards/shields/lcd_par_s035/doc/index.rst
@@ -16,14 +16,13 @@ Requirements
 ************
 
 This shield can only be used with FRDM-X evaluation kits with a parallel LCD
-connector or a PMOD connector. Currently only the parallel LCD connector is
-enabled.
+connector or a PMOD connector.
 
 Programming
 ***********
 
-Set ``--shield lcd_par_s035_8080`` when you invoke ``west build``. For
-example:
+Set ``--shield lcd_par_s035_8080`` or ``--shield lcd_par_s035_spi`` when you
+invoke ``west build``. For example:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/display
@@ -31,6 +30,9 @@ example:
    :shield: lcd_par_s035_8080
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/lcd_par_s035/lcd_par_s035_spi.overlay b/boards/shields/lcd_par_s035/lcd_par_s035_spi.overlay
new file mode 100644
index 0000000000000..3ae939df7ada6
--- /dev/null
+++ b/boards/shields/lcd_par_s035/lcd_par_s035_spi.overlay
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/mipi_dbi/mipi_dbi.h>
+#include <zephyr/dt-bindings/spi/spi.h>
+
+/{
+	chosen {
+		zephyr,display = &st7796s;
+		zephyr,touch = &gt911_lcd_par_s035;
+	};
+
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&gt911_lcd_par_s035>;
+		swap-xy;
+		invert-y;
+	};
+};
+
+&nxp_pmod_touch_panel_i2c {
+	status = "okay";
+
+	gt911_lcd_par_s035: gt911-lcd_par_s035@5d {
+		compatible = "goodix,gt911";
+		reg = <0x5d>;
+		irq-gpios = <&nxp_lcd_pmod_connector 12 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&zephyr_mipi_dbi_spi {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	st7796s: st7796s@0 {
+		compatible = "sitronix,st7796s";
+		reg = <0>;
+		/*
+		 * Display supports minimum write cycle time of 66ns. This
+		 * means we can clock the LCDIC module at 30MHz, as
+		 * the minimum write duration will be 2x the module
+		 * clock. Note that this frequency is too fast for reading
+		 * from the display module
+		 */
+		mipi-max-frequency = <30000000>;
+		mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
+		duplex = <SPI_HALF_DUPLEX>;
+		height = <320>;
+		width = <480>;
+		invert-mode = "1-dot";
+		frmctl1 = [80 10];
+		bpc = [1F 50 00 20];
+		dfc = [8A 07 3B];
+		pwr1 = [80 64];
+		pwr2 = <0x13>;
+		pwr3 = <0xA7>;
+		vcmpctl = <0x09>;
+		doca = [40 8A 00 00 29 19 A5 33];
+		pgc = [F0 06 0B 07 06 05 2E 33 47 3A 17 16 2E 31];
+		ngc = [F0 09 0D 09 08 23 2E 33 46 38 13 13 2C 32];
+		madctl = <0x28>;
+		color-invert;
+	};
+};
diff --git a/boards/shields/nxp_btb44_ov5640/doc/index.rst b/boards/shields/nxp_btb44_ov5640/doc/index.rst
index 07a7d24e7d1a3..2fc16104377b7 100644
--- a/boards/shields/nxp_btb44_ov5640/doc/index.rst
+++ b/boards/shields/nxp_btb44_ov5640/doc/index.rst
@@ -125,6 +125,9 @@ Set ``--shield nxp_btb44_ov5640`` when you invoke ``west build``. For example:
    :shield: nxp_btb44_ov5640
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/rk043fn02h_ct/doc/index.rst b/boards/shields/rk043fn02h_ct/doc/index.rst
index 6b80c91f72c2d..9e398b7734817 100644
--- a/boards/shields/rk043fn02h_ct/doc/index.rst
+++ b/boards/shields/rk043fn02h_ct/doc/index.rst
@@ -96,6 +96,9 @@ example:
    :shield: rk043fn02h_ct
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/rk043fn66hs_ctg/doc/index.rst b/boards/shields/rk043fn66hs_ctg/doc/index.rst
index b600afedc30dc..1191f2a22f01d 100644
--- a/boards/shields/rk043fn66hs_ctg/doc/index.rst
+++ b/boards/shields/rk043fn66hs_ctg/doc/index.rst
@@ -96,6 +96,9 @@ example:
    :shield: rk043fn66hs_ctg
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/rk055hdmipi4m/doc/index.rst b/boards/shields/rk055hdmipi4m/doc/index.rst
index 32975c5c9626f..17bf9ea4a34ad 100644
--- a/boards/shields/rk055hdmipi4m/doc/index.rst
+++ b/boards/shields/rk055hdmipi4m/doc/index.rst
@@ -59,6 +59,9 @@ example:
    :shield: rk055hdmipi4m
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig b/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig
index 938ebb3b070fd..27b6d9befc44d 100644
--- a/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig
+++ b/boards/shields/rk055hdmipi4ma0/Kconfig.defconfig
@@ -14,7 +14,7 @@ endif # DISPLAY
 
 if LVGL
 
-# Configure LVGL to use touchscreen with KSCAN API
+# Configure LVGL to use touchscreen
 
 config INPUT
 	default y
diff --git a/boards/shields/rk055hdmipi4ma0/doc/index.rst b/boards/shields/rk055hdmipi4ma0/doc/index.rst
index a5d93b454e6e4..d34e4bfa80b94 100644
--- a/boards/shields/rk055hdmipi4ma0/doc/index.rst
+++ b/boards/shields/rk055hdmipi4ma0/doc/index.rst
@@ -59,6 +59,9 @@ example:
    :shield: rk055hdmipi4ma0
    :goals: build
 
+.. include:: ../../../nxp/common/board-footer.rst
+   :start-after: nxp-board-footer
+
 References
 **********
 
diff --git a/boards/shields/rpi_pico_uno_flexypin/doc/index.rst b/boards/shields/rpi_pico_uno_flexypin/doc/index.rst
index f7d19831e6e4a..06aa96c6add86 100644
--- a/boards/shields/rpi_pico_uno_flexypin/doc/index.rst
+++ b/boards/shields/rpi_pico_uno_flexypin/doc/index.rst
@@ -1,7 +1,7 @@
 .. _rpi_pico_uno_flexypin:
 
-RaspberryPi Pico to UNO FlexyPin Adapter
-########################################
+Raspberry Pi Pico to UNO FlexyPin Adapter
+#########################################
 
 Overview
 ********
@@ -16,10 +16,10 @@ to the Arduino UNO form factor.
 
 .. image:: img/rpi_pico_uno_flexypin.png
      :align: center
-     :alt: RaspberryPi Pico to UNO FlexyPin Adapter
+     :alt: Raspberry Pi Pico to UNO FlexyPin Adapter
 
-Pins Assignment of the RaspberryPi Pico to UNO FlexyPin Adapter
-===============================================================
+Pins Assignment of the Raspberry Pi Pico to UNO FlexyPin Adapter
+================================================================
 
 +---------------------+------------+
 | Rpi-Pico Pin        | UNO Header |
diff --git a/boards/shields/rtk7eka6m3b00001bu/Kconfig.defconfig b/boards/shields/rtk7eka6m3b00001bu/Kconfig.defconfig
new file mode 100644
index 0000000000000..4da6abdda9692
--- /dev/null
+++ b/boards/shields/rtk7eka6m3b00001bu/Kconfig.defconfig
@@ -0,0 +1,39 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_RTK7EKA6M3B00001BU
+
+if LVGL
+
+# Configure LVGL to use touchscreen with input API
+
+config INPUT
+	default y
+
+# LVGL should allocate buffers equal to size of display
+config LV_Z_VDB_SIZE
+	default 100
+
+# Enable double buffering
+config LV_Z_DOUBLE_VDB
+	default y
+
+# Force full refresh. This prevents memory copy associated with partial
+# display refreshes, which is not necessary for the GLCDC driver
+config LV_Z_FULL_REFRESH
+	default y
+
+config LV_Z_BITS_PER_PIXEL
+	default 32
+
+# Use offloaded render thread
+config LV_Z_FLUSH_THREAD
+	default y
+
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_32
+endchoice
+
+endif # LVGL
+
+endif # SHIELD_RTK7EKA6M3B00001BU
diff --git a/boards/shields/rtk7eka6m3b00001bu/Kconfig.shield b/boards/shields/rtk7eka6m3b00001bu/Kconfig.shield
new file mode 100644
index 0000000000000..a880c767f291b
--- /dev/null
+++ b/boards/shields/rtk7eka6m3b00001bu/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_RTK7EKA6M3B00001BU
+	def_bool $(shields_list_contains,rtk7eka6m3b00001bu)
diff --git a/boards/shields/rtk7eka6m3b00001bu/boards/ek_ra8d1.overlay b/boards/shields/rtk7eka6m3b00001bu/boards/ek_ra8d1.overlay
new file mode 100644
index 0000000000000..7c689e77bfef6
--- /dev/null
+++ b/boards/shields/rtk7eka6m3b00001bu/boards/ek_ra8d1.overlay
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	renesas_parallel_graphics_connector: parallel-graphics-connector {
+		compatible = "renesas,ra-parallel-graphics-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map =	<1 0 &ioport4 4 0>,	/* DISP_BLEN */
+				<2 0 &ioport5 11 0>,	/* IIC_SDA */
+				<3 0 &ioport5 10 0>,	/* DISP_INT */
+				<4 0 &ioport5 12 0>,	/* IIC_SCL */
+				<6 0 &ioporta 1 0>;	/* DISP_RST */
+	};
+};
+
+&port_irq3 {
+	interrupts = <90 1>;
+	status = "okay";
+};
+
+&pinctrl {
+	glcdc_default: glcdc_default {
+		group1 {
+			psels = <RA_PSEL(RA_PSEL_GLCDC, 8, 5)>, /* LCDC_TCON0 */
+				<RA_PSEL(RA_PSEL_GLCDC, 8, 7)>, /* LCDC_TCON1 */
+				<RA_PSEL(RA_PSEL_GLCDC, 5, 13)>, /* LCDC_TCON2 */
+				<RA_PSEL(RA_PSEL_GLCDC, 5, 15)>, /* LCDC_TCON3 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 14)>, /* LCDC_DATA00 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 15)>, /* LCDC_DATA01 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 10)>, /* LCDC_DATA02 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 11)>, /* LCDC_DATA03 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 12)>, /* LCDC_DATA04 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 13)>, /* LCDC_DATA05 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 4)>, /* LCDC_DATA06 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 3)>, /* LCDC_DATA07 */
+				<RA_PSEL(RA_PSEL_GLCDC, 9, 2)>, /* LCDC_DATA08 */
+				<RA_PSEL(RA_PSEL_GLCDC, 2, 7)>, /* LCDC_DATA09 */
+				<RA_PSEL(RA_PSEL_GLCDC, 7, 11)>, /* LCDC_DATA10 */
+				<RA_PSEL(RA_PSEL_GLCDC, 7, 12)>, /* LCDC_DATA11 */
+				<RA_PSEL(RA_PSEL_GLCDC, 7, 13)>, /* LCDC_DATA12 */
+				<RA_PSEL(RA_PSEL_GLCDC, 7, 14)>, /* LCDC_DATA13 */
+				<RA_PSEL(RA_PSEL_GLCDC, 7, 15)>, /* LCDC_DATA14 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 7)>, /* LCDC_DATA15 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 6)>, /* LCDC_DATA16 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 5)>, /* LCDC_DATA17 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 1)>, /* LCDC_DATA18 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 4)>, /* LCDC_DATA19 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 3)>, /* LCDC_DATA20 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 2)>, /* LCDC_DATA21 */
+				<RA_PSEL(RA_PSEL_GLCDC, 11, 0)>, /* LCDC_DATA22 */
+				<RA_PSEL(RA_PSEL_GLCDC, 7, 7)>, /* LCDC_DATA23 */
+				<RA_PSEL(RA_PSEL_GLCDC, 8, 6)>, /* LCDC_CLK */
+				<RA_PSEL(RA_PSEL_GLCDC, 5, 14)>; /* LCDC_EXTCLK */
+		};
+	};
+
+	iic1_default: iic1_default {
+		group1 {
+			/* SCL1 SDA1 */
+			psels = <RA_PSEL(RA_PSEL_I2C, 5, 12)>,
+				<RA_PSEL(RA_PSEL_I2C, 5, 11)>;
+			drive-strength = "medium";
+		};
+	};
+};
+
+&zephyr_lcdif {
+	pinctrl-0 = <&glcdc_default>;
+	pinctrl-names = "default";
+	output-pin-hsync = "TCON_PIN_1";
+	output-pin-vsync = "TCON_PIN_0";
+	output-pin-de = "TCON_PIN_2";
+};
+
+&iic1 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	clock-frequency = <DT_FREQ_K(100)>;
+	pinctrl-0 = <&iic1_default>;
+	pinctrl-names = "default";
+};
diff --git a/boards/shields/rtk7eka6m3b00001bu/doc/index.rst b/boards/shields/rtk7eka6m3b00001bu/doc/index.rst
new file mode 100644
index 0000000000000..2ae42ca925501
--- /dev/null
+++ b/boards/shields/rtk7eka6m3b00001bu/doc/index.rst
@@ -0,0 +1,49 @@
+.. _rtk7eka6m3b00001bu:
+
+RTK7EKA6M3B00001BU Display
+##########################
+
+Overview
+********
+
+The Graphics Expansion Board includes a 4.3-inch 480x272 pixel TFT color LCD with a
+capacitive touch overlay.
+
+This display uses a 40-pin connector header.
+
+Pins Assignment of the Renesas RTK7EKA6M3B00001BU Display
+=========================================================
+
++-----------------+--------------------------+
+| Connector Pin   | Function                 |
++=================+==========================+
+| 1               | Display backlight enable |
++-----------------+--------------------------+
+| 2               | Touch ctrl I2C SDA       |
++-----------------+--------------------------+
+| 3               | External interrupt       |
++-----------------+--------------------------+
+| 4               | Touch ctrl I2C SCL       |
++-----------------+--------------------------+
+| 6               | Display reset            |
++-----------------+--------------------------+
+
+Hardware Requirements:
+**********************
+
+Supported Renesas RA boards: EK-RA8D1
+
+- 1 x RA Board
+- 1 x Micro USB cable
+
+Programming
+***********
+
+Set ``--shield=rtk7eka6m3b00001bu`` when you invoke ``west build``. For
+example:
+
+.. zephyr-app-commands::
+   :zephyr-app: tests/drivers/display/display_read_write
+   :board: ek_ra8d1
+   :shield: rtk7eka6m3b00001bu
+   :goals: build
diff --git a/boards/shields/rtk7eka6m3b00001bu/rtk7eka6m3b00001bu.overlay b/boards/shields/rtk7eka6m3b00001bu/rtk7eka6m3b00001bu.overlay
new file mode 100644
index 0000000000000..1a374de75e6d8
--- /dev/null
+++ b/boards/shields/rtk7eka6m3b00001bu/rtk7eka6m3b00001bu.overlay
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/display/panel.h>
+
+/ {
+	chosen {
+		zephyr,display = &zephyr_lcdif;
+	};
+
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		input = <&ft5336_rtk7eka6m3b00001bu>;
+	};
+};
+
+&iic1 {
+	status = "okay";
+	ft5336_rtk7eka6m3b00001bu: ft5336-rtk7eka6m3b00001bu@38 {
+		compatible = "focaltech,ft5336";
+		reg = <0x38>;
+		int-gpios = <&renesas_parallel_graphics_connector 3 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&zephyr_lcdif {
+	status = "okay";
+	width = <480>;
+	height = <272>;
+	input-pixel-format = <PANEL_PIXEL_FORMAT_RGB_888>;
+	output-pixel-format = <PANEL_PIXEL_FORMAT_RGB_888>;
+	display-timings {
+		compatible = "zephyr,panel-timing";
+		hsync-len = <1>;
+		hback-porch = <40>;
+		vsync-len = <1>;
+		vback-porch = <8>;
+		hsync-active = <0>;
+		vsync-active = <0>;
+		de-active = <1>;
+		pixelclk-active = <0>;
+		hfront-porch = <4>;
+		vfront-porch = <35>;
+	};
+	backlight-gpios = <&renesas_parallel_graphics_connector 1 GPIO_ACTIVE_HIGH>;
+};
diff --git a/boards/shields/rtkmipilcdb00000be/boards/ek_ra8d1.overlay b/boards/shields/rtkmipilcdb00000be/boards/ek_ra8d1.overlay
index 4bab6b914dcd1..70e2a1817dd07 100644
--- a/boards/shields/rtkmipilcdb00000be/boards/ek_ra8d1.overlay
+++ b/boards/shields/rtkmipilcdb00000be/boards/ek_ra8d1.overlay
@@ -9,7 +9,7 @@
 		group1 {
 			/* SCL1 SDA1 */
 			psels = <RA_PSEL(RA_PSEL_I2C, 5, 12)>,
-					<RA_PSEL(RA_PSEL_I2C, 5, 11)>;
+				<RA_PSEL(RA_PSEL_I2C, 5, 11)>;
 			drive-strength = "medium";
 		};
 	};
@@ -27,3 +27,23 @@
 &zephyr_lcdif {
 	input-pixel-format = <PANEL_PIXEL_FORMAT_RGB_565>;
 };
+
+&mipi_dsi {
+	status = "okay";
+	pll-div = <1>;
+	pll-mul-int = <50>;
+	pll-mul-frac = "0.00";
+	lp-divisor = <5>;
+	ulps-wakeup-period = <97>;
+	video-mode-delay = <186>;
+	timing = <1183 11 26 40>;
+
+	phys-timing {
+		t-init = <71999>;
+		t-clk-prep = <8>;
+		t-hs-prep = <5>;
+		t-lp-exit = <7>;
+		dphytim4 = <27 1 19 7>;
+		dphytim5 = <19 8 11>;
+	};
+};
diff --git a/boards/shields/rtkmipilcdb00000be/doc/index.rst b/boards/shields/rtkmipilcdb00000be/doc/index.rst
index 4e77512e6d5ac..301a793382dd2 100644
--- a/boards/shields/rtkmipilcdb00000be/doc/index.rst
+++ b/boards/shields/rtkmipilcdb00000be/doc/index.rst
@@ -14,19 +14,19 @@ This display uses a 26 pin connector header.
 Pins Assignment of the Renesas RTKMIPILCDB00000BE MIPI Display
 ==============================================================
 
-+-----------------------+------------------------+
++----------------------+-------------------------+
 | Connector Pin        | Function                |
-+=======================+========================+
++======================+=========================+
 | 14                   | Touch ctrl I2C SDA      |
-+-----------------------+------------------------+
++----------------------+-------------------------+
 | 15                   | Display backlight enable|
-+-----------------------+------------------------+
++----------------------+-------------------------+
 | 16                   | Touch ctrl I2C SCL      |
-+-----------------------+------------------------+
++----------------------+-------------------------+
 | 17                   | External interrupt      |
-+-----------------------+------------------------+
++----------------------+-------------------------+
 | 18                   | Display reset           |
-+-----------------------+------------------------+
++----------------------+-------------------------+
 
 Hardware Requirements:
 **********************
@@ -35,19 +35,6 @@ Supported Renesas RA boards: EK-RA8D1
 - 1 x RA Board
 - 1 x Micro USB cable
 
-Hardware Configuration:
-***********************
-
-The MIPI Graphics Expansion Port (J58) connects the EK-RA8D1 board to the MIPI Graphics Expansion Board
-supplied as part of the kit.
-
-Set the configuration switches (SW1) as below to avoid potential failures.
-		+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-		| SW1-1 PMOD1 | SW1-2 TRACE | SW1-3 CAMERA | SW1-4 ETHA | SW1-5 ETHB | SW1-6 GLCD | SW1-7 SDRAM | SW1-8 I3C |
-		+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-		|     OFF     |     OFF     |      OFF     |     OFF    |     OFF    |     ON     |     ON      |    OFF    |
-		+-------------+-------------+--------------+------------+------------+------------+-------------+-----------+
-
 Programming
 ***********
 
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/boards/st_b_lcd40_dsi1_mb1166/stm32h757i_eval_stm32h757xx_m7.conf b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/st_b_lcd40_dsi1_mb1166/stm32h757i_eval_stm32h757xx_m7.conf
new file mode 100644
index 0000000000000..80af9d85fffb9
--- /dev/null
+++ b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/st_b_lcd40_dsi1_mb1166/stm32h757i_eval_stm32h757xx_m7.conf
@@ -0,0 +1,7 @@
+# Copyright (c) 2023 bytes at work AG
+# Copyright (c) 2024 Erik Andersson <erian747@gmail.com>
+# Copyright (c) 2025 Foss Analytical A/S
+# SPDX-License-Identifier: Apache-2.0
+
+# Initialize after LTDC and MIPI-DSI
+CONFIG_DISPLAY_OTM8009A_INIT_PRIORITY=87
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.conf b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.conf
new file mode 100644
index 0000000000000..8ff1f5b0838d6
--- /dev/null
+++ b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2023 bytes at work AG
+# Copyright (c) 2025 Foss Analytical A/S
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MEMC=y
+CONFIG_STM32_LTDC_ARGB8888=y
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.defconfig b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.defconfig
new file mode 100644
index 0000000000000..a48bcaf437d3e
--- /dev/null
+++ b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.defconfig
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Linumiz
+# Copyright (c) 2025 Foss Analytical A/S
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_STM32H757I_EVAL_STM32H757XX_M7
+
+if LVGL
+
+# Double frame buffer maintained by lvgl.
+config STM32_LTDC_FB_NUM
+	default 0
+
+config LV_Z_DOUBLE_VDB
+	default y
+
+config LV_Z_VDB_CUSTOM_SECTION
+	default y
+
+config LV_Z_FULL_REFRESH
+	default y
+
+endif # LVGL
+
+endif # BOARD_STM32H757I_EVAL_STM32H757XX_M7
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.overlay b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.overlay
new file mode 100644
index 0000000000000..167160594bb2a
--- /dev/null
+++ b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h757i_eval_stm32h757xx_m7.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023 bytes at work AG
+ * Copyright (c) 2025 Foss Analytical A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&sdram2 {
+	/* Frame buffer memory when cached causes screen flickering. */
+	zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>;
+};
+
+&zephyr_lcd_controller {
+	status = "okay";
+	ext-sdram = <&sdram2>;
+	def-back-color-red = <0>;
+	def-back-color-green = <0>;
+	def-back-color-blue = <0>;
+};
+
+/* ltdc uses pll3_r as pixel clock */
+&pll3 {
+	status = "okay";
+	clocks = <&clk_hse>;
+	div-m = <5>;
+	mul-n = <132>;
+	div-p = <2>;
+	div-q = <2>;
+	div-r = <24>; /* 27.5 MHz */
+};
+
+&zephyr_mipi_dsi {
+	status = "okay";
+
+	/* DSI HOST dedicated PLL
+	 * F_VCO = CLK_IN / pll-idf * 2 * pll-ndiv
+	 * PHI = F_VCO / 2 / (1 << pll-odf) = lane_byte_clk
+	 *     = 25 MHz / 5 * 2 * 100 / 2 / (1<<0) / 8 = 62.5 MHz
+	 */
+	pll-ndiv = <100>;
+	pll-idf = <5>;
+	pll-odf = <0>;
+
+	vs-active-high;
+	hs-active-high;
+	de-active-high;
+};
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay
index 5e577214d2749..608ad73a24e4e 100644
--- a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay
+++ b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166.overlay
@@ -59,7 +59,7 @@
 	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
-		int-gpios = <&dsi_lcd_qsh_030 4 0>;
+		int-gpios = <&dsi_lcd_qsh_030 4 GPIO_ACTIVE_LOW>;
 		status = "okay";
 	};
 };
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay
index ddef9b74e0250..3e8a7aa38f99b 100644
--- a/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay
+++ b/boards/shields/st_b_lcd40_dsi1_mb1166/st_b_lcd40_dsi1_mb1166_a09.overlay
@@ -59,7 +59,7 @@
 	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
-		int-gpios = <&dsi_lcd_qsh_030 4 0>;
+		int-gpios = <&dsi_lcd_qsh_030 4 GPIO_ACTIVE_LOW>;
 		status = "okay";
 	};
 };
diff --git a/boards/shields/waveshare_pico_lcd_1_14/Kconfig.defconfig b/boards/shields/waveshare_pico_lcd_1_14/Kconfig.defconfig
new file mode 100644
index 0000000000000..4d03c6d8a4413
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/Kconfig.defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_WAVESHARE_PICO_LCD_1_14 || SHIELD_WAVESHARE_PICO_LCD_1_14_DISPLAY
+
+if DISPLAY
+
+choice ST7789V_PIXEL_FORMAT
+	default ST7789V_RGB565
+endchoice
+
+if LVGL
+
+config LV_DPI_DEF
+	default 242
+
+config LV_Z_BITS_PER_PIXEL
+	default 16
+
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_16
+endchoice
+
+configdefault LV_COLOR_16_SWAP
+	default y
+
+endif # LVGL
+
+endif # DISPLAY
+
+endif # SHIELD_WAVESHARE_PICO_LCD_1_14
diff --git a/boards/shields/waveshare_pico_lcd_1_14/Kconfig.shield b/boards/shields/waveshare_pico_lcd_1_14/Kconfig.shield
new file mode 100644
index 0000000000000..d4e81fed05625
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/Kconfig.shield
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_WAVESHARE_PICO_LCD_1_14
+	def_bool $(shields_list_contains,waveshare_pico_lcd_1_14)
+
+config SHIELD_WAVESHARE_PICO_LCD_1_14_DISPLAY
+	def_bool $(shields_list_contains,waveshare_pico_lcd_1_14_display)
+
+config SHIELD_WAVESHARE_PICO_LCD_1_14_BUTTONS
+	def_bool $(shields_list_contains,waveshare_pico_lcd_1_14_buttons)
diff --git a/boards/shields/waveshare_pico_lcd_1_14/boards/pico_plus2_rp2350b_m33.overlay b/boards/shields/waveshare_pico_lcd_1_14/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..f97a5f748aaee
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* pico_plus2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_lcd_1_14/boards/rpi_pico.overlay b/boards/shields/waveshare_pico_lcd_1_14/boards/rpi_pico.overlay
new file mode 100644
index 0000000000000..29574081340d2
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/boards/rpi_pico.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi1_default: spi1_default {
+		group1 {
+			pinmux = <SPI1_CSN_P9>, <SPI1_SCK_P10>, <SPI1_TX_P11>;
+		};
+	};
+};
+
+&spi1 {
+	pinctrl-0 = < &spi1_default >;
+	pinctrl-names = "default";
+	cs-gpios = <&pico_header 9 GPIO_ACTIVE_LOW>;
+	status = "okay";
+};
diff --git a/boards/shields/waveshare_pico_lcd_1_14/boards/rpi_pico2_rp2350a_m33.overlay b/boards/shields/waveshare_pico_lcd_1_14/boards/rpi_pico2_rp2350a_m33.overlay
new file mode 100644
index 0000000000000..34e8cc4082a76
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/boards/rpi_pico2_rp2350a_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* rpi_pico2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_lcd_1_14/boards/w5500_evb_pico.overlay b/boards/shields/waveshare_pico_lcd_1_14/boards/w5500_evb_pico.overlay
new file mode 100644
index 0000000000000..f7430a242acf3
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/boards/w5500_evb_pico.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* w5500_evb_pico2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_lcd_1_14/boards/w5500_evb_pico2_rp2350a_m33.overlay b/boards/shields/waveshare_pico_lcd_1_14/boards/w5500_evb_pico2_rp2350a_m33.overlay
new file mode 100644
index 0000000000000..f7430a242acf3
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/boards/w5500_evb_pico2_rp2350a_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* w5500_evb_pico2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_lcd_1_14/doc/index.rst b/boards/shields/waveshare_pico_lcd_1_14/doc/index.rst
new file mode 100644
index 0000000000000..6af8fbde23757
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/doc/index.rst
@@ -0,0 +1,66 @@
+.. _waveshare_pico_lcd_1_14:
+
+Waveshare 1.14inch LCD Display Module for Raspberry Pi Pico
+###########################################################
+
+Overview
+********
+
+The Waveshare 1.14inch LCD Display Module for Raspberry Pi Pico is
+a 240x135/65K color IPS LCD module based on the ST7789V controller.
+This module connects via SPI.
+This display module has two buttons and joystick that the user program can use.
+It is convenient for implementing user interfaces.
+
+More information about the shield and Arduino adapter can be found at
+the `Waveshare Pico-LCD-1.14 Module website`_.
+
+Pin Assignments
+===============
+
++-------+-----------+-------------------------------------------+
+| Name  | Function  | Usage                                     |
++=======+===========+===========================================+
+| GP2   | UP        | Joystick Up                               |
++-------+-----------+-------------------------------------------+
+| GP3   | CTRL      | Joystick Center                           |
++-------+-----------+-------------------------------------------+
+| GP8   | LCD_DC    | Data/Command control pin                  |
++-------+-----------+-------------------------------------------+
+| GP9   | LCD_CS    | SPI Chip Select   (SPI1_CSN)              |
++-------+-----------+-------------------------------------------+
+| GP10  | LCD_CLK   | SPI Clock input   (SPI1_SCK)              |
++-------+-----------+-------------------------------------------+
+| GP11  | LCD_DIN   | SPI Data input    (SPI1_TX)               |
++-------+-----------+-------------------------------------------+
+| GP12  | LCD_RST   | Reset                                     |
++-------+-----------+-------------------------------------------+
+| GP13  | LCD_BL    | Backlight                                 |
++-------+-----------+-------------------------------------------+
+| GP15  | GPIO      | User Key A                                |
++-------+-----------+-------------------------------------------+
+| GP17  | GPIO      | User Key 1                                |
++-------+-----------+-------------------------------------------+
+| GP18  | DOWN      | Joystick Down                             |
++-------+-----------+-------------------------------------------+
+| GP20  | RIGHT     | Joystick Right                            |
++-------+-----------+-------------------------------------------+
+
+Programming
+***********
+
+Set ``-DSHIELD=waveshare_pico_lcd_1_14`` when you invoke ``west build``. For example:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/display/lvgl
+   :board: rpi_pico
+   :shield: waveshare_pico_oled_1_14
+   :goals: build
+
+References
+**********
+
+.. target-notes::
+
+.. _Waveshare Pico-LCD-1.14 Module website:
+   https://www.waveshare.com/wiki/Pico-LCD-1.14
diff --git a/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14.overlay b/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14.overlay
new file mode 100644
index 0000000000000..3b809ab510e12
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "waveshare_pico_lcd_1_14_display.overlay"
+#include "waveshare_pico_lcd_1_14_buttons.overlay"
diff --git a/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14_buttons.overlay b/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14_buttons.overlay
new file mode 100644
index 0000000000000..8fd18afad8da6
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14_buttons.overlay
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/lvgl/lvgl.h>
+
+/ {
+	waveshare_pico_lcd_1_14_buttons: waveshare-pico_lcd_1_14-buttons {
+		compatible = "gpio-keys";
+
+		key_a: key_a {
+			label = "User key A";
+			gpios = <&pico_header 15 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_A>;
+		};
+
+		key_b: key_b {
+			label = "User key B";
+			gpios = <&pico_header 17 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_B>;
+		};
+	};
+
+	waveshare_pico_lcd_1_14_joystick: waveshare-pico_lcd_1_14-joystick {
+		compatible = "gpio-keys";
+
+		joystick_enter: joystick_enter {
+			label = "User joystick ENTER";
+			gpios = <&pico_header 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_ENTER>;
+		};
+
+		joystick_right: joystick_right {
+			label = "User joystick RIGHT";
+			gpios = <&pico_header 20 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_RIGHT>;
+		};
+
+		joystick_up: joystick_up {
+			label = "User joystick UP";
+			gpios = <&pico_header  2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_UP>;
+		};
+
+		joystick_down: joystick_down {
+			label = "User joystick DOWN";
+			gpios = <&pico_header  18 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_DOWN>;
+		};
+
+		joystick_left: joystick_left {
+			label = "User joystick LEFT";
+			gpios = <&pico_header 16 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_LEFT>;
+		};
+	};
+
+	aliases {
+		sw0 = &key_a;
+		sw1 = &key_b;
+	};
+};
diff --git a/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14_display.overlay b/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14_display.overlay
new file mode 100644
index 0000000000000..eb027f772bbad
--- /dev/null
+++ b/boards/shields/waveshare_pico_lcd_1_14/waveshare_pico_lcd_1_14_display.overlay
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/mipi_dbi/mipi_dbi.h>
+
+/ {
+	chosen {
+		zephyr,display = &st7789v_waveshare_pico_lcd_1_14;
+	};
+
+	mipi_dbi_waveshare_pico_lcd_1_14 {
+		compatible = "zephyr,mipi-dbi-spi";
+		spi-dev = <&spi1>;
+		dc-gpios = <&pico_header 8 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&pico_header 12 GPIO_ACTIVE_LOW>;
+		write-only;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "okay";
+
+		st7789v_waveshare_pico_lcd_1_14: st7789v@0 {
+			compatible = "sitronix,st7789v";
+			reg = <0>;
+			mipi-max-frequency = <20000000>;
+
+			width = <240>;
+			height = <135>;
+			x-offset = <40>;
+			y-offset = <53>;
+
+			vcom = <0x19>;
+			gctrl = <0x35>;
+			vrhs = <0x12>;
+			vdvs = <0x20>;
+			mdac = <0x77>;
+			gamma = <0x00>;
+			colmod = <0x05>;
+			lcm = <0x2c>;
+			porch-param = [0c 0c 00 33 33];
+			cmd2en-param = [5a 69 02 00];
+			pwctrl1-param = [a4 a1];
+			pvgam-param = [d0 04 0d 11 13 2b 3f 54 4c 18 0d 0b 1f 23];
+			nvgam-param = [d0 04 0c 11 13 2c 3f 44 51 2f 1f 1f 20 23];
+			ram-param = [00 F0];
+			rgb-param = [40 02 14];
+			mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
+			status = "okay";
+		};
+	};
+
+	lcd_backlight_en {
+		compatible = "regulator-fixed";
+		regulator-name = "lcd_backlight_enable";
+		enable-gpios = <&pico_header 13 GPIO_ACTIVE_HIGH>;
+		regulator-boot-on;
+	};
+};
diff --git a/boards/shields/waveshare_pico_oled_1_3/Kconfig.defconfig b/boards/shields/waveshare_pico_oled_1_3/Kconfig.defconfig
new file mode 100644
index 0000000000000..81883a4658fdd
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/Kconfig.defconfig
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_WAVESHARE_PICO_OLED_1_3
+
+if DISPLAY
+
+if LVGL
+
+config LV_DPI_DEF
+	default 110
+
+config LV_Z_BITS_PER_PIXEL
+	default 1
+
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_1
+endchoice
+
+endif # LVGL
+
+endif # DISPLAY
+
+endif # SHIELD_WAVESHARE_PICO_OLED_1_3
diff --git a/boards/shields/waveshare_pico_oled_1_3/Kconfig.shield b/boards/shields/waveshare_pico_oled_1_3/Kconfig.shield
new file mode 100644
index 0000000000000..205293098eb88
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/Kconfig.shield
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_WAVESHARE_PICO_OLED_1_3
+	def_bool $(shields_list_contains,waveshare_pico_oled_1_3)
+
+config SHIELD_WAVESHARE_PICO_OLED_1_3_DISPLAY
+	def_bool $(shields_list_contains,waveshare_pico_oled_1_3_display)
+
+config SHIELD_WAVESHARE_PICO_OLED_1_3_BUTTONS
+	def_bool $(shields_list_contains,waveshare_pico_oled_1_3_buttons)
diff --git a/boards/shields/waveshare_pico_oled_1_3/boards/pico_plus2_rp2350b_m33.overlay b/boards/shields/waveshare_pico_oled_1_3/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..f97a5f748aaee
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* pico_plus2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_oled_1_3/boards/rpi_pico.overlay b/boards/shields/waveshare_pico_oled_1_3/boards/rpi_pico.overlay
new file mode 100644
index 0000000000000..154456fbaaaca
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/boards/rpi_pico.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	i2c1_default: i2c1_default {
+		waveshare_pico_oled_1_3_group1 {
+			pinmux = <I2C1_SDA_P6>, <I2C1_SCL_P7>;
+			input-enable;
+			input-schmitt-enable;
+		};
+	};
+};
+
+&i2c1 {
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/shields/waveshare_pico_oled_1_3/boards/rpi_pico2_rp2350a_m33.overlay b/boards/shields/waveshare_pico_oled_1_3/boards/rpi_pico2_rp2350a_m33.overlay
new file mode 100644
index 0000000000000..34e8cc4082a76
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/boards/rpi_pico2_rp2350a_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* rpi_pico2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_oled_1_3/boards/w5500_evb_pico.overlay b/boards/shields/waveshare_pico_oled_1_3/boards/w5500_evb_pico.overlay
new file mode 100644
index 0000000000000..f7430a242acf3
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/boards/w5500_evb_pico.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* w5500_evb_pico2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_oled_1_3/boards/w5500_evb_pico2_rp2350a_m33.overlay b/boards/shields/waveshare_pico_oled_1_3/boards/w5500_evb_pico2_rp2350a_m33.overlay
new file mode 100644
index 0000000000000..f7430a242acf3
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/boards/w5500_evb_pico2_rp2350a_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* w5500_evb_pico2 can use with the rpi_pico configuration. */
+#include "rpi_pico.overlay"
diff --git a/boards/shields/waveshare_pico_oled_1_3/doc/index.rst b/boards/shields/waveshare_pico_oled_1_3/doc/index.rst
new file mode 100644
index 0000000000000..48f101e4fb814
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/doc/index.rst
@@ -0,0 +1,65 @@
+.. _waveshare_pico_oled_1_3:
+
+Waveshare 1.3inch OLED Display Module for Raspberry Pi Pico
+###########################################################
+
+Overview
+********
+
+The Waveshare 1.3inch OLED Display Module for Raspberry Pi Pico is
+a 64x128 vertically long LCD module based on the SinoWealth SH1107 controller.
+This module connects via I2C and optionally can use SPI(need soldering).
+This display module has two buttons that the user program can use.
+It is convenient for implementing user interfaces.
+
+More information about the shield and Arduino adapter can be found at
+the `Waveshare Pico OLED 1.3 Module website`_.
+
+Pin Assignments
+===============
+
++-------+-----------+-------------------------------------------+
+| Name  | Function  | Usage                                     |
++=======+===========+===========================================+
+| GP6   | I2C_SDA   | I2C Data input    (I2C1_SDA)              |
++-------+-----------+-------------------------------------------+
+| GP7   | I2C_SCL   | I2C Clock input   (I2C1_SCL)              |
++-------+-----------+-------------------------------------------+
+| GP8   | OLED_DC   | Data/Command control pin (optional)       |
++-------+-----------+-------------------------------------------+
+| GP9   | OLED_CS   | SPI Chip Select   (SPI1_CSN, optional)    |
++-------+-----------+-------------------------------------------+
+| GP10  | OLED_CLK  | SPI Clock input   (SPI1_SCK, optional)    |
++-------+-----------+-------------------------------------------+
+| GP11  | OLED_DIN  | SPI Data input    (SPI1_TX, optional)     |
++-------+-----------+-------------------------------------------+
+| GP12  | OLED_RST  | Reset                                     |
++-------+-----------+-------------------------------------------+
+| GP15  | GPIO      | User Key 0                                |
++-------+-----------+-------------------------------------------+
+| GP17  | GPIO      | User Key 1                                |
++-------+-----------+-------------------------------------------+
+
+.. note::
+   The SPI interface is not available by default.
+   Switch the J1, J2, and J3 jumper by moving 0-ohm registers
+   to the SPI side to enable SPI.
+
+Programming
+***********
+
+Set ``-DSHIELD=waveshare_pico_oled_1_3`` when you invoke ``west build``. For example:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/display/lvgl
+   :board: rpi_pico
+   :shield: waveshare_pico_oled_1_3
+   :goals: build
+
+References
+**********
+
+.. target-notes::
+
+.. _Waveshare Pico OLED 1.3 Module website:
+   https://www.waveshare.com/wiki/Pico-OLED-1.3
diff --git a/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3.overlay b/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3.overlay
new file mode 100644
index 0000000000000..dd449e18bd39c
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "waveshare_pico_oled_1_3_display.overlay"
+#include "waveshare_pico_oled_1_3_buttons.overlay"
diff --git a/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3_buttons.overlay b/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3_buttons.overlay
new file mode 100644
index 0000000000000..96d3b76735aca
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3_buttons.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/lvgl/lvgl.h>
+
+/ {
+	buttons {
+		compatible = "gpio-keys";
+
+		key0: key0 {
+			label = "User Key 0";
+			gpios = <&pico_header 15 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		key1: key1 {
+			label = "User Key 1";
+			gpios = <&pico_header 17 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+	aliases {
+		sw0 = &key0;
+	};
+};
diff --git a/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3_display.overlay b/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3_display.overlay
new file mode 100644
index 0000000000000..78da3f6c17929
--- /dev/null
+++ b/boards/shields/waveshare_pico_oled_1_3/waveshare_pico_oled_1_3_display.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	chosen {
+		zephyr,display = &sh1107_waveshare_pico_oled_1_3;
+	};
+};
+
+&i2c1 {
+	sh1107_waveshare_pico_oled_1_3: sh1107@3c {
+		compatible = "sinowealth,sh1106";
+		reg = <0x3c>;
+
+		width = <64>;
+		height = <128>;
+		segment-offset = <0>;
+		page-offset = <0>;
+		display-offset = <0x20>;
+		multiplex-ratio = <63>;
+		prechargep = <0x22>;
+		segment-remap;
+		com-invdir;
+		reset-gpios = <&pico_header 12 GPIO_ACTIVE_LOW>;
+
+		status = "okay";
+	};
+};
diff --git a/boards/shields/x_nucleo_iks01a3/x_nucleo_iks01a3.overlay b/boards/shields/x_nucleo_iks01a3/x_nucleo_iks01a3.overlay
index 5db40cb32673a..abc28041acc28 100644
--- a/boards/shields/x_nucleo_iks01a3/x_nucleo_iks01a3.overlay
+++ b/boards/shields/x_nucleo_iks01a3/x_nucleo_iks01a3.overlay
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
 / {
 	aliases {
 		magn0 = &lis2mdl_1e_x_nucleo_iks01a3;
diff --git a/boards/sifive/hifive1/doc/index.rst b/boards/sifive/hifive1/doc/index.rst
index dcd9a2948ef28..96336cd99107d 100644
--- a/boards/sifive/hifive1/doc/index.rst
+++ b/boards/sifive/hifive1/doc/index.rst
@@ -23,6 +23,8 @@ and `HiFive1 Rev B <https://www.sifive.com/boards/hifive1-rev-b>`__.
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/sifive/hifive_unleashed/doc/index.rst b/boards/sifive/hifive_unleashed/doc/index.rst
index e6450ac1f6c75..8336d7da2791c 100644
--- a/boards/sifive/hifive_unleashed/doc/index.rst
+++ b/boards/sifive/hifive_unleashed/doc/index.rst
@@ -9,6 +9,8 @@ multi-core 64bit RISC-V SoC.
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/sifive/hifive_unmatched/doc/index.rst b/boards/sifive/hifive_unmatched/doc/index.rst
index bc2447104b2ba..4a151a8c8edd9 100644
--- a/boards/sifive/hifive_unmatched/doc/index.rst
+++ b/boards/sifive/hifive_unmatched/doc/index.rst
@@ -9,6 +9,8 @@ multi-core 64bit RISC-V SoC.
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/silabs/dev_kits/sim3u1xx_dk/doc/index.rst b/boards/silabs/dev_kits/sim3u1xx_dk/doc/index.rst
index da8bb3cac5e9b..8cc622d66b2e5 100644
--- a/boards/silabs/dev_kits/sim3u1xx_dk/doc/index.rst
+++ b/boards/silabs/dev_kits/sim3u1xx_dk/doc/index.rst
@@ -40,26 +40,7 @@ For more information about the SiM3U167 SoC and the SiM3U1xx board, refer to the
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | dma                                 |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -91,6 +72,8 @@ Connections and IOs
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/dev_kits/sltb004a/doc/index.rst b/boards/silabs/dev_kits/sltb004a/doc/index.rst
index 14795756afc37..b53f3b6fe9c56 100644
--- a/boards/silabs/dev_kits/sltb004a/doc/index.rst
+++ b/boards/silabs/dev_kits/sltb004a/doc/index.rst
@@ -43,39 +43,7 @@ For more information about the EFR32MG12 SoC and Thunderboard Sense 2 board:
 Supported Features
 ==================
 
-The sltb004a board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port-polling                    |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | true random number generator        |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/dev_kits/sltb004a/sltb004a_defconfig`
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -140,6 +108,8 @@ purpose application serial data transfer with this interface.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/dev_kits/sltb009a/doc/index.rst b/boards/silabs/dev_kits/sltb009a/doc/index.rst
index 8be84aefc6036..285bd1b6bc224 100644
--- a/boards/silabs/dev_kits/sltb009a/doc/index.rst
+++ b/boards/silabs/dev_kits/sltb009a/doc/index.rst
@@ -26,30 +26,7 @@ For more information about the WGM160P and SLTB009A board:
 Supported Features
 ==================
 
-The efm32gg_sltb009a board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port-polling                    |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/dev_kits/sltb009a/sltb009a_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -99,6 +76,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/dev_kits/sltb010a/Kconfig.defconfig b/boards/silabs/dev_kits/sltb010a/Kconfig.defconfig
index fac4f17b12e8e..b9edc20d7cf1d 100644
--- a/boards/silabs/dev_kits/sltb010a/Kconfig.defconfig
+++ b/boards/silabs/dev_kits/sltb010a/Kconfig.defconfig
@@ -1,6 +1,11 @@
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
 # SPDX-License-Identifier: Apache-2.0
 
+if BOARD_SLTB010A
+
+configdefault LOG_BACKEND_SWO_FREQ_HZ
+	default 875000
+
 if SOC_GECKO_USE_RAIL
 
 config FPU
@@ -24,3 +29,5 @@ endif # BT
 
 config REGULATOR
 	default y if SI7210
+
+endif
diff --git a/boards/silabs/dev_kits/sltb010a/doc/index.rst b/boards/silabs/dev_kits/sltb010a/doc/index.rst
index eb7dcfb24a040..a9fcdd7164371 100644
--- a/boards/silabs/dev_kits/sltb010a/doc/index.rst
+++ b/boards/silabs/dev_kits/sltb010a/doc/index.rst
@@ -42,40 +42,7 @@ For more information about the EFR32BG SoC and Thunderboard EFR32BG22 board:
 Supported Features
 ==================
 
-The sltb010a board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| SPI(M/S)  | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | ldma                                |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | true random number generator        |
-+-----------+------------+-------------------------------------+
-| I2C(M/S)  | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | bluetooth                           |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/dev_kits/sltb010a/sltb010a_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -122,6 +89,8 @@ board.
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 Flashing an application
 -----------------------
 
diff --git a/boards/silabs/dev_kits/sltb010a/sltb010a-pinctrl.dtsi b/boards/silabs/dev_kits/sltb010a/sltb010a-pinctrl.dtsi
index 435ca5a0cf46f..756653bdcf5dd 100644
--- a/boards/silabs/dev_kits/sltb010a/sltb010a-pinctrl.dtsi
+++ b/boards/silabs/dev_kits/sltb010a/sltb010a-pinctrl.dtsi
@@ -39,4 +39,12 @@
 			bias-pull-up;
 		};
 	};
+
+	itm_default: itm_default {
+		group0 {
+			pins = <GPIO_SWV_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+	};
 };
diff --git a/boards/silabs/dev_kits/sltb010a/thunderboard.dtsi b/boards/silabs/dev_kits/sltb010a/thunderboard.dtsi
index 0ec7c11aa157c..771a45e1e9391 100644
--- a/boards/silabs/dev_kits/sltb010a/thunderboard.dtsi
+++ b/boards/silabs/dev_kits/sltb010a/thunderboard.dtsi
@@ -68,6 +68,12 @@
 	clock-frequency = <76800000>;
 };
 
+&itm {
+	pinctrl-0 = <&itm_default>;
+	pinctrl-names = "default";
+	swo-ref-frequency = <DT_FREQ_K(76800)>;
+};
+
 &pstate_em3 {
 	status = "disabled";
 };
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig b/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig
index 13cb5b0c77c49..325d26f1f4aaf 100644
--- a/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig
+++ b/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig
@@ -3,6 +3,9 @@
 
 if BOARD_XG24_DK2601B
 
+configdefault LOG_BACKEND_SWO_FREQ_HZ
+	default 875000
+
 if SOC_GECKO_USE_RAIL
 
 config FPU
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/doc/index.rst b/boards/silabs/dev_kits/xg24_dk2601b/doc/index.rst
index 769692c66fe2e..8df7d25dc8f98 100644
--- a/boards/silabs/dev_kits/xg24_dk2601b/doc/index.rst
+++ b/boards/silabs/dev_kits/xg24_dk2601b/doc/index.rst
@@ -38,41 +38,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+------------------------------------+
-| Interface | Controller | Driver/Component                   |
-+===========+============+====================================+
-| MPU       | on-chip    | memory protection unit             |
-+-----------+------------+------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller |
-+-----------+------------+------------------------------------+
-| SYSTICK   | on-chip    | systick                            |
-+-----------+------------+------------------------------------+
-| SYSRTC    | on-chip    | counter, timer                     |
-+-----------+------------+------------------------------------+
-| MSC       | on-chip    | flash memory                       |
-+-----------+------------+------------------------------------+
-| GPIO      | on-chip    | gpio                               |
-+-----------+------------+------------------------------------+
-| EUSART    | on-chip    | serial, spi                        |
-+-----------+------------+------------------------------------+
-| USART     | on-chip    | serial, spi                        |
-+-----------+------------+------------------------------------+
-| LDMA      | on-chip    | dma                                |
-+-----------+------------+------------------------------------+
-| SE        | on-chip    | entropy                            |
-+-----------+------------+------------------------------------+
-| WDOG      | on-chip    | watchdog                           |
-+-----------+------------+------------------------------------+
-| I2C       | on-chip    | i2c                                |
-+-----------+------------+------------------------------------+
-| RADIO     | on-chip    | bluetooth                          |
-+-----------+------------+------------------------------------+
-| ACMP      | on-chip    | comparator                         |
-+-----------+------------+------------------------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -128,6 +94,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b-pinctrl.dtsi b/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b-pinctrl.dtsi
index 9f49a09574495..a991860ea0f0c 100644
--- a/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b-pinctrl.dtsi
+++ b/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b-pinctrl.dtsi
@@ -40,4 +40,12 @@
 			bias-pull-up;
 		};
 	};
+
+	itm_default: itm_default {
+		group0 {
+			pins = <GPIO_SWV_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+	};
 };
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b.dts b/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b.dts
index 0e5713ce9777a..9fafecd6df1ce 100644
--- a/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b.dts
+++ b/boards/silabs/dev_kits/xg24_dk2601b/xg24_dk2601b.dts
@@ -75,6 +75,12 @@
 	clock-frequency = <78000000>;
 };
 
+&itm {
+	pinctrl-0 = <&itm_default>;
+	pinctrl-names = "default";
+	swo-ref-frequency = <DT_FREQ_M(78)>;
+};
+
 &hfxo {
 	status = "okay";
 	ctune = <140>;
diff --git a/boards/silabs/dev_kits/xg24_ek2703a/Kconfig.defconfig b/boards/silabs/dev_kits/xg24_ek2703a/Kconfig.defconfig
index 53290acffd071..aa088655ef536 100644
--- a/boards/silabs/dev_kits/xg24_ek2703a/Kconfig.defconfig
+++ b/boards/silabs/dev_kits/xg24_ek2703a/Kconfig.defconfig
@@ -3,6 +3,9 @@
 
 if BOARD_XG24_EK2703A
 
+configdefault LOG_BACKEND_SWO_FREQ_HZ
+	default 875000
+
 config CMU_HFXO_FREQ
 	default 39000000
 
diff --git a/boards/silabs/dev_kits/xg24_ek2703a/doc/index.rst b/boards/silabs/dev_kits/xg24_ek2703a/doc/index.rst
index 5161fa1455dde..59befeeec0f51 100644
--- a/boards/silabs/dev_kits/xg24_ek2703a/doc/index.rst
+++ b/boards/silabs/dev_kits/xg24_ek2703a/doc/index.rst
@@ -29,37 +29,7 @@ documents:
 Supported Features
 ==================
 
-The ``xg24_ek2703a`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | semailbox                           |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| I2C(M/S)  | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | bluetooth                           |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | comparator                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -101,6 +71,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a-pinctrl.dtsi b/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a-pinctrl.dtsi
index 30aaa4655ba94..81c23b9a88fda 100644
--- a/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a-pinctrl.dtsi
+++ b/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a-pinctrl.dtsi
@@ -27,4 +27,12 @@
 			bias-pull-up;
 		};
 	};
+
+	itm_default: itm_default {
+		group0 {
+			pins = <GPIO_SWV_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+	};
 };
diff --git a/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a.dts b/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a.dts
index a4bf9f857e5f4..7ebddf29945eb 100644
--- a/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a.dts
+++ b/boards/silabs/dev_kits/xg24_ek2703a/xg24_ek2703a.dts
@@ -64,6 +64,12 @@
 	clock-frequency = <78000000>;
 };
 
+&itm {
+	pinctrl-0 = <&itm_default>;
+	pinctrl-names = "default";
+	swo-ref-frequency = <DT_FREQ_M(78)>;
+};
+
 &hfxo {
 	status = "okay";
 	ctune = <140>;
diff --git a/boards/silabs/dev_kits/xg27_dk2602a/Kconfig.defconfig b/boards/silabs/dev_kits/xg27_dk2602a/Kconfig.defconfig
index fac4f17b12e8e..866eb2483c370 100644
--- a/boards/silabs/dev_kits/xg27_dk2602a/Kconfig.defconfig
+++ b/boards/silabs/dev_kits/xg27_dk2602a/Kconfig.defconfig
@@ -1,6 +1,11 @@
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
 # SPDX-License-Identifier: Apache-2.0
 
+if BOARD_XG27_DK2602A
+
+configdefault LOG_BACKEND_SWO_FREQ_HZ
+	default 875000
+
 if SOC_GECKO_USE_RAIL
 
 config FPU
@@ -24,3 +29,5 @@ endif # BT
 
 config REGULATOR
 	default y if SI7210
+
+endif
diff --git a/boards/silabs/dev_kits/xg27_dk2602a/doc/index.rst b/boards/silabs/dev_kits/xg27_dk2602a/doc/index.rst
index 19123e7bf0af4..eec5ba7c021a7 100644
--- a/boards/silabs/dev_kits/xg27_dk2602a/doc/index.rst
+++ b/boards/silabs/dev_kits/xg27_dk2602a/doc/index.rst
@@ -32,25 +32,7 @@ For more information, refer to these documents:
 Supported Features
 ==================
 
-The xg27_dk2602a board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | ldma                                |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | comparator                          |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Flashing
 ========
@@ -99,6 +81,8 @@ Commander in unattended mode and passes all the necessary arguments to it.
 Programming and Debugging
 =========================
 
+.. zephyr:board-supported-runners::
+
 The sample application :zephyr:code-sample:`hello_world` is used for this example.
 Build the Zephyr kernel and application:
 
diff --git a/boards/silabs/dev_kits/xg27_dk2602a/thunderboard.dtsi b/boards/silabs/dev_kits/xg27_dk2602a/thunderboard.dtsi
index 0ec7c11aa157c..771a45e1e9391 100644
--- a/boards/silabs/dev_kits/xg27_dk2602a/thunderboard.dtsi
+++ b/boards/silabs/dev_kits/xg27_dk2602a/thunderboard.dtsi
@@ -68,6 +68,12 @@
 	clock-frequency = <76800000>;
 };
 
+&itm {
+	pinctrl-0 = <&itm_default>;
+	pinctrl-names = "default";
+	swo-ref-frequency = <DT_FREQ_K(76800)>;
+};
+
 &pstate_em3 {
 	status = "disabled";
 };
diff --git a/boards/silabs/dev_kits/xg27_dk2602a/xg27_dk2602a-pinctrl.dtsi b/boards/silabs/dev_kits/xg27_dk2602a/xg27_dk2602a-pinctrl.dtsi
index 915d9bfe2096a..2d2c481f2f58d 100644
--- a/boards/silabs/dev_kits/xg27_dk2602a/xg27_dk2602a-pinctrl.dtsi
+++ b/boards/silabs/dev_kits/xg27_dk2602a/xg27_dk2602a-pinctrl.dtsi
@@ -39,4 +39,12 @@
 			bias-pull-up;
 		};
 	};
+
+	itm_default: itm_default {
+		group0 {
+			pins = <GPIO_SWV_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+	};
 };
diff --git a/boards/silabs/radio_boards/siwx917_rb4338a/doc/index.rst b/boards/silabs/radio_boards/siwx917_rb4338a/doc/index.rst
index dd6e4bf8bbb27..20dbe472cb139 100644
--- a/boards/silabs/radio_boards/siwx917_rb4338a/doc/index.rst
+++ b/boards/silabs/radio_boards/siwx917_rb4338a/doc/index.rst
@@ -32,23 +32,13 @@ documents:
 Supported Features
 ==================
 
-The ``siwx917_rb4338a`` board supports the following hardware features:
-
-+-----------+------------+------------------------+
-| Interface | Controller | Driver/Component       |
-+===========+============+========================+
-| CMU       | on-chip    | clock control          |
-+-----------+------------+------------------------+
-| MPU       | on-chip    | memory protection unit |
-+-----------+------------+------------------------+
-| NVIC      | on-chip    | interrupt controller   |
-+-----------+------------+------------------------+
-| UART      | on-chip    | serial                 |
-+-----------+------------+------------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
@@ -107,7 +97,7 @@ the board.
    https://www.silabs.com/wireless/wi-fi/siwx917-wireless-socs
 
 .. _SiWG917 Datasheet:
-   https://www.silabs.com/documents/public/data-sheets/siw917x-datasheet.pdf
+   https://www.silabs.com/documents/public/data-sheets/siwg917-datasheet.pdf
 
 .. _SiWG917 Reference Manual:
    https://www.silabs.com/documents/public/reference-manuals/siw917x-family-rm.pdf
diff --git a/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.dts b/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.dts
index f650297426c32..d6620b0402af7 100644
--- a/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.dts
+++ b/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.dts
@@ -20,6 +20,7 @@
 		zephyr,code-partition = &code_partition;
 		zephyr,console = &ulpuart;
 		zephyr,shell-uart = &ulpuart;
+		zephyr,uart-pipe = &ulpuart;
 		zephyr,bt-hci = &bt_hci0;
 	};
 
@@ -106,6 +107,10 @@
 	};
 };
 
+&sysrtc0  {
+	status = "okay";
+};
+
 &bt_hci0 {
 	status = "okay";
 };
diff --git a/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.yaml b/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.yaml
index 602906447c2fd..29a0ddccea59c 100644
--- a/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.yaml
+++ b/boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.yaml
@@ -7,7 +7,6 @@ flash: 1024
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - bluetooth
   - dma
@@ -15,5 +14,7 @@ supported:
   - flash
   - gpio
   - i2c
+  - pwm
+  - watchdog
   - wifi
 vendor: silabs
diff --git a/boards/silabs/radio_boards/slwrb4104a/doc/index.rst b/boards/silabs/radio_boards/slwrb4104a/doc/index.rst
index 1cee2ffd5ab55..ac419da806f33 100644
--- a/boards/silabs/radio_boards/slwrb4104a/doc/index.rst
+++ b/boards/silabs/radio_boards/slwrb4104a/doc/index.rst
@@ -37,33 +37,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/radio_boards/slwrb4104a/slwrb4104a_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -113,6 +87,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/slwrb4161a/doc/index.rst b/boards/silabs/radio_boards/slwrb4161a/doc/index.rst
index 134dbdb3af0a8..f2e0fcdb7b12d 100644
--- a/boards/silabs/radio_boards/slwrb4161a/doc/index.rst
+++ b/boards/silabs/radio_boards/slwrb4161a/doc/index.rst
@@ -32,33 +32,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/radio_boards/slwrb4161a/slwrb4161a_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -107,6 +81,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/slwrb4170a/doc/index.rst b/boards/silabs/radio_boards/slwrb4170a/doc/index.rst
index 9c96d7ec31ec9..54ec7a1985bd3 100644
--- a/boards/silabs/radio_boards/slwrb4170a/doc/index.rst
+++ b/boards/silabs/radio_boards/slwrb4170a/doc/index.rst
@@ -32,33 +32,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/radio_boards/slwrb4170a/slwrb4170a_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -107,6 +81,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/slwrb4180a/doc/index.rst b/boards/silabs/radio_boards/slwrb4180a/doc/index.rst
index d49a5770e4c5b..540c4f967399a 100644
--- a/boards/silabs/radio_boards/slwrb4180a/doc/index.rst
+++ b/boards/silabs/radio_boards/slwrb4180a/doc/index.rst
@@ -34,34 +34,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port-polling                    |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip     | ldma                               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -106,6 +79,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/slwrb4180b/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4180b/Kconfig.defconfig
new file mode 100644
index 0000000000000..9fa20f62d7c0b
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/Kconfig.defconfig
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 Piotr Mienkowski
+# Copyright (c) 2020 TriaGnoSys GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_SLWRB4180B
+
+config LOG_BACKEND_SWO_FREQ_HZ
+	default 875000
+	depends on LOG_BACKEND_SWO
+
+if SOC_GECKO_USE_RAIL
+
+config FPU
+	default y
+
+endif # SOC_GECKO_USE_RAIL
+
+endif # BOARD_SLWRB4180B
diff --git a/boards/silabs/radio_boards/slwrb4180b/Kconfig.slwrb4180b b/boards/silabs/radio_boards/slwrb4180b/Kconfig.slwrb4180b
new file mode 100644
index 0000000000000..b802cf3ae943b
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/Kconfig.slwrb4180b
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Capgemini
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_SLWRB4180B
+	select SOC_PART_NUMBER_EFR32MG21A020F1024IM32
diff --git a/boards/silabs/radio_boards/slwrb4180b/board.cmake b/boards/silabs/radio_boards/slwrb4180b/board.cmake
new file mode 100644
index 0000000000000..9505e42eed40c
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/board.cmake
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=EFR32MG21AxxxF1024")
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+
+board_runner_args(openocd)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+
+board_runner_args(silabs_commander "--device=EFR32MG21A020F1024IM32")
+include(${ZEPHYR_BASE}/boards/common/silabs_commander.board.cmake)
diff --git a/boards/silabs/radio_boards/slwrb4180b/board.yml b/boards/silabs/radio_boards/slwrb4180b/board.yml
new file mode 100644
index 0000000000000..adef398703b34
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: slwrb4180b
+  full_name: EFR32xG21 2.4 GHz 20 dBm (SLWRB4180B)
+  vendor: silabs
+  socs:
+    - name: efr32mg21a020f1024im32
diff --git a/boards/silabs/radio_boards/slwrb4180b/doc/efr32mg21-slwrb4180b.webp b/boards/silabs/radio_boards/slwrb4180b/doc/efr32mg21-slwrb4180b.webp
new file mode 100644
index 0000000000000..cc37a1a574717
Binary files /dev/null and b/boards/silabs/radio_boards/slwrb4180b/doc/efr32mg21-slwrb4180b.webp differ
diff --git a/boards/silabs/radio_boards/slwrb4180b/doc/index.rst b/boards/silabs/radio_boards/slwrb4180b/doc/index.rst
new file mode 100644
index 0000000000000..f47dffab43e26
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/doc/index.rst
@@ -0,0 +1,112 @@
+.. zephyr:board:: slwrb4180b
+
+Overview
+********
+
+The EFR32MG21 Mighty Gecko Radio Board is one of the two
+radio boards delivered with `EFR32-SLWSTK6006A Website`_. It features a
+Wireless System-On-Chip (SoC) from the EFR32MG21 family, built on an
+ARM Cortex®-M33F processor, offering exceptional low-power performance.
+
+The SLWRB4180B radio board is designed to connect seamlessly with
+the Wireless Starter Kit Mainboards BRD4001A and BRD4002A
+
+Hardware
+********
+
+- EFR32MG21A020F1024IM32 Mighty Gecko SoC
+- CPU core: ARM Cortex®-M33 with FPU
+- Flash memory: 1024 kB
+- RAM: 96 kB
+- Transmit power: up to +20 dBm
+- Operation frequency: 2.4 GHz
+- Crystals for LFXO (32.768 kHz) and HFXO (38.4 MHz).
+
+For more information about the EFR32MG21 SoC and BRD4180B board, refer to these
+documents:
+
+- `EFR32MG21 Website`_
+- `EFR32MG21 Datasheet`_
+- `EFR32xG21 Reference Manual`_
+- `EFR32-SLWSTK6006A Website`_
+- `BRD4180B User Guide`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+In the following table, the column **Name** contains Pin names. For example, PD2
+means Pin number 2 on PORTD, as used in the board's datasheets and manuals.
+
++-------+-------------+-------------------------------------+
+| Name  | Function    | Usage                               |
++=======+=============+=====================================+
+| PD2   | GPIO        | LED0                                |
++-------+-------------+-------------------------------------+
+| PD3   | GPIO        | LED1                                |
++-------+-------------+-------------------------------------+
+| PB0   | GPIO        | Push Button PB0                     |
++-------+-------------+-------------------------------------+
+| PB1   | GPIO        | Push Button PB1                     |
++-------+-------------+-------------------------------------+
+| PD4   | GPIO        | Board Controller Enable             |
+|       |             | EFM_BC_EN                           |
++-------+-------------+-------------------------------------+
+| PA5   | USART1_TX   | UART Console EFM_BC_TX US1_TX       |
++-------+-------------+-------------------------------------+
+| PA6   | USART1_RX   | UART Console EFM_BC_RX US1_RX       |
++-------+-------------+-------------------------------------+
+
+The default configuration can be found in
+:zephyr_file:`boards/silabs/radio_boards/slwrb4180b/slwrb4180b_defconfig`
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+
+Connect the BRD4001A or BRD4002A mainboard, with the BRD4180B radio module mounted,
+to your host computer via the USB port.
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: slwrb4180b
+   :goals: flash
+
+Open a serial terminal (minicom, putty, etc.) with the following settings:
+
+- Speed: 115200
+- Data: 8 bits
+- Parity: None
+- Stop bits: 1
+
+Reset the board and you should see the following message in the terminal:
+
+.. code-block:: console
+
+   Hello World! slwrb4180b
+
+
+.. _EFR32-SLWSTK6006A Website:
+   https://www.silabs.com/products/development-tools/wireless/efr32xg21-wireless-starter-kit
+
+.. _BRD4180B User Guide:
+   https://www.silabs.com/documents/public/user-guides/ug427-brd4180b-user-guide.pdf
+
+.. _EFR32MG21 Website:
+   https://www.silabs.com/products/wireless/mesh-networking/efr32mg21-series-2-socs
+
+.. _EFR32MG21 Datasheet:
+   https://www.silabs.com/documents/public/data-sheets/efr32mg21-datasheet.pdf
+
+.. _EFR32xG21 Reference Manual:
+   https://www.silabs.com/documents/public/reference-manuals/efr32xg21-rm.pdf
diff --git a/boards/silabs/radio_boards/slwrb4180b/pre_dt_board.cmake b/boards/silabs/radio_boards/slwrb4180b/pre_dt_board.cmake
new file mode 100644
index 0000000000000..beb76b85552d1
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/pre_dt_board.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2021 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+# SPI is implemented via usart so node name isn't spi@...
+list(APPEND EXTRA_DTC_FLAGS "-Wno-spi_bus_bridge")
diff --git a/boards/silabs/radio_boards/slwrb4180b/slwrb4180b-pinctrl.dtsi b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b-pinctrl.dtsi
new file mode 100644
index 0000000000000..4f8612eb15bd1
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b-pinctrl.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 Capgemini
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dt-bindings/pinctrl/silabs/xg21-pinctrl.h>
+
+&pinctrl {
+	usart0_default: usart0_default {
+		group0 {
+			pins = <USART0_TX_PA5>;
+			drive-push-pull;
+			output-high;
+		};
+		group1 {
+			pins = <USART0_RX_PA6>;
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+};
diff --git a/boards/silabs/radio_boards/slwrb4180b/slwrb4180b.dts b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b.dts
new file mode 100644
index 0000000000000..77654a1f0336d
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b.dts
@@ -0,0 +1,183 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Capgemini
+ *
+ */
+
+/dts-v1/;
+#include <silabs/efr32mg21a020f1024im32.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include "slwrb4180b-pinctrl.dtsi"
+
+/ {
+	model = "Silicon Labs BRD4180B (Wireless Gecko 21 Radio Board)";
+	compatible = "silabs,slwrb4180b", "silabs,efr32mg21";
+
+	chosen {
+		zephyr,console = &usart0;
+		zephyr,shell-uart = &usart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	/* These aliases are provided for compatibility with samples */
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		sw0 = &button0;
+		sw1 = &button1;
+		watchdog0 = &wdog0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led_0 {
+			gpios = <&gpiod 2 0>;
+			label = "LED0";
+		};
+
+		led1: led_1 {
+			gpios = <&gpiod 3 0>;
+			label = "LED1";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		button0: button_0 {
+			gpios = <&gpiob 0 GPIO_ACTIVE_LOW>;
+			label = "BTN0";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		button1: button_1 {
+			gpios = <&gpiob 1 GPIO_ACTIVE_LOW>;
+			label = "BTN1";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+};
+
+&cpu0 {
+	clock-frequency = <76800000>;
+};
+
+&hfxo {
+	status = "okay";
+	ctune = <129>;
+	precision = <50>;
+};
+
+&lfxo {
+	status = "okay";
+	ctune = <79>;
+	precision = <50>;
+};
+
+&hfrcodpll {
+	clock-frequency = <DT_FREQ_K(76800)>;
+	clocks = <&hfxo>;
+	dpll-n = <3839>;
+	dpll-m = <1919>;
+	dpll-edge = "fall";
+	dpll-lock = "phase";
+	dpll-autorecover;
+};
+
+&em23grpaclk {
+	clocks = <&lfxo>;
+};
+
+&em4grpaclk {
+	clocks = <&lfxo>;
+};
+
+&rtccclk {
+	clocks = <&lfxo>;
+};
+
+&wdog0clk {
+	clocks = <&lfxo>;
+};
+
+&wdog1clk {
+	clocks = <&lfxo>;
+};
+
+&usart0 {
+	current-speed = <115200>;
+	pinctrl-0 = <&usart0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&rtcc0 {
+	prescaler = <1>;
+	status = "okay";
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpioa {
+	status = "okay";
+};
+
+&gpiob {
+	status = "okay";
+};
+
+&gpioc {
+	status = "okay";
+};
+
+&gpiod {
+	status = "okay";
+
+	board-controller-enable {
+		gpio-hog;
+		gpios = <4 GPIO_ACTIVE_HIGH>;
+		output-high;
+	};
+};
+
+&wdog0 {
+	status = "okay";
+};
+
+&dma0 {
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(48)>;
+		};
+
+		slot0_partition: partition@c000 {
+			label = "image-0";
+			reg = <0x0000C000 DT_SIZE_K(472)>;
+		};
+
+		slot1_partition: partition@82000 {
+			label = "image-1";
+			reg = <0x00082000 DT_SIZE_K(472)>;
+		};
+
+		storage_partition: partition@F8000 {
+			label = "storage";
+			reg = <0x000F8000 DT_SIZE_K(32)>;
+		};
+	};
+};
diff --git a/boards/silabs/radio_boards/slwrb4180b/slwrb4180b.yaml b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b.yaml
new file mode 100644
index 0000000000000..c6e9d2b90cfb1
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b.yaml
@@ -0,0 +1,18 @@
+identifier: slwrb4180b
+name: EFR32xG21 2.4 GHz 20 dBm Radio Board (SLWRB4180B)
+type: mcu
+arch: arm
+ram: 96
+flash: 1024
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - counter
+  - gpio
+  - nvs
+  - uart
+  - dma
+  - watchdog
+vendor: silabs
diff --git a/boards/silabs/radio_boards/slwrb4180b/slwrb4180b_defconfig b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b_defconfig
new file mode 100644
index 0000000000000..e70f8f5c5197d
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/slwrb4180b_defconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_ARM_MPU=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_GPIO=y
diff --git a/boards/silabs/radio_boards/slwrb4180b/support/openocd.cfg b/boards/silabs/radio_boards/slwrb4180b/support/openocd.cfg
new file mode 100644
index 0000000000000..38409eb70ad79
--- /dev/null
+++ b/boards/silabs/radio_boards/slwrb4180b/support/openocd.cfg
@@ -0,0 +1,25 @@
+if {[info exists env(OPENOCD_INTERFACE)]} {
+	set INTERFACE $env(OPENOCD_INTERFACE)
+} else {
+	# By default connect over Debug USB port using the J-Link interface
+	set INTERFACE "jlink"
+}
+
+source [find interface/$INTERFACE.cfg]
+
+transport select swd
+
+set CHIPNAME efr32
+
+source [find target/efm32.cfg]
+
+$_TARGETNAME configure -event gdb-attach {
+	echo "Debugger attaching: halting execution"
+	reset halt
+	gdb_breakpoint_override hard
+}
+
+$_TARGETNAME configure -event gdb-detach {
+	echo "Debugger detaching: resuming execution"
+	resume
+}
diff --git a/boards/silabs/radio_boards/slwrb4250b/doc/index.rst b/boards/silabs/radio_boards/slwrb4250b/doc/index.rst
index 57a26c65cbf26..8908b8eda389d 100644
--- a/boards/silabs/radio_boards/slwrb4250b/doc/index.rst
+++ b/boards/silabs/radio_boards/slwrb4250b/doc/index.rst
@@ -36,33 +36,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/radio_boards/slwrb4250b/slwrb4250b_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -111,6 +85,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/slwrb4255a/doc/index.rst b/boards/silabs/radio_boards/slwrb4255a/doc/index.rst
index 47cb5a15fbbd9..84ba0aa8d4796 100644
--- a/boards/silabs/radio_boards/slwrb4255a/doc/index.rst
+++ b/boards/silabs/radio_boards/slwrb4255a/doc/index.rst
@@ -32,33 +32,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| SPI(M)    | on-chip    | spi port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/radio_boards/slwrb4255a/slwrb4255a_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -107,6 +81,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/slwrb4321a/doc/index.rst b/boards/silabs/radio_boards/slwrb4321a/doc/index.rst
index ccd82c5387e3c..e61d4f9552999 100644
--- a/boards/silabs/radio_boards/slwrb4321a/doc/index.rst
+++ b/boards/silabs/radio_boards/slwrb4321a/doc/index.rst
@@ -33,37 +33,7 @@ For more information about the WGM160P and SLWSTK6121A board:
 Supported Features
 ==================
 
-The slwrb4321a board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port-polling                    |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/radio_boards/slwrb4321a/slwrb4321a_defconfig`
-
-Other hardware features, including the WF200 WiFi transceiver, are
-currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -110,6 +80,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/radio_boards/xg23_rb4210a/doc/index.rst b/boards/silabs/radio_boards/xg23_rb4210a/doc/index.rst
index b3642243e64af..866b1a9375226 100644
--- a/boards/silabs/radio_boards/xg23_rb4210a/doc/index.rst
+++ b/boards/silabs/radio_boards/xg23_rb4210a/doc/index.rst
@@ -37,39 +37,7 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | ldma                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | semailbox                           |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | comparator                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -131,6 +99,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a-pinctrl.dtsi b/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a-pinctrl.dtsi
index c899c0558f8c0..ec58fdc58f2bc 100644
--- a/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a-pinctrl.dtsi
+++ b/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a-pinctrl.dtsi
@@ -40,4 +40,12 @@
 			bias-pull-up;
 		};
 	};
+
+	itm_default: itm_default {
+		group0 {
+			pins = <GPIO_SWV_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+	};
 };
diff --git a/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a.dts b/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a.dts
index 5dc8423e32f6b..dd94b0dfa360e 100644
--- a/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a.dts
+++ b/boards/silabs/radio_boards/xg23_rb4210a/xg23_rb4210a.dts
@@ -71,6 +71,12 @@
 	clock-frequency = <78000000>;
 };
 
+&itm {
+	pinctrl-0 = <&itm_default>;
+	pinctrl-names = "default";
+	swo-ref-frequency = <DT_FREQ_M(78)>;
+};
+
 &pstate_em3 {
 	status = "disabled";
 };
diff --git a/boards/silabs/radio_boards/xg24_rb4187c/doc/index.rst b/boards/silabs/radio_boards/xg24_rb4187c/doc/index.rst
index ac1dfc1f9a2a7..9d836519b5e84 100644
--- a/boards/silabs/radio_boards/xg24_rb4187c/doc/index.rst
+++ b/boards/silabs/radio_boards/xg24_rb4187c/doc/index.rst
@@ -34,71 +34,13 @@ documents:
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | stimer                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | ldma                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | semailbox                           |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| ACMP      | on-chip    | comparator                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are currently not supported by the port.
-
-Connections and IOs
-===================
-
-In the following table, the column **Name** contains Pin names. For example, PA2
-means Pin number 2 on PORTA, as used in the board's datasheets and manuals.
-
-+-------+-------------+-------------------------------------+
-| Name  | Function    | Usage                               |
-+=======+=============+=====================================+
-| PB2   | GPIO        | LED0                                |
-+-------+-------------+-------------------------------------+
-| PB4   | GPIO        | LED1                                |
-+-------+-------------+-------------------------------------+
-| PB1   | GPIO        | Push Button 0                       |
-+-------+-------------+-------------------------------------+
-| PB3   | GPIO        | Push Button 1                       |
-+-------+-------------+-------------------------------------+
-| PB0   | GPIO        | Board Controller Enable             |
-|       |             | VCOM_ENABLE                         |
-+-------+-------------+-------------------------------------+
-| PA8   | USART0_TX   | UART Console VCOM_TX US0_TX         |
-+-------+-------------+-------------------------------------+
-| PA9   | USART0_RX   | UART Console VCOM_RX US0_RX         |
-+-------+-------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c_defconfig`
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
 
-The EFR32MG24 SoC is configured to use the 39 MHz external oscillator on the
-board.
+The EFR32MG24 SoC is configured to use the HFRCODPLL oscillator at 78 MHz as the system clock,
+locked to the 39 MHz external crystal oscillator on the board.
 
 Serial Port
 ===========
@@ -109,6 +51,8 @@ USART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c-pinctrl.dtsi b/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c-pinctrl.dtsi
index 75e9112e69c1a..67e9032e41893 100644
--- a/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c-pinctrl.dtsi
+++ b/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c-pinctrl.dtsi
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2023 Antmicro <www.antmicro.com>
+ * Copyright (c) 2025 Silicon Laboratories Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -19,4 +20,33 @@
 			silabs,input-filter;
 		};
 	};
+
+	eusart1_default: eusart1_default {
+		group0 {
+			pins = <EUSART1_TX_PC1>, <EUSART1_SCLK_PC3>;
+			drive-push-pull;
+			output-high;
+		};
+		group1 {
+			pins = <EUSART1_RX_PC2>;
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group0 {
+			pins = <I2C0_SCL_PC5>, <I2C0_SDA_PC7>;
+			drive-open-drain;
+			bias-pull-up;
+		};
+	};
+
+	itm_default: itm_default {
+		group0 {
+			pins = <GPIO_SWV_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+	};
 };
diff --git a/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.dts b/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.dts
index 819ed7cd80037..ba9e0a1420a25 100644
--- a/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.dts
+++ b/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.dts
@@ -22,6 +22,7 @@
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
 		zephyr,bt-hci = &bt_hci_silabs;
+		zephyr,display = &ls0xx_ls013b7dh03;
 	};
 
 	/* These aliases are provided for compatibility with samples */
@@ -31,6 +32,7 @@
 		sw0 = &button0;
 		sw1 = &button1;
 		watchdog0 = &wdog0;
+		dht0 = &si7021;
 	};
 
 	leds {
@@ -59,12 +61,24 @@
 		};
 	};
 
+	sensor_enable: sensor_enable {
+		compatible = "regulator-fixed";
+		regulator-name = "sensor_enable";
+		enable-gpios = <&gpiod 3 GPIO_ACTIVE_HIGH>;
+		status = "okay";
+	};
 };
 
 &cpu0 {
 	clock-frequency = <78000000>;
 };
 
+&itm {
+	pinctrl-0 = <&itm_default>;
+	pinctrl-names = "default";
+	swo-ref-frequency = <DT_FREQ_M(78)>;
+};
+
 &pstate_em3 {
 	status = "disabled";
 };
@@ -118,6 +132,53 @@
 	status = "okay";
 };
 
+&eusart1 {
+	compatible = "silabs,eusart-spi";
+	pinctrl-0 = <&eusart1_default>;
+	pinctrl-names = "default";
+	clock-frequency = <DT_FREQ_M(10)>;
+	cs-gpios = <&gpioc 8 GPIO_ACTIVE_HIGH>, <&gpioc 4 GPIO_ACTIVE_LOW>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	ls0xx_ls013b7dh03: ls0xx@0 {
+		compatible = "sharp,ls0xx";
+		spi-max-frequency = <DT_FREQ_K(1100)>;
+		reg = <0>;
+		width = <128>;
+		height = <128>;
+		extcomin-gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>;
+		extcomin-frequency = <60>;
+		disp-en-gpios = <&gpioc 9 GPIO_ACTIVE_HIGH>;
+	};
+
+	mx25r80: mx25r8035f@1 {
+		compatible = "jedec,spi-nor";
+		reg = <1>;
+		spi-max-frequency = <DT_FREQ_M(33)>;
+		size = <DT_SIZE_M(8)>;
+		jedec-id = [c2 28 14];
+		has-dpd;
+		dpd-wakeup-sequence = <30000 20 35000>;
+		mxicy,mx25r-power-mode = "low-power";
+		zephyr,pm-device-runtime-auto;
+	};
+};
+
+&i2c0 {
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	si7021: si7021@40 {
+		compatible = "silabs,si7006";
+		reg = <0x40>;
+		vin-supply = <&sensor_enable>;
+		status = "okay";
+	};
+};
+
 &gpio {
 	location-swo = <0>;
 	status = "okay";
diff --git a/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.yaml b/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.yaml
index 705f74253c93d..d783e3919ec56 100644
--- a/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.yaml
+++ b/boards/silabs/radio_boards/xg24_rb4187c/xg24_rb4187c.yaml
@@ -8,9 +8,11 @@ toolchain:
   - zephyr
   - gnuarmemb
 supported:
+  - adc
   - bluetooth
   - gpio
   - uart
+  - spi
   - dma
   - watchdog
   - comparator
diff --git a/boards/silabs/radio_boards/xg29_rb4412a/doc/index.rst b/boards/silabs/radio_boards/xg29_rb4412a/doc/index.rst
index 85d017f32ffb5..707d79e15f276 100644
--- a/boards/silabs/radio_boards/xg29_rb4412a/doc/index.rst
+++ b/boards/silabs/radio_boards/xg29_rb4412a/doc/index.rst
@@ -19,43 +19,13 @@ Hardware
 Supported Features
 ==================
 
-The ``xg29_rb4412a`` board target supports the following hardware features:
-
-+-----------+------------+------------------------+
-| Interface | Controller | Driver/Component       |
-+===========+============+========================+
-| CMU       | on-chip    | clock control          |
-+-----------+------------+------------------------+
-| MSC       | on-chip    | flash                  |
-+-----------+------------+------------------------+
-| GPIO      | on-chip    | gpio, pin control      |
-+-----------+------------+------------------------+
-| RTCC      | on-chip    | system clock, counter  |
-+-----------+------------+------------------------+
-| MPU       | on-chip    | memory protection unit |
-+-----------+------------+------------------------+
-| NVIC      | on-chip    | interrupt controller   |
-+-----------+------------+------------------------+
-| USART     | on-chip    | serial, spi            |
-+-----------+------------+------------------------+
-| EUSART    | on-chip    | serial, spi            |
-+-----------+------------+------------------------+
-| I2C       | on-chip    | i2c                    |
-+-----------+------------+------------------------+
-| LDMA      | on-chip    | dma                    |
-+-----------+------------+------------------------+
-| WDOG      | on-chip    | watchdog               |
-+-----------+------------+------------------------+
-| SE        | on-chip    | entropy                |
-+-----------+------------+------------------------+
-| RADIO     | on-chip    | bluetooth              |
-+-----------+------------+------------------------+
-| ACMP      | on-chip    | comparator             |
-+-----------+------------+------------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``xg29_rb4412a`` board target can be built, flashed, and debugged in the
 usual way. See :ref:`build_an_application` and :ref:`application_run` for more details on
 building and running.
diff --git a/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a-pinctrl.dtsi b/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a-pinctrl.dtsi
index 1acb655711189..c53b1c2458f0b 100644
--- a/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a-pinctrl.dtsi
+++ b/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a-pinctrl.dtsi
@@ -40,4 +40,12 @@
 			bias-pull-up;
 		};
 	};
+
+	itm_default: itm_default {
+		group0 {
+			pins = <GPIO_SWV_PA3>;
+			drive-push-pull;
+			output-high;
+		};
+	};
 };
diff --git a/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.dts b/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.dts
index c96235a5082e7..e99ae541ff0b6 100644
--- a/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.dts
+++ b/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.dts
@@ -75,6 +75,12 @@
 	clock-frequency = <76800000>;
 };
 
+&itm {
+	pinctrl-0 = <&itm_default>;
+	pinctrl-names = "default";
+	swo-ref-frequency = <DT_FREQ_K(76800)>;
+};
+
 &hfxo {
 	status = "okay";
 	ctune = <140>;
diff --git a/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.yaml b/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.yaml
index 989719eda22a8..ea0a2e3936b7e 100644
--- a/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.yaml
+++ b/boards/silabs/radio_boards/xg29_rb4412a/xg29_rb4412a.yaml
@@ -7,15 +7,15 @@ flash: 1024
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
+  - adc
   - bluetooth
+  - comparator
+  - dma
+  - entropy
   - gpio
+  - flash
+  - spi
   - uart
-  - dma
   - watchdog
-  - comparator
-testing:
-  ignore_tags:
-    - pm
 vendor: silabs
diff --git a/boards/silabs/starter_kits/efm32wg_stk3800/doc/index.rst b/boards/silabs/starter_kits/efm32wg_stk3800/doc/index.rst
index e8f4b9e432a03..0856d97b6bcfb 100644
--- a/boards/silabs/starter_kits/efm32wg_stk3800/doc/index.rst
+++ b/boards/silabs/starter_kits/efm32wg_stk3800/doc/index.rst
@@ -30,29 +30,7 @@ For more information about the EFM32WG SoC and EFM32WG-STK3800 board:
 Supported Features
 ==================
 
-The efm32wg_stk3800 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/starter_kits/efm32wg_stk3800/efm32wg_stk3800_defconfig`
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -97,6 +75,8 @@ UART0 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/starter_kits/slstk3400a/doc/index.rst b/boards/silabs/starter_kits/slstk3400a/doc/index.rst
index 9178651500801..01693d34b74db 100644
--- a/boards/silabs/starter_kits/slstk3400a/doc/index.rst
+++ b/boards/silabs/starter_kits/slstk3400a/doc/index.rst
@@ -33,27 +33,7 @@ See these documents for more information
 Supported Features
 ==================
 
-The efm32hg_slstk3400 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USART     | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/starter_kits/slstk3400a/slstk3400a_defconfig`
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -98,6 +78,8 @@ USART1 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/starter_kits/slstk3401a/doc/index.rst b/boards/silabs/starter_kits/slstk3401a/doc/index.rst
index 8e5fa5fb1eeec..e3805b2b19748 100644
--- a/boards/silabs/starter_kits/slstk3401a/doc/index.rst
+++ b/boards/silabs/starter_kits/slstk3401a/doc/index.rst
@@ -28,35 +28,7 @@ For more information about the EFM32PG SoC and SLSTK3401A board:
 Supported Features
 ==================
 
-The slstk3401a board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/starter_kits/slstk3401a/slstk3401a_defconfig`
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -109,6 +81,8 @@ The EFM32PG SoC has two USARTs and one Low Energy UART (LEUART).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/starter_kits/slstk3402a/doc/index.rst b/boards/silabs/starter_kits/slstk3402a/doc/index.rst
index 3470e9e670157..30bea70c4f6ff 100644
--- a/boards/silabs/starter_kits/slstk3402a/doc/index.rst
+++ b/boards/silabs/starter_kits/slstk3402a/doc/index.rst
@@ -29,41 +29,7 @@ For more information about the EFM32PG SoC and SLSTK3402A board:
 Supported Features
 ==================
 
-The slstk3402a board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port-polling                    |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | true random number generator        |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/starter_kits/slstk3402a/slstk3402a_efm32pg12b500f1024gl125_defconfig`
-
-The default configuration when building using this board to develop for the
-EFM32JG12 SoC can be found in
-:zephyr_file:`boards/silabs/starter_kits/slstk3402a/slstk3402a_efm32jg12b500f1024gl125_defconfig`
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 EFM32 Jade Gecko SoC
 --------------------
@@ -132,6 +98,8 @@ The EFM32PG12 SoC has four USARTs and one Low Energy UART (LEUART).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/silabs/starter_kits/slstk3701a/doc/index.rst b/boards/silabs/starter_kits/slstk3701a/doc/index.rst
index d63c3f3844b3d..ca3d2feb8dc2b 100644
--- a/boards/silabs/starter_kits/slstk3701a/doc/index.rst
+++ b/boards/silabs/starter_kits/slstk3701a/doc/index.rst
@@ -34,36 +34,7 @@ For more information about the EFM32GG11 SoC and SLSTK3701A board:
 Supported Features
 ==================
 
-The slstk3701a board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | memory protection unit              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtcc                                |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c port-polling                    |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/silabs/starter_kits/slstk3701a/slstk3701a_defconfig`
-
-Other hardware features are currently not supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -121,6 +92,8 @@ USART4 is connected to the board controller and is used for the console.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 .. note::
    Before using the kit the first time, you should update the J-Link firmware
    in Simplicity Studio.
diff --git a/boards/sipeed/longan_nano/doc/index.rst b/boards/sipeed/longan_nano/doc/index.rst
index 49a52c00d6526..9acb207cc844e 100644
--- a/boards/sipeed/longan_nano/doc/index.rst
+++ b/boards/sipeed/longan_nano/doc/index.rst
@@ -35,41 +35,7 @@ Hardware
 Supported Features
 ==================
 
-The board configuration supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`gd,gd32-gpio`
-   * - Machine timer
-     - :kconfig:option:`CONFIG_RISCV_MACHINE_TIMER`
-     - :dtcompatible:`riscv,machine-timer`
-   * - Nuclei ECLIC Interrupt Controller
-     - :kconfig:option:`CONFIG_NUCLEI_ECLIC`
-     - :dtcompatible:`nuclei,eclic`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`gd,gd32-pwm`
-   * - USART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`gd,gd32-usart`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`gd,gd32-i2c`
-   * - DAC
-     - :kconfig:option:`CONFIG_DAC`
-     - :dtcompatible:`gd,gd32-dac`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`gd,gd32-adc`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`gd,gd32-spi`
+.. zephyr:board-supported-hw::
 
 The microSD card reader in Longan Nano board is connected to SPI1.
 
@@ -82,6 +48,8 @@ Connect to TX0 (PA9) and RX0 (PA10).
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building & Flashing
 ===================
 
diff --git a/boards/snps/em_starterkit/doc/index.rst b/boards/snps/em_starterkit/doc/index.rst
index 9fc53692b66fd..cbb669a573636 100644
--- a/boards/snps/em_starterkit/doc/index.rst
+++ b/boards/snps/em_starterkit/doc/index.rst
@@ -108,6 +108,8 @@ copy the initialized data section to the data memory if CONFIG_XIP is used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Required Hardware and Software
 ==============================
 
diff --git a/boards/snps/emsdp/doc/index.rst b/boards/snps/emsdp/doc/index.rst
index f300d3723cea2..d880a6ad6da70 100644
--- a/boards/snps/emsdp/doc/index.rst
+++ b/boards/snps/emsdp/doc/index.rst
@@ -117,6 +117,8 @@ multiplexer ARDUINO_MUX_CTRL is in the default mode (GPIO).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Required Hardware and Software
 ==============================
 
diff --git a/boards/snps/hsdk/doc/index.rst b/boards/snps/hsdk/doc/index.rst
index f7d82a9866fb8..9e5dee7556c60 100644
--- a/boards/snps/hsdk/doc/index.rst
+++ b/boards/snps/hsdk/doc/index.rst
@@ -343,6 +343,8 @@ For hardware feature details, refer to : `Designware HS Development Kit website
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Required Hardware and Software
 ==============================
 
diff --git a/boards/snps/hsdk4xd/doc/index.rst b/boards/snps/hsdk4xd/doc/index.rst
index 0808b76ca6d1c..52e88da142a41 100644
--- a/boards/snps/hsdk4xd/doc/index.rst
+++ b/boards/snps/hsdk4xd/doc/index.rst
@@ -340,6 +340,8 @@ For hardware feature details, refer to : `Designware HS4x/HS4xD Development Kit
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Required Hardware and Software
 ==============================
 
diff --git a/boards/snps/iotdk/doc/index.rst b/boards/snps/iotdk/doc/index.rst
index 8176f51618d95..d038451dd05b0 100644
--- a/boards/snps/iotdk/doc/index.rst
+++ b/boards/snps/iotdk/doc/index.rst
@@ -25,6 +25,8 @@ For hardware feature details, refer to : `ARC IoT Development Kit
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Required Hardware and Software
 ==============================
 
diff --git a/boards/snps/nsim/arc_classic/doc/index.rst b/boards/snps/nsim/arc_classic/doc/index.rst
index c3839dfc893cd..b6111d234a335 100644
--- a/boards/snps/nsim/arc_classic/doc/index.rst
+++ b/boards/snps/nsim/arc_classic/doc/index.rst
@@ -68,6 +68,8 @@ I.e. for the multi-core ``nsim/nsim_hs5x/smp`` platform there is only
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Required Hardware and Software
 ==============================
 
diff --git a/boards/snps/nsim/arc_v/doc/index.rst b/boards/snps/nsim/arc_v/doc/index.rst
index a0bc41c2be784..4d6bf6427f60f 100644
--- a/boards/snps/nsim/arc_v/doc/index.rst
+++ b/boards/snps/nsim/arc_v/doc/index.rst
@@ -27,6 +27,8 @@ which options are configured and so will be used on invocation of the simulator.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Required Hardware and Software
 ==============================
 
diff --git a/boards/sparkfun/micromod/board.cmake b/boards/sparkfun/micromod/board.cmake
index 55900ba5975e1..6eed9c98a5811 100644
--- a/boards/sparkfun/micromod/board.cmake
+++ b/boards/sparkfun/micromod/board.cmake
@@ -3,6 +3,7 @@
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/sparkfun/thing_plus/board.cmake b/boards/sparkfun/thing_plus/board.cmake
index a4f45e5cfdf7d..11ad52dbca630 100644
--- a/boards/sparkfun/thing_plus/board.cmake
+++ b/boards/sparkfun/thing_plus/board.cmake
@@ -2,5 +2,6 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF91")
 board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/st/b_g474e_dpow1/doc/index.rst b/boards/st/b_g474e_dpow1/doc/index.rst
index b130b72866320..8d377e784c504 100644
--- a/boards/st/b_g474e_dpow1/doc/index.rst
+++ b/boards/st/b_g474e_dpow1/doc/index.rst
@@ -43,29 +43,7 @@ More information about STM32G474RE can be found here:
 Supported Features
 ==================
 
-The Zephyr b_g474e_dpow1 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| UCPD      | on-chip    | ucpd                                |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/b_g474e_dpow1/b_g474e_dpow1_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -98,6 +76,8 @@ For more details please refer to `B-G474E-DPOW1 Discovery board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The B-G474E-DPOW1 Discovery board includes an ST-LINK/V3E embedded debug tool interface.
 
 Applications for the ``b_g474e_dpow1`` board configuration can be built and
diff --git a/boards/st/b_l072z_lrwan1/doc/index.rst b/boards/st/b_l072z_lrwan1/doc/index.rst
index 06385429700a1..4f2caa6d82812 100644
--- a/boards/st/b_l072z_lrwan1/doc/index.rst
+++ b/boards/st/b_l072z_lrwan1/doc/index.rst
@@ -108,40 +108,7 @@ More information about STM32L072CZ can be found here:
 Supported Features
 ==================
 
-The Zephyr B-L072Z-LRWAN1 Discovery board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| TRNG      | on-chip    | true random number generator        |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| LoRa      | on-module  | sx1276                              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/b_l072z_lrwan1/b_l072z_lrwan1_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -184,6 +151,8 @@ the USB data lines to the MCU, short solder bridges SB15 and SB16.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 B-L072Z-LRWAN1 Discovery board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``b_l072z_lrwan1`` board configuration can be built and
diff --git a/boards/st/b_l4s5i_iot01a/b_l4s5i_iot01a.dts b/boards/st/b_l4s5i_iot01a/b_l4s5i_iot01a.dts
index d7f5adab5bebc..da6bcc44c6a70 100644
--- a/boards/st/b_l4s5i_iot01a/b_l4s5i_iot01a.dts
+++ b/boards/st/b_l4s5i_iot01a/b_l4s5i_iot01a.dts
@@ -239,7 +239,7 @@ zephyr_udc0: &usbotg_fs {
 		     &octospim_p1_io2_pe14 &octospim_p1_io3_pe15>;
 	pinctrl-names = "default";
 
-	dmas = <&dma1 0 40 0x480>; /* request 40 for OCTOSPI1 */
+	dmas = <&dma1 0 40 STM32_DMA_PERIPH_RX>; /* request 40 for OCTOSPI1 */
 	dma-names = "tx_rx";
 
 	status = "okay";
diff --git a/boards/st/b_l4s5i_iot01a/doc/index.rst b/boards/st/b_l4s5i_iot01a/doc/index.rst
index 83a6dcd1e8a7c..82cfef3093508 100644
--- a/boards/st/b_l4s5i_iot01a/doc/index.rst
+++ b/boards/st/b_l4s5i_iot01a/doc/index.rst
@@ -99,37 +99,7 @@ More information about STM32L4S5VI can be found here:
 Supported Features
 ==================
 
-The Zephyr b_l4s5i_iot01a board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| BLE       | module     | bluetooth                           |
-+-----------+------------+-------------------------------------+
-| WIFI      | module     | es-wifi                             |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/st/b_l4s5i_iot01a/b_l4s5i_iot01a_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -170,6 +140,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 B_L4S5I_IOT01A Discovery kit includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/b_u585i_iot02a/doc/index.rst b/boards/st/b_u585i_iot02a/doc/index.rst
index c9d9378444a07..7f1e812c89c35 100644
--- a/boards/st/b_u585i_iot02a/doc/index.rst
+++ b/boards/st/b_u585i_iot02a/doc/index.rst
@@ -153,48 +153,7 @@ More information about STM32U585AI can be found here:
 Supported Features
 ==================
 
-The Zephyr b_u585i_iot02a board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb_device                          |
-+-----------+------------+-------------------------------------+
-| BKP SRAM  | on-chip    | Backup SRAM                         |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| RADIO     | STM32WB5MMG| Bluetooth Low Energy (BLE)          |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/b_u585i_iot02a/b_u585i_iot02a_defconfig`
+.. zephyr:board-supported-hw::
 
 Zephyr board options
 ====================
@@ -283,6 +242,8 @@ do it by removing ``SB6`` jumper on the back side of the board.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 B_U585I_IOT02A Discovery kit includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
diff --git a/boards/st/disco_l475_iot1/disco_l475_iot1.dts b/boards/st/disco_l475_iot1/disco_l475_iot1.dts
index 6ffb695012402..166d24c3ee5af 100644
--- a/boards/st/disco_l475_iot1/disco_l475_iot1.dts
+++ b/boards/st/disco_l475_iot1/disco_l475_iot1.dts
@@ -228,9 +228,9 @@
 			read-only;
 		};
 
-		slot0_partition: partition@1000 {
+		slot0_partition: partition@10000 {
 			label = "image-0";
-			reg = <0x1000 DT_SIZE_K(928)>;
+			reg = <0x10000 DT_SIZE_K(928)>;
 		};
 
 		storage_partition: partition@f8000 {
diff --git a/boards/st/disco_l475_iot1/doc/index.rst b/boards/st/disco_l475_iot1/doc/index.rst
index b301979a16389..60523b3cfe1ef 100644
--- a/boards/st/disco_l475_iot1/doc/index.rst
+++ b/boards/st/disco_l475_iot1/doc/index.rst
@@ -92,47 +92,7 @@ More information about STM32L475VG can be found here:
 Supported Features
 ==================
 
-The Zephyr Disco L475 IoT board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/st/disco_l475_iot1/disco_l475_iot1_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -186,6 +146,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Disco L475 IoT board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``disco_l475_iot1`` board configuration can be built and
diff --git a/boards/st/nucleo_c031c6/doc/index.rst b/boards/st/nucleo_c031c6/doc/index.rst
index 7de1e597fac4f..6bdc470701874 100644
--- a/boards/st/nucleo_c031c6/doc/index.rst
+++ b/boards/st/nucleo_c031c6/doc/index.rst
@@ -51,45 +51,7 @@ More information about STM32C031C6 can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_c031c6 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| IWDG      | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| WWDG      | on-chip    | window watchdog                     |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_c031c6/nucleo_c031c6_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -110,6 +72,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo C031C6 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_c031c6`` board configuration can be built and
diff --git a/boards/st/nucleo_c071rb/doc/index.rst b/boards/st/nucleo_c071rb/doc/index.rst
index 7d4637c82a534..4cbeeb2e25095 100644
--- a/boards/st/nucleo_c071rb/doc/index.rst
+++ b/boards/st/nucleo_c071rb/doc/index.rst
@@ -55,47 +55,7 @@ More information about STM32C071RB can be found here:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_c071rb`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| IWDG      | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| WWDG      | on-chip    | window watchdog                     |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_c071rb/nucleo_c071rb_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -121,6 +81,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo C071RB board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_c071rb`` board can be built and
diff --git a/boards/st/nucleo_f030r8/doc/index.rst b/boards/st/nucleo_f030r8/doc/index.rst
index 4796c939ecc9a..41a3f68fbd1f1 100644
--- a/boards/st/nucleo_f030r8/doc/index.rst
+++ b/boards/st/nucleo_f030r8/doc/index.rst
@@ -58,35 +58,7 @@ More information about STM32F030R8 can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f030r8 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f030r8/nucleo_f030r8_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -121,6 +93,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F030R8 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f030r8`` board configuration can be built and
diff --git a/boards/st/nucleo_f031k6/doc/index.rst b/boards/st/nucleo_f031k6/doc/index.rst
index 2da4927aeadd2..f87d39b3a4d52 100644
--- a/boards/st/nucleo_f031k6/doc/index.rst
+++ b/boards/st/nucleo_f031k6/doc/index.rst
@@ -41,33 +41,7 @@ More information about STM32F031K6 can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f031k6 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f031k6/nucleo_f031k6_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -96,6 +70,8 @@ For more details please refer to `STM32 Nucleo-32 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F031K6 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f031k6`` board configuration can be built and
diff --git a/boards/st/nucleo_f042k6/doc/index.rst b/boards/st/nucleo_f042k6/doc/index.rst
index 51145f105e24b..8efbf66a8cc74 100644
--- a/boards/st/nucleo_f042k6/doc/index.rst
+++ b/boards/st/nucleo_f042k6/doc/index.rst
@@ -41,33 +41,7 @@ More information about STM32F042K6 can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f042k6 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f042k6/nucleo_f042k6_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -96,6 +70,8 @@ For more details please refer to `STM32 Nucleo-32 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F042K6 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f042k6`` board configuration can be built and
diff --git a/boards/st/nucleo_f070rb/doc/index.rst b/boards/st/nucleo_f070rb/doc/index.rst
index 989decfd3f06a..7db43191d67c9 100644
--- a/boards/st/nucleo_f070rb/doc/index.rst
+++ b/boards/st/nucleo_f070rb/doc/index.rst
@@ -57,37 +57,7 @@ the `STM32F070 reference manual`_ .
 Supported Features
 ==================
 
-The Zephyr nucleo_f070rb board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | SPI controller                      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f070rb/nucleo_f070rb_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -120,6 +90,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F070RB board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f070rb`` board configuration can be built and
diff --git a/boards/st/nucleo_f072rb/doc/index.rst b/boards/st/nucleo_f072rb/doc/index.rst
index 154497de01493..a78e0226b8e8c 100644
--- a/boards/st/nucleo_f072rb/doc/index.rst
+++ b/boards/st/nucleo_f072rb/doc/index.rst
@@ -56,37 +56,7 @@ the `STM32F072 reference manual`_ .
 Supported Features
 ==================
 
-The Zephyr ``nucleo_f072rb`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | SPI controller                      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f072rb/nucleo_f072rb_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -119,6 +89,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F072RB board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f072rb`` board configuration can be built and
diff --git a/boards/st/nucleo_f072rb/nucleo_f072rb.yaml b/boards/st/nucleo_f072rb/nucleo_f072rb.yaml
index dca1847f4b8ed..0a46f541b9115 100644
--- a/boards/st/nucleo_f072rb/nucleo_f072rb.yaml
+++ b/boards/st/nucleo_f072rb/nucleo_f072rb.yaml
@@ -7,7 +7,6 @@ flash: 128
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - adc
   - arduino_gpio
diff --git a/boards/st/nucleo_f091rc/doc/index.rst b/boards/st/nucleo_f091rc/doc/index.rst
index 1773bc8132394..a8aded09f47ed 100644
--- a/boards/st/nucleo_f091rc/doc/index.rst
+++ b/boards/st/nucleo_f091rc/doc/index.rst
@@ -57,51 +57,7 @@ More information about STM32F091RC can be found in the
 Supported Features
 ==================
 
-The Zephyr nucleo_f091rc board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | SPI controller                      |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC controller                      |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC controller                      |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f091rc/nucleo_f091rc_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -137,6 +93,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F091RC board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f091rc`` board configuration can be built and
diff --git a/boards/st/nucleo_f103rb/doc/index.rst b/boards/st/nucleo_f103rb/doc/index.rst
index 0bb6f042c43b0..05c1c9385e5b7 100644
--- a/boards/st/nucleo_f103rb/doc/index.rst
+++ b/boards/st/nucleo_f103rb/doc/index.rst
@@ -58,39 +58,7 @@ More information about STM32F103RB can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f103rb board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f103rb/nucleo_f103rb_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -123,6 +91,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F103RB board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f103rb`` board configuration can be built and
diff --git a/boards/st/nucleo_f207zg/doc/index.rst b/boards/st/nucleo_f207zg/doc/index.rst
index 51082a2cfc6c6..048cf26b7ebeb 100644
--- a/boards/st/nucleo_f207zg/doc/index.rst
+++ b/boards/st/nucleo_f207zg/doc/index.rst
@@ -63,52 +63,7 @@ More information about STM32F207ZG can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_207zg board configuration supports the following hardware features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port-polling;                |
-|             |            | serial port-interrupt               |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| ETHERNET    | on-chip    | Ethernet                            |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| USB         | on-chip    | USB device                          |
-+-------------+------------+-------------------------------------+
-| SPI         | on-chip    | spi                                 |
-+-------------+------------+-------------------------------------+
-| WATCHDOG    | on-chip    | independent watchdog                |
-+-------------+------------+-------------------------------------+
-| ADC         | on-chip    | ADC Controller                      |
-+-------------+------------+-------------------------------------+
-| DAC         | on-chip    | DAC Controller                      |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | PWM                                 |
-+-------------+------------+-------------------------------------+
-| RNG         | on-chip    | Random Number Generator             |
-+-------------+------------+-------------------------------------+
-| DMA         | on-chip    | Direct Memory Access                |
-+-------------+------------+-------------------------------------+
-| die-temp    | on-chip    | die temperature sensor              |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | rtc                                 |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_f207zg/nucleo_f207zg_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -184,6 +139,8 @@ do it by removing ``SB156`` jumper on the back side of the board.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F207ZG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_f207zg/nucleo_f207zg.dts b/boards/st/nucleo_f207zg/nucleo_f207zg.dts
index 724bf9456cc3b..c10b1aced009e 100644
--- a/boards/st/nucleo_f207zg/nucleo_f207zg.dts
+++ b/boards/st/nucleo_f207zg/nucleo_f207zg.dts
@@ -179,16 +179,27 @@ zephyr_udc0: &usbotg_fs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 &flash0 {
diff --git a/boards/st/nucleo_f302r8/doc/index.rst b/boards/st/nucleo_f302r8/doc/index.rst
index 9609270cd69c1..13a0b5b7707b0 100644
--- a/boards/st/nucleo_f302r8/doc/index.rst
+++ b/boards/st/nucleo_f302r8/doc/index.rst
@@ -67,34 +67,7 @@ More information about the STM32F302R8 can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f302r8 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f302r8/nucleo_f302r8_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -141,6 +114,8 @@ to UART2.  Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Nucleo F302R8 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_f303k8/doc/index.rst b/boards/st/nucleo_f303k8/doc/index.rst
index a21cc477b413c..dd4750a3ae53e 100644
--- a/boards/st/nucleo_f303k8/doc/index.rst
+++ b/boards/st/nucleo_f303k8/doc/index.rst
@@ -63,34 +63,7 @@ More information about the STM32F303K8 can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f303k8 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f303k8/nucleo_f303k8_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -132,6 +105,8 @@ to UART2.  Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Nucleo F303K8 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_f303re/doc/index.rst b/boards/st/nucleo_f303re/doc/index.rst
index 1c8b6363a397c..2531643ab6477 100644
--- a/boards/st/nucleo_f303re/doc/index.rst
+++ b/boards/st/nucleo_f303re/doc/index.rst
@@ -68,32 +68,7 @@ More information about the STM32F303RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f303re board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f303re/nucleo_f303re_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -135,6 +110,8 @@ to UART2.  Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Nucleo F303RE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_f334r8/doc/index.rst b/boards/st/nucleo_f334r8/doc/index.rst
index d5e633e97d8a2..0f7d4f7edb7c0 100644
--- a/boards/st/nucleo_f334r8/doc/index.rst
+++ b/boards/st/nucleo_f334r8/doc/index.rst
@@ -58,31 +58,7 @@ More information about STM32F334R8 can be found in the
 Supported Features
 ==================
 
-The Zephyr nucleo_f334r8 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f334r8/nucleo_f334r8_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -115,6 +91,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F334R8 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f334r8`` board configuration can be built and
diff --git a/boards/st/nucleo_f401re/doc/index.rst b/boards/st/nucleo_f401re/doc/index.rst
index fc64a2e5bfde6..17e00604f1e69 100644
--- a/boards/st/nucleo_f401re/doc/index.rst
+++ b/boards/st/nucleo_f401re/doc/index.rst
@@ -56,38 +56,7 @@ More information about STM32F401RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_401re board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | System Window Watchdog              |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f401re/nucleo_f401re_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -141,6 +110,8 @@ Nucleo F401RE board has up to 3 I2Cs. The default I2C mapping for Zephyr is:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F401RE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f401re`` board configuration can be built and
diff --git a/boards/st/nucleo_f410rb/doc/index.rst b/boards/st/nucleo_f410rb/doc/index.rst
index 4b48811fdf9fa..26018e9eab0e1 100644
--- a/boards/st/nucleo_f410rb/doc/index.rst
+++ b/boards/st/nucleo_f410rb/doc/index.rst
@@ -57,40 +57,7 @@ More information about STM32F410RB can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f410rb board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | window & independent                |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f410rb/nucleo_f410rb_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -146,6 +113,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F410RB board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f410rb`` board configuration can be built and
diff --git a/boards/st/nucleo_f411re/doc/index.rst b/boards/st/nucleo_f411re/doc/index.rst
index cdfcd32678708..f65d455904e03 100644
--- a/boards/st/nucleo_f411re/doc/index.rst
+++ b/boards/st/nucleo_f411re/doc/index.rst
@@ -57,33 +57,7 @@ More information about STM32F411RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f411re board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| I2S       | on-chip    | i2s                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f411re/nucleo_f411re_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -134,6 +108,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F411RE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f411re`` board configuration can be built and
diff --git a/boards/st/nucleo_f412zg/doc/index.rst b/boards/st/nucleo_f412zg/doc/index.rst
index 60f5f06531a22..8bc9fb26bb231 100644
--- a/boards/st/nucleo_f412zg/doc/index.rst
+++ b/boards/st/nucleo_f412zg/doc/index.rst
@@ -60,34 +60,7 @@ More information about STM32F412ZG can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_412zg board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f412zg/nucleo_f412zg_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -148,6 +121,8 @@ Ethernet over USB is configured as the default network interface
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F412ZG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_f413zh/doc/index.rst b/boards/st/nucleo_f413zh/doc/index.rst
index 0c9bad9f77d42..6d948615b8dc9 100644
--- a/boards/st/nucleo_f413zh/doc/index.rst
+++ b/boards/st/nucleo_f413zh/doc/index.rst
@@ -60,34 +60,7 @@ More information about STM32F413ZH can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_413zh board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f413zh/nucleo_f413zh_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -150,6 +123,8 @@ supports both device and host functions through its micro USB connector
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F413ZH board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_f413zh/nucleo_f413zh.dts b/boards/st/nucleo_f413zh/nucleo_f413zh.dts
index 28769998d8617..11623e6d3b1ad 100644
--- a/boards/st/nucleo_f413zh/nucleo_f413zh.dts
+++ b/boards/st/nucleo_f413zh/nucleo_f413zh.dts
@@ -19,6 +19,7 @@
 		zephyr,shell-uart = &usart3;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
 	};
 
 	leds: leds {
@@ -115,6 +116,40 @@ zephyr_udc0: &usbotg_fs {
 	status = "okay";
 };
 
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(64)>;
+			read-only;
+		};
+
+		/*
+		 * The flash starting at offset 0x10000 and ending at
+		 * offset 0x1ffff is reserved for use by the application.
+		 */
+
+		slot0_partition: partition@20000 {
+			label = "image-0";
+			reg = <0x00020000 DT_SIZE_K(256)>;
+		};
+
+		slot1_partition: partition@60000 {
+			label = "image-1";
+			reg = <0x00060000 DT_SIZE_K(256)>;
+		};
+
+		scratch_partition: partition@a0000 {
+			label = "image-scratch";
+			reg = <0x000a0000 DT_SIZE_K(128)>;
+		};
+	};
+};
+
 &timers2 {
 	status = "okay";
 
diff --git a/boards/st/nucleo_f429zi/doc/index.rst b/boards/st/nucleo_f429zi/doc/index.rst
index 1fe03b83ced52..925528cb9a15c 100644
--- a/boards/st/nucleo_f429zi/doc/index.rst
+++ b/boards/st/nucleo_f429zi/doc/index.rst
@@ -70,48 +70,7 @@ More information about STM32F429ZI can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f429zi board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | Ethernet                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f429zi/nucleo_f429zi_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -173,6 +132,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Nucleo F429ZI board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_f429zi/nucleo_f429zi.dts b/boards/st/nucleo_f429zi/nucleo_f429zi.dts
index d05081ed8396f..ee88ed5ce39af 100644
--- a/boards/st/nucleo_f429zi/nucleo_f429zi.dts
+++ b/boards/st/nucleo_f429zi/nucleo_f429zi.dts
@@ -176,16 +176,27 @@ zephyr_udc0: &usbotg_fs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 &flash0 {
diff --git a/boards/st/nucleo_f439zi/Kconfig.defconfig b/boards/st/nucleo_f439zi/Kconfig.defconfig
new file mode 100644
index 0000000000000..f93177dc26366
--- /dev/null
+++ b/boards/st/nucleo_f439zi/Kconfig.defconfig
@@ -0,0 +1,15 @@
+# NUCLEO-144 F439ZI board configuration
+
+# Copyright (c) 2025 Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NUCLEO_F439ZI
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+endif # NETWORKING
+
+endif # BOARD_NUCLEO_F439ZI
diff --git a/boards/st/nucleo_f439zi/Kconfig.nucleo_f439zi b/boards/st/nucleo_f439zi/Kconfig.nucleo_f439zi
new file mode 100644
index 0000000000000..11a3dc5b2acae
--- /dev/null
+++ b/boards/st/nucleo_f439zi/Kconfig.nucleo_f439zi
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NUCLEO_F439ZI
+	select SOC_STM32F439XX
diff --git a/boards/st/nucleo_f439zi/arduino_r3_connector.dtsi b/boards/st/nucleo_f439zi/arduino_r3_connector.dtsi
new file mode 100644
index 0000000000000..067c3c6c67654
--- /dev/null
+++ b/boards/st/nucleo_f439zi/arduino_r3_connector.dtsi
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019, Christian Taedcke
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpioa 3 0>,	/* A0 */
+			   <1 0 &gpioc 0 0>,	/* A1 */
+			   <2 0 &gpioc 3 0>,	/* A2 */
+			   <3 0 &gpiof 3 0>,	/* A3 */
+			   <4 0 &gpiof 5 0>,	/* A4 */
+			   <5 0 &gpiof 10 0>,	/* A5 */
+			   <6 0 &gpiog 9 0>,	/* D0 */
+			   <7 0 &gpiog 14 0>,	/* D1 */
+			   <8 0 &gpiof 15 0>,	/* D2 */
+			   <9 0 &gpioe 13 0>,	/* D3 */
+			   <10 0 &gpiof 14 0>,	/* D4 */
+			   <11 0 &gpioe 11 0>,	/* D5 */
+			   <12 0 &gpioe 9 0>,	/* D6 */
+			   <13 0 &gpiof 13 0>,	/* D7 */
+			   <14 0 &gpiof 12 0>,	/* D8 */
+			   <15 0 &gpiod 15 0>,	/* D9 */
+			   <16 0 &gpiod 14 0>,	/* D10 */
+			   <17 0 &gpioa 7 0>,	/* D11 */
+			   <18 0 &gpioa 6 0>,	/* D12 */
+			   <19 0 &gpioa 5 0>,	/* D13 */
+			   <20 0 &gpiob 9 0>,	/* D14 */
+			   <21 0 &gpiob 8 0>;	/* D15 */
+	};
+};
+
+arduino_i2c: &i2c1 {};
+arduino_spi: &spi1 {};
+arduino_serial: &usart6 {};
diff --git a/boards/st/nucleo_f439zi/board.cmake b/boards/st/nucleo_f439zi/board.cmake
new file mode 100644
index 0000000000000..b7761f24ff315
--- /dev/null
+++ b/boards/st/nucleo_f439zi/board.cmake
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# keep first
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
+board_runner_args(jlink "--device=STM32F439ZI" "--speed=4000")
+
+# keep first
+include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/st/nucleo_f439zi/board.yml b/boards/st/nucleo_f439zi/board.yml
new file mode 100644
index 0000000000000..32428f55018e3
--- /dev/null
+++ b/boards/st/nucleo_f439zi/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: nucleo_f439zi
+  full_name: Nucleo F439ZI
+  vendor: st
+  socs:
+    - name: stm32f439xx
diff --git a/boards/st/nucleo_f439zi/doc/index.rst b/boards/st/nucleo_f439zi/doc/index.rst
new file mode 100644
index 0000000000000..e9e5b154dcc24
--- /dev/null
+++ b/boards/st/nucleo_f439zi/doc/index.rst
@@ -0,0 +1,86 @@
+.. zephyr:board:: nucleo_f439zi
+
+Overview
+********
+
+The Nucleo F439ZI board features an ARM Cortex-M4 based STM32F439ZI MCU
+with a wide range of connectivity support and configurations. This SoC
+is basically a clone of the STM32F429ZI with a supplementary hardware
+cryptographic accelerator.
+
+More information about STM32F439ZI can be found here:
+
+- `STM32F439ZI on www.st.com`_
+- `STM32F439 reference manual`_
+- `STM32F439 datasheet`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+The Nucleo F439ZI board includes an ST-LINK/V2-1 embedded debug tool interface.
+
+Flashing
+========
+
+The board is configured to be flashed using west `STM32CubeProgrammer`_ runner,
+so its :ref:`installation <stm32cubeprog-flash-host-tools>` is required.
+
+Alternatively, OpenOCD or JLink can also be used to flash the board using
+the ``--runner`` (or ``-r``) option:
+
+.. code-block:: console
+
+   $ west flash --runner openocd
+   $ west flash --runner jlink
+
+Flashing an application to the Nucleo F439ZI
+--------------------------------------------
+
+Here is an example for the :zephyr:code-sample:`blinky` application.
+
+Run a serial host program to connect with your board:
+
+.. code-block:: console
+
+   $ minicom -D /dev/ttyACM0
+
+Build and flash the application:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: nucleo_f439zi
+   :goals: build flash
+
+You should see user led "LD1" blinking.
+
+Debugging
+=========
+
+You can debug an application in the usual way.  Here is an example for the
+:zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: nucleo_f439zi
+   :maybe-skip-config:
+   :goals: debug
+
+.. target-notes::
+.. _STM32F439ZI on www.st.com:
+   https://www.st.com/en/microcontrollers/stm32f439zi.html
+
+.. _STM32F439 reference manual:
+   https://www.st.com/resource/en/reference_manual/dm00031020.pdf
+
+.. _STM32F439 datasheet:
+   https://www.st.com/resource/en/datasheet/stm32f439zi.pdf
+
+.. _STM32CubeProgrammer:
+   https://www.st.com/en/development-tools/stm32cubeprog.html
diff --git a/boards/st/nucleo_f439zi/nucleo_f439zi.dts b/boards/st/nucleo_f439zi/nucleo_f439zi.dts
new file mode 100644
index 0000000000000..7c0ee16ad6885
--- /dev/null
+++ b/boards/st/nucleo_f439zi/nucleo_f439zi.dts
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2025 Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/f4/stm32f439Xi.dtsi>
+#include <st/f4/stm32f439z(g-i)tx-pinctrl.dtsi>
+#include "arduino_r3_connector.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "STMicroelectronics STM32F439ZI-NUCLEO board";
+	compatible = "st,stm32f439zi-nucleo";
+
+	chosen {
+		zephyr,console = &usart3;
+		zephyr,shell-uart = &usart3;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,ccm = &ccm0;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+
+		green_led_1: led_1 {
+			gpios = <&gpiob 0 GPIO_ACTIVE_HIGH>;
+			label = "User LD1";
+		};
+
+		blue_led_1: led_2 {
+			gpios = <&gpiob 7 GPIO_ACTIVE_HIGH>;
+			label = "User LD2";
+		};
+
+		red_led_1: led_3 {
+			gpios = <&gpiob 14 GPIO_ACTIVE_HIGH>;
+			label = "User LD3";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		user_button: button {
+			label = "User";
+			gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	aliases {
+		led0 = &green_led_1;
+		led1 = &blue_led_1;
+		led2 = &red_led_1;
+		sw0 = &user_button;
+		watchdog0 = &iwdg;
+		die-temp0 = &die_temp;
+		volt-sensor0 = &vref;
+		volt-sensor1 = &vbat;
+	};
+};
+
+&clk_lsi {
+	status = "okay";
+};
+
+&clk_hse {
+	hse-bypass;
+	clock-frequency = <DT_FREQ_M(8)>; /* STLink 8MHz clock */
+	status = "okay";
+};
+
+&pll {
+	div-m = <8>;
+	mul-n = <336>;
+	div-p = <2>;
+	div-q = <7>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(168)>; /* highest value to get a precise USB clock */
+	ahb-prescaler = <1>;
+	apb1-prescaler = <4>;
+	apb2-prescaler = <2>;
+};
+
+&adc1 {
+	pinctrl-0 = <&adc1_in0_pa0>;
+	pinctrl-names = "default";
+	st,adc-clock-source = "SYNC";
+	st,adc-prescaler = <2>;
+	status = "okay";
+};
+
+&die_temp {
+	status = "okay";
+};
+
+&dac1 {
+	status = "okay";
+	pinctrl-0 = <&dac_out1_pa4>;
+	pinctrl-names = "default";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_scl_pb8 &i2c1_sda_pb9>;
+	pinctrl-names = "default";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+};
+
+&i2c2 {
+	pinctrl-0 = <&i2c2_scl_pb10 &i2c2_sda_pb11>;
+	pinctrl-names = "default";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_sck_pa5 &spi1_miso_pa6 &spi1_mosi_pa7>;
+	pinctrl-names = "default";
+	cs-gpios = <&gpiod 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+	status = "okay";
+};
+
+&usart3 {
+	pinctrl-0 = <&usart3_tx_pd8 &usart3_rx_pd9>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+&usart6 {
+	pinctrl-0 = <&usart6_tx_pg14 &usart6_rx_pg9>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+zephyr_udc0: &usbotg_fs {
+	pinctrl-0 = <&usb_otg_fs_dm_pa11 &usb_otg_fs_dp_pa12>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&timers1 {
+	st,prescaler = <10000>;
+	status = "okay";
+
+	pwm1: pwm {
+		status = "okay";
+		pinctrl-0 = <&tim1_ch3_pe13>;
+		pinctrl-names = "default";
+	};
+};
+
+&rtc {
+	clocks = <&rcc STM32_CLOCK_BUS_APB1 0x10000000>,
+		 <&rcc STM32_SRC_LSI RTC_SEL(2)>;
+	status = "okay";
+};
+
+&iwdg {
+	status = "okay";
+};
+
+&rng {
+	status = "okay";
+};
+
+&dma2 {
+	status = "okay";
+};
+
+&mac {
+	status = "okay";
+	pinctrl-0 = <&eth_rxd0_pc4
+		     &eth_rxd1_pc5
+		     &eth_ref_clk_pa1
+		     &eth_crs_dv_pa7
+		     &eth_tx_en_pg11
+		     &eth_txd0_pg13
+		     &eth_txd1_pb13>;
+	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* 32KB for bootloader */
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(32)>;
+			read-only;
+		};
+
+		/*
+		 * nvs subsystem requires 2 sectors with a max total of 32K
+		 * On F4 series, the only option is to use the following
+		 * partition, which is compatible with mcuboot usage.
+		 * Keep it commented in order it is not used by CI.
+		 *
+		 * storage_partition: partition@8000 {
+		 *	label = "storage";
+		 *	reg = <0x0008000 DT_SIZE_K(32)>;
+		 * };
+		 */
+
+		/* free sector: 64KB
+		 *
+		 * free0_partition: partition@10000 {
+		 *	label = "free-0";
+		 *	reg = <0x00010000 DT_SIZE_K(64)>;
+		 * };
+		 */
+
+		/* application image slot: 896KB */
+		slot0_partition: partition@20000 {
+			label = "image-0";
+			reg = <0x00020000 DT_SIZE_K(896)>;
+		};
+
+		/* free sectors: 4 * 16KB + 64KB
+		 *
+		 * free1_partition: partition@100000 {
+		 *	label = "free-1";
+		 *	reg = <0x00100000 DT_SIZE_K(128)>;
+		 * };
+		 */
+
+		/* backup slot: 768KB */
+		slot1_partition: partition@120000 {
+			label = "image-1";
+			reg = <0x00120000 DT_SIZE_K(768)>;
+		};
+
+		/* free sector: 128KB
+		 *
+		 * free2_partition: partition@1e0000 {
+		 *	label = "free-2";
+		 *	reg = <0x0001e0000 DT_SIZE_K(128)>;
+		 * };
+		 */
+	};
+};
+
+&vref {
+	status = "okay";
+};
+
+&vbat {
+	status = "okay";
+};
diff --git a/boards/st/nucleo_f439zi/nucleo_f439zi.yaml b/boards/st/nucleo_f439zi/nucleo_f439zi.yaml
new file mode 100644
index 0000000000000..409e131d99cb7
--- /dev/null
+++ b/boards/st/nucleo_f439zi/nucleo_f439zi.yaml
@@ -0,0 +1,27 @@
+identifier: nucleo_f439zi
+name: ST Nucleo F439ZI
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+ram: 192
+flash: 2048
+supported:
+  - arduino_gpio
+  - arduino_i2c
+  - arduino_spi
+  - netif:eth
+  - i2c
+  - spi
+  - gpio
+  - pwm
+  - counter
+  - usb_device
+  - watchdog
+  - adc
+  - dac
+  - dma
+  - rtc
+  - usbd
+vendor: st
diff --git a/boards/st/nucleo_f439zi/nucleo_f439zi_defconfig b/boards/st/nucleo_f439zi/nucleo_f439zi_defconfig
new file mode 100644
index 0000000000000..d03e9b544669a
--- /dev/null
+++ b/boards/st/nucleo_f439zi/nucleo_f439zi_defconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable console
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
diff --git a/boards/st/nucleo_f439zi/support/openocd.cfg b/boards/st/nucleo_f439zi/support/openocd.cfg
new file mode 100644
index 0000000000000..9073ee6db0990
--- /dev/null
+++ b/boards/st/nucleo_f439zi/support/openocd.cfg
@@ -0,0 +1,12 @@
+source [find board/st_nucleo_f4.cfg]
+
+$_TARGETNAME configure -event gdb-attach {
+        echo "Debugger attaching: halting execution"
+        reset halt
+        gdb_breakpoint_override hard
+}
+
+$_TARGETNAME configure -event gdb-detach {
+        echo "Debugger detaching: resuming execution"
+        resume
+}
diff --git a/boards/st/nucleo_f446re/doc/index.rst b/boards/st/nucleo_f446re/doc/index.rst
index 0688c3c6f02fb..09965db0df053 100644
--- a/boards/st/nucleo_f446re/doc/index.rst
+++ b/boards/st/nucleo_f446re/doc/index.rst
@@ -62,33 +62,7 @@ More information about STM32F446RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f446re board configuration supports the following hardware features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| CAN 1/2     | on-chip    | Controller Area Network             |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f446re/nucleo_f446re_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -157,6 +131,8 @@ used with `RS485 CAN Shield`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F446RE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f446re`` board configuration can be built and
diff --git a/boards/st/nucleo_f446ze/doc/index.rst b/boards/st/nucleo_f446ze/doc/index.rst
index 852ce5bd99b62..e3ebe377ef64f 100644
--- a/boards/st/nucleo_f446ze/doc/index.rst
+++ b/boards/st/nucleo_f446ze/doc/index.rst
@@ -67,39 +67,7 @@ More information about STM32F446ZE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_f446ze board configuration supports the following hardware features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| USB         | on-chip    | usb                                 |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| CAN 1/2     | on-chip    | Controller Area Network             |
-+-------------+------------+-------------------------------------+
-| ADC         | on-chip    | Analog Input                        |
-+-------------+------------+-------------------------------------+
-| DAC         | on-chip    | Analog Output                       |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f446ze/nucleo_f446ze_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -182,6 +150,8 @@ The TX/RX wires are connected with pins 25/27 of CN9 connector.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F446ZE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f446ze`` board configuration can be built and
diff --git a/boards/st/nucleo_f722ze/doc/index.rst b/boards/st/nucleo_f722ze/doc/index.rst
index b381f20de4ce5..8a98d09ee18c1 100644
--- a/boards/st/nucleo_f722ze/doc/index.rst
+++ b/boards/st/nucleo_f722ze/doc/index.rst
@@ -54,61 +54,7 @@ Nucleo F722ZE provides the following hardware components:
 Supported Features
 ==================
 
-+---------------+------------+-------------------------------+
-| Interface     | Controller | Driver/Component              |
-+===============+============+===============================+
-| NVIC          | on-chip    | arch/arm                      |
-+---------------+------------+-------------------------------+
-| MPU           | on-chip    | arch/arm                      |
-+---------------+------------+-------------------------------+
-| ADC           | on-chip    | adc                           |
-+---------------+------------+-------------------------------+
-| CAN           | on-chip    | can                           |
-+---------------+------------+-------------------------------+
-| USART/UART    | on-chip    | console, serial               |
-+---------------+------------+-------------------------------+
-| TIMER         | on-chip    | counter, pwm, timer           |
-+---------------+------------+-------------------------------+
-| DAC           | on-chip    | dac                           |
-+---------------+------------+-------------------------------+
-| DMA           | on-chip    | dma                           |
-+---------------+------------+-------------------------------+
-| GPIO          | on-chip    | gpio                          |
-+---------------+------------+-------------------------------+
-| HWINFO        | on-chip    | hwinfo                        |
-+---------------+------------+-------------------------------+
-| I2C           | on-chip    | i2c                           |
-+---------------+------------+-------------------------------+
-| EXTI          | on-chip    | interrupt_controller          |
-+---------------+------------+-------------------------------+
-| BACKUP_SRAM   | on-chip    | memory                        |
-+---------------+------------+-------------------------------+
-| QUADSPI       | on-chip    | memory                        |
-+---------------+------------+-------------------------------+
-| PINMUX        | on-chip    | pinctrl                       |
-+---------------+------------+-------------------------------+
-| RCC           | on-chip    | reset                         |
-+---------------+------------+-------------------------------+
-| RTC           | on-chip    | rtc                           |
-+---------------+------------+-------------------------------+
-| DIE_TEMP      | on-chip    | sensor                        |
-+---------------+------------+-------------------------------+
-| VREF          | on-chip    | sensor                        |
-+---------------+------------+-------------------------------+
-| VBAT          | on-chip    | sensor                        |
-+---------------+------------+-------------------------------+
-| SPI           | on-chip    | spi                           |
-+---------------+------------+-------------------------------+
-| USBOTG_HS     | on-chip    | usb                           |
-+---------------+------------+-------------------------------+
-| USBOTG_FS     | on-chip    | usb                           |
-+---------------+------------+-------------------------------+
-| IWDG          | on-chip    | watchdog                      |
-+---------------+------------+-------------------------------+
-| WWDG          | on-chip    | watchdog                      |
-+---------------+------------+-------------------------------+
-| RTC           | on-chip    | rtc                           |
-+---------------+------------+-------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -173,6 +119,8 @@ using 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The ``nucleo_f722ze`` can be flashed and debugged in the typical manner.
 The Nucleo F722ZE board includes an ST-LINK V2-1 debugger.
 
diff --git a/boards/st/nucleo_f746zg/doc/index.rst b/boards/st/nucleo_f746zg/doc/index.rst
index 05b436d99e9fd..e78653684819e 100644
--- a/boards/st/nucleo_f746zg/doc/index.rst
+++ b/boards/st/nucleo_f746zg/doc/index.rst
@@ -81,47 +81,7 @@ Nucleo F746ZG provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_f746zg board configuration supports the following hardware
-features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| ETHERNET    | on-chip    | ethernet                            |
-+-------------+------------+-------------------------------------+
-| USB         | on-chip    | usb_device                          |
-+-------------+------------+-------------------------------------+
-| COUNTER     | on-chip    | rtc                                 |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| SPI         | on-chip    | spi                                 |
-+-------------+------------+-------------------------------------+
-| WATCHDOG    | on-chip    | independent watchdog                |
-+-------------+------------+-------------------------------------+
-| ADC         | on-chip    | ADC Controller                      |
-+-------------+------------+-------------------------------------+
-| DAC         | on-chip    | DAC Controller                      |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | rtc                                 |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f746zg/nucleo_f746zg_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
@@ -172,6 +132,8 @@ do it by removing ``SB156`` jumper on the back side of the board.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F746ZG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f746zg`` board configuration can be built and
diff --git a/boards/st/nucleo_f746zg/nucleo_f746zg.dts b/boards/st/nucleo_f746zg/nucleo_f746zg.dts
index 65416d66d529c..f1df608b81778 100644
--- a/boards/st/nucleo_f746zg/nucleo_f746zg.dts
+++ b/boards/st/nucleo_f746zg/nucleo_f746zg.dts
@@ -197,16 +197,27 @@ zephyr_udc0: &usbotg_fs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 &backup_sram {
diff --git a/boards/st/nucleo_f756zg/doc/index.rst b/boards/st/nucleo_f756zg/doc/index.rst
index 3b90c688ff8c3..2de8ce752d13f 100644
--- a/boards/st/nucleo_f756zg/doc/index.rst
+++ b/boards/st/nucleo_f756zg/doc/index.rst
@@ -81,35 +81,7 @@ Nucleo F756ZG provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_f756zg board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb_device                          |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f756zg/nucleo_f756zg_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
@@ -153,6 +125,8 @@ assigned to UART3. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F756ZG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f756zg`` board configuration can be built and
diff --git a/boards/st/nucleo_f756zg/nucleo_f756zg.dts b/boards/st/nucleo_f756zg/nucleo_f756zg.dts
index 234321842ba9c..da329479c8582 100644
--- a/boards/st/nucleo_f756zg/nucleo_f756zg.dts
+++ b/boards/st/nucleo_f756zg/nucleo_f756zg.dts
@@ -141,18 +141,30 @@ zephyr_udc0: &usbotg_fs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
+};
+
+
 &flash0 {
 	partitions {
 		compatible = "fixed-partitions";
diff --git a/boards/st/nucleo_f767zi/doc/index.rst b/boards/st/nucleo_f767zi/doc/index.rst
index d68ae61592f4a..4afe4cd84e09f 100644
--- a/boards/st/nucleo_f767zi/doc/index.rst
+++ b/boards/st/nucleo_f767zi/doc/index.rst
@@ -81,55 +81,15 @@ Nucleo F767ZI provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_f767zi board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet (*)                        |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb_device                          |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-
-(*) nucleo_f767zi with soc cut-A (Device marking A) has some ethernet
+.. zephyr:board-supported-hw::
+
+.. note::
+    nucleo_f767zi with soc cut-A (Device marking A) has some ethernet
     instability (:github:`26519`).
     Use of cut-Z is advised.
     see restrictions errata:
     https://www.st.com/content/ccc/resource/technical/document/errata_sheet/group0/23/a6/11/0b/30/24/46/a5/DM00257543/files/DM00257543.pdf/jcr:content/translations/en.DM00257543.pdf
 
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_f767zi/nucleo_f767zi_defconfig`
-
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
 Default Zephyr Peripheral Mapping:
@@ -173,6 +133,8 @@ assigned to UART3. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo F767ZI board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_f767zi`` board configuration can be built and
diff --git a/boards/st/nucleo_f767zi/nucleo_f767zi.dts b/boards/st/nucleo_f767zi/nucleo_f767zi.dts
index c7a113fdfcf56..3cc05d175e3a2 100644
--- a/boards/st/nucleo_f767zi/nucleo_f767zi.dts
+++ b/boards/st/nucleo_f767zi/nucleo_f767zi.dts
@@ -188,16 +188,27 @@ zephyr_udc0: &usbotg_fs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 &flash0 {
diff --git a/boards/st/nucleo_g031k8/doc/index.rst b/boards/st/nucleo_g031k8/doc/index.rst
index bf985149d833a..cc2cba3f929aa 100644
--- a/boards/st/nucleo_g031k8/doc/index.rst
+++ b/boards/st/nucleo_g031k8/doc/index.rst
@@ -56,31 +56,7 @@ More information about STM32G031K8 can be found in the
 Supported Features
 ==================
 
-The Zephyr nucleo_g031k8 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_g031k8/nucleo_g031k8_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -103,6 +79,8 @@ For more details please refer to `STM32 Nucleo-32 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo G031K8 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_g031k8`` board configuration can be built and
diff --git a/boards/st/nucleo_g070rb/doc/index.rst b/boards/st/nucleo_g070rb/doc/index.rst
index 2dc826765aca0..bb20170372df5 100644
--- a/boards/st/nucleo_g070rb/doc/index.rst
+++ b/boards/st/nucleo_g070rb/doc/index.rst
@@ -61,45 +61,7 @@ More information about STM32G070RB can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_g070rb board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | arm memory protection unit          |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_g070rb/nucleo_g070rb_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -130,6 +92,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo G070RB board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_g070rb`` board configuration can be built and
diff --git a/boards/st/nucleo_g071rb/doc/index.rst b/boards/st/nucleo_g071rb/doc/index.rst
index b7f778ac2c4f0..5e7bca2b457fd 100644
--- a/boards/st/nucleo_g071rb/doc/index.rst
+++ b/boards/st/nucleo_g071rb/doc/index.rst
@@ -63,49 +63,7 @@ More information about STM32G071RB can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_g071rb board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | arm memory protection unit          |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_g071rb/nucleo_g071rb_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -136,6 +94,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo G071RB board includes an ST-LINK/V3 embedded debug tool interface.
 
 Applications for the ``nucleo_g071rb`` board configuration can be built and
diff --git a/boards/st/nucleo_g0b1re/doc/index.rst b/boards/st/nucleo_g0b1re/doc/index.rst
index aa68effb93ced..73b3d36034af5 100644
--- a/boards/st/nucleo_g0b1re/doc/index.rst
+++ b/boards/st/nucleo_g0b1re/doc/index.rst
@@ -67,47 +67,7 @@ More information about STM32G0B1RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_g0b1re board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| MPU       | on-chip    | arm memory protection unit          |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| FDCAN     | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_g0b1re/nucleo_g0b1re_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -140,6 +100,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo G0B1RE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_g0b1re`` board configuration can be built and
diff --git a/boards/st/nucleo_g431kb/board.cmake b/boards/st/nucleo_g431kb/board.cmake
index 00ab7c45ccfe5..7d054ec941f1c 100644
--- a/boards/st/nucleo_g431kb/board.cmake
+++ b/boards/st/nucleo_g431kb/board.cmake
@@ -3,8 +3,10 @@
 # keep first
 board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
 board_runner_args(pyocd "--target=stm32g431kbtx")
+board_runner_args(jlink "--device=STM32G431KB" "--speed=4000")
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/st/nucleo_g431kb/doc/index.rst b/boards/st/nucleo_g431kb/doc/index.rst
index d9400a7b38bcd..80fc06eb78f9a 100644
--- a/boards/st/nucleo_g431kb/doc/index.rst
+++ b/boards/st/nucleo_g431kb/doc/index.rst
@@ -30,30 +30,7 @@ More information about STM32G431KB can be found here:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_g431kb`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_g431kb/nucleo_g431kb_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -95,6 +72,8 @@ low power mode.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo G431KB Board includes an ST-Link/V3 embedded debug tool interface.
 
 Applications for the ``nucleo_g431kb`` board target can be built and
diff --git a/boards/st/nucleo_g431rb/board.cmake b/boards/st/nucleo_g431rb/board.cmake
index 7a680ee8d4be9..19ba91a4a2541 100644
--- a/boards/st/nucleo_g431rb/board.cmake
+++ b/boards/st/nucleo_g431rb/board.cmake
@@ -3,8 +3,10 @@
 # keep first
 board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
 board_runner_args(pyocd "--target=stm32g431rbtx")
+board_runner_args(jlink "--device=STM32G431RB" "--speed=4000")
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/st/nucleo_g431rb/doc/index.rst b/boards/st/nucleo_g431rb/doc/index.rst
index cebd20cc4913a..4e6e3d9b770cb 100644
--- a/boards/st/nucleo_g431rb/doc/index.rst
+++ b/boards/st/nucleo_g431rb/doc/index.rst
@@ -88,38 +88,7 @@ More information about STM32G431RB can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_g431rb board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | rng                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_g431rb/nucleo_g431rb_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -177,6 +146,8 @@ low power mode.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo G431RB board includes an ST-LINK/V3E embedded debug tool interface.
 
 Applications for the ``nucleo_g431rb`` board configuration can be built and
diff --git a/boards/st/nucleo_g474re/board.cmake b/boards/st/nucleo_g474re/board.cmake
index 3c3ffc9e7ff63..9e4f74239feef 100644
--- a/boards/st/nucleo_g474re/board.cmake
+++ b/boards/st/nucleo_g474re/board.cmake
@@ -3,8 +3,10 @@
 # keep first
 board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
 board_runner_args(pyocd "--target=stm32g474retx")
+board_runner_args(jlink "--device=STM32G474RE" "--speed=4000")
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/st/nucleo_g474re/doc/index.rst b/boards/st/nucleo_g474re/doc/index.rst
index 2b61e4b2296e8..fdcd035c412c6 100644
--- a/boards/st/nucleo_g474re/doc/index.rst
+++ b/boards/st/nucleo_g474re/doc/index.rst
@@ -88,48 +88,7 @@ More information about STM32G474RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_g474re board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| FDCAN1    | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_g474re/nucleo_g474re_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -191,6 +150,8 @@ low power mode.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo G474RE board includes an ST-LINK/V3E embedded debug tool interface.
 
 Applications for the ``nucleo_g474re`` board configuration can be built and
diff --git a/boards/st/nucleo_g474re/nucleo_g474re.dts b/boards/st/nucleo_g474re/nucleo_g474re.dts
index a315266113127..a0fe283ba5840 100644
--- a/boards/st/nucleo_g474re/nucleo_g474re.dts
+++ b/boards/st/nucleo_g474re/nucleo_g474re.dts
@@ -8,6 +8,7 @@
 #include <st/g4/stm32g474Xe.dtsi>
 #include <st/g4/stm32g474r(b-c-e)tx-pinctrl.dtsi>
 #include "arduino_r3_connector.dtsi"
+#include "st_morpho_connector.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {
diff --git a/boards/st/nucleo_g474re/st_morpho_connector.dtsi b/boards/st/nucleo_g474re/st_morpho_connector.dtsi
new file mode 100644
index 0000000000000..100cda300b71a
--- /dev/null
+++ b/boards/st/nucleo_g474re/st_morpho_connector.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 Thomas Günther
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/gpio/st-morpho-header.h>
+
+/ {
+	st_morpho_header: st-morpho-header {
+		compatible = "st-morpho-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <ST_MORPHO_PIN_MASK 0x0>;
+		gpio-map-pass-thru = <0x0 GPIO_DT_FLAGS_MASK>;
+		gpio-map = <ST_MORPHO_L_1 0 &gpioc 10 0>,
+			   <ST_MORPHO_L_2 0 &gpioc 11 0>,
+			   <ST_MORPHO_L_3 0 &gpioc 12 0>,
+			   <ST_MORPHO_L_4 0 &gpiod 2 0>,
+			   <ST_MORPHO_L_13 0 &gpioa 13 0>,
+			   <ST_MORPHO_L_15 0 &gpioa 14 0>,
+			   <ST_MORPHO_L_17 0 &gpioa 15 0>,
+			   <ST_MORPHO_L_21 0 &gpiob 7 0>,
+			   <ST_MORPHO_L_23 0 &gpioc 13 0>,
+			   <ST_MORPHO_L_25 0 &gpioc 14 0>,
+			   <ST_MORPHO_L_27 0 &gpioc 15 0>,
+			   <ST_MORPHO_L_28 0 &gpioa 0 0>,
+			   <ST_MORPHO_L_29 0 &gpiof 0 0>,
+			   <ST_MORPHO_L_30 0 &gpioa 1 0>,
+			   <ST_MORPHO_L_31 0 &gpiof 1 0>,
+			   <ST_MORPHO_L_32 0 &gpioa 4 0>,
+			   <ST_MORPHO_L_34 0 &gpiob 0 0>,
+			   <ST_MORPHO_L_35 0 &gpioc 2 0>,
+			   <ST_MORPHO_L_36 0 &gpioc 1 0>,
+			   <ST_MORPHO_L_37 0 &gpioc 3 0>,
+			   <ST_MORPHO_L_38 0 &gpioc 0 0>,
+			   <ST_MORPHO_R_1 0 &gpioc 9 0>,
+			   <ST_MORPHO_R_2 0 &gpioc 8 0>,
+			   <ST_MORPHO_R_3 0 &gpiob 8 0>,
+			   <ST_MORPHO_R_4 0 &gpioc 6 0>,
+			   <ST_MORPHO_R_5 0 &gpiob 9 0>,
+			   <ST_MORPHO_R_6 0 &gpioc 5 0>,
+			   <ST_MORPHO_R_11 0 &gpioa 5 0>,
+			   <ST_MORPHO_R_12 0 &gpioa 12 0>,
+			   <ST_MORPHO_R_13 0 &gpioa 6 0>,
+			   <ST_MORPHO_R_14 0 &gpioa 11 0>,
+			   <ST_MORPHO_R_15 0 &gpioa 7 0>,
+			   <ST_MORPHO_R_16 0 &gpiob 12 0>,
+			   <ST_MORPHO_R_17 0 &gpiob 6 0>,
+			   <ST_MORPHO_R_18 0 &gpiob 11 0>,
+			   <ST_MORPHO_R_19 0 &gpioc 7 0>,
+			   <ST_MORPHO_R_21 0 &gpioa 9 0>,
+			   <ST_MORPHO_R_22 0 &gpiob 2 0>,
+			   <ST_MORPHO_R_23 0 &gpioa 8 0>,
+			   <ST_MORPHO_R_24 0 &gpiob 1 0>,
+			   <ST_MORPHO_R_25 0 &gpiob 10 0>,
+			   <ST_MORPHO_R_26 0 &gpiob 15 0>,
+			   <ST_MORPHO_R_27 0 &gpiob 4 0>,
+			   <ST_MORPHO_R_28 0 &gpiob 14 0>,
+			   <ST_MORPHO_R_29 0 &gpiob 5 0>,
+			   <ST_MORPHO_R_30 0 &gpiob 13 0>,
+			   <ST_MORPHO_R_31 0 &gpiob 3 0>,
+			   <ST_MORPHO_R_33 0 &gpioa 10 0>,
+			   <ST_MORPHO_R_34 0 &gpioc 4 0>,
+			   <ST_MORPHO_R_35 0 &gpioa 2 0>,
+			   <ST_MORPHO_R_37 0 &gpioa 3 0>;
+	};
+};
diff --git a/boards/st/nucleo_h503rb/doc/index.rst b/boards/st/nucleo_h503rb/doc/index.rst
index 2be64f7e95a6b..0ac6e91bb307a 100644
--- a/boards/st/nucleo_h503rb/doc/index.rst
+++ b/boards/st/nucleo_h503rb/doc/index.rst
@@ -115,37 +115,7 @@ More information about STM32H533RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_h503rb board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c bus                             |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| BKP SRAM  | on-chip    | Backup SRAM                         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig and dts files:
-
-  - :zephyr_file:`boards/st/nucleo_h503rb/nucleo_h503rb_defconfig`
-  - :zephyr_file:`boards/st/nucleo_h503rb/nucleo_h503rb.dts`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -187,6 +157,8 @@ VBAT can be provided via the left ST Morpho connector's pin 33.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo-H503RB board includes an ST-LINK/V3EC embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
@@ -199,7 +171,7 @@ OpenOCD Support
 
 For now, openocd support  for stm32h5 is not available on upstream OpenOCD.
 You can check `OpenOCD official Github mirror`_.
-In order to use it though, you should clone from the cutomized
+In order to use it though, you should clone from the customized
 `STMicroelectronics OpenOCD Github`_ and compile it following usual README guidelines.
 Once it is done, you can set the OPENOCD and OPENOCD_DEFAULT_PATH variables in
 :zephyr_file:`boards/st/nucleo_h563zi/board.cmake` to point the build
diff --git a/boards/st/nucleo_h533re/doc/index.rst b/boards/st/nucleo_h533re/doc/index.rst
index 986cda88c35dc..6a290a41b92fb 100644
--- a/boards/st/nucleo_h533re/doc/index.rst
+++ b/boards/st/nucleo_h533re/doc/index.rst
@@ -139,47 +139,7 @@ More information about STM32H533RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_h533re board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | PWM                                 |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | Real Time Clock                     |
-+-----------+------------+-------------------------------------+
-| BKP SRAM  | on-chip    | Backup SRAM                         |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB full-speed host/device bus      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig and dts files:
-
-- Secure target:
-
-  - :zephyr_file:`boards/st/nucleo_h533re/nucleo_h533re_defconfig`
-  - :zephyr_file:`boards/st/nucleo_h533re/nucleo_h533re.dts`
+.. zephyr:board-supported-hw::
 
 Zephyr board options
 ====================
@@ -235,6 +195,8 @@ VBAT can be provided via the left ST Morpho connector's pin 33.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H533RE board includes an ST-LINK/V3EC embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
@@ -247,7 +209,7 @@ OpenOCD Support
 
 For now, openocd support  for stm32h5 is not available on upstream OpenOCD.
 You can check `OpenOCD official Github mirror`_.
-In order to use it though, you should clone from the cutomized
+In order to use it though, you should clone from the customized
 `STMicroelectronics OpenOCD Github`_ and compile it following usual README guidelines.
 Once it is done, you can set the OPENOCD and OPENOCD_DEFAULT_PATH variables in
 :zephyr_file:`boards/st/nucleo_h533re/board.cmake` to point the build
diff --git a/boards/st/nucleo_h563zi/doc/index.rst b/boards/st/nucleo_h563zi/doc/index.rst
index da88685959cf3..1adc48f7fae5d 100644
--- a/boards/st/nucleo_h563zi/doc/index.rst
+++ b/boards/st/nucleo_h563zi/doc/index.rst
@@ -136,71 +136,7 @@ More information about STM32H563ZI can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_h563zi board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| BKP SRAM  | on-chip    | Backup SRAM                         |
-+-----------+------------+-------------------------------------+
-| CAN/CANFD | on-chip    | CAN                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | PWM                                 |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | Real Time Clock                     |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi bus                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c bus                             |
-+-----------+------------+-------------------------------------+
-| I3C       | on-chip    | i3c bus                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB full-speed host/device bus      |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig and dts files:
-
-- Secure target:
-
-  - :zephyr_file:`boards/st/nucleo_h563zi/nucleo_h563zi_defconfig`
-  - :zephyr_file:`boards/st/nucleo_h563zi/nucleo_h563zi.dts`
-
-Zephyr board options
-====================
-
-The STM32H563 is an SoC with Cortex-M33 architecture. Zephyr provides support
-for building for Secure firmware.
-
-The BOARD options are summarized below:
-
-+----------------------+-----------------------------------------------+
-|   BOARD              | Description                                   |
-+======================+===============================================+
-| nucleo_h563zi        | For building Secure firmware                  |
-+----------------------+-----------------------------------------------+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -249,6 +185,8 @@ VBAT can be provided via the left ST Morpho connector's pin 33.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H563ZI board includes an ST-LINK/V3EC embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
@@ -261,7 +199,7 @@ OpenOCD Support
 
 For now, openocd support  for stm32h5 is not available on upstream OpenOCD.
 You can check `OpenOCD official Github mirror`_.
-In order to use it though, you should clone from the cutomized
+In order to use it though, you should clone from the customized
 `STMicroelectronics OpenOCD Github`_ and compile it following usual README guidelines.
 Once it is done, you can set the OPENOCD and OPENOCD_DEFAULT_PATH variables in
 :zephyr_file:`boards/st/nucleo_h563zi/board.cmake` to point the build
diff --git a/boards/st/nucleo_h563zi/nucleo_h563zi.dts b/boards/st/nucleo_h563zi/nucleo_h563zi.dts
index 8acb70d0e6c42..add1ea518db5c 100644
--- a/boards/st/nucleo_h563zi/nucleo_h563zi.dts
+++ b/boards/st/nucleo_h563zi/nucleo_h563zi.dts
@@ -49,6 +49,8 @@
 		     &eth_txd0_pg13
 		     &eth_txd1_pb15>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -56,9 +58,8 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
diff --git a/boards/st/nucleo_h723zg/doc/index.rst b/boards/st/nucleo_h723zg/doc/index.rst
index 6cd0dc6c56806..981228ca8caf0 100644
--- a/boards/st/nucleo_h723zg/doc/index.rst
+++ b/boards/st/nucleo_h723zg/doc/index.rst
@@ -80,43 +80,7 @@ Nucleo H723ZG provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_h723zg board configuration supports the following hardware
-features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | counter                             |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| SPI         | on-chip    | spi                                 |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| ETHERNET    | on-chip    | ethernet                            |
-+-------------+------------+-------------------------------------+
-| RNG         | on-chip    | True Random number generator        |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | rtc                                 |
-+-------------+------------+-------------------------------------+
-| FDCAN1      | on-chip    | CAN-FD Controller                   |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig files:
-:zephyr_file:`boards/st/nucleo_h723zg/nucleo_h723zg_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
@@ -164,6 +128,8 @@ connected to pins PD0 (RX) and PD1 (TX).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H723ZG board includes an ST-LINK/V3 embedded debug tool interface.
 
 .. note::
diff --git a/boards/st/nucleo_h723zg/nucleo_h723zg.dts b/boards/st/nucleo_h723zg/nucleo_h723zg.dts
index 72fc5b7f0928d..8c49c833e7152 100644
--- a/boards/st/nucleo_h723zg/nucleo_h723zg.dts
+++ b/boards/st/nucleo_h723zg/nucleo_h723zg.dts
@@ -178,6 +178,8 @@
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -185,10 +187,9 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	phy: ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/nucleo_h743zi/doc/index.rst b/boards/st/nucleo_h743zi/doc/index.rst
index cb6e58b3b2989..2f8008a66b590 100644
--- a/boards/st/nucleo_h743zi/doc/index.rst
+++ b/boards/st/nucleo_h743zi/doc/index.rst
@@ -82,53 +82,7 @@ Nucleo H743ZI provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_h743zi board configuration supports the following hardware
-features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | counter                             |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| ADC         | on-chip    | adc                                 |
-+-------------+------------+-------------------------------------+
-| DAC         | on-chip    | DAC Controller                      |
-+-------------+------------+-------------------------------------+
-| RNG         | on-chip    | True Random number generator        |
-+-------------+------------+-------------------------------------+
-| ETHERNET    | on-chip    | ethernet                            |
-+-------------+------------+-------------------------------------+
-| SPI         | on-chip    | spi                                 |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| WATCHDOG    | on-chip    | independent watchdog                |
-+-------------+------------+-------------------------------------+
-| USB         | on-chip    | usb_device                          |
-+-------------+------------+-------------------------------------+
-| CAN/CANFD   | on-chip    | canbus                              |
-+-------------+------------+-------------------------------------+
-| die-temp    | on-chip    | die temperature sensor              |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | rtc                                 |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_h743zi/nucleo_h743zi_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
@@ -177,6 +131,8 @@ Requires an external CAN or CANFD transceiver.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H743ZI board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_h743zi`` board configuration can be built and
diff --git a/boards/st/nucleo_h743zi/nucleo_h743zi.dts b/boards/st/nucleo_h743zi/nucleo_h743zi.dts
index cd47bf9794c0b..e774b728c213d 100644
--- a/boards/st/nucleo_h743zi/nucleo_h743zi.dts
+++ b/boards/st/nucleo_h743zi/nucleo_h743zi.dts
@@ -203,6 +203,8 @@ zephyr_udc0: &usbotg_fs {
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -210,10 +212,9 @@ zephyr_udc0: &usbotg_fs {
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/nucleo_h745zi_q/doc/index.rst b/boards/st/nucleo_h745zi_q/doc/index.rst
index 39a74a81ab734..8cb4d3ae78a5e 100644
--- a/boards/st/nucleo_h745zi_q/doc/index.rst
+++ b/boards/st/nucleo_h745zi_q/doc/index.rst
@@ -84,42 +84,7 @@ Nucleo H745ZI-Q provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_h745zi_q board configuration supports the following hardware
-features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | counter                             |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| ETHERNET    | on-chip    | ethernet                            |
-+-------------+------------+-------------------------------------+
-| RNG         | on-chip    | True Random number generator        |
-+-------------+------------+-------------------------------------+
-| USB OTG FS  | on-chip    | USB device                          |
-+-------------+------------+-------------------------------------+
-| SPI         | on-chip    | spi                                 |
-+-------------+------------+-------------------------------------+
-| FDCAN       | on-chip    | CAN-FD Control Area Network         |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration per core can be found in the defconfig files:
-:zephyr_file:`boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7_defconfig` and
-:zephyr_file:`boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
@@ -168,6 +133,8 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H745ZI-Q board includes an ST-LINK/V3 embedded debug tool interface.
 
 Applications for the ``nucleo_h745zi_q`` board should be built per core target,
diff --git a/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.dts b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.dts
index c79712968e1bc..bca10943e9c66 100644
--- a/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.dts
+++ b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.dts
@@ -115,6 +115,8 @@
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -122,10 +124,9 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/nucleo_h753zi/doc/index.rst b/boards/st/nucleo_h753zi/doc/index.rst
index a6b8dcf0bf676..fe99931c23cae 100644
--- a/boards/st/nucleo_h753zi/doc/index.rst
+++ b/boards/st/nucleo_h753zi/doc/index.rst
@@ -84,43 +84,7 @@ Nucleo H753ZI provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_h753zi board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb_device                          |
-+-----------+------------+-------------------------------------+
-| CAN/CANFD | on-chip    | canbus                              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_h753zi/nucleo_h753zi_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
@@ -162,6 +126,8 @@ Requires an external CAN or CANFD transceiver.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H753ZI board includes an ST-LINK/V3 embedded debug tool interface.
 
 Applications for the ``nucleo_h753zi`` board configuration can be built and
diff --git a/boards/st/nucleo_h753zi/nucleo_h753zi.dts b/boards/st/nucleo_h753zi/nucleo_h753zi.dts
index 83ee70c171de7..e411028579b45 100644
--- a/boards/st/nucleo_h753zi/nucleo_h753zi.dts
+++ b/boards/st/nucleo_h753zi/nucleo_h753zi.dts
@@ -11,7 +11,7 @@
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {
-	model = "STMicroelectronics STM32H743ZI-NUCLEO board";
+	model = "STMicroelectronics STM32H753ZI-NUCLEO board";
 	compatible = "st,stm32h753zi-nucleo";
 
 	chosen {
@@ -182,6 +182,8 @@ zephyr_udc0: &usbotg_fs {
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -189,10 +191,9 @@ zephyr_udc0: &usbotg_fs {
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/nucleo_h755zi_q/doc/index.rst b/boards/st/nucleo_h755zi_q/doc/index.rst
index cc29afb00093b..9b26e8aea79ca 100644
--- a/boards/st/nucleo_h755zi_q/doc/index.rst
+++ b/boards/st/nucleo_h755zi_q/doc/index.rst
@@ -77,40 +77,9 @@ Nucleo H755ZI-Q provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_h755zi_q board configuration supports the following hardware
-features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART/USART  | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | counter                             |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| ETHERNET    | on-chip    | ethernet                            |
-+-------------+------------+-------------------------------------+
-| RNG         | on-chip    | True Random number generator        |
-+-------------+------------+-------------------------------------+
-| USB OTG FS  | on-chip    | USB device                          |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration per core can be found in the defconfig files:
-:zephyr_file:`boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7_defconfig` and
-:zephyr_file:`boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m4_defconfig`
-
-For mode details please refer to `STM32 Nucleo-144 board User Manual`_.
+.. zephyr:board-supported-hw::
+
+For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
 Default Zephyr Peripheral Mapping:
 ----------------------------------
@@ -124,6 +93,7 @@ and a ST morpho connector. Board is configured as follows:
 - LD2 : PE1
 - LD3 : PB14
 - I2C : PB8, PB9
+- CAN/CANFD : PD0, PD1
 
 System Clock
 ------------
@@ -138,6 +108,11 @@ Serial Port
 Nucleo H755ZI-Q board has 4 UARTs and 4 USARTs. The Zephyr console output is
 assigned to USART3. Default settings are 115200 8N1.
 
+CAN, CANFD
+----------
+
+Requires an external CAN or CANFD transceiver.
+
 Resources sharing
 -----------------
 
@@ -156,6 +131,8 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H755ZI-Q board includes an ST-LINK/V3 embedded debug tool interface.
 
 Applications for the ``nucleo_h755zi_q`` board should be built per core target,
diff --git a/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.dts b/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.dts
index d565297ebcb48..bda0b08c27448 100644
--- a/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.dts
+++ b/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.dts
@@ -26,6 +26,7 @@
 		zephyr,dtcm = &dtcm;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
+		zephyr,canbus = &fdcan1;
 	};
 
 	pwmleds {
@@ -68,6 +69,24 @@
 	status = "okay";
 };
 
+&pll2 {
+	div-m = <4>;
+	mul-n = <120>;
+	div-p = <2>;
+	div-q = <3>; /* gives 80MHz to the FDCAN */
+	div-r = <2>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&fdcan1 {
+	clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000100>,
+		 <&rcc STM32_SRC_PLL2_Q FDCAN_SEL(2)>;
+	pinctrl-0 = <&fdcan1_rx_pd0 &fdcan1_tx_pd1>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &rcc {
 	clocks = <&pll>;
 	clock-frequency = <DT_FREQ_M(480)>;
@@ -114,6 +133,8 @@
 		     &eth_txd0_pg13
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -121,10 +142,9 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.yaml b/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.yaml
index 63739dff138ea..0865ea5498509 100644
--- a/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.yaml
+++ b/boards/st/nucleo_h755zi_q/nucleo_h755zi_q_stm32h755xx_m7.yaml
@@ -17,4 +17,5 @@ supported:
   - pwm
   - netif:eth
   - usb_device
+  - can
 vendor: st
diff --git a/boards/st/nucleo_h755zi_q/support/openocd.cfg b/boards/st/nucleo_h755zi_q/support/openocd.cfg
index 719125ff149de..4635f852bcec8 100644
--- a/boards/st/nucleo_h755zi_q/support/openocd.cfg
+++ b/boards/st/nucleo_h755zi_q/support/openocd.cfg
@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Borrow the nucleo_h745zi openocd configuration as no config exists for the h755 yet.
-source [find board/st_nucleo_h745zi.cfg]
+# Borrow the stm32h745i-disco openocd configuration as no config exists for the h755 yet.
+source [find board/stm32h745i-disco.cfg]
 
 # Use connect_assert_srst here to be able to program
 # even when core is in sleep mode
diff --git a/boards/st/nucleo_h7a3zi_q/doc/index.rst b/boards/st/nucleo_h7a3zi_q/doc/index.rst
index e823191e62591..5a251da92fd82 100644
--- a/boards/st/nucleo_h7a3zi_q/doc/index.rst
+++ b/boards/st/nucleo_h7a3zi_q/doc/index.rst
@@ -78,37 +78,7 @@ Nucleo H7A3ZI-Q provides the following hardware components:
 Supported Features
 ==================
 
-The Zephyr nucleo_h7a3zi_q board configuration supports the following hardware
-features:
-
-+-------------+------------+------------------------------------+
-| Interface   | Controller | Driver/Component                   |
-+=============+============+====================================+
-| NVIC        | on-chip    | nested vector interrupt controller |
-+-------------+------------+------------------------------------+
-| UART        | on-chip    | serial port                        |
-+-------------+------------+------------------------------------+
-| PINMUX      | on-chip    | pinmux                             |
-+-------------+------------+------------------------------------+
-| GPIO        | on-chip    | gpio                               |
-+-------------+------------+------------------------------------+
-| PWM         | on-chip    | pwm                                |
-+-------------+------------+------------------------------------+
-| ADC         | on-chip    | adc                                |
-+-------------+------------+------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                        |
-+-------------+------------+------------------------------------+
-| USB OTG HS  | on-chip    | USB device                         |
-+-------------+------------+------------------------------------+
-| RNG         | on-chip    | True Random number generator       |
-+-------------+------------+------------------------------------+
-
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32 Nucleo-144 board User Manual`_.
 
@@ -141,6 +111,8 @@ assigned to USART3. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H7A3ZI-Q board includes an ST-LINK/V3E embedded debug tool interface.
 
 Applications for the ``nucleo_h7a3zi_q`` board configuration can be built and
diff --git a/boards/st/nucleo_h7s3l8/doc/index.rst b/boards/st/nucleo_h7s3l8/doc/index.rst
index 4d24bb9afe50d..0a9a5147811b8 100644
--- a/boards/st/nucleo_h7s3l8/doc/index.rst
+++ b/boards/st/nucleo_h7s3l8/doc/index.rst
@@ -148,39 +148,7 @@ More information about STM32H7S3 can be found here:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_h7s3l8`` board target supports the following hardware
-features:
-
-+-------------+------------+-------------------------------------+
-| Interface   | Controller | Driver/Component                    |
-+=============+============+=====================================+
-| NVIC        | on-chip    | nested vector interrupt controller  |
-+-------------+------------+-------------------------------------+
-| UART        | on-chip    | serial port                         |
-+-------------+------------+-------------------------------------+
-| PINMUX      | on-chip    | pinmux                              |
-+-------------+------------+-------------------------------------+
-| GPIO        | on-chip    | gpio                                |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | counter                             |
-+-------------+------------+-------------------------------------+
-| I2C         | on-chip    | i2c                                 |
-+-------------+------------+-------------------------------------+
-| SPI         | on-chip    | spi                                 |
-+-------------+------------+-------------------------------------+
-| PWM         | on-chip    | pwm                                 |
-+-------------+------------+-------------------------------------+
-| RNG         | on-chip    | True Random number generator        |
-+-------------+------------+-------------------------------------+
-| Backup SRAM | on-chip    | Backup SRAM                         |
-+-------------+------------+-------------------------------------+
-| RTC         | on-chip    | rtc                                 |
-+-------------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig files:
-:zephyr_file:`boards/st/nucleo_h7s3l8/nucleo_h7s3l8_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32H7R/S Nucleo-144 board User Manual`_.
 
@@ -220,6 +188,8 @@ do it by removing ``SB13`` jumper on the back side of the board.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo H7S3L8 board includes an ST-LINK/V3 embedded debug tool interface.
 
 .. note::
diff --git a/boards/st/nucleo_l011k4/doc/index.rst b/boards/st/nucleo_l011k4/doc/index.rst
index 0b61e27b1a961..5994d0015427d 100644
--- a/boards/st/nucleo_l011k4/doc/index.rst
+++ b/boards/st/nucleo_l011k4/doc/index.rst
@@ -56,33 +56,7 @@ More information about STM32L011K4 can be found in the
 Supported Features
 ==================
 
-The Zephyr nucleo_l011k4 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi controller                      |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l011k4/nucleo_l011k4_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -105,6 +79,8 @@ For more details please refer to `STM32 Nucleo-32 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L011K4 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l011k4`` board configuration can be built and
diff --git a/boards/st/nucleo_l031k6/doc/index.rst b/boards/st/nucleo_l031k6/doc/index.rst
index b5a7727a23864..e5572afed00bb 100644
--- a/boards/st/nucleo_l031k6/doc/index.rst
+++ b/boards/st/nucleo_l031k6/doc/index.rst
@@ -55,33 +55,7 @@ More information about STM32L031K6 can be found in the
 Supported Features
 ==================
 
-The Zephyr nucleo_l031k6 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi controller                      |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l031k6/nucleo_l031k6_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -104,6 +78,8 @@ For more details please refer to `STM32 Nucleo-32 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L031K6 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l031k6`` board configuration can be built and
diff --git a/boards/st/nucleo_l053r8/doc/index.rst b/boards/st/nucleo_l053r8/doc/index.rst
index 39d2669ce6d50..a301b02531ba3 100644
--- a/boards/st/nucleo_l053r8/doc/index.rst
+++ b/boards/st/nucleo_l053r8/doc/index.rst
@@ -57,33 +57,7 @@ More information about STM32L053R8 can be found in the
 Supported Features
 ==================
 
-The Zephyr nucleo_l053r8 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi controller                      |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l053r8/nucleo_l053r8_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -114,6 +88,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L053R8 board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l053r8`` board configuration can be built and
diff --git a/boards/st/nucleo_l073rz/doc/index.rst b/boards/st/nucleo_l073rz/doc/index.rst
index e6e5f669adb78..a75313f7d5851 100644
--- a/boards/st/nucleo_l073rz/doc/index.rst
+++ b/boards/st/nucleo_l073rz/doc/index.rst
@@ -57,47 +57,7 @@ More information about STM32L073RZ can be found in the
 Supported Features
 ==================
 
-The Zephyr nucleo_l073rz board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi controller                      |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | Random Number Generator             |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l073rz/nucleo_l073rz_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -130,6 +90,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L073RZ board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l073rz`` board configuration can be built and
diff --git a/boards/st/nucleo_l152re/doc/index.rst b/boards/st/nucleo_l152re/doc/index.rst
index 1973ffa8e5a39..4b6a27f3e757c 100644
--- a/boards/st/nucleo_l152re/doc/index.rst
+++ b/boards/st/nucleo_l152re/doc/index.rst
@@ -57,49 +57,7 @@ More information about STM32L152RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l152re board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| EEPROM    | on-chip    | eeprom                              |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | PWM                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/nucleo_l152re/nucleo_l152re_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -130,6 +88,8 @@ For more details please refer to `STM32 Nucleo-64 board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L152RE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l152re`` board configuration can be built and
diff --git a/boards/st/nucleo_l152re/nucleo_l152re.dts b/boards/st/nucleo_l152re/nucleo_l152re.dts
index d1278873fd88d..2d2e048e70dcb 100644
--- a/boards/st/nucleo_l152re/nucleo_l152re.dts
+++ b/boards/st/nucleo_l152re/nucleo_l152re.dts
@@ -25,7 +25,7 @@
 	leds: leds {
 		compatible = "gpio-leds";
 		green_led_0: led_0 {
-			gpios = <&gpioa 5 GPIO_ACTIVE_LOW>;
+			gpios = <&gpioa 5 GPIO_ACTIVE_HIGH>;
 			label = "User LD2";
 		};
 	};
diff --git a/boards/st/nucleo_l412rb_p/doc/index.rst b/boards/st/nucleo_l412rb_p/doc/index.rst
index 75caa4e9f1b97..e20d978dc6109 100644
--- a/boards/st/nucleo_l412rb_p/doc/index.rst
+++ b/boards/st/nucleo_l412rb_p/doc/index.rst
@@ -128,34 +128,7 @@ More information about STM32L412RB can be found here:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_l412rb_p`` board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l412rb_p/nucleo_l412rb_p_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -201,6 +174,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L412RB-P board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l412rb_p`` board configuration can be built and
diff --git a/boards/st/nucleo_l432kc/doc/index.rst b/boards/st/nucleo_l432kc/doc/index.rst
index ad17c525de5f2..5348e09d6e292 100644
--- a/boards/st/nucleo_l432kc/doc/index.rst
+++ b/boards/st/nucleo_l432kc/doc/index.rst
@@ -89,35 +89,10 @@ More information about STM32L432KC can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l432kc board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note:: CAN feature requires CAN transceiver
 
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l432kc/nucleo_l432kc_defconfig`
-
-
 Connections and IOs
 ===================
 
@@ -161,6 +136,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L432KC board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l432kc`` board configuration can be built and
diff --git a/boards/st/nucleo_l433rc_p/doc/index.rst b/boards/st/nucleo_l433rc_p/doc/index.rst
index 5b61f6e77183e..ffce9d4adeb3b 100644
--- a/boards/st/nucleo_l433rc_p/doc/index.rst
+++ b/boards/st/nucleo_l433rc_p/doc/index.rst
@@ -90,37 +90,10 @@ More information about STM32L433RC can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l433rc_p board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note:: CAN feature requires CAN transceiver
 
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l433rc_p/nucleo_l433rc_p_defconfig`
-
-
 Connections and IOs
 ===================
 
@@ -166,6 +139,8 @@ to LPUART1. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L433RC-P board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l433rc_p`` board configuration can be built and
diff --git a/boards/st/nucleo_l452re/doc/index.rst b/boards/st/nucleo_l452re/doc/index.rst
index 2995387e8ae4e..5c5dddd7cae39 100644
--- a/boards/st/nucleo_l452re/doc/index.rst
+++ b/boards/st/nucleo_l452re/doc/index.rst
@@ -99,38 +99,10 @@ More information about STM32L452RE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l452re board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note:: CAN feature requires CAN transceiver
 
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l452re/nucleo_l452re_defconfig`
-
-And for Nucleo L452RE-P in this defconfig file:
-:zephyr_file:`boards/st/nucleo_l452re/nucleo_l452re_stm32l452xx_p_defconfig`
-
-
 Connections and IOs
 ===================
 
@@ -185,6 +157,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L452RE board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l452re`` board configuration can be built and
diff --git a/boards/st/nucleo_l476rg/doc/index.rst b/boards/st/nucleo_l476rg/doc/index.rst
index 7c0ddb76958d3..7bdf04eeab116 100644
--- a/boards/st/nucleo_l476rg/doc/index.rst
+++ b/boards/st/nucleo_l476rg/doc/index.rst
@@ -94,34 +94,7 @@ More information about STM32L476RG can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l476rg board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l476rg/nucleo_l476rg_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -174,6 +147,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L476RG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l476rg`` board configuration can be built and
diff --git a/boards/st/nucleo_l476rg/nucleo_l476rg.dts b/boards/st/nucleo_l476rg/nucleo_l476rg.dts
index ecc5ea5cf7af2..4a63a5ad3280b 100644
--- a/boards/st/nucleo_l476rg/nucleo_l476rg.dts
+++ b/boards/st/nucleo_l476rg/nucleo_l476rg.dts
@@ -63,6 +63,7 @@
 	div-m = <1>;
 	mul-n = <20>;
 	div-r = <4>;
+	div-q = <8>;
 	clocks = <&clk_hsi>;
 	status = "okay";
 };
@@ -193,3 +194,10 @@ stm32_lp_tick_source: &lptim1 {
 		};
 	};
 };
+
+&rng {
+	/* Change clock source to avoid using MSI */
+	clocks = <&rcc STM32_CLOCK(AHB2, 18U)>,
+		 <&rcc STM32_SRC_PLL_Q CLK48_SEL(2)>;
+	status = "okay";
+};
diff --git a/boards/st/nucleo_l496zg/doc/index.rst b/boards/st/nucleo_l496zg/doc/index.rst
index 838bec9905e66..97e25d36cdf7e 100644
--- a/boards/st/nucleo_l496zg/doc/index.rst
+++ b/boards/st/nucleo_l496zg/doc/index.rst
@@ -98,38 +98,7 @@ More information about STM32L496ZG can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l496zg board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| OTG FS    | on-chip    | USB OTG Full-speed                  |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | System Window Watchdog              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l496zg/nucleo_l496zg_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -177,6 +146,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L496ZG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l496zg`` board configuration can be built and
diff --git a/boards/st/nucleo_l4a6zg/doc/index.rst b/boards/st/nucleo_l4a6zg/doc/index.rst
index aced62768600a..a5dc14787a52d 100644
--- a/boards/st/nucleo_l4a6zg/doc/index.rst
+++ b/boards/st/nucleo_l4a6zg/doc/index.rst
@@ -99,40 +99,7 @@ More information about STM32L4A6ZG can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l4a6zg board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | System Window Watchdog              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l4a6zg/nucleo_l4a6zg_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -174,6 +141,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L4A6ZG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l4a6zg`` board configuration can be built and
diff --git a/boards/st/nucleo_l4r5zi/doc/index.rst b/boards/st/nucleo_l4r5zi/doc/index.rst
index 7ea8f85980620..937689ac630d2 100644
--- a/boards/st/nucleo_l4r5zi/doc/index.rst
+++ b/boards/st/nucleo_l4r5zi/doc/index.rst
@@ -109,39 +109,7 @@ More information about STM32L4R5ZI can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l4r5zi board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_l4r5zi/nucleo_l4r5zi_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -214,6 +182,8 @@ Ethernet over USB is configured as the default network interface (EEM)
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The NUCLEO-L4R5ZI board includes a ST-LINK/V2 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/nucleo_l552ze_q/doc/nucleol552ze_q.rst b/boards/st/nucleo_l552ze_q/doc/nucleol552ze_q.rst
index 9dab9c36a9ab2..434c1dc4975e8 100644
--- a/boards/st/nucleo_l552ze_q/doc/nucleol552ze_q.rst
+++ b/boards/st/nucleo_l552ze_q/doc/nucleol552ze_q.rst
@@ -123,55 +123,7 @@ More information about STM32L552ZE can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_l552ze_q board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| TrustZone | on-chip    | Trusted Firmware-M                  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig and dts files:
-
-- Common:
-
-  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q-common.dtsi`
-
-- Secure target:
-
-  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q_defconfig`
-  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q.dts`
-
-- Non-Secure target:
-
-  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q_stm32l552xx_ns_defconfig`
-  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q_stm32l552xx_ns.dts`
+.. zephyr:board-supported-hw::
 
 Zephyr board options
 ====================
@@ -275,6 +227,8 @@ UART2. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo L552ZE Q board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_l552ze_q`` board configuration can be built and
diff --git a/boards/st/nucleo_n657x0_q/Kconfig.defconfig b/boards/st/nucleo_n657x0_q/Kconfig.defconfig
new file mode 100644
index 0000000000000..170ddd3eb3741
--- /dev/null
+++ b/boards/st/nucleo_n657x0_q/Kconfig.defconfig
@@ -0,0 +1,15 @@
+# STM32N657X0_Q Nucleo board configuration
+
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NUCLEO_N657X0_Q
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+endif # NETWORKING
+
+endif # BOARD_NUCLEO_N657X0_Q
diff --git a/boards/st/nucleo_n657x0_q/arduino_r3_connector.dtsi b/boards/st/nucleo_n657x0_q/arduino_r3_connector.dtsi
new file mode 100644
index 0000000000000..3d452c84a643a
--- /dev/null
+++ b/boards/st/nucleo_n657x0_q/arduino_r3_connector.dtsi
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/ {
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpioa 8 0>,	/* A0 */
+			   <1 0 &gpioa 9 0>,	/* A1 */
+			   <2 0 &gpioa 10 0>,	/* A2 */
+			   <3 0 &gpioa 12 0>,	/* A3 */
+			   <4 0 &gpiof 3 0>,	/* A4 */
+			   <5 0 &gpiog 15 0>,	/* A5 */
+			   <6 0 &gpiod 9 0>,	/* D0 */
+			   <7 0 &gpiod 8 0>,	/* D1 */
+			   <8 0 &gpiod 0 0>,	/* D2 */
+			   <9 0 &gpioe 9 0>,	/* D3 */
+			   <10 0 &gpioe 0 0>,	/* D4 */
+			   <11 0 &gpioe 10 0>,	/* D5 */
+			   <12 0 &gpiod 5 0>,	/* D6 */
+			   <13 0 &gpioe 11 0>,	/* D7 */
+			   <14 0 &gpiod 12 0>,	/* D8 */
+			   <15 0 &gpiod 7 0>,	/* D9 */
+			   <16 0 &gpioa 3 0>,	/* D10 */
+			   <17 0 &gpiog 2 0>,	/* D11 */
+			   <18 0 &gpiog 1 0>,	/* D12 */
+			   <19 0 &gpioe 15 0>,	/* D13 */
+			   <20 0 &gpioc 1 0>,	/* D14 */
+			   <21 0 &gpioh 9 0>;	/* D15 */
+	};
+};
+
+arduino_serial: &usart3 {};
+arduino_i2c: &i2c1 {};
+arduino_spi: &spi5 {};
diff --git a/boards/st/nucleo_n657x0_q/doc/index.rst b/boards/st/nucleo_n657x0_q/doc/index.rst
index 57e8dd010eac1..866f8f59de7e1 100644
--- a/boards/st/nucleo_n657x0_q/doc/index.rst
+++ b/boards/st/nucleo_n657x0_q/doc/index.rst
@@ -60,29 +60,37 @@ For more details, please refer to:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_n657x0_q`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access Controller     |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_n657x0_q/nucleo_n657x0_q_defconfig`
-
+.. zephyr:board-supported-hw::
+
+USB
+===
+
+The USB pin assignments on the STM32N657XX microcontroller are immutable. This means that the specific
+pins designated for USB functionality are fixed and cannot be changed or reassigned to other functions,
+ensuring consistent and reliable USB communication.
+
+USB PIN (IOs)
+=============
+
++------------------+--------------------------------------+
+| Name             | Description                          |
++==================+======================================+
+| OTG1_HSDM        | USB OTG1 High-Speed Data- (negative) |
++------------------+--------------------------------------+
+| OTG1_HSDP        | USB OTG1 High-Speed Data+ (positive) |
++------------------+--------------------------------------+
+| OTG1_ID          | USB OTG1 ID Pin                      |
++------------------+--------------------------------------+
+| OTG1_TXRTUNE     | USB OTG1 Transmit Retune             |
++------------------+--------------------------------------+
+| OTG2_HSDM        | USB OTG2 High-Speed Data- (negative) |
++------------------+--------------------------------------+
+| OTG2_HSDP        | USB OTG2 High-Speed Data+ (positive) |
++------------------+--------------------------------------+
+| OTG2_ID          | USB OTG2 ID Pin                      |
++------------------+--------------------------------------+
+| OTG2_TXRTUNE     | USB OTG2 Transmit Retune             |
++------------------+--------------------------------------+
 
 Connections and IOs
 ===================
@@ -95,10 +103,35 @@ For more details please refer to `NUCLEO-N657X0-Q User Manual`_.
 Default Zephyr Peripheral Mapping:
 ----------------------------------
 
+- ADC1_INP10 : PA9
+- ADC1_INP11 : PA10
+- FDCAN1_TX : PH2
+- FDCAN1_RX : PD0
+- I2C1_SCL : PH9
+- I2C1_SDA : PC1
+- I2C4_SCL : PE13
+- I2C4_SDA : PE14
 - LD1 : PO1
 - LD2 : PG10
+- SPI5_SCK : PE15
+- SPI5_MOSI : PG2
+- SPI5_MISO : PG1
+- SPI5_NSS : PA3
 - USART_1_TX : PE5
 - USART_1_RX : PE6
+- USART_3_TX : PD8
+- USART_3_RX : PD9
+- XSPI2_NCS1 : PN1
+- XSPI2_DQS0 : PN0
+- XSPI2_CLK : PN6
+- XSPI2_IO0 : PN2
+- XSPI2_IO1 : PN3
+- XSPI2_IO2 : PN4
+- XSPI2_IO3 : PN5
+- XSPI2_IO4 : PN8
+- XSPI2_IO5 : PN9
+- XSPI2_IO6 : PN10
+- XSPI2_IO7 : PN11
 
 System Clock
 ------------
@@ -116,6 +149,8 @@ USART1. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 NUCLEO-N657X0-Q board includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash and debug the board using various tools.
 
@@ -128,6 +163,13 @@ The board is configured to be programmed using west `STM32CubeProgrammer`_ runne
 so its :ref:`installation <stm32cubeprog-flash-host-tools>` is needed.
 Version 2.18.0 or later of `STM32CubeProgrammer`_ is required.
 
+.. note::
+   Firmware is run in secure mode of execution, which requires a signature.
+   After build, the build system  will automatically generate a signed version of the
+   binary using `STM32CubeProgrammer`_ utility ``STM32_SigningTool_CLI``.
+   This utility is installed along with `STM32CubeProgrammer`_, but make sure it is
+   available in your ``PATH`` variable.
+
 To program the board, there are two options:
 
 - Program the firmware in external flash. At boot, it will then be loaded on RAM
@@ -154,7 +196,7 @@ First, connect the NUCLEO-N657X0-Q to your host computer using the ST-Link USB p
             :board: nucleo_n657x0_q
             :goals: build flash
 
-.. note::
+         .. note::
             For flashing, before powering the board, set the boot pins in the following configuration:
 
             * BOOT0: 0
@@ -166,12 +208,6 @@ First, connect the NUCLEO-N657X0-Q to your host computer using the ST-Link USB p
 
 	    Power off and on the board again.
 
-         Run a serial host program to connect to your board:
-
-.. code-block:: console
-
-   $ minicom -D /dev/ttyACM0
-
       .. group-tab:: Serial Boot Loader (USB)
 
          Additionally, connect the NUCLEO-N657X0-Q to your host computer using the USB port.
@@ -187,10 +223,10 @@ First, connect the NUCLEO-N657X0-Q to your host computer using the ST-Link USB p
          Build and load an application using ``nucleo_n657x0_q/stm32n657xx/sb`` target (you
          can also use the shortened form: ``nucleo_n657x0_q//sb``)
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/hello_world
-   :board: nucleo_n657x0_q
-   :goals: build flash
+         .. zephyr-app-commands::
+            :zephyr-app: samples/hello_world
+            :board: nucleo_n657x0_q
+            :goals: build flash
 
 
 Run a serial host program to connect to your board:
diff --git a/boards/st/nucleo_n657x0_q/nucleo_n657x0_q_common.dtsi b/boards/st/nucleo_n657x0_q/nucleo_n657x0_q_common.dtsi
index 3dffbe335e734..45df3911f4f7a 100644
--- a/boards/st/nucleo_n657x0_q/nucleo_n657x0_q_common.dtsi
+++ b/boards/st/nucleo_n657x0_q/nucleo_n657x0_q_common.dtsi
@@ -6,13 +6,17 @@
 
 #include <st/n6/stm32n657X0.dtsi>
 #include <st/n6/stm32n657x0hxq-pinctrl.dtsi>
+#include <zephyr/dt-bindings/flash_controller/xspi.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
+#include "arduino_r3_connector.dtsi"
 
 / {
 	chosen {
 		zephyr,console = &usart1;
 		zephyr,shell-uart = &usart1;
 		zephyr,sram = &axisram2;
+		zephyr,canbus = &fdcan1;
+		spi-flash0 = &mx25um51245g;
 	};
 
 	leds: leds {
@@ -46,10 +50,18 @@
 
 	aliases {
 		led0 = &green_led;
+		led1 = &blue_led;
+		led2 = &red_led;
 		sw0 = &user_button;
 	};
 };
 
+&clk_hse {
+	hse-div2;
+	clock-frequency = <DT_FREQ_M(48)>;
+	status = "okay";
+};
+
 &clk_hsi {
 	hsi-div = <1>;
 	status = "okay";
@@ -110,6 +122,49 @@
 	apb5-prescaler = <1>;
 };
 
+&adc1 {
+	clocks = <&rcc STM32_CLOCK(AHB1, 5)>,
+		 <&rcc STM32_SRC_CKPER ADC12_SEL(1)>;
+	pinctrl-0 = <&adc1_inp10_pa9 &adc1_inp11_pa10>; /* Arduino A1 & A2 */
+	pinctrl-names = "default";
+	vref-mv = <1800>;
+	status = "okay";
+};
+
+&fdcan1 {
+	clocks = <&rcc STM32_CLOCK(APB1_2, 8)>,
+		 <&rcc STM32_SRC_CKPER FDCAN_SEL(1)>;
+	pinctrl-0 = <&fdcan1_rx_pd0 &fdcan1_tx_ph2>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&i2c1 {
+	clocks = <&rcc STM32_CLOCK(APB1, 21)>,
+		 <&rcc STM32_SRC_CKPER I2C1_SEL(1)>;
+	pinctrl-0 = <&i2c1_scl_ph9 &i2c1_sda_pc1>;
+	pinctrl-names = "default";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	status = "okay";
+};
+
+&i2c4 {
+	clocks = <&rcc STM32_CLOCK(APB4, 7)>,
+		 <&rcc STM32_SRC_CKPER I2C4_SEL(1)>;
+	pinctrl-0 = <&i2c4_scl_pe13 &i2c4_sda_pe14>;
+	pinctrl-names = "default";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	status = "okay";
+};
+
+&spi5 {
+	clocks = <&rcc STM32_CLOCK(APB2, 20)>,
+		 <&rcc STM32_SRC_CKPER SPI5_SEL(1)>;
+	pinctrl-0 = <&spi5_nss_pa3 &spi5_sck_pe15 &spi5_miso_pg1 &spi5_mosi_pg2>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &usart1 {
 	clocks = <&rcc STM32_CLOCK(APB2, 4)>,
 		 <&rcc STM32_SRC_CKPER USART1_SEL(1)>;
@@ -118,3 +173,71 @@
 	current-speed = <115200>;
 	status = "okay";
 };
+
+&usart3 {
+	clocks = <&rcc STM32_CLOCK(APB1, 18)>,
+		 <&rcc STM32_SRC_CKPER USART3_SEL(1)>;
+	pinctrl-0 = <&usart3_tx_pd8 &usart3_rx_pd9>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+zephyr_udc0: &usbotg_hs1 {
+	status = "okay";
+};
+
+&mac {
+	status = "okay";
+	pinctrl-0 = <&eth1_rmii_ref_clk_pf7
+		     &eth1_rmii_crs_dv_pf10
+		     &eth1_rmii_rxd0_pf14
+		     &eth1_rmii_rxd1_pf15
+		     &eth1_rmii_tx_en_pf11
+		     &eth1_rmii_txd0_pf12
+		     &eth1_rmii_txd1_pf13>;
+	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth1_mdio_pf4 &eth1_mdc_pg11>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x0>;
+	};
+};
+
+&xspi2 {
+	pinctrl-0 = <&xspim_p2_ncs1_pn1 &xspim_p2_dqs0_pn0 &xspim_p2_clk_pn6
+		     &xspim_p2_io0_pn2 &xspim_p2_io1_pn3 &xspim_p2_io2_pn4
+		     &xspim_p2_io3_pn5 &xspim_p2_io4_pn8 &xspim_p2_io5_pn9
+		     &xspim_p2_io6_pn10 &xspim_p2_io7_pn11>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	mx25um51245g: ospi-nor-flash@70000000 {
+		compatible = "st,stm32-xspi-nor";
+		reg = <0x70000000 DT_SIZE_M(64)>; /* 512 Mbits */
+		ospi-max-frequency = <DT_FREQ_M(200)>;
+		spi-bus-width = <XSPI_OCTO_MODE>;
+		data-rate = <XSPI_DTR_TRANSFER>;
+		four-byte-opcodes;
+		status = "okay";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			storage_partition: partition@3ff0000 {
+				label = "storage";
+				reg = <0x3ff0000 DT_SIZE_K(64)>;
+			};
+		};
+	};
+};
diff --git a/boards/st/nucleo_n657x0_q/twister.yaml b/boards/st/nucleo_n657x0_q/twister.yaml
index 1fe32141c7fc9..1b3b669ae47ec 100644
--- a/boards/st/nucleo_n657x0_q/twister.yaml
+++ b/boards/st/nucleo_n657x0_q/twister.yaml
@@ -4,9 +4,18 @@ arch: arm
 ram: 1024
 flash: 1024
 supported:
+  - arduino_i2c
+  - arduino_serial
+  - arduino_spi
+  - adc
+  - can
   - dma
+  - i2c
   - gpio
+  - spi
   - uart
+  - usb_device
+  - usbd
 vendor: st
 variants:
   nucleo_n657x0_q/stm32n657xx:
diff --git a/boards/st/nucleo_u031r8/doc/index.rst b/boards/st/nucleo_u031r8/doc/index.rst
index 6126586000f73..f369de0920aff 100644
--- a/boards/st/nucleo_u031r8/doc/index.rst
+++ b/boards/st/nucleo_u031r8/doc/index.rst
@@ -128,32 +128,7 @@ More information about STM32U031R8 can be found here:
 Supported Features
 ==================
 
-The Zephyr _nucleo_u031r8_ board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_u031r8/nucleo_u031r8_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -191,6 +166,8 @@ USART2. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo U031R8 board includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
diff --git a/boards/st/nucleo_u083rc/doc/index.rst b/boards/st/nucleo_u083rc/doc/index.rst
index 7cd2f5db57807..5e4e21b4727d3 100644
--- a/boards/st/nucleo_u083rc/doc/index.rst
+++ b/boards/st/nucleo_u083rc/doc/index.rst
@@ -136,50 +136,7 @@ More information about STM32U083RC can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_u083rc board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | Real Time Clock                     |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB full-speed host/device bus      |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access Controller     |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| LPTIM     | on-chip    | Low Power Timer                     |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_u083rc/nucleo_u083rc_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -222,6 +179,8 @@ USART2. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo U083RC board includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
diff --git a/boards/st/nucleo_u083rc/nucleo_u083rc.dts b/boards/st/nucleo_u083rc/nucleo_u083rc.dts
index cfe5e1495621f..b9d1ca27c1bc6 100644
--- a/boards/st/nucleo_u083rc/nucleo_u083rc.dts
+++ b/boards/st/nucleo_u083rc/nucleo_u083rc.dts
@@ -153,7 +153,7 @@ stm32_lp_tick_source: &lptim1 {
 
 &spi1{
 	pinctrl-0 = <&spi1_sck_pa5 &spi1_miso_pa6 &spi1_mosi_pa7>;
-	cs-gpios = <&gpioa 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+	cs-gpios = <&gpiob 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
 	pinctrl-names = "default";
 	status = "okay";
 };
diff --git a/boards/st/nucleo_u575zi_q/doc/index.rst b/boards/st/nucleo_u575zi_q/doc/index.rst
index 29dc145ce29c7..9824852f35bb2 100644
--- a/boards/st/nucleo_u575zi_q/doc/index.rst
+++ b/boards/st/nucleo_u575zi_q/doc/index.rst
@@ -138,47 +138,7 @@ More information about STM32U575ZI can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_u575zi_q board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CAN/CANFD | on-chip    | canbus                              |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| USB FS    | on-chip    | USB Full Speed device               |
-+-----------+------------+-------------------------------------+
-| BKP SRAM  | on-chip    | Backup SRAM                         |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_u575zi_q/nucleo_u575zi_q_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -238,6 +198,8 @@ do it by removing ``SB50`` jumper on the back side of the board.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo U575ZI-Q board includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
diff --git a/boards/st/nucleo_u5a5zj_q/doc/index.rst b/boards/st/nucleo_u5a5zj_q/doc/index.rst
index 794a2351d825a..28e779822f4e5 100644
--- a/boards/st/nucleo_u5a5zj_q/doc/index.rst
+++ b/boards/st/nucleo_u5a5zj_q/doc/index.rst
@@ -172,47 +172,7 @@ More information about STM32U5A5ZJ can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_u5a5zj_q board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CAN/CANFD | on-chip    | canbus                              |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| BKP SRAM  | on-chip    | Backup SRAM                         |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB 2.0 HS                          |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_u5a5zj_q/nucleo_u5a5zj_q_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -279,6 +239,8 @@ jumper settings.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo U5A5ZJ-Q board includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
diff --git a/boards/st/nucleo_wb05kz/board.cmake b/boards/st/nucleo_wb05kz/board.cmake
index a6b62f37ce2db..84605805bbab8 100644
--- a/boards/st/nucleo_wb05kz/board.cmake
+++ b/boards/st/nucleo_wb05kz/board.cmake
@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # keep first
-board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=sw")
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=sw" "--start-address=0x10000000")
+board_runner_args(pyocd "--target=stm32wb05kzvx")
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/st/nucleo_wb05kz/doc/index.rst b/boards/st/nucleo_wb05kz/doc/index.rst
index 8b5c9a7e54114..2f7cae97d0a1f 100644
--- a/boards/st/nucleo_wb05kz/doc/index.rst
+++ b/boards/st/nucleo_wb05kz/doc/index.rst
@@ -30,38 +30,7 @@ More information about STM32WB05KZV can be found here:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_wb05kz`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | internal flash memory               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| TIMER     | on-chip    | counter, pwm                        |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | Bluetooth Low Energy                |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_wb09ke/nucleo_wb09ke_defconfig`
+.. zephyr:board-supported-hw::
 
 Bluetooh support
 ----------------
@@ -94,6 +63,8 @@ For more details, please refer to the `Nucleo WB05KZ board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo WB05KZ board includes an ST-LINK-V3EC embedded debug tool interface.
 
 Applications for the ``nucleo_w05kz`` board target can be built and flashed
@@ -137,6 +108,13 @@ You should see the following message on the console:
 
    Hello World! nucleo_wb05kz/stm32wb05
 
+Usage of the pyOCD runner requires installation of an additional target pack.
+This can be done using the following commands:
+
+.. code-block:: console
+
+   $ pyocd pack update
+   $ pyocd pack install stm32wb0
 
 Debugging
 =========
diff --git a/boards/st/nucleo_wb05kz/nucleo_wb05kz.dts b/boards/st/nucleo_wb05kz/nucleo_wb05kz.dts
index 93b98e86fded3..5961c1e97056a 100644
--- a/boards/st/nucleo_wb05kz/nucleo_wb05kz.dts
+++ b/boards/st/nucleo_wb05kz/nucleo_wb05kz.dts
@@ -67,6 +67,7 @@
 	};
 
 	aliases {
+		rtc = &rtc;
 		led0 = &blue_led_1;
 		led1 = &green_led_1;
 		led2 = &red_led_1;
@@ -74,6 +75,7 @@
 		sw0 = &user_button_1;
 		sw1 = &user_button_2;
 		sw2 = &user_button_3;
+		watchdog0 = &iwdg;
 	};
 };
 
@@ -105,6 +107,20 @@
 	slow-clock = <&clk_lse>;
 };
 
+&rtc {
+	/**
+	 * STM32_SRC_LSE reflects the "slow-clock" selected on RCC node.
+	 * NO_SEL reflects STM32WB0's lack of RTC clock mux to configure.
+	 */
+	clocks = <&rcc STM32_CLOCK(APB0, 12)>,
+		<&rcc STM32_SRC_LSE NO_SEL>;
+	status = "okay";
+};
+
+&iwdg {
+	status = "okay";
+};
+
 &bt_hci_wb0 {
 	status = "okay";
 };
diff --git a/boards/st/nucleo_wb05kz/nucleo_wb05kz.yaml b/boards/st/nucleo_wb05kz/nucleo_wb05kz.yaml
index 57ede119efe7a..874285b589d66 100644
--- a/boards/st/nucleo_wb05kz/nucleo_wb05kz.yaml
+++ b/boards/st/nucleo_wb05kz/nucleo_wb05kz.yaml
@@ -16,6 +16,8 @@ supported:
   - gpio
   - i2c
   - pwm
+  - rtc
   - spi
+  - watchdog
   - bluetooth
 vendor: st
diff --git a/boards/st/nucleo_wb05kz/support/openocd.cfg b/boards/st/nucleo_wb05kz/support/openocd.cfg
index 6d294443fcfac..22338abf166c4 100644
--- a/boards/st/nucleo_wb05kz/support/openocd.cfg
+++ b/boards/st/nucleo_wb05kz/support/openocd.cfg
@@ -1,5 +1,3 @@
+set CHIPNAME bluenrg-lps
 source [find interface/stlink-dap.cfg]
-
-transport select "dapdirect_swd"
-
-source [find target/stm32wb0x.cfg]
+source [find target/bluenrg-x.cfg]
diff --git a/boards/st/nucleo_wb07cc/board.cmake b/boards/st/nucleo_wb07cc/board.cmake
index f70ab15a58669..d68dc28916557 100644
--- a/boards/st/nucleo_wb07cc/board.cmake
+++ b/boards/st/nucleo_wb07cc/board.cmake
@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # keep first
-board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=sw" "--start-address=0x10040000")
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=sw" "--start-address=0x10000000")
+board_runner_args(pyocd "--target=stm32wb07ccvx")
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/st/nucleo_wb07cc/doc/index.rst b/boards/st/nucleo_wb07cc/doc/index.rst
index 15a2cfc2fe406..de36f37eeb42a 100644
--- a/boards/st/nucleo_wb07cc/doc/index.rst
+++ b/boards/st/nucleo_wb07cc/doc/index.rst
@@ -30,50 +30,19 @@ More information about STM32WB07CCV can be found here:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_wb07cc`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | internal flash memory               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| TIMER     | on-chip    | counter, pwm                        |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | Bluetooth Low Energy                |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_wb07cc/nucleo_wb07cc_defconfig`
-
-Bluetooth support
------------------
+.. zephyr:board-supported-hw::
+
+Bluetooh support
+----------------
 
 BLE support is enabled; however, to build a Zephyr sample using this board,
-the Bluetooth controller library must be fetched into Zephyr as a binary blob.
+you first need to fetch the Bluetooth controller library into Zephyr as a binary BLOB.
 
-To fetch the binary blobs:
+To fetch binary BLOBs:
 
 .. code-block:: console
 
-   $ west blobs fetch hal_stm32
+   west blobs fetch hal_stm32
 
 Connections and IOs
 ===================
@@ -94,6 +63,8 @@ For more details, please refer to the `Nucleo WB07CC board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo WB07CC board includes an ST-LINK-V3EC embedded debug tool interface.
 
 Applications for the ``nucleo_wb07cc`` board target can be built and flashed
@@ -137,6 +108,13 @@ You should see the following message on the console:
 
    Hello World! nucleo_wb07cc/stm32wb07
 
+Usage of the pyOCD runner requires installation of an additional target pack.
+This can be done using the following commands:
+
+.. code-block:: console
+
+   $ pyocd pack update
+   $ pyocd pack install stm32wb0
 
 Debugging
 =========
diff --git a/boards/st/nucleo_wb07cc/nucleo_wb07cc.dts b/boards/st/nucleo_wb07cc/nucleo_wb07cc.dts
index 4b53c858e9237..7d9d4012b5cbb 100644
--- a/boards/st/nucleo_wb07cc/nucleo_wb07cc.dts
+++ b/boards/st/nucleo_wb07cc/nucleo_wb07cc.dts
@@ -66,6 +66,7 @@
 	};
 
 	aliases {
+		rtc = &rtc;
 		led0 = &blue_led_1;
 		led1 = &green_led_1;
 		led2 = &red_led_1;
@@ -73,6 +74,7 @@
 		sw0 = &user_button_1;
 		sw1 = &user_button_2;
 		sw2 = &user_button_3;
+		watchdog0 = &iwdg;
 	};
 };
 
@@ -104,6 +106,20 @@
 	slow-clock = <&clk_lse>;
 };
 
+&rtc {
+	/**
+	 * STM32_SRC_LSE reflects the "slow-clock" selected on RCC node.
+	 * NO_SEL reflects STM32WB0's lack of RTC clock mux to configure.
+	 */
+	clocks = <&rcc STM32_CLOCK(APB0, 12)>,
+		<&rcc STM32_SRC_LSE NO_SEL>;
+	status = "okay";
+};
+
+&iwdg {
+	status = "okay";
+};
+
 &bt_hci_wb0 {
 	status = "okay";
 };
diff --git a/boards/st/nucleo_wb07cc/nucleo_wb07cc.yaml b/boards/st/nucleo_wb07cc/nucleo_wb07cc.yaml
index 452e43da855b5..bdd547615635f 100644
--- a/boards/st/nucleo_wb07cc/nucleo_wb07cc.yaml
+++ b/boards/st/nucleo_wb07cc/nucleo_wb07cc.yaml
@@ -16,6 +16,8 @@ supported:
   - gpio
   - i2c
   - pwm
+  - rtc
   - spi
+  - watchdog
   - bluetooth
 vendor: st
diff --git a/boards/st/nucleo_wb07cc/support/openocd.cfg b/boards/st/nucleo_wb07cc/support/openocd.cfg
index 6d294443fcfac..8c020c9afb6b4 100644
--- a/boards/st/nucleo_wb07cc/support/openocd.cfg
+++ b/boards/st/nucleo_wb07cc/support/openocd.cfg
@@ -1,5 +1,3 @@
+set CHIPNAME bluenrg-lp
 source [find interface/stlink-dap.cfg]
-
-transport select "dapdirect_swd"
-
-source [find target/stm32wb0x.cfg]
+source [find target/bluenrg-x.cfg]
diff --git a/boards/st/nucleo_wb09ke/board.cmake b/boards/st/nucleo_wb09ke/board.cmake
index a6b62f37ce2db..7f80e9325ae92 100644
--- a/boards/st/nucleo_wb09ke/board.cmake
+++ b/boards/st/nucleo_wb09ke/board.cmake
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 # keep first
-board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=sw")
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=sw" "--start-address=0x10000000")
+board_runner_args(pyocd "--target=stm32wb09kevx")
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/st/nucleo_wb09ke/doc/index.rst b/boards/st/nucleo_wb09ke/doc/index.rst
index b48869175f442..854e83c7ed8af 100644
--- a/boards/st/nucleo_wb09ke/doc/index.rst
+++ b/boards/st/nucleo_wb09ke/doc/index.rst
@@ -30,38 +30,7 @@ More information about STM32WB09KEV can be found here:
 Supported Features
 ==================
 
-The Zephyr ``nucleo_wb09ke`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | internal flash memory               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| TIMER     | on-chip    | counter, pwm                        |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | Bluetooth Low Energy                |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_wb09ke/nucleo_wb09ke_defconfig`
+.. zephyr:board-supported-hw::
 
 Bluetooh support
 ----------------
@@ -94,6 +63,8 @@ For more details, please refer to the `Nucleo WB09KE board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo WB09KE board includes an ST-LINK-V3EC embedded debug tool interface.
 
 Applications for the ``nucleo_w09ke`` board target can be built and flashed
@@ -150,6 +121,15 @@ You can debug an application in the usual way.  Here is an example for the
    :maybe-skip-config:
    :goals: debug
 
+.. warning::
+   Application debugging on this board uses the pyOCD runner, which requires an additional pack
+   to be installed beforehand. This can be performed using the following commands:
+
+   .. code-block:: console
+
+      $ pyocd pack update
+      $ pyocd pack install stm32wb0
+
 .. _`Nucleo WB09KE webpage`:
    https://www.st.com/en/evaluation-tools/nucleo-wb09ke.html
 
diff --git a/boards/st/nucleo_wb09ke/nucleo_wb09ke.dts b/boards/st/nucleo_wb09ke/nucleo_wb09ke.dts
index 15cde545c18cc..ea7dcd708beee 100644
--- a/boards/st/nucleo_wb09ke/nucleo_wb09ke.dts
+++ b/boards/st/nucleo_wb09ke/nucleo_wb09ke.dts
@@ -67,6 +67,7 @@
 	};
 
 	aliases {
+		rtc = &rtc;
 		led0 = &blue_led_1;
 		led1 = &green_led_1;
 		led2 = &red_led_1;
@@ -74,6 +75,7 @@
 		sw0 = &user_button_1;
 		sw1 = &user_button_2;
 		sw2 = &user_button_3;
+		watchdog0 = &iwdg;
 	};
 };
 
@@ -105,6 +107,20 @@
 	slow-clock = <&clk_lse>;
 };
 
+&rtc {
+	/**
+	 * STM32_SRC_LSE reflects the "slow-clock" selected on RCC node.
+	 * NO_SEL reflects STM32WB0's lack of RTC clock mux to configure.
+	 */
+	clocks = <&rcc STM32_CLOCK(APB0, 12)>,
+		<&rcc STM32_SRC_LSE NO_SEL>;
+	status = "okay";
+};
+
+&iwdg {
+	status = "okay";
+};
+
 &bt_hci_wb0 {
 	status = "okay";
 };
diff --git a/boards/st/nucleo_wb09ke/nucleo_wb09ke.yaml b/boards/st/nucleo_wb09ke/nucleo_wb09ke.yaml
index fde311bd0f5ce..f8ca581c8d8af 100644
--- a/boards/st/nucleo_wb09ke/nucleo_wb09ke.yaml
+++ b/boards/st/nucleo_wb09ke/nucleo_wb09ke.yaml
@@ -16,6 +16,8 @@ supported:
   - gpio
   - i2c
   - pwm
+  - rtc
   - spi
+  - watchdog
   - bluetooth
 vendor: st
diff --git a/boards/st/nucleo_wb09ke/support/openocd.cfg b/boards/st/nucleo_wb09ke/support/openocd.cfg
deleted file mode 100644
index 6d294443fcfac..0000000000000
--- a/boards/st/nucleo_wb09ke/support/openocd.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-source [find interface/stlink-dap.cfg]
-
-transport select "dapdirect_swd"
-
-source [find target/stm32wb0x.cfg]
diff --git a/boards/st/nucleo_wb55rg/doc/nucleo_wb55rg.rst b/boards/st/nucleo_wb55rg/doc/nucleo_wb55rg.rst
index 0aa7928ca2a90..18c9655b54b40 100644
--- a/boards/st/nucleo_wb55rg/doc/nucleo_wb55rg.rst
+++ b/boards/st/nucleo_wb55rg/doc/nucleo_wb55rg.rst
@@ -132,47 +132,13 @@ provides the following hardware capabilities:
 More information about STM32WB55RG can be found here:
 
 - `STM32WB55RG on www.st.com`_
-- `STM32WB5RG datasheet`_
-- `STM32WB5RG reference manual`_
+- `STM32WB55RG datasheet`_
+- `STM32WB55RG reference manual`_
 
 Supported Features
 ==================
 
-The Zephyr nucleo_wb55rg board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | Bluetooth Low Energy                |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_wb55rg/nucleo_wb55rg_defconfig`
+.. zephyr:board-supported-hw::
 
 Bluetooth and compatibility with STM32WB Copro Wireless Binaries
 ================================================================
@@ -180,10 +146,11 @@ Bluetooth and compatibility with STM32WB Copro Wireless Binaries
 To operate bluetooth on Nucleo WB55RG, Cortex-M0 core should be flashed with
 a valid STM32WB Coprocessor binaries (either 'Full stack' or 'HCI Layer').
 These binaries are delivered in STM32WB Cube packages, under
-Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/
+``Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/``
+
 For compatibility information with the various versions of these binaries,
-please check `modules/hal/stm32/lib/stm32wb/hci/README <https://github.com/zephyrproject-rtos/hal_stm32/blob/main/lib/stm32wb/hci/README>`__
-in the hal_stm32 repo.
+please check :module_file:`hal_stm32:lib/stm32wb/README.rst`.
+
 Note that since STM32WB Cube package V1.13.2, "full stack" binaries are not compatible
 anymore for a use in Zephyr and only "HCI Only" versions should be used on the M0
 side.
@@ -234,6 +201,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo WB55RG board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``nucleo_wb55rg`` board configuration can be built the
@@ -306,10 +275,10 @@ You can debug an application in the usual way.  Here is an example for the
 .. _STM32WB55RG on www.st.com:
    https://www.st.com/en/microcontrollers-microprocessors/stm32wb55rg.html
 
-.. _STM32WB5RG datasheet:
+.. _STM32WB55RG datasheet:
    https://www.st.com/resource/en/datasheet/stm32wb55rg.pdf
 
-.. _STM32WB5RG reference manual:
+.. _STM32WB55RG reference manual:
    https://www.st.com/resource/en/reference_manual/dm00318631.pdf
 
 .. _STM32CubeProgrammer:
diff --git a/boards/st/nucleo_wba52cg/Kconfig.defconfig b/boards/st/nucleo_wba52cg/Kconfig.defconfig
deleted file mode 100644
index 6bf6d3f610f0d..0000000000000
--- a/boards/st/nucleo_wba52cg/Kconfig.defconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# STM32WBA52CG Nucleo board configuration
-
-# Copyright (c) 2023 STMicroelectronics
-
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NUCLEO_WBA52CG
-
-config SPI_STM32_INTERRUPT
-	default y
-	depends on SPI
-
-endif # BOARD_NUCLEO_WBA52CG
diff --git a/boards/st/nucleo_wba52cg/Kconfig.nucleo_wba52cg b/boards/st/nucleo_wba52cg/Kconfig.nucleo_wba52cg
deleted file mode 100644
index 515685e5715ab..0000000000000
--- a/boards/st/nucleo_wba52cg/Kconfig.nucleo_wba52cg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 STMicroelectronics
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NUCLEO_WBA52CG
-	select SOC_STM32WBA52XX
diff --git a/boards/st/nucleo_wba52cg/arduino_r3_connector.dtsi b/boards/st/nucleo_wba52cg/arduino_r3_connector.dtsi
deleted file mode 100644
index 619cebea62a43..0000000000000
--- a/boards/st/nucleo_wba52cg/arduino_r3_connector.dtsi
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2023 STMicroelectronics
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	arduino_header: connector {
-		compatible = "arduino-header-r3";
-		#gpio-cells = <2>;
-		gpio-map-mask = <0xffffffff 0xffffffc0>;
-		gpio-map-pass-thru = <0 0x3f>;
-		gpio-map = <0 0 &gpioa 7 0>,	/* A0 */
-			   <1 0 &gpioa 6 0>,	/* A1 */
-			   <2 0 &gpioa 2 0>,	/* A2 */
-			   <3 0 &gpioa 1 0>,	/* A3 */
-			   <4 0 &gpioa 5 0>,	/* A4 */
-			   <5 0 &gpioa 0 0>,	/* A5 */
-			   <6 0 &gpioa 10 0>,	/* D0 */
-			   <7 0 &gpiob 5 0>,	/* D1 */
-			   <8 0 &gpiob 7 0>,	/* D2 */
-			   <9 0 &gpiob 6 0>,	/* D3 */
-			   <10 0 &gpiob 13 0>,	/* D4 */
-			   <11 0 &gpiob 14 0>,	/* D5 */
-			   <12 0 &gpiob 0 0>,	/* D6 */
-			   <13 0 &gpiob 9 0>,	/* D7 */
-			   <14 0 &gpiob 15 0>,	/* D8 */
-			   <15 0 &gpioa 9 0>,	/* D9 */
-			   <16 0 &gpioa 12 0>,	/* D10 */
-			   <17 0 &gpioa 15 0>,	/* D11 */
-			   <18 0 &gpiob 3 0>,	/* D12 */
-			   <19 0 &gpiob 4 0>,	/* D13 */
-			   <20 0 &gpiob 1 0>,	/* D14 */
-			   <21 0 &gpiob 2 0>;	/* D15 */
-	};
-};
-
-arduino_i2c: &i2c1 {};
-arduino_spi: &spi1 {};
diff --git a/boards/st/nucleo_wba52cg/board.cmake b/boards/st/nucleo_wba52cg/board.cmake
deleted file mode 100644
index 9c612e9d0b07a..0000000000000
--- a/boards/st/nucleo_wba52cg/board.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# keep first
-board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
-
-# keep first
-include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/st/nucleo_wba52cg/board.yml b/boards/st/nucleo_wba52cg/board.yml
deleted file mode 100644
index 0b12139fcf2a5..0000000000000
--- a/boards/st/nucleo_wba52cg/board.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-board:
-  name: nucleo_wba52cg
-  full_name: Nucleo WBA52CG
-  vendor: st
-  socs:
-    - name: stm32wba52xx
diff --git a/boards/st/nucleo_wba52cg/doc/img/nucleowba52cg.jpg b/boards/st/nucleo_wba52cg/doc/img/nucleowba52cg.jpg
deleted file mode 100644
index 67c7d351e9962..0000000000000
Binary files a/boards/st/nucleo_wba52cg/doc/img/nucleowba52cg.jpg and /dev/null differ
diff --git a/boards/st/nucleo_wba52cg/doc/nucleo_wba52cg.rst b/boards/st/nucleo_wba52cg/doc/nucleo_wba52cg.rst
deleted file mode 100644
index c27dc4a56a56d..0000000000000
--- a/boards/st/nucleo_wba52cg/doc/nucleo_wba52cg.rst
+++ /dev/null
@@ -1,292 +0,0 @@
-.. zephyr:board:: nucleo_wba52cg
-
-Overview
-********
-
-NUCLEO-WBA52CG is a Bluetooth® Low Energy wireless and ultra-low-power board
-embedding a powerful and ultra-low-power radio compliant with the Bluetooth®
-Low Energy SIG specification v5.3.
-
-The ARDUINO® Uno V3 connectivity support and the ST morpho headers allow the
-easy expansion of the functionality of the STM32 Nucleo open development
-platform with a wide choice of specialized shields.
-
-- Ultra-low-power wireless STM32WBA52CG microcontroller based on the Arm®
-  Cortex®‑M33 core, featuring 1 Mbyte of flash memory and 128 Kbytes of SRAM in
-  a UFQFPN48 package
-
-- MCU RF board (MB1863):
-
-  - 2.4 GHz RF transceiver supporting Bluetooth® specification v5.3
-  - Arm® Cortex® M33 CPU with TrustZone®, MPU, DSP, and FPU
-  - Integrated PCB antenna
-
-- Three user LEDs
-- Three user and one reset push-buttons
-
-- Board connectors:
-
-  - USB Micro-B
-  - ARDUINO® Uno V3 expansion connector
-  - ST morpho headers for full access to all STM32 I/Os
-
-- Flexible power-supply options: ST-LINK USB VBUS or external sources
-- On-board STLINK-V3MODS debugger/programmer with USB re-enumeration capability:
-  mass storage, Virtual COM port, and debug port
-
-More information about the board can be found at the `Nucleo WBA52CG website`_.
-
-Hardware
-********
-
-The STM32WBA52xx multiprotocol wireless and ultralow power devices embed a
-powerful and ultralow power radio compliant with the Bluetooth® SIG Low Energy
-specification 5.3. They contain a high-performance Arm Cortex-M33 32-bit RISC
-core. They operate at a frequency of up to 100 MHz.
-
-- Includes ST state-of-the-art patented technology
-
-- Ultra low power radio:
-
-  - 2.4 GHz radio
-  - RF transceiver supporting Bluetooth® Low Energy 5.3 specification
-  - Proprietary protocols
-  - RX sensitivity: -96 dBm (Bluetooth® Low Energy at 1 Mbps)
-  - Programmable output power, up to +10 dBm with 1 dB steps
-  - Integrated balun to reduce BOM
-  - Suitable for systems requiring compliance with radio frequency regulations
-    ETSI EN 300 328, EN 300 440, FCC CFR47 Part 15 and ARIB STD-T66
-
-- Ultra low power platform with FlexPowerControl:
-
-  - 1.71 to 3.6 V power supply
-  - - 40 °C to 85 °C temperature range
-  - Autonomous peripherals with DMA, functional down to Stop 1 mode
-  - 140 nA Standby mode (16 wake-up pins)
-  - 200 nA Standby mode with RTC
-  - 2.4 µA Standby mode with 64 KB SRAM
-  - 16.3 µA Stop mode with 64 KB SRAM
-  - 45 µA/MHz Run mode at 3.3 V
-  - Radio: Rx 7.4 mA / Tx at 0 dBm 10.6 mA
-
-- Core: Arm® 32-bit Cortex®-M33 CPU with TrustZone®, MPU, DSP, and FPU
-- ART Accelerator™: 8-Kbyte instruction cache allowing 0-wait-state execution
-  from flash memory (frequency up to 100 MHz, 150 DMIPS)
-- Power management: embedded regulator LDO supporting voltage scaling
-
-- Benchmarks:
-
-  - 1.5 DMIPS/MHz (Drystone 2.1)
-  - 407 CoreMark® (4.07 CoreMark/MHz)
-
-- Clock sources:
-
-  - 32 MHz crystal oscillator
-  - 32 kHz crystal oscillator (LSE)
-  - Internal low-power 32 kHz (±5%) RC
-  - Internal 16 MHz factory trimmed RC (±1%)
-  - PLL for system clock and ADC
-
-- Memories:
-
-  - 1 MB flash memory with ECC, including 256 Kbytes with 100 cycles
-  - 128 KB SRAM, including 64 KB with parity check
-  - 512-byte (32 rows) OTP
-
-- Rich analog peripherals (independent supply):
-
-  - 12-bit ADC 2.5 Msps with hardware oversampling
-
-- Communication peripherals:
-
-  - Three UARTs (ISO 7816, IrDA, modem)
-  - Two SPIs
-  - Two I2C Fm+ (1 Mbit/s), SMBus/PMBus®
-
-- System peripherals:
-
-  - Touch sensing controller, up to 20 sensors, supporting touch key, linear,
-     rotary touch sensors
-  - One 16-bit, advanced motor control timer
-  - Three 16-bit timers
-  - One 32-bit timer
-  - Two low-power 16-bit timers (available in Stop mode)
-  - Two Systick timers
-  - Two watchdogs
-  - 8-channel DMA controller, functional in Stop mode
-
-- Security and cryptography:
-
-  - Arm® TrustZone® and securable I/Os, memories, and peripherals
-  - Flexible life cycle scheme with RDP and password protected debug
-  - Root of trust thanks to unique boot entry and secure hide protection area (HDP)
-  - SFI (secure firmware installation) thanks to embedded RSS (root secure services)
-  - Secure data storage with root hardware unique key (RHUK)
-  - Secure firmware upgrade support with TF-M
-  - Two AES co-processors, including one with DPA resistance
-  - Public key accelerator, DPA resistant
-  - HASH hardware accelerator
-  - True random number generator, NIST SP800-90B compliant
-  - 96-bit unique ID
-  - Active tampers
-  - CRC calculation unit
-
-- Up to 35 I/Os (most of them 5 V-tolerant) with interrupt capability
-
-- Development support:
-
-  - Serial wire debug (SWD), JTAG
-
-- ECOPACK2 compliant package
-
-More information about STM32WB55RG can be found here:
-
-- `STM32WBA52CG on www.st.com`_
-- `STM32WBA52CG datasheet`_
-- `STM32WBA52CG reference manual`_
-
-Supported Features
-==================
-
-The Zephyr nucleo_wba52cg board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_wba52cg/nucleo_wba52cg_defconfig`
-
-Connections and IOs
-===================
-
-Nucleo WBA52CG Board has 4 GPIO controllers. These controllers are responsible for pin muxing,
-input/output, pull-up, etc.
-
-Default Zephyr Peripheral Mapping:
-----------------------------------
-
-.. rst-class:: rst-columns
-
-- USART_1 TX/RX : PB12/PA8
-- I2C_1_SCL : PB2
-- I2C_1_SDA : PB1
-- USER_PB : PC13
-- LD1 : PB4
-- SPI_1_NSS : PA12 (arduino_spi)
-- SPI_1_SCK : PB4 (arduino_spi)
-- SPI_1_MISO : PB3 (arduino_spi)
-- SPI_1_MOSI : PA15 (arduino_spi)
-
-System Clock
-------------
-
-Nucleo WBA52CG System Clock could be driven by internal or external oscillator,
-as well as main PLL clock. By default System clock is driven by HSE+PLL clock at 100MHz.
-
-Serial Port
------------
-
-Nucleo WBA52CG board has 1 U(S)ARTs. The Zephyr console output is assigned to USART1.
-Default settings are 115200 8N1.
-
-
-Programming and Debugging
-*************************
-
-Nucleo WBA52CG board includes an ST-LINK/V3 embedded debug tool interface.
-It could be used for flash and debug using either OpenOCD or STM32Cube ecosystem tools.
-
-Flashing
-========
-
-The board is configured to be flashed using west `STM32CubeProgrammer`_ runner,
-so its :ref:`installation <stm32cubeprog-flash-host-tools>` is required.
-
-Alternatively, OpenOCD can also be used to flash the board using
-the ``--runner`` (or ``-r``) option:
-
-.. code-block:: console
-
-   $ west flash --runner openocd
-
-Flashing an application to Nucleo WBA52CG
------------------------------------------
-
-Here is an example for the :zephyr:code-sample:`blinky` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_wba52cg
-   :goals: build flash
-
-You will see the LED blinking every second.
-
-Debugging
-=========
-
-Debugging using OpenOCD
------------------------
-
-You can debug an application in the usual way using OpenOCD. Here is an example for the
-:zephyr:code-sample:`blinky` application.
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_wba52cg
-   :maybe-skip-config:
-   :goals: debug
-
-Debugging using STM32CubeIDE
-----------------------------
-
-You can debug an application using a STM32WBA compatible version of STM32CubeIDE.
-
-For that:
-
-- Create an empty STM32WBA project by going to File > New > STM32 project
-- Select your MCU, click Next, and select an Empty project.
-- Right click on your project name, select Debug as > Debug configurations
-- In the new window, create a new target in STM32 Cortex-M C/C++ Application
-- Select the new target and enter the path to zephyr.elf file in the C/C++ Application field
-- Check Disable auto build
-- Run debug
-
-.. _Nucleo WBA52CG website:
-   https://www.st.com/en/evaluation-tools/nucleo-wba52cg.html
-
-.. _STM32WBA52CG on www.st.com:
-   https://www.st.com/en/microcontrollers-microprocessors/stm32wba52cg.html
-
-.. _STM32WBA52CG datasheet:
-   https://www.st.com/resource/en/datasheet/stm32wba52cg.pdf
-
-.. _STM32WBA52CG reference manual:
-   https://www.st.com/resource/en/reference_manual/rm0493-multiprotocol-wireless-bluetooth-lowenergy-armbased-32bit-mcu-stmicroelectronics.pdf
-
-.. _OpenOCD official Github mirror:
-   https://github.com/openocd-org/openocd/commit/870769b0ba9f4dae6ada9d8b1a40d75bd83aaa06
-
-.. _STM32CubeProgrammer:
-   https://www.st.com/en/development-tools/stm32cubeprog.html
diff --git a/boards/st/nucleo_wba52cg/nucleo_wba52cg.dts b/boards/st/nucleo_wba52cg/nucleo_wba52cg.dts
deleted file mode 100644
index 08b81dba0dc49..0000000000000
--- a/boards/st/nucleo_wba52cg/nucleo_wba52cg.dts
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c)  2023 STMicroelectronics
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <st/wba/stm32wba52Xg.dtsi>
-#include <st/wba/stm32wba52cgux-pinctrl.dtsi>
-#include "arduino_r3_connector.dtsi"
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-
-/ {
-	model = "STMicroelectronics STM32WBA52CG-NUCLEO board";
-	compatible = "st,stm32wba52cg-nucleo";
-
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	chosen {
-		zephyr,console = &usart1;
-		zephyr,shell-uart = &usart1;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,code-partition = &slot0_partition;
-	};
-
-	leds: leds {
-		compatible = "gpio-leds";
-		blue_led_1: led_1 {
-			gpios = <&gpiob 4 GPIO_ACTIVE_LOW>;
-			label = "User LD1";
-		};
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		user_button: button {
-			label = "User";
-			gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
-			zephyr,code = <INPUT_KEY_0>;
-		};
-	};
-
-	aliases {
-		led0 = &blue_led_1;
-		sw0 = &user_button;
-	};
-};
-
-&clk_lsi {
-	status = "okay";
-};
-
-&clk_lse {
-	status = "okay";
-};
-
-&clk_hse {
-	status = "okay";
-};
-
-&clk_hsi {
-	status = "okay";
-};
-
-&pll1 {
-	div-m = <8>;
-	mul-n = <48>;
-	div-q = <2>;
-	div-r = <2>;
-	clocks = <&clk_hse>;
-	status = "okay";
-};
-
-&rcc {
-	clocks = <&pll1>;
-	clock-frequency = <DT_FREQ_M(96)>;
-	ahb-prescaler = <1>;
-	ahb5-prescaler = <4>;
-	apb1-prescaler = <1>;
-	apb2-prescaler = <1>;
-	apb7-prescaler = <1>;
-};
-
-&iwdg {
-	status = "okay";
-};
-
-&rtc {
-	status = "okay";
-	clocks = <&rcc STM32_CLOCK_BUS_APB7 0x00200000>,
-			<&rcc STM32_SRC_LSE RTC_SEL(1)>;
-	prescaler = <32768>;
-};
-
-&usart1 {
-	pinctrl-0 = <&usart1_tx_pb12 &usart1_rx_pa8>;
-	pinctrl-names = "default";
-	current-speed = <115200>;
-	status = "okay";
-};
-
-&lpuart1 {
-	pinctrl-0 = <&lpuart1_tx_pb5 &lpuart1_rx_pa10>;
-	pinctrl-names = "default";
-	current-speed = <115200>;
-	status = "okay";
-};
-
-&spi1 {
-	pinctrl-0 = <&spi1_nss_pa12 &spi1_sck_pb4
-		     &spi1_miso_pb3 &spi1_mosi_pa15>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&i2c1 {
-	pinctrl-0 = <&i2c1_scl_pb2 &i2c1_sda_pb1>;
-	pinctrl-names = "default";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&adc4 {
-	pinctrl-0 = <&adc4_in8_pa1>;
-	pinctrl-names = "default";
-	st,adc-clock-source = "ASYNC";
-	st,adc-prescaler = <4>;
-	status = "okay";
-};
-
-stm32_lp_tick_source: &lptim1 {
-	clocks = <&rcc STM32_CLOCK_BUS_APB7 0x00000800>,
-		 <&rcc STM32_SRC_LSE LPTIM1_SEL(3)>;
-	status = "okay";
-};
-
-&rng {
-	status = "okay";
-};
-
-&flash0 {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x00000000 DT_SIZE_K(64)>;
-		};
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x00010000 DT_SIZE_K(448)>;
-		};
-		slot1_partition: partition@80000 {
-			label = "image-1";
-			reg = <0x00080000 DT_SIZE_K(448)>;
-		};
-		scratch_partition: partition@f0000 {
-			label = "image-scratch";
-			reg = <0x000f0000 DT_SIZE_K(16)>;
-		};
-		storage_partition: partition@f4000 {
-			label = "storage";
-			reg = <0x000f4000 DT_SIZE_K(48)>;
-		};
-	};
-};
diff --git a/boards/st/nucleo_wba52cg/nucleo_wba52cg.yaml b/boards/st/nucleo_wba52cg/nucleo_wba52cg.yaml
deleted file mode 100644
index 8e075b44ae12d..0000000000000
--- a/boards/st/nucleo_wba52cg/nucleo_wba52cg.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-identifier: nucleo_wba52cg
-name: ST Nucleo WBA52CG
-type: mcu
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-supported:
-  - gpio
-  - i2c
-  - spi
-  - adc
-  - watchdog
-  - rng
-  - arduino_gpio
-  - arduino_i2c
-  - arduino_spi
-  - counter
-ram: 128
-flash: 1024
-vendor: st
diff --git a/boards/st/nucleo_wba52cg/nucleo_wba52cg_defconfig b/boards/st/nucleo_wba52cg/nucleo_wba52cg_defconfig
deleted file mode 100644
index 8655ea99d4255..0000000000000
--- a/boards/st/nucleo_wba52cg/nucleo_wba52cg_defconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-# enable uart driver
-CONFIG_SERIAL=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable HW stack protection
-CONFIG_HW_STACK_PROTECTION=y
diff --git a/boards/st/nucleo_wba52cg/support/openocd.cfg b/boards/st/nucleo_wba52cg/support/openocd.cfg
deleted file mode 100644
index 7c785bec41285..0000000000000
--- a/boards/st/nucleo_wba52cg/support/openocd.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-# Note: Using OpenOCD using nucloe_wba52cg requires using STMicroelectronics
-# openocd fork. See board documentation for more information
-
-source [find interface/stlink-dap.cfg]
-
-set WORKAREASIZE 0x8000
-
-transport select "dapdirect_swd"
-
-# Enable debug when in low power modes
-set ENABLE_LOW_POWER 1
-
-# Stop Watchdog counters when halt
-set STOP_WATCHDOG 1
-
-# STlink Debug clock frequency
-set CLOCK_FREQ 8000
-
-# Reset configuration
-# use hardware reset, connect under reset
-# connect_assert_srst needed if low power mode application running (WFI...)
-reset_config srst_only srst_nogate
-
-source [find target/stm32wbax.cfg]
diff --git a/boards/st/nucleo_wba55cg/doc/nucleo_wba55cg.rst b/boards/st/nucleo_wba55cg/doc/nucleo_wba55cg.rst
index affcf8c4c499f..c07b352f17f9f 100644
--- a/boards/st/nucleo_wba55cg/doc/nucleo_wba55cg.rst
+++ b/boards/st/nucleo_wba55cg/doc/nucleo_wba55cg.rst
@@ -144,39 +144,7 @@ More information about STM32WBA series can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_wba55cg board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | Bluetooth Low Energy                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/nucleo_wba55cg/nucleo_wba55cg_defconfig`
+.. zephyr:board-supported-hw::
 
 Bluetooh support
 ----------------
@@ -228,6 +196,8 @@ Default settings are 115500 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo WBA55CG board includes an ST-LINK/V3 embedded debug tool interface.
 It could be used for flash and debug using either OpenOCD or STM32Cube ecosystem tools.
 
diff --git a/boards/st/nucleo_wba65ri/Kconfig.defconfig b/boards/st/nucleo_wba65ri/Kconfig.defconfig
new file mode 100644
index 0000000000000..8e937f2a6ad12
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/Kconfig.defconfig
@@ -0,0 +1,13 @@
+# STM32WBA65RI Nucleo board configuration
+
+# Copyright (c) 2025 STMicroelectronics
+
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NUCLEO_WBA65RI
+
+config SPI_STM32_INTERRUPT
+	default y
+	depends on SPI
+
+endif # BOARD_NUCLEO_WBA65RI
diff --git a/boards/st/nucleo_wba65ri/Kconfig.nucleo_wba65ri b/boards/st/nucleo_wba65ri/Kconfig.nucleo_wba65ri
new file mode 100644
index 0000000000000..35b3adb2ab3c1
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/Kconfig.nucleo_wba65ri
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NUCLEO_WBA65RI
+	select SOC_STM32WBA65XX
diff --git a/boards/st/nucleo_wba65ri/arduino_r3_connector.dtsi b/boards/st/nucleo_wba65ri/arduino_r3_connector.dtsi
new file mode 100644
index 0000000000000..44e824e46644e
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/arduino_r3_connector.dtsi
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpioa 4 0>,	/* A0 */
+			   <1 0 &gpioa 6 0>,	/* A1 */
+			   <2 0 &gpioa 2 0>,	/* A2 */
+			   <3 0 &gpioa 1 0>,	/* A3 */
+			   <4 0 &gpioa 5 0>,	/* A4 */
+			   <5 0 &gpioa 0 0>,	/* A5 */
+			   <6 0 &gpioa 11 0>,	/* D0 */
+			   <7 0 &gpioa 12 0>,	/* D1 */
+			   <8 0 &gpioe 0 0>,	/* D2 */
+			   <9 0 &gpiob 13 0>,	/* D3 */
+			   <10 0 &gpioa 3 0>,	/* D4 */
+			   <11 0 &gpiob 14 0>,	/* D5 */
+			   <12 0 &gpiob 0 0>,	/* D6 */
+			   <13 0 &gpiod 14 0>,	/* D7 */
+			   <14 0 &gpioa 10 0>,	/* D8 */
+			   <15 0 &gpiob 11 0>,	/* D9 */
+			   <16 0 &gpiob 9 0>,	/* D10 */
+			   <17 0 &gpioc 3 0>,	/* D11 */
+			   <18 0 &gpioa 9 0>,	/* D12 */
+			   <19 0 &gpiob 10 0>,	/* D13 */
+			   <20 0 &gpiob 1 0>,	/* D14 */
+			   <21 0 &gpiob 2 0>;	/* D15 */
+	};
+};
+
+arduino_i2c: &i2c1 {};
+arduino_spi: &spi1 {};
diff --git a/boards/st/nucleo_wba65ri/board.cmake b/boards/st/nucleo_wba65ri/board.cmake
new file mode 100644
index 0000000000000..5243407fcc0d1
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/board.cmake
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
+
+include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/st/nucleo_wba65ri/board.yml b/boards/st/nucleo_wba65ri/board.yml
new file mode 100644
index 0000000000000..01a51d7715d1e
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: nucleo_wba65ri
+  full_name: Nucleo WBA65RI
+  vendor: st
+  socs:
+    - name: stm32wba65xx
diff --git a/boards/st/nucleo_wba65ri/doc/img/nucleo_wba65ri.webp b/boards/st/nucleo_wba65ri/doc/img/nucleo_wba65ri.webp
new file mode 100644
index 0000000000000..a9959ba55a900
Binary files /dev/null and b/boards/st/nucleo_wba65ri/doc/img/nucleo_wba65ri.webp differ
diff --git a/boards/st/nucleo_wba65ri/doc/nucleo_wba65ri.rst b/boards/st/nucleo_wba65ri/doc/nucleo_wba65ri.rst
new file mode 100644
index 0000000000000..1452d65987a31
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/doc/nucleo_wba65ri.rst
@@ -0,0 +1,241 @@
+.. zephyr:board:: nucleo_wba65ri
+
+Overview
+********
+
+NUCLEO-WBA65RI is a Bluetooth® Low Energy, 802.15.4 and Zigbee® wireless
+and ultra-low-power board embedding a powerful and ultra-low-power radio
+compliant with the Bluetooth® Low Energy SIG specification v5.4
+with IEEE 802.15.4-2015 and Zigbee® specifications.
+
+The ARDUINO® Uno V3 connectivity support and the ST morpho headers allow the
+easy expansion of the functionality of the STM32 Nucleo open development
+platform with a wide choice of specialized shields.
+
+- Ultra-low-power wireless STM32WBA65RI microcontroller based on the Arm®
+  Cortex®‑M33 core, featuring 2 Mbyte of flash memory and 512 Kbytes of SRAM in
+  a VFQFPN68 package
+
+- MCU RF board (MB2130):
+
+  - 2.4 GHz RF transceiver supporting Bluetooth® specification v5.4
+  - Arm® Cortex® M33 CPU with TrustZone®, MPU, DSP, and FPU
+  - Integrated PCB antenna
+
+- Three user LEDs
+- Three user and one reset push-buttons
+
+- Board connectors:
+
+  - 2 USB Type-C
+  - ARDUINO® Uno V3 expansion connector
+  - ST morpho headers for full access to all STM32 I/Os
+
+- Flexible power-supply options: ST-LINK USB VBUS or external sources
+- On-board STLINK-V3MODS debugger/programmer with USB re-enumeration capability:
+  mass storage, Virtual COM port, and debug port
+
+Hardware
+********
+
+The STM32WBA65xx multiprotocol wireless and ultralow power devices embed a
+powerful and ultralow power radio compliant with the Bluetooth® SIG Low Energy
+specification 5.4. They contain a high-performance Arm Cortex-M33 32-bit RISC
+core. They operate at a frequency of up to 100 MHz.
+
+- Includes ST state-of-the-art patented technology
+
+- Ultra low power radio:
+
+  - 2.4 GHz radio
+  - RF transceiver supporting Bluetooth® Low Energy 5.4 specification
+    IEEE 802.15.4-2015 PHY and MAC, supporting Thread, Matter and Zigbee®
+  - Proprietary protocols
+  - RX sensitivity: -96 dBm (Bluetooth® Low Energy at 1 Mbps)
+    and -100 dBm (IEEE 802.15.4 at 250 kbps)
+  - Programmable output power, up to +10 dBm with 1 dB steps
+  - Support for external PA
+  - Integrated balun to reduce BOM
+  - Suitable for systems requiring compliance with radio frequency regulations
+    ETSI EN 300 328, EN 300 440, FCC CFR47 Part 15 and ARIB STD-T66
+
+- Ultra low power platform with FlexPowerControl:
+
+  - 1.71 to 3.6 V power supply
+  - - 40 °C to 85 °C temperature range
+  - Autonomous peripherals with DMA, functional down to Stop 1 mode
+  - TBD nA Standby mode (16 wake-up pins)
+  - TBD nA Standby mode with RTC
+  - TBD µA Standby mode with 64 KB SRAM
+  - TBD µA Stop 2 mode with 64 KB SRAM
+  - TBD µA/MHz Run mode at 3.3 V
+  - Radio: Rx TBD mA / Tx at 0 dBm TBD mA
+
+- Core: Arm® 32-bit Cortex®-M33 CPU with TrustZone®, MPU, DSP, and FPU
+- ART Accelerator™: 8-Kbyte instruction cache allowing 0-wait-state execution
+  from flash memory (frequency up to 100 MHz, 150 DMIPS)
+- Power management: embedded regulator LDO and SMPS step-down converter
+- Supporting switch on-the-fly and voltage scaling
+
+- Benchmarks:
+
+  - 1.5 DMIPS/MHz (Drystone 2.1)
+  - 410 CoreMark® (4.10 CoreMark/MHz)
+
+- Clock sources:
+
+  - 32 MHz crystal oscillator
+  - 32 kHz crystal oscillator (LSE)
+  - Internal low-power 32 kHz (±5%) RC
+  - Internal 16 MHz factory trimmed RC (±1%)
+  - PLL for system clock and ADC
+
+- Memories:
+
+  - 2 MB flash memory with ECC, including 256 Kbytes with 100 cycles
+  - 512 KB SRAM, including 64 KB with parity check
+  - 512-byte (32 rows) OTP
+
+- Rich analog peripherals (independent supply):
+
+  - 12-bit ADC 2.5 Msps with hardware oversampling
+
+- Communication peripherals:
+
+  - Four UARTs (ISO 7816, IrDA, modem)
+  - Three SPIs
+  - Four I2C Fm+ (1 Mbit/s), SMBus/PMBus®
+
+- System peripherals:
+
+  - Touch sensing controller, up to 24 sensors, supporting touch key, linear,
+     rotary touch sensors
+  - One 16-bit, advanced motor control timer
+  - Three 16-bit timers
+  - Two 32-bit timer
+  - Two low-power 16-bit timers (available in Stop mode)
+  - Two Systick timers
+  - RTC with hardware calendar and calibration
+  - Two watchdogs
+  - 8-channel DMA controller, functional in Stop mode
+
+- Security and cryptography:
+
+  - Arm® TrustZone® and securable I/Os, memories, and peripherals
+  - Flexible life cycle scheme with RDP and password protected debug
+  - Root of trust thanks to unique boot entry and secure hide protection area (HDP)
+  - SFI (secure firmware installation) thanks to embedded RSS (root secure services)
+  - Secure data storage with root hardware unique key (RHUK)
+  - Secure firmware upgrade support with TF-M
+  - Two AES co-processors, including one with DPA resistance
+  - Public key accelerator, DPA resistant
+  - HASH hardware accelerator
+  - True random number generator, NIST SP800-90B compliant
+  - 96-bit unique ID
+  - Active tampers
+  - CRC calculation unit
+
+- Up to 86 I/Os (most of them 5 V-tolerant) with interrupt capability
+
+- Development support:
+
+  - Serial wire debug (SWD), JTAG
+
+- ECOPACK2 compliant package
+
+More information about STM32WBA series can be found here:
+
+- `STM32WBA Series on www.st.com`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+Nucleo WBA65RI Board has 4 GPIO controllers. These controllers are responsible for pin muxing,
+input/output, pull-up, etc.
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+
+.. rst-class:: rst-columns
+
+- USART_1 TX/RX : PB12/PA8
+- I2C_1_SCL : PB2
+- I2C_1_SDA : PB1
+- USER_PB : PC13
+- LD1 : PD8
+- SPI_1_NSS : PA12 (arduino_spi)
+- SPI_1_SCK : PB4 (arduino_spi)
+- SPI_1_MISO : PB3 (arduino_spi)
+- SPI_1_MOSI : PA15 (arduino_spi)
+
+System Clock
+------------
+
+Nucleo WBA65RI System Clock could be driven by internal or external oscillator,
+as well as main PLL clock. By default System clock is driven by HSE+PLL clock at 100MHz.
+
+Serial Port
+-----------
+
+Nucleo WBA65RI board has 3 U(S)ARTs. The Zephyr console output is assigned to USART1.
+Default settings are 115200 8N1.
+
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Nucleo WBA65RI board includes an ST-LINK/V3 embedded debug tool interface.
+It could be used for flash and debug using either OpenOCD or STM32Cube ecosystem tools.
+
+Flashing
+========
+
+The board is configured to be flashed using west `STM32CubeProgrammer`_ runner,
+so its :ref:`installation <stm32cubeprog-flash-host-tools>` is required.
+
+Alternatively, openocd can also be used to flash the board using
+the ``--runner`` (or ``-r``) option:
+
+.. code-block:: console
+
+   $ west flash --runner openocd
+
+Flashing an application to Nucleo WBA65RI
+-----------------------------------------
+
+Here is an example for the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: nucleo_wba65ri
+   :goals: build flash
+
+You will see the LED blinking every second.
+
+Debugging
+=========
+
+Debugging using OpenOCD
+-----------------------
+
+You can debug an application in the usual way using OpenOCD. Here is an example for the
+:zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: nucleo_wba65ri
+   :maybe-skip-config:
+   :goals: debug
+
+.. _STM32WBA Series on www.st.com:
+   https://www.st.com/en/microcontrollers-microprocessors/stm32wba-series.html
+
+.. _STM32CubeProgrammer:
+   https://www.st.com/en/development-tools/stm32cubeprog.html
diff --git a/boards/st/nucleo_wba65ri/nucleo_wba65ri.dts b/boards/st/nucleo_wba65ri/nucleo_wba65ri.dts
new file mode 100644
index 0000000000000..47ddf62fe038e
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/nucleo_wba65ri.dts
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c)  2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/wba/stm32wba65Xi.dtsi>
+#include <st/wba/stm32wba65rivx-pinctrl.dtsi>
+#include "arduino_r3_connector.dtsi"
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "STMicroelectronics STM32WBA65RI-NUCLEO board";
+	compatible = "st,stm32wba65ri-nucleo";
+
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	chosen {
+		zephyr,bt-c2h-uart = &usart1;
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+
+		blue_led_1: led_0 {
+			gpios = <&gpiod 8 GPIO_ACTIVE_LOW>;
+			label = "User LD1";
+		};
+
+		green_led_2: led_1 {
+			gpios = <&gpioc 4 GPIO_ACTIVE_LOW>;
+			label = "User LD2";
+		};
+
+		red_led_3: led_2 {
+			gpios = <&gpiob 8 GPIO_ACTIVE_LOW>;
+			label = "User LD3";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		user_button_1: button_0 {
+			label = "User B1";
+			gpios = <&gpioc 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		user_button_2: button_1 {
+			label = "User B2";
+			gpios = <&gpioc 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+
+		user_button_3: button_2 {
+			label = "User B3";
+			gpios = <&gpiob 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			zephyr,code = <INPUT_KEY_2>;
+		};
+	};
+
+	aliases {
+		led0 = &blue_led_1;
+		led1 = &green_led_2;
+		led2 = &red_led_3;
+		sw0 = &user_button_1;
+		sw1 = &user_button_2;
+		sw2 = &user_button_3;
+		mcuboot-led0 = &blue_led_1;
+		mcuboot-button0 = &user_button_1;
+	};
+};
+
+&clk_lse {
+	status = "okay";
+};
+
+&clk_hse {
+	hse-div2;
+	status = "okay";
+};
+
+&clk_hsi {
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&clk_hse>;
+	clock-frequency = <DT_FREQ_M(16)>;
+	ahb-prescaler = <1>;
+	ahb5-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <2>;
+	apb7-prescaler = <1>;
+};
+
+&iwdg {
+	status = "okay";
+};
+
+&rtc {
+	status = "okay";
+	clocks = <&rcc STM32_CLOCK(APB7, 21)>,
+			<&rcc STM32_SRC_LSE RTC_SEL(1)>;
+	prescaler = <32768>;
+};
+
+&usart1 {
+	clocks = <&rcc STM32_CLOCK(APB2, 14)>,
+		 <&rcc STM32_SRC_HSI16 USART1_SEL(2)>;
+	pinctrl-0 = <&usart1_tx_pb12 &usart1_rx_pa8>;
+	pinctrl-1 = <&analog_pb12 &analog_pa8>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_nss_pa12 &spi1_sck_pb4
+		     &spi1_miso_pb3 &spi1_mosi_pa15>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&i2c1 {
+	pinctrl-0 = <&i2c1_scl_pb2 &i2c1_sda_pb1>;
+	pinctrl-names = "default";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+};
+
+&adc4 {
+	pinctrl-0 = <&adc4_in8_pa1>;
+	pinctrl-names = "default";
+	st,adc-clock-source = "ASYNC";
+	st,adc-prescaler = <4>;
+	status = "okay";
+};
+
+stm32_lp_tick_source: &lptim1 {
+	clocks = <&rcc STM32_CLOCK(APB7, 11)>,
+		 <&rcc STM32_SRC_LSE LPTIM1_SEL(3)>;
+	status = "okay";
+};
+
+&rng {
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		storage_partition: partition@1c0000 {
+			label = "storage";
+			reg = <0x001c0000 DT_SIZE_K(256)>;
+		};
+	};
+};
diff --git a/boards/st/nucleo_wba65ri/nucleo_wba65ri.yaml b/boards/st/nucleo_wba65ri/nucleo_wba65ri.yaml
new file mode 100644
index 0000000000000..78617e1b26282
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/nucleo_wba65ri.yaml
@@ -0,0 +1,19 @@
+identifier: nucleo_wba65ri
+name: ST Nucleo WBA65RI
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - i2c
+  - spi
+  - adc
+  - rng
+  - arduino_gpio
+  - arduino_i2c
+  - arduino_spi
+ram: 512
+flash: 2048
+vendor: st
diff --git a/boards/st/nucleo_wba65ri/nucleo_wba65ri_defconfig b/boards/st/nucleo_wba65ri/nucleo_wba65ri_defconfig
new file mode 100644
index 0000000000000..24ca108f2456a
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/nucleo_wba65ri_defconfig
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2025 STMicroelectronics
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable clock
+CONFIG_CLOCK_CONTROL=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable the internal SMPS regulator
+CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
diff --git a/boards/st/nucleo_wba65ri/support/openocd.cfg b/boards/st/nucleo_wba65ri/support/openocd.cfg
new file mode 100644
index 0000000000000..0532f11f83a10
--- /dev/null
+++ b/boards/st/nucleo_wba65ri/support/openocd.cfg
@@ -0,0 +1,26 @@
+# Note: Using OpenOCD using nucleo_wba65ri requires using openocd fork.
+# See board documentation for more information
+
+source [find interface/stlink-dap.cfg]
+
+set WORKAREASIZE 0x8000
+
+transport select "dapdirect_swd"
+
+# Enable debug when in low power modes
+set ENABLE_LOW_POWER 1
+
+# Stop Watchdog counters when halt
+set STOP_WATCHDOG 1
+
+# STlink Debug clock frequency
+set CLOCK_FREQ 8000
+
+# Reset configuration
+# use hardware reset, connect under reset
+# connect_assert_srst needed if low power mode application running (WFI...)
+reset_config srst_only srst_nogate
+
+source [find target/stm32wbax.cfg]
+
+gdb_memory_map disable
diff --git a/boards/st/nucleo_wl55jc/doc/nucleo_wl55jc.rst b/boards/st/nucleo_wl55jc/doc/nucleo_wl55jc.rst
index 8ec97fbc184e3..56a2fbb8de1bb 100644
--- a/boards/st/nucleo_wl55jc/doc/nucleo_wl55jc.rst
+++ b/boards/st/nucleo_wl55jc/doc/nucleo_wl55jc.rst
@@ -162,53 +162,7 @@ More information about STM32WL55JC can be found here:
 Supported Features
 ==================
 
-The Zephyr nucleo_wl55jc board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock_control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| MPU       | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | arch/arm                            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | LoRa                                |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in:
-
-- :zephyr_file:`boards/st/nucleo_wl55jc/nucleo_wl55jc_defconfig`
-- :zephyr_file:`boards/st/nucleo_wl55jc/nucleo_wl55jc.dts`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -249,6 +203,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Nucleo WL55JC board includes an STLINK-V3 embedded debug tool interface.
 
 Applications for the ``nucleo_wl55jc`` board configuration can be built the
diff --git a/boards/st/sensortile_box/doc/index.rst b/boards/st/sensortile_box/doc/index.rst
index 861b2e559b9fb..da3931ed8b2d6 100644
--- a/boards/st/sensortile_box/doc/index.rst
+++ b/boards/st/sensortile_box/doc/index.rst
@@ -70,6 +70,8 @@ on a smartphone/PC to implement applications such as:
 - Compass and inclinometer
 - Sensor data logger
 
+.. zephyr:board-supported-hw::
+
 Connections and IOs
 ===================
 
@@ -121,6 +123,8 @@ functions.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 There are 2 main entry points for flashing STM32FL4Rx SoCs, one using the ROM
 bootloader, and another by using the SWD debug port (which requires additional
 hardware) on FTSH107 connector.
diff --git a/boards/st/sensortile_box/sensortile_box.dts b/boards/st/sensortile_box/sensortile_box.dts
index 9e7acee2e5a0d..84fee2824b47e 100644
--- a/boards/st/sensortile_box/sensortile_box.dts
+++ b/boards/st/sensortile_box/sensortile_box.dts
@@ -72,7 +72,7 @@
 	div-m = <4>;
 	mul-n = <40>;
 	div-p = <7>;
-	div-q = <2>;
+	div-q = <4>;
 	div-r = <2>;
 	clocks = <&clk_hse>;
 	status = "okay";
@@ -244,3 +244,10 @@ zephyr_udc0: &usbotg_fs {
 		};
 	};
 };
+
+&rng {
+	/* Change clock source to avoid using MSI */
+	clocks = <&rcc STM32_CLOCK(AHB2, 18U)>,
+		 <&rcc STM32_SRC_PLL_Q CLK48_SEL(2)>;
+	status = "okay";
+};
diff --git a/boards/st/sensortile_box_pro/doc/index.rst b/boards/st/sensortile_box_pro/doc/index.rst
index 528e6762a8758..63d84cfe7e155 100644
--- a/boards/st/sensortile_box_pro/doc/index.rst
+++ b/boards/st/sensortile_box_pro/doc/index.rst
@@ -31,6 +31,8 @@ on a smartphone/PC to implement applications such as:
 (see `Motion and environmental sensors`_ section for the complete lists of available
 sensors on board)
 
+.. zephyr:board-supported-hw::
+
 Hardware
 ********
 
@@ -247,6 +249,8 @@ Console default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 There are two alternative methods of flashing ST Sensortile.box Pro board:
 
 1. Using DFU software tools
diff --git a/boards/st/st25dv_mb1283_disco/doc/index.rst b/boards/st/st25dv_mb1283_disco/doc/index.rst
index b1fe8fa35da63..1c629ef03189b 100644
--- a/boards/st/st25dv_mb1283_disco/doc/index.rst
+++ b/boards/st/st25dv_mb1283_disco/doc/index.rst
@@ -66,6 +66,11 @@ Default Zephyr Peripheral Mapping
 - GPIO : PE15/PE7 (Available on external ST25DV connector J6)
 - GPIO : PE14 (Available on J5 connector)
 
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
 Serial Port
 ===========
 
@@ -76,6 +81,8 @@ Default communication settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``st25dv_mb1283_disco`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/st/steval_fcu001v1/doc/index.rst b/boards/st/steval_fcu001v1/doc/index.rst
index aea2ce5ac7901..81e31a53ab9a3 100644
--- a/boards/st/steval_fcu001v1/doc/index.rst
+++ b/boards/st/steval_fcu001v1/doc/index.rst
@@ -39,28 +39,7 @@ can be found in these documents:
 Supported Features
 ==================
 
-The Zephyr steval_fcu001v1 board configuration supports the following hardware features:
-
-+-----------+------------+------------------------------------+
-| Interface | Controller | Driver/Component                   |
-+===========+============+====================================+
-| NVIC      | on-chip    | nested vector interrupt controller |
-+-----------+------------+------------------------------------+
-| UART      | on-chip    | serial port-polling;               |
-|           |            | serial port-interrupt              |
-+-----------+------------+------------------------------------+
-| PINMUX    | on-chip    | pinmux                             |
-+-----------+------------+------------------------------------+
-| GPIO      | on-chip    | gpio                               |
-+-----------+------------+------------------------------------+
-| PWM       | on-chip    | pwm                                |
-+-----------+------------+------------------------------------+
-| I2C       | on-chip    | i2c                                |
-+-----------+------------+------------------------------------+
-
-
-The default configuration can be found in
-:zephyr_file:`boards/st/steval_fcu001v1/steval_fcu001v1_defconfig`
+.. zephyr:board-supported-hw::
 
 Default Zephyr Peripheral Mapping:
 ----------------------------------
@@ -95,6 +74,8 @@ The steval_fcu001v1 board has one I2C. The default I2C mapping for Zephyr is:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``steval_fcu001v1`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/st/steval_stwinbx1/doc/index.rst b/boards/st/steval_stwinbx1/doc/index.rst
index 8ef4c10dccaf0..1622f07b3affa 100644
--- a/boards/st/steval_stwinbx1/doc/index.rst
+++ b/boards/st/steval_stwinbx1/doc/index.rst
@@ -31,6 +31,8 @@ NFC or USB protocols to a host application running on a smartphone/PC to impleme
 (see `Sensing`_ section for the complete lists of available
 sensors on board)
 
+.. zephyr:board-supported-hw::
+
 Hardware
 ********
 
@@ -254,7 +256,9 @@ There are two possible options for Zephyr console output:
 Console default settings are 115200 8N1.
 
 Programming and Debugging
--------------------------
+*************************
+
+.. zephyr:board-supported-runners::
 
 There are two alternative methods of flashing ST Sensortile.box Pro board:
 
@@ -295,7 +299,7 @@ It is recommended to use the latest version of `STM32CubeProgrammer`_
 
 
 Flash an Application to STEVAL-STWINBX1
-------------------------------------------
+---------------------------------------
 
 There are two ways to enter DFU mode:
 
diff --git a/boards/st/stm3210c_eval/doc/index.rst b/boards/st/stm3210c_eval/doc/index.rst
index 43a5bdd4b68b0..61e8fd3a20ba2 100644
--- a/boards/st/stm3210c_eval/doc/index.rst
+++ b/boards/st/stm3210c_eval/doc/index.rst
@@ -50,31 +50,7 @@ More information about STM32F107VCT can be found here:
 Supported Features
 ==================
 
-The Zephyr stm3210c_eval board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm3210c_eval/stm3210c_eval_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -100,6 +76,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/st/stm32373c_eval/doc/index.rst b/boards/st/stm32373c_eval/doc/index.rst
index 10f722c650dcb..28758854910ba 100644
--- a/boards/st/stm32373c_eval/doc/index.rst
+++ b/boards/st/stm32373c_eval/doc/index.rst
@@ -54,31 +54,7 @@ More information about STM32F373VCT6 can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32373c_eval board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32373c_eval/stm32373c_eval_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -104,6 +80,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``stm32373c_eval`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/st/stm32c0116_dk/doc/index.rst b/boards/st/stm32c0116_dk/doc/index.rst
index b955518a77634..d5b771c699a39 100644
--- a/boards/st/stm32c0116_dk/doc/index.rst
+++ b/boards/st/stm32c0116_dk/doc/index.rst
@@ -39,43 +39,7 @@ More information about STM32C011F6 can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32c0116_dk board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| IWDG      | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| WWDG      | on-chip    | window watchdog                     |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32c0116_dk/stm32c0116_dk_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -99,6 +63,8 @@ The STM32C0116 Discovery board is configured as follows:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32C0116-DK Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32c0116_dk`` board configuration can be built and
diff --git a/boards/st/stm32f072_eval/doc/index.rst b/boards/st/stm32f072_eval/doc/index.rst
index 43c1eb1e0bef9..19cf2e4e8f65a 100644
--- a/boards/st/stm32f072_eval/doc/index.rst
+++ b/boards/st/stm32f072_eval/doc/index.rst
@@ -68,32 +68,7 @@ More information about STM32F072VB can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f072_eval board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f072_eval/stm32f072_eval_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -134,6 +109,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F072-EVAL Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f072_eval`` board configuration can be built and
diff --git a/boards/st/stm32f072b_disco/doc/index.rst b/boards/st/stm32f072b_disco/doc/index.rst
index 9790d3f4d0e76..3794fc098fae8 100644
--- a/boards/st/stm32f072b_disco/doc/index.rst
+++ b/boards/st/stm32f072b_disco/doc/index.rst
@@ -60,40 +60,10 @@ More information about STM32F072RB can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f072b_disco board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | SPI controller                      |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note:: CAN feature requires CAN transceiver, such as `SK Pang CAN breakout board`_.
 
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f072b_disco/stm32f072b_disco_defconfig`
-
-
 Pin Mapping
 ===========
 
@@ -137,6 +107,8 @@ is assigned to UART 1. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F072B-DISCO board includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f072b_disco`` board configuration can be built and
diff --git a/boards/st/stm32f0_disco/doc/index.rst b/boards/st/stm32f0_disco/doc/index.rst
index dccce953fac97..afe2789eaf7e0 100644
--- a/boards/st/stm32f0_disco/doc/index.rst
+++ b/boards/st/stm32f0_disco/doc/index.rst
@@ -40,31 +40,7 @@ More information about STM32F051R8 can be found in the `STM32F0x8 reference manu
 Supported Features
 ==================
 
-The Zephyr stm32f0_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f0_disco/stm32f0_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -87,6 +63,8 @@ For more details please refer to `STM32F0DISCOVERY board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F0DISCOVERY board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``stm32f0_disco`` board configuration can be built and
diff --git a/boards/st/stm32f3_disco/doc/index.rst b/boards/st/stm32f3_disco/doc/index.rst
index 107f3a609646c..c73c6768499a9 100644
--- a/boards/st/stm32f3_disco/doc/index.rst
+++ b/boards/st/stm32f3_disco/doc/index.rst
@@ -67,49 +67,7 @@ More information about STM32F303VC can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f3_disco board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | CAN                                 |
-+-----------+------------+-------------------------------------+
-| IWDG      | on-chip    | Independent WatchDoG                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | dac                                 |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| die-temp  | on-chip    | die temperature sensor              |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f3_disco/stm32f3_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -194,6 +152,8 @@ transceiver must be connected to ``PD0`` (``CAN1_RX``) and ``PD1``
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F3DISCOVERY Discovery kit includes a ST-LINK/V2 or ST-LINK/V2-B embedded
 debug tool interface.
 
diff --git a/boards/st/stm32f3_disco/stm32f3_disco.dts b/boards/st/stm32f3_disco/stm32f3_disco.dts
index 01fbad2721fd1..b47e139c4b84d 100644
--- a/boards/st/stm32f3_disco/stm32f3_disco.dts
+++ b/boards/st/stm32f3_disco/stm32f3_disco.dts
@@ -61,7 +61,7 @@
 		compatible = "gpio-keys";
 		user_button: button {
 			label = "User";
-			gpios = <&gpioa 0 GPIO_ACTIVE_LOW>;
+			gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
 			zephyr,code = <INPUT_KEY_0>;
 		};
 	};
diff --git a/boards/st/stm32f411e_disco/doc/index.rst b/boards/st/stm32f411e_disco/doc/index.rst
index 3b97cf290129f..9c7f25ec56a38 100644
--- a/boards/st/stm32f411e_disco/doc/index.rst
+++ b/boards/st/stm32f411e_disco/doc/index.rst
@@ -59,29 +59,7 @@ More information about STM32F411VE can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f411e_disco board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f411e_disco/stm32f411e_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -117,6 +95,8 @@ assigned to UART2. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F411E-DISCO Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f411e_disco`` board configuration can be built and
diff --git a/boards/st/stm32f412g_disco/doc/index.rst b/boards/st/stm32f412g_disco/doc/index.rst
index db8674826c22c..fb7fa80482ce5 100644
--- a/boards/st/stm32f412g_disco/doc/index.rst
+++ b/boards/st/stm32f412g_disco/doc/index.rst
@@ -72,32 +72,7 @@ More information about STM32F412ZG can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f412g_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f412g_disco/stm32f412g_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -133,6 +108,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F412G-DISCO Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f412g_disco`` board configuration can be built and
diff --git a/boards/st/stm32f413h_disco/doc/index.rst b/boards/st/stm32f413h_disco/doc/index.rst
index 49ce176da6514..be2433a18c58d 100644
--- a/boards/st/stm32f413h_disco/doc/index.rst
+++ b/boards/st/stm32f413h_disco/doc/index.rst
@@ -75,30 +75,7 @@ More information about STM32F413ZH can be found here:
 Supported Features
 ==================
 
-The Zephyr STM32F413H-DISCO board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported by Zephyr.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f413h_disco/stm32f413h_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -132,6 +109,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F413H-DISCO Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the STM32F413H-DISCO board configuration can be built and
diff --git a/boards/st/stm32f429i_disc1/doc/index.rst b/boards/st/stm32f429i_disc1/doc/index.rst
index 24780fb6cc091..6bac481d9b2f2 100644
--- a/boards/st/stm32f429i_disc1/doc/index.rst
+++ b/boards/st/stm32f429i_disc1/doc/index.rst
@@ -68,38 +68,7 @@ More information about STM32F429ZI can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f429i_disc1 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| OTG_HS    | on-chip    | usbotg_hs                           |
-+-----------+------------+-------------------------------------+
-| LTDC      | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f429i_disc1/stm32f429i_disc1_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -153,6 +122,8 @@ and host OTG operation, but only device mode has been tested with Zephyr at this
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The STM32F429I-DISC1 Discovery kit includes a ST-LINK/V2-B embedded debug tool interface.
 Applications for the ``stm32f429i_disc1`` board configuration can be built
 and flashed in the usual way (see :ref:`build_an_application` and
diff --git a/boards/st/stm32f469i_disco/doc/index.rst b/boards/st/stm32f469i_disco/doc/index.rst
index 7570831c568a1..e6830efb2be48 100644
--- a/boards/st/stm32f469i_disco/doc/index.rst
+++ b/boards/st/stm32f469i_disco/doc/index.rst
@@ -72,32 +72,7 @@ More information about STM32F469NI can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f469i_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| SDIO      | on-chip    | SD-card controller                  |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f469i_disco/stm32f469i_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -139,6 +114,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``stm32f469i_disco`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/st/stm32f4_disco/doc/index.rst b/boards/st/stm32f4_disco/doc/index.rst
index f21b1cdc01407..18e8ac7e2be91 100644
--- a/boards/st/stm32f4_disco/doc/index.rst
+++ b/boards/st/stm32f4_disco/doc/index.rst
@@ -69,37 +69,12 @@ More information about STM32F407VG can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f4_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note:: CAN feature requires CAN transceiver, such as `SK Pang CAN breakout board`_.
           Zephyr default configuration uses CAN_2 exclusively, as simultaneous use
           of CAN_1 and CAN_2 is not yet supported.
 
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f4_disco/stm32f4_disco_defconfig`
-
-
 Pin Mapping
 ===========
 
@@ -113,8 +88,6 @@ Default Zephyr Peripheral Mapping:
 
 .. rst-class:: rst-columns
 
-- UART_1_TX : PB6
-- UART_1_RX : PB7
 - UART_2_TX : PA2
 - UART_2_RX : PA3
 - USER_PB : PA0
@@ -124,10 +97,14 @@ Default Zephyr Peripheral Mapping:
 - LD6 : PD15
 - USB DM : PA11
 - USB DP : PA12
-- CAN1_RX : PB8
-- CAN1_TX : PB9
 - CAN2_RX : PB5
 - CAN2_TX : PB13
+- I2C1_SDA : PB9
+- I2C1_SCL : PB6
+- I2S3_MCK : PC7
+- I2S3_CK : PC10
+- I2S3_SD : PC12
+- I2S3_WS : PA4
 
 System Clock
 ============
@@ -148,6 +125,8 @@ enable console output you should use a serial cable and connect it to UART2 pins
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F4DISCOVERY Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f4_disco`` board configuration can be built and
diff --git a/boards/st/stm32f4_disco/stm32f4_disco.dts b/boards/st/stm32f4_disco/stm32f4_disco.dts
index 4e5d9ff87f869..10404e49103cd 100644
--- a/boards/st/stm32f4_disco/stm32f4_disco.dts
+++ b/boards/st/stm32f4_disco/stm32f4_disco.dts
@@ -83,13 +83,6 @@
 	};
 };
 
-&usart1 {
-	pinctrl-0 = <&usart1_tx_pb6 &usart1_rx_pb7>;
-	pinctrl-names = "default";
-	current-speed = <115200>;
-	status = "okay";
-};
-
 &clk_lsi {
 	status = "okay";
 };
@@ -159,12 +152,6 @@ zephyr_udc0: &usbotg_fs {
 	status = "okay";
 };
 
-&can1 {
-	pinctrl-0 = <&can1_rx_pb8 &can1_tx_pb9>;
-	pinctrl-names = "default";
-	status = "disabled";
-};
-
 &can2 {
 	pinctrl-0 = <&can2_rx_pb5 &can2_tx_pb13>;
 	pinctrl-names = "default";
@@ -187,3 +174,42 @@ zephyr_udc0: &usbotg_fs {
 &vbat {
 	status = "okay";
 };
+
+&dma1 {
+	status = "okay";
+};
+
+&plli2s {
+	/* Minimize audio clock error (with i2s mck-enabled) for all of:
+	 * - 22.05kHz / 16b, 24b or 32b
+	 * - 44.1kHz  / 16b, 24b or 32b
+	 * - 88.2kHz  / 16b or 24b
+	 * Note: because the PLLI2S is dependent on the main PLL, the latter
+	 *       should not be changed without checking impact on PLLI2S
+	 */
+	mul-n = <271>;
+	div-r = <2>;
+	status = "okay";
+};
+
+&i2s3 {
+	mck-enabled;
+	pinctrl-0 = <&i2s3_ws_pa4 &i2s3_ck_pc10 &i2s3_sd_pc12 &i2s3_mck_pc7>;
+	pinctrl-names = "default";
+	clocks = <&rcc STM32_CLOCK(APB1, 15U)>,
+		 <&rcc STM32_SRC_PLLI2S_R I2S_SEL(0)>;
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c1_scl_pb6 &i2c1_sda_pb9>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	audio_codec: cs43l22@4a {
+		compatible = "cirrus,cs43l22";
+		reg = <0x4a>;
+		reset-gpios = <&gpiod 4 0>;
+	};
+};
diff --git a/boards/st/stm32f723e_disco/doc/index.rst b/boards/st/stm32f723e_disco/doc/index.rst
index 412e5998dd0b5..5ec869f27d729 100644
--- a/boards/st/stm32f723e_disco/doc/index.rst
+++ b/boards/st/stm32f723e_disco/doc/index.rst
@@ -60,31 +60,7 @@ More information about STM32F723IEK6 can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f723e_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB device                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f723e_disco/stm32f723e_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -125,6 +101,8 @@ settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F723E Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f723e_disco`` board configuration can be built and
diff --git a/boards/st/stm32f746g_disco/board.cmake b/boards/st/stm32f746g_disco/board.cmake
index 038a5d7e806d7..968e8cfa890d5 100644
--- a/boards/st/stm32f746g_disco/board.cmake
+++ b/boards/st/stm32f746g_disco/board.cmake
@@ -2,6 +2,8 @@
 
 # keep first
 board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
+board_runner_args(stm32cubeprogrammer "--extload=N25Q128A_STM32F746G-DISCO.stldr")
+
 board_runner_args(jlink "--device=STM32F746NG" "--speed=4000")
 
 # keep first
diff --git a/boards/st/stm32f746g_disco/doc/index.rst b/boards/st/stm32f746g_disco/doc/index.rst
index bdd9ee665b635..35d515c4b423b 100644
--- a/boards/st/stm32f746g_disco/doc/index.rst
+++ b/boards/st/stm32f746g_disco/doc/index.rst
@@ -77,45 +77,7 @@ More information about STM32F746NGH6 can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f746g_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | Ethernet                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| LTDC      | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f746g_disco/stm32f746g_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -176,6 +138,8 @@ settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F746G Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f746g_disco`` board configuration can be built and
diff --git a/boards/st/stm32f746g_disco/stm32f746g_disco.dts b/boards/st/stm32f746g_disco/stm32f746g_disco.dts
index e224d24beaa05..eafd8bd6be221 100644
--- a/boards/st/stm32f746g_disco/stm32f746g_disco.dts
+++ b/boards/st/stm32f746g_disco/stm32f746g_disco.dts
@@ -57,6 +57,15 @@
 		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM) )>;
 	};
 
+	/* Declare attributes for the External flash Mem to allow code execution there */
+	ext_memory: memory@90000000 {
+		compatible = "zephyr,memory-region";
+		reg = <0x90000000 DT_SIZE_M(16)>; /* max addressable area */
+		zephyr,memory-region = "EXTMEM";
+		/* Override ATTR_MPU_EXTMEM with ATTR_MPU_IO to allow access */
+		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>;
+	};
+
 	aliases {
 		led0 = &green_led_1;
 		sw0 = &user_button;
@@ -105,7 +114,7 @@
 	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
-		int-gpios = <&gpioi 13 0>;
+		int-gpios = <&gpioi 13 GPIO_ACTIVE_LOW>;
 	};
 };
 
@@ -168,16 +177,27 @@ zephyr_udc0: &usbotg_fs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pg14>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 &quadspi {
diff --git a/boards/st/stm32f7508_dk/doc/index.rst b/boards/st/stm32f7508_dk/doc/index.rst
index fae2512a2f0b0..11e899d1bcbfd 100644
--- a/boards/st/stm32f7508_dk/doc/index.rst
+++ b/boards/st/stm32f7508_dk/doc/index.rst
@@ -72,45 +72,7 @@ More information about STM32F750x8 can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f7508_dk board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | Ethernet                            |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| LTDC      | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f7508_dk/stm32f7508_dk_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -171,6 +133,8 @@ settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F7508-DK Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f7508_dk`` board configuration can be built and
diff --git a/boards/st/stm32f7508_dk/stm32f7508_dk.dts b/boards/st/stm32f7508_dk/stm32f7508_dk.dts
index cf05ebfd479eb..2add12eb8ec45 100644
--- a/boards/st/stm32f7508_dk/stm32f7508_dk.dts
+++ b/boards/st/stm32f7508_dk/stm32f7508_dk.dts
@@ -105,7 +105,7 @@
 	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
-		int-gpios = <&gpioi 13 0>;
+		int-gpios = <&gpioi 13 GPIO_ACTIVE_LOW>;
 	};
 };
 
@@ -164,16 +164,27 @@ zephyr_udc0: &usbotg_fs {
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pg14>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 &quadspi {
diff --git a/boards/st/stm32f769i_disco/doc/index.rst b/boards/st/stm32f769i_disco/doc/index.rst
index 5324f080bed49..7805c58c2e41d 100644
--- a/boards/st/stm32f769i_disco/doc/index.rst
+++ b/boards/st/stm32f769i_disco/doc/index.rst
@@ -87,37 +87,7 @@ More information about STM32F769NIH6 can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32f769i_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | Ethernet                            |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | flash                               |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| TOUCH     | off-chip   | ft5336(FT6202)                      |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32f769i_disco/stm32f769i_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -158,6 +128,8 @@ settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32F769I Discovery kit includes an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32f769i_disco`` board configuration can be built and
diff --git a/boards/st/stm32f769i_disco/stm32f769i_disco.dts b/boards/st/stm32f769i_disco/stm32f769i_disco.dts
index bae733080165c..ba6837339c828 100644
--- a/boards/st/stm32f769i_disco/stm32f769i_disco.dts
+++ b/boards/st/stm32f769i_disco/stm32f769i_disco.dts
@@ -139,7 +139,7 @@ arduino_serial: &usart6 {};
 	ft6202: ft6202@2a {
 		compatible = "focaltech,ft5336";
 		reg = <0x2a>;
-		int-gpios = <&gpioi 13 0>;
+		int-gpios = <&gpioi 13 GPIO_ACTIVE_LOW>;
 	};
 };
 
@@ -151,16 +151,27 @@ arduino_serial: &usart6 {};
 
 &mac {
 	status = "okay";
-	pinctrl-0 = <&eth_mdc_pc1
-		     &eth_rxd0_pc4
+	pinctrl-0 = <&eth_rxd0_pc4
 		     &eth_rxd1_pc5
 		     &eth_ref_clk_pa1
-		     &eth_mdio_pa2
 		     &eth_crs_dv_pa7
 		     &eth_tx_en_pg11
 		     &eth_txd0_pg13
 		     &eth_txd1_pg14>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
 };
 
 &sdmmc2 {
diff --git a/boards/st/stm32f769i_disco/stm32f769i_disco.yaml b/boards/st/stm32f769i_disco/stm32f769i_disco.yaml
index 1f3c62f4c8d3b..db78a18bff6a3 100644
--- a/boards/st/stm32f769i_disco/stm32f769i_disco.yaml
+++ b/boards/st/stm32f769i_disco/stm32f769i_disco.yaml
@@ -16,5 +16,4 @@ supported:
   - arduino_gpio
   - netif:eth
   - memc
-  - kscan:touch
 vendor: st
diff --git a/boards/st/stm32g0316_disco/doc/index.rst b/boards/st/stm32g0316_disco/doc/index.rst
index 45741fad177b8..f2694c7ed846b 100644
--- a/boards/st/stm32g0316_disco/doc/index.rst
+++ b/boards/st/stm32g0316_disco/doc/index.rst
@@ -30,29 +30,7 @@ For more information about the STM32G03x SoC and the STM32G0316-DISCO board, see
 Supported Features
 ==================
 
-The Zephyr stm32g0316_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by the port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32g0316_disco/stm32g0316_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -74,6 +52,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The STM32G0316-DISCO board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``stm32g0316_disco`` board configuration can be built the
diff --git a/boards/st/stm32g071b_disco/doc/index.rst b/boards/st/stm32g071b_disco/doc/index.rst
index 6937ea9452e79..f5b437e8f935e 100644
--- a/boards/st/stm32g071b_disco/doc/index.rst
+++ b/boards/st/stm32g071b_disco/doc/index.rst
@@ -52,29 +52,7 @@ More information about STM32G071RB can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32g071b_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| UCPD      | on-chip    | ucpd                                |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32g071b_disco/stm32g071b_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -108,6 +86,8 @@ For more details please refer to `STM32G0 Discovery board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The STM32G071B Discovery board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``stm32g071b_disco`` board configuration can be built and
diff --git a/boards/st/stm32g081b_eval/doc/index.rst b/boards/st/stm32g081b_eval/doc/index.rst
index 27d932b096bbb..18d9bdedaffaf 100644
--- a/boards/st/stm32g081b_eval/doc/index.rst
+++ b/boards/st/stm32g081b_eval/doc/index.rst
@@ -93,29 +93,7 @@ More information about STM32G081RB can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32g081b_eval board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| UCPD      | on-chip    + ucpd                                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32g081b_eval/stm32g081b_eval_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -146,6 +124,8 @@ For more details please refer to `STM32G0 Evaluation board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The STM32G081B Evaluation board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Applications for the ``stm32g081b_eval`` board configuration can be built and
diff --git a/boards/st/stm32h573i_dk/doc/index.rst b/boards/st/stm32h573i_dk/doc/index.rst
index c5ae45a9a20d3..3bbabc2f28f63 100644
--- a/boards/st/stm32h573i_dk/doc/index.rst
+++ b/boards/st/stm32h573i_dk/doc/index.rst
@@ -147,62 +147,7 @@ More information about STM32H573 can be found here:
 Supported Features
 ==================
 
-The Zephyr STM32H573I_DK board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | PWM                                 |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | Real Time Clock                     |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c bus                             |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi bus                             |
-+-----------+------------+-------------------------------------+
-| OCTOSPI   | on-chip    | octospi                             |
-+-----------+------------+-------------------------------------+
-| CAN       | on-chip    | can bus                             |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB full-speed host/device bus      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig and dts files:
-
-- Secure target:
-
-  - :zephyr_file:`boards/st/stm32h573i_dk/stm32h573i_dk_defconfig`
-  - :zephyr_file:`boards/st/stm32h573i_dk/stm32h573i_dk.dts`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -239,6 +184,8 @@ assigned to USART1. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32H573I-DK Discovery board includes an ST-LINK/V3E embedded debug tool interface.
 
 Applications for the ``stm32h573i_dk`` board configuration can be built and
@@ -250,7 +197,7 @@ OpenOCD Support
 
 For now, OpenOCD support  for STM32H5 is not available on upstream OpenOCD.
 You can check `OpenOCD official Github mirror`_.
-In order to use it though, you should clone from the cutomized
+In order to use it though, you should clone from the customized
 `STMicroelectronics OpenOCD Github`_ and compile it following usual README guidelines.
 Once it is done, you can set the OPENOCD and OPENOCD_DEFAULT_PATH variables in
 :zephyr_file:`boards/st/stm32h573i_dk/board.cmake` to point the build
diff --git a/boards/st/stm32h573i_dk/stm32h573i_dk.dts b/boards/st/stm32h573i_dk/stm32h573i_dk.dts
index 97664d80ebab6..896da6606d2b3 100644
--- a/boards/st/stm32h573i_dk/stm32h573i_dk.dts
+++ b/boards/st/stm32h573i_dk/stm32h573i_dk.dts
@@ -166,6 +166,8 @@
 		     &eth_txd0_pg13
 		     &eth_txd1_pg12>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -173,10 +175,9 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/stm32h735g_disco/doc/index.rst b/boards/st/stm32h735g_disco/doc/index.rst
index 919451922dc37..b5f2786a267b5 100644
--- a/boards/st/stm32h735g_disco/doc/index.rst
+++ b/boards/st/stm32h735g_disco/doc/index.rst
@@ -34,46 +34,7 @@ More information about STM32H735 can be found here:
 Supported Features
 ==================
 
-The current Zephyr stm32h735g_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| FDCAN1    | on-chip    | CAN-FD Controller                   |
-+-----------+------------+-------------------------------------+
-| FDCAN2    | on-chip    | CAN-FD Controller                   |
-+-----------+------------+-------------------------------------+
-| FDCAN3    | on-chip    | CAN-FD Controller (disabled by      |
-|           |            | default. Solder bridges SB29 and    |
-|           |            | SB30 need to be closed for FDCAN3   |
-|           |            | to work)                            |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb_device                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32h735g_disco/stm32h735g_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -107,6 +68,8 @@ COM port interface. Default communication settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32H735G-DISCO board includes an ST-LINK/V3 embedded debug tool interface.
 
 See :ref:`build_an_application` for more information about application builds.
diff --git a/boards/st/stm32h735g_disco/stm32h735g_disco.dts b/boards/st/stm32h735g_disco/stm32h735g_disco.dts
index 0dc2d17f93da9..06afe9fb6450b 100644
--- a/boards/st/stm32h735g_disco/stm32h735g_disco.dts
+++ b/boards/st/stm32h735g_disco/stm32h735g_disco.dts
@@ -138,6 +138,8 @@
 		     &eth_txd0_pb12
 		     &eth_txd1_pb13>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 	status = "okay";
 };
 
@@ -146,10 +148,9 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/stm32h745i_disco/Kconfig.defconfig b/boards/st/stm32h745i_disco/Kconfig.defconfig
index 1788447e060b2..4d89e712958d5 100644
--- a/boards/st/stm32h745i_disco/Kconfig.defconfig
+++ b/boards/st/stm32h745i_disco/Kconfig.defconfig
@@ -11,13 +11,6 @@ if NETWORKING
 config NET_L2_ETHERNET
 	default y
 
-config ETH_STM32_HAL_MII
-	default y
-
-# STM32H745I-DISCO have PHY connected to address 1
-config ETH_STM32_HAL_PHY_ADDRESS
-	default 1
-
 endif # NETWORKING
 
 config MEMC
diff --git a/boards/st/stm32h745i_disco/doc/index.rst b/boards/st/stm32h745i_disco/doc/index.rst
index 24dab98ae4ca8..f1b9d60bec05f 100644
--- a/boards/st/stm32h745i_disco/doc/index.rst
+++ b/boards/st/stm32h745i_disco/doc/index.rst
@@ -60,43 +60,7 @@ More information about STM32H747XIH6 can be found here:
 Supported Features
 ==================
 
-The current Zephyr stm32h745i_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| FDCAN     | on-chip    | fdcan                               |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration per core can be found in the defconfig files:
-:zephyr_file:`boards/st/stm32h745i_disco/stm32h745i_disco_stm32h745xx_m7_defconfig` and
-:zephyr_file:`boards/st/stm32h745i_disco/stm32h745i_disco_stm32h745xx_m4_defconfig`
+.. zephyr:board-supported-hw::
 
 For more details please refer to `STM32H745-Disco UM`_.
 
@@ -143,6 +107,8 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32H745I-DISCO board includes an ST-LINK/V3 embedded debug tool interface.
 
 Applications for the ``stm32h745i_disco`` board should be built per core target,
diff --git a/boards/st/stm32h745i_disco/stm32h745i_disco_stm32h745xx_m7.dts b/boards/st/stm32h745i_disco/stm32h745i_disco_stm32h745xx_m7.dts
index f1e7204a8646e..1d6f188f19a52 100644
--- a/boards/st/stm32h745i_disco/stm32h745i_disco_stm32h745xx_m7.dts
+++ b/boards/st/stm32h745i_disco/stm32h745i_disco_stm32h745xx_m7.dts
@@ -144,6 +144,8 @@
 		     &eth_txd0_pg13
 		     &eth_rx_er_pi10>;
 	pinctrl-names = "default";
+	phy-connection-type = "mii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -151,10 +153,9 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@1 {
+	eth_phy: ethernet-phy@1 {
 		compatible = "ethernet-phy";
 		reg = <0x01>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/stm32h747i_disco/doc/index.rst b/boards/st/stm32h747i_disco/doc/index.rst
index 8d61400060a5a..ff7b5446ed866 100644
--- a/boards/st/stm32h747i_disco/doc/index.rst
+++ b/boards/st/stm32h747i_disco/doc/index.rst
@@ -41,51 +41,14 @@ More information about STM32H747XIH6 can be found here:
 Supported Features
 ==================
 
-The current Zephyr stm32h747i_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet  (*)                       |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| IPM       | on-chip    | virtual mailbox based on HSEM       |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | MIPI DSI Host with shield (MP1166)  |
-|           |            | st_b_lcd40_dsi1_mb1166              |
-+-----------+------------+-------------------------------------+
-
-(*) From UM2411 Rev 4:
+.. zephyr:board-supported-hw::
+
+.. note:
+   From UM2411 Rev 4:
    With the default setting, the Ethernet feature is not working because of
    a conflict between ETH_MDC and SAI4_D1 of the MEMs digital microphone.
    Make sure you have SB8 closed and SB21 open to get Ethernet working.
 
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration per core can be found in the defconfig files:
-:zephyr_file:`boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7_defconfig` and
-:zephyr_file:`boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4_defconfig`
-
 Pin Mapping
 ===========
 
@@ -192,6 +155,8 @@ two cores. This is done in 3 ways:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32H747I-DISCO board includes an ST-LINK/V3 embedded debug tool interface.
 
 Applications for the ``stm32h747i_disco`` board should be built per core target,
diff --git a/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.dts b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.dts
index b5b0ee1cd88ac..1406b29f2ea65 100644
--- a/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.dts
+++ b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.dts
@@ -144,6 +144,8 @@
 		     &eth_txd0_pg13
 		     &eth_txd1_pg12>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -151,10 +153,9 @@
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "ethernet-phy";
 		reg = <0x00>;
-		status = "okay";
 	};
 };
 
diff --git a/boards/st/stm32h750b_dk/doc/index.rst b/boards/st/stm32h750b_dk/doc/index.rst
index 8dacd802075de..a360cf8543cf7 100644
--- a/boards/st/stm32h750b_dk/doc/index.rst
+++ b/boards/st/stm32h750b_dk/doc/index.rst
@@ -34,37 +34,7 @@ More information about STM32H750 can be found here:
 Supported Features
 ==================
 
-The current Zephyr stm32h750b_dk board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| LTDC      | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32h750b_dk/stm32h750b_dk_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -97,6 +67,8 @@ COM port interface. Default communication settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32H750B Discovery kit includes an ST-LINK-V3E embedded debug tool interface.
 This probe allows flashing and debugging the board using various tools.
 
diff --git a/boards/st/stm32h757i_eval/CMakeLists.txt b/boards/st/stm32h757i_eval/CMakeLists.txt
new file mode 100644
index 0000000000000..5b63ce05f245a
--- /dev/null
+++ b/boards/st/stm32h757i_eval/CMakeLists.txt
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023 BrainCo Inc.
+# Copyright (c) 2025 Foss Analytical A/S
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Add custom linker section to relocate framebuffers to PSRAM
+zephyr_linker_sources_ifdef(CONFIG_LV_Z_VDB_CUSTOM_SECTION
+  SECTIONS dc_ram.ld)
diff --git a/boards/st/stm32h757i_eval/Kconfig.defconfig b/boards/st/stm32h757i_eval/Kconfig.defconfig
new file mode 100644
index 0000000000000..0d868227ea122
--- /dev/null
+++ b/boards/st/stm32h757i_eval/Kconfig.defconfig
@@ -0,0 +1,19 @@
+# STM32H757I EVAL board configuration
+
+# Copyright (c) 2019 Linaro Limited
+# Copyright (c) 2025 Foss Analytical A/S
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_STM32H757I_EVAL
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+endif # NETWORKING
+
+config DISK_DRIVER_SDMMC
+	default y if DISK_DRIVERS
+
+endif # BOARD_STM32H757I_EVAL
diff --git a/boards/st/stm32h757i_eval/Kconfig.stm32h757i_eval b/boards/st/stm32h757i_eval/Kconfig.stm32h757i_eval
new file mode 100644
index 0000000000000..d77cfe9280cb8
--- /dev/null
+++ b/boards/st/stm32h757i_eval/Kconfig.stm32h757i_eval
@@ -0,0 +1,9 @@
+# STM32H757I EVAL board configuration
+
+# Copyright (c) 2019 Linaro Limited
+# Copyright (c) 2025 Foss Analytical A/S
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_STM32H757I_EVAL
+	select SOC_STM32H757XX_M7 if BOARD_STM32H757I_EVAL_STM32H757XX_M7
+	select SOC_STM32H757XX_M4 if BOARD_STM32H757I_EVAL_STM32H757XX_M4
diff --git a/boards/st/stm32h757i_eval/board.cmake b/boards/st/stm32h757i_eval/board.cmake
new file mode 100644
index 0000000000000..b0a38149731a3
--- /dev/null
+++ b/boards/st/stm32h757i_eval/board.cmake
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2019 STMicroelectronics
+# Copyright (c) 2025 Foss Analytical A/S
+
+# keep first
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
+
+if(CONFIG_BOARD_STM32H757I_EVAL_STM32H757XX_M7)
+  board_runner_args(jlink "--device=STM32H757XI")
+  board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_stm32h757i_eval_m7.cfg")
+  board_runner_args(openocd --target-handle=_CHIPNAME.cpu0)
+elseif(CONFIG_BOARD_STM32H757I_EVAL_STM32H757XX_M4)
+  board_runner_args(jlink "--device=STM32H757XI_M4")
+  board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_stm32h757i_eval_m4.cfg")
+  board_runner_args(openocd --target-handle=_CHIPNAME.cpu1)
+endif()
+
+# keep first
+include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/st/stm32h757i_eval/board.yml b/boards/st/stm32h757i_eval/board.yml
new file mode 100644
index 0000000000000..5f73c601f91d4
--- /dev/null
+++ b/boards/st/stm32h757i_eval/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: stm32h757i_eval
+  full_name: STM32H757I Eval
+  vendor: st
+  socs:
+    - name: stm32h757xx
diff --git a/boards/st/stm32h757i_eval/dc_ram.ld b/boards/st/stm32h757i_eval/dc_ram.ld
new file mode 100644
index 0000000000000..56db3a2b997da
--- /dev/null
+++ b/boards/st/stm32h757i_eval/dc_ram.ld
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2023 BrainCo Inc.
+ * Copyright (c) 2025 Foss Analytical A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(sdram2), okay)
+GROUP_START(SDRAM2)
+
+	SECTION_PROLOGUE(_STM32_SDRAM2_SECTION_NAME, (NOLOAD),)
+	{
+		*(.lvgl_buf)
+	} GROUP_LINK_IN(SDRAM2)
+
+GROUP_END(SDRAM2)
+#endif
diff --git a/boards/st/stm32h757i_eval/doc/img/stm32h757i_eval.webp b/boards/st/stm32h757i_eval/doc/img/stm32h757i_eval.webp
new file mode 100644
index 0000000000000..246d4524e14c5
Binary files /dev/null and b/boards/st/stm32h757i_eval/doc/img/stm32h757i_eval.webp differ
diff --git a/boards/st/stm32h757i_eval/doc/index.rst b/boards/st/stm32h757i_eval/doc/index.rst
new file mode 100644
index 0000000000000..f2fe7f1bd5c7a
--- /dev/null
+++ b/boards/st/stm32h757i_eval/doc/index.rst
@@ -0,0 +1,259 @@
+.. zephyr:board:: stm32h757i_eval
+
+Overview
+********
+
+The evaluation kit enables a wide diversity of applications taking benefit
+from audio, multi-sensor support, graphics, security, video,
+and high-speed connectivity features.
+
+The STM32H7X7I-eval board comes with both the STM32H757XI SoC and the STM32H747XI SoC.
+But in the following documentation, we will focus on the STM32H757XI SoC, but both should work.
+
+The board includes an STM32H757XI SoC with a high-performance DSP, Arm Cortex-M7 + Cortex-M4 MCU,
+with 2MBytes of Flash memory, 1MB RAM, 480 MHz CPU, Art Accelerator, L1 cache, external memory interface,
+large set of peripherals, SMPS, and MIPI-DSI.
+
+Additionally, the board features:
+
+- On-board ST-LINK/V3E supporting USB reenumeration capability
+- USB ST-LINK functions: virtual COM port, mass storage, debug port
+- Flexible power-supply options:
+
+  - ST-LINK USB VBUS, USB OTG HS connector, or external sources
+
+- 4” capacitive touch LCD display module with MIPI® DSI interface
+- Ethernet compliant with IEEE802.3-2002
+- USB OTG HS and OTG FS
+- I2C compatible serial interface
+- RTC with rechargeable backup battery
+- SAI audio DAC
+- ST-MEMS digital microphones
+- 8-Gbyte (or more) SDIO 3.0 interface microSD card
+- 8 M×32bit SDRAM, 1 M×16bit SDRAM and 8 M×16bit NOR flash memory
+- 1-Gbit twin Quad-SPI NOR flash memory or two 512-Mbit Quad-SPI NOR flash memories
+- Potentiometer
+- 4 color user LEDs
+- Reset, wakeup, tamper, or key buttons
+- Joystick with 4-direction control and selector
+
+
+More information about the board can be found at the `STM32H757I-EVAL website`_.
+More information about STM32H757XIH6 can be found here:
+
+- `STM32H757XI on www.st.com`_
+- `STM32H757xx reference manual`_
+- `STM32H757xx datasheet`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Pin Mapping
+===========
+
+STM32H757I Discovery kit has 9 GPIO controllers. These controllers are responsible for pin muxing,
+input/output, pull-up, etc.
+
+For more details please refer to `STM32H757I-EVAL website`_.
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+
+- UART_1 TX/RX : PA9/PA10 (ST-Link Virtual Port Com)
+- SDMMC_1 D0/D1/D2/D3/CK/CMD: PC8/PC9/PC10/PC11/PC12/PD2
+- LD1 : PK3
+- LD2 : PK4
+- LD3 : PK5
+- LD4 : PK6
+- W-UP : PA0
+- J-CENTER : PB0
+- J-DOWN : PB1
+- J-LEFT : PB2
+- J-RIGHT : PB3
+- J-UP : PB4
+
+System Clock
+============
+
+The STM32H757I System Clock can be driven by an internal or external oscillator,
+as well as by the main PLL clock. By default, the CPU1 (Cortex-M7) System clock
+is driven by the PLL clock at 400MHz, and the CPU2 (Cortex-M4) System clock
+is driven at 200MHz. PLL clock is feed by a 25MHz high speed external clock.
+
+Serial Port
+===========
+
+Default configuration assigns USART1 to the CPU1. The Zephyr console
+output is assigned to UART1 which connected to the onboard ST-LINK/V3.0. Virtual
+COM port interface. Default communication settings are 115200 8N1.
+
+Display
+=======
+
+The STM32H757I Eval kit has a dedicated DSI LCD connector **CN15**, where
+the MB1166 (B-LCD40-DSI1) display extension board can be mounted. Enable display
+support in Zephyr by adding the shield ``st_b_lcd40_dsi1_mb1166`` or
+``st_b_lcd40_dsi1_mb1166_a09`` to your build command, for example:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/drivers/display
+   :board: stm32h757i_eval/stm32h757xx/m7
+   :shield: st_b_lcd40_dsi1_mb1166
+   :goals: build flash
+
+.. note::
+   The shield comes in different hardware revisions, the MB1166-A09
+   is utilizing a NT35510 panel controller and shall specifically
+   use ``st_b_lcd40_dsi1_mb1166_a09`` as SHIELD when building.
+   Prior versions are utilizing an OTM8009a controller and shall
+   use shield name without postfix, that is: ``st_b_lcd40_dsi1_mb1166``.
+   Shield version is printed on a sticker placed below the two bottom
+   mounting holes and has the format: MB1166-Axx.
+
+Resources sharing
+=================
+
+The dual core nature of STM32H757 SoC requires sharing HW resources between the
+two cores. This is done in 3 ways:
+
+- **Compilation**: Clock configuration is only accessible to M7 core. M4 core only
+  has access to bus clock activation and deactivation.
+- **Static pre-compilation assignment**: Peripherals such as a UART are assigned in
+  devicetree before compilation. The user must ensure peripherals are not assigned
+  to both cores at the same time.
+- **Run time protection**: Interrupt-controller and GPIO configurations could be
+  accessed by both cores at run time. Accesses are protected by a hardware semaphore
+  to avoid potential concurrent access issues.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+STM32H757I-EVAL board includes an ST-LINK/V3 embedded debug tool interface.
+
+Applications for the ``stm32h757i_disco`` board should be built per core target,
+using either ``stm32h757i_eval/stm32h757xx/m7`` or ``stm32h757i_eval/stm32h757xx/m4``
+as the target.
+See :ref:`build_an_application` for more information about application builds.
+
+.. note::
+
+   Check if the board's ST-LINK V3 has the newest FW version. It can be updated
+   using `STM32CubeProgrammer`_.
+
+.. note::
+
+   With OpenOCD, sometimes, flashing does not work. It is necessary to
+   erase the flash (with STM32CubeProgrammer for example) to make it work again.
+   Debugging with OpenOCD is currently working for this board only with Cortex M7,
+   not Cortex M4.
+
+
+Flashing
+========
+
+Flashing operation will depend on the target to be flashed and the SoC
+option bytes configuration.
+
+The board is configured to be flashed using west `STM32CubeProgrammer`_ runner
+for both cores, so its :ref:`installation <stm32cubeprog-flash-host-tools>` is required.
+The target core is detected automatically.
+
+Alternatively, OpenOCD or JLink can also be used to flash the board using
+the ``--runner`` (or ``-r``) option:
+
+.. code-block:: console
+
+   $ west flash --runner openocd
+   $ west flash --runner jlink
+
+It is advised to use `STM32CubeProgrammer`_ to check and update option bytes
+configuration.
+
+By default:
+
+  - CPU1 (Cortex-M7) boot address is set to 0x80000000 (OB: BOOT_CM7_ADD0)
+  - CPU2 (Cortex-M4) boot address is set to 0x81000000 (OB: BOOT_CM4_ADD0)
+
+Also, default out of the box board configuration enables CM7 and CM4 boot when
+board is powered (Option bytes BCM7 and BCM4 are checked).
+It is possible to change Option Bytes so that CM7 boots first in stand alone,
+and CM7 will wakeup CM4 after clock initialization.
+Drivers are able to take into account both Option Bytes configurations
+automatically.
+
+Zephyr flash configuration has been set to meet these default settings.
+
+Flashing an application to STM32H757I M7 Core
+---------------------------------------------
+
+First, connect the STM32H757I Eval kit to your host computer using
+the USB port to prepare it for flashing. Then build and flash your application.
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: stm32h757i_eval/stm32h757xx/m7
+   :goals: build flash
+
+Run a serial host program to connect with your board:
+
+.. code-block:: console
+
+   $ minicom -D /dev/ttyACM0
+
+You should see the following message on the console:
+
+.. code-block:: console
+
+   Hello World! stm32h757i_disco
+
+.. note::
+  Sometimes, flashing is not working. It is necessary to erase the flash
+  (with STM32CubeProgrammer for example) to make it work again.
+
+Similarly, you can build and flash samples on the M4 target. For this, please
+take care of the resource sharing (UART port used for console for instance).
+
+Here is an example for the :zephyr:code-sample:`blinky` application on M4 core.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: stm32h757i_eval/stm32h757xx/m7
+   :goals: build flash
+
+Debugging
+=========
+
+You can debug an application on Cortex M7 side in the usual way.  Here is an example
+for the :zephyr:code-sample:`hello_world` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: stm32h757i_eval/stm32h757xx/m7
+   :goals: debug
+
+Debugging a Zephyr application on Cortex M4 side with west is currently not available.
+As a workaround, you can use `STM32CubeIDE`_.
+
+.. _STM32H757I-EVAL website:
+   https://www.st.com/en/evaluation-tools/stm32h757i-eval.html
+
+.. _STM32H757XI on www.st.com:
+   https://www.st.com/en/microcontrollers-microprocessors/stm32h757xi.html
+
+.. _STM32H757xx reference manual:
+   https://www.st.com/resource/en/reference_manual/rm0399-stm32h745755-and-stm32h747757-advanced-armbased-32bit-mcus-stmicroelectronics.pdf
+
+.. _STM32H757xx datasheet:
+   https://www.st.com/resource/en/datasheet/stm32h757xi.pdf
+
+.. _STM32CubeProgrammer:
+   https://www.st.com/en/development-tools/stm32cubeprog.html
+
+.. _STM32CubeIDE:
+   https://www.st.com/en/development-tools/stm32cubeide.html
diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval.dtsi b/boards/st/stm32h757i_eval/stm32h757i_eval.dtsi
new file mode 100644
index 0000000000000..822019339f998
--- /dev/null
+++ b/boards/st/stm32h757i_eval/stm32h757i_eval.dtsi
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2019 Linaro Limited
+ * Copyright (c) 2025 Foss Analytical A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	leds {
+		compatible = "gpio-leds";
+
+		green_led_1: led_1 {
+			gpios = <&gpiok 3 GPIO_ACTIVE_LOW>;
+			label = "User LD1";
+			status = "disabled";
+		};
+
+		orange_led_2: led_2 {
+			gpios = <&gpiok 4 GPIO_ACTIVE_LOW>;
+			label = "User LD2";
+			status = "disabled";
+		};
+
+		red_led_3: led_3 {
+			gpios = <&gpiok 5 GPIO_ACTIVE_LOW>;
+			label = "User LD3";
+			status = "disabled";
+		};
+
+		blue_led_4: led_4 {
+			gpios = <&gpiok 6 GPIO_ACTIVE_LOW>;
+			label = "User LD4";
+			status = "disabled";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		wake_up: button_1 {
+			label = "Wakeup";
+			gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
+			status = "disabled";
+			zephyr,code = <INPUT_KEY_WAKEUP>;
+		};
+
+		tamper: button_2 {
+			label = "Tamper";
+			gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
+			status = "disabled";
+			zephyr,code = <INPUT_KEY_ENTER>;
+		};
+
+		joy_center: joystick_center {
+			label = "joystick center";
+			gpios = <&gpiob 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			status = "disabled";
+			zephyr,code = <INPUT_KEY_ENTER>;
+		};
+
+		joy_down: joystick_down {
+			label = "joystick down";
+			gpios = <&gpiob 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			status = "disabled";
+			zephyr,code = <INPUT_KEY_DOWN>;
+		};
+
+		joy_up: joystick_up {
+			label = "joystick up";
+			gpios = <&gpiob 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			status = "disabled";
+			zephyr,code = <INPUT_KEY_UP>;
+		};
+
+		joy_left: joystick_left {
+			label = "joystick left";
+			gpios = <&gpiob 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			status = "disabled";
+			zephyr,code = <INPUT_KEY_LEFT>;
+		};
+
+		joy_right: joystick_right {
+			label = "joystick right";
+			gpios = <&gpiob 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+			status = "disabled";
+			zephyr,code = <INPUT_KEY_RIGHT>;
+		};
+	};
+
+	dsi_lcd_qsh_030: connector_dsi_lcd {
+		compatible = "st,dsi-lcd-qsh-030";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <4 0 &gpiob 14 0>,	/* TOUCH_INT */
+			   <35 0 &gpioe 5 0>,	/* SCLK/MCLK */
+			   <37 0 &gpioe 4 0>,	/* LRCLK */
+			   <39 0 &gpioe 6 0>,	/* I2S */
+			   <40 0 &gpiob 7 0>,	/* I2C4_SDA (=>I2C1_SDA) */
+			   <44 0 &gpiod 12 0>,	/* I2C4_SCL (=>I2C1_SCL) */
+			   <45 0 &gpioa 8 0>,	/* CEC_CLK */
+			   <47 0 &gpioa 15 0>,	/* CEC */
+			   <49 0 &gpioj 2 0>,	/* DSI_TE */
+			   <53 0 &gpioa 6 0>,	/* LCD_BL_CTRL */
+			   <57 0 &gpiof 10 0>;	/* DSI_RESET */
+	};
+};
+
+&rcc {
+	d1cpre = <1>;
+	hpre = <2>;
+	d1ppre = <2>;
+	d2ppre1 = <2>;
+	d2ppre2 = <2>;
+	d3ppre = <2>;
+};
+
+&usart1 {
+	pinctrl-0 = <&usart1_tx_pb14 &usart1_rx_pb15>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4.dts b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4.dts
new file mode 100644
index 0000000000000..4f274e198ec6b
--- /dev/null
+++ b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4.dts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019 Linaro Limited
+ * Copyright (c) 2025 Foss Analytical A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/h7/stm32h757Xi_m4.dtsi>
+#include <st/h7/stm32h757xihx-pinctrl.dtsi>
+#include "stm32h757i_eval.dtsi"
+
+/ {
+	model = "STMicroelectronics STM32H757I EVAL board";
+	compatible = "st,stm32h757i-eval";
+
+	/* HW resources are split between CM7 and CM4 */
+	chosen {
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+		zephyr,sram = &sram1;
+		zephyr,flash = &flash1;
+	};
+
+	leds {
+		green_led_1: led_1 {
+			status = "okay";
+		};
+
+		orange_led_2: led_2 {
+			status = "okay";
+		};
+
+		red_led_3: led_3 {
+			status = "okay";
+		};
+
+		blue_led_4: led_4 {
+			status = "okay";
+		};
+	};
+
+	gpio_keys {
+		joy_center: joystick_center {
+			status = "okay";
+		};
+	};
+
+	aliases {
+		led0 = &green_led_1;
+		led1 = &orange_led_2;
+		led2 = &red_led_3;
+		led3 = &blue_led_4;
+		sw0 = &joy_center;
+	};
+};
+
+&rcc {
+	clock-frequency = <DT_FREQ_M(200)>;
+};
+
+&usart1 {
+	status = "okay";
+};
diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4.yaml b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4.yaml
new file mode 100644
index 0000000000000..c4f1095a6f0cf
--- /dev/null
+++ b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4.yaml
@@ -0,0 +1,18 @@
+identifier: stm32h757i_eval/stm32h757xx/m4
+name: ST STM32H757I Eval (M4)
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+ram: 288
+flash: 1024
+supported:
+  - gpio
+testing:
+  ignore_tags:
+    - mpu
+    - nfc
+    - net
+vendor: st
diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4_defconfig b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4_defconfig
new file mode 100644
index 0000000000000..e6cb73f81b7f2
--- /dev/null
+++ b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m4_defconfig
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2019 STMicroelectronics
+# Copyright (c) 2025 Foss Analytical A/S
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# By default CONSOLE is assigned to m7
+#CONFIG_CONSOLE=y
+#CONFIG_UART_CONSOLE=y
diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts
new file mode 100644
index 0000000000000..4640468048c5e
--- /dev/null
+++ b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2019 Linaro Limited
+ * Copyright (c) 2025 Foss Analytical A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/h7/stm32h757Xi_m7.dtsi>
+#include <st/h7/stm32h757xihx-pinctrl.dtsi>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#include "stm32h757i_eval.dtsi"
+
+
+/ {
+	model = "STMicroelectronics STM32H757I Eval board";
+	compatible = "st,stm32h757i-eval";
+
+	/* HW resources are split between CM7 and CM4 */
+	chosen {
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,flash-controller = &mt25ql512ab1;
+		zephyr,code-partition = &slot0_partition;
+	};
+
+	sdram2: sdram@d0000000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		device_type = "memory";
+		reg = <0xd0000000 DT_SIZE_M(32)>;
+		zephyr,memory-region = "SDRAM2";
+		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM) )>;
+	};
+
+	ext_memory: memory@90000000 {
+		compatible = "zephyr,memory-region";
+		reg = <0x90000000 DT_SIZE_M(64)>; /* 512 Mbits */
+		zephyr,memory-region = "EXTMEM";
+		/* The ATTR_MPU_EXTMEM attribut causing a MPU FAULT */
+		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>;
+	};
+
+	leds {
+		green_led_1: led_1 {
+			status = "okay";
+		};
+
+		orange_led_2: led_2 {
+			status = "okay";
+		};
+
+		red_led_3: led_3 {
+			status = "okay";
+		};
+
+		blue_led_4: led_4 {
+			status = "okay";
+		};
+	};
+
+	gpio_keys {
+		wake_up: button_1 {
+			status = "okay";
+		};
+
+		tamper: button_2 {
+			status = "okay";
+		};
+	};
+
+	otghs_ulpi_phy: otghs_ulpis_phy {
+		compatible = "usb-ulpi-phy";
+		#phy-cells = <0>;
+	};
+
+	aliases {
+		led0 = &green_led_1;
+		led1 = &orange_led_2;
+		led2 = &red_led_3;
+		led3 = &blue_led_4;
+		sw0 = &tamper;
+	};
+};
+
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(25)>;
+	status = "okay";
+};
+
+&clk_hsi48 {
+	status = "okay";
+};
+
+&pll {
+	div-m = <5>;
+	mul-n = <160>;
+	div-p = <2>;
+	div-q = <4>;
+	div-r = <2>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&pll2 {
+	div-m = <5>;
+	mul-n = <96>;
+	div-p = <2>;
+	div-q = <4>;
+	div-r = <10>;
+	clocks = <&clk_hse>;  /* Assuming 25MHz HSE */
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(400)>;
+};
+
+&usart1 {
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(128)>;
+		};
+
+		slot0_partition: partition@20000 {
+			label = "image-0";
+			reg = <0x00020000 DT_SIZE_K(896)>;
+		};
+
+		slot1_partition: partition@100000 {
+			label = "image-1";
+			reg = <0x00100000 DT_SIZE_K(896)>;
+		};
+
+		storage_partition: partition@1e0000 {
+			label = "storage";
+			reg = <0x001e0000 DT_SIZE_K(128)>;
+		};
+	};
+};
+
+&mac {
+	status = "okay";
+	pinctrl-0 = <&eth_ref_clk_pa1
+		     &eth_crs_dv_pa7
+		     &eth_rxd0_pc4
+		     &eth_rxd1_pc5
+		     &eth_tx_en_pg11
+		     &eth_txd0_pg13
+		     &eth_txd1_pg12>;
+	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x00>;
+	};
+};
+
+&rng {
+	status = "okay";
+};
+
+&fmc {
+	status = "okay";
+	pinctrl-0 = <&fmc_nbl0_pe0 &fmc_nbl1_pe1 &fmc_nbl2_pi4 &fmc_nbl3_pi5
+		     &fmc_sdclk_pg8 &fmc_sdnwe_ph5 &fmc_sdcke1_ph7
+		     &fmc_sdne1_ph6 &fmc_sdnras_pf11 &fmc_sdncas_pg15
+		     &fmc_a0_pf0 &fmc_a1_pf1 &fmc_a2_pf2 &fmc_a3_pf3 &fmc_a4_pf4
+		     &fmc_a5_pf5 &fmc_a6_pf12 &fmc_a7_pf13 &fmc_a8_pf14
+		     &fmc_a9_pf15 &fmc_a10_pg0 &fmc_a11_pg1 &fmc_a12_pg2
+		     &fmc_a14_pg4 &fmc_a15_pg5 &fmc_d0_pd14 &fmc_d1_pd15
+		     &fmc_d2_pd0 &fmc_d3_pd1 &fmc_d4_pe7 &fmc_d5_pe8 &fmc_d6_pe9
+		     &fmc_d7_pe10 &fmc_d8_pe11 &fmc_d9_pe12 &fmc_d10_pe13
+		     &fmc_d11_pe14 &fmc_d12_pe15 &fmc_d13_pd8 &fmc_d14_pd9
+		     &fmc_d15_pd10 &fmc_d16_ph8 &fmc_d17_ph9 &fmc_d18_ph10
+		     &fmc_d19_ph11 &fmc_d20_ph12 &fmc_d21_ph13 &fmc_d22_ph14
+		     &fmc_d23_ph15 &fmc_d24_pi0 &fmc_d25_pi1 &fmc_d26_pi2
+		     &fmc_d27_pi3 &fmc_d28_pi6 &fmc_d29_pi7 &fmc_d30_pi9
+		     &fmc_d31_pi10>;
+	pinctrl-names = "default";
+
+	sdram {
+		status = "okay";
+
+		power-up-delay = <100>;
+		num-auto-refresh = <8>;
+		mode-register = <0x220>;
+		refresh-rate = <603>;
+
+		bank@1 {
+			reg = <1>;
+
+			st,sdram-control = <STM32_FMC_SDRAM_NC_9
+					    STM32_FMC_SDRAM_NR_12
+					    STM32_FMC_SDRAM_MWID_32
+					    STM32_FMC_SDRAM_NB_4
+					    STM32_FMC_SDRAM_CAS_2
+					    STM32_FMC_SDRAM_SDCLK_PERIOD_2
+					    STM32_FMC_SDRAM_RBURST_ENABLE
+					    STM32_FMC_SDRAM_RPIPE_0>;
+			st,sdram-timing = <2 6 4 6 2 2 2>;
+		};
+	};
+};
+
+zephyr_udc0: &usbotg_hs {
+	pinctrl-0 = <&usb_otg_hs_ulpi_ck_pa5
+			&usb_otg_hs_ulpi_d0_pa3
+			&usb_otg_hs_ulpi_d1_pb0
+			&usb_otg_hs_ulpi_d2_pb1
+			&usb_otg_hs_ulpi_d3_pb10
+			&usb_otg_hs_ulpi_d4_pb11
+			&usb_otg_hs_ulpi_d5_pb12
+			&usb_otg_hs_ulpi_d6_pb13
+			&usb_otg_hs_ulpi_d7_pb5
+			&usb_otg_hs_ulpi_stp_pc0
+			&usb_otg_hs_ulpi_dir_pi11
+			&usb_otg_hs_ulpi_nxt_ph4>;
+	pinctrl-names = "default";
+	maximum-speed = "high-speed";
+	/* Include the USB1ULPIEN clock enable bit */
+	clocks = <&rcc STM32_CLOCK_BUS_AHB1 0x06000000>,
+		 <&rcc STM32_SRC_HSI48 USB_SEL(3)>;
+	phys = <&otghs_ulpi_phy>;
+	status = "okay";
+};
+
+&sdmmc1 {
+	status = "okay";
+	clocks = <&rcc STM32_CLOCK_BUS_AHB3 0x00010000>,
+			<&rcc STM32_SRC_PLL2_R SDMMC_SEL(1)>;
+	pinctrl-0 = <&sdmmc1_d0_pc8 &sdmmc1_d1_pc9
+			&sdmmc1_d2_pc10 &sdmmc1_d3_pc11
+			&sdmmc1_d4_pb8 &sdmmc1_d5_pb9
+			&sdmmc1_d6_pc6 &sdmmc1_d7_pc7
+			&sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>;
+	pinctrl-names = "default";
+	cd-gpios = <&gpioi 8 GPIO_ACTIVE_LOW>;
+};
+
+&quadspi {
+	pinctrl-0 = <&quadspi_clk_pb2 &quadspi_bk1_ncs_pg6
+		     &quadspi_bk1_io0_pd11 &quadspi_bk1_io1_pf9
+		     &quadspi_bk1_io2_pf7 &quadspi_bk1_io3_pf6
+		     &quadspi_bk2_io0_ph2 &quadspi_bk2_io1_ph3
+		     &quadspi_bk2_io2_pg9 &quadspi_bk2_io3_pg14>;
+	pinctrl-names = "default";
+	dual-flash;
+	status = "okay";
+
+	mt25ql512ab1: qspi-nor-flash-1@90000000 {
+		compatible = "st,stm32-qspi-nor";
+		reg = <0x90000000 DT_SIZE_M(64)>; /* 512 Mbits */
+		qspi-max-frequency = <72000000>;
+		spi-bus-width = <4>;
+		reset-cmd;
+		status = "okay";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x0 DT_SIZE_M(64)>;
+			};
+		};
+	};
+
+	mt25ql512ab2: qspi-nor-flash-2@90000000 {
+		compatible = "st,stm32-qspi-nor";
+		reg = <0x90000000 DT_SIZE_M(64)>; /* 512 Mbits */
+		qspi-max-frequency = <72000000>;
+		status = "okay";
+	};
+};
+
+/* alias used by display shields with touch control */
+qsh_030_i2c: &i2c4 {
+	pinctrl-0 = <&i2c4_scl_pd12 &i2c4_sda_pd13>;
+	pinctrl-names = "default";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	status = "okay";
+};
+
+/* alias used by display shields */
+zephyr_mipi_dsi: &mipi_dsi {};
+
+/* alias used by LCD display shields */
+zephyr_lcd_controller: &ltdc {};
diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.yaml b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.yaml
new file mode 100644
index 0000000000000..956e5dc0c4fbc
--- /dev/null
+++ b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.yaml
@@ -0,0 +1,18 @@
+identifier: stm32h757i_eval/stm32h757xx/m7
+name: ST STM32H757I Eval (M7)
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+ram: 2048
+flash: 1024
+supported:
+  - gpio
+  - spi
+  - netif:eth
+  - qspi
+  - memc
+  - usb_device
+vendor: st
diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7_defconfig b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7_defconfig
new file mode 100644
index 0000000000000..f5ea7cc621359
--- /dev/null
+++ b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7_defconfig
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2019 STMicroelectronics
+# Copyright (c) 2025 Foss Analytical A/S
+
+# Enable the internal SMPS regulator
+CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Disable following to assign serial ports to m4 core
+
+# Enable uart driver
+CONFIG_SERIAL=y
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/st/stm32h757i_eval/support/openocd_stm32h757i_eval_m4.cfg b/boards/st/stm32h757i_eval/support/openocd_stm32h757i_eval_m4.cfg
new file mode 100644
index 0000000000000..9958067dfb389
--- /dev/null
+++ b/boards/st/stm32h757i_eval/support/openocd_stm32h757i_eval_m4.cfg
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2025 Foss Analytical A/S
+
+source [find interface/stlink.cfg]
+
+transport select hla_swd
+
+set DUAL_BANK 1
+
+set DUAL_CORE 1
+
+source [find target/stm32h7x.cfg]
+
+reset_config srst_only srst_nogate connect_assert_srst
diff --git a/boards/st/stm32h757i_eval/support/openocd_stm32h757i_eval_m7.cfg b/boards/st/stm32h757i_eval/support/openocd_stm32h757i_eval_m7.cfg
new file mode 100644
index 0000000000000..172b4eb785142
--- /dev/null
+++ b/boards/st/stm32h757i_eval/support/openocd_stm32h757i_eval_m7.cfg
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2025 Foss Analytical A/S
+
+source [find interface/stlink.cfg]
+
+transport select hla_swd
+
+source [find target/stm32h7x.cfg]
+
+# Use connect_assert_srst here to be able to program
+# even when core is in sleep mode
+reset_config srst_only srst_nogate connect_assert_srst
+
+$_CHIPNAME.cpu0 configure -event gdb-attach {
+        echo "Debugger attaching: halting execution"
+        gdb_breakpoint_override hard
+}
+
+$_CHIPNAME.cpu0 configure -event gdb-detach {
+        echo "Debugger detaching: resuming execution"
+        resume
+}
+
+# Due to the use of connect_assert_srst, running gdb requires
+# to reset halt just after openocd init.
+rename init old_init
+proc init {} {
+        old_init
+        reset halt
+}
diff --git a/boards/st/stm32h7b3i_dk/doc/index.rst b/boards/st/stm32h7b3i_dk/doc/index.rst
index e5ad38f4c2b77..13fb0eeea67fe 100644
--- a/boards/st/stm32h7b3i_dk/doc/index.rst
+++ b/boards/st/stm32h7b3i_dk/doc/index.rst
@@ -94,42 +94,7 @@ More information about STM32H7B3 can be found here:
 Supported Features
 ==================
 
-The current Zephyr stm32h7b3i_dk board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| OSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| LTDC      | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-| CANFD     | on-chip    | can                                 |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32h7b3i_dk/stm32h7b3i_dk_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -189,6 +154,8 @@ default communication settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32H7B3I Discovery kit includes an STLINK-V3E embedded debug tool interface.
 
 Applications for the ``stm32h7b3i_dk`` board configuration can be built and
diff --git a/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts
index 23d71b056441a..c76f7b7f238f9 100644
--- a/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts
+++ b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts
@@ -169,7 +169,7 @@
 	ft5336: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
-		int-gpios = <&gpioh 2 0>;
+		int-gpios = <&gpioh 2 GPIO_ACTIVE_LOW>;
 	};
 };
 
diff --git a/boards/st/stm32h7s78_dk/doc/index.rst b/boards/st/stm32h7s78_dk/doc/index.rst
index 430b3d9dd0edc..ae69379abdd7c 100644
--- a/boards/st/stm32h7s78_dk/doc/index.rst
+++ b/boards/st/stm32h7s78_dk/doc/index.rst
@@ -147,40 +147,7 @@ More information about STM32H7S7 can be found here:
 Supported Features
 ==================
 
-The Zephyr STM32H7S78_DK board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi bus                             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig and dts files:
-
-- Secure target:
-
-  - :zephyr_file:`boards/st/stm32h7s78_dk/stm32h7s78_dk_defconfig`
-  - :zephyr_file:`boards/st/stm32h7s78_dk/stm32h7s78_dk.dts`
+.. zephyr:board-supported-hw::
 
 Zephyr board options
 ====================
@@ -215,6 +182,7 @@ Default Zephyr Peripheral Mapping:
 - LD3 (red) : PM2
 - LD4 (blue) : PM3
 - ADC1 channel 6 input : PF12
+- USB OTG FS DM/DP : PM12/PM11
 
 System Clock
 ------------
@@ -229,10 +197,17 @@ Serial Port
 STM32H7S78-DK Discovery board has 2 U(S)ARTs. The Zephyr console output is
 assigned to USART4. Default settings are 115200 8N1.
 
+USB
+---
+
+STM32H7S78-DK Discovery board has 2 USB Type-C connectors. Currently, only
+USB port2 (FS) is supported.
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32H7S78-DK Discovery board includes an ST-LINK/V3E embedded debug tool interface.
 
 Applications for the ``stm32h7s78_dk`` board configuration can be built and
diff --git a/boards/st/stm32h7s78_dk/stm32h7s78_dk.dts b/boards/st/stm32h7s78_dk/stm32h7s78_dk.dts
index e4192d41641a1..5cfbbb449b85a 100644
--- a/boards/st/stm32h7s78_dk/stm32h7s78_dk.dts
+++ b/boards/st/stm32h7s78_dk/stm32h7s78_dk.dts
@@ -184,3 +184,11 @@
 &vbat {
 	status = "okay";
 };
+
+usb2: &usbotg_fs {
+	pinctrl-0 = <&usb_otg_fs_dm_pm12 &usb_otg_fs_dp_pm11>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+zephyr_udc0: &usb2 {};
diff --git a/boards/st/stm32h7s78_dk/stm32h7s78_dk.yaml b/boards/st/stm32h7s78_dk/stm32h7s78_dk.yaml
index e48895cbce1bb..7e14a410259ff 100644
--- a/boards/st/stm32h7s78_dk/stm32h7s78_dk.yaml
+++ b/boards/st/stm32h7s78_dk/stm32h7s78_dk.yaml
@@ -13,4 +13,6 @@ supported:
   - watchdog
   - entropy
   - adc
+  - usb_device
+  - usbd
 vendor: st
diff --git a/boards/st/stm32l1_disco/doc/index.rst b/boards/st/stm32l1_disco/doc/index.rst
index 6954625564b48..621e161189805 100644
--- a/boards/st/stm32l1_disco/doc/index.rst
+++ b/boards/st/stm32l1_disco/doc/index.rst
@@ -47,54 +47,7 @@ More information about STM32L151x can be found in the `STM32L1x reference manual
 Supported Features
 ==================
 
-The Zephyr stm32l1_disco and stm32l152c_disco board configurations support
-the following hardware features:
-
-.. list-table:: Supported hardware
-   :header-rows: 1
-
-   * - Interface
-     - Controller
-     - Driver/component
-   * - NVIC
-     - on-chip
-     - nested vector interrupt controller
-   * - UART
-     - on-chip
-     - serial port-polling
-       serial port-interrupt
-   * - PINMUX
-     - on-chip
-     - pinmux
-   * - GPIO
-     - on-chip
-     - gpio
-   * - CLOCK
-     - on-chip
-     - reset and clock control
-   * - FLASH
-     - on-chip
-     - flash memory
-   * - EEPROM
-     - on-chip
-     - eeprom
-   * - WATCHDOG
-     - on-chip
-     - window watchdog
-   * - I2C
-     - on-chip
-     - i2c
-   * - SPI
-     - on-chip
-     - spi
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The configuration of stm32l1_disco can be found in
-:zephyr_file:`boards/st/stm32l1_disco/stm32l1_disco_defconfig`
-
-Configuration of stm32l152c_disco can be found in
-:zephyr_file:`boards/st/stm32l1_disco/stm32l152c_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -131,6 +84,8 @@ For more details please refer to `STM32L1DISCOVERY board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32L1DISCOVERY and STM32L152CDISCOVERY boards include an ST-LINK/V2 embedded debug tool interface.
 
 Applications for the ``stm32l1_disco`` board configuration can be built and
diff --git a/boards/st/stm32l476g_disco/doc/index.rst b/boards/st/stm32l476g_disco/doc/index.rst
index 00c7fdc45d404..868590f70335b 100644
--- a/boards/st/stm32l476g_disco/doc/index.rst
+++ b/boards/st/stm32l476g_disco/doc/index.rst
@@ -100,27 +100,7 @@ More information about STM32L476VG can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32l476g_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/st/stm32l476g_disco/stm32l476g_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -155,6 +135,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32L476G Discovery board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/stm32l496g_disco/doc/index.rst b/boards/st/stm32l496g_disco/doc/index.rst
index ce91d694043f6..09b7207953b12 100644
--- a/boards/st/stm32l496g_disco/doc/index.rst
+++ b/boards/st/stm32l496g_disco/doc/index.rst
@@ -115,41 +115,7 @@ More information about STM32L496AG can be found in:
 Supported Features
 ==================
 
-The Zephyr stm32l496g_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb_device                          |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/st/stm32l496g_disco/stm32l496g_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -191,6 +157,8 @@ Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32L496G Discovery board includes an ST-LINK/V2-1 embedded debug tool interface.
 
 Flashing
diff --git a/boards/st/stm32l496g_disco/stm32l496g_disco.dts b/boards/st/stm32l496g_disco/stm32l496g_disco.dts
index 9027656636a47..4a942a5ab066c 100644
--- a/boards/st/stm32l496g_disco/stm32l496g_disco.dts
+++ b/boards/st/stm32l496g_disco/stm32l496g_disco.dts
@@ -194,7 +194,7 @@ zephyr_udc0: &usbotg_fs {
 			&quadspi_bk1_ncs_pb11 &quadspi_clk_pa3>;
 	pinctrl-names = "default";
 
-	dmas = <&dma2 7 3 0x480>; /* channel 7 request 3 on DMA2 */
+	dmas = <&dma2 7 3 STM32_DMA_PERIPH_RX>; /* channel 7 request 3 on DMA2 */
 	dma-names = "tx_rx";
 
 	flash-id = <1>;
diff --git a/boards/st/stm32l4r9i_disco/doc/index.rst b/boards/st/stm32l4r9i_disco/doc/index.rst
index 0b5b992c05937..f6a7417e0b738 100644
--- a/boards/st/stm32l4r9i_disco/doc/index.rst
+++ b/boards/st/stm32l4r9i_disco/doc/index.rst
@@ -25,41 +25,7 @@ More information about STM32L4R9 can be found here:
 Supported Features
 ==================
 
-The current Zephyr stm32l4r9i_disco board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling                 |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | on-chip flash memory;               |
-|           |            | external OctoSPI memory             |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | Real Time Clock                     |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | sd/mmc                              |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/st/stm32l4r9i_disco/stm32l4r9i_disco_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -84,6 +50,8 @@ ST-LINK Virtual COM port interface. Default communication settings are 115200 8N
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The STM32L4R9I Discovery board includes an ST-LINK/V2-1 debug tool.
 
 Applications for the ``stm32l4r9i_disco`` board configuration can be
diff --git a/boards/st/stm32l562e_dk/board.cmake b/boards/st/stm32l562e_dk/board.cmake
index 15e7afc15c090..e3f5f878df228 100644
--- a/boards/st/stm32l562e_dk/board.cmake
+++ b/boards/st/stm32l562e_dk/board.cmake
@@ -15,8 +15,10 @@ endif()
 # keep first
 board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
 board_runner_args(pyocd "--target=stm32l562qeixq")
+board_runner_args(jlink "--device=STM32L562QE" "--speed=4000")
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/st/stm32l562e_dk/doc/index.rst b/boards/st/stm32l562e_dk/doc/index.rst
index 4e15997193655..8abda84af0432 100644
--- a/boards/st/stm32l562e_dk/doc/index.rst
+++ b/boards/st/stm32l562e_dk/doc/index.rst
@@ -139,68 +139,8 @@ More information about STM32L562QE can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32l562e_dk board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| ADC       | on-chip    | ADC Controller                      |
-+-----------+------------+-------------------------------------+
-| AES       | on-chip    | crypto                              |
-+-----------+------------+-------------------------------------+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | TFT LCD screen with st7789v driver  |
-|           |            | and touch panel with ft5336 driver  |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access                |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | PWM                                 |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | entropy                             |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | sd/mmc                              |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| TrustZone | on-chip    | Trusted Firmware-M                  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig and dts files:
-
-- Common:
-
-  - :zephyr_file:`boards/st/stm32l562e_dk/stm32l562e_dk_common.dtsi`
-
-- Secure target:
-
-  - :zephyr_file:`boards/st/stm32l562e_dk/stm32l562e_dk_defconfig`
-  - :zephyr_file:`boards/st/stm32l562e_dk/stm32l562e_dk.dts`
-
-- Non-Secure target:
-
-  - :zephyr_file:`boards/st/stm32l562e_dk/stm32l562e_dk_stm32l562xx_ns_defconfig`
-  - :zephyr_file:`boards/st/stm32l562e_dk/stm32l562e_dk_stm32l562xx_ns.dts`
+.. zephyr:board-supported-hw::
+
 
 Zephyr board options
 ====================
@@ -290,6 +230,8 @@ They can be tested using :zephyr:code-sample:`lvgl` sample:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32L562E-DK Discovery board includes an ST-LINK/V3E embedded debug tool interface.
 
 Applications for the ``stm32l562e_dk`` board configuration can be built and
diff --git a/boards/st/stm32mp135f_dk/Kconfig.stm32mp135f_dk b/boards/st/stm32mp135f_dk/Kconfig.stm32mp135f_dk
new file mode 100644
index 0000000000000..c648af34bc372
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/Kconfig.stm32mp135f_dk
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_STM32MP135F_DK
+	select SOC_STM32MP135FXX
diff --git a/boards/st/stm32mp135f_dk/board.cmake b/boards/st/stm32mp135f_dk/board.cmake
new file mode 100644
index 0000000000000..af21b18031704
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/board.cmake
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+
+board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd.cfg")
diff --git a/boards/st/stm32mp135f_dk/board.yml b/boards/st/stm32mp135f_dk/board.yml
new file mode 100644
index 0000000000000..2e3886965ba73
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: stm32mp135f_dk
+  full_name: STM32MP135F-DK Discovery
+  vendor: st
+  socs:
+    - name: stm32mp135fxx
diff --git a/boards/st/stm32mp135f_dk/doc/img/stm32mp135f_dk.webp b/boards/st/stm32mp135f_dk/doc/img/stm32mp135f_dk.webp
new file mode 100644
index 0000000000000..d4e5a32a261ac
Binary files /dev/null and b/boards/st/stm32mp135f_dk/doc/img/stm32mp135f_dk.webp differ
diff --git a/boards/st/stm32mp135f_dk/doc/index.rst b/boards/st/stm32mp135f_dk/doc/index.rst
new file mode 100644
index 0000000000000..d56cb0c4c1298
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/doc/index.rst
@@ -0,0 +1,205 @@
+.. zephyr:board:: stm32mp135f_dk
+
+Overview
+********
+The STM32MP135 Discovery kit (STM32MP135F-DK) leverages the capabilities of the
+1 GHz STM32MP135 microprocessors to allow users to develop applications easily with Zephyr RTOS.
+
+It includes an ST-LINK embedded debug tool, LEDs, push-buttons, two 10/100 Mbit/s Ethernet (RMII) connectors, one USB Type-C |reg| connector, four USB Host Type-A connectors, and one microSD™ connector.
+
+To expand the functionality of the STM32MP135 Discovery kit, one GPIO expansion connector is also available for third-party shields.
+
+Additionally, the STM32MP135 Discovery kit features an LCD display with a touch panel, Wi‑Fi |reg| and Bluetooth |reg| Low Energy capability, and a 2-megapixel CMOS camera module.
+
+It also provides secure boot and cryptography features.
+
+Zephyr OS is ported to run on the Cortex |reg|-A7 core.
+
+- STM32MP135FAF7: Arm |reg| Cortex |reg|-A7 32-bit processor at 1 GHz, in a TFBGA320 package
+- ST PMIC STPMIC1
+- 4-Gbit DDR3L, 16 bits, 533 MHz
+- 4.3" 480x272 pixels LCD display module with capacitive touch panel and RGB interface
+- UXGA 2-megapixel CMOS camera module (included) with MIPI CSI-2 |reg| / SMIA CCP2 deserializer
+- Wi-Fi |reg| 802.11b/g/n
+- Bluetooth |reg| Low Energy 4.1
+- Dual 10/100 Mbit/s Ethernet (RMII) compliant with IEEE-802.3u, one with Wake on LAN (WoL) support
+- USB Host 4-port hub
+- USB Type-C |reg| DRP based on an STM32G0 device
+- 4 user LEDs
+- 4 push-buttons (2× user, tamper, and reset)
+- 1 wake-up button
+- Board connectors:
+
+  - Dual-lane MIPI CSI-2 |reg| camera module expansion
+  - 2x Ethernet RJ45
+  - 4x USB Type-A
+  - USB Micro-B
+  - USB Type-C |reg|
+  - microSD™ card holder
+  - GPIO expansion
+  - 5 V / 3 A USB Type-C |reg| power supply input (charger not provided)
+  - VBAT for power backup
+
+- On-board current measurement
+- On-board STLINK-V3E debugger/programmer with USB re-enumeration capability:
+
+  - mass storage
+  - Virtual COM port
+  - debug port
+
+More information about the board can be found at the
+`STM32P135 Discovery website`_.
+
+Hardware
+********
+
+More information about the STM32MP135F_DK board hardware can be found here:
+
+- `STM32MP135F_DK Hardware Description`_
+
+More information about STM32P135F microprocessor can be found here:
+
+- `STM32MP135F on www.st.com`_
+- `STM32MP135F reference manual`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+STM32MP135F-DK Discovery Board schematic is available here:
+`STM32MP135F Discovery board schematics`_.
+
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+
+- USART_4 TX/RX : PD6/PD8 (UART console)
+
+- USER_BUTTON : PA13
+- LED_3 : PA14
+- LED_4 : PA13
+
+System Clock
+------------
+
+The Cortex |reg|-A7 core is configured to run at a clock speed of up to 1GHz.
+
+Memory mapping
+--------------
+
++------------+-----------------------+----------------+
+| Region     |        Address        |     Size       |
++============+=======================+================+
+| SYSRAM     | 0x2FFE0000-0x2FFFFFFF | 128KB          |
++------------+-----------------------+----------------+
+| SRAM 1     | 0x30000000-0x30003FFF |  16KB          |
++------------+-----------------------+----------------+
+| SRAM 2     | 0x30004000-0x30005FFF |   8KB          |
++------------+-----------------------+----------------+
+| SRAM 3     | 0x30006000-0x30007FFF |   8KB          |
++------------+-----------------------+----------------+
+| DDR        | 0xC0000000-0xDFFFFFFF |   512 MB       |
++------------+-----------------------+----------------+
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Prerequisite
+============
+
+The STM32MP135 has a DDR controller that need to be initialized before loading the Zephyr example.
+
+One method to perform this is to flash the Zephyr executable, along with the DDR initialization script, on an SD card inserted in the board. To do so, you first need to :ref:`install STM32CubeProgrammer <stm32cubeprog-flash-host-tools>` and download the `STM32CubeMP13 package`_.
+
+Signature and flashing
+======================
+
+After building the Zephyr project, you need to sign your binary file using the Stm32ImageAddHeader.py with the following command:
+
+.. code-block:: console
+
+   python3 ${Path_to_STM32CubeMP13}/Utilities/ImageHeader/Python3/Stm32ImageAddHeader.py ${Path_to_build_dir}/zephyr/zephyr.bin ${STM32CubeMP13}/Projects/STM32MP135C-DK/External_Loader/Prebuild_Binaries/SD_Ext_Loader/zephyr_Signed.bin -bt 10 -la C0000000 -ep C0000000
+
+Here -bt specifies the boot type, -la specifies the load address and -ep the entry point for your executable (same as the load address in this case).
+
+Then, copy :zephyr_file:`boards/st/stm32mp135f_dk/support/Zephyr.tsv` to ``${Path_to_STM32CubeMP13}/Projects/STM32MP135C-DK/External_Loader/Prebuild_Binaries/SD_Ext_Loader/``.
+
+Finally using the Cube Programmer select the Zephyr.tsv and flash the SD card with the following command:
+
+.. code-block:: console
+
+   ${Path_to_STM32cube_Programmer}/bin/STM32_Programmer.sh -c port=${ConnectedPort} p=even br=115200 -d ${Path_to_STM32CubeMP13}/Projects/STM32MP135C-DK/External_Loader/Prebuild_Binaries/SD_Ext_Loader/Zephyr.tsv
+
+.. note::
+  You can refer to this example to flash an example to the SD card:
+  `How to install STM32Cube software package on microSD card`_
+
+Debugging
+=========
+
+You can debug an application using OpenOCD and GDB.
+
+- Build the sample:
+
+  .. zephyr-app-commands::
+     :zephyr-app: samples/hello_world
+     :board: stm32mp135f_dk
+     :goals: build
+
+- Flash the SD card using:
+  `How to install STM32Cube software package on microSD card`_
+
+- Run the application from the SD card
+
+- Attach to the target:
+
+  .. code-block:: console
+
+      west attach
+
+.. note::
+  The ``run`` command of GDB isn't supported at the moment for this board.
+
+References
+**********
+
+.. target-notes::
+
+.. _STM32P135 Discovery website:
+   https://www.st.com/en/evaluation-tools/stm32mp135f-dk.html
+
+.. _STM32MP135F Discovery board User Manual:
+   https://www.st.com/resource/en/user_manual/dm00862450.pdf
+
+.. _STM32MP135F Discovery board schematics:
+   https://www.st.com/resource/en/schematic_pack/mb1635-mp135f-e02-schematic.pdf
+
+.. _STM32MP135F on www.st.com:
+   https://www.st.com/content/st_com/en/products/microcontrollers-microprocessors/stm32-arm-cortex-mpus/stm32mp1-series/stm32mp135/stm32mp135f.html
+
+.. _STM32MP135F reference manual:
+   https://www.st.com/resource/en/reference_manual/DM00670465-.pdf
+
+.. _STM32MP135 STM32Cube software package:
+   https://www.st.com/en/embedded-software/stm32cubemp13.html#get-software
+
+.. _How to install STM32Cube software package on microSD card:
+   https://wiki.st.com/stm32mpu/wiki/How_to_load_and_start_STM32CubeMP13_applications_via_microSD_card
+
+.. _STM32MP135F boot architecture:
+   https://wiki.st.com/stm32mpu/wiki/STM32CubeMP13_package_-_boot_architecture
+
+.. _STM32MP135F baremetal distribution:
+   https://wiki.st.com/stm32mpu/wiki/Category:Bare_metal_-_RTOS_embedded_software
+
+.. _STM32CubeMP13 package:
+   https://github.com/STMicroelectronics/STM32CubeMP13
+
+.. _STM32MP135F_DK Hardware Description:
+   https://wiki.stmicroelectronics.cn/stm32mpu/wiki/STM32MP135x-DK_-_hardware_description
diff --git a/boards/st/stm32mp135f_dk/stm32mp135f_dk.dts b/boards/st/stm32mp135f_dk/stm32mp135f_dk.dts
new file mode 100644
index 0000000000000..5d2f343835568
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/stm32mp135f_dk.dts
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <st/mp13/stm32mp135.dtsi>
+#include <st/mp13/stm32mp135faex-pinctrl.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "STMicroelectronics STM32MP135-DK board";
+	compatible = "st,stm32mp135f-dk";
+
+	chosen {
+		zephyr,flash = &ddr_code;
+		zephyr,sram = &ddr_data;
+		zephyr,console = &uart4;
+		zephyr,shell-uart = &uart4;
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		user_button: button {
+			label = "User 1";
+			gpios = <&gpioa 13 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		blue_led_1: led_1 {
+			gpios = <&gpioa 14 GPIO_ACTIVE_HIGH>;
+			label = "LD3";
+		};
+
+		red_led_2: led_2 {
+			gpios = <&gpioa 13 GPIO_ACTIVE_HIGH>;
+			label = "LD4";
+		};
+	};
+
+	aliases {
+		led0 = &blue_led_1;
+		led1 = &red_led_2;
+		sw0 = &user_button;
+	};
+};
+
+&clk_hsi {
+	clock-frequency = <DT_FREQ_M(64)>;
+	status = "okay";
+};
+
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(24)>;
+	status = "okay";
+};
+
+&cpusw {
+	clocks = <&clk_hsi>;
+	clock-frequency = <DT_FREQ_M(64)>;
+	status = "okay";
+};
+
+&pll1 {
+	clocks = <&clk_hse>;
+	div-m = <2>;
+	mul-n = <83>;
+	div-p = <1>;
+	frac-v = <2730>;
+	status = "okay";
+};
+
+&rcc {
+	clock-frequency = <DT_FREQ_M(1000)>;
+	clocks = <&pll>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+};
+
+&uart4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart4_tx_pd6 &uart4_rx_pd8>;
+	current-speed = <115200>;
+	status = "okay";
+};
diff --git a/boards/st/stm32mp135f_dk/stm32mp135f_dk_defconfig b/boards/st/stm32mp135f_dk/stm32mp135f_dk_defconfig
new file mode 100644
index 0000000000000..5a7682e99ddba
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/stm32mp135f_dk_defconfig
@@ -0,0 +1,16 @@
+# Copyright (c) 2025, STMicroelectronics
+
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable UART driver
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Console (remote proc console by default)
+CONFIG_CONSOLE=y
+
+# UART console (overrides remote proc console)
+CONFIG_UART_CONSOLE=y
diff --git a/boards/st/stm32mp135f_dk/support/Zephyr.tsv b/boards/st/stm32mp135f_dk/support/Zephyr.tsv
new file mode 100644
index 0000000000000..9f59a34e9274e
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/support/Zephyr.tsv
@@ -0,0 +1,5 @@
+#Opt	Id	Name	Type	IP	Offset	Binary
+P	0x1	fsbl-openbl	Binary	none	0x0	External_Mem_Loader_A7.stm32
+P	0x3	fsbl-extfl	Binary	none	0x0	SD_Ext_Loader.bin
+P	0x4	fsbl-app	Binary	mmc0	0x0000080	FSBLA_Sdmmc1_A7_Signed.bin
+P	0x5	fsbl-app	Binary	mmc0	0x0000500	zephyr_Signed.bin
diff --git a/boards/st/stm32mp135f_dk/support/openocd.cfg b/boards/st/stm32mp135f_dk/support/openocd.cfg
new file mode 100644
index 0000000000000..95aff7bb7ba7b
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/support/openocd.cfg
@@ -0,0 +1,4 @@
+source [find board/stm32mp13x_dk.cfg]
+
+# Don't reset the SoC to keep DDR configuration
+reset_config none
diff --git a/boards/st/stm32mp135f_dk/twister.yaml b/boards/st/stm32mp135f_dk/twister.yaml
new file mode 100644
index 0000000000000..6e2d37a648298
--- /dev/null
+++ b/boards/st/stm32mp135f_dk/twister.yaml
@@ -0,0 +1,14 @@
+identifier: stm32mp135f_dk
+name: ST STM32MP135F-DK Discovery
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - gpio
+  - uart
+  - shell
+ram: 256
+flash: 256
+vendor: st
diff --git a/boards/st/stm32mp157c_dk2/doc/stm32mp157_dk2.rst b/boards/st/stm32mp157c_dk2/doc/stm32mp157_dk2.rst
index bd649f2e2510c..5610262ab2357 100644
--- a/boards/st/stm32mp157c_dk2/doc/stm32mp157_dk2.rst
+++ b/boards/st/stm32mp157c_dk2/doc/stm32mp157_dk2.rst
@@ -151,29 +151,7 @@ More information about STM32P157C can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32mp157c_dk2 board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32mp157c_dk2/stm32mp157c_dk2_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -211,6 +189,9 @@ console settings are 115200 8N1.
 
 Programming and Debugging
 *************************
+
+.. zephyr:board-supported-runners::
+
 The STM32MP157C doesn't have QSPI flash for the Cortex®-M4  and it needs to be
 started by the Cortex®-A7 core. The Cortex®-A7 core is responsible to load the
 Cortex®-M4 binary application into the RAM, and get the Cortex®-M4 out of reset.
diff --git a/boards/st/stm32n6570_dk/Kconfig.defconfig b/boards/st/stm32n6570_dk/Kconfig.defconfig
new file mode 100644
index 0000000000000..0196c3c0b854a
--- /dev/null
+++ b/boards/st/stm32n6570_dk/Kconfig.defconfig
@@ -0,0 +1,15 @@
+# STM32N6570 DISCOVERY board configuration
+
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_STM32N6570_DK
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+endif # NETWORKING
+
+endif # BOARD_STM32N6570_DK
diff --git a/boards/st/stm32n6570_dk/arduino_r3_connector.dtsi b/boards/st/stm32n6570_dk/arduino_r3_connector.dtsi
new file mode 100644
index 0000000000000..b3309965278e5
--- /dev/null
+++ b/boards/st/stm32n6570_dk/arduino_r3_connector.dtsi
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	arduino_header: connector {
+		compatible = "arduino-header-r3";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpioa 5 0>,	/* A0 */
+			   <1 0 &gpioa 9 0>,	/* A1 */
+			   <2 0 &gpioa 10 0>,	/* A2 */
+			   <3 0 &gpioa 12 0>,	/* A3 */
+			   <4 0 &gpiof 3 0>,	/* A4 */
+			   <5 0 &gpiob 10 0>,	/* A5 */
+			   <6 0 &gpiof 6 0>,	/* D0 */
+			   <7 0 &gpiod 5 0>,	/* D1 */
+			   <8 0 &gpiod 0 0>,	/* D2 */
+			   <9 0 &gpioe 9 0>,	/* D3 */
+			   <10 0 &gpioh 5 0>,	/* D4 */
+			   <11 0 &gpioe 10 0>,	/* D5 */
+			   <12 0 &gpioe 13 0>,	/* D6 */
+			   <13 0 &gpiod 6 0>,	/* D7 */
+			   <14 0 &gpioe 7 0>,	/* D8 */
+			   <15 0 &gpioe 14 0>,	/* D9 */
+			   <16 0 &gpioa 3 0>,	/* D10 */
+			   <17 0 &gpiog 2 0>,	/* D11 */
+			   <18 0 &gpioh 8 0>,	/* D12 */
+			   <19 0 &gpioe 15 0>,	/* D13 */
+			   <20 0 &gpioc 1 0>,	/* D14 */
+			   <21 0 &gpioh 9 0>;	/* D15 */
+	};
+};
+
+arduino_serial: &usart2 {};
+arduino_i2c: &i2c1 {};
+arduino_spi: &spi5 {};
diff --git a/boards/st/stm32n6570_dk/doc/index.rst b/boards/st/stm32n6570_dk/doc/index.rst
index 95f2d42f79023..dd66f90d77f46 100644
--- a/boards/st/stm32n6570_dk/doc/index.rst
+++ b/boards/st/stm32n6570_dk/doc/index.rst
@@ -64,29 +64,37 @@ For more details, please refer to:
 Supported Features
 ==================
 
-The Zephyr ``stm32n6570_dk`` board supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| DMA       | on-chip    | Direct Memory Access Controller     |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32n6570_dk/stm32n6570_dk_defconfig`
-
+.. zephyr:board-supported-hw::
+
+USB
+===
+
+The USB pin assignments on the STM32N657XX microcontroller are immutable. This means that the specific
+pins designated for USB functionality are fixed and cannot be changed or reassigned to other functions,
+ensuring consistent and reliable USB communication.
+
+USB PIN (IOs)
+=============
+
++------------------+--------------------------------------+
+| Name             | Description                          |
++==================+======================================+
+| OTG1_HSDM        | USB OTG1 High-Speed Data- (negative) |
++------------------+--------------------------------------+
+| OTG1_HSDP        | USB OTG1 High-Speed Data+ (positive) |
++------------------+--------------------------------------+
+| OTG1_ID          | USB OTG1 ID Pin                      |
++------------------+--------------------------------------+
+| OTG1_TXRTUNE     | USB OTG1 Transmit Retune             |
++------------------+--------------------------------------+
+| OTG2_HSDM        | USB OTG2 High-Speed Data- (negative) |
++------------------+--------------------------------------+
+| OTG2_HSDP        | USB OTG2 High-Speed Data+ (positive) |
++------------------+--------------------------------------+
+| OTG2_ID          | USB OTG2 ID Pin                      |
++------------------+--------------------------------------+
+| OTG2_TXRTUNE     | USB OTG2 Transmit Retune             |
++------------------+--------------------------------------+
 
 Connections and IOs
 ===================
@@ -99,10 +107,61 @@ For more details please refer to `STM32N6570_DK User Manual`_.
 Default Zephyr Peripheral Mapping:
 ----------------------------------
 
+- ADC1_INP10 : PA9
+- ADC1_INP11 : PA10
+- FDCAN1_TX : PH2
+- FDCAN1_RX : PD0
+- I2C1_SCL : PH9
+- I2C1_SDA : PC1
+- I2C4_SCL : PE13
+- I2C4_SDA : PE14
 - LD1 : PO1
 - LD2 : PG10
+- SDMMC2_CK : PC2
+- SDMMC2_CMD : PC3
+- SDMMC2_D0 : PC4
+- SDMMC2_D1 : PC5
+- SDMMC2_D2 : PC0
+- SDMMC2_D3 : PE4
+- SPI5_SCK : PE15
+- SPI5_MOSI : PG2
+- SPI5_MISO : PH8
+- SPI5_NSS : PA3
 - USART_1_TX : PE5
 - USART_1_RX : PE6
+- USART_2_TX : PD5
+- USART_2_RX : PF6
+- XSPI1_NCS1 : PO0
+- XSPI1_DQS0 : PO2
+- XSPI1_DQS1 : PO3
+- XSPI1_CLK : PO4
+- XSPI1_IO0 : PP0
+- XSPI1_IO1 : PP1
+- XSPI1_IO2 : PP2
+- XSPI1_IO3 : PP3
+- XSPI1_IO4 : PP4
+- XSPI1_IO5 : PP5
+- XSPI1_IO6 : PP6
+- XSPI1_IO7 : PP7
+- XSPI1_IO8 : PP8
+- XSPI1_IO9 : PP9
+- XSPI1_IO10 : PP10
+- XSPI1_IO11 : PP11
+- XSPI1_IO12 : PP12
+- XSPI1_IO13 : PP13
+- XSPI1_IO14 : PP14
+- XSPI1_IO15 : PP15
+- XSPI2_NCS1 : PN1
+- XSPI2_DQS0 : PN0
+- XSPI2_CLK : PN6
+- XSPI2_IO0 : PN2
+- XSPI2_IO1 : PN3
+- XSPI2_IO2 : PN4
+- XSPI2_IO3 : PN5
+- XSPI2_IO4 : PN8
+- XSPI2_IO5 : PN9
+- XSPI2_IO6 : PN10
+- XSPI2_IO7 : PN11
 
 System Clock
 ------------
@@ -120,6 +179,8 @@ USART1. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32N6570_DK board includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash and debug the board using various tools.
 
@@ -131,6 +192,13 @@ The board is configured to be programmed using west `STM32CubeProgrammer`_ runne
 so its :ref:`installation <stm32cubeprog-flash-host-tools>` is needed.
 Version 2.18.0 or later of `STM32CubeProgrammer`_ is required.
 
+.. note::
+   Firmware is run in secure mode of execution, which requires a signature.
+   After build, the build system  will automatically generate a signed version of the
+   binary using `STM32CubeProgrammer`_ utility ``STM32_SigningTool_CLI``.
+   This utility is installed along with `STM32CubeProgrammer`_, but make sure it is
+   available in your ``PATH`` variable.
+
 To program the board, there are two options:
 
 - Program the firmware in external flash. At boot, it will then be loaded on RAM
@@ -169,12 +237,6 @@ First, connect the STM32N6570_DK to your host computer using the ST-Link USB por
 
 	    Power off and on the board again.
 
-         Run a serial host program to connect to your board:
-
-         .. code-block:: console
-
-            $ minicom -D /dev/ttyACM0
-
       .. group-tab:: Serial Boot Loader (USB)
 
          Additionally, connect the STM32N6570_DK to your host computer using the USB port.
diff --git a/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi b/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi
index ba29343eda0ab..1e4f59dcfda54 100644
--- a/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi
+++ b/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi
@@ -6,19 +6,30 @@
 
 #include <st/n6/stm32n657X0.dtsi>
 #include <st/n6/stm32n657x0hxq-pinctrl.dtsi>
+#include <zephyr/dt-bindings/flash_controller/xspi.h>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
+#include "arduino_r3_connector.dtsi"
 
 / {
 	chosen {
 		zephyr,console = &usart1;
 		zephyr,shell-uart = &usart1;
 		zephyr,sram = &axisram2;
+		zephyr,canbus = &fdcan1;
+		spi-flash0 = &mx66uw1g45g;
 	};
 
 	aliases {
 		led0 = &green_led_1;
 	};
 
+	psram: memory@90000000 {
+		compatible = "zephyr,memory-region";
+		reg = <0x90000000 DT_SIZE_M(32)>;
+		zephyr,memory-region = "PSRAM";
+		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM) )>;
+	};
+
 	leds: leds {
 		compatible = "gpio-leds";
 
@@ -34,6 +45,12 @@
 	};
 };
 
+&clk_hse {
+	hse-div2;
+	clock-frequency = <DT_FREQ_M(48)>;
+	status = "okay";
+};
+
 &clk_hsi {
 	hsi-div = <1>;
 	status = "okay";
@@ -48,6 +65,15 @@
 	status = "okay";
 };
 
+&pll2 {
+	clocks = <&clk_hsi>;
+	div-m = <4>;
+	mul-n = <24>;
+	div-p1 = <2>;
+	div-p2 = <2>;
+	status = "okay";
+};
+
 &ic1 {
 	pll-src = <1>;
 	ic-div = <2>;
@@ -60,6 +86,12 @@
 	status = "okay";
 };
 
+&ic4 {
+	pll-src = <2>;
+	ic-div = <2>;
+	status = "okay";
+};
+
 &ic6 {
 	pll-src = <1>;
 	ic-div = <2>;
@@ -94,6 +126,62 @@
 	apb5-prescaler = <1>;
 };
 
+&adc1 {
+	clocks = <&rcc STM32_CLOCK(AHB1, 5)>,
+		 <&rcc STM32_SRC_CKPER ADC12_SEL(1)>;
+	pinctrl-0 = <&adc1_inp10_pa9 &adc1_inp11_pa10>; /* Arduino A1 & A2 */
+	pinctrl-names = "default";
+	vref-mv = <1800>;
+	status = "okay";
+};
+
+&fdcan1 {
+	clocks = <&rcc STM32_CLOCK(APB1_2, 8)>,
+		 <&rcc STM32_SRC_CKPER FDCAN_SEL(1)>;
+	pinctrl-0 = <&fdcan1_rx_pd0 &fdcan1_tx_ph2>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&i2c1 {
+	clocks = <&rcc STM32_CLOCK(APB1, 21)>,
+		 <&rcc STM32_SRC_CKPER I2C1_SEL(1)>;
+	pinctrl-0 = <&i2c1_scl_ph9 &i2c1_sda_pc1>;
+	pinctrl-names = "default";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	status = "okay";
+};
+
+&i2c4 {
+	clocks = <&rcc STM32_CLOCK(APB4, 7)>,
+		 <&rcc STM32_SRC_CKPER I2C4_SEL(1)>;
+	pinctrl-0 = <&i2c4_scl_pe13 &i2c4_sda_pe14>;
+	pinctrl-names = "default";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	status = "okay";
+};
+
+&sdmmc2 {
+	status = "okay";
+	clocks = <&rcc STM32_CLOCK(AHB5, 7)>,
+		 <&rcc STM32_SRC_IC4 SDMMC2_SEL(2)>;
+	pinctrl-0 = <&sdmmc2_d0_pc4 &sdmmc2_d1_pc5
+			&sdmmc2_d2_pc0 &sdmmc2_d3_pe4
+			&sdmmc2_ck_pc2 &sdmmc2_cmd_pc3>;
+	pinctrl-names = "default";
+	bus-width = <4>;
+	cd-gpios = <&gpion 8 GPIO_ACTIVE_HIGH>;
+	pwr-gpios = <&gpioq 7 GPIO_ACTIVE_HIGH>;
+};
+
+&spi5 {
+	clocks = <&rcc STM32_CLOCK(APB2, 20)>,
+		 <&rcc STM32_SRC_CKPER SPI5_SEL(1)>;
+	pinctrl-0 = <&spi5_nss_pa3 &spi5_sck_pe15 &spi5_miso_ph8 &spi5_mosi_pg2>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
 &usart1 {
 	clocks = <&rcc STM32_CLOCK(APB2, 4)>,
 		 <&rcc STM32_SRC_CKPER USART1_SEL(1)>;
@@ -102,3 +190,102 @@
 	current-speed = <115200>;
 	status = "okay";
 };
+
+&usart2 {
+	clocks = <&rcc STM32_CLOCK(APB1, 17)>,
+		 <&rcc STM32_SRC_CKPER USART2_SEL(1)>;
+	pinctrl-0 = <&usart2_tx_pd5 &usart2_rx_pf6>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+zephyr_udc0: &usbotg_hs1 {
+	status = "okay";
+};
+
+&xspi1 {
+	pinctrl-0 = <&xspim_p1_ncs1_po0 &xspim_p1_dqs0_po2
+		     &xspim_p1_dqs1_po3 &xspim_p1_clk_po4
+		     &xspim_p1_io0_pp0 &xspim_p1_io1_pp1 &xspim_p1_io2_pp2
+		     &xspim_p1_io3_pp3 &xspim_p1_io4_pp4 &xspim_p1_io5_pp5
+		     &xspim_p1_io6_pp6 &xspim_p1_io7_pp7 &xspim_p1_io8_pp8
+		     &xspim_p1_io9_pp9 &xspim_p1_io10_pp10 &xspim_p1_io11_pp11
+		     &xspim_p1_io12_pp12 &xspim_p1_io13_pp13 &xspim_p1_io14_pp14
+		     &xspim_p1_io15_pp15>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	memc: aps256xxn_obr: memory@90000000 {
+		compatible = "st,stm32-xspi-psram";
+		reg = <0x90000000 DT_SIZE_M(32)>; /* 256 Mbits */
+		fixed-latency;
+		io-x16-mode;
+		read-latency = <4>;
+		write-latency = <1>;
+		burst-length = <0>;
+		status = "okay";
+	};
+};
+
+&xspi2 {
+	pinctrl-0 = <&xspim_p2_ncs1_pn1 &xspim_p2_dqs0_pn0 &xspim_p2_clk_pn6
+		     &xspim_p2_io0_pn2 &xspim_p2_io1_pn3 &xspim_p2_io2_pn4
+		     &xspim_p2_io3_pn5 &xspim_p2_io4_pn8 &xspim_p2_io5_pn9
+		     &xspim_p2_io6_pn10 &xspim_p2_io7_pn11>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	mx66uw1g45g: ospi-nor-flash@70000000 {
+		compatible = "st,stm32-xspi-nor";
+		reg = <0x70000000 DT_SIZE_M(128)>; /* 1 Gbits */
+		ospi-max-frequency = <DT_FREQ_M(200)>;
+		spi-bus-width = <XSPI_OCTO_MODE>;
+		data-rate = <XSPI_DTR_TRANSFER>;
+		four-byte-opcodes;
+		status = "okay";
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			storage_partition: partition@7ff0000 {
+				label = "storage";
+				reg = <0x7ff0000 DT_SIZE_K(64)>;
+			};
+		};
+	};
+};
+
+&mac {
+	status = "okay";
+	pinctrl-0 = <&eth1_rgmii_gtx_clk_pf0
+		     &eth1_rgmii_clk125_pf2
+		     &eth1_rgmii_rx_clk_pf7
+		     &eth1_rgmii_rxd2_pf8
+		     &eth1_rgmii_rxd3_pf9
+		     &eth1_rgmii_rx_ctl_pf10
+		     &eth1_rgmii_tx_ctl_pf11
+		     &eth1_rgmii_txd1_pf13
+		     &eth1_rgmii_txd0_pf12
+		     &eth1_rgmii_rxd0_pf14
+		     &eth1_rgmii_rxd1_pf15
+		     &eth1_rgmii_txd2_pg3
+		     &eth1_rgmii_txd3_pg4
+		     &eth1_phy_intn_pd3>;
+	pinctrl-names = "default";
+	phy-connection-type = "rgmii";
+	phy-handle = <&eth_phy>;
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&eth1_mdio_pd12 &eth1_mdc_pd1>;
+	pinctrl-names = "default";
+
+	eth_phy: ethernet-phy@0 {
+		compatible = "ethernet-phy";
+		reg = <0x0>;
+	};
+};
diff --git a/boards/st/stm32n6570_dk/twister.yaml b/boards/st/stm32n6570_dk/twister.yaml
index 5feec454af057..27d6d2d79759d 100644
--- a/boards/st/stm32n6570_dk/twister.yaml
+++ b/boards/st/stm32n6570_dk/twister.yaml
@@ -5,9 +5,19 @@ ram: 1024
 flash: 1024
 vendor: st
 supported:
+  - arduino_i2c
+  - arduino_serial
+  - arduino_spi
+  - adc
+  - can
   - dma
+  - i2c
   - gpio
+  - memc
+  - spi
   - uart
+  - usb_device
+  - usbd
 variants:
   stm32n6570_dk/stm32n657xx:
     twister: false
diff --git a/boards/st/stm32u083c_dk/doc/index.rst b/boards/st/stm32u083c_dk/doc/index.rst
index 81ddcf92a1f2a..433ba53bf3168 100644
--- a/boards/st/stm32u083c_dk/doc/index.rst
+++ b/boards/st/stm32u083c_dk/doc/index.rst
@@ -144,34 +144,7 @@ More information about STM32U083MC can be found here:
 Supported Features
 ==================
 
-The Zephyr stm32u083c_dk board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| DAC       | on-chip    | DAC Controller                      |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32u083c_dk/stm32u083c_dk_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -214,6 +187,8 @@ USART2. Default settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32U083C_DK board includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash the board using various tools.
 
diff --git a/boards/st/stm32u083c_dk/stm32u083c_dk.dts b/boards/st/stm32u083c_dk/stm32u083c_dk.dts
index 4f340422d5152..c5cbfb93a2e07 100644
--- a/boards/st/stm32u083c_dk/stm32u083c_dk.dts
+++ b/boards/st/stm32u083c_dk/stm32u083c_dk.dts
@@ -9,6 +9,7 @@
 #include <st/u0/stm32u083mctx-pinctrl.dtsi>
 #include "arduino_r3_connector.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/input/stm32-tsc-defines.h>
 
 / {
 	model = "STMicroelectronics STM32U83C-DK board";
@@ -124,3 +125,38 @@
 		status = "okay";
 	};
 };
+
+&tsc {
+	status = "okay";
+	pinctrl-0 = <&tsc_g1_io1_pb12 &tsc_g1_io2_pb13 &tsc_g6_io1_pd10 &tsc_g6_io2_pd11>;
+	pinctrl-names = "default";
+
+	st,pulse-generator-prescaler = <2>;
+	st,charge-transfer-pulse-high = <2>;
+	st,charge-transfer-pulse-low = <2>;
+	st,spread-spectrum;
+	st,spread-spectrum-prescaler = <2>;
+	st,spread-spectrum-deviation = <100>;
+	st,max-count-value = <8191>;
+
+	tsc_group1: g1 {
+		group = <1>;
+		st,use-as-shield;
+		channel-ios = <TSC_IO2>;
+		sampling-io = <TSC_IO1>;
+	};
+
+	tsc_group6: g6 {
+		group = <6>;
+		channel-ios = <TSC_IO2>;
+		sampling-io = <TSC_IO1>;
+		ts1 {
+			compatible = "tsc-keys";
+			sampling-interval-ms = <10>;
+			oversampling = <10>;
+			noise-threshold = <50>;
+			sticky-key-timeout-ms = <10000>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+};
diff --git a/boards/st/stm32u083c_dk/stm32u083c_dk.yaml b/boards/st/stm32u083c_dk/stm32u083c_dk.yaml
index 5d1b0f4f6b100..e6add7e72aaf6 100644
--- a/boards/st/stm32u083c_dk/stm32u083c_dk.yaml
+++ b/boards/st/stm32u083c_dk/stm32u083c_dk.yaml
@@ -15,5 +15,6 @@ supported:
   - i2c
   - pwm
   - usart
+  - tsc
 ram: 40
 flash: 256
diff --git a/boards/st/stm32u5a9j_dk/doc/index.rst b/boards/st/stm32u5a9j_dk/doc/index.rst
index 0851459c26804..0f4874d425bbc 100644
--- a/boards/st/stm32u5a9j_dk/doc/index.rst
+++ b/boards/st/stm32u5a9j_dk/doc/index.rst
@@ -47,48 +47,7 @@ More information about STM32U5A9NJH6Q can be found here:
 Supported Features
 ==================
 
-The current Zephyr stm32u5a9j_dk board configuration supports the following
-hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| LPUART    | on-chip    | low power uart                      |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | independent watchdog                |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| TIMER     | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration per core can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32u5a9j_dk/stm32u5a9j_dk_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -133,6 +92,8 @@ ST-LINK/V3.0. Virtual COM port interface. Default communication settings are
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32U5A9J Discovery kit includes an ST-LINK/V3 embedded debug tool interface.
 This probe allows to flash and debug the board using various tools.
 
diff --git a/boards/st/stm32vl_disco/doc/index.rst b/boards/st/stm32vl_disco/doc/index.rst
index a2bb8c8baec4b..386e6d38427a0 100644
--- a/boards/st/stm32vl_disco/doc/index.rst
+++ b/boards/st/stm32vl_disco/doc/index.rst
@@ -35,50 +35,7 @@ More information about the STM32F100x can be found in the
 Supported Features
 ==================
 
-The Zephyr stm32vl_disco board configuration supports the following hardware features:
-
-.. list-table:: Supported hardware
-   :header-rows: 1
-
-   * - Interface
-     - Controller
-     - Driver/component
-   * - NVIC
-     - on-chip
-     - nested vector interrupt controller
-   * - UART
-     - on-chip
-     - serial port-polling
-       serial port-interrupt
-   * - PINMUX
-     - on-chip
-     - pinmux
-   * - GPIO
-     - on-chip
-     - gpio
-   * - CLOCK
-     - on-chip
-     - reset and clock control
-   * - FLASH
-     - on-chip
-     - flash memory
-   * - WATCHDOG
-     - on-chip
-     - window watchdog
-   * - I2C
-     - on-chip
-     - i2c
-   * - SPI
-     - on-chip
-     - spi
-   * - ADC
-     - on-chip
-     - adc
-
-Other hardware features are not yet supported in this Zephyr port.
-
-The default configuration can be found in
-:zephyr_file:`boards/st/stm32vl_disco/stm32vl_disco_defconfig`
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -117,6 +74,8 @@ For more details please refer to `STM32VLDISCOVERY board User Manual`_.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``stm32vl_disco`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/st/stm32wb5mm_dk/doc/stm32wb5mm_dk.rst b/boards/st/stm32wb5mm_dk/doc/stm32wb5mm_dk.rst
index 3a7bae73f13a4..94f8e5f3663ad 100644
--- a/boards/st/stm32wb5mm_dk/doc/stm32wb5mm_dk.rst
+++ b/boards/st/stm32wb5mm_dk/doc/stm32wb5mm_dk.rst
@@ -98,7 +98,7 @@ enable extended battery life, small coin-cell batteries, and energy harvesting.
     trimmed RC (±1%)
   - 2x PLL for system clock, USB, SAI, ADC
 
-More information about STM32WB55RG can be found here:
+More information about STM32WB5MMG can be found here:
 
 - `STM32WB5MM-DK on www.st.com`_
 - `STM32WB5MMG datasheet`_
@@ -106,22 +106,7 @@ More information about STM32WB55RG can be found here:
 Supported Features
 ==================
 
-The Zephyr STM32WB5MM-DK board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32wb5mm_dk/stm32wb5mm_dk_defconfig`
+.. zephyr:board-supported-hw::
 
 Bluetooth and compatibility with STM32WB Copro Wireless Binaries
 ================================================================
@@ -132,8 +117,7 @@ These binaries are delivered in STM32WB Cube packages, under
 ``Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/``.
 
 For compatibility information with the various versions of these binaries,
-please check `modules/hal/stm32/lib/stm32wb/hci/README`_
-in the ``hal_stm32`` repo.
+please check :module_file:`hal_stm32:lib/stm32wb/README.rst`.
 
 Note that since STM32WB Cube package V1.13.2, "full stack" binaries are not
 compatible anymore for a use in Zephyr and only "HCI Only" versions should be
@@ -182,6 +166,8 @@ and the second to PC13. They have the aliases sw0 and sw1 respectively.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 STM32WB5MM-DK has an on-board ST-Link to flash and debug the firmware on the module.
 
 Applications for the ``stm32wb5mm_dk`` board configuration can be built the
@@ -245,9 +231,6 @@ You can debug an application in the usual way.  Here is an example for the
 .. _STM32WB5MMG datasheet:
    https://www.st.com/resource/en/datasheet/stm32wb5mmg.pdf
 
-.. _modules/hal/stm32/lib/stm32wb/hci/README:
-   https://github.com/zephyrproject-rtos/hal_stm32/blob/main/lib/stm32wb/hci/README
-
 .. _Hello_World:
    https://docs.zephyrproject.org/latest/samples/hello_world/README.html
 
diff --git a/boards/st/stm32wb5mmg/doc/stm32wb5mmg.rst b/boards/st/stm32wb5mmg/doc/stm32wb5mmg.rst
index f4f2a34cdd18b..b9718b73ca8c1 100644
--- a/boards/st/stm32wb5mmg/doc/stm32wb5mmg.rst
+++ b/boards/st/stm32wb5mmg/doc/stm32wb5mmg.rst
@@ -149,7 +149,7 @@ cut 2.2.
    and Bluetooth|reg| Low Energy
  - 48-bit EUI
 
-More information about STM32WB55RG can be found here:
+More information about STM32WB5MMG can be found here:
 
 - `STM32WB5MMG on www.st.com`_
 - `STM32WB5MMG datasheet`_
@@ -157,22 +157,7 @@ More information about STM32WB55RG can be found here:
 Supported Features
 ==================
 
-The Zephyr STM32WB5MMG board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| RADIO     | on-chip    | Bluetooth Low Energy                |
-+-----------+------------+-------------------------------------+
-
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/st/stm32wb5mmg/stm32wb5mmg_defconfig`
+.. zephyr:board-supported-hw::
 
 Bluetooth and compatibility with STM32WB Copro Wireless Binaries
 ================================================================
@@ -180,10 +165,11 @@ Bluetooth and compatibility with STM32WB Copro Wireless Binaries
 To operate bluetooth on STM32WB5MMG, Cortex-M0 core should be flashed with
 a valid STM32WB Coprocessor binaries (either 'Full stack' or 'HCI Layer').
 These binaries are delivered in STM32WB Cube packages, under
-Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/
+``Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/``
+
 For compatibility information with the various versions of these binaries,
-please check `modules/hal/stm32/lib/stm32wb/hci/README`_
-in the hal_stm32 repo.
+please check :module_file:`hal_stm32:lib/stm32wb/README.rst`.
+
 Note that since STM32WB Cube package V1.13.2, "full stack" binaries are not compatible
 anymore for a use in Zephyr and only "HCI Only" versions should be used on the M0
 side.
@@ -221,6 +207,8 @@ Rather, users can use the available USB port (CN12) to run virtual com port
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``stm32wb5mmg`` board configuration can be built the
 usual way (see :ref:`build_an_application`).
 
@@ -303,8 +291,5 @@ You can debug an application in the usual way.  Here is an example for the
 .. _STM32WB5MMG datasheet:
    https://www.st.com/resource/en/datasheet/stm32wb5mmg.pdf
 
-.. _modules/hal/stm32/lib/stm32wb/hci/README:
-  https://github.com/zephyrproject-rtos/hal_stm32/blob/main/lib/stm32wb/hci/README
-
 .. _STM32CubeProgrammer:
    https://www.st.com/en/development-tools/stm32cubeprog.html
diff --git a/boards/starfive/visionfive2/doc/index.rst b/boards/starfive/visionfive2/doc/index.rst
index 24cebc6021c69..8c71e2bfb9419 100644
--- a/boards/starfive/visionfive2/doc/index.rst
+++ b/boards/starfive/visionfive2/doc/index.rst
@@ -9,6 +9,8 @@ multi-core 64bit RISC-V SoC.
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/tdk/robokit1/doc/index.rst b/boards/tdk/robokit1/doc/index.rst
index 4f674a188618a..4b588854c63bd 100644
--- a/boards/tdk/robokit1/doc/index.rst
+++ b/boards/tdk/robokit1/doc/index.rst
@@ -32,75 +32,7 @@ Hardware
 Supported Features
 ==================
 
-The TDK RoboKit1 board supports the following hardware
-features:
-
-.. list-table::
-   : header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO_SAM`
-     - :dtcompatible:`atmel,sam-gpio`
-   * - USART
-     - :kconfig:option:`CONFIG_USART_SAM`
-     - :dtcompatible:`atmel,sam-usart`
-   * - UART
-     - :kconfig:option:`CONFIG_UART_SAM`
-     - :dtcompatible:`atmel,sam-uart`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI_SAM`
-     - :dtcompatible:`atmel,sam-spi`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C_SAM_TWIHS`
-     - :dtcompatible:`atmel,sam-i2c-twihs`
-   * - I2S
-     - :kconfig:option:`CONFIG_I2S_SAM_SSC`
-     - :dtcompatible:`atmel,sam-ssc`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC_SAM_AFEC`
-     - :dtcompatible:`atmel,sam-afec`
-   * - DAC
-     - :kconfig:option:`CONFIG_DAC_SAM`
-     - :dtcompatible:`atmel,sam-dac`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM_SAM`
-     - :dtcompatible:`atmel,sam-pwm`
-   * - CAN
-     - :kconfig:option:`CONFIG_CAN_SAM`
-     - :dtcompatible:`atmel,sam-can`
-   * - USB
-     - :kconfig:option:`CONFIG_USB_DC_SAM_USBHS`
-     - :dtcompatible:`atmel,sam-usbhs`
-   * - WATCHDOG
-     - :kconfig:option:`CONFIG_WDT_SAM`
-     - :dtcompatible:`atmel,sam-watchdog`
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v7m-nvic`
-   * - SYSTICK
-     - N/A
-     - N/A
-   * - COUNTER
-     - :kconfig:option:`CONFIG_COUNTER_SAM_TC`
-     - :dtcompatible:`atmel,sam-tc`
-   * - DMA
-     - :kconfig:option:`CONFIG_DMA_SAM_XDMAC`
-     - :dtcompatible:`atmel,sam-xdmac`
-   * - ENTROPY
-     - :kconfig:option:`CONFIG_ENTROPY_SAM_RNG`
-     - :dtcompatible:`atmel,sam-trng`
-   * - HWINFO (reset cause)
-     - :kconfig:option:`CONFIG_HWINFO_SAM_RSTC`
-     - :dtcompatible:`atmel,sam-rstc`
-   * - HWINFO (device id)
-     - :kconfig:option:`CONFIG_HWINFO_SAM`
-     - N/A
-
-The default configuration can be found in the Kconfig
-:zephyr_file:`boards/tdk/robokit1/robokit1_defconfig`.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -122,6 +54,8 @@ configured for the console and is available as a Virtual COM Port via the USB2 c
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing the Zephyr project onto SAM E70 MCU requires the `OpenOCD tool`_.
 Both west flash and west debug commands should correctly work with both USB0 and USB1
 connected and the board powered.
diff --git a/boards/telink/tlsr9518adk80d/doc/index.rst b/boards/telink/tlsr9518adk80d/doc/index.rst
index 27a65a0429946..b67c40bcad3c2 100644
--- a/boards/telink/tlsr9518adk80d/doc/index.rst
+++ b/boards/telink/tlsr9518adk80d/doc/index.rst
@@ -38,45 +38,13 @@ The TLSR9518ADK80D default board configuration provides the following hardware c
 Supported Features
 ==================
 
-The Zephyr TLSR9518ADK80D board configuration supports the following hardware features:
-
-+----------------+------------+------------------------------+
-| Interface      | Controller | Driver/Component             |
-+================+============+==============================+
-| PLIC           | on-chip    | interrupt_controller         |
-+----------------+------------+------------------------------+
-| RISC-V Machine | on-chip    | timer                        |
-| Timer (32 KHz) |            |                              |
-+----------------+------------+------------------------------+
-| PINCTRL        | on-chip    | pinctrl                      |
-+----------------+------------+------------------------------+
-| GPIO           | on-chip    | gpio                         |
-+----------------+------------+------------------------------+
-| UART           | on-chip    | serial                       |
-+----------------+------------+------------------------------+
-| PWM            | on-chip    | pwm                          |
-+----------------+------------+------------------------------+
-| TRNG           | on-chip    | entropy                      |
-+----------------+------------+------------------------------+
-| FLASH (MSPI)   | on-chip    | flash                        |
-+----------------+------------+------------------------------+
-| RADIO          | on-chip    | Bluetooth,                   |
-|                |            | ieee802154, OpenThread       |
-+----------------+------------+------------------------------+
-| SPI (Master)   | on-chip    | spi                          |
-+----------------+------------+------------------------------+
-| I2C (Master)   | on-chip    | i2c                          |
-+----------------+------------+------------------------------+
-| ADC            | on-chip    | adc                          |
-+----------------+------------+------------------------------+
+.. zephyr:board-supported-hw::
 
 .. note::
    To support "button" example project PC3-KEY3 (J20-19, J20-20) jumper needs to be removed and KEY3 (J20-19) should be connected to VDD3_DCDC (J51-13) externally.
 
    For the rest example projects use the default jumpers configuration.
 
-Other hardware features and example projects are not supported yet.
-
 Limitations
 -----------
 
@@ -138,6 +106,8 @@ The default settings are 115200 8N1.
 Programming and debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Building
 ========
 
diff --git a/boards/ti/cc1352p1_launchxl/doc/index.rst b/boards/ti/cc1352p1_launchxl/doc/index.rst
index dc807f559424a..f83d42f4f42d6 100644
--- a/boards/ti/cc1352p1_launchxl/doc/index.rst
+++ b/boards/ti/cc1352p1_launchxl/doc/index.rst
@@ -26,32 +26,7 @@ See the `TI CC1352P Product Page`_ for additional details.
 Supported Features
 ==================
 
-The CC1352P LaunchPad board configuration supports the following hardware
-features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| HWINFO    | on-chip    | hwinfo               |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -122,6 +97,8 @@ aligns with the LaunchPad standard.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before flashing or debugging ensure the RESET, TMS, TCK, TDO, and TDI jumpers
 are in place. Also place jumpers on the TXD and RXD signals for a serial
 console using the XDS110 application serial port.
diff --git a/boards/ti/cc1352p7_launchpad/doc/index.rst b/boards/ti/cc1352p7_launchpad/doc/index.rst
index 6ad90f18e8679..346bcf6bc3d11 100644
--- a/boards/ti/cc1352p7_launchpad/doc/index.rst
+++ b/boards/ti/cc1352p7_launchpad/doc/index.rst
@@ -27,32 +27,7 @@ See the `TI CC1352P7 Product Page`_ for additional details.
 Supported Features
 ==================
 
-The CC1352P7 LaunchPad board configuration supports the following hardware
-features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| HWINFO    | on-chip    | hwinfo               |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -123,6 +98,8 @@ aligns with the LaunchPad standard.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before flashing or debugging ensure the RESET, TMS, TCK, TDO, and TDI jumpers
 are in place. Also place jumpers on the TXD and RXD signals for a serial
 console using the XDS110 application serial port.
diff --git a/boards/ti/cc1352r1_launchxl/doc/index.rst b/boards/ti/cc1352r1_launchxl/doc/index.rst
index a908e1ceccc02..7395792602136 100644
--- a/boards/ti/cc1352r1_launchxl/doc/index.rst
+++ b/boards/ti/cc1352r1_launchxl/doc/index.rst
@@ -24,34 +24,7 @@ See the `TI CC1352R Product Page`_ for additional details.
 Supported Features
 ==================
 
-The CC1352R LaunchPad board configuration supports the following hardware
-features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| AUX_ADC   | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| HWINFO    | on-chip    | hwinfo               |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -122,6 +95,8 @@ aligns with the LaunchPad standard.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before flashing or debugging ensure the RESET, TMS, TCK, TDO, and TDI jumpers
 are in place. Also place jumpers on the TXD and RXD signals for a serial
 console using the XDS110 application serial port.
diff --git a/boards/ti/cc1352r_sensortag/doc/index.rst b/boards/ti/cc1352r_sensortag/doc/index.rst
index f31c744b7b7b6..6cedd6e28612f 100644
--- a/boards/ti/cc1352r_sensortag/doc/index.rst
+++ b/boards/ti/cc1352r_sensortag/doc/index.rst
@@ -24,42 +24,7 @@ See the `TI CC1352R Product Page`_ for additional details.
 Supported Features
 ==================
 
-The CC1352R SensorTag board configuration supports the following hardware
-features:
-
-+-----------+------------+------------------+
-| Interface | Controller | Driver/Component |
-+===========+============+==================+
-| GPIO      | on-chip    | gpio             |
-+-----------+------------+------------------+
-| MPU       | on-chip    | arch/arm         |
-+-----------+------------+------------------+
-| NVIC      | on-chip    | arch/arm         |
-+-----------+------------+------------------+
-| PINMUX    | on-chip    | pinmux           |
-+-----------+------------+------------------+
-| UART      | on-chip    | serial           |
-+-----------+------------+------------------+
-| I2C       | on-chip    | i2c              |
-+-----------+------------+------------------+
-| SPI       | on-chip    | spi              |
-+-----------+------------+------------------+
-| AUX_ADC   | on-chip    | adc              |
-+-----------+------------+------------------+
-| DIO23     | off-chip   | DRV5032          |
-+-----------+------------+------------------+
-| I2C       | off-chip   | HDC2080          |
-+-----------+------------+------------------+
-| I2C       | off-chip   | OPT3001          |
-+-----------+------------+------------------+
-| SPI       | off-chip   | ADXL362          |
-+-----------+------------+------------------+
-| WDT       | on-chip    | watchdog         |
-+-----------+------------+------------------+
-| HWINFO    | on-chip    | hwinfo           |
-+-----------+------------+------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -130,6 +95,8 @@ aligns with the SensorTag standard.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 TI's supported method of programming and debugging the ``CC1352R SensorTag`` is
 to use it in tandem with a ``CC1352R LaunchPad``, making use of the integrated
 (XDS110) debugger and serial console over USB.
diff --git a/boards/ti/cc26x2r1_launchxl/doc/index.rst b/boards/ti/cc26x2r1_launchxl/doc/index.rst
index c08b2b9a933ca..037c55ab1d486 100644
--- a/boards/ti/cc26x2r1_launchxl/doc/index.rst
+++ b/boards/ti/cc26x2r1_launchxl/doc/index.rst
@@ -24,34 +24,7 @@ See the `TI CC2652R Product Page`_ for additional details.
 Supported Features
 ==================
 
-The CC26x2R LaunchPad board configuration supports the following hardware
-features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-| AUX_ADC   | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| HWINFO    | on-chip    | hwinfo               |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -128,6 +101,8 @@ aligns with the LaunchPad standard.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Before flashing or debugging ensure the RESET, TMS, TCK, TDO, and TDI jumpers
 are in place. Also place jumpers on the TXD and RXD signals for a serial
 console using the XDS110 application serial port.
diff --git a/boards/ti/cc3220sf_launchxl/doc/index.rst b/boards/ti/cc3220sf_launchxl/doc/index.rst
index 6ff33afb88b2c..ef5a3ec6647b2 100644
--- a/boards/ti/cc3220sf_launchxl/doc/index.rst
+++ b/boards/ti/cc3220sf_launchxl/doc/index.rst
@@ -44,20 +44,7 @@ Complete details of the CC3220SF SoC can be found in the `CC3220 TRM`_.
 Supported Features
 ==================
 
-Zephyr has been ported to the Applications MCU, with basic peripheral
-driver support.
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| UART      | on-chip    | serial port-interrupt |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | gpio                  |
-+-----------+------------+-----------------------+
-| I2C       | on-chip    | i2c                   |
-+-----------+------------+-----------------------+
-| SPI_0     | on-chip    | Wi-Fi host driver     |
-+-----------+------------+-----------------------+
+.. zephyr:board-supported-hw::
 
 .. note::
 
@@ -71,6 +58,8 @@ accessible through the BoosterPack, are not currently supported.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 TI officially supports development on the CC3220SF using the TI
 `CC3220 SDK`_ on Windows and Linux using TI tools: Code Composer
 Studio for debugging and `UniFlash`_ for flashing.
diff --git a/boards/ti/cc3235sf_launchxl/doc/index.rst b/boards/ti/cc3235sf_launchxl/doc/index.rst
index 7602a3b27125a..d72920bbd5545 100644
--- a/boards/ti/cc3235sf_launchxl/doc/index.rst
+++ b/boards/ti/cc3235sf_launchxl/doc/index.rst
@@ -47,17 +47,7 @@ Supported Features
 Zephyr has been ported to the Applications MCU, with basic peripheral
 driver support.
 
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| UART      | on-chip    | serial port-interrupt |
-+-----------+------------+-----------------------+
-| GPIO      | on-chip    | gpio                  |
-+-----------+------------+-----------------------+
-| I2C       | on-chip    | i2c                   |
-+-----------+------------+-----------------------+
-| SPI_0     | on-chip    | Wi-Fi host driver     |
-+-----------+------------+-----------------------+
+.. zephyr:board-supported-hw::
 
 .. note::
 
@@ -71,6 +61,8 @@ accessible through the BoosterPack, are not currently supported.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 TI officially supports development on the CC3235SF using the TI
 `CC32xx SDK`_ on Windows and Linux using TI tools: Code Composer
 Studio for debugging and `UniFlash`_ for flashing.
diff --git a/boards/ti/lp_em_cc2340r5/doc/index.rst b/boards/ti/lp_em_cc2340r5/doc/index.rst
index f6b2077db1bef..6878ac3d6aac1 100644
--- a/boards/ti/lp_em_cc2340r5/doc/index.rst
+++ b/boards/ti/lp_em_cc2340r5/doc/index.rst
@@ -24,25 +24,7 @@ See the `TI CC2340R5 Product Page`_ for additional details.
 Supported Features
 ==================
 
-The ``lp_em_cc2340r5`` board supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| PINMUX    | on-chip    | pinmux               |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| SYSTIM    | on-chip    | system timer         |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash memory         |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -99,6 +81,8 @@ aligns with the LaunchPad standard.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The LP_EM_CC2340R5 requires an external debug probe such as the LP-XDS110 or
 LP-XDS110ET.
 
diff --git a/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5-pinctrl.dtsi b/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5-pinctrl.dtsi
index 1d929cfa6acaa..eb19f89888f98 100644
--- a/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5-pinctrl.dtsi
+++ b/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5-pinctrl.dtsi
@@ -13,9 +13,32 @@
 		pinmux = <20 DIO20_UART0_TXD>;
 		bias-disable;
 	};
+
 	uart0_rx_default: uart0_rx_default {
 		pinmux = <22 DIO22_UART0_RXD>;
 		bias-disable;
 		input-enable;
 	};
+
+	/* SPI0 */
+	spi0_sck_default: spi0_sck_default {
+		pinmux = <18 DIO18_SPI0_SCLK>;
+		bias-disable;
+	};
+
+	spi0_mosi_default: spi0_mosi_default {
+		pinmux = <13 DIO13_SPI0_MOSI>;
+		bias-disable;
+	};
+
+	spi0_miso_default: spi0_miso_default {
+		pinmux = <12 DIO12_SPI0_MISO>;
+		bias-disable;
+		input-enable;
+	};
+
+	spi0_cs_default: spi0_cs_default {
+		pinmux = <11 DIO11_SPI0_CSN>;
+		bias-disable;
+	};
 };
diff --git a/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.dts b/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.dts
index 64d3e15020750..90288e5ba8f51 100644
--- a/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.dts
+++ b/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.dts
@@ -73,3 +73,20 @@
 	pinctrl-0 = <&uart0_rx_default &uart0_tx_default>;
 	pinctrl-names = "default";
 };
+
+&aes {
+	status = "okay";
+};
+
+&dma {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+	pinctrl-0 = <&spi0_sck_default
+		     &spi0_mosi_default
+		     &spi0_miso_default
+		     &spi0_cs_default>;
+	pinctrl-names = "default";
+};
diff --git a/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.yaml b/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.yaml
index 705f3cdef20a7..29cda9cc23990 100644
--- a/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.yaml
+++ b/boards/ti/lp_em_cc2340r5/lp_em_cc2340r5.yaml
@@ -7,7 +7,6 @@ flash: 512
 toolchain:
   - zephyr
   - gnuarmemb
-  - xtools
 supported:
   - gpio
   - uart
diff --git a/boards/ti/msp_exp432p401r_launchxl/doc/index.rst b/boards/ti/msp_exp432p401r_launchxl/doc/index.rst
index 7b0662d66221f..61598eb820183 100644
--- a/boards/ti/msp_exp432p401r_launchxl/doc/index.rst
+++ b/boards/ti/msp_exp432p401r_launchxl/doc/index.rst
@@ -24,30 +24,20 @@ MSP-EXP432P401R LaunchXL User's Guide.
 Supported Features
 ==================
 
+.. zephyr:board-supported-hw::
+
 * The on-board 32-kHz crystal allows for lower LPM3 sleep currents and a higher-precision clock source than the
   default internal 32-kHz REFOCLK. Therefore, the presence of the crystal allows the full range of low-power
   modes to be used.
 * The on-board 48-MHz crystal allows the device to run at its maximum operating speed for MCLK and HSMCLK.
 
-The MSP-EXP432P401R LaunchXL development board configuration supports the following hardware features:
-
-+-----------+------------+-----------------------+
-| Interface | Controller | Driver/Component      |
-+===========+============+=======================+
-| NVIC      | on-chip    | nested vectored       |
-|           |            | interrupt controller  |
-+-----------+------------+-----------------------+
-| SYSTICK   | on-chip    | system clock          |
-+-----------+------------+-----------------------+
-| UART      | on-chip    | serial port           |
-+-----------+------------+-----------------------+
-
-More details about the supported peripherals are available in MSP432P4XX TRM
-Other hardware features are not currently supported by the Zephyr kernel.
+More details about the supported peripherals are available in MSP432P4XX TRM.
 
 Building and Flashing
 *********************
 
+.. zephyr:board-supported-runners::
+
 Prerequisites:
 ==============
 
diff --git a/boards/ti/sk_am62/doc/index.rst b/boards/ti/sk_am62/doc/index.rst
index a56f4cc2c0d4c..248c16e66b69c 100644
--- a/boards/ti/sk_am62/doc/index.rst
+++ b/boards/ti/sk_am62/doc/index.rst
@@ -33,23 +33,7 @@ the M4F core and the following listed hardware specifications are used:
 Supported Features
 ==================
 
-The sk_am62 configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINCTRL   | on-chip    | pinctrl                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial                              |
-+-----------+------------+-------------------------------------+
-| Mailbox   | on-chip    | IPC Mailbox                         |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Devices
 ========
diff --git a/boards/ti/sk_am62/sk_am62_am6234_m4.dts b/boards/ti/sk_am62/sk_am62_am6234_m4.dts
index 0c3ea26e033e6..85688607d5d7a 100644
--- a/boards/ti/sk_am62/sk_am62_am6234_m4.dts
+++ b/boards/ti/sk_am62/sk_am62_am6234_m4.dts
@@ -16,7 +16,8 @@
 		zephyr,sram = &sram0;
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
-		zephyr,sram1 = &ddr0;
+		zephyr,ipc_shm = &ddr0;
+		zephyr,sram1 = &ddr1;
 	};
 
 	cpus {
@@ -26,9 +27,20 @@
 		};
 	};
 
-	ddr0:memory@9CC00000{
+	ddr0: memory@9cb00000 {
+		compatible = "mmio-sram";
+		reg = <0x9cb00000 DT_SIZE_M(1)>;
+	};
+
+	rsc_table: memory@9cc00000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x9cc00000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RSC_TABLE";
+	};
+
+	ddr1: memory@9cc01000 {
 		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x9CC00000 DT_SIZE_K(4)>;
+		reg = <0x9cc01000 (DT_SIZE_M(15) - DT_SIZE_K(4))>;
 		zephyr,memory-region = "DDR";
 	};
 };
diff --git a/boards/ti/sk_am64/Kconfig.sk_am64 b/boards/ti/sk_am64/Kconfig.sk_am64
new file mode 100644
index 0000000000000..5def92ea56941
--- /dev/null
+++ b/boards/ti/sk_am64/Kconfig.sk_am64
@@ -0,0 +1,8 @@
+# Texas Instruments SK-AM64
+#
+# Copyright (c) 2025 Texas Instruments Incorporated
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_SK_AM64
+	select SOC_AM6442_M4 if BOARD_SK_AM64_AM6442_M4
diff --git a/boards/ti/sk_am64/board.yml b/boards/ti/sk_am64/board.yml
new file mode 100644
index 0000000000000..1e6242f45cbb2
--- /dev/null
+++ b/boards/ti/sk_am64/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: sk_am64
+  full_name: SK-AM64
+  vendor: ti
+  socs:
+  - name: am6442
diff --git a/boards/ti/sk_am64/doc/assets/sk_am64.webp b/boards/ti/sk_am64/doc/assets/sk_am64.webp
new file mode 100644
index 0000000000000..ef86e8dab0d57
Binary files /dev/null and b/boards/ti/sk_am64/doc/assets/sk_am64.webp differ
diff --git a/boards/ti/sk_am64/doc/index.rst b/boards/ti/sk_am64/doc/index.rst
new file mode 100644
index 0000000000000..fa87ea3590c62
--- /dev/null
+++ b/boards/ti/sk_am64/doc/index.rst
@@ -0,0 +1,120 @@
+.. zephyr:board:: sk_am64
+
+Overview
+********
+
+The SK-AM64 board configuration is used by Zephyr applications that run on
+the TI AM64x platform. The board configuration provides support for the ARM
+Cortex-M4F MCU core and the following features:
+
+- Nested Vector Interrupt Controller (NVIC)
+- System Tick System Clock (SYSTICK)
+
+The board configuration also enables support for the semihosting debugging console.
+
+See the `TI AM64 Product Page`_ for details.
+
+Hardware
+********
+The SK-AM64 EVM features the AM64 SoC, which is composed of a dual Cortex-A53
+cluster and a single Cortex-M4 core in the MCU domain. Zephyr is ported to run on
+the M4F core and the following listed hardware specifications are used:
+
+- Low-power ARM Cortex-M4F
+- Memory
+
+   - 256KB of SRAM
+   - 2GB of DDR4
+
+- Debug
+
+   - XDS110 based JTAG
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Devices
+========
+System Clock
+------------
+
+This board configuration uses a system clock frequency of 400 MHz.
+
+DDR RAM
+-------
+
+The board has 2GB of DDR RAM available. This board configuration
+allocates Zephyr 4kB of RAM (only for resource table: 0xa4100000 to 0xa4100400).
+
+Serial Port
+-----------
+
+This board configuration uses a single serial communication channel with the
+MCU domain UART (MCU_UART0).
+
+GPIO
+----
+
+The SK-AM64 has a heartbeat LED connected to MCU_GPIO0_6. It's configured
+to build and run the :zephyr:code-sample:`blinky` sample.
+
+SD Card
+*******
+
+Download TI's official `WIC`_ and flash the WIC file with an etching software
+onto an SD card. This will boot Linux on the A53 application cores of the EVM.
+These cores will then load the zephyr binary on the M4 core using remoteproc.
+
+The default configuration can be found in
+:zephyr_file:`boards/ti/sk_am64/sk_am64_am6442_m4_defconfig`
+
+Flashing
+********
+
+The board can using remoteproc, and uses the OpenAMP resource table to accomplish this.
+
+The testing requires the binary to be copied to the SD card to allow the A53 cores to load it while booting using remoteproc.
+
+To test the M4F core, we build the :zephyr:code-sample:`hello_world` sample with the following command.
+
+.. code-block:: console
+
+   # From the root of the Zephyr repository
+   west build -p -b sk_am64/am6442/m4 samples/hello_world
+
+This builds the program and the binary is present in the :file:`build/zephyr` directory as
+:file:`zephyr.elf`.
+
+We now copy this binary onto the SD card in the :file:`/lib/firmware` directory and name it as
+:file:`am64-mcu-m4f0_0-fw`.
+
+.. code-block:: console
+
+   # Mount the SD card at sdcard for example
+   sudo mount /dev/sdX sdcard
+   # copy the elf to the /lib/firmware directory
+   sudo cp --remove-destination zephyr.elf sdcard/lib/firmware/am64-mcu-m4f0_0-fw
+
+The SD card can now be used for booting. The binary will now be loaded onto the M4F core on boot.
+
+To allow the board to boot using the SD card, set the boot pins to the SD Card boot mode. Refer to `SK-AM64B EVM User's Guide`_.
+
+After changing the boot mode, the board should go through the boot sequence on powering up.
+The binary will run and print Hello world to the MCU_UART0 port.
+
+References
+**********
+
+.. _TI AM64 Product Page:
+   https://www.ti.com/product/AM6442
+
+.. _WIC:
+   https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-yXgchBCk98/10.01.10.04/tisdk-default-image-am64xx-evm-10.01.10.04.rootfs.wic.xz
+
+.. _SK-AM64B EVM User's Guide:
+   https://www.ti.com/lit/ug/spruj64/spruj64.pdf
+
+.. _build OpenOCD from source:
+   https://docs.u-boot.org/en/latest/board/ti/k3.html#building-openocd-from-source
diff --git a/boards/ti/sk_am64/sk_am64_am6442_m4-pinctrl.dtsi b/boards/ti/sk_am64/sk_am64_am6442_m4-pinctrl.dtsi
new file mode 100644
index 0000000000000..034c627336e77
--- /dev/null
+++ b/boards/ti/sk_am64/sk_am64_am6442_m4-pinctrl.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Texas Instruments Incorporated
+ *	Andrew Davis <afd@ti.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/ti-k3-pinctrl.h>
+
+&pinctrl {
+	mcu_uart0_rx_default: mcu_uart0_rx_default {
+		pinmux = <K3_PINMUX(0x028, PIN_INPUT, MUX_MODE_0)>; /* (A9) MCU_UART0_RXD */
+	};
+
+	mcu_uart0_tx_default: mcu_uart0_tx_default {
+		pinmux = <K3_PINMUX(0x002C, PIN_OUTPUT, MUX_MODE_0)>; /* (A8) MCU_UART0_TXD */
+	};
+
+	mcu_gpio0_led_default: mcu_gpio0_led_default {
+		pinmux = <K3_PINMUX(0x0014, PIN_INPUT, MUX_MODE_7)>; /* (A7) MCU_GPIO0_5 */
+	};
+};
diff --git a/boards/ti/sk_am64/sk_am64_am6442_m4.dts b/boards/ti/sk_am64/sk_am64_am6442_m4.dts
new file mode 100644
index 0000000000000..93073c26e737e
--- /dev/null
+++ b/boards/ti/sk_am64/sk_am64_am6442_m4.dts
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024 Texas Instruments Incorporated
+ *	Andrew Davis <afd@ti.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <ti/am64x_m4.dtsi>
+#include "sk_am64_am6442_m4-pinctrl.dtsi"
+
+/ {
+	model = "TI AM64x STARTER KIT (SK) M4";
+	compatible = "ti,am64x_m4_sk", "ti,am6442";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,ipc = &ipc0;
+		zephyr,ipc_shm = &ddr0;
+	};
+
+	aliases {
+		led0 = &heartbeat_led;
+	};
+
+	cpus {
+		cpu@0 {
+			status = "okay";
+			clock-frequency = <DT_FREQ_M(400)>;
+		};
+	};
+
+	ddr0: memory@a4000000 {
+		compatible = "mmio-sram";
+		reg = <0xa4000000 DT_SIZE_M(1)>;
+	};
+
+	rsc_table: memory@a4100000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0xa4100000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RSC_TABLE";
+	};
+
+	ddr1: memory@a4200000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0xa4200000 (DT_SIZE_M(15) - DT_SIZE_K(4))>;
+		zephyr,memory-region = "DDR";
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+
+		heartbeat_led: led_0 {
+			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+			label = "Heartbeat LED";
+		};
+	};
+
+	ipc0: ipc {
+		compatible = "zephyr,mbox-ipm";
+		mboxes = <&mbox6 0>, <&mbox6 1>;
+		mbox-names = "tx", "rx";
+	};
+};
+
+&uart0 {
+	current-speed = <115200>;
+	pinctrl-0 = <&mcu_uart0_rx_default &mcu_uart0_tx_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&gpio0 {
+	pinctrl-0 = <&mcu_gpio0_led_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/boards/ti/sk_am64/sk_am64_am6442_m4.yaml b/boards/ti/sk_am64/sk_am64_am6442_m4.yaml
new file mode 100644
index 0000000000000..88d628dd68839
--- /dev/null
+++ b/boards/ti/sk_am64/sk_am64_am6442_m4.yaml
@@ -0,0 +1,8 @@
+identifier: sk_am64/am6442/m4
+name: TI AM64X M4 Starter Kit (SK)
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+ram: 192
+vendor: ti
diff --git a/boards/ti/sk_am64/sk_am64_am6442_m4_defconfig b/boards/ti/sk_am64/sk_am64_am6442_m4_defconfig
new file mode 100644
index 0000000000000..6f8f05cb1f725
--- /dev/null
+++ b/boards/ti/sk_am64/sk_am64_am6442_m4_defconfig
@@ -0,0 +1,20 @@
+# Copyright (c) 2024 Texas Instruments Incorporated
+#	Andrew Davis <afd@ti.com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Platform Configuration
+CONFIG_CORTEX_M_SYSTICK=y
+
+# Zephyr Kernel Configuration
+CONFIG_XIP=n
+
+# Serial Driver
+CONFIG_SERIAL=y
+
+# GPIO Driver
+CONFIG_GPIO=y
+
+# Enable Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/toradex/colibri_imx7d/doc/index.rst b/boards/toradex/colibri_imx7d/doc/index.rst
index ea36ff6b50b47..10f0b732a21c7 100644
--- a/boards/toradex/colibri_imx7d/doc/index.rst
+++ b/boards/toradex/colibri_imx7d/doc/index.rst
@@ -125,6 +125,8 @@ the remaining are not used/tested.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Colibri iMX7D doesn't have QSPI flash for the M4 and it needs to be started by
 the A7 core. The A7 core is responsible to load the M4 binary application into the
 RAM, put the M4 in reset, set the M4 Program Counter and Stack Pointer, and get
diff --git a/boards/toradex/verdin_imx8mm/doc/index.rst b/boards/toradex/verdin_imx8mm/doc/index.rst
index 112596322bcaf..9ae5e807b40c2 100644
--- a/boards/toradex/verdin_imx8mm/doc/index.rst
+++ b/boards/toradex/verdin_imx8mm/doc/index.rst
@@ -132,6 +132,8 @@ The M4 Core is configured to run at a 400 MHz clock speed.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The i.MX8MM doesn't have QSPI flash for the M4 and it needs
 to be started by the A53 core. The A53 core is responsible to load the M4 binary
 application into the RAM, putting the M4 in reset, setting the M4 Program Counter and
diff --git a/boards/toradex/verdin_imx8mp/doc/index.rst b/boards/toradex/verdin_imx8mp/doc/index.rst
index af78ea49808f0..cc99a1e773505 100644
--- a/boards/toradex/verdin_imx8mp/doc/index.rst
+++ b/boards/toradex/verdin_imx8mp/doc/index.rst
@@ -172,6 +172,8 @@ used/tested.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The Verdin iMX8M Plus board doesn't have QSPI flash for the M7, and it needs to be started by the
 A53 core. The A53 core is responsible to load the M7 binary application into the RAM, put the M7 in
 reset, set the M7 Program Counter and Stack Pointer, and get the M7 out of reset. The A53 can
diff --git a/boards/u-blox/ubx_bmd300eval/board.cmake b/boards/u-blox/ubx_bmd300eval/board.cmake
index ff043e765a854..7a6bc33788dd5 100644
--- a/boards/u-blox/ubx_bmd300eval/board.cmake
+++ b/boards/u-blox/ubx_bmd300eval/board.cmake
@@ -5,6 +5,7 @@
 
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_bmd330eval/board.cmake b/boards/u-blox/ubx_bmd330eval/board.cmake
index 6ba621fc8f5d0..156fb582e6429 100644
--- a/boards/u-blox/ubx_bmd330eval/board.cmake
+++ b/boards/u-blox/ubx_bmd330eval/board.cmake
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52810_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/u-blox/ubx_bmd340eval/board.cmake b/boards/u-blox/ubx_bmd340eval/board.cmake
index 8d1e2b8b93d0b..ff0defdbc9036 100644
--- a/boards/u-blox/ubx_bmd340eval/board.cmake
+++ b/boards/u-blox/ubx_bmd340eval/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_bmd345eval/board.cmake b/boards/u-blox/ubx_bmd345eval/board.cmake
index 2588f9d09a472..df3db6f9d21e8 100644
--- a/boards/u-blox/ubx_bmd345eval/board.cmake
+++ b/boards/u-blox/ubx_bmd345eval/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_bmd360eval/board.cmake b/boards/u-blox/ubx_bmd360eval/board.cmake
index f109b0318a523..597511273adab 100644
--- a/boards/u-blox/ubx_bmd360eval/board.cmake
+++ b/boards/u-blox/ubx_bmd360eval/board.cmake
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF52811_xxAA" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)
diff --git a/boards/u-blox/ubx_bmd380eval/board.cmake b/boards/u-blox/ubx_bmd380eval/board.cmake
index ebeb58f74fb0f..fde7182d10af5 100644
--- a/boards/u-blox/ubx_bmd380eval/board.cmake
+++ b/boards/u-blox/ubx_bmd380eval/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkannab1/board.cmake b/boards/u-blox/ubx_evkannab1/board.cmake
index 18747716bc1a8..98e9e3d7ae549 100644
--- a/boards/u-blox/ubx_evkannab1/board.cmake
+++ b/boards/u-blox/ubx_evkannab1/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkninab1/board.cmake b/boards/u-blox/ubx_evkninab1/board.cmake
index 8546871b5f288..7eddd95a8c03e 100644
--- a/boards/u-blox/ubx_evkninab1/board.cmake
+++ b/boards/u-blox/ubx_evkninab1/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkninab3/board.cmake b/boards/u-blox/ubx_evkninab3/board.cmake
index ff8c1f01cf6cf..a92e93d80be1b 100644
--- a/boards/u-blox/ubx_evkninab3/board.cmake
+++ b/boards/u-blox/ubx_evkninab3/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/u-blox/ubx_evkninab4/board.cmake b/boards/u-blox/ubx_evkninab4/board.cmake
index f7373de125460..c7b3288d4fec0 100644
--- a/boards/u-blox/ubx_evkninab4/board.cmake
+++ b/boards/u-blox/ubx_evkninab4/board.cmake
@@ -6,6 +6,7 @@
 board_runner_args(nrfjprog "--nrf-family=NRF52")
 board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/udoo/udoo_neo_full/doc/index.rst b/boards/udoo/udoo_neo_full/doc/index.rst
index 3c9dd90e2141d..4a2f49ab800d8 100644
--- a/boards/udoo/udoo_neo_full/doc/index.rst
+++ b/boards/udoo/udoo_neo_full/doc/index.rst
@@ -106,29 +106,7 @@ see these references:
 Supported Features
 ==================
 
-The UDOO Neo Full board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | general purpose input/output        |
-+-----------+------------+-------------------------------------+
-| COUNTER   | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-	:zephyr_file:`boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4_defconfig`
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -160,6 +138,8 @@ remaining are used by the A9 core or not used.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The M4 core does not have a flash memory and is not provided a clock
 at power-on-reset. Therefore it needs to be started by the A9 core.
 The A9 core is responsible to load the M4 binary application into the RAM,
diff --git a/boards/up-bridge-the-gap/up_squared/doc/index.rst b/boards/up-bridge-the-gap/up_squared/doc/index.rst
index 62166f2ef3803..9acd231d20e71 100644
--- a/boards/up-bridge-the-gap/up_squared/doc/index.rst
+++ b/boards/up-bridge-the-gap/up_squared/doc/index.rst
@@ -1,7 +1,4 @@
-.. _up_squared:
-
-UP Squared
-##########
+.. zephyr:board:: up_squared
 
 Overview
 ********
@@ -11,12 +8,6 @@ performance and low power consumption. It features the latest Intel |reg| Apollo
 Lake Celeron |trade| and Pentium |trade| Processors with only 4W of Scenario Design Power and
 a powerful and flexible Intel |reg| FPGA Altera MAX 10 onboard.
 
-.. figure:: img/up_squared.jpg
-   :align: center
-   :alt: UP Squared
-
-   Up Squared (Credit: https://up-board.org)
-
 This board configuration enables kernel support for the `UP Squared`_ board.
 
 .. note::
@@ -53,6 +44,8 @@ for connection diagrams.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use the following procedures for booting an image on a UP Squared board.
 
 .. contents::
diff --git a/boards/up-bridge-the-gap/up_squared_pro_7000/doc/up_squared_pro_7000.rst b/boards/up-bridge-the-gap/up_squared_pro_7000/doc/up_squared_pro_7000.rst
index 1b2d6bace7bce..d3f1fc7cc109e 100644
--- a/boards/up-bridge-the-gap/up_squared_pro_7000/doc/up_squared_pro_7000.rst
+++ b/boards/up-bridge-the-gap/up_squared_pro_7000/doc/up_squared_pro_7000.rst
@@ -1,9 +1,4 @@
-:orphan:
-
-.. _up_squared_pro_7000_board:
-
-UP Squared Pro 7000
-###################
+.. zephyr:board:: up_squared_pro_7000
 
 Overview
 ********
@@ -30,6 +25,8 @@ Refer to the `UP Squared Pro 7000`_ website for more information.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Use the following procedures for booting an image for an UP Squared Pro 7000 board.
 
 .. contents::
diff --git a/boards/vcc-gnd/yd_esp32/doc/index.rst b/boards/vcc-gnd/yd_esp32/doc/index.rst
index 425c11c69f0c9..af9e54c5a65fd 100644
--- a/boards/vcc-gnd/yd_esp32/doc/index.rst
+++ b/boards/vcc-gnd/yd_esp32/doc/index.rst
@@ -50,45 +50,7 @@ manual at `ESP32 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's YD-ESP32 board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| DAC        | on-chip    | dac                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 ===================
@@ -110,6 +72,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.dts b/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.dts
index 119e18f222ff5..b0d7cd944e386 100644
--- a/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.dts
+++ b/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.dts
@@ -140,3 +140,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/vcc-gnd/yd_stm32h750vb/doc/index.rst b/boards/vcc-gnd/yd_stm32h750vb/doc/index.rst
index d11a7e2473060..8ce686dc5090d 100644
--- a/boards/vcc-gnd/yd_stm32h750vb/doc/index.rst
+++ b/boards/vcc-gnd/yd_stm32h750vb/doc/index.rst
@@ -16,27 +16,7 @@ More information about STM32H750 can be found here:
 Supported Features
 ==================
 
-The current Zephyr YD-STM32H750VB board supports the following features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| CLOCK     | on-chip    | reset and clock control             |
-+-----------+------------+-------------------------------------+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port-polling;                |
-|           |            | serial port-interrupt               |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on Zephyr porting.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/vcc-gnd/yd_stm32h750vb/yd_stm32h750vb_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -62,6 +42,8 @@ is driven by the PLL clock at 480MHz. PLL clock is feed by a 25MHz high speed ex
 Flashing
 ========
 
+.. zephyr:board-supported-runners::
+
 There are 2 main entry points for flashing STM32H750VB SoCs, one using the ROM
 bootloader, and another by using the SWD debug port (which requires additional
 hardware such as ST-Link). Flashing using the ROM bootloader requires a special activation
diff --git a/boards/vngiotlab/nrf51_vbluno51/doc/index.rst b/boards/vngiotlab/nrf51_vbluno51/doc/index.rst
index ad9db23a69e1b..eac9d110bd2e7 100644
--- a/boards/vngiotlab/nrf51_vbluno51/doc/index.rst
+++ b/boards/vngiotlab/nrf51_vbluno51/doc/index.rst
@@ -86,6 +86,8 @@ More details
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``nrf51_vbluno51`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details).
diff --git a/boards/vngiotlab/nrf52_vbluno52/doc/index.rst b/boards/vngiotlab/nrf52_vbluno52/doc/index.rst
index 2c710421a64ec..fc1c788fe3da5 100644
--- a/boards/vngiotlab/nrf52_vbluno52/doc/index.rst
+++ b/boards/vngiotlab/nrf52_vbluno52/doc/index.rst
@@ -25,31 +25,7 @@ is 64 MHz.
 Supported Features
 ==================
 
-The nrf52_vbluno52 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| NVIC      | on-chip    | nested vectored      |
-|           |            | interrupt controller |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial port          |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| I2C       | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| SPI       | on-chip    | spi                  |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -67,6 +43,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst b/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
index 540ac8a68e66f..b9cab2da1d141 100644
--- a/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
+++ b/boards/waveshare/esp32s3_touch_lcd_1_28/doc/index.rst
@@ -57,37 +57,7 @@ manual at `ESP32-S3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Current Zephyr's ESP32-S3-Touch-LCD-1.28 board supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI/CAN   | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| MCPWM      | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| PCNT       | on-chip    | qdec                                |
-+------------+------------+-------------------------------------+
-| GDMA       | on-chip    | dma                                 |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 Prerequisites
 -------------
@@ -106,6 +76,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
diff --git a/boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_procpu.dts b/boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_procpu.dts
index 1204ed87bbdc5..3b502f4160934 100644
--- a/boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_procpu.dts
+++ b/boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_procpu.dts
@@ -157,3 +157,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/waveshare/nrf51_ble400/board.cmake b/boards/waveshare/nrf51_ble400/board.cmake
index e62f55b6a1dcc..3bdb9b702c1ae 100644
--- a/boards/waveshare/nrf51_ble400/board.cmake
+++ b/boards/waveshare/nrf51_ble400/board.cmake
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 board_runner_args(jlink "--device=nRF51822_xxAC" "--speed=4000")
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/boards/waveshare/nrf51_ble400/doc/index.rst b/boards/waveshare/nrf51_ble400/doc/index.rst
index 5dd3034f9ca85..06c8dabe43689 100644
--- a/boards/waveshare/nrf51_ble400/doc/index.rst
+++ b/boards/waveshare/nrf51_ble400/doc/index.rst
@@ -156,6 +156,8 @@ UART (USB)
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/waveshare/open103z/doc/index.rst b/boards/waveshare/open103z/doc/index.rst
index 0ba052cc623d0..9a77af08f4fb3 100644
--- a/boards/waveshare/open103z/doc/index.rst
+++ b/boards/waveshare/open103z/doc/index.rst
@@ -16,33 +16,13 @@ The Waveshare Open103Z provides the following hardware components:
 Supported Features
 ==================
 
-The Waveshare Open103Z configuration supports the following hardware features:
-
-+-----------+------------+--------------------------------------+
-| Interface | Controller |      Driver/Component                |
-+===========+============+======================================+
-| NVIC      | on-chip    | nested vectored interrupt controller |
-+-----------+------------+--------------------------------------+
-| ADC       | on-chip    | adc                                  |
-+-----------+------------+--------------------------------------+
-| UART      | on-chip    | serial port                          |
-+-----------+------------+--------------------------------------+
-| GPIO      | on-chip    | gpio                                 |
-+-----------+------------+--------------------------------------+
-| FLASH     | on-chip    | flash                                |
-+-----------+------------+--------------------------------------+
-| SPI       | on-chip    | spi                                  |
-+-----------+------------+--------------------------------------+
-| I2C       | on-chip    | i2c                                  |
-+-----------+------------+--------------------------------------+
-| CAN       | on-chip    | can (disabled by default)            |
-+-----------+------------+--------------------------------------+
-| USB       | on-chip    | usb                                  |
-+-----------+------------+--------------------------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``waveshare_open103z`` board configuration can be built and
 flashed in the usual way.
 
diff --git a/boards/waveshare/rp2040_zero/doc/index.rst b/boards/waveshare/rp2040_zero/doc/index.rst
index 27e527e32c34b..a469e2f502f87 100644
--- a/boards/waveshare/rp2040_zero/doc/index.rst
+++ b/boards/waveshare/rp2040_zero/doc/index.rst
@@ -25,56 +25,7 @@ Hardware
 Supported Features
 ==================
 
-The ``rp2040_zero`` board target supports the following hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v6m-nvic`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - USB Device
-     - :kconfig:option:`CONFIG_USB_DEVICE_STACK`
-     - :dtcompatible:`raspberrypi,pico-usbd`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - Watchdog Timer (WDT)
-     - :kconfig:option:`CONFIG_WATCHDOG`
-     - :dtcompatible:`raspberrypi,pico-watchdog`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - Flash
-     - :kconfig:option:`CONFIG_FLASH`
-     - :dtcompatible:`raspberrypi,pico-flash`
-   * - Clock controller
-     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
-     - :dtcompatible:`raspberrypi,pico-clock-controller`
-   * - UART (PIO)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart-pio`
-   * - SPI (PIO)
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi-pio`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -100,6 +51,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/waveshare/rp2040_zero/rp2040_zero.dts b/boards/waveshare/rp2040_zero/rp2040_zero.dts
index 88c41f55d2e87..6e593f9a5ab43 100644
--- a/boards/waveshare/rp2040_zero/rp2040_zero.dts
+++ b/boards/waveshare/rp2040_zero/rp2040_zero.dts
@@ -28,7 +28,7 @@
 };
 
 &flash0 {
-	reg = <0x10000000 DT_SIZE_M(16)>;
+	reg = <0x10000000 DT_SIZE_M(2)>;
 
 	partitions {
 		compatible = "fixed-partitions";
@@ -44,11 +44,11 @@
 
 		/*
 		 * Usable flash. Starts at 0x100, after the bootloader. The partition
-		 * size is 16MB minus the 0x100 bytes taken by the bootloader.
+		 * size is 2MB minus the 0x100 bytes taken by the bootloader.
 		 */
 		code_partition: partition@100 {
 			label = "code-partition";
-			reg = <0x100 (DT_SIZE_M(16) - 0x100)>;
+			reg = <0x100 (DT_SIZE_M(2) - 0x100)>;
 			read-only;
 		};
 	};
diff --git a/boards/waveshare/rp2040_zero/rp2040_zero.yaml b/boards/waveshare/rp2040_zero/rp2040_zero.yaml
index 36434dbb72a2c..409dd03975fdc 100644
--- a/boards/waveshare/rp2040_zero/rp2040_zero.yaml
+++ b/boards/waveshare/rp2040_zero/rp2040_zero.yaml
@@ -2,7 +2,7 @@ identifier: rp2040_zero
 name: Waveshare RP2040-Zero
 type: mcu
 arch: arm
-flash: 16384
+flash: 2048
 ram: 264
 toolchain:
   - zephyr
diff --git a/boards/wch/ch32v003evt/ch32v003evt-pinctrl.dtsi b/boards/wch/ch32v003evt/ch32v003evt-pinctrl.dtsi
index 7f33d888e7559..db0d39f0ac1aa 100644
--- a/boards/wch/ch32v003evt/ch32v003evt-pinctrl.dtsi
+++ b/boards/wch/ch32v003evt/ch32v003evt-pinctrl.dtsi
@@ -18,4 +18,12 @@
 			bias-pull-up;
 		};
 	};
+
+	i2c1_default: i2c1_default {
+		group1 {
+			pinmux = <I2C1_SDA_PC1_0>, <I2C1_SCL_PC2_0>;
+			output-high;
+			drive-open-drain;
+		};
+	};
 };
diff --git a/boards/wch/ch32v003evt/ch32v003evt.dts b/boards/wch/ch32v003evt/ch32v003evt.dts
index 482c14045b06e..fef72bcbd376e 100644
--- a/boards/wch/ch32v003evt/ch32v003evt.dts
+++ b/boards/wch/ch32v003evt/ch32v003evt.dts
@@ -8,6 +8,9 @@
 #include <wch/ch32v0/ch32v003f4p.dtsi>
 #include "ch32v003evt-pinctrl.dtsi"
 
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+
 / {
 	model = "ch32v003evt";
 	compatible = "wch,ch32v003";
@@ -53,10 +56,21 @@
 	clocks = <&pll>;
 };
 
+&gpioc {
+	status = "okay";
+};
+
 &gpiod {
 	status = "okay";
 };
 
+&i2c1 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+};
+
 &usart1 {
 	status = "okay";
 	current-speed = <115200>;
diff --git a/boards/wch/ch32v003evt/ch32v003evt.yaml b/boards/wch/ch32v003evt/ch32v003evt.yaml
index 0968fd0b4e7e2..2b349c49d837e 100644
--- a/boards/wch/ch32v003evt/ch32v003evt.yaml
+++ b/boards/wch/ch32v003evt/ch32v003evt.yaml
@@ -9,3 +9,4 @@ ram: 2
 flash: 16
 supported:
   - gpio
+  - i2c
diff --git a/boards/wch/ch32v003evt/doc/index.rst b/boards/wch/ch32v003evt/doc/index.rst
index 0c59c492de21e..a0d8b0140a722 100644
--- a/boards/wch/ch32v003evt/doc/index.rst
+++ b/boards/wch/ch32v003evt/doc/index.rst
@@ -22,25 +22,7 @@ external crystal and runs at 48 MHz.
 Supported Features
 ==================
 
-The ``ch32v003evt`` board target supports the following hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| PINCTRL   | on-chip    | pinctrl              |
-+-----------+------------+----------------------+
-| TIMER     | on-chip    | timer                |
-+-----------+------------+----------------------+
-| UART      | on-chip    | uart                 |
-+-----------+------------+----------------------+
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -53,6 +35,8 @@ LED
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``ch32v003evt`` board target can be built and flashed
 in the usual way (see :ref:`build_an_application` and :ref:`application_run`
 for more details); however, an external programmer is required since the board
diff --git a/boards/wch/ch32v003f4p6_dev_board/CMakeLists.txt b/boards/wch/ch32v003f4p6_dev_board/CMakeLists.txt
new file mode 100644
index 0000000000000..a1268429b1527
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Andrei-Edward Popa <andrei.popa105@yahoo.com>.
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(board.c)
diff --git a/boards/wch/ch32v003f4p6_dev_board/Kconfig b/boards/wch/ch32v003f4p6_dev_board/Kconfig
new file mode 100644
index 0000000000000..8e159b39cd220
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/Kconfig
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Andrei-Edward Popa
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_CH32V003F4P6_DEV_BOARD
+	select BOARD_LATE_INIT_HOOK
diff --git a/boards/wch/ch32v003f4p6_dev_board/Kconfig.ch32v003f4p6_dev_board b/boards/wch/ch32v003f4p6_dev_board/Kconfig.ch32v003f4p6_dev_board
new file mode 100644
index 0000000000000..41a1c2543fb36
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/Kconfig.ch32v003f4p6_dev_board
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Andrei-Edward Popa
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_CH32V003F4P6_DEV_BOARD
+	select SOC_CH32V003
diff --git a/boards/wch/ch32v003f4p6_dev_board/board.c b/boards/wch/ch32v003f4p6_dev_board/board.c
new file mode 100644
index 0000000000000..ff48852dc44a0
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/board.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 Andrei-Edward Popa <andrei.popa105@yahoo.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+
+#include <ch32fun.h>
+
+#define AFIO_SWCFG_MASK    0x07000000
+#define AFIO_SWCFG_SWD_OFF 0x04000000
+
+void board_late_init_hook(void)
+{
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(gpiod))
+	const struct device *gpiod = DEVICE_DT_GET(DT_NODELABEL(gpiod));
+	uint32_t pcfr1;
+
+	/*
+	 * PD1 is wired to led and to SWDIO pin.
+	 * If PD1 is not put to ground, change the function to GPIO to use
+	 * the led as a user led.
+	 * If PD1 is put to ground, let the pin as SWDIO pin (default) to be
+	 * able to program the board.
+	 */
+	if (gpio_pin_get(gpiod, 1) == 1) {
+		RCC->APB2PCENR |= RCC_AFIOEN;
+		pcfr1 = AFIO->PCFR1;
+		pcfr1 = (pcfr1 & ~AFIO_SWCFG_MASK) | (AFIO_SWCFG_SWD_OFF & AFIO_SWCFG_MASK);
+		AFIO->PCFR1 = pcfr1;
+	}
+#endif
+}
diff --git a/boards/wch/ch32v003f4p6_dev_board/board.cmake b/boards/wch/ch32v003f4p6_dev_board/board.cmake
new file mode 100644
index 0000000000000..480e7d3abe0cc
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/board.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Andrei-Edward Popa
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(minichlink)
+include(${ZEPHYR_BASE}/boards/common/minichlink.board.cmake)
+
+board_runner_args(openocd "--use-elf" "--cmd-reset-halt" "halt")
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
diff --git a/boards/wch/ch32v003f4p6_dev_board/board.yml b/boards/wch/ch32v003f4p6_dev_board/board.yml
new file mode 100644
index 0000000000000..a7709ff6d027d
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: ch32v003f4p6_dev_board
+  full_name: WCH CH32V003F4P6 Development Board
+  vendor: wch
+  socs:
+    - name: ch32v003
diff --git a/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board-pinctrl.dtsi b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board-pinctrl.dtsi
new file mode 100644
index 0000000000000..4b203569e4737
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board-pinctrl.dtsi
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Andrei-Edward Popa <andrei.popa105@yahoo.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/ch32v003-pinctrl.h>
+
+&pinctrl {
+	usart1_default: usart1_default {
+		group1 {
+			pinmux = <USART1_TX_PD5_0>;
+			output-high;
+			drive-push-pull;
+			slew-rate = "max-speed-10mhz";
+		};
+
+		group2 {
+			pinmux = <USART1_RX_PD6_0>;
+			bias-pull-up;
+		};
+	};
+
+	i2c1_default: i2c1_default {
+		group1 {
+			pinmux = <I2C1_SDA_PC1_0>, <I2C1_SCL_PC2_0>;
+			output-high;
+			drive-open-drain;
+		};
+	};
+};
diff --git a/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board.dts b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board.dts
new file mode 100644
index 0000000000000..2f83259ffc15f
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board.dts
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Andrei-Edward Popa <andrei.popa105@yahoo.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <wch/ch32v0/ch32v003f4p.dtsi>
+#include "ch32v003f4p6_dev_board-pinctrl.dtsi"
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+
+/ {
+	model = "ch32v003f4p6_dev_board";
+	compatible = "wch,ch32v003";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		red_led: led0 {
+			gpios = <&gpiod 1 GPIO_ACTIVE_LOW>;
+			label = "LED";
+		};
+	};
+
+	aliases {
+		led0 = &red_led;
+	};
+};
+
+&clk_hsi {
+	status = "okay";
+};
+
+&pll {
+	clocks = <&clk_hsi>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+};
+
+&gpioc {
+	status = "okay";
+};
+
+&gpiod {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c1_default>;
+	pinctrl-names = "default";
+};
+
+&usart1 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&usart1_default>;
+	pinctrl-names = "default";
+};
diff --git a/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board.yaml b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board.yaml
new file mode 100644
index 0000000000000..e4823b08a3ac7
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board.yaml
@@ -0,0 +1,13 @@
+identifier: ch32v003f4p6_dev_board
+name: WCH CH32V003F4P6 Development Board
+type: mcu
+arch: riscv
+toolchain:
+  - cross-compile
+  - zephyr
+ram: 2
+flash: 16
+supported:
+  - gpio
+  - uart
+  - i2c
diff --git a/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board_defconfig b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board_defconfig
new file mode 100644
index 0000000000000..99469475200d9
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board_defconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Andrei-Edward Popa
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_GPIO=y
+
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/wch/ch32v003f4p6_dev_board/doc/img/ch32v003f4p6_dev_board.webp b/boards/wch/ch32v003f4p6_dev_board/doc/img/ch32v003f4p6_dev_board.webp
new file mode 100644
index 0000000000000..a55ccd3481805
Binary files /dev/null and b/boards/wch/ch32v003f4p6_dev_board/doc/img/ch32v003f4p6_dev_board.webp differ
diff --git a/boards/wch/ch32v003f4p6_dev_board/doc/index.rst b/boards/wch/ch32v003f4p6_dev_board/doc/index.rst
new file mode 100644
index 0000000000000..6646efea06c8c
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/doc/index.rst
@@ -0,0 +1,100 @@
+.. zephyr:board:: ch32v003f4p6_dev_board
+
+Overview
+********
+
+The `WCH`_ CH32V003F4P6 Development Board hardware provides support for
+QingKe 32-bit RISC-V2A processor and the following devices:
+
+* CLOCK
+* :abbr:`GPIO (General Purpose Input Output)`
+* :abbr:`NVIC (Nested Vectored Interrupt Controller)`
+
+The board is equipped with one LED, wired to PD1 and SWIO pins.
+The `WCH webpage on CH32V003`_ contains the processor's information
+and the datasheet.
+
+Hardware
+********
+
+The QingKe 32-bit RISC-V2A processor of the WCH CH32V003F4P6_DEV_BOARD is clocked
+by an internal RC oscillator and runs at 24 MHz.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+LED
+---
+
+* LED1 (red) = PD1
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``ch32v003f4p6_dev_board`` board target can be built and
+flashed in the usual way (see :ref:`build_an_application` and :ref:`application_run`
+for more details); however, an external programmer is required since the board
+does not have any built-in debug support.
+
+The following pins of the external programmer must be connected to the
+following pins on the PCB (see image):
+
+* VCC = VCC (do not power the board from the USB port at the same time)
+* GND = GND
+* SWIO = PD1
+
+Flashing
+========
+
+SWIO pin is connected to PD1 and also to led on the board. By default, the function
+of PD1 is SWD. To use the led on the board, the function of PD1 is changed to GPIO
+if PD1 is not put to ground (see :zephyr_file:`boards/wch/ch32v003f4p6_dev_board/board.c`).
+In order to be able to reflash the board, if some zephyr application is already loaded
+in flash, power on the board with PD1 put to ground to let PD1 as SWIO. After that,
+reconnect the external debugger SWDIO pin to PD1/SWIO to be able to flash the board
+using the external debugger.
+
+You can use ``minichlink`` to flash the board. Once ``minichlink`` has been set
+up, build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Here is an example for the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: ch32v003f4p6_dev_board
+   :goals: build flash
+
+Debugging
+=========
+
+This board can be debugged via OpenOCD or ``minichlink``.
+
+Testing the LED on the WCH CH32V003F4P6_DEV_BOARD
+*************************************************
+
+There is 1 sample program that allow you to test that the LED on the board is
+working properly with Zephyr:
+
+.. code-block:: console
+
+   samples/basic/blinky
+
+You can build and flash the examples to make sure Zephyr is running
+correctly on your board. The button and LED definition can be found
+in :zephyr_file:`boards/wch/ch32v003f4p6_dev_board/ch32v003f4p6_dev_board.dts`.
+
+References
+**********
+
+.. target-notes::
+
+.. _WCH: http://www.wch-ic.com
+.. _WCH webpage on CH32V003: https://www.wch-ic.com/products/CH32V003.html
diff --git a/boards/wch/ch32v003f4p6_dev_board/support/openocd.cfg b/boards/wch/ch32v003f4p6_dev_board/support/openocd.cfg
new file mode 100644
index 0000000000000..ac321f2af6638
--- /dev/null
+++ b/boards/wch/ch32v003f4p6_dev_board/support/openocd.cfg
@@ -0,0 +1,14 @@
+adapter driver wlink
+wlink_set
+set _CHIPNAME riscv
+jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x00001
+
+set _TARGETNAME $_CHIPNAME.cpu
+
+target create $_TARGETNAME.0 riscv -chain-position $_TARGETNAME
+$_TARGETNAME.0 configure  -work-area-phys 0x80000000 -work-area-size 10000 -work-area-backup 1
+set _FLASHNAME $_CHIPNAME.flash
+
+flash bank $_FLASHNAME wch_riscv 0x00000000 0 0 0 $_TARGETNAME.0
+
+echo "Ready for Remote Connections"
diff --git a/boards/wch/linkw/Kconfig.linkw b/boards/wch/linkw/Kconfig.linkw
new file mode 100644
index 0000000000000..3cdfe3c66ba9f
--- /dev/null
+++ b/boards/wch/linkw/Kconfig.linkw
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_LINKW
+	select SOC_CH32V208
diff --git a/boards/wch/linkw/board.cmake b/boards/wch/linkw/board.cmake
new file mode 100644
index 0000000000000..cc34377de8fee
--- /dev/null
+++ b/boards/wch/linkw/board.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(openocd "--use-elf" "--cmd-reset-halt" "halt")
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+
+board_runner_args(minichlink)
+include(${ZEPHYR_BASE}/boards/common/minichlink.board.cmake)
diff --git a/boards/wch/linkw/board.yml b/boards/wch/linkw/board.yml
new file mode 100644
index 0000000000000..ce9a140eacdde
--- /dev/null
+++ b/boards/wch/linkw/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: linkw
+  full_name: WCH LinkW
+  vendor: wch
+  socs:
+    - name: ch32v208
diff --git a/boards/wch/linkw/doc/img/linkw.webp b/boards/wch/linkw/doc/img/linkw.webp
new file mode 100644
index 0000000000000..3c719a5307434
Binary files /dev/null and b/boards/wch/linkw/doc/img/linkw.webp differ
diff --git a/boards/wch/linkw/doc/img/weaxie_linkw.webp b/boards/wch/linkw/doc/img/weaxie_linkw.webp
new file mode 100644
index 0000000000000..c621a0a56c2d5
Binary files /dev/null and b/boards/wch/linkw/doc/img/weaxie_linkw.webp differ
diff --git a/boards/wch/linkw/doc/index.rst b/boards/wch/linkw/doc/index.rst
new file mode 100644
index 0000000000000..4df6283d28649
--- /dev/null
+++ b/boards/wch/linkw/doc/index.rst
@@ -0,0 +1,89 @@
+.. zephyr:board:: linkw
+
+Overview
+********
+
+The `WCH`_ LinkW hardware provides support for QingKe 32-bit RISC-V4C
+processor and the following devices:
+
+* CLOCK
+* :abbr:`GPIO (General Purpose Input Output)`
+* :abbr:`NVIC (Nested Vectored Interrupt Controller)`
+
+The board is equipped with two LEDs and two Buttons.
+The `WCH webpage on CH32V208`_ contains the processor's manuals.
+The `WCH webpage on LinkW`_ contains the LinkW's schematic.
+
+Hardware
+********
+
+The QingKe 32-bit RISC-V4C processor of the WCH LinkW is clocked by an external
+32 MHz crystal or the internal 8 MHz oscillator and runs up to 144 MHz.
+The CH32V208 SoC Features 4 USART, 4 GPIO ports, 2 SPI, 2 I2C, ADC, RTC,
+CAN, 2 USB Device, USB Host, OPA, ETH with PHY, several timers, and BLE 5.3.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Connections and IOs
+===================
+
+LED
+---
+
+* LED0 = Green Mode LED
+* LED1 = Blue Activity LED
+
+Button
+------
+
+* SW0 = Mode Select Button (Active Low)
+* SW1 = Bootstrap Button (Active High)
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``linkw`` board target can be built and flashed
+in the usual way (see :ref:`build_an_application` and :ref:`application_run`
+for more details); however, an external programmer is required since the board
+does not have any built-in debug support.
+
+The following pins of the external programmer must be connected to the
+following pins on the PCB:
+
+* VCC = VCC
+* GND = GND
+* SWIO = PA13
+* SWCLK = PA14
+
+Flashing
+========
+
+You can use ``minichlink`` to flash the board. Once ``minichlink`` has been set
+up, build and flash applications as usual (see :ref:`build_an_application` and
+:ref:`application_run` for more details).
+
+Here is an example for the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: linkw
+   :goals: build flash
+
+Debugging
+=========
+
+This board can be debugged via OpenOCD or ``minichlink``.
+
+References
+**********
+
+.. target-notes::
+
+.. _WCH: http://www.wch-ic.com
+.. _WCH webpage on CH32V208: https://www.wch-ic.com/products/CH32V208.html
+.. _WCH webpage on LinkW: https://www.wch-ic.com/products/WCH-Link.html
diff --git a/boards/wch/linkw/linkw-pinctrl.dtsi b/boards/wch/linkw/linkw-pinctrl.dtsi
new file mode 100644
index 0000000000000..3cbd4ba16457b
--- /dev/null
+++ b/boards/wch/linkw/linkw-pinctrl.dtsi
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h>
+
+&pinctrl {
+	usart2_default: usart2_default {
+		group1 {
+			pinmux = <USART2_TX_PA2_0>;
+			output-high;
+			drive-push-pull;
+			slew-rate = "max-speed-10mhz";
+		};
+		group2 {
+			pinmux = <USART2_RX_PA3_0>;
+			bias-pull-up;
+		};
+	};
+};
diff --git a/boards/wch/linkw/linkw.dts b/boards/wch/linkw/linkw.dts
new file mode 100644
index 0000000000000..50f749ef28cbe
--- /dev/null
+++ b/boards/wch/linkw/linkw.dts
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <wch/ch32v208/ch32v208gbu.dtsi>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include "linkw-pinctrl.dtsi"
+
+/ {
+	model = "linkw";
+	compatible = "wch,ch32v208";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &usart2;
+		zephyr,shell-uart = &usart2;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		status = "okay";
+
+		green_led: led0 {
+			gpios = <&gpioc 7 GPIO_ACTIVE_LOW>;
+		};
+
+		blue_led: led1 {
+			gpios = <&gpioc 9 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		mode: sw0 {
+			gpios = <&gpioa 4 GPIO_ACTIVE_LOW>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		boot: sw1 {
+			gpios = <&gpiob 8 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+	aliases {
+		led0 = &blue_led;
+		sw0 = &mode;
+	};
+};
+
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(32)>;
+	status = "okay";
+};
+
+&pll {
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+};
+
+&gpioa {
+	status = "okay";
+};
+
+&gpioc {
+	status = "okay";
+};
+
+&usart2 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&usart2_default>;
+	pinctrl-names = "default";
+};
diff --git a/boards/wch/linkw/linkw.yaml b/boards/wch/linkw/linkw.yaml
new file mode 100644
index 0000000000000..042c9cf0e65e7
--- /dev/null
+++ b/boards/wch/linkw/linkw.yaml
@@ -0,0 +1,11 @@
+identifier: linkw
+name: WCH LinkW
+type: mcu
+arch: riscv
+toolchain:
+  - cross-compile
+  - zephyr
+ram: 64
+flash: 128
+supported:
+  - gpio
diff --git a/boards/wch/linkw/linkw_defconfig b/boards/wch/linkw/linkw_defconfig
new file mode 100644
index 0000000000000..ea223eef702f4
--- /dev/null
+++ b/boards/wch/linkw/linkw_defconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Michael Hope
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_GPIO=y
+
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/wch/linkw/support/openocd.cfg b/boards/wch/linkw/support/openocd.cfg
new file mode 100644
index 0000000000000..65a43f18a1697
--- /dev/null
+++ b/boards/wch/linkw/support/openocd.cfg
@@ -0,0 +1,20 @@
+# Tested with WCH openOCD liberated fork (https://github.com/jnk0le/openocd-wch)
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+adapter driver wlinke
+adapter speed 6000
+transport select sdi
+
+wlink_set_address 0x00000000
+set _CHIPNAME wch_riscv
+sdi newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x00001
+
+set _TARGETNAME $_CHIPNAME.cpu
+
+target create $_TARGETNAME.0 wch_riscv -chain-position $_TARGETNAME
+$_TARGETNAME.0 configure  -work-area-phys 0x20000000 -work-area-size 10000 -work-area-backup 1
+set _FLASHNAME $_CHIPNAME.flash
+
+flash bank $_FLASHNAME wch_riscv 0x00000000 0 0 0 $_TARGETNAME.0
+
+echo "Ready for Remote Connections"
diff --git a/boards/we/oceanus1ev/doc/index.rst b/boards/we/oceanus1ev/doc/index.rst
index 1ccb459e328e3..d32be011a39c3 100644
--- a/boards/we/oceanus1ev/doc/index.rst
+++ b/boards/we/oceanus1ev/doc/index.rst
@@ -33,38 +33,13 @@ The board has below hardware features:
 Supported Features
 ==================
 
-The ``we_oceanus1ev`` board supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | LoRa                 |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``we_oceanus1ev`` board can be built the
 usual way (see :ref:`build_an_application`).
 
diff --git a/boards/we/ophelia1ev/board.cmake b/boards/we/ophelia1ev/board.cmake
index ffc9229c08793..c55ce2f4da596 100644
--- a/boards/we/ophelia1ev/board.cmake
+++ b/boards/we/ophelia1ev/board.cmake
@@ -4,6 +4,7 @@
 board_runner_args(jlink "--device=nRF52805_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52805" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/we/ophelia1ev/board.yml b/boards/we/ophelia1ev/board.yml
index b69567e089d66..263047876a020 100644
--- a/boards/we/ophelia1ev/board.yml
+++ b/boards/we/ophelia1ev/board.yml
@@ -1,6 +1,6 @@
 board:
   name: we_ophelia1ev
   full_name: Ophelia-I EV NRF52805
-  vendor: wurth
+  vendor: we
   socs:
   - name: nrf52805
diff --git a/boards/we/ophelia1ev/doc/index.rst b/boards/we/ophelia1ev/doc/index.rst
index 189e0bdcfc702..54a8ffe21221a 100644
--- a/boards/we/ophelia1ev/doc/index.rst
+++ b/boards/we/ophelia1ev/doc/index.rst
@@ -30,40 +30,13 @@ antenna that can be connected to the available SMA connector.
 Supported Features
 ==================
 
-The we_ophelia1ev_nrf52805 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
+.. zephyr:board-supported-hw::
 
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
diff --git a/boards/we/ophelia4ev/Kconfig.defconfig b/boards/we/ophelia4ev/Kconfig.defconfig
new file mode 100644
index 0000000000000..ae367b374d7ed
--- /dev/null
+++ b/boards/we/ophelia4ev/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_OPHELIA4EV_NRF54L15_CPUAPP
+
+config ROM_START_OFFSET
+	default 0x800 if BOOTLOADER_MCUBOOT
+
+endif # BOARD_OPHELIA4EV_NRF54L15_CPUAPP
diff --git a/boards/we/ophelia4ev/Kconfig.ophelia4ev b/boards/we/ophelia4ev/Kconfig.ophelia4ev
new file mode 100644
index 0000000000000..7093796320803
--- /dev/null
+++ b/boards/we/ophelia4ev/Kconfig.ophelia4ev
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_OPHELIA4EV
+	select SOC_NRF54L15_CPUAPP if BOARD_OPHELIA4EV_NRF54L15_CPUAPP
+	select SOC_NRF54L15_CPUFLPR if BOARD_OPHELIA4EV_NRF54L15_CPUFLPR
diff --git a/boards/we/ophelia4ev/board.cmake b/boards/we/ophelia4ev/board.cmake
new file mode 100644
index 0000000000000..69dfac8e45eac
--- /dev/null
+++ b/boards/we/ophelia4ev/board.cmake
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+include(${ZEPHYR_BASE}/boards/nordic/nrf54l15dk/board.cmake)
diff --git a/boards/we/ophelia4ev/board.yml b/boards/we/ophelia4ev/board.yml
new file mode 100644
index 0000000000000..22987b007cbce
--- /dev/null
+++ b/boards/we/ophelia4ev/board.yml
@@ -0,0 +1,9 @@
+board:
+  name: ophelia4ev
+  full_name: Ophelia-IV DK
+  vendor: we
+  socs:
+  - name: nrf54l15
+    variants:
+    - name: xip
+      cpucluster: cpuflpr
diff --git a/boards/we/ophelia4ev/doc/img/ophelia4ev.webp b/boards/we/ophelia4ev/doc/img/ophelia4ev.webp
new file mode 100644
index 0000000000000..07a2ced30b6b5
Binary files /dev/null and b/boards/we/ophelia4ev/doc/img/ophelia4ev.webp differ
diff --git a/boards/we/ophelia4ev/doc/index.rst b/boards/we/ophelia4ev/doc/index.rst
new file mode 100644
index 0000000000000..ad981f6c01db5
--- /dev/null
+++ b/boards/we/ophelia4ev/doc/index.rst
@@ -0,0 +1,92 @@
+.. zephyr:board:: ophelia4ev
+
+Overview
+********
+
+.. note::
+   You can find more information about the nRF54L15 SoC on the `nRF54L15 website`_.
+   For the nRF54L15 technical documentation and other resources (such as
+   SoC Datasheet), see the `nRF54L15 documentation`_ page.
+
+The OPHELIA-IV EV board is an evaluation board of the Ophelia-IV radio module.
+
+Hardware
+********
+
+The Ophelia-IV uses the internal low frequency RC oscillator
+and provides the so called smart antenna connection, that allows
+to choose between the module's integrated PCB antenna and an external
+antenna that can be connected to the available SMA connector.
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Applications for the ``ophelia4ev/nrf54l15/cpuapp`` board target can be
+built, flashed, and debugged in the usual way. See
+:ref:`build_an_application` and :ref:`application_run` for more details on
+building and running.
+
+Applications for the ``ophelia4ev/nrf54l15/cpuflpr`` board target need
+to be built using sysbuild to include the ``vpr_launcher`` image for the application core.
+
+Enter the following command to compile ``hello_world`` for the FLPR core:
+
+.. code-block:: console
+
+   west build -p -b ophelia4ev/nrf54l15/cpuflpr --sysbuild
+
+
+Flashing
+========
+
+As an example, this section shows how to build and flash the :zephyr:code-sample:`hello_world`
+application.
+
+To build and program the sample to the OPHELIA-IV EV, complete the following steps:
+
+First, connect the OPHELIA-IV EV to you computer using the USB port on the board.
+Then connect a segger flasher to the SWD connector available on the board.
+Next, build the sample by running the following command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: ophelia4ev/nrf54l15/cpuapp
+   :goals: build flash
+
+.. warning::
+
+   When programming the device, you might get an error similar to the following message::
+
+    ERROR: The operation attempted is unavailable due to readback protection in
+    ERROR: your device. Please use --recover to unlock the device.
+
+   This error occurs when readback protection is enabled.
+   To disable the readback protection, you must *recover* your device.
+
+   Enter the following command to recover the core::
+
+    west flash --recover
+
+   The ``--recover`` command erases the flash memory and then writes a small binary into
+   the recovered flash memory.
+   This binary prevents the readback protection from enabling itself again after a pin
+   reset or power cycle.
+
+Follow the instructions in the :ref:`nordic_segger` page to install
+and configure all the necessary software. Further information can be
+found in :ref:`nordic_segger_flashing`.
+
+References
+**********
+
+.. target-notes::
+
+.. _nRF54L15 website: https://www.nordicsemi.com/Products/nRF54L15
+.. _nRF54L15 documentation: https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/app_dev/device_guides/nrf54l/index.html
diff --git a/boards/we/ophelia4ev/ophelia4ev_common.dtsi b/boards/we/ophelia4ev/ophelia4ev_common.dtsi
new file mode 100644
index 0000000000000..313e8f3f39a4a
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_common.dtsi
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "ophelia4ev_nrf54l15-pinctrl.dtsi"
+
+/ {
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led_0 {
+			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 0";
+		};
+
+		led1: led_1 {
+			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 1";
+		};
+
+		led2: led_2 {
+			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 2";
+		};
+
+		led3: led_3 {
+			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 3";
+		};
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+
+		/*
+		 * PWM signal can be exposed on GPIO pin only within same domain.
+		 * There is only one domain which contains both PWM and GPIO:
+		 * PWM20/21/22 and GPIO Port P1.
+		 * Only LEDs connected to P1 can work with PWM, for example LED3.
+		 */
+		pwm_led3: pwm_led_3 {
+			pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		button0: button_0 {
+			gpios = <&gpio2 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 0";
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		button1: button_1 {
+			gpios = <&gpio1 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 1";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+
+		button2: button_2 {
+			gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 2";
+			zephyr,code = <INPUT_KEY_2>;
+		};
+
+		button3: button_3 {
+			gpios = <&gpio1 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 3";
+			zephyr,code = <INPUT_KEY_3>;
+		};
+	};
+
+	aliases {
+		led0 = &led0;
+		led1 = &led1;
+		led2 = &led2;
+		led3 = &led3;
+		pwm-led0 = &pwm_led3;
+		sw0 = &button0;
+		sw1 = &button1;
+		sw2 = &button2;
+		sw3 = &button3;
+		watchdog0 = &wdt31;
+	};
+};
+
+&uart20 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart30 {
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&pwm20 {
+	status = "okay";
+	pinctrl-0 = <&pwm20_default>;
+	pinctrl-1 = <&pwm20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+/* Get a node label for wi-fi spi to use in shield files */
+wifi_spi: &spi22 {};
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15-pinctrl.dtsi b/boards/we/ophelia4ev/ophelia4ev_nrf54l15-pinctrl.dtsi
new file mode 100644
index 0000000000000..4a3b761796ba7
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15-pinctrl.dtsi
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	/omit-if-no-ref/ uart20_default: uart20_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RTS, 1, 6)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 1, 15)>,
+				<NRF_PSEL(UART_CTS, 1, 2)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart20_sleep: uart20_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 4)>,
+				<NRF_PSEL(UART_RX, 1, 15)>,
+				<NRF_PSEL(UART_RTS, 1, 6)>,
+				<NRF_PSEL(UART_CTS, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RTS, 2, 10)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 2, 7)>,
+				<NRF_PSEL(UART_CTS, 2, 9)>;
+			bias-pull-up;
+		};
+	};
+
+	/omit-if-no-ref/ uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RX, 2, 7)>,
+				<NRF_PSEL(UART_RTS, 2, 10)>,
+				<NRF_PSEL(UART_CTS, 2, 9)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi00_default: spi00_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
+				<NRF_PSEL(SPIM_MISO, 2, 4)>;
+		};
+	};
+
+	/omit-if-no-ref/ spi00_sleep: spi00_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 2)>,
+				<NRF_PSEL(SPIM_MISO, 2, 4)>;
+				low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_default: pwm20_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
+		};
+	};
+
+	/omit-if-no-ref/ pwm20_sleep: pwm20_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_default: grtc_default {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+		};
+	};
+
+	/omit-if-no-ref/ grtc_sleep: grtc_sleep {
+		group1 {
+			psels = <NRF_PSEL(GRTC_CLKOUT_FAST, 1, 8)>,
+				<NRF_PSEL(GRTC_CLKOUT_32K, 0, 4)>;
+			low-power-enable;
+		};
+	};
+};
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts
new file mode 100644
index 0000000000000..73b135891a8a9
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l15_cpuapp.dtsi>
+#include "ophelia4ev_common.dtsi"
+
+/ {
+	model = "Ophelia-IV EV Application MCU";
+	compatible = "we,ophelia4ev_nrf54l15-cpuapp";
+
+	chosen {
+		zephyr,console = &uart20;
+		zephyr,shell-uart = &uart20;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,flash = &cpuapp_rram;
+		zephyr,sram = &cpuapp_sram;
+		zephyr,uart-mcumgr = &uart20;
+		zephyr,bt-mon-uart = &uart20;
+		zephyr,bt-c2h-uart = &uart20;
+		zephyr,flash-controller = &rram_controller;
+		zephyr,ieee802154 = &ieee802154;
+	};
+};
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x0 DT_SIZE_K(64)>;
+		};
+
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x10000 DT_SIZE_K(324)>;
+		};
+
+		slot0_ns_partition: partition@61000 {
+			label = "image-0-nonsecure";
+			reg = <0x61000 DT_SIZE_K(324)>;
+		};
+
+		slot1_partition: partition@b2000 {
+			label = "image-1";
+			reg = <0xb2000 DT_SIZE_K(324)>;
+		};
+
+		slot1_ns_partition: partition@103000 {
+			label = "image-1-nonsecure";
+			reg = <0x103000 DT_SIZE_K(324)>;
+		};
+
+		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
+		storage_partition: partition@15c000 {
+			label = "storage";
+			reg = <0x15c000 DT_SIZE_K(36)>;
+		};
+	};
+};
+
+&cpuapp_sram {
+	status = "okay";
+};
+
+&lfxo {
+	load-capacitors = "internal";
+	load-capacitance-femtofarad = <15500>;
+};
+
+&hfxo {
+	load-capacitors = "internal";
+	load-capacitance-femtofarad = <15000>;
+};
+
+&regulators {
+	status = "okay";
+};
+
+&vregmain {
+	status = "okay";
+
+	regulator-initial-mode = <NRF5X_REG_MODE_DCDC>;
+};
+
+&grtc {
+	owned-channels = <0 1 2 3 4 5 6 7 8 9 10 11>;
+
+	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
+	child-owned-channels = <3 4 7 8 9 10 11>;
+
+	status = "okay";
+};
+
+&uart20 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
+
+&radio {
+	status = "okay";
+};
+
+&ieee802154 {
+	status = "okay";
+};
+
+&temp {
+	status = "okay";
+};
+
+&clock {
+	status = "okay";
+};
+
+&spi00 {
+	status = "okay";
+
+	cs-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
+	pinctrl-0 = <&spi00_default>;
+	pinctrl-1 = <&spi00_sleep>;
+	pinctrl-names = "default", "sleep";
+
+	mx25r64: mx25r6435f@0 {
+		compatible = "jedec,spi-nor";
+		status = "okay";
+		reg = <0>;
+		spi-max-frequency = <8000000>;
+
+		jedec-id = [c2 28 17];
+
+		sfdp-bfp = [
+			e5 20 f1 ff  ff ff ff 03  44 eb 08 6b  08 3b 04 bb
+			ee ff ff ff  ff ff 00 ff  ff ff 00 ff  0c 20 0f 52
+			10 d8 00 ff  23 72 f5 00  82 ed 04 cc  44 83 48 44
+			30 b0 30 b0  f7 c4 d5 5c  00 be 29 ff  f0 d0 ff ff
+		];
+
+		size = <67108864>;
+		has-dpd;
+		t-enter-dpd = <10000>;
+		t-exit-dpd = <35000>;
+	};
+};
+
+&adc {
+	status = "okay";
+};
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.yaml b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.yaml
new file mode 100644
index 0000000000000..87fee9c3d62bc
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: ophelia4ev/nrf54l15/cpuapp
+name: Ophelia4-EV-nRF54l15-Application
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - zephyr
+sysbuild: true
+ram: 188
+flash: 324
+supported:
+  - adc
+  - counter
+  - dmic
+  - gpio
+  - i2c
+  - pwm
+  - retained_mem
+  - spi
+  - watchdog
+  - i2s
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp_defconfig b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp_defconfig
new file mode 100644
index 0000000000000..80a40b5a79d93
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp_defconfig
@@ -0,0 +1,21 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Use internal LFCLK
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.dts b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.dts
new file mode 100644
index 0000000000000..b47b81affc44e
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.dts
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf54l15_cpuflpr.dtsi>
+#include "ophelia4ev_common.dtsi"
+
+/ {
+	model = "Ophelia-IV EV FLPR MCU";
+	compatible = "we,ophelia4ev_nrf54l15-cpuflpr";
+
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+		zephyr,code-partition = &cpuflpr_code_partition;
+		zephyr,flash = &cpuflpr_rram;
+		zephyr,sram = &cpuflpr_sram;
+	};
+};
+
+&cpuflpr_sram {
+	status = "okay";
+
+	/* size must be increased due to booting from SRAM */
+	reg = <0x20028000 DT_SIZE_K(96)>;
+
+	ranges = <0x0 0x20028000 0x18000>;
+};
+
+&cpuflpr_rram {
+	partitions {
+		compatible = "fixed-partitions";
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuflpr_code_partition: partition@0 {
+			label = "image-0";
+			reg = <0x0 DT_SIZE_K(96)>;
+		};
+	};
+};
+
+&grtc {
+	owned-channels = <3 4>;
+
+	status = "okay";
+};
+
+&uart30 {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpiote30 {
+	status = "okay";
+};
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.yaml b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.yaml
new file mode 100644
index 0000000000000..a302cf4a192d6
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: ophelia4ev/nrf54l15/cpuflpr
+name: Ophelia4-EV-nRF54L15-Fast-Lightweight-Peripheral-Processor
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 96
+flash: 96
+supported:
+  - counter
+  - gpio
+  - i2c
+  - spi
+  - watchdog
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr_defconfig b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr_defconfig
new file mode 100644
index 0000000000000..a0e86949608fb
--- /dev/null
+++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr_defconfig
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Execute from SRAM
+CONFIG_XIP=n
+
+# Use internal LFCLK
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
diff --git a/boards/we/orthosie1ev/doc/index.rst b/boards/we/orthosie1ev/doc/index.rst
index f6fdb4d554631..55f0afdb168a5 100644
--- a/boards/we/orthosie1ev/doc/index.rst
+++ b/boards/we/orthosie1ev/doc/index.rst
@@ -42,41 +42,7 @@ manual at `ESP32-C3 Technical Reference Manual`_.
 Supported Features
 ==================
 
-Currently Zephyr's ``we_orthosie1ev`` board target supports the following features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| USB-JTAG   | on-chip    | hardware interface                  |
-+------------+------------+-------------------------------------+
-| SPI Master | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| Timers     | on-chip    | counter                             |
-+------------+------------+-------------------------------------+
-| Watchdog   | on-chip    | watchdog                            |
-+------------+------------+-------------------------------------+
-| TRNG       | on-chip    | entropy                             |
-+------------+------------+-------------------------------------+
-| LEDC       | on-chip    | pwm                                 |
-+------------+------------+-------------------------------------+
-| SPI DMA    | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| TWAI       | on-chip    | can                                 |
-+------------+------------+-------------------------------------+
-| USB-CDC    | on-chip    | serial                              |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | adc                                 |
-+------------+------------+-------------------------------------+
-| Wi-Fi      | on-chip    |                                     |
-+------------+------------+-------------------------------------+
-| Bluetooth  | on-chip    |                                     |
-+------------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System requirements
 *******************
@@ -98,6 +64,8 @@ below to retrieve those files.
 Building & Flashing
 *******************
 
+.. zephyr:board-supported-runners::
+
 Simple boot
 ===========
 
@@ -139,7 +107,7 @@ To build the sample application using sysbuild use the command:
 .. zephyr-app-commands::
    :tool: west
    :zephyr-app: samples/hello_world
-   :board: orthosie1ev
+   :board: we_orthosie1ev
    :goals: build
    :west-args: --sysbuild
    :compact:
@@ -188,16 +156,16 @@ Build and flash applications as usual (see :ref:`build_an_application` and
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: orthosie1ev
+   :board: we_orthosie1ev
    :goals: build
 
-The usual ``flash`` target will work with the ``orthosie1ev`` board
+The usual ``flash`` target will work with the ``we_orthosie1ev`` board
 configuration. Here is an example for the :zephyr:code-sample:`hello_world`
 application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: orthosie1ev
+   :board: we_orthosie1ev
    :goals: flash
 
 Open the serial monitor using the following command:
@@ -212,7 +180,7 @@ message in the monitor:
 .. code-block:: console
 
    ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx *****
-   Hello World! orthosie1ev
+   Hello World! we_orthosie1ev
 
 Debugging
 *********
@@ -229,7 +197,7 @@ Here is an example for building the :zephyr:code-sample:`hello_world` applicatio
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: orthosie1ev
+   :board: we_orthosie1ev
    :goals: build flash
    :gen-args: -DOPENOCD=<path/to/bin/openocd> -DOPENOCD_DEFAULT_PATH=<path/to/openocd/share/openocd/scripts>
 
@@ -237,7 +205,7 @@ You can debug an application in the usual way. Here is an example for the :zephy
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: orthosie1ev
+   :board: we_orthosie1ev
    :goals: debug
 
 References
diff --git a/boards/we/orthosie1ev/we_orthosie1ev.dts b/boards/we/orthosie1ev/we_orthosie1ev.dts
index a0c27fc81bbf2..b6d2b9089880a 100644
--- a/boards/we/orthosie1ev/we_orthosie1ev.dts
+++ b/boards/we/orthosie1ev/we_orthosie1ev.dts
@@ -107,3 +107,7 @@
 &esp32_bt_hci {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/we/proteus2ev/board.cmake b/boards/we/proteus2ev/board.cmake
index 6b390dd00bafe..468999481af6d 100644
--- a/boards/we/proteus2ev/board.cmake
+++ b/boards/we/proteus2ev/board.cmake
@@ -4,6 +4,7 @@
 board_runner_args(jlink "--device=nRF52832_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52832" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/we/proteus2ev/board.yml b/boards/we/proteus2ev/board.yml
index d246b6d1b4d44..c6848fd786e0e 100644
--- a/boards/we/proteus2ev/board.yml
+++ b/boards/we/proteus2ev/board.yml
@@ -1,6 +1,6 @@
 board:
   name: we_proteus2ev
   full_name: Proteus-II-EV
-  vendor: wurth
+  vendor: we
   socs:
   - name: nrf52832
diff --git a/boards/we/proteus2ev/doc/index.rst b/boards/we/proteus2ev/doc/index.rst
index 938258249a159..ac65789b21efd 100644
--- a/boards/we/proteus2ev/doc/index.rst
+++ b/boards/we/proteus2ev/doc/index.rst
@@ -34,42 +34,7 @@ is 32.768 kHz. The frequency of the main clock is 32 MHz.
 Supported Features
 ==================
 
-The we_proteus2ev/nrf52832 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth            |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features are not supported by the Zephyr kernel.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -89,6 +54,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``we_proteus2ev/nrf52832`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
diff --git a/boards/we/proteus3ev/board.cmake b/boards/we/proteus3ev/board.cmake
index 8d1cbeacc8955..aa5959e43616a 100644
--- a/boards/we/proteus3ev/board.cmake
+++ b/boards/we/proteus3ev/board.cmake
@@ -4,6 +4,7 @@
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
 
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/we/proteus3ev/board.yml b/boards/we/proteus3ev/board.yml
index fa498a2801487..e6a496ef0faed 100644
--- a/boards/we/proteus3ev/board.yml
+++ b/boards/we/proteus3ev/board.yml
@@ -1,6 +1,6 @@
 board:
   name: we_proteus3ev
   full_name: Proteus-III-EV
-  vendor: wurth
+  vendor: we
   socs:
   - name: nrf52840
diff --git a/boards/we/proteus3ev/doc/index.rst b/boards/we/proteus3ev/doc/index.rst
index 8c8b855cc5dd5..b4d8bd0aede71 100644
--- a/boards/we/proteus3ev/doc/index.rst
+++ b/boards/we/proteus3ev/doc/index.rst
@@ -36,43 +36,7 @@ clock is 32 MHz.
 Supported Features
 ==================
 
-The we_proteus3ev/nrf52840 board configuration supports the following
-hardware features:
-
-+-----------+------------+----------------------+
-| Interface | Controller | Driver/Component     |
-+===========+============+======================+
-| ADC       | on-chip    | adc                  |
-+-----------+------------+----------------------+
-| CLOCK     | on-chip    | clock_control        |
-+-----------+------------+----------------------+
-| FLASH     | on-chip    | flash                |
-+-----------+------------+----------------------+
-| GPIO      | on-chip    | gpio                 |
-+-----------+------------+----------------------+
-| I2C(M)    | on-chip    | i2c                  |
-+-----------+------------+----------------------+
-| MPU       | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| NVIC      | on-chip    | arch/arm             |
-+-----------+------------+----------------------+
-| PWM       | on-chip    | pwm                  |
-+-----------+------------+----------------------+
-| RADIO     | on-chip    | Bluetooth,           |
-|           |            | ieee802154           |
-+-----------+------------+----------------------+
-| RTC       | on-chip    | system clock         |
-+-----------+------------+----------------------+
-| RTT       | Segger     | console              |
-+-----------+------------+----------------------+
-| SPI(M/S)  | on-chip    | spi                  |
-+-----------+------------+----------------------+
-| UART      | on-chip    | serial               |
-+-----------+------------+----------------------+
-| WDT       | on-chip    | watchdog             |
-+-----------+------------+----------------------+
-
-Other hardware features are not supported by the Zephyr kernel.
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -91,6 +55,8 @@ Push buttons
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``we_proteus3ev/nrf52840`` board configuration can be
 built, flashed, and debugged in the usual way. See
 :ref:`build_an_application` and :ref:`application_run` for more details on
diff --git a/boards/weact/blackpill_f401cc/doc/index.rst b/boards/weact/blackpill_f401cc/doc/index.rst
index e5ea1e7f699c7..fbd9ab4cfb3c9 100644
--- a/boards/weact/blackpill_f401cc/doc/index.rst
+++ b/boards/weact/blackpill_f401cc/doc/index.rst
@@ -37,35 +37,7 @@ hardware components:
 Supported Features
 ==================
 
-The Zephyr blackpill_f401cc board configuration supports the following
-hardware features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| NVIC       | on-chip    | nested vector interrupt controller  |
-+------------+------------+-------------------------------------+
-| SYSTICK    | on-chip    | system clock                        |
-+------------+------------+-------------------------------------+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| FLASH      | on-chip    | flash                               |
-+------------+------------+-------------------------------------+
-| SPI        | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | ADC Controller                      |
-+------------+------------+-------------------------------------+
-| USB OTG FS | on-chip    | USB device                          |
-+------------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/weact/blackpill_f401cc/blackpill_f401cc_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -101,6 +73,8 @@ to achieve a stable USB clock (42MHz).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 There are 2 main entry points for flashing STM32F4X SoCs, one using the ROM
 bootloader, and another by using the SWD debug port (which requires additional
 hardware). Flashing using the ROM bootloader requires a special activation
diff --git a/boards/weact/blackpill_f401ce/doc/index.rst b/boards/weact/blackpill_f401ce/doc/index.rst
index aa81976e7d90d..54045467befc5 100644
--- a/boards/weact/blackpill_f401ce/doc/index.rst
+++ b/boards/weact/blackpill_f401ce/doc/index.rst
@@ -37,35 +37,7 @@ hardware components:
 Supported Features
 ==================
 
-The Zephyr blackpill_f401ce board configuration supports the following
-hardware features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| NVIC       | on-chip    | nested vector interrupt controller  |
-+------------+------------+-------------------------------------+
-| SYSTICK    | on-chip    | system clock                        |
-+------------+------------+-------------------------------------+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| FLASH      | on-chip    | flash                               |
-+------------+------------+-------------------------------------+
-| SPI        | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | ADC Controller                      |
-+------------+------------+-------------------------------------+
-| USB OTG FS | on-chip    | USB device                          |
-+------------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/weact/blackpill_f401ce/blackpill_f401ce_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -106,6 +78,8 @@ to achieve a stable USB clock (42MHz).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 There are 2 main entry points for flashing STM32F4X SoCs, one using the ROM
 bootloader, and another by using the SWD debug port (which requires additional
 hardware). Flashing using the ROM bootloader requires a special activation
diff --git a/boards/weact/blackpill_f411ce/doc/index.rst b/boards/weact/blackpill_f411ce/doc/index.rst
index f045f331b8656..74a6df4200f5d 100644
--- a/boards/weact/blackpill_f411ce/doc/index.rst
+++ b/boards/weact/blackpill_f411ce/doc/index.rst
@@ -37,35 +37,7 @@ hardware components:
 Supported Features
 ==================
 
-The Zephyr blackpill_f411ce board configuration supports the following
-hardware features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| NVIC       | on-chip    | nested vector interrupt controller  |
-+------------+------------+-------------------------------------+
-| SYSTICK    | on-chip    | system clock                        |
-+------------+------------+-------------------------------------+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| FLASH      | on-chip    | flash                               |
-+------------+------------+-------------------------------------+
-| SPI        | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | ADC Controller                      |
-+------------+------------+-------------------------------------+
-| USB OTG FS | on-chip    | USB device                          |
-+------------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/weact/blackpill_f411ce/blackpill_f411ce_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -106,6 +78,8 @@ to achieve a stable USB clock (48MHz).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 There are 2 main entry points for flashing STM32F4X SoCs, one using the ROM
 bootloader, and another by using the SWD debug port (which requires additional
 hardware). Flashing using the ROM bootloader requires a special activation
diff --git a/boards/weact/mini_stm32h743/doc/index.rst b/boards/weact/mini_stm32h743/doc/index.rst
index 9dc96700d5bc9..c1ca99c2ea8eb 100644
--- a/boards/weact/mini_stm32h743/doc/index.rst
+++ b/boards/weact/mini_stm32h743/doc/index.rst
@@ -71,34 +71,7 @@ More information about STM32H743 can be found here:
 Supported Features
 ==================
 
-The mini_stm32h743 board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration per core can be found in the defconfig file:
-``boards/weact/mini_stm32h743/mini_stm32h743_defconfig``
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -137,6 +110,8 @@ Virtual COM port interface. Default communication settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The MiniSTM32H743 Core board facilitates firmware flashing via the USB DFU
 bootloader. This method simplifies the process of updating images, although
 it doesn't provide debugging capabilities. However, the board provides header
diff --git a/boards/weact/mini_stm32h7b0/Kconfig.defconfig b/boards/weact/mini_stm32h7b0/Kconfig.defconfig
index 4286c38d989c7..661935b903cf7 100644
--- a/boards/weact/mini_stm32h7b0/Kconfig.defconfig
+++ b/boards/weact/mini_stm32h7b0/Kconfig.defconfig
@@ -22,14 +22,6 @@ endif # LVGL
 
 endif # DISPLAY
 
-if USB_DEVICE_STACK
-
-config UART_CONSOLE
-	default CONSOLE
-
-config USB_DEVICE_INITIALIZE_AT_BOOT
-	default y
-
-endif # USB_DEVICE_STACK
+source "boards/common/usb/Kconfig.cdc_acm_serial.defconfig"
 
 endif # BOARD_MINI_STM32H7B0
diff --git a/boards/weact/mini_stm32h7b0/doc/index.rst b/boards/weact/mini_stm32h7b0/doc/index.rst
index 8cf425d55703d..9d1e201b13cc8 100644
--- a/boards/weact/mini_stm32h7b0/doc/index.rst
+++ b/boards/weact/mini_stm32h7b0/doc/index.rst
@@ -72,34 +72,7 @@ More information about STM32H7BO can be found here:
 Supported Features
 ==================
 
-The ``mini_stm32h7b0`` board target supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| WDT       | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| QSPI NOR  | on-chip    | off-chip flash                      |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-| DISPLAY   | on-chip    | display                             |
-+-----------+------------+-------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration per core can be found in the defconfig file:
-:zephyr_file:`boards/weact/mini_stm32h7b0/mini_stm32h7b0_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -138,6 +111,8 @@ Virtual COM port interface. Default communication settings are 115200 8N1.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The MiniSTM32H7B0 Core board facilitates firmware flashing via the USB DFU
 bootloader. This method simplifies the process of updating images, although
 it doesn't provide debugging capabilities. However, the board provides header
diff --git a/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts b/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts
index cc09b5dda6830..cce16f72fc30f 100644
--- a/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts
+++ b/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts
@@ -15,8 +15,6 @@
 	compatible = "weact,mini-stm32h7b0";
 
 	chosen {
-		zephyr,console = &usb_cdc_acm_uart;
-		zephyr,shell-uart = &usb_cdc_acm_uart;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,display = &st7735r_160x80;
@@ -132,12 +130,9 @@ zephyr_udc0: &usbotg_hs {
 	pinctrl-0 = <&usb_otg_hs_dm_pa11 &usb_otg_hs_dp_pa12>;
 	pinctrl-names = "default";
 	status = "okay";
-
-	usb_cdc_acm_uart: cdc_acm_uart {
-		compatible = "zephyr,cdc-acm-uart";
-	};
 };
 
+#include <../boards/common/usb/cdc_acm_serial.dtsi>
 
 &octospi1 {
 	pinctrl-names = "default";
diff --git a/boards/weact/mini_stm32h7b0/mini_stm32h7b0_defconfig b/boards/weact/mini_stm32h7b0/mini_stm32h7b0_defconfig
index 77c7a72061969..723197901d9ed 100644
--- a/boards/weact/mini_stm32h7b0/mini_stm32h7b0_defconfig
+++ b/boards/weact/mini_stm32h7b0/mini_stm32h7b0_defconfig
@@ -7,17 +7,5 @@ CONFIG_ARM_MPU=y
 # Enable HW stack protection
 CONFIG_HW_STACK_PROTECTION=y
 
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-
 # Enable GPIO
 CONFIG_GPIO=y
-
-# Logger cannot use itself to log
-CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
-
-# Enable USB
-CONFIG_USB_DEVICE_STACK=y
diff --git a/boards/weact/stm32f405_core/doc/index.rst b/boards/weact/stm32f405_core/doc/index.rst
index 3afc69b79d01e..ec237b6faa628 100644
--- a/boards/weact/stm32f405_core/doc/index.rst
+++ b/boards/weact/stm32f405_core/doc/index.rst
@@ -45,35 +45,7 @@ hardware components:
 Supported Features
 ==================
 
-The Zephyr weact_stm32f405_core board configuration supports the following
-hardware features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| NVIC       | on-chip    | nested vector interrupt controller  |
-+------------+------------+-------------------------------------+
-| SYSTICK    | on-chip    | system clock                        |
-+------------+------------+-------------------------------------+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| PINMUX     | on-chip    | pinmux                              |
-+------------+------------+-------------------------------------+
-| FLASH      | on-chip    | flash                               |
-+------------+------------+-------------------------------------+
-| SPI        | on-chip    | spi                                 |
-+------------+------------+-------------------------------------+
-| I2C        | on-chip    | i2c                                 |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | ADC Controller                      |
-+------------+------------+-------------------------------------+
-| USB OTG FS | on-chip    | USB device                          |
-+------------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/weact/stm32f405_core/weact_stm32f405_core_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -103,6 +75,8 @@ to achieve a stable USB clock (48MHz).
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 There are 2 main entry points for flashing STM32F4X SoCs, one using the ROM
 bootloader, and another by using the SWD debug port (which requires additional
 hardware). Flashing using the ROM bootloader requires a special activation
diff --git a/boards/weact/stm32g431_core/doc/index.rst b/boards/weact/stm32g431_core/doc/index.rst
index 862398794f60e..985d00b1a101d 100644
--- a/boards/weact/stm32g431_core/doc/index.rst
+++ b/boards/weact/stm32g431_core/doc/index.rst
@@ -28,28 +28,7 @@ considered reserved for USB-C and not available for other applications.
 Supported Features
 ==================
 
-The Zephyr weact_stm32g431_core board configuration supports the following hardware
-features:
-
-+------------+------------+-------------------------------------+
-| Interface  | Controller | Driver/Component                    |
-+============+============+=====================================+
-| NVIC       | on-chip    | nested vector interrupt controller  |
-+------------+------------+-------------------------------------+
-| UART       | on-chip    | serial port                         |
-+------------+------------+-------------------------------------+
-| GPIO       | on-chip    | gpio                                |
-+------------+------------+-------------------------------------+
-| ADC        | on-chip    | ADC Controller                      |
-+------------+------------+-------------------------------------+
-| USB        | on-chip    | USB device                          |
-+------------+------------+-------------------------------------+
-| UCPD       | on-chip    | ucpd                                |
-+------------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-
-:zephyr_file:`boards/weact/stm32g431_core/weact_stm32g431_core_defconfig`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -101,6 +80,8 @@ PLL instead of the internal 48 MHz oscillator.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 The MCU is normally programmed using the ROM bootloader or the exposed SWD port.
 
 Please note that some laptops may not detect the ROM bootloader correctly if the CCx
diff --git a/boards/weact/stm32h5_core/Kconfig.weact_stm32h5_core b/boards/weact/stm32h5_core/Kconfig.weact_stm32h5_core
new file mode 100644
index 0000000000000..999012b1955ed
--- /dev/null
+++ b/boards/weact/stm32h5_core/Kconfig.weact_stm32h5_core
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Kacper Brzostowski
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_WEACT_STM32H5_CORE
+	select SOC_STM32H562XX
diff --git a/boards/weact/stm32h5_core/board.cmake b/boards/weact/stm32h5_core/board.cmake
new file mode 100644
index 0000000000000..2288b4765efc8
--- /dev/null
+++ b/boards/weact/stm32h5_core/board.cmake
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Kacper Brzostowski
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(dfu-util "--pid=0483:df11" "--alt=0" "--dfuse")
+
+# Keep first
+include(${ZEPHYR_BASE}/boards/common/dfu-util.board.cmake)
diff --git a/boards/weact/stm32h5_core/board.yml b/boards/weact/stm32h5_core/board.yml
new file mode 100644
index 0000000000000..ad89ef703655f
--- /dev/null
+++ b/boards/weact/stm32h5_core/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: weact_stm32h5_core
+  full_name: STM32H5 Core Board
+  vendor: weact
+  socs:
+    - name: stm32h562xx
diff --git a/boards/weact/stm32h5_core/doc/index.rst b/boards/weact/stm32h5_core/doc/index.rst
new file mode 100644
index 0000000000000..8ff4c9167359a
--- /dev/null
+++ b/boards/weact/stm32h5_core/doc/index.rst
@@ -0,0 +1,196 @@
+.. zephyr:board:: weact_stm32h5_core
+
+Overview
+********
+
+The ``weact_stm32h5_core`` board is a compact development board equipped with
+an STM32H562RGT6 microcontroller. It features basic set of peripherals:
+user LED and button, microSD |trade| card slot, and combined SWD & UART header.
+
+Key Features
+
+- STM32 microcontroller in LQFP64 package
+- USB OTG or full-speed device
+- 1 user LED
+- User, boot, and reset push-buttons
+- 32.768 kHz and 8MHz HSE crystal oscillators
+- Board connectors:
+
+   - microSD |trade| card
+   - USB Type-C Connector
+   - SWD & UART header for external debugger
+   - 2x 30-pin GPIO connector
+
+More information about the board can be found on the `WeAct GitHub`_.
+
+Hardware
+********
+
+The ``weact_stm32h5_core`` board provides the following hardware components:
+
+   - STM32H562RGT6 in LQFP64 package
+   - ARM 32-bit Cortex-M33 CPU with FPU
+   - CORDIC for trigonometric functions acceleration
+   - FMAC (filter mathematical accelerator)
+   - CRC calculation unit
+   - 240 MHz max CPU frequency
+   - VDD from 1.71 V to 3.6 V
+   - 1MB Flash, 2 banks read-while-write
+   - 640kB SRAM
+   - 4 Kbytes of backup SRAM available in the lowest power modes
+   - 2x watchdogs
+   - 2x SysTick timer
+   - 32-bit timers (2)
+   - 16-bit advanced motor control timers (2)
+   - 16-bit low power timers (6)
+   - 16-bit timers (10)
+   - 1x USB Type-C / USB power-delivery controller
+   - 1x USB 2.0 full-speed host and device
+   - 4x I2C FM+ interfaces (SMBus/PMBus)
+   - 1x I3C interface
+   - 12x U(S)ARTS (ISO7816 interface, LIN, IrDA, modem control)
+   - 1x LP UART
+   - 6x SPIs including 3 muxed with full-duplex I2S
+   - 2x SAI
+   - 1x FDCAN
+   - Flexible external memory controller with up to 16-bit data bus: SRAM, PSRAM, FRAM, SDRAM/LPSDR SDRAM, NOR/NAND memories
+   - 1x OCTOSPI memory interface with on-the-fly decryption and support for serial PSRAM/NAND/NOR, Hyper RAM/Flash frame formats
+   - 1x SD/SDIO/MMC interfaces
+   - 1x HDMI-CEC
+   - 2x 12-bit ADC with up to 5 MSPS in 12-bit
+   - 1x 12-bit D/A with 2 channels
+   - 1x Digital temperature sensor
+
+More information about STM32H562RG can be found here:
+
+- `STM32H562RG on www.st.com`_
+- `STM32H562 reference manual`_
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Pin Mapping
+===========
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+
+The ``weact_stm32h5_core`` board is configured as follows
+
+- USER_LED : PB2
+- USER_PB : PC13
+- SDMMC1 CLK/DCMD/CD/D0/D1/D2/D3 : PC12/PD2/PD4/PC8/PC9/PC10/PC11 (microSD card)
+- USB DM/DP : PA11/PA12 (USB CDC ACM)
+- UART on debug header : RX/TX - pA10/PA9
+
+System Clock
+============
+
+The STM32H562RG System Clock can be driven by an internal or external oscillator,
+as well as by the main PLL clock. By default, the System clock is driven
+by the PLL clock at 240MHz. PLL clock is fed by a 8MHz external clock.
+
+Serial Port (USB CDC ACM)
+=========================
+
+The Zephyr console output is assigned to the USB CDC ACM virtual serial port.
+Virtual COM port interface. Default communication settings are 115200 8N1.
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+The ``weact_stm32h5_core`` board facilitates firmware flashing via the USB DFU
+bootloader. This method simplifies the process of updating images, although
+it doesn't provide debugging capabilities. However, the board provides header
+pins for the Serial Wire Debug (SWD) interface, which can be used to connect
+an external debugger, such as ST-Link.
+
+Flashing
+========
+
+To activate the bootloader, follow these steps:
+
+1. Press and hold the BOOT0 key.
+2. While still holding the BOOT0 key, press and release the RESET key.
+3. Wait for 0.5 seconds, then release the BOOT0 key.
+
+Upon successful execution of these steps, the device will transition into
+bootloader mode and present itself as a USB DFU Mode device. You can program
+the device using the west tool or the STM32CubeProgrammer.
+
+Flashing an application to ``weact_stm32h5_core``
+-------------------------------------------------
+
+Here is an example for the :zephyr:code-sample:`hello_world` application.
+
+First, put the board in bootloader mode as described above. Then build and flash
+the application in the usual way. Just add ``CONFIG_BOOT_DELAY=5000`` to the
+configuration, so that USB CDC ACM is initialized before any text is printed,
+as below:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: weact_stm32h5_core
+   :goals: build flash
+   :gen-args: -DCONFIG_BOOT_DELAY=5000
+
+Run a serial host program to connect with your board:
+
+.. code-block:: console
+
+   $ minicom -D <tty_device> -b 115200
+
+Then, press the RESET button, you should see the following message after few seconds:
+
+.. code-block:: console
+
+   Hello World! weact_stm32h5_core
+
+Replace :code:`<tty_device>` with the port where the board can be found.
+For example, under Linux, :code:`/dev/ttyACM0`.
+
+Debugging
+---------
+
+This current Zephyr port does not support debugging.
+
+Testing the LEDs in the ``weact_stm32h5_core``
+**********************************************
+
+There is a sample that allows to test that LED on the board are working
+properly with Zephyr:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: weact_stm32h5_core
+   :goals: build flash
+   :gen-args: -DCONFIG_BOOT_DELAY=5000
+
+You can build and flash the examples to make sure Zephyr is running correctly on
+your board. The LED definitions can be found in
+:zephyr_file:`boards/weact/stm32h5_core/weact_stm32h5_core.dts`.
+
+Testing shell over USB in the ``weact_stm32h5_core``
+****************************************************
+
+There is a sample that allows to test shell interface over USB CDC ACM interface
+with Zephyr:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/shell/shell_module
+   :board: weact_stm32h5_core
+   :goals: build flash
+   :gen-args: -DCONFIG_BOOT_DELAY=5000
+
+.. _WeAct GitHub:
+   https://github.com/WeActStudio/WeActStudio.STM32H5_64Pin_CoreBoard
+
+.. _STM32H562RG on www.st.com:
+   https://www.st.com/en/microcontrollers-microprocessors/stm32h562rg.html
+
+.. _STM32H562 reference manual:
+   https://www.st.com/resource/en/reference_manual/rm0481-stm32h52333xx-stm32h56263xx-and-stm32h573xx-armbased-32bit-mcus-stmicroelectronics.pdf
diff --git a/boards/weact/stm32h5_core/weact_stm32h5_core.dts b/boards/weact/stm32h5_core/weact_stm32h5_core.dts
new file mode 100644
index 0000000000000..1d39eea4c2018
--- /dev/null
+++ b/boards/weact/stm32h5_core/weact_stm32h5_core.dts
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2025 Kacper Brzostowski
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/h5/stm32h562Xg.dtsi>
+#include <st/h5/stm32h562rgtx-pinctrl.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "WeAct Studio STM32H5 Core Board";
+	compatible = "weact,stm32h5-core";
+
+	chosen {
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &sram1;
+		zephyr,flash = &flash0;
+	};
+
+	aliases {
+		led0 = &led_0;
+		sw0 = &button_0;
+		watchdog0 = &iwdg;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_0: led0 {
+			gpios = <&gpiob 2 GPIO_ACTIVE_HIGH>;
+			label = "User LED";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+
+		button_0: button0 {
+			label = "User Button";
+			gpios = <&gpioc 13 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+	};
+};
+
+&sdmmc1 {
+	pinctrl-0 = <&sdmmc1_d0_pc8 &sdmmc1_d1_pc9
+				&sdmmc1_d2_pc10 &sdmmc1_d3_pc11
+				&sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>;
+	cd-gpios = <&gpioa 8 GPIO_ACTIVE_LOW>;
+	pinctrl-names = "default";
+	cd-gpios = <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+	status = "okay";
+};
+
+&clk_lsi {
+	status = "okay";
+};
+
+&clk_lse {
+	status = "okay";
+};
+
+&clk_hsi {
+	status = "okay";
+};
+
+&clk_hse {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(8)>;
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(240)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <2>;
+	apb2-prescaler = <1>;
+	apb3-prescaler = <2>;
+};
+
+&pll {
+	div-m = <2>;
+	mul-n = <120>;
+	div-p = <2>;
+	div-q = <3>;
+	div-r = <2>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rtc {
+	clocks = <&rcc STM32_CLOCK_BUS_APB3 0x00200000>,
+			<&rcc STM32_SRC_LSE RTC_SEL(1)>;
+	status = "okay";
+};
+
+stm32_lp_tick_source: &lptim4 {
+	clocks = <&rcc STM32_CLOCK_BUS_APB3 0x2000>,
+			<&rcc STM32_SRC_LSI LPTIM4_SEL(4)>;
+	status = "okay";
+};
+
+&iwdg {
+	status = "okay";
+};
+
+&usart1 {
+	status = "okay";
+	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
+
+&rng {
+	status = "okay";
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_nss_pa4 &spi1_sck_pa5 &spi1_miso_pa6 &spi1_mosi_pa7>;
+	pinctrl-names = "default";
+	cs-gpios = <&gpioa 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+	status = "okay";
+};
+
+&fdcan1 {
+	pinctrl-0 = <&fdcan1_rx_pb8 &fdcan1_tx_pb7>;
+	pinctrl-names = "default";
+	clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000200>,
+		<&rcc STM32_SRC_PLL1_Q FDCAN_SEL(1)>;
+	clk-divider = <2>;
+	status = "okay";
+};
+
+zephyr_udc0: &usb {
+	pinctrl-0 = <&usb_dm_pa11 &usb_dp_pa12>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 DT_SIZE_K(64)>;
+		};
+
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x00010000 DT_SIZE_K(448)>;
+		};
+
+		slot1_partition: partition@80000 {
+			label = "image-1";
+			reg = <0x00080000 DT_SIZE_K(448)>;
+		};
+
+		storage_partition: partition@f0000 {
+			label = "storage";
+			reg = <0x000f0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/boards/weact/stm32h5_core/weact_stm32h5_core.yaml b/boards/weact/stm32h5_core/weact_stm32h5_core.yaml
new file mode 100644
index 0000000000000..942b2f55025bb
--- /dev/null
+++ b/boards/weact/stm32h5_core/weact_stm32h5_core.yaml
@@ -0,0 +1,20 @@
+identifier: weact_stm32h5_core
+name: WeAct Studio STM32H5 Core Board
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+ram: 640
+flash: 1024
+supported:
+  - gpio
+  - can
+  - uart
+  - entropy
+  - spi
+  - usb_device
+  - rtc
+  - watchdog
+vendor: weact
diff --git a/boards/weact/stm32h5_core/weact_stm32h5_core_defconfig b/boards/weact/stm32h5_core/weact_stm32h5_core_defconfig
new file mode 100644
index 0000000000000..4b8a61df364a4
--- /dev/null
+++ b/boards/weact/stm32h5_core/weact_stm32h5_core_defconfig
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Kacper Brzostowski
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# Console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable HW stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable GPIO
+CONFIG_GPIO=y
diff --git a/boards/weact/usb2canfdv1/doc/index.rst b/boards/weact/usb2canfdv1/doc/index.rst
index 1ea39dcd4be2e..807e44659ce81 100644
--- a/boards/weact/usb2canfdv1/doc/index.rst
+++ b/boards/weact/usb2canfdv1/doc/index.rst
@@ -15,28 +15,7 @@ terminal block for connecting to the CAN bus, and three LEDs.
 Supported Features
 ==================
 
-The ``usb2canfdv1`` board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | flash memory                        |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | USB                                 |
-+-----------+------------+-------------------------------------+
-| FDCAN1    | on-chip    | CAN controller                      |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/weact/usb2canfdv1/usb2canfdv1_defconfig`.
-
-Other hardware features are not currently supported by the port.
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
@@ -48,6 +27,8 @@ MHz.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
 
diff --git a/boards/wemos/esp32s2_lolin_mini/doc/index.rst b/boards/wemos/esp32s2_lolin_mini/doc/index.rst
index c9ce4b2306821..9fadc278205e2 100644
--- a/boards/wemos/esp32s2_lolin_mini/doc/index.rst
+++ b/boards/wemos/esp32s2_lolin_mini/doc/index.rst
@@ -27,11 +27,19 @@ The features include the following:
   - DAC
   - LED PWM with up to 8 channels
 
+Hardware
+********
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
 System requirements
 *******************
 
 Prerequisites
--------------
+=============
 
 Espressif HAL requires WiFi and Bluetooth binary blobs in order work. Run the command
 below to retrieve those files.
@@ -45,7 +53,9 @@ below to retrieve those files.
    It is recommended running the command above after :file:`west update`.
 
 Building & Flashing
--------------------
+===================
+
+.. zephyr:board-supported-runners::
 
 Build and flash applications as usual (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.dts b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
index 058cce83a2b22..3605429bfa425 100644
--- a/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
+++ b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
@@ -89,3 +89,7 @@
 &wdt0 {
 	status = "okay";
 };
+
+&wifi {
+	status = "okay";
+};
diff --git a/boards/witte/linum/doc/index.rst b/boards/witte/linum/doc/index.rst
index 43466abdfc88c..e5da27ad8c691 100644
--- a/boards/witte/linum/doc/index.rst
+++ b/boards/witte/linum/doc/index.rst
@@ -47,50 +47,7 @@ More information about the board, can be found at the `Witte Linum website`_.
 Supported Features
 ==================
 
-The Zephyr Linum board configuration supports the following hardware
-features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| UART      | on-chip    | serial port                         |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | counter                             |
-+-----------+------------+-------------------------------------+
-| I2C       | on-chip    | i2c                                 |
-+-----------+------------+-------------------------------------+
-| PWM       | on-chip    | pwm                                 |
-+-----------+------------+-------------------------------------+
-| ADC       | on-chip    | adc                                 |
-+-----------+------------+-------------------------------------+
-| RNG       | on-chip    | True Random number generator        |
-+-----------+------------+-------------------------------------+
-| ETHERNET  | on-chip    | ethernet                            |
-+-----------+------------+-------------------------------------+
-| SPI       | on-chip    | spi                                 |
-+-----------+------------+-------------------------------------+
-| USB       | on-chip    | usb_device                          |
-+-----------+------------+-------------------------------------+
-| CAN/CANFD | on-chip    | canbus                              |
-+-----------+------------+-------------------------------------+
-| LTDC      | on-chip    | LCD Interface                       |
-+-----------+------------+-------------------------------------+
-| FMC       | on-chip    | memc (SDRAM)                        |
-+-----------+------------+-------------------------------------+
-| SDMMC     | on-chip    | disk access                         |
-+-----------+------------+-------------------------------------+
-
-Other hardware features are not yet supported on this Zephyr port.
-
-The default configuration can be found in the defconfig file:
-:zephyr_file:`boards/witte/linum/linum_defconfig`
-
+.. zephyr:board-supported-hw::
 
 Default Zephyr Peripheral Mapping:
 ----------------------------------
@@ -348,6 +305,8 @@ driven by the PLL clock at 480MHz, driven by an 25MHz high-speed external clock.
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Applications for the ``linum`` board configuration can be built and
 flashed in the usual way (see :ref:`build_an_application` and
 :ref:`application_run` for more details).
diff --git a/boards/witte/linum/linum.dts b/boards/witte/linum/linum.dts
index fe2280ec11726..0453b7ab568f1 100644
--- a/boards/witte/linum/linum.dts
+++ b/boards/witte/linum/linum.dts
@@ -238,6 +238,8 @@ zephyr_udc0: &usbotg_fs {
 		     &eth_txd0_pg13
 		     &eth_txd1_pg14>;
 	pinctrl-names = "default";
+	phy-connection-type = "rmii";
+	phy-handle = <&eth_phy>;
 };
 
 &mdio {
@@ -245,10 +247,9 @@ zephyr_udc0: &usbotg_fs {
 	pinctrl-0 = <&eth_mdio_pa2 &eth_mdc_pc1>;
 	pinctrl-names = "default";
 
-	ethernet-phy@0 {
+	eth_phy: ethernet-phy@0 {
 		compatible = "microchip,ksz8081";
 		reg = <0x00>;
-		status = "okay";
 		microchip,interface-type = "rmii-25MHz";
 	};
 };
diff --git a/boards/wiznet/w5500_evb_pico/board.yml b/boards/wiznet/w5500_evb_pico/board.yml
index eb4eed60b88bd..e80be185286fe 100644
--- a/boards/wiznet/w5500_evb_pico/board.yml
+++ b/boards/wiznet/w5500_evb_pico/board.yml
@@ -1,6 +1,6 @@
 board:
   name: w5500_evb_pico
-  full_name: W5500 Evaluation Pico
+  full_name: W5500-EVB-Pico
   vendor: wiznet
   socs:
   - name: rp2040
diff --git a/boards/wiznet/w5500_evb_pico/doc/index.rst b/boards/wiznet/w5500_evb_pico/doc/index.rst
index 4763f5e53982a..c05edf5a81895 100644
--- a/boards/wiznet/w5500_evb_pico/doc/index.rst
+++ b/boards/wiznet/w5500_evb_pico/doc/index.rst
@@ -1,7 +1,4 @@
-.. _w5500_evb_pico:
-
-Wiznet W5500 Evaluation Pico
-############################
+.. zephyr:board:: w5500_evb_pico
 
 Overview
 ********
@@ -30,67 +27,10 @@ Hardware
 - 1 Watchdog timer peripheral
 - Wiznet W5500 Ethernet MAC/PHY
 
-
-.. figure:: img/w5500_evb_pico_side.png
-     :align: center
-     :alt: W5500 Evaluation Board
-
-     Wiznet W5500_EVB_PICO evaluation board (Image courtesy of Wiznet)
-
 Supported Features
 ==================
 
-The w5500_evb_pico board configuration supports the following
-hardware features:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Peripheral
-     - Kconfig option
-     - Devicetree compatible
-   * - NVIC
-     - N/A
-     - :dtcompatible:`arm,v6m-nvic`
-   * - UART
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart`
-   * - GPIO
-     - :kconfig:option:`CONFIG_GPIO`
-     - :dtcompatible:`raspberrypi,pico-gpio`
-   * - ADC
-     - :kconfig:option:`CONFIG_ADC`
-     - :dtcompatible:`raspberrypi,pico-adc`
-   * - I2C
-     - :kconfig:option:`CONFIG_I2C`
-     - :dtcompatible:`snps,designware-i2c`
-   * - SPI
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi`
-   * - USB Device
-     - :kconfig:option:`CONFIG_USB_DEVICE_STACK`
-     - :dtcompatible:`raspberrypi,pico-usbd`
-   * - HWINFO
-     - :kconfig:option:`CONFIG_HWINFO`
-     - N/A
-   * - Watchdog Timer (WDT)
-     - :kconfig:option:`CONFIG_WATCHDOG`
-     - :dtcompatible:`raspberrypi,pico-watchdog`
-   * - PWM
-     - :kconfig:option:`CONFIG_PWM`
-     - :dtcompatible:`raspberrypi,pico-pwm`
-   * - Flash
-     - :kconfig:option:`CONFIG_FLASH`
-     - :dtcompatible:`raspberrypi,pico-flash`
-   * - UART (PIO)
-     - :kconfig:option:`CONFIG_SERIAL`
-     - :dtcompatible:`raspberrypi,pico-uart-pio`
-   * - SPI (PIO)
-     - :kconfig:option:`CONFIG_SPI`
-     - :dtcompatible:`raspberrypi,pico-spi-pio`
-   * - W5500 Ethernet
-     - :kconfig:option:`CONFIG_NETWORKING`
-     - :dtcompatible:`wiznet,w5500`
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========
@@ -134,6 +74,8 @@ Default Zephyr Peripheral Mapping:
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 
@@ -172,7 +114,7 @@ interface that can be used to program and debug the on board RP2040. This
 interface can be utilized by OpenOCD. To use it with the RP2040, OpenOCD
 version 0.12.0 or later is needed.
 
-If you are using a Debian based system (including RaspberryPi OS, Ubuntu. and
+If you are using a Debian based system (including Raspberry Pi OS, Ubuntu, and
 more), using the `pico_setup.sh`_ script is a convenient way to set up the
 forked version of OpenOCD.
 
diff --git a/boards/wiznet/w5500_evb_pico2/Kconfig.defconfig b/boards/wiznet/w5500_evb_pico2/Kconfig.defconfig
new file mode 100644
index 0000000000000..1af3e24b6f085
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/Kconfig.defconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_W5500_EVB_PICO2
+
+if NETWORKING
+
+config NET_L2_ETHERNET
+	default y
+
+endif # NETWORKING
+
+config USB_SELF_POWERED
+	default n
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 150000000
+
+endif # BOARD_W5500_EVB_PICO2
diff --git a/boards/wiznet/w5500_evb_pico2/Kconfig.w5500_evb_pico2 b/boards/wiznet/w5500_evb_pico2/Kconfig.w5500_evb_pico2
new file mode 100644
index 0000000000000..ef3da1e97c306
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/Kconfig.w5500_evb_pico2
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_W5500_EVB_PICO2
+	select SOC_RP2350A_M33 if BOARD_W5500_EVB_PICO2_RP2350A_M33
diff --git a/boards/wiznet/w5500_evb_pico2/board.cmake b/boards/wiznet/w5500_evb_pico2/board.cmake
new file mode 100644
index 0000000000000..feae063129ac7
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/board.cmake
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
+	set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
+endif()
+
+board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
+board_runner_args(openocd --cmd-pre-init "source [find target/rp2350.cfg]")
+
+# The adapter speed is expected to be set by interface configuration.
+# The Raspberry Pi's OpenOCD fork doesn't, so match their documentation at
+# https://www.raspberrypi.com/documentation/microcontrollers/debug-probe.html#debugging-with-swd
+board_runner_args(openocd --cmd-pre-init "set_adapter_speed_if_not_set 5000")
+
+board_runner_args(uf2 "--board-id=RP2350")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
diff --git a/boards/wiznet/w5500_evb_pico2/board.yml b/boards/wiznet/w5500_evb_pico2/board.yml
new file mode 100644
index 0000000000000..61a534601dc30
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: w5500_evb_pico2
+  full_name: W5500-EVB-Pico2
+  vendor: wiznet
+  socs:
+  - name: rp2350a
diff --git a/boards/wiznet/w5500_evb_pico2/doc/img/w5500_evb_pico2.webp b/boards/wiznet/w5500_evb_pico2/doc/img/w5500_evb_pico2.webp
new file mode 100644
index 0000000000000..cd0ced64165d4
Binary files /dev/null and b/boards/wiznet/w5500_evb_pico2/doc/img/w5500_evb_pico2.webp differ
diff --git a/boards/wiznet/w5500_evb_pico2/doc/index.rst b/boards/wiznet/w5500_evb_pico2/doc/index.rst
new file mode 100644
index 0000000000000..4ddcdd8d7f66e
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/doc/index.rst
@@ -0,0 +1,138 @@
+.. zephyr:board:: w5500_evb_pico2
+
+Overview
+********
+
+W5500-EVB-Pico2 is a microcontroller evaluation board based on the Raspberry
+Pi RP2350A and fully hardwired TCP/IP controller W5500 - and basically works
+the same as Raspberry Pi Pico2 board but with additional Ethernet via W5500.
+The USB bootloader allows the ability to flash without any adapter, in a
+drag-and-drop manner. It is also possible to flash and debug the boards with
+their SWD interface, using an external adapter.
+
+Hardware
+********
+
+- Dual core Arm Cortex-M33 or Hazard3 processor running up to 133MHz
+- 520KB on-chip SRAM
+- 16MB on-board QSPI flash with XIP capabilities
+- 26 GPIO pins
+- 3 Analog inputs
+- 2 UART peripherals
+- 2 SPI controllers
+- 2 I2C controllers
+- 16 PWM channels
+- USB 1.1 controller (host/device)
+- 3 Programmable I/O (PIO) for custom peripherals
+- On-board LED
+- 1 Watchdog timer peripheral
+- Wiznet W5500 Ethernet MAC/PHY
+
+Supported Features
+==================
+
+.. zephyr:board-supported-hw::
+
+Pin Mapping
+===========
+
+The peripherals of the RP2350A SoC can be routed to various pins on the board.
+The configuration of these routes can be modified through DTS. Please refer to
+the datasheet to see the possible routings for each peripheral.
+
+External pin mapping on the W5500_EVB_PICO2 is identical to the Raspberry Pi
+Pico2. Since GPIO 25 is routed to the on-board LED on, similar to the Raspberry
+Pi Pico, the blinky example works as intended. The W5500 is routed to the SPI0
+(P16-P19), with the reset and interrupt signal for the W5500 routed to P20 and
+P21, respectively. All of these are shared with the edge connector on the
+board.
+
+Refer to `W55500 Evaluation Board Pico2 Documentation`_ for a board schematic and
+other certifications.
+
+Default Zephyr Peripheral Mapping:
+----------------------------------
+
+.. rst-class:: rst-columns
+
+- UART0_TX : P0
+- UART0_RX : P1
+- I2C0_SDA : P4
+- I2C0_SCL : P5
+- I2C1_SDA : P14
+- I2C1_SCL : P15
+- SPI0_RX : P16
+- SPI0_CSN : P17
+- SPI0_SCK : P18
+- SPI0_TX : P19
+- W5500 Reset : P20
+- W5500 Interrupt : P21
+- ADC_CH0 : P26
+- ADC_CH1 : P27
+- ADC_CH2 : P28
+- ADC_CH3 : P29
+
+Programming and Debugging
+*************************
+
+.. zephyr:board-supported-runners::
+
+Flashing
+========
+
+Using OpenOCD
+-------------
+
+The overall explanation regarding flashing and debugging is the same as or
+``rpi_pico``.
+See :ref:`rpi_pico_flashing_using_openocd`. in ``rpi_pico`` documentation.
+
+A typical build command for w5500_evb_pico2 is as follows.
+This assumes a CMSIS-DAP adapter such as the Raspberry Pi Debug Probe,
+but if you are using something else, specify ``RPI_PICO_DEBUG_ADAPTER``.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: w5500_evb_pico2
+   :goals: build flash
+   :gen-args: -DOPENOCD=/usr/local/bin/openocd
+
+Using UF2
+---------
+
+If you don't have an SWD adapter, you can flash the Raspberry Pi Pico with
+a UF2 file. By default, building an app for this board will generate a
+:file:`build/zephyr/zephyr.uf2` file. If the Pico is powered on with the ``BOOTSEL``
+button pressed, it will appear on the host as a mass storage device. The
+UF2 file should be drag-and-dropped to the device, which will flash the Pico.
+
+Debugging
+=========
+
+The SWD interface can also be used to debug the board. To achieve this, you can
+either use SEGGER JLink or OpenOCD.
+
+Using OpenOCD
+-------------
+
+Install OpenOCD as described for flashing the board.
+
+Here is an example for debugging the :zephyr:code-sample:`blinky` application.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/basic/blinky
+   :board: w5500_evb_pico2
+   :maybe-skip-config:
+   :goals: debug
+   :gen-args: -DOPENOCD=/usr/local/bin/openocd
+
+.. target-notes::
+
+.. _pico_setup.sh:
+  https://raw.githubusercontent.com/raspberrypi/pico-setup/master/pico_setup.sh
+
+.. _Getting Started with Raspberry Pi Pico:
+  https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf
+
+.. _W55500 Evaluation Board Pico2 Documentation:
+  https://docs.wiznet.io/Product/iEthernet/W5500/w5500-evb-pico2
diff --git a/boards/wiznet/w5500_evb_pico2/support/openocd.cfg b/boards/wiznet/w5500_evb_pico2/support/openocd.cfg
new file mode 100644
index 0000000000000..0f833247bc60e
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/support/openocd.cfg
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+# Checking and set 'adapter speed'.
+# Set the adaptor speed, if unset, and given as an argument.
+proc set_adapter_speed_if_not_set { speed } {
+	puts "checking adapter speed..."
+	if { [catch {adapter speed} ret] } {
+		adapter speed $speed
+	}
+}
diff --git a/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2-pinctrl.dtsi b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2-pinctrl.dtsi
new file mode 100644
index 0000000000000..dffd24d8aeaa6
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2-pinctrl.dtsi
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021, Yonatan Schachter
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/rpi-pico-rp2350a-pinctrl.h>
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			pinmux = <UART0_TX_P0>;
+		};
+
+		group2 {
+			pinmux = <UART0_RX_P1>;
+			input-enable;
+		};
+	};
+
+	i2c0_default: i2c0_default {
+		group1 {
+			pinmux = <I2C0_SDA_P4>, <I2C0_SCL_P5>;
+			input-enable;
+			input-schmitt-enable;
+		};
+	};
+
+	i2c1_default: i2c1_default {
+		group1 {
+			pinmux = <I2C1_SDA_P6>, <I2C1_SCL_P7>;
+			input-enable;
+			input-schmitt-enable;
+		};
+	};
+
+	spi0_default: spi0_default {
+		group1 {
+			pinmux = <SPI0_CSN_P17>, <SPI0_SCK_P18>, <SPI0_TX_P19>;
+		};
+
+		group2 {
+			pinmux = <SPI0_RX_P16>;
+			input-enable;
+		};
+	};
+
+	pwm_ch4b_default: pwm_ch4b_default {
+		group1 {
+			pinmux = <PWM_4B_P25>;
+		};
+	};
+
+	adc_default: adc_default {
+		group1 {
+			pinmux = <ADC_CH0_P26>, <ADC_CH1_P27>, <ADC_CH2_P28>, <ADC_CH3_P29>;
+			input-enable;
+		};
+	};
+};
diff --git a/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2.dtsi b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2.dtsi
new file mode 100644
index 0000000000000..5a0959d721e65
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2.dtsi
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <freq.h>
+
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+#include "w5500_evb_pico2-pinctrl.dtsi"
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,code-partition = &code_partition;
+	};
+
+	pico_header: connector {
+		compatible = "raspberrypi,pico-header";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map = <0 0 &gpio0 0 0>,	/* GP0 */
+			<1 0 &gpio0 1 0>,	/* GP1 */
+			<2 0 &gpio0 2 0>,	/* GP2 */
+			<3 0 &gpio0 3 0>,	/* GP3 */
+			<4 0 &gpio0 4 0>,	/* GP4 */
+			<5 0 &gpio0 5 0>,	/* GP5 */
+			<6 0 &gpio0 6 0>,	/* GP6 */
+			<7 0 &gpio0 7 0>,	/* GP7 */
+			<8 0 &gpio0 8 0>,	/* GP8 */
+			<9 0 &gpio0 9 0>,	/* GP9 */
+			<10 0 &gpio0 10 0>,	/* GP10 */
+			<11 0 &gpio0 11 0>,	/* GP11 */
+			<12 0 &gpio0 12 0>,	/* GP12 */
+			<13 0 &gpio0 13 0>,	/* GP13 */
+			<14 0 &gpio0 14 0>,	/* GP14 */
+			<15 0 &gpio0 15 0>,	/* GP15 */
+			<16 0 &gpio0 16 0>,	/* GP16 */
+			<17 0 &gpio0 17 0>,	/* GP17 */
+			<18 0 &gpio0 18 0>,	/* GP18 */
+			<19 0 &gpio0 19 0>,	/* GP19 */
+			<20 0 &gpio0 20 0>,	/* GP20 */
+			<21 0 &gpio0 21 0>,	/* GP21 */
+			<22 0 &gpio0 22 0>,	/* GP22 */
+			<26 0 &gpio0 26 0>,	/* GP26 */
+			<27 0 &gpio0 27 0>,	/* GP27 */
+			<28 0 &gpio0 28 0>;	/* GP28 */
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led0: led_0 {
+			gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
+			label = "LED";
+		};
+	};
+
+	pwm_leds {
+		compatible = "pwm-leds";
+		status = "disabled";
+
+		pwm_led0: pwm_led_0 {
+			pwms = <&pwm 9 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
+			label = "PWM_LED";
+		};
+	};
+
+	aliases {
+		led0 = &led0;
+		pwm-led0 = &pwm_led0;
+		watchdog0 = &wdt0;
+	};
+};
+
+&flash0 {
+	/* 16MB of flash minus the 0x100 used for
+	 * the second stage bootloader
+	 */
+	reg = <0x10000000 DT_SIZE_M(16)>;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Reserved memory for the second stage bootloader */
+		second_stage_bootloader: partition@0 {
+			label = "second_stage_bootloader";
+			reg = <0x00000000 0x100>;
+			read-only;
+		};
+
+		/*
+		 * Usable flash. Starts at 0x100, after the bootloader. The partition
+		 * size is 16MB minus the 0x100 bytes taken by the bootloader.
+		 */
+		code_partition: partition@100 {
+			label = "code-partition";
+			reg = <0x100 (DT_SIZE_M(16) - 0x100)>;
+			read-only;
+		};
+	};
+};
+
+&uart0 {
+	current-speed = <115200>;
+	status = "okay";
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-names = "default";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&spi0 {
+	clock-frequency = <DT_FREQ_M(8)>;
+	status = "okay";
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-names = "default";
+	cs-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
+
+	ethernet: w5500@0 {
+		compatible = "wiznet,w5500";
+		reg = <0x0>;
+		spi-max-frequency = <50000000>;
+		int-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+		reset-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+		local-mac-address = [00 00 00 01 02 03];
+		status = "okay";
+	};
+};
+
+&i2c0 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&adc {
+	pinctrl-0 = <&adc_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&pwm {
+	pinctrl-0 = <&pwm_ch4b_default>;
+	pinctrl-names = "default";
+	divider-int-0 = <255>;
+};
+
+&timer0 {
+	status = "okay";
+};
+
+&wdt0 {
+	status = "okay";
+};
+
+zephyr_udc0: &usbd {
+	status = "okay";
+};
+
+pico_spi: &spi0 {};
+pico_i2c0: &i2c0 {};
+pico_i2c1: &i2c1 {};
+pico_serial: &uart0 {};
diff --git a/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33.dts b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33.dts
new file mode 100644
index 0000000000000..88ba8a6d16c4e
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33.dts
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <raspberrypi/rpi_pico/rp2350a.dtsi>
+#include <raspberrypi/rpi_pico/m33.dtsi>
+#include "w5500_evb_pico2.dtsi"
diff --git a/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33.yaml b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33.yaml
new file mode 100644
index 0000000000000..a4073e97463ed
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33.yaml
@@ -0,0 +1,22 @@
+identifier: w5500_evb_pico2/rp2350a/m33
+name: Wiznet W5500 Evaluation Board with RP2350
+type: mcu
+arch: arm
+flash: 16384
+ram: 520
+toolchain:
+  - zephyr
+  - gnuarmemb
+supported:
+  - adc
+  - clock
+  - counter
+  - dma
+  - gpio
+  - hwinfo
+  - i2c
+  - pwm
+  - spi
+  - uart
+  - usbd
+  - watchdog
diff --git a/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33_defconfig b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33_defconfig
new file mode 100644
index 0000000000000..aaaa51cbdb989
--- /dev/null
+++ b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2_rp2350a_m33_defconfig
@@ -0,0 +1,10 @@
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_GPIO=y
+CONFIG_USE_DT_CODE_PARTITION=y
+CONFIG_BUILD_OUTPUT_UF2=y
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_RESET=y
+CONFIG_CLOCK_CONTROL=y
diff --git a/cmake/bintools/iar/target.cmake b/cmake/bintools/iar/target.cmake
new file mode 100644
index 0000000000000..0ea594503cc36
--- /dev/null
+++ b/cmake/bintools/iar/target.cmake
@@ -0,0 +1,44 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Configures binary tools as GNU binutils
+include(extensions)
+
+# Specifically choose arm-zephyr-eabi from the zephyr sdk for objcopy and friends
+
+if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
+  set(IAR_ZEPHYR_HOME ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin)
+  set(IAR_GNU_PREFIX arm-zephyr-eabi-)
+else()
+  message(ERROR "IAR_TOOLCHAIN_VARIANT not set")
+endif()
+find_program(CMAKE_OBJCOPY ${IAR_GNU_PREFIX}objcopy PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_OBJDUMP ${IAR_GNU_PREFIX}objdump PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_AS      ${IAR_GNU_PREFIX}as      PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_AR      ${IAR_GNU_PREFIX}ar      PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_RANLIB  ${IAR_GNU_PREFIX}ranlib  PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_READELF ${IAR_GNU_PREFIX}readelf PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_NM      ${IAR_GNU_PREFIX}nm      PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_STRIP   ${IAR_GNU_PREFIX}strip   PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+find_program(CMAKE_GDB     ${IAR_GNU_PREFIX}gdb-py  PATHS ${IAR_ZEPHYR_HOME} NO_DEFAULT_PATH)
+
+if(CMAKE_GDB)
+  execute_process(
+    COMMAND ${CMAKE_GDB} --configuration
+    RESULTS_VARIABLE GDB_CFG_ERR
+    OUTPUT_QUIET
+    ERROR_QUIET
+    )
+endif()
+
+if(NOT CMAKE_GDB OR GDB_CFG_ERR)
+  find_program(CMAKE_GDB_NO_PY ${CROSS_COMPILE}gdb PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
+
+  if(CMAKE_GDB_NO_PY)
+    set(CMAKE_GDB ${CMAKE_GDB_NO_PY} CACHE FILEPATH "Path to a program." FORCE)
+  endif()
+endif()
+
+# Include bin tool properties
+include(${ZEPHYR_BASE}/cmake/bintools/iar/target_bintools.cmake)
diff --git a/cmake/bintools/iar/target_bintools.cmake b/cmake/bintools/iar/target_bintools.cmake
new file mode 100644
index 0000000000000..087bd518df136
--- /dev/null
+++ b/cmake/bintools/iar/target_bintools.cmake
@@ -0,0 +1,135 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# - elfconvert  : Name of command for elf file conversion.
+#                 In this implementation `objcopy` is used
+#   elfconvert_formats            : Formats supported: ihex, srec, binary
+#   elfconvert_flag               : empty
+#   elfconvert_flag_final         : empty
+#   elfconvert_flag_strip_all     : -S
+#   elfconvert_flag_strip_debug   : -g
+#   elfconvert_flag_intarget      : --input-target=
+#   elfconvert_flag_outtarget     : --output-target=
+#   elfconvert_flag_section_remove: --remove-section=
+#   elfconvert_flag_section_only  : --only-section=
+#   elfconvert_flag_section_rename: --rename-section;
+#   elfconvert_flag_gapfill       : --gap-fill;
+#                                   Note: The ';' will be transformed into an
+#                                   empty space when executed
+#   elfconvert_flag_srec_len      : --srec-len=
+#   elfconvert_flag_infile        : empty, objcopy doesn't take arguments for filenames
+#   elfconvert_flag_outfile       : empty, objcopy doesn't take arguments for filenames
+#
+
+# elfconvert to use for transforming an elf file into another format,
+# such as intel hex, s-rec, binary, etc.
+set_property(TARGET bintools PROPERTY elfconvert_command ${CMAKE_OBJCOPY})
+
+# List of format the tool supports for converting, for example,
+# GNU tools uses objectcopy, which supports the following: ihex, srec, binary
+set_property(TARGET bintools PROPERTY elfconvert_formats ihex srec binary)
+
+set_property(TARGET bintools PROPERTY elfconvert_flag "")
+set_property(TARGET bintools PROPERTY elfconvert_flag_final "")
+
+set_property(TARGET bintools PROPERTY elfconvert_flag_strip_all "-S")
+set_property(TARGET bintools PROPERTY elfconvert_flag_strip_debug "-g")
+
+set_property(TARGET bintools PROPERTY elfconvert_flag_intarget "--input-target=")
+set_property(TARGET bintools PROPERTY elfconvert_flag_outtarget "--output-target=")
+
+set_property(TARGET bintools PROPERTY elfconvert_flag_section_remove "--remove-section=")
+set_property(TARGET bintools PROPERTY elfconvert_flag_section_only "--only-section=")
+set_property(TARGET bintools PROPERTY elfconvert_flag_section_rename "--rename-section;")
+
+set_property(TARGET bintools PROPERTY elfconvert_flag_lma_adjust "--change-section-lma;")
+
+# Note, placing a ';' at the end results in the following param  to be a list,
+# and hence space separated.
+# Thus the command line argument becomes:
+# `--gap-file <value>` instead of `--gap-fill<value>` (The latter would result in an error)
+set_property(TARGET bintools PROPERTY elfconvert_flag_gapfill "--gap-fill;")
+set_property(TARGET bintools PROPERTY elfconvert_flag_srec_len "--srec-len=")
+
+set_property(TARGET bintools PROPERTY elfconvert_flag_infile "")
+set_property(TARGET bintools PROPERTY elfconvert_flag_outfile "")
+
+#
+# - disassembly : Name of command for disassembly of files
+#                 In this implementation `objdump` is used
+#   disassembly_flag               : -d
+#   disassembly_flag_final         : empty
+#   disassembly_flag_inline_source : -S
+#   disassembly_flag_all           : -SDz
+#   disassembly_flag_infile        : empty, objdump doesn't take arguments for filenames
+#   disassembly_flag_outfile       : '>', objdump doesn't take arguments for output file, but result is printed to standard out, and is redirected.
+
+set_property(TARGET bintools PROPERTY disassembly_command ${CMAKE_OBJDUMP})
+set_property(TARGET bintools PROPERTY disassembly_flag -d)
+set_property(TARGET bintools PROPERTY disassembly_flag_final "")
+set_property(TARGET bintools PROPERTY disassembly_flag_inline_source -S)
+set_property(TARGET bintools PROPERTY disassembly_flag_all -SDz)
+
+set_property(TARGET bintools PROPERTY disassembly_flag_infile "")
+set_property(TARGET bintools PROPERTY disassembly_flag_outfile ">;" )
+
+#
+# - strip: Name of command for stripping symbols
+#          In this implementation `strip` is used
+#   strip_flag         : empty
+#   strip_flag_final   : empty
+#   strip_flag_all     : --strip-all
+#   strip_flag_debug   : --strip-debug
+#   strip_flag_dwo     : --strip-dwo
+#   strip_flag_infile  : empty, strip doesn't take arguments for input file
+#   strip_flag_outfile : -o
+
+# This is using strip from bintools.
+set_property(TARGET bintools PROPERTY strip_command ${CMAKE_STRIP})
+
+# Any flag the strip command requires for processing
+set_property(TARGET bintools PROPERTY strip_flag "")
+set_property(TARGET bintools PROPERTY strip_flag_final "")
+
+set_property(TARGET bintools PROPERTY strip_flag_all --strip-all)
+set_property(TARGET bintools PROPERTY strip_flag_debug --strip-debug)
+set_property(TARGET bintools PROPERTY strip_flag_dwo --strip-dwo)
+set_property(TARGET bintools PROPERTY strip_flag_remove_section -R )
+
+set_property(TARGET bintools PROPERTY strip_flag_infile "")
+set_property(TARGET bintools PROPERTY strip_flag_outfile -o )
+
+#
+# - readelf : Name of command for reading elf files.
+#             In this implementation `readelf` is used
+#   readelf_flag          : empty
+#   readelf_flag_final    : empty
+#   readelf_flag_headers  : -e
+#   readelf_flag_infile   : empty, readelf doesn't take arguments for filenames
+#   readelf_flag_outfile  : '>', readelf doesn't take arguments for output
+#                           file, but result is printed to standard out, and
+#                           is redirected.
+
+# This is using readelf from bintools.
+set_property(TARGET bintools PROPERTY readelf_command ${CMAKE_READELF})
+
+set_property(TARGET bintools PROPERTY readelf_flag "")
+set_property(TARGET bintools PROPERTY readelf_flag_final "")
+set_property(TARGET bintools PROPERTY readelf_flag_headers -e)
+
+set_property(TARGET bintools PROPERTY readelf_flag_infile "")
+set_property(TARGET bintools PROPERTY readelf_flag_outfile ">;" )
+
+# Example on how to support dwarfdump instead of readelf
+#set_property(TARGET bintools PROPERTY readelf_command dwarfdump)
+#set_property(TARGET bintools PROPERTY readelf_flag "")
+#set_property(TARGET bintools PROPERTY readelf_flag_headers -E)
+#set_property(TARGET bintools PROPERTY readelf_flag_infile "")
+#set_property(TARGET bintools PROPERTY readelf_flag_outfile "-O file=" )
+
+set_property(TARGET bintools PROPERTY symbols_command ${CMAKE_NM})
+set_property(TARGET bintools PROPERTY symbols_flag "")
+set_property(TARGET bintools PROPERTY symbols_final "")
+set_property(TARGET bintools PROPERTY symbols_infile "")
+set_property(TARGET bintools PROPERTY symbols_outfile ">;" )
diff --git a/cmake/compiler/arcmwdt/compiler_flags.cmake b/cmake/compiler/arcmwdt/compiler_flags.cmake
index 7234afc0c8030..2827c954e7524 100644
--- a/cmake/compiler/arcmwdt/compiler_flags.cmake
+++ b/cmake/compiler/arcmwdt/compiler_flags.cmake
@@ -14,7 +14,8 @@ list(APPEND CXX_EXCLUDED_OPTIONS
 set_compiler_property(PROPERTY no_optimization -O0)
 set_compiler_property(PROPERTY optimization_debug -O0)
 set_compiler_property(PROPERTY optimization_speed -O2)
-set_compiler_property(PROPERTY optimization_size  -Os)
+set_compiler_property(PROPERTY optimization_size -Os)
+set_compiler_property(PROPERTY optimization_fast -O3)
 
 #######################################################
 # This section covers flags related to warning levels #
@@ -165,6 +166,9 @@ set_compiler_property(PROPERTY coverage "")
 # mwdt compiler flags for imacros. The specific header must be appended by user.
 set_compiler_property(PROPERTY imacros -imacros)
 
+# assembler compiler flags for imacros. The specific header must be appended by user.
+set_property(TARGET asm PROPERTY imacros -imacros)
+
 # Security canaries.
 #no support of -mstack-protector-guard=global"
 set_compiler_property(PROPERTY security_canaries -fstack-protector)
@@ -205,8 +209,9 @@ if(CONFIG_ARCMWDT_LIBC)
   set_property(TARGET asm APPEND PROPERTY required "-I${NOSTDINC}")
 endif()
 
-# Remove after testing that -Wshadow works
+# Update after testing that -Wshadow and -Wno-array-bounds works
 set_compiler_property(PROPERTY warning_shadow_variables)
+set_compiler_property(PROPERTY warning_no_array_bounds)
 
 set_compiler_property(PROPERTY no_builtin -fno-builtin)
 set_compiler_property(PROPERTY no_builtin_malloc -fno-builtin-malloc)
diff --git a/cmake/compiler/clang/compiler_flags.cmake b/cmake/compiler/clang/compiler_flags.cmake
index 8715150e5a6f3..d081ed3a4bf44 100644
--- a/cmake/compiler/clang/compiler_flags.cmake
+++ b/cmake/compiler/clang/compiler_flags.cmake
@@ -101,10 +101,8 @@ check_set_compiler_property(APPEND PROPERTY warning_dw_3
 
 check_set_compiler_property(PROPERTY warning_extended
                             #FIXME: need to fix all of those
-                            -Wno-sometimes-uninitialized
                             -Wno-self-assign
                             -Wno-address-of-packed-member
-                            -Wno-unused-function
                             -Wno-initializer-overrides
                             -Wno-section
                             -Wno-unused-variable
diff --git a/cmake/compiler/compiler_flags_template.cmake b/cmake/compiler/compiler_flags_template.cmake
index 447db04a2d307..bd8733ce9d08e 100644
--- a/cmake/compiler/compiler_flags_template.cmake
+++ b/cmake/compiler/compiler_flags_template.cmake
@@ -15,6 +15,8 @@ set_compiler_property(PROPERTY optimization_size)
 
 set_compiler_property(PROPERTY optimization_size_aggressive)
 
+set_compiler_property(PROPERTY optimization_fast)
+
 #######################################################
 # This section covers flags related to warning levels #
 #######################################################
@@ -125,6 +127,9 @@ set_property(TARGET compiler-cpp PROPERTY no_threadsafe_statics)
 # Required ASM flags when compiling
 set_property(TARGET asm PROPERTY required)
 
+# GCC compiler flags for imacros. The specific header must be appended by user.
+set_property(TARGET asm PROPERTY imacros)
+
 # Compiler flag for disabling pointer arithmetic warnings
 set_compiler_property(PROPERTY warning_no_pointer_arithmetic)
 
@@ -138,6 +143,8 @@ set_compiler_property(PROPERTY no_global_merge)
 
 # Compiler flag for warning about shadow variables
 set_compiler_property(PROPERTY warning_shadow_variables)
+# Compiler flag for disabling warning about array bounds
+set_compiler_property(PROPERTY warning_no_array_bounds)
 
 # Compiler flags to avoid recognizing built-in functions
 set_compiler_property(PROPERTY no_builtin)
@@ -149,3 +156,8 @@ set_compiler_property(PROPERTY specs)
 
 # Compiler flag for defining preinclude files.
 set_compiler_property(PROPERTY include_file)
+
+# Compiler flag for trustzone
+set_compiler_property(PROPERTY cmse)
+
+set_property(TARGET asm PROPERTY cmse)
diff --git a/cmake/compiler/gcc/compiler_flags.cmake b/cmake/compiler/gcc/compiler_flags.cmake
index 830d479ee6693..48afd244ac72a 100644
--- a/cmake/compiler/gcc/compiler_flags.cmake
+++ b/cmake/compiler/gcc/compiler_flags.cmake
@@ -21,6 +21,7 @@ endif()
 set_compiler_property(PROPERTY optimization_speed -O2)
 set_compiler_property(PROPERTY optimization_size  -Os)
 set_compiler_property(PROPERTY optimization_size_aggressive -Oz)
+set_compiler_property(PROPERTY optimization_fast -Ofast)
 
 if(CMAKE_C_COMPILER_VERSION GREATER_EQUAL "4.5.0")
   set_compiler_property(PROPERTY optimization_lto -flto=auto)
@@ -231,6 +232,9 @@ set_property(TARGET compiler-cpp PROPERTY no_threadsafe_statics "-fno-threadsafe
 # Required ASM flags when using gcc
 set_property(TARGET asm PROPERTY required "-xassembler-with-cpp")
 
+# GCC compiler flags for imacros. The specific header must be appended by user.
+set_property(TARGET asm PROPERTY imacros "-imacros")
+
 # gcc flag for colourful diagnostic messages
 check_set_compiler_property(PROPERTY diagnostic -fdiagnostics-color=always)
 
@@ -246,6 +250,7 @@ set_compiler_property(PROPERTY no_position_independent
 set_compiler_property(PROPERTY no_global_merge "")
 
 set_compiler_property(PROPERTY warning_shadow_variables -Wshadow)
+set_compiler_property(PROPERTY warning_no_array_bounds -Wno-array-bounds)
 
 set_compiler_property(PROPERTY no_builtin -fno-builtin)
 set_compiler_property(PROPERTY no_builtin_malloc -fno-builtin-malloc)
@@ -253,3 +258,7 @@ set_compiler_property(PROPERTY no_builtin_malloc -fno-builtin-malloc)
 set_compiler_property(PROPERTY specs -specs=)
 
 set_compiler_property(PROPERTY include_file -include)
+
+set_compiler_property(PROPERTY cmse -mcmse)
+
+set_property(TARGET asm PROPERTY cmse -mcmse)
diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake
index f2f6a96e369bf..2e90f00f659de 100644
--- a/cmake/compiler/gcc/target.cmake
+++ b/cmake/compiler/gcc/target.cmake
@@ -5,7 +5,6 @@ set_ifndef(C++ g++)
 # Configures CMake for using GCC, this script is re-used by several
 # GCC-based toolchains
 
-find_package(Deprecated COMPONENTS SPARSE)
 find_program(CMAKE_C_COMPILER ${CROSS_COMPILE}${CC} PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH)
 
 if(${CMAKE_C_COMPILER} STREQUAL CMAKE_C_COMPILER-NOTFOUND)
@@ -39,11 +38,11 @@ endif()
 # Add check for GCC version >= 13.1
 execute_process(
     COMMAND ${CMAKE_C_COMPILER} -dumpfullversion
-    OUTPUT_VARIABLE temp_compiler_version
+    OUTPUT_VARIABLE GCC_COMPILER_VERSION
     )
 
-if("${temp_compiler_version}" VERSION_LESS 4.3.0 OR
-    "${temp_compiler_version}" VERSION_GREATER_EQUAL 13.1.0)
+if("${GCC_COMPILER_VERSION}" VERSION_LESS 4.3.0 OR
+    "${GCC_COMPILER_VERSION}" VERSION_GREATER_EQUAL 13.1.0)
     set(fix_header_file include/limits.h)
 else()
     set(fix_header_file include-fixed/limits.h)
diff --git a/cmake/compiler/gcc/target_riscv.cmake b/cmake/compiler/gcc/target_riscv.cmake
index 74d12d04c7975..81ed0cafedf55 100644
--- a/cmake/compiler/gcc/target_riscv.cmake
+++ b/cmake/compiler/gcc/target_riscv.cmake
@@ -98,8 +98,12 @@ set(LLEXT_REMOVE_FLAGS
 # Flags to be added to llext code compilation
 # mno-relax is needed to stop gcc from generating R_RISCV_ALIGN relocations,
 # which are currently not supported
+# -msmall-data-limit=0 disables the "small data" sections such as .sbss and .sdata
+# only one NOBITS sections is supported at a time, so having .sbss can cause
+# llext's not to be loadable
 set(LLEXT_APPEND_FLAGS
   -mabi=${riscv_mabi}
   -march=${riscv_march}
   -mno-relax
+  -msmall-data-limit=0
 )
diff --git a/cmake/compiler/iar/compiler_flags.cmake b/cmake/compiler/iar/compiler_flags.cmake
new file mode 100644
index 0000000000000..95e66e8cc4a5f
--- /dev/null
+++ b/cmake/compiler/iar/compiler_flags.cmake
@@ -0,0 +1,193 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Compiler options for the IAR C/C++ Compiler for Arm
+
+#####################################################
+# This section covers flags related to optimization #
+#####################################################
+set_compiler_property(PROPERTY no_optimization -On)
+
+set_compiler_property(PROPERTY optimization_debug -Ol)
+
+set_compiler_property(PROPERTY optimization_speed -Ohs)
+
+set_compiler_property(PROPERTY optimization_size -Ohz)
+
+set_compiler_property(PROPERTY optimization_size_aggressive -Ohz)
+
+set_compiler_property(PROPERTY optimization_fast --no_size_constraints)
+
+#######################################################
+# This section covers flags related to warning levels #
+#######################################################
+
+# -DW=... settings
+#
+# W=1 - warnings that may be relevant and does not occur too often
+# W=2 - warnings that occur quite often but may still be relevant
+# W=3 - the more obscure warnings, can most likely be ignored
+
+set(IAR_SUPPRESSED_WARNINGS)
+
+# Set basic suppressed warning first
+
+# Pe223: function "xxx" declared implicitly
+# Pe054: too few arguments in invocation of macro
+# Pe1675: unrecognized GCC pragma
+# Pe111: statement is unreachable
+# Pe1143: arithmetic on pointer to void or function type
+# Pe068: integer conversion resulted in a change of sign
+list(APPEND IAR_SUPPRESSED_WARNINGS
+     --diag_suppress=Pe068,Pe1143,Pe111,Pe1675,Pe054,Pe223)
+
+# Since IAR does not turn on warnings we do this backwards
+# by not suppressing warnings on higher levels.
+if(NOT W MATCHES "3")
+  # Pe381: extra ";" ignored
+  list(APPEND IAR_SUPPRESSED_WARNINGS --diag_suppress=Pe381)
+endif()
+if(NOT W MATCHES "2" AND NOT W MATCHES "3")
+  # Pe1097: unknown attribute
+  # Pa082: undefined behavior: the order of volatile accesses is undefined
+  # Pa084: pointless integer comparison, the result is always false
+  # Pe185: dynamic initialization in unreachable code
+  # Pe167: argument of type "onoff_notify_fn" is incompatible with...
+  # Pe144: a value of type "void *" cannot be used to initialize...
+  # Pe177: function "xxx" was declared but never referenced
+  # Pe513: a value of type "void *" cannot be assigned to an
+  #        entity of type "int (*)(int)"
+  list(APPEND IAR_SUPPRESSED_WARNINGS
+       --diag_suppress=Pe513,Pe177,Pe144,Pe167,Pe185,Pa084,Pa082,Pe1097)
+endif()
+if(NOT W MATCHES "1" AND NOT W MATCHES "2" AND NOT W MATCHES "3")
+  # Pe188: enumerated type mixed with another type
+  # Pe128: loop is not reachable
+  # Pe550: variable "res" was set but never used
+  # Pe546: transfer of control bypasses initialization
+  # Pe186: pointless comparison of unsigned integer with zero
+  # Pe054: too few arguments in invocation of macro xxx
+  # Pe144: a value of type "void *" cannot be used to initialize an
+  #        entity of type [...] "void (*)(struct onoff_manager *, int)"
+  # Pe167: argument of type "void *" is incompatible with [...]
+  #        "void (*)(void *, void *, void *)"
+  list(APPEND IAR_SUPPRESSED_WARNINGS
+       --diag_suppress=Pe054,Pe186,Pe546,Pe550,Pe128,Pe188,Pe144,Pe167)
+endif()
+
+set_compiler_property(PROPERTY warning_base ${IAR_SUPPRESSED_WARNINGS})
+
+# Extended warning set supported by the compiler
+set_compiler_property(PROPERTY warning_extended)
+
+# Compiler property that will issue error if a declaration does not specify a type
+set_compiler_property(PROPERTY warning_error_implicit_int)
+
+# Compiler flags to use when compiling according to MISRA
+set_compiler_property(PROPERTY warning_error_misra_sane)
+
+set_property(TARGET compiler PROPERTY warnings_as_errors --warnings_are_errors)
+
+###########################################################################
+# This section covers flags related to C or C++ standards / standard libs #
+###########################################################################
+
+# Compiler flags for C standard. The specific standard must be appended by user.
+# For example, gcc specifies this as: set_compiler_property(PROPERTY cstd -std=)
+# TC-WG: the `cstd99` is used regardless of this flag being useful for iccarm
+# This flag will make it a symbol. Works for C,CXX,ASM
+# Since ICCARM does not use C standard flags, we just make them a defined symbol
+# instead
+set_compiler_property(PROPERTY cstd -D__IAR_CSTD_)
+
+# Compiler flags for disabling C standard include and instead specify include
+# dirs in nostdinc_include to use.
+set_compiler_property(PROPERTY nostdinc)
+set_compiler_property(PROPERTY nostdinc_include)
+
+# Compiler flags for disabling C++ standard include.
+set_compiler_property(TARGET compiler-cpp PROPERTY nostdincxx)
+
+# Required C++ flags when compiling C++ code
+set_property(TARGET compiler-cpp PROPERTY required --c++)
+
+# Compiler flags to use for specific C++ dialects
+set_property(TARGET compiler-cpp PROPERTY dialect_cpp98)
+set_property(TARGET compiler-cpp PROPERTY dialect_cpp11)
+set_property(TARGET compiler-cpp PROPERTY dialect_cpp14)
+set_property(TARGET compiler-cpp PROPERTY dialect_cpp17 --libc++)
+set_property(TARGET compiler-cpp PROPERTY dialect_cpp2a --libc++)
+set_property(TARGET compiler-cpp PROPERTY dialect_cpp20 --libc++)
+set_property(TARGET compiler-cpp PROPERTY dialect_cpp2b --libc++)
+
+# Flag for disabling strict aliasing rule in C and C++
+set_compiler_property(PROPERTY no_strict_aliasing)
+
+# Flag for disabling exceptions in C++
+set_property(TARGET compiler-cpp PROPERTY no_exceptions --no_exceptions)
+
+# Flag for disabling rtti in C++
+set_property(TARGET compiler-cpp PROPERTY no_rtti --no_rtti)
+
+###################################################
+# This section covers all remaining C / C++ flags #
+###################################################
+
+# Flags for coverage generation
+set_compiler_property(PROPERTY coverage)
+
+# Security canaries flags.
+set_compiler_property(PROPERTY security_canaries --stack_protection)
+set_compiler_property(PROPERTY security_canaries_strong --stack_protection)
+set_compiler_property(PROPERTY security_canaries_all --security_canaries_all_is_not_supported)
+set_compiler_property(PROPERTY security_canaries_explicit --security_canaries_explicit_is_not_supported)
+
+if(CONFIG_STACK_CANARIES_TLS)
+  check_set_compiler_property(APPEND PROPERTY security_canaries --stack_protector_guard=tls)
+  check_set_compiler_property(APPEND PROPERTY security_canaries_strong --stack_protector_guard=tls)
+  check_set_compiler_property(APPEND PROPERTY security_canaries_all --stack_protector_guard=tls)
+  check_set_compiler_property(APPEND PROPERTY security_canaries_explicit --stack_protector_guard=tls)
+endif()
+
+set_compiler_property(PROPERTY security_fortify)
+
+# Flag for a hosted (no-freestanding) application
+set_compiler_property(PROPERTY hosted)
+
+# gcc flag for a freestanding application
+set_compiler_property(PROPERTY freestanding)
+
+# Flag to include debugging symbol in compilation
+set_property(TARGET compiler PROPERTY debug --debug)
+set_property(TARGET compiler-cpp PROPERTY debug --debug)
+
+set_compiler_property(PROPERTY no_common)
+
+# Flags for imacros. The specific header must be appended by user.
+set_property(TARGET compiler PROPERTY imacros --preinclude)
+set_property(TARGET compiler-cpp PROPERTY imacros --preinclude)
+set_property(TARGET asm PROPERTY imacros -imacros)
+
+# Compiler flag for turning off thread-safe initialization of local statics
+set_property(TARGET compiler-cpp PROPERTY no_threadsafe_statics)
+
+# Required ASM flags when compiling
+set_property(TARGET asm PROPERTY required)
+
+# Compiler flag for disabling pointer arithmetic warnings
+set_compiler_property(PROPERTY warning_no_pointer_arithmetic)
+# Compiler flag for warning about shadow variables
+set_compiler_property(PROPERTY warning_shadow_variables)
+# Compiler flag for disabling warning about array bounds
+set_compiler_property(PROPERTY warning_no_array_bounds)
+
+# Compiler flags for disabling position independent code / executable
+set_compiler_property(PROPERTY no_position_independent)
+
+# Compiler flag for defining preinclude files.
+set_compiler_property(PROPERTY include_file --preinclude)
+
+set_compiler_property(PROPERTY cmse --cmse)
+
+set_property(TARGET asm PROPERTY cmse -mcmse)
diff --git a/cmake/compiler/iar/generic.cmake b/cmake/compiler/iar/generic.cmake
new file mode 100644
index 0000000000000..5d46412770d77
--- /dev/null
+++ b/cmake/compiler/iar/generic.cmake
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT CMAKE_DTS_PREPROCESSOR)
+  find_program(CMAKE_DTS_PREPROCESSOR arm-zephyr-eabi-gcc PATHS ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin NO_DEFAULT_PATH)
+endif()
+
+if(NOT CMAKE_DTS_PREPROCESSOR)
+  message(FATAL_ERROR "Zephyr was unable to find \`arm-zephyr-eabi-gcc\` for DTS preprocessing")
+endif()
+
+if(CMAKE_C_COMPILER STREQUAL CMAKE_C_COMPILER-NOTFOUND)
+  message(FATAL_ERROR "Zephyr was unable to find the IAR toolchain. Was the environment misconfigured?")
+endif()
diff --git a/cmake/compiler/iar/iccarm-cpu.cmake b/cmake/compiler/iar/iccarm-cpu.cmake
new file mode 100644
index 0000000000000..f191bb7e314a8
--- /dev/null
+++ b/cmake/compiler/iar/iccarm-cpu.cmake
@@ -0,0 +1,91 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Determines what argument to give to --cpu= based on the
+# KConfig'uration and sets this to ICCARM_CPU
+
+if("${ARCH}" STREQUAL "arm")
+  if(CONFIG_CPU_CORTEX_M0)
+    set(ICCARM_CPU Cortex-M0)
+  elseif(CONFIG_CPU_CORTEX_M0PLUS)
+    set(ICCARM_CPU Cortex-M0+)
+  elseif(CONFIG_CPU_CORTEX_M1)
+    set(ICCARM_CPU Cortex-M1)
+  elseif(CONFIG_CPU_CORTEX_M3)
+    set(ICCARM_CPU Cortex-M3)
+  elseif(CONFIG_CPU_CORTEX_M4)
+    set(ICCARM_CPU Cortex-M4)
+  elseif(CONFIG_CPU_CORTEX_M7)
+    set(ICCARM_CPU Cortex-M7)
+  elseif(CONFIG_CPU_CORTEX_M23)
+    set(ICCARM_CPU Cortex-M23)
+  elseif(CONFIG_CPU_CORTEX_M33)
+    if(CONFIG_ARMV8_M_DSP)
+      set(ICCARM_CPU Cortex-M33)
+    else()
+      set(ICCARM_CPU Cortex-M33.no_dsp)
+    endif()
+  elseif(CONFIG_CPU_CORTEX_M55)
+    if(CONFIG_ARMV8_1_M_MVEF)
+      set(ICCARM_CPU Cortex-M55)
+    elseif(CONFIG_ARMV8_1_M_MVEI)
+      set(ICCARM_CPU Cortex-M55.no_mve)
+    elseif(CONFIG_ARMV8_M_DSP)
+      set(ICCARM_CPU Cortex-M55.no_mve)
+    else()
+      set(ICCARM_CPU Cortex-M55.no_dsp)
+    endif()
+  elseif(CONFIG_CPU_CORTEX_R4)
+    if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
+      set(ICCARM_CPU Cortex-R4F)
+    else()
+      set(ICCARM_CPU Cortex-R4)
+    endif()
+  elseif(CONFIG_CPU_CORTEX_R5)
+    set(ICCARM_CPU Cortex-R5)
+    if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
+      if(NOT CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
+        set(ICCARM_CPU ${ICCARM_CPU}+fp.sp)
+      endif()
+    else()
+      set(ICCARM_CPU ${ICCARM_CPU}+fp.dp)
+    endif()
+  elseif(CONFIG_CPU_CORTEX_R7)
+    set(ICCARM_CPU Cortex-R7)
+    if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
+      if(NOT CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
+        set(ICCARM_CPU ${ICCARM_CPU}+fp.sp)
+      endif()
+    else()
+      set(ICCARM_CPU ${ICCARM_CPU}+fp.dp)
+    endif()
+  elseif(CONFIG_CPU_CORTEX_R52)
+    set(ICCARM_CPU Cortex-R52)
+    if(CONFIG_FPU AND CONFIG_CPU_HAS_VFP)
+      if(NOT CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
+        set(ICCARM_CPU ${ICCARM_CPU}+fp.sp)
+      endif()
+    endif()
+  elseif(CONFIG_CPU_CORTEX_A7)
+    set(ICCARM_CPU Cortex-A7)
+  elseif(CONFIG_CPU_CORTEX_A9)
+    set(ICCARM_CPU Cortex-A9)
+  else()
+    message(FATAL_ERROR "Expected CONFIG_CPU_CORTEX_x to be defined")
+  endif()
+elseif("${ARCH}" STREQUAL "arm64")
+  if(CONFIG_CPU_CORTEX_A53)
+    set(ICCARM_CPU Cortex-A53)
+  elseif(CONFIG_CPU_CORTEX_A55)
+    set(ICCARM_CPU Cortex-A55)
+  elseif(CONFIG_CPU_CORTEX_A76)
+    set(ICCARM_CPU cortex-a76)
+  elseif(CONFIG_CPU_CORTEX_A76_A55)
+    set(ICCARM_CPU cortex-a76)
+  elseif(CONFIG_CPU_CORTEX_A72)
+    set(ICCARM_CPU Cortex-A72)
+  elseif(CONFIG_CPU_CORTEX_R82)
+    set(ICCARM_CPU Cortex-R82)
+  endif()
+endif()
diff --git a/cmake/compiler/iar/iccarm-fpu.cmake b/cmake/compiler/iar/iccarm-fpu.cmake
new file mode 100644
index 0000000000000..84b012799227f
--- /dev/null
+++ b/cmake/compiler/iar/iccarm-fpu.cmake
@@ -0,0 +1,55 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Determines what argument to give to --fpu= based on the
+# KConfiguration and sets this to ICCARM_FPU
+
+if(CONFIG_FPU)
+
+  # 32-bit
+  if("${ARCH}" STREQUAL "arm")
+    if(CONFIG_CPU_AARCH32_CORTEX_R)
+      if(CONFIG_CPU_CORTEX_R4 OR CONFIG_CPU_CORTEX_R5) # VFPv3
+        if(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
+          set(ICCARM_FPU VFPv3_D16)
+        elseif(CONFIG_VFP_FEATURE_SINGLE_PRECISION)
+          set(ICCARM_FPU VFPv3-SP)
+        endif()
+        if(CONFIG_VFP_FEATURE_HALF_PRECISION)
+          set(ICCARM_FPU ${ICCARM_FPU}_Fp16)
+        endif()
+      elseif(CONFIG_CPU_CORTEX_R52)
+        if(CONFIG_VFP_FEATURE_DOUBLE_PRECISION)
+          set(ICCARM_FPU VFPv5_D16)
+        elseif(CONFIG_VFP_FEATURE_SINGLE_PRECISION)
+          set(ICCARM_FPU VFPv5-SP)
+        endif()
+      endif()
+    elseif(CONFIG_CPU_CORTEX_M)
+      # Defines a mapping from ICCARM_CPU to FPU
+      if(CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION)
+        set(PRECISION_TOKEN _D16)
+      else()
+        set(PRECISION_TOKEN _SP)
+      endif()
+
+      set(FPU_FOR_Cortex-M4           FPv4${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M7           FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M33          FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M33.no_dsp   FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M55          FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M55.no_mve   FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M55.no_dsp   FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M85          FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M85.no_mve   FPv5${PRECISION_TOKEN})
+      set(FPU_FOR_Cortex-M85.no_dsp   FPv5${PRECISION_TOKEN})
+
+      set(ICCARM_FPU ${FPU_FOR_${ICCARM_CPU}})
+    endif()
+  # 64-bit
+  else()
+    set(ICCARM_FPU none)
+  endif()
+
+endif() #CONFIG_FPU
diff --git a/cmake/compiler/iar/target.cmake b/cmake/compiler/iar/target.cmake
new file mode 100644
index 0000000000000..432c1238b703e
--- /dev/null
+++ b/cmake/compiler/iar/target.cmake
@@ -0,0 +1,150 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Avoids running the linker during try_compile()
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+set(NO_BUILD_TYPE_WARNING 1)
+set(CMAKE_NOT_USING_CONFIG_FLAGS 1)
+
+find_program(CMAKE_C_COMPILER
+  NAMES ${IAR_COMPILER}
+  PATHS ${TOOLCHAIN_HOME}
+  PATH_SUFFIXES bin
+  NO_DEFAULT_PATH
+  REQUIRED )
+
+message(STATUS "Found C Compiler ${CMAKE_C_COMPILER}")
+
+find_program(CMAKE_CXX_COMPILER
+  NAMES ${IAR_COMPILER}
+  PATHS ${TOOLCHAIN_HOME}
+  PATH_SUFFIXES bin
+  NO_DEFAULT_PATH
+  REQUIRED )
+
+find_program(CMAKE_AR
+  NAMES iarchive
+  PATHS ${TOOLCHAIN_HOME}
+  PATH_SUFFIXES bin
+  NO_DEFAULT_PATH
+  REQUIRED )
+
+set(CMAKE_ASM_COMPILER)
+if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
+  find_program(CMAKE_ASM_COMPILER
+    arm-zephyr-eabi-gcc
+    PATHS ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin
+    NO_DEFAULT_PATH )
+else()
+  find_program(CMAKE_ASM_COMPILER
+    riscv64-zephyr-elf-gcc
+    PATHS ${ZEPHYR_SDK_INSTALL_DIR}/riscv64-zephyr-elf/bin
+    NO_DEFAULT_PATH )
+endif()
+
+message(STATUS "Found assembler ${CMAKE_ASM_COMPILER}")
+
+set(ICC_BASE ${ZEPHYR_BASE}/cmake/compiler/iar)
+
+
+if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
+  # Used for settings correct cpu/fpu option for gnu assembler
+  include(${ZEPHYR_BASE}/cmake/gcc-m-cpu.cmake)
+  include(${ZEPHYR_BASE}/cmake/gcc-m-fpu.cmake)
+
+  # Map KConfig option to icc cpu/fpu
+  include(${ICC_BASE}/iccarm-cpu.cmake)
+  include(${ICC_BASE}/iccarm-fpu.cmake)
+endif()
+
+set(IAR_COMMON_FLAGS)
+# Minimal C compiler flags
+
+list(APPEND IAR_COMMON_FLAGS
+  "SHELL: --preinclude"
+  "${ZEPHYR_BASE}/include/zephyr/toolchain/iar/iar_missing_defs.h"
+  # Enable both IAR and GNU extensions
+  -e
+  --language gnu
+  --do_explicit_init_in_named_sections
+  --macro_positions_in_diagnostics
+  --no_wrap_diagnostics
+)
+
+if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
+  list(APPEND IAR_COMMON_FLAGS
+    --endian=little
+    --cpu=${ICCARM_CPU}
+    -DRTT_USE_ASM=0        # WA for VAAK-232
+    --diag_suppress=Ta184  # Using zero sized arrays except for as last
+                           # member of a struct is discouraged and
+                           # dereferencing elements in such an array has
+                           # undefined behavior
+  )
+endif()
+
+# Enable VLA if CONFIG_MISRA_SANE is not set and warnings are not enabled.
+if(NOT CONFIG_MISRA_SANE AND NOT DEFINED W)
+  list(APPEND IAR_COMMON_FLAGS --vla)
+endif()
+
+# Minimal ASM compiler flags
+if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
+  list(APPEND IAR_ASM_FLAGS
+    -mcpu=${GCC_M_CPU}
+    -mabi=aapcs
+    -DRTT_USE_ASM=0       #WA for VAAK-232
+    )
+endif()
+
+# IAR needs Dwarf 4 output
+list(APPEND IAR_ASM_FLAGS -gdwarf-4)
+
+if(DEFINED CONFIG_ARM_SECURE_FIRMWARE)
+  list(APPEND IAR_COMMON_FLAGS --cmse)
+  list(APPEND IAR_ASM_FLAGS -mcmse)
+endif()
+
+# 64-bit
+if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
+  if(CONFIG_ARM64)
+    list(APPEND IAR_COMMON_FLAGS --abi=lp64)
+    list(APPEND TOOLCHAIN_LD_FLAGS --abi=lp64)
+  # 32-bit
+  else()
+    list(APPEND IAR_COMMON_FLAGS --aeabi)
+    if(CONFIG_COMPILER_ISA_THUMB2)
+      list(APPEND IAR_COMMON_FLAGS --thumb)
+      list(APPEND IAR_ASM_FLAGS -mthumb)
+    endif()
+
+    if(CONFIG_FPU)
+      list(APPEND IAR_COMMON_FLAGS --fpu=${ICCARM_FPU})
+      list(APPEND IAR_ASM_FLAGS -mfpu=${GCC_M_FPU})
+    endif()
+  endif()
+
+  if(CONFIG_IAR_LIBC)
+    # Zephyr requires AEABI portability to ensure correct functioning of the C
+    # library, for example error numbers, errno.h.
+    list(APPEND IAR_COMMON_FLAGS -D__AEABI_PORTABILITY_LEVEL=1)
+  endif()
+endif()
+
+if(CONFIG_IAR_LIBC)
+  message(STATUS "IAR C library used")
+  # Zephyr uses the type FILE for normal LIBC while IAR
+  # only has it for full LIBC support, so always choose
+  # full libc when using IAR C libraries.
+  list(APPEND IAR_COMMON_FLAGS --dlib_config full)
+endif()
+
+foreach(F ${IAR_COMMON_FLAGS})
+  list(APPEND TOOLCHAIN_C_FLAGS $<$<COMPILE_LANGUAGE:C>:${F}>)
+  list(APPEND TOOLCHAIN_C_FLAGS $<$<COMPILE_LANGUAGE:CXX>:${F}>)
+endforeach()
+
+foreach(F ${IAR_ASM_FLAGS})
+  list(APPEND TOOLCHAIN_C_FLAGS $<$<COMPILE_LANGUAGE:ASM>:${F}>)
+endforeach()
diff --git a/cmake/compiler/xt-clang/compiler_flags.cmake b/cmake/compiler/xt-clang/compiler_flags.cmake
index 593e384284316..c70832ebc0f97 100644
--- a/cmake/compiler/xt-clang/compiler_flags.cmake
+++ b/cmake/compiler/xt-clang/compiler_flags.cmake
@@ -34,3 +34,12 @@ set_compiler_property(PROPERTY no_position_independent "")
 
 # Remove after testing that -Wshadow works
 set_compiler_property(PROPERTY warning_shadow_variables)
+
+# xt-clang is usually based on older version of clang, and
+# Zephyr main targets more recent versions. Because of this,
+# some newer compiler flags may cause warnings where twister
+# would mark as test being failed. To workaround that,
+# add -Wno-unknown-warning-option to suppress those warnings.
+check_set_compiler_property(APPEND PROPERTY warning_extended
+                            -Wno-unknown-warning-option
+)
diff --git a/cmake/emu/armfvp.cmake b/cmake/emu/armfvp.cmake
index 70fa5dc0aa3b8..354cc43cbcf10 100644
--- a/cmake/emu/armfvp.cmake
+++ b/cmake/emu/armfvp.cmake
@@ -53,9 +53,12 @@ elseif(CONFIG_ARMV8_A_NS)
     --data cluster0.cpu0="${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}"@0x88000000
     )
 else()
-  set(ARMFVP_FLAGS ${ARMFVP_FLAGS}
-    -a ${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}
+  string(FIND "${ARMFVP_FLAGS}" " -a " ARMFVP_APPARG_POS)
+  if(${ARMFVP_APPARG_POS} EQUAL -1)
+    set(ARMFVP_FLAGS ${ARMFVP_FLAGS}
+      -a ${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}
     )
+  endif()
 endif()
 
 if(CONFIG_ETH_SMSC91X)
diff --git a/cmake/gcc-m-cpu.cmake b/cmake/gcc-m-cpu.cmake
index 6f00283b6b8e4..75b13fa423844 100644
--- a/cmake/gcc-m-cpu.cmake
+++ b/cmake/gcc-m-cpu.cmake
@@ -84,6 +84,8 @@ if("${ARCH}" STREQUAL "arm")
         set(GCC_M_CPU ${GCC_M_CPU}+nofp.dp)
       endif()
     endif()
+  elseif(CONFIG_CPU_CORTEX_A7)
+    set(GCC_M_CPU cortex-a7)
   elseif(CONFIG_CPU_CORTEX_A9)
     set(GCC_M_CPU cortex-a9)
   else()
diff --git a/cmake/gcc-m-fpu.cmake b/cmake/gcc-m-fpu.cmake
index d1ce9655b46d0..aafe5b75c8616 100644
--- a/cmake/gcc-m-fpu.cmake
+++ b/cmake/gcc-m-fpu.cmake
@@ -45,6 +45,10 @@ if("${ARCH}" STREQUAL "arm")
     set(FPU_FOR_cortex-m85+nodsp    auto)
 
     set(GCC_M_FPU ${FPU_FOR_${GCC_M_CPU}})
+  elseif(CONFIG_CPU_AARCH32_CORTEX_A)
+    if(CONFIG_CPU_CORTEX_A7)
+      set(GCC_M_FPU vfpv4-d16)
+    endif()
   endif()
 endif()
 
diff --git a/cmake/linker/armlink/target.cmake b/cmake/linker/armlink/target.cmake
index be2bb8e89778f..7a973865c4aca 100644
--- a/cmake/linker/armlink/target.cmake
+++ b/cmake/linker/armlink/target.cmake
@@ -29,22 +29,13 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
     set(STEERING_C_ARG "-DSTEERING_C=${STEERING_C}")
   endif()
 
-  file(GENERATE OUTPUT ${cmake_linker_script_settings} CONTENT
-       "set(FORMAT \"$<TARGET_PROPERTY:linker,FORMAT>\" CACHE INTERNAL \"\")\n
-        set(ENTRY \"$<TARGET_PROPERTY:linker,ENTRY>\" CACHE INTERNAL \"\")\n
-        set(MEMORY_REGIONS \"$<TARGET_PROPERTY:linker,MEMORY_REGIONS>\" CACHE INTERNAL \"\")\n
-        set(GROUPS \"$<TARGET_PROPERTY:linker,GROUPS>\" CACHE INTERNAL \"\")\n
-        set(SECTIONS \"$<TARGET_PROPERTY:linker,SECTIONS>\" CACHE INTERNAL \"\")\n
-        set(SECTION_SETTINGS \"$<TARGET_PROPERTY:linker,SECTION_SETTINGS>\" CACHE INTERNAL \"\")\n
-        set(SYMBOLS \"$<TARGET_PROPERTY:linker,SYMBOLS>\" CACHE INTERNAL \"\")\n
-       "
-    )
+  zephyr_linker_generate_linker_settings_file(${cmake_linker_script_settings})
+
   add_custom_command(
     OUTPUT ${linker_script_gen}
            ${STEERING_FILE}
            ${STEERING_C}
     COMMAND ${CMAKE_COMMAND}
-      -C ${DEVICE_API_LINKER_SECTIONS_CMAKE}
       -C ${cmake_linker_script_settings}
       -DPASS="${linker_pass_define}"
       ${STEERING_FILE_ARG}
@@ -52,6 +43,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/${linker_script_gen}
       -P ${ZEPHYR_BASE}/cmake/linker/armlink/scatter_script.cmake
     DEPENDS ${DEVICE_API_LD_TARGET}
+            ${cmake_linker_script_settings}
   )
 
   if("LINKER_ZEPHYR_FINAL" IN_LIST linker_pass_define_list)
diff --git a/cmake/linker/iar/config_file_script.cmake b/cmake/linker/iar/config_file_script.cmake
new file mode 100644
index 0000000000000..9d430d5b219fe
--- /dev/null
+++ b/cmake/linker/iar/config_file_script.cmake
@@ -0,0 +1,919 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.17)
+
+set(SORT_TYPE_NAME Lexical)
+
+set_property(GLOBAL PROPERTY ILINK_REGION_SYMBOL_ICF)
+
+# This function post process the region for easier use.
+#
+# Tasks:
+# - Symbol translation using a steering file is configured.
+function(process_region)
+  cmake_parse_arguments(REGION "" "OBJECT" "" ${ARGN})
+
+  process_region_common(${ARGN})
+
+  get_property(empty GLOBAL PROPERTY ${REGION_OBJECT}_EMPTY)
+  if(NOT empty)
+    # For scatter files we move any system symbols into first non-empty load section.
+    get_parent(OBJECT ${REGION_OBJECT} PARENT parent TYPE SYSTEM)
+    get_property(symbols GLOBAL PROPERTY ${parent}_SYMBOLS)
+    set_property(GLOBAL APPEND PROPERTY ${REGION_OBJECT}_SYMBOLS ${symbols})
+    set_property(GLOBAL PROPERTY ${parent}_SYMBOLS)
+  endif()
+
+  get_property(sections GLOBAL PROPERTY ${REGION_OBJECT}_SECTION_LIST_ORDERED)
+  foreach(section ${sections})
+
+    get_property(name       GLOBAL PROPERTY ${section}_NAME)
+    get_property(name_clean GLOBAL PROPERTY ${section}_NAME_CLEAN)
+    get_property(noinput    GLOBAL PROPERTY ${section}_NOINPUT)
+    get_property(type       GLOBAL PROPERTY ${section}_TYPE)
+    get_property(nosymbols  GLOBAL PROPERTY ${section}_NOSYMBOLS)
+
+    if(NOT nosymbols)
+      if(${name} STREQUAL .ramfunc)
+        create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name_clean}_load_start
+          EXPR "@ADDR(.ramfunc_init)@"
+          )
+      else()
+        create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name_clean}_load_start
+          EXPR "@LOADADDR(${name_clean})@"
+          )
+      endif()
+    endif()
+
+    get_property(indicies GLOBAL PROPERTY ${section}_SETTINGS_INDICIES)
+    list(LENGTH indicies length)
+    foreach(idx ${indicies})
+      set(steering_postfixes Base Limit)
+      get_property(symbols GLOBAL PROPERTY ${section}_SETTING_${idx}_SYMBOLS)
+      get_property(sort    GLOBAL PROPERTY ${section}_SETTING_${idx}_SORT)
+      get_property(offset  GLOBAL PROPERTY ${section}_SETTING_${idx}_OFFSET)
+      if(DEFINED offset AND NOT offset EQUAL 0 )
+        # Same behavior as in section_to_string
+      elseif(DEFINED offset AND offset STREQUAL 0 )
+        # Same behavior as in section_to_string
+      elseif(sort)
+        # Treated by labels in the icf or image symbols.
+      elseif(DEFINED symbols AND ${length} EQUAL 1 AND noinput)
+      endif()
+    endforeach()
+
+    # Symbols translation here.
+
+    get_property(symbol_val GLOBAL PROPERTY SYMBOL_TABLE___${name_clean}_end)
+
+    if("${symbol_val}" STREQUAL "${name_clean}")
+      create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name_clean}_size
+        EXPR "@SIZE(${name_clean})@"
+        )
+    else()
+      # These seem to be thing that can't be transformed to $$Length
+      set_property(GLOBAL APPEND PROPERTY ILINK_REGION_SYMBOL_ICF
+        "define image symbol __${name_clean}_size = (__${symbol_val} - ADDR(${name_clean}))")
+    endif()
+    set(ZI)
+
+    if(${name_clean} STREQUAL last_ram_section)
+      # A trick to add the symbol for the nxp devices
+      # _flash_used = LOADADDR(.last_section) + SIZEOF(.last_section) - __rom_region_start;
+      create_symbol(OBJECT ${REGION_OBJECT} SYMBOL _flash_used
+        EXPR "(@LOADADDR(last_section)@ + @SIZE(last_section)@ - @__rom_region_start@)"
+        )
+    endif()
+
+    if(${name_clean} STREQUAL rom_start)
+      # The below two symbols is meant to make aliases to the _vector_table symbol.
+      list(GET symbols 0 symbol_start)
+      create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __Vectors
+        EXPR "@ADDR(${symbol_start})@"
+        )
+      create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __vector_table
+        EXPR "@ADDR(${symbol_start})@"
+        )
+    endif()
+
+  endforeach()
+
+  get_property(groups GLOBAL PROPERTY ${REGION_OBJECT}_GROUP_LIST_ORDERED)
+  foreach(group ${groups})
+    get_property(name GLOBAL PROPERTY ${group}_NAME)
+    string(TOLOWER ${name} name)
+
+    get_property(group_type  GLOBAL PROPERTY ${group}_OBJ_TYPE)
+    get_property(parent      GLOBAL PROPERTY ${group}_PARENT)
+    get_property(parent_type GLOBAL PROPERTY ${parent}_OBJ_TYPE)
+    # Need to find the init manually group or parent
+    if(${parent_type} STREQUAL GROUP)
+      get_property(vma GLOBAL PROPERTY ${parent}_VMA)
+      get_property(lma GLOBAL PROPERTY ${parent}_LMA)
+    else()
+      get_property(vma GLOBAL PROPERTY ${group}_VMA)
+      get_property(lma GLOBAL PROPERTY ${group}_LMA)
+    endif()
+
+    get_objects(LIST sections OBJECT ${group} TYPE SECTION)
+    list(GET sections 0 section)
+    get_property(first_section_name GLOBAL PROPERTY ${section}_NAME_CLEAN)
+    list(POP_BACK sections section)
+    get_property(last_section_name GLOBAL PROPERTY ${section}_NAME_CLEAN)
+
+    if(DEFINED vma AND DEFINED lma)
+      # Something to init
+      create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name}_load_start
+        EXPR "@ADDR(${first_section_name}_init)@"
+        )
+    else()
+      create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name}_load_start
+        EXPR "@LOADADDR(${first_section_name})@"
+        )
+    endif()
+
+    create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name}_start
+      EXPR "@ADDR(${first_section_name})@"
+      )
+    create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name}_end
+      EXPR "@END(${last_section_name})@"
+      )
+    create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name}_size
+      EXPR "(@(__${name}_end)@ - @(__${name}_start)@)"
+      )
+
+  endforeach()
+
+  get_property(symbols GLOBAL PROPERTY ${REGION_OBJECT}_SYMBOLS)
+  foreach(symbol ${symbols})
+    get_property(name GLOBAL PROPERTY ${symbol}_NAME)
+    get_property(expr GLOBAL PROPERTY ${symbol}_EXPR)
+    if(NOT DEFINED expr)
+      create_symbol(OBJECT ${REGION_OBJECT} SYMBOL __${name}_size
+        EXPR "@(ADDR(${name})@"
+        )
+    endif()
+  endforeach()
+
+  # This is only a trick to get the memories
+  set(groups)
+  get_objects(LIST groups OBJECT ${REGION_OBJECT} TYPE GROUP)
+  foreach(group ${groups})
+    get_property(group_type  GLOBAL PROPERTY ${group}_OBJ_TYPE)
+    get_property(parent      GLOBAL PROPERTY ${group}_PARENT)
+    get_property(parent_type GLOBAL PROPERTY ${parent}_OBJ_TYPE)
+
+    if(${group_type} STREQUAL GROUP)
+      get_property(group_name GLOBAL PROPERTY ${group}_NAME)
+      get_property(group_lma  GLOBAL PROPERTY ${group}_LMA)
+      if(${group_name} STREQUAL ROM_REGION)
+        set_property(GLOBAL PROPERTY ILINK_ROM_REGION_NAME ${group_lma})
+      endif()
+    endif()
+
+    if(${parent_type} STREQUAL GROUP)
+      get_property(vma GLOBAL PROPERTY ${parent}_VMA)
+      get_property(lma GLOBAL PROPERTY ${parent}_LMA)
+
+      set_property(GLOBAL PROPERTY ${group}_VMA ${vma})
+      set_property(GLOBAL PROPERTY ${group}_LMA ${lma})
+    endif()
+  endforeach()
+
+endfunction()
+
+#
+# String functions - start
+#
+
+function(system_to_string)
+  cmake_parse_arguments(STRING "" "OBJECT;STRING" "" ${ARGN})
+
+  get_property(name    GLOBAL PROPERTY ${STRING_OBJECT}_NAME)
+  get_property(regions GLOBAL PROPERTY ${STRING_OBJECT}_REGIONS)
+  get_property(format  GLOBAL PROPERTY ${STRING_OBJECT}_FORMAT)
+
+  # Ilink specials
+  # set(${STRING_STRING} "build for rom;\n")
+  set(${STRING_STRING} "build for ram;\n")
+  if("${format}" MATCHES "aarch64")
+    set(${STRING_STRING} "${${STRING_STRING}}define memory mem with size = 16E;\n")
+  else()
+    set(${STRING_STRING} "${${STRING_STRING}}define memory mem with size = 4G;\n")
+  endif()
+
+  foreach(region ${regions})
+    get_property(name    GLOBAL PROPERTY ${region}_NAME)
+    get_property(address GLOBAL PROPERTY ${region}_ADDRESS)
+    get_property(flags   GLOBAL PROPERTY ${region}_FLAGS)
+    get_property(size    GLOBAL PROPERTY ${region}_SIZE)
+
+    if(DEFINED flags)
+      if(${flags} STREQUAL rx)
+        set(flags " rom")
+      elseif(${flags} STREQUAL ro)
+        set(flags " rom")
+      elseif(${flags} STREQUAL wx)
+        set(flags " ram")
+      elseif(${flags} STREQUAL rw)
+        set(flags " ram")
+      endif()
+    endif()
+
+    if(${name} STREQUAL IDT_LIST)
+      # Need to use a untyped region for IDT_LIST
+      set(flags "")
+    endif()
+
+    if(DEFINED address)
+      set(start "${address}")
+    endif()
+
+    if(DEFINED size)
+      set(size "${size}")
+    endif()
+    # define rom region FLASH    = mem:[from 0x0 size 0x40000];
+    set(memory_region "define${flags} region ${name} = mem:[from ${start} size ${size}];")
+
+    set(${STRING_STRING} "${${STRING_STRING}}${memory_region}\n")
+    set(flags)
+  endforeach()
+
+  set(${STRING_STRING} "${${STRING_STRING}}\n\n")
+  set_property(GLOBAL PROPERTY ILINK_SYMBOL_ICF)
+
+  set(${STRING_STRING} "${${STRING_STRING}}\n")
+  foreach(region ${regions})
+    get_property(empty GLOBAL PROPERTY ${region}_EMPTY)
+    if(NOT empty)
+      get_property(name    GLOBAL PROPERTY ${region}_NAME)
+      set(ILINK_CURRENT_NAME ${name})
+      to_string(OBJECT ${region} STRING ${STRING_STRING})
+      set(ILINK_CURRENT_NAME)
+    endif()
+  endforeach()
+  set(${STRING_STRING} "${${STRING_STRING}}\n")
+
+  get_property(symbols_icf GLOBAL PROPERTY ILINK_SYMBOL_ICF)
+  foreach(image_symbol ${symbols_icf})
+    set(${STRING_STRING} "${${STRING_STRING}}define image symbol ${image_symbol};\n")
+  endforeach()
+
+  get_property(symbols_icf GLOBAL PROPERTY ILINK_REGION_SYMBOL_ICF)
+  set(${STRING_STRING} "${${STRING_STRING}}\n")
+  foreach(image_symbol ${symbols_icf})
+    set(${STRING_STRING} "${${STRING_STRING}}${image_symbol};\n")
+  endforeach()
+
+  if(IAR_LIBC)
+    set(${STRING_STRING} "${${STRING_STRING}}if (K_HEAP_MEM_POOL_SIZE>0)\n{\n")
+    set(${STRING_STRING} "${${STRING_STRING}}  define block HEAP with alignment=8 { symbol kheap__system_heap };\n")
+    set(${STRING_STRING} "${${STRING_STRING}}}\nelse\n{\n")
+    set(${STRING_STRING} "${${STRING_STRING}}  define block HEAP with alignment=8, expanding size { };\n")
+    set(${STRING_STRING} "${${STRING_STRING}}}\n")
+    set(${STRING_STRING} "${${STRING_STRING}}\"DLib heap\": place in RAM { block HEAP };\n")
+#    set(${STRING_STRING} "${${STRING_STRING}}define exported symbol HEAP$$Base=kheap__system_heap;\n")
+#    set(${STRING_STRING} "${${STRING_STRING}}define exported symbol HEAP$$Limit=END(kheap__system_heap);\n")
+  endif()
+
+  set(${STRING_STRING} ${${STRING_STRING}} PARENT_SCOPE)
+endfunction()
+
+function(group_to_string)
+  cmake_parse_arguments(STRING "" "OBJECT;STRING" "" ${ARGN})
+
+  get_property(type GLOBAL PROPERTY ${STRING_OBJECT}_OBJ_TYPE)
+  if(${type} STREQUAL REGION)
+    get_property(empty GLOBAL PROPERTY ${STRING_OBJECT}_EMPTY)
+    if(empty)
+      return()
+    endif()
+  endif()
+
+  #_SECTIONS_FIXED need a place at address statement:
+  get_property(sections GLOBAL PROPERTY ${STRING_OBJECT}_SECTIONS_FIXED)
+  foreach(section ${sections})
+    to_string(OBJECT ${section} STRING ${STRING_STRING})
+    get_property(name       GLOBAL PROPERTY ${section}_NAME)
+    get_property(name_clean GLOBAL PROPERTY ${section}_NAME_CLEAN)
+    get_property(section_address GLOBAL PROPERTY ${section}_ADDRESS)
+    set(${STRING_STRING} "${${STRING_STRING}}\"${name}\": place at address mem:${section_address} { block ${name_clean} };\n")
+  endforeach()
+
+  get_property(groups GLOBAL PROPERTY ${STRING_OBJECT}_GROUPS)
+  foreach(group ${groups})
+    to_string(OBJECT ${group} STRING ${STRING_STRING})
+  endforeach()
+
+  get_property(sections GLOBAL PROPERTY ${STRING_OBJECT}_SECTIONS)
+  foreach(section ${sections})
+    to_string(OBJECT ${section} STRING ${STRING_STRING})
+
+    get_property(name     GLOBAL PROPERTY ${section}_NAME)
+
+    get_property(name_clean GLOBAL PROPERTY ${section}_NAME_CLEAN)
+
+    get_property(parent   GLOBAL PROPERTY ${section}_PARENT)
+    get_property(noinit   GLOBAL PROPERTY ${section}_NOINIT)
+    # This is only a trick to get the memories
+    get_property(parent_type GLOBAL PROPERTY ${parent}_OBJ_TYPE)
+    if(${parent_type} STREQUAL GROUP)
+      get_property(vma GLOBAL PROPERTY ${parent}_VMA)
+      get_property(lma GLOBAL PROPERTY ${parent}_LMA)
+    endif()
+
+    if(DEFINED vma)
+      set(ILINK_CURRENT_NAME ${vma})
+    elseif(DEFINED lma)
+      set(ILINK_CURRENT_NAME ${lma})
+    else()
+      # message(FATAL_ERROR "Need either vma or lma")
+    endif()
+
+    set(${STRING_STRING} "${${STRING_STRING}}\"${name}\": place in ${ILINK_CURRENT_NAME} { block ${name_clean} };\n")
+    if(DEFINED vma AND DEFINED lma AND NOT ${noinit})
+      set(${STRING_STRING} "${${STRING_STRING}}\"${name}_init\": place in ${lma} { block ${name_clean}_init };\n")
+    endif()
+
+  endforeach()
+
+  get_parent(OBJECT ${STRING_OBJECT} PARENT parent TYPE SYSTEM)
+  get_property(regions GLOBAL PROPERTY ${parent}_REGIONS)
+  list(REMOVE_ITEM regions ${STRING_OBJECT})
+
+  foreach(region ${regions})
+    get_property(vma GLOBAL PROPERTY ${region}_NAME)
+    get_property(sections GLOBAL PROPERTY ${STRING_OBJECT}_${vma}_SECTIONS_FIXED)
+
+    foreach(section ${sections})
+      to_string(OBJECT ${section} STRING ${STRING_STRING})
+    endforeach()
+
+    get_property(groups GLOBAL PROPERTY ${STRING_OBJECT}_${vma}_GROUPS)
+    foreach(group ${groups})
+      to_string(OBJECT ${group} STRING ${STRING_STRING})
+    endforeach()
+
+    get_property(sections GLOBAL PROPERTY ${STRING_OBJECT}_${vma}_SECTIONS)
+    foreach(section ${sections})
+      to_string(OBJECT ${section} STRING ${STRING_STRING})
+      get_property(name     GLOBAL PROPERTY ${section}_NAME)
+      string(REGEX REPLACE "^[\.]" "" name_clean "${name}")
+      string(REPLACE "." "_" name_clean "${name_clean}")
+      set(${STRING_STRING} "${${STRING_STRING}}\"${name}\": place in ${vma} { block ${name_clean} };\n")
+
+      # Insert 'do not initialize' here
+      get_property(current_sections GLOBAL PROPERTY ILINK_CURRENT_SECTIONS)
+      if(${name} STREQUAL .bss)
+        if(DEFINED current_sections)
+          set(${STRING_STRING} "${${STRING_STRING}}do not initialize\n")
+          set(${STRING_STRING} "${${STRING_STRING}}{\n")
+          foreach(section ${current_sections})
+            set(${STRING_STRING} "${${STRING_STRING}}  ${section},\n")
+          endforeach()
+          set(${STRING_STRING} "${${STRING_STRING}}};\n")
+          set(current_sections)
+          set_property(GLOBAL PROPERTY ILINK_CURRENT_SECTIONS)
+        endif()
+      endif()
+
+      if(${name_clean} STREQUAL last_ram_section)
+        get_property(group_name_lma GLOBAL PROPERTY ILINK_ROM_REGION_NAME)
+        set(${STRING_STRING} "${${STRING_STRING}}\n")
+        if(${CONFIG_LINKER_LAST_SECTION_ID})
+          set(${STRING_STRING} "${${STRING_STRING}}define section last_section_id { udata32 ${CONFIG_LINKER_LAST_SECTION_ID_PATTERN}; };\n")
+          set(${STRING_STRING} "${${STRING_STRING}}define block last_section with fixed order { section last_section_id };\n")
+        else()
+          set(${STRING_STRING} "${${STRING_STRING}}define block last_section with fixed order { };\n")
+        endif()
+        # Not really the right place, we want the last used flash bytes not end of the world!
+        # set(${STRING_STRING} "${${STRING_STRING}}\".last_section\": place at end of ${group_name_lma} { block last_section };\n")
+        set(${STRING_STRING} "${${STRING_STRING}}\".last_section\": place in ${group_name_lma} { block last_section };\n")
+        set(${STRING_STRING} "${${STRING_STRING}}keep { block last_section };\n")
+      endif()
+
+    endforeach()
+  endforeach()
+
+  get_property(symbols GLOBAL PROPERTY ${STRING_OBJECT}_SYMBOLS)
+  set(${STRING_STRING} "${${STRING_STRING}}\n")
+  foreach(symbol ${symbols})
+    to_string(OBJECT ${symbol} STRING ${STRING_STRING})
+  endforeach()
+
+  set(${STRING_STRING} ${${STRING_STRING}} PARENT_SCOPE)
+endfunction()
+
+
+function(section_to_string)
+  cmake_parse_arguments(STRING "" "SECTION;STRING" "" ${ARGN})
+
+  get_property(name     GLOBAL PROPERTY ${STRING_SECTION}_NAME)
+  get_property(address  GLOBAL PROPERTY ${STRING_SECTION}_ADDRESS)
+  get_property(type     GLOBAL PROPERTY ${STRING_SECTION}_TYPE)
+  get_property(align    GLOBAL PROPERTY ${STRING_SECTION}_ALIGN)
+  get_property(subalign GLOBAL PROPERTY ${STRING_SECTION}_SUBALIGN)
+  get_property(endalign GLOBAL PROPERTY ${STRING_SECTION}_ENDALIGN)
+  get_property(vma      GLOBAL PROPERTY ${STRING_SECTION}_VMA)
+  get_property(lma      GLOBAL PROPERTY ${STRING_SECTION}_LMA)
+  get_property(noinput  GLOBAL PROPERTY ${STRING_SECTION}_NOINPUT)
+  get_property(noinit   GLOBAL PROPERTY ${STRING_SECTION}_NOINIT)
+
+  get_property(nosymbols  GLOBAL PROPERTY ${STRING_SECTION}_NOSYMBOLS)
+  get_property(start_syms GLOBAL PROPERTY ${STRING_SECTION}_START_SYMBOLS)
+  get_property(end_syms   GLOBAL PROPERTY ${STRING_SECTION}_END_SYMBOLS)
+
+  get_property(parent   GLOBAL PROPERTY ${STRING_SECTION}_PARENT)
+
+  get_property(parent_type GLOBAL PROPERTY ${parent}_OBJ_TYPE)
+  if(${parent_type} STREQUAL GROUP)
+    get_property(group_parent_vma GLOBAL PROPERTY ${parent}_VMA)
+    get_property(group_parent_lma GLOBAL PROPERTY ${parent}_LMA)
+    if(NOT DEFINED vma)
+      get_property(vma GLOBAL PROPERTY ${parent}_VMA)
+    endif()
+    if(NOT DEFINED lma)
+      get_property(lma GLOBAL PROPERTY ${parent}_LMA)
+    endif()
+  endif()
+
+  if(DEFINED group_parent_vma AND DEFINED group_parent_lma)
+    # Something to init
+    set(part "rw ")
+  else()
+    set(part)
+  endif()
+
+
+  set_property(GLOBAL PROPERTY ILINK_CURRENT_SECTIONS)
+
+  string(REGEX REPLACE "^[\.]" "" name_clean "${name}")
+  string(REPLACE "." "_" name_clean "${name_clean}")
+
+  # WA for 'Error[Lc036]: no block or place matches the pattern "ro data section .tdata_init"'
+  if("${name_clean}" STREQUAL "tdata")
+    set(TEMP "${TEMP}define block ${name_clean}_init { ro section .tdata_init };\n")
+    set(TEMP "${TEMP}\"${name_clean}_init\": place in ${ILINK_CURRENT_NAME} { block ${name_clean}_init };\n\n")
+  endif()
+
+  get_property(indicies GLOBAL PROPERTY ${STRING_SECTION}_SETTINGS_INDICIES)
+  # ZIP_LISTS partner
+  get_property(next_indicies GLOBAL PROPERTY ${STRING_SECTION}_SETTINGS_INDICIES)
+  list(POP_FRONT next_indicies first_index)
+
+  set(first_index_section)
+  set(first_index_section_name)
+  if(DEFINED first_index)
+    # Handle case where the first section has an offset
+    get_property(first_index_offset
+      GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${first_index}_OFFSET)
+    get_property(keep   GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${first_index}_KEEP)
+    if(DEFINED keep)
+      set(root "root ")
+    else()
+      set(root)
+    endif()
+    if(DEFINED first_index_offset AND NOT first_index_offset EQUAL 0 )
+      set(first_index_section_name "${name_clean}_${first_index}_offset")
+      set(first_index_section
+        "define ${root}section ${first_index_section_name} {};")
+    else()
+      set(first_index)
+    endif()
+  endif()
+
+  foreach(start_symbol ${start_syms})
+    set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "${start_symbol} = ADDR(${name_clean})")
+  endforeach()
+  foreach(end_symbol ${end_syms})
+    set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "${end_symbol} = END(${name_clean})")
+  endforeach()
+
+  if(NOT nosymbols)
+    if("${name_clean}" STREQUAL "tdata")
+      set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "__${name_clean}_start = (__iar_tls$$INIT_DATA$$Base)")
+      set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "__${name_clean}_end = (__iar_tls$$INIT_DATA$$Limit)")
+    else()
+      set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "__${name_clean}_start = ADDR(${name_clean})")
+      set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "__${name_clean}_end = END(${name_clean})")
+    endif()
+  endif()
+  # section patterns and blocks to keep { }
+  set(to_be_kept "")
+
+  if(DEFINED first_index_section)
+    set(TEMP "${TEMP}${first_index_section}\n")
+  endif()
+
+  set(TEMP "${TEMP}define block ${name_clean} with fixed order")
+
+  if(align)
+    set(TEMP "${TEMP}, alignment=${align}")
+  elseif(subalign)
+    set(TEMP "${TEMP}, alignment = ${subalign}")
+  elseif(part)
+    set(TEMP "${TEMP}, alignment = input")
+  else()
+    set(TEMP "${TEMP}, alignment=4")
+  endif()
+  if(endalign)
+    set(TEMP "${TEMP}, end alignment=${endalign}")
+  endif()
+
+  set(TEMP "${TEMP}\n{")
+
+  # foreach(start_symbol ${start_syms})
+  #   set(TEMP "${TEMP}\n  section ${start_symbol},")
+  #   set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section ${start_symbol}")
+  # endforeach()
+
+  # if(NOT nosymbols)
+  #   set(TEMP "${TEMP}\n  section __${name_clean}_start,")
+  #   set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section __${name_clean}_start")
+  # endif()
+
+  list(GET indicies -1 last_index)
+  list(LENGTH indicies length)
+
+  if(NOT noinput)
+
+    set(TEMP "${TEMP}\n  block ${name_clean}_winput")
+    if(align)
+      list(APPEND block_attr "alignment = ${align}")
+    elseif(subalign)
+      list(APPEND block_attr "alignment = ${subalign}")
+    elseif(part)
+      # list(APPEND block_attr "alignment = input")
+    else()
+      list(APPEND block_attr "alignment=4")
+    endif()
+    list(APPEND block_attr "fixed order")
+
+    list(JOIN block_attr ", " block_attr_str)
+    if(block_attr_str)
+      set(TEMP "${TEMP} with ${block_attr_str}")
+    endif()
+    set(block_attr)
+    set(block_attr_str)
+
+    set(TEMP "${TEMP} { ${part}section ${name}, ${part}section ${name}.* }")
+    if(${length} GREATER 0)
+      set(TEMP "${TEMP},")
+    endif()
+    set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section ${name}")
+    set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section ${name}.*")
+  endif()
+
+  foreach(idx idx_next IN ZIP_LISTS indicies next_indicies)
+    get_property(align    GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_ALIGN)
+    get_property(any      GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_ANY)
+    get_property(first    GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_FIRST)
+    get_property(keep     GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_KEEP)
+    get_property(sort     GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_SORT)
+    get_property(flags    GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_FLAGS)
+    get_property(input    GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_INPUT)
+    get_property(symbols  GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_SYMBOLS)
+    # Get the next offset and use that as this ones size!
+    get_property(offset   GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx_next}_OFFSET)
+
+    if(keep)
+      list(APPEND to_be_kept "block ${name_clean}_${idx}")
+      foreach(setting ${input})
+        list(APPEND to_be_kept "section ${setting}")
+      endforeach()
+    endif()
+    if(DEFINED symbols)
+      list(LENGTH symbols symbols_count)
+      if(${symbols_count} GREATER 0)
+        list(GET symbols 0 symbol_start)
+      endif()
+      if(${symbols_count} GREATER 1)
+        list(GET symbols 1 symbol_end)
+      endif()
+    endif()
+
+    if(DEFINED symbol_start)
+      # set(TEMP "${TEMP}\n  section ${symbol_start},")
+      # set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section ${symbol_start}")
+      set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "${symbol_start} = ADDR(${name_clean}_${idx})")
+    endif()
+
+    if(DEFINED first_index AND first_index EQUAL ${idx})
+      # Create the offset
+      set(TEMP "${TEMP}\n  block ${first_index_section_name}")
+      list(APPEND block_attr "size = ${first_index_offset}")
+      if(sort)
+        if(${sort} STREQUAL NAME)
+          list(APPEND block_attr "alphabetical order")
+        endif()
+      endif()
+      if(align)
+        list(APPEND block_attr "alignment = ${align}")
+      elseif(subalign)
+        list(APPEND block_attr "alignment = ${subalign}")
+      elseif(part)
+        # list(APPEND block_attr "alignment = input")
+      else()
+        list(APPEND block_attr "alignment=4")
+      endif()
+      list(APPEND block_attr "fixed order")
+
+      list(JOIN block_attr ", " block_attr_str)
+      if(block_attr_str)
+        set(TEMP "${TEMP} with ${block_attr_str}")
+      endif()
+      set(block_attr)
+      set(block_attr_str)
+
+      set(TEMP "${TEMP} { section ${first_index_section_name} },\n")
+    endif()
+
+    # block init_100 with alphabetical order { section .z_init_EARLY_?_}
+    set(TEMP "${TEMP}\n  block ${name_clean}_${idx}")
+    if(DEFINED offset AND NOT offset EQUAL 0 )
+      list(APPEND block_attr "size = ${offset}")
+    elseif(DEFINED offset AND offset STREQUAL 0 )
+      # Do nothing
+    endif()
+    if(sort)
+      if(${sort} STREQUAL NAME)
+        list(APPEND block_attr "alphabetical order")
+      endif()
+    endif()
+    if(align)
+      list(APPEND block_attr "alignment = ${align}")
+    elseif(subalign)
+      list(APPEND block_attr "alignment = ${subalign}")
+    elseif(part)
+      # list(APPEND block_attr "alignment = input")
+    else()
+      list(APPEND block_attr "alignment=4")
+    endif()
+
+    # LD
+    # There are two ways to include more than one section:
+    #
+    # *(.text .rdata)
+    # *(.text) *(.rdata)
+    #
+    # The difference between these is the order in which
+    # the `.text' and `.rdata' input sections will appear in the output section.
+    # In the first example, they will be intermingled,
+    # appearing in the same order as they are found in the linker input.
+    # In the second example, all `.text' input sections will appear first,
+    # followed by all `.rdata' input sections.
+    #
+    # ILINK solved by adding 'fixed order'
+    if(NOT sort AND NOT first)
+      list(APPEND block_attr "fixed order")
+    endif()
+
+    list(JOIN block_attr ", " block_attr_str)
+    if(block_attr_str)
+      set(TEMP "${TEMP} with ${block_attr_str}")
+    endif()
+    set(block_attr)
+    set(block_attr_str)
+
+    if(empty)
+      set(TEMP "${TEMP}\n  {")
+      set(empty FALSE)
+    endif()
+
+    list(GET input -1 last_input)
+
+    set(TEMP "${TEMP} {")
+    if(NOT DEFINED input AND NOT any)
+      set(TEMP "${TEMP} }")
+    endif()
+
+    foreach(setting ${input})
+      if(first)
+        set(TEMP "${TEMP} first")
+        set(first "")
+      endif()
+
+      set(section_type "")
+
+      # build for ram, no section_type
+      # if("${lma}" STREQUAL "${vma}")
+      #		# if("${vma}" STREQUAL "")
+      #           set(section_type "")
+      #		# else()
+      #		#   set(section_type " readwrite")
+      #		# endif()
+      # elseif(NOT "${vma}" STREQUAL "")
+      #		set(section_type " readwrite")
+      # elseif(NOT "${lma}" STREQUAL "")
+      #		set(section_type " readonly")
+      # else()
+      #		message(FATAL_ERROR "How to handle this? lma=${lma} vma=${vma}")
+      # endif()
+
+      set(TEMP "${TEMP}${section_type} ${part}section ${setting}")
+      set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section ${setting}")
+      set(section_type "")
+
+      if("${setting}" STREQUAL "${last_input}")
+        set(TEMP "${TEMP} }")
+      else()
+        set(TEMP "${TEMP}, ")
+      endif()
+
+      # set(TEMP "${TEMP}\n    *.o(${setting})")
+    endforeach()
+
+    if(any)
+      if(NOT flags)
+        message(FATAL_ERROR ".ANY requires flags to be set.")
+      endif()
+      set(ANY_FLAG "")
+      foreach(flag ${flags})
+        # if("${flag}" STREQUAL +RO OR "${flag}" STREQUAL +XO)
+        #   set(ANY_FLAG "readonly")
+        # # elseif("${flag}" STREQUAL +RW)
+        # #   set(ANY_FLAG "readwrite")
+        # else
+        if("${flag}" STREQUAL +ZI)
+          set(ANY_FLAG "zeroinit")
+          set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "${ANY_FLAG}")
+        endif()
+      endforeach()
+      set(TEMP "${TEMP} ${ANY_FLAG} }")
+    endif()
+
+    if(DEFINED symbol_end)
+      # set(TEMP "${TEMP},\n  section ${symbol_end}")
+      # set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section ${symbol_end}")
+      set_property(GLOBAL APPEND PROPERTY ILINK_SYMBOL_ICF "${symbol_end} = END(${name_clean}_${idx})")
+    endif()
+    if(${length} GREATER 0)
+      if(NOT "${idx}" STREQUAL "${last_index}")
+        set(TEMP "${TEMP},")
+      elseif()
+      endif()
+    endif()
+
+    set(symbol_start)
+    set(symbol_end)
+  endforeach()
+  set(next_indicies)
+
+  set(last_index)
+  set(last_input)
+  set(TEMP "${TEMP}")
+
+  # if(NOT nosymbols)
+  #   set(TEMP "${TEMP},\n  section __${name_clean}_end")
+  #   set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section __${name_clean}_end")
+  # endif()
+
+  # foreach(end_symbol ${end_syms})
+  #   set(TEMP "${TEMP},\n  section ${end_symbol}")
+  #   set_property(GLOBAL APPEND PROPERTY ILINK_CURRENT_SECTIONS "section ${end_symbol}")
+  # endforeach()
+
+  set(TEMP "${TEMP}\n};")
+
+  get_property(type GLOBAL PROPERTY ${parent}_OBJ_TYPE)
+  if(${type} STREQUAL REGION)
+    get_property(name GLOBAL PROPERTY ${parent}_NAME)
+    get_property(address GLOBAL PROPERTY ${parent}_ADDRESS)
+    get_property(size GLOBAL PROPERTY ${parent}_SIZE)
+
+  endif()
+
+  get_property(current_sections GLOBAL PROPERTY ILINK_CURRENT_SECTIONS)
+
+  if(DEFINED group_parent_vma AND DEFINED group_parent_lma)
+    if(${noinit})
+      list(JOIN current_sections ", " SELECTORS)
+      set(TEMP "${TEMP}\ndo not initialize {\n${SELECTORS}\n};")
+    else()
+      # Generate the _init block and the initialize manually statement.
+      # Note that we need to have the X_init block defined even if we have
+      # no sections, since there will come a "place in XXX" statement later.
+
+      # "${TEMP}" is there too keep the ';' else it will be a list
+      string(REGEX REPLACE "(block[ \t\r\n]+)([^ \t\r\n]+)" "\\1\\2_init" INIT_TEMP "${TEMP}")
+      string(REGEX REPLACE "(rw)([ \t\r\n]+)(section[ \t\r\n]+)([^ \t\r\n,]+)" "\\1\\2\\3\\4_init" INIT_TEMP "${INIT_TEMP}")
+      string(REGEX REPLACE "(rw)([ \t\r\n]+)(section[ \t\r\n]+)" "ro\\2\\3" INIT_TEMP "${INIT_TEMP}")
+      string(REGEX REPLACE "alphabetical order, " "" INIT_TEMP "${INIT_TEMP}")
+      string(REGEX REPLACE "{ readwrite }" "{ }" INIT_TEMP "${INIT_TEMP}")
+
+      # If any content is marked as keep, is has to be applied to the init block
+      # too, esp. for blocks that are not referenced (e.g. empty blocks wiht min_size)
+      if(to_be_kept)
+        list(APPEND to_be_kept "block ${name_clean}_init")
+      endif()
+      set(TEMP "${TEMP}\n${INIT_TEMP}\n")
+      if(DEFINED current_sections)
+        set(TEMP "${TEMP}\ninitialize manually with copy friendly\n")
+        set(TEMP "${TEMP}{\n")
+        foreach(section ${current_sections})
+          set(TEMP "${TEMP}  ${section},\n")
+        endforeach()
+        set(TEMP "${TEMP}};")
+        set(current_sections)
+      endif()
+    endif()
+  endif()
+
+  # Finally, add the keeps.
+  if(to_be_kept)
+    list(JOIN to_be_kept ", " K)
+    set(TEMP "${TEMP}\nkeep { ${K} };\n")
+  endif()
+
+  set(${STRING_STRING} "${${STRING_STRING}}\n${TEMP}\n" PARENT_SCOPE)
+endfunction()
+
+function(symbol_to_string)
+  cmake_parse_arguments(STRING "" "SYMBOL;STRING" "" ${ARGN})
+
+  get_property(name     GLOBAL PROPERTY ${STRING_SYMBOL}_NAME)
+  get_property(expr     GLOBAL PROPERTY ${STRING_SYMBOL}_EXPR)
+  get_property(size     GLOBAL PROPERTY ${STRING_SYMBOL}_SIZE)
+  get_property(symbol   GLOBAL PROPERTY ${STRING_SYMBOL}_SYMBOL)
+  get_property(subalign GLOBAL PROPERTY ${STRING_SYMBOL}_SUBALIGN)
+
+  string(REPLACE "\\" "" expr "${expr}")
+  string(REGEX MATCHALL "@([^@]*)@" match_res ${expr})
+
+  foreach(match ${match_res})
+    string(REPLACE "@" "" match ${match})
+    get_property(symbol_val GLOBAL PROPERTY SYMBOL_TABLE_${match})
+    string(REPLACE "@${match}@" "${match}" expr ${expr})
+  endforeach()
+
+  list(LENGTH match_res match_res_count)
+
+  if(match_res_count)
+    if(${match_res_count} GREATER 1)
+      set(${STRING_STRING}
+        "${${STRING_STRING}}define image symbol ${symbol} = ${expr};\n"
+        )
+    else()
+      if((expr MATCHES "Base|Limit|Length") OR (expr MATCHES "ADDR\\(|END\\(|SIZE\\("))
+        # Anything like $$Base/$$Limit/$$Length should be an image symbol
+        if( "${symbol}" STREQUAL "__tdata_size")
+          # This will handle the alignment of the TBSS block
+          set(${STRING_STRING}
+            "${${STRING_STRING}}define image symbol ${symbol}=(__iar_tls$$INIT_DATA$$Limit-__iar_tls$$INIT_DATA$$Base);\n"
+            )
+        elseif( "${symbol}" STREQUAL "__tbss_size")
+          # This will handle the alignment of the TBSS block by
+          # pre-padding bytes
+          set(${STRING_STRING}
+            "${${STRING_STRING}}define image symbol ${symbol}=((tbss$$Limit-__iar_tls$$DATA$$Base)-(__iar_tls$$INIT_DATA$$Limit-__iar_tls$$INIT_DATA$$Base));\n"
+            )
+        else()
+          set(${STRING_STRING}
+            "${${STRING_STRING}}define image symbol ${symbol} = ${expr};\n"
+            )
+        endif()
+      else()
+        list(GET match_res 0 match)
+        string(REPLACE "@" "" match ${match})
+        get_property(symbol_val GLOBAL PROPERTY SYMBOL_TABLE_${match})
+        if(symbol_val)
+          set(${STRING_STRING}
+            "${${STRING_STRING}}define image symbol ${symbol} = ${expr};\n"
+            )
+        else()
+          # Treatmen of "zephyr_linker_symbol(SYMBOL z_arm_platform_init EXPR "@SystemInit@")"
+          set_property(GLOBAL APPEND PROPERTY SYMBOL_STEERING_FILE
+            "--redirect ${symbol}=${expr}\n"
+            )
+        endif()
+      endif()
+    endif()
+  else()
+    # Handle things like ADDR(.ramfunc)
+    if(${expr} MATCHES "^[A-Za-z]?ADDR\\(.+\\)")
+      # string(REGEX REPLACE "^[A-Za-z]?ADDR\\((.+)\\)" "(\\1$$Base)" expr ${expr})
+      set(${STRING_STRING}
+        "${${STRING_STRING}}define image symbol ${symbol} = ${expr};\n"
+        )
+    else()
+      set(${STRING_STRING}
+        "${${STRING_STRING}}define exported symbol ${symbol} = ${expr};\n"
+        )
+    endif()
+  endif()
+
+  set(${STRING_STRING} ${${STRING_STRING}} PARENT_SCOPE)
+endfunction()
+
+include(${CMAKE_CURRENT_LIST_DIR}/../linker_script_common.cmake)
+
+if(DEFINED STEERING_FILE)
+  get_property(steering_content GLOBAL PROPERTY SYMBOL_STEERING_FILE)
+  file(WRITE ${STEERING_FILE}  "/* AUTO-GENERATED - Do not modify\n")
+  file(APPEND ${STEERING_FILE} " * AUTO-GENERATED - All changes will be lost\n")
+  file(APPEND ${STEERING_FILE} " */\n")
+
+  file(APPEND ${STEERING_FILE} ${steering_content})
+endif()
diff --git a/cmake/linker/iar/linker_flags.cmake b/cmake/linker/iar/linker_flags.cmake
new file mode 100644
index 0000000000000..f65925ff8a894
--- /dev/null
+++ b/cmake/linker/iar/linker_flags.cmake
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Override the default CMake's IAR ILINK linker signature
+
+string(APPEND CMAKE_C_LINK_FLAGS --no-wrap-diagnostics  )
+
+foreach(lang C CXX ASM)
+  set(commands "--log modules,libraries,initialization,redirects,sections")
+  set(CMAKE_${lang}_LINK_EXECUTABLE
+  "<CMAKE_LINKER> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> ${commands} <LINK_LIBRARIES> <OBJECTS> -o <TARGET>")
+  set(commands)
+endforeach()
diff --git a/cmake/linker/iar/target.cmake b/cmake/linker/iar/target.cmake
new file mode 100644
index 0000000000000..f2326b60491aa
--- /dev/null
+++ b/cmake/linker/iar/target.cmake
@@ -0,0 +1,135 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set_property(TARGET linker PROPERTY devices_start_symbol "_device_list_start")
+find_program(CMAKE_LINKER
+  NAMES ${CROSS_COMPILE}${IAR_LINKER}
+  PATHS ${TOOLCHAIN_HOME}
+  PATH_SUFFIXES bin
+  NO_DEFAULT_PATH
+)
+
+add_custom_target(${IAR_LINKER})
+set(ILINK_THUMB_CALLS_WARNING_SUPPRESSED)
+set(IAR_LIB_USED)
+function(toolchain_ld_force_undefined_symbols "")
+#  foreach(symbol ${ARGN})
+#    zephyr_link_libraries(--place_holder=${symbol})
+#  endforeach()
+endfunction()
+
+# NOTE: ${linker_script_gen} will be produced at build-time; not at configure-time
+macro(configure_linker_script linker_script_gen linker_pass_define)
+  set(extra_dependencies ${ARGN})
+  set(STEERING_FILE "${CMAKE_CURRENT_BINARY_DIR}/${linker_script_gen}.xcl")
+  set(STEERING_FILE_ARG "-DSTEERING_FILE=${STEERING_FILE}")
+  set(cmake_linker_script_settings
+      ${PROJECT_BINARY_DIR}/include/generated/ld_script_settings_${linker_pass_define}.cmake
+  )
+  if("${linker_pass_define}" STREQUAL "LINKER_ZEPHYR_PREBUILT")
+    set(ILINK_THUMB_CALLS_WARNING_SUPPRESSED "--diag_suppress=Lt056")
+  else()
+    set(ILINK_THUMB_CALLS_WARNING_SUPPRESSED "")
+  endif()
+  if(CONFIG_IAR_LIBC OR CONFIG_IAR_LIBCPP)
+    set(IAR_LIB_USED "-DIAR_LIBC=1")
+  else()
+    set(IAR_LIB_USED "")
+  endif()
+
+  file(GENERATE OUTPUT ${cmake_linker_script_settings} CONTENT
+       "set(FORMAT \"$<TARGET_PROPERTY:linker,FORMAT>\" CACHE INTERNAL \"\")\n
+        set(ENTRY \"$<TARGET_PROPERTY:linker,ENTRY>\" CACHE INTERNAL \"\")\n
+        set(MEMORY_REGIONS \"$<TARGET_PROPERTY:linker,MEMORY_REGIONS>\" CACHE INTERNAL \"\")\n
+        set(GROUPS \"$<TARGET_PROPERTY:linker,GROUPS>\" CACHE INTERNAL \"\")\n
+        set(SECTIONS \"$<TARGET_PROPERTY:linker,SECTIONS>\" CACHE INTERNAL \"\")\n
+        set(SECTION_SETTINGS \"$<TARGET_PROPERTY:linker,SECTION_SETTINGS>\" CACHE INTERNAL \"\")\n
+        set(SYMBOLS \"$<TARGET_PROPERTY:linker,SYMBOLS>\" CACHE INTERNAL \"\")\n
+       "
+    )
+  add_custom_command(
+    OUTPUT ${linker_script_gen}
+           ${STEERING_FILE}
+    DEPENDS
+           ${extra_dependencies}
+           ${DEVICE_API_LD_TARGET}
+    COMMAND ${CMAKE_COMMAND}
+      -C ${DEVICE_API_LINKER_SECTIONS_CMAKE}
+      -C ${cmake_linker_script_settings}
+      -DPASS="${linker_pass_define}"
+      ${STEERING_FILE_ARG}
+      -DCONFIG_LINKER_LAST_SECTION_ID=${CONFIG_LINKER_LAST_SECTION_ID}
+      -DCONFIG_LINKER_LAST_SECTION_ID_PATTERN=${CONFIG_LINKER_LAST_SECTION_ID_PATTERN}
+      -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/${linker_script_gen}
+      ${IAR_LIB_USED}
+      -P ${ZEPHYR_BASE}/cmake/linker/iar/config_file_script.cmake
+  )
+
+endmacro()
+
+function(toolchain_ld_link_elf)
+  cmake_parse_arguments(
+    TOOLCHAIN_LD_LINK_ELF                                     # prefix of output variables
+    ""                                                        # list of names of the boolean arguments
+    "TARGET_ELF;OUTPUT_MAP;LINKER_SCRIPT"                     # list of names of scalar arguments
+    "LIBRARIES_PRE_SCRIPT;LIBRARIES_POST_SCRIPT;DEPENDENCIES" # list of names of list arguments
+    ${ARGN}                                                   # input args to parse
+  )
+
+  foreach(lib ${ZEPHYR_LIBS_PROPERTY})
+    list(APPEND ZEPHYR_LIBS_OBJECTS $<TARGET_OBJECTS:${lib}>)
+    list(APPEND ZEPHYR_LIBS_OBJECTS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
+  endforeach()
+
+  set(ILINK_SEMIHOSTING)
+  set(ILINK_BUFFERED_WRITE)
+  if(${CONFIG_IAR_SEMIHOSTING})
+    set(ILINK_SEMIHOSTING "--semihosting")
+  endif()
+  if(${CONFIG_IAR_BUFFERED_WRITE})
+    set(ILINK_BUFFERED_WRITE "--redirect __write=__write_buffered")
+  endif()
+
+  set(ILINK_XCL "-f ${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT}.xcl")
+
+  set(ILINK_TLS_LIBRARY)
+  if(${CONFIG_THREAD_LOCAL_STORAGE})
+    set(ILINK_TLS_LIBRARY "--threaded_lib=manual")
+  endif()
+
+  set(ILINK_TZONE_LIBRARY)
+  # if(${CONFIG_IAR_LIBC})
+  #   set(ILINK_TZONE_LIBRARY "--timezone_lib")
+  # endif()
+
+  target_link_libraries(
+    ${TOOLCHAIN_LD_LINK_ELF_TARGET_ELF}
+    ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_PRE_SCRIPT}
+    --config=${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT}
+    ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_POST_SCRIPT}
+    --map=${TOOLCHAIN_LD_LINK_ELF_OUTPUT_MAP}
+    --log_file=${TOOLCHAIN_LD_LINK_ELF_OUTPUT_MAP}.log
+
+    ${ZEPHYR_LIBS_OBJECTS}
+    kernel
+    $<TARGET_OBJECTS:${OFFSETS_LIB}>
+    --entry=$<TARGET_PROPERTY:linker,ENTRY>
+
+    ${ILINK_SEMIHOSTING}
+    ${ILINK_BUFFERED_WRITE}
+    ${ILINK_TLS_LIBRARY}
+    ${ILINK_TZONE_LIBRARY}
+    ${ILINK_THUMB_CALLS_WARNING_SUPPRESSED}
+    # Do not remove symbols
+    #--no_remove
+    ${ILINK_XCL}
+
+    ${TOOLCHAIN_LIBS_OBJECTS}
+
+    ${TOOLCHAIN_LD_LINK_ELF_DEPENDENCIES}
+  )
+endfunction(toolchain_ld_link_elf)
+
+include(${ZEPHYR_BASE}/cmake/linker/ld/target_relocation.cmake)
+include(${ZEPHYR_BASE}/cmake/linker/ld/target_configure.cmake)
diff --git a/cmake/linker/ld/ld_script.cmake b/cmake/linker/ld/ld_script.cmake
index 76cb5b433f112..22fd1b66d625b 100644
--- a/cmake/linker/ld/ld_script.cmake
+++ b/cmake/linker/ld/ld_script.cmake
@@ -88,6 +88,10 @@ function(group_to_string)
   cmake_parse_arguments(STRING "" "OBJECT;STRING" "" ${ARGN})
 
   get_property(type GLOBAL PROPERTY ${STRING_OBJECT}_OBJ_TYPE)
+
+  # Output a comment for the section start
+  set(${STRING_STRING} "${${STRING_STRING}}\n  /* ${type} : ${STRING_OBJECT} */")
+
   if(${type} STREQUAL REGION)
     get_property(empty GLOBAL PROPERTY ${STRING_OBJECT}_EMPTY)
     if(empty)
@@ -168,6 +172,16 @@ function(group_to_string)
   set(${STRING_STRING} ${${STRING_STRING}} PARENT_SCOPE)
 endfunction()
 
+# Helper to add size-checks and padding to handle MIN_SIZE and MAX_SIZE
+macro(add_min_max_size TEMP min_size max_size symbol_start symbol_end)
+  if(DEFINED ${min_size})
+    set(${TEMP} "${${TEMP}}\n  . = MAX(${${symbol_start}} + ${${min_size}}, .); /*MIN_SIZE*/")
+  endif()
+  if(DEFINED ${max_size})
+    set(${TEMP} "${${TEMP}}\n  ASSERT( ${${symbol_end}} <= ( ${${symbol_start}} + ${${max_size}}), \"MAX_SIZE\");\n . = MIN( ., ${${symbol_start}} + ${${max_size}}); /*MAX_SIZE*/")
+  endif()
+endmacro()
+
 function(section_to_string)
   cmake_parse_arguments(STRING "" "SECTION;STRING" "" ${ARGN})
 
@@ -185,6 +199,8 @@ function(section_to_string)
   get_property(nosymbols  GLOBAL PROPERTY ${STRING_SECTION}_NOSYMBOLS)
   get_property(parent     GLOBAL PROPERTY ${STRING_SECTION}_PARENT)
   get_property(start_syms GLOBAL PROPERTY ${STRING_SECTION}_START_SYMBOLS)
+  get_property(sect_min_size GLOBAL PROPERTY ${STRING_SECTION}_MIN_SIZE)
+  get_property(sect_max_size GLOBAL PROPERTY ${STRING_SECTION}_MAX_SIZE)
 
   string(REGEX REPLACE "^[\.]" "" name_clean "${name}")
   string(REPLACE "." "_" name_clean "${name_clean}")
@@ -212,12 +228,24 @@ function(section_to_string)
 
   set(TEMP "${name} ${address}${type} :${secalign}\n{")
 
+  # Symbol names for size_check
+  set(sect_symbol_start)
+  set(sect_symbol_end)
+
   foreach(start_symbol ${start_syms})
     set(TEMP "${TEMP}\n  ${start_symbol} = .;")
+    set(sect_symbol_start "${start_symbol}")
   endforeach()
 
   if(NOT nosymbols)
     set(TEMP "${TEMP}\n  __${name_clean}_start = .;")
+    set(sect_symbol_start "__${name_clean}_start")
+  endif()
+
+  # Min and Max size may need symbols too, even if the user did not want them
+  if((DEFINED sect_min_size OR DEFINED sect_max_size)
+    AND NOT DEFINED sect_symbol_start)
+      set(sect_symbol_start "__${name_clean}_size_check_start")
   endif()
 
   if(NOT noinput)
@@ -236,8 +264,10 @@ function(section_to_string)
     get_property(input    GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_INPUT)
     get_property(symbols  GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_SYMBOLS)
     get_property(offset   GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_OFFSET)
+    get_property(min_size   GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_MIN_SIZE)
+    get_property(max_size   GLOBAL PROPERTY ${STRING_SECTION}_SETTING_${idx}_MAX_SIZE)
 
-    if(DEFINED SETTINGS_ALIGN)
+    if(DEFINED align)
       set(TEMP "${TEMP}\n  . = ALIGN(${align});")
     endif()
 
@@ -250,6 +280,19 @@ function(section_to_string)
         list(GET symbols 1 symbol_end)
       endif()
     endif()
+    # Min and Max size may need symbols too, even if the user did not want them
+    if(DEFINED min_size OR DEFINED max_size)
+      foreach(se "start" "end")
+        if(NOT DEFINED symbol_${se})
+          set(symbol_${se} "__${name_clean}_${idx}_size_check_${se}")
+        endif()
+      endforeach()
+    endif()
+
+    if(DEFINED offset AND NOT ("${offset}" STREQUAL "${current_offset}"))
+      set(TEMP "${TEMP}\n  . = ${offset}; /* OFFSET */")
+      set(current_offset ${offset})
+    endif()
 
     if(DEFINED symbol_start)
       set(TEMP "${TEMP}\n  ${symbol_start} = .;")
@@ -261,34 +304,53 @@ function(section_to_string)
         set(current_offset ${offset})
       endif()
 
-      if(keep AND sort)
-        set(TEMP "${TEMP}\n  KEEP(*(${SORT_TYPE_${sort}}(${setting})));")
-      elseif(SETTINGS_SORT)
-        message(WARNING "Not tested")
-        set(TEMP "${TEMP}\n  *(${SORT_TYPE_${sort}}(${setting}));")
-      elseif(keep)
-        set(TEMP "${TEMP}\n  KEEP(*(${setting}));")
+      #setting may have file-pattern or not.
+      if(setting MATCHES "(.+)\\((.+)\\)")
+        set(file_pattern "${CMAKE_MATCH_1}")
+        set(section_pattern "${CMAKE_MATCH_2}")
       else()
-        set(TEMP "${TEMP}\n  *(${setting})")
+        set(file_pattern "*")
+        set(section_pattern "${setting}")
+      endif()
+
+      if(sort)
+        set(section_pattern "${SORT_TYPE_${sort}}(${section_pattern})")
+      endif()
+      set(pattern "${file_pattern}(${section_pattern})")
+      if(keep)
+        set(pattern "KEEP(${pattern})")
       endif()
+      set(TEMP "${TEMP}\n  ${pattern};")
     endforeach()
 
     if(DEFINED symbol_end)
       set(TEMP "${TEMP}\n  ${symbol_end} = .;")
     endif()
 
+    add_min_max_size(TEMP min_size max_size symbol_start symbol_end)
+
     set(symbol_start)
     set(symbol_end)
   endforeach()
 
   if(NOT nosymbols)
     set(TEMP "${TEMP}\n  __${name_clean}_end = .;")
+    set(sect_symbol_end "__${name_clean}_end")
   endif()
 
   if(DEFINED extra_symbol_end)
     set(TEMP "${TEMP}\n  ${extra_symbol_end} = .;")
+    set(sect_symbol_end "${extra_symbol_end}")
+  endif()
+
+  # Min and Max size may need symbols too, even if the user did not want them
+  if((DEFINED sect_min_size OR DEFINED sect_max_size)
+    AND NOT DEFINED sect_symbol_end)
+      set(sect_symbol_end "__${name_clean}_size_check_end")
   endif()
 
+  add_min_max_size(TEMP sect_min_size sect_max_size sect_symbol_start sect_symbol_end)
+
   set(TEMP "${TEMP}\n}")
 
   get_property(parent_type GLOBAL PROPERTY ${parent}_OBJ_TYPE)
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index 37a88b837c48a..733accda78203 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -23,25 +23,20 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
   )
 
   if(CONFIG_CMAKE_LINKER_GENERATOR)
-    file(GENERATE OUTPUT ${cmake_linker_script_settings} CONTENT
-         "set(FORMAT \"$<TARGET_PROPERTY:linker,FORMAT>\" CACHE INTERNAL \"\")\n
-          set(ENTRY \"$<TARGET_PROPERTY:linker,ENTRY>\" CACHE INTERNAL \"\")\n
-          set(MEMORY_REGIONS \"$<TARGET_PROPERTY:linker,MEMORY_REGIONS>\" CACHE INTERNAL \"\")\n
-          set(GROUPS \"$<TARGET_PROPERTY:linker,GROUPS>\" CACHE INTERNAL \"\")\n
-          set(SECTIONS \"$<TARGET_PROPERTY:linker,SECTIONS>\" CACHE INTERNAL \"\")\n
-          set(SECTION_SETTINGS \"$<TARGET_PROPERTY:linker,SECTION_SETTINGS>\" CACHE INTERNAL \"\")\n
-          set(SYMBOLS \"$<TARGET_PROPERTY:linker,SYMBOLS>\" CACHE INTERNAL \"\")\n
-         "
-    )
+
+    zephyr_linker_generate_linker_settings_file(${cmake_linker_script_settings})
+
     add_custom_command(
       OUTPUT ${linker_script_gen}
+      DEPENDS
+        ${extra_dependencies}
+        ${cmake_linker_script_settings}
+        ${DEVICE_API_LD_TARGET}
       COMMAND ${CMAKE_COMMAND}
-        -C ${DEVICE_API_LINKER_SECTIONS_CMAKE}
         -C ${cmake_linker_script_settings}
         -DPASS="${linker_pass_define}"
         -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/${linker_script_gen}
         -P ${ZEPHYR_BASE}/cmake/linker/ld/ld_script.cmake
-      DEPENDS ${DEVICE_API_LD_TARGET}
     )
   else()
     set(template_script_defines ${linker_pass_define})
diff --git a/cmake/linker/linker_script_common.cmake b/cmake/linker/linker_script_common.cmake
index 017de14cf6bf4..272fe7977779f 100644
--- a/cmake/linker/linker_script_common.cmake
+++ b/cmake/linker/linker_script_common.cmake
@@ -1,7 +1,8 @@
+find_package(Zephyr REQUIRED COMPONENTS extensions HINTS ${CMAKE_CURRENT_LIST_DIR}/../../)
+
 #
 # Create functions - start
 #
-
 function(create_system)
   cmake_parse_arguments(OBJECT "" "ENTRY;FORMAT;NAME;OBJECT" "" ${ARGN})
 
@@ -47,6 +48,7 @@ function(get_parent)
     return()
   endif()
 
+  # Follow parent pointers until a GET_PARENT_TYPE is reached
   get_property(parent GLOBAL PROPERTY ${GET_PARENT_OBJECT}_PARENT)
   get_property(type   GLOBAL PROPERTY ${parent}_OBJ_TYPE)
   while(NOT ${type} STREQUAL ${GET_PARENT_TYPE})
@@ -94,15 +96,34 @@ function(create_group)
   set(${OBJECT_OBJECT} GROUP_${OBJECT_NAME} PARENT_SCOPE)
 endfunction()
 
+function(is_active_in_pass ret_ptr current_pass pass_rules)
+  # by validation in zephyr_linker_* we know that if there is a NOT,
+  # it is the first, and the other entries are pass names
+  if(NOT pass_rules)
+    set(result 1)
+  elseif("NOT" IN_LIST pass_rules)
+    set(result 1)
+    if(current_pass IN_LIST pass_rules)
+      set(result 0)
+    endif()
+  else()
+    set(result 0)
+    if(current_pass IN_LIST pass_rules)
+      set(result 1)
+    endif()
+  endif()
+  set(${ret_ptr} ${result} PARENT_SCOPE)
+endfunction()
+
 function(create_section)
-  set(single_args "NAME;ADDRESS;ALIGN_WITH_INPUT;TYPE;ALIGN;ENDALIGN;SUBALIGN;VMA;LMA;NOINPUT;NOINIT;NOSYMBOLS;GROUP;SYSTEM")
+  set(single_args "NAME;ADDRESS;ALIGN_WITH_INPUT;TYPE;ALIGN;ENDALIGN;SUBALIGN;VMA;LMA;NOINPUT;NOINIT;NOSYMBOLS;GROUP;SYSTEM;MIN_SIZE;MAX_SIZE")
   set(multi_args  "PASS")
 
   cmake_parse_arguments(SECTION "" "${single_args}" "${multi_args}" ${ARGN})
 
   if(DEFINED SECTION_PASS)
-    if(NOT (${SECTION_PASS} IN_LIST PASS))
-      # This section is not active in this pass, ignore.
+    is_active_in_pass(active ${PASS} "${SECTION_PASS}")
+    if(NOT active)
       return()
     endif()
   endif()
@@ -119,6 +140,8 @@ function(create_section)
   set_property(GLOBAL PROPERTY SECTION_${SECTION_NAME}_NOINPUT          ${SECTION_NOINPUT})
   set_property(GLOBAL PROPERTY SECTION_${SECTION_NAME}_NOINIT           ${SECTION_NOINIT})
   set_property(GLOBAL PROPERTY SECTION_${SECTION_NAME}_NOSYMBOLS        ${SECTION_NOSYMBOLS})
+  set_property(GLOBAL PROPERTY SECTION_${SECTION_NAME}_MIN_SIZE         ${SECTION_MIN_SIZE})
+  set_property(GLOBAL PROPERTY SECTION_${SECTION_NAME}_MAX_SIZE         ${SECTION_MAX_SIZE})
 
   string(REGEX REPLACE "^[\.]" "" name_clean "${SECTION_NAME}")
   string(REPLACE "." "_" name_clean "${name_clean}")
@@ -130,7 +153,7 @@ function(create_section)
   set_property(GLOBAL PROPERTY SYMBOL_TABLE___${name_clean}_end        ${name_clean})
 
   set(INDEX 100)
-  set(settings_single "ALIGN;ANY;FIRST;KEEP;OFFSET;PRIO;SECTION;SORT")
+  set(settings_single "ALIGN;ANY;FIRST;KEEP;OFFSET;PRIO;SECTION;SORT;MIN_SIZE;MAX_SIZE")
   set(settings_multi  "FLAGS;INPUT;PASS;SYMBOLS")
   foreach(settings ${SECTION_SETTINGS} ${DEVICE_API_SECTION_SETTINGS})
     if("${settings}" MATCHES "^{(.*)}$")
@@ -141,8 +164,8 @@ function(create_section)
       endif()
 
       if(DEFINED SETTINGS_PASS)
-        if(NOT (${SETTINGS_PASS} IN_LIST PASS))
-          # This section setting is not active in this pass, ignore.
+        is_active_in_pass(active ${PASS} "${SETTINGS_PASS}")
+        if(NOT active)
           continue()
         endif()
       endif()
@@ -240,6 +263,7 @@ function(add_region)
   set_property(GLOBAL APPEND PROPERTY ${ADD_REGION_OBJECT}_REGIONS ${ADD_REGION_REGION})
 endfunction()
 
+# add_group OBJECT o GROUP g adds group g to object o
 function(add_group)
   cmake_parse_arguments(ADD_GROUP "" "OBJECT;GROUP" "" ${ARGN})
 
@@ -352,9 +376,12 @@ function(find_object)
   endif()
 endfunction()
 
+# get_object(LIST l OBJECT o TYPE t)
+# sets l to a list of objects of type t that are children of o
 function(get_objects)
   cmake_parse_arguments(GET "" "LIST;OBJECT;TYPE" "" ${ARGN})
 
+  # Get what type of object we are starting from
   get_property(type GLOBAL PROPERTY ${GET_OBJECT}_OBJ_TYPE)
 
   if(${type} STREQUAL SECTION)
@@ -371,11 +398,14 @@ function(get_objects)
 
   set(out)
 
+  # Find (other) regions in our system
   get_parent(OBJECT ${GET_OBJECT} PARENT parent TYPE SYSTEM)
   get_property(regions GLOBAL PROPERTY ${parent}_REGIONS)
   list(REMOVE_ITEM regions ${GET_OBJECT})
 
   if(${GET_TYPE} STREQUAL SECTION)
+    # If we are retrieving sections, then we need to get _SECTIONS_FIXED,
+    # sections from sub-groups, and immediate setion children
     get_property(sections GLOBAL PROPERTY ${GET_OBJECT}_SECTIONS_FIXED)
     list(APPEND out ${sections})
 
@@ -388,6 +418,7 @@ function(get_objects)
     get_property(sections GLOBAL PROPERTY ${GET_OBJECT}_SECTIONS)
     list(APPEND out ${sections})
 
+    # Now pick up sections from each region via the _vma_ properties.
     foreach(region ${regions})
       get_property(vma GLOBAL PROPERTY ${region}_NAME)
 
@@ -406,6 +437,8 @@ function(get_objects)
   endif()
 
   if(${GET_TYPE} STREQUAL GROUP)
+    # For groups we add immediate sub-groups, and all their descendant groups,
+    # and all the _vma_ groups and descendants
     get_property(groups GLOBAL PROPERTY ${GET_OBJECT}_GROUPS)
     list(APPEND out ${groups})
 
@@ -520,6 +553,7 @@ function(process_region_common)
     endif()
   endif()
 
+  # Loop over other regions with the same parent
   get_parent(OBJECT ${REGION_COMMON_OBJECT} PARENT parent TYPE SYSTEM)
   get_property(regions GLOBAL PROPERTY ${parent}_REGIONS)
   list(REMOVE_ITEM regions ${REGION_COMMON_OBJECT})
@@ -617,6 +651,102 @@ endfunction()
 # String functions - end
 #
 
+## Preprocess and gather input
+foreach(VAR ${VARIABLES})
+  if("${VAR}" MATCHES "^{(.*)}$")
+    cmake_parse_arguments(VAR "" "VAR;VALUE" "PASS" ${CMAKE_MATCH_1})
+
+    if(DEFINED VAR_PASS)
+      is_active_in_pass(active ${PASS} "${VAR_PASS}")
+      if(NOT active)
+        continue()
+      endif()
+    endif()
+
+    set(${VAR_VAR} "${VAR_VALUE}" CACHE INTERNAL "")
+  endif()
+endforeach()
+
+# By the input we have INCLUDES defined that contains the files that we need
+# to include depending on linker pass.
+foreach(file ${INCLUDES})
+  if("${file}" MATCHES "^{(.*)}$")
+    cmake_parse_arguments(INC "" "KCONFIG;HEADER;CMAKE" "PASS" ${CMAKE_MATCH_1})
+
+    if(DEFINED INC_PASS)
+      is_active_in_pass(active ${PASS} "${INC_PASS}")
+      if(NOT active)
+        continue()
+      endif()
+    endif()
+
+    if(CMAKE_VERBOSE_MAKEFILE)
+      message("Reading file ${INC_KCONFIG}${INC_HEADER}${INC_CMAKE}")
+    endif()
+
+    if(INC_KCONFIG)
+      import_kconfig(CONFIG ${INC_KCONFIG})
+    elseif(INC_CMAKE)
+      include(${INC_CMAKE})
+    elseif(INC_HEADER)
+      list(APPEND PREPROCESSOR_FILES ${INC_HEADER})
+    endif()
+  endif()
+endforeach()
+
+# For now, lets start with @FOO@ and store each #define FOO value as a global
+# property AT_VAR_FOO (prefix to avoid name clashes).
+# We will do all the replacements in the input lists before giving them to the
+# generator functions.
+set(VAR_DEF_REGEX "#define ([A-Za-z0-9_]+)[ \t\r\n]+(.+)")
+foreach(file IN LISTS PREPROCESSOR_FILES )
+  if(EXISTS ${file})
+    file(STRINGS ${file} defs REGEX ${VAR_DEF_REGEX})
+    foreach(def ${defs})
+      if(${def} MATCHES ${VAR_DEF_REGEX})
+        set("AT_VAR_${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
+      endif()
+    endforeach()
+  else()
+    message("Missing file ${file}")
+  endif()
+endforeach()
+
+# To pickup information gathered by the scripts from the previous pass, we use
+# the syntax @FOO@ where FOO is a cmake variable name
+function(do_var_replace_in res_ptr src)
+  string(REGEX MATCHALL "@([^@]*)@" match_res "${src}")
+  foreach(match IN LISTS match_res)
+    string(REPLACE "@" "" expr ${match})
+    # the variable expression is as follows:
+    # @NAME[,undef:VALUE]@ Where the VALUE gets picked if we dont find NAME
+    string(REPLACE "," ";" expr ${expr})
+    list(GET expr 0 var)
+    if(DEFINED "AT_VAR_${var}")
+      set(value "${AT_VAR_${var}}")
+    elseif(DEFINED ${var}) # set by zephyr_linker_include_generated files
+      set(value "${${var}}")
+    elseif("${expr}" MATCHES ";undef:([^,]*)")
+      set(value "${CMAKE_MATCH_1}")
+    else()
+      set(value "${match}")
+      # can't warn here because we can't check for what is relevant in this pass
+      # message(WARNING "Missing definition for ${match}")
+    endif()
+
+    if(CMAKE_VERBOSE_MAKEFILE)
+      message("Using variable ${match} with value ${value}")
+    endif()
+    string(REPLACE "${match}" "${value}" src "${src}")
+  endforeach()
+  set(${res_ptr} "${src}" PARENT_SCOPE)
+endfunction()
+
+foreach(input IN ITEMS "MEMORY_REGIONS" "GROUPS" "SECTIONS" "SECTION_SETTINGS")
+  do_var_replace_in(${input} "${${input}}")
+endforeach()
+
+
 create_system(OBJECT new_system NAME ZEPHYR_LINKER_v1 FORMAT ${FORMAT} ENTRY ${ENTRY})
 
 # Sorting the memory sections in ascending order.
@@ -641,7 +771,6 @@ endforeach()
 foreach(region ${MEMORY_REGIONS_SORTED})
   if("${region}" MATCHES "^{(.*)}$")
     create_region(OBJECT new_region ${CMAKE_MATCH_1})
-
     add_region(OBJECT ${new_system} REGION ${new_region})
   endif()
 endforeach()
diff --git a/cmake/linker_script/arm/linker.cmake b/cmake/linker_script/arm/linker.cmake
index ad639f373ccdb..47b3bcdc86f6e 100644
--- a/cmake/linker_script/arm/linker.cmake
+++ b/cmake/linker_script/arm/linker.cmake
@@ -1,14 +1,38 @@
 set(COMMON_ZEPHYR_LINKER_DIR ${ZEPHYR_BASE}/cmake/linker_script/common)
 
-set_ifndef(region_min_align CONFIG_CUSTOM_SECTION_MIN_ALIGN_SIZE)
+# This should be different for cortex_r or cortex_a....
+# cut from zephyr/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
+if(DEFINED CONFIG_CUSTOM_SECTION_MIN_ALIGN_SIZE)
+  set_ifndef(region_min_align ${CONFIG_CUSTOM_SECTION_MIN_ALIGN_SIZE})
+endif()
 
 # Set alignment to CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE if not set above
 # to make linker section alignment comply with MPU granularity.
-set_ifndef(region_min_align CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE)
+if(DEFINED CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE)
+  set_ifndef(region_min_align ${CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE})
+endif()
 
 # If building without MPU support, use default 4-byte alignment.. if not set above.
 set_ifndef(region_min_align 4)
 
+zephyr_linker_include_var(VAR region_min_align)
+if((NOT DEFINED CONFIG_CUSTOM_SECTION_ALIGN) AND DEFINED  CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
+  # define MPU_ALIGN(region_size) \
+  # . = ALIGN(_region_min_align); \
+  # . = ALIGN( 1 << LOG2CEIL(region_size))
+  # Handling this requires us to handle log2ceil() in iar linker since the size
+  # isn't known until then.
+  set(MPU_ALIGN_BYTES ${region_min_align})
+  #message(WARNING "We can not handle . = ALIGN( 1 << LOG2CEIL(region_size))  ")
+else()
+  set(MPU_ALIGN_BYTES ${region_min_align})
+endif()
+# The APP_SHARED_ALIGN and SMEM_PARTITION_ALIGN macros are defined as
+# ". = ALIGN(...)" things.
+# the cmake generator stuff needs an align-size in bytes so:
+zephyr_linker_include_var(VAR APP_SHARED_ALIGN_BYTES VALUE ${region_min_align})
+zephyr_linker_include_var(VAR SMEM_PARTITION_ALIGN_BYTES VALUE ${MPU_ALIGN_BYTES})
+
 # Note, the `+ 0` in formulas below avoids errors in cases where a Kconfig
 #       variable is undefined and thus expands to nothing.
 math(EXPR FLASH_ADDR
@@ -59,6 +83,7 @@ zephyr_linker_group(NAME RAM_REGION VMA RAM LMA ROM_REGION)
 zephyr_linker_group(NAME TEXT_REGION GROUP ROM_REGION SYMBOL SECTION)
 zephyr_linker_group(NAME RODATA_REGION GROUP ROM_REGION)
 zephyr_linker_group(NAME DATA_REGION GROUP RAM_REGION SYMBOL SECTION)
+zephyr_linker_group(NAME NOINIT_REGION GROUP RAM_REGION SYMBOL SECTION)
 
 # should go to a relocation.cmake - from include/linker/rel-sections.ld - start
 zephyr_linker_section(NAME  .rel.plt  HIDDEN)
@@ -82,6 +107,8 @@ zephyr_linker_section(NAME .text         GROUP TEXT_REGION)
 zephyr_linker_section_configure(SECTION .rel.plt  INPUT ".rel.iplt")
 zephyr_linker_section_configure(SECTION .rela.plt INPUT ".rela.iplt")
 
+include(${COMMON_ZEPHYR_LINKER_DIR}/kobject-text.cmake)
+
 zephyr_linker_section_configure(SECTION .text INPUT ".TEXT.*")
 zephyr_linker_section_configure(SECTION .text INPUT ".gnu.linkonce.t.*")
 
@@ -107,9 +134,9 @@ include(${COMMON_ZEPHYR_LINKER_DIR}/thread-local-storage.cmake)
 
 zephyr_linker_section(NAME .rodata GROUP RODATA_REGION)
 zephyr_linker_section_configure(SECTION .rodata INPUT ".gnu.linkonce.r.*")
-if(CONFIG_USERSPACE AND CONFIG_XIP)
-  zephyr_linker_section_configure(SECTION .rodata INPUT ".kobject_data.rodata*")
-endif()
+
+include(${COMMON_ZEPHYR_LINKER_DIR}/kobject-rom.cmake)
+
 zephyr_linker_section_configure(SECTION .rodata ALIGN 4)
 
 # ToDo - . = ALIGN(_region_min_align);
@@ -119,13 +146,33 @@ zephyr_linker_section_configure(SECTION .rodata ALIGN 4)
 zephyr_linker_section(NAME .ramfunc GROUP RAM_REGION SUBALIGN 8)
 # Todo: handle MPU_ALIGN(_ramfunc_size);
 
-# ToDo - handle if(CONFIG_USERSPACE)
+if(CONFIG_USERSPACE)
+  # This is where the app_mem_partition stuff is going to be placed, once it
+  # is generated by gen_app_partitions.py. _app_smem has its own init-copy
+  # handling in z_data_copy, so put it in RAM_REGIOM rather than DATA_REGION
+  zephyr_linker_group(NAME APP_SMEM_GROUP GROUP RAM_REGION SYMBOL SECTION)
+  zephyr_linker_symbol(SYMBOL "_app_smem_size" EXPR "@__app_smem_group_size@")
+	zephyr_linker_symbol(SYMBOL "_app_smem_rom_start" EXPR "@__app_smem_group_load_start@")
+
+
+  zephyr_linker_section(NAME .bss VMA RAM LMA FLASH TYPE BSS)
+  zephyr_linker_section_configure(SECTION .bss INPUT COMMON)
+  zephyr_linker_section_configure(SECTION .bss INPUT ".kernel_bss.*")
+
+  #TODO: the skeletons includes <linker_sram_bss_relocate.ld> here
+
+  # As memory is cleared in words only, it is simpler to ensure the BSS
+  # section ends on a 4 byte boundary. This wastes a maximum of 3 bytes.
+  zephyr_linker_section_configure(SECTION .bss ALIGN 4)
+
+  include(${COMMON_ZEPHYR_LINKER_DIR}/common-noinit.cmake)
+endif()
 
-zephyr_linker_section(NAME .data GROUP DATA_REGION)
+zephyr_linker_section(NAME .data GROUP DATA_REGION ALIGN_WITH_INPUT)
 zephyr_linker_section_configure(SECTION .data INPUT ".kernel.*")
 
 include(${COMMON_ZEPHYR_LINKER_DIR}/common-ram.cmake)
-#include(kobject.ld)
+include(${COMMON_ZEPHYR_LINKER_DIR}/kobject-data.cmake)
 
 if(NOT CONFIG_USERSPACE)
   zephyr_linker_section(NAME .bss VMA RAM LMA FLASH TYPE BSS)
@@ -135,7 +182,7 @@ if(NOT CONFIG_USERSPACE)
   # section ends on a 4 byte boundary. This wastes a maximum of 3 bytes.
   zephyr_linker_section_configure(SECTION .bss ALIGN 4)
 
-  zephyr_linker_section(NAME .noinit GROUP RAM_REGION TYPE NOLOAD NOINIT)
+  zephyr_linker_section(NAME .noinit GROUP NOINIT_REGION TYPE NOLOAD NOINIT)
   # This section is used for non-initialized objects that
   # will not be cleared during the boot process.
   zephyr_linker_section_configure(SECTION .noinit INPUT ".kernel_noinit.*")
diff --git a/cmake/linker_script/common/common-noinit.cmake b/cmake/linker_script/common/common-noinit.cmake
new file mode 100644
index 0000000000000..78093250d233b
--- /dev/null
+++ b/cmake/linker_script/common/common-noinit.cmake
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/common-noinit.ld
+# Please keep in sync
+
+zephyr_linker_section(NAME .noinit GROUP NOINIT_REGION TYPE NOLOAD NOINIT)
+
+if(CONFIG_USERSPACE)
+  zephyr_linker_section_configure(
+    SECTION .noinit
+    INPUT ".user_stacks*"
+    SYMBOLS z_user_stacks_start z_user_stacks_end)
+
+endif()
+# TODO: #include <snippets-noinit.ld>
+include(${COMMON_ZEPHYR_LINKER_DIR}/kobject-priv-stacks.cmake)
diff --git a/cmake/linker_script/common/common-ram.cmake b/cmake/linker_script/common/common-ram.cmake
index 37b0e86faf1d1..0dda1ee3c0a2c 100644
--- a/cmake/linker_script/common/common-ram.cmake
+++ b/cmake/linker_script/common/common-ram.cmake
@@ -1,4 +1,6 @@
-# originates from common-ram.ld
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/common-ram.ld
+# Please keep in sync
 
 if(CONFIG_GEN_SW_ISR_TABLE AND CONFIG_DYNAMIC_INTERRUPTS)
   # ld align has been changed to subalign to provide identical behavior scatter vs. ld.
@@ -10,6 +12,12 @@ if(CONFIG_GEN_SW_ISR_TABLE AND CONFIG_DYNAMIC_INTERRUPTS)
     SECTION sw_isr_table
     INPUT ".gnu.linkonce.sw_isr_table*"
   )
+  if(CONFIG_SHARED_INTERRUPTS)
+    zephyr_linker_section_configure(
+      SECTION sw_isr_table
+      INPUT ".gnu.linkonce.shared_sw_isr_table*"
+    )
+  endif()
 endif()
 
 zephyr_linker_section(NAME device_states GROUP DATA_REGION NOINPUT ${XIP_ALIGN_WITH_INPUT})
@@ -24,79 +32,91 @@ endif()
 zephyr_iterable_section(NAME log_dynamic GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_USERSPACE)
+  set(K_OBJECTS_GROUP "K_OBJECTS_IN_DATA_REGION")
   # All kernel objects within are assumed to be either completely
   # initialized at build time, or initialized automatically at runtime
   # via iteration before the POST_KERNEL phase.
   #
-  # These two symbols only used by gen_kobject_list.py
-  #   _static_kernel_objects_begin = .;
-endif()
-
-zephyr_iterable_section(NAME k_timer GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_mem_slab GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_heap GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_mutex GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_stack GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_msgq GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_mbox GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_pipe GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_sem GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_event GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_queue GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_fifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_lifo GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME k_condvar GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-zephyr_iterable_section(NAME sys_mem_blocks_ptr GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-
-zephyr_iterable_section(NAME net_buf_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_linker_group(NAME ${K_OBJECTS_GROUP} GROUP DATA_REGION SYMBOL SECTION)
+
+  # gen_kobject_list.py expects the start and end symbols to be called
+  # _static_kernel_objects_begin and _static_kernel_objects_end respectively...
+  zephyr_linker_symbol(
+    SYMBOL
+    _static_kernel_objects_begin
+    EXPR
+    "(@__k_objects_in_data_region_start@)"
+    )
+  zephyr_linker_symbol(
+    SYMBOL
+    _static_kernel_objects_end
+    EXPR
+    "(@__k_objects_in_data_region_end@)"
+    )
+else()
+  set(K_OBJECTS_GROUP "DATA_REGION")
+endif()
+
+zephyr_iterable_section(NAME k_timer GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mem_slab GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_heap GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mutex GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_stack GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_msgq GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_mbox GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_pipe GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_sem GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_event GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_queue GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_fifo GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_lifo GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME k_condvar GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+zephyr_iterable_section(NAME sys_mem_blocks_ptr GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+
+zephyr_iterable_section(NAME net_buf_pool GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_NETWORKING)
-  zephyr_iterable_section(NAME net_if     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME net_if_dev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME net_l2     GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME eth_bridge GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_if     GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_if_dev GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME net_l2     GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME eth_bridge GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_ARM_SCMI)
-  zephyr_iterable_section(NAME scmi_protocol GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME scmi_protocol GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME sensing_sensor GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_DEVICE_STACK)
-  zephyr_linker_section(NAME usb_descriptor GROUP DATA_REGION NOINPUT ${XIP_ALIGN_WITH_INPUT} SUBALIGN 1)
+  zephyr_linker_section(NAME usb_descriptor GROUP ${K_OBJECTS_GROUP} NOINPUT ${XIP_ALIGN_WITH_INPUT} SUBALIGN 1)
   zephyr_linker_section_configure(SECTION usb_descriptor
     KEEP SORT NAME INPUT ".usb.descriptor*"
   )
 
-  zephyr_iterable_section(NAME usb_cfg_data GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME usb_cfg_data GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_USB_DEVICE_BOS)
-  zephyr_linker_section(NAME usb_bos_desc GROUP DATA_REGION NOINPUT ${XIP_ALIGN_WITH_INPUT} SUBALIGN 1)
+  zephyr_linker_section(NAME usb_bos_desc GROUP ${K_OBJECTS_GROUP} NOINPUT ${XIP_ALIGN_WITH_INPUT} SUBALIGN 1)
   zephyr_linker_section_configure(SECTION usb_data
     KEEP SORT NAME INPUT ".usb.bos_desc"
   )
 endif()
 
 if(CONFIG_RTIO)
-  zephyr_iterable_section(NAME rtio GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME rtio_iodev GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME rtio_sqe_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-  zephyr_iterable_section(NAME rtio_cqe_pool GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME rtio GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME rtio_iodev GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME rtio_sqe_pool GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME rtio_cqe_pool GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 if(CONFIG_SENSING)
-  zephyr_iterable_section(NAME sensing_sensor GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
+  zephyr_iterable_section(NAME sensing_sensor GROUP ${K_OBJECTS_GROUP} ${XIP_ALIGN_WITH_INPUT} SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-#if(CONFIG_USERSPACE)
-#	_static_kernel_objects_end = .;
-#endif()
-#
-
 if(CONFIG_ZBUS)
   zephyr_iterable_section(NAME zbus_channel_observation_mask GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN 1)
 endif()
diff --git a/cmake/linker_script/common/common-rom.cmake b/cmake/linker_script/common/common-rom.cmake
index 85a258996b4e9..3980b1f6f2385 100644
--- a/cmake/linker_script/common/common-rom.cmake
+++ b/cmake/linker_script/common/common-rom.cmake
@@ -1,4 +1,7 @@
-# originates from common-rom.ld
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/common-rom.ld
+# and som of include/zephyr/linker/common-rom/*.ld
+# Please keep in sync
 
 zephyr_linker_section(NAME init KVMA RAM_REGION GROUP RODATA_REGION)
 zephyr_linker_section_obj_level(SECTION init LEVEL EARLY)
@@ -8,9 +11,6 @@ zephyr_linker_section_obj_level(SECTION init LEVEL POST_KERNEL)
 zephyr_linker_section_obj_level(SECTION init LEVEL APPLICATION)
 zephyr_linker_section_obj_level(SECTION init LEVEL SMP)
 
-zephyr_linker_section(NAME deferred_init_list KVMA RAM_REGION GROUP RODATA_REGION)
-zephyr_linker_section_configure(SECTION deferred_init_list INPUT ".z_deferred_init*" KEEP SORT NAME)
-
 zephyr_iterable_section(NAME device NUMERIC KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_GEN_SW_ISR_TABLE AND NOT CONFIG_DYNAMIC_INTERRUPTS)
@@ -20,10 +20,16 @@ if(CONFIG_GEN_SW_ISR_TABLE AND NOT CONFIG_DYNAMIC_INTERRUPTS)
     SECTION sw_isr_table
     INPUT ".gnu.linkonce.sw_isr_table*"
   )
+  if(CONFIG_SHARED_INTERRUPTS)
+    zephyr_linker_section_configure(
+      SECTION sw_isr_table
+      INPUT ".gnu.linkonce.shared_sw_isr_table*"
+    )
+  endif()
 endif()
 
 zephyr_linker_section(NAME initlevel_error KVMA RAM_REGION GROUP RODATA_REGION NOINPUT)
-zephyr_linker_section_configure(SECTION initlevel_error INPUT ".z_init_[_A-Z0-9]*" KEEP SORT NAME)
+zephyr_linker_section_configure(SECTION initlevel_error INPUT ".z_init_*" KEEP SORT NAME)
 # How to do cross linker ?
 # ASSERT(SIZEOF(initlevel_error) == 0, "Undefined initialization levels used.")
 
@@ -69,16 +75,7 @@ endif()
 if(CONFIG_USERSPACE)
   # Build-time assignment of permissions to kernel objects to
   # threads declared with K_THREAD_DEFINE()
-  zephyr_linker_section(
-    NAME k_object_assignment_area
-    VMA FLASH NOINPUT
-    SUBALIGN 4
-  )
-  zephyr_linker_section_configure(
-    SECTION k_object_assignment
-    INPUT ".k_object_assignment.static.*"
-    KEEP SORT NAME
-  )
+  zephyr_iterable_section(NAME k_object_assignment VMA FLASH SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
 zephyr_linker_section(
@@ -177,6 +174,9 @@ zephyr_iterable_section(NAME log_strings KVMA RAM_REGION GROUP RODATA_REGION SUB
 
 zephyr_iterable_section(NAME log_const KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
+zephyr_linker_section(NAME symbol_to_keep GROUP RODATA_REGION NOINPUT)
+zephyr_linker_section_configure(SECTION symbol_to_keep INPUT ".symbol_to_keep*" KEEP SORT NAME)
+
 zephyr_iterable_section(NAME shell KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 zephyr_iterable_section(NAME shell_root_cmds KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
@@ -190,7 +190,7 @@ zephyr_iterable_section(NAME cfb_font KVMA RAM_REGION GROUP RODATA_REGION SUBALI
 zephyr_iterable_section(NAME tracing_backend KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 zephyr_linker_section(NAME zephyr_dbg_info KVMA RAM_REGION GROUP RODATA_REGION NOINPUT ${XIP_ALIGN_WITH_INPUT})
-zephyr_linker_section_configure(SECTION zephyr_dbg_info INPUT ".zephyr_dbg_info" KEEP)
+zephyr_linker_section_configure(SECTION zephyr_dbg_info INPUT ".dbg_thread_info" KEEP)
 
 if(CONFIG_SYMTAB)
   zephyr_linker_section(NAME symtab KVMA FLASH GROUP RODATA_REGION SUBALIGN 4 NOINPUT)
diff --git a/cmake/linker_script/common/debug-sections.cmake b/cmake/linker_script/common/debug-sections.cmake
index ba6aff11c3ae6..55a68e1fe7a04 100644
--- a/cmake/linker_script/common/debug-sections.cmake
+++ b/cmake/linker_script/common/debug-sections.cmake
@@ -1,4 +1,7 @@
-# Content of this file originates from include/zephyr/linker/debug-sections.ld
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/debug-sections.ld
+# Please keep in sync
+
 # Following sections are obtained via 'ld --verbose'
 
 # Stabs debugging sections.
diff --git a/cmake/linker_script/common/kobject-data.cmake b/cmake/linker_script/common/kobject-data.cmake
new file mode 100644
index 0000000000000..072dfe635aa4b
--- /dev/null
+++ b/cmake/linker_script/common/kobject-data.cmake
@@ -0,0 +1,59 @@
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/kobject-data.ld
+# Please keep in sync
+
+if(CONFIG_USERSPACE)
+
+  zephyr_linker_section(NAME kobject_data GROUP ${K_OBJECTS_GROUP} ALIGN_WITH_INPUT NOINPUT)
+
+  zephyr_linker_section_configure(
+    SECTION kobject_data
+    SYMBOLS z_kobject_data_begin
+    )
+
+  if(CONFIG_DYNAMIC_OBJECTS)
+    # generated by gperf, this avoids errors for the first build.
+    # Also, we dont have KOBJECT_DATA_SZ for the first build
+    zephyr_linker_section_configure(
+      SECTION kobject_data
+      SYMBOLS _thread_idx_map
+      MIN_SIZE ${CONFIG_MAX_THREAD_BYTES}
+      PASS NOT LINKER_ZEPHYR_PREBUILT LINKER_ZEPHYR_FINAL
+      )
+    zephyr_linker_section_configure(
+      SECTION kobject_data
+      SYMBOLS _kobject_data_area_start _kobject_data_area_end
+      PASS NOT LINKER_ZEPHYR_PREBUILT LINKER_ZEPHYR_FINAL
+      )
+  endif()
+
+  # During LINKER_KOBJECT_PREBUILT and LINKER_ZEPHYR_PREBUILT,
+  # space needs to be reserved for the rodata that will be
+  # produced by gperf during the final stages of linking.
+  # The alignment and size are produced by
+  # scripts/build/gen_kobject_placeholders.py. These are here
+  # so the addresses to kobjects would remain the same
+  # during the final stages of linking (LINKER_ZEPHYR_FINAL).
+  if(CONFIG_DYNAMIC_OBJECTS)
+    # in LINKER_ZEPHYR_PREBUILT there is no object file defining _thread_idx_map
+    # so we must have a synthetic one. Note that the size is not set here,
+    # since the space is provided in the section below:
+    zephyr_linker_section_configure(
+      SECTION kobject_data
+      SYMBOLS _thread_idx_map
+      PASS LINKER_ZEPHYR_PREBUILT
+      )
+  endif()
+
+  zephyr_linker_section_configure(
+    SECTION kobject_data
+    INPUT
+    ".kobject_data.data*"
+    ".kobject_data.sdata*"
+    PASS LINKER_ZEPHYR_PREBUILT LINKER_ZEPHYR_FINAL
+    ALIGN @KOBJECT_DATA_ALIGN,undef:4@
+    MIN_SIZE @KOBJECT_DATA_SZ@
+    MAX_SIZE @KOBJECT_DATA_SZ@
+    SYMBOLS _kobject_data_area_start _kobject_data_area_end
+    )
+endif()
diff --git a/cmake/linker_script/common/kobject-priv-stacks.cmake b/cmake/linker_script/common/kobject-priv-stacks.cmake
new file mode 100644
index 0000000000000..bfbf7edb5f53b
--- /dev/null
+++ b/cmake/linker_script/common/kobject-priv-stacks.cmake
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/kobject-priv-stacks.ld
+# Please keep in sync
+
+if(CONFIG_USERSPACE)
+  if(CONFIG_GEN_PRIV_STACKS)
+    # Padding is needed to preserve kobject addresses
+    # if we have reserved more space than needed.
+    zephyr_linker_section(NAME .priv_stacks_noinit GROUP NOINIT_REGION NOINPUT NOINIT
+                MIN_SIZE @KOBJECT_PRIV_STACKS_SZ,undef:0@ MAX_SIZE @KOBJECT_PRIV_STACKS_SZ,undef:0@)
+
+    zephyr_linker_section_configure(
+      SECTION .priv_stacks_noinit
+      SYMBOLS z_priv_stacks_ram_start
+    )
+
+    # During LINKER_KOBJECT_PREBUILT and LINKER_ZEPHYR_PREBUILT,
+    # space needs to be reserved for the rodata that will be
+    # produced by gperf during the final stages of linking.
+    # The alignment and size are produced by
+    # scripts/build/gen_kobject_placeholders.py. These are here
+    # so the addresses to kobjects would remain the same
+    # during the final stages of linking (LINKER_ZEPHYR_FINAL).
+    zephyr_linker_section_configure(
+      SECTION .priv_stacks_noinit
+      ALIGN @KOBJECT_PRIV_STACKS_ALIGN,undef:0@
+      INPUT ".priv_stacks.noinit"
+      KEEP
+      PASS LINKER_ZEPHYR_PREBUILT LINKER_ZEPHYR_FINAL
+      SYMBOLS z_priv_stacks_ram_aligned_start z_priv_stacks_ram_end
+    )
+
+    if(KOBJECT_PRIV_STACKS_ALIGN)
+      zephyr_linker_symbol(
+        SYMBOL z_priv_stacks_ram_used
+        EXPR "(@z_priv_stacks_ram_end@ - @z_priv_stacks_ram_start@)"
+        PASS LINKER_ZEPHYR_FINAL
+      )
+    endif()
+  endif()
+endif()
diff --git a/cmake/linker_script/common/kobject-rom.cmake b/cmake/linker_script/common/kobject-rom.cmake
new file mode 100644
index 0000000000000..81360c1edba39
--- /dev/null
+++ b/cmake/linker_script/common/kobject-rom.cmake
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/kobject-rom.ld
+# Please keep in sync
+
+# During LINKER_KOBJECT_PREBUILT and LINKER_ZEPHYR_PREBUILT,
+# space needs to be reserved for the rodata that will be
+# produced by gperf during the final stages of linking.
+# The alignment and size are produced by
+# scripts/build/gen_kobject_placeholders.py. These are here
+# so the addresses to kobjects would remain the same
+# during the final stages of linking (LINKER_ZEPHYR_FINAL).
+
+if(CONFIG_USERSPACE)
+  # By the magic of MIN_SIZE the space will be there
+  zephyr_linker_section_configure(SECTION .rodata KEEP INPUT ".kobject_data.rodata*"
+    MIN_SIZE @KOBJECT_RODATA_SZ@
+    ALIGN @KOBJECT_RODATA_ALIGN@
+    PASS LINKER_ZEPHYR_PREBUILT LINKER_ZEPHYR_FINAL
+  )
+endif()
diff --git a/cmake/linker_script/common/kobject-text.cmake b/cmake/linker_script/common/kobject-text.cmake
new file mode 100644
index 0000000000000..9fdf08b478f51
--- /dev/null
+++ b/cmake/linker_script/common/kobject-text.cmake
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: Apache-2.0
+# The contents of this file is based on include/zephyr/linker/kobject-text.ld
+# Please keep in sync
+
+if(CONFIG_USERSPACE)
+  zephyr_linker_section(NAME _kobject_text_area
+                        GROUP TEXT_REGION NOINPUT)
+
+  zephyr_linker_section_configure(
+    SECTION
+    _kobject_text_area
+    INPUT
+    ".kobject_data.literal*"
+    ".kobject_data.text*"
+    MIN_SIZE ${CONFIG_KOBJECT_TEXT_AREA}
+    MAX_SIZE ${CONFIG_KOBJECT_TEXT_AREA}
+    SYMBOLS
+    _kobject_text_area_start
+    _kobject_text_area_end
+    )
+  zephyr_linker_symbol(
+    SYMBOL
+    _kobject_text_area_used
+    EXPR
+    "(@_kobject_text_area_end@ - @_kobject_text_area_start@)"
+    )
+
+  if(CONFIG_DYNAMIC_OBJECTS)
+    zephyr_linker_section_configure(
+      SECTION
+      _kobject_text_area
+      SYMBOLS
+      z_object_gperf_find
+      z_object_gperf_wordlist_foreach
+      PASS NOT LINKER_ZEPHYR_FINAL
+      )
+  else()
+    zephyr_linker_section_configure(
+      SECTION
+      _kobject_text_area
+      SYMBOLS
+      k_object_find
+      k_object_wordlist_foreach
+      PASS NOT LINKER_ZEPHYR_FINAL
+      )
+  endif()
+
+endif()
\ No newline at end of file
diff --git a/cmake/linker_script/common/thread-local-storage.cmake b/cmake/linker_script/common/thread-local-storage.cmake
index 229fc0900d1a3..6eb8dd417af90 100644
--- a/cmake/linker_script/common/thread-local-storage.cmake
+++ b/cmake/linker_script/common/thread-local-storage.cmake
@@ -1,4 +1,5 @@
-# originates from thread-local-storage.ld
+# The contents of this file is based on include/zephyr/linker/thread-local-storage.ld
+# Please keep in sync
 
 if(CONFIG_THREAD_LOCAL_STORAGE)
   zephyr_linker_section(NAME .tdata LMA FLASH NOINPUT)
diff --git a/cmake/llext-edk.cmake b/cmake/llext-edk.cmake
index ff3f1660f010c..1475931968dd2 100644
--- a/cmake/llext-edk.cmake
+++ b/cmake/llext-edk.cmake
@@ -14,6 +14,9 @@
 # The script expects a build_info.yml file in the project binary directory.
 # This file should contain the following entries:
 #  - cmake application source-dir
+#  - cmake board name
+#  - cmake board qualifiers
+#  - cmake board revision
 #  - cmake llext-edk cflags
 #  - cmake llext-edk file
 #  - cmake llext-edk include-dirs
@@ -158,19 +161,36 @@ yaml_get(INTERFACE_INCLUDE_DIRECTORIES NAME build_info KEY cmake llext-edk inclu
 yaml_get(APPLICATION_SOURCE_DIR NAME build_info KEY cmake application source-dir)
 yaml_get(WEST_TOPDIR NAME build_info KEY west topdir)
 
+yaml_get(board_name NAME build_info KEY cmake board name)
+yaml_get(board_qualifiers NAME build_info KEY cmake board qualifiers)
+yaml_get(board_revision NAME build_info KEY cmake board revision)
+zephyr_build_string(normalized_board_target
+    BOARD ${board_name}
+    BOARD_QUALIFIERS ${board_qualifiers})
+
 set(llext_edk_name ${CONFIG_LLEXT_EDK_NAME})
 set(llext_edk ${PROJECT_BINARY_DIR}/${llext_edk_name})
 set(llext_edk_inc ${llext_edk}/include)
 
-string(REGEX REPLACE "[^a-zA-Z0-9]" "_" llext_edk_name_sane ${llext_edk_name})
-string(TOUPPER ${llext_edk_name_sane} llext_edk_name_sane)
-set(install_dir_var "${llext_edk_name_sane}_INSTALL_DIR")
+zephyr_string(SANITIZE TOUPPER var_prefix ${llext_edk_name})
+set(install_dir_var "${var_prefix}_INSTALL_DIR")
 
 set(make_relative FALSE)
 foreach(flag ${llext_edk_cflags})
-    if (flag STREQUAL "-imacros")
+    # Detect all combinations of 'imacros' flag:
+    # - with one or two preceding dashes
+    # - separated from the argument, joined by '=', or joined (no separator)
+    if(flag MATCHES "^--?imacros$")
+        # imacros followed by a space, convert next argument
+        set(make_relative TRUE)
+        continue()
+    elseif(flag MATCHES "^--?imacros=?([^=].*)$")
+        # imacros=<stuff> or imacros<stuff>, immediately convert <stuff>
+        set(flag ${CMAKE_MATCH_1})
         set(make_relative TRUE)
-    elseif (make_relative)
+    endif()
+
+    if(make_relative)
         set(make_relative FALSE)
         cmake_path(GET flag PARENT_PATH parent)
         cmake_path(GET flag FILENAME name)
@@ -229,6 +249,12 @@ set(edk_file_CMAKE ${llext_edk}/cmake.cflags)
 foreach(target ${edk_targets})
     edk_write_header(${target})
 
+    edk_write_comment(${target} "Target information")
+    edk_write_var(${target} "${var_prefix}_BOARD_NAME" "${board_name}")
+    edk_write_var(${target} "${var_prefix}_BOARD_QUALIFIERS" "${board_qualifiers}")
+    edk_write_var(${target} "${var_prefix}_BOARD_REVISION" "${board_revision}")
+    edk_write_var(${target} "${var_prefix}_BOARD_TARGET" "${normalized_board_target}")
+
     edk_write_comment(${target} "Compile flags")
     edk_write_var(${target} "LLEXT_CFLAGS" "${all_flags}")
     edk_write_var(${target} "LLEXT_ALL_INCLUDE_CFLAGS" "${all_inc_flags}")
@@ -238,12 +264,21 @@ foreach(target ${edk_targets})
     edk_write_var(${target} "LLEXT_GENERATED_IMACROS_CFLAGS" "${imacros_gen}")
 endforeach()
 
+if(CONFIG_LLEXT_EDK_FORMAT_TAR_XZ)
+  set(llext_edk_format FORMAT gnutar COMPRESSION XZ)
+elseif(CONFIG_LLEXT_EDK_FORMAT_TAR_ZSTD)
+  set(llext_edk_format FORMAT gnutar COMPRESSION Zstd)
+elseif(CONFIG_LLEXT_EDK_FORMAT_ZIP)
+  set(llext_edk_format FORMAT zip)
+else()
+  message(FATAL_ERROR "Unsupported LLEXT_EDK_FORMAT choice")
+endif()
+
 # Generate the tarball
 file(ARCHIVE_CREATE
     OUTPUT ${llext_edk_file}
     PATHS ${llext_edk}
-    FORMAT gnutar
-    COMPRESSION XZ
+    ${llext_edk_format}
 )
 
 file(REMOVE_RECURSE ${llext_edk})
diff --git a/cmake/mcuboot.cmake b/cmake/mcuboot.cmake
index 99f6af9e2396e..d2fcf68e8897c 100644
--- a/cmake/mcuboot.cmake
+++ b/cmake/mcuboot.cmake
@@ -19,6 +19,8 @@ endfunction()
 function(zephyr_mcuboot_tasks)
   set(keyfile "${CONFIG_MCUBOOT_SIGNATURE_KEY_FILE}")
   set(keyfile_enc "${CONFIG_MCUBOOT_ENCRYPTION_KEY_FILE}")
+  string(CONFIGURE "${keyfile}" keyfile)
+  string(CONFIGURE "${keyfile_enc}" keyfile_enc)
 
   if(NOT "${CONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE}")
     # Check for misconfiguration.
@@ -29,28 +31,50 @@ function(zephyr_mcuboot_tasks)
                       "CONFIG_MCUBOOT_SIGNATURE_KEY_FILE are set, the generated build will not be "
                       "bootable by MCUboot unless it is signed manually/externally.")
       return()
+    elseif(NOT (CONFIG_BUILD_OUTPUT_BIN OR CONFIG_BUILD_OUTPUT_HEX))
+      message(FATAL_ERROR "Can't sign images for MCUboot: Neither "
+                          "CONFIG_BUILD_OUTPUT_BIN nor CONFIG_BUILD_OUTPUT_HEX "
+                          "is enabled, so there's nothing to sign.")
     endif()
-  endif()
 
-  if(NOT WEST)
-    # This feature requires west.
-    message(FATAL_ERROR "Can't sign images for MCUboot: west not found. To fix, install west and ensure it's on PATH.")
-  endif()
+    foreach(file keyfile keyfile_enc)
+      if("${${file}}" STREQUAL "")
+        continue()
+      endif()
 
-  foreach(file keyfile keyfile_enc)
-    if(NOT "${${file}}" STREQUAL "")
+      # Find the key files in the order of preference for a simple search
+      # modeled by the if checks across the various locations
+      #
+      #  1. absolute
+      #  2. application config
+      #  3. west topdir (optional when the workspace is not west managed)
+      #
       if(NOT IS_ABSOLUTE "${${file}}")
-        # Relative paths are relative to 'west topdir'.
-        set(${file} "${WEST_TOPDIR}/${${file}}")
+        if(EXISTS "${APPLICATION_CONFIG_DIR}/${${file}}")
+          set(${file} "${APPLICATION_CONFIG_DIR}/${${file}}")
+        else()
+          # Relative paths are relative to 'west topdir'.
+          #
+          # This is the only file that has a relative check to topdir likely
+          # from the historical callouts to "west" itself before using
+          # imgtool. So, this is maintained here for backward compatibility
+          #
+          if(NOT WEST OR NOT WEST_TOPDIR)
+            message(FATAL_ERROR "Can't sign images for MCUboot: west workspace undefined. "
+                                "To fix, ensure `west topdir` is a valid workspace directory.")
+          endif()
+          set(${file} "${WEST_TOPDIR}/${${file}}")
+        endif()
       endif()
 
-      if(NOT EXISTS "${${file}}" AND NOT "${CONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE}")
-        message(FATAL_ERROR "west sign can't find file ${${file}} (Note: Relative paths are relative to the west workspace topdir \"${WEST_TOPDIR}\")")
-      elseif(NOT (CONFIG_BUILD_OUTPUT_BIN OR CONFIG_BUILD_OUTPUT_HEX))
-        message(FATAL_ERROR "Can't sign images for MCUboot: Neither CONFIG_BUILD_OUTPUT_BIN nor CONFIG_BUILD_OUTPUT_HEX is enabled, so there's nothing to sign.")
+      if(NOT EXISTS "${${file}}")
+        message(FATAL_ERROR "Can't sign images for MCUboot: can't find file ${${file}} "
+                            "(Note: Relative paths are searched through "
+                            "APPLICATION_CONFIG_DIR=\"${APPLICATION_CONFIG_DIR}\" "
+                            "and WEST_TOPDIR=\"${WEST_TOPDIR}\")")
       endif()
-    endif()
-  endforeach()
+    endforeach()
+  endif()
 
   # No imgtool, no signed binaries.
   if(NOT DEFINED IMGTOOL)
@@ -71,7 +95,8 @@ function(zephyr_mcuboot_tasks)
 
   # If single slot mode, or if in firmware updater mode and this is the firmware updater image,
   # use slot 0 information
-  if(NOT CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP AND (NOT CONFIG_MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER OR CONFIG_MCUBOOT_APPLICATION_FIRMWARE_UPDATER))
+  if(NOT CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP AND (NOT CONFIG_MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER OR CONFIG_MCUBOOT_APPLICATION_FIRMWARE_UPDATER)
+      AND NOT CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP_RAM_LOAD)
     # Slot 1 size is used instead of slot 0 size
     set(slot_size)
     dt_nodelabel(slot1_flash NODELABEL "slot1_partition" REQUIRED)
@@ -114,6 +139,15 @@ function(zephyr_mcuboot_tasks)
     set(imgtool_args --align 1 --load-addr ${chosen_ram_address} ${imgtool_args})
     set(imgtool_args_alt_slot ${imgtool_args} --hex-addr ${slot1_partition_address})
     set(imgtool_args ${imgtool_args} --hex-addr ${slot0_partition_address})
+  elseif(CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP_RAM_LOAD)
+    dt_chosen(ram_load_dev PROPERTY "mcuboot,ram-load-dev")
+    if(DEFINED ram_load_dev)
+      dt_reg_addr(load_address PATH ${ram_load_dev})
+    else()
+      dt_chosen(chosen_ram PROPERTY "zephyr,sram")
+      dt_reg_addr(load_address PATH ${chosen_ram})
+    endif()
+    set(imgtool_args --align 1 --load-addr ${load_address} ${imgtool_args})
   else()
     set(imgtool_args --align ${write_block_size} ${imgtool_args})
   endif()
@@ -136,6 +170,7 @@ function(zephyr_mcuboot_tasks)
 
     if(CONFIG_MCUBOOT_GENERATE_CONFIRMED_IMAGE)
       list(APPEND byproducts ${output}.signed.confirmed.bin)
+      zephyr_runner_file(bin ${output}.signed.confirmed.bin)
       set(BYPRODUCT_KERNEL_SIGNED_CONFIRMED_BIN_NAME "${output}.signed.confirmed.bin"
           CACHE FILEPATH "Signed and confirmed kernel bin file" FORCE
       )
@@ -183,11 +218,22 @@ function(zephyr_mcuboot_tasks)
     set(BYPRODUCT_KERNEL_SIGNED_HEX_NAME "${output}.signed.hex"
         CACHE FILEPATH "Signed kernel hex file" FORCE
     )
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND
-                 ${imgtool_sign} ${imgtool_args} ${output}.hex ${output}.signed.hex)
+
+    if(NOT "${keyfile_enc}" STREQUAL "")
+      # When encryption is enabled, set the encrypted bit when signing the image but do not
+      # encrypt the data, this means that when the image is moved out of the primary into the
+      # secondary, it will be encrypted rather than being in unencrypted
+      set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND
+                   ${imgtool_sign} ${imgtool_args} --encrypt "${keyfile_enc}" --clear
+                   ${output}.hex ${output}.signed.hex)
+    else()
+      set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND
+                   ${imgtool_sign} ${imgtool_args} ${output}.hex ${output}.signed.hex)
+    endif()
 
     if(CONFIG_MCUBOOT_GENERATE_CONFIRMED_IMAGE)
       list(APPEND byproducts ${output}.signed.confirmed.hex)
+      zephyr_runner_file(hex ${output}.signed.confirmed.hex)
       set(BYPRODUCT_KERNEL_SIGNED_CONFIRMED_HEX_NAME "${output}.signed.confirmed.hex"
           CACHE FILEPATH "Signed and confirmed kernel hex file" FORCE
       )
diff --git a/cmake/modules/FindDeprecated.cmake b/cmake/modules/FindDeprecated.cmake
index 8030c75953173..233577600345c 100644
--- a/cmake/modules/FindDeprecated.cmake
+++ b/cmake/modules/FindDeprecated.cmake
@@ -37,58 +37,6 @@ if("${Deprecated_FIND_COMPONENTS}" STREQUAL "")
   message(WARNING "find_package(Deprecated) missing required COMPONENTS keyword")
 endif()
 
-if("CROSS_COMPILE" IN_LIST Deprecated_FIND_COMPONENTS)
-  list(REMOVE_ITEM Deprecated_FIND_COMPONENTS CROSS_COMPILE)
-  # This code was deprecated after Zephyr v3.1.0
-  if(NOT DEFINED ZEPHYR_TOOLCHAIN_VARIANT)
-    set(ZEPHYR_TOOLCHAIN_VARIANT $ENV{ZEPHYR_TOOLCHAIN_VARIANT})
-  endif()
-
-  if(NOT ZEPHYR_TOOLCHAIN_VARIANT AND
-     (CROSS_COMPILE OR (DEFINED ENV{CROSS_COMPILE})))
-      set(ZEPHYR_TOOLCHAIN_VARIANT cross-compile CACHE STRING "Zephyr toolchain variant" FORCE)
-      message(DEPRECATION  "Setting CROSS_COMPILE without setting ZEPHYR_TOOLCHAIN_VARIANT is deprecated."
-                           "Please set ZEPHYR_TOOLCHAIN_VARIANT to 'cross-compile'"
-      )
-  endif()
-endif()
-
-if("SPARSE" IN_LIST Deprecated_FIND_COMPONENTS)
-  list(REMOVE_ITEM Deprecated_FIND_COMPONENTS SPARSE)
-  # This code was deprecated after Zephyr v3.2.0
-  if(SPARSE)
-    message(DEPRECATION
-        "Setting SPARSE='${SPARSE}' is deprecated. "
-        "Please set ZEPHYR_SCA_VARIANT to 'sparse'"
-    )
-    if("${SPARSE}" STREQUAL "y")
-      set_ifndef(ZEPHYR_SCA_VARIANT sparse)
-    endif()
-  endif()
-endif()
-
-if("SOURCES" IN_LIST Deprecated_FIND_COMPONENTS)
-  list(REMOVE_ITEM Deprecated_FIND_COMPONENTS SOURCES)
-  if(SOURCES)
-    message(DEPRECATION
-        "Setting SOURCES prior to calling find_package() for unit tests is deprecated."
-        " To add sources after find_package() use:\n"
-        "    target_sources(testbinary PRIVATE <source-file.c>)")
-  endif()
-endif()
-
-if("PYTHON_PREFER" IN_LIST Deprecated_FIND_COMPONENTS)
-  # This code was deprecated after Zephyr v3.4.0
-  list(REMOVE_ITEM Deprecated_FIND_COMPONENTS PYTHON_PREFER)
-  if(DEFINED PYTHON_PREFER)
-    message(DEPRECATION "'PYTHON_PREFER' variable is deprecated. Please use "
-                        "Python3_EXECUTABLE instead.")
-    if(NOT DEFINED Python3_EXECUTABLE)
-      set(Python3_EXECUTABLE ${PYTHON_PREFER})
-    endif()
-  endif()
-endif()
-
 if("toolchain_ld_base" IN_LIST Deprecated_FIND_COMPONENTS)
   # This code was deprecated after Zephyr v4.0.0
   list(REMOVE_ITEM Deprecated_FIND_COMPONENTS toolchain_ld_base)
@@ -142,23 +90,5 @@ if(NOT "${Deprecated_FIND_COMPONENTS}" STREQUAL "")
                  "${Deprecated_FIND_COMPONENTS}")
 endif()
 
-if("SEARCHED_LINKER_SCRIPT" IN_LIST Deprecated_FIND_COMPONENTS)
-  # This code was deprecated after Zephyr v3.5.0
-  list(REMOVE_ITEM Deprecated_FIND_COMPONENTS SEARCHED_LINKER_SCRIPT)
-
-  # Try a board specific linker file
-  set(LINKER_SCRIPT ${BOARD_DIR}/linker.ld)
-  if(NOT EXISTS ${LINKER_SCRIPT})
-    # If not available, try an SoC specific linker file
-    set(LINKER_SCRIPT ${SOC_FULL_DIR}/linker.ld)
-  endif()
-  message(DEPRECATION
-      "Pre-defined `linker.ld` script is deprecated. Please set "
-      "BOARD_LINKER_SCRIPT or SOC_LINKER_SCRIPT to point to ${LINKER_SCRIPT} "
-      "or one of the Zephyr provided common linker scripts for the ${ARCH} "
-      "architecture."
-  )
-endif()
-
 set(Deprecated_FOUND True)
 set(DEPRECATED_FOUND True)
diff --git a/cmake/modules/FindHostTools.cmake b/cmake/modules/FindHostTools.cmake
index f0954a26b7505..a73d52956aafd 100644
--- a/cmake/modules/FindHostTools.cmake
+++ b/cmake/modules/FindHostTools.cmake
@@ -48,8 +48,6 @@ if(HostTools_FOUND)
   return()
 endif()
 
-find_package(Deprecated COMPONENTS CROSS_COMPILE)
-
 find_package(Zephyr-sdk 0.16)
 
 # gperf is an optional dependency
diff --git a/cmake/modules/arch_v2.cmake b/cmake/modules/arch.cmake
similarity index 100%
rename from cmake/modules/arch_v2.cmake
rename to cmake/modules/arch.cmake
diff --git a/cmake/modules/arch_v1.cmake b/cmake/modules/arch_v1.cmake
deleted file mode 100644
index 613182f0723f9..0000000000000
--- a/cmake/modules/arch_v1.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2022, Nordic Semiconductor ASA
-
-#
-# This CMake module is only valid for hw model v1.
-# In hw model v1, then arch is determined by the board folder structure.
-#
-# Configure ARCH settings based on board directory and arch root.
-#
-# This CMake module will set the following variables in the build system based
-# on board directory and arch root.
-#
-# If no implementation is available for the current arch an error will be raised.
-#
-# Outcome:
-# The following variables will be defined when this CMake module completes:
-#
-# - ARCH:      Name of the arch in use.
-# - ARCH_DIR:  Directory containing the arch implementation.
-# - ARCH_ROOT: ARCH_ROOT with ZEPHYR_BASE appended
-#
-# Variable dependencies:
-# - ARCH_ROOT: CMake list of arch roots containing arch implementations
-# - BOARD_DIR: CMake variable specifying the directory of the selected BOARD
-#
-# Variables set by this module and not mentioned above are considered internal
-# use only and may be removed, renamed, or re-purposed without prior notice.
-
-include_guard(GLOBAL)
-
-if(HWMv1)
-  # 'ARCH_ROOT' is a prioritized list of directories where archs may be
-  # found. It always includes ${ZEPHYR_BASE} at the lowest priority (except for unittesting).
-  if(NOT unittest IN_LIST Zephyr_FIND_COMPONENTS)
-    list(APPEND ARCH_ROOT ${ZEPHYR_BASE})
-  endif()
-
-  cmake_path(GET BOARD_DIR PARENT_PATH board_arch_dir)
-  cmake_path(GET board_arch_dir FILENAME ARCH)
-
-  foreach(root ${ARCH_ROOT})
-    if(EXISTS ${root}/arch/${ARCH}/CMakeLists.txt)
-      set(ARCH_DIR ${root}/arch)
-      break()
-    endif()
-  endforeach()
-
-  if(NOT ARCH_DIR)
-    message(FATAL_ERROR "Could not find ARCH=${ARCH} for BOARD=${BOARD}, \
-please check your installation. ARCH roots searched: \n\
-${ARCH_ROOT}")
-  endif()
-endif()
diff --git a/cmake/modules/boards.cmake b/cmake/modules/boards.cmake
index 3f086dca94809..9d75ff377ffda 100644
--- a/cmake/modules/boards.cmake
+++ b/cmake/modules/boards.cmake
@@ -141,8 +141,7 @@ Hints:
   endif()
 endforeach()
 
-if((HWMv1 AND NOT EXISTS ${BOARD_DIR}/${BOARD}_defconfig)
-   OR (HWMv2 AND NOT EXISTS ${BOARD_DIR}/board.yml))
+if(HWMv2 AND NOT EXISTS ${BOARD_DIR}/board.yml)
   message(WARNING "BOARD_DIR: ${BOARD_DIR} has been moved or deleted. "
                   "Trying to find new location."
   )
@@ -209,9 +208,8 @@ if(NOT "${ret_board}" STREQUAL "")
   endforeach()
 
   # Create two CMake variables identifying the hw model.
-  # CMake variable: HWM=[v1,v2]
-  # CMake variable: HWMv1=True, when HWMv1 is in use.
-  # CMake variable: HWMv2=True, when HWMv2 is in use.
+  # CMake variable: HWM=v2
+  # CMake variable: HWMv2=True
   set(HWM       ${LIST_BOARD_HWM} CACHE INTERNAL "Zephyr hardware model version")
   set(HWM${HWM} True   CACHE INTERNAL "Zephyr hardware model")
 elseif(BOARD_DIR)
@@ -228,86 +226,67 @@ else()
   message(FATAL_ERROR "Invalid BOARD; see above.")
 endif()
 
-if(HWMv1 AND DEFINED BOARD_QUALIFIERS)
-  message(FATAL_ERROR
-          "Board '${BOARD}' does not support board qualifiers, ${BOARD}${BOARD_QUALIFIERS}.\n"
-          "Please specify board without qualifiers.\n"
-  )
-endif()
-
 cmake_path(IS_PREFIX ZEPHYR_BASE "${BOARD_DIR}" NORMALIZE in_zephyr_tree)
 if(NOT in_zephyr_tree)
   set(USING_OUT_OF_TREE_BOARD 1)
 endif()
 
-if(HWMv1)
-  if(EXISTS ${BOARD_DIR}/revision.cmake)
-    # Board provides revision handling.
+if(LIST_BOARD_REVISION_FORMAT)
+  if(LIST_BOARD_REVISION_FORMAT STREQUAL "custom")
     include(${BOARD_DIR}/revision.cmake)
-  elseif(BOARD_REVISION)
-    message(WARNING "Board revision ${BOARD_REVISION} specified for ${BOARD}, \
-                     but board has no revision so revision will be ignored.")
-  endif()
-elseif(HWMv2)
-  if(LIST_BOARD_REVISION_FORMAT)
-    if(LIST_BOARD_REVISION_FORMAT STREQUAL "custom")
-      include(${BOARD_DIR}/revision.cmake)
-    else()
-      if(EXISTS ${BOARD_DIR}/revision.cmake)
-        message(WARNING
-          "revision.cmake ignored, revision.cmake is only used for revision format: 'custom'"
-        )
-      endif()
-
-      string(TOUPPER "${LIST_BOARD_REVISION_FORMAT}" rev_format)
-      if(LIST_BOARD_REVISION_EXACT)
-        set(rev_exact EXACT)
-      endif()
-
-      board_check_revision(
-        FORMAT ${rev_format}
-        DEFAULT_REVISION ${LIST_BOARD_REVISION_DEFAULT}
-        VALID_REVISIONS ${LIST_BOARD_REVISIONS}
-        ${rev_exact}
-      )
-    endif()
-  elseif(DEFINED BOARD_REVISION)
+  else()
     if(EXISTS ${BOARD_DIR}/revision.cmake)
       message(WARNING
-        "revision.cmake is not used, revisions must be defined in '${BOARD_DIR}/board.yml'"
+        "revision.cmake ignored, revision.cmake is only used for revision format: 'custom'"
       )
     endif()
 
-    message(FATAL_ERROR "Invalid board revision: ${BOARD_REVISION}\n"
-                        "Board '${BOARD}' does not define any revisions."
+    string(TOUPPER "${LIST_BOARD_REVISION_FORMAT}" rev_format)
+    if(LIST_BOARD_REVISION_EXACT)
+      set(rev_exact EXACT)
+    endif()
+
+    board_check_revision(
+      FORMAT ${rev_format}
+      DEFAULT_REVISION ${LIST_BOARD_REVISION_DEFAULT}
+      VALID_REVISIONS ${LIST_BOARD_REVISIONS}
+      ${rev_exact}
+    )
+  endif()
+elseif(DEFINED BOARD_REVISION)
+  if(EXISTS ${BOARD_DIR}/revision.cmake)
+    message(WARNING
+      "revision.cmake is not used, revisions must be defined in '${BOARD_DIR}/board.yml'"
     )
   endif()
 
-  if(LIST_BOARD_QUALIFIERS)
-    # Allow users to omit the SoC when building for a board with a single SoC.
-    list(LENGTH LIST_BOARD_SOCS socs_length)
-    if(socs_length EQUAL 1)
-      set(BOARD_SINGLE_SOC TRUE)
-      set(BOARD_${BOARD}_SINGLE_SOC TRUE)
-      if(NOT DEFINED BOARD_QUALIFIERS)
-        set(BOARD_QUALIFIERS "/${LIST_BOARD_SOCS}")
-      elseif("${BOARD_QUALIFIERS}" MATCHES "^//.*")
-        string(REGEX REPLACE "^//" "/${LIST_BOARD_SOCS}/" BOARD_QUALIFIERS "${BOARD_QUALIFIERS}")
-      endif()
-    endif()
+  message(FATAL_ERROR "Invalid board revision: ${BOARD_REVISION}\n"
+                      "Board '${BOARD}' does not define any revisions."
+  )
+endif()
 
-    set(board_targets ${LIST_BOARD_QUALIFIERS})
-    list(TRANSFORM board_targets PREPEND "${BOARD}/")
-    if(NOT ("${BOARD}${BOARD_QUALIFIERS}" IN_LIST board_targets))
-      string(REPLACE ";" "\n" board_targets "${board_targets}")
-      unset(CACHED_BOARD CACHE)
-      message(FATAL_ERROR "Board qualifiers `${BOARD_QUALIFIERS}` for board \
-            `${BOARD}` not found. Please specify a valid board target.\n"
-            "Valid board targets for ${LIST_BOARD_NAME} are:\n${board_targets}\n")
+if(LIST_BOARD_QUALIFIERS)
+  # Allow users to omit the SoC when building for a board with a single SoC.
+  list(LENGTH LIST_BOARD_SOCS socs_length)
+  if(socs_length EQUAL 1)
+    set(BOARD_SINGLE_SOC TRUE)
+    set(BOARD_${BOARD}_SINGLE_SOC TRUE)
+    if(NOT DEFINED BOARD_QUALIFIERS)
+      set(BOARD_QUALIFIERS "/${LIST_BOARD_SOCS}")
+    elseif("${BOARD_QUALIFIERS}" MATCHES "^//.*")
+      string(REGEX REPLACE "^//" "/${LIST_BOARD_SOCS}/" BOARD_QUALIFIERS "${BOARD_QUALIFIERS}")
     endif()
   endif()
-else()
-  message(FATAL_ERROR "Unknown hw model (${HWM}) for board: ${BOARD}.")
+
+  set(board_targets ${LIST_BOARD_QUALIFIERS})
+  list(TRANSFORM board_targets PREPEND "${BOARD}/")
+  if(NOT ("${BOARD}${BOARD_QUALIFIERS}" IN_LIST board_targets))
+    string(REPLACE ";" "\n" board_targets "${board_targets}")
+    unset(CACHED_BOARD CACHE)
+    message(FATAL_ERROR "Board qualifiers `${BOARD_QUALIFIERS}` for board \
+          `${BOARD}` not found. Please specify a valid board target.\n"
+          "Valid board targets for ${LIST_BOARD_NAME} are:\n${board_targets}\n")
+  endif()
 endif()
 
 set(board_message "Board: ${BOARD}")
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 08ed8db083d2c..41e79dd733792 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -413,17 +413,9 @@ execute_process(
   ${ZEPHYR_DTS}
   OUTPUT_QUIET # Discard stdout
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-  RESULT_VARIABLE ret
-  ERROR_VARIABLE stderr
+  COMMAND_ERROR_IS_FATAL ANY
   )
 
-if(NOT "${ret}" STREQUAL "0")
-  message(FATAL_ERROR "dtc failed with return code: ${ret}")
-elseif(stderr)
-  # dtc printed warnings on stderr but did not fail.
-  # Display them as CMake warnings to draw attention.
-  message(WARNING "dtc raised one or more warnings:\n${stderr}")
-endif()
 endif(DTC)
 
 build_info(devicetree files PATH ${dts_files})
diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 8350b2f397455..843590d06382a 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -336,6 +336,12 @@ function(process_flags lang input output)
 
   foreach(flag ${${input}})
     set(is_compile_lang_generator_expression 0)
+    # SHELL is used to avoid de-duplication, but when process flags
+    # then this tag must be removed to return real compile/linker flags.
+    if(flag MATCHES "^SHELL:[ ]*(.*)")
+      separate_arguments(flag UNIX_COMMAND ${CMAKE_MATCH_1})
+    endif()
+
     foreach(l ${languages})
       if(flag MATCHES "<COMPILE_LANGUAGE:${l}>:([^>]+)>")
         set(updated_flag ${CMAKE_MATCH_1})
@@ -356,11 +362,6 @@ function(process_flags lang input output)
     endforeach()
 
     if(NOT is_compile_lang_generator_expression)
-      # SHELL is used to avoid de-duplication, but when process flags
-      # then this tag must be removed to return real compile/linker flags.
-      if(flag MATCHES "SHELL:[ ]*(.*)")
-        separate_arguments(flag UNIX_COMMAND ${CMAKE_MATCH_1})
-      endif()
       # Flags may be placed inside generator expression, therefore any flag
       # which is not already a generator expression must have commas converted.
       if(NOT flag MATCHES "\\\$<.*>")
@@ -463,11 +464,21 @@ endmacro()
 
 # Provides amend functionality to a Zephyr library for out-of-tree usage.
 #
+# Usage:
+#   zephyr_library_amend([<dir>])
+#
 # When called from a Zephyr module, the corresponding zephyr library defined
 # within Zephyr will be looked up.
 #
-# Note, in order to ensure correct library when amending, the folder structure in the
-# Zephyr module must resemble the structure used in Zephyr, as example:
+# <dir>: Use '<dir>' as out-of-tree base directory from where the Zephyr
+#        library name shall be generated.
+#        <dir> can be used in cases where the structure for the library is not
+#        placed directly at the ZEPHYR_MODULE's root directory or for cases
+#        where the module integration file is located in a 'MODULE_EXT_ROOT'.
+#
+# Note, in order to ensure correct library when amending, the folder structure
+# in the Zephyr module or '<dir>' base directory must resemble the structure
+# used in Zephyr, as example:
 #
 # Example: to amend the zephyr library created in
 # ZEPHYR_BASE/drivers/entropy/CMakeLists.txt
@@ -496,7 +507,11 @@ macro(zephyr_library_amend)
     message(FATAL_ERROR "Function only available for Zephyr modules.")
   endif()
 
-  zephyr_library_get_current_dir_lib_name(${ZEPHYR_CURRENT_MODULE_DIR} lib_name)
+  if(${ARGC} EQUAL 1)
+    zephyr_library_get_current_dir_lib_name(${ARGV0} lib_name)
+  else()
+    zephyr_library_get_current_dir_lib_name(${ZEPHYR_CURRENT_MODULE_DIR} lib_name)
+  endif()
 
   set(ZEPHYR_CURRENT_LIBRARY ${lib_name})
 endmacro()
@@ -1452,7 +1467,7 @@ endmacro()
 # - PHDR [program_header]: add program header. Used on Xtensa platforms.
 function(zephyr_code_relocate)
   set(options NOCOPY NOKEEP)
-  set(single_args LIBRARY LOCATION PHDR)
+  set(single_args LIBRARY LOCATION PHDR FILTER)
   set(multi_args FILES)
   cmake_parse_arguments(CODE_REL "${options}" "${single_args}"
     "${multi_args}" ${ARGN})
@@ -1521,7 +1536,7 @@ function(zephyr_code_relocate)
   if(CODE_REL_PHDR)
     set(CODE_REL_LOCATION "${CODE_REL_LOCATION}\ :${CODE_REL_PHDR}")
   endif()
-  # We use the "|" character to separate code relocation directives, instead of
+  # Each code relocation directive is placed on an independent line, instead of
   # using set_property(APPEND) to produce a ";"-separated CMake list. This way,
   # each directive can embed multiple CMake lists, representing flags and files,
   # the latter of which can come from generator expressions.
@@ -1529,7 +1544,7 @@ function(zephyr_code_relocate)
     PROPERTY INTERFACE_SOURCES)
   set_property(TARGET code_data_relocation_target
     PROPERTY INTERFACE_SOURCES
-    "${code_rel_str}|${CODE_REL_LOCATION}:${flag_list}:${file_list}")
+    "${code_rel_str}\n${CODE_REL_LOCATION}:${flag_list}:${file_list},${CODE_REL_FILTER}")
 endfunction()
 
 # Usage:
@@ -1586,8 +1601,8 @@ function(pow2round n)
   set(${n} ${${n}} PARENT_SCOPE)
 endfunction()
 
-# Function to create a build string based on BOARD, BOARD_REVISION, and BUILD
-# type.
+# Function to create a build string based on BOARD, BOARD_REVISION, and
+# BOARD_QUALIFIER.
 #
 # This is a common function to ensure that build strings are always created
 # in a uniform way.
@@ -3034,22 +3049,34 @@ endfunction()
 #
 # Zephyr string function extension.
 # This function extends the CMake string function by providing additional
-# manipulation arguments to CMake string.
+# manipulation options for the <mode> argument:
+#
+# ESCAPE: Ensure that every character of the input arguments is considered
+#         by CMake as a literal by prefixing the escape character '\' where
+#         appropriate. This is useful for handling Windows path separators in
+#         strings, or when it is desired to write "\n" as an actual string of
+#         four characters instead of a single newline.
+#         Note that this operation must be performed exactly once during the
+#         lifetime of a string, or previous escape characters will be treated
+#         as literals and escaped further.
 #
 # SANITIZE: Ensure that the output string does not contain any special
 #           characters. Special characters, such as -, +, =, $, etc. are
-#           converted to underscores '_'.
+#           converted to underscores '_'. Multiple arguments are concatenated.
 #
 # SANITIZE TOUPPER: Ensure that the output string does not contain any special
-#                   characters. Special characters, such as -, +, =, $, etc. are
-#                   converted to underscores '_'.
+#                   characters. Special characters, such as -, +, =, $, etc.
+#                   are converted to underscores '_'. Multiple arguments are
+#                   concatenated.
 #                   The sanitized string will be returned in UPPER case.
 #
-# returns the updated string
+# Returns the updated string in <out-var>.
 function(zephyr_string)
-  set(options SANITIZE TOUPPER)
+  set(options SANITIZE TOUPPER ESCAPE)
   cmake_parse_arguments(ZEPHYR_STRING "${options}" "" "" ${ARGN})
 
+  zephyr_check_flags_exclusive(${CMAKE_CURRENT_FUNCTION} ZEPHYR_STRING SANITIZE ESCAPE)
+
   if (NOT ZEPHYR_STRING_UNPARSED_ARGUMENTS)
     message(FATAL_ERROR "Function zephyr_string() called without a return variable")
   endif()
@@ -3057,14 +3084,20 @@ function(zephyr_string)
   list(GET ZEPHYR_STRING_UNPARSED_ARGUMENTS 0 return_arg)
   list(REMOVE_AT ZEPHYR_STRING_UNPARSED_ARGUMENTS 0)
 
-  list(JOIN ZEPHYR_STRING_UNPARSED_ARGUMENTS "" work_string)
-
   if(ZEPHYR_STRING_SANITIZE)
+    list(JOIN ZEPHYR_STRING_UNPARSED_ARGUMENTS "" work_string)
     string(REGEX REPLACE "[^a-zA-Z0-9_]" "_" work_string ${work_string})
-  endif()
-
-  if(ZEPHYR_STRING_TOUPPER)
-    string(TOUPPER ${work_string} work_string)
+    if(ZEPHYR_STRING_TOUPPER)
+      string(TOUPPER ${work_string} work_string)
+    endif()
+  elseif(ZEPHYR_STRING_ESCAPE)
+    # Escape every instance of '\' or '"' in the <input> arguments.
+    # Note that:
+    #  - backslashes must be replaced first to avoid duplicating the '\' in \"
+    #  - "\\\\" is seen by CMake as \\, meaning an escaped '\', which then
+    #    becomes a single '\' in the final string.
+    string(REGEX REPLACE "\\\\" "\\\\\\\\" work_string "${ZEPHYR_STRING_UNPARSED_ARGUMENTS}")
+    string(REGEX REPLACE "\"" "\\\\\"" work_string "${work_string}")
   endif()
 
   set(${return_arg} ${work_string} PARENT_SCOPE)
@@ -4775,7 +4808,7 @@ function(zephyr_linker_dts_section)
 
   dt_reg_addr(addr PATH ${DTS_SECTION_PATH})
 
-  zephyr_linker_section(NAME ${name} ADDRESS ${addr} VMA ${name} TYPE NOLOAD)
+  zephyr_linker_section(NAME ${name} VMA ${name} TYPE NOLOAD)
 
 endfunction()
 
@@ -4975,8 +5008,9 @@ endfunction()
 #                         [VMA <region|group>] [LMA <region|group>]
 #                         [ADDRESS <address>] [ALIGN <alignment>]
 #                         [SUBALIGN <alignment>] [FLAGS <flags>]
+#                         [MIN_SIZE <minimum size>] [MAX_SIZE <maximum size>]
 #                         [HIDDEN] [NOINPUT] [NOINIT]
-#                         [PASS [NOT] <name>]
+#                         [PASS [NOT] [<name>]]
 #   )
 #
 # Zephyr linker output section.
@@ -5028,23 +5062,23 @@ endfunction()
 #  Note: Regarding all alignment attributes. Not all linkers may handle alignment
 #        in identical way. For example the Scatter file will align both load and
 #        execution address (LMA and VMA) to be aligned when given the ALIGN attribute.
+# MIN_SIZE <size>     : Pad section so that it at least <size> bytes in size.
+# MAX_SIZE <size>     : Check that the sections is not larger than <size> bytes.
 # NOINPUT             : No default input sections will be defined, to setup input
 #                       sections for section <name>, the corresponding
 #                       `zephyr_linker_section_configure()` must be used.
-# PASS [NOT] <name>   : Linker pass iteration where this section should be active.
-#                       Default a section will be present during all linker passes
-#                       but in cases a section shall only be present at a specific
-#                       pass, this argument can be used. For example to only have
-#                       this section present on the `TEST` linker pass, use `PASS TEST`.
-#                       It is possible to negate <name>, such as `PASS NOT <name>`.
-#                       For example, `PASS NOT TEST` means the call is effective
-#                       on all but the `TEST` linker pass iteration.
-#
+# PASS [NOT] [<name> ..]: Linker pass where this section should be active.
+#                       By default a section will be present during all linker
+#                       passes.
+#                       PASS [<p1>] [<p2>...] makes the section present only in
+#                       the given passes. Empty list means no passes.
+#                       PASS NOT [<p1>] [<p2>...] makes the section present in
+#                       all but the given passes. Empty list means all passes.
 # Note: VMA and LMA are mutual exclusive with GROUP
 #
 function(zephyr_linker_section)
   set(options     "ALIGN_WITH_INPUT;HIDDEN;NOINIT;NOINPUT")
-  set(single_args "ADDRESS;ALIGN;ENDALIGN;GROUP;KVMA;LMA;NAME;SUBALIGN;TYPE;VMA")
+  set(single_args "ADDRESS;ALIGN;ENDALIGN;GROUP;KVMA;LMA;NAME;SUBALIGN;TYPE;VMA;MIN_SIZE;MAX_SIZE")
   set(multi_args  "PASS")
   cmake_parse_arguments(SECTION "${options}" "${single_args}" "${multi_args}" ${ARGN})
 
@@ -5076,16 +5110,7 @@ function(zephyr_linker_section)
     endif()
   endif()
 
-  if(DEFINED SECTION_PASS)
-    list(LENGTH SECTION_PASS pass_length)
-    if(${pass_length} GREATER 1)
-      list(GET SECTION_PASS 0 pass_elem_0)
-      if((NOT (${pass_elem_0} STREQUAL "NOT")) OR (${pass_length} GREATER 2))
-        message(FATAL_ERROR "zephyr_linker_section(PASS takes maximum "
-          "a single argument of the form: '<pass name>' or 'NOT <pass_name>'.")
-      endif()
-    endif()
-  endif()
+  zephyr_linker_check_pass_param("${SECTION_PASS}")
 
   set(SECTION)
   zephyr_linker_arg_val_list(SECTION "${single_args}")
@@ -5220,8 +5245,8 @@ endfunction()
 # This is useful content such as struct devices.
 #
 # For example: zephyr_linker_section_obj_level(SECTION init LEVEL PRE_KERNEL_1)
-# will create an input section matching `.z_init_PRE_KERNEL_1?_` and
-# `.z_init_PRE_KERNEL_1??_`.
+# will create an input section matching `.z_init_PRE_KERNEL_P_1_SUB_?_`,
+# `.z_init_PRE_KERNEL_P_1_SUB_??_`, and `.z_init_PRE_KERNEL_P_1_SUB_???_`.
 #
 # SECTION <section>: Section in which the objects shall be placed
 # LEVEL <level>    : Priority level, all input sections matching the level
@@ -5245,13 +5270,18 @@ function(zephyr_linker_section_obj_level)
 
   zephyr_linker_section_configure(
     SECTION ${OBJ_SECTION}
-    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}?_*"
+    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}_P_?_*"
     SYMBOLS __${OBJ_SECTION}_${OBJ_LEVEL}_start
     KEEP SORT NAME
   )
   zephyr_linker_section_configure(
     SECTION ${OBJ_SECTION}
-    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}??_*"
+    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}_P_??_*"
+    KEEP SORT NAME
+  )
+  zephyr_linker_section_configure(
+    SECTION ${OBJ_SECTION}
+    INPUT ".z_${OBJ_SECTION}_${OBJ_LEVEL}_P_???_*"
     KEEP SORT NAME
   )
 endfunction()
@@ -5259,7 +5289,8 @@ endfunction()
 # Usage:
 #   zephyr_linker_section_configure(SECTION <section> [ALIGN <alignment>]
 #                                   [PASS [NOT] <name>] [PRIO <no>] [SORT <sort>]
-#                                   [ANY] [FIRST] [KEEP]
+#                                   [MIN_SIZE <minimum size>] [MAX_SIZE <maximum size>]
+#                                   [ANY] [FIRST] [KEEP] [INPUT <input>] [SYMBOLS [<start>[<end>]]]
 #   )
 #
 # Configure an output section with additional input sections.
@@ -5275,6 +5306,8 @@ endfunction()
 #                       first section in output.
 # SORT <NAME>         : Sort the input sections according to <type>.
 #                       Currently only `NAME` is supported.
+# MIN_SIZE <size>     : Pad section so that it at least <size> bytes in size.
+# MAX_SIZE <size>     : Check that the sections is not larger than <size> bytes.
 # KEEP                : Do not eliminate input section during linking
 # PRIO                : The priority of the input section. Per default, input
 #                       sections order is not guaranteed by all linkers, but
@@ -5287,19 +5320,20 @@ endfunction()
 #                       you may use `PRIO 50`, `PRIO 20` and so on.
 #                       To ensure an input section is at the end, it is advised
 #                       to use `PRIO 200` and above.
-# PASS [NOT] <name>   : The call should only be considered for linker pass where
-#                       <name> is defined. It is possible to negate <name>, such
-#                       as `PASS NOT <name>.
-#                       For example, `PASS TEST` means the call is only effective
-#                       on the `TEST` linker pass iteration. `PASS NOT TEST` on
-#                       all iterations the are not `TEST`.
+# PASS [NOT] [<pass>..]: Control in which linker passes this piece is present
+#                       See zephyr_linker_section(PASS) for details.
 # FLAGS <flags>       : Special section flags such as "+RO", +XO, "+ZI".
 # ANY                 : ANY section flag in scatter file.
 #                       The FLAGS and ANY arguments only has effect for scatter files.
+# INPUT <input>       : Input section name or list of input section names.
+#                       <input> is either just a section name ".data*" or
+#                       <file-pattern>(<section-patterns>... )
+#                       <file-pattern> is [library.a:]file
+#                       e.g. foo.a:bar.o(.data*)
 #
 function(zephyr_linker_section_configure)
   set(options     "ANY;FIRST;KEEP")
-  set(single_args "ALIGN;OFFSET;PRIO;SECTION;SORT")
+  set(single_args "ALIGN;OFFSET;PRIO;SECTION;SORT;MIN_SIZE;MAX_SIZE")
   set(multi_args  "FLAGS;INPUT;PASS;SYMBOLS")
   cmake_parse_arguments(SECTION "${options}" "${single_args}" "${multi_args}" ${ARGN})
 
@@ -5315,16 +5349,7 @@ function(zephyr_linker_section_configure)
     endif()
   endif()
 
-  if(DEFINED SECTION_PASS)
-    list(LENGTH SECTION_PASS pass_length)
-    if(${pass_length} GREATER 1)
-      list(GET SECTION_PASS 0 pass_elem_0)
-      if((NOT (${pass_elem_0} STREQUAL "NOT")) OR (${pass_length} GREATER 2))
-        message(FATAL_ERROR "zephyr_linker_section_configure(PASS takes maximum "
-          "a single argument of the form: '<pass name>' or 'NOT <pass_name>'.")
-      endif()
-    endif()
-  endif()
+  zephyr_linker_check_pass_param("${SECTION_PASS}")
 
   set(SECTION)
   zephyr_linker_arg_val_list(SECTION "${single_args}")
@@ -5373,6 +5398,98 @@ function(zephyr_linker_symbol)
   )
 endfunction()
 
+# Usage:
+#   zephyr_linker_include_generated(CMAKE|KCONFIG|HEADER <name> [PASS [NOT] <pass>])
+#
+# Add file that is generated at build-time to be included when running the
+# linker script generator.
+#
+# CMAKE <name>     : includes the given cmake file
+# KCONFIG <name>   : import_kconfig() the given Kconfig file. gives
+#                    @variable@ access to all the CONFIG_FOO settings
+# HEADER <name>    : finds all #define FOO value in name. Plain regex, no
+#                    proper preprocessing.
+# PASS [NOT] [<pass>]: Rule for which PASSES to include file.
+#                    see zephyr_linker_section(PASS)
+function(zephyr_linker_include_generated)
+  set(single_args "KCONFIG;HEADER;CMAKE")
+  set(multi_args "PASS")
+  cmake_parse_arguments(INCLUDE "" "${single_args}" "${multi_args}" ${ARGN})
+
+  #check that we have exactly one of CMAKE KCONFIG or HEADER
+  set(files)
+  list(APPEND files ${INCLUDE_CMAKE} ${INCLUDE_KCONFIG} ${INCLUDE_HEADER})
+  list(LENGTH files files_count)
+  if(NOT ${files_count} EQUAL 1)
+    message(FATAL_ERROR "zephyr_linker_include_generated(${ARGV0} ...) must have one of CMAKE, KCONFIG or HEADER")
+  endif()
+
+  zephyr_linker_check_pass_param("${INCLUDE_PASS}")
+
+  set(INCLUDE)
+  zephyr_linker_arg_val_list(INCLUDE "${single_args}")
+  zephyr_linker_arg_val_list(INCLUDE "${multi_args}")
+  string(REPLACE ";" "\;" INCLUDE "${INCLUDE}")
+  set_property(TARGET linker
+               APPEND PROPERTY INCLUDES "{${INCLUDE}}")
+endfunction()
+
+# Usage:
+#   zephyr_linker_include_var(VAR <name> [VALUE <value>] [PASS [NOT] <pass>])
+#
+# Save the value of <name> for when the generator is running at build-time.
+# If VALUE isn't set, the current value of the variable is used
+#
+# Save the value of <name> for when the generator is running at build-time.
+# If VALUE isn't set, the current value of the variable is used
+#
+# VAR <name>       : Variable to be set
+# VALUE <value>    : The value
+# PASS [NOT] <pass>: Rule for which PASSES to include variable see
+#                    zephyr_linker_section(PASS) for details.
+function(zephyr_linker_include_var)
+  set(single_args "VAR;VALUE")
+  set(multi_args "PASS")
+  cmake_parse_arguments(VAR "" "${single_args}" "${multi_args}" ${ARGN})
+  if(NOT DEFINED VAR_VAR)
+    message(FATAL_ERROR "zephyr_linker_include_var(${ARGV0} ...) must have VAR <variable> ")
+  endif()
+  if(NOT DEFINED VAR_VALUE)
+    if(DEFINED ${VAR_VAR})
+      set(VAR_VALUE ${${VAR_VAR}})
+    else()
+      message(FATAL_ERROR "zephyr_linker_include_var(${ARGV0} ...) value not set ")
+    endif()
+  endif()
+  zephyr_linker_check_pass_param("${VAR_PASS}")
+  set(VAR)
+  zephyr_linker_arg_val_list(VAR "${single_args}")
+  zephyr_linker_arg_val_list(VAR "${multi_args}")
+  string(REPLACE ";" "\;" VAR "${VAR}")
+  set_property(TARGET linker
+              APPEND PROPERTY VARIABLES "{${VAR}}")
+endfunction()
+
+# Usage:
+#   zephyr_linker_generate_linker_settings_file(file_name)
+#
+# Generate a file for the settings to the linker file generator script.
+# file_name      : File to be created
+#
+function(zephyr_linker_generate_linker_settings_file FILE)
+  file(GENERATE OUTPUT ${FILE} CONTENT
+         "set(FORMAT \"$<TARGET_PROPERTY:linker,FORMAT>\" CACHE INTERNAL \"\")\n
+          set(ENTRY \"$<TARGET_PROPERTY:linker,ENTRY>\" CACHE INTERNAL \"\")\n
+          set(MEMORY_REGIONS \"$<TARGET_PROPERTY:linker,MEMORY_REGIONS>\" CACHE INTERNAL \"\")\n
+          set(GROUPS \"$<TARGET_PROPERTY:linker,GROUPS>\" CACHE INTERNAL \"\")\n
+          set(SECTIONS \"$<TARGET_PROPERTY:linker,SECTIONS>\" CACHE INTERNAL \"\")\n
+          set(SECTION_SETTINGS \"$<TARGET_PROPERTY:linker,SECTION_SETTINGS>\" CACHE INTERNAL \"\")\n
+          set(SYMBOLS \"$<TARGET_PROPERTY:linker,SYMBOLS>\" CACHE INTERNAL \"\")\n
+          set(INCLUDES \"$<TARGET_PROPERTY:linker,INCLUDES>\" CACHE INTERNAL \"\")\n
+          set(VARIABLES \"$<TARGET_PROPERTY:linker,VARIABLES>\" CACHE INTERNAL \"\")\n
+         ")
+endfunction()
+
 # Internal helper macro for zephyr_linker*() functions.
 # The macro will create a list of argument-value pairs for defined arguments
 # that can be passed on to linker script generators and processed as a CMake
@@ -5393,6 +5510,16 @@ macro(zephyr_linker_arg_val_list list arguments)
   endforeach()
 endmacro()
 
+
+# Internal helper that checks if we have consistent PASS arguments.
+# Allow PASS [NOT] [<pass>...]
+function(zephyr_linker_check_pass_param PASSES)
+  list(POP_FRONT PASSES)
+  if("NOT" IN_LIST PASSES)
+    message(FATAL_ERROR "NOT only allowed before first <pass> value, like this: PASS [NOT] <pass>...")
+  endif()
+endfunction()
+
 ########################################################
 # 6. Function helper macros
 ########################################################
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index af8c1e33fa7b9..d4d22508d0b79 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -24,30 +24,6 @@ set_ifndef(KCONFIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Kconfig)
 set(KCONFIG_BOARD_DIR ${KCONFIG_BINARY_DIR}/boards)
 file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR})
 
-if(HWMv1)
-  # HWMv1 only supoorts a single board dir which points directly to the board dir.
-  set(KCONFIG_BOARD_DIR ${BOARD_DIR})
-  # Support multiple SOC_ROOT
-  file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR}/soc)
-  set(kconfig_soc_root ${SOC_ROOT})
-  list(REMOVE_ITEM kconfig_soc_root ${ZEPHYR_BASE})
-  set(soc_defconfig_file ${KCONFIG_BINARY_DIR}/soc/Kconfig.defconfig)
-
-  set(OPERATION WRITE)
-  foreach(root ${kconfig_soc_root})
-    file(APPEND ${soc_defconfig_file}
-         "osource \"${root}/soc/$(ARCH)/*/Kconfig.defconfig\"\n")
-    file(${OPERATION} ${KCONFIG_BINARY_DIR}/soc/Kconfig.soc.choice
-         "osource \"${root}/soc/$(ARCH)/*/Kconfig.soc\"\n"
-    )
-    file(${OPERATION} ${KCONFIG_BINARY_DIR}/soc/Kconfig.soc.arch
-         "osource \"${root}/soc/$(ARCH)/Kconfig\"\n"
-         "osource \"${root}/soc/$(ARCH)/*/Kconfig\"\n"
-    )
-    set(OPERATION APPEND)
-  endforeach()
-endif()
-
 # Support multiple shields in BOARD_ROOT, remove ZEPHYR_BASE as that is always sourced.
 set(kconfig_board_root ${BOARD_ROOT})
 list(REMOVE_ITEM kconfig_board_root ${ZEPHYR_BASE})
@@ -176,20 +152,13 @@ set(COMMON_KCONFIG_ENV_SETTINGS
   ${ZEPHYR_KCONFIG_MODULES_DIR}
 )
 
-if(HWMv1)
-  list(APPEND COMMON_KCONFIG_ENV_SETTINGS
-    ARCH=${ARCH}
-    ARCH_DIR=${ARCH_DIR}
-  )
-else()
-  # For HWMv2 we should in future generate a Kconfig.arch.v2 which instead
-  # glob-sources all arch roots, but for Zephyr itself, the current approach is
-  # sufficient.
-  list(APPEND COMMON_KCONFIG_ENV_SETTINGS
-    ARCH=*
-    ARCH_DIR=${ZEPHYR_BASE}/arch
-  )
-endif()
+# For HWMv2 we should in future generate a Kconfig.arch.v2 which instead
+# glob-sources all arch roots, but for Zephyr itself, the current approach is
+# sufficient.
+list(APPEND COMMON_KCONFIG_ENV_SETTINGS
+  ARCH=*
+  ARCH_DIR=${ZEPHYR_BASE}/arch
+)
 
 # Allow out-of-tree users to add their own Kconfig python frontend
 # targets by appending targets to the CMake list
diff --git a/cmake/modules/kernel.cmake b/cmake/modules/kernel.cmake
index 6a1a48b172d06..b6192b1ba78e9 100644
--- a/cmake/modules/kernel.cmake
+++ b/cmake/modules/kernel.cmake
@@ -142,8 +142,12 @@ enable_language(ASM)
 # Verify that the toolchain can compile a dummy file, if it is not we
 # won't be able to test for compatibility with certain C flags.
 zephyr_check_compiler_flag(C "" toolchain_is_ok)
+set(log_file "CMakeConfigureLog.yaml")
+if(CMAKE_VERSION VERSION_LESS "3.26.0")
+  set(log_file "CMakeError.log")
+endif()
 assert(toolchain_is_ok "The toolchain is unable to build a dummy C file.\
- Move ${USER_CACHE_DIR}, re-run and look at CMakeError.log")
+ Move ${USER_CACHE_DIR}, re-run and look at ${log_file}")
 
 include(${ZEPHYR_BASE}/cmake/target_toolchain_flags.cmake)
 
diff --git a/cmake/modules/pre_dt.cmake b/cmake/modules/pre_dt.cmake
index 982cdc6e4a7fc..f8e2a80ec56e7 100644
--- a/cmake/modules/pre_dt.cmake
+++ b/cmake/modules/pre_dt.cmake
@@ -60,13 +60,9 @@ function(pre_dt_module_run)
   # Finalize DTS_ROOT.
   list(REMOVE_DUPLICATES DTS_ROOT)
 
-  if(HWMv1)
-    set(arch_include dts/${ARCH})
-  else()
-    foreach(arch ${ARCH_V2_NAME_LIST})
-      list(APPEND arch_include dts/${arch})
-    endforeach()
-  endif()
+  foreach(arch ${ARCH_V2_NAME_LIST})
+    list(APPEND arch_include dts/${arch})
+  endforeach()
 
   # Finalize DTS_ROOT_SYSTEM_INCLUDE_DIRS.
   set(DTS_ROOT_SYSTEM_INCLUDE_DIRS)
diff --git a/cmake/modules/python.cmake b/cmake/modules/python.cmake
index ffebec7d5c206..e01d31921202a 100644
--- a/cmake/modules/python.cmake
+++ b/cmake/modules/python.cmake
@@ -13,8 +13,6 @@ endif()
 
 set(PYTHON_MINIMUM_REQUIRED 3.10)
 
-find_package(Deprecated COMPONENTS PYTHON_PREFER)
-
 if(NOT DEFINED Python3_EXECUTABLE AND DEFINED WEST_PYTHON)
   set(Python3_EXECUTABLE "${WEST_PYTHON}")
 endif()
diff --git a/cmake/modules/snippets.cmake b/cmake/modules/snippets.cmake
index fba7818c65063..b897067667eff 100644
--- a/cmake/modules/snippets.cmake
+++ b/cmake/modules/snippets.cmake
@@ -94,7 +94,20 @@ function(zephyr_process_snippets)
     ERROR_VARIABLE output
     RESULT_VARIABLE ret)
   if(${ret})
-    message(FATAL_ERROR "${output}")
+    list(JOIN SNIPPET_ROOT "\n    " snippet_root_paths)
+    set(snippet_root_paths "\n    ${snippet_root_paths}")
+
+    if(SYSBUILD)
+      zephyr_get(SYSBUILD_NAME SYSBUILD GLOBAL)
+      set(extra_output "Snippet roots for image ${SYSBUILD_NAME}:${snippet_root_paths}\n"
+          "Note that snippets will be applied to all images unless prefixed with the image name "
+          "e.g. `-D${SYSBUILD_NAME}_SNIPPET=...`, local snippet roots for one image are not set "
+          "for other images in a build")
+    else()
+      set(extra_output "Snippet roots for application:${snippet_root_paths}")
+    endif()
+
+    message(FATAL_ERROR "${output}" ${extra_output})
   endif()
   include(${snippets_generated})
 
diff --git a/cmake/modules/soc_v2.cmake b/cmake/modules/soc.cmake
similarity index 100%
rename from cmake/modules/soc_v2.cmake
rename to cmake/modules/soc.cmake
diff --git a/cmake/modules/soc_v1.cmake b/cmake/modules/soc_v1.cmake
deleted file mode 100644
index e2004f322550d..0000000000000
--- a/cmake/modules/soc_v1.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2021, Nordic Semiconductor ASA
-
-# Configure SoC settings based on Kconfig settings and SoC root.
-#
-# This CMake module will set the following variables in the build system based
-# on Kconfig settings and selected SoC.
-#
-# If no implementation is available for the selected SoC an error will be raised.
-#
-# Outcome:
-# The following variables will be defined when this CMake module completes:
-#
-# - SOC_NAME:   Name of the SoC in use, identical to CONFIG_SOC
-# - SOC_SERIES: Name of the SoC series in use, identical to CONFIG_SOC_SERIES
-# - SOC_FAMILY: Name of the SoC family, identical to CONFIG_SOC_FAMILY
-# - SOC_PATH:   Path fragment defined by either SOC_NAME or SOC_FAMILY/SOC_SERIES.
-# - SOC_DIR:    Directory containing the SoC implementation
-# - SOC_ROOT:   SOC_ROOT with ZEPHYR_BASE appended
-#
-# Variable dependencies:
-# - SOC_ROOT: CMake list of SoC roots containing SoC implementations
-#
-# Variables set by this module and not mentioned above are considered internal
-# use only and may be removed, renamed, or re-purposed without prior notice.
-
-include_guard(GLOBAL)
-
-include(kconfig)
-
-if(HWMv1)
-  # 'SOC_ROOT' is a prioritized list of directories where socs may be
-  # found. It always includes ${ZEPHYR_BASE}/soc at the lowest priority.
-  list(APPEND SOC_ROOT ${ZEPHYR_BASE})
-
-  set(SOC_NAME   ${CONFIG_SOC})
-  set(SOC_SERIES ${CONFIG_SOC_SERIES})
-  set(SOC_TOOLCHAIN_NAME ${CONFIG_SOC_TOOLCHAIN_NAME})
-  set(SOC_FAMILY ${CONFIG_SOC_FAMILY})
-
-  if("${SOC_SERIES}" STREQUAL "")
-    set(SOC_PATH ${SOC_NAME})
-  else()
-    set(SOC_PATH ${SOC_FAMILY}/${SOC_SERIES})
-  endif()
-
-  # Use SOC to search for a 'CMakeLists.txt' file.
-  # e.g. zephyr/soc/xtensa/intel_adsp/CMakeLists.txt.
-  foreach(root ${SOC_ROOT})
-    # Check that the root looks reasonable.
-    if(NOT IS_DIRECTORY "${root}/soc")
-      message(WARNING "\nSOC_ROOT element(s) without a 'soc' subdirectory:
-  ${root}
-  Hints:
-    - if your SoC family directory is '/foo/bar/soc/<ARCH>/my_soc_family', then add '/foo/bar' to SOC_ROOT, not the entire SoC family path
-    - if in doubt, use absolute paths\n")
-    endif()
-
-    if(EXISTS ${root}/soc/${ARCH}/${SOC_PATH})
-      set(SOC_DIR ${root}/soc)
-      break()
-    endif()
-  endforeach()
-
-  if(NOT SOC_DIR)
-    message(FATAL_ERROR "Could not find SOC=${SOC_NAME} for BOARD=${BOARD},\n"
-            "please check your installation.\n"
-            "SOC roots searched:\n"
-            "${SOC_ROOT}\n"
-    )
-  endif()
-
-  set(SOC_FULL_DIR ${SOC_DIR}/${ARCH}/${SOC_PATH})
-endif()
diff --git a/cmake/modules/unittest.cmake b/cmake/modules/unittest.cmake
index aa3247661c549..4c80283aa0ebc 100644
--- a/cmake/modules/unittest.cmake
+++ b/cmake/modules/unittest.cmake
@@ -12,8 +12,8 @@ include(hwm_v2)
 include(configuration_files)
 
 include(kconfig)
-include(arch_v2)
-include(soc_v2)
+include(arch)
+include(soc)
 
 find_package(TargetTools)
 
@@ -44,8 +44,6 @@ if((NOT DEFINED ZEPHYR_BASE) AND (DEFINED ENV_ZEPHYR_BASE))
   set(ZEPHYR_BASE ${ENV_ZEPHYR_BASE} CACHE PATH "Zephyr base")
 endif()
 
-find_package(Deprecated COMPONENTS SOURCES)
-
 if(NOT SOURCES AND EXISTS main.c)
   set(SOURCES main.c)
 endif()
diff --git a/cmake/modules/yaml.cmake b/cmake/modules/yaml.cmake
index ec12a04bec5f8..17afcd0ef0bdf 100644
--- a/cmake/modules/yaml.cmake
+++ b/cmake/modules/yaml.cmake
@@ -96,13 +96,6 @@ function(internal_yaml_list_append var genex key)
       internal_yaml_list_initializer(subjson TRUE)
       if(${arraylength} GREATER 0)
         math(EXPR arraystop "${arraylength} - 1")
-        list(GET ARG_YAML_LIST 0 entry_0)
-        if(entry_0 STREQUAL MAP)
-          message(FATAL_ERROR "${function}(GENEX ${argument} ) is not valid at this position.\n"
-                    "Syntax is 'LIST MAP \"key1: value1.1, ...\" MAP \"key1: value1.2, ...\""
-            )
-        endif()
-
         foreach(i RANGE 0 ${arraystop})
           string(JSON item GET "${json_content}" ${key} ${i})
           list(APPEND subjson ${item})
@@ -129,12 +122,12 @@ function(internal_yaml_list_append var genex key)
           endif()
           list(POP_FRONT ARG_YAML_LIST map_value)
           string(REGEX REPLACE "([^\\])," "\\1;" pair_list "${map_value}")
-          set(qouted_map_value)
+          set(quoted_map_value)
           foreach(pair ${pair_list})
             if(NOT pair MATCHES "[^ ]*:[^ ]*")
               message(FATAL_ERROR "yaml_set(MAP ${map_value} ) is malformed.\n"
                     "Syntax is 'LIST MAP \"key1: value1.1, ...\" MAP \"key1: value1.2, ...\"\n"
-                    "If value contains comma ',' then ensure the value field is properly qouted "
+                    "If value contains comma ',' then ensure the value field is properly quoted "
                     "and escaped"
               )
             endif()
@@ -145,10 +138,10 @@ function(internal_yaml_list_append var genex key)
               message(FATAL_ERROR "value: ${value} is not properly quoted")
             endif()
             string(REGEX REPLACE "\\\\," "," value "${value}")
-            list(APPEND qouted_map_value "\"${map_key}\": \"${value}\"")
+            list(APPEND quoted_map_value "\"${map_key}\": \"${value}\"")
           endforeach()
-          list(JOIN qouted_map_value "," qouted_map_value)
-          string(JSON json_content SET "${json_content}" ${key} ${i} "{${qouted_map_value}}")
+          list(JOIN quoted_map_value "," quoted_map_value)
+          string(JSON json_content SET "${json_content}" ${key} ${i} "{${quoted_map_value}}")
         endforeach()
       else()
         math(EXPR stop "${index} + ${length} - 1")
@@ -422,9 +415,11 @@ function(yaml_set)
       internal_yaml_list_initializer(json_string ${genex})
       string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "${json_string}")
     endif()
-    internal_yaml_list_append(json_content ${genex} "${ARG_YAML_KEY}" ${ARG_YAML_LIST})
+    zephyr_string(ESCAPE escape_list "${ARG_YAML_LIST}")
+    internal_yaml_list_append(json_content ${genex} "${ARG_YAML_KEY}" ${escape_list})
   else()
-    string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "\"${ARG_YAML_VALUE}\"")
+    zephyr_string(ESCAPE escape_value "${ARG_YAML_VALUE}")
+    string(JSON json_content SET "${json_content}" ${ARG_YAML_KEY} "\"${escape_value}\"")
   endif()
 
   zephyr_set(JSON "${json_content}" SCOPE ${ARG_YAML_NAME})
@@ -489,7 +484,11 @@ function(yaml_save)
 
   zephyr_get_scoped(genex ${ARG_YAML_NAME} GENEX)
   zephyr_get_scoped(json_content ${ARG_YAML_NAME} JSON)
-  to_yaml("${json_content}" 0 yaml_out ${genex})
+  if(genex)
+    to_yaml("${json_content}" 0 yaml_out DIRECT_GENEX)
+   else()
+    to_yaml("${json_content}" 0 yaml_out DIRECT)
+   endif()
 
   if(EXISTS ${yaml_file})
     FILE(RENAME ${yaml_file} ${yaml_file}.bak)
@@ -497,7 +496,7 @@ function(yaml_save)
   FILE(WRITE ${yaml_file} "${yaml_out}")
 
   set(save_target ${ARG_YAML_NAME}_yaml_saved)
-  if (NOT TARGET ${save_target})
+  if(NOT TARGET ${save_target})
     # Create a target for the completion of the YAML save operation.
     # This will be a dummy unless genexes are used.
     add_custom_target(${save_target} ALL DEPENDS ${yaml_file})
@@ -507,16 +506,16 @@ function(yaml_save)
     )
   endif()
 
-  if (genex)
+  if(genex)
     get_property(genex_save_count TARGET ${save_target} PROPERTY genex_save_count)
-    if (${genex_save_count} EQUAL 0)
+    if(${genex_save_count} EQUAL 0)
       # First yaml_save() for this context with genexes enabled
       add_custom_command(
         OUTPUT ${yaml_file}
-        DEPENDS $<TARGET_PROPERTY:${save_target},json_file>
+        DEPENDS $<TARGET_PROPERTY:${save_target},expanded_file>
         COMMAND ${CMAKE_COMMAND}
-                -DJSON_FILE="$<TARGET_PROPERTY:${save_target},json_file>"
-                -DYAML_FILE="${yaml_file}"
+                -DEXPANDED_FILE="$<TARGET_PROPERTY:${save_target},expanded_file>"
+                -DOUTPUT_FILE="${yaml_file}"
                 -DTEMP_FILES="$<TARGET_PROPERTY:${save_target},temp_files>"
                 -P ${ZEPHYR_BASE}/cmake/yaml-filter.cmake
       )
@@ -527,20 +526,45 @@ function(yaml_save)
 
     cmake_path(SET yaml_path "${yaml_file}")
     cmake_path(GET yaml_path STEM yaml_file_no_ext)
-    set(json_file ${yaml_file_no_ext}_${genex_save_count}.json)
-    set_property(TARGET ${save_target} PROPERTY json_file ${json_file})
+    set(expanded_file ${yaml_file_no_ext}_${genex_save_count}.yaml)
+    set_property(TARGET ${save_target} PROPERTY expanded_file ${expanded_file})
 
-    # comment this to keep the temporary JSON files
-    set_property(TARGET ${save_target} APPEND PROPERTY temp_files ${json_file})
+    # comment this to keep the temporary files
+    set_property(TARGET ${save_target} APPEND PROPERTY temp_files ${expanded_file})
 
-    FILE(GENERATE OUTPUT ${json_file}
-      CONTENT "${json_content}"
-    )
+    to_yaml("${json_content}" 0 yaml_out TEMP_GENEX)
+    FILE(GENERATE OUTPUT ${expanded_file} CONTENT "${yaml_out}")
+    FILE(TOUCH ${expanded_file}) # ensure timestamp is updated even if nothing changed
   endif()
 endfunction()
 
-function(to_yaml json level yaml genex)
-  if(level GREATER 0)
+function(to_yaml json level yaml mode)
+  if(mode STREQUAL "DIRECT")
+    # Direct output mode, no genexes: write a standard YAML
+    set(expand_lists TRUE)
+    set(escape_quotes TRUE)
+    set(comment_genexes FALSE)
+  elseif(mode STREQUAL "DIRECT_GENEX" OR mode STREQUAL "FINAL_GENEX")
+    # Direct output mode with genexes enabled, or final write of post-processed
+    # file: write a standard YAML, comment entries with genexes if they are
+    # (still) present in the file
+    set(expand_lists TRUE)
+    set(escape_quotes TRUE)
+    set(comment_genexes TRUE)
+  elseif(mode STREQUAL "TEMP_GENEX")
+    # Temporary output mode for genex expansion: save single quotes with no
+    # special processing, since they will be fixed up by yaml-filter.cmake
+    set(expand_lists FALSE)
+    set(escape_quotes FALSE)
+    set(comment_genexes FALSE)
+  else()
+    message(FATAL_ERROR "to_yaml(... ${mode} ) is malformed.")
+  endif()
+
+  if(level EQUAL 0)
+    # Top-level call, initialize the YAML output variable
+    set(${yaml} "" PARENT_SCOPE)
+  else()
     math(EXPR level_dec "${level} - 1")
     set(indent_${level} "${indent_${level_dec}}  ")
   endif()
@@ -561,7 +585,7 @@ function(to_yaml json level yaml genex)
       # JSON object -> YAML dictionary
       set(${yaml} "${${yaml}}${indent_${level}}${member}:\n")
       math(EXPR sublevel "${level} + 1")
-      to_yaml("${subjson}" ${sublevel} ${yaml} ${genex})
+      to_yaml("${subjson}" ${sublevel} ${yaml} ${mode})
     elseif(type STREQUAL ARRAY)
       # JSON array -> YAML list
       set(${yaml} "${${yaml}}${indent_${level}}${member}:")
@@ -578,12 +602,16 @@ function(to_yaml json level yaml genex)
           string(JSON length ERROR_VARIABLE ignore LENGTH "${item}")
           if(length)
             set(non_indent_yaml)
-            to_yaml("${item}" 0 non_indent_yaml FALSE)
+            to_yaml("${item}" 0 non_indent_yaml ${mode})
             string(REGEX REPLACE "\n$" "" non_indent_yaml "${non_indent_yaml}")
             string(REPLACE "\n" "\n${indent_${level}}   " indent_yaml "${non_indent_yaml}")
             set(${yaml} "${${yaml}}${indent_${level}} - ${indent_yaml}\n")
           else()
-            set(${yaml} "${${yaml}}${indent_${level}} - ${item}\n")
+            # Assume a string, escape single quotes when required (see comment below).
+            if(escape_quotes)
+              string(REPLACE "'" "''" item "${item}")
+            endif()
+            set(${yaml} "${${yaml}}${indent_${level}} - '${item}'\n")
           endif()
         endforeach()
       endif()
@@ -592,11 +620,17 @@ function(to_yaml json level yaml genex)
       # - with unexpanded generator expressions: save as YAML comment
       # - if it matches the special prefix: convert to YAML list
       # - otherwise: save as YAML scalar
-      if (subjson MATCHES "\\$<.*>" AND ${genex})
+      # Single quotes must be escaped in the value _unless_ this will be used
+      # to expand generator expressions, because then the escaping will be
+      # addressed once in the yaml-filter.cmake script.
+      if(escape_quotes)
+        string(REPLACE "'" "''" subjson "${subjson}")
+      endif()
+      if(subjson MATCHES "\\$<.*>" AND comment_genexes)
         # Yet unexpanded generator expression: save as comment
         string(SUBSTRING ${indent_${level}} 1 -1 short_indent)
-        set(${yaml} "${${yaml}}#${short_indent}${member}: ${subjson}\n")
-      elseif(subjson MATCHES "^@YAML-LIST@")
+        set(${yaml} "${${yaml}}#${short_indent}${member}: '${subjson}'\n")
+      elseif(subjson MATCHES "^@YAML-LIST@" AND expand_lists)
         # List-as-string: convert to list
         set(${yaml} "${${yaml}}${indent_${level}}${member}:")
         list(POP_FRONT subjson)
@@ -605,12 +639,12 @@ function(to_yaml json level yaml genex)
         else()
           set(${yaml} "${${yaml}}\n")
           foreach(item ${subjson})
-            set(${yaml} "${${yaml}}${indent_${level}} - ${item}\n")
+            set(${yaml} "${${yaml}}${indent_${level}} - '${item}'\n")
           endforeach()
         endif()
       else()
         # Raw strings: save as is
-        set(${yaml} "${${yaml}}${indent_${level}}${member}: ${subjson}\n")
+        set(${yaml} "${${yaml}}${indent_${level}}${member}: '${subjson}'\n")
       endif()
     else()
       # Other JSON data type -> YAML scalar, as-is
diff --git a/cmake/modules/zephyr_default.cmake b/cmake/modules/zephyr_default.cmake
index 2afef93405736..087e9d77c6d64 100644
--- a/cmake/modules/zephyr_default.cmake
+++ b/cmake/modules/zephyr_default.cmake
@@ -97,7 +97,6 @@ list(APPEND zephyr_cmake_modules zephyr_module)
 list(APPEND zephyr_cmake_modules boards)
 list(APPEND zephyr_cmake_modules shields)
 list(APPEND zephyr_cmake_modules snippets)
-list(APPEND zephyr_cmake_modules arch_v1)
 list(APPEND zephyr_cmake_modules hwm_v2)
 list(APPEND zephyr_cmake_modules configuration_files)
 list(APPEND zephyr_cmake_modules generated_file_directories)
@@ -110,9 +109,8 @@ list(APPEND zephyr_cmake_modules "\${pre_dt_board}")
 # kconfig and dts should be available at the same time.
 list(APPEND zephyr_cmake_modules dts)
 list(APPEND zephyr_cmake_modules kconfig)
-list(APPEND zephyr_cmake_modules arch_v2)
-list(APPEND zephyr_cmake_modules soc_v1)
-list(APPEND zephyr_cmake_modules soc_v2)
+list(APPEND zephyr_cmake_modules arch)
+list(APPEND zephyr_cmake_modules soc)
 
 foreach(component ${SUB_COMPONENTS})
   if(NOT ${component} IN_LIST zephyr_cmake_modules)
diff --git a/cmake/modules/zephyr_module.cmake b/cmake/modules/zephyr_module.cmake
index 191c71c193b2c..a2f42959d8dd2 100644
--- a/cmake/modules/zephyr_module.cmake
+++ b/cmake/modules/zephyr_module.cmake
@@ -85,9 +85,6 @@ if(WEST OR ZEPHYR_MODULES)
     endforeach()
   endif()
 
-  # Append ZEPHYR_BASE as a default ext root at lowest priority
-  list(APPEND MODULE_EXT_ROOT ${ZEPHYR_BASE})
-
   if(EXISTS ${cmake_modules_file})
     file(STRINGS ${cmake_modules_file} zephyr_modules_txt ENCODING UTF-8)
   endif()
@@ -114,9 +111,12 @@ if(WEST OR ZEPHYR_MODULES)
     list(APPEND SYSBUILD_MODULE_NAMES ${module_name})
   endforeach()
 
+  # Prepend ZEPHYR_BASE as a default ext root at lowest priority
+  list(PREPEND MODULE_EXT_ROOT ${ZEPHYR_BASE})
+
   # MODULE_EXT_ROOT is process order which means Zephyr module roots processed
-  # later wins. therefore we reverse the list before processing.
-  list(REVERSE MODULE_EXT_ROOT)
+  # later wins. Thus processing Zephyr first, and modules thereafter allows them
+  # to overrule default glue folder settings provided by higher level modules.cmake.
   foreach(root ${MODULE_EXT_ROOT})
     set(module_cmake_file_path modules/modules.cmake)
     if(NOT EXISTS ${root}/${module_cmake_file_path})
diff --git a/cmake/reports/CMakeLists.txt b/cmake/reports/CMakeLists.txt
index c9d2783db3fad..41c1b7087324f 100644
--- a/cmake/reports/CMakeLists.txt
+++ b/cmake/reports/CMakeLists.txt
@@ -11,7 +11,7 @@ elseif(DEFINED WEST_TOPDIR)
   set(workspace_arg "--workspace=${WEST_TOPDIR}")
 endif()
 
-foreach(report ram_report rom_report footprint)
+foreach(report ram_report rom_report)
   add_custom_target(
     ${report}
     ${PYTHON_EXECUTABLE}
@@ -29,10 +29,15 @@ foreach(report ram_report rom_report footprint)
     )
 endforeach()
 
+add_custom_target(
+  footprint
+  DEPENDS ram_report rom_report
+  )
+
 if(CONFIG_BUILD_WITH_TFM)
-  foreach(report ram_report rom_report footprint)
+  foreach(report ram rom)
     add_custom_target(
-      tfm_${report}
+      tfm_${report}_report
       ${PYTHON_EXECUTABLE}
       ${ZEPHYR_BASE}/scripts/footprint/size_report
       -k $<TARGET_PROPERTY:tfm,TFM_S_ELF_FILE>
@@ -41,18 +46,23 @@ if(CONFIG_BUILD_WITH_TFM)
       ${workspace_arg}
       -d ${report_depth}
       --json tfm_${report}.json
-      ${flag_for_${report}}
+      ${flag_for_${report}_report}
       DEPENDS tfm
       USES_TERMINAL
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       )
   endforeach()
+
+  add_custom_target(
+    tfm_footprint
+    DEPENDS tfm_ram_report tfm_rom_report
+    )
 endif()
 
 if(CONFIG_TFM_BL2)
-  foreach(report ram_report rom_report footprint)
+  foreach(report ram rom)
     add_custom_target(
-      bl2_${report}
+      bl2_${report}_report
       ${PYTHON_EXECUTABLE}
       ${ZEPHYR_BASE}/scripts/footprint/size_report
       -k $<TARGET_PROPERTY:tfm,BL2_ELF_FILE>
@@ -61,12 +71,17 @@ if(CONFIG_TFM_BL2)
       ${workspace_arg}
       -d ${report_depth}
       --json bl2_${report}.json
-      ${flag_for_${report}}
+      ${flag_for_${report}_report}
       DEPENDS tfm
       USES_TERMINAL
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       )
   endforeach()
+
+  add_custom_target(
+    bl2_footprint
+    DEPENDS bl2_ram_report bl2_rom_report
+    )
 endif()
 
 find_program(PUNCOVER puncover)
diff --git a/cmake/sca/gcc/sca.cmake b/cmake/sca/gcc/sca.cmake
index c106933c10155..4d0bf491e57de 100644
--- a/cmake/sca/gcc/sca.cmake
+++ b/cmake/sca/gcc/sca.cmake
@@ -1,5 +1,36 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright (c) 2024 Intel Corporation
+# Copyright (c) 2025 Alex Fabre
 
+# Check GCC version
+# GCC static analyzer requires GCC version >= 10.0.0
+if("${GCC_COMPILER_VERSION}" VERSION_LESS 10.0.0)
+  message(FATAL_ERROR "GCC static analyzer requires GCC >= v10.0")
+endif()
+
+
+# Enable GCC static analyzer
 list(APPEND TOOLCHAIN_C_FLAGS -fanalyzer)
+
+# Add GCC analyzer user options
+zephyr_get(GCC_SCA_OPTS)
+zephyr_get(USE_CCACHE)
+
+if(DEFINED GCC_SCA_OPTS)
+  foreach(analyzer_option IN LISTS GCC_SCA_OPTS)
+
+    if(analyzer_option STREQUAL "-fdiagnostics-format=sarif-file" OR analyzer_option STREQUAL "-fdiagnostics-format=json-file")
+      # Beginning with GCC 14, users can use the -fdiagnostics-format option
+      # to output analyzer diagnostics as SARIF or JSON files.
+      # This option encounters a specific issue[1] when used with ccache.
+      # Therefore, currently, the build process is halted if 'ccache' is enabled.
+      # [1] https://github.com/ccache/ccache/issues/1466
+      if(NOT USE_CCACHE STREQUAL "0")
+        message(FATAL_ERROR "GCC SCA requires 'ccache' to be disabled for output file generation. Disable 'ccache' by setting USE_CCACHE=0.")
+      endif()
+    endif()
+
+    list(APPEND TOOLCHAIN_C_FLAGS ${analyzer_option})
+  endforeach()
+endif()
diff --git a/cmake/toolchain/iar/Kconfig b/cmake/toolchain/iar/Kconfig
new file mode 100644
index 0000000000000..056fa5d499f4d
--- /dev/null
+++ b/cmake/toolchain/iar/Kconfig
@@ -0,0 +1,40 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config LD_LINKER_SCRIPT_SUPPORTED
+	default n
+
+choice LINKER_SCRIPT
+	default CMAKE_LINKER_GENERATOR
+endchoice
+
+menu "IAR library options"
+
+config IAR_SEMIHOSTING
+	bool "Use the IAR semihosting implementation."
+	depends on IAR_LIBC
+	help
+	  Use the semihosting implementation in the IAR library
+	  instead of the Zephyr implementation.
+
+config IAR_BUFFERED_WRITE
+	bool "Use buffered write"
+	depends on IAR_SEMIHOSTING
+	help
+	  Instead of printing one character at a time
+	  this option uses a buffer to print a line
+	  at a time instead, increasing speed of printout.
+
+endmenu
+
+config TOOLCHAIN_IAR_SUPPORTS_THREAD_LOCAL_STORAGE
+	def_bool y
+	select TOOLCHAIN_SUPPORTS_THREAD_LOCAL_STORAGE
+
+# Should we set this? It doesn't seem to be used
+# We support most but don't set __GNUC__
+#
+config TOOLCHAIN_IAR_SUPPORTS_GNU_EXTENSIONS
+	def_bool y
+	select TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS
diff --git a/cmake/toolchain/iar/Kconfig.defconfig b/cmake/toolchain/iar/Kconfig.defconfig
new file mode 100644
index 0000000000000..64d78470c7532
--- /dev/null
+++ b/cmake/toolchain/iar/Kconfig.defconfig
@@ -0,0 +1,46 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config TOOLCHAIN_SUPPORTS_VLA_IN_STATEMENTS
+	default n
+
+config PICOLIBC_SUPPORTED
+	default n
+
+config IAR_LIBC_SUPPORTED
+	default y
+
+config COMPILER_FREESTANDING
+	default y
+
+config CBPRINTF_LIBC_SUBSTS
+	default y
+
+# IAR has slightly different types
+config ENFORCE_ZEPHYR_STDINT
+	default n
+
+# IAR uses a little bit more stack than GCC
+config TEST_EXTRA_STACK_SIZE
+	default 64
+
+# ICCARM does not support relaxation
+config LINKER_USE_NO_RELAX
+	default y
+
+# ICCARM support C17 with some additional features from C23
+config REQUIRES_STD_C17
+	default y
+
+config CODING_GUIDELINE_CHECK
+	default n
+	help
+	  Not applicable to ICCARM
+
+config TC_PROVIDES_POSIX_C_LANG_SUPPORT_R
+	default n
+
+# ICCARM does not support <threads.h>
+config COMMON_LIBC_THRD
+	default n
diff --git a/cmake/toolchain/iar/generic.cmake b/cmake/toolchain/iar/generic.cmake
new file mode 100644
index 0000000000000..645ba19ecb989
--- /dev/null
+++ b/cmake/toolchain/iar/generic.cmake
@@ -0,0 +1,46 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_get(IAR_TOOLCHAIN_PATH)
+assert(IAR_TOOLCHAIN_PATH "IAR_TOOLCHAIN_PATH is not set")
+
+set(IAR_TOOLCHAIN_VARIANT none)
+if(NOT EXISTS ${IAR_TOOLCHAIN_PATH})
+  message(FATAL_ERROR "Nothing found at IAR_TOOLCHAIN_PATH: '${IAR_TOOLCHAIN_PATH}'")
+endif()
+
+if(EXISTS ${IAR_TOOLCHAIN_PATH}/bin/iccarm)
+  message(STATUS "Found toolchain: IAR C/C++ Compiler for Arm (${IAR_TOOLCHAIN_PATH})")
+  set(IAR_COMPILER iccarm)
+  set(IAR_LINKER ilinkarm)
+elseif(EXISTS ${IAR_TOOLCHAIN_PATH}/bin/iccarm.exe)
+  message(STATUS "Found toolchain: IAR C/C++ Compiler for Arm (${IAR_TOOLCHAIN_PATH})")
+  set(IAR_COMPILER iccarm)
+  set(IAR_LINKER ilinkarm)
+endif()
+
+set(IAR_TOOLCHAIN_VARIANT ${IAR_COMPILER})
+
+# iar relies on Zephyr SDK for the use of C preprocessor (devicetree) and objcopy
+find_package(Zephyr-sdk 0.16 REQUIRED)
+message(STATUS "Found Zephyr SDK at ${ZEPHYR_SDK_INSTALL_DIR}")
+
+set(TOOLCHAIN_HOME ${IAR_TOOLCHAIN_PATH})
+
+# Handling to be improved in Zephyr SDK, to avoid overriding ZEPHYR_TOOLCHAIN_VARIANT by
+# find_package(Zephyr-sdk) if it's already set
+set(ZEPHYR_TOOLCHAIN_VARIANT iar)
+
+set(COMPILER iar)
+set(LINKER iar)
+set(BINTOOLS iar)
+
+if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
+  set(SYSROOT_TARGET arm)
+else()
+  set(SYSROOT_TARGET riscv)
+endif()
+set(CROSS_COMPILE ${TOOLCHAIN_HOME}/bin/)
+
+set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports NewLib")
diff --git a/cmake/toolchain/iar/target.cmake b/cmake/toolchain/iar/target.cmake
new file mode 100644
index 0000000000000..b11635894a639
--- /dev/null
+++ b/cmake/toolchain/iar/target.cmake
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 IAR Systems AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Intentionally left blank.
diff --git a/cmake/yaml-filter.cmake b/cmake/yaml-filter.cmake
index c7733be6485f0..9873514d0c0c4 100644
--- a/cmake/yaml-filter.cmake
+++ b/cmake/yaml-filter.cmake
@@ -1,21 +1,28 @@
 # Copyright (c) 2024 Arduino SA
 # SPDX-License-Identifier: Apache-2.0
 
-# Simple second stage filter for YAML generation, used when generator
-# expressions have been used for some of the data and the conversion to
-# YAML needs to happen after cmake has completed processing.
+# Second stage filter for YAML generation, called when generator expressions
+# have been used in some of the data and cleanup needs to happen after CMake
+# has completed processing.
 #
-# This scripts expects as input:
-# - JSON_FILE: the name of the input file, in JSON format, that contains
-#              the expanded generator expressions.
-# - YAML_FILE: the name of the final output YAML file.
+# Two issues are addressed here:
+#
+#  - the intermediate YAML may have non-escaped single quotes in its strings.
+#    These may have been introduced directly via yaml_set() in the main CMake
+#    script or by some generator expressions; at this stage they are however
+#    finalized and can be escaped in one single pass.
+#
+#  - in the input YAML, lists have been stored as a CMake-format string to
+#    allow generator expressions to seamlessly expand into multiple items.
+#    These now need to be converted back into a proper YAML list.
+#
+# This scripts expects as input the following variables:
+#
+# - EXPANDED_FILE: the name of the file that contains the expanded generator
+#                  expressions.
+# - OUTPUT_FILE: the name of the final output YAML file.
 # - TEMP_FILES: a list of temporary files that need to be removed after
 #               the conversion is done.
-#
-# This script loads the Zephyr yaml module and reuses its `to_yaml()`
-# function to convert the fully expanded JSON content to YAML, taking
-# into account the special format that was used to store lists.
-# Temporary files are then removed.
 
 cmake_minimum_required(VERSION 3.20.0)
 
@@ -23,13 +30,40 @@ set(ZEPHYR_BASE ${CMAKE_CURRENT_LIST_DIR}/../)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
 include(yaml)
 
-file(READ ${JSON_FILE} json_content)
-to_yaml("${json_content}" 0 yaml_out TRUE)
-file(WRITE ${YAML_FILE} "${yaml_out}")
+# Fix all quotes in the input YAML file. Strings in it will be in one of the
+# following formats:
+#
+#   name: 'string with 'single quotes' in it'
+#       - 'string with 'single quotes' in it'
+#
+# To address this, every single quote is duplicated, then the first and last
+# occurrences of two single quotes are removed (they are the string beginning
+# and end markers). The result is written to a temporary file.
+file(STRINGS ${EXPANDED_FILE} yaml_content)
+foreach(line ${yaml_content})
+  string(REPLACE "'" "''" line "${line}") # escape every single quote in the string
+  string(REGEX REPLACE "^([^']* )''" "\\1'" line "${line}") # fix opening quote
+  string(REGEX REPLACE "''$" "'" line "${line}") # fix closing quote
+  # semicolons in the string are not to be confused with string separators
+  string(REPLACE ";" "\\;" line "${line}")
+  list(APPEND tmp_content "${line}")
+endforeach()
+list(JOIN tmp_content "\n" tmp_content)
+file(WRITE ${EXPANDED_FILE}.tmp "${tmp_content}")
+
+# Load the now-fixed YAML file and convert the CMake-format lists back into
+# proper YAML format using the to_yaml() function. The result is written to
+# the final destination file.
+yaml_load(FILE ${EXPANDED_FILE}.tmp NAME yaml_saved)
+zephyr_get_scoped(json_content yaml_saved JSON)
+to_yaml("${json_content}" 0 yaml_out FINAL_GENEX)
+file(WRITE ${OUTPUT_FILE} "${yaml_out}")
 
-# Remove unused temporary files. JSON_FILE needs to be kept, or the
-# build system will complain there is no rule to rebuild it
-list(REMOVE_ITEM TEMP_FILES ${JSON_FILE})
+# Remove unused temporary files. EXPANDED_FILE needs to be kept, or the
+# build system will complain there is no rule to rebuild it, but the
+# .tmp file that was just created can be removed.
+list(REMOVE_ITEM TEMP_FILES ${EXPANDED_FILE})
+list(APPEND TEMP_FILES ${EXPANDED_FILE}.tmp)
 foreach(file ${TEMP_FILES})
   file(REMOVE ${file})
 endforeach()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index bcabb520a79a3..cb54555824dfb 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -16,6 +16,7 @@ set(SPHINXOPTS "-j auto -W --keep-going -T" CACHE STRING "Default Sphinx Options
 set(SPHINXOPTS_EXTRA "" CACHE STRING "Extra Sphinx Options (added to defaults)")
 set(LATEXMKOPTS "-halt-on-error -no-shell-escape" CACHE STRING "Default latexmk options")
 set(DT_TURBO_MODE OFF CACHE BOOL "Enable DT turbo mode")
+set(HW_FEATURES_TURBO_MODE OFF CACHE BOOL "Enable HW features turbo mode")
 set(DOC_TAG "development" CACHE STRING "Documentation tag")
 set(DTS_ROOTS "${ZEPHYR_BASE}" CACHE STRING "DT bindings root folders")
 
@@ -149,6 +150,16 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${GEN_DEVICETREE_
 #-------------------------------------------------------------------------------
 # html
 
+set(SPHINX_TAGS "${DOC_TAG}")
+if(HW_FEATURES_TURBO_MODE)
+  list(APPEND SPHINX_TAGS "hw_features_turbo")
+endif()
+
+set(SPHINX_TAGS_ARGS "")
+foreach(tag ${SPHINX_TAGS})
+  list(APPEND SPHINX_TAGS_ARGS "-t" "${tag}")
+endforeach()
+
 add_doc_target(
   html
   COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_HTML_DIR}
@@ -157,7 +168,7 @@ add_doc_target(
     -c ${DOCS_CFG_DIR}
     -d ${DOCS_DOCTREE_DIR}
     -w ${DOCS_BUILD_DIR}/html.log
-    -t ${DOC_TAG}
+    ${SPHINX_TAGS_ARGS}
     ${SPHINXOPTS}
     ${SPHINXOPTS_EXTRA}
     ${DOCS_SRC_DIR}
@@ -179,7 +190,7 @@ add_dependencies(html devicetree)
 
 add_doc_target(
   html-live
-  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV}
+  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_HTML_DIR}
   ${SPHINXAUTOBUILD}
     --watch ${DOCS_CFG_DIR}
     --ignore ${DOCS_BUILD_DIR}
@@ -187,7 +198,7 @@ add_doc_target(
     -c ${DOCS_CFG_DIR}
     -d ${DOCS_DOCTREE_DIR}
     -w ${DOCS_BUILD_DIR}/html.log
-    -t ${DOC_TAG}
+    ${SPHINX_TAGS_ARGS}
     ${SPHINXOPTS}
     ${SPHINXOPTS_EXTRA}
     ${DOCS_SRC_DIR}
@@ -214,7 +225,7 @@ add_doc_target(
     -c ${DOCS_CFG_DIR}
     -d ${DOCS_DOCTREE_DIR}
     -w ${DOCS_BUILD_DIR}/latex.log
-    -t ${DOC_TAG}
+    ${SPHINX_TAGS_ARGS}
     -t convertimages
     ${SPHINXOPTS}
     ${SPHINXOPTS_EXTRA}
@@ -266,7 +277,7 @@ add_doc_target(
     -c ${DOCS_CFG_DIR}
     -d ${DOCS_DOCTREE_DIR}
     -w ${DOCS_BUILD_DIR}/linkcheck.log
-    -t ${DOC_TAG}
+    ${SPHINX_TAGS_ARGS}
     ${SPHINXOPTS}
     ${SPHINXOPTS_EXTRA}
     ${DOCS_SRC_DIR}
diff --git a/doc/LICENSING.rst b/doc/LICENSING.rst
index d2674a7b3276b..f267160c8d36d 100644
--- a/doc/LICENSING.rst
+++ b/doc/LICENSING.rst
@@ -59,8 +59,8 @@ ENE KB1200_EVB Board OpenOCD Configuration
 ------------------------------------------
 
 * *Licensing:* `GPLv2 License`_
-* *Impact:* This file is used by `OpenOCD`_ when programming and debugging the :ref:`ene_kb1200_evb`
-  board. It is never linked into the firmware.
+* *Impact:* This file is used by `OpenOCD`_ when programming and debugging the
+  :zephyr:board:`kb1200_evb` board. It is never linked into the firmware.
 * *Files:*
 
   * :zephyr_file:`boards/ene/kb1200_evb/support/openocd.cfg`
@@ -99,6 +99,15 @@ OpenThread Spinel HDLC RCP Host Interface Files
   * :zephyr_file:`modules/openthread/platform/radio_spinel.cpp`
   * :zephyr_file:`modules/openthread/platform/hdlc_interface.cpp`
 
+Python Devicetree library test files
+------------------------------------
+
+* *Licensing:* `BSD-3-clause`_
+* *Impact:* These are only used for testing and never linked with the firmware.
+* *Files*:
+
+  * Various yaml files under ``scripts/dts/python-devicetree/tests``
+
 .. _Apache 2.0 License:
    https://github.com/zephyrproject-rtos/zephyr/blob/main/LICENSE
 
diff --git a/doc/Makefile b/doc/Makefile
index e1dd82d59cb6e..4ce22f280f439 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,6 +8,7 @@ SPHINXOPTS ?= -j auto -W --keep-going -T
 SPHINXOPTS_EXTRA ?=
 LATEXMKOPTS ?= -halt-on-error -no-shell-escape
 DT_TURBO_MODE ?= 0
+HW_FEATURES_TURBO_MODE ?= 0
 
 # ------------------------------------------------------------------------------
 # Documentation targets
@@ -15,10 +16,10 @@ DT_TURBO_MODE ?= 0
 .PHONY: configure clean html html-fast html-live html-live-fast latex pdf doxygen
 
 html-fast:
-	${MAKE} html DT_TURBO_MODE=1
+	${MAKE} html DT_TURBO_MODE=1 HW_FEATURES_TURBO_MODE=1
 
 html-live-fast:
-	${MAKE} html-live DT_TURBO_MODE=1
+	${MAKE} html-live DT_TURBO_MODE=1 HW_FEATURES_TURBO_MODE=1
 
 html html-live latex pdf linkcheck doxygen: configure
 	cmake --build ${BUILDDIR} --target $@
@@ -32,7 +33,8 @@ configure:
 		-DSPHINXOPTS="${SPHINXOPTS}" \
 		-DSPHINXOPTS_EXTRA="${SPHINXOPTS_EXTRA}" \
 		-DLATEXMKOPTS="${LATEXMKOPTS}" \
-		-DDT_TURBO_MODE=${DT_TURBO_MODE}
+		-DDT_TURBO_MODE=${DT_TURBO_MODE} \
+		-DHW_FEATURES_TURBO_MODE=${HW_FEATURES_TURBO_MODE}
 
 clean:
 	cmake --build ${BUILDDIR} --target clean
diff --git a/doc/_doxygen/groups.dox b/doc/_doxygen/groups.dox
index 38edbb052b2dc..20b58037c571c 100644
--- a/doc/_doxygen/groups.dox
+++ b/doc/_doxygen/groups.dox
@@ -39,6 +39,12 @@
 @{
 @}
 
+@brief Debug Services
+@defgroup debug Debug
+@ingroup os_services
+@{
+@}
+
 @brief Connectivity
 @defgroup connectivity Connectivity
 @{
diff --git a/doc/_extensions/zephyr/domain/__init__.py b/doc/_extensions/zephyr/domain/__init__.py
index 5cdb7213ca931..462b56527639b 100644
--- a/doc/_extensions/zephyr/domain/__init__.py
+++ b/doc/_extensions/zephyr/domain/__init__.py
@@ -2,7 +2,7 @@
 Zephyr Extension
 ################
 
-Copyright (c) 2023 The Linux Foundation
+Copyright (c) 2023-2025 The Linux Foundation
 SPDX-License-Identifier: Apache-2.0
 
 This extension adds a new ``zephyr`` domain for handling the documentation of various entities
@@ -16,6 +16,10 @@
 - ``zephyr:code-sample-listing::`` - Shows a listing of code samples found in a given category.
 - ``zephyr:board-catalog::`` - Shows a listing of boards supported by Zephyr.
 - ``zephyr:board::`` - Flags a document as being the documentation page for a board.
+- ``zephyr:board-supported-hw::`` - Shows a table of supported hardware features for all the targets
+  of the board documented in the current page.
+- ``zephyr:board-supported-runners::`` - Shows a table of supported runners for the board documented
+  in the current page.
 
 Roles
 -----
@@ -27,6 +31,7 @@
 """
 
 import json
+import re
 import sys
 from collections.abc import Iterator
 from os import path
@@ -35,7 +40,7 @@
 
 from anytree import ChildResolverError, Node, PreOrderIter, Resolver, search
 from docutils import nodes
-from docutils.parsers.rst import directives
+from docutils.parsers.rst import directives, roles
 from docutils.statemachine import StringList
 from sphinx import addnodes
 from sphinx.application import Sphinx
@@ -57,6 +62,7 @@
 
 
 sys.path.insert(0, str(Path(__file__).parents[4] / "scripts/dts/python-devicetree/src"))
+sys.path.insert(0, str(Path(__file__).parents[4] / "scripts/west_commands"))
 sys.path.insert(0, str(Path(__file__).parents[3] / "_scripts"))
 
 from gen_boards_catalog import get_catalog
@@ -65,6 +71,43 @@
 TEMPLATES_DIR = Path(__file__).parent / "templates"
 RESOURCES_DIR = Path(__file__).parent / "static"
 
+# Load and parse binding types from text file
+BINDINGS_TXT_PATH = ZEPHYR_BASE / "dts" / "bindings" / "binding-types.txt"
+ACRONYM_PATTERN = re.compile(r'([a-zA-Z0-9-]+)\s*\((.*?)\)')
+BINDING_TYPE_TO_DOCUTILS_NODE = {}
+
+
+def parse_text_with_acronyms(text):
+    """Parse text that may contain acronyms into a list of nodes."""
+    result = nodes.inline()
+    last_end = 0
+
+    for match in ACRONYM_PATTERN.finditer(text):
+        # Add any text before the acronym
+        if match.start() > last_end:
+            result += nodes.Text(text[last_end : match.start()])
+
+        # Add the acronym
+        abbr, explanation = match.groups()
+        result += nodes.abbreviation(abbr, abbr, explanation=explanation)
+        last_end = match.end()
+
+    # Add any remaining text
+    if last_end < len(text):
+        result += nodes.Text(text[last_end:])
+
+    return result
+
+
+with open(BINDINGS_TXT_PATH) as f:
+    for line in f:
+        line = line.strip()
+        if not line or line.startswith('#'):
+            continue
+
+        key, value = line.split('\t', 1)
+        BINDING_TYPE_TO_DOCUTILS_NODE[key] = parse_text_with_acronyms(value)
+
 logger = logging.getLogger(__name__)
 
 
@@ -677,6 +720,7 @@ def run(self):
             )
             return []
         else:
+            self.env.domaindata["zephyr"]["has_board"][self.env.docname] = True
             board = boards[board_name]
             # flag board in the domain data as now having a documentation page so that it can be
             # cross-referenced etc.
@@ -685,9 +729,14 @@ def run(self):
             board_node = BoardNode(id=board_name)
             board_node["full_name"] = board["full_name"]
             board_node["vendor"] = vendors.get(board["vendor"], board["vendor"])
+            board_node["revision_default"] = board["revision_default"]
+            board_node["supported_features"] = board["supported_features"]
             board_node["archs"] = board["archs"]
             board_node["socs"] = board["socs"]
             board_node["image"] = board["image"]
+            board_node["supported_runners"] = board["supported_runners"]
+            board_node["flash_runner"] = board["flash_runner"]
+            board_node["debug_runner"] = board["debug_runner"]
             return [board_node]
 
 
@@ -708,6 +757,7 @@ def run(self):
                     "boards": domain_data["boards"],
                     "vendors": domain_data["vendors"],
                     "socs": domain_data["socs"],
+                    "hw_features_present": self.env.app.config.zephyr_generate_hw_features,
                 },
             )
             return [nodes.raw("", rendered, format="html")]
@@ -715,6 +765,356 @@ def run(self):
             return [nodes.paragraph(text="Board catalog is only available in HTML.")]
 
 
+class BoardSupportedHardwareDirective(SphinxDirective):
+    """A directive for showing the supported hardware features of a board."""
+
+    has_content = False
+    required_arguments = 0
+    optional_arguments = 0
+
+    def run(self):
+        env = self.env
+        docname = env.docname
+
+        matcher = NodeMatcher(BoardNode)
+        board_nodes = list(self.state.document.traverse(matcher))
+        if not board_nodes:
+            logger.warning(
+                "board-supported-hw directive must be used in a board documentation page.",
+                location=(docname, self.lineno),
+            )
+            return []
+
+        board_node = board_nodes[0]
+        supported_features = board_node["supported_features"]
+        result_nodes = []
+
+        paragraph = nodes.paragraph()
+        paragraph += nodes.Text("The ")
+        paragraph += nodes.literal(text=board_node["id"])
+        paragraph += nodes.Text(" board supports the hardware features listed below.")
+        result_nodes.append(paragraph)
+
+        if not env.app.config.zephyr_generate_hw_features:
+            note = nodes.admonition()
+            note += nodes.title(text="Note")
+            note["classes"].append("warning")
+            note += nodes.paragraph(
+                text="The list of supported hardware features was not generated. Run a full "
+                "documentation build for the required metadata to be available."
+            )
+            result_nodes.append(note)
+            return result_nodes
+
+        html_contents = """<div class="legend admonition">
+  <dl class="supported-hardware field-list">
+    <dt>
+      <span class="location-chip onchip">on-chip</span> /
+      <span class="location-chip onboard">on-board</span>
+    </dt>
+    <dd>
+      Feature integrated in the SoC / present on the board.
+    </dd>
+    <dt>
+      <span class="count okay-count">2</span> /
+      <span class="count disabled-count">2</span>
+    </dt>
+    <dd>
+      Number of instances that are enabled / disabled. <br/>
+      Click on the label to see the first instance of this feature in the board/SoC DTS files.
+    </dd>
+    <dt>
+      <code class="docutils literal notranslate"><span class="pre">vnd,foo</span></code>
+    </dt>
+    <dd>
+      Compatible string for the Devicetree binding matching the feature. <br/>
+      Click on the link to view the binding documentation.
+    </dd>
+  </dl>
+</div>"""
+        result_nodes.append(nodes.raw("", html_contents, format="html"))
+
+        tables_container = nodes.container(ids=[f"{board_node['id']}-hw-features"])
+        result_nodes.append(tables_container)
+
+        board_json = json.dumps(
+            {
+                "board_name": board_node["id"],
+                "revision_default": board_node["revision_default"],
+                "targets": list(supported_features.keys()),
+            }
+        )
+        result_nodes.append(
+            nodes.raw(
+                "",
+                f"""<script>board_data = {board_json}</script>""",
+                format="html",
+            )
+        )
+
+        for target, features in sorted(supported_features.items()):
+            if not features:
+                continue
+
+            target_heading = nodes.section(ids=[f"{board_node['id']}-{target}-hw-features-section"])
+            heading = nodes.title()
+            heading += nodes.literal(text=target)
+            heading += nodes.Text(" target")
+            target_heading += heading
+            tables_container += target_heading
+
+            table = nodes.table(
+                classes=["colwidths-given", "hardware-features"],
+                ids=[f"{board_node['id']}-{target}-hw-features-table"],
+            )
+            tgroup = nodes.tgroup(cols=4)
+
+            tgroup += nodes.colspec(colwidth=15, classes=["type"])
+            tgroup += nodes.colspec(colwidth=12, classes=["location"])
+            tgroup += nodes.colspec(colwidth=53, classes=["description"])
+            tgroup += nodes.colspec(colwidth=20, classes=["compatible"])
+
+            thead = nodes.thead()
+            row = nodes.row()
+            headers = ["Type", "Location", "Description", "Compatible"]
+            for header in headers:
+                entry = nodes.entry(classes=[header.lower()])
+                entry += nodes.paragraph(text=header)
+                row += entry
+            thead += row
+            tgroup += thead
+
+            tbody = nodes.tbody()
+
+            def feature_sort_key(feature):
+                # Put "CPU" first. Later updates might also give priority to features
+                # like "sensor"s, for example.
+                if feature == "cpu":
+                    return (0, feature)
+                return (1, feature)
+
+            sorted_features = sorted(features.keys(), key=feature_sort_key)
+
+            for feature in sorted_features:
+                items = list(features[feature].items())
+                num_items = len(items)
+
+                for i, (key, value) in enumerate(items):
+                    row = nodes.row()
+
+                    # TYPE column
+                    if i == 0:
+                        type_entry = nodes.entry(morerows=num_items - 1, classes=["type"])
+                        type_entry += nodes.paragraph(
+                            "",
+                            "",
+                            BINDING_TYPE_TO_DOCUTILS_NODE.get(
+                                feature, nodes.Text(feature)
+                            ).deepcopy(),
+                        )
+                        row += type_entry
+
+                    # LOCATION column
+                    location_entry = nodes.entry(classes=["location"])
+                    location_para = nodes.paragraph()
+
+                    if "board" in value["locations"]:
+                        location_chip = nodes.inline(
+                            classes=["location-chip", "onboard"],
+                            text="on-board",
+                        )
+                        location_para += location_chip
+                    elif "soc" in value["locations"]:
+                        location_chip = nodes.inline(
+                            classes=["location-chip", "onchip"],
+                            text="on-chip",
+                        )
+                        location_para += location_chip
+
+                    location_entry += location_para
+                    row += location_entry
+
+                    # DESCRIPTION column
+                    desc_entry = nodes.entry(classes=["description"])
+                    desc_para = nodes.paragraph(classes=["status"])
+                    desc_para += nodes.Text(value["description"])
+
+                    # Add count indicators for okay and not-okay instances
+                    okay_nodes = value.get("okay_nodes", [])
+                    disabled_nodes = value.get("disabled_nodes", [])
+
+                    role_fn, _ = roles.role(
+                        "zephyr_file", self.state_machine.language, self.lineno, self.state.reporter
+                    )
+
+                    def create_count_indicator(nodes_list, class_type, role_function=role_fn):
+                        if not nodes_list:
+                            return None
+
+                        count = len(nodes_list)
+
+                        if role_function is None:
+                            return nodes.inline(
+                                classes=["count", f"{class_type}-count"], text=str(count)
+                            )
+
+                        # Create a reference to the first node in the list
+                        first_node = nodes_list[0]
+                        file_ref = f"{count} <{first_node['filename']}#L{first_node['lineno']}>"
+
+                        role_nodes, _ = role_function(
+                            "zephyr_file", file_ref, file_ref, self.lineno, self.state.inliner
+                        )
+
+                        count_node = role_nodes[0]
+                        count_node["classes"] = ["count", f"{class_type}-count"]
+
+                        return count_node
+
+                    desc_para += create_count_indicator(okay_nodes, "okay")
+                    desc_para += create_count_indicator(disabled_nodes, "disabled")
+
+                    desc_entry += desc_para
+                    row += desc_entry
+
+                    # COMPATIBLE column
+                    compatible_entry = nodes.entry(classes=["compatible"])
+                    xref = addnodes.pending_xref(
+                        "",
+                        refdomain="std",
+                        reftype="dtcompatible",
+                        reftarget=key,
+                        refexplicit=False,
+                        refwarn=(not value.get("custom_binding", False)),
+                    )
+                    xref += nodes.literal(text=key)
+                    compatible_entry += nodes.paragraph("", "", xref)
+                    row += compatible_entry
+
+                    tbody += row
+
+            tgroup += tbody
+            table += tgroup
+            tables_container += table
+
+        return result_nodes
+
+
+class BoardSupportedRunnersDirective(SphinxDirective):
+    """A directive for showing the supported runners of a board."""
+
+    has_content = False
+    required_arguments = 0
+    optional_arguments = 0
+
+    def run(self):
+        env = self.env
+        docname = env.docname
+
+        matcher = NodeMatcher(BoardNode)
+        board_nodes = list(self.state.document.traverse(matcher))
+        if not board_nodes:
+            logger.warning(
+                "board-supported-runners directive must be used in a board documentation page.",
+                location=(docname, self.lineno),
+            )
+            return []
+
+        if not env.app.config.zephyr_generate_hw_features:
+            note = nodes.admonition()
+            note += nodes.title(text="Note")
+            note["classes"].append("warning")
+            note += nodes.paragraph(
+                text="The list of supported runners was not generated. Run a full documentation "
+                "build for the required metadata to be available."
+            )
+            return [note]
+
+        board_node = board_nodes[0]
+        runners = board_node["supported_runners"]
+        flash_runner = board_node["flash_runner"]
+        debug_runner = board_node["debug_runner"]
+
+        result_nodes = []
+
+        paragraph = nodes.paragraph()
+        paragraph += nodes.Text("The ")
+        paragraph += nodes.literal(text=board_node["id"])
+        paragraph += nodes.Text(
+            " board supports the runners and associated west commands listed below."
+        )
+        result_nodes.append(paragraph)
+
+        env_runners = env.domaindata["zephyr"]["runners"]
+        commands = ["flash", "debug"]
+        for runner in env_runners:
+            if runner in board_node["supported_runners"]:
+                for cmd in env_runners[runner].get("commands", []):
+                    if cmd not in commands:
+                        commands.append(cmd)
+
+        # create the table
+        table = nodes.table(classes=["colwidths-given", "runners-table"])
+        tgroup = nodes.tgroup(cols=len(commands) + 1)  # +1 for the Runner column
+
+        # Add colspec for Runner column
+        tgroup += nodes.colspec(colwidth=15, classes=["type"])
+        # Add colspecs for command columns
+        for _ in commands:
+            tgroup += nodes.colspec(colwidth=15, classes=["type"])
+
+        thead = nodes.thead()
+        row = nodes.row()
+        entry = nodes.entry()
+        row += entry
+        headers = [*commands]
+        for header in headers:
+            entry = nodes.entry(classes=[header.lower()])
+            entry += addnodes.literal_strong(text=header, classes=["command"])
+            row += entry
+        thead += row
+        tgroup += thead
+
+        tbody = nodes.tbody()
+
+        # add a row for each runner
+        for runner in sorted(runners):
+            row = nodes.row()
+            # First column - Runner name
+            entry = nodes.entry()
+
+            xref = addnodes.pending_xref(
+                "",
+                refdomain="std",
+                reftype="ref",
+                reftarget=f"runner_{runner}",
+                refexplicit=True,
+                refwarn=False,
+            )
+            xref += nodes.Text(runner)
+            entry += addnodes.literal_strong("", "", xref)
+            row += entry
+
+            # Add columns for each command
+            for command in commands:
+                entry = nodes.entry()
+                if command in env_runners[runner].get("commands", []):
+                    entry += nodes.Text("✅")
+                    if (command == "flash" and runner == flash_runner) or (
+                        command == "debug" and runner == debug_runner
+                    ):
+                        entry += nodes.Text(" (default)")
+                row += entry
+            tbody += row
+
+        tgroup += tbody
+        table += tgroup
+
+        result_nodes.append(table)
+
+        return result_nodes
+
+
 class ZephyrDomain(Domain):
     """Zephyr domain"""
 
@@ -733,6 +1133,8 @@ class ZephyrDomain(Domain):
         "code-sample-category": CodeSampleCategoryDirective,
         "board-catalog": BoardCatalogDirective,
         "board": BoardDirective,
+        "board-supported-hw": BoardSupportedHardwareDirective,
+        "board-supported-runners": BoardSupportedRunnersDirective,
     }
 
     object_types: dict[str, ObjType] = {
@@ -748,6 +1150,7 @@ class ZephyrDomain(Domain):
         # keep track of documents containing special directives
         "has_code_sample_listing": {},  # docname -> bool
         "has_board_catalog": {},  # docname -> bool
+        "has_board": {},  # docname -> bool
     }
 
     def clear_doc(self, docname: str) -> None:
@@ -767,6 +1170,7 @@ def clear_doc(self, docname: str) -> None:
 
         self.data["has_code_sample_listing"].pop(docname, None)
         self.data["has_board_catalog"].pop(docname, None)
+        self.data["has_board"].pop(docname, None)
 
     def merge_domaindata(self, docnames: list[str], otherdata: dict) -> None:
         self.data["code-samples"].update(otherdata["code-samples"])
@@ -799,6 +1203,7 @@ def merge_domaindata(self, docnames: list[str], otherdata: dict) -> None:
             self.data["has_board_catalog"][docname] = otherdata["has_board_catalog"].get(
                 docname, False
             )
+            self.data["has_board"][docname] = otherdata["has_board"].get(docname, False)
 
     def get_objects(self):
         for _, code_sample in self.data["code-samples"].items():
@@ -952,16 +1357,26 @@ def install_static_assets_as_needed(
         app.add_css_file("css/board-catalog.css")
         app.add_js_file("js/board-catalog.js")
 
+    if app.env.domaindata["zephyr"]["has_board"].get(pagename, False):
+        app.add_css_file("css/board.css")
+        app.add_js_file("js/board.js")
+
 
 def load_board_catalog_into_domain(app: Sphinx) -> None:
-    board_catalog = get_catalog()
+    board_catalog = get_catalog(
+        generate_hw_features=(
+            app.builder.format == "html" and app.config.zephyr_generate_hw_features
+        )
+    )
     app.env.domaindata["zephyr"]["boards"] = board_catalog["boards"]
     app.env.domaindata["zephyr"]["vendors"] = board_catalog["vendors"]
     app.env.domaindata["zephyr"]["socs"] = board_catalog["socs"]
+    app.env.domaindata["zephyr"]["runners"] = board_catalog["runners"]
 
 
 def setup(app):
     app.add_config_value("zephyr_breathe_insert_related_samples", False, "env")
+    app.add_config_value("zephyr_generate_hw_features", False, "env")
 
     app.add_domain(ZephyrDomain)
 
diff --git a/doc/_extensions/zephyr/domain/static/css/board-catalog.css b/doc/_extensions/zephyr/domain/static/css/board-catalog.css
index 9e5e33f7e7f79..36768a1be4ef8 100644
--- a/doc/_extensions/zephyr/domain/static/css/board-catalog.css
+++ b/doc/_extensions/zephyr/domain/static/css/board-catalog.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024, The Linux Foundation.
+ * Copyright (c) 2024-2025, The Linux Foundation.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -82,6 +82,49 @@
   white-space: nowrap;
 }
 
+.tag-container {
+  display: flex;
+  flex-wrap: wrap;
+  border: 1px solid #ccc;
+  border-radius: 50px;
+  padding: 5px 18px;
+}
+
+.tag-container:focus-within {
+  border-color: var(--input-focus-border-color);
+}
+
+.tag {
+  background-color: var(--admonition-note-background-color);
+  color: var(--admonition-note-color);
+  padding: 2px 12px 4px 16px;
+  border-radius: 30px;
+  display: inline-flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 14px;
+  margin-right: 8px;
+}
+
+.tag:hover {
+  background-color: #0056b3;
+}
+
+.tag::after {
+  content: '\00D7'; /* multiplication sign */
+  margin-left: 8px;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.filter-form input.tag-input {
+  flex: 1;
+  border: none;
+  padding: 5px;
+  outline: none;
+  background-color: transparent;
+}
+
 #catalog {
   display: flex;
   flex-wrap: wrap;
diff --git a/doc/_extensions/zephyr/domain/static/css/board.css b/doc/_extensions/zephyr/domain/static/css/board.css
new file mode 100644
index 0000000000000..d2d90b9fe5c34
--- /dev/null
+++ b/doc/_extensions/zephyr/domain/static/css/board.css
@@ -0,0 +1,297 @@
+/**
+ * Copyright (c) 2024-2025, The Linux Foundation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Board overview "card" on board documentation pages */
+.sidebar.board-overview {
+    border-radius: 12px;
+    padding: 0px;
+    background: var(--admonition-note-background-color);
+    color: var(--admonition-note-title-color);
+    border-color: var(--admonition-note-title-background-color);
+}
+
+@media screen and (max-width: 480px) {
+    .sidebar.board-overview {
+        float: none;
+        margin-left: 0;
+    }
+}
+
+.sidebar.board-overview {
+    color: var(--admonition-note-color);
+}
+
+.sidebar.board-overview .sidebar-title {
+    font-family: var(--header-font-family);
+    background: var(--admonition-note-title-background-color);
+    color: var(--admonition-note-title-color);
+    border-radius: 12px 12px 0px 0px;
+    margin: 0px;
+    text-align: center;
+}
+
+.sidebar.board-overview figure {
+    padding: 1rem;
+    margin-bottom: -1rem;
+}
+
+.sidebar.board-overview figure img {
+    height: auto !important;
+}
+
+.sidebar.board-overview figure figcaption p {
+    margin-bottom: 0px;
+}
+
+.sidebar.board-overview dl.field-list {
+    align-items: center;
+    margin-top: 12px !important;
+    margin-bottom: 12px !important;
+    grid-template-columns: auto 1fr !important;
+    padding-right: 1em;
+}
+
+.sidebar.board-overview dl.field-list>dt {
+    background: transparent !important;
+}
+
+.sidebar.board-overview dl.field-list>dd {
+    margin-left: 1em;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.sidebar.board-overview dl.field-list>dd code {
+    font-size: 0.9em;
+}
+
+.sidebar.board-overview #board-github-link {
+    text-align: center;
+    margin-bottom: 1em;
+    font-size: 0.9em;
+}
+
+.sidebar.board-overview #board-github-link a {
+    display: inline-block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 80%;
+}
+
+.legend {
+    font-size: 0.9em;
+    border-radius: 6px;
+    margin: auto;
+
+    .supported-hardware {
+        margin-bottom: 0px !important;
+        grid-template-columns: auto auto !important;
+
+        dt {
+            display: table-cell !important;
+            padding-left: 0em;
+            padding-bottom: 0.5em;
+            text-align: center;
+            background: none !important;
+        }
+
+        dd {
+            margin-top:4px;
+            line-height: 1.1em;
+        }
+    }
+}
+
+.board-target-selector {
+    margin-bottom: 1em;
+    padding: 15px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    flex-wrap: wrap;
+    position: relative;
+}
+
+.board-target-selector > div {
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+}
+
+.static-value {
+    padding: 5px 0px;
+    color: var(--body-color);
+    font-family: var(--monospace-font-family);
+    font-size: 0.9em;
+}
+
+.separator {
+    font-size: 16px;
+    font-weight: bold;
+    margin: 0 4px;
+}
+
+.board-target-selector select {
+    background-color: var(--input-background-color);
+    color: var(--body-color);
+    border-radius: 4px;
+    font-family: var(--monospace-font-family);
+    font-size: 0.9em;
+    box-shadow: none;
+    transition: none;
+}
+
+.board-target-selector select:focus {
+    border-color: var(--input-focus-border-color);
+}
+
+.copy-button {
+    background: transparent;
+    border: 1px solid var(--input-border-color);
+    border-radius: 4px;
+    padding: 4px 8px;
+    cursor: pointer;
+    font-size: 0.8em;
+    color: var(--body-color);
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    transition: all 0.2s ease;
+}
+
+.copy-button:hover {
+    background: var(--input-background-color);
+    border-color: var(--input-focus-border-color);
+}
+
+.copy-button.copied {
+    background: var(--admonition-note-title-background-color);
+    color: var(--admonition-note-title-color);
+    border-color: var(--admonition-note-title-color);
+}
+
+.copy-button svg {
+    width: 18px;
+    height: 18px;
+    fill: currentColor;
+}
+
+.hardware-features {
+    th {
+        background: var(--navbar-background-color);
+        color: var(--navbar-level-1-color);
+        border: none !important;
+        font-weight: 600;
+        text-transform: uppercase;
+        font-size: 0.8em;
+        letter-spacing: 0.5px;
+    }
+
+    td,
+    th {
+        padding: 8px 12px;
+        border-left: none !important;
+        text-align: left;
+    }
+
+    td {
+        font-size: 0.85em;
+        background: transparent !important;
+        vertical-align: middle;
+
+        p {
+            white-space: normal;
+        }
+    }
+
+    /* Column widths and specific styling */
+    .type {
+        font-weight: 600;
+    }
+
+    .location {
+        font-size: 0.9em;
+    }
+
+    .description {
+    }
+
+    .compatible {
+        font-family: var(--monospace-font-family);
+
+        code {
+            background: transparent;
+            border: none;
+            padding: 0;
+            font-size: 0.9em;
+        }
+
+        code.literal {
+            display: inline-block;
+            width:190px;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+        }
+    }
+}
+
+.count {
+    line-height: 1rem;
+    display: inline-flex;
+    align-items: center;
+    padding: 1px 4px;
+    border-radius: 4px;
+    font-size: 0.7em;
+    font-weight: 600;
+    margin-left: 4px;
+    padding-right: 6px !important;
+
+    &::before {
+        content: "×";
+        margin-right: 2px;
+    }
+
+    &.okay-count {
+        background: rgba(46, 204, 113, 1);
+        color: white;
+    }
+
+    &.disabled-count {
+        background: rgba(241, 196, 15, 1);
+        color: black;
+    }
+}
+
+.location-chip {
+    line-height: 1em;
+    display: inline-block;
+    width: 7em;
+    padding: 0.6em;
+    border-radius: 12px;
+    font-size: 0.8em;
+    font-weight: 600;
+    text-transform: lowercase;
+    text-align: center;
+    white-space: nowrap;
+
+    &.onboard {
+        background: var(--admonition-note-title-background-color);
+        color: var(--admonition-note-title-color);
+    }
+
+    &.onchip {
+        background: var(--admonition-tip-title-background-color);
+        color: var(--admonition-tip-title-color);
+    }
+}
+
+/* Status indicators */
+.status {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+}
diff --git a/doc/_extensions/zephyr/domain/static/js/board-catalog.js b/doc/_extensions/zephyr/domain/static/js/board-catalog.js
index 6ac7ae946b8f5..0e8c2767c7fcf 100644
--- a/doc/_extensions/zephyr/domain/static/js/board-catalog.js
+++ b/doc/_extensions/zephyr/domain/static/js/board-catalog.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024, The Linux Foundation.
+ * Copyright (c) 2024-2025, The Linux Foundation.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -29,6 +29,29 @@ function populateFormFromURL() {
     }
   });
 
+  // Restore supported features from URL
+  if (hashParams.has("features")) {
+    const features = hashParams.get("features").split(",");
+    setTimeout(() => {
+      features.forEach(feature => {
+        const tagContainer = document.getElementById('tag-container');
+        const tagInput = document.getElementById('tag-input');
+
+        const tagElement = document.createElement('span');
+        tagElement.classList.add('tag');
+        tagElement.textContent = feature;
+        tagElement.onclick = () => {
+          const selectedTags = [...document.querySelectorAll('.tag')].map(tag => tag.textContent);
+          selectedTags.splice(selectedTags.indexOf(feature), 1);
+          tagElement.remove();
+          filterBoards();
+        };
+        tagContainer.insertBefore(tagElement, tagInput);
+      });
+      filterBoards();
+    }, 0);
+  }
+
   filterBoards();
 }
 
@@ -47,6 +70,10 @@ function updateURL() {
     }
   });
 
+  // Add supported features to URL
+  const selectedTags = [...document.querySelectorAll('.tag')].map(tag => tag.textContent);
+  selectedTags.length ? hashParams.set("features", selectedTags.join(",")) : hashParams.delete("features");
+
   window.history.replaceState({}, "", `#${hashParams.toString()}`);
 }
 
@@ -84,6 +111,81 @@ function fillSocSocSelect(families, series = undefined, selectOnFill = false) {
   });
 }
 
+function setupHWCapabilitiesField() {
+  let selectedTags = [];
+
+  const tagContainer = document.getElementById('tag-container');
+  const tagInput = document.getElementById('tag-input');
+  const datalist = document.getElementById('tag-list');
+
+  const tagCounts = Array.from(document.querySelectorAll('.board-card')).reduce((acc, board) => {
+    board.getAttribute('data-supported-features').split(' ').forEach(tag => {
+      acc[tag] = (acc[tag] || 0) + 1;
+    });
+    return acc;
+  }, {});
+
+  const allTags = Object.keys(tagCounts).sort();
+
+  function addTag(tag) {
+    if (selectedTags.includes(tag) || tag === "" || !allTags.includes(tag)) return;
+    selectedTags.push(tag);
+
+    const tagElement = document.createElement('span');
+    tagElement.classList.add('tag');
+    tagElement.textContent = tag;
+    tagElement.onclick = () => removeTag(tag);
+    tagContainer.insertBefore(tagElement, tagInput);
+
+    tagInput.value = '';
+    updateDatalist();
+  }
+
+  function removeTag(tag) {
+    selectedTags = selectedTags.filter(t => t !== tag);
+    document.querySelectorAll('.tag').forEach(el => {
+      if (el.textContent.includes(tag)) el.remove();
+    });
+    updateDatalist();
+  }
+
+  function updateDatalist() {
+    datalist.innerHTML = '';
+    const filteredTags = allTags.filter(tag => !selectedTags.includes(tag));
+
+    filteredTags.forEach(tag => {
+      const option = document.createElement('option');
+      option.value = tag;
+      datalist.appendChild(option);
+    });
+
+    filterBoards();
+  }
+
+  tagInput.addEventListener('input', () => {
+    if (allTags.includes(tagInput.value)) {
+      addTag(tagInput.value);
+    }
+  });
+
+  // Add tag when pressing the Enter key
+  tagInput.addEventListener('keydown', (e) => {
+    if (e.key === 'Enter' && allTags.includes(tagInput.value)) {
+      addTag(tagInput.value);
+      e.preventDefault();
+    }
+  });
+
+  // Delete tag when pressing the Backspace key
+  tagInput.addEventListener('keydown', (e) => {
+    if (e.key === 'Backspace' && tagInput.value === '' && selectedTags.length > 0) {
+      removeTag(selectedTags[selectedTags.length - 1]);
+    }
+  });
+
+  updateDatalist();
+}
+
 document.addEventListener("DOMContentLoaded", function () {
   const form = document.querySelector(".filter-form");
 
@@ -101,9 +203,10 @@ document.addEventListener("DOMContentLoaded", function () {
   fillSocFamilySelect();
   fillSocSeriesSelect();
   fillSocSocSelect();
-
   populateFormFromURL();
 
+  setupHWCapabilitiesField();
+
   socFamilySelect = document.getElementById("family");
   socFamilySelect.addEventListener("change", () => {
     const selectedFamilies = [...socFamilySelect.selectedOptions].map(({ value }) => value);
@@ -142,6 +245,11 @@ function resetForm() {
   fillSocFamilySelect();
   fillSocSeriesSelect();
   fillSocSocSelect();
+
+  // Clear supported features
+  document.querySelectorAll('.tag').forEach(tag => tag.remove());
+  document.getElementById('tag-input').value = '';
+
   filterBoards();
 }
 
@@ -160,8 +268,10 @@ function filterBoards() {
   const vendorSelect = document.getElementById("vendor").value;
   const socSocSelect = document.getElementById("soc");
 
+  const selectedTags = [...document.querySelectorAll('.tag')].map(tag => tag.textContent);
+
   const resetFiltersBtn = document.getElementById("reset-filters");
-  if (nameInput || archSelect || vendorSelect || socSocSelect.selectedOptions.length) {
+  if (nameInput || archSelect || vendorSelect || socSocSelect.selectedOptions.length || selectedTags.length) {
     resetFiltersBtn.classList.remove("btn-disabled");
   } else {
     resetFiltersBtn.classList.add("btn-disabled");
@@ -174,6 +284,7 @@ function filterBoards() {
     const boardArchs = board.getAttribute("data-arch").split(" ");
     const boardVendor = board.getAttribute("data-vendor");
     const boardSocs = board.getAttribute("data-socs").split(" ");
+    const boardSupportedFeatures = board.getAttribute("data-supported-features").split(" ");
 
     let matches = true;
 
@@ -183,7 +294,8 @@ function filterBoards() {
       !(nameInput && !boardName.includes(nameInput)) &&
       !(archSelect && !boardArchs.includes(archSelect)) &&
       !(vendorSelect && boardVendor !== vendorSelect) &&
-      (selectedSocs.length === 0 || selectedSocs.some((soc) => boardSocs.includes(soc)));
+      (selectedSocs.length === 0 || selectedSocs.some((soc) => boardSocs.includes(soc))) &&
+      (selectedTags.length === 0 || selectedTags.every((tag) => boardSupportedFeatures.includes(tag)));
 
     board.classList.toggle("hidden", !matches);
   });
diff --git a/doc/_extensions/zephyr/domain/static/js/board.js b/doc/_extensions/zephyr/domain/static/js/board.js
new file mode 100644
index 0000000000000..6ff36a5b0f255
--- /dev/null
+++ b/doc/_extensions/zephyr/domain/static/js/board.js
@@ -0,0 +1,248 @@
+/**
+ * Copyright (c) 2025, The Linux Foundation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+(() => {
+  // SVG icons for copy button
+  const COPY_ICON = `<svg viewBox="0 0 24 24"><path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/></svg>`;
+  const CHECK_ICON = `<svg viewBox="0 0 24 24"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41L9 16.17z"/></svg>`;
+
+  // DOM element creation helper
+  const createElement = (tag, className, text) => {
+    const element = document.createElement(tag);
+    if (className) element.className = className;
+    if (text) element.textContent = text;
+    return element;
+  };
+
+  // Target parsing helper
+  const parseTargetString = (targetString) => {
+    const [boardWithRev, ...qualifiers] = targetString.split('/');
+    const [board, revision] = boardWithRev.split('@');
+    return {
+      board: board || '',
+      revision: revision || '',
+      qualifier: qualifiers.join('/') || ''
+    };
+  };
+
+  // Select element creation helper
+  const createSelect = (options, selectedValue) => {
+    const select = createElement('select');
+    options.sort().forEach(value => {
+      const option = createElement('option', null, value);
+      option.value = value;
+      option.selected = (value === selectedValue);
+      select.appendChild(option);
+    });
+    return select;
+  };
+
+  // Main initialization function
+  const initializeBoardSelector = () => {
+    const container = document.querySelector('.container[id$="-hw-features"]');
+    if (!container) return console.error('Container element not found');
+
+    const components = {
+      boards: new Set([board_data.board_name]),
+      revisions: new Set(),
+      qualifiers: new Set()
+    };
+
+    board_data.targets.forEach(target => {
+      const { revision, qualifier } = parseTargetString(target);
+      if (revision) components.revisions.add(revision);
+      if (qualifier) components.qualifiers.add(qualifier);
+    });
+
+    const initialValues = parseTargetString(board_data.targets[0]);
+    if (board_data.revision_default) {
+      initialValues.revision = board_data.revision_default;
+    }
+
+    const selector = createElement('div', 'board-target-selector');
+    selector.appendChild(createElement('div', 'static-value', initialValues.board));
+
+    // Add revision selector if needed
+    let revisionSelect;
+    if (components.revisions.size > 0) {
+      selector.appendChild(createElement('div', 'separator', '@'));
+      revisionSelect = createSelect(
+        Array.from(components.revisions),
+        initialValues.revision
+      );
+      selector.appendChild(revisionSelect);
+    }
+
+    // Add qualifier selector or static value
+    let qualifierSelect;
+    if (components.qualifiers.size > 0) {
+      selector.appendChild(createElement('div', 'separator', '/'));
+      if (components.qualifiers.size === 1) {
+        selector.appendChild(createElement('div', 'static-value', initialValues.qualifier));
+      } else {
+        qualifierSelect = createSelect(
+          Array.from(components.qualifiers),
+          null
+        );
+        selector.appendChild(qualifierSelect);
+      }
+    }
+
+    // Add copy button
+    const copyButton = createElement('button', 'copy-button');
+    copyButton.innerHTML = COPY_ICON;
+    copyButton.addEventListener('click', handleCopyButtonClick(
+      initialValues,
+      revisionSelect,
+      qualifierSelect,
+      copyButton
+    ));
+    selector.appendChild(copyButton);
+
+    // Insert selector into DOM and set up event listeners
+    container.parentNode.insertBefore(selector, container);
+    selector.querySelectorAll('select').forEach(select => {
+      select.addEventListener('change', () => {
+        updateSelectOptions(initialValues, revisionSelect, qualifierSelect);
+        updateDisplayedTable(revisionSelect, qualifierSelect);
+
+      });
+    });
+
+    // Initial display setup
+    initializeDisplay();
+    // updateDisplayedTable(revisionSelect, qualifierSelect);
+  };
+
+  // Copy button click handler
+  const handleCopyButtonClick = (initialValues, revisionSelect, qualifierSelect, button) => async () => {
+    try {
+      const target = buildTargetString(initialValues, revisionSelect, qualifierSelect);
+      await navigator.clipboard.writeText(target);
+
+      button.classList.add('copied');
+      button.innerHTML = CHECK_ICON;
+
+      setTimeout(() => {
+        button.classList.remove('copied');
+        button.innerHTML = COPY_ICON;
+      }, 1000);
+    } catch (error) {
+      console.error('Failed to copy text:', error);
+    }
+  };
+
+  // Build target string from current selections
+  const buildTargetString = (initialValues, revisionSelect, qualifierSelect) => {
+    const parts = [initialValues.board];
+
+    if (revisionSelect) {
+      parts.push(`@${revisionSelect.value}`);
+    } else if (initialValues.revision) {
+      parts.push(`@${initialValues.revision}`);
+    }
+
+    if (qualifierSelect) {
+      parts.push(`/${qualifierSelect.value}`);
+    } else if (initialValues.qualifier) {
+      parts.push(`/${initialValues.qualifier}`);
+    }
+
+    return parts.join('');
+  };
+
+  // Update displayed table based on selections
+  const updateDisplayedTable = (revisionSelect, qualifierSelect) => {
+    const currentTarget = buildTargetString(
+      parseTargetString(board_data.targets[0]),
+      revisionSelect,
+      qualifierSelect
+    );
+
+    console.log(currentTarget);
+
+    document.querySelectorAll('section[id$="-hw-features-section"]').forEach(section => {
+      // Find the matching target in board_data.targets
+      const isMatch = section.id.replace(/${board_data.name}/).replace(/-hw-features-section$/, '').endsWith(currentTarget);
+
+      const table = document.querySelector(`table[id="${section.id.replace('-section', '-table')}"]`);
+      const wrapper = table?.closest('.wy-table-responsive');
+
+
+      if (table) table.style.display = isMatch ? 'table' : 'none';
+      if (wrapper) wrapper.style.display = isMatch ? 'block' : 'none';
+    });
+  };
+
+  // Initial display setup
+  const initializeDisplay = () => {
+    document.querySelectorAll('section[id$="-hw-features-section"]').forEach(section => section.style.display = 'none');
+    document.querySelectorAll('table.hardware-features').forEach((table, index) => {
+      const wrapper = table.closest('.wy-table-responsive');
+      table.style.display = index === 0 ? 'table' : 'none';
+      if (wrapper) wrapper.style.display = index === 0 ? 'block' : 'none';
+    });
+    updateDisplayedTable(revisionSelect, qualifierSelect);
+  };
+
+  // Update select options based on valid combinations
+  const updateSelectOptions = (initialValues, revisionSelect, qualifierSelect) => {
+    if (revisionSelect) {
+      const currentBoard = initialValues.board;
+      const validRevisions = new Set();
+
+      // Find valid revisions for current board
+      board_data.targets.forEach(target => {
+        const { board, revision } = parseTargetString(target);
+        if (board === currentBoard && revision) {
+          validRevisions.add(revision);
+        }
+      });
+
+      // Update revision select options
+      Array.from(revisionSelect.options).forEach(option => {
+        option.disabled = !validRevisions.has(option.value);
+        if (option.disabled && option.selected) {
+          // If current selection is invalid, select first valid option
+          const firstValid = Array.from(revisionSelect.options).find(opt => !opt.disabled);
+          if (firstValid) firstValid.selected = true;
+        }
+      });
+    }
+
+    if (qualifierSelect) {
+      const currentBoard = initialValues.board;
+      const currentRevision = revisionSelect ? revisionSelect.value : initialValues.revision;
+      const validQualifiers = new Set();
+
+      // Find valid qualifiers for current board and revision
+      board_data.targets.forEach(target => {
+        const { board, revision, qualifier } = parseTargetString(target);
+        if (board === currentBoard &&
+          (!revision || revision === currentRevision) &&
+          qualifier) {
+          validQualifiers.add(qualifier);
+        }
+      });
+
+      // Update qualifier select options
+      Array.from(qualifierSelect.options).forEach(option => {
+        option.disabled = !validQualifiers.has(option.value);
+        if (option.disabled && option.selected) {
+          // If current selection is invalid, select first valid option
+          const firstValid = Array.from(qualifierSelect.options).find(opt => !opt.disabled);
+          if (firstValid) firstValid.selected = true;
+        }
+      });
+    }
+  };
+
+  // Start initialization when DOM is ready
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', initializeBoardSelector);
+  } else {
+    initializeBoardSelector();
+  }
+})();
diff --git a/doc/_extensions/zephyr/domain/templates/board-card.html b/doc/_extensions/zephyr/domain/templates/board-card.html
index 4c16a3c0cc5ce..0e4808b85a74f 100644
--- a/doc/_extensions/zephyr/domain/templates/board-card.html
+++ b/doc/_extensions/zephyr/domain/templates/board-card.html
@@ -1,5 +1,5 @@
 {#
-  Copyright (c) 2024, The Linux Foundation.
+  Copyright (c) 2024-2025, The Linux Foundation.
   SPDX-License-Identifier: Apache-2.0
 #}
 
@@ -15,7 +15,17 @@
   data-arch="{{ board.archs | join(" ") }}"
   data-vendor="{{ board.vendor }}"
   data-socs="{{ board.socs | join(" ") }}"
-  tabindex="0">
+  data-supported-features="
+    {%- set feature_types = [] -%}
+    {%- for target_features in board.supported_features.values() -%}
+      {%- for feature_type in target_features.keys() -%}
+        {%- if feature_type not in feature_types -%}
+          {%- set _ = feature_types.append(feature_type) -%}
+        {%- endif -%}
+      {%- endfor -%}
+    {%- endfor -%}
+    {{- feature_types|join(' ') -}}
+  " tabindex="0">
   <div class="vendor">{{ vendors[board.vendor] }}</div>
   {% if board.image -%}
   <img alt="A picture of the {{ board.full_name }} board"
diff --git a/doc/_extensions/zephyr/domain/templates/board-catalog.html b/doc/_extensions/zephyr/domain/templates/board-catalog.html
index dc3c9147fed61..4436d3ae09129 100644
--- a/doc/_extensions/zephyr/domain/templates/board-catalog.html
+++ b/doc/_extensions/zephyr/domain/templates/board-catalog.html
@@ -1,5 +1,5 @@
 {#
-  Copyright (c) 2024, The Linux Foundation.
+  Copyright (c) 2024-2025, The Linux Foundation.
   SPDX-License-Identifier: Apache-2.0
 #}
 
@@ -60,6 +60,20 @@
     <select id="soc" name="soc" size="10" multiple></select>
   </div>
 
+  <div class="form-group" style="flex-basis: 100%">
+    <label for="hw-capabilities">Supported Hardware Capabilities</label>
+    <div class="tag-container" id="tag-container">
+      <input list="tag-list" class="tag-input" id="tag-input"
+             placeholder="{% if hw_features_present -%}
+               Type a tag...
+             {%- else -%}
+               List of supported hardware capabilities is not available
+             {%- endif %}"
+             {% if not hw_features_present %}disabled{% endif %}>
+      <datalist id="tag-list"></datalist>
+    </div>
+  </div>
+
 </form>
 
 <div id="form-options" style="text-align: center; margin-bottom: 20px">
diff --git a/doc/_extensions/zephyr/link-roles.py b/doc/_extensions/zephyr/link-roles.py
index 64877b6383078..b07c36d96aa3e 100644
--- a/doc/_extensions/zephyr/link-roles.py
+++ b/doc/_extensions/zephyr/link-roles.py
@@ -84,6 +84,12 @@ def role(
             link_text = text
             link = text
 
+        line_ref = ""
+        line_match = re.search(r"(.+?)(?:#(L\d+(?:-L\d+)?))?$", link)
+        if line_match and line_match.group(2):
+            link = line_match.group(1)
+            line_ref = f"?plain=1#{line_match.group(2)}"
+
         module_match = re.search(r"(.+?):\s*(.+)", link)
         if module_match:
             module = module_match.group(1).strip()
@@ -124,7 +130,7 @@ def role(
                     f"{link} not found in {config.link_roles_manifest_project} {trace}"
                 )
 
-        url = f"{baseurl}/{format}/{rev}/{link}"
+        url = f"{baseurl}/{format}/{rev}/{link}{line_ref}"
         node = nodes.reference(rawtext, link_text, refuri=url, **options)
         return [node], []
 
diff --git a/doc/_scripts/gen_boards_catalog.py b/doc/_scripts/gen_boards_catalog.py
old mode 100644
new mode 100755
index db17c67314fe0..a22ad111176c2
--- a/doc/_scripts/gen_boards_catalog.py
+++ b/doc/_scripts/gen_boards_catalog.py
@@ -1,7 +1,12 @@
-# Copyright (c) 2024 The Linux Foundation
+# Copyright (c) 2024-2025 The Linux Foundation
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
+import os
+import pickle
+import re
+import subprocess
+import sys
 from collections import namedtuple
 from pathlib import Path
 
@@ -10,12 +15,68 @@
 import yaml
 import zephyr_module
 from gen_devicetree_rest import VndLookup
+from runners.core import ZephyrBinaryRunner
 
 ZEPHYR_BASE = Path(__file__).parents[2]
+ZEPHYR_BINDINGS = ZEPHYR_BASE / "dts/bindings"
+EDT_PICKLE_PATHS = [
+    "zephyr/edt.pickle",
+    "hello_world/zephyr/edt.pickle"  # for board targets using sysbuild
+]
+RUNNERS_YAML_PATHS = [
+    "zephyr/runners.yaml",
+    "hello_world/zephyr/runners.yaml"  # for board targets using sysbuild
+]
 
 logger = logging.getLogger(__name__)
 
 
+class DeviceTreeUtils:
+    _compat_description_cache = {}
+
+    @classmethod
+    def get_first_sentence(cls, text):
+        """Extract the first sentence from a text block (typically a node description).
+
+        Args:
+            text: The text to extract the first sentence from.
+
+        Returns:
+            The first sentence found in the text, or the entire text if no sentence
+            boundary is found.
+        """
+        if not text:
+            return ""
+
+        text = text.replace('\n', ' ')
+        # Split by double spaces to get paragraphs
+        paragraphs = text.split('  ')
+        first_paragraph = paragraphs[0].strip()
+
+        # Look for a period followed by a space in the first paragraph
+        period_match = re.search(r'(.*?)\.(?:\s|$)', first_paragraph)
+        if period_match:
+            return period_match.group(1).strip()
+
+        # If no period in the first paragraph, return the entire first paragraph
+        return first_paragraph
+
+    @classmethod
+    def get_cached_description(cls, node):
+        """Get the cached description for a devicetree node.
+
+        Args:
+            node: A devicetree node object with matching_compat and description attributes.
+
+        Returns:
+            The cached description for the node's compatible, creating it if needed.
+        """
+        return cls._compat_description_cache.setdefault(
+            node.matching_compat,
+            cls.get_first_sentence(node.description)
+        )
+
+
 def guess_file_from_patterns(directory, patterns, name, extensions):
     for pattern in patterns:
         for ext in extensions:
@@ -38,6 +99,7 @@ def guess_image(board_or_shield):
 
     return (img_file.relative_to(ZEPHYR_BASE)).as_posix() if img_file else None
 
+
 def guess_doc_page(board_or_shield):
     patterns = [
         "doc/index.{ext}",
@@ -51,7 +113,117 @@ def guess_doc_page(board_or_shield):
     return doc_file
 
 
-def get_catalog():
+def gather_board_build_info(twister_out_dir):
+    """Gather EDT objects and runners info for each board from twister output directory.
+
+    Args:
+        twister_out_dir: Path object pointing to twister output directory
+
+    Returns:
+        A tuple of two dictionaries:
+           - A dictionary mapping board names to a dictionary of board targets and their EDT.
+             objects.
+             The structure is: {board_name: {board_target: edt_object}}
+           - A dictionary mapping board names to a dictionary of board targets and their runners
+             info.
+             The structure is: {board_name: {board_target: runners_info}}
+    """
+    board_devicetrees = {}
+    board_runners = {}
+    if not twister_out_dir.exists():
+        return board_devicetrees, board_runners
+
+    # Find all build_info.yml files in twister-out
+    build_info_files = list(twister_out_dir.glob("*/**/build_info.yml"))
+
+    for build_info_file in build_info_files:
+        edt_pickle_file = None
+        for pickle_path in EDT_PICKLE_PATHS:
+            maybe_file = build_info_file.parent / pickle_path
+            if maybe_file.exists():
+                edt_pickle_file = maybe_file
+                break
+
+        if not edt_pickle_file:
+            continue
+
+        runners_yaml_file = None
+        for runners_yaml_path in RUNNERS_YAML_PATHS:
+            maybe_file = build_info_file.parent / runners_yaml_path
+            if maybe_file.exists():
+                runners_yaml_file = maybe_file
+                break
+
+        try:
+            with open(build_info_file) as f:
+                build_info = yaml.safe_load(f)
+                board_info = build_info.get('cmake', {}).get('board', {})
+                board_name = board_info.get('name')
+                qualifier = board_info.get('qualifiers', '')
+                revision = board_info.get('revision', '')
+
+                board_target = board_name
+                if revision != '':
+                    board_target = f"{board_target}@{revision}"
+                if qualifier:
+                    board_target = f"{board_target}/{qualifier}"
+
+                with open(edt_pickle_file, 'rb') as f:
+                    edt = pickle.load(f)
+                    board_devicetrees.setdefault(board_name, {})[board_target] = edt
+
+                if runners_yaml_file:
+                    with open(runners_yaml_file) as f:
+                        runners_yaml = yaml.safe_load(f)
+                        board_runners.setdefault(board_name, {})[board_target] = (
+                            runners_yaml
+                        )
+
+        except Exception as e:
+            logger.error(f"Error processing build info file {build_info_file}: {e}")
+
+    return board_devicetrees, board_runners
+
+
+def run_twister_cmake_only(outdir):
+    """Run twister in cmake-only mode to generate build info files.
+
+    Args:
+        outdir: Directory where twister should output its files
+    """
+    twister_cmd = [
+        sys.executable,
+        f"{ZEPHYR_BASE}/scripts/twister",
+        "-T", "samples/hello_world/",
+        "--all",
+        "-M",
+        *[arg for path in EDT_PICKLE_PATHS for arg in ('--keep-artifacts', path)],
+        *[arg for path in RUNNERS_YAML_PATHS for arg in ('--keep-artifacts', path)],
+        "--cmake-only",
+        "--outdir", str(outdir),
+    ]
+
+    minimal_env = {
+        'PATH': os.environ.get('PATH', ''),
+        'ZEPHYR_BASE': str(ZEPHYR_BASE),
+        'HOME': os.environ.get('HOME', ''),
+        'PYTHONPATH': os.environ.get('PYTHONPATH', '')
+    }
+
+    try:
+        subprocess.run(twister_cmd, check=True, cwd=ZEPHYR_BASE, env=minimal_env)
+    except subprocess.CalledProcessError as e:
+        logger.warning(f"Failed to run Twister, list of hw features might be incomplete.\n{e}")
+
+
+def get_catalog(generate_hw_features=False):
+    """Get the board catalog.
+
+    Args:
+        generate_hw_features: If True, run twister to generate hardware features information.
+    """
+    import tempfile
+
     vnd_lookup = VndLookup(ZEPHYR_BASE / "dts/bindings/vendor-prefixes.txt", [])
 
     module_settings = {
@@ -78,6 +250,16 @@ def get_catalog():
     boards = list_boards.find_v2_boards(args_find_boards)
     systems = list_hardware.find_v2_systems(args_find_boards)
     board_catalog = {}
+    board_devicetrees = {}
+    board_runners = {}
+
+    if generate_hw_features:
+        logger.info("Running twister in cmake-only mode to get Devicetree files for all boards")
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            run_twister_cmake_only(tmp_dir)
+            board_devicetrees, board_runners = gather_board_build_info(Path(tmp_dir))
+    else:
+        logger.info("Skipping generation of supported hardware features.")
 
     for board in boards.values():
         # We could use board.vendor but it is often incorrect. Instead, deduce vendor from
@@ -91,6 +273,82 @@ def get_catalog():
                 vendor = folder.name
                 break
 
+        socs = {soc.name for soc in board.socs}
+        full_name = board.full_name or board.name
+        doc_page = guess_doc_page(board)
+
+        supported_features = {}
+
+        # Use pre-gathered build info and DTS files
+        if board.name in board_devicetrees:
+            for board_target, edt in board_devicetrees[board.name].items():
+                features = {}
+                for node in edt.nodes:
+                    if node.binding_path is None:
+                        continue
+
+                    binding_path = Path(node.binding_path)
+                    is_custom_binding = False
+                    if binding_path.is_relative_to(ZEPHYR_BINDINGS):
+                        binding_type = binding_path.relative_to(ZEPHYR_BINDINGS).parts[0]
+                    else:
+                        binding_type = "misc"
+                        is_custom_binding = True
+
+
+                    if node.matching_compat is None:
+                        continue
+
+                    # skip "zephyr,xxx" compatibles
+                    if node.matching_compat.startswith("zephyr,"):
+                        continue
+
+                    description = DeviceTreeUtils.get_cached_description(node)
+                    filename = node.filename
+                    lineno = node.lineno
+                    locations = set()
+                    if Path(filename).is_relative_to(ZEPHYR_BASE):
+                        filename = Path(filename).relative_to(ZEPHYR_BASE)
+                        if filename.parts[0] == "boards":
+                            locations.add("board")
+                        else:
+                            locations.add("soc")
+
+                    existing_feature = features.get(binding_type, {}).get(
+                        node.matching_compat
+                    )
+
+                    node_info = {"filename": str(filename), "lineno": lineno}
+                    node_list_key = "okay_nodes" if node.status == "okay" else "disabled_nodes"
+
+                    if existing_feature:
+                        locations.update(existing_feature["locations"])
+                        existing_feature.setdefault(node_list_key, []).append(node_info)
+                        continue
+
+                    feature_data = {
+                        "description": description,
+                        "custom_binding": is_custom_binding,
+                        "locations": locations,
+                        "okay_nodes": [],
+                        "disabled_nodes": [],
+                    }
+                    feature_data[node_list_key].append(node_info)
+
+                    features.setdefault(binding_type, {})[node.matching_compat] = feature_data
+
+                # Store features for this specific target
+                supported_features[board_target] = features
+
+        board_runner_info = {}
+        if board.name in board_runners:
+            # Assume all board targets have the same runners so only consider the runners
+            # for the first board target.
+            r = list(board_runners[board.name].values())[0]
+            board_runner_info["runners"] = r.get("runners")
+            board_runner_info["flash-runner"] = r.get("flash-runner")
+            board_runner_info["debug-runner"] = r.get("debug-runner")
+
         # Grab all the twister files for this board and use them to figure out all the archs it
         # supports.
         archs = set()
@@ -103,18 +361,25 @@ def get_catalog():
             except Exception as e:
                 logger.error(f"Error parsing twister file {twister_file}: {e}")
 
-        socs = {soc.name for soc in board.socs}
-        full_name = board.full_name or board.name
-        doc_page = guess_doc_page(board)
+        if doc_page and doc_page.is_relative_to(ZEPHYR_BASE):
+            doc_page_path = doc_page.relative_to(ZEPHYR_BASE).as_posix()
+        else:
+            doc_page_path = None
 
         board_catalog[board.name] = {
             "name": board.name,
             "full_name": full_name,
-            "doc_page": doc_page.relative_to(ZEPHYR_BASE).as_posix() if doc_page else None,
+            "doc_page": doc_page_path,
             "vendor": vendor,
             "archs": list(archs),
             "socs": list(socs),
+            "revision_default": board.revision_default,
+            "supported_features": supported_features,
             "image": guess_image(board),
+            # runners
+            "supported_runners": board_runner_info.get("runners", []),
+            "flash_runner": board_runner_info.get("flash-runner", ""),
+            "debug_runner": board_runner_info.get("debug-runner", ""),
         }
 
     socs_hierarchy = {}
@@ -123,8 +388,16 @@ def get_catalog():
         series = soc.series or "<no series>"
         socs_hierarchy.setdefault(family, {}).setdefault(series, []).append(soc.name)
 
+    available_runners = {}
+    for runner in ZephyrBinaryRunner.get_runners():
+        available_runners[runner.name()] = {
+            "name": runner.name(),
+            "commands": runner.capabilities().commands,
+        }
+
     return {
         "boards": board_catalog,
         "vendors": {**vnd_lookup.vnd2vendor, "others": "Other/Unknown"},
         "socs": socs_hierarchy,
+        "runners": available_runners,
     }
diff --git a/doc/_scripts/gen_devicetree_rest.py b/doc/_scripts/gen_devicetree_rest.py
index 9a28b591f29f6..908cfb0278b9f 100644
--- a/doc/_scripts/gen_devicetree_rest.py
+++ b/doc/_scripts/gen_devicetree_rest.py
@@ -580,7 +580,14 @@ def print_binding_page(binding, base_names, vnd_lookup, driver_sources,dup_compa
 
     {bus_help}
     ''', string_io)
-    print(to_code_block(binding.description.strip()), file=string_io)
+
+    if binding.title:
+        description = ("\n\n"
+                       .join([binding.title, binding.description])
+                       .strip())
+    else:
+        description = binding.description.strip()
+    print(to_code_block(description), file=string_io)
 
     # Properties.
     print_block('''\
diff --git a/doc/_scripts/redirects.py b/doc/_scripts/redirects.py
index 87d54e5032eca..72ae07b5d542c 100644
--- a/doc/_scripts/redirects.py
+++ b/doc/_scripts/redirects.py
@@ -193,7 +193,6 @@
     ('reference/peripherals/i2c', 'hardware/peripherals/i2c'),
     ('reference/peripherals/index', 'hardware/peripherals/index'),
     ('reference/peripherals/ipm', 'hardware/peripherals/ipm'),
-    ('reference/peripherals/kscan', 'hardware/peripherals/kscan'),
     ('reference/peripherals/led', 'hardware/peripherals/led'),
     ('reference/peripherals/mbox', 'hardware/peripherals/mbox'),
     ('reference/peripherals/mdio', 'hardware/peripherals/mdio'),
@@ -210,7 +209,7 @@
     ('reference/peripherals/uart', 'hardware/peripherals/uart'),
     ('reference/peripherals/video', 'hardware/peripherals/video'),
     ('reference/pm/index', 'services/pm/api/index'),
-    ('reference/settings/index', 'services/settings/index'),
+    ('reference/settings/index', 'services/storage/settings/index'),
     ('reference/shell/index', 'services/shell/index'),
     ('reference/storage/fcb/fcb', 'services/storage/fcb/fcb'),
     ('reference/storage/index', 'services/storage/index'),
@@ -284,7 +283,6 @@
     ('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'),
     ('samples/drivers/led_is31fl3194/README', 'samples/drivers/led/is31fl3194/README'),
     ('samples/drivers/led_is31fl3216a/README', 'samples/drivers/led/is31fl3216a/README'),
@@ -308,5 +306,7 @@
     ('samples/subsys/video/video', 'samples/drivers/video/video'),
     ('services/crypto/tinycrypt', 'services/crypto/psa_crypto'),
     ('services/portability/posix', 'services/portability/posix/index'),
+    ('services/secure_storage', 'services/storage/secure_storage/index'),
+    ('services/settings/index', 'services/storage/settings/index'),
     # zephyr-keep-sorted-stop
 ]
diff --git a/doc/_static/css/custom.css b/doc/_static/css/custom.css
index 586450fc64962..2fd1045d81e4a 100644
--- a/doc/_static/css/custom.css
+++ b/doc/_static/css/custom.css
@@ -1,6 +1,7 @@
 /**
  * Copyright (c) 2019-2020, Juan Linietsky, Ariel Manzur and the Godot community
  * Copyright (c) 2021, Teslabs Engineering S.L.
+ * Copyright (c) 2023-2025, The Linux Foundation.
  * SPDX-License-Identifier: CC-BY-3.0
  *
  * Various tweaks to the Read the Docs theme to better conform with Zephyr's
@@ -11,6 +12,7 @@
      /* Use system font stacks for better performance (no Web fonts required) */
      --system-font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
      --header-font-family: Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif;
+     --monospace-font-family: 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Mono', 'Droid Sans Mono', 'Source Code Pro', monospace;
  }
 
 body,
@@ -921,6 +923,10 @@ dark-mode-toggle::part(toggleLabel){
   font-size: unset;
 }
 
+div.graphviz > object {
+    filter: var(--graphviz-filter);
+}
+
 /* Home page grid display */
 .grid {
     list-style-type: none !important;
@@ -1111,81 +1117,3 @@ li>a.code-sample-link.reference.internal {
 li>a.code-sample-link.reference.internal.current {
     text-decoration: underline;
 }
-
-/* Board overview "card" on board documentation pages */
-.sidebar.board-overview {
-    border-radius: 12px;
-    padding: 0px;
-    background: var(--admonition-note-background-color);
-    color: var(--admonition-note-title-color);
-    border-color: var(--admonition-note-title-background-color);
-}
-
-@media screen and (max-width: 480px) {
-    .sidebar.board-overview {
-        float: none;
-        margin-left: 0;
-    }
-}
-
-.sidebar.board-overview {
-    color: var(--admonition-note-color);
-}
-
-.sidebar.board-overview .sidebar-title {
-    font-family: var(--header-font-family);
-    background: var(--admonition-note-title-background-color);
-    color: var(--admonition-note-title-color);
-    border-radius: 12px 12px 0px 0px;
-    margin: 0px;
-    text-align: center;
-}
-
-.sidebar.board-overview figure {
-    padding: 1rem;
-    margin-bottom: -1rem;
-}
-
-.sidebar.board-overview figure img {
-    height: auto !important;
-}
-
-.sidebar.board-overview figure figcaption p {
-    margin-bottom: 0px;
-}
-
-.sidebar.board-overview dl.field-list {
-    align-items: center;
-    margin-top: 12px !important;
-    margin-bottom: 12px !important;
-    grid-template-columns: auto 1fr !important;
-    padding-right: 1em;
-}
-
-.sidebar.board-overview dl.field-list > dt {
-    background: transparent !important;
-}
-
-.sidebar.board-overview dl.field-list>dd {
-    margin-left: 1em;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-.sidebar.board-overview dl.field-list>dd code {
-    font-size: 0.9em;
-}
-
-.sidebar.board-overview #board-github-link {
-    text-align: center;
-    margin-bottom: 1em;
-    font-size: 0.9em;
-}
-
-.sidebar.board-overview #board-github-link a {
-    display: inline-block;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width:80%;
-}
diff --git a/doc/_static/css/dark.css b/doc/_static/css/dark.css
index 47d555242f6a8..bb1c20c0b5cdd 100644
--- a/doc/_static/css/dark.css
+++ b/doc/_static/css/dark.css
@@ -93,4 +93,6 @@
     --btn-neutral-background-color: #404040;
     --btn-neutral-hover-background-color: #505050;
     --footer-color: #aaa;
+
+    --graphviz-filter: invert(0.9) brightness(1.2);
 }
diff --git a/doc/_static/css/light.css b/doc/_static/css/light.css
index 0389650278c7c..757ec6f1e1b0c 100644
--- a/doc/_static/css/light.css
+++ b/doc/_static/css/light.css
@@ -91,4 +91,6 @@
     --btn-neutral-background-color: #f3f6f6;
     --btn-neutral-hover-background-color: #e5ebeb;
     --footer-color: #808080;
+
+    --graphviz-filter: none;
 }
diff --git a/doc/build/dts/api/api.rst b/doc/build/dts/api/api.rst
index f604f29d9e077..c8c3c0563a9f6 100644
--- a/doc/build/dts/api/api.rst
+++ b/doc/build/dts/api/api.rst
@@ -422,6 +422,9 @@ device.
      - A node whose ``reg`` is used by the OpenAMP subsystem to determine the
        base address and size of the shared memory (SHM) usable for
        interprocess-communication (IPC)
+   * - zephyr,ipc_rsc_table
+     - Specifies a memory region that will be used for the OpenAMP resource table.
+       Only needed if :kconfig:option:`CONFIG_OPENAMP_COPY_RSC_TABLE` is enabled.
    * - zephyr,itcm
      - Instruction Tightly Coupled Memory node on some Arm SoCs
    * - zephyr,log-uart
@@ -459,3 +462,8 @@ device.
        WS2812 GPIO driver
    * - zephyr,touch
      - touchscreen controller device node.
+   * - mcuboot,ram-load-dev
+     - When a Zephyr application is built to be loaded to RAM by MCUboot, with
+       :kconfig:option:`CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP_RAM_LOAD`,
+       this property is used to tell MCUboot the load address of the image, which
+       will be the ``reg`` of the chosen node.
diff --git a/doc/build/dts/bindings-syntax.rst b/doc/build/dts/bindings-syntax.rst
index def71687fb3a0..fea69ee591150 100644
--- a/doc/build/dts/bindings-syntax.rst
+++ b/doc/build/dts/bindings-syntax.rst
@@ -19,6 +19,16 @@ like this:
 
 .. code-block:: yaml
 
+   # When the description text is too long, this field can
+   # be used to improve readability, e.g.:
+   #
+   # title: Binding the device's hardware model.
+   #
+   # description |
+   #   A piece of content with 20 lines.
+   #   ...
+   title: Concise title for the long description [optional]
+
    # A high level description of the device the binding applies to:
    description: |
       This is the Vendomatic company's foo-device.
@@ -58,6 +68,14 @@ like this:
 
 These keys are explained in the following sections.
 
+.. _dt-bindings-title:
+
+Title
+*****
+
+Short description of the bound device, typically the hardware model.
+(It's optional.)
+
 .. _dt-bindings-description:
 
 Description
diff --git a/doc/build/dts/bindings-upstream.rst b/doc/build/dts/bindings-upstream.rst
index b33b7f9245207..6a9cb666a42f8 100644
--- a/doc/build/dts/bindings-upstream.rst
+++ b/doc/build/dts/bindings-upstream.rst
@@ -83,6 +83,8 @@ style:
 
 .. code-block:: yaml
 
+   title: I'm sure you need a short title.
+
    description: |
      My very long string
      goes here.
diff --git a/doc/build/kconfig/preprocessor-functions.rst b/doc/build/kconfig/preprocessor-functions.rst
index e3cd282f9250b..9de5110bfdbc7 100644
--- a/doc/build/kconfig/preprocessor-functions.rst
+++ b/doc/build/kconfig/preprocessor-functions.rst
@@ -65,6 +65,7 @@ while the ``*_hex`` version returns a hexadecimal value starting with ``0x``.
    $(dt_nodelabel_bool_prop,<node label>,<prop>)
    $(dt_nodelabel_enabled,<node label>)
    $(dt_nodelabel_enabled_with_compat,<node label>,<compatible string>)
+   $(dt_nodelabel_exists,<node label>)
    $(dt_nodelabel_has_compat,<node label>,<compatible string>)
    $(dt_nodelabel_has_prop,<node label>,<prop>)
    $(dt_nodelabel_path,<node label>)
diff --git a/doc/build/sysbuild/images.rst b/doc/build/sysbuild/images.rst
new file mode 100644
index 0000000000000..3ccfd873e16b4
--- /dev/null
+++ b/doc/build/sysbuild/images.rst
@@ -0,0 +1,441 @@
+.. _sysbuild_images:
+
+Sysbuild images
+###############
+
+Sysbuild can be used to add additional images to builds, these can be added by projects or boards
+though at present must be Zephyr applications.
+
+Methods of adding images
+************************
+
+Images can be added to project or projects in various ways, multiple ways can be used
+simultaneously, they can be added in the following ways:
+
+Applications
+============
+
+Applications can add sysbuild images using the ``sysbuild.cmake`` file in the application
+directory, the inclusion of images can be controlled with a ``Kconfig.sysbuild`` file in the
+application directory.
+
+Boards
+======
+
+Boards can add sysbuild images by using the ``sysbuild.cmake`` file in the board directory, the
+inclusion of images can be controlled with a ``Kconfig.sysbuild`` file in the board directory.
+
+SoCs
+====
+
+SoCs can add sysbuild images by using the ``sysbuild.cmake`` file in the soc directory.
+
+Modules
+=======
+
+:ref:`modules` can add sysbuild images with the ``sysbuild-cmake`` and ``sysbuild-kconfig``
+options in a ``module.yml`` file, see :ref:`sysbuild_module_integration` for details.
+
+Adding images
+*************
+
+Images can be added in one of two ways:
+
+Single unchangeable image
+=========================
+
+With this setup, the image to be added is fixed to a specific application and cannot be changed
+(although it cannot be changed to another image, the version of the image itself can be changed by
+use of a west manifest bringing in a different version of the application repo or from an
+alternate source, assuming that the image is in it's own repository).
+
+.. note::
+
+   This method should only be used if the image is locked to a specific interface and has no
+   extensibility.
+
+An example of how to create such an image, this assumes that a
+:ref:`Zephyr application has been created <application>`:
+
+.. tabs::
+
+   .. group-tab:: ``Kconfig.sysbuild``
+
+      .. code-block:: kconfig
+
+         config MY_IMAGE
+                 bool "Include my amazing image"
+                 help
+                   If enabled, will include my amazing image in the build which does...
+
+      .. note::
+
+         Remember to have ``source "share/sysbuild/Kconfig"`` in the file if this
+         is being applied in an application ``Kconfig.sysbuild`` file.
+
+
+   .. group-tab:: ``sysbuild.cmake``
+
+      .. code-block:: cmake
+
+         if(SB_CONFIG_MY_IMAGE)
+           ExternalZephyrProject_Add(
+             APPLICATION my_image
+             SOURCE_DIR ${ZEPHYR_MY_IMAGE_MODULE_DIR}/path/to/my_image
+           )
+         endif()
+
+Additional dependency ordering can be set here if needed, see
+:ref:`sysbuild_zephyr_application_dependencies` for details, image configuration can also be set
+here, see :ref:`sysbuild_images_config` for details.
+
+This image can be enabled when building with west like so:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: <app>
+   :board: nrf52840dk/nrf52840
+   :goals: build
+   :west-args: --sysbuild
+   :gen-args: -DSB_CONFIG_MY_IMAGE=y
+   :compact:
+
+Extensible changeable image
+===========================
+
+With this setup, the image to be added can be one of any number of possible applications which the
+user has selection over, this list of selections can also be extended downstream to add additional
+options for out-of-tree specific applications that are not available in upstream Zephyr. This is
+more complex to create but is the preferred method for adding images to upstream Zephyr.
+
+.. tabs::
+
+   .. group-tab:: ``Kconfig.sysbuild``
+
+      .. code-block:: kconfig
+
+         config SUPPORT_OTHER_APP
+                 bool
+                 # Conditions can be placed here if this application type is only usable on certain platforms
+                 default y
+
+         config SUPPORT_OTHER_APP_MY_IMAGE
+                 bool
+                 # Conditions can be placed here if this image is only usable on certain platforms
+                 default y
+
+         choice OTHER_APP
+                 prompt "Other app image"
+                 # Defaults can be specified here if a default image should be loaded if e.g. it is supported
+                 default OTHER_APP_NONE
+                 depends on SUPPORT_OTHER_APP
+
+         config OTHER_APP_IMAGE_NONE
+                 bool "None"
+                 help
+                   Do not Include an other app image in the build.
+
+         config OTHER_APP_IMAGE_MY_IMAGE
+                 bool "my_image"
+                 depends on SUPPORT_OTHER_APP_MY_IMAGE
+                 help
+                   Include my amazing image as the other app image to use, which does...
+
+         endchoice
+
+         config OTHER_APP_IMAGE_NAME
+                 string
+                 default "my_image" if OTHER_APP_IMAGE_MY_IMAGE
+                 help
+                   Name of other app image.
+
+         config OTHER_APP_IMAGE_PATH
+                 string
+                 default "${ZEPHYR_MY_IMAGE_MODULE_DIR}/path/to/my_image" if OTHER_APP_IMAGE_MY_IMAGE
+                 help
+                   Source directory of other app image.
+
+      .. note::
+
+         Remember to have ``source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"`` in the file if this
+         is being applied in an application ``Kconfig.sysbuild`` file.
+
+   .. group-tab:: ``sysbuild.cmake``
+
+      .. code-block:: cmake
+
+         if(SB_CONFIG_OTHER_APP_IMAGE_PATH)
+           ExternalZephyrProject_Add(
+             APPLICATION ${SB_CONFIG_OTHER_APP_IMAGE_NAME}
+             SOURCE_DIR ${SB_CONFIG_OTHER_APP_IMAGE_PATH}
+           )
+         endif()
+
+Additional dependency ordering can be set here if needed, see
+:ref:`sysbuild_zephyr_application_dependencies` for details, image configuration can also be set
+here, see :ref:`sysbuild_images_config` for details.
+
+This secondary image can be enabled when building with west like so:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: <app>
+   :board: nrf52840dk/nrf52840
+   :goals: build
+   :west-args: --sysbuild
+   :gen-args: -DSB_CONFIG_MY_IMAGE=y
+   :compact:
+
+This can then be extended by :ref:`modules` like so:
+
+.. tabs::
+
+   .. group-tab:: ``Kconfig.sysbuild``
+
+      .. code-block:: kconfig
+
+         config SUPPORT_OTHER_APP_MY_SECOND_IMAGE
+                 bool
+                 default y
+
+         choice OTHER_APP
+
+         config OTHER_APP_IMAGE_MY_SECOND_IMAGE
+                 bool "my_second_image"
+                 depends on SUPPORT_OTHER_APP_MY_SECOND_IMAGE
+                 help
+                   Include my other amazing image as the other app image to use, which does...
+
+         endchoice
+
+         config OTHER_APP_IMAGE_NAME
+                 default "my_second_image" if OTHER_APP_IMAGE_MY_SECOND_IMAGE
+
+         config OTHER_APP_IMAGE_PATH
+                 default "${ZEPHYR_MY_SECOND_IMAGE_MODULE_DIR}/path/to/my_second_image" if OTHER_APP_IMAGE_MY_SECOND_IMAGE
+
+As can be seen, no additional CMake changes are needed to add an alternative image as the base
+CMake code will add the replacement image instead of the original image, if selected.
+
+This alternative secondary image can be enabled when building with west like so:
+
+.. zephyr-app-commands::
+   :tool: west
+   :zephyr-app: <app>
+   :board: nrf52840dk/nrf52840
+   :goals: build
+   :west-args: --sysbuild
+   :gen-args: -DSB_CONFIG_MY_SECOND_IMAGE=y
+   :compact:
+
+.. _sysbuild_images_config:
+
+Image configuration
+*******************
+
+Sysbuild supports being able to set image configuration (Kconfig options) and also supports
+reading the output of image configuration (Kconfig) which can be used to allow an
+option to be added to sysbuild itself and then to configure it globally or selectively.
+
+Setting image configuration
+===========================
+
+Kconfig
+-------
+
+Sysbuild can be used to set image configuration **before the CMake configuration of images takes
+place**. An important note about setting Kconfig options in images is that these are persistent
+and cannot be changed by the images. The following functions can be used to set configuration on
+an image:
+
+.. code-block:: cmake
+
+   set_config_bool(<image> CONFIG_<setting> <value>)
+   set_config_string(<image> CONFIG_<setting> <value>)
+   set_config_int(<image> CONFIG_<setting> <value>)
+
+For example, to change the default image to output a hex file:
+
+.. code-block:: cmake
+
+   set_config_bool(${DEFAULT_IMAGE} CONFIG_BUILD_OUTPUT_HEX y)
+
+These can safely be used in an application, board or SoC ``sysbuild.cmake`` file, as that file is
+included before the image CMake processes are invoked. When extending
+:ref:`sysbuild using modules <sysbuild_module_integration>` the pre-CMake hook should be used
+instead, for example:
+
+.. code-block:: cmake
+
+   function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
+     cmake_parse_arguments(PRE_CMAKE "" "" "IMAGES" ${ARGN})
+
+     foreach(image ${PRE_CMAKE_IMAGES})
+       set_config_bool(${image} CONFIG_BUILD_OUTPUT_HEX y)
+     endforeach()
+   endfunction()
+
+Image configuration script
+==========================
+
+An image configuration script is a CMake file that can be used to configure an image with common
+configuration values, multiple can be used per image, the configuration should be transferrable to
+different images to correctly configure them based upon options set in sysbuild. MCUboot
+configuration options are configured in both the application the MCUboot image using this method
+which allows sysbuild to be the central location for things like the signing key which are then
+kept in-sync in the main application bootloader images.
+
+Inside image configuration scripts, the ``ZCMAKE_APPLICATION`` variable is set to the name of the
+application being configured, the ``set_config_*`` sysbuild CMake functions can be used to set
+configuration and the sysbuild Kconfig can be read, for example:
+
+.. code-block:: cmake
+
+   if(SB_CONFIG_BOOTLOADER_MCUBOOT AND "${SB_CONFIG_SIGNATURE_TYPE}" STREQUAL "NONE")
+     set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE y)
+   endif()
+
+Image configuration script (module/application)
+-----------------------------------------------
+
+Module/application image configuration scripts can be set from module or application code, this
+must be done in a ``sysbuild.cmake`` file for an application. This can be used to add an image
+configuration script as follows:
+
+.. tabs::
+
+   .. group-tab:: ``sysbuild.cmake``
+
+      .. code-block:: cmake
+
+         # This applies the image configuration script to the default image only
+         get_property(tmp_conf_scripts TARGET ${DEFAULT_IMAGE} PROPERTY IMAGE_CONF_SCRIPT)
+         list(APPEND tmp_conf_scripts "${CMAKE_SOURCE_DIR}/image_configurations/MY_CUSTOM_TYPE_image_default.cmake")
+         set_target_properties(${DEFAULT_IMAGE} PROPERTIES IMAGE_CONF_SCRIPT "${tmp_conf_scripts}")
+
+
+   .. group-tab:: Module CMake
+
+      .. code-block:: cmake
+
+         function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
+           cmake_parse_arguments(PRE_CMAKE "" "" "IMAGES" ${ARGN})
+
+           # This applies the image configuration script to all images
+           foreach(image ${PRE_CMAKE_IMAGES})
+             get_property(tmp_conf_scripts TARGET ${image} PROPERTY IMAGE_CONF_SCRIPT)
+             list(APPEND tmp_conf_scripts "${CMAKE_SOURCE_DIR}/image_configurations/MY_CUSTOM_TYPE_image_default.cmake")
+             set_target_properties(${image} PROPERTIES IMAGE_CONF_SCRIPT "${tmp_conf_scripts}")
+           endforeach()
+         endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
+
+Image configuration script (Zephyr-wide)
+----------------------------------------
+
+Global Zephyr provided image configuration scripts, which allow specifying the type when using
+``ExternalZephyrProject_Add()`` require changes to sysbuild code in Zephyr. This should only be
+added to when adding a new type that any project should be able to select, generally this should
+only be needed for upstream Zephyr though forked versions of Zephyr might use this to add
+additional types without restriction.
+
+Image configuration has an allow-list of names which must be set in the Zephyr file
+:zephyr_file:`share/sysbuild/cmake/modules/sysbuild_extensions.cmake` in the
+``ExternalZephyrProject_Add`` function. After adding a new type, it can be used when adding a
+sysbuild image, for example:
+
+.. tabs::
+
+   .. group-tab:: ``sysbuild_extensions.cmake``
+
+      Full file path: ``share/sysbuild/cmake/modules/sysbuild_extensions.cmake``
+
+      .. code-block:: cmake
+
+         # ...
+         # Usage:
+         #   ExternalZephyrProject_Add(APPLICATION <name>
+         #                             SOURCE_DIR <dir>
+         #                             [BOARD <board> [BOARD_REVISION <revision>]]
+         #                             [APP_TYPE <MAIN|BOOTLOADER|MY_CUSTOM_TYPE>]
+         #   )
+         # ...
+         # APP_TYPE <MAIN|BOOTLOADER|MY_CUSTOM_TYPE>: Application type.
+         #                                            MAIN indicates this application is the main application
+         #                                            and where user defined settings should be passed on as-is
+         #                                            except for multi image build flags.
+         #                                            For example, -DCONF_FILES=<files> will be passed on to the
+         #                                            MAIN_APP unmodified.
+         #                                            BOOTLOADER indicates this app is a bootloader
+         #                                            MY_CUSTOM_TYPE indicates this app is...
+         # ...
+         function(ExternalZephyrProject_Add)
+           set(app_types MAIN BOOTLOADER MY_CUSTOM_TYPE)
+         # ...
+
+   .. group-tab:: ``sysbuild.cmake``
+
+      .. code-block:: cmake
+
+         if(SB_CONFIG_OTHER_APP_IMAGE_PATH)
+           ExternalZephyrProject_Add(
+             APPLICATION ${SB_CONFIG_OTHER_APP_IMAGE_NAME}
+             SOURCE_DIR ${SB_CONFIG_OTHER_APP_IMAGE_PATH}
+             APP_TYPE MY_CUSTOM_TYPE
+           )
+         endif()
+
+
+   .. group-tab:: ``MY_CUSTOM_TYPE_image_default.cmake``
+
+      Full file path: ``share/sysbuild/image_configurations/MY_CUSTOM_TYPE_image_default.cmake``
+
+      .. code-block:: cmake
+
+         # Here, the ZCMAKE_APPLICATION variable will be replaced with the image being configured
+         set_config_bool(${ZCMAKE_APPLICATION} CONFIG_BUILD_OUTPUT_HEX y)
+
+Reading image configuration
+===========================
+
+Kconfig
+-------
+
+Kconfig values from images can be read by sysbuild **after the CMake configuration of images has
+taken place**. This can be used to check configuration or to adjust additional sysbuild tasks
+depending upon configuration. The following function can be used for this purpose:
+
+.. code-block:: cmake
+
+   sysbuild_get(<variable> IMAGE <image> [VAR <image-variable>] KCONFIG)
+
+This function can only be used when
+:ref:`sysbuild is extended by a module <sysbuild_module_integration>` or inside of a ``sysbuild/CMakeLists.txt`` file after ``find_package(Sysbuild)`` has been used. An example of outputting
+values from all images is shown:
+
+.. tabs::
+
+   .. group-tab:: Module CMake
+
+      .. code-block:: cmake
+
+         function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
+           cmake_parse_arguments(POST_CMAKE "" "" "IMAGES" ${ARGN})
+
+           foreach(image ${POST_CMAKE_IMAGES})
+             # Note that the variable to read in to must not be set before using the sysbuild_get() function
+             set(tmp_val)
+             sysbuild_get(tmp_val IMAGE ${image} VAR CONFIG_BUILD_OUTPUT_HEX KCONFIG)
+             message(STATUS "Image ${image} build hex: ${tmp_val}")
+           endforeach()
+         endfunction()
+
+   .. group-tab:: ``sysbuild/CMakeLists.txt``
+
+      .. code-block:: cmake
+
+         find_package(Sysbuild REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+         project(sysbuild LANGUAGES)
+
+         sysbuild_get(tmp_val IMAGE ${DEFAULT_IMAGE} VAR CONFIG_BUILD_OUTPUT_HEX KCONFIG)
+         message(STATUS "Image ${DEFAULT_IMAGE} build hex: ${tmp_val}")
diff --git a/doc/build/sysbuild/index.rst b/doc/build/sysbuild/index.rst
index 4d11d5a1fa33d..51675569e0853 100644
--- a/doc/build/sysbuild/index.rst
+++ b/doc/build/sysbuild/index.rst
@@ -143,6 +143,25 @@ As mentioned above, you can run sysbuild via ``west build`` or ``cmake``.
       an extra CMake argument. ``APP_DIR`` is the path to the main Zephyr
       application managed by sysbuild.
 
+      .. tip::
+
+         The environment variables, ``CMAKE_BUILD_PARALLEL_LEVEL`` and ``VERBOSE``, can be used to
+         control the build process when using sysbuild with CMake and ninja.
+
+         To set number of jobs for ninja for all sysbuild images, set the CMAKE_BUILD_PARALLEL_LEVEL
+         environment variable and invoke the build with ``cmake --build``, for example:
+
+         .. code-block:: shell
+
+            CMAKE_BUILD_PARALLEL_LEVEL=<n> cmake --build .
+
+         For verbose output of all images, use:
+
+         .. code-block:: shell
+
+            VERBOSE=1 cmake --build .
+
+
 Configuration namespacing
 *************************
 
@@ -423,8 +442,8 @@ Dedicated image build targets
 Not all build targets for images are given equivalent prefixed build targets
 when sysbuild is used, for example build targets like ``ram_report``,
 ``rom_report``, ``footprint``, ``puncover`` and ``pahole`` are not exposed.
-When using :ref:`Trusted Firmware <tfm_build_system>`, this includes build
-targets prefix with ``tfm_`` and ``bl2_``, for example: ``tfm_rom_report``
+When using :ref:`Trusted Firmware <tfm_build_system>`, the build targets prefixed
+with ``tfm_`` and ``bl2_`` are also not exposed, for example: ``tfm_rom_report``
 and ``bl2_ram_report``. To run these build targets, the build directory of the
 image can be provided to west/ninja/make along with the name of the build
 target to execute and it will run.
@@ -442,6 +461,13 @@ target to execute and it will run.
 
          west build -d build/mcuboot -t rom_report
 
+      For TF-M projects using TF-M targets, the application build directory is
+      used like so:
+
+      .. code-block:: shell
+
+         west build -d build/<app_name> -t tfm_rom_report
+
    .. group-tab:: ``ninja``
 
       Assuming that a project has been configured using ``cmake`` and built
@@ -452,6 +478,13 @@ target to execute and it will run.
 
          ninja -C mcuboot rom_report
 
+      For TF-M projects using TF-M targets, the application build directory is
+      used like so:
+
+      .. code-block:: shell
+
+         ninja -C <app_name> -t tfm_rom_report
+
    .. group-tab:: ``make``
 
       Assuming that a project has been configured using ``cmake`` and built
@@ -462,6 +495,13 @@ target to execute and it will run.
 
          make -C mcuboot rom_report
 
+      For TF-M projects using TF-M targets, the application build directory is
+      used like so:
+
+      .. code-block:: shell
+
+         make -C <app_name> -t tfm_rom_report
+
 .. _sysbuild_zephyr_application:
 
 Adding Zephyr applications to sysbuild
@@ -495,7 +535,7 @@ In sysbuild and Zephyr CMake build system a board may refer to:
 
 * A physical board with a single core SoC.
 * A specific core on a physical board with a multi-core SoC, such as
-  :ref:`nrf5340dk_nrf5340`.
+  :zephyr:board:`nrf5340dk`.
 * A specific SoC on a physical board with multiple SoCs, such as
   :ref:`nrf9160dk_nrf9160` and :ref:`nrf9160dk_nrf52840`.
 
@@ -780,6 +820,46 @@ debug the application.
 .. _MCUboot with Zephyr: https://docs.mcuboot.com/readme-zephyr
 .. _ExternalProject: https://cmake.org/cmake/help/latest/module/ExternalProject.html
 
+.. _sysbuild_var_override:
+
+Configuring sysbuild internal state
+***********************************
+
+Because sysbuild is a CMake project in it's own right, it runs and sets up itself similar to a
+Zephyr application but using it's own CMake code. This means that some features, for example
+specifying variables in an application ``CMakeLists.txt`` (such as ``BOARD_ROOT``) will not work,
+instead these must be set by using a :ref:`a module <modules_build_settings>` or by using a custom
+sysbuild project file as ``<application>/sysbuild/CMakeLists.txt``, for example:
+
+.. code-block:: cmake
+
+   # Place pre-sysbuild configuration items here
+
+   # For changing configuration that sysbuild itself uses:
+   # set(<var> <value>)
+   # list(APPEND <list> <value>)
+
+   # For changing configuration of other images:
+   # set(<image>_<var> <value> CACHE INTERNAL "<description>")
+
+   # Finds the sysbuild project and includes it with the new configuration
+   find_package(Sysbuild REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+   project(sysbuild LANGUAGES)
+
+An example of adding a ``BOARD_ROOT``:
+
+.. code-block:: cmake
+
+   list(APPEND BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../<extra-board-root>)
+
+   find_package(Sysbuild REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+   project(sysbuild LANGUAGES)
+
+This will pass the board root on to all images as part of a project, it does not need to be
+repeated in each image's ``CMakeLists.txt`` file.
+
 Extending sysbuild
 ******************
 
@@ -794,3 +874,9 @@ each image that is part of a project. Alternatively, there are
 which can be used to include CMake and Kconfig files for the overall sysbuild
 image itself, this is where e.g. a custom image for a particular board or SoC
 can be added.
+
+
+.. toctree::
+    :maxdepth: 1
+
+    images.rst
diff --git a/doc/conf.py b/doc/conf.py
index a9646be01e596..fdafbdafd9adb 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -196,6 +196,7 @@
     "current_version": version,
     "versions": (
         ("latest", "/"),
+        ("4.1.0", "/4.1.0/"),
         ("4.0.0", "/4.0.0/"),
         ("3.7.0 (LTS)", "/3.7.0/"),
     ),
@@ -325,6 +326,7 @@
 # -- Options for zephyr.domain --------------------------------------------
 
 zephyr_breathe_insert_related_samples = True
+zephyr_generate_hw_features = not tags.has("hw_features_turbo")  # pylint: disable=undefined-variable  # noqa: F821
 
 # -- Options for sphinx.ext.graphviz --------------------------------------
 
@@ -337,6 +339,9 @@
     "-Ncolor=gray60",
     "-Nfontcolor=gray25",
     "-Ecolor=gray60",
+    "-Gfontname=system-ui,-apple-system,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif",
+    "-Nfontname=system-ui,-apple-system,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif",
+    "-Efontname=SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace",
 ]
 
 # -- Options for sphinx_copybutton ----------------------------------------
diff --git a/doc/connectivity/bluetooth/api/audio/bluetooth-le-audio-arch.rst b/doc/connectivity/bluetooth/api/audio/bluetooth-le-audio-arch.rst
index f2a15814e3f35..f5da068188059 100644
--- a/doc/connectivity/bluetooth/api/audio/bluetooth-le-audio-arch.rst
+++ b/doc/connectivity/bluetooth/api/audio/bluetooth-le-audio-arch.rst
@@ -698,19 +698,19 @@ Bluetooth Audio Stack.
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
    | Module | Role                          | Version | Added in Release | Status                | Remaining                                        |
    +========+===============================+=========+==================+=======================+==================================================+
-   | VCP    | Volume Renderer               | 1.0     | 2.6              | - Feature complete    | - Sample Application                             |
+   | VCP    | Volume Renderer               | 1.0.0   | 2.6              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Volume Controller             | 1.0     | 2.6              | - Feature complete    | - Sample Application                             |
+   |        | Volume Controller             | 1.0.0   | 2.6              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | MICP   | Microphone Device             | 1.0     | 2.7              | - Feature complete    | - Sample Application                             |
+   | MICP   | Microphone Device             | 1.0.0   | 2.7              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Microphone Controller         | 1.0     | 2.7              | - Feature complete    | - Sample Application                             |
+   |        | Microphone Controller         | 1.0.0   | 2.7              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
@@ -722,19 +722,19 @@ Bluetooth Audio Stack.
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | CCP    | Call Control Server           | 1.0     | 3.0              | - Feature complete    | - API refactor (in progress)                     |
+   | CCP    | Call Control Server           | 1.0.0   | 3.0              | - Feature complete    | - API refactor (in progress)                     |
    |        |                               |         |                  | - Shell Module        | - Sample Application (in progress)               |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Call Control Client           | 1.0     | 3.0              | - Feature complete    | - API refactor (in progress)                     |
+   |        | Call Control Client           | 1.0.0   | 3.0              | - Feature complete    | - API refactor (in progress)                     |
    |        |                               |         |                  | - Shell Module        | - Sample Application (in progress)               |
    |        |                               |         |                  | - BSIM test           |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | MCP    | Media Control Server          | 1.0     | 3.0              | - Feature complete    | - API refactor                                   |
+   | MCP    | Media Control Server          | 1.0.0   | 3.0              | - Feature complete    | - API refactor                                   |
    |        |                               |         |                  | - Shell Module        | - Support for multiple instances and connections |
    |        |                               |         |                  | - BSIM test           | - Sample Application                             |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Media Control Client          | 1.0     | 3.0              | - Feature complete    | - API refactor                                   |
+   |        | Media Control Client          | 1.0.0   | 3.0              | - Feature complete    | - API refactor                                   |
    |        |                               |         |                  | - Shell Module        | - Sample Application                             |
    |        |                               |         |                  | - BSIM test           |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
@@ -768,12 +768,12 @@ Bluetooth Audio Stack.
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | CAP    | Acceptor                      | 1.0     | 3.2              | - Feature complete    |                                                  |
+   | CAP    | Acceptor                      | 1.0.1   | 3.2              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Initiator                     | 1.0     | 3.3              | - Feature complete    |                                                  |
+   |        | Initiator                     | 1.0.1   | 3.3              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
@@ -783,12 +783,12 @@ Bluetooth Audio Stack.
    |        |                               |         |                  |                       | - BSIM test                                      |
    |        |                               |         |                  |                       | - Sample Application                             |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | HAP    | Hearing Aid                   | 1.0     | 3.1              | - Feature complete    |                                                  |
+   | HAP    | Hearing Aid                   | 1.0.0   | 3.1              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Hearing Aid Unicast Client    | 1.0     | 3.1              | - Feature complete    |                                                  |
+   |        | Hearing Aid Unicast Client    | 1.0.0   | 3.1              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
@@ -798,42 +798,42 @@ Bluetooth Audio Stack.
    |        |                               |         |                  |                       | - BSIM test                                      |
    |        |                               |         |                  |                       | - Sample Application                             |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | TMAP   | Call Gateway                  | 1.0     | 3.4              | - Feature complete    |                                                  |
+   | TMAP   | Call Gateway                  | 1.0.0   | 3.4              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Call Terminal                 | 1.0     | 3.4              | - Feature complete    |                                                  |
+   |        | Call Terminal                 | 1.0.0   | 3.4              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Unicast Media Sender          | 1.0     | 3.4              | - Feature complete    |                                                  |
+   |        | Unicast Media Sender          | 1.0.0   | 3.4              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Unicast Media Receiver        | 1.0     | 3.4              | - Feature complete    |                                                  |
+   |        | Unicast Media Receiver        | 1.0.0   | 3.4              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Broadcast Media Sender        | 1.0     | 3.4              | - Feature complete    |                                                  |
+   |        | Broadcast Media Sender        | 1.0.0   | 3.4              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Broadcast Media Receiver      | 1.0     | 3.4              | - Feature complete    |                                                  |
+   |        | Broadcast Media Receiver      | 1.0.0   | 3.4              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | PBP    | Public Broadcast Source       |         | 3.5              | - Feature complete    |                                                  |
+   | PBP    | Public Broadcast Source       | 1.0.0   | 3.5              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Public Broadcast Sink         |         | 3.5              | - Feature complete    |                                                  |
+   |        | Public Broadcast Sink         | 1.0.0   | 3.5              | - Feature complete    |                                                  |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  | - Sample Application  |                                                  |
@@ -843,22 +843,22 @@ Bluetooth Audio Stack.
    |        |                               |         |                  |                       | - BSIM test                                      |
    |        |                               |         |                  |                       | - Sample Application                             |
    +--------+-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   | GMAP   | Unicast Game Gateway          |         | 3.5              | - Feature complete    | - Sample Application                             |
+   | GMAP   | Unicast Game Gateway          | 1.0.0   | 3.5              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  |                       |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Unicast Game Terminal         |         | 3.5              | - Feature complete    | - Sample Application                             |
+   |        | Unicast Game Terminal         | 1.0.0   | 3.5              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  |                       |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Broadcast Game Sender         |         | 3.5              | - Feature complete    | - Sample Application                             |
+   |        | Broadcast Game Sender         | 1.0.0   | 3.5              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  |                       |                                                  |
    |        +-------------------------------+---------+------------------+-----------------------+--------------------------------------------------+
-   |        | Broadcast Game Receiver       |         | 3.5              | - Feature complete    | - Sample Application                             |
+   |        | Broadcast Game Receiver       | 1.0.0   | 3.5              | - Feature complete    | - Sample Application                             |
    |        |                               |         |                  | - Shell Module        |                                                  |
    |        |                               |         |                  | - BSIM test           |                                                  |
    |        |                               |         |                  |                       |                                                  |
diff --git a/doc/connectivity/bluetooth/api/gatt.rst b/doc/connectivity/bluetooth/api/gatt.rst
index bb4487f57dd83..58920cdcb657d 100644
--- a/doc/connectivity/bluetooth/api/gatt.rst
+++ b/doc/connectivity/bluetooth/api/gatt.rst
@@ -4,10 +4,18 @@
 Generic Attribute Profile (GATT)
 ################################
 
-GATT layer manages the service database providing APIs for service registration
-and attribute declaration.
+The GATT layer manages the service database providing APIs for service
+registration and attribute declaration.
 
-Services can be registered using :c:func:`bt_gatt_service_register` API
+The GATT Client initiates commands and requests towards the GATT Server, and can
+receive responses, indications and notifications sent by the server. It is
+enabled through the configuration option:
+:kconfig:option:`CONFIG_BT_GATT_CLIENT`
+
+The GATT Server accepts incoming commands and requests from the GATT Client, and
+sends responses, indications and notifications to the client.
+
+Services can be registered using the :c:func:`bt_gatt_service_register` API
 which takes the :c:struct:`bt_gatt_service` struct that provides the list of
 attributes the service contains. The helper macro :c:macro:`BT_GATT_SERVICE()`
 can be used to declare a service.
@@ -61,9 +69,6 @@ pass a callback to be called when it is necessary to know the exact instant when
 the data has been transmitted over the air. Indications are supported by
 :c:func:`bt_gatt_indicate` API.
 
-Client procedures can be enabled with the configuration option:
-:kconfig:option:`CONFIG_BT_GATT_CLIENT`
-
 Discover procedures can be initiated with the use of
 :c:func:`bt_gatt_discover` API which takes the
 :c:struct:`bt_gatt_discover_params` struct which describes the type of
diff --git a/doc/connectivity/bluetooth/shell/audio/cap.rst b/doc/connectivity/bluetooth/shell/audio/cap.rst
index f7b34930d6248..d1fcf583df574 100644
--- a/doc/connectivity/bluetooth/shell/audio/cap.rst
+++ b/doc/connectivity/bluetooth/shell/audio/cap.rst
@@ -40,7 +40,7 @@ Setting a new SIRK
 
 This command can modify the currently used SIRK. To get the new RSI to advertise on air,
 :code:`bt adv-data` or :code:`bt advertise` must be called again to set the new advertising data.
-If :code:`CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE` is enabled, this will also notify connected
+If :code:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE` is enabled, this will also notify connected
 clients.
 
 .. code-block:: console
diff --git a/doc/connectivity/bluetooth/shell/audio/csip.rst b/doc/connectivity/bluetooth/shell/audio/csip.rst
index 25e725fa8385d..2761346344213 100644
--- a/doc/connectivity/bluetooth/shell/audio/csip.rst
+++ b/doc/connectivity/bluetooth/shell/audio/csip.rst
@@ -144,15 +144,18 @@ Using the Set Member
 
    csip_set_member --help
    csip_set_member - Bluetooth CSIP set member shell commands
-   Subcommands:
-      register      :Initialize the service and register callbacks [size <int>]
-                     [rank <int>] [not-lockable] [sirk <data>]
-      lock          :Lock the set
-      release       :Release the set [force]
-      sirk          :Set the currently used SIRK <sirk>
-      get_sirk      :Get the currently used SIRK
-      sirk_rsp      :Set the response used in SIRK requests <accept, accept_enc,
-                     reject, oob>
+      Subcommands:
+      register           : Initialize the service and register callbacks [size
+                           <int>] [rank <int>] [not-lockable] [sirk <data>]
+      lock               : Lock the set
+      release            : Release the set [force]
+      sirk               : Set the currently used SIRK <sirk>
+      set_size_and_rank  : Set the currently used size and rank <size> <rank>
+      get_info           : Get service info
+      sirk_rsp           : Set the response used in SIRK requests <accept,
+                           accept_enc, reject, oob>
+
+
 
 Example Usage
 =============
@@ -171,7 +174,7 @@ Setting a new SIRK
 
 This command can modify the currently used SIRK. To get the new RSI to advertise on air,
 :code:`bt adv-data` or :code:`bt advertise` must be called again to set the new advertising data.
-If :code:`CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE` is enabled, this will also notify connected
+If :code:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE` is enabled, this will also notify connected
 clients.
 
 .. code-block:: console
@@ -179,14 +182,32 @@ clients.
    uart:~$ csip_set_member sirk 00112233445566778899aabbccddeeff
    SIRK updated
 
-Getting the current SIRK
+Setting a new set size and rank
+-------------------------------
+
+This command can modify the set size and rank of a service instance.
+This shall be done for all device in the set at the same time,
+and all devices shall have the same set size.
+The rank will be ignored if the set is not lockable, else the rank shall be <= the set size,
+and shall be unique for this device in the set.
+
+.. code-block:: console
+
+   uart:~$ csip_set_member set_size_and_rank 1 1
+   Set size and rank updated to 1 and 1
+
+Getting the current info
 ------------------------
 
-This command can get the currently used SIRK.
+This command can get the currently used set info.
 
 .. code-block:: console
 
-   uart:~$ csip_set_member get_sirk
-   SIRK
-   36 04 9a dc 66 3a a1 a1 |6...f:..
-   1d 9a 2f 41 01 73 3e 01 |../A.s>.
+   uart:~$ csip_set_member get_info
+   Info for 0x2003b0c8
+           SIRK
+   00000000: 20 37 0a 00 95 c4 04 20  00 00 00 00 f1 79 09 00 | 7.....  .....y..|
+           Set size: 2
+           Rank: 1
+           Lockable: true
+           Locked: false
diff --git a/doc/connectivity/networking/api/apis.rst b/doc/connectivity/networking/api/apis.rst
index 12929088ac062..05804c47333ff 100644
--- a/doc/connectivity/networking/api/apis.rst
+++ b/doc/connectivity/networking/api/apis.rst
@@ -7,6 +7,7 @@ Network APIs
    :maxdepth: 1
 
    sockets.rst
+   socket_service.rst
    ip_4_6.rst
    dns_resolve.rst
    net_mgmt.rst
diff --git a/doc/connectivity/networking/api/lwm2m.rst b/doc/connectivity/networking/api/lwm2m.rst
index cc48086613f63..35952511b4ae2 100644
--- a/doc/connectivity/networking/api/lwm2m.rst
+++ b/doc/connectivity/networking/api/lwm2m.rst
@@ -504,7 +504,7 @@ Enabling and configuring
 
 Enable data cache by selecting :kconfig:option:`CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT`.
 Application needs to allocate an array of :c:struct:`lwm2m_time_series_elem` structures and then
-enable the cache by calling :c:func:`lwm2m_engine_enable_cache` for a given resource. Each resource
+enable the cache by calling :c:func:`lwm2m_enable_cache` for a given resource. Each resource
 must be enabled separately and each resource needs their own storage.
 
 .. code-block:: c
@@ -512,7 +512,7 @@ must be enabled separately and each resource needs their own storage.
   /* Allocate data cache storage */
   static struct lwm2m_time_series_elem temperature_cache[10];
   /* Enable data cache */
-  lwm2m_engine_enable_cache(LWM2M_PATH(IPSO_OBJECT_TEMP_SENSOR_ID, 0, SENSOR_VALUE_RID),
+  lwm2m_enable_cache(LWM2M_OBJ(IPSO_OBJECT_TEMP_SENSOR_ID, 0, SENSOR_VALUE_RID),
           temperature_cache, ARRAY_SIZE(temperature_cache));
 
 LwM2M engine have room for four resources that have cache enabled. Limit can be increased by
diff --git a/doc/connectivity/networking/api/mqtt.rst b/doc/connectivity/networking/api/mqtt.rst
index b232f125333d9..9a167ffe665a4 100644
--- a/doc/connectivity/networking/api/mqtt.rst
+++ b/doc/connectivity/networking/api/mqtt.rst
@@ -18,7 +18,7 @@ For more information about the protocol itself, see http://mqtt.org/.
 Zephyr provides an MQTT client library built on top of BSD sockets API. The
 library can be enabled with :kconfig:option:`CONFIG_MQTT_LIB` Kconfig option and
 is configurable at a per-client basis, with support for MQTT versions
-3.1.0 and 3.1.1. The Zephyr MQTT implementation can be used with either plain
+3.1.0, 3.1.1 and 5.0. The Zephyr MQTT implementation can be used with either plain
 sockets communicating over TCP, or with secure sockets communicating over
 TLS. See :ref:`bsd_sockets_interface` for more information about Zephyr sockets.
 
diff --git a/doc/connectivity/networking/api/net_shell.rst b/doc/connectivity/networking/api/net_shell.rst
index 710b544eb7bda..a6ab2ccd4821b 100644
--- a/doc/connectivity/networking/api/net_shell.rst
+++ b/doc/connectivity/networking/api/net_shell.rst
@@ -26,6 +26,8 @@ The following net-shell commands are implemented:
    resolve a DNS name. Only available if :kconfig:option:`CONFIG_DNS_RESOLVER` is set."
    "net events", "Enable network event monitoring. Only available if
    :kconfig:option:`CONFIG_NET_MGMT_EVENT_MONITOR` is set."
+   "net filter", "View network packet filter rules. Only available if
+   :kconfig:option:`CONFIG_NET_PKT_FILTER` is set."
    "net gptp", "Print information about gPTP support. Only available if
    :kconfig:option:`CONFIG_NET_GPTP` is set."
    "net iface", "Print information about network interfaces."
diff --git a/doc/connectivity/networking/api/socket_service.rst b/doc/connectivity/networking/api/socket_service.rst
new file mode 100644
index 0000000000000..9ef85e3459dac
--- /dev/null
+++ b/doc/connectivity/networking/api/socket_service.rst
@@ -0,0 +1,219 @@
+.. _socket_service_interface:
+
+Socket Services
+###############
+
+.. contents::
+    :local:
+    :depth: 2
+
+Overview
+********
+
+The socket service API can be used to install a handler that is called if there
+is data received on a socket. The API helps to avoid creating a dedicated thread
+for each TCP or UDP service that the application provides. Instead one thread
+is created that serves data to multiple listening sockets which saves memory
+as only one thread needs to be created in the system in this case.
+
+See :zephyr:code-sample:`sockets-service-echo` sample application to learn how
+to create a simple BSD socket based server application using the sockets service API.
+The source code for this sample application can be found at:
+:zephyr_file:`samples/net/sockets/echo_service`.
+
+API Description
+***************
+
+Socket service API is enabled using :kconfig:option:`CONFIG_NET_SOCKETS_SERVICE`
+config option and implements the following operations:
+
+* :c:macro:`NET_SOCKET_SERVICE_SYNC_DEFINE`
+
+  Define a network socket service. This socket service is created with extern
+  scope so it can be used from multiple C source files.
+
+* :c:macro:`NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC`
+
+  Define a network socket service with static scope. This socket service can only
+  be used within one C source file.
+
+* :c:func:`net_socket_service_register`
+
+  Register pollable sockets for this service. User must create the sockets
+  before this call.
+
+* :c:func:`net_socket_service_unregister`
+
+  Remove pollable sockets for this service. User can close the sockets after
+  this call.
+
+* :c:type:`net_socket_service_handler_t`
+
+  User specified callback which is called when data is received on the
+  listening socket.
+
+Application Overview
+********************
+
+If the socket service API is enabled, an application must create the service like
+this:
+
+.. code-block:: c
+
+   #define MAX_BUF_LEN 1500
+   #define MAX_SERVICES 1
+
+   static void udp_service_handler(struct net_socket_service_event *pev)
+   {
+	struct pollfd *pfd = &pev->event;
+	int client = pfd->fd;
+	struct sockaddr_in6 addr;
+	socklen_t addrlen = sizeof(addr);
+
+	/* In this example we use one static buffer in order to avoid
+	 * having a large stack.
+	 */
+	static char buf[MAX_BUF_LEN];
+
+	len = recvfrom(client, buf, sizeof(buf), 0,
+		       (struct sockaddr *)&addr, &addrlen);
+	if (len <= 0) {
+		/* Error */
+		...
+		return;
+	}
+
+	/* Do something with the received data. The pev variable contains
+	 * user data that was stored in the socket service when it was
+	 * registered.
+	 */
+   }
+
+   NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(service_udp, udp_service_handler, MAX_SERVICES);
+
+The application needs to create the sockets, then register them to the socket
+service after which the socket service thread will start to call the callback
+for any incoming data.
+
+.. code-block:: c
+
+   /* Create one or multiple sockets */
+
+   struct pollfd sockfd_udp[1] = { 0 };
+   int sock, ret;
+
+   sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+   if (sock < 0) {
+	LOG_ERR("socket: %d", -errno);
+	return -errno;
+   }
+
+   /* Set possible socket options after creation */
+   ...
+
+   /* Then bind the socket to local address */
+   if (bind(sock, (struct sockaddr *)addr, sizeof(*addr)) < 0) {
+	LOG_ERR("bind: %d", -errno);
+	return -errno;
+   }
+
+   /* Set the polled sockets */
+   sockfd_udp[0].fd = sock;
+   sockfd_udp[0].events = POLLIN;
+
+   /* Register UDP socket to service handler */
+   ret = net_socket_service_register(&service_udp, sockfd_udp,
+				     ARRAY_SIZE(sockfd_udp), NULL);
+   if (ret < 0) {
+	LOG_ERR("Cannot register socket service handler (%d)", ret);
+	return ret;
+   }
+
+   /* Application logic happens here. When application is ready to
+    * quit, one should unregister the socket service and close the
+    * socket.
+    */
+
+   (void)net_socket_service_unregister(&service_udp);
+   close(sock);
+
+The TCP socket needs slightly different logic as we need to add any
+accepted socket to the listening socket by calling the
+:c:func:`net_socket_service_register` for the accepted socket.
+
+.. code-block:: c
+
+   struct sockaddr_in6 client_addr;
+   socklen_t client_addr_len = sizeof(client_addr);
+   struct pollfd sockfd_tcp[1] = { 0 };
+   int client;
+
+   /* TCP socket service is created similar way as the UDP one */
+   sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+   if (sock < 0) {
+	LOG_ERR("socket: %d", -errno);
+	return -errno;
+   }
+
+   if (bind(sock, (struct sockaddr *)addr, sizeof(*addr)) < 0) {
+	LOG_ERR("bind: %d", -errno);
+	return -errno;
+   }
+
+   if (listen(sock, 5) < 0) {
+	LOG_ERR("listen: %d", -errno);
+	return -errno;
+   }
+
+   while (1) {
+	client = accept(tcp_sock, (struct sockaddr *)&client_addr,
+			&client_addr_len);
+	if (client < 0) {
+		LOG_ERR("accept: %d", -errno);
+		continue;
+	}
+
+	inet_ntop(client_addr.sin6_family, &client_addr.sin6_addr,
+		  addr_str, sizeof(addr_str));
+	LOG_INF("Connection from %s (%d)", addr_str, client);
+
+	sockfd_tcp[0].fd = client;
+	sockfd_tcp[0].events = POLLIN;
+
+	/* Register all the sockets to service handler */
+	ret = net_socket_service_register(&service_tcp, sockfd_tcp,
+					  ARRAY_SIZE(sockfd_tcp), NULL);
+	if (ret < 0) {
+		LOG_ERR("Cannot register socket service handler (%d)", ret);
+		break;
+	}
+   }
+
+For any closed TCP client connection we need to remove the closed
+socket from the polled socket list.
+
+.. code-block:: c
+
+   /* If the TCP socket is closed while reading the data in the handler,
+    * mark it as non pollable.
+    */
+   if (sockfd_tcp[0].fd == client) {
+	sockfd_tcp[0].fd = -1;
+
+	/* Update the handler so that client connection is
+	 * not monitored any more.
+	 */
+	 (void)net_socket_service_register(&service_tcp, sockfd_tcp,
+					   ARRAY_SIZE(sockfd_tcp), NULL);
+	 close(client);
+
+	 LOG_INF("Connection from %s closed", addr_str);
+   }
+
+Please see a more complete example in the ``echo_service`` sample source
+code at :zephyr_file:`samples/net/sockets/echo_service/src/main.c`.
+
+API Reference
+*************
+
+.. doxygengroup:: bsd_socket_service
diff --git a/doc/connectivity/networking/api/sockets.rst b/doc/connectivity/networking/api/sockets.rst
index fa3a1bb761f45..d5f5970a1216d 100644
--- a/doc/connectivity/networking/api/sockets.rst
+++ b/doc/connectivity/networking/api/sockets.rst
@@ -23,7 +23,7 @@ compatible API implementation for Zephyr:
   names like ``close()``, which may be part of libc or other POSIX
   compatibility libraries.
   If enabled by :kconfig:option:`CONFIG_POSIX_API`, it will also
-  expose native POSIX names.
+  expose POSIX compatible APIs.
 
 BSD Sockets compatible API is enabled using :kconfig:option:`CONFIG_NET_SOCKETS`
 config option and implements the following operations: ``socket()``, ``close()``,
@@ -57,6 +57,41 @@ there is a table mapping file descriptors to internal object pointers.
 The file descriptor table is used by the BSD Sockets API even if the rest
 of the POSIX subsystem (filesystem, stdin/stdout) is not enabled.
 
+Zephyr supports multiple types of BSD sockets, the following table summarizes
+what socket types are available:
+
++--------------+-------------+------------------+---------------------------------------------------------------------------+
+| Family       | Type        | Protocol         | Description                                                               |
++==============+=============+==================+===========================================================================+
+| AF_INET |br| | SOCK_DGRAM  | IPPROTO_UDP      | Enabled if :kconfig:option:`CONFIG_NET_UDP` is set. |br|                  |
+| AF_INET6     |             |                  | Allows to send and receive UDP datagrams.                                 |
+|              |             +------------------+---------------------------------------------------------------------------+
+|              |             | IPPROTO_DTLS_1_x | Enabled if :kconfig:option:`CONFIG_NET_SOCKETS_ENABLE_DTLS` is set. |br|  |
+|              |             |                  | Allows to send and receive DTLS datagrams.                                |
+|              +-------------+------------------+---------------------------------------------------------------------------+
+|              | SOCK_STREAM | IPPROTO_TCP      | Enabled if :kconfig:option:`CONFIG_NET_TCP` is set. |br|                  |
+|              |             |                  | Allows to send and receive TCP data stream.                               |
+|              |             +------------------+---------------------------------------------------------------------------+
+|              |             | IPPROTO_TLS_1_x  | Enabled if :kconfig:option:`CONFIG_NET_SOCKETS_SOCKOPT_TLS` is set. |br|  |
+|              |             |                  | Allows to send and receive TLS data stream.                               |
+|              +-------------+------------------+---------------------------------------------------------------------------+
+|              | SOCK_RAW    | IPPROTO_IP |br|  | Enabled if :kconfig:option:`CONFIG_NET_SOCKETS_INET_RAW` is set. |br|     |
+|              |             | <proto>          | Allows to send and receive IPv4/IPv6 datagrams. |br|                      |
+|              |             |                  | Packets are filtered by L4 protocol specified.                            |
+|              |             |                  | IPPROTO_IP is a wildcard protocol to receive all IP datagrams.            |
++--------------+-------------+------------------+---------------------------------------------------------------------------+
+| AF_PACKET    | SOCK_DGRAM  | ETH_P_ALL |br|   | Enabled if :kconfig:option:`CONFIG_NET_SOCKETS_PACKET_DGRAM` is set. |br| |
+|              |             | <proto>          | Allows to send and receive packets without L2 header. |br|                |
+|              |             |                  | Packets are filtered by L3 protocol specified.                            |
+|              |             |                  | ETH_P_ALL is a wildcard protocol to receive all packets.                  |
+|              +-------------+------------------+---------------------------------------------------------------------------+
+|              | SOCK_RAW    | ETH_P_ALL        | Enabled if :kconfig:option:`CONFIG_NET_SOCKETS_PACKET` is set. |br|       |
+|              |             |                  | Allows to send and receive packets with L2 header included.               |
++--------------+-------------+------------------+---------------------------------------------------------------------------+
+| AF_CAN       | SOCK_RAW    | CAN_RAW          | Enabled if :kconfig:option:`CONFIG_NET_SOCKETS_CAN` is set. |br|          |
+|              |             |                  | Allows to send and receive CAN packets.                                   |
++--------------+-------------+------------------+---------------------------------------------------------------------------+
+
 See :zephyr:code-sample:`sockets-echo-server` and :zephyr:code-sample:`sockets-echo-client`
 sample applications to learn how to create a simple server or client BSD socket based
 application.
@@ -93,7 +128,7 @@ socket options.
 The following TLS credential types can be registered in the system:
 
 - ``TLS_CREDENTIAL_CA_CERTIFICATE``
-- ``TLS_CREDENTIAL_SERVER_CERTIFICATE``
+- ``TLS_CREDENTIAL_PUBLIC_CERTIFICATE``
 - ``TLS_CREDENTIAL_PRIVATE_KEY``
 - ``TLS_CREDENTIAL_PSK``
 - ``TLS_CREDENTIAL_PSK_ID``
diff --git a/doc/connectivity/networking/api/wifi.rst b/doc/connectivity/networking/api/wifi.rst
index 7f322bf248674..e480f25a3b87f 100644
--- a/doc/connectivity/networking/api/wifi.rst
+++ b/doc/connectivity/networking/api/wifi.rst
@@ -30,37 +30,63 @@ Wi-Fi PSA crypto supported build
 
 To enable PSA crypto API supported Wi-Fi build, the :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT` and the :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA` need to be set.
 
-Wi-Fi Enterprise test: X.509 Certificate header generation
-**********************************************************
+Wi-Fi Enterprise test: X.509 Certificate management
+***************************************************
 
-Wi-Fi enterprise security requires use of X.509 certificates, test certificates
-in PEM format are committed to the repo at :zephyr_file:`samples/net/wifi/test_certs` and the during the
+Wi-Fi enterprise security requires use of X.509 certificates, two methods of installing certificates are supported:
+
+Compile time certificates
+-------------------------
+
+Test certificates in PEM format are committed to the repo at :zephyr_file:`samples/net/wifi/test_certs` and the during the
 build process the certificates are converted to a C header file that is included by the Wi-Fi shell
 module.
 
+If you want to use your own certificates, you can replace the existing certificates with your own certificates in the same directory.
+
+.. code-block:: bash
+
+    $ export WIFI_TEST_CERTS_DIR=samples/net/wifi/test_certs/rsa3k
+    $ cp client.pem $WIFI_TEST_CERTS_DIR
+    $ cp client-key.pem $WIFI_TEST_CERTS_DIR
+    $ cp ca.pem $WIFI_TEST_CERTS_DIR
+    $ cp client2.pem $WIFI_TEST_CERTS_DIR
+    $ cp client-key2.pem $WIFI_TEST_CERTS_DIR
+    $ cp ca2.pem $WIFI_TEST_CERTS_DIR
+    $ west build -p -b <board> samples/net/wifi -S wifi-enterprise
+
+or alternatively copy ``rsa2k`` certificates by changing the ``WIFI_TEST_CERTS_DIR`` environment variable.
+
 .. code-block:: bash
 
-    $ cp client.pem samples/net/wifi/test_certs/
-    $ cp client-key.pem samples/net/wifi/test_certs/
-    $ cp ca.pem samples/net/wifi/test_certs/
-    $ cp client2.pem samples/net/wifi/test_certs/
-    $ cp client-key2.pem samples/net/wifi/test_certs/
-    $ cp ca2.pem samples/net/wifi/test_certs/
-    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise.conf
+    $ export WIFI_TEST_CERTS_DIR=samples/net/wifi/test_certs/rsa2k
+
+or you can set the :envvar:`WIFI_TEST_CERTS_DIR` environment variable to point to the directory containing your certificates.
+
+.. code-block:: bash
+
+    $ west build -p -b <board> samples/net/wifi -S wifi-enterprise -- -DWIFI_TEST_CERTS_DIR=<path_to_your_certificates>
+
+Run time certificates
+---------------------
+
+The Wi-Fi shell module uses TLS credentials subsystem to store and manage the certificates. The certificates can be added at runtime using the shell commands, see :ref:`tls_credentials_shell` for more details.
+The sample or application need to enable the :kconfig:option:`CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES` option to use this feature.
 
-For using variable size network buffer, the following overlay file can be used:
+To facilitate installation of the certificates, a helper script is provided in the ``samples/net/wifi/test_certs`` directory. The script can be used to install the certificates at runtime.
 
 .. code-block:: bash
 
-    $ west build -p -b <board> samples/net/wifi -- -DEXTRA_CONF_FILE=overlay-enterprise-variable-bufs.conf
+    $ ./scripts/utils/wifi_ent_cert_installer.py -p samples/net/wifi/test_certs/rsa2k
 
+The script will install the certificates in the ``rsa2k`` directory to the TLS credentials store in the device over UART and using TLS credentials shell commands.
 
 
 To initiate Wi-Fi connection, the following command can be used:
 
 .. code-block:: console
 
-    uart:~$ wifi connect -s <SSID> -c 149 -k 17 -w 2 -a client1 --key1-pwd whatever --key2-pwd whatever --eap-id1 id1 --eap-pwd1 pwd1
+    uart:~$ wifi connect -s <SSID> -c 149 -k 7 -w 2 -a client1 --key1-pwd whatever --key2-pwd whatever
 
 Server certificate is also provided in the same directory for testing purposes.
 Any AAA server can be used for testing purposes, for example, ``FreeRADIUS`` or ``hostapd``.
diff --git a/doc/connectivity/networking/eth_bridge_native_sim_setup.rst b/doc/connectivity/networking/eth_bridge_native_sim_setup.rst
index 69c8fa7845f7e..20554e376db37 100644
--- a/doc/connectivity/networking/eth_bridge_native_sim_setup.rst
+++ b/doc/connectivity/networking/eth_bridge_native_sim_setup.rst
@@ -58,10 +58,10 @@ Then create a sample and enable Ethernet bridging support. In this example we cr
 
    west build -p -b native_sim -d ../build/echo-server \
       samples/net/sockets/echo_server -- \
-      -DCONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD="\"gnome-terminal -- screen %s\"" \
+      -DCONFIG_UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD="\"gnome-terminal -- screen %s\"" \
       -DCONFIG_NET_ETHERNET_BRIDGE=y \
       -DCONFIG_NET_ETHERNET_BRIDGE_SHELL=y \
-      -DCONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT=2 \
+      -DCONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT=2 \
       -DCONFIG_NET_IF_MAX_IPV6_COUNT=2 \
       -DCONFIG_NET_IF_MAX_IPV4_COUNT=2
    ../build/echo-server/zephyr/zephyr.exe -attach_uart
diff --git a/doc/connectivity/networking/native_sim_setup.rst b/doc/connectivity/networking/native_sim_setup.rst
index 70f6469abcbd6..4e6257d22d42a 100644
--- a/doc/connectivity/networking/native_sim_setup.rst
+++ b/doc/connectivity/networking/native_sim_setup.rst
@@ -145,18 +145,29 @@ For TCP test, type:
 
    ./echo-client -t 127.0.0.1
 
-Setting interface name from command line
-****************************************
+Setting interface name and IPv4 parameters from command line
+************************************************************
 
 By default the Ethernet interface name used by native_sim is determined by
-:kconfig:option:`CONFIG_ETH_NATIVE_POSIX_DRV_NAME`, but is also possible
+:kconfig:option:`CONFIG_ETH_NATIVE_TAP_DRV_NAME`, but is also possible
 to set it from the command line using ``--eth-if=<interface_name>``.
+
+The same applies to the IPv4 address, gateway and netmask. They can be set
+from the command line using ``--ipv4-addr=<ip_address>``,
+``--ipv4-gw=<gateway>`` and ``--ipv4-nm=<netmask>``.
+
+Note that the configuration :kconfig:option:`CONFIG_NET_CONFIG_MY_IPV4_ADDR`
+and the command line arguments work in parallel. This means that if both are
+set, the interface might end up with two IP addresses. In most cases, it does
+make sense to only use one of both at the same time.
+
 This can be useful if the application has to be
 run in multiple instances and recompiling it for each instance would be
 troublesome.
 
 .. code-block:: console
 
-   ./zephyr.exe --eth-if=zeth2
+   ./zephyr.exe --eth-if=zeth2 --ipv4-addr=192.0.2.2 --ipv4-gw=192.0.0.1
+   --ipv4-nm=255.255.0.0
 
 .. _`net-tools`: https://github.com/zephyrproject-rtos/net-tools
diff --git a/doc/connectivity/networking/network_monitoring.rst b/doc/connectivity/networking/network_monitoring.rst
index 6a41dafea401c..a389f6215068f 100644
--- a/doc/connectivity/networking/network_monitoring.rst
+++ b/doc/connectivity/networking/network_monitoring.rst
@@ -117,7 +117,7 @@ In terminal #3, type:
    :zephyr-app: samples/net/capture
    :host-os: unix
    :board: native_sim
-   :gen-args: -DCONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD=\""gnome-terminal -- screen %s"\"
+   :gen-args: -DCONFIG_UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD=\""gnome-terminal -- screen %s"\"
    :goals: build
    :compact:
 
diff --git a/doc/connectivity/networking/networking_with_multiple_instances.rst b/doc/connectivity/networking/networking_with_multiple_instances.rst
index 225d50ebb39fc..064ed4b730f38 100644
--- a/doc/connectivity/networking/networking_with_multiple_instances.rst
+++ b/doc/connectivity/networking/networking_with_multiple_instances.rst
@@ -153,9 +153,9 @@ or if you want to use native_sim board, type this:
       -DCONFIG_NET_CONFIG_MY_IPV6_ADDR=\"2001:db8:100::1\" \
       -DCONFIG_NET_CONFIG_PEER_IPV6_ADDR=\"2001:db8:200::1\" \
       -DCONFIG_NET_CONFIG_MY_IPV4_GW=\"203.0.113.1\" \
-      -DCONFIG_ETH_NATIVE_POSIX_DRV_NAME=\"zeth.1\" \
-      -DCONFIG_ETH_NATIVE_POSIX_MAC_ADDR=\"00:00:5e:00:53:01\" \
-      -DCONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n
+      -DCONFIG_ETH_NATIVE_TAP_DRV_NAME=\"zeth.1\" \
+      -DCONFIG_ETH_NATIVE_TAP_MAC_ADDR=\"00:00:5e:00:53:01\" \
+      -DCONFIG_ETH_NATIVE_TAP_RANDOM_MAC=n
 
 
 In terminal #5, if you are using QEMU, type this:
@@ -184,9 +184,9 @@ or if you want to use native_sim board, type this:
       -DCONFIG_NET_CONFIG_MY_IPV6_ADDR=\"2001:db8:200::1\" \
       -DCONFIG_NET_CONFIG_PEER_IPV6_ADDR=\"2001:db8:100::1\" \
       -DCONFIG_NET_CONFIG_MY_IPV4_GW=\"198.51.100.1\" \
-      -DCONFIG_ETH_NATIVE_POSIX_DRV_NAME=\"zeth.2\" \
-      -DCONFIG_ETH_NATIVE_POSIX_MAC_ADDR=\"00:00:5e:00:53:02\" \
-      -DCONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=n
+      -DCONFIG_ETH_NATIVE_TAP_DRV_NAME=\"zeth.2\" \
+      -DCONFIG_ETH_NATIVE_TAP_MAC_ADDR=\"00:00:5e:00:53:02\" \
+      -DCONFIG_ETH_NATIVE_TAP_RANDOM_MAC=n
 
 
 Also if you have firewall enabled in your host, you need to allow traffic
diff --git a/doc/contribute/documentation/generation.rst b/doc/contribute/documentation/generation.rst
index 7c88ccd1beb29..cad9201b113c6 100644
--- a/doc/contribute/documentation/generation.rst
+++ b/doc/contribute/documentation/generation.rst
@@ -253,11 +253,19 @@ To enable this mode, set the following option when invoking cmake::
 
    -DDT_TURBO_MODE=1
 
-or invoke make with the following target::
+Another step that typically takes a long time is the generation of the list of
+supported features for each board. This can be disabled by setting the following
+option when invoking cmake::
+
+   -DHW_FEATURES_TURBO_MODE=1
+
+Invoking :command:`make` with the following target will build the documentation
+without either of the aforementioned features::
 
    cd ~/zephyrproject/zephyr/doc
 
-   # To generate HTML output without detailed Kconfig
+   # To generate HTML output without detailed Devicetree bindings documentation
+   # and supported features index
    make html-fast
 
 Viewing generated documentation locally
diff --git a/doc/contribute/documentation/guidelines.rst b/doc/contribute/documentation/guidelines.rst
index 8cba07080cc03..2dbb46e141fd9 100644
--- a/doc/contribute/documentation/guidelines.rst
+++ b/doc/contribute/documentation/guidelines.rst
@@ -942,7 +942,26 @@ very file can be done using the :rst:role:`zephyr_file` role.
 
       Check out :zephyr_file:`doc/contribute/documentation/guidelines.rst` for more information.
 
-You may use the :rst:role:`zephyr_raw` role instead if you want to reference the "raw" content.
+   You can reference specific lines or line ranges in a file by appending :samp:`#L{line_number}` or
+   :samp:`#L{start_line}-L{end_line}` to the file path::
+
+      See :zephyr_file:`doc/contribute/documentation/guidelines.rst#L3` for the main heading of
+      this document.
+
+   Will render as:
+
+      See :zephyr_file:`doc/contribute/documentation/guidelines.rst#L3` for the main heading of
+      this document.
+
+   The role automatically verifies that the referenced file exists in the Zephyr tree and will
+   generate a warning during documentation build if the file is not found.
+
+   .. note::
+
+      Use the line references sparingly as keeping them accurate over time can be challenging as the
+      content of the linked file is subject to change.
+
+   You may use the :rst:role:`zephyr_raw` role instead if you want to reference the "raw" content.
 
 .. rst:role:: zephyr_raw
 
@@ -964,6 +983,7 @@ You may use the :rst:role:`zephyr_raw` role instead if you want to reference the
 
          Check out :module_file:`hal_stm32:CMakeLists.txt` for more information.
 
+   Similar to :rst:role:`zephyr_file`, you can reference specific lines or line ranges in a file.
 
 Cross-referencing GitHub issues and pull requests
 =================================================
@@ -1231,6 +1251,35 @@ Boards
    This directive is used to generate a catalog of Zephyr-supported boards that can be used to
    quickly browse the list of all supported boards and filter them according to various criteria.
 
+.. rst:directive:: .. zephyr:board-supported-hw::
+
+   This directive is used to show supported hardware features for all the targets of the board
+   documented in the current page. The tables are automatically generated based on the board's
+   Devicetree.
+
+   The directive must be used in a document that also contains a :rst:dir:`zephyr:board` directive,
+   as it relies on the board information to generate the table.
+
+   .. note::
+
+      This directive requires that the documentation is built with hardware features generation enabled
+      (``zephyr_generate_hw_features`` config option set to ``True``). If disabled, a warning message
+      will be shown instead of the hardware features tables.
+
+.. rst:directive:: .. zephyr:board-supported-runners::
+
+   This directive is used to show the supported runners for the board documented in the current
+   page, including which runner is the default for flashing and debugging.
+
+   The directive must be used in a document that also contains a :rst:dir:`zephyr:board` directive,
+   as it relies on the board information to generate the table.
+
+   .. note::
+
+      Similar to :rst:dir:`zephyr:board-supported-hw`, this directive requires hardware features
+      generation to be enabled (``zephyr_generate_hw_features`` config option set to ``True``) to
+      produce a complete table. If disabled, a warning message will be shown instead of the runners
+      tables.
 
 References
 **********
diff --git a/doc/contribute/guidelines.rst b/doc/contribute/guidelines.rst
index eac7185850592..e02db855e5d15 100644
--- a/doc/contribute/guidelines.rst
+++ b/doc/contribute/guidelines.rst
@@ -104,9 +104,14 @@ this contributing and review process for imported components.
 Copyrights Notices
 *******************
 
-Please follow this `Community Best Practice`_ for Copyright Notices from the
-Linux Foundation.
+The Zephyr Project follows the `Community Best Practice`_ for Copyright Notices from the Linux
+Foundation.
 
+We recommend using the following copyright notice:
+
+.. code-block:: C
+
+    Copyright The Zephyr Project Contributors
 
 .. _Community Best Practice:
    https://www.linuxfoundation.org/blog/copyright-notices-in-open-source-software-projects/
@@ -561,12 +566,19 @@ before opening a new Pull Request:
 
    ./scripts/ci/check_compliance.py -c upstream/main..
 
+.. note::
+   On Windows if the .pl extension has not yet been associated with an
+   application, then the first time a .pl file is run without specifying an
+   interpreter, Windows will ask what application will open Perl files.
+   Set the default app to Strawberry Perl. By default the executable is
+   installed at ``C:\Strawberry\perl\bin\perl.exe``.
+
 twister
 -------
 
 .. note::
    twister is only fully supported on Linux; on Windows and MacOS the execution
-   of tests is not supported, only building.
+   of tests is not supported on all target devices.
 
 If you think your change may break some test, you can submit your PR as a draft
 and let the project CI automatically run the :ref:`twister_script` for you.
@@ -737,13 +749,6 @@ workflow here:
    review.  Email will be sent as review comments are made, or you can check
    on your pull request at https://github.com/zephyrproject-rtos/zephyr/pulls.
 
-   .. note:: As more commits are merged upstream, the GitHub PR page will show
-      a ``This branch is out-of-date with the base branch`` message and a
-      ``Update branch`` button on the PR page. That message should be ignored,
-      as the commits will be rebased as part of merging anyway, and triggering
-      a branch update from the GitHub UI will cause the PR approvals to be
-      dropped.
-
 #. While you're waiting for your pull request to be accepted and merged, you
    can create another branch to work on another issue. (Be sure to make your
    new branch off of ``main`` and not the previous branch.)::
diff --git a/doc/contribute/style/devicetree.rst b/doc/contribute/style/devicetree.rst
index 36746770754fa..9578a750f7a02 100644
--- a/doc/contribute/style/devicetree.rst
+++ b/doc/contribute/style/devicetree.rst
@@ -5,6 +5,12 @@ Devicetree Style Guidelines
 
   * Indent with tabs.
   * Follow the Devicetree specification conventions and rules.
+  * If the Linux kernel rules in
+    `Devicetree Sources (DTS) Coding Style <https://docs.kernel.org/devicetree/bindings/dts-coding-style.html>`_
+    make a recommendation, it's the preferred style in Zephyr too.
+  * You can split related groups of properties into "paragraphs" by
+    separating them with one empty line (two newline characters) if it aids
+    readability.
   * Use dashes (``-``) as word separators for node and property names.
   * Use underscores (``_``) as word separators in node labels.
   * Leave a single space on each side of the equal sign (``=``) in property
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index f89d45b11b214..7dc4539677ea1 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -1197,6 +1197,11 @@ boilerplate with ``find_package(Zephyr ...)``.
    When using ``-DBOARD_ROOT=<board-root>`` both absolute and relative paths can
    be used. Relative paths are treated relatively to the application directory.
 
+.. note::
+
+   When using sysbuild, then ``BOARD_ROOT`` must defined in a module or in the sysbuild
+   ``CMakeLists.txt`` file, see :ref:`sysbuild_var_override` for details.
+
 SOC Definitions
 ===============
 
diff --git a/doc/develop/beyond-GSG.rst b/doc/develop/beyond-GSG.rst
index ab0a1aba84fef..fe7e646e9e858 100644
--- a/doc/develop/beyond-GSG.rst
+++ b/doc/develop/beyond-GSG.rst
@@ -136,6 +136,8 @@ Keeping Zephyr updated
 To update the Zephyr project source code, you need to get the latest
 changes via ``git``. Afterwards, run ``west update`` as mentioned in
 the previous paragraph.
+Additionally, in the case of updated or added Python dependencies, running
+``west packages pip --install`` will make sure these are up-to-date.
 
 .. code-block:: console
 
@@ -143,6 +145,7 @@ the previous paragraph.
    cd zephyrproject/zephyr
    git pull
    west update
+   west packages pip --install
 
 Export Zephyr CMake package
 ***************************
diff --git a/doc/develop/flash_debug/host-tools.rst b/doc/develop/flash_debug/host-tools.rst
index e0788734091ff..dfe0462694638 100644
--- a/doc/develop/flash_debug/host-tools.rst
+++ b/doc/develop/flash_debug/host-tools.rst
@@ -13,6 +13,7 @@ file declares that support properly. See :ref:`west-build-flash-debug` for
 more information on these commands.
 
 .. _atmel_sam_ba_bootloader:
+.. _runner_bossac:
 
 SAM Boot Assistant (SAM-BA)
 ***************************
@@ -185,8 +186,8 @@ As a quick reference, see these three board documentation pages:
 
   - :zephyr:board:`sam4e_xpro` (ROM bootloader)
   - :zephyr:board:`adafruit_feather_m0_basic_proto` (Adafruit UF2 bootloader)
-  - :ref:`arduino_nano_33_iot` (Arduino bootloader)
-  - :ref:`arduino_nano_33_ble` (Arduino legacy bootloader)
+  - :zephyr:board:`arduino_nano_33_iot` (Arduino bootloader)
+  - :zephyr:board:`arduino_nano_33_ble` (Arduino legacy bootloader)
 
 Enabling BOSSAC on Windows Native [Experimental]
 ------------------------------------------------
@@ -207,6 +208,7 @@ Windows PATH. A specific bossac executable can be used by passing the
 
 
 .. _linkserver-debug-host-tools:
+.. _runner_linkserver:
 
 LinkServer Debug  Host Tools
 ****************************
@@ -282,6 +284,7 @@ LinkServer west runner   ``--probe`` option to pass the probe index.
    will need to add a breakpoint at ``main`` or the reset handler manually.
 
 .. _jlink-debug-host-tools:
+.. _runner_jlink:
 
 J-Link Debug Host Tools
 ***********************
@@ -312,6 +315,7 @@ required.
 Note that the J-Link GDB server does not yet support Zephyr RTOS-awareness.
 
 .. _openocd-debug-host-tools:
+.. _runner_openocd:
 
 OpenOCD Debug Host Tools
 ************************
@@ -339,6 +343,7 @@ Check if your SoC is listed in `OpenOCD Supported Devices`_.
    - Add ``C:\Program Files\OpenOCD\bin`` to 'PATH' environment variable
 
 .. _pyocd-debug-host-tools:
+.. _runner_pyocd:
 
 pyOCD Debug Host Tools
 **********************
@@ -358,6 +363,7 @@ These debug host tools are compatible with the following debug probes:
 Check if your SoC is listed in `pyOCD Supported Devices`_.
 
 .. _lauterbach-trace32-debug-host-tools:
+.. _runner_trace32:
 
 Lauterbach TRACE32 Debug Host Tools
 ***********************************
@@ -409,6 +415,7 @@ To enable Zephyr RTOS awareness follow the steps described in
 `Lauterbach TRACE32 Zephyr OS Awareness Manual`_.
 
 .. _nxp-s32-debug-host-tools:
+.. _runner_nxp_s32dbg:
 
 NXP S32 Debug Probe Host Tools
 ******************************
@@ -471,6 +478,8 @@ afterwards detach the debug session:
 
    west debug --tool-opt='--batch'
 
+.. _runner_probe_rs:
+
 probe-rs Debug Host Tools
 *************************
 
@@ -482,7 +491,29 @@ Check `probe-rs Installation`_ for more setup details.
 
 Check if your SoC is listed in `probe-rs Supported Devices`_.
 
+.. _runner_rfp:
+
+Renesas Flash Programmer (RFP) Host Tools
+*****************************************
+
+Renesas provides `Renesas Flash Programmer`_ as an official programming tool for Renesas boards
+using the Renesas standard boot firmware. It is available as a GUI and CLI.
+
+For boards configured with the ``rfp`` west runner, the RFP CLI can be easily used to flash Zephyr.
+
+Supported west commands:
+
+1. flash
+
+Once downloaded, if ``rfp-cli`` is not placed somewhere in your system PATH, you can pass the location
+to ``rfp-cli`` when flashing:
+
+.. code-block:: console
+
+   west flash --rfp-cli ~/Downloads/RFP_CLI_Linux_V31800_x64/linux-x64/rfp-cli
+
 .. _stm32cubeprog-flash-host-tools:
+.. _runner_stm32cubeprogrammer:
 
 STM32CubeProgrammer Flash Host Tools
 ************************************
@@ -572,6 +603,9 @@ For advanced usage via the GUI or CLI, check out the `STM32CubeProgrammer User M
 .. _NXP S32 Design Studio for S32 Platform:
    https://www.nxp.com/design/software/development-software/s32-design-studio-ide/s32-design-studio-for-s32-platform:S32DS-S32PLATFORM
 
+.. _Renesas Flash Programmer:
+   https://www.renesas.com/en/software-tool/renesas-flash-programmer-programming-gui
+
 .. _S32 Design Studio for S32 Platform Installation User Guide:
    https://www.nxp.com/webapp/Download?colCode=S32DSIG
 
diff --git a/doc/develop/flash_debug/nordic_segger.rst b/doc/develop/flash_debug/nordic_segger.rst
index 083601f91aa8b..13fe81f6a01b4 100644
--- a/doc/develop/flash_debug/nordic_segger.rst
+++ b/doc/develop/flash_debug/nordic_segger.rst
@@ -109,13 +109,13 @@ temporarily disable ModemManager by running these commands:
    systemctl stop ModemManager.service
    systemctl disable ModemManager.service
 
-You can also `blacklist Segger devices by editing udev rules`_ so ModemManager
+You can also `blocklist Segger devices by editing udev rules`_ so ModemManager
 ignores them, by running:
 
 .. code-block:: bash
 
    sudo sh -c 'echo "ATTRS{idVendor}==\"1366\", ENV{ID_MM_DEVICE_IGNORE}=\"1\" " \
-     >> /etc/udev/rules.d/99-segger-modemmanager-blacklist.rules'
+     >> /etc/udev/rules.d/99-segger-modemmanager-blocklist.rules'
    sudo service udev restart
 
 A fix for this is expected in ModemManager 1.8 and new firmware for the Segger IMCUs.
@@ -245,6 +245,6 @@ References
 .. _Segger Ozone Download: https://www.segger.com/downloads/jlink#Ozone
 
 .. _ModemManager send AT commands to TTY-like devices: https://bugs.freedesktop.org/show_bug.cgi?id=85007
-.. _blacklist Segger devices by editing udev rules: http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools#Device_or_resource_busy_dev_ttyA
+.. _blocklist Segger devices by editing udev rules: http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools#Device_or_resource_busy_dev_ttyA
 
 .. _J-Link Software and documentation pack: https://www.segger.com/jlink-software.html
diff --git a/doc/develop/getting_started/index.rst b/doc/develop/getting_started/index.rst
index f2bee3943cd93..78f43e70b5fd3 100644
--- a/doc/develop/getting_started/index.rst
+++ b/doc/develop/getting_started/index.rst
@@ -160,48 +160,42 @@ The current minimum required version for the main dependencies are:
 
          Therefore, we don't recommend using WSL when getting started.
 
-      These instructions must be run in a ``cmd.exe`` command prompt terminal window.
       In modern version of Windows (10 and later) it is recommended to install the Windows Terminal
-      application from the Microsoft Store. The required commands differ on PowerShell.
+      application from the Microsoft Store. Instructions are provided for a ``cmd.exe`` or
+      PowerShell command prompts.
 
-      These instructions rely on `Chocolatey`_. If Chocolatey isn't an option,
-      you can install dependencies from their respective websites and ensure
-      the command line tools are on your :envvar:`PATH` :ref:`environment
-      variable <env_vars>`.
+      These instructions rely on Windows' official package manager, `winget`_.
+      If using winget isn't an option, you can install dependencies from their
+      respective websites and ensure the command line tools are on your
+      :envvar:`PATH` :ref:`environment variable <env_vars>`.
 
       |p|
 
       .. _install_dependencies_windows:
 
-      #. `Install chocolatey`_.
+      #. In modern Windows versions, winget is already pre-installed by default.
+         You can verify that this is the case by typing ``winget`` in a terminal
+         window. If that fails, you can then `install winget`_.
 
-      #. Open a ``cmd.exe`` terminal window as **Administrator**. To do so, press the Windows key,
-         type ``cmd.exe``, right-click the :guilabel:`Command Prompt` search result, and choose
-         :guilabel:`Run as Administrator`.
+      #. Open a Command Prompt (``cmd.exe``) or PowerShell terminal window.
+         To do so, press the Windows key, type ``cmd.exe`` or PowerShell and
+         click on the result.
 
-      #. Disable global confirmation to avoid having to confirm the
-         installation of individual programs:
+      #. Use ``winget`` to install the required dependencies:
 
          .. code-block:: bat
 
-            choco feature enable -n allowGlobalConfirmation
+            winget install Kitware.CMake Ninja-build.Ninja oss-winget.gperf python Git.Git oss-winget.dtc wget 7zip.7zip
 
-      #. Use ``choco`` to install the required dependencies:
-
-         .. code-block:: bat
-
-            choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
-            choco install ninja gperf python311 git dtc-msys2 wget 7zip
+      #. Close the terminal window.
 
-         .. warning::
+      .. note::
 
-            As of November 2024, Python 3.13 is not recommended for Zephyr development on Windows,
-            as some required Python dependencies may be difficult to install.
+         You may need to add the 7zip installation folder to your ``PATH``.
 
-      #. Close the terminal window.
 
-.. _Chocolatey: https://chocolatey.org/
-.. _Install chocolatey: https://chocolatey.org/install
+.. _winget: https://learn.microsoft.com/en-us/windows/package-manager/
+.. _install winget: https://aka.ms/getwinget
 
 .. _get_the_code:
 .. _clone-zephyr:
@@ -333,20 +327,33 @@ chosen. You'll also install Zephyr's additional Python dependencies in a
 
    .. group-tab:: Windows
 
-      #. Open a ``cmd.exe`` terminal window **as a regular user**
+      #. Open a ``cmd.exe`` or PowerShell terminal window **as a regular user**
 
       #. Create a new virtual environment:
 
-         .. code-block:: bat
+         .. tabs::
+
+            .. code-tab:: bat
+
+               cd %HOMEPATH%
+               python -m venv zephyrproject\.venv
 
-            cd %HOMEPATH%
-            python -m venv zephyrproject\.venv
+            .. code-tab:: powershell
+
+               cd $Env:HOMEPATH
+               python -m venv zephyrproject\.venv
 
       #. Activate the virtual environment:
 
-         .. code-block:: bat
+         .. tabs::
+
+            .. code-tab:: bat
 
-            zephyrproject\.venv\Scripts\activate.bat
+               zephyrproject\.venv\Scripts\activate.bat
+
+            .. code-tab:: powershell
+
+               zephyrproject\.venv\Scripts\Activate.ps1
 
          Once activated your shell will be prefixed with ``(.venv)``. The
          virtual environment can be deactivated at any time by running
@@ -434,10 +441,17 @@ that are used to emulate, flash and debug Zephyr applications.
 
       Install the Zephyr SDK using the ``west sdk install``.
 
-         .. code-block:: bat
+         .. tabs::
 
-            cd %HOMEPATH%\zephyrproject\zephyr
-            west sdk install
+            .. code-tab:: bat
+
+               cd %HOMEPATH%\zephyrproject\zephyr
+               west sdk install
+
+            .. code-tab:: powershell
+
+               cd $Env:HOMEPATH\zephyrproject\zephyr
+               west sdk install
 
       .. tip::
 
@@ -485,10 +499,17 @@ Build the :zephyr:code-sample:`blinky` with :ref:`west build <west-building>`, c
 
    .. group-tab:: Windows
 
-      .. code-block:: bat
+      .. tabs::
+
+         .. code-tab:: bat
+
+            cd %HOMEPATH%\zephyrproject\zephyr
+            west build -p always -b <your-board-name> samples\basic\blinky
+
+         .. code-tab:: powershell
 
-         cd %HOMEPATH%\zephyrproject\zephyr
-         west build -p always -b <your-board-name> samples\basic\blinky
+            cd $Env:HOMEPATH\zephyrproject\zephyr
+            west build -p always -b <your-board-name> samples\basic\blinky
 
 The ``-p always`` option forces a pristine build, and is recommended for new
 users. Users may also use the ``-p auto`` option, which will use
@@ -502,7 +523,7 @@ another sample.
    When building for such boards it is necessary to specify the SoC or CPU
    cluster for which the sample must be built.
    For example to build :zephyr:code-sample:`blinky` for the ``cpuapp`` core on
-   the :ref:`nRF5340DK <nrf5340dk_nrf5340>` the board must be provided as:
+   the :zephyr:board:`nrf5340dk` the board must be provided as:
    ``nrf5340dk/nrf5340/cpuapp``. See also :ref:`board_terminology` for more
    details.
 
diff --git a/doc/develop/languages/index.rst b/doc/develop/languages/index.rst
index 033b9084ac4fc..b1b54355f1a4f 100644
--- a/doc/develop/languages/index.rst
+++ b/doc/develop/languages/index.rst
@@ -8,3 +8,4 @@ Language Support
 
    c/index.rst
    cpp/index.rst
+   rust/index.rst
diff --git a/doc/develop/languages/rust/index.rst b/doc/develop/languages/rust/index.rst
new file mode 100644
index 0000000000000..8363fc7797df7
--- /dev/null
+++ b/doc/develop/languages/rust/index.rst
@@ -0,0 +1,100 @@
+.. _language_rust:
+
+Rust Language Support
+#####################
+
+Rust is a modern systems programming language designed to provide memory safety, concurrency, and
+performance without sacrificing low-level control. It achieves this through a unique ownership model
+that eliminates common bugs like null pointer dereferencing and data races at compile time.
+
+Rust's emphasis on safety and correctness makes it particularly well-suited for embedded systems and
+environments where reliability is critical.
+Additionally, Rust offers powerful abstractions without a runtime or garbage collector, allowing
+developers to write both high-level code and low-level hardware interactions with confidence and
+efficiency.
+
+These attributes make Rust a strong choice for projects on Zephyr, where resource constraints and
+system stability are paramount.
+
+Enabling Rust Support
+*********************
+
+In order to enable Rust support in a Zephyr application, a few things need to be done:
+
+1.  As Rust is currently an optional module, the module needs to be enabled.  The easiest way to do
+    this is with west:
+
+    .. code-block:: shell
+
+       west config manifest.project-filter +zephyr-lang-rust
+       west update
+
+    This should cause the Rust language support to be placed in :samp:`modules/lang/rust` in your
+    Zephyr workspace.
+
+2.  Enable Rust support, via :kconfig:option:`CONFIG_RUST` in the :file:`prj.conf`. The easiest way
+    to do this (as well as the CMake setup from the next step) is to start with one of the samples
+    in :module_file:`modules/lang/rust/samples <zephyr-lang-rust:samples>`.
+
+3.  Configure the application's :file:`CMakeLists.txt` file to support Rust.  Again this is easiest
+    to copy from a sample, but this will look something like:
+
+    .. code-block:: cmake
+
+       cmake_minimum_required(VERSION 3.20.0)
+
+       find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+       project(my_app)
+       rust_cargo_application()
+
+4.  Create a :file:`Cargo.toml` that describes how to build the Rust application. From the Hello
+    World sample:
+
+    .. code-block:: toml
+
+       [package]
+       # This must be rustapp for now.
+       name = "rustapp"
+       version = "0.1.0"
+       edition = "2021"
+       description = "The description of my app"
+       license = "Apache-2.0 or MIT"
+
+       [lib]
+       crate-type = ["staticlib"]
+
+       [dependencies]
+       zephyr = "0.1.0"
+       log = "0.4.22"
+
+    The only required dependency is ``zephyr`` which provides the zephyr crate that is used to
+    interface with Zephyr.
+
+5.  Build as you would any other Zephyr application.  Only a few targets currently support Rust
+    (these can be seen in the
+    :module_file:`modules/lang/rust/etc/platforms.txt <zephyr-lang-rust:etc/platforms.txt>` file).
+
+API Documentation
+*****************
+
+The `API Documentation`_ for the latest version in the module is kept on gh-pages.
+
+.. _`API Documentation`:
+   https://zephyrproject-rtos.github.io/zephyr-lang-rust/nostd/zephyr/index.html
+
+This documentation is generated for a general target, with all features enabled.  Once you have an
+application that is buildable, you can generate documentation specifically for your target:
+
+.. code-block:: shell
+
+   west build -t rustdoc
+
+   ...
+
+   Generated /my/path/app/zephyr/build/doc/rust/target/riscv32i-unknown-none-elf/doc/rustapp/index.html
+
+The path printed at the end can be opened in a browser.  This top level docs will be for your
+application itself.  Look for the 'zephyr' crate on the left side bar, and this will take you to the
+docs for Zephyr.  This page will also generate local docs for any dependencies used by your
+application, directly or indirectly.
diff --git a/doc/develop/optimizations/footprint.rst b/doc/develop/optimizations/footprint.rst
index b826bc26fbe3a..fbe416157af0f 100644
--- a/doc/develop/optimizations/footprint.rst
+++ b/doc/develop/optimizations/footprint.rst
@@ -40,14 +40,16 @@ peripherals in your project configuration, for example::
 Various Debug/Informational Options
 ***********************************
 
-The following options are enabled by default to provide more information about
-the running application and to provide means for debugging and error handling:
+The following options output more information about
+the running application and provide means for debugging and error handling:
 
 :kconfig:option:`CONFIG_BOOT_BANNER`
   This option can be disabled to save a few bytes.
 
 :kconfig:option:`CONFIG_DEBUG`
-  This option can be disabled for production builds
+  This option can be enabled for debug builds.
+
+Note that the boot banner is enabled by default.
 
 
 MPU/MMU Support
diff --git a/doc/develop/sca/gcc.rst b/doc/develop/sca/gcc.rst
index 4ae852c81ad85..1123772b722d6 100644
--- a/doc/develop/sca/gcc.rst
+++ b/doc/develop/sca/gcc.rst
@@ -13,6 +13,58 @@ Run GCC static analysis
 To run GCC static analysis, :ref:`west build <west-building>` should be
 called with a ``-DZEPHYR_SCA_VARIANT=gcc`` parameter, e.g.
 
-.. code-block:: shell
+.. zephyr-app-commands::
+   :zephyr-app: samples/userspace/hello_world_user
+   :board: qemu_x86
+   :gen-args: -DZEPHYR_SCA_VARIANT=gcc
+   :goals: build
+   :compact:
 
-    west build -b qemu_x86 samples/userspace/hello_world_user -- -DZEPHYR_SCA_VARIANT=gcc
+Configuring GCC static analyzer
+*******************************
+
+GCC static analyzer can be controlled using specific options.
+
+* `Options controlling the
+  analyzer <https://gcc.gnu.org/onlinedocs/gcc/Static-Analyzer-Options.html>`__
+* `Options controlling the diagnostic message
+  formatting <https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Message-Formatting-Options.html>`__
+
+.. list-table::
+   :header-rows: 1
+
+   * - Parameter
+     - Description
+   * - ``GCC_SCA_OPTS``
+     - A semicolon separated list of GCC analyzer options.
+
+These parameters can be passed on the command line, or be set as environment variables.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: stm32h573i_dk
+   :gen-args: -DZEPHYR_SCA_VARIANT=gcc -DGCC_SCA_OPTS="-fdiagnostics-format=json;-fanalyzer-verbosity=3"
+   :goals: build
+   :compact:
+
+.. note::
+
+   GCC static analyzer is under active development, and each new release comes with new options.
+   This `page <https://gcc.gnu.org/wiki/StaticAnalyzer>`__ gives an overview of options and fix
+   introduced with each new release of the analyzer.
+
+
+Latest version of the analyzer
+******************************
+
+Since the Zephyr toolchain may not include the most recent version of the GCC static analyzer,
+the GCC static analysis can be run with a more recent `GNU Arm embedded toolchain
+<https://docs.zephyrproject.org/latest/develop/toolchains/gnu_arm_embedded.html>`__
+to take advantage of the latest analyzer version.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: stm32h573i_dk
+   :gen-args: -DZEPHYR_SCA_VARIANT=gcc -DZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb -DGNUARMEMB_TOOLCHAIN_PATH=...
+   :goals: build
+   :compact:
diff --git a/doc/develop/test/twister.rst b/doc/develop/test/twister.rst
index d9ac4646f7bea..948a487439ae4 100644
--- a/doc/develop/test/twister.rst
+++ b/doc/develop/test/twister.rst
@@ -734,6 +734,11 @@ required_snippets: <list of needed snippets>
               - cdc-acm-console
               - user-snippet-example
 
+expect_reboot: <True|False> (default False)
+    Notify twister that the test scenario is expected to reboot while executing.
+    When enabled, twister will suppress warnings about unexpected multiple runs
+    of a testsuite or testcase.
+
 The set of test scenarios that actually run depends on directives in the test scenario
 filed and options passed in on the command line. If there is any confusion,
 running with ``-v`` or examining the discard report
@@ -993,13 +998,30 @@ framework and the pytest harness of twister.
 
 The following options apply to the shell harness:
 
-shell_params_file: <string> (default empty)
+shell_commands: <list of pairs of commands and their expected output> (default empty)
+    Specify a list of shell commands to be executed and their expected output.
+    For example:
+
+    .. code-block:: yaml
+
+        harness_config:
+          shell_commands:
+          - command: "kernel cycles"
+            expected: "cycles: .* hw cycles"
+          - command: "kernel version"
+            expected: "Zephyr version .*"
+          - command: "kernel sleep 100"
+
+
+    If expected output is not provided, the command will be executed and the output
+    will be logged.
+
+shell_commands_file: <string> (default empty)
     Specify a file containing test parameters to be used in the test.
     The file should contain a list of commands and their expected output. For example:
 
-    .. code-block:: none
+    .. code-block:: yaml
 
-      test_shell_harness:
       - command: "mpu mtest 1"
         expected: "The value is: 0x.*"
       - command: "mpu mtest 2"
@@ -1007,7 +1029,8 @@ shell_params_file: <string> (default empty)
 
 
     If no file is specified, the shell harness will use the default file
-      ``test_shell.yml`` in the test directory.
+    ``test_shell.yml`` in the test directory.
+    ``shell_commands`` will take precedence over ``shell_commands_file``.
 
 Selecting platform scope
 ************************
@@ -1473,10 +1496,11 @@ The current status of tests on the quarantine list can also be verified by addin
 ``--quarantine-verify`` to the above argument. This will make twister skip all tests
 which are not on the given list.
 
-A quarantine yaml has to be a sequence of dictionaries. Each dictionary has to have
-``scenarios`` and ``platforms`` entries listing combinations of scenarios and platforms
-to put under quarantine. In addition, an optional entry ``comment`` can be used, where
-some more details can be given (e.g. link to a reported issue). These comments will also
+A quarantine yaml is a sequence of dictionaries. Each dictionary must have
+at least one of the following keys: ``scenarios``, ``platforms``, ``architectures``
+or ``simulations``. A combination of these entries is allowed.
+An optional ``comment`` entry can be used to provide more details
+(e.g., a link to a reported issue). These comments will also
 be added to the output reports.
 
 When quarantining a class of tests or many scenarios in a single testsuite or
@@ -1500,15 +1524,15 @@ An example of entries in a quarantine yaml:
         - .*_cortex_.*
         - native_sim
 
-To exclude a platform, use the following syntax:
-
-.. code-block:: yaml
-
     - platforms:
-      - qemu_x86
-      comment: "broken qemu"
+        - qemu_x86
+      comment: "filter out qemu_x86"
+
+    - architectures:
+        - riscv
 
-Additionally you can quarantine entire architectures or a specific simulator for executing tests.
+    - simulations:
+        - armfvp
 
 Test Configuration
 ******************
diff --git a/doc/develop/toolchains/iar_arm_toolchain.rst b/doc/develop/toolchains/iar_arm_toolchain.rst
new file mode 100644
index 0000000000000..33f5e3795af00
--- /dev/null
+++ b/doc/develop/toolchains/iar_arm_toolchain.rst
@@ -0,0 +1,62 @@
+.. _toolchain_iar_arm:
+
+IAR Arm Toolchain
+#################
+
+#. Download and install a release of  `IAR Arm Toolchain`_ (EWARM/CXARM) on your host.
+
+.. note::
+   As of now, a Development version of the IAR build tools for Arm is required to work with Zephyr.
+   It is distributed to selected partners and customers for evaluation. If you are interested in being
+   part of this program, please send a request to the IAR FAE team at fae.emea@iar.com.
+
+#. Make sure you have :ref:`Zephyr SDK <toolchain_zephyr_sdk>` installed on your host.
+
+.. note::
+   A Zephyr SDK is used as a source of tools like device tree compiler (DTC), QEMU, etc… Even though
+   IAR Arm toolchain is used for Zephyr RTOS build, still the GNU preprocessor & GNU objcopy might
+   be used for some steps like device tree preprocessing and .bin file generation.
+
+#. :ref:`Set these environment variables <env_vars>`:
+
+   - Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``iar``.
+   - Set :envvar:`IAR_TOOLCHAIN_PATH` to the toolchain installation directory.
+
+#. The IAR Toolchain needs the :envvar:`IAR_LMS_BEARER_TOKEN` environment
+   variable to be set to a valid ``license bearer token``.
+
+For example:
+
+   .. code-block:: bash
+
+      # Linux (default installation path):
+      export IAR_TOOLCHAIN_PATH=/opt/iarsystems/bxarm/arm
+      export ZEPHYR_TOOLCHAIN_VARIANT=iar
+      export IAR_LMS_BEARER_TOKEN="<BEARER-TOKEN>"
+
+   .. code-block:: batch
+
+      # Windows:
+      set IAR_TOOLCHAIN_PATH=c:\<path>\arm
+      set ZEPHYR_TOOLCHAIN_VARIANT=iar
+      set IAR_LMS_BEARER_TOKEN="<BEARER-TOKEN>"
+
+.. note::
+
+   The IAR Toolchain uses ``ilink`` for linking. This is incompatible with Zephyr’s
+   linker script template, which works with GNU ld. Zephyr’s IAR Arm Toolchain depends on
+   Zephyr’s CMake linker script generator, which supports generating icf-files.
+   Basic icf-file support is in place, but there are still areas which are not fully
+   supported by the CMake linker script generator.
+
+.. note::
+
+   The IAR Toolchain uses the GNU Assembler which is distributed with the Zephyr SDK
+   for ``.S-files``.
+
+.. note::
+
+   Some Zephyr subsystems or modules may also contain C or assembly code that relies
+   on GNU intrinsics and have not yet been updated to work fully with ``iar``.
+
+.. _IAR Arm Toolchain: https://www.iar.com/products/architectures/arm/
diff --git a/doc/develop/toolchains/index.rst b/doc/develop/toolchains/index.rst
index 7f1f605e6e368..e085a1fbe1c3c 100644
--- a/doc/develop/toolchains/index.rst
+++ b/doc/develop/toolchains/index.rst
@@ -14,6 +14,7 @@ Guides on how to set up toolchains for Zephyr development.
    cadence_xcc.rst
    designware_arc_mwdt.rst
    gnu_arm_embedded.rst
+   iar_arm_toolchain.rst
    intel_oneapi_toolkit.rst
 
    host.rst
diff --git a/doc/develop/tools/img/stm32cube_import_project.webp b/doc/develop/tools/img/stm32cube_import_project.webp
new file mode 100644
index 0000000000000..81bbc632cab45
Binary files /dev/null and b/doc/develop/tools/img/stm32cube_import_project.webp differ
diff --git a/doc/develop/tools/img/stm32cube_menu_import.webp b/doc/develop/tools/img/stm32cube_menu_import.webp
new file mode 100644
index 0000000000000..dc70bd89ecfd2
Binary files /dev/null and b/doc/develop/tools/img/stm32cube_menu_import.webp differ
diff --git a/doc/develop/tools/stm32cubeide.rst b/doc/develop/tools/stm32cubeide.rst
index 73e160ee1ebe6..2b1eae3a01c2f 100644
--- a/doc/develop/tools/stm32cubeide.rst
+++ b/doc/develop/tools/stm32cubeide.rst
@@ -87,6 +87,33 @@ Project Setup
    The project can be run using the :guilabel:`Run` button, as well as debugged
    using the :guilabel:`Debug` button.
 
+Debugging only
+**************
+
+If you only want to use STM32CubeIDE to debug your project you can proceed as follows:
+
+#. First, make sure to compile your project and have the ``zephyr.elf`` available.
+
+#. Run STM32CubeIDE and import your project by going to :menuselection:`File --> Import...`:
+
+   .. figure:: img/stm32cube_menu_import.webp
+      :align: center
+      :alt: Import project
+
+#. Select :menuselection:`C/C++ --> STM32 Cortex-M Executable`, then click :guilabel:`Next`:
+
+   .. figure:: img/stm32cube_import_project.webp
+      :align: center
+      :alt: Import project selection
+
+#. Click on :guilabel:`Browse` to browse to your build folder and select your ``zephyr.elf``.
+
+#. Click on :guilabel:`Select` to select your MCU. If relevant, choose also your CPU and/or core.
+
+#. Click on :guilabel:`Finish`.
+
+#. The project can now be debugged using the :guilabel:`Debug` button.
+
 Troubleshooting
 ***************
 
diff --git a/doc/develop/west/zephyr-cmds.rst b/doc/develop/west/zephyr-cmds.rst
index 0c665c7f64a09..b4ef9532cff6a 100644
--- a/doc/develop/west/zephyr-cmds.rst
+++ b/doc/develop/west/zephyr-cmds.rst
@@ -219,3 +219,52 @@ You can list all known standard descriptor names using::
 You can print the offset of the descriptors inside the image using::
 
    west bindesc get_offset
+
+Indexing the sources with GNU Global: ``west gtags``
+****************************************************
+
+.. important:: You must install the ``gtags`` and ``global`` programs provided
+               by `GNU Global`_ to use this command.
+
+The ``west gtags`` command lets you create a GNU Global tags file for the entire
+west workspace::
+
+  west gtags
+
+.. _GNU Global: https://www.gnu.org/software/global/
+
+This will create a tags file named ``GTAGS`` in the workspace :ref:`topdir
+<west-workspace>` (it will also create other Global-related metadata files
+named ``GPATH`` and ``GRTAGS`` in the same place).
+
+You can then run the ``global`` command anywhere inside the
+workspace to search for symbol locations using this tags file.
+
+For example, to search for definitions of the ``arch_system_halt()`` function,
+starting from the ``zephyr/drivers`` directory::
+
+  $ cd zephyr/drivers
+  $ global -x arch_system_halt
+  arch_system_halt   65 ../arch/arc/core/fatal.c FUNC_NORETURN void arch_system_halt(unsigned int reason)
+  arch_system_halt  455 ../arch/arm64/core/fatal.c FUNC_NORETURN void arch_system_halt(unsigned int reason)
+  arch_system_halt  137 ../arch/nios2/core/fatal.c FUNC_NORETURN void arch_system_halt(unsigned int reason)
+  arch_system_halt   18 ../arch/posix/core/fatal.c FUNC_NORETURN void arch_system_halt(unsigned int reason)
+  arch_system_halt   17 ../arch/x86/core/fatal.c FUNC_NORETURN void arch_system_halt(unsigned int reason)
+  arch_system_halt  126 ../arch/xtensa/core/fatal.c FUNC_NORETURN void arch_system_halt(unsigned int reason)
+  arch_system_halt   21 ../kernel/fatal.c FUNC_NORETURN __weak void arch_system_halt(unsigned int reason)
+
+This prints the search symbol, the line it is defined on, a relative path to
+the file it is defined in, and the line itself, for all places where the symbol
+is defined.
+
+Additional tips:
+
+- This can also be useful to search for vendor HAL function definitions.
+
+- See the ``global`` command's manual page for more information on how to use
+  this tool.
+
+- You should run ``global``, **not** ``west global``. There is no need for a
+  separate ``west global`` command since ``global`` already searches for the
+  ``GTAGS`` file starting from your current working directory. This is why you
+  need to run ``global`` from inside the workspace.
diff --git a/doc/hardware/arch/arm_cortex_m.rst b/doc/hardware/arch/arm_cortex_m.rst
index 7eef8e7f2f5d1..4bfb05d8026ee 100644
--- a/doc/hardware/arch/arm_cortex_m.rst
+++ b/doc/hardware/arch/arm_cortex_m.rst
@@ -55,6 +55,8 @@ Arm Cortex-M implementation variants.
 +---------------------------------+-----------------------------------+-----------------+---------+--------+-----------+--------+---------+------------+------------+
 |                                 | HW-assisted stack limit checking  |        N        |   N     |   N    |    N      |    N   |Y [#f2]_ |     Y      |   Y        |
 +---------------------------------+-----------------------------------+-----------------+---------+--------+-----------+--------+---------+------------+------------+
+|                                 | Privileged Execute Never          |        N        |   N     |   N    |    N      |    N   |    N    |     N      |   Y [#f3]_ |
++---------------------------------+-----------------------------------+-----------------+---------+--------+-----------+--------+---------+------------+------------+
 | HW-assisted null-pointer        |                                   |                 |         |        |           |        |         |            |            |
 | dereference detection           |                                   |        N        |   N     |   Y    |    Y      |    Y   |    Y    |     Y      |   Y        |
 +---------------------------------+-----------------------------------+-----------------+---------+--------+-----------+--------+---------+------------+------------+
@@ -86,6 +88,7 @@ Notes
 
 .. [#f1] SysTick is optional in Cortex-M1
 .. [#f2] Stack limit checking only in Secure builds in Cortex-M23
+.. [#f3] https://developer.arm.com/documentation/107655/100/RTOS-and-Secure-software-design-considerations/Secure-software-development-design-considerations/Security-and-privilege-combination/Using-PXN-bit?lang=en
 
 OS features
 ***********
diff --git a/doc/hardware/peripherals/can/controller.rst b/doc/hardware/peripherals/can/controller.rst
index e87102013498b..99cda14a36196 100644
--- a/doc/hardware/peripherals/can/controller.rst
+++ b/doc/hardware/peripherals/can/controller.rst
@@ -70,7 +70,7 @@ in case, abort their transmission.
 This effectively gives lower number identifiers priority over higher number
 identifiers.
 
-Filters are used to whitelist identifiers that are of interest for the specific
+Filters are used to allowlist identifiers that are of interest for the specific
 node. An identifier that doesn't match any filter is ignored.
 Filters can either match exactly or a specified part of the identifier.
 This method is called masking.
diff --git a/doc/hardware/peripherals/i3c.rst b/doc/hardware/peripherals/i3c.rst
index 476c23fcdaa23..c2882efc82525 100644
--- a/doc/hardware/peripherals/i3c.rst
+++ b/doc/hardware/peripherals/i3c.rst
@@ -347,7 +347,6 @@ Configuration Options
 Related configuration options:
 
 * :kconfig:option:`CONFIG_I3C`
-* :kconfig:option:`CONFIG_I3C_USE_GROUP_ADDR`
 * :kconfig:option:`CONFIG_I3C_USE_IBI`
 * :kconfig:option:`CONFIG_I3C_IBI_MAX_PAYLOAD_SIZE`
 * :kconfig:option:`CONFIG_I3C_CONTROLLER_INIT_PRIORITY`
diff --git a/doc/hardware/peripherals/index.rst b/doc/hardware/peripherals/index.rst
index 2a7405aced2ba..acb12942c236d 100644
--- a/doc/hardware/peripherals/index.rst
+++ b/doc/hardware/peripherals/index.rst
@@ -38,7 +38,6 @@ Peripherals
    i3c.rst
    i2c.rst
    ipm.rst
-   kscan.rst
    led.rst
    mdio.rst
    mipi_dbi.rst
diff --git a/doc/hardware/peripherals/kscan.rst b/doc/hardware/peripherals/kscan.rst
deleted file mode 100644
index 1ac9e808f99a2..0000000000000
--- a/doc/hardware/peripherals/kscan.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. _kscan_api:
-
-
-Keyboard Scan
-#############
-
-.. note:: Kscan APIs are deprecated, any driver and applications should be
-   ported over to use :ref:`input` instead.
-
-Overview
-********
-
-The kscan driver (keyboard scan matrix) is used for detecting a key press in a
-connected matrix keyboard or any device with buttons such as joysticks.
-Typically, matrix keyboards are implemented using a two-dimensional
-configuration in order to sense several keys.  This allows interfacing to
-many keys through fewer physical pins. Keyboard matrix
-drivers read the rows while applying power through the columns one at a time
-with the purpose of detecting key events.
-There is no correlation between the physical and electrical layout of keys.
-For, example, the physical layout may be one array of 16 or fewer keys, which
-may be electrically connected to a 4 x 4 array. In addition, key values are
-defined by a keymap provided by the keyboard manufacturer.
-
-Configuration Options
-*********************
-
-Related configuration options:
-
-* :kconfig:option:`CONFIG_KSCAN`
-
-API Reference
-*************
-
-.. doxygengroup:: kscan_interface
diff --git a/doc/hardware/peripherals/sensor/triggers.rst b/doc/hardware/peripherals/sensor/triggers.rst
index 6dd7870103225..c4a5c9536a2cc 100644
--- a/doc/hardware/peripherals/sensor/triggers.rst
+++ b/doc/hardware/peripherals/sensor/triggers.rst
@@ -5,7 +5,7 @@ Sensor Triggers
 
 :dfn:`Triggers`, enumerated in :c:enum:`sensor_trigger_type`, are sensor
 generated events. Typically sensors allow setting up these events to cause
-digital line signaling for easy capture by a micro controller. The events can
+digital line signaling for easy capture by a microcontroller. The events can
 then commonly be inspected by reading registers to determine which event caused
 the digital line signaling to occur.
 
diff --git a/doc/hardware/peripherals/stepper.rst b/doc/hardware/peripherals/stepper.rst
index 0754b35b5cc86..16d103421dd96 100644
--- a/doc/hardware/peripherals/stepper.rst
+++ b/doc/hardware/peripherals/stepper.rst
@@ -14,6 +14,7 @@ Configure Stepper Driver
   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
 ===============
@@ -47,6 +48,45 @@ is open to all.
 
 .. _stepper-api-reference:
 
+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.
+
+.. zephyr-app-commands::
+   :zephyr-app: tests/drivers/stepper/stepper_api
+   :board: <board>
+   :west-args: --extra-dtc-overlay <path/to/board.overlay>
+   :goals: build flash
+
+Sample Output
+=============
+
+Below is a snippet of the test output for the tmc50xx stepper driver. Since
+:c:func:`stepper_set_microstep_interval` is not implemented by the driver the corresponding tests
+have been skipped.
+
+.. code-block:: console
+
+   ===================================================================
+   TESTSUITE stepper succeeded
+
+   ------ TESTSUITE SUMMARY START ------
+
+   SUITE PASS - 100.00% [stepper]: pass = 4, fail = 0, skip = 2, total = 6 duration = 0.069 seconds
+    - PASS - [stepper.test_actual_position] duration = 0.016 seconds
+    - PASS - [stepper.test_get_micro_step_res] duration = 0.013 seconds
+    - SKIP - [stepper.test_set_micro_step_interval_invalid_zero] duration = 0.007 seconds
+    - PASS - [stepper.test_set_micro_step_res_incorrect] duration = 0.010 seconds
+    - PASS - [stepper.test_stop] duration = 0.016 seconds
+    - SKIP - [stepper.test_target_position_w_fixed_step_interval] duration = 0.007 seconds
+
+   ------ TESTSUITE SUMMARY END ------
+
+   ===================================================================
+   PROJECT EXECUTION SUCCESSFUL
+
 API Reference
 *************
 
diff --git a/doc/hardware/porting/arch.rst b/doc/hardware/porting/arch.rst
index 339b6642a2573..7c3e4ff9975dc 100644
--- a/doc/hardware/porting/arch.rst
+++ b/doc/hardware/porting/arch.rst
@@ -83,7 +83,7 @@ Some examples of architecture-specific steps that have to be taken:
   in an unknown or broken state.
 * Initialize a board-specific watchdog on Cortex-M3/4.
 * Switch stacks from MSP to PSP on Cortex-M.
-* Use a different approach than calling into _Swap() on Cortex-M to prevent
+* Use a different approach than calling into z_swap() on Cortex-M to prevent
   race conditions.
 * Setup FIRQ and regular IRQ handling on ARCv2.
 
@@ -149,8 +149,8 @@ parameter.
   parameter from the separate table. This approach is commonly used in the ARC
   and ARM architectures via the :kconfig:option:`CONFIG_GEN_ISR_TABLES` implementation.
   You can find examples of the stubs by looking at :code:`_interrupt_enter()` in
-  x86, :code:`_IntExit()` in ARM, :code:`_isr_wrapper()` in ARM, or the full
-  implementation description for ARC in :zephyr_file:`arch/arc/core/isr_wrapper.S`.
+  x86, :code:`_isr_wrapper()` in ARM, or the full implementation description for
+  ARC in :zephyr_file:`arch/arc/core/isr_wrapper.S`.
 
 Each architecture also has to implement primitives for interrupt control:
 
@@ -176,15 +176,16 @@ Thread Context Switching
 ************************
 
 Multi-threading is the basic purpose to have a kernel at all. Zephyr supports
-two types of threads: preemptible and cooperative.
+two types of threads: preemptible and cooperative. The rules for determining
+the next thread to schedule are handled by the kernel. However, it is up to
+the architecture port to implement the method of the context switch itself.
 
-Two crucial concepts when writing an architecture port are the following:
-
-* Cooperative threads run at a higher priority than preemptible ones, and
-  always preempt them.
-
-* After handling an interrupt, if a cooperative thread was interrupted, the
-  kernel always goes back to running that thread, since it is not preemptible.
+Zephyr provides two mutually exclusive interfaces for context switching. The
+preferred interface to use is :code:`arch_switch` which is selected when
+:kconfig:option:`CONFIG_USE_SWITCH` is enabled. The alternative interface is
+:code:`arch_swap`--selected when :kconfig:option:`CONFIG_USE_SWITCH`
+is disabled. When porting to a new architecture, only one of these needs to
+implemented; however, for SMP platforms it must be :code:`arch_switch`.
 
 A context switch can happen in several circumstances:
 
@@ -204,9 +205,6 @@ A context switch can happen in several circumstances:
 
 Therefore, the context switching must thus be able to handle all these cases.
 
-The kernel keeps the next thread to run in a "cache", and thus the context
-switching code only has to fetch from that cache to select which thread to run.
-
 There are two types of context switches: :dfn:`cooperative` and :dfn:`preemptive`.
 
 * A *cooperative* context switch happens when a thread willfully gives the
@@ -228,58 +226,47 @@ There are two types of context switches: :dfn:`cooperative` and :dfn:`preemptive
   running thread.
 
 A cooperative context switch is always done by having a thread call the
-:code:`_Swap()` kernel internal symbol. When :code:`_Swap` is called, the
-kernel logic knows that a context switch has to happen: :code:`_Swap` does not
-check to see if a context switch must happen. Rather, :code:`_Swap` decides
-what thread to context switch in. :code:`_Swap` is called by the kernel logic
-when an object being operated on is unavailable, and some thread
-yielding/sleeping primitives.
+internal kernel routine :code:`z_swap` (or one of its variants). This in turn
+will call either :code:`arch_switch` or :code:`arch_swap` as appropriate.
+When these are called, no checks are done to determine if the context switch is
+to happen--the context switch must happen.
 
 .. note::
 
-  On x86 and Nios2, :code:`_Swap` is generic enough and the architecture
-  flexible enough that :code:`_Swap` can be called when exiting an interrupt
-  to provoke the context switch. This should not be taken as a rule, since
-  neither the ARM Cortex-M or ARCv2 port do this.
+  On x86 and Nios2, :code:`arch_swap` is generic enough and the architecture
+  flexible enough that it can be called when exiting an interrupt to provoke
+  the context switch. This should not be taken as a rule, since
+  neither the ARM Cortex-M nor ARCv2 port do this.
 
-Since :code:`_Swap` is cooperative, the caller-saved registers from the ABI are
+Since :code:`z_swap` is cooperative, the caller-saved registers from the ABI are
 already on the stack. There is no need to save them in the k_thread structure.
 
 A context switch can also be performed preemptively. This happens upon exiting
 an ISR, in the kernel interrupt exit stub:
 
 * :code:`_interrupt_enter` on x86 after the handler is called.
-* :code:`_IntExit` on ARM.
+* :code:`z_arm_exc_exit` and :code:`z_arm_int_exit` on ARM.
 * :code:`_firq_exit` and :code:`_rirq_exit` on ARCv2.
 
-In this case, the context switch must only be invoked when the interrupted
-thread was preemptible, not when it was a cooperative one, and only when the
-current interrupt is not nested.
+The decision logic to invoke the context switch is simple and is only performed
+when exiting a non-nested interrupt:
+
+When :kconfig:option:`CONFIG_USE_SWITCH` is enabled ...
 
-The kernel also has the concept of "locking the scheduler". This is a concept
-similar to locking the interrupts, but lighter-weight since interrupts can
-still occur. If a thread has locked the scheduler, is it temporarily
-non-preemptible.
+* The interrupt exit code shall call :c:func:`z_get_next_switch_handle`, and
+  return to the thread context identified by the returned switch handle
 
-So, the decision logic to invoke the context switch when exiting an interrupt
-is simple:
+When :kconfig:option:`CONFIG_USE_SWITCH` is not enabled ...
 
-* If the interrupted thread is not preemptible, do not invoke it.
-* Else, fetch the cached thread from the ready queue, and:
+* The interrupt exit code shall fetch the cached thread from the ready queue, and:
 
   * If the cached thread is not the current thread, invoke the context switch.
-  * Else, do not invoke it.
+  * Otherwise do not invoke it.
 
 This is simple, but crucial: if this is not implemented correctly, the kernel
 will not function as intended and will experience bizarre crashes, mostly due
 to stack corruption.
 
-.. note::
-
-  If running a coop-only system, i.e. if :kconfig:option:`CONFIG_NUM_PREEMPT_PRIORITIES`
-  is 0, no preemptive context switch ever happens. The interrupt code can be
-  optimized to not take any scheduling decision when this is the case.
-
 Thread Creation and Termination
 *******************************
 
diff --git a/doc/hardware/porting/board_porting.rst b/doc/hardware/porting/board_porting.rst
index 8140c7a367b2a..37ec26f172a9c 100644
--- a/doc/hardware/porting/board_porting.rst
+++ b/doc/hardware/porting/board_porting.rst
@@ -93,13 +93,13 @@ the :term:`SoC series` and :term:`SoC family` levels are not always used.
    +--------------------------------------------+--------------------------+-------------+--------------------+--------------------+----------------+----------------------+
    | :term:`board name`                         | :term:`board qualifiers` | :term:`SoC` | :term:`SoC Series` | :term:`SoC family` | CPU core       | :term:`architecture` |
    +============================================+==========================+=============+====================+====================+================+======================+
-   | :ref:`nrf52dk <nrf52dk_nrf52832>`          | nrf52832                 | nRF52832    | nRF52              | Nordic nRF         | Arm Cortex-M4  | ARMv7-M              |
+   | :zephyr:board:`nrf52dk`                    | nrf52832                 | nRF52832    | nRF52              | Nordic nRF         | Arm Cortex-M4  | ARMv7-M              |
    +--------------------------------------------+--------------------------+-------------+--------------------+--------------------+----------------+----------------------+
    | :zephyr:board:`frdm_k64f <frdm_k64f>`      | mk64f12                  | MK64F12     | Kinetis K6x        | NXP Kinetis        | Arm Cortex-M4  | ARMv7-M              |
    +--------------------------------------------+--------------------------+-------------+--------------------+--------------------+----------------+----------------------+
    | :zephyr:board:`rv32m1_vega <rv32m1_vega>`  | openisa_rv32m1/ri5cy     | RV32M1      | (Not used)         | (Not used)         | RI5CY          | RISC-V RV32          |
    +--------------------------------------------+--------------------------+-------------+--------------------+--------------------+----------------+----------------------+
-   | :ref:`nrf5340dk <nrf5340dk_nrf5340>`       | nrf5340/cpuapp           | nRF5340     | nRF53              | Nordic nRF         | Arm Cortex-M33 | ARMv8-M              |
+   | :zephyr:board:`nrf5340dk`                  | nrf5340/cpuapp           | nRF5340     | nRF53              | Nordic nRF         | Arm Cortex-M33 | ARMv8-M              |
    |                                            +--------------------------+-------------+--------------------+--------------------+----------------+----------------------+
    |                                            | nrf5340/cpunet           | nRF5340     | nRF53              | Nordic nRF         | Arm Cortex-M33 | ARMv8-M              |
    +--------------------------------------------+--------------------------+-------------+--------------------+--------------------+----------------+----------------------+
@@ -168,7 +168,7 @@ The board qualifiers ``nrf5340/cpuapp/ns`` can be read as:
   Zephyr denoting a non-secure build for boards supporting :ref:`tfm`.
 
 Not all SoCs define CPU clusters or variants. For example a simple board
-like the :ref:`thingy52_nrf52832` contains a single SoC with no CPU clusters and
+like the :zephyr:board:`thingy52` contains a single SoC with no CPU clusters and
 no variants.
 For ``thingy52`` the board target ``thingy52/nrf52832`` can be read as:
 
@@ -651,7 +651,7 @@ while porting.
   using the ``zephyr,console`` chosen node in the devicetree.
   Development boards with a built-in debug adapter or USB-to-UART adapter should
   by default configure and use the UART controller connected to that adapter.
-  For boards like :ref:`nRF52840 Dongle <nrf52840dongle_nrf52840>`, that do not
+  For boards like :zephyr:board:`nrf52840dongle`, that do not
   have a debug adapter, but a USB device controller, there is a common
   :zephyr_file:`Kconfig file <boards/common/usb/Kconfig.cdc_acm_serial.defconfig>`
   that must be included in the board's Kconfig.defconfig file and
@@ -696,11 +696,13 @@ example :file:`board.cmake`:
    board_runner_args(jlink "--device=nrf52" "--speed=4000")
    board_runner_args(pyocd "--target=nrf52" "--frequency=4000000")
 
+   include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
    include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
    include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
    include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 
-This example configures the ``nrfjprog``, ``jlink``, and ``pyocd`` runners.
+This example configures the ``nrfutil``, ``nrfjprog``, ``jlink``, and ``pyocd``
+runners.
 
 .. warning::
 
diff --git a/doc/kernel/code-relocation.rst b/doc/kernel/code-relocation.rst
index aea6e11793d4b..c3b8aced76ecc 100644
--- a/doc/kernel/code-relocation.rst
+++ b/doc/kernel/code-relocation.rst
@@ -14,15 +14,23 @@ This script provides a robust way to re-order the memory contents without
 actually having to modify the code.  In simple terms this script will do the job
 of ``__attribute__((section("name")))`` for a bunch of files together.
 
+A regular expression filter can be used to select only the required sections to be relocated.
+
 Details
 *******
-The memory region and file are given to the :ref:`gen_relocate_app.py` script in the form of a string.
+The memory region and file are given to the :ref:`gen_relocate_app.py` script
+through a file where each line specifies a list of files to be placed in the
+given region.
+
+An example of such a file is:
+
+  .. code-block:: none
 
-An example of such a string is:
-``SRAM2:/home/xyz/zephyr/samples/hello_world/src/main.c,SRAM1:/home/xyz/zephyr/samples/hello_world/src/main2.c``
+     SRAM2:/home/xyz/zephyr/samples/hello_world/src/main.c,
+     SRAM1:/home/xyz/zephyr/samples/hello_world/src/main2.c,
 
 This script is invoked with the following parameters:
-``python3 gen_relocate_app.py -i input_string -o generated_linker -c generated_code``
+``python3 gen_relocate_app.py -i input_file -o generated_linker -c generated_code``
 
 Kconfig :kconfig:option:`CONFIG_CODE_DATA_RELOCATION` option,  when enabled in
 ``prj.conf``, will invoke the script and do the required relocation.
@@ -97,6 +105,24 @@ This section shows additional configuration options that can be set in
      zephyr_code_relocate(FILES ${sources} LOCATION SRAM)
      zephyr_code_relocate(FILES $<TARGET_PROPERTY:my_tgt,SOURCES> LOCATION SRAM)
 
+Section Filtering
+=================
+
+By default, all sections of the specified files will be relocated. If
+``FILTER`` is used, a regular expression is provided to select only
+the sections to be relocated.
+
+The regular expression applies to sections names which can be used to
+select the file's symbols when this one has been built with
+``-ffunction-sections`` and ``-fdata-sections`` which is the case by
+default.
+
+  .. code-block:: none
+
+     zephyr_code_relocate(FILES src/file1.c FILTER ".*\\.func1|.*\\.func2" LOCATION SRAM2_TEXT)
+
+The example above will only relocate ``func1()`` and ``func2()`` of file ``src/file1.c``
+
 NOKEEP flag
 ===========
 
diff --git a/doc/kernel/drivers/index.rst b/doc/kernel/drivers/index.rst
index 07069942557cf..762ddb94b28a9 100644
--- a/doc/kernel/drivers/index.rst
+++ b/doc/kernel/drivers/index.rst
@@ -366,7 +366,7 @@ initialization levels:
 
 Within each initialization level you may specify a priority level, relative to
 other devices in the same initialization level. The priority level is specified
-as an integer value in the range 0 to 99; lower values indicate earlier
+as an integer value in the range 0 to 999; lower values indicate earlier
 initialization.  The priority level must be a decimal integer literal without
 leading zeroes or sign (e.g. 32), or an equivalent symbolic name (e.g.
 ``\#define MY_INIT_PRIO 32``); symbolic expressions are *not* permitted (e.g.
diff --git a/doc/kernel/services/interrupts.rst b/doc/kernel/services/interrupts.rst
index 044e9ddea1fef..f598d4ba838ef 100644
--- a/doc/kernel/services/interrupts.rst
+++ b/doc/kernel/services/interrupts.rst
@@ -325,9 +325,10 @@ for some low-latency use-cases. Specifically:
   potentially make a scheduling decision.
 
 Zephyr supports so-called 'direct' interrupts, which are installed via
-:c:macro:`IRQ_DIRECT_CONNECT`. These direct interrupts have some special
-implementation requirements and a reduced feature set; see the definition
-of :c:macro:`IRQ_DIRECT_CONNECT` for details.
+:c:macro:`IRQ_DIRECT_CONNECT` and whose handlers are declared using
+:c:macro:`ISR_DIRECT_DECLARE`. These direct interrupts have some special
+implementation requirements and a reduced feature set; see the definitions
+of :c:macro:`IRQ_DIRECT_CONNECT` and :c:macro:`ISR_DIRECT_DECLARE` for details.
 
 The following code demonstrates a direct ISR:
 
diff --git a/doc/kernel/services/other/fatal.rst b/doc/kernel/services/other/fatal.rst
index f46fdaef1e696..c2b006ba37725 100644
--- a/doc/kernel/services/other/fatal.rst
+++ b/doc/kernel/services/other/fatal.rst
@@ -120,8 +120,8 @@ discouraged.
 Build Assertions
 ================
 
-Zephyr provides two macros for performing build-time assertion checks.
-These are evaluated completely at compile-time, and are always checked.
+Zephyr provides a macro for performing build-time assertion checks.
+It is evaluated completely at compile-time and always checked.
 
 BUILD_ASSERT()
 --------------
diff --git a/doc/kernel/services/scheduling/index.rst b/doc/kernel/services/scheduling/index.rst
index 87823ad40bf29..28319539582c0 100644
--- a/doc/kernel/services/scheduling/index.rst
+++ b/doc/kernel/services/scheduling/index.rst
@@ -13,8 +13,10 @@ The scheduler determines which thread is allowed to execute
 at any point in time; this thread is known as the **current thread**.
 
 There are various points in time when the scheduler is given an
-opportunity to change the identity of the current thread.  These points
-are called **reschedule points**. Some potential reschedule points are:
+opportunity to change the identity of the current thread, meaning
+when the scheduler switches the CPU's execution from one thread
+to another. These points are called **reschedule points**.
+Some potential reschedule points are:
 
 - transition of a thread from running state to a suspended or waiting
   state, for example by :c:func:`k_sem_take` or :c:func:`k_sleep`.
@@ -59,7 +61,7 @@ The kernel can be built with one of several choices for the ready queue
 implementation, offering different choices between code size, constant factor
 runtime overhead and performance scaling when many threads are added.
 
-* Simple linked-list ready queue (:kconfig:option:`CONFIG_SCHED_DUMB`)
+* Simple linked-list ready queue (:kconfig:option:`CONFIG_SCHED_SIMPLE`)
 
   The scheduler ready queue will be implemented as a simple unordered list, with
   very fast constant time performance for single threads and very low code size.
@@ -95,7 +97,7 @@ runtime overhead and performance scaling when many threads are added.
   list of threads.
 
   Typical applications with small numbers of runnable threads probably want the
-  DUMB scheduler.
+  simple scheduler.
 
 
 The wait_q abstraction used in IPC primitives to pend threads for later wakeup
@@ -106,13 +108,13 @@ the same options.
 
   When selected, the wait_q will be implemented with a balanced tree.  Choose
   this if you expect to have many threads waiting on individual primitives.
-  There is a ~2kb code size increase over :kconfig:option:`CONFIG_WAITQ_DUMB` (which may
+  There is a ~2kb code size increase over :kconfig:option:`CONFIG_WAITQ_SIMPLE` (which may
   be shared with :kconfig:option:`CONFIG_SCHED_SCALABLE`) if the red/black tree is not
   used elsewhere in the application, and pend/unpend operations on "small"
   queues will be somewhat slower (though this is not generally a performance
   path).
 
-* Simple linked-list wait_q (:kconfig:option:`CONFIG_WAITQ_DUMB`)
+* Simple linked-list wait_q (:kconfig:option:`CONFIG_WAITQ_SIMPLE`)
 
   When selected, the wait_q will be implemented with a doubly-linked list.
   Choose this if you expect to have only a few threads blocked on any single
diff --git a/doc/kernel/services/smp/smp.rst b/doc/kernel/services/smp/smp.rst
index 615676494f822..9a81609188cac 100644
--- a/doc/kernel/services/smp/smp.rst
+++ b/doc/kernel/services/smp/smp.rst
@@ -118,7 +118,7 @@ traversed in full.  The kernel does not keep a per-CPU run queue.
 That means that the performance benefits from the
 :kconfig:option:`CONFIG_SCHED_SCALABLE` and :kconfig:option:`CONFIG_SCHED_MULTIQ`
 scheduler backends cannot be realized.  CPU mask processing is
-available only when :kconfig:option:`CONFIG_SCHED_DUMB` is the selected
+available only when :kconfig:option:`CONFIG_SCHED_SIMPLE` is the selected
 backend.  This requirement is enforced in the configuration layer.
 
 SMP Boot Process
diff --git a/doc/kernel/services/threads/index.rst b/doc/kernel/services/threads/index.rst
index b9dd1fb3ba895..1edc7593cff11 100644
--- a/doc/kernel/services/threads/index.rst
+++ b/doc/kernel/services/threads/index.rst
@@ -189,8 +189,12 @@ require their regions to be of some power of two in size, and aligned to its
 own size.
 
 Because of this, portable code can't simply pass an arbitrary character buffer
-to :c:func:`k_thread_create`. Special macros exist to instantiate stacks,
-prefixed with ``K_KERNEL_STACK`` and ``K_THREAD_STACK``.
+to :c:func:`k_thread_create`. Special macros exist to instantiate stacks
+statically, prefixed with ``K_KERNEL_STACK`` and ``K_THREAD_STACK``.
+
+Additionally, stacks may be instantiated dynamically using
+:c:func:`k_thread_stack_alloc` and subsequently freed with
+:c:func:`k_thread_stack_free`.
 
 Kernel-only Stacks
 ==================
@@ -411,8 +415,9 @@ Spawning a Thread
 A thread is spawned by defining its stack area and its thread control block,
 and then calling :c:func:`k_thread_create`.
 
-The stack area must be defined using :c:macro:`K_THREAD_STACK_DEFINE` or
-:c:macro:`K_KERNEL_STACK_DEFINE` to ensure it is properly set up in memory.
+The stack area may be statically allocated using
+:c:macro:`K_THREAD_STACK_DEFINE` or :c:macro:`K_KERNEL_STACK_DEFINE` to ensure
+it is properly set up in memory.
 
 The size parameter for the stack must be one of three values:
 
@@ -426,6 +431,9 @@ The size parameter for the stack must be one of three values:
   macros, the return value of :c:macro:`K_KERNEL_STACK_SIZEOF()` for that
   object.
 
+Alternatively, the stack area may be dynamically allocated using
+:c:func:`k_thread_stack_alloc` and freed using :c:func:`k_thread_stack_free`.
+
 The thread spawning function returns its thread id, which can be used
 to reference the thread.
 
@@ -470,6 +478,25 @@ The following code has the same effect as the code segment above.
    thread immediately. The corresponding parameter to :c:macro:`K_THREAD_DEFINE`
    is a duration in integral milliseconds, so the equivalent argument is 0.
 
+The following code dynamically allocates a thread stack, waits until the thread
+has joined, and then frees the dynamically allocated thread stack.
+
+.. code-block:: c
+
+    extern void my_entry_point(void *, void *, void *);
+
+    k_tid_t my_tid;
+    void *my_stack_area;
+
+    my_stack_area = k_thread_stack_alloc(CONFIG_DYNAMIC_THREAD_STACK_SIZE);
+    my_tid = k_thread_create(&my_thread_data, my_stack_area,
+                              CONFIG_DYNAMIC_THREAD_STACK_SIZE,
+                              my_entry_point,
+                              NULL, NULL, NULL,
+                              MY_PRIORITY, 0, K_NO_WAIT);
+    k_thread_join(my_tid, K_FOREVER);
+    k_thread_stack_free(my_stack_area);
+
 User Mode Constraints
 ---------------------
 
diff --git a/doc/kernel/services/threads/priorities.svg b/doc/kernel/services/threads/priorities.svg
index 2e9a85d4ad51b..00475e6e9826f 100644
--- a/doc/kernel/services/threads/priorities.svg
+++ b/doc/kernel/services/threads/priorities.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Do not edit this file with editors other than diagrams.net -->
+<!-- Do not edit this file with editors other than draw.io -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="889px" height="312px" viewBox="-0.5 -0.5 889 312" content="&lt;mxfile modified=&quot;2023-06-23T14:25:58.904Z&quot; host=&quot;app.diagrams.net&quot; agent=&quot;Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36&quot; etag=&quot;5Xonh3YCq1qyZHMtrfR0&quot; version=&quot;21.1.4&quot; type=&quot;device&quot;&gt;&#10;  &lt;diagram id=&quot;UuDMrMdYpm0XhTTwV58i&quot; name=&quot;Priorities&quot;&gt;&#10;    &lt;mxGraphModel dx=&quot;1482&quot; dy=&quot;940&quot; grid=&quot;1&quot; gridSize=&quot;10&quot; guides=&quot;1&quot; tooltips=&quot;1&quot; connect=&quot;1&quot; arrows=&quot;1&quot; fold=&quot;1&quot; page=&quot;1&quot; pageScale=&quot;1&quot; pageWidth=&quot;1100&quot; pageHeight=&quot;850&quot; math=&quot;0&quot; shadow=&quot;0&quot;&gt;&#10;      &lt;root&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-0&quot; /&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-0&quot; /&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-2&quot; value=&quot;&quot; style=&quot;endArrow=block;startArrow=block;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;endFill=1;startFill=1;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;192.5&quot; y=&quot;630&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;912.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-3&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;560&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;560.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-4&quot; value=&quot;0&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;540&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-17&quot; value=&quot;- CONFIG_NUM_COOP_PRIORITIES&quot; style=&quot;text;html=1;fontSize=11;fillColor=#dae8fc;strokeColor=#6c8ebf;align=center;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;122.5&quot; y=&quot;660&quot; width=&quot;210&quot; height=&quot;30&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-18&quot; value=&quot;&quot; style=&quot;shape=curlyBracket;whiteSpace=wrap;html=1;rounded=1;dashed=1;fillColor=#ffffff;fontSize=11;align=center;rotation=-90;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;349&quot; y=&quot;556&quot; width=&quot;18&quot; height=&quot;330&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-19&quot; value=&quot;cooperative threads&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;297.5&quot; y=&quot;740&quot; width=&quot;110&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-20&quot; value=&quot;&quot; style=&quot;shape=curlyBracket;whiteSpace=wrap;html=1;rounded=1;dashed=1;fillColor=#ffffff;fontSize=11;align=center;rotation=-90;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;724&quot; y=&quot;547&quot; width=&quot;20&quot; height=&quot;348&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-21&quot; value=&quot;preemptible threads&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;652.5&quot; y=&quot;740&quot; width=&quot;110&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-22&quot; value=&quot;CONFIG_NUM_PREEMPT_PRIORITIES - 1&quot; style=&quot;text;html=1;fontSize=11;fillColor=#dae8fc;strokeColor=#6c8ebf;align=center;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;707.5&quot; y=&quot;660&quot; width=&quot;250&quot; height=&quot;30&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-23&quot; value=&quot;-1&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;500&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-33&quot; value=&quot;Higher priority&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;fontColor=#FF511C;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;110&quot; y=&quot;620&quot; width=&quot;80&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-34&quot; value=&quot;Lower priority&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;fontColor=#FF511C;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;917.5&quot; y=&quot;620&quot; width=&quot;80&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-7&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;520&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;520.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-8&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;480&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;480.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-9&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;600&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;600.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-10&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;640&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;640.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-11&quot; value=&quot;1&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;580&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-12&quot; value=&quot;2&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;620&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-13&quot; value=&quot;- 2&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;460&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-0&quot; value=&quot;&quot; style=&quot;endArrow=classic;html=1;strokeWidth=1;dashed=1;strokeColor=#FF511C;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; source=&quot;rILaYbx1iXKolmLqMkbF-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;520&quot; y=&quot;490&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;520&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;            &lt;Array as=&quot;points&quot;&gt;&#10;              &lt;mxPoint x=&quot;500&quot; y=&quot;520&quot; /&gt;&#10;            &lt;/Array&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-1&quot; value=&quot;Idle thread (cooperative)&quot; style=&quot;text;html=1;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;407.5&quot; y=&quot;450&quot; width=&quot;160&quot; height=&quot;30&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-3&quot; value=&quot;&quot; style=&quot;endArrow=classic;html=1;strokeWidth=1;dashed=1;strokeColor=#FF511C;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; source=&quot;rILaYbx1iXKolmLqMkbF-4&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;882.5&quot; y=&quot;485&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;882.5&quot; y=&quot;625&quot; as=&quot;targetPoint&quot; /&gt;&#10;            &lt;Array as=&quot;points&quot;&gt;&#10;              &lt;mxPoint x=&quot;862.5&quot; y=&quot;515&quot; /&gt;&#10;            &lt;/Array&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-4&quot; value=&quot;Idle thread (preemptible)&quot; style=&quot;text;html=1;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;770&quot; y=&quot;445&quot; width=&quot;160&quot; height=&quot;30&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-5&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;240&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;240.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-7&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;881.5&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;882&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;      &lt;/root&gt;&#10;    &lt;/mxGraphModel&gt;&#10;  &lt;/diagram&gt;&#10;&lt;/mxfile&gt;&#10;"><defs/><g><path d="M 94.85 185 L 790.15 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 85.85 185 L 94.85 180.5 L 94.85 189.5 Z" fill="#000000" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><path d="M 799.15 185 L 790.15 189.5 L 790.15 180.5 Z" fill="#000000" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><path d="M 450 205 L 450.5 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><rect x="430" y="205" width="40" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 215px; margin-left: 431px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">0</div></div></div></foreignObject><text x="450" y="218" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">0</text></switch></g><rect x="12.5" y="215" width="210" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 222px; margin-left: 118px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">- CONFIG_NUM_COOP_PRIORITIES</div></div></div></foreignObject><text x="118" y="233" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">- CONFIG_NUM_COOP_PRIORITIES</text></switch></g><path d="M 257 111 L 252.5 111 Q 248 111 248 121 L 248 266 Q 248 276 243.5 276 L 241.25 276 Q 239 276 243.5 276 L 245.75 276 Q 248 276 248 286 L 248 431 Q 248 441 252.5 441 L 257 441" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" transform="rotate(-90,248,276)" pointer-events="all"/><rect x="187.5" y="295" width="110" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 298px; margin-left: 190px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">cooperative threads</div></div></div></foreignObject><text x="190" y="309" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px">cooperative threads</text></switch></g><path d="M 634 102 L 629 102 Q 624 102 624 112 L 624 266 Q 624 276 619 276 L 616.5 276 Q 614 276 619 276 L 621.5 276 Q 624 276 624 286 L 624 440 Q 624 450 629 450 L 634 450" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" transform="rotate(-90,624,276)" pointer-events="all"/><rect x="542.5" y="295" width="110" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 298px; margin-left: 545px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">preemptible threads</div></div></div></foreignObject><text x="545" y="309" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px">preemptible threads</text></switch></g><rect x="597.5" y="215" width="250" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 222px; margin-left: 723px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">CONFIG_NUM_PREEMPT_PRIORITIES - 1</div></div></div></foreignObject><text x="723" y="233" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">CONFIG_NUM_PREEMPT_PRIORITIES - 1</text></switch></g><rect x="390" y="205" width="40" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 215px; margin-left: 391px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">-1</div></div></div></foreignObject><text x="410" y="218" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">-1</text></switch></g><rect x="0" y="175" width="80" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 178px; margin-left: 2px;"><div data-drawio-colors="color: #FF511C; " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(255, 81, 28); line-height: 1.2; pointer-events: all; white-space: nowrap;">Higher priority</div></div></div></foreignObject><text x="2" y="189" fill="#FF511C" font-family="Helvetica" font-size="11px">Higher priority</text></switch></g><rect x="807.5" y="175" width="80" height="10" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 178px; margin-left: 810px;"><div data-drawio-colors="color: #FF511C; " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(255, 81, 28); line-height: 1.2; pointer-events: all; white-space: nowrap;">Lower priority</div></div></div></foreignObject><text x="810" y="189" fill="#FF511C" font-family="Helvetica" font-size="11px">Lower priority</text></switch></g><path d="M 410 205 L 410.5 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 370 205 L 370.5 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 490 205 L 490.5 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 530 205 L 530.5 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><rect x="470" y="205" width="40" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 215px; margin-left: 471px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">1</div></div></div></foreignObject><text x="490" y="218" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">1</text></switch></g><rect x="510" y="205" width="40" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 215px; margin-left: 511px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">2</div></div></div></foreignObject><text x="530" y="218" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">2</text></switch></g><rect x="350" y="205" width="40" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 215px; margin-left: 351px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">- 2</div></div></div></foreignObject><text x="370" y="218" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">- 2</text></switch></g><path d="M 377.5 35 L 387.02 65.46 Q 390 75 391.79 84.84 L 408.86 178.73" fill="none" stroke="#ff511c" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 409.8 183.9 L 405.1 177.64 L 408.86 178.73 L 411.99 176.39 Z" fill="#ff511c" stroke="#ff511c" stroke-miterlimit="10" pointer-events="all"/><rect x="297.5" y="5" width="160" height="30" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 12px; margin-left: 300px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Idle thread (cooperative)</div></div></div></foreignObject><text x="300" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Idle thread (cooperative)</text></switch></g><path d="M 740 30 L 749.52 60.46 Q 752.5 70 754.29 79.84 L 771.36 173.73" fill="none" stroke="#ff511c" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 772.3 178.9 L 767.6 172.64 L 771.36 173.73 L 774.49 171.39 Z" fill="#ff511c" stroke="#ff511c" stroke-miterlimit="10" pointer-events="all"/><rect x="660" y="0" width="160" height="30" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 7px; margin-left: 662px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Idle thread (preemptible)</div></div></div></foreignObject><text x="662" y="19" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Idle thread (preemptible)</text></switch></g><path d="M 130 205 L 130.5 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 771.5 205 L 772 185" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="888px" height="306px" viewBox="-0.5 -0.5 888 306" content="&lt;mxfile host=&quot;Electron&quot; agent=&quot;Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.17 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36&quot; version=&quot;24.7.17&quot;&gt;&#10;  &lt;diagram id=&quot;UuDMrMdYpm0XhTTwV58i&quot; name=&quot;Priorities&quot;&gt;&#10;    &lt;mxGraphModel dx=&quot;989&quot; dy=&quot;659&quot; grid=&quot;1&quot; gridSize=&quot;10&quot; guides=&quot;1&quot; tooltips=&quot;1&quot; connect=&quot;1&quot; arrows=&quot;1&quot; fold=&quot;1&quot; page=&quot;1&quot; pageScale=&quot;1&quot; pageWidth=&quot;1100&quot; pageHeight=&quot;850&quot; math=&quot;0&quot; shadow=&quot;0&quot;&gt;&#10;      &lt;root&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-0&quot; /&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-0&quot; /&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-2&quot; value=&quot;&quot; style=&quot;endArrow=block;startArrow=block;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;endFill=1;startFill=1;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;192.5&quot; y=&quot;630&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;912.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-3&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;520&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;520.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-4&quot; value=&quot;0&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;500&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-17&quot; value=&quot;- CONFIG_NUM_COOP_PRIORITIES&quot; style=&quot;text;html=1;fontSize=11;fillColor=#dae8fc;strokeColor=#6c8ebf;align=center;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;122.5&quot; y=&quot;660&quot; width=&quot;210&quot; height=&quot;30&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-18&quot; value=&quot;&quot; style=&quot;shape=curlyBracket;whiteSpace=wrap;html=1;rounded=1;dashed=1;fillColor=#ffffff;fontSize=11;align=center;rotation=-90;fontColor=#000000;strokeColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;331.14&quot; y=&quot;573.42&quot; width=&quot;18.44&quot; height=&quot;294.72&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-19&quot; value=&quot;cooperative threads&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;297.5&quot; y=&quot;740&quot; width=&quot;110&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-20&quot; value=&quot;&quot; style=&quot;shape=curlyBracket;whiteSpace=wrap;html=1;rounded=1;dashed=1;fillColor=#ffffff;fontSize=11;align=center;rotation=-90;fontColor=#000000;strokeColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;668.3&quot; y=&quot;553.44&quot; width=&quot;20&quot; height=&quot;335.12&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-21&quot; value=&quot;preemptible threads&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;652.5&quot; y=&quot;740&quot; width=&quot;110&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-22&quot; value=&quot;CONFIG_NUM_PREEMPT_PRIORITIES - 1&quot; style=&quot;text;html=1;fontSize=11;fillColor=#dae8fc;strokeColor=#6c8ebf;align=center;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;610&quot; y=&quot;660&quot; width=&quot;250&quot; height=&quot;30&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-23&quot; value=&quot;-1&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;460&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-33&quot; value=&quot;Higher priority&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;fontColor=#FF511C;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;110&quot; y=&quot;620&quot; width=&quot;80&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;iS6kiN90LlEgJOz6M8BC-34&quot; value=&quot;Lower priority&quot; style=&quot;text;html=1;resizable=0;points=[];autosize=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=11;fontColor=#FF511C;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;917.5&quot; y=&quot;620&quot; width=&quot;80&quot; height=&quot;10&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-7&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;480&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;480.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-8&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;440&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;440.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-9&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;560&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;560.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-11&quot; value=&quot;1&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;540&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;tDvL4nYGF5BsJqzyVPHV-13&quot; value=&quot;- 2&quot; style=&quot;text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;dashed=1;fontSize=11;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;420&quot; y=&quot;650&quot; width=&quot;40&quot; height=&quot;20&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-3&quot; value=&quot;&quot; style=&quot;endArrow=classic;html=1;strokeWidth=1;dashed=1;strokeColor=#FF511C;exitX=0.5;exitY=1;exitDx=0;exitDy=0;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; source=&quot;rILaYbx1iXKolmLqMkbF-4&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;882.5&quot; y=&quot;485&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;882.5&quot; y=&quot;625&quot; as=&quot;targetPoint&quot; /&gt;&#10;            &lt;Array as=&quot;points&quot;&gt;&#10;              &lt;mxPoint x=&quot;862.5&quot; y=&quot;515&quot; /&gt;&#10;            &lt;/Array&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-4&quot; value=&quot;Idle thread&quot; style=&quot;text;html=1;fontColor=#000000;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; vertex=&quot;1&quot;&gt;&#10;          &lt;mxGeometry x=&quot;820&quot; y=&quot;450&quot; width=&quot;70&quot; height=&quot;28.13&quot; as=&quot;geometry&quot; /&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-5&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;240&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;240.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;rILaYbx1iXKolmLqMkbF-7&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;881.5&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;882&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;        &lt;mxCell id=&quot;ZvM7SDeOIhH1VxSZ58RR-1&quot; value=&quot;&quot; style=&quot;endArrow=none;html=1;strokeColor=#000000;strokeWidth=3;fontSize=11;&quot; parent=&quot;iS6kiN90LlEgJOz6M8BC-1&quot; edge=&quot;1&quot;&gt;&#10;          &lt;mxGeometry width=&quot;50&quot; height=&quot;50&quot; relative=&quot;1&quot; as=&quot;geometry&quot;&gt;&#10;            &lt;mxPoint x=&quot;840&quot; y=&quot;650&quot; as=&quot;sourcePoint&quot; /&gt;&#10;            &lt;mxPoint x=&quot;840.5&quot; y=&quot;630&quot; as=&quot;targetPoint&quot; /&gt;&#10;          &lt;/mxGeometry&gt;&#10;        &lt;/mxCell&gt;&#10;      &lt;/root&gt;&#10;    &lt;/mxGraphModel&gt;&#10;  &lt;/diagram&gt;&#10;&lt;/mxfile&gt;&#10;"><defs/><g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-0"><g data-cell-id="iS6kiN90LlEgJOz6M8BC-1"><g data-cell-id="iS6kiN90LlEgJOz6M8BC-2"><g><path d="M 94.85 180 L 790.15 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 85.85 180 L 94.85 175.5 L 94.85 184.5 Z" fill="#000000" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><path d="M 799.15 180 L 790.15 184.5 L 790.15 175.5 Z" fill="#000000" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-3"><g><path d="M 410 200 L 410.5 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-4"><g><rect x="390" y="200" width="40" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 210px; margin-left: 391px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">0</div></div></div></foreignObject><text x="410" y="213" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px" text-anchor="middle">0</text></switch></g></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-17"><g><rect x="12.5" y="210" width="210" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 217px; margin-left: 118px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">- CONFIG_NUM_COOP_PRIORITIES</div></div></div></foreignObject><text x="118" y="228" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px" text-anchor="middle">- CONFIG_NUM_COOP_PRIORITIES</text></switch></g></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-18"><g><path d="M 239.58 123.42 L 234.97 123.42 Q 230.36 123.42 230.36 133.42 L 230.36 260.78 Q 230.36 270.78 225.75 270.78 L 223.44 270.78 Q 221.14 270.78 225.75 270.78 L 228.05 270.78 Q 230.36 270.78 230.36 280.78 L 230.36 408.14 Q 230.36 418.14 234.97 418.14 L 239.58 418.14" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" transform="rotate(-90,230.36,270.78)" pointer-events="all"/></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-19"><g><rect x="187.5" y="290" width="110" height="10" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 293px; margin-left: 190px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">cooperative threads</div></div></div></foreignObject><text x="190" y="304" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px">cooperative threads</text></switch></g></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-20"><g><path d="M 578.3 103.44 L 573.3 103.44 Q 568.3 103.44 568.3 113.44 L 568.3 261 Q 568.3 271 563.3 271 L 560.8 271 Q 558.3 271 563.3 271 L 565.8 271 Q 568.3 271 568.3 281 L 568.3 428.56 Q 568.3 438.56 573.3 438.56 L 578.3 438.56" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" transform="rotate(-90,568.3,271)" pointer-events="all"/></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-21"><g><rect x="542.5" y="290" width="110" height="10" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 293px; margin-left: 545px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">preemptible threads</div></div></div></foreignObject><text x="545" y="304" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px">preemptible threads</text></switch></g></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-22"><g><rect x="500" y="210" width="250" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 217px; margin-left: 625px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">CONFIG_NUM_PREEMPT_PRIORITIES - 1</div></div></div></foreignObject><text x="625" y="228" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px" text-anchor="middle">CONFIG_NUM_PREEMPT_PRIORITIES - 1</text></switch></g></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-23"><g><rect x="350" y="200" width="40" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 210px; margin-left: 351px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">-1</div></div></div></foreignObject><text x="370" y="213" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px" text-anchor="middle">-1</text></switch></g></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-33"><g><rect x="0" y="170" width="80" height="10" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 173px; margin-left: 2px;"><div data-drawio-colors="color: #FF511C; " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(255, 81, 28); line-height: 1.2; pointer-events: all; white-space: nowrap;">Higher priority</div></div></div></foreignObject><text x="2" y="184" fill="#FF511C" font-family="&quot;Helvetica&quot;" font-size="11px">Higher priority</text></switch></g></g></g><g data-cell-id="iS6kiN90LlEgJOz6M8BC-34"><g><rect x="807.5" y="170" width="80" height="10" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 173px; margin-left: 810px;"><div data-drawio-colors="color: #FF511C; " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(255, 81, 28); line-height: 1.2; pointer-events: all; white-space: nowrap;">Lower priority</div></div></div></foreignObject><text x="810" y="184" fill="#FF511C" font-family="&quot;Helvetica&quot;" font-size="11px">Lower priority</text></switch></g></g></g><g data-cell-id="tDvL4nYGF5BsJqzyVPHV-7"><g><path d="M 370 200 L 370.5 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g></g><g data-cell-id="tDvL4nYGF5BsJqzyVPHV-8"><g><path d="M 330 200 L 330.5 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g></g><g data-cell-id="tDvL4nYGF5BsJqzyVPHV-9"><g><path d="M 450 200 L 450.5 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g></g><g data-cell-id="tDvL4nYGF5BsJqzyVPHV-11"><g><rect x="430" y="200" width="40" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 210px; margin-left: 431px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">1</div></div></div></foreignObject><text x="450" y="213" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px" text-anchor="middle">1</text></switch></g></g></g><g data-cell-id="tDvL4nYGF5BsJqzyVPHV-13"><g><rect x="310" y="200" width="40" height="20" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 210px; margin-left: 311px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">- 2</div></div></div></foreignObject><text x="330" y="213" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="11px" text-anchor="middle">- 2</text></switch></g></g></g><g data-cell-id="rILaYbx1iXKolmLqMkbF-3"><g><path d="M 745 28.13 L 750.51 55.2 Q 752.5 65 754.29 74.84 L 771.36 168.73" fill="none" stroke="#ff511c" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 772.3 173.9 L 767.6 167.64 L 771.36 168.73 L 774.49 166.39 Z" fill="#ff511c" stroke="#ff511c" stroke-miterlimit="10" pointer-events="all"/></g></g><g data-cell-id="rILaYbx1iXKolmLqMkbF-4"><g><rect x="710" y="0" width="70" height="28.13" fill="none" stroke="none" pointer-events="all"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 7px; margin-left: 712px;"><div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: left;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">Idle thread</div></div></div></foreignObject><text x="712" y="19" fill="#000000" font-family="&quot;Helvetica&quot;" font-size="12px">Idle thread</text></switch></g></g></g><g data-cell-id="rILaYbx1iXKolmLqMkbF-5"><g><path d="M 130 200 L 130.5 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g></g><g data-cell-id="rILaYbx1iXKolmLqMkbF-7"><g><path d="M 771.5 200 L 772 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g></g><g data-cell-id="ZvM7SDeOIhH1VxSZ58RR-1"><g><path d="M 730 200 L 730.5 180" fill="none" stroke="#000000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/></g></g></g></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.drawio.com/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
diff --git a/doc/kernel/services/threads/system_threads.rst b/doc/kernel/services/threads/system_threads.rst
index 74da3c0a033c9..b46ab4d3c83ca 100644
--- a/doc/kernel/services/threads/system_threads.rst
+++ b/doc/kernel/services/threads/system_threads.rst
@@ -35,9 +35,6 @@ The kernel spawns the following system threads:
     and never terminates.
 
     The idle thread always uses the lowest configured thread priority.
-    If this makes it a cooperative thread, the idle thread repeatedly
-    yields the CPU to allow the application's other threads to run when
-    they need to.
 
     The idle thread is an essential thread, which means a fatal system error
     is raised if the thread aborts.
diff --git a/doc/releases/index.rst b/doc/releases/index.rst
index e068ae493513c..a9c6d81255493 100644
--- a/doc/releases/index.rst
+++ b/doc/releases/index.rst
@@ -55,15 +55,26 @@ For more information, see  :ref:`Security Vulnerability Reporting <reporting>`.
 Supported Releases
 ******************
 
-+-----------------+----------------+---------------+
-| Release         | Release date   | EOL           |
-+=================+================+===============+
-| `Zephyr 3.7.0`_ | 2024-07-26     | 2027-01-26    |
-+-----------------+----------------+---------------+
-| `Zephyr 4.0.0`_ | 2024-11-15     | 2025-07-18    |
-+-----------------+----------------+---------------+
-
-As of 2022-01-01, LTS1 (1.14.x) is not supported and has reached end of life (EOL).
++------------------------+----------------+---------------+
+| Release                | Release date   | EOL           |
++========================+================+===============+
+| `Zephyr 4.1.0`_        | 2025-03-07     | 2025-11-14    |
++------------------------+----------------+---------------+
+| `Zephyr 4.0.0`_        | 2024-11-15     | 2025-07-18    |
++------------------------+----------------+---------------+
+| `Zephyr 3.7.0 (LTS3)`_ | 2024-07-26     | 2029-07-27    |
++------------------------+----------------+---------------+
+
+Previous LTS
+************
+
++-------------------------+---------------+
+| Release                 | EOL           |
++=========================+===============+
+| `Zephyr 2.7.6 (LTS2)`_  | 2025-01-26    |
++-------------------------+---------------+
+| `Zephyr 1.14.1 (LTS1)`_ | 2022-01-01    |
++-------------------------+---------------+
 
 Release Notes
 *************
@@ -74,13 +85,18 @@ Changes that require the user to modify their own application to support the new
 release may be mentioned in the release notes, but the details regarding *what*
 needs to be changed are to be detailed in the release's migration guide.
 
+Updates to the release notes post release cycle is permitted but limited to
+style, typographical fixes and to upmerge the notes from maintenance release
+branches with the sole purpose of keeping the latest documentation consistent
+with the changes in the project.
+
 .. toctree::
    :maxdepth: 1
    :glob:
    :reversed:
 
    release-notes-3.7
-   release-notes-4.[0-1]
+   release-notes-4.[0-2]
 
 Migration Guides
 ****************
@@ -112,7 +128,7 @@ to be able to understand the context of the change.
    :reversed:
 
    migration-guide-3.[6-7]
-   migration-guide-4.[0-1]
+   migration-guide-4.[0-2]
 
 End-of-life Releases
 ********************
@@ -128,5 +144,8 @@ Release notes and migration guides for end-of-life releases of Zephyr RTOS can b
 
 .. _`GitHub repository`: https://github.com/zephyrproject-rtos/zephyr
 .. _`GitHub tagged releases`: https://github.com/zephyrproject-rtos/zephyr/tags
-.. _`Zephyr 3.7.0`: https://docs.zephyrproject.org/3.7.0/
+.. _`Zephyr 1.14.1 (LTS1)`: https://docs.zephyrproject.org/1.14.1/
+.. _`Zephyr 2.7.6 (LTS2)`: https://docs.zephyrproject.org/2.7.6/
+.. _`Zephyr 3.7.0 (LTS3)`: https://docs.zephyrproject.org/3.7.0/
 .. _`Zephyr 4.0.0`: https://docs.zephyrproject.org/4.0.0/
+.. _`Zephyr 4.1.0`: https://docs.zephyrproject.org/4.1.0/
diff --git a/doc/releases/migration-guide-3.6.rst b/doc/releases/migration-guide-3.6.rst
index 99d248961036d..3c0e42b028417 100644
--- a/doc/releases/migration-guide-3.6.rst
+++ b/doc/releases/migration-guide-3.6.rst
@@ -241,7 +241,7 @@ Bluetooth HCI
 Controller Area Network (CAN)
 =============================
 
-* The native Linux SocketCAN driver, which can now be used in both :ref:`native_posix<native_posix>`
+* The native Linux SocketCAN driver, which can now be used in both ``native_posix``
   and :ref:`native_sim<native_sim>` with or without an embedded C-library, has been renamed to
   reflect this:
 
diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst
index b686643873539..4a7b500c1870e 100644
--- a/doc/releases/migration-guide-4.0.rst
+++ b/doc/releases/migration-guide-4.0.rst
@@ -33,7 +33,7 @@ Kernel
 Boards
 ******
 
-* :ref:`native_posix<native_posix>` has been deprecated in favour of
+* ``native_posix`` has been deprecated in favour of
   :ref:`native_sim<native_sim>` (:github:`76898`).
 * Nordic nRF53 and nRF91 based boards can use the common devicetree overlays in ``dts/common/nordic``
   to define default flash and ram partitioning based on TF-M.
@@ -505,7 +505,7 @@ Networking
   will take network interface pointer as a first parameter. (:github:`77987`)
 
 * To facilitate use outside of the networking subsystem, the network buffer header file was renamed
-  from :zephyr_file:`include/zephyr/net/buf.h` to :zephyr_file:`include/zephyr/net_buf.h` and the
+  from ``include/zephyr/net/buf.h`` to :zephyr_file:`include/zephyr/net_buf.h` and the
   implementation moved to :zephyr_file:`lib/net_buf/`. (:github:`78009`)
 
 * The ``work_q`` parameter to ``NET_SOCKET_SERVICE_SYNC_DEFINE`` and
diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
index 9aaf171e41bff..8be63d1954086 100644
--- a/doc/releases/migration-guide-4.1.rst
+++ b/doc/releases/migration-guide-4.1.rst
@@ -7,8 +7,8 @@
 
 .. _migration_4.1:
 
-Migration guide to Zephyr v4.1.0 (Working Draft)
-################################################
+Migration guide to Zephyr v4.1.0
+################################
 
 This document describes the changes required when migrating your application from Zephyr v4.0.0 to
 Zephyr v4.1.0.
@@ -41,6 +41,45 @@ perform a full erase, pass the ``--erase`` option when executing ``west flash``.
 Kernel
 ******
 
+
+k_pipe API
+==========
+
+The k_pipe API has been reworked and the API used in ``CONFIG_PIPES`` is now deprecated.
+The k_pipe API is enabled by default when ``CONFIG_MULTITHREADING`` is set.
+Function renames and modifications:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Old API
+     - New API
+     - Changes
+   * - ``k_pipe_put(..)``
+     - ``k_pipe_write(..)``
+     - Removed ``min_xfer`` parameter (partial transfers based on thresholds are no longer supported)
+       ``bytes_written`` is now the return value
+   * - ``k_pipe_get(..)``
+     - ``k_pipe_read(..)``
+     - Removed ``min_xfer`` parameter (partial transfers based on thresholds are no longer supported)
+       ``bytes_read`` is now the return value
+   * - ``k_pipe_flush(..)`` & ``k_pipe_buffer_flush(..)``
+     - ``k_pipe_reset(..)``
+     - Reset the pipe, discarding all data in the pipe, non blocking.
+   * - ``k_pipe_alloc_init(..)``, ``k_pipe_cleanup(..)``
+     - **Removed**
+     - Dynamic allocation of pipes is no longer supported
+   * - ``k_pipe_read_avail(..)``, ``k_pipe_write_avail(..)``
+     - **Removed**
+     - Querying the number of bytes in the pipe is no longer supported
+   * - None
+     - ``k_pipe_close(..)``
+     - Close a pipe, waking up all pending readers and writers with an error code. No further
+       reading or writing is allowed on the pipe. The pipe can be re-opened by calling
+       ``k_pipe_init(..)`` again. **Note**, all data in the pipe is available to readers until the
+       pipe is emptied.
+
+
 Security
 ********
 
@@ -67,6 +106,10 @@ Boards
   always erase only the sectors of the external flash used by the new firmware,
   and the ``nrfutil`` one would always erase the whole external flash.
 
+* CAN1 and USART1 have been disabled on the ``stm32f4_disco``, because of
+  conflicting pinctrl on I2C1, which is now used to control the audio codec
+  connected to the audio jack output.
+
 Devicetree
 **********
 
@@ -160,6 +203,9 @@ Counter
 Controller Area Network (CAN)
 =============================
 
+* Renamed the :dtcompatible:`infineon,xmc4xxx-can-node` devicetree property ``clock_div8`` to
+  ``clock-div8`` (:github:`83782`).
+
 Display
 =======
 
@@ -209,6 +255,7 @@ Entropy
 Ethernet
 ========
 
+* Deprecated eth_mcux driver was removed.
 * Silabs gecko ethernet changes:
 
   * Renamed the devicetree property ``location-phy_mdc`` to ``location-phy-mdc``.
@@ -487,11 +534,11 @@ Video
 Watchdog
 ========
 
+* Renamed the ``compatible`` from ``nxp,kinetis-wdog32`` to :dtcompatible:`nxp,wdog32`.
+
 Wi-Fi
 =====
 
-* Renamed the ``compatible`` from ``nxp,kinetis-wdog32`` to :dtcompatible:`nxp,wdog32`.
-
 * The config options :kconfig:option:`CONFIG_NXP_WIFI_BUILD_ONLY_MODE` and
   :kconfig:option:`CONFIG_NRF_WIFI_BUILD_ONLY_MODE` are now unified under
   :kconfig:option:`CONFIG_BUILD_ONLY_NO_BLOBS` making it a common entry point
@@ -587,6 +634,16 @@ Bluetooth Host
 Bluetooth Crypto
 ================
 
+Bluetooth Services
+==================
+
+* The :kconfig:option:`CONFIG_BT_DIS_MODEL` and :kconfig:option:`CONFIG_BT_DIS_MANUF` have been
+  deprecated. Application developers should now use the
+  :kconfig:option:`CONFIG_BT_DIS_MODEL_NUMBER_STR` and
+  :kconfig:option:`CONFIG_BT_DIS_MANUF_NAME_STR` Kconfig options to set the string values in the
+  Model Number String and Manufacturer Name String characteristics that are part of the Device
+  Information Service (DIS).
+
 Networking
 **********
 
@@ -650,6 +707,8 @@ MCUmgr
   deprecated and replaced with :kconfig:option:`CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_USING_MOVE`,
   applications should be updated to select this new symbol if they were selecting the old symbol.
 
+* The deprecated macro ``MGMT_CB_ERROR_RET`` has been removed.
+
 Modem
 =====
 
@@ -660,6 +719,15 @@ LoRa
   additional ``user_data`` parameter, which is a void pointer. This parameter can be used to reference
   any user-defined data structure. To maintain the current behavior, set this parameter to ``NULL``.
 
+Secure Storage
+==============
+
+* Store backends no longer automatically enable their dependencies through ``select`` or ``imply``.
+  Users must ensure that the depencies are enabled in their applications.
+  :kconfig:option:`CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS` previously enabled NVS
+  and settings, which means the NVS settings backend would get used by default if ZMS wasn't
+  enabled. (:github:`86181`)
+
 Stream Flash
 ============
 
diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst
new file mode 100644
index 0000000000000..36cafac89819b
--- /dev/null
+++ b/doc/releases/migration-guide-4.2.rst
@@ -0,0 +1,319 @@
+:orphan:
+
+..
+  See
+  https://docs.zephyrproject.org/latest/releases/index.html#migration-guides
+  for details of what is supposed to go into this document.
+
+.. _migration_4.2:
+
+Migration guide to Zephyr v4.2.0 (Working Draft)
+################################################
+
+This document describes the changes required when migrating your application from Zephyr v4.1.0 to
+Zephyr v4.2.0.
+
+Any other changes (not directly related to migrating applications) can be found in
+the :ref:`release notes<zephyr_4.2>`.
+
+.. contents::
+    :local:
+    :depth: 2
+
+Build System
+************
+
+Kernel
+******
+
+Boards
+******
+
+* All boards based on Nordic ICs that used the ``nrfjprog`` Nordic command-line
+  tool for flashing by default have been modified to instead default to the new
+  nRF Util (``nrfutil``) tool. This means that you may need to `install nRF Util
+  <https://www.nordicsemi.com/Products/Development-tools/nrf-util>`_ or, if you
+  prefer to continue using ``nrfjprog``, you can do so by invoking west while
+  specfying the runner: ``west flash -r nrfjprog``. The full documentation for
+  nRF Util can be found
+  `here <https://docs.nordicsemi.com/bundle/nrfutil/page/README.html>`_.
+
+* All boards based on a Nordic IC of the nRF54L series now default to not
+  erasing any part of the internal storage when flashing. If you'd like to
+  revert to the previous default of erasing the pages that will be written to by
+  the firmware to be flashed you can set the new ``--erase-mode`` command-line
+  switch when invoking ``west flash`` to ``ranges``.
+  Note that RRAM on nRF54L devices is not physically paged, and paging is
+  only artificially provided, with a page size of 4096 bytes, for an easier
+  transition of nRF52 software to nRF54L devices.
+
+* The config option :kconfig:option:`CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME` has been deprecated
+  in favor of :kconfig:option:`CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME`.
+
+* The DT binding :dtcompatible:`zephyr,native-posix-cpu` has been deprecated in favor of
+  :dtcompatible:`zephyr,native-sim-cpu`.
+
+* Zephyr now supports version 1.11.2 of the :zephyr:board:`neorv32`. NEORV32 processor (SoC)
+  implementations need to be updated to this version to be compatible with Zephyr v4.2.0.
+
+* The :zephyr:board:`neorv32` now targets NEORV32 processor (SoC) templates via board variants. The
+  old ``neorv32`` board target is now named ``neorv32/neorv32/up5kdemo``.
+
+* ``arduino_uno_r4_minima``, ``arduino_uno_r4_wifi``, and ``mikroe_clicker_ra4m1`` have migrated to
+  new FSP-based configurations.
+  While there are no major functional changes, the device tree structure has been significantly revised.
+  The following device tree bindings are now removed:
+  ``renesas,ra-gpio``, ``renesas,ra-uart-sci``, ``renesas,ra-pinctrl``,
+  ``renesas,ra-clock-generation-circuit``, and ``renesas,ra-interrupt-controller-unit``.
+  Instead, use the following replacements:
+  - :dtcompatible:`renesas,ra-gpio-ioport`
+  - :dtcompatible:`renesas,ra-sci-uart`
+  - :dtcompatible:`renesas,ra-pinctrl-pfs`
+  - :dtcompatible:`renesas,ra-cgc-pclk-block`
+
+* Nucleo WBA52CG board (``nucleo_wba52cg``) is not supported anymore since it is NRND
+  (Not Recommended for New Design) and it is not supported anymore in the STM32CubeWBA from
+  version 1.1.0 (July 2023). The migration to :zephyr:board:`nucleo_wba55cg` (``nucleo_wba55cg``)
+  is recommended and it could be done without any change.
+
+Device Drivers and Devicetree
+*****************************
+
+DAI
+===
+
+* Renamed the devicetree property ``dai_id`` to ``dai-id``.
+* Renamed the devicetree property ``afe_name`` to ``afe-name``.
+* Renamed the devicetree property ``agent_disable`` to ``agent-disable``.
+* Renamed the devicetree property ``ch_num`` to ``ch-num``.
+* Renamed the devicetree property ``mono_invert`` to ``mono-invert``.
+* Renamed the devicetree property ``quad_ch`` to ``quad-ch``.
+* Renamed the devicetree property ``int_odd`` to ``int-odd``.
+
+DMA
+===
+
+* Renamed the devicetree property ``nxp,a_on`` to ``nxp,a-on``.
+* Renamed the devicetree property ``dma_channels`` to ``dma-channels``.
+
+Counter
+=======
+
+* ``counter_native_posix`` has been renamed ``counter_native_sim``, and with it its
+  kconfig options and DT binding. :dtcompatible:`zephyr,native-posix-counter`  has been deprecated
+  in favor of :dtcompatible:`zephyr,native-sim-counter`.
+  And :kconfig:option:`CONFIG_COUNTER_NATIVE_POSIX` and its related options with
+  :kconfig:option:`CONFIG_COUNTER_NATIVE_SIM` (:github:`86616`).
+
+Entropy
+=======
+
+* ``fake_entropy_native_posix`` has been renamed ``fake_entropy_native_sim``, and with it its
+  kconfig options and DT binding. :dtcompatible:`zephyr,native-posix-rng`  has been deprecated
+  in favor of :dtcompatible:`zephyr,native-sim-rng`.
+  And :kconfig:option:`CONFIG_FAKE_ENTROPY_NATIVE_POSIX` and its related options with
+  :kconfig:option:`CONFIG_FAKE_ENTROPY_NATIVE_SIM` (:github:`86615`).
+
+Eeprom
+========
+
+* :dtcompatible:`ti,tmp116-eeprom` has been renamed to :dtcompatible:`ti,tmp11x-eeprom` because it
+  supports both tmp117 and tmp119.
+
+Ethernet
+========
+
+* Removed Kconfig option ``ETH_STM32_HAL_MII`` (:github:`86074`).
+  PHY interface type is now selected via the ``phy-connection-type`` property in the device tree.
+
+* The :dtcompatible:`st,stm32-ethernet` driver now requires the ``phy-handle`` phandle to be
+  set to the according PHY node in the device tree (:github:`87593`).
+
+* The Kconfig options ``ETH_STM32_HAL_PHY_ADDRESS``, ``ETH_STM32_CARRIER_CHECK``,
+  ``ETH_STM32_CARRIER_CHECK_RX_IDLE_TIMEOUT_MS``, ``ETH_STM32_AUTO_NEGOTIATION_ENABLE``,
+  ``ETH_STM32_SPEED_10M``, ``ETH_STM32_MODE_HALFDUPLEX`` have been removed, as they are no longer
+  needed, and the driver now uses the ethernet phy api to communicate with the phy driver, which
+  is resposible for configuring the phy settings (:github:`87593`).
+
+* ``ethernet_native_posix`` has been renamed ``ethernet_native_tap``, and with it its
+  kconfig options: :kconfig:option:`CONFIG_ETH_NATIVE_POSIX` and its related options have been
+  deprecated in favor of :kconfig:option:`CONFIG_ETH_NATIVE_TAP` (:github:`86578`).
+
+* NuMaker Ethernet driver ``eth_numaker.c`` now supports ``gen_random_mac``,
+  and the EMAC data flash feature has been removed (:github:`87953`).
+
+Enhanced Serial Peripheral Interface (eSPI)
+===========================================
+
+* Renamed the devicetree property ``io_girq`` to ``io-girq``.
+* Renamed the devicetree property ``vw_girqs`` to ``vw-girqs``.
+* Renamed the devicetree property ``pc_girq`` to ``pc-girq``.
+* Renamed the devicetree property ``poll_timeout`` to ``poll-timeout``.
+* Renamed the devicetree property ``poll_interval`` to ``poll-interval``.
+* Renamed the devicetree property ``consec_rd_timeout`` to ``consec-rd-timeout``.
+* Renamed the devicetree property ``sus_chk_delay`` to ``sus-chk-delay``.
+* Renamed the devicetree property ``sus_rsm_interval`` to ``sus-rsm-interval``.
+
+GPIO
+====
+
+* To support the RP2350B, which has many pins, the Raspberry Pi-GPIO configuration has
+  been changed. The previous role of :dtcompatible:`raspberrypi,rpi-gpio` has been migrated to
+  :dtcompatible:`raspberrypi,rpi-gpio-port`, and :dtcompatible:`raspberrypi,rpi-gpio` is
+  now left as a placeholder and mapper.
+  The labels have also been changed along, so no changes are necessary for regular use.
+
+I2S
+===
+* The :dtcompatible:`nxp,mcux-i2s` driver added property ``mclk-output``. Set this property to
+* configure the MCLK signal as an output.  Older driver versions used the macro
+* ``I2S_OPT_BIT_CLK_SLAVE`` to configure the MCLK signal direction. (:github:`88554`)
+
+Sensors
+=======
+
+* ``ltr`` vendor prefix has been renamed to ``liteon``, and with it the
+  :dtcompatible:`ltr,f216a` name has been replaced by :dtcompatible:`liteon,ltrf216a`.
+  The choice :kconfig:option:`DT_HAS_LTR_F216A_ENABLED` has been replaced with
+  :kconfig:option:`DT_HAS_LITEON_LTRF216A_ENABLED` (:github:`85453`)
+
+* :dtcompatible:`ti,tmp116` has been renamed to :dtcompatible:`ti,tmp11x` because it supports
+  tmp116, tmp117 and tmp119.
+
+* :dtcompatible:`meas,ms5837` has been replaced by :dtcompatible:`meas,ms5837-30ba`
+  and :dtcompatible:`meas,ms5837-02ba`. In order to use one of the two variants, the
+  status property needs to be used as well.
+
+Serial
+=======
+
+* ``uart_native_posix`` has been renamed ``uart_native_pty``, and with it its
+  kconfig options and DT binding. :dtcompatible:`zephyr,native-posix-uart`  has been deprecated
+  in favor of :dtcompatible:`zephyr,native-pty-uart`.
+  :kconfig:option:`CONFIG_UART_NATIVE_POSIX` and its related options with
+  :kconfig:option:`CONFIG_UART_NATIVE_PTY`.
+  The choice :kconfig:option:`CONFIG_NATIVE_UART_0` has been replaced with
+  :kconfig:option:`CONFIG_UART_NATIVE_PTY_0`, but now, it is also possible to select if a UART is
+  connected to the process stdin/out instead of a PTY at runtime with the command line option
+  ``--<uart_name>_stdinout``.
+  :kconfig:option:`CONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD` has been replaced with
+  :kconfig:option:`CONFIG_UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD`.
+  :kconfig:option:`CONFIG_UART_NATIVE_WAIT_PTS_READY_ENABLE` has been deprecated. The functionality
+  it enabled is now always enabled as there is no drawbacks from it.
+  :kconfig:option:`CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE` has been deprecated. This option does
+  nothing now. Instead users should instantiate as many :dtcompatible:`zephyr,native-pty-uart` nodes
+  as native PTY UART instances they want. (:github:`86739`)
+
+Timer
+=====
+
+* ``native_posix_timer`` has been renamed ``native_sim_timer``, and so its kconfig option
+  :kconfig:option:`CONFIG_NATIVE_POSIX_TIMER` has been deprecated in favor of
+  :kconfig:option:`CONFIG_NATIVE_SIM_TIMER`, (:github:`86612`).
+
+Modem
+=====
+
+* Removed Kconfig option :kconfig:option:`CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE` in favor of
+  :kconfig:option:`CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE` and :kconfig:option:`CONFIG_MODEM_CMUX_MTU`.
+
+
+Stepper
+=======
+
+* Refactored the ``stepper_enable(const struct device * dev, bool enable)`` function to
+  :c:func:`stepper_enable` & :c:func:`stepper_disable`.
+
+Bluetooth
+*********
+
+Bluetooth Audio
+===============
+
+* ``CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE`` has been renamed to
+  :kconfig:option:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE``. (:github:`86763``)
+
+Bluetooth Host
+==============
+
+* The symbols ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_<NUMBER>`` in
+  :zephyr_file:`include/zephyr/bluetooth/conn.h` have been renamed
+  to ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A<NUMBER>_B<NUMBER>``.
+
+* The ISO data paths are not longer setup automatically, and shall explicitly be setup and removed
+  by the application by calling :c:func:`bt_iso_setup_data_path` and
+  :c:func:`bt_iso_remove_data_path` respectively. (:github:`75549`)
+
+* ``BT_ISO_CHAN_TYPE_CONNECTED`` has been split into ``BT_ISO_CHAN_TYPE_CENTRAL`` and
+  ``BT_ISO_CHAN_TYPE_PERIPHERAL`` to better describe the type of the ISO channel, as behavior for
+  each role may be different. Any existing uses/checks for ``BT_ISO_CHAN_TYPE_CONNECTED``
+  can be replaced with an ``||`` of the two. (:github:`75549`)
+
+* The ``struct _bt_gatt_ccc`` in :zephyr_file:`include/zephyr/bluetooth/gatt.h` has been renamed to
+  struct :c:struct:`bt_gatt_ccc_managed_user_data`. (:github:`88652`)
+
+* The macro ``BT_GATT_CCC_INITIALIZER`` in :zephyr_file:`include/zephyr/bluetooth/gatt.h`
+  has been renamed to :c:macro:`BT_GATT_CCC_MANAGED_USER_DATA_INIT`. (:github:`88652`)
+
+Bluetooth Classic
+=================
+
+* The parameters of HFP AG callback ``sco_disconnected`` of the struct :c:struct:`bt_hfp_ag_cb`
+  have been changed to SCO connection object ``struct bt_conn *sco_conn`` and the disconnection
+  reason of the SCO connection ``uint8_t reason``.
+
+Networking
+**********
+
+* The struct ``net_linkaddr_storage`` has been renamed to struct
+  :c:struct:`net_linkaddr` and the old struct ``net_linkaddr`` has been removed.
+  The struct :c:struct:`net_linkaddr` now contains space to store the link
+  address instead of having pointer that point to the link address. This avoids
+  possible dangling pointers when cloning struct :c:struct:`net_pkt`. This will
+  increase the size of struct :c:struct:`net_pkt` by 4 octets for IEEE 802.15.4,
+  but there is no size increase for other network technologies like Ethernet.
+  Note that any code that is using struct :c:struct:`net_linkaddr` directly, and
+  which has checks like ``if (lladdr->addr == NULL)``, will no longer work as expected
+  (because the addr is not a pointer) and must be changed to ``if (lladdr->len == 0)``
+  if the code wants to check that the link address is not set.
+
+* TLS credential type ``TLS_CREDENTIAL_SERVER_CERTIFICATE`` was renamed to
+  more generic :c:enumerator:`TLS_CREDENTIAL_PUBLIC_CERTIFICATE` to better
+  reflect the purpose of this credential type.
+
+* The MQTT public API function :c:func:`mqtt_disconnect` has changed. The function
+  now accepts additional ``param`` parameter to support MQTT 5.0 case. The parameter
+  is optional and not used with older MQTT versions - MQTT 3.1.1 users should pass
+  NULL as an argument.
+
+* The ``AF_PACKET/SOCK_RAW/IPPROTO_RAW`` socket combination is no longer supported,
+  as ``AF_PACKET`` sockets should only accept IEEE 802.3 protocol numbers. As an
+  alternative, ``AF_PACKET/SOCK_DGRAM/ETH_P_ALL`` or ``AF_INET(6)/SOCK_RAW/IPPROTO_IP``
+  sockets can be used, depending on the actual use case.
+
+* The HTTP server now respects the configured ``_concurrent`` and  ``_backlog`` values. Check that
+  you provide applicable values to :c:macro:`HTTP_SERVICE_DEFINE_EMPTY`,
+  :c:macro:`HTTPS_SERVICE_DEFINE_EMPTY`, :c:macro:`HTTP_SERVICE_DEFINE` and
+  :c:macro:`HTTPS_SERVICE_DEFINE`.
+
+SPI
+===
+
+* Renamed the device tree property ``port_sel`` to ``port-sel``.
+* Renamed the device tree property ``chip_select`` to ``chip-select``.
+
+Other subsystems
+****************
+
+ZBus
+====
+
+* The function :c:func:`zbus_chan_add_obs` now requires a :c:struct:`zbus_observer_node` as an argument,
+  which was previously allocated through :c:func:`k_malloc` internally. The structure must remain valid
+  in memory until :c:func:`zbus_chan_rem_obs` is called.
+
+Modules
+*******
+
+Architectures
+*************
diff --git a/doc/releases/release-notes-1.14.rst b/doc/releases/release-notes-1.14.rst
index 4d8100c24ff3c..70bf8daa54f5e 100644
--- a/doc/releases/release-notes-1.14.rst
+++ b/doc/releases/release-notes-1.14.rst
@@ -704,7 +704,7 @@ Boards & SoC Support
 Drivers and Sensors
 *******************
 
-* Added new drivers and backends for :ref:`native_posix <native_posix>`:
+* Added new drivers and backends for ``native_posix``:
 
   * A UART driver that maps the Zephyr UART to a new host PTY
   * A USB driver that can expose a host connected USB device
diff --git a/doc/releases/release-notes-3.2.rst b/doc/releases/release-notes-3.2.rst
index 11e923b0f8e61..a7852db2e06e3 100644
--- a/doc/releases/release-notes-3.2.rst
+++ b/doc/releases/release-notes-3.2.rst
@@ -505,7 +505,7 @@ Drivers and Sensors
 
 * CAN
 
-  * A driver for bridging from :ref:`native_posix` to Linux SocketCAN has been added.
+  * A driver for bridging from ``native_posix`` to Linux SocketCAN has been added.
   * A driver for the Espressif ESP32 TWAI has been added. See the
     :dtcompatible:`espressif,esp32-twai` devicetree binding for more information.
   * The STM32 CAN-FD CAN driver clock configuration has been moved from Kconfig to :ref:`devicetree
@@ -1112,7 +1112,7 @@ Devicetree
     * :dtcompatible:`microchip,xec-espi`
     * :dtcompatible:`microchip,xec-i2c`
     * :dtcompatible:`microchip,xec-qmspi`
-    * :dtcompatible:`neorv32-machine-timer`
+    * :dtcompatible:`neorv32,machine-timer`
     * :dtcompatible:`nordic,nrf-ieee802154`
     * :dtcompatible:`nuclei,systimer`
     * :dtcompatible:`nuvoton,npcx-leakage-io`
@@ -1613,7 +1613,7 @@ MCUboot
 * Edited the DFU detection's GPIO-pin configuration to be done through DTS using the ``mcuboot-button0`` pin alias.
 * Edited the LED usage to prefer DTS' ``mcuboot-led0`` alias over the ``bootloader-led0`` alias.
 * Removed :c:func:`device_get_binding()` usage in favor of :c:func:`DEVICE_DT_GET()`.
-* Added support for generic `watchdog0` alias.
+* Added support for generic ``watchdog0`` alias.
 * Enabled watchdog feed by default.
 * Dropped the :kconfig:option:`CONFIG_BOOT_IMAGE_ACCESS_HOOKS_FILE` option.
   The inclusion of the Hooks implementation file is now up to the project's customization.
diff --git a/doc/releases/release-notes-3.4.rst b/doc/releases/release-notes-3.4.rst
index a8c3b6608e97a..927850d84456d 100644
--- a/doc/releases/release-notes-3.4.rst
+++ b/doc/releases/release-notes-3.4.rst
@@ -150,12 +150,12 @@ Changes in this release
   * ``gpio_keys``: moved out of ``gpio``, replaced the custom API to use input
     events instead, the :dtcompatible:`zephyr,gpio-keys` binding is unchanged
     but now requires ``zephyr,code`` to be set.
-  * ``ft5336``: moved from :ref:`kscan_api` to :ref:`input`, renamed the Kconfig
+  * ``ft5336``: moved from ``kscan_api`` to :ref:`input`, renamed the Kconfig
     options from ``CONFIG_KSCAN_FT5336``, ``CONFIG_KSCAN_FT5336_PERIOD`` and
     ``KSCAN_FT5336_INTERRUPT`` to :kconfig:option:`CONFIG_INPUT_FT5336`,
     :kconfig:option:`CONFIG_INPUT_FT5336_PERIOD` and
     :kconfig:option:`CONFIG_INPUT_FT5336_INTERRUPT`.
-  * ``kscan_sdl``: moved from :ref:`kscan_api` to :ref:`input`, renamed the Kconfig
+  * ``kscan_sdl``: moved from ``kscan_api`` to :ref:`input`, renamed the Kconfig
     option from ``KSCAN_SDL`` to :kconfig:option:`CONFIG_INPUT_SDL_TOUCH` and the
     compatible from ``zephyr,sdl-kscan`` to
     :dtcompatible:`zephyr,input-sdl-touch`.
diff --git a/doc/releases/release-notes-3.5.rst b/doc/releases/release-notes-3.5.rst
index aea5c731abb31..d643d4b5dba45 100644
--- a/doc/releases/release-notes-3.5.rst
+++ b/doc/releases/release-notes-3.5.rst
@@ -1022,7 +1022,7 @@ Bindings
     * The ``riscv,isa`` property used by RISC-V CPU bindings no longer has an
       ``enum`` value.
 
-    * :dtcompatible:`neorv32-cpu`:
+    * :dtcompatible:`neorv32,cpu`:
 
           * new property: ``mmu-type``
           * new property: ``riscv,isa``
@@ -2180,7 +2180,7 @@ Libraries / Subsystems
     the heap.
   * Added a new type of observer called Message Subscriber. ZBus' VDED will send a copy of the
     message during the publication/notification process.
-  * Changed the VDED delivery sequence. Check the ref:`documentation<zbus delivery sequence>`.
+  * Changed the VDED delivery sequence. Check the :ref:`documentation <zbus delivery sequence>`.
   * ZBus runtime observers now rely on the heap instead of a memory pool.
   * Added new iterable section iterators APIs (for channels and observers) can now receive a
     ``user_data`` pointer to keep context between the function calls.
@@ -2322,8 +2322,8 @@ Documentation
 Tests and Samples
 *****************
 
-* Created common sample for file systems (`fs_sample`). It originates from sample for FAT
-  (`fat_fs`) and supports both FAT and ext2 file systems.
+* Created common sample for file systems (``fs_sample``). It originates from sample for FAT
+  (``fat_fs``) and supports both FAT and ext2 file systems.
 
 * Created the zbus confirmed channel sample to demonstrate how to implement a delivery-guaranteed
   channel using subscribers.
diff --git a/doc/releases/release-notes-3.6.rst b/doc/releases/release-notes-3.6.rst
index 8bbec8f1be339..06c587298f3fc 100644
--- a/doc/releases/release-notes-3.6.rst
+++ b/doc/releases/release-notes-3.6.rst
@@ -1301,9 +1301,9 @@ Additionally, the following changes in Zephyr were done:
 Tests and Samples
 *****************
 
-* :ref:`native_sim<native_sim>` has replaced :ref:`native_posix<native_posix>` as the default
+* :ref:`native_sim<native_sim>` has replaced ``native_posix`` as the default
   test platform.
-  :ref:`native_posix<native_posix>` remains supported and used in testing but will be deprecated
+  ``native_posix`` remains supported and used in testing but will be deprecated
   in a future release.
 
 * Bluetooth split stacks tests, where the BT host and controller are run in separate MCUs, are
diff --git a/doc/releases/release-notes-3.7.rst b/doc/releases/release-notes-3.7.rst
index 30749ad038076..9f81deebf40ab 100644
--- a/doc/releases/release-notes-3.7.rst
+++ b/doc/releases/release-notes-3.7.rst
@@ -412,8 +412,8 @@ Boards & SoC Support
   * Added support for :zephyr:board:`Raspberry Pi 5 board <rpi_5>`: ``rpi_5``.
   * Added support for :zephyr:board:`Seeed Studio XIAO RP2040 board <xiao_rp2040>`: ``xiao_rp2040``.
   * Added support for :zephyr:board:`Mikroe RA4M1 Clicker board <mikroe_clicker_ra4m1>`: ``mikroe_clicker_ra4m1``.
-  * Added support for :ref:`Arduino UNO R4 WiFi board <arduino_uno_r4>`: ``arduino_uno_r4_wifi``.
-  * Added support for :ref:`Renesas EK-RA8M1 board <ek_ra8m1>`: ``ek_ra8m1``.
+  * Added support for :zephyr:board:`Arduino UNO R4 WiFi board <arduino_uno_r4>`: ``arduino_uno_r4_wifi``.
+  * Added support for :zephyr:board:`Renesas EK-RA8M1 board <ek_ra8m1>`: ``ek_ra8m1``.
   * Added support for :zephyr:board:`ST Nucleo H533RE <nucleo_h533re>`: ``nucleo_h533re``.
   * Added support for :zephyr:board:`ST STM32C0116-DK Discovery Kit <stm32c0116_dk>`: ``stm32c0116_dk``.
   * Added support for :zephyr:board:`ST STM32H745I Discovery <stm32h745i_disco>`: ``stm32h745i_disco``.
@@ -452,8 +452,8 @@ Boards & SoC Support
   * Introduced the simulated :ref:`nrf54l15bsim<nrf54l15bsim>` target.
   * The nrf5x bsim targets now support BT LE Coded PHY.
   * LLVM fuzzing support has been refactored while adding support for it in native_sim.
-  * nRF54H20 PDK (pre-release) converted to :ref:`nrf54h20dk_nrf54h20`
-  * PPR core target in :ref:`nrf54h20dk_nrf54h20` runs from RAM by default. A
+  * nRF54H20 PDK (pre-release) converted to :zephyr:board:`nrf54h20dk`
+  * PPR core target in :zephyr:board:`nrf54h20dk` runs from RAM by default. A
     new ``xip`` variant has been introduced which runs from MRAM (XIP).
   * Refactored :zephyr:board:`beagleconnect_freedom` external antenna switch handling.
   * Added Arduino dts node labels for the nRF5340 Audio DK.
diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index 8b9ede8f11eba..6b8ab57300966 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -105,22 +105,20 @@ Removed APIs in this release
 Deprecated in this release
 ==========================
 
-* Deprecated the :c:func:`net_buf_put` and :c:func:`net_buf_get` API functions in favor of
+* Deprecated the ``net_buf_put()`` and ``net_buf_get()`` API functions in favor of
   :c:func:`k_fifo_put` and :c:func:`k_fifo_get`.
 
-* The :ref:`kscan_api` subsystem has been marked as deprecated.
+* The ``kscan_api`` subsystem has been marked as deprecated.
 
 * Deprecated the TinyCrypt shim driver ``CONFIG_CRYPTO_TINYCRYPT_SHIM``.
 
-* :ref:`native_posix<native_posix>` has been deprecated in favour of
+* ``native_posix`` has been deprecated in favour of
   :ref:`native_sim<native_sim>`.
 
 * ``include/zephyr/net/buf.h`` is deprecated in favor of
   ``include/zephyr/net_buf.h>``. The old header will be removed in future releases
   and its usage should be avoided.
 
-* Deprecated the :c:func:`net_buf_put` and :c:func:`net_buf_get` API functions.
-
 Architectures
 *************
 
@@ -281,7 +279,7 @@ Boards & SoC Support
    * :zephyr:board:`ADI MAX32666FTHR <max32666fthr>` (``max32666fthr``)
    * :zephyr:board:`ADI MAX32675EVKIT <max32675evkit>` (``max32675evkit``)
    * :zephyr:board:`ADI MAX32690FTHR <max32690fthr>` (``max32690fthr``)
-   * :ref:`Arduino Nicla Vision <arduino_nicla_vision_board>` (``arduino_nicla_vision``)
+   * :zephyr:board:`arduino_nicla_vision` (``arduino_nicla_vision``)
    * :zephyr:board:`BeagleBone AI-64 <beaglebone_ai64>` (``beaglebone_ai64``)
    * :zephyr:board:`BeaglePlay (CC1352) <beagleplay>` (``beagleplay``)
    * :zephyr:board:`DPTechnics Walter <walter>` (``walter``)
@@ -291,9 +289,9 @@ Boards & SoC Support
    * :zephyr:board:`Espressif ESP8684-DevKitM <esp8684_devkitm>` (``esp8684_devkitm``)
    * :zephyr:board:`Gardena Smart Garden Radio Module <sgrm>` (``sgrm``)
    * :zephyr:board:`mikroe STM32 M4 Clicker <mikroe_stm32_m4_clicker>` (``mikroe_stm32_m4_clicker``)
-   * :ref:`Nordic Semiconductor nRF54L15 DK <nrf54l15dk_nrf54l15>` (``nrf54l15dk``)
-   * :ref:`Nordic Semiconductor nRF54L20 PDK <nrf54l20pdk_nrf54l20>` (``nrf54l20pdk``)
-   * :ref:`Nordic Semiconductor nRF7002 DK <nrf7002dk_nrf5340>` (``nrf7002dk``)
+   * :zephyr:board:`Nordic Semiconductor nRF54L15 DK <nrf54l15dk>` (``nrf54l15dk``)
+   * :zephyr:board:`Nordic Semiconductor nRF54L20 PDK <nrf54l20pdk>` (``nrf54l20pdk``)
+   * :zephyr:board:`Nordic Semiconductor nRF7002 DK <nrf7002dk>` (``nrf7002dk``)
    * :zephyr:board:`Nuvoton NPCM400_EVB <npcm400_evb>` (``npcm400_evb``)
    * :zephyr:board:`NXP FRDM-MCXA156 <frdm_mcxa156>` (``frdm_mcxa156``)
    * :zephyr:board:`NXP FRDM-MCXC242 <frdm_mcxc242>` (``frdm_mcxc242``)
@@ -303,21 +301,21 @@ Boards & SoC Support
    * :zephyr:board:`NXP i.MX95 EVK <imx95_evk>` (``imx95_evk``)
    * :zephyr:board:`NXP MIMXRT1180-EVK <mimxrt1180_evk>` (``mimxrt1180_evk``)
    * :ref:`PHYTEC phyBOARD-Nash i.MX93 <phyboard_nash>` (``phyboard_nash``)
-   * :ref:`Renesas RA2A1 Evaluation Kit <ek_ra2a1>` (``ek_ra2a1``)
-   * :ref:`Renesas RA4E2 Evaluation Kit <ek_ra4e2>` (``ek_ra4e2``)
-   * :ref:`Renesas RA4M2 Evaluation Kit <ek_ra4m2>` (``ek_ra4m2``)
-   * :ref:`Renesas RA4M3 Evaluation Kit <ek_ra4m3>` (``ek_ra4m3``)
-   * :ref:`Renesas RA4W1 Evaluation Kit <ek_ra4w1>` (``ek_ra4w1``)
-   * :ref:`Renesas RA6E2 Evaluation Kit <ek_ra6e2>` (``ek_ra6e2``)
-   * :ref:`Renesas RA6M1 Evaluation Kit <ek_ra6m1>` (``ek_ra6m1``)
-   * :ref:`Renesas RA6M2 Evaluation Kit <ek_ra6m2>` (``ek_ra6m2``)
-   * :ref:`Renesas RA6M3 Evaluation Kit <ek_ra6m3>` (``ek_ra6m3``)
-   * :ref:`Renesas RA6M4 Evaluation Kit <ek_ra6m4>` (``ek_ra6m4``)
-   * :ref:`Renesas RA6M5 Evaluation Kit <ek_ra6m5>` (``ek_ra6m5``)
-   * :ref:`Renesas RA8D1 Evaluation Kit <ek_ra8d1>` (``ek_ra8d1``)
-   * :ref:`Renesas RA6E1 Fast Prototyping Board <fpb_ra6e1>` (``fpb_ra6e1``)
-   * :ref:`Renesas RA6E2 Fast Prototyping Board <fpb_ra6e2>` (``fpb_ra6e2``)
-   * :ref:`Renesas RA8T1 Evaluation Kit <mcb_ra8t1>` (``mck_ra8t1``)
+   * :zephyr:board:`Renesas RA2A1 Evaluation Kit <ek_ra2a1>` (``ek_ra2a1``)
+   * :zephyr:board:`Renesas RA4E2 Evaluation Kit <ek_ra4e2>` (``ek_ra4e2``)
+   * :zephyr:board:`Renesas RA4M2 Evaluation Kit <ek_ra4m2>` (``ek_ra4m2``)
+   * :zephyr:board:`Renesas RA4M3 Evaluation Kit <ek_ra4m3>` (``ek_ra4m3``)
+   * :zephyr:board:`Renesas RA4W1 Evaluation Kit <ek_ra4w1>` (``ek_ra4w1``)
+   * :zephyr:board:`Renesas RA6E2 Evaluation Kit <ek_ra6e2>` (``ek_ra6e2``)
+   * :zephyr:board:`Renesas RA6M1 Evaluation Kit <ek_ra6m1>` (``ek_ra6m1``)
+   * :zephyr:board:`Renesas RA6M2 Evaluation Kit <ek_ra6m2>` (``ek_ra6m2``)
+   * :zephyr:board:`Renesas RA6M3 Evaluation Kit <ek_ra6m3>` (``ek_ra6m3``)
+   * :zephyr:board:`Renesas RA6M4 Evaluation Kit <ek_ra6m4>` (``ek_ra6m4``)
+   * :zephyr:board:`Renesas RA6M5 Evaluation Kit <ek_ra6m5>` (``ek_ra6m5``)
+   * :zephyr:board:`Renesas RA8D1 Evaluation Kit <ek_ra8d1>` (``ek_ra8d1``)
+   * :zephyr:board:`Renesas RA6E1 Fast Prototyping Board <fpb_ra6e1>` (``fpb_ra6e1``)
+   * :zephyr:board:`Renesas RA6E2 Fast Prototyping Board <fpb_ra6e2>` (``fpb_ra6e2``)
+   * :zephyr:board:`Renesas RA8T1 Motor Control Kit <mck_ra8t1>` (``mck_ra8t1``)
    * :zephyr:board:`Renode Cortex-R8 Virtual <cortex_r8_virtual>` (``cortex_r8_virtual``)
    * :zephyr:board:`Seeed XIAO ESP32-S3 Sense Variant <xiao_esp32s3>`: ``xiao_esp32s3``.
    * :ref:`sensry.io Ganymed Break-Out-Board (BOB) <ganymed_bob>` (``ganymed_bob``)
@@ -346,7 +344,7 @@ Boards & SoC Support
   * STM32: Deprecated MCO configuration via Kconfig in favour of setting it through Devicetree.
     See ``samples/boards/st/mco`` sample.
   * STM32: STM32CubeProgrammer is now the default runner on all STMicroelectronics STM32 boards.
-  * Removed the ``nrf54l15pdk`` board, use :ref:`nrf54l15dk_nrf54l15` instead.
+  * Removed the ``nrf54l15pdk`` board, use :zephyr:board:`nrf54l15dk` instead.
   * PHYTEC: ``mimx8mp_phyboard_pollux`` has been renamed to :ref:`phyboard_pollux<phyboard_pollux>`,
     with the old name marked as deprecated.
   * PHYTEC: ``mimx8mm_phyboard_polis`` has been renamed to :ref:`phyboard_polis<phyboard_polis>`,
@@ -1543,7 +1541,7 @@ zcbor
 Tests and Samples
 *****************
 
-* Together with the deprecation of :ref:`native_posix<native_posix>`, many tests which were
+* Together with the deprecation of ``native_posix``, many tests which were
   explicitly run in native_posix now run in :ref:`native_sim<native_sim>` instead.
   native_posix as a platform remains tested though.
 * Extended the tests of counter_basic_api with a testcase for counters without alarms
diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst
index 468f89ef21cbb..8d2649bd2956e 100644
--- a/doc/releases/release-notes-4.1.rst
+++ b/doc/releases/release-notes-4.1.rst
@@ -26,13 +26,43 @@
 
 .. _zephyr_4.1:
 
-Zephyr 4.1.0 (Working Draft)
-############################
+Zephyr 4.1.0
+############
 
 We are pleased to announce the release of Zephyr version 4.1.0.
-
 Major enhancements with this release include:
 
+**Performance improvements**
+  Multiple performance improvements of core Zephyr kernel functions have been implemented,
+  benefiting all supported hardware architectures.
+
+  An official port of the :zephyr_file:`thread_metric <tests/benchmarks/thread_metric>` RTOS
+  benchmark has also been added to make it easier for developers to measure the performance of
+  Zephyr on their hardware and compare it to other RTOSes.
+
+**Experimental support for IAR compiler**
+  :ref:`toolchain_iar_arm` can now be used to build Zephyr applications. This is an experimental
+  feature that is expected to be improved in future releases.
+
+**Initial support for Rust on Zephyr**
+  It is now possible to write Zephyr applications in Rust. :ref:`language_rust` is available through
+  an optional Zephyr module, and several code samples are available as a starting point.
+
+**USB MIDI Class Driver**
+  Introduction of a new :ref:`USB MIDI 2.0 <usbd_midi2>` device driver, allowing Zephyr devices to
+  communicate with MIDI controllers and instruments over USB.
+
+**Expanded Board Support**
+  Support for 70 :ref:`new boards <boards_added_in_zephyr_4_1>` and 11
+  :ref:`new shields <shields_added_in_zephyr_4_1>` has been added in this release.
+
+  This includes highly popular boards such as :zephyr:board:`rpi_pico2` and
+  :zephyr:board:`ch32v003evt`, several boards with CAN+USB capabilities making them good candidates
+  for running the Zephyr-based open source `CANnectivity`_ firmware, and dozens of other boards
+  across all supported architectures.
+
+.. _CANnectivity: https://cannectivity.org/
+
 An overview of the changes required or recommended when migrating your application from Zephyr
 v4.0.0 to Zephyr v4.1.0 can be found in the separate :ref:`migration guide<migration_4.1>`.
 
@@ -40,8 +70,18 @@ The following sections provide detailed lists of changes by component.
 
 Security Vulnerability Related
 ******************************
+
 The following CVEs are addressed by this release:
 
+* :cve:`2025-1673` `Zephyr project bug tracker GHSA-jjhx-rrh4-j8mx
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-jjhx-rrh4-j8mx>`_
+
+* :cve:`2025-1674` `Zephyr project bug tracker GHSA-x975-8pgf-qh66
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-x975-8pgf-qh66>`_
+
+* :cve:`2025-1675` `Zephyr project bug tracker GHSA-2m84-5hfw-m8v4
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-2m84-5hfw-m8v4>`_
+
 More detailed information can be found in:
 https://docs.zephyrproject.org/latest/security/vulnerabilities.html
 
@@ -87,6 +127,13 @@ Removed APIs and options
 
 * The ``z_pm_save_idle_exit()`` PM API function has been removed.
 
+* Struct ``z_arch_esf_t`` has been removed. Use ``struct arch_esf`` instead.
+
+* The following networking options have been removed:
+
+    * ``CONFIG_NET_PKT_BUF_DATA_POOL_SIZE``
+    * ``CONFIG_NET_TCP_ACK_TIMEOUT``
+
 
 Deprecated APIs and options
 ===========================
@@ -106,6 +153,26 @@ Deprecated APIs and options
   1. when Stream Flash is not configured to do erase on its own
   2. when erase is used for removal of a data prior or after Stream Flash uses the designated area.
 
+* The pipe API has been reworked.
+  The new API is enabled by default when ``CONFIG_MULTITHREADING`` is set.
+
+  * Deprecates the ``CONFIG_PIPES`` Kconfig option.
+  * Introduces the ``k_pipe_close(..)`` function.
+  * ``k_pipe_put(..)`` translates to ``k_pipe_write(..)``.
+  * ``k_pipe_get(..)`` translates to ``k_pipe_read(..)``.
+  * ``k_pipe_flush(..)`` & ``k_pipe_buffer_flush()`` can be translated to ``k_pipe_reset(..)``.
+
+  * Dynamic allocation of pipes is no longer supported.
+
+    - ``k_pipe_alloc_init(..)`` API has been removed.
+    - ``k_pipe_cleanup(..)`` API has been removed.
+
+  * Querying the number of bytes in the pipe is no longer supported.
+
+    - ``k_pipe_read_avail(..)`` API has been removed.
+    - ``k_pipe_write_avail(..)`` API has been removed.
+
+
 * For the native_sim target :kconfig:option:`CONFIG_NATIVE_SIM_NATIVE_POSIX_COMPAT` has been
   switched to ``n`` by default, and this option has been deprecated.
 
@@ -117,6 +184,11 @@ Deprecated APIs and options
 * The TinyCrypt library has been deprecated as the upstream version is no longer maintained.
   PSA Crypto API is now the recommended cryptographic library for Zephyr.
 
+* The :kconfig:option:`CONFIG_BT_DIS_MODEL` and :kconfig:option:`CONFIG_BT_DIS_MANUF` have been
+  deprecated. Application developers can achieve the same configuration by using the new
+  :kconfig:option:`CONFIG_BT_DIS_MODEL_NUMBER_STR` and
+  :kconfig:option:`CONFIG_BT_DIS_MANUF_NAME_STR` Kconfig options.
+
 New APIs and options
 ====================
 
@@ -133,6 +205,15 @@ New APIs and options
 
 * Bluetooth
 
+  * Audio
+
+    * :c:func:`bt_bap_broadcast_source_register_cb`
+    * :c:func:`bt_bap_broadcast_source_unregister_cb`
+    * :c:func:`bt_cap_commander_distribute_broadcast_code`
+    * ``bt_ccp`` API (in progress)
+    * :c:func:`bt_pacs_register`
+    * :c:func:`bt_pacs_unregister`
+
   * Host
 
     * :c:func:`bt_conn_is_type`
@@ -142,6 +223,16 @@ New APIs and options
     * :c:member:`bt_mesh_health_cli::update` callback can be used to periodically update the message
       published by the Health Client.
 
+  * Services
+
+    * The :kconfig:option:`CONFIG_BT_DIS_MODEL_NUMBER` and
+      :kconfig:option:`CONFIG_BT_DIS_MANUF_NAME` Kconfig options can be used to control the
+      presence of the Model Number String and Manufacturer Name String characteristics inside
+      the Device Information Service (DIS). The :kconfig:option:`CONFIG_BT_DIS_MODEL_NUMBER_STR`
+      and :kconfig:option:`CONFIG_BT_DIS_MANUF_NAME_STR` Kconfig options are now used to set the
+      string values in these characteristics. They replace the functionality of the deprecated
+      :kconfig:option:`CONFIG_BT_DIS_MODEL` and :kconfig:option:`CONFIG_BT_DIS_MANUF` Kconfigs.
+
 * Build system
 
   * Sysbuild
@@ -154,6 +245,14 @@ New APIs and options
   * :kconfig:option:`CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOTS`
   * :kconfig:option:`CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT`
 
+* I3C
+
+  * :kconfig:option:`CONFIG_I3C_TARGET_BUFFER_MODE`
+  * :kconfig:option:`CONFIG_I3C_RTIO`
+  * :c:func:`i3c_ibi_hj_response`
+  * :c:func:`i3c_ccc_do_getacccr`
+  * :c:func:`i3c_device_controller_handoff`
+
 * Management
 
   * hawkBit
@@ -168,6 +267,81 @@ New APIs and options
     * Image management :c:macro:`MGMT_EVT_OP_IMG_MGMT_DFU_CONFIRMED` now has image data field
       :c:struct:`img_mgmt_image_confirmed`.
 
+* MCUboot
+
+  * Signed hex files where an encryption key Kconfig is set now have the encrypted flag set in
+    the image header.
+
+* Networking:
+
+  * CoAP
+
+    * :c:func:`coap_client_cancel_request`
+
+  * DHCP
+
+    * :kconfig:option:`CONFIG_NET_DHCPV4_SERVER_OPTION_ROUTER`
+    * :kconfig:option:`CONFIG_NET_DHCPV4_OPTION_DNS_ADDRESS`
+    * :kconfig:option:`CONFIG_NET_DHCPV6_OPTION_DNS_ADDRESS`
+
+  * DNS
+
+    * :kconfig:option:`CONFIG_MDNS_RESPONDER_PROBE`
+
+  * Ethernet
+
+    * Allow user to specify protocol extensions when receiving data from Ethernet network.
+      This makes it possible to register a handler for Ethernet protocol type without changing
+      core Zephyr network code. :c:macro:`NET_L3_REGISTER`
+    * :kconfig:option:`CONFIG_NET_L2_ETHERNET_RESERVE_HEADER`
+
+  * HTTP
+
+    * Extended :c:macro:`HTTP_SERVICE_DEFINE` to allow to specify a default
+      fallback resource handler.
+    * :kconfig:option:`CONFIG_HTTP_SERVER_REPORT_FAILURE_REASON`
+    * :kconfig:option:`CONFIG_HTTP_SERVER_TLS_USE_ALPN`
+
+  * IPv4
+
+    * :kconfig:option:`CONFIG_NET_IPV4_PMTU`
+
+  * IPv6
+
+    * :kconfig:option:`CONFIG_NET_IPV6_PMTU`
+
+  * LwM2M
+
+    * :c:func:`lwm2m_pull_context_set_sockopt_callback`
+
+  * MQTT-SN
+
+    * Added Gateway Advertisement and Discovery support:
+
+      * :c:func:`mqtt_sn_add_gw`
+      * :c:func:`mqtt_sn_search`
+
+  * OpenThread
+
+    * :kconfig:option:`CONFIG_OPENTHREAD_WAKEUP_COORDINATOR`
+    * :kconfig:option:`CONFIG_OPENTHREAD_WAKEUP_END_DEVICE`
+    * :kconfig:option:`CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT`
+    * :kconfig:option:`CONFIG_OPENTHREAD_TCAT_MULTIRADIO_CAPABILITIES`
+
+  * Sockets
+
+    * Added support for new socket options:
+
+      * :c:macro:`IP_LOCAL_PORT_RANGE`
+      * :c:macro:`IP_MULTICAST_IF`
+      * :c:macro:`IPV6_MULTICAST_IF`
+      * :c:macro:`IP_MTU`
+      * :c:macro:`IPV6_MTU`
+
+  * Other
+
+    * :kconfig:option:`CONFIG_NET_STATISTICS_VIA_PROMETHEUS`
+
 * Video
 
   * :c:func:`video_set_stream()` driver API has replaced :c:func:`video_stream_start()` and
@@ -180,6 +354,8 @@ New APIs and options
   * :c:struct:`led_dt_spec`
   * :kconfig:option:`CONFIG_STEP_DIR_STEPPER`
 
+.. _boards_added_in_zephyr_4_1:
+
 New Boards
 **********
 ..
@@ -191,6 +367,7 @@ New Boards
 * Adafruit Industries, LLC
 
    * :zephyr:board:`adafruit_feather_m4_express` (``adafruit_feather_m4_express``)
+   * :zephyr:board:`adafruit_macropad_rp2040` (``adafruit_macropad_rp2040``)
    * :zephyr:board:`adafruit_qt_py_esp32s3` (``adafruit_qt_py_esp32s3``)
 
 * Advanced Micro Devices (AMD), Inc.
@@ -199,6 +376,10 @@ New Boards
 
 * Analog Devices, Inc.
 
+   * :zephyr:board:`ad_swiot1l_sl` (``ad_swiot1l_sl``)
+   * :zephyr:board:`max32650evkit` (``max32650evkit``)
+   * :zephyr:board:`max32650fthr` (``max32650fthr``)
+   * :zephyr:board:`max32660evsys` (``max32660evsys``)
    * :zephyr:board:`max78000evkit` (``max78000evkit``)
    * :zephyr:board:`max78000fthr` (``max78000fthr``)
    * :zephyr:board:`max78002evkit` (``max78002evkit``)
@@ -224,6 +405,10 @@ New Boards
 
    * :zephyr:board:`cy8ckit_062s2_ai` (``cy8ckit_062s2_ai``)
 
+* Khadas
+
+   * :zephyr:board:`khadas_edge2` (``khadas_edge2``)
+
 * Lilygo Shenzhen Xinyuan Electronic Technology Co., Ltd
 
    * :zephyr:board:`ttgo_t7v1_5` (``ttgo_t7v1_5``)
@@ -245,6 +430,9 @@ New Boards
 
 * NXP Semiconductors
 
+   * :zephyr:board:`frdm_mcxw72` (``frdm_mcxw72``)
+   * :zephyr:board:`imx91_evk` (``imx91_evk``)
+   * :zephyr:board:`mcxw72_evk` (``mcxw72_evk``)
    * :zephyr:board:`mimxrt700_evk` (``mimxrt700_evk``)
 
 * Nordic Semiconductor
@@ -256,10 +444,22 @@ New Boards
    * :zephyr:board:`octopus_io_board` (``octopus_io_board``)
    * :zephyr:board:`octopus_som` (``octopus_som``)
 
+* Panasonic Corporation
+
+   * :zephyr:board:`panb511evb` (``panb511evb``)
+
+* Peregrine Consultoria e Servicos
+
+   * :zephyr:board:`sam4l_wm400_cape` (``sam4l_wm400_cape``)
+
 * Qorvo, Inc.
 
    * :zephyr:board:`decawave_dwm3001cdk` (``decawave_dwm3001cdk``)
 
+* RAKwireless Technology Limited
+
+   * :zephyr:board:`rak3172` (``rak3172``)
+
 * Raspberry Pi Foundation
 
    * :zephyr:board:`rpi_pico2` (``rpi_pico2``)
@@ -270,6 +470,9 @@ New Boards
 
 * Renesas Electronics Corporation
 
+   * :zephyr:board:`ek_ra2l1` (``ek_ra2l1``)
+   * :zephyr:board:`ek_ra4l1` (``ek_ra4l1``)
+   * :zephyr:board:`ek_ra4m1` (``ek_ra4m1``)
    * :zephyr:board:`fpb_ra4e1` (``fpb_ra4e1``)
    * :zephyr:board:`rzg3s_smarc` (``rzg3s_smarc``)
    * :zephyr:board:`voice_ra4e1` (``voice_ra4e1``)
@@ -294,10 +497,15 @@ New Boards
 
 * Silicon Laboratories
 
+   * :zephyr:board:`siwx917_rb4338a` (``siwx917_rb4338a``)
    * :zephyr:board:`xg23_rb4210a` (``xg23_rb4210a``)
    * :zephyr:board:`xg24_ek2703a` (``xg24_ek2703a``)
    * :zephyr:board:`xg29_rb4412a` (``xg29_rb4412a``)
 
+* Texas Instruments
+
+   * :zephyr:board:`lp_em_cc2340r5` (``lp_em_cc2340r5``)
+
 * Toradex AG
 
    * :zephyr:board:`verdin_imx8mm` (``verdin_imx8mm``)
@@ -309,6 +517,7 @@ New Boards
 * WeAct Studio
 
    * :zephyr:board:`mini_stm32h7b0` (``mini_stm32h7b0``)
+   * :zephyr:board:`weact_stm32h5_core` (``weact_stm32h5_core``)
 
 * WinChipHead
 
@@ -319,7 +528,7 @@ New Boards
    * :zephyr:board:`we_oceanus1ev` (``we_oceanus1ev``)
    * :zephyr:board:`we_orthosie1ev` (``we_orthosie1ev``)
 
-* others
+* Others
 
    * :zephyr:board:`canbardo` (``canbardo``)
    * :zephyr:board:`candlelight` (``candlelight``)
@@ -327,6 +536,23 @@ New Boards
    * :zephyr:board:`esp32c3_supermini` (``esp32c3_supermini``)
    * :zephyr:board:`promicro_nrf52840` (``promicro_nrf52840``)
 
+.. _shields_added_in_zephyr_4_1:
+
+New shields
+============
+
+  * :ref:`Abrobot ESP32 C3 OLED Shield <abrobot_esp32c3oled_shield>`
+  * :ref:`Adafruit Adalogger Featherwing Shield <adafruit_adalogger_featherwing_shield>`
+  * :ref:`Adafruit AW9523 GPIO Expander and LED Driver <adafruit_aw9523>`
+  * :ref:`MikroElektronika ETH 3 Click <mikroe_eth3_click>`
+  * :ref:`P3T1755DP Arduino® Shield Evaluation Board <p3t1755dp_ard_i2c_shield>`
+  * :ref:`P3T1755DP Arduino® Shield Evaluation Board <p3t1755dp_ard_i3c_shield>`
+  * :ref:`Digilent Pmod SD <pmod_sd>`
+  * :ref:`Renesas DA14531 Pmod Board <renesas_us159_da14531evz_shield>`
+  * :ref:`RTKMIPILCDB00000BE MIPI Display <rtkmipilcdb00000be>`
+  * :ref:`Seeed W5500 Ethernet Shield <seeed_w5500>`
+  * :ref:`ST B-CAMS-OMV-MB1683 <st_b_cams_omv_mb1683>`
+
 New Drivers
 ***********
 ..
@@ -336,22 +562,34 @@ New Drivers
 * :abbr:`ADC (Analog to Digital Converter)`
 
    * :dtcompatible:`adi,ad4114-adc`
-   * :dtcompatible:`ti,ads131m02`
-   * :dtcompatible:`ti,tla2022`
-   * :dtcompatible:`ti,tla2024`
+   * :dtcompatible:`adi,ad7124-adc`
+   * :dtcompatible:`st,stm32n6-adc`
    * :dtcompatible:`ti,ads114s06`
    * :dtcompatible:`ti,ads124s06`
    * :dtcompatible:`ti,ads124s08`
+   * :dtcompatible:`ti,ads131m02`
+   * :dtcompatible:`ti,tla2022`
+   * :dtcompatible:`ti,tla2024`
 
 * ARM architecture
 
    * :dtcompatible:`nxp,nbu`
 
+* Audio
+
+   * :dtcompatible:`cirrus,cs43l22`
+   * :dtcompatible:`intel,adsp-mic-privacy`
+
 * Bluetooth
 
    * :dtcompatible:`renesas,bt-hci-da1453x`
+   * :dtcompatible:`silabs,siwx91x-bt-hci`
    * :dtcompatible:`st,hci-stm32wb0`
 
+* Charger
+
+   * :dtcompatible:`nxp,pf1550-charger`
+
 * Clock control
 
    * :dtcompatible:`atmel,sam0-gclk`
@@ -360,14 +598,25 @@ New Drivers
    * :dtcompatible:`nordic,nrf-hsfll-global`
    * :dtcompatible:`nuvoton,npcm-pcc`
    * :dtcompatible:`realtek,rts5912-sccon`
+   * :dtcompatible:`renesas,rz-cpg`
+   * :dtcompatible:`st,stm32n6-cpu-clock-mux`
+   * :dtcompatible:`st,stm32n6-hse-clock`
+   * :dtcompatible:`st,stm32n6-ic-clock-mux`
+   * :dtcompatible:`st,stm32n6-pll-clock`
+   * :dtcompatible:`st,stm32n6-rcc`
    * :dtcompatible:`wch,ch32v00x-hse-clock`
    * :dtcompatible:`wch,ch32v00x-hsi-clock`
    * :dtcompatible:`wch,ch32v00x-pll-clock`
    * :dtcompatible:`wch,rcc`
 
+* Comparator
+
+   * :dtcompatible:`silabs,acmp`
+
 * Counter
 
    * :dtcompatible:`adi,max32-rtc-counter`
+   * :dtcompatible:`renesas,rz-gtm-counter`
 
 * CPU
 
@@ -376,10 +625,13 @@ New Drivers
 * :abbr:`DAC (Digital to Analog Converter)`
 
    * :dtcompatible:`adi,max22017-dac`
+   * :dtcompatible:`renesas,ra-dac`
+   * :dtcompatible:`renesas,ra-dac-global`
 
 * :abbr:`DAI (Digital Audio Interface)`
 
    * :dtcompatible:`mediatek,afe`
+   * :dtcompatible:`nxp,dai-micfil`
 
 * Display
 
@@ -392,9 +644,18 @@ New Drivers
    * :dtcompatible:`infineon,cat1-dma`
    * :dtcompatible:`nxp,sdma`
    * :dtcompatible:`silabs,ldma`
+   * :dtcompatible:`silabs,siwx91x-dma`
    * :dtcompatible:`xlnx,axi-dma-1.00.a`
    * :dtcompatible:`xlnx,eth-dma`
 
+* :abbr:`DSA (Distributed Switch Architecture)`
+
+   * :dtcompatible:`nxp,netc-switch`
+
+* :abbr:`EEPROM (Electrically Erasable Programmable Read-Only Memory)`
+
+  *  :dtcompatible:`fujitsu,mb85rsxx`
+
 * Ethernet
 
    * :dtcompatible:`davicom,dm8806-phy`
@@ -402,11 +663,17 @@ New Drivers
    * :dtcompatible:`microchip,t1s-phy`
    * :dtcompatible:`microchip,vsc8541`
    * :dtcompatible:`renesas,ra-ethernet`
+   * :dtcompatible:`sensry,sy1xx-mac`
 
 * Firmware
 
    * :dtcompatible:`arm,scmi-power`
 
+* Flash controller
+
+   * :dtcompatible:`silabs,siwx91x-flash-controller`
+   * :dtcompatible:`ti,cc23x0-flash-controller`
+
 * :abbr:`FPGA (Field Programmable Gate Array)`
 
    * :dtcompatible:`lattice,ice40-fpga-base`
@@ -420,14 +687,20 @@ New Drivers
    * :dtcompatible:`ite,it8801-gpio`
    * :dtcompatible:`microchip,mec5-gpio`
    * :dtcompatible:`nordic,npm2100-gpio`
+   * :dtcompatible:`nxp,pca6416`
    * :dtcompatible:`raspberrypi,rp1-gpio`
    * :dtcompatible:`realtek,rts5912-gpio`
    * :dtcompatible:`renesas,ra-gpio-mipi-header`
    * :dtcompatible:`renesas,rz-gpio`
    * :dtcompatible:`renesas,rz-gpio-int`
    * :dtcompatible:`sensry,sy1xx-gpio`
+   * :dtcompatible:`silabs,siwx91x-gpio`
+   * :dtcompatible:`silabs,siwx91x-gpio-port`
+   * :dtcompatible:`silabs,siwx91x-gpio-uulp`
+   * :dtcompatible:`st,dcmi-camera-fpu-330zh`
    * :dtcompatible:`st,mfxstm32l152`
    * :dtcompatible:`stemma-qt-connector`
+   * :dtcompatible:`ti,cc23x0-gpio`
    * :dtcompatible:`wch,gpio`
 
 * IEEE 802.15.4 HDLC RCP interface
@@ -437,22 +710,30 @@ New Drivers
 
 * :abbr:`I2C (Inter-Integrated Circuit)`
 
+   * :dtcompatible:`nordic,nrf-twis`
    * :dtcompatible:`nxp,ii2c`
    * :dtcompatible:`ti,omap-i2c`
    * :dtcompatible:`ti,tca9544a`
 
 * :abbr:`I3C (Improved Inter-Integrated Circuit)`
 
+   * :dtcompatible:`snps,designware-i3c`
    * :dtcompatible:`st,stm32-i3c`
 
+* IEEE 802.15.4
+
+   * :dtcompatible:`nxp,mcxw-ieee802154`
+
 * Input
 
+   * :dtcompatible:`cypress,cy8cmbr3xxx`
    * :dtcompatible:`ite,it8801-kbd`
    * :dtcompatible:`microchip,cap12xx`
    * :dtcompatible:`nintendo,nunchuk`
 
 * Interrupt controller
 
+   * :dtcompatible:`renesas,rz-ext-irq`
    * :dtcompatible:`wch,pfic`
 
 * Mailbox
@@ -464,6 +745,7 @@ New Drivers
 
    * :dtcompatible:`microchip,lan865x-mdio`
    * :dtcompatible:`renesas,ra-mdio`
+   * :dtcompatible:`sensry,sy1xx-mdio`
 
 * Memory controller
 
@@ -478,6 +760,7 @@ New Drivers
    * :dtcompatible:`ite,it8801-mfd-map`
    * :dtcompatible:`maxim,ds3231-mfd`
    * :dtcompatible:`nordic,npm2100`
+   * :dtcompatible:`nxp,pf1550`
 
 * :abbr:`MIPI DSI (Mobile Industry Processor Interface Display Serial Interface)`
 
@@ -495,9 +778,13 @@ New Drivers
 
 * :abbr:`MTD (Memory Technology Device)`
 
-   * :dtcompatible:`fujitsu,mb85rsxx`
    * :dtcompatible:`nxp,s32-qspi-hyperflash`
    * :dtcompatible:`nxp,xspi-mx25um51345g`
+   * :dtcompatible:`ti,cc23x0-ccfg-flash`
+
+* Networking
+
+   * :dtcompatible:`silabs,series2-radio`
 
 * :abbr:`PCIe (Peripheral Component Interconnect Express)`
 
@@ -514,12 +801,15 @@ New Drivers
    * :dtcompatible:`renesas,rzg-pinctrl`
    * :dtcompatible:`sensry,sy1xx-pinctrl`
    * :dtcompatible:`silabs,dbus-pinctrl`
+   * :dtcompatible:`silabs,siwx91x-pinctrl`
+   * :dtcompatible:`ti,cc23x0-pinctrl`
    * :dtcompatible:`wch,afio`
 
 * :abbr:`PWM (Pulse Width Modulation)`
 
    * :dtcompatible:`atmel,sam0-tc-pwm`
    * :dtcompatible:`ite,it8801-pwm`
+   * :dtcompatible:`renesas,rz-gpt-pwm`
    * :dtcompatible:`zephyr,fake-pwm`
 
 * Quad SPI
@@ -530,20 +820,27 @@ New Drivers
 * Regulator
 
    * :dtcompatible:`nordic,npm2100-regulator`
+   * :dtcompatible:`nxp,pf1550-regulator`
 
 * :abbr:`RNG (Random Number Generator)`
 
    * :dtcompatible:`nordic,nrf-cracen-ctrdrbg`
+   * :dtcompatible:`nxp,ele-trng`
    * :dtcompatible:`renesas,ra-sce5-rng`
    * :dtcompatible:`renesas,ra-sce7-rng`
    * :dtcompatible:`renesas,ra-sce9-rng`
    * :dtcompatible:`renesas,ra-trng`
+   * :dtcompatible:`sensry,sy1xx-trng`
+   * :dtcompatible:`silabs,siwx91x-rng`
    * :dtcompatible:`st,stm32-rng-noirq`
 
 * :abbr:`RTC (Real Time Clock)`
 
+   * :dtcompatible:`epson,rx8130ce-rtc`
+   * :dtcompatible:`maxim,ds1337`
    * :dtcompatible:`maxim,ds3231-rtc`
    * :dtcompatible:`microcrystal,rv8803`
+   * :dtcompatible:`ti,bq32002`
 
 * SDHC
 
@@ -553,11 +850,13 @@ New Drivers
 
    * :dtcompatible:`adi,adxl366`
    * :dtcompatible:`hc-sr04`
+   * :dtcompatible:`invensense,icm42370p`
    * :dtcompatible:`invensense,icm42670s`
-   * :dtcompatible:`invensense,icm42370`
+   * :dtcompatible:`invensense,icp101xx`
    * :dtcompatible:`maxim,ds3231-sensor`
    * :dtcompatible:`melexis,mlx90394`
    * :dtcompatible:`nordic,npm2100-vbat`
+   * :dtcompatible:`phosense,xbr818`
    * :dtcompatible:`renesas,hs400x`
    * :dtcompatible:`sensirion,scd40`
    * :dtcompatible:`sensirion,scd41`
@@ -577,11 +876,13 @@ New Drivers
    * :dtcompatible:`renesas,rz-scif-uart`
    * :dtcompatible:`silabs,eusart-uart`
    * :dtcompatible:`silabs,usart-uart`
+   * :dtcompatible:`ti,cc23x0-uart`
    * :dtcompatible:`wch,usart`
 
 * :abbr:`SPI (Serial Peripheral Interface)`
 
    * :dtcompatible:`ite,it8xxx2-spi`
+   * :dtcompatible:`nxp,lpspi`
    * :dtcompatible:`nxp,xspi`
    * :dtcompatible:`renesas,ra-spi`
 
@@ -599,14 +900,19 @@ New Drivers
    * :dtcompatible:`mediatek,ostimer64`
    * :dtcompatible:`realtek,rts5912-rtmr`
    * :dtcompatible:`realtek,rts5912-slwtimer`
+   * :dtcompatible:`renesas,rz-gpt`
+   * :dtcompatible:`renesas,rz-gtm`
    * :dtcompatible:`riscv,machine-timer`
+   * :dtcompatible:`ti,cc23x0-systim-timer`
    * :dtcompatible:`wch,systick`
 
 * USB
 
    * :dtcompatible:`ambiq,usb`
    * :dtcompatible:`renesas,ra-udc`
-   * :dtcompatible:`renesas,ra-usb`
+   * :dtcompatible:`renesas,ra-usbfs`
+   * :dtcompatible:`renesas,ra-usbhs`
+   * :dtcompatible:`zephyr,midi2-device`
 
 * Video
 
@@ -622,6 +928,7 @@ New Drivers
 * Wi-Fi
 
    * :dtcompatible:`infineon,airoc-wifi`
+   * :dtcompatible:`silabs,siwx91x-wifi`
 
 New Samples
 ***********
@@ -635,6 +942,7 @@ New Samples
 * :zephyr:code-sample:`bluetooth_ccp_call_control_client`
 * :zephyr:code-sample:`bluetooth_ccp_call_control_server`
 * :zephyr:code-sample:`coresight_stm_sample`
+* :zephyr:code-sample:`dfu-next`
 * :zephyr:code-sample:`i2c-rtio-loopback`
 * :zephyr:code-sample:`lvgl-screen-transparency`
 * :zephyr:code-sample:`mctp_endpoint_sample`
@@ -646,7 +954,10 @@ New Samples
 * :zephyr:code-sample:`sensor_clock`
 * :zephyr:code-sample:`stream_fifo`
 * :zephyr:code-sample:`tdk_apex`
+* :zephyr:code-sample:`tmc50xx`
 * :zephyr:code-sample:`uart`
+* :zephyr:code-sample:`usb-midi2-device`
+* :zephyr:code-sample:`usbd-cdc-acm-console`
 * :zephyr:code-sample:`webusb-next`
 
 Other notable changes
@@ -656,6 +967,11 @@ Other notable changes
   Any more descriptive subsystem or driver changes. Do you really want to write
   a paragraph or is it enough to link to the api/driver/Kconfig/board page above?
 
+* A header file has been introduced to allocate ID ranges for persistent keys in the PSA Crypto API.
+  It defines the ID ranges allocated to different users of the API (application, subsystems...).
+  Users of the API must now use this header file to construct persistent key IDs.
+  See :zephyr_file:`include/zephyr/psa/key_ids.h` for more information. (:github:`85581`)
+
 * Space-separated lists support has been removed from Twister configuration
   files. This feature was deprecated a long time ago. Projects that do still use
   them can use the :zephyr_file:`scripts/utils/twister_to_list.py` script to
@@ -668,3 +984,16 @@ Other notable changes
 
 * The ``--no-detailed-test-id`` command line option can be used to shorten the test case name
   by excluding the test scenario name prefix which is the same as the parent test suite id.
+
+* Added support for HTTP PUT/PATCH/DELETE methods for HTTP server dynamic resources.
+
+* Driver API structures are now available through iterable sections and a new
+  :c:macro:`DEVICE_API_IS` macro has been introduced to allow to check if a device supports a
+  given API. Many shell commands now use this to provide "smarter" auto-completion and only list
+  compatible devices when they expect a device argument.
+
+* Zephyr's :ref:`interactive board catalog <boards>` has been extended to allow searching for boards
+  based on supported hardware features. A new :rst:dir:`zephyr:board-supported-hw` Sphinx directive
+  can now be used in boards' documentation pages to automatically include a list of the hardware
+  features supported by a board, and many boards have already adopted this new feature in their
+  documentation.
diff --git a/doc/releases/release-notes-4.2.rst b/doc/releases/release-notes-4.2.rst
new file mode 100644
index 0000000000000..6aed4f0820dc9
--- /dev/null
+++ b/doc/releases/release-notes-4.2.rst
@@ -0,0 +1,564 @@
+:orphan:
+
+..
+  What goes here: removed/deprecated apis, new boards, new drivers, notable
+  features. If you feel like something new can be useful to a user, put it
+  under "Other Enhancements" in the first paragraph, if you feel like something
+  is worth mentioning in the project media (release blog post, release
+  livestream) put it under "Major enhancement".
+..
+  If you are describing a feature or functionality, consider adding it to the
+  actual project documentation rather than the release notes, so that the
+  information does not get lost in time.
+..
+  No list of bugfixes, minor changes, those are already in the git log, this is
+  not a changelog.
+..
+  Does the entry have a link that contains the details? Just add the link, if
+  you think it needs more details, put them in the content that shows up on the
+  link.
+..
+  Are you thinking about generating this? Don't put anything at all.
+..
+  Does the thing require the user to change their application? Put it on the
+  migration guide instead. (TODO: move the removed APIs section in the
+  migration guide)
+
+.. _zephyr_4.2:
+
+Zephyr 4.2.0 (Working Draft)
+############################
+
+We are pleased to announce the release of Zephyr version 4.2.0.
+
+Major enhancements with this release include:
+
+An overview of the changes required or recommended when migrating your application from Zephyr
+v4.1.0 to Zephyr v4.2.0 can be found in the separate :ref:`migration guide<migration_4.2>`.
+
+The following sections provide detailed lists of changes by component.
+
+Security Vulnerability Related
+******************************
+
+The following CVEs are addressed by this release:
+
+* :cve:`2025-27809` `TLS clients may unwittingly skip server authentication
+  <https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2025-03-1/>`_
+* :cve:`2025-27810` `Potential authentication bypass in TLS handshake
+  <https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2025-03-2/>`_
+
+More detailed information can be found in:
+https://docs.zephyrproject.org/latest/security/vulnerabilities.html
+
+API Changes
+***********
+
+Removed APIs and options
+========================
+
+* Removed the deprecated the ``net_buf_put()`` and ``net_buf_get()`` API functions.
+
+* Removed the deprecated ``include/zephyr/net/buf.h`` header file.
+
+* Removed the ``--disable-unrecognized-section-test`` Twister option. Test has been removed and the
+  option became the default behavior.
+
+* Removed the deprecated ``kscan`` subsystem.
+
+* Removed :dtcompatible:`meas,ms5837` and replaced with :dtcompatible:`meas,ms5837-30ba`
+  and :dtcompatible:`meas,ms5837-02ba`.
+
+Deprecated APIs and options
+===========================
+
+* The scheduler Kconfig options CONFIG_SCHED_DUMB and CONFIG_WAITQ_DUMB were
+  renamed and deprecated. Use :kconfig:option:`CONFIG_SCHED_SIMPLE` and
+  :kconfig:option:`CONFIG_WAITQ_SIMPLE` instead.
+
+* The :kconfig:option:`CONFIG_LWM2M_ENGINE_MESSAGE_HEADER_SIZE` Kconfig option has been removed.
+  The required header size should be included in the message size, configured using
+  :kconfig:option:`CONFIG_LWM2M_COAP_MAX_MSG_SIZE`. Special care should be taken to ensure that
+  used CoAP block size :kconfig:option:`CONFIG_LWM2M_COAP_BLOCK_SIZE` can fit given message size
+  with headers. Previous headroom was 48 bytes.
+
+* TLS credential type ``TLS_CREDENTIAL_SERVER_CERTIFICATE`` was renamed and
+  deprecated, use :c:enumerator:`TLS_CREDENTIAL_PUBLIC_CERTIFICATE` instead.
+
+* ``arduino_uno_r4_minima`` and ``arduino_uno_r4_wifi`` board targets have been deprecated in favor
+  of a new ``arduino_uno_r4`` board with revisions (``arduino_uno_r4@minima`` and
+  ``arduino_uno_r4@wifi``).
+
+* ``esp32c6_devkitc`` board target has been deprecated and renamed to
+  ``esp32c6_devkitc/esp32c6/hpcore``.
+
+* ``xiao_esp32c6`` board target has been deprecated and renamed to
+  ``xiao_esp32c6/esp32c6/hpcore``.
+
+New APIs and options
+====================
+
+* Kernel
+
+ * :c:macro:`K_TIMEOUT_ABS_SEC`
+
+* I2C
+
+  * :c:func:`i2c_configure_dt`.
+
+..
+  Link to new APIs here, in a group if you think it's necessary, no need to get
+  fancy just list the link, that should contain the documentation. If you feel
+  like you need to add more details, add them in the API documentation code
+  instead.
+
+* Bluetooth
+
+  * Audio
+
+    * :c:macro:`BT_BAP_ADV_PARAM_CONN_QUICK`
+    * :c:macro:`BT_BAP_ADV_PARAM_CONN_REDUCED`
+    * :c:macro:`BT_BAP_CONN_PARAM_SHORT_7_5`
+    * :c:macro:`BT_BAP_CONN_PARAM_SHORT_10`
+    * :c:macro:`BT_BAP_CONN_PARAM_RELAXED`
+    * :c:macro:`BT_BAP_ADV_PARAM_BROADCAST_FAST`
+    * :c:macro:`BT_BAP_ADV_PARAM_BROADCAST_SLOW`
+    * :c:macro:`BT_BAP_PER_ADV_PARAM_BROADCAST_FAST`
+    * :c:macro:`BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW`
+    * :c:func:`bt_csip_set_member_set_size_and_rank`
+    * :c:func:`bt_csip_set_member_get_info`
+
+  * Host
+
+    * :c:func:`bt_le_get_local_features`
+    * :c:func:`bt_le_bond_exists`
+    * :c:func:`bt_br_bond_exists`
+    * :c:func:`bt_conn_lookup_addr_br`
+    * :c:func:`bt_conn_get_dst_br`
+    * LE Connection Subrating is no longer experimental.
+    * Remove deletion of the classic bonding information from :c:func:`bt_unpair`, and add
+      :c:func:`bt_br_unpair`.
+    * Remove query of the classic bonding information from :c:func:`bt_foreach_bond`, and add
+      :c:func:`bt_br_foreach_bond`.
+
+* Display
+
+  * :c:func:`display_clear`
+
+* Networking:
+
+  * IPv4
+
+    * :kconfig:option:`CONFIG_NET_IPV4_MTU`
+
+  * MQTT
+
+    * :kconfig:option:`CONFIG_MQTT_VERSION_5_0`
+
+  * Sockets
+
+    * :kconfig:option:`CONFIG_NET_SOCKETS_INET_RAW`
+
+* Stepper
+
+  * :c:func:`stepper_stop()`
+
+* Storage
+
+  * :c:func:`flash_area_copy()`
+
+* Counter
+
+  * :c:func:`counter_reset`
+
+* Sys
+
+  * :c:func:`util_eq`
+  * :c:func:`util_memeq`
+
+* LoRaWAN
+   * :c:func:`lorawan_request_link_check`
+
+New Boards
+**********
+
+..
+  You may update this list as you contribute a new board during the release cycle, in order to make
+  it visible to people who might be looking at the working draft of the release notes. However, note
+  that this list will be recomputed at the time of the release, so you don't *have* to update it.
+  In any case, just link the board, further details go in the board description.
+
+* Adafruit Industries, LLC
+
+   * :zephyr:board:`adafruit_feather_esp32s2` (``adafruit_feather_esp32s2``)
+   * :zephyr:board:`adafruit_feather_esp32s2_tft` (``adafruit_feather_esp32s2_tft``)
+   * :zephyr:board:`adafruit_feather_esp32s2_tft_reverse` (``adafruit_feather_esp32s2_tft_reverse``)
+   * :zephyr:board:`adafruit_feather_esp32s3` (``adafruit_feather_esp32s3``)
+   * :zephyr:board:`adafruit_feather_esp32s3_tft` (``adafruit_feather_esp32s3_tft``)
+
+* Advanced Micro Devices (AMD), Inc.
+
+   * :zephyr:board:`versalnet_rpu` (``versalnet_rpu``)
+
+* Blues Wireless
+
+   * :zephyr:board:`cygnet` (``cygnet``)
+
+* FANKE Technology Co., Ltd.
+
+   * :zephyr:board:`fk743m5_xih6` (``fk743m5_xih6``)
+
+* IAR Systems AB
+
+   * :zephyr:board:`stm32f429ii_aca` (``stm32f429ii_aca``)
+
+* Intel Corporation
+
+   * :zephyr:board:`intel_btl_s_crb` (``intel_btl_s_crb``)
+
+* ITE Tech. Inc.
+
+   * :zephyr:board:`it515xx_evb` (``it515xx_evb``)
+
+* KWS Computersysteme Gmbh
+
+   * :zephyr:board:`pico2_spe` (``pico2_spe``)
+   * :zephyr:board:`pico_spe` (``pico_spe``)
+
+* Lilygo Shenzhen Xinyuan Electronic Technology Co., Ltd
+
+   * :zephyr:board:`tdongle_s3` (``tdongle_s3``)
+   * :zephyr:board:`ttgo_tbeam` (``ttgo_tbeam``)
+   * :zephyr:board:`ttgo_toiplus` (``ttgo_toiplus``)
+   * :zephyr:board:`twatch_s3` (``twatch_s3``)
+
+* Nuvoton Technology Corporation
+
+   * :zephyr:board:`numaker_m55m1` (``numaker_m55m1``)
+
+* NXP Semiconductors
+
+   * :zephyr:board:`frdm_mcxa166` (``frdm_mcxa166``)
+   * :zephyr:board:`frdm_mcxa276` (``frdm_mcxa276``)
+
+* Octavo Systems LLC
+
+   * :zephyr:board:`osd32mp1_brk` (``osd32mp1_brk``)
+
+* OpenHW Group
+
+   * :zephyr:board:`cv32a6_genesys_2` (``cv32a6_genesys_2``)
+   * :zephyr:board:`cv64a6_genesys_2` (``cv64a6_genesys_2``)
+
+* Pimoroni Ltd.
+
+   * :zephyr:board:`pico_plus2` (``pico_plus2``)
+
+* Renesas Electronics Corporation
+
+   * :zephyr:board:`rza3ul_smarc` (``rza3ul_smarc``)
+   * :zephyr:board:`rzg2l_smarc` (``rzg2l_smarc``)
+   * :zephyr:board:`rzn2l_rsk` (``rzn2l_rsk``)
+   * :zephyr:board:`rzt2l_rsk` (``rzt2l_rsk``)
+   * :zephyr:board:`rzt2m_rsk` (``rzt2m_rsk``)
+   * :zephyr:board:`rzv2l_smarc` (``rzv2l_smarc``)
+
+* Seeed Technology Co., Ltd
+
+   * :zephyr:board:`xiao_mg24` (``xiao_mg24``)
+   * :zephyr:board:`xiao_ra4m1` (``xiao_ra4m1``)
+
+* sensry.io
+
+   * :zephyr:board:`ganymed_sk` (``ganymed_sk``)
+
+* Silicon Laboratories
+
+   * :zephyr:board:`slwrb4180b` (``slwrb4180b``)
+
+* STMicroelectronics
+
+   * :zephyr:board:`nucleo_f439zi` (``nucleo_f439zi``)
+   * :zephyr:board:`stm32h757i_eval` (``stm32h757i_eval``)
+   * :zephyr:board:`stm32mp135f_dk` (``stm32mp135f_dk``)
+
+* Texas Instruments
+
+   * :zephyr:board:`sk_am64` (``sk_am64``)
+
+* WinChipHead
+
+   * :zephyr:board:`ch32v003f4p6_dev_board` (``ch32v003f4p6_dev_board``)
+   * :zephyr:board:`linkw` (``linkw``)
+
+* WIZnet Co., Ltd.
+
+   * :zephyr:board:`w5500_evb_pico2` (``w5500_evb_pico2``)
+
+* Würth Elektronik GmbH.
+
+   * :zephyr:board:`ophelia4ev` (``ophelia4ev``)
+
+New Drivers
+***********
+
+..
+  Same as above for boards, this will also be recomputed at the time of the release.
+  Just link the driver, further details go in the binding description
+
+* :abbr:`ADC (Analog to Digital Converter)`
+
+   * :dtcompatible:`adi,ad4050-adc`
+   * :dtcompatible:`adi,ad4052-adc`
+   * :dtcompatible:`adi,ad4130-adc`
+   * :dtcompatible:`renesas,rz-adc`
+
+* Audio
+
+   * :dtcompatible:`ti,tlv320aic3110`
+
+* Charger
+
+   * :dtcompatible:`ti,bq25713`
+
+* Clock control
+
+   * :dtcompatible:`ite,it51xxx-ecpm`
+   * :dtcompatible:`nordic,nrfs-audiopll`
+   * :dtcompatible:`st,stm32mp13-cpu-clock-mux`
+   * :dtcompatible:`st,stm32mp13-pll-clock`
+   * :dtcompatible:`wch,ch32v20x_30x-pll-clock`
+
+* Comparator
+
+   * :dtcompatible:`renesas,ra-acmphs`
+   * :dtcompatible:`renesas,ra-acmphs-global`
+
+* Counter
+
+   * :dtcompatible:`ite,it8xxx2-counter`
+   * :dtcompatible:`zephyr,native-sim-counter`
+
+* CPU
+
+   * :dtcompatible:`intel,bartlett-lake`
+   * :dtcompatible:`wch,qingke-v4c`
+   * :dtcompatible:`zephyr,native-sim-cpu`
+
+* Cryptographic accelerator
+
+   * :dtcompatible:`ti,cc23x0-aes`
+
+* :abbr:`DAC (Digital to Analog Converter)`
+
+   * :dtcompatible:`ti,dac161s997`
+
+* Display
+
+   * :dtcompatible:`sitronix,st7567`
+   * :dtcompatible:`sitronix,st7701`
+
+* :abbr:`DMA (Direct Memory Access)`
+
+   * :dtcompatible:`renesas,rz-dma`
+   * :dtcompatible:`ti,cc23x0-dma`
+   * :dtcompatible:`wch,wch-dma`
+
+* Ethernet
+
+   * :dtcompatible:`st,stm32-ethernet-controller`
+   * :dtcompatible:`st,stm32n6-ethernet`
+   * :dtcompatible:`ti,dp83867`
+   * :dtcompatible:`xlnx,axi-ethernet-1.00.a`
+
+* Flash controller
+
+   * :dtcompatible:`silabs,series2-flash-controller`
+
+* File system
+
+   * :dtcompatible:`zephyr,fstab,fatfs`
+
+* :abbr:`GPIO (General Purpose Input/Output)` and Headers
+
+   * :dtcompatible:`adi,max14915-gpio`
+   * :dtcompatible:`adi,max14917-gpio`
+   * :dtcompatible:`adi,max22199-gpio`
+   * :dtcompatible:`ite,it51xxx-gpio`
+   * :dtcompatible:`nxp,lcd-pmod`
+   * :dtcompatible:`raspberrypi,pico-gpio-port`
+   * :dtcompatible:`renesas,ra-parallel-graphics-header`
+
+* :abbr:`I2C (Inter-Integrated Circuit)`
+
+   * :dtcompatible:`cdns,i2c`
+   * :dtcompatible:`litex,litei2c`
+   * :dtcompatible:`renesas,ra-i2c-sci-b`
+   * :dtcompatible:`renesas,rz-riic`
+   * :dtcompatible:`sensry,sy1xx-i2c`
+
+* Input
+
+   * :dtcompatible:`realtek,rts5912-kbd`
+   * :dtcompatible:`st,stm32-tsc`
+   * :dtcompatible:`tsc-keys`
+
+* Interrupt controller
+
+   * :dtcompatible:`ite,it51xxx-intc`
+   * :dtcompatible:`ite,it51xxx-wuc`
+   * :dtcompatible:`ite,it51xxx-wuc-map`
+
+* Mailbox
+
+   * :dtcompatible:`arm,mhuv3`
+   * :dtcompatible:`renesas,rz-mhu-mbox`
+
+* :abbr:`MDIO (Management Data Input/Output)`
+
+   * :dtcompatible:`xlnx,axi-ethernet-1.00.a-mdio`
+
+* Memory controller
+
+   * :dtcompatible:`realtek,rts5912-bbram`
+   * :dtcompatible:`st,stm32-xspi-psram`
+
+* :abbr:`MFD (Multi-Function Device)`
+
+   * :dtcompatible:`adi,maxq10xx`
+   * :dtcompatible:`ambiq,iom`
+   * :dtcompatible:`x-powers,axp2101`
+
+* Miscellaneous
+
+   * :dtcompatible:`nordic,nrf-mpc`
+   * :dtcompatible:`renesas,ra-ulpt`
+   * :dtcompatible:`renesas,rz-sci`
+
+* Multi-bit SPI
+
+   * :dtcompatible:`snps,designware-ssi`
+
+* :abbr:`MTD (Memory Technology Device)`
+
+   * :dtcompatible:`jedec,mspi-nor`
+
+* Networking
+
+   * :dtcompatible:`nordic,nrf-nfct-v2`
+
+* Pin control
+
+   * :dtcompatible:`arm,mps2-pinctrl`
+   * :dtcompatible:`arm,mps3-pinctrl`
+   * :dtcompatible:`arm,v2m_beetle-pinctrl`
+   * :dtcompatible:`renesas,rza-pinctrl`
+   * :dtcompatible:`renesas,rzn-pinctrl`
+   * :dtcompatible:`renesas,rzt-pinctrl`
+   * :dtcompatible:`renesas,rzv-pinctrl`
+   * :dtcompatible:`wch,20x_30x-afio`
+
+* :abbr:`PWM (Pulse Width Modulation)`
+
+   * :dtcompatible:`arduino-header-pwm`
+   * :dtcompatible:`silabs,siwx91x-pwm`
+
+* Regulator
+
+   * :dtcompatible:`x-powers,axp2101-regulator`
+
+* Reset controller
+
+   * :dtcompatible:`reset-mmio`
+
+* :abbr:`RNG (Random Number Generator)`
+
+   * :dtcompatible:`adi,maxq10xx-trng`
+   * :dtcompatible:`zephyr,native-sim-rng`
+
+* :abbr:`RTC (Real Time Clock)`
+
+   * :dtcompatible:`nxp,pcf2123`
+   * :dtcompatible:`realtek,rts5912-rtc`
+
+* SDHC
+
+   * :dtcompatible:`ambiq,sdio`
+
+* Sensors
+
+   * :dtcompatible:`bosch,bmm350`
+   * :dtcompatible:`everlight,als-pt19`
+   * :dtcompatible:`invensense,icm45686`
+   * :dtcompatible:`invensense,icp201xx`
+   * :dtcompatible:`liteon,ltr329`
+   * :dtcompatible:`meas,ms5837-02ba`
+   * :dtcompatible:`meas,ms5837-30ba`
+   * :dtcompatible:`pixart,paa3905`
+   * :dtcompatible:`pixart,pat9136`
+   * :dtcompatible:`st,lsm6dsv32x`
+   * :dtcompatible:`vishay,veml6031`
+
+* Serial controller
+
+   * :dtcompatible:`ite,it51xxx-uart`
+   * :dtcompatible:`renesas,rz-sci-uart`
+   * :dtcompatible:`zephyr,native-pty-uart`
+
+* :abbr:`SPI (Serial Peripheral Interface)`
+
+   * :dtcompatible:`cdns,spi`
+
+* Timer
+
+   * :dtcompatible:`ite,it51xxx-timer`
+   * :dtcompatible:`renesas,ra-ulpt-timer`
+
+* USB
+
+   * :dtcompatible:`adi,max32-usbhs`
+
+* Watchdog
+
+   * :dtcompatible:`realtek,rts5912-watchdog`
+   * :dtcompatible:`renesas,ra-wdt`
+   * :dtcompatible:`silabs,siwx91x-wdt`
+
+New Samples
+***********
+
+..
+  Same as above for boards and drivers, this will also be recomputed at the time of the release.
+ Just link the sample, further details go in the sample documentation itself.
+
+* :zephyr:code-sample:`bmg160`
+* :zephyr:code-sample:`debug-ulp`
+* :zephyr:code-sample:`echo-ulp`
+* :zephyr:code-sample:`fatfs-fstab`
+* :zephyr:code-sample:`pressure_interrupt`
+* :zephyr:code-sample:`pressure_polling`
+* :zephyr:code-sample:`renesas_comparator`
+* :zephyr:code-sample:`rz-openamp-linux-zephyr`
+* :zephyr:code-sample:`spis-wakeup`
+* :zephyr:code-sample:`stepper`
+* :zephyr:code-sample:`veml6031`
+
+Other notable changes
+*********************
+
+..
+  Any more descriptive subsystem or driver changes. Do you really want to write
+  a paragraph or is it enough to link to the api/driver/Kconfig/board page above?
+
+* Added support for Armv8.1-M MPU's PXN (Privileged Execute Never) attribute.
+  With this, the MPU attributes for ``__ramfunc`` and ``__ram_text_reloc`` were modified such that,
+  PXN attribute is set for these regions if compiled with ``CONFIG_ARM_MPU_PXN`` and ``CONFIG_USERSPACE``.
+  This results in a change in behaviour for code being executed from these regions because,
+  if these regions have pxn attribute set in them, they cannot be executed in privileged mode.
+
+* Removed support for Nucleo WBA52CG board (``nucleo_wba52cg``) since it is NRND (Not Recommended
+  for New Design) and it is not supported anymore in the STM32CubeWBA from version 1.1.0 (July 2023).
+  The migration to :zephyr:board:`nucleo_wba55cg` (``nucleo_wba55cg``) is recommended instead.
+
+* Updated Mbed TLS to version 3.6.3 (from 3.6.2). The release notes can be found at:
+  https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.3
diff --git a/doc/requirements.in b/doc/requirements.in
new file mode 100644
index 0000000000000..36bb61a00c850
--- /dev/null
+++ b/doc/requirements.in
@@ -0,0 +1,29 @@
+# DOC: used to generate docs
+
+sphinx<8.3.0
+sphinx_rtd_theme~=3.0
+sphinx-tabs
+sphinxcontrib-svg2pdfconverter
+pygments>=2.9,!=2.19.0
+sphinx-notfound-page
+sphinx-copybutton
+sphinx-togglebutton
+sphinx-sitemap
+sphinx-autobuild
+
+# YAML validation. Used by zephyr_module.
+PyYAML>=6.0
+pykwalify
+
+# Used by pytest-twister-harness plugin (imported by autodoc)
+pytest
+pyserial
+
+# Doxygen doxmlparser
+doxmlparser
+
+# Used by the Zephyr domain to organize code samples
+anytree
+
+# Used to generate API coverage reports
+coverxygen
diff --git a/doc/requirements.txt b/doc/requirements.txt
index b5a5d3065408a..c10b390651a98 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,26 +1,835 @@
-# DOC: used to generate docs
-
-sphinx
-sphinx_rtd_theme~=3.0
-sphinx-tabs
-sphinxcontrib-svg2pdfconverter
-pygments>=2.9,!=2.19.0
-sphinx-notfound-page
-sphinx-copybutton
-sphinx-togglebutton
-sphinx-sitemap
-sphinx-autobuild
-
-# YAML validation. Used by zephyr_module.
-PyYAML>=6.0
-pykwalify
-
-# Used by pytest-twister-harness plugin (imported by autodoc)
-pytest
-pyserial
-
-# Doxygen doxmlparser
-doxmlparser
-
-# Used by the Zephyr domain to organize code samples
-anytree
+# This file was autogenerated by uv via the following command:
+#    uv pip compile --universal --python-version 3.10 --generate-hashes requirements.in --output-file requirements.txt
+alabaster==1.0.0 \
+    --hash=sha256:c00dca57bca26fa62a6d7d0a9fcce65f3e026e9bfe33e9c538fd3fbb2144fd9e \
+    --hash=sha256:fc6786402dc3fcb2de3cabd5fe455a2db534b371124f1f21de8731783dec828b
+    # via sphinx
+anyio==4.9.0 \
+    --hash=sha256:673c0c244e15788651a4ff38710fea9675823028a6f08a5eda409e0c9840a028 \
+    --hash=sha256:9f76d541cad6e36af7beb62e978876f3b41e3e04f2c1fbf0884604c0a9c4d93c
+    # via
+    #   starlette
+    #   watchfiles
+anytree==2.12.1 \
+    --hash=sha256:244def434ccf31b668ed282954e5d315b4e066c4940b94aff4a7962d85947830 \
+    --hash=sha256:5ea9e61caf96db1e5b3d0a914378d2cd83c269dfce1fb8242ce96589fa3382f0
+    # via -r requirements.in
+babel==2.17.0 \
+    --hash=sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d \
+    --hash=sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2
+    # via sphinx
+certifi==2025.1.31 \
+    --hash=sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651 \
+    --hash=sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe
+    # via requests
+charset-normalizer==3.4.1 \
+    --hash=sha256:0167ddc8ab6508fe81860a57dd472b2ef4060e8d378f0cc555707126830f2537 \
+    --hash=sha256:01732659ba9b5b873fc117534143e4feefecf3b2078b0a6a2e925271bb6f4cfa \
+    --hash=sha256:01ad647cdd609225c5350561d084b42ddf732f4eeefe6e678765636791e78b9a \
+    --hash=sha256:04432ad9479fa40ec0f387795ddad4437a2b50417c69fa275e212933519ff294 \
+    --hash=sha256:0907f11d019260cdc3f94fbdb23ff9125f6b5d1039b76003b5b0ac9d6a6c9d5b \
+    --hash=sha256:0924e81d3d5e70f8126529951dac65c1010cdf117bb75eb02dd12339b57749dd \
+    --hash=sha256:09b26ae6b1abf0d27570633b2b078a2a20419c99d66fb2823173d73f188ce601 \
+    --hash=sha256:09b5e6733cbd160dcc09589227187e242a30a49ca5cefa5a7edd3f9d19ed53fd \
+    --hash=sha256:0af291f4fe114be0280cdd29d533696a77b5b49cfde5467176ecab32353395c4 \
+    --hash=sha256:0f55e69f030f7163dffe9fd0752b32f070566451afe180f99dbeeb81f511ad8d \
+    --hash=sha256:1a2bc9f351a75ef49d664206d51f8e5ede9da246602dc2d2726837620ea034b2 \
+    --hash=sha256:22e14b5d70560b8dd51ec22863f370d1e595ac3d024cb8ad7d308b4cd95f8313 \
+    --hash=sha256:234ac59ea147c59ee4da87a0c0f098e9c8d169f4dc2a159ef720f1a61bbe27cd \
+    --hash=sha256:2369eea1ee4a7610a860d88f268eb39b95cb588acd7235e02fd5a5601773d4fa \
+    --hash=sha256:237bdbe6159cff53b4f24f397d43c6336c6b0b42affbe857970cefbb620911c8 \
+    --hash=sha256:28bf57629c75e810b6ae989f03c0828d64d6b26a5e205535585f96093e405ed1 \
+    --hash=sha256:2967f74ad52c3b98de4c3b32e1a44e32975e008a9cd2a8cc8966d6a5218c5cb2 \
+    --hash=sha256:2a75d49014d118e4198bcee5ee0a6f25856b29b12dbf7cd012791f8a6cc5c496 \
+    --hash=sha256:2bdfe3ac2e1bbe5b59a1a63721eb3b95fc9b6817ae4a46debbb4e11f6232428d \
+    --hash=sha256:2d074908e1aecee37a7635990b2c6d504cd4766c7bc9fc86d63f9c09af3fa11b \
+    --hash=sha256:2fb9bd477fdea8684f78791a6de97a953c51831ee2981f8e4f583ff3b9d9687e \
+    --hash=sha256:311f30128d7d333eebd7896965bfcfbd0065f1716ec92bd5638d7748eb6f936a \
+    --hash=sha256:329ce159e82018d646c7ac45b01a430369d526569ec08516081727a20e9e4af4 \
+    --hash=sha256:345b0426edd4e18138d6528aed636de7a9ed169b4aaf9d61a8c19e39d26838ca \
+    --hash=sha256:363e2f92b0f0174b2f8238240a1a30142e3db7b957a5dd5689b0e75fb717cc78 \
+    --hash=sha256:3a3bd0dcd373514dcec91c411ddb9632c0d7d92aed7093b8c3bbb6d69ca74408 \
+    --hash=sha256:3bed14e9c89dcb10e8f3a29f9ccac4955aebe93c71ae803af79265c9ca5644c5 \
+    --hash=sha256:44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3 \
+    --hash=sha256:44ecbf16649486d4aebafeaa7ec4c9fed8b88101f4dd612dcaf65d5e815f837f \
+    --hash=sha256:4532bff1b8421fd0a320463030c7520f56a79c9024a4e88f01c537316019005a \
+    --hash=sha256:49402233c892a461407c512a19435d1ce275543138294f7ef013f0b63d5d3765 \
+    --hash=sha256:4c0907b1928a36d5a998d72d64d8eaa7244989f7aaaf947500d3a800c83a3fd6 \
+    --hash=sha256:4d86f7aff21ee58f26dcf5ae81a9addbd914115cdebcbb2217e4f0ed8982e146 \
+    --hash=sha256:5777ee0881f9499ed0f71cc82cf873d9a0ca8af166dfa0af8ec4e675b7df48e6 \
+    --hash=sha256:5df196eb874dae23dcfb968c83d4f8fdccb333330fe1fc278ac5ceeb101003a9 \
+    --hash=sha256:619a609aa74ae43d90ed2e89bdd784765de0a25ca761b93e196d938b8fd1dbbd \
+    --hash=sha256:6e27f48bcd0957c6d4cb9d6fa6b61d192d0b13d5ef563e5f2ae35feafc0d179c \
+    --hash=sha256:6ff8a4a60c227ad87030d76e99cd1698345d4491638dfa6673027c48b3cd395f \
+    --hash=sha256:73d94b58ec7fecbc7366247d3b0b10a21681004153238750bb67bd9012414545 \
+    --hash=sha256:7461baadb4dc00fd9e0acbe254e3d7d2112e7f92ced2adc96e54ef6501c5f176 \
+    --hash=sha256:75832c08354f595c760a804588b9357d34ec00ba1c940c15e31e96d902093770 \
+    --hash=sha256:7709f51f5f7c853f0fb938bcd3bc59cdfdc5203635ffd18bf354f6967ea0f824 \
+    --hash=sha256:78baa6d91634dfb69ec52a463534bc0df05dbd546209b79a3880a34487f4b84f \
+    --hash=sha256:7974a0b5ecd505609e3b19742b60cee7aa2aa2fb3151bc917e6e2646d7667dcf \
+    --hash=sha256:7a4f97a081603d2050bfaffdefa5b02a9ec823f8348a572e39032caa8404a487 \
+    --hash=sha256:7b1bef6280950ee6c177b326508f86cad7ad4dff12454483b51d8b7d673a2c5d \
+    --hash=sha256:7d053096f67cd1241601111b698f5cad775f97ab25d81567d3f59219b5f1adbd \
+    --hash=sha256:804a4d582ba6e5b747c625bf1255e6b1507465494a40a2130978bda7b932c90b \
+    --hash=sha256:807f52c1f798eef6cf26beb819eeb8819b1622ddfeef9d0977a8502d4db6d534 \
+    --hash=sha256:80ed5e856eb7f30115aaf94e4a08114ccc8813e6ed1b5efa74f9f82e8509858f \
+    --hash=sha256:8417cb1f36cc0bc7eaba8ccb0e04d55f0ee52df06df3ad55259b9a323555fc8b \
+    --hash=sha256:8436c508b408b82d87dc5f62496973a1805cd46727c34440b0d29d8a2f50a6c9 \
+    --hash=sha256:89149166622f4db9b4b6a449256291dc87a99ee53151c74cbd82a53c8c2f6ccd \
+    --hash=sha256:8bfa33f4f2672964266e940dd22a195989ba31669bd84629f05fab3ef4e2d125 \
+    --hash=sha256:8c60ca7339acd497a55b0ea5d506b2a2612afb2826560416f6894e8b5770d4a9 \
+    --hash=sha256:91b36a978b5ae0ee86c394f5a54d6ef44db1de0815eb43de826d41d21e4af3de \
+    --hash=sha256:955f8851919303c92343d2f66165294848d57e9bba6cf6e3625485a70a038d11 \
+    --hash=sha256:97f68b8d6831127e4787ad15e6757232e14e12060bec17091b85eb1486b91d8d \
+    --hash=sha256:9b23ca7ef998bc739bf6ffc077c2116917eabcc901f88da1b9856b210ef63f35 \
+    --hash=sha256:9f0b8b1c6d84c8034a44893aba5e767bf9c7a211e313a9605d9c617d7083829f \
+    --hash=sha256:aabfa34badd18f1da5ec1bc2715cadc8dca465868a4e73a0173466b688f29dda \
+    --hash=sha256:ab36c8eb7e454e34e60eb55ca5d241a5d18b2c6244f6827a30e451c42410b5f7 \
+    --hash=sha256:b010a7a4fd316c3c484d482922d13044979e78d1861f0e0650423144c616a46a \
+    --hash=sha256:b1ac5992a838106edb89654e0aebfc24f5848ae2547d22c2c3f66454daa11971 \
+    --hash=sha256:b7b2d86dd06bfc2ade3312a83a5c364c7ec2e3498f8734282c6c3d4b07b346b8 \
+    --hash=sha256:b97e690a2118911e39b4042088092771b4ae3fc3aa86518f84b8cf6888dbdb41 \
+    --hash=sha256:bc2722592d8998c870fa4e290c2eec2c1569b87fe58618e67d38b4665dfa680d \
+    --hash=sha256:c0429126cf75e16c4f0ad00ee0eae4242dc652290f940152ca8c75c3a4b6ee8f \
+    --hash=sha256:c30197aa96e8eed02200a83fba2657b4c3acd0f0aa4bdc9f6c1af8e8962e0757 \
+    --hash=sha256:c4c3e6da02df6fa1410a7680bd3f63d4f710232d3139089536310d027950696a \
+    --hash=sha256:c75cb2a3e389853835e84a2d8fb2b81a10645b503eca9bcb98df6b5a43eb8886 \
+    --hash=sha256:c96836c97b1238e9c9e3fe90844c947d5afbf4f4c92762679acfe19927d81d77 \
+    --hash=sha256:d7f50a1f8c450f3925cb367d011448c39239bb3eb4117c36a6d354794de4ce76 \
+    --hash=sha256:d973f03c0cb71c5ed99037b870f2be986c3c05e63622c017ea9816881d2dd247 \
+    --hash=sha256:d98b1668f06378c6dbefec3b92299716b931cd4e6061f3c875a71ced1780ab85 \
+    --hash=sha256:d9c3cdf5390dcd29aa8056d13e8e99526cda0305acc038b96b30352aff5ff2bb \
+    --hash=sha256:dad3e487649f498dd991eeb901125411559b22e8d7ab25d3aeb1af367df5efd7 \
+    --hash=sha256:dccbe65bd2f7f7ec22c4ff99ed56faa1e9f785482b9bbd7c717e26fd723a1d1e \
+    --hash=sha256:dd78cfcda14a1ef52584dbb008f7ac81c1328c0f58184bf9a84c49c605002da6 \
+    --hash=sha256:e218488cd232553829be0664c2292d3af2eeeb94b32bea483cf79ac6a694e037 \
+    --hash=sha256:e358e64305fe12299a08e08978f51fc21fac060dcfcddd95453eabe5b93ed0e1 \
+    --hash=sha256:ea0d8d539afa5eb2728aa1932a988a9a7af94f18582ffae4bc10b3fbdad0626e \
+    --hash=sha256:eab677309cdb30d047996b36d34caeda1dc91149e4fdca0b1a039b3f79d9a807 \
+    --hash=sha256:eb8178fe3dba6450a3e024e95ac49ed3400e506fd4e9e5c32d30adda88cbd407 \
+    --hash=sha256:ecddf25bee22fe4fe3737a399d0d177d72bc22be6913acfab364b40bce1ba83c \
+    --hash=sha256:eea6ee1db730b3483adf394ea72f808b6e18cf3cb6454b4d86e04fa8c4327a12 \
+    --hash=sha256:f08ff5e948271dc7e18a35641d2f11a4cd8dfd5634f55228b691e62b37125eb3 \
+    --hash=sha256:f30bf9fd9be89ecb2360c7d94a711f00c09b976258846efe40db3d05828e8089 \
+    --hash=sha256:fa88b843d6e211393a37219e6a1c1df99d35e8fd90446f1118f4216e307e48cd \
+    --hash=sha256:fc54db6c8593ef7d4b2a331b58653356cf04f67c960f584edb7c3d8c97e8f39e \
+    --hash=sha256:fd4ec41f914fa74ad1b8304bbc634b3de73d2a0889bd32076342a573e0779e00 \
+    --hash=sha256:ffc9202a29ab3920fa812879e95a9e78b2465fd10be7fcbd042899695d75e616
+    # via requests
+click==8.1.8 \
+    --hash=sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2 \
+    --hash=sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a
+    # via uvicorn
+colorama==0.4.6 \
+    --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
+    --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
+    # via
+    #   click
+    #   pytest
+    #   sphinx
+    #   sphinx-autobuild
+coverxygen==1.8.1 \
+    --hash=sha256:d1c2f6569e8df8823ae313b1f7876e88ff20b4372c6d02f04c51fb5dc424576f
+    # via -r requirements.in
+docopt==0.6.2 \
+    --hash=sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
+    # via pykwalify
+docutils==0.21.2 \
+    --hash=sha256:3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f \
+    --hash=sha256:dafca5b9e384f0e419294eb4d2ff9fa826435bf15f15b7bd45723e8ad76811b2
+    # via
+    #   sphinx
+    #   sphinx-rtd-theme
+    #   sphinx-tabs
+    #   sphinx-togglebutton
+doxmlparser==1.13.2 \
+    --hash=sha256:65ab126e7d3f77b1bb15fa6886663614f68d0473b48831e1fb822f533243eb68
+    # via -r requirements.in
+exceptiongroup==1.2.2 ; python_full_version < '3.11' \
+    --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
+    --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
+    # via
+    #   anyio
+    #   pytest
+h11==0.14.0 \
+    --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
+    --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
+    # via uvicorn
+idna==3.10 \
+    --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
+    --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
+    # via
+    #   anyio
+    #   requests
+imagesize==1.4.1 \
+    --hash=sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b \
+    --hash=sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a
+    # via sphinx
+iniconfig==2.1.0 \
+    --hash=sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7 \
+    --hash=sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760
+    # via pytest
+jinja2==3.1.6 \
+    --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
+    --hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
+    # via sphinx
+lxml==5.3.1 \
+    --hash=sha256:016b96c58e9a4528219bb563acf1aaaa8bc5452e7651004894a973f03b84ba81 \
+    --hash=sha256:05123fad495a429f123307ac6d8fd6f977b71e9a0b6d9aeeb8f80c017cb17131 \
+    --hash=sha256:057e30d0012439bc54ca427a83d458752ccda725c1c161cc283db07bcad43cf9 \
+    --hash=sha256:06a20d607a86fccab2fc15a77aa445f2bdef7b49ec0520a842c5c5afd8381576 \
+    --hash=sha256:094b28ed8a8a072b9e9e2113a81fda668d2053f2ca9f2d202c2c8c7c2d6516b1 \
+    --hash=sha256:0bcfadea3cdc68e678d2b20cb16a16716887dd00a881e16f7d806c2138b8ff0c \
+    --hash=sha256:0d6b2fa86becfa81f0a0271ccb9eb127ad45fb597733a77b92e8a35e53414914 \
+    --hash=sha256:0f2cfae0688fd01f7056a17367e3b84f37c545fb447d7282cf2c242b16262607 \
+    --hash=sha256:106b7b5d2977b339f1e97efe2778e2ab20e99994cbb0ec5e55771ed0795920c8 \
+    --hash=sha256:133f3493253a00db2c870d3740bc458ebb7d937bd0a6a4f9328373e0db305709 \
+    --hash=sha256:136bf638d92848a939fd8f0e06fcf92d9f2e4b57969d94faae27c55f3d85c05b \
+    --hash=sha256:155e1a5693cf4b55af652f5c0f78ef36596c7f680ff3ec6eb4d7d85367259b2c \
+    --hash=sha256:1637fa31ec682cd5760092adfabe86d9b718a75d43e65e211d5931809bc111e7 \
+    --hash=sha256:172d65f7c72a35a6879217bcdb4bb11bc88d55fb4879e7569f55616062d387c2 \
+    --hash=sha256:17b5d7f8acf809465086d498d62a981fa6a56d2718135bb0e4aa48c502055f5c \
+    --hash=sha256:198bb4b4dd888e8390afa4f170d4fa28467a7eaf857f1952589f16cfbb67af27 \
+    --hash=sha256:1b6f92e35e2658a5ed51c6634ceb5ddae32053182851d8cad2a5bc102a359b33 \
+    --hash=sha256:1b92fe86e04f680b848fff594a908edfa72b31bfc3499ef7433790c11d4c8cd8 \
+    --hash=sha256:1bcc211542f7af6f2dfb705f5f8b74e865592778e6cafdfd19c792c244ccce19 \
+    --hash=sha256:1c93ed3c998ea8472be98fb55aed65b5198740bfceaec07b2eba551e55b7b9ae \
+    --hash=sha256:203b1d3eaebd34277be06a3eb880050f18a4e4d60861efba4fb946e31071a295 \
+    --hash=sha256:22ec2b3c191f43ed21f9545e9df94c37c6b49a5af0a874008ddc9132d49a2d9c \
+    --hash=sha256:231cf4d140b22a923b1d0a0a4e0b4f972e5893efcdec188934cc65888fd0227b \
+    --hash=sha256:236610b77589faf462337b3305a1be91756c8abc5a45ff7ca8f245a71c5dab70 \
+    --hash=sha256:29bfc8d3d88e56ea0a27e7c4897b642706840247f59f4377d81be8f32aa0cfbf \
+    --hash=sha256:2b8969dbc8d09d9cd2ae06362c3bad27d03f433252601ef658a49bd9f2b22d79 \
+    --hash=sha256:2dd0b80ac2d8f13ffc906123a6f20b459cb50a99222d0da492360512f3e50f84 \
+    --hash=sha256:2df7ed5edeb6bd5590914cd61df76eb6cce9d590ed04ec7c183cf5509f73530d \
+    --hash=sha256:2e4a570f6a99e96c457f7bec5ad459c9c420ee80b99eb04cbfcfe3fc18ec6423 \
+    --hash=sha256:2f1be45d4c15f237209bbf123a0e05b5d630c8717c42f59f31ea9eae2ad89394 \
+    --hash=sha256:2f23cf50eccb3255b6e913188291af0150d89dab44137a69e14e4dcb7be981f1 \
+    --hash=sha256:3031e4c16b59424e8d78522c69b062d301d951dc55ad8685736c3335a97fc270 \
+    --hash=sha256:33e06717c00c788ab4e79bc4726ecc50c54b9bfb55355eae21473c145d83c2d2 \
+    --hash=sha256:364de8f57d6eda0c16dcfb999af902da31396949efa0e583e12675d09709881b \
+    --hash=sha256:3715cdf0dd31b836433af9ee9197af10e3df41d273c19bb249230043667a5dfd \
+    --hash=sha256:3bb8149840daf2c3f97cebf00e4ed4a65a0baff888bf2605a8d0135ff5cf764e \
+    --hash=sha256:3c3c8b55c7fc7b7e8877b9366568cc73d68b82da7fe33d8b98527b73857a225f \
+    --hash=sha256:3d68eeef7b4d08a25e51897dac29bcb62aba830e9ac6c4e3297ee7c6a0cf6439 \
+    --hash=sha256:3dddf0fb832486cc1ea71d189cb92eb887826e8deebe128884e15020bb6e3f61 \
+    --hash=sha256:3edbb9c9130bac05d8c3fe150c51c337a471cc7fdb6d2a0a7d3a88e88a829314 \
+    --hash=sha256:3effe081b3135237da6e4c4530ff2a868d3f80be0bda027e118a5971285d42d0 \
+    --hash=sha256:422c179022ecdedbe58b0e242607198580804253da220e9454ffe848daa1cfd2 \
+    --hash=sha256:42978a68d3825eaac55399eb37a4d52012a205c0c6262199b8b44fcc6fd686e8 \
+    --hash=sha256:4399b4226c4785575fb20998dc571bc48125dc92c367ce2602d0d70e0c455eb0 \
+    --hash=sha256:45fbb70ccbc8683f2fb58bea89498a7274af1d9ec7995e9f4af5604e028233fc \
+    --hash=sha256:4867361c049761a56bd21de507cab2c2a608c55102311d142ade7dab67b34f32 \
+    --hash=sha256:48fd46bf7155def2e15287c6f2b133a2f78e2d22cdf55647269977b873c65499 \
+    --hash=sha256:4b0d5cdba1b655d5b18042ac9c9ff50bda33568eb80feaaca4fc237b9c4fbfde \
+    --hash=sha256:4df0ec814b50275ad6a99bc82a38b59f90e10e47714ac9871e1b223895825468 \
+    --hash=sha256:4e52e1b148867b01c05e21837586ee307a01e793b94072d7c7b91d2c2da02ffe \
+    --hash=sha256:514fe78fc4b87e7a7601c92492210b20a1b0c6ab20e71e81307d9c2e377c64de \
+    --hash=sha256:524ccfded8989a6595dbdda80d779fb977dbc9a7bc458864fc9a0c2fc15dc877 \
+    --hash=sha256:528f3a0498a8edc69af0559bdcf8a9f5a8bf7c00051a6ef3141fdcf27017bbf5 \
+    --hash=sha256:52d82b0d436edd6a1d22d94a344b9a58abd6c68c357ed44f22d4ba8179b37629 \
+    --hash=sha256:5412500e0dc5481b1ee9cf6b38bb3b473f6e411eb62b83dc9b62699c3b7b79f7 \
+    --hash=sha256:585c4dc429deebc4307187d2b71ebe914843185ae16a4d582ee030e6cfbb4d8a \
+    --hash=sha256:5865b270b420eda7b68928d70bb517ccbe045e53b1a428129bb44372bf3d7dd5 \
+    --hash=sha256:5881aaa4bf3a2d086c5f20371d3a5856199a0d8ac72dd8d0dbd7a2ecfc26ab73 \
+    --hash=sha256:5885bc586f1edb48e5d68e7a4b4757b5feb2a496b64f462b4d65950f5af3364f \
+    --hash=sha256:5a11b16a33656ffc43c92a5343a28dc71eefe460bcc2a4923a96f292692709f6 \
+    --hash=sha256:5a997b784a639e05b9d4053ef3b20c7e447ea80814a762f25b8ed5a89d261eac \
+    --hash=sha256:5be8f5e4044146a69c96077c7e08f0709c13a314aa5315981185c1f00235fe65 \
+    --hash=sha256:63d57fc94eb0bbb4735e45517afc21ef262991d8758a8f2f05dd6e4174944519 \
+    --hash=sha256:673b9d8e780f455091200bba8534d5f4f465944cbdd61f31dc832d70e29064a5 \
+    --hash=sha256:67d2f8ad9dcc3a9e826bdc7802ed541a44e124c29b7d95a679eeb58c1c14ade8 \
+    --hash=sha256:67f5e80adf0aafc7b5454f2c1cb0cde920c9b1f2cbd0485f07cc1d0497c35c5d \
+    --hash=sha256:68018c4c67d7e89951a91fbd371e2e34cd8cfc71f0bb43b5332db38497025d51 \
+    --hash=sha256:6c4dd3bfd0c82400060896717dd261137398edb7e524527438c54a8c34f736bf \
+    --hash=sha256:71f31eda4e370f46af42fc9f264fafa1b09f46ba07bdbee98f25689a04b81c20 \
+    --hash=sha256:7512b4d0fc5339d5abbb14d1843f70499cab90d0b864f790e73f780f041615d7 \
+    --hash=sha256:75fa3d6946d317ffc7016a6fcc44f42db6d514b7fdb8b4b28cbe058303cb6e53 \
+    --hash=sha256:779e851fd0e19795ccc8a9bb4d705d6baa0ef475329fe44a13cf1e962f18ff1e \
+    --hash=sha256:796520afa499732191e39fc95b56a3b07f95256f2d22b1c26e217fb69a9db5b5 \
+    --hash=sha256:7aae7a3d63b935babfdc6864b31196afd5145878ddd22f5200729006366bc4d5 \
+    --hash=sha256:7b82e67c5feb682dbb559c3e6b78355f234943053af61606af126df2183b9ef9 \
+    --hash=sha256:7c0536bd9178f754b277a3e53f90f9c9454a3bd108b1531ffff720e082d824f2 \
+    --hash=sha256:7eda194dd46e40ec745bf76795a7cccb02a6a41f445ad49d3cf66518b0bd9cff \
+    --hash=sha256:82a4bb10b0beef1434fb23a09f001ab5ca87895596b4581fd53f1e5145a8934a \
+    --hash=sha256:85c4f11be9cf08917ac2a5a8b6e1ef63b2f8e3799cec194417e76826e5f1de9c \
+    --hash=sha256:88b72eb7222d918c967202024812c2bfb4048deeb69ca328363fb8e15254c549 \
+    --hash=sha256:89934f9f791566e54c1d92cdc8f8fd0009447a5ecdb1ec6b810d5f8c4955f6be \
+    --hash=sha256:8b1942b3e4ed9ed551ed3083a2e6e0772de1e5e3aca872d955e2e86385fb7ff9 \
+    --hash=sha256:8ffb141361108e864ab5f1813f66e4e1164181227f9b1f105b042729b6c15125 \
+    --hash=sha256:8fffc08de02071c37865a155e5ea5fce0282e1546fd5bde7f6149fcaa32558ac \
+    --hash=sha256:91fb6a43d72b4f8863d21f347a9163eecbf36e76e2f51068d59cd004c506f332 \
+    --hash=sha256:928e75a7200a4c09e6efc7482a1337919cc61fe1ba289f297827a5b76d8969c2 \
+    --hash=sha256:96eef5b9f336f623ffc555ab47a775495e7e8846dde88de5f941e2906453a1ce \
+    --hash=sha256:a0611da6b07dd3720f492db1b463a4d1175b096b49438761cc9f35f0d9eaaef5 \
+    --hash=sha256:a091026c3bf7519ab1e64655a3f52a59ad4a4e019a6f830c24d6430695b1cf6a \
+    --hash=sha256:a22f66270bd6d0804b02cd49dae2b33d4341015545d17f8426f2c4e22f557a23 \
+    --hash=sha256:a243132767150a44e6a93cd1dde41010036e1cbc63cc3e9fe1712b277d926ce3 \
+    --hash=sha256:a31fa7536ec1fb7155a0cd3a4e3d956c835ad0a43e3610ca32384d01f079ea1c \
+    --hash=sha256:a364e8e944d92dcbf33b6b494d4e0fb3499dcc3bd9485beb701aa4b4201fa414 \
+    --hash=sha256:a4058f16cee694577f7e4dd410263cd0ef75644b43802a689c2b3c2a7e69453b \
+    --hash=sha256:a4b382e0e636ed54cd278791d93fe2c4f370772743f02bcbe431a160089025c9 \
+    --hash=sha256:a83d3adea1e0ee36dac34627f78ddd7f093bb9cfc0a8e97f1572a949b695cb98 \
+    --hash=sha256:a8ade0363f776f87f982572c2860cc43c65ace208db49c76df0a21dde4ddd16e \
+    --hash=sha256:aa59974880ab5ad8ef3afaa26f9bda148c5f39e06b11a8ada4660ecc9fb2feb3 \
+    --hash=sha256:aa826340a609d0c954ba52fd831f0fba2a4165659ab0ee1a15e4aac21f302406 \
+    --hash=sha256:aaca5a812f050ab55426c32177091130b1e49329b3f002a32934cd0245571307 \
+    --hash=sha256:ae82fce1d964f065c32c9517309f0c7be588772352d2f40b1574a214bd6e6098 \
+    --hash=sha256:aed57b541b589fa05ac248f4cb1c46cbb432ab82cbd467d1c4f6a2bdc18aecf9 \
+    --hash=sha256:afa578b6524ff85fb365f454cf61683771d0170470c48ad9d170c48075f86725 \
+    --hash=sha256:b0884e3f22d87c30694e625b1e62e6f30d39782c806287450d9dc2fdf07692fd \
+    --hash=sha256:b2aca14c235c7a08558fe0a4786a1a05873a01e86b474dfa8f6df49101853a4e \
+    --hash=sha256:b450d7cabcd49aa7ab46a3c6aa3ac7e1593600a1a0605ba536ec0f1b99a04322 \
+    --hash=sha256:b725e70d15906d24615201e650d5b0388b08a5187a55f119f25874d0103f90dd \
+    --hash=sha256:bfbbab9316330cf81656fed435311386610f78b6c93cc5db4bebbce8dd146675 \
+    --hash=sha256:c093c7088b40d8266f57ed71d93112bd64c6724d31f0794c1e52cc4857c28e0e \
+    --hash=sha256:c2e49dc23a10a1296b04ca9db200c44d3eb32c8d8ec532e8c1fd24792276522a \
+    --hash=sha256:c4393600915c308e546dc7003d74371744234e8444a28622d76fe19b98fa59d1 \
+    --hash=sha256:c5ae125276f254b01daa73e2c103363d3e99e3e10505686ac7d9d2442dd4627a \
+    --hash=sha256:c6aacf00d05b38a5069826e50ae72751cb5bc27bdc4d5746203988e429b385bb \
+    --hash=sha256:c76722b5ed4a31ba103e0dc77ab869222ec36efe1a614e42e9bcea88a36186fe \
+    --hash=sha256:c809eef167bf4a57af4b03007004896f5c60bd38dc3852fcd97a26eae3d4c9e6 \
+    --hash=sha256:c92ea6d9dd84a750b2bae72ff5e8cf5fdd13e58dda79c33e057862c29a8d5b50 \
+    --hash=sha256:cb659702a45136c743bc130760c6f137870d4df3a9e14386478b8a0511abcfca \
+    --hash=sha256:ce0930a963ff593e8bb6fda49a503911accc67dee7e5445eec972668e672a0f0 \
+    --hash=sha256:d0751528b97d2b19a388b302be2a0ee05817097bab46ff0ed76feeec24951f78 \
+    --hash=sha256:d184f85ad2bb1f261eac55cddfcf62a70dee89982c978e92b9a74a1bfef2e367 \
+    --hash=sha256:d2a3e412ce1849be34b45922bfef03df32d1410a06d1cdeb793a343c2f1fd666 \
+    --hash=sha256:d61ec60945d694df806a9aec88e8f29a27293c6e424f8ff91c80416e3c617645 \
+    --hash=sha256:db0c742aad702fd5d0c6611a73f9602f20aec2007c102630c06d7633d9c8f09a \
+    --hash=sha256:db4743e30d6f5f92b6d2b7c86b3ad250e0bad8dee4b7ad8a0c44bfb276af89a3 \
+    --hash=sha256:dbf7bebc2275016cddf3c997bf8a0f7044160714c64a9b83975670a04e6d2252 \
+    --hash=sha256:de1fc314c3ad6bc2f6bd5b5a5b9357b8c6896333d27fdbb7049aea8bd5af2d79 \
+    --hash=sha256:df7e5edac4778127f2bf452e0721a58a1cfa4d1d9eac63bdd650535eb8543615 \
+    --hash=sha256:e220f7b3e8656ab063d2eb0cd536fafef396829cafe04cb314e734f87649058f \
+    --hash=sha256:e3c623923967f3e5961d272718655946e5322b8d058e094764180cdee7bab1af \
+    --hash=sha256:e69add9b6b7b08c60d7ff0152c7c9a6c45b4a71a919be5abde6f98f1ea16421c \
+    --hash=sha256:e8e0d177b1fe251c3b1b914ab64135475c5273c8cfd2857964b2e3bb0fe196a7 \
+    --hash=sha256:ef45f31aec9be01379fc6c10f1d9c677f032f2bac9383c827d44f620e8a88407 \
+    --hash=sha256:f1208c1c67ec9e151d78aa3435aa9b08a488b53d9cfac9b699f15255a3461ef2 \
+    --hash=sha256:f12582b8d3b4c6be1d298c49cb7ae64a3a73efaf4c2ab4e37db182e3545815ac \
+    --hash=sha256:f1de541a9893cf8a1b1db9bf0bf670a2decab42e3e82233d36a74eda7822b4c9 \
+    --hash=sha256:f4eac0584cdc3285ef2e74eee1513a6001681fd9753b259e8159421ed28a72e5 \
+    --hash=sha256:f7b64fcd670bca8800bc10ced36620c6bbb321e7bc1214b9c0c0df269c1dddc2 \
+    --hash=sha256:fb7c61d4be18e930f75948705e9718618862e6fc2ed0d7159b2262be73f167a2
+    # via doxmlparser
+markupsafe==3.0.2 \
+    --hash=sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4 \
+    --hash=sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30 \
+    --hash=sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0 \
+    --hash=sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9 \
+    --hash=sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396 \
+    --hash=sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13 \
+    --hash=sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028 \
+    --hash=sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca \
+    --hash=sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557 \
+    --hash=sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832 \
+    --hash=sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0 \
+    --hash=sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b \
+    --hash=sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579 \
+    --hash=sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a \
+    --hash=sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c \
+    --hash=sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff \
+    --hash=sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c \
+    --hash=sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22 \
+    --hash=sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094 \
+    --hash=sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb \
+    --hash=sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e \
+    --hash=sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5 \
+    --hash=sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a \
+    --hash=sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d \
+    --hash=sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a \
+    --hash=sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b \
+    --hash=sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8 \
+    --hash=sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225 \
+    --hash=sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c \
+    --hash=sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144 \
+    --hash=sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f \
+    --hash=sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87 \
+    --hash=sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d \
+    --hash=sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93 \
+    --hash=sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf \
+    --hash=sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158 \
+    --hash=sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84 \
+    --hash=sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb \
+    --hash=sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48 \
+    --hash=sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171 \
+    --hash=sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c \
+    --hash=sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6 \
+    --hash=sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd \
+    --hash=sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d \
+    --hash=sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1 \
+    --hash=sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d \
+    --hash=sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca \
+    --hash=sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a \
+    --hash=sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29 \
+    --hash=sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe \
+    --hash=sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798 \
+    --hash=sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c \
+    --hash=sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8 \
+    --hash=sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f \
+    --hash=sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f \
+    --hash=sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a \
+    --hash=sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178 \
+    --hash=sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0 \
+    --hash=sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79 \
+    --hash=sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430 \
+    --hash=sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50
+    # via jinja2
+packaging==24.2 \
+    --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
+    --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
+    # via
+    #   pytest
+    #   sphinx
+pluggy==1.5.0 \
+    --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
+    --hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
+    # via pytest
+pygments==2.19.1 \
+    --hash=sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f \
+    --hash=sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c
+    # via
+    #   -r requirements.in
+    #   sphinx
+    #   sphinx-tabs
+pykwalify==1.8.0 \
+    --hash=sha256:731dfa87338cca9f559d1fca2bdea37299116e3139b73f78ca90a543722d6651 \
+    --hash=sha256:796b2ad3ed4cb99b88308b533fb2f559c30fa6efb4fa9fda11347f483d245884
+    # via -r requirements.in
+pyserial==3.5 \
+    --hash=sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb \
+    --hash=sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0
+    # via -r requirements.in
+pytest==8.3.5 \
+    --hash=sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820 \
+    --hash=sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845
+    # via -r requirements.in
+python-dateutil==2.9.0.post0 \
+    --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
+    --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
+    # via pykwalify
+pyyaml==6.0.2 \
+    --hash=sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff \
+    --hash=sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48 \
+    --hash=sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086 \
+    --hash=sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e \
+    --hash=sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133 \
+    --hash=sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5 \
+    --hash=sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484 \
+    --hash=sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee \
+    --hash=sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5 \
+    --hash=sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68 \
+    --hash=sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a \
+    --hash=sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf \
+    --hash=sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99 \
+    --hash=sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8 \
+    --hash=sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85 \
+    --hash=sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19 \
+    --hash=sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc \
+    --hash=sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a \
+    --hash=sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1 \
+    --hash=sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317 \
+    --hash=sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c \
+    --hash=sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631 \
+    --hash=sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d \
+    --hash=sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652 \
+    --hash=sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5 \
+    --hash=sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e \
+    --hash=sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b \
+    --hash=sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8 \
+    --hash=sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476 \
+    --hash=sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706 \
+    --hash=sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563 \
+    --hash=sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237 \
+    --hash=sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b \
+    --hash=sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083 \
+    --hash=sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180 \
+    --hash=sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425 \
+    --hash=sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e \
+    --hash=sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f \
+    --hash=sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725 \
+    --hash=sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183 \
+    --hash=sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab \
+    --hash=sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774 \
+    --hash=sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725 \
+    --hash=sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e \
+    --hash=sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5 \
+    --hash=sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d \
+    --hash=sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290 \
+    --hash=sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44 \
+    --hash=sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed \
+    --hash=sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4 \
+    --hash=sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba \
+    --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
+    --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
+    # via -r requirements.in
+requests==2.32.3 \
+    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
+    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
+    # via sphinx
+roman-numerals-py==3.1.0 ; python_full_version >= '3.11' \
+    --hash=sha256:9da2ad2fb670bcf24e81070ceb3be72f6c11c440d73bd579fbeca1e9f330954c \
+    --hash=sha256:be4bf804f083a4ce001b5eb7e3c0862479d10f94c936f6c4e5f250aa5ff5bd2d
+    # via sphinx
+ruamel-yaml==0.18.10 \
+    --hash=sha256:20c86ab29ac2153f80a428e1254a8adf686d3383df04490514ca3b79a362db58 \
+    --hash=sha256:30f22513ab2301b3d2b577adc121c6471f28734d3d9728581245f1e76468b4f1
+    # via pykwalify
+ruamel-yaml-clib==0.2.12 ; python_full_version < '3.13' and platform_python_implementation == 'CPython' \
+    --hash=sha256:040ae85536960525ea62868b642bdb0c2cc6021c9f9d507810c0c604e66f5a7b \
+    --hash=sha256:0467c5965282c62203273b838ae77c0d29d7638c8a4e3a1c8bdd3602c10904e4 \
+    --hash=sha256:0b7e75b4965e1d4690e93021adfcecccbca7d61c7bddd8e22406ef2ff20d74ef \
+    --hash=sha256:11f891336688faf5156a36293a9c362bdc7c88f03a8a027c2c1d8e0bcde998e5 \
+    --hash=sha256:1492a6051dab8d912fc2adeef0e8c72216b24d57bd896ea607cb90bb0c4981d3 \
+    --hash=sha256:20b0f8dc160ba83b6dcc0e256846e1a02d044e13f7ea74a3d1d56ede4e48c632 \
+    --hash=sha256:22353049ba4181685023b25b5b51a574bce33e7f51c759371a7422dcae5402a6 \
+    --hash=sha256:2c59aa6170b990d8d2719323e628aaf36f3bfbc1c26279c0eeeb24d05d2d11c7 \
+    --hash=sha256:32621c177bbf782ca5a18ba4d7af0f1082a3f6e517ac2a18b3974d4edf349680 \
+    --hash=sha256:3bc2a80e6420ca8b7d3590791e2dfc709c88ab9152c00eeb511c9875ce5778bf \
+    --hash=sha256:3eac5a91891ceb88138c113f9db04f3cebdae277f5d44eaa3651a4f573e6a5da \
+    --hash=sha256:4a6679521a58256a90b0d89e03992c15144c5f3858f40d7c18886023d7943db6 \
+    --hash=sha256:4c8c5d82f50bb53986a5e02d1b3092b03622c02c2eb78e29bec33fd9593bae1a \
+    --hash=sha256:4f6f3eac23941b32afccc23081e1f50612bdbe4e982012ef4f5797986828cd01 \
+    --hash=sha256:5a0e060aace4c24dcaf71023bbd7d42674e3b230f7e7b97317baf1e953e5b519 \
+    --hash=sha256:6442cb36270b3afb1b4951f060eccca1ce49f3d087ca1ca4563a6eb479cb3de6 \
+    --hash=sha256:6c8fbb13ec503f99a91901ab46e0b07ae7941cd527393187039aec586fdfd36f \
+    --hash=sha256:749c16fcc4a2b09f28843cda5a193e0283e47454b63ec4b81eaa2242f50e4ccd \
+    --hash=sha256:7dd5adc8b930b12c8fc5b99e2d535a09889941aa0d0bd06f4749e9a9397c71d2 \
+    --hash=sha256:811ea1594b8a0fb466172c384267a4e5e367298af6b228931f273b111f17ef52 \
+    --hash=sha256:932205970b9f9991b34f55136be327501903f7c66830e9760a8ffb15b07f05cd \
+    --hash=sha256:943f32bc9dedb3abff9879edc134901df92cfce2c3d5c9348f172f62eb2d771d \
+    --hash=sha256:95c3829bb364fdb8e0332c9931ecf57d9be3519241323c5274bd82f709cebc0c \
+    --hash=sha256:96777d473c05ee3e5e3c3e999f5d23c6f4ec5b0c38c098b3a5229085f74236c6 \
+    --hash=sha256:a274fb2cb086c7a3dea4322ec27f4cb5cc4b6298adb583ab0e211a4682f241eb \
+    --hash=sha256:a52d48f4e7bf9005e8f0a89209bf9a73f7190ddf0489eee5eb51377385f59f2a \
+    --hash=sha256:a606ef75a60ecf3d924613892cc603b154178ee25abb3055db5062da811fd969 \
+    --hash=sha256:ab007f2f5a87bd08ab1499bdf96f3d5c6ad4dcfa364884cb4549aa0154b13a28 \
+    --hash=sha256:b82a7c94a498853aa0b272fd5bc67f29008da798d4f93a2f9f289feb8426a58d \
+    --hash=sha256:bb43a269eb827806502c7c8efb7ae7e9e9d0573257a46e8e952f4d4caba4f31e \
+    --hash=sha256:bc5f1e1c28e966d61d2519f2a3d451ba989f9ea0f2307de7bc45baa526de9e45 \
+    --hash=sha256:bd0a08f0bab19093c54e18a14a10b4322e1eacc5217056f3c063bd2f59853ce4 \
+    --hash=sha256:beffaed67936fbbeffd10966a4eb53c402fafd3d6833770516bf7314bc6ffa12 \
+    --hash=sha256:bf165fef1f223beae7333275156ab2022cffe255dcc51c27f066b4370da81e31 \
+    --hash=sha256:cf12567a7b565cbf65d438dec6cfbe2917d3c1bdddfce84a9930b7d35ea59642 \
+    --hash=sha256:d84318609196d6bd6da0edfa25cedfbabd8dbde5140a0a23af29ad4b8f91fb1e \
+    --hash=sha256:d85252669dc32f98ebcd5d36768f5d4faeaeaa2d655ac0473be490ecdae3c285 \
+    --hash=sha256:e143ada795c341b56de9418c58d028989093ee611aa27ffb9b7f609c00d813ed \
+    --hash=sha256:e188d2699864c11c36cdfdada94d781fd5d6b0071cd9c427bceb08ad3d7c70e1 \
+    --hash=sha256:e2f1c3765db32be59d18ab3953f43ab62a761327aafc1594a2a1fbe038b8b8a7 \
+    --hash=sha256:e5b8daf27af0b90da7bb903a876477a9e6d7270be6146906b276605997c7e9a3 \
+    --hash=sha256:e7e3736715fbf53e9be2a79eb4db68e4ed857017344d697e8b9749444ae57475 \
+    --hash=sha256:e8c4ebfcfd57177b572e2040777b8abc537cdef58a2120e830124946aa9b42c5 \
+    --hash=sha256:f66efbc1caa63c088dead1c4170d148eabc9b80d95fb75b6c92ac0aad2437d76 \
+    --hash=sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987 \
+    --hash=sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df
+    # via ruamel-yaml
+setuptools==78.1.0 \
+    --hash=sha256:18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54 \
+    --hash=sha256:3e386e96793c8702ae83d17b853fb93d3e09ef82ec62722e61da5cd22376dcd8
+    # via sphinx-togglebutton
+six==1.17.0 \
+    --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
+    --hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
+    # via
+    #   anytree
+    #   doxmlparser
+    #   python-dateutil
+sniffio==1.3.1 \
+    --hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \
+    --hash=sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc
+    # via anyio
+snowballstemmer==2.2.0 \
+    --hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \
+    --hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a
+    # via sphinx
+sphinx==8.1.3 ; python_full_version < '3.11' \
+    --hash=sha256:09719015511837b76bf6e03e42eb7595ac8c2e41eeb9c29c5b755c6b677992a2 \
+    --hash=sha256:43c1911eecb0d3e161ad78611bc905d1ad0e523e4ddc202a58a821773dc4c927
+    # via
+    #   -r requirements.in
+    #   sphinx-autobuild
+    #   sphinx-copybutton
+    #   sphinx-notfound-page
+    #   sphinx-rtd-theme
+    #   sphinx-sitemap
+    #   sphinx-tabs
+    #   sphinx-togglebutton
+    #   sphinxcontrib-jquery
+    #   sphinxcontrib-svg2pdfconverter
+sphinx==8.2.3 ; python_full_version >= '3.11' \
+    --hash=sha256:398ad29dee7f63a75888314e9424d40f52ce5a6a87ae88e7071e80af296ec348 \
+    --hash=sha256:4405915165f13521d875a8c29c8970800a0141c14cc5416a38feca4ea5d9b9c3
+    # via
+    #   -r requirements.in
+    #   sphinx-autobuild
+    #   sphinx-copybutton
+    #   sphinx-notfound-page
+    #   sphinx-rtd-theme
+    #   sphinx-sitemap
+    #   sphinx-tabs
+    #   sphinx-togglebutton
+    #   sphinxcontrib-jquery
+    #   sphinxcontrib-svg2pdfconverter
+sphinx-autobuild==2024.10.3 \
+    --hash=sha256:158e16c36f9d633e613c9aaf81c19b0fc458ca78b112533b20dafcda430d60fa \
+    --hash=sha256:248150f8f333e825107b6d4b86113ab28fa51750e5f9ae63b59dc339be951fb1
+    # via -r requirements.in
+sphinx-copybutton==0.5.2 \
+    --hash=sha256:4cf17c82fb9646d1bc9ca92ac280813a3b605d8c421225fd9913154103ee1fbd \
+    --hash=sha256:fb543fd386d917746c9a2c50360c7905b605726b9355cd26e9974857afeae06e
+    # via -r requirements.in
+sphinx-notfound-page==1.1.0 \
+    --hash=sha256:835dc76ff7914577a1f58d80a2c8418fb6138c0932c8da8adce4d9096fbcd389 \
+    --hash=sha256:913e1754370bb3db201d9300d458a8b8b5fb22e9246a816643a819a9ea2b8067
+    # via -r requirements.in
+sphinx-rtd-theme==3.0.2 \
+    --hash=sha256:422ccc750c3a3a311de4ae327e82affdaf59eb695ba4936538552f3b00f4ee13 \
+    --hash=sha256:b7457bc25dda723b20b086a670b9953c859eab60a2a03ee8eb2bb23e176e5f85
+    # via -r requirements.in
+sphinx-sitemap==2.6.0 \
+    --hash=sha256:5e0c66b9f2e371ede80c659866a9eaad337d46ab02802f9c7e5f7bc5893c28d2 \
+    --hash=sha256:7478e417d141f99c9af27ccd635f44c03a471a08b20e778a0f9daef7ace1d30b
+    # via -r requirements.in
+sphinx-tabs==3.4.7 \
+    --hash=sha256:991ad4a424ff54119799ba1491701aa8130dd43509474aef45a81c42d889784d \
+    --hash=sha256:c12d7a36fd413b369e9e9967a0a4015781b71a9c393575419834f19204bd1915
+    # via -r requirements.in
+sphinx-togglebutton==0.3.2 \
+    --hash=sha256:9647ba7874b7d1e2d43413d8497153a85edc6ac95a3fea9a75ef9c1e08aaae2b \
+    --hash=sha256:ab0c8b366427b01e4c89802d5d078472c427fa6e9d12d521c34fa0442559dc7a
+    # via -r requirements.in
+sphinxcontrib-applehelp==2.0.0 \
+    --hash=sha256:2f29ef331735ce958efa4734873f084941970894c6090408b079c61b2e1c06d1 \
+    --hash=sha256:4cd3f0ec4ac5dd9c17ec65e9ab272c9b867ea77425228e68ecf08d6b28ddbdb5
+    # via sphinx
+sphinxcontrib-devhelp==2.0.0 \
+    --hash=sha256:411f5d96d445d1d73bb5d52133377b4248ec79db5c793ce7dbe59e074b4dd1ad \
+    --hash=sha256:aefb8b83854e4b0998877524d1029fd3e6879210422ee3780459e28a1f03a8a2
+    # via sphinx
+sphinxcontrib-htmlhelp==2.1.0 \
+    --hash=sha256:166759820b47002d22914d64a075ce08f4c46818e17cfc9470a9786b759b19f8 \
+    --hash=sha256:c9e2916ace8aad64cc13a0d233ee22317f2b9025b9cf3295249fa985cc7082e9
+    # via sphinx
+sphinxcontrib-jquery==4.1 \
+    --hash=sha256:1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a \
+    --hash=sha256:f936030d7d0147dd026a4f2b5a57343d233f1fc7b363f68b3d4f1cb0993878ae
+    # via sphinx-rtd-theme
+sphinxcontrib-jsmath==1.0.1 \
+    --hash=sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178 \
+    --hash=sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8
+    # via sphinx
+sphinxcontrib-qthelp==2.0.0 \
+    --hash=sha256:4fe7d0ac8fc171045be623aba3e2a8f613f8682731f9153bb2e40ece16b9bbab \
+    --hash=sha256:b18a828cdba941ccd6ee8445dbe72ffa3ef8cbe7505d8cd1fa0d42d3f2d5f3eb
+    # via sphinx
+sphinxcontrib-serializinghtml==2.0.0 \
+    --hash=sha256:6e2cb0eef194e10c27ec0023bfeb25badbbb5868244cf5bc5bdc04e4464bf331 \
+    --hash=sha256:e9d912827f872c029017a53f0ef2180b327c3f7fd23c87229f7a8e8b70031d4d
+    # via sphinx
+sphinxcontrib-svg2pdfconverter==1.3.0 \
+    --hash=sha256:5df6b0895e2e2101d720bfd08841bb56d74c57b1f86229a7c18b771dfdf4ffbb \
+    --hash=sha256:6411a4cc2f57eed96a0d7bbfa139f68cbe7983018881e1e6d7c46053cd69911f
+    # via -r requirements.in
+starlette==0.46.1 \
+    --hash=sha256:3c88d58ee4bd1bb807c0d1acb381838afc7752f9ddaec81bbe4383611d833230 \
+    --hash=sha256:77c74ed9d2720138b25875133f3a2dae6d854af2ec37dceb56aef370c1d8a227
+    # via sphinx-autobuild
+tomli==2.2.1 ; python_full_version < '3.11' \
+    --hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \
+    --hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \
+    --hash=sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c \
+    --hash=sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b \
+    --hash=sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8 \
+    --hash=sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6 \
+    --hash=sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77 \
+    --hash=sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff \
+    --hash=sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea \
+    --hash=sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192 \
+    --hash=sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249 \
+    --hash=sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee \
+    --hash=sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4 \
+    --hash=sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98 \
+    --hash=sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8 \
+    --hash=sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4 \
+    --hash=sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281 \
+    --hash=sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744 \
+    --hash=sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69 \
+    --hash=sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13 \
+    --hash=sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140 \
+    --hash=sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e \
+    --hash=sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e \
+    --hash=sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc \
+    --hash=sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff \
+    --hash=sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec \
+    --hash=sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2 \
+    --hash=sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222 \
+    --hash=sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106 \
+    --hash=sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272 \
+    --hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \
+    --hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7
+    # via
+    #   pytest
+    #   sphinx
+typing-extensions==4.13.0 ; python_full_version < '3.13' \
+    --hash=sha256:0a4ac55a5820789d87e297727d229866c9650f6521b64206413c4fbada24d95b \
+    --hash=sha256:c8dd92cc0d6425a97c18fbb9d1954e5ff92c1ca881a309c45f06ebc0b79058e5
+    # via
+    #   anyio
+    #   uvicorn
+urllib3==2.3.0 \
+    --hash=sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df \
+    --hash=sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d
+    # via requests
+uvicorn==0.34.0 \
+    --hash=sha256:023dc038422502fa28a09c7a30bf2b6991512da7dcdb8fd35fe57cfc154126f4 \
+    --hash=sha256:404051050cd7e905de2c9a7e61790943440b3416f49cb409f965d9dcd0fa73e9
+    # via sphinx-autobuild
+watchfiles==1.0.4 \
+    --hash=sha256:02a526ee5b5a09e8168314c905fc545c9bc46509896ed282aeb5a8ba9bd6ca27 \
+    --hash=sha256:05d341c71f3d7098920f8551d4df47f7b57ac5b8dad56558064c3431bdfc0b74 \
+    --hash=sha256:076f293100db3b0b634514aa0d294b941daa85fc777f9c698adb1009e5aca0b1 \
+    --hash=sha256:0799ae68dfa95136dde7c472525700bd48777875a4abb2ee454e3ab18e9fc712 \
+    --hash=sha256:0986902677a1a5e6212d0c49b319aad9cc48da4bd967f86a11bde96ad9676ca1 \
+    --hash=sha256:0bc80d91ddaf95f70258cf78c471246846c1986bcc5fd33ccc4a1a67fcb40f9a \
+    --hash=sha256:13c2ce7b72026cfbca120d652f02c7750f33b4c9395d79c9790b27f014c8a5a2 \
+    --hash=sha256:1941b4e39de9b38b868a69b911df5e89dc43767feeda667b40ae032522b9b5f1 \
+    --hash=sha256:1eacd91daeb5158c598fe22d7ce66d60878b6294a86477a4715154990394c9b3 \
+    --hash=sha256:229e6ec880eca20e0ba2f7e2249c85bae1999d330161f45c78d160832e026ee2 \
+    --hash=sha256:22bb55a7c9e564e763ea06c7acea24fc5d2ee5dfc5dafc5cfbedfe58505e9f90 \
+    --hash=sha256:278aaa395f405972e9f523bd786ed59dfb61e4b827856be46a42130605fd0899 \
+    --hash=sha256:2a9f93f8439639dc244c4d2902abe35b0279102bca7bbcf119af964f51d53c19 \
+    --hash=sha256:308ac265c56f936636e3b0e3f59e059a40003c655228c131e1ad439957592303 \
+    --hash=sha256:31f1a379c9dcbb3f09cf6be1b7e83b67c0e9faabed0471556d9438a4a4e14202 \
+    --hash=sha256:32b026a6ab64245b584acf4931fe21842374da82372d5c039cba6bf99ef722f3 \
+    --hash=sha256:342622287b5604ddf0ed2d085f3a589099c9ae8b7331df3ae9845571586c4f3d \
+    --hash=sha256:39f4914548b818540ef21fd22447a63e7be6e24b43a70f7642d21f1e73371590 \
+    --hash=sha256:3f68d8e9d5a321163ddacebe97091000955a1b74cd43724e346056030b0bacee \
+    --hash=sha256:43b168bba889886b62edb0397cab5b6490ffb656ee2fcb22dec8bfeb371a9e12 \
+    --hash=sha256:47eb32ef8c729dbc4f4273baece89398a4d4b5d21a1493efea77a17059f4df8a \
+    --hash=sha256:4810ea2ae622add560f4aa50c92fef975e475f7ac4900ce5ff5547b2434642d8 \
+    --hash=sha256:4e997802d78cdb02623b5941830ab06f8860038faf344f0d288d325cc9c5d2ff \
+    --hash=sha256:4ebbeca9360c830766b9f0df3640b791be569d988f4be6c06d6fae41f187f105 \
+    --hash=sha256:4f8c4998506241dedf59613082d1c18b836e26ef2a4caecad0ec41e2a15e4226 \
+    --hash=sha256:55ccfd27c497b228581e2838d4386301227fc0cb47f5a12923ec2fe4f97b95af \
+    --hash=sha256:5717021b199e8353782dce03bd8a8f64438832b84e2885c4a645f9723bf656d9 \
+    --hash=sha256:5c11ea22304d17d4385067588123658e9f23159225a27b983f343fcffc3e796a \
+    --hash=sha256:5e0227b8ed9074c6172cf55d85b5670199c99ab11fd27d2c473aa30aec67ee42 \
+    --hash=sha256:62c9953cf85529c05b24705639ffa390f78c26449e15ec34d5339e8108c7c407 \
+    --hash=sha256:6ba473efd11062d73e4f00c2b730255f9c1bdd73cd5f9fe5b5da8dbd4a717205 \
+    --hash=sha256:740d103cd01458f22462dedeb5a3382b7f2c57d07ff033fbc9465919e5e1d0f3 \
+    --hash=sha256:74cb3ca19a740be4caa18f238298b9d472c850f7b2ed89f396c00a4c97e2d9ff \
+    --hash=sha256:7b75fee5a16826cf5c46fe1c63116e4a156924d668c38b013e6276f2582230f0 \
+    --hash=sha256:7cf684aa9bba4cd95ecb62c822a56de54e3ae0598c1a7f2065d51e24637a3c5d \
+    --hash=sha256:8012bd820c380c3d3db8435e8cf7592260257b378b649154a7948a663b5f84e9 \
+    --hash=sha256:857f5fc3aa027ff5e57047da93f96e908a35fe602d24f5e5d8ce64bf1f2fc733 \
+    --hash=sha256:8b1f135238e75d075359cf506b27bf3f4ca12029c47d3e769d8593a2024ce161 \
+    --hash=sha256:8d0d0630930f5cd5af929040e0778cf676a46775753e442a3f60511f2409f48f \
+    --hash=sha256:90192cdc15ab7254caa7765a98132a5a41471cf739513cc9bcf7d2ffcc0ec7b2 \
+    --hash=sha256:95b42cac65beae3a362629950c444077d1b44f1790ea2772beaea95451c086bb \
+    --hash=sha256:9745a4210b59e218ce64c91deb599ae8775c8a9da4e95fb2ee6fe745fc87d01a \
+    --hash=sha256:9d1ef56b56ed7e8f312c934436dea93bfa3e7368adfcf3df4c0da6d4de959a1e \
+    --hash=sha256:9eea33ad8c418847dd296e61eb683cae1c63329b6d854aefcd412e12d94ee235 \
+    --hash=sha256:9f25d0ba0fe2b6d2c921cf587b2bf4c451860086534f40c384329fb96e2044d1 \
+    --hash=sha256:9fe37a2de80aa785d340f2980276b17ef697ab8db6019b07ee4fd28a8359d2f3 \
+    --hash=sha256:a38320582736922be8c865d46520c043bff350956dfc9fbaee3b2df4e1740a4b \
+    --hash=sha256:a462490e75e466edbb9fc4cd679b62187153b3ba804868452ef0577ec958f5ff \
+    --hash=sha256:a5ae5706058b27c74bac987d615105da17724172d5aaacc6c362a40599b6de43 \
+    --hash=sha256:aa216f87594f951c17511efe5912808dfcc4befa464ab17c98d387830ce07b60 \
+    --hash=sha256:ab0311bb2ffcd9f74b6c9de2dda1612c13c84b996d032cd74799adb656af4e8b \
+    --hash=sha256:ab594e75644421ae0a2484554832ca5895f8cab5ab62de30a1a57db460ce06c6 \
+    --hash=sha256:aee397456a29b492c20fda2d8961e1ffb266223625346ace14e4b6d861ba9c80 \
+    --hash=sha256:b045c800d55bc7e2cadd47f45a97c7b29f70f08a7c2fa13241905010a5493f94 \
+    --hash=sha256:b77d5622ac5cc91d21ae9c2b284b5d5c51085a0bdb7b518dba263d0af006132c \
+    --hash=sha256:ba5bb3073d9db37c64520681dd2650f8bd40902d991e7b4cfaeece3e32561d08 \
+    --hash=sha256:bdef5a1be32d0b07dcea3318a0be95d42c98ece24177820226b56276e06b63b0 \
+    --hash=sha256:c2acfa49dd0ad0bf2a9c0bb9a985af02e89345a7189be1efc6baa085e0f72d7c \
+    --hash=sha256:c7cce76c138a91e720d1df54014a047e680b652336e1b73b8e3ff3158e05061e \
+    --hash=sha256:cc27a65069bcabac4552f34fd2dce923ce3fcde0721a16e4fb1b466d63ec831f \
+    --hash=sha256:cdbd912a61543a36aef85e34f212e5d2486e7c53ebfdb70d1e0b060cc50dd0bf \
+    --hash=sha256:cdcc92daeae268de1acf5b7befcd6cfffd9a047098199056c72e4623f531de18 \
+    --hash=sha256:d3452c1ec703aa1c61e15dfe9d482543e4145e7c45a6b8566978fbb044265a21 \
+    --hash=sha256:d6097538b0ae5c1b88c3b55afa245a66793a8fec7ada6755322e465fb1a0e8cc \
+    --hash=sha256:d8d3d9203705b5797f0af7e7e5baa17c8588030aaadb7f6a86107b7247303817 \
+    --hash=sha256:e0611d244ce94d83f5b9aff441ad196c6e21b55f77f3c47608dcf651efe54c4a \
+    --hash=sha256:f12969a3765909cf5dc1e50b2436eb2c0e676a3c75773ab8cc3aa6175c16e902 \
+    --hash=sha256:f44a39aee3cbb9b825285ff979ab887a25c5d336e5ec3574f1506a4671556a8d \
+    --hash=sha256:f9ce064e81fe79faa925ff03b9f4c1a98b0bbb4a1b8c1b015afa93030cb21a49 \
+    --hash=sha256:fb2c46e275fbb9f0c92e7654b231543c7bbfa1df07cdc4b99fa73bedfde5c844 \
+    --hash=sha256:fc2eb5d14a8e0d5df7b36288979176fbb39672d45184fc4b1c004d7c3ce29317
+    # via sphinx-autobuild
+websockets==15.0.1 \
+    --hash=sha256:0701bc3cfcb9164d04a14b149fd74be7347a530ad3bbf15ab2c678a2cd3dd9a2 \
+    --hash=sha256:0a34631031a8f05657e8e90903e656959234f3a04552259458aac0b0f9ae6fd9 \
+    --hash=sha256:0af68c55afbd5f07986df82831c7bff04846928ea8d1fd7f30052638788bc9b5 \
+    --hash=sha256:0c9e74d766f2818bb95f84c25be4dea09841ac0f734d1966f415e4edfc4ef1c3 \
+    --hash=sha256:0f3c1e2ab208db911594ae5b4f79addeb3501604a165019dd221c0bdcabe4db8 \
+    --hash=sha256:0fdfe3e2a29e4db3659dbd5bbf04560cea53dd9610273917799f1cde46aa725e \
+    --hash=sha256:1009ee0c7739c08a0cd59de430d6de452a55e42d6b522de7aa15e6f67db0b8e1 \
+    --hash=sha256:1234d4ef35db82f5446dca8e35a7da7964d02c127b095e172e54397fb6a6c256 \
+    --hash=sha256:16b6c1b3e57799b9d38427dda63edcbe4926352c47cf88588c0be4ace18dac85 \
+    --hash=sha256:2034693ad3097d5355bfdacfffcbd3ef5694f9718ab7f29c29689a9eae841880 \
+    --hash=sha256:21c1fa28a6a7e3cbdc171c694398b6df4744613ce9b36b1a498e816787e28123 \
+    --hash=sha256:229cf1d3ca6c1804400b0a9790dc66528e08a6a1feec0d5040e8b9eb14422375 \
+    --hash=sha256:27ccee0071a0e75d22cb35849b1db43f2ecd3e161041ac1ee9d2352ddf72f065 \
+    --hash=sha256:363c6f671b761efcb30608d24925a382497c12c506b51661883c3e22337265ed \
+    --hash=sha256:39c1fec2c11dc8d89bba6b2bf1556af381611a173ac2b511cf7231622058af41 \
+    --hash=sha256:3b1ac0d3e594bf121308112697cf4b32be538fb1444468fb0a6ae4feebc83411 \
+    --hash=sha256:3be571a8b5afed347da347bfcf27ba12b069d9d7f42cb8c7028b5e98bbb12597 \
+    --hash=sha256:3c714d2fc58b5ca3e285461a4cc0c9a66bd0e24c5da9911e30158286c9b5be7f \
+    --hash=sha256:3d00075aa65772e7ce9e990cab3ff1de702aa09be3940d1dc88d5abf1ab8a09c \
+    --hash=sha256:3e90baa811a5d73f3ca0bcbf32064d663ed81318ab225ee4f427ad4e26e5aff3 \
+    --hash=sha256:47819cea040f31d670cc8d324bb6435c6f133b8c7a19ec3d61634e62f8d8f9eb \
+    --hash=sha256:47b099e1f4fbc95b701b6e85768e1fcdaf1630f3cbe4765fa216596f12310e2e \
+    --hash=sha256:4a9fac8e469d04ce6c25bb2610dc535235bd4aa14996b4e6dbebf5e007eba5ee \
+    --hash=sha256:4b826973a4a2ae47ba357e4e82fa44a463b8f168e1ca775ac64521442b19e87f \
+    --hash=sha256:4c2529b320eb9e35af0fa3016c187dffb84a3ecc572bcee7c3ce302bfeba52bf \
+    --hash=sha256:54479983bd5fb469c38f2f5c7e3a24f9a4e70594cd68cd1fa6b9340dadaff7cf \
+    --hash=sha256:558d023b3df0bffe50a04e710bc87742de35060580a293c2a984299ed83bc4e4 \
+    --hash=sha256:5756779642579d902eed757b21b0164cd6fe338506a8083eb58af5c372e39d9a \
+    --hash=sha256:592f1a9fe869c778694f0aa806ba0374e97648ab57936f092fd9d87f8bc03665 \
+    --hash=sha256:595b6c3969023ecf9041b2936ac3827e4623bfa3ccf007575f04c5a6aa318c22 \
+    --hash=sha256:5a939de6b7b4e18ca683218320fc67ea886038265fd1ed30173f5ce3f8e85675 \
+    --hash=sha256:5d54b09eba2bada6011aea5375542a157637b91029687eb4fdb2dab11059c1b4 \
+    --hash=sha256:5df592cd503496351d6dc14f7cdad49f268d8e618f80dce0cd5a36b93c3fc08d \
+    --hash=sha256:5f4c04ead5aed67c8a1a20491d54cdfba5884507a48dd798ecaf13c74c4489f5 \
+    --hash=sha256:64dee438fed052b52e4f98f76c5790513235efaa1ef7f3f2192c392cd7c91b65 \
+    --hash=sha256:66dd88c918e3287efc22409d426c8f729688d89a0c587c88971a0faa2c2f3792 \
+    --hash=sha256:678999709e68425ae2593acf2e3ebcbcf2e69885a5ee78f9eb80e6e371f1bf57 \
+    --hash=sha256:67f2b6de947f8c757db2db9c71527933ad0019737ec374a8a6be9a956786aaf9 \
+    --hash=sha256:693f0192126df6c2327cce3baa7c06f2a117575e32ab2308f7f8216c29d9e2e3 \
+    --hash=sha256:746ee8dba912cd6fc889a8147168991d50ed70447bf18bcda7039f7d2e3d9151 \
+    --hash=sha256:756c56e867a90fb00177d530dca4b097dd753cde348448a1012ed6c5131f8b7d \
+    --hash=sha256:76d1f20b1c7a2fa82367e04982e708723ba0e7b8d43aa643d3dcd404d74f1475 \
+    --hash=sha256:7f493881579c90fc262d9cdbaa05a6b54b3811c2f300766748db79f098db9940 \
+    --hash=sha256:823c248b690b2fd9303ba00c4f66cd5e2d8c3ba4aa968b2779be9532a4dad431 \
+    --hash=sha256:82544de02076bafba038ce055ee6412d68da13ab47f0c60cab827346de828dee \
+    --hash=sha256:8dd8327c795b3e3f219760fa603dcae1dcc148172290a8ab15158cf85a953413 \
+    --hash=sha256:8fdc51055e6ff4adeb88d58a11042ec9a5eae317a0a53d12c062c8a8865909e8 \
+    --hash=sha256:a625e06551975f4b7ea7102bc43895b90742746797e2e14b70ed61c43a90f09b \
+    --hash=sha256:abdc0c6c8c648b4805c5eacd131910d2a7f6455dfd3becab248ef108e89ab16a \
+    --hash=sha256:ac017dd64572e5c3bd01939121e4d16cf30e5d7e110a119399cf3133b63ad054 \
+    --hash=sha256:ac1e5c9054fe23226fb11e05a6e630837f074174c4c2f0fe442996112a6de4fb \
+    --hash=sha256:ac60e3b188ec7574cb761b08d50fcedf9d77f1530352db4eef1707fe9dee7205 \
+    --hash=sha256:b359ed09954d7c18bbc1680f380c7301f92c60bf924171629c5db97febb12f04 \
+    --hash=sha256:b7643a03db5c95c799b89b31c036d5f27eeb4d259c798e878d6937d71832b1e4 \
+    --hash=sha256:ba9e56e8ceeeedb2e080147ba85ffcd5cd0711b89576b83784d8605a7df455fa \
+    --hash=sha256:c338ffa0520bdb12fbc527265235639fb76e7bc7faafbb93f6ba80d9c06578a9 \
+    --hash=sha256:cad21560da69f4ce7658ca2cb83138fb4cf695a2ba3e475e0559e05991aa8122 \
+    --hash=sha256:d08eb4c2b7d6c41da6ca0600c077e93f5adcfd979cd777d747e9ee624556da4b \
+    --hash=sha256:d50fd1ee42388dcfb2b3676132c78116490976f1300da28eb629272d5d93e905 \
+    --hash=sha256:d591f8de75824cbb7acad4e05d2d710484f15f29d4a915092675ad3456f11770 \
+    --hash=sha256:d5f6b181bb38171a8ad1d6aa58a67a6aa9d4b38d0f8c5f496b9e42561dfc62fe \
+    --hash=sha256:d63efaa0cd96cf0c5fe4d581521d9fa87744540d4bc999ae6e08595a1014b45b \
+    --hash=sha256:d99e5546bf73dbad5bf3547174cd6cb8ba7273062a23808ffea025ecb1cf8562 \
+    --hash=sha256:e09473f095a819042ecb2ab9465aee615bd9c2028e4ef7d933600a8401c79561 \
+    --hash=sha256:e8b56bdcdb4505c8078cb6c7157d9811a85790f2f2b3632c7d1462ab5783d215 \
+    --hash=sha256:ee443ef070bb3b6ed74514f5efaa37a252af57c90eb33b956d35c8e9c10a1931 \
+    --hash=sha256:f29d80eb9a9263b8d109135351caf568cc3f80b9928bccde535c235de55c22d9 \
+    --hash=sha256:f7a866fbc1e97b5c617ee4116daaa09b722101d4a3c170c787450ba409f9736f \
+    --hash=sha256:fcd5cf9e305d7b8338754470cf69cf81f420459dbae8a3b40cee57417f4614a7
+    # via sphinx-autobuild
+wheel==0.45.1 \
+    --hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \
+    --hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248
+    # via sphinx-togglebutton
diff --git a/doc/security/secure-coding.rst b/doc/security/secure-coding.rst
index 579622999b4d0..e9c9c8340e2a8 100644
--- a/doc/security/secure-coding.rst
+++ b/doc/security/secure-coding.rst
@@ -176,10 +176,10 @@ including the 8 principles from [SALT75]_:
 - limited attack surface (the set of the
   different points where an attacker can try to enter or extract data)
 
-- input validation with whitelists (inputs should typically be checked
+- input validation with allowlists (inputs should typically be checked
   to determine if they are valid before they are accepted; this
-  validation should use whitelists (which only accept known-good
-  values), not blacklists (which attempt to list known-bad values)).
+  validation should use allowlists (which only accept known-good
+  values), not blocklists (which attempt to list known-bad values)).
 
 Vulnerability Knowledge
 =======================
diff --git a/doc/security/vulnerabilities.rst b/doc/security/vulnerabilities.rst
index 550a66da217a9..1217b1db70d66 100644
--- a/doc/security/vulnerabilities.rst
+++ b/doc/security/vulnerabilities.rst
@@ -1837,3 +1837,70 @@ This has been fixed in main for v4.0.0
 
 - `PR 81370 fix for 3.7
   <https://github.com/zephyrproject-rtos/zephyr/pull/81370>`_
+
+:cve:`2025-1673`
+----------------
+
+Out of bounds read when calling crc16_ansi and strlen in dns_validate_msg
+
+A malicious or malformed DNS packet without a payload can cause an out-of-bounds
+read, resulting in a crash (denial of service) or an incorrect computation.
+
+- `Zephyr project bug tracker GHSA-jjhx-rrh4-j8mx
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-jjhx-rrh4-j8mx>`_
+
+This has been fixed in main for v4.1.0
+
+- `PR 82072 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82072>`_
+
+- `PR 82289 fix for 4.0
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82289>`_
+
+- `PR 82288 fix for 3.7
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82288>`_
+
+:cve:`2025-1674`
+----------------
+
+Out of bounds read when unpacking DNS answers
+
+A lack of input validation allows for out of bounds reads caused by malicious or
+malformed packets.
+
+- `Zephyr project bug tracker GHSA-x975-8pgf-qh66
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-x975-8pgf-qh66>`_
+
+This has been fixed in main for v4.1.0
+
+- `PR 82072 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82072>`_
+
+- `PR 82289 fix for 4.0
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82289>`_
+
+- `PR 82288 fix for 3.7
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82288>`_
+
+:cve:`2025-1675`
+----------------
+
+Out of bounds read in dns_copy_qname
+
+The function dns_copy_qname in dns_pack.c performs performs a memcpy operation
+with an untrusted field and does not check if the source buffer is large enough
+to contain the copied data.
+
+- `Zephyr project bug tracker GHSA-2m84-5hfw-m8v4
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-2m84-5hfw-m8v4>`_
+
+This has been fixed in main for v4.1.0
+
+- `PR 82072 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82072>`_
+
+- `PR 82289 fix for 4.0
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82289>`_
+
+- `PR 82288 fix for 3.7
+  <https://github.com/zephyrproject-rtos/zephyr/pull/82288>`_
diff --git a/doc/services/debugging/cpu_load.rst b/doc/services/debugging/cpu_load.rst
new file mode 100644
index 0000000000000..07b7cc755b637
--- /dev/null
+++ b/doc/services/debugging/cpu_load.rst
@@ -0,0 +1,26 @@
+.. _cpu_load:
+
+CPU load
+########
+
+Module can be used to track how much time is spent in idle. It is using tracing hooks
+which are called before and after CPU goes to idle. Compared to :ref:`thread_analyzer`
+it is more accurate since it takes into account time spent in the interrupt context as well.
+
+Function :c:func:`cpu_load_get` is used to get the latest value. It is also used to reset
+the measurement. By default, module is using :c:func:`k_cycle_get_32` but in cases when higher
+precision is needed a :ref:`counter_api` device can be used.
+
+Load can also be reported periodically using a logging message. Period is configured using :kconfig:option:`CONFIG_CPU_LOAD_LOG_PERIODICALLY`.
+
+Using counter device
+********************
+
+In order to use :ref:`counter_api` device :kconfig:option:`CONFIG_CPU_LOAD_USE_COUNTER` must be
+enabled and chosen in devicetree must be set.
+
+.. code-block:: devicetree
+
+   chosen {
+     zephyr,cpu-load-counter = &counter_device;
+   };
diff --git a/doc/services/debugging/index.rst b/doc/services/debugging/index.rst
index 1a1e4f91893b8..36864412d3447 100644
--- a/doc/services/debugging/index.rst
+++ b/doc/services/debugging/index.rst
@@ -7,6 +7,7 @@ Debugging
    :maxdepth: 1
 
    thread-analyzer.rst
+   cpu_load.rst
    coredump.rst
    gdbstub.rst
    debugmon.rst
diff --git a/doc/services/device_mgmt/index.rst b/doc/services/device_mgmt/index.rst
index 1063743e87a23..09d5aeb4da94b 100644
--- a/doc/services/device_mgmt/index.rst
+++ b/doc/services/device_mgmt/index.rst
@@ -15,18 +15,3 @@ Device Management
     dfu.rst
     ota.rst
     ec_host_cmd.rst
-
-SMP Groups
-==========
-
-.. toctree::
-    :maxdepth: 1
-
-    smp_groups/smp_group_0.rst
-    smp_groups/smp_group_1.rst
-    smp_groups/smp_group_2.rst
-    smp_groups/smp_group_3.rst
-    smp_groups/smp_group_8.rst
-    smp_groups/smp_group_9.rst
-    smp_groups/smp_group_10.rst
-    smp_groups/smp_group_63.rst
diff --git a/doc/services/device_mgmt/mcumgr.rst b/doc/services/device_mgmt/mcumgr.rst
index a91bd86e46fa8..aa3ebb403bb8c 100644
--- a/doc/services/device_mgmt/mcumgr.rst
+++ b/doc/services/device_mgmt/mcumgr.rst
@@ -136,7 +136,7 @@ On boards where a J-Link OB is present which has both CDC and MSC (virtual Mass
 Storage Device, also known as drag-and-drop) support, the MSD functionality can
 prevent MCUmgr commands over the CDC UART port from working due to how USB
 endpoints are configured in the J-Link firmware (for example on the
-:ref:`Nordic nrf52840dk/nrf52840 board <nrf52840dk_nrf52840>`) because of
+:zephyr:board:`nrf52840dk` board) because of
 limiting the maximum packet size (most likely to occur when using image
 management commands for updating firmware). This issue can be
 resolved by disabling MSD functionality on the J-Link device, follow the
diff --git a/doc/services/device_mgmt/smp_groups/smp_group_1.rst b/doc/services/device_mgmt/smp_groups/smp_group_1.rst
index 5651e126c352a..a7ff01807cc80 100644
--- a/doc/services/device_mgmt/smp_groups/smp_group_1.rst
+++ b/doc/services/device_mgmt/smp_groups/smp_group_1.rst
@@ -519,6 +519,8 @@ where:
     :c:enumerator:`MGMT_ERR_EBADSTATE`, which means that the secondary
     image has been marked for next boot already and may not be erased.
 
+.. _mcumgr_smp_group_1_slot_info:
+
 Slot info
 *********
 
diff --git a/doc/services/device_mgmt/smp_protocol.rst b/doc/services/device_mgmt/smp_protocol.rst
index 1ad4634d6e7bd..fd9d5579673bd 100644
--- a/doc/services/device_mgmt/smp_protocol.rst
+++ b/doc/services/device_mgmt/smp_protocol.rst
@@ -220,3 +220,5 @@ Specifications of management groups supported by Zephyr
     smp_groups/smp_group_3.rst
     smp_groups/smp_group_8.rst
     smp_groups/smp_group_9.rst
+    smp_groups/smp_group_10.rst
+    smp_groups/smp_group_63.rst
diff --git a/doc/services/index.rst b/doc/services/index.rst
index d1c456151a299..69050cb784fc5 100644
--- a/doc/services/index.rst
+++ b/doc/services/index.rst
@@ -29,10 +29,8 @@ OS Services
    portability/index.rst
    poweroff.rst
    profiling/index.rst
-   secure_storage.rst
    shell/index.rst
    serialization/index.rst
-   settings/index.rst
    smf/index.rst
    storage/index.rst
    sensing/index.rst
diff --git a/doc/services/input/index.rst b/doc/services/input/index.rst
index e2e28430185e0..1145b64a8e899 100644
--- a/doc/services/input/index.rst
+++ b/doc/services/input/index.rst
@@ -63,29 +63,6 @@ this purpose, the :c:func:`input_to_hid_code` and
 :c:func:`input_to_hid_modifier` functions can be used to map input codes to HID
 codes and modifiers.
 
-Kscan Compatibility
-*******************
-
-Input devices generating X/Y/Touch events can be used in existing applications
-based on the :ref:`kscan_api` API by enabling both
-:kconfig:option:`CONFIG_INPUT` and :kconfig:option:`CONFIG_KSCAN`, defining a
-:dtcompatible:`zephyr,kscan-input` node as a child node of the corresponding
-input device and pointing the ``zephyr,keyboard-scan`` chosen node to the
-compatibility device node, for example:
-
-.. code-block:: devicetree
-
-    chosen {
-        zephyr,keyboard-scan = &kscan_input;
-    };
-
-    ft5336@38 {
-        ...
-        kscan_input: kscan-input {
-            compatible = "zephyr,kscan-input";
-        };
-    };
-
 General Purpose Drivers
 ***********************
 
diff --git a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
index 251a332027a44..369929a876f50 100644
--- a/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
+++ b/doc/services/ipc/ipc_service/backends/ipc_service_icmsg.rst
@@ -83,8 +83,7 @@ connected through the IPC instance:
    memory.
 #. It then sends a signal to the other domain or CPU, informing that the data
    has been written. Sending the signal to the other domain or CPU is repeated
-   with timeout specified by
-   :kconfig:option:`CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS` option.
+   with timeout.
 #. When the signal from the other domain or CPU is received, the magic number
    is read from ``rx-region``. If it is correct, the bonding process is finished
    and the backend informs the application by calling
diff --git a/doc/services/llext/api.rst b/doc/services/llext/api.rst
index b3d8d64152b00..c4227ca2d8a42 100644
--- a/doc/services/llext/api.rst
+++ b/doc/services/llext/api.rst
@@ -6,3 +6,5 @@ API Reference
 .. doxygengroup:: llext_symbols
 
 .. doxygengroup:: llext_loader_apis
+
+.. doxygengroup:: llext_inspect_apis
diff --git a/doc/services/llext/build.rst b/doc/services/llext/build.rst
index eae96259d245d..6eb8da9dc71e3 100644
--- a/doc/services/llext/build.rst
+++ b/doc/services/llext/build.rst
@@ -152,15 +152,34 @@ directory. It's a tarball that contains the headers and compile flags needed
 to build extensions. The extension developer can then include the headers
 and use the compile flags in their build system to build the extension.
 
+EDK definition files
+--------------------
+
+The EDK includes several convenience files which define a set of variables that
+contain the compile flags needed by the project, as well as other build-related
+information, when enabled. The information is currently exported in the
+following formats:
+
+- ``Makefile.cflags``, for Makefile-based projects;
+- ``cmake.cflags``, for CMake-based projects.
+
+Paths to the headers and flags are prefixed by the EDK root directory. This is
+automatically obtained for CMake projects from ``CMAKE_CURRENT_LIST_DIR``;
+other formats refer to an ``LLEXT_EDK_INSTALL_DIR`` variable, which must be set
+by the user with the path where the EDK is installed before including the
+generated file.
+
+.. note::
+   The ``LLEXT_EDK`` prefix in the variable name may be changed with the
+   :kconfig:option:`CONFIG_LLEXT_EDK_NAME` option.
+
 Compile flags
 -------------
 
-The EDK includes the convenience files ``cmake.cflags`` (for CMake-based
-projects) and ``Makefile.cflags`` (for Make-based ones), which define a set of
-variables that contain the compile flags needed by the project. The full list
-of flags needed to build an extension is provided by ``LLEXT_CFLAGS``. Also
-provided is a more granular set of flags that can be used in support of
-different use cases, such as when building mocks for unit tests:
+The full list of flags needed to build an extension is provided by
+``LLEXT_CFLAGS``. Also provided is a more granular set of flags that can be
+used in support of different use cases, such as when building mocks for unit
+tests:
 
 ``LLEXT_INCLUDE_CFLAGS``
 
@@ -194,6 +213,29 @@ different use cases, such as when building mocks for unit tests:
         ``LLEXT_ALL_INCLUDE_CFLAGS``, ``LLEXT_GENERATED_IMACROS_CFLAGS`` and
         ``LLEXT_BASE_CFLAGS``.
 
+Target information
+------------------
+
+The EDK includes information that identifies the target of the current Zephyr
+build. The following variables are currently defined and mirror the information
+available in the Zephyr build system:
+
+``LLEXT_EDK_BOARD_NAME``
+    The board name used in the Zephyr build.
+
+``LLEXT_EDK_BOARD_QUALIFIERS``
+    The board qualifiers, if provided, used in the Zephyr build.
+
+``LLEXT_EDK_BOARD_REVISION``
+    The board revision, if provided, used in the Zephyr build.
+
+``LLEXT_EDK_BOARD_TARGET``
+    The fully qualified board target used in the Zephyr build.
+
+.. note::
+   The ``LLEXT_EDK`` prefix in the variable names may be changed with the
+   :kconfig:option:`CONFIG_LLEXT_EDK_NAME` option.
+
 .. _llext_kconfig_edk:
 
 LLEXT EDK Kconfig options
@@ -202,7 +244,8 @@ LLEXT EDK Kconfig options
 The LLEXT EDK can be configured using the following Kconfig options:
 
 :kconfig:option:`CONFIG_LLEXT_EDK_NAME`
-    The name of the generated EDK tarball.
+    The name of the generated EDK tarball. This is also used as the prefix for
+    several variables defined in the EDK files.
 
 :kconfig:option:`CONFIG_LLEXT_EDK_USERSPACE_ONLY`
     If set, the EDK will include headers that do not contain code to route
diff --git a/doc/services/llext/load.rst b/doc/services/llext/load.rst
index a72913c0bdec1..5438b58f17b7c 100644
--- a/doc/services/llext/load.rst
+++ b/doc/services/llext/load.rst
@@ -11,9 +11,17 @@ Loading an extension
 An extension may be loaded using any implementation of a :c:struct:`llext_loader`
 which has a set of function pointers that provide the necessary functionality
 to read the ELF data. A loader also provides some minimal context (memory)
-needed by the :c:func:`llext_load` function. An implementation over a buffer
-containing an ELF in addressable memory in memory is available as
-:c:struct:`llext_buf_loader`.
+needed by the :c:func:`llext_load` function. Several loaders are already provided:
+
+ * An implementation over a buffer containing an ELF in addressable memory in
+   memory is available as :c:struct:`llext_buf_loader`. To use this kind of
+   loader, it is helpful to use one of the :c:macro:`LLEXT_TEMPORARY_BUF_LOADER`,
+   :c:macro:`LLEXT_PERSISTENT_BUF_LOADER`, or :c:macro:`LLEXT_WRITABLE_BUF_LOADER`
+   macros to tell LLEXT the appropriate type of memory buffer.
+
+ * An implementation that reads data from a file in the filesystem is available
+   as the :c:struct:`llext_fs_loader`. The path to the file must be provided
+   when creating the loader with the :c:macro:`LLEXT_FS_LOADER` macro.
 
 The extensions are loaded with a call to the :c:func:`llext_load` function,
 passing in the extension name and the configured loader. Once that completes
@@ -60,6 +68,10 @@ The returned ``void *`` can then be cast to the appropriate type and used.
 A wrapper for calling a function with no arguments is provided in
 :c:func:`llext_call_fn`.
 
+Advanced users that need direct access to areas of the newly loaded extension
+may want to refer to :c:func:`llext_get_section_info` and other LLEXT
+inspection APIs.
+
 Cleaning up after use
 =====================
 
diff --git a/doc/services/logging/index.rst b/doc/services/logging/index.rst
index 5aa868362b80f..86f5e97d8c960 100644
--- a/doc/services/logging/index.rst
+++ b/doc/services/logging/index.rst
@@ -758,8 +758,8 @@ Please refer to the :zephyr:code-sample:`logging-dictionary` sample to learn mor
 the log parser.
 
 
-Recommendations
-***************
+Recommendations and limitations
+*******************************
 
 The are following recommendations:
 
@@ -771,7 +771,7 @@ The are following recommendations:
   format specifier and it points to a constant string.
 * It is recommended to cast pointer to ``char *`` when it is used with ``%s``
   format specifier and it points to a transient string.
-* It is recommended to cast character pointer to non character pointer
+* It is required to cast a character pointer to non character pointer
   (e.g., ``void *``) when it is used with ``%p`` format specifier.
 
 .. code-block:: c
@@ -779,6 +779,11 @@ The are following recommendations:
    LOG_WRN("%s", str);
    LOG_WRN("%p", (void *)str);
 
+There are following limitations:
+
+* Logging does not support string format specifier with width (e.g., ``%.*s`` or ``%8s``). That
+  is because format string content is not used to build a log message, only argument types.
+
 Benchmark
 *********
 
@@ -836,9 +841,6 @@ When :kconfig:option:`CONFIG_LOG_MODE_IMMEDIATE` is used then log message is pro
 which includes string formatting. In case of that mode, stack usage will depend on which backends
 are used.
 
-:zephyr_file:`tests/subsys/logging/log_stack` test is used to characterize stack usage depending
-on mode, optimization and platform used. Test is using only the default backend.
-
 Some of the platforms characterization for log message with two ``integer`` arguments listed below:
 
 +---------------+----------+----------------------------+-----------+-----------------------------+
diff --git a/doc/services/misc.rst b/doc/services/misc.rst
index 95cb27b5bd09f..2c9ea5792f8a5 100644
--- a/doc/services/misc.rst
+++ b/doc/services/misc.rst
@@ -34,3 +34,16 @@ this API is limited to creating the simplistic tokens needed to
 authenticate with the Google Core IoT infrastructure.
 
 .. doxygengroup:: jwt
+
+Identifier APIs
+***************
+
+UUID
+====
+
+Universally Unique Identifiers (UUID), also known as Globally Unique
+IDentifiers (GUIDs) are an open, industry standard [RFC
+9562](https://tools.ietf.org/html/rfc9562) 128 bits long identifiers
+intended to guarantee uniqueness across space and time.
+
+.. doxygengroup:: uuid
diff --git a/doc/services/portability/posix/option_groups/index.rst b/doc/services/portability/posix/option_groups/index.rst
index 87a21fe7147c7..542ef326303e2 100644
--- a/doc/services/portability/posix/option_groups/index.rst
+++ b/doc/services/portability/posix/option_groups/index.rst
@@ -72,6 +72,25 @@ Group.
 For more information on developing Zephyr applications in the C programming language, please refer
 to :ref:`details<language_support>`.
 
+.. _posix_option_group_c_lang_support_r:
+
+POSIX_C_LANG_SUPPORT_R
+++++++++++++++++++++++
+
+Enable this option group with :kconfig:option:`CONFIG_POSIX_C_LANG_SUPPORT_R`.
+
+.. csv-table:: POSIX_C_LANG_SUPPORT_R
+   :header: API, Supported
+   :widths: 50,10
+
+    asctime_r(),yes
+    ctime_r(),yes
+    gmtime_r(),yes
+    localtime_r(),yes
+    rand_r(),yes
+    strerror_r(),yes
+    strtok_r(),yes
+
 .. _posix_option_group_c_lib_ext:
 
 POSIX_C_LIB_EXT
diff --git a/doc/services/retention/blinfo.rst b/doc/services/retention/blinfo.rst
index db9c548e9c7c0..b3422f273e385 100644
--- a/doc/services/retention/blinfo.rst
+++ b/doc/services/retention/blinfo.rst
@@ -15,7 +15,7 @@ Devicetree setup
 To use the bootloader information subsystem, a retention area needs to be
 created which has a retained data section as its parent, generally non-init RAM
 is used for this purpose. See the following example (examples in this guide are
-based on the :ref:`nrf52840dk_nrf52840` board and memory layout):
+based on the :zephyr:board:`nrf52840dk` board and memory layout):
 
 .. code-block:: devicetree
 
diff --git a/doc/services/retention/index.rst b/doc/services/retention/index.rst
index 7316fb0a5b690..b4ba1564dbbba 100644
--- a/doc/services/retention/index.rst
+++ b/doc/services/retention/index.rst
@@ -33,7 +33,7 @@ RAM as non-init for this purpose. The retention system is then initialised as a
 child node of this device 1 or more times - note that the memory region will
 need to be decremented to account for this reserved portion of RAM. See the
 following example (examples in this guide are based on the
-:ref:`nrf52840dk_nrf52840` board and memory layout):
+:zephyr:board:`nrf52840dk` board and memory layout):
 
 .. code-block:: devicetree
 
diff --git a/doc/services/secure_storage.rst b/doc/services/secure_storage.rst
deleted file mode 100644
index 5f7b90943b6fd..0000000000000
--- a/doc/services/secure_storage.rst
+++ /dev/null
@@ -1,119 +0,0 @@
-.. _secure_storage:
-
-Secure storage
-##############
-
-| The secure storage subsystem provides an implementation of the functions defined in the
-  `Platform Security Architecture (PSA) Secure Storage API <https://arm-software.github.io/psa-api/storage/>`_.
-| It can be enabled on :term:`board targets<board target>`
-  that don't already have an implementation of the API.
-
-Overview
-********
-
-The secure storage subsystem makes the PSA Secure Storage API available on all board targets with
-non-volatile memory support.
-As such, it provides an implementation of the API on those that don't already have one, ensuring
-functional support for the API.
-Board targets with :ref:`tfm` enabled (ending in ``/ns``), for instance,
-cannot enable the subsystem because TF-M already provides an implementation of the API.
-
-| In addition to providing functional support for the API, depending on
-  device-specific security features and the configuration, the subsystem
-  may secure the data stored via the PSA Secure Storage API at rest.
-| Keep in mind, however, that it's preferable to use a secure processing environment like TF-M when
-  possible because it's able to provide more security due to isolation guarantees.
-
-Limitations
-***********
-
-The secure storage subsystem's implementation of the PSA Secure Storage API:
-
-* does not aim at full compliance with the specification.
-
-  | Its foremost goal is functional support for the API on all board targets.
-  | See below for important ways the implementation deviates from the specification.
-
-* does not guarantee that the data it stores will be secure at rest in all cases.
-
-  This depends on device-specific security features and the configuration.
-
-* does not yet provide an implementation of the Protected Storage (PS) API as of this writing.
-
-  Instead, the PS API directly calls into the Internal Trusted Storage (ITS) API
-  (unless a `custom implementation <#whole-api>`_ of the PS API is provided).
-
-Below are some ways the implementation deviates from the specification
-and an explanation why. This is not an exhaustive list.
-
-* The data stored in the ITS is by default encrypted and authenticated (Against ``1.`` in
-  `3.2. Internal Trusted Storage requirements <https://arm-software.github.io/psa-api/storage/1.0/overview/requirements.html#internal-trusted-storage-requirements>`_.)
-
-  | The specification considers the storage underlying the ITS to be
-    ``implicitly confidential and protected from replay``
-    (`2.4. The Internal Trusted Storage API <https://arm-software.github.io/psa-api/storage/1.0/overview/architecture.html#the-internal-trusted-storage-api>`_)
-    because ``most embedded microprocessors (MCU) have on-chip flash storage that can be made
-    inaccessible except to software running on the MCU``
-    (`2.2. Technical Background <https://arm-software.github.io/psa-api/storage/1.0/overview/architecture.html#technical-background>`_).
-  | This is not the case on all MCUs. Thus, additional protection is provided to the stored data.
-
-  However, this does not guarantee that the data stored will be secure at rest in all cases,
-  because this depends on device-specific security features and the configuration.
-  It requires a random entropy source and especially a secure encryption key provider
-  (:kconfig:option:`CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_KEY_PROVIDER`).
-
-  In addition, the data stored in the ITS is not protected against replay attacks,
-  because this requires storage that is protected by hardware.
-
-* The data stored via the PSA Secure Storage API is not protected from direct
-  read/write by software or debugging. (Against ``2.`` and ``10.`` in
-  `3.2. Internal Trusted Storage requirements <https://arm-software.github.io/psa-api/storage/1.0/overview/requirements.html#internal-trusted-storage-requirements>`_.)
-
-  It is only secured at rest. Protecting it at runtime as well
-  requires specific hardware mechanisms to support this.
-
-Configuration
-*************
-
-To configure the implementation of the PSA Secure Storage API provided by Zephyr, have a look at the
-``CONFIG_SECURE_STORAGE_.*`` Kconfig options. They are defined in the various Kconfig files found
-under ``subsys/secure_storage/``.
-
-Customization
-*************
-
-Custom implementations can also replace those of Zephyr at different levels
-if the functionality provided by the existing implementations isn't enough.
-
-Whole API
-=========
-
-If you already have an implementation of the whole ITS or PS API and want to make use of it, you
-can do so by enabling the following Kconfig option and implementing the relevant functions:
-
-* :kconfig:option:`CONFIG_SECURE_STORAGE_ITS_IMPLEMENTATION_CUSTOM`, for the ITS API.
-* :kconfig:option:`CONFIG_SECURE_STORAGE_PS_IMPLEMENTATION_CUSTOM`, for the PS API.
-
-ITS API
-=======
-
-Zephyr's implementation of the ITS API
-(:kconfig:option:`CONFIG_SECURE_STORAGE_ITS_IMPLEMENTATION_ZEPHYR`)
-makes use of the ITS transform and store modules, which can be configured and customized separately.
-Have a look at the ``CONFIG_SECURE_STORAGE_ITS_(STORE|TRANSFORM)_.*_CUSTOM``
-Kconfig options to see the different customization possibilities.
-
-It's especially recommended to implement a custom encryption key provider
-(:kconfig:option:`CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_KEY_PROVIDER_CUSTOM`)
-that is more secure than the available options, if possible.
-
-Samples
-*******
-
-* :zephyr:code-sample:`persistent_key`
-* :zephyr:code-sample:`psa_its`
-
-PSA Secure Storage API reference
-********************************
-
-.. doxygengroup:: psa_secure_storage
diff --git a/doc/services/settings/index.rst b/doc/services/settings/index.rst
deleted file mode 100644
index 66c99d050a353..0000000000000
--- a/doc/services/settings/index.rst
+++ /dev/null
@@ -1,350 +0,0 @@
-.. _settings_api:
-
-Settings
-########
-
-The settings subsystem gives modules a way to store persistent per-device
-configuration and runtime state.  A variety of storage implementations are
-provided behind a common API using FCB, NVS, or a file system.  These different
-implementations give the application developer flexibility to select an
-appropriate storage medium, and even change it later as needs change.  This
-subsystem is used by various Zephyr components and can be used simultaneously by
-user applications.
-
-Settings items are stored as key-value pair strings.  By convention,
-the keys can be organized by the package and subtree defining the key,
-for example the key ``id/serial`` would define the ``serial`` configuration
-element for the package ``id``.
-
-Convenience routines are provided for converting a key value to
-and from a string type.
-
-For an example of the settings subsystem refer to :zephyr:code-sample:`settings` sample.
-
-.. note::
-
-   As of Zephyr release 2.1 the recommended backend for non-filesystem
-   storage is :ref:`NVS <nvs_api>`.
-
-Handlers
-********
-
-Settings handlers for subtree implement a set of handler functions.
-These are registered using a call to :c:func:`settings_register()` for
-dynamic handlers or defined using a call to :c:macro:`SETTINGS_STATIC_HANDLER_DEFINE()`
-for static handlers.
-
-**h_get**
-    This gets called when asking for a settings element value by its name using
-    :c:func:`settings_runtime_get()` from the runtime backend.
-
-**h_set**
-    This gets called when the value is loaded from persisted storage with
-    :c:func:`settings_load()`, or when using :c:func:`settings_runtime_set()` from the
-    runtime backend.
-
-**h_commit**
-    This gets called after the settings have been loaded in full.
-    Sometimes you don't want an individual setting value to take
-    effect right away, for example if there are multiple settings
-    which are interdependent.
-
-**h_export**
-    This gets called to write all current settings. This happens
-    when :c:func:`settings_save()` tries to save the settings or transfer to any
-    user-implemented back-end.
-
-Settings handlers also have a commit priority ``cprio`` that allows to prioritize
-the ``h_commit`` calls. This can be advantageous when e.g. a subsystem initializes
-a service that other ``h_commit`` calls depend on.
-
-Settings handlers ``h_commit`` routines are by default initialized with ``cprio = 0``,
-initializing a settings handler with a different priority is done using a call to
-:c:func:`settings_register_with_cprio()` for dynamic handlers or using a call to
-:c:macro:`SETTINGS_STATIC_HANDLER_DEFINE_WITH_CPRIO()` for static handlers. The
-specified ``cprio`` value is an integer where lower values mean higher priority.
-
-Backends
-********
-
-Backends are meant to load and save data to/from setting handlers, and
-implement a set of handler functions. These are registered using a call to
-:c:func:`settings_src_register()` for backends that can load data, and/or
-:c:func:`settings_dst_register()` for backends that can save data. The current
-implementation allows for multiple source backends but only a single destination
-backend.
-
-**csi_load**
-    This gets called when loading values from persistent storage using
-    :c:func:`settings_load()`.
-
-**csi_save**
-    This gets called when saving a single setting to persistent storage using
-    :c:func:`settings_save_one()`.
-
-**csi_save_start**
-    This gets called when starting a save of all current settings using
-    :c:func:`settings_save()` or :c:func:`settings_save_subtree()`.
-
-**csi_save_end**
-    This gets called after having saved of all current settings using
-    :c:func:`settings_save()` or :c:func:`settings_save_subtree()`.
-
-Zephyr Storage Backends
-***********************
-
-Zephyr has three storage backends: a Flash Circular Buffer
-(:kconfig:option:`CONFIG_SETTINGS_FCB`), a file in the filesystem
-(:kconfig:option:`CONFIG_SETTINGS_FILE`), or non-volatile storage
-(:kconfig:option:`CONFIG_SETTINGS_NVS`).
-
-You can declare multiple sources for settings; settings from
-all of these are restored when :c:func:`settings_load()` is called.
-
-There can be only one target for writing settings; this is where
-data is stored when you call :c:func:`settings_save()`, or :c:func:`settings_save_one()`.
-
-FCB read target is registered using :c:func:`settings_fcb_src()`, and write target
-using :c:func:`settings_fcb_dst()`. As a side-effect,  :c:func:`settings_fcb_src()`
-initializes the FCB area, so it must be called before calling
-:c:func:`settings_fcb_dst()`. File read target is registered using
-:c:func:`settings_file_src()`, and write target by using :c:func:`settings_file_dst()`.
-Non-volatile storage read target is registered using
-:c:func:`settings_nvs_src()`, and write target by using
-:c:func:`settings_nvs_dst()`.
-
-Storage Location
-****************
-
-The FCB and non-volatile storage (NVS) backends both look for a fixed
-partition with label "storage" by default. A different partition can be
-selected by setting the ``zephyr,settings-partition`` property of the
-chosen node in the devicetree.
-
-The file path used by the file backend to store settings is selected via the
-option :kconfig:option:`CONFIG_SETTINGS_FILE_PATH`.
-
-Loading data from persisted storage
-***********************************
-
-A call to :c:func:`settings_load()` uses an ``h_set`` implementation
-to load settings data from storage to volatile memory.
-After all data is loaded, the ``h_commit`` handler is issued,
-signalling the application that the settings were successfully
-retrieved.
-
-Technically FCB and file backends may store some history of the entities.
-This means that the newest data entity is stored after any
-older existing data entities.
-Starting with Zephyr 2.1, the back-end must filter out all old entities and
-call the callback with only the newest entity.
-
-Storing data to persistent storage
-**********************************
-
-A call to :c:func:`settings_save_one()` uses a backend implementation to store
-settings data to the storage medium. A call to :c:func:`settings_save()` uses an
-``h_export`` implementation to store different data in one operation using
-:c:func:`settings_save_one()`.
-A key need to be covered by a ``h_export`` only if it is supposed to be stored
-by :c:func:`settings_save()` call.
-
-For both FCB and file back-end only storage requests with data which
-changes most actual key's value are stored, therefore there is no need to check
-whether a value changed by the application. Such a storage mechanism implies
-that storage can contain multiple value assignments for a key , while only the
-last is the current value for the key.
-
-Garbage collection
-==================
-When storage becomes full (FCB) or consumes too much space (file),
-the backend removes non-recent key-value pairs records and unnecessary
-key-delete records.
-
-Secure domain settings
-**********************
-Currently settings doesn't provide scheme of being secure, and non-secure
-configuration storage simultaneously for the same instance.
-It is recommended that secure domain uses its own settings instance and it might
-provide data for non-secure domain using dedicated interface if needed
-(case dependent).
-
-Example: Device Configuration
-*****************************
-
-This is a simple example, where the settings handler only implements ``h_set``
-and ``h_export``. ``h_set`` is called when the value is restored from storage
-(or when set initially), and ``h_export`` is used to write the value to
-storage thanks to ``storage_func()``. The user can also implement some other
-export functionality, for example, writing to the shell console).
-
-.. code-block:: c
-
-    #define DEFAULT_FOO_VAL_VALUE 1
-
-    static int8 foo_val = DEFAULT_FOO_VAL_VALUE;
-
-    static int foo_settings_set(const char *name, size_t len,
-                                settings_read_cb read_cb, void *cb_arg)
-    {
-        const char *next;
-        int rc;
-
-        if (settings_name_steq(name, "bar", &next) && !next) {
-            if (len != sizeof(foo_val)) {
-                return -EINVAL;
-            }
-
-            rc = read_cb(cb_arg, &foo_val, sizeof(foo_val));
-            if (rc >= 0) {
-                /* key-value pair was properly read.
-                 * rc contains value length.
-                 */
-                return 0;
-            }
-            /* read-out error */
-            return rc;
-        }
-
-        return -ENOENT;
-    }
-
-    static int foo_settings_export(int (*storage_func)(const char *name,
-                                                       const void *value,
-                                                       size_t val_len))
-    {
-        return storage_func("foo/bar", &foo_val, sizeof(foo_val));
-    }
-
-    struct settings_handler my_conf = {
-        .name = "foo",
-        .h_set = foo_settings_set,
-        .h_export = foo_settings_export
-    };
-
-Example: Persist Runtime State
-******************************
-
-This is a simple example showing how to persist runtime state. In this example,
-only ``h_set`` is defined, which is used when restoring value from
-persisted storage.
-
-In this example, the ``main`` function increments ``foo_val``, and then
-persists the latest number. When the system restarts, the application calls
-:c:func:`settings_load()` while initializing, and ``foo_val`` will continue counting
-up from where it was before restart.
-
-.. code-block:: c
-
-    #include <zephyr/kernel.h>
-    #include <zephyr/sys/reboot.h>
-    #include <zephyr/settings/settings.h>
-    #include <zephyr/sys/printk.h>
-    #include <inttypes.h>
-
-    #define DEFAULT_FOO_VAL_VALUE 0
-
-    static uint8_t foo_val = DEFAULT_FOO_VAL_VALUE;
-
-    static int foo_settings_set(const char *name, size_t len,
-                                settings_read_cb read_cb, void *cb_arg)
-    {
-        const char *next;
-        int rc;
-
-        if (settings_name_steq(name, "bar", &next) && !next) {
-            if (len != sizeof(foo_val)) {
-                return -EINVAL;
-            }
-
-            rc = read_cb(cb_arg, &foo_val, sizeof(foo_val));
-            if (rc >= 0) {
-                return 0;
-            }
-
-            return rc;
-        }
-
-
-        return -ENOENT;
-    }
-
-    struct settings_handler my_conf = {
-        .name = "foo",
-        .h_set = foo_settings_set
-    };
-
-    int main(void)
-    {
-        settings_subsys_init();
-        settings_register(&my_conf);
-        settings_load();
-
-        foo_val++;
-        settings_save_one("foo/bar", &foo_val, sizeof(foo_val));
-
-        printk("foo: %d\n", foo_val);
-
-        k_msleep(1000);
-        sys_reboot(SYS_REBOOT_COLD);
-    }
-
-Example: Custom Backend Implementation
-**************************************
-
-This is a simple example showing how to register a simple custom backend
-handler (:kconfig:option:`CONFIG_SETTINGS_CUSTOM`).
-
-.. code-block:: c
-
-    static int settings_custom_load(struct settings_store *cs,
-                                    const struct settings_load_arg *arg)
-    {
-        //...
-    }
-
-    static int settings_custom_save(struct settings_store *cs, const char *name,
-                                    const char *value, size_t val_len)
-    {
-        //...
-    }
-
-    /* custom backend interface */
-    static struct settings_store_itf settings_custom_itf = {
-        .csi_load = settings_custom_load,
-        .csi_save = settings_custom_save,
-    };
-
-    /* custom backend node */
-    static struct settings_store settings_custom_store = {
-        .cs_itf = &settings_custom_itf
-    };
-
-    int settings_backend_init(void)
-    {
-        /* register custom backend */
-        settings_dst_register(&settings_custom_store);
-        settings_src_register(&settings_custom_store);
-        return 0;
-    }
-
-API Reference
-*************
-
-The Settings subsystem APIs are provided by :zephyr_file:`include/zephyr/settings/settings.h`.
-
-API for general settings usage
-==============================
-.. doxygengroup:: settings
-
-API for key-name processing
-===========================
-.. doxygengroup:: settings_name_proc
-
-API for runtime settings manipulation
-=====================================
-.. doxygengroup:: settings_rt
-
-API of backend interface
-========================
-..  doxygengroup:: settings_backend
diff --git a/doc/services/shell/index.rst b/doc/services/shell/index.rst
index d1aa82dc7a3d0..c747c00fc846f 100644
--- a/doc/services/shell/index.rst
+++ b/doc/services/shell/index.rst
@@ -110,7 +110,7 @@ Details on the configuration settings are captured in the following files:
 - :zephyr_file:`snippets/nus-console/nus-console.conf`.
 - :zephyr_file:`snippets/nus-console/nus-console.overlay`.
 
-Segget RTT
+Segger RTT
 ==========
 
 To configure Segger RTT backend, add the following configurations to your build:
diff --git a/doc/services/storage/index.rst b/doc/services/storage/index.rst
index f6e069ecf2ab1..0fe31e8edccb8 100644
--- a/doc/services/storage/index.rst
+++ b/doc/services/storage/index.rst
@@ -12,3 +12,5 @@ Storage
    flash_map/flash_map.rst
    fcb/fcb.rst
    stream/stream_flash.rst
+   secure_storage/index.rst
+   settings/index.rst
diff --git a/doc/services/storage/secure_storage/index.rst b/doc/services/storage/secure_storage/index.rst
new file mode 100644
index 0000000000000..83eb7aa4dace2
--- /dev/null
+++ b/doc/services/storage/secure_storage/index.rst
@@ -0,0 +1,119 @@
+.. _secure_storage:
+
+Secure Storage
+##############
+
+| The secure storage subsystem provides an implementation of the functions defined in the
+  `Platform Security Architecture (PSA) Secure Storage API <https://arm-software.github.io/psa-api/storage/>`_.
+| It can be enabled on :term:`board targets<board target>`
+  that don't already have an implementation of the API.
+
+Overview
+********
+
+The secure storage subsystem makes the PSA Secure Storage API available on all board targets with
+non-volatile memory support.
+As such, it provides an implementation of the API on those that don't already have one, ensuring
+functional support for the API.
+Board targets with :ref:`tfm` enabled (ending in ``/ns``), for instance,
+cannot enable the subsystem because TF-M already provides an implementation of the API.
+
+| In addition to providing functional support for the API, depending on
+  device-specific security features and the configuration, the subsystem
+  may secure the data stored via the PSA Secure Storage API at rest.
+| Keep in mind, however, that it's preferable to use a secure processing environment like TF-M when
+  possible because it's able to provide more security due to isolation guarantees.
+
+Limitations
+***********
+
+The secure storage subsystem's implementation of the PSA Secure Storage API:
+
+* does not aim at full compliance with the specification.
+
+  | Its foremost goal is functional support for the API on all board targets.
+  | See below for important ways the implementation deviates from the specification.
+
+* does not guarantee that the data it stores will be secure at rest in all cases.
+
+  This depends on device-specific security features and the configuration.
+
+* does not yet provide an implementation of the Protected Storage (PS) API as of this writing.
+
+  Instead, the PS API directly calls into the Internal Trusted Storage (ITS) API
+  (unless a `custom implementation <#whole-api>`_ of the PS API is provided).
+
+Below are some ways the implementation deviates from the specification
+and an explanation why. This is not an exhaustive list.
+
+* The data stored in the ITS is by default encrypted and authenticated (Against ``1.`` in
+  `3.2. Internal Trusted Storage requirements <https://arm-software.github.io/psa-api/storage/1.0/overview/requirements.html#internal-trusted-storage-requirements>`_.)
+
+  | The specification considers the storage underlying the ITS to be
+    ``implicitly confidential and protected from replay``
+    (`2.4. The Internal Trusted Storage API <https://arm-software.github.io/psa-api/storage/1.0/overview/architecture.html#the-internal-trusted-storage-api>`_)
+    because ``most embedded microprocessors (MCU) have on-chip flash storage that can be made
+    inaccessible except to software running on the MCU``
+    (`2.2. Technical Background <https://arm-software.github.io/psa-api/storage/1.0/overview/architecture.html#technical-background>`_).
+  | This is not the case on all MCUs. Thus, additional protection is provided to the stored data.
+
+  However, this does not guarantee that the data stored will be secure at rest in all cases,
+  because this depends on device-specific security features and the configuration.
+  It requires a random entropy source and especially a secure encryption key provider
+  (:kconfig:option:`CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_KEY_PROVIDER`).
+
+  In addition, the data stored in the ITS is not protected against replay attacks,
+  because this requires storage that is protected by hardware.
+
+* The data stored via the PSA Secure Storage API is not protected from direct
+  read/write by software or debugging. (Against ``2.`` and ``10.`` in
+  `3.2. Internal Trusted Storage requirements <https://arm-software.github.io/psa-api/storage/1.0/overview/requirements.html#internal-trusted-storage-requirements>`_.)
+
+  It is only secured at rest. Protecting it at runtime as well
+  requires specific hardware mechanisms to support this.
+
+Configuration
+*************
+
+To configure the implementation of the PSA Secure Storage API provided by Zephyr, have a look at the
+``CONFIG_SECURE_STORAGE_.*`` Kconfig options. They are defined in the various Kconfig files found
+under ``subsys/secure_storage/``.
+
+Customization
+*************
+
+Custom implementations can also replace those of Zephyr at different levels
+if the functionality provided by the existing implementations isn't enough.
+
+Whole API
+=========
+
+If you already have an implementation of the whole ITS or PS API and want to make use of it, you
+can do so by enabling the following Kconfig option and implementing the relevant functions:
+
+* :kconfig:option:`CONFIG_SECURE_STORAGE_ITS_IMPLEMENTATION_CUSTOM`, for the ITS API.
+* :kconfig:option:`CONFIG_SECURE_STORAGE_PS_IMPLEMENTATION_CUSTOM`, for the PS API.
+
+ITS API
+=======
+
+Zephyr's implementation of the ITS API
+(:kconfig:option:`CONFIG_SECURE_STORAGE_ITS_IMPLEMENTATION_ZEPHYR`)
+makes use of the ITS transform and store modules, which can be configured and customized separately.
+Have a look at the ``CONFIG_SECURE_STORAGE_ITS_(STORE|TRANSFORM)_.*_CUSTOM``
+Kconfig options to see the different customization possibilities.
+
+It's especially recommended to implement a custom encryption key provider
+(:kconfig:option:`CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_KEY_PROVIDER_CUSTOM`)
+that is more secure than the available options, if possible.
+
+Samples
+*******
+
+* :zephyr:code-sample:`persistent_key`
+* :zephyr:code-sample:`psa_its`
+
+PSA Secure Storage API reference
+********************************
+
+.. doxygengroup:: psa_secure_storage
diff --git a/doc/services/storage/settings/index.rst b/doc/services/storage/settings/index.rst
new file mode 100644
index 0000000000000..4f8831e3a11ee
--- /dev/null
+++ b/doc/services/storage/settings/index.rst
@@ -0,0 +1,365 @@
+.. _settings_api:
+
+Settings
+########
+
+The settings subsystem gives modules a way to store persistent per-device
+configuration and runtime state.  A variety of storage implementations are
+provided behind a common API using FCB, NVS, ZMS or a file system.  These
+different implementations give the application developer flexibility to select
+an appropriate storage medium, and even change it later as needs change.  This
+subsystem is used by various Zephyr components and can be used simultaneously by
+user applications.
+
+Settings items are stored as key-value pair strings.  By convention,
+the keys can be organized by the package and subtree defining the key,
+for example the key ``id/serial`` would define the ``serial`` configuration
+element for the package ``id``.
+
+Convenience routines are provided for converting a key value to
+and from a string type.
+
+For an example of the settings subsystem refer to :zephyr:code-sample:`settings` sample.
+
+.. note::
+
+   As of Zephyr release 4.1 the recommended backends for non-filesystem
+   storage are :ref:`NVS <nvs_api>` and :ref:`ZMS <zms_api>`.
+
+Handlers
+********
+
+Settings handlers for subtree implement a set of handler functions.
+These are registered using a call to :c:func:`settings_register()` for
+dynamic handlers or defined using a call to :c:macro:`SETTINGS_STATIC_HANDLER_DEFINE()`
+for static handlers.
+
+**h_get**
+    This gets called when asking for a settings element value by its name using
+    :c:func:`settings_runtime_get()` from the runtime backend.
+
+**h_set**
+    This gets called when the value is loaded from persistent storage with
+    :c:func:`settings_load()`, or when using :c:func:`settings_runtime_set()` from the
+    runtime backend.
+
+**h_commit**
+    This gets called after the settings have been loaded in full.
+    Sometimes you don't want an individual setting value to take
+    effect right away, for example if there are multiple settings
+    which are interdependent.
+
+**h_export**
+    This gets called to write all current settings. This happens
+    when :c:func:`settings_save()` tries to save the settings or transfer to any
+    user-implemented back-end.
+
+Settings handlers also have a commit priority ``cprio`` that allows to prioritize
+the ``h_commit`` calls. This can be advantageous when e.g. a subsystem initializes
+a service that other ``h_commit`` calls depend on.
+
+Settings handlers ``h_commit`` routines are by default initialized with ``cprio = 0``,
+initializing a settings handler with a different priority is done using a call to
+:c:func:`settings_register_with_cprio()` for dynamic handlers or using a call to
+:c:macro:`SETTINGS_STATIC_HANDLER_DEFINE_WITH_CPRIO()` for static handlers. The
+specified ``cprio`` value is an integer where lower values mean higher priority.
+
+Backends
+********
+
+Backends are meant to load and save data to/from setting handlers, and
+implement a set of handler functions. These are registered using a call to
+:c:func:`settings_src_register()` for backends that can load data, and/or
+:c:func:`settings_dst_register()` for backends that can save data. The current
+implementation allows for multiple source backends but only a single destination
+backend.
+
+**csi_load**
+    This gets called when loading values from persistent storage using
+    :c:func:`settings_load()`.
+
+**csi_save**
+    This gets called when saving a single setting to persistent storage using
+    :c:func:`settings_save_one()`.
+
+**csi_save_start**
+    This gets called when starting a save of all current settings using
+    :c:func:`settings_save()` or :c:func:`settings_save_subtree()`.
+
+**csi_save_end**
+    This gets called after having saved of all current settings using
+    :c:func:`settings_save()` or :c:func:`settings_save_subtree()`.
+
+Zephyr Storage Backends
+***********************
+
+Zephyr offers the following storage backends:
+
+* Flash Circular Buffer (:kconfig:option:`CONFIG_SETTINGS_FCB`).
+* A file in the filesystem (:kconfig:option:`CONFIG_SETTINGS_FILE`).
+* Non-Volatile Storage (:kconfig:option:`CONFIG_SETTINGS_NVS`).
+* Zephyr Memory Storage (:kconfig:option:`CONFIG_SETTINGS_ZMS`).
+
+You can declare multiple sources for settings; settings from
+all of these are restored when :c:func:`settings_load()` is called.
+
+There can be only one target for writing settings; this is where
+data is stored when you call :c:func:`settings_save()`, or :c:func:`settings_save_one()`.
+
+FCB read target is registered using :c:func:`settings_fcb_src()`, and write target
+using :c:func:`settings_fcb_dst()`. As a side-effect,  :c:func:`settings_fcb_src()`
+initializes the FCB area, so it must be called before calling
+:c:func:`settings_fcb_dst()`. File read target is registered using
+:c:func:`settings_file_src()`, and write target by using :c:func:`settings_file_dst()`.
+
+Non-volatile storage read target is registered using
+:c:func:`settings_nvs_src()`, and write target by using
+:c:func:`settings_nvs_dst()`.
+
+Zephyr Memory Storage (ZMS) read target is registered using :c:func:`settings_zms_src()`,
+and write target is registered using :c:func:`settings_zms_dst()`.
+
+ZMS backend has the particularity of using hash functions to hash the settings
+key before storing it to the persistent storage. This implementation implies
+that some collisions between key's hashes could occur if a big number of
+different keys are stored. This number depends on the selected hash function.
+
+ZMS backend can handle :math:`2^n` maximum collisions where n is defined by
+(:kconfig:option:`SETTINGS_ZMS_MAX_COLLISIONS_BITS`).
+
+
+Storage Location
+****************
+
+The FCB, non-volatile storage (NVS) and ZMS backends look for a fixed
+partition with label "storage" by default. A different partition can be
+selected by setting the ``zephyr,settings-partition`` property of the
+chosen node in the devicetree.
+
+The file path used by the file backend to store settings is selected via the
+option :kconfig:option:`CONFIG_SETTINGS_FILE_PATH`.
+
+Loading data from persistent storage
+************************************
+
+A call to :c:func:`settings_load()` uses an ``h_set`` implementation
+to load settings data from storage to volatile memory.
+After all data is loaded, the ``h_commit`` handler is issued,
+signalling the application that the settings were successfully
+retrieved.
+
+Technically FCB and file backends may store some history of the entities.
+This means that the newest data entity is stored after any
+older existing data entities.
+Starting with Zephyr 2.1, the back-end must filter out all old entities and
+call the callback with only the newest entity.
+
+Storing data to persistent storage
+**********************************
+
+A call to :c:func:`settings_save_one()` uses a backend implementation to store
+settings data to the storage medium. A call to :c:func:`settings_save()` uses an
+``h_export`` implementation to store different data in one operation using
+:c:func:`settings_save_one()`.
+A key needs to be covered by a ``h_export`` only if it is supposed to be stored
+by :c:func:`settings_save()` call.
+
+For both FCB and file back-end only storage requests with data which
+changes most actual key's value are stored, therefore there is no need to check
+whether a value changed by the application. Such a storage mechanism implies
+that storage can contain multiple value assignments for a key , while only the
+last is the current value for the key.
+
+Garbage collection
+==================
+When storage becomes full (FCB) or consumes too much space (file),
+the backend removes non-recent key-value pairs records and unnecessary
+key-delete records.
+
+Secure domain settings
+**********************
+Currently settings doesn't provide scheme of being secure, and non-secure
+configuration storage simultaneously for the same instance.
+It is recommended that secure domain uses its own settings instance and it might
+provide data for non-secure domain using dedicated interface if needed
+(case dependent).
+
+Example: Device Configuration
+*****************************
+
+This is a simple example, where the settings handler only implements ``h_set``
+and ``h_export``. ``h_set`` is called when the value is restored from storage
+(or when set initially), and ``h_export`` is used to write the value to
+storage thanks to ``storage_func()``. The user can also implement some other
+export functionality, for example, writing to the shell console).
+
+.. code-block:: c
+
+    #define DEFAULT_FOO_VAL_VALUE 1
+
+    static int8 foo_val = DEFAULT_FOO_VAL_VALUE;
+
+    static int foo_settings_set(const char *name, size_t len,
+                                settings_read_cb read_cb, void *cb_arg)
+    {
+        const char *next;
+        int rc;
+
+        if (settings_name_steq(name, "bar", &next) && !next) {
+            if (len != sizeof(foo_val)) {
+                return -EINVAL;
+            }
+
+            rc = read_cb(cb_arg, &foo_val, sizeof(foo_val));
+            if (rc >= 0) {
+                /* key-value pair was properly read.
+                 * rc contains value length.
+                 */
+                return 0;
+            }
+            /* read-out error */
+            return rc;
+        }
+
+        return -ENOENT;
+    }
+
+    static int foo_settings_export(int (*storage_func)(const char *name,
+                                                       const void *value,
+                                                       size_t val_len))
+    {
+        return storage_func("foo/bar", &foo_val, sizeof(foo_val));
+    }
+
+    struct settings_handler my_conf = {
+        .name = "foo",
+        .h_set = foo_settings_set,
+        .h_export = foo_settings_export
+    };
+
+Example: Persist Runtime State
+******************************
+
+This is a simple example showing how to persist runtime state. In this example,
+only ``h_set`` is defined, which is used when restoring value from
+persistent storage.
+
+In this example, the ``main`` function increments ``foo_val``, and then
+persists the latest number. When the system restarts, the application calls
+:c:func:`settings_load()` while initializing, and ``foo_val`` will continue counting
+up from where it was before restart.
+
+.. code-block:: c
+
+    #include <zephyr/kernel.h>
+    #include <zephyr/sys/reboot.h>
+    #include <zephyr/settings/settings.h>
+    #include <zephyr/sys/printk.h>
+    #include <inttypes.h>
+
+    #define DEFAULT_FOO_VAL_VALUE 0
+
+    static uint8_t foo_val = DEFAULT_FOO_VAL_VALUE;
+
+    static int foo_settings_set(const char *name, size_t len,
+                                settings_read_cb read_cb, void *cb_arg)
+    {
+        const char *next;
+        int rc;
+
+        if (settings_name_steq(name, "bar", &next) && !next) {
+            if (len != sizeof(foo_val)) {
+                return -EINVAL;
+            }
+
+            rc = read_cb(cb_arg, &foo_val, sizeof(foo_val));
+            if (rc >= 0) {
+                return 0;
+            }
+
+            return rc;
+        }
+
+
+        return -ENOENT;
+    }
+
+    struct settings_handler my_conf = {
+        .name = "foo",
+        .h_set = foo_settings_set
+    };
+
+    int main(void)
+    {
+        settings_subsys_init();
+        settings_register(&my_conf);
+        settings_load();
+
+        foo_val++;
+        settings_save_one("foo/bar", &foo_val, sizeof(foo_val));
+
+        printk("foo: %d\n", foo_val);
+
+        k_msleep(1000);
+        sys_reboot(SYS_REBOOT_COLD);
+    }
+
+Example: Custom Backend Implementation
+**************************************
+
+This is a simple example showing how to register a simple custom backend
+handler (:kconfig:option:`CONFIG_SETTINGS_CUSTOM`).
+
+.. code-block:: c
+
+    static int settings_custom_load(struct settings_store *cs,
+                                    const struct settings_load_arg *arg)
+    {
+        //...
+    }
+
+    static int settings_custom_save(struct settings_store *cs, const char *name,
+                                    const char *value, size_t val_len)
+    {
+        //...
+    }
+
+    /* custom backend interface */
+    static struct settings_store_itf settings_custom_itf = {
+        .csi_load = settings_custom_load,
+        .csi_save = settings_custom_save,
+    };
+
+    /* custom backend node */
+    static struct settings_store settings_custom_store = {
+        .cs_itf = &settings_custom_itf
+    };
+
+    int settings_backend_init(void)
+    {
+        /* register custom backend */
+        settings_dst_register(&settings_custom_store);
+        settings_src_register(&settings_custom_store);
+        return 0;
+    }
+
+API Reference
+*************
+
+The Settings subsystem APIs are provided by :zephyr_file:`include/zephyr/settings/settings.h`.
+
+API for general settings usage
+==============================
+.. doxygengroup:: settings
+
+API for key-name processing
+===========================
+.. doxygengroup:: settings_name_proc
+
+API for runtime settings manipulation
+=====================================
+.. doxygengroup:: settings_rt
+
+API of backend interface
+========================
+..  doxygengroup:: settings_backend
diff --git a/doc/services/storage/zms/zms.rst b/doc/services/storage/zms/zms.rst
index 3523bfc5eae02..8a94e6d5992e0 100644
--- a/doc/services/storage/zms/zms.rst
+++ b/doc/services/storage/zms/zms.rst
@@ -15,15 +15,15 @@ pairs until it is full.
 The key-value pair is divided into two parts:
 
 - The key part is written in an ATE (Allocation Table Entry) called "ID-ATE" which is stored
-  starting from the bottom of the sector
-- The value part is defined as "DATA" and is stored raw starting from the top of the sector
+  starting from the bottom of the sector.
+- The value part is defined as "data" and is stored raw starting from the top of the sector.
 
-Additionally, for each sector we store at the last positions Header-ATEs which are ATEs that
+Additionally, for each sector we store at the last positions header ATEs which are ATEs that
 are needed for the sector to describe its status (closed, open) and the current version of ZMS.
 
 When the current sector is full we verify first that the following sector is empty, we garbage
-collect the N+2 sector (where N is the current sector number) by moving the valid ATEs to the
-N+1 empty sector, we erase the garbage collected sector and then we close the current sector by
+collect the sector N+2 (where N is the current sector number) by moving the valid ATEs to the
+N+1 empty sector, we erase the garbage-collected sector and then we close the current sector by
 writing a garbage_collect_done ATE and the close ATE (one of the header entries).
 Afterwards we move forward to the next sector and start writing entries again.
 
@@ -60,50 +60,50 @@ A sector is organized in this form (example with 3 sectors):
      -    .
      -    .
    * -    .
-     - ATE_b2
-     - ATE_c2
-   * - ATE_a2
-     - ATE_b1
-     - ATE_c1
-   * - ATE_a1
-     - ATE_b0
-     - ATE_c0
-   * - ATE_a0
-     - GC_done
-     - GC_done
-   * - Close (cyc=1)
-     - Close (cyc=1)
-     - Close (cyc=1)
-   * - Empty (cyc=1)
-     - Empty (cyc=2)
-     - Empty (cyc=2)
+     - ID ATE_b2
+     - ID ATE_c2
+   * - ID ATE_a2
+     - ID ATE_b1
+     - ID ATE_c1
+   * - ID ATE_a1
+     - ID ATE_b0
+     - ID ATE_c0
+   * - ID ATE_a0
+     - GC_done ATE
+     - GC_done ATE
+   * - Close ATE (cyc=1)
+     - Close ATE (cyc=1)
+     - Close ATE (cyc=1)
+   * - Empty ATE (cyc=1)
+     - Empty ATE (cyc=2)
+     - Empty ATE (cyc=2)
 
 Definition of each element in the sector
 ========================================
 
-``Empty ATE:`` is written when erasing a sector (last position of the sector).
+``Empty ATE`` is written when erasing a sector (last position of the sector).
 
-``Close ATE:`` is written when closing a sector (second to last position of the sector).
+``Close ATE`` is written when closing a sector (second to last position of the sector).
 
-``GC_done ATE:`` is written to indicate that the next sector has been already garbage
-collected. This ATE could be in any position of the sector.
+``GC_done ATE`` is written to indicate that the next sector has already been garbage-collected.
+This ATE could be at any position of the sector.
 
-``ID-ATE:`` are entries that contain a 32 bits Key and describe where the data is stored, its
-size and its crc32
+``ID ATE`` are entries that contain a 32-bit key and describe where the data is stored, its
+size and its CRC32.
 
-``Data:`` is the actual value associated to the ID-ATE
+``Data`` is the actual value associated to the ID-ATE.
 
 How does ZMS work?
 ******************
 
-Mounting the Storage system
+Mounting the storage system
 ===========================
 
-Mounting the storage starts by getting the flash parameters, checking that the file system
+Mounting the storage system starts by getting the flash parameters, checking that the file system
 properties are correct (sector_size, sector_count ...) then calling the zms_init function to
 make the storage ready.
 
-To mount the filesystem some elements in the zms_fs structure must be initialized.
+To mount the filesystem the following elements in the ``zms_fs`` structure must be initialized:
 
 .. code-block:: c
 
@@ -125,43 +125,44 @@ To mount the filesystem some elements in the zms_fs structure must be initialize
 Initialization
 ==============
 
-As ZMS has a fast-forward write mechanism, we must find the last sector and the last pointer of
+As ZMS has a fast-forward write mechanism, it must find the last sector and the last pointer of
 the entry where it stopped the last time.
 It must look for a closed sector followed by an open one, then within the open sector, it finds
-(recover) the last written ATE (Allocation Table Entry).
+(recovers) the last written ATE.
 After that, it checks that the sector after this one is empty, or it will erase it.
 
-ZMS ID-Data write
+ZMS ID/data write
 ===================
 
-To avoid rewriting the same data with the same ID again, it must look in all the sectors if the
-same ID exist then compares its data, if the data is identical no write is performed.
-If we must perform a write, then an ATE and Data (if not a delete) are written in the sector.
-If the sector is full (cannot hold the current data + ATE) we have to move to the next sector,
+To avoid rewriting the same data with the same ID again, ZMS must look in all the sectors if the
+same ID exists and then compares its data. If the data is identical, no write is performed.
+If it must perform a write, then an ATE and the data (if the operation is not a delete) are written
+in the sector.
+If the sector is full (cannot hold the current data + ATE), ZMS has to move to the next sector,
 garbage collect the sector after the newly opened one then erase it.
-Data size that is smaller or equal to 8 bytes are written within the ATE.
+Data whose size is smaller or equal to 8 bytes are written within the ATE.
 
 ZMS ID/data read (with history)
 ===============================
 
-By default it looks for the last data with the same ID by browsing through all stored ATEs from
+By default ZMS looks for the last data with the same ID by browsing through all stored ATEs from
 the most recent ones to the oldest ones. If it finds a valid ATE with a matching ID it retrieves
 its data and returns the number of bytes that were read.
-If history count is provided that is different than 0, older data with same ID is retrieved.
+If a history count is provided and different than 0, older data with same ID is retrieved.
 
 ZMS free space calculation
 ==========================
 
 ZMS can also return the free space remaining in the partition.
-However, this operation is very time consuming and needs to browse all valid ATEs in all sectors
-of the partition and for each valid ATE try to find if an older one exist.
-It is not recommended for application to use this function often, as it is time consuming and
+However, this operation is very time-consuming as it needs to browse through all valid ATEs
+in all sectors of the partition and for each valid ATE try to find if an older one exists.
+It is not recommended for applications to use this function often, as it is time-consuming and
 could slow down the calling thread.
 
 The cycle counter
 =================
 
-Each sector has a lead cycle counter which is a uin8_t that is used to validate all the other
+Each sector has a lead cycle counter which is a ``uin8_t`` that is used to validate all the other
 ATEs.
 The lead cycle counter is stored in the empty ATE.
 To become valid, an ATE must have the same cycle counter as the one stored in the empty ATE.
@@ -179,88 +180,68 @@ counter as the empty ATE.
 When closing a sector, all the remaining space that has not been used is filled with garbage data
 to avoid having old ATEs with a valid cycle counter.
 
-Triggering Garbage collection
+Triggering garbage collection
 =============================
 
 Some applications need to make sure that storage writes have a maximum defined latency.
-When calling a ZMS write, the current sector could be almost full and we need to trigger the GC
-to switch to the next sector.
-This operation is time consuming and it will cause some applications to not meet their real time
+When calling ZMS to make a write, the current sector could be almost full such that ZMS needs to
+trigger the GC to switch to the next sector.
+This operation is time-consuming and will cause some applications to not meet their real time
 constraints.
 ZMS adds an API for the application to get the current remaining free space in a sector.
-The application could then decide when needed to switch to the next sector if the current one is
-almost full and of course it will trigger the garbage collection on the next sector.
+The application could then decide when to switch to the next sector if the current one is almost
+full. This will of course trigger the garbage collection operation on the next sector.
 This will guarantee the application that the next write won't trigger the garbage collection.
 
 ATE (Allocation Table Entry) structure
 ======================================
 
-An entry has 16 bytes divided between these variables :
+An entry has 16 bytes divided between these fields:
 
-.. code-block:: c
+See the :c:struct:`zms_ate` structure.
 
-	struct zms_ate {
-		uint8_t crc8;      /* crc8 check of the entry */
-		uint8_t cycle_cnt; /* cycle counter for non-erasable devices */
-		uint16_t len;      /* data len within sector */
-		uint32_t id;       /* data id */
-		union {
-			uint8_t data[8]; /* used to store small size data */
-			struct {
-				uint32_t offset; /* data offset within sector */
-				union {
-					uint32_t data_crc; /* crc for data */
-					uint32_t metadata; /* Used to store metadata information
-							    * such as storage version.
-							    */
-				};
-			};
-		};
-	} __packed;
-
-.. note:: The CRC of the data is checked only when the whole the element is read.
+.. note:: The CRC of the data is checked only when a full read of the data is made.
    The CRC of the data is not checked for a partial read, as it is computed for the whole element.
 
-.. note:: Enabling the CRC feature on previously existing ZMS content without CRC enabled
-   will make all existing data invalid.
-
-.. _free-space:
+.. warning:: Enabling the CRC feature on previously existing ZMS content that did not have it
+   enabled will make all existing data invalid.
 
 Available space for user data (key-value pairs)
 ***********************************************
 
-For both scenarios ZMS should always have an empty sector to be able to perform the
-garbage collection (GC).
+ZMS always needs an empty sector to be able to perform the garbage collection (GC).
 So, if we suppose that 4 sectors exist in a partition, ZMS will only use 3 sectors to store
-Key-value pairs and keep one sector empty to be able to launch GC.
+key-value pairs and keep one sector empty to be able to perform GC.
 The empty sector will rotate between the 4 sectors in the partition.
 
-.. note:: The maximum single data length that could be written at once in a sector is 64K
-   (This could change in future versions of ZMS)
+.. note:: The maximum single data length that can be written at once in a sector is 64K
+   (this could change in future versions of ZMS).
 
 Small data values
 =================
 
-Values smaller than 8 bytes will be stored within the entry (ATE) itself, without writing data
-at the top of the sector.
+Values smaller than or equal to 8 bytes will be stored within the entry (ATE) itself, without
+writing data at the top of the sector.
 ZMS has an entry size of 16 bytes which means that the maximum available space in a partition to
-store data is computed in this scenario as :
+store data is computed in this scenario as:
 
 .. math::
 
-   \small\frac{(NUM\_SECTORS - 1) \times (SECTOR\_SIZE - (5 \times ATE\_SIZE))}{2}
+   \small\frac{(NUM\_SECTORS - 1) \times (SECTOR\_SIZE - (5 \times ATE\_SIZE)) \times (DATA\_SIZE)}{ATE\_SIZE}
 
 Where:
 
-``NUM_SECTOR:`` Total number of sectors
+``NUM_SECTOR``: Total number of sectors
+
+``SECTOR_SIZE``: Size of the sector
 
-``SECTOR_SIZE:`` Size of the sector
+``ATE_SIZE``: 16 bytes
 
-``ATE_SIZE:`` 16 bytes
+``(5 * ATE_SIZE)``: Reserved ATEs for header and delete items
 
-``(5 * ATE_SIZE):`` Reserved ATEs for header and delete items
+``DATA_SIZE``: Size of the small data values (range from 1 to 8)
 
-For example for 4 sectors of 1024 bytes, free space for data is :math:`\frac{3 \times 944}{2} = 1416 \, \text{ bytes}`.
+For example for 4 sectors of 1024 bytes, free space for 8-byte length data is :math:`\frac{3 \times 944 \times 8}{16} = 1416 \, \text{ bytes}`.
 
 Large data values
 =================
@@ -274,67 +255,66 @@ Let's take an example:
 
 For a partition that has 4 sectors of 1024 bytes and for data size of 64 bytes.
 Only 3 sectors are available for writes with a capacity of 944 bytes each.
-Each Key-value pair needs an extra 16 bytes for ATE which makes it possible to store 11 pairs
-in each sectors (:math:`\frac{944}{80}`).
-Total data that could be stored in this partition for this case is :math:`11 \times 3 \times 64 = 2112 \text{ bytes}`
-
-.. _wear-leveling:
+Each key-value pair needs an extra 16 bytes for the ATE, which makes it possible to store 11 pairs
+in each sector (:math:`\frac{944}{80}`).
+Total data that could be stored in this partition for this case is :math:`11 \times 3 \times 64 = 2112 \text{ bytes}`.
 
 Wear leveling
 *************
 
 This storage system is optimized for devices that do not require an erase.
-Using storage systems that rely on an erase-value (NVS as an example) will need to emulate the
-erase with write operations. This will cause a significant decrease in the life expectancy of
-these devices and will cause more delays for write operations and for initialization.
-ZMS uses a cycle count mechanism that avoids emulating erase operation for these devices.
+Storage systems that rely on an erase value (NVS as an example) need to emulate the erase with
+write operations. This causes a significant decrease in the life expectancy of these devices
+as well as more delays for write operations and initialization of the device when it is empty.
+ZMS uses a cycle count mechanism that avoids emulating erase operations for these devices.
 It also guarantees that every memory location is written only once for each cycle of sector write.
 
-As an example, to erase a 4096 bytes sector on a non-erasable device using NVS, 256 flash writes
-must be performed (supposing that write-block-size=16 bytes), while using ZMS only 1 write of
-16 bytes is needed. This operation is 256 times faster in this case.
+As an example, to erase a 4096-byte sector on devices that do not require an erase operation
+using NVS, 256 flash writes must be performed (supposing that ``write-block-size`` = 16 bytes), while
+using ZMS, only 1 write of 16 bytes is needed. This operation is 256 times faster in this case.
 
-Garbage collection operation is also adding some writes to the memory cell life expectancy as it
-is moving some blocks from one sector to another.
+The garbage collection operation also reduces the memory cell life expectancy as it performs write
+operations when moving blocks from one sector to another.
 To make the garbage collector not affect the life expectancy of the device it is recommended
-to correctly dimension the partition size. Its size should be the double of the maximum size of
-data (including extra headers) that could be written in the storage.
+to dimension the partition appropriately. Its size should be the double of the maximum size of
+data (including headers) that could be written in the storage.
 
-See :ref:`free-space`.
+See `Available space for user data <#available-space-for-user-data-key-value-pairs>`_.
 
 Device lifetime calculation
 ===========================
 
-Storage devices whether they are classical Flash or new technologies like RRAM/MRAM has a limited
-life expectancy which is determined by the number of times memory cells can be erased/written.
+Storage devices, whether they are classical flash or new technologies like RRAM/MRAM, have a
+limited life expectancy which is determined by the number of times memory cells can be
+erased/written.
 Flash devices are erased one page at a time as part of their functional behavior (otherwise
-memory cells cannot be overwritten) and for non-erasable storage devices memory cells can be
-overwritten directly.
+memory cells cannot be overwritten), and for storage devices that do not require an erase
+operation, memory cells can be overwritten directly.
 
 A typical scenario is shown here to calculate the life expectancy of a device:
-Let's suppose that we store an 8 bytes variable using the same ID but its content changes every
+Let's suppose that we store an 8-byte variable using the same ID but its content changes every
 minute. The partition has 4 sectors with 1024 bytes each.
 Each write of the variable requires 16 bytes of storage.
 As we have 944 bytes available for ATEs for each sector, and because ZMS is a fast-forward
 storage system, we are going to rewrite the first location of the first sector after
 :math:`\frac{(944 \times 4)}{16} = 236 \text{ minutes}`.
 
-In addition to the normal writes, garbage collector will move the still valid data from old
-sectors to new ones.
+In addition to the normal writes, the garbage collector will move the data that is still valid
+from old sectors to new ones.
 As we are using the same ID and a big partition size, no data will be moved by the garbage
 collector in this case.
-For storage devices that could be written 20000 times, the storage will last about
-4.720.000 minutes (~9 years).
+For storage devices that can be written 20 000 times, the storage will last about
+4 720 000 minutes (~9 years).
 
 To make a more general formula we must first compute the effective used size in ZMS by our
 typical set of data.
-For id/data pair with data <= 8 bytes, effective_size is 16 bytes
-For id/data pair with data > 8 bytes, effective_size is 16 bytes + sizeof(data)
-Let's suppose that total_effective_size is the total size of the set of data that is written in
-the storage and that the partition is well dimensioned (double of the effective size) to avoid
+For ID/data pairs with data <= 8 bytes, ``effective_size`` is 16 bytes.
+For ID/data pairs with data > 8 bytes, ``effective_size`` is ``16 + sizeof(data)`` bytes.
+Let's suppose that ``total_effective_size`` is the total size of the data that is written in
+the storage and that the partition is sized appropriately (double of the effective size) to avoid
 having the garbage collector moving blocks all the time.
 
-The expected life of the device in minutes is computed as :
+The expected lifetime of the device in minutes is computed as:
 
 .. math::
 
@@ -342,11 +322,11 @@ The expected life of the device in minutes is computed as :
 
 Where:
 
-``SECTOR_EFFECTIVE_SIZE``: is the size sector - header_size(80 bytes)
+``SECTOR_EFFECTIVE_SIZE``: The sector size - header size (80 bytes)
 
-``SECTOR_NUMBER``: is the number of sectors
+``SECTOR_NUMBER``: The number of sectors
 
-``MAX_NUM_WRITES``: is the life expectancy of the storage device in number of writes
+``MAX_NUM_WRITES``: The life expectancy of the storage device in number of writes
 
 ``TOTAL_EFFECTIVE_SIZE``: Total effective size of the set of written data
 
@@ -360,15 +340,16 @@ such as low latency and bigger storage space.
 
 Existing features
 =================
-Version1
---------
-- Supports non-erasable devices (only one write operation to erase a sector)
-- Supports large partition size and sector size (64 bits address space)
-- Supports 32-bit IDs to store ID/Value pairs
-- Small sized data ( <= 8 bytes) are stored in the ATE itself
-- Built-in Data CRC32 (included in the ATE)
-- Versioning of ZMS (to handle future evolution)
-- Supports large write-block-size (Only for platforms that need this)
+Version 1
+---------
+- Supports storage devices that do not require an erase operation (only one write operation
+  to invalidate a sector)
+- Supports large partition and sector sizes (64-bit address space)
+- Supports 32-bit IDs
+- Small-sized data (<= 8 bytes) are stored in the ATE itself
+- Built-in data CRC32 (included in the ATE)
+- Versioning of ZMS (to handle future evolutions)
+- Supports large ``write-block-size`` (only for platforms that need it)
 
 Future features
 ===============
@@ -395,10 +376,10 @@ functionality: :ref:`NVS <nvs_api>` and :ref:`FCB <fcb_api>`.
 Which one to use in your application will depend on your needs and the hardware you are using,
 and this section provides information to help make a choice.
 
-- If you are using a non-erasable technology device like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
+- If you are using devices that do not require an erase operation like RRAM or MRAM, :ref:`ZMS <zms_api>` is definitely the
   best fit for your storage subsystem as it is designed to avoid emulating erase operation using
   large block writes for these devices and replaces it with a single write call.
-- For devices with large write_block_size and/or needs a sector size that is different than the
+- For devices that have a large ``write_block_size`` and/or need a sector size that is different than the
   classical flash page size (equal to erase_block_size), :ref:`ZMS <zms_api>` is also the best fit as there is
   the possibility to customize these parameters and add the support of these devices in ZMS.
 - For classical flash technology devices, :ref:`NVS <nvs_api>` is recommended as it has low footprint (smaller
@@ -413,7 +394,7 @@ and this section provides information to help make a choice.
 More generally to make the right choice between NVS and ZMS, all the blockers should be first
 verified to make sure that the application could work with one subsystem or the other, then if
 both solutions could be implemented, the best choice should be based on the calculations of the
-life expectancy of the device described in this section: :ref:`wear-leveling`.
+life expectancy of the device described in this section: `Wear leveling <#wear-leveling>`_.
 
 Recommendations to increase performance
 ***************************************
@@ -421,44 +402,41 @@ Recommendations to increase performance
 Sector size and count
 =====================
 
-- The total size of the storage partition should be well dimensioned to achieve the best
-  performance for ZMS.
+- The total size of the storage partition should be set appropriately to achieve the best
+  performance with ZMS.
   All the information regarding the effectively available free space in ZMS can be found
-  in the documentation. See :ref:`free-space`.
-  We recommend choosing a storage partition that can hold double the size of the key-value pairs
+  in the documentation. See `Available space for user data <#available-space-for-user-data-key-value-pairs>`_.
+  It's recommended to choose a storage partition size that is double the size of the key-value pairs
   that will be written in the storage.
-- The size of a sector needs to be dimensioned to hold the maximum data length that will be stored.
-  Increasing the size of a sector will slow down the garbage collection operation which will
-  occur less frequently.
-  Decreasing its size, in the opposite, will make the garbage collection operation faster
-  which will occur more frequently.
+- The sector size needs to be set such that a sector can fit the maximum data size that will be
+  stored.
+  Increasing the sector size will slow down the garbage collection operation and make it occur
+  less frequently.
+  Decreasing its size, on the opposite, will make the garbage collection operation faster but also
+  occur more frequently.
 - For some subsystems like :ref:`Settings <settings_api>`, all path-value pairs are split into two ZMS entries (ATEs).
-  The header needed by the two entries should be accounted when computing the needed storage space.
-- Using small data to store in the ZMS entries can increase the performance, as this data is
-  written within the entry header.
+  The headers needed by the two entries should be accounted for when computing the needed storage
+  space.
+- Storing small data (<= 8 bytes) in ZMS entries can increase the performance, as this data is
+  written within the entry.
   For example, for the :ref:`Settings <settings_api>` subsystem, choosing a path name that is
   less than or equal to 8 bytes can make reads and writes faster.
 
-Dimensioning cache
-==================
+Cache size
+==========
 
-- When using ZMS API directly, the recommended cache size should be, at least, equal to
-  the number of different entries that will be written in the storage.
+- When using the ZMS API directly, the recommendation for the cache size is to make it at least
+  equal to the number of different entries that will be written in the storage.
 - Each additional cache entry will add 8 bytes to your RAM usage. Cache size should be carefully
   chosen.
 - If you use ZMS through :ref:`Settings <settings_api>`, you have to take into account that each Settings entry is
-  divided into two ZMS entries. The recommended cache size should be, at least, twice the number
-  of Settings entries.
-
-Sample
-******
-
-A sample of how ZMS can be used is supplied in :zephyr:code-sample:`zms`.
+  divided into two ZMS entries. The recommendation for the cache size is to make it at least
+  twice the number of Settings entries.
 
 API Reference
 *************
 
-The ZMS subsystem APIs are provided by ``zms.h``:
+The ZMS API is provided by ``zms.h``:
 
 .. doxygengroup:: zms_data_structures
 
diff --git a/doc/services/tfm/requirements.rst b/doc/services/tfm/requirements.rst
index 0221683d4a1a2..180d0c821eb0c 100644
--- a/doc/services/tfm/requirements.rst
+++ b/doc/services/tfm/requirements.rst
@@ -18,7 +18,7 @@ The following are some of the boards that can be used with TF-M:
      - ``lpcxpresso55s69_ns``
    * - :ref:`nrf9160dk_nrf9160`
      - ``nrf9160dk/nrf9160/ns``
-   * - :ref:`nrf5340dk_nrf5340`
+   * - :zephyr:board:`nrf5340dk`
      - ``nrf5340dk/nrf5340/cpuapp/ns``
    * - :zephyr:board:`b_u585i_iot02a`
      - ``b_u585i_iot02a/stm32u585xx/ns``
diff --git a/doc/services/zbus/index.rst b/doc/services/zbus/index.rst
index 0473d7157083a..a7d6b7c55c4bb 100644
--- a/doc/services/zbus/index.rst
+++ b/doc/services/zbus/index.rst
@@ -848,25 +848,28 @@ The following code has the exact behavior of the code in :ref:`reading from a ch
 Runtime observer registration
 -----------------------------
 
-It is possible to add observers to channels in runtime. This feature uses the heap to allocate the
-nodes dynamically. The heap size limits the number of dynamic observers zbus can create. Therefore,
-set the :kconfig:option:`CONFIG_ZBUS_RUNTIME_OBSERVERS` to enable the feature. It is possible to
-adjust the heap size by changing the configuration :kconfig:option:`CONFIG_HEAP_MEM_POOL_SIZE`. The
-following example illustrates the runtime registration usage.
-
-
+It is possible to add observers to channels at runtime if
+:kconfig:option:`CONFIG_ZBUS_RUNTIME_OBSERVERS` is enabled. In addition to the channel and observer
+references, :c:func:`zbus_chan_add_obs` also requires a :c:struct:`zbus_observer_node` to link the two
+together, which must remain valid in memory for the duration that the observer is attached to the
+channel. The simplest way to achieve this is to make the structure ``static``.
 
 .. code-block:: c
 
     ZBUS_LISTENER_DEFINE(my_listener, callback);
     // ...
     void thread_entry(void) {
+            static struct zbus_observer_node obs_node;
             // ...
             /* Adding the observer to channel chan1 */
-            zbus_chan_add_obs(&chan1, &my_listener, K_NO_WAIT);
+            zbus_chan_add_obs(&chan1, &my_listener, &obs_node, K_NO_WAIT);
             /* Removing the observer from channel chan1 */
             zbus_chan_rm_obs(&chan1, &my_listener, K_NO_WAIT);
 
+.. warning::
+
+  The :c:struct:`zbus_observer_node` can only be re-used in :c:func:`zbus_chan_add_obs` after removing
+  the channel observer it was first associated with through :c:func:`zbus_chan_rm_obs`.
 
 Samples
 *******
diff --git a/doc/templates/board.tmpl b/doc/templates/board.tmpl
index 96201094eed29..38aa0fafa1d83 100644
--- a/doc/templates/board.tmpl
+++ b/doc/templates/board.tmpl
@@ -17,7 +17,8 @@ Hardware
 
 Supported Features
 ==================
-[List of supported features and level of support in Zephyr]
+
+.. zephyr:board-supported-hw::
 
 Connections and IOs
 ===================
@@ -28,6 +29,8 @@ to connect external components]
 Programming and Debugging
 *************************
 
+.. zephyr:board-supported-runners::
+
 Flashing
 ========
 [How to use this board with Zephyr and how to flash a Zephyr binary on this
diff --git a/doc/zephyr.doxyfile.in b/doc/zephyr.doxyfile.in
index 036bef82c6624..11b1da30688e5 100644
--- a/doc/zephyr.doxyfile.in
+++ b/doc/zephyr.doxyfile.in
@@ -980,6 +980,7 @@ INPUT                  = @ZEPHYR_BASE@/doc/_doxygen/mainpage.md \
                          @ZEPHYR_BASE@/subsys/testsuite/include/ \
                          @ZEPHYR_BASE@/subsys/testsuite/ztest/include/ \
                          @ZEPHYR_BASE@/subsys/secure_storage/include/ \
+                         @ZEPHYR_BASE@/subsys/fs/zms/zms_priv.h \
 
 # This tag can be used to specify the character encoding of the source files
 # that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1038,7 +1039,8 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = @ZEPHYR_BASE@/include/zephyr/portability/cmsis_os.h \
-                         @ZEPHYR_BASE@/include/zephyr/portability/cmsis_os2.h
+                         @ZEPHYR_BASE@/include/zephyr/portability/cmsis_os2.h \
+                         @ZEPHYR_BASE@/include/zephyr/drivers/wifi/nrf_wifi
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index a4975dbe249c9..50f64359a3916 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -55,7 +55,6 @@ add_subdirectory_ifdef(CONFIG_IEEE802154 ieee802154)
 add_subdirectory_ifdef(CONFIG_INPUT input)
 add_subdirectory_ifdef(CONFIG_INTEL_ADSP_MIC_PRIVACY audio/mic_privacy/intel)
 add_subdirectory_ifdef(CONFIG_IPM ipm)
-add_subdirectory_ifdef(CONFIG_KSCAN kscan)
 add_subdirectory_ifdef(CONFIG_LED led)
 add_subdirectory_ifdef(CONFIG_LED_STRIP led_strip)
 add_subdirectory_ifdef(CONFIG_LORA lora)
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 4819d5059dfbe..401220c49177a 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -50,7 +50,6 @@ source "drivers/input/Kconfig"
 source "drivers/interrupt_controller/Kconfig"
 source "drivers/interrupt_controller/Kconfig.shared_irq"
 source "drivers/ipm/Kconfig"
-source "drivers/kscan/Kconfig"
 source "drivers/led/Kconfig"
 source "drivers/led_strip/Kconfig"
 source "drivers/lora/Kconfig"
diff --git a/drivers/adc/CMakeLists.txt b/drivers/adc/CMakeLists.txt
index 5770e9eb3cc8d..e20cced556f7a 100644
--- a/drivers/adc/CMakeLists.txt
+++ b/drivers/adc/CMakeLists.txt
@@ -55,6 +55,9 @@ zephyr_library_sources_ifdef(CONFIG_ADC_ENE_KB1200	adc_ene_kb1200.c)
 zephyr_library_sources_ifdef(CONFIG_ADC_MCUX_GAU	adc_mcux_gau_adc.c)
 zephyr_library_sources_ifdef(CONFIG_ADC_AMBIQ           adc_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_ADC_RENESAS_RA	adc_renesas_ra.c)
+zephyr_library_sources_ifdef(CONFIG_ADC_RENESAS_RZ  adc_renesas_rz.c)
 zephyr_library_sources_ifdef(CONFIG_ADC_MAX32		adc_max32.c)
 zephyr_library_sources_ifdef(CONFIG_ADC_AD4114      adc_ad4114.c)
 zephyr_library_sources_ifdef(CONFIG_ADC_AD7124		adc_ad7124.c)
+zephyr_library_sources_ifdef(CONFIG_ADC_AD405X		adc_ad405x.c)
+zephyr_library_sources_ifdef(CONFIG_ADC_AD4130		adc_ad4130.c)
diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig
index 0266c7f2a8d45..32b4e4175e100 100644
--- a/drivers/adc/Kconfig
+++ b/drivers/adc/Kconfig
@@ -134,10 +134,16 @@ source "drivers/adc/Kconfig.ambiq"
 
 source "drivers/adc/Kconfig.renesas_ra"
 
+source "drivers/adc/Kconfig.renesas_rz"
+
 source "drivers/adc/Kconfig.max32"
 
 source "drivers/adc/Kconfig.ad4114"
 
 source "drivers/adc/Kconfig.ad7124"
 
+source "drivers/adc/Kconfig.ad405x"
+
+source "drivers/adc/Kconfig.ad4130"
+
 endif # ADC
diff --git a/drivers/adc/Kconfig.ad405x b/drivers/adc/Kconfig.ad405x
new file mode 100644
index 0000000000000..5abc89a8dd56f
--- /dev/null
+++ b/drivers/adc/Kconfig.ad405x
@@ -0,0 +1,18 @@
+# ADI SoC ADC configuration options
+
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config ADC_AD405X
+	bool "AD405X ADC driver"
+	depends on DT_HAS_ADI_AD4052_ADC_ENABLED || DT_HAS_ADI_AD4050_ADC_ENABLED
+	select SPI
+	default y
+	help
+	  Enable ADC driver for ADI AD405X.
+
+config AD405X_TRIGGER
+	bool "AD405X interrupts"
+	default n
+	help
+	  Enable interrupts for ADI AD405X.
diff --git a/drivers/adc/Kconfig.ad4130 b/drivers/adc/Kconfig.ad4130
new file mode 100644
index 0000000000000..e1db1fee5af82
--- /dev/null
+++ b/drivers/adc/Kconfig.ad4130
@@ -0,0 +1,25 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config ADC_AD4130
+	bool "ADI AD4130 Analog-to-Digital Converter"
+	default y
+	depends on DT_HAS_ADI_AD4130_ADC_ENABLED
+	select SPI
+	select ADC_CONFIGURABLE_INPUTS
+	help
+	  Enable the AD4130 ADC driver. It is SPI based
+	  Ultra Low Power, 24-Bit Sigma-Delta ADC.
+
+config ADI_AD4130_ADC_ACQUISITION_THREAD_PRIO
+	int "ADC data acquisition thread priority"
+	default 90
+	depends on ADC_AD4130 && ADC_ASYNC
+
+config ADI_AD4130_ADC_ACQUISITION_THREAD_STACK_SIZE
+	int "Stack size for the ADC data acquisition thread"
+	default 400
+	depends on ADC_AD4130 && ADC_ASYNC
+	help
+	  Size of the stack used for the internal data acquisition
+	  thread.
diff --git a/drivers/adc/Kconfig.renesas_rz b/drivers/adc/Kconfig.renesas_rz
new file mode 100644
index 0000000000000..75146acf6d5f1
--- /dev/null
+++ b/drivers/adc/Kconfig.renesas_rz
@@ -0,0 +1,12 @@
+# Renesas RZ Family
+
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config ADC_RENESAS_RZ
+	bool "Renesas RZ ADC Driver"
+	default y
+	depends on DT_HAS_RENESAS_RZ_ADC_ENABLED
+	select USE_RZ_FSP_ADC
+	help
+	  Enable the RZ ADC driver.
diff --git a/drivers/adc/adc_ad405x.c b/drivers/adc/adc_ad405x.c
new file mode 100644
index 0000000000000..d45355781e12f
--- /dev/null
+++ b/drivers/adc/adc_ad405x.c
@@ -0,0 +1,957 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdbool.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+LOG_MODULE_REGISTER(adc_ad405x, CONFIG_ADC_LOG_LEVEL);
+
+#define ADC_CONTEXT_USES_KERNEL_TIMER
+#include "adc_context.h"
+
+#define AD4050_CHIP_ID 4050
+#define AD4052_CHIP_ID 4052
+
+#define AD4050_ADC_RESOLUTION 12U
+#define AD4052_ADC_RESOLUTION 16U
+
+#define AD405X_REG_INTERFACE_CONFIG_A 0x00U
+#define AD405X_REG_DEVICE_CONFIG      0x02U
+#define AD405X_REG_DEVICE_TYPE        0x03U
+#define AD405X_REG_PRODUCT_ID_L       0x04U
+#define AD405X_REG_PRODUCT_ID_H       0x05U
+#define AD405X_REG_VENDOR_L           0x0CU
+#define AD405X_REG_VENDOR_H           0x0DU
+#define AD405X_REG_MODE_SET           0x20U
+#define AD405X_REG_ADC_MODES          0x21U
+#define AD405X_REG_AVG_CONFIG         0x23U
+#define AD405X_REG_GP_PIN_CONF        0x24U
+#define AD405X_REG_TIMER_CONFIG       0x27U
+
+#define AD405X_REG_INTERFACE_CONFIG_A_VAL       0x10U
+#define AD405X_REG_DEVICE_TYPE_VAL              0x07U
+#define AD4052_REG_PRODUCT_ID_VAL               0x0072U
+#define AD4050_REG_PRODUCT_ID_VAL               0x0070U
+#define AD405X_REG_VENDOR_VAL                   0x0456U
+#define AD405X_REG_INTERFACE_CONFIG_A_RESET_VAL 0x81U
+
+/** AD405X_REG_ADC_MODES Bit definition */
+#define AD405X_ADC_MODES_MSK        GENMASK(2, 0)
+#define AD405X_BURST_AVERAGING_MODE BIT(0)
+#define AD405X_AVERAGING_MODE       BIT(1)
+
+/** AD405X_REG_MODE_SET Bit definition */
+#define AD405X_ENTER_ADC_MODE_MSK BIT(0)
+#define AD405X_ENTER_ADC_MODE     BIT(0)
+#define AD405X_ENTER_SLEEP_MODE   BIT(1) | BIT(0)
+#define AD405X_ENTER_ACTIVE_MODE  0x0U
+
+/** AD405X_REG_AVG_CONFIG Bit Definitions */
+#define AD405X_AVG_WIN_LEN_MSK GENMASK(3, 0)
+
+#define AD405X_SINGLE_DIFFERENTIAL_MSK BIT(7)
+
+#define AD405X_WRITE_CMD 0x0U
+#define AD405X_READ_CMD  0x80U
+
+#define AD405X_SW_RESET_MSK   BIT(7) | BIT(0)
+
+#define AD405X_GP1_MODE_MSK GENMASK(6, 4)
+#define AD405X_GP0_MODE_MSK GENMASK(2, 0)
+#define AD405X_GP1          0x1U
+#define AD405X_GP0          0x0U
+
+#define AD405X_SINGLE_ENDED  0x0U
+#define AD405X_DIFFERENTIAL  BIT(7)
+
+/** AD405X_REG_TIMER_CONFIG Bit Definitions */
+#define AD405X_FS_BURST_AUTO_MSK GENMASK(7, 4)
+
+union ad405x_bus {
+	struct spi_dt_spec spi;
+};
+
+enum ad405x_gpx_mode {
+	AD405X_DISABLED = 0,
+	AD405X_GP0_1_INTR = 1,
+	AD405X_DATA_READY = 2,
+	AD405X_DEV_ENABLE = 3,
+	AD405X_CHOP = 4,
+	AD405X_LOGIC_LOW = 5,
+	AD405X_LOGIC_HIGH = 6,
+	AD405X_DEV_READY = 7
+};
+
+/** AD405X modes of operations */
+enum ad405x_operation_mode {
+	AD405X_SAMPLE_MODE_OP = 0,
+	AD405X_BURST_AVERAGING_MODE_OP = 1,
+	AD405X_AVERAGING_MODE_OP = 2,
+	AD405X_MONITOR_AUTO_MODE_OP = 3,
+	AD405X_CONFIG_MODE_OP = 4,
+	AD405X_SLEEP_MODE_OP = 5,
+	AD405X_TRIGGER_AUTO_MODE_OP = 7
+};
+
+/** AD405X sample rate for burst and autonomous modes */
+enum ad405x_sample_rate {
+	AD405X_2_MSPS,
+	AD405X_1_MSPS,
+	AD405X_333_KSPS,
+	AD405X_100_KSPS,
+	AD405X_33_KSPS,
+	AD405X_10_KSPS,
+	AD405X_3_KSPS,
+	AD405X_1_KSPS,
+	AD405X_500_SPS,
+	AD405X_333_SPS,
+	AD405X_250_SPS,
+	AD405X_200_SPS,
+	AD405X_166_SPS,
+	AD405X_140_SPS,
+	AD405X_125_SPS,
+	AD405X_111_SPS
+};
+
+/** AD405X averaging filter window length */
+enum ad405x_avg_filter_l {
+	AD405X_LENGTH_2,
+	AD405X_LENGTH_4,
+	AD405X_LENGTH_8,
+	AD405X_LENGTH_16,
+	AD405X_LENGTH_32,
+	AD405X_LENGTH_64,
+	AD405X_LENGTH_128,
+	AD405X_LENGTH_256,
+	AD405X_LENGTH_512,
+	AD405X_LENGTH_1024,
+	AD405X_LENGTH_2048,
+	AD405X_LENGTH_4096
+};
+static const int avg_filter_values[] = {2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096};
+
+struct adc_ad405x_config {
+	const union ad405x_bus bus;
+	enum ad405x_operation_mode active_mode;
+#ifdef CONFIG_AD405X_TRIGGER
+	struct gpio_dt_spec gp1_interrupt;
+	struct gpio_dt_spec gp0_interrupt;
+	uint8_t has_gp1;
+	uint8_t has_gp0;
+#endif
+	struct gpio_dt_spec conversion;
+	uint16_t chip_id;
+	const struct adc_dt_spec spec;
+};
+
+struct adc_ad405x_data {
+	struct adc_context ctx;
+	const struct device *dev;
+	uint8_t adc_conf;
+	uint8_t diff;
+	uint8_t channels;
+	uint16_t *buffer;
+	uint16_t *repeat_buffer;
+	enum ad405x_operation_mode operation_mode;
+	struct k_sem sem_devrdy;
+	const struct device *gpio_dev;
+	enum ad405x_gpx_mode gp1_mode;
+	enum ad405x_gpx_mode gp0_mode;
+	uint8_t dev_en_pol;
+	enum ad405x_sample_rate rate;
+	enum ad405x_avg_filter_l filter_length;
+#if CONFIG_AD405X_TRIGGER
+	struct gpio_callback gpio1_cb;
+	struct gpio_callback gpio0_cb;
+	struct k_sem sem_drdy;
+	uint8_t has_drdy;
+#endif
+};
+
+static bool ad405x_bus_is_ready_spi(const union ad405x_bus *bus)
+{
+	bool ret = spi_is_ready_dt(&bus->spi);
+
+	return ret;
+}
+
+int ad405x_reg_access_spi(const struct device *dev, uint8_t cmd, uint8_t reg_addr, uint8_t *data,
+			size_t length)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	uint8_t access = reg_addr | cmd;
+	const struct spi_buf buf[2] = {{.buf = &access, .len = 1}, {.buf = data, .len = length}};
+	const struct spi_buf_set rx = {.buffers = buf, .count = ARRAY_SIZE(buf)};
+	struct spi_buf_set tx = {
+		.buffers = buf,
+		.count = 2,
+	};
+	int ret;
+
+	if (cmd == AD405X_READ_CMD) {
+		tx.count = 1;
+		ret = spi_transceive_dt(&cfg->bus.spi, &tx, &rx);
+	} else {
+		ret = spi_write_dt(&cfg->bus.spi, &tx);
+	}
+	return ret;
+}
+
+int ad405x_reset_pattern_cmd(const struct device *dev)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+#if CONFIG_AD405X_TRIGGER
+	struct adc_ad405x_data *data = dev->data;
+#endif
+	uint8_t access[18] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF,
+				0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE};
+	const struct spi_buf buf[1] = {{.buf = &access, .len = ARRAY_SIZE(access)}};
+	struct spi_buf_set tx = {
+		.buffers = buf,
+		.count = 1,
+	};
+
+	int ret = spi_write_dt(&cfg->bus.spi, &tx);
+
+	if (ret < 0) {
+		return ret;
+	}
+#if CONFIG_AD405X_TRIGGER
+	if (cfg->has_gp1 != 0) {
+		k_sem_take(&data->sem_devrdy, K_FOREVER);
+	} else {
+		k_msleep(5);
+	}
+#else
+	k_msleep(5);
+#endif
+	return ret;
+
+}
+
+int ad405x_read_raw(const struct device *dev, uint8_t *data, size_t len)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	int ret = 0;
+	const struct spi_buf buf[1] = {{.buf = data, .len = len}};
+	const struct spi_buf_set rx = {.buffers = buf, .count = ARRAY_SIZE(buf)};
+
+	ret = spi_transceive_dt(&cfg->bus.spi, NULL, &rx);
+
+	return ret;
+}
+
+int ad405x_reg_access(const struct device *dev, uint8_t cmd, uint8_t addr, uint8_t *data,
+			size_t len)
+{
+	return ad405x_reg_access_spi(dev, cmd, addr, data, len);
+}
+
+int ad405x_reg_write(const struct device *dev, uint8_t addr, uint8_t *data, uint8_t len)
+{
+
+	return ad405x_reg_access(dev, AD405X_WRITE_CMD, addr, data, len);
+}
+
+int ad405x_reg_read(const struct device *dev, uint8_t addr, uint8_t *data, uint8_t len)
+{
+
+	return ad405x_reg_access(dev, AD405X_READ_CMD, addr, data, len);
+}
+
+int ad405x_reg_write_byte(const struct device *dev, uint8_t addr, uint8_t val)
+{
+	return ad405x_reg_write(dev, addr, &val, 1);
+}
+
+int ad405x_reg_read_byte(const struct device *dev, uint8_t addr, uint8_t *buf)
+
+{
+	return ad405x_reg_read(dev, addr, buf, 1);
+}
+
+int ad405x_reg_update_bits(const struct device *dev, uint8_t addr, uint8_t mask, uint8_t val)
+{
+	int ret;
+	uint8_t byte = 0;
+
+	ret = ad405x_reg_read_byte(dev, addr, &byte);
+	if (ret < 0) {
+		return ret;
+	}
+
+	byte &= ~mask;
+	byte |= val;
+
+	return ad405x_reg_write_byte(dev, addr, byte);
+}
+
+#if CONFIG_AD405X_TRIGGER
+static void ad405x_gpio1_callback(const struct device *dev, struct gpio_callback *cb,
+				uint32_t pins)
+{
+	struct adc_ad405x_data *drv_data = CONTAINER_OF(cb, struct adc_ad405x_data, gpio1_cb);
+	const struct adc_ad405x_config *cfg = drv_data->dev->config;
+	gpio_flags_t gpio_flag = GPIO_INT_EDGE_TO_ACTIVE;
+
+	gpio_pin_interrupt_configure_dt(&cfg->gp1_interrupt, GPIO_INT_DISABLE);
+
+	switch (drv_data->gp1_mode) {
+	case AD405X_DEV_READY:
+		k_sem_give(&drv_data->sem_devrdy);
+		break;
+	case AD405X_DATA_READY:
+		k_sem_give(&drv_data->sem_drdy);
+		gpio_flag = GPIO_INT_EDGE_TO_INACTIVE;
+		break;
+	default: /* TODO */
+		break;
+	}
+
+	gpio_pin_interrupt_configure_dt(&cfg->gp1_interrupt, gpio_flag);
+}
+
+static void ad405x_gpio0_callback(const struct device *dev, struct gpio_callback *cb,
+				uint32_t pins)
+{
+	struct adc_ad405x_data *drv_data = CONTAINER_OF(cb, struct adc_ad405x_data, gpio0_cb);
+	const struct adc_ad405x_config *cfg = drv_data->dev->config;
+	gpio_flags_t gpio_flag = GPIO_INT_EDGE_TO_ACTIVE;
+
+	gpio_pin_interrupt_configure_dt(&cfg->gp0_interrupt, GPIO_INT_DISABLE);
+
+	switch (drv_data->gp0_mode) {
+	case AD405X_DATA_READY:
+		k_sem_give(&drv_data->sem_drdy);
+		gpio_flag = GPIO_INT_EDGE_TO_INACTIVE;
+		break;
+	default:
+		break;
+	}
+
+	gpio_pin_interrupt_configure_dt(&cfg->gp0_interrupt, gpio_flag);
+
+}
+#endif
+
+int ad405x_init_conv(const struct device *dev)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	struct adc_ad405x_data *drv_data = dev->data;
+	int ret;
+
+	if (!gpio_is_ready_dt(&cfg->conversion)) {
+		LOG_ERR("GPIO port %s not ready", cfg->conversion.port->name);
+		return -EINVAL;
+	}
+
+	ret = gpio_pin_configure_dt(&cfg->conversion, GPIO_OUTPUT_INACTIVE);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = gpio_pin_set_dt(&cfg->conversion, 0);
+	drv_data->dev = dev;
+	return ret;
+}
+
+#if CONFIG_AD405X_TRIGGER
+int ad405x_init_interrupt(const struct device *dev)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	struct adc_ad405x_data *drv_data = dev->data;
+	int ret;
+
+	if (cfg->has_gp1 != 0) {
+
+		if (!gpio_is_ready_dt(&cfg->gp1_interrupt)) {
+			LOG_ERR("GPIO port %s not ready", cfg->gp1_interrupt.port->name);
+			return -EINVAL;
+		}
+
+		ret = gpio_pin_configure_dt(&cfg->gp1_interrupt, GPIO_INPUT);
+		if (ret != 0) {
+			return ret;
+		}
+
+		gpio_init_callback(&drv_data->gpio1_cb, ad405x_gpio1_callback,
+					BIT(cfg->gp1_interrupt.pin));
+
+		ret = gpio_add_callback(cfg->gp1_interrupt.port, &drv_data->gpio1_cb);
+		if (ret != 0) {
+			LOG_ERR("Failed to set gpio callback!");
+			return ret;
+		}
+
+		gpio_pin_interrupt_configure_dt(&cfg->gp1_interrupt, GPIO_INT_EDGE_TO_ACTIVE);
+	}
+
+	if (cfg->has_gp0 != 0) {
+
+		if (!gpio_is_ready_dt(&cfg->gp0_interrupt)) {
+			LOG_ERR("GPIO port %s not ready", cfg->gp0_interrupt.port->name);
+			return -EINVAL;
+		}
+
+		ret = gpio_pin_configure_dt(&cfg->gp0_interrupt, GPIO_INPUT);
+		if (ret != 0) {
+			return ret;
+		}
+
+		gpio_init_callback(&drv_data->gpio0_cb, ad405x_gpio0_callback,
+					BIT(cfg->gp0_interrupt.pin));
+
+		ret = gpio_add_callback(cfg->gp0_interrupt.port, &drv_data->gpio0_cb);
+		if (ret != 0) {
+			LOG_ERR("Failed to set gpio callback!");
+			return ret;
+		}
+	}
+
+	return 0;
+}
+#endif
+
+static int ad405x_channel_setup(const struct device *dev,
+				const struct adc_channel_cfg *channel_cfg)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	if (channel_cfg->channel_id != 0) {
+		LOG_ERR("invalid channel id %d", channel_cfg->channel_id);
+		return -EINVAL;
+	}
+	if (channel_cfg->differential != cfg->spec.channel_cfg.differential) {
+		LOG_ERR("invalid mode %d", channel_cfg->differential);
+		return -EINVAL;
+	}
+
+	uint8_t diff_mode = AD405X_SINGLE_ENDED;
+
+	if (channel_cfg->differential) {
+		diff_mode = AD405X_DIFFERENTIAL;
+	}
+	return ad405x_reg_update_bits(dev, AD405X_REG_ADC_MODES,
+				AD405X_SINGLE_DIFFERENTIAL_MSK, diff_mode);
+}
+
+static int adc_ad405x_validate_buffer_size(const struct device *dev,
+					const struct adc_sequence *sequence)
+{
+	uint8_t channels;
+	size_t needed;
+
+	channels = POPCOUNT(sequence->channels);
+	needed = channels * sizeof(uint16_t);
+
+	if (sequence->buffer_size < needed) {
+		return -ENOMEM;
+	}
+
+	return 0;
+}
+
+int ad405x_conv_start(const struct device *dev)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	int ret;
+
+	ret = gpio_pin_set_dt(&cfg->conversion, 1);
+	if (ret != 0) {
+		return ret;
+	}
+
+	/** CNV High Time min 10 ns */
+	k_busy_wait(1);
+	ret = gpio_pin_set_dt(&cfg->conversion, 0);
+	if (ret != 0) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static void adc_context_start_sampling(struct adc_context *ctx)
+{
+
+	struct adc_ad405x_data *data = CONTAINER_OF(ctx, struct adc_ad405x_data, ctx);
+	const struct adc_ad405x_config *cfg = (struct adc_ad405x_config *)data->dev->config;
+
+	uint8_t reg_val_x[3] = {0};
+	uint32_t data_be;
+	size_t len = 0;
+
+	switch (data->operation_mode) {
+	case AD405X_SAMPLE_MODE_OP:
+		len = 2;
+		ad405x_conv_start(data->dev);
+		break;
+	case AD405X_BURST_AVERAGING_MODE_OP:
+		if (cfg->chip_id == AD4052_CHIP_ID) {
+			len = 3;
+		}
+		ad405x_conv_start(data->dev);
+		break;
+	case AD405X_AVERAGING_MODE_OP:
+		if (cfg->chip_id == AD4052_CHIP_ID) {
+			len = 3;
+		}
+		uint16_t conv_avg = avg_filter_values[data->filter_length];
+
+		for (int i = 0; i < conv_avg; i++) {
+			ad405x_conv_start(data->dev);
+		}
+		break;
+	default:
+		len = 2;
+		break;
+	}
+
+#if CONFIG_AD405X_TRIGGER
+	if (data->has_drdy != 0) {
+		k_sem_take(&data->sem_drdy, K_FOREVER);
+	}
+#endif
+	ad405x_read_raw(data->dev, reg_val_x, len);
+	switch (len) {
+	case 2:
+		/* translate valid bytes to BE format */
+		data_be = sys_get_be16(reg_val_x);
+		break;
+	case 3:
+		data_be = sys_get_be24(reg_val_x);
+		break;
+	default:
+		data_be = sys_get_be16(reg_val_x);
+		break;
+	}
+	memcpy(ctx->sequence.buffer, &data_be, len);
+
+	adc_context_on_sampling_done(&data->ctx, data->dev);
+}
+
+int ad405x_set_sample_rate(const struct device *dev, enum ad405x_sample_rate rate)
+{
+	struct adc_ad405x_data *data = dev->data;
+	int ret;
+
+	ret = ad405x_reg_update_bits(dev, AD405X_REG_TIMER_CONFIG, AD405X_FS_BURST_AUTO_MSK, rate);
+	if (ret != 0) {
+		return ret;
+	}
+
+	data->rate = rate;
+
+	return 0;
+}
+
+int ad405x_set_averaging_filter_length(const struct device *dev, enum ad405x_avg_filter_l length)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	struct adc_ad405x_data *data = dev->data;
+	int ret;
+
+	/* Restrict filter length depending on active device selected */
+	if (cfg->chip_id == AD4050_CHIP_ID) {
+		if (length > AD405X_LENGTH_256) {
+			return -EINVAL;
+		}
+	}
+	ret = ad405x_reg_update_bits(dev, AD405X_REG_AVG_CONFIG, AD405X_AVG_WIN_LEN_MSK, length);
+	if (ret) {
+		return ret;
+	}
+
+	data->filter_length = length;
+
+	return 0;
+}
+
+int ad405x_exit_command(const struct device *dev)
+{
+	int ret;
+
+	const struct adc_ad405x_config *cfg = dev->config;
+	struct adc_ad405x_data *data = dev->data;
+	uint8_t access[1] = {0xA8};
+	const struct spi_buf buf[1] = {{.buf = &access, .len = ARRAY_SIZE(access)}};
+	struct spi_buf_set tx = {
+		.buffers = buf,
+		.count = 1,
+	};
+
+	ret = spi_write_dt(&cfg->bus.spi, &tx);
+	if (!ret) {
+		data->operation_mode = AD405X_CONFIG_MODE_OP;
+	}
+
+	return ret;
+}
+
+int ad405x_set_operation_mode(const struct device *dev, enum ad405x_operation_mode operation_mode)
+{
+	struct adc_ad405x_data *data = dev->data;
+	int ret;
+
+	if (data->operation_mode == AD405X_SLEEP_MODE_OP) {
+		if (operation_mode != AD405X_SLEEP_MODE_OP) {
+			ret = ad405x_reg_write_byte(dev, AD405X_REG_DEVICE_CONFIG,
+						AD405X_ENTER_ACTIVE_MODE);
+			if (ret != 0) {
+				return ret;
+			}
+			if (operation_mode != AD405X_CONFIG_MODE_OP) {
+				/* Set Operation mode. */
+				ret = ad405x_reg_update_bits(dev, AD405X_REG_ADC_MODES,
+							  AD405X_ADC_MODES_MSK, operation_mode);
+				if (ret != 0) {
+					return ret;
+				}
+				/* Enter ADC_MODE. */
+				ret = ad405x_reg_update_bits(dev, AD405X_REG_MODE_SET,
+							     AD405X_ENTER_ADC_MODE_MSK,
+							     AD405X_ENTER_ADC_MODE);
+				if (ret != 0) {
+					return ret;
+				}
+			}
+		}
+	} else if (data->operation_mode == AD405X_CONFIG_MODE_OP) {
+		if (operation_mode == AD405X_SLEEP_MODE_OP) {
+			ret = ad405x_reg_write_byte(dev, AD405X_REG_DEVICE_CONFIG,
+						AD405X_ENTER_SLEEP_MODE);
+			if (ret != 0) {
+				return ret;
+			}
+		} else {
+			/* Set Operation mode. */
+			ret = ad405x_reg_update_bits(dev, AD405X_REG_ADC_MODES,
+						  AD405X_ADC_MODES_MSK, operation_mode);
+			if (ret != 0) {
+				return ret;
+			}
+			/* Enter ADC_MODE. */
+			ret = ad405x_reg_update_bits(dev, AD405X_REG_MODE_SET,
+						     AD405X_ENTER_ADC_MODE_MSK,
+						     AD405X_ENTER_ADC_MODE);
+			if (ret != 0) {
+				return ret;
+			}
+		}
+	} else {
+		ret = ad405x_exit_command(dev);
+		if (ret != 0) {
+			return ret;
+		};
+		if (operation_mode == AD405X_SLEEP_MODE_OP) {
+			ret = ad405x_reg_write_byte(dev, AD405X_REG_DEVICE_CONFIG,
+						AD405X_ENTER_SLEEP_MODE);
+			if (ret != 0) {
+				return ret;
+			}
+		} else if (operation_mode != AD405X_CONFIG_MODE_OP) {
+			ret = ad405x_reg_update_bits(dev, AD405X_REG_ADC_MODES,
+						AD405X_ADC_MODES_MSK, operation_mode);
+			if (ret != 0) {
+				return ret;
+			}
+			/* Enter ADC_MODE. */
+			ret = ad405x_reg_update_bits(dev, AD405X_REG_MODE_SET,
+						     AD405X_ENTER_ADC_MODE_MSK,
+						     AD405X_ENTER_ADC_MODE);
+			if (ret != 0) {
+				return ret;
+			}
+		}
+	}
+	data->operation_mode = operation_mode;
+	return 0;
+}
+
+#if CONFIG_AD405X_TRIGGER
+int ad405x_set_gpx_mode(const struct device *dev, uint8_t gp0_1, enum ad405x_gpx_mode gpx_mode)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	struct adc_ad405x_data *data = dev->data;
+	uint8_t mask = AD405X_GP1_MODE_MSK;
+	int ret;
+	enum ad405x_gpx_mode gpx_mode_tmp = gpx_mode;
+
+	if (gp0_1 == AD405X_GP0) {
+		mask = AD405X_GP0_MODE_MSK;
+		if (gpx_mode == AD405X_DEV_READY) {
+			return -EINVAL;
+		}
+	} else {
+		gpx_mode_tmp = gpx_mode_tmp << 4;
+	}
+
+	ret = ad405x_reg_update_bits(dev, AD405X_REG_GP_PIN_CONF, mask, gpx_mode_tmp);
+
+	if (ret == 0) {
+		if (gp0_1 == AD405X_GP0) {
+			if (gpx_mode == AD405X_DATA_READY) {
+				gpio_pin_interrupt_configure_dt(&cfg->gp0_interrupt,
+								GPIO_INT_EDGE_TO_INACTIVE);
+			}
+			data->gp0_mode = gpx_mode;
+		} else {
+			if (gpx_mode == AD405X_DATA_READY) {
+				gpio_pin_interrupt_configure_dt(&cfg->gp1_interrupt,
+								GPIO_INT_EDGE_TO_INACTIVE);
+			}
+			data->gp1_mode = gpx_mode;
+		}
+	}
+	return ret;
+}
+#endif
+
+static void adc_context_update_buffer_pointer(struct adc_context *ctx, bool repeat_sampling)
+{
+	struct adc_ad405x_data *data = CONTAINER_OF(ctx, struct adc_ad405x_data, ctx);
+
+	if (repeat_sampling) {
+		data->buffer = data->repeat_buffer;
+	}
+}
+
+static int adc_ad405x_start_read(const struct device *dev, const struct adc_sequence *sequence)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	struct adc_ad405x_data *data = dev->data;
+	int ret;
+
+	if (cfg->chip_id == AD4050_CHIP_ID) {
+		if (sequence->resolution != cfg->spec.resolution) {
+			LOG_ERR("invalid resolution %d", sequence->resolution);
+			return -EINVAL;
+		}
+	}
+	if (cfg->chip_id == AD4052_CHIP_ID) {
+		if (sequence->resolution != cfg->spec.resolution) {
+			LOG_ERR("invalid resolution %d", sequence->resolution);
+			return -EINVAL;
+		}
+	}
+
+	ret = adc_ad405x_validate_buffer_size(dev, sequence);
+	if (ret < 0) {
+		LOG_ERR("insufficient buffer size");
+		return ret;
+	}
+
+	ad405x_set_operation_mode(dev, cfg->active_mode);
+
+	data->buffer = sequence->buffer;
+	adc_context_start_read(&data->ctx, sequence);
+
+	return adc_context_wait_for_completion(&data->ctx);
+}
+
+static int adc_ad405x_read_async(const struct device *dev, const struct adc_sequence *sequence,
+				struct k_poll_signal *async)
+{
+	struct adc_ad405x_data *data = dev->data;
+	int ret;
+
+	adc_context_lock(&data->ctx, async ? true : false, async);
+	ret = adc_ad405x_start_read(dev, sequence);
+	adc_context_release(&data->ctx, ret);
+
+	return ret;
+}
+
+static int ad405x_read(const struct device *dev, const struct adc_sequence *sequence)
+{
+	return adc_ad405x_read_async(dev, sequence, NULL);
+}
+
+static inline bool adc_ad405x_bus_is_ready(const struct device *dev)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+
+	return ad405x_bus_is_ready_spi(&cfg->bus);
+}
+
+int ad405x_soft_reset(const struct device *dev)
+{
+	int ret;
+
+	ret = ad405x_reg_update_bits(dev, AD405X_REG_INTERFACE_CONFIG_A, AD405X_SW_RESET_MSK,
+					AD405X_REG_INTERFACE_CONFIG_A_RESET_VAL);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return ad405x_reg_update_bits(dev, AD405X_REG_INTERFACE_CONFIG_A, AD405X_SW_RESET_MSK, 0);
+}
+
+static int adc_ad405x_init(const struct device *dev)
+{
+	const struct adc_ad405x_config *cfg = dev->config;
+	struct adc_ad405x_data *data = dev->data;
+	int ret;
+	uint8_t reg_val;
+	uint8_t reg_val_hi;
+	uint16_t reg_val_res;
+
+	if (!adc_ad405x_bus_is_ready(dev)) {
+		LOG_ERR("bus not ready");
+		return -ENODEV;
+	}
+
+#if CONFIG_AD405X_TRIGGER
+	ret = ad405x_init_interrupt(dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to initialize interrupt!");
+		return -EIO;
+	}
+#else
+	data->gp0_mode = AD405X_DISABLED;
+#endif
+	ad405x_init_conv(dev);
+	data->gp1_mode = AD405X_DEV_READY;
+	data->operation_mode = AD405X_CONFIG_MODE_OP;
+	data->filter_length = AD405X_LENGTH_2;
+	k_sem_init(&data->sem_devrdy, 0, 1);
+	adc_context_init(&data->ctx);
+
+	/* Reset */
+	ret = ad405x_reset_pattern_cmd(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = ad405x_reg_read_byte(dev, AD405X_REG_PRODUCT_ID_L, &reg_val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = ad405x_reg_read_byte(dev, AD405X_REG_PRODUCT_ID_H, &reg_val_hi);
+	if (ret < 0) {
+		return ret;
+	}
+
+	reg_val_res = (reg_val_hi << 8) | reg_val;
+	if ((reg_val_res != AD4052_REG_PRODUCT_ID_VAL) &
+	    (reg_val_res != AD4050_REG_PRODUCT_ID_VAL)) {
+		LOG_ERR("Invalid product id");
+		return -ENODEV;
+	}
+
+	ret = ad405x_reg_read_byte(dev, AD405X_REG_DEVICE_TYPE, &reg_val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (reg_val != AD405X_REG_DEVICE_TYPE_VAL) {
+		LOG_ERR("Invalid device type");
+		return -ENODEV;
+	}
+
+	ret = ad405x_reg_read_byte(dev, AD405X_REG_VENDOR_L, &reg_val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = ad405x_reg_read_byte(dev, AD405X_REG_VENDOR_H, &reg_val_hi);
+	if (ret < 0) {
+		return ret;
+	}
+
+	reg_val_res = (reg_val_hi << 8) | reg_val;
+	if (reg_val_res != AD405X_REG_VENDOR_VAL) {
+		LOG_ERR("Invalid vendor value");
+		return -ENODEV;
+	}
+
+	if (cfg->chip_id == AD4050_CHIP_ID) {
+		if (cfg->spec.resolution != AD4050_ADC_RESOLUTION) {
+			LOG_ERR("Invalid resolution %d", cfg->spec.resolution);
+			return -EINVAL;
+		}
+	} else {
+		if (cfg->spec.resolution != AD4052_ADC_RESOLUTION) {
+			LOG_ERR("Invalid resolution %d", cfg->spec.resolution);
+			return -EINVAL;
+		}
+	}
+
+#if CONFIG_AD405X_TRIGGER
+	if (cfg->has_gp1 != 0) {
+		ad405x_set_gpx_mode(dev, AD405X_GP1, AD405X_DATA_READY);
+		k_sem_init(&data->sem_drdy, 0, 1);
+		data->has_drdy = 1;
+	}
+#endif
+
+	adc_context_unlock_unconditionally(&data->ctx);
+	data->dev = dev;
+	return ret;
+}
+
+static DEVICE_API(adc, ad405x_api_funcs) = {
+	.channel_setup = ad405x_channel_setup,
+	.read = ad405x_read,
+	.ref_internal = 2500,
+#ifdef CONFIG_ADC_ASYNC
+	.read_async = ad405x_adc_read_async,
+#endif
+};
+
+#define AD405X_SPI_CFG SPI_WORD_SET(8) | SPI_TRANSFER_MSB
+
+#define DT_INST_AD405X(inst, t) DT_INST(inst, adi_ad##t##_adc)
+
+#define AD405X_GPIO_PROPS1(n)                                                                    \
+	.gp1_interrupt = GPIO_DT_SPEC_INST_GET_OR(n, gp1_gpios, {0}),                            \
+	.has_gp1 = 1,                                                                            \
+
+#define AD405X_GPIO_PROPS0(n)                                                                    \
+	.gp0_interrupt = GPIO_DT_SPEC_INST_GET_OR(n, gp0_gpios, {0}),                            \
+	.has_gp0 = 1,                                                                            \
+
+#define AD405X_GPIO(t, n)                                                                        \
+	IF_ENABLED(DT_NODE_HAS_PROP(DT_INST_AD405X(n, t), gp1_gpios),                            \
+		   (AD405X_GPIO_PROPS1(n)))                                                      \
+	IF_ENABLED(DT_NODE_HAS_PROP(DT_INST_AD405X(n, t), gp0_gpios),                            \
+		   (AD405X_GPIO_PROPS0(n)))
+
+#define AD405X_INIT(t, n) \
+	static struct adc_ad405x_data ad##t##_data_##n = {};                                     \
+	static const struct adc_ad405x_config ad##t##_config_##n =  {                            \
+		.bus = {.spi = SPI_DT_SPEC_GET(DT_INST_AD405X(n, t), AD405X_SPI_CFG, 0)},        \
+		.conversion = GPIO_DT_SPEC_GET_BY_IDX(DT_INST_AD405X(n, t), conversion_gpios, 0),\
+		IF_ENABLED(CONFIG_AD405X_TRIGGER, (AD405X_GPIO(t, n)))                           \
+		.chip_id = t,                                                                    \
+		.active_mode = AD405X_SAMPLE_MODE_OP,                                            \
+		.spec = ADC_DT_SPEC_STRUCT(DT_INST(n, DT_DRV_COMPAT), 0)                         \
+		};                                                                               \
+	DEVICE_DT_DEFINE(DT_INST_AD405X(n, t), adc_ad405x_init, NULL, &ad##t##_data_##n,         \
+			&ad##t##_config_##n, POST_KERNEL,                                        \
+			CONFIG_ADC_INIT_PRIORITY, &ad405x_api_funcs);
+
+/*
+ * AD4052: 16 bit
+ */
+#define AD4052_INIT(n) AD405X_INIT(AD4052_CHIP_ID, n)
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT adi_ad4052_adc
+DT_INST_FOREACH_STATUS_OKAY(AD4052_INIT)
+
+/*
+ * AD4050: 12 bit
+ */
+#define AD4050_INIT(n) AD405X_INIT(AD4050_CHIP_ID, n)
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT adi_ad4050_adc
+DT_INST_FOREACH_STATUS_OKAY(AD4050_INIT)
diff --git a/drivers/adc/adc_ad4130.c b/drivers/adc/adc_ad4130.c
new file mode 100644
index 0000000000000..1c74efd01a050
--- /dev/null
+++ b/drivers/adc/adc_ad4130.c
@@ -0,0 +1,1071 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT adi_ad4130_adc
+
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+
+LOG_MODULE_REGISTER(adc_ad4130, CONFIG_ADC_LOG_LEVEL);
+
+#define ADC_CONTEXT_USES_KERNEL_TIMER
+#include "adc_context.h"
+
+/* ---------------------------------------
+ * AD4130 Register Addresses
+ * ---------------------------------------
+ */
+
+#define AD4130_STATUS_REG       0x00
+#define AD4130_ADC_CONTROL_REG  0x01
+#define AD4130_DATA_REG         0x02
+#define AD4130_IO_CONTROL_REG   0x03
+#define AD4130_VBIAS_REG        0x04
+#define AD4130_ID_REG           0x05
+#define AD4130_ERROR_REG        0x06
+#define AD4130_ERROR_EN_REG     0x07
+#define AD4130_MCLK_COUNT_REG   0x08
+#define AD4130_CHANNEL_X_REG(x) (0x09 + (x))
+#define AD4130_CONFIG_X_REG(x)  (0x19 + (x))
+#define AD4130_FILTER_X_REG(x)  (0x21 + (x))
+
+/* ---------------------------------------
+ * AD4130 Status Flags and Bit Masks
+ * ---------------------------------------
+ */
+
+#define AD4130_STATUS_REG_DATA_READY BIT(7)
+#define AD4130_COMMS_READ_MASK       BIT(6)
+
+/* ---------------------------------------
+ * AD4130 ADC Control Bit Masks
+ * ---------------------------------------
+ */
+
+#define AD4130_ADC_CONTROL_BIPOLAR_MASK     BIT(14)
+#define AD4130_ADC_CONTROL_INT_REF_VAL_MASK BIT(13)
+#define AD4130_ADC_CONTROL_CSB_EN_MASK      BIT(9)
+#define AD4130_ADC_CONTROL_INT_REF_EN_MASK  BIT(8)
+#define AD4130_ADC_CONTROL_MODE_MASK        GENMASK(5, 2)
+#define AD4130_ADC_CONTROL_MCLK_SEL_MASK    GENMASK(1, 0)
+
+/* ---------------------------------------
+ * AD4130 Channel Configuration Bit Masks
+ * ---------------------------------------
+ */
+
+#define AD4130_CHANNEL_EN_MASK    BIT(23)
+#define AD4130_CHANNEL_SETUP_MASK GENMASK(22, 20)
+#define AD4130_CHANNEL_AINP_MASK  GENMASK(17, 13)
+#define AD4130_CHANNEL_AINM_MASK  GENMASK(12, 8)
+
+/* ---------------------------------------
+ * AD4130 Configuration Register Bit Masks
+ * ---------------------------------------
+ */
+
+#define AD4130_CONFIG_REF_SEL_MASK GENMASK(5, 4)
+#define AD4130_CONFIG_PGA_MASK     GENMASK(3, 1)
+
+/* ---------------------------------------
+ * AD4130 Device-Specific Parameters
+ * ---------------------------------------
+ */
+
+#define AD4130_MAX_CHANNELS 16
+#define AD4130_MAX_SETUPS   8
+
+/* ---------------------------------------
+ * AD4130 Reset Parameters
+ * ---------------------------------------
+ */
+
+#define AD4130_RESET_BUF_SIZE 8
+#define AD4130_RESET_SLEEP_MS (160 * 1000 / AD4130_MCLK_FREQ_76_8KHZ)
+
+/* ---------------------------------------
+ * AD4130 Error Values
+ * ---------------------------------------
+ */
+
+#define AD4130_INVALID_CHANNEL -1
+#define AD4130_INVALID_SLOT    -1
+
+/* ---------------------------------------
+ * AD4130 Electrical Characteristics
+ * ---------------------------------------
+ */
+
+#define AD4130_INT_REF_2_5V      2500U
+#define AD4130_ADC_RESOLUTION    24
+#define AD4130_MCLK_FREQ_76_8KHZ 76800
+
+/* ---------------------------------------
+ * AD4130-8 Identification
+ * ---------------------------------------
+ */
+
+#define AD4130_8_ID 0x04 /* AD4130-8 Device ID */
+
+static const unsigned int ad4130_reg_size[] = {
+	[AD4130_STATUS_REG] = 1,
+	[AD4130_ADC_CONTROL_REG] = 2,
+	[AD4130_DATA_REG] = 3,
+	[AD4130_VBIAS_REG] = 2,
+	[AD4130_ID_REG] = 1,
+	[AD4130_CHANNEL_X_REG(0)... AD4130_CHANNEL_X_REG(AD4130_MAX_CHANNELS - 1)] = 3,
+	[AD4130_CONFIG_X_REG(0)... AD4130_CONFIG_X_REG(AD4130_MAX_SETUPS - 1)] = 2,
+	[AD4130_FILTER_X_REG(0)... AD4130_FILTER_X_REG(AD4130_MAX_SETUPS - 1)] = 3,
+};
+
+enum ad4130_input {
+	AD4130_AIN0,
+	AD4130_AIN1,
+	AD4130_AIN2,
+	AD4130_AIN3,
+	AD4130_AIN4,
+	AD4130_AIN5,
+	AD4130_AIN6,
+	AD4130_AIN7,
+	AD4130_AIN8,
+	AD4130_AIN9,
+	AD4130_AIN10,
+	AD4130_AIN11,
+	AD4130_AIN12,
+	AD4130_AIN13,
+	AD4130_AIN14,
+	AD4130_AIN15,
+	AD4130_TEMP,
+	AD4130_AVSS,
+	AD4130_INT_REF,
+	AD4130_DGND,
+	AD4130_AVDD_AVSS_6P,
+	AD4130_AVDD_AVSS_6M,
+	AD4130_IOVDD_DGND_6P,
+	AD4130_IOVDD_DGND_6M,
+	AD4130_ALDO_AVSS_6P,
+	AD4130_ALDO_AVSS_6M,
+	AD4130_DLDO_DGND_6P,
+	AD4130_DLDO_DGND_6M,
+	AD4130_V_MV_P,
+	AD4130_V_MV_M,
+};
+
+enum ad4130_int_ref {
+	AD4130_INT_REF_VAL_2_5V,
+	AD4130_INT_REF_VAL_1_25V,
+};
+
+enum ad4130_setup {
+	AD4130_SETUP_0,
+	AD4130_SETUP_1,
+	AD4130_SETUP_2,
+	AD4130_SETUP_3,
+	AD4130_SETUP_4,
+	AD4130_SETUP_5,
+	AD4130_SETUP_6,
+	AD4130_SETUP_7
+};
+
+enum ad4130_mclk_sel {
+	AD4130_MCLK_76_8KHZ,
+	AD4130_MCLK_76_8KHZ_OUT,
+	AD4130_MCLK_76_8KHZ_EXT,
+	AD4130_MCLK_153_6KHZ_EXT,
+};
+
+enum ad4130_ref_sel {
+	AD4130_REF_REFIN1,
+	AD4130_REF_REFIN2,
+	AD4130_REF_REFOUT_AVSS,
+	AD4130_REF_AVDD_AVSS,
+	AD4130_REF_SEL_MAX
+};
+
+enum ad4130_adc_mode {
+	AD4130_MODE_CONTINUOUS = 0b0000,
+	AD4130_STANDBY_MODE = 0b0010,
+	AD4130_MODE_IDLE = 0b0100,
+};
+
+enum ad4130_gain {
+	AD4130_GAIN_1,
+	AD4130_GAIN_2,
+	AD4130_GAIN_4,
+	AD4130_GAIN_8,
+	AD4130_GAIN_16,
+	AD4130_GAIN_32,
+	AD4130_GAIN_64,
+	AD4130_GAIN_128,
+};
+
+struct ad4130_config_props {
+	enum ad4130_ref_sel ref_sel;
+	enum ad4130_gain gain;
+};
+
+struct ad4130_channel_config {
+	struct ad4130_config_props props;
+	uint8_t cfg_slot;
+	bool live_cfg;
+};
+
+struct ad4130_config {
+	struct spi_dt_spec bus;
+	uint8_t resolution;
+	bool bipolar;
+	enum ad4130_int_ref int_ref;
+	enum ad4130_adc_mode adc_mode;
+	enum ad4130_mclk_sel mclk_sel;
+};
+
+struct adc_ad4130_data {
+	const struct device *dev;
+	struct adc_context ctx;
+	struct ad4130_channel_config channel_setup_cfg[AD4130_MAX_SETUPS];
+	uint8_t setup_cfg_slots;
+	struct k_sem acquire_signal;
+	uint16_t channels;
+	uint32_t *buffer;
+	uint32_t *repeat_buffer;
+#if CONFIG_ADC_ASYNC
+	struct k_thread thread;
+
+	K_KERNEL_STACK_MEMBER(stack, CONFIG_ADI_AD4130_ADC_ACQUISITION_THREAD_STACK_SIZE);
+#endif /* CONFIG_ADC_ASYNC */
+};
+
+static size_t ad4130_get_reg_size(unsigned int reg_addr, size_t *reg_size)
+{
+	if (reg_addr >= ARRAY_SIZE(ad4130_reg_size)) {
+		return -EINVAL;
+	}
+
+	*reg_size = ad4130_reg_size[reg_addr];
+	return 0;
+}
+
+static int ad4130_reg_write(const struct device *dev, unsigned int reg_addr, unsigned int val)
+{
+	const struct ad4130_config *config = dev->config;
+	const struct spi_dt_spec *spec = &config->bus;
+
+	uint8_t reg_write_tx_buf[4] = {0};
+	size_t reg_size = 0;
+	int ret;
+
+	ret = ad4130_get_reg_size(reg_addr, &reg_size);
+	if (ret) {
+		return ret;
+	}
+
+	reg_write_tx_buf[0] = reg_addr;
+
+	switch (reg_size) {
+	case 1:
+		reg_write_tx_buf[1] = val;
+		break;
+	case 2:
+		sys_put_be16(val, &reg_write_tx_buf[1]);
+		break;
+	case 3:
+		sys_put_be24(val, &reg_write_tx_buf[1]);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	const struct spi_buf tx_buf = {.buf = reg_write_tx_buf, .len = reg_size + 1};
+	const struct spi_buf_set tx = {.buffers = &tx_buf, .count = 1};
+
+	return spi_write_dt(spec, &tx);
+}
+
+static int ad4130_reg_read(const struct device *dev, unsigned int reg_addr, unsigned int *val)
+{
+	const struct ad4130_config *config = dev->config;
+	const struct spi_dt_spec *spec = &config->bus;
+	int ret;
+
+	uint8_t reg_read_tx_buf[1] = {AD4130_COMMS_READ_MASK | reg_addr};
+	uint8_t reg_read_rx_buf[4] = {0};
+	size_t reg_size = 0;
+
+	ret = ad4130_get_reg_size(reg_addr, &reg_size);
+	if (ret) {
+		return ret;
+	}
+
+	const struct spi_buf tx_buf = {.buf = reg_read_tx_buf, .len = 1};
+	const struct spi_buf rx_buf = {.buf = reg_read_rx_buf, .len = reg_size + 1};
+	const struct spi_buf_set tx = {.buffers = &tx_buf, .count = 1};
+	const struct spi_buf_set rx = {.buffers = &rx_buf, .count = 1};
+
+	ret = spi_transceive_dt(spec, &tx, &rx);
+	if (ret) {
+		return ret;
+	}
+
+	switch (reg_size) {
+	case 1:
+		*val = reg_read_rx_buf[1];
+		break;
+	case 2:
+		*val = sys_get_be16(&reg_read_rx_buf[1]);
+		break;
+	case 3:
+		*val = sys_get_be24(&reg_read_rx_buf[1]);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int ad4130_reg_write_msk(const struct device *dev, unsigned int reg_addr, unsigned int data,
+				unsigned int mask)
+{
+	uint32_t reg_data;
+	int ret;
+
+	ret = ad4130_reg_read(dev, reg_addr, &reg_data);
+	if (ret) {
+		return ret;
+	}
+
+	reg_data &= ~mask;
+	reg_data |= data;
+
+	return ad4130_reg_write(dev, reg_addr, reg_data);
+}
+
+static void adc_context_update_buffer_pointer(struct adc_context *ctx, bool repeat_sampling)
+{
+	struct adc_ad4130_data *data = CONTAINER_OF(ctx, struct adc_ad4130_data, ctx);
+
+	if (repeat_sampling) {
+		data->buffer = data->repeat_buffer;
+	}
+}
+
+static void adc_context_start_sampling(struct adc_context *ctx)
+{
+	struct adc_ad4130_data *data = CONTAINER_OF(ctx, struct adc_ad4130_data, ctx);
+
+	data->repeat_buffer = data->buffer;
+	k_sem_give(&data->acquire_signal);
+}
+
+static int adc_ad4130_set_ref(const struct device *dev, enum ad4130_ref_sel ref,
+			      enum ad4130_setup setup_id)
+{
+	bool internal_reference;
+	int ret;
+
+	if (ref == AD4130_REF_REFOUT_AVSS) {
+		internal_reference = true;
+	} else {
+		internal_reference = false;
+	}
+
+	ret = ad4130_reg_write_msk(
+		dev, AD4130_ADC_CONTROL_REG,
+		FIELD_PREP(AD4130_ADC_CONTROL_INT_REF_EN_MASK, internal_reference),
+		AD4130_ADC_CONTROL_INT_REF_EN_MASK);
+	if (ret) {
+		return ret;
+	}
+
+	return ad4130_reg_write_msk(dev, AD4130_CONFIG_X_REG(setup_id),
+				    FIELD_PREP(AD4130_CONFIG_REF_SEL_MASK, ref),
+				    AD4130_CONFIG_REF_SEL_MASK);
+}
+
+static int adc_ad4130_set_gain(const struct device *dev, enum ad4130_gain gain,
+			       enum ad4130_setup setup_id)
+{
+	return ad4130_reg_write_msk(dev, AD4130_CONFIG_X_REG(setup_id),
+				    FIELD_PREP(AD4130_CONFIG_PGA_MASK, gain),
+				    AD4130_CONFIG_PGA_MASK);
+}
+
+static int adc_ad4130_setup_cfg(const struct device *dev, const struct ad4130_channel_config *cfg)
+{
+	int ret;
+
+	ret = adc_ad4130_set_ref(dev, cfg->props.ref_sel, cfg->cfg_slot);
+	if (ret) {
+		return ret;
+	}
+
+	ret = adc_ad4130_set_gain(dev, cfg->props.gain, cfg->cfg_slot);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int adc_ad4130_find_similar_configuration(const struct device *dev,
+						 const struct ad4130_channel_config *cfg,
+						 uint8_t channel_id)
+{
+	struct adc_ad4130_data *data = dev->data;
+	int similar_channel_index = AD4130_INVALID_CHANNEL;
+
+	for (int i = 0; i < AD4130_MAX_CHANNELS; i++) {
+		if (!data->channel_setup_cfg[i].live_cfg && i == channel_id) {
+			continue;
+		}
+
+		if (memcmp(&cfg->props, &data->channel_setup_cfg[i].props,
+			   sizeof(struct ad4130_config_props)) == 0) {
+			similar_channel_index = i;
+			break;
+		}
+	}
+
+	return similar_channel_index;
+}
+
+static int adc_ad4130_find_new_slot(const struct device *dev)
+{
+	struct adc_ad4130_data *data = dev->data;
+	uint8_t slot = data->setup_cfg_slots;
+
+	for (int i = 0; i < AD4130_MAX_SETUPS; i++) {
+		if (!(slot & (1 << i))) {
+			return i;
+		}
+	}
+
+	return AD4130_INVALID_SLOT;
+}
+
+static int adc_ad4130_create_new_cfg(const struct device *dev, const struct adc_channel_cfg *cfg,
+				     struct ad4130_channel_config *new_cfg)
+{
+	enum ad4130_ref_sel ref_source;
+	enum ad4130_gain gain;
+
+	if (cfg->channel_id >= AD4130_MAX_CHANNELS) {
+		LOG_ERR("Invalid channel (%u)", cfg->channel_id);
+		return -EINVAL;
+	}
+
+	if (cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
+		LOG_ERR("invalid acquisition time %i", cfg->acquisition_time);
+		return -EINVAL;
+	}
+
+	switch (cfg->reference) {
+	case ADC_REF_INTERNAL:
+		ref_source = AD4130_REF_REFOUT_AVSS;
+		break;
+	case ADC_REF_EXTERNAL0:
+		ref_source = AD4130_REF_REFIN1;
+		break;
+	case ADC_REF_EXTERNAL1:
+		ref_source = AD4130_REF_REFIN2;
+		break;
+	case ADC_REF_VDD_1:
+		ref_source = AD4130_REF_AVDD_AVSS;
+		break;
+	default:
+		LOG_ERR("Invalid reference source (%u)", cfg->reference);
+		return -EINVAL;
+	}
+
+	new_cfg->props.ref_sel = ref_source;
+
+	switch (cfg->gain) {
+	case ADC_GAIN_1:
+		gain = AD4130_GAIN_1;
+		break;
+	case ADC_GAIN_2:
+		gain = AD4130_GAIN_2;
+		break;
+	case ADC_GAIN_4:
+		gain = AD4130_GAIN_4;
+		break;
+	case ADC_GAIN_8:
+		gain = AD4130_GAIN_8;
+		break;
+	case ADC_GAIN_16:
+		gain = AD4130_GAIN_16;
+		break;
+	case ADC_GAIN_32:
+		gain = AD4130_GAIN_32;
+		break;
+	case ADC_GAIN_64:
+		gain = AD4130_GAIN_64;
+		break;
+	case ADC_GAIN_128:
+		gain = AD4130_GAIN_128;
+		break;
+	default:
+		LOG_ERR("Invalid gain value (%u)", cfg->gain);
+		return -EINVAL;
+	}
+
+	new_cfg->props.gain = gain;
+
+	return 0;
+}
+
+static int adc_ad4130_set_channel_setup(const struct device *dev, uint8_t channel_id,
+					enum ad4130_setup setup_id)
+{
+	return ad4130_reg_write_msk(dev, AD4130_CHANNEL_X_REG(channel_id),
+				    FIELD_PREP(AD4130_CHANNEL_SETUP_MASK, setup_id),
+				    AD4130_CHANNEL_SETUP_MASK);
+}
+
+static int adc_ad4130_channel_en(const struct device *dev, uint8_t channel_id, bool enable)
+{
+	return ad4130_reg_write_msk(dev, AD4130_CHANNEL_X_REG(channel_id),
+				    FIELD_PREP(AD4130_CHANNEL_EN_MASK, enable),
+				    AD4130_CHANNEL_EN_MASK);
+}
+
+static int adc_ad4130_connect_analog_input(const struct device *dev, uint8_t channel_id,
+					   enum ad4130_input ainp, enum ad4130_input ainm)
+{
+	if (ainp < AD4130_AIN0 || ainp > AD4130_V_MV_M || ainm < AD4130_AIN0 ||
+	    ainm > AD4130_V_MV_M) {
+		return -EINVAL;
+	}
+
+	int ret = ad4130_reg_write_msk(dev, AD4130_CHANNEL_X_REG(channel_id),
+				       FIELD_PREP(AD4130_CHANNEL_AINP_MASK, ainp),
+				       AD4130_CHANNEL_AINP_MASK);
+	if (ret) {
+		return ret;
+	}
+
+	return ad4130_reg_write_msk(dev, AD4130_CHANNEL_X_REG(channel_id),
+				    FIELD_PREP(AD4130_CHANNEL_AINM_MASK, ainm),
+				    AD4130_CHANNEL_AINM_MASK);
+}
+
+static int adc_ad4130_channel_setup(const struct device *dev, const struct adc_channel_cfg *cfg)
+{
+	struct adc_ad4130_data *data = dev->data;
+	struct ad4130_channel_config new_cfg;
+	int similar_channel_index;
+	int new_slot;
+	int ret;
+
+	data->channel_setup_cfg[cfg->channel_id].live_cfg = false;
+
+	ret = adc_ad4130_create_new_cfg(dev, cfg, &new_cfg);
+	if (ret) {
+		return ret;
+	}
+
+	/* AD4130 supports only 8 different configurations for 16 channels*/
+	new_slot = adc_ad4130_find_new_slot(dev);
+
+	if (new_slot == AD4130_INVALID_SLOT) {
+		similar_channel_index =
+			adc_ad4130_find_similar_configuration(dev, &new_cfg, cfg->channel_id);
+		if (similar_channel_index == AD4130_INVALID_CHANNEL) {
+			return -EINVAL;
+		}
+		new_cfg.cfg_slot = data->channel_setup_cfg[similar_channel_index].cfg_slot;
+	} else {
+		new_cfg.cfg_slot = new_slot;
+		WRITE_BIT(data->setup_cfg_slots, new_slot, true);
+	}
+
+	new_cfg.live_cfg = true;
+
+	memcpy(&data->channel_setup_cfg[cfg->channel_id], &new_cfg,
+	       sizeof(struct ad4130_channel_config));
+
+	/* Setup the channel configuration */
+	ret = adc_ad4130_setup_cfg(dev, &data->channel_setup_cfg[cfg->channel_id]);
+	if (ret) {
+		LOG_ERR("Error setting up configuration");
+		return ret;
+	}
+
+	/* Setup the channel */
+	ret = adc_ad4130_connect_analog_input(dev, cfg->channel_id, cfg->input_positive,
+					      cfg->input_negative);
+	if (ret) {
+		return ret;
+	}
+
+	ret = adc_ad4130_set_channel_setup(dev, cfg->channel_id, new_cfg.cfg_slot);
+	if (ret) {
+		LOG_ERR("Error setting up configuration");
+		return ret;
+	}
+
+	ret = adc_ad4130_channel_en(dev, cfg->channel_id, true);
+	if (ret) {
+		LOG_ERR("Error setting up configuration");
+		return ret;
+	}
+
+	WRITE_BIT(data->channels, cfg->channel_id, true);
+
+	return 0;
+}
+
+static int adc_ad4130_reset(const struct device *dev)
+{
+	const struct ad4130_config *config = dev->config;
+	const struct spi_dt_spec *spec = &config->bus;
+	int ret;
+
+	uint8_t buffer_write_tx[AD4130_RESET_BUF_SIZE] = {0xFF, 0xFF, 0xFF, 0xFF,
+							  0xFF, 0xFF, 0xFF, 0xFF};
+	struct spi_buf tx_buf = {
+		.buf = buffer_write_tx,
+		.len = ARRAY_SIZE(buffer_write_tx),
+	};
+
+	const struct spi_buf_set tx = {.buffers = &tx_buf, .count = 1};
+
+	/*
+	 * Send 8 times 0xFF to reset the ADC
+	 */
+	ret = spi_write_dt(spec, &tx);
+	if (ret) {
+		return ret;
+	}
+
+	k_sleep(K_MSEC(AD4130_RESET_SLEEP_MS));
+
+	return 0;
+}
+
+static int adc_ad4130_set_int_ref(const struct device *dev, enum ad4130_int_ref int_ref)
+{
+	int ret;
+
+	switch (int_ref) {
+	case AD4130_INT_REF_VAL_2_5V:
+		ret = ad4130_reg_write_msk(dev, AD4130_ADC_CONTROL_REG, 0U,
+					   AD4130_ADC_CONTROL_INT_REF_VAL_MASK);
+		break;
+
+	case AD4130_INT_REF_VAL_1_25V:
+		ret = ad4130_reg_write_msk(dev, AD4130_ADC_CONTROL_REG,
+					   FIELD_PREP(AD4130_ADC_CONTROL_INT_REF_VAL_MASK, 1),
+					   AD4130_ADC_CONTROL_INT_REF_VAL_MASK);
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	return ret;
+}
+
+static int adc_ad4130_set_adc_mode(const struct device *dev, enum ad4130_adc_mode mode)
+{
+	return ad4130_reg_write_msk(dev, AD4130_ADC_CONTROL_REG,
+				    FIELD_PREP(AD4130_ADC_CONTROL_MODE_MASK, mode),
+				    AD4130_ADC_CONTROL_MODE_MASK);
+}
+
+static int adc_ad4130_check_chip_id(const struct device *dev)
+{
+	uint32_t reg_data;
+	int ret;
+
+	ret = ad4130_reg_read(dev, AD4130_ID_REG, &reg_data);
+	if (ret) {
+		return ret;
+	}
+
+	return reg_data == AD4130_8_ID ? 0 : -EINVAL;
+}
+
+static int adc_ad4130_set_polarity(const struct device *dev, bool enable)
+{
+	return ad4130_reg_write_msk(dev, AD4130_ADC_CONTROL_REG,
+				    FIELD_PREP(AD4130_ADC_CONTROL_BIPOLAR_MASK, enable),
+				    AD4130_ADC_CONTROL_BIPOLAR_MASK);
+}
+
+static int adc_ad4130_set_mclk(const struct device *dev, enum ad4130_mclk_sel clk)
+{
+	return ad4130_reg_write_msk(dev, AD4130_ADC_CONTROL_REG,
+				    FIELD_PREP(AD4130_ADC_CONTROL_MCLK_SEL_MASK, clk),
+				    AD4130_ADC_CONTROL_MCLK_SEL_MASK);
+}
+
+static int adc_ad4130_setup(const struct device *dev)
+{
+	const struct ad4130_config *config = dev->config;
+	uint32_t reg_data;
+	int ret;
+
+	/* Reset the device interface */
+	ret = adc_ad4130_reset(dev);
+	if (ret) {
+		return ret;
+	}
+
+	ret = ad4130_reg_read(dev, AD4130_STATUS_REG, &reg_data);
+	if (ret) {
+		return ret;
+	}
+
+	/* Change SPI to 4 wire*/
+	ret = ad4130_reg_write_msk(dev, AD4130_ADC_CONTROL_REG, AD4130_ADC_CONTROL_CSB_EN_MASK,
+				   AD4130_ADC_CONTROL_CSB_EN_MASK);
+	if (ret) {
+		return ret;
+	}
+
+	/* Check the device ID */
+	ret = adc_ad4130_check_chip_id(dev);
+	if (ret) {
+		return ret;
+	}
+
+	/* Disable channel 0 */
+	ret = adc_ad4130_channel_en(dev, 0, false);
+	if (ret) {
+		return ret;
+	}
+
+	ret = adc_ad4130_set_polarity(dev, config->bipolar);
+	if (ret) {
+		return ret;
+	}
+
+	ret = adc_ad4130_set_int_ref(dev, config->int_ref);
+	if (ret) {
+		return ret;
+	}
+
+	ret = adc_ad4130_set_adc_mode(dev, config->adc_mode);
+	if (ret) {
+		return ret;
+	}
+
+	ret = adc_ad4130_set_mclk(dev, config->mclk_sel);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static bool get_next_ch_idx(uint16_t ch_mask, uint16_t last_idx, uint16_t *new_idx)
+{
+	last_idx++;
+	if (last_idx >= AD4130_MAX_CHANNELS) {
+		return 0;
+	}
+	ch_mask >>= last_idx;
+	if (!ch_mask) {
+		*new_idx = AD4130_INVALID_CHANNEL;
+		return 0;
+	}
+	while (!(ch_mask & 1)) {
+		last_idx++;
+		ch_mask >>= 1;
+	}
+	*new_idx = last_idx;
+
+	return 1;
+}
+
+static int adc_ad4130_get_read_channel_id(const struct device *dev, uint16_t *channel_id)
+{
+	int ret;
+	uint32_t reg_temp;
+
+	ret = ad4130_reg_read(dev, AD4130_STATUS_REG, &reg_temp);
+	if (ret) {
+		return ret;
+	}
+
+	*channel_id = reg_temp & 0xF;
+
+	return 0;
+}
+
+static int adc_ad4130_wait_for_conv_ready(const struct device *dev)
+{
+	bool ready = false;
+	uint32_t reg_val;
+	int ret = 0;
+
+	while (!ready) {
+
+		ret = ad4130_reg_read(dev, AD4130_STATUS_REG, &reg_val);
+		if (ret) {
+			return ret;
+		}
+
+		ready = (reg_val & AD4130_STATUS_REG_DATA_READY) == 0;
+	}
+
+	return 0;
+}
+
+static int adc_ad4130_perform_read(const struct device *dev)
+{
+	int ret;
+	struct adc_ad4130_data *data = dev->data;
+	uint16_t ch_idx = AD4130_INVALID_CHANNEL;
+	uint16_t prev_ch_idx = AD4130_INVALID_CHANNEL;
+	uint16_t adc_ch_id = 0;
+	bool status;
+
+	k_sem_take(&data->acquire_signal, K_FOREVER);
+
+	do {
+		prev_ch_idx = ch_idx;
+
+		status = get_next_ch_idx(data->ctx.sequence.channels, ch_idx, &ch_idx);
+		if (!status) {
+			break;
+		}
+
+		adc_ad4130_wait_for_conv_ready(dev);
+
+		ret = ad4130_reg_read(dev, AD4130_DATA_REG, data->buffer);
+		if (ret) {
+			LOG_ERR("reading sample failed");
+			adc_context_complete(&data->ctx, ret);
+			return ret;
+		}
+
+		ret = adc_ad4130_get_read_channel_id(dev, &adc_ch_id);
+		if (ret) {
+			LOG_ERR("reading channel id failed");
+			adc_context_complete(&data->ctx, ret);
+			return ret;
+		}
+
+		if (ch_idx == adc_ch_id) {
+			data->buffer++;
+		} else {
+			ch_idx = prev_ch_idx;
+		}
+
+	} while (true);
+
+	adc_context_on_sampling_done(&data->ctx, dev);
+
+	return ret;
+}
+
+static int adc_ad4130_validate_sequence(const struct device *dev,
+					const struct adc_sequence *sequence)
+{
+	const struct ad4130_config *config = dev->config;
+	struct adc_ad4130_data *data = dev->data;
+	const size_t channel_maximum = AD4130_MAX_SETUPS * sizeof(sequence->channels);
+	uint32_t num_requested_channels;
+	size_t necessary;
+
+	if (sequence->resolution != config->resolution) {
+		LOG_ERR("invalid resolution");
+		return -EINVAL;
+	}
+
+	if (!sequence->channels) {
+		LOG_ERR("no channel selected");
+		return -EINVAL;
+	}
+
+	if (sequence->oversampling) {
+		LOG_ERR("oversampling is not supported");
+		return -EINVAL;
+	}
+
+	num_requested_channels = POPCOUNT(sequence->channels);
+	necessary = num_requested_channels * sizeof(int32_t);
+
+	if (sequence->options) {
+		necessary *= (1 + sequence->options->extra_samplings);
+	}
+
+	if (sequence->buffer_size < necessary) {
+		LOG_ERR("buffer size %u is too small, need %u", sequence->buffer_size, necessary);
+		return -ENOMEM;
+	}
+
+	for (size_t i = 0; i < channel_maximum; ++i) {
+		if ((BIT(i) & sequence->channels) == 0) {
+			continue;
+		}
+
+		if ((BIT(i) & sequence->channels) && !(BIT(i) & data->channels)) {
+			LOG_ERR("Channel-%d not enabled", i);
+			return -EINVAL;
+		}
+
+		if (i >= AD4130_MAX_CHANNELS) {
+			LOG_ERR("invalid channel selection");
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+static int adc_ad4130_start_read(const struct device *dev, const struct adc_sequence *sequence,
+				 bool wait)
+{
+	int result;
+	struct adc_ad4130_data *data = dev->data;
+
+	result = adc_ad4130_validate_sequence(dev, sequence);
+	if (result != 0) {
+		LOG_ERR("sequence validation failed");
+		return result;
+	}
+
+	data->buffer = sequence->buffer;
+
+	adc_context_start_read(&data->ctx, sequence);
+
+	if (wait) {
+		result = adc_context_wait_for_completion(&data->ctx);
+	}
+
+	return result;
+}
+
+#if CONFIG_ADC_ASYNC
+static int adc_ad4130_read_async(const struct device *dev, const struct adc_sequence *sequence,
+				 struct k_poll_signal *async)
+{
+	int status;
+	struct adc_ad4130_data *data = dev->data;
+
+	adc_context_lock(&data->ctx, true, async);
+	status = adc_ad4130_start_read(dev, sequence, true);
+	adc_context_release(&data->ctx, status);
+
+	return status;
+}
+
+static int adc_ad4130_read(const struct device *dev, const struct adc_sequence *sequence)
+{
+	int status;
+	struct adc_ad4130_data *data = dev->data;
+
+	adc_context_lock(&data->ctx, false, NULL);
+	status = adc_ad4130_start_read(dev, sequence, true);
+	adc_context_release(&data->ctx, status);
+
+	return status;
+}
+
+#else
+static int adc_ad4130_read(const struct device *dev, const struct adc_sequence *sequence)
+{
+	int status;
+	struct adc_ad4130_data *data = dev->data;
+
+	adc_context_lock(&data->ctx, false, NULL);
+
+	status = adc_ad4130_start_read(dev, sequence, false);
+
+	while (status == 0 && k_sem_take(&data->ctx.sync, K_NO_WAIT) != 0) {
+		status = adc_ad4130_perform_read(dev);
+	}
+
+	adc_context_release(&data->ctx, status);
+
+	return status;
+}
+#endif
+
+#if CONFIG_ADC_ASYNC
+static void adc_ad4130_acquisition_thread(void *p1, void *p2, void *p3)
+{
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+
+	const struct device *dev = p1;
+
+	while (true) {
+		adc_ad4130_perform_read(dev);
+	}
+}
+#endif /* CONFIG_ADC_ASYNC */
+
+static int ad4130_init(const struct device *dev)
+{
+	const struct ad4130_config *config = dev->config;
+	struct adc_ad4130_data *data = dev->data;
+	int ret;
+
+	data->dev = dev;
+
+	k_sem_init(&data->acquire_signal, 0, 1);
+
+	if (!spi_is_ready_dt(&config->bus)) {
+		LOG_ERR("spi bus %s not ready", config->bus.bus->name);
+		return -ENODEV;
+	}
+
+	ret = adc_ad4130_setup(dev);
+	if (ret) {
+		return ret;
+	}
+
+#if CONFIG_ADC_ASYNC
+	k_tid_t tid = k_thread_create(
+		&data->thread, data->stack, CONFIG_ADI_AD4130_ADC_ACQUISITION_THREAD_STACK_SIZE,
+		adc_ad4130_acquisition_thread, (void *)dev, NULL, NULL,
+		CONFIG_ADI_AD4130_ADC_ACQUISITION_THREAD_PRIO, 0, K_NO_WAIT);
+	k_thread_name_set(tid, "adc_ad4130");
+#endif /* CONFIG_ADC_ASYNC */
+
+	adc_context_unlock_unconditionally(&data->ctx);
+
+	return 0;
+}
+
+static DEVICE_API(adc, adc_ad4130_driver_api) = {
+	.channel_setup = adc_ad4130_channel_setup,
+	.read = adc_ad4130_read,
+	.ref_internal = AD4130_INT_REF_2_5V,
+#ifdef CONFIG_ADC_ASYNC
+	.read_async = adc_ad4130_read_async,
+#endif
+};
+
+#define AD4130_ADC_INIT(inst)                                                                      \
+	static const struct ad4130_config ad4130_config_##inst = {                                 \
+		.bus = SPI_DT_SPEC_GET(DT_INST(inst, adi_ad4130_adc),                              \
+				       SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_TRANSFER_MSB,    \
+				       1),                                                         \
+		.resolution = AD4130_ADC_RESOLUTION,                                               \
+		.bipolar = DT_INST_PROP_OR(inst, bipolar, 1),                                      \
+		.int_ref = DT_INST_PROP_OR(inst, internal_reference_value, 0),                     \
+		.adc_mode = DT_INST_PROP_OR(inst, adc_mode, 0),                                    \
+		.mclk_sel = DT_INST_PROP_OR(inst, clock_type, 0),                                  \
+	};                                                                                         \
+	static struct adc_ad4130_data adc_ad4130_data_##inst = {                                   \
+		ADC_CONTEXT_INIT_LOCK(adc_ad4130_data_##inst, ctx),                                \
+		ADC_CONTEXT_INIT_TIMER(adc_ad4130_data_##inst, ctx),                               \
+		ADC_CONTEXT_INIT_SYNC(adc_ad4130_data_##inst, ctx),                                \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, &ad4130_init, NULL, &adc_ad4130_data_##inst,                   \
+			      &ad4130_config_##inst, POST_KERNEL, CONFIG_ADC_INIT_PRIORITY,        \
+			      &adc_ad4130_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(AD4130_ADC_INIT)
diff --git a/drivers/adc/adc_ads1x4s0x.c b/drivers/adc/adc_ads1x4s0x.c
index f4d5f8687d912..c5d15d072e31f 100644
--- a/drivers/adc/adc_ads1x4s0x.c
+++ b/drivers/adc/adc_ads1x4s0x.c
@@ -1577,13 +1577,12 @@ BUILD_ASSERT(CONFIG_ADC_INIT_PRIORITY > CONFIG_SPI_INIT_PRIORITY,
 	static const struct ads1x4s0x_config config_##name##_##n = {                              \
 		.bus = SPI_DT_SPEC_INST_GET(                                                      \
 			n, SPI_OP_MODE_MASTER | SPI_MODE_CPHA | SPI_WORD_SET(8), 0),              \
-		IF_ENABLED(CONFIG_ADC_ASYNC, (.stack = thread_stack_##n,))                        \
+		IF_ENABLED(CONFIG_ADC_ASYNC, (.stack = thread_stack_##name##_##n,))               \
 		.gpio_reset = GPIO_DT_SPEC_INST_GET_OR(n, reset_gpios, {0}),                      \
 		.gpio_data_ready = GPIO_DT_SPEC_INST_GET(n, drdy_gpios),                          \
 		.gpio_start_sync = GPIO_DT_SPEC_INST_GET_OR(n, start_sync_gpios, {0}),            \
 		.idac_current = DT_INST_PROP(n, idac_current),                                    \
 		.vbias_level = DT_INST_PROP(n, vbias_level),                                      \
-		.vbias_level = DT_INST_PROP(n, vbias_level),                                      \
 		.resolution = res,                                                                \
 		.channels = ch,                                                                   \
 	};                                                                                        \
diff --git a/drivers/adc/adc_ambiq.c b/drivers/adc/adc_ambiq.c
index 66c40efac8369..5af7b1301b14e 100644
--- a/drivers/adc/adc_ambiq.c
+++ b/drivers/adc/adc_ambiq.c
@@ -16,13 +16,11 @@
 #include "adc_context.h"
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_ambiq, CONFIG_ADC_LOG_LEVEL);
 
-typedef int (*ambiq_adc_pwr_func_t)(void);
-#define PWRCTRL_MAX_WAIT_US   5
 /* Number of slots available. */
 #define AMBIQ_ADC_SLOT_NUMBER AM_HAL_ADC_MAX_SLOTS
 
@@ -32,7 +30,6 @@ struct adc_ambiq_config {
 	uint8_t num_channels;
 	void (*irq_config_func)(void);
 	const struct pinctrl_dev_config *pin_cfg;
-	ambiq_adc_pwr_func_t pwr_func;
 };
 
 struct adc_ambiq_data {
@@ -290,7 +287,7 @@ static int adc_ambiq_init(const struct device *dev)
 	}
 
 	/* power on ADC*/
-	ret = cfg->pwr_func();
+	ret = am_hal_adc_power_control(data->adcHandle, AM_HAL_SYSCTRL_WAKE, false);
 
 	/* Set up the ADC configuration parameters. These settings are reasonable
 	 *  for accurate measurements at a low sample rate.
@@ -404,14 +401,6 @@ static int adc_ambiq_pm_action(const struct device *dev, enum pm_device_action a
 #define ADC_AMBIQ_INIT(n)                                                                          \
 	PINCTRL_DT_INST_DEFINE(n);                                                                 \
 	ADC_AMBIQ_DRIVER_API(n);                                                                   \
-	static int pwr_on_ambiq_adc_##n(void)                                                      \
-	{                                                                                          \
-		uint32_t addr = DT_REG_ADDR(DT_INST_PHANDLE(n, ambiq_pwrcfg)) +                    \
-				DT_INST_PHA(n, ambiq_pwrcfg, offset);                              \
-		sys_write32((sys_read32(addr) | DT_INST_PHA(n, ambiq_pwrcfg, mask)), addr);        \
-		k_busy_wait(PWRCTRL_MAX_WAIT_US);                                                  \
-		return 0;                                                                          \
-	}                                                                                          \
 	static void adc_irq_config_func_##n(void)                                                  \
 	{                                                                                          \
 		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), adc_ambiq_isr,              \
@@ -429,7 +418,6 @@ static int adc_ambiq_pm_action(const struct device *dev, enum pm_device_action a
 		.num_channels = DT_PROP(DT_DRV_INST(n), channel_count),                            \
 		.irq_config_func = adc_irq_config_func_##n,                                        \
 		.pin_cfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                      \
-		.pwr_func = pwr_on_ambiq_adc_##n,                                                  \
 	};                                                                                         \
 	PM_DEVICE_DT_INST_DEFINE(n, adc_ambiq_pm_action);                                          \
 	DEVICE_DT_INST_DEFINE(n, &adc_ambiq_init, PM_DEVICE_DT_INST_GET(n), &adc_ambiq_data_##n,   \
diff --git a/drivers/adc/adc_esp32.c b/drivers/adc/adc_esp32.c
index d41795d2c4362..8ffeb5539f72a 100644
--- a/drivers/adc/adc_esp32.c
+++ b/drivers/adc/adc_esp32.c
@@ -45,6 +45,8 @@ LOG_MODULE_REGISTER(adc_esp32, CONFIG_ADC_LOG_LEVEL);
 
 #define ADC_DMA_BUFFER_SIZE DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED
 
+#define ADC_CLIP_MVOLT_12DB	2550
+
 struct adc_esp32_conf {
 	const struct device *clock_dev;
 	const clock_control_subsys_t clock_subsys;
@@ -93,6 +95,42 @@ static inline int gain_to_atten(enum adc_gain gain, adc_atten_t *atten)
 	return 0;
 }
 
+#if !defined(CONFIG_ADC_ESP32_DMA)
+
+/* Convert voltage by inverted attenuation to support zephyr gain values */
+static void atten_to_gain(adc_atten_t atten, uint32_t *val_mv)
+{
+	uint32_t num, den;
+
+	if (!val_mv) {
+		return;
+	}
+
+	switch (atten) {
+	case ADC_ATTEN_DB_2_5: /* 1/ADC_GAIN_4_5 */
+		num = 4;
+		den = 5;
+		break;
+	case ADC_ATTEN_DB_6: /* 1/ADC_GAIN_1_2 */
+		num = 1;
+		den = 2;
+		break;
+	case ADC_ATTEN_DB_12: /* 1/ADC_GAIN_1_4 */
+		num = 1;
+		den = 4;
+		break;
+	case ADC_ATTEN_DB_0: /* 1/ADC_GAIN_1 */
+	default:
+		num = 1;
+		den = 1;
+		break;
+	}
+
+	*val_mv = (*val_mv * num) / den;
+}
+
+#endif /* !defined(CONFIG_ADC_ESP32_DMA) */
+
 static void adc_hw_calibration(adc_unit_t unit)
 {
 #if SOC_ADC_CALIBRATION_V1_SUPPORTED
@@ -375,7 +413,7 @@ static int adc_esp32_read(const struct device *dev, const struct adc_sequence *s
 
 #if !defined(CONFIG_ADC_ESP32_DMA)
 
-	uint32_t acq_raw, acq_mv, result;
+	uint32_t acq_raw;
 
 	adc_oneshot_hal_setup(&data->hal, channel_id);
 
@@ -386,20 +424,36 @@ static int adc_esp32_read(const struct device *dev, const struct adc_sequence *s
 	adc_oneshot_hal_convert(&data->hal, &acq_raw);
 
 	if (data->cal_handle[channel_id]) {
-		adc_cali_raw_to_voltage(data->cal_handle[channel_id], acq_raw, &acq_mv);
+		if (data->meas_ref_internal > 0) {
+			uint32_t acq_mv;
 
-		LOG_DBG("ADC acquisition [unit: %u, chan: %u, acq_raw: %u, acq_mv: %u]",
-			data->hal.unit, channel_id, acq_raw, acq_mv);
+			adc_cali_raw_to_voltage(data->cal_handle[channel_id], acq_raw, &acq_mv);
 
-		result = acq_mv;
+			LOG_DBG("ADC acquisition [unit: %u, chan: %u, acq_raw: %u, acq_mv: %u]",
+				data->hal.unit, channel_id, acq_raw, acq_mv);
+
+#if CONFIG_SOC_SERIES_ESP32
+		if (data->attenuation[channel_id] == ADC_ATTEN_DB_12) {
+			if (acq_mv > ADC_CLIP_MVOLT_12DB) {
+				acq_mv = ADC_CLIP_MVOLT_12DB;
+			}
+		}
+#endif /* CONFIG_SOC_SERIES_ESP32 */
+
+			/* Fit according to selected attenuation */
+			atten_to_gain(data->attenuation[channel_id], &acq_mv);
+			acq_raw = acq_mv * ((1 << data->resolution[channel_id]) - 1) /
+				  data->meas_ref_internal;
+		} else {
+			LOG_WRN("ADC reading is uncompensated");
+		}
 	} else {
-		LOG_WRN("ADC values are raw (uncalibrated)");
-		result = acq_raw;
+		LOG_WRN("ADC reading is uncompensated");
 	}
 
 	/* Store result */
 	data->buffer = (uint16_t *)seq->buffer;
-	data->buffer[0] = result;
+	data->buffer[0] = acq_raw;
 
 #else /* !defined(CONFIG_ADC_ESP32_DMA) */
 
diff --git a/drivers/adc/adc_ifx_cat1.c b/drivers/adc/adc_ifx_cat1.c
index 0df730d143385..3a4aa9f8746df 100644
--- a/drivers/adc/adc_ifx_cat1.c
+++ b/drivers/adc/adc_ifx_cat1.c
@@ -32,8 +32,13 @@ LOG_MODULE_REGISTER(ifx_cat1_adc, CONFIG_ADC_LOG_LEVEL);
 #define ADC_CAT1_EVENTS_MASK (CYHAL_ADC_EOS | CYHAL_ADC_ASYNC_READ_COMPLETE)
 
 #define ADC_CAT1_DEFAULT_ACQUISITION_NS (1000u)
+#if defined(CONFIG_SOC_FAMILY_INFINEON_CAT1A)
 #define ADC_CAT1_RESOLUTION             (12u)
 #define ADC_CAT1_REF_INTERNAL_MV        (1200u)
+#elif defined(CONFIG_SOC_FAMILY_INFINEON_CAT1B)
+#define ADC_CAT1_RESOLUTION             (16u)
+#define ADC_CAT1_REF_INTERNAL_MV        (3600u)
+#endif
 
 #if defined(CONFIG_SOC_FAMILY_INFINEON_CAT1B)
 #define IFX_ADC_NUM_CHANNELS                                                                       \
@@ -60,10 +65,12 @@ struct ifx_cat1_adc_config {
 	uint8_t irq_priority;
 };
 
-static void _cyhal_adc_event_callback(void *callback_arg, cyhal_adc_event_t event)
+#ifdef CONFIG_SOC_FAMILY_INFINEON_CAT1B
+static void ifx_cat1_adc_worker(struct k_work *adc_worker_thread)
 {
-	const struct device *dev = (const struct device *) callback_arg;
-	struct ifx_cat1_adc_data *data = dev->data;
+	struct ifx_cat1_adc_data *data =
+		CONTAINER_OF(adc_worker_thread, struct ifx_cat1_adc_data, adc_worker_thread);
+
 	uint32_t channels = data->channels;
 	int32_t result;
 	uint32_t channel_id;
@@ -72,26 +79,20 @@ static void _cyhal_adc_event_callback(void *callback_arg, cyhal_adc_event_t even
 		channel_id = find_lsb_set(channels) - 1;
 		channels &= ~BIT(channel_id);
 
-		result = Cy_SAR_GetResult32(data->adc_chan_obj[channel_id].adc->base,
-					    data->adc_chan_obj[channel_id].channel_idx);
+		result = cyhal_adc_read(&data->adc_chan_obj[channel_id]);
 		/* Legacy API for BWC. Convert from signed to unsigned by adding 0x800 to
 		 * convert the lowest signed 12-bit number to 0x0.
 		 */
 		*data->buffer = (uint16_t)(result + 0x800);
 		data->buffer++;
 	}
-
-	adc_context_on_sampling_done(&data->ctx, dev);
-
-	LOG_DBG("%s ISR triggered.", dev->name);
+	adc_context_on_sampling_done(&data->ctx, data->dev);
 }
-
-#ifdef CONFIG_SOC_FAMILY_INFINEON_CAT1B
-static void ifx_cat1_adc_worker(struct k_work *adc_worker_thread)
+#else
+static void _cyhal_adc_event_callback(void *callback_arg, cyhal_adc_event_t event)
 {
-	struct ifx_cat1_adc_data *data =
-		CONTAINER_OF(adc_worker_thread, struct ifx_cat1_adc_data, adc_worker_thread);
-
+	const struct device *dev = (const struct device *) callback_arg;
+	struct ifx_cat1_adc_data *data = dev->data;
 	uint32_t channels = data->channels;
 	int32_t result;
 	uint32_t channel_id;
@@ -100,14 +101,18 @@ static void ifx_cat1_adc_worker(struct k_work *adc_worker_thread)
 		channel_id = find_lsb_set(channels) - 1;
 		channels &= ~BIT(channel_id);
 
-		result = cyhal_adc_read(&data->adc_chan_obj[channel_id]);
+		result = Cy_SAR_GetResult32(data->adc_chan_obj[channel_id].adc->base,
+					    data->adc_chan_obj[channel_id].channel_idx);
 		/* Legacy API for BWC. Convert from signed to unsigned by adding 0x800 to
 		 * convert the lowest signed 12-bit number to 0x0.
 		 */
 		*data->buffer = (uint16_t)(result + 0x800);
 		data->buffer++;
 	}
-	adc_context_on_sampling_done(&data->ctx, data->dev);
+
+	adc_context_on_sampling_done(&data->ctx, dev);
+
+	LOG_DBG("%s ISR triggered.", dev->name);
 }
 #endif
 
@@ -300,7 +305,10 @@ static int ifx_cat1_adc_init(const struct device *dev)
 	/* Enable ADC Interrupt */
 	cyhal_adc_enable_event(&data->adc_obj, (cyhal_adc_event_t)ADC_CAT1_EVENTS_MASK,
 			       config->irq_priority, true);
+
+#ifndef CONFIG_SOC_FAMILY_INFINEON_CAT1B
 	cyhal_adc_register_callback(&data->adc_obj, _cyhal_adc_event_callback, (void *) dev);
+#endif
 
 	adc_context_unlock_unconditionally(&data->ctx);
 
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index e3ea05f124808..22a839a5f3543 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -9,7 +9,10 @@
 #include <haly/nrfy_saadc.h>
 #include <zephyr/dt-bindings/adc/nrf-saadc-v3.h>
 #include <zephyr/dt-bindings/adc/nrf-saadc-nrf54l.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-haltium.h>
 #include <zephyr/linker/devicetree_regions.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
 #include <zephyr/logging/log.h>
@@ -21,7 +24,7 @@ LOG_MODULE_REGISTER(adc_nrfx_saadc);
 #if (NRF_SAADC_HAS_AIN_AS_PIN)
 
 #if defined(CONFIG_NRF_PLATFORM_HALTIUM)
-static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
+static const uint32_t saadc_psels[NRF_SAADC_AIN13 + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
 	[NRF_SAADC_AIN2] = NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
@@ -30,8 +33,14 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN5] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
+	[NRF_SAADC_AIN8] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 9),
+	[NRF_SAADC_AIN9] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 9),
+	[NRF_SAADC_AIN10] = NRF_PIN_PORT_TO_PIN_NUMBER(2U, 9),
+	[NRF_SAADC_AIN11] = NRF_PIN_PORT_TO_PIN_NUMBER(3U, 9),
+	[NRF_SAADC_AIN12] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 9),
+	[NRF_SAADC_AIN13] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 9),
 };
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
@@ -168,6 +177,26 @@ static int adc_convert_acq_time(uint16_t acquisition_time, nrf_saadc_acqtime_t *
 	return result;
 }
 
+static int saadc_pm_hook(const struct device *dev, enum pm_device_action action)
+{
+	ARG_UNUSED(dev);
+
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		nrf_saadc_disable(NRF_SAADC);
+		return 0;
+
+	case PM_DEVICE_ACTION_RESUME:
+		nrf_saadc_enable(NRF_SAADC);
+		return 0;
+
+	default:
+		break;
+	}
+
+	return -ENOTSUP;
+}
+
 /* Implementation of the ADC driver API function: adc_channel_setup. */
 static int adc_nrfx_channel_setup(const struct device *dev,
 				  const struct adc_channel_cfg *channel_cfg)
@@ -320,7 +349,11 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 
 static void adc_context_start_sampling(struct adc_context *ctx)
 {
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	pm_device_runtime_get(DEVICE_DT_INST_GET(0));
+#else
 	nrf_saadc_enable(NRF_SAADC);
+#endif
 
 	if (ctx->sequence.calibrate) {
 		nrf_saadc_task_trigger(NRF_SAADC,
@@ -623,7 +656,12 @@ static void saadc_irq_handler(const struct device *dev)
 		nrf_saadc_event_clear(NRF_SAADC, NRF_SAADC_EVENT_END);
 
 		nrf_saadc_task_trigger(NRF_SAADC, NRF_SAADC_TASK_STOP);
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+		pm_device_runtime_put(DEVICE_DT_INST_GET(0));
+#else
 		nrf_saadc_disable(NRF_SAADC);
+#endif
 
 		if (has_single_ended(&m_data.ctx.sequence)) {
 			correct_single_ended(&m_data.ctx.sequence);
@@ -663,7 +701,7 @@ static int init_saadc(const struct device *dev)
 
 	adc_context_unlock_unconditionally(&m_data.ctx);
 
-	return 0;
+	return pm_device_driver_init(dev, saadc_pm_hook);
 }
 
 static DEVICE_API(adc, adc_nrfx_driver_api) = {
@@ -672,7 +710,7 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #ifdef CONFIG_ADC_ASYNC
 	.read_async    = adc_nrfx_read_async,
 #endif
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
 	.ref_internal  = 900,
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 	.ref_internal  = 1024,
@@ -693,9 +731,10 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #define SAADC_INIT(inst)						\
 	BUILD_ASSERT((inst) == 0,					\
 		     "multiple instances not supported");		\
+	PM_DEVICE_DT_INST_DEFINE(0, saadc_pm_hook, 1);			\
 	DEVICE_DT_INST_DEFINE(0,					\
 			    init_saadc,					\
-			    NULL,					\
+			    PM_DEVICE_DT_INST_GET(0),			\
 			    NULL,					\
 			    NULL,					\
 			    POST_KERNEL,				\
diff --git a/drivers/adc/adc_renesas_ra.c b/drivers/adc/adc_renesas_ra.c
index 9eadfc7a4278c..e448fcb4c4026 100644
--- a/drivers/adc/adc_renesas_ra.c
+++ b/drivers/adc/adc_renesas_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -36,8 +36,6 @@ void adc_scan_end_isr(void);
  * This structure contains constant data for given instance of RA ADC.
  */
 struct adc_ra_config {
-	/** Number of supported channels */
-	uint8_t num_channels;
 	/** Mask for channels existed in each board */
 	uint32_t channel_available_mask;
 	/** pinctrl configs */
@@ -155,16 +153,10 @@ static void adc_ra_isr(const struct device *dev)
  */
 static int adc_ra_check_buffer_size(const struct device *dev, const struct adc_sequence *sequence)
 {
-	const struct adc_ra_config *config = dev->config;
 	uint8_t channels = 0;
 	size_t needed;
-	uint32_t mask;
 
-	for (mask = BIT(config->num_channels - 1); mask != 0; mask >>= 1) {
-		if (mask & sequence->channels) {
-			channels++;
-		}
-	}
+	channels = POPCOUNT(sequence->channels);
 
 	needed = channels * sizeof(uint16_t);
 	if (sequence->options) {
@@ -202,7 +194,7 @@ static int adc_ra_start_read(const struct device *dev, const struct adc_sequence
 		return -ENOTSUP;
 	}
 
-	if (find_msb_set(sequence->channels) > config->num_channels) {
+	if ((sequence->channels & ~config->channel_available_mask) != 0) {
 		LOG_ERR("unsupported channels in mask: 0x%08x", sequence->channels);
 		return -ENOTSUP;
 	}
@@ -319,11 +311,12 @@ static int adc_ra_init(const struct device *dev)
 	return 0;
 }
 
+#define EVENT_ADC_SCAN_END(idx) BSP_PRV_IELS_ENUM(CONCAT(EVENT_ADC, idx, _SCAN_END))
+
 #define IRQ_CONFIGURE_FUNC(idx)                                                                    \
 	static void adc_ra_configure_func_##idx(void)                                              \
 	{                                                                                          \
-		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(idx, scanend, irq)] =                             \
-			ELC_EVENT_ADC##idx##_SCAN_END;                                             \
+		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(idx, scanend, irq)] = EVENT_ADC_SCAN_END(idx);    \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, scanend, irq),                                \
 			    DT_INST_IRQ_BY_NAME(idx, scanend, priority), adc_ra_isr,               \
 			    DEVICE_DT_INST_GET(idx), 0);                                           \
@@ -354,7 +347,6 @@ static int adc_ra_init(const struct device *dev)
 		.ref_internal = DT_INST_PROP(idx, vref_mv),                                        \
 		IF_ENABLED(CONFIG_ADC_ASYNC, (.read_async = adc_ra_read_async))};                  \
 	static const struct adc_ra_config adc_ra_config_##idx = {                                  \
-		.num_channels = DT_INST_PROP(idx, channel_count),                                  \
 		.channel_available_mask = DT_INST_PROP(idx, channel_available_mask),               \
 		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx),                                       \
 		IRQ_CONFIGURE_DEFINE(idx),                                                         \
diff --git a/drivers/adc/adc_renesas_rz.c b/drivers/adc/adc_renesas_rz.c
new file mode 100644
index 0000000000000..2e18c04984ee3
--- /dev/null
+++ b/drivers/adc/adc_renesas_rz.c
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT renesas_rz_adc
+
+#include <zephyr/drivers/adc.h>
+#include <zephyr/irq.h>
+#include <zephyr/logging/log.h>
+#include "r_adc_c.h"
+
+LOG_MODULE_REGISTER(adc_renesas_rz, CONFIG_ADC_LOG_LEVEL);
+
+#define ADC_CONTEXT_USES_KERNEL_TIMER
+#include "adc_context.h"
+
+#define ADC_RZ_MAX_RESOLUTION 12
+
+void adc_c_scan_end_isr(void);
+
+/**
+ * @brief RZ ADC config
+ *
+ * This structure contains constant config data for given instance of RZ ADC.
+ */
+struct adc_rz_config {
+	/** Mask for channels existed in each board */
+	uint32_t channel_available_mask;
+	/** Structure that handle FSP API */
+	const adc_api_t *fsp_api;
+};
+
+/**
+ * @brief RZ ADC data
+ *
+ * This structure contains data structures used by a RZ ADC.
+ */
+struct adc_rz_data {
+	/** Structure that handle state of ongoing read operation */
+	struct adc_context ctx;
+	/** Pointer to RZ ADC own device structure */
+	const struct device *dev;
+	/** Structure that handle fsp ADC */
+	adc_c_instance_ctrl_t fsp_ctrl;
+	/** Structure that handle fsp ADC config */
+	struct st_adc_cfg fsp_cfg;
+	/** Structure that handle fsp ADC channel config */
+	adc_c_channel_cfg_t fsp_channel_cfg;
+	/** Pointer to memory where next sample will be written */
+	uint16_t *buf;
+	/** Mask with channels that will be sampled */
+	uint32_t channels;
+	/** Buffer id */
+	uint16_t buf_id;
+};
+
+/**
+ * @brief Setup channels before starting to scan ADC
+ *
+ * @param dev RZ ADC device
+ * @param channel_cfg channel configuration (user-defined)
+ *
+ * @return 0 on success
+ * @return -ENOTSUP if channel id or differential is wrong value
+ * @return -EINVAL if channel configuration is invalid
+ */
+static int adc_rz_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg)
+{
+
+	fsp_err_t fsp_err = FSP_SUCCESS;
+	struct adc_rz_data *data = dev->data;
+	const struct adc_rz_config *config = dev->config;
+
+	if (!((config->channel_available_mask & BIT(channel_cfg->channel_id)) != 0)) {
+		LOG_ERR("unsupported channel id '%d'", channel_cfg->channel_id);
+		return -ENOTSUP;
+	}
+
+	if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
+		LOG_ERR("Unsupported channel acquisition time");
+		return -ENOTSUP;
+	}
+
+	if (channel_cfg->differential) {
+		LOG_ERR("Differential channels are not supported");
+		return -ENOTSUP;
+	}
+
+	if (channel_cfg->gain != ADC_GAIN_1) {
+		LOG_ERR("Unsupported channel gain %d", channel_cfg->gain);
+		return -ENOTSUP;
+	}
+
+	if (channel_cfg->reference != ADC_REF_INTERNAL) {
+		LOG_ERR("Unsupported channel reference");
+		return -ENOTSUP;
+	}
+	data->fsp_channel_cfg.scan_mask |= (1U << channel_cfg->channel_id);
+	/** Enable channels. */
+	config->fsp_api->scanCfg(&data->fsp_ctrl, &data->fsp_channel_cfg);
+
+	if (FSP_SUCCESS != fsp_err) {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+/**
+ * Interrupt handler
+ */
+static void adc_rz_isr(const struct device *dev)
+{
+	struct adc_rz_data *data = dev->data;
+	const struct adc_rz_config *config = dev->config;
+	fsp_err_t fsp_err = FSP_SUCCESS;
+	adc_channel_t channel_id = 0;
+	uint32_t channels = 0;
+	int16_t *sample_buffer = (int16_t *)data->buf;
+
+	channels = data->channels;
+	for (channel_id = 0; channels > 0; channel_id++) {
+		/** Get channel ids from scan mask "channels"  */
+		if ((channels & 0x01) != 0) {
+			/** Read converted data */
+			config->fsp_api->read(&data->fsp_ctrl, channel_id,
+					      &sample_buffer[data->buf_id]);
+			if (FSP_SUCCESS != fsp_err) {
+				break;
+			}
+			data->buf_id = data->buf_id + 1;
+		}
+		channels = channels >> 1;
+	}
+	adc_c_scan_end_isr();
+	adc_context_on_sampling_done(&data->ctx, dev);
+}
+
+/**
+ * @brief Check if buffer in @p sequence is big enough to hold all ADC samples
+ *
+ * @param dev RZ ADC device
+ * @param sequence ADC sequence description
+ *
+ * @return 0 on success
+ * @return -ENOMEM if buffer is not big enough
+ */
+static int adc_rz_check_buffer_size(const struct device *dev, const struct adc_sequence *sequence)
+{
+	uint8_t channels = 0;
+	size_t needed;
+
+	channels = POPCOUNT(sequence->channels);
+	needed = channels * sizeof(uint16_t);
+
+	if (sequence->options) {
+		needed *= (1 + sequence->options->extra_samplings);
+	}
+
+	if (sequence->buffer_size < needed) {
+		return -ENOMEM;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Start processing read request
+ *
+ * @param dev RZ ADC device
+ * @param sequence ADC sequence description
+ *
+ * @return 0 on success
+ * @return -ENOTSUP if requested resolution or channel is out side of supported
+ *         range
+ * @return -ENOMEM if buffer is not big enough
+ *         (see @ref adc_rz_check_buffer_size)
+ * @return other error code returned by adc_context_wait_for_completion
+ */
+static int adc_rz_start_read(const struct device *dev, const struct adc_sequence *sequence)
+{
+	const struct adc_rz_config *config = dev->config;
+	struct adc_rz_data *data = dev->data;
+	int err;
+
+	if (sequence->resolution > ADC_RZ_MAX_RESOLUTION || sequence->resolution == 0) {
+		LOG_ERR("unsupported resolution %d", sequence->resolution);
+		return -ENOTSUP;
+	}
+
+	if ((sequence->channels & ~config->channel_available_mask) != 0) {
+		LOG_ERR("unsupported channels in mask: 0x%08x", sequence->channels);
+		return -ENOTSUP;
+	}
+	err = adc_rz_check_buffer_size(dev, sequence);
+
+	if (err) {
+		LOG_ERR("buffer size too small");
+		return err;
+	}
+	data->buf_id = 0;
+	data->buf = sequence->buffer;
+	adc_context_start_read(&data->ctx, sequence);
+	adc_context_wait_for_completion(&data->ctx);
+
+	return 0;
+}
+
+/**
+ * @brief Start processing read request asynchronously.
+ *
+ * @param dev RZ ADC device
+ * @param sequence ADC sequence description
+ * @param async async pointer to asynchronous signal
+ *
+ * @return 0 on success
+ * @return -ENOTSUP if requested resolution or channel is out side of supported
+ *         range
+ * @return -ENOMEM if buffer is not big enough
+ *         (see @ref adc_rz_check_buffer_size)
+ * @return other error code returned by adc_context_wait_for_completion
+ */
+static int adc_rz_read_async(const struct device *dev, const struct adc_sequence *sequence,
+			     struct k_poll_signal *async)
+{
+	struct adc_rz_data *data = dev->data;
+	int err;
+
+	adc_context_lock(&data->ctx, async ? true : false, async);
+	err = adc_rz_start_read(dev, sequence);
+	adc_context_release(&data->ctx, err);
+
+	return err;
+}
+
+/**
+ * @brief Start processing read request synchronously.
+ *
+ * @param dev RZ ADC device
+ * @param sequence ADC sequence description
+ *
+ * @return 0 on success
+ * @return -ENOTSUP if requested resolution or channel is out side of supported
+ *         range
+ * @return -ENOMEM if buffer is not big enough
+ *         (see @ref adc_rz_check_buffer_size)
+ * @return other error code returned by adc_context_wait_for_completion
+ */
+static int adc_rz_read(const struct device *dev, const struct adc_sequence *sequence)
+{
+	return adc_rz_read_async(dev, sequence, NULL);
+}
+
+static void adc_context_start_sampling(struct adc_context *ctx)
+{
+	struct adc_rz_data *data = CONTAINER_OF(ctx, struct adc_rz_data, ctx);
+	const struct device *dev = data->dev;
+	const struct adc_rz_config *config = dev->config;
+
+	data->channels = ctx->sequence.channels;
+	/** Start a scan */
+	config->fsp_api->scanStart(&data->fsp_ctrl);
+}
+
+static void adc_context_update_buffer_pointer(struct adc_context *ctx, bool repeat_sampling)
+{
+	struct adc_rz_data *data = CONTAINER_OF(ctx, struct adc_rz_data, ctx);
+
+	if (repeat_sampling) {
+		data->buf_id = 0;
+	}
+}
+
+/**
+ * @brief Function called on init for each RZ ADC device. It setups all
+ *        channels.
+ *
+ * @param dev RZ ADC device
+ *
+ * @return -EIO if error
+ *
+ * @return 0 on success
+ */
+static int adc_rz_init(const struct device *dev)
+{
+	const struct adc_rz_config *config = dev->config;
+	struct adc_rz_data *data = dev->data;
+	fsp_err_t fsp_err = FSP_SUCCESS;
+	/**Open the ADC module */
+	config->fsp_api->open(&data->fsp_ctrl, &data->fsp_cfg);
+
+	if (FSP_SUCCESS != fsp_err) {
+		return -EIO;
+	}
+	/** Release context unconditionally */
+	adc_context_unlock_unconditionally(&data->ctx);
+
+	return 0;
+}
+
+/**
+ * ************************* DRIVER REGISTER SECTION ***************************
+ */
+
+#define ADC_RZG_IRQ_CONNECT(idx, irq_name, isr)                                                    \
+	do {                                                                                       \
+		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, irq_name, irq),                               \
+			    DT_INST_IRQ_BY_NAME(idx, irq_name, priority), isr,                     \
+			    DEVICE_DT_INST_GET(idx), 0);                                           \
+		irq_enable(DT_INST_IRQ_BY_NAME(idx, irq_name, irq));                               \
+	} while (0)
+
+#define ADC_RZG_CONFIG_FUNC(idx) ADC_RZG_IRQ_CONNECT(idx, scanend, adc_rz_isr);
+
+#define ADC_RZG_INIT(idx)                                                                          \
+	static const adc_c_extended_cfg_t g_adc##idx##_cfg_extend = {                              \
+		.trigger_mode = ADC_C_TRIGGER_MODE_SOFTWARE,                                       \
+		.trigger_source = ADC_C_ACTIVE_TRIGGER_EXTERNAL,                                   \
+		.trigger_edge = ADC_C_TRIGGER_EDGE_FALLING,                                        \
+		.input_mode = ADC_C_INPUT_MODE_AUTO,                                               \
+		.operating_mode = ADC_C_OPERATING_MODE_SCAN,                                       \
+		.buffer_mode = ADC_C_BUFFER_MODE_1,                                                \
+		.sampling_time = 100,                                                              \
+		.external_trigger_filter = ADC_C_FILTER_STAGE_SETTING_DISABLE,                     \
+	};                                                                                         \
+	static DEVICE_API(adc, adc_rz_api_##idx) = {                                               \
+		.channel_setup = adc_rz_channel_setup,                                             \
+		.read = adc_rz_read,                                                               \
+		.ref_internal = DT_INST_PROP(idx, vref_mv),                                        \
+		IF_ENABLED(CONFIG_ADC_ASYNC,                                                       \
+					  (.read_async = adc_rz_read_async))};                     \
+	static const struct adc_rz_config adc_rz_config_##idx = {                                  \
+		.channel_available_mask = DT_INST_PROP(idx, channel_available_mask),               \
+		.fsp_api = &g_adc_on_adc,                                                          \
+	};                                                                                         \
+	static struct adc_rz_data adc_rz_data_##idx = {                                            \
+		ADC_CONTEXT_INIT_TIMER(adc_rz_data_##idx, ctx),                                    \
+		ADC_CONTEXT_INIT_LOCK(adc_rz_data_##idx, ctx),                                     \
+		ADC_CONTEXT_INIT_SYNC(adc_rz_data_##idx, ctx),                                     \
+		.dev = DEVICE_DT_INST_GET(idx),                                                    \
+		.fsp_cfg =                                                                         \
+			{                                                                          \
+				.mode = ADC_MODE_SINGLE_SCAN,                                      \
+				.p_callback = NULL,                                                \
+				.p_context = NULL,                                                 \
+				.p_extend = &g_adc##idx##_cfg_extend,                              \
+				.scan_end_irq = DT_INST_IRQ_BY_NAME(idx, scanend, irq),            \
+				.scan_end_ipl = DT_INST_IRQ_BY_NAME(idx, scanend, priority),       \
+			},                                                                         \
+		.fsp_channel_cfg =                                                                 \
+			{                                                                          \
+				.scan_mask = 0,                                                    \
+				.interrupt_setting = ADC_C_INTERRUPT_CHANNEL_SETTING_ENABLE,       \
+			},                                                                         \
+	};                                                                                         \
+	static int adc_rz_init_##idx(const struct device *dev)                                     \
+	{                                                                                          \
+		ADC_RZG_CONFIG_FUNC(idx)                                                           \
+		return adc_rz_init(dev);                                                           \
+	}                                                                                          \
+	DEVICE_DT_INST_DEFINE(idx, adc_rz_init_##idx, NULL, &adc_rz_data_##idx,                    \
+			      &adc_rz_config_##idx, POST_KERNEL, CONFIG_ADC_INIT_PRIORITY,         \
+			      &adc_rz_api_##idx)
+
+DT_INST_FOREACH_STATUS_OKAY(ADC_RZG_INIT);
diff --git a/drivers/adc/adc_rpi_pico.c b/drivers/adc/adc_rpi_pico.c
index 5dffdd6ba00e2..f2a5b73356ea3 100644
--- a/drivers/adc/adc_rpi_pico.c
+++ b/drivers/adc/adc_rpi_pico.c
@@ -27,9 +27,9 @@ LOG_MODULE_REGISTER(adc_rpi, CONFIG_ADC_LOG_LEVEL);
 #define ADC_RPI_CHANNEL_NUM (ADC_CS_RROBIN_MSB - ADC_CS_RROBIN_LSB + 1)
 
 /**
- * @brief RaspberryPi Pico ADC config
+ * @brief Raspberry Pi Pico ADC config
  *
- * This structure contains constant data for given instance of RaspberryPi Pico ADC.
+ * This structure contains constant data for given instance of Raspberry Pi Pico ADC.
  */
 struct adc_rpi_config {
 	/** Number of supported channels */
@@ -47,14 +47,14 @@ struct adc_rpi_config {
 };
 
 /**
- * @brief RaspberryPi Pico ADC data
+ * @brief Raspberry Pi Pico ADC data
  *
- * This structure contains data structures used by a RaspberryPi Pico ADC.
+ * This structure contains data structures used by a Raspberry Pi Pico ADC.
  */
 struct adc_rpi_data {
 	/** Structure that handle state of ongoing read operation */
 	struct adc_context ctx;
-	/** Pointer to RaspberryPi Pico ADC own device structure */
+	/** Pointer to Raspberry Pi Pico ADC own device structure */
 	const struct device *dev;
 	/** Pointer to memory where next sample will be written */
 	uint16_t *buf;
@@ -127,7 +127,7 @@ static int adc_rpi_channel_setup(const struct device *dev,
 /**
  * @brief Check if buffer in @p sequence is big enough to hold all ADC samples
  *
- * @param dev RaspberryPi Pico ADC device
+ * @param dev Raspberry Pi Pico ADC device
  * @param sequence ADC sequence description
  *
  * @return 0 on success
@@ -162,7 +162,7 @@ static int adc_rpi_check_buffer_size(const struct device *dev,
 /**
  * @brief Start processing read request
  *
- * @param dev RaspberryPi Pico ADC device
+ * @param dev Raspberry Pi Pico ADC device
  * @param sequence ADC sequence description
  *
  * @return 0 on success
@@ -290,10 +290,10 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 }
 
 /**
- * @brief Function called on init for each RaspberryPi Pico ADC device. It setups all
+ * @brief Function called on init for each Raspberry Pi Pico ADC device. It setups all
  *        channels to return constant 0 mV and create acquisition thread.
  *
- * @param dev RaspberryPi Pico ADC device
+ * @param dev Raspberry Pi Pico ADC device
  *
  * @return 0 on success
  */
diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c
index 1e246668bb6bf..fd8008234706d 100644
--- a/drivers/adc/adc_stm32.c
+++ b/drivers/adc/adc_stm32.c
@@ -18,12 +18,14 @@
 #include <zephyr/device.h>
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/policy.h>
 #include <stm32_ll_adc.h>
 #include <stm32_ll_system.h>
-#if defined(CONFIG_SOC_SERIES_STM32U5X)
+#if defined(CONFIG_SOC_SERIES_STM32N6X) || \
+	defined(CONFIG_SOC_SERIES_STM32U5X)
 #include <stm32_ll_pwr.h>
 #endif /* CONFIG_SOC_SERIES_STM32U5X */
 
@@ -52,12 +54,7 @@ LOG_MODULE_REGISTER(adc_stm32);
 #include <stm32_ll_system.h>
 #endif
 
-#ifdef CONFIG_NOCACHE_MEMORY
 #include <zephyr/linker/linker-defs.h>
-#elif defined(CONFIG_CACHE_MANAGEMENT)
-#include <zephyr/arch/cache.h>
-#endif /* CONFIG_NOCACHE_MEMORY */
-
 
 /* Here are some redefinitions of ADC versions for better readability */
 #if defined(CONFIG_SOC_SERIES_STM32F3X)
@@ -157,11 +154,17 @@ struct stream {
 };
 #endif /* CONFIG_ADC_STM32_DMA */
 
+#if defined(CONFIG_SOC_SERIES_STM32N6X)
+typedef uint32_t adc_data_size_t;
+#else
+typedef uint16_t adc_data_size_t;
+#endif
+
 struct adc_stm32_data {
 	struct adc_context ctx;
 	const struct device *dev;
-	uint16_t *buffer;
-	uint16_t *repeat_buffer;
+	adc_data_size_t *buffer;
+	adc_data_size_t *repeat_buffer;
 
 	uint8_t resolution;
 	uint32_t channels;
@@ -196,7 +199,9 @@ static void adc_stm32_enable_dma_support(ADC_TypeDef *adc)
 	/* Allow ADC to create DMA request and set to one-shot mode as implemented in HAL drivers */
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc)
 	LL_ADC_REG_SetDMATransfer(adc, LL_ADC_REG_DMA_TRANSFER_UNLIMITED);
-#elif defined(CONFIG_SOC_SERIES_STM32H7X) || defined(CONFIG_SOC_SERIES_STM32U5X)
+#elif defined(CONFIG_SOC_SERIES_STM32H7X) || \
+	defined(CONFIG_SOC_SERIES_STM32N6X) || \
+	defined(CONFIG_SOC_SERIES_STM32U5X)
 	/* H72x ADC3 and U5 ADC4 are different from the rest, but this call works also for them,
 	 * so no need to call their specific function
 	 */
@@ -221,7 +226,7 @@ static int adc_stm32_dma_start(const struct device *dev,
 	blk_cfg = &dma->dma_blk_cfg;
 
 	/* prepare the block */
-	blk_cfg->block_size = channel_count * sizeof(int16_t);
+	blk_cfg->block_size = channel_count * sizeof(adc_data_size_t);
 
 	/* Source and destination */
 	blk_cfg->source_address = (uint32_t)LL_ADC_DMA_GetRegAddr(adc, LL_ADC_DMA_REG_REGULAR_DATA);
@@ -272,7 +277,7 @@ static int adc_stm32_dma_start(const struct device *dev,
  *		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) | ... )>;
  *	};
  */
-static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
+static bool buf_in_nocache(uintptr_t buf __maybe_unused, size_t len_bytes __maybe_unused)
 {
 	bool buf_within_nocache = false;
 
@@ -284,8 +289,10 @@ static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
 	}
 #endif /* CONFIG_NOCACHE_MEMORY */
 
+#ifdef CONFIG_MEM_ATTR
 	buf_within_nocache = mem_attr_check_buf(
 		(void *)buf, len_bytes, DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)) == 0;
+#endif /* CONFIG_MEM_ATTR */
 
 	return buf_within_nocache;
 }
@@ -296,7 +303,7 @@ static int check_buffer(const struct adc_sequence *sequence,
 {
 	size_t needed_buffer_size;
 
-	needed_buffer_size = active_channels * sizeof(uint16_t);
+	needed_buffer_size = active_channels * sizeof(adc_data_size_t);
 
 	if (sequence->options) {
 		needed_buffer_size *= (1 + sequence->options->extra_samplings);
@@ -469,6 +476,41 @@ static void adc_stm32_calibration_delay(const struct device *dev)
 	}
 }
 
+#if defined(CONFIG_SOC_SERIES_STM32N6X)
+/* Number of ADC measurement during calibration procedure */
+#define ADC_CALIBRATION_STEPS (8U)
+
+static void adc_stm32_calibration_measure(ADC_TypeDef *adc, uint32_t *calibration_factor)
+{
+	uint32_t calib_step;
+	uint32_t calib_factor_avg = 0;
+	uint8_t done = 0;
+
+	do {
+		for (calib_step = 0; calib_step < ADC_CALIBRATION_STEPS; calib_step++) {
+			LL_ADC_REG_StartConversion(adc);
+			while (LL_ADC_REG_IsConversionOngoing(adc) != 0UL) {
+			}
+
+			calib_factor_avg += LL_ADC_REG_ReadConversionData32(adc);
+		}
+
+		/* Compute the average data */
+		calib_factor_avg /= ADC_CALIBRATION_STEPS;
+
+		if ((calib_factor_avg == 0) && (LL_ADC_IsCalibrationOffsetEnabled(adc) == 0UL)) {
+			/* If average is 0 and offset is disabled
+			 * set offset and repeat measurements
+			 */
+			LL_ADC_EnableCalibrationOffset(adc);
+		} else {
+			*calibration_factor = (uint32_t)(calib_factor_avg);
+			done = 1;
+		}
+	} while (done == 0);
+}
+#endif
+
 static void adc_stm32_calibration_start(const struct device *dev)
 {
 	const struct adc_stm32_cfg *config =
@@ -517,6 +559,17 @@ static void adc_stm32_calibration_start(const struct device *dev)
 	LL_ADC_StartCalibration(adc, LL_ADC_CALIB_OFFSET);
 #elif defined(CONFIG_SOC_SERIES_STM32H7X)
 	LL_ADC_StartCalibration(adc, LL_ADC_CALIB_OFFSET, LL_ADC_SINGLE_ENDED);
+#elif defined(CONFIG_SOC_SERIES_STM32N6X)
+	uint32_t calibration_factor;
+	/* Start ADC calibration */
+	LL_ADC_StartCalibration(adc, LL_ADC_SINGLE_ENDED);
+	/* Disable additional offset before calibration start */
+	LL_ADC_DisableCalibrationOffset(adc);
+
+	adc_stm32_calibration_measure(adc, &calibration_factor);
+
+	LL_ADC_SetCalibrationFactor(adc, LL_ADC_SINGLE_ENDED, calibration_factor);
+	LL_ADC_StopCalibration(adc);
 #endif
 	/* Make sure ADCAL is cleared before returning for proper operations
 	 * on the ADC control register, for enabling the peripheral for example
@@ -551,7 +604,8 @@ static int adc_stm32_calibrate(const struct device *dev)
 #endif /* CONFIG_SOC_SERIES_* */
 #endif /* CONFIG_ADC_STM32_DMA */
 
-#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc)
+#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc) && \
+	!defined(CONFIG_SOC_SERIES_STM32N6X)
 	adc_stm32_disable(adc);
 	adc_stm32_calibration_start(dev);
 	adc_stm32_calibration_delay(dev);
@@ -562,7 +616,8 @@ static int adc_stm32_calibrate(const struct device *dev)
 		return err;
 	}
 
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc)
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc) || \
+	defined(CONFIG_SOC_SERIES_STM32N6X)
 	adc_stm32_calibration_delay(dev);
 	adc_stm32_calibration_start(dev);
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc) */
@@ -868,7 +923,9 @@ static int set_sequencer(const struct device *dev)
 
 #if ANY_ADC_SEQUENCER_TYPE_IS(FULLY_CONFIGURABLE)
 		if (config->sequencer_type == FULLY_CONFIGURABLE) {
-#if defined(CONFIG_SOC_SERIES_STM32H7X) || defined(CONFIG_SOC_SERIES_STM32U5X)
+#if defined(CONFIG_SOC_SERIES_STM32H7X) || \
+	defined(CONFIG_SOC_SERIES_STM32N6X) || \
+	defined(CONFIG_SOC_SERIES_STM32U5X)
 			/*
 			 * Each channel in the sequence must be previously enabled in PCSEL.
 			 * This register controls the analog switch integrated in the IO level.
@@ -1021,10 +1078,7 @@ static void adc_context_start_sampling(struct adc_context *ctx)
 		CONTAINER_OF(ctx, struct adc_stm32_data, ctx);
 	const struct device *dev = data->dev;
 	const struct adc_stm32_cfg *config = dev->config;
-	ADC_TypeDef *adc = config->base;
-
-	/* Remove warning for some series */
-	ARG_UNUSED(adc);
+	__maybe_unused ADC_TypeDef *adc = config->base;
 
 	data->repeat_buffer = data->buffer;
 
@@ -1095,7 +1149,7 @@ static void adc_context_on_complete(struct adc_context *ctx, int status)
 	struct adc_stm32_data *data =
 		CONTAINER_OF(ctx, struct adc_stm32_data, ctx);
 	const struct adc_stm32_cfg *config = data->dev->config;
-	ADC_TypeDef *adc = config->base;
+	__maybe_unused ADC_TypeDef *adc = config->base;
 
 	ARG_UNUSED(status);
 
@@ -1106,8 +1160,6 @@ static void adc_context_on_complete(struct adc_context *ctx, int status)
 #if defined(CONFIG_SOC_SERIES_STM32H7X) || defined(CONFIG_SOC_SERIES_STM32U5X)
 	/* Reset channel preselection register */
 	LL_ADC_SetChannelPreselection(adc, 0);
-#else
-	ARG_UNUSED(adc);
 #endif /* CONFIG_SOC_SERIES_STM32H7X || CONFIG_SOC_SERIES_STM32U5X */
 }
 
@@ -1178,7 +1230,7 @@ static int adc_stm32_sampling_time_setup(const struct device *dev, uint8_t id,
 	const struct adc_stm32_cfg *config =
 		(const struct adc_stm32_cfg *)dev->config;
 	ADC_TypeDef *adc = config->base;
-	struct adc_stm32_data *data = dev->data;
+	__maybe_unused struct adc_stm32_data *data = dev->data;
 
 	int acq_time_index;
 
@@ -1196,7 +1248,6 @@ static int adc_stm32_sampling_time_setup(const struct device *dev, uint8_t id,
 	switch (config->num_sampling_time_common_channels) {
 	case 0:
 #if ANY_NUM_COMMON_SAMPLING_TIME_CHANNELS_IS(0)
-		ARG_UNUSED(data);
 		LL_ADC_SetChannelSamplingTime(adc,
 					      __LL_ADC_DECIMAL_NB_TO_CHANNEL(id),
 					      (uint32_t)acq_time_index);
@@ -1432,11 +1483,9 @@ static int adc_stm32_set_clock(const struct device *dev)
 {
 	const struct adc_stm32_cfg *config = dev->config;
 	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
-	ADC_TypeDef *adc = config->base;
+	__maybe_unused ADC_TypeDef *adc = config->base;
 	int ret = 0;
 
-	ARG_UNUSED(adc); /* Necessary to avoid warnings on some series */
-
 	if (clock_control_on(clk,
 		(clock_control_subsys_t) &config->pclken[0]) != 0) {
 		return -EIO;
@@ -1451,6 +1500,7 @@ static int adc_stm32_set_clock(const struct device *dev)
 		}
 	}
 
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(st_adc_clock_source)
 #if defined(CONFIG_SOC_SERIES_STM32F0X)
 	LL_ADC_SetClock(adc, config->clk_prescaler);
 #elif defined(ADC_STM32_HAS_INDIVIDUAL_CLOCKS)
@@ -1461,7 +1511,7 @@ static int adc_stm32_set_clock(const struct device *dev)
 				      config->clk_prescaler);
 		LL_ADC_SetClock(adc, LL_ADC_CLOCK_ASYNC);
 	}
-#elif !DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc)
+#else
 	LL_ADC_SetCommonClock(__LL_ADC_COMMON_INSTANCE(adc),
 			      config->clk_prescaler);
 
@@ -1470,20 +1520,39 @@ static int adc_stm32_set_clock(const struct device *dev)
 	ret = adc_stm32h7_setup_boost(config, adc, clk);
 #endif
 #endif
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(st_adc_clock_source) */
 
 	return ret;
 }
 
+static void adc_stm32_enable_analog_supply(void)
+{
+#if defined(CONFIG_SOC_SERIES_STM32N6X)
+	LL_PWR_EnableVddADC();
+#elif defined(CONFIG_SOC_SERIES_STM32U5X)
+	LL_PWR_EnableVDDA();
+#endif /* CONFIG_SOC_SERIES_STM32U5X */
+}
+
+#ifdef CONFIG_PM_DEVICE
+static void adc_stm32_disable_analog_supply(void)
+{
+#if defined(CONFIG_SOC_SERIES_STM32N6X)
+	LL_PWR_DisableVddADC();
+#elif defined(CONFIG_SOC_SERIES_STM32U5X)
+	LL_PWR_DisableVDDA();
+#endif /* CONFIG_SOC_SERIES_STM32U5X */
+}
+#endif
+
 static int adc_stm32_init(const struct device *dev)
 {
 	struct adc_stm32_data *data = dev->data;
 	const struct adc_stm32_cfg *config = dev->config;
 	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
-	ADC_TypeDef *adc = config->base;
+	__maybe_unused ADC_TypeDef *adc = config->base;
 	int err;
 
-	ARG_UNUSED(adc); /* Necessary to avoid warnings on some series */
-
 	LOG_DBG("Initializing %s", dev->name);
 
 	if (!device_is_ready(clk)) {
@@ -1519,10 +1588,7 @@ static int adc_stm32_init(const struct device *dev)
 		return err;
 	}
 
-#if defined(CONFIG_SOC_SERIES_STM32U5X)
-	/* Enable the independent analog supply */
-	LL_PWR_EnableVDDA();
-#endif /* CONFIG_SOC_SERIES_STM32U5X */
+	adc_stm32_enable_analog_supply();
 
 #ifdef CONFIG_ADC_STM32_DMA
 	if ((data->dma.dma_dev != NULL) &&
@@ -1539,6 +1605,7 @@ static int adc_stm32_init(const struct device *dev)
 	defined(CONFIG_SOC_SERIES_STM32H5X) || \
 	defined(CONFIG_SOC_SERIES_STM32H7X) || \
 	defined(CONFIG_SOC_SERIES_STM32H7RSX) || \
+	defined(CONFIG_SOC_SERIES_STM32N6X) || \
 	defined(CONFIG_SOC_SERIES_STM32U5X)
 	/*
 	 * L4, WB, G4, H5, H7 and U5 series STM32 needs to be awaken from deep sleep
@@ -1554,7 +1621,8 @@ static int adc_stm32_init(const struct device *dev)
 	 */
 #if !defined(CONFIG_SOC_SERIES_STM32F0X) && \
 	!DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc) && \
-	!DT_HAS_COMPAT_STATUS_OKAY(st_stm32f4_adc)
+	!DT_HAS_COMPAT_STATUS_OKAY(st_stm32f4_adc) && \
+	!defined(CONFIG_SOC_SERIES_STM32N6X)
 	LL_ADC_EnableInternalRegulator(adc);
 	/* Wait for Internal regulator stabilisation
 	 * Some series have a dedicated status bit, others relie on a delay
@@ -1604,7 +1672,8 @@ static int adc_stm32_suspend_setup(const struct device *dev)
 
 #if !defined(CONFIG_SOC_SERIES_STM32F0X) && \
 	!DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc) && \
-	!DT_HAS_COMPAT_STATUS_OKAY(st_stm32f4_adc)
+	!DT_HAS_COMPAT_STATUS_OKAY(st_stm32f4_adc) && \
+	!defined(CONFIG_SOC_SERIES_STM32N6X)
 	/* Disable ADC internal voltage regulator */
 	LL_ADC_DisableInternalRegulator(adc);
 	while (LL_ADC_IsInternalRegulatorEnabled(adc) == 1U) {
@@ -1618,6 +1687,7 @@ static int adc_stm32_suspend_setup(const struct device *dev)
 	defined(CONFIG_SOC_SERIES_STM32H5X) || \
 	defined(CONFIG_SOC_SERIES_STM32H7X) || \
 	defined(CONFIG_SOC_SERIES_STM32H7RSX) || \
+	defined(CONFIG_SOC_SERIES_STM32N6X) || \
 	defined(CONFIG_SOC_SERIES_STM32U5X)
 	/*
 	 * L4, WB, G4, H5, H7 and U5 series STM32 needs to be put into
@@ -1627,10 +1697,7 @@ static int adc_stm32_suspend_setup(const struct device *dev)
 	LL_ADC_EnableDeepPowerDown(adc);
 #endif
 
-#if defined(CONFIG_SOC_SERIES_STM32U5X)
-	/* Disable the independent analog supply */
-	LL_PWR_DisableVDDA();
-#endif /* CONFIG_SOC_SERIES_STM32U5X */
+	adc_stm32_disable_analog_supply();
 
 	/* Stop device clock. Note: fixed clocks are not handled yet. */
 	err = clock_control_off(clk, (clock_control_subsys_t)&config->pclken[0]);
@@ -1680,6 +1747,9 @@ static DEVICE_API(adc, api_stm32_driver_api) = {
 	.ref_internal = STM32_ADC_VREF_MV, /* VREF is usually connected to VDD */
 };
 
+/* Macros for ADC clock source and prescaler */
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(st_adc_clock_source)
+
 #if defined(CONFIG_SOC_SERIES_STM32F0X)
 /* LL_ADC_CLOCK_ASYNC_DIV1 doesn't exist in F0 LL. Define it here. */
 #define LL_ADC_CLOCK_ASYNC_DIV1 LL_ADC_CLOCK_ASYNC
@@ -1696,17 +1766,20 @@ static DEVICE_API(adc, api_stm32_driver_api) = {
 		(LL_ADC_CLOCK_ASYNC_DIV))
 
 /* Concat prefix (1st element) and DIV value (2nd element) of st,adc-prescaler */
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_adc)
-#define ADC_STM32_DT_PRESC(x)	0
-#define ADC_STM32_CHECK_DT_CLOCK(x)
-#else
 #define ADC_STM32_DT_PRESC(x)	\
 	_CONCAT(ADC_STM32_CLOCK_PREFIX(x), ADC_STM32_DIV(x))
+
 /* Macro to check if the ADC instance clock setup is correct */
 #define ADC_STM32_CHECK_DT_CLOCK(x)								\
 	BUILD_ASSERT(IS_EQ(ADC_STM32_CLOCK(x), SYNC) || (DT_INST_NUM_CLOCKS(x) > 1),		\
 		     "ASYNC clock mode defined without ASYNC clock defined in device tree")
-#endif
+
+#else /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(st_adc_clock_source) */
+
+#define ADC_STM32_DT_PRESC(x)	0
+#define ADC_STM32_CHECK_DT_CLOCK(x)
+
+#endif /* !DT_ANY_INST_HAS_PROP_STATUS_OKAY(st_adc_clock_source) */
 
 
 #if defined(CONFIG_ADC_STM32_DMA)
diff --git a/drivers/adc/iadc_gecko.c b/drivers/adc/iadc_gecko.c
index 5a6af0bafe059..ee8d3804734f0 100644
--- a/drivers/adc/iadc_gecko.c
+++ b/drivers/adc/iadc_gecko.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/clock_control_silabs.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/pm/device.h>
 
 #include <em_iadc.h>
 
@@ -361,29 +362,52 @@ static int adc_gecko_channel_setup(const struct device *dev,
 	return 0;
 }
 
-static int adc_gecko_init(const struct device *dev)
+static int adc_gecko_pm_action(const struct device *dev, enum pm_device_action action)
 {
 	int err;
 	const struct adc_gecko_config *config = dev->config;
-	struct adc_gecko_data *data = dev->data;
 
-	err = clock_control_on(config->clock_dev, (clock_control_subsys_t)&config->clock_cfg);
-	if (err < 0) {
-		return err;
-	}
+	if (action == PM_DEVICE_ACTION_RESUME) {
+		err = clock_control_on(config->clock_dev,
+				       (clock_control_subsys_t)&config->clock_cfg);
+		if (err < 0) {
+			return err;
+		}
+
+		err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		if (err < 0 && err != -ENOENT) {
+			return err;
+		}
+	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
+		err = clock_control_off(config->clock_dev,
+					(clock_control_subsys_t)&config->clock_cfg);
+		if (err < 0) {
+			return err;
+		}
 
-	err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-	if (err < 0 && err != -ENOENT) {
-		return err;
+		err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+		if (err < 0 && err != -ENOENT) {
+			return err;
+		}
+	} else {
+		return -ENOTSUP;
 	}
 
+	return 0;
+}
+
+static int adc_gecko_init(const struct device *dev)
+{
+	const struct adc_gecko_config *config = dev->config;
+	struct adc_gecko_data *data = dev->data;
+
 	data->dev = dev;
 
 	config->irq_cfg_func();
 
 	adc_context_unlock_unconditionally(&data->ctx);
 
-	return 0;
+	return pm_device_driver_init(dev, adc_gecko_pm_action);
 }
 
 static DEVICE_API(adc, api_gecko_adc_driver_api) = {
@@ -397,6 +421,7 @@ static DEVICE_API(adc, api_gecko_adc_driver_api) = {
 
 #define GECKO_IADC_INIT(n)						\
 	PINCTRL_DT_INST_DEFINE(n);					\
+	PM_DEVICE_DT_INST_DEFINE(n, adc_gecko_pm_action);		\
 									\
 	static void adc_gecko_config_func_##n(void);			\
 									\
@@ -420,7 +445,7 @@ static DEVICE_API(adc, api_gecko_adc_driver_api) = {
 		irq_enable(DT_INST_IRQN(n));	\
 	}; \
 	DEVICE_DT_INST_DEFINE(n,					 \
-			      &adc_gecko_init, NULL,			 \
+			      &adc_gecko_init, PM_DEVICE_DT_INST_GET(n), \
 			      &adc_gecko_data_##n, &adc_gecko_config_##n,\
 			      POST_KERNEL, CONFIG_ADC_INIT_PRIORITY,	 \
 			      &api_gecko_adc_driver_api);
diff --git a/drivers/audio/CMakeLists.txt b/drivers/audio/CMakeLists.txt
index 0396ae23e483f..9fb0dfe912ae9 100644
--- a/drivers/audio/CMakeLists.txt
+++ b/drivers/audio/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 zephyr_library()
 
+zephyr_library_sources_ifdef(CONFIG_AUDIO_TLV320AIC3110	tlv320aic3110.c)
 zephyr_library_sources_ifdef(CONFIG_AUDIO_TLV320DAC	tlv320dac310x.c)
 zephyr_library_sources_ifdef(CONFIG_AUDIO_MPXXDTYY	mpxxdtyy.c)
 zephyr_library_sources_ifdef(CONFIG_AUDIO_MPXXDTYY	mpxxdtyy-i2s.c)
@@ -10,3 +11,4 @@ zephyr_library_sources_ifdef(CONFIG_AUDIO_TAS6422DAC tas6422dac.c)
 zephyr_library_sources_ifdef(CONFIG_AUDIO_CODEC_SHELL	codec_shell.c)
 zephyr_library_sources_ifdef(CONFIG_AUDIO_DMIC_MCUX dmic_mcux.c)
 zephyr_library_sources_ifdef(CONFIG_AUDIO_CODEC_WM8904 wm8904.c)
+zephyr_library_sources_ifdef(CONFIG_AUDIO_CODEC_CS43L22 cs43l22.c)
diff --git a/drivers/audio/Kconfig b/drivers/audio/Kconfig
index 70d02b5320a21..ffd29112492d7 100644
--- a/drivers/audio/Kconfig
+++ b/drivers/audio/Kconfig
@@ -35,7 +35,9 @@ module = AUDIO_CODEC
 module-str = audio codec
 source "subsys/logging/Kconfig.template.log_config"
 
+source "drivers/audio/Kconfig.cs43l22"
 source "drivers/audio/Kconfig.tas6422dac"
+source "drivers/audio/Kconfig.tlv320aic3110"
 source "drivers/audio/Kconfig.tlv320dac"
 source "drivers/audio/Kconfig.wm8904"
 
diff --git a/drivers/audio/Kconfig.cs43l22 b/drivers/audio/Kconfig.cs43l22
new file mode 100644
index 0000000000000..6fa65a451b943
--- /dev/null
+++ b/drivers/audio/Kconfig.cs43l22
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Titouan Christophe
+# SPDX-License-Identifier: Apache-2.0
+
+config AUDIO_CODEC_CS43L22
+	bool "Cirrus CS43L22 driver"
+	default y
+	select I2C
+	depends on GPIO
+	depends on DT_HAS_CIRRUS_CS43L22_ENABLED
+	help
+	  Enable the driver for the Cirrus CS43L22 low Power, stereo DAC
+	  with headphone & speaker amplifiers
diff --git a/drivers/audio/Kconfig.tlv320aic3110 b/drivers/audio/Kconfig.tlv320aic3110
new file mode 100644
index 0000000000000..3a86b888382bf
--- /dev/null
+++ b/drivers/audio/Kconfig.tlv320aic3110
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 PHYTEC America LLC
+# SPDX-License-Identifier: Apache-2.0
+
+config AUDIO_TLV320AIC3110
+	bool "TLV320AIC3110 AIC support"
+	default y
+	depends on DT_HAS_TI_TLV320AIC3110_ENABLED
+	select I2C
+	help
+	  Enable TLV320AIC3110 support on the selected board
diff --git a/drivers/audio/cs43l22.c b/drivers/audio/cs43l22.c
new file mode 100644
index 0000000000000..0da2af130b498
--- /dev/null
+++ b/drivers/audio/cs43l22.c
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 2025 Titouan Christophe
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/audio/codec.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(cirrus_cs43l22);
+
+#define DT_DRV_COMPAT cirrus_cs43l22
+
+/*
+ * See datasheet: https://statics.cirrus.com/pubs/proDatasheet/CS43L22_F2.pdf
+ */
+
+/* (datasheet) 6. REGISTER QUICK REFERENCE */
+#define REG_ID                       0x01
+#define REG_POWER_CTL_1              0x02
+#define REG_POWER_CTL_2              0x04
+#define REG_CLOCKING_CTL             0x05
+#define REG_INTERFACE_CTL_1          0x06
+#define REG_INTERFACE_CTL_2          0x07
+#define REG_PASSTHROUGH_A            0x08
+#define REG_PASSTHROUGH_B            0x09
+#define REG_ANALOG_ZC_AND_SR         0x0a
+#define REG_PASSTHROUGH_GANG_CONTROL 0x0c
+#define REG_PLAYBACK_CTL_1           0x0d
+#define REG_MISC_CTL                 0x0e
+#define REG_PLAYBACK_CTL_2           0x0f
+#define REG_PASSTHROUGH_A_VOL        0x14
+#define REG_PASSTHROUGH_B_VOL        0x15
+#define REG_PCMA_VOL                 0x1a
+#define REG_PCMB_VOL                 0x1b
+#define REG_BEEP_FREQ                0x1c
+#define REG_BEEP_VOL                 0x1d
+#define REG_BEEP_TONE                0x1e
+#define REG_TONE_CTL                 0x1f
+#define REG_MASTER_A_VOL             0x20
+#define REG_MASTER_B_VOL             0x21
+#define REG_HEADPHONES_A_VOL         0x22
+#define REG_HEADPHONES_B_VOL         0x23
+#define REG_SPEAKER_A_VOL            0x22
+#define REG_SPEAKER_B_VOL            0x23
+#define REG_LIMITER_CTL_1            0x27
+#define REG_LIMITER_CTL_2            0x28
+#define REG_STATUS                   0x2e
+#define REG_SPEAKER_STATUS           0x31
+
+/* (datasheet) 7.5.4 DAC Interface Format */
+#define DAC_IF_FORMAT_LEFT_JUSTIFIED  0
+#define DAC_IF_FORMAT_I2S             1
+#define DAC_IF_FORMAT_RIGHT_JUSTIFIED 2
+
+/* (datasheet) 7.5.5 Audio Word Length */
+#define WORDLEN_32       0
+#define WORDLEN_24       1
+#define WORDLEN_20       2
+#define WORDLEN_16       3
+#define WORDLEN_RIGHT_24 0
+#define WORDLEN_RIGHT_20 1
+#define WORDLEN_RIGHT_18 2
+#define WORDLEN_RIGHT_16 3
+
+/* (datasheet) 7.12 Playback Control 2 */
+#define HEADPHONES_B_MUTE (1 << 7)
+#define HEADPHONES_A_MUTE (1 << 6)
+#define SPEAKER_B_MUTE    (1 << 5)
+#define SPEAKER_A_MUTE    (1 << 4)
+
+#define cs43l22_write(_i2c, _reg, _value) \
+	cs43l22_write_masked(_i2c, _reg, _value, 0xff)
+
+static inline int cs43l22_write_masked(const struct i2c_dt_spec *i2c, uint8_t reg,
+				       uint8_t value, uint8_t mask)
+{
+	int ret;
+	uint8_t actual_value = 0;
+
+	if (mask != 0xff) {
+		ret = i2c_burst_read_dt(i2c, reg, &actual_value, 1);
+		if (ret) {
+			LOG_ERR("Unable to get actual register value [%02X]", reg);
+			return ret;
+		}
+	}
+	actual_value = (actual_value & ~mask) | (value & mask);
+
+	return i2c_burst_write_dt(i2c, reg, &actual_value, 1);
+}
+
+#define cs43l22_soft_power_down(_i2c) cs43l22_write(_i2c, REG_POWER_CTL_1, 0x01)
+#define cs43l22_soft_power_up(_i2c)   cs43l22_write(_i2c, REG_POWER_CTL_1, 0x9e)
+
+struct cs43l22_config {
+	struct i2c_dt_spec i2c;
+	struct gpio_dt_spec reset_gpio;
+};
+
+static int cs43l22_configure(const struct device *dev, struct audio_codec_cfg *audiocfg)
+{
+	uint8_t format, wordlen;
+	const struct cs43l22_config *cfg = dev->config;
+
+	if (audiocfg->dai_route != AUDIO_ROUTE_PLAYBACK) {
+		return -ENOTSUP;
+	}
+
+	switch (audiocfg->dai_type) {
+	case AUDIO_DAI_TYPE_LEFT_JUSTIFIED:
+		format = DAC_IF_FORMAT_LEFT_JUSTIFIED;
+		break;
+	case AUDIO_DAI_TYPE_I2S:
+		format = DAC_IF_FORMAT_I2S;
+		break;
+	case AUDIO_DAI_TYPE_RIGHT_JUSTIFIED:
+		format = DAC_IF_FORMAT_RIGHT_JUSTIFIED;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	if (format == DAC_IF_FORMAT_RIGHT_JUSTIFIED) {
+		switch (audiocfg->dai_cfg.i2s.word_size) {
+		case 16:
+			wordlen = WORDLEN_RIGHT_16;
+			break;
+		case 18:
+			wordlen = WORDLEN_RIGHT_18;
+			break;
+		case 20:
+			wordlen = WORDLEN_RIGHT_20;
+			break;
+		case 24:
+			wordlen = WORDLEN_RIGHT_24;
+			break;
+		default:
+			return -ENOTSUP;
+		}
+	} else {
+		switch (audiocfg->dai_cfg.i2s.word_size) {
+		case 16:
+			wordlen = WORDLEN_16;
+			break;
+		case 20:
+			wordlen = WORDLEN_20;
+			break;
+		case 24:
+			wordlen = WORDLEN_24;
+			break;
+		case 32:
+			wordlen = WORDLEN_32;
+			break;
+		default:
+			return -ENOTSUP;
+		}
+	}
+
+	if (cs43l22_soft_power_down(&cfg->i2c)) {
+		return -EIO;
+	}
+	/* Set automatic clock detection */
+	if (cs43l22_write(&cfg->i2c, REG_CLOCKING_CTL, (1 << 7))) {
+		return -EIO;
+	}
+	/* Set input audio format */
+	if (cs43l22_write_masked(&cfg->i2c, REG_INTERFACE_CTL_1, (format << 2) | wordlen, 0xdf)) {
+		return -EIO;
+	}
+	if (cs43l22_soft_power_up(&cfg->i2c)) {
+		return -EIO;
+	}
+	return 0;
+}
+
+static void cs43l22_start_output(const struct device *dev)
+{
+}
+
+static void cs43l22_stop_output(const struct device *dev)
+{
+}
+
+static int cs43l22_apply_properties(const struct device *dev)
+{
+	return 0;
+}
+
+static inline int cs43l22_set_mute(const struct i2c_dt_spec *i2c,
+				   audio_channel_t channel, bool mute)
+{
+	uint8_t chan_mute_mask = 0;
+
+	switch (channel) {
+	case AUDIO_CHANNEL_ALL:
+		chan_mute_mask = HEADPHONES_A_MUTE
+			       | HEADPHONES_B_MUTE
+			       | SPEAKER_A_MUTE
+			       | SPEAKER_B_MUTE;
+		break;
+	case AUDIO_CHANNEL_HEADPHONE_LEFT:
+		chan_mute_mask = HEADPHONES_A_MUTE;
+		break;
+	case AUDIO_CHANNEL_HEADPHONE_RIGHT:
+		chan_mute_mask = HEADPHONES_B_MUTE;
+		break;
+	case AUDIO_CHANNEL_FRONT_LEFT:
+		chan_mute_mask = SPEAKER_A_MUTE;
+		break;
+	case AUDIO_CHANNEL_FRONT_RIGHT:
+		chan_mute_mask = SPEAKER_B_MUTE;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return cs43l22_write_masked(i2c, REG_PLAYBACK_CTL_2,
+				    mute * chan_mute_mask, chan_mute_mask);
+}
+
+static inline int cs43l22_set_volume(const struct i2c_dt_spec *i2c,
+				     audio_channel_t channel, int vol)
+{
+	uint8_t reg;
+	uint8_t volume_scaled = 65 + (191 * vol / 100);
+
+	switch (channel) {
+	case AUDIO_CHANNEL_HEADPHONE_LEFT:
+		reg = REG_HEADPHONES_A_VOL;
+		break;
+	case AUDIO_CHANNEL_HEADPHONE_RIGHT:
+		reg = REG_HEADPHONES_B_VOL;
+		break;
+	case AUDIO_CHANNEL_FRONT_LEFT:
+		reg = REG_SPEAKER_A_VOL;
+		break;
+	case AUDIO_CHANNEL_FRONT_RIGHT:
+		reg = REG_SPEAKER_B_VOL;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return cs43l22_write(i2c, reg, volume_scaled);
+}
+
+static int cs43l22_set_property(const struct device *dev, audio_property_t property,
+				audio_channel_t channel, audio_property_value_t val)
+{
+	const struct cs43l22_config *cfg = dev->config;
+
+	switch (property) {
+	case AUDIO_PROPERTY_OUTPUT_MUTE:
+		return cs43l22_set_mute(&cfg->i2c, channel, val.mute);
+	case AUDIO_PROPERTY_OUTPUT_VOLUME:
+		return cs43l22_set_volume(&cfg->i2c, channel, val.vol);
+	default:
+		return -ENOTSUP;
+	}
+
+}
+
+static const struct audio_codec_api cs43l22_api = {
+	.configure = cs43l22_configure,
+	.start_output = cs43l22_start_output,
+	.stop_output = cs43l22_stop_output,
+	.set_property = cs43l22_set_property,
+	.apply_properties = cs43l22_apply_properties,
+};
+
+static int cs43l22_init(const struct device *dev)
+{
+	uint8_t regval;
+	const struct cs43l22_config *cfg = dev->config;
+	int ret;
+
+	ret = gpio_pin_configure_dt(&cfg->reset_gpio, GPIO_OUTPUT_ACTIVE);
+	if (ret) {
+		return -EIO;
+	}
+
+	ret = i2c_burst_read_dt(&cfg->i2c, REG_ID, &regval, 1);
+	if (ret) {
+		LOG_ERR("Unable to read device ID");
+		return -ENODEV;
+	}
+
+	if ((regval >> 3) != 0x1C) {
+		LOG_ERR("Wrong Chip ID");
+		return -ENODEV;
+	}
+
+	LOG_DBG("Found CS43L22 (chip=%02X, rev=%c%d)",
+		regval >> 3, 'A' + ((regval >> 1) & 3), regval & 1);
+
+	return 0;
+}
+
+#define CS43L22_INIT(inst)                                                \
+	static const struct cs43l22_config cs43l22_config_##inst = {      \
+		.i2c = I2C_DT_SPEC_INST_GET(inst),                        \
+		.reset_gpio = GPIO_DT_SPEC_INST_GET(inst, reset_gpios),   \
+	};                                                                \
+	DEVICE_DT_INST_DEFINE(inst, cs43l22_init, NULL, NULL,             \
+			      &cs43l22_config_##inst, POST_KERNEL,        \
+			      CONFIG_AUDIO_CODEC_INIT_PRIORITY,           \
+			      &cs43l22_api);
+
+DT_INST_FOREACH_STATUS_OKAY(CS43L22_INIT)
diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index b7ea336b9f9d6..ea78330deb5bc 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -16,9 +16,11 @@
 LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 
 #if CONFIG_SOC_SERIES_NRF54HX
-#define DMIC_NRFX_CLOCK_FREQ 8*1000*1000UL
+#define DMIC_NRFX_CLOCK_FREQ MHZ(16)
+#define DMIC_NRFX_CLOCK_FACTOR 8192
 #else
-#define DMIC_NRFX_CLOCK_FREQ 32*1000*1000UL
+#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
+#define DMIC_NRFX_CLOCK_FACTOR 4096
 #endif
 
 struct dmic_nrfx_pdm_drv_data {
@@ -26,8 +28,8 @@ struct dmic_nrfx_pdm_drv_data {
 	struct onoff_manager *clk_mgr;
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
-	void *mem_slab_buffer;
 	uint32_t block_size;
+	struct k_msgq mem_slab_queue;
 	struct k_msgq rx_queue;
 	bool request_clock : 1;
 	bool configured    : 1;
@@ -47,10 +49,10 @@ struct dmic_nrfx_pdm_drv_cfg {
 	void *mem_reg;
 };
 
-static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data)
+static void free_buffer(struct dmic_nrfx_pdm_drv_data *drv_data, void *buffer)
 {
-	k_mem_slab_free(drv_data->mem_slab, drv_data->mem_slab_buffer);
-	LOG_DBG("Freed buffer %p", drv_data->mem_slab_buffer);
+	k_mem_slab_free(drv_data->mem_slab, buffer);
+	LOG_DBG("Freed buffer %p", buffer);
 }
 
 static void stop_pdm(struct dmic_nrfx_pdm_drv_data *drv_data)
@@ -65,20 +67,29 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 	const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;
 	int ret;
 	bool stop = false;
+	void *mem_slab_buffer;
 
 	if (evt->buffer_requested) {
 		void *buffer;
 		nrfx_err_t err;
 
-		ret = k_mem_slab_alloc(drv_data->mem_slab, &drv_data->mem_slab_buffer, K_NO_WAIT);
+		ret = k_mem_slab_alloc(drv_data->mem_slab, &mem_slab_buffer, K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("Failed to allocate buffer: %d", ret);
 			stop = true;
 		} else {
-			ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+			ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, mem_slab_buffer,
 						    drv_data->block_size, &buffer);
 			if (ret < 0) {
 				LOG_ERR("Failed to prepare buffer: %d", ret);
+				free_buffer(drv_data, mem_slab_buffer);
+				stop_pdm(drv_data);
+				return;
+			}
+			ret = k_msgq_put(&drv_data->mem_slab_queue, &mem_slab_buffer, K_NO_WAIT);
+			if (ret < 0) {
+				LOG_ERR("Unable to put mem slab in queue");
+				free_buffer(drv_data, mem_slab_buffer);
 				stop_pdm(drv_data);
 				return;
 			}
@@ -92,14 +103,18 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 	if (drv_data->stopping) {
 		if (evt->buffer_released) {
-			ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+			ret = k_msgq_get(&drv_data->mem_slab_queue, &mem_slab_buffer, K_NO_WAIT);
+			if (ret < 0) {
+				LOG_ERR("No buffers to free");
+				return;
+			}
+			ret = dmm_buffer_in_release(drv_cfg->mem_reg, mem_slab_buffer,
 						    drv_data->block_size, evt->buffer_released);
 			if (ret < 0) {
 				LOG_ERR("Failed to release buffer: %d", ret);
-				stop_pdm(drv_data);
 				return;
 			}
-			free_buffer(drv_data);
+			free_buffer(drv_data, mem_slab_buffer);
 		}
 
 		if (drv_data->active) {
@@ -109,7 +124,13 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			}
 		}
 	} else if (evt->buffer_released) {
-		ret = dmm_buffer_in_release(drv_cfg->mem_reg, drv_data->mem_slab_buffer,
+		ret = k_msgq_get(&drv_data->mem_slab_queue, &mem_slab_buffer, K_NO_WAIT);
+		if (ret < 0) {
+			LOG_ERR("No buffers to free");
+			stop_pdm(drv_data);
+			return;
+		}
+		ret = dmm_buffer_in_release(drv_cfg->mem_reg, mem_slab_buffer,
 					    drv_data->block_size, evt->buffer_released);
 		if (ret < 0) {
 			LOG_ERR("Failed to release buffer: %d", ret);
@@ -117,12 +138,12 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 			return;
 		}
 		ret = k_msgq_put(&drv_data->rx_queue,
-				 &drv_data->mem_slab_buffer,
+				 &mem_slab_buffer,
 				 K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("No room in RX queue");
 			stop = true;
-			free_buffer(drv_data);
+			free_buffer(drv_data, mem_slab_buffer);
 		} else {
 			LOG_DBG("Queued buffer %p", evt->buffer_released);
 		}
@@ -234,7 +255,7 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 
 		if (is_in_freq_range(act_freq, pdm_cfg) &&
 		    is_better(act_freq, ratio, req_rate, best_diff, best_rate, best_freq)) {
-			config->clock_freq = clk_factor * 4096;
+			config->clock_freq = clk_factor * DMIC_NRFX_CLOCK_FACTOR;
 
 			better_found = true;
 		}
@@ -403,7 +424,6 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 
 	channel->act_num_streams = 1;
 	channel->act_chan_map_hi = 0;
-	channel->act_chan_map_lo = def_map;
 
 	if (channel->req_num_streams != 1 ||
 	    channel->req_num_chan > 2 ||
@@ -434,9 +454,13 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 	nrfx_cfg.mode = channel->req_num_chan == 1
 		      ? NRF_PDM_MODE_MONO
 		      : NRF_PDM_MODE_STEREO;
-	nrfx_cfg.edge = channel->req_chan_map_lo == def_map
-		      ? NRF_PDM_EDGE_LEFTFALLING
-		      : NRF_PDM_EDGE_LEFTRISING;
+	if (channel->req_chan_map_lo == def_map) {
+		nrfx_cfg.edge = NRF_PDM_EDGE_LEFTFALLING;
+		channel->act_chan_map_lo = def_map;
+	} else {
+		nrfx_cfg.edge = NRF_PDM_EDGE_LEFTRISING;
+		channel->act_chan_map_lo = alt_map;
+	}
 #if NRF_PDM_HAS_MCLKCONFIG
 	nrfx_cfg.mclksrc = drv_cfg->clk_src == ACLK
 			 ? NRF_PDM_MCLKSRC_ACLK
@@ -633,6 +657,7 @@ static const struct _dmic_ops dmic_ops = {
 
 #define PDM_NRFX_DEVICE(idx)						     \
 	static void *rx_msgs##idx[DT_PROP(PDM(idx), queue_size)];	     \
+	static void *mem_slab_msgs##idx[DT_PROP(PDM(idx), queue_size)];	     \
 	static struct dmic_nrfx_pdm_drv_data dmic_nrfx_pdm_data##idx;	     \
 	static const nrfx_pdm_t dmic_nrfx_pdm##idx = NRFX_PDM_INSTANCE(idx); \
 	static int pdm_nrfx_init##idx(const struct device *dev)		     \
@@ -649,6 +674,9 @@ static const struct _dmic_ops dmic_ops = {
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.rx_queue,		     \
 			    (char *)rx_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(rx_msgs##idx));			     \
+		k_msgq_init(&dmic_nrfx_pdm_data##idx.mem_slab_queue,	     \
+			    (char *)mem_slab_msgs##idx, sizeof(void *),	     \
+			    ARRAY_SIZE(mem_slab_msgs##idx));		     \
 		IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF,			     \
 			   (init_clock_manager(dev);))			     \
 		return 0;						     \
diff --git a/drivers/audio/mic_privacy/intel/mic_privacy.c b/drivers/audio/mic_privacy/intel/mic_privacy.c
index 1d2076e8bb619..71b4bca2278cc 100644
--- a/drivers/audio/mic_privacy/intel/mic_privacy.c
+++ b/drivers/audio/mic_privacy/intel/mic_privacy.c
@@ -88,6 +88,8 @@ static void mic_privacy_enable_dmic_irq(bool enable_irq, const void *fn)
 			NULL, 0);
 		irq_enable(ACE_INTL_DMIC);
 		ace_dmic_intc_unmask();
+	} else {
+		irq_disable(ACE_INTL_DMIC);
 	}
 }
 
diff --git a/drivers/audio/tlv320aic3110.c b/drivers/audio/tlv320aic3110.c
new file mode 100644
index 0000000000000..d51cd602e857a
--- /dev/null
+++ b/drivers/audio/tlv320aic3110.c
@@ -0,0 +1,582 @@
+/*
+ * Copyright (c) 2025 PHYTEC America LLC
+ * Author: Florijan Plohl <florijan.plohl@norik.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_tlv320aic3110
+
+#include <errno.h>
+
+#include <zephyr/sys/util.h>
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/audio/codec.h>
+#include <zephyr/drivers/clock_control.h>
+#include "tlv320aic3110.h"
+
+#define LOG_LEVEL CONFIG_AUDIO_CODEC_LOG_LEVEL
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(tlv320aic3110);
+
+#define CODEC_OUTPUT_VOLUME_MAX 0
+#define CODEC_OUTPUT_VOLUME_MIN (-78 * 2)
+
+struct codec_driver_config {
+	struct i2c_dt_spec bus;
+	int clock_source;
+	const struct device *mclk_dev;
+	clock_control_subsys_t mclk_name;
+};
+
+struct codec_driver_data {
+	struct reg_addr reg_addr_cache;
+};
+
+static void codec_write_reg(const struct device *dev, struct reg_addr reg, uint8_t val);
+static void codec_read_reg(const struct device *dev, struct reg_addr reg, uint8_t *val);
+static void codec_update_reg(const struct device *dev, struct reg_addr reg, uint8_t mask,
+			     uint8_t val);
+static void codec_soft_reset(const struct device *dev);
+static int codec_configure_dai(const struct device *dev, audio_dai_cfg_t *cfg);
+static int codec_configure_clocks(const struct device *dev, struct audio_codec_cfg *cfg);
+static int codec_configure_filters(const struct device *dev, audio_dai_cfg_t *cfg);
+static void codec_configure_output(const struct device *dev);
+static void codec_configure_input(const struct device *dev);
+static int codec_set_output_volume(const struct device *dev, audio_channel_t channel, int vol);
+
+#if (LOG_LEVEL >= LOG_LEVEL_DEBUG)
+static void codec_read_all_regs(const struct device *dev);
+#define CODEC_DUMP_REGS(dev) codec_read_all_regs((dev))
+#else
+#define CODEC_DUMP_REGS(dev)
+#endif
+
+static int codec_configure(const struct device *dev, struct audio_codec_cfg *cfg)
+{
+	int ret;
+
+	if (cfg->dai_type != AUDIO_DAI_TYPE_I2S) {
+		LOG_ERR("dai_type must be AUDIO_DAI_TYPE_I2S");
+		return -EINVAL;
+	}
+
+	codec_soft_reset(dev);
+
+	ret = codec_configure_clocks(dev, cfg);
+	if (ret) {
+		LOG_ERR("Failed to configure clocks: %d", ret);
+		return ret;
+	}
+
+	ret = codec_configure_dai(dev, &cfg->dai_cfg);
+	if (ret) {
+		LOG_ERR("Failed to configure DAI: %d", ret);
+		return ret;
+	}
+
+	ret = codec_configure_filters(dev, &cfg->dai_cfg);
+	if (ret) {
+		LOG_ERR("Failed to configure filters: %d", ret);
+		return ret;
+	}
+
+	codec_configure_input(dev);
+	codec_configure_output(dev);
+
+	return ret;
+}
+
+static void codec_start_output(const struct device *dev)
+{
+	/* powerup DAC channels */
+	codec_write_reg(dev, DATA_PATH_SETUP_ADDR, DAC_LR_POWERUP_DEFAULT);
+
+	/* unmute DAC channels */
+	codec_write_reg(dev, VOL_CTRL_ADDR, VOL_CTRL_UNMUTE_DEFAULT);
+
+	CODEC_DUMP_REGS(dev);
+}
+
+static void codec_stop_output(const struct device *dev)
+{
+	/* mute DAC channels */
+	codec_write_reg(dev, VOL_CTRL_ADDR, VOL_CTRL_MUTE_DEFAULT);
+
+	/* powerdown DAC channels */
+	codec_write_reg(dev, DATA_PATH_SETUP_ADDR, DAC_LR_POWERDN_DEFAULT);
+}
+
+static void codec_mute_output(const struct device *dev, audio_channel_t channel, bool mute)
+{
+	/* mute channel */
+	switch (channel) {
+	case AUDIO_CHANNEL_HEADPHONE_LEFT:
+		/**/
+		codec_update_reg(dev, HPL_DRV_GAIN_CTRL_ADDR, HPX_DRV_UNMUTE,
+				 (mute << 2) | HPX_DRV_RESERVED);
+		break;
+
+	case AUDIO_CHANNEL_HEADPHONE_RIGHT:
+		codec_update_reg(dev, HPR_DRV_GAIN_CTRL_ADDR, HPX_DRV_UNMUTE,
+				 (mute << 2) | HPX_DRV_RESERVED);
+		break;
+
+	case AUDIO_CHANNEL_FRONT_LEFT:
+		codec_update_reg(dev, SPL_DRV_GAIN_CTRL_ADDR, SPX_DRV_UNMUTE, mute << 2);
+		break;
+
+	case AUDIO_CHANNEL_FRONT_RIGHT:
+		codec_update_reg(dev, SPR_DRV_GAIN_CTRL_ADDR, SPX_DRV_UNMUTE, mute << 2);
+		break;
+
+	case AUDIO_CHANNEL_ALL:
+		codec_update_reg(dev, HPL_DRV_GAIN_CTRL_ADDR, HPX_DRV_UNMUTE,
+				 (mute << 2) | HPX_DRV_RESERVED);
+		codec_update_reg(dev, HPR_DRV_GAIN_CTRL_ADDR, HPX_DRV_UNMUTE,
+				 (mute << 2) | HPX_DRV_RESERVED);
+		codec_update_reg(dev, SPL_DRV_GAIN_CTRL_ADDR, SPX_DRV_UNMUTE, mute << 2);
+		codec_update_reg(dev, SPR_DRV_GAIN_CTRL_ADDR, SPX_DRV_UNMUTE, mute << 2);
+		break;
+
+	default:
+		LOG_ERR("channel %u invalid.", channel);
+		break;
+	}
+}
+
+static int codec_set_property(const struct device *dev, audio_property_t property,
+			      audio_channel_t channel, audio_property_value_t val)
+{
+	switch (property) {
+	case AUDIO_PROPERTY_OUTPUT_VOLUME:
+		return codec_set_output_volume(dev, channel, val.vol);
+
+	case AUDIO_PROPERTY_OUTPUT_MUTE:
+		codec_mute_output(dev, channel, !val.mute);
+		return 0;
+
+	default:
+		break;
+	}
+
+	return -EINVAL;
+}
+
+static int codec_apply_properties(const struct device *dev)
+{
+	/* nothing to do because there is nothing cached */
+	return 0;
+}
+
+static void codec_write_reg(const struct device *dev, struct reg_addr reg, uint8_t val)
+{
+	struct codec_driver_data *const dev_data = dev->data;
+	const struct codec_driver_config *const dev_cfg = dev->config;
+
+	/* set page if different */
+	if (dev_data->reg_addr_cache.page != reg.page) {
+		i2c_reg_write_byte_dt(&dev_cfg->bus, 0, reg.page);
+		dev_data->reg_addr_cache.page = reg.page;
+	}
+
+	i2c_reg_write_byte_dt(&dev_cfg->bus, reg.reg_addr, val);
+	LOG_DBG("WR PG:%u REG:%02u VAL:0x%02x", reg.page, reg.reg_addr, val);
+}
+
+static void codec_read_reg(const struct device *dev, struct reg_addr reg, uint8_t *val)
+{
+	struct codec_driver_data *const dev_data = dev->data;
+	const struct codec_driver_config *const dev_cfg = dev->config;
+
+	/* set page if different */
+	if (dev_data->reg_addr_cache.page != reg.page) {
+		i2c_reg_write_byte_dt(&dev_cfg->bus, 0, reg.page);
+		dev_data->reg_addr_cache.page = reg.page;
+	}
+
+	i2c_reg_read_byte_dt(&dev_cfg->bus, reg.reg_addr, val);
+	LOG_DBG("RD PG:%u REG:%02u VAL:0x%02x", reg.page, reg.reg_addr, *val);
+}
+
+static void codec_update_reg(const struct device *dev, struct reg_addr reg, uint8_t mask,
+			     uint8_t val)
+{
+	uint8_t reg_val;
+
+	codec_read_reg(dev, reg, &reg_val);
+	reg_val = (reg_val & ~mask) | (val & mask);
+	codec_write_reg(dev, reg, reg_val);
+}
+
+static void codec_soft_reset(const struct device *dev)
+{
+	/* soft reset the AIC */
+	codec_write_reg(dev, SOFT_RESET_ADDR, SOFT_RESET_ASSERT);
+}
+
+static int codec_configure_dai(const struct device *dev, audio_dai_cfg_t *cfg)
+{
+	uint8_t val;
+
+	/* configure I2S interface */
+	val = IF_CTRL_IFTYPE(IF_CTRL_IFTYPE_I2S);
+	if (cfg->i2s.options & I2S_OPT_BIT_CLK_MASTER) {
+		val |= IF_CTRL_BCLK_OUT;
+	}
+
+	if (cfg->i2s.options & I2S_OPT_FRAME_CLK_MASTER) {
+		val |= IF_CTRL_WCLK_OUT;
+	}
+
+	switch (cfg->i2s.word_size) {
+	case AUDIO_PCM_WIDTH_16_BITS:
+		val |= IF_CTRL_WLEN(IF_CTRL_WLEN_16);
+		break;
+	case AUDIO_PCM_WIDTH_20_BITS:
+		val |= IF_CTRL_WLEN(IF_CTRL_WLEN_20);
+		break;
+	case AUDIO_PCM_WIDTH_24_BITS:
+		val |= IF_CTRL_WLEN(IF_CTRL_WLEN_24);
+		break;
+	case AUDIO_PCM_WIDTH_32_BITS:
+		val |= IF_CTRL_WLEN(IF_CTRL_WLEN_32);
+		break;
+	default:
+		LOG_ERR("Unsupported PCM sample bit width %u", cfg->i2s.word_size);
+		return -EINVAL;
+	}
+
+	codec_write_reg(dev, IF_CTRL1_ADDR, val);
+	return 0;
+}
+
+static int codec_configure_clocks(const struct device *dev, struct audio_codec_cfg *cfg)
+{
+	struct i2s_config *i2s;
+	const struct codec_driver_config *const dev_cfg = dev->config;
+	uint32_t rate;
+	int madc, nadc, aosr, mdac, ndac, dosr, bclk_div, mclk_div;
+	int p, r, j, d;
+	int i, ret;
+
+	i2s = &cfg->dai_cfg.i2s;
+
+	/* get MCLK rate */
+	if (dev_cfg->clock_source == 0) {
+		ret = clock_control_get_rate(dev_cfg->mclk_dev, dev_cfg->mclk_name,
+					     &cfg->mclk_freq);
+		if (ret < 0) {
+			LOG_ERR("MCLK clock source freq acquire fail: %d", ret);
+		}
+	}
+
+	LOG_DBG("MCLK %u Hz Sampling Rate: %u Hz", cfg->mclk_freq, i2s->frame_clk_freq);
+
+	/* use pll div table to get all values */
+	rate = i2s->frame_clk_freq;
+	for (i = 0; i < ARRAY_SIZE(pll_div_table); i++) {
+		if (rate == pll_div_table[i].rate && cfg->mclk_freq == pll_div_table[i].mclk) {
+			break;
+		}
+	}
+
+	if (i == ARRAY_SIZE(pll_div_table)) {
+		LOG_ERR("Unable to find PLL dividers for MCLK %u Hz PCM Rate: %u Hz",
+			cfg->mclk_freq, i2s->frame_clk_freq);
+		return -EINVAL;
+	}
+
+	p = pll_div_table[i].pll_p;
+	r = 1;
+	j = pll_div_table[i].pll_j;
+	d = pll_div_table[i].pll_d;
+
+	/* set the dividers */
+	codec_write_reg(dev, PLL_P_R_ADDR, (1 << 7) | PLL_P(p) | PLL_R(r));
+	codec_write_reg(dev, PLL_J_ADDR, j);
+	codec_write_reg(dev, PLL_D_MSB_ADDR, (uint8_t)(d >> 8));
+	codec_write_reg(dev, PLL_D_LSB_ADDR, (uint8_t)(d & 0xFF));
+
+	madc = pll_div_table[i].madc;
+	nadc = pll_div_table[i].nadc;
+	aosr = pll_div_table[i].aosr;
+
+	ndac = pll_div_table[i].ndac;
+	mdac = pll_div_table[i].mdac;
+	dosr = pll_div_table[i].dosr;
+
+	LOG_DBG("PLLP: %u PLLJ: %u PLLD: %u", pll_div_table[i].pll_p, pll_div_table[i].pll_j,
+		pll_div_table[i].pll_d);
+	LOG_DBG("MDAC: %u NDAC: %u DOSR: %u", mdac, ndac, dosr);
+	LOG_DBG("MADC: %u NADC: %u AOSR: %u", madc, nadc, aosr);
+
+	if (i2s->options & I2S_OPT_BIT_CLK_MASTER) {
+		bclk_div = dosr * mdac / (i2s->word_size * 2U); /* stereo */
+		if ((bclk_div * i2s->word_size * 2) != (dosr * mdac)) {
+			LOG_ERR("Unable to generate BCLK %u from MCLK %u",
+				i2s->frame_clk_freq * i2s->word_size * 2U, cfg->mclk_freq);
+			return -EINVAL;
+		}
+		LOG_DBG("I2S Master BCLKDIV: %u", bclk_div);
+		codec_write_reg(dev, BCLK_DIV_ADDR, BCLK_DIV_POWER_UP | BCLK_DIV(bclk_div));
+	}
+
+	/* Set clock gen mux and turn on PLL */
+	codec_write_reg(dev, CLOCK_GEN_MUX_ADDR, CLOCK_GEN_MUX_DEFAULT);
+	codec_update_reg(dev, PLL_P_R_ADDR, PLL_POWER_UP, PLL_POWER_UP);
+
+	/* set NDAC, then MDAC, followed by OSR */
+	codec_write_reg(dev, NDAC_DIV_ADDR, (uint8_t)(NDAC_DIV(ndac) | NDAC_POWER_UP_MASK));
+	codec_write_reg(dev, MDAC_DIV_ADDR, (uint8_t)(MDAC_DIV(mdac) | MDAC_POWER_UP_MASK));
+	codec_write_reg(dev, OSR_MSB_ADDR, (uint8_t)((dosr >> 8) & OSR_MSB_MASK));
+	codec_write_reg(dev, OSR_LSB_ADDR, (uint8_t)(dosr & OSR_LSB_MASK));
+
+	/* set NADC, MADC, OSR */
+	codec_write_reg(dev, NADC_DIV_ADDR, (uint8_t)(NADC_DIV(nadc) | NADC_POWER_UP_MASK));
+	codec_write_reg(dev, MADC_DIV_ADDR, (uint8_t)(MADC_DIV(madc) | MADC_POWER_UP_MASK));
+	codec_write_reg(dev, AOSR_ADDR, (uint8_t)aosr);
+
+	if (i2s->options & I2S_OPT_BIT_CLK_MASTER) {
+		codec_write_reg(dev, BCLK_DIV_ADDR, BCLK_DIV(bclk_div) | BCLK_DIV_POWER_UP);
+	}
+
+	/* calculate MCLK divider to get ~1MHz */
+	mclk_div = DIV_ROUND_UP(cfg->mclk_freq, 1000000);
+	/* setup timer clock to be MCLK divided */
+	codec_write_reg(dev, TIMER_MCLK_DIV_ADDR,
+			TIMER_MCLK_DIV_EN_EXT | TIMER_MCLK_DIV_VAL(mclk_div));
+	LOG_DBG("Timer MCLK Divider: %u", mclk_div);
+
+	return 0;
+}
+
+static int codec_configure_filters(const struct device *dev, audio_dai_cfg_t *cfg)
+{
+	enum dac_proc_block dac_proc_blk;
+	enum adc_proc_block adc_proc_blk;
+
+	/* determine decimation filter type */
+	if (cfg->i2s.frame_clk_freq >= AUDIO_PCM_RATE_192K) {
+		dac_proc_blk = PRB_P17_DECIMATION_C;
+		adc_proc_blk = PRB_R16_DECIMATION_C;
+		LOG_INF("PCM Rate: %u Filter C PRB P17/R16 selected", cfg->i2s.frame_clk_freq);
+	} else if (cfg->i2s.frame_clk_freq >= AUDIO_PCM_RATE_96K) {
+		dac_proc_blk = PRB_P7_DECIMATION_B;
+		adc_proc_blk = PRB_R10_DECIMATION_B;
+		LOG_INF("PCM Rate: %u Filter B PRB P7/R10 selected", cfg->i2s.frame_clk_freq);
+	} else {
+		dac_proc_blk = PRB_P1_DECIMATION_A;
+		adc_proc_blk = PRB_R4_DECIMATION_A;
+		LOG_INF("PCM Rate: %u Filter A PRB P1/R4 selected", cfg->i2s.frame_clk_freq);
+	}
+
+	codec_write_reg(dev, DAC_PROC_BLK_SEL_ADDR, dac_proc_blk);
+	codec_write_reg(dev, ADC_PROC_BLK_SEL_ADDR, adc_proc_blk);
+	return 0;
+}
+
+static void codec_configure_output(const struct device *dev)
+{
+	uint8_t val;
+
+	/*
+	 * set common mode voltage to 1.65V (half of AVDD)
+	 * AVDD is typically 3.3V
+	 */
+	codec_read_reg(dev, HEADPHONE_DRV_ADDR, &val);
+	val &= ~HEADPHONE_DRV_CM_MASK;
+	val |= HEADPHONE_DRV_CM(CM_VOLTAGE_1P65) | HEADPHONE_DRV_RESERVED;
+	codec_write_reg(dev, HEADPHONE_DRV_ADDR, val);
+
+	/* enable pop removal on power down/up */
+	codec_read_reg(dev, HP_OUT_POP_RM_ADDR, &val);
+	codec_write_reg(dev, HP_OUT_POP_RM_ADDR, val | HP_OUT_POP_RM_ENABLE);
+
+	/* route DAC output to mixer */
+	val = OUTPUT_ROUTING_MIXER;
+	codec_write_reg(dev, OUTPUT_ROUTING_ADDR, val);
+
+	/* enable volume control on Headphone out and Speaker out */
+	codec_write_reg(dev, HPL_ANA_VOL_CTRL_ADDR, HPX_ANA_VOL(HPX_ANA_VOL_DEFAULT));
+	codec_write_reg(dev, HPR_ANA_VOL_CTRL_ADDR, HPX_ANA_VOL(HPX_ANA_VOL_DEFAULT));
+	codec_write_reg(dev, SPL_ANA_VOL_CTRL_ADDR, SPX_ANA_VOL(SPX_ANA_VOL_DEFAULT));
+	codec_write_reg(dev, SPR_ANA_VOL_CTRL_ADDR, SPX_ANA_VOL(SPX_ANA_VOL_DEFAULT));
+
+	/* unmute headphone and speaker drivers */
+	codec_write_reg(dev, HPL_DRV_GAIN_CTRL_ADDR, HPX_DRV_UNMUTE | HPX_DRV_RESERVED);
+	codec_write_reg(dev, HPR_DRV_GAIN_CTRL_ADDR, HPX_DRV_UNMUTE | HPX_DRV_RESERVED);
+	codec_write_reg(dev, SPL_DRV_GAIN_CTRL_ADDR, SPX_DRV_UNMUTE);
+	codec_write_reg(dev, SPR_DRV_GAIN_CTRL_ADDR, SPX_DRV_UNMUTE);
+
+	/* power up headphone drivers */
+	codec_read_reg(dev, HEADPHONE_DRV_ADDR, &val);
+	val |= HEADPHONE_DRV_POWERUP | HEADPHONE_DRV_RESERVED;
+	codec_write_reg(dev, HEADPHONE_DRV_ADDR, val);
+
+	/* power up speaker drivers */
+	codec_read_reg(dev, SPEAKER_DRV_ADDR, &val);
+	val |= SPEAKER_DRV_POWERUP | SPEAKER_DRV_RESERVED;
+	codec_write_reg(dev, SPEAKER_DRV_ADDR, val);
+	LOG_INF("Headphone driver and Class-D amplifier powered up");
+}
+
+static void codec_configure_input(const struct device *dev)
+{
+	uint8_t val;
+
+	/* power up ADC channel */
+	codec_write_reg(dev, MIC_ADC_CTRL_ADDR, MIC_ADC_POWERUP);
+
+	/* set microphone bias - THIS SHOULD BE FIXED*/
+	codec_write_reg(dev, MIC_BIAS_ADDR, MICBIAS_DEFAULT);
+
+	/* unmute microphone input */
+	codec_write_reg(dev, MIC_FCTRL_ADDR, MIC_FCTRL_DEFAULT);
+
+	/* set PGA, D7 enables PGA control, D6-D0 sets volume */
+	codec_write_reg(dev, MIC_PGA_ADDR, MIC_PGA_VOL_DEFAULT);
+
+	/* select both MIC inputs for PGA and their resistance */
+	val = MIC_PGAPI_L_DEFAULT | MIC_PGAPI_R_DEFAULT;
+	codec_write_reg(dev, MIC_PGAPI_ADDR, val);
+	LOG_INF("Microphone bias and PGA configured");
+}
+
+static int codec_set_output_volume(const struct device *dev, audio_channel_t channel, int vol)
+{
+	struct reg_addr reg;
+	uint8_t vol_val;
+	int vol_index;
+	uint8_t vol_array[] = {107, 108, 110, 113, 116, 120, 125, 128, 132, 138, 144};
+
+	if ((vol > CODEC_OUTPUT_VOLUME_MAX) || (vol < CODEC_OUTPUT_VOLUME_MIN)) {
+		LOG_ERR("Invalid volume %d.%d dB", vol >> 1, ((uint32_t)vol & 1) ? 5 : 0);
+		return -EINVAL;
+	}
+
+	/* remove sign */
+	vol = -vol;
+
+	/* if volume is near floor, set minimum */
+	if (vol > HPX_ANA_VOL_FLOOR) {
+		vol_val = HPX_ANA_VOL_FLOOR;
+	} else if (vol > HPX_ANA_VOL_LOW_THRESH) {
+		/* lookup low volume values */
+		for (vol_index = 0; vol_index < ARRAY_SIZE(vol_array); vol_index++) {
+			if (vol_array[vol_index] >= vol) {
+				break;
+			}
+		}
+		vol_val = HPX_ANA_VOL_LOW_THRESH + vol_index + 1;
+	} else {
+		vol_val = (uint8_t)vol;
+	}
+	LOG_INF("Writing value to %u channel: %u", channel, vol_val);
+
+	switch (channel) {
+	case AUDIO_CHANNEL_HEADPHONE_LEFT:
+		reg = HPL_ANA_VOL_CTRL_ADDR;
+		break;
+
+	case AUDIO_CHANNEL_HEADPHONE_RIGHT:
+		reg = HPR_ANA_VOL_CTRL_ADDR;
+		break;
+
+	case AUDIO_CHANNEL_FRONT_LEFT:
+		reg = SPL_ANA_VOL_CTRL_ADDR;
+		break;
+
+	case AUDIO_CHANNEL_FRONT_RIGHT:
+		reg = SPR_ANA_VOL_CTRL_ADDR;
+		break;
+
+	case AUDIO_CHANNEL_ALL:
+		codec_write_reg(dev, HPL_ANA_VOL_CTRL_ADDR, HPX_ANA_VOL(vol_val));
+		codec_write_reg(dev, HPR_ANA_VOL_CTRL_ADDR, HPX_ANA_VOL(vol_val));
+		codec_write_reg(dev, SPL_ANA_VOL_CTRL_ADDR, SPX_ANA_VOL(vol_val));
+		codec_write_reg(dev, SPR_ANA_VOL_CTRL_ADDR, SPX_ANA_VOL(vol_val));
+		return 0;
+
+	default:
+		LOG_ERR("channel %u invalid.", channel);
+		return -EINVAL;
+	}
+
+	codec_write_reg(dev, reg, HPX_ANA_VOL(vol_val));
+	return 0;
+}
+
+#if (LOG_LEVEL >= LOG_LEVEL_DEBUG)
+static void codec_read_all_regs(const struct device *dev)
+{
+	uint8_t val;
+
+	codec_read_reg(dev, SOFT_RESET_ADDR, &val);
+	codec_read_reg(dev, PLL_P_R_ADDR, &val);
+	codec_read_reg(dev, PLL_J_ADDR, &val);
+	codec_read_reg(dev, PLL_D_MSB_ADDR, &val);
+	codec_read_reg(dev, PLL_D_LSB_ADDR, &val);
+	codec_read_reg(dev, NDAC_DIV_ADDR, &val);
+	codec_read_reg(dev, MDAC_DIV_ADDR, &val);
+	codec_read_reg(dev, OSR_MSB_ADDR, &val);
+	codec_read_reg(dev, OSR_LSB_ADDR, &val);
+	codec_read_reg(dev, NADC_DIV_ADDR, &val);
+	codec_read_reg(dev, MADC_DIV_ADDR, &val);
+	codec_read_reg(dev, AOSR_ADDR, &val);
+	codec_read_reg(dev, IF_CTRL1_ADDR, &val);
+	codec_read_reg(dev, BCLK_DIV_ADDR, &val);
+	codec_read_reg(dev, OVF_FLAG_ADDR, &val);
+	codec_read_reg(dev, DAC_PROC_BLK_SEL_ADDR, &val);
+	codec_read_reg(dev, ADC_PROC_BLK_SEL_ADDR, &val);
+	codec_read_reg(dev, DATA_PATH_SETUP_ADDR, &val);
+	codec_read_reg(dev, VOL_CTRL_ADDR, &val);
+	codec_read_reg(dev, L_DIG_VOL_CTRL_ADDR, &val);
+
+	codec_read_reg(dev, MIC_PGA_ADDR, &val);
+
+	codec_read_reg(dev, DRC_CTRL1_ADDR, &val);
+	codec_read_reg(dev, L_BEEP_GEN_ADDR, &val);
+	codec_read_reg(dev, R_BEEP_GEN_ADDR, &val);
+	codec_read_reg(dev, BEEP_LEN_MSB_ADDR, &val);
+	codec_read_reg(dev, BEEP_LEN_MIB_ADDR, &val);
+	codec_read_reg(dev, BEEP_LEN_LSB_ADDR, &val);
+
+	codec_read_reg(dev, HEADPHONE_DRV_ADDR, &val);
+	codec_read_reg(dev, HP_OUT_POP_RM_ADDR, &val);
+	codec_read_reg(dev, OUTPUT_ROUTING_ADDR, &val);
+	codec_read_reg(dev, HPL_ANA_VOL_CTRL_ADDR, &val);
+	codec_read_reg(dev, HPR_ANA_VOL_CTRL_ADDR, &val);
+	codec_read_reg(dev, HPL_DRV_GAIN_CTRL_ADDR, &val);
+	codec_read_reg(dev, HPR_DRV_GAIN_CTRL_ADDR, &val);
+	codec_read_reg(dev, HEADPHONE_DRV_CTRL_ADDR, &val);
+
+	codec_read_reg(dev, SPL_DRV_GAIN_CTRL_ADDR, &val);
+	codec_read_reg(dev, SPR_DRV_GAIN_CTRL_ADDR, &val);
+
+	codec_read_reg(dev, TIMER_MCLK_DIV_ADDR, &val);
+}
+#endif
+
+static const struct audio_codec_api codec_driver_api = {
+	.configure = codec_configure,
+	.start_output = codec_start_output,
+	.stop_output = codec_stop_output,
+	.set_property = codec_set_property,
+	.apply_properties = codec_apply_properties,
+};
+
+#define TLV320AIC3110_INIT(n)                                                                      \
+	static const struct codec_driver_config codec_device_config_##n = {                        \
+		.bus = I2C_DT_SPEC_INST_GET(n),                                                    \
+		.clock_source = 0,                                                                 \
+		.mclk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR_BY_NAME(n, mclk)),                   \
+		.mclk_name = (clock_control_subsys_t)DT_INST_CLOCKS_CELL_BY_NAME(n, mclk, name)};  \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(n, NULL, NULL, NULL, &codec_device_config_##n, POST_KERNEL,          \
+			      CONFIG_AUDIO_CODEC_INIT_PRIORITY, &codec_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(TLV320AIC3110_INIT)
diff --git a/drivers/audio/tlv320aic3110.h b/drivers/audio/tlv320aic3110.h
new file mode 100644
index 0000000000000..3f34605150f4d
--- /dev/null
+++ b/drivers/audio/tlv320aic3110.h
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2025 PHYTEC America LLC
+ * Author: Florijan Plohl <florijan.plohl@norik.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_AUDIO_TLV320DAC310X_H_
+#define ZEPHYR_DRIVERS_AUDIO_TLV320DAC310X_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Register addresses */
+#define PAGE_CONTROL_ADDR	0
+
+/* Register addresses {page, address} and fields */
+#define SOFT_RESET_ADDR		(struct reg_addr){0, 1}
+#define SOFT_RESET_ASSERT	(1)
+
+#define CLOCK_GEN_MUX_ADDR	(struct reg_addr){0, 4}
+#define CLOCK_GEN_MUX_DEFAULT	(0x3)
+
+#define PLL_P_R_ADDR		(struct reg_addr){0, 5}
+#define PLL_POWER_UP		BIT(7)
+#define PLL_POWER_UP_MASK	BIT(7)
+#define PLL_P_MASK		BIT_MASK(3)
+#define PLL_P(val)		(((val) & PLL_P_MASK) << 4)
+#define PLL_R_MASK		BIT_MASK(4)
+#define PLL_R(val)		((val) & PLL_R_MASK)
+
+#define PLL_J_ADDR		(struct reg_addr){0, 6}
+
+#define PLL_D_MSB_ADDR		(struct reg_addr){0, 7}
+#define PLL_D_LSB_ADDR		(struct reg_addr){0, 8}
+
+#define NDAC_DIV_ADDR		(struct reg_addr){0, 11}
+#define NDAC_POWER_UP		BIT(7)
+#define NDAC_POWER_UP_MASK	BIT(7)
+#define NDAC_DIV_MASK		BIT_MASK(7)
+#define NDAC_DIV(val)		((val) & NDAC_DIV_MASK)
+
+#define MDAC_DIV_ADDR		(struct reg_addr){0, 12}
+#define MDAC_POWER_UP		BIT(7)
+#define MDAC_POWER_UP_MASK	BIT(7)
+#define MDAC_DIV_MASK		BIT_MASK(7)
+#define MDAC_DIV(val)		((val) & MDAC_DIV_MASK)
+
+#define OSR_MSB_ADDR		(struct reg_addr){0, 13}
+#define OSR_MSB_MASK		BIT_MASK(2)
+
+#define OSR_LSB_ADDR		(struct reg_addr){0, 14}
+#define OSR_LSB_MASK		BIT_MASK(8)
+
+#define NADC_DIV_ADDR		(struct reg_addr){0, 18}
+#define NADC_POWER_UP		BIT(7)
+#define NADC_POWER_UP_MASK	BIT(7)
+#define NADC_DIV_MASK		BIT_MASK(7)
+#define NADC_DIV(val)		((val) & NADC_DIV_MASK)
+
+#define MADC_DIV_ADDR		(struct reg_addr){0, 19}
+#define MADC_POWER_UP		BIT(7)
+#define MADC_POWER_UP_MASK	BIT(7)
+#define MADC_DIV_MASK		BIT_MASK(7)
+#define MADC_DIV(val)		((val) & MADC_DIV_MASK)
+
+#define AOSR_ADDR		(struct reg_addr){0, 20}
+
+#define IF_CTRL1_ADDR		(struct reg_addr){0, 27}
+#define IF_CTRL_IFTYPE_MASK	BIT_MASK(1)
+#define IF_CTRL_IFTYPE_I2S	0
+#define IF_CTRL_IFTYPE_DSP	1
+#define IF_CTRL_IFTYPE_RJF	2
+#define IF_CTRL_IFTYPE_LJF	3
+#define IF_CTRL_IFTYPE(val)	(((val) & IF_CTRL_IFTYPE_MASK) << 6)
+#define IF_CTRL_WLEN_MASK	BIT_MASK(2)
+#define IF_CTRL_WLEN(val)	(((val) & IF_CTRL_WLEN_MASK) << 4)
+#define IF_CTRL_WLEN_16		0
+#define IF_CTRL_WLEN_20		1
+#define IF_CTRL_WLEN_24		2
+#define IF_CTRL_WLEN_32		3
+#define IF_CTRL_BCLK_OUT	BIT(3)
+#define IF_CTRL_WCLK_OUT	BIT(2)
+#define IF_CTRL_DOUT_HIGH_Z	BIT(0)
+
+#define BCLK_DIV_ADDR		(struct reg_addr){0, 30}
+#define BCLK_DIV_POWER_UP	BIT(7)
+#define BCLK_DIV_POWER_UP_MASK	BIT(7)
+#define BCLK_DIV_MASK		BIT_MASK(7)
+#define BCLK_DIV(val)		((val) & MDAC_DIV_MASK)
+
+#define OVF_FLAG_ADDR		(struct reg_addr){0, 39}
+
+#define DAC_PROC_BLK_SEL_ADDR	(struct reg_addr){0, 60}
+#define	DAC_PROC_BLK_SEL_MASK	BIT_MASK(5)
+#define	DAC_PROC_BLK_SEL(val)	((val) & DAC_PROC_BLK_SEL_MASK)
+
+#define ADC_PROC_BLK_SEL_ADDR	(struct reg_addr){0, 61}
+#define	ADC_PROC_BLK_SEL_MASK	BIT_MASK(5)
+#define	ADC_PROC_BLK_SEL(val)	((val) & ADC_PROC_BLK_SEL_MASK)
+
+#define DATA_PATH_SETUP_ADDR	(struct reg_addr){0, 63}
+#define DAC_LR_POWERUP_DEFAULT	(BIT(7) | BIT(6) | BIT(4) | BIT(2))
+#define DAC_LR_POWERDN_DEFAULT	(BIT(4) | BIT(2))
+
+#define VOL_CTRL_ADDR		(struct reg_addr){0, 64}
+#define VOL_CTRL_UNMUTE_DEFAULT	(0)
+#define VOL_CTRL_MUTE_DEFAULT	(BIT(3) | BIT(2))
+
+#define L_DIG_VOL_CTRL_ADDR	(struct reg_addr){0, 65}
+#define DRC_CTRL1_ADDR		(struct reg_addr){0, 68}
+#define L_BEEP_GEN_ADDR		(struct reg_addr){0, 71}
+#define BEEP_GEN_EN_BEEP	(BIT(7))
+#define R_BEEP_GEN_ADDR		(struct reg_addr){0, 72}
+#define BEEP_LEN_MSB_ADDR	(struct reg_addr){0, 73}
+#define BEEP_LEN_MIB_ADDR	(struct reg_addr){0, 74}
+#define BEEP_LEN_LSB_ADDR	(struct reg_addr){0, 75}
+
+/* Page 1 registers */
+/* Headphone driver registers */
+#define HEADPHONE_DRV_ADDR	(struct reg_addr){1, 31}
+#define HEADPHONE_DRV_POWERUP	(BIT(7) | BIT(6))
+#define HEADPHONE_DRV_CM_MASK	(BIT_MASK(2) << 3)
+#define HEADPHONE_DRV_CM(val)	(((val) << 3) & HEADPHONE_DRV_CM_MASK)
+#define HEADPHONE_DRV_RESERVED	(BIT(2))
+
+#define HP_OUT_POP_RM_ADDR	(struct reg_addr){1, 33}
+#define HP_OUT_POP_RM_ENABLE	(BIT(7))
+
+#define OUTPUT_ROUTING_ADDR	(struct reg_addr){1, 35}
+#define OUTPUT_ROUTING_HPL	BIT(7)
+#define OUTPUT_ROUTING_HPR	BIT(3)
+
+#define HPL_ANA_VOL_CTRL_ADDR	(struct reg_addr){1, 36}
+#define HPR_ANA_VOL_CTRL_ADDR	(struct reg_addr){1, 37}
+#define HPX_ANA_VOL_ENABLE	BIT(7)
+#define HPX_ANA_VOL_MASK	BIT_MASK(7)
+#define HPX_ANA_VOL(val)	(((val) & HPX_ANA_VOL_MASK) |	\
+		HPX_ANA_VOL_ENABLE)
+#define HPX_ANA_VOL_MAX		(0)
+#define HPX_ANA_VOL_DEFAULT	(0)
+#define HPX_ANA_VOL_MIN		(127)
+#define HPX_ANA_VOL_MUTE	(HPX_ANA_VOL_MIN | ~HPX_ANA_VOL_ENABLE)
+#define HPX_ANA_VOL_LOW_THRESH	(105)
+#define HPX_ANA_VOL_FLOOR	(144)
+
+#define HPL_DRV_GAIN_CTRL_ADDR	(struct reg_addr){1, 40}
+#define HPR_DRV_GAIN_CTRL_ADDR	(struct reg_addr){1, 41}
+#define	HPX_DRV_UNMUTE		(BIT(2))
+#define HPX_DRV_RESERVED	(BIT(1)) /* Write only 1 */
+
+#define HEADPHONE_DRV_CTRL_ADDR	(struct reg_addr){1, 44}
+#define HEADPHONE_DRV_LINEOUT	(BIT(1) | BIT(2))
+
+/* Class-D speaker amplifier registers */
+#define SPEAKER_DRV_ADDR	(struct reg_addr){1, 32}
+#define SPEAKER_DRV_POWERUP	BIT(7) | BIT(6)
+#define SPEAKER_DRV_RESERVED	BIT(2) | BIT(1)
+
+#define OUTPUT_ROUTING_MIXER	BIT(6) | BIT(2)
+
+#define SPL_ANA_VOL_CTRL_ADDR	(struct reg_addr){1, 38}
+#define SPR_ANA_VOL_CTRL_ADDR	(struct reg_addr){1, 39}
+#define SPX_ANA_VOL_ENABLE	BIT(7)
+#define SPX_ANA_VOL_MASK	(BIT_MASK(7))
+#define SPX_ANA_VOL(val)	(((val) & SPX_ANA_VOL_MASK) |	\
+		SPX_ANA_VOL_ENABLE)
+#define SPX_ANA_VOL_MAX		(0)
+#define SPX_ANA_VOL_DEFAULT	(0)
+#define SPX_ANA_VOL_MIN		(127)
+#define SPX_ANA_VOL_MUTE	(SPX_ANA_VOL_MIN | ~SPX_ANA_VOL_ENABLE)
+#define SPX_ANA_VOL_LOW_THRESH	(105)
+#define SPX_ANA_VOL_FLOOR	(144)
+
+#define SPL_DRV_GAIN_CTRL_ADDR	(struct reg_addr){1, 42}
+#define SPR_DRV_GAIN_CTRL_ADDR	(struct reg_addr){1, 43}
+#define	SPX_DRV_UNMUTE		(BIT(2))
+#define	SPX_DRV_RESERVED	(BIT(1)) /* Write only 0 */
+
+/* ADC Mic registers */
+#define MIC_ADC_CTRL_ADDR	(struct reg_addr){0, 81}
+#define MIC_ADC_POWERUP		BIT(7)
+#define MIC_ADC_FLAG_ADDR	(struct reg_addr){0, 36}
+
+#define MIC_FCTRL_ADDR		(struct reg_addr){0, 82}
+#define MIC_FCTRL_DEFAULT	0x0
+
+#define MIC_CCTRL_ADDR		(struct reg_addr){0, 83}
+#define MIC_CCTRL_DEFAULT	0x0
+
+#define MIC_BIAS_ADDR		(struct reg_addr){1, 46}
+#define MICBIAS_DEFAULT		(BIT(3) | BIT(1))
+
+#define MIC_PGA_ADDR		(struct reg_addr){1, 47} /* Missing in datasheet */
+#define MIC_PGA_VOL_DEFAULT	0x0 /* 0.5 dB/bit, max volume: 59.5 dB */
+#define MIC_PGAPI_ADDR		(struct reg_addr){1, 48}
+#define MIC_PGAPI_L_DEFAULT	(BIT(7) | BIT(6))
+#define MIC_PGAPI_R_DEFAULT	(BIT(5) | BIT(4))
+#define MIC_PGAMI_ADDR		(struct reg_addr){1, 49}
+#define MIC_ICM_ADDR		(struct reg_addr){1, 50}
+
+/* Page 3 registers */
+#define TIMER_MCLK_DIV_ADDR	(struct reg_addr){3, 16}
+#define TIMER_MCLK_DIV_EN_EXT	(BIT(7))
+#define TIMER_MCLK_DIV_MASK	(BIT_MASK(7))
+#define TIMER_MCLK_DIV_VAL(val)	((val) & TIMER_MCLK_DIV_MASK)
+
+struct reg_addr {
+	uint8_t page; /* page number */
+	uint8_t reg_addr; /* register address */
+};
+
+enum dac_proc_block {
+	PRB_P1_DECIMATION_A = 1,
+	PRB_P7_DECIMATION_B = 7,
+	PRB_P17_DECIMATION_C = 17,
+};
+
+enum adc_proc_block {
+	PRB_R4_DECIMATION_A = 4,
+	PRB_R10_DECIMATION_B = 10,
+	PRB_R16_DECIMATION_C = 16,
+};
+
+enum cm_voltage {
+	CM_VOLTAGE_1P35 = 0,
+	CM_VOLTAGE_1P5 = 1,
+	CM_VOLTAGE_1P65 = 2,
+	CM_VOLTAGE_1P8 = 3,
+};
+
+struct tlv320aic3110_rate_divs {
+	uint32_t mclk;
+	uint32_t rate;
+	uint8_t pll_p;
+	uint8_t pll_j;
+	uint16_t pll_d;
+	uint8_t dosr;
+	uint8_t ndac;
+	uint8_t mdac;
+	uint8_t aosr;
+	uint8_t nadc;
+	uint8_t madc;
+};
+
+/* PLL configurations */
+static const struct tlv320aic3110_rate_divs pll_div_table[] = {
+	/* mclk rate pll: p j d dosr ndac mdac aors nadc madc */
+	/* 8k rate */
+	{12000000, 8000, 1, 8, 1920, 128, 48, 2, 128, 48, 2},
+	{24000000, 8000, 2, 8, 1920, 128, 48, 2, 128, 48, 2},
+	{25000000, 8000, 2, 7, 8643, 128, 48, 2, 128, 48, 2},
+	/* 11.025k rate */
+	{12000000, 11025, 1, 7, 5264, 128, 32, 2, 128, 32, 2},
+	{24000000, 11025, 2, 7, 5264, 128, 32, 2, 128, 32, 2},
+	{25000000, 11025, 2, 7, 2253, 128, 32, 2, 128, 32, 2},
+	/* 16k rate */
+	{12000000, 16000, 1, 8, 1920, 128, 24, 2, 128, 24, 2},
+	{24000000, 16000, 2, 8, 1920, 128, 24, 2, 128, 24, 2},
+	{25000000, 16000, 2, 7, 8643, 128, 24, 2, 128, 24, 2},
+	/* 22.05k rate */
+	{12000000, 22050, 1, 7, 5264, 128, 16, 2, 128, 16, 2},
+	{24000000, 22050, 2, 7, 5264, 128, 16, 2, 128, 16, 2},
+	{25000000, 22050, 2, 7, 2253, 128, 16, 2, 128, 16, 2},
+	/* 32k rate */
+	{12000000, 32000, 1, 8, 1920, 128, 12, 2, 128, 12, 2},
+	{24000000, 32000, 2, 8, 1920, 128, 12, 2, 128, 12, 2},
+	{25000000, 32000, 2, 7, 8643, 128, 12, 2, 128, 12, 2},
+	/* 44.1k rate */
+	{12000000, 44100, 1, 7, 5264, 128, 8, 2, 128, 8, 2},
+	{24000000, 44100, 2, 7, 5264, 128, 8, 2, 128, 8, 2},
+	{25000000, 44100, 2, 7, 2253, 128, 8, 2, 128, 8, 2},
+	/* 48k rate */
+	{12000000, 48000, 1, 8, 1920, 128, 8, 2, 128, 8, 2},
+	{24000000, 48000, 2, 8, 1920, 128, 8, 2, 128, 8, 2},
+	{25000000, 48000, 2, 7, 8643, 128, 8, 2, 128, 8, 2},
+	/* 88.2k rate */
+	{12000000, 88200, 1, 7, 5264, 64, 8, 2, 64, 8, 2},
+	{24000000, 88200, 2, 7, 5264, 64, 8, 2, 64, 8, 2},
+	{25000000, 88200, 2, 7, 2253, 64, 8, 2, 64, 8, 2},
+	/* 96k rate */
+	{12000000, 96000, 1, 8, 1920, 64, 8, 2, 64, 8, 2},
+	{24000000, 96000, 2, 8, 1920, 64, 8, 2, 64, 8, 2},
+	{25000000, 96000, 2, 7, 8643, 64, 8, 2, 64, 8, 2},
+	/* 176.4k rate */
+	{12000000, 176400, 1, 7, 5264, 32, 8, 2, 32, 8, 2},
+	{24000000, 176400, 2, 7, 5264, 32, 8, 2, 32, 8, 2},
+	{25000000, 176400, 2, 7, 2253, 32, 8, 2, 32, 8, 2},
+	/* 192k rate */
+	{12000000, 192000, 1, 8, 1920, 32, 8, 2, 32, 8, 2},
+	{24000000, 192000, 2, 8, 1920, 32, 8, 2, 32, 8, 2},
+	{25000000, 192000, 2, 7, 8643, 32, 8, 2, 32, 8, 2},
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_DRIVERS_AUDIO_TLV320DAC310X_H_ */
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index 8cfe9db900aa7..29d71a220c30b 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -264,9 +264,9 @@ static int wm8904_in_update(
 static int wm8904_in_volume_config(const struct device *dev, audio_channel_t channel, int volume)
 {
 	const uint16_t val = WM8904_REGVAL_IN_VOL(0, volume);
-	const uint16_t mask = WM8904_REGMASK_IN_MUTE;
+	const uint16_t mask = WM8904_REGMASK_IN_VOLUME;
 
-	return wm8904_in_update(dev, channel, val, mask);
+	return wm8904_in_update(dev, channel, mask, val);
 }
 
 static int wm8904_in_mute_config(const struct device *dev, audio_channel_t channel, bool mute)
@@ -274,7 +274,7 @@ static int wm8904_in_mute_config(const struct device *dev, audio_channel_t chann
 	const uint16_t val = WM8904_REGVAL_IN_VOL(mute, 0);
 	const uint16_t mask = WM8904_REGMASK_IN_MUTE;
 
-	return wm8904_in_update(dev, channel, val, mask);
+	return wm8904_in_update(dev, channel, mask, val);
 }
 
 static int wm8904_route_input(const struct device *dev, audio_channel_t channel, uint32_t input)
diff --git a/drivers/audio/wm8904.h b/drivers/audio/wm8904.h
index da01fb00df1f7..1224ee7f84bc2 100644
--- a/drivers/audio/wm8904.h
+++ b/drivers/audio/wm8904.h
@@ -102,7 +102,7 @@
  * [1:0] - x_MODE: Input mode
  */
 #define WM8904_REGVAL_INSEL(cm, nin, pin, mode) \
-	(((cm) & 0b1) << 6) | (((nin) & 0b11) << 4)
+	(((cm) & 0b1) << 6) | (((nin) & 0b11) << 4) | (((pin) & 0b11) << 2)
 #define WM8904_REGMASK_INSEL_CMENA		0b01000000
 #define WM8904_REGMASK_INSEL_IP_SEL_N	0b00110000
 #define WM8904_REGMASK_INSEL_IP_SEL_P	0b00001100
diff --git a/drivers/bbram/CMakeLists.txt b/drivers/bbram/CMakeLists.txt
index 9027ab548b382..87a41054ce8a8 100644
--- a/drivers/bbram/CMakeLists.txt
+++ b/drivers/bbram/CMakeLists.txt
@@ -17,3 +17,4 @@ zephyr_library_sources_ifdef(CONFIG_BBRAM_MICROCHIP_MCP7940N bbram_microchip_mcp
 zephyr_library_sources_ifdef(CONFIG_BBRAM_MICROCHIP_MCP7940N_EMUL bbram_microchip_mcp7940n_emul.c)
 zephyr_library_sources_ifdef(CONFIG_BBRAM_XEC bbram_xec.c)
 zephyr_library_sources_ifdef(CONFIG_BBRAM_STM32 bbram_stm32.c)
+zephyr_library_sources_ifdef(CONFIG_BBRAM_RTS5912 bbram_rts5912.c)
diff --git a/drivers/bbram/Kconfig b/drivers/bbram/Kconfig
index 011c90e03de19..5c2bb6bc4a1d6 100644
--- a/drivers/bbram/Kconfig
+++ b/drivers/bbram/Kconfig
@@ -42,4 +42,6 @@ source "drivers/bbram/Kconfig.xec"
 
 source "drivers/bbram/Kconfig.stm32"
 
+source "drivers/bbram/Kconfig.rts5912"
+
 endif # BBRAM
diff --git a/drivers/bbram/Kconfig.npcx b/drivers/bbram/Kconfig.npcx
index e529022213ec3..d5190d7d805d9 100644
--- a/drivers/bbram/Kconfig.npcx
+++ b/drivers/bbram/Kconfig.npcx
@@ -15,3 +15,12 @@ config BBRAM_NPCX_EMUL
 	depends on EMUL
 	help
 	  Enable the emulator for the NPCX BBRAM.
+
+config BBRAM_NPCX_STATUS_REG_WRITE_WORKAROUND
+	bool
+	default y if SOC_SERIES_NPCX4
+	help
+	  Workaround the issue documented in NPCX49nF errata rev1_5, No.2.30.
+	  A write operation to the BKUP_STS register might disable write to all
+	  the Battery-Backed RAM. The workaround is to read the BKUP_STS
+	  register after every write to this register.
diff --git a/drivers/bbram/Kconfig.rts5912 b/drivers/bbram/Kconfig.rts5912
new file mode 100644
index 0000000000000..8291b3cebca7b
--- /dev/null
+++ b/drivers/bbram/Kconfig.rts5912
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+config BBRAM_RTS5912
+	bool "Realtek RTS5912 Battery-backed RAM drivers"
+	default y
+	depends on DT_HAS_REALTEK_RTS5912_BBRAM_ENABLED
+	help
+	  This option enables the BBRAM driver for Realtek RTS5912 of processors.
diff --git a/drivers/bbram/bbram_npcx.c b/drivers/bbram/bbram_npcx.c
index c40a577fabfce..d085633fe83c7 100644
--- a/drivers/bbram/bbram_npcx.c
+++ b/drivers/bbram/bbram_npcx.c
@@ -35,6 +35,12 @@ static int get_bit_and_reset(const struct device *dev, int mask)
 	DRV_STATUS(dev) &= ~mask;
 #else
 	DRV_STATUS(dev) = mask;
+
+	if (IS_ENABLED(CONFIG_BBRAM_NPCX_STATUS_REG_WRITE_WORKAROUND)) {
+		uint8_t __unused read_unused;
+
+		read_unused = DRV_STATUS(dev);
+	}
 #endif
 
 	return result;
@@ -72,7 +78,6 @@ static int bbram_npcx_read(const struct device *dev, size_t offset, size_t size,
 		return -EINVAL;
 	}
 
-
 	bytecpy(data, ((uint8_t *)config->base_addr + offset), size);
 	return 0;
 }
diff --git a/drivers/bbram/bbram_rts5912.c b/drivers/bbram/bbram_rts5912.c
new file mode 100644
index 0000000000000..8616d60913fc0
--- /dev/null
+++ b/drivers/bbram/bbram_rts5912.c
@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Elmo Lan <elmo_lan@realtek.com>
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_bbram
+
+#include <zephyr/drivers/bbram.h>
+#include <errno.h>
+#include <zephyr/sys/util.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(rts5912_bbram, CONFIG_BBRAM_LOG_LEVEL);
+
+struct bbram_rts5912_config {
+	uintptr_t base;
+	int size;
+};
+
+static int bbram_rts5912_get_size(const struct device *dev, size_t *size)
+{
+	const struct bbram_rts5912_config *config = dev->config;
+
+	*size = config->size;
+	LOG_INF("size: 0x%08x", *size);
+	return 0;
+}
+
+static int bbram_rts5912_read(const struct device *dev, size_t offset, size_t size, uint8_t *data)
+{
+	const struct bbram_rts5912_config *config = dev->config;
+
+	uint32_t word;
+	size_t start_offset, bytes_to_read;
+
+	if (size < 1 || offset + size > config->size) {
+		LOG_ERR("Invalid params");
+		return -EFAULT;
+	}
+
+	/* The bbram in RTS5912 only accepts word-access.
+	 * Read it as a word, then split it into bytes.
+	 */
+	for (int i = 0; i < size;) {
+		word = *(uint32_t *)(config->base + ROUND_DOWN((offset + i), 4));
+		start_offset = (offset + i) % 4;
+		bytes_to_read = MIN(4 - start_offset, size - i);
+		memcpy(&data[i], ((uint8_t *)&word) + start_offset, bytes_to_read);
+		i += bytes_to_read;
+	}
+
+	return 0;
+}
+
+static int bbram_rts5912_write(const struct device *dev, size_t offset, size_t size,
+			       const uint8_t *data)
+{
+	const struct bbram_rts5912_config *config = dev->config;
+
+	uint32_t word;
+	size_t start_offset, bytes_to_write;
+
+	if (size < 1 || offset + size > config->size) {
+		LOG_ERR("Invalid params");
+		return -EFAULT;
+	}
+
+	/* The BBRAM in RTS5912 only accepts word-access. Read it as a word,
+	 * then modify the byte field, and finally write it back as a word
+	 */
+	for (int i = 0; i < size;) {
+		word = *(uint32_t *)(config->base + ROUND_DOWN((offset + i), 4));
+		start_offset = (offset + i) % 4;
+		bytes_to_write = MIN(4 - start_offset, size - i);
+		memcpy(((uint8_t *)&word) + start_offset, &data[i], bytes_to_write);
+		*(uint32_t *)(config->base + ROUND_DOWN((offset + i), 4)) = word;
+		i += bytes_to_write;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(bbram, bbram_rts5912_driver_api) = {
+	.get_size = bbram_rts5912_get_size,
+	.read = bbram_rts5912_read,
+	.write = bbram_rts5912_write,
+};
+
+#define BBRAM_INIT(inst)                                                                           \
+	static const struct bbram_rts5912_config bbram_cfg_##inst = {                              \
+		.base = DT_INST_REG_ADDR(inst),                                                    \
+		.size = DT_INST_REG_SIZE(inst),                                                    \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, NULL, &bbram_cfg_##inst, PRE_KERNEL_1,             \
+			      CONFIG_BBRAM_INIT_PRIORITY, &bbram_rts5912_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(BBRAM_INIT);
diff --git a/drivers/bluetooth/hci/CMakeLists.txt b/drivers/bluetooth/hci/CMakeLists.txt
index 845c7cd2aa2ec..35c97fa79b87c 100644
--- a/drivers/bluetooth/hci/CMakeLists.txt
+++ b/drivers/bluetooth/hci/CMakeLists.txt
@@ -25,6 +25,10 @@ if(CONFIG_DT_HAS_INFINEON_CAT1_BLESS_HCI_ENABLED)
   zephyr_blobs_verify(MODULE hal_infineon REQUIRED)
 endif()
 
+if(CONFIG_DT_HAS_RENESAS_BT_HCI_DA1469X_ENABLED)
+  zephyr_blobs_verify(MODULE hal_renesas REQUIRED)
+endif()
+
 endif() # CONFIG_BUILD_ONLY_NO_BLOBS
 
 zephyr_library_sources_ifdef(CONFIG_BT_ESP32       hci_esp32.c)
@@ -38,7 +42,6 @@ zephyr_library_sources_ifdef(CONFIG_BT_CYW208XX  hci_ifx_cyw208xx.c)
 zephyr_library_sources_ifdef(CONFIG_BT_STM32_IPM   ipm_stm32wb.c)
 zephyr_library_sources_ifdef(CONFIG_BT_STM32WBA    hci_stm32wba.c)
 zephyr_library_sources_ifdef(CONFIG_BT_STM32WB0    hci_stm32wb0.c)
-zephyr_library_sources_ifdef(CONFIG_BT_USERCHAN    userchan.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SILABS_EFR32 hci_silabs_efr32.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SILABS_SIWX91X hci_silabs_siwx91x.c)
 zephyr_library_sources_ifdef(CONFIG_BT_PSOC6_BLESS hci_ifx_psoc6_bless.c)
@@ -48,3 +51,12 @@ zephyr_library_sources_ifdef(CONFIG_BT_DA1453X     hci_da1453x.c)
 zephyr_library_sources_ifdef(CONFIG_BT_DA1469X     hci_da1469x.c)
 zephyr_library_sources_ifdef(CONFIG_BT_NXP         hci_nxp.c)
 zephyr_library_sources_ifdef(CONFIG_BT_H4_NXP_CTLR hci_nxp_setup.c)
+
+if(CONFIG_BT_USERCHAN)
+  zephyr_library_sources(userchan.c)
+  if (CONFIG_NATIVE_LIBRARY)
+    target_sources(native_simulator INTERFACE userchan_bottom.c)
+  else()
+    zephyr_library_sources(userchan_bottom.c)
+  endif()
+endif()
diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
index 3ac7554347cc8..0e4b2a6c38a60 100644
--- a/drivers/bluetooth/hci/Kconfig
+++ b/drivers/bluetooth/hci/Kconfig
@@ -40,6 +40,32 @@ config BT_HCI_IPC
 	  Bluetooth HCI driver for communication with another CPU
 	  using the IPC subsystem.
 
+config BT_HCI_IPC_SEND_RETRY_COUNT
+	int "HCI IPC send retry count"
+	depends on BT_HCI_IPC
+	default 3
+	help
+	  Number of times to retry sending a message via IPC.
+	  The retries occur in case of a failure to send a message
+	  through IPC (-ENOMEM returned by ipc_service_send).
+
+config BT_HCI_IPC_SEND_RETRY_DELAY_US
+	int "HCI IPC send retry delay (us)"
+	depends on BT_HCI_IPC
+	default 75
+	help
+	  Delay in microseconds between retries when sending a message via IPC.
+	  When a single tick (CONFIG_SYS_CLOCK_TICKS_PER_SEC) is bigger then
+	  the retry delay the k_busy_wait function is used. Set with care.
+
+config BT_HCI_IPC_ENDPOINT_BOUND_TIMEOUT_MS
+	int "HCI IPC binding timeout value in milliseconds"
+	depends on BT_HCI_IPC
+	default 2000
+	help
+	  Timeout value that HCI will wait for an IPC endpoint to be bound,
+	  in milliseconds.
+
 config BT_SPI
 	bool
 	select SPI
@@ -55,6 +81,16 @@ config BT_SPI_INIT_PRIORITY
 	depends on BT_SPI
 	default 75
 
+config BT_SPI_BOOT_TIMEOUT_SEC
+	int "Seconds to wait for SPI device to report ready"
+	depends on BT_SPI_ZEPHYR || BT_SPI_BLUENRG
+	default 30
+	help
+	  Maximum duration for a HCI SPI Controller to report ready through the
+	  Zephyr Project defined `EVT_BLUE_INITIALIZED` HCI vendor event.
+	  Default is 30 seconds to support a bootloader image swap on the
+	  Controller.
+
 config BT_SPI_ZEPHYR
 	bool
 	default y
@@ -148,15 +184,20 @@ config BT_SILABS_SIWX91X
 	help
 	  Use Silicon Labs Wiseconnect 3.x Bluetooth library to connect to the controller.
 
+	# SiWx917 BLE controller currently does not support HCI Command: Host Number of Completed Packets
+	configdefault BT_HCI_ACL_FLOW_CONTROL
+		default n if BT_SILABS_SIWX91X
+
 config BT_USERCHAN
 	bool
-	depends on (BOARD_NATIVE_POSIX || BOARD_NATIVE_SIM)
+	depends on BOARD_NATIVE_SIM
 	default y
 	depends on DT_HAS_ZEPHYR_BT_HCI_USERCHAN_ENABLED
+	select NATIVE_USE_NSI_ERRNO
 	help
 	  This driver provides access to the local Linux host's Bluetooth
 	  adapter using a User Channel HCI socket to the Linux kernel. It
-	  is only intended to be used with the native POSIX build of Zephyr.
+	  is only intended to be used with the native_sim[//64] build of Zephyr.
 	  The Bluetooth adapter must be powered off in order for Zephyr to
 	  be able to use it.
 
@@ -166,6 +207,14 @@ config BT_ESP32
 	depends on DT_HAS_ESPRESSIF_ESP32_BT_HCI_ENABLED
 	depends on ZEPHYR_HAL_ESPRESSIF_MODULE_BLOBS || BUILD_ONLY_NO_BLOBS
 	select HAS_BT_CTLR
+	select BT_CTLR_PRIVACY_SUPPORT
+	select BT_CTLR_EXT_SCAN_FP_SUPPORT
+	select BT_CTLR_DATA_LEN_UPDATE_SUPPORT
+	select BT_CTLR_ADV_EXT_SUPPORT if SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3
+	select BT_CTLR_PHY_UPDATE_SUPPORT if SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3
+	select BT_CTLR_EXT_REJ_IND_SUPPORT if SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3
+	select BT_CTLR_PHY_2M_SUPPORT if SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3
+	select BT_CTLR_CHAN_SEL_2_SUPPORT if SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3
 	help
 	  Espressif HCI bluetooth interface
 
@@ -220,6 +269,7 @@ config BT_AMBIQ_HCI
 	select GPIO if SOC_SERIES_APOLLO4X
 	select CLOCK_CONTROL if SOC_SERIES_APOLLO4X
 	select BT_HCI_SETUP
+	select AMBIQ_COMPONENT_USE_BT
 	help
 	  Supports Ambiq Bluetooth SoC using SPI as the communication protocol.
 	  HCI packets are sent and received as single Byte transfers.
diff --git a/drivers/bluetooth/hci/Kconfig.nxp b/drivers/bluetooth/hci/Kconfig.nxp
index 25cffe1f7021b..d5f72a0d72080 100644
--- a/drivers/bluetooth/hci/Kconfig.nxp
+++ b/drivers/bluetooth/hci/Kconfig.nxp
@@ -48,7 +48,10 @@ endif
 
 if BT_NXP
 
-config BT_DIS_MANUF
+config BT_DIS_MANUF_NAME
+	default y
+
+config BT_DIS_MANUF_NAME_STR
 	default "NXP"
 
 config BT_HCI_ACL_FLOW_CONTROL
@@ -68,6 +71,12 @@ endif # BT_NXP
 
 if BT_H4_NXP_CTLR
 
+choice BT_NXP_MODULE
+	# All NXP Bluetooth modules controlled by BT_H4_NXP_CTLR should be added to this section
+	# similar with BT_NXP_NW612.
+	prompt "NXP Bluetooth Module"
+	default BT_NXP_NW612
+
 config BT_NXP_NW612
 	bool "NW612 firmware for NXP IW612 Chipset"
 	help
@@ -80,4 +89,6 @@ config BT_NXP_NW612
 	  dual-band-1x1-wi-fi-6-802-11ax-plus-bluetooth-5-4-plus-802-15-4-tri-
 	  radio-solution:IW612.
 
+endchoice # BT_NXP_MODULE
+
 endif # BT_H4_NXP_CTLR
diff --git a/drivers/bluetooth/hci/apollox_blue.c b/drivers/bluetooth/hci/apollox_blue.c
index ab9abd07d4aa3..1fb2ab33fb10f 100644
--- a/drivers/bluetooth/hci/apollox_blue.c
+++ b/drivers/bluetooth/hci/apollox_blue.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(bt_apollox_driver);
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/clock_control_ambiq.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 #include "apollox_blue.h"
 #if (CONFIG_SOC_SERIES_APOLLO4X)
 #include "am_devices_cooper.h"
diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c
index 4ca495e2abe88..34dea69852f0a 100644
--- a/drivers/bluetooth/hci/h4.c
+++ b/drivers/bluetooth/hci/h4.c
@@ -193,6 +193,11 @@ static inline void copy_hdr(struct h4_data *h4)
 
 static void reset_rx(struct h4_data *h4)
 {
+	if (h4->rx.buf) {
+		net_buf_unref(h4->rx.buf);
+		h4->rx.buf = NULL;
+	}
+
 	h4->rx.type = BT_HCI_H4_NONE;
 	h4->rx.remaining = 0U;
 	h4->rx.have_hdr = false;
@@ -545,6 +550,35 @@ static int h4_open(const struct device *dev, bt_hci_recv_t recv)
 	return 0;
 }
 
+int __weak bt_hci_transport_teardown(const struct device *dev)
+{
+	return 0;
+}
+
+static int h4_close(const struct device *dev)
+{
+	const struct h4_config *cfg = dev->config;
+	struct h4_data *h4 = dev->data;
+	int err;
+
+	LOG_DBG("");
+
+	uart_irq_rx_disable(cfg->uart);
+	uart_irq_tx_disable(cfg->uart);
+
+	err = bt_hci_transport_teardown(cfg->uart);
+	if (err < 0) {
+		return err;
+	}
+
+	/* Abort RX thread */
+	k_thread_abort(cfg->rx_thread);
+
+	h4->recv = NULL;
+
+	return 0;
+}
+
 #if defined(CONFIG_BT_HCI_SETUP)
 static int h4_setup(const struct device *dev, const struct bt_hci_setup_params *params)
 {
@@ -567,6 +601,7 @@ static int h4_setup(const struct device *dev, const struct bt_hci_setup_params *
 static DEVICE_API(bt_hci, h4_driver_api) = {
 	.open = h4_open,
 	.send = h4_send,
+	.close = h4_close,
 #if defined(CONFIG_BT_HCI_SETUP)
 	.setup = h4_setup,
 #endif
diff --git a/drivers/bluetooth/hci/hci_da1453x.c b/drivers/bluetooth/hci/hci_da1453x.c
index 668dd8aaa18f1..8e63e377cb718 100644
--- a/drivers/bluetooth/hci/hci_da1453x.c
+++ b/drivers/bluetooth/hci/hci_da1453x.c
@@ -41,7 +41,7 @@ int bt_hci_transport_setup(const struct device *h4)
 	k_sleep(K_MSEC(DT_INST_PROP_OR(0, reset_assert_duration_ms, 0)));
 
 	/* Release the DA1453x from reset */
-	err = gpio_pin_set_dt(&bt_reset, 0);
+	err = gpio_pin_configure_dt(&bt_reset, GPIO_OUTPUT_INACTIVE);
 	if (err) {
 		return err;
 	}
diff --git a/drivers/bluetooth/hci/hci_nxp.c b/drivers/bluetooth/hci/hci_nxp.c
index ad2dbfb9ec7a6..153130d9525ad 100644
--- a/drivers/bluetooth/hci/hci_nxp.c
+++ b/drivers/bluetooth/hci/hci_nxp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 NXP
+ * Copyright 2023-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -16,6 +16,7 @@
 #include <zephyr/drivers/flash.h>
 #include <zephyr/bluetooth/hci_types.h>
 #include <soc.h>
+#include <zephyr/pm/policy.h>
 
 #include <fwk_platform_ble.h>
 #include <fwk_platform.h>
@@ -71,6 +72,12 @@ LOG_MODULE_REGISTER(bt_driver);
 #if !defined(CONFIG_BT_HCI_SET_PUBLIC_ADDR)
 #define bt_nxp_set_mac_address(public_addr) 0
 #endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(standby), okay) && defined(CONFIG_PM) &&\
+	defined(CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP)
+#define HCI_NXP_LOCK_STANDBY_BEFORE_SEND
+#endif
+
 /* -------------------------------------------------------------------------- */
 /*                              Public prototypes                             */
 /* -------------------------------------------------------------------------- */
@@ -79,7 +86,8 @@ LOG_MODULE_REGISTER(bt_driver);
 /*                             Private functions                              */
 /* -------------------------------------------------------------------------- */
 
-#if defined(CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP) || defined(CONFIG_HCI_NXP_SET_CAL_DATA)
+#if defined(CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP) || defined(CONFIG_HCI_NXP_SET_CAL_DATA) ||\
+	defined(CONFIG_BT_HCI_SET_PUBLIC_ADDR)
 static int nxp_bt_send_vs_command(uint16_t opcode, const uint8_t *params, uint8_t params_len)
 {
 	if (IS_ENABLED(CONFIG_BT_HCI_HOST)) {
@@ -101,7 +109,7 @@ static int nxp_bt_send_vs_command(uint16_t opcode, const uint8_t *params, uint8_
 		return 0;
 	}
 }
-#endif /* CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP || CONFIG_HCI_NXP_SET_CAL_DATA */
+#endif
 
 #if defined(CONFIG_HCI_NXP_ENABLE_AUTO_SLEEP)
 static int nxp_bt_enable_controller_autosleep(void)
@@ -170,7 +178,10 @@ static int bt_nxp_set_mac_address(const bt_addr_t *public_addr)
 	uint8_t addrOUI[BD_ADDR_OUI_PART_SIZE] = {BD_ADDR_OUI};
 	uint8_t uid[16] = {0};
 	uint8_t uuidLen;
-	uint8_t hciBuffer[12];
+	uint8_t params[HCI_CMD_BT_HOST_SET_MAC_ADDR_PARAM_LENGTH] = {
+		BT_USER_BD,
+		0x06U
+	};
 
 	/* If no public address is provided by the user, use a unique address made
 	 * from the device's UID (unique ID)
@@ -190,18 +201,12 @@ static int bt_nxp_set_mac_address(const bt_addr_t *public_addr)
 		bt_addr_copy((bt_addr_t *)bleDeviceAddress, public_addr);
 	}
 
-	hciBuffer[0] = BT_HCI_H4_CMD;
-	memcpy((void *)&hciBuffer[1], (const void *)&opcode, 2U);
-	/* Set HCI parameter length */
-	hciBuffer[3] = HCI_CMD_BT_HOST_SET_MAC_ADDR_PARAM_LENGTH;
-	/* Set command parameter ID */
-	hciBuffer[4] = BT_USER_BD;
-	/* Set command parameter length */
-	hciBuffer[5] = (uint8_t)6U;
-	memcpy(hciBuffer + 6U, (const void *)bleDeviceAddress,
-	       BD_ADDR_UUID_PART_SIZE + BD_ADDR_OUI_PART_SIZE);
+	memcpy(&params[2], (const void *)bleDeviceAddress,
+		BD_ADDR_UUID_PART_SIZE + BD_ADDR_OUI_PART_SIZE);
+
 	/* Send the command */
-	return PLATFORM_SendHciMessage(hciBuffer, 12U);
+	return nxp_bt_send_vs_command(opcode, params,
+					HCI_CMD_BT_HOST_SET_MAC_ADDR_PARAM_LENGTH);
 }
 #endif /* CONFIG_BT_HCI_SET_PUBLIC_ADDR */
 
@@ -368,19 +373,23 @@ K_THREAD_DEFINE(nxp_hci_rx_thread, CONFIG_BT_DRV_RX_STACK_SIZE, bt_rx_thread, NU
 static void hci_rx_cb(uint8_t packetType, uint8_t *data, uint16_t len)
 {
 	struct hci_data hci_rx_frame;
+	int ret;
 
 	hci_rx_frame.packetType = packetType;
 	hci_rx_frame.data = k_malloc(len);
 
 	if (!hci_rx_frame.data) {
 		LOG_ERR("Failed to allocate RX buffer");
+		return;
 	}
 
 	memcpy(hci_rx_frame.data, data, len);
 	hci_rx_frame.len = len;
 
-	if (k_msgq_put(&rx_msgq, &hci_rx_frame, K_NO_WAIT) < 0) {
-		LOG_ERR("Failed to push RX data to message queue");
+	ret = k_msgq_put(&rx_msgq, &hci_rx_frame, K_NO_WAIT);
+	if (ret < 0) {
+		LOG_ERR("Failed to push RX data to message queue: %d", ret);
+		k_free(hci_rx_frame.data);
 	}
 }
 
@@ -411,7 +420,18 @@ static int bt_nxp_send(const struct device *dev, struct net_buf *buf)
 	}
 
 	net_buf_push_u8(buf, packetType);
+#if defined(HCI_NXP_LOCK_STANDBY_BEFORE_SEND)
+	/* Sending an HCI message requires to wake up the controller core if it's asleep.
+	 * Platform controllers may send reponses using non wakeable interrupts which can
+	 * be lost during standby usage.
+	 * Blocking standby usage until the HCI message is sent.
+	 */
+	pm_policy_state_lock_get(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+#endif
 	PLATFORM_SendHciMessage(buf->data, buf->len);
+#if defined(HCI_NXP_LOCK_STANDBY_BEFORE_SEND)
+	pm_policy_state_lock_put(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+#endif
 
 	net_buf_unref(buf);
 
@@ -505,19 +525,7 @@ static int bt_nxp_close(const struct device *dev)
 {
 	struct bt_nxp_data *hci = dev->data;
 	int ret = 0;
-	/* Reset the Controller */
-	if (IS_ENABLED(CONFIG_BT_HCI_HOST)) {
-		ret = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
-		if (ret) {
-			LOG_ERR("Failed to reset BLE controller");
-		}
-		k_sleep(K_SECONDS(1));
 
-		ret = PLATFORM_TerminateBle();
-		if (ret < 0) {
-			LOG_ERR("Failed to shutdown BLE controller");
-		}
-	}
 	hci->recv = NULL;
 
 	return ret;
diff --git a/drivers/bluetooth/hci/hci_nxp_setup.c b/drivers/bluetooth/hci/hci_nxp_setup.c
index bacc9f3ca5b04..6bd0e5d5764ca 100644
--- a/drivers/bluetooth/hci/hci_nxp_setup.c
+++ b/drivers/bluetooth/hci/hci_nxp_setup.c
@@ -194,6 +194,7 @@ struct nxp_ctlr_fw_upload_state {
 	bool is_error_case;
 	bool is_cmd7_req;
 	bool is_entry_point_req;
+	bool is_setup_done;
 
 	uint8_t last_5bytes_buffer[6];
 };
@@ -1171,11 +1172,15 @@ static int bt_nxp_ctlr_init(void)
 
 int bt_hci_transport_setup(const struct device *dev)
 {
+	int ret = 0;
 	if (dev != uart_dev) {
 		return -EINVAL;
 	}
 
-	return bt_nxp_ctlr_init();
+	if (!fw_upload.is_setup_done) {
+		ret = bt_nxp_ctlr_init();
+	}
+	return ret;
 }
 
 #define BT_HCI_VSC_BAUDRATE_UPDATE_LENGTH 4
@@ -1228,13 +1233,15 @@ int bt_h4_vnd_setup(const struct device *dev)
 		return 0;
 	}
 
-	err = bt_hci_baudrate_update(dev, operation_speed);
-	if (err) {
-		return err;
-	}
+	if (!fw_upload.is_setup_done) {
+		err = bt_hci_baudrate_update(dev, operation_speed);
+		if (err) {
+			return err;
+		}
 
-	/* BT waiting time after controller bandrate updated */
-	(void)k_msleep(CONFIG_BT_H4_NXP_CTLR_WAIT_TIME_AFTER_BAUDRATE_UPDATE);
+		/* BT waiting time after controller bandrate updated */
+		(void)k_msleep(CONFIG_BT_H4_NXP_CTLR_WAIT_TIME_AFTER_BAUDRATE_UPDATE);
+	}
 
 	err = fw_upload_uart_reconfig(operation_speed, flowcontrol_of_hci);
 	if (err) {
@@ -1242,5 +1249,7 @@ int bt_h4_vnd_setup(const struct device *dev)
 		return err;
 	}
 
+	fw_upload.is_setup_done = true;
+
 	return 0;
 }
diff --git a/drivers/bluetooth/hci/hci_silabs_efr32.c b/drivers/bluetooth/hci/hci_silabs_efr32.c
index 5ae602cff9dfd..c528b3b69103b 100644
--- a/drivers/bluetooth/hci/hci_silabs_efr32.c
+++ b/drivers/bluetooth/hci/hci_silabs_efr32.c
@@ -52,6 +52,7 @@ static struct k_fifo slz_rx_fifo;
 /* FIXME: these functions should come from the SiSDK headers! */
 void BTLE_LL_EventRaise(uint32_t events);
 void BTLE_LL_Process(uint32_t events);
+int16_t BTLE_LL_SetMaxPower(int16_t power);
 bool sli_pending_btctrl_events(void);
 RAIL_Handle_t BTLE_LL_GetRadioHandle(void);
 
@@ -256,6 +257,18 @@ static void slz_rx_thread_func(void *p1, void *p2, void *p3)
 	}
 }
 
+static void slz_set_tx_power(int16_t max_power_dbm)
+{
+	const int16_t max_power_cbm = max_power_dbm * 10;
+	const int16_t actual_max_power_cbm = BTLE_LL_SetMaxPower(max_power_cbm);
+	const int16_t actual_max_power_dbm = DIV_ROUND_CLOSEST(actual_max_power_cbm, 10);
+
+	if (actual_max_power_dbm != max_power_dbm) {
+		LOG_WRN("Unable to set max TX power to %d dBm, actual max is %d dBm", max_power_dbm,
+			actual_max_power_dbm);
+	}
+}
+
 static int slz_bt_open(const struct device *dev, bt_hci_recv_t recv)
 {
 	struct hci_data *hci = dev->data;
@@ -303,6 +316,8 @@ static int slz_bt_open(const struct device *dev, bt_hci_recv_t recv)
 		goto deinit;
 	}
 
+	slz_set_tx_power(CONFIG_BT_CTLR_TX_PWR_ANTENNA);
+
 	sl_btctrl_init_adv();
 	sl_btctrl_init_scan();
 	sl_btctrl_init_conn();
diff --git a/drivers/bluetooth/hci/hci_spi_st.c b/drivers/bluetooth/hci/hci_spi_st.c
index 4b8e25fe43dbf..faa158a2ef9f5 100644
--- a/drivers/bluetooth/hci/hci_spi_st.c
+++ b/drivers/bluetooth/hci/hci_spi_st.c
@@ -631,7 +631,9 @@ static int bt_spi_send(const struct device *dev, struct net_buf *buf)
 	 * EVT_BLUE_INITIALIZED as an indication that it is safe to proceed.
 	 */
 	if (bt_spi_get_cmd(buf->data) == BT_HCI_OP_RESET) {
-		k_sem_take(&sem_initialised, K_FOREVER);
+		if (k_sem_take(&sem_initialised, K_SECONDS(CONFIG_BT_SPI_BOOT_TIMEOUT_SEC)) < 0) {
+			ret = -EIO;
+		}
 	}
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(st_hci_spi_v1) */
 	net_buf_unref(buf);
@@ -682,7 +684,9 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
 			0, K_NO_WAIT);
 
 	/* Device will let us know when it's ready */
-	k_sem_take(&sem_initialised, K_FOREVER);
+	if (k_sem_take(&sem_initialised, K_SECONDS(CONFIG_BT_SPI_BOOT_TIMEOUT_SEC)) < 0) {
+		return -EIO;
+	}
 
 #if defined(CONFIG_BT_HCI_RAW) && defined(CONFIG_BT_BLUENRG_ACI)
 	/* force BlueNRG to be on controller mode */
diff --git a/drivers/bluetooth/hci/ipc.c b/drivers/bluetooth/hci/ipc.c
index d25f7c8af1036..3bc9875016137 100644
--- a/drivers/bluetooth/hci/ipc.c
+++ b/drivers/bluetooth/hci/ipc.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Nordic Semiconductor ASA
+ * Copyright 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,6 +10,7 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/drivers/bluetooth.h>
 
 #include <zephyr/device.h>
@@ -18,9 +20,20 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_hci_driver);
 
+BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_CONN) || IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL),
+	     "HCI IPC driver can drop ACL data without Controller-to-Host ACL flow control");
+
 #define DT_DRV_COMPAT zephyr_bt_hci_ipc
 
-#define IPC_BOUND_TIMEOUT_IN_MS K_MSEC(1000)
+#define IPC_BOUND_TIMEOUT_IN_MS K_MSEC(CONFIG_BT_HCI_IPC_ENDPOINT_BOUND_TIMEOUT_MS)
+
+/* The retry of ipc_service_send function requires a small (tens of us) delay.
+ * In order to ensure proper delay k_usleep is used when the system clock is
+ * precise enough and available (CONFIG_SYS_CLOCK_TICKS_PER_SEC different than 0).
+ */
+#define USE_SLEEP_BETWEEN_IPC_RETRIES COND_CODE_0(CONFIG_SYS_CLOCK_TICKS_PER_SEC, \
+	(false), \
+	((USEC_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC) > CONFIG_BT_HCI_IPC_SEND_RETRY_DELAY_US))
 
 struct ipc_data {
 	bt_hci_recv_t recv;
@@ -74,7 +87,7 @@ static struct net_buf *bt_ipc_evt_recv(const uint8_t *data, size_t remaining)
 	size_t buf_tailroom;
 
 	if (remaining < sizeof(hdr)) {
-		LOG_ERR("Not enough data for event header");
+		LOG_ERR("Not enough data (%u) for event header (%zu)", remaining, sizeof(hdr));
 		return NULL;
 	}
 
@@ -85,7 +98,7 @@ static struct net_buf *bt_ipc_evt_recv(const uint8_t *data, size_t remaining)
 	remaining -= sizeof(hdr);
 
 	if (remaining != hdr.len) {
-		LOG_ERR("Event payload length is not correct");
+		LOG_ERR("Event payload length is not correct (%u != %u)", remaining, hdr.len);
 		return NULL;
 	}
 	LOG_DBG("len %u", hdr.len);
@@ -122,7 +135,7 @@ static struct net_buf *bt_ipc_acl_recv(const uint8_t *data, size_t remaining)
 	size_t buf_tailroom;
 
 	if (remaining < sizeof(hdr)) {
-		LOG_ERR("Not enough data for ACL header");
+		LOG_ERR("Not enough data (%u) for ACL header (%zu)", remaining, sizeof(hdr));
 		return NULL;
 	}
 
@@ -139,7 +152,8 @@ static struct net_buf *bt_ipc_acl_recv(const uint8_t *data, size_t remaining)
 	}
 
 	if (remaining != sys_le16_to_cpu(hdr.len)) {
-		LOG_ERR("ACL payload length is not correct");
+		LOG_ERR("ACL payload length is not correct (%u != %u)", remaining,
+			sys_le16_to_cpu(hdr.len));
 		net_buf_unref(buf);
 		return NULL;
 	}
@@ -165,7 +179,7 @@ static struct net_buf *bt_ipc_iso_recv(const uint8_t *data, size_t remaining)
 	size_t buf_tailroom;
 
 	if (remaining < sizeof(hdr)) {
-		LOG_ERR("Not enough data for ISO header");
+		LOG_ERR("Not enough data (%u) for ISO header (%zu)", remaining, sizeof(hdr));
 		return NULL;
 	}
 
@@ -189,7 +203,8 @@ static struct net_buf *bt_ipc_iso_recv(const uint8_t *data, size_t remaining)
 	}
 
 	if (remaining != bt_iso_hdr_len(sys_le16_to_cpu(hdr.len))) {
-		LOG_ERR("ISO payload length is not correct");
+		LOG_ERR("ISO payload length is not correct (%u != %lu)", remaining,
+			bt_iso_hdr_len(sys_le16_to_cpu(hdr.len)));
 		net_buf_unref(buf);
 		return NULL;
 	}
@@ -265,19 +280,35 @@ static int bt_ipc_send(const struct device *dev, struct net_buf *buf)
 		break;
 	default:
 		LOG_ERR("Unknown type %u", bt_buf_get_type(buf));
+		err = -ENOMSG;
 		goto done;
 	}
 	net_buf_push_u8(buf, pkt_indicator);
 
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "Final HCI buffer:");
-	err = ipc_service_send(&data->hci_ept, buf->data, buf->len);
+
+	for (int retries = 0; retries < CONFIG_BT_HCI_IPC_SEND_RETRY_COUNT + 1; retries++) {
+		err = ipc_service_send(&data->hci_ept, buf->data, buf->len);
+		if ((err >= 0) || (err != -ENOMEM)) {
+			break;
+		}
+
+		if (USE_SLEEP_BETWEEN_IPC_RETRIES) {
+			k_usleep(CONFIG_BT_HCI_IPC_SEND_RETRY_DELAY_US);
+		} else {
+			k_busy_wait(CONFIG_BT_HCI_IPC_SEND_RETRY_DELAY_US);
+		}
+	}
+
 	if (err < 0) {
 		LOG_ERR("Failed to send (err %d)", err);
+	} else {
+		err = 0;
 	}
 
 done:
 	net_buf_unref(buf);
-	return 0;
+	return err;
 }
 
 static void hci_ept_bound(void *priv)
@@ -348,14 +379,6 @@ static int bt_ipc_close(const struct device *dev)
 	struct ipc_data *ipc = dev->data;
 	int err;
 
-	if (IS_ENABLED(CONFIG_BT_HCI_HOST)) {
-		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
-		if (err) {
-			LOG_ERR("Sending reset command failed with: %d", err);
-			return err;
-		}
-	}
-
 	err = ipc_service_deregister_endpoint(&ipc->hci_ept);
 	if (err) {
 		LOG_ERR("Deregistering HCI endpoint failed with: %d", err);
diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
index 3ce62548ea01d..57009c4376bec 100644
--- a/drivers/bluetooth/hci/spi.c
+++ b/drivers/bluetooth/hci/spi.c
@@ -416,7 +416,9 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
 	k_thread_name_set(&spi_rx_thread_data, "bt_spi_rx_thread");
 
 	/* Device will let us know when it's ready */
-	k_sem_take(&sem_initialised, K_FOREVER);
+	if (k_sem_take(&sem_initialised, K_SECONDS(CONFIG_BT_SPI_BOOT_TIMEOUT_SEC)) < 0) {
+		return -EIO;
+	}
 
 	return 0;
 }
diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c
index 50c3165809d8c..c46647fabd0d1 100644
--- a/drivers/bluetooth/hci/userchan.c
+++ b/drivers/bluetooth/hci/userchan.c
@@ -14,19 +14,15 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <poll.h>
-#include <errno.h>
-#include <sys/socket.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <zephyr/sys/byteorder.h>
 
+#include "nsi_host_trampolines.h"
+#include "nsi_errno.h"
 #include "soc.h"
-#include "cmdline.h" /* native_posix command line options header */
+#include "cmdline.h" /* native_sim command line options header */
+#include "userchan_bottom.h"
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
@@ -41,19 +37,8 @@ LOG_MODULE_REGISTER(bt_driver);
 struct uc_data {
 	int           fd;
 	bt_hci_recv_t recv;
-
 };
 
-#define BTPROTO_HCI      1
-struct sockaddr_hci {
-	sa_family_t     hci_family;
-	unsigned short  hci_dev;
-	unsigned short  hci_channel;
-};
-#define HCI_CHANNEL_USER 1
-
-#define SOL_HCI          0
-
 static K_KERNEL_STACK_DEFINE(rx_thread_stack,
 			     CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);
 static struct k_thread rx_thread_data;
@@ -179,13 +164,6 @@ static int32_t hci_packet_complete(const uint8_t *buf, uint16_t buf_len)
 	return (int32_t)header_len + payload_len;
 }
 
-static bool uc_ready(int fd)
-{
-	struct pollfd pollfd = { .fd = fd, .events = POLLIN };
-
-	return (poll(&pollfd, 1, 0) == 1);
-}
-
 static void rx_thread(void *p1, void *p2, void *p3)
 {
 	const struct device *dev = p1;
@@ -196,32 +174,32 @@ static void rx_thread(void *p1, void *p2, void *p3)
 
 	LOG_DBG("started");
 
-	ssize_t frame_size = 0;
+	long frame_size = 0;
 
 	while (1) {
 		static uint8_t frame[512];
 		struct net_buf *buf;
 		size_t buf_tailroom;
 		size_t buf_add_len;
-		ssize_t len;
+		long len;
 		const uint8_t *frame_start = frame;
 
-		if (!uc_ready(uc->fd)) {
+		if (!user_chan_rx_ready(uc->fd)) {
 			k_sleep(K_MSEC(1));
 			continue;
 		}
 
 		LOG_DBG("calling read()");
 
-		len = read(uc->fd, frame + frame_size, sizeof(frame) - frame_size);
+		len = nsi_host_read(uc->fd, frame + frame_size, sizeof(frame) - frame_size);
 		if (len < 0) {
-			if (errno == EINTR) {
+			if (nsi_host_get_errno() == EINTR) {
 				k_yield();
 				continue;
 			}
 
 			LOG_ERR("Reading socket failed, errno %d", errno);
-			close(uc->fd);
+			(void)nsi_host_close(uc->fd);
 			uc->fd = -1;
 			return;
 		}
@@ -315,66 +293,14 @@ static int uc_send(const struct device *dev, struct net_buf *buf)
 		return -EINVAL;
 	}
 
-	if (write(uc->fd, buf->data, buf->len) < 0) {
-		return -errno;
+	if (nsi_host_write(uc->fd, buf->data, buf->len) < 0) {
+		return -nsi_host_get_errno();
 	}
 
 	net_buf_unref(buf);
 	return 0;
 }
 
-static int user_chan_open(void)
-{
-	int fd;
-
-	if (hci_socket) {
-		struct sockaddr_hci addr;
-
-		fd = socket(PF_BLUETOOTH, SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK,
-			    BTPROTO_HCI);
-		if (fd < 0) {
-			return -errno;
-		}
-
-		(void)memset(&addr, 0, sizeof(addr));
-		addr.hci_family = AF_BLUETOOTH;
-		addr.hci_dev = bt_dev_index;
-		addr.hci_channel = HCI_CHANNEL_USER;
-
-		if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-			int err = -errno;
-
-			close(fd);
-			return err;
-		}
-	} else {
-		struct sockaddr_in addr;
-
-		fd = socket(AF_INET, SOCK_STREAM, 0);
-		if (fd < 0) {
-			return -errno;
-		}
-
-		addr.sin_family = AF_INET;
-		addr.sin_port = htons(port);
-		if (inet_pton(AF_INET, ip_addr, &(addr.sin_addr)) <= 0) {
-			int err = -errno;
-
-			close(fd);
-			return err;
-		}
-
-		if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-			int err = -errno;
-
-			close(fd);
-			return err;
-		}
-	}
-
-	return fd;
-}
-
 static int uc_open(const struct device *dev, bt_hci_recv_t recv)
 {
 	struct uc_data *uc = dev->data;
@@ -385,9 +311,13 @@ static int uc_open(const struct device *dev, bt_hci_recv_t recv)
 		LOG_DBG("hci %s:%d", ip_addr, port);
 	}
 
-	uc->fd = user_chan_open();
+	if (hci_socket) {
+		uc->fd = user_chan_socket_open(bt_dev_index);
+	} else {
+		uc->fd = user_chan_net_connect(ip_addr, port);
+	}
 	if (uc->fd < 0) {
-		return uc->fd;
+		return -nsi_errno_from_mid(-uc->fd);
 	}
 
 	uc->recv = recv;
@@ -449,9 +379,8 @@ static void cmd_bt_dev_found(char *argv, int offset)
 			posix_print_error_and_exit("Error: IP port for bluetooth "
 						   "hci tcp server is out of range.\n");
 		}
-		struct in_addr addr;
 
-		if (inet_pton(AF_INET, ip_addr, &addr) != 1) {
+		if (user_chan_is_ipaddr_ok(ip_addr) != 1) {
 			posix_print_error_and_exit("Error: IP address for bluetooth "
 						   "hci tcp server is incorrect.\n");
 		}
diff --git a/drivers/bluetooth/hci/userchan_bottom.c b/drivers/bluetooth/hci/userchan_bottom.c
new file mode 100644
index 0000000000000..38b0a0b2908cf
--- /dev/null
+++ b/drivers/bluetooth/hci/userchan_bottom.c
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * "Bottom"/Linux/Host side of the userchannel driver. This file is built in the native_simulator
+ * runner context with the host libC, but it's functionality can be called from the "embedded" side
+ */
+
+#include <stdbool.h>
+#include <string.h>
+#include <errno.h>
+#include <poll.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <limits.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <nsi_errno.h>
+
+#define BTPROTO_HCI      1
+#define HCI_CHANNEL_USER 1
+
+struct sockaddr_hci {
+	sa_family_t    hci_family;
+	unsigned short hci_dev;
+	unsigned short hci_channel;
+};
+
+bool user_chan_rx_ready(int fd)
+{
+	struct pollfd pollfd = {.fd = fd, .events = POLLIN};
+
+	return (poll(&pollfd, 1, 0) == 1);
+}
+
+int user_chan_is_ipaddr_ok(char ip_addr[])
+{
+	struct in_addr addr;
+
+	return inet_pton(AF_INET, ip_addr, &addr);
+}
+
+int user_chan_socket_open(unsigned short bt_dev_index)
+{
+	int fd;
+	struct sockaddr_hci addr;
+
+	fd = socket(PF_BLUETOOTH, SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK, BTPROTO_HCI);
+	if (fd < 0) {
+		return -nsi_errno_to_mid(errno);
+	}
+
+	(void)memset(&addr, 0, sizeof(addr));
+	addr.hci_family = AF_BLUETOOTH;
+	addr.hci_dev = bt_dev_index;
+	addr.hci_channel = HCI_CHANNEL_USER;
+
+	if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+		int err = -nsi_errno_to_mid(errno);
+
+		close(fd);
+		return err;
+	}
+
+	return fd;
+}
+
+
+int user_chan_net_connect(char ip_addr[], unsigned int port)
+{
+	int fd;
+	struct sockaddr_in addr;
+
+	fd = socket(AF_INET, SOCK_STREAM, 0);
+	if (fd < 0) {
+		return -nsi_errno_to_mid(errno);
+	}
+
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons(port);
+	if (inet_pton(AF_INET, ip_addr, &(addr.sin_addr)) <= 0) {
+		int err = -nsi_errno_to_mid(errno);
+
+		close(fd);
+		return err;
+	}
+
+	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+		int err = -nsi_errno_to_mid(errno);
+
+		close(fd);
+		return err;
+	}
+
+	return fd;
+}
diff --git a/drivers/bluetooth/hci/userchan_bottom.h b/drivers/bluetooth/hci/userchan_bottom.h
new file mode 100644
index 0000000000000..732f0970c2b62
--- /dev/null
+++ b/drivers/bluetooth/hci/userchan_bottom.h
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef DRIVERS_BLUETOOTH_HCI_USERCHAN_BOTTOM_H
+#define DRIVERS_BLUETOOTH_HCI_USERCHAN_BOTTOM_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool user_chan_rx_ready(int fd);
+int user_chan_is_ipaddr_ok(char ip_addr[]);
+int user_chan_socket_open(unsigned short bt_dev_index);
+int user_chan_net_connect(char ip_addr[], unsigned int port);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DRIVERS_BLUETOOTH_HCI_USERCHAN_BOTTOM_H */
diff --git a/drivers/can/Kconfig.stm32 b/drivers/can/Kconfig.stm32
index 65da04a7225f3..7a9bfae3a731f 100644
--- a/drivers/can/Kconfig.stm32
+++ b/drivers/can/Kconfig.stm32
@@ -54,7 +54,6 @@ config CAN_STM32_FDCAN
 	depends on DT_HAS_ST_STM32_FDCAN_ENABLED
 	select CAN_MCAN
 	select PINCTRL
-	select USE_STM32_LL_RCC
 
 if CAN_STM32_FDCAN
 
@@ -82,4 +81,3 @@ config CAN_STM32H7_FDCAN
 	depends on DT_HAS_ST_STM32H7_FDCAN_ENABLED
 	select CAN_MCAN
 	select PINCTRL
-	select USE_STM32_LL_RCC
diff --git a/drivers/can/can_mcp251xfd.c b/drivers/can/can_mcp251xfd.c
index 19dc618e3c230..3335eceb2765a 100644
--- a/drivers/can/can_mcp251xfd.c
+++ b/drivers/can/can_mcp251xfd.c
@@ -1394,6 +1394,12 @@ static inline int mcp251xfd_init_iocon_reg(const struct device *dev)
 		tmp |= MCP251XFD_REG_IOCON_SOF;
 	}
 
+	if (dev_cfg->xstby_enable) {
+		tmp &= ~MCP251XFD_REG_IOCON_TRIS0;
+		tmp &= ~MCP251XFD_REG_IOCON_PM0;
+		tmp |= MCP251XFD_REG_IOCON_XSTBYEN;
+	}
+
 	*reg = sys_cpu_to_le32(tmp);
 
 	return  mcp251xfd_write(dev, MCP251XFD_REG_IOCON, MCP251XFD_REG_SIZE);
@@ -1749,6 +1755,7 @@ static DEVICE_API(can, mcp251xfd_api_funcs) = {
 		.int_gpio_dt = GPIO_DT_SPEC_INST_GET(inst, int_gpios),                             \
                                                                                                    \
 		.sof_on_clko = DT_INST_PROP(inst, sof_on_clko),                                    \
+		.xstby_enable = DT_INST_PROP(inst, xstby_enable),                                  \
 		.clko_div = DT_INST_ENUM_IDX(inst, clko_div),                                      \
 		.pll_enable = DT_INST_PROP(inst, pll_enable),                                      \
 		.timestamp_prescaler = DT_INST_PROP(inst, timestamp_prescaler),                    \
diff --git a/drivers/can/can_mcp251xfd.h b/drivers/can/can_mcp251xfd.h
index 249631b33d341..4392079685644 100644
--- a/drivers/can/can_mcp251xfd.h
+++ b/drivers/can/can_mcp251xfd.h
@@ -524,6 +524,7 @@ struct mcp251xfd_config {
 
 	/* IO Config */
 	bool sof_on_clko;
+	bool xstby_enable;
 	bool pll_enable;
 	uint8_t clko_div;
 
diff --git a/drivers/can/can_native_linux_adapt.h b/drivers/can/can_native_linux_adapt.h
index 6ad06f6a87912..b92a7a08e7dfa 100644
--- a/drivers/can/can_native_linux_adapt.h
+++ b/drivers/can/can_native_linux_adapt.h
@@ -5,7 +5,7 @@
  */
 
 /** @file
- * @brief Private functions for native posix canbus driver.
+ * @brief Private functions for native_linux canbus driver.
  */
 
 #ifndef ZEPHYR_DRIVERS_CAN_NATIVE_LINUX_ADAPT_H_
diff --git a/drivers/can/can_renesas_ra.c b/drivers/can/can_renesas_ra.c
index 8a4239275e6e9..c7fcf712325ee 100644
--- a/drivers/can/can_renesas_ra.c
+++ b/drivers/can/can_renesas_ra.c
@@ -88,7 +88,7 @@ LOG_MODULE_REGISTER(can_renesas_ra, CONFIG_CAN_LOG_LEVEL);
 #define CANFD_CFG_GLOBAL                                                                           \
 	((0U << R_CANFD_CFDGCFG_TPRI_Pos) | /* Transmission Priority: ID priority */               \
 	 (0U << R_CANFD_CFDGCFG_DCE_Pos) |  /* DLC check disabled */                               \
-	 (1U << R_CANFD_CFDGCFG_DCS_Pos))   /* DLL Clock Select: CANFDCLK */
+	 (0U << R_CANFD_CFDGCFG_DCS_Pos))   /* DLL Clock Select: CANFDCLK */
 
 /*
  * TX Message Buffer Interrupt Enable Configuration: refer to '34.2.43 CFDTMIEC : TX Message Buffer
@@ -142,6 +142,8 @@ struct can_renesas_ra_global_cfg {
 	const struct device *ram_clk;
 	const struct clock_control_ra_subsys_cfg op_subsys;
 	const struct clock_control_ra_subsys_cfg ram_subsys;
+	const unsigned int dll_min_freq;
+	const unsigned int dll_max_freq;
 };
 
 struct can_renesas_ra_filter {
@@ -902,19 +904,33 @@ static inline int can_renesas_module_clock_init(const struct device *dev)
 		return ret;
 	}
 
+	if (dll_rate < global_cfg->dll_min_freq || dll_rate > global_cfg->dll_max_freq) {
+		LOG_ERR("%s frequency is out of supported range: %d < %s freq < %d",
+			cfg->dll_clk->name, global_cfg->dll_min_freq, cfg->dll_clk->name,
+			global_cfg->dll_max_freq);
+		return -ENOTSUP;
+	}
+
 	/* Clock constraint: refer to '34.1.2 Clock restriction' - RA8M1 MCU group HWM */
 	/*
 	 * Operation clock rate must be at least 40Mhz in case CANFD mode.
 	 * Otherwise, it must be at least 32MHz.
 	 */
-	if (IS_ENABLED(CONFIG_CAN_FD_MODE) ? op_rate < 40000000 : op_rate < 32000000) {
+	if (IS_ENABLED(CONFIG_CAN_FD_MODE) ? op_rate < MHZ(40) : op_rate < MHZ(32)) {
+		LOG_ERR("%s frequency should be at least %d", global_cfg->op_clk->name,
+			IS_ENABLED(CONFIG_CAN_FD_MODE) ? MHZ(40) : MHZ(32));
 		return -ENOTSUP;
 	}
+
 	/*
 	 * (RAM clock rate / 2) >= DLL rate
 	 * (CANFD operation clock rate) >= DLL rate
 	 */
 	if ((ram_rate / 2) < dll_rate || op_rate < dll_rate) {
+		LOG_ERR("%s frequency should be less than half of %s and %s frequency should "
+			"be less than %s",
+			global_cfg->ram_clk->name, cfg->dll_clk->name, global_cfg->op_clk->name,
+			cfg->dll_clk->name);
 		return -ENOTSUP;
 	}
 
@@ -995,15 +1011,13 @@ static DEVICE_API(can, can_renesas_ra_driver_api) = {
 };
 
 #define CAN_RENESAS_RA_GLOBAL_IRQ_INIT()                                                           \
-	R_ICU->IELSR_b[VECTOR_NUMBER_CAN_GLERR].IELS = ELC_EVENT_CAN_GLERR;                        \
-	R_ICU->IELSR_b[VECTOR_NUMBER_CAN_RXF].IELS = ELC_EVENT_CAN_RXF;                            \
+	R_ICU->IELSR_b[VECTOR_NUMBER_CAN_GLERR].IELS = BSP_PRV_IELS_ENUM(EVENT_CAN_GLERR);         \
+	R_ICU->IELSR_b[VECTOR_NUMBER_CAN_RXF].IELS = BSP_PRV_IELS_ENUM(EVENT_CAN_RXF);             \
 	IRQ_CONNECT(VECTOR_NUMBER_CAN_GLERR,                                                       \
-		    DT_IRQ_BY_NAME(DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), glerr,  \
-				   priority),                                                      \
+		    DT_IRQ_BY_NAME(DT_INST(0, renesas_ra_canfd_global), glerr, priority),          \
 		    canfd_error_isr, NULL, 0);                                                     \
 	IRQ_CONNECT(VECTOR_NUMBER_CAN_RXF,                                                         \
-		    DT_IRQ_BY_NAME(DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), rxf,    \
-				   priority),                                                      \
+		    DT_IRQ_BY_NAME(DT_INST(0, renesas_ra_canfd_global), rxf, priority),            \
 		    canfd_rx_fifo_isr, NULL, 0);                                                   \
 	irq_enable(VECTOR_NUMBER_CAN_RXF);                                                         \
 	irq_enable(VECTOR_NUMBER_CAN_GLERR);
@@ -1012,30 +1026,26 @@ static canfd_global_cfg_t g_canfd_global_cfg = {
 	.global_interrupts = CANFD_CFG_GLERR_IRQ,
 	.global_config = CANFD_CFG_GLOBAL,
 	.rx_mb_config = CANFD_CFG_RXMB,
-	.global_err_ipl = DT_IRQ_BY_NAME(DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global),
-					 glerr, priority),
-	.rx_fifo_ipl = DT_IRQ_BY_NAME(DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), rxf,
-				      priority),
+	.global_err_ipl = DT_IRQ_BY_NAME(DT_INST(0, renesas_ra_canfd_global), glerr, priority),
+	.rx_fifo_ipl = DT_IRQ_BY_NAME(DT_INST(0, renesas_ra_canfd_global), rxf, priority),
 	.rx_fifo_config = CANFD_CFG_RXFIFO,
 	.common_fifo_config = CANFD_CFG_COMMONFIFO,
 };
 
 static const struct can_renesas_ra_global_cfg g_can_renesas_ra_global_cfg = {
-	.op_clk = DEVICE_DT_GET(DT_CLOCKS_CTLR_BY_NAME(
-		DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), opclk)),
-	.ram_clk = DEVICE_DT_GET(DT_CLOCKS_CTLR_BY_NAME(
-		DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), ramclk)),
-	.op_subsys = {.mstp = DT_CLOCKS_CELL_BY_NAME(
-			      DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), opclk, mstp),
-		      .stop_bit = DT_CLOCKS_CELL_BY_NAME(
-			      DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), opclk,
-			      stop_bit)},
-	.ram_subsys = {.mstp = DT_CLOCKS_CELL_BY_NAME(
-			       DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), ramclk,
-			       mstp),
-		       .stop_bit = DT_CLOCKS_CELL_BY_NAME(
-			       DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), ramclk,
-			       stop_bit)},
+	.op_clk = DEVICE_DT_GET(DT_CLOCKS_CTLR_BY_NAME(DT_INST(0, renesas_ra_canfd_global), opclk)),
+	.ram_clk =
+		DEVICE_DT_GET(DT_CLOCKS_CTLR_BY_NAME(DT_INST(0, renesas_ra_canfd_global), ramclk)),
+	.op_subsys = {.mstp = DT_CLOCKS_CELL_BY_NAME(DT_INST(0, renesas_ra_canfd_global), opclk,
+						     mstp),
+		      .stop_bit = DT_CLOCKS_CELL_BY_NAME(DT_INST(0, renesas_ra_canfd_global), opclk,
+							 stop_bit)},
+	.ram_subsys = {.mstp = DT_CLOCKS_CELL_BY_NAME(DT_INST(0, renesas_ra_canfd_global), ramclk,
+						      mstp),
+		       .stop_bit = DT_CLOCKS_CELL_BY_NAME(DT_INST(0, renesas_ra_canfd_global),
+							  ramclk, stop_bit)},
+	.dll_min_freq = DT_PROP_OR(DT_INST(0, renesas_ra_canfd_global), dll_min_freq, 0),
+	.dll_max_freq = DT_PROP_OR(DT_INST(0, renesas_ra_canfd_global), dll_max_freq, UINT_MAX),
 };
 
 static int can_renesas_ra_global_init(const struct device *dev)
@@ -1064,22 +1074,18 @@ DEVICE_DT_DEFINE(DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_canfd_global), can_ren
 		 NULL, NULL, &g_can_renesas_ra_global_cfg, PRE_KERNEL_2, CONFIG_CAN_INIT_PRIORITY,
 		 NULL)
 
-#define _ELC_EVENT_CAN_COMFRX(channel) ELC_EVENT_CAN##channel##_COMFRX
-#define _ELC_EVENT_CAN_TX(channel)     ELC_EVENT_CAN##channel##_TX
-#define _ELC_EVENT_CAN_CHERR(channel)  ELC_EVENT_CAN##channel##_CHERR
-
-#define ELC_EVENT_CAN_COMFRX(channel) _ELC_EVENT_CAN_COMFRX(channel)
-#define ELC_EVENT_CAN_TX(channel)     _ELC_EVENT_CAN_TX(channel)
-#define ELC_EVENT_CAN_CHERR(channel)  _ELC_EVENT_CAN_CHERR(channel)
+#define EVENT_CAN_COMFRX(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_CAN, channel, _COMFRX))
+#define EVENT_CAN_TX(channel)     BSP_PRV_IELS_ENUM(CONCAT(EVENT_CAN, channel, _TX))
+#define EVENT_CAN_CHERR(channel)  BSP_PRV_IELS_ENUM(CONCAT(EVENT_CAN, channel, _CHERR))
 
 #define CAN_RENESAS_RA_CHANNEL_IRQ_INIT(index)                                                     \
 	{                                                                                          \
 		R_ICU->IELSR_b[DT_INST_IRQ_BY_NAME(index, rx, irq)].IELS =                         \
-			ELC_EVENT_CAN_COMFRX(DT_INST_PROP(index, channel));                        \
+			EVENT_CAN_COMFRX(DT_INST_PROP(index, channel));                            \
 		R_ICU->IELSR_b[DT_INST_IRQ_BY_NAME(index, tx, irq)].IELS =                         \
-			ELC_EVENT_CAN_TX(DT_INST_PROP(index, channel));                            \
+			EVENT_CAN_TX(DT_INST_PROP(index, channel));                                \
 		R_ICU->IELSR_b[DT_INST_IRQ_BY_NAME(index, err, irq)].IELS =                        \
-			ELC_EVENT_CAN_CHERR(DT_INST_PROP(index, channel));                         \
+			EVENT_CAN_CHERR(DT_INST_PROP(index, channel));                             \
                                                                                                    \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, rx, irq),                                   \
 			    DT_INST_IRQ_BY_NAME(index, rx, priority), canfd_common_fifo_rx_isr,    \
diff --git a/drivers/can/can_stm32_bxcan.c b/drivers/can/can_stm32_bxcan.c
index cdbd3f96e1e4e..66d15beda9a8e 100644
--- a/drivers/can/can_stm32_bxcan.c
+++ b/drivers/can/can_stm32_bxcan.c
@@ -599,7 +599,6 @@ static int can_stm32_init(const struct device *dev)
 	CAN_TypeDef *can = cfg->can;
 	struct can_timing timing = { 0 };
 	const struct device *clock;
-	uint32_t bank_offset;
 	int ret;
 
 	k_mutex_init(&filter_mutex);
@@ -645,10 +644,19 @@ static int can_stm32_init(const struct device *dev)
 	}
 
 	/* configure scale of filter banks < CONFIG_CAN_MAX_EXT_ID_FILTER for ext ids */
-	bank_offset = (cfg->can == cfg->master_can) ? 0 : CAN_STM32_NUM_FILTER_BANKS;
-	cfg->master_can->FMR |= CAN_FMR_FINIT;
-	cfg->master_can->FS1R |= ((1U << CONFIG_CAN_MAX_EXT_ID_FILTER) - 1) << bank_offset;
-	cfg->master_can->FMR &= ~CAN_FMR_FINIT;
+	/* We have to have set filters after initializing master CAN */
+	if (cfg->can == cfg->master_can) {
+		cfg->master_can->FMR |= CAN_FMR_FINIT;
+		cfg->master_can->FS1R |= ((1U << CONFIG_CAN_MAX_EXT_ID_FILTER) - 1);
+
+#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) > 1
+		/* reserve ext_id filters on slave CAN device */
+		cfg->master_can->FS1R |= ((1U << CONFIG_CAN_MAX_EXT_ID_FILTER) - 1)
+					 << CAN_STM32_NUM_FILTER_BANKS;
+#endif /* DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) > 1 */
+
+		cfg->master_can->FMR &= ~CAN_FMR_FINIT;
+	}
 
 	can->MCR &= ~CAN_MCR_TTCM & ~CAN_MCR_ABOM & ~CAN_MCR_AWUM &
 		    ~CAN_MCR_NART & ~CAN_MCR_RFLM & ~CAN_MCR_TXFP;
diff --git a/drivers/can/can_stm32_fdcan.c b/drivers/can/can_stm32_fdcan.c
index 44605a3237a97..ebed4c6939b64 100644
--- a/drivers/can/can_stm32_fdcan.c
+++ b/drivers/can/can_stm32_fdcan.c
@@ -13,7 +13,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/__assert.h>
 #include <soc.h>
-#include <stm32_ll_rcc.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 
@@ -403,13 +402,30 @@ static int can_stm32fd_clear_mram(const struct device *dev, uint16_t offset, siz
 
 static int can_stm32fd_get_core_clock(const struct device *dev, uint32_t *rate)
 {
-	const uint32_t rate_tmp = LL_RCC_GetFDCANClockFreq(LL_RCC_FDCAN_CLKSOURCE);
+	uint32_t rate_tmp;
+	const struct can_mcan_config *mcan_cfg = dev->config;
+	const struct can_stm32fd_config *stm32fd_cfg = mcan_cfg->custom;
+	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
 
 	ARG_UNUSED(dev);
+	if (!device_is_ready(clk)) {
+		return -ENODEV;
+	}
 
-	if (rate_tmp == LL_RCC_PERIPH_FREQUENCY_NO) {
-		LOG_ERR("Can't read core clock");
-		return -EIO;
+	if (IS_ENABLED(STM32_CANFD_DOMAIN_CLOCK_SUPPORT) && (stm32fd_cfg->pclk_len > 1)) {
+		if (clock_control_get_rate(clk,
+			 (clock_control_subsys_t) &stm32fd_cfg->pclken[1],
+			  &rate_tmp) < 0) {
+			LOG_ERR("Failed call clock_control_get_rate(pclk[1])");
+			return -EIO;
+		}
+	} else {
+		if (clock_control_get_rate(clk,
+			 (clock_control_subsys_t) &stm32fd_cfg->pclken[0],
+			  &rate_tmp) < 0) {
+			LOG_ERR("Failed call clock_control_get_rate(pclk[0])");
+			return -EIO;
+		}
 	}
 
 	if (FDCAN_CONFIG->CKDIV == 0) {
diff --git a/drivers/can/can_stm32h7_fdcan.c b/drivers/can/can_stm32h7_fdcan.c
index 912358b14624b..9e3c5ceb055c2 100644
--- a/drivers/can/can_stm32h7_fdcan.c
+++ b/drivers/can/can_stm32h7_fdcan.c
@@ -11,7 +11,6 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/kernel.h>
-#include <stm32_ll_rcc.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 #include <zephyr/sys/util.h>
@@ -84,16 +83,33 @@ static int can_stm32h7_clear_mram(const struct device *dev, uint16_t offset, siz
 
 static int can_stm32h7_get_core_clock(const struct device *dev, uint32_t *rate)
 {
-	const uint32_t rate_tmp = LL_RCC_GetFDCANClockFreq(LL_RCC_FDCAN_CLKSOURCE);
+	uint32_t rate_tmp;
+	const struct can_mcan_config *mcan_cfg = dev->config;
+	const struct can_stm32h7_config *stm32h7_cfg = mcan_cfg->custom;
+	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
 	uint32_t cdiv;
 
 	ARG_UNUSED(dev);
-
-	if (rate_tmp == LL_RCC_PERIPH_FREQUENCY_NO) {
-		LOG_ERR("Can't read core clock");
-		return -EIO;
+	if (!device_is_ready(clk)) {
+		LOG_ERR("clock control device not ready");
+		return -ENODEV;
 	}
 
+	if (IS_ENABLED(STM32H7_FDCAN_DOMAIN_CLOCK_SUPPORT) && (stm32h7_cfg->pclk_len > 1)) {
+		if (clock_control_get_rate(clk,
+			 (clock_control_subsys_t) &stm32h7_cfg->pclken[1],
+			  &rate_tmp) < 0) {
+			LOG_ERR("Failed call clock_control_get_rate(pclk[1])");
+			return -EIO;
+		}
+	} else {
+		if (clock_control_get_rate(clk,
+			 (clock_control_subsys_t) &stm32h7_cfg->pclken[0],
+			  &rate_tmp) < 0) {
+			LOG_ERR("Failed call clock_control_get_rate(pclk[0])");
+			return -EIO;
+		}
+	}
 	cdiv = FIELD_GET(FDCANCCU_CCFG_CDIV, FDCAN_CCU->CCFG);
 	if (cdiv == 0U) {
 		*rate = rate_tmp;
diff --git a/drivers/charger/CMakeLists.txt b/drivers/charger/CMakeLists.txt
index 60b80b0ed25cd..3c5dbe1f7e021 100644
--- a/drivers/charger/CMakeLists.txt
+++ b/drivers/charger/CMakeLists.txt
@@ -3,9 +3,12 @@
 zephyr_library()
 zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/charger.h)
 
+zephyr_library_sources_ifdef(CONFIG_CHARGER_AXP2101 charger_axp2101.c)
 zephyr_library_sources_ifdef(CONFIG_CHARGER_BQ24190 charger_bq24190.c)
 zephyr_library_sources_ifdef(CONFIG_CHARGER_BQ25180 charger_bq25180.c)
+zephyr_library_sources_ifdef(CONFIG_CHARGER_BQ25713 charger_bq25713.c)
 zephyr_library_sources_ifdef(CONFIG_CHARGER_MAX20335 charger_max20335.c)
+zephyr_library_sources_ifdef(CONFIG_CHARGER_PF1550 charger_pf1550.c)
 zephyr_library_sources_ifdef(CONFIG_SBS_CHARGER sbs_charger.c)
 zephyr_library_sources_ifdef(CONFIG_USERSPACE charger_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_EMUL_SBS_CHARGER emul_sbs_charger.c)
diff --git a/drivers/charger/Kconfig b/drivers/charger/Kconfig
index 4e0b6b3c7a742..2c6956278dca0 100644
--- a/drivers/charger/Kconfig
+++ b/drivers/charger/Kconfig
@@ -1,4 +1,5 @@
 # Copyright 2023 Cirrus Logic, Inc.
+# Copyright 2025 Palta Tech, S.A
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -50,9 +51,12 @@ config CHARGER_SYSTEM_VOLTAGE_NOTIFICATIONS
 	  Enables support for system voltage notifications
 endmenu
 
+source "drivers/charger/Kconfig.axp2101"
 source "drivers/charger/Kconfig.sbs_charger"
 source "drivers/charger/Kconfig.bq24190"
 source "drivers/charger/Kconfig.bq25180"
+source "drivers/charger/Kconfig.bq25713"
 source "drivers/charger/Kconfig.max20335"
+source "drivers/charger/Kconfig.pf1550"
 
 endif # CHARGER
diff --git a/drivers/charger/Kconfig.axp2101 b/drivers/charger/Kconfig.axp2101
new file mode 100644
index 0000000000000..70675625865cb
--- /dev/null
+++ b/drivers/charger/Kconfig.axp2101
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+config CHARGER_AXP2101
+	bool "X-Powers AXP2101 PMIC charger driver"
+	default y
+	depends on DT_HAS_X_POWERS_AXP2101_CHARGER_ENABLED
+	depends on DT_HAS_X_POWERS_AXP2101_ENABLED
+	select I2C
+	select MFD
+	help
+	  Enable the AXP2101 PMIC charger driver
diff --git a/drivers/charger/Kconfig.bq25713 b/drivers/charger/Kconfig.bq25713
new file mode 100644
index 0000000000000..747dc46d9e4cf
--- /dev/null
+++ b/drivers/charger/Kconfig.bq25713
@@ -0,0 +1,11 @@
+# Copyright 2025 Palta Tech, S.A
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config CHARGER_BQ25713
+	bool "BQ25713 Battery Charger"
+	default y
+	depends on DT_HAS_TI_BQ25713_ENABLED
+	select I2C
+	help
+	  Enable BQ25713 battery charger driver.
diff --git a/drivers/charger/Kconfig.pf1550 b/drivers/charger/Kconfig.pf1550
new file mode 100644
index 0000000000000..f81e0b085b91e
--- /dev/null
+++ b/drivers/charger/Kconfig.pf1550
@@ -0,0 +1,12 @@
+# Copyright 2024 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+config CHARGER_PF1550
+	bool "NXP PF1550 battery charger driver"
+	default y
+	depends on DT_HAS_NXP_PF1550_CHARGER_ENABLED
+	select GPIO
+	select I2C
+	select MFD
+	help
+	  Enable the NXP PF1550 battery charger driver.
diff --git a/drivers/charger/charger_axp2101.c b/drivers/charger/charger_axp2101.c
new file mode 100644
index 0000000000000..5396c2cce454f
--- /dev/null
+++ b/drivers/charger/charger_axp2101.c
@@ -0,0 +1,404 @@
+/*
+ * Copyright 2025 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT x_powers_axp2101_charger
+
+#include <errno.h>
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/charger.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(charger_axp2101, CONFIG_CHARGER_LOG_LEVEL);
+
+#define AXP2101_PMU_STATUS1			0x00
+	#define VBUS_GOOD_INDICATION		BIT(5)
+
+#define AXP2101_PMU_STATUS2			0x01
+	#define CHARGING_STATUS			GENMASK(2, 0)
+	#define TRICKLE_CHARGE			0x0
+	#define PRE_CHARGE			0x1
+	#define CONSTANT_CURRENT		0x2
+	#define CONSTANT_VOLTAGE		0x3
+	#define CHARGE_DONE			0x4
+	#define NOT_CHARGING			0x5
+
+#define AXP2101_CHARGER_CONTROL			0x18
+	#define BUTTON_BATTERY_CHARGE_ENABLE	BIT(2)
+	#define CELL_BATTERY_CHARGE_ENABLE	BIT(1)
+
+#define AXP2101_IPRECH_CHARGER_SETTING		0x61
+	#define PRE_CHARGE_CURRENT_STEP_UA	25000
+
+#define AXP2101_ICC_CHARGER_SETTING		0x62
+#define AXP2101_ITERM_CHARGER_SETTING		0x63
+	#define CHARGE_TERMINATION_ENABLE	BIT(4)
+	#define TERMINATION_CURRENT_LIMIT	GENMASK(3, 0)
+	#define TERMINATION_CURRENT_STEP_UA	25000
+
+#define AXP2101_CV_CHARGER_VOLTAGE		0x64
+
+struct axp2101_config {
+	struct i2c_dt_spec i2c;
+	bool vbackup_enable;
+};
+
+struct axp2101_data {
+	uint32_t cc_current_ua;
+	uint32_t cc_voltage_uv;
+	uint32_t termination_current_ua;
+};
+
+static const uint32_t constant_charge_current_lut[] = {
+	[0] = 0,
+	[1] = 0,
+	[2] = 0,
+	[3] = 0,
+	[4] = 100000,
+	[5] = 125000,
+	[6] = 150000,
+	[7] = 175000,
+	[8] = 200000,
+	[9] = 300000,
+	[10] = 400000,
+	[11] = 500000,
+	[12] = 600000,
+	[13] = 700000,
+	[14] = 800000,
+	[15] = 900000,
+	[16] = 1000000,
+};
+
+static const uint32_t constant_charge_voltage_lut[] = {
+	[0] = 0,
+	[1] = 4000000,
+	[2] = 4100000,
+	[3] = 4200000,
+	[4] = 4350000,
+	[5] = 4400000,
+};
+
+static int get_index_in_lut(uint32_t value, const uint32_t *lut, size_t lut_len)
+{
+	int i;
+
+	for (i = 0; i < (int) lut_len; i++) {
+		if (value == lut[i]) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+static enum charger_online is_charger_online(const struct device *dev, union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint8_t tmp;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, AXP2101_PMU_STATUS1, &tmp);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val->online = (tmp & VBUS_GOOD_INDICATION) ?
+		      CHARGER_ONLINE_FIXED : CHARGER_ONLINE_OFFLINE;
+
+	return 0;
+}
+
+static int get_constant_charge_current_ua(const struct device *dev, union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint8_t tmp;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, AXP2101_ICC_CHARGER_SETTING, &tmp);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val->const_charge_current_ua = constant_charge_current_lut[tmp];
+
+	return 0;
+}
+
+static int set_constant_charge_current_ua(const struct device *dev,
+					  const union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	struct axp2101_data *data = dev->data;
+	int lut_index;
+
+	lut_index = get_index_in_lut(val->const_charge_current_ua,
+				     constant_charge_current_lut,
+				     ARRAY_SIZE(constant_charge_current_lut));
+	if (lut_index < 0) {
+		return -EINVAL;
+	}
+
+	data->cc_current_ua = constant_charge_current_lut[lut_index];
+
+	return i2c_reg_write_byte_dt(&config->i2c, AXP2101_ICC_CHARGER_SETTING,
+				     (uint8_t) lut_index);
+}
+
+static int get_pre_charge_current_ua(const struct device *dev, union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint8_t tmp;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, AXP2101_IPRECH_CHARGER_SETTING, &tmp);
+	if (ret < 0) {
+		return ret;
+	}
+	val->precharge_current_ua = PRE_CHARGE_CURRENT_STEP_UA * ((uint32_t) tmp);
+
+	return 0;
+}
+
+static int get_termination_current_ua(const struct device *dev,
+				      union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint8_t tmp;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, AXP2101_ITERM_CHARGER_SETTING, &tmp);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if ((tmp & CHARGE_TERMINATION_ENABLE) == 0) {
+		val->charge_term_current_ua = 0;
+	} else {
+		tmp = tmp & TERMINATION_CURRENT_LIMIT;
+		val->charge_term_current_ua = TERMINATION_CURRENT_STEP_UA * ((uint32_t) tmp);
+	}
+
+	return 0;
+}
+
+static int set_termination_current_ua(const struct device *dev,
+				      const union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint32_t mask, tmp = 0;
+
+	tmp = val->charge_term_current_ua;
+	if ((tmp > 200000) || ((tmp % TERMINATION_CURRENT_STEP_UA) != 0)) {
+		return -EINVAL;
+	}
+
+	if (tmp != 0) {
+		tmp = (uint8_t) (tmp / TERMINATION_CURRENT_STEP_UA);
+		tmp |= CHARGE_TERMINATION_ENABLE;
+	}
+
+	mask = TERMINATION_CURRENT_LIMIT | CHARGE_TERMINATION_ENABLE;
+
+	return i2c_reg_update_byte_dt(&config->i2c, AXP2101_ITERM_CHARGER_SETTING,
+				      mask, tmp);
+}
+
+static int get_constant_charge_voltage_uv(const struct device *dev, union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint8_t tmp;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, AXP2101_CV_CHARGER_VOLTAGE, &tmp);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (tmp > ARRAY_SIZE(constant_charge_voltage_lut)) {
+		return -EINVAL;
+	}
+
+	val->const_charge_voltage_uv = constant_charge_voltage_lut[tmp];
+
+	return 0;
+}
+
+static int set_constant_charge_voltage_uv(const struct device *dev,
+					  const union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	int lut_index;
+
+	lut_index = get_index_in_lut(val->const_charge_voltage_uv,
+				     constant_charge_voltage_lut,
+				     ARRAY_SIZE(constant_charge_voltage_lut));
+	if (lut_index < 0) {
+		return -EINVAL;
+	}
+
+	return i2c_reg_write_byte_dt(&config->i2c, AXP2101_CV_CHARGER_VOLTAGE, (uint8_t) lut_index);
+}
+
+static int get_status(const struct device *dev, union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint8_t tmp;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, AXP2101_PMU_STATUS2, &tmp);
+	if (ret < 0) {
+		return ret;
+	}
+
+	tmp = tmp & CHARGING_STATUS;
+	if ((tmp >= TRICKLE_CHARGE) && (tmp <= CONSTANT_VOLTAGE)) {
+		val->status = CHARGER_STATUS_CHARGING;
+	} else if (tmp == CHARGE_DONE) {
+		val->status = CHARGER_STATUS_FULL;
+	} else if (tmp == NOT_CHARGING) {
+		val->status = CHARGER_STATUS_NOT_CHARGING;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int get_charge_type(const struct device *dev, union charger_propval *val)
+{
+	const struct axp2101_config *const config = dev->config;
+	uint8_t tmp;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, AXP2101_PMU_STATUS2, &tmp);
+	if (ret < 0) {
+		return ret;
+	}
+
+	tmp = tmp & CHARGING_STATUS;
+	if ((tmp == TRICKLE_CHARGE) || (tmp == PRE_CHARGE)) {
+		val->charge_type = CHARGER_CHARGE_TYPE_TRICKLE;
+	} else if ((tmp >= CONSTANT_CURRENT) && (tmp <= CHARGE_DONE)) {
+		val->charge_type = CHARGER_CHARGE_TYPE_STANDARD;
+	} else if (tmp == NOT_CHARGING) {
+		val->charge_type = CHARGER_CHARGE_TYPE_UNKNOWN;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int axp2101_get_prop(const struct device *dev, charger_prop_t prop,
+			    union charger_propval *val)
+{
+	switch (prop) {
+	case CHARGER_PROP_ONLINE:
+		return is_charger_online(dev, val);
+	case CHARGER_PROP_CONSTANT_CHARGE_CURRENT_UA:
+		return get_constant_charge_current_ua(dev, val);
+	case CHARGER_PROP_CONSTANT_CHARGE_VOLTAGE_UV:
+		return get_constant_charge_voltage_uv(dev, val);
+	case CHARGER_PROP_PRECHARGE_CURRENT_UA:
+		return get_pre_charge_current_ua(dev, val);
+	case CHARGER_PROP_CHARGE_TERM_CURRENT_UA:
+		return get_termination_current_ua(dev, val);
+	case CHARGER_PROP_CHARGE_TYPE:
+		return get_charge_type(dev, val);
+	case CHARGER_PROP_STATUS:
+		return get_status(dev, val);
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int axp2101_set_prop(const struct device *dev, charger_prop_t prop,
+			    const union charger_propval *val)
+{
+	switch (prop) {
+	case CHARGER_PROP_CONSTANT_CHARGE_CURRENT_UA:
+		return set_constant_charge_current_ua(dev, val);
+	case CHARGER_PROP_CONSTANT_CHARGE_VOLTAGE_UV:
+		return set_constant_charge_voltage_uv(dev, val);
+	case CHARGER_PROP_CHARGE_TERM_CURRENT_UA:
+		return set_termination_current_ua(dev, val);
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int axp2101_charge_enable(const struct device *dev, const bool enable)
+{
+	const struct axp2101_config *const config = dev->config;
+
+	return i2c_reg_update_byte_dt(&config->i2c, AXP2101_CHARGER_CONTROL,
+				      CELL_BATTERY_CHARGE_ENABLE,
+				      (enable) ? CELL_BATTERY_CHARGE_ENABLE : 0);
+}
+
+static int axp2101_init(const struct device *dev)
+{
+	const struct axp2101_config *const config = dev->config;
+	struct axp2101_data *data = dev->data;
+	union charger_propval val;
+	int ret;
+
+	if (config->vbackup_enable) {
+		ret = i2c_reg_update_byte_dt(&config->i2c, AXP2101_CHARGER_CONTROL,
+					     BUTTON_BATTERY_CHARGE_ENABLE,
+					     BUTTON_BATTERY_CHARGE_ENABLE);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+
+	val.const_charge_current_ua = data->cc_current_ua;
+	ret = set_constant_charge_current_ua(dev, &val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val.const_charge_voltage_uv = data->cc_voltage_uv;
+	ret = set_constant_charge_voltage_uv(dev, &val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val.charge_term_current_ua = data->termination_current_ua;
+	ret = set_termination_current_ua(dev, &val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(charger, axp2101_driver_api) = {
+	.get_property = axp2101_get_prop,
+	.set_property = axp2101_set_prop,
+	.charge_enable = axp2101_charge_enable,
+};
+
+#define AXP2101_INIT(inst)                                                                         \
+	static const struct axp2101_config axp2101_config_##inst = {                               \
+		.i2c = I2C_DT_SPEC_GET(DT_PARENT(DT_INST(inst, DT_DRV_COMPAT))),                   \
+		.vbackup_enable = DT_INST_PROP(inst, vbackup_enable),                              \
+	};                                                                                         \
+	static struct axp2101_data axp2101_data_##inst = {                                         \
+		.cc_current_ua = DT_INST_PROP(inst, constant_charge_current_max_microamp),         \
+		.cc_voltage_uv = DT_INST_PROP(inst, constant_charge_voltage_max_microvolt),        \
+		.termination_current_ua = DT_INST_PROP_OR(inst, charge-term-current-microamp,      \
+							  125000),                                 \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, axp2101_init, NULL, &axp2101_data_##inst,                      \
+			      &axp2101_config_##inst, POST_KERNEL,                                 \
+			      CONFIG_CHARGER_INIT_PRIORITY,                                        \
+			      &axp2101_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(AXP2101_INIT)
diff --git a/drivers/charger/charger_bq24190.c b/drivers/charger/charger_bq24190.c
index b7672a8880703..0fdf861c5afe2 100644
--- a/drivers/charger/charger_bq24190.c
+++ b/drivers/charger/charger_bq24190.c
@@ -18,7 +18,7 @@
 #include "zephyr/logging/log.h"
 #include <zephyr/drivers/gpio.h>
 
-LOG_MODULE_REGISTER(ti_bq24190);
+LOG_MODULE_REGISTER(ti_bq24190, CONFIG_CHARGER_LOG_LEVEL);
 
 struct bq24190_config {
 	struct i2c_dt_spec i2c;
diff --git a/drivers/charger/charger_bq25713.c b/drivers/charger/charger_bq25713.c
new file mode 100644
index 0000000000000..20d6ceb8f791a
--- /dev/null
+++ b/drivers/charger/charger_bq25713.c
@@ -0,0 +1,463 @@
+/*
+ * Copyright 2025 Palta Tech, S.A
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * BQ25713 Datasheet: https://www.ti.com/lit/ds/symlink/bq25713.pdf
+ */
+
+#define DT_DRV_COMPAT ti_bq25713
+
+#include <errno.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/charger.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(ti_bq25713, CONFIG_CHARGER_LOG_LEVEL);
+
+/* Charge Option 0 */
+#define BQ25713_REG_CO0_LOW          0x00
+#define BQ25713_REG_CO0_INHIBIT      0x01
+#define BQ25713_REG_CO0_INHIBIT_MASK BIT(0)
+
+/* Charge Current */
+#define BQ25713_REG_CC_LOW                    0x02
+#define BQ25713_REG_CC_CHARGE_CURRENT_MASK    GENMASK(12, 6)
+#define BQ25713_REG_CC_CHARGE_CURRENT_STEP_UA 64000
+#define BQ25713_REG_CC_CHARGE_CURRENT_MIN_UA  0
+#define BQ25713_REG_CC_CHARGE_CURRENT_MAX_UA  8128000
+
+/* Charger Status */
+#define BQ25713_REG_CS_HIGH            0x21
+#define BQ25713_REG_CS_AC_STAT         0x01
+#define BQ25713_REG_CS_AC_STAT_MASK    BIT(7)
+#define BQ25713_REG_CS_PRE_FAST_CHARGE GENMASK(2, 1)
+#define BQ25713_REG_CS_PRECHARGE       BIT(1)
+#define BQ25713_REG_CS_FASTCHARGE      BIT(2)
+
+/* Max Charge Voltage */
+#define BQ25713_REG_CV_LOW                    0x04
+#define BQ25713_REG_CV_CHARGE_VOLTAGE_MASK    GENMASK(14, 3)
+#define BQ25713_REG_CV_CHARGE_VOLTAGE_STEP_UV 8000
+#define BQ25713_REG_CV_CHARGE_VOLTAGE_MIN_UV  1024000
+#define BQ25713_REG_CV_CHARGE_VOLTAGE_MAX_UV  19200000
+
+/* Input current set by host IDPM */
+#define BQ25713_REG_IIN_HOST_HIGH    0x0F
+#define BQ25713_REG_IIN_HOST_MASK    GENMASK(7, 0)
+#define BQ25713_REG_IIN_HOST_STEP_UA 50000
+#define BQ25713_REG_IIN_HOST_MIN_UV  BQ25713_REG_IIN_HOST_STEP_UA
+#define BQ25713_REG_IIN_HOST_MAX_UV  6400000
+
+/*  Input voltage IDPM */
+#define BQ25713_REG_IIN_DPM_HIGH    0x25
+#define BQ25713_REG_IIN_DPM_MASK    BQ25713_REG_IIN_HOST_MASK
+#define BQ25713_REG_IIN_DPM_STEP_UA BQ25713_REG_IIN_HOST_STEP_UA
+
+/* Mininum system voltage */
+#define BQ25713_REG_MIN_SYS_VOLTAGE_HI      0x0D
+#define BQ25713_REG_MIN_SYS_VOLTAGE_MASK    GENMASK(5, 0)
+#define BQ25713_REG_MIN_SYS_VOLTAGE_STEP_UV 256000
+#define BQ25713_REG_MIN_SYS_VOLTAGE_MIN_UV  1024000
+#define BQ25713_REG_MIN_SYS_VOLTAGE_MAX_UV  16128000
+
+/*  Input voltage VDPM */
+#define BQ25713_REG_VIN_LOW                0x0A
+#define BQ25713_REG_VIN_DPM_MASK           GENMASK(13, 6)
+#define BQ25713_REG_VIN_DPM_STEP_UV        64000
+#define BQ25713_REG_VIN_DPM_OFFSET_UV      3200000
+#define BQ25713_REG_VIN_DPM_VOLTAGE_MIN_UV BQ25713_REG_VIN_DPM_OFFSET_UV
+#define BQ25713_REG_VIN_DPM_VOLTAGE_MAX_UV 195200000
+
+/* Manufacture ID */
+#define BQ25713_REG_ID_LOW       0x2E
+#define BQ25713_REG_ID_PN_25713  0x4088
+#define BQ25713_REG_ID_PN_25713B 0x408A
+
+#define BQ25713_FACTOR_U_TO_M 1000
+
+struct bq25713_config {
+	struct i2c_dt_spec i2c;
+	uint32_t vsys_min_uv;
+	uint32_t ichg_ua;
+	uint32_t vreg_uv;
+};
+
+static inline int bq25713_write8(const struct device *dev, uint8_t reg, uint8_t value)
+{
+	const struct bq25713_config *const config = dev->config;
+
+	return i2c_reg_write_byte_dt(&config->i2c, reg, value);
+}
+
+static inline int bq25713_read8(const struct device *dev, uint8_t reg, uint8_t *value)
+{
+	const struct bq25713_config *const config = dev->config;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->i2c, reg, value);
+	if (ret < 0) {
+		LOG_ERR("Unable to read register");
+	}
+	return ret;
+}
+
+static inline int bq25713_update8(const struct device *dev, uint8_t reg, uint8_t mask,
+				  uint8_t value)
+{
+	const struct bq25713_config *const config = dev->config;
+	int ret;
+
+	ret = i2c_reg_update_byte_dt(&config->i2c, reg, mask, value);
+	if (ret < 0) {
+		LOG_ERR("Unable to update register");
+	}
+	return ret;
+}
+
+static inline int bq25713_write16(const struct device *dev, uint8_t reg, uint16_t value)
+{
+	const struct bq25713_config *const config = dev->config;
+	uint8_t buf[3];
+
+	buf[0] = reg;
+	sys_put_le16(value, &buf[1]);
+
+	return i2c_write_dt(&config->i2c, buf, sizeof(buf));
+}
+
+static inline int bq25713_read16(const struct device *dev, uint8_t reg, uint16_t *value)
+{
+	const struct bq25713_config *config = dev->config;
+	uint8_t i2c_data[2];
+	int ret;
+
+	ret = i2c_burst_read_dt(&config->i2c, reg, i2c_data, sizeof(i2c_data));
+	if (ret < 0) {
+		LOG_ERR("Unable to read register");
+		return ret;
+	}
+
+	*value = sys_get_be16(i2c_data);
+
+	return 0;
+}
+
+static int bq25713_set_minimum_system_voltage(const struct device *dev, uint32_t voltage_uv)
+{
+	if (!IN_RANGE(voltage_uv, BQ25713_REG_MIN_SYS_VOLTAGE_MIN_UV,
+		      BQ25713_REG_MIN_SYS_VOLTAGE_MAX_UV)) {
+		LOG_WRN("minimum system voltage out of range: %umV, "
+			"clamping to the nearest limit",
+			voltage_uv / BQ25713_FACTOR_U_TO_M);
+	}
+
+	uint32_t v;
+
+	voltage_uv = CLAMP(voltage_uv, BQ25713_REG_MIN_SYS_VOLTAGE_MIN_UV,
+			   BQ25713_REG_MIN_SYS_VOLTAGE_MAX_UV);
+	v = voltage_uv / BQ25713_REG_MIN_SYS_VOLTAGE_STEP_UV;
+	v = FIELD_PREP(BQ25713_REG_MIN_SYS_VOLTAGE_MASK, v);
+	return bq25713_write8(dev, BQ25713_REG_MIN_SYS_VOLTAGE_HI, v);
+}
+
+static int bq25713_set_constant_charge_current(const struct device *dev, uint32_t current_ua)
+{
+	if (!IN_RANGE(current_ua, BQ25713_REG_CC_CHARGE_CURRENT_MIN_UA,
+		      BQ25713_REG_CC_CHARGE_CURRENT_MAX_UA)) {
+		LOG_WRN("charging current out of range: %umA, "
+			"clamping to the nearest limit",
+			current_ua / BQ25713_FACTOR_U_TO_M);
+	}
+	current_ua = CLAMP(current_ua, BQ25713_REG_CC_CHARGE_CURRENT_MIN_UA,
+			   BQ25713_REG_CC_CHARGE_CURRENT_MAX_UA);
+	uint32_t v;
+
+	v = current_ua / BQ25713_REG_CC_CHARGE_CURRENT_STEP_UA;
+	v = FIELD_PREP(BQ25713_REG_CC_CHARGE_CURRENT_MASK, v);
+
+	return bq25713_write16(dev, BQ25713_REG_CC_LOW, v);
+}
+
+static int bq25713_set_constant_charge_voltage(const struct device *dev, uint32_t voltage_uv)
+{
+	if (!IN_RANGE(voltage_uv, BQ25713_REG_CV_CHARGE_VOLTAGE_MIN_UV,
+		      BQ25713_REG_CV_CHARGE_VOLTAGE_MAX_UV)) {
+		LOG_WRN("charging voltage out of range: %umV, "
+			"clamping to the nearest limit",
+			voltage_uv / BQ25713_FACTOR_U_TO_M);
+	}
+
+	uint32_t v;
+
+	voltage_uv = CLAMP(voltage_uv, BQ25713_REG_CV_CHARGE_VOLTAGE_MIN_UV,
+			   BQ25713_REG_CV_CHARGE_VOLTAGE_MAX_UV);
+	v = voltage_uv / BQ25713_REG_CV_CHARGE_VOLTAGE_STEP_UV;
+	v = FIELD_PREP(BQ25713_REG_CV_CHARGE_VOLTAGE_MASK, v);
+	return bq25713_write16(dev, BQ25713_REG_CV_LOW, v);
+}
+
+static int bq25713_set_iindpm(const struct device *dev, uint32_t current_ua)
+{
+	if (!IN_RANGE(current_ua, BQ25713_REG_IIN_HOST_MIN_UV, BQ25713_REG_IIN_HOST_MAX_UV)) {
+		LOG_WRN("input current regulation out of range: %umA, "
+			"clamping to the nearest limit",
+			current_ua / BQ25713_FACTOR_U_TO_M);
+	}
+
+	uint32_t v;
+
+	current_ua = CLAMP(current_ua, BQ25713_REG_IIN_HOST_MIN_UV, BQ25713_REG_IIN_HOST_MAX_UV);
+	v = current_ua / BQ25713_REG_IIN_HOST_STEP_UA;
+	v = FIELD_PREP(BQ25713_REG_IIN_HOST_MASK, v);
+	return bq25713_write8(dev, BQ25713_REG_IIN_HOST_HIGH, v);
+}
+
+static int bq25713_set_vindpm(const struct device *dev, uint32_t voltage_ua)
+{
+	if (!IN_RANGE(voltage_ua, BQ25713_REG_VIN_DPM_VOLTAGE_MIN_UV,
+		      BQ25713_REG_VIN_DPM_VOLTAGE_MAX_UV)) {
+		LOG_WRN("input voltage regulation of range: %umV, "
+			"clamping to the nearest limit",
+			voltage_ua / BQ25713_FACTOR_U_TO_M);
+	}
+
+	uint32_t v;
+
+	voltage_ua = CLAMP(voltage_ua, BQ25713_REG_VIN_DPM_VOLTAGE_MIN_UV,
+			   BQ25713_REG_VIN_DPM_VOLTAGE_MAX_UV);
+	v = (voltage_ua - BQ25713_REG_VIN_DPM_OFFSET_UV) / BQ25713_REG_VIN_DPM_STEP_UV;
+	v = FIELD_PREP(BQ25713_REG_VIN_DPM_MASK, v);
+	return bq25713_write16(dev, BQ25713_REG_VIN_LOW, v);
+}
+
+static int bq25713_get_constant_charge_current(const struct device *dev, uint32_t *current_ua)
+{
+	uint16_t v;
+	int ret;
+
+	ret = bq25713_read16(dev, BQ25713_REG_CC_LOW, &v);
+	if (ret < 0) {
+		return ret;
+	}
+
+	v = FIELD_GET(BQ25713_REG_CC_CHARGE_CURRENT_MASK, v);
+
+	*current_ua = v * BQ25713_REG_CC_CHARGE_CURRENT_STEP_UA;
+
+	return 0;
+}
+
+static int bq25713_get_constant_charge_voltage(const struct device *dev, uint32_t *voltage_uv)
+{
+	uint16_t value;
+	int ret;
+
+	ret = bq25713_read16(dev, BQ25713_REG_CV_LOW, &value);
+	if (ret < 0) {
+		return ret;
+	}
+	value = FIELD_GET(BQ25713_REG_CV_CHARGE_VOLTAGE_MASK, value);
+
+	*voltage_uv = value * BQ25713_REG_CV_CHARGE_VOLTAGE_STEP_UV;
+
+	return 0;
+}
+
+static int bq25713_get_iindpm(const struct device *dev, uint32_t *current_ua)
+{
+	uint8_t value;
+	int ret;
+
+	ret = bq25713_read8(dev, BQ25713_REG_IIN_DPM_HIGH, &value);
+	if (ret < 0) {
+		return ret;
+	}
+	value = FIELD_GET(BQ25713_REG_IIN_DPM_MASK, value);
+
+	*current_ua = value * BQ25713_REG_IIN_DPM_STEP_UA;
+
+	return 0;
+}
+
+static int bq25713_get_vindpm(const struct device *dev, uint32_t *voltage_uv)
+{
+	uint16_t value;
+	int ret;
+
+	ret = bq25713_read16(dev, BQ25713_REG_VIN_LOW, &value);
+	if (ret < 0) {
+		return ret;
+	}
+	value = FIELD_GET(BQ25713_REG_VIN_DPM_MASK, value);
+
+	*voltage_uv = (value * BQ25713_REG_VIN_DPM_STEP_UV) + BQ25713_REG_VIN_DPM_OFFSET_UV;
+
+	return 0;
+}
+
+static int bq25713_get_status(const struct device *dev, enum charger_status *status)
+{
+	uint8_t charge_status;
+	int ret;
+
+	ret = bq25713_read8(dev, BQ25713_REG_CS_HIGH, &charge_status);
+	if (ret < 0) {
+		return ret;
+	}
+
+	switch (FIELD_GET(BQ25713_REG_CS_PRE_FAST_CHARGE, charge_status)) {
+	case BQ25713_REG_CS_FASTCHARGE:
+		__fallthrough;
+	case BQ25713_REG_CS_PRECHARGE:
+		*status = CHARGER_STATUS_CHARGING;
+		break;
+	default:
+		*status = CHARGER_STATUS_UNKNOWN;
+		break;
+	}
+
+	return 0;
+}
+
+static int bq25713_get_online(const struct device *dev, enum charger_online *online)
+{
+	uint8_t status;
+	int ret;
+
+	ret = bq25713_read8(dev, BQ25713_REG_CS_HIGH, &status);
+	if (ret < 0) {
+		return ret;
+	}
+
+	status = FIELD_GET(BQ25713_REG_CS_AC_STAT_MASK, status);
+	if (status == BQ25713_REG_CS_AC_STAT) {
+		*online = CHARGER_ONLINE_FIXED;
+	} else {
+		*online = CHARGER_ONLINE_OFFLINE;
+	}
+
+	return 0;
+}
+
+static int bq25713_charger_get_charge_type(const struct device *dev,
+					   enum charger_charge_type *charge_type)
+{
+	*charge_type = CHARGER_CHARGE_TYPE_UNKNOWN;
+	return 0;
+}
+
+static int bq25713_get_prop(const struct device *dev, charger_prop_t prop,
+			    union charger_propval *value)
+{
+	switch (prop) {
+	case CHARGER_PROP_ONLINE:
+		return bq25713_get_online(dev, &value->online);
+	case CHARGER_PROP_CHARGE_TYPE:
+		return bq25713_charger_get_charge_type(dev, &value->charge_type);
+	case CHARGER_PROP_STATUS:
+		return bq25713_get_status(dev, &value->status);
+	case CHARGER_PROP_CONSTANT_CHARGE_CURRENT_UA:
+		return bq25713_get_constant_charge_current(dev, &value->const_charge_current_ua);
+	case CHARGER_PROP_CONSTANT_CHARGE_VOLTAGE_UV:
+		return bq25713_get_constant_charge_voltage(dev, &value->const_charge_voltage_uv);
+	case CHARGER_PROP_INPUT_REGULATION_CURRENT_UA:
+		return bq25713_get_iindpm(dev, &value->input_current_regulation_current_ua);
+	case CHARGER_PROP_INPUT_REGULATION_VOLTAGE_UV:
+		return bq25713_get_vindpm(dev, &value->input_voltage_regulation_voltage_uv);
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int bq25713_set_prop(const struct device *dev, charger_prop_t prop,
+			    const union charger_propval *value)
+{
+	switch (prop) {
+	case CHARGER_PROP_CONSTANT_CHARGE_CURRENT_UA:
+		return bq25713_set_constant_charge_current(dev, value->const_charge_current_ua);
+	case CHARGER_PROP_CONSTANT_CHARGE_VOLTAGE_UV:
+		return bq25713_set_constant_charge_voltage(dev, value->const_charge_voltage_uv);
+	case CHARGER_PROP_INPUT_REGULATION_CURRENT_UA:
+		return bq25713_set_iindpm(dev, value->input_current_regulation_current_ua);
+	case CHARGER_PROP_INPUT_REGULATION_VOLTAGE_UV:
+		return bq25713_set_vindpm(dev, value->input_voltage_regulation_voltage_uv);
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int bq25713_charge_enable(const struct device *dev, const bool enable)
+{
+	uint8_t value = enable ? 0 : BQ25713_REG_CO0_INHIBIT;
+
+	return bq25713_update8(dev, BQ25713_REG_CO0_LOW, BQ25713_REG_CO0_INHIBIT_MASK, value);
+}
+
+static int bq25713_set_config(const struct device *dev)
+{
+	const struct bq25713_config *const config = dev->config;
+	union charger_propval value;
+	int ret;
+
+	value.const_charge_current_ua = config->ichg_ua;
+
+	ret = bq25713_set_constant_charge_current(dev, value.const_charge_current_ua);
+	if (ret < 0) {
+		return ret;
+	}
+
+	value.const_charge_voltage_uv = config->vreg_uv;
+
+	ret = bq25713_set_constant_charge_voltage(dev, value.const_charge_voltage_uv);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return bq25713_set_minimum_system_voltage(dev, config->vsys_min_uv);
+}
+
+static int bq25713_init(const struct device *dev)
+{
+	uint16_t value;
+	int ret;
+
+	ret = bq25713_read16(dev, BQ25713_REG_ID_LOW, &value);
+	if (ret < 0) {
+		return ret;
+	}
+
+	switch (value) {
+	case BQ25713_REG_ID_PN_25713:
+		__fallthrough;
+	case BQ25713_REG_ID_PN_25713B:
+		break;
+	default:
+		LOG_ERR("Error unknown model: 0x%04x\n", value);
+		return -ENODEV;
+	}
+
+	return bq25713_set_config(dev);
+}
+
+static DEVICE_API(charger, bq7513_driver_api) = {
+	.get_property = bq25713_get_prop,
+	.set_property = bq25713_set_prop,
+	.charge_enable = bq25713_charge_enable,
+};
+
+#define BQ25713_INIT(inst)                                                                         \
+                                                                                                   \
+	static const struct bq25713_config bq25713_config_##inst = {                               \
+		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
+		.ichg_ua = DT_INST_PROP(inst, constant_charge_current_max_microamp),               \
+		.vreg_uv = DT_INST_PROP(inst, constant_charge_voltage_max_microvolt),              \
+		.vsys_min_uv = DT_INST_PROP(inst, system_voltage_min_threshold_microvolt),         \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(inst, bq25713_init, NULL, NULL, &bq25713_config_##inst, POST_KERNEL, \
+			      CONFIG_CHARGER_INIT_PRIORITY, &bq7513_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(BQ25713_INIT)
diff --git a/drivers/charger/charger_max20335.c b/drivers/charger/charger_max20335.c
index 43d65bf9f800a..ff6ccd59c7d40 100644
--- a/drivers/charger/charger_max20335.c
+++ b/drivers/charger/charger_max20335.c
@@ -15,7 +15,7 @@
 #include <zephyr/sys/linear_range.h>
 
 #include "zephyr/logging/log.h"
-LOG_MODULE_REGISTER(max20335_charger);
+LOG_MODULE_REGISTER(max20335_charger, CONFIG_CHARGER_LOG_LEVEL);
 
 #define MAX20335_REG_STATUSA 0x02
 #define MAX20335_REG_STATUSB 0x03
diff --git a/drivers/charger/charger_pf1550.c b/drivers/charger/charger_pf1550.c
new file mode 100644
index 0000000000000..e53785a629879
--- /dev/null
+++ b/drivers/charger/charger_pf1550.c
@@ -0,0 +1,691 @@
+/*
+ * Copyright 2024 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nxp_pf1550_charger
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/charger.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/linear_range.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(pf1550_charger, CONFIG_CHARGER_LOG_LEVEL);
+
+#define INT_ENABLE_DELAY K_MSEC(500)
+
+#define CHARGER_CHG_INT           (0x80 + 0x00)
+#define CHARGER_CHG_INT_MASK      (0x80 + 0x02)
+#define CHARGER_CHG_INT_OK        (0x80 + 0x04)
+#define CHARGER_VBUS_SNS          (0x80 + 0x06)
+#define CHARGER_CHG_SNS           (0x80 + 0x07)
+#define CHARGER_BATT_SNS          (0x80 + 0x08)
+#define CHARGER_CHG_OPER          (0x80 + 0x09)
+#define CHARGER_CHG_TMR           (0x80 + 0x0A)
+#define CHARGER_CHG_EOC_CNFG      (0x80 + 0x0D)
+#define CHARGER_CHG_CURR_CNFG     (0x80 + 0x0E)
+#define CHARGER_BATT_REG          (0x80 + 0x0F)
+#define CHARGER_BATFET_CNFG       (0x80 + 0x11)
+#define CHARGER_THM_REG_CNFG      (0x80 + 0x12)
+#define CHARGER_VBUS_INLIM_CNFG   (0x80 + 0x14)
+#define CHARGER_VBUS_LIN_DPM      (0x80 + 0x15)
+#define CHARGER_USB_PHY_LDO_CNFG  (0x80 + 0x16)
+#define CHARGER_DBNC_DELAY_TIME   (0x80 + 0x18)
+#define CHARGER_CHG_INT_CNFG      (0x80 + 0x19)
+#define CHARGER_THM_ADJ_SETTING   (0x80 + 0x1A)
+#define CHARGER_VBUS2SYS_CNFG     (0x80 + 0x1B)
+#define CHARGER_LED_PWM           (0x80 + 0x1C)
+#define CHARGER_FAULT_BATFET_CNFG (0x80 + 0x1D)
+#define CHARGER_LED_CNFG          (0x80 + 0x1E)
+#define CHARGER_CHGR_KEY2         (0x80 + 0x1F)
+
+#define PF1550_BAT_IRQ      BIT(2)
+#define PF1550_CHG_IRQ      BIT(3)
+#define PF1550_VBUS_IRQ     BIT(5)
+#define PF1550_VBUS_DPM_IRQ BIT(5)
+#define CHG_INT_ENABLE_ALL  (0xFF)
+
+#define LED_PWM_LED_EN          BIT(7)
+#define LED_PWM_FULL_ON         BIT(5)
+
+#define LED_CNFG_LED_CFG        BIT(4)
+#define LED_CNFG_LEDOVRD        BIT(5)
+
+#define CHG_OPER_CHG_OPER_MASK          GENMASK(1, 0)
+#define CHG_CURR_CNFG_CHG_CC_MASK       GENMASK(4, 0)
+#define CHG_SNS_CHG_SNS_MASK            GENMASK(3, 0)
+#define VBUS_INLIM_CNFG_VBUS_INLIM_MASK GENMASK(7, 3)
+#define BATT_REG_CHGCV_MASK             GENMASK(5, 0)
+#define BATT_REG_VSYSMIN_MASK           GENMASK(7, 6)
+#define THM_REG_CNFG_THM_CNFG_MASK      GENMASK(1, 0)
+
+#define CHG_OPER_CHARGER_OFF_LINEAR_OFF     0
+#define CHG_OPER_CHARGER_OFF_LINEAR_ON      1
+#define CHG_OPER_CHARGER_ON_LINEAR_ON       2
+
+enum charger_pf1550_therm_mode {
+	PF1550_THERM_MODE_DISABLED,
+	PF1550_THERM_MODE_THERMISTOR,
+	PF1550_THERM_MODE_JEITA_1,
+	PF1550_THERM_MODE_JEITA_2,
+	PF1550_THERM_MODE_UNKNOWN,
+};
+
+/* synced with YAML binding */
+enum charger_pf1550_led_behaviour {
+	PF1550_LED_ON_IN_CHARGING_FLASH_IN_FAULT,
+	PF1550_LED_FLASH_IN_CHARGING_ON_IN_FAULT,
+	PF1550_LED_MANUAL_OFF
+};
+
+struct charger_pf1550_led_config {
+	bool enabled;
+	bool manual;
+	enum charger_pf1550_led_behaviour behaviour;
+};
+
+struct charger_pf1550_config {
+	struct i2c_dt_spec bus;
+	struct gpio_dt_spec int_gpio;
+	char *therm_mon_mode;
+	uint32_t charge_current_ua;
+	uint32_t vbus_ilim_ua;
+	uint32_t charge_voltage_max_uv;
+	uint32_t vsys_min_uv;
+};
+
+struct charger_pf1550_data {
+	const struct device *dev;
+	struct gpio_callback gpio_cb;
+	struct k_work int_routine_work;
+	struct k_work_delayable int_enable_work;
+	enum charger_status charger_status;
+	enum charger_online charger_online;
+	charger_status_notifier_t charger_status_notifier;
+	charger_online_notifier_t charger_online_notifier;
+	bool charger_enabled;
+	uint32_t charge_current_ua;
+	uint32_t vbus_ilim_ua;
+	struct charger_pf1550_led_config *led_config;
+};
+
+static const struct linear_range charger_vbus_ilim_range[] = {
+	LINEAR_RANGE_INIT(10000, 5000, 0, 8),
+	LINEAR_RANGE_INIT(100000, 50000, 9, 10),
+	LINEAR_RANGE_INIT(200000, 100000, 11, 19),
+	LINEAR_RANGE_INIT(1500000, 0, 20, 20),
+};
+
+static const struct linear_range charger_fast_charge_ua_range[] = {
+	LINEAR_RANGE_INIT(100000, 50000, 0, 18),
+};
+
+static const struct linear_range charger_battery_termination_uv_range[] = {
+	LINEAR_RANGE_INIT(3500000, 20000, 8, 55),
+};
+
+static const struct linear_range charger_vsysmin_uv[] = {
+	LINEAR_RANGE_INIT(3500000, 0, 0, 0),
+	LINEAR_RANGE_INIT(3700000, 0, 1, 1),
+	LINEAR_RANGE_INIT(4300000, 0, 2, 2),
+};
+
+static int pf1550_get_charger_status(const struct device *dev, enum charger_status *status)
+{
+	enum chg_sns {
+		PF1550_CHARGER_PRECHARGE,
+		PF1550_FAST_CHARGE_CONSTANT_CURRENT,
+		PF1550_FAST_CHARGE_CONSTANT_VOLTAGE,
+		PF1550_END_OF_CHARGE,
+		PF1550_CHARGE_DONE,
+		PF1550_TIMER_FAULT = 6,
+		PF1550_THERMISTOR_SUSPEND,
+		PF1550_CHARGER_OFF_INVALID_INPUT,
+		PF1550_BATTERY_OVERVOLTAGE,
+		PF1550_BATTERY_OVERTEMPERATURE,
+		PF1550_CHARGER_OFF_LINEAR_MODE = 12,
+	};
+
+	const struct charger_pf1550_config *const config = dev->config;
+	uint8_t val;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->bus, CHARGER_CHG_SNS, &val);
+	if (ret) {
+		return ret;
+	}
+
+	val = FIELD_GET(CHG_SNS_CHG_SNS_MASK, val);
+
+	if (val == PF1550_CHARGE_DONE) {
+		*status = CHARGER_STATUS_FULL;
+	} else if (val < PF1550_CHARGE_DONE) {
+		*status = CHARGER_STATUS_CHARGING;
+	} else {
+		*status = CHARGER_STATUS_NOT_CHARGING;
+	}
+
+	return 0;
+}
+
+static int pf1550_get_charger_online(const struct device *dev, enum charger_online *online)
+{
+	const struct charger_pf1550_config *const config = dev->config;
+	uint8_t val;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->bus, CHARGER_CHG_OPER, &val);
+	if (ret) {
+		return ret;
+	}
+
+	val = FIELD_GET(CHG_OPER_CHG_OPER_MASK, val);
+
+	switch (val) {
+	case CHG_OPER_CHARGER_ON_LINEAR_ON:
+		*online = CHARGER_ONLINE_FIXED;
+		break;
+	default:
+		*online = CHARGER_ONLINE_OFFLINE;
+		break;
+	};
+
+	return 0;
+}
+
+static int pf1550_set_constant_charge_current(const struct device *dev, uint32_t current_ua)
+{
+	const struct charger_pf1550_config *const config = dev->config;
+	uint16_t idx;
+	uint8_t val;
+	int ret;
+
+	ret = linear_range_group_get_index(charger_fast_charge_ua_range,
+					   ARRAY_SIZE(charger_fast_charge_ua_range), current_ua,
+					   &idx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val = FIELD_PREP(CHG_CURR_CNFG_CHG_CC_MASK, idx);
+
+	return i2c_reg_update_byte_dt(&config->bus, CHARGER_CHG_CURR_CNFG,
+				      CHG_CURR_CNFG_CHG_CC_MASK, val);
+}
+
+static int pf1550_set_vbus_ilim(const struct device *dev, uint32_t current_ua)
+{
+	const struct charger_pf1550_config *const config = dev->config;
+	uint16_t idx;
+	uint8_t val;
+	int ret;
+
+	ret = linear_range_group_get_index(charger_vbus_ilim_range,
+					   ARRAY_SIZE(charger_vbus_ilim_range), current_ua, &idx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val = FIELD_PREP(VBUS_INLIM_CNFG_VBUS_INLIM_MASK, idx);
+
+	return i2c_reg_update_byte_dt(&config->bus, CHARGER_VBUS_INLIM_CNFG,
+				      VBUS_INLIM_CNFG_VBUS_INLIM_MASK, val);
+}
+
+static int pf1550_set_vsys_min(const struct device *dev, uint32_t voltage_uv)
+{
+	const struct charger_pf1550_config *const config = dev->config;
+	uint16_t idx;
+	uint8_t val;
+	int ret;
+
+	ret = linear_range_group_get_index(charger_vsysmin_uv, ARRAY_SIZE(charger_vsysmin_uv),
+					   voltage_uv, &idx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val = FIELD_PREP(BATT_REG_VSYSMIN_MASK, idx);
+
+	return i2c_reg_update_byte_dt(&config->bus, CHARGER_BATT_REG, BATT_REG_VSYSMIN_MASK, val);
+}
+
+static int pf1550_set_charge_termination_uv(const struct device *dev, uint32_t voltage_uv)
+{
+	const struct charger_pf1550_config *const config = dev->config;
+	uint16_t idx;
+	uint8_t val;
+	int ret;
+
+	ret = linear_range_group_get_index(charger_battery_termination_uv_range,
+					   ARRAY_SIZE(charger_battery_termination_uv_range),
+					   voltage_uv, &idx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val = FIELD_PREP(BATT_REG_CHGCV_MASK, idx);
+
+	return i2c_reg_update_byte_dt(&config->bus, CHARGER_BATT_REG, BATT_REG_CHGCV_MASK, val);
+}
+
+static int pf1550_set_thermistor_mode(const struct device *dev, enum charger_pf1550_therm_mode mode)
+{
+	const struct charger_pf1550_config *const config = dev->config;
+	uint8_t val;
+
+	val = FIELD_PREP(THM_REG_CNFG_THM_CNFG_MASK, mode);
+
+	return i2c_reg_update_byte_dt(&config->bus, CHARGER_THM_REG_CNFG,
+				      THM_REG_CNFG_THM_CNFG_MASK, val);
+}
+
+static int pf1550_set_enabled(const struct device *dev, bool enable)
+{
+	struct charger_pf1550_data *data = dev->data;
+	const struct charger_pf1550_config *const config = dev->config;
+
+	int ret = i2c_reg_update_byte_dt(&config->bus, CHARGER_CHG_OPER, CHG_OPER_CHG_OPER_MASK,
+					 enable ? 2 : 0);
+
+	if (ret == 0) {
+		data->charger_enabled = enable;
+	}
+
+	return ret;
+}
+
+static int pf1550_get_interrupt_source(const struct device *dev, uint8_t *int_a)
+{
+	const struct charger_pf1550_config *config = dev->config;
+	uint8_t buf = 0;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->bus, CHARGER_CHG_INT, &buf);
+
+	if (int_a) {
+		*int_a = buf;
+	}
+	return ret;
+}
+
+static int pf1550_enable_interrupts(const struct device *dev)
+{
+	const struct charger_pf1550_config *config = dev->config;
+	int ret;
+
+	ret = pf1550_get_interrupt_source(dev, NULL);
+	if (ret < 0) {
+		LOG_WRN("Failed to clear pending interrupts: %d", ret);
+		return ret;
+	}
+
+	return i2c_reg_write_byte_dt(&config->bus, CHARGER_CHG_INT_MASK, CHG_INT_ENABLE_ALL);
+}
+
+static int pf1550_led_config(const struct device *dev)
+{
+	struct charger_pf1550_data *data = dev->data;
+	const struct charger_pf1550_config *config = dev->config;
+	struct charger_pf1550_led_config *cfg = data->led_config;
+	int ret;
+	uint8_t val;
+
+	cfg->enabled = true;
+
+	if (cfg->behaviour == PF1550_LED_MANUAL_OFF) {
+		cfg->manual = true;
+		cfg->enabled = false;
+	}
+
+	val = (cfg->enabled ? LED_PWM_LED_EN : 0) | LED_PWM_FULL_ON;
+
+	ret = i2c_reg_write_byte_dt(&config->bus, CHARGER_LED_PWM, val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val = (cfg->manual ? LED_CNFG_LEDOVRD : 0) |
+	      (cfg->behaviour == PF1550_LED_FLASH_IN_CHARGING_ON_IN_FAULT ?
+	       LED_CNFG_LED_CFG : 0);
+
+	return i2c_reg_write_byte_dt(&config->bus, CHARGER_LED_CNFG, val);
+}
+
+static int pf1550_init_properties(const struct device *dev)
+{
+	struct charger_pf1550_data *data = dev->data;
+	const struct charger_pf1550_config *config = dev->config;
+	int ret;
+
+	data->charger_enabled = true;
+	data->charge_current_ua = config->charge_current_ua;
+	data->vbus_ilim_ua = config->vbus_ilim_ua;
+
+	ret = pf1550_get_charger_status(dev, &data->charger_status);
+	if (ret < 0) {
+		LOG_ERR("Failed to read charger status: %d", ret);
+		return ret;
+	}
+
+	ret = pf1550_get_charger_online(dev, &data->charger_online);
+	if (ret < 0) {
+		LOG_ERR("Failed to read charger online: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+enum charger_pf1550_therm_mode pf1550_string_to_therm_mode(const char *mode_string)
+{
+	static const char *const modes[] = {
+		[PF1550_THERM_MODE_DISABLED] = "disabled",
+		[PF1550_THERM_MODE_THERMISTOR] = "thermistor",
+		[PF1550_THERM_MODE_JEITA_1] = "JEITA-1",
+		[PF1550_THERM_MODE_JEITA_2] = "JEITA-2",
+	};
+	enum charger_pf1550_therm_mode i;
+
+	for (i = PF1550_THERM_MODE_DISABLED; i < ARRAY_SIZE(modes); i++) {
+		if (strncmp(mode_string, modes[i], strlen(modes[i])) == 0) {
+			return i;
+		}
+	}
+
+	return PF1550_THERM_MODE_UNKNOWN;
+}
+
+static int pf1550_update_properties(const struct device *dev)
+{
+	struct charger_pf1550_data *data = dev->data;
+	const struct charger_pf1550_config *config = dev->config;
+	enum charger_pf1550_therm_mode therm_mode;
+	int ret;
+
+	ret = pf1550_set_vbus_ilim(dev, config->vbus_ilim_ua);
+	if (ret < 0) {
+		LOG_ERR("Failed to set vbus current limit: %d", ret);
+		return ret;
+	}
+
+	ret = pf1550_set_vsys_min(dev, config->vsys_min_uv);
+	if (ret < 0) {
+		LOG_ERR("Failed to set minimum system voltage threshold: %d", ret);
+		return ret;
+	}
+
+	ret = pf1550_set_charge_termination_uv(dev, config->charge_voltage_max_uv);
+	if (ret < 0) {
+		LOG_ERR("Failed to set recharge threshold: %d", ret);
+		return ret;
+	}
+
+	therm_mode = pf1550_string_to_therm_mode(config->therm_mon_mode);
+	ret = pf1550_set_thermistor_mode(dev, therm_mode);
+	if (ret < 0) {
+		LOG_ERR("Failed to set thermistor mode: %d", ret);
+		return ret;
+	}
+
+	ret = pf1550_set_constant_charge_current(dev, data->charge_current_ua);
+	if (ret < 0) {
+		LOG_ERR("Failed to set charge voltage: %d", ret);
+		return ret;
+	}
+
+	ret = pf1550_set_enabled(dev, data->charger_enabled);
+	if (ret < 0) {
+		LOG_ERR("Failed to set enabled: %d", ret);
+		return ret;
+	}
+
+	ret = pf1550_led_config(dev);
+	if (ret < 0) {
+		LOG_ERR("Failed to configure led: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int pf1550_get_prop(const struct device *dev, charger_prop_t prop,
+			   union charger_propval *val)
+{
+	struct charger_pf1550_data *data = dev->data;
+
+	switch (prop) {
+	case CHARGER_PROP_ONLINE:
+		val->online = data->charger_online;
+		return 0;
+	case CHARGER_PROP_STATUS:
+		val->status = data->charger_status;
+		return 0;
+	case CHARGER_PROP_CONSTANT_CHARGE_CURRENT_UA:
+		val->const_charge_current_ua = data->charge_current_ua;
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int pf1550_set_prop(const struct device *dev, charger_prop_t prop,
+			   const union charger_propval *val)
+{
+	struct charger_pf1550_data *data = dev->data;
+	int ret;
+
+	switch (prop) {
+	case CHARGER_PROP_CONSTANT_CHARGE_CURRENT_UA:
+		ret = pf1550_set_constant_charge_current(dev, val->const_charge_current_ua);
+		if (ret == 0) {
+			data->charge_current_ua = val->const_charge_current_ua;
+		}
+		return ret;
+	case CHARGER_PROP_INPUT_REGULATION_CURRENT_UA:
+		ret = pf1550_set_vbus_ilim(dev, val->input_current_regulation_current_ua);
+		if (ret == 0) {
+			data->vbus_ilim_ua = val->input_current_regulation_current_ua;
+		}
+		return ret;
+	case CHARGER_PROP_STATUS_NOTIFICATION:
+		data->charger_status_notifier = val->status_notification;
+		return 0;
+	case CHARGER_PROP_ONLINE_NOTIFICATION:
+		data->charger_online_notifier = val->online_notification;
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int pf1550_enable_interrupt_pin(const struct device *dev, bool enabled)
+{
+	const struct charger_pf1550_config *const config = dev->config;
+	gpio_flags_t flags;
+	int ret;
+
+	flags = enabled ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE;
+
+	ret = gpio_pin_interrupt_configure_dt(&config->int_gpio, flags);
+	if (ret < 0) {
+		LOG_ERR("Could not %s interrupt GPIO callback: %d", enabled ? "enable" : "disable",
+			ret);
+	}
+
+	return ret;
+}
+
+static void pf1550_gpio_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
+{
+	struct charger_pf1550_data *data = CONTAINER_OF(cb, struct charger_pf1550_data, gpio_cb);
+	int ret;
+
+	(void)pf1550_enable_interrupt_pin(data->dev, false);
+
+	ret = k_work_submit(&data->int_routine_work);
+	if (ret < 0) {
+		LOG_WRN("Could not submit int work: %d", ret);
+	}
+}
+
+static void pf1550_int_routine_work_handler(struct k_work *work)
+{
+	struct charger_pf1550_data *data =
+		CONTAINER_OF(work, struct charger_pf1550_data, int_routine_work);
+	uint8_t int_src;
+	int ret;
+
+	ret = pf1550_get_interrupt_source(data->dev, &int_src);
+	if (ret < 0) {
+		LOG_WRN("Failed to read interrupt source: %d", ret);
+		return;
+	}
+
+	LOG_DBG("Interrupt received: %x", int_src);
+
+	ret = pf1550_get_charger_status(data->dev, &data->charger_status);
+	if (ret < 0) {
+		LOG_WRN("Failed to read charger status: %d", ret);
+		return;
+	}
+
+	ret = pf1550_get_charger_online(data->dev, &data->charger_online);
+	if (ret < 0) {
+		LOG_WRN("Failed to read charger online %d", ret);
+		return;
+	}
+
+	if (data->charger_status_notifier != NULL) {
+		data->charger_status_notifier(data->charger_status);
+	}
+	if (data->charger_online_notifier != NULL) {
+		data->charger_online_notifier(data->charger_online);
+	}
+
+	if (data->charger_online != CHARGER_ONLINE_OFFLINE) {
+		(void)pf1550_update_properties(data->dev);
+	}
+
+	ret = k_work_reschedule(&data->int_enable_work, INT_ENABLE_DELAY);
+	if (ret < 0) {
+		LOG_WRN("Could not reschedule int_enable_work: %d", ret);
+	}
+}
+
+static void pf1550_int_enable_work_handler(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct charger_pf1550_data *data =
+		CONTAINER_OF(dwork, struct charger_pf1550_data, int_enable_work);
+
+	(void)pf1550_enable_interrupt_pin(data->dev, true);
+}
+
+static int pf1550_configure_interrupt_pin(const struct device *dev)
+{
+	struct charger_pf1550_data *data = dev->data;
+	const struct charger_pf1550_config *config = dev->config;
+	int ret;
+
+	ret = gpio_is_ready_dt(&config->int_gpio) ? 0 : -ENODEV;
+	if (ret < 0) {
+		LOG_ERR("Interrupt GPIO device not ready: %d", ret);
+		return ret;
+	}
+
+	ret = gpio_pin_configure_dt(&config->int_gpio, GPIO_INPUT);
+	if (ret < 0) {
+		LOG_ERR("Could not configure interrupt GPIO: %d", ret);
+		return ret;
+	}
+
+	gpio_init_callback(&data->gpio_cb, pf1550_gpio_callback, BIT(config->int_gpio.pin));
+	ret = gpio_add_callback_dt(&config->int_gpio, &data->gpio_cb);
+	if (ret < 0) {
+		LOG_ERR("Could not add interrupt GPIO callback: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int pf1550_init(const struct device *dev)
+{
+	struct charger_pf1550_data *data = dev->data;
+	const struct charger_pf1550_config *config = dev->config;
+	int ret;
+
+	if (!i2c_is_ready_dt(&config->bus)) {
+		return -ENODEV;
+	}
+
+	data->dev = dev;
+
+	ret = pf1550_init_properties(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	k_work_init(&data->int_routine_work, pf1550_int_routine_work_handler);
+	k_work_init_delayable(&data->int_enable_work, pf1550_int_enable_work_handler);
+
+	ret = pf1550_configure_interrupt_pin(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = pf1550_enable_interrupt_pin(dev, true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = pf1550_enable_interrupts(dev);
+	if (ret < 0) {
+		LOG_ERR("Failed to enable interrupts: %d", ret);
+		return ret;
+	}
+
+	ret = pf1550_update_properties(dev);
+	if (ret < 0) {
+		LOG_ERR("Failed to setup charger: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(charger, pf1550_driver_api) = {
+	.get_property = pf1550_get_prop,
+	.set_property = pf1550_set_prop,
+	.charge_enable = pf1550_set_enabled,
+};
+
+#define PF1550_DEFINE(inst)                                                                        \
+	static struct charger_pf1550_led_config charger_pf1550_led_config_##inst = {               \
+		.behaviour = DT_INST_ENUM_IDX(inst, pf1550_led_behaviour),                         \
+	};                                                                                         \
+	static struct charger_pf1550_data charger_pf1550_data_##inst = {                           \
+		.led_config = &charger_pf1550_led_config_##inst,                                   \
+	};                                                                                         \
+	static const struct charger_pf1550_config charger_pf1550_config_##inst = {                 \
+		.bus = I2C_DT_SPEC_GET(DT_INST_PARENT(inst)),                                      \
+		.int_gpio = GPIO_DT_SPEC_INST_GET(inst, pf1550_int_gpios),                         \
+		.charge_current_ua = DT_INST_PROP(inst, constant_charge_current_max_microamp),     \
+		.vsys_min_uv = DT_INST_PROP(inst, pf1550_system_voltage_min_threshold_microvolt),  \
+		.therm_mon_mode = DT_INST_PROP(inst, pf1550_thermistor_monitoring_mode),           \
+		.vbus_ilim_ua = DT_INST_PROP(inst, pf1550_vbus_current_limit_microamp),            \
+		.charge_voltage_max_uv =                                                           \
+			DT_INST_PROP(inst, constant_charge_voltage_max_microvolt),                 \
+	};                                                                                         \
+												   \
+	DEVICE_DT_INST_DEFINE(inst, &pf1550_init, NULL, &charger_pf1550_data_##inst,               \
+			      &charger_pf1550_config_##inst, POST_KERNEL,                          \
+			      CONFIG_MFD_INIT_PRIORITY, &pf1550_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(PF1550_DEFINE)
diff --git a/drivers/charger/emul_sbs_charger.c b/drivers/charger/emul_sbs_charger.c
index 90c64b908ab3d..7e5202b6f7950 100644
--- a/drivers/charger/emul_sbs_charger.c
+++ b/drivers/charger/emul_sbs_charger.c
@@ -17,7 +17,7 @@
 
 #include "sbs_charger.h"
 
-LOG_MODULE_REGISTER(sbs_sbs_charger);
+LOG_MODULE_REGISTER(sbs_sbs_charger, CONFIG_CHARGER_LOG_LEVEL);
 
 /** Static configuration for the emulator */
 struct sbs_charger_emul_cfg {
diff --git a/drivers/charger/sbs_charger.c b/drivers/charger/sbs_charger.c
index 3dc7f874a2df6..15a5eeea77325 100644
--- a/drivers/charger/sbs_charger.c
+++ b/drivers/charger/sbs_charger.c
@@ -17,7 +17,7 @@ struct sbs_charger_config {
 	struct i2c_dt_spec i2c;
 };
 
-LOG_MODULE_REGISTER(sbs_charger);
+LOG_MODULE_REGISTER(sbs_charger, CONFIG_CHARGER_LOG_LEVEL);
 
 static int sbs_cmd_reg_read(const struct device *dev, uint8_t reg_addr, uint16_t *val)
 {
diff --git a/drivers/clock_control/CMakeLists.txt b/drivers/clock_control/CMakeLists.txt
index 3a7892ef9ac05..2e8cf83005347 100644
--- a/drivers/clock_control/CMakeLists.txt
+++ b/drivers/clock_control/CMakeLists.txt
@@ -35,11 +35,14 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_SMARTBOND           clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NUMAKER_SCC         clock_control_numaker_scc.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NXP_S32             clock_control_nxp_s32.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RA_CGC      clock_control_renesas_ra_cgc.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RENESAS_RZ_CPG      clock_control_renesas_rz_cpg.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_control_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL   clock_control_nrf2_global_hsfll.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RTS5912_SCCON       clock_control_rts5912_sccon.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL       clock_control_nrf2_audiopll.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_IT51XXX             clock_control_it51xxx.c)
 
 if(CONFIG_CLOCK_CONTROL_NRF2)
   zephyr_library_sources(clock_control_nrf2_common.c)
@@ -54,6 +57,8 @@ if(CONFIG_CLOCK_CONTROL_STM32_CUBE)
   zephyr_library_sources_ifdef(CONFIG_CLOCK_STM32_MCO clock_stm32_mco.c)
 if(CONFIG_SOC_SERIES_STM32MP1X)
   zephyr_library_sources(clock_stm32_ll_mp1.c)
+elseif(CONFIG_SOC_SERIES_STM32MP13X)
+  zephyr_library_sources(clock_stm32_ll_mp13.c)
 elseif(CONFIG_SOC_SERIES_STM32H7X)
   zephyr_library_sources(clock_stm32_ll_h7.c)
 elseif(CONFIG_SOC_SERIES_STM32H7RSX)
diff --git a/drivers/clock_control/Kconfig b/drivers/clock_control/Kconfig
index a746628d86db9..229a45792e8d9 100644
--- a/drivers/clock_control/Kconfig
+++ b/drivers/clock_control/Kconfig
@@ -88,6 +88,8 @@ source "drivers/clock_control/Kconfig.agilex5"
 
 source "drivers/clock_control/Kconfig.renesas_ra_cgc"
 
+source "drivers/clock_control/Kconfig.renesas_rz_cpg"
+
 source "drivers/clock_control/Kconfig.max32"
 
 source "drivers/clock_control/Kconfig.ambiq"
@@ -106,4 +108,6 @@ source "drivers/clock_control/Kconfig.siwx91x"
 
 source "drivers/clock_control/Kconfig.wch_rcc"
 
+source "drivers/clock_control/Kconfig.it51xxx"
+
 endif # CLOCK_CONTROL
diff --git a/drivers/clock_control/Kconfig.it51xxx b/drivers/clock_control/Kconfig.it51xxx
new file mode 100644
index 0000000000000..2619f96f6c243
--- /dev/null
+++ b/drivers/clock_control/Kconfig.it51xxx
@@ -0,0 +1,17 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config CLOCK_CONTROL_IT51XXX
+	bool "ITE IT51XXX clock controller driver"
+	default y
+	depends on DT_HAS_ITE_IT51XXX_ECPM_ENABLED
+	help
+	  This option enables the clock controller driver for IT51XXX.
+
+if CLOCK_CONTROL_IT51XXX
+
+config IT51XXX_PLL_SEQUENCE_PRIORITY
+	int
+	default 1
+
+endif # CLOCK_CONTROL_IT51XXX
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index b5b066ac48ebf..0a3c7f652fb13 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -128,6 +128,29 @@ config CLOCK_CONTROL_NRF_USES_TEMP_SENSOR
 endif # CLOCK_CONTROL_NRF_DRIVER_CALIBRATION
 endif # CLOCK_CONTROL_NRF_K32SRC_RC_CALIBRATION
 
+config CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+	bool "HFINT clock calibration"
+	depends on SOC_NRF54L05 || SOC_NRF54L10 || SOC_NRF54L15
+	depends on DT_HAS_NORDIC_NRF_HFXO_ENABLED
+	depends on !TRUSTED_EXECUTION_NONSECURE
+	select EXPERIMENTAL
+	help
+	  Enables calibration of HFINT clock on every start of HFXO clock.
+
+if CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+
+config CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD
+	int "HFINT clock calibration period in milliseconds"
+	default 60000
+	help
+	  Periodically, HFINT clock calibration is performed.
+	  This includes requesting HFXO clock and starting actual calibration.
+	  Once the calibration is finished, the HFXO clock is released.
+	  Set to 0 to disable periodic calibration - in such case calibration
+	  will be done only when HFXO is started by the application itself.
+
+endif # CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+
 choice CLOCK_CONTROL_NRF_ACCURACY_PPM
 	prompt "32KHz clock accuracy"
 	default CLOCK_CONTROL_NRF_K32SRC_500PPM if CLOCK_CONTROL_NRF_K32SRC_RC && SOC_COMPATIBLE_NRF52X
@@ -179,12 +202,17 @@ config CLOCK_CONTROL_NRF2
 	depends on SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR
 	select ONOFF
 	select NRFS if HAS_NRFS
-	imply NRFS_LOCAL_DOMAIN_DVFS_SCALE_DOWN_AFTER_INIT if NRFS_DVFS_LOCAL_DOMAIN
 	help
 	  Support for nRF clock control devices.
 
 if CLOCK_CONTROL_NRF2
 
+config CLOCK_CONTROL_NRF2_HSFLL_REQ_LOW_FREQ
+	bool "Local domain scale down after init"
+	default y if NRFS_DVFS_LOCAL_DOMAIN
+	help
+	  Request the lowest operating point after DVFS initialization.
+
 config CLOCK_CONTROL_NRF2_NRFS_DVFS_TIMEOUT_MS
 	int "Timeout waiting for nrfs dvfs service callback in milliseconds"
 	default 2000
@@ -226,4 +254,10 @@ config CLOCK_CONTROL_NRF2_GLOBAL_HSFLL_INIT_PRIORITY
 
 endif # CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
 
+config CLOCK_CONTROL_NRF2_AUDIOPLL
+	bool "NRFS AudioPLL driver support"
+	depends on DT_HAS_NORDIC_NRFS_AUDIOPLL_ENABLED
+	depends on NRFS_AUDIOPLL_SERVICE_ENABLED
+	default y
+
 endif # CLOCK_CONTROL_NRF2
diff --git a/drivers/clock_control/Kconfig.renesas_rz_cpg b/drivers/clock_control/Kconfig.renesas_rz_cpg
new file mode 100644
index 0000000000000..6d8e04cefce57
--- /dev/null
+++ b/drivers/clock_control/Kconfig.renesas_rz_cpg
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config CLOCK_CONTROL_RENESAS_RZ_CPG
+	bool "Renesas RZ/G Clock Control Driver"
+	default y
+	depends on DT_HAS_RENESAS_RZ_CPG_ENABLED
+	select USE_RZ_FSP_CPG
+	help
+	  Enable support for Renesas RZ CPG Clock Pulse Generator (CPG) driver.
+	  The CPG driver supports only module's clocks.
+	  The PLLs and core clocks are not configured by the CPG driver.
diff --git a/drivers/clock_control/Kconfig.stm32 b/drivers/clock_control/Kconfig.stm32
index d99fa3b62eb29..9dacd04dbeac9 100644
--- a/drivers/clock_control/Kconfig.stm32
+++ b/drivers/clock_control/Kconfig.stm32
@@ -9,7 +9,7 @@ menuconfig CLOCK_CONTROL_STM32_CUBE
 	depends on SOC_FAMILY_STM32
 	default y
 	select USE_STM32_LL_UTILS
-	select USE_STM32_LL_RCC if (SOC_SERIES_STM32MP1X || SOC_SERIES_STM32H7X || \
+	select USE_STM32_LL_RCC if (SOC_SERIES_STM32MP1X || SOC_SERIES_STM32MP13X || SOC_SERIES_STM32H7X || \
 		SOC_SERIES_STM32H7RSX || SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X || \
 		SOC_SERIES_STM32N6X)
 	select RUNTIME_NMI if ($(dt_nodelabel_enabled,clk_hse) && \
diff --git a/drivers/clock_control/clock_control_ambiq.c b/drivers/clock_control/clock_control_ambiq.c
index 77fdcbad6bda1..436b5234fa372 100644
--- a/drivers/clock_control/clock_control_ambiq.c
+++ b/drivers/clock_control/clock_control_ambiq.c
@@ -11,7 +11,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/clock_control/clock_control_ambiq.h>
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_ambiq, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
diff --git a/drivers/clock_control/clock_control_esp32.c b/drivers/clock_control/clock_control_esp32.c
index 902f186c10e57..6ee615b9bbab8 100644
--- a/drivers/clock_control/clock_control_esp32.c
+++ b/drivers/clock_control/clock_control_esp32.c
@@ -105,7 +105,8 @@ static void esp32_clock_perip_init(void)
 	soc_reset_reason_t rst_reason = esp_rom_get_reset_reason(0);
 
 	if ((rst_reason != RESET_REASON_CPU0_MWDT0) && (rst_reason != RESET_REASON_CPU0_MWDT1) &&
-	    (rst_reason != RESET_REASON_CPU0_SW) && (rst_reason != RESET_REASON_CPU0_RTC_WDT)) {
+	    (rst_reason != RESET_REASON_CPU0_SW) && (rst_reason != RESET_REASON_CPU0_RTC_WDT) &&
+	    (rst_reason != RESET_REASON_CPU0_JTAG)) {
 
 		periph_ll_disable_clk_set_rst(PERIPH_UART1_MODULE);
 		periph_ll_disable_clk_set_rst(PERIPH_I2C0_MODULE);
diff --git a/drivers/clock_control/clock_control_it51xxx.c b/drivers/clock_control/clock_control_it51xxx.c
new file mode 100644
index 0000000000000..4cb5fdffef37c
--- /dev/null
+++ b/drivers/clock_control/clock_control_it51xxx.c
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ite_it51xxx_ecpm
+
+#include <soc.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/ite-it51xxx-clock.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-it51xxx-intc.h>
+#include <zephyr/irq.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(clock_control_it51xxx, LOG_LEVEL_ERR);
+
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	     "only one ite,it51xxx-ecpm compatible node can be supported");
+
+/* it51xxx ECPM registers definition */
+/* 0x02: Clock Gating Control 2 register */
+#define ECPM_CGCTRL2R     0x02
+#define ECPM_CIRCG        BIT(5)
+#define ECPM_SWUCCG       BIT(4)
+/* 0x03: PLL Control */
+#define ECPM_PLLCTRL      0x03
+/* 0x04: Auto Clock Gating */
+#define ECPM_AUTOCG       0x04
+#define ECPM_AUART1CG     BIT(6)
+#define ECPM_AUART2CG     BIT(5)
+#define ECPM_ASSPICG      BIT(4)
+#define ECPM_ACIRCG       BIT(2)
+/* 0x02: Clock Gating Control 5 register */
+#define ECPM_CGCTRL3R     0x05
+#define ECPM_PECICG       BIT(3)
+#define ECPM_SSPICG       BIT(1)
+/* 0x06: PLL Frequency */
+#define ECPM_PLLFREQR     0x06
+#define ECPM_PLLFREQ_MASK GENMASK(3, 0)
+
+static const uint8_t pll_cfg[] = {
+	[PLL_18400_KHZ] = 0x01,
+	[PLL_32300_KHZ] = 0x03,
+	[PLL_64500_KHZ] = 0x07,
+	[PLL_48000_KHZ] = 0x09,
+};
+
+struct clock_control_it51xxx_data {
+	const uint8_t *pll_configuration;
+};
+
+/* Driver config */
+struct clock_control_it51xxx_config {
+	mm_reg_t ecpm_base;
+	int pll_freq;
+};
+
+/* Clock controller local functions */
+static inline int clock_control_it51xxx_on(const struct device *dev,
+					   clock_control_subsys_t sub_system)
+{
+	const struct clock_control_it51xxx_config *const config = dev->config;
+	struct ite_clk_cfg *clk_cfg = (struct ite_clk_cfg *)(sub_system);
+
+	/* Enable the clock of this module */
+	sys_write8(sys_read8(config->ecpm_base + clk_cfg->ctrl) & ~(clk_cfg->bits),
+		   config->ecpm_base + clk_cfg->ctrl);
+
+	return 0;
+}
+
+static inline int clock_control_it51xxx_off(const struct device *dev,
+					    clock_control_subsys_t sub_system)
+{
+	const struct clock_control_it51xxx_config *const config = dev->config;
+	struct ite_clk_cfg *clk_cfg = (struct ite_clk_cfg *)(sub_system);
+	uint8_t tmp_mask = 0;
+
+	/* CGCTRL3R, bit 6, must always write a 1. */
+	tmp_mask = (clk_cfg->ctrl == IT51XXX_ECPM_CGCTRL3R_OFF) ? 0x40 : 0x00;
+	sys_write8(sys_read8(config->ecpm_base + clk_cfg->ctrl) | clk_cfg->bits | tmp_mask,
+		   config->ecpm_base + clk_cfg->ctrl);
+
+	return 0;
+}
+
+static int clock_control_it51xxx_get_rate(const struct device *dev,
+					  clock_control_subsys_t sub_system, uint32_t *rate)
+{
+	const struct clock_control_it51xxx_config *const config = dev->config;
+	int reg_val = sys_read8(config->ecpm_base + ECPM_PLLFREQR) & ECPM_PLLFREQ_MASK;
+
+	switch (reg_val) {
+	case 0x01:
+		*rate = KHZ(18400);
+		break;
+	case 0x03:
+		*rate = KHZ(32300);
+		break;
+	case 0x07:
+		*rate = KHZ(64500);
+		break;
+	case 0x09:
+		*rate = KHZ(48000);
+		break;
+	default:
+		return -ERANGE;
+	}
+
+	return 0;
+}
+
+static void pll_change_isr(const void *unused)
+{
+	ARG_UNUSED(unused);
+
+	/*
+	 * We are here because we have completed changing PLL sequence,
+	 * so disabled PLL frequency change event interrupt.
+	 */
+	irq_disable(IT51XXX_IRQ_PLL_CHANGE);
+}
+
+static void chip_configure_pll(const struct device *dev, uint8_t pll)
+{
+	const struct clock_control_it51xxx_config *config = dev->config;
+
+	/* Set pll frequency change event */
+	IRQ_CONNECT(IT51XXX_IRQ_PLL_CHANGE, 0, pll_change_isr, NULL, IRQ_TYPE_EDGE_RISING);
+	/* Clear interrupt status of pll frequency change event */
+	ite_intc_isr_clear(IT51XXX_IRQ_PLL_CHANGE);
+
+	irq_enable(IT51XXX_IRQ_PLL_CHANGE);
+	/*
+	 * Configure PLL clock dividers.
+	 * Writing data to these registers doesn't change the PLL frequency immediately until the
+	 * status is changed into wakeup from the sleep mode.
+	 * The following code is intended to make the system enter sleep mode, and wait PLL
+	 * frequency change event to wakeup chip to complete PLL update.
+	 */
+	sys_write8(pll, config->ecpm_base + ECPM_PLLFREQR);
+
+	/* Chip sleep after wait for interrupt (wfi) instruction */
+	chip_pll_ctrl(CHIP_PLL_SLEEP);
+	/* Chip sleep and wait timer wake it up */
+	__asm__ volatile("wfi");
+	/* Chip sleep and wait timer wake it up */
+	chip_pll_ctrl(CHIP_PLL_DOZE);
+}
+
+static int clock_control_it51xxx_init(const struct device *dev)
+{
+	const struct clock_control_it51xxx_config *config = dev->config;
+	struct clock_control_it51xxx_data *data = dev->data;
+	int reg_val = sys_read8(config->ecpm_base + ECPM_PLLFREQR) & ECPM_PLLFREQ_MASK;
+	uint8_t autocg;
+
+	/* Disable auto gating and enable it by the respective module. */
+	autocg = sys_read8(config->ecpm_base + ECPM_AUTOCG);
+	sys_write8(autocg & ~(ECPM_AUART1CG | ECPM_AUART2CG | ECPM_ASSPICG | ECPM_ACIRCG),
+		   config->ecpm_base + ECPM_AUTOCG);
+
+	/* The following modules are gated in the initial state */
+	sys_write8(ECPM_CIRCG | ECPM_SWUCCG, config->ecpm_base + ECPM_CGCTRL2R);
+	sys_write8(sys_read8(config->ecpm_base + ECPM_CGCTRL3R) | ECPM_PECICG | ECPM_SSPICG,
+		   config->ecpm_base + ECPM_CGCTRL3R);
+
+	if (IS_ENABLED(CONFIG_ITE_IT51XXX_INTC)) {
+		ite_intc_save_and_disable_interrupts();
+	}
+
+	if (reg_val != data->pll_configuration[config->pll_freq]) {
+		/* configure PLL clock */
+		chip_configure_pll(dev, data->pll_configuration[config->pll_freq]);
+	}
+
+	if (IS_ENABLED(CONFIG_ITE_IT51XXX_INTC)) {
+		ite_intc_restore_interrupts();
+	}
+
+	return 0;
+}
+
+/* Clock controller driver registration */
+static DEVICE_API(clock_control, clock_control_it51xxx_api) = {
+	.on = clock_control_it51xxx_on,
+	.off = clock_control_it51xxx_off,
+	.get_rate = clock_control_it51xxx_get_rate,
+};
+
+static struct clock_control_it51xxx_data clock_control_it51xxx_data = {
+	.pll_configuration = pll_cfg,
+};
+
+static const struct clock_control_it51xxx_config clock_control_it51xxx_cfg = {
+	.ecpm_base = DT_INST_REG_ADDR(0),
+	.pll_freq = DT_INST_PROP(0, pll_frequency),
+};
+
+DEVICE_DT_INST_DEFINE(0, clock_control_it51xxx_init, NULL, &clock_control_it51xxx_data,
+		      &clock_control_it51xxx_cfg, PRE_KERNEL_1,
+		      CONFIG_IT51XXX_PLL_SEQUENCE_PRIORITY, &clock_control_it51xxx_api);
diff --git a/drivers/clock_control/clock_control_mcux_syscon.c b/drivers/clock_control/clock_control_mcux_syscon.c
index a9e27e731c43d..93a07b830c8cd 100644
--- a/drivers/clock_control/clock_control_mcux_syscon.c
+++ b/drivers/clock_control/clock_control_mcux_syscon.c
@@ -59,9 +59,11 @@ static int mcux_lpc_syscon_clock_control_on(const struct device *dev,
 	case MCUX_PORT3_CLK:
 		CLOCK_EnableClock(kCLOCK_GatePORT3);
 		break;
+#if (defined(FSL_FEATURE_SOC_PORT_COUNT) && (FSL_FEATURE_SOC_PORT_COUNT > 4))
 	case MCUX_PORT4_CLK:
 		CLOCK_EnableClock(kCLOCK_GatePORT4);
 		break;
+#endif /* defined(FSL_FEATURE_SOC_PORT_COUNT) */
 #else
 	case MCUX_PORT0_CLK:
 		CLOCK_EnableClock(kCLOCK_Port0);
@@ -374,6 +376,8 @@ static int mcux_lpc_syscon_clock_control_get_subsys_rate(const struct device *de
 	case MCUX_I3C_CLK:
 #if CONFIG_SOC_SERIES_MCXN
 		*rate = CLOCK_GetI3cClkFreq(0);
+#elif CONFIG_SOC_SERIES_MCXA
+		*rate = CLOCK_GetI3CFClkFreq();
 #else
 		*rate = CLOCK_GetI3cClkFreq();
 #endif
diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index 03955d3fb7d3a..5e3fb6875e3c8 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -14,6 +14,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/irq.h>
+#include <nrf_erratas.h>
 
 LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
@@ -172,9 +173,90 @@ static void set_on_state(uint32_t *flags)
 	irq_unlock(key);
 }
 
+#ifdef CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+
+static void nrf54l_errata_30_workaround(void)
+{
+	while (FIELD_GET(CLOCK_XO_STAT_STATE_Msk, NRF_CLOCK->XO.STAT) !=
+	       CLOCK_XO_STAT_STATE_Running) {
+	}
+	const uint32_t higher_bits = *((volatile uint32_t *)0x50120820UL) & 0xFFFFFFC0;
+	*((volatile uint32_t *)0x50120864UL) = 1 | BIT(31);
+	*((volatile uint32_t *)0x50120848UL) = 1;
+	uint32_t off_abs = 24;
+
+	while (off_abs >= 24) {
+		*((volatile uint32_t *)0x50120844UL) = 1;
+		while (((*((volatile uint32_t *)0x50120840UL)) & (1 << 16)) != 0) {
+		}
+		const uint32_t current_cal = *((volatile uint32_t *)0x50120820UL) & 0x3F;
+		const uint32_t cal_result = *((volatile uint32_t *)0x50120840UL) & 0x7FF;
+		int32_t off = 1024 - cal_result;
+
+		off_abs = (off < 0) ? -off : off;
+
+		if (off >= 24 && current_cal < 0x3F) {
+			*((volatile uint32_t *)0x50120820UL) = higher_bits | (current_cal + 1);
+		} else if (off <= -24 && current_cal > 0) {
+			*((volatile uint32_t *)0x50120820UL) = higher_bits | (current_cal - 1);
+		}
+	}
+
+	*((volatile uint32_t *)0x50120848UL) = 0;
+	*((volatile uint32_t *)0x50120864UL) = 0;
+}
+
+#if CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD
+
+static struct onoff_client hf_cal_cli;
+
+static void calibration_finished_callback(struct onoff_manager *mgr,
+					  struct onoff_client *cli,
+					  uint32_t state,
+					  int res)
+{
+	(void)onoff_cancel_or_release(mgr, cli);
+}
+
+static void calibration_handler(struct k_timer *timer)
+{
+	nrf_clock_hfclk_t clk_src;
+
+	bool ret = nrfx_clock_is_running(NRF_CLOCK_DOMAIN_HFCLK, &clk_src);
+
+	if (ret && (clk_src == NRF_CLOCK_HFCLK_HIGH_ACCURACY)) {
+		return;
+	}
+
+	sys_notify_init_callback(&hf_cal_cli.notify, calibration_finished_callback);
+	(void)onoff_request(z_nrf_clock_control_get_onoff(CLOCK_CONTROL_NRF_SUBSYS_HF),
+			    &hf_cal_cli);
+}
+
+static K_TIMER_DEFINE(calibration_timer, calibration_handler, NULL);
+
+static int calibration_init(void)
+{
+	k_timer_start(&calibration_timer,
+		      K_NO_WAIT,
+		      K_MSEC(CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD));
+
+	return 0;
+}
+
+SYS_INIT(calibration_init, APPLICATION, 0);
+
+#endif /* CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION_PERIOD */
+#endif /* CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION */
+
 static void clkstarted_handle(const struct device *dev,
 			      enum clock_control_nrf_type type)
 {
+#if CONFIG_CLOCK_CONTROL_NRF_HFINT_CALIBRATION
+	if (nrf54l_errata_30() && (type == CLOCK_CONTROL_NRF_TYPE_HFCLK)) {
+		nrf54l_errata_30_workaround();
+	}
+#endif
 	struct nrf_clock_control_sub_data *sub_data = get_sub_data(dev, type);
 	clock_control_cb_t callback = sub_data->cb;
 	void *user_data = sub_data->user_data;
@@ -599,6 +681,17 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 	const struct device *dev = CLOCK_DEVICE;
 
 	switch (event) {
+#if NRF_CLOCK_HAS_XO_TUNE
+	case NRFX_CLOCK_EVT_XO_TUNED:
+		clkstarted_handle(dev, CLOCK_CONTROL_NRF_TYPE_HFCLK);
+		break;
+	case NRFX_CLOCK_EVT_HFCLK_STARTED:
+		/* HFCLK is stable after XOTUNED event.
+		 * HFCLK_STARTED means only that clock has been started.
+		 */
+		break;
+#else
+	/* HFCLK started should be used only if tune operation is done implicitly. */
 	case NRFX_CLOCK_EVT_HFCLK_STARTED:
 	{
 		struct nrf_clock_control_sub_data *data =
@@ -613,6 +706,8 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 
 		break;
 	}
+#endif
+
 #if NRF_CLOCK_HAS_HFCLK192M
 	case NRFX_CLOCK_EVT_HFCLK192M_STARTED:
 		clkstarted_handle(dev, CLOCK_CONTROL_NRF_TYPE_HFCLK192M);
@@ -629,6 +724,7 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 		}
 		clkstarted_handle(dev, CLOCK_CONTROL_NRF_TYPE_LFCLK);
 		break;
+#if NRF_CLOCK_HAS_CALIBRATION
 	case NRFX_CLOCK_EVT_CAL_DONE:
 		if (IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_DRIVER_CALIBRATION)) {
 			z_nrf_clock_calibration_done_handler();
@@ -637,9 +733,11 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
 			__ASSERT_NO_MSG(false);
 		}
 		break;
+#endif
+#if NRF_CLOCK_HAS_PLL
 	case NRFX_CLOCK_EVT_PLL_STARTED:
+#endif
 #if NRF_CLOCK_HAS_XO_TUNE
-	case NRFX_CLOCK_EVT_XO_TUNED:
 	case NRFX_CLOCK_EVT_XO_TUNE_ERROR:
 	case NRFX_CLOCK_EVT_XO_TUNE_FAILED:
 #endif
diff --git a/drivers/clock_control/clock_control_nrf2_audiopll.c b/drivers/clock_control/clock_control_nrf2_audiopll.c
new file mode 100644
index 0000000000000..c4df962144a0c
--- /dev/null
+++ b/drivers/clock_control/clock_control_nrf2_audiopll.c
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nordic_nrfs_audiopll
+
+#include "clock_control_nrf2_common.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/clock/nrfs-audiopll.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <nrfs_audiopll.h>
+#include <nrfs_backend_ipc_service.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(clock_control_nrf2, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
+
+#define SHIM_DEFAULT_PRESCALER AUDIOPLL_DIV_12
+
+BUILD_ASSERT(
+	DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	"multiple instances not supported"
+);
+
+BUILD_ASSERT(DT_INST_PROP(0, frequency) >= NRFS_AUDIOPLL_FREQ_MIN);
+BUILD_ASSERT(DT_INST_PROP(0, frequency) <= NRFS_AUDIOPLL_FREQ_MAX);
+
+struct shim_data {
+	struct onoff_manager mgr;
+	onoff_notify_fn mgr_notify;
+	const struct device *dev;
+	struct k_sem evt_sem;
+	nrfs_audiopll_evt_type_t evt;
+};
+
+static int shim_nrfs_request_enable(const struct device *dev)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send enable request");
+
+	dev_data->evt = NRFS_AUDIOPLL_EVT_ENABLED;
+	err = nrfs_audiopll_enable_request(dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int shim_nrfs_request_disable(const struct device *dev)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send disable request");
+
+	dev_data->evt = NRFS_AUDIOPLL_EVT_DISABLED;
+	err = nrfs_audiopll_disable_request(dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static void onoff_start_option(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	struct shim_data *dev_data = CONTAINER_OF(mgr, struct shim_data, mgr);
+	const struct device *dev = dev_data->dev;
+	int ret;
+
+	dev_data->mgr_notify = notify;
+
+	ret = shim_nrfs_request_enable(dev);
+	if (ret) {
+		dev_data->mgr_notify = NULL;
+		notify(mgr, -EIO);
+	}
+}
+
+static void onoff_stop_option(struct onoff_manager *mgr, onoff_notify_fn notify)
+{
+	struct shim_data *dev_data = CONTAINER_OF(mgr, struct shim_data, mgr);
+	const struct device *dev = dev_data->dev;
+	int ret;
+
+	dev_data->mgr_notify = notify;
+
+	ret = shim_nrfs_request_disable(dev);
+	if (ret) {
+		dev_data->mgr_notify = NULL;
+		notify(mgr, -EIO);
+	}
+}
+
+static const struct onoff_transitions shim_mgr_transitions = {
+	.start = onoff_start_option,
+	.stop  = onoff_stop_option
+};
+
+/*
+ * Formula:
+ *
+ *   frequency = ((4 + (freq_fraction * 2^-16)) * 32000000) / 12
+ *
+ * Simplified linear approximation:
+ *
+ *   frequency = 10666666 + (((13333292 - 10666666) / 65535) * freq_fraction)
+ *   frequency = 10666666 + ((2666626 / 65535) * freq_fraction)
+ *   frequency = ((10666666 * 65535) + (2666626 * freq_fraction)) / 65535
+ *   frequency = (699039956310 + (2666626 * freq_fraction)) / 65535
+ *
+ * Isolate freq_fraction:
+ *
+ *   frequency = (699039956310 + (2666626 * freq_fraction)) / 65535
+ *   frequency * 65535 = 699039956310 + (2666626 * freq_fraction)
+ *   (frequency * 65535) - 699039956310 = 2666626 * freq_fraction
+ *   freq_fraction = ((frequency * 65535) - 699039956310) / 2666626
+ */
+static uint16_t shim_frequency_to_freq_fraction(uint32_t frequency)
+{
+	uint64_t freq_fraction;
+
+	freq_fraction = frequency;
+	freq_fraction *= 65535;
+	freq_fraction -= 699039956310;
+	freq_fraction = DIV_ROUND_CLOSEST(freq_fraction, 2666626);
+
+	return (uint16_t)freq_fraction;
+}
+
+static int shim_nrfs_request_freq_sync(const struct device *dev, uint16_t freq_fraction)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send freq request");
+
+	err = nrfs_audiopll_request_freq(freq_fraction, dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	k_sem_take(&dev_data->evt_sem, K_FOREVER);
+	return dev_data->evt == NRFS_AUDIOPLL_EVT_FREQ_CONFIRMED ? 0 : -EIO;
+}
+
+static int shim_nrfs_request_prescaler_sync(const struct device *dev,
+					    enum audiopll_prescaler_div div)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+
+	LOG_DBG("send prescaler request");
+
+	err = nrfs_audiopll_request_prescaler(div, dev_data);
+	if (err != NRFS_SUCCESS) {
+		return -EIO;
+	}
+
+	k_sem_take(&dev_data->evt_sem, K_FOREVER);
+	return dev_data->evt == NRFS_AUDIOPLL_EVT_PRESCALER_CONFIRMED ? 0 : -EIO;
+}
+
+static void shim_nrfs_audiopll_init_evt_handler(nrfs_audiopll_evt_t const *evt, void *context)
+{
+	struct shim_data *dev_data = context;
+
+	LOG_DBG("init resp evt %u", (uint32_t)evt->type);
+
+	dev_data->evt = evt->type;
+	k_sem_give(&dev_data->evt_sem);
+}
+
+static void shim_nrfs_audiopll_evt_handler(nrfs_audiopll_evt_t const *evt, void *context)
+{
+	struct shim_data *dev_data = context;
+	int ret;
+
+	LOG_DBG("resp evt %u", (uint32_t)evt->type);
+
+	if (dev_data->mgr_notify == NULL) {
+		return;
+	}
+
+	ret = evt->type == dev_data->evt ? 0 : -EIO;
+	dev_data->mgr_notify(&dev_data->mgr, ret);
+}
+
+static int api_request_audiopll(const struct device *dev,
+				const struct nrf_clock_spec *spec,
+				struct onoff_client *cli)
+{
+	struct shim_data *dev_data = dev->data;
+	struct onoff_manager *mgr = &dev_data->mgr;
+
+	ARG_UNUSED(spec);
+
+	return onoff_request(mgr, cli);
+}
+
+static int api_release_audiopll(const struct device *dev,
+				    const struct nrf_clock_spec *spec)
+{
+	struct shim_data *dev_data = dev->data;
+	struct onoff_manager *mgr = &dev_data->mgr;
+
+	ARG_UNUSED(spec);
+
+	return onoff_release(mgr);
+}
+
+static int api_cancel_or_release_audiopll(const struct device *dev,
+					  const struct nrf_clock_spec *spec,
+					  struct onoff_client *cli)
+{
+	struct shim_data *dev_data = dev->data;
+	struct onoff_manager *mgr = &dev_data->mgr;
+
+	ARG_UNUSED(spec);
+
+	return onoff_cancel_or_release(mgr, cli);
+}
+
+static DEVICE_API(nrf_clock_control, shim_driver_api) = {
+	.std_api = {
+		.on = api_nosys_on_off,
+		.off = api_nosys_on_off,
+	},
+	.request = api_request_audiopll,
+	.release = api_release_audiopll,
+	.cancel_or_release = api_cancel_or_release_audiopll,
+};
+
+static int shim_init(const struct device *dev)
+{
+	struct shim_data *dev_data = dev->data;
+	nrfs_err_t err;
+	int ret;
+	uint16_t freq_fraction;
+
+	LOG_DBG("waiting for nrfs backend connected");
+	err = nrfs_backend_wait_for_connection(K_FOREVER);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("nrfs backend not connected");
+		return -ENODEV;
+	}
+
+	k_sem_init(&dev_data->evt_sem, 0, 1);
+
+	err = nrfs_audiopll_init(shim_nrfs_audiopll_init_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("failed to init audiopll service");
+		return -ENODEV;
+	}
+
+	ret = shim_nrfs_request_prescaler_sync(dev, SHIM_DEFAULT_PRESCALER);
+	if (ret) {
+		LOG_ERR("failed to set prescaler divider");
+		return ret;
+	}
+
+	freq_fraction = shim_frequency_to_freq_fraction(DT_INST_PROP(0, frequency));
+
+	LOG_DBG("requesting freq_fraction %u for frequency %uHz",
+		freq_fraction,
+		DT_INST_PROP(0, frequency));
+
+	ret = shim_nrfs_request_freq_sync(dev, freq_fraction);
+	if (ret) {
+		LOG_ERR("failed to set freq_fraction");
+		return ret;
+	}
+
+	nrfs_audiopll_uninit();
+
+	ret = onoff_manager_init(&dev_data->mgr, &shim_mgr_transitions);
+	if (ret < 0) {
+		LOG_ERR("failed to init onoff manager");
+		return ret;
+	}
+
+	err = nrfs_audiopll_init(shim_nrfs_audiopll_evt_handler);
+	if (err != NRFS_SUCCESS) {
+		LOG_ERR("failed to init audiopll service");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static struct shim_data shim_data = {
+	.dev = DEVICE_DT_INST_GET(0),
+};
+
+DEVICE_DT_INST_DEFINE(
+	0,
+	shim_init,
+	NULL,
+	&shim_data,
+	NULL,
+	POST_KERNEL,
+	UTIL_INC(CONFIG_NRFS_BACKEND_IPC_SERVICE_INIT_PRIO),
+	&shim_driver_api,
+);
diff --git a/drivers/clock_control/clock_control_nrf2_hsfll.c b/drivers/clock_control/clock_control_nrf2_hsfll.c
index 12ca616fad334..f67373070f1a4 100644
--- a/drivers/clock_control/clock_control_nrf2_hsfll.c
+++ b/drivers/clock_control/clock_control_nrf2_hsfll.c
@@ -218,6 +218,21 @@ static DEVICE_API(nrf_clock_control, hsfll_drv_api) = {
 static struct hsfll_dev_data hsfll_data;
 #endif
 
+#ifdef CONFIG_CLOCK_CONTROL_NRF2_HSFLL_REQ_LOW_FREQ
+static int dvfs_low_init(void)
+{
+	static const k_timeout_t timeout = K_MSEC(CONFIG_CLOCK_CONTROL_NRF2_NRFS_DVFS_TIMEOUT_MS);
+	static const struct device *hsfll_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(DT_NODELABEL(cpu)));
+	static const struct nrf_clock_spec clk_spec = {
+		.frequency = HSFLL_FREQ_LOW
+	};
+
+	return nrf_clock_control_request_sync(hsfll_dev, &clk_spec, timeout);
+}
+
+SYS_INIT(dvfs_low_init, APPLICATION, 0);
+#endif
+
 DEVICE_DT_INST_DEFINE(0, hsfll_init, NULL,
 		      COND_CODE_1(CONFIG_NRFS_DVFS_LOCAL_DOMAIN,
 				  (&hsfll_data),
diff --git a/drivers/clock_control/clock_control_numaker_scc.c b/drivers/clock_control/clock_control_numaker_scc.c
index 1973030dd096a..fe00c108b862b 100644
--- a/drivers/clock_control/clock_control_numaker_scc.c
+++ b/drivers/clock_control/clock_control_numaker_scc.c
@@ -22,6 +22,39 @@ struct numaker_scc_config {
 	uint32_t core_clock;
 };
 
+#if defined(CONFIG_SOC_SERIES_M55M1X)
+static const uint64_t numaker_clkmodidx_tab[] = {
+	0x0000000000000000, 0x0000000000000400, 0x0000800000000000, 0x0001008000800000,
+	0x0001008000800480, 0x0001810203FF8000, 0x0001810203FF8488, 0x0002018003800000,
+	0x0002800000000000, 0x0003000000000000, 0x0003800000000000, 0x0004028283FF8000,
+	0x0004028001800080, 0x0004830301FF8000, 0x0005000000000000, 0x0005800000000000,
+	0x0005800000000400, 0x0005800000000800, 0x0005800000000C00, 0x0006000000000000,
+	0x0006838000800000, 0x0006838000800480, 0x0007000000000000, 0x0007000000000400,
+	0x0007000000000800, 0x0007000000000C00, 0x0007840000800000, 0x0007800000004000,
+	0x0008000000000000, 0x0008800000000000, 0x0008800000000400, 0x0008800000000800,
+	0x0008800000000C00, 0x0008800000001000, 0x0008800000001400, 0x0008800000001800,
+	0x0008800000001C00, 0x0008800000002000, 0x0008800000002400, 0x0009000000000000,
+	0x0009800000000000, 0x000A000000000000, 0x000A800000000000, 0x000A800000000400,
+	0x000A800000000800, 0x000A800000000C00, 0x000B048383FF8000, 0x000B048383FF8488,
+	0x000B850000800000, 0x000C000000000000, 0x000C858401FF8000, 0x000D000000000000,
+	0x000D860481FF8000, 0x000E000000000000, 0x000E800000000000, 0x000F000000000000,
+	0x000F868001800000, 0x0010000000000000, 0x0010870003800000, 0x0010870003800480,
+	0x0011078503878000, 0x0011800000000000, 0x0012800000000000, 0x0013000000000000,
+	0x0013800000000000, 0x0013800000000400, 0x0014080583FF8000, 0x0014888003800000,
+	0x0014888003800480, 0x0015000000000000, 0x0015890603FF8000, 0x0015890603FF8488,
+	0x0015890603FF8910, 0x0016000000000000, 0x0016898683FF8000, 0x0016898683FF8488,
+	0x00170A0003800000, 0x00170A0003800480, 0x00170A0003800900, 0x00170A0003800D80,
+	0x0017800000000000, 0x0018000000000000, 0x0018000000000400, 0x0018000000000800,
+	0x0018000000000C00, 0x0019800000000000, 0x001A8B0003800000, 0x001A8B0003800480,
+	0x001A8B0003800900, 0x001A8B0003800D80, 0x001B000000000000, 0x001B8B8003800000,
+	0x001B8B8003800480, 0x001C0C0783878000, 0x001C0C0783878484, 0x001C0C0783878908,
+	0x001C0C0783878D8C, 0x001C0C0783879210, 0x001C0C0783879694, 0x001C0C0783879B18,
+	0x001C0C0783879F9C, 0x001C0C880387A000, 0x001C0C880387A484, 0x001C8D0880878000,
+	0x001D0D0880878000, 0x001D800000000000, 0x001E000000000000, 0x001E8D8000800000,
+	0x001E8D8000800480, 0x001F0F8000800000, 0x001F0F8000800480,
+};
+#endif
+
 static inline int numaker_scc_on(const struct device *dev, clock_control_subsys_t subsys)
 {
 	ARG_UNUSED(dev);
@@ -30,7 +63,12 @@ static inline int numaker_scc_on(const struct device *dev, clock_control_subsys_
 
 	if (scc_subsys->subsys_id == NUMAKER_SCC_SUBSYS_ID_PCC) {
 		SYS_UnlockReg();
+#if defined(CONFIG_SOC_SERIES_M55M1X)
+		__ASSERT_NO_MSG(scc_subsys->pcc.clk_modidx < ARRAY_SIZE(numaker_clkmodidx_tab));
+		CLK_EnableModuleClock(numaker_clkmodidx_tab[scc_subsys->pcc.clk_modidx]);
+#else
 		CLK_EnableModuleClock(scc_subsys->pcc.clk_modidx);
+#endif
 		SYS_LockReg();
 	} else {
 		return -EINVAL;
@@ -47,7 +85,12 @@ static inline int numaker_scc_off(const struct device *dev, clock_control_subsys
 
 	if (scc_subsys->subsys_id == NUMAKER_SCC_SUBSYS_ID_PCC) {
 		SYS_UnlockReg();
+#if defined(CONFIG_SOC_SERIES_M55M1X)
+		__ASSERT_NO_MSG(scc_subsys->pcc.clk_modidx < ARRAY_SIZE(numaker_clkmodidx_tab));
+		CLK_DisableModuleClock(numaker_clkmodidx_tab[scc_subsys->pcc.clk_modidx]);
+#else
 		CLK_DisableModuleClock(scc_subsys->pcc.clk_modidx);
+#endif
 		SYS_LockReg();
 	} else {
 		return -EINVAL;
@@ -84,8 +127,15 @@ static inline int numaker_scc_configure(const struct device *dev, clock_control_
 
 	if (scc_subsys->subsys_id == NUMAKER_SCC_SUBSYS_ID_PCC) {
 		SYS_UnlockReg();
+#if defined(CONFIG_SOC_SERIES_M55M1X)
+		__ASSERT_NO_MSG(scc_subsys->pcc.clk_modidx < ARRAY_SIZE(numaker_clkmodidx_tab));
+		CLK_SetModuleClock(numaker_clkmodidx_tab[scc_subsys->pcc.clk_modidx],
+				   scc_subsys->pcc.clk_src,
+				   scc_subsys->pcc.clk_div);
+#else
 		CLK_SetModuleClock(scc_subsys->pcc.clk_modidx, scc_subsys->pcc.clk_src,
 				   scc_subsys->pcc.clk_div);
+#endif
 		SYS_LockReg();
 	} else {
 		return -EINVAL;
diff --git a/drivers/clock_control/clock_control_renesas_ra_cgc.c b/drivers/clock_control/clock_control_renesas_ra_cgc.c
index 5a35b721943af..23875fcc71aab 100644
--- a/drivers/clock_control/clock_control_renesas_ra_cgc.c
+++ b/drivers/clock_control/clock_control_renesas_ra_cgc.c
@@ -23,7 +23,7 @@ static volatile uint32_t *mstp_regs[] = {
 static volatile uint32_t *mstp_regs[] = {};
 #endif
 
-#if !defined(CONFIG_PM)
+#if defined(CONFIG_CORTEX_M_SYSTICK)
 /* If a CPU clock exists in the system, it will be the source for the CPU */
 #if BSP_FEATURE_CGC_HAS_CPUCLK
 #define sys_clk DT_NODELABEL(cpuclk)
diff --git a/drivers/clock_control/clock_control_renesas_rz_cpg.c b/drivers/clock_control/clock_control_renesas_rz_cpg.c
new file mode 100644
index 0000000000000..f220cc2e4d0aa
--- /dev/null
+++ b/drivers/clock_control/clock_control_renesas_rz_cpg.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/renesas_rzg_clock.h>
+#include <zephyr/kernel.h>
+
+#define DT_DRV_COMPAT renesas_rz_cpg
+
+static int clock_control_renesas_rz_on(const struct device *dev, clock_control_subsys_t sys)
+{
+	if (!dev || !sys) {
+		return -EINVAL;
+	}
+
+	uint32_t *clock_id = (uint32_t *)sys;
+
+	uint32_t ip = (*clock_id & RZ_IP_MASK) >> RZ_IP_SHIFT;
+	uint32_t ch = (*clock_id & RZ_IP_CH_MASK) >> RZ_IP_CH_SHIFT;
+
+	switch (ip) {
+	case RZ_IP_GTM:
+		R_BSP_MODULE_START(FSP_IP_GTM, ch);
+		break;
+	case RZ_IP_GPT:
+		R_BSP_MODULE_START(FSP_IP_GPT, ch);
+		break;
+	case RZ_IP_SCIF:
+		R_BSP_MODULE_START(FSP_IP_SCIF, ch);
+		break;
+	case RZ_IP_RIIC:
+		R_BSP_MODULE_START(FSP_IP_RIIC, ch);
+		break;
+	case RZ_IP_RSPI:
+		R_BSP_MODULE_START(FSP_IP_RSPI, ch);
+		break;
+	case RZ_IP_MHU:
+		R_BSP_MODULE_START(FSP_IP_MHU, ch);
+		break;
+	case RZ_IP_DMAC:
+		R_BSP_MODULE_START(FSP_IP_DMAC, ch);
+		break;
+	case RZ_IP_CANFD:
+		R_BSP_MODULE_START(FSP_IP_CANFD, ch);
+		break;
+	case RZ_IP_ADC:
+		R_BSP_MODULE_START(FSP_IP_ADC, ch);
+		break;
+	default:
+		return -EINVAL; /* Invalid FSP IP Module */
+	}
+
+	return 0;
+}
+
+static int clock_control_renesas_rz_off(const struct device *dev, clock_control_subsys_t sys)
+{
+	if (!dev || !sys) {
+		return -EINVAL;
+	}
+
+	uint32_t *clock_id = (uint32_t *)sys;
+
+	uint32_t ip = (*clock_id & RZ_IP_MASK) >> RZ_IP_SHIFT;
+	uint32_t ch = (*clock_id & RZ_IP_CH_MASK) >> RZ_IP_CH_SHIFT;
+
+	switch (ip) {
+	case RZ_IP_GTM:
+		R_BSP_MODULE_STOP(FSP_IP_GTM, ch);
+		break;
+	case RZ_IP_GPT:
+		R_BSP_MODULE_STOP(FSP_IP_GPT, ch);
+		break;
+	case RZ_IP_SCIF:
+		R_BSP_MODULE_STOP(FSP_IP_SCIF, ch);
+		break;
+	case RZ_IP_RIIC:
+		R_BSP_MODULE_STOP(FSP_IP_RIIC, ch);
+		break;
+	case RZ_IP_RSPI:
+		R_BSP_MODULE_STOP(FSP_IP_RSPI, ch);
+		break;
+	case RZ_IP_MHU:
+		R_BSP_MODULE_STOP(FSP_IP_MHU, ch);
+		break;
+	case RZ_IP_DMAC:
+		R_BSP_MODULE_STOP(FSP_IP_DMAC, ch);
+		break;
+	case RZ_IP_CANFD:
+		R_BSP_MODULE_STOP(FSP_IP_CANFD, ch);
+		break;
+	case RZ_IP_ADC:
+		R_BSP_MODULE_STOP(FSP_IP_ADC, ch);
+		break;
+	default:
+		return -EINVAL; /* Invalid */
+	}
+	return 0;
+}
+
+static int clock_control_renesas_rz_get_rate(const struct device *dev, clock_control_subsys_t sys,
+					     uint32_t *rate)
+{
+	if (!dev || !sys || !rate) {
+		return -EINVAL;
+	}
+
+	uint32_t *clock_id = (uint32_t *)sys;
+
+	fsp_priv_clock_t clk_src = (*clock_id & RZ_CLOCK_MASK) >> RZ_CLOCK_SHIFT;
+	uint32_t clk_div = (*clock_id & RZ_CLOCK_DIV_MASK) >> RZ_CLOCK_DIV_SHIFT;
+
+	uint32_t clk_hz = R_FSP_SystemClockHzGet(clk_src);
+	*rate = clk_hz / clk_div;
+	return 0;
+}
+
+static DEVICE_API(clock_control, rz_clock_control_driver_api) = {
+	.on = clock_control_renesas_rz_on,
+	.off = clock_control_renesas_rz_off,
+	.get_rate = clock_control_renesas_rz_get_rate,
+};
+
+static int clock_control_rz_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+	return 0;
+}
+
+DEVICE_DT_INST_DEFINE(0, clock_control_rz_init, NULL, NULL, NULL, PRE_KERNEL_1,
+		      CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &rz_clock_control_driver_api);
diff --git a/drivers/clock_control/clock_control_rpi_pico.c b/drivers/clock_control/clock_control_rpi_pico.c
index 02f2c867c31ed..762e72677ee6f 100644
--- a/drivers/clock_control/clock_control_rpi_pico.c
+++ b/drivers/clock_control/clock_control_rpi_pico.c
@@ -676,7 +676,7 @@ static int clock_control_rpi_pico_init(const struct device *dev)
 			     RESETS_RESET_USBCTRL_BITS));
 
 	/* Start tick in watchdog */
-	watchdog_start_tick(cycles_per_tick);
+	tick_start(TICK_WATCHDOG, cycles_per_tick);
 #if defined(CONFIG_SOC_SERIES_RP2350)
 	tick_start(TICK_TIMER0, cycles_per_tick);
 	tick_start(TICK_TIMER1, cycles_per_tick);
diff --git a/drivers/clock_control/clock_control_silabs_siwx91x.c b/drivers/clock_control/clock_control_silabs_siwx91x.c
index 44f4b3909e64f..57c703f6936b0 100644
--- a/drivers/clock_control/clock_control_silabs_siwx91x.c
+++ b/drivers/clock_control/clock_control_silabs_siwx91x.c
@@ -12,10 +12,13 @@
 #include "rsi_power_save.h"
 #include "rsi_rom_ulpss_clk.h"
 #include "rsi_rom_clks.h"
+#include "rsi_sysrtc.h"
 #include "clock_update.h"
 #include "sl_si91x_clock_manager.h"
 
 #define DT_DRV_COMPAT silabs_siwx91x_clock
+#define DT_DRV_COMPAT          silabs_siwx91x_clock
+#define LF_FSM_CLOCK_FREQUENCY 32768
 
 LOG_MODULE_REGISTER(siwx91x_clock, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
@@ -42,12 +45,12 @@ static int siwx91x_clock_on(const struct device *dev, clock_control_subsys_t sys
 		RSI_PS_UlpssPeriPowerUp(ULPSS_PWRGATE_ULP_UDMA);
 		RSI_ULPSS_PeripheralEnable(ULPCLK, ULP_UDMA_CLK, ENABLE_STATIC_CLK);
 		break;
-	case SIWX91X_CLK_UART1:
+	case SIWX91X_CLK_UART0:
 		RSI_PS_M4ssPeriPowerUp(M4SS_PWRGATE_ULP_EFUSE_PERI);
 		/* RSI_CLK_UsartClkConfig() calls RSI_CLK_PeripheralClkEnable(); */
 		RSI_CLK_UsartClkConfig(M4CLK, ENABLE_STATIC_CLK, 0, USART1, 0, 1);
 		break;
-	case SIWX91X_CLK_UART2:
+	case SIWX91X_CLK_UART1:
 		RSI_PS_M4ssPeriPowerUp(M4SS_PWRGATE_ULP_EFUSE_PERI);
 		/* RSI_CLK_UsartClkConfig() calls RSI_CLK_PeripheralClkEnable(); */
 		RSI_CLK_UsartClkConfig(M4CLK, ENABLE_STATIC_CLK, 0, USART2, 0, 1);
@@ -64,6 +67,16 @@ static int siwx91x_clock_on(const struct device *dev, clock_control_subsys_t sys
 		RSI_PS_M4ssPeriPowerUp(M4SS_PWRGATE_ULP_EFUSE_PERI);
 		RSI_CLK_PeripheralClkEnable(M4CLK, UDMA_CLK, ENABLE_STATIC_CLK);
 		break;
+	case SIWX91X_CLK_PWM:
+		RSI_PS_M4ssPeriPowerUp(M4SS_PWRGATE_ULP_EFUSE_PERI);
+		RSI_CLK_PeripheralClkEnable(M4CLK, PWM_CLK, ENABLE_STATIC_CLK);
+		break;
+	case SIWX91X_CLK_WATCHDOG:
+		/* Both SYSRTC and WDT are clocked using LF-FSM XTAL which is initialized in
+		 * SystemCoreClockUpdate(). This function allows clock to stabilize before use.
+		 */
+		rsi_sysrtc_clk_set(RSI_SYSRTC_CLK_32kHz_Xtal, 0);
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -84,10 +97,10 @@ static int siwx91x_clock_off(const struct device *dev, clock_control_subsys_t sy
 	case SIWX91X_CLK_ULP_DMA:
 		RSI_ULPSS_PeripheralDisable(ULPCLK, ULP_UDMA_CLK);
 		break;
-	case SIWX91X_CLK_UART1:
+	case SIWX91X_CLK_UART0:
 		RSI_CLK_PeripheralClkDisable(M4CLK, USART1_CLK);
 		break;
-	case SIWX91X_CLK_UART2:
+	case SIWX91X_CLK_UART1:
 		RSI_CLK_PeripheralClkDisable(M4CLK, USART2_CLK);
 		break;
 	case SIWX91X_CLK_DMA0:
@@ -115,12 +128,19 @@ static int siwx91x_clock_get_rate(const struct device *dev, clock_control_subsys
 	case SIWX91X_CLK_ULP_UART:
 		*rate = RSI_CLK_GetBaseClock(ULPSS_UART);
 		return 0;
-	case SIWX91X_CLK_UART1:
+	case SIWX91X_CLK_UART0:
 		*rate = RSI_CLK_GetBaseClock(M4_USART0);
 		return 0;
-	case SIWX91X_CLK_UART2:
+	case SIWX91X_CLK_UART1:
 		*rate = RSI_CLK_GetBaseClock(M4_UART1);
 		return 0;
+	case SIWX91X_CLK_PWM:
+		/* PWM peripheral operates at the system clock frequency */
+		*rate = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC;
+		return 0;
+	case SIWX91X_CLK_WATCHDOG:
+		*rate = LF_FSM_CLOCK_FREQUENCY;
+		return 0;
 	default:
 		/* For now, no other driver need clock rate */
 		return -EINVAL;
diff --git a/drivers/clock_control/clock_control_smartbond.c b/drivers/clock_control/clock_control_smartbond.c
index 33e7f3407ae7d..41e5291465e91 100644
--- a/drivers/clock_control/clock_control_smartbond.c
+++ b/drivers/clock_control/clock_control_smartbond.c
@@ -39,7 +39,7 @@ struct lpc_clock_state {
 #define CALIBRATION_INTERVAL CONFIG_SMARTBOND_LP_OSC_CALIBRATION_INTERVAL
 
 #ifdef CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME
-extern int z_clock_hw_cycles_per_sec;
+extern unsigned int z_clock_hw_cycles_per_sec;
 #endif
 
 static void calibration_work_cb(struct k_work *work);
diff --git a/drivers/clock_control/clock_control_wch_rcc.c b/drivers/clock_control/clock_control_wch_rcc.c
index d51b9ae684613..9275fd0bc82fe 100644
--- a/drivers/clock_control/clock_control_wch_rcc.c
+++ b/drivers/clock_control/clock_control_wch_rcc.c
@@ -19,29 +19,23 @@
 #define WCH_RCC_CLOCK_ID_OFFSET(id) (((id) >> 5) & 0xFF)
 #define WCH_RCC_CLOCK_ID_BIT(id)    ((id) & 0x1F)
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pll)) && DT_NODE_HAS_PROP(DT_NODELABEL(pll), clocks)
-#define DT_PLL_CLOCKS_CTRL DT_CLOCKS_CTLR(DT_NODELABEL(pll))
-#if DT_SAME_NODE(DT_PLL_CLOCKS_CTRL, DT_NODELABEL(clk_hsi))
-#define WCH_RCC_PLL_SRC_IS_HSI 1
-#endif
-#if DT_SAME_NODE(DT_PLL_CLOCKS_CTRL, DT_NODELABEL(clk_hse))
-#define WCH_RCC_PLL_SRC_IS_HSE 1
-#endif
-#endif
-
-#define DT_RCC_CLOCKS_CTRL DT_CLOCKS_CTLR(DT_NODELABEL(rcc))
-#if DT_SAME_NODE(DT_RCC_CLOCKS_CTRL, DT_NODELABEL(pll))
+#if DT_NODE_HAS_COMPAT(DT_INST_CLOCKS_CTLR(0), wch_ch32v00x_pll_clock) ||                          \
+	DT_NODE_HAS_COMPAT(DT_INST_CLOCKS_CTLR(0), wch_ch32v20x_30x_pll_clock)
 #define WCH_RCC_SRC_IS_PLL 1
+#if DT_NODE_HAS_COMPAT(DT_CLOCKS_CTLR(DT_INST_CLOCKS_CTLR(0)), wch_ch32v00x_hse_clock)
+#define WCH_RCC_PLL_SRC_IS_HSE 1
+#elif DT_NODE_HAS_COMPAT(DT_CLOCKS_CTLR(DT_INST_CLOCKS_CTLR(0)), wch_ch32v00x_hsi_clock)
+#define WCH_RCC_PLL_SRC_IS_HSI 1
 #endif
-#if DT_SAME_NODE(DT_RCC_CLOCKS_CTRL, DT_NODELABEL(clk_hsi))
-#define WCH_RCC_SRC_IS_HSI 1
-#endif
-#if DT_SAME_NODE(DT_RCC_CLOCKS_CTRL, DT_NODELABEL(clk_hse))
+#elif DT_NODE_HAS_COMPAT(DT_INST_CLOCKS_CTLR(0), wch_ch32v00x_hse_clock)
 #define WCH_RCC_SRC_IS_HSE 1
+#elif DT_NODE_HAS_COMPAT(DT_INST_CLOCKS_CTLR(0), wch_ch32v00x_hsi_clock)
+#define WCH_RCC_SRC_IS_HSI 1
 #endif
 
 struct clock_control_wch_rcc_config {
 	RCC_TypeDef *regs;
+	uint8_t mul;
 };
 
 static int clock_control_wch_rcc_on(const struct device *dev, clock_control_subsys_t sys)
@@ -91,7 +85,10 @@ static DEVICE_API(clock_control, clock_control_wch_rcc_api) = {
 
 static int clock_control_wch_rcc_init(const struct device *dev)
 {
-	if (IS_ENABLED(CONFIG_DT_HAS_WCH_CH32V00X_PLL_CLOCK_ENABLED)) {
+	const struct clock_control_wch_rcc_config *config = dev->config;
+
+	if (IS_ENABLED(CONFIG_DT_HAS_WCH_CH32V00X_PLL_CLOCK_ENABLED) ||
+	    IS_ENABLED(CONFIG_DT_HAS_WCH_CH32V20X_30X_PLL_CLOCK_ENABLED)) {
 		/* Disable the PLL before potentially changing the input clocks. */
 		RCC->CTLR &= ~RCC_PLLON;
 	}
@@ -123,6 +120,17 @@ static int clock_control_wch_rcc_init(const struct device *dev)
 		while ((RCC->CTLR & RCC_PLLRDY) == 0) {
 		}
 	}
+	if (IS_ENABLED(CONFIG_DT_HAS_WCH_CH32V20X_30X_PLL_CLOCK_ENABLED)) {
+		if (IS_ENABLED(WCH_RCC_PLL_SRC_IS_HSE)) {
+			RCC->CFGR0 |= RCC_PLLSRC;
+		} else if (IS_ENABLED(WCH_RCC_PLL_SRC_IS_HSI)) {
+			RCC->CFGR0 &= ~RCC_PLLSRC;
+		}
+		RCC->CFGR0 |= (config->mul == 18 ? 0xF : (config->mul - 2)) << 0x12;
+		RCC->CTLR |= RCC_PLLON;
+		while ((RCC->CTLR & RCC_PLLRDY) == 0) {
+		}
+	}
 
 	if (IS_ENABLED(WCH_RCC_SRC_IS_HSI)) {
 		RCC->CFGR0 = (RCC->CFGR0 & ~RCC_SW) | RCC_SW_HSI;
@@ -137,8 +145,10 @@ static int clock_control_wch_rcc_init(const struct device *dev)
 	RCC->INTR = RCC_CSSC | RCC_PLLRDYC | RCC_HSERDYC | RCC_LSIRDYC;
 	/* HCLK = SYSCLK = APB1 */
 	RCC->CFGR0 = (RCC->CFGR0 & ~RCC_HPRE) | RCC_HPRE_DIV1;
+#if defined(CONFIG_SOC_CH32V003)
 	/* Set the Flash to 0 wait state */
 	FLASH->ACTLR = (FLASH->ACTLR & ~FLASH_ACTLR_LATENCY) | FLASH_ACTLR_LATENCY_1;
+#endif
 
 	return 0;
 }
@@ -146,9 +156,11 @@ static int clock_control_wch_rcc_init(const struct device *dev)
 #define CLOCK_CONTROL_WCH_RCC_INIT(idx)                                                            \
 	static const struct clock_control_wch_rcc_config clock_control_wch_rcc_##idx##_config = {  \
 		.regs = (RCC_TypeDef *)DT_INST_REG_ADDR(idx),                                      \
+		.mul = DT_PROP_OR(DT_INST_CLOCKS_CTLR(idx), mul, 1),                               \
 	};                                                                                         \
 	DEVICE_DT_INST_DEFINE(idx, clock_control_wch_rcc_init, NULL, NULL,                         \
 			      &clock_control_wch_rcc_##idx##_config, PRE_KERNEL_1,                 \
 			      CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &clock_control_wch_rcc_api);
 
-DT_INST_FOREACH_STATUS_OKAY(CLOCK_CONTROL_WCH_RCC_INIT)
+/* There is only ever one RCC */
+CLOCK_CONTROL_WCH_RCC_INIT(0)
diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c
index 0e2e577b518ea..338ce0ed5c6dd 100644
--- a/drivers/clock_control/clock_stm32_ll_common.c
+++ b/drivers/clock_control/clock_stm32_ll_common.c
@@ -247,15 +247,14 @@ int enabled_clock(uint32_t src_clk)
 	return r;
 }
 
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	volatile int temp;
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to change a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -271,14 +270,13 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -289,9 +287,9 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_configure(const struct device *dev,
-						clock_control_subsys_t sub_system,
-						void *data)
+static int stm32_clock_control_configure(const struct device *dev,
+					 clock_control_subsys_t sub_system,
+					 void *data)
 {
 	/* At least one alt src clock available */
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
@@ -311,10 +309,12 @@ static inline int stm32_clock_control_configure(const struct device *dev,
 		return 0;
 	}
 
-	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		       STM32_CLOCK_MASK_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
-	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		     STM32_CLOCK_VAL_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
+	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		       STM32_DT_CLKSEL_MASK_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
+	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		     STM32_DT_CLKSEL_VAL_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 
 	return 0;
 }
@@ -496,7 +496,7 @@ static enum clock_control_status stm32_clock_control_get_status(const struct dev
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == true) {
+	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Gated clocks */
 		if ((sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus) & pclken->enr)
 		    == pclken->enr) {
diff --git a/drivers/clock_control/clock_stm32_ll_h5.c b/drivers/clock_control/clock_stm32_ll_h5.c
index 39aaa65d7c771..f0679ce2725a3 100644
--- a/drivers/clock_control/clock_stm32_ll_h5.c
+++ b/drivers/clock_control/clock_stm32_ll_h5.c
@@ -144,15 +144,14 @@ int enabled_clock(uint32_t src_clk)
 	return -ENOTSUP;
 }
 
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	volatile int temp;
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -166,14 +165,13 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -184,9 +182,9 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_configure(const struct device *dev,
-						clock_control_subsys_t sub_system,
-						void *data)
+static int stm32_clock_control_configure(const struct device *dev,
+					 clock_control_subsys_t sub_system,
+					 void *data)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	int err;
@@ -200,8 +198,9 @@ static inline int stm32_clock_control_configure(const struct device *dev,
 		return err;
 	}
 
-	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		     STM32_CLOCK_VAL_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
+	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		     STM32_DT_CLKSEL_VAL_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 
 	return 0;
 }
diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c
index 5819eb5017bbf..e99ea44452a95 100644
--- a/drivers/clock_control/clock_stm32_ll_h7.c
+++ b/drivers/clock_control/clock_stm32_ll_h7.c
@@ -249,27 +249,6 @@ static uint32_t get_hclk_frequency(void)
 
 static int32_t prepare_regulator_voltage_scale(void)
 {
-	/* Apply system power supply configuration */
-#if defined(SMPS) && defined(CONFIG_POWER_SUPPLY_DIRECT_SMPS)
-	LL_PWR_ConfigSupply(LL_PWR_DIRECT_SMPS_SUPPLY);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_1V8_SUPPLIES_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_1V8_SUPPLIES_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_2V5_SUPPLIES_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_2V5_SUPPLIES_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT_AND_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_1V8_SUPPLIES_EXT_AND_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT_AND_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_2V5_SUPPLIES_EXT_AND_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_1V8_SUPPLIES_EXT);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_2V5_SUPPLIES_EXT);
-#elif defined(CONFIG_POWER_SUPPLY_EXTERNAL_SOURCE)
-	LL_PWR_ConfigSupply(LL_PWR_EXTERNAL_SOURCE_SUPPLY);
-#else
-	LL_PWR_ConfigSupply(LL_PWR_LDO_SUPPLY);
-#endif
-
 	/* Make sure to put the CPU in highest Voltage scale during clock configuration */
 	/* Highest voltage is SCALE0 */
 	LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE0);
@@ -279,6 +258,7 @@ static int32_t prepare_regulator_voltage_scale(void)
 	while (LL_PWR_IsActiveFlag_VOS() == 0) {
 #endif
 	}
+
 	return 0;
 }
 
@@ -292,25 +272,6 @@ static int32_t optimize_regulator_voltage_scale(uint32_t sysclk_freq)
 	/* LL_PWR_REGULATOR_SCALE3 is lowest power consumption */
 	/* Must be done in accordance to the Maximum allowed frequency vs VOS*/
 	/* See RM0433 page 352 for more details */
-#if defined(SMPS) && defined(CONFIG_POWER_SUPPLY_DIRECT_SMPS)
-	LL_PWR_ConfigSupply(LL_PWR_DIRECT_SMPS_SUPPLY);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_1V8_SUPPLIES_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_1V8_SUPPLIES_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_2V5_SUPPLIES_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_2V5_SUPPLIES_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT_AND_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_1V8_SUPPLIES_EXT_AND_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT_AND_LDO)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_2V5_SUPPLIES_EXT_AND_LDO);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_1V8_SUPPLIES_EXT);
-#elif defined(SMPS) && defined(CONFIG_POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT)
-	LL_PWR_ConfigSupply(LL_PWR_SMPS_2V5_SUPPLIES_EXT);
-#elif defined(CONFIG_POWER_SUPPLY_EXTERNAL_SOURCE)
-	LL_PWR_ConfigSupply(LL_PWR_EXTERNAL_SOURCE_SUPPLY);
-#else
-	LL_PWR_ConfigSupply(LL_PWR_LDO_SUPPLY);
-#endif
 	LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE0);
 #if defined(CONFIG_SOC_SERIES_STM32H7RSX)
 	while (LL_PWR_IsActiveFlag_VOSRDY() == 0) {
@@ -318,6 +279,7 @@ static int32_t optimize_regulator_voltage_scale(uint32_t sysclk_freq)
 	while (LL_PWR_IsActiveFlag_VOS() == 0) {
 #endif
 	};
+
 	return 0;
 }
 
@@ -382,15 +344,14 @@ int enabled_clock(uint32_t src_clk)
 	return -ENOTSUP;
 }
 
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	volatile int temp;
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -409,14 +370,13 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -430,9 +390,9 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_configure(const struct device *dev,
-						clock_control_subsys_t sub_system,
-						void *data)
+static int stm32_clock_control_configure(const struct device *dev,
+					 clock_control_subsys_t sub_system,
+					 void *data)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	int err;
@@ -448,10 +408,12 @@ static inline int stm32_clock_control_configure(const struct device *dev,
 
 	z_stm32_hsem_lock(CFG_HW_RCC_SEMID, HSEM_LOCK_DEFAULT_RETRY);
 
-	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		       STM32_CLOCK_MASK_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
-	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		     STM32_CLOCK_VAL_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
+	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		       STM32_DT_CLKSEL_MASK_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
+	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		     STM32_DT_CLKSEL_VAL_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 
 	z_stm32_hsem_unlock(CFG_HW_RCC_SEMID);
 
@@ -685,7 +647,7 @@ static void set_up_fixed_clock_sources(void)
 
 	if (IS_ENABLED(STM32_HSI_ENABLED)) {
 		if (IS_ENABLED(STM32_PLL_SRC_HSI) || IS_ENABLED(STM32_PLL2_SRC_HSI) ||
-+		    IS_ENABLED(STM32_PLL3_SRC_HSI)) {
+		    IS_ENABLED(STM32_PLL3_SRC_HSI)) {
 			/* HSI calibration */
 			LL_RCC_HSI_SetCalibTrimming(RCC_HSICALIBRATION_DEFAULT);
 		}
@@ -988,91 +950,6 @@ static int set_up_plls(void)
 	return 0;
 }
 
-#if defined(CONFIG_SOC_SERIES_STM32H7RSX)
-/*  adapted from the stm32cube SystemCoreClockUpdate*/
-void stm32_system_clock_update(void)
-{
-	uint32_t sysclk, hsivalue, pllsource, pllm, pllp, core_presc;
-	float_t pllfracn, pllvco;
-
-	/* Get SYSCLK source */
-	switch (RCC->CFGR & RCC_CFGR_SWS) {
-	case 0x00: /* HSI used as system clock source (default after reset) */
-		sysclk = (HSI_VALUE >> ((RCC->CR & RCC_CR_HSIDIV)
-			>> RCC_CR_HSIDIV_Pos));
-		break;
-
-	case 0x08: /* CSI used as system clock source */
-		sysclk = CSI_VALUE;
-		break;
-
-	case 0x10: /* HSE used as system clock source */
-		sysclk = HSE_VALUE;
-		break;
-
-	case 0x18:  /* PLL1 used as system clock  source */
-		/*
-		 * PLL1_VCO = (HSE_VALUE or HSI_VALUE or CSI_VALUE/ PLLM) * PLLN
-		 * SYSCLK = PLL1_VCO / PLL1R
-		 */
-		pllsource = (RCC->PLLCKSELR & RCC_PLLCKSELR_PLLSRC);
-		pllm = ((RCC->PLLCKSELR & RCC_PLLCKSELR_DIVM1) >> RCC_PLLCKSELR_DIVM1_Pos);
-
-		if ((RCC->PLLCFGR & RCC_PLLCFGR_PLL1FRACEN) != 0U) {
-			pllfracn = (float_t)(uint32_t)(((RCC->PLL1FRACR & RCC_PLL1FRACR_FRACN)
-			>> RCC_PLL1FRACR_FRACN_Pos));
-		} else {
-			pllfracn = (float_t)0U;
-		}
-
-		if (pllm != 0U) {
-			switch (pllsource) {
-			case 0x02: /* HSE used as PLL1 clock source */
-				pllvco = ((float_t)HSE_VALUE / (float_t)pllm) *
-					((float_t)(uint32_t)(RCC->PLL1DIVR1 & RCC_PLL1DIVR1_DIVN) +
-					(pllfracn/(float_t)0x2000) + (float_t)1);
-				break;
-
-			case 0x01: /* CSI used as PLL1 clock source */
-				pllvco = ((float_t)CSI_VALUE / (float_t)pllm) *
-				((float_t)(uint32_t)(RCC->PLL1DIVR1 & RCC_PLL1DIVR1_DIVN) +
-				(pllfracn/(float_t)0x2000) + (float_t)1);
-				break;
-
-			case 0x00: /* HSI used as PLL1 clock source */
-			default:
-				hsivalue = (HSI_VALUE >> ((RCC->CR & RCC_CR_HSIDIV) >>
-					RCC_CR_HSIDIV_Pos));
-				pllvco = ((float_t)hsivalue / (float_t)pllm) *
-					((float_t)(uint32_t)(RCC->PLL1DIVR1 & RCC_PLL1DIVR1_DIVN) +
-					(pllfracn/(float_t)0x2000) + (float_t)1);
-				break;
-			}
-
-			pllp = (((RCC->PLL1DIVR1 & RCC_PLL1DIVR1_DIVP) >>
-				RCC_PLL1DIVR1_DIVP_Pos) + 1U);
-			sysclk =  (uint32_t)(float_t)(pllvco/(float_t)pllp);
-		} else {
-			sysclk = 0U;
-		}
-		break;
-
-	default: /* Unexpected, default to HSI used as system clk source (default after reset) */
-		sysclk = (HSI_VALUE >> ((RCC->CR & RCC_CR_HSIDIV) >> RCC_CR_HSIDIV_Pos));
-		break;
-	}
-
-	/* system clock frequency : CM7 CPU frequency  */
-	core_presc = (RCC->CDCFGR & RCC_CDCFGR_CPRE);
-
-	if (core_presc >= 8U) {
-		SystemCoreClock = (sysclk >> (core_presc - RCC_CDCFGR_CPRE_3 + 1U));
-	} else {
-		SystemCoreClock = sysclk;
-	}
-}
-#endif /* CONFIG_SOC_SERIES_STM32H7RSX */
-
 int stm32_clock_control_init(const struct device *dev)
 {
 	int r = 0;
diff --git a/drivers/clock_control/clock_stm32_ll_mp1.c b/drivers/clock_control/clock_stm32_ll_mp1.c
index e87d4c94b7718..d13ec2ecb2739 100644
--- a/drivers/clock_control/clock_stm32_ll_mp1.c
+++ b/drivers/clock_control/clock_stm32_ll_mp1.c
@@ -14,8 +14,7 @@
 /**
  * @brief fill in AHB/APB buses configuration structure
  */
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
@@ -65,8 +64,7 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
diff --git a/drivers/clock_control/clock_stm32_ll_mp13.c b/drivers/clock_control/clock_stm32_ll_mp13.c
new file mode 100644
index 0000000000000..6c8da819e5116
--- /dev/null
+++ b/drivers/clock_control/clock_stm32_ll_mp13.c
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+
+#include <stm32_ll_bus.h>
+#include <stm32_ll_pwr.h>
+#include <stm32_ll_rcc.h>
+#include <stm32_ll_system.h>
+#include <stm32_ll_utils.h>
+
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/sys/util.h>
+
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
+{
+	struct stm32_pclken *pclken = (struct stm32_pclken *)sub_system;
+	volatile int temp;
+
+	ARG_UNUSED(dev);
+
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
+		/* Attempt to toggle a wrong periph clock bit */
+		return -ENOTSUP;
+	}
+
+	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus, pclken->enr);
+	/* Ensure that the write operation is completed */
+	temp = sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus);
+	UNUSED(temp);
+
+	return 0;
+}
+
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
+{
+	struct stm32_pclken *pclken = (struct stm32_pclken *)sub_system;
+	volatile int temp;
+
+	ARG_UNUSED(dev);
+
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
+		/* Attempt to toggle a wrong periph clock bit */
+		return -ENOTSUP;
+	}
+
+	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus, pclken->enr);
+	/* Ensure that the write operation is completed */
+	temp = sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus);
+	UNUSED(temp);
+
+	return 0;
+}
+
+static int stm32_clock_control_get_subsys_rate(const struct device *dev,
+					       clock_control_subsys_t sub_system, uint32_t *rate)
+{
+	struct stm32_pclken *pclken = (struct stm32_pclken *)sub_system;
+
+	ARG_UNUSED(dev);
+
+	switch (pclken->bus) {
+	case STM32_CLOCK_BUS_APB1:
+		switch (pclken->enr) {
+		case LL_APB1_GRP1_PERIPH_UART4:
+			*rate = LL_RCC_GetUARTClockFreq(LL_RCC_UART4_CLKSOURCE);
+			break;
+		default:
+			return -ENOTSUP;
+		}
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
+}
+
+static const struct clock_control_driver_api stm32_clock_control_api = {
+	.on = stm32_clock_control_on,
+	.off = stm32_clock_control_off,
+	.get_rate = stm32_clock_control_get_subsys_rate,
+};
+
+static void set_up_fixed_clock_sources(void)
+{
+	if (IS_ENABLED(STM32_HSE_ENABLED)) {
+		/* Enable HSE */
+		LL_RCC_HSE_Enable();
+		while (LL_RCC_HSE_IsReady() != 1) {
+			/* Wait for HSE ready */
+		}
+	}
+
+	if (IS_ENABLED(STM32_HSI_ENABLED)) {
+		/* Enable HSI if not enabled */
+		if (LL_RCC_HSI_IsReady() != 1) {
+			/* Enable HSI */
+			LL_RCC_HSI_Enable();
+			while (LL_RCC_HSI_IsReady() != 1) {
+			/* Wait for HSI ready */
+			}
+		}
+	}
+}
+
+static int stm32_clock_control_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	set_up_fixed_clock_sources();
+
+#if STM32_SYSCLK_SRC_HSE
+
+	LL_RCC_SetMPUClkSource(LL_RCC_MPU_CLKSOURCE_HSE);
+	while (LL_RCC_GetMPUClkSource() != LL_RCC_MPU_CLKSOURCE_HSE) {
+	}
+
+#elif STM32_SYSCLK_SRC_HSI
+
+	LL_RCC_SetMPUClkSource(LL_RCC_MPU_CLKSOURCE_HSI);
+	while (LL_RCC_GetMPUClkSource() != LL_RCC_MPU_CLKSOURCE_HSI) {
+	}
+
+#elif STM32_SYSCLK_SRC_PLL
+
+	BUILD_ASSERT(IS_ENABLED(STM32_HSE_ENABLED),
+		     "STM32MP13 PLL requires HSE to be enabled!");
+
+	/* The default system clock source is HSI, but the bootloader may have switched it. */
+	/* Switch back to HSE for clock setup as PLL1 configuration must not be modified */
+	/* while active.*/
+
+	LL_RCC_SetMPUClkSource(LL_RCC_MPU_CLKSOURCE_HSE);
+	while ((READ_BIT(RCC->MPCKSELR, RCC_MPCKSELR_MPUSRCRDY) != RCC_MPCKSELR_MPUSRCRDY)) {
+	}
+
+	CLEAR_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVPEN);
+	while (READ_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVPEN) == RCC_PLL1CR_DIVPEN) {
+	};
+
+	CLEAR_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVQEN);
+	while (READ_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVQEN) == RCC_PLL1CR_DIVQEN) {
+	};
+
+	CLEAR_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVREN);
+	while (READ_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVREN) == RCC_PLL1CR_DIVREN) {
+	};
+
+	uint32_t pll1_n = DT_PROP(DT_NODELABEL(pll1), mul_n);
+	uint32_t pll1_m = DT_PROP(DT_NODELABEL(pll1), div_m);
+	uint32_t pll1_p = DT_PROP(DT_NODELABEL(pll1), div_p);
+	uint32_t pll1_v = DT_PROP(DT_NODELABEL(pll1), frac_v);
+
+	LL_RCC_PLL1_SetN(pll1_n);
+	while (LL_RCC_PLL1_GetN() != pll1_n) {
+	}
+	LL_RCC_PLL1_SetM(pll1_m);
+	while (LL_RCC_PLL1_GetM() != pll1_m) {
+	}
+	LL_RCC_PLL1_SetP(pll1_p);
+	while (LL_RCC_PLL1_GetP() != pll1_p) {
+	}
+	LL_RCC_PLL1_SetFRACV(pll1_v);
+	while (LL_RCC_PLL1_GetFRACV() != pll1_v) {
+	}
+
+	LL_RCC_PLL1_Enable();
+	while (LL_RCC_PLL1_IsReady() != 1) {
+	}
+
+	SET_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVPEN);
+	while (READ_BIT(RCC->PLL1CR, RCC_PLL1CR_DIVPEN) != RCC_PLL1CR_DIVPEN) {
+	};
+
+	LL_RCC_SetMPUClkSource(LL_RCC_MPU_CLKSOURCE_PLL1);
+	while (LL_RCC_GetMPUClkSource() != LL_RCC_MPU_CLKSOURCE_PLL1) {
+	}
+
+#endif
+
+	return 0;
+}
+
+/**
+ * @brief RCC device, note that priority is intentionally set to 1 so
+ * that the device init runs just after SOC init
+ */
+DEVICE_DT_DEFINE(DT_NODELABEL(rcc),
+		 stm32_clock_control_init,
+		 NULL,
+		 NULL, NULL,
+		 PRE_KERNEL_1,
+		 CONFIG_CLOCK_CONTROL_INIT_PRIORITY,
+		 &stm32_clock_control_api);
diff --git a/drivers/clock_control/clock_stm32_ll_n6.c b/drivers/clock_control/clock_stm32_ll_n6.c
index e69faf6823d5b..938166fb69201 100644
--- a/drivers/clock_control/clock_stm32_ll_n6.c
+++ b/drivers/clock_control/clock_stm32_ll_n6.c
@@ -38,6 +38,9 @@
 #define z_apb5_prescaler(v) LL_RCC_APB5_DIV_ ## v
 #define apb5_prescaler(v) z_apb5_prescaler(v)
 
+#define z_timg_prescaler(v) LL_RCC_TIM_PRESCALER_ ## v
+#define timg_prescaler(v) z_timg_prescaler(v)
+
 #define PLL1_ID		1
 #define PLL2_ID		2
 #define PLL3_ID		3
@@ -156,10 +159,21 @@ static uint32_t get_sysclk_frequency(void)
 static int enabled_clock(uint32_t src_clk)
 {
 	if ((src_clk == STM32_SRC_SYSCLK) ||
+	    (src_clk == STM32_SRC_HCLK1) ||
+	    (src_clk == STM32_SRC_HCLK2) ||
+	    (src_clk == STM32_SRC_HCLK3) ||
+	    (src_clk == STM32_SRC_HCLK4) ||
+	    (src_clk == STM32_SRC_HCLK5) ||
+	    (src_clk == STM32_SRC_PCLK1) ||
+	    (src_clk == STM32_SRC_PCLK2) ||
+	    (src_clk == STM32_SRC_PCLK4) ||
+	    (src_clk == STM32_SRC_PCLK5) ||
+	    (src_clk == STM32_SRC_TIMG) ||
 	    ((src_clk == STM32_SRC_LSE) && IS_ENABLED(STM32_LSE_ENABLED)) ||
 	    ((src_clk == STM32_SRC_LSI) && IS_ENABLED(STM32_LSI_ENABLED)) ||
 	    ((src_clk == STM32_SRC_HSE) && IS_ENABLED(STM32_HSE_ENABLED)) ||
 	    ((src_clk == STM32_SRC_HSI) && IS_ENABLED(STM32_HSI_ENABLED)) ||
+	    ((src_clk == STM32_SRC_HSI_DIV) && IS_ENABLED(STM32_HSI_ENABLED)) ||
 	    ((src_clk == STM32_SRC_PLL1) && IS_ENABLED(STM32_PLL1_ENABLED)) ||
 	    ((src_clk == STM32_SRC_PLL2) && IS_ENABLED(STM32_PLL2_ENABLED)) ||
 	    ((src_clk == STM32_SRC_PLL3) && IS_ENABLED(STM32_PLL3_ENABLED)) ||
@@ -191,14 +205,13 @@ static int enabled_clock(uint32_t src_clk)
 	return -ENOTSUP;
 }
 
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -214,14 +227,13 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -237,9 +249,9 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_configure(const struct device *dev,
-						clock_control_subsys_t sub_system,
-						void *data)
+static int stm32_clock_control_configure(const struct device *dev,
+					 clock_control_subsys_t sub_system,
+					 void *data)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	int err;
@@ -253,10 +265,12 @@ static inline int stm32_clock_control_configure(const struct device *dev,
 		return err;
 	}
 
-	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		       STM32_CLOCK_MASK_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
-	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		     STM32_CLOCK_VAL_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
+	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		       STM32_DT_CLKSEL_MASK_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
+	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		     STM32_DT_CLKSEL_VAL_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 
 	return 0;
 }
@@ -276,6 +290,11 @@ static int stm32_clock_control_get_subsys_rate(const struct device *dev,
 	case STM32_SRC_SYSCLK:
 		*rate = get_sysclk_frequency();
 		break;
+	case STM32_SRC_HCLK1:
+	case STM32_SRC_HCLK2:
+	case STM32_SRC_HCLK3:
+	case STM32_SRC_HCLK4:
+	case STM32_SRC_HCLK5:
 	case STM32_CLOCK_BUS_AHB1:
 	case STM32_CLOCK_BUS_AHB2:
 	case STM32_CLOCK_BUS_AHB3:
@@ -283,17 +302,21 @@ static int stm32_clock_control_get_subsys_rate(const struct device *dev,
 	case STM32_CLOCK_BUS_AHB5:
 		*rate = ahb_clock;
 		break;
+	case STM32_SRC_PCLK1:
 	case STM32_CLOCK_BUS_APB1:
 	case STM32_CLOCK_BUS_APB1_2:
 		*rate = get_bus_clock(ahb_clock, STM32_APB1_PRESCALER);
 		break;
+	case STM32_SRC_PCLK2:
 	case STM32_CLOCK_BUS_APB2:
 		*rate = get_bus_clock(ahb_clock, STM32_APB2_PRESCALER);
 		break;
+	case STM32_SRC_PCLK4:
 	case STM32_CLOCK_BUS_APB4:
 	case STM32_CLOCK_BUS_APB4_2:
 		*rate = get_bus_clock(ahb_clock, STM32_APB4_PRESCALER);
 		break;
+	case STM32_SRC_PCLK5:
 	case STM32_CLOCK_BUS_APB5:
 		*rate = get_bus_clock(ahb_clock, STM32_APB5_PRESCALER);
 		break;
@@ -316,6 +339,9 @@ static int stm32_clock_control_get_subsys_rate(const struct device *dev,
 	case STM32_SRC_HSI:
 		*rate = STM32_HSI_FREQ;
 		break;
+	case STM32_SRC_HSI_DIV:
+		*rate = STM32_HSI_FREQ / STM32_HSI_DIVISOR;
+		break;
 #endif /* STM32_HSI_ENABLED */
 	case STM32_SRC_PLL1:
 		*rate = get_pllout_frequency(PLL1_ID);
@@ -434,6 +460,9 @@ static int stm32_clock_control_get_subsys_rate(const struct device *dev,
 		*rate = get_icout_frequency(LL_RCC_IC20_GetSource(), STM32_IC20_DIV);
 		break;
 #endif /* STM32_IC20_ENABLED */
+	case STM32_SRC_TIMG:
+		*rate = sys_clock / STM32_TIMG_PRESCALER;
+		break;
 	default:
 		return -ENOTSUP;
 	}
@@ -445,10 +474,36 @@ static int stm32_clock_control_get_subsys_rate(const struct device *dev,
 	return 0;
 }
 
+static enum clock_control_status stm32_clock_control_get_status(const struct device *dev,
+								clock_control_subsys_t sub_system)
+{
+	struct stm32_pclken *pclken = (struct stm32_pclken *)sub_system;
+
+	ARG_UNUSED(dev);
+
+	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == true) {
+		/* Gated clocks */
+		if ((sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus) & pclken->enr)
+		    == pclken->enr) {
+			return CLOCK_CONTROL_STATUS_ON;
+		} else {
+			return CLOCK_CONTROL_STATUS_OFF;
+		}
+	} else {
+		/* Domain clock sources */
+		if (enabled_clock(pclken->bus) == 0) {
+			return CLOCK_CONTROL_STATUS_ON;
+		} else {
+			return CLOCK_CONTROL_STATUS_OFF;
+		}
+	}
+}
+
 static DEVICE_API(clock_control, stm32_clock_control_api) = {
 	.on = stm32_clock_control_on,
 	.off = stm32_clock_control_off,
 	.get_rate = stm32_clock_control_get_subsys_rate,
+	.get_status = stm32_clock_control_get_status,
 	.configure = stm32_clock_control_configure,
 };
 
@@ -898,6 +953,9 @@ int stm32_clock_control_init(const struct device *dev)
 	LL_RCC_SetAPB4Prescaler(apb4_prescaler(STM32_APB4_PRESCALER));
 	LL_RCC_SetAPB5Prescaler(apb5_prescaler(STM32_APB5_PRESCALER));
 
+	/* Set TIMG presclar */
+	LL_RCC_SetTIMPrescaler(timg_prescaler(STM32_TIMG_PRESCALER));
+
 	if (IS_ENABLED(STM32_CKPER_ENABLED)) {
 		LL_MISC_EnableClock(LL_PER);
 		LL_MISC_EnableClockLowPower(LL_PER);
diff --git a/drivers/clock_control/clock_stm32_ll_u5.c b/drivers/clock_control/clock_stm32_ll_u5.c
index c32c72820cf2f..94448d51416c8 100644
--- a/drivers/clock_control/clock_stm32_ll_u5.c
+++ b/drivers/clock_control/clock_stm32_ll_u5.c
@@ -150,15 +150,14 @@ int enabled_clock(uint32_t src_clk)
 	return -ENOTSUP;
 }
 
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	volatile int temp;
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -172,14 +171,13 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -190,9 +188,9 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_configure(const struct device *dev,
-						clock_control_subsys_t sub_system,
-						void *data)
+static int stm32_clock_control_configure(const struct device *dev,
+					 clock_control_subsys_t sub_system,
+					 void *data)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	int err;
@@ -206,10 +204,12 @@ static inline int stm32_clock_control_configure(const struct device *dev,
 		return err;
 	}
 
-	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		       STM32_CLOCK_MASK_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
-	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		     STM32_CLOCK_VAL_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
+	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		       STM32_DT_CLKSEL_MASK_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
+	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		     STM32_DT_CLKSEL_VAL_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 
 	return 0;
 }
@@ -371,7 +371,7 @@ static enum clock_control_status stm32_clock_control_get_status(const struct dev
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == true) {
+	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Gated clocks */
 		if ((sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus) & pclken->enr)
 		    == pclken->enr) {
diff --git a/drivers/clock_control/clock_stm32_ll_wb0.c b/drivers/clock_control/clock_stm32_ll_wb0.c
index f5375d2d8b3bc..e4e856c784d16 100644
--- a/drivers/clock_control/clock_stm32_ll_wb0.c
+++ b/drivers/clock_control/clock_stm32_ll_wb0.c
@@ -206,8 +206,7 @@ int enabled_clock(uint32_t src_clk)
 	return r;
 }
 
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	const mem_addr_t reg = RCC_REG(pclken->bus);
@@ -230,8 +229,7 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	const mem_addr_t reg = RCC_REG(pclken->bus);
@@ -247,13 +245,13 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_configure(const struct device *dev,
-						clock_control_subsys_t sub_system,
-						void *data)
+static int stm32_clock_control_configure(const struct device *dev,
+					 clock_control_subsys_t sub_system,
+					 void *data)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)sub_system;
-	const uint32_t shift = STM32_CLOCK_SHIFT_GET(pclken->enr);
-	mem_addr_t reg = RCC_REG(STM32_CLOCK_REG_GET(pclken->enr));
+	const uint32_t shift = STM32_DT_CLKSEL_SHIFT_GET(pclken->enr);
+	mem_addr_t reg = RCC_REG(STM32_DT_CLKSEL_REG_GET(pclken->enr));
 	int err;
 
 	ARG_UNUSED(dev);
@@ -265,13 +263,13 @@ static inline int stm32_clock_control_configure(const struct device *dev,
 		return err;
 	}
 
-	sys_clear_bits(reg, STM32_CLOCK_MASK_GET(pclken->enr) << shift);
-	sys_set_bits(reg, STM32_CLOCK_VAL_GET(pclken->enr) << shift);
+	sys_clear_bits(reg, STM32_DT_CLKSEL_MASK_GET(pclken->enr) << shift);
+	sys_set_bits(reg, STM32_DT_CLKSEL_VAL_GET(pclken->enr) << shift);
 
 	return 0;
 }
 
-static inline int get_apb0_periph_clkrate(struct stm32_pclken *pclken,
+static int get_apb0_periph_clkrate(struct stm32_pclken *pclken,
 	uint32_t *rate, uint32_t slow_clock, uint32_t sysclk, uint32_t clk_sys)
 {
 	switch (pclken->enr) {
@@ -312,8 +310,7 @@ static inline int get_apb0_periph_clkrate(struct stm32_pclken *pclken,
 	return 0;
 }
 
-static inline int get_apb1_periph_clkrate(struct stm32_pclken *pclken,
-	uint32_t *rate, uint32_t clk_sys)
+static int get_apb1_periph_clkrate(struct stm32_pclken *pclken, uint32_t *rate, uint32_t clk_sys)
 {
 	switch (pclken->enr) {
 #if defined(SPI1)
@@ -603,7 +600,7 @@ static void set_up_fixed_clock_sources(void)
  * @brief Converts the Kconfig STM32_WB0_CLKSYS_PRESCALER option
  * to a LL_RCC_RC64MPLL_DIV_x value understandable by the LL.
  */
-static inline uint32_t kconfig_to_ll_prescaler(uint32_t kcfg_pre)
+static uint32_t kconfig_to_ll_prescaler(uint32_t kcfg_pre)
 {
 	switch (kcfg_pre) {
 	case 1:
diff --git a/drivers/clock_control/clock_stm32_ll_wba.c b/drivers/clock_control/clock_stm32_ll_wba.c
index 323d0f1ae5fe4..ca888b690e832 100644
--- a/drivers/clock_control/clock_stm32_ll_wba.c
+++ b/drivers/clock_control/clock_stm32_ll_wba.c
@@ -62,15 +62,14 @@ int enabled_clock(uint32_t src_clk)
 	return -ENOTSUP;
 }
 
-static inline int stm32_clock_control_on(const struct device *dev,
-					 clock_control_subsys_t sub_system)
+static int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	volatile int temp;
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -84,14 +83,13 @@ static inline int stm32_clock_control_on(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_off(const struct device *dev,
-					  clock_control_subsys_t sub_system)
+static int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) {
+	if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Attempt to toggle a wrong periph clock bit */
 		return -ENOTSUP;
 	}
@@ -102,9 +100,9 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	return 0;
 }
 
-static inline int stm32_clock_control_configure(const struct device *dev,
-						clock_control_subsys_t sub_system,
-						void *data)
+static int stm32_clock_control_configure(const struct device *dev,
+					 clock_control_subsys_t sub_system,
+					 void *data)
 {
 #if defined(STM32_SRC_CLOCK_MIN)
 	/* At least one alt src clock available */
@@ -120,10 +118,12 @@ static inline int stm32_clock_control_configure(const struct device *dev,
 		return err;
 	}
 
-	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		       STM32_CLOCK_MASK_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
-	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_CLOCK_REG_GET(pclken->enr),
-		     STM32_CLOCK_VAL_GET(pclken->enr) << STM32_CLOCK_SHIFT_GET(pclken->enr));
+	sys_clear_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		       STM32_DT_CLKSEL_MASK_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
+	sys_set_bits(DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		     STM32_DT_CLKSEL_VAL_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 
 	return 0;
 #else
@@ -285,7 +285,7 @@ static enum clock_control_status stm32_clock_control_get_status(const struct dev
 
 	ARG_UNUSED(dev);
 
-	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == true) {
+	if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) {
 		/* Gated clocks */
 		if ((sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus) & pclken->enr)
 		    == pclken->enr) {
diff --git a/drivers/clock_control/clock_stm32_mco.c b/drivers/clock_control/clock_stm32_mco.c
index 0e8d6faec2661..1a524d74c59b2 100644
--- a/drivers/clock_control/clock_stm32_mco.c
+++ b/drivers/clock_control/clock_stm32_mco.c
@@ -41,24 +41,24 @@ static int stm32_mco_init(const struct device *dev)
 
 	/* MCO source */
 	sys_clear_bits(
-		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_MCO_CFGR_REG_GET(pclken->enr),
-		STM32_MCO_CFGR_MASK_GET(pclken->enr) <<
-			STM32_MCO_CFGR_SHIFT_GET(pclken->enr));
+		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		STM32_DT_CLKSEL_MASK_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 	sys_set_bits(
-		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_MCO_CFGR_REG_GET(pclken->enr),
-		STM32_MCO_CFGR_VAL_GET(pclken->enr) <<
-			STM32_MCO_CFGR_SHIFT_GET(pclken->enr));
+		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(pclken->enr),
+		STM32_DT_CLKSEL_VAL_GET(pclken->enr) <<
+			STM32_DT_CLKSEL_SHIFT_GET(pclken->enr));
 
 #if defined(HAS_PRESCALER)
 	/* MCO prescaler */
 	sys_clear_bits(
-		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_MCO_CFGR_REG_GET(config->prescaler),
-		STM32_MCO_CFGR_MASK_GET(config->prescaler) <<
-			STM32_MCO_CFGR_SHIFT_GET(config->prescaler));
+		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(config->prescaler),
+		STM32_DT_CLKSEL_MASK_GET(config->prescaler) <<
+			STM32_DT_CLKSEL_SHIFT_GET(config->prescaler));
 	sys_set_bits(
-		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_MCO_CFGR_REG_GET(config->prescaler),
-		STM32_MCO_CFGR_VAL_GET(config->prescaler) <<
-			STM32_MCO_CFGR_SHIFT_GET(config->prescaler));
+		DT_REG_ADDR(DT_NODELABEL(rcc)) + STM32_DT_CLKSEL_REG_GET(config->prescaler),
+		STM32_DT_CLKSEL_VAL_GET(config->prescaler) <<
+			STM32_DT_CLKSEL_SHIFT_GET(config->prescaler));
 #endif
 
 	return pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
diff --git a/drivers/comparator/CMakeLists.txt b/drivers/comparator/CMakeLists.txt
index cbfa301d580f3..5d8ef05546165 100644
--- a/drivers/comparator/CMakeLists.txt
+++ b/drivers/comparator/CMakeLists.txt
@@ -12,3 +12,4 @@ zephyr_library_sources_ifdef(CONFIG_COMPARATOR_MCUX_ACMP comparator_mcux_acmp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_COMP comparator_nrf_comp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_NRF_LPCOMP comparator_nrf_lpcomp.c)
 zephyr_library_sources_ifdef(CONFIG_COMPARATOR_SHELL comparator_shell.c)
+zephyr_library_sources_ifdef(CONFIG_COMPARATOR_RENESAS_RA comparator_renesas_ra.c)
diff --git a/drivers/comparator/Kconfig b/drivers/comparator/Kconfig
index 79538a6cc2221..2cc02c2408510 100644
--- a/drivers/comparator/Kconfig
+++ b/drivers/comparator/Kconfig
@@ -24,5 +24,6 @@ rsource "Kconfig.mcux_acmp"
 rsource "Kconfig.nrf_comp"
 rsource "Kconfig.nrf_lpcomp"
 rsource "Kconfig.shell"
+rsource "Kconfig.renesas_ra"
 
 endif # COMPARATOR
diff --git a/drivers/comparator/Kconfig.mcux_acmp b/drivers/comparator/Kconfig.mcux_acmp
index 8109cb1cdd2d8..be4467c8e4337 100644
--- a/drivers/comparator/Kconfig.mcux_acmp
+++ b/drivers/comparator/Kconfig.mcux_acmp
@@ -6,4 +6,3 @@ config COMPARATOR_MCUX_ACMP
 	default y
 	depends on DT_HAS_NXP_KINETIS_ACMP_ENABLED
 	select PINCTRL
-	select MCUX_ACMP
diff --git a/drivers/comparator/Kconfig.renesas_ra b/drivers/comparator/Kconfig.renesas_ra
new file mode 100644
index 0000000000000..f66390a32ab55
--- /dev/null
+++ b/drivers/comparator/Kconfig.renesas_ra
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config COMPARATOR_RENESAS_RA
+	bool "Renesas RA ACMPHS"
+	default y
+	depends on DT_HAS_RENESAS_RA_ACMPHS_ENABLED
+	select USE_RA_FSP_ACMPHS
+	select PINCTRL
+	help
+	  Enable Renesas RA ACMPHS Driver.
diff --git a/drivers/comparator/comparator_renesas_ra.c b/drivers/comparator/comparator_renesas_ra.c
new file mode 100644
index 0000000000000..6b0cb98249b6b
--- /dev/null
+++ b/drivers/comparator/comparator_renesas_ra.c
@@ -0,0 +1,282 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT renesas_ra_acmphs
+
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/kernel.h>
+#include <zephyr/irq.h>
+#include <soc.h>
+#include "r_acmphs.h"
+
+LOG_MODULE_REGISTER(acmphs_renesas_ra, CONFIG_COMPARATOR_LOG_LEVEL);
+
+#define ACMPHS_RENESAS_RA_FLAG_HS BIT(0)
+
+void comp_hs_int_isr(void);
+
+struct acmphs_renesas_ra_global_config {
+	const struct pinctrl_dev_config *pcfg;
+};
+
+struct acmphs_renesas_ra_config {
+	const struct pinctrl_dev_config *pcfg;
+};
+
+struct acmphs_renesas_ra_data {
+	const struct device *dev;
+	acmphs_instance_ctrl_t acmphs;
+	comparator_cfg_t fsp_config;
+	comparator_callback_t user_cb;
+	void *user_cb_data;
+	atomic_t flags;
+};
+
+static int acmphs_renesas_get_output(const struct device *dev)
+{
+	struct acmphs_renesas_ra_data *data = dev->data;
+	comparator_status_t status;
+	fsp_err_t fsp_err;
+
+	fsp_err = R_ACMPHS_StatusGet(&data->acmphs, &status);
+	if (FSP_SUCCESS != fsp_err) {
+		return -EIO;
+	}
+
+	switch (status.state) {
+	case COMPARATOR_STATE_OUTPUT_LOW:
+		return 0;
+
+	case COMPARATOR_STATE_OUTPUT_HIGH:
+		return 1;
+
+	case COMPARATOR_STATE_OUTPUT_DISABLED:
+		LOG_ERR("Need to set trigger to open comparator first");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int acmphs_renesas_set_trigger(const struct device *dev, enum comparator_trigger trigger)
+{
+	struct acmphs_renesas_ra_data *data = dev->data;
+
+	/* Disable interrupt */
+	data->acmphs.p_reg->CMPCTL &= ~R_ACMPHS0_CMPCTL_CEG_Msk;
+
+	switch (trigger) {
+	case COMPARATOR_TRIGGER_RISING_EDGE:
+		data->fsp_config.trigger = COMPARATOR_TRIGGER_RISING;
+		break;
+
+	case COMPARATOR_TRIGGER_FALLING_EDGE:
+		data->fsp_config.trigger = COMPARATOR_TRIGGER_FALLING;
+		break;
+
+	case COMPARATOR_TRIGGER_BOTH_EDGES:
+		data->fsp_config.trigger = COMPARATOR_TRIGGER_BOTH_EDGE;
+		break;
+
+	case COMPARATOR_TRIGGER_NONE:
+		data->fsp_config.trigger = COMPARATOR_TRIGGER_NO_EDGE;
+		break;
+	}
+
+	data->acmphs.p_reg->CMPCTL |= (data->fsp_config.trigger << R_ACMPHS0_CMPCTL_CEG_Pos);
+
+	return 0;
+}
+
+static int acmphs_renesas_set_trigger_callback(const struct device *dev,
+					       comparator_callback_t callback, void *user_data)
+{
+	struct acmphs_renesas_ra_data *data = dev->data;
+
+	/* Disable interrupt */
+	data->acmphs.p_reg->CMPCTL &= ~R_ACMPHS0_CMPCTL_CEG_Msk;
+
+	data->user_cb = callback;
+	data->user_cb_data = user_data;
+
+	/* Enable interrupt */
+	data->acmphs.p_reg->CMPCTL |= (data->fsp_config.trigger << R_ACMPHS0_CMPCTL_CEG_Pos);
+
+	return 0;
+}
+
+static int acmphs_renesas_trigger_is_pending(const struct device *dev)
+{
+	struct acmphs_renesas_ra_data *data = dev->data;
+
+	if (data->flags & ACMPHS_RENESAS_RA_FLAG_HS) {
+		atomic_and(&data->flags, ~ACMPHS_RENESAS_RA_FLAG_HS);
+		return 1;
+	}
+
+	return 0;
+}
+
+static void acmphs_renesas_ra_hs_isr(comparator_callback_args_t *fsp_args)
+{
+	const struct device *dev = fsp_args->p_context;
+	struct acmphs_renesas_ra_data *data = dev->data;
+	comparator_callback_t cb = data->user_cb;
+
+	if (cb != NULL) {
+		cb(dev, data->user_cb_data);
+		return;
+	}
+
+	atomic_or(&data->flags, ACMPHS_RENESAS_RA_FLAG_HS);
+}
+
+static int acmphs_renesas_ra_global_init(const struct device *dev)
+{
+	const struct acmphs_renesas_ra_global_config *cfg = dev->config;
+	int ret;
+
+	ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		LOG_DBG("pin VCOUT initial failed");
+		return ret;
+	}
+
+	return 0;
+}
+
+static int acmphs_renesas_ra_init(const struct device *dev)
+{
+	struct acmphs_renesas_ra_data *data = dev->data;
+	const struct acmphs_renesas_ra_config *cfg = dev->config;
+	fsp_err_t fsp_err;
+	int ret;
+
+	ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		LOG_DBG("pin default initial failed");
+		return ret;
+	}
+
+	data->fsp_config.p_context = dev;
+
+	fsp_err = R_ACMPHS_Open(&data->acmphs, &data->fsp_config);
+	if (FSP_SUCCESS != fsp_err) {
+		return -EIO;
+	}
+
+	/*
+	 * Once the analog comparator is configurate, the program must wait
+	 * for the ACMPHS stabilization time (300ns enabling + 200ns input switching)
+	 * before using the comparator.
+	 */
+	k_usleep(5);
+
+	fsp_err = R_ACMPHS_OutputEnable(&data->acmphs);
+	if (FSP_SUCCESS != fsp_err) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(comparator, acmphs_renesas_ra_api) = {
+	.get_output = acmphs_renesas_get_output,
+	.set_trigger = acmphs_renesas_set_trigger,
+	.set_trigger_callback = acmphs_renesas_set_trigger_callback,
+	.trigger_is_pending = acmphs_renesas_trigger_is_pending,
+};
+
+PINCTRL_DT_DEFINE(DT_INST(0, renesas_ra_acmphs_global));
+
+static const struct acmphs_renesas_ra_global_config acmphs_renesas_ra_global_config = {
+	.pcfg = PINCTRL_DT_DEV_CONFIG_GET(DT_INST(0, renesas_ra_acmphs_global)),
+};
+
+DEVICE_DT_DEFINE(DT_COMPAT_GET_ANY_STATUS_OKAY(renesas_ra_acmphs_global),
+		 acmphs_renesas_ra_global_init, NULL, NULL, &acmphs_renesas_ra_global_config,
+		 PRE_KERNEL_2, CONFIG_COMPARATOR_INIT_PRIORITY, NULL)
+
+#define ACMPHS_RENESAS_RA_IRQ_INIT(idx)                                                            \
+	{                                                                                          \
+		R_ICU->IELSR_b[DT_INST_IRQ_BY_NAME(idx, hs, irq)].IELS =                           \
+			BSP_PRV_IELS_ENUM(CONCAT(EVENT_ACMPHS, DT_INST_PROP(idx, channel), _INT)); \
+                                                                                                   \
+		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, hs, irq),                                     \
+			    DT_INST_IRQ_BY_NAME(idx, hs, priority), comp_hs_int_isr,               \
+			    DEVICE_DT_INST_GET(idx), 0);                                           \
+                                                                                                   \
+		irq_enable(DT_INST_IRQ_BY_NAME(idx, hs, irq));                                     \
+	}
+
+#define FILTER_PARAMETER(idx)                                                                      \
+	COND_CODE_1(IS_EQ(DT_INST_PROP(idx, noise_filter), 1),                                     \
+	(COMPARATOR_FILTER_OFF), (UTIL_CAT(COMPARATOR_FILTER_, DT_INST_PROP(idx, noise_filter))))
+
+#define INVERT_PARAMETER(idx)                                                                      \
+	COND_CODE_1(DT_INST_PROP(idx, output_invert_polarity),                                     \
+	(COMPARATOR_POLARITY_INVERT_ON), (COMPARATOR_POLARITY_INVERT_OFF))
+
+#define PIN_OUTPUT_PARAMETER(idx)                                                                  \
+	COND_CODE_1(DT_INST_PROP(idx, pin_output_enable),                                          \
+	(COMPARATOR_PIN_OUTPUT_ON), (COMPARATOR_PIN_OUTPUT_OFF))
+
+#define IRQ_PARAMETER(idx)                                                                         \
+	COND_CODE_1(DT_INST_IRQ_HAS_NAME(idx, hs),                                                 \
+	(DT_INST_IRQ_BY_NAME(idx, hs, irq)), (FSP_INVALID_VECTOR))
+
+#define IPL_PARAMETER(idx)                                                                         \
+	COND_CODE_1(DT_INST_IRQ_HAS_NAME(idx, hs),                                                 \
+	(DT_INST_IRQ_BY_NAME(idx, hs, priority)), (BSP_IRQ_DISABLED))
+
+#define IRQ_INIT_MACRO_FUNCTION(idx)                                                               \
+	COND_CODE_1(DT_INST_IRQ_HAS_NAME(idx, hs), (ACMPHS_RENESAS_RA_IRQ_INIT(idx);), ())
+
+#define ACMPHS_RENESAS_RA_INIT(idx)                                                                \
+	PINCTRL_DT_INST_DEFINE(idx);                                                               \
+	static r_acmphs_extended_cfg_t g_acmphs_cfg_extend_##idx = {                               \
+		.input_voltage = UTIL_CAT(ACMPHS_INPUT_,                                           \
+					  DT_INST_STRING_UPPER_TOKEN(idx, compare_input_source)),  \
+		.reference_voltage =                                                               \
+			UTIL_CAT(ACMPHS_REFERENCE_,                                                \
+				 DT_INST_STRING_UPPER_TOKEN(idx, reference_input_source)),         \
+		.maximum_status_retries = 1024,                                                    \
+	};                                                                                         \
+	static const struct acmphs_renesas_ra_config acmphs_renesas_ra_config_##idx = {            \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx),                                       \
+	};                                                                                         \
+	static struct acmphs_renesas_ra_data acmphs_renesas_ra_data_##idx = {                      \
+		.dev = DEVICE_DT_INST_GET(idx),                                                    \
+		.fsp_config =                                                                      \
+			{                                                                          \
+				.channel = DT_INST_PROP(idx, channel),                             \
+				.mode = COMPARATOR_MODE_NORMAL,                                    \
+				.trigger = COMPARATOR_TRIGGER_NO_EDGE,                             \
+				.filter = FILTER_PARAMETER(idx),                                   \
+				.invert = INVERT_PARAMETER(idx),                                   \
+				.pin_output = PIN_OUTPUT_PARAMETER(idx),                           \
+				.p_extend = &g_acmphs_cfg_extend_##idx,                            \
+				.irq = IRQ_PARAMETER(idx),                                         \
+				.ipl = IPL_PARAMETER(idx),                                         \
+				.p_callback = acmphs_renesas_ra_hs_isr,                            \
+			},                                                                         \
+		.flags = 0,                                                                        \
+	};                                                                                         \
+	static int acmphs_renesas_ra_init##idx(const struct device *dev)                           \
+	{                                                                                          \
+		IRQ_INIT_MACRO_FUNCTION(idx)                                                       \
+		return acmphs_renesas_ra_init(dev);                                                \
+	}                                                                                          \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(idx, acmphs_renesas_ra_init##idx, NULL,                              \
+			      &acmphs_renesas_ra_data_##idx, &acmphs_renesas_ra_config_##idx,      \
+			      POST_KERNEL, CONFIG_COMPARATOR_INIT_PRIORITY,                        \
+			      &acmphs_renesas_ra_api)
+
+DT_INST_FOREACH_STATUS_OKAY(ACMPHS_RENESAS_RA_INIT);
diff --git a/drivers/comparator/comparator_silabs_acmp.c b/drivers/comparator/comparator_silabs_acmp.c
index 479472f790f0c..4cbf880d5f1d5 100644
--- a/drivers/comparator/comparator_silabs_acmp.c
+++ b/drivers/comparator/comparator_silabs_acmp.c
@@ -12,6 +12,7 @@
 #include <zephyr/drivers/clock_control/clock_control_silabs.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/irq.h>
+#include <zephyr/pm/device.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(silabs_acmp, CONFIG_COMPARATOR_LOG_LEVEL);
@@ -35,6 +36,45 @@ struct acmp_data {
 	void *user_data;
 };
 
+static int acmp_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct acmp_config *config = dev->config;
+	int err;
+
+	if (action == PM_DEVICE_ACTION_RESUME) {
+		err = clock_control_on(config->clock_dev,
+				       (clock_control_subsys_t)&config->clock_cfg);
+		if (err < 0 && err != -EALREADY) {
+			return err;
+		}
+
+		err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
+		if (err < 0 && err != -ENOENT) {
+			LOG_ERR("failed to allocate silabs,analog-bus via pinctrl");
+			return err;
+		}
+
+		ACMP_Enable(config->base);
+	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
+		ACMP_Disable(config->base);
+
+		err = clock_control_off(config->clock_dev,
+					(clock_control_subsys_t)&config->clock_cfg);
+		if (err < 0) {
+			return err;
+		}
+
+		err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_SLEEP);
+		if (err < 0 && err != -ENOENT) {
+			return err;
+		}
+	} else {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
 static int acmp_init(const struct device *dev)
 {
 	int err;
@@ -58,10 +98,16 @@ static int acmp_init(const struct device *dev)
 	/* Configure the ACMP Input Channels */
 	ACMP_ChannelSet(config->base, config->input_negative, config->input_positive);
 
+	/* After initialization, the comparator should not yet be enabled. It was temporarily
+	 * enabled to perform input configuration since the INPUTCTRL register has the SYNC type,
+	 * disable it again here. It will be enabled by the PM resume action.
+	 */
+	ACMP_Disable(config->base);
+
 	/* Initialize the irq handler */
 	config->irq_init();
 
-	return 0;
+	return pm_device_driver_init(dev, acmp_pm_action);
 }
 
 static int acmp_get_output(const struct device *dev)
@@ -169,6 +215,7 @@ static DEVICE_API(comparator, acmp_api) = {
 
 #define ACMP_DEVICE(inst)                                                                          \
 	PINCTRL_DT_INST_DEFINE(inst);                                                              \
+	PM_DEVICE_DT_INST_DEFINE(inst, acmp_pm_action);                                            \
                                                                                                    \
 	static void acmp_irq_init##inst(void)                                                      \
 	{                                                                                          \
@@ -197,7 +244,8 @@ static DEVICE_API(comparator, acmp_api) = {
 		.input_positive = DT_INST_PROP(inst, input_positive),                              \
 	};                                                                                         \
                                                                                                    \
-	DEVICE_DT_INST_DEFINE(inst, acmp_init, NULL, &acmp_data##inst, &acmp_config##inst,         \
-			      POST_KERNEL, CONFIG_COMPARATOR_INIT_PRIORITY, &acmp_api);
+	DEVICE_DT_INST_DEFINE(inst, acmp_init, PM_DEVICE_DT_INST_GET(inst), &acmp_data##inst,      \
+			      &acmp_config##inst, POST_KERNEL, CONFIG_COMPARATOR_INIT_PRIORITY,    \
+			      &acmp_api);
 
 DT_INST_FOREACH_STATUS_OKAY(ACMP_DEVICE)
diff --git a/drivers/console/Kconfig b/drivers/console/Kconfig
index 98ae6f7f84306..17e45604b43ec 100644
--- a/drivers/console/Kconfig
+++ b/drivers/console/Kconfig
@@ -284,6 +284,8 @@ config WINSTREAM_CONSOLE
 
 	  See the WINSTREAM Kconfig help for more information.
 
+if WINSTREAM_CONSOLE
+
 config WINSTREAM_CONSOLE_STATIC
 	bool "Use static/linkable memory for the winstream console"
 	default y if !SOC_FAMILY_INTEL_ADSP
@@ -300,4 +302,6 @@ config WINSTREAM_CONSOLE_STATIC_SIZE
 	help
 	  Size of winstream console buffer, in bytes
 
+endif # WINSTREAM_CONSOLE
+
 endif # CONSOLE
diff --git a/drivers/counter/CMakeLists.txt b/drivers/counter/CMakeLists.txt
index 93a51369f572c..13b12340b646e 100644
--- a/drivers/counter/CMakeLists.txt
+++ b/drivers/counter/CMakeLists.txt
@@ -15,6 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_COUNTER_AMBIQ               counter_ambiq_ti
 zephyr_library_sources_ifdef(CONFIG_COUNTER_GECKO_RTCC          counter_gecko_rtcc.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_GECKO_STIMER        counter_gecko_stimer.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_IMX_EPIT            counter_imx_epit.c)
+zephyr_library_sources_ifdef(CONFIG_COUNTER_ITE_IT8XXX2         counter_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_CTIMER         counter_mcux_ctimer.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_RTC            counter_mcux_rtc.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_LPC_RTC        counter_mcux_lpc_rtc.c)
@@ -32,7 +33,7 @@ zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_TPM            counter_mcux_tpm
 zephyr_library_sources_ifdef(CONFIG_COUNTER_XEC                 counter_mchp_xec.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_LPTMR          counter_mcux_lptmr.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_MAXIM_DS3231        maxim_ds3231.c)
-zephyr_library_sources_ifdef(CONFIG_COUNTER_NATIVE_POSIX        counter_native_posix.c)
+zephyr_library_sources_ifdef(CONFIG_COUNTER_NATIVE_SIM          counter_native_sim.c)
 zephyr_library_sources_ifdef(CONFIG_USERSPACE                   counter_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_NXP_PIT             counter_nxp_pit.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_XLNX_AXI_TIMER      counter_xlnx_axi_timer.c)
@@ -54,3 +55,4 @@ zephyr_library_sources_ifdef(CONFIG_COUNTER_RTC_MAX32           counter_max32_rt
 zephyr_library_sources_ifdef(CONFIG_COUNTER_NXP_MRT             counter_nxp_mrt.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_RA_AGT              counter_renesas_ra_agt.c)
 zephyr_library_sources_ifdef(CONFIG_COUNTER_RENESAS_RZ_GTM      counter_renesas_rz_gtm.c)
+zephyr_library_sources_ifdef(CONFIG_COUNTER_REALTEK_RTS5912_SLWTMR     counter_realtek_rts5912_slwtmr.c)
diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig
index d9d1dcafcc5fa..0bc67ab8ff3ef 100644
--- a/drivers/counter/Kconfig
+++ b/drivers/counter/Kconfig
@@ -42,6 +42,8 @@ source "drivers/counter/Kconfig.nrfx"
 
 source "drivers/counter/Kconfig.imx_epit"
 
+source "drivers/counter/Kconfig.ite_it8xxx2"
+
 source "drivers/counter/Kconfig.stm32_rtc"
 
 source "drivers/counter/Kconfig.stm32_timer"
@@ -68,7 +70,7 @@ source "drivers/counter/Kconfig.mcux_lptmr"
 
 source "drivers/counter/Kconfig.maxim_ds3231"
 
-source "drivers/counter/Kconfig.native_posix"
+source "drivers/counter/Kconfig.native_sim"
 
 source "drivers/counter/Kconfig.nxp_pit"
 
@@ -106,4 +108,6 @@ source "drivers/counter/Kconfig.renesas_ra"
 
 source "drivers/counter/Kconfig.renesas_rz"
 
+source "drivers/counter/Kconfig.rts5912_slwtmr"
+
 endif # COUNTER
diff --git a/drivers/counter/Kconfig.ite_it8xxx2 b/drivers/counter/Kconfig.ite_it8xxx2
new file mode 100644
index 0000000000000..a1f34da4ccf1e
--- /dev/null
+++ b/drivers/counter/Kconfig.ite_it8xxx2
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config COUNTER_ITE_IT8XXX2
+	bool "ITE IT8XXX2 Timer driver"
+	default y
+	depends on DT_HAS_ITE_IT8XXX2_COUNTER_ENABLED
+	help
+	  Enable counter support for the ITE IT8XXX2.
diff --git a/drivers/counter/Kconfig.mcux_lptmr b/drivers/counter/Kconfig.mcux_lptmr
index af961c790e1d4..11f387eef3cf5 100644
--- a/drivers/counter/Kconfig.mcux_lptmr
+++ b/drivers/counter/Kconfig.mcux_lptmr
@@ -6,17 +6,6 @@
 config COUNTER_MCUX_LPTMR
 	bool "MCUX LPTMR driver"
 	default y
-	depends on DT_HAS_NXP_LPTMR_ENABLED || \
-		   COUNTER_MCUX_KINETIS_LPTMR
+	depends on DT_HAS_NXP_LPTMR_ENABLED
 	help
 	  Enable support for the MCUX Low Power Timer (LPTMR).
-
-config COUNTER_MCUX_KINETIS_LPTMR
-	bool
-	default y
-	depends on DT_HAS_NXP_KINETIS_LPTMR_ENABLED
-	select DEPRECATED
-	help
-	  The compatible string "nxp,kinetis-lptmr" should
-	  be swiched to "nxp,lptmr" in DT. The former will
-	  be removed eventually.
diff --git a/drivers/counter/Kconfig.native_posix b/drivers/counter/Kconfig.native_posix
deleted file mode 100644
index a342ed07a3069..0000000000000
--- a/drivers/counter/Kconfig.native_posix
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2020, Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config COUNTER_NATIVE_POSIX
-	bool "Counter on COUNTER_0"
-	default y
-	depends on DT_HAS_ZEPHYR_NATIVE_POSIX_COUNTER_ENABLED
-
-config COUNTER_NATIVE_POSIX_FREQUENCY
-	int "native_posix counter frequency in Hz"
-	default 1000
-	depends on COUNTER_NATIVE_POSIX
-
-config COUNTER_NATIVE_POSIX_NBR_CHANNELS
-	int "native counter, number of channels"
-	default 4
-	depends on COUNTER_NATIVE_POSIX
diff --git a/drivers/counter/Kconfig.native_sim b/drivers/counter/Kconfig.native_sim
new file mode 100644
index 0000000000000..cc5a71481908f
--- /dev/null
+++ b/drivers/counter/Kconfig.native_sim
@@ -0,0 +1,29 @@
+# Copyright (c) 2020, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config COUNTER_NATIVE_SIM
+	bool "Counter on COUNTER_0"
+	default y
+	depends on (DT_HAS_ZEPHYR_NATIVE_SIM_COUNTER_ENABLED || DT_HAS_ZEPHYR_NATIVE_POSIX_COUNTER_ENABLED)
+
+config COUNTER_NATIVE_SIM_FREQUENCY
+	int "native_sim counter frequency in Hz"
+	default COUNTER_NATIVE_POSIX_FREQUENCY
+	depends on COUNTER_NATIVE_SIM
+
+config COUNTER_NATIVE_SIM_NBR_CHANNELS
+	int "native_sim counter: number of channels"
+	default COUNTER_NATIVE_POSIX_NBR_CHANNELS
+	depends on COUNTER_NATIVE_SIM
+
+config COUNTER_NATIVE_POSIX
+	bool "Counter on COUNTER_0 (deprecated)"
+	select DEPRECATED
+
+config COUNTER_NATIVE_POSIX_FREQUENCY
+	int "native_posix counter frequency in Hz (deprecated)"
+	default 1000
+
+config COUNTER_NATIVE_POSIX_NBR_CHANNELS
+	int "native counter, number of channels (deprecated)"
+	default 4
diff --git a/drivers/counter/Kconfig.rts5912_slwtmr b/drivers/counter/Kconfig.rts5912_slwtmr
new file mode 100644
index 0000000000000..47b6ab72f1b66
--- /dev/null
+++ b/drivers/counter/Kconfig.rts5912_slwtmr
@@ -0,0 +1,12 @@
+# Realtek counter configuration options
+
+# Copyright (c) 2025 Realtek Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config COUNTER_REALTEK_RTS5912_SLWTMR
+	bool "Realtek rts5912 series slow timer counter driver"
+	default y
+	depends on DT_HAS_REALTEK_RTS5912_SLWTIMER_ENABLED
+	help
+	  Enable counter driver for Realtek RTS5912 MCU series. Such driver
+	  will expose the slow timer devices present on the MCU.
diff --git a/drivers/counter/Kconfig.stm32_rtc b/drivers/counter/Kconfig.stm32_rtc
index 6bab7a93e76fa..e7c7c1bea9788 100644
--- a/drivers/counter/Kconfig.stm32_rtc
+++ b/drivers/counter/Kconfig.stm32_rtc
@@ -7,10 +7,8 @@ menuconfig COUNTER_RTC_STM32
 	bool "STM32 Counter RTC driver"
 	default y if !RTC
 	depends on DT_HAS_ST_STM32_RTC_ENABLED
+	depends on !SOC_SERIES_STM32WB0X
 	select USE_STM32_LL_RTC
-	select USE_STM32_LL_PWR
-	select USE_STM32_LL_RCC
-	select USE_STM32_LL_EXTI
 	help
 	  Build RTC driver for STM32 SoCs.
 	  Tested on STM32 C0, F0, F2, F3, F4, F7, G0, G4, H7, L1, L4, L5, U5 series
diff --git a/drivers/counter/counter_ambiq_timer.c b/drivers/counter/counter_ambiq_timer.c
index 2b3459ec5e948..b9323c5f5a3dc 100644
--- a/drivers/counter/counter_ambiq_timer.c
+++ b/drivers/counter/counter_ambiq_timer.c
@@ -12,7 +12,7 @@
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_REGISTER(ambiq_counter, CONFIG_COUNTER_LOG_LEVEL);
 
diff --git a/drivers/counter/counter_esp32_rtc.c b/drivers/counter/counter_esp32_rtc.c
index ebbdd20754155..bf751f6441439 100644
--- a/drivers/counter/counter_esp32_rtc.c
+++ b/drivers/counter/counter_esp32_rtc.c
@@ -1,15 +1,11 @@
 /*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2022-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #define DT_DRV_COMPAT espressif_esp32_rtc_timer
 
-/*
- * Include esp-idf headers first to avoid
- * redefining BIT() macro
- */
 #include "soc/rtc_cntl_reg.h"
 #include "soc/rtc.h"
 #include <esp_rom_sys.h>
@@ -21,22 +17,11 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/esp32_clock_control.h>
-
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || defined(CONFIG_SOC_SERIES_ESP32C3)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(esp32_counter_rtc, CONFIG_COUNTER_LOG_LEVEL);
 
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || defined(CONFIG_SOC_SERIES_ESP32C3)
-#define ESP32_COUNTER_RTC_ISR_HANDLER isr_handler_t
-#else
-#define ESP32_COUNTER_RTC_ISR_HANDLER intr_handler_t
-#endif
-
 static void counter_esp32_isr(void *arg);
 
 struct counter_esp32_config {
@@ -65,9 +50,10 @@ static int counter_esp32_init(const struct device *dev)
 			       &data->clk_src_freq);
 
 	flags = ESP_PRIO_TO_FLAGS(cfg->irq_priority) | ESP_INT_FLAGS_CHECK(cfg->irq_flags) |
-		ESP_INTR_FLAG_SHARED;
+			     ESP_INTR_FLAG_SHARED;
+
 	ret = esp_intr_alloc(cfg->irq_source, flags,
-			     (ESP32_COUNTER_RTC_ISR_HANDLER)counter_esp32_isr, (void *)dev, NULL);
+			     (intr_handler_t)counter_esp32_isr, (void *)dev, NULL);
 
 	if (ret != 0) {
 		LOG_ERR("could not allocate interrupt (err %d)", ret);
@@ -246,6 +232,6 @@ DEVICE_DT_INST_DEFINE(0,
 		      NULL,
 		      &counter_data,
 		      &counter_config,
-		      POST_KERNEL,
+		      PRE_KERNEL_2,
 		      CONFIG_COUNTER_INIT_PRIORITY,
 		      &rtc_timer_esp32_api);
diff --git a/drivers/counter/counter_esp32_tmr.c b/drivers/counter/counter_esp32_tmr.c
index 3131b45a42b2c..45143dc51dcca 100644
--- a/drivers/counter/counter_esp32_tmr.c
+++ b/drivers/counter/counter_esp32_tmr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,22 +14,12 @@
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/kernel.h>
-#if defined(CONFIG_RISCV)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(esp32_counter, CONFIG_COUNTER_LOG_LEVEL);
 
-#if defined(CONFIG_RISCV)
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
-
 static void counter_esp32_isr(void *arg);
 
 typedef bool (*timer_isr_t)(void *);
@@ -97,7 +87,7 @@ static int counter_esp32_init(const struct device *dev)
 	int ret = esp_intr_alloc(cfg->irq_source,
 				 ESP_PRIO_TO_FLAGS(cfg->irq_priority) |
 					 ESP_INT_FLAGS_CHECK(cfg->irq_flags),
-				 (ISR_HANDLER)counter_esp32_isr, (void *)dev, NULL);
+				 (intr_handler_t)counter_esp32_isr, (void *)dev, NULL);
 
 	if (ret != 0) {
 		LOG_ERR("could not allocate interrupt (err %d)", ret);
diff --git a/drivers/counter/counter_ite_it8xxx2.c b/drivers/counter/counter_ite_it8xxx2.c
new file mode 100644
index 0000000000000..cbd34a605ffbc
--- /dev/null
+++ b/drivers/counter/counter_ite_it8xxx2.c
@@ -0,0 +1,334 @@
+/*
+ * Copyright (c) 2025 ITE Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ite_it8xxx2_counter
+
+#include <soc.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(counter_it8xxx2, CONFIG_COUNTER_LOG_LEVEL);
+
+/* IT8XXX2 Timer registers offsets */
+#define ET7CTRL   0x00
+#define ET7PSR    0x01
+#define ET7CNTLLR 0x04
+#define ET8CTRL   0x08
+#define ET8PSR    0x09
+#define ET8CNTLLR 0x0C
+#define ET7CNTOLR 0x28
+#define ET8CNTOLR 0x2C
+
+/* ETnCTLR bit definitions (for n = 7 ~ 8) */
+#define ET_COMB BIT(3) /* only defined in ET7CTRL */
+#define ET_TC   BIT(2)
+#define ET_RST  BIT(1)
+#define ET_EN   BIT(0)
+
+/* ETnPSR bit definitions (for n = 7 ~ 8) */
+#define ETnPSR_32768HZ 0x00
+
+struct counter_it8xxx2_config {
+	struct counter_config_info info;
+	mm_reg_t base;
+	/* alarm timer irq */
+	int alarm_irq;
+	/* top timer irq */
+	int top_irq;
+	void (*irq_config_func)(const struct device *dev);
+};
+
+struct counter_it8xxx2_data {
+	counter_top_callback_t top_callback;
+	void *top_user_data;
+	counter_alarm_callback_t alarm_callback;
+	void *alarm_user_data;
+};
+
+static inline uint32_t counter_it8xxx2_read8(const struct device *dev, mm_reg_t offset)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+
+	return sys_read8(config->base + offset);
+}
+
+static inline uint32_t counter_it8xxx2_read32(const struct device *dev, mm_reg_t offset)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+
+	return sys_read32(config->base + offset);
+}
+
+static inline void counter_it8xxx2_write8(const struct device *dev, uint32_t value, mm_reg_t offset)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+
+	sys_write8(value, config->base + offset);
+}
+
+static inline void counter_it8xxx2_write32(const struct device *dev, uint32_t value,
+					   mm_reg_t offset)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+
+	sys_write32(value, config->base + offset);
+}
+
+static inline void counter_it8xxx2_alarm_timer_disable(const struct device *dev)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+
+	irq_disable(config->alarm_irq);
+	counter_it8xxx2_write8(dev, counter_it8xxx2_read8(dev, ET7CTRL) & ~ET_EN, ET7CTRL);
+	ite_intc_isr_clear(config->alarm_irq);
+}
+
+static int counter_it8xxx2_start(const struct device *dev)
+{
+	LOG_DBG("starting top timer");
+
+	counter_it8xxx2_write8(dev, ET_EN | ET_RST, ET8CTRL);
+
+	return 0;
+}
+
+static int counter_it8xxx2_stop(const struct device *dev)
+{
+	LOG_DBG("stopping timer");
+
+	counter_it8xxx2_write8(dev, counter_it8xxx2_read8(dev, ET8CTRL) & ~ET_EN, ET8CTRL);
+
+	return 0;
+}
+
+static int counter_it8xxx2_get_value(const struct device *dev, uint32_t *ticks)
+{
+	*ticks = counter_it8xxx2_read32(dev, ET8CNTOLR);
+
+	return 0;
+}
+
+static int counter_it8xxx2_set_alarm(const struct device *dev, uint8_t chan_id,
+				     const struct counter_alarm_cfg *alarm_cfg)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+	struct counter_it8xxx2_data *data = dev->data;
+
+	ARG_UNUSED(chan_id);
+
+	/* Interrupts are only triggered when the counter reaches 0.
+	 * So only relative alarms are supported.
+	 */
+	if (alarm_cfg->flags & COUNTER_ALARM_CFG_ABSOLUTE) {
+		return -ENOTSUP;
+	}
+
+	if (data->alarm_callback != NULL) {
+		return -EBUSY;
+	}
+
+	if (alarm_cfg->callback == NULL) {
+		return -EINVAL;
+	}
+
+	if (alarm_cfg->ticks > counter_it8xxx2_read32(dev, ET8CNTLLR)) {
+		return -EINVAL;
+	}
+
+	LOG_DBG("triggering alarm in 0x%08x ticks", alarm_cfg->ticks);
+
+	irq_disable(config->alarm_irq);
+
+	counter_it8xxx2_write32(dev, alarm_cfg->ticks, ET7CNTLLR);
+
+	data->alarm_callback = alarm_cfg->callback;
+	data->alarm_user_data = alarm_cfg->user_data;
+
+	LOG_DBG("%p Counter alarm set to %u ticks", dev, alarm_cfg->ticks);
+
+	counter_it8xxx2_write8(dev, counter_it8xxx2_read8(dev, ET7CTRL) | ET_EN | ET_RST, ET7CTRL);
+
+	ite_intc_isr_clear(config->alarm_irq);
+
+	irq_enable(config->alarm_irq);
+
+	return 0;
+}
+
+static int counter_it8xxx2_cancel_alarm(const struct device *dev, uint8_t chan_id)
+{
+	struct counter_it8xxx2_data *data = dev->data;
+
+	if (chan_id != 0) {
+		LOG_ERR("Invalid channel id %u", chan_id);
+		return -ENOTSUP;
+	}
+
+	counter_it8xxx2_alarm_timer_disable(dev);
+
+	data->alarm_callback = NULL;
+	data->alarm_user_data = NULL;
+
+	LOG_DBG("%p Counter alarm canceled", dev);
+
+	return 0;
+}
+
+static int counter_it8xxx2_set_top_value(const struct device *dev,
+					 const struct counter_top_cfg *top_cfg)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+	struct counter_it8xxx2_data *data = dev->data;
+
+	if (top_cfg == NULL) {
+		LOG_ERR("Invalid top value configuration");
+		return -EINVAL;
+	}
+
+	if (top_cfg->ticks == 0) {
+		return -EINVAL;
+	}
+
+	if (top_cfg->ticks > config->info.max_top_value) {
+		return -ENOTSUP;
+	}
+
+	if (data->alarm_callback) {
+		return -EBUSY;
+	}
+
+	/* top value cannot be updated without reset */
+	if (top_cfg->flags & COUNTER_TOP_CFG_DONT_RESET) {
+		LOG_ERR("Updating top value without reset is not supported");
+		return -ENOTSUP;
+	}
+
+	LOG_DBG("setting top value to 0x%08x", top_cfg->ticks);
+
+	data->top_callback = top_cfg->callback;
+	data->top_user_data = top_cfg->user_data;
+
+	irq_disable(config->top_irq);
+
+	/* set new top value */
+	counter_it8xxx2_write32(dev, top_cfg->ticks, ET8CNTLLR);
+
+	/* re-enable and reset timer */
+	counter_it8xxx2_write8(dev, counter_it8xxx2_read8(dev, ET8CTRL) | ET_EN | ET_RST, ET8CTRL);
+
+	ite_intc_isr_clear(config->top_irq);
+
+	irq_enable(config->top_irq);
+
+	return 0;
+}
+
+static uint32_t counter_it8xxx2_get_top_value(const struct device *dev)
+{
+	return counter_it8xxx2_read32(dev, ET8CNTLLR);
+}
+
+static void counter_it8xxx2_alarm_isr(const struct device *dev)
+{
+	struct counter_it8xxx2_data *data = dev->data;
+	counter_alarm_callback_t alarm_cb;
+	void *user_data;
+	uint32_t ticks;
+
+	LOG_DBG("%p alarm timer ISR", dev);
+
+	/* Alarm is one-shot, so disable interrupt and callback */
+	if (data->alarm_callback) {
+		alarm_cb = data->alarm_callback;
+		data->alarm_callback = NULL;
+		user_data = data->alarm_user_data;
+
+		ticks = counter_it8xxx2_read32(dev, ET8CNTOLR);
+
+		alarm_cb(dev, 0, ticks, user_data);
+	}
+
+	counter_it8xxx2_alarm_timer_disable(dev);
+}
+
+static void counter_it8xxx2_top_isr(const struct device *dev)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+	struct counter_it8xxx2_data *data = dev->data;
+
+	LOG_DBG("%p top timer ISR", dev);
+
+	if (data->top_callback) {
+		data->top_callback(dev, data->top_user_data);
+	}
+
+	/* read clear timer 8 terminal count */
+	counter_it8xxx2_read8(dev, ET8CTRL);
+
+	ite_intc_isr_clear(config->top_irq);
+}
+
+static int counter_it8xxx2_init(const struct device *dev)
+{
+	const struct counter_it8xxx2_config *config = dev->config;
+
+	LOG_DBG("max top value = 0x%08x", config->info.max_top_value);
+	LOG_DBG("frequency = %d", config->info.freq);
+	LOG_DBG("channels = %d", config->info.channels);
+
+	/* set the top value of top timer  */
+	counter_it8xxx2_write32(dev, config->info.max_top_value, ET8CNTLLR);
+
+	/* set the frequencies of alarm timer and top timer */
+	counter_it8xxx2_write8(dev, ETnPSR_32768HZ, ET7PSR);
+	counter_it8xxx2_write8(dev, ETnPSR_32768HZ, ET8PSR);
+
+	config->irq_config_func(dev);
+
+	return 0;
+}
+
+static DEVICE_API(counter, counter_it8xxx2_driver_api) = {
+	.start = counter_it8xxx2_start,
+	.stop = counter_it8xxx2_stop,
+	.get_value = counter_it8xxx2_get_value,
+	.set_alarm = counter_it8xxx2_set_alarm,
+	.cancel_alarm = counter_it8xxx2_cancel_alarm,
+	.set_top_value = counter_it8xxx2_set_top_value,
+	.get_top_value = counter_it8xxx2_get_top_value,
+};
+
+#define COUNTER_IT8XXX2_INIT(n)                                                                    \
+	static void counter_it8xxx2_cfg_func_##n(const struct device *dev)                         \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN_BY_IDX(n, 0), 0, counter_it8xxx2_alarm_isr,               \
+			    DEVICE_DT_INST_GET(n), 0);                                             \
+		IRQ_CONNECT(DT_INST_IRQN_BY_IDX(n, 1), 0, counter_it8xxx2_top_isr,                 \
+			    DEVICE_DT_INST_GET(n), 0);                                             \
+	}                                                                                          \
+                                                                                                   \
+	static struct counter_it8xxx2_config counter_it8xxx2_config_##n = {                        \
+		.info =                                                                            \
+			{                                                                          \
+				.max_top_value = UINT32_MAX,                                       \
+				.freq = 32768,                                                     \
+				.flags = 0,                                                        \
+				.channels = 1,                                                     \
+			},                                                                         \
+		.base = DT_INST_REG_ADDR(n),                                                       \
+		.alarm_irq = DT_INST_IRQN_BY_IDX(n, 0),                                            \
+		.top_irq = DT_INST_IRQN_BY_IDX(n, 1),                                              \
+		.irq_config_func = counter_it8xxx2_cfg_func_##n,                                   \
+	};                                                                                         \
+                                                                                                   \
+	static struct counter_it8xxx2_data counter_it8xxx2_data_##n;                               \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(n, &counter_it8xxx2_init, NULL, &counter_it8xxx2_data_##n,           \
+			      &counter_it8xxx2_config_##n, POST_KERNEL,                            \
+			      CONFIG_COUNTER_INIT_PRIORITY, &counter_it8xxx2_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(COUNTER_IT8XXX2_INIT)
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	     "only one ite,it8xxx2-counter compatible node can be supported");
diff --git a/drivers/counter/counter_max32_rtc.c b/drivers/counter/counter_max32_rtc.c
index 74e5c86f3b66d..832a1394508cf 100644
--- a/drivers/counter/counter_max32_rtc.c
+++ b/drivers/counter/counter_max32_rtc.c
@@ -38,11 +38,6 @@ struct max32_rtc_config {
 
 static int api_start(const struct device *dev)
 {
-	/* Ensure that both sec and subsec are reset to 0 */
-	while (MXC_RTC_Init(0, 0) == E_BUSY) {
-		;
-	}
-
 	while (MXC_RTC_Start() == E_BUSY) {
 		;
 	}
diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c
index de78cc896dc84..3f55a8601d3fe 100644
--- a/drivers/counter/counter_mcux_lptmr.c
+++ b/drivers/counter/counter_mcux_lptmr.c
@@ -4,14 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/sys/util.h>
-#if DT_HAS_COMPAT_STATUS_OKAY(nxp_kinetis_lptmr)
-#define DT_DRV_COMPAT nxp_kinetis_lptmr
-#else
 #define DT_DRV_COMPAT nxp_lptmr
-#endif
 
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/irq.h>
 #include <fsl_lptmr.h>
diff --git a/drivers/counter/counter_native_posix.c b/drivers/counter/counter_native_posix.c
deleted file mode 100644
index 949a08a9f998a..0000000000000
--- a/drivers/counter/counter_native_posix.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2020, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT zephyr_native_posix_counter
-
-#include <string.h>
-#include <zephyr/device.h>
-#include <zephyr/drivers/counter.h>
-#include <zephyr/irq.h>
-#include <soc.h>
-#include <hw_counter.h>
-#include <limits.h>
-
-#define DRIVER_CONFIG_INFO_FLAGS (COUNTER_CONFIG_INFO_COUNT_UP)
-#define DRIVER_CONFIG_INFO_CHANNELS CONFIG_COUNTER_NATIVE_POSIX_NBR_CHANNELS
-#define COUNTER_NATIVE_POSIX_IRQ_FLAGS (0)
-#define COUNTER_NATIVE_POSIX_IRQ_PRIORITY (2)
-
-#define COUNTER_PERIOD (USEC_PER_SEC / CONFIG_COUNTER_NATIVE_POSIX_FREQUENCY)
-#define TOP_VALUE (UINT_MAX)
-
-static struct counter_alarm_cfg pending_alarm[DRIVER_CONFIG_INFO_CHANNELS];
-static bool is_alarm_pending[DRIVER_CONFIG_INFO_CHANNELS];
-static struct counter_top_cfg top;
-static bool is_top_set;
-static const struct device *device;
-
-static void schedule_next_isr(void)
-{
-	int64_t current_value = hw_counter_get_value();
-	uint32_t next_time = top.ticks; /* top.ticks is TOP_VALUE if is_top_set == false */
-
-	if (current_value == top.ticks) {
-		current_value = -1;
-	}
-
-	for (int i = 0; i < DRIVER_CONFIG_INFO_CHANNELS; i++) {
-		if (is_alarm_pending[i]) {
-			if (pending_alarm[i].ticks > current_value) {
-				/* If the alarm is not after a wrap */
-				next_time = MIN(pending_alarm[i].ticks, next_time);
-			}
-		}
-	}
-
-	/* We will at least get an interrupt at top.ticks even if is_top_set == false,
-	 * which is fine. We may use that to set the next alarm if needed
-	 */
-	hw_counter_set_target(next_time);
-}
-
-static void counter_isr(const void *arg)
-{
-	ARG_UNUSED(arg);
-	uint32_t current_value = hw_counter_get_value();
-
-	for (int i = 0; i < DRIVER_CONFIG_INFO_CHANNELS; i++) {
-		if (is_alarm_pending[i] && (current_value == pending_alarm[i].ticks)) {
-			is_alarm_pending[i] = false;
-			if (pending_alarm[i].callback) {
-				pending_alarm[i].callback(device, i, current_value,
-							  pending_alarm[i].user_data);
-			}
-		}
-	}
-
-	if (is_top_set && (current_value == top.ticks)) {
-		if (top.callback) {
-			top.callback(device, top.user_data);
-		}
-	}
-
-	schedule_next_isr();
-}
-
-static int ctr_init(const struct device *dev)
-{
-	device = dev;
-	memset(is_alarm_pending, 0, sizeof(is_alarm_pending));
-	is_top_set = false;
-	top.ticks = TOP_VALUE;
-
-	IRQ_CONNECT(COUNTER_EVENT_IRQ, COUNTER_NATIVE_POSIX_IRQ_PRIORITY,
-		    counter_isr, NULL, COUNTER_NATIVE_POSIX_IRQ_FLAGS);
-	irq_enable(COUNTER_EVENT_IRQ);
-	hw_counter_set_period(COUNTER_PERIOD);
-	hw_counter_set_wrap_value((uint64_t)top.ticks + 1);
-	hw_counter_reset();
-
-	return 0;
-}
-
-static int ctr_start(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	schedule_next_isr();
-	hw_counter_start();
-	return 0;
-}
-
-static int ctr_stop(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	hw_counter_stop();
-	return 0;
-}
-
-static int ctr_get_value(const struct device *dev, uint32_t *ticks)
-{
-	ARG_UNUSED(dev);
-
-	*ticks = hw_counter_get_value();
-	return 0;
-}
-
-static uint32_t ctr_get_pending_int(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-	return 0;
-}
-
-static bool is_any_alarm_pending(void)
-{
-	for (int i = 0; i < DRIVER_CONFIG_INFO_CHANNELS; i++) {
-		if (is_alarm_pending[i]) {
-			return true;
-		}
-	}
-	return false;
-}
-
-static int ctr_set_top_value(const struct device *dev,
-			     const struct counter_top_cfg *cfg)
-{
-	ARG_UNUSED(dev);
-
-	if (is_any_alarm_pending()) {
-		posix_print_warning("Can't set top value while alarm is active\n");
-		return -EBUSY;
-	}
-
-	uint32_t current_value = hw_counter_get_value();
-
-	if (cfg->flags & COUNTER_TOP_CFG_DONT_RESET) {
-		if (current_value >= cfg->ticks) {
-			if (cfg->flags & COUNTER_TOP_CFG_RESET_WHEN_LATE) {
-				hw_counter_reset();
-			}
-			return -ETIME;
-		}
-	} else {
-		hw_counter_reset();
-	}
-
-	top = *cfg;
-	hw_counter_set_wrap_value((uint64_t)top.ticks + 1);
-
-	if ((cfg->ticks == TOP_VALUE) && !cfg->callback) {
-		is_top_set = false;
-	} else {
-		is_top_set = true;
-	}
-
-	schedule_next_isr();
-
-	return 0;
-}
-
-static uint32_t ctr_get_top_value(const struct device *dev)
-{
-	return top.ticks;
-}
-
-static int ctr_set_alarm(const struct device *dev, uint8_t chan_id,
-			 const struct counter_alarm_cfg *alarm_cfg)
-{
-	ARG_UNUSED(dev);
-
-	if (is_alarm_pending[chan_id]) {
-		return -EBUSY;
-	}
-
-	uint32_t ticks = alarm_cfg->ticks;
-
-	if (ticks > top.ticks) {
-		posix_print_warning("Alarm ticks %u exceed top ticks %u\n", ticks,
-				top.ticks);
-		return -EINVAL;
-	}
-
-	if (!(alarm_cfg->flags & COUNTER_ALARM_CFG_ABSOLUTE)) {
-		uint32_t current_value = hw_counter_get_value();
-
-		ticks += current_value;
-		if (ticks > top.ticks) { /* Handle wrap arounds */
-			ticks -= (top.ticks + 1); /* The count period is top.ticks + 1 */
-		}
-	}
-
-	pending_alarm[chan_id] = *alarm_cfg;
-	pending_alarm[chan_id].ticks = ticks;
-	is_alarm_pending[chan_id] = true;
-
-	schedule_next_isr();
-
-	return 0;
-}
-
-static int ctr_cancel_alarm(const struct device *dev, uint8_t chan_id)
-{
-	ARG_UNUSED(dev);
-
-	if (!hw_counter_is_started()) {
-		posix_print_warning("Counter not started\n");
-		return -ENOTSUP;
-	}
-
-	is_alarm_pending[chan_id] = false;
-
-	schedule_next_isr();
-
-	return 0;
-}
-
-static DEVICE_API(counter, ctr_api) = {
-	.start = ctr_start,
-	.stop = ctr_stop,
-	.get_value = ctr_get_value,
-	.set_alarm = ctr_set_alarm,
-	.cancel_alarm = ctr_cancel_alarm,
-	.set_top_value = ctr_set_top_value,
-	.get_pending_int = ctr_get_pending_int,
-	.get_top_value = ctr_get_top_value,
-};
-
-static const struct counter_config_info ctr_config = {
-	.max_top_value = UINT_MAX,
-	.freq = CONFIG_COUNTER_NATIVE_POSIX_FREQUENCY,
-	.channels = DRIVER_CONFIG_INFO_CHANNELS,
-	.flags = DRIVER_CONFIG_INFO_FLAGS
-};
-
-DEVICE_DT_INST_DEFINE(0, ctr_init,
-		    NULL, NULL, &ctr_config, PRE_KERNEL_1,
-		    CONFIG_COUNTER_INIT_PRIORITY, &ctr_api);
diff --git a/drivers/counter/counter_native_sim.c b/drivers/counter/counter_native_sim.c
new file mode 100644
index 0000000000000..c044f8eef3df3
--- /dev/null
+++ b/drivers/counter/counter_native_sim.c
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2020, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/devicetree.h>
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_native_posix_counter)
+#define DT_DRV_COMPAT zephyr_native_posix_counter
+#warning "zephyr,native-posix-counter is deprecated in favor of zephyr,native-sim-counter"
+#else
+#define DT_DRV_COMPAT zephyr_native_sim_counter
+#endif
+
+#include <string.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/irq.h>
+#include <soc.h>
+#include <hw_counter.h>
+#include <limits.h>
+
+#define DRIVER_CONFIG_INFO_FLAGS (COUNTER_CONFIG_INFO_COUNT_UP)
+#define DRIVER_CONFIG_INFO_CHANNELS CONFIG_COUNTER_NATIVE_SIM_NBR_CHANNELS
+#define COUNTER_NATIVE_SIM_IRQ_FLAGS (0)
+#define COUNTER_NATIVE_SIM_IRQ_PRIORITY (2)
+
+#define COUNTER_PERIOD (USEC_PER_SEC / CONFIG_COUNTER_NATIVE_SIM_FREQUENCY)
+#define TOP_VALUE (UINT_MAX)
+
+static struct counter_alarm_cfg pending_alarm[DRIVER_CONFIG_INFO_CHANNELS];
+static bool is_alarm_pending[DRIVER_CONFIG_INFO_CHANNELS];
+static struct counter_top_cfg top;
+static bool is_top_set;
+static const struct device *device;
+
+static void schedule_next_isr(void)
+{
+	int64_t current_value = hw_counter_get_value();
+	uint32_t next_time = top.ticks; /* top.ticks is TOP_VALUE if is_top_set == false */
+
+	if (current_value == top.ticks) {
+		current_value = -1;
+	}
+
+	for (int i = 0; i < DRIVER_CONFIG_INFO_CHANNELS; i++) {
+		if (is_alarm_pending[i]) {
+			if (pending_alarm[i].ticks > current_value) {
+				/* If the alarm is not after a wrap */
+				next_time = MIN(pending_alarm[i].ticks, next_time);
+			}
+		}
+	}
+
+	/* We will at least get an interrupt at top.ticks even if is_top_set == false,
+	 * which is fine. We may use that to set the next alarm if needed
+	 */
+	hw_counter_set_target(next_time);
+}
+
+static void counter_isr(const void *arg)
+{
+	ARG_UNUSED(arg);
+	uint32_t current_value = hw_counter_get_value();
+
+	for (int i = 0; i < DRIVER_CONFIG_INFO_CHANNELS; i++) {
+		if (is_alarm_pending[i] && (current_value == pending_alarm[i].ticks)) {
+			is_alarm_pending[i] = false;
+			if (pending_alarm[i].callback) {
+				pending_alarm[i].callback(device, i, current_value,
+							  pending_alarm[i].user_data);
+			}
+		}
+	}
+
+	if (is_top_set && (current_value == top.ticks)) {
+		if (top.callback) {
+			top.callback(device, top.user_data);
+		}
+	}
+
+	schedule_next_isr();
+}
+
+static int ctr_init(const struct device *dev)
+{
+	device = dev;
+	memset(is_alarm_pending, 0, sizeof(is_alarm_pending));
+	is_top_set = false;
+	top.ticks = TOP_VALUE;
+
+	IRQ_CONNECT(COUNTER_EVENT_IRQ, COUNTER_NATIVE_SIM_IRQ_PRIORITY,
+		    counter_isr, NULL, COUNTER_NATIVE_SIM_IRQ_FLAGS);
+	irq_enable(COUNTER_EVENT_IRQ);
+	hw_counter_set_period(COUNTER_PERIOD);
+	hw_counter_set_wrap_value((uint64_t)top.ticks + 1);
+	hw_counter_reset();
+
+	return 0;
+}
+
+static int ctr_start(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	schedule_next_isr();
+	hw_counter_start();
+	return 0;
+}
+
+static int ctr_stop(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	hw_counter_stop();
+	return 0;
+}
+
+static int ctr_get_value(const struct device *dev, uint32_t *ticks)
+{
+	ARG_UNUSED(dev);
+
+	*ticks = hw_counter_get_value();
+	return 0;
+}
+
+static int ctr_reset(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	hw_counter_reset();
+	return 0;
+}
+
+static uint32_t ctr_get_pending_int(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+	return 0;
+}
+
+static bool is_any_alarm_pending(void)
+{
+	for (int i = 0; i < DRIVER_CONFIG_INFO_CHANNELS; i++) {
+		if (is_alarm_pending[i]) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static int ctr_set_top_value(const struct device *dev,
+			     const struct counter_top_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (is_any_alarm_pending()) {
+		posix_print_warning("Can't set top value while alarm is active\n");
+		return -EBUSY;
+	}
+
+	uint32_t current_value = hw_counter_get_value();
+
+	if (cfg->flags & COUNTER_TOP_CFG_DONT_RESET) {
+		if (current_value >= cfg->ticks) {
+			if (cfg->flags & COUNTER_TOP_CFG_RESET_WHEN_LATE) {
+				hw_counter_reset();
+			}
+			return -ETIME;
+		}
+	} else {
+		hw_counter_reset();
+	}
+
+	top = *cfg;
+	hw_counter_set_wrap_value((uint64_t)top.ticks + 1);
+
+	if ((cfg->ticks == TOP_VALUE) && !cfg->callback) {
+		is_top_set = false;
+	} else {
+		is_top_set = true;
+	}
+
+	schedule_next_isr();
+
+	return 0;
+}
+
+static uint32_t ctr_get_top_value(const struct device *dev)
+{
+	return top.ticks;
+}
+
+static int ctr_set_alarm(const struct device *dev, uint8_t chan_id,
+			 const struct counter_alarm_cfg *alarm_cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (is_alarm_pending[chan_id]) {
+		return -EBUSY;
+	}
+
+	uint32_t ticks = alarm_cfg->ticks;
+
+	if (ticks > top.ticks) {
+		posix_print_warning("Alarm ticks %u exceed top ticks %u\n", ticks,
+				top.ticks);
+		return -EINVAL;
+	}
+
+	if (!(alarm_cfg->flags & COUNTER_ALARM_CFG_ABSOLUTE)) {
+		uint32_t current_value = hw_counter_get_value();
+
+		ticks += current_value;
+		if (ticks > top.ticks) { /* Handle wrap arounds */
+			ticks -= (top.ticks + 1); /* The count period is top.ticks + 1 */
+		}
+	}
+
+	pending_alarm[chan_id] = *alarm_cfg;
+	pending_alarm[chan_id].ticks = ticks;
+	is_alarm_pending[chan_id] = true;
+
+	schedule_next_isr();
+
+	return 0;
+}
+
+static int ctr_cancel_alarm(const struct device *dev, uint8_t chan_id)
+{
+	ARG_UNUSED(dev);
+
+	if (!hw_counter_is_started()) {
+		posix_print_warning("Counter not started\n");
+		return -ENOTSUP;
+	}
+
+	is_alarm_pending[chan_id] = false;
+
+	schedule_next_isr();
+
+	return 0;
+}
+
+static DEVICE_API(counter, ctr_api) = {
+	.start = ctr_start,
+	.stop = ctr_stop,
+	.get_value = ctr_get_value,
+	.reset = ctr_reset,
+	.set_alarm = ctr_set_alarm,
+	.cancel_alarm = ctr_cancel_alarm,
+	.set_top_value = ctr_set_top_value,
+	.get_pending_int = ctr_get_pending_int,
+	.get_top_value = ctr_get_top_value,
+};
+
+static const struct counter_config_info ctr_config = {
+	.max_top_value = UINT_MAX,
+	.freq = CONFIG_COUNTER_NATIVE_SIM_FREQUENCY,
+	.channels = DRIVER_CONFIG_INFO_CHANNELS,
+	.flags = DRIVER_CONFIG_INFO_FLAGS
+};
+
+DEVICE_DT_INST_DEFINE(0, ctr_init,
+		    NULL, NULL, &ctr_config, PRE_KERNEL_1,
+		    CONFIG_COUNTER_INIT_PRIORITY, &ctr_api);
diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index afbdb4ed1adac..52e525717a9b6 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <soc.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <zephyr/devicetree.h>
@@ -109,7 +110,13 @@ static int stop(const struct device *dev)
 {
 	const struct counter_nrfx_config *config = dev->config;
 
+#if NRF_TIMER_HAS_SHUTDOWN
+	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_SHUTDOWN);
+#else
 	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_STOP);
+	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_CLEAR);
+#endif
+
 #ifdef COUNTER_ANY_FAST
 	struct counter_nrfx_data *data = dev->data;
 
@@ -151,6 +158,14 @@ static int get_value(const struct device *dev, uint32_t *ticks)
 	return 0;
 }
 
+static int reset(const struct device *dev)
+{
+	const struct counter_nrfx_config *config = dev->config;
+
+	nrf_timer_task_trigger(config->timer, NRF_TIMER_TASK_CLEAR);
+	return 0;
+}
+
 static uint32_t ticks_add(uint32_t val1, uint32_t val2, uint32_t top)
 {
 	uint32_t to_top;
@@ -445,6 +460,7 @@ static DEVICE_API(counter, counter_nrfx_driver_api) = {
 	.start = start,
 	.stop = stop,
 	.get_value = get_value,
+	.reset = reset,
 	.set_alarm = set_alarm,
 	.cancel_alarm = cancel_alarm,
 	.set_top_value = set_top_value,
diff --git a/drivers/counter/counter_realtek_rts5912_slwtmr.c b/drivers/counter/counter_realtek_rts5912_slwtmr.c
new file mode 100644
index 0000000000000..d9741779f69b1
--- /dev/null
+++ b/drivers/counter/counter_realtek_rts5912_slwtmr.c
@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) 2025 Realtek Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_slwtimer
+
+/**
+ * @file
+ * @brief Realtek RTS5912 Counter driver
+ *
+ * This is the driver for the 32-bit counters on the Realtek SoCs.
+ *
+ * Notes:
+ * - The counters are running in down counting mode.
+ * - Interrupts are triggered (if enabled) when the counter
+ *   reaches zero.
+ * - These are not free running counters where there are separate
+ *   compare values for interrupts. When setting single shot alarms,
+ *   the counter values are changed so that interrupts are triggered
+ *   when the counters reach zero.
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_control_rts5912.h>
+#include <zephyr/logging/log.h>
+#include "reg/reg_slwtmr.h"
+LOG_MODULE_REGISTER(counter_realtek_rts5912_slwtmr, CONFIG_COUNTER_LOG_LEVEL);
+
+struct counter_rts5912_config {
+	struct counter_config_info info;
+	void (*config_func)(void);
+	volatile struct slwtmr_type *base_address;
+	uint16_t prescaler;
+#if (CONFIG_CLOCK_CONTROL)
+	const struct device *clk_dev;
+	struct rts5912_sccon_subsys sccon_cfg;
+#endif
+};
+
+struct counter_rts5912_data {
+	counter_alarm_callback_t alarm_cb;
+	counter_top_callback_t top_cb;
+	void *user_data;
+};
+
+static int counter_rts5912_start(const struct device *dev)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+
+	if (counter->ctrl & SLWTMR_CTRL_EN) {
+		return -EALREADY;
+	}
+
+	counter->ctrl |= SLWTMR_CTRL_EN;
+
+	LOG_DBG("%p Counter started", dev);
+
+	return 0;
+}
+
+static int counter_rts5912_stop(const struct device *dev)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+
+	if (!(counter->ctrl & SLWTMR_CTRL_EN)) {
+		/* Already stopped, nothing to do */
+		return 0;
+	}
+
+	/* disable timer and disable interrupt. */
+	counter->ctrl = 0;
+	counter->ldcnt = counter->cnt;
+
+	/* w1c interrupt pending status */
+	counter->insts |= SLWTMR_INTSTS_STS;
+
+	LOG_DBG("%p Counter stopped", dev);
+
+	return 0;
+}
+
+static int counter_rts5912_get_value(const struct device *dev, uint32_t *ticks)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+
+	*ticks = counter->cnt;
+	return 0;
+}
+
+static int counter_rts5912_set_alarm(const struct device *dev, uint8_t chan_id,
+				     const struct counter_alarm_cfg *alarm_cfg)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+	struct counter_rts5912_data *data = dev->data;
+
+	if (chan_id != 0) {
+		LOG_ERR("Invalid channel id %u", chan_id);
+		return -ENOTSUP;
+	}
+
+	/* Interrupts are only triggered when the counter reaches 0.
+	 * So only relative alarms are supported.
+	 */
+	if (alarm_cfg->flags & COUNTER_ALARM_CFG_ABSOLUTE) {
+		return -ENOTSUP;
+	}
+
+	if (data->alarm_cb != NULL) {
+		return -EBUSY;
+	}
+
+	if (!alarm_cfg->callback) {
+		return -EINVAL;
+	}
+
+	if (alarm_cfg->ticks > config->info.max_top_value) {
+		return -EINVAL;
+	}
+	/* disable timer and disable interrupt */
+	counter->ctrl = 0;
+
+	counter->ldcnt = alarm_cfg->ticks;
+
+	data->alarm_cb = alarm_cfg->callback;
+	data->user_data = alarm_cfg->user_data;
+	/* w1c interrupt status */
+	counter->insts |= SLWTMR_INTSTS_STS;
+	/* enable interrupt */
+	counter->ctrl |= SLWTMR_CTRL_INTEN_EN;
+
+	LOG_DBG("%p Counter alarm set to %u ticks", dev, alarm_cfg->ticks);
+	/* enable timer and re-load PRcnt to cnt */
+	counter->ctrl |= SLWTMR_CTRL_EN;
+
+	return 0;
+}
+
+static int counter_rts5912_cancel_alarm(const struct device *dev, uint8_t chan_id)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+	struct counter_rts5912_data *data = dev->data;
+
+	if (chan_id != 0) {
+		LOG_ERR("Invalid channel id %u", chan_id);
+		return -ENOTSUP;
+	}
+
+	counter->ctrl = 0;
+
+	data->alarm_cb = NULL;
+	data->user_data = NULL;
+
+	LOG_DBG("%p Counter alarm canceled", dev);
+
+	return 0;
+}
+
+static uint32_t counter_rts5912_get_pending_int(const struct device *dev)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+
+	return counter->insts;
+}
+
+static uint32_t counter_rts5912_get_top_value(const struct device *dev)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+
+	return counter->ldcnt;
+}
+
+static int counter_rts5912_set_top_value(const struct device *dev,
+					 const struct counter_top_cfg *cfg)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+	struct counter_rts5912_data *data = dev->data;
+	int ret = 0;
+
+	if (data->alarm_cb) {
+		return -EBUSY;
+	}
+
+	if (cfg->ticks > config->info.max_top_value) {
+		return -EINVAL;
+	}
+
+	counter->ctrl = 0;
+
+	counter->ldcnt = cfg->ticks;
+
+	data->top_cb = cfg->callback;
+	data->user_data = cfg->user_data;
+
+	if (data->top_cb) {
+		/* w1c interrupt status */
+		counter->insts |= SLWTMR_INTSTS_STS;
+		/* enable interrupt */
+		counter->ctrl |= SLWTMR_CTRL_INTEN_EN;
+		/* enable periodic alarm mode */
+		counter->ctrl |= SLWTMR_CTRL_MDSELS_PERIOD;
+	} else {
+		/* disable interrupt */
+		counter->ctrl &= ~SLWTMR_CTRL_INTEN_EN;
+	}
+
+	LOG_DBG("%p Counter top value was set to %u", dev, cfg->ticks);
+
+	counter->ctrl |= SLWTMR_CTRL_EN;
+	return ret;
+}
+
+static void counter_rts5912_isr(const struct device *dev)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+	struct counter_rts5912_data *data = dev->data;
+	counter_alarm_callback_t alarm_cb;
+	void *user_data;
+	/* disable timer */
+	counter->ctrl &= ~SLWTMR_CTRL_EN;
+	/* disable interrupt */
+	counter->ctrl &= ~SLWTMR_CTRL_INTEN_EN;
+	/* clear interrupt pending status */
+	counter->insts |= SLWTMR_INTSTS_STS;
+
+	LOG_DBG("%p Counter ISR", dev);
+
+	if (data->alarm_cb) {
+		/* Alarm is one-shot, so disable callback */
+		alarm_cb = data->alarm_cb;
+		data->alarm_cb = NULL;
+		user_data = data->user_data;
+
+		alarm_cb(dev, 0, counter->cnt, user_data);
+	} else if (data->top_cb) {
+		data->top_cb(dev, data->user_data);
+		/* periodic alarm mode, enable interrupt */
+		counter->ctrl |= SLWTMR_CTRL_INTEN_EN;
+		/* enable timer again */
+		counter->ctrl |= SLWTMR_CTRL_EN;
+	}
+}
+
+static uint32_t counter_rts5912_get_freq(const struct device *dev)
+{
+	const struct counter_rts5912_config *config = dev->config;
+
+	return config->info.freq;
+}
+
+static DEVICE_API(counter, counter_rts5912_api) = {
+	.start = counter_rts5912_start,
+	.stop = counter_rts5912_stop,
+	.get_value = counter_rts5912_get_value,
+	.set_alarm = counter_rts5912_set_alarm,
+	.cancel_alarm = counter_rts5912_cancel_alarm,
+	.set_top_value = counter_rts5912_set_top_value,
+	.get_pending_int = counter_rts5912_get_pending_int,
+	.get_top_value = counter_rts5912_get_top_value,
+	.get_freq = counter_rts5912_get_freq,
+};
+
+static int counter_rts5912_init(const struct device *dev)
+{
+	const struct counter_rts5912_config *config = dev->config;
+	volatile struct slwtmr_type *counter = config->base_address;
+	int ret;
+
+#if defined(CONFIG_CLOCK_CONTROL)
+	if (!device_is_ready(config->clk_dev)) {
+		return -ENODEV;
+	}
+	ret = clock_control_on(config->clk_dev, (clock_control_subsys_t)&config->sccon_cfg);
+	if (ret != 0) {
+		return ret;
+	}
+#endif
+
+	counter_rts5912_stop(dev);
+	/* Set preload and actually pre-load the counter */
+	counter->ldcnt = config->info.max_top_value;
+	counter->cnt = config->info.max_top_value;
+
+	config->config_func();
+	LOG_DBG("Init Complete");
+	return 0;
+}
+
+#define DEV_CONFIG_CLK_DEV_INIT(n)                                                                 \
+	.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),                                          \
+	.sccon_cfg = {                                                                             \
+		.clk_grp = DT_INST_CLOCKS_CELL_BY_NAME(n, slwtmr, clk_grp),                        \
+		.clk_idx = DT_INST_CLOCKS_CELL_BY_NAME(n, slwtmr, clk_idx),                        \
+	}
+
+#define COUNTER_RTS5912_INIT(inst)                                                                 \
+	static void counter_rts5912_irq_config_##inst(void);                                       \
+                                                                                                   \
+	static struct counter_rts5912_data counter_rts5912_dev_data_##inst;                        \
+                                                                                                   \
+	static struct counter_rts5912_config counter_rts5912_dev_config_##inst = {                 \
+		.info =                                                                            \
+			{                                                                          \
+				.max_top_value = DT_INST_PROP(inst, max_value),                    \
+				.freq = DT_INST_PROP(inst, clock_frequency) /                      \
+					(1 << DT_INST_PROP(inst, prescaler)),                      \
+				.flags = 0,                                                        \
+				.channels = 1,                                                     \
+			},                                                                         \
+                                                                                                   \
+		.config_func = counter_rts5912_irq_config_##inst,                                  \
+		.base_address = (struct slwtmr_type *)DT_INST_REG_ADDR(inst),                      \
+		.prescaler = DT_INST_PROP(inst, prescaler),                                        \
+		DEV_CONFIG_CLK_DEV_INIT(inst)};                                                    \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(inst, counter_rts5912_init, NULL, &counter_rts5912_dev_data_##inst,  \
+			      &counter_rts5912_dev_config_##inst, POST_KERNEL,                     \
+			      CONFIG_COUNTER_INIT_PRIORITY, &counter_rts5912_api);                 \
+                                                                                                   \
+	static void counter_rts5912_irq_config_##inst(void)                                        \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(inst), DT_INST_IRQ(inst, priority), counter_rts5912_isr,  \
+			    DEVICE_DT_INST_GET(inst), 0);                                          \
+		irq_enable(DT_INST_IRQN(inst));                                                    \
+	}
+
+DT_INST_FOREACH_STATUS_OKAY(COUNTER_RTS5912_INIT)
diff --git a/drivers/counter/counter_renesas_ra_agt.c b/drivers/counter/counter_renesas_ra_agt.c
index be12ac539a8f7..535e37086c6f5 100644
--- a/drivers/counter/counter_renesas_ra_agt.c
+++ b/drivers/counter/counter_renesas_ra_agt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -535,11 +535,8 @@ static DEVICE_API(counter, ra_agt_driver_api) = {
 
 #define TIMER(idx) DT_INST_PARENT(idx)
 
-#define _ELC_EVENT_AGT_INT(channel)       ELC_EVENT_AGT##channel##_INT
-#define _ELC_EVENT_AGT_COMPARE_A(channel) ELC_EVENT_AGT##channel##_COMPARE_A
-
-#define ELC_EVENT_AGT_INT(channel)       _ELC_EVENT_AGT_INT(channel)
-#define ELC_EVENT_AGT_COMPARE_A(channel) _ELC_EVENT_AGT_COMPARE_A(channel)
+#define EVENT_AGT_INT(channel)       BSP_PRV_IELS_ENUM(CONCAT(EVENT_AGT, channel, _INT))
+#define EVENT_AGT_COMPARE_A(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_AGT, channel, _COMPARE_A))
 
 #define AGT_DEVICE_INIT_RA(n)                                                                      \
 	static const struct counter_ra_agt_config ra_agt_config_##n = {                            \
@@ -570,14 +567,14 @@ static DEVICE_API(counter, ra_agt_driver_api) = {
 	static int counter_ra_agt_##n##_init(const struct device *dev)                             \
 	{                                                                                          \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(TIMER(n), agti, irq)] =                                \
-			ELC_EVENT_AGT_INT(DT_PROP(TIMER(n), channel));                             \
+			EVENT_AGT_INT(DT_PROP(TIMER(n), channel));                                 \
 		IRQ_CONNECT(DT_IRQ_BY_NAME(TIMER(n), agti, irq),                                   \
 			    DT_IRQ_BY_NAME(TIMER(n), agti, priority), counter_ra_agt_agti_isr,     \
 			    DEVICE_DT_INST_GET(n), 0);                                             \
 		irq_enable(DT_IRQ_BY_NAME(TIMER(n), agti, irq));                                   \
                                                                                                    \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(TIMER(n), agtcmai, irq)] =                             \
-			ELC_EVENT_AGT_COMPARE_A(DT_PROP(TIMER(n), channel));                       \
+			EVENT_AGT_COMPARE_A(DT_PROP(TIMER(n), channel));                           \
 		IRQ_CONNECT(DT_IRQ_BY_NAME(TIMER(n), agtcmai, irq),                                \
 			    DT_IRQ_BY_NAME(TIMER(n), agtcmai, priority),                           \
 			    counter_ra_agt_agtcmai_isr, DEVICE_DT_INST_GET(n), 0);                 \
diff --git a/drivers/crypto/CMakeLists.txt b/drivers/crypto/CMakeLists.txt
index 59d02d44ad973..5094377abb137 100644
--- a/drivers/crypto/CMakeLists.txt
+++ b/drivers/crypto/CMakeLists.txt
@@ -14,4 +14,5 @@ zephyr_library_sources_ifdef(CONFIG_CRYPTO_IT8XXX2_SHA		crypto_it8xxx2_sha.c)
 zephyr_library_sources_ifdef(CONFIG_CRYPTO_IT8XXX2_SHA_V2	crypto_it8xxx2_sha_v2.c)
 zephyr_library_sources_ifdef(CONFIG_CRYPTO_MCUX_DCP		crypto_mcux_dcp.c)
 zephyr_library_sources_ifdef(CONFIG_CRYPTO_SI32 		crypto_si32.c)
+zephyr_library_sources_ifdef(CONFIG_CRYPTO_CC23X0		crypto_cc23x0.c)
 zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index a1b147b12bfae..9a7bdb89b54ee 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -84,5 +84,6 @@ source "drivers/crypto/Kconfig.it8xxx2"
 source "drivers/crypto/Kconfig.mcux_dcp"
 source "drivers/crypto/Kconfig.si32"
 source "drivers/crypto/Kconfig.smartbond"
+source "drivers/crypto/Kconfig.cc23x0"
 
 endif # CRYPTO
diff --git a/drivers/crypto/Kconfig.cc23x0 b/drivers/crypto/Kconfig.cc23x0
new file mode 100644
index 0000000000000..8e2cae28536ad
--- /dev/null
+++ b/drivers/crypto/Kconfig.cc23x0
@@ -0,0 +1,15 @@
+# CC23X0 AES accelerator configuration options
+
+# Copyright (c) 2024 BayLibre, SAS
+# SPDX-License-Identifier: Apache-2.0
+
+config CRYPTO_CC23X0
+	bool "CC23X0 AES accelerator driver"
+	default y
+	depends on DT_HAS_TI_CC23X0_AES_ENABLED
+	help
+	  Enable TI CC23X0 AES accelerator driver.
+	  This driver supports the following modes:
+	  - ECB (Electronic Code Book) encryption only (decryption not supported by the hardware)
+	  - CTR (Counter)
+	  - CCM (CTR with CBC-MAC)
diff --git a/drivers/crypto/crypto_cc23x0.c b/drivers/crypto/crypto_cc23x0.c
new file mode 100644
index 0000000000000..09f79567d57ec
--- /dev/null
+++ b/drivers/crypto/crypto_cc23x0.c
@@ -0,0 +1,689 @@
+/*
+ * Copyright (c) 2024 BayLibre, SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_cc23x0_aes
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(crypto_cc23x0, CONFIG_CRYPTO_LOG_LEVEL);
+
+#include <zephyr/crypto/crypto.h>
+#include <zephyr/device.h>
+#include <zephyr/irq.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+
+#include <string.h>
+
+#include <driverlib/aes.h>
+#include <driverlib/clkctl.h>
+
+#define CRYPTO_CC23_CAP		(CAP_RAW_KEY | CAP_SEPARATE_IO_BUFS | \
+				 CAP_SYNC_OPS | CAP_NO_IV_PREFIX)
+
+#define CRYPTO_CC23_INT_MASK	AES_IMASK_AESDONE
+
+/* CCM mode: see https://datatracker.ietf.org/doc/html/rfc3610 for reference */
+#define CCM_CC23_MSG_LEN_SIZE_MIN	2
+#define CCM_CC23_MSG_LEN_SIZE_MAX	8
+
+#define CCM_CC23_NONCE_LEN_SIZE_MIN	(AES_BLOCK_SIZE - CCM_CC23_MSG_LEN_SIZE_MAX - 1)
+#define CCM_CC23_NONCE_LEN_SIZE_MAX	(AES_BLOCK_SIZE - CCM_CC23_MSG_LEN_SIZE_MIN - 1)
+
+#define CCM_CC23_AD_LEN_SIZE		2
+#define CCM_CC23_AD_DATA_SIZE_MAX	(AES_BLOCK_SIZE - CCM_CC23_AD_LEN_SIZE)
+
+#define CCM_CC23_TAG_SIZE_MIN		4
+#define CCM_CC23_TAG_SIZE_MAX		16
+
+#define CCM_CC23_BYTE_GET(idx, val)	FIELD_GET(0xff << ((idx) << 3), (val))
+
+#define CCM_CC23_B0_GET(ad_len, tag_len, len_size) \
+			(((ad_len) ? 1 << 6 : 0) + (((tag_len) - 2) << 2) + ((len_size) - 1))
+
+/*
+ * The Finite State Machine (FSM) processes the data in a column-fashioned way,
+ * processing 2 columns/cycle, completing 10 rounds in 20 cycles. With three cycles
+ * of pre-processing, the execution/encryption time is 23 cycles.
+ */
+#define CRYPTO_CC23_OP_TIMEOUT	K_CYC(23 << 1)
+
+struct crypto_cc23x0_data {
+	struct k_mutex device_mutex;
+	struct k_sem aes_done;
+};
+
+static void crypto_cc23x0_isr(const struct device *dev)
+{
+	struct crypto_cc23x0_data *data = dev->data;
+	uint32_t status;
+
+	status = AESGetMaskedInterruptStatus();
+
+	if (status & AES_IMASK_AESDONE) {
+		k_sem_give(&data->aes_done);
+	}
+
+	AESClearInterrupt(status);
+}
+
+static void crypto_cc23x0_cleanup(void)
+{
+	AESClearAUTOCFGTrigger();
+	AESClearAUTOCFGBusHalt();
+	AESClearTXTAndBUF();
+}
+
+static int crypto_cc23x0_ecb_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt)
+{
+	const struct device *dev = ctx->device;
+	struct crypto_cc23x0_data *data = dev->data;
+	int in_bytes_processed = 0;
+	int out_bytes_processed = 0;
+	int ret;
+
+	if (pkt->out_buf_max < ROUND_UP(pkt->in_len, AES_BLOCK_SIZE)) {
+		LOG_ERR("Output buffer too small");
+		return -EINVAL;
+	}
+
+	k_mutex_lock(&data->device_mutex, K_FOREVER);
+
+	/* Load key */
+	AESWriteKEY(ctx->key.bit_stream);
+
+	/* Configure source buffer and encryption triggers */
+	AESSetAUTOCFG(AES_AUTOCFG_AESSRC_BUF |
+		      AES_AUTOCFG_TRGAES_RDTXT3 |
+		      AES_AUTOCFG_TRGAES_WRBUF3S);
+
+	/* Write first block of input to trigger encryption */
+	AESWriteBUF(pkt->in_buf);
+	in_bytes_processed += AES_BLOCK_SIZE;
+
+	do {
+		if (in_bytes_processed < pkt->in_len) {
+			/* Preload next input block */
+			AESWriteBUF(&pkt->in_buf[in_bytes_processed]);
+			in_bytes_processed += AES_BLOCK_SIZE;
+		} else {
+			/* Avoid triggering a spurious encryption upon reading the final output */
+			AESClearAUTOCFGTrigger();
+		}
+
+		/* Wait for AES operation completion */
+		ret = k_sem_take(&data->aes_done, CRYPTO_CC23_OP_TIMEOUT);
+		if (ret) {
+			goto cleanup;
+		}
+
+		LOG_DBG("AES operation completed");
+
+		/*
+		 * Read output and trigger encryption of next input that was
+		 * preloaded at the start of this loop.
+		 */
+		AESReadTXT(&pkt->out_buf[out_bytes_processed]);
+		out_bytes_processed += AES_BLOCK_SIZE;
+	} while (out_bytes_processed < pkt->in_len);
+
+cleanup:
+	crypto_cc23x0_cleanup();
+	k_mutex_unlock(&data->device_mutex);
+	pkt->out_len = out_bytes_processed;
+
+	return ret;
+}
+
+static int crypto_cc23x0_ctr(struct cipher_ctx *ctx, struct cipher_pkt *pkt, uint8_t *iv)
+{
+	const struct device *dev = ctx->device;
+	struct crypto_cc23x0_data *data = dev->data;
+	uint32_t ctr_len = ctx->mode_params.ctr_info.ctr_len >> 3;
+	uint8_t ctr[AES_BLOCK_SIZE] = { 0 };
+	uint8_t last_buf[AES_BLOCK_SIZE] = { 0 };
+	int bytes_remaining = pkt->in_len;
+	int bytes_processed = 0;
+	int block_size;
+	int iv_len;
+	int ret;
+
+	if (pkt->out_buf_max < ROUND_UP(pkt->in_len, AES_BLOCK_SIZE)) {
+		LOG_ERR("Output buffer too small");
+		return -EINVAL;
+	}
+
+	k_mutex_lock(&data->device_mutex, K_FOREVER);
+
+	/* Load key */
+	AESWriteKEY(ctx->key.bit_stream);
+
+	/* Configure source buffer and encryption triggers */
+	AESSetAUTOCFG(AES_AUTOCFG_AESSRC_BUF |
+		      AES_AUTOCFG_TRGAES_RDTXT3 |
+		      AES_AUTOCFG_TRGAES_WRBUF3S |
+		      AES_AUTOCFG_CTRENDN_BIGENDIAN |
+		      AES_AUTOCFG_CTRSIZE_CTR128);
+
+	/* Write the counter value to the AES engine to trigger first encryption */
+	iv_len = (ctx->ops.cipher_mode == CRYPTO_CIPHER_MODE_CCM) ?
+		  AES_BLOCK_SIZE : (ctx->keylen - ctr_len);
+	memcpy(ctr, iv, iv_len);
+	AESWriteBUF(ctr);
+
+	do {
+		/* Wait for AES operation completion */
+		ret = k_sem_take(&data->aes_done, CRYPTO_CC23_OP_TIMEOUT);
+		if (ret) {
+			goto cleanup;
+		}
+
+		LOG_DBG("AES operation completed");
+
+		/* XOR input data with encrypted counter block to form ciphertext */
+		if (bytes_remaining > AES_BLOCK_SIZE) {
+			block_size = AES_BLOCK_SIZE;
+			AESWriteTXTXOR(&pkt->in_buf[bytes_processed]);
+		} else {
+			block_size = bytes_remaining;
+			memcpy(last_buf, &pkt->in_buf[bytes_processed], block_size);
+			AESWriteTXTXOR(last_buf);
+
+			/*
+			 * Do not auto-trigger encrypt and increment of counter
+			 * value for last block of data.
+			 */
+			AESClearAUTOCFGTrigger();
+		}
+
+		/*
+		 * Read the output ciphertext and trigger the encryption
+		 * of the next counter block
+		 */
+		AESReadTXT(&pkt->out_buf[bytes_processed]);
+
+		bytes_processed += block_size;
+		bytes_remaining -= block_size;
+	} while (bytes_remaining > 0);
+
+cleanup:
+	crypto_cc23x0_cleanup();
+	k_mutex_unlock(&data->device_mutex);
+	pkt->out_len = bytes_processed;
+
+	return ret;
+}
+
+static int crypto_cc23x0_cmac(struct cipher_ctx *ctx, struct cipher_pkt *pkt,
+			      uint8_t *b0, uint8_t *b1)
+{
+	const struct device *dev = ctx->device;
+	struct crypto_cc23x0_data *data = dev->data;
+	uint32_t iv[AES_BLOCK_SIZE_WORDS] = { 0 };
+	uint8_t last_buf[AES_BLOCK_SIZE] = { 0 };
+	int bytes_remaining = pkt->in_len;
+	int bytes_processed = 0;
+	int block_size;
+	int ret;
+
+	if (pkt->out_buf_max < AES_BLOCK_SIZE) {
+		LOG_ERR("Output buffer too small");
+		return -EINVAL;
+	}
+
+	k_mutex_lock(&data->device_mutex, K_FOREVER);
+
+	/* Load key */
+	AESWriteKEY(ctx->key.bit_stream);
+
+	/* Configure source buffer and encryption triggers */
+	AESSetAUTOCFG(AES_AUTOCFG_AESSRC_TXTXBUF |
+		      AES_AUTOCFG_TRGAES_WRBUF3 |
+		      AES_AUTOCFG_BUSHALT_EN);
+
+	/* Write zero'd IV */
+	AESWriteIV32(iv);
+
+	if (b0) {
+		/* Load input block */
+		AESWriteBUF(b0);
+
+		/* Wait for AES operation completion */
+		ret = k_sem_take(&data->aes_done, CRYPTO_CC23_OP_TIMEOUT);
+		if (ret) {
+			goto out;
+		}
+
+		LOG_DBG("AES operation completed (block 0)");
+	}
+
+	if (b1) {
+		/* Load input block */
+		AESWriteBUF(b1);
+
+		/* Wait for AES operation completion */
+		ret = k_sem_take(&data->aes_done, CRYPTO_CC23_OP_TIMEOUT);
+		if (ret) {
+			goto out;
+		}
+
+		LOG_DBG("AES operation completed (block 1)");
+	}
+
+	do {
+		/* Load input block */
+		if (bytes_remaining >= AES_BLOCK_SIZE) {
+			block_size = AES_BLOCK_SIZE;
+			AESWriteBUF(&pkt->in_buf[bytes_processed]);
+		} else {
+			block_size = bytes_remaining;
+			memcpy(last_buf, &pkt->in_buf[bytes_processed], block_size);
+			AESWriteBUF(last_buf);
+		}
+
+		/* Wait for AES operation completion */
+		ret = k_sem_take(&data->aes_done, CRYPTO_CC23_OP_TIMEOUT);
+		if (ret) {
+			goto out;
+		}
+
+		LOG_DBG("AES operation completed (data)");
+
+		bytes_processed += block_size;
+		bytes_remaining -= block_size;
+	} while (bytes_remaining > 0);
+
+	/* Read tag */
+	AESReadTag(pkt->out_buf);
+
+out:
+	crypto_cc23x0_cleanup();
+	k_mutex_unlock(&data->device_mutex);
+	pkt->out_len = bytes_processed;
+
+	return ret;
+}
+
+static int crypto_cc23x0_ccm_check_param(struct cipher_ctx *ctx, struct cipher_aead_pkt *aead_op)
+{
+	uint16_t ad_len = aead_op->ad_len;
+	uint16_t tag_len = ctx->mode_params.ccm_info.tag_len;
+	uint16_t nonce_len = ctx->mode_params.ccm_info.nonce_len;
+
+	if (aead_op->pkt->out_buf_max < ROUND_UP(aead_op->pkt->in_len, AES_BLOCK_SIZE)) {
+		LOG_ERR("Output buffer too small");
+		return -EINVAL;
+	}
+
+	if (tag_len < CCM_CC23_TAG_SIZE_MIN || tag_len > CCM_CC23_TAG_SIZE_MAX || tag_len & 1) {
+		LOG_ERR("CCM parameter invalid (tag_len must be an even value from %d to %d)",
+			CCM_CC23_TAG_SIZE_MIN, CCM_CC23_TAG_SIZE_MAX);
+		return -EINVAL;
+	}
+
+	if (nonce_len < CCM_CC23_NONCE_LEN_SIZE_MIN || nonce_len > CCM_CC23_NONCE_LEN_SIZE_MAX) {
+		LOG_ERR("CCM parameter invalid (nonce_len must be a value from %d to %d)",
+			CCM_CC23_NONCE_LEN_SIZE_MIN, CCM_CC23_NONCE_LEN_SIZE_MAX);
+		return -EINVAL;
+	}
+
+	if (ad_len > CCM_CC23_AD_DATA_SIZE_MAX) {
+		LOG_ERR("CCM parameter invalid (ad_len max = %d)", CCM_CC23_AD_DATA_SIZE_MAX);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int crypto_cc23x0_ccm_encrypt(struct cipher_ctx *ctx,
+				     struct cipher_aead_pkt *aead_op, uint8_t *nonce)
+{
+	struct cipher_pkt tag_pkt = { 0 };
+	struct cipher_pkt data_pkt = { 0 };
+	uint8_t tag[AES_BLOCK_SIZE] = { 0 };
+	uint8_t b0[AES_BLOCK_SIZE] = { 0 };
+	uint8_t b1[AES_BLOCK_SIZE] = { 0 };
+	uint8_t ctri[AES_BLOCK_SIZE] = { 0 };
+	uint32_t msg_len = aead_op->pkt->in_len;
+	uint16_t ad_len = aead_op->ad_len;
+	uint16_t tag_len = ctx->mode_params.ccm_info.tag_len;
+	uint16_t nonce_len = ctx->mode_params.ccm_info.nonce_len;
+	uint8_t len_size = AES_BLOCK_SIZE - nonce_len - 1;
+	int ret;
+	int i;
+
+	ret = crypto_cc23x0_ccm_check_param(ctx, aead_op);
+	if (ret) {
+		return ret;
+	}
+
+	/*
+	 * Build the first block B0 required for CMAC computation.
+	 * ============================================
+	 * Block B0 formatting per RFC3610:
+	 *    Octet Number   Contents
+	 *    ------------   ---------
+	 *    0		     Flags
+	 *    1 ... 15-L     Nonce N
+	 *    16-L ... 15    l(m), MSB first
+	 *
+	 * Flags in octet 0 of B0:
+	 *    Bit Number   Contents
+	 *    ----------   ----------------------
+	 *    7		   Reserved (always zero)
+	 *    6		   Adata = 1 if l(a) > 0, 0 otherwise
+	 *    5 ... 3	   M' = (M - 2) / 2 where M = Number of octets in authentication field
+	 *    2 ... 0	   L' = L - 1 where L = Number of octets in length field
+	 * ============================================
+	 */
+	b0[0] = CCM_CC23_B0_GET(aead_op->ad_len, tag_len, len_size);
+
+	for (i = 0 ; i < sizeof(msg_len) ; i++) {
+		b0[AES_BLOCK_SIZE - 1 - i] = CCM_CC23_BYTE_GET(i, msg_len);
+	}
+
+	memcpy(&b0[1], nonce, nonce_len);
+
+	/*
+	 * Build the second block B1 for additional data (header).
+	 * ============================================
+	 * Block B1 formatting per RFC3610, for 0 < l(a) < (2^16 - 2^8):
+	 *    Octet Number   Contents
+	 *    ------------   ---------
+	 *    0 ... 1	     l(a), MSB first
+	 *    2 ... N	     Header data
+	 *    N+1 ... 15     Zero padding
+	 * ============================================
+	 */
+	for (i = 0 ; i < sizeof(ad_len) ; i++) {
+		b1[CCM_CC23_AD_LEN_SIZE - 1 - i] = CCM_CC23_BYTE_GET(i, ad_len);
+	}
+
+	memcpy(&b1[CCM_CC23_AD_LEN_SIZE], aead_op->ad, ad_len);
+
+	/* Calculate the authentication tag by passing B0, B1, and data to CMAC function. */
+	LOG_DBG("Compute CMAC");
+
+	data_pkt.in_buf = aead_op->pkt->in_buf;
+	data_pkt.in_len = aead_op->pkt->in_len;
+	data_pkt.out_buf = tag;
+	data_pkt.out_buf_max = AES_BLOCK_SIZE;
+
+	ret = crypto_cc23x0_cmac(ctx, &data_pkt, b0, b1);
+	if (ret) {
+		return ret;
+	}
+
+	/*
+	 * Prepare the initial counter block CTR1 for the CTR mode.
+	 * ============================================
+	 * Block CTRi formatting per RFC3610:
+	 *    Octet Number   Contents
+	 *    ------------   ---------
+	 *    0              Flags
+	 *    1 ... 15-L     Nonce N
+	 *    16-L ... 15    Counter i, MSB first
+	 *
+	 * Flags in octet 0 of CTR0:
+	 *    Bit Number   Contents
+	 *    ----------   ----------------------
+	 *    7            Reserved (always zero)
+	 *    6            Reserved (always zero)
+	 *    5 ... 3      Zero
+	 *    2 ... 0      L' = L - 1 where L = Number of octets in length field
+	 * ============================================
+	 */
+	ctri[0] = len_size - 1;
+	memcpy(&ctri[1], nonce, nonce_len);
+	ctri[AES_BLOCK_SIZE - 1] = 1;
+
+	/* Encrypt the data using the counter block CTR1. */
+	LOG_DBG("Encrypt data");
+
+	ret = crypto_cc23x0_ctr(ctx, aead_op->pkt, ctri);
+	if (ret) {
+		return ret;
+	}
+
+	/* Encrypt the authentication tag using the counter block CTR0. */
+	LOG_DBG("Encrypt tag");
+
+	ctri[AES_BLOCK_SIZE - 1] = 0;
+
+	tag_pkt.in_buf = tag;
+	tag_pkt.in_len = tag_len;
+	tag_pkt.out_buf = aead_op->tag;
+	tag_pkt.out_buf_max = AES_BLOCK_SIZE;
+
+	return crypto_cc23x0_ctr(ctx, &tag_pkt, ctri);
+}
+
+static int crypto_cc23x0_ccm_decrypt(struct cipher_ctx *ctx,
+				     struct cipher_aead_pkt *aead_op, uint8_t *nonce)
+{
+	struct cipher_pkt tag_pkt = { 0 };
+	struct cipher_pkt data_pkt = { 0 };
+	uint8_t enc_tag[AES_BLOCK_SIZE] = { 0 };
+	uint8_t calc_tag[AES_BLOCK_SIZE] = { 0 };
+	uint8_t b0[AES_BLOCK_SIZE] = { 0 };
+	uint8_t b1[AES_BLOCK_SIZE] = { 0 };
+	uint8_t ctri[AES_BLOCK_SIZE] = { 0 };
+	uint32_t msg_len = aead_op->pkt->in_len;
+	uint16_t ad_len = aead_op->ad_len;
+	uint16_t tag_len = ctx->mode_params.ccm_info.tag_len;
+	uint16_t nonce_len = ctx->mode_params.ccm_info.nonce_len;
+	uint8_t len_size = AES_BLOCK_SIZE - nonce_len - 1;
+	int ret;
+	int i;
+
+	ret = crypto_cc23x0_ccm_check_param(ctx, aead_op);
+	if (ret) {
+		return ret;
+	}
+
+	/* Prepare the initial counter block CTR1 for the CTR mode. */
+	ctri[0] = len_size - 1;
+	memcpy(&ctri[1], nonce, nonce_len);
+	ctri[AES_BLOCK_SIZE - 1] = 1;
+
+	/* Decrypt the data using the counter block CTR1. */
+	LOG_DBG("Decrypt data");
+
+	ret = crypto_cc23x0_ctr(ctx, aead_op->pkt, ctri);
+	if (ret) {
+		goto clear_out_buf;
+	}
+
+	/* Build the first block B0 required for CMAC computation. */
+	b0[0] = CCM_CC23_B0_GET(aead_op->ad_len, tag_len, len_size);
+
+	for (i = 0 ; i < sizeof(msg_len) ; i++) {
+		b0[AES_BLOCK_SIZE - 1 - i] = CCM_CC23_BYTE_GET(i, msg_len);
+	}
+
+	memcpy(&b0[1], nonce, nonce_len);
+
+	/* Build the second block B1 for additional data (header). */
+	for (i = 0 ; i < sizeof(ad_len) ; i++) {
+		b1[CCM_CC23_AD_LEN_SIZE - 1 - i] = CCM_CC23_BYTE_GET(i, ad_len);
+	}
+
+	memcpy(&b1[CCM_CC23_AD_LEN_SIZE], aead_op->ad, ad_len);
+
+	/*
+	 * Calculate the authentication tag by passing B0, B1, and decrypted data
+	 * to CMAC function.
+	 */
+	LOG_DBG("Compute CMAC");
+
+	data_pkt.in_buf = aead_op->pkt->out_buf;
+	data_pkt.in_len = aead_op->pkt->out_len;
+	data_pkt.out_buf = calc_tag;
+	data_pkt.out_buf_max = AES_BLOCK_SIZE;
+
+	ret = crypto_cc23x0_cmac(ctx, &data_pkt, b0, b1);
+	if (ret) {
+		goto clear_out_buf;
+	}
+
+	/* Encrypt the recalculated authentication tag using the counter block CTR0. */
+	LOG_DBG("Encrypt tag");
+
+	ctri[AES_BLOCK_SIZE - 1] = 0;
+
+	tag_pkt.in_buf = calc_tag;
+	tag_pkt.in_len = tag_len;
+	tag_pkt.out_buf = enc_tag;
+	tag_pkt.out_buf_max = AES_BLOCK_SIZE;
+
+	ret = crypto_cc23x0_ctr(ctx, &tag_pkt, ctri);
+	if (ret) {
+		goto clear_out_buf;
+	}
+
+	/*
+	 * Compare the recalculated encrypted authentication tag with the one supplied by the app.
+	 * If they match, the decrypted data is returned. Otherwise, the authentication has failed
+	 * and the output buffer is zero'd.
+	 */
+	LOG_DBG("Check tag");
+
+	if (!memcmp(enc_tag, aead_op->tag, tag_len)) {
+		return 0;
+	}
+
+	LOG_ERR("Invalid tag");
+	ret = -EINVAL;
+
+clear_out_buf:
+	memset(aead_op->pkt->out_buf, 0, msg_len);
+
+	return ret;
+}
+
+static int crypto_cc23x0_session_setup(const struct device *dev,
+				       struct cipher_ctx *ctx,
+				       enum cipher_algo algo,
+				       enum cipher_mode mode,
+				       enum cipher_op op_type)
+{
+	if (ctx->flags & ~(CRYPTO_CC23_CAP)) {
+		LOG_ERR("Unsupported feature");
+		return -EINVAL;
+	}
+
+	if (algo != CRYPTO_CIPHER_ALGO_AES) {
+		LOG_ERR("Unsupported algo");
+		return -EINVAL;
+	}
+
+	if (mode != CRYPTO_CIPHER_MODE_ECB &&
+	    mode != CRYPTO_CIPHER_MODE_CTR &&
+	    mode != CRYPTO_CIPHER_MODE_CCM) {
+		LOG_ERR("Unsupported mode");
+		return -EINVAL;
+	}
+
+	if (ctx->keylen != 16U) {
+		LOG_ERR("%u key size is not supported", ctx->keylen);
+		return -EINVAL;
+	}
+
+	if (!ctx->key.bit_stream) {
+		LOG_ERR("No key provided");
+		return -EINVAL;
+	}
+
+	if (op_type == CRYPTO_CIPHER_OP_ENCRYPT) {
+		switch (mode) {
+		case CRYPTO_CIPHER_MODE_ECB:
+			ctx->ops.block_crypt_hndlr = crypto_cc23x0_ecb_encrypt;
+			break;
+		case CRYPTO_CIPHER_MODE_CTR:
+			ctx->ops.ctr_crypt_hndlr = crypto_cc23x0_ctr;
+			break;
+		case CRYPTO_CIPHER_MODE_CCM:
+			ctx->ops.ccm_crypt_hndlr = crypto_cc23x0_ccm_encrypt;
+			break;
+		default:
+			return -EINVAL;
+		}
+	} else {
+		switch (mode) {
+		case CRYPTO_CIPHER_MODE_ECB:
+			LOG_ERR("ECB decryption not supported by the hardware");
+			return -EINVAL;
+		case CRYPTO_CIPHER_MODE_CTR:
+			ctx->ops.ctr_crypt_hndlr = crypto_cc23x0_ctr;
+			break;
+		case CRYPTO_CIPHER_MODE_CCM:
+			ctx->ops.ccm_crypt_hndlr = crypto_cc23x0_ccm_decrypt;
+			break;
+		default:
+			return -EINVAL;
+		}
+	}
+
+	ctx->ops.cipher_mode = mode;
+	ctx->device = dev;
+
+	return 0;
+}
+
+static int crypto_cc23x0_session_free(const struct device *dev,
+				      struct cipher_ctx *ctx)
+{
+	ARG_UNUSED(dev);
+
+	ctx->ops.ccm_crypt_hndlr = NULL;
+	ctx->device = NULL;
+
+	return 0;
+}
+
+static int crypto_cc23x0_query_caps(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return CRYPTO_CC23_CAP;
+}
+
+static int crypto_cc23x0_init(const struct device *dev)
+{
+	struct crypto_cc23x0_data *data = dev->data;
+
+	IRQ_CONNECT(DT_INST_IRQN(0),
+		    DT_INST_IRQ(0, priority),
+		    crypto_cc23x0_isr,
+		    DEVICE_DT_INST_GET(0),
+		    0);
+	irq_enable(DT_INST_IRQN(0));
+
+	CLKCTLEnable(CLKCTL_BASE, CLKCTL_LAES);
+
+	AESSetIMASK(CRYPTO_CC23_INT_MASK);
+
+	k_mutex_init(&data->device_mutex);
+	k_sem_init(&data->aes_done, 0, 1);
+
+	return 0;
+}
+
+static DEVICE_API(crypto, crypto_enc_funcs) = {
+	.cipher_begin_session = crypto_cc23x0_session_setup,
+	.cipher_free_session = crypto_cc23x0_session_free,
+	.query_hw_caps = crypto_cc23x0_query_caps,
+};
+
+static struct crypto_cc23x0_data crypto_cc23x0_dev_data;
+
+DEVICE_DT_INST_DEFINE(0,
+		      crypto_cc23x0_init,
+		      NULL,
+		      &crypto_cc23x0_dev_data,
+		      NULL,
+		      POST_KERNEL,
+		      CONFIG_CRYPTO_INIT_PRIORITY,
+		      &crypto_enc_funcs);
diff --git a/drivers/crypto/crypto_stm32.c b/drivers/crypto/crypto_stm32.c
index c453e3a0e6556..b1c7cf59b03d5 100644
--- a/drivers/crypto/crypto_stm32.c
+++ b/drivers/crypto/crypto_stm32.c
@@ -123,7 +123,7 @@ static int do_aes(struct cipher_ctx *ctx, hal_cryp_aes_op_func_t fn, uint8_t *in
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32l4_aes)
 	/* Device is initialized from the configuration in the encryption/decryption function
-	 * called bellow.
+	 * called below.
 	 */
 	memcpy(&data->hcryp.Init, &session->config, sizeof(session->config));
 #else
diff --git a/drivers/dac/CMakeLists.txt b/drivers/dac/CMakeLists.txt
index 2b2584daf4195..cd719fa718528 100644
--- a/drivers/dac/CMakeLists.txt
+++ b/drivers/dac/CMakeLists.txt
@@ -10,6 +10,7 @@ zephyr_library_sources_ifdef(CONFIG_DAC_MCUX_DAC32	dac_mcux_dac32.c)
 zephyr_library_sources_ifdef(CONFIG_DAC_STM32		dac_stm32.c)
 zephyr_library_sources_ifdef(CONFIG_DAC_SAM		dac_sam.c)
 zephyr_library_sources_ifdef(CONFIG_DAC_SAM0		dac_sam0.c)
+zephyr_library_sources_ifdef(CONFIG_DAC_DAC161S997	dac_dac161s997.c)
 zephyr_library_sources_ifdef(CONFIG_DAC_DACX0501	dac_dacx0501.c)
 zephyr_library_sources_ifdef(CONFIG_DAC_DACX0508	dac_dacx0508.c)
 zephyr_library_sources_ifdef(CONFIG_DAC_DACX3608	dac_dacx3608.c)
diff --git a/drivers/dac/Kconfig b/drivers/dac/Kconfig
index 36592ab983799..21c2f174c9c1e 100644
--- a/drivers/dac/Kconfig
+++ b/drivers/dac/Kconfig
@@ -37,6 +37,8 @@ source "drivers/dac/Kconfig.sam"
 
 source "drivers/dac/Kconfig.sam0"
 
+source "drivers/dac/Kconfig.dac161s997"
+
 source "drivers/dac/Kconfig.dacx0501"
 
 source "drivers/dac/Kconfig.dacx0508"
diff --git a/drivers/dac/Kconfig.dac161s997 b/drivers/dac/Kconfig.dac161s997
new file mode 100644
index 0000000000000..c055f00fd49a4
--- /dev/null
+++ b/drivers/dac/Kconfig.dac161s997
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Vitrolife A/S
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config DAC_DAC161S997
+	bool "TI DAC161S997 DAC driver"
+	default y
+	select SPI
+	depends on DT_HAS_TI_DAC161S997_ENABLED
+	help
+	  Enable the driver for the TI DAC161S997.
diff --git a/drivers/dac/dac_dac161s997.c b/drivers/dac/dac_dac161s997.c
new file mode 100644
index 0000000000000..7d7666c68b7de
--- /dev/null
+++ b/drivers/dac/dac_dac161s997.c
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2025 Vitrolife A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_dac161s997
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/drivers/dac/dac161s997.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util_macro.h>
+
+LOG_MODULE_REGISTER(dac_dac161s997, CONFIG_DAC_LOG_LEVEL);
+
+#define DAC161S997_CHANNELS   1
+#define DAC161S997_RESOLUTION 16
+
+enum dac161s997_reg {
+	DAC161S997_REG_XFER = 1,
+	DAC161S997_REG_NOP,
+	DAC161S997_REG_WR_MODE,
+	DAC161S997_REG_DACCODE,
+	DAC161S997_REG_ERR_CONFIG,
+	DAC161S997_REG_ERR_LOW,
+	DAC161S997_REG_ERR_HIGH,
+	DAC161S997_REG_RESET,
+	DAC161S997_REG_STATUS,
+};
+
+struct dac161s997_config {
+	struct spi_dt_spec bus;
+	const struct gpio_dt_spec gpio_errb;
+};
+
+struct dac161s997_data {
+	const struct device *dev;
+	struct k_sem lock;
+	struct gpio_callback gpio_errb_cb;
+	struct k_work gpio_errb_work;
+	dac161s997_error_callback_t error_cb;
+};
+
+int dac161s997_set_error_callback(const struct device *dev, dac161s997_error_callback_t cb)
+{
+	const struct dac161s997_config *config = dev->config;
+	struct dac161s997_data *data = dev->data;
+	int ret;
+
+	ret = k_sem_take(&data->lock, K_FOREVER);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (config->gpio_errb.port != NULL) {
+		data->error_cb = cb;
+	} else {
+		ret = -ENOTSUP;
+	}
+
+	k_sem_give(&data->lock);
+
+	return ret;
+}
+
+static int dac161s997_read_reg(const struct device *dev, enum dac161s997_reg reg, uint16_t *val)
+{
+	const struct dac161s997_config *config = dev->config;
+	int res;
+
+	uint8_t reg_read = BIT(7) | reg;
+	uint8_t tx_buf[3] = {reg_read};
+	const struct spi_buf tx_buffers[] = {{.buf = tx_buf, .len = ARRAY_SIZE(tx_buf)}};
+	const struct spi_buf_set tx_bufs = {.buffers = tx_buffers, .count = ARRAY_SIZE(tx_buffers)};
+	uint8_t rx_buf[3];
+	const struct spi_buf rx_buffers[] = {{.buf = rx_buf, .len = ARRAY_SIZE(rx_buf)}};
+	const struct spi_buf_set rx_bufs = {.buffers = rx_buffers, .count = ARRAY_SIZE(rx_buffers)};
+
+	res = spi_write_dt(&config->bus, &tx_bufs);
+	if (res != 0) {
+		LOG_ERR("Read 0x%02x setup failed: %d", reg, res);
+		return res;
+	}
+
+	tx_buf[0] = DAC161S997_REG_NOP;
+	res = spi_transceive_dt(&config->bus, &tx_bufs, &rx_bufs);
+	if (res != 0) {
+		LOG_ERR("Read from 0x%02x failed: %d", reg, res);
+		return res;
+	}
+
+	if (reg_read != rx_buf[0]) {
+		LOG_ERR("Read 0x%02x addr mismatch: 0x%02x", reg_read, rx_buf[0]);
+		return -EIO;
+	}
+
+	*val = sys_get_be16(&rx_buf[1]);
+
+	LOG_DBG("Reg 0x%02x: 0x%02x", reg, *val);
+
+	return 0;
+}
+
+static int dac161s997_write_reg(const struct device *dev, enum dac161s997_reg reg, uint16_t val)
+{
+	const struct dac161s997_config *config = dev->config;
+
+	uint8_t tx_buf[3] = {reg, val >> 8, val};
+	const struct spi_buf tx_buffers[] = {{.buf = tx_buf, .len = ARRAY_SIZE(tx_buf)}};
+	const struct spi_buf_set tx_bufs = {.buffers = tx_buffers, .count = ARRAY_SIZE(tx_buffers)};
+
+	int ret = spi_write_dt(&config->bus, &tx_bufs);
+
+	if (ret != 0) {
+		LOG_ERR("Write to reg 0x%02x failed: %i", reg, ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int dac161s997_channel_setup(const struct device *dev,
+				    const struct dac_channel_cfg *channel_cfg)
+{
+	if (channel_cfg->channel_id >= DAC161S997_CHANNELS) {
+		LOG_ERR("Channel %d is not valid", channel_cfg->channel_id);
+		return -EINVAL;
+	}
+
+	if (channel_cfg->resolution != DAC161S997_RESOLUTION) {
+		LOG_ERR("Only %d bit resolution is supported", DAC161S997_RESOLUTION);
+		return -ENOTSUP;
+	}
+
+	if (channel_cfg->internal) {
+		LOG_ERR("Internal channels not supported");
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int dac161s997_write_value(const struct device *dev, uint8_t channel, uint32_t value)
+{
+	struct dac161s997_data *data = dev->data;
+	int ret;
+
+	if (channel >= DAC161S997_CHANNELS) {
+		LOG_ERR("Channel %d is not valid", channel);
+		return -EINVAL;
+	}
+
+	if (value > BIT(DAC161S997_RESOLUTION) - 1) {
+		LOG_ERR("Value %d out of range", value);
+		return -EINVAL;
+	}
+
+	ret = k_sem_take(&data->lock, K_FOREVER);
+	if (ret != 0) {
+		LOG_WRN("Write value lock failed: %d", ret);
+		return ret;
+	}
+
+	ret = dac161s997_write_reg(dev, DAC161S997_REG_DACCODE, value);
+
+	k_sem_give(&data->lock);
+
+	return ret;
+}
+
+static int dac161s997_read_status(const struct device *dev, union dac161s997_status *status)
+{
+	int ret;
+	uint16_t tmp;
+
+	ret = dac161s997_read_reg(dev, DAC161S997_REG_STATUS, &tmp);
+	if (ret == 0) {
+		status->raw = tmp;
+	}
+
+	return ret;
+}
+
+static void dac161s997_gpio_errb_work_handler(struct k_work *work)
+{
+	struct dac161s997_data *data = CONTAINER_OF(work, struct dac161s997_data, gpio_errb_work);
+	const struct device *dev = data->dev;
+	union dac161s997_status status;
+	int ret;
+
+	ret = k_sem_take(&data->lock, K_FOREVER);
+	if (ret != 0) {
+		LOG_WRN("ERRB handler take lock failed: %d", ret);
+		return;
+	}
+
+	ret = dac161s997_read_status(dev, &status);
+
+	if (data->error_cb != NULL) {
+		data->error_cb(dev, ret == 0 ? &status : NULL);
+	}
+
+	k_sem_give(&data->lock);
+}
+
+static void dac161s997_gpio_errb_cb(const struct device *dev, struct gpio_callback *cb,
+				    gpio_port_pins_t pins)
+{
+	struct dac161s997_data *data = CONTAINER_OF(cb, struct dac161s997_data, gpio_errb_cb);
+	int ret;
+
+	ret = k_work_submit(&data->gpio_errb_work);
+	if (ret != 1) {
+		LOG_WRN("ERRB work not queued: %d", ret);
+	}
+}
+
+static int dac161s997_init(const struct device *dev)
+{
+	const struct dac161s997_config *config = dev->config;
+	struct dac161s997_data *data = dev->data;
+	union dac161s997_status status;
+	int ret;
+
+	data->dev = dev;
+
+	if (!spi_is_ready_dt(&config->bus)) {
+		LOG_ERR("SPI bus %s not ready", config->bus.bus->name);
+		return -ENODEV;
+	}
+
+	k_sem_init(&data->lock, 1, 1);
+
+	ret = dac161s997_write_reg(dev, DAC161S997_REG_RESET, 0xc33c);
+	if (ret != 0) {
+		return ret;
+	}
+	ret = dac161s997_write_reg(dev, DAC161S997_REG_NOP, 0);
+	if (ret != 0) {
+		return ret;
+	}
+
+	/* Read status to clear any sticky error caused during boot or reboot */
+	ret = dac161s997_read_status(dev, &status);
+	if (ret != 0) {
+		return ret;
+	}
+
+	/* Check that DAC_RES bits are all set */
+	if (status.dac_resolution != 0x7) {
+		LOG_ERR("Unexpected DAC resolution value: 0x%02x", status.dac_resolution);
+		return ret;
+	}
+
+	if (config->gpio_errb.port != NULL) {
+		if (!gpio_is_ready_dt(&config->gpio_errb)) {
+			LOG_ERR("ERRB GPIO is not ready");
+			return -ENODEV;
+		}
+
+		k_work_init(&data->gpio_errb_work, dac161s997_gpio_errb_work_handler);
+
+		gpio_init_callback(&data->gpio_errb_cb, dac161s997_gpio_errb_cb,
+				   BIT(config->gpio_errb.pin));
+
+		ret = gpio_pin_configure_dt(&config->gpio_errb, GPIO_INPUT);
+		if (ret != 0) {
+			LOG_ERR("Configure ERRB GPIO failed: %d", ret);
+			return ret;
+		}
+
+		ret = gpio_pin_interrupt_configure_dt(&config->gpio_errb, GPIO_INT_EDGE_TO_ACTIVE);
+		if (ret) {
+			LOG_ERR("Configure ERRB interrupt failed: %d", ret);
+			return ret;
+		}
+
+		ret = gpio_add_callback_dt(&config->gpio_errb, &data->gpio_errb_cb);
+		if (ret != 0) {
+			LOG_ERR("Configure ERRB callback failed: %d", ret);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
+static DEVICE_API(dac, dac161s997_driver_api) = {
+	.channel_setup = dac161s997_channel_setup,
+	.write_value = dac161s997_write_value,
+};
+
+#define DAC_DAC161S997_INIT(n)                                                                     \
+	static const struct dac161s997_config dac161s997_config_##n = {                            \
+		.bus = SPI_DT_SPEC_INST_GET(n, SPI_TRANSFER_MSB | SPI_WORD_SET(8), 0),             \
+		.gpio_errb = GPIO_DT_SPEC_INST_GET_OR(n, errb_gpios, {0}),                         \
+	};                                                                                         \
+                                                                                                   \
+	static struct dac161s997_data dac161s997_data_##n;                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(n, dac161s997_init, NULL, &dac161s997_data_##n,                      \
+			      &dac161s997_config_##n, POST_KERNEL, CONFIG_DAC_INIT_PRIORITY,       \
+			      &dac161s997_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DAC_DAC161S997_INIT);
diff --git a/drivers/dac/dac_renesas_ra.c b/drivers/dac/dac_renesas_ra.c
index 766facb14fb31..5078a4f038475 100644
--- a/drivers/dac/dac_renesas_ra.c
+++ b/drivers/dac/dac_renesas_ra.c
@@ -14,6 +14,10 @@
 
 LOG_MODULE_REGISTER(dac_renesas_ra, CONFIG_DAC_LOG_LEVEL);
 
+#define HAS_CHARGEPUMP       DT_PROP(DT_PARENT(DT_DRV_INST(0)), has_chargepump)
+#define HAS_OUTPUT_AMPLIFIER DT_PROP(DT_PARENT(DT_DRV_INST(0)), has_output_amplifier)
+#define HAS_INTERNAL_OUTPUT  DT_PROP(DT_PARENT(DT_DRV_INST(0)), has_internal_output)
+
 struct dac_renesas_ra_config {
 	const struct pinctrl_dev_config *pcfg;
 };
@@ -46,7 +50,9 @@ static int dac_renesas_ra_channel_setup(const struct device *dev,
 					const struct dac_channel_cfg *channel_cfg)
 {
 	struct dac_renesas_ra_data *data = dev->data;
+#if (HAS_OUTPUT_AMPLIFIER || HAS_CHARGEPUMP || HAS_INTERNAL_OUTPUT)
 	dac_extended_cfg_t *config_extend = (dac_extended_cfg_t *)data->f_config.p_extend;
+#endif
 	fsp_err_t fsp_err;
 
 	if (channel_cfg->channel_id != 0) {
@@ -66,9 +72,9 @@ static int dac_renesas_ra_channel_setup(const struct device *dev,
 		}
 	}
 
-#if DT_PROP(DT_PARENT(DT_DRV_INST(0)), has_output_amplifier)
+#if HAS_OUTPUT_AMPLIFIER
 	config_extend->output_amplifier_enabled = channel_cfg->buffered;
-#elif DT_PROP(DT_PARENT(DT_DRV_INST(0)), has_chargepump)
+#elif HAS_CHARGEPUMP
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(moco))
 	config_extend->enable_charge_pump = channel_cfg->buffered;
 #else
@@ -84,7 +90,7 @@ static int dac_renesas_ra_channel_setup(const struct device *dev,
 	}
 #endif
 
-#if DT_PROP(DT_PARENT(DT_DRV_INST(0)), has_internal_output)
+#if HAS_INTERNAL_OUTPUT
 	config_extend->internal_output_enabled = channel_cfg->internal;
 #else
 	if (channel_cfg->internal) {
diff --git a/drivers/dai/intel/dmic/dmic.c b/drivers/dai/intel/dmic/dmic.c
index e1a93da91b46e..ed84cb22fda0e 100644
--- a/drivers/dai/intel/dmic/dmic.c
+++ b/drivers/dai/intel/dmic/dmic.c
@@ -257,33 +257,6 @@ static void dai_dmic_stop_fifo_packers(struct dai_intel_dmic *dmic,
 			     OUTCONTROL_FINIT);
 }
 
-/* On DMIC IRQ event trace the status register that contains the status and
- * error bit fields.
- */
-static void dai_dmic_irq_handler(const void *data)
-{
-	struct dai_intel_dmic *dmic = ((struct device *)data)->data;
-	uint32_t val0;
-	uint32_t val1;
-
-	/* Trace OUTSTAT0 register */
-	val0 = dai_dmic_read(dmic, OUTSTAT);
-	val1 = dai_dmic_read(dmic, OUTSTAT + PDM_CHANNEL_REGS_SIZE);
-	LOG_DBG("dmic_irq_handler(), OUTSTAT0 = 0x%x, OUTSTAT1 = 0x%x", val0, val1);
-
-	if (val0 & OUTSTAT_ROR) {
-		LOG_ERR("dmic_irq_handler(): full fifo A or PDM overrun");
-		dai_dmic_write(dmic, OUTSTAT, val0);
-		dai_dmic_stop_fifo_packers(dmic, 0);
-	}
-
-	if (val1 & OUTSTAT_ROR) {
-		LOG_ERR("dmic_irq_handler(): full fifo B or PDM overrun");
-		dai_dmic_write(dmic, OUTSTAT + PDM_CHANNEL_REGS_SIZE, val1);
-		dai_dmic_stop_fifo_packers(dmic, 1);
-	}
-}
-
 static inline void dai_dmic_dis_clk_gating(const struct dai_intel_dmic *dmic)
 {
 	/* Disable DMIC clock gating */
@@ -366,8 +339,6 @@ static int dai_dmic_probe(struct dai_intel_dmic *dmic)
 	/* DMIC Owner Select to DSP */
 	dai_dmic_claim_ownership(dmic);
 
-	irq_enable(dmic->irq);
-
 	return 0;
 }
 
@@ -376,10 +347,6 @@ static int dai_dmic_remove(struct dai_intel_dmic *dmic)
 	uint32_t active_fifos_mask = dai_dmic_global.active_fifos_mask;
 	uint32_t pause_mask = dai_dmic_global.pause_mask;
 
-	LOG_INF("dmic_remove()");
-
-	irq_disable(dmic->irq);
-
 	LOG_INF("dmic_remove(), dmic_active_fifos_mask = 0x%x, dmic_pause_mask = 0x%x",
 		active_fifos_mask, pause_mask);
 
@@ -585,7 +552,6 @@ static void dai_dmic_start(struct dai_intel_dmic *dmic)
 	for (i = 0; i < CONFIG_DAI_DMIC_HW_CONTROLLERS; i++) {
 		mic_a = dmic->enable[i] & 1;
 		mic_b = (dmic->enable[i] & 2) >> 1;
-		start_fir = dmic->enable[i] > 0;
 
 		/* If both microphones are needed start them simultaneously
 		 * to start them in sync. The reset may be cleared for another
@@ -618,7 +584,10 @@ static void dai_dmic_start(struct dai_intel_dmic *dmic)
 					     MIC_CONTROL_PDM_EN_B,
 					     FIELD_PREP(MIC_CONTROL_PDM_EN_B, 1));
 		}
+	}
 
+	for (i = 0; i < CONFIG_DAI_DMIC_HW_CONTROLLERS; i++) {
+		start_fir = dmic->enable[i] > 0;
 		dai_dmic_update_bits(dmic, dmic_base[i] + FIR_CHANNEL_REGS_SIZE *
 				     dmic->dai_config_params.dai_index + FIR_CONTROL,
 				     FIR_CONTROL_START,
@@ -889,13 +858,6 @@ DEVICE_API(dai, dai_dmic_ops) = {
 
 static int dai_dmic_initialize_device(const struct device *dev)
 {
-	IRQ_CONNECT(
-		DT_INST_IRQN(0),
-		IRQ_DEFAULT_PRIORITY,
-		dai_dmic_irq_handler,
-		DEVICE_DT_INST_GET(0),
-		0);
-
 	return pm_device_driver_init(dev, dmic_pm_action);
 };
 
diff --git a/drivers/disk/Kconfig.sdmmc b/drivers/disk/Kconfig.sdmmc
index 42d82676b18f2..651fdbc8b6ae3 100644
--- a/drivers/disk/Kconfig.sdmmc
+++ b/drivers/disk/Kconfig.sdmmc
@@ -51,7 +51,8 @@ config SDMMC_STM32_HWFC
 		   SOC_SERIES_STM32H7X || \
 		   SOC_SERIES_STM32F7X || \
 		   SOC_SERIES_STM32L4X || \
-		   SOC_SERIES_STM32L5X
+		   SOC_SERIES_STM32L5X || \
+		   SOC_SERIES_STM32N6X
 	help
 	  Enable SDMMC Hardware Flow Control to avoid FIFO underrun (TX mode) and
 	  overrun (RX mode) errors.
diff --git a/drivers/display/CMakeLists.txt b/drivers/display/CMakeLists.txt
index 185e3a1b2b4bc..5123faeafd085 100644
--- a/drivers/display/CMakeLists.txt
+++ b/drivers/display/CMakeLists.txt
@@ -20,6 +20,7 @@ zephyr_library_sources_ifdef(CONFIG_SSD1306		ssd1306.c)
 zephyr_library_sources_ifdef(CONFIG_SSD1327		ssd1327.c)
 zephyr_library_sources_ifdef(CONFIG_SSD16XX		ssd16xx.c)
 zephyr_library_sources_ifdef(CONFIG_SSD1322		ssd1322.c)
+zephyr_library_sources_ifdef(CONFIG_ST7567		display_st7567.c)
 zephyr_library_sources_ifdef(CONFIG_ST7789V		display_st7789v.c)
 zephyr_library_sources_ifdef(CONFIG_ST7735R		display_st7735r.c)
 zephyr_library_sources_ifdef(CONFIG_ST7796S		display_st7796s.c)
@@ -33,6 +34,7 @@ zephyr_library_sources_ifdef(CONFIG_DISPLAY_RENESAS_LCDC display_renesas_lcdc.c)
 zephyr_library_sources_ifdef(CONFIG_NT35510		display_nt35510.c)
 zephyr_library_sources_ifdef(CONFIG_RENESAS_RA_GLCDC		display_renesas_ra.c)
 zephyr_library_sources_ifdef(CONFIG_ILI9806E_DSI		display_ili9806e_dsi.c)
+zephyr_library_sources_ifdef(CONFIG_ST7701 display_st7701.c)
 
 zephyr_library_sources_ifdef(CONFIG_MICROBIT_DISPLAY
 	mb_display.c
diff --git a/drivers/display/Kconfig b/drivers/display/Kconfig
index 593c34dc163ba..08de8a09ce532 100644
--- a/drivers/display/Kconfig
+++ b/drivers/display/Kconfig
@@ -30,6 +30,7 @@ source "drivers/display/Kconfig.ssd1306"
 source "drivers/display/Kconfig.ssd1327"
 source "drivers/display/Kconfig.ssd16xx"
 source "drivers/display/Kconfig.ssd1322"
+source "drivers/display/Kconfig.st7567"
 source "drivers/display/Kconfig.st7735r"
 source "drivers/display/Kconfig.st7789v"
 source "drivers/display/Kconfig.st7796s"
@@ -50,5 +51,6 @@ source "drivers/display/Kconfig.renesas_lcdc"
 source "drivers/display/Kconfig.nt35510"
 source "drivers/display/Kconfig.renesas_ra"
 source "drivers/display/Kconfig.ili9806e_dsi"
+source "drivers/display/Kconfig.st7701"
 
 endif # DISPLAY
diff --git a/drivers/display/Kconfig.renesas_ra b/drivers/display/Kconfig.renesas_ra
index 4eaaeb99196d3..8bd872b240fb7 100644
--- a/drivers/display/Kconfig.renesas_ra
+++ b/drivers/display/Kconfig.renesas_ra
@@ -1,6 +1,6 @@
 # Renesas RA Family
 
-# Copyright (c) 2024 Renesas Electronics Corporation
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 config RENESAS_RA_GLCDC
@@ -23,6 +23,14 @@ config RENESAS_RA_GLCDC_FB_NUM
 	    - 1 single frame buffer in RENESAS RA GLCDC driver.
 	    - 2 double frame buffer in RENESAS RA GLCDC driver.
 
+config RENESAS_RA_GLCDC_FRAME_BUFFER_SECTION
+	string "RAM memory section to place frame buffer"
+	depends on RENESAS_RA_GLCDC_FB_NUM > 0
+	help
+	  RAM memory section name to place frame buffer.
+	  Example: to place display frame buffer in external SDRAM (.sdram section)
+	    CONFIG_RENESAS_RA_GLCDC_FRAME_BUFFER_SECTION=".sdram"
+
 if LVGL
 
 # Force display buffers to be aligned to cache line size (64 bytes)
diff --git a/drivers/display/Kconfig.sdl b/drivers/display/Kconfig.sdl
index d1ed25bf53750..3c41b2848ab2b 100644
--- a/drivers/display/Kconfig.sdl
+++ b/drivers/display/Kconfig.sdl
@@ -37,6 +37,9 @@ choice SDL_DISPLAY_DEFAULT_PIXEL_FORMAT
 	config SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_BGR_565
 		bool "BGR 565"
 
+	config SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_L_8
+		bool "Grayscale 8bit"
+
 endchoice
 
 config SDL_DISPLAY_ZOOM_PCT
@@ -59,6 +62,14 @@ config SDL_DISPLAY_MONO_MSB_FIRST
 	  If selected, set the MSB to represent the first pixel.
 	  This applies when the pixel format is MONO01/MONO10.
 
+config SDL_DISPLAY_MONO_VTILED
+	bool "Configure data octet representation"
+	default y
+	help
+	  If selected, set the data octet to represent 8 pixels ordered vertically.
+	  Otherwise, horizontally.
+	  This applies when the pixel format is MONO01/MONO10.
+
 config SDL_DISPLAY_TRANSPARENCY_GRID_CELL_SIZE
 	int "Transparency grid cell size"
 	default 8
@@ -77,4 +88,10 @@ config SDL_DISPLAY_TRANSPARENCY_GRID_CELL_COLOR_2
 	help
 	  The color of the even cells in the transparency grid.
 
+config SDL_DISPLAY_THREAD_PRIORITY
+	int "SDL display thread priority"
+	default NUM_PREEMPT_PRIORITIES
+	help
+	  Drawing thread priority.
+
 endif # SDL_DISPLAY
diff --git a/drivers/display/Kconfig.st7567 b/drivers/display/Kconfig.st7567
new file mode 100644
index 0000000000000..1a8b5d7e559ef
--- /dev/null
+++ b/drivers/display/Kconfig.st7567
@@ -0,0 +1,22 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig ST7567
+	bool "ST7567 display controller"
+	default y
+	depends on DT_HAS_SITRONIX_ST7567_ENABLED
+	select I2C if $(dt_compat_on_bus,$(DT_COMPAT_SITRONIX_ST7567),i2c)
+	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_SITRONIX_ST7567),spi)
+	help
+	  Enable driver for ST7567 display controller.
+
+if ST7567
+
+config ST7567_DEFAULT_CONTRAST
+	int "ST7567 default contrast"
+	default 8
+	range 0 15
+	help
+	  ST7567 default contrast.
+
+endif # ST7567
diff --git a/drivers/display/Kconfig.st7701 b/drivers/display/Kconfig.st7701
new file mode 100644
index 0000000000000..6a71f1f68af4f
--- /dev/null
+++ b/drivers/display/Kconfig.st7701
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+config ST7701
+	bool "ST7701 display controller driver"
+	default y
+	depends on DT_HAS_SITRONIX_ST7701_ENABLED
+	select MIPI_DSI
+	help
+	  Enable driver for ST7701 display driver.
diff --git a/drivers/display/Kconfig.stm32_ltdc b/drivers/display/Kconfig.stm32_ltdc
index 980642edc3fea..135986ca967ee 100644
--- a/drivers/display/Kconfig.stm32_ltdc
+++ b/drivers/display/Kconfig.stm32_ltdc
@@ -52,6 +52,9 @@ config STM32_LTDC_FB_NUM
 	    - 1 single frame buffer in stm32 ltdc driver.
 	    - 2 double frame buffer in stm32 ltdc driver.
 
+config STM32_LTDC_FB_USE_SHARED_MULTI_HEAP
+	bool "Use shared multi heap for the display buffer"
+
 config STM32_LTDC_DISABLE_FMC_BANK1
 	bool "Disable FMC bank1 for STM32F7/H7 series"
 	depends on SOC_SERIES_STM32H7X || SOC_SERIES_STM32F7X
diff --git a/drivers/display/display_ili9806e_dsi.c b/drivers/display/display_ili9806e_dsi.c
index ed54d413119a0..6c9a59a9bd57b 100644
--- a/drivers/display/display_ili9806e_dsi.c
+++ b/drivers/display/display_ili9806e_dsi.c
@@ -212,7 +212,28 @@ static int ili9806e_write_reg(const struct device *dev, uint8_t reg, const uint8
 	int ret;
 	const struct ili9806e_config *cfg = dev->config;
 
-	ret = mipi_dsi_dcs_write(cfg->mipi_dsi, cfg->channel, reg, buf, len);
+	struct mipi_dsi_msg msg = {
+		.cmd = reg,
+		.tx_buf = buf,
+		.tx_len = len,
+		.flags = MIPI_DSI_MSG_USE_LPM,
+	};
+
+	switch (len) {
+	case 0U:
+		msg.type = MIPI_DSI_DCS_SHORT_WRITE;
+		break;
+
+	case 1U:
+		msg.type = MIPI_DSI_DCS_SHORT_WRITE_PARAM;
+		break;
+
+	default:
+		msg.type = MIPI_DSI_DCS_LONG_WRITE;
+		break;
+	}
+
+	ret = mipi_dsi_transfer(cfg->mipi_dsi, cfg->channel, &msg);
 	if (ret < 0) {
 		LOG_ERR("Failed writing reg: 0x%x result: (%d)", reg, ret);
 		return ret;
@@ -384,7 +405,7 @@ static int ili9806e_init(const struct device *dev)
 		mdev.pixfmt = MIPI_DSI_PIXFMT_RGB888;
 	}
 	mdev.data_lanes = cfg->data_lanes;
-	mdev.mode_flags = MIPI_DSI_MODE_VIDEO;
+	mdev.mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_LPM;
 	mdev.timings.hactive = cfg->width;
 	mdev.timings.hbp = ILITEK_ILI9806E_HBP;
 	mdev.timings.hfp = ILITEK_ILI9806E_HFP;
diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c
index 9a600421f8efa..6ba0f4223483b 100644
--- a/drivers/display/display_mcux_elcdif.c
+++ b/drivers/display/display_mcux_elcdif.c
@@ -30,7 +30,8 @@ LOG_MODULE_REGISTER(display_mcux_elcdif, CONFIG_DISPLAY_LOG_LEVEL);
 /* Define the heap size. 512 bytes of padding are included for kernel heap structures */
 K_HEAP_DEFINE(display_heap, CONFIG_MCUX_ELCDIF_FB_NUM * CONFIG_MCUX_ELCDIF_FB_SIZE + 512);
 
-static const uint32_t supported_fmts = PIXEL_FORMAT_BGR_565 | PIXEL_FORMAT_ARGB_8888;
+static const uint32_t supported_fmts =
+	PIXEL_FORMAT_BGR_565 | PIXEL_FORMAT_ARGB_8888 | PIXEL_FORMAT_RGB_888;
 
 struct mcux_elcdif_config {
 	LCDIF_Type *base;
diff --git a/drivers/display/display_nrf_led_matrix.c b/drivers/display/display_nrf_led_matrix.c
index 64068ea488f65..79ae6652807a7 100644
--- a/drivers/display/display_nrf_led_matrix.c
+++ b/drivers/display/display_nrf_led_matrix.c
@@ -339,7 +339,7 @@ static void timer_irq_handler(void *arg)
 	const struct display_drv_config *dev_config = dev->config;
 	uint8_t iteration = dev_data->iteration;
 	uint8_t pixel_idx;
-	uint8_t row_idx;
+	uint8_t row_idx = 0;
 
 	/* The timer is automagically stopped and cleared by shortcuts
 	 * on the same event (COMPARE0) that generates this interrupt.
diff --git a/drivers/display/display_renesas_ra.c b/drivers/display/display_renesas_ra.c
index ea5cfdaec81c2..9d53aa55e8351 100644
--- a/drivers/display/display_renesas_ra.c
+++ b/drivers/display/display_renesas_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,7 +17,6 @@
 
 LOG_MODULE_REGISTER(display_renesas_ra, CONFIG_DISPLAY_LOG_LEVEL);
 
-void glcdc_line_detect_isr(void);
 struct display_ra_config {
 	const struct pinctrl_dev_config *pincfg;
 	const struct gpio_dt_spec backlight_gpio;
@@ -25,31 +24,40 @@ struct display_ra_config {
 	struct clock_control_ra_subsys_cfg clock_glcdc_subsys;
 	uint16_t height;
 	uint16_t width;
-	uint32_t display_frame_size;
-	enum display_pixel_format pixel_format;
 	void (*irq_configure)(void);
 };
 
 struct display_ra_data {
 	glcdc_instance_ctrl_t display_ctrl;
 	display_cfg_t display_fsp_cfg;
-	uint8_t *p_base;
-	uint32_t frame_buffer_len;
 	const uint8_t *pend_buf;
 	const uint8_t *front_buf;
 	uint8_t pixel_size;
+	enum display_pixel_format current_pixel_format;
 	uint8_t *frame_buffer;
-	struct k_sem sem;
+	uint32_t frame_buffer_len;
+	struct k_sem frame_buf_sem;
 };
 
+extern void glcdc_line_detect_isr(void);
+
 static void renesas_ra_glcdc_isr(const struct device *dev)
 {
+	ARG_UNUSED(dev);
+	glcdc_line_detect_isr();
+}
+
+static void renesas_ra_callback_adapter(display_callback_args_t *p_args)
+{
+	const struct device *dev = p_args->p_context;
 	struct display_ra_data *data = dev->data;
 
-	glcdc_line_detect_isr();
-	if (data->front_buf != data->pend_buf) {
-		data->front_buf = data->pend_buf;
-		k_sem_give(&data->sem);
+	if (p_args->event == DISPLAY_EVENT_LINE_DETECTION) {
+		if (data->front_buf != data->pend_buf) {
+			data->front_buf = data->pend_buf;
+		}
+
+		k_sem_give(&data->frame_buf_sem);
 	}
 }
 
@@ -58,24 +66,31 @@ static int ra_display_write(const struct device *dev, const uint16_t x, const ui
 {
 	struct display_ra_data *data = dev->data;
 	const struct display_ra_config *config = dev->config;
-	uint8_t *dst = NULL;
-	const uint8_t *src = buf;
 	const uint8_t *l_pend_buf = NULL;
-	uint16_t row;
-	int err;
+	bool vsync_wait = false;
+	fsp_err_t err;
 
-	__ASSERT(desc->width <= desc->pitch, "Pitch is smaller than width");
-	__ASSERT((desc->pitch * BYTE_PER_PIXEL * desc->height) <= desc->buf_size,
-		 "Input buffer too small");
+	if (desc->pitch < desc->width) {
+		LOG_ERR("Pitch is smaller than width");
+		return -EINVAL;
+	}
 
-	if (x == 0 && y == 0 && desc->height == DISPLAY_VSIZE && desc->width == DISPLAY_HSIZE &&
-	    desc->pitch == DISPLAY_HSIZE) {
+	if ((desc->pitch * data->pixel_size * desc->height) > desc->buf_size) {
+		LOG_ERR("Input buffer too small");
+		return -EINVAL;
+	}
+
+	if (x == 0 && y == 0 && desc->height == config->height && desc->width == config->width) {
 		l_pend_buf = buf;
 	} else {
-		if (CONFIG_RENESAS_RA_GLCDC_FB_NUM == 0) {
-			LOG_ERR("Partial write requires internal frame buffer");
-			return -ENOTSUP;
-		}
+#if CONFIG_RENESAS_RA_GLCDC_FB_NUM == 0
+		LOG_ERR("Partial write requires internal frame buffer");
+		return -ENOTSUP;
+#else
+		const uint8_t *src = buf;
+		uint8_t *dst = NULL;
+		uint16_t row;
+
 		dst = data->frame_buffer;
 
 		if (CONFIG_RENESAS_RA_GLCDC_FB_NUM == 2) {
@@ -99,24 +114,37 @@ static int ra_display_write(const struct device *dev, const uint16_t x, const ui
 			dst += (config->width * data->pixel_size);
 			src += (desc->pitch * data->pixel_size);
 		}
+#endif /* CONFIG_RENESAS_RA_GLCDC_FB_NUM == 0 */
 	}
 
-	if (data->front_buf == l_pend_buf) {
-		return 0;
-	}
+	k_sem_reset(&data->frame_buf_sem);
 
-	k_sem_reset(&data->sem);
+	if (data->front_buf != l_pend_buf) {
+		data->pend_buf = l_pend_buf;
 
-	data->pend_buf = l_pend_buf;
+		err = R_GLCDC_BufferChange(&data->display_ctrl, (uint8_t *)data->pend_buf,
+					   DISPLAY_FRAME_LAYER_1);
+		if (err != FSP_SUCCESS) {
+			LOG_ERR("GLCDC buffer change failed");
+			return -EIO;
+		}
 
-	err = R_GLCDC_BufferChange(&data->display_ctrl, (uint8_t *)data->pend_buf,
-				   DISPLAY_FRAME_LAYER_1);
-	if (err) {
-		LOG_ERR("GLCDC buffer change failed");
-		return -EIO;
+		vsync_wait = true;
+	}
+
+	if (data->display_ctrl.state != DISPLAY_STATE_DISPLAYING) {
+		err = R_GLCDC_Start(&data->display_ctrl);
+		if (err != FSP_SUCCESS) {
+			LOG_ERR("GLCDC start failed");
+			return -EIO;
+		}
+
+		vsync_wait = true;
 	}
 
-	k_sem_take(&data->sem, K_FOREVER);
+	if (vsync_wait) {
+		k_sem_take(&data->frame_buf_sem, K_FOREVER);
+	}
 
 	return 0;
 }
@@ -146,65 +174,179 @@ static int ra_display_read(const struct device *dev, const uint16_t x, const uin
 static int ra_display_blanking_on(const struct device *dev)
 {
 	const struct display_ra_config *config = dev->config;
-	int err;
+	int ret = 0;
 
 	if (config->backlight_gpio.port != NULL) {
-		err = gpio_pin_set_dt(&config->backlight_gpio, 0);
-		if (err) {
-			LOG_ERR("Disable backlight failed! (%d)", err);
-			return err;
-		}
+		ret = gpio_pin_set_dt(&config->backlight_gpio, 0);
 	} else {
-		return -ENOTSUP;
+		ret = -ENOTSUP;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int ra_display_blanking_off(const struct device *dev)
 {
 	const struct display_ra_config *config = dev->config;
-	int err;
+	int ret = 0;
 
 	if (config->backlight_gpio.port != NULL) {
-		err = gpio_pin_set_dt(&config->backlight_gpio, 1);
-		if (err) {
-			LOG_ERR("Enable backlight failed! (%d)", err);
-			return err;
-		}
+		ret = gpio_pin_set_dt(&config->backlight_gpio, 1);
 	} else {
-		return -ENOTSUP;
+		ret = -ENOTSUP;
 	}
 
-	return 0;
+	return ret;
 }
 
 static void ra_display_get_capabilities(const struct device *dev,
 					struct display_capabilities *capabilities)
 {
 	const struct display_ra_config *config = dev->config;
+	struct display_ra_data *data = dev->data;
 
-	memset(capabilities, 0, sizeof(struct display_capabilities));
 	capabilities->x_resolution = config->width;
 	capabilities->y_resolution = config->height;
 	capabilities->current_orientation = DISPLAY_ORIENTATION_NORMAL;
 	capabilities->supported_pixel_formats =
 		PIXEL_FORMAT_RGB_888 | PIXEL_FORMAT_ARGB_8888 | PIXEL_FORMAT_RGB_565;
-	capabilities->current_pixel_format = (config->pixel_format == PIXEL_FORMAT_RGB_888)
-						     ? PIXEL_FORMAT_ARGB_8888
-						     : config->pixel_format;
+	capabilities->current_pixel_format = data->current_pixel_format;
+	capabilities->screen_info = 0U;
 }
 
 static int ra_display_set_pixel_format(const struct device *dev,
 				       const enum display_pixel_format pixel_format)
 {
 	const struct display_ra_config *config = dev->config;
+	struct display_ra_data *data = dev->data;
+	display_runtime_cfg_t layer_cfg;
+	enum display_pixel_format set_pixel_format;
+	display_in_format_t hardware_pixel_format;
+	uint32_t buf_len;
+	fsp_err_t err;
 
-	if (pixel_format == config->pixel_format) {
+	if (pixel_format == data->current_pixel_format) {
 		return 0;
 	}
-	LOG_ERR("Pixel format changes must be set in dts at build time.");
-	return -ENOTSUP;
+
+	if (data->display_ctrl.state == DISPLAY_STATE_DISPLAYING) {
+		LOG_ERR("Cannot change the display format while displaying");
+		return -EWOULDBLOCK;
+	}
+
+	switch (pixel_format) {
+	case PIXEL_FORMAT_RGB_888:
+		set_pixel_format = PIXEL_FORMAT_ARGB_8888;
+		hardware_pixel_format = DISPLAY_IN_FORMAT_32BITS_RGB888;
+		break;
+
+	case PIXEL_FORMAT_ARGB_8888:
+		set_pixel_format = PIXEL_FORMAT_ARGB_8888;
+		hardware_pixel_format = DISPLAY_IN_FORMAT_32BITS_ARGB8888;
+		break;
+
+	case PIXEL_FORMAT_RGB_565:
+		set_pixel_format = PIXEL_FORMAT_RGB_565;
+		hardware_pixel_format = DISPLAY_IN_FORMAT_16BITS_RGB565;
+		break;
+
+	default:
+		return -ENOTSUP;
+	}
+
+	buf_len = (config->height * config->width * DISPLAY_BITS_PER_PIXEL(set_pixel_format)) >> 3;
+
+	if (buf_len > data->frame_buffer_len) {
+		LOG_ERR("Frame buffer is smaller than new pixel format require");
+		return -ENOTSUP;
+	}
+
+	memcpy(&layer_cfg.input, &data->display_fsp_cfg.input[0], sizeof(display_input_cfg_t));
+	memcpy(&layer_cfg.layer, &data->display_fsp_cfg.layer[0], sizeof(display_layer_t));
+	layer_cfg.input.format = hardware_pixel_format;
+	layer_cfg.input.hstride =
+		ROUND_UP(layer_cfg.input.hsize * DISPLAY_BITS_PER_PIXEL(set_pixel_format),
+			 NUM_BITS(uint64_t)) /
+		DISPLAY_BITS_PER_PIXEL(set_pixel_format);
+
+	err = R_GLCDC_LayerChange(&data->display_ctrl, &layer_cfg, DISPLAY_FRAME_LAYER_1);
+	if (err != FSP_SUCCESS) {
+		LOG_ERR("Failed to change the pixel format");
+		return -EIO;
+	}
+
+	data->current_pixel_format = pixel_format;
+	data->pixel_size = DISPLAY_BITS_PER_PIXEL(set_pixel_format) >> 3;
+
+	return 0;
+}
+
+static int ra_display_color_config(const struct device *dev,
+				   const display_correction_t *display_color_cfg)
+{
+	struct display_ra_data *data = dev->data;
+	fsp_err_t err;
+	int ret;
+
+	err = R_GLCDC_ColorCorrection(&data->display_ctrl, display_color_cfg);
+	switch (err) {
+	case FSP_SUCCESS:
+		ret = 0;
+		break;
+	case FSP_ERR_INVALID_UPDATE_TIMING:
+		ret = -EWOULDBLOCK;
+		break;
+	default:
+		ret = -EIO;
+		break;
+	}
+
+	return ret;
+}
+
+#define RENESAS_RA_GLCDC_BRIGHTNESS_MAX 1023U
+
+static int ra_display_set_brightness(const struct device *dev, const uint8_t brightness)
+{
+	struct display_ra_data *data = dev->data;
+	const uint32_t brightness_adj =
+		DIV_ROUND_CLOSEST(brightness * RENESAS_RA_GLCDC_BRIGHTNESS_MAX, UINT8_MAX);
+	display_correction_t display_color_cfg;
+
+	if (brightness_adj == 0) {
+		return -EINVAL;
+	}
+
+	memcpy(&display_color_cfg.contrast, &data->display_fsp_cfg.output.contrast,
+	       sizeof(display_contrast_t));
+	display_color_cfg.brightness = (display_brightness_t){
+		.enable = true, .r = brightness_adj, .g = brightness_adj, .b = brightness_adj};
+
+	return ra_display_color_config(dev, &display_color_cfg);
+}
+
+static int ra_display_set_contrast(const struct device *dev, const uint8_t contrast)
+{
+	struct display_ra_data *data = dev->data;
+	display_correction_t display_color_cfg;
+
+	if (contrast == 0) {
+		return -EINVAL;
+	}
+
+	memcpy(&display_color_cfg.brightness, &data->display_fsp_cfg.output.brightness,
+	       sizeof(display_brightness_t));
+	display_color_cfg.contrast =
+		(display_contrast_t){.enable = true, .r = contrast, .g = contrast, .b = contrast};
+
+	return ra_display_color_config(dev, &display_color_cfg);
+}
+
+static void *ra_display_get_framebuffer(const struct device *dev)
+{
+	struct display_ra_data *data = dev->data;
+
+	return (void *)data->front_buf;
 }
 
 static DEVICE_API(display, display_api) = {
@@ -214,6 +356,9 @@ static DEVICE_API(display, display_api) = {
 	.set_pixel_format = ra_display_set_pixel_format,
 	.write = ra_display_write,
 	.read = ra_display_read,
+	.set_brightness = ra_display_set_brightness,
+	.set_contrast = ra_display_set_contrast,
+	.get_framebuffer = ra_display_get_framebuffer,
 };
 
 static int display_init(const struct device *dev)
@@ -235,12 +380,16 @@ static int display_init(const struct device *dev)
 	R_BSP_RegisterProtectEnable(BSP_REG_PROTECT_OM_LPC_BATT);
 
 #endif
-	err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
-	if (err) {
-		LOG_ERR("pin function initial failed");
-		return err;
+
+	if (config->pincfg != NULL) {
+		err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
+		if (err) {
+			LOG_ERR("pin function initial failed");
+			return err;
+		}
 	}
-	k_sem_init(&data->sem, 0, 1);
+
+	k_sem_init(&data->frame_buf_sem, 0, 1);
 
 	err = clock_control_on(config->clock_dev,
 			       (clock_control_subsys_t)&config->clock_glcdc_subsys);
@@ -261,12 +410,6 @@ static int display_init(const struct device *dev)
 		return err;
 	}
 
-	err = R_GLCDC_Start(&data->display_ctrl);
-	if (err) {
-		LOG_ERR("GLCDC start failed");
-		return -EIO;
-	}
-
 	config->irq_configure();
 
 	return 0;
@@ -275,7 +418,8 @@ static int display_init(const struct device *dev)
 #define IRQ_CONFIGURE_FUNC(id)                                                                     \
 	static void glcdc_renesas_ra_configure_func_##id(void)                                     \
 	{                                                                                          \
-		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(id, line, irq)] = ELC_EVENT_GLCDC_LINE_DETECT;    \
+		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(id, line, irq)] =                                 \
+			BSP_PRV_IELS_ENUM(EVENT_GLCDC_LINE_DETECT);                                \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(id, line, irq),                                    \
 			    DT_INST_IRQ_BY_NAME(id, line, priority), renesas_ra_glcdc_isr,         \
 			    DEVICE_DT_INST_GET(id), 0);                                            \
@@ -285,146 +429,83 @@ static int display_init(const struct device *dev)
 #define IRQ_CONFIGURE_DEFINE(id) .irq_configure = glcdc_renesas_ra_configure_func_##id
 
 #define RENESAS_RA_FRAME_BUFFER_LEN(id)                                                            \
-	(BYTE_PER_PIXEL * DT_INST_PROP(id, height) * DT_INST_PROP(id, width))
+	(RENESAS_RA_GLCDC_PIXEL_BYTE_SIZE(id) * DT_INST_PROP(id, height) * DT_INST_PROP(id, width))
+
+#ifdef CONFIG_RENESAS_RA_GLCDC_FRAME_BUFFER_SECTION
+#define FRAME_BUFFER_SECTION Z_GENERIC_SECTION(CONFIG_RENESAS_RA_GLCDC_FRAME_BUFFER_SECTION)
+#else
+#define FRAME_BUFFER_SECTION
+#endif /* CONFIG_RENESAS_RA_GLCDC_FRAME_BUFFER_SECTION */
+
+#define RENESAS_RA_GLCDC_DEVICE_PINCTRL_INIT(n)                                                    \
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(n, pinctrl_0), (PINCTRL_DT_INST_DEFINE(n)), ())
+
+#define RENESAS_RA_GLCDC_DEVICE_PINCTRL_GET(n)                                                     \
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(n, pinctrl_0), (PINCTRL_DT_INST_DEV_CONFIG_GET(n)),      \
+		    (NULL))
 
 #define RENESAS_RA_DEVICE_INIT(id)                                                                 \
-	PINCTRL_DT_INST_DEFINE(id);                                                                \
+	RENESAS_RA_GLCDC_DEVICE_PINCTRL_INIT(id);                                                  \
 	IRQ_CONFIGURE_FUNC(id)                                                                     \
-	Z_GENERIC_SECTION(".sdram")                                                                \
-	static uint8_t __aligned(64)                                                               \
+	FRAME_BUFFER_SECTION static uint8_t __aligned(64)                                          \
 	fb_background##id[CONFIG_RENESAS_RA_GLCDC_FB_NUM * RENESAS_RA_FRAME_BUFFER_LEN(id)];       \
 	static const glcdc_extended_cfg_t display_extend_cfg##id = {                               \
-		.tcon_hsync = GLCDC_TCON_PIN_1,                                                    \
-		.tcon_vsync = GLCDC_TCON_PIN_0,                                                    \
-		.tcon_de = GLCDC_TCON_PIN_2,                                                       \
+		.tcon_hsync = RENESAS_RA_GLCDC_TCON_HSYNC_PIN(id),                                 \
+		.tcon_vsync = RENESAS_RA_GLCDC_TCON_VSYNC_PIN(id),                                 \
+		.tcon_de = RENESAS_RA_GLCDC_TCON_DE_PIN(id),                                       \
 		.correction_proc_order = GLCDC_CORRECTION_PROC_ORDER_BRIGHTNESS_CONTRAST2GAMMA,    \
 		.clksrc = GLCDC_CLK_SRC_INTERNAL,                                                  \
-		.clock_div_ratio = GLCDC_PANEL_CLK_DIVISOR_8,                                      \
-		.dithering_mode = GLCDC_DITHERING_MODE_TRUNCATE,                                   \
-		.dithering_pattern_A = GLCDC_DITHERING_PATTERN_11,                                 \
-		.dithering_pattern_B = GLCDC_DITHERING_PATTERN_11,                                 \
-		.dithering_pattern_C = GLCDC_DITHERING_PATTERN_11,                                 \
-		.dithering_pattern_D = GLCDC_DITHERING_PATTERN_11,                                 \
-		.phy_layer = NULL,                                                                 \
-	};                                                                                         \
+		.clock_div_ratio = RENESAS_RA_GLCDC_OUTPUT_CLOCK_DIV(id),                          \
+		.phy_layer = NULL};                                                                \
 	static struct display_ra_data ra_data##id = {                                              \
 		.frame_buffer = fb_background##id,                                                 \
 		.frame_buffer_len = RENESAS_RA_FRAME_BUFFER_LEN(id),                               \
 		.front_buf = fb_background##id,                                                    \
 		.pend_buf = fb_background##id,                                                     \
-		.pixel_size = BYTE_PER_PIXEL,                                                      \
-		.p_base = (uint8_t *)&fb_background##id,                                           \
+		.pixel_size = RENESAS_RA_GLCDC_PIXEL_BYTE_SIZE(id),                                \
+		.current_pixel_format = RENESAS_RA_DISPLAY_GET_PIXEL_FORMAT(id),                   \
 		.display_fsp_cfg = {                                                               \
-			.input[0] = {.p_base = (uint32_t *)&fb_background##id,                     \
-				     .hsize = DISPLAY_HSIZE,                                       \
-				     .vsize = DISPLAY_VSIZE,                                       \
-				     .hstride = DISPLAY_BUFFER_STRIDE_PIXELS_INPUT0,               \
-				     .format =                                                     \
-					     (INPUT_FORMAT_PIXEL == PANEL_PIXEL_FORMAT_RGB_565)    \
-						     ? DISPLAY_IN_FORMAT_16BITS_RGB565             \
-					     : (INPUT_FORMAT_PIXEL == PANEL_PIXEL_FORMAT_RGB_888)  \
-						     ? DISPLAY_IN_FORMAT_32BITS_RGB888             \
-						     : DISPLAY_IN_FORMAT_32BITS_ARGB8888,          \
-				     .line_descending_enable = false,                              \
-				     .lines_repeat_enable = false,                                 \
-				     .lines_repeat_times = 0},                                     \
-			.input[1] = {.p_base = NULL,                                               \
-				     .hsize = DISPLAY_HSIZE,                                       \
-				     .vsize = DISPLAY_VSIZE,                                       \
-				     .hstride = DISPLAY_BUFFER_STRIDE_PIXELS_INPUT1,               \
-				     .format = DISPLAY_IN_FORMAT_16BITS_RGB565,                    \
+			.input[0] = {.p_base = (uint32_t *)fb_background##id,                      \
+				     .hsize = DISPLAY_HSIZE(id),                                   \
+				     .vsize = DISPLAY_VSIZE(id),                                   \
+				     .hstride = RENESAS_RA_DISPLAY_BUFFER_HSTRIDE_BYTE(id),        \
+				     .format = RENESAS_RA_GLCDC_IN_PIXEL_FORMAT(id),               \
 				     .line_descending_enable = false,                              \
 				     .lines_repeat_enable = false,                                 \
 				     .lines_repeat_times = 0},                                     \
 			.layer[0] = {.coordinate = {.x = 0, .y = 0},                               \
-				     .bg_color = {.byte = {.a = LAYER_ALPHA,                       \
-							   .r = LAYER_RED,                         \
-							   .g = LAYER_GREEN,                       \
-							   .b = LAYER_BLUE}},                      \
-				     .fade_control = DISPLAY_FADE_CONTROL_NONE,                    \
-				     .fade_speed = 0},                                             \
-			.layer[1] = {.coordinate = {.x = 0, .y = 0},                               \
-				     .bg_color = {.byte = {.a = LAYER_ALPHA,                       \
-							   .r = LAYER_RED,                         \
-							   .g = LAYER_GREEN,                       \
-							   .b = LAYER_BLUE}},                      \
+				     .bg_color = RENESAS_RA_GLCDC_BG_COLOR(id),                    \
 				     .fade_control = DISPLAY_FADE_CONTROL_NONE,                    \
 				     .fade_speed = 0},                                             \
-			.output = {.htiming = {.total_cyc =                                        \
-						       DT_INST_PROP(id, width) +                   \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       hback_porch) +                      \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       hfront_porch) +                     \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       hsync_len),                         \
-					       .display_cyc = DT_INST_PROP(id, width),             \
-					       .back_porch =                                       \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       hback_porch),                       \
-					       .sync_width =                                       \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       hsync_len),                         \
-					       .sync_polarity =                                    \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       hsync_active)},                     \
-				   .vtiming = {.total_cyc =                                        \
-						       DT_INST_PROP(id, height) +                  \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       vback_porch) +                      \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       vfront_porch) +                     \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       vsync_len),                         \
-					       .display_cyc = DT_INST_PROP(id, height),            \
-					       .back_porch =                                       \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       vback_porch),                       \
-					       .sync_width =                                       \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       vsync_len),                         \
-					       .sync_polarity =                                    \
-						       DT_PROP(DT_INST_CHILD(id, display_timings), \
-							       vsync_active)},                     \
-				   .format = (OUTPUT_FORMAT_PIXEL == PANEL_PIXEL_FORMAT_RGB_565)   \
-						     ? DISPLAY_OUT_FORMAT_16BITS_RGB565            \
-						     : DISPLAY_OUT_FORMAT_24BITS_RGB888,           \
-				   .endian = DISPLAY_ENDIAN_LITTLE,                                \
-				   .color_order = DISPLAY_COLOR_ORDER_RGB,                         \
-				   .data_enable_polarity = DISPLAY_SIGNAL_POLARITY_HIACTIVE,       \
-				   .sync_edge = DISPLAY_SIGNAL_SYNC_EDGE_FALLING,                  \
-				   .bg_color = {.byte = {.a = OUTPUT_ALPHA,                        \
-							 .r = OUTPUT_RED,                          \
-							 .g = OUTPUT_GREEN,                        \
-							 .b = OUTPUT_BLUE}},                       \
-				   .brightness = {.enable = false,                                 \
-						  .r = OUTPUT_RED,                                 \
-						  .g = OUTPUT_GREEN,                               \
-						  .b = OUTPUT_BLUE},                               \
-				   .contrast = {.enable = false,                                   \
-						.r = OUTPUT_RED,                                   \
-						.g = OUTPUT_GREEN,                                 \
-						.b = OUTPUT_BLUE},                                 \
+			.input[1] = {.p_base = NULL},                                              \
+			.output = {.htiming = RENESAS_RA_GLCDC_HTIMING(id),                        \
+				   .vtiming = RENESAS_RA_GLCDC_VTIMING(id),                        \
+				   .format = RENESAS_RA_GLCDC_OUT_PIXEL_FORMAT(id),                \
+				   .endian = RENESAS_RA_GLCDC_OUTPUT_ENDIAN(id),                   \
+				   .color_order = RENESAS_RA_GLCDC_OUTPUT_COLOR_ODER(id),          \
+				   .data_enable_polarity =                                         \
+					   RENESAS_RA_GLCDC_OUTPUT_DE_POLARITY(id),                \
+				   .sync_edge = RENESAS_RA_GLCDC_OUTPUT_SYNC_EDGE(id),             \
+				   .bg_color = RENESAS_RA_GLCDC_BG_COLOR(id),                      \
+				   .brightness = {.enable = false},                                \
+				   .contrast = {.enable = false},                                  \
 				   .dithering_on = false},                                         \
-			.p_callback = NULL,                                                        \
-			.p_context = NULL,                                                         \
+			.p_callback = renesas_ra_callback_adapter,                                 \
+			.p_context = DEVICE_DT_INST_GET(id),                                       \
 			.p_extend = (void *)(&display_extend_cfg##id),                             \
-			.line_detect_ipl = BSP_IRQ_DISABLED,                                       \
-			.underflow_1_ipl = BSP_IRQ_DISABLED,                                       \
-			.underflow_2_ipl = BSP_IRQ_DISABLED}};                                     \
+			.line_detect_irq = DT_INST_IRQ_BY_NAME(id, line, irq),                     \
+			.line_detect_ipl = DT_INST_IRQ_BY_NAME(id, line, priority),                \
+			.underflow_1_irq = BSP_IRQ_DISABLED,                                       \
+			.underflow_2_irq = BSP_IRQ_DISABLED}};                                     \
 	static struct display_ra_config ra_config##id = {                                          \
 		IRQ_CONFIGURE_DEFINE(id),                                                          \
-		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(id),                                      \
-		.backlight_gpio = GPIO_DT_SPEC_INST_GET(id, backlight_gpios),                      \
+		.pincfg = RENESAS_RA_GLCDC_DEVICE_PINCTRL_GET(id),                                 \
+		.backlight_gpio = GPIO_DT_SPEC_INST_GET_OR(id, backlight_gpios, NULL),             \
 		.height = DT_INST_PROP(id, height),                                                \
 		.width = DT_INST_PROP(id, width),                                                  \
-		.pixel_format = DT_INST_PROP(id, input_pixel_format),                              \
-		.display_frame_size =                                                              \
-			(DT_INST_PROP(id, width)) * (DT_INST_PROP(id, height)) * BYTE_PER_PIXEL,   \
 		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(id)),                               \
 		.clock_glcdc_subsys = {.mstp = (uint32_t)DT_INST_CLOCKS_CELL_BY_IDX(id, 0, mstp),  \
-				       .stop_bit = DT_INST_CLOCKS_CELL_BY_IDX(id, 0, stop_bit)},   \
-	};                                                                                         \
+				       .stop_bit = DT_INST_CLOCKS_CELL_BY_IDX(id, 0, stop_bit)}};  \
 	DEVICE_DT_INST_DEFINE(id, &display_init, NULL, &ra_data##id, &ra_config##id, POST_KERNEL,  \
 			      CONFIG_DISPLAY_INIT_PRIORITY, &display_api);
 
diff --git a/drivers/display/display_renesas_ra.h b/drivers/display/display_renesas_ra.h
index e3cddbcc3b7d1..d7695255fc3d2 100644
--- a/drivers/display/display_renesas_ra.h
+++ b/drivers/display/display_renesas_ra.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,42 +9,92 @@
 
 #include <zephyr/drivers/display.h>
 
-#define INPUT_FORMAT_PIXEL  DT_INST_PROP(0, input_pixel_format)
-#define OUTPUT_FORMAT_PIXEL DT_INST_PROP(0, output_pixel_format)
-
-#if (INPUT_FORMAT_PIXEL == PANEL_PIXEL_FORMAT_RGB_565)
-#define BYTE_PER_PIXEL                (2)
-#define DISPLAY_BITS_PER_PIXEL_INPUT0 (16)
-#elif (INPUT_FORMAT_PIXEL == PANEL_PIXEL_FORMAT_RGB_888)
-#define BYTE_PER_PIXEL                (4)
-#define DISPLAY_BITS_PER_PIXEL_INPUT0 (32)
-#elif (INPUT_FORMAT_PIXEL == PANEL_PIXEL_FORMAT_ARGB_8888)
-#define BYTE_PER_PIXEL                (4)
-#define DISPLAY_BITS_PER_PIXEL_INPUT0 (32)
-#endif
-
-#define DISPLAY_BITS_PER_PIXEL_INPUT1 (16)
-#define DISPLAY_HSIZE                 DT_INST_PROP(0, width)
-#define DISPLAY_VSIZE                 DT_INST_PROP(0, height)
-#define DISPLAY_BUFFER_STRIDE_BYTES_INPUT0                                                         \
-	(((DISPLAY_HSIZE * DISPLAY_BITS_PER_PIXEL_INPUT0 + 0x1FF) >> 9) << 6)
-#define DISPLAY_BUFFER_STRIDE_PIXELS_INPUT0                                                        \
-	((DISPLAY_BUFFER_STRIDE_BYTES_INPUT0 * 8) / DISPLAY_BITS_PER_PIXEL_INPUT0)
-#define DISPLAY_BUFFER_STRIDE_BYTES_INPUT1                                                         \
-	(((DISPLAY_HSIZE * DISPLAY_BITS_PER_PIXEL_INPUT1 + 0x1FF) >> 9) << 6)
-#define DISPLAY_BUFFER_STRIDE_PIXELS_INPUT1                                                        \
-	((DISPLAY_BUFFER_STRIDE_BYTES_INPUT1 * 8) / DISPLAY_BITS_PER_PIXEL_INPUT1)
-
-#define LAYER_GREEN          (255)
-#define LAYER_RED            (255)
-#define LAYER_BLUE           (255)
-#define LAYER_ALPHA          (255)
-#define OUTPUT_GREEN         (0)
-#define OUTPUT_RED           (0)
-#define OUTPUT_BLUE          (0)
-#define OUTPUT_ALPHA         (255)
-#define GLCDC_BRIGHTNESS_MAX (1023U)
-#define BRIGHTNESS_MAX       (255U)
-#define GLCDC_CONTRAST_MAX   (255U)
+#define ROUND_UP_64BYTES(x)    ROUND_UP(x, NUM_BITS(uint64_t))
+#define INPUT_FORMAT_PIXEL(n)  DT_INST_PROP(n, input_pixel_format)
+#define OUTPUT_FORMAT_PIXEL(n) DT_INST_PROP(n, output_pixel_format)
+
+#define RENESAS_RA_GLCDC_IN_PIXEL_FORMAT_1  (DISPLAY_IN_FORMAT_32BITS_RGB888)
+#define RENESAS_RA_GLCDC_IN_PIXEL_FORMAT_8  (DISPLAY_IN_FORMAT_32BITS_ARGB8888)
+#define RENESAS_RA_GLCDC_IN_PIXEL_FORMAT_16 (DISPLAY_IN_FORMAT_16BITS_RGB565)
+
+#define RENESAS_RA_GLCDC_OUT_PIXEL_FORMAT_1  (DISPLAY_OUT_FORMAT_24BITS_RGB888)
+#define RENESAS_RA_GLCDC_OUT_PIXEL_FORMAT_16 (DISPLAY_OUT_FORMAT_16BITS_RGB565)
+
+#define RENESAS_RA_DISPLAY_GET_PIXEL_FORMAT(n)                                                     \
+	(DT_INST_PROP(n, input_pixel_format) == PANEL_PIXEL_FORMAT_RGB_888                         \
+		 ? PANEL_PIXEL_FORMAT_ARGB_8888                                                    \
+		 : DT_INST_PROP(n, input_pixel_format))
+
+#define DISPLAY_HSIZE(n) (DT_INST_PROP(n, width))
+#define DISPLAY_VSIZE(n) (DT_INST_PROP(n, height))
+
+#define RENESAS_RA_GLCDC_IN_PIXEL_FORMAT(n)                                                        \
+	UTIL_CAT(RENESAS_RA_GLCDC_IN_PIXEL_FORMAT_, INPUT_FORMAT_PIXEL(n))
+
+#define RENESAS_RA_GLCDC_OUT_PIXEL_FORMAT(n)                                                       \
+	UTIL_CAT(RENESAS_RA_GLCDC_OUT_PIXEL_FORMAT_, OUTPUT_FORMAT_PIXEL(n))
+
+#define RENESAS_RA_GLCDC_PIXEL_BYTE_SIZE(n)                                                        \
+	(DISPLAY_BITS_PER_PIXEL(RENESAS_RA_DISPLAY_GET_PIXEL_FORMAT(n)) >> 3)
+
+#define RENESAS_RA_DISPLAY_BUFFER_HSTRIDE_BYTE(n)                                                  \
+	(ROUND_UP_64BYTES(DISPLAY_HSIZE(n) * DISPLAY_BITS_PER_PIXEL(INPUT_FORMAT_PIXEL(n))) /      \
+	 DISPLAY_BITS_PER_PIXEL(INPUT_FORMAT_PIXEL(n)))
+
+#define RENESAS_RA_GLCDC_HTIMING(n)                                                                \
+	{.total_cyc = DT_INST_PROP(n, width) +                                                     \
+		      DT_PROP(DT_INST_CHILD(n, display_timings), hback_porch) +                    \
+		      DT_PROP(DT_INST_CHILD(n, display_timings), hfront_porch) +                   \
+		      DT_PROP(DT_INST_CHILD(n, display_timings), hsync_len),                       \
+	 .display_cyc = DT_INST_PROP(n, width),                                                    \
+	 .back_porch = DT_PROP(DT_INST_CHILD(n, display_timings), hback_porch),                    \
+	 .sync_width = DT_PROP(DT_INST_CHILD(n, display_timings), hsync_len),                      \
+	 .sync_polarity = DT_PROP(DT_INST_CHILD(n, display_timings), hsync_active)}
+
+#define RENESAS_RA_GLCDC_VTIMING(n)                                                                \
+	{.total_cyc = DT_INST_PROP(n, height) +                                                    \
+		      DT_PROP(DT_INST_CHILD(n, display_timings), vback_porch) +                    \
+		      DT_PROP(DT_INST_CHILD(n, display_timings), vfront_porch) +                   \
+		      DT_PROP(DT_INST_CHILD(n, display_timings), vsync_len),                       \
+	 .display_cyc = DT_INST_PROP(n, height),                                                   \
+	 .back_porch = DT_PROP(DT_INST_CHILD(n, display_timings), vback_porch),                    \
+	 .sync_width = DT_PROP(DT_INST_CHILD(n, display_timings), vsync_len),                      \
+	 .sync_polarity = DT_PROP(DT_INST_CHILD(n, display_timings), vsync_active)}
+
+#define RENESAS_RA_GLCDC_OUTPUT_ENDIAN(n)                                                          \
+	UTIL_CAT(DISPLAY_ENDIAN_, DT_INST_STRING_UPPER_TOKEN_OR(n, output_endian, LITTLE))
+
+#define RENESAS_RA_GLCDC_OUTPUT_COLOR_ODER(n)                                                      \
+	UTIL_CAT(DISPLAY_COLOR_ORDER_, DT_INST_STRING_UPPER_TOKEN_OR(n, output_color_oder, RGB))
+
+#define RENESAS_RA_GLCDC_OUTPUT_DE_POLARITY(n)                                                     \
+	UTIL_CAT(DISPLAY_SIGNAL_POLARITY_,                                                         \
+		 DT_INST_STRING_UPPER_TOKEN_OR(n, output_data_signal_polarity, HIACTIVE))
+
+#define RENESAS_RA_GLCDC_OUTPUT_SYNC_EDGE(n)                                                       \
+	UTIL_CAT(DISPLAY_SIGNAL_SYNC_EDGE_,                                                        \
+		 DT_INST_STRING_UPPER_TOKEN_OR(n, output_signal_sync_edge, FALLING))
+
+#define RENESAS_RA_GLCDC_BG_COLOR(n)                                                               \
+	{                                                                                          \
+		.byte = {                                                                          \
+			.a = DT_INST_PROP_OR(n, def_back_color_alpha, 255),                        \
+			.r = DT_INST_PROP_OR(n, def_back_color_red, 255),                          \
+			.g = DT_INST_PROP_OR(n, def_back_color_green, 255),                        \
+			.b = DT_INST_PROP_OR(n, def_back_color_blue, 255)                          \
+		}                                                                                  \
+	}
+
+#define RENESAS_RA_GLCDC_TCON_HSYNC_PIN(n)                                                         \
+	UTIL_CAT(GLCDC_, DT_INST_STRING_UPPER_TOKEN_OR(n, output_pin_hsync, TCON_PIN_1))
+
+#define RENESAS_RA_GLCDC_TCON_VSYNC_PIN(n)                                                         \
+	UTIL_CAT(GLCDC_, DT_INST_STRING_UPPER_TOKEN_OR(n, output_pin_vsync, TCON_PIN_0))
+
+#define RENESAS_RA_GLCDC_TCON_DE_PIN(n)                                                            \
+	UTIL_CAT(GLCDC_, DT_INST_STRING_UPPER_TOKEN_OR(n, output_pin_de, TCON_PIN_2))
+
+#define RENESAS_RA_GLCDC_OUTPUT_CLOCK_DIV(n)                                                       \
+	UTIL_CAT(GLCDC_PANEL_CLK_DIVISOR_, DT_INST_PROP_OR(n, output_clock_divisor, 8))
 
 #endif /* ZEPHYR_DRIVERS_DISPLAY_RENESAS_RA_H_ */
diff --git a/drivers/display/display_sdl.c b/drivers/display/display_sdl.c
index bbae94c75e068..e24e6ea66929b 100644
--- a/drivers/display/display_sdl.c
+++ b/drivers/display/display_sdl.c
@@ -7,8 +7,10 @@
 
 #define DT_DRV_COMPAT zephyr_sdl_dc
 
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/display.h>
 
+#include <nsi_tracing.h>
 #include <string.h>
 #include <stdlib.h>
 #include <soc.h>
@@ -22,6 +24,26 @@ LOG_MODULE_REGISTER(display_sdl);
 
 static uint32_t sdl_display_zoom_pct;
 
+enum sdl_display_op {
+	SDL_WRITE,
+	SDL_BLANKING_OFF,
+	SDL_BLANKING_ON,
+};
+
+struct sdl_display_write {
+	uint16_t x;
+	uint16_t y;
+	const struct display_buffer_descriptor *desc;
+};
+
+struct sdl_display_task {
+	enum sdl_display_op op;
+	union {
+		struct sdl_display_write write;
+	};
+};
+
+
 struct sdl_display_config {
 	uint16_t height;
 	uint16_t width;
@@ -38,6 +60,12 @@ struct sdl_display_data {
 	enum display_pixel_format current_pixel_format;
 	uint8_t *buf;
 	uint8_t *read_buf;
+	struct k_thread sdl_thread;
+
+	K_KERNEL_STACK_MEMBER(sdl_thread_stack, CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);
+	struct k_msgq *task_msgq;
+	struct k_sem task_sem;
+	struct k_mutex task_mutex;
 };
 
 static inline uint32_t mono_pixel_order(uint32_t order)
@@ -49,14 +77,73 @@ static inline uint32_t mono_pixel_order(uint32_t order)
 	}
 }
 
-static int sdl_display_init(const struct device *dev)
+static void exec_sdl_task(const struct device *dev, const struct sdl_display_task *task)
 {
+	struct sdl_display_data *disp_data = dev->data;
+
+	switch (task->op) {
+	case SDL_WRITE:
+		sdl_display_write_bottom(task->write.desc->height, task->write.desc->width,
+					 task->write.x, task->write.y, disp_data->renderer,
+					 disp_data->mutex, disp_data->texture,
+					 disp_data->background_texture, disp_data->buf,
+					 disp_data->display_on,
+					 task->write.desc->frame_incomplete);
+		break;
+	case SDL_BLANKING_OFF:
+		sdl_display_blanking_off_bottom(disp_data->renderer, disp_data->texture,
+						disp_data->background_texture);
+		break;
+	case SDL_BLANKING_ON:
+		sdl_display_blanking_on_bottom(disp_data->renderer);
+		break;
+	default:
+		LOG_ERR("Unknown SDL task");
+		break;
+	}
+}
+
+static void sdl_task_thread(void *p1, void *p2, void *p3)
+{
+	const struct device *dev = p1;
+	struct sdl_display_data *disp_data = dev->data;
 	const struct sdl_display_config *config = dev->config;
+	struct sdl_display_task task;
+	bool use_accelerator =
+		IS_ENABLED(CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR);
+
+	if (sdl_display_zoom_pct == UINT32_MAX) {
+		sdl_display_zoom_pct = CONFIG_SDL_DISPLAY_ZOOM_PCT;
+	}
+
+	int rc = sdl_display_init_bottom(config->height, config->width, sdl_display_zoom_pct,
+					 use_accelerator, &disp_data->window, dev,
+					 &disp_data->renderer, &disp_data->mutex,
+					 &disp_data->texture, &disp_data->read_texture,
+					 &disp_data->background_texture,
+					 CONFIG_SDL_DISPLAY_TRANSPARENCY_GRID_CELL_COLOR_1,
+					 CONFIG_SDL_DISPLAY_TRANSPARENCY_GRID_CELL_COLOR_2,
+					 CONFIG_SDL_DISPLAY_TRANSPARENCY_GRID_CELL_SIZE);
+
+	if (rc != 0) {
+		nsi_print_error_and_exit("Failed to create SDL display");
+		return;
+	}
+
+	disp_data->display_on = false;
+
+	while (1) {
+		k_msgq_get(disp_data->task_msgq, &task, K_FOREVER);
+		exec_sdl_task(dev, &task);
+		k_sem_give(&disp_data->task_sem);
+	}
+}
+
+static int sdl_display_init(const struct device *dev)
+{
 	struct sdl_display_data *disp_data = dev->data;
-	bool use_accelerator = true;
-	LOG_DBG("Initializing display driver");
 
-	IF_DISABLED(CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR, (use_accelerator = false));
+	LOG_DBG("Initializing display driver");
 
 	disp_data->current_pixel_format =
 #if defined(CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_RGB_888)
@@ -69,29 +156,19 @@ static int sdl_display_init(const struct device *dev)
 		PIXEL_FORMAT_RGB_565
 #elif defined(CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_BGR_565)
 		PIXEL_FORMAT_BGR_565
-#else /* SDL_DISPLAY_DEFAULT_PIXEL_FORMAT */
+#elif defined(CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_L_8)
+		PIXEL_FORMAT_L_8
+#else  /* SDL_DISPLAY_DEFAULT_PIXEL_FORMAT */
 		PIXEL_FORMAT_ARGB_8888
 #endif /* SDL_DISPLAY_DEFAULT_PIXEL_FORMAT */
 		;
 
-	if (sdl_display_zoom_pct == UINT32_MAX) {
-		sdl_display_zoom_pct = CONFIG_SDL_DISPLAY_ZOOM_PCT;
-	}
-
-	int rc = sdl_display_init_bottom(config->height, config->width, sdl_display_zoom_pct,
-					 use_accelerator, &disp_data->window, &disp_data->renderer,
-					 &disp_data->mutex, &disp_data->texture,
-					 &disp_data->read_texture, &disp_data->background_texture,
-					 CONFIG_SDL_DISPLAY_TRANSPARENCY_GRID_CELL_COLOR_1,
-					 CONFIG_SDL_DISPLAY_TRANSPARENCY_GRID_CELL_COLOR_2,
-					 CONFIG_SDL_DISPLAY_TRANSPARENCY_GRID_CELL_SIZE);
-
-	if (rc != 0) {
-		LOG_ERR("Failed to create SDL display");
-		return -EIO;
-	}
-
-	disp_data->display_on = false;
+	k_sem_init(&disp_data->task_sem, 0, 1);
+	k_mutex_init(&disp_data->task_mutex);
+	k_thread_create(&disp_data->sdl_thread, disp_data->sdl_thread_stack,
+			K_KERNEL_STACK_SIZEOF(disp_data->sdl_thread_stack),
+			sdl_task_thread, (void *)dev, NULL, NULL,
+			CONFIG_SDL_DISPLAY_THREAD_PRIORITY, 0, K_NO_WAIT);
 
 	return 0;
 }
@@ -202,24 +279,62 @@ static void sdl_display_write_mono(uint8_t *disp_buf,
 		one_color = 0x00FFFFFF;
 	}
 
-	for (tile_idx = 0U; tile_idx < desc->height/8U; ++tile_idx) {
-		for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
-			byte_ptr = (const uint8_t *)buf +
-				((tile_idx * desc->pitch) + w_idx);
-			disp_buf_start = disp_buf;
-			for (h_idx = 0U; h_idx < 8; ++h_idx) {
-				if ((*byte_ptr & mono_pixel_order(h_idx)) != 0U)  {
-					pixel = one_color;
-				} else {
-					pixel = ~one_color;
+	if (IS_ENABLED(CONFIG_SDL_DISPLAY_MONO_VTILED)) {
+		for (tile_idx = 0U; tile_idx < desc->height / 8U; ++tile_idx) {
+			for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
+				byte_ptr =
+					(const uint8_t *)buf + ((tile_idx * desc->pitch) + w_idx);
+				disp_buf_start = disp_buf;
+				for (h_idx = 0U; h_idx < 8; ++h_idx) {
+					if ((*byte_ptr & mono_pixel_order(h_idx)) != 0U) {
+						pixel = one_color;
+					} else {
+						pixel = ~one_color;
+					}
+					*((uint32_t *)disp_buf) = pixel | 0xFF000000;
+					disp_buf += (desc->width * 4U);
 				}
-				*((uint32_t *)disp_buf) = pixel | 0xFF000000;
-				disp_buf += (desc->width * 4U);
+				disp_buf = disp_buf_start;
+				disp_buf += 4;
 			}
-			disp_buf = disp_buf_start;
+			disp_buf += 7 * (desc->width * 4U);
+		}
+	} else {
+		for (h_idx = 0; h_idx < desc->height; h_idx++) {
+			for (tile_idx = 0; tile_idx < desc->width / 8; tile_idx++) {
+				byte_ptr = (const uint8_t *)buf +
+					   ((h_idx * desc->width / 8) + tile_idx);
+				for (w_idx = 0; w_idx < 8; w_idx++) {
+					if ((*byte_ptr & mono_pixel_order(w_idx)) != 0U) {
+						pixel = one_color;
+					} else {
+						pixel = ~one_color;
+					}
+					*((uint32_t *)disp_buf + w_idx) = pixel | 0xFF000000;
+				}
+				disp_buf += 8 * sizeof(uint32_t);
+			}
+		}
+	}
+}
+
+static void sdl_display_write_l8(uint8_t *disp_buf, const struct display_buffer_descriptor *desc,
+				 const void *buf)
+{
+	uint32_t w_idx;
+	uint32_t h_idx;
+	uint32_t pixel;
+	const uint8_t *byte_ptr;
+
+	__ASSERT((desc->pitch * desc->height) <= desc->buf_size, "Input buffer too small");
+
+	for (h_idx = 0U; h_idx < desc->height; ++h_idx) {
+		for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
+			byte_ptr = (const uint8_t *)buf + ((h_idx * desc->pitch) + w_idx);
+			pixel = *byte_ptr;
+			*((uint32_t *)disp_buf) = pixel | (pixel << 8) | (pixel << 16) | 0xFF000000;
 			disp_buf += 4;
 		}
-		disp_buf += 7 * (desc->width * 4U);
 	}
 }
 
@@ -230,6 +345,14 @@ static int sdl_display_write(const struct device *dev, const uint16_t x,
 {
 	const struct sdl_display_config *config = dev->config;
 	struct sdl_display_data *disp_data = dev->data;
+	struct sdl_display_task task = {
+		.op = SDL_WRITE,
+		.write = {
+			.x = x,
+			.y = y,
+			.desc = desc,
+		},
+	};
 
 	LOG_DBG("Writing %dx%d (w,h) bitmap @ %dx%d (x,y)", desc->width,
 			desc->height, x, y);
@@ -250,6 +373,7 @@ static int sdl_display_write(const struct device *dev, const uint16_t x,
 		return -EINVAL;
 	}
 
+	k_mutex_lock(&disp_data->task_mutex, K_FOREVER);
 	if (disp_data->current_pixel_format == PIXEL_FORMAT_ARGB_8888) {
 		sdl_display_write_argb8888(disp_data->buf, desc, buf);
 	} else if (disp_data->current_pixel_format == PIXEL_FORMAT_RGB_888) {
@@ -262,12 +386,18 @@ static int sdl_display_write(const struct device *dev, const uint16_t x,
 		sdl_display_write_rgb565(disp_data->buf, desc, buf);
 	} else if (disp_data->current_pixel_format == PIXEL_FORMAT_BGR_565) {
 		sdl_display_write_bgr565(disp_data->buf, desc, buf);
+	} else if (disp_data->current_pixel_format == PIXEL_FORMAT_L_8) {
+		sdl_display_write_l8(disp_data->buf, desc, buf);
+	}
+
+	if (k_current_get() == &disp_data->sdl_thread) {
+		exec_sdl_task(dev, &task);
+	} else {
+		k_msgq_put(disp_data->task_msgq, &task, K_FOREVER);
+		k_sem_take(&disp_data->task_sem, K_FOREVER);
 	}
 
-	sdl_display_write_bottom(desc->height, desc->width, x, y, disp_data->renderer,
-				 disp_data->mutex, disp_data->texture,
-				 disp_data->background_texture, disp_data->buf,
-				 disp_data->display_on, desc->frame_incomplete);
+	k_mutex_unlock(&disp_data->task_mutex);
 
 	return 0;
 }
@@ -388,10 +518,29 @@ static void sdl_display_read_mono(const uint8_t *read_buf,
 	}
 }
 
-static int sdl_display_read(const struct device *dev, const uint16_t x,
-			    const uint16_t y,
-			    const struct display_buffer_descriptor *desc,
-			    void *buf)
+static void sdl_display_read_l8(const uint8_t *read_buf,
+				const struct display_buffer_descriptor *desc, void *buf)
+{
+	uint32_t w_idx;
+	uint32_t h_idx;
+	uint8_t *buf8;
+	const uint32_t *pix_ptr;
+
+	__ASSERT((desc->pitch * desc->height) <= desc->buf_size, "Read buffer is too small");
+
+	for (h_idx = 0U; h_idx < desc->height; ++h_idx) {
+		buf8 = ((uint8_t *)buf) + desc->pitch * h_idx;
+
+		for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
+			pix_ptr = (const uint32_t *)read_buf + ((h_idx * desc->pitch) + w_idx);
+			*buf8 = *pix_ptr & 0xFF;
+			buf8 += 1;
+		}
+	}
+}
+
+static int sdl_display_read(const struct device *dev, const uint16_t x, const uint16_t y,
+			    const struct display_buffer_descriptor *desc, void *buf)
 {
 	struct sdl_display_data *disp_data = dev->data;
 	int err;
@@ -401,6 +550,7 @@ static int sdl_display_read(const struct device *dev, const uint16_t x,
 
 	__ASSERT(desc->width <= desc->pitch, "Pitch is smaller than width");
 
+	k_mutex_lock(&disp_data->task_mutex, K_FOREVER);
 	memset(disp_data->read_buf, 0, desc->pitch * desc->height * 4);
 
 	err = sdl_display_read_bottom(desc->height, desc->width, x, y, disp_data->renderer,
@@ -408,6 +558,7 @@ static int sdl_display_read(const struct device *dev, const uint16_t x,
 				      disp_data->texture, disp_data->read_texture);
 
 	if (err) {
+		k_mutex_unlock(&disp_data->task_mutex);
 		return err;
 	}
 
@@ -423,7 +574,52 @@ static int sdl_display_read(const struct device *dev, const uint16_t x,
 		sdl_display_read_rgb565(disp_data->read_buf, desc, buf);
 	} else if (disp_data->current_pixel_format == PIXEL_FORMAT_BGR_565) {
 		sdl_display_read_bgr565(disp_data->read_buf, desc, buf);
+	} else if (disp_data->current_pixel_format == PIXEL_FORMAT_L_8) {
+		sdl_display_read_l8(disp_data->read_buf, desc, buf);
+	}
+	k_mutex_unlock(&disp_data->task_mutex);
+
+	return 0;
+}
+
+static int sdl_display_clear(const struct device *dev)
+{
+	const struct sdl_display_config *config = dev->config;
+	struct sdl_display_data *disp_data = dev->data;
+	uint8_t bgcolor = 0x00u;
+	size_t size;
+
+	LOG_DBG("Clearing display screen to black");
+
+	switch (disp_data->current_pixel_format) {
+	case PIXEL_FORMAT_ARGB_8888:
+		size = config->width * config->height * 4U;
+		bgcolor = 0xFFu;
+		break;
+	case PIXEL_FORMAT_RGB_888:
+		size = config->width * config->height * 3U;
+		break;
+	case PIXEL_FORMAT_MONO10:
+		size = config->height * DIV_ROUND_UP(config->width,
+						NUM_BITS(uint8_t));
+		break;
+	case PIXEL_FORMAT_MONO01:
+		size = config->height * DIV_ROUND_UP(config->width,
+						NUM_BITS(uint8_t));
+		bgcolor = 0xFFu;
+		break;
+	case PIXEL_FORMAT_RGB_565:
+	case PIXEL_FORMAT_BGR_565:
+		size = config->width * config->height * 2U;
+		break;
+	default:
+		__ASSERT_MSG_INFO("Pixel format not supported");
+		return -EINVAL;
 	}
+	LOG_DBG("size: %zu, bgcolor: %hhu", size, bgcolor);
+	k_mutex_lock(&disp_data->task_mutex, K_FOREVER);
+	memset(disp_data->buf, bgcolor, size);
+	k_mutex_unlock(&disp_data->task_mutex);
 
 	return 0;
 }
@@ -431,13 +627,22 @@ static int sdl_display_read(const struct device *dev, const uint16_t x,
 static int sdl_display_blanking_off(const struct device *dev)
 {
 	struct sdl_display_data *disp_data = dev->data;
+	struct sdl_display_task task = {
+		.op = SDL_BLANKING_OFF,
+	};
 
 	LOG_DBG("Turning display blacking off");
-
 	disp_data->display_on = true;
+	k_mutex_lock(&disp_data->task_mutex, K_FOREVER);
 
-	sdl_display_blanking_off_bottom(disp_data->renderer, disp_data->texture,
-					disp_data->background_texture);
+	if (k_current_get() == &disp_data->sdl_thread) {
+		exec_sdl_task(dev, &task);
+	} else {
+		k_msgq_put(disp_data->task_msgq, &task, K_FOREVER);
+		k_sem_take(&disp_data->task_sem, K_FOREVER);
+	}
+
+	k_mutex_unlock(&disp_data->task_mutex);
 
 	return 0;
 }
@@ -445,12 +650,23 @@ static int sdl_display_blanking_off(const struct device *dev)
 static int sdl_display_blanking_on(const struct device *dev)
 {
 	struct sdl_display_data *disp_data = dev->data;
+	struct sdl_display_task task = {
+		.op = SDL_BLANKING_ON,
+	};
 
 	LOG_DBG("Turning display blanking on");
-
 	disp_data->display_on = false;
+	k_mutex_lock(&disp_data->task_mutex, K_FOREVER);
+
+	if (k_current_get() == &disp_data->sdl_thread) {
+		exec_sdl_task(dev, &task);
+	} else {
+		k_msgq_put(disp_data->task_msgq, &task, K_FOREVER);
+		k_sem_take(&disp_data->task_sem, K_FOREVER);
+	}
+
+	k_mutex_unlock(&disp_data->task_mutex);
 
-	sdl_display_blanking_on_bottom(disp_data->renderer);
 	return 0;
 }
 
@@ -468,9 +684,11 @@ static void sdl_display_get_capabilities(
 		PIXEL_FORMAT_MONO01 |
 		PIXEL_FORMAT_MONO10 |
 		PIXEL_FORMAT_RGB_565 |
-		PIXEL_FORMAT_BGR_565;
+		PIXEL_FORMAT_BGR_565 |
+		PIXEL_FORMAT_L_8;
 	capabilities->current_pixel_format = disp_data->current_pixel_format;
-	capabilities->screen_info = SCREEN_INFO_MONO_VTILED |
+	capabilities->screen_info =
+		(IS_ENABLED(CONFIG_SDL_DISPLAY_MONO_VTILED) ? SCREEN_INFO_MONO_VTILED : 0) |
 		(IS_ENABLED(CONFIG_SDL_DISPLAY_MONO_MSB_FIRST) ? SCREEN_INFO_MONO_MSB_FIRST : 0);
 }
 
@@ -486,6 +704,7 @@ static int sdl_display_set_pixel_format(const struct device *dev,
 	case PIXEL_FORMAT_MONO10:
 	case PIXEL_FORMAT_RGB_565:
 	case PIXEL_FORMAT_BGR_565:
+	case PIXEL_FORMAT_L_8:
 		disp_data->current_pixel_format = pixel_format;
 		return 0;
 	default:
@@ -506,6 +725,7 @@ static DEVICE_API(display, sdl_display_api) = {
 	.blanking_off = sdl_display_blanking_off,
 	.write = sdl_display_write,
 	.read = sdl_display_read,
+	.clear = sdl_display_clear,
 	.get_capabilities = sdl_display_get_capabilities,
 	.set_pixel_format = sdl_display_set_pixel_format,
 };
@@ -520,9 +740,11 @@ static DEVICE_API(display, sdl_display_api) = {
 				   * DT_INST_PROP(n, width)];		\
 	static uint8_t sdl_read_buf_##n[4 * DT_INST_PROP(n, height)	\
 					* DT_INST_PROP(n, width)];	\
+	K_MSGQ_DEFINE(sdl_task_msgq_##n, sizeof(struct sdl_display_task), 1, 4); \
 	static struct sdl_display_data sdl_data_##n = {			\
 		.buf = sdl_buf_##n,					\
 		.read_buf = sdl_read_buf_##n,				\
+		.task_msgq = &sdl_task_msgq_##n,			\
 	};								\
 									\
 	DEVICE_DT_INST_DEFINE(n, &sdl_display_init, NULL,		\
diff --git a/drivers/display/display_sdl_bottom.c b/drivers/display/display_sdl_bottom.c
index e7b259cda095b..da50ad81c91d8 100644
--- a/drivers/display/display_sdl_bottom.c
+++ b/drivers/display/display_sdl_bottom.c
@@ -14,10 +14,10 @@
 #include "nsi_tracing.h"
 
 int sdl_display_init_bottom(uint16_t height, uint16_t width, uint16_t zoom_pct,
-			    bool use_accelerator, void **window, void **renderer, void **mutex,
-			    void **texture, void **read_texture, void **background_texture,
-			    uint32_t transparency_grid_color1, uint32_t transparency_grid_color2,
-			    uint16_t transparency_grid_cell_size)
+			    bool use_accelerator, void **window, const void *window_user_data,
+			    void **renderer, void **mutex, void **texture, void **read_texture,
+			    void **background_texture, uint32_t transparency_grid_color1,
+			    uint32_t transparency_grid_color2, uint16_t transparency_grid_cell_size)
 {
 	*window = SDL_CreateWindow("Zephyr Display", SDL_WINDOWPOS_UNDEFINED,
 				   SDL_WINDOWPOS_UNDEFINED, width * zoom_pct / 100,
@@ -26,6 +26,7 @@ int sdl_display_init_bottom(uint16_t height, uint16_t width, uint16_t zoom_pct,
 		nsi_print_warning("Failed to create SDL window: %s", SDL_GetError());
 		return -1;
 	}
+	SDL_SetWindowData(*window, "zephyr_display", (void *)window_user_data);
 
 	if (use_accelerator) {
 		*renderer = SDL_CreateRenderer(*window, -1, SDL_RENDERER_ACCELERATED);
diff --git a/drivers/display/display_sdl_bottom.h b/drivers/display/display_sdl_bottom.h
index 16a6a2ce603f3..4ce795f64e309 100644
--- a/drivers/display/display_sdl_bottom.h
+++ b/drivers/display/display_sdl_bottom.h
@@ -21,9 +21,10 @@ extern "C" {
 /* Note: None of these functions are public interfaces. But internal to the SDL display driver */
 
 int sdl_display_init_bottom(uint16_t height, uint16_t width, uint16_t zoom_pct,
-			    bool use_accelerator, void **window, void **renderer, void **mutex,
-			    void **texture, void **read_texture, void **background_texture,
-			    uint32_t transparency_grid_color1, uint32_t transparency_grid_color2,
+			    bool use_accelerator, void **window, const void *window_user_data,
+			    void **renderer, void **mutex, void **texture, void **read_texture,
+			    void **background_texture, uint32_t transparency_grid_color1,
+			    uint32_t transparency_grid_color2,
 			    uint16_t transparency_grid_cell_size);
 void sdl_display_write_bottom(const uint16_t height, const uint16_t width, const uint16_t x,
 			      const uint16_t y, void *renderer, void *mutex, void *texture,
diff --git a/drivers/display/display_st7567.c b/drivers/display/display_st7567.c
new file mode 100644
index 0000000000000..15491f0561845
--- /dev/null
+++ b/drivers/display/display_st7567.c
@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(display_st7567, CONFIG_DISPLAY_LOG_LEVEL);
+
+#include <string.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+
+#include "display_st7567_regs.h"
+
+union st7567_bus {
+	struct i2c_dt_spec i2c;
+	struct spi_dt_spec spi;
+};
+
+typedef bool (*st7567_bus_ready_fn)(const struct device *dev);
+typedef int (*st7567_write_bus_fn)(const struct device *dev, uint8_t *buf, size_t len,
+				   bool command);
+typedef const char *(*st7567_bus_name_fn)(const struct device *dev);
+
+struct st7567_config {
+	union st7567_bus bus;
+	struct gpio_dt_spec data_cmd;
+	struct gpio_dt_spec reset;
+	st7567_bus_ready_fn bus_ready;
+	st7567_write_bus_fn write_bus;
+	st7567_bus_name_fn bus_name;
+	uint16_t height;
+	uint16_t width;
+	uint8_t column_offset;
+	uint8_t line_offset;
+	uint8_t regulation_ratio;
+	bool com_invdir;
+	bool segment_invdir;
+	bool inversion_on;
+	bool bias;
+};
+
+struct st7567_data {
+	enum display_pixel_format pf;
+};
+
+#if DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(sitronix_st7567, i2c)
+
+static bool st7567_bus_ready_i2c(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+
+	return i2c_is_ready_dt(&config->bus.i2c);
+}
+
+static int st7567_write_bus_i2c(const struct device *dev, uint8_t *buf, size_t len, bool command)
+{
+	const struct st7567_config *config = dev->config;
+
+	return i2c_burst_write_dt(
+		&config->bus.i2c,
+		command ? ST7567_CONTROL_ALL_BYTES_CMD : ST7567_CONTROL_ALL_BYTES_DATA, buf, len);
+}
+
+static const char *st7567_bus_name_i2c(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+
+	return config->bus.i2c.bus->name;
+}
+
+#endif
+
+#if DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(sitronix_st7567, spi)
+
+static bool st7567_bus_ready_spi(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+
+	if (gpio_pin_configure_dt(&config->data_cmd, GPIO_OUTPUT_INACTIVE) < 0) {
+		return false;
+	}
+
+	return spi_is_ready_dt(&config->bus.spi);
+}
+
+static int st7567_write_bus_spi(const struct device *dev, uint8_t *buf, size_t len, bool command)
+{
+	const struct st7567_config *config = dev->config;
+	int ret;
+
+	gpio_pin_set_dt(&config->data_cmd, command ? 0 : 1);
+	struct spi_buf tx_buf = {.buf = buf, .len = len};
+
+	struct spi_buf_set tx_bufs = {.buffers = &tx_buf, .count = 1};
+
+	ret = spi_write_dt(&config->bus.spi, &tx_bufs);
+
+	return ret;
+}
+
+static const char *st7567_bus_name_spi(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+
+	return config->bus.spi.bus->name;
+}
+
+#endif
+
+static inline bool st7567_bus_ready(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+
+	return config->bus_ready(dev);
+}
+
+static inline int st7567_write_bus(const struct device *dev, uint8_t *buf, size_t len, bool command)
+{
+	const struct st7567_config *config = dev->config;
+
+	return config->write_bus(dev, buf, len, command);
+}
+
+static inline int st7567_set_panel_orientation(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+	uint8_t cmd_buf[] = {(config->segment_invdir ? ST7567_SET_SEGMENT_MAP_FLIPPED
+						     : ST7567_SET_SEGMENT_MAP_NORMAL),
+			     (config->com_invdir ? ST7567_SET_COM_OUTPUT_SCAN_FLIPPED
+						 : ST7567_SET_COM_OUTPUT_SCAN_NORMAL)};
+
+	return st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+}
+
+static inline int st7567_set_hardware_config(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+	int ret;
+	uint8_t cmd_buf[1];
+
+	cmd_buf[0] = ST7567_SET_BIAS | (config->bias ? 1 : 0);
+	ret = st7567_write_bus(dev, cmd_buf, 1, true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	cmd_buf[0] = ST7567_POWER_CONTROL | ST7567_POWER_CONTROL_VB;
+	ret = st7567_write_bus(dev, cmd_buf, 1, true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	cmd_buf[0] = ST7567_POWER_CONTROL | ST7567_POWER_CONTROL_VB | ST7567_POWER_CONTROL_VR;
+	ret = st7567_write_bus(dev, cmd_buf, 1, true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	cmd_buf[0] = ST7567_POWER_CONTROL | ST7567_POWER_CONTROL_VB | ST7567_POWER_CONTROL_VR |
+		     ST7567_POWER_CONTROL_VF;
+	ret = st7567_write_bus(dev, cmd_buf, 1, true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	cmd_buf[0] = ST7567_SET_REGULATION_RATIO | (config->regulation_ratio & 0x7);
+	ret = st7567_write_bus(dev, cmd_buf, 1, true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	cmd_buf[0] = ST7567_LINE_SCROLL | (config->line_offset & 0x3F);
+	ret = st7567_write_bus(dev, cmd_buf, 1, true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return ret;
+}
+
+static int st7567_resume(const struct device *dev)
+{
+	uint8_t cmd_buf[] = {
+		ST7567_DISPLAY_ALL_PIXEL_NORMAL,
+		ST7567_DISPLAY_ON,
+	};
+
+	return st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+}
+
+static int st7567_suspend(const struct device *dev)
+{
+	uint8_t cmd_buf[] = {
+		ST7567_DISPLAY_OFF,
+		ST7567_DISPLAY_ALL_PIXEL_ON,
+	};
+
+	return st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+}
+
+static int st7567_write_default(const struct device *dev, const uint16_t x, const uint16_t y,
+				const struct display_buffer_descriptor *desc, const void *buf,
+				const size_t buf_len)
+{
+	int ret;
+	uint8_t cmd_buf[3];
+
+	for (int i = 0; i < desc->height / 8; i++) {
+		cmd_buf[0] = ST7567_COLUMN_LSB | (x & 0xF);
+		cmd_buf[1] = ST7567_COLUMN_MSB | ((x >> 4) & 0xF);
+		cmd_buf[2] = ST7567_PAGE | ((y >> 3) + i);
+		ret = st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+		if (ret < 0) {
+			return ret;
+		}
+		ret = st7567_write_bus(dev, ((uint8_t *)buf + i * desc->pitch), desc->pitch, false);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+
+	return ret;
+}
+
+static int st7567_write(const struct device *dev, const uint16_t x, const uint16_t y,
+			const struct display_buffer_descriptor *desc, const void *buf)
+{
+	size_t buf_len;
+
+	if (desc->pitch < desc->width) {
+		LOG_ERR("Pitch is smaller than width");
+		return -EINVAL;
+	}
+
+	buf_len = MIN(desc->buf_size, desc->height * desc->width / 8);
+	if (buf == NULL || buf_len == 0U) {
+		LOG_ERR("Display buffer is not available");
+		return -EINVAL;
+	}
+
+	if (desc->pitch > desc->width) {
+		LOG_ERR("Unsupported mode");
+		return -EINVAL;
+	}
+
+	if ((y & 0x7) != 0U) {
+		LOG_ERR("Y coordinate must be aligned on page boundary");
+		return -EINVAL;
+	}
+
+	LOG_DBG("x %u, y %u, pitch %u, width %u, height %u, buf_len %u", x, y, desc->pitch,
+		desc->width, desc->height, buf_len);
+
+	return st7567_write_default(dev, x, y, desc, buf, buf_len);
+}
+
+static int st7567_set_contrast(const struct device *dev, const uint8_t contrast)
+{
+	uint8_t cmd_buf[] = {
+		ST7567_SET_CONTRAST_CTRL,
+		contrast,
+	};
+
+	return st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+}
+
+static void st7567_get_capabilities(const struct device *dev, struct display_capabilities *caps)
+{
+	const struct st7567_config *config = dev->config;
+	struct st7567_data *data = dev->data;
+
+	caps->x_resolution = config->width;
+	caps->y_resolution = config->height;
+	caps->supported_pixel_formats = PIXEL_FORMAT_MONO10 | PIXEL_FORMAT_MONO01;
+	caps->current_pixel_format = data->pf;
+	caps->screen_info = SCREEN_INFO_MONO_VTILED;
+	caps->current_orientation = DISPLAY_ORIENTATION_NORMAL;
+}
+
+static int st7567_set_pixel_format(const struct device *dev, const enum display_pixel_format pf)
+{
+	struct st7567_data *data = dev->data;
+	const struct st7567_config *config = dev->config;
+	uint8_t cmd;
+	int ret;
+
+	if (pf == data->pf) {
+		return 0;
+	}
+
+	if (pf == PIXEL_FORMAT_MONO10) {
+		cmd = config->inversion_on ? ST7567_SET_REVERSE_DISPLAY : ST7567_SET_NORMAL_DISPLAY;
+	} else if (pf == PIXEL_FORMAT_MONO01) {
+		cmd = config->inversion_on ? ST7567_SET_NORMAL_DISPLAY : ST7567_SET_REVERSE_DISPLAY;
+	} else {
+		LOG_WRN("Unsupported pixel format");
+		return -ENOTSUP;
+	}
+
+	ret = st7567_write_bus(dev, &cmd, 1, true);
+	if (ret) {
+		LOG_WRN("Couldn't set inversion");
+		return ret;
+	}
+
+	data->pf = pf;
+
+	return 0;
+}
+
+static int st7567_reset(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+	uint8_t cmd_buf[] = {
+		ST7567_DISPLAY_OFF,
+		(config->inversion_on ? ST7567_SET_REVERSE_DISPLAY : ST7567_SET_NORMAL_DISPLAY),
+	};
+
+	/* Reset if pin connected */
+	if (config->reset.port) {
+		k_sleep(K_MSEC(ST7567_RESET_DELAY));
+		gpio_pin_set_dt(&config->reset, 1);
+		k_sleep(K_MSEC(ST7567_RESET_DELAY));
+		gpio_pin_set_dt(&config->reset, 0);
+		k_sleep(K_MSEC(ST7567_RESET_DELAY));
+	}
+
+	return st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+}
+
+static int st7567_clear(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+	int ret;
+	uint8_t buf = 0;
+
+	uint8_t cmd_buf[] = {
+		ST7567_COLUMN_LSB,
+		ST7567_COLUMN_MSB,
+		ST7567_PAGE,
+	};
+
+	for (int y = 0; y < config->height; y += 8) {
+		for (int x = 0; x < config->width; x++) {
+			cmd_buf[0] = ST7567_COLUMN_LSB | (x & 0xF);
+			cmd_buf[1] = ST7567_COLUMN_MSB | ((x >> 4) & 0xF);
+			cmd_buf[2] = ST7567_PAGE | (y >> 3);
+			ret = st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+			if (ret < 0) {
+				LOG_ERR("Error clearing display");
+				return ret;
+			}
+			ret = st7567_write_bus(dev, (uint8_t *)&buf, 1, false);
+			if (ret < 0) {
+				LOG_ERR("Error clearing display");
+				return ret;
+			}
+		}
+	}
+	return ret;
+}
+
+static int st7567_init_device(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+	struct st7567_data *data = dev->data;
+	int ret;
+	uint8_t cmd_buf[] = {
+		ST7567_DISPLAY_OFF,
+		(config->inversion_on ? ST7567_SET_REVERSE_DISPLAY : ST7567_SET_NORMAL_DISPLAY),
+	};
+
+	ret = st7567_reset(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = st7567_suspend(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = st7567_set_hardware_config(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = st7567_set_panel_orientation(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Set inversion */
+	ret = st7567_write_bus(dev, cmd_buf, sizeof(cmd_buf), true);
+	if (ret < 0) {
+		return ret;
+	}
+
+	data->pf = config->inversion_on ? PIXEL_FORMAT_MONO10 : PIXEL_FORMAT_MONO01;
+
+	ret = st7567_set_contrast(dev, CONFIG_ST7567_DEFAULT_CONTRAST);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Clear display, RAM is undefined at power up */
+	ret = st7567_clear(dev);
+	if (ret < 0) {
+		return ret;
+	}
+	ret = st7567_resume(dev);
+
+	return ret;
+}
+
+static int st7567_init(const struct device *dev)
+{
+	const struct st7567_config *config = dev->config;
+	int ret;
+
+	if (!st7567_bus_ready(dev)) {
+		LOG_ERR("Bus device %s not ready!", config->bus_name(dev));
+		return -EINVAL;
+	}
+
+	if (config->reset.port) {
+		ret = gpio_pin_configure_dt(&config->reset, GPIO_OUTPUT_INACTIVE);
+		if (ret < 0) {
+			LOG_ERR("Couldn't configure reset pin");
+			return ret;
+		}
+		if (!gpio_is_ready_dt(&config->reset)) {
+			LOG_ERR("Reset GPIO device not ready");
+			return -ENODEV;
+		}
+	}
+
+	if (st7567_init_device(dev)) {
+		LOG_ERR("Failed to initialize device!");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(display, st7567_driver_api) = {
+	.blanking_on = st7567_suspend,
+	.blanking_off = st7567_resume,
+	.write = st7567_write,
+	.set_contrast = st7567_set_contrast,
+	.get_capabilities = st7567_get_capabilities,
+	.set_pixel_format = st7567_set_pixel_format,
+};
+
+#define ST7567_CONFIG_SPI(node_id)                                                                 \
+	.bus = {.spi = SPI_DT_SPEC_GET(                                                            \
+			node_id, SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB | SPI_WORD_SET(8), 0)},     \
+	.bus_ready = st7567_bus_ready_spi, .write_bus = st7567_write_bus_spi,                      \
+	.bus_name = st7567_bus_name_spi, .data_cmd = GPIO_DT_SPEC_GET(node_id, data_cmd_gpios),
+
+#define ST7567_CONFIG_I2C(node_id)                                                                 \
+	.bus = {.i2c = I2C_DT_SPEC_GET(node_id)}, .bus_ready = st7567_bus_ready_i2c,               \
+	.write_bus = st7567_write_bus_i2c, .bus_name = st7567_bus_name_i2c, .data_cmd = {0},
+
+#define ST7567_DEFINE(node_id)                                                                     \
+	static struct st7567_data data##node_id;                                                   \
+	static const struct st7567_config config##node_id = {                                      \
+		.reset = GPIO_DT_SPEC_GET_OR(node_id, reset_gpios, {0}),                           \
+		.height = DT_PROP(node_id, height),                                                \
+		.width = DT_PROP(node_id, width),                                                  \
+		.column_offset = DT_PROP(node_id, column_offset),                                  \
+		.line_offset = DT_PROP(node_id, line_offset),                                      \
+		.segment_invdir = DT_PROP(node_id, segment_invdir),                                \
+		.com_invdir = DT_PROP(node_id, com_invdir),                                        \
+		.inversion_on = DT_PROP(node_id, inversion_on),                                    \
+		.bias = DT_PROP(node_id, bias),                                                    \
+		.regulation_ratio = DT_PROP(node_id, regulation_ratio),                            \
+		COND_CODE_1(DT_ON_BUS(node_id, spi), (ST7567_CONFIG_SPI(node_id)),                 \
+			    (ST7567_CONFIG_I2C(node_id))) }; \
+                                                                                                   \
+	DEVICE_DT_DEFINE(node_id, st7567_init, NULL, &data##node_id, &config##node_id,             \
+			 POST_KERNEL, CONFIG_DISPLAY_INIT_PRIORITY, &st7567_driver_api);
+
+DT_FOREACH_STATUS_OKAY(sitronix_st7567, ST7567_DEFINE)
diff --git a/drivers/display/display_st7567_regs.h b/drivers/display/display_st7567_regs.h
new file mode 100644
index 0000000000000..e963e3cf49091
--- /dev/null
+++ b/drivers/display/display_st7567_regs.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __DISPLAY_ST7567_REGS_H__
+#define __DISPLAY_ST7567_REGS_H__
+
+/* All following bytes will contain commands */
+#define ST7567_CONTROL_ALL_BYTES_CMD     0x00
+/* All following bytes will contain data */
+#define ST7567_CONTROL_ALL_BYTES_DATA    0x40
+/* The next byte will contain a command, then expect another control byte */
+#define ST7567_CONTROL_CONTINUE_BYTE_CMD 0x80
+
+#define ST7567_DISPLAY_OFF              0xAE
+#define ST7567_DISPLAY_ON               0xAF
+#define ST7567_DISPLAY_ALL_PIXEL_ON     0xA5
+#define ST7567_DISPLAY_ALL_PIXEL_NORMAL 0xA4
+#define ST7567_SET_CONTRAST_CTRL        0x81
+#define ST7567_SET_BIAS                 0xA2
+#define ST7567_SET_REGULATION_RATIO     0x20
+
+/* Inversion controls */
+#define ST7567_SET_NORMAL_DISPLAY  0xA6
+#define ST7567_SET_REVERSE_DISPLAY 0xA7
+
+/* COM invdir */
+#define ST7567_SET_COM_OUTPUT_SCAN_FLIPPED 0xC8
+#define ST7567_SET_COM_OUTPUT_SCAN_NORMAL  0xC0
+
+/* SEG invdir */
+#define ST7567_SET_SEGMENT_MAP_FLIPPED 0xA1
+#define ST7567_SET_SEGMENT_MAP_NORMAL  0xA0
+
+/* Power Control */
+#define ST7567_POWER_CONTROL    0x28
+#define ST7567_POWER_CONTROL_VF 0x1
+#define ST7567_POWER_CONTROL_VR 0x2
+#define ST7567_POWER_CONTROL_VB 0x4
+
+/* Offsets */
+#define ST7567_COLUMN_MSB  0x10
+#define ST7567_COLUMN_LSB  0x0
+#define ST7567_PAGE        0xB0
+#define ST7567_LINE_SCROLL 0x40
+
+#define ST7567_RESET_DELAY 1
+#define ST7567_RESET       0xE2
+
+#endif /* __DISPLAY_ST7567_REGS_H__ */
diff --git a/drivers/display/display_st7701.c b/drivers/display/display_st7701.c
new file mode 100644
index 0000000000000..22fc96c1bf0ff
--- /dev/null
+++ b/drivers/display/display_st7701.c
@@ -0,0 +1,494 @@
+/*
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT sitronix_st7701
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/mipi_dsi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(st7701, CONFIG_DISPLAY_LOG_LEVEL);
+
+/* Command2 BKx selection command */
+#define DSI_CMD2BKX_SEL      0xFF
+#define DSI_CMD2BK1_SEL      0x11
+#define DSI_CMD2BK0_SEL      0x10
+#define DSI_CMD2BKX_SEL_NONE 0x00
+
+/* Command2, BK0 commands */
+#define DSI_CMD2_BK0_PVGAMCTRL 0xB0 /* Positive Voltage Gamma Control */
+#define DSI_CMD2_BK0_NVGAMCTRL 0xB1 /* Negative Voltage Gamma Control */
+#define DSI_CMD2_BK0_LNESET    0xC0 /* Display Line setting */
+#define DSI_CMD2_BK0_PORCTRL   0xC1 /* Porch control */
+#define DSI_CMD2_BK0_INVSEL    0xC2 /* Inversion selection, Frame Rate Control */
+
+/* Command2, BK1 commands */
+#define DSI_CMD2_BK1_VRHS     0xB0 /* Vop amplitude setting */
+#define DSI_CMD2_BK1_VCOM     0xB1 /* VCOM amplitude setting */
+#define DSI_CMD2_BK1_VGHSS    0xB2 /* VGH Voltage setting */
+#define DSI_CMD2_BK1_TESTCMD  0xB3 /* TEST Command Setting */
+#define DSI_CMD2_BK1_VGLS     0xB5 /* VGL Voltage setting */
+#define DSI_CMD2_BK1_PWCTLR1  0xB7 /* Power Control 1 */
+#define DSI_CMD2_BK1_PWCTLR2  0xB8 /* Power Control 2 */
+#define DSI_CMD2_BK1_SPD1     0xC1 /* Source pre_drive timing set1 */
+#define DSI_CMD2_BK1_SPD2     0xC2 /* Source EQ2 Setting */
+#define DSI_CMD2_BK1_MIPISET1 0xD0 /* MIPI Setting 1 */
+
+#define ST7701_CMD_ID1 0xDA
+#define ST7701_ID      0xFF
+
+/* Write Control Display: brightness control. */
+#define ST7701_WRCTRLD_BCTRL BIT(5)
+/* Write Control Display: display dimming. */
+#define ST7701_WRCTRLD_DD    BIT(3)
+/* Write Control Display: backlight. */
+#define ST7701_WRCTRLD_BL    BIT(2)
+
+/* Adaptive Brightness Control: off. */
+#define ST7701_WRCABC_OFF 0x00U
+/* Adaptive Brightness Control: user interface. */
+#define ST7701_WRCABC_UI  0x01U
+/* Adaptive Brightness Control: still picture. */
+#define ST7701_WRCABC_ST  0x02U
+/* Adaptive Brightness Control: moving image. */
+#define ST7701_WRCABC_MV  0x03U
+
+struct st7701_config {
+	const struct device *mipi_dsi;
+	const struct gpio_dt_spec reset;
+	const struct gpio_dt_spec backlight;
+	uint8_t data_lanes;
+	uint16_t width;
+	uint16_t height;
+	uint8_t channel;
+	uint16_t rotation;
+	uint32_t hbp;
+	uint32_t hsync;
+	uint32_t hfp;
+	uint32_t vbp;
+	uint32_t vsync;
+	uint32_t vfp;
+	uint8_t gip_e0[4];
+	uint8_t gip_e1[12];
+	uint8_t gip_e2[14];
+	uint8_t gip_e3[5];
+	uint8_t gip_e4[3];
+	uint8_t gip_e5[17];
+	uint8_t gip_e6[5];
+	uint8_t gip_e7[3];
+	uint8_t gip_e8[17];
+	uint8_t gip_eb[8];
+	uint8_t gip_ec[3];
+	uint8_t gip_ed[17];
+	uint8_t pvgamctrl[17];
+	uint8_t nvgamctrl[17];
+};
+
+struct st7701_data {
+	uint16_t xres;
+	uint16_t yres;
+	uint8_t dsi_pixel_format;
+	enum display_pixel_format pixel_format;
+	enum display_orientation orientation;
+};
+
+static inline int st7701_dcs_write(const struct device *dev, uint8_t cmd, const void *buf,
+				   size_t len)
+{
+	const struct st7701_config *cfg = dev->config;
+	int ret;
+
+	ret = mipi_dsi_dcs_write(cfg->mipi_dsi, cfg->channel, cmd, buf, len);
+	if (ret < 0) {
+		LOG_ERR("DCS 0x%x write failed! (%d)", cmd, ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int st7701_short_write_1p(const struct device *dev, uint8_t cmd, uint8_t val)
+{
+	const struct st7701_config *cfg = dev->config;
+	int ret;
+	uint8_t buf[] = {cmd, val};
+
+	ret = mipi_dsi_generic_write(cfg->mipi_dsi, cfg->channel, buf, sizeof(val));
+	if (ret < 0) {
+		LOG_ERR("Short write failed! (%d)", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int st7701_generic_write(const struct device *dev, const void *buf, size_t len)
+{
+	const struct st7701_config *cfg = dev->config;
+	int ret;
+
+	ret = mipi_dsi_generic_write(cfg->mipi_dsi, cfg->channel, buf, len);
+	if (ret < 0) {
+		LOG_ERR("Generic write failed! (%d)", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int st7701_check_id(const struct device *dev)
+{
+	const struct st7701_config *cfg = dev->config;
+	uint32_t id = 0;
+	int ret;
+
+	ret = mipi_dsi_dcs_read(cfg->mipi_dsi, cfg->channel, ST7701_CMD_ID1, &id, sizeof(id));
+	if (ret != sizeof(id)) {
+		LOG_ERR("Read panel ID failed! (%d)", ret);
+		return -EIO;
+	}
+
+	if (id != ST7701_ID) {
+		LOG_ERR("ID 0x%x (should 0x%x)", id, ST7701_ID);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int st7701_configure(const struct device *dev)
+{
+	struct st7701_data *data = dev->data;
+	const struct st7701_config *cfg = dev->config;
+	uint8_t buf[4];
+	int ret;
+
+	const uint8_t ff1[] = {DSI_CMD2BKX_SEL, 0x77, 0x01, 0x00, 0x00, DSI_CMD2BK1_SEL};
+	const uint8_t ff2[] = {DSI_CMD2BKX_SEL, 0x77, 0x01, 0x00, 0x00, DSI_CMD2BKX_SEL_NONE};
+
+	const uint8_t control0[] = {DSI_CMD2BKX_SEL, 0x77, 0x01, 0x00, 0x00, DSI_CMD2BK0_SEL};
+	const uint8_t control1[] = {0xC0, 0x63, 0x00};
+	const uint8_t control2[] = {0xC1, 0x11, 0x02};
+	const uint8_t control3[] = {0xC2, 0x01, 0x08};
+	const uint8_t control4[] = {0xCC, 0x18};
+
+	st7701_generic_write(dev, control0, sizeof(control0));
+	st7701_generic_write(dev, control1, sizeof(control1));
+	st7701_generic_write(dev, control2, sizeof(control2));
+	st7701_generic_write(dev, control3, sizeof(control3));
+	st7701_generic_write(dev, control4, sizeof(control4));
+
+	/* Gamma Cluster Setting */
+	st7701_generic_write(dev, cfg->pvgamctrl, sizeof(cfg->pvgamctrl));
+	st7701_generic_write(dev, cfg->nvgamctrl, sizeof(cfg->nvgamctrl));
+
+	/* Initial power control registers */
+	st7701_generic_write(dev, ff1, sizeof(ff1));
+
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_VRHS, 0x65);
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_VCOM, 0x34);
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_VGHSS, 0x87);
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_TESTCMD, 0x80);
+
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_VGLS, 0x49);
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_PWCTLR1, 0x85);
+
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_PWCTLR2, 0x20);
+	st7701_short_write_1p(dev, 0xB9, 0x10);
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_SPD1, 0x78);
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_SPD2, 0x78);
+	st7701_short_write_1p(dev, DSI_CMD2_BK1_MIPISET1, 0x88);
+	k_msleep(100);
+
+	/* GIP Setting */
+	st7701_generic_write(dev, cfg->gip_e0, sizeof(cfg->gip_e0));
+	st7701_generic_write(dev, cfg->gip_e1, sizeof(cfg->gip_e1));
+	st7701_generic_write(dev, cfg->gip_e2, sizeof(cfg->gip_e2));
+	st7701_generic_write(dev, cfg->gip_e3, sizeof(cfg->gip_e3));
+	st7701_generic_write(dev, cfg->gip_e4, sizeof(cfg->gip_e4));
+	st7701_generic_write(dev, cfg->gip_e5, sizeof(cfg->gip_e5));
+	st7701_generic_write(dev, cfg->gip_e6, sizeof(cfg->gip_e6));
+	st7701_generic_write(dev, cfg->gip_e7, sizeof(cfg->gip_e7));
+	st7701_generic_write(dev, cfg->gip_e8, sizeof(cfg->gip_e8));
+	st7701_generic_write(dev, cfg->gip_eb, sizeof(cfg->gip_eb));
+	st7701_generic_write(dev, cfg->gip_ec, sizeof(cfg->gip_ec));
+	st7701_generic_write(dev, cfg->gip_ed, sizeof(cfg->gip_ed));
+
+	/* Bank1 setting */
+	st7701_generic_write(dev, ff2, sizeof(ff2));
+
+	/* Exit sleep mode */
+	ret = st7701_dcs_write(dev, MIPI_DCS_EXIT_SLEEP_MODE, NULL, 0);
+	if (ret < 0) {
+		return ret;
+	}
+
+	k_msleep(50);
+
+	/* Set pixel color format */
+	switch (data->dsi_pixel_format) {
+	case MIPI_DSI_PIXFMT_RGB565:
+		buf[0] = MIPI_DCS_PIXEL_FORMAT_16BIT;
+		break;
+	case MIPI_DSI_PIXFMT_RGB888:
+		buf[0] = MIPI_DCS_PIXEL_FORMAT_24BIT;
+		break;
+	default:
+		LOG_ERR("Unsupported pixel format 0x%x!", data->dsi_pixel_format);
+		return -ENOTSUP;
+	}
+
+	ret = st7701_dcs_write(dev, MIPI_DCS_SET_PIXEL_FORMAT, buf, 1);
+	if (ret < 0) {
+		return ret;
+	}
+
+	buf[0] = 0x00;
+	buf[1] = 0x00;
+	sys_put_be16(data->xres, (uint8_t *)&buf[2]);
+	ret = st7701_dcs_write(dev, MIPI_DCS_SET_COLUMN_ADDRESS, buf, 4);
+	if (ret < 0) {
+		return ret;
+	}
+
+	buf[0] = 0x00;
+	buf[1] = 0x00;
+	sys_put_be16(data->yres, (uint8_t *)&buf[2]);
+	ret = st7701_dcs_write(dev, MIPI_DCS_SET_PAGE_ADDRESS, buf, 4);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Backlight control */
+	buf[0] = ST7701_WRCTRLD_BCTRL | ST7701_WRCTRLD_DD | ST7701_WRCTRLD_BL;
+	ret = st7701_dcs_write(dev, MIPI_DCS_WRITE_CONTROL_DISPLAY, buf, 1);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Adaptive brightness control */
+	buf[0] = ST7701_WRCABC_UI;
+	ret = st7701_dcs_write(dev, MIPI_DCS_WRITE_POWER_SAVE, buf, 1);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Adaptive brightness control minimum brightness */
+	buf[0] = 0xFF;
+	ret = st7701_dcs_write(dev, MIPI_DCS_SET_CABC_MIN_BRIGHTNESS, buf, 1);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Brightness */
+	buf[0] = 0xFF;
+	ret = st7701_dcs_write(dev, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, buf, 1);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Display On */
+	ret = st7701_dcs_write(dev, MIPI_DCS_SET_DISPLAY_ON, NULL, 0);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int st7701_blanking_on(const struct device *dev)
+{
+	const struct st7701_config *cfg = dev->config;
+	int ret;
+
+	if (cfg->backlight.port != NULL) {
+		ret = gpio_pin_set_dt(&cfg->backlight, 0);
+		if (ret) {
+			LOG_ERR("Disable backlight failed! (%d)", ret);
+			return ret;
+		}
+	}
+
+	return st7701_dcs_write(dev, MIPI_DCS_SET_DISPLAY_OFF, NULL, 0);
+}
+
+static int st7701_blanking_off(const struct device *dev)
+{
+	const struct st7701_config *cfg = dev->config;
+	int ret;
+
+	if (cfg->backlight.port != NULL) {
+		ret = gpio_pin_set_dt(&cfg->backlight, 1);
+		if (ret) {
+			LOG_ERR("Enable backlight failed! (%d)", ret);
+			return ret;
+		}
+	}
+
+	return st7701_dcs_write(dev, MIPI_DCS_SET_DISPLAY_ON, NULL, 0);
+}
+
+static int st7701_set_brightness(const struct device *dev, uint8_t brightness)
+{
+	return st7701_dcs_write(dev, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, &brightness, 1);
+}
+
+static void st7701_get_capabilities(const struct device *dev,
+				    struct display_capabilities *capabilities)
+{
+	const struct st7701_config *cfg = dev->config;
+	struct st7701_data *data = dev->data;
+
+	if (!capabilities) {
+		return;
+	}
+
+	memset(capabilities, 0, sizeof(struct display_capabilities));
+	capabilities->x_resolution = cfg->width;
+	capabilities->y_resolution = cfg->height;
+	capabilities->supported_pixel_formats = data->pixel_format;
+	capabilities->current_pixel_format = data->pixel_format;
+	capabilities->current_orientation = data->orientation;
+}
+
+static DEVICE_API(display, st7701_api) = {
+	.blanking_on = st7701_blanking_on,
+	.blanking_off = st7701_blanking_off,
+	.set_brightness = st7701_set_brightness,
+	.get_capabilities = st7701_get_capabilities,
+};
+
+static int st7701_init(const struct device *dev)
+{
+	const struct st7701_config *cfg = dev->config;
+	struct st7701_data *data = dev->data;
+	struct mipi_dsi_device mdev;
+	int ret;
+
+	if (cfg->reset.port) {
+		if (!gpio_is_ready_dt(&cfg->reset)) {
+			LOG_ERR("Reset GPIO device is not ready!");
+			return -ENODEV;
+		}
+
+		ret = gpio_pin_configure_dt(&cfg->reset, GPIO_OUTPUT_INACTIVE);
+		if (ret < 0) {
+			LOG_ERR("Reset display failed! (%d)", ret);
+			return ret;
+		}
+
+		k_msleep(10);
+		ret = gpio_pin_set_dt(&cfg->reset, 1);
+		if (ret < 0) {
+			LOG_ERR("Enable display failed! (%d)", ret);
+			return ret;
+		}
+
+		k_msleep(100);
+	}
+
+	/* store x/y resolution & rotation */
+	if (cfg->rotation == 0) {
+		data->xres = cfg->width;
+		data->yres = cfg->height;
+		data->orientation = DISPLAY_ORIENTATION_NORMAL;
+	} else if (cfg->rotation == 90) {
+		data->xres = cfg->height;
+		data->yres = cfg->width;
+		data->orientation = DISPLAY_ORIENTATION_ROTATED_90;
+	} else if (cfg->rotation == 180) {
+		data->xres = cfg->width;
+		data->yres = cfg->height;
+		data->orientation = DISPLAY_ORIENTATION_ROTATED_180;
+	} else if (cfg->rotation == 270) {
+		data->xres = cfg->height;
+		data->yres = cfg->width;
+		data->orientation = DISPLAY_ORIENTATION_ROTATED_270;
+	}
+
+	/* attach to MIPI-DSI host */
+	mdev.data_lanes = cfg->data_lanes;
+	mdev.pixfmt = data->dsi_pixel_format;
+	mdev.mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_LPM;
+
+	mdev.timings.hactive = cfg->width;
+	mdev.timings.hbp = cfg->hbp;
+	mdev.timings.hsync = cfg->hsync;
+	mdev.timings.hfp = cfg->hfp;
+	mdev.timings.vactive = cfg->height;
+	mdev.timings.vbp = cfg->vbp;
+	mdev.timings.vsync = cfg->vsync;
+	mdev.timings.vfp = cfg->vfp;
+
+	ret = mipi_dsi_attach(cfg->mipi_dsi, cfg->channel, &mdev);
+	if (ret < 0) {
+		LOG_ERR("MIPI-DSI attach failed! (%d)", ret);
+		return ret;
+	}
+
+	ret = st7701_check_id(dev);
+	if (ret) {
+		LOG_ERR("Panel ID check failed! (%d)", ret);
+		return ret;
+	}
+
+	ret = st7701_configure(dev);
+	if (ret) {
+		LOG_ERR("DSI init sequence failed! (%d)", ret);
+		return ret;
+	}
+
+	ret = st7701_blanking_off(dev);
+	if (ret) {
+		LOG_ERR("Display blanking off failed! (%d)", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+#define ST7701_DEVICE(inst)                                                                        \
+	static const struct st7701_config st7701_config_##inst = {                                 \
+		.mipi_dsi = DEVICE_DT_GET(DT_INST_BUS(inst)),                                      \
+		.reset = GPIO_DT_SPEC_INST_GET_OR(inst, reset_gpios, {0}),                         \
+		.backlight = GPIO_DT_SPEC_INST_GET_OR(inst, bl_gpios, {0}),                        \
+		.data_lanes = DT_INST_PROP_BY_IDX(inst, data_lanes, 0),                            \
+		.width = DT_INST_PROP(inst, width),                                                \
+		.height = DT_INST_PROP(inst, height),                                              \
+		.channel = DT_INST_REG_ADDR(inst),                                                 \
+		.rotation = DT_INST_PROP(inst, rotation),                                          \
+		.hbp = DT_PROP(DT_INST_CHILD(inst, display_timings), hback_porch),                 \
+		.hsync = DT_PROP(DT_INST_CHILD(inst, display_timings), hsync_len),                 \
+		.hfp = DT_PROP(DT_INST_CHILD(inst, display_timings), hfront_porch),                \
+		.vbp = DT_PROP(DT_INST_CHILD(inst, display_timings), vback_porch),                 \
+		.vsync = DT_PROP(DT_INST_CHILD(inst, display_timings), vsync_len),                 \
+		.vfp = DT_PROP(DT_INST_CHILD(inst, display_timings), vfront_porch),                \
+		.gip_e0 = DT_INST_PROP_OR(inst, gip_e0, {}),                                       \
+		.gip_e1 = DT_INST_PROP_OR(inst, gip_e1, {}),                                       \
+		.gip_e2 = DT_INST_PROP_OR(inst, gip_e2, {}),                                       \
+		.gip_e3 = DT_INST_PROP_OR(inst, gip_e3, {}),                                       \
+		.gip_e4 = DT_INST_PROP_OR(inst, gip_e4, {}),                                       \
+		.gip_e5 = DT_INST_PROP_OR(inst, gip_e5, {}),                                       \
+		.gip_e6 = DT_INST_PROP_OR(inst, gip_e6, {}),                                       \
+		.gip_e7 = DT_INST_PROP_OR(inst, gip_e7, {}),                                       \
+		.gip_e8 = DT_INST_PROP_OR(inst, gip_e8, {}),                                       \
+		.gip_eb = DT_INST_PROP_OR(inst, gip_eb, {}),                                       \
+		.gip_ec = DT_INST_PROP_OR(inst, gip_ec, {}),                                       \
+		.gip_ed = DT_INST_PROP_OR(inst, gip_ed, {}),                                       \
+		.pvgamctrl = DT_INST_PROP_OR(inst, pvgamctrl, {}),                                 \
+		.nvgamctrl = DT_INST_PROP_OR(inst, nvgamctrl, {}),                                 \
+	};                                                                                         \
+	static struct st7701_data st7701_data_##inst = {                                           \
+		.dsi_pixel_format = DT_INST_PROP(inst, pixel_format),                              \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, &st7701_init, NULL, &st7701_data_##inst,                       \
+			      &st7701_config_##inst, POST_KERNEL,                                  \
+			      CONFIG_DISPLAY_INIT_PRIORITY, &st7701_api);
+
+DT_INST_FOREACH_STATUS_OKAY(ST7701_DEVICE)
diff --git a/drivers/display/display_stm32_ltdc.c b/drivers/display/display_stm32_ltdc.c
index e9e61da74962c..200cd286eac80 100644
--- a/drivers/display/display_stm32_ltdc.c
+++ b/drivers/display/display_stm32_ltdc.c
@@ -21,6 +21,9 @@
 #include <zephyr/pm/device.h>
 #include <zephyr/sys/barrier.h>
 #include <zephyr/cache.h>
+#if defined(CONFIG_STM32_LTDC_FB_USE_SHARED_MULTI_HEAP)
+#include <zephyr/multi_heap/shared_multi_heap.h>
+#endif
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_stm32_ltdc, CONFIG_DISPLAY_LOG_LEVEL);
@@ -391,6 +394,21 @@ static int stm32_ltdc_init(const struct device *dev)
 		return err;
 	}
 
+#if defined(CONFIG_STM32_LTDC_FB_USE_SHARED_MULTI_HEAP)
+	data->frame_buffer = shared_multi_heap_aligned_alloc(
+			CONFIG_VIDEO_BUFFER_SMH_ATTRIBUTE,
+			32,
+			CONFIG_STM32_LTDC_FB_NUM * data->frame_buffer_len);
+
+	if (data->frame_buffer == NULL) {
+		return -ENOMEM;
+	}
+
+	data->pend_buf = data->frame_buffer;
+	data->front_buf = data->frame_buffer;
+	data->hltdc.LayerCfg[0].FBStartAdress = (uint32_t) data->frame_buffer;
+#endif
+
 	/* Configure layer 1 (only one layer is used) */
 	/* LTDC starts fetching pixels and sending them to display after this call */
 	err = HAL_LTDC_ConfigLayer(&data->hltdc, &data->hltdc.LayerCfg[0], LTDC_LAYER_1);
@@ -503,7 +521,19 @@ static DEVICE_API(display, stm32_ltdc_display_api) = {
 #define STM32_LTDC_FRAME_BUFFER_LEN(inst)							\
 	(STM32_LTDC_INIT_PIXEL_SIZE * DT_INST_PROP(inst, height) * DT_INST_PROP(inst, width))	\
 
+#if defined(CONFIG_STM32_LTDC_FB_USE_SHARED_MULTI_HEAP)
+#define STM32_LTDC_FRAME_BUFFER_ADDR(inst)  (NULL)
+#define STM32_LTDC_FRAME_BUFFER_DEFINE(inst)
+#else
+#define STM32_LTDC_FRAME_BUFFER_ADDR(inst)  frame_buffer_##inst
+#define STM32_LTDC_FRAME_BUFFER_DEFINE(inst)    \
+	/* frame buffer aligned to cache line width for optimal cache flushing */                  \
+	FRAME_BUFFER_SECTION static uint8_t __aligned(32)                                          \
+		frame_buffer_##inst[CONFIG_STM32_LTDC_FB_NUM * STM32_LTDC_FRAME_BUFFER_LEN(inst)];
+#endif
+
 #define STM32_LTDC_DEVICE(inst)									\
+	STM32_LTDC_FRAME_BUFFER_DEFINE(inst);                       \
 	STM32_LTDC_DEVICE_PINCTRL_INIT(inst);							\
 	PM_DEVICE_DT_INST_DEFINE(inst, stm32_ltdc_pm_action);					\
 	static void stm32_ltdc_irq_config_func_##inst(const struct device *dev)			\
@@ -515,15 +545,11 @@ static DEVICE_API(display, stm32_ltdc_display_api) = {
 			    0);									\
 		irq_enable(DT_INST_IRQN(inst));							\
 	}											\
-	/* frame buffer aligned to cache line width for optimal cache flushing */		\
-	FRAME_BUFFER_SECTION static uint8_t __aligned(32)					\
-				frame_buffer_##inst[CONFIG_STM32_LTDC_FB_NUM *			\
-							STM32_LTDC_FRAME_BUFFER_LEN(inst)];	\
 	static struct display_stm32_ltdc_data stm32_ltdc_data_##inst = {			\
-		.frame_buffer = frame_buffer_##inst,						\
+		.frame_buffer = STM32_LTDC_FRAME_BUFFER_ADDR(inst),				\
 		.frame_buffer_len = STM32_LTDC_FRAME_BUFFER_LEN(inst),				\
-		.front_buf = frame_buffer_##inst,						\
-		.pend_buf = frame_buffer_##inst,						\
+		.front_buf = STM32_LTDC_FRAME_BUFFER_ADDR(inst),				\
+		.pend_buf = STM32_LTDC_FRAME_BUFFER_ADDR(inst),					\
 		.hltdc = {									\
 			.Instance = (LTDC_TypeDef *) DT_INST_REG_ADDR(inst),			\
 			.Init = {								\
@@ -594,7 +620,7 @@ static DEVICE_API(display, stm32_ltdc_display_api) = {
 				.Alpha0 = 0,							\
 				.BlendingFactor1 = LTDC_BLENDING_FACTOR1_PAxCA,			\
 				.BlendingFactor2 = LTDC_BLENDING_FACTOR2_PAxCA,			\
-				.FBStartAdress = (uint32_t) frame_buffer_##inst,		\
+				.FBStartAdress = (uint32_t) STM32_LTDC_FRAME_BUFFER_ADDR(inst), \
 				.ImageWidth = DT_INST_PROP(inst, width),			\
 				.ImageHeight = DT_INST_PROP(inst, height),			\
 				.Backcolor.Red =						\
diff --git a/drivers/dma/CMakeLists.txt b/drivers/dma/CMakeLists.txt
index e9fee15f7921f..8e82bc8719b85 100644
--- a/drivers/dma/CMakeLists.txt
+++ b/drivers/dma/CMakeLists.txt
@@ -33,6 +33,7 @@ zephyr_library_sources_ifdef(CONFIG_DMA_ESP32		dma_esp32_gdma.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_MCHP_XEC	dma_mchp_xec.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_XMC4XXX		dma_xmc4xxx.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_RPI_PICO	dma_rpi_pico.c)
+zephyr_library_sources_ifdef(CONFIG_DMA_RENESAS_RZ	dma_renesas_rz.c)
 zephyr_library_sources_ifdef(CONFIG_MCUX_PXP		dma_mcux_pxp.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_MAX32		dma_max32.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_SMARTDMA	dma_mcux_smartdma.c)
@@ -49,3 +50,5 @@ zephyr_library_sources_ifdef(CONFIG_DMA_NXP_EDMA dma_nxp_edma.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_DW_AXI		dma_dw_axi.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_XILINX_AXI_DMA		dma_xilinx_axi_dma.c)
 zephyr_library_sources_ifdef(CONFIG_DMA_NXP_SDMA dma_nxp_sdma.c)
+zephyr_library_sources_ifdef(CONFIG_DMA_WCH             dma_wch.c)
+zephyr_library_sources_ifdef(CONFIG_DMA_TI_CC23X0	dma_ti_cc23x0.c)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 0c86eda9be987..0bba13fb04f3f 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -58,6 +58,8 @@ source "drivers/dma/Kconfig.xmc4xxx"
 
 source "drivers/dma/Kconfig.rpi_pico"
 
+source "drivers/dma/Kconfig.renesas_rz"
+
 source "drivers/dma/Kconfig.ifx_cat1"
 
 source "drivers/dma/Kconfig.intel_lpss"
@@ -91,4 +93,8 @@ source "drivers/dma/Kconfig.xilinx_axi_dma"
 
 source "drivers/dma/Kconfig.nxp_sdma"
 
+source "drivers/dma/Kconfig.wch"
+
+source "drivers/dma/Kconfig.ti_cc23x0"
+
 endif # DMA
diff --git a/drivers/dma/Kconfig.intel_adsp_hda b/drivers/dma/Kconfig.intel_adsp_hda
index 3090d8cb57472..3c6ce8e045f4a 100644
--- a/drivers/dma/Kconfig.intel_adsp_hda
+++ b/drivers/dma/Kconfig.intel_adsp_hda
@@ -44,7 +44,7 @@ config DMA_INTEL_ADSP_HDA
 
 config DMA_INTEL_ADSP_HDA_TIMING_L1_EXIT
 	bool "Intel ADSP HDA Host L1 Exit Interrupt"
-	default y if SOC_INTEL_ACE15_MTPM || SOC_INTEL_ACE20_LNL || SOC_INTEL_ACE30
+	default y if SOC_SERIES_INTEL_ADSP_ACE
 	depends on DMA_INTEL_ADSP_HDA_HOST_IN || DMA_INTEL_ADSP_HDA_HOST_OUT
 	help
 	  Intel ADSP HDA Host Interrupt for L1 exit.
diff --git a/drivers/dma/Kconfig.mcux_edma b/drivers/dma/Kconfig.mcux_edma
index d6bd7b42cdfb4..e6014bb04ab18 100644
--- a/drivers/dma/Kconfig.mcux_edma
+++ b/drivers/dma/Kconfig.mcux_edma
@@ -10,7 +10,7 @@ config DMA_MCUX_EDMA
 	bool "MCUX DMA driver"
 	default y
 	depends on $(dt_compat_any_has_prop,$(EDMA_COMPAT),$(REV_PROP),2)
-	imply NOCACHE_MEMORY if HAS_MCUX_CACHE
+	imply NOCACHE_MEMORY if CPU_HAS_DCACHE
 	help
 	  DMA driver for MCUX series SoCs.
 
diff --git a/drivers/dma/Kconfig.renesas_rz b/drivers/dma/Kconfig.renesas_rz
new file mode 100644
index 0000000000000..fd40f348ace6b
--- /dev/null
+++ b/drivers/dma/Kconfig.renesas_rz
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config DMA_RENESAS_RZ
+	bool "Renesas RZ DMAC"
+	default y
+	depends on DT_HAS_RENESAS_RZ_DMA_ENABLED
+	select USE_RZ_FSP_DMA
+	help
+	  Enable Renesas RZ DMA Driver.
diff --git a/drivers/dma/Kconfig.rpi_pico b/drivers/dma/Kconfig.rpi_pico
index 434ac9fdf14c5..b491a9e02ab2a 100644
--- a/drivers/dma/Kconfig.rpi_pico
+++ b/drivers/dma/Kconfig.rpi_pico
@@ -9,4 +9,4 @@ config DMA_RPI_PICO
 	select PICOSDK_USE_CLAIM
 	depends on RESET
 	help
-	  DMA driver for RaspberryPi Pico.
+	  DMA driver for Raspberry Pi Pico.
diff --git a/drivers/dma/Kconfig.siwx91x b/drivers/dma/Kconfig.siwx91x
index b6e7520439151..a13491aa9efb2 100644
--- a/drivers/dma/Kconfig.siwx91x
+++ b/drivers/dma/Kconfig.siwx91x
@@ -4,6 +4,15 @@
 config DMA_SILABS_SIWX91X
 	bool "Silabs SiWx91x DMA driver"
 	default y
+	select SYS_MEM_BLOCKS
 	depends on DT_HAS_SILABS_SIWX91X_DMA_ENABLED
 	help
 	  Enable the High Power(HP)/Ultra Low Power(ULP) DMA driver for the Silabs SiWx91x SoC series.
+
+if DMA_SILABS_SIWX91X
+
+config DMA_SILABS_SIWX91X_SG_BUFFER_COUNT
+	int "The maximum allowable number of buffers for scatter-gather transfers"
+	default 30
+
+endif
diff --git a/drivers/dma/Kconfig.ti_cc23x0 b/drivers/dma/Kconfig.ti_cc23x0
new file mode 100644
index 0000000000000..eeac23f0b2718
--- /dev/null
+++ b/drivers/dma/Kconfig.ti_cc23x0
@@ -0,0 +1,11 @@
+# TI CC23X0 DMA configuration options
+
+# Copyright (c) 2024 BayLibre, SAS
+# SPDX-License-Identifier: Apache-2.0
+
+config DMA_TI_CC23X0
+	bool "TI CC23X0 DMA driver"
+	default y
+	depends on DT_HAS_TI_CC23X0_DMA_ENABLED
+	help
+	  DMA driver for TI CC23X0 MCUs.
diff --git a/drivers/dma/Kconfig.wch b/drivers/dma/Kconfig.wch
new file mode 100644
index 0000000000000..ed1d4e02f8094
--- /dev/null
+++ b/drivers/dma/Kconfig.wch
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Paul Wedeck <paulwedeck@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config DMA_WCH
+	bool "CH32V DMA driver"
+	default y
+	depends on DT_HAS_WCH_WCH_DMA_ENABLED
+	help
+	  DMA driver for the WCH CH32V SoC family.
diff --git a/drivers/dma/dma_emul.c b/drivers/dma/dma_emul.c
index bdb5245ae4648..6320d1c1620b7 100644
--- a/drivers/dma/dma_emul.c
+++ b/drivers/dma/dma_emul.c
@@ -70,11 +70,6 @@ static void dma_emul_work_handler(struct k_work *work);
 
 LOG_MODULE_REGISTER(dma_emul, CONFIG_DMA_LOG_LEVEL);
 
-static inline bool dma_emul_xfer_is_error_status(int status)
-{
-	return status < 0;
-}
-
 static inline const char *const dma_emul_channel_state_to_string(enum dma_emul_channel_state state)
 {
 	switch (state) {
diff --git a/drivers/dma/dma_esp32_gdma.c b/drivers/dma/dma_esp32_gdma.c
index c7874a65ce807..da7905fa574f1 100644
--- a/drivers/dma/dma_esp32_gdma.c
+++ b/drivers/dma/dma_esp32_gdma.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2022-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -21,17 +21,7 @@ LOG_MODULE_REGISTER(dma_esp32_gdma, CONFIG_DMA_LOG_LEVEL);
 #include <zephyr/drivers/dma.h>
 #include <zephyr/drivers/dma/dma_esp32.h>
 #include <zephyr/drivers/clock_control.h>
-#if defined(CONFIG_SOC_SERIES_ESP32C3) || defined(CONFIG_SOC_SERIES_ESP32C6)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
-
-#if defined(CONFIG_SOC_SERIES_ESP32C3) || defined(CONFIG_SOC_SERIES_ESP32C6)
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
 
 #define DMA_MAX_CHANNEL SOC_GDMA_PAIRS_PER_GROUP
 
@@ -81,23 +71,23 @@ static void IRAM_ATTR dma_esp32_isr_handle_rx(const struct device *dev,
 					      struct dma_esp32_channel *rx, uint32_t intr_status)
 {
 	struct dma_esp32_data *data = (struct dma_esp32_data *const)(dev)->data;
-	uint32_t status;
 
 	gdma_ll_rx_clear_interrupt_status(data->hal.dev, rx->channel_id, intr_status);
+	if (rx->cb) {
+		int status;
 
-	if (intr_status == (GDMA_LL_EVENT_RX_SUC_EOF | GDMA_LL_EVENT_RX_DONE)) {
-		status = DMA_STATUS_COMPLETE;
-	} else if (intr_status == GDMA_LL_EVENT_RX_DONE) {
-		status = DMA_STATUS_BLOCK;
+		if (intr_status == (GDMA_LL_EVENT_RX_SUC_EOF | GDMA_LL_EVENT_RX_DONE)) {
+			status = DMA_STATUS_COMPLETE;
+		} else if (intr_status == GDMA_LL_EVENT_RX_DONE) {
+			status = DMA_STATUS_BLOCK;
 #if defined(CONFIG_SOC_SERIES_ESP32S3)
-	} else if (intr_status == GDMA_LL_EVENT_RX_WATER_MARK) {
-		status = DMA_STATUS_BLOCK;
+		} else if (intr_status == GDMA_LL_EVENT_RX_WATER_MARK) {
+			status = DMA_STATUS_BLOCK;
 #endif
-	} else {
-		status = -intr_status;
-	}
+		} else {
+			status = -intr_status;
+		}
 
-	if (rx->cb) {
 		rx->cb(dev, rx->user_data, rx->channel_id * 2, status);
 	}
 }
@@ -108,15 +98,15 @@ static void IRAM_ATTR dma_esp32_isr_handle_tx(const struct device *dev,
 	struct dma_esp32_data *data = (struct dma_esp32_data *const)(dev)->data;
 
 	gdma_ll_tx_clear_interrupt_status(data->hal.dev, tx->channel_id, intr_status);
-
-	intr_status &= ~(GDMA_LL_EVENT_TX_TOTAL_EOF | GDMA_LL_EVENT_TX_DONE | GDMA_LL_EVENT_TX_EOF);
-
 	if (tx->cb) {
+		intr_status &= ~(GDMA_LL_EVENT_TX_TOTAL_EOF | GDMA_LL_EVENT_TX_DONE |
+				 GDMA_LL_EVENT_TX_EOF);
+
 		tx->cb(dev, tx->user_data, tx->channel_id * 2 + 1, -intr_status);
 	}
 }
 
-#if !defined(CONFIG_SOC_SERIES_ESP32C6) && !defined(CONFIG_SOC_SERIES_ESP32S3)
+#if defined(SOC_GDMA_TX_RX_SHARE_INTERRUPT)
 static void IRAM_ATTR dma_esp32_isr_handle(const struct device *dev, uint8_t rx_id, uint8_t tx_id)
 {
 	struct dma_esp32_config *config = (struct dma_esp32_config *)dev->config;
@@ -137,46 +127,82 @@ static void IRAM_ATTR dma_esp32_isr_handle(const struct device *dev, uint8_t rx_
 }
 #endif
 
-static int dma_esp32_config_rx_descriptor(struct dma_esp32_channel *dma_channel,
-						struct dma_block_config *block)
+static int dma_esp32_config_descriptor(struct dma_esp32_channel *dma_channel,
+					struct dma_block_config *block)
 {
 	if (!block) {
 		LOG_ERR("At least one dma block is required");
 		return -EINVAL;
 	}
 
-	if (!esp_ptr_dma_capable((uint32_t *)block->dest_address)
+	uint32_t target_address = 0, block_size = 0;
+	dma_descriptor_t *desc_iter = dma_channel->desc_list;
+
+	for (int i = 0; i < CONFIG_DMA_ESP32_MAX_DESCRIPTOR_NUM; ++i) {
+		if (block_size == 0) {
+			if (dma_channel->dir == DMA_TX) {
+				target_address = block->source_address;
+			} else {
+				target_address = block->dest_address;
+			}
+
+			if (!esp_ptr_dma_capable((uint32_t *)target_address)
 #if defined(CONFIG_ESP_SPIRAM)
-	&& !esp_ptr_dma_ext_capable((uint32_t *)block->dest_address)
+			&& !esp_ptr_dma_ext_capable((uint32_t *)target_address)
 #endif
-	) {
-		LOG_ERR("Rx buffer not in DMA capable memory: %p", (uint32_t *)block->dest_address);
-		return -EINVAL;
-	}
+			) {
+				if (dma_channel->dir == DMA_TX) {
+					LOG_ERR("Tx buffer not in DMA capable memory: %p",
+						(uint32_t *)target_address);
+				} else {
+					LOG_ERR("Rx buffer not in DMA capable memory: %p",
+						(uint32_t *)target_address);
+				}
+
+				return -EINVAL;
+			}
 
-	dma_descriptor_t *desc_iter = dma_channel->desc_list;
+			block_size = block->block_size;
+		}
 
-	for (int i = 0; i < CONFIG_DMA_ESP32_MAX_DESCRIPTOR_NUM; ++i) {
-		if (block->block_size > DMA_DESCRIPTOR_BUFFER_MAX_SIZE) {
-			LOG_ERR("Size of block %d is too large", i);
-			return -EINVAL;
+		uint32_t buffer_size;
+
+		if (block_size > DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED) {
+			buffer_size = DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED;
+		} else {
+			buffer_size = block_size;
 		}
+
 		memset(desc_iter, 0, sizeof(dma_descriptor_t));
-		desc_iter->buffer = (void *)block->dest_address;
-		desc_iter->dw0.size = block->block_size;
+		desc_iter->buffer = (void *)target_address;
+		desc_iter->dw0.size = buffer_size;
+		if (dma_channel->dir == DMA_TX) {
+			desc_iter->dw0.length = buffer_size;
+		}
 		desc_iter->dw0.owner = DMA_DESCRIPTOR_BUFFER_OWNER_DMA;
-		if (!block->next_block) {
-			desc_iter->next = NULL;
-			break;
+
+		target_address += buffer_size;
+		block_size -= buffer_size;
+
+		if (!block_size) {
+			if (block->next_block) {
+				block = block->next_block;
+			} else {
+				desc_iter->next = NULL;
+				if (dma_channel->dir == DMA_TX) {
+					desc_iter->dw0.suc_eof = 1;
+				}
+				break;
+			}
 		}
+
 		desc_iter->next = desc_iter + 1;
 		desc_iter += 1;
-		block = block->next_block;
 	}
 
 	if (desc_iter->next) {
 		memset(dma_channel->desc_list, 0, sizeof(dma_channel->desc_list));
-		LOG_ERR("Too many dma blocks. Increase CONFIG_DMA_ESP32_MAX_DESCRIPTOR_NUM");
+		LOG_ERR("Run out of DMA descriptors. Increase CONFIG_DMA_ESP32_MAX_DESCRIPTOR_NUM");
 		return -EINVAL;
 	}
 
@@ -213,60 +239,13 @@ static int dma_esp32_config_rx(const struct device *dev, struct dma_esp32_channe
 	dma_channel->cb = config_dma->dma_callback;
 	dma_channel->user_data = config_dma->user_data;
 
-	gdma_ll_rx_clear_interrupt_status(data->hal.dev, dma_channel->channel_id, UINT32_MAX);
-	gdma_ll_rx_enable_interrupt(data->hal.dev, dma_channel->channel_id, UINT32_MAX,
-				    config_dma->dma_callback != NULL);
+	gdma_ll_rx_enable_interrupt(data->hal.dev, dma_channel->channel_id, GDMA_LL_RX_EVENT_MASK,
+				    false);
 
-	return dma_esp32_config_rx_descriptor(dma_channel, config_dma->head_block);
-}
+	gdma_ll_rx_clear_interrupt_status(data->hal.dev, dma_channel->channel_id,
+					  GDMA_LL_RX_EVENT_MASK);
 
-static int dma_esp32_config_tx_descriptor(struct dma_esp32_channel *dma_channel,
-						struct dma_block_config *block)
-{
-	if (!block) {
-		LOG_ERR("At least one dma block is required");
-		return -EINVAL;
-	}
-
-	if (!esp_ptr_dma_capable((uint32_t *)block->source_address)
-#if defined(CONFIG_ESP_SPIRAM)
-	&& !esp_ptr_dma_ext_capable((uint32_t *)block->source_address)
-#endif
-	) {
-		LOG_ERR("Tx buffer not in DMA capable memory: %p",
-			(uint32_t *)block->source_address);
-		return -EINVAL;
-	}
-
-	dma_descriptor_t *desc_iter = dma_channel->desc_list;
-
-	for (int i = 0; i < CONFIG_DMA_ESP32_MAX_DESCRIPTOR_NUM; ++i) {
-		if (block->block_size > DMA_DESCRIPTOR_BUFFER_MAX_SIZE) {
-			LOG_ERR("Size of block %d is too large", i);
-			return -EINVAL;
-		}
-		memset(desc_iter, 0, sizeof(dma_descriptor_t));
-		desc_iter->buffer = (void *)block->source_address;
-		desc_iter->dw0.size = block->block_size;
-		desc_iter->dw0.length = block->block_size;
-		desc_iter->dw0.owner = DMA_DESCRIPTOR_BUFFER_OWNER_DMA;
-		if (!block->next_block) {
-			desc_iter->next = NULL;
-			desc_iter->dw0.suc_eof = 1;
-			break;
-		}
-		desc_iter->next = desc_iter + 1;
-		desc_iter += 1;
-		block = block->next_block;
-	}
-
-	if (desc_iter->next) {
-		memset(dma_channel->desc_list, 0, sizeof(dma_channel->desc_list));
-		LOG_ERR("Too many dma blocks. Increase CONFIG_DMA_ESP32_MAX_DESCRIPTOR_NUM");
-		return -EINVAL;
-	}
-
-	return 0;
+	return dma_esp32_config_descriptor(dma_channel, config_dma->head_block);
 }
 
 static int dma_esp32_config_tx(const struct device *dev, struct dma_esp32_channel *dma_channel,
@@ -296,12 +275,13 @@ static int dma_esp32_config_tx(const struct device *dev, struct dma_esp32_channe
 	dma_channel->cb = config_dma->dma_callback;
 	dma_channel->user_data = config_dma->user_data;
 
-	gdma_ll_tx_clear_interrupt_status(data->hal.dev, dma_channel->channel_id, UINT32_MAX);
+	gdma_ll_tx_enable_interrupt(data->hal.dev, dma_channel->channel_id, GDMA_LL_TX_EVENT_MASK,
+				    false);
 
-	gdma_ll_tx_enable_interrupt(data->hal.dev, dma_channel->channel_id, GDMA_LL_EVENT_TX_EOF,
-				    config_dma->dma_callback != NULL);
+	gdma_ll_tx_clear_interrupt_status(data->hal.dev, dma_channel->channel_id,
+					  GDMA_LL_TX_EVENT_MASK);
 
-	return dma_esp32_config_tx_descriptor(dma_channel, config_dma->head_block);
+	return dma_esp32_config_descriptor(dma_channel, config_dma->head_block);
 }
 
 static int dma_esp32_config(const struct device *dev, uint32_t channel,
@@ -382,7 +362,7 @@ static int dma_esp32_start(const struct device *dev, uint32_t channel)
 			&config->dma_channel[(dma_channel->channel_id * 2) + 1];
 
 		gdma_ll_rx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
-					UINT32_MAX, true);
+					GDMA_LL_EVENT_RX_SUC_EOF | GDMA_LL_EVENT_RX_DONE, true);
 		gdma_ll_tx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
 					GDMA_LL_EVENT_TX_EOF, true);
 
@@ -396,13 +376,14 @@ static int dma_esp32_start(const struct device *dev, uint32_t channel)
 	} else {
 		if (dma_channel->dir == DMA_RX) {
 			gdma_ll_rx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
-					UINT32_MAX, true);
+						    GDMA_LL_EVENT_RX_SUC_EOF |
+						    GDMA_LL_EVENT_RX_DONE, true);
 			gdma_ll_rx_set_desc_addr(data->hal.dev, dma_channel->channel_id,
 						 (int32_t)dma_channel->desc_list);
 			gdma_ll_rx_start(data->hal.dev, dma_channel->channel_id);
 		} else if (dma_channel->dir == DMA_TX) {
 			gdma_ll_tx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
-					GDMA_LL_EVENT_TX_EOF, true);
+						    GDMA_LL_EVENT_TX_EOF, true);
 			gdma_ll_tx_set_desc_addr(data->hal.dev, dma_channel->channel_id,
 						 (int32_t)dma_channel->desc_list);
 			gdma_ll_tx_start(data->hal.dev, dma_channel->channel_id);
@@ -428,20 +409,20 @@ static int dma_esp32_stop(const struct device *dev, uint32_t channel)
 
 	if (dma_channel->periph_id == SOC_GDMA_TRIG_PERIPH_M2M0) {
 		gdma_ll_rx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
-				UINT32_MAX, false);
+					    GDMA_LL_RX_EVENT_MASK, false);
 		gdma_ll_tx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
-				GDMA_LL_EVENT_TX_EOF, false);
+					    GDMA_LL_TX_EVENT_MASK, false);
 		gdma_ll_rx_stop(data->hal.dev, dma_channel->channel_id);
 		gdma_ll_tx_stop(data->hal.dev, dma_channel->channel_id);
 	}
 
 	if (dma_channel->dir == DMA_RX) {
 		gdma_ll_rx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
-				UINT32_MAX, false);
+					    GDMA_LL_RX_EVENT_MASK, false);
 		gdma_ll_rx_stop(data->hal.dev, dma_channel->channel_id);
 	} else if (dma_channel->dir == DMA_TX) {
 		gdma_ll_tx_enable_interrupt(data->hal.dev, dma_channel->channel_id,
-				GDMA_LL_EVENT_TX_EOF, false);
+					    GDMA_LL_TX_EVENT_MASK, false);
 		gdma_ll_tx_stop(data->hal.dev, dma_channel->channel_id);
 	}
 
@@ -517,9 +498,9 @@ static int dma_esp32_reload(const struct device *dev, uint32_t channel, uint32_t
 
 	for (int i = 0; i < ARRAY_SIZE(dma_channel->desc_list); ++i) {
 		memset(desc_iter, 0, sizeof(dma_descriptor_t));
-		desc_iter->buffer = (void *)(buf + DMA_DESCRIPTOR_BUFFER_MAX_SIZE * i);
+		desc_iter->buffer = (void *)(buf + DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED * i);
 		desc_iter->dw0.owner = DMA_DESCRIPTOR_BUFFER_OWNER_DMA;
-		if (size < DMA_DESCRIPTOR_BUFFER_MAX_SIZE) {
+		if (size <= DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED) {
 			desc_iter->dw0.size = size;
 			if (dma_channel->dir == DMA_TX) {
 				desc_iter->dw0.length = size;
@@ -528,11 +509,11 @@ static int dma_esp32_reload(const struct device *dev, uint32_t channel, uint32_t
 			desc_iter->next = NULL;
 			break;
 		}
-		desc_iter->dw0.size = DMA_DESCRIPTOR_BUFFER_MAX_SIZE;
+		desc_iter->dw0.size = DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED;
 		if (dma_channel->dir == DMA_TX) {
-			desc_iter->dw0.length = DMA_DESCRIPTOR_BUFFER_MAX_SIZE;
+			desc_iter->dw0.length = DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED;
 		}
-		size -= DMA_DESCRIPTOR_BUFFER_MAX_SIZE;
+		size -= DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED;
 		desc_iter->next = desc_iter + 1;
 		desc_iter += 1;
 	}
@@ -549,15 +530,35 @@ static int dma_esp32_reload(const struct device *dev, uint32_t channel, uint32_t
 static int dma_esp32_configure_irq(const struct device *dev)
 {
 	struct dma_esp32_config *config = (struct dma_esp32_config *)dev->config;
+	struct dma_esp32_data *data = (struct dma_esp32_data *)dev->data;
 	struct irq_config *irq_cfg = (struct irq_config *)config->irq_config;
+	volatile uint32_t *status_reg;
+	uint32_t status_mask;
 
 	for (uint8_t i = 0; i < config->irq_size; i++) {
-		int ret = esp_intr_alloc(irq_cfg[i].irq_source,
+#if defined(SOC_GDMA_TX_RX_SHARE_INTERRUPT)
+		status_reg = gdma_ll_rx_get_interrupt_status_reg(data->hal.dev, i);
+		status_mask = (GDMA_LL_RX_EVENT_MASK | GDMA_LL_TX_EVENT_MASK);
+#else
+		/* We assume device tree to feature RX/TX pairs */
+		if (i % 2) {
+			status_reg = gdma_ll_tx_get_interrupt_status_reg(data->hal.dev, i / 2);
+			status_mask = GDMA_LL_TX_EVENT_MASK;
+		} else {
+			status_reg = gdma_ll_rx_get_interrupt_status_reg(data->hal.dev, i / 2);
+			status_mask = GDMA_LL_RX_EVENT_MASK;
+		}
+#endif
+
+		int ret = esp_intr_alloc_intrstatus(irq_cfg[i].irq_source,
 			ESP_PRIO_TO_FLAGS(irq_cfg[i].irq_priority) |
 				ESP_INT_FLAGS_CHECK(irq_cfg[i].irq_flags) | ESP_INTR_FLAG_IRAM,
-			(ISR_HANDLER)config->irq_handlers[i],
+			(uint32_t)status_reg,
+			status_mask,
+			(intr_handler_t)config->irq_handlers[i],
 			(void *)dev,
 			NULL);
+
 		if (ret != 0) {
 			LOG_ERR("Could not allocate interrupt handler");
 			return ret;
@@ -613,7 +614,16 @@ static DEVICE_API(dma, dma_esp32_api) = {
 	.reload = dma_esp32_reload,
 };
 
-#if defined(CONFIG_SOC_SERIES_ESP32C6) || defined(CONFIG_SOC_SERIES_ESP32S3)
+#if defined(SOC_GDMA_TX_RX_SHARE_INTERRUPT)
+
+#define DMA_ESP32_DEFINE_IRQ_HANDLER(channel)                                                      \
+	__attribute__((unused)) static void IRAM_ATTR dma_esp32_isr_##channel(                     \
+		const struct device *dev)                                                          \
+	{                                                                                          \
+		dma_esp32_isr_handle(dev, channel * 2, channel * 2 + 1);                           \
+	}
+
+#else
 
 #define DMA_ESP32_DEFINE_IRQ_HANDLER(channel)                                                      \
 	__attribute__((unused)) static void IRAM_ATTR dma_esp32_isr_##channel##_rx(                \
@@ -640,21 +650,12 @@ static DEVICE_API(dma, dma_esp32_api) = {
 		}                                                                                  \
 	}
 
-#else
-
-#define DMA_ESP32_DEFINE_IRQ_HANDLER(channel)                                                      \
-	__attribute__((unused)) static void IRAM_ATTR dma_esp32_isr_##channel(                     \
-		const struct device *dev)                                                          \
-	{                                                                                          \
-		dma_esp32_isr_handle(dev, channel * 2, channel * 2 + 1);                           \
-	}
-
 #endif
 
-#if defined(CONFIG_SOC_SERIES_ESP32C6) || defined(CONFIG_SOC_SERIES_ESP32S3)
-#define ESP32_DMA_HANDLER(channel) dma_esp32_isr_##channel##_rx, dma_esp32_isr_##channel##_tx
-#else
+#if defined(SOC_GDMA_TX_RX_SHARE_INTERRUPT)
 #define ESP32_DMA_HANDLER(channel) dma_esp32_isr_##channel
+#else
+#define ESP32_DMA_HANDLER(channel) dma_esp32_isr_##channel##_rx, dma_esp32_isr_##channel##_tx
 #endif
 
 DMA_ESP32_DEFINE_IRQ_HANDLER(0)
@@ -702,6 +703,6 @@ static void *irq_handlers[] = {
 	};                                                                                         \
 												   \
 	DEVICE_DT_INST_DEFINE(idx, &dma_esp32_init, NULL, &dma_data_##idx, &dma_config_##idx,      \
-			      PRE_KERNEL_1, CONFIG_DMA_INIT_PRIORITY, &dma_esp32_api);
+			      PRE_KERNEL_2, CONFIG_DMA_INIT_PRIORITY, &dma_esp32_api);
 
 DT_INST_FOREACH_STATUS_OKAY(DMA_ESP32_INIT)
diff --git a/drivers/dma/dma_mcux_lpc.c b/drivers/dma/dma_mcux_lpc.c
index fde97055284cf..c4d51d3926a02 100644
--- a/drivers/dma/dma_mcux_lpc.c
+++ b/drivers/dma/dma_mcux_lpc.c
@@ -402,7 +402,7 @@ static int dma_mcux_lpc_configure(const struct device *dev, uint32_t channel,
 	switch (config->channel_direction) {
 	case MEMORY_TO_MEMORY:
 		is_periph = false;
-		if (block_config->source_gather_en) {
+		if (block_config->source_gather_en && (block_config->source_gather_interval != 0)) {
 			src_inc = block_config->source_gather_interval / width;
 			/* The current controller only supports incrementing the
 			 * source and destination up to 4 time transfer width
@@ -412,7 +412,7 @@ static int dma_mcux_lpc_configure(const struct device *dev, uint32_t channel,
 			}
 		}
 
-		if (block_config->dest_scatter_en) {
+		if (block_config->dest_scatter_en && (block_config->dest_scatter_interval != 0)) {
 			dst_inc = block_config->dest_scatter_interval / width;
 			/* The current controller only supports incrementing the
 			 * source and destination up to 4 time transfer width
diff --git a/drivers/dma/dma_mcux_smartdma.c b/drivers/dma/dma_mcux_smartdma.c
index af7fb600be994..edc1645c6eaee 100644
--- a/drivers/dma/dma_mcux_smartdma.c
+++ b/drivers/dma/dma_mcux_smartdma.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 NXP
+ * Copyright 2023, 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -13,7 +13,6 @@
 #include <soc.h>
 #include <fsl_smartdma.h>
 #include <fsl_inputmux.h>
-#include <fsl_power.h>
 
 #define DT_DRV_COMPAT nxp_smartdma
 
diff --git a/drivers/dma/dma_nxp_sdma.c b/drivers/dma/dma_nxp_sdma.c
index 380a9411c9e36..ab45927247d5a 100644
--- a/drivers/dma/dma_nxp_sdma.c
+++ b/drivers/dma/dma_nxp_sdma.c
@@ -202,7 +202,9 @@ void dma_nxp_sdma_callback(sdma_handle_t *handle, void *userData, bool TransferD
 		break;
 	}
 
+	/* prepare next BD for transfer */
 	bd = &chan_data->bd_pool[bdIndex];
+	bd->count = xfer_size;
 	bd->status |= (uint8_t)kSDMA_BDStatusDone;
 
 	SDMA_StartChannelSoftware(dev_cfg->base, chan_data->index);
@@ -266,6 +268,7 @@ static void dma_nxp_sdma_setup_bd(const struct device *dev, uint32_t channel,
 static int dma_nxp_sdma_config(const struct device *dev, uint32_t channel,
 			       struct dma_config *config)
 {
+	const struct sdma_dev_cfg *dev_cfg = dev->config;
 	struct sdma_dev_data *dev_data = dev->data;
 	struct sdma_channel_data *chan_data;
 	struct dma_block_config *block_cfg;
@@ -293,6 +296,14 @@ static int dma_nxp_sdma_config(const struct device *dev, uint32_t channel,
 		return ret;
 	}
 
+	if (chan_data->peripheral == kSDMA_PeripheralMultiFifoPDM) {
+		unsigned int n_fifos = 4; /* TODO: make this configurable */
+
+		SDMA_SetMultiFifoConfig(&chan_data->transfer_cfg, n_fifos, 0);
+		SDMA_EnableSwDone(dev_cfg->base, &chan_data->transfer_cfg, 0,
+				  chan_data->peripheral);
+	}
+
 	dma_nxp_sdma_setup_bd(dev, channel, config);
 	ret = dma_nxp_sdma_init_stat(chan_data);
 	if (ret < 0) {
@@ -421,6 +432,7 @@ static bool sdma_channel_filter(const struct device *dev, int chan_id, void *par
 
 	dev_data->chan[chan_id].event_source = *((int *)param);
 	dev_data->chan[chan_id].index = chan_id;
+	dev_data->chan[chan_id].capacity = 0;
 
 	return true;
 }
diff --git a/drivers/dma/dma_renesas_rz.c b/drivers/dma/dma_renesas_rz.c
new file mode 100644
index 0000000000000..258561ae95edf
--- /dev/null
+++ b/drivers/dma/dma_renesas_rz.c
@@ -0,0 +1,639 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#define DT_DRV_COMPAT renesas_rz_dma
+
+#include <zephyr/drivers/dma.h>
+#include "r_dmac_b.h"
+#include <zephyr/logging/log.h>
+#include "dma_renesas_rz.h"
+LOG_MODULE_REGISTER(renesas_rz_dma);
+
+/* FSP DMAC handler should be called within DMA ISR */
+void dmac_b_int_isr(void);
+void dmac_b_err_isr(void);
+
+struct dmac_cb_ctx {
+	const struct device *dmac_dev;
+	uint32_t channel;
+};
+
+struct dma_channel_data {
+	transfer_ctrl_t *fsp_ctrl;
+	transfer_cfg_t fsp_cfg;
+
+	/* INTID associated with the channel */
+	int irq;
+	int irq_ipl;
+
+	/* DMA call back */
+	dma_callback_t user_cb;
+	void *user_data;
+	struct dmac_cb_ctx cb_ctx;
+
+	bool is_configured;
+	uint32_t direction;
+};
+
+struct dma_renesas_rz_config {
+	uint8_t unit;
+	uint8_t num_channels;
+	void (*irq_configure)(void);
+	const transfer_api_t *fsp_api;
+};
+
+struct dma_renesas_rz_data {
+	/* Dma context should be the first in data structure */
+	struct dma_context ctx;
+	struct dma_channel_data *channels;
+};
+
+static void dmac_rz_cb_handler(dmac_b_callback_args_t *args)
+{
+	struct dmac_cb_ctx *cb_ctx = (struct dmac_cb_ctx *)args->p_context;
+	uint32_t channel = cb_ctx->channel;
+	const struct device *dev = cb_ctx->dmac_dev;
+	struct dma_renesas_rz_data *data = dev->data;
+	dma_callback_t user_cb = data->channels[channel].user_cb;
+	void *user_data = data->channels[channel].user_data;
+
+	if (user_cb) {
+		user_cb(dev, user_data, channel, args->event);
+	}
+}
+
+static int dma_channel_common_checks(const struct device *dev, uint32_t channel)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+
+	if (channel >= config->num_channels) {
+		LOG_ERR("%d: Invalid DMA channel %d.", __LINE__, channel);
+		return -EINVAL;
+	}
+
+	if (!data->channels[channel].is_configured) {
+		LOG_ERR("%d: DMA channel %d should first be configured.", __LINE__, channel);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static inline int dma_channel_config_check_parameters(const struct device *dev,
+						      struct dma_config *cfg)
+{
+	if ((cfg == NULL) || (cfg->head_block == NULL)) {
+		LOG_ERR("%d: Missing configuration structure.", __LINE__);
+		return -EFAULT;
+	}
+
+	if (1 < cfg->block_count) {
+		LOG_ERR("%d: Link Mode is not supported, but only support 1 block per transfer",
+			__LINE__);
+		return -ENOTSUP;
+	}
+
+	if (cfg->source_chaining_en || cfg->dest_chaining_en) {
+		LOG_ERR("%d:Channel Chainning is not supported.", __LINE__);
+		return -ENOTSUP;
+	}
+
+	if (cfg->head_block->dest_scatter_count || cfg->head_block->source_gather_count ||
+	    cfg->head_block->source_gather_interval || cfg->head_block->dest_scatter_interval) {
+		LOG_ERR("%d: Scater and gather are not supported.", __LINE__);
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int dma_channel_set_size(uint32_t size)
+{
+	int transfer_size;
+
+	switch (size) {
+	case 1:
+		transfer_size = TRANSFER_SIZE_1_BYTE;
+		break;
+	case 2:
+		transfer_size = TRANSFER_SIZE_2_BYTE;
+		break;
+	case 4:
+		transfer_size = TRANSFER_SIZE_4_BYTE;
+		break;
+	case 8:
+		transfer_size = TRANSFER_SIZE_8_BYTE;
+		break;
+	case 32:
+		transfer_size = TRANSFER_SIZE_32_BYTE;
+		break;
+	case 64:
+		transfer_size = TRANSFER_SIZE_64_BYTE;
+		break;
+	case 128:
+		transfer_size = TRANSFER_SIZE_128_BYTE;
+		break;
+	default:
+		LOG_ERR("%d: Unsupported data width.", __LINE__);
+		return -ENOTSUP;
+	}
+
+	return transfer_size;
+}
+
+static inline int dma_channel_config_save_parameters(const struct device *dev, uint32_t channel,
+						     struct dma_config *cfg)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+	transfer_info_t *p_info = data->channels[channel].fsp_cfg.p_info;
+	dmac_b_extended_cfg_t *p_extend =
+		(dmac_b_extended_cfg_t *)data->channels[channel].fsp_cfg.p_extend;
+
+	memset(p_info, 0, sizeof(*p_info));
+	memset(p_extend, 0, sizeof(*p_extend));
+
+	/* Save transfer properties required by FSP */
+	switch (cfg->head_block->dest_addr_adj) {
+	case DMA_ADDR_ADJ_NO_CHANGE:
+		p_info->dest_addr_mode = TRANSFER_ADDR_MODE_FIXED;
+		break;
+	case DMA_ADDR_ADJ_INCREMENT:
+		p_info->dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED;
+		break;
+	default:
+		LOG_ERR("%d, Unsupported destination address adjustemnt.", __LINE__);
+		return -ENOTSUP;
+	}
+
+	switch (cfg->head_block->source_addr_adj) {
+	case DMA_ADDR_ADJ_NO_CHANGE:
+		p_info->src_addr_mode = TRANSFER_ADDR_MODE_FIXED;
+		break;
+	case DMA_ADDR_ADJ_INCREMENT:
+		p_info->src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED;
+		break;
+	default:
+		LOG_ERR("%d, Unsupported source address adjustemnt.", __LINE__);
+		return -ENOTSUP;
+	}
+
+	/* Convert data size following FSP convention */
+	p_info->src_size = dma_channel_set_size(cfg->source_data_size);
+	p_info->dest_size = dma_channel_set_size(cfg->dest_data_size);
+
+	/* Save transfer properties required by FSP */
+	p_info->p_src = (void const *volatile)cfg->head_block->source_address;
+	p_info->p_dest = (void *volatile)cfg->head_block->dest_address;
+	p_info->length = cfg->head_block->block_size;
+
+	/*
+	 * Properties of next 1 registers are assigned default value following FSP because transfer
+	 * continuous is not supported.
+	 */
+	p_info->p_next1_src = NULL;
+	p_info->p_next1_dest = NULL;
+	p_info->next1_length = 1;
+	p_extend->continuous_setting = DMAC_B_CONTINUOUS_SETTING_TRANSFER_ONCE;
+
+	/* Save DMAC properties required by FSP */
+	p_extend->unit = config->unit;
+	p_extend->channel = channel;
+
+	/* Save INTID and priority */
+	p_extend->dmac_int_irq = data->channels[channel].irq;
+	p_extend->dmac_int_ipl = data->channels[channel].irq_ipl;
+
+	/* Save callback and data and use the generic handler. */
+	data->channels[channel].user_cb = cfg->dma_callback;
+	data->channels[channel].user_data = cfg->user_data;
+	data->channels[channel].cb_ctx.dmac_dev = dev;
+	data->channels[channel].cb_ctx.channel = channel;
+	p_extend->p_callback = dmac_rz_cb_handler;
+	p_extend->p_context = (void *)&data->channels[channel].cb_ctx;
+
+	/* Save default value following FSP version */
+	p_extend->ack_mode = DMAC_B_ACK_MODE_MASK_DACK_OUTPUT;
+	p_extend->external_detection_mode = DMAC_B_EXTERNAL_DETECTION_NO_DETECTION;
+	p_extend->internal_detection_mode = DMAC_B_INTERNAL_DETECTION_NO_DETECTION;
+
+	/* Save properties with respect to a specific case */
+	switch (cfg->channel_direction) {
+	case MEMORY_TO_MEMORY:
+		p_info->mode = TRANSFER_MODE_BLOCK;
+		p_extend->activation_request_source_select =
+			DMAC_B_REQUEST_DIRECTION_DESTINATION_MODULE;
+		p_extend->activation_source = DMAC_TRIGGER_EVENT_SOFTWARE_TRIGGER;
+		break;
+	case PERIPHERAL_TO_MEMORY:
+		p_info->mode = TRANSFER_MODE_NORMAL;
+		p_extend->activation_request_source_select =
+			DMAC_B_REQUEST_DIRECTION_DESTINATION_MODULE;
+		p_extend->activation_source = cfg->dma_slot;
+		break;
+	case MEMORY_TO_PERIPHERAL:
+		p_info->mode = TRANSFER_MODE_NORMAL;
+		p_extend->activation_request_source_select = DMAC_B_REQUEST_DIRECTION_SOURCE_MODULE;
+		p_extend->activation_source = cfg->dma_slot;
+		break;
+	default:
+		LOG_ERR("%d: Unsupported direction mode.", __LINE__);
+		return -ENOTSUP;
+	}
+
+	data->channels[channel].direction = cfg->channel_direction;
+
+	/*
+	 * Only support two priority modes, 0 is the highest priority with respect to FIXED
+	 * Priority, Round Robin otherwise.
+	 */
+	if (cfg->channel_priority == 0) {
+		p_extend->channel_scheduling = DMAC_B_CHANNEL_SCHEDULING_FIXED;
+	} else {
+		p_extend->channel_scheduling = DMAC_B_CHANNEL_SCHEDULING_ROUND_ROBIN;
+	}
+
+	if (1 < cfg->block_count) {
+		LOG_ERR("%d: Link Mode is not supported.", __LINE__);
+	} else {
+		p_extend->dmac_mode = DMAC_B_MODE_SELECT_REGISTER;
+	}
+
+	return 0;
+}
+
+static int dma_renesas_rz_get_status(const struct device *dev, uint32_t channel,
+				     struct dma_status *status)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+
+	int ret = dma_channel_common_checks(dev, channel);
+
+	if (ret) {
+		return ret;
+	}
+
+	transfer_info_t *p_info;
+
+	p_info = data->channels[channel].fsp_cfg.p_info;
+	transfer_properties_t properties;
+
+	ret = config->fsp_api->infoGet(data->channels[channel].fsp_ctrl, &properties);
+	if (FSP_SUCCESS != (fsp_err_t)ret) {
+		LOG_ERR("%d: Failed to get info dma channel %d info with status %d.", __LINE__,
+			channel, ret);
+		return -EIO;
+	}
+
+	memset(status, 0, sizeof(*status));
+
+	status->dir = data->channels[channel].direction;
+	status->pending_length = properties.transfer_length_remaining;
+	status->busy = status->pending_length ? true : false;
+	status->total_copied = p_info->length - properties.transfer_length_remaining;
+
+	return 0;
+}
+
+static int dma_renesas_rz_suspend(const struct device *dev, uint32_t channel)
+{
+	struct dma_renesas_rz_data *data = dev->data;
+
+	int ret = dma_channel_common_checks(dev, channel);
+
+	if (ret) {
+		return ret;
+	}
+
+	dmac_b_instance_ctrl_t *p_ctrl = (dmac_b_instance_ctrl_t *)data->channels[channel].fsp_ctrl;
+
+	uint8_t group = DMA_PRV_GROUP(channel);
+	uint8_t prv_channel = DMA_PRV_CHANNEL(channel);
+
+	/* Set transfer status is suspend */
+	p_ctrl->p_reg->GRP[group].CH[prv_channel].CHCTRL = R_DMAC_B0_GRP_CH_CHCTRL_SETSUS_Msk;
+
+	/* Check whether a transfer is suspended. */
+	FSP_HARDWARE_REGISTER_WAIT(p_ctrl->p_reg->GRP[group].CH[prv_channel].CHSTAT_b.SUS, 1);
+
+	return 0;
+}
+
+static int dma_renesas_rz_resume(const struct device *dev, uint32_t channel)
+{
+	struct dma_renesas_rz_data *data = dev->data;
+
+	int ret = dma_channel_common_checks(dev, channel);
+
+	if (ret) {
+		return ret;
+	}
+
+	dmac_b_instance_ctrl_t *p_ctrl = (dmac_b_instance_ctrl_t *)data->channels[channel].fsp_ctrl;
+
+	uint8_t group = DMA_PRV_GROUP(channel);
+	uint8_t prv_channel = DMA_PRV_CHANNEL(channel);
+
+	/* Check whether a transfer is suspended. */
+	if (0 == p_ctrl->p_reg->GRP[group].CH[prv_channel].CHSTAT_b.SUS) {
+		LOG_ERR("%d: DMA channel not suspend.", channel);
+		return -EINVAL;
+	}
+
+	/* Restore transfer status from suspend */
+	p_ctrl->p_reg->GRP[group].CH[prv_channel].CHCTRL |= R_DMAC_B0_GRP_CH_CHCTRL_CLRSUS_Msk;
+
+	return 0;
+}
+
+static int dma_renesas_rz_stop(const struct device *dev, uint32_t channel)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+
+	int ret = dma_channel_common_checks(dev, channel);
+
+	if (ret) {
+		return ret;
+	}
+
+	ret = config->fsp_api->disable(data->channels[channel].fsp_ctrl);
+
+	if (FSP_SUCCESS != (fsp_err_t)ret) {
+		LOG_ERR("%d: Failed to stop dma channel %d info with status %d.", __LINE__, channel,
+			ret);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int dma_renesas_rz_start(const struct device *dev, uint32_t channel)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+	dmac_b_extended_cfg_t const *p_extend;
+
+	int ret = dma_channel_common_checks(dev, channel);
+
+	if (ret) {
+		return ret;
+	}
+
+	p_extend = data->channels[channel].fsp_cfg.p_extend;
+
+	ret = config->fsp_api->enable(data->channels[channel].fsp_ctrl);
+
+	if (FSP_SUCCESS != (fsp_err_t)ret) {
+		LOG_ERR("%d: Failed to start %d dma channel with status %d.", __LINE__, channel,
+			ret);
+		return -EIO;
+	}
+
+	if (DMAC_TRIGGER_EVENT_SOFTWARE_TRIGGER == p_extend->activation_source) {
+		ret = config->fsp_api->softwareStart(data->channels[channel].fsp_ctrl,
+						     (transfer_start_mode_t)NULL);
+
+		if (FSP_SUCCESS != (fsp_err_t)ret) {
+			LOG_ERR("%d: Failed to trigger %d dma channel with status %d.", __LINE__,
+				channel, ret);
+			return -EIO;
+		}
+	}
+
+	return 0;
+}
+static int dma_renesas_rz_config(const struct device *dev, uint32_t channel,
+				 struct dma_config *dma_cfg)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+	struct dma_channel_data *channel_cfg;
+	int ret;
+
+	if (channel >= config->num_channels) {
+		LOG_ERR("%d: Invalid DMA channel %d.", __LINE__, channel);
+		return -EINVAL;
+	}
+
+	ret = dma_channel_config_check_parameters(dev, dma_cfg);
+
+	if (ret) {
+		return ret;
+	}
+
+	ret = dma_channel_config_save_parameters(dev, channel, dma_cfg);
+	if (ret) {
+		return ret;
+	}
+
+	channel_cfg = &data->channels[channel];
+
+	/* To avoid assertions we should first close the driver instance if already enabled
+	 */
+	if (data->channels[channel].is_configured) {
+		config->fsp_api->close(channel_cfg->fsp_ctrl);
+	}
+
+	ret = config->fsp_api->open(channel_cfg->fsp_ctrl, &channel_cfg->fsp_cfg);
+
+	if (FSP_SUCCESS != (fsp_err_t)ret) {
+		LOG_ERR("%d: Failed to configure %d dma channel with status %d.", __LINE__, channel,
+			ret);
+		return -EIO;
+	}
+	/* Mark that requested channel is configured successfully. */
+	data->channels[channel].is_configured = true;
+	return 0;
+}
+
+static int dma_renesas_rz_reload(const struct device *dev, uint32_t channel, uint32_t src,
+				 uint32_t dst, size_t size)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+
+	int ret = dma_channel_common_checks(dev, channel);
+
+	if (ret) {
+		return ret;
+	}
+
+	if (size == 0) {
+		LOG_ERR("%d: Size must to not equal to 0 %d.", __LINE__, size);
+		return -EINVAL;
+	}
+
+	transfer_info_t *p_info = data->channels[channel].fsp_cfg.p_info;
+
+	p_info->length = size;
+	p_info->p_src = (void const *volatile)src;
+	p_info->p_dest = (void *volatile)dst;
+
+	ret = config->fsp_api->reconfigure(data->channels[channel].fsp_ctrl, p_info);
+
+	if (FSP_SUCCESS != (fsp_err_t)ret) {
+		LOG_ERR("%d: Failed to reload %d dma channel with status %d.", __LINE__, channel,
+			ret);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int dma_renesas_rz_get_attribute(const struct device *dev, uint32_t type, uint32_t *val)
+{
+	if (val == NULL) {
+		LOG_ERR("%d: Invalid attribute context.", __LINE__);
+		return -EINVAL;
+	}
+
+	switch (type) {
+	case DMA_ATTR_BUFFER_ADDRESS_ALIGNMENT:
+	case DMA_ATTR_BUFFER_SIZE_ALIGNMENT:
+	case DMA_ATTR_COPY_ALIGNMENT:
+		return -ENOSYS;
+	case DMA_ATTR_MAX_BLOCK_COUNT:
+		/*
+		 * this is restricted to 1 because SG and Link Mode configurations are not
+		 * supported
+		 */
+		*val = 1;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static bool dma_renesas_rz_channel_filter(const struct device *dev, int channel, void *filter_param)
+{
+	ARG_UNUSED(filter_param);
+
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+
+	if (channel >= config->num_channels) {
+		LOG_ERR("%d: Invalid DMA channel %d.", __LINE__, channel);
+		return -EINVAL;
+	}
+
+	irq_enable(data->channels[channel].irq);
+	/* All DMA channels support triggered by periodic sources so always return true */
+	return true;
+}
+
+static void dma_renesas_rz_channel_release(const struct device *dev, uint32_t channel)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+	struct dma_renesas_rz_data *data = dev->data;
+	fsp_err_t ret;
+
+	if (channel >= config->num_channels) {
+		LOG_ERR("%d: Invalid DMA channel %d.", __LINE__, channel);
+	}
+
+	irq_disable(data->channels[channel].irq);
+	ret = config->fsp_api->close(data->channels[channel].fsp_ctrl);
+
+	if (ret != FSP_SUCCESS) {
+		LOG_ERR("%d: Failed to release %d dma channel with status %d.", __LINE__, channel,
+			ret);
+	}
+}
+
+static DEVICE_API(dma, dma_api) = {
+	.reload = dma_renesas_rz_reload,
+	.config = dma_renesas_rz_config,
+	.start = dma_renesas_rz_start,
+	.stop = dma_renesas_rz_stop,
+	.suspend = dma_renesas_rz_suspend,
+	.resume = dma_renesas_rz_resume,
+	.get_status = dma_renesas_rz_get_status,
+	.get_attribute = dma_renesas_rz_get_attribute,
+	.chan_filter = dma_renesas_rz_channel_filter,
+	.chan_release = dma_renesas_rz_channel_release,
+};
+
+static int renesas_rz_dma_init(const struct device *dev)
+{
+	const struct dma_renesas_rz_config *config = dev->config;
+
+	config->irq_configure();
+
+	return 0;
+}
+
+static void dmac_err_isr(const void *arg)
+{
+	ARG_UNUSED(arg);
+
+	/* Call FSP DMAC ERR ISR */
+	dmac_b_err_isr();
+}
+
+static void dmac_irq_isr(const void *arg)
+{
+	ARG_UNUSED(arg);
+
+	/* Call FSP DMAC ISR */
+	dmac_b_int_isr();
+}
+
+#define IRQ_ERR_CONFIGURE(inst, name)                                                              \
+	IRQ_CONNECT(                                                                               \
+		DT_INST_IRQ_BY_NAME(inst, name, irq), DT_INST_IRQ_BY_NAME(inst, name, priority),   \
+		dmac_err_isr, DEVICE_DT_INST_GET(inst),                                            \
+		COND_CODE_1(DT_IRQ_HAS_CELL_AT_NAME(DT_DRV_INST(inst), name, flags),           \
+				(DT_INST_IRQ_BY_NAME(inst, name, flags)), (0)));  \
+	irq_enable(DT_INST_IRQ_BY_NAME(inst, name, irq));
+
+#define IRQ_CONFIGURE(n, inst)                                                                     \
+	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, n, irq), DT_INST_IRQ_BY_IDX(inst, n, priority),       \
+		    dmac_irq_isr, DEVICE_DT_INST_GET(inst),                                        \
+		    COND_CODE_1(DT_IRQ_HAS_CELL_AT_IDX(DT_DRV_INST(inst), n, flags),               \
+				(DT_INST_IRQ_BY_IDX(inst, n, flags)), (0)));
+
+#define CONFIGURE_ALL_IRQS(inst, n) LISTIFY(n, IRQ_CONFIGURE, (), inst)
+
+#define DMA_RZ_INIT(inst)                                                                          \
+	static void dma_rz_##inst##_irq_configure(void)                                            \
+	{                                                                                          \
+		CONFIGURE_ALL_IRQS(inst, DT_INST_PROP(inst, dma_channels));                        \
+		COND_CODE_1(DT_INST_IRQ_HAS_NAME(inst, err1),					\
+			    (IRQ_ERR_CONFIGURE(inst, err1)), ())                                \
+	}                                                                                          \
+                                                                                                   \
+	static const struct dma_renesas_rz_config dma_renesas_rz_config_##inst = {                 \
+		.unit = inst,                                                                      \
+		.num_channels = DT_INST_PROP(inst, dma_channels),                                  \
+		.irq_configure = dma_rz_##inst##_irq_configure,                                    \
+		.fsp_api = &g_transfer_on_dmac_b};                                                 \
+                                                                                                   \
+	static dmac_b_instance_ctrl_t g_transfer_ctrl[DT_INST_PROP(inst, dma_channels)];           \
+	static transfer_info_t g_transfer_info[DT_INST_PROP(inst, dma_channels)];                  \
+	static dmac_b_extended_cfg_t g_transfer_extend[DT_INST_PROP(inst, dma_channels)];          \
+	static struct dma_channel_data                                                             \
+		dma_rz_##inst##_channels[DT_INST_PROP(inst, dma_channels)] =                       \
+			DMA_CHANNEL_ARRAY(inst);                                                   \
+                                                                                                   \
+	ATOMIC_DEFINE(dma_rz_atomic##inst, DT_INST_PROP(inst, dma_channels));                      \
+                                                                                                   \
+	static struct dma_renesas_rz_data dma_renesas_rz_data_##inst = {                           \
+		.ctx =                                                                             \
+			{                                                                          \
+				.magic = DMA_MAGIC,                                                \
+				.atomic = dma_rz_atomic##inst,                                     \
+				.dma_channels = DT_INST_PROP(inst, dma_channels),                  \
+			},                                                                         \
+		.channels = dma_rz_##inst##_channels};                                             \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(inst, renesas_rz_dma_init, NULL, &dma_renesas_rz_data_##inst,        \
+			      &dma_renesas_rz_config_##inst, PRE_KERNEL_1,                         \
+			      CONFIG_DMA_INIT_PRIORITY, &dma_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DMA_RZ_INIT);
diff --git a/drivers/dma/dma_renesas_rz.h b/drivers/dma/dma_renesas_rz.h
new file mode 100644
index 0000000000000..30a9fee135f6b
--- /dev/null
+++ b/drivers/dma/dma_renesas_rz.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+
+/* used to store interrupt and priority for channels */
+#define DMA_CHANNEL_DECLARE(n, inst)                                                               \
+	{                                                                                          \
+		.fsp_ctrl = (transfer_ctrl_t *)&g_transfer_ctrl[n],                                \
+		.fsp_cfg =                                                                         \
+			{                                                                          \
+				.p_info = &g_transfer_info[n],                                     \
+				.p_extend = &g_transfer_extend[n],                                 \
+			},                                                                         \
+		.irq = DT_INST_IRQ_BY_IDX(inst, n, irq),                                           \
+		.irq_ipl = DT_INST_IRQ_BY_IDX(inst, n, priority),                                  \
+	}
+
+/* Generate an array of DMA channel data structures */
+#define DMA_CHANNEL_ARRAY(inst)                                                                    \
+	{LISTIFY(DT_INST_PROP(inst, dma_channels), DMA_CHANNEL_DECLARE, (,), inst) }
+
+#define DMA_PRV_CHANNEL(channel) (channel % 8)
+#define DMA_PRV_GROUP(channel)   (channel / 8)
diff --git a/drivers/dma/dma_silabs_ldma.c b/drivers/dma/dma_silabs_ldma.c
index 5bd43c5dfd1f0..358b90b3f485f 100644
--- a/drivers/dma/dma_silabs_ldma.c
+++ b/drivers/dma/dma_silabs_ldma.c
@@ -491,7 +491,7 @@ bool dma_silabs_chan_filter(const struct device *dev, int channel, void *filter_
 void dma_silabs_chan_release(const struct device *dev, uint32_t channel)
 {
 	ARG_UNUSED(dev);
-	Ecode_t err = DMADRV_FreeChannel(channel);
+	Ecode_t __maybe_unused err = DMADRV_FreeChannel(channel);
 
 	__ASSERT_NO_MSG(err == ECODE_EMDRV_DMADRV_OK);
 }
diff --git a/drivers/dma/dma_silabs_siwx91x.c b/drivers/dma/dma_silabs_siwx91x.c
index 1bcdfe05580c3..0fb61f010ff0e 100644
--- a/drivers/dma/dma_silabs_siwx91x.c
+++ b/drivers/dma/dma_silabs_siwx91x.c
@@ -7,27 +7,40 @@
 #include <errno.h>
 #include <zephyr/irq.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/mem_blocks.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/dma.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/types.h>
+#include "rsi_rom_udma.h"
 #include "rsi_rom_udma_wrapper.h"
 #include "rsi_udma.h"
 #include "sl_status.h"
 
-#define DT_DRV_COMPAT          silabs_siwx91x_dma
-#define DMA_MAX_TRANSFER_COUNT 1024
-#define DMA_CH_PRIORITY_HIGH   1
-#define DMA_CH_PRIORITY_LOW    0
-#define VALID_BURST_LENGTH     0
-#define UDMA_ADDR_INC_NONE     0X03
+#define DT_DRV_COMPAT                    silabs_siwx91x_dma
+#define DMA_MAX_TRANSFER_COUNT           1024
+#define DMA_CH_PRIORITY_HIGH             1
+#define DMA_CH_PRIORITY_LOW              0
+#define UDMA_ADDR_INC_NONE               0x03
+#define UDMA_MODE_PER_ALT_SCATTER_GATHER 0x07
 
 LOG_MODULE_REGISTER(si91x_dma, CONFIG_DMA_LOG_LEVEL);
 
+enum {
+	TRANSFER_MEM_TO_MEM,
+	TRANSFER_TO_OR_FROM_PER,
+};
+
+struct dma_siwx91x_channel_info {
+	dma_callback_t dma_callback;        /* User callback */
+	void *cb_data;                      /* User callback data */
+	RSI_UDMA_DESC_T *sg_desc_addr_info; /* Scatter-Gather table start address */
+};
+
 struct dma_siwx91x_config {
 	UDMA0_Type *reg;                 /* UDMA register base address */
-	uint8_t channels;                /* UDMA channel count */
 	uint8_t irq_number;              /* IRQ number */
 	RSI_UDMA_DESC_T *sram_desc_addr; /* SRAM Address for UDMA Descriptor Storage */
 	const struct device *clock_dev;
@@ -36,49 +49,55 @@ struct dma_siwx91x_config {
 };
 
 struct dma_siwx91x_data {
+	struct dma_context dma_ctx;
 	UDMA_Channel_Info *chan_info;
-	dma_callback_t dma_callback;         /* User callback */
-	void *cb_data;                       /* User callback data */
-	RSI_UDMA_DATACONTEXT_T dma_rom_buff; /* Buffer to store UDMA handle */
-					     /* related information */
+	struct dma_siwx91x_channel_info *zephyr_channel_info;
+	struct sys_mem_blocks *dma_desc_pool; /* Pointer to the memory pool for DMA descriptor */
+	RSI_UDMA_DATACONTEXT_T udma_handle;  /* Buffer to store UDMA handle
+					      * related information
+					      */
 };
 
-static inline int siwx91x_dma_is_peripheral_request(uint32_t dir)
+static int siwx91x_transfer_direction(uint32_t dir)
 {
 	if (dir == MEMORY_TO_MEMORY) {
-		return 0;
+		return TRANSFER_MEM_TO_MEM;
 	}
+
 	if (dir == MEMORY_TO_PERIPHERAL || dir == PERIPHERAL_TO_MEMORY) {
-		return 1;
+		return TRANSFER_TO_OR_FROM_PER;
 	}
-	return -1;
+
+	return -EINVAL;
 }
 
-static inline int siwx91x_dma_data_width(uint32_t data_width)
+static bool siwx91x_is_data_width_valid(uint32_t data_width)
 {
 	switch (data_width) {
 	case 1:
-		return SRC_SIZE_8;
 	case 2:
-		return SRC_SIZE_16;
 	case 4:
-		return SRC_SIZE_32;
+		return true;
 	default:
-		return -EINVAL;
+		return false;
 	}
 }
 
-static inline int siwx91x_dma_burst_length(uint32_t blen)
+static int siwx91x_burst_length(uint32_t blen)
 {
-	switch (blen / 8) {
+	switch (blen) {
 	case 1:
-		return VALID_BURST_LENGTH; /* 8-bit burst */
+		return SRC_INC_8;
+	case 2:
+		return SRC_INC_16;
+	case 4:
+		return SRC_INC_32;
 	default:
 		return -EINVAL;
 	}
 }
 
-static inline int siwx91x_dma_addr_adjustment(uint32_t adjustment)
+static int siwx91x_addr_adjustment(uint32_t adjustment)
 {
 	switch (adjustment) {
 	case 0:
@@ -90,11 +109,162 @@ static inline int siwx91x_dma_addr_adjustment(uint32_t adjustment)
 	}
 }
 
-static int dma_channel_config(const struct device *dev, RSI_UDMA_HANDLE_T udma_handle,
-			      uint32_t channel, struct dma_config *config,
-			      UDMA_Channel_Info *channel_info)
+/* Sets up the scatter-gather descriptor table for a DMA transfer */
+static int siwx91x_sg_fill_desc(RSI_UDMA_DESC_T *descs, const struct dma_config *config_zephyr)
+{
+	const struct dma_block_config *block_addr = config_zephyr->head_block;
+	RSI_UDMA_CHA_CONFIG_DATA_T *cfg_91x;
+
+	for (int i = 0; i < config_zephyr->block_count; i++) {
+		sys_write32((uint32_t)&descs[i].vsUDMAChaConfigData1, (mem_addr_t)&cfg_91x);
+
+		if (siwx91x_addr_adjustment(block_addr->source_addr_adj) == UDMA_ADDR_INC_NONE) {
+			descs[i].pSrcEndAddr = (void *)block_addr->source_address;
+		} else {
+			descs[i].pSrcEndAddr = (void *)(block_addr->source_address +
+							(block_addr->block_size -
+							 config_zephyr->source_burst_length));
+		}
+		if (siwx91x_addr_adjustment(block_addr->dest_addr_adj) == UDMA_ADDR_INC_NONE) {
+			descs[i].pDstEndAddr = (void *)block_addr->dest_address;
+		} else {
+			descs[i].pDstEndAddr = (void *)(block_addr->dest_address +
+							(block_addr->block_size -
+							 config_zephyr->dest_burst_length));
+		}
+
+		cfg_91x->srcSize = siwx91x_burst_length(config_zephyr->source_burst_length);
+		cfg_91x->dstSize = siwx91x_burst_length(config_zephyr->dest_burst_length);
+
+		/* Calculate the number of DMA transfers required */
+		if (block_addr->block_size / config_zephyr->source_burst_length >
+		    DMA_MAX_TRANSFER_COUNT) {
+			return -EINVAL;
+		}
+
+		cfg_91x->totalNumOfDMATrans =
+			block_addr->block_size / config_zephyr->source_burst_length - 1;
+
+		/* Set the transfer type based on whether it is a peripheral request */
+		if (siwx91x_transfer_direction(config_zephyr->channel_direction) ==
+		    TRANSFER_TO_OR_FROM_PER) {
+			cfg_91x->transferType = UDMA_MODE_PER_ALT_SCATTER_GATHER;
+		} else {
+			cfg_91x->transferType = UDMA_MODE_MEM_ALT_SCATTER_GATHER;
+		}
+
+		cfg_91x->rPower = ARBSIZE_1;
+
+		if (siwx91x_addr_adjustment(block_addr->source_addr_adj) < 0 ||
+		    siwx91x_addr_adjustment(block_addr->dest_addr_adj) < 0) {
+			return -EINVAL;
+		}
+
+		if (siwx91x_addr_adjustment(block_addr->source_addr_adj) == UDMA_ADDR_INC_NONE) {
+			cfg_91x->srcInc = UDMA_SRC_INC_NONE;
+		} else {
+			cfg_91x->srcInc = siwx91x_burst_length(config_zephyr->source_burst_length);
+		}
+
+		if (siwx91x_addr_adjustment(block_addr->dest_addr_adj) == UDMA_ADDR_INC_NONE) {
+			cfg_91x->dstInc = UDMA_DST_INC_NONE;
+		} else {
+			cfg_91x->dstInc = siwx91x_burst_length(config_zephyr->dest_burst_length);
+		}
+
+		/* Move to the next block */
+		block_addr = block_addr->next_block;
+	}
+
+	if (block_addr != NULL) {
+		/* next_block address for last block must be null */
+		return -EINVAL;
+	}
+
+	/* Set the transfer type for the last descriptor */
+	switch (siwx91x_transfer_direction(config_zephyr->channel_direction)) {
+	case TRANSFER_TO_OR_FROM_PER:
+		descs[config_zephyr->block_count - 1].vsUDMAChaConfigData1.transferType =
+			UDMA_MODE_BASIC;
+		break;
+	case TRANSFER_MEM_TO_MEM:
+		descs[config_zephyr->block_count - 1].vsUDMAChaConfigData1.transferType =
+			UDMA_MODE_AUTO;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+/* Configure DMA for scatter-gather transfer */
+static int siwx91x_sg_chan_config(const struct device *dev, RSI_UDMA_HANDLE_T udma_handle,
+				  uint32_t channel, const struct dma_config *config)
+{
+	const struct dma_siwx91x_config *cfg = dev->config;
+	struct dma_siwx91x_data *data = dev->data;
+	RSI_UDMA_DESC_T *sg_desc_base_addr = NULL;
+	uint8_t transfer_type;
+	int ret;
+
+	ret = siwx91x_transfer_direction(config->channel_direction);
+	if (ret < 0) {
+		return -EINVAL;
+	}
+	transfer_type = ret ? UDMA_MODE_PER_SCATTER_GATHER : UDMA_MODE_MEM_SCATTER_GATHER;
+
+	if (!siwx91x_is_data_width_valid(config->source_data_size) ||
+	    !siwx91x_is_data_width_valid(config->dest_data_size)) {
+		return -EINVAL;
+	}
+
+	if (siwx91x_burst_length(config->source_burst_length) < 0 ||
+	    siwx91x_burst_length(config->dest_burst_length) < 0) {
+		return -EINVAL;
+	}
+
+	/* Request start index for scatter-gather descriptor table */
+	if (sys_mem_blocks_alloc_contiguous(data->dma_desc_pool, config->block_count,
+					    (void **)&sg_desc_base_addr)) {
+		return -EINVAL;
+	}
+
+	if (siwx91x_sg_fill_desc(sg_desc_base_addr, config)) {
+		return -EINVAL;
+	}
+
+	/* This channel information is used to distinguish scatter-gather transfers and
+	 * free the allocated descriptors in sg_transfer_desc_block
+	 */
+	data->chan_info[channel].Cnt = config->block_count;
+	data->zephyr_channel_info[channel].sg_desc_addr_info = sg_desc_base_addr;
+	RSI_UDMA_InterruptClear(udma_handle, channel);
+	RSI_UDMA_ErrorStatusClear(udma_handle);
+
+	if (cfg->reg == UDMA0) {
+		/* UDMA0 is accessible by both TA and M4, so an interrupt should be configured in
+		 * the TA-M4 common register set to signal the TA when UDMA0 is actively in use.
+		 */
+		sys_write32((BIT(channel) | M4SS_UDMA_INTR_SEL), (mem_addr_t)&M4SS_UDMA_INTR_SEL);
+	} else {
+		sys_set_bit((mem_addr_t)&cfg->reg->UDMA_INTR_MASK_REG, channel);
+	}
+
+	sys_write32(BIT(channel), (mem_addr_t)&cfg->reg->CHNL_PRI_ALT_SET);
+	sys_write32(BIT(channel), (mem_addr_t)&cfg->reg->CHNL_REQ_MASK_CLR);
+
+	RSI_UDMA_SetChannelScatterGatherTransfer(udma_handle, channel, config->block_count,
+						 sg_desc_base_addr, transfer_type);
+	return 0;
+}
+
+static int siwx91x_direct_chan_config(const struct device *dev, RSI_UDMA_HANDLE_T udma_handle,
+				      uint32_t channel, const struct dma_config *config)
 {
+	uint32_t dma_transfer_num = config->head_block->block_size / config->source_burst_length;
 	const struct dma_siwx91x_config *cfg = dev->config;
+	struct dma_siwx91x_data *data = dev->data;
 	UDMA_RESOURCES udma_resources = {
 		.reg = cfg->reg,
 		.udma_irq_num = cfg->irq_number,
@@ -107,12 +277,14 @@ static int dma_channel_config(const struct device *dev, RSI_UDMA_HANDLE_T udma_h
 	RSI_UDMA_CHA_CFG_T channel_config = {};
 	int status;
 
-	channel_config.channelPrioHigh = config->channel_priority;
-	if (siwx91x_dma_is_peripheral_request(config->channel_direction) < 0) {
+	if (siwx91x_transfer_direction(config->channel_direction) < 0) {
 		return -EINVAL;
 	}
-	channel_config.periphReq = siwx91x_dma_is_peripheral_request(config->channel_direction);
+
+	channel_config.channelPrioHigh = config->channel_priority;
+	channel_config.periphReq = siwx91x_transfer_direction(config->channel_direction);
 	channel_config.dmaCh = channel;
+
 	if (channel_config.periphReq) {
 		/* Arbitration power for peripheral<->memory transfers */
 		channel_control.rPower = ARBSIZE_1;
@@ -120,60 +292,66 @@ static int dma_channel_config(const struct device *dev, RSI_UDMA_HANDLE_T udma_h
 		/* Arbitration power for mem-mem transfers */
 		channel_control.rPower = ARBSIZE_1024;
 	}
+
 	/* Obtain the number of transfers */
-	config->head_block->block_size /= config->source_data_size;
-	if (config->head_block->block_size >= DMA_MAX_TRANSFER_COUNT) {
+	if (dma_transfer_num >= DMA_MAX_TRANSFER_COUNT) {
 		/* Maximum number of transfers is 1024 */
 		channel_control.totalNumOfDMATrans = DMA_MAX_TRANSFER_COUNT - 1;
 	} else {
-		channel_control.totalNumOfDMATrans = config->head_block->block_size;
+		channel_control.totalNumOfDMATrans = dma_transfer_num;
 	}
-	if (siwx91x_dma_data_width(config->source_data_size) < 0 ||
-	    siwx91x_dma_data_width(config->dest_data_size) < 0) {
+
+	if (!siwx91x_is_data_width_valid(config->source_data_size) ||
+	    !siwx91x_is_data_width_valid(config->dest_data_size)) {
 		return -EINVAL;
 	}
-	if (siwx91x_dma_burst_length(config->source_burst_length) < 0 ||
-	    siwx91x_dma_burst_length(config->dest_burst_length) < 0) {
+	if (siwx91x_burst_length(config->source_burst_length) < 0 ||
+	    siwx91x_burst_length(config->dest_burst_length) < 0) {
 		return -EINVAL;
 	}
-	channel_control.srcSize = siwx91x_dma_data_width(config->source_data_size);
-	channel_control.dstSize = siwx91x_dma_data_width(config->dest_data_size);
-	if (siwx91x_dma_addr_adjustment(config->head_block->source_addr_adj) < 0 ||
-	    siwx91x_dma_addr_adjustment(config->head_block->dest_addr_adj) < 0) {
+
+	channel_control.srcSize = siwx91x_burst_length(config->source_burst_length);
+	channel_control.dstSize = siwx91x_burst_length(config->dest_burst_length);
+	if (siwx91x_addr_adjustment(config->head_block->source_addr_adj) < 0 ||
+	    siwx91x_addr_adjustment(config->head_block->dest_addr_adj) < 0) {
 		return -EINVAL;
 	}
-	if (siwx91x_dma_addr_adjustment(config->head_block->source_addr_adj) == 0) {
-		channel_control.srcInc = channel_control.srcSize;
+
+	if (siwx91x_addr_adjustment(config->head_block->source_addr_adj) == 0) {
+		channel_control.srcInc = siwx91x_burst_length(config->source_burst_length);
 	} else {
 		channel_control.srcInc = UDMA_SRC_INC_NONE;
 	}
-	if (siwx91x_dma_addr_adjustment(config->head_block->dest_addr_adj) == 0) {
-		channel_control.dstInc = channel_control.dstSize;
+
+	if (siwx91x_addr_adjustment(config->head_block->dest_addr_adj) == 0) {
+		channel_control.dstInc = siwx91x_burst_length(config->dest_burst_length);
 	} else {
 		channel_control.dstInc = UDMA_DST_INC_NONE;
 	}
+
 	status = UDMAx_ChannelConfigure(&udma_resources, (uint8_t)channel,
 					config->head_block->source_address,
 					config->head_block->dest_address,
-					config->head_block->block_size, channel_control,
-					&channel_config, NULL, channel_info, udma_handle);
+					dma_transfer_num, channel_control,
+					&channel_config, NULL, data->chan_info,
+					udma_handle);
 	if (status) {
 		return -EIO;
 	}
+
 	return 0;
 }
 
 /* Function to configure UDMA channel for transfer */
-static int dma_siwx91x_configure(const struct device *dev, uint32_t channel,
+static int siwx91x_dma_configure(const struct device *dev, uint32_t channel,
 				 struct dma_config *config)
 {
-	const struct dma_siwx91x_config *cfg = dev->config;
 	struct dma_siwx91x_data *data = dev->data;
-	void *udma_handle = &data->dma_rom_buff;
+	void *udma_handle = &data->udma_handle;
 	int status;
 
 	/* Expecting a fixed channel number between 0-31 for dma0 and 0-11 for ulpdma */
-	if (channel >= cfg->channels) {
+	if (channel >= data->dma_ctx.dma_channels) {
 		return -EINVAL;
 	}
 
@@ -187,28 +365,46 @@ static int dma_siwx91x_configure(const struct device *dev, uint32_t channel,
 		return -EINVAL;
 	}
 
+	if (config->cyclic || config->complete_callback_en) {
+		/* Cyclic DMA feature and completion callback for each block
+		 * is not supported
+		 */
+		return -EINVAL;
+	}
+
 	/* Configure dma channel for transfer */
-	status = dma_channel_config(dev, udma_handle, channel, config, data->chan_info);
+	if (config->head_block->next_block != NULL) {
+		/* Configure DMA for a Scatter-Gather transfer */
+		status = siwx91x_sg_chan_config(dev, udma_handle, channel, config);
+	} else {
+		status = siwx91x_direct_chan_config(dev, udma_handle, channel, config);
+	}
 	if (status) {
 		return status;
 	}
+
+	data->zephyr_channel_info[channel].dma_callback = config->dma_callback;
+	data->zephyr_channel_info[channel].cb_data = config->user_data;
+
+	atomic_set_bit(data->dma_ctx.atomic, channel);
+
 	return 0;
 }
 
 /* Function to reload UDMA channel for new transfer */
-static int dma_siwx91x_reload(const struct device *dev, uint32_t channel, uint32_t src,
+static int siwx91x_dma_reload(const struct device *dev, uint32_t channel, uint32_t src,
 			      uint32_t dst, size_t size)
 {
 	const struct dma_siwx91x_config *cfg = dev->config;
 	struct dma_siwx91x_data *data = dev->data;
-	void *udma_handle = &data->dma_rom_buff;
+	void *udma_handle = &data->udma_handle;
 	uint32_t desc_src_addr;
 	uint32_t desc_dst_addr;
 	uint32_t length;
 	RSI_UDMA_DESC_T *udma_table = cfg->sram_desc_addr;
 
 	/* Expecting a fixed channel number between 0-31 for dma0 and 0-11 for ulpdma */
-	if (channel >= cfg->channels) {
+	if (channel >= data->dma_ctx.dma_channels) {
 		return -EINVAL;
 	}
 
@@ -228,6 +424,7 @@ static int dma_siwx91x_reload(const struct device *dev, uint32_t channel, uint32
 	} else {
 		data->chan_info[channel].Cnt = size;
 	}
+
 	/* Program the DMA descriptors with new transfer data information. */
 	if (udma_table[channel].vsUDMAChaConfigData1.srcInc != UDMA_SRC_INC_NONE) {
 		length = data->chan_info[channel].Cnt
@@ -235,12 +432,14 @@ static int dma_siwx91x_reload(const struct device *dev, uint32_t channel, uint32
 		desc_src_addr = src + (length - 1);
 		udma_table[channel].pSrcEndAddr = (void *)desc_src_addr;
 	}
+
 	if (udma_table[channel].vsUDMAChaConfigData1.dstInc != UDMA_SRC_INC_NONE) {
 		length = data->chan_info[channel].Cnt
 			 << udma_table[channel].vsUDMAChaConfigData1.dstInc;
 		desc_dst_addr = dst + (length - 1);
 		udma_table[channel].pDstEndAddr = (void *)desc_dst_addr;
 	}
+
 	udma_table[channel].vsUDMAChaConfigData1.totalNumOfDMATrans = data->chan_info[channel].Cnt;
 	udma_table[channel].vsUDMAChaConfigData1.transferType = UDMA_MODE_BASIC;
 
@@ -248,17 +447,18 @@ static int dma_siwx91x_reload(const struct device *dev, uint32_t channel, uint32
 }
 
 /* Function to start a DMA transfer */
-static int dma_siwx91x_start(const struct device *dev, uint32_t channel)
+static int siwx91x_dma_start(const struct device *dev, uint32_t channel)
 {
 	const struct dma_siwx91x_config *cfg = dev->config;
 	RSI_UDMA_DESC_T *udma_table = cfg->sram_desc_addr;
 	struct dma_siwx91x_data *data = dev->data;
-	void *udma_handle = &data->dma_rom_buff;
+	void *udma_handle = &data->udma_handle;
 
 	/* Expecting a fixed channel number between 0-31 for dma0 and 0-11 for ulpdma */
-	if (channel >= cfg->channels) {
+	if (channel >= data->dma_ctx.dma_channels) {
 		return -EINVAL;
 	}
+
 	if (RSI_UDMA_ChannelEnable(udma_handle, channel) != 0) {
 		return -EINVAL;
 	}
@@ -267,46 +467,50 @@ static int dma_siwx91x_start(const struct device *dev, uint32_t channel)
 	if (udma_table[channel].vsUDMAChaConfigData1.srcInc != UDMA_SRC_INC_NONE &&
 	    udma_table[channel].vsUDMAChaConfigData1.dstInc != UDMA_DST_INC_NONE) {
 		/* Apply software trigger to start transfer */
-		cfg->reg->CHNL_SW_REQUEST |= BIT(channel);
+		sys_set_bit((mem_addr_t)&cfg->reg->CHNL_SW_REQUEST, channel);
 	}
+
 	return 0;
 }
 
 /* Function to stop a DMA transfer */
-static int dma_siwx91x_stop(const struct device *dev, uint32_t channel)
+static int siwx91x_dma_stop(const struct device *dev, uint32_t channel)
 {
-	const struct dma_siwx91x_config *cfg = dev->config;
 	struct dma_siwx91x_data *data = dev->data;
-	void *udma_handle = &data->dma_rom_buff;
+	void *udma_handle = &data->udma_handle;
 
 	/* Expecting a fixed channel number between 0-31 for dma0 and 0-11 for ulpdma */
-	if (channel >= cfg->channels) {
+	if (channel >= data->dma_ctx.dma_channels) {
 		return -EINVAL;
 	}
+
 	if (RSI_UDMA_ChannelDisable(udma_handle, channel) != 0) {
 		return -EIO;
 	}
+
 	return 0;
 }
 
 /* Function to fetch DMA channel status */
-static int dma_siwx91x_get_status(const struct device *dev, uint32_t channel,
+static int siwx91x_dma_get_status(const struct device *dev, uint32_t channel,
 				  struct dma_status *stat)
 {
 	const struct dma_siwx91x_config *cfg = dev->config;
+	struct dma_siwx91x_data *data = dev->data;
 	RSI_UDMA_DESC_T *udma_table = cfg->sram_desc_addr;
 
 	/* Expecting a fixed channel number between 0-31 for dma0 and 0-11 for ulpdma */
-	if (channel >= cfg->channels) {
+	if (channel >= data->dma_ctx.dma_channels) {
 		return -EINVAL;
 	}
-	/* Read the channel status register */
-	if (cfg->reg->CHANNEL_STATUS_REG & BIT(channel)) {
-		stat->busy = 1;
-	} else {
-		stat->busy = 0;
+
+	if (!atomic_test_bit(data->dma_ctx.atomic, channel)) {
+		return -EINVAL;
 	}
 
+	/* Read the channel status register */
+	stat->busy = sys_test_bit((mem_addr_t)&cfg->reg->CHANNEL_STATUS_REG, channel);
+
 	/* Obtain the transfer direction from channel descriptors */
 	if (udma_table[channel].vsUDMAChaConfigData1.srcInc == UDMA_SRC_INC_NONE) {
 		stat->dir = PERIPHERAL_TO_MEMORY;
@@ -315,11 +519,27 @@ static int dma_siwx91x_get_status(const struct device *dev, uint32_t channel,
 	} else {
 		stat->dir = MEMORY_TO_MEMORY;
 	}
+
 	return 0;
 }
 
+bool siwx91x_dma_chan_filter(const struct device *dev, int channel, void *filter_param)
+{
+	ARG_UNUSED(dev);
+
+	if (!filter_param) {
+		return false;
+	}
+
+	if (*(int *)filter_param == channel) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
 /* Function to initialize DMA peripheral */
-static int dma_siwx91x_init(const struct device *dev)
+static int siwx91x_dma_init(const struct device *dev)
 {
 	const struct dma_siwx91x_config *cfg = dev->config;
 	struct dma_siwx91x_data *data = dev->data;
@@ -337,8 +557,8 @@ static int dma_siwx91x_init(const struct device *dev)
 	}
 
 	udma_handle = UDMAx_Initialize(&udma_resources, udma_resources.desc, NULL,
-				       (uint32_t *)&data->dma_rom_buff);
-	if (udma_handle != &data->dma_rom_buff) {
+				       (uint32_t *)&data->udma_handle);
+	if (udma_handle != &data->udma_handle) {
 		return -EINVAL;
 	}
 
@@ -348,10 +568,11 @@ static int dma_siwx91x_init(const struct device *dev)
 	if (UDMAx_DMAEnable(&udma_resources, udma_handle) != 0) {
 		return -EBUSY;
 	}
+
 	return 0;
 }
 
-static void dma_siwx91x_isr(const struct device *dev)
+static void siwx91x_dma_isr(const struct device *dev)
 {
 	const struct dma_siwx91x_config *cfg = dev->config;
 	struct dma_siwx91x_data *data = dev->data;
@@ -362,22 +583,40 @@ static void dma_siwx91x_isr(const struct device *dev)
 	};
 	uint8_t channel;
 
-	/* Disable the IRQ to prevent the ISR from being triggered by */
-	/* interrupts from other DMA channels */
+	/* Disable the IRQ to prevent the ISR from being triggered by
+	 * interrupts from other DMA channels.
+	 */
 	irq_disable(cfg->irq_number);
+
 	channel = find_lsb_set(cfg->reg->UDMA_DONE_STATUS_REG);
 	/* Identify the interrupt channel */
-	if (!channel || channel > cfg->channels) {
+	if (!channel || channel > data->dma_ctx.dma_channels) {
 		goto out;
 	}
 	/* find_lsb_set() returns 1 indexed value */
 	channel -= 1;
+
+	if (data->zephyr_channel_info[channel].sg_desc_addr_info) {
+		/* A Scatter-Gather transfer is completed, free the allocated descriptors */
+		if (sys_mem_blocks_free_contiguous(
+			    data->dma_desc_pool,
+			    (void *)data->zephyr_channel_info[channel].sg_desc_addr_info,
+			    data->chan_info[channel].Cnt)) {
+			sys_write32(BIT(channel), (mem_addr_t)&cfg->reg->UDMA_DONE_STATUS_REG);
+			goto out;
+		}
+		data->chan_info[channel].Cnt = 0;
+		data->chan_info[channel].Size = 0;
+		data->zephyr_channel_info[channel].sg_desc_addr_info = NULL;
+	}
+
 	if (data->chan_info[channel].Cnt == data->chan_info[channel].Size) {
-		if (data->dma_callback) {
+		if (data->zephyr_channel_info[channel].dma_callback) {
 			/* Transfer complete, call user callback */
-			data->dma_callback(dev, data->cb_data, channel, 0);
+			data->zephyr_channel_info[channel].dma_callback(
+				dev, data->zephyr_channel_info[channel].cb_data, channel, 0);
 		}
-		cfg->reg->UDMA_DONE_STATUS_REG = BIT(channel);
+		sys_write32(BIT(channel), (mem_addr_t)&cfg->reg->UDMA_DONE_STATUS_REG);
 	} else {
 		/* Call UDMA ROM IRQ handler. */
 		ROMAPI_UDMA_WRAPPER_API->uDMAx_IRQHandler(&udma_resources, udma_resources.desc,
@@ -386,9 +625,10 @@ static void dma_siwx91x_isr(const struct device *dev)
 		if (udma_resources.desc[channel].vsUDMAChaConfigData1.srcInc != UDMA_SRC_INC_NONE &&
 		    udma_resources.desc[channel].vsUDMAChaConfigData1.dstInc != UDMA_DST_INC_NONE) {
 			/* Set the software trigger bit for starting next transfer */
-			cfg->reg->CHNL_SW_REQUEST |= BIT(channel);
+			sys_set_bit((mem_addr_t)&cfg->reg->CHNL_SW_REQUEST, channel);
 		}
 	}
+
 out:
 	/* Enable the IRQ to restore interrupt functionality for other DMA channels */
 	irq_enable(cfg->irq_number);
@@ -396,34 +636,50 @@ static void dma_siwx91x_isr(const struct device *dev)
 
 /* Store the Si91x DMA APIs */
 static DEVICE_API(dma, siwx91x_dma_api) = {
-	.config = dma_siwx91x_configure,
-	.reload = dma_siwx91x_reload,
-	.start = dma_siwx91x_start,
-	.stop = dma_siwx91x_stop,
-	.get_status = dma_siwx91x_get_status,
+	.config = siwx91x_dma_configure,
+	.reload = siwx91x_dma_reload,
+	.start = siwx91x_dma_start,
+	.stop = siwx91x_dma_stop,
+	.get_status = siwx91x_dma_get_status,
+	.chan_filter = siwx91x_dma_chan_filter,
 };
 
 #define SIWX91X_DMA_INIT(inst)                                                                     \
-	static UDMA_Channel_Info dma##inst##_channel_info[DT_INST_PROP(inst, dma_channels)];       \
-	static struct dma_siwx91x_data dma##inst##_data = {                                        \
-		.chan_info = dma##inst##_channel_info,                                             \
+	static ATOMIC_DEFINE(dma_channels_atomic_##inst, DT_INST_PROP(inst, dma_channels));        \
+	static UDMA_Channel_Info dma_channel_info_##inst[DT_INST_PROP(inst, dma_channels)];        \
+	SYS_MEM_BLOCKS_DEFINE_STATIC(desc_pool_##inst, sizeof(RSI_UDMA_DESC_T),                    \
+				     CONFIG_DMA_SILABS_SIWX91X_SG_BUFFER_COUNT, 4);                \
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, silabs_sram_region),                               \
+		    (),                                                                            \
+		    (static __aligned(512) RSI_UDMA_DESC_T                                         \
+			     siwx91x_dma_chan_desc##inst[DT_INST_PROP(inst, dma_channels) * 2];))  \
+	static struct dma_siwx91x_channel_info                                                     \
+		zephyr_channel_info_##inst[DT_INST_PROP(inst, dma_channels)];                      \
+	static struct dma_siwx91x_data dma_data_##inst = {                                         \
+		.dma_ctx.magic = DMA_MAGIC,                                                        \
+		.dma_ctx.dma_channels = DT_INST_PROP(inst, dma_channels),                          \
+		.dma_ctx.atomic = dma_channels_atomic_##inst,                                      \
+		.chan_info = dma_channel_info_##inst,                                              \
+		.zephyr_channel_info = zephyr_channel_info_##inst,                                 \
+		.dma_desc_pool = &desc_pool_##inst,                                                \
 	};                                                                                         \
-	static void siwx91x_dma##inst##_irq_configure(void)                                        \
+	static void siwx91x_dma_irq_configure_##inst(void)                                         \
 	{                                                                                          \
-		IRQ_CONNECT(DT_INST_IRQ(inst, irq), DT_INST_IRQ(inst, priority), dma_siwx91x_isr,  \
+		IRQ_CONNECT(DT_INST_IRQ(inst, irq), DT_INST_IRQ(inst, priority), siwx91x_dma_isr,  \
 			    DEVICE_DT_INST_GET(inst), 0);                                          \
 		irq_enable(DT_INST_IRQ(inst, irq));                                                \
 	}                                                                                          \
-	static const struct dma_siwx91x_config dma##inst##_cfg = {                                 \
+	static const struct dma_siwx91x_config dma_cfg_##inst = {                                  \
 		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(inst)),                             \
 		.clock_subsys = (clock_control_subsys_t)DT_INST_PHA(inst, clocks, clkid),          \
 		.reg = (UDMA0_Type *)DT_INST_REG_ADDR(inst),                                       \
-		.channels = DT_INST_PROP(inst, dma_channels),                                      \
 		.irq_number = DT_INST_PROP_BY_IDX(inst, interrupts, 0),                            \
-		.sram_desc_addr = (RSI_UDMA_DESC_T *)DT_INST_PROP(inst, silabs_sram_desc_addr),    \
-		.irq_configure = siwx91x_dma##inst##_irq_configure,                                \
+		.sram_desc_addr = COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, silabs_sram_region),     \
+					      ((RSI_UDMA_DESC_T *)DT_REG_ADDR(DT_INST_PHANDLE(inst, silabs_sram_region))), \
+					      (siwx91x_dma_chan_desc##inst)),                      \
+		.irq_configure = siwx91x_dma_irq_configure_##inst,                                 \
 	};                                                                                         \
-	DEVICE_DT_INST_DEFINE(inst, &dma_siwx91x_init, NULL, &dma##inst##_data, &dma##inst##_cfg,  \
-			      PRE_KERNEL_1, CONFIG_DMA_INIT_PRIORITY, &siwx91x_dma_api);
+	DEVICE_DT_INST_DEFINE(inst, &siwx91x_dma_init, NULL, &dma_data_##inst, &dma_cfg_##inst,    \
+			      POST_KERNEL, CONFIG_DMA_INIT_PRIORITY, &siwx91x_dma_api);
 
 DT_INST_FOREACH_STATUS_OKAY(SIWX91X_DMA_INIT)
diff --git a/drivers/dma/dma_stm32.h b/drivers/dma/dma_stm32.h
index 54e7ac45524d8..a0d0674de7d2b 100644
--- a/drivers/dma/dma_stm32.h
+++ b/drivers/dma/dma_stm32.h
@@ -44,6 +44,9 @@ struct dma_stm32_config {
 	uint8_t offset; /* position in the list of dmamux channel list */
 #endif
 	struct dma_stm32_stream *streams;
+#ifdef CONFIG_DMA_STM32U5
+	volatile uint32_t *linked_list_buffer;
+#endif
 };
 
 uint32_t dma_stm32_id_to_stream(uint32_t id);
@@ -52,7 +55,8 @@ uint32_t dma_stm32_slot_to_channel(uint32_t id);
 #endif
 
 typedef void (*dma_stm32_clear_flag_func)(DMA_TypeDef *DMAx);
-#if !defined(CONFIG_SOC_SERIES_STM32G0X) && \
+#if !defined(CONFIG_SOC_SERIES_STM32C0X) && \
+	!defined(CONFIG_SOC_SERIES_STM32G0X) && \
 	!defined(CONFIG_SOC_SERIES_STM32H7X) && \
 	!defined(CONFIG_SOC_SERIES_STM32U0X)
 typedef uint32_t (*dma_stm32_check_flag_func)(DMA_TypeDef *DMAx);
diff --git a/drivers/dma/dma_stm32u5.c b/drivers/dma/dma_stm32u5.c
index d5b94d89af4ee..db9b9f102a929 100644
--- a/drivers/dma/dma_stm32u5.c
+++ b/drivers/dma/dma_stm32u5.c
@@ -24,6 +24,8 @@ LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 
 #define DT_DRV_COMPAT st_stm32u5_dma
 
+#define STM32U5_DMA_LINKED_LIST_NODE_SIZE (2)
+
 static const uint32_t table_src_size[] = {
 	LL_DMA_SRC_DATAWIDTH_BYTE,
 	LL_DMA_SRC_DATAWIDTH_HALFWORD,
@@ -350,18 +352,10 @@ static int dma_stm32_configure(const struct device *dev,
 	struct dma_stm32_stream *stream =
 				&dev_config->streams[id - STM32_DMA_STREAM_OFFSET];
 	DMA_TypeDef *dma = (DMA_TypeDef *)dev_config->base;
-	LL_DMA_InitTypeDef DMA_InitStruct;
+	uint32_t ll_priority;
+	uint32_t ll_direction;
 	int ret;
 
-	/*  Linked list Node  and structure initialization */
-	static LL_DMA_LinkNodeTypeDef Node_GPDMA_Channel;
-	LL_DMA_InitLinkedListTypeDef DMA_InitLinkedListStruct;
-	LL_DMA_InitNodeTypeDef NodeConfig;
-
-	LL_DMA_ListStructInit(&DMA_InitLinkedListStruct);
-	LL_DMA_NodeStructInit(&NodeConfig);
-	LL_DMA_StructInit(&DMA_InitStruct);
-
 	/* Give channel from index 0 */
 	id = id - STM32_DMA_STREAM_OFFSET;
 
@@ -431,31 +425,28 @@ static int dma_stm32_configure(const struct device *dev,
 		LOG_WRN("dest_buffer address is null.");
 	}
 
-	DMA_InitStruct.SrcAddress = config->head_block->source_address;
-	DMA_InitStruct.DestAddress = config->head_block->dest_address;
-	NodeConfig.SrcAddress = config->head_block->source_address;
-	NodeConfig.DestAddress = config->head_block->dest_address;
-	NodeConfig.BlkDataLength = config->head_block->block_size;
+	LL_DMA_ConfigAddresses(dma, dma_stm32_id_to_stream(id), config->head_block->source_address,
+			       config->head_block->dest_address);
 
-	ret = dma_stm32_get_priority(config->channel_priority,
-				     &DMA_InitStruct.Priority);
+	ret = dma_stm32_get_priority(config->channel_priority, &ll_priority);
 	if (ret < 0) {
 		return ret;
 	}
+	LL_DMA_SetChannelPriorityLevel(dma, dma_stm32_id_to_stream(id), ll_priority);
 
-	ret = dma_stm32_get_direction(config->channel_direction,
-				      &DMA_InitStruct.Direction);
+	ret = dma_stm32_get_direction(config->channel_direction, &ll_direction);
 	if (ret < 0) {
 		return ret;
 	}
+	LL_DMA_SetDataTransferDirection(dma, dma_stm32_id_to_stream(id), ll_direction);
 
 	/* This part is for source */
 	switch (config->head_block->source_addr_adj) {
 	case DMA_ADDR_ADJ_INCREMENT:
-		DMA_InitStruct.SrcIncMode = LL_DMA_SRC_INCREMENT;
+		LL_DMA_SetSrcIncMode(dma, dma_stm32_id_to_stream(id), LL_DMA_SRC_INCREMENT);
 		break;
 	case DMA_ADDR_ADJ_NO_CHANGE:
-		DMA_InitStruct.SrcIncMode = LL_DMA_SRC_FIXED;
+		LL_DMA_SetSrcIncMode(dma, dma_stm32_id_to_stream(id), LL_DMA_SRC_FIXED);
 		break;
 	case DMA_ADDR_ADJ_DECREMENT:
 		return -ENOTSUP;
@@ -464,16 +455,16 @@ static int dma_stm32_configure(const struct device *dev,
 			config->head_block->source_addr_adj);
 		return -EINVAL;
 	}
-	LOG_DBG("Channel (%d) src inc (%x).",
-				id, DMA_InitStruct.SrcIncMode);
+	LOG_DBG("Channel (%d) src inc (%x).", id,
+		LL_DMA_GetSrcIncMode(dma, dma_stm32_id_to_stream(id)));
 
 	/* This part is for dest */
 	switch (config->head_block->dest_addr_adj) {
 	case DMA_ADDR_ADJ_INCREMENT:
-		DMA_InitStruct.DestIncMode = LL_DMA_DEST_INCREMENT;
+		LL_DMA_SetDestIncMode(dma, dma_stm32_id_to_stream(id), LL_DMA_DEST_INCREMENT);
 		break;
 	case DMA_ADDR_ADJ_NO_CHANGE:
-		DMA_InitStruct.DestIncMode = LL_DMA_DEST_FIXED;
+		LL_DMA_SetDestIncMode(dma, dma_stm32_id_to_stream(id), LL_DMA_DEST_FIXED);
 		break;
 	case DMA_ADDR_ADJ_DECREMENT:
 		return -ENOTSUP;
@@ -482,49 +473,60 @@ static int dma_stm32_configure(const struct device *dev,
 			config->head_block->dest_addr_adj);
 		return -EINVAL;
 	}
-	LOG_DBG("Channel (%d) dest inc (%x).",
-				id, DMA_InitStruct.DestIncMode);
+	LOG_DBG("Channel (%d) dest inc (%x).", id,
+		LL_DMA_GetDestIncMode(dma, dma_stm32_id_to_stream(id)));
 
 	stream->source_periph = (stream->direction == PERIPHERAL_TO_MEMORY);
 
 	/* Set the data width, when source_data_size equals dest_data_size */
 	int index = find_lsb_set(config->source_data_size) - 1;
 
-	DMA_InitStruct.SrcDataWidth = table_src_size[index];
+	LL_DMA_SetSrcDataWidth(dma, dma_stm32_id_to_stream(id), table_src_size[index]);
 
 	index = find_lsb_set(config->dest_data_size) - 1;
-	DMA_InitStruct.DestDataWidth = table_dst_size[index];
+	LL_DMA_SetDestDataWidth(dma, dma_stm32_id_to_stream(id), table_dst_size[index]);
 
-	DMA_InitStruct.BlkDataLength = config->head_block->block_size;
+	LL_DMA_SetBlkDataLength(dma, dma_stm32_id_to_stream(id), config->head_block->block_size);
 
 	/* The request ID is stored in the dma_slot */
-	DMA_InitStruct.Request = config->dma_slot;
+	LL_DMA_SetPeriphRequest(dma, dma_stm32_id_to_stream(id), config->dma_slot);
 
 	if (config->head_block->source_reload_en == 0) {
+		LL_DMA_SetLinkStepMode(dma, dma_stm32_id_to_stream(id), LL_DMA_LSM_1LINK_EXECUTION);
 		/* Initialize the DMA structure in non-cyclic mode only */
-		LL_DMA_Init(dma, dma_stm32_id_to_stream(id), &DMA_InitStruct);
+		LL_DMA_SetLinkedListAddrOffset(dma, dma_stm32_id_to_stream(id), 0);
 	} else {/* cyclic mode */
-		/* Setting GPDMA request */
-		NodeConfig.DestDataWidth = DMA_InitStruct.DestDataWidth;
-		NodeConfig.SrcDataWidth = DMA_InitStruct.SrcDataWidth;
-		NodeConfig.DestIncMode = DMA_InitStruct.DestIncMode;
-		NodeConfig.SrcIncMode = DMA_InitStruct.SrcIncMode;
-		NodeConfig.Direction = DMA_InitStruct.Direction;
-		NodeConfig.Request = DMA_InitStruct.Request;
+		uint32_t linked_list_flags = 0;
+		volatile uint32_t *linked_list_node =
+			&dev_config->linked_list_buffer[id * STM32U5_DMA_LINKED_LIST_NODE_SIZE];
+		/* We use "linked list" to emulate circular mode.
+		 * The linked list can consists of just source and/or destination address.
+		 * Other registers can remain the same. Linked list itself doesn't contain
+		 * pointer to other item, since LLR register is not updated (ULL bit = 0).
+		 */
+		if (config->head_block->source_addr_adj == config->head_block->dest_addr_adj) {
+			/* We update both source and destination address */
+			linked_list_node[0] = config->head_block->source_address;
+			linked_list_node[1] = config->head_block->dest_address;
+			linked_list_flags = LL_DMA_UPDATE_CSAR | LL_DMA_UPDATE_CDAR;
+		} else if (config->head_block->source_addr_adj == DMA_ADDR_ADJ_INCREMENT) {
+			/* We update only source address */
+			linked_list_node[0] = config->head_block->source_address;
+			linked_list_flags = LL_DMA_UPDATE_CSAR;
+		} else if (config->head_block->dest_addr_adj == DMA_ADDR_ADJ_INCREMENT) {
+			/* We update only destination address */
+			linked_list_node[0] = config->head_block->dest_address;
+			linked_list_flags = LL_DMA_UPDATE_CDAR;
+		}
+		/* We update only destination address */
+		LL_DMA_SetLinkedListBaseAddr(dma, dma_stm32_id_to_stream(id),
+					     (uint32_t)&linked_list_node[0]);
+		LL_DMA_ConfigLinkUpdate(dma, dma_stm32_id_to_stream(id), linked_list_flags,
+					(uint32_t)&linked_list_node[0]);
 
 		/* Continuous transfers with Linked List */
 		stream->cyclic = true;
-		LL_DMA_List_Init(dma, dma_stm32_id_to_stream(id), &DMA_InitLinkedListStruct);
-		LL_DMA_CreateLinkNode(&NodeConfig, &Node_GPDMA_Channel);
-		LL_DMA_ConnectLinkNode(&Node_GPDMA_Channel, LL_DMA_CLLR_OFFSET5,
-				       &Node_GPDMA_Channel, LL_DMA_CLLR_OFFSET5);
-		LL_DMA_SetLinkedListBaseAddr(dma, dma_stm32_id_to_stream(id),
-					     (uint32_t)&Node_GPDMA_Channel);
-		LL_DMA_ConfigLinkUpdate(dma, dma_stm32_id_to_stream(id),
-					(LL_DMA_UPDATE_CTR1 | LL_DMA_UPDATE_CTR2 |
-					 LL_DMA_UPDATE_CBR1 | LL_DMA_UPDATE_CSAR |
-					 LL_DMA_UPDATE_CDAR | LL_DMA_UPDATE_CLLR),
-					(uint32_t)&Node_GPDMA_Channel);
+		LL_DMA_SetLinkStepMode(dma, dma_stm32_id_to_stream(id), LL_DMA_LSM_FULL_EXECUTION);
 
 		LL_DMA_EnableIT_HT(dma, dma_stm32_id_to_stream(id));
 	}
@@ -800,6 +802,11 @@ static struct dma_stm32_stream						\
 	dma_stm32_streams_##index[DT_INST_PROP_OR(index, dma_channels,	\
 		DT_NUM_IRQS(DT_DRV_INST(index)))];	\
 									\
+static volatile uint32_t dma_stm32_linked_list_buffer##index	\
+		[STM32U5_DMA_LINKED_LIST_NODE_SIZE * \
+		 DT_INST_PROP_OR(index, dma_channels,	\
+				 DT_NUM_IRQS(DT_DRV_INST(index)))] __nocache_noinit;	\
+									\
 const struct dma_stm32_config dma_stm32_config_##index = {		\
 	.pclken = { .bus = DT_INST_CLOCKS_CELL(index, bus),		\
 		    .enr = DT_INST_CLOCKS_CELL(index, bits) },		\
@@ -809,6 +816,7 @@ const struct dma_stm32_config dma_stm32_config_##index = {		\
 		DT_NUM_IRQS(DT_DRV_INST(index))				\
 	),		\
 	.streams = dma_stm32_streams_##index,				\
+	.linked_list_buffer = dma_stm32_linked_list_buffer##index	\
 };									\
 									\
 static struct dma_stm32_data dma_stm32_data_##index = {			\
diff --git a/drivers/dma/dma_ti_cc23x0.c b/drivers/dma/dma_ti_cc23x0.c
new file mode 100644
index 0000000000000..5b1a6c7228332
--- /dev/null
+++ b/drivers/dma/dma_ti_cc23x0.c
@@ -0,0 +1,382 @@
+/*
+ * Copyright (c) 2024 BayLibre, SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_cc23x0_dma
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(dma_cc23x0, CONFIG_DMA_LOG_LEVEL);
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/util.h>
+
+#include <driverlib/clkctl.h>
+#include <driverlib/udma.h>
+
+#include <inc/hw_evtsvt.h>
+#include <inc/hw_memmap.h>
+#include <inc/hw_types.h>
+
+/*
+ * Channels 0 to 5 are assigned to peripherals.
+ * Channels 6 and 7 are assigned to SW-initiated transfers.
+ */
+#define DMA_CC23_PERIPH_CH_MAX	5
+#define DMA_CC23_SW_CH_MIN	6
+#define DMA_CC23_SW_CH_MAX	7
+
+#define DMA_CC23_IS_SW_CH(ch)	((ch) >= DMA_CC23_SW_CH_MIN)
+
+/*
+ * In basic mode, the DMA controller performs transfers as long as there are more items
+ * to transfer, and a transfer request is present. This mode is used with peripherals that
+ * assert a DMA request signal whenever the peripheral is ready for a data transfer.
+ * Auto mode is similar to basic mode, except that when a transfer request is received,
+ * the transfer completes, even if the DMA request is removed. This mode is suitable for
+ * software-triggered transfers.
+ */
+#define DMA_CC23_MODE(ch)	(DMA_CC23_IS_SW_CH(ch) ? UDMA_MODE_AUTO : UDMA_MODE_BASIC)
+
+/* Each DMA channel is multiplexed between two peripherals which ID is in range 0 to 7 */
+#define DMA_CC23_IPID_MASK	GENMASK(2, 0)
+#define DMA_CC23_CHXSEL_REG(ch)	HWREG(EVTSVT_BASE + EVTSVT_O_DMACH0SEL + sizeof(uint32_t) * (ch))
+
+struct dma_cc23x0_channel {
+	uint8_t data_size;
+	dma_callback_t cb;
+	void *user_data;
+};
+
+struct dma_cc23x0_data {
+	__aligned(1024) uDMAControlTableEntry desc[UDMA_NUM_CHANNELS];
+	struct dma_cc23x0_channel channels[UDMA_NUM_CHANNELS];
+};
+
+/*
+ * If the channel is a software channel, then the completion will be signaled
+ * on this DMA dedicated interrupt.
+ * If a peripheral channel is used, then the completion will be signaled on the
+ * peripheral's interrupt.
+ */
+static void dma_cc23x0_isr(const struct device *dev)
+{
+	struct dma_cc23x0_data *data = dev->data;
+	struct dma_cc23x0_channel *ch_data;
+	uint32_t done_flags;
+	int i;
+
+	done_flags = uDMAIntStatus();
+
+	for (i = DMA_CC23_SW_CH_MIN; i <= DMA_CC23_SW_CH_MAX; i++) {
+		if (!(done_flags & BIT(i))) {
+			continue;
+		}
+
+		LOG_DBG("DMA transfer completed on channel %u", i);
+
+		ch_data = &data->channels[i];
+		if (ch_data->cb) {
+			ch_data->cb(dev, ch_data->user_data, i, DMA_STATUS_COMPLETE);
+		}
+
+		uDMAClearInt(done_flags & BIT(i));
+	}
+}
+
+static uint32_t dma_cc23x0_set_addr_adj(uint32_t *control, uint16_t addr_adj,
+					uint32_t inc_flags, uint32_t no_inc_flags)
+{
+	switch (addr_adj) {
+	case DMA_ADDR_ADJ_INCREMENT:
+		*control |= inc_flags;
+		break;
+	case DMA_ADDR_ADJ_NO_CHANGE:
+		*control |= no_inc_flags;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int dma_cc23x0_config(const struct device *dev, uint32_t channel,
+			     struct dma_config *config)
+{
+	struct dma_cc23x0_data *data = dev->data;
+	struct dma_cc23x0_channel *ch_data;
+	struct dma_block_config *block = config->head_block;
+	uint32_t control;
+	uint32_t data_size;
+	uint32_t src_inc_flags;
+	uint32_t dst_inc_flags;
+	uint32_t xfer_size;
+	uint32_t burst_len;
+	int ret;
+
+	if (channel >= UDMA_NUM_CHANNELS) {
+		LOG_ERR("Invalid channel (%u)", channel);
+		return -EINVAL;
+	}
+
+	if (config->dma_slot > DMA_CC23_IPID_MASK) {
+		LOG_ERR("Invalid trigger (%u)", config->dma_slot);
+		return -EINVAL;
+	}
+
+	if (config->block_count > 1) {
+		LOG_ERR("Chained transfers not supported");
+		return -ENOTSUP;
+	}
+
+	switch (config->source_data_size) {
+	case 1:
+		src_inc_flags = UDMA_SRC_INC_8;
+		break;
+	case 2:
+		src_inc_flags = UDMA_SRC_INC_16;
+		break;
+	case 4:
+		src_inc_flags = UDMA_SRC_INC_32;
+		break;
+	default:
+		LOG_ERR("Invalid source data size (%u)", config->source_data_size);
+		return -EINVAL;
+	}
+
+	switch (config->dest_data_size) {
+	case 1:
+		dst_inc_flags = UDMA_DST_INC_8;
+		break;
+	case 2:
+		dst_inc_flags = UDMA_DST_INC_16;
+		break;
+	case 4:
+		dst_inc_flags = UDMA_DST_INC_32;
+		break;
+	default:
+		LOG_ERR("Invalid destination data size (%u)", config->dest_data_size);
+		return -EINVAL;
+	}
+
+	data_size = MIN(config->source_data_size, config->dest_data_size);
+
+	switch (data_size) {
+	case 1:
+		control = UDMA_SIZE_8;
+		break;
+	case 2:
+		control = UDMA_SIZE_16;
+		break;
+	case 4:
+		control = UDMA_SIZE_32;
+		break;
+	default:
+		LOG_ERR("Invalid data size (%u)", data_size);
+		return -EINVAL;
+	}
+
+	ret = dma_cc23x0_set_addr_adj(&control, block->source_addr_adj,
+				      src_inc_flags, UDMA_SRC_INC_NONE);
+	if (ret) {
+		LOG_ERR("Invalid source address adjustment type (%u)", block->source_addr_adj);
+		return ret;
+	}
+
+	ret = dma_cc23x0_set_addr_adj(&control, block->dest_addr_adj,
+				      dst_inc_flags, UDMA_DST_INC_NONE);
+	if (ret) {
+		LOG_ERR("Invalid dest address adjustment type (%u)", block->dest_addr_adj);
+		return ret;
+	}
+
+	xfer_size = block->block_size / data_size;
+	if (!xfer_size || xfer_size > UDMA_XFER_SIZE_MAX) {
+		LOG_ERR("Invalid block size (%u - must be in range %u to %u)",
+			block->block_size, data_size, data_size * UDMA_XFER_SIZE_MAX);
+		return -EINVAL;
+	}
+
+	burst_len = config->source_burst_length / data_size;
+	if (burst_len <= UDMA_XFER_SIZE_MAX && IS_POWER_OF_TWO(burst_len)) {
+		control |= LOG2(burst_len) << UDMA_ARB_S;
+	} else {
+		LOG_ERR("Invalid burst length (%u - must be a power of 2 between %u and %u)",
+			config->source_burst_length, data_size, data_size * UDMA_XFER_SIZE_MAX);
+		return -EINVAL;
+	}
+
+	ch_data = &data->channels[channel];
+	ch_data->data_size = data_size;
+	ch_data->cb = config->dma_callback;
+	ch_data->user_data = config->user_data;
+
+	if (uDMAIsChannelEnabled(BIT(channel))) {
+		return -EBUSY;
+	}
+
+	if (DMA_CC23_IS_SW_CH(channel)) {
+		uDMAEnableSwEventInt(BIT(channel));
+	} else {
+		/* Select peripheral */
+		DMA_CC23_CHXSEL_REG(channel) = config->dma_slot;
+	}
+
+	uDMASetChannelControl(&data->desc[channel], control);
+
+	uDMASetChannelTransfer(&data->desc[channel], DMA_CC23_MODE(channel),
+			       (void *)block->source_address,
+			       (void *)block->dest_address,
+			       xfer_size);
+
+	LOG_DBG("Configured channel %u for %08x to %08x (%u bytes)",
+		channel,
+		block->source_address,
+		block->dest_address,
+		block->block_size);
+
+	return 0;
+}
+
+static int dma_cc23x0_start(const struct device *dev, uint32_t channel)
+{
+	if (uDMAIsChannelEnabled(BIT(channel))) {
+		return 0;
+	}
+
+	uDMAEnableChannel(BIT(channel));
+
+	if (DMA_CC23_IS_SW_CH(channel)) {
+		/* Request DMA channel to start a memory to memory transfer */
+		uDMARequestChannel(BIT(channel));
+	}
+
+	return 0;
+}
+
+static int dma_cc23x0_stop(const struct device *dev, uint32_t channel)
+{
+	uDMADisableChannel(BIT(channel));
+
+	return 0;
+}
+
+static int dma_cc23x0_reload(const struct device *dev, uint32_t channel,
+			     uint32_t src, uint32_t dst, size_t size)
+{
+	struct dma_cc23x0_data *data = dev->data;
+	struct dma_cc23x0_channel *ch_data = &data->channels[channel];
+	uint32_t xfer_size = size / ch_data->data_size;
+
+	if (uDMAIsChannelEnabled(BIT(channel))) {
+		return -EBUSY;
+	}
+
+	uDMASetChannelTransfer(&data->desc[channel], DMA_CC23_MODE(channel),
+			       (void *)src, (void *)dst, xfer_size);
+
+	LOG_DBG("Reloaded channel %u for %08x to %08x (%u bytes)",
+		channel, src, dst, size);
+
+	return 0;
+}
+
+static int dma_cc23x0_get_status(const struct device *dev, uint32_t channel,
+				 struct dma_status *stat)
+{
+	struct dma_cc23x0_data *data = dev->data;
+	uint8_t ch_sel;
+
+	if (channel >= UDMA_NUM_CHANNELS || !stat) {
+		return -EINVAL;
+	}
+
+	ch_sel = DMA_CC23_CHXSEL_REG(channel) & DMA_CC23_IPID_MASK;
+	switch (channel) {
+	case 0:
+		if (ch_sel == 0) {
+			/* spi0txtrg */
+			stat->dir = MEMORY_TO_PERIPHERAL;
+		} else {
+			/* uart0rxtrg */
+			stat->dir = PERIPHERAL_TO_MEMORY;
+		}
+		break;
+	case 1:
+		if (ch_sel == 1) {
+			/* spi0rxtrg */
+			stat->dir = PERIPHERAL_TO_MEMORY;
+		} else {
+			/* uart0txtrg */
+			stat->dir = MEMORY_TO_PERIPHERAL;
+		}
+		break;
+	case 2:
+	case 4:
+		/* ch2: uart0txtrg | ch4: laestrga */
+		stat->dir = MEMORY_TO_PERIPHERAL;
+		break;
+	case 3:
+	case 5:
+		/* ch3: adc0trg or uart0rxtrg | ch5: laestrgb or adc0trg */
+		stat->dir = PERIPHERAL_TO_MEMORY;
+		break;
+	default:
+		/* ch6, ch7: SW trg */
+		stat->dir = MEMORY_TO_MEMORY;
+		break;
+	}
+
+	stat->busy = uDMAIsChannelEnabled(BIT(channel));
+
+	stat->pending_length = uDMAGetChannelSize(&data->desc[channel]);
+	if (data->desc[channel].control & UDMA_SIZE_16) {
+		stat->pending_length <<= 1;
+	} else if (data->desc[channel].control & UDMA_SIZE_32) {
+		stat->pending_length <<= 2;
+	}
+
+	return 0;
+}
+
+static int dma_cc23x0_init(const struct device *dev)
+{
+	struct dma_cc23x0_data *data = dev->data;
+
+	IRQ_CONNECT(DT_INST_IRQN(0),
+		    DT_INST_IRQ(0, priority),
+		    dma_cc23x0_isr,
+		    DEVICE_DT_INST_GET(0),
+		    0);
+	irq_enable(DT_INST_IRQN(0));
+
+	/* Enable clock */
+	CLKCTLEnable(CLKCTL_BASE, CLKCTL_DMA);
+
+	/* Enable DMA */
+	uDMAEnable();
+
+	/* Set base address for channel control table (descriptors) */
+	uDMASetControlBase(data->desc);
+
+	return 0;
+}
+
+static struct dma_cc23x0_data cc23x0_data;
+
+static const struct dma_driver_api dma_cc23x0_api = {
+	.config = dma_cc23x0_config,
+	.start = dma_cc23x0_start,
+	.stop = dma_cc23x0_stop,
+	.reload = dma_cc23x0_reload,
+	.get_status = dma_cc23x0_get_status,
+};
+
+DEVICE_DT_INST_DEFINE(0, &dma_cc23x0_init, NULL,
+		      &cc23x0_data, NULL,
+		      PRE_KERNEL_1, CONFIG_DMA_INIT_PRIORITY,
+		      &dma_cc23x0_api);
diff --git a/drivers/dma/dma_wch.c b/drivers/dma/dma_wch.c
new file mode 100644
index 0000000000000..2174de1501528
--- /dev/null
+++ b/drivers/dma/dma_wch.c
@@ -0,0 +1,499 @@
+/*
+ * Copyright (c) 2024 Paul Wedeck <paulwedeck@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#define DT_DRV_COMPAT wch_wch_dma
+
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/clock_control.h>
+
+#include <ch32fun.h>
+
+#define DMA_WCH_MAX_CHAN      11
+#define DMA_WCH_MAX_CHAN_BASE 8
+
+#define DMA_WCH_AIF        (DMA_GIF1 | DMA_TCIF1 | DMA_HTIF1 | DMA_TEIF1)
+#define DMA_WCH_IF_OFF(ch) (4 * (ch))
+#define DMA_WCH_MAX_BLOCK  ((UINT32_C(2) << 16) - 1)
+
+struct dma_wch_chan_regs {
+	volatile uint32_t CFGR;
+	volatile uint32_t CNTR;
+	volatile uint32_t PADDR;
+	volatile uint32_t MADDR;
+	volatile uint32_t reserved1;
+};
+
+struct dma_wch_regs {
+	DMA_TypeDef base;
+	struct dma_wch_chan_regs channels[DMA_WCH_MAX_CHAN];
+	DMA_TypeDef ext;
+};
+
+struct dma_wch_config {
+	struct dma_wch_regs *regs;
+	uint32_t num_channels;
+	const struct device *clock_dev;
+	uint8_t clock_id;
+	void (*irq_config_func)(const struct device *dev);
+};
+
+struct dma_wch_channel {
+	void *user_data;
+	dma_callback_t dma_cb;
+};
+
+struct dma_wch_data {
+	struct dma_context ctx;
+	struct dma_wch_channel *channels;
+};
+
+static uint8_t dma_wch_get_ip(const struct device *dev, uint32_t chan)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	uint32_t intfr;
+
+	if (chan > DMA_WCH_MAX_CHAN_BASE) {
+		chan -= DMA_WCH_MAX_CHAN_BASE;
+		intfr = regs->ext.INTFR;
+		return (intfr >> DMA_WCH_IF_OFF(chan)) & DMA_WCH_AIF;
+	}
+
+	intfr = regs->base.INTFR;
+	return (intfr >> DMA_WCH_IF_OFF(chan)) & DMA_WCH_AIF;
+}
+
+static bool dma_wch_busy(const struct device *dev, uint32_t ch)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+
+	return (regs->channels[ch].CFGR & DMA_CFGR1_EN) > 0 &&
+	       !(dma_wch_get_ip(dev, ch) & DMA_TCIF1);
+}
+
+static int dma_wch_init(const struct device *dev)
+{
+	const struct dma_wch_config *config = dev->config;
+	clock_control_subsys_t clock_sys = (clock_control_subsys_t *)(uintptr_t)config->clock_id;
+
+	if (config->num_channels > DMA_WCH_MAX_CHAN) {
+		return -ENOTSUP;
+	}
+
+	clock_control_on(config->clock_dev, clock_sys);
+
+	config->irq_config_func(dev);
+	return 0;
+}
+
+static int dma_wch_config(const struct device *dev, uint32_t ch, struct dma_config *dma_cfg)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_data *data = dev->data;
+	struct dma_wch_regs *regs = config->regs;
+	unsigned int key;
+	int ret = 0;
+
+	uint32_t cfgr = 0;
+	uint32_t cntr = 0;
+	uint32_t paddr = 0;
+	uint32_t maddr = 0;
+
+	if (config->num_channels <= ch) {
+		return -EINVAL;
+	}
+
+	if (dma_cfg->block_count != 1) {
+		return -ENOTSUP;
+	}
+
+	if (dma_cfg->head_block->block_size > DMA_WCH_MAX_BLOCK ||
+	    dma_cfg->head_block->source_gather_en || dma_cfg->head_block->dest_scatter_en ||
+	    dma_cfg->head_block->source_reload_en || dma_cfg->channel_priority > 3 ||
+	    dma_cfg->head_block->source_addr_adj == DMA_ADDR_ADJ_DECREMENT ||
+	    dma_cfg->head_block->dest_addr_adj == DMA_ADDR_ADJ_DECREMENT ||
+	    dma_cfg->head_block->dest_reload_en) {
+		return -ENOTSUP;
+	}
+
+	cntr = dma_cfg->head_block->block_size;
+
+	switch (dma_cfg->channel_direction) {
+	case MEMORY_TO_MEMORY:
+		cfgr |= DMA_CFGR1_MEM2MEM;
+		paddr = dma_cfg->head_block->source_address;
+		maddr = dma_cfg->head_block->dest_address;
+
+		if (dma_cfg->cyclic) {
+			return -ENOTSUP;
+		}
+		break;
+	case MEMORY_TO_PERIPHERAL:
+		maddr = dma_cfg->head_block->source_address;
+		paddr = dma_cfg->head_block->dest_address;
+		cfgr |= DMA_CFGR1_DIR;
+		break;
+	case PERIPHERAL_TO_MEMORY:
+		paddr = dma_cfg->head_block->source_address;
+		maddr = dma_cfg->head_block->dest_address;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	cfgr |= dma_cfg->channel_priority * DMA_CFGR1_PL_0;
+
+	if (dma_cfg->channel_direction == MEMORY_TO_PERIPHERAL) {
+		cfgr |= dma_width_index(dma_cfg->source_data_size / BITS_PER_BYTE) *
+			DMA_CFGR1_MSIZE_0;
+		cfgr |= dma_width_index(dma_cfg->dest_data_size / BITS_PER_BYTE) *
+			DMA_CFGR1_PSIZE_0;
+
+		cfgr |= (dma_cfg->head_block->dest_addr_adj == DMA_ADDR_ADJ_INCREMENT)
+				? DMA_CFGR1_PINC
+				: 0;
+		cfgr |= (dma_cfg->head_block->source_addr_adj == DMA_ADDR_ADJ_INCREMENT)
+				? DMA_CFGR1_MINC
+				: 0;
+	} else {
+		cfgr |= dma_width_index(dma_cfg->source_data_size / BITS_PER_BYTE) *
+			DMA_CFGR1_PSIZE_0;
+		cfgr |= dma_width_index(dma_cfg->dest_data_size / BITS_PER_BYTE) *
+			DMA_CFGR1_MSIZE_0;
+
+		cfgr |= (dma_cfg->head_block->dest_addr_adj == DMA_ADDR_ADJ_INCREMENT)
+				? DMA_CFGR1_MINC
+				: 0;
+		cfgr |= (dma_cfg->head_block->source_addr_adj == DMA_ADDR_ADJ_INCREMENT)
+				? DMA_CFGR1_PINC
+				: 0;
+	}
+
+	if (dma_cfg->cyclic) {
+		cfgr |= DMA_CFGR1_CIRC;
+	}
+
+	if (dma_cfg->dma_callback) {
+		if (!dma_cfg->error_callback_dis) {
+			cfgr |= DMA_CFGR1_TEIE;
+		}
+
+		if (dma_cfg->complete_callback_en) {
+			cfgr |= DMA_CFGR1_HTIE;
+		}
+
+		cfgr |= DMA_CFGR1_TCIE;
+	}
+
+	key = irq_lock();
+
+	if (dma_wch_busy(dev, ch)) {
+		ret = -EBUSY;
+		goto end;
+	}
+
+	data->channels[ch].user_data = dma_cfg->user_data;
+	data->channels[ch].dma_cb = dma_cfg->dma_callback;
+
+	regs->channels[ch].CFGR = 0;
+
+	if (ch <= DMA_WCH_MAX_CHAN_BASE) {
+		regs->base.INTFCR = DMA_WCH_AIF << DMA_WCH_IF_OFF(ch);
+	} else {
+		regs->ext.INTFCR = DMA_WCH_AIF << DMA_WCH_IF_OFF(ch - DMA_WCH_MAX_CHAN_BASE);
+	}
+
+	regs->channels[ch].PADDR = paddr;
+	regs->channels[ch].MADDR = maddr;
+	regs->channels[ch].CNTR = cntr;
+	regs->channels[ch].CFGR = cfgr;
+end:
+	irq_unlock(key);
+	return ret;
+}
+
+#ifdef CONFIG_DMA_64BIT
+static int dma_wch_reload(const struct device *dev, uint32_t ch, uint64_t src, uint64_t dst,
+			  size_t size)
+#else
+static int dma_wch_reload(const struct device *dev, uint32_t ch, uint32_t src, uint32_t dst,
+			  size_t size)
+#endif
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	uint32_t maddr, paddr;
+	int ret = 0;
+	unsigned int key;
+
+	if (config->num_channels <= ch) {
+		return -EINVAL;
+	}
+
+	key = irq_lock();
+
+	if (dma_wch_busy(dev, ch)) {
+		ret = -EBUSY;
+		goto end;
+	}
+
+	if (regs->channels[ch].CFGR & DMA_CFGR1_DIR) {
+		maddr = src;
+		paddr = dst;
+	} else {
+		maddr = dst;
+		paddr = src;
+	}
+
+	regs->channels[ch].MADDR = maddr;
+	regs->channels[ch].PADDR = paddr;
+	regs->channels[ch].CNTR = size;
+end:
+	irq_unlock(key);
+	return ret;
+}
+
+static int dma_wch_start(const struct device *dev, uint32_t ch)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	unsigned int key;
+
+	if (config->num_channels <= ch) {
+		return -EINVAL;
+	}
+
+	key = irq_lock();
+	regs->channels[ch].CFGR |= DMA_CFGR1_EN;
+	irq_unlock(key);
+
+	return 0;
+}
+
+static int dma_wch_stop(const struct device *dev, uint32_t ch)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	unsigned int key;
+
+	if (config->num_channels <= ch) {
+		return -EINVAL;
+	}
+
+	key = irq_lock();
+	regs->channels[ch].CFGR &= ~DMA_CFGR1_EN;
+	irq_unlock(key);
+
+	return 0;
+}
+
+static int dma_wch_resume(const struct device *dev, uint32_t ch)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	int ret = 0;
+	unsigned int key;
+
+	if (config->num_channels <= ch) {
+		return -EINVAL;
+	}
+
+	key = irq_lock();
+
+	if (regs->channels[ch].CFGR & DMA_CFGR1_EN) {
+		ret = -EINVAL;
+		goto end;
+	}
+
+	regs->channels[ch].CFGR |= DMA_CFGR1_EN;
+end:
+	irq_unlock(key);
+	return ret;
+}
+
+static int dma_wch_suspend(const struct device *dev, uint32_t ch)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	int ret = 0;
+	unsigned int key;
+
+	if (config->num_channels <= ch) {
+		return -EINVAL;
+	}
+
+	key = irq_lock();
+
+	if (!(regs->channels[ch].CFGR & DMA_CFGR1_EN)) {
+		ret = -EINVAL;
+		goto end;
+	}
+
+	regs->channels[ch].CFGR &= ~DMA_CFGR1_EN;
+end:
+	irq_unlock(key);
+	return ret;
+}
+
+static int dma_wch_get_status(const struct device *dev, uint32_t ch, struct dma_status *status)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	uint32_t cfgr;
+	unsigned int key;
+
+	if (config->num_channels <= ch) {
+		return -EINVAL;
+	}
+
+	key = irq_lock();
+	cfgr = regs->channels[ch].CFGR;
+
+	status->busy = dma_wch_busy(dev, ch);
+	if (cfgr & DMA_CFGR1_MEM2MEM) {
+		status->dir = MEMORY_TO_MEMORY;
+	} else if (cfgr & DMA_CFGR1_DIR) {
+		status->dir = MEMORY_TO_PERIPHERAL;
+	} else {
+		status->dir = PERIPHERAL_TO_MEMORY;
+	}
+
+	status->pending_length = regs->channels[ch].CNTR;
+	if (cfgr & DMA_CFGR1_DIR) {
+		status->read_position = regs->channels[ch].MADDR;
+		status->write_position = regs->channels[ch].PADDR;
+	} else {
+		status->read_position = regs->channels[ch].PADDR;
+		status->write_position = regs->channels[ch].MADDR;
+	}
+	irq_unlock(key);
+	return 0;
+}
+
+int dma_wch_get_attribute(const struct device *dev, uint32_t type, uint32_t *value)
+{
+	switch (type) {
+	case DMA_ATTR_BUFFER_ADDRESS_ALIGNMENT:
+	case DMA_ATTR_BUFFER_SIZE_ALIGNMENT:
+	case DMA_ATTR_COPY_ALIGNMENT:
+	case DMA_ATTR_MAX_BLOCK_COUNT:
+		*value = 1;
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
+
+static void dma_wch_handle_callback(const struct device *dev, uint32_t ch, uint8_t ip)
+{
+	const struct dma_wch_data *data = dev->data;
+	void *cb_data;
+	dma_callback_t cb_func;
+	unsigned int key = irq_lock();
+
+	cb_data = data->channels[ch].user_data;
+	cb_func = data->channels[ch].dma_cb;
+	irq_unlock(key);
+
+	if (!cb_func) {
+		return;
+	}
+
+	if (ip & DMA_TCIF1) {
+		cb_func(dev, cb_data, ch, DMA_STATUS_COMPLETE);
+	} else if (ip & DMA_TEIF1) {
+		cb_func(dev, cb_data, ch, -EIO);
+	} else if (ip & DMA_HTIF1) {
+		cb_func(dev, cb_data, ch, DMA_STATUS_BLOCK);
+	}
+}
+
+static void dma_wch_isr(const struct device *dev, uint32_t chan)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	uint32_t intfr = regs->base.INTFR;
+
+	intfr &= (DMA_WCH_AIF << DMA_WCH_IF_OFF(chan));
+	if (intfr & DMA_TCIF1 << DMA_WCH_IF_OFF(chan)) {
+		regs->channels[chan].CFGR &= ~DMA_CFGR1_EN;
+	}
+	regs->base.INTFCR = intfr;
+
+	dma_wch_handle_callback(dev, chan, intfr >> DMA_WCH_IF_OFF(chan));
+}
+
+static void dma_wch_isr_ext(const struct device *dev, uint32_t chan)
+{
+	const struct dma_wch_config *config = dev->config;
+	struct dma_wch_regs *regs = config->regs;
+	uint32_t chan_idx = chan - DMA_WCH_MAX_CHAN_BASE;
+	uint32_t intfr = regs->ext.INTFR;
+
+	intfr &= (DMA_WCH_AIF << DMA_WCH_IF_OFF(chan_idx));
+	regs->ext.INTFCR = intfr;
+
+	dma_wch_handle_callback(dev, chan, intfr >> DMA_WCH_IF_OFF(chan_idx));
+}
+
+static DEVICE_API(dma, dma_wch_driver_api) = {
+	.config = dma_wch_config,
+	.reload = dma_wch_reload,
+	.start = dma_wch_start,
+	.stop = dma_wch_stop,
+	.resume = dma_wch_resume,
+	.suspend = dma_wch_suspend,
+	.get_status = dma_wch_get_status,
+	.get_attribute = dma_wch_get_attribute,
+};
+
+#define GENERATE_ISR(ch, _)                                                                        \
+	__used static void dma_wch_isr##ch(const struct device *dev)                               \
+	{                                                                                          \
+		if (ch <= DMA_WCH_MAX_CHAN_BASE) {                                                 \
+			dma_wch_isr(dev, ch);                                                      \
+		} else {                                                                           \
+			dma_wch_isr_ext(dev, ch);                                                  \
+		}                                                                                  \
+	}
+
+LISTIFY(DMA_WCH_MAX_CHAN, GENERATE_ISR, ())
+
+#define IRQ_CONFIGURE(n, idx)                                                                      \
+	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(idx, n, irq), DT_INST_IRQ_BY_IDX(idx, n, priority),         \
+		    dma_wch_isr##n, DEVICE_DT_INST_GET(idx), 0);                                   \
+	irq_enable(DT_INST_IRQ_BY_IDX(idx, n, irq));
+
+#define CONFIGURE_ALL_IRQS(idx, n) LISTIFY(n, IRQ_CONFIGURE, (), idx)
+
+#define WCH_DMA_INIT(idx)                                                                          \
+	static void dma_wch##idx##_irq_config(const struct device *dev)                            \
+	{                                                                                          \
+		CONFIGURE_ALL_IRQS(idx, DT_NUM_IRQS(DT_DRV_INST(idx)));                            \
+	}                                                                                          \
+	static const struct dma_wch_config dma_wch##idx##_config = {                               \
+		.regs = (struct dma_wch_regs *)DT_INST_REG_ADDR(idx),                              \
+		.num_channels = DT_INST_PROP(idx, dma_channels),                                   \
+		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(idx)),                              \
+		.clock_id = DT_INST_CLOCKS_CELL(idx, id),                                          \
+		.irq_config_func = dma_wch##idx##_irq_config,                                      \
+	};                                                                                         \
+	static struct dma_wch_channel dma_wch##idx##_channels[DT_INST_PROP(idx, dma_channels)];    \
+	ATOMIC_DEFINE(dma_wch_atomic##idx, DT_INST_PROP(idx, dma_channels));                       \
+	static struct dma_wch_data dma_wch##idx##_data = {                                         \
+		.ctx =                                                                             \
+			{                                                                          \
+				.magic = DMA_MAGIC,                                                \
+				.atomic = dma_wch_atomic##idx,                                     \
+				.dma_channels = DT_INST_PROP(idx, dma_channels),                   \
+			},                                                                         \
+		.channels = dma_wch##idx##_channels,                                               \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(idx, &dma_wch_init, NULL, &dma_wch##idx##_data,                      \
+			      &dma_wch##idx##_config, PRE_KERNEL_1, CONFIG_DMA_INIT_PRIORITY,      \
+			      &dma_wch_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(WCH_DMA_INIT)
diff --git a/drivers/dma/dma_xilinx_axi_dma.c b/drivers/dma/dma_xilinx_axi_dma.c
index 3b40f42f56000..7503e64909d9b 100644
--- a/drivers/dma/dma_xilinx_axi_dma.c
+++ b/drivers/dma/dma_xilinx_axi_dma.c
@@ -359,8 +359,7 @@ uint32_t dma_xilinx_axi_dma_last_received_frame_length(const struct device *dev)
 	return data->channels[XILINX_AXI_DMA_RX_CHANNEL_NUM].last_rx_size;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER)
 static inline void
 dma_xilinx_axi_dma_acknowledge_interrupt(struct dma_xilinx_axi_dma_channel *channel_data)
 {
@@ -371,10 +370,9 @@ dma_xilinx_axi_dma_acknowledge_interrupt(struct dma_xilinx_axi_dma_channel *chan
 
 	dma_xilinx_axi_dma_write_reg(&channel_data->channel_regs->dmacr, dmacr);
 }
-#pragma GCC diagnostic pop
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER)
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER)
 static bool dma_xilinx_axi_dma_channel_has_error(
 	const struct dma_xilinx_axi_dma_channel *channel_data,
 	volatile const struct dma_xilinx_axi_dma_sg_descriptor *descriptor)
@@ -441,7 +439,7 @@ static bool dma_xilinx_axi_dma_channel_has_error(
 
 	return error;
 }
-#pragma GCC diagnostic pop
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER)
 
 static int
 dma_xilinx_axi_dma_clean_up_sg_descriptors(const struct device *dev,
@@ -522,12 +520,11 @@ dma_xilinx_axi_dma_clean_up_sg_descriptors(const struct device *dev,
 		processed_packets++;
 	}
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+	TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 	/* this clears the IRQ */
 	/* FIXME write the same value back... */
 	dma_xilinx_axi_dma_write_reg(&channel_data->channel_regs->dmasr, 0xffffffff);
-#pragma GCC diagnostic pop
+	TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 
 	/* writes must commit before returning from ISR */
 	barrier_dmem_fence_full();
@@ -615,8 +612,7 @@ static int dma_xilinx_axi_dma_start(const struct device *dev, uint32_t channel)
 		channel == XILINX_AXI_DMA_TX_CHANNEL_NUM ? "TX" : "RX", tail_descriptor,
 		channel_data->current_transfer_end_index);
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+	TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 	if (dma_xilinx_axi_dma_read_reg(&channel_data->channel_regs->dmasr) &
 	    XILINX_AXI_DMA_REGS_DMASR_HALTED) {
 
@@ -636,7 +632,7 @@ static int dma_xilinx_axi_dma_start(const struct device *dev, uint32_t channel)
 					     (uint32_t)(uintptr_t)first_unprocessed_descriptor);
 #endif
 	}
-#pragma GCC diagnostic pop
+	TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 
 	/* current descriptor MUST be set before tail descriptor */
 	barrier_dmem_fence_full();
@@ -669,8 +665,7 @@ static int dma_xilinx_axi_dma_start(const struct device *dev, uint32_t channel)
 
 		LOG_DBG("New DMACR value: %" PRIx32, new_control);
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+		TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 		dma_xilinx_axi_dma_write_reg(&channel_data->channel_regs->dmacr, new_control);
 		/* need to make sure start was committed before writing tail */
 		barrier_dmem_fence_full();
@@ -685,7 +680,7 @@ static int dma_xilinx_axi_dma_start(const struct device *dev, uint32_t channel)
 	dma_xilinx_axi_dma_write_reg(&channel_data->channel_regs->taildesc,
 				     (uint32_t)(uintptr_t)current_descriptor);
 #endif
-#pragma GCC diagnostic pop
+	TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 
 	dma_xilinx_axi_dma_enable_cache();
 
@@ -717,10 +712,9 @@ static int dma_xilinx_axi_dma_stop(const struct device *dev, uint32_t channel)
 	/* RS = 0 --> DMA will complete ongoing transactions and then go into hold */
 	new_control = new_control & ~XILINX_AXI_DMA_REGS_DMACR_RS;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+	TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 	dma_xilinx_axi_dma_write_reg(&channel_data->channel_regs->dmacr, new_control);
-#pragma GCC diagnostic pop
+	TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 
 	/* commit before returning to caller */
 	barrier_dmem_fence_full();
@@ -743,13 +737,12 @@ static int dma_xilinx_axi_dma_get_status(const struct device *dev, uint32_t chan
 
 	memset(stat, 0, sizeof(*stat));
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+	TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 	stat->busy = !(dma_xilinx_axi_dma_read_reg(&channel_data->channel_regs->dmasr) &
 		       XILINX_AXI_DMA_REGS_DMASR_IDLE) &&
 		     !(dma_xilinx_axi_dma_read_reg(&channel_data->channel_regs->dmasr) &
 		       XILINX_AXI_DMA_REGS_DMASR_HALTED);
-#pragma GCC diagnostic pop
+	TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 	stat->dir = channel_data->last_transfer_direction;
 
 	/* FIXME fill hardware-specific fields */
@@ -944,14 +937,13 @@ static int dma_xilinx_axi_dma_configure(const struct device *dev, uint32_t chann
 
 	if (!data->device_has_been_reset) {
 		LOG_INF("Soft-resetting the DMA core!");
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+		TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 		/* this resets BOTH RX and TX channels, although it is triggered in per-channel
 		 * DMACR
 		 */
 		dma_xilinx_axi_dma_write_reg(&data->channels[channel].channel_regs->dmacr,
 					     XILINX_AXI_DMA_REGS_DMACR_RESET);
-#pragma GCC diagnostic pop
+		TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER);
 		data->device_has_been_reset = true;
 	}
 
diff --git a/drivers/eeprom/CMakeLists.txt b/drivers/eeprom/CMakeLists.txt
index c7b5f65c21ff1..b22380fdde84f 100644
--- a/drivers/eeprom/CMakeLists.txt
+++ b/drivers/eeprom/CMakeLists.txt
@@ -19,7 +19,7 @@ if(CONFIG_EEPROM_SIMULATOR)
   endif()
 endif()
 zephyr_library_sources_ifdef(CONFIG_EEPROM_EMULATOR eeprom_emulator.c)
-zephyr_library_sources_ifdef(CONFIG_EEPROM_TMP116 eeprom_tmp116.c)
+zephyr_library_sources_ifdef(CONFIG_EEPROM_TMP11X eeprom_tmp11x.c)
 zephyr_library_sources_ifdef(CONFIG_EEPROM_XEC eeprom_mchp_xec.c)
 zephyr_library_sources_ifdef(CONFIG_EEPROM_FAKE eeprom_fake.c)
 
diff --git a/drivers/eeprom/Kconfig b/drivers/eeprom/Kconfig
index cf1cefb550540..02e7fc9eba200 100644
--- a/drivers/eeprom/Kconfig
+++ b/drivers/eeprom/Kconfig
@@ -96,7 +96,7 @@ config EEPROM_AT2X_INIT_PRIORITY
 source "drivers/eeprom/Kconfig.lpc11u6x"
 source "drivers/eeprom/Kconfig.stm32"
 source "drivers/eeprom/Kconfig.eeprom_emu"
-source "drivers/eeprom/Kconfig.tmp116"
+source "drivers/eeprom/Kconfig.tmp11x"
 source "drivers/eeprom/Kconfig.xec"
 source "drivers/eeprom/Kconfig.mb85rcxx"
 source "drivers/eeprom/Kconfig.mb85rsxx"
diff --git a/drivers/eeprom/Kconfig.tmp116 b/drivers/eeprom/Kconfig.tmp116
deleted file mode 100644
index 86db689f26533..0000000000000
--- a/drivers/eeprom/Kconfig.tmp116
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2021 Innoseis B.V.
-# SPDX-License-Identifier: Apache-2.0
-
-config EEPROM_TMP116
-	bool "TMP116 EEPROM driver"
-	default y
-	depends on DT_HAS_TI_TMP116_EEPROM_ENABLED
-	depends on TMP116
-	help
-	  Enable support for the on-chip EEPROM found on
-	  Texas instrument TMP116 temperature sensor
diff --git a/drivers/eeprom/Kconfig.tmp11x b/drivers/eeprom/Kconfig.tmp11x
new file mode 100644
index 0000000000000..6325523e492cf
--- /dev/null
+++ b/drivers/eeprom/Kconfig.tmp11x
@@ -0,0 +1,11 @@
+# Copyright (c) 2021 Innoseis B.V.
+# SPDX-License-Identifier: Apache-2.0
+
+config EEPROM_TMP11X
+	bool "TMP116, TMP117 and TMP119 EEPROM driver"
+	default y
+	depends on DT_HAS_TI_TMP11X_EEPROM_ENABLED
+	depends on TMP11X
+	help
+	  Enable support for the on-chip EEPROM found on
+	  Texas instrument TMP116, TMP117 and TMP119 temperature sensor
diff --git a/drivers/eeprom/eeprom_stm32.c b/drivers/eeprom/eeprom_stm32.c
index cc096247c16e0..a3288fe3dc6de 100644
--- a/drivers/eeprom/eeprom_stm32.c
+++ b/drivers/eeprom/eeprom_stm32.c
@@ -91,8 +91,6 @@ static int eeprom_stm32_write(const struct device *dev, off_t offset,
 	ret = HAL_FLASHEx_DATAEEPROM_Lock();
 	if (ret) {
 		LOG_ERR("failed to lock EEPROM (err %d)", ret);
-		k_mutex_unlock(&lock);
-		return ret;
 	}
 
 	k_mutex_unlock(&lock);
diff --git a/drivers/eeprom/eeprom_tmp116.c b/drivers/eeprom/eeprom_tmp116.c
deleted file mode 100644
index 5a959aa9b3242..0000000000000
--- a/drivers/eeprom/eeprom_tmp116.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2020 Innoseis B.V
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <errno.h>
-
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/eeprom.h>
-#include <zephyr/drivers/sensor/tmp116.h>
-
-#define DT_DRV_COMPAT ti_tmp116_eeprom
-
-struct eeprom_tmp116_config {
-	const struct device *parent;
-};
-
-BUILD_ASSERT(CONFIG_EEPROM_INIT_PRIORITY >
-	     CONFIG_SENSOR_INIT_PRIORITY,
-	     "TMP116 eeprom driver must be initialized after TMP116 sensor "
-	     "driver");
-
-static size_t eeprom_tmp116_size(const struct device *dev)
-{
-	return EEPROM_TMP116_SIZE;
-}
-
-static int eeprom_tmp116_write(const struct device *dev, off_t offset,
-			       const void *data, size_t len)
-{
-	const struct eeprom_tmp116_config *config = dev->config;
-
-	return tmp116_eeprom_write(config->parent, offset, data, len);
-}
-
-static int eeprom_tmp116_read(const struct device *dev, off_t offset, void *data,
-			      size_t len)
-{
-	const struct eeprom_tmp116_config *config = dev->config;
-
-	return tmp116_eeprom_read(config->parent, offset, data, len);
-}
-
-static int eeprom_tmp116_init(const struct device *dev)
-{
-	const struct eeprom_tmp116_config *config = dev->config;
-
-	if (!device_is_ready(config->parent)) {
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static DEVICE_API(eeprom, eeprom_tmp116_api) = {
-	.read = eeprom_tmp116_read,
-	.write = eeprom_tmp116_write,
-	.size = eeprom_tmp116_size,
-};
-
-#define DEFINE_TMP116(_num)						       \
-	static const struct eeprom_tmp116_config eeprom_tmp116_config##_num = { \
-		.parent =  DEVICE_DT_GET(DT_INST_BUS(_num))		       \
-	};								       \
-	DEVICE_DT_INST_DEFINE(_num, eeprom_tmp116_init, NULL,		       \
-			      NULL, &eeprom_tmp116_config##_num, POST_KERNEL,   \
-			      CONFIG_EEPROM_INIT_PRIORITY, &eeprom_tmp116_api);
-
-DT_INST_FOREACH_STATUS_OKAY(DEFINE_TMP116);
diff --git a/drivers/eeprom/eeprom_tmp11x.c b/drivers/eeprom/eeprom_tmp11x.c
new file mode 100644
index 0000000000000..1966683ee6dcc
--- /dev/null
+++ b/drivers/eeprom/eeprom_tmp11x.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2020 Innoseis B.V
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/sensor/tmp11x.h>
+
+#define DT_DRV_COMPAT ti_tmp11x_eeprom
+
+struct eeprom_tmp11x_config {
+	const struct device *parent;
+};
+
+BUILD_ASSERT(CONFIG_EEPROM_INIT_PRIORITY >
+	     CONFIG_SENSOR_INIT_PRIORITY,
+	     "TMP11X eeprom driver must be initialized after TMP11X sensor "
+	     "driver");
+
+static size_t eeprom_tmp11x_size(const struct device *dev)
+{
+	return EEPROM_TMP11X_SIZE;
+}
+
+static int eeprom_tmp11x_write(const struct device *dev, off_t offset,
+			       const void *data, size_t len)
+{
+	const struct eeprom_tmp11x_config *config = dev->config;
+
+	return tmp11x_eeprom_write(config->parent, offset, data, len);
+}
+
+static int eeprom_tmp11x_read(const struct device *dev, off_t offset, void *data,
+			      size_t len)
+{
+	const struct eeprom_tmp11x_config *config = dev->config;
+
+	return tmp11x_eeprom_read(config->parent, offset, data, len);
+}
+
+static int eeprom_tmp11x_init(const struct device *dev)
+{
+	const struct eeprom_tmp11x_config *config = dev->config;
+
+	if (!device_is_ready(config->parent)) {
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(eeprom, eeprom_tmp11x_api) = {
+	.read = eeprom_tmp11x_read,
+	.write = eeprom_tmp11x_write,
+	.size = eeprom_tmp11x_size,
+};
+
+#define DEFINE_TMP11X(_num)						       \
+	static const struct eeprom_tmp11x_config eeprom_tmp11x_config##_num = { \
+		.parent =  DEVICE_DT_GET(DT_INST_BUS(_num))		       \
+	};								       \
+	DEVICE_DT_INST_DEFINE(_num, eeprom_tmp11x_init, NULL,		       \
+			      NULL, &eeprom_tmp11x_config##_num, POST_KERNEL,   \
+			      CONFIG_EEPROM_INIT_PRIORITY, &eeprom_tmp11x_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_TMP11X);
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
index 6decc76781b17..c59eba033b019 100644
--- a/drivers/entropy/CMakeLists.txt
+++ b/drivers/entropy/CMakeLists.txt
@@ -11,14 +11,15 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_RNG           entropy_mcux_rng.
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_RNGA          entropy_mcux_rnga.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_TRNG          entropy_mcux_trng.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_CAAM          entropy_mcux_caam.c)
+zephyr_library_sources_ifdef(CONFIG_ENTROPY_NXP_ELE_TRNG       entropy_nxp_ele.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_NRF5_RNG           entropy_nrf5.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_NRF_CRACEN_CTR_DRBG entropy_nrf_cracen.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_SAM_RNG            entropy_sam.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_SMARTBOND_TRNG     entropy_smartbond.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_STM32_RNG          entropy_stm32.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_LITEX_RNG          entropy_litex.c)
-if(CONFIG_FAKE_ENTROPY_NATIVE_POSIX)
-  zephyr_library_sources(fake_entropy_native_posix.c)
+if(CONFIG_FAKE_ENTROPY_NATIVE_SIM)
+  zephyr_library_sources(fake_entropy_native_sim.c)
   if(CONFIG_NATIVE_LIBRARY)
     target_sources(native_simulator INTERFACE fake_entropy_native_bottom.c)
   else()
@@ -36,6 +37,7 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_SILABS_SIWX91X  entropy_silabs_siwx9
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_PSA_CRYPTO_RNG  entropy_psa_crypto.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_NPCX_DRBG       entropy_npcx_drbg.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAX32_TRNG      entropy_max32.c)
+zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAXQ10XX_RNG    entropy_maxq10xx.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_RENESAS_RA      entropy_renesas_ra.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_SY1XX_TRNG      entropy_sy1xx_trng.c)
 
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index e170d3381a1bc..3664ce0f18416 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -23,13 +23,14 @@ config ENTROPY_INIT_PRIORITY
 source "drivers/entropy/Kconfig.b91"
 source "drivers/entropy/Kconfig.cc13xx_cc26xx"
 source "drivers/entropy/Kconfig.mcux"
+source "drivers/entropy/Kconfig.nxp"
 source "drivers/entropy/Kconfig.stm32"
 source "drivers/entropy/Kconfig.esp32"
 source "drivers/entropy/Kconfig.nrf5"
 source "drivers/entropy/Kconfig.nrf_cracen"
 source "drivers/entropy/Kconfig.sam"
 source "drivers/entropy/Kconfig.smartbond"
-source "drivers/entropy/Kconfig.native_posix"
+source "drivers/entropy/Kconfig.native_sim"
 source "drivers/entropy/Kconfig.rv32m1"
 source "drivers/entropy/Kconfig.litex"
 source "drivers/entropy/Kconfig.gecko"
@@ -39,6 +40,7 @@ source "drivers/entropy/Kconfig.bt_hci"
 source "drivers/entropy/Kconfig.psa_crypto"
 source "drivers/entropy/Kconfig.npcx"
 source "drivers/entropy/Kconfig.max32"
+source "drivers/entropy/Kconfig.maxq10xx"
 source "drivers/entropy/Kconfig.renesas_ra"
 source "drivers/entropy/Kconfig.sy1xx"
 
diff --git a/drivers/entropy/Kconfig.maxq10xx b/drivers/entropy/Kconfig.maxq10xx
new file mode 100644
index 0000000000000..3e18b761eac8a
--- /dev/null
+++ b/drivers/entropy/Kconfig.maxq10xx
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Vogl Electronic GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+config ENTROPY_MAXQ10XX_RNG
+	bool "MAXQ10xx entropy number generator driver"
+	default y
+	depends on DT_HAS_ADI_MAXQ10XX_TRNG_ENABLED
+	select ENTROPY_HAS_DRIVER
+	select SPI
+	select MFD
+	select CRC
+	help
+	  This option enables the entropy number generator driver for the
+	  MAXQ10xx crypto chips.
+
+# Don't use use the MAXQ10XX RNG as a random source since it can be quite slow.
+# Instead, use the software-implemented xoshiro PRNG.
+choice RNG_GENERATOR_CHOICE
+	default XOSHIRO_RANDOM_GENERATOR if ENTROPY_MAXQ10XX_RNG
+endchoice
diff --git a/drivers/entropy/Kconfig.native_posix b/drivers/entropy/Kconfig.native_posix
deleted file mode 100644
index 39298c444df6b..0000000000000
--- a/drivers/entropy/Kconfig.native_posix
+++ /dev/null
@@ -1,23 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-config FAKE_ENTROPY_NATIVE_POSIX
-	bool "Native posix entropy driver"
-	default y
-	depends on DT_HAS_ZEPHYR_NATIVE_POSIX_RNG_ENABLED
-	select ENTROPY_HAS_DRIVER
-	help
-	  This option enables the test random number generator for the
-	  native_posix board (ARCH_POSIX). This is based on the host random() API.
-	  Note that this entropy generator is only meant for test purposes and does
-	  not generate real entropy.
-	  It actually generates always the same sequence of random numbers if
-	  initialized with the same seed.
-
-config FAKE_ENTROPY_NATIVE_POSIX_SEED_BY_DEFAULT
-	bool "Seed the generator by default"
-	default y
-	depends on FAKE_ENTROPY_NATIVE_POSIX
-	help
-	  Apply a seed by default, even if the user does not request it through the command line.
-	  Disabling this feature allows some other component to seed the host standard library random
-	  generator without this component's default initialization interfering.
diff --git a/drivers/entropy/Kconfig.native_sim b/drivers/entropy/Kconfig.native_sim
new file mode 100644
index 0000000000000..adcf3f407cd02
--- /dev/null
+++ b/drivers/entropy/Kconfig.native_sim
@@ -0,0 +1,37 @@
+# SPDX-License-Identifier: Apache-2.0
+
+config FAKE_ENTROPY_NATIVE_SIM
+	bool "Native simulator entropy driver"
+	default y
+	depends on DT_HAS_ZEPHYR_NATIVE_POSIX_RNG_ENABLED || DT_HAS_ZEPHYR_NATIVE_SIM_RNG_ENABLED
+	select ENTROPY_HAS_DRIVER
+	help
+	  This option enables the test random number generator for the
+	  native_sim board (ARCH_POSIX). This is based on the host random() API.
+	  Note that this entropy generator is only meant for test purposes and does
+	  not generate real entropy.
+	  It actually generates always the same sequence of random numbers if
+	  initialized with the same seed.
+
+config FAKE_ENTROPY_NATIVE_SIM_SEED_BY_DEFAULT
+	bool "Seed the generator by default"
+	default y
+	depends on FAKE_ENTROPY_NATIVE_SIM
+	help
+	  Apply a seed by default, even if the user does not request it through the command line.
+	  Disabling this feature allows some other component to seed the host standard library random
+	  generator without this component's default initialization interfering.
+
+config FAKE_ENTROPY_NATIVE_POSIX
+	bool "Native posix entropy driver (deprecated)"
+	select FAKE_ENTROPY_NATIVE_SIM
+	select DEPRECATED
+	help
+	  Deprecated option in favour of FAKE_ENTROPY_NATIVE_SIM
+
+config FAKE_ENTROPY_NATIVE_POSIX_SEED_BY_DEFAULT
+	bool "Seed the generator by default (deprecated)"
+	depends on FAKE_ENTROPY_NATIVE_POSIX
+	select DEPRECATED
+	help
+	  Deprecated option. Replaced by FAKE_ENTROPY_NATIVE_SIM_SEED_BY_DEFAULT
diff --git a/drivers/entropy/Kconfig.nxp b/drivers/entropy/Kconfig.nxp
new file mode 100644
index 0000000000000..895ff59dd76f8
--- /dev/null
+++ b/drivers/entropy/Kconfig.nxp
@@ -0,0 +1,12 @@
+# NXP ELE entropy configuration options
+
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config ENTROPY_NXP_ELE_TRNG
+	bool "NXP ELE TRNG driver"
+	default y
+	depends on DT_HAS_NXP_ELE_TRNG_ENABLED
+	select ENTROPY_HAS_DRIVER
+	help
+	  This option enables the ELE true random number generator (TRNG)
diff --git a/drivers/entropy/Kconfig.stm32 b/drivers/entropy/Kconfig.stm32
index 4bf47e7224dd1..7c9cfc441a764 100644
--- a/drivers/entropy/Kconfig.stm32
+++ b/drivers/entropy/Kconfig.stm32
@@ -8,7 +8,6 @@ menuconfig ENTROPY_STM32_RNG
 	default y
 	depends on DT_HAS_ST_STM32_RNG_ENABLED || DT_HAS_ST_STM32_RNG_NOIRQ_ENABLED
 	select ENTROPY_HAS_DRIVER
-	select USE_STM32_LL_RNG
 	help
 	  This option enables the RNG processor, which is a entropy number
 	  generator, based on a continuous analog noise, that provides
diff --git a/drivers/entropy/entropy_maxq10xx.c b/drivers/entropy/entropy_maxq10xx.c
new file mode 100644
index 0000000000000..d20e798330a6e
--- /dev/null
+++ b/drivers/entropy/entropy_maxq10xx.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2025 Vogl Electronic GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT adi_maxq10xx_trng
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/drivers/mfd/mfd_maxq10xx.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(entropy_maxq10xx, CONFIG_ENTROPY_LOG_LEVEL);
+
+#define MAXQ10XX_CMD_HEADER                0xAA
+#define MAXQ10XX_CMD_GET_RANDOM            0xC9
+#define MAXQ10XX_CMD_GET_RANDOM_INPUT_DATA 0x02
+#define MAXQ10XX_CMD_READ_READY            0x55
+
+#define MAXQ10XX_CRC16_POLYNOMIAL    0xA001
+#define MAXQ10XX_CRC16_INITIAL_VALUE 0x0000
+
+#define MAXQ10XX_WAIT_TIME K_MSEC(1)
+
+struct entropy_maxq10xx_config {
+	struct spi_dt_spec spi;
+	const struct device *parent;
+};
+
+static int entropy_maxq10xx_send_cmd(const struct device *dev, uint16_t length)
+{
+	const struct entropy_maxq10xx_config *config = dev->config;
+
+	uint8_t buffer_tx[9];
+	uint16_t crc;
+	int ret;
+
+	buffer_tx[0] = MAXQ10XX_CMD_HEADER;
+	buffer_tx[1] = 0x00;
+	buffer_tx[2] = MAXQ10XX_CMD_GET_RANDOM;
+	buffer_tx[3] = 0x00;
+	buffer_tx[4] = MAXQ10XX_CMD_GET_RANDOM_INPUT_DATA;
+
+	sys_put_be16(length, &buffer_tx[5]);
+
+	crc = crc16_reflect(MAXQ10XX_CRC16_POLYNOMIAL, MAXQ10XX_CRC16_INITIAL_VALUE, buffer_tx, 7);
+
+	sys_put_le16(crc, &buffer_tx[7]);
+
+	const struct spi_buf tx_buf[] = {{
+		.buf = buffer_tx,
+		.len = ARRAY_SIZE(buffer_tx),
+	}};
+	const struct spi_buf_set tx = {
+		.buffers = tx_buf,
+		.count = ARRAY_SIZE(tx_buf),
+	};
+
+	LOG_HEXDUMP_DBG(buffer_tx, sizeof(buffer_tx), "TX buffer");
+
+	ret = spi_write_dt(&config->spi, &tx);
+
+	return ret;
+}
+
+static int entropy_maxq10xx_wait(const struct device *dev)
+{
+	const struct entropy_maxq10xx_config *config = dev->config;
+	uint8_t buffer_rx[1];
+	int ret;
+
+	const struct spi_buf rx_buf[] = {{
+		.buf = buffer_rx,
+		.len = ARRAY_SIZE(buffer_rx),
+	}};
+	const struct spi_buf_set rx = {
+		.buffers = rx_buf,
+		.count = ARRAY_SIZE(rx_buf),
+	};
+
+	while (1) {
+		ret = spi_read_dt(&config->spi, &rx);
+		if ((ret < 0) || (buffer_rx[0] == MAXQ10XX_CMD_READ_READY)) {
+			break;
+		}
+
+		k_sleep(MAXQ10XX_WAIT_TIME);
+	};
+
+	return ret;
+}
+
+static int entropy_maxq10xx_read(const struct device *dev, uint8_t *buffer, uint16_t length)
+{
+	const struct entropy_maxq10xx_config *config = dev->config;
+	uint8_t execution_status[2];
+	uint8_t length_data[2];
+	uint8_t crc[2];
+	uint16_t crc_calc;
+	int ret;
+
+	const struct spi_buf rx_buf[] = {
+		{
+			.buf = execution_status,
+			.len = ARRAY_SIZE(execution_status),
+		},
+		{
+			.buf = length_data,
+			.len = ARRAY_SIZE(length_data),
+		}
+	};
+	const struct spi_buf_set rx = {
+		.buffers = rx_buf,
+		.count = ARRAY_SIZE(rx_buf),
+	};
+
+	ret = spi_read_dt(&config->spi, &rx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (execution_status[0] != 0 || execution_status[1] != 0) {
+		LOG_ERR("Execution status: 0x%02X 0x%02X", execution_status[0],
+			execution_status[1]);
+		return -EIO;
+	}
+
+	if (length != sys_get_be16(length_data)) {
+		LOG_ERR("Length mismatch: %d != %d", length, sys_get_be16(length_data));
+		return -EIO;
+	}
+
+	const struct spi_buf rx_data_buf[] = {
+		{
+			.buf = buffer,
+			.len = length,
+		},
+		{
+			.buf = crc,
+			.len = sizeof(crc),
+		}
+	};
+
+	const struct spi_buf_set rx_data = {
+		.buffers = rx_data_buf,
+		.count = ARRAY_SIZE(rx_data_buf),
+	};
+
+	ret = spi_read_dt(&config->spi, &rx_data);
+	if (ret < 0) {
+		return ret;
+	}
+
+	uint8_t header_tx[1] = {MAXQ10XX_CMD_READ_READY};
+
+	crc_calc = crc16_reflect(MAXQ10XX_CRC16_POLYNOMIAL, MAXQ10XX_CRC16_INITIAL_VALUE, header_tx,
+				 sizeof(header_tx));
+	crc_calc = crc16_reflect(MAXQ10XX_CRC16_POLYNOMIAL, crc_calc, execution_status,
+				 sizeof(execution_status));
+	crc_calc = crc16_reflect(MAXQ10XX_CRC16_POLYNOMIAL, crc_calc, length_data,
+				 sizeof(length_data));
+	crc_calc = crc16_reflect(MAXQ10XX_CRC16_POLYNOMIAL, crc_calc, buffer, length);
+
+	if (crc_calc != sys_get_le16(crc)) {
+		LOG_ERR("CRC error: 0x%04X != 0x%04X", crc_calc, sys_get_le16(crc));
+		return -EIO;
+	}
+
+	return ret;
+}
+
+static int entropy_maxq10xx_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t length)
+{
+	const struct entropy_maxq10xx_config *config = dev->config;
+	struct k_sem *sem_lock = mfd_maxq10xx_get_lock(config->parent);
+
+	int ret;
+
+	if (!spi_is_ready_dt(&config->spi)) {
+		return -EAGAIN;
+	}
+
+	k_sem_take(sem_lock, K_FOREVER);
+
+	ret = entropy_maxq10xx_send_cmd(dev, length);
+	if (ret < 0) {
+		LOG_ERR("Failed to send command: %d", ret);
+		goto exit;
+	}
+
+	ret = entropy_maxq10xx_wait(dev);
+	if (ret < 0) {
+		LOG_ERR("Failed to wait for ready: %d", ret);
+		goto exit;
+	}
+
+	ret = entropy_maxq10xx_read(dev, buffer, length);
+	if (ret < 0) {
+		LOG_ERR("Failed to read data: %d", ret);
+	}
+exit:
+	k_sem_give(sem_lock);
+	return ret;
+}
+
+static DEVICE_API(entropy, entropy_maxq10xx_api) = {
+	.get_entropy = entropy_maxq10xx_get_entropy
+};
+
+#define DEFINE_MAXQ10XX_ENTROPY(_num)                                                              \
+	static const struct entropy_maxq10xx_config entropy_maxq10xx_config##_num = {              \
+		.spi = SPI_DT_SPEC_GET(DT_INST_PARENT(_num), SPI_WORD_SET(8), 0),                  \
+		.parent = DEVICE_DT_GET(DT_INST_PARENT(_num)),                                     \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(_num, NULL, NULL, NULL,                                              \
+			      &entropy_maxq10xx_config##_num, POST_KERNEL,                         \
+			      CONFIG_MFD_MAXQ10XX_INIT_PRIORITY, &entropy_maxq10xx_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_MAXQ10XX_ENTROPY);
diff --git a/drivers/entropy/entropy_mcux_trng.c b/drivers/entropy/entropy_mcux_trng.c
index be542daddec24..d541c5fbea476 100644
--- a/drivers/entropy/entropy_mcux_trng.c
+++ b/drivers/entropy/entropy_mcux_trng.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017 Linaro Limited.
+ * Copyright 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,6 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/entropy.h>
 #include <zephyr/random/random.h>
+#include <zephyr/pm/device.h>
 #include <zephyr/init.h>
 
 #include "fsl_trng.h"
@@ -53,8 +55,29 @@ static int entropy_mcux_trng_init(const struct device *dev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_DEVICE
+static int entropy_mcux_trng_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		break;
+	case PM_DEVICE_ACTION_TURN_OFF:
+		break;
+	case PM_DEVICE_ACTION_TURN_ON:
+		entropy_mcux_trng_init(dev);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
+}
+#endif /*CONFIG_PM_DEVICE*/
+
+PM_DEVICE_DT_INST_DEFINE(0, entropy_mcux_trng_pm_action);
 DEVICE_DT_INST_DEFINE(0,
-		    entropy_mcux_trng_init, NULL, NULL,
+		    entropy_mcux_trng_init, PM_DEVICE_DT_INST_GET(0), NULL,
 		    &entropy_mcux_config,
 		    PRE_KERNEL_1, CONFIG_ENTROPY_INIT_PRIORITY,
 		    &entropy_mcux_trng_api_funcs);
diff --git a/drivers/entropy/entropy_neorv32_trng.c b/drivers/entropy/entropy_neorv32_trng.c
index b33de87d7f1a7..8869b0e2a8032 100644
--- a/drivers/entropy/entropy_neorv32_trng.c
+++ b/drivers/entropy/entropy_neorv32_trng.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+ * Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,10 +17,19 @@
 
 LOG_MODULE_REGISTER(neorv32_trng, CONFIG_ENTROPY_LOG_LEVEL);
 
-/* TRNG CTRL register bits */
-#define NEORV32_TRNG_CTRL_DATA_MASK BIT_MASK(8)
-#define NEORV32_TRNG_CTRL_EN        BIT(30)
-#define NEORV32_TRNG_CTRL_VALID     BIT(31)
+/* Register offsets */
+#define NEORV32_TRNG_CTRL 0x00
+#define NEORV32_TRNG_DATA 0x04
+
+/* CTRL register bits */
+#define NEORV32_TRNG_CTRL_EN         BIT(0)
+#define NEORV32_TRNG_CTRL_FIFO_CLR   BIT(1)
+#define NEORV32_TRNG_CTRL_FIFO_DEPTH GENMASK(5, 2)
+#define NEORV32_TRNG_CTRL_SIM_MODE   BIT(6)
+#define NEORV32_TRNG_CTRL_AVAIL      BIT(7)
+
+/* DATA register bits */
+#define NEORV32_TRNG_DATA_MASK GENMASK(7, 0)
 
 struct neorv32_trng_config {
 	const struct device *syscon;
@@ -31,14 +40,21 @@ static inline uint32_t neorv32_trng_read_ctrl(const struct device *dev)
 {
 	const struct neorv32_trng_config *config = dev->config;
 
-	return sys_read32(config->base);
+	return sys_read32(config->base + NEORV32_TRNG_CTRL);
 }
 
 static inline void neorv32_trng_write_ctrl(const struct device *dev, uint32_t ctrl)
 {
 	const struct neorv32_trng_config *config = dev->config;
 
-	sys_write32(ctrl, config->base);
+	sys_write32(ctrl, config->base + NEORV32_TRNG_CTRL);
+}
+
+static inline uint8_t neorv32_trng_read_data(const struct device *dev)
+{
+	const struct neorv32_trng_config *config = dev->config;
+
+	return sys_read32(config->base + NEORV32_TRNG_DATA) & NEORV32_TRNG_DATA_MASK;
 }
 
 static int neorv32_trng_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t len)
@@ -48,8 +64,8 @@ static int neorv32_trng_get_entropy(const struct device *dev, uint8_t *buffer, u
 	while (len > 0) {
 		ctrl = neorv32_trng_read_ctrl(dev);
 
-		if ((ctrl & NEORV32_TRNG_CTRL_VALID) != 0) {
-			*buffer++ = ctrl & NEORV32_TRNG_CTRL_DATA_MASK;
+		if ((ctrl & NEORV32_TRNG_CTRL_AVAIL) != 0) {
+			*buffer++ = neorv32_trng_read_data(dev);
 			len--;
 		}
 	}
@@ -65,8 +81,8 @@ static int neorv32_trng_get_entropy_isr(const struct device *dev, uint8_t *buffe
 
 	if ((flags & ENTROPY_BUSYWAIT) == 0) {
 		ctrl = neorv32_trng_read_ctrl(dev);
-		if ((ctrl & NEORV32_TRNG_CTRL_VALID) != 0) {
-			*buffer = ctrl & NEORV32_TRNG_CTRL_DATA_MASK;
+		if ((ctrl & NEORV32_TRNG_CTRL_AVAIL) != 0) {
+			*buffer = neorv32_trng_read_data(dev);
 			return 1;
 		}
 
@@ -93,13 +109,13 @@ static int neorv32_trng_init(const struct device *dev)
 		return -EINVAL;
 	}
 
-	err = syscon_read_reg(config->syscon, NEORV32_SYSINFO_FEATURES, &features);
+	err = syscon_read_reg(config->syscon, NEORV32_SYSINFO_SOC, &features);
 	if (err < 0) {
 		LOG_ERR("failed to determine implemented features (err %d)", err);
 		return err;
 	}
 
-	if ((features & NEORV32_SYSINFO_FEATURES_IO_TRNG) == 0) {
+	if ((features & NEORV32_SYSINFO_SOC_IO_TRNG) == 0) {
 		LOG_ERR("neorv32 trng not supported");
 		return -ENODEV;
 	}
diff --git a/drivers/entropy/entropy_nxp_ele.c b/drivers/entropy/entropy_nxp_ele.c
new file mode 100644
index 0000000000000..8d8e037de7f04
--- /dev/null
+++ b/drivers/entropy/entropy_nxp_ele.c
@@ -0,0 +1,71 @@
+/* entropy_nxp_ele.c - NXP ELE entropy driver */
+
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nxp_ele_trng
+
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <soc.h>
+
+#include "sss_crypto.h"
+
+struct entropy_ele_data_str {
+	struct k_sem sem_lock;
+};
+
+static struct entropy_ele_data_str entropy_ele_data;
+
+static int entropy_ele_get_entropy(const struct device *dev, uint8_t *buf, uint16_t len)
+{
+	sss_sscp_rng_t ctx;
+	int result = -EIO;
+
+	__ASSERT_NO_MSG(buf != NULL);
+	__ASSERT_NO_MSG(&entropy_ele_data == dev->data);
+
+	k_sem_take(&entropy_ele_data.sem_lock, K_FOREVER);
+
+	if (CRYPTO_InitHardware() != kStatus_Success) {
+		goto exit;
+	}
+
+	if (sss_sscp_rng_context_init(&g_sssSession, &ctx, 0u) != kStatus_SSS_Success) {
+		goto exit;
+	}
+
+	if (sss_sscp_rng_get_random(&ctx, buf, len) != kStatus_SSS_Success) {
+		goto exit;
+	}
+
+	if (sss_sscp_rng_free(&ctx) != kStatus_SSS_Success) {
+		goto exit;
+	}
+
+	result = 0;
+
+exit:
+	k_sem_give(&entropy_ele_data.sem_lock);
+	return result;
+}
+
+static int entropy_ele_init(const struct device *dev)
+{
+	__ASSERT_NO_MSG(&entropy_ele_data == dev->data);
+
+	k_sem_init(&entropy_ele_data.sem_lock, 1, 1);
+
+	return 0;
+}
+
+static DEVICE_API(entropy, entropy_ele_api_funcs) = {.get_entropy = entropy_ele_get_entropy};
+
+DEVICE_DT_INST_DEFINE(0, entropy_ele_init, NULL, &entropy_ele_data, NULL, PRE_KERNEL_1,
+		      CONFIG_ENTROPY_INIT_PRIORITY, &entropy_ele_api_funcs);
diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
index 602daf19277fa..1f76d3b5126cc 100644
--- a/drivers/entropy/entropy_stm32.c
+++ b/drivers/entropy/entropy_stm32.c
@@ -177,6 +177,14 @@ static int entropy_stm32_resume(void)
 
 	res = clock_control_on(dev_data->clock,
 			(clock_control_subsys_t)&dev_cfg->pclken[0]);
+#if defined(CONFIG_SOC_STM32WB09XX)
+	/**
+	 * STM32WB09 RNG clock domain runs at (16 MHz / CLKDIV).
+	 * CLKDIV is 256 after reset which makes the RNG runs VERY slow.
+	 * Configure CLKDIV=1 to ensure RNG runs at an acceptable speed.
+	 */
+	LL_RNG_SetSamplingClockEnableDivider(rng, 0);
+#endif
 	LL_RNG_Enable(rng);
 	ll_rng_enable_it(rng);
 
diff --git a/drivers/entropy/entropy_stm32.h b/drivers/entropy/entropy_stm32.h
index 2ddc6fbac1c61..533cc03149325 100644
--- a/drivers/entropy/entropy_stm32.h
+++ b/drivers/entropy/entropy_stm32.h
@@ -40,12 +40,11 @@ static inline void ll_rng_enable_it(RNG_TypeDef *RNGx)
 
 static inline uint32_t ll_rng_is_active_seis(RNG_TypeDef *RNGx)
 {
-#if defined(CONFIG_SOC_SERIES_STM32WB0X)
-#	if defined(CONFIG_SOC_STM32WB09XX)
-		return LL_RNG_IsActiveFlag_ENTROPY_ERR(RNGx);
-#	else
-		return LL_RNG_IsActiveFlag_FAULT(RNGx);
-#	endif
+#if defined(CONFIG_SOC_STM32WB09XX)
+	return LL_RNG_IsActiveFlag_ENTROPY_ERR(RNGx);
+#elif defined(CONFIG_SOC_SERIES_STM32WB0X)
+	/* STM32WB05 / STM32WB06 / STM32WB07 */
+	return LL_RNG_IsActiveFlag_FAULT(RNGx);
 #else
 	return LL_RNG_IsActiveFlag_SEIS(RNGx);
 #endif /* CONFIG_SOC_SERIES_STM32WB0X */
@@ -53,12 +52,11 @@ static inline uint32_t ll_rng_is_active_seis(RNG_TypeDef *RNGx)
 
 static inline void ll_rng_clear_seis(RNG_TypeDef *RNGx)
 {
-#if defined(CONFIG_SOC_SERIES_STM32WB0X)
-#	if defined(CONFIG_SOC_STM32WB09XX)
-		LL_RNG_SetResetHealthErrorFlags(RNGx, 1);
-#	else
-		LL_RNG_ClearFlag_FAULT(RNGx);
-#	endif
+#if defined(CONFIG_SOC_STM32WB09XX)
+	LL_RNG_SetResetHealthErrorFlags(RNGx, 1);
+#elif defined(CONFIG_SOC_SERIES_STM32WB0X)
+	/* STM32WB05 / STM32WB06 / STM32WB07 */
+	LL_RNG_ClearFlag_FAULT(RNGx);
 #else
 	LL_RNG_ClearFlag_SEIS(RNGx);
 #endif /* CONFIG_SOC_SERIES_STM32WB0X */
@@ -80,12 +78,11 @@ static inline uint32_t ll_rng_is_active_secs(RNG_TypeDef *RNGx)
 
 static inline uint32_t ll_rng_is_active_drdy(RNG_TypeDef *RNGx)
 {
-#if defined(CONFIG_SOC_SERIES_STM32WB0X)
-#	if defined(CONFIG_SOC_STM32WB09XX)
-		return LL_RNG_IsActiveFlag_VAL_READY(RNGx);
-#	else
-		return LL_RNG_IsActiveFlag_RNGRDY(RNGx);
-#	endif
+#if defined(CONFIG_SOC_STM32WB09XX)
+	return LL_RNG_IsActiveFlag_VAL_READY(RNGx);
+#elif defined(CONFIG_SOC_SERIES_STM32WB0X)
+	/* STM32WB05 / STM32WB06 / STM32WB07 */
+	return LL_RNG_IsActiveFlag_RNGRDY(RNGx);
 #else
 	return LL_RNG_IsActiveFlag_DRDY(RNGx);
 #endif /* CONFIG_SOC_SERIES_STM32WB0X */
@@ -93,12 +90,23 @@ static inline uint32_t ll_rng_is_active_drdy(RNG_TypeDef *RNGx)
 
 static inline uint16_t ll_rng_read_rand_data(RNG_TypeDef *RNGx)
 {
-#if defined(CONFIG_SOC_SERIES_STM32WB0X)
-#	if defined(CONFIG_SOC_STM32WB09XX)
-		return (uint16_t)LL_RNG_GetRndVal(RNGx);
-#	else
-		return LL_RNG_ReadRandData16(RNGx);
-#	endif
+#if defined(CONFIG_SOC_STM32WB09XX)
+	uint16_t rnd = (uint16_t)LL_RNG_GetRndVal(RNGx);
+
+	/**
+	 * STM32WB09 TRNG does not clear IRQ flags in hardware.
+	 * We must clear the "FIFO full" flag now that we consumed data
+	 * from it to ensure the TRNG's IRQ line goes back to low state.
+	 *
+	 * Raw register access is performed because STM32CubeWB0 v1.0.0
+	 * package is lacking the LL function to clear IRQ flags.
+	 */
+	WRITE_REG(RNG->IRQ_SR, RNG_IRQ_SR_FF_FULL_IRQ);
+
+	return rnd;
+#elif defined(CONFIG_SOC_SERIES_STM32WB0X)
+	/* STM32WB05 / STM32WB06 / STM32WB07 */
+	return LL_RNG_ReadRandData16(RNGx);
 #else
 	return (uint16_t)LL_RNG_ReadRandData32(RNGx);
 #endif /* CONFIG_SOC_SERIES_STM32WB0X */
diff --git a/drivers/entropy/fake_entropy_native_bottom.c b/drivers/entropy/fake_entropy_native_bottom.c
index f456b978d99c9..119e41c446ffd 100644
--- a/drivers/entropy/fake_entropy_native_bottom.c
+++ b/drivers/entropy/fake_entropy_native_bottom.c
@@ -3,8 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- * Bottom/Linux side of the pseudo-random entropy generator for
- * ARCH_POSIX architecture
+ * Bottom/Linux side of the pseudo-random entropy generator for the native simulator
  */
 
 #undef _XOPEN_SOURCE
diff --git a/drivers/entropy/fake_entropy_native_posix.c b/drivers/entropy/fake_entropy_native_posix.c
deleted file mode 100644
index 04f25b2e62da1..0000000000000
--- a/drivers/entropy/fake_entropy_native_posix.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2018 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Pseudo-random entropy generator for the ARCH_POSIX architecture:
- * Following the principle of reproducibility of the native_posix board
- * this entropy device will always generate the same random sequence when
- * initialized with the same seed
- *
- * This entropy source should only be used for testing.
- */
-
-#define DT_DRV_COMPAT zephyr_native_posix_rng
-
-#include <zephyr/device.h>
-#include <zephyr/drivers/entropy.h>
-#include <zephyr/init.h>
-#include <zephyr/sys/util.h>
-#include <stdlib.h>
-#include <string.h>
-#include <zephyr/arch/posix/posix_trace.h>
-#include "soc.h"
-#include "cmdline.h" /* native_posix command line options header */
-#include "nsi_host_trampolines.h"
-#include "fake_entropy_native_bottom.h"
-
-static unsigned int seed = 0x5678;
-static bool seed_random;
-static bool seed_set;
-
-static int entropy_native_posix_get_entropy(const struct device *dev,
-					    uint8_t *buffer,
-					    uint16_t length)
-{
-	ARG_UNUSED(dev);
-
-	while (length) {
-		/*
-		 * Note that only 1 thread (Zephyr thread or HW models), runs at
-		 * a time, therefore there is no need to use random_r()
-		 */
-		long value = nsi_host_random();
-
-		/* The host random() provides a number between 0 and 2**31-1. Bit 32 is always 0.
-		 * So let's just use the lower 3 bytes discarding the upper 7 bits
-		 */
-		size_t to_copy = MIN(length, 3);
-
-		memcpy(buffer, &value, to_copy);
-		buffer += to_copy;
-		length -= to_copy;
-	}
-
-	return 0;
-}
-
-static int entropy_native_posix_get_entropy_isr(const struct device *dev,
-						uint8_t *buf,
-						uint16_t len, uint32_t flags)
-{
-	ARG_UNUSED(flags);
-
-	/*
-	 * entropy_native_posix_get_entropy() is also safe for ISRs
-	 * and always produces data.
-	 */
-	entropy_native_posix_get_entropy(dev, buf, len);
-
-	return len;
-}
-
-static int entropy_native_posix_init(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-	if (seed_set || seed_random ||
-	    IS_ENABLED(CONFIG_FAKE_ENTROPY_NATIVE_POSIX_SEED_BY_DEFAULT)) {
-		entropy_native_seed(seed, seed_random);
-	}
-	posix_print_warning("WARNING: "
-			    "Using a test - not safe - entropy source\n");
-	return 0;
-}
-
-static DEVICE_API(entropy, entropy_native_posix_api_funcs) = {
-	.get_entropy     = entropy_native_posix_get_entropy,
-	.get_entropy_isr = entropy_native_posix_get_entropy_isr
-};
-
-DEVICE_DT_INST_DEFINE(0,
-		    entropy_native_posix_init, NULL,
-		    NULL, NULL,
-		    PRE_KERNEL_1, CONFIG_ENTROPY_INIT_PRIORITY,
-		    &entropy_native_posix_api_funcs);
-
-static void seed_was_set(char *argv, int offset)
-{
-	ARG_UNUSED(argv);
-	ARG_UNUSED(offset);
-	seed_set = true;
-}
-
-static void add_fake_entropy_option(void)
-{
-	static struct args_struct_t entropy_options[] = {
-		{
-			.option = "seed",
-			.name = "r_seed",
-			.type = 'u',
-			.dest = (void *)&seed,
-			.call_when_found = seed_was_set,
-			.descript = "A 32-bit integer seed value for the entropy device, such as "
-				    "97229 (decimal), 0x17BCD (hex), or 0275715 (octal)"
-		},
-		{
-			.is_switch = true,
-			.option = "seed-random",
-			.type = 'b',
-			.dest = (void *)&seed_random,
-			.descript = "Seed the random generator from /dev/urandom. "
-				    "Note your test may not be reproducible if you set this option"
-		},
-		ARG_TABLE_ENDMARKER
-	};
-
-	native_add_command_line_opts(entropy_options);
-}
-
-NATIVE_TASK(add_fake_entropy_option, PRE_BOOT_1, 10);
diff --git a/drivers/entropy/fake_entropy_native_sim.c b/drivers/entropy/fake_entropy_native_sim.c
new file mode 100644
index 0000000000000..abc6acec537eb
--- /dev/null
+++ b/drivers/entropy/fake_entropy_native_sim.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2018 Oticon A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Pseudo-random entropy generator for native simulator based target boards:
+ * Following the principle of reproducibility of the native_sim board
+ * this entropy device will always generate the same random sequence when
+ * initialized with the same seed
+ *
+ * This entropy source should only be used for testing.
+ */
+
+#include <zephyr/devicetree.h>
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_native_posix_rng)
+#define DT_DRV_COMPAT zephyr_native_posix_rng
+#warning "zephyr,native-posix-rng is deprecated in favor of zephyr,native-sim-rng"
+#else
+#define DT_DRV_COMPAT zephyr_native_sim_rng
+#endif
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
+#include <stdlib.h>
+#include <string.h>
+#include <zephyr/arch/posix/posix_trace.h>
+#include "soc.h"
+#include "cmdline.h" /* native_sim command line options header */
+#include "nsi_host_trampolines.h"
+#include "fake_entropy_native_bottom.h"
+
+static unsigned int seed = 0x5678;
+static bool seed_random;
+static bool seed_set;
+
+static int entropy_native_sim_get_entropy(const struct device *dev,
+					    uint8_t *buffer,
+					    uint16_t length)
+{
+	ARG_UNUSED(dev);
+
+	while (length) {
+		/*
+		 * Note that only 1 thread (Zephyr thread or HW models), runs at
+		 * a time, therefore there is no need to use random_r()
+		 */
+		long value = nsi_host_random();
+
+		/* The host random() provides a number between 0 and 2**31-1. Bit 32 is always 0.
+		 * So let's just use the lower 3 bytes discarding the upper 7 bits
+		 */
+		size_t to_copy = MIN(length, 3);
+
+		memcpy(buffer, &value, to_copy);
+		buffer += to_copy;
+		length -= to_copy;
+	}
+
+	return 0;
+}
+
+static int entropy_native_sim_get_entropy_isr(const struct device *dev,
+						uint8_t *buf,
+						uint16_t len, uint32_t flags)
+{
+	ARG_UNUSED(flags);
+
+	/*
+	 * entropy_native_sim_get_entropy() is also safe for ISRs
+	 * and always produces data.
+	 */
+	entropy_native_sim_get_entropy(dev, buf, len);
+
+	return len;
+}
+
+static int entropy_native_sim_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+	if (seed_set || seed_random ||
+	    IS_ENABLED(CONFIG_FAKE_ENTROPY_NATIVE_SIM_SEED_BY_DEFAULT)) {
+		entropy_native_seed(seed, seed_random);
+	}
+	posix_print_warning("WARNING: "
+			    "Using a test - not safe - entropy source\n");
+	return 0;
+}
+
+static DEVICE_API(entropy, entropy_native_sim_api_funcs) = {
+	.get_entropy     = entropy_native_sim_get_entropy,
+	.get_entropy_isr = entropy_native_sim_get_entropy_isr
+};
+
+DEVICE_DT_INST_DEFINE(0,
+		    entropy_native_sim_init, NULL,
+		    NULL, NULL,
+		    PRE_KERNEL_1, CONFIG_ENTROPY_INIT_PRIORITY,
+		    &entropy_native_sim_api_funcs);
+
+static void seed_was_set(char *argv, int offset)
+{
+	ARG_UNUSED(argv);
+	ARG_UNUSED(offset);
+	seed_set = true;
+}
+
+static void add_fake_entropy_option(void)
+{
+	static struct args_struct_t entropy_options[] = {
+		{
+			.option = "seed",
+			.name = "r_seed",
+			.type = 'u',
+			.dest = (void *)&seed,
+			.call_when_found = seed_was_set,
+			.descript = "A 32-bit integer seed value for the entropy device, such as "
+				    "97229 (decimal), 0x17BCD (hex), or 0275715 (octal)"
+		},
+		{
+			.is_switch = true,
+			.option = "seed-random",
+			.type = 'b',
+			.dest = (void *)&seed_random,
+			.descript = "Seed the random generator from /dev/urandom. "
+				    "Note your test may not be reproducible if you set this option"
+		},
+		ARG_TABLE_ENDMARKER
+	};
+
+	native_add_command_line_opts(entropy_options);
+}
+
+NATIVE_TASK(add_fake_entropy_option, PRE_BOOT_1, 10);
diff --git a/drivers/espi/Kconfig.npcx b/drivers/espi/Kconfig.npcx
index dbeadaddfa2e6..fbd6ee643ca76 100644
--- a/drivers/espi/Kconfig.npcx
+++ b/drivers/espi/Kconfig.npcx
@@ -60,6 +60,19 @@ config ESPI_NPCX_PERIPHERAL_DEBUG_PORT_80_RING_BUF_SIZE
 	  The size of the ring buffer in byte used by the Port80 ISR to store
 	  Postcodes from Host.
 
+config ESPI_NPCX_VWIRE_ENABLE_SEND_CHECK
+	bool "Check the value was read by host after wire bits changed"
+	help
+	  This option enables the function to check whether the host has read the value
+	  after the wire data changes.
+
+config ESPI_NPCX_WIRE_SEND_TIMEOUT_US
+	int "eSPI virtual wire send timeout count"
+	default 1000
+	help
+	  The times to check status after sending the eSPI virtual wire signal. The unit
+	  is microseconds (µs).
+
 config ESPI_TAF_NPCX
 	bool "Nuvoton NPCX embedded controller (EC) ESPI TAF driver"
 	depends on SOC_SERIES_NPCX4
@@ -98,6 +111,14 @@ config ESPI_TAF_NPCX_RPMC_SUPPORT
 	help
 	  This option enable the handler for eSPI TAF RPMC request.
 
+config ESPI_TAF_NPCX_STS_AWAIT_TIMEOUT
+	int "A timeout value in microseconds to wait for automatic read status"
+	depends on ESPI_TAF_NPCX
+	default 20000
+	help
+	  This option specifies the timeout value in microseconds (us) for checking
+	  automatic read status.
+
 # The default value 'y' for the existing options if ESPI_NPCX is selected.
 if ESPI_NPCX
 
@@ -134,4 +155,12 @@ config ESPI_NPCX_CAF_GLOBAL_RESET_WORKAROUND
 	help
 	  Workaround the issue "Global Reset" in the npcx4 SoC errata.
 
+config ESPI_NPCX_RESET_SLP_SX_VW_ON_ESPI_RST
+	bool "Reset SLP_Sx virtual wires when eSPI_RST is asserted"
+	help
+	    The SLP_S3/SLP_S4/SLP_S5/ virtual wires are automatically reset when
+	    eSPI_Reset is asserted on the global reset.
+	    Don't enable this config if the platform implements the Deep-Sx
+	    entry as EC needs to maintain these pins' states per request.
+
 endif #ESPI_NPCX
diff --git a/drivers/espi/Kconfig.xec b/drivers/espi/Kconfig.xec
index 0b3e5644460a6..36ebba6aa9d62 100644
--- a/drivers/espi/Kconfig.xec
+++ b/drivers/espi/Kconfig.xec
@@ -104,6 +104,13 @@ config ESPI_XEC_PERIPHERAL_HOST_CMD_PARAM_SIZE
 config ESPI_PERIPHERAL_8042_KBC
 	default y
 
+config ESPI_XEC_P80_MULTIBYTE
+	bool "Host can write 1/2/4 bytes of Port80 data in a eSPI transaction"
+	depends on ESPI_XEC_V2 && ESPI_PERIPHERAL_DEBUG_PORT_80
+	help
+	  EC can accept 1/2/4 bytes of Port 80 data written from the Host in an
+	  eSPI transaction.
+
 if ESPI_PERIPHERAL_CHANNEL
 
 config ESPI_PERIPHERAL_XEC_MAILBOX
diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c
index a609c7a892178..01103e31bd471 100644
--- a/drivers/espi/espi_mchp_xec.c
+++ b/drivers/espi/espi_mchp_xec.c
@@ -19,9 +19,9 @@
 #define ESPI_XEC_VWIRE_ACK_DELAY    10ul
 
 /* Maximum timeout to transmit a virtual wire packet.
- * 10 ms expressed in multiples of 100us
+ * 1 ms expressed in multiples of 1us
  */
-#define ESPI_XEC_VWIRE_SEND_TIMEOUT 100ul
+#define ESPI_XEC_VWIRE_SEND_TIMEOUT 1000ul
 
 #define VW_MAX_GIRQS                2ul
 
@@ -461,10 +461,15 @@ static int espi_xec_send_vwire(const struct device *dev,
 		/* Ensure eSPI virtual wire packet is transmitted
 		 * There is no interrupt, so need to poll register
 		 */
-		uint8_t rd_cnt = ESPI_XEC_VWIRE_SEND_TIMEOUT;
+		uint16_t rd_cnt = ESPI_XEC_VWIRE_SEND_TIMEOUT;
 
 		while (reg->SRC_CHG && rd_cnt--) {
-			k_busy_wait(100);
+			k_busy_wait(1);
+		}
+
+		if (rd_cnt == 0) {
+			LOG_ERR("VW %d send timeout", signal);
+			return -ETIMEDOUT;
 		}
 	}
 
diff --git a/drivers/espi/espi_mchp_xec_host_v2.c b/drivers/espi/espi_mchp_xec_host_v2.c
index 5bcb78903cbdd..73e3858363c0a 100644
--- a/drivers/espi/espi_mchp_xec_host_v2.c
+++ b/drivers/espi/espi_mchp_xec_host_v2.c
@@ -70,6 +70,9 @@
 #define XEC_PCR_REG_BASE						\
 	((struct pcr_regs *)(DT_REG_ADDR(DT_NODELABEL(pcr))))
 
+#define MCHP_P80_MAX_BYTE_COUNT  4
+#define MCHP_P80_FIFO_READ_COUNT 8
+
 struct xec_espi_host_sram_config {
 	uint32_t host_sram1_base;
 	uint32_t host_sram2_base;
@@ -817,6 +820,7 @@ static const struct xec_p80bd_config xec_p80bd0_cfg = {
  * We must decode the byte lane information and produce one or more
  * notification packets.
  */
+#ifndef CONFIG_ESPI_XEC_P80_MULTIBYTE
 static void p80bd0_isr(const struct device *dev)
 {
 	struct espi_xec_data *const data =
@@ -825,7 +829,7 @@ static void p80bd0_isr(const struct device *dev)
 		(struct p80bd_regs *)xec_p80bd0_cfg.regbase;
 	struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, 0,
 				  ESPI_PERIPHERAL_NODATA };
-	int count = 8; /* limit ISR to 8 bytes */
+	int count = MCHP_P80_FIFO_READ_COUNT; /* limit ISR to 8 bytes */
 	uint32_t dattr = p80regs->EC_DA;
 
 	/* b[7:0]=8-bit value written, b[15:8]=attributes */
@@ -861,6 +865,47 @@ static void p80bd0_isr(const struct device *dev)
 	/* clear GIRQ status */
 	mchp_xec_ecia_info_girq_src_clr(xec_p80bd0_cfg.ecia_info);
 }
+#else
+static void p80bd0_isr(const struct device *dev)
+{
+	struct espi_xec_data *const data =
+		(struct espi_xec_data *const)dev->data;
+	struct p80bd_regs *p80regs =
+		(struct p80bd_regs *)xec_p80bd0_cfg.regbase;
+	struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, 0,
+				  ESPI_PERIPHERAL_NODATA };
+	int count = MCHP_P80_FIFO_READ_COUNT; /* limit ISR to 8 bytes */
+	uint32_t dattr = p80regs->EC_DA;
+	uint8_t byte_count;
+	uint8_t shift;
+
+	/* b[7:0]=8-bit value written, b[15:8]=attributes */
+	while ((dattr & MCHP_P80BD_ECDA_NE) && (count--)) { /* Not empty? */
+		byte_count = 0;
+		evt.evt_data = 0;
+
+		byte_count = BIT((dattr & MCHP_P80BD_ECDA_LEN_MSK) >> MCHP_P80BD_ECDA_LEN_POS);
+		if (byte_count <= MCHP_P80_MAX_BYTE_COUNT) {
+			shift = 0;
+			while (byte_count) {
+				evt.evt_data |= (dattr & 0xffu) << (shift * 8);
+				byte_count--;
+				shift++;
+				if (byte_count) {
+					dattr = p80regs->EC_DA;
+				}
+			}
+
+			evt.evt_details = ESPI_PERIPHERAL_DEBUG_PORT80;
+			espi_send_callbacks(&data->callbacks, dev, evt);
+		}
+		dattr = p80regs->EC_DA;
+	}
+
+	/* clear GIRQ status */
+	mchp_xec_ecia_info_girq_src_clr(xec_p80bd0_cfg.ecia_info);
+}
+#endif
 
 static int connect_irq_p80bd0(const struct device *dev)
 {
diff --git a/drivers/espi/espi_mchp_xec_v2.c b/drivers/espi/espi_mchp_xec_v2.c
index 22410a7f619b0..e4f315438bed5 100644
--- a/drivers/espi/espi_mchp_xec_v2.c
+++ b/drivers/espi/espi_mchp_xec_v2.c
@@ -25,9 +25,9 @@
 #define ESPI_XEC_VWIRE_ACK_DELAY	10ul
 
 /* Maximum timeout to transmit a virtual wire packet.
- * 10 ms expressed in multiples of 100us
+ * 1 ms expressed in multiples of 1us
  */
-#define ESPI_XEC_VWIRE_SEND_TIMEOUT	100ul
+#define ESPI_XEC_VWIRE_SEND_TIMEOUT	1000ul
 
 #define VW_MAX_GIRQS			2ul
 
@@ -325,10 +325,15 @@ static int espi_xec_send_vwire(const struct device *dev,
 		/* Ensure eSPI virtual wire packet is transmitted
 		 * There is no interrupt, so need to poll register
 		 */
-		uint8_t rd_cnt = ESPI_XEC_VWIRE_SEND_TIMEOUT;
+		uint16_t rd_cnt = ESPI_XEC_VWIRE_SEND_TIMEOUT;
 
 		while (sys_read8(regaddr + SMVW_BI_SRC_CHG) && rd_cnt--) {
-			k_busy_wait(100);
+			k_busy_wait(1);
+		}
+
+		if (rd_cnt == 0) {
+			LOG_ERR("VW %d send timeout", signal);
+			return -ETIMEDOUT;
 		}
 	}
 
diff --git a/drivers/espi/espi_npcx.c b/drivers/espi/espi_npcx.c
index 4a7f40b64c062..b42b270a2e8fb 100644
--- a/drivers/espi/espi_npcx.c
+++ b/drivers/espi/espi_npcx.c
@@ -91,6 +91,9 @@ static const struct espi_npcx_vw_ex espi_npcx_vw_ex_0[] = {
 #define NPCX_ESPI_MAXFREQ_50         3
 #define NPCX_ESPI_MAXFREQ_66         4
 
+/* SLP_S3/SLP_S4/SLP_S5 Virtual Wire belong to Virtual Wire Index 2 */
+#define ESPI_VW_SLP_SX_INDEX         0x02
+
 /* Minimum delay before acknowledging a virtual wire */
 #define NPCX_ESPI_VWIRE_ACK_DELAY    10ul /* 10 us */
 
@@ -498,6 +501,14 @@ static void espi_vw_config_input(const struct device *dev,
 	struct espi_reg *const inst = HAL_INSTANCE(dev);
 	int idx = config_in->reg_idx;
 
+	if (IS_ENABLED(CONFIG_ESPI_NPCX_RESET_SLP_SX_VW_ON_ESPI_RST)) {
+		uint8_t vwire_index = GET_FIELD(inst->VWEVMS[idx], NPCX_VWEVMS_INDEX);
+
+		if (vwire_index == ESPI_VW_SLP_SX_INDEX) {
+			inst->VWEVMS[idx] |= BIT(NPCX_VWEVMS_ENESPIRST);
+		}
+	}
+
 	/* IE & WE bits are already set? */
 	if (IS_BIT_SET(inst->VWEVMS[idx], NPCX_VWEVMS_IE) &&
 	    IS_BIT_SET(inst->VWEVMS[idx], NPCX_VWEVMS_WE)) {
@@ -848,9 +859,25 @@ static int espi_npcx_send_vwire(const struct device *dev,
 	if (signal >= ESPI_VWIRE_SIGNAL_TARGET_GPIO_0) {
 		SET_FIELD(inst->VWGPSM[reg_idx], NPCX_VWEVSM_WIRE, val);
 		reg_val = inst->VWGPSM[reg_idx];
+
+		if (IS_ENABLED(CONFIG_ESPI_NPCX_VWIRE_ENABLE_SEND_CHECK)) {
+			if (!WAIT_FOR(!IS_BIT_SET(inst->VWGPSM[reg_idx], NPCX_VWEVSM_DIRTY),
+				      CONFIG_ESPI_NPCX_WIRE_SEND_TIMEOUT_US, NULL)) {
+				LOG_ERR("%s signal %d timeout", __func__, signal);
+				return -ETIMEDOUT;
+			}
+		}
 	} else {
 		SET_FIELD(inst->VWEVSM[reg_idx], NPCX_VWEVSM_WIRE, val);
 		reg_val = inst->VWEVSM[reg_idx];
+
+		if (IS_ENABLED(CONFIG_ESPI_NPCX_VWIRE_ENABLE_SEND_CHECK)) {
+			if (!WAIT_FOR(!IS_BIT_SET(inst->VWEVSM[reg_idx], NPCX_VWEVSM_DIRTY),
+				      CONFIG_ESPI_NPCX_WIRE_SEND_TIMEOUT_US, NULL)) {
+				LOG_ERR("%s signal %d timeout", __func__, signal);
+				return -ETIMEDOUT;
+			}
+		}
 	}
 
 	LOG_DBG("Send VW: %s%d 0x%08X", reg_name, reg_idx, reg_val);
diff --git a/drivers/espi/espi_taf_npcx.c b/drivers/espi/espi_taf_npcx.c
index 855f2b382c7d7..3d4450e196371 100644
--- a/drivers/espi/espi_taf_npcx.c
+++ b/drivers/espi/espi_taf_npcx.c
@@ -666,6 +666,38 @@ static void espi_taf_event_handler(const struct device *dev, struct espi_callbac
 	k_work_submit(&npcx_espi_taf_data.work);
 }
 
+int espi_taf_npcx_block(const struct device *dev, bool en_block)
+{
+	struct espi_reg *const inst = HAL_INSTANCE(dev);
+
+	if (!IS_BIT_SET(inst->FLASHCTL, NPCX_FLASHCTL_SAF_AUTO_READ)) {
+		return 0;
+	}
+
+	if (en_block) {
+		if (WAIT_FOR(!IS_BIT_SET(inst->ESPISTS, NPCX_ESPISTS_FLAUTORDREQ),
+			     CONFIG_ESPI_TAF_NPCX_STS_AWAIT_TIMEOUT, NULL) == false) {
+			LOG_ERR("Check Automatic Read Queue Empty Timeout");
+			return -ETIMEDOUT;
+		}
+
+		inst->FLASHCTL |= BIT(NPCX_FLASHCTL_AUTO_RD_DIS_CTL);
+
+		if (WAIT_FOR(IS_BIT_SET(inst->ESPISTS, NPCX_ESPISTS_AUTO_RD_DIS_STS),
+			     CONFIG_ESPI_TAF_NPCX_STS_AWAIT_TIMEOUT, NULL) == false) {
+			inst->FLASHCTL &= ~BIT(NPCX_FLASHCTL_AUTO_RD_DIS_CTL);
+			inst->ESPISTS |= BIT(NPCX_ESPISTS_AUTO_RD_DIS_STS);
+			LOG_ERR("Check Automatic Read Disable Timeout");
+			return -ETIMEDOUT;
+		}
+	} else {
+		inst->FLASHCTL &= ~BIT(NPCX_FLASHCTL_AUTO_RD_DIS_CTL);
+		inst->ESPISTS |= BIT(NPCX_ESPISTS_AUTO_RD_DIS_STS);
+	}
+
+	return 0;
+}
+
 int npcx_init_taf(const struct device *dev, sys_slist_t *callbacks)
 {
 	espi_init_callback(&espi_taf_cb, espi_taf_event_handler, ESPI_BUS_TAF_NOTIFICATION);
diff --git a/drivers/ethernet/CMakeLists.txt b/drivers/ethernet/CMakeLists.txt
index 3eb6bbc4e63e7..f9cef24042b5e 100644
--- a/drivers/ethernet/CMakeLists.txt
+++ b/drivers/ethernet/CMakeLists.txt
@@ -26,7 +26,6 @@ zephyr_library_sources_ifdef(CONFIG_ETH_E1000		eth_e1000.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_ENC28J60	eth_enc28j60.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_ENC424J600	eth_enc424j600.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_ESP32		eth_esp32.c)
-zephyr_library_sources_ifdef(CONFIG_DSA_KSZ8XXX		dsa_ksz8xxx.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_LITEX_LITEETH	eth_litex_liteeth.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_SMSC911X	eth_smsc911x.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_STELLARIS	eth_stellaris.c)
@@ -41,9 +40,11 @@ zephyr_library_sources_ifdef(CONFIG_ETH_ADIN2111	eth_adin2111.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_LAN865X	        eth_lan865x.c oa_tc6.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_XMC4XXX		eth_xmc4xxx.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_TEST		eth_test.c)
-zephyr_library_sources_ifdef(CONFIG_ETH_RENESAS_RA     eth_renesas_ra.c)
-zephyr_library_sources_ifdef(CONFIG_ETH_LAN9250    eth_lan9250.c)
-zephyr_library_sources_ifdef(CONFIG_ETH_SY1XX   eth_sensry_sy1xx_mac.c)
+zephyr_library_sources_ifdef(CONFIG_ETH_RENESAS_RA	eth_renesas_ra.c)
+zephyr_library_sources_ifdef(CONFIG_ETH_LAN9250		eth_lan9250.c)
+zephyr_library_sources_ifdef(CONFIG_ETH_SY1XX		eth_sensry_sy1xx_mac.c)
+zephyr_library_sources_ifdef(CONFIG_ETH_NXP_ENET	eth_nxp_enet.c)
+zephyr_library_sources_ifdef(CONFIG_ETH_XILINX_AXIENET	eth_xilinx_axienet.c)
 
 if(CONFIG_ETH_NXP_S32_NETC)
   zephyr_library_sources(eth_nxp_s32_netc.c)
@@ -54,22 +55,22 @@ endif()
 zephyr_library_sources_ifdef(CONFIG_ETH_NXP_S32_GMAC	eth_nxp_s32_gmac.c)
 zephyr_library_sources_ifdef(CONFIG_ETH_NUMAKER		eth_numaker.c)
 
-if(CONFIG_ETH_NATIVE_POSIX)
+if(CONFIG_ETH_NATIVE_TAP)
   if (CONFIG_NATIVE_APPLICATION)
-    set(native_posix_source_files eth_native_posix.c eth_native_posix_adapt.c)
-    set_source_files_properties(${native_posix_source_files}
+    set(native_tap_source_files eth_native_tap.c eth_native_tap_adapt.c)
+    set_source_files_properties(${native_tap_source_files}
       PROPERTIES COMPILE_DEFINITIONS
       "NO_POSIX_CHEATS;_BSD_SOURCE;_DEFAULT_SOURCE"
     )
-    zephyr_library_sources(${native_posix_source_files})
+    zephyr_library_sources(${native_tap_source_files})
   else()
-    zephyr_library_sources(eth_native_posix.c)
-    target_sources(native_simulator INTERFACE eth_native_posix_adapt.c)
+    zephyr_library_sources(eth_native_tap.c)
+    target_sources(native_simulator INTERFACE eth_native_tap_adapt.c)
   endif()
 endif()
 
+add_subdirectory(dsa)
 add_subdirectory(phy)
 add_subdirectory(eth_nxp_enet_qos)
-add_subdirectory(nxp_enet)
 add_subdirectory(nxp_imx_netc)
 add_subdirectory(dwc_xgmac)
diff --git a/drivers/ethernet/Kconfig b/drivers/ethernet/Kconfig
index d864c9c6e136a..b771cd106f8a8 100644
--- a/drivers/ethernet/Kconfig
+++ b/drivers/ethernet/Kconfig
@@ -57,14 +57,14 @@ source "drivers/ethernet/Kconfig.sam_gmac"
 source "drivers/ethernet/Kconfig.stm32_hal"
 source "drivers/ethernet/Kconfig.dwmac"
 source "drivers/ethernet/Kconfig.smsc911x"
-source "drivers/ethernet/Kconfig.native_posix"
+source "drivers/ethernet/Kconfig.native_tap"
 source "drivers/ethernet/Kconfig.stellaris"
 source "drivers/ethernet/Kconfig.litex"
 source "drivers/ethernet/Kconfig.gecko"
 source "drivers/ethernet/Kconfig.w5500"
-source "drivers/ethernet/Kconfig.dsa"
 source "drivers/ethernet/Kconfig.xlnx_gem"
 source "drivers/ethernet/Kconfig.cyclonev"
+source "drivers/ethernet/Kconfig.nxp_enet"
 source "drivers/ethernet/Kconfig.nxp_s32_netc"
 source "drivers/ethernet/Kconfig.nxp_s32_gmac"
 source "drivers/ethernet/Kconfig.smsc91x"
@@ -76,13 +76,14 @@ source "drivers/ethernet/Kconfig.xmc4xxx"
 source "drivers/ethernet/Kconfig.test"
 source "drivers/ethernet/Kconfig.lan9250"
 source "drivers/ethernet/Kconfig.sy1xx_mac"
+source "drivers/ethernet/Kconfig.xilinx_axienet"
 
 source "drivers/ethernet/eth_nxp_enet_qos/Kconfig"
 
+source "drivers/ethernet/dsa/Kconfig"
 source "drivers/ethernet/dwc_xgmac/Kconfig"
 source "drivers/ethernet/phy/Kconfig"
 
-source "drivers/ethernet/nxp_enet/Kconfig"
 source "drivers/ethernet/nxp_imx_netc/Kconfig"
 source "drivers/ethernet/Kconfig.renesas_ra"
 
diff --git a/drivers/ethernet/Kconfig.dsa b/drivers/ethernet/Kconfig.dsa
deleted file mode 100644
index faa2112b7ce47..0000000000000
--- a/drivers/ethernet/Kconfig.dsa
+++ /dev/null
@@ -1,68 +0,0 @@
-# Distributed Switch Architecture [DSA] configuration options
-
-# Copyright (c) 2020 DENX Software Engineering GmbH
-#               Lukasz Majewski <lukma@denx.de>
-# SPDX-License-Identifier: Apache-2.0
-
-config ETH_DSA_SUPPORT
-	bool
-	help
-	  Set by an ethernet driver that supports DSA.
-
-menuconfig NET_DSA
-	bool "Distributed Switch Architecture support"
-	depends on ETH_DSA_SUPPORT
-	help
-	  Enable Distributed Switch Architecture support. For now it
-	  only supports Kinetics and STM32 ENET drivers.
-
-if NET_DSA
-
-config DSA_KSZ8XXX
-	bool
-
-config DSA_KSZ8794
-	bool "Support for KSZ8794"
-	default y
-	depends on DT_HAS_MICROCHIP_KSZ8794_ENABLED
-	select DSA_KSZ8XXX
-	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_MICROCHIP_KSZ8794),spi)
-	help
-	  Add support for KSZ8794 DSA device driver.
-
-config DSA_KSZ8863
-	bool "Support for KSZ8863"
-	default y
-	depends on DT_HAS_MICROCHIP_KSZ8863_ENABLED
-	select DSA_KSZ8XXX
-	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_MICROCHIP_KSZ8863),spi)
-	help
-	  Add support for KSZ8863 DSA device driver.
-
-config DSA_KSZ_TAIL_TAGGING
-	bool "Support for tail tagging"
-	depends on DSA_KSZ8794 || DSA_KSZ8863
-	help
-	  Add support for tail tagging on DSA device.
-
-config DSA_TAG_SIZE
-	int "DSA tag size in bytes"
-	default 1 if DSA_KSZ8794 || DSA_KSZ8863
-	default 0
-	depends on DSA_KSZ_TAIL_TAGGING
-	help
-	  Set the DSA tag length in bytes.
-
-config DSA_SPI
-	bool "Support for PHY SPI interface"
-	depends on SPI && (DSA_KSZ8794 || DSA_KSZ8863)
-	help
-	  Use SPI bus to communicate with PHY
-
-module = NET_DSA
-module-dep = NET_LOG
-module-str = Log level for DSA
-module-help = Enables core DSA code to output debug messages.
-source "subsys/net/Kconfig.template.log_config.net"
-
-endif # NET_DSA
diff --git a/drivers/ethernet/Kconfig.native_posix b/drivers/ethernet/Kconfig.native_posix
deleted file mode 100644
index d4c065fbdde45..0000000000000
--- a/drivers/ethernet/Kconfig.native_posix
+++ /dev/null
@@ -1,86 +0,0 @@
-# Native posix ethernet driver configuration options
-
-# Copyright (c) 2018 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-menuconfig ETH_NATIVE_POSIX
-	bool "Native Posix Ethernet driver"
-	depends on ARCH_POSIX
-	help
-	  Enable native posix ethernet driver. Note, this driver is run inside
-	  a process in your host system.
-
-if ETH_NATIVE_POSIX
-
-config ETH_NATIVE_POSIX_INTERFACE_COUNT
-	int "Number of network interfaces created"
-	default NET_GPTP_NUM_PORTS if NET_GPTP
-	default PTP_NUM_PORTS if PTP
-	default 1
-	range 1 32
-	help
-	  By default only one network interface is created. It is possible
-	  to create multiple interfaces in certain use cases. For example if
-	  multiple ports are defined in gPTP or PTP, then multiple network interfaces
-	  must be created here.
-
-config ETH_NATIVE_POSIX_DRV_NAME
-	string "Ethernet driver name"
-	default "zeth"
-	help
-	  This option sets the driver name and name of the network interface
-	  in your host system. If there are multiple network interfaces defined,
-	  then this value is used as a prefix and the interface names will be
-	  zeth0, zeth1, etc.
-
-config ETH_NATIVE_POSIX_DEV_NAME
-	string "Host ethernet TUN/TAP device name"
-	default "/dev/net/tun"
-	help
-	  This option sets the TUN/TAP device name in your host system.
-
-config ETH_NATIVE_POSIX_PTP_CLOCK
-	bool "PTP clock driver support"
-	default y if NET_GPTP || PTP
-	select PTP_CLOCK
-	depends on NET_GPTP || PTP
-	help
-	  Enable PTP clock support.
-
-config ETH_NATIVE_POSIX_RANDOM_MAC
-	bool "Random MAC address"
-	depends on ENTROPY_GENERATOR
-	default y
-	help
-	  Generate a random MAC address dynamically.
-
-config ETH_NATIVE_POSIX_VLAN_TAG_STRIP
-	bool "Strip VLAN tag from Rx frames"
-	depends on NET_VLAN
-	help
-	  Native posix ethernet driver will strip of VLAN tag from
-	  Rx Ethernet frames and sets tag information in net packet
-	  metadata.
-
-config ETH_NATIVE_POSIX_MAC_ADDR
-	string "MAC address for the interface"
-	default ""
-	depends on !ETH_NATIVE_POSIX_RANDOM_MAC
-	help
-	  Specify a MAC address for the ethernet interface in the form of
-	  six hex 8-bit chars separated by colons (e.g.:
-	  aa:33:cc:22:e2:c0).  The default is an empty string, which
-	  means the code will make 00:00:5E:00:53:XX, where XX will be
-	  random.
-
-config ETH_NATIVE_POSIX_RX_TIMEOUT
-	int "Ethernet RX timeout"
-	default 1 if NET_GPTP
-	default 50
-	range 1 100
-	help
-	  Native posix ethernet driver repeatedly checks for new data.
-	  Specify how long the thread sleeps between these checks if no new data
-	  available.
-
-endif # ETH_NATIVE_POSIX
diff --git a/drivers/ethernet/Kconfig.native_tap b/drivers/ethernet/Kconfig.native_tap
new file mode 100644
index 0000000000000..f42b65fb198c4
--- /dev/null
+++ b/drivers/ethernet/Kconfig.native_tap
@@ -0,0 +1,159 @@
+# Native TAP ethernet driver configuration options
+
+# Copyright (c) 2018 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig ETH_NATIVE_TAP
+	bool "Native TAP Ethernet driver"
+	depends on ARCH_POSIX
+	select ETH_NATIVE_POSIX_BACKWARDS_COMPAT_MENU
+	help
+	  Enable native_sim TAP ethernet driver. Note, this driver is run inside
+	  a process in your host system.
+
+if ETH_NATIVE_TAP
+
+config ETH_NATIVE_TAP_INTERFACE_COUNT
+	int "Number of network interfaces created"
+	default ETH_NATIVE_POSIX_INTERFACE_COUNT
+	range 1 32
+	help
+	  By default only one network interface is created. It is possible
+	  to create multiple interfaces in certain use cases. For example if
+	  multiple ports are defined in gPTP or PTP, then multiple network interfaces
+	  must be created here.
+
+config ETH_NATIVE_TAP_DRV_NAME
+	string "Ethernet driver name"
+	default ETH_NATIVE_POSIX_DRV_NAME
+	help
+	  This option sets the driver name and name of the network interface
+	  in your host system. If there are multiple network interfaces defined,
+	  then this value is used as a prefix and the interface names will be
+	  zeth0, zeth1, etc.
+
+config ETH_NATIVE_TAP_DEV_NAME
+	string "Host ethernet TUN/TAP device name"
+	default ETH_NATIVE_POSIX_DEV_NAME
+	help
+	  This option sets the TUN/TAP device name in your host system.
+
+config ETH_NATIVE_TAP_PTP_CLOCK
+	bool "PTP clock driver support"
+	default ETH_NATIVE_POSIX_PTP_CLOCK
+	select PTP_CLOCK
+	depends on NET_GPTP || PTP
+	help
+	  Enable PTP clock support.
+
+config ETH_NATIVE_TAP_RANDOM_MAC
+	bool "Random MAC address"
+	depends on ENTROPY_GENERATOR
+	default ETH_NATIVE_POSIX_RANDOM_MAC
+	help
+	  Generate a random MAC address dynamically.
+
+config ETH_NATIVE_TAP_VLAN_TAG_STRIP
+	bool "Strip VLAN tag from Rx frames"
+	default ETH_NATIVE_POSIX_VLAN_TAG_STRIP
+	depends on NET_VLAN
+	help
+	  Native TAP ethernet driver will strip of VLAN tag from
+	  Rx Ethernet frames and sets tag information in net packet
+	  metadata.
+
+config ETH_NATIVE_TAP_MAC_ADDR
+	string "MAC address for the interface"
+	default ETH_NATIVE_POSIX_MAC_ADDR
+	depends on !ETH_NATIVE_TAP_RANDOM_MAC
+	help
+	  Specify a MAC address for the ethernet interface in the form of
+	  six hex 8-bit chars separated by colons (e.g.:
+	  aa:33:cc:22:e2:c0). The default is an empty string, which
+	  means the code will make 00:00:5E:00:53:XX, where XX will be
+	  random.
+
+config ETH_NATIVE_TAP_RX_TIMEOUT
+	int "Ethernet RX timeout"
+	default ETH_NATIVE_POSIX_RX_TIMEOUT
+	range 1 100
+	help
+	  Native TAP ethernet driver repeatedly checks for new data.
+	  Specify how long the thread sleeps between these checks if no new data
+	  available.
+
+endif # ETH_NATIVE_TAP
+
+
+config ETH_NATIVE_POSIX
+	bool "Native POSIX Ethernet driver (deprecated)"
+	depends on ARCH_POSIX
+	select DEPRECATED
+	select ETH_NATIVE_TAP
+	select ETH_NATIVE_POSIX_BACKWARDS_COMPAT_MENU
+	help
+	  Deprecated, use ETH_NATIVE_TAP instead
+
+menuconfig ETH_NATIVE_POSIX_BACKWARDS_COMPAT_MENU
+	bool "Native POSIX Ethernet driver options (deprecated)"
+	depends on ARCH_POSIX
+
+if ETH_NATIVE_POSIX_BACKWARDS_COMPAT_MENU
+
+config ETH_NATIVE_POSIX_INTERFACE_COUNT
+	int "Number of network interfaces created (deprecated)"
+	default NET_GPTP_NUM_PORTS if NET_GPTP
+	default PTP_NUM_PORTS if PTP
+	default 1
+	range 1 32
+	help
+	  Deprecated, use ETH_NATIVE_TAP_INTERFACE_COUNT instead
+
+config ETH_NATIVE_POSIX_DRV_NAME
+	string "Ethernet driver name (deprecated)"
+	default "zeth"
+	help
+	  Deprecated, use ETH_NATIVE_TAP_DRV_NAME instead
+
+config ETH_NATIVE_POSIX_DEV_NAME
+	string "Host ethernet TUN/TAP device name (deprecated)"
+	default "/dev/net/tun"
+	help
+	  Deprecated, use ETH_NATIVE_TAP_DEV_NAME instead
+
+config ETH_NATIVE_POSIX_PTP_CLOCK
+	bool "PTP clock driver support (deprecated)"
+	default y if NET_GPTP || PTP
+	depends on NET_GPTP || PTP
+	help
+	  Deprecated, use ETH_NATIVE_TAP_PTP_CLOCK instead
+
+config ETH_NATIVE_POSIX_RANDOM_MAC
+	bool "Random MAC address (deprecated)"
+	depends on ENTROPY_GENERATOR
+	default y
+	help
+	  Deprecated, use ETH_NATIVE_TAP_RANDOM_MAC instead
+
+config ETH_NATIVE_POSIX_VLAN_TAG_STRIP
+	bool "Strip VLAN tag from Rx frames (deprecated)"
+	depends on NET_VLAN
+	help
+	  Deprecated, use ETH_NATIVE_TAP_VLAN_TAG_STRIP instead
+
+config ETH_NATIVE_POSIX_MAC_ADDR
+	string "MAC address for the interface (deprecated)"
+	default ""
+	depends on !ETH_NATIVE_POSIX_RANDOM_MAC
+	help
+	  Deprecated, use ETH_NATIVE_TAP_MAC_ADDR instead
+
+config ETH_NATIVE_POSIX_RX_TIMEOUT
+	int "Ethernet RX timeout (deprecated)"
+	default 1 if NET_GPTP
+	default 50
+	range 1 100
+	help
+	  Deprecated, use ETH_NATIVE_TAP_DEV_NAME instead
+
+endif # ETH_NATIVE_POSIX_BACKWARDS_COMPAT
diff --git a/drivers/ethernet/Kconfig.numaker b/drivers/ethernet/Kconfig.numaker
index a21462bac746e..3a40c1d81afe3 100644
--- a/drivers/ethernet/Kconfig.numaker
+++ b/drivers/ethernet/Kconfig.numaker
@@ -9,6 +9,7 @@ config ETH_NUMAKER
 	select HAS_NUMAKER_ETH
 	select PINCTRL
 	depends on DT_HAS_NUVOTON_NUMAKER_ETHERNET_ENABLED
+	select NOCACHE_MEMORY if ARCH_HAS_NOCACHE_MEMORY_SUPPORT
 	help
 	  This option enables the Ethernet driver for Nuvoton NuMaker family of
 	  processors.
diff --git a/drivers/ethernet/Kconfig.nxp_enet b/drivers/ethernet/Kconfig.nxp_enet
new file mode 100644
index 0000000000000..42402ff7b29e0
--- /dev/null
+++ b/drivers/ethernet/Kconfig.nxp_enet
@@ -0,0 +1,77 @@
+# NXP ENET ethernet drivers configuration options
+
+# Copyright (c) 2016-2017 ARM Ltd
+# Copyright 2024-2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config ETH_NXP_ENET
+	bool "NXP ENET Ethernet driver"
+	default y
+	depends on DT_HAS_NXP_ENET_MAC_ENABLED
+	select NOCACHE_MEMORY if CPU_HAS_DCACHE
+	select ARM_MPU if CPU_CORTEX_M7
+	select MDIO if DT_HAS_NXP_ENET_MDIO_ENABLED
+	select NET_POWER_MANAGEMENT if (PM_DEVICE && SOC_FAMILY_KINETIS)
+	select ETH_DSA_SUPPORT
+	select PINCTRL
+	help
+	  Enable NXP ENET Ethernet driver.
+
+
+if ETH_NXP_ENET
+
+config ETH_NXP_ENET_1G
+	bool "1G mode for ENET1G instance"
+	default y
+	depends on DT_HAS_NXP_ENET1G_ENABLED
+	help
+	  Enable the use of the ENET1G ethernet instance in 1G mode.
+
+config ETH_NXP_ENET_USE_DTCM_FOR_DMA_BUFFER
+	bool "Use DTCM for hardware DMA buffers"
+	default y
+	help
+	  Place the hardware DMA buffers into DTCM for better
+	  networking performance.
+
+config ETH_NXP_ENET_HW_ACCELERATION
+	bool "Hardware acceleration"
+	default y
+	help
+	  Enable hardware acceleration for the following:
+	  - IPv4, UDP and TCP checksum (both Rx and Tx)
+
+config ETH_NXP_ENET_RX_BUFFERS
+	int "Number of RX buffers for ethernet driver"
+	default 6
+	range 6 16
+	help
+	  Set the number of RX buffers provided to the NXP ENET driver.
+
+config ETH_NXP_ENET_TX_BUFFERS
+	int "Number of TX buffers for ethernet driver"
+	default 1
+	range 1 16
+	help
+	  Set the number of TX buffers provided to the NXP ENET driver.
+
+config ETH_NXP_ENET_RX_THREAD_STACK_SIZE
+	int "NXP ENET RX thread stack size"
+	default 1600
+	help
+	  ENET RX thread stack size in bytes.
+
+config ETH_NXP_ENET_RX_THREAD_PRIORITY
+	int "NXP ENET driver RX cooperative thread priority"
+	default 2
+	help
+	  ENET MAC Driver handles RX in cooperative workqueue thread.
+	  This options sets the priority of that thread.
+
+config ETH_NXP_ENET_RMII_EXT_CLK
+	bool "RMII clock from external sources"
+	help
+	  Setting this option will configure ENET clock block to feed RMII
+	  reference clock from external source (ENET_1588_CLKIN)
+
+endif # ETH_NXP_ENET
diff --git a/drivers/ethernet/Kconfig.stm32_hal b/drivers/ethernet/Kconfig.stm32_hal
index 1511498e96b45..fe4732496f149 100644
--- a/drivers/ethernet/Kconfig.stm32_hal
+++ b/drivers/ethernet/Kconfig.stm32_hal
@@ -9,11 +9,12 @@ menuconfig ETH_STM32_HAL
 	default y
 	depends on DT_HAS_ST_STM32_ETHERNET_ENABLED
 	select USE_STM32_HAL_ETH
-	select NOCACHE_MEMORY if SOC_SERIES_STM32H7X && CPU_CORTEX_M7
+	select USE_STM32_HAL_RIF if SOC_SERIES_STM32N6X
+	select NOCACHE_MEMORY if (SOC_SERIES_STM32H7X && CPU_CORTEX_M7) || SOC_SERIES_STM32N6X
 	select HWINFO
 	select ETH_DSA_SUPPORT
 	select PINCTRL
-	select MDIO if SOC_SERIES_STM32H5X || SOC_SERIES_STM32H7X
+	select MDIO if DT_HAS_ST_STM32_MDIO_ENABLED
 	imply CRC
 	help
 	  Enable STM32 HAL based Ethernet driver. It is available for
@@ -26,7 +27,8 @@ choice ETH_STM32_HAL_API_VERSION
 
 config ETH_STM32_HAL_API_V2
 	bool "Use official STM32Cube HAL driver"
-	depends on SOC_SERIES_STM32H7X || SOC_SERIES_STM32H5X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X
+	depends on SOC_SERIES_STM32H7X || SOC_SERIES_STM32H5X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X || SOC_SERIES_STM32N6X
+	select USE_STM32_HAL_ETH_EX if SOC_SERIES_STM32N6X
 	help
 	  Use the official STM32Cube HAL driver instead of the legacy one.
 
@@ -45,6 +47,14 @@ config ETH_STM32_HAL_RX_THREAD_STACK_SIZE
 	help
 	  RX thread stack size
 
+config ETH_STM32_HAL_RX_THREAD_PREEMPTIVE
+	bool "STM32 Ethernet RX Thread pre-emptive [EXPERIMENTAL]"
+	default y if NET_TC_THREAD_PREEMPTIVE
+	depends on PREEMPT_ENABLED
+	select EXPERIMENTAL
+	help
+	  With pre-emptive threads, the thread can be pre-empted.
+
 config ETH_STM32_HAL_RX_THREAD_PRIO
 	int "STM32 Ethernet RX Thread Priority"
 	default 2
@@ -64,31 +74,6 @@ config ETH_STM32_HAL_USE_DTCM_FOR_DMA_BUFFER
 	  When this option is activated, the buffers for DMA transfer are
 	  moved from SRAM to the DTCM (Data Tightly Coupled Memory).
 
-config ETH_STM32_HAL_PHY_ADDRESS
-	int "Phy address"
-	default 0
-	help
-	  The phy address to use.
-
-config ETH_STM32_HAL_MII
-	bool "Use MII interface"
-	help
-	  Use the MII physical interface instead of RMII.
-
-config ETH_STM32_CARRIER_CHECK_RX_IDLE_TIMEOUT_MS
-	int "Carrier check timeout period (ms)"
-	default 500
-	range 100 30000
-	help
-	  Set the RX idle timeout period in milliseconds after which the
-	  PHY's carrier status is re-evaluated.
-
-config ETH_STM32_AUTO_NEGOTIATION_ENABLE
-	bool "Autonegotiation mode"
-	default y
-	help
-	  Enable this if using autonegotiation
-
 config ETH_STM32_HW_CHECKSUM
 	bool "Use TX and RX hardware checksum"
 	depends on !SOC_SERIES_STM32H5X
@@ -97,35 +82,20 @@ config ETH_STM32_HW_CHECKSUM
 	  performances.
 	  See reference manual for more information on this feature.
 
-if !ETH_STM32_AUTO_NEGOTIATION_ENABLE
-
-config ETH_STM32_SPEED_10M
-	bool "Set speed to 10 Mbps when autonegotiation is disabled"
-	help
-	  Set this if using 10 Mbps and when autonegotiation is disabled, otherwise speed
-	  is 100 Mbps
-
-config ETH_STM32_MODE_HALFDUPLEX
-	bool "Half duplex mode"
-	help
-	  Set this if using half duplex when autonegotiation is disabled otherwise
-	  duplex mode is full duplex
-
-endif # !ETH_STM32_AUTO_NEGOTIATION_ENABLE
-
-if SOC_SERIES_STM32F7X || SOC_SERIES_STM32H7X || SOC_SERIES_STM32H5X
-
-config PTP_CLOCK_STM32_HAL
+menuconfig PTP_CLOCK_STM32_HAL
 	bool "STM32 HAL PTP clock driver support"
 	default y
 	depends on PTP_CLOCK || NET_L2_PTP
+	depends on ETH_STM32_HAL_API_V2
+	depends on SOC_SERIES_STM32F7X || SOC_SERIES_STM32H7X || SOC_SERIES_STM32H5X
 	help
 	  Enable STM32 PTP clock support.
 
+if PTP_CLOCK_STM32_HAL
+
 config ETH_STM32_HAL_PTP_CLOCK_SRC_HZ
 	int "Frequency of the clock source for the PTP timer"
 	default 50000000
-	depends on PTP_CLOCK_STM32_HAL
 	help
 	  Set the frequency in Hz sourced to the PTP timer.
 	  If the value is set properly, the timer will be accurate.
@@ -133,27 +103,24 @@ config ETH_STM32_HAL_PTP_CLOCK_SRC_HZ
 config ETH_STM32_HAL_PTP_CLOCK_ADJ_MIN_PCT
 	int "Lower bound of clock frequency adjustment (in percent)"
 	default 90
-	depends on PTP_CLOCK_STM32_HAL
 	help
 	  Specifies lower bound of PTP clock rate adjustment.
 
 config ETH_STM32_HAL_PTP_CLOCK_ADJ_MAX_PCT
 	int "Upper bound of clock frequency adjustment (in percent)"
 	default 110
-	depends on PTP_CLOCK_STM32_HAL
 	help
 	  Specifies upper bound of PTP clock rate adjustment.
 
 config ETH_STM32_HAL_PTP_CLOCK_INIT_PRIO
 	int
 	default 85
-	depends on PTP_CLOCK_STM32_HAL
 	help
 	  STM32 PTP Clock initialization priority level. There is
 	  a dependency from the network stack that this device
 	  initializes before network stack (NET_INIT_PRIO).
 
-endif # SOC_SERIES_STM32F7X || SOC_SERIES_STM32H7X || SOC_SERIES_STM32H5X
+endif # PTP_CLOCK_STM32_HAL
 
 config ETH_STM32_MULTICAST_FILTER
 	bool "Multicast hash filter support"
diff --git a/drivers/ethernet/Kconfig.xilinx_axienet b/drivers/ethernet/Kconfig.xilinx_axienet
new file mode 100644
index 0000000000000..bec8ab3127475
--- /dev/null
+++ b/drivers/ethernet/Kconfig.xilinx_axienet
@@ -0,0 +1,41 @@
+#
+#Xilinx AXI 1G / 2.5G Ethernet Subsystem
+#
+#Copyright(c) 2024, CISPA Helmholtz Center for Information Security
+#SPDX-License-Identifier: Apache-2.0
+#
+
+config ETH_XILINX_AXIENET
+	bool "Xilinx AXI Ethernet Driver"
+	default y
+	depends on DT_HAS_XLNX_AXI_ETHERNET_1_00_A_ENABLED
+	depends on DMA_XILINX_AXI_DMA
+	help
+		Enable Xilinx 1G / 2.5G AXI Ethernet driver,
+		commonly found on FPGAs.
+
+config ETH_XILINX_AXIENET_BUFFER_NUM_TX
+	int "Number of buffers for concurrent transmission (TX)."
+	depends on ETH_XILINX_AXIENET
+	default DMA_XILINX_AXI_DMA_SG_DESCRIPTOR_NUM_TX
+	range 2 DMA_XILINX_AXI_DMA_SG_DESCRIPTOR_NUM_TX
+	help
+		Number of buffers for transmission allocated in the Xilinx AXI Ethernet driver.
+		This limits how many transmissions can be in-flight at the same time.
+		This cannot exceed the number of available TX buffers in the AXI DMA. However,
+		in scenarios with multiple AXI DMAs for different purposes in the system, it
+		may be desirable to reduce the number of concurrent transmissions to conserve
+		resources.
+
+config ETH_XILINX_AXIENET_BUFFER_NUM_RX
+	int "Number of buffers for concurrent reception (RX)."
+	depends on ETH_XILINX_AXIENET
+	default DMA_XILINX_AXI_DMA_SG_DESCRIPTOR_NUM_RX
+	range 2 DMA_XILINX_AXI_DMA_SG_DESCRIPTOR_NUM_RX
+	help
+		Number of buffers for reception allocated in the Xilinx AXI Ethernet driver.
+		This limits how many transmissions can be in-flight at the same time.
+		This cannot exceed the number of available RX buffers in the AXI DMA. However,
+		in scenarios with multiple AXI DMAs for different purposes in the system, it
+		may be desirable to reduce the number of concurrent transmissions to conserve
+		resources.
diff --git a/drivers/ethernet/dsa/CMakeLists.txt b/drivers/ethernet/dsa/CMakeLists.txt
new file mode 100644
index 0000000000000..1ade5f741d90b
--- /dev/null
+++ b/drivers/ethernet/dsa/CMakeLists.txt
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library_sources_ifdef(CONFIG_DSA_KSZ8XXX	dsa_ksz8xxx.c)
diff --git a/drivers/ethernet/dsa/Kconfig b/drivers/ethernet/dsa/Kconfig
new file mode 100644
index 0000000000000..56d0109b0eb66
--- /dev/null
+++ b/drivers/ethernet/dsa/Kconfig
@@ -0,0 +1,83 @@
+# Distributed Switch Architecture [DSA] configuration options
+
+# Copyright (c) 2020 DENX Software Engineering GmbH
+#               Lukasz Majewski <lukma@denx.de>
+# SPDX-License-Identifier: Apache-2.0
+
+config ETH_DSA_SUPPORT
+	bool
+	help
+	  Set by an ethernet driver that supports DSA.
+
+menuconfig NET_DSA
+	bool "Distributed Switch Architecture support"
+	depends on ETH_DSA_SUPPORT
+	help
+	  Enable Distributed Switch Architecture support. For now it
+	  only supports Kinetics and STM32 ENET drivers.
+
+if NET_DSA
+
+config DSA_KSZ8XXX
+	bool
+
+config DSA_KSZ8794
+	bool "Support for KSZ8794"
+	default y
+	depends on DT_HAS_MICROCHIP_KSZ8794_ENABLED
+	select DSA_KSZ8XXX
+	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_MICROCHIP_KSZ8794),spi)
+	help
+	  Add support for KSZ8794 DSA device driver.
+
+config DSA_KSZ8863
+	bool "Support for KSZ8863"
+	default y
+	depends on DT_HAS_MICROCHIP_KSZ8863_ENABLED
+	select DSA_KSZ8XXX
+	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_MICROCHIP_KSZ8863),spi)
+	help
+	  Add support for KSZ8863 DSA device driver.
+
+config DSA_KSZ8463
+	bool "Support for KSZ8463"
+	default y
+	depends on DT_HAS_MICROCHIP_KSZ8463_ENABLED
+	select DSA_KSZ8XXX
+	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_MICROCHIP_KSZ8463),spi)
+	help
+	  Add support for KSZ8463 DSA device driver.
+
+config DSA_KSZ_TAIL_TAGGING
+	bool "Support for tail tagging"
+	depends on DSA_KSZ8794 || DSA_KSZ8863 || DSA_KSZ8463
+	help
+	  Add support for tail tagging on DSA device.
+
+config DSA_TAG_SIZE
+	int "DSA tag size in bytes"
+	default 1 if DSA_KSZ8794 || DSA_KSZ8863 || DSA_KSZ8463
+	default 0
+	depends on DSA_KSZ_TAIL_TAGGING
+	help
+	  Set the DSA tag length in bytes.
+
+config DSA_KSZ_PORT_ISOLATING
+	bool "Support for ports isolating"
+	depends on DSA_KSZ8794 || DSA_KSZ8863 || DSA_KSZ8463
+	help
+	  Add support for traffic isolation on DSA slave ports
+
+config DSA_SPI
+	bool "Support for PHY SPI interface"
+	depends on SPI && (DSA_KSZ8794 || DSA_KSZ8863 || DSA_KSZ8463)
+	help
+	  Use SPI bus to communicate with PHY
+
+module = NET_DSA
+module-dep = NET_LOG
+module-str = Log level for DSA
+module-help = Enables core DSA code to output debug messages.
+source "subsys/net/Kconfig.template.log_config.net"
+
+endif # NET_DSA
diff --git a/drivers/ethernet/dsa/dsa_ksz8463.h b/drivers/ethernet/dsa/dsa_ksz8463.h
new file mode 100644
index 0000000000000..b57096cbac3e7
--- /dev/null
+++ b/drivers/ethernet/dsa/dsa_ksz8463.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2023 Meshium
+ *               Aleksandr Senin <al@meshium.net>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __DSA_KSZ8463_H__
+#define __DSA_KSZ8463_H__
+
+/* SPI commands */
+#define KSZ8463_SPI_CMD_WR (BIT(7))
+#define KSZ8463_SPI_CMD_RD (0)
+
+#define KSZ8463_REG_ADDR_HI_PART(x)	(((x) & 0x7FF) >> 4)
+#define KSZ8463_REG_ADDR_LO_PART(x)	(((x) & 0x00C) << 4)
+#define KSZ8463_SPI_BYTE_ENABLE(x)	(BIT(((x) & 0x3) + 2))
+
+/* PHY registers */
+#define KSZ8463_BMCR                                 0x00
+#define KSZ8463_BMSR                                 0x01
+#define KSZ8463_PHYID1                               0x02
+#define KSZ8463_PHYID2                               0x03
+#define KSZ8463_ANAR                                 0x04
+#define KSZ8463_ANLPAR                               0x05
+#define KSZ8463_LINKMD                               0x1D
+#define KSZ8463_PHYSCS                               0x1F
+
+/* SWITCH registers */
+#define KSZ8463_CHIP_ID0                             0x01
+#define KSZ8463_CHIP_ID1                             0x00
+#define KSZ8463_GLOBAL_CTRL_1L			     0x02
+#define KSZ8463_GLOBAL_CTRL_1H			     0x03
+#define KSZ8463_GLOBAL_CTRL_2L			     0x04
+#define KSZ8463_GLOBAL_CTRL_2H			     0x05
+#define KSZ8463_GLOBAL_CTRL_3L			     0x06
+#define KSZ8463_GLOBAL_CTRL_3H			     0x07
+#define KSZ8463_GLOBAL_CTRL_6L			     0x0C
+#define KSZ8463_GLOBAL_CTRL_6H			     0x0D
+#define KSZ8463_GLOBAL_CTRL_7L			     0x0E
+#define KSZ8463_GLOBAL_CTRL_7H			     0x0F
+#define KSZ8463_GLOBAL_CTRL_8L			     0xAC
+#define KSZ8463_GLOBAL_CTRL_8H			     0xAD
+#define KSZ8463_GLOBAL_CTRL_9L			     0xAE
+#define KSZ8463_GLOBAL_CTRL_9H			     0xAF
+
+#define KSZ8463_CFGR_L				     0xD8
+
+#define KSZ8463_DSP_CNTRL_6L			     0x734
+#define KSZ8463_DSP_CNTRL_6H			     0x735
+
+#define KSZ8463_GLOBAL_CTRL1_TAIL_TAG_EN             BIT(0)
+#define KSZ8463_GLOBAL_CTRL2_LEG_MAX_PKT_SIZ_CHK_ENA BIT(1)
+
+#define KSZ8463_CTRL2L_PORTn(n)                      (0x6E + ((n) * 0x18))
+#define KSZ8463_CTRL2L_VLAN_PORTS_MASK		     0xF8
+#define KSZ8463_CTRL2H_PORTn(n)                      (0x6F + ((n) * 0x18))
+#define KSZ8463_CTRL2_TRANSMIT_EN                    BIT(2)
+#define KSZ8463_CTRL2_RECEIVE_EN                     BIT(1)
+#define KSZ8463_CTRL2_LEARNING_DIS                   BIT(0)
+
+#define KSZ8463_STAT2_PORTn(n)                       (0x80 + ((n) * 0x18))
+#define KSZ8463_STAT2_LINK_GOOD                      BIT(5)
+
+#define KSZ8463_CHIP_ID0_ID_DEFAULT                  0x84
+#define KSZ8463_CHIP_ID1_ID_DEFAULT                  0x43
+#define KSZ8463F_CHIP_ID1_ID_DEFAULT                 0x53
+#define KSZ8463_RESET_REG	                     0x127
+#define KSZ8463_SOFTWARE_RESET_SET                   BIT(0)
+#define KSZ8463_SOFTWARE_RESET_CLEAR                 0
+
+#define KSZ8463_P2_COPPER_MODE			     BIT(7)
+#define KSZ8463_P1_COPPER_MODE			     BIT(6)
+#define KSZ8463_RECV_ADJ			     BIT(5)
+
+enum {
+	/* LAN ports for the ksz8463 switch */
+	KSZ8463_PORT1 = 0,
+	KSZ8463_PORT2,
+	/* SWITCH <-> CPU port */
+	KSZ8463_PORT3,
+};
+
+#define KSZ8463_REG_IND_CTRL_0                        0x31
+#define KSZ8463_REG_IND_CTRL_1                        0x30
+#define KSZ8463_REG_IND_DATA_8                        0x26
+#define KSZ8463_REG_IND_DATA_7                        0x2B
+#define KSZ8463_REG_IND_DATA_6                        0x2A
+#define KSZ8463_REG_IND_DATA_5                        0x29
+#define KSZ8463_REG_IND_DATA_4                        0x28
+#define KSZ8463_REG_IND_DATA_3                        0x2F
+#define KSZ8463_REG_IND_DATA_2                        0x2E
+#define KSZ8463_REG_IND_DATA_1                        0x2D
+#define KSZ8463_REG_IND_DATA_0                        0x2C
+
+#define KSZ8463_STATIC_MAC_TABLE_VALID                BIT(3)
+#define KSZ8463_STATIC_MAC_TABLE_OVRD                 BIT(4)
+#define KSZ8463_STATIC_MAC_TABLE_USE_FID              BIT(5)
+
+#define KSZ8XXX_CHIP_ID0                        KSZ8463_CHIP_ID0
+#define KSZ8XXX_CHIP_ID1                        KSZ8463_CHIP_ID1
+#define KSZ8XXX_CHIP_ID0_ID_DEFAULT             KSZ8463_CHIP_ID0_ID_DEFAULT
+#define KSZ8XXX_CHIP_ID1_ID_DEFAULT             KSZ8463F_CHIP_ID1_ID_DEFAULT
+#define KSZ8XXX_FIRST_PORT                      KSZ8463_PORT1
+#define KSZ8XXX_LAST_PORT                       KSZ8463_PORT3
+#define KSZ8XXX_CPU_PORT                        KSZ8463_PORT3
+#define KSZ8XXX_REG_IND_CTRL_0                  KSZ8463_REG_IND_CTRL_0
+#define KSZ8XXX_REG_IND_CTRL_1                  KSZ8463_REG_IND_CTRL_1
+#define KSZ8XXX_REG_IND_DATA_8                  KSZ8463_REG_IND_DATA_8
+#define KSZ8XXX_REG_IND_DATA_7                  KSZ8463_REG_IND_DATA_7
+#define KSZ8XXX_REG_IND_DATA_6                  KSZ8463_REG_IND_DATA_6
+#define KSZ8XXX_REG_IND_DATA_5                  KSZ8463_REG_IND_DATA_5
+#define KSZ8XXX_REG_IND_DATA_4                  KSZ8463_REG_IND_DATA_4
+#define KSZ8XXX_REG_IND_DATA_3                  KSZ8463_REG_IND_DATA_3
+#define KSZ8XXX_REG_IND_DATA_2                  KSZ8463_REG_IND_DATA_2
+#define KSZ8XXX_REG_IND_DATA_1                  KSZ8463_REG_IND_DATA_1
+#define KSZ8XXX_REG_IND_DATA_0                  KSZ8463_REG_IND_DATA_0
+#define KSZ8XXX_STATIC_MAC_TABLE_VALID          KSZ8463_STATIC_MAC_TABLE_VALID
+#define KSZ8XXX_STATIC_MAC_TABLE_OVRD           KSZ8463_STATIC_MAC_TABLE_OVRD
+#define KSZ8XXX_STAT2_LINK_GOOD                 KSZ8463_STAT2_LINK_GOOD
+#define KSZ8XXX_RESET_REG                       KSZ8463_RESET_REG
+#define KSZ8XXX_RESET_SET                       KSZ8463_SOFTWARE_RESET_SET
+#define KSZ8XXX_RESET_CLEAR                     KSZ8463_SOFTWARE_RESET_CLEAR
+#define KSZ8XXX_STAT2_PORTn                     KSZ8463_STAT2_PORTn
+#define KSZ8XXX_CTRL1_PORTn			KSZ8463_CTRL2L_PORTn
+#define KSZ8XXX_CTRL1_VLAN_PORTS_MASK		KSZ8463_CTRL2L_VLAN_PORTS_MASK
+#define KSZ8XXX_SPI_CMD_RD                      KSZ8463_SPI_CMD_RD
+#define KSZ8XXX_SPI_CMD_WR                      KSZ8463_SPI_CMD_WR
+#define KSZ8XXX_SOFT_RESET_DURATION             1000
+#define KSZ8XXX_HARD_RESET_WAIT                 10000
+
+#endif /* __DSA_KSZ8463_H__ */
diff --git a/drivers/ethernet/dsa_ksz8794.h b/drivers/ethernet/dsa/dsa_ksz8794.h
similarity index 98%
rename from drivers/ethernet/dsa_ksz8794.h
rename to drivers/ethernet/dsa/dsa_ksz8794.h
index 93ed81e5bac7e..d4a1c2f578bbd 100644
--- a/drivers/ethernet/dsa_ksz8794.h
+++ b/drivers/ethernet/dsa/dsa_ksz8794.h
@@ -234,6 +234,8 @@
 #define KSZ8794_GLOBAL_CTRL10_TAIL_TAG_EN            BIT(1)
 #define KSZ8794_GLOBAL_CTRL2_LEG_MAX_PKT_SIZ_CHK_DIS BIT(1)
 
+#define KSZ8794_CTRL1_PORTn(n)                       (0x11 + ((n) * 0x10))
+#define KSZ8794_CTRL1_VLAN_PORTS_MASK		     0xE0
 #define KSZ8794_CTRL2_PORTn(n)                       (0x12 + ((n) * 0x10))
 #define KSZ8794_CTRL2_TRANSMIT_EN                    BIT(2)
 #define KSZ8794_CTRL2_RECEIVE_EN                     BIT(1)
@@ -321,6 +323,8 @@ enum {
 #define KSZ8XXX_RESET_SET                       KSZ8794_PWR_MGNT_MODE_SOFT_DOWN
 #define KSZ8XXX_RESET_CLEAR                     0
 #define KSZ8XXX_STAT2_PORTn                     KSZ8794_STAT2_PORTn
+#define KSZ8XXX_CTRL1_PORTn			KSZ8794_CTRL1_PORTn
+#define KSZ8XXX_CTRL1_VLAN_PORTS_MASK		KSZ8794_CTRL1_VLAN_PORTS_MASK
 #define KSZ8XXX_SPI_CMD_RD                      KSZ8794_SPI_CMD_RD
 #define KSZ8XXX_SPI_CMD_WR                      KSZ8794_SPI_CMD_WR
 #define KSZ8XXX_SOFT_RESET_DURATION                     1000
diff --git a/drivers/ethernet/dsa_ksz8863.h b/drivers/ethernet/dsa/dsa_ksz8863.h
similarity index 97%
rename from drivers/ethernet/dsa_ksz8863.h
rename to drivers/ethernet/dsa/dsa_ksz8863.h
index 602662ee1eb31..d523da9261564 100644
--- a/drivers/ethernet/dsa_ksz8863.h
+++ b/drivers/ethernet/dsa/dsa_ksz8863.h
@@ -94,6 +94,8 @@
 #define KSZ8863_GLOBAL_CTRL1_TAIL_TAG_EN             BIT(6)
 #define KSZ8863_GLOBAL_CTRL2_LEG_MAX_PKT_SIZ_CHK_ENA BIT(1)
 
+#define KSZ8863_CTRL1_PORTn(n)                       (0x11 + ((n) * 0x10))
+#define KSZ8863_CTRL1_VLAN_PORTS_MASK                0xF8
 #define KSZ8863_CTRL2_PORTn(n)                       (0x12 + ((n) * 0x10))
 #define KSZ8863_CTRL2_TRANSMIT_EN                    BIT(2)
 #define KSZ8863_CTRL2_RECEIVE_EN                     BIT(1)
@@ -157,6 +159,8 @@ enum {
 #define KSZ8XXX_RESET_SET                       KSZ8863_SOFTWARE_RESET_SET
 #define KSZ8XXX_RESET_CLEAR                     KSZ8863_SOFTWARE_RESET_CLEAR
 #define KSZ8XXX_STAT2_PORTn                     KSZ8863_STAT2_PORTn
+#define KSZ8XXX_CTRL1_PORTn			KSZ8863_CTRL1_PORTn
+#define KSZ8XXX_CTRL1_VLAN_PORTS_MASK		KSZ8863_CTRL1_VLAN_PORTS_MASK
 #define KSZ8XXX_SPI_CMD_RD                      KSZ8863_SPI_CMD_RD
 #define KSZ8XXX_SPI_CMD_WR                      KSZ8863_SPI_CMD_WR
 #define KSZ8XXX_SOFT_RESET_DURATION             1000
diff --git a/drivers/ethernet/dsa_ksz8xxx.c b/drivers/ethernet/dsa/dsa_ksz8xxx.c
similarity index 91%
rename from drivers/ethernet/dsa_ksz8xxx.c
rename to drivers/ethernet/dsa/dsa_ksz8xxx.c
index 9cf136f7b0114..5be6a251a0e4f 100644
--- a/drivers/ethernet/dsa_ksz8xxx.c
+++ b/drivers/ethernet/dsa/dsa_ksz8xxx.c
@@ -30,6 +30,9 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_ETHERNET_LOG_LEVEL);
 #elif CONFIG_DSA_KSZ8794
 #define DT_DRV_COMPAT microchip_ksz8794
 #include "dsa_ksz8794.h"
+#elif CONFIG_DSA_KSZ8463
+#define DT_DRV_COMPAT microchip_ksz8463
+#include "dsa_ksz8463.h"
 #else
 #error "Unsupported KSZ chipset"
 #endif
@@ -59,9 +62,15 @@ static void dsa_ksz8xxx_write_reg(const struct ksz8xxx_data *pdev,
 		.count = 1
 	};
 
+#if CONFIG_DSA_KSZ8463
+	buf[0] = KSZ8XXX_SPI_CMD_WR | KSZ8463_REG_ADDR_HI_PART(reg_addr);
+	buf[1] = KSZ8463_REG_ADDR_LO_PART(reg_addr) | KSZ8463_SPI_BYTE_ENABLE(reg_addr);
+	buf[2] = value;
+#else
 	buf[0] = KSZ8XXX_SPI_CMD_WR | ((reg_addr >> 7) & 0x1F);
 	buf[1] = (reg_addr << 1) & 0xFE;
 	buf[2] = value;
+#endif
 
 	spi_write_dt(&pdev->spi, &tx);
 #endif
@@ -91,9 +100,15 @@ static void dsa_ksz8xxx_read_reg(const struct ksz8xxx_data *pdev,
 		.count = 1
 	};
 
+#if CONFIG_DSA_KSZ8463
+	buf[0] = KSZ8XXX_SPI_CMD_RD | KSZ8463_REG_ADDR_HI_PART(reg_addr);
+	buf[1] = KSZ8463_REG_ADDR_LO_PART(reg_addr) | KSZ8463_SPI_BYTE_ENABLE(reg_addr);
+	buf[2] = 0;
+#else
 	buf[0] = KSZ8XXX_SPI_CMD_RD | ((reg_addr >> 7) & 0x1F);
 	buf[1] = (reg_addr << 1) & 0xFE;
 	buf[2] = 0x0;
+#endif
 
 	if (!spi_transceive_dt(&pdev->spi, &tx, &rx)) {
 		*value = buf[2];
@@ -153,7 +168,12 @@ static int dsa_ksz8xxx_probe(struct ksz8xxx_data *pdev)
 	dsa_ksz8xxx_read_reg(pdev, KSZ8XXX_CHIP_ID1, &val[1]);
 
 	if (val[0] != KSZ8XXX_CHIP_ID0_ID_DEFAULT ||
+#if CONFIG_DSA_KSZ8463
+	    (val[1] != KSZ8463_CHIP_ID1_ID_DEFAULT &&
+	    val[1] != KSZ8463F_CHIP_ID1_ID_DEFAULT)) {
+#else
 	    val[1] != KSZ8XXX_CHIP_ID1_ID_DEFAULT) {
+#endif
 		LOG_ERR("Chip ID mismatch. "
 			"Expected %02x%02x but found %02x%02x",
 			KSZ8XXX_CHIP_ID0_ID_DEFAULT,
@@ -163,7 +183,7 @@ static int dsa_ksz8xxx_probe(struct ksz8xxx_data *pdev)
 		return -ENODEV;
 	}
 
-	LOG_DBG("KSZ8794: ID0: 0x%x ID1: 0x%x timeout: %d", val[1], val[0],
+	LOG_DBG("KSZ8794: ID0: 0x%x ID1: 0x%x timeout: %d", val[0], val[1],
 		timeout);
 
 	return 0;
@@ -260,6 +280,79 @@ static int dsa_ksz8xxx_read_static_mac_table(struct ksz8xxx_data *pdev,
 	return 0;
 }
 
+#if defined(CONFIG_DSA_KSZ_PORT_ISOLATING)
+static int dsa_ksz8xxx_port_isolate(const struct ksz8xxx_data *pdev)
+{
+	uint8_t tmp, i;
+
+	for (i = KSZ8XXX_FIRST_PORT; i < KSZ8XXX_LAST_PORT; i++) {
+		dsa_ksz8xxx_read_reg(pdev, KSZ8XXX_CTRL1_PORTn(i), &tmp);
+		tmp &= KSZ8XXX_CTRL1_VLAN_PORTS_MASK;
+		tmp |= 1 << KSZ8XXX_CPU_PORT | 1 << i;
+		dsa_ksz8xxx_write_reg(pdev, KSZ8XXX_CTRL1_PORTn(i), tmp);
+	}
+
+	dsa_ksz8xxx_read_reg(pdev, KSZ8XXX_CTRL1_PORTn(KSZ8XXX_CPU_PORT),
+			     &tmp);
+	tmp |= ~KSZ8XXX_CTRL1_VLAN_PORTS_MASK;
+	dsa_ksz8xxx_write_reg(pdev, KSZ8XXX_CTRL1_PORTn(KSZ8XXX_CPU_PORT),
+			      tmp);
+
+	return 0;
+}
+#endif
+
+#if CONFIG_DSA_KSZ8463
+static int dsa_ksz8xxx_switch_setup(struct ksz8xxx_data *pdev)
+{
+	uint8_t tmp, i;
+
+	dsa_ksz8xxx_read_reg(pdev, KSZ8XXX_CHIP_ID1, &tmp);
+
+	if (tmp == KSZ8463F_CHIP_ID1_ID_DEFAULT) {
+		dsa_ksz8xxx_read_reg(pdev, KSZ8463_CFGR_L, &tmp);
+		tmp &= ~KSZ8463_P1_COPPER_MODE;
+		tmp &= ~KSZ8463_P2_COPPER_MODE;
+		dsa_ksz8xxx_write_reg(pdev, KSZ8463_CFGR_L, tmp);
+		dsa_ksz8xxx_read_reg(pdev, KSZ8463_DSP_CNTRL_6H, &tmp);
+		tmp &= ~KSZ8463_RECV_ADJ;
+		dsa_ksz8xxx_write_reg(pdev, KSZ8463_DSP_CNTRL_6H, tmp);
+	}
+
+	/*
+	 * Loop through ports - The same setup when tail tagging is enabled or
+	 * disabled.
+	 */
+	for (i = KSZ8XXX_FIRST_PORT; i <= KSZ8XXX_LAST_PORT; i++) {
+
+		/* Enable transmission, reception and switch address learning */
+		dsa_ksz8xxx_read_reg(pdev, KSZ8463_CTRL2H_PORTn(i), &tmp);
+		tmp |= KSZ8463_CTRL2_TRANSMIT_EN;
+		tmp |= KSZ8463_CTRL2_RECEIVE_EN;
+		tmp &= ~KSZ8463_CTRL2_LEARNING_DIS;
+		dsa_ksz8xxx_write_reg(pdev, KSZ8463_CTRL2H_PORTn(i), tmp);
+	}
+
+#if defined(CONFIG_DSA_KSZ_TAIL_TAGGING)
+	/* Enable tail tag feature */
+	dsa_ksz8xxx_read_reg(pdev, KSZ8463_GLOBAL_CTRL_8H, &tmp);
+	tmp |= KSZ8463_GLOBAL_CTRL1_TAIL_TAG_EN;
+	dsa_ksz8xxx_write_reg(pdev, KSZ8463_GLOBAL_CTRL_8H, tmp);
+#else
+	/* Disable tail tag feature */
+	dsa_ksz8xxx_read_reg(pdev, KSZ8463_GLOBAL_CTRL_8H, &tmp);
+	tmp &= ~KSZ8463_GLOBAL_CTRL1_TAIL_TAG_EN;
+	dsa_ksz8xxx_write_reg(pdev, KSZ8463_GLOBAL_CTRL_8H, tmp);
+#endif
+
+	dsa_ksz8xxx_read_reg(pdev, KSZ8463_GLOBAL_CTRL_2L, &tmp);
+	tmp &= ~KSZ8463_GLOBAL_CTRL2_LEG_MAX_PKT_SIZ_CHK_ENA;
+	dsa_ksz8xxx_write_reg(pdev, KSZ8463_GLOBAL_CTRL_2L, tmp);
+
+	return 0;
+}
+#endif
+
 #if CONFIG_DSA_KSZ8863
 static int dsa_ksz8xxx_switch_setup(const struct ksz8xxx_data *pdev)
 {
@@ -697,6 +790,10 @@ int dsa_hw_init(struct ksz8xxx_data *pdev)
 	/* Setup KSZ8794 */
 	dsa_ksz8xxx_switch_setup(pdev);
 
+#if defined(CONFIG_DSA_KSZ_PORT_ISOLATING)
+	dsa_ksz8xxx_port_isolate(pdev);
+#endif
+
 #if DT_INST_NODE_HAS_PROP(0, mii_lowspeed_drivestrength)
 	dsa_ksz8794_set_lowspeed_drivestrength(pdev);
 #endif
@@ -841,8 +938,8 @@ struct net_pkt *dsa_ksz8xxx_xmit_pkt(struct net_if *iface, struct net_pkt *pkt)
 	struct net_buf *buf;
 	size_t len, pad = 0;
 
-	lladst.len = sizeof(hdr->dst.addr);
-	lladst.addr = &hdr->dst.addr[0];
+	(void)net_linkaddr_create(&lladst, hdr->dst.addr, sizeof(hdr->dst.addr),
+				  NET_LINK_ETHERNET);
 
 	len = net_pkt_get_len(pkt);
 	/*
@@ -885,7 +982,7 @@ struct net_pkt *dsa_ksz8xxx_xmit_pkt(struct net_if *iface, struct net_pkt *pkt)
 		port_idx = (1 << (ctx->dsa_port_idx));
 	}
 
-	NET_DBG("TT - port: 0x%x[%p] LEN: %d 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
+	LOG_DBG("TT - port: 0x%x[%p] LEN: %d 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
 		port_idx, iface, len, lladst.addr[0], lladst.addr[1],
 		lladst.addr[2], lladst.addr[3], lladst.addr[4], lladst.addr[5]);
 
@@ -948,7 +1045,7 @@ static struct net_if *dsa_ksz8xxx_get_iface(struct net_if *iface,
 	iface_sw = net_if_get_by_index(pnum + 2);
 
 	ctx = net_if_l2_data(iface);
-	NET_DBG("TT - plen: %d pnum: %d pos: 0x%p dsa_port_idx: %d",
+	LOG_DBG("TT - plen: %d pnum: %d pos: 0x%p dsa_port_idx: %d",
 		plen - DSA_KSZ8794_EGRESS_TAG_LEN, pnum,
 		net_pkt_cursor_get_pos(pkt), ctx->dsa_port_idx);
 
@@ -1112,5 +1209,4 @@ static struct dsa_api dsa_api_f = {
 	};								\
 	DT_INST_FOREACH_CHILD_VARGS(n, NET_SLAVE_DEVICE_INIT_INSTANCE, n);
 
-
 DT_INST_FOREACH_STATUS_OKAY(DSA_DEVICE);
diff --git a/drivers/ethernet/dwc_xgmac/eth_dwc_xgmac.c b/drivers/ethernet/dwc_xgmac/eth_dwc_xgmac.c
index 976e676a9a145..bc370eda20579 100644
--- a/drivers/ethernet/dwc_xgmac/eth_dwc_xgmac.c
+++ b/drivers/ethernet/dwc_xgmac/eth_dwc_xgmac.c
@@ -1564,7 +1564,6 @@ static int eth_dwc_xgmac_set_config(const struct device *dev, enum ethernet_conf
 	const struct eth_dwc_xgmac_config *dev_conf = (struct eth_dwc_xgmac_config *)dev->config;
 	struct eth_dwc_xgmac_dev_data *dev_data = (struct eth_dwc_xgmac_dev_data *)dev->data;
 	const struct device *phy = dev_conf->phy_dev;
-	const struct ethphy_driver_api *phy_api = phy->api;
 	enum phy_link_speed adv_speeds;
 
 	int retval = 0;
@@ -1577,7 +1576,7 @@ static int eth_dwc_xgmac_set_config(const struct device *dev, enum ethernet_conf
 			adv_speeds =
 				get_phy_adv_speeds(dev_data->auto_neg, dev_data->enable_full_duplex,
 						   dev_data->link_speed);
-			retval = phy_api->cfg_link(phy, adv_speeds);
+			retval = phy_configure_link(phy, adv_speeds);
 		} else {
 			retval = -EALREADY;
 		}
@@ -1599,7 +1598,7 @@ static int eth_dwc_xgmac_set_config(const struct device *dev, enum ethernet_conf
 		}
 		adv_speeds = get_phy_adv_speeds(dev_data->auto_neg, dev_data->enable_full_duplex,
 						dev_data->link_speed);
-		retval = phy_api->cfg_link(phy, adv_speeds);
+		retval = phy_configure_link(phy, adv_speeds);
 		break;
 	case ETHERNET_CONFIG_TYPE_DUPLEX:
 		if (config->full_duplex == dev_data->enable_full_duplex) {
@@ -1610,7 +1609,7 @@ static int eth_dwc_xgmac_set_config(const struct device *dev, enum ethernet_conf
 
 		adv_speeds = get_phy_adv_speeds(dev_data->auto_neg, dev_data->enable_full_duplex,
 						dev_data->link_speed);
-		retval = phy_api->cfg_link(phy, adv_speeds);
+		retval = phy_configure_link(phy, adv_speeds);
 		break;
 	case ETHERNET_CONFIG_TYPE_MAC_ADDRESS:
 		memcpy(dev_data->mac_addr, config->mac_address.addr, ETH_MAC_ADDRESS_SIZE);
diff --git a/drivers/ethernet/eth_adin2111.c b/drivers/ethernet/eth_adin2111.c
index 536209a84efc4..0f125fabc2d4b 100644
--- a/drivers/ethernet/eth_adin2111.c
+++ b/drivers/ethernet/eth_adin2111.c
@@ -317,7 +317,7 @@ int eth_adin2111_oa_data_read(const struct device *dev, const uint16_t port_idx)
 							   K_MSEC(CONFIG_ETH_ADIN2111_TIMEOUT));
 			if (!pkt) {
 				LOG_ERR("OA RX: cannot allcate packet space, skipping.");
-				return -EIO;
+				return -ENOMEM;
 			}
 			/* Skipping CRC32 */
 			ret = net_pkt_write(pkt, ctx->buf, ctx->scur - sizeof(uint32_t));
@@ -351,7 +351,7 @@ static int eth_adin2111_send_oa_frame(const struct device *dev, struct net_pkt *
 	uint16_t clen, len = net_pkt_get_len(pkt);
 	uint32_t hdr;
 	uint8_t chunks, i;
-	int ret, txc, cur;
+	int ret, txc, cur, ebo;
 
 	chunks = len / ctx->oa_cps;
 
@@ -359,6 +359,17 @@ static int eth_adin2111_send_oa_frame(const struct device *dev, struct net_pkt *
 		chunks++;
 	}
 
+	if (chunks > 1) {
+		/* we have to calculate EBO so we do not exceed maximum Ethernet frame length */
+		ebo = (len % ctx->oa_cps) - 1;
+		if (ebo < 0) {
+			ebo += ctx->oa_cps;
+		}
+	} else {
+		/* we have to pad to the minimum Ethernet frame length */
+		ebo = ctx->oa_cps - 1;
+	}
+
 	ret = eth_adin2111_reg_read(dev, ADIN2111_BUFSTS, &txc);
 	if (ret < 0) {
 		LOG_ERR("Cannot read txc");
@@ -380,7 +391,7 @@ static int eth_adin2111_send_oa_frame(const struct device *dev, struct net_pkt *
 		}
 		if (i == chunks) {
 			hdr |= ADIN2111_OA_DATA_HDR_EV;
-			hdr |= (ctx->oa_cps - 1) << ADIN2111_OA_DATA_HDR_EBO;
+			hdr |= ebo << ADIN2111_OA_DATA_HDR_EBO;
 		}
 
 		hdr |= eth_adin2111_oa_get_parity(hdr);
@@ -693,58 +704,47 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
 			adin2111_port_on_phyint(ctx->port[1]);
 		}
 
-		if (ctx->oa) {
-			if (status1 & ADIN2111_STATUS1_P1_RX_RDY) {
-				ret = eth_adin2111_oa_data_read(dev, 0);
-				if (ret < 0) {
-					goto continue_unlock;
-				}
-			}
-			if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
-				ret = eth_adin2111_oa_data_read(dev, 1);
-				if (ret < 0) {
-					goto continue_unlock;
-				}
-			}
-		} else {
+		if (!ctx->oa) {
 #if CONFIG_ETH_ADIN2111_SPI_CFG0
 			if (status0 & ADIN2111_STATUS1_SPI_ERR) {
 				LOG_WRN("Detected TX SPI CRC error");
 			}
-#endif /* CONFIG_ETH_ADIN2111_SPI_CFG0 */
+#endif
+		}
 
+		/* handle rx interrupt(s) */
+		do {
 			/* handle port 1 rx */
 			if (status1 & ADIN2111_STATUS1_P1_RX_RDY) {
-				do {
+				if (ctx->oa) {
+					ret = eth_adin2111_oa_data_read(dev, 0);
+				} else {
 					ret = adin2111_read_fifo(dev, 0U);
-					if (ret < 0) {
-						break;
-					}
-
-					ret = eth_adin2111_reg_read(dev, ADIN2111_STATUS1,
-								    &status1);
-					if (ret < 0) {
-						goto continue_unlock;
-					}
-				} while (!!(status1 & ADIN2111_STATUS1_P1_RX_RDY));
+				}
+
+				if (ret < 0) {
+					break;
+				}
 			}
 
 			/* handle port 2 rx */
 			if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
-				do {
+				if (ctx->oa) {
+					ret = eth_adin2111_oa_data_read(dev, 1);
+				} else {
 					ret = adin2111_read_fifo(dev, 1U);
-					if (ret < 0) {
-						break;
-					}
-
-					ret = eth_adin2111_reg_read(dev, ADIN2111_STATUS1,
-								    &status1);
-					if (ret < 0) {
-						goto continue_unlock;
-					}
-				} while (!!(status1 & ADIN2111_STATUS1_P2_RX_RDY));
+				}
+
+				if (ret < 0) {
+					break;
+				}
 			}
-		}
+
+			ret = eth_adin2111_reg_read(dev, ADIN2111_STATUS1, &status1);
+			if (ret < 0) {
+				break;
+			}
+		} while (status1 & (ADIN2111_STATUS1_P1_RX_RDY | ADIN2111_STATUS1_P2_RX_RDY));
 
 continue_unlock:
 		/* clear interrupts */
diff --git a/drivers/ethernet/eth_dwmac_stm32h7x.c b/drivers/ethernet/eth_dwmac_stm32h7x.c
index 846008c842de3..bf96341207b86 100644
--- a/drivers/ethernet/eth_dwmac_stm32h7x.c
+++ b/drivers/ethernet/eth_dwmac_stm32h7x.c
@@ -33,8 +33,8 @@ static const struct pinctrl_dev_config *eth0_pcfg =
 	PINCTRL_DT_INST_DEV_CONFIG_GET(0);
 
 static const struct stm32_pclken pclken = {
-	.bus = DT_INST_CLOCKS_CELL_BY_NAME(0, stmmaceth, bus),
-	.enr = DT_INST_CLOCKS_CELL_BY_NAME(0, stmmaceth, bits),
+	.bus = DT_CLOCKS_CELL_BY_NAME(DT_INST_PARENT(0), stm_eth, bus),
+	.enr = DT_CLOCKS_CELL_BY_NAME(DT_INST_PARENT(0), stm_eth, bits),
 };
 static const struct stm32_pclken pclken_tx = {
 	.bus = DT_INST_CLOCKS_CELL_BY_NAME(0, mac_clk_tx, bus),
@@ -81,7 +81,7 @@ int dwmac_bus_init(struct dwmac_priv *p)
 	reg_val = sys_read32(reg_addr);
 	sys_write32(reg_val | 0x03800000, reg_addr);
 
-	p->base_addr = DT_INST_REG_ADDR(0);
+	p->base_addr = DT_REG_ADDR(DT_INST_PARENT(0));
 	return 0;
 }
 
diff --git a/drivers/ethernet/eth_litex_liteeth.c b/drivers/ethernet/eth_litex_liteeth.c
index a8b1b38c739be..1a2b60098321b 100644
--- a/drivers/ethernet/eth_litex_liteeth.c
+++ b/drivers/ethernet/eth_litex_liteeth.c
@@ -27,12 +27,16 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include "eth.h"
 
-#define MAX_TX_FAILURE 100
+#define MAX_TX_FAILURE K_MSEC(100)
+
+#define ETH_LITEX_SLOT_SIZE 0x0800
 
 struct eth_litex_dev_data {
 	struct net_if *iface;
 	uint8_t mac_addr[6];
 	uint8_t txslot;
+	struct k_mutex tx_mutex;
+	struct k_sem sem_tx_ready;
 };
 
 struct eth_litex_config {
@@ -49,8 +53,10 @@ struct eth_litex_config {
 	uint32_t tx_length_addr;
 	uint32_t tx_ev_pending_addr;
 	uint32_t tx_ev_enable_addr;
-	uint8_t *tx_buf[2];
-	uint8_t *rx_buf[2];
+	uint32_t tx_buf_addr;
+	uint32_t rx_buf_addr;
+	uint8_t tx_buf_n;
+	uint8_t rx_buf_n;
 };
 
 static int eth_initialize(const struct device *dev)
@@ -58,10 +64,10 @@ static int eth_initialize(const struct device *dev)
 	const struct eth_litex_config *config = dev->config;
 	struct eth_litex_dev_data *context = dev->data;
 
-	config->config_func(dev);
+	k_mutex_init(&context->tx_mutex);
+	k_sem_init(&context->sem_tx_ready, 1, 1);
 
-	/* TX event is disabled because it isn't used by this driver */
-	litex_write8(0, config->tx_ev_enable_addr);
+	config->config_func(dev);
 
 	if (config->random_mac_address) {
 		/* generate random MAC address */
@@ -73,42 +79,40 @@ static int eth_initialize(const struct device *dev)
 
 static int eth_tx(const struct device *dev, struct net_pkt *pkt)
 {
-	unsigned int key;
 	uint16_t len;
 	struct eth_litex_dev_data *context = dev->data;
 	const struct eth_litex_config *config = dev->config;
+	int ret;
 
-	key = irq_lock();
-	int attempts = 0;
+	k_mutex_lock(&context->tx_mutex, K_FOREVER);
 
 	/* get data from packet and send it */
 	len = net_pkt_get_len(pkt);
-	net_pkt_read(pkt, config->tx_buf[context->txslot], len);
+	net_pkt_read(pkt,
+		     UINT_TO_POINTER(config->tx_buf_addr + (context->txslot * ETH_LITEX_SLOT_SIZE)),
+		     len);
 
 	litex_write8(context->txslot, config->tx_slot_addr);
 	litex_write16(len, config->tx_length_addr);
 
 	/* wait for the device to be ready to transmit */
-	while (litex_read8(config->tx_ready_addr) == 0) {
-		if (attempts++ == MAX_TX_FAILURE) {
-			goto error;
-		}
-		k_sleep(K_MSEC(1));
-	}
-
+	ret = k_sem_take(&context->sem_tx_ready, MAX_TX_FAILURE);
+	if (ret < 0) {
+		goto error;
+	};
 	/* start transmitting */
 	litex_write8(1, config->tx_start_addr);
 
 	/* change slot */
-	context->txslot = (context->txslot + 1) % 2;
+	context->txslot = (context->txslot + 1) % config->tx_buf_n;
 
-	irq_unlock(key);
+	k_mutex_unlock(&context->tx_mutex);
 
 	return 0;
 error:
-	irq_unlock(key);
+	k_mutex_unlock(&context->tx_mutex);
 	LOG_ERR("TX fifo failed");
-	return -1;
+	return -EIO;
 }
 
 static void eth_rx(const struct device *port)
@@ -118,7 +122,6 @@ static void eth_rx(const struct device *port)
 	const struct eth_litex_config *config = port->config;
 
 	int r;
-	unsigned int key;
 	uint16_t len = 0;
 	uint8_t rxslot = 0;
 
@@ -126,8 +129,6 @@ static void eth_rx(const struct device *port)
 		return;
 	}
 
-	key = irq_lock();
-
 	/* get frame's length */
 	len = litex_read16(config->rx_length_addr);
 
@@ -139,14 +140,16 @@ static void eth_rx(const struct device *port)
 					   K_NO_WAIT);
 	if (pkt == NULL) {
 		LOG_ERR("Failed to obtain RX buffer");
-		goto out;
+		return;
 	}
 
 	/* copy data to buffer */
-	if (net_pkt_write(pkt, (void *)config->rx_buf[rxslot], len) != 0) {
+	if (net_pkt_write(pkt,
+			  UINT_TO_POINTER(config->rx_buf_addr + (rxslot * ETH_LITEX_SLOT_SIZE)),
+			  len) != 0) {
 		LOG_ERR("Failed to append RX buffer to context buffer");
 		net_pkt_unref(pkt);
-		goto out;
+		return;
 	}
 
 	/* receive data */
@@ -155,19 +158,17 @@ static void eth_rx(const struct device *port)
 		LOG_ERR("Failed to enqueue frame into RX queue: %d", r);
 		net_pkt_unref(pkt);
 	}
-
-out:
-	irq_unlock(key);
 }
 
 static void eth_irq_handler(const struct device *port)
 {
+	struct eth_litex_dev_data *context = port->data;
 	const struct eth_litex_config *config = port->config;
 	/* check sram reader events (tx) */
 	if (litex_read8(config->tx_ev_pending_addr) & BIT(0)) {
-		/* TX event is not enabled nor used by this driver; ack just
-		 * in case if some rogue TX event appeared
-		 */
+		k_sem_give(&context->sem_tx_ready);
+
+		/* ack reader irq */
 		litex_write8(BIT(0), config->tx_ev_pending_addr);
 	}
 
@@ -201,8 +202,14 @@ static int eth_set_config(const struct device *dev, enum ethernet_config_type ty
 
 static int eth_start(const struct device *dev)
 {
+	struct eth_litex_dev_data *context = dev->data;
 	const struct eth_litex_config *config = dev->config;
 
+	if (litex_read8(config->tx_ready_addr)) {
+		k_sem_give(&context->sem_tx_ready);
+	}
+
+	litex_write8(1, config->tx_ev_enable_addr);
 	litex_write8(1, config->rx_ev_enable_addr);
 
 	litex_write8(BIT(0), config->tx_ev_pending_addr);
@@ -215,6 +222,7 @@ static int eth_stop(const struct device *dev)
 {
 	const struct eth_litex_config *config = dev->config;
 
+	litex_write8(0, config->tx_ev_enable_addr);
 	litex_write8(0, config->rx_ev_enable_addr);
 
 	return 0;
@@ -299,16 +307,18 @@ static const struct ethernet_api eth_api = {
 	.send = eth_tx
 };
 
-#define ETH_LITEX_SLOT_SIZE 0x0800
-
-#define ETH_LITEX_SLOT_RX0_ADDR(n)                                                                 \
+#define ETH_LITEX_SLOT_RX_ADDR(n)                                                                  \
 	DT_INST_REG_ADDR_BY_NAME_OR(n, rx_buffers, (DT_INST_REG_ADDR_BY_NAME(n, buffers)))
-#define ETH_LITEX_SLOT_RX1_ADDR(n) (ETH_LITEX_SLOT_RX0_ADDR(n) + ETH_LITEX_SLOT_SIZE)
-#define ETH_LITEX_SLOT_TX0_ADDR(n)                                                                 \
+#define ETH_LITEX_SLOT_TX_ADDR(n)                                                                  \
 	DT_INST_REG_ADDR_BY_NAME_OR(n, tx_buffers,                                                 \
 				    (DT_INST_REG_ADDR_BY_NAME(n, buffers) +                        \
 				     (DT_INST_REG_SIZE_BY_NAME(n, buffers) / 2)))
-#define ETH_LITEX_SLOT_TX1_ADDR(n) (ETH_LITEX_SLOT_TX0_ADDR(n) + ETH_LITEX_SLOT_SIZE)
+#define ETH_LITEX_SLOT_RX_N(n)                                                                     \
+	(DT_INST_REG_SIZE_BY_NAME_OR(n, rx_buffers, (DT_INST_REG_SIZE_BY_NAME(n, buffers) / 2)) /  \
+	 ETH_LITEX_SLOT_SIZE)
+#define ETH_LITEX_SLOT_TX_N(n)                                                                     \
+	(DT_INST_REG_SIZE_BY_NAME_OR(n, tx_buffers, (DT_INST_REG_SIZE_BY_NAME(n, buffers) / 2)) /  \
+	 ETH_LITEX_SLOT_SIZE)
 
 #define ETH_LITEX_INIT(n)                                                                          \
                                                                                                    \
@@ -324,8 +334,7 @@ static const struct ethernet_api eth_api = {
 		.mac_addr = DT_INST_PROP(n, local_mac_address)};                                   \
                                                                                                    \
 	static const struct eth_litex_config eth_config##n = {                                     \
-		IF_ENABLED(DT_INST_NODE_HAS_PROP(n, phy_handle),                                   \
-			   (.phy_dev = DEVICE_DT_GET(DT_INST_PHANDLE(n, phy_handle)),))            \
+		.phy_dev = DEVICE_DT_GET_OR_NULL(DT_INST_PHANDLE(n, phy_handle)),                  \
 		.config_func = eth_irq_config##n,                                                  \
 		.random_mac_address = DT_INST_PROP(n, zephyr_random_mac_address),                  \
 		.rx_slot_addr = DT_INST_REG_ADDR_BY_NAME(n, rx_slot),                              \
@@ -338,15 +347,10 @@ static const struct ethernet_api eth_api = {
 		.tx_length_addr = DT_INST_REG_ADDR_BY_NAME(n, tx_length),                          \
 		.tx_ev_pending_addr = DT_INST_REG_ADDR_BY_NAME(n, tx_ev_pending),                  \
 		.tx_ev_enable_addr = DT_INST_REG_ADDR_BY_NAME(n, tx_ev_enable),                    \
-		.rx_buf = {                                                                        \
-			(uint8_t *)ETH_LITEX_SLOT_RX0_ADDR(n),                                     \
-			(uint8_t *)ETH_LITEX_SLOT_RX1_ADDR(n),                                     \
-												   \
-		},                                                                                 \
-		.tx_buf = {                                                                        \
-			(uint8_t *)ETH_LITEX_SLOT_TX0_ADDR(n),                                     \
-			(uint8_t *)ETH_LITEX_SLOT_TX1_ADDR(n),                                     \
-		},                                                                                 \
+		.rx_buf_addr = ETH_LITEX_SLOT_RX_ADDR(n),                                          \
+		.tx_buf_addr = ETH_LITEX_SLOT_TX_ADDR(n),                                          \
+		.rx_buf_n = ETH_LITEX_SLOT_RX_N(n),                                                \
+		.tx_buf_n = ETH_LITEX_SLOT_TX_N(n),                                                \
                                                                                                    \
 	};                                                                                         \
                                                                                                    \
diff --git a/drivers/ethernet/eth_native_posix.c b/drivers/ethernet/eth_native_posix.c
deleted file mode 100644
index 5a5be070c75ca..0000000000000
--- a/drivers/ethernet/eth_native_posix.c
+++ /dev/null
@@ -1,617 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- *
- * Ethernet driver for native posix board. This is meant for network
- * connectivity between host and Zephyr.
- */
-
-#define LOG_MODULE_NAME eth_posix
-#define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(LOG_MODULE_NAME);
-
-#include <stdio.h>
-
-#include <zephyr/kernel.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <stddef.h>
-#include <cmdline.h>
-#include <posix_native_task.h>
-
-#include <zephyr/net/net_pkt.h>
-#include <zephyr/net/net_core.h>
-#include <zephyr/net/net_if.h>
-#include <zephyr/net/ethernet.h>
-#include <ethernet/eth_stats.h>
-
-#include <zephyr/drivers/ptp_clock.h>
-#include <zephyr/net/gptp.h>
-#include <zephyr/net/lldp.h>
-
-#include "eth_native_posix_priv.h"
-#include "nsi_host_trampolines.h"
-#include "eth.h"
-
-#define NET_BUF_TIMEOUT K_MSEC(100)
-
-#if defined(CONFIG_NET_VLAN)
-#define ETH_HDR_LEN sizeof(struct net_eth_vlan_hdr)
-#else
-#define ETH_HDR_LEN sizeof(struct net_eth_hdr)
-#endif
-
-struct eth_context {
-	uint8_t recv[NET_ETH_MTU + ETH_HDR_LEN];
-	uint8_t send[NET_ETH_MTU + ETH_HDR_LEN];
-	uint8_t mac_addr[6];
-	struct net_linkaddr ll_addr;
-	struct net_if *iface;
-	const char *if_name;
-	k_tid_t rx_thread;
-	struct z_thread_stack_element *rx_stack;
-	size_t rx_stack_size;
-	int dev_fd;
-	bool init_done;
-	bool status;
-	bool promisc_mode;
-
-#if defined(CONFIG_NET_STATISTICS_ETHERNET)
-	struct net_stats_eth stats;
-#endif
-#if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK)
-	const struct device *ptp_clock;
-#endif
-};
-
-static const char *if_name_cmd_opt;
-
-#define DEFINE_RX_THREAD(x, _)						\
-	K_KERNEL_STACK_DEFINE(rx_thread_stack_##x,			\
-			      CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);\
-	static struct k_thread rx_thread_data_##x
-
-LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_RX_THREAD, (;), _);
-
-#if defined(CONFIG_NET_GPTP)
-static bool need_timestamping(struct gptp_hdr *hdr)
-{
-	switch (hdr->message_type) {
-	case GPTP_SYNC_MESSAGE:
-	case GPTP_PATH_DELAY_RESP_MESSAGE:
-		return true;
-	default:
-		return false;
-	}
-}
-
-static struct gptp_hdr *check_gptp_msg(struct net_if *iface,
-				       struct net_pkt *pkt,
-				       bool is_tx)
-{
-	uint8_t *msg_start = net_pkt_data(pkt);
-	struct gptp_hdr *gptp_hdr;
-	int eth_hlen;
-	struct net_eth_hdr *hdr;
-
-	hdr = (struct net_eth_hdr *)msg_start;
-	if (ntohs(hdr->type) != NET_ETH_PTYPE_PTP) {
-		return NULL;
-	}
-
-	eth_hlen = sizeof(struct net_eth_hdr);
-
-	/* In TX, the first net_buf contains the Ethernet header
-	 * and the actual gPTP header is in the second net_buf.
-	 * In RX, the Ethernet header + other headers are in the
-	 * first net_buf.
-	 */
-	if (is_tx) {
-		if (pkt->frags->frags == NULL) {
-			return false;
-		}
-
-		gptp_hdr = (struct gptp_hdr *)pkt->frags->frags->data;
-	} else {
-		gptp_hdr = (struct gptp_hdr *)(pkt->frags->data + eth_hlen);
-	}
-
-	return gptp_hdr;
-}
-
-static void update_pkt_priority(struct gptp_hdr *hdr, struct net_pkt *pkt)
-{
-	if (GPTP_IS_EVENT_MSG(hdr->message_type)) {
-		net_pkt_set_priority(pkt, NET_PRIORITY_CA);
-	} else {
-		net_pkt_set_priority(pkt, NET_PRIORITY_IC);
-	}
-}
-
-static void update_gptp(struct net_if *iface, struct net_pkt *pkt,
-			bool send)
-{
-	struct net_ptp_time timestamp;
-	struct gptp_hdr *hdr;
-	int ret;
-
-	ret = eth_clock_gettime(&timestamp.second, &timestamp.nanosecond);
-	if (ret < 0) {
-		return;
-	}
-
-	net_pkt_set_timestamp(pkt, &timestamp);
-
-	hdr = check_gptp_msg(iface, pkt, send);
-	if (!hdr) {
-		return;
-	}
-
-	if (send) {
-		ret = need_timestamping(hdr);
-		if (ret) {
-			net_if_add_tx_timestamp(pkt);
-		}
-	} else {
-		update_pkt_priority(hdr, pkt);
-	}
-}
-#else
-#define update_gptp(iface, pkt, send)
-#endif /* CONFIG_NET_GPTP */
-
-static int eth_send(const struct device *dev, struct net_pkt *pkt)
-{
-	struct eth_context *ctx = dev->data;
-	int count = net_pkt_get_len(pkt);
-	int ret;
-
-	ret = net_pkt_read(pkt, ctx->send, count);
-	if (ret) {
-		return ret;
-	}
-
-	update_gptp(net_pkt_iface(pkt), pkt, true);
-
-	LOG_DBG("Send pkt %p len %d", pkt, count);
-
-	ret = nsi_host_write(ctx->dev_fd, ctx->send, count);
-	if (ret < 0) {
-		LOG_DBG("Cannot send pkt %p (%d)", pkt, ret);
-	}
-
-	return ret < 0 ? ret : 0;
-}
-
-static struct net_linkaddr *eth_get_mac(struct eth_context *ctx)
-{
-	ctx->ll_addr.addr = ctx->mac_addr;
-	ctx->ll_addr.len = sizeof(ctx->mac_addr);
-
-	return &ctx->ll_addr;
-}
-
-static struct net_pkt *prepare_pkt(struct eth_context *ctx,
-				   int count, int *status)
-{
-	struct net_pkt *pkt;
-
-	pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, count,
-					   AF_UNSPEC, 0, NET_BUF_TIMEOUT);
-	if (!pkt) {
-		*status = -ENOMEM;
-		return NULL;
-	}
-
-	if (net_pkt_write(pkt, ctx->recv, count)) {
-		net_pkt_unref(pkt);
-		*status = -ENOBUFS;
-		return NULL;
-	}
-
-	*status = 0;
-
-	LOG_DBG("Recv pkt %p len %d", pkt, count);
-
-	return pkt;
-}
-
-static int read_data(struct eth_context *ctx, int fd)
-{
-	struct net_if *iface = ctx->iface;
-	struct net_pkt *pkt = NULL;
-	int status;
-	int count;
-
-	count = nsi_host_read(fd, ctx->recv, sizeof(ctx->recv));
-	if (count <= 0) {
-		return 0;
-	}
-
-	pkt = prepare_pkt(ctx, count, &status);
-	if (!pkt) {
-		return status;
-	}
-
-	update_gptp(iface, pkt, false);
-
-	if (net_recv_data(iface, pkt) < 0) {
-		net_pkt_unref(pkt);
-	}
-
-	return 0;
-}
-
-static void eth_rx(void *p1, void *p2, void *p3)
-{
-	ARG_UNUSED(p2);
-	ARG_UNUSED(p3);
-
-	struct eth_context *ctx = p1;
-	LOG_DBG("Starting ZETH RX thread");
-
-	while (1) {
-		if (net_if_is_up(ctx->iface)) {
-			while (!eth_wait_data(ctx->dev_fd)) {
-				read_data(ctx, ctx->dev_fd);
-				k_yield();
-			}
-		}
-
-		k_sleep(K_MSEC(CONFIG_ETH_NATIVE_POSIX_RX_TIMEOUT));
-	}
-}
-
-#if defined(CONFIG_THREAD_MAX_NAME_LEN)
-#define THREAD_MAX_NAME_LEN CONFIG_THREAD_MAX_NAME_LEN
-#else
-#define THREAD_MAX_NAME_LEN 1
-#endif
-
-static void create_rx_handler(struct eth_context *ctx)
-{
-	k_thread_create(ctx->rx_thread,
-			ctx->rx_stack,
-			ctx->rx_stack_size,
-			eth_rx,
-			ctx, NULL, NULL, K_PRIO_COOP(14),
-			0, K_NO_WAIT);
-
-	if (IS_ENABLED(CONFIG_THREAD_NAME)) {
-		char name[THREAD_MAX_NAME_LEN];
-
-		snprintk(name, sizeof(name), "eth_native_posix_rx-%s",
-			 ctx->if_name);
-		k_thread_name_set(ctx->rx_thread, name);
-	}
-}
-
-static void eth_iface_init(struct net_if *iface)
-{
-	struct eth_context *ctx = net_if_get_device(iface)->data;
-	struct net_linkaddr *ll_addr = eth_get_mac(ctx);
-
-	ctx->iface = iface;
-
-	ethernet_init(iface);
-
-	if (ctx->init_done) {
-		return;
-	}
-
-	net_lldp_set_lldpdu(iface);
-
-	ctx->init_done = true;
-
-#if defined(CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC)
-	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
-	gen_random_mac(ctx->mac_addr, 0x00, 0x00, 0x5E);
-
-	ctx->mac_addr[3] = 0x00;
-	ctx->mac_addr[4] = 0x53;
-
-	/* The TUN/TAP setup script will by default set the MAC address of host
-	 * interface to 00:00:5E:00:53:FF so do not allow that.
-	 */
-	if (ctx->mac_addr[5] == 0xff) {
-		ctx->mac_addr[5] = 0x01;
-	}
-#else
-	/* Difficult to configure MAC addresses any sane way if we have more
-	 * than one network interface.
-	 */
-	BUILD_ASSERT(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT == 1,
-		     "Cannot have static MAC if interface count > 1");
-
-	if (CONFIG_ETH_NATIVE_POSIX_MAC_ADDR[0] != 0) {
-		if (net_bytes_from_str(ctx->mac_addr, sizeof(ctx->mac_addr),
-				       CONFIG_ETH_NATIVE_POSIX_MAC_ADDR) < 0) {
-			LOG_ERR("Invalid MAC address %s",
-				CONFIG_ETH_NATIVE_POSIX_MAC_ADDR);
-		}
-	}
-#endif
-
-	/* If we have only one network interface, then use the name
-	 * defined in the Kconfig directly. This way there is no need to
-	 * change the documentation etc. and break things.
-	 */
-	if (CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT == 1) {
-		ctx->if_name = CONFIG_ETH_NATIVE_POSIX_DRV_NAME;
-	}
-
-	if (if_name_cmd_opt != NULL) {
-		ctx->if_name = if_name_cmd_opt;
-	}
-
-	LOG_DBG("Interface %p using \"%s\"", iface, ctx->if_name);
-
-	net_if_set_link_addr(iface, ll_addr->addr, ll_addr->len,
-			     NET_LINK_ETHERNET);
-
-	ctx->dev_fd = eth_iface_create(CONFIG_ETH_NATIVE_POSIX_DEV_NAME, ctx->if_name, false);
-	if (ctx->dev_fd < 0) {
-		LOG_ERR("Cannot create %s (%d/%s)", ctx->if_name, ctx->dev_fd,
-			strerror(-ctx->dev_fd));
-	} else {
-		/* Create a thread that will handle incoming data from host */
-		create_rx_handler(ctx);
-	}
-}
-
-static
-enum ethernet_hw_caps eth_posix_native_get_capabilities(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return ETHERNET_TXTIME
-#if defined(CONFIG_NET_VLAN)
-		| ETHERNET_HW_VLAN
-#endif
-#if defined(CONFIG_ETH_NATIVE_POSIX_VLAN_TAG_STRIP)
-		| ETHERNET_HW_VLAN_TAG_STRIP
-#endif
-#if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK)
-		| ETHERNET_PTP
-#endif
-#if defined(CONFIG_NET_PROMISCUOUS_MODE)
-		| ETHERNET_PROMISC_MODE
-#endif
-#if defined(CONFIG_NET_LLDP)
-		| ETHERNET_LLDP
-#endif
-		;
-}
-
-#if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK)
-static const struct device *eth_get_ptp_clock(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-
-	return context->ptp_clock;
-}
-#endif
-
-#if defined(CONFIG_NET_STATISTICS_ETHERNET)
-static struct net_stats_eth *get_stats(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-
-	return &(context->stats);
-}
-#endif
-
-static int set_config(const struct device *dev,
-		      enum ethernet_config_type type,
-		      const struct ethernet_config *config)
-{
-	int ret = 0;
-
-	if (IS_ENABLED(CONFIG_NET_PROMISCUOUS_MODE) &&
-	    type == ETHERNET_CONFIG_TYPE_PROMISC_MODE) {
-		struct eth_context *context = dev->data;
-
-		if (config->promisc_mode) {
-			if (context->promisc_mode) {
-				return -EALREADY;
-			}
-
-			context->promisc_mode = true;
-		} else {
-			if (!context->promisc_mode) {
-				return -EALREADY;
-			}
-
-			context->promisc_mode = false;
-		}
-
-		ret = eth_promisc_mode(context->if_name,
-				       context->promisc_mode);
-	} else if (type == ETHERNET_CONFIG_TYPE_MAC_ADDRESS) {
-		struct eth_context *context = dev->data;
-
-		memcpy(context->mac_addr, config->mac_address.addr,
-		       sizeof(context->mac_addr));
-	}
-
-	return ret;
-}
-
-#if defined(CONFIG_NET_VLAN)
-static int vlan_setup(const struct device *dev, struct net_if *iface,
-		      uint16_t tag, bool enable)
-{
-	if (enable) {
-		net_lldp_set_lldpdu(iface);
-	} else {
-		net_lldp_unset_lldpdu(iface);
-	}
-
-	return 0;
-}
-#endif /* CONFIG_NET_VLAN */
-
-static const struct ethernet_api eth_if_api = {
-	.iface_api.init = eth_iface_init,
-
-	.get_capabilities = eth_posix_native_get_capabilities,
-	.set_config = set_config,
-	.send = eth_send,
-
-#if defined(CONFIG_NET_VLAN)
-	.vlan_setup = vlan_setup,
-#endif
-#if defined(CONFIG_NET_STATISTICS_ETHERNET)
-	.get_stats = get_stats,
-#endif
-#if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK)
-	.get_ptp_clock = eth_get_ptp_clock,
-#endif
-};
-
-#define DEFINE_ETH_DEV_DATA(x, _)					     \
-	static struct eth_context eth_context_data_##x = {		     \
-		.if_name = CONFIG_ETH_NATIVE_POSIX_DRV_NAME #x,		     \
-		.rx_thread = &rx_thread_data_##x,			     \
-		.rx_stack = rx_thread_stack_##x,			     \
-		.rx_stack_size = K_KERNEL_STACK_SIZEOF(rx_thread_stack_##x), \
-	}
-
-LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEV_DATA, (;), _);
-
-#define DEFINE_ETH_DEVICE(x, _)						\
-	ETH_NET_DEVICE_INIT(eth_native_posix_##x,			\
-			    CONFIG_ETH_NATIVE_POSIX_DRV_NAME #x,	\
-			    NULL, NULL,	&eth_context_data_##x, NULL,	\
-			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
-			    &eth_if_api,				\
-			    NET_ETH_MTU)
-
-LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEVICE, (;), _);
-
-#if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK)
-
-#if defined(CONFIG_NET_GPTP)
-BUILD_ASSERT(								\
-	CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT == CONFIG_NET_GPTP_NUM_PORTS, \
-	"Number of network interfaces must match gPTP port count");
-#endif
-
-struct ptp_context {
-	struct eth_context *eth_context;
-};
-
-#define DEFINE_PTP_DEV_DATA(x, _) \
-	static struct ptp_context ptp_context_##x
-
-LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_PTP_DEV_DATA, (;), _);
-
-static int ptp_clock_set_native_posix(const struct device *clk,
-				      struct net_ptp_time *tm)
-{
-	ARG_UNUSED(clk);
-	ARG_UNUSED(tm);
-
-	/* We cannot set the host device time so this function
-	 * does nothing.
-	 */
-
-	return 0;
-}
-
-static int ptp_clock_get_native_posix(const struct device *clk,
-				      struct net_ptp_time *tm)
-{
-	ARG_UNUSED(clk);
-
-	return eth_clock_gettime(&tm->second, &tm->nanosecond);
-}
-
-static int ptp_clock_adjust_native_posix(const struct device *clk,
-					 int increment)
-{
-	ARG_UNUSED(clk);
-	ARG_UNUSED(increment);
-
-	/* We cannot adjust the host device time so this function
-	 * does nothing.
-	 */
-
-	return 0;
-}
-
-static int ptp_clock_rate_adjust_native_posix(const struct device *clk,
-					      double ratio)
-{
-	ARG_UNUSED(clk);
-	ARG_UNUSED(ratio);
-
-	/* We cannot adjust the host device time so this function
-	 * does nothing.
-	 */
-
-	return 0;
-}
-
-static DEVICE_API(ptp_clock, api) = {
-	.set = ptp_clock_set_native_posix,
-	.get = ptp_clock_get_native_posix,
-	.adjust = ptp_clock_adjust_native_posix,
-	.rate_adjust = ptp_clock_rate_adjust_native_posix,
-};
-
-#define PTP_INIT_FUNC(x, _)						\
-	static int ptp_init_##x(const struct device *port)			\
-	{								\
-		const struct device *const eth_dev = DEVICE_GET(eth_native_posix_##x); \
-		struct eth_context *context = eth_dev->data;	\
-		struct ptp_context *ptp_context = port->data;	\
-									\
-		context->ptp_clock = port;				\
-		ptp_context->eth_context = context;			\
-									\
-		return 0;						\
-	}
-
-LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, PTP_INIT_FUNC, (), _)
-
-#define DEFINE_PTP_DEVICE(x, _)						\
-	DEVICE_DEFINE(eth_native_posix_ptp_clock_##x,			\
-			    PTP_CLOCK_NAME "_" #x,			\
-			    ptp_init_##x,				\
-			    NULL,					\
-			    &ptp_context_##x,				\
-			    NULL,					\
-			    POST_KERNEL,				\
-			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
-			    &api)
-
-LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_PTP_DEVICE, (;), _);
-
-#endif /* CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK */
-
-static void add_native_posix_options(void)
-{
-	static struct args_struct_t eth_native_posix_options[] = {
-		{
-			.is_mandatory = false,
-			.option = "eth-if",
-			.name = "name",
-			.type = 's',
-			.dest = (void *)&if_name_cmd_opt,
-			.descript = "Name of the eth interface to use",
-		},
-		ARG_TABLE_ENDMARKER,
-	};
-
-	native_add_command_line_opts(eth_native_posix_options);
-}
-
-NATIVE_TASK(add_native_posix_options, PRE_BOOT_1, 10);
diff --git a/drivers/ethernet/eth_native_posix_adapt.c b/drivers/ethernet/eth_native_posix_adapt.c
deleted file mode 100644
index 81ae9bdcf8fa2..0000000000000
--- a/drivers/ethernet/eth_native_posix_adapt.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- *
- * Routines setting up the host system. Those are placed in separate file
- * because there is naming conflicts between host and zephyr network stacks.
- */
-
-/* Host include files */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <string.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <net/if.h>
-#include <time.h>
-#include <inttypes.h>
-#include <nsi_tracing.h>
-
-#ifdef __linux
-#include <linux/if.h>
-#include <linux/if_tun.h>
-#endif
-
-#include "eth_native_posix_priv.h"
-
-/* Note that we cannot create the TUN/TAP device from the setup script
- * as we need to get a file descriptor to communicate with the interface.
- */
-int eth_iface_create(const char *dev_name, const char *if_name, bool tun_only)
-{
-	struct ifreq ifr;
-	int fd, ret = -EINVAL;
-
-	fd = open(dev_name, O_RDWR);
-	if (fd < 0) {
-		return -errno;
-	}
-
-	(void)memset(&ifr, 0, sizeof(ifr));
-
-#ifdef __linux
-	ifr.ifr_flags = (tun_only ? IFF_TUN : IFF_TAP) | IFF_NO_PI;
-
-	strncpy(ifr.ifr_name, if_name, IFNAMSIZ - 1);
-
-	ret = ioctl(fd, TUNSETIFF, (void *)&ifr);
-	if (ret < 0) {
-		ret = -errno;
-		close(fd);
-		return ret;
-	}
-#endif
-
-	return fd;
-}
-
-int eth_iface_remove(int fd)
-{
-	return close(fd);
-}
-
-static int ssystem(const char *fmt, ...)
-	__attribute__((__format__(__printf__, 1, 2)));
-
-static int ssystem(const char *fmt, ...)
-{
-	char cmd[255];
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	vsnprintf(cmd, sizeof(cmd), fmt, ap);
-	va_end(ap);
-
-	nsi_print_trace("%s\n", cmd);
-
-	ret = system(cmd);
-
-	return -WEXITSTATUS(ret);
-}
-
-int eth_wait_data(int fd)
-{
-	struct timeval timeout;
-	fd_set rset;
-	int ret;
-
-	FD_ZERO(&rset);
-
-	FD_SET(fd, &rset);
-
-	timeout.tv_sec = 0;
-	timeout.tv_usec = 0;
-
-	ret = select(fd + 1, &rset, NULL, NULL, &timeout);
-	if (ret < 0 && errno != EINTR) {
-		return -errno;
-	} else if (ret > 0) {
-		if (FD_ISSET(fd, &rset)) {
-			return 0;
-		}
-	}
-
-	return -EAGAIN;
-}
-
-int eth_clock_gettime(uint64_t *second, uint32_t *nanosecond)
-{
-	struct timespec tp;
-	int ret;
-
-	ret = clock_gettime(CLOCK_MONOTONIC_RAW, &tp);
-	if (ret < 0) {
-		return -errno;
-	}
-
-	*second = (uint64_t)tp.tv_sec;
-	*nanosecond = (uint32_t)tp.tv_nsec;
-
-	return 0;
-}
-
-int eth_promisc_mode(const char *if_name, bool enable)
-{
-	return ssystem("ip link set dev %s promisc %s",
-		       if_name, enable ? "on" : "off");
-}
diff --git a/drivers/ethernet/eth_native_posix_priv.h b/drivers/ethernet/eth_native_posix_priv.h
deleted file mode 100644
index f1d56f8df178d..0000000000000
--- a/drivers/ethernet/eth_native_posix_priv.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/** @file
- * @brief Private functions for native posix ethernet driver.
- */
-
-#ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_POSIX_PRIV_H_
-#define ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_POSIX_PRIV_H_
-
-int eth_iface_create(const char *dev_name, const char *if_name, bool tun_only);
-int eth_iface_remove(int fd);
-int eth_wait_data(int fd);
-int eth_clock_gettime(uint64_t *second, uint32_t *nanosecond);
-int eth_promisc_mode(const char *if_name, bool enable);
-
-#endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_POSIX_PRIV_H_ */
diff --git a/drivers/ethernet/eth_native_tap.c b/drivers/ethernet/eth_native_tap.c
new file mode 100644
index 0000000000000..8e8f696e14e34
--- /dev/null
+++ b/drivers/ethernet/eth_native_tap.c
@@ -0,0 +1,688 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ *
+ * TAP Ethernet driver for the native_sim board. This is meant for network
+ * connectivity between the host and Zephyr.
+ *
+ * Note this driver is divided in two files. This one, built in the embedded code context,
+ * with whichever libC is used in that context, and eth_native_tap_adapt.c built with the host
+ * libC.
+ */
+
+#define LOG_MODULE_NAME eth_tap
+#define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(LOG_MODULE_NAME);
+
+#include <stdio.h>
+
+#include <zephyr/kernel.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <stddef.h>
+#include <cmdline.h>
+#include <posix_native_task.h>
+
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <ethernet/eth_stats.h>
+
+#include <zephyr/drivers/ptp_clock.h>
+#include <zephyr/net/gptp.h>
+#include <zephyr/net/lldp.h>
+
+#include "eth_native_tap_priv.h"
+#include "nsi_host_trampolines.h"
+#include "eth.h"
+
+#define NET_BUF_TIMEOUT K_MSEC(100)
+
+#if defined(CONFIG_NET_VLAN)
+#define ETH_HDR_LEN sizeof(struct net_eth_vlan_hdr)
+#else
+#define ETH_HDR_LEN sizeof(struct net_eth_hdr)
+#endif
+
+struct eth_context {
+	uint8_t recv[NET_ETH_MTU + ETH_HDR_LEN];
+	uint8_t send[NET_ETH_MTU + ETH_HDR_LEN];
+	uint8_t mac_addr[6];
+	struct net_linkaddr ll_addr;
+	struct net_if *iface;
+	const char *if_name;
+	k_tid_t rx_thread;
+	struct z_thread_stack_element *rx_stack;
+	size_t rx_stack_size;
+	int dev_fd;
+	bool init_done;
+	bool status;
+	bool promisc_mode;
+
+#if defined(CONFIG_NET_STATISTICS_ETHERNET)
+	struct net_stats_eth stats;
+#endif
+#if defined(CONFIG_ETH_NATIVE_TAP_PTP_CLOCK)
+	const struct device *ptp_clock;
+#endif
+};
+
+static const char *if_name_cmd_opt;
+static const char *mac_addr_cmd_opt;
+#ifdef CONFIG_NET_IPV4
+static const char *ipv4_addr_cmd_opt;
+static const char *ipv4_nm_cmd_opt;
+static const char *ipv4_gw_cmd_opt;
+#endif
+
+
+#define DEFINE_RX_THREAD(x, _)						\
+	K_KERNEL_STACK_DEFINE(rx_thread_stack_##x,			\
+			      CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);\
+	static struct k_thread rx_thread_data_##x
+
+LISTIFY(CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT, DEFINE_RX_THREAD, (;), _);
+
+#if defined(CONFIG_NET_GPTP)
+static bool need_timestamping(struct gptp_hdr *hdr)
+{
+	switch (hdr->message_type) {
+	case GPTP_SYNC_MESSAGE:
+	case GPTP_PATH_DELAY_RESP_MESSAGE:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static struct gptp_hdr *check_gptp_msg(struct net_if *iface,
+				       struct net_pkt *pkt,
+				       bool is_tx)
+{
+	uint8_t *msg_start = net_pkt_data(pkt);
+	struct gptp_hdr *gptp_hdr;
+	int eth_hlen;
+	struct net_eth_hdr *hdr;
+
+	hdr = (struct net_eth_hdr *)msg_start;
+	if (ntohs(hdr->type) != NET_ETH_PTYPE_PTP) {
+		return NULL;
+	}
+
+	eth_hlen = sizeof(struct net_eth_hdr);
+
+	/* In TX, the first net_buf contains the Ethernet header
+	 * and the actual gPTP header is in the second net_buf.
+	 * In RX, the Ethernet header + other headers are in the
+	 * first net_buf.
+	 */
+	if (is_tx) {
+		if (pkt->frags->frags == NULL) {
+			return false;
+		}
+
+		gptp_hdr = (struct gptp_hdr *)pkt->frags->frags->data;
+	} else {
+		gptp_hdr = (struct gptp_hdr *)(pkt->frags->data + eth_hlen);
+	}
+
+	return gptp_hdr;
+}
+
+static void update_pkt_priority(struct gptp_hdr *hdr, struct net_pkt *pkt)
+{
+	if (GPTP_IS_EVENT_MSG(hdr->message_type)) {
+		net_pkt_set_priority(pkt, NET_PRIORITY_CA);
+	} else {
+		net_pkt_set_priority(pkt, NET_PRIORITY_IC);
+	}
+}
+
+static void update_gptp(struct net_if *iface, struct net_pkt *pkt,
+			bool send)
+{
+	struct net_ptp_time timestamp;
+	struct gptp_hdr *hdr;
+	int ret;
+
+	ret = eth_clock_gettime(&timestamp.second, &timestamp.nanosecond);
+	if (ret < 0) {
+		return;
+	}
+
+	net_pkt_set_timestamp(pkt, &timestamp);
+
+	hdr = check_gptp_msg(iface, pkt, send);
+	if (!hdr) {
+		return;
+	}
+
+	if (send) {
+		ret = need_timestamping(hdr);
+		if (ret) {
+			net_if_add_tx_timestamp(pkt);
+		}
+	} else {
+		update_pkt_priority(hdr, pkt);
+	}
+}
+#else
+#define update_gptp(iface, pkt, send)
+#endif /* CONFIG_NET_GPTP */
+
+static int eth_send(const struct device *dev, struct net_pkt *pkt)
+{
+	struct eth_context *ctx = dev->data;
+	int count = net_pkt_get_len(pkt);
+	int ret;
+
+	ret = net_pkt_read(pkt, ctx->send, count);
+	if (ret) {
+		return ret;
+	}
+
+	update_gptp(net_pkt_iface(pkt), pkt, true);
+
+	LOG_DBG("Send pkt %p len %d", pkt, count);
+
+	ret = nsi_host_write(ctx->dev_fd, ctx->send, count);
+	if (ret < 0) {
+		LOG_DBG("Cannot send pkt %p (%d)", pkt, ret);
+	}
+
+	return ret < 0 ? ret : 0;
+}
+
+static struct net_linkaddr *eth_get_mac(struct eth_context *ctx)
+{
+	(void)net_linkaddr_set(&ctx->ll_addr, ctx->mac_addr,
+			       sizeof(ctx->mac_addr));
+
+	return &ctx->ll_addr;
+}
+
+static struct net_pkt *prepare_pkt(struct eth_context *ctx,
+				   int count, int *status)
+{
+	struct net_pkt *pkt;
+
+	pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, count,
+					   AF_UNSPEC, 0, NET_BUF_TIMEOUT);
+	if (!pkt) {
+		*status = -ENOMEM;
+		return NULL;
+	}
+
+	if (net_pkt_write(pkt, ctx->recv, count)) {
+		net_pkt_unref(pkt);
+		*status = -ENOBUFS;
+		return NULL;
+	}
+
+	*status = 0;
+
+	LOG_DBG("Recv pkt %p len %d", pkt, count);
+
+	return pkt;
+}
+
+static int read_data(struct eth_context *ctx, int fd)
+{
+	struct net_if *iface = ctx->iface;
+	struct net_pkt *pkt = NULL;
+	int status;
+	int count;
+
+	count = nsi_host_read(fd, ctx->recv, sizeof(ctx->recv));
+	if (count <= 0) {
+		return 0;
+	}
+
+	pkt = prepare_pkt(ctx, count, &status);
+	if (!pkt) {
+		return status;
+	}
+
+	update_gptp(iface, pkt, false);
+
+	if (net_recv_data(iface, pkt) < 0) {
+		net_pkt_unref(pkt);
+	}
+
+	return 0;
+}
+
+static void eth_rx(void *p1, void *p2, void *p3)
+{
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+
+	struct eth_context *ctx = p1;
+	LOG_DBG("Starting ZETH RX thread");
+
+	while (1) {
+		if (net_if_is_up(ctx->iface)) {
+			while (!eth_wait_data(ctx->dev_fd)) {
+				read_data(ctx, ctx->dev_fd);
+				k_yield();
+			}
+		}
+
+		k_sleep(K_MSEC(CONFIG_ETH_NATIVE_TAP_RX_TIMEOUT));
+	}
+}
+
+#if defined(CONFIG_THREAD_MAX_NAME_LEN)
+#define THREAD_MAX_NAME_LEN CONFIG_THREAD_MAX_NAME_LEN
+#else
+#define THREAD_MAX_NAME_LEN 1
+#endif
+
+static void create_rx_handler(struct eth_context *ctx)
+{
+	k_thread_create(ctx->rx_thread,
+			ctx->rx_stack,
+			ctx->rx_stack_size,
+			eth_rx,
+			ctx, NULL, NULL, K_PRIO_COOP(14),
+			0, K_NO_WAIT);
+
+	if (IS_ENABLED(CONFIG_THREAD_NAME)) {
+		char name[THREAD_MAX_NAME_LEN];
+
+		snprintk(name, sizeof(name), "eth_native_tap_rx-%s",
+			 ctx->if_name);
+		k_thread_name_set(ctx->rx_thread, name);
+	}
+}
+
+static void eth_iface_init(struct net_if *iface)
+{
+	struct eth_context *ctx = net_if_get_device(iface)->data;
+	struct net_linkaddr *ll_addr = eth_get_mac(ctx);
+#if !defined(CONFIG_ETH_NATIVE_TAP_RANDOM_MAC)
+	const char *mac_addr =
+		mac_addr_cmd_opt ? mac_addr_cmd_opt : CONFIG_ETH_NATIVE_TAP_MAC_ADDR;
+#endif
+#ifdef CONFIG_NET_IPV4
+	struct in_addr addr, netmask;
+#endif
+
+	ctx->iface = iface;
+
+	ethernet_init(iface);
+
+	if (ctx->init_done) {
+		return;
+	}
+
+	net_lldp_set_lldpdu(iface);
+
+	ctx->init_done = true;
+
+#if defined(CONFIG_ETH_NATIVE_TAP_RANDOM_MAC)
+	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
+	gen_random_mac(ctx->mac_addr, 0x00, 0x00, 0x5E);
+
+	ctx->mac_addr[3] = 0x00;
+	ctx->mac_addr[4] = 0x53;
+
+	/* The TUN/TAP setup script will by default set the MAC address of host
+	 * interface to 00:00:5E:00:53:FF so do not allow that.
+	 */
+	if (ctx->mac_addr[5] == 0xff) {
+		ctx->mac_addr[5] = 0x01;
+	}
+#else
+	/* Difficult to configure MAC addresses any sane way if we have more
+	 * than one network interface.
+	 */
+	BUILD_ASSERT(CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT == 1,
+		     "Cannot have static MAC if interface count > 1");
+
+	if (mac_addr[0] != 0) {
+		if (net_bytes_from_str(ctx->mac_addr, sizeof(ctx->mac_addr), mac_addr) < 0) {
+			LOG_ERR("Invalid MAC address %s", mac_addr);
+		}
+	}
+#endif
+
+	/* If we have only one network interface, then use the name
+	 * defined in the Kconfig directly. This way there is no need to
+	 * change the documentation etc. and break things.
+	 */
+	if (CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT == 1) {
+		ctx->if_name = CONFIG_ETH_NATIVE_TAP_DRV_NAME;
+	}
+
+	if (if_name_cmd_opt != NULL) {
+		ctx->if_name = if_name_cmd_opt;
+	}
+
+	LOG_DBG("Interface %p using \"%s\"", iface, ctx->if_name);
+
+	net_if_set_link_addr(iface, ll_addr->addr, ll_addr->len,
+			     NET_LINK_ETHERNET);
+
+#ifdef CONFIG_NET_IPV4
+	if (ipv4_addr_cmd_opt != NULL) {
+		if (net_addr_pton(AF_INET, ipv4_addr_cmd_opt, &addr) == 0) {
+			net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0);
+
+			if (ipv4_nm_cmd_opt != NULL) {
+				if (net_addr_pton(AF_INET, ipv4_nm_cmd_opt, &netmask) == 0) {
+					net_if_ipv4_set_netmask_by_addr(iface, &addr, &netmask);
+				} else {
+					NET_ERR("Invalid netmask: %s", ipv4_nm_cmd_opt);
+				}
+			}
+		} else {
+			NET_ERR("Invalid address: %s", ipv4_addr_cmd_opt);
+		}
+	}
+
+	if (ipv4_gw_cmd_opt != NULL) {
+		if (net_addr_pton(AF_INET, ipv4_gw_cmd_opt, &addr) == 0) {
+			net_if_ipv4_set_gw(iface, &addr);
+		} else {
+			NET_ERR("Invalid gateway: %s", ipv4_gw_cmd_opt);
+		}
+	}
+#endif
+
+	ctx->dev_fd = eth_iface_create(CONFIG_ETH_NATIVE_POSIX_DEV_NAME, ctx->if_name, false);
+	if (ctx->dev_fd < 0) {
+		LOG_ERR("Cannot create %s (%d/%s)", ctx->if_name, ctx->dev_fd,
+			strerror(-ctx->dev_fd));
+	} else {
+		/* Create a thread that will handle incoming data from host */
+		create_rx_handler(ctx);
+	}
+}
+
+static enum ethernet_hw_caps eth_native_tap_get_capabilities(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return ETHERNET_TXTIME
+#if defined(CONFIG_NET_VLAN)
+		| ETHERNET_HW_VLAN
+#endif
+#if defined(CONFIG_ETH_NATIVE_TAP_VLAN_TAG_STRIP)
+		| ETHERNET_HW_VLAN_TAG_STRIP
+#endif
+#if defined(CONFIG_ETH_NATIVE_TAP_PTP_CLOCK)
+		| ETHERNET_PTP
+#endif
+#if defined(CONFIG_NET_PROMISCUOUS_MODE)
+		| ETHERNET_PROMISC_MODE
+#endif
+#if defined(CONFIG_NET_LLDP)
+		| ETHERNET_LLDP
+#endif
+		;
+}
+
+#if defined(CONFIG_ETH_NATIVE_TAP_PTP_CLOCK)
+static const struct device *eth_get_ptp_clock(const struct device *dev)
+{
+	struct eth_context *context = dev->data;
+
+	return context->ptp_clock;
+}
+#endif
+
+#if defined(CONFIG_NET_STATISTICS_ETHERNET)
+static struct net_stats_eth *get_stats(const struct device *dev)
+{
+	struct eth_context *context = dev->data;
+
+	return &(context->stats);
+}
+#endif
+
+static int set_config(const struct device *dev,
+		      enum ethernet_config_type type,
+		      const struct ethernet_config *config)
+{
+	int ret = 0;
+
+	if (IS_ENABLED(CONFIG_NET_PROMISCUOUS_MODE) &&
+	    type == ETHERNET_CONFIG_TYPE_PROMISC_MODE) {
+		struct eth_context *context = dev->data;
+
+		if (config->promisc_mode) {
+			if (context->promisc_mode) {
+				return -EALREADY;
+			}
+
+			context->promisc_mode = true;
+		} else {
+			if (!context->promisc_mode) {
+				return -EALREADY;
+			}
+
+			context->promisc_mode = false;
+		}
+
+		ret = eth_promisc_mode(context->if_name,
+				       context->promisc_mode);
+	} else if (type == ETHERNET_CONFIG_TYPE_MAC_ADDRESS) {
+		struct eth_context *context = dev->data;
+
+		memcpy(context->mac_addr, config->mac_address.addr,
+		       sizeof(context->mac_addr));
+	}
+
+	return ret;
+}
+
+#if defined(CONFIG_NET_VLAN)
+static int vlan_setup(const struct device *dev, struct net_if *iface,
+		      uint16_t tag, bool enable)
+{
+	if (enable) {
+		net_lldp_set_lldpdu(iface);
+	} else {
+		net_lldp_unset_lldpdu(iface);
+	}
+
+	return 0;
+}
+#endif /* CONFIG_NET_VLAN */
+
+static const struct ethernet_api eth_if_api = {
+	.iface_api.init = eth_iface_init,
+
+	.get_capabilities = eth_native_tap_get_capabilities,
+	.set_config = set_config,
+	.send = eth_send,
+
+#if defined(CONFIG_NET_VLAN)
+	.vlan_setup = vlan_setup,
+#endif
+#if defined(CONFIG_NET_STATISTICS_ETHERNET)
+	.get_stats = get_stats,
+#endif
+#if defined(CONFIG_ETH_NATIVE_TAP_PTP_CLOCK)
+	.get_ptp_clock = eth_get_ptp_clock,
+#endif
+};
+
+#define DEFINE_ETH_DEV_DATA(x, _)					     \
+	static struct eth_context eth_context_data_##x = {		     \
+		.if_name = CONFIG_ETH_NATIVE_TAP_DRV_NAME #x,		     \
+		.rx_thread = &rx_thread_data_##x,			     \
+		.rx_stack = rx_thread_stack_##x,			     \
+		.rx_stack_size = K_KERNEL_STACK_SIZEOF(rx_thread_stack_##x), \
+	}
+
+LISTIFY(CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT, DEFINE_ETH_DEV_DATA, (;), _);
+
+#define DEFINE_ETH_DEVICE(x, _)						\
+	ETH_NET_DEVICE_INIT(eth_native_tap_##x,				\
+			    CONFIG_ETH_NATIVE_TAP_DRV_NAME #x,		\
+			    NULL, NULL,	&eth_context_data_##x, NULL,	\
+			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
+			    &eth_if_api,				\
+			    NET_ETH_MTU)
+
+LISTIFY(CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT, DEFINE_ETH_DEVICE, (;), _);
+
+#if defined(CONFIG_ETH_NATIVE_TAP_PTP_CLOCK)
+
+#if defined(CONFIG_NET_GPTP)
+BUILD_ASSERT(								\
+	CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT == CONFIG_NET_GPTP_NUM_PORTS, \
+	"Number of network interfaces must match gPTP port count");
+#endif
+
+struct ptp_context {
+	struct eth_context *eth_context;
+};
+
+#define DEFINE_PTP_DEV_DATA(x, _) \
+	static struct ptp_context ptp_context_##x
+
+LISTIFY(CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT, DEFINE_PTP_DEV_DATA, (;), _);
+
+static int ptp_clock_set_native_tap(const struct device *clk, struct net_ptp_time *tm)
+{
+	ARG_UNUSED(clk);
+	ARG_UNUSED(tm);
+
+	/* We cannot set the host device time so this function
+	 * does nothing.
+	 */
+
+	return 0;
+}
+
+static int ptp_clock_get_native_tap(const struct device *clk, struct net_ptp_time *tm)
+{
+	ARG_UNUSED(clk);
+
+	return eth_clock_gettime(&tm->second, &tm->nanosecond);
+}
+
+static int ptp_clock_adjust_native_tap(const struct device *clk, int increment)
+{
+	ARG_UNUSED(clk);
+	ARG_UNUSED(increment);
+
+	/* We cannot adjust the host device time so this function
+	 * does nothing.
+	 */
+
+	return 0;
+}
+
+static int ptp_clock_rate_adjust_native_tap(const struct device *clk, double ratio)
+{
+	ARG_UNUSED(clk);
+	ARG_UNUSED(ratio);
+
+	/* We cannot adjust the host device time so this function
+	 * does nothing.
+	 */
+
+	return 0;
+}
+
+static DEVICE_API(ptp_clock, api) = {
+	.set = ptp_clock_set_native_tap,
+	.get = ptp_clock_get_native_tap,
+	.adjust = ptp_clock_adjust_native_tap,
+	.rate_adjust = ptp_clock_rate_adjust_native_tap,
+};
+
+#define PTP_INIT_FUNC(x, _)						\
+	static int ptp_init_##x(const struct device *port)			\
+	{								\
+		const struct device *const eth_dev = DEVICE_GET(eth_native_tap_##x); \
+		struct eth_context *context = eth_dev->data;	\
+		struct ptp_context *ptp_context = port->data;	\
+									\
+		context->ptp_clock = port;				\
+		ptp_context->eth_context = context;			\
+									\
+		return 0;						\
+	}
+
+LISTIFY(CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT, PTP_INIT_FUNC, (), _)
+
+#define DEFINE_PTP_DEVICE(x, _)						\
+	DEVICE_DEFINE(eth_native_tap_ptp_clock_##x,			\
+			    PTP_CLOCK_NAME "_" #x,			\
+			    ptp_init_##x,				\
+			    NULL,					\
+			    &ptp_context_##x,				\
+			    NULL,					\
+			    POST_KERNEL,				\
+			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
+			    &api)
+
+LISTIFY(CONFIG_ETH_NATIVE_TAP_INTERFACE_COUNT, DEFINE_PTP_DEVICE, (;), _);
+
+#endif /* CONFIG_ETH_NATIVE_TAP_PTP_CLOCK */
+
+static void add_native_tap_options(void)
+{
+	static struct args_struct_t eth_native_tap_options[] = {
+		{
+			.is_mandatory = false,
+			.option = "eth-if",
+			.name = "name",
+			.type = 's',
+			.dest = (void *)&if_name_cmd_opt,
+			.descript = "Name of the eth interface to use",
+		},
+		{
+			.is_mandatory = false,
+			.option = "mac-addr",
+			.name = "mac",
+			.type = 's',
+			.dest = (void *)&mac_addr_cmd_opt,
+			.descript = "MAC address",
+		},
+#ifdef CONFIG_NET_IPV4
+		{
+			.is_mandatory = false,
+			.option = "ipv4-addr",
+			.name = "ipv4",
+			.type = 's',
+			.dest = (void *)&ipv4_addr_cmd_opt,
+			.descript = "IPv4 address",
+		},
+		{
+			.is_mandatory = false,
+			.option = "ipv4-gw",
+			.name = "ipv4",
+			.type = 's',
+			.dest = (void *)&ipv4_gw_cmd_opt,
+			.descript = "IPv4 gateway",
+		},
+		{
+			.is_mandatory = false,
+			.option = "ipv4-nm",
+			.name = "ipv4",
+			.type = 's',
+			.dest = (void *)&ipv4_nm_cmd_opt,
+			.descript = "IPv4 netmask",
+		},
+#endif
+		ARG_TABLE_ENDMARKER,
+	};
+
+	native_add_command_line_opts(eth_native_tap_options);
+}
+
+NATIVE_TASK(add_native_tap_options, PRE_BOOT_1, 10);
diff --git a/drivers/ethernet/eth_native_tap_adapt.c b/drivers/ethernet/eth_native_tap_adapt.c
new file mode 100644
index 0000000000000..3bdd6ac7548ab
--- /dev/null
+++ b/drivers/ethernet/eth_native_tap_adapt.c
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ *
+ * Routines setting up the host system. Those are placed in a separate file
+ * to avoid naming conflicts between host and zephyr network stacks.
+ * This file is built with the host libC in the native simulator runner context.
+ */
+
+/* Host include files */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <string.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <net/if.h>
+#include <time.h>
+#include <inttypes.h>
+#include <nsi_tracing.h>
+
+#ifdef __linux
+#include <linux/if.h>
+#include <linux/if_tun.h>
+#endif
+
+#include "eth_native_tap_priv.h"
+
+/* Note that we cannot create the TUN/TAP device from the setup script
+ * as we need to get a file descriptor to communicate with the interface.
+ */
+int eth_iface_create(const char *dev_name, const char *if_name, bool tun_only)
+{
+	struct ifreq ifr;
+	int fd, ret = -EINVAL;
+
+	fd = open(dev_name, O_RDWR);
+	if (fd < 0) {
+		return -errno;
+	}
+
+	(void)memset(&ifr, 0, sizeof(ifr));
+
+#ifdef __linux
+	ifr.ifr_flags = (tun_only ? IFF_TUN : IFF_TAP) | IFF_NO_PI;
+
+	strncpy(ifr.ifr_name, if_name, IFNAMSIZ - 1);
+
+	ret = ioctl(fd, TUNSETIFF, (void *)&ifr);
+	if (ret < 0) {
+		ret = -errno;
+		close(fd);
+		return ret;
+	}
+#endif
+
+	return fd;
+}
+
+int eth_iface_remove(int fd)
+{
+	return close(fd);
+}
+
+static int ssystem(const char *fmt, ...)
+	__attribute__((__format__(__printf__, 1, 2)));
+
+static int ssystem(const char *fmt, ...)
+{
+	char cmd[255];
+	va_list ap;
+	int ret;
+
+	va_start(ap, fmt);
+	vsnprintf(cmd, sizeof(cmd), fmt, ap);
+	va_end(ap);
+
+	nsi_print_trace("%s\n", cmd);
+
+	ret = system(cmd);
+
+	return -WEXITSTATUS(ret);
+}
+
+int eth_wait_data(int fd)
+{
+	struct timeval timeout;
+	fd_set rset;
+	int ret;
+
+	FD_ZERO(&rset);
+
+	FD_SET(fd, &rset);
+
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 0;
+
+	ret = select(fd + 1, &rset, NULL, NULL, &timeout);
+	if (ret < 0 && errno != EINTR) {
+		return -errno;
+	} else if (ret > 0) {
+		if (FD_ISSET(fd, &rset)) {
+			return 0;
+		}
+	}
+
+	return -EAGAIN;
+}
+
+int eth_clock_gettime(uint64_t *second, uint32_t *nanosecond)
+{
+	struct timespec tp;
+	int ret;
+
+	ret = clock_gettime(CLOCK_MONOTONIC_RAW, &tp);
+	if (ret < 0) {
+		return -errno;
+	}
+
+	*second = (uint64_t)tp.tv_sec;
+	*nanosecond = (uint32_t)tp.tv_nsec;
+
+	return 0;
+}
+
+int eth_promisc_mode(const char *if_name, bool enable)
+{
+	return ssystem("ip link set dev %s promisc %s",
+		       if_name, enable ? "on" : "off");
+}
diff --git a/drivers/ethernet/eth_native_tap_priv.h b/drivers/ethernet/eth_native_tap_priv.h
new file mode 100644
index 0000000000000..0769ee73add00
--- /dev/null
+++ b/drivers/ethernet/eth_native_tap_priv.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/** @file
+ * @brief Private functions for native TAP ethernet driver.
+ */
+
+#ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_TAP_PRIV_H_
+#define ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_TAP_PRIV_H_
+
+int eth_iface_create(const char *dev_name, const char *if_name, bool tun_only);
+int eth_iface_remove(int fd);
+int eth_wait_data(int fd);
+int eth_clock_gettime(uint64_t *second, uint32_t *nanosecond);
+int eth_promisc_mode(const char *if_name, bool enable);
+
+#endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_TAP_PRIV_H_ */
diff --git a/drivers/ethernet/eth_numaker.c b/drivers/ethernet/eth_numaker.c
index 77577943f23dc..80b807e8f8bd8 100644
--- a/drivers/ethernet/eth_numaker.c
+++ b/drivers/ethernet/eth_numaker.c
@@ -21,22 +21,31 @@
 
 #ifdef CONFIG_SOC_M467
 #include <m460_eth.h>
+#else
+#include <numaker_eth.h>
 #endif
 
 LOG_MODULE_REGISTER(eth_numaker, CONFIG_ETHERNET_LOG_LEVEL);
 
 /* Device EMAC Interface port */
 #define NUMAKER_GMAC_INTF  0
-/* 2KB Data Flash at 0xFF800 */
-#define NUMAKER_DATA_FLASH (0xFF800U)
+
 #define NUMAKER_MASK_32    (0xFFFFFFFFU)
 #define NUMAKER_MII_CONFIG (ADVERTISE_CSMA | ADVERTISE_10HALF | ADVERTISE_10FULL | \
 							ADVERTISE_100HALF | ADVERTISE_100FULL)
 #define NUMAKER_MII_LINKED (BMSR_ANEGCOMPLETE | BMSR_LSTATUS)
 
 extern synopGMACdevice GMACdev[GMAC_CNT];
+
+#ifdef CONFIG_NOCACHE_MEMORY
+DmaDesc tx_desc[GMAC_CNT][TRANSMIT_DESC_SIZE] __nocache __aligned(64);
+DmaDesc rx_desc[GMAC_CNT][RECEIVE_DESC_SIZE] __nocache __aligned(64);
+struct sk_buff tx_buf[GMAC_CNT][TRANSMIT_DESC_SIZE] __nocache __aligned(64);
+struct sk_buff rx_buf[GMAC_CNT][RECEIVE_DESC_SIZE] __nocache __aligned(64);
+#else
 extern struct sk_buff tx_buf[GMAC_CNT][TRANSMIT_DESC_SIZE];
 extern struct sk_buff rx_buf[GMAC_CNT][RECEIVE_DESC_SIZE];
+#endif
 
 static uint32_t eth_phy_addr;
 
@@ -167,33 +176,31 @@ static int reset_phy(synopGMACdevice *gmacdev)
 
 static void m_numaker_read_mac_addr(char *mac)
 {
+#if DT_INST_PROP(0, zephyr_random_mac_address)
+	gen_random_mac(mac, NUMAKER_OUI_B0, NUMAKER_OUI_B1, NUMAKER_OUI_B2);
+#else
 	uint32_t uid1;
-	/* Fetch word 0 of data flash */
-	uint32_t word0 = *(uint32_t *)(NUMAKER_DATA_FLASH + 0x04U);
+	uint32_t word0;
 	/*
-	 * Fetch word 1 of data flash
 	 * we only want bottom 16 bits of word1 (MAC bits 32-47)
 	 * and bit 9 forced to 1, bit 8 forced to 0
 	 * Locally administered MAC, reduced conflicts
 	 * http://en.wikipedia.org/wiki/MAC_address
 	 */
-	uint32_t word1 = *(uint32_t *)NUMAKER_DATA_FLASH;
-
-	/* Not burn any mac address at the beginning of data flash */
-	if (word0 == NUMAKER_MASK_32) {
-		/* Generate a semi-unique MAC address from the UUID */
-		SYS_UnlockReg();
-		/* Enable FMC ISP function */
-		FMC_Open();
-		uid1 = FMC_ReadUID(1);
-		word1 = (uid1 & 0x003FFFFF) | ((uid1 & 0x030000) << 6) >> 8;
-		word0 = ((FMC_ReadUID(0) >> 4) << 20) | ((uid1 & 0xFF) << 12) |
-			(FMC_ReadUID(2) & 0xFFF);
-		/* Disable FMC ISP function */
-		FMC_Close();
-		/* Lock protected registers */
-		SYS_LockReg();
-	}
+	uint32_t word1;
+
+	/* Generate a semi-unique MAC address from the UUID */
+	SYS_UnlockReg();
+	/* Enable FMC ISP function */
+	FMC_Open();
+	uid1 = FMC_ReadUID(1);
+	word1 = (uid1 & 0x003FFFFF) | ((uid1 & 0x030000) << 6) >> 8;
+	word0 = ((FMC_ReadUID(0) >> 4) << 20) | ((uid1 & 0xFF) << 12) |
+		(FMC_ReadUID(2) & 0xFFF);
+	/* Disable FMC ISP function */
+	FMC_Close();
+	/* Lock protected registers */
+	SYS_LockReg();
 
 	word1 |= 0x00000200;
 	word1 &= 0x0000FEFF;
@@ -204,7 +211,7 @@ static void m_numaker_read_mac_addr(char *mac)
 	mac[3] = (word0 & 0x00ff0000) >> 16;
 	mac[4] = (word0 & 0x0000ff00) >> 8;
 	mac[5] = (word0 & 0x000000ff);
-
+#endif
 	LOG_INF("mac address %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3],
 	       mac[4], mac[5]);
 }
diff --git a/drivers/ethernet/eth_numaker_priv.h b/drivers/ethernet/eth_numaker_priv.h
index e3bec804b9808..283081dd47c54 100644
--- a/drivers/ethernet/eth_numaker_priv.h
+++ b/drivers/ethernet/eth_numaker_priv.h
@@ -15,4 +15,9 @@
 
 #define NU_ETH_MTU_SIZE              1500
 
+/* NuMaker chip's OUI*/
+#define NUMAKER_OUI_B0 0xDA
+#define NUMAKER_OUI_B1 0x00
+#define NUMAKER_OUI_B2 0x53
+
 #endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_NUMAKER_PRIV_H_ */
diff --git a/drivers/ethernet/nxp_enet/eth_nxp_enet.c b/drivers/ethernet/eth_nxp_enet.c
similarity index 97%
rename from drivers/ethernet/nxp_enet/eth_nxp_enet.c
rename to drivers/ethernet/eth_nxp_enet.c
index 0278f8a5f8eb8..949c381cd282a 100644
--- a/drivers/ethernet/nxp_enet/eth_nxp_enet.c
+++ b/drivers/ethernet/eth_nxp_enet.c
@@ -47,7 +47,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <zephyr/pm/device.h>
 #endif
 
-#include "../eth.h"
+#include "eth.h"
 #include <zephyr/drivers/ethernet/eth_nxp_enet.h>
 #include <zephyr/dt-bindings/ethernet/nxp_enet.h>
 #include <fsl_enet.h>
@@ -461,6 +461,8 @@ static int nxp_enet_phy_configure(const struct device *phy, uint8_t phy_mode)
 {
 	enum phy_link_speed speeds = LINK_HALF_10BASE_T | LINK_FULL_10BASE_T |
 				       LINK_HALF_100BASE_T | LINK_FULL_100BASE_T;
+	int ret;
+	struct phy_link_state state;
 
 	if (COND_CODE_1(IS_ENABLED(CONFIG_ETH_NXP_ENET_1G),
 	   (phy_mode == NXP_ENET_RGMII_MODE), (0))) {
@@ -468,7 +470,27 @@ static int nxp_enet_phy_configure(const struct device *phy, uint8_t phy_mode)
 	}
 
 	/* Configure the PHY */
-	return phy_configure_link(phy, speeds);
+	ret = phy_configure_link(phy, speeds);
+
+	if (ret == -ENOTSUP) {
+		phy_get_link_state(phy, &state);
+
+		if (state.is_up) {
+			LOG_WRN("phy_configure_link returned -ENOTSUP, but link is up. "
+				"Speed: %s, %s-duplex",
+				PHY_LINK_IS_SPEED_1000M(state.speed) ? "1 Gbits" :
+				PHY_LINK_IS_SPEED_100M(state.speed) ? "100 Mbits" : "10 Mbits",
+				PHY_LINK_IS_FULL_DUPLEX(state.speed) ? "full" : "half");
+		} else {
+			LOG_ERR("phy_configure_link returned -ENOTSUP and link is down.");
+			return -ENETDOWN;
+		}
+	} else if (ret) {
+		LOG_ERR("phy_configure_link failed with error: %d", ret);
+		return ret;
+	}
+
+	return 0;
 }
 
 static void nxp_enet_phy_cb(const struct device *phy,
diff --git a/drivers/ethernet/eth_nxp_enet_qos/eth_nxp_enet_qos_mac.c b/drivers/ethernet/eth_nxp_enet_qos/eth_nxp_enet_qos_mac.c
index 30b95eeff96fa..bd2b4f59de239 100644
--- a/drivers/ethernet/eth_nxp_enet_qos/eth_nxp_enet_qos_mac.c
+++ b/drivers/ethernet/eth_nxp_enet_qos/eth_nxp_enet_qos_mac.c
@@ -73,14 +73,15 @@ static int eth_nxp_enet_qos_tx(const struct device *dev, struct net_pkt *pkt)
 		frags_count++;
 		total_bytes += fragment->len;
 		fragment = fragment->frags;
-	}
 
-	if (total_bytes > config->hw_info.max_frame_len ||
-	    frags_count > NUM_TX_BUFDESC) {
-		LOG_ERR("TX packet too large");
-		return -E2BIG;
+		if (total_bytes > config->hw_info.max_frame_len ||
+			frags_count > NUM_TX_BUFDESC) {
+			LOG_ERR("TX packet too large");
+			return -E2BIG;
+		}
 	}
 
+
 	/* One TX at a time in the current implementation */
 	k_sem_take(&data->tx.tx_sem, K_FOREVER);
 
diff --git a/drivers/ethernet/eth_renesas_ra.c b/drivers/ethernet/eth_renesas_ra.c
index d17d0cbf78e93..809d0d189e677 100644
--- a/drivers/ethernet/eth_renesas_ra.c
+++ b/drivers/ethernet/eth_renesas_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -370,7 +370,7 @@ static void renesas_ra_eth_thread(void *p1, void *p2, void *p3)
 	}
 }
 
-#define ELC_EVENT_EDMAC_EINT(channel) ELC_EVENT_EDMAC##channel##_EINT
+#define EVENT_EDMAC_EINT(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_EDMAC, channel, _EINT))
 
 /* Bindings to the platform */
 int renesas_ra_eth_init(const struct device *dev)
@@ -391,7 +391,7 @@ int renesas_ra_eth_init(const struct device *dev)
 		return -EINVAL;
 	}
 
-	R_ICU->IELSR[DT_INST_IRQN(0)] = ELC_EVENT_EDMAC_EINT(0);
+	R_ICU->IELSR[DT_INST_IRQN(0)] = EVENT_EDMAC_EINT(0);
 
 	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), renesas_ra_eth_isr,
 		    DEVICE_DT_INST_GET(0), 0);
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index ec46339e8ef34..bec5dae50acfe 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -54,31 +54,18 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #error DTCM for DMA buffer is activated but zephyr,dtcm is not present in dts
 #endif
 
-#define PHY_ADDR	CONFIG_ETH_STM32_HAL_PHY_ADDRESS
+static const struct device *eth_stm32_phy_dev = DEVICE_DT_GET(DT_INST_PHANDLE(0, phy_handle));
 
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_mdio)
-
-#define DEVICE_PHY_BY_NAME(n) \
-	    DEVICE_DT_GET(DT_CHILD(DT_INST_CHILD(n, mdio), _CONCAT(ethernet_phy_, PHY_ADDR)))
-
-static const struct device *eth_stm32_phy_dev = DEVICE_PHY_BY_NAME(0);
-
-#endif
+#define ETH_STM32_AUTO_NEGOTIATION_ENABLE                                                          \
+	UTIL_NOT(DT_NODE_HAS_PROP(DT_INST_PHANDLE(0, phy_handle), fixed_link))
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet)
-
-#define PHY_BSR  ((uint16_t)0x0001U)  /*!< Transceiver Basic Status Register */
-#define PHY_LINKED_STATUS  ((uint16_t)0x0004U)  /*!< Valid link established */
-
 #define IS_ETH_DMATXDESC_OWN(dma_tx_desc)	(dma_tx_desc->DESC3 & \
 							ETH_DMATXNDESCRF_OWN)
 
 #define ETH_RXBUFNB	ETH_RX_DESC_CNT
 #define ETH_TXBUFNB	ETH_TX_DESC_CNT
 
-#define ETH_MEDIA_INTERFACE_MII		HAL_ETH_MII_MODE
-#define ETH_MEDIA_INTERFACE_RMII	HAL_ETH_RMII_MODE
-
 /* Only one tx_buffer is sufficient to pass only 1 dma_buffer */
 #define ETH_TXBUF_DEF_NB	1U
 #else
@@ -88,6 +75,33 @@ static const struct device *eth_stm32_phy_dev = DEVICE_PHY_BY_NAME(0);
 
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet) */
 
+#if defined(CONFIG_ETH_STM32_HAL_API_V2)
+#define ETH_MII_MODE	HAL_ETH_MII_MODE
+#define ETH_RMII_MODE	HAL_ETH_RMII_MODE
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
+#define ETH_GMII_MODE	HAL_ETH_GMII_MODE
+#define ETH_RGMII_MODE	HAL_ETH_RGMII_MODE
+#endif
+
+#else
+#define ETH_MII_MODE	ETH_MEDIA_INTERFACE_MII
+#define ETH_RMII_MODE	ETH_MEDIA_INTERFACE_RMII
+#endif
+
+#define MAC_NODE DT_NODELABEL(mac)
+
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
+#define STM32_ETH_PHY_MODE(node_id) \
+	((DT_ENUM_HAS_VALUE(node_id, phy_connection_type, rgmii) ? ETH_RGMII_MODE : \
+	 (DT_ENUM_HAS_VALUE(node_id, phy_connection_type, gmii) ? ETH_GMII_MODE : \
+	 (DT_ENUM_HAS_VALUE(node_id, phy_connection_type, mii) ? ETH_MII_MODE : \
+		 ETH_RMII_MODE))))
+#else
+#define STM32_ETH_PHY_MODE(node_id) \
+	(DT_ENUM_HAS_VALUE(node_id, phy_connection_type, mii) ? \
+		ETH_MII_MODE : ETH_RMII_MODE)
+#endif
+
 #define ETH_DMA_TX_TIMEOUT_MS	20U  /* transmit timeout in milliseconds */
 
 #if defined(CONFIG_ETH_STM32_HAL_USE_DTCM_FOR_DMA_BUFFER) && \
@@ -105,8 +119,16 @@ static const struct device *eth_stm32_phy_dev = DEVICE_PHY_BY_NAME(0);
 #define __eth_stm32_buf  __aligned(4)
 #endif
 
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
+static ETH_DMADescTypeDef
+	dma_rx_desc_tab[ETH_DMA_RX_CH_CNT][ETH_RXBUFNB] ALIGN_32BYTES(__eth_stm32_desc);
+static ETH_DMADescTypeDef
+	dma_tx_desc_tab[ETH_DMA_TX_CH_CNT][ETH_TXBUFNB] ALIGN_32BYTES(__eth_stm32_desc);
+#else
 static ETH_DMADescTypeDef dma_rx_desc_tab[ETH_RXBUFNB] __eth_stm32_desc;
 static ETH_DMADescTypeDef dma_tx_desc_tab[ETH_TXBUFNB] __eth_stm32_desc;
+#endif
+
 static uint8_t dma_rx_buffer[ETH_RXBUFNB][ETH_STM32_RX_BUF_SIZE] __eth_stm32_buf;
 static uint8_t dma_tx_buffer[ETH_TXBUFNB][ETH_STM32_TX_BUF_SIZE] __eth_stm32_buf;
 
@@ -234,21 +256,6 @@ static inline struct eth_stm32_tx_context *allocate_tx_context(struct net_pkt *p
 static ETH_TxPacketConfig tx_config;
 #endif
 
-static HAL_StatusTypeDef read_eth_phy_register(ETH_HandleTypeDef *heth,
-						uint32_t PHYAddr,
-						uint32_t PHYReg,
-						uint32_t *RegVal)
-{
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_mdio)
-	return phy_read(eth_stm32_phy_dev, PHYReg, RegVal);
-#elif defined(CONFIG_ETH_STM32_HAL_API_V2)
-	return HAL_ETH_ReadPHYRegister(heth, PHYAddr, PHYReg, RegVal);
-#else
-	ARG_UNUSED(PHYAddr);
-	return HAL_ETH_ReadPHYRegister(heth, PHYReg, RegVal);
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
-}
-
 static inline void setup_mac_filter(ETH_HandleTypeDef *heth)
 {
 	__ASSERT_NO_MSG(heth != NULL);
@@ -308,7 +315,7 @@ static bool eth_is_ptp_pkt(struct net_if *iface, struct net_pkt *pkt)
 
 	return true;
 }
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
+
 void HAL_ETH_TxPtpCallback(uint32_t *buff, ETH_TimeStampTypeDef *timestamp)
 {
 	struct eth_stm32_tx_context *ctx = (struct eth_stm32_tx_context *)buff;
@@ -318,7 +325,6 @@ void HAL_ETH_TxPtpCallback(uint32_t *buff, ETH_TimeStampTypeDef *timestamp)
 
 	net_if_add_tx_timestamp(ctx->pkt);
 }
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 #endif /* CONFIG_PTP_CLOCK_STM32_HAL */
 
 static int eth_tx(const struct device *dev, struct net_pkt *pkt)
@@ -370,11 +376,7 @@ static int eth_tx(const struct device *dev, struct net_pkt *pkt)
 			    net_pkt_is_tx_timestamping(pkt);
 	if (timestamped_frame) {
 		/* Enable transmit timestamp */
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
 		HAL_ETH_PTP_InsertTxTimestamp(heth);
-#else
-		dma_tx_desc->Status |= ETH_DMATXDESC_TTSE;
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 	}
 #endif /* CONFIG_PTP_CLOCK_STM32_HAL */
 
@@ -495,35 +497,6 @@ static int eth_tx(const struct device *dev, struct net_pkt *pkt)
 	}
 #endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 
-#if defined(CONFIG_PTP_CLOCK_STM32_HAL) && !defined(CONFIG_ETH_STM32_HAL_API_V2)
-	if (timestamped_frame) {
-		/* Retrieve transmission timestamp from last DMA TX descriptor */
-		__IO ETH_DMADescTypeDef *last_dma_tx_desc = dma_tx_desc;
-
-		while (!(last_dma_tx_desc->Status & ETH_DMATXDESC_LS) &&
-				last_dma_tx_desc->Buffer2NextDescAddr) {
-			last_dma_tx_desc =
-				(ETH_DMADescTypeDef *)last_dma_tx_desc->Buffer2NextDescAddr;
-		}
-
-		while (IS_ETH_DMATXDESC_OWN(last_dma_tx_desc) != (uint32_t)RESET) {
-			/* Wait for transmission */
-			k_yield();
-		}
-
-		if (last_dma_tx_desc->Status & ETH_DMATXDESC_LS &&
-				last_dma_tx_desc->Status & ETH_DMATXDESC_TTSS) {
-			pkt->timestamp.second = last_dma_tx_desc->TimeStampHigh;
-			pkt->timestamp.nanosecond = last_dma_tx_desc->TimeStampLow;
-		} else {
-			/* Invalid value */
-			pkt->timestamp.second = UINT64_MAX;
-			pkt->timestamp.nanosecond = UINT32_MAX;
-		}
-		net_if_add_tx_timestamp(pkt);
-	}
-#endif /* CONFIG_PTP_CLOCK_STM32_HAL && !CONFIG_ETH_STM32_HAL_API_V2 */
-
 	res = 0;
 error:
 
@@ -563,9 +536,7 @@ static struct net_pkt *eth_rx(const struct device *dev)
 #endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 #if defined(CONFIG_PTP_CLOCK_STM32_HAL)
 	struct net_ptp_time timestamp;
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
 	ETH_TimeStampTypeDef ts_registers;
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 	/* Default to invalid value. */
 	timestamp.second = UINT64_MAX;
 	timestamp.nanosecond = UINT32_MAX;
@@ -602,22 +573,10 @@ static struct net_pkt *eth_rx(const struct device *dev)
 #endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 
 #if defined(CONFIG_PTP_CLOCK_STM32_HAL)
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-
 	if (HAL_ETH_PTP_GetRxTimestamp(heth, &ts_registers) == HAL_OK) {
 		timestamp.second = ts_registers.TimeStampHigh;
 		timestamp.nanosecond = ts_registers.TimeStampLow;
 	}
-#else
-	__IO ETH_DMADescTypeDef *last_dma_rx_desc;
-
-	last_dma_rx_desc = heth->RxFrameInfos.LSRxDesc;
-	if (last_dma_rx_desc->TimeStampHigh != UINT32_MAX ||
-			last_dma_rx_desc->TimeStampLow != UINT32_MAX) {
-		timestamp.second = last_dma_rx_desc->TimeStampHigh;
-		timestamp.nanosecond = last_dma_rx_desc->TimeStampLow;
-	}
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 #endif /* CONFIG_PTP_CLOCK_STM32_HAL */
 
 	pkt = net_pkt_rx_alloc_with_buffer(get_iface(dev_data),
@@ -707,8 +666,6 @@ static void rx_thread(void *arg1, void *unused1, void *unused2)
 	struct net_if *iface;
 	struct net_pkt *pkt;
 	int res;
-	uint32_t status;
-	HAL_StatusTypeDef hal_ret = HAL_OK;
 
 	__ASSERT_NO_MSG(arg1 != NULL);
 	ARG_UNUSED(unused1);
@@ -720,14 +677,9 @@ static void rx_thread(void *arg1, void *unused1, void *unused2)
 	__ASSERT_NO_MSG(dev_data != NULL);
 
 	while (1) {
-		res = k_sem_take(&dev_data->rx_int_sem,
-			K_MSEC(CONFIG_ETH_STM32_CARRIER_CHECK_RX_IDLE_TIMEOUT_MS));
+		res = k_sem_take(&dev_data->rx_int_sem, K_FOREVER);
 		if (res == 0) {
-			/* semaphore taken, update link status and receive packets */
-			if (dev_data->link_up != true) {
-				dev_data->link_up = true;
-				net_eth_carrier_on(get_iface(dev_data));
-			}
+			/* semaphore taken and receive packets */
 			while ((pkt = eth_rx(dev)) != NULL) {
 				iface = net_pkt_iface(pkt);
 #if defined(CONFIG_NET_DSA)
@@ -742,25 +694,6 @@ static void rx_thread(void *arg1, void *unused1, void *unused2)
 					net_pkt_unref(pkt);
 				}
 			}
-		} else if (res == -EAGAIN) {
-			/* semaphore timeout period expired, check link status */
-			hal_ret = read_eth_phy_register(&dev_data->heth,
-				    PHY_ADDR, PHY_BSR, (uint32_t *) &status);
-			if (hal_ret == HAL_OK) {
-				if ((status & PHY_LINKED_STATUS) == PHY_LINKED_STATUS) {
-					if (dev_data->link_up != true) {
-						dev_data->link_up = true;
-						net_eth_carrier_on(
-							get_iface(dev_data));
-					}
-				} else {
-					if (dev_data->link_up != false) {
-						dev_data->link_up = false;
-						net_eth_carrier_off(
-							get_iface(dev_data));
-					}
-				}
-			}
 		}
 	}
 }
@@ -816,7 +749,12 @@ void HAL_ETH_ErrorCallback(ETH_HandleTypeDef *heth)
 		CONTAINER_OF(heth, struct eth_stm32_hal_dev_data, heth);
 
 	switch (error_code) {
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
+	case HAL_ETH_ERROR_DMA_CH0:
+	case HAL_ETH_ERROR_DMA_CH1:
+#else
 	case HAL_ETH_ERROR_DMA:
+#endif
 		dma_error = HAL_ETH_GetDMAError(heth);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet)
@@ -913,12 +851,37 @@ static void generate_mac(uint8_t *mac_addr)
 #endif
 }
 
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
+/**
+ * Configures the RISAF (RIF Security Attribute Framework) for Ethernet on STM32N6.
+ * This function sets up the master and slave security attributes for the Ethernet peripheral.
+ */
+
+static void RISAF_Config(void)
+{
+	/* Define and initialize the master configuration structure */
+	RIMC_MasterConfig_t RIMC_master = {0};
+
+	/* Enable the clock for the RIFSC (RIF Security Controller) */
+	__HAL_RCC_RIFSC_CLK_ENABLE();
+
+	RIMC_master.MasterCID = RIF_CID_1;
+	RIMC_master.SecPriv = RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV;
+
+	/* Configure the master attributes for the Ethernet peripheral (ETH1) */
+	HAL_RIF_RIMC_ConfigMasterAttributes(RIF_MASTER_INDEX_ETH1, &RIMC_master);
+
+	/* Set the secure and privileged attributes for the Ethernet peripheral (ETH1) as a slave */
+	HAL_RIF_RISC_SetSlaveSecureAttributes(RIF_RISC_PERIPH_INDEX_ETH1,
+					      RIF_ATTRIBUTE_SEC | RIF_ATTRIBUTE_PRIV);
+}
+#endif
+
 static int eth_initialize(const struct device *dev)
 {
 	struct eth_stm32_hal_dev_data *dev_data;
 	const struct eth_stm32_hal_dev_cfg *cfg;
 	ETH_HandleTypeDef *heth;
-	HAL_StatusTypeDef hal_ret = HAL_OK;
 	int ret = 0;
 
 	__ASSERT_NO_MSG(dev != NULL);
@@ -936,6 +899,11 @@ static int eth_initialize(const struct device *dev)
 		return -ENODEV;
 	}
 
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
+	/* RISAF Configuration */
+	RISAF_Config();
+#endif
+
 	/* enable clock */
 	ret = clock_control_on(dev_data->clock,
 		(clock_control_subsys_t)&cfg->pclken);
@@ -966,95 +934,41 @@ static int eth_initialize(const struct device *dev)
 
 	heth->Init.MACAddr = dev_data->mac_addr;
 
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-	heth->Init.TxDesc = dma_tx_desc_tab;
-	heth->Init.RxDesc = dma_rx_desc_tab;
-	heth->Init.RxBuffLen = ETH_STM32_RX_BUF_SIZE;
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
+#if defined(CONFIG_ETH_STM32_HAL_API_V1)
+	HAL_StatusTypeDef hal_ret = HAL_OK;
+
+	if (!ETH_STM32_AUTO_NEGOTIATION_ENABLE) {
+		struct phy_link_state state;
+
+		phy_get_link_state(eth_stm32_phy_dev, &state);
+
+		heth->Init.DuplexMode = PHY_LINK_IS_FULL_DUPLEX(state.speed) ? ETH_MODE_FULLDUPLEX
+									     : ETH_MODE_HALFDUPLEX;
+		heth->Init.Speed =
+			PHY_LINK_IS_SPEED_100M(state.speed) ? ETH_SPEED_100M : ETH_SPEED_10M;
+	}
 
 	hal_ret = HAL_ETH_Init(heth);
 	if (hal_ret == HAL_TIMEOUT) {
 		/* HAL Init time out. This could be linked to */
 		/* a recoverable error. Log the issue and continue */
 		/* driver initialisation */
-		LOG_ERR("HAL_ETH_Init Timed out");
+		LOG_WRN("HAL_ETH_Init timed out (cable not connected?)");
 	} else if (hal_ret != HAL_OK) {
 		LOG_ERR("HAL_ETH_Init failed: %d", hal_ret);
 		return -EINVAL;
 	}
 
-#if defined(CONFIG_PTP_CLOCK_STM32_HAL)
-	/* Enable timestamping of RX packets. We enable all packets to be
-	 * timestamped to cover both IEEE 1588 and gPTP.
-	 */
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet)
-	heth->Instance->MACTSCR |= ETH_MACTSCR_TSENALL;
-#else
-	heth->Instance->PTPTSCR |= ETH_PTPTSCR_TSSARFE;
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet) */
-#endif /* CONFIG_PTP_CLOCK_STM32_HAL */
-
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-	/* Tx config init: */
-	memset(&tx_config, 0, sizeof(ETH_TxPacketConfig));
-	tx_config.Attributes = ETH_TX_PACKETS_FEATURES_CSUM |
-				ETH_TX_PACKETS_FEATURES_CRCPAD;
-	tx_config.ChecksumCtrl = IS_ENABLED(CONFIG_ETH_STM32_HW_CHECKSUM) ?
-			ETH_CHECKSUM_IPHDR_PAYLOAD_INSERT_PHDR_CALC : ETH_CHECKSUM_DISABLE;
-	tx_config.CRCPadCtrl = ETH_CRC_PAD_INSERT;
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
-
-	dev_data->link_up = false;
-
 	/* Initialize semaphores */
 	k_mutex_init(&dev_data->tx_mutex);
 	k_sem_init(&dev_data->rx_int_sem, 0, K_SEM_MAX_LIMIT);
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-	k_sem_init(&dev_data->tx_int_sem, 0, K_SEM_MAX_LIMIT);
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
 
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-	/* Adjust MDC clock range depending on HCLK frequency: */
-	HAL_ETH_SetMDIOClockRange(heth);
-
-	/* @TODO: read duplex mode and speed from PHY and set it to ETH */
-
-	ETH_MACConfigTypeDef mac_config;
-
-	HAL_ETH_GetMACConfig(heth, &mac_config);
-	mac_config.DuplexMode = IS_ENABLED(CONFIG_ETH_STM32_MODE_HALFDUPLEX) ?
-				      ETH_HALFDUPLEX_MODE : ETH_FULLDUPLEX_MODE;
-	mac_config.Speed = IS_ENABLED(CONFIG_ETH_STM32_SPEED_10M) ?
-				 ETH_SPEED_10M : ETH_SPEED_100M;
-	hal_ret = HAL_ETH_SetMACConfig(heth, &mac_config);
-	if (hal_ret != HAL_OK) {
-		LOG_ERR("HAL_ETH_SetMACConfig: failed: %d", hal_ret);
-	}
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
-
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-
-	/* prepare tx buffer header */
-	for (uint16_t i = 0; i < ETH_TXBUFNB; ++i) {
-		dma_tx_buffer_header[i].tx_buff.buffer = dma_tx_buffer[i];
-	}
-
-	hal_ret = HAL_ETH_Start_IT(heth);
-#else
 	HAL_ETH_DMATxDescListInit(heth, dma_tx_desc_tab,
 		&dma_tx_buffer[0][0], ETH_TXBUFNB);
 	HAL_ETH_DMARxDescListInit(heth, dma_rx_desc_tab,
 		&dma_rx_buffer[0][0], ETH_RXBUFNB);
 
-	hal_ret = HAL_ETH_Start(heth);
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
-
-	if (hal_ret != HAL_OK) {
-		LOG_ERR("HAL_ETH_Start{_IT} failed");
-	}
-
-	setup_mac_filter(heth);
-
+#endif /* !CONFIG_ETH_STM32_HAL_API_V1 */
 
 	LOG_DBG("MAC %02x:%02x:%02x:%02x:%02x:%02x",
 		dev_data->mac_addr[0], dev_data->mac_addr[1],
@@ -1114,11 +1028,171 @@ static void eth_stm32_mcast_filter(const struct device *dev, const struct ethern
 
 #endif /* CONFIG_ETH_STM32_MULTICAST_FILTER */
 
+#if defined(CONFIG_ETH_STM32_HAL_API_V2)
+static int eth_init_api_v2(const struct device *dev)
+{
+	HAL_StatusTypeDef hal_ret = HAL_OK;
+	struct eth_stm32_hal_dev_data *dev_data;
+	ETH_HandleTypeDef *heth;
+
+	dev_data = dev->data;
+	heth = &dev_data->heth;
+
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
+	for (int ch = 0; ch < ETH_DMA_CH_CNT; ch++) {
+		heth->Init.TxDesc[ch] = dma_tx_desc_tab[ch];
+		heth->Init.RxDesc[ch] = dma_rx_desc_tab[ch];
+	}
+#else
+	heth->Init.TxDesc = dma_tx_desc_tab;
+	heth->Init.RxDesc = dma_rx_desc_tab;
+#endif
+	heth->Init.RxBuffLen = ETH_STM32_RX_BUF_SIZE;
+
+	hal_ret = HAL_ETH_Init(heth);
+	if (hal_ret == HAL_TIMEOUT) {
+		/* HAL Init time out. This could be linked to */
+		/* a recoverable error. Log the issue and continue */
+		/* driver initialisation */
+		LOG_ERR("HAL_ETH_Init Timed out");
+	} else if (hal_ret != HAL_OK) {
+		LOG_ERR("HAL_ETH_Init failed: %d", hal_ret);
+		return -EINVAL;
+	}
+
+#if defined(CONFIG_PTP_CLOCK_STM32_HAL)
+	/* Enable timestamping of RX packets. We enable all packets to be
+	 * timestamped to cover both IEEE 1588 and gPTP.
+	 */
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet)
+	heth->Instance->MACTSCR |= ETH_MACTSCR_TSENALL;
+#else
+	heth->Instance->PTPTSCR |= ETH_PTPTSCR_TSSARFE;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet) */
+#endif /* CONFIG_PTP_CLOCK_STM32_HAL */
+
+	/* Initialize semaphores */
+	k_mutex_init(&dev_data->tx_mutex);
+	k_sem_init(&dev_data->rx_int_sem, 0, K_SEM_MAX_LIMIT);
+	k_sem_init(&dev_data->tx_int_sem, 0, K_SEM_MAX_LIMIT);
+
+	/* Tx config init: */
+	memset(&tx_config, 0, sizeof(ETH_TxPacketConfig));
+	tx_config.Attributes = ETH_TX_PACKETS_FEATURES_CSUM |
+				ETH_TX_PACKETS_FEATURES_CRCPAD;
+	tx_config.ChecksumCtrl = IS_ENABLED(CONFIG_ETH_STM32_HW_CHECKSUM) ?
+			ETH_CHECKSUM_IPHDR_PAYLOAD_INSERT_PHDR_CALC : ETH_CHECKSUM_DISABLE;
+	tx_config.CRCPadCtrl = ETH_CRC_PAD_INSERT;
+
+	/* prepare tx buffer header */
+	for (uint16_t i = 0; i < ETH_TXBUFNB; ++i) {
+		dma_tx_buffer_header[i].tx_buff.buffer = dma_tx_buffer[i];
+	}
+
+	return 0;
+}
+#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
+
+static void set_mac_config(const struct device *dev, struct phy_link_state *state)
+{
+	struct eth_stm32_hal_dev_data *dev_data = dev->data;
+	ETH_HandleTypeDef *heth = &dev_data->heth;
+	HAL_StatusTypeDef hal_ret = HAL_OK;
+#if defined(CONFIG_ETH_STM32_HAL_API_V2)
+	ETH_MACConfigTypeDef mac_config = {0};
+
+	HAL_ETH_GetMACConfig(heth, &mac_config);
+
+	mac_config.DuplexMode =
+		PHY_LINK_IS_FULL_DUPLEX(state->speed) ? ETH_FULLDUPLEX_MODE : ETH_HALFDUPLEX_MODE;
+
+	mac_config.Speed =
+		IF_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet),
+			PHY_LINK_IS_SPEED_1000M(state->speed) ? ETH_SPEED_1000M :)
+		PHY_LINK_IS_SPEED_100M(state->speed) ? ETH_SPEED_100M : ETH_SPEED_10M;
+
+	hal_ret = HAL_ETH_SetMACConfig(heth, &mac_config);
+	if (hal_ret != HAL_OK) {
+		LOG_ERR("HAL_ETH_SetMACConfig: failed: %d", hal_ret);
+	}
+#else  /* CONFIG_ETH_STM32_HAL_API_V2 */
+	heth->Init.DuplexMode =
+		PHY_LINK_IS_FULL_DUPLEX(state->speed) ? ETH_MODE_FULLDUPLEX : ETH_MODE_HALFDUPLEX;
+
+	heth->Init.Speed = PHY_LINK_IS_SPEED_100M(state->speed) ? ETH_SPEED_100M : ETH_SPEED_10M;
+
+	hal_ret = HAL_ETH_ConfigMAC(heth, NULL);
+	if (hal_ret != HAL_OK) {
+		LOG_ERR("HAL_ETH_ConfigMAC: failed: %d", hal_ret);
+	}
+#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
+}
+
+static int eth_stm32_hal_start(const struct device *dev)
+{
+	struct eth_stm32_hal_dev_data *dev_data = dev->data;
+	ETH_HandleTypeDef *heth = &dev_data->heth;
+	HAL_StatusTypeDef hal_ret = HAL_OK;
+
+	LOG_DBG("Starting ETH HAL driver");
+
+#if defined(CONFIG_ETH_STM32_HAL_API_V2)
+	hal_ret = HAL_ETH_Start_IT(heth);
+#else
+	hal_ret = HAL_ETH_Start(heth);
+#endif
+	if (hal_ret != HAL_OK) {
+		LOG_ERR("HAL_ETH_Start{_IT} failed");
+	}
+
+	return 0;
+}
+
+static int eth_stm32_hal_stop(const struct device *dev)
+{
+	struct eth_stm32_hal_dev_data *dev_data = dev->data;
+	ETH_HandleTypeDef *heth = &dev_data->heth;
+	HAL_StatusTypeDef hal_ret = HAL_OK;
+
+	LOG_DBG("Stopping ETH HAL driver");
+
+#if defined(CONFIG_ETH_STM32_HAL_API_V2)
+	hal_ret = HAL_ETH_Stop_IT(heth);
+#else
+	hal_ret = HAL_ETH_Stop(heth);
+#endif
+	if (hal_ret != HAL_OK) {
+		/* HAL_ETH_Stop{_IT} returns HAL_ERROR only if ETH is already stopped */
+		LOG_DBG("HAL_ETH_Stop{_IT} returned error (Ethernet is already stopped)");
+	}
+
+	return 0;
+}
+
+static void phy_link_state_changed(const struct device *phy_dev, struct phy_link_state *state,
+				   void *user_data)
+{
+	const struct device *dev = (const struct device *)user_data;
+	struct eth_stm32_hal_dev_data *dev_data = dev->data;
+
+	ARG_UNUSED(phy_dev);
+
+	if (state->is_up) {
+		set_mac_config(dev, state);
+		eth_stm32_hal_start(dev);
+		net_eth_carrier_on(dev_data->iface);
+	} else {
+		eth_stm32_hal_stop(dev);
+		net_eth_carrier_off(dev_data->iface);
+	}
+}
+
 static void eth_iface_init(struct net_if *iface)
 {
 	const struct device *dev;
 	struct eth_stm32_hal_dev_data *dev_data;
 	bool is_first_init = false;
+	ETH_HandleTypeDef *heth;
 
 	__ASSERT_NO_MSG(iface != NULL);
 
@@ -1128,6 +1202,9 @@ static void eth_iface_init(struct net_if *iface)
 	dev_data = dev->data;
 	__ASSERT_NO_MSG(dev_data != NULL);
 
+	heth = &dev_data->heth;
+	__ASSERT_NO_MSG(heth != NULL);
+
 	if (dev_data->iface == NULL) {
 		dev_data->iface = iface;
 		is_first_init = true;
@@ -1144,10 +1221,26 @@ static void eth_iface_init(struct net_if *iface)
 
 	ethernet_init(iface);
 
+#if defined(CONFIG_ETH_STM32_HAL_API_V2)
+	/* This function requires the Ethernet interface to be
+	 * properly initialized. In auto-negotiation mode, it reads the speed
+	 * and duplex settings to configure the driver accordingly.
+	 */
+	eth_init_api_v2(dev);
+#endif
+
+	setup_mac_filter(heth);
+
 	net_if_carrier_off(iface);
 
 	net_lldp_set_lldpdu(iface);
 
+	if (device_is_ready(eth_stm32_phy_dev)) {
+		phy_link_callback_set(eth_stm32_phy_dev, phy_link_state_changed, (void *)dev);
+	} else {
+		LOG_ERR("PHY device not ready");
+	}
+
 	if (is_first_init) {
 		const struct eth_stm32_hal_dev_cfg *cfg = dev->config;
 		/* Now that the iface is setup, we are safe to enable IRQs. */
@@ -1158,7 +1251,7 @@ static void eth_iface_init(struct net_if *iface)
 		k_thread_create(&dev_data->rx_thread, dev_data->rx_thread_stack,
 				K_KERNEL_STACK_SIZEOF(dev_data->rx_thread_stack),
 				rx_thread, (void *) dev, NULL, NULL,
-				IS_ENABLED(CONFIG_NET_TC_THREAD_PREEMPTIVE)
+				IS_ENABLED(CONFIG_ETH_STM32_HAL_RX_THREAD_PREEMPTIVE)
 					? K_PRIO_PREEMPT(CONFIG_ETH_STM32_HAL_RX_THREAD_PRIO)
 					: K_PRIO_COOP(CONFIG_ETH_STM32_HAL_RX_THREAD_PRIO),
 				0, K_NO_WAIT);
@@ -1197,6 +1290,47 @@ static enum ethernet_hw_caps eth_stm32_hal_get_capabilities(const struct device
 		;
 }
 
+static int eth_stm32_hal_get_config(const struct device *dev, enum ethernet_config_type type,
+				    struct ethernet_config *config)
+{
+	int ret = -ENOTSUP;
+	struct eth_stm32_hal_dev_data *dev_data;
+	ETH_HandleTypeDef *heth;
+
+	dev_data = dev->data;
+	heth = &dev_data->heth;
+
+	switch (type) {
+	case ETHERNET_CONFIG_TYPE_MAC_ADDRESS:
+		memcpy(config->mac_address.addr, dev_data->mac_addr,
+		       sizeof(config->mac_address.addr));
+		ret = 0;
+		break;
+	case ETHERNET_CONFIG_TYPE_PROMISC_MODE:
+#if defined(CONFIG_NET_PROMISCUOUS_MODE)
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet)
+		if (heth->Instance->MACPFR & ETH_MACPFR_PR) {
+			config->promisc_mode = true;
+		} else {
+			config->promisc_mode = false;
+		}
+#else
+		if (heth->Instance->MACFFR & ETH_MACFFR_PM) {
+			config->promisc_mode = true;
+		} else {
+			config->promisc_mode = false;
+		}
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet) */
+		ret = 0;
+#endif /* CONFIG_NET_PROMISCUOUS_MODE */
+		break;
+	default:
+		break;
+	}
+
+	return ret;
+}
+
 static int eth_stm32_hal_set_config(const struct device *dev,
 				    enum ethernet_config_type type,
 				    const struct ethernet_config *config)
@@ -1252,6 +1386,12 @@ static int eth_stm32_hal_set_config(const struct device *dev,
 	return ret;
 }
 
+static const struct device *eth_stm32_hal_get_phy(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+	return eth_stm32_phy_dev;
+}
+
 #if defined(CONFIG_PTP_CLOCK_STM32_HAL)
 static const struct device *eth_stm32_get_ptp_clock(const struct device *dev)
 {
@@ -1277,6 +1417,8 @@ static const struct ethernet_api eth_api = {
 #endif /* CONFIG_PTP_CLOCK_STM32_HAL */
 	.get_capabilities = eth_stm32_hal_get_capabilities,
 	.set_config = eth_stm32_hal_set_config,
+	.get_phy = eth_stm32_hal_get_phy,
+	.get_config = eth_stm32_hal_get_config,
 #if defined(CONFIG_NET_DSA)
 	.send = dsa_tx,
 #else
@@ -1298,8 +1440,8 @@ PINCTRL_DT_INST_DEFINE(0);
 
 static const struct eth_stm32_hal_dev_cfg eth0_config = {
 	.config_func = eth0_irq_config,
-	.pclken = {.bus = DT_INST_CLOCKS_CELL_BY_NAME(0, stmmaceth, bus),
-		   .enr = DT_INST_CLOCKS_CELL_BY_NAME(0, stmmaceth, bits)},
+	.pclken = {.bus = DT_CLOCKS_CELL_BY_NAME(DT_INST_PARENT(0), stm_eth, bus),
+		   .enr = DT_CLOCKS_CELL_BY_NAME(DT_INST_PARENT(0), stm_eth, bits)},
 	.pclken_tx = {.bus = DT_INST_CLOCKS_CELL_BY_NAME(0, mac_clk_tx, bus),
 		      .enr = DT_INST_CLOCKS_CELL_BY_NAME(0, mac_clk_tx, bits)},
 	.pclken_rx = {.bus = DT_INST_CLOCKS_CELL_BY_NAME(0, mac_clk_rx, bus),
@@ -1311,27 +1453,26 @@ static const struct eth_stm32_hal_dev_cfg eth0_config = {
 	.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(0),
 };
 
+BUILD_ASSERT(DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, mii)
+	|| DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, rmii)
+	IF_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet),
+	(|| DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, rgmii)
+	 || DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, gmii))),
+			"Unsupported PHY connection type");
+
 static struct eth_stm32_hal_dev_data eth0_data = {
 	.heth = {
-		.Instance = (ETH_TypeDef *)DT_INST_REG_ADDR(0),
+		.Instance = (ETH_TypeDef *)DT_REG_ADDR(DT_INST_PARENT(0)),
 		.Init = {
-#if !defined(CONFIG_ETH_STM32_HAL_API_V2)
-#if defined(CONFIG_ETH_STM32_AUTO_NEGOTIATION_ENABLE)
-			.AutoNegotiation = ETH_AUTONEGOTIATION_ENABLE,
-#else
-			.AutoNegotiation = ETH_AUTONEGOTIATION_DISABLE,
-			.Speed = IS_ENABLED(CONFIG_ETH_STM32_SPEED_10M) ?
-				 ETH_SPEED_10M : ETH_SPEED_100M,
-			.DuplexMode = IS_ENABLED(CONFIG_ETH_STM32_MODE_HALFDUPLEX) ?
-				      ETH_MODE_HALFDUPLEX : ETH_MODE_FULLDUPLEX,
-#endif /* !CONFIG_ETH_STM32_AUTO_NEGOTIATION_ENABLE */
-			.PhyAddress = PHY_ADDR,
+#if defined(CONFIG_ETH_STM32_HAL_API_V1)
+			.AutoNegotiation = ETH_STM32_AUTO_NEGOTIATION_ENABLE ?
+					   ETH_AUTONEGOTIATION_ENABLE : ETH_AUTONEGOTIATION_DISABLE,
+			.PhyAddress = DT_REG_ADDR(DT_INST_PHANDLE(0, phy_handle)),
 			.RxMode = ETH_RXINTERRUPT_MODE,
 			.ChecksumMode = IS_ENABLED(CONFIG_ETH_STM32_HW_CHECKSUM) ?
 					ETH_CHECKSUM_BY_HARDWARE : ETH_CHECKSUM_BY_SOFTWARE,
-#endif /* !CONFIG_SOC_SERIES_STM32H7X */
-			.MediaInterface = IS_ENABLED(CONFIG_ETH_STM32_HAL_MII) ?
-					  ETH_MEDIA_INTERFACE_MII : ETH_MEDIA_INTERFACE_RMII,
+#endif /* CONFIG_ETH_STM32_HAL_API_V1 */
+			.MediaInterface = STM32_ETH_PHY_MODE(MAC_NODE),
 		},
 	},
 };
diff --git a/drivers/ethernet/eth_stm32_hal_priv.h b/drivers/ethernet/eth_stm32_hal_priv.h
index 4aef0389d4097..53a01462c37ce 100644
--- a/drivers/ethernet/eth_stm32_hal_priv.h
+++ b/drivers/ethernet/eth_stm32_hal_priv.h
@@ -56,7 +56,6 @@ struct eth_stm32_hal_dev_data {
 	K_KERNEL_STACK_MEMBER(rx_thread_stack,
 		CONFIG_ETH_STM32_HAL_RX_THREAD_STACK_SIZE);
 	struct k_thread rx_thread;
-	bool link_up;
 #if defined(CONFIG_ETH_STM32_MULTICAST_FILTER)
 	uint8_t hash_index_cnt[64];
 #endif /* CONFIG_ETH_STM32_MULTICAST_FILTER */
diff --git a/drivers/ethernet/eth_xilinx_axienet.c b/drivers/ethernet/eth_xilinx_axienet.c
new file mode 100644
index 0000000000000..0292fd95eb9d8
--- /dev/null
+++ b/drivers/ethernet/eth_xilinx_axienet.c
@@ -0,0 +1,607 @@
+/*
+ * Xilinx AXI 1G / 2.5G Ethernet Subsystem
+ *
+ * Copyright(c) 2024, CISPA Helmholtz Center for Information Security
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(eth_xilinx_axienet, CONFIG_ETHERNET_LOG_LEVEL);
+
+#include <sys/types.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/ethernet.h>
+#include <ethernet/eth_stats.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/net/phy.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/barrier.h>
+
+#include "../dma/dma_xilinx_axi_dma.h"
+
+/* register offsets and masks */
+#define XILINX_AXIENET_INTERRUPT_STATUS_OFFSET         0x0000000C
+#define XILINX_AXIENET_INTERRUPT_STATUS_RXREJ_MASK     0x00000008
+#define XILINX_AXIENET_INTERRUPT_STATUS_RXFIFOOVR_MASK 0x00000010 /* Rx fifo overrun */
+#define XILINX_AXIENET_INTERRUPT_PENDING_OFFSET        0x00000010
+
+#define XILINX_AXIENET_INTERRUPT_PENDING_RXCMPIT_MASK     0x00000004 /* Rx complete */
+#define XILINX_AXIENET_INTERRUPT_PENDING_RXRJECT_MASK     0x00000008 /* Rx frame rejected */
+#define XILINX_AXIENET_INTERRUPT_PENDING_RXFIFOOVR_MASK   0x00000010 /* Rx fifo overrun */
+#define XILINX_AXIENET_INTERRUPT_PENDING_TXCMPIT_MASK     0x00000020 /* Tx complete */
+#define XILINX_AXIENET_INTERRUPT_PENDING_RXDCMLOCK_MASK   0x00000040 /* Rx Dcm Lock */
+#define XILINX_AXIENET_INTERRUPT_PENDING_MGTRDY_MASK      0x00000080 /* MGT clock Lock */
+#define XILINX_AXIENET_INTERRUPT_PENDING_PHYRSTCMPLT_MASK 0x00000100 /* Phy Reset complete */
+
+#define XILINX_AXIENET_INTERRUPT_ENABLE_OFFSET     0x00000014
+#define XILINX_AXIENET_INTERRUPT_ENABLE_RXREJ_MASK 0x00000008
+#define XILINX_AXIENET_INTERRUPT_ENABLE_OVR_MASK   0x00000010 /* FIFO overrun */
+
+#define XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_0_REG_OFFSET     0x00000400
+#define XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_OFFSET     0x00000404
+#define XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_RX_EN_MASK 0x10000000
+#define XILINX_AXIENET_RECEIVER_CONFIGURATION_FLOW_CONTROL_OFFSET   0x0000040C
+#define XILINX_AXIENET_RECEIVER_CONFIGURATION_FLOW_CONTROL_EN_MASK  0x20000000
+#define XILINX_AXIENET_TX_CONTROL_REG_OFFSET                        0x00000408
+#define XILINX_AXIENET_TX_CONTROL_TX_EN_MASK                        (1 << 11)
+
+#define XILINX_AXIENET_UNICAST_ADDRESS_WORD_0_OFFSET 0x00000700
+#define XILINX_AXIENET_UNICAST_ADDRESS_WORD_1_OFFSET 0x00000704
+
+#if (CONFIG_DCACHE_LINE_SIZE > 0)
+/* cache-line aligned to allow selective cache-line invalidation on the buffer */
+#define XILINX_AXIENET_ETH_ALIGN CONFIG_DCACHE_LINE_SIZE
+#else
+/* pointer-aligned to reduce padding in the struct */
+#define XILINX_AXIENET_ETH_ALIGN sizeof(void *)
+#endif
+
+#define XILINX_AXIENET_ETH_BUFFER_SIZE                                                             \
+	((NET_ETH_MAX_FRAME_SIZE + XILINX_AXIENET_ETH_ALIGN - 1) & ~(XILINX_AXIENET_ETH_ALIGN - 1))
+
+struct xilinx_axienet_buffer {
+	uint8_t buffer[XILINX_AXIENET_ETH_BUFFER_SIZE];
+} __aligned(XILINX_AXIENET_ETH_ALIGN);
+
+/* device state */
+struct xilinx_axienet_data {
+	struct xilinx_axienet_buffer tx_buffer[CONFIG_ETH_XILINX_AXIENET_BUFFER_NUM_TX];
+	struct xilinx_axienet_buffer rx_buffer[CONFIG_ETH_XILINX_AXIENET_BUFFER_NUM_RX];
+
+	size_t rx_populated_buffer_index;
+	size_t rx_completed_buffer_index;
+	size_t tx_populated_buffer_index;
+	size_t tx_completed_buffer_index;
+
+	struct net_if *interface;
+
+	/* device mac address */
+	uint8_t mac_addr[NET_ETH_ADDR_LEN];
+	bool dma_is_configured_rx;
+	bool dma_is_configured_tx;
+};
+
+/* global configuration per Ethernet device */
+struct xilinx_axienet_config {
+	void (*config_func)(const struct xilinx_axienet_data *dev);
+	const struct device *dma;
+
+	const struct device *phy;
+
+	mem_addr_t reg;
+
+	int irq_num;
+	bool have_irq;
+
+	bool have_rx_csum_offload;
+	bool have_tx_csum_offload;
+};
+
+static void xilinx_axienet_write_register(const struct xilinx_axienet_config *config,
+					  mem_addr_t reg_offset, uint32_t value)
+{
+	sys_write32(value, config->reg + reg_offset);
+}
+
+static uint32_t xilinx_axienet_read_register(const struct xilinx_axienet_config *config,
+					     mem_addr_t reg_offset)
+{
+	return sys_read32(config->reg + reg_offset);
+}
+static int setup_dma_rx_transfer(const struct device *dev,
+				 const struct xilinx_axienet_config *config,
+				 struct xilinx_axienet_data *data);
+
+/* called by DMA when a packet is available */
+static void xilinx_axienet_rx_callback(const struct device *dma, void *user_data, uint32_t channel,
+				       int status)
+{
+	struct device *ethdev = (struct device *)user_data;
+	struct xilinx_axienet_data *data = ethdev->data;
+	unsigned int packet_size;
+	struct net_pkt *pkt;
+
+	size_t next_descriptor =
+		(data->rx_completed_buffer_index + 1) % CONFIG_ETH_XILINX_AXIENET_BUFFER_NUM_RX;
+	size_t current_descriptor = data->rx_completed_buffer_index;
+
+	if (!net_if_is_up(data->interface)) {
+		/*
+		 * cannot receive data now, so discard silently
+		 * setup new transfer for when the interface is back up
+		 */
+		goto setup_new_transfer;
+	}
+
+	if (status < 0) {
+		LOG_ERR("DMA RX error: %d", status);
+		eth_stats_update_errors_rx(data->interface);
+		goto setup_new_transfer;
+	}
+
+	data->rx_completed_buffer_index = next_descriptor;
+
+	packet_size = dma_xilinx_axi_dma_last_received_frame_length(dma);
+	pkt = net_pkt_rx_alloc_with_buffer(data->interface, packet_size, AF_UNSPEC, 0, K_NO_WAIT);
+
+	if (!pkt) {
+		LOG_ERR("Could not allocate a packet!");
+		goto setup_new_transfer;
+	}
+	if (net_pkt_write(pkt, data->rx_buffer[current_descriptor].buffer, packet_size)) {
+		LOG_ERR("Could not write RX buffer into packet!");
+		net_pkt_unref(pkt);
+		goto setup_new_transfer;
+	}
+	if (net_recv_data(data->interface, pkt) < 0) {
+		LOG_ERR("Coult not receive packet data!");
+		net_pkt_unref(pkt);
+		goto setup_new_transfer;
+	}
+
+	LOG_DBG("Packet with %u bytes received!\n", packet_size);
+
+	/* we need to start a new DMA transfer irregardless of whether the DMA reported an error */
+	/* otherwise, the ethernet subsystem would just stop receiving */
+setup_new_transfer:
+	if (setup_dma_rx_transfer(ethdev, ethdev->config, ethdev->data)) {
+		LOG_ERR("Could not set up next RX DMA transfer!");
+	}
+}
+
+static void xilinx_axienet_tx_callback(const struct device *dev, void *user_data, uint32_t channel,
+				       int status)
+{
+	struct device *ethdev = (struct device *)user_data;
+	struct xilinx_axienet_data *data = ethdev->data;
+	size_t next_descriptor =
+		(data->tx_completed_buffer_index + 1) % CONFIG_ETH_XILINX_AXIENET_BUFFER_NUM_TX;
+
+	data->tx_completed_buffer_index = next_descriptor;
+
+	if (status < 0) {
+		LOG_ERR("DMA TX error: %d", status);
+		eth_stats_update_errors_tx(data->interface);
+	}
+}
+
+static int setup_dma_rx_transfer(const struct device *dev,
+				 const struct xilinx_axienet_config *config,
+				 struct xilinx_axienet_data *data)
+{
+	int err;
+	size_t next_descriptor =
+		(data->rx_populated_buffer_index + 1) % CONFIG_ETH_XILINX_AXIENET_BUFFER_NUM_RX;
+	size_t current_descriptor = data->rx_populated_buffer_index;
+
+	if (next_descriptor == data->rx_completed_buffer_index) {
+		LOG_ERR("Cannot start RX via DMA - populated buffer %zu will run into completed"
+			" buffer %zu!",
+			data->rx_populated_buffer_index, data->rx_completed_buffer_index);
+		return -ENOSPC;
+	}
+
+	if (!data->dma_is_configured_rx) {
+		struct dma_block_config head_block = {
+			.source_address = 0x0,
+			.dest_address = (uintptr_t)data->rx_buffer[current_descriptor].buffer,
+			.block_size = sizeof(data->rx_buffer[current_descriptor].buffer),
+			.next_block = NULL,
+			.source_addr_adj = DMA_ADDR_ADJ_INCREMENT,
+			.dest_addr_adj = DMA_ADDR_ADJ_INCREMENT};
+		struct dma_config dma_conf = {.dma_slot = 0,
+					      .channel_direction = PERIPHERAL_TO_MEMORY,
+					      .complete_callback_en = 1,
+					      .error_callback_dis = 0,
+					      .block_count = 1,
+					      .head_block = &head_block,
+					      .user_data = (void *)dev,
+					      .dma_callback = xilinx_axienet_rx_callback};
+
+		if (config->have_rx_csum_offload) {
+			dma_conf.linked_channel = XILINX_AXI_DMA_LINKED_CHANNEL_FULL_CSUM_OFFLOAD;
+		} else {
+			dma_conf.linked_channel = XILINX_AXI_DMA_LINKED_CHANNEL_NO_CSUM_OFFLOAD;
+		}
+
+		err = dma_config(config->dma, XILINX_AXI_DMA_RX_CHANNEL_NUM, &dma_conf);
+		if (err) {
+			LOG_ERR("DMA config failed: %d", err);
+			return err;
+		}
+
+		data->dma_is_configured_rx = true;
+	} else {
+		/* can use faster "reload" API, as everything else stays the same */
+		err = dma_reload(config->dma, XILINX_AXI_DMA_RX_CHANNEL_NUM, 0x0,
+				 (uintptr_t)data->rx_buffer[current_descriptor].buffer,
+				 sizeof(data->rx_buffer[current_descriptor].buffer));
+		if (err) {
+			LOG_ERR("DMA reconfigure failed: %d", err);
+			return err;
+		}
+	}
+	LOG_DBG("Receiving one packet with DMA!");
+
+	/* prevent concurrent modification */
+	data->rx_populated_buffer_index = next_descriptor;
+
+	err = dma_start(config->dma, XILINX_AXI_DMA_RX_CHANNEL_NUM);
+
+	if (err) {
+		/* buffer has not been accepted by DMA */
+		data->rx_populated_buffer_index = current_descriptor;
+	}
+
+	return err;
+}
+
+/* assumes that the caller has set up data->tx_buffer */
+static int setup_dma_tx_transfer(const struct device *dev,
+				 const struct xilinx_axienet_config *config,
+				 struct xilinx_axienet_data *data, uint32_t buffer_len)
+{
+	int err;
+	size_t next_descriptor =
+		(data->tx_populated_buffer_index + 1) % CONFIG_ETH_XILINX_AXIENET_BUFFER_NUM_TX;
+	size_t current_descriptor = data->tx_populated_buffer_index;
+
+	if (next_descriptor == data->tx_completed_buffer_index) {
+		LOG_ERR("Cannot start TX via DMA - populated buffer %zu will run into completed"
+			" buffer %zu!",
+			data->tx_populated_buffer_index, data->tx_completed_buffer_index);
+		return -ENOSPC;
+	}
+
+	if (!data->dma_is_configured_tx) {
+		struct dma_block_config head_block = {
+			.source_address = (uintptr_t)data->tx_buffer[current_descriptor].buffer,
+			.dest_address = 0x0,
+			.block_size = buffer_len,
+			.next_block = NULL,
+			.source_addr_adj = DMA_ADDR_ADJ_INCREMENT,
+			.dest_addr_adj = DMA_ADDR_ADJ_INCREMENT};
+		struct dma_config dma_conf = {.dma_slot = 0,
+					      .channel_direction = MEMORY_TO_PERIPHERAL,
+					      .complete_callback_en = 1,
+					      .error_callback_dis = 0,
+					      .block_count = 1,
+					      .head_block = &head_block,
+					      .user_data = (void *)dev,
+					      .dma_callback = xilinx_axienet_tx_callback};
+
+		if (config->have_tx_csum_offload) {
+			dma_conf.linked_channel = XILINX_AXI_DMA_LINKED_CHANNEL_FULL_CSUM_OFFLOAD;
+		} else {
+			dma_conf.linked_channel = XILINX_AXI_DMA_LINKED_CHANNEL_NO_CSUM_OFFLOAD;
+		}
+
+		err = dma_config(config->dma, XILINX_AXI_DMA_TX_CHANNEL_NUM, &dma_conf);
+		if (err) {
+			LOG_ERR("DMA config failed: %d", err);
+			return err;
+		}
+
+		data->dma_is_configured_tx = true;
+	} else {
+		/* can use faster "reload" API, as everything else stays the same */
+		err = dma_reload(config->dma, XILINX_AXI_DMA_TX_CHANNEL_NUM,
+				 (uintptr_t)data->tx_buffer[current_descriptor].buffer, 0x0,
+				 buffer_len);
+		if (err) {
+			LOG_ERR("DMA reconfigure failed: %d", err);
+			return err;
+		}
+	}
+
+	/* prevent concurrent modification */
+	data->tx_populated_buffer_index = next_descriptor;
+
+	err = dma_start(config->dma, XILINX_AXI_DMA_TX_CHANNEL_NUM);
+
+	if (err) {
+		/* buffer has not been accepted by DMA */
+		data->tx_populated_buffer_index = current_descriptor;
+	}
+
+	return err;
+}
+
+static void xilinx_axienet_isr(const struct device *dev)
+{
+	const struct xilinx_axienet_config *config = dev->config;
+	struct xilinx_axienet_data *data = dev->data;
+	uint32_t status =
+		xilinx_axienet_read_register(config, XILINX_AXIENET_INTERRUPT_PENDING_OFFSET);
+
+	(void)data;
+
+	if (status & XILINX_AXIENET_INTERRUPT_PENDING_RXFIFOOVR_MASK) {
+		LOG_WRN("FIFO was overrun - probably lost packets!");
+		eth_stats_update_errors_rx(data->interface);
+	} else if (status & XILINX_AXIENET_INTERRUPT_PENDING_RXRJECT_MASK) {
+		/* this is extremely rare on Ethernet */
+		/* most likely cause is mistake in FPGA configuration */
+		LOG_WRN("Erroneous frame received!");
+		eth_stats_update_errors_rx(data->interface);
+	}
+
+	if (status != 0) {
+		/* clear IRQ by writing the same value back */
+		xilinx_axienet_write_register(config, XILINX_AXIENET_INTERRUPT_STATUS_OFFSET,
+					      status);
+	}
+}
+
+static enum ethernet_hw_caps xilinx_axienet_caps(const struct device *dev)
+{
+	const struct xilinx_axienet_config *config = dev->config;
+	enum ethernet_hw_caps ret = ETHERNET_LINK_10BASE_T | ETHERNET_LINK_100BASE_T |
+				    ETHERNET_LINK_1000BASE_T;
+
+	if (config->have_rx_csum_offload) {
+		ret |= ETHERNET_HW_RX_CHKSUM_OFFLOAD;
+	}
+	if (config->have_tx_csum_offload) {
+		ret |= ETHERNET_HW_TX_CHKSUM_OFFLOAD;
+	}
+
+	return ret;
+}
+
+static const struct device *xilinx_axienet_get_phy(const struct device *dev)
+{
+	const struct xilinx_axienet_config *config = dev->config;
+
+	return config->phy;
+}
+
+static int xilinx_axienet_get_config(const struct device *dev, enum ethernet_config_type type,
+				     struct ethernet_config *config)
+{
+	const struct xilinx_axienet_config *dev_config = dev->config;
+	const struct xilinx_axienet_data *data = dev->data;
+	struct phy_link_state link_state;
+	int err;
+
+	switch (type) {
+	case ETHERNET_CONFIG_TYPE_RX_CHECKSUM_SUPPORT:
+		if (dev_config->have_rx_csum_offload) {
+			config->chksum_support =
+				ETHERNET_CHECKSUM_SUPPORT_IPV4_HEADER |
+				ETHERNET_CHECKSUM_SUPPORT_TCP | ETHERNET_CHECKSUM_SUPPORT_UDP |
+				ETHERNET_CHECKSUM_SUPPORT_IPV6_HEADER |
+				ETHERNET_CHECKSUM_SUPPORT_TCP | ETHERNET_CHECKSUM_SUPPORT_UDP;
+		} else {
+			config->chksum_support = ETHERNET_CHECKSUM_SUPPORT_NONE;
+		}
+		return 0;
+	case ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT:
+		if (dev_config->have_tx_csum_offload) {
+			config->chksum_support =
+				ETHERNET_CHECKSUM_SUPPORT_IPV4_HEADER |
+				ETHERNET_CHECKSUM_SUPPORT_TCP | ETHERNET_CHECKSUM_SUPPORT_UDP |
+				ETHERNET_CHECKSUM_SUPPORT_IPV6_HEADER |
+				ETHERNET_CHECKSUM_SUPPORT_TCP | ETHERNET_CHECKSUM_SUPPORT_UDP;
+		} else {
+			config->chksum_support = ETHERNET_CHECKSUM_SUPPORT_NONE;
+		}
+		return 0;
+	default:
+		LOG_ERR("Unsupported configuration queried: %u", type);
+		return -EINVAL;
+	}
+}
+
+static void xilinx_axienet_set_mac_address(const struct xilinx_axienet_config *config,
+					   const struct xilinx_axienet_data *data)
+{
+	xilinx_axienet_write_register(config, XILINX_AXIENET_UNICAST_ADDRESS_WORD_0_OFFSET,
+				      (data->mac_addr[0]) | (data->mac_addr[1] << 8) |
+					      (data->mac_addr[2] << 16) |
+					      (data->mac_addr[3] << 24));
+	xilinx_axienet_write_register(config, XILINX_AXIENET_UNICAST_ADDRESS_WORD_1_OFFSET,
+				      (data->mac_addr[4]) | (data->mac_addr[5] << 8));
+}
+
+static int xilinx_axienet_set_config(const struct device *dev, enum ethernet_config_type type,
+				     const struct ethernet_config *config)
+{
+	const struct xilinx_axienet_config *dev_config = dev->config;
+	struct xilinx_axienet_data *data = dev->data;
+
+	switch (type) {
+	case ETHERNET_CONFIG_TYPE_MAC_ADDRESS:
+		memcpy(data->mac_addr, config->mac_address.addr, sizeof(data->mac_addr));
+		xilinx_axienet_set_mac_address(dev_config, data);
+		return net_if_set_link_addr(data->interface, data->mac_addr,
+			sizeof(data->mac_addr), NET_LINK_ETHERNET);
+	default:
+		LOG_ERR("Unsupported configuration set: %u", type);
+		return -EINVAL;
+	}
+}
+
+static void phy_link_state_changed(const struct device *dev, struct phy_link_state *state,
+				   void *user_data)
+{
+	struct xilinx_axienet_data *data = user_data;
+
+	ARG_UNUSED(dev);
+
+	LOG_INF("Link state changed to: %s (speed %x)", state->is_up ? "up" : "down", state->speed);
+
+	/* inform the L2 driver about link event */
+	if (state->is_up) {
+		net_eth_carrier_on(data->interface);
+	} else {
+		net_eth_carrier_off(data->interface);
+	}
+}
+
+static void xilinx_axienet_iface_init(struct net_if *iface)
+{
+	struct xilinx_axienet_data *data = net_if_get_device(iface)->data;
+	const struct xilinx_axienet_config *config = net_if_get_device(iface)->config;
+	int err;
+
+	data->interface = iface;
+
+	ethernet_init(iface);
+
+	net_if_set_link_addr(iface, data->mac_addr, sizeof(data->mac_addr), NET_LINK_ETHERNET);
+
+	/* carrier is initially off */
+	net_eth_carrier_off(iface);
+
+	err = phy_link_callback_set(config->phy, phy_link_state_changed, data);
+
+	if (err) {
+		LOG_ERR("Could not set PHY link state changed handler : %d",
+			config->phy ? err : -1);
+	}
+
+	LOG_INF("Interface initialized!");
+}
+
+static int xilinx_axienet_send(const struct device *dev, struct net_pkt *pkt)
+{
+	struct xilinx_axienet_data *data = dev->data;
+	const struct xilinx_axienet_config *config = dev->config;
+	size_t pkt_len = net_pkt_get_len(pkt);
+	size_t current_descriptor = data->tx_populated_buffer_index;
+
+	if (net_pkt_read(pkt, data->tx_buffer[current_descriptor].buffer, pkt_len)) {
+		LOG_ERR("Failed to read packet into TX buffer!");
+		return -EIO;
+	}
+	return setup_dma_tx_transfer(dev, config, data, pkt_len);
+}
+
+static int xilinx_axienet_probe(const struct device *dev)
+{
+	const struct xilinx_axienet_config *config = dev->config;
+	struct xilinx_axienet_data *data = dev->data;
+	uint32_t status;
+	int err;
+
+	status = xilinx_axienet_read_register(
+		config, XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_OFFSET);
+	status = status & ~XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_RX_EN_MASK;
+	xilinx_axienet_write_register(
+		config, XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_OFFSET, status);
+
+	/* RX disabled - it is safe to modify settings */
+
+	/* clear any RX rejected interrupts from when the core was not configured */
+	xilinx_axienet_write_register(config, XILINX_AXIENET_INTERRUPT_STATUS_OFFSET,
+				      XILINX_AXIENET_INTERRUPT_STATUS_RXREJ_MASK |
+					      XILINX_AXIENET_INTERRUPT_STATUS_RXFIFOOVR_MASK);
+
+	xilinx_axienet_write_register(config, XILINX_AXIENET_INTERRUPT_ENABLE_OFFSET,
+				      config->have_irq
+					      ? XILINX_AXIENET_INTERRUPT_ENABLE_RXREJ_MASK |
+							XILINX_AXIENET_INTERRUPT_ENABLE_OVR_MASK
+					      : 0);
+
+	xilinx_axienet_write_register(config,
+				      XILINX_AXIENET_RECEIVER_CONFIGURATION_FLOW_CONTROL_OFFSET,
+				      XILINX_AXIENET_RECEIVER_CONFIGURATION_FLOW_CONTROL_EN_MASK);
+
+	/* at time of writing, hardware does not support half duplex */
+	err = phy_configure_link(config->phy, LINK_FULL_10BASE_T | LINK_FULL_100BASE_T |
+						      LINK_FULL_1000BASE_T);
+	if (err) {
+		LOG_WRN("Could not configure PHY: %d", -err);
+	}
+
+	LOG_INF("RX Checksum offloading %s",
+		config->have_rx_csum_offload ? "requested" : "disabled");
+	LOG_INF("TX Checksum offloading %s",
+		config->have_tx_csum_offload ? "requested" : "disabled");
+
+	xilinx_axienet_set_mac_address(config, data);
+
+	for (int i = 0; i < CONFIG_ETH_XILINX_AXIENET_BUFFER_NUM_RX - 1; i++) {
+		setup_dma_rx_transfer(dev, config, data);
+	}
+
+	status = xilinx_axienet_read_register(
+		config, XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_OFFSET);
+	status = status | XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_RX_EN_MASK;
+	xilinx_axienet_write_register(
+		config, XILINX_AXIENET_RECEIVER_CONFIGURATION_WORD_1_REG_OFFSET, status);
+
+	status = xilinx_axienet_read_register(config, XILINX_AXIENET_TX_CONTROL_REG_OFFSET);
+	status = status | XILINX_AXIENET_TX_CONTROL_TX_EN_MASK;
+	xilinx_axienet_write_register(config, XILINX_AXIENET_TX_CONTROL_REG_OFFSET, status);
+
+	config->config_func(data);
+
+	return 0;
+}
+
+/* TODO PTP, VLAN not supported yet */
+static const struct ethernet_api xilinx_axienet_api = {
+	.iface_api.init = xilinx_axienet_iface_init,
+	.get_capabilities = xilinx_axienet_caps,
+	.get_config = xilinx_axienet_get_config,
+	.set_config = xilinx_axienet_set_config,
+	.get_phy = xilinx_axienet_get_phy,
+	.send = xilinx_axienet_send,
+};
+
+#define SETUP_IRQS(inst)                                                                           \
+	IRQ_CONNECT(DT_INST_IRQN(inst), DT_INST_IRQ(inst, priority), xilinx_axienet_isr,           \
+		    DEVICE_DT_INST_GET(inst), 0);                                                  \
+                                                                                                   \
+	irq_enable(DT_INST_IRQN(inst))
+
+#define XILINX_AXIENET_INIT(inst)                                                                  \
+                                                                                                   \
+	static void xilinx_axienet_config_##inst(const struct xilinx_axienet_data *dev)            \
+	{                                                                                          \
+		COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, interrupts), (SETUP_IRQS(inst)),           \
+			    (LOG_INF("No IRQs defined!")));        \
+	}                                                                                          \
+                                                                                                   \
+	static struct xilinx_axienet_data data_##inst = {                                          \
+		.mac_addr = DT_INST_PROP(inst, local_mac_address),                                 \
+		.dma_is_configured_rx = false,                                                     \
+		.dma_is_configured_tx = false};                                                    \
+	static const struct xilinx_axienet_config config_##inst = {                                \
+		.config_func = xilinx_axienet_config_##inst,                                       \
+		.dma = DEVICE_DT_GET(DT_INST_PHANDLE(inst, axistream_connected)),                  \
+		.phy = DEVICE_DT_GET(DT_INST_PHANDLE(inst, phy_handle)),                           \
+		.reg = DT_REG_ADDR(DT_INST_PARENT(inst)),                                          \
+		.have_irq = DT_INST_NODE_HAS_PROP(inst, interrupts),                               \
+		.have_tx_csum_offload = DT_INST_PROP_OR(inst, xlnx_txcsum, 0x0) == 0x2,            \
+		.have_rx_csum_offload = DT_INST_PROP_OR(inst, xlnx_rxcsum, 0x0) == 0x2,            \
+	};                                                                                         \
+                                                                                                   \
+	ETH_NET_DEVICE_DT_INST_DEFINE(inst, xilinx_axienet_probe, NULL, &data_##inst,              \
+				      &config_##inst, CONFIG_ETH_INIT_PRIORITY,                    \
+				      &xilinx_axienet_api, NET_ETH_MTU);
+
+#define DT_DRV_COMPAT xlnx_axi_ethernet_1_00_a
+DT_INST_FOREACH_STATUS_OKAY(XILINX_AXIENET_INIT);
diff --git a/drivers/ethernet/nxp_enet/CMakeLists.txt b/drivers/ethernet/nxp_enet/CMakeLists.txt
deleted file mode 100644
index 777a1624ff142..0000000000000
--- a/drivers/ethernet/nxp_enet/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library_sources_ifdef(CONFIG_ETH_NXP_ENET eth_nxp_enet.c)
-zephyr_library_sources_ifdef(CONFIG_ETH_MCUX eth_mcux.c)
diff --git a/drivers/ethernet/nxp_enet/Kconfig b/drivers/ethernet/nxp_enet/Kconfig
deleted file mode 100644
index 848d44b485650..0000000000000
--- a/drivers/ethernet/nxp_enet/Kconfig
+++ /dev/null
@@ -1,195 +0,0 @@
-# NXP ENET ethernet drivers configuration options
-
-# Copyright (c) 2016-2017 ARM Ltd
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-menu "NXP ENET"
-
-choice NXP_ENET_DRIVER
-	prompt "NXP ENET Driver Version"
-	default ETH_NXP_ENET if DT_HAS_NXP_ENET_MAC_ENABLED
-	default ETH_MCUX if DT_HAS_NXP_KINETIS_ETHERNET_ENABLED
-	depends on DT_HAS_NXP_ENET_MAC_ENABLED || DT_HAS_NXP_KINETIS_ETHERNET_ENABLED
-
-config ETH_NXP_ENET
-	bool "NXP ENET Ethernet driver"
-	select NOCACHE_MEMORY if HAS_MCUX_CACHE && CPU_HAS_DCACHE
-	select ARM_MPU if CPU_CORTEX_M7
-	select MDIO if DT_HAS_NXP_ENET_MDIO_ENABLED
-	select NET_POWER_MANAGEMENT if (PM_DEVICE && SOC_FAMILY_KINETIS)
-	select ETH_DSA_SUPPORT
-	select PINCTRL
-	help
-	  Enable NXP ENET Ethernet driver.
-
-config ETH_MCUX
-	bool "MCUX Ethernet driver"
-	select NOCACHE_MEMORY if HAS_MCUX_CACHE && CPU_HAS_DCACHE
-	select ARM_MPU if CPU_CORTEX_M7
-	select NET_POWER_MANAGEMENT if PM_DEVICE
-	select ETH_DSA_SUPPORT
-	select DEPRECATED
-	select PINCTRL
-	help
-	  Enable deprecated legacy MCUX Ethernet driver.
-	  Note, this driver performs one shot PHY setup.
-	  There is no support for PHY disconnect, reconnect or configuration change.
-
-endchoice
-
-if ETH_NXP_ENET
-
-config ETH_NXP_ENET_1G
-	bool "1G mode for ENET1G instance"
-	default y
-	depends on DT_HAS_NXP_ENET1G_ENABLED
-	help
-	  Enable the use of the ENET1G ethernet instance in 1G mode.
-
-config ETH_NXP_ENET_USE_DTCM_FOR_DMA_BUFFER
-	bool "Use DTCM for hardware DMA buffers"
-	default y
-	help
-	  Place the hardware DMA buffers into DTCM for better
-	  networking performance.
-
-config ETH_NXP_ENET_HW_ACCELERATION
-	bool "Hardware acceleration"
-	default y
-	help
-	  Enable hardware acceleration for the following:
-	  - IPv4, UDP and TCP checksum (both Rx and Tx)
-
-config ETH_NXP_ENET_RX_BUFFERS
-	int "Number of RX buffers for ethernet driver"
-	default 6
-	range 6 16
-	help
-	  Set the number of RX buffers provided to the NXP ENET driver.
-
-config ETH_NXP_ENET_TX_BUFFERS
-	int "Number of TX buffers for ethernet driver"
-	default 1
-	range 1 16
-	help
-	  Set the number of TX buffers provided to the NXP ENET driver.
-
-config ETH_NXP_ENET_RX_THREAD_STACK_SIZE
-	int "NXP ENET RX thread stack size"
-	default 1600
-	help
-	  ENET RX thread stack size in bytes.
-
-config ETH_NXP_ENET_RX_THREAD_PRIORITY
-	int "NXP ENET driver RX cooperative thread priority"
-	default 2
-	help
-	  ENET MAC Driver handles RX in cooperative workqueue thread.
-	  This options sets the priority of that thread.
-
-endif # ETH_NXP_ENET
-
-if ETH_MCUX
-
-config ETH_MCUX_PROMISCUOUS_MODE
-	bool "Promiscuous mode"
-	help
-	  Place the Ethernet receiver in promiscuous mode. This may be useful
-	  for debugging and not needed for normal work.
-
-config ETH_MCUX_USE_DTCM_FOR_DMA_BUFFER
-	bool "Use DTCM for hardware DMA buffers"
-	default y
-	help
-	  Place the hardware DMA buffers into DTCM for better
-	  networking performance.
-
-config ETH_MCUX_HW_ACCELERATION
-	bool "Hardware acceleration"
-	default y
-	help
-	  Enable hardware acceleration for the following:
-	  - IPv4, UDP and TCP checksum (both Rx and Tx)
-
-config ETH_MCUX_RX_BUFFERS
-	int "Number of RX buffers for ethernet driver"
-	default 6
-	range 6 16
-	help
-	  Set the number of RX buffers provided to the NXP ENET driver.
-
-config ETH_MCUX_TX_BUFFERS
-	int "Number of TX buffers for ethernet driver"
-	default 1
-	range 1 16
-	help
-	  Set the number of TX buffers provided to the NXP ENET driver.
-
-menu "Legacy driver options"
-
-config ETH_MCUX_RMII_EXT_CLK
-	bool "RMII clock from external sources"
-	help
-	  Setting this option will configure MCUX clock block to feed RMII
-	  reference clock from external source (ENET_1588_CLKIN)
-
-config ETH_MCUX_NO_PHY_SMI
-	bool "Do not use SMI for PHY communication"
-	help
-	  Some PHY devices, with DSA capabilities do not use SMI for
-	  communication with MAC ENET controller. Other busses - like SPI
-	  or I2C are used instead.
-
-config ETH_MCUX_PHY_TICK_MS
-	int "PHY poll period (ms)"
-	default 1000
-	range 100 30000
-	help
-	  Set the PHY status polling period.
-
-config ETH_MCUX_PHY_EXTRA_DEBUG
-	bool "Additional detailed PHY debug"
-	help
-	  Enable additional PHY related debug information related to
-	  PHY status polling.
-
-config ETH_MCUX_PHY_RESET
-	bool "Reset the PHY at boot"
-	help
-	  Reset the ethernet PHY at boot. Requires dts properties int-gpios and
-	  reset-gpios to be present.
-
-config PTP_CLOCK_MCUX
-	bool "MCUX PTP clock driver support"
-	default y
-	depends on PTP_CLOCK || NET_L2_PTP
-	help
-	  Enable MCUX PTP clock support.
-
-if PTP_CLOCK_MCUX
-
-config ETH_MCUX_PTP_CLOCK_SRC_HZ
-	int "Frequency of the clock source for the PTP timer"
-	default 50000000 if SOC_SERIES_KINETIS_K6X
-	default 50000000 if SOC_SERIES_IMXRT10XX
-	default 24000000 if SOC_SERIES_IMXRT11XX
-	help
-	  Set the frequency in Hz sourced to the PTP timer.
-	  If the value is set properly, the timer will be accurate.
-
-config ETH_MCUX_PTP_CLOCK_INIT_PRIO
-	int
-	default 85
-	help
-	  MCUX PTP Clock initialization priority level. There is
-	  a dependency from the network stack that this device
-	  initializes before network stack (NET_INIT_PRIO).
-
-endif # PTP_CLOCK_MCUX
-
-endmenu # Legacy options
-
-endif # ETH_MCUX
-
-endmenu # NXP ENET
diff --git a/drivers/ethernet/nxp_enet/eth_mcux.c b/drivers/ethernet/nxp_enet/eth_mcux.c
deleted file mode 100644
index 8d8fac6ad4d6c..0000000000000
--- a/drivers/ethernet/nxp_enet/eth_mcux.c
+++ /dev/null
@@ -1,1745 +0,0 @@
-/* MCUX Ethernet Driver
- *
- *  Copyright (c) 2016-2017 ARM Ltd
- *  Copyright (c) 2016 Linaro Ltd
- *  Copyright (c) 2018 Intel Corporation
- *  Copyright 2023 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT nxp_kinetis_ethernet
-
-/* Driver Limitations:
- *
- * There is no statistics collection for either normal operation or
- * error behaviour.
- */
-
-#define LOG_MODULE_NAME eth_mcux
-#define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#define RING_ID 0
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(LOG_MODULE_NAME);
-
-#include <zephyr/device.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/kernel.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/net/net_pkt.h>
-#include <zephyr/net/net_if.h>
-#include <zephyr/net/ethernet.h>
-#include <ethernet/eth_stats.h>
-#include <zephyr/pm/device.h>
-#include <zephyr/irq.h>
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-#include <zephyr/drivers/ptp_clock.h>
-#endif
-
-#if defined(CONFIG_NET_DSA)
-#include <zephyr/net/dsa.h>
-#endif
-
-#include "fsl_enet.h"
-#include "fsl_phy.h"
-#include "fsl_phyksz8081.h"
-#include "fsl_enet_mdio.h"
-#if defined(CONFIG_NET_POWER_MANAGEMENT)
-#include "fsl_clock.h"
-#include <zephyr/drivers/clock_control.h>
-#endif
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#if defined(CONFIG_PINCTRL)
-#include <zephyr/drivers/pinctrl.h>
-#endif
-
-#include "../eth.h"
-
-#define PHY_OMS_OVERRIDE_REG 0x16U      /* The PHY Operation Mode Strap Override register. */
-#define PHY_OMS_STATUS_REG 0x17U        /* The PHY Operation Mode Strap Status register. */
-
-#define PHY_OMS_NANDTREE_MASK 0x0020U     /* The PHY NAND Tree Strap-In Override/Status mask. */
-#define PHY_OMS_FACTORY_MODE_MASK 0x8000U /* The factory mode Override/Status mask. */
-
-/* Defines the PHY KSZ8081 vendor defined registers. */
-#define PHY_CONTROL1_REG 0x1EU /* The PHY control one register. */
-#define PHY_CONTROL2_REG 0x1FU /* The PHY control two register. */
-
-/* Defines the PHY KSZ8081 ID number. */
-#define PHY_CONTROL_ID1 0x22U /* The PHY ID1 */
-
-/* Defines the mask flag of operation mode in control registers */
-#define PHY_CTL2_REMOTELOOP_MASK    0x0004U /* The PHY remote loopback mask. */
-#define PHY_CTL2_REFCLK_SELECT_MASK 0x0080U /* The PHY RMII reference clock select. */
-#define PHY_CTL1_10HALFDUPLEX_MASK  0x0001U /* The PHY 10M half duplex mask. */
-#define PHY_CTL1_100HALFDUPLEX_MASK 0x0002U /* The PHY 100M half duplex mask. */
-#define PHY_CTL1_10FULLDUPLEX_MASK  0x0005U /* The PHY 10M full duplex mask. */
-#define PHY_CTL1_100FULLDUPLEX_MASK 0x0006U /* The PHY 100M full duplex mask. */
-#define PHY_CTL1_SPEEDUPLX_MASK     0x0007U /* The PHY speed and duplex mask. */
-#define PHY_CTL1_ENERGYDETECT_MASK  0x10U   /* The PHY signal present on rx differential pair. */
-#define PHY_CTL1_LINKUP_MASK        0x100U  /* The PHY link up. */
-#define PHY_LINK_READY_MASK         (PHY_CTL1_ENERGYDETECT_MASK | PHY_CTL1_LINKUP_MASK)
-
-/* Defines the timeout macro. */
-#define PHY_READID_TIMEOUT_COUNT 1000U
-
-/* Define RX and TX thread stack sizes */
-#define ETH_MCUX_RX_THREAD_STACK_SIZE 1600
-#define ETH_MCUX_TX_THREAD_STACK_SIZE 1600
-
-#define FREESCALE_OUI_B0 0x00
-#define FREESCALE_OUI_B1 0x04
-#define FREESCALE_OUI_B2 0x9f
-
-#define ETH_MCUX_FIXED_LINK_NODE \
-	DT_CHILD(DT_NODELABEL(enet), fixed_link)
-#define ETH_MCUX_FIXED_LINK \
-	DT_NODE_EXISTS(ETH_MCUX_FIXED_LINK_NODE)
-#define ETH_MCUX_FIXED_LINK_SPEED \
-	DT_PROP(ETH_MCUX_FIXED_LINK_NODE, speed)
-#define ETH_MCUX_FIXED_LINK_FULL_DUPLEX \
-	DT_PROP(ETH_MCUX_FIXED_LINK_NODE, full_duplex)
-
-enum eth_mcux_phy_state {
-	eth_mcux_phy_state_initial,
-	eth_mcux_phy_state_reset,
-	eth_mcux_phy_state_autoneg,
-	eth_mcux_phy_state_restart,
-	eth_mcux_phy_state_read_status,
-	eth_mcux_phy_state_read_duplex,
-	eth_mcux_phy_state_wait,
-	eth_mcux_phy_state_closing
-};
-
-struct _phy_resource {
-	mdioWrite write;
-	mdioRead read;
-};
-
-#if defined(CONFIG_NET_POWER_MANAGEMENT)
-extern uint32_t ENET_GetInstance(ENET_Type * base);
-static const clock_ip_name_t enet_clocks[] = ENET_CLOCKS;
-#endif
-
-static void eth_mcux_init(const struct device *dev);
-
-#if defined(CONFIG_ETH_MCUX_PHY_EXTRA_DEBUG)
-static const char *phy_state_name(enum eth_mcux_phy_state state)
-{
-	static const char * const name[] = {
-		"initial",
-		"reset",
-		"autoneg",
-		"restart",
-		"read-status",
-		"read-duplex",
-		"wait",
-		"closing"
-	};
-
-	return name[state];
-}
-#endif
-
-static const char *eth_name(ENET_Type *base)
-{
-	switch ((int)base) {
-	case DT_INST_REG_ADDR(0):
-		return "ETH_0";
-#if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(1))
-	case DT_INST_REG_ADDR(1):
-		return "ETH_1";
-#endif
-	default:
-		return "unknown";
-	}
-}
-
-struct eth_context {
-	ENET_Type *base;
-	void (*config_func)(void);
-	struct net_if *iface;
-#if defined(CONFIG_NET_POWER_MANAGEMENT)
-	clock_ip_name_t clock;
-	const struct device *clock_dev;
-#endif
-	enet_handle_t enet_handle;
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	const struct device *ptp_clock;
-	enet_ptp_config_t ptp_config;
-	double clk_ratio;
-	struct k_mutex ptp_mutex;
-	struct k_sem ptp_ts_sem;
-#endif
-	struct k_sem tx_buf_sem;
-	phy_handle_t *phy_handle;
-	struct _phy_resource *phy_config;
-	struct k_sem rx_thread_sem;
-	enum eth_mcux_phy_state phy_state;
-	bool enabled;
-	bool link_up;
-	uint32_t phy_addr;
-	uint32_t rx_irq_num;
-	uint32_t tx_irq_num;
-	phy_duplex_t phy_duplex;
-	phy_speed_t phy_speed;
-	uint8_t mac_addr[6];
-	void (*generate_mac)(uint8_t *);
-	struct k_work phy_work;
-	struct k_work_delayable delayed_phy_work;
-
-	K_KERNEL_STACK_MEMBER(rx_thread_stack, ETH_MCUX_RX_THREAD_STACK_SIZE);
-	struct k_thread rx_thread;
-
-	/* TODO: FIXME. This Ethernet frame sized buffer is used for
-	 * interfacing with MCUX. How it works is that hardware uses
-	 * DMA scatter buffers to receive a frame, and then public
-	 * MCUX call gathers them into this buffer (there's no other
-	 * public interface). All this happens only for this driver
-	 * to scatter this buffer again into Zephyr fragment buffers.
-	 * This is not efficient, but proper resolution of this issue
-	 * depends on introduction of zero-copy networking support
-	 * in Zephyr, and adding needed interface to MCUX (or
-	 * bypassing it and writing a more complex driver working
-	 * directly with hardware).
-	 *
-	 * Note that we do not copy FCS into this buffer thus the
-	 * size is 1514 bytes.
-	 */
-	struct k_mutex tx_frame_buf_mutex;
-	struct k_mutex rx_frame_buf_mutex;
-	uint8_t *tx_frame_buf; /* Max MTU + ethernet header */
-	uint8_t *rx_frame_buf; /* Max MTU + ethernet header */
-#if defined(CONFIG_PINCTRL)
-	const struct pinctrl_dev_config *pincfg;
-#endif
-#if defined(CONFIG_ETH_MCUX_PHY_RESET)
-	const struct gpio_dt_spec int_gpio;
-	const struct gpio_dt_spec reset_gpio;
-#endif
-};
-
-/* Use ENET_FRAME_MAX_VLANFRAMELEN for VLAN frame size
- * Use ENET_FRAME_MAX_FRAMELEN for Ethernet frame size
- */
-#if defined(CONFIG_NET_VLAN)
-#if !defined(ENET_FRAME_MAX_VLANFRAMELEN)
-#define ENET_FRAME_MAX_VLANFRAMELEN (ENET_FRAME_MAX_FRAMELEN + 4)
-#endif
-#define ETH_MCUX_BUFFER_SIZE \
-	ROUND_UP(ENET_FRAME_MAX_VLANFRAMELEN, ENET_BUFF_ALIGNMENT)
-#else
-#define ETH_MCUX_BUFFER_SIZE \
-	ROUND_UP(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)
-#endif /* CONFIG_NET_VLAN */
-
-#ifdef CONFIG_SOC_FAMILY_KINETIS
-#if defined(CONFIG_NET_POWER_MANAGEMENT)
-static void eth_mcux_phy_enter_reset(struct eth_context *context);
-void eth_mcux_phy_stop(struct eth_context *context);
-
-static int eth_mcux_device_pm_action(const struct device *dev,
-				     enum pm_device_action action)
-{
-	struct eth_context *eth_ctx = dev->data;
-	int ret = 0;
-
-	if (!device_is_ready(eth_ctx->clock_dev)) {
-		LOG_ERR("No CLOCK dev");
-
-		ret = -EIO;
-		goto out;
-	}
-
-	switch (action) {
-	case PM_DEVICE_ACTION_SUSPEND:
-		LOG_DBG("Suspending");
-
-		ret = net_if_suspend(eth_ctx->iface);
-		if (ret == -EBUSY) {
-			goto out;
-		}
-
-		eth_mcux_phy_enter_reset(eth_ctx);
-		eth_mcux_phy_stop(eth_ctx);
-
-		ENET_Reset(eth_ctx->base);
-		ENET_Deinit(eth_ctx->base);
-		clock_control_off(eth_ctx->clock_dev,
-			(clock_control_subsys_t)eth_ctx->clock);
-		break;
-	case PM_DEVICE_ACTION_RESUME:
-		LOG_DBG("Resuming");
-
-		clock_control_on(eth_ctx->clock_dev,
-			(clock_control_subsys_t)eth_ctx->clock);
-		eth_mcux_init(dev);
-		net_if_resume(eth_ctx->iface);
-		break;
-	default:
-		ret = -ENOTSUP;
-		break;
-	}
-
-out:
-
-	return ret;
-}
-#endif /* CONFIG_NET_POWER_MANAGEMENT */
-#endif /* CONFIG_SOC_FAMILY_KINETIS */
-
-#if ETH_MCUX_FIXED_LINK
-static void eth_mcux_get_phy_params(phy_duplex_t *p_phy_duplex,
-				    phy_speed_t *p_phy_speed)
-{
-	*p_phy_duplex = kPHY_HalfDuplex;
-#if ETH_MCUX_FIXED_LINK_FULL_DUPLEX
-	*p_phy_duplex = kPHY_FullDuplex;
-#endif
-
-	*p_phy_speed = kPHY_Speed10M;
-#if ETH_MCUX_FIXED_LINK_SPEED == 100
-	*p_phy_speed = kPHY_Speed100M;
-#endif
-}
-#else
-
-static void eth_mcux_decode_duplex_and_speed(uint32_t status,
-					     phy_duplex_t *p_phy_duplex,
-					     phy_speed_t *p_phy_speed)
-{
-	switch (status & PHY_CTL1_SPEEDUPLX_MASK) {
-	case PHY_CTL1_10FULLDUPLEX_MASK:
-		*p_phy_duplex = kPHY_FullDuplex;
-		*p_phy_speed = kPHY_Speed10M;
-		break;
-	case PHY_CTL1_100FULLDUPLEX_MASK:
-		*p_phy_duplex = kPHY_FullDuplex;
-		*p_phy_speed = kPHY_Speed100M;
-		break;
-	case PHY_CTL1_100HALFDUPLEX_MASK:
-		*p_phy_duplex = kPHY_HalfDuplex;
-		*p_phy_speed = kPHY_Speed100M;
-		break;
-	case PHY_CTL1_10HALFDUPLEX_MASK:
-		*p_phy_duplex = kPHY_HalfDuplex;
-		*p_phy_speed = kPHY_Speed10M;
-		break;
-	}
-}
-#endif /* ETH_MCUX_FIXED_LINK */
-
-static inline struct net_if *get_iface(struct eth_context *ctx)
-{
-	return ctx->iface;
-}
-
-static void eth_mcux_phy_enter_reset(struct eth_context *context)
-{
-	/* Reset the PHY. */
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-	ENET_StartSMIWrite(context->base, context->phy_addr,
-			   PHY_BASICCONTROL_REG,
-			   kENET_MiiWriteValidFrame,
-			   PHY_BCTL_RESET_MASK);
-#endif
-	context->phy_state = eth_mcux_phy_state_reset;
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-	k_work_submit(&context->phy_work);
-#endif
-}
-
-static void eth_mcux_phy_start(struct eth_context *context)
-{
-#if defined(CONFIG_ETH_MCUX_PHY_EXTRA_DEBUG)
-	LOG_DBG("%s phy_state=%s", eth_name(context->base),
-		phy_state_name(context->phy_state));
-#endif
-
-	context->enabled = true;
-
-	switch (context->phy_state) {
-	case eth_mcux_phy_state_initial:
-		context->phy_handle->phyAddr = context->phy_addr;
-		ENET_ActiveRead(context->base);
-		/* Reset the PHY. */
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		ENET_StartSMIWrite(context->base, context->phy_addr,
-				   PHY_BASICCONTROL_REG,
-				   kENET_MiiWriteValidFrame,
-				   PHY_BCTL_RESET_MASK);
-#else
-		/*
-		 * With no SMI communication one needs to wait for
-		 * iface being up by the network core.
-		 */
-		k_work_submit(&context->phy_work);
-		break;
-#endif
-#if defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT11XX)
-		context->phy_state = eth_mcux_phy_state_initial;
-#else
-		context->phy_state = eth_mcux_phy_state_reset;
-#endif
-		break;
-	case eth_mcux_phy_state_reset:
-		eth_mcux_phy_enter_reset(context);
-		break;
-	case eth_mcux_phy_state_autoneg:
-	case eth_mcux_phy_state_restart:
-	case eth_mcux_phy_state_read_status:
-	case eth_mcux_phy_state_read_duplex:
-	case eth_mcux_phy_state_wait:
-	case eth_mcux_phy_state_closing:
-		break;
-	}
-}
-
-void eth_mcux_phy_stop(struct eth_context *context)
-{
-#if defined(CONFIG_ETH_MCUX_PHY_EXTRA_DEBUG)
-	LOG_DBG("%s phy_state=%s", eth_name(context->base),
-		phy_state_name(context->phy_state));
-#endif
-
-	context->enabled = false;
-
-	switch (context->phy_state) {
-	case eth_mcux_phy_state_initial:
-	case eth_mcux_phy_state_reset:
-	case eth_mcux_phy_state_autoneg:
-	case eth_mcux_phy_state_restart:
-	case eth_mcux_phy_state_read_status:
-	case eth_mcux_phy_state_read_duplex:
-		/* Do nothing, let the current communication complete
-		 * then deal with shutdown.
-		 */
-		context->phy_state = eth_mcux_phy_state_closing;
-		break;
-	case eth_mcux_phy_state_wait:
-		k_work_cancel_delayable(&context->delayed_phy_work);
-		/* @todo, actually power down the PHY ? */
-		context->phy_state = eth_mcux_phy_state_initial;
-		break;
-	case eth_mcux_phy_state_closing:
-		/* We are already going down. */
-		break;
-	}
-}
-
-static void eth_mcux_phy_event(struct eth_context *context)
-{
-#if !(defined(CONFIG_ETH_MCUX_NO_PHY_SMI) && ETH_MCUX_FIXED_LINK)
-	uint32_t status;
-#endif
-	bool link_up;
-#if defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT11XX)
-	status_t res;
-	uint16_t ctrl2;
-#endif
-	phy_duplex_t phy_duplex = kPHY_FullDuplex;
-	phy_speed_t phy_speed = kPHY_Speed100M;
-
-#if defined(CONFIG_ETH_MCUX_PHY_EXTRA_DEBUG)
-	LOG_DBG("%s phy_state=%s", eth_name(context->base),
-		phy_state_name(context->phy_state));
-#endif
-	switch (context->phy_state) {
-	case eth_mcux_phy_state_initial:
-#if defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT11XX)
-		ENET_DisableInterrupts(context->base, ENET_EIR_MII_MASK);
-		res = PHY_Read(context->phy_handle, PHY_CONTROL2_REG, &ctrl2);
-		ENET_EnableInterrupts(context->base, ENET_EIR_MII_MASK);
-		if (res != kStatus_Success) {
-			LOG_WRN("Reading PHY reg failed (status 0x%x)", res);
-			k_work_submit(&context->phy_work);
-		} else {
-			ctrl2 |= PHY_CTL2_REFCLK_SELECT_MASK;
-			ENET_StartSMIWrite(context->base, context->phy_addr,
-					   PHY_CONTROL2_REG,
-					   kENET_MiiWriteValidFrame,
-					   ctrl2);
-		}
-		context->phy_state = eth_mcux_phy_state_reset;
-#endif
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		/*
-		 * When the iface is available proceed with the eth link setup,
-		 * otherwise reschedule the eth_mcux_phy_event and check after
-		 * 1ms
-		 */
-		if (context->iface) {
-		       context->phy_state = eth_mcux_phy_state_reset;
-		}
-
-		k_work_reschedule(&context->delayed_phy_work, K_MSEC(1));
-#endif
-		break;
-	case eth_mcux_phy_state_closing:
-		if (context->enabled) {
-			eth_mcux_phy_enter_reset(context);
-		} else {
-			/* @todo, actually power down the PHY ? */
-			context->phy_state = eth_mcux_phy_state_initial;
-		}
-		break;
-	case eth_mcux_phy_state_reset:
-		/* Setup PHY autonegotiation. */
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		ENET_StartSMIWrite(context->base, context->phy_addr,
-				   PHY_AUTONEG_ADVERTISE_REG,
-				   kENET_MiiWriteValidFrame,
-				   (PHY_100BASETX_FULLDUPLEX_MASK |
-				    PHY_100BASETX_HALFDUPLEX_MASK |
-				    PHY_10BASETX_FULLDUPLEX_MASK |
-				    PHY_10BASETX_HALFDUPLEX_MASK |
-					PHY_IEEE802_3_SELECTOR_MASK));
-#endif
-		context->phy_state = eth_mcux_phy_state_autoneg;
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		k_work_submit(&context->phy_work);
-#endif
-		break;
-	case eth_mcux_phy_state_autoneg:
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		/* Setup PHY autonegotiation. */
-		ENET_StartSMIWrite(context->base, context->phy_addr,
-				   PHY_BASICCONTROL_REG,
-				   kENET_MiiWriteValidFrame,
-				   (PHY_BCTL_AUTONEG_MASK |
-				    PHY_BCTL_RESTART_AUTONEG_MASK));
-#endif
-		context->phy_state = eth_mcux_phy_state_restart;
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		k_work_submit(&context->phy_work);
-#endif
-		break;
-	case eth_mcux_phy_state_wait:
-	case eth_mcux_phy_state_restart:
-		/* Start reading the PHY basic status. */
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		ENET_StartSMIRead(context->base, context->phy_addr,
-				  PHY_BASICSTATUS_REG,
-				  kENET_MiiReadValidFrame);
-#endif
-		context->phy_state = eth_mcux_phy_state_read_status;
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-		k_work_submit(&context->phy_work);
-#endif
-		break;
-	case eth_mcux_phy_state_read_status:
-		/* PHY Basic status is available. */
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI) && ETH_MCUX_FIXED_LINK
-		link_up = true;
-#else
-		status = ENET_ReadSMIData(context->base);
-		link_up =  status & PHY_BSTATUS_LINKSTATUS_MASK;
-#endif
-		if (link_up && !context->link_up && context->iface != NULL) {
-			/* Start reading the PHY control register. */
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-			ENET_StartSMIRead(context->base, context->phy_addr,
-					  PHY_CONTROL1_REG,
-					  kENET_MiiReadValidFrame);
-#endif
-			context->link_up = link_up;
-			context->phy_state = eth_mcux_phy_state_read_duplex;
-			net_eth_carrier_on(context->iface);
-			k_msleep(1);
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-			k_work_submit(&context->phy_work);
-#endif
-		} else if (!link_up && context->link_up && context->iface != NULL) {
-			LOG_INF("%s link down", eth_name(context->base));
-			context->link_up = link_up;
-			k_work_reschedule(&context->delayed_phy_work,
-					  K_MSEC(CONFIG_ETH_MCUX_PHY_TICK_MS));
-			context->phy_state = eth_mcux_phy_state_wait;
-			net_eth_carrier_off(context->iface);
-		} else {
-			k_work_reschedule(&context->delayed_phy_work,
-					  K_MSEC(CONFIG_ETH_MCUX_PHY_TICK_MS));
-			context->phy_state = eth_mcux_phy_state_wait;
-		}
-
-		break;
-	case eth_mcux_phy_state_read_duplex:
-		/* PHY control register is available. */
-#if defined(CONFIG_ETH_MCUX_NO_PHY_SMI) && ETH_MCUX_FIXED_LINK
-		eth_mcux_get_phy_params(&phy_duplex, &phy_speed);
-		LOG_INF("%s - Fixed Link", eth_name(context->base));
-#else
-		status = ENET_ReadSMIData(context->base);
-		eth_mcux_decode_duplex_and_speed(status,
-						 &phy_duplex,
-						 &phy_speed);
-#endif
-		if (phy_speed != context->phy_speed ||
-		    phy_duplex != context->phy_duplex) {
-			context->phy_speed = phy_speed;
-			context->phy_duplex = phy_duplex;
-			ENET_SetMII(context->base,
-				    (enet_mii_speed_t) phy_speed,
-				    (enet_mii_duplex_t) phy_duplex);
-		}
-
-		LOG_INF("%s enabled %sM %s-duplex mode.",
-			eth_name(context->base),
-			(phy_speed ? "100" : "10"),
-			(phy_duplex ? "full" : "half"));
-		k_work_reschedule(&context->delayed_phy_work,
-				  K_MSEC(CONFIG_ETH_MCUX_PHY_TICK_MS));
-		context->phy_state = eth_mcux_phy_state_wait;
-		break;
-	}
-}
-
-static void eth_mcux_phy_work(struct k_work *item)
-{
-	struct eth_context *context =
-		CONTAINER_OF(item, struct eth_context, phy_work);
-
-	eth_mcux_phy_event(context);
-}
-
-static void eth_mcux_delayed_phy_work(struct k_work *item)
-{
-	struct k_work_delayable *dwork = k_work_delayable_from_work(item);
-	struct eth_context *context =
-		CONTAINER_OF(dwork, struct eth_context, delayed_phy_work);
-
-	eth_mcux_phy_event(context);
-}
-
-static void eth_mcux_phy_setup(struct eth_context *context)
-{
-#if defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT11XX)
-	status_t res;
-	uint16_t oms_override;
-
-	/* Disable MII interrupts to prevent triggering PHY events. */
-	ENET_DisableInterrupts(context->base, ENET_EIR_MII_MASK);
-
-	res = PHY_Read(context->phy_handle,
-		       PHY_OMS_OVERRIDE_REG, &oms_override);
-	if (res != kStatus_Success) {
-		LOG_WRN("Reading PHY reg failed (status 0x%x)", res);
-	} else {
-		/* Based on strap-in pins the PHY can be in factory test mode.
-		 * Force normal operation.
-		 */
-		oms_override &= ~PHY_OMS_FACTORY_MODE_MASK;
-
-		/* Prevent PHY entering NAND Tree mode override. */
-		if (oms_override & PHY_OMS_NANDTREE_MASK) {
-			oms_override &= ~PHY_OMS_NANDTREE_MASK;
-		}
-
-		res = PHY_Write(context->phy_handle,
-				PHY_OMS_OVERRIDE_REG, oms_override);
-		if (res != kStatus_Success) {
-			LOG_WRN("Writing PHY reg failed (status 0x%x)", res);
-		}
-	}
-
-	ENET_EnableInterrupts(context->base, ENET_EIR_MII_MASK);
-#endif
-}
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-
-static bool eth_get_ptp_data(struct net_if *iface, struct net_pkt *pkt)
-{
-	int eth_hlen;
-
-	if (ntohs(NET_ETH_HDR(pkt)->type) != NET_ETH_PTYPE_PTP) {
-		return false;
-	}
-
-	eth_hlen = sizeof(struct net_eth_hdr);
-
-	net_pkt_set_priority(pkt, NET_PRIORITY_CA);
-
-	return true;
-}
-#endif /* CONFIG_PTP_CLOCK_MCUX */
-
-static int eth_tx(const struct device *dev, struct net_pkt *pkt)
-{
-	struct eth_context *context = dev->data;
-	uint16_t total_len = net_pkt_get_len(pkt);
-	status_t status;
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	bool timestamped_frame;
-#endif
-
-	/* Wait for a TX buffer descriptor to be available */
-	k_sem_take(&context->tx_buf_sem, K_FOREVER);
-
-	k_mutex_lock(&context->tx_frame_buf_mutex, K_FOREVER);
-
-	if (net_pkt_read(pkt, context->tx_frame_buf, total_len)) {
-		k_mutex_unlock(&context->tx_frame_buf_mutex);
-		return -EIO;
-	}
-
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	timestamped_frame = eth_get_ptp_data(net_pkt_iface(pkt), pkt);
-	if (timestamped_frame) {
-		status = ENET_SendFrame(context->base, &context->enet_handle,
-					  context->tx_frame_buf, total_len, RING_ID, true, pkt);
-		if (!status) {
-			net_pkt_ref(pkt);
-			/*
-			 * Network stack will modify the packet upon return,
-			 * so wait for the packet to be timestamped,
-			 * which will occur within the TX ISR, before
-			 * returning
-			 */
-			k_sem_take(&context->ptp_ts_sem, K_FOREVER);
-		}
-
-	} else
-#endif
-	{
-		status = ENET_SendFrame(context->base, &context->enet_handle,
-					context->tx_frame_buf, total_len, RING_ID, false, NULL);
-	}
-
-	if (status) {
-		LOG_ERR("ENET_SendFrame error: %d", (int)status);
-		k_mutex_unlock(&context->tx_frame_buf_mutex);
-		ENET_ReclaimTxDescriptor(context->base,
-					&context->enet_handle, RING_ID);
-		return -1;
-	}
-
-	k_mutex_unlock(&context->tx_frame_buf_mutex);
-
-	return 0;
-}
-
-static int eth_rx(struct eth_context *context)
-{
-	uint32_t frame_length = 0U;
-	struct net_if *iface;
-	struct net_pkt *pkt;
-	status_t status;
-	uint32_t ts;
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	enet_ptp_time_t ptpTimeData;
-#endif
-
-	status = ENET_GetRxFrameSize(&context->enet_handle,
-				     (uint32_t *)&frame_length, RING_ID);
-	if (status == kStatus_ENET_RxFrameEmpty) {
-		return 0;
-	} else if (status == kStatus_ENET_RxFrameError) {
-		enet_data_error_stats_t error_stats;
-
-		LOG_ERR("ENET_GetRxFrameSize return: %d", (int)status);
-
-		ENET_GetRxErrBeforeReadFrame(&context->enet_handle,
-					     &error_stats, RING_ID);
-		goto flush;
-	}
-
-	if (frame_length > NET_ETH_MAX_FRAME_SIZE) {
-		LOG_ERR("frame too large (%d)", frame_length);
-		goto flush;
-	}
-
-	/* Using root iface. It will be updated in net_recv_data() */
-	pkt = net_pkt_rx_alloc_with_buffer(context->iface, frame_length,
-					   AF_UNSPEC, 0, K_NO_WAIT);
-	if (!pkt) {
-		goto flush;
-	}
-
-	/* in case multiply thread access
-	 * we need to protect it with mutex.
-	 */
-	k_mutex_lock(&context->rx_frame_buf_mutex, K_FOREVER);
-
-	status = ENET_ReadFrame(context->base, &context->enet_handle,
-				context->rx_frame_buf, frame_length, RING_ID, &ts);
-	if (status) {
-		LOG_ERR("ENET_ReadFrame failed: %d", (int)status);
-		net_pkt_unref(pkt);
-
-		k_mutex_unlock(&context->rx_frame_buf_mutex);
-		goto error;
-	}
-
-	if (net_pkt_write(pkt, context->rx_frame_buf, frame_length)) {
-		LOG_ERR("Unable to write frame into the pkt");
-		net_pkt_unref(pkt);
-		k_mutex_unlock(&context->rx_frame_buf_mutex);
-		goto error;
-	}
-
-	k_mutex_unlock(&context->rx_frame_buf_mutex);
-
-	/*
-	 * Use MAC timestamp
-	 */
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	k_mutex_lock(&context->ptp_mutex, K_FOREVER);
-	if (eth_get_ptp_data(get_iface(context), pkt)) {
-		ENET_Ptp1588GetTimer(context->base, &context->enet_handle,
-					&ptpTimeData);
-		/* If latest timestamp reloads after getting from Rx BD,
-		 * then second - 1 to make sure the actual Rx timestamp is
-		 * accurate
-		 */
-		if (ptpTimeData.nanosecond < ts) {
-			ptpTimeData.second--;
-		}
-
-		pkt->timestamp.nanosecond = ts;
-		pkt->timestamp.second = ptpTimeData.second;
-	} else {
-		/* Invalid value. */
-		pkt->timestamp.nanosecond = UINT32_MAX;
-		pkt->timestamp.second = UINT64_MAX;
-	}
-	k_mutex_unlock(&context->ptp_mutex);
-#endif /* CONFIG_PTP_CLOCK_MCUX */
-
-	iface = get_iface(context);
-#if defined(CONFIG_NET_DSA)
-	iface = dsa_net_recv(iface, &pkt);
-#endif
-	if (net_recv_data(iface, pkt) < 0) {
-		net_pkt_unref(pkt);
-		goto error;
-	}
-
-	return 1;
-flush:
-	/* Flush the current read buffer.  This operation can
-	 * only report failure if there is no frame to flush,
-	 * which cannot happen in this context.
-	 */
-	status = ENET_ReadFrame(context->base, &context->enet_handle, NULL,
-					0, RING_ID, NULL);
-	__ASSERT_NO_MSG(status == kStatus_Success);
-error:
-	eth_stats_update_errors_rx(get_iface(context));
-	return -EIO;
-}
-
-#if defined(CONFIG_PTP_CLOCK_MCUX) && defined(CONFIG_NET_L2_PTP)
-static inline void ts_register_tx_event(struct eth_context *context,
-					 enet_frame_info_t *frameinfo)
-{
-	struct net_pkt *pkt;
-
-	pkt = frameinfo->context;
-	if (pkt && atomic_get(&pkt->atomic_ref) > 0) {
-		if (eth_get_ptp_data(net_pkt_iface(pkt), pkt)) {
-			if (frameinfo->isTsAvail) {
-				k_mutex_lock(&context->ptp_mutex, K_FOREVER);
-
-				pkt->timestamp.nanosecond =
-					frameinfo->timeStamp.nanosecond;
-				pkt->timestamp.second =
-					frameinfo->timeStamp.second;
-
-				net_if_add_tx_timestamp(pkt);
-				k_sem_give(&context->ptp_ts_sem);
-				k_mutex_unlock(&context->ptp_mutex);
-			}
-		}
-
-		net_pkt_unref(pkt);
-	} else {
-		if (IS_ENABLED(CONFIG_ETH_MCUX_PHY_EXTRA_DEBUG) && pkt) {
-			LOG_ERR("pkt %p already freed", pkt);
-		}
-	}
-
-}
-#endif /* CONFIG_PTP_CLOCK_MCUX && CONFIG_NET_L2_PTP */
-
-static void eth_callback(ENET_Type *base, enet_handle_t *handle,
-#if FSL_FEATURE_ENET_QUEUE > 1
-			 uint32_t ringId,
-#endif /* FSL_FEATURE_ENET_QUEUE > 1 */
-			 enet_event_t event, enet_frame_info_t *frameinfo, void *param)
-{
-	struct eth_context *context = param;
-
-	switch (event) {
-	case kENET_RxEvent:
-		k_sem_give(&context->rx_thread_sem);
-		break;
-	case kENET_TxEvent:
-#if defined(CONFIG_PTP_CLOCK_MCUX) && defined(CONFIG_NET_L2_PTP)
-		/* Register event */
-		ts_register_tx_event(context, frameinfo);
-#endif /* CONFIG_PTP_CLOCK_MCUX && CONFIG_NET_L2_PTP */
-		/* Free the TX buffer. */
-		k_sem_give(&context->tx_buf_sem);
-		break;
-	case kENET_ErrEvent:
-		/* Error event: BABR/BABT/EBERR/LC/RL/UN/PLR.  */
-		break;
-	case kENET_WakeUpEvent:
-		/* Wake up from sleep mode event. */
-		break;
-	case kENET_TimeStampEvent:
-		/* Time stamp event.  */
-		/* Reset periodic timer to default value. */
-		context->base->ATPER = NSEC_PER_SEC;
-		break;
-	case kENET_TimeStampAvailEvent:
-		/* Time stamp available event.  */
-		break;
-	}
-}
-
-static void eth_rx_thread(void *arg1, void *unused1, void *unused2)
-{
-	struct eth_context *context = (struct eth_context *)arg1;
-
-	while (1) {
-		if (k_sem_take(&context->rx_thread_sem, K_FOREVER) == 0) {
-			while (eth_rx(context) == 1) {
-				;
-			}
-			/* enable the IRQ for RX */
-			ENET_EnableInterrupts(context->base,
-			  kENET_RxFrameInterrupt | kENET_RxBufferInterrupt);
-		}
-	}
-}
-
-#if defined(CONFIG_ETH_MCUX_PHY_RESET)
-static int eth_phy_reset(const struct device *dev)
-{
-	int err;
-	struct eth_context *context = dev->data;
-
-	/* pull up the ENET_INT before RESET. */
-	err =  gpio_pin_configure_dt(&context->int_gpio, GPIO_OUTPUT_ACTIVE);
-	if (err) {
-		return err;
-	}
-	return gpio_pin_configure_dt(&context->reset_gpio, GPIO_OUTPUT_INACTIVE);
-}
-
-static int eth_phy_init(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-
-	/* RESET PHY chip. */
-	k_busy_wait(USEC_PER_MSEC * 500);
-	return gpio_pin_set_dt(&context->reset_gpio, 1);
-}
-#endif
-
-static void eth_mcux_init(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-	const enet_buffer_config_t *buffer_config = dev->config;
-	enet_config_t enet_config;
-	uint32_t sys_clock;
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	uint8_t ptp_multicast[6] = { 0x01, 0x1B, 0x19, 0x00, 0x00, 0x00 };
-	uint8_t ptp_peer_multicast[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x0E };
-#endif
-#if defined(CONFIG_MDNS_RESPONDER) || defined(CONFIG_MDNS_RESOLVER)
-	/* standard multicast MAC address */
-	uint8_t mdns_multicast[6] = { 0x01, 0x00, 0x5E, 0x00, 0x00, 0xFB };
-#endif
-
-	context->phy_state = eth_mcux_phy_state_initial;
-	context->phy_handle->ops = &phyksz8081_ops;
-
-#if defined(CONFIG_SOC_SERIES_IMXRT10XX)
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
-	sys_clock = CLOCK_GetFreq(kCLOCK_IpgClk);
-#endif
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet2))
-	sys_clock = CLOCK_GetFreq(kCLOCK_EnetPll1Clk);
-#endif
-#elif defined(CONFIG_SOC_SERIES_IMXRT11XX)
-	sys_clock = CLOCK_GetRootClockFreq(kCLOCK_Root_Bus);
-#else
-	sys_clock = CLOCK_GetFreq(kCLOCK_CoreSysClk);
-#endif
-
-	ENET_GetDefaultConfig(&enet_config);
-	enet_config.interrupt |= kENET_RxFrameInterrupt;
-	enet_config.interrupt |= kENET_TxFrameInterrupt;
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-	enet_config.interrupt |= kENET_MiiInterrupt;
-#endif
-	enet_config.miiMode = kENET_RmiiMode;
-	enet_config.callback = eth_callback;
-	enet_config.userData = context;
-
-	if (IS_ENABLED(CONFIG_ETH_MCUX_PROMISCUOUS_MODE)) {
-		enet_config.macSpecialConfig |= kENET_ControlPromiscuousEnable;
-	}
-
-	if (IS_ENABLED(CONFIG_NET_VLAN)) {
-		enet_config.macSpecialConfig |= kENET_ControlVLANTagEnable;
-	}
-
-	if (IS_ENABLED(CONFIG_ETH_MCUX_HW_ACCELERATION)) {
-		enet_config.txAccelerConfig |=
-			kENET_TxAccelIpCheckEnabled |
-			kENET_TxAccelProtoCheckEnabled;
-		enet_config.rxAccelerConfig |=
-			kENET_RxAccelIpCheckEnabled |
-			kENET_RxAccelProtoCheckEnabled;
-	}
-
-	ENET_Init(context->base,
-		  &context->enet_handle,
-		  &enet_config,
-		  buffer_config,
-		  context->mac_addr,
-		  sys_clock);
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	ENET_AddMulticastGroup(context->base, ptp_multicast);
-	ENET_AddMulticastGroup(context->base, ptp_peer_multicast);
-
-	/* only for ERRATA_2579 */
-	context->ptp_config.channel = kENET_PtpTimerChannel3;
-	context->ptp_config.ptp1588ClockSrc_Hz =
-					CONFIG_ETH_MCUX_PTP_CLOCK_SRC_HZ;
-	context->clk_ratio = 1.0;
-
-	ENET_Ptp1588SetChannelMode(context->base, kENET_PtpTimerChannel3,
-			kENET_PtpChannelPulseHighonCompare, true);
-	ENET_Ptp1588Configure(context->base, &context->enet_handle,
-			      &context->ptp_config);
-#endif
-
-#if defined(CONFIG_MDNS_RESPONDER) || defined(CONFIG_MDNS_RESOLVER)
-	ENET_AddMulticastGroup(context->base, mdns_multicast);
-#endif
-
-#if !defined(CONFIG_ETH_MCUX_NO_PHY_SMI)
-	ENET_SetSMI(context->base, sys_clock, false);
-#endif
-
-	/* handle PHY setup after SMI initialization */
-	eth_mcux_phy_setup(context);
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	/* Enable reclaim of tx descriptors that will have the tx timestamp */
-	ENET_SetTxReclaim(&context->enet_handle, true, 0);
-#endif
-
-	eth_mcux_phy_start(context);
-}
-
-static int eth_init(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-#if defined(CONFIG_PINCTRL)
-	int err;
-
-	err = pinctrl_apply_state(context->pincfg, PINCTRL_STATE_DEFAULT);
-	if (err) {
-		return err;
-	}
-#endif /* CONFIG_PINCTRL */
-
-#if defined(CONFIG_NET_POWER_MANAGEMENT)
-	const uint32_t inst = ENET_GetInstance(context->base);
-
-	context->clock = enet_clocks[inst];
-#endif
-
-#if defined(CONFIG_ETH_MCUX_PHY_RESET)
-	eth_phy_reset(dev);
-	eth_phy_init(dev);
-#endif
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	k_mutex_init(&context->ptp_mutex);
-	k_sem_init(&context->ptp_ts_sem, 0, 1);
-#endif
-	k_mutex_init(&context->rx_frame_buf_mutex);
-	k_mutex_init(&context->tx_frame_buf_mutex);
-
-	k_sem_init(&context->rx_thread_sem, 0, CONFIG_ETH_MCUX_RX_BUFFERS);
-	k_sem_init(&context->tx_buf_sem,
-		   CONFIG_ETH_MCUX_TX_BUFFERS, CONFIG_ETH_MCUX_TX_BUFFERS);
-	k_work_init(&context->phy_work, eth_mcux_phy_work);
-	k_work_init_delayable(&context->delayed_phy_work,
-			      eth_mcux_delayed_phy_work);
-
-	/* Start interruption-poll thread */
-	k_thread_create(&context->rx_thread, context->rx_thread_stack,
-			K_KERNEL_STACK_SIZEOF(context->rx_thread_stack),
-			eth_rx_thread, (void *) context, NULL, NULL,
-			K_PRIO_COOP(2),
-			0, K_NO_WAIT);
-	k_thread_name_set(&context->rx_thread, "mcux_eth_rx");
-	if (context->generate_mac) {
-		context->generate_mac(context->mac_addr);
-	}
-
-	eth_mcux_init(dev);
-
-	LOG_DBG("%s MAC %02x:%02x:%02x:%02x:%02x:%02x",
-		dev->name,
-		context->mac_addr[0], context->mac_addr[1],
-		context->mac_addr[2], context->mac_addr[3],
-		context->mac_addr[4], context->mac_addr[5]);
-
-	return 0;
-}
-
-static void eth_iface_init(struct net_if *iface)
-{
-	const struct device *dev = net_if_get_device(iface);
-	struct eth_context *context = dev->data;
-
-	net_if_set_link_addr(iface, context->mac_addr,
-			     sizeof(context->mac_addr),
-			     NET_LINK_ETHERNET);
-
-	if (context->iface == NULL) {
-		context->iface = iface;
-	}
-
-#if defined(CONFIG_NET_DSA)
-	dsa_register_master_tx(iface, &eth_tx);
-#endif
-	ethernet_init(iface);
-	net_if_carrier_off(iface);
-
-	context->config_func();
-}
-
-static enum ethernet_hw_caps eth_mcux_get_capabilities(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return ETHERNET_LINK_10BASE_T |
-		ETHERNET_HW_FILTERING |
-#if defined(CONFIG_NET_VLAN)
-		ETHERNET_HW_VLAN |
-#endif
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-		ETHERNET_PTP |
-#endif
-#if defined(CONFIG_NET_DSA)
-		ETHERNET_DSA_MASTER_PORT |
-#endif
-#if defined(CONFIG_ETH_MCUX_HW_ACCELERATION)
-		ETHERNET_HW_TX_CHKSUM_OFFLOAD |
-		ETHERNET_HW_RX_CHKSUM_OFFLOAD |
-#endif
-		ETHERNET_AUTO_NEGOTIATION_SET |
-		ETHERNET_LINK_100BASE_T;
-}
-
-static int eth_mcux_set_config(const struct device *dev,
-			       enum ethernet_config_type type,
-			       const struct ethernet_config *config)
-{
-	struct eth_context *context = dev->data;
-
-	switch (type) {
-	case ETHERNET_CONFIG_TYPE_MAC_ADDRESS:
-		memcpy(context->mac_addr,
-		       config->mac_address.addr,
-		       sizeof(context->mac_addr));
-		ENET_SetMacAddr(context->base, context->mac_addr);
-		net_if_set_link_addr(context->iface, context->mac_addr,
-				     sizeof(context->mac_addr),
-				     NET_LINK_ETHERNET);
-		LOG_DBG("%s MAC set to %02x:%02x:%02x:%02x:%02x:%02x",
-			dev->name,
-			context->mac_addr[0], context->mac_addr[1],
-			context->mac_addr[2], context->mac_addr[3],
-			context->mac_addr[4], context->mac_addr[5]);
-		return 0;
-	case ETHERNET_CONFIG_TYPE_FILTER:
-		/* The ENET driver does not modify the address buffer but the API is not const */
-		if (config->filter.set) {
-			ENET_AddMulticastGroup(context->base,
-					       (uint8_t *)config->filter.mac_address.addr);
-		} else {
-			ENET_LeaveMulticastGroup(context->base,
-						 (uint8_t *)config->filter.mac_address.addr);
-		}
-		return 0;
-	default:
-		break;
-	}
-
-	return -ENOTSUP;
-}
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-static const struct device *eth_mcux_get_ptp_clock(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-
-	return context->ptp_clock;
-}
-#endif
-
-static const struct ethernet_api api_funcs = {
-	.iface_api.init		= eth_iface_init,
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	.get_ptp_clock		= eth_mcux_get_ptp_clock,
-#endif
-	.get_capabilities	= eth_mcux_get_capabilities,
-	.set_config		= eth_mcux_set_config,
-#if defined(CONFIG_NET_DSA)
-	.send                   = dsa_tx,
-#else
-	.send			= eth_tx,
-#endif
-};
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-static void eth_mcux_ptp_isr(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-	unsigned int irq_lock_key = irq_lock();
-	enet_ptp_timer_channel_t channel;
-
-	/* clear channel */
-	for (channel = kENET_PtpTimerChannel1; channel <= kENET_PtpTimerChannel4; channel++) {
-		if (ENET_Ptp1588GetChannelStatus(context->base, channel)) {
-			ENET_Ptp1588ClearChannelStatus(context->base, channel);
-		}
-	}
-	ENET_TimeStampIRQHandler(context->base, &context->enet_handle);
-	irq_unlock(irq_lock_key);
-}
-#endif
-
-#if DT_INST_IRQ_HAS_NAME(0, common) || DT_INST_IRQ_HAS_NAME(1, common)
-static void eth_mcux_common_isr(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-	uint32_t EIR = ENET_GetInterruptStatus(context->base);
-	unsigned int irq_lock_key = irq_lock();
-
-	if (EIR & (kENET_RxBufferInterrupt | kENET_RxFrameInterrupt)) {
-		/* disable the IRQ for RX */
-		context->rx_irq_num++;
-#if FSL_FEATURE_ENET_QUEUE > 1
-		/* Only use ring 0 in this driver */
-		ENET_ReceiveIRQHandler(context->base, &context->enet_handle, 0);
-#else
-		ENET_ReceiveIRQHandler(context->base, &context->enet_handle);
-#endif
-		ENET_DisableInterrupts(context->base, kENET_RxFrameInterrupt |
-			kENET_RxBufferInterrupt);
-	}
-
-	if (EIR & kENET_TxFrameInterrupt) {
-#if FSL_FEATURE_ENET_QUEUE > 1
-		ENET_TransmitIRQHandler(context->base, &context->enet_handle, 0);
-#else
-		ENET_TransmitIRQHandler(context->base, &context->enet_handle);
-#endif
-	}
-
-	if (EIR | kENET_TxBufferInterrupt) {
-		ENET_ClearInterruptStatus(context->base, kENET_TxBufferInterrupt);
-		ENET_DisableInterrupts(context->base, kENET_TxBufferInterrupt);
-	}
-
-	if (EIR & ENET_EIR_MII_MASK) {
-		k_work_submit(&context->phy_work);
-		ENET_ClearInterruptStatus(context->base, kENET_MiiInterrupt);
-	}
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-	if (EIR & ENET_TS_INTERRUPT) {
-		ENET_TimeStampIRQHandler(context->base, &context->enet_handle);
-	}
-#endif
-	irq_unlock(irq_lock_key);
-}
-#endif
-
-#if DT_INST_IRQ_HAS_NAME(0, rx) || DT_INST_IRQ_HAS_NAME(1, rx)
-static void eth_mcux_rx_isr(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-
-	ENET_DisableInterrupts(context->base, kENET_RxFrameInterrupt | kENET_RxBufferInterrupt);
-	ENET_ReceiveIRQHandler(context->base, &context->enet_handle);
-}
-#endif
-
-#if DT_INST_IRQ_HAS_NAME(0, tx) || DT_INST_IRQ_HAS_NAME(1, tx)
-static void eth_mcux_tx_isr(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-#if FSL_FEATURE_ENET_QUEUE > 1
-	ENET_TransmitIRQHandler(context->base, &context->enet_handle, 0);
-#else
-	ENET_TransmitIRQHandler(context->base, &context->enet_handle);
-#endif
-}
-#endif
-
-#if DT_INST_IRQ_HAS_NAME(0, err) || DT_INST_IRQ_HAS_NAME(1, err)
-static void eth_mcux_err_isr(const struct device *dev)
-{
-	struct eth_context *context = dev->data;
-	uint32_t pending = ENET_GetInterruptStatus(context->base);
-
-	if (pending & ENET_EIR_MII_MASK) {
-		k_work_submit(&context->phy_work);
-		ENET_ClearInterruptStatus(context->base, kENET_MiiInterrupt);
-	}
-}
-#endif
-
-#if defined(CONFIG_SOC_SERIES_IMXRT10XX)
-#define ETH_MCUX_UNIQUE_ID	(OCOTP->CFG1 ^ OCOTP->CFG2)
-#elif defined(CONFIG_SOC_SERIES_IMXRT11XX)
-#define ETH_MCUX_UNIQUE_ID	(OCOTP->FUSEN[40].FUSE)
-#elif defined(CONFIG_SOC_SERIES_KINETIS_K6X)
-#define ETH_MCUX_UNIQUE_ID	(SIM->UIDH ^ SIM->UIDMH ^ SIM->UIDML ^ SIM->UIDL)
-#else
-#error "Unsupported SOC"
-#endif
-
-#define ETH_MCUX_NONE
-
-#define ETH_MCUX_IRQ_INIT(n, name)					\
-	do {								\
-		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(n, name, irq),		\
-			    DT_INST_IRQ_BY_NAME(n, name, priority),	\
-			    eth_mcux_##name##_isr,			\
-			    DEVICE_DT_INST_GET(n),			\
-			    0);						\
-		irq_enable(DT_INST_IRQ_BY_NAME(n, name, irq));		\
-	} while (false)
-
-#define ETH_MCUX_IRQ(n, name)						\
-	COND_CODE_1(DT_INST_IRQ_HAS_NAME(n, name),			\
-		    (ETH_MCUX_IRQ_INIT(n, name)),			\
-		    (ETH_MCUX_NONE))
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-#define PTP_INST_NODEID(n) DT_INST_CHILD(n, ptp)
-
-#define ETH_MCUX_IRQ_PTP_INIT(n)							\
-	do {										\
-		IRQ_CONNECT(DT_IRQ_BY_NAME(PTP_INST_NODEID(n), ieee1588_tmr, irq),	\
-			    DT_IRQ_BY_NAME(PTP_INST_NODEID(n), ieee1588_tmr, priority),	\
-			    eth_mcux_ptp_isr,						\
-			    DEVICE_DT_INST_GET(n),					\
-			    0);								\
-		irq_enable(DT_IRQ_BY_NAME(PTP_INST_NODEID(n), ieee1588_tmr, irq));	\
-	} while (false)
-
-#define ETH_MCUX_IRQ_PTP(n)						\
-	COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(PTP_INST_NODEID(n)),	\
-		    (ETH_MCUX_IRQ_PTP_INIT(n)),				\
-		    (ETH_MCUX_NONE))
-
-#define ETH_MCUX_PTP_FRAMEINFO_ARRAY(n)					\
-	static enet_frame_info_t					\
-		eth##n##_tx_frameinfo_array[CONFIG_ETH_MCUX_TX_BUFFERS];
-
-#define ETH_MCUX_PTP_FRAMEINFO(n)					\
-	.txFrameInfo = eth##n##_tx_frameinfo_array,
-#else
-#define ETH_MCUX_IRQ_PTP(n)
-
-#define ETH_MCUX_PTP_FRAMEINFO_ARRAY(n)
-
-#define ETH_MCUX_PTP_FRAMEINFO(n)					\
-	.txFrameInfo = NULL,
-#endif
-
-#define ETH_MCUX_GENERATE_MAC_RANDOM(n)					\
-	static void generate_eth##n##_mac(uint8_t *mac_addr)		\
-	{								\
-		gen_random_mac(mac_addr,				\
-			       FREESCALE_OUI_B0,			\
-			       FREESCALE_OUI_B1,			\
-			       FREESCALE_OUI_B2);			\
-	}
-
-#define ETH_MCUX_GENERATE_MAC_UNIQUE(n)					\
-	static void generate_eth##n##_mac(uint8_t *mac_addr)		\
-	{								\
-		uint32_t id = ETH_MCUX_UNIQUE_ID;			\
-									\
-		mac_addr[0] = FREESCALE_OUI_B0;				\
-		mac_addr[0] |= 0x02; /* force LAA bit */		\
-		mac_addr[1] = FREESCALE_OUI_B1;				\
-		mac_addr[2] = FREESCALE_OUI_B2;				\
-		mac_addr[3] = id >> 8;					\
-		mac_addr[4] = id >> 16;					\
-		mac_addr[5] = id >> 0;					\
-		mac_addr[5] += n;					\
-	}
-
-#define ETH_MCUX_GENERATE_MAC(n)					\
-	COND_CODE_1(DT_INST_PROP(n, zephyr_random_mac_address),		\
-		    (ETH_MCUX_GENERATE_MAC_RANDOM(n)),			\
-		    (ETH_MCUX_GENERATE_MAC_UNIQUE(n)))
-
-#define ETH_MCUX_MAC_ADDR_LOCAL(n)					\
-	.mac_addr = DT_INST_PROP(n, local_mac_address),			\
-	.generate_mac = NULL,
-
-#define ETH_MCUX_MAC_ADDR_GENERATE(n)					\
-	.mac_addr = {0},						\
-	.generate_mac = generate_eth##n##_mac,
-
-#define ETH_MCUX_MAC_ADDR(n)						\
-	COND_CODE_1(ETH_MCUX_MAC_ADDR_TO_BOOL(n),			\
-		    (ETH_MCUX_MAC_ADDR_LOCAL(n)),			\
-		    (ETH_MCUX_MAC_ADDR_GENERATE(n)))
-
-#ifdef CONFIG_SOC_FAMILY_KINETIS
-#define ETH_MCUX_POWER_INIT(n)						\
-	.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),		\
-
-#define ETH_MCUX_POWER(n)						\
-	COND_CODE_1(CONFIG_NET_POWER_MANAGEMENT,			\
-		    (ETH_MCUX_POWER_INIT(n)),				\
-		    (ETH_MCUX_NONE))
-#define ETH_MCUX_PM_DEVICE_INIT(n)					\
-	PM_DEVICE_DT_INST_DEFINE(n, eth_mcux_device_pm_action);
-#define ETH_MCUX_PM_DEVICE_GET(n) PM_DEVICE_DT_INST_GET(n)
-#else
-#define ETH_MCUX_POWER(n)
-#define ETH_MCUX_PM_DEVICE_INIT(n)
-#define ETH_MCUX_PM_DEVICE_GET(n) NULL
-#endif /* CONFIG_SOC_FAMILY_KINETIS */
-
-#define ETH_MCUX_GEN_MAC(n)                                             \
-	COND_CODE_0(ETH_MCUX_MAC_ADDR_TO_BOOL(n),                       \
-		    (ETH_MCUX_GENERATE_MAC(n)),                         \
-		    (ETH_MCUX_NONE))
-
-/*
- * In the below code we explicitly define
- * ETH_MCUX_MAC_ADDR_TO_BOOL_0 for the '0' instance of enet driver.
- *
- * For instance N one shall add definition for ETH_MCUX_MAC_ADDR_TO_BOOL_N
- */
-#if (NODE_HAS_VALID_MAC_ADDR(DT_DRV_INST(0))) == 0
-#define ETH_MCUX_MAC_ADDR_TO_BOOL_0 0
-#else
-#define ETH_MCUX_MAC_ADDR_TO_BOOL_0 1
-#endif
-#define ETH_MCUX_MAC_ADDR_TO_BOOL(n) ETH_MCUX_MAC_ADDR_TO_BOOL_##n
-
-#if defined(CONFIG_PINCTRL)
-#define ETH_MCUX_PINCTRL_DEFINE(n) PINCTRL_DT_INST_DEFINE(n);
-#define ETH_MCUX_PINCTRL_INIT(n) .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),
-#else
-#define ETH_MCUX_PINCTRL_DEFINE(n)
-#define ETH_MCUX_PINCTRL_INIT(n)
-#endif
-
-#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) && \
-	CONFIG_ETH_MCUX_USE_DTCM_FOR_DMA_BUFFER
-/* Use DTCM for hardware DMA buffers */
-#define _mcux_dma_desc __dtcm_bss_section
-#define _mcux_dma_buffer __dtcm_noinit_section
-#define _mcux_driver_buffer __dtcm_noinit_section
-#elif defined(CONFIG_NOCACHE_MEMORY)
-#define _mcux_dma_desc __nocache
-#define _mcux_dma_buffer __nocache
-#define _mcux_driver_buffer
-#else
-#define _mcux_dma_desc
-#define _mcux_dma_buffer
-#define _mcux_driver_buffer
-#endif
-
-#if defined(CONFIG_ETH_MCUX_PHY_RESET)
-#define ETH_MCUX_PHY_GPIOS(n)						\
-	.int_gpio = GPIO_DT_SPEC_INST_GET(n, int_gpios),		\
-	.reset_gpio = GPIO_DT_SPEC_INST_GET(n, reset_gpios),
-#else
-#define ETH_MCUX_PHY_GPIOS(n)
-#endif
-
-#define ETH_MCUX_INIT(n)						\
-	ETH_MCUX_GEN_MAC(n)                                             \
-									\
-	ETH_MCUX_PINCTRL_DEFINE(n)					\
-									\
-	static void eth##n##_config_func(void);				\
-	static _mcux_driver_buffer uint8_t				\
-		tx_enet_frame_##n##_buf[NET_ETH_MAX_FRAME_SIZE];	\
-	static _mcux_driver_buffer uint8_t				\
-		rx_enet_frame_##n##_buf[NET_ETH_MAX_FRAME_SIZE];	\
-	static status_t _MDIO_Write(uint8_t phyAddr, uint8_t regAddr, uint16_t data) \
-	{								\
-		return ENET_MDIOWrite((ENET_Type *)DT_INST_REG_ADDR(n), phyAddr, regAddr, data);\
-	};								\
-									\
-	static status_t _MDIO_Read(uint8_t phyAddr, uint8_t regAddr, uint16_t *pData) \
-	{  \
-		return ENET_MDIORead((ENET_Type *)DT_INST_REG_ADDR(n), phyAddr, regAddr, pData); \
-	}; \
-									\
-	static struct _phy_resource eth##n##_phy_resource = {		\
-		.read = _MDIO_Read,					\
-		.write = _MDIO_Write					\
-	};								\
-	static phy_handle_t eth##n##_phy_handle = {			\
-		.resource = (void *)&eth##n##_phy_resource		\
-	};								\
-	static struct _phy_resource eth##n##_phy_config;		\
-									\
-	static struct eth_context eth##n##_context = {			\
-		.base = (ENET_Type *)DT_INST_REG_ADDR(n),		\
-		.config_func = eth##n##_config_func,			\
-		.phy_config = &eth##n##_phy_config,			\
-		.phy_addr = DT_INST_PROP(n, phy_addr),		        \
-		.phy_duplex = kPHY_FullDuplex,				\
-		.phy_speed = kPHY_Speed100M,				\
-		.phy_handle = &eth##n##_phy_handle,			\
-		.tx_frame_buf = tx_enet_frame_##n##_buf,		\
-		.rx_frame_buf = rx_enet_frame_##n##_buf,		\
-		ETH_MCUX_PINCTRL_INIT(n)				\
-		ETH_MCUX_PHY_GPIOS(n)					\
-		ETH_MCUX_MAC_ADDR(n)					\
-		ETH_MCUX_POWER(n)					\
-	};								\
-									\
-	static __aligned(ENET_BUFF_ALIGNMENT)				\
-		_mcux_dma_desc						\
-		enet_rx_bd_struct_t					\
-		eth##n##_rx_buffer_desc[CONFIG_ETH_MCUX_RX_BUFFERS];	\
-									\
-	static __aligned(ENET_BUFF_ALIGNMENT)				\
-		_mcux_dma_desc						\
-		enet_tx_bd_struct_t					\
-		eth##n##_tx_buffer_desc[CONFIG_ETH_MCUX_TX_BUFFERS];	\
-									\
-	static uint8_t __aligned(ENET_BUFF_ALIGNMENT)			\
-		_mcux_dma_buffer					\
-		eth##n##_rx_buffer[CONFIG_ETH_MCUX_RX_BUFFERS]		\
-				  [ETH_MCUX_BUFFER_SIZE];		\
-									\
-	static uint8_t __aligned(ENET_BUFF_ALIGNMENT)			\
-		_mcux_dma_buffer					\
-		eth##n##_tx_buffer[CONFIG_ETH_MCUX_TX_BUFFERS]		\
-				  [ETH_MCUX_BUFFER_SIZE];		\
-									\
-	ETH_MCUX_PTP_FRAMEINFO_ARRAY(n)					\
-									\
-	static const enet_buffer_config_t eth##n##_buffer_config = {	\
-		.rxBdNumber = CONFIG_ETH_MCUX_RX_BUFFERS,		\
-		.txBdNumber = CONFIG_ETH_MCUX_TX_BUFFERS,		\
-		.rxBuffSizeAlign = ETH_MCUX_BUFFER_SIZE,		\
-		.txBuffSizeAlign = ETH_MCUX_BUFFER_SIZE,		\
-		.rxBdStartAddrAlign = eth##n##_rx_buffer_desc,		\
-		.txBdStartAddrAlign = eth##n##_tx_buffer_desc,		\
-		.rxBufferAlign = eth##n##_rx_buffer[0],			\
-		.txBufferAlign = eth##n##_tx_buffer[0],			\
-		.rxMaintainEnable = true,				\
-		.txMaintainEnable = true,				\
-		ETH_MCUX_PTP_FRAMEINFO(n)				\
-	};								\
-									\
-	ETH_MCUX_PM_DEVICE_INIT(n)					\
-									\
-	ETH_NET_DEVICE_DT_INST_DEFINE(n,				\
-			    eth_init,					\
-			    ETH_MCUX_PM_DEVICE_GET(n),			\
-			    &eth##n##_context,				\
-			    &eth##n##_buffer_config,			\
-			    CONFIG_ETH_INIT_PRIORITY,			\
-			    &api_funcs,					\
-			    NET_ETH_MTU);				\
-									\
-	static void eth##n##_config_func(void)				\
-	{								\
-		ETH_MCUX_IRQ(n, rx);					\
-		ETH_MCUX_IRQ(n, tx);					\
-		ETH_MCUX_IRQ(n, err);					\
-		ETH_MCUX_IRQ(n, common);				\
-		ETH_MCUX_IRQ_PTP(n);					\
-	}								\
-
-DT_INST_FOREACH_STATUS_OKAY(ETH_MCUX_INIT)
-
-#if defined(CONFIG_PTP_CLOCK_MCUX)
-struct ptp_context {
-	struct eth_context *eth_context;
-#if defined(CONFIG_PINCTRL)
-	const struct pinctrl_dev_config *pincfg;
-#endif /* CONFIG_PINCTRL */
-};
-
-#if defined(CONFIG_PINCTRL)
-#define ETH_MCUX_PTP_PINCTRL_DEFINE(n) PINCTRL_DT_DEFINE(n);
-#define ETH_MCUX_PTP_PINCTRL_INIT(n) .pincfg = PINCTRL_DT_DEV_CONFIG_GET(n),
-#else
-#define ETH_MCUX_PTP_PINCTRL_DEFINE(n)
-#define ETH_MCUX_PTP_PINCTRL_INIT(n)
-#endif /* CONFIG_PINCTRL */
-
-ETH_MCUX_PTP_PINCTRL_DEFINE(DT_NODELABEL(ptp))
-
-static struct ptp_context ptp_mcux_0_context = {
-	ETH_MCUX_PTP_PINCTRL_INIT(DT_NODELABEL(ptp))
-};
-
-static int ptp_clock_mcux_set(const struct device *dev,
-			      struct net_ptp_time *tm)
-{
-	struct ptp_context *ptp_context = dev->data;
-	struct eth_context *context = ptp_context->eth_context;
-	enet_ptp_time_t enet_time;
-
-	enet_time.second = tm->second;
-	enet_time.nanosecond = tm->nanosecond;
-
-	ENET_Ptp1588SetTimer(context->base, &context->enet_handle, &enet_time);
-	return 0;
-}
-
-static int ptp_clock_mcux_get(const struct device *dev,
-			      struct net_ptp_time *tm)
-{
-	struct ptp_context *ptp_context = dev->data;
-	struct eth_context *context = ptp_context->eth_context;
-	enet_ptp_time_t enet_time;
-
-	ENET_Ptp1588GetTimer(context->base, &context->enet_handle, &enet_time);
-
-	tm->second = enet_time.second;
-	tm->nanosecond = enet_time.nanosecond;
-	return 0;
-}
-
-static int ptp_clock_mcux_adjust(const struct device *dev, int increment)
-{
-	struct ptp_context *ptp_context = dev->data;
-	struct eth_context *context = ptp_context->eth_context;
-	int key, ret;
-
-	ARG_UNUSED(dev);
-
-	if ((increment <= (int32_t)(-NSEC_PER_SEC)) ||
-			(increment >= (int32_t)NSEC_PER_SEC)) {
-		ret = -EINVAL;
-	} else {
-		key = irq_lock();
-		if (context->base->ATPER != NSEC_PER_SEC) {
-			ret = -EBUSY;
-		} else {
-			/* Seconds counter is handled by software. Change the
-			 * period of one software second to adjust the clock.
-			 */
-			context->base->ATPER = NSEC_PER_SEC - increment;
-			ret = 0;
-		}
-		irq_unlock(key);
-	}
-
-	return ret;
-}
-
-static int ptp_clock_mcux_rate_adjust(const struct device *dev, double ratio)
-{
-	const int hw_inc = NSEC_PER_SEC / CONFIG_ETH_MCUX_PTP_CLOCK_SRC_HZ;
-	struct ptp_context *ptp_context = dev->data;
-	struct eth_context *context = ptp_context->eth_context;
-	int corr;
-	int32_t mul;
-	double val;
-
-	/* No change needed. */
-	if ((ratio > 1.0 && ratio - 1.0 < 0.00000001) ||
-	   (ratio < 1.0 && 1.0 - ratio < 0.00000001)) {
-		return 0;
-	}
-
-	ratio *= context->clk_ratio;
-
-	/* Limit possible ratio. */
-	if ((ratio > 1.0 + 1.0/(2 * hw_inc)) ||
-			(ratio < 1.0 - 1.0/(2 * hw_inc))) {
-		return -EINVAL;
-	}
-
-	/* Save new ratio. */
-	context->clk_ratio = ratio;
-
-	if (ratio < 1.0) {
-		corr = hw_inc - 1;
-		val = 1.0 / (hw_inc * (1.0 - ratio));
-	} else if (ratio > 1.0) {
-		corr = hw_inc + 1;
-		val = 1.0 / (hw_inc * (ratio - 1.0));
-	} else {
-		val = 0;
-		corr = hw_inc;
-	}
-
-	if (val >= INT32_MAX) {
-		/* Value is too high.
-		 * It is not possible to adjust the rate of the clock.
-		 */
-		mul = 0;
-	} else {
-		mul = val;
-	}
-	k_mutex_lock(&context->ptp_mutex, K_FOREVER);
-	ENET_Ptp1588AdjustTimer(context->base, corr, mul);
-	k_mutex_unlock(&context->ptp_mutex);
-
-	return 0;
-}
-
-static DEVICE_API(ptp_clock, api) = {
-	.set = ptp_clock_mcux_set,
-	.get = ptp_clock_mcux_get,
-	.adjust = ptp_clock_mcux_adjust,
-	.rate_adjust = ptp_clock_mcux_rate_adjust,
-};
-
-static int ptp_mcux_init(const struct device *port)
-{
-	const struct device *const eth_dev = DEVICE_DT_GET(DT_NODELABEL(enet));
-	struct eth_context *context = eth_dev->data;
-	struct ptp_context *ptp_context = port->data;
-#if defined(CONFIG_PINCTRL)
-	int err;
-
-	err = pinctrl_apply_state(ptp_context->pincfg, PINCTRL_STATE_DEFAULT);
-	if (err) {
-		return err;
-	}
-#endif /* CONFIG_PINCTRL */
-
-	context->ptp_clock = port;
-	ptp_context->eth_context = context;
-
-	return 0;
-}
-
-DEVICE_DEFINE(mcux_ptp_clock_0, PTP_CLOCK_NAME, ptp_mcux_init,
-		NULL, &ptp_mcux_0_context, NULL, POST_KERNEL,
-		CONFIG_ETH_MCUX_PTP_CLOCK_INIT_PRIO, &api);
-
-#endif /* CONFIG_PTP_CLOCK_MCUX */
diff --git a/drivers/ethernet/nxp_imx_netc/dsa_nxp_imx_netc.c b/drivers/ethernet/nxp_imx_netc/dsa_nxp_imx_netc.c
index 9dd68d97865ff..a1cda7cc7c16e 100644
--- a/drivers/ethernet/nxp_imx_netc/dsa_nxp_imx_netc.c
+++ b/drivers/ethernet/nxp_imx_netc/dsa_nxp_imx_netc.c
@@ -256,8 +256,8 @@ static struct dsa_api dsa_netc_api = {
 		.pseudo_mac = DT_ENUM_HAS_VALUE(slave, phy_connection_type, internal),             \
 		.pincfg = PINCTRL_DT_DEV_CONFIG_GET(slave),                                        \
 		.port_idx = DT_REG_ADDR_BY_IDX(slave, 0),                                          \
-		.ethernet_connection = (COND_CODE_1(DT_INST_NODE_HAS_PROP(slave, ethernet),        \
-					(DEVICE_DT_GET(DT_INST_PHANDLE(slave, ethernet))), NULL)), \
+		.ethernet_connection = (COND_CODE_1(DT_NODE_HAS_PROP(slave, ethernet),             \
+					(DEVICE_DT_GET(DT_PHANDLE(slave, ethernet))), NULL)),      \
 	};                                                                                         \
 	NET_DEVICE_INIT_INSTANCE(                                                                  \
 		CONCAT(dsa_slave_port_, slave),                                                    \
diff --git a/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc_priv.h b/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc_priv.h
index 2f28e1c0bf42d..61440efce58b1 100644
--- a/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc_priv.h
+++ b/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc_priv.h
@@ -29,12 +29,20 @@
 /* MSGINTR */
 #define NETC_MSGINTR_CHANNEL 0
 
+#if DT_IRQ_HAS_IDX(DT_NODELABEL(netc), 0)
+#define NETC_MSGINTR_IRQ DT_IRQN_BY_IDX(DT_NODELABEL(netc), 0)
+#endif
+
 #if (CONFIG_ETH_NXP_IMX_MSGINTR == 1)
-#define NETC_MSGINTR     MSGINTR1
+#define NETC_MSGINTR MSGINTR1
+#ifndef NETC_MSGINTR_IRQ
 #define NETC_MSGINTR_IRQ MSGINTR1_IRQn
+#endif
 #elif (CONFIG_ETH_NXP_IMX_MSGINTR == 2)
-#define NETC_MSGINTR     MSGINTR2
+#define NETC_MSGINTR MSGINTR2
+#ifndef NETC_MSGINTR_IRQ
 #define NETC_MSGINTR_IRQ MSGINTR2_IRQn
+#endif
 #else
 #error "Current CONFIG_ETH_NXP_IMX_MSGINTR not support"
 #endif
diff --git a/drivers/ethernet/phy/CMakeLists.txt b/drivers/ethernet/phy/CMakeLists.txt
index 40964bf8d6b85..34d769eca6c56 100644
--- a/drivers/ethernet/phy/CMakeLists.txt
+++ b/drivers/ethernet/phy/CMakeLists.txt
@@ -1,13 +1,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library_sources_ifdef(CONFIG_PHY_GENERIC_MII	phy_mii.c)
+
+# zephyr-keep-sorted-start
 zephyr_library_sources_ifdef(CONFIG_PHY_ADIN2111	phy_adin2111.c)
 zephyr_library_sources_ifdef(CONFIG_PHY_DM8806	phy_dm8806.c)
-zephyr_library_sources_ifdef(CONFIG_PHY_TJA1103	        phy_tja1103.c)
 zephyr_library_sources_ifdef(CONFIG_PHY_MICROCHIP_KSZ8081	phy_microchip_ksz8081.c)
+zephyr_library_sources_ifdef(CONFIG_PHY_MICROCHIP_T1S phy_microchip_t1s.c)
 zephyr_library_sources_ifdef(CONFIG_PHY_MICROCHIP_VSC8541 phy_microchip_vsc8541.c)
-zephyr_library_sources_ifdef(CONFIG_PHY_TI_DP83825  phy_ti_dp83825.c)
-zephyr_library_sources_ifdef(CONFIG_PHY_REALTEK_RTL8211F phy_realtek_rtl8211f.c)
-zephyr_library_sources_ifdef(CONFIG_PHY_QUALCOMM_AR8031 phy_qualcomm_ar8031.c)
 zephyr_library_sources_ifdef(CONFIG_PHY_OA_TC14_PLCA_LIB phy_oa_tc14_plca.c)
-zephyr_library_sources_ifdef(CONFIG_PHY_MICROCHIP_T1S phy_microchip_t1s.c)
+zephyr_library_sources_ifdef(CONFIG_PHY_QUALCOMM_AR8031 phy_qualcomm_ar8031.c)
+zephyr_library_sources_ifdef(CONFIG_PHY_REALTEK_RTL8211F phy_realtek_rtl8211f.c)
+zephyr_library_sources_ifdef(CONFIG_PHY_TI_DP83825  phy_ti_dp83825.c)
+zephyr_library_sources_ifdef(CONFIG_PHY_TI_DP83867  phy_ti_dp83867.c)
+zephyr_library_sources_ifdef(CONFIG_PHY_TJA1103	        phy_tja1103.c)
+# zephyr-keep-sorted-stop
diff --git a/drivers/ethernet/phy/Kconfig b/drivers/ethernet/phy/Kconfig
index 2d2779c5f2d9f..c9d0c61baa227 100644
--- a/drivers/ethernet/phy/Kconfig
+++ b/drivers/ethernet/phy/Kconfig
@@ -69,6 +69,15 @@ config PHY_TI_DP83825
 	help
 	  Enable TI DP83825 Ethernet PHY Driver
 
+config PHY_TI_DP83867
+	bool "TI DP83867 PHY Driver"
+	default y
+	depends on DT_HAS_TI_DP83867_ENABLED
+	depends on MDIO
+	depends on GPIO
+	help
+	  Enable TI DP83867 Ethernet PHY Driver
+
 config PHY_REALTEK_RTL8211F
 	bool "Realtek RTL8211F PHY Driver"
 	default y
diff --git a/drivers/ethernet/phy/phy_adin2111.c b/drivers/ethernet/phy/phy_adin2111.c
index 5f762ce691964..1b7a042d9d448 100644
--- a/drivers/ethernet/phy/phy_adin2111.c
+++ b/drivers/ethernet/phy/phy_adin2111.c
@@ -5,20 +5,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(DT_DRV_COMPAT, CONFIG_PHY_LOG_LEVEL);
-
 #include <errno.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/net/phy.h>
-#include <zephyr/net/mii.h>
-#include <zephyr/net/mdio.h>
 #include <zephyr/drivers/mdio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net/mdio.h>
+#include <zephyr/net/mii.h>
+#include <zephyr/net/phy.h>
+#include <zephyr/sys/util.h>
+#include "phy_adin2111_priv.h"
+
+LOG_MODULE_REGISTER(phy_adin, CONFIG_PHY_LOG_LEVEL);
 
 /* PHYs out of reset check retry delay */
 #define ADIN2111_PHY_AWAIT_DELAY_POLL_US			15U
diff --git a/drivers/ethernet/phy/phy_dm8806.c b/drivers/ethernet/phy/phy_dm8806.c
index 976d882c005cf..34f09bb975f88 100644
--- a/drivers/ethernet/phy/phy_dm8806.c
+++ b/drivers/ethernet/phy/phy_dm8806.c
@@ -673,9 +673,9 @@ static DEVICE_API(ethphy, phy_dm8806_api) = {
 	static const struct phy_dm8806_config phy_dm8806_config_##n = {                            \
 		.mdio = DEVICE_DT_GET(DT_INST_BUS(n)),                                             \
 		.phy_addr = DT_INST_REG_ADDR(n),                                                   \
-		.switch_addr = DT_PROP(DT_NODELABEL(dm8806_phy##n), reg_switch),                   \
-		.gpio_int = GPIO_DT_SPEC_INST_GET(n, interrupt_gpio),                              \
-		.gpio_rst = GPIO_DT_SPEC_INST_GET(n, reset_gpio),                                  \
+		.switch_addr = DT_INST_PROP(n, reg_switch),                                        \
+		.gpio_int = GPIO_DT_SPEC_INST_GET(n, int_gpios),                                   \
+		.gpio_rst = GPIO_DT_SPEC_INST_GET(n, reset_gpios),                                 \
 	}
 
 #define DM8806_PHY_INITIALIZE(n)                                                                   \
diff --git a/drivers/ethernet/phy/phy_mii.c b/drivers/ethernet/phy/phy_mii.c
index a19eb252bb117..b2abf474d9e14 100644
--- a/drivers/ethernet/phy/phy_mii.c
+++ b/drivers/ethernet/phy/phy_mii.c
@@ -31,9 +31,11 @@ struct phy_mii_dev_data {
 	phy_callback_t cb;
 	void *cb_data;
 	struct k_work_delayable monitor_work;
+	struct k_work_delayable autoneg_work;
 	struct phy_link_state state;
 	struct k_sem sem;
 	bool gigabit_supported;
+	uint32_t autoneg_timeout;
 };
 
 /* Offset to align capabilities bits of 1000BASE-T Control and Status regs */
@@ -41,6 +43,9 @@ struct phy_mii_dev_data {
 
 #define MII_INVALID_PHY_ID UINT32_MAX
 
+/* How often to poll auto-negotiation status while waiting for it to complete */
+#define MII_AUTONEG_POLL_INTERVAL_MS 100
+
 static int phy_mii_get_link_state(const struct device *dev,
 				  struct phy_link_state *state);
 
@@ -50,9 +55,14 @@ static inline int phy_mii_reg_read(const struct device *dev, uint16_t reg_addr,
 	const struct phy_mii_dev_config *const cfg = dev->config;
 
 	/* if there is no mdio (fixed-link) it is not supported to read */
-	if (cfg->mdio == NULL) {
+	if (cfg->fixed) {
 		return -ENOTSUP;
 	}
+
+	if (cfg->mdio == NULL) {
+		return -ENODEV;
+	}
+
 	return mdio_read(cfg->mdio, cfg->phy_addr, reg_addr, value);
 }
 
@@ -62,9 +72,14 @@ static inline int phy_mii_reg_write(const struct device *dev, uint16_t reg_addr,
 	const struct phy_mii_dev_config *const cfg = dev->config;
 
 	/* if there is no mdio (fixed-link) it is not supported to write */
-	if (cfg->mdio == NULL) {
+	if (cfg->fixed) {
 		return -ENOTSUP;
 	}
+
+	if (cfg->mdio == NULL) {
+		return -ENODEV;
+	}
+
 	return mdio_write(cfg->mdio, cfg->phy_addr, reg_addr, value);
 }
 
@@ -145,13 +160,8 @@ static int update_link_state(const struct device *dev)
 	struct phy_mii_dev_data *const data = dev->data;
 	bool link_up;
 
-	uint16_t anar_reg = 0;
 	uint16_t bmcr_reg = 0;
 	uint16_t bmsr_reg = 0;
-	uint16_t anlpar_reg = 0;
-	uint16_t c1kt_reg = 0;
-	uint16_t s1kt_reg = 0;
-	uint32_t timeout = CONFIG_PHY_AUTONEG_TIMEOUT_MS / 100;
 
 	if (phy_mii_reg_read(dev, MII_BMSR, &bmsr_reg) < 0) {
 		return -EIO;
@@ -178,11 +188,6 @@ static int update_link_state(const struct device *dev)
 	LOG_DBG("PHY (%d) Starting MII PHY auto-negotiate sequence",
 		cfg->phy_addr);
 
-	/* Read PHY default advertising parameters */
-	if (phy_mii_reg_read(dev, MII_ANAR, &anar_reg) < 0) {
-		return -EIO;
-	}
-
 	/* Configure and start auto-negotiation process */
 	if (phy_mii_reg_read(dev, MII_BMCR, &bmcr_reg) < 0) {
 		return -EIO;
@@ -195,15 +200,21 @@ static int update_link_state(const struct device *dev)
 		return -EIO;
 	}
 
-	/* Wait for the auto-negotiation process to complete */
-	do {
-		if (timeout-- == 0U) {
-			LOG_DBG("PHY (%d) auto-negotiate timedout",
-				cfg->phy_addr);
-			return -ETIMEDOUT;
-		}
+	/* We have to wait for the auto-negotiation process to complete */
+	data->autoneg_timeout = CONFIG_PHY_AUTONEG_TIMEOUT_MS / MII_AUTONEG_POLL_INTERVAL_MS;
+	return -EINPROGRESS;
+}
+
+static int check_autonegotiation_completion(const struct device *dev)
+{
+	const struct phy_mii_dev_config *const cfg = dev->config;
+	struct phy_mii_dev_data *const data = dev->data;
 
-		k_sleep(K_MSEC(100));
+	uint16_t anar_reg = 0;
+	uint16_t bmsr_reg = 0;
+	uint16_t anlpar_reg = 0;
+	uint16_t c1kt_reg = 0;
+	uint16_t s1kt_reg = 0;
 
 		/* On some PHY chips, the BMSR bits are latched, so the first read may
 		 * show incorrect status. A second read ensures correct values.
@@ -216,11 +227,23 @@ static int update_link_state(const struct device *dev)
 		if (phy_mii_reg_read(dev, MII_BMSR, &bmsr_reg) < 0) {
 			return -EIO;
 		}
-	} while (!(bmsr_reg & MII_BMSR_AUTONEG_COMPLETE));
+
+	if (!(bmsr_reg & MII_BMSR_AUTONEG_COMPLETE)) {
+		if (data->autoneg_timeout-- == 0U) {
+			LOG_DBG("PHY (%d) auto-negotiate timedout", cfg->phy_addr);
+			return -ETIMEDOUT;
+		}
+		return -EINPROGRESS;
+	}
 
 	LOG_DBG("PHY (%d) auto-negotiate sequence completed",
 		cfg->phy_addr);
 
+	/* Read PHY default advertising parameters */
+	if (phy_mii_reg_read(dev, MII_ANAR, &anar_reg) < 0) {
+		return -EIO;
+	}
+
 	/** Read peer device capability */
 	if (phy_mii_reg_read(dev, MII_ANLPAR, &anlpar_reg) < 0) {
 		return -EIO;
@@ -283,7 +306,12 @@ static void monitor_work_handler(struct k_work *work)
 	const struct device *dev = data->dev;
 	int rc;
 
-	k_sem_take(&data->sem, K_FOREVER);
+	if (k_sem_take(&data->sem, K_NO_WAIT) != 0) {
+		/* Try again soon */
+		k_work_reschedule(&data->monitor_work,
+				  K_MSEC(MII_AUTONEG_POLL_INTERVAL_MS));
+		return;
+	}
 
 	rc = update_link_state(dev);
 
@@ -294,9 +322,49 @@ static void monitor_work_handler(struct k_work *work)
 		invoke_link_cb(dev);
 	}
 
-	/* Submit delayed work */
-	k_work_reschedule(&data->monitor_work,
-			  K_MSEC(CONFIG_PHY_MONITOR_PERIOD));
+	if (rc == -EINPROGRESS) {
+		/* Check for autonegotiation completion */
+		k_work_reschedule(&data->autoneg_work,
+				  K_MSEC(MII_AUTONEG_POLL_INTERVAL_MS));
+	} else {
+		/* Submit delayed work */
+		k_work_reschedule(&data->monitor_work, K_MSEC(CONFIG_PHY_MONITOR_PERIOD));
+	}
+}
+
+static void autoneg_work_handler(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct phy_mii_dev_data *const data =
+		CONTAINER_OF(dwork, struct phy_mii_dev_data, autoneg_work);
+	const struct device *dev = data->dev;
+	int rc;
+
+	if (k_sem_take(&data->sem, K_NO_WAIT) != 0) {
+		/* Try again soon */
+		k_work_reschedule(&data->autoneg_work,
+				  K_MSEC(MII_AUTONEG_POLL_INTERVAL_MS));
+		return;
+	}
+
+	rc = check_autonegotiation_completion(dev);
+
+	k_sem_give(&data->sem);
+
+	/* If link state has changed and a callback is set, invoke callback */
+	if (rc == 0) {
+		invoke_link_cb(dev);
+	}
+
+	if (rc == -EINPROGRESS) {
+		/* Check again soon */
+		k_work_reschedule(&data->autoneg_work,
+				  K_MSEC(MII_AUTONEG_POLL_INTERVAL_MS));
+	} else {
+		/* Schedule the next monitoring call */
+		k_work_reschedule(&data->monitor_work,
+				  K_MSEC(CONFIG_PHY_MONITOR_PERIOD));
+	}
 }
 
 static int phy_mii_read(const struct device *dev, uint16_t reg_addr,
@@ -315,10 +383,20 @@ static int phy_mii_cfg_link(const struct device *dev,
 			    enum phy_link_speed adv_speeds)
 {
 	struct phy_mii_dev_data *const data = dev->data;
+	const struct phy_mii_dev_config *const cfg = dev->config;
 	uint16_t anar_reg;
 	uint16_t bmcr_reg;
 	uint16_t c1kt_reg;
 
+	/* if there is no mdio (fixed-link) it is not supported to configure link */
+	if (cfg->fixed) {
+		return -ENOTSUP;
+	}
+
+	if (cfg->mdio == NULL) {
+		return -ENODEV;
+	}
+
 	if (phy_mii_reg_read(dev, MII_ANAR, &anar_reg) < 0) {
 		return -EIO;
 	}
@@ -479,6 +557,8 @@ static int phy_mii_initialize(const struct device *dev)
 
 		k_work_init_delayable(&data->monitor_work,
 					monitor_work_handler);
+		k_work_init_delayable(&data->autoneg_work,
+					autoneg_work_handler);
 
 		monitor_work_handler(&data->monitor_work.work);
 	}
diff --git a/drivers/ethernet/phy/phy_ti_dp83867.c b/drivers/ethernet/phy/phy_ti_dp83867.c
new file mode 100644
index 0000000000000..84b3b4d14d93b
--- /dev/null
+++ b/drivers/ethernet/phy/phy_ti_dp83867.c
@@ -0,0 +1,558 @@
+/*
+ * Copyright 2024, PHYTEC America, LLC
+ * Author: Florijan Plohl <florijan.plohl@norik.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_dp83867
+
+#include <zephyr/kernel.h>
+#include <zephyr/net/phy.h>
+#include <zephyr/net/mii.h>
+#include <zephyr/drivers/mdio.h>
+#include <string.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/drivers/gpio.h>
+
+#define LOG_MODULE_NAME phy_ti_dp83867
+#define LOG_LEVEL       CONFIG_PHY_LOG_LEVEL
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL);
+
+#define PHY_TI_DP83867_PHYSTS                 0x11
+#define PHY_TI_DP83867_PHYSTS_LINKSTATUS_MASK BIT(10)
+#define PHY_TI_DP83867_PHYSTS_LINKDUPLEX_MASK BIT(13)
+#define PHY_TI_DP83867_PHYSTS_LINKSPEED_MASK  (BIT(14) | BIT(15))
+#define PHY_TI_DP83867_PHYSTS_LINKSPEED_SHIFT (14U)
+
+#define PHY_TI_DP83867_PHYSTS_LINKSPEED_10M   (0U)
+#define PHY_TI_DP83867_PHYSTS_LINKSPEED_100M  (1U)
+#define PHY_TI_DP83867_PHYSTS_LINKSPEED_1000M (2U)
+
+#define PHY_TI_DP83867_RESET_PULSE_WIDTH 1
+#define PHY_TI_DP83867_POR_DELAY         200
+
+#define PHY_TI_DP83867_MICR                    0x0012
+#define PHY_TI_DP83867_ISR                     0x0013
+#define PHY_TI_DP83867_LINK_STATUS_CHNG_INT_EN BIT(10)
+#define PHY_TI_DP83867_CFG3                    0x001e
+#define PHY_TI_DP83867_INT_EN                  BIT(7)
+
+struct ti_dp83867_config {
+	uint8_t addr;
+	const struct device *mdio_dev;
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+	const struct gpio_dt_spec reset_gpio;
+#endif
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	const struct gpio_dt_spec interrupt_gpio;
+#endif
+};
+
+struct ti_dp83867_data {
+	const struct device *dev;
+	struct phy_link_state state;
+	phy_callback_t cb;
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	struct gpio_callback gpio_callback;
+#endif
+	void *cb_data;
+	struct k_mutex mutex;
+	struct k_work_delayable phy_monitor_work;
+};
+
+static int phy_ti_dp83867_read(const struct device *dev, uint16_t reg_addr, uint32_t *data)
+{
+	const struct ti_dp83867_config *config = dev->config;
+	int ret;
+
+	/* Make sure excessive bits 16-31 are reset */
+	*data = 0U;
+
+	ret = mdio_read(config->mdio_dev, config->addr, reg_addr, (uint16_t *)data);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int phy_ti_dp83867_write(const struct device *dev, uint16_t reg_addr, uint32_t data)
+{
+	const struct ti_dp83867_config *config = dev->config;
+	int ret;
+
+	ret = mdio_write(config->mdio_dev, config->addr, reg_addr, (uint16_t)data);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+static int phy_ti_dp83867_clear_interrupt(struct ti_dp83867_data *data)
+{
+	const struct device *dev = data->dev;
+	const struct ti_dp83867_config *config = dev->config;
+	uint32_t reg_val;
+	int ret;
+
+	/* Lock mutex */
+	ret = k_mutex_lock(&data->mutex, K_FOREVER);
+	if (ret) {
+		LOG_ERR("PHY mutex lock error");
+		return ret;
+	}
+
+	/* Read/clear PHY interrupt status register */
+	ret = phy_ti_dp83867_read(dev, PHY_TI_DP83867_ISR, &reg_val);
+	if (ret) {
+		LOG_ERR("Error reading phy (%d) interrupt status register", config->addr);
+	}
+
+	/* Unlock mutex */
+	(void)k_mutex_unlock(&data->mutex);
+
+	return ret;
+}
+
+static void phy_ti_dp83867_interrupt_handler(const struct device *port, struct gpio_callback *cb,
+					     gpio_port_pins_t pins)
+{
+	struct ti_dp83867_data *data = CONTAINER_OF(cb, struct ti_dp83867_data, gpio_callback);
+	int ret;
+
+	ret = k_work_reschedule(&data->phy_monitor_work, K_NO_WAIT);
+	if (ret < 0) {
+		LOG_ERR("Failed to schedule phy_monitor_work from ISR");
+	}
+}
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) */
+
+static int phy_ti_dp83867_autonegotiate(const struct device *dev)
+{
+	const struct ti_dp83867_config *config = dev->config;
+	int ret;
+	uint32_t bmcr = 0;
+
+	/* Read control register to write back with autonegotiation bit */
+	ret = phy_ti_dp83867_read(dev, MII_BMCR, &bmcr);
+	if (ret) {
+		LOG_ERR("Error reading phy (%d) basic control register", config->addr);
+		return ret;
+	}
+
+	/* (re)start autonegotiation */
+	LOG_DBG("PHY (%d) is entering autonegotiation sequence", config->addr);
+	bmcr |= MII_BMCR_AUTONEG_ENABLE | MII_BMCR_AUTONEG_RESTART;
+
+	ret = phy_ti_dp83867_write(dev, MII_BMCR, bmcr);
+	if (ret) {
+		LOG_ERR("Error writing phy (%d) basic control register", config->addr);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int phy_ti_dp83867_get_link(const struct device *dev, struct phy_link_state *state)
+{
+	const struct ti_dp83867_config *config = dev->config;
+	struct ti_dp83867_data *data = dev->data;
+	int ret;
+	uint32_t physr = 0;
+	uint32_t duplex = 0;
+	struct phy_link_state old_state = data->state;
+	struct phy_link_state new_state = {};
+
+	/* Lock mutex */
+	ret = k_mutex_lock(&data->mutex, K_FOREVER);
+	if (ret) {
+		LOG_ERR("PHY mutex lock error");
+		return ret;
+	}
+
+	/* Read PHY status register */
+	ret = phy_ti_dp83867_read(dev, PHY_TI_DP83867_PHYSTS, &physr);
+	if (ret) {
+		LOG_ERR("Error reading phy (%d) specific status register", config->addr);
+		(void)k_mutex_unlock(&data->mutex);
+		return ret;
+	}
+
+	/* Unlock mutex */
+	(void)k_mutex_unlock(&data->mutex);
+
+	new_state.is_up = physr & PHY_TI_DP83867_PHYSTS_LINKSTATUS_MASK;
+
+	if (new_state.is_up) {
+		duplex = (physr & PHY_TI_DP83867_PHYSTS_LINKDUPLEX_MASK);
+		switch ((physr & PHY_TI_DP83867_PHYSTS_LINKSPEED_MASK) >>
+			PHY_TI_DP83867_PHYSTS_LINKSPEED_SHIFT) {
+		case PHY_TI_DP83867_PHYSTS_LINKSPEED_1000M:
+			if (duplex) {
+				new_state.speed = LINK_FULL_1000BASE_T;
+			} else {
+				new_state.speed = LINK_HALF_1000BASE_T;
+			}
+			break;
+		case PHY_TI_DP83867_PHYSTS_LINKSPEED_100M:
+			if (duplex) {
+				new_state.speed = LINK_FULL_100BASE_T;
+			} else {
+				new_state.speed = LINK_HALF_100BASE_T;
+			}
+			break;
+		case PHY_TI_DP83867_PHYSTS_LINKSPEED_10M:
+		default:
+			if (duplex) {
+				new_state.speed = LINK_FULL_10BASE_T;
+			} else {
+				new_state.speed = LINK_HALF_10BASE_T;
+			}
+			break;
+		}
+	}
+
+	if (memcmp(&old_state, &new_state, sizeof(struct phy_link_state)) != 0) {
+		LOG_INF("PHY %d is %s", config->addr, new_state.is_up ? "up" : "down");
+		if (new_state.is_up) {
+			LOG_INF("PHY (%d) Link speed %s Mb, %s duplex", config->addr,
+				(PHY_LINK_IS_SPEED_1000M(new_state.speed)
+					 ? "1000"
+					 : (PHY_LINK_IS_SPEED_100M(new_state.speed) ? "100"
+										    : "10")),
+				PHY_LINK_IS_FULL_DUPLEX(new_state.speed) ? "full" : "half");
+		}
+	}
+
+	memcpy(state, &new_state, sizeof(struct phy_link_state));
+
+	return ret;
+}
+
+static int phy_ti_dp83867_reset(const struct device *dev)
+{
+	const struct ti_dp83867_config *config = dev->config;
+	struct ti_dp83867_data *data = dev->data;
+	int ret;
+
+	/* Lock mutex */
+	ret = k_mutex_lock(&data->mutex, K_FOREVER);
+	if (ret) {
+		LOG_ERR("PHY mutex lock error");
+		return ret;
+	}
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+	if (config->reset_gpio.port) {
+		ret = gpio_pin_set_dt(&config->reset_gpio, 1);
+		if (ret >= 0) {
+			/* Reset pulse (minimum specified width is T1=1us) */
+			k_busy_wait(PHY_TI_DP83867_RESET_PULSE_WIDTH);
+
+			ret = gpio_pin_set_dt(&config->reset_gpio, 0);
+			if (ret >= 0) {
+				goto done;
+			}
+		}
+	}
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios) */
+
+	/* Reset PHY using register */
+	ret = phy_ti_dp83867_write(dev, MII_BMCR, MII_BMCR_RESET);
+	if (ret < 0) {
+		LOG_ERR("Error writing phy (%d) basic control register", config->addr);
+	}
+
+done:
+	/* POR release time (minimum specified is T4=195us) */
+	k_busy_wait(PHY_TI_DP83867_POR_DELAY);
+
+	/* Unlock mutex */
+	k_mutex_unlock(&data->mutex);
+	LOG_DBG("PHY (%d) reset completed", config->addr);
+
+	return ret;
+}
+
+static int phy_ti_dp83867_cfg_link(const struct device *dev, enum phy_link_speed speeds)
+{
+	const struct ti_dp83867_config *config = dev->config;
+	struct ti_dp83867_data *data = dev->data;
+	int ret;
+	uint32_t anar, cfg1, val;
+
+	/* Lock mutex */
+	ret = k_mutex_lock(&data->mutex, K_FOREVER);
+	if (ret) {
+		LOG_ERR("PHY mutex lock error");
+		goto done;
+	}
+
+	/* We are going to reconfigure the phy, don't need to monitor until done */
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	if (config->interrupt_gpio.port) {
+		/* Enable interrupt output register */
+		ret = phy_ti_dp83867_read(dev, PHY_TI_DP83867_CFG3, &val);
+		if (ret) {
+			LOG_ERR("Error reading phy (%d) CFG3 register", config->addr);
+			goto done;
+		}
+
+		val |= PHY_TI_DP83867_INT_EN;
+		ret = phy_ti_dp83867_write(dev, PHY_TI_DP83867_CFG3, val);
+		if (ret) {
+			LOG_ERR("Error writing phy (%d) CFG3 register", config->addr);
+			goto done;
+		}
+
+		/* Enable link status change interrupt */
+		ret = phy_ti_dp83867_read(dev, PHY_TI_DP83867_MICR, &val);
+		if (ret) {
+			LOG_ERR("Error reading phy (%d) MICR register", config->addr);
+			goto done;
+		}
+
+		val |= PHY_TI_DP83867_LINK_STATUS_CHNG_INT_EN;
+		ret = phy_ti_dp83867_write(dev, PHY_TI_DP83867_MICR, val);
+		if (ret) {
+			LOG_ERR("Error writing phy (%d) MICR register", config->addr);
+			goto done;
+		}
+
+	} else {
+		k_work_cancel_delayable(&data->phy_monitor_work);
+	}
+#else
+	k_work_cancel_delayable(&data->phy_monitor_work);
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) */
+
+	/* Read ANAR register to write back */
+	ret = phy_ti_dp83867_read(dev, MII_ANAR, &anar);
+	if (ret) {
+		LOG_ERR("Error reading phy (%d) advertising register", config->addr);
+		goto done;
+	}
+
+	/* Read CFG1 register to write back */
+	ret = phy_ti_dp83867_read(dev, MII_1KTCR, &cfg1);
+	if (ret) {
+		LOG_ERR("Error reading phy (%d) 1000Base-T control register", config->addr);
+		goto done;
+	}
+
+	/* Setup advertising register */
+	if (speeds & LINK_FULL_100BASE_T) {
+		anar |= MII_ADVERTISE_100_FULL;
+	} else {
+		anar &= ~MII_ADVERTISE_100_FULL;
+	}
+	if (speeds & LINK_HALF_100BASE_T) {
+		anar |= MII_ADVERTISE_100_HALF;
+	} else {
+		anar &= ~MII_ADVERTISE_100_HALF;
+	}
+	if (speeds & LINK_FULL_10BASE_T) {
+		anar |= MII_ADVERTISE_10_FULL;
+	} else {
+		anar &= ~MII_ADVERTISE_10_FULL;
+	}
+	if (speeds & LINK_HALF_10BASE_T) {
+		anar |= MII_ADVERTISE_10_HALF;
+	} else {
+		anar &= ~MII_ADVERTISE_10_HALF;
+	}
+
+	/* Setup 1000Base-T control register */
+	if (speeds & LINK_FULL_1000BASE_T) {
+		cfg1 |= MII_ADVERTISE_1000_FULL;
+	} else {
+		cfg1 &= ~MII_ADVERTISE_1000_FULL;
+	}
+
+	/* Write capabilities to advertising register */
+	ret = phy_ti_dp83867_write(dev, MII_ANAR, anar);
+	if (ret) {
+		LOG_ERR("Error writing phy (%d) advertising register", config->addr);
+		goto done;
+	}
+
+	/* Write capabilities to 1000Base-T control register */
+	ret = phy_ti_dp83867_write(dev, MII_1KTCR, cfg1);
+	if (ret) {
+		LOG_ERR("Error writing phy (%d) 1000Base-T control register", config->addr);
+		goto done;
+	}
+
+	/* (re)do autonegotiation */
+	ret = phy_ti_dp83867_autonegotiate(dev);
+	if (ret && (ret != -ENETDOWN)) {
+		LOG_ERR("Error in autonegotiation");
+		goto done;
+	}
+
+done:
+	/* Unlock mutex */
+	k_mutex_unlock(&data->mutex);
+
+	/* Start monitoring */
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	if (config->interrupt_gpio.port) {
+		return ret;
+	}
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) */
+	k_work_reschedule(&data->phy_monitor_work, K_MSEC(CONFIG_PHY_MONITOR_PERIOD));
+
+	return ret;
+}
+
+static int phy_ti_dp83867_link_cb_set(const struct device *dev, phy_callback_t cb, void *user_data)
+{
+	struct ti_dp83867_data *data = dev->data;
+
+	data->cb = cb;
+	data->cb_data = user_data;
+
+	phy_ti_dp83867_get_link(dev, &data->state);
+
+	data->cb(dev, &data->state, data->cb_data);
+
+	return 0;
+}
+
+static void phy_ti_dp83867_monitor_work_handler(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct ti_dp83867_data *data =
+		CONTAINER_OF(dwork, struct ti_dp83867_data, phy_monitor_work);
+	const struct device *dev = data->dev;
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	const struct ti_dp83867_config *config = dev->config;
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) */
+	struct phy_link_state state = {};
+	int ret;
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	if (config->interrupt_gpio.port) {
+		ret = phy_ti_dp83867_clear_interrupt(data);
+		if (ret) {
+			return;
+		}
+	}
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) */
+
+	ret = phy_ti_dp83867_get_link(dev, &state);
+
+	if (ret == 0 && memcmp(&state, &data->state, sizeof(struct phy_link_state)) != 0) {
+		memcpy(&data->state, &state, sizeof(struct phy_link_state));
+		if (data->cb) {
+			data->cb(dev, &data->state, data->cb_data);
+		}
+	}
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	if (config->interrupt_gpio.port) {
+		return;
+	}
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) */
+	k_work_reschedule(&data->phy_monitor_work, K_MSEC(CONFIG_PHY_MONITOR_PERIOD));
+}
+
+static int phy_ti_dp83867_init(const struct device *dev)
+{
+	const struct ti_dp83867_config *config = dev->config;
+	struct ti_dp83867_data *data = dev->data;
+	int ret;
+
+	data->dev = dev;
+
+	ret = k_mutex_init(&data->mutex);
+	if (ret) {
+		return ret;
+	}
+
+	mdio_bus_enable(config->mdio_dev);
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+	if (config->reset_gpio.port) {
+		ret = gpio_pin_configure_dt(&config->reset_gpio, GPIO_OUTPUT_INACTIVE);
+		if (ret) {
+			return ret;
+		}
+	}
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios) */
+
+	/* Reset PHY */
+	ret = phy_ti_dp83867_reset(dev);
+	if (ret) {
+		LOG_ERR("Failed to reset phy (%d)", config->addr);
+		return ret;
+	}
+
+	k_work_init_delayable(&data->phy_monitor_work, phy_ti_dp83867_monitor_work_handler);
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+	if (!config->interrupt_gpio.port) {
+		goto skip_int_gpio;
+	}
+
+	/* Configure interrupt pin */
+	ret = gpio_pin_configure_dt(&config->interrupt_gpio, GPIO_INPUT);
+	if (ret < 0) {
+		return ret;
+	}
+
+	gpio_init_callback(&data->gpio_callback, phy_ti_dp83867_interrupt_handler,
+			   BIT(config->interrupt_gpio.pin));
+	ret = gpio_add_callback_dt(&config->interrupt_gpio, &data->gpio_callback);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&config->interrupt_gpio, GPIO_INT_EDGE_TO_ACTIVE);
+
+	return ret;
+
+skip_int_gpio:
+#endif /* DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) */
+	phy_ti_dp83867_monitor_work_handler(&data->phy_monitor_work.work);
+
+	return 0;
+}
+
+static DEVICE_API(ethphy, ti_dp83867_phy_api) = {
+	.get_link = phy_ti_dp83867_get_link,
+	.cfg_link = phy_ti_dp83867_cfg_link,
+	.link_cb_set = phy_ti_dp83867_link_cb_set,
+	.read = phy_ti_dp83867_read,
+	.write = phy_ti_dp83867_write,
+};
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+#define RESET_GPIO(n) .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(n, reset_gpios, {0}),
+#else
+#define RESET_GPIO(n)
+#endif /* reset gpio */
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios)
+#define INTERRUPT_GPIO(n) .interrupt_gpio = GPIO_DT_SPEC_INST_GET_OR(n, int_gpios, {0}),
+#else
+#define INTERRUPT_GPIO(n)
+#endif /* interrupt gpio */
+
+#define TI_DP83867_INIT(n)                                                                         \
+	static const struct ti_dp83867_config ti_dp83867_##n##_config = {                          \
+		.addr = DT_INST_REG_ADDR(n),                                                       \
+		.mdio_dev = DEVICE_DT_GET(DT_INST_PARENT(n)),                                      \
+		RESET_GPIO(n) INTERRUPT_GPIO(n)};                                                  \
+                                                                                                   \
+	static struct ti_dp83867_data ti_dp83867_##n##_data;                                       \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(n, &phy_ti_dp83867_init, NULL, &ti_dp83867_##n##_data,               \
+			      &ti_dp83867_##n##_config, POST_KERNEL, CONFIG_PHY_INIT_PRIORITY,     \
+			      &ti_dp83867_phy_api);
+
+DT_INST_FOREACH_STATUS_OKAY(TI_DP83867_INIT)
diff --git a/drivers/firmware/scmi/CMakeLists.txt b/drivers/firmware/scmi/CMakeLists.txt
index fbd52e6ed2d1d..60ea86a5cb69b 100644
--- a/drivers/firmware/scmi/CMakeLists.txt
+++ b/drivers/firmware/scmi/CMakeLists.txt
@@ -11,3 +11,5 @@ zephyr_library_sources_ifdef(CONFIG_ARM_SCMI_SHMEM shmem.c)
 zephyr_library_sources_ifdef(CONFIG_ARM_SCMI_CLK_HELPERS clk.c)
 zephyr_library_sources_ifdef(CONFIG_ARM_SCMI_PINCTRL_HELPERS pinctrl.c)
 zephyr_library_sources_ifdef(CONFIG_ARM_SCMI_POWER_DOMAIN_HELPERS power.c)
+
+add_subdirectory_ifdef(CONFIG_ARM_SCMI nxp)
diff --git a/drivers/firmware/scmi/Kconfig b/drivers/firmware/scmi/Kconfig
index 93c1b1189636d..c4beec1d2b4e4 100644
--- a/drivers/firmware/scmi/Kconfig
+++ b/drivers/firmware/scmi/Kconfig
@@ -64,4 +64,6 @@ config ARM_SCMI_TRANSPORT_INIT_PRIORITY
 	help
 	  SCMI transport driver device initialization priority.
 
+source "drivers/firmware/scmi/nxp/Kconfig"
+
 endif # ARM_SCMI
diff --git a/drivers/firmware/scmi/nxp/CMakeLists.txt b/drivers/firmware/scmi/nxp/CMakeLists.txt
new file mode 100644
index 0000000000000..44fa881778d58
--- /dev/null
+++ b/drivers/firmware/scmi/nxp/CMakeLists.txt
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library_sources_ifdef(CONFIG_ARM_SCMI_NXP_VENDOR_EXTENSIONS shmem.c)
diff --git a/drivers/firmware/scmi/nxp/Kconfig b/drivers/firmware/scmi/nxp/Kconfig
new file mode 100644
index 0000000000000..2a20210294b3f
--- /dev/null
+++ b/drivers/firmware/scmi/nxp/Kconfig
@@ -0,0 +1,8 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config ARM_SCMI_NXP_VENDOR_EXTENSIONS
+	bool "Allow NXP specific SCMI features"
+	select CRC
+	help
+	  When enabled, additional SCMI features specific to NXP will be available
diff --git a/drivers/firmware/scmi/nxp/shmem.c b/drivers/firmware/scmi/nxp/shmem.c
new file mode 100644
index 0000000000000..629076a2e6de2
--- /dev/null
+++ b/drivers/firmware/scmi/nxp/shmem.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/firmware/scmi/shmem.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(arm_scmi_shmem_nxp);
+
+#define SMT_CRC_NONE  0U
+#define SMT_CRC_XOR   1U /* Unsupported */
+#define SMT_CRC_J1850 2U /* Unsupported */
+#define SMT_CRC_CRC32 3U
+
+int scmi_shmem_vendor_read_message(const struct scmi_shmem_layout *layout)
+{
+	uint32_t validation_type = layout->res1[0];
+
+	if (validation_type == SMT_CRC_CRC32) {
+		if (layout->res1[1] != crc32_ieee((const uint8_t *)&layout->msg_hdr, layout->len)) {
+			LOG_ERR("bad message crc");
+			return -EBADMSG;
+		}
+	} else if (validation_type == SMT_CRC_NONE) {
+		/* do nothing */
+	} else {
+		LOG_ERR("unsupported validation type 0x%x", validation_type);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+int scmi_shmem_vendor_write_message(struct scmi_shmem_layout *layout)
+{
+	uint32_t validation_type = layout->res1[0];
+
+	if (validation_type == SMT_CRC_CRC32) {
+		layout->res1[1] = crc32_ieee((const uint8_t *)&layout->msg_hdr, layout->len);
+	} else if (validation_type == SMT_CRC_NONE) {
+		/* do nothing */
+	} else {
+		LOG_ERR("unsupported validation type 0x%x", validation_type);
+		return -EINVAL;
+	}
+
+	return 0;
+}
diff --git a/drivers/firmware/scmi/shmem.c b/drivers/firmware/scmi/shmem.c
index 6ec645cbc3096..86b1a9659d494 100644
--- a/drivers/firmware/scmi/shmem.c
+++ b/drivers/firmware/scmi/shmem.c
@@ -26,15 +26,6 @@ struct scmi_shmem_data {
 	mm_reg_t regmap;
 };
 
-struct scmi_shmem_layout {
-	volatile uint32_t res0;
-	volatile uint32_t chan_status;
-	volatile uint32_t res1[2];
-	volatile uint32_t chan_flags;
-	volatile uint32_t len;
-	volatile uint32_t msg_hdr;
-};
-
 int scmi_shmem_get_channel_status(const struct device *dev, uint32_t *status)
 {
 	struct scmi_shmem_data *data;
@@ -57,6 +48,16 @@ static void scmi_shmem_memcpy(mm_reg_t dst, mm_reg_t src, uint32_t bytes)
 	}
 }
 
+__weak int scmi_shmem_vendor_read_message(const struct scmi_shmem_layout *layout)
+{
+	return 0;
+}
+
+__weak int scmi_shmem_vendor_write_message(struct scmi_shmem_layout *layout)
+{
+	return 0;
+}
+
 int scmi_shmem_read_message(const struct device *shmem, struct scmi_message *msg)
 {
 	struct scmi_shmem_layout *layout;
@@ -96,6 +97,11 @@ int scmi_shmem_read_message(const struct device *shmem, struct scmi_message *msg
 		return -EINVAL;
 	}
 
+	if (scmi_shmem_vendor_read_message(layout) < 0) {
+		LOG_ERR("vendor specific validation failed");
+		return -EINVAL;
+	}
+
 	if (msg->content) {
 		scmi_shmem_memcpy(POINTER_TO_UINT(msg->content),
 				  data->regmap + sizeof(*layout), msg->len);
@@ -139,6 +145,10 @@ int scmi_shmem_write_message(const struct device *shmem, struct scmi_message *ms
 				  POINTER_TO_UINT(msg->content), msg->len);
 	}
 
+	if (scmi_shmem_vendor_write_message(layout) < 0) {
+		return -EINVAL;
+	}
+
 	/* done, mark channel as busy and proceed */
 	layout->chan_status &= ~SCMI_SHMEM_CHAN_STATUS_BUSY_BIT;
 
diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt
index 474205e397350..089259a2572a4 100644
--- a/drivers/flash/CMakeLists.txt
+++ b/drivers/flash/CMakeLists.txt
@@ -34,6 +34,7 @@ zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_MX25UM51345G flash_mcux_f
 zephyr_library_sources_ifdef(CONFIG_FLASH_MCUX_FLEXSPI_NOR flash_mcux_flexspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_ATXP032 flash_mspi_atxp032.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_EMUL_DEVICE flash_mspi_emul_device.c)
+zephyr_library_sources_ifdef(CONFIG_FLASH_MSPI_NOR flash_mspi_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_NOR flash_npcx_fiu_nor.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_NPCX_FIU_QSPI flash_npcx_fiu_qspi.c)
 zephyr_library_sources_ifdef(CONFIG_FLASH_RPI_PICO flash_rpi_pico.c)
@@ -60,6 +61,7 @@ zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_RV32M1 soc_flash_rv32m1.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM flash_sam.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SAM0 flash_sam0.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SI32 flash_si32.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SILABS_S2 soc_flash_silabs_series2.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SILABS_SIWX91X soc_flash_silabs_siwx91x.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_SMARTBOND flash_smartbond.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_TELINK_B91 soc_flash_b91.c)
diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig
index 00ffd104a88c6..bdd84f25814b4 100644
--- a/drivers/flash/Kconfig
+++ b/drivers/flash/Kconfig
@@ -197,6 +197,7 @@ source "drivers/flash/Kconfig.rv32m1"
 source "drivers/flash/Kconfig.sam"
 source "drivers/flash/Kconfig.sam0"
 source "drivers/flash/Kconfig.si32"
+source "drivers/flash/Kconfig.silabs"
 source "drivers/flash/Kconfig.simulator"
 source "drivers/flash/Kconfig.siwx91x"
 source "drivers/flash/Kconfig.smartbond"
diff --git a/drivers/flash/Kconfig.it8xxx2 b/drivers/flash/Kconfig.it8xxx2
index ef0307f65a39e..9c7252cac3a96 100644
--- a/drivers/flash/Kconfig.it8xxx2
+++ b/drivers/flash/Kconfig.it8xxx2
@@ -7,7 +7,8 @@ config SOC_FLASH_ITE_IT8XXX2
 	bool "ITE IT8XXX2 flash driver"
 	default y
 	depends on DT_HAS_ITE_IT8XXX2_FLASH_CONTROLLER_ENABLED
-	select SOC_IT8XXX2_USE_ILM
+	select SOC_IT51XXX_USE_ILM if SOC_SERIES_IT51XXX
+	select SOC_IT8XXX2_USE_ILM if SOC_SERIES_IT8XXX2
 	select FLASH_HAS_PAGE_LAYOUT
 	select FLASH_HAS_DRIVER_ENABLED
 	select FLASH_HAS_EXPLICIT_ERASE
diff --git a/drivers/flash/Kconfig.mspi b/drivers/flash/Kconfig.mspi
index 158fcefb528f5..d699aa4930937 100644
--- a/drivers/flash/Kconfig.mspi
+++ b/drivers/flash/Kconfig.mspi
@@ -28,4 +28,27 @@ config FLASH_MSPI_ATXP032
 	select FLASH_JESD216
 	select MSPI_AMBIQ_AP3 if SOC_SERIES_APOLLO3X
 
+menuconfig FLASH_MSPI_NOR
+	bool "Generic MSPI NOR Flash"
+	default y
+	depends on DT_HAS_JEDEC_MSPI_NOR_ENABLED
+	select FLASH_MSPI
+	select FLASH_HAS_EXPLICIT_ERASE
+	select FLASH_JESD216
+	select GPIO if $(dt_compat_any_has_prop,$(DT_COMPAT_JEDEC_MSPI_NOR),reset-gpios)
+
+if FLASH_MSPI_NOR
+
+config FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE
+	int "Page size to use for FLASH_LAYOUT feature"
+	depends on FLASH_PAGE_LAYOUT
+	default 65536
+	help
+	  When CONFIG_FLASH_PAGE_LAYOUT is used, this driver will support that
+	  API. By default the page size corresponds to the block size (65536).
+	  Other options include the 32K-byte erase size (32768), the sector
+	  size (4096), or any non-zero multiple of the sector size.
+
+endif # FLASH_MSPI_NOR
+
 endmenu
diff --git a/drivers/flash/Kconfig.nrf b/drivers/flash/Kconfig.nrf
index 6e29ef952cac6..39800a0627e4f 100644
--- a/drivers/flash/Kconfig.nrf
+++ b/drivers/flash/Kconfig.nrf
@@ -7,6 +7,13 @@ config FLASH_NRF_FORCE_ALT
 	  This option can be enabled to force an alternative implementation
 	  of the flash driver.
 
+config SOC_FLASH_NRF_CUSTOM_CONTEXT
+	bool "Nordic nRFx flash driver operation custom context"
+	depends on SOC_COMPATIBLE_NRF
+	help
+	  Enable pointer to custom context, for drivers that need to store additional data,
+	  not covered by the structure.
+
 menuconfig SOC_FLASH_NRF
 	bool "Nordic Semiconductor nRF flash driver"
 	default y
diff --git a/drivers/flash/Kconfig.silabs b/drivers/flash/Kconfig.silabs
new file mode 100644
index 0000000000000..5890f98ed340f
--- /dev/null
+++ b/drivers/flash/Kconfig.silabs
@@ -0,0 +1,27 @@
+# Copyright (c) 2025 Silicon Laboratories Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FLASH_SILABS_S2
+	bool "Silicon Labs Series 2 flash driver"
+	default y
+	depends on DT_HAS_SILABS_SERIES2_FLASH_CONTROLLER_ENABLED
+	select FLASH_HAS_DRIVER_ENABLED
+	select FLASH_HAS_PAGE_LAYOUT
+	select SOC_GECKO_MSC
+	select FLASH_HAS_EXPLICIT_ERASE
+	select MPU_ALLOW_FLASH_WRITE if ARM_MPU
+	help
+	  Enable Silicon Labs Series 2 internal flash driver.
+
+if SOC_FLASH_SILABS_S2
+
+config SOC_FLASH_SILABS_S2_DMA_WRITE
+	bool "Use DMA for flash write operations"
+	depends on DMA
+	default y if $(dt_compat_any_has_prop,$(DT_COMPAT_SILABS_SERIES2_FLASH_CONTROLLER),dmas)
+
+config SOC_FLASH_SILABS_S2_DMA_READ
+	bool "Use DMA for flash read operations"
+	depends on DMA
+
+endif
diff --git a/drivers/flash/flash_ambiq.c b/drivers/flash/flash_ambiq.c
index b7d805a65e866..d3998e3e200c2 100644
--- a/drivers/flash/flash_ambiq.c
+++ b/drivers/flash/flash_ambiq.c
@@ -11,7 +11,7 @@
 #include <zephyr/drivers/flash.h>
 #include <zephyr/logging/log.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_REGISTER(flash_ambiq, CONFIG_FLASH_LOG_LEVEL);
 
diff --git a/drivers/flash/flash_esp32.c b/drivers/flash/flash_esp32.c
index 6d947064e9d8a..cb123a3349a8d 100644
--- a/drivers/flash/flash_esp32.c
+++ b/drivers/flash/flash_esp32.c
@@ -19,6 +19,7 @@
 #include <soc/spi_struct.h>
 #include <esp_flash_encrypt.h>
 #include <esp_flash_internal.h>
+#include <bootloader_flash_priv.h>
 
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
@@ -69,21 +70,89 @@ static inline void flash_esp32_sem_give(const struct device *dev)
 
 #endif /* CONFIG_MULTITHREADING */
 
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
+#include <stdint.h>
+#include <string.h>
+
+#ifdef CONFIG_MCUBOOT
+#define READ_BUFFER_SIZE 32
+static bool flash_esp32_is_aligned(off_t address, void *buffer, size_t length)
+{
+	/* check if address, buffer pointer, and length are 4-byte aligned */
+	return ((address & 3) == 0) && (((uintptr_t)buffer & 3) == 0) && ((length & 3) == 0);
+}
+#endif
+
 static int flash_esp32_read(const struct device *dev, off_t address, void *buffer, size_t length)
 {
 	int ret = 0;
 
+#ifdef CONFIG_MCUBOOT
+	uint8_t *dest_ptr = (uint8_t *)buffer;
+	size_t remaining = length;
+	size_t copy_size = 0;
+	size_t aligned_size = 0;
+	bool allow_decrypt = esp_flash_encryption_enabled();
+
+	if (flash_esp32_is_aligned(address, buffer, length)) {
+		ret = esp_rom_flash_read(address, buffer, length, allow_decrypt);
+		return (ret == ESP_OK) ? 0 : -EIO;
+	}
+
+	/* handle unaligned reading */
+	uint8_t __aligned(4) temp_buf[READ_BUFFER_SIZE + 8];
+	while (remaining > 0) {
+		size_t addr_offset = address & 3;
+		size_t buf_offset = (uintptr_t)dest_ptr & 3;
+
+		copy_size = (remaining > READ_BUFFER_SIZE) ? READ_BUFFER_SIZE : remaining;
+
+		if (addr_offset == 0 && buf_offset == 0 && copy_size >= 4) {
+			aligned_size = copy_size & ~3;
+			ret = esp_rom_flash_read(address, dest_ptr, aligned_size, allow_decrypt);
+			if (ret != ESP_OK) {
+				return -EIO;
+			}
+
+			address += aligned_size;
+			dest_ptr += aligned_size;
+			remaining -= aligned_size;
+		} else {
+			size_t start_addr = address - addr_offset;
+
+			aligned_size = (copy_size + addr_offset + 3) & ~3;
+
+			ret = esp_rom_flash_read(start_addr, temp_buf, aligned_size, allow_decrypt);
+			if (ret != ESP_OK) {
+				return -EIO;
+			}
+
+			memcpy(dest_ptr, temp_buf + addr_offset, copy_size);
+
+			address += copy_size;
+			dest_ptr += copy_size;
+			remaining -= copy_size;
+		}
+	}
+#else
 	flash_esp32_sem_take(dev);
-	if (!esp_flash_encryption_enabled()) {
-		ret = esp_flash_read(NULL, buffer, address, length);
-	} else {
+
+	if (esp_flash_encryption_enabled()) {
 		ret = esp_flash_read_encrypted(NULL, address, buffer, length);
+	} else {
+		ret = esp_flash_read(NULL, buffer, address, length);
 	}
+
 	flash_esp32_sem_give(dev);
+#endif
+
 	if (ret != 0) {
-		LOG_ERR("esp_flash_read failed %d", ret);
+		LOG_ERR("Flash read error: %d", ret);
 		return -EIO;
 	}
+
 	return 0;
 }
 
@@ -94,28 +163,48 @@ static int flash_esp32_write(const struct device *dev,
 {
 	int ret = 0;
 
+#ifdef CONFIG_MCUBOOT
+	if (!flash_esp32_is_aligned(address, (void *)buffer, length)) {
+		LOG_ERR("Unaligned flash write is not supported");
+		return -EINVAL;
+	}
+
+	bool encrypt = esp_flash_encryption_enabled();
+
+	ret = esp_rom_flash_write(address, (void *)buffer, length, encrypt);
+#else
 	flash_esp32_sem_take(dev);
-	if (!esp_flash_encryption_enabled()) {
-		ret = esp_flash_write(NULL, buffer, address, length);
-	} else {
+
+	if (esp_flash_encryption_enabled()) {
 		ret = esp_flash_write_encrypted(NULL, address, buffer, length);
+	} else {
+		ret = esp_flash_write(NULL, buffer, address, length);
 	}
+
 	flash_esp32_sem_give(dev);
+#endif
 
 	if (ret != 0) {
-		LOG_ERR("esp_flash_write failed %d", ret);
+		LOG_ERR("Flash write error: %d", ret);
 		return -EIO;
 	}
+
 	return 0;
 }
 
 static int flash_esp32_erase(const struct device *dev, off_t start, size_t len)
 {
+	int ret = 0;
+
+#ifdef CONFIG_MCUBOOT
+	ret = esp_rom_flash_erase_range(start, len);
+#else
 	flash_esp32_sem_take(dev);
-	int ret = esp_flash_erase_region(NULL, start, len);
+	ret = esp_flash_erase_region(NULL, start, len);
 	flash_esp32_sem_give(dev);
+#endif
 	if (ret != 0) {
-		LOG_ERR("esp_flash_erase_region failed %d", ret);
+		LOG_ERR("Flash erase error: %d", ret);
 		return -EIO;
 	}
 	return 0;
@@ -146,18 +235,12 @@ flash_esp32_get_parameters(const struct device *dev)
 
 static int flash_esp32_init(const struct device *dev)
 {
-	uint32_t ret = 0;
-
 #ifdef CONFIG_MULTITHREADING
 	struct flash_esp32_dev_data *const dev_data = dev->data;
 
 	k_sem_init(&dev_data->sem, 1, 1);
 #endif /* CONFIG_MULTITHREADING */
-	ret = esp_flash_init_default_chip();
-	if (ret != 0) {
-		LOG_ERR("esp_flash_init_default_chip failed %d", ret);
-		return 0;
-	}
+
 	return 0;
 }
 
diff --git a/drivers/flash/flash_hp_ra.c b/drivers/flash/flash_hp_ra.c
index eb5ba3ec5bb67..d58985c8ea3ad 100644
--- a/drivers/flash/flash_hp_ra.c
+++ b/drivers/flash/flash_hp_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -378,8 +378,10 @@ static void flash_controller_ra_irq_config_func(const struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	R_ICU->IELSR[DT_IRQ_BY_NAME(DT_DRV_INST(0), frdyi, irq)] = ELC_EVENT_FCU_FRDYI;
-	R_ICU->IELSR[DT_IRQ_BY_NAME(DT_DRV_INST(0), fiferr, irq)] = ELC_EVENT_FCU_FIFERR;
+	R_ICU->IELSR[DT_IRQ_BY_NAME(DT_DRV_INST(0), frdyi, irq)] =
+		BSP_PRV_IELS_ENUM(EVENT_FCU_FRDYI);
+	R_ICU->IELSR[DT_IRQ_BY_NAME(DT_DRV_INST(0), fiferr, irq)] =
+		BSP_PRV_IELS_ENUM(EVENT_FCU_FIFERR);
 
 	IRQ_CONNECT(DT_IRQ_BY_NAME(DT_DRV_INST(0), frdyi, irq),
 		    DT_IRQ_BY_NAME(DT_DRV_INST(0), frdyi, priority), fcu_frdyi_isr,
diff --git a/drivers/flash/flash_hp_ra_ex_op.c b/drivers/flash/flash_hp_ra_ex_op.c
index 42cc4c81b1cf2..aa9c9f3c9fc66 100644
--- a/drivers/flash/flash_hp_ra_ex_op.c
+++ b/drivers/flash/flash_hp_ra_ex_op.c
@@ -28,7 +28,8 @@ flash_hp_enter_pe_cf_mode(flash_hp_instance_ctrl_t *const p_ctrl) PLACE_IN_RAM_S
 extern fsp_err_t flash_hp_stop(void) PLACE_IN_RAM_SECTION;
 
 extern fsp_err_t flash_hp_configuration_area_write(flash_hp_instance_ctrl_t *p_ctrl,
-						   uint32_t fsaddr) PLACE_IN_RAM_SECTION;
+						   uint32_t fsaddr,
+						   uint16_t *src_address) PLACE_IN_RAM_SECTION;
 
 extern fsp_err_t flash_hp_check_errors(fsp_err_t previous_error, uint32_t error_bits,
 				       fsp_err_t return_error) PLACE_IN_RAM_SECTION;
@@ -63,7 +64,8 @@ static fsp_err_t flash_hp_set_block_protect_ns(flash_hp_instance_ctrl_t *p_ctrl,
 	if (bps_val_ns != NULL) {
 		memcpy(&g_configuration_area_data[FLASH_HP_FCU_CONFIG_SET_BPS_OFFSET], bps_val_ns,
 		       size);
-		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_BPS);
+		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_BPS,
+							&g_configuration_area_data);
 		err = flash_hp_check_errors(err, 0, FSP_ERR_WRITE_FAILED);
 	}
 
@@ -71,7 +73,8 @@ static fsp_err_t flash_hp_set_block_protect_ns(flash_hp_instance_ctrl_t *p_ctrl,
 	if (pbps_val_ns != NULL) {
 		memcpy(&g_configuration_area_data[FLASH_HP_FCU_CONFIG_SET_BPS_OFFSET], pbps_val_ns,
 		       size);
-		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_PBPS);
+		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_PBPS,
+							&g_configuration_area_data);
 		err = flash_hp_check_errors(err, 0, FSP_ERR_WRITE_FAILED);
 	}
 
@@ -103,7 +106,8 @@ static fsp_err_t flash_hp_set_block_protect_sec(flash_hp_instance_ctrl_t *p_ctrl
 	if (bps_val_sec != NULL) {
 		memcpy(&g_configuration_area_data[FLASH_HP_FCU_CONFIG_SET_BPS_OFFSET], bps_val_sec,
 		       size);
-		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_BPS_SEC);
+		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_BPS_SEC,
+							&g_configuration_area_data);
 		err = flash_hp_check_errors(err, 0, FSP_ERR_WRITE_FAILED);
 	}
 
@@ -111,7 +115,8 @@ static fsp_err_t flash_hp_set_block_protect_sec(flash_hp_instance_ctrl_t *p_ctrl
 	if (pbps_val_sec != NULL) {
 		memcpy(&g_configuration_area_data[FLASH_HP_FCU_CONFIG_SET_BPS_OFFSET], pbps_val_sec,
 		       size);
-		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_PBPS_SEC);
+		err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_PBPS_SEC,
+							&g_configuration_area_data);
 		err = flash_hp_check_errors(err, 0, FSP_ERR_WRITE_FAILED);
 	}
 
@@ -141,7 +146,8 @@ static fsp_err_t flash_hp_set_block_protect_sel(flash_hp_instance_ctrl_t *p_ctrl
 
 	memset(g_configuration_area_data, UINT8_MAX, sizeof(g_configuration_area_data));
 	memcpy(&g_configuration_area_data[FLASH_HP_FCU_CONFIG_SET_BPS_OFFSET], bps_sel_val, size);
-	err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_BPS_SEL);
+	err = flash_hp_configuration_area_write(p_ctrl, FLASH_HP_FCU_CONFIG_SET_BPS_SEL,
+						&g_configuration_area_data);
 	err = flash_hp_check_errors(err, 0, FSP_ERR_WRITE_FAILED);
 
 	/* Return to read mode*/
diff --git a/drivers/flash/flash_ite_it8xxx2.c b/drivers/flash/flash_ite_it8xxx2.c
index 04b63c7a4982c..acf5bbd8664e5 100644
--- a/drivers/flash/flash_ite_it8xxx2.c
+++ b/drivers/flash/flash_ite_it8xxx2.c
@@ -25,8 +25,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_ite_it8xxx2);
 
-#define FLASH_IT8XXX2_REG_BASE \
-		((struct smfi_it8xxx2_regs *)DT_INST_REG_ADDR(0))
+#define FLASH_ITE_EC_REGS_BASE ((struct smfi_ite_ec_regs *)DT_INST_REG_ADDR(0))
 
 struct flash_it8xxx2_dev_data {
 	struct k_sem sem;
@@ -93,7 +92,8 @@ static const struct flash_parameters flash_it8xxx2_parameters = {
 
 void __soc_ram_code ramcode_reset_i_cache(void)
 {
-	struct gctrl_it8xxx2_regs *const gctrl_regs = GCTRL_IT8XXX2_REGS_BASE;
+#ifdef CONFIG_SOC_SERIES_IT8XXX2
+	struct gctrl_ite_ec_regs *const gctrl_regs = GCTRL_ITE_EC_REGS_BASE;
 
 	/* I-Cache tag sram reset */
 	gctrl_regs->GCTRL_MCCR |= IT8XXX2_GCTRL_ICACHE_RESET;
@@ -102,11 +102,14 @@ void __soc_ram_code ramcode_reset_i_cache(void)
 
 	gctrl_regs->GCTRL_MCCR &= ~IT8XXX2_GCTRL_ICACHE_RESET;
 	__asm__ volatile ("fence.i" ::: "memory");
+#else
+	custom_reset_instr_cache();
+#endif
 }
 
 void __soc_ram_code ramcode_flash_follow_mode(void)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
 	/*
 	 * ECINDAR3-0 are EC-indirect memory address registers.
 	 *
@@ -127,7 +130,7 @@ void __soc_ram_code ramcode_flash_follow_mode(void)
 
 void __soc_ram_code ramcode_flash_follow_mode_exit(void)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
 
 	/* Exit follow mode, and keep the setting of selecting internal flash */
 	flash_regs->SMFI_ECINDAR3 = EC_INDIRECT_READ_INTERNAL_FLASH;
@@ -136,8 +139,8 @@ void __soc_ram_code ramcode_flash_follow_mode_exit(void)
 
 void __soc_ram_code ramcode_flash_fsce_high(void)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
-	struct gctrl_it8xxx2_regs *const gctrl_regs = GCTRL_IT8XXX2_REGS_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
+	struct gctrl_ite_ec_regs *const gctrl_regs = GCTRL_ITE_EC_REGS_BASE;
 
 	/* FSCE# high level */
 	flash_regs->SMFI_ECINDAR1 = (FLASH_FSCE_HIGH_ADDRESS >> 8) & GENMASK(7, 0);
@@ -160,7 +163,7 @@ void __soc_ram_code ramcode_flash_fsce_high(void)
 
 void __soc_ram_code ramcode_flash_write_dat(uint8_t wdata)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
 
 	/* Write data to FMOSI */
 	flash_regs->SMFI_ECINDDR = wdata;
@@ -169,7 +172,7 @@ void __soc_ram_code ramcode_flash_write_dat(uint8_t wdata)
 void __soc_ram_code ramcode_flash_transaction(int wlen, uint8_t *wbuf, int rlen, uint8_t *rbuf,
 					      enum flash_transaction_cmd cmd_end)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
 	int i;
 
 	/*  FSCE# with low level */
@@ -191,7 +194,7 @@ void __soc_ram_code ramcode_flash_transaction(int wlen, uint8_t *wbuf, int rlen,
 void __soc_ram_code ramcode_flash_cmd_read_status(enum flash_status_mask mask,
 						  enum flash_status_mask target)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
 	uint8_t cmd_rs[] = {FLASH_CMD_RS};
 
 	/* Send read status command */
@@ -343,7 +346,7 @@ void __soc_ram_code ramcode_flash_erase(int addr, int cmd)
 static int __soc_ram_code flash_it8xxx2_read(const struct device *dev, off_t offset, void *data,
 					     size_t len)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
 	uint8_t *data_t = data;
 	int i;
 
@@ -464,7 +467,7 @@ flash_it8xxx2_get_parameters(const struct device *dev)
 
 static int flash_it8xxx2_init(const struct device *dev)
 {
-	struct smfi_it8xxx2_regs *const flash_regs = FLASH_IT8XXX2_REG_BASE;
+	struct smfi_ite_ec_regs *const flash_regs = FLASH_ITE_EC_REGS_BASE;
 	struct flash_it8xxx2_dev_data *data = dev->data;
 
 	/* By default, select internal flash for indirect fast read. */
@@ -475,7 +478,7 @@ static int flash_it8xxx2_init(const struct device *dev)
 	 * than 256K-byte, enable the page program cycle constructed
 	 * by EC-Indirect Follow Mode.
 	 */
-	flash_regs->SMFI_FLHCTRL6R |= IT8XXX2_SMFI_MASK_ECINDPP;
+	flash_regs->SMFI_FLHCTRL6R |= ITE_EC_SMFI_MASK_ECINDPP;
 
 	/* Initialize mutex for flash controller */
 	k_sem_init(&data->sem, 1, 1);
diff --git a/drivers/flash/flash_mcux_flexspi_nor.c b/drivers/flash/flash_mcux_flexspi_nor.c
index 87abe2142fa4a..8487c87065641 100644
--- a/drivers/flash/flash_mcux_flexspi_nor.c
+++ b/drivers/flash/flash_mcux_flexspi_nor.c
@@ -943,37 +943,72 @@ static int flash_flexspi_nor_sfdp_read(const struct device *dev,
 
 #endif
 
-/* Helper to configure IS25 flash, by clearing read param bits */
-static int flash_flexspi_nor_is25_clear_read_param(struct flash_flexspi_nor_data *data,
-			uint32_t (*flexspi_lut)[MEMC_FLEXSPI_CMD_PER_SEQ],
-			uint32_t *read_params)
+/* Helper to configure IS25 flash */
+static int
+flash_flexspi_nor_is25_clear_dummy_cycles(struct flash_flexspi_nor_data *data,
+					  uint32_t (*flexspi_lut)[MEMC_FLEXSPI_CMD_PER_SEQ])
 {
 	int ret;
-	/* Install Set Read Parameters (Volatile) command */
+
+	const flexspi_device_config_t config = {
+		.flexspiRootClk = MHZ(50),
+		.flashSize = FLEXSPI_FLSHCR0_FLSHSZ_MASK, /* Max flash size */
+		.ARDSeqNumber = 1,
+		.ARDSeqIndex = READ,
+	};
+
 	flexspi_transfer_t transfer = {
 		.deviceAddress = 0,
 		.port = data->port,
 		.seqIndex = SCRATCH_CMD,
 		.SeqNumber = 1,
-		.data = read_params,
 		.dataSize = 1,
-		.cmdType = kFLEXSPI_Write,
-	};
-	flexspi_device_config_t config = {
-		.flexspiRootClk = MHZ(50),
-		.flashSize = FLEXSPI_FLSHCR0_FLSHSZ_MASK, /* Max flash size */
-		.ARDSeqNumber = 1,
-		.ARDSeqIndex = READ,
 	};
 
-	flexspi_lut[SCRATCH_CMD][0] = FLEXSPI_LUT_SEQ(
-			kFLEXSPI_Command_SDR, kFLEXSPI_1PAD, 0xC0,
-			kFLEXSPI_Command_WRITE_SDR, kFLEXSPI_1PAD, 0x1);
-	ret = memc_flexspi_set_device_config(&data->controller,
-				&config,
-				(uint32_t *)flexspi_lut,
-				FLEXSPI_INSTR_END * MEMC_FLEXSPI_CMD_PER_SEQ,
-				data->port);
+	/*
+	 * Get Extended Read Parameters (Non-Volatile) command (RDERP, 81h)
+	 *
+	 * This is done to distinguish between an IS25LPXXX and IS25LPXXXD since
+	 * the former uses the read parameters (SRPV) to set drive strength and
+	 * dummy cycles, while IS25LPXXXD uses extended read parameters (SERPV)
+	 * for drive strength and read parameters (SRPV) for dummy cycles.
+	 */
+	uint32_t resp_data;
+
+	transfer.data = &resp_data;
+	transfer.cmdType = kFLEXSPI_Read;
+
+	flexspi_lut[SCRATCH_CMD][0] =
+		FLEXSPI_LUT_SEQ(kFLEXSPI_Command_SDR, kFLEXSPI_1PAD, 0x81,
+				kFLEXSPI_Command_READ_SDR, kFLEXSPI_1PAD, 0x1);
+	ret = memc_flexspi_set_device_config(&data->controller, &config, (uint32_t *)flexspi_lut,
+					     FLEXSPI_INSTR_END * MEMC_FLEXSPI_CMD_PER_SEQ,
+					     data->port);
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = memc_flexspi_transfer(&data->controller, &transfer);
+
+	/*
+	 * Check that EB[7:4] is not all zero and that EB[0] (WIP)
+	 * is not 1, which should catch a chip responding to an
+	 * unsupported 81h command with either 0x00 or 0xFF
+	 */
+	const int has_extended_read_reg = resp_data & 0xF0 && !(resp_data & 0x01);
+	uint32_t read_params = has_extended_read_reg ? 0 : 0xE0U;
+
+	/* Switch over to writing read_params (SRPV, C0h) */
+	transfer.cmdType = kFLEXSPI_Write;
+	transfer.data = &read_params;
+
+	flexspi_lut[SCRATCH_CMD][0] =
+		FLEXSPI_LUT_SEQ(kFLEXSPI_Command_SDR, kFLEXSPI_1PAD, 0xC0,
+				kFLEXSPI_Command_WRITE_SDR, kFLEXSPI_1PAD, 0x1);
+	ret = memc_flexspi_set_device_config(&data->controller, &config, (uint32_t *)flexspi_lut,
+					     FLEXSPI_INSTR_END * MEMC_FLEXSPI_CMD_PER_SEQ,
+					     data->port);
 	if (ret < 0) {
 		return ret;
 	}
@@ -986,7 +1021,6 @@ static int flash_flexspi_nor_check_jedec(struct flash_flexspi_nor_data *data,
 {
 	int ret;
 	uint32_t vendor_id;
-	uint32_t read_params;
 
 	ret = flash_flexspi_nor_read_id_helper(data, (uint8_t *)&vendor_id);
 	if (ret < 0) {
@@ -995,31 +1029,17 @@ static int flash_flexspi_nor_check_jedec(struct flash_flexspi_nor_data *data,
 
 	/* Switch on manufacturer and vendor ID */
 	switch (vendor_id & 0xFFFFFF) {
-	case 0x16609d: /* IS25LP032 flash, needs P[4:3] cleared with same method as IS25WP */
+	case 0x16609d: /* IS25LP032 */
 	case 0x17609d: /* IS25LP064 */
 	case 0x18609d: /* IS25LP128 */
-		read_params = 0xE0U;
-		ret = flash_flexspi_nor_is25_clear_read_param(data, flexspi_lut, &read_params);
-		if (ret < 0) {
-			while (1) {
-				/*
-				 * Spin here, this flash won't configure correctly.
-				 * We can't print a warning, as we are unlikely to
-				 * be able to XIP at this point.
-				 */
-			}
-		}
-		/* Still return an error- we want the JEDEC configuration to run */
-		return -ENOTSUP;
 	case 0x16709d: /* IS25WP032 */
 	case 0x17709d: /* IS25WP064 */
 	case 0x18709d: /* IS25WP128 */
 		/*
-		 * IS25WP flash. We can support this flash with the JEDEC probe,
-		 * but we need to insure P[6:3] are at the default value
+		 * We can support this flash with the JEDEC probe, but we need to
+		 * ensure Dummy Cycles are at the default value
 		 */
-		read_params = 0;
-		ret = flash_flexspi_nor_is25_clear_read_param(data, flexspi_lut, &read_params);
+		ret = flash_flexspi_nor_is25_clear_dummy_cycles(data, flexspi_lut);
 		if (ret < 0) {
 			while (1) {
 				/*
diff --git a/drivers/flash/flash_mspi_nor.c b/drivers/flash/flash_mspi_nor.c
new file mode 100644
index 0000000000000..a5ced1e00703b
--- /dev/null
+++ b/drivers/flash/flash_mspi_nor.c
@@ -0,0 +1,686 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT jedec_mspi_nor
+
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+
+#include "jesd216.h"
+#include "spi_nor.h"
+
+LOG_MODULE_REGISTER(flash_mspi_nor, CONFIG_FLASH_LOG_LEVEL);
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(reset_gpios)
+#define WITH_RESET_GPIO 1
+#endif
+
+struct flash_mspi_nor_data {
+	struct k_sem acquired;
+	struct mspi_xfer_packet packet;
+	struct mspi_xfer xfer;
+};
+
+struct flash_mspi_nor_config {
+	const struct device *bus;
+	uint32_t flash_size;
+	struct mspi_dev_id mspi_id;
+	struct mspi_dev_cfg mspi_cfg;
+	enum mspi_dev_cfg_mask mspi_cfg_mask;
+#if defined(CONFIG_MSPI_XIP)
+	struct mspi_xip_cfg xip_cfg;
+#endif
+#if defined(WITH_RESET_GPIO)
+	struct gpio_dt_spec reset;
+	uint32_t reset_pulse_us;
+	uint32_t reset_recovery_us;
+#endif
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	struct flash_pages_layout layout;
+#endif
+	uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
+};
+
+static int acquire(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	k_sem_take(&dev_data->acquired, K_FOREVER);
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+	} else {
+		/* This acquires the MSPI controller and reconfigures it
+		 * if needed for the flash device.
+		 */
+		rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+				     dev_config->mspi_cfg_mask,
+				     &dev_config->mspi_cfg);
+		if (rc < 0) {
+			LOG_ERR("mspi_dev_config() failed: %d", rc);
+		} else {
+			return 0;
+		}
+
+		(void)pm_device_runtime_put(dev_config->bus);
+	}
+
+	k_sem_give(&dev_data->acquired);
+	return rc;
+}
+
+static void release(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+
+	/* This releases the MSPI controller. */
+	(void)mspi_get_channel_status(dev_config->bus, 0);
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	k_sem_give(&dev_data->acquired);
+}
+
+static inline uint32_t dev_flash_size(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	return dev_config->flash_size;
+}
+
+static inline uint16_t dev_page_size(const struct device *dev)
+{
+	return SPI_NOR_PAGE_SIZE;
+}
+
+static int api_read(const struct device *dev, off_t addr, void *dest,
+		    size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* TODO: get rid of all these hard-coded values for MX25Ux chips */
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = SPI_NOR_OCMD_RD;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+
+	release(dev);
+
+	if (rc < 0) {
+		LOG_ERR("SPI_NOR_OCMD_RD xfer failed: %d", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+static int wait_until_ready(const struct device *dev, k_timeout_t poll_period)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	uint8_t status_reg;
+	int rc;
+
+	while (true) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.addr_length = 4;
+		dev_data->xfer.rx_dummy    = 4;
+		dev_data->packet.dir       = MSPI_RX;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_RDSR;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = &status_reg;
+		dev_data->packet.num_bytes = sizeof(status_reg);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_RDSR xfer failed: %d", rc);
+			return rc;
+		}
+		if (!(status_reg & SPI_NOR_WIP_BIT)) {
+			break;
+		}
+
+		k_sleep(poll_period);
+	}
+
+	return 0;
+}
+
+static int api_write(const struct device *dev, off_t addr, const void *src,
+		     size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	const uint16_t page_size = dev_page_size(dev);
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		/* Split write into parts, each within one page only. */
+		uint16_t page_offset = (uint16_t)(addr % page_size);
+		uint16_t page_left = page_size - page_offset;
+		uint16_t to_write = (uint16_t)MIN(size, page_left);
+
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_PAGE_PRG;
+		dev_data->packet.address   = addr;
+		dev_data->packet.data_buf  = (uint8_t *)src;
+		dev_data->packet.num_bytes = to_write;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_PAGE_PRG xfer failed: %d", rc);
+			break;
+		}
+
+		addr += to_write;
+		src   = (const uint8_t *)src + to_write;
+		size -= to_write;
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_erase(const struct device *dev, off_t addr, size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	const uint32_t flash_size = dev_flash_size(dev);
+	int rc = 0;
+
+	if ((addr < 0) || ((addr + size) > flash_size)) {
+		return -EINVAL;
+	}
+
+	if (!SPI_NOR_IS_SECTOR_ALIGNED(addr)) {
+		return -EINVAL;
+	}
+
+	if ((size % SPI_NOR_SECTOR_SIZE) != 0) {
+		return -EINVAL;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	while (size > 0) {
+		dev_data->xfer.cmd_length  = 2;
+		dev_data->xfer.tx_dummy    = 0;
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.num_bytes = 0;
+
+		dev_data->xfer.addr_length = 0;
+		dev_data->packet.cmd       = SPI_NOR_OCMD_WREN;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_OCMD_WREN xfer failed: %d", rc);
+			break;
+		}
+
+		if (size == flash_size) {
+			/* Chip erase. */
+			dev_data->xfer.addr_length = 0;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_CE;
+
+			size -= flash_size;
+		} else {
+			/* Sector erase. */
+			dev_data->xfer.addr_length = 4;
+			dev_data->packet.cmd       = SPI_NOR_OCMD_SE;
+			dev_data->packet.address   = addr;
+
+			addr += SPI_NOR_SECTOR_SIZE;
+			size -= SPI_NOR_SECTOR_SIZE;
+		}
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("Erase command 0x%02x xfer failed: %d",
+				dev_data->packet.cmd, rc);
+			break;
+		}
+
+		rc = wait_until_ready(dev, K_MSEC(1));
+		if (rc < 0) {
+			break;
+		}
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static const
+struct flash_parameters *api_get_parameters(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	static const struct flash_parameters parameters = {
+		.write_block_size = 1,
+		.erase_value = 0xff,
+	};
+
+	return &parameters;
+}
+
+static int read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 4;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_ID;
+	dev_data->packet.address   = 0;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = JESD216_READ_ID_LEN;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("mspi_transceive() failed: %d\n", rc);
+		return rc;
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+static void api_page_layout(const struct device *dev,
+			     const struct flash_pages_layout **layout,
+			     size_t *layout_size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+
+	*layout = &dev_config->layout;
+	*layout_size = 1;
+}
+#endif /* CONFIG_FLASH_PAGE_LAYOUT */
+
+#if defined(CONFIG_FLASH_JESD216_API)
+static int api_sfdp_read(const struct device *dev, off_t addr, void *dest,
+			 size_t size)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (size == 0) {
+		return 0;
+	}
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	dev_data->xfer.cmd_length  = 2;
+	dev_data->xfer.addr_length = 4;
+	dev_data->xfer.rx_dummy    = 20;
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_OCMD_READ_SFDP;
+	dev_data->packet.address   = addr;
+	dev_data->packet.data_buf  = dest;
+	dev_data->packet.num_bytes = size;
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		printk("JESD216_OCMD_READ_SFDP xfer failed: %d\n", rc);
+		return rc;
+	}
+
+	release(dev);
+
+	return rc;
+}
+
+static int api_read_jedec_id(const struct device *dev, uint8_t *id)
+{
+	int rc = 0;
+
+	rc = acquire(dev);
+	if (rc < 0) {
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+
+	release(dev);
+
+	return rc;
+}
+#endif /* CONFIG_FLASH_JESD216_API  */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		break;
+	case PM_DEVICE_ACTION_RESUME:
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int flash_chip_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	struct mspi_dev_cfg init_dev_cfg = dev_config->mspi_cfg;
+	uint8_t id[JESD216_READ_ID_LEN] = {0};
+	int rc;
+
+	init_dev_cfg.freq = MHZ(1);
+	init_dev_cfg.io_mode = MSPI_IO_MODE_SINGLE;
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &init_dev_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set initial device config: %d", rc);
+		return rc;
+	}
+
+	dev_data->xfer.xfer_mode  = MSPI_PIO;
+	dev_data->xfer.packets    = &dev_data->packet;
+	dev_data->xfer.num_packet = 1;
+	dev_data->xfer.timeout    = 10;
+
+	dev_data->xfer.cmd_length  = 1;
+	dev_data->xfer.addr_length = 0;
+	dev_data->xfer.tx_dummy    = 0;
+	dev_data->xfer.rx_dummy    = 0;
+
+	dev_data->packet.dir       = MSPI_RX;
+	dev_data->packet.cmd       = JESD216_CMD_READ_ID;
+	dev_data->packet.data_buf  = id;
+	dev_data->packet.num_bytes = sizeof(id);
+	rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+			     &dev_data->xfer);
+	if (rc < 0) {
+		LOG_ERR("Failed to read JEDEC ID in single line mode: %d", rc);
+		return rc;
+	}
+
+	/*
+	 * If the read ID does not match the one from DTS, assume the flash
+	 * is already in the Octa I/O mode, so switching it is not needed.
+	 */
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) == 0) {
+		static const uint8_t enable_sopi[] = { 0x01 };
+
+		dev_data->packet.dir       = MSPI_TX;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WREN;
+		dev_data->packet.num_bytes = 0;
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			LOG_ERR("SPI_NOR_CMD_WREN xfer failed: %d", rc);
+			return rc;
+		}
+
+		dev_data->xfer.addr_length = 4;
+		dev_data->packet.cmd       = SPI_NOR_CMD_WR_CFGREG2;
+		dev_data->packet.address   = 0;
+		dev_data->packet.data_buf  = (uint8_t *)&enable_sopi;
+		dev_data->packet.num_bytes = sizeof(enable_sopi);
+		rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
+				     &dev_data->xfer);
+		if (rc < 0) {
+			printk("SPI_NOR_CMD_WR_CFGREG2 xfer failed: %d\n", rc);
+			return rc;
+		}
+	}
+
+	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
+			     MSPI_DEVICE_CONFIG_ALL, &dev_config->mspi_cfg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set device config: %d", rc);
+		return rc;
+	}
+
+	rc = read_jedec_id(dev, id);
+	if (rc < 0) {
+		return rc;
+	}
+
+	if (memcmp(id, dev_config->jedec_id, sizeof(id)) != 0) {
+		LOG_ERR("JEDEC ID mismatch, read: %02x %02x %02x, "
+			"expected: %02x %02x %02x",
+			id[0], id[1], id[2],
+			dev_config->jedec_id[0],
+			dev_config->jedec_id[1],
+			dev_config->jedec_id[2]);
+		return -ENODEV;
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	/* Enable XIP access for this chip if specified so in DT. */
+	if (dev_config->xip_cfg.enable) {
+		rc = mspi_xip_config(dev_config->bus, &dev_config->mspi_id,
+				     &dev_config->xip_cfg);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+#endif
+
+	return 0;
+}
+
+static int drv_init(const struct device *dev)
+{
+	const struct flash_mspi_nor_config *dev_config = dev->config;
+	struct flash_mspi_nor_data *dev_data = dev->data;
+	int rc;
+
+	if (!device_is_ready(dev_config->bus)) {
+		LOG_ERR("Device %s is not ready", dev_config->bus->name);
+		return -ENODEV;
+	}
+
+#if defined(WITH_RESET_GPIO)
+	if (dev_config->reset.port) {
+		if (!gpio_is_ready_dt(&dev_config->reset)) {
+			LOG_ERR("Device %s is not ready",
+				dev_config->reset.port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(&dev_config->reset,
+					   GPIO_OUTPUT_ACTIVE);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_pulse_us != 0) {
+			k_busy_wait(dev_config->reset_pulse_us);
+		}
+
+		rc = gpio_pin_set_dt(&dev_config->reset, 0);
+		if (rc < 0) {
+			LOG_ERR("Failed to deactivate RESET: %d", rc);
+			return -EIO;
+		}
+
+		if (dev_config->reset_recovery_us != 0) {
+			k_busy_wait(dev_config->reset_recovery_us);
+		}
+	}
+#endif
+
+	rc = pm_device_runtime_get(dev_config->bus);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	rc = flash_chip_init(dev);
+
+	/* Release the MSPI controller - it was acquired by the call to
+	 * mspi_dev_config() in flash_chip_init().
+	 */
+	(void)mspi_get_channel_status(dev_config->bus, 0);
+
+	(void)pm_device_runtime_put(dev_config->bus);
+
+	if (rc < 0) {
+		return rc;
+	}
+
+	k_sem_init(&dev_data->acquired, 1, K_SEM_MAX_LIMIT);
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static DEVICE_API(flash, drv_api) = {
+	.read = api_read,
+	.write = api_write,
+	.erase = api_erase,
+	.get_parameters = api_get_parameters,
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+	.page_layout = api_page_layout,
+#endif
+#if defined(CONFIG_FLASH_JESD216_API)
+	.sfdp_read = api_sfdp_read,
+	.read_jedec_id = api_read_jedec_id,
+#endif
+};
+
+#define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
+
+#if defined(CONFIG_FLASH_PAGE_LAYOUT)
+BUILD_ASSERT((CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE % 4096) == 0,
+	"MSPI_NOR_FLASH_LAYOUT_PAGE_SIZE must be multiple of 4096");
+#define FLASH_PAGE_LAYOUT_DEFINE(inst) \
+	.layout = { \
+		.pages_size = CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE, \
+		.pages_count = FLASH_SIZE_INST(inst) \
+			     / CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE, \
+	},
+#define FLASH_PAGE_LAYOUT_CHECK(inst) \
+BUILD_ASSERT((FLASH_SIZE_INST(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) == 0, \
+	"MSPI_NOR_FLASH_LAYOUT_PAGE_SIZE incompatible with flash size, instance " #inst);
+#else
+#define FLASH_PAGE_LAYOUT_DEFINE(inst)
+#define FLASH_PAGE_LAYOUT_CHECK(inst)
+#endif
+
+/* MSPI bus must be initialized before this device. */
+#if (CONFIG_MSPI_INIT_PRIORITY < CONFIG_FLASH_INIT_PRIORITY)
+#define INIT_PRIORITY CONFIG_FLASH_INIT_PRIORITY
+#else
+#define INIT_PRIORITY UTIL_INC(CONFIG_MSPI_INIT_PRIORITY)
+#endif
+
+#define FLASH_MSPI_NOR_INST(inst)						\
+	BUILD_ASSERT(DT_INST_ENUM_IDX(inst, mspi_io_mode) ==			\
+		     MSPI_IO_MODE_OCTAL,					\
+		"Only Octal I/O mode is supported for now");			\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);			\
+	static struct flash_mspi_nor_data dev##inst##_data;			\
+	static const struct flash_mspi_nor_config dev##inst##_config = {	\
+		.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),			\
+		.flash_size = FLASH_SIZE_INST(inst),				\
+		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
+		.mspi_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),			\
+		.mspi_cfg_mask = DT_PROP(DT_INST_BUS(inst),			\
+					 software_multiperipheral)		\
+			       ? MSPI_DEVICE_CONFIG_ALL				\
+			       : MSPI_DEVICE_CONFIG_NONE,			\
+	IF_ENABLED(CONFIG_MSPI_XIP,						\
+		(.xip_cfg = MSPI_XIP_CONFIG_DT_INST(inst),))			\
+	IF_ENABLED(WITH_RESET_GPIO,						\
+		(.reset = GPIO_DT_SPEC_INST_GET_OR(inst, reset_gpios, {0}),	\
+		.reset_pulse_us = DT_INST_PROP_OR(inst, t_reset_pulse, 0)	\
+				/ 1000,						\
+		.reset_recovery_us = DT_INST_PROP_OR(inst, t_reset_recovery, 0)	\
+				   / 1000,))					\
+		FLASH_PAGE_LAYOUT_DEFINE(inst)					\
+		.jedec_id = DT_INST_PROP(inst, jedec_id),			\
+	};									\
+	FLASH_PAGE_LAYOUT_CHECK(inst)						\
+	DEVICE_DT_INST_DEFINE(inst,						\
+		drv_init, PM_DEVICE_DT_INST_GET(inst),				\
+		&dev##inst##_data, &dev##inst##_config,				\
+		POST_KERNEL, INIT_PRIORITY,					\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(FLASH_MSPI_NOR_INST)
diff --git a/drivers/flash/flash_npcx_fiu_nor.c b/drivers/flash/flash_npcx_fiu_nor.c
index c368f646ad0a2..cbd3dcd70a50a 100644
--- a/drivers/flash/flash_npcx_fiu_nor.c
+++ b/drivers/flash/flash_npcx_fiu_nor.c
@@ -23,9 +23,15 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_npcx_fiu_nor, CONFIG_FLASH_LOG_LEVEL);
 
+#if defined(CONFIG_ESPI_TAF)
+static const struct device *const espi_dev = DEVICE_DT_GET(DT_NODELABEL(espi0));
+#endif
+
 #define BLOCK_64K_SIZE KB(64)
 #define BLOCK_4K_SIZE  KB(4)
 
+#define POLLING_BUSY_SLEEP_TIME_US 100
+
 /* Device config */
 struct flash_npcx_nor_config {
 	/* QSPI bus device for mutex control and bus configuration */
@@ -45,6 +51,8 @@ struct flash_npcx_nor_config {
 
 /* Device data */
 struct flash_npcx_nor_data {
+	/* mutex for flash write and erase operation */
+	struct k_sem nor_flash_sem;
 	/* Specific control operation for Quad-SPI Nor Flash */
 	uint32_t operation;
 };
@@ -153,6 +161,7 @@ static int flash_npcx_nor_wait_until_ready(const struct device *dev)
 			return 0;
 		}
 
+		k_usleep(POLLING_BUSY_SLEEP_TIME_US);
 	} while ((k_uptime_get() - st) < config->max_timeout);
 
 	return -EBUSY;
@@ -189,16 +198,32 @@ static int flash_npcx_nor_write_status_regs(const struct device *dev, uint8_t *s
 #if defined(CONFIG_FLASH_JESD216_API)
 static int flash_npcx_nor_read_jedec_id(const struct device *dev, uint8_t *id)
 {
+	int ret;
+
 	if (id == NULL) {
 		return -EINVAL;
 	}
 
-	return flash_npcx_uma_read(dev, SPI_NOR_CMD_RDID, id, SPI_NOR_MAX_ID_LEN);
+#if defined(CONFIG_ESPI_TAF)
+	if (espi_taf_npcx_block(espi_dev, true) != 0) {
+		LOG_ERR("TAF LOCK TIMEOUT");
+		return -ETIMEDOUT;
+	}
+#endif
+
+	ret = flash_npcx_uma_read(dev, SPI_NOR_CMD_RDID, id, SPI_NOR_MAX_ID_LEN);
+
+#if defined(CONFIG_ESPI_TAF)
+	espi_taf_npcx_block(espi_dev, false);
+#endif
+
+	return ret;
 }
 
 static int flash_npcx_nor_read_sfdp(const struct device *dev, off_t addr,
 				    void *data, size_t size)
 {
+	int ret;
 	uint8_t sfdp_addr[4];
 	struct npcx_uma_cfg cfg = { .opcode = JESD216_CMD_READ_SFDP,
 					.tx_buf = sfdp_addr,
@@ -214,8 +239,22 @@ static int flash_npcx_nor_read_sfdp(const struct device *dev, off_t addr,
 	sfdp_addr[0] = (addr >> 16) & 0xff;
 	sfdp_addr[1] = (addr >> 8) & 0xff;
 	sfdp_addr[2] = addr & 0xff;
-	return flash_npcx_uma_transceive(dev, &cfg, NPCX_UMA_ACCESS_WRITE |
+
+#if defined(CONFIG_ESPI_TAF)
+	if (espi_taf_npcx_block(espi_dev, true) != 0) {
+		LOG_ERR("TAF LOCK TIMEOUT");
+		return -ETIMEDOUT;
+	}
+#endif
+
+	ret = flash_npcx_uma_transceive(dev, &cfg, NPCX_UMA_ACCESS_WRITE |
 					 NPCX_UMA_ACCESS_READ);
+
+#if defined(CONFIG_ESPI_TAF)
+	espi_taf_npcx_block(espi_dev, false);
+#endif
+
+	return ret;
 }
 #endif /* CONFIG_FLASH_JESD216_API */
 
@@ -257,32 +296,47 @@ static int flash_npcx_nor_read(const struct device *dev, off_t addr,
 static int flash_npcx_nor_erase(const struct device *dev, off_t addr, size_t size)
 {
 	const struct flash_npcx_nor_config *config = dev->config;
+	struct flash_npcx_nor_data *dev_data = dev->data;
 	int ret = 0;
 
+	k_sem_take(&dev_data->nor_flash_sem, K_FOREVER);
+
 	/* Out of the region of nor flash device? */
 	if (!is_within_region(addr, size, 0, config->flash_size)) {
 		LOG_ERR("Addr %ld, size %d are out of range", addr, size);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto out_nor_erase;
 	}
 
 	/* address must be sector-aligned */
 	if (!SPI_NOR_IS_SECTOR_ALIGNED(addr)) {
 		LOG_ERR("Addr %ld is not sector-aligned", addr);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto out_nor_erase;
 	}
 
 	/* size must be a multiple of sectors */
 	if ((size % BLOCK_4K_SIZE) != 0) {
 		LOG_ERR("Size %d is not a multiple of sectors", size);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto out_nor_erase;
 	}
 
+#if defined(CONFIG_ESPI_TAF)
+	if (espi_taf_npcx_block(espi_dev, true) != 0) {
+		LOG_ERR("TAF LOCK TIMEOUT");
+		ret = -ETIMEDOUT;
+		goto out_nor_erase;
+	}
+#endif
+
 	/* Select erase opcode by size */
 	if (size == config->flash_size) {
 		flash_npcx_uma_cmd_only(dev, SPI_NOR_CMD_WREN);
 		/* Send chip erase command */
 		flash_npcx_uma_cmd_only(dev, SPI_NOR_CMD_CE);
-		return flash_npcx_nor_wait_until_ready(dev);
+		ret = flash_npcx_nor_wait_until_ready(dev);
+		goto out_nor_erase_unblock;
 	}
 
 	while (size > 0) {
@@ -302,6 +356,12 @@ static int flash_npcx_nor_erase(const struct device *dev, off_t addr, size_t siz
 			break;
 		}
 	}
+out_nor_erase_unblock:
+#if defined(CONFIG_ESPI_TAF)
+	espi_taf_npcx_block(espi_dev, false);
+#endif
+out_nor_erase:
+	k_sem_give(&dev_data->nor_flash_sem);
 
 	return ret;
 }
@@ -310,12 +370,16 @@ static int flash_npcx_nor_write(const struct device *dev, off_t addr,
 				  const void *data, size_t size)
 {
 	const struct flash_npcx_nor_config *config = dev->config;
+	struct flash_npcx_nor_data *dev_data = dev->data;
 	uint8_t *tx_buf = (uint8_t *)data;
 	int ret = 0;
 	size_t sz_write;
 
+	k_sem_take(&dev_data->nor_flash_sem, K_FOREVER);
+
 	/* Out of the region of nor flash device? */
 	if (!is_within_region(addr, size, 0, config->flash_size)) {
+		k_sem_give(&dev_data->nor_flash_sem);
 		return -EINVAL;
 	}
 
@@ -335,20 +399,38 @@ static int flash_npcx_nor_write(const struct device *dev, off_t addr,
 	}
 
 	while (size > 0) {
+#if defined(CONFIG_ESPI_TAF)
+		if (espi_taf_npcx_block(espi_dev, true) != 0) {
+			LOG_ERR("TAF LOCK TIMEOUT");
+			k_sem_give(&dev_data->nor_flash_sem);
+
+			return -ETIMEDOUT;
+		}
+#endif
 		/* Start to write */
 		flash_npcx_uma_cmd_only(dev, SPI_NOR_CMD_WREN);
 		ret = flash_npcx_uma_write_by_addr(dev, SPI_NOR_CMD_PP, tx_buf,
 						   sz_write, addr);
 		if (ret != 0) {
+#if defined(CONFIG_ESPI_TAF)
+			espi_taf_npcx_block(espi_dev, false);
+#endif
 			break;
 		}
 
 		/* Wait for writing completed */
 		ret = flash_npcx_nor_wait_until_ready(dev);
 		if (ret != 0) {
+#if defined(CONFIG_ESPI_TAF)
+			espi_taf_npcx_block(espi_dev, false);
+#endif
 			break;
 		}
 
+#if defined(CONFIG_ESPI_TAF)
+		espi_taf_npcx_block(espi_dev, false);
+#endif
+
 		size -= sz_write;
 		tx_buf += sz_write;
 		addr += sz_write;
@@ -360,6 +442,8 @@ static int flash_npcx_nor_write(const struct device *dev, off_t addr,
 		}
 	}
 
+	k_sem_give(&dev_data->nor_flash_sem);
+
 	return ret;
 }
 
@@ -459,7 +543,16 @@ static int flash_npcx_nor_ex_op(const struct device *dev, uint16_t code,
 		}
 #endif
 
+#if defined(CONFIG_ESPI_TAF)
+		if (espi_taf_npcx_block(espi_dev, true) != 0) {
+			LOG_ERR("TAF LOCK TIMEOUT");
+			return -ETIMEDOUT;
+		}
+#endif
 		ret = flash_npcx_nor_ex_exec_uma(dev, op_in, op_out);
+#if defined(CONFIG_ESPI_TAF)
+		espi_taf_npcx_block(espi_dev, false);
+#endif
 #ifdef CONFIG_USERSPACE
 		if (ret == 0 && syscall_trap) {
 			K_OOPS(k_usermode_to_copy(out, op_out, sizeof(out_copy)));
@@ -529,6 +622,7 @@ static DEVICE_API(flash, flash_npcx_nor_driver_api) = {
 static int flash_npcx_nor_init(const struct device *dev)
 {
 	const struct flash_npcx_nor_config *config = dev->config;
+	struct flash_npcx_nor_data *dev_data = dev->data;
 	int ret;
 
 	if (!IS_ENABLED(CONFIG_FLASH_NPCX_FIU_NOR_INIT)) {
@@ -591,6 +685,8 @@ static int flash_npcx_nor_init(const struct device *dev)
 		qspi_npcx_fiu_set_spi_size(config->qspi_bus, &config->qspi_cfg);
 	}
 
+	k_sem_init(&dev_data->nor_flash_sem, 1, 1);
+
 	return 0;
 }
 
diff --git a/drivers/flash/flash_sam.c b/drivers/flash/flash_sam.c
index ba439bdec335b..bb248fdf38e71 100644
--- a/drivers/flash/flash_sam.c
+++ b/drivers/flash/flash_sam.c
@@ -396,17 +396,12 @@ static bool sam_flash_erase_foreach_page(const struct flash_pages_info *info, vo
 	/* Check if we've reached the end of pages to erase */
 	if (info->start_offset >= erase_data->section_end) {
 		/* Succeeded, stop iterating */
-		erase_data->succeeded = true;
 		return false;
 	}
 
-	if (sam_flash_unlock_page(dev, info) < 0) {
-		/* Failed to unlock page, stop iterating */
-		return false;
-	}
-
-	if (sam_flash_erase_page(dev, info) < 0) {
-		/* Failed to erase page, stop iterating */
+	if (sam_flash_unlock_page(dev, info) || sam_flash_erase_page(dev, info)) {
+		/* Failed to unlock page and erase page, stop iterating */
+		erase_data->succeeded = false;
 		return false;
 	}
 
@@ -436,7 +431,7 @@ static int sam_flash_erase(const struct device *dev, off_t offset, size_t size)
 	key = k_spin_lock(&sam_data->lock);
 	sam_data->erase_data.section_start = offset;
 	sam_data->erase_data.section_end = offset + size;
-	sam_data->erase_data.succeeded = false;
+	sam_data->erase_data.succeeded = true;
 	flash_page_foreach(dev, sam_flash_erase_foreach_page, sam_data);
 	if (!sam_data->erase_data.succeeded) {
 		k_spin_unlock(&sam_data->lock, key);
diff --git a/drivers/flash/flash_stm32.h b/drivers/flash/flash_stm32.h
index 01d0c21d3f5fe..3480f152b4cdf 100644
--- a/drivers/flash/flash_stm32.h
+++ b/drivers/flash/flash_stm32.h
@@ -131,7 +131,12 @@ struct flash_stm32_priv {
 #define FLASH_STM32_NSPNB_POS FLASH_NSCR1_PNB_Pos
 #define FLASH_STM32_NSPNB FLASH_NSCR1_PNB
 #define FLASH_STM32_NSSTRT FLASH_NSCR1_STRT
+/* STM32WBA6x has DUAL bank flash */
+#if defined(FLASH_OPTR_DUAL_BANK)
+#define FLASH_STM32_DBANK FLASH_OPTR_DUAL_BANK
+#endif /* FLASH_OPTR_DUAL_BANK */
 #endif /* CONFIG_SOC_SERIES_STM32U5X */
+
 #if defined(FLASH_OPTR_DBANK)
 #define FLASH_STM32_DBANK FLASH_OPTR_DBANK
 #endif /* FLASH_OPTR_DBANK */
diff --git a/drivers/flash/flash_stm32_ospi.c b/drivers/flash/flash_stm32_ospi.c
index 0f0453d967f2f..3c9fe5e542a05 100644
--- a/drivers/flash/flash_stm32_ospi.c
+++ b/drivers/flash/flash_stm32_ospi.c
@@ -2593,7 +2593,7 @@ static const struct flash_stm32_ospi_config flash_stm32_ospi_cfg = {
 		       .enr = DT_CLOCKS_CELL_BY_NAME(STM32_OSPI_NODE, ospi_mgr, bits)},
 #endif
 	.irq_config = flash_stm32_ospi_irq_config_func,
-	.flash_size = DT_INST_REG_ADDR_BY_IDX(0, 1),
+	.flash_size = DT_INST_REG_SIZE(0),
 	.max_frequency = DT_INST_PROP(0, ospi_max_frequency),
 	.data_mode = DT_INST_PROP(0, spi_bus_width), /* SPI or OPI */
 	.data_rate = DT_INST_PROP(0, data_rate), /* DTR or STR */
diff --git a/drivers/flash/flash_stm32_qspi.c b/drivers/flash/flash_stm32_qspi.c
index 83a98067bd750..d1d7985473679 100644
--- a/drivers/flash/flash_stm32_qspi.c
+++ b/drivers/flash/flash_stm32_qspi.c
@@ -1617,7 +1617,7 @@ static const struct flash_stm32_qspi_config flash_stm32_qspi_cfg = {
 		.bus = DT_CLOCKS_CELL(STM32_QSPI_NODE, bus)
 	},
 	.irq_config = flash_stm32_qspi_irq_config_func,
-	.flash_size = DT_INST_REG_ADDR_BY_IDX(0, 1) << STM32_QSPI_DOUBLE_FLASH,
+	.flash_size = DT_INST_REG_SIZE(0) << STM32_QSPI_DOUBLE_FLASH,
 	.max_frequency = DT_INST_PROP(0, qspi_max_frequency),
 	.pcfg = PINCTRL_DT_DEV_CONFIG_GET(STM32_QSPI_NODE),
 #if STM32_QSPI_RESET_GPIO
diff --git a/drivers/flash/flash_stm32_xspi.c b/drivers/flash/flash_stm32_xspi.c
index 81d6f21eb6487..29b352dee6b48 100644
--- a/drivers/flash/flash_stm32_xspi.c
+++ b/drivers/flash/flash_stm32_xspi.c
@@ -190,7 +190,9 @@ static XSPI_RegularCmdTypeDef xspi_prepare_cmd(const uint8_t transfer_mode,
 		.DQSMode = (transfer_rate == XSPI_DTR_TRANSFER)
 				? HAL_XSPI_DQS_ENABLE
 				: HAL_XSPI_DQS_DISABLE,
+#ifdef XSPI_CCR_SIOO
 		.SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD,
+#endif /* XSPI_CCR_SIOO */
 	};
 
 	switch (transfer_mode) {
@@ -773,7 +775,9 @@ static int stm32_xspi_mem_reset(const struct device *dev)
 		.DataLength = HAL_XSPI_DATA_NONE,
 		.DummyCycles = 0U,
 		.DQSMode = HAL_XSPI_DQS_DISABLE,
+#ifdef XSPI_CCR_SIOO
 		.SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD,
+#endif /* XSPI_CCR_SIOO */
 	};
 
 	/* Reset enable in SPI mode and STR transfer mode */
@@ -1021,7 +1025,9 @@ static int flash_stm32_xspi_erase(const struct device *dev, off_t addr,
 		.DataMode = HAL_XSPI_DATA_NONE,
 		.DummyCycles = 0U,
 		.DQSMode = HAL_XSPI_DQS_DISABLE,
+#ifdef XSPI_CCR_SIOO
 		.SIOOMode = HAL_XSPI_SIOO_INST_EVERY_CMD,
+#endif /* XSPI_CCR_SIOO */
 	};
 
 	if (stm32_xspi_mem_ready(dev,
@@ -2121,11 +2127,13 @@ static int flash_stm32_xspi_init(const struct device *dev)
 	} else {
 
 	}
+#if defined(XSPI_DCR1_DLYBYP)
 #if STM32_XSPI_DLYB_BYPASSED
 	dev_data->hxspi.Init.DelayBlockBypass = HAL_XSPI_DELAY_BLOCK_BYPASS;
 #else
 	dev_data->hxspi.Init.DelayBlockBypass = HAL_XSPI_DELAY_BLOCK_ON;
 #endif /* STM32_XSPI_DLYB_BYPASSED */
+#endif /* XSPI_DCR1_DLYBYP */
 
 
 	if (HAL_XSPI_Init(&dev_data->hxspi) != HAL_OK) {
@@ -2405,7 +2413,7 @@ static const struct flash_stm32_xspi_config flash_stm32_xspi_cfg = {
 	.pclken = pclken,
 	.pclk_len = DT_NUM_CLOCKS(STM32_XSPI_NODE),
 	.irq_config = flash_stm32_xspi_irq_config_func,
-	.flash_size = DT_INST_REG_ADDR_BY_IDX(0, 1),
+	.flash_size = DT_INST_REG_SIZE(0),
 	.max_frequency = DT_INST_PROP(0, ospi_max_frequency),
 	.data_mode = DT_INST_PROP(0, spi_bus_width), /* SPI or OPI */
 	.data_rate = DT_INST_PROP(0, data_rate), /* DTR or STR */
diff --git a/drivers/flash/flash_stm32h7x.c b/drivers/flash/flash_stm32h7x.c
index 24f5b0b3a7d56..3873e9e13753c 100644
--- a/drivers/flash/flash_stm32h7x.c
+++ b/drivers/flash/flash_stm32h7x.c
@@ -45,7 +45,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 #define REAL_FLASH_SIZE_KB (KB(STM32H7_M4_FLASH_SIZE * 2))
 #endif
 #else
-#define REAL_FLASH_SIZE_KB KB(LL_GetFlashSize())
+#define REAL_FLASH_SIZE_KB DT_REG_SIZE(DT_INST(0, st_stm32_nv_flash))
 #endif
 #define SECTOR_PER_BANK ((REAL_FLASH_SIZE_KB / FLASH_SECTOR_SIZE) / 2)
 #if defined(DUAL_BANK)
@@ -67,7 +67,9 @@ struct flash_stm32_sector_t {
 	volatile uint32_t *sr;
 };
 
-static __unused int commit_optb(const struct device *dev)
+#if defined(CONFIG_FLASH_STM32_READOUT_PROTECTION) || defined(CONFIG_FLASH_STM32_WRITE_PROTECT)
+
+static int commit_optb(const struct device *dev)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
 	int64_t timeout_time = k_uptime_get() + STM32H7_FLASH_OPT_TIMEOUT_MS;
@@ -87,8 +89,8 @@ static __unused int commit_optb(const struct device *dev)
 }
 
 /* Returns negative value on error, 0 if a change was not need, 1 if a change has been made. */
-static __unused int write_opt(const struct device *dev, uint32_t mask, uint32_t value,
-			      uintptr_t cur, bool commit)
+static int write_opt(const struct device *dev, uint32_t mask, uint32_t value, uintptr_t cur,
+		     bool commit)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
 	/* PRG register always follows CUR register. */
@@ -124,7 +126,10 @@ static __unused int write_opt(const struct device *dev, uint32_t mask, uint32_t
 	return 1;
 }
 
-static __unused int write_optsr(const struct device *dev, uint32_t mask, uint32_t value)
+#endif /* CONFIG_FLASH_STM32_WRITE_PROTECT || CONFIG_FLASH_STM32_READOUT_PROTECTION */
+
+#if defined(CONFIG_FLASH_STM32_READOUT_PROTECTION)
+static int write_optsr(const struct device *dev, uint32_t mask, uint32_t value)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
 	uintptr_t cur = (uintptr_t)regs + offsetof(FLASH_TypeDef, OPTSR_CUR);
@@ -132,26 +137,6 @@ static __unused int write_optsr(const struct device *dev, uint32_t mask, uint32_
 	return write_opt(dev, mask, value, cur, true);
 }
 
-static __unused int write_optwp(const struct device *dev, uint32_t mask, uint32_t value,
-				 uint32_t bank)
-{
-	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	uintptr_t cur = (uintptr_t)regs + offsetof(FLASH_TypeDef, WPSN_CUR1);
-
-	if (bank >= NUMBER_OF_BANKS) {
-		return -EINVAL;
-	}
-
-#ifdef DUAL_BANK
-	if (bank == 1) {
-		cur = (uintptr_t)regs + offsetof(FLASH_TypeDef, WPSN_CUR2);
-	}
-#endif /* DUAL_BANK */
-
-	return write_opt(dev, mask, value, cur, false);
-}
-
-#if defined(CONFIG_FLASH_STM32_READOUT_PROTECTION)
 uint8_t flash_stm32_get_rdp_level(const struct device *dev)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
@@ -170,6 +155,24 @@ void flash_stm32_set_rdp_level(const struct device *dev, uint8_t level)
 #define WP_MSK FLASH_WPSN_WRPSN_Msk
 #define WP_POS FLASH_WPSN_WRPSN_Pos
 
+static int write_optwp(const struct device *dev, uint32_t mask, uint32_t value, uint32_t bank)
+{
+	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
+	uintptr_t cur = (uintptr_t)regs + offsetof(FLASH_TypeDef, WPSN_CUR1);
+
+	if (bank >= NUMBER_OF_BANKS) {
+		return -EINVAL;
+	}
+
+#ifdef DUAL_BANK
+	if (bank == 1) {
+		cur = (uintptr_t)regs + offsetof(FLASH_TypeDef, WPSN_CUR2);
+	}
+#endif /* DUAL_BANK */
+
+	return write_opt(dev, mask, value, cur, false);
+}
+
 int flash_stm32_update_wp_sectors(const struct device *dev, uint64_t changed_sectors,
 				  uint64_t protected_sectors)
 {
diff --git a/drivers/flash/flash_stm32wba_fm.c b/drivers/flash/flash_stm32wba_fm.c
index 08838a147aad3..8ebf1a35bd9bc 100644
--- a/drivers/flash/flash_stm32wba_fm.c
+++ b/drivers/flash/flash_stm32wba_fm.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(flash_stm32wba, CONFIG_FLASH_LOG_LEVEL);
 #define STM32_FLASH_TIMEOUT	\
 	(2 * DT_PROP(DT_INST(0, st_stm32_nv_flash), max_erase_time))
 
-extern struct k_work_q ble_ctlr_work_q;
+extern struct k_work_q ble_ctrl_work_q;
 struct k_work fm_work;
 
 static const struct flash_parameters flash_stm32_parameters = {
@@ -47,7 +47,7 @@ struct FM_CallbackNode cb_ptr = {
 
 void FM_ProcessRequest(void)
 {
-	k_work_submit_to_queue(&ble_ctlr_work_q, &fm_work);
+	k_work_submit_to_queue(&ble_ctrl_work_q, &fm_work);
 }
 
 void FM_BackgroundProcess_Entry(struct k_work *work)
diff --git a/drivers/flash/flash_stm32wbax.c b/drivers/flash/flash_stm32wbax.c
index 8660d46c26500..d7abb3ff928db 100644
--- a/drivers/flash/flash_stm32wbax.c
+++ b/drivers/flash/flash_stm32wbax.c
@@ -20,7 +20,20 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #include "flash_stm32.h"
 
+#if defined(FLASH_OPTR_DUAL_BANK)
+/* The stm32wba6x MCUs have 2MB dual-bank */
+#define STM32_SERIES_MAX_FLASH	2048
+#define STM32_FLASH_HAS_2_BANKS(flash_device) \
+	((FLASH_STM32_REGS(flash_device)->OPTR & FLASH_STM32_DBANK) \
+	== FLASH_STM32_DBANK)
+#else
 #define STM32_SERIES_MAX_FLASH	1024
+#define STM32_FLASH_HAS_2_BANKS(flash_device) (false)
+#endif /* FLASH_OPTR_DUAL_BANK */
+
+#define PAGES_PER_BANK ((FLASH_SIZE / FLASH_PAGE_SIZE) / 2)
+
+#define BANK2_OFFSET	(KB(STM32_SERIES_MAX_FLASH) / 2)
 
 #define ICACHE_DISABLE_TIMEOUT_VALUE           1U   /* 1ms */
 #define ICACHE_INVALIDATE_TIMEOUT_VALUE        1U   /* 1ms */
@@ -105,6 +118,34 @@ static int icache_wait_for_invalidate_complete(void)
 	return status;
 }
 
+/*
+ * offset and len must be aligned on write-block-size for write,
+ * positive and not beyond end of flash
+ */
+bool flash_stm32_valid_range(const struct device *dev, off_t offset,
+			     uint32_t len, bool write)
+{
+	if (STM32_FLASH_HAS_2_BANKS(dev) &&
+			(CONFIG_FLASH_SIZE < STM32_SERIES_MAX_FLASH)) {
+		/*
+		 * In case of bank1/2 discontinuity, the range should not
+		 * start before bank2 and end beyond bank1 at the same time.
+		 * Locations beyond bank2 are caught by
+		 * flash_stm32_range_exists.
+		 */
+		if ((offset < BANK2_OFFSET) &&
+					(offset + len > FLASH_SIZE / 2)) {
+			return false;
+		}
+	}
+
+	if (write && !flash_stm32_valid_write(offset, len)) {
+		return false;
+	}
+
+	return flash_stm32_range_exists(dev, offset, len);
+}
+
 static int write_qword(const struct device *dev, off_t offset, const uint32_t *buff)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
@@ -172,9 +213,40 @@ static int erase_page(const struct device *dev, unsigned int offset)
 		return rc;
 	}
 
+#if defined(FLASH_OPTR_DUAL_BANK)
+	bool bank_swap;
+	/* Check whether bank1/2 are swapped */
+	bank_swap =
+	((regs->OPTR & FLASH_OPTR_SWAP_BANK) == FLASH_OPTR_SWAP_BANK);
+
+	if ((offset < (FLASH_SIZE / 2)) && !bank_swap) {
+		/* The pages to be erased is in bank 1 */
+		regs->NSCR &= ~FLASH_STM32_NSBKER_MSK;
+		page = offset / FLASH_PAGE_SIZE;
+		LOG_DBG("Erase page %d on bank 1", page);
+	} else if ((offset >= BANK2_OFFSET) && bank_swap) {
+		/* The pages to be erased is in bank 1 */
+		regs->NSCR &= ~FLASH_STM32_NSBKER_MSK;
+		page = (offset - BANK2_OFFSET) / FLASH_PAGE_SIZE;
+		LOG_DBG("Erase page %d on bank 1", page);
+	} else if ((offset < (FLASH_SIZE / 2)) && bank_swap) {
+		/* The pages to be erased is in bank 2 */
+		regs->NSCR |= FLASH_STM32_NSBKER;
+		page = offset / FLASH_PAGE_SIZE;
+		LOG_DBG("Erase page %d on bank 2", page);
+	} else if ((offset >= BANK2_OFFSET) && !bank_swap) {
+		/* The pages to be erased is in bank 2 */
+		regs->NSCR |= FLASH_STM32_NSBKER;
+		page = (offset - BANK2_OFFSET) / FLASH_PAGE_SIZE;
+		LOG_DBG("Erase page %d on bank 2", page);
+	} else {
+		LOG_ERR("Offset %d does not exist", offset);
+		return -EINVAL;
+	}
+#else
 	page = offset / FLASH_PAGE_SIZE;
 	LOG_DBG("Erase page %d\n", page);
-
+#endif
 	/* Set the NSPER bit and select the page you wish to erase */
 	regs->NSCR |= FLASH_STM32_NSPER;
 	regs->NSCR &= ~FLASH_STM32_NSPNB_MSK;
@@ -282,6 +354,55 @@ int flash_stm32_write_range(const struct device *dev, unsigned int offset,
 	return rc;
 }
 
+#if defined(FLASH_OPTR_DUAL_BANK)
+/* The STM32WBA6x has a dual-bank flash */
+void flash_stm32_page_layout(const struct device *dev,
+			     const struct flash_pages_layout **layout,
+			     size_t *layout_size)
+{
+	static struct flash_pages_layout stm32_flash_layout[3];
+	static size_t stm32_flash_layout_size;
+
+	*layout = stm32_flash_layout;
+
+	if (stm32_flash_layout[0].pages_count != 0) {
+		/* Short circuit calculation logic if already performed (size is known) */
+		*layout_size = stm32_flash_layout_size;
+		return;
+	}
+
+	if (STM32_FLASH_HAS_2_BANKS(dev) &&
+			(CONFIG_FLASH_SIZE < STM32_SERIES_MAX_FLASH)) {
+		/* For device, which has space between banks 1 and 2 */
+
+		/* Bank1 */
+		stm32_flash_layout[0].pages_count = PAGES_PER_BANK;
+		stm32_flash_layout[0].pages_size = FLASH_PAGE_SIZE;
+
+		/* Dummy page corresponding to space between banks 1 and 2 */
+		stm32_flash_layout[1].pages_count = 1;
+		stm32_flash_layout[1].pages_size = BANK2_OFFSET
+				- (PAGES_PER_BANK * FLASH_PAGE_SIZE);
+
+		/* Bank2 */
+		stm32_flash_layout[2].pages_count = PAGES_PER_BANK;
+		stm32_flash_layout[2].pages_size = FLASH_PAGE_SIZE;
+
+		stm32_flash_layout_size = ARRAY_SIZE(stm32_flash_layout);
+	} else {
+		/*
+		 * For device, which has no space between banks 1 and 2
+		 * Considering one layout of full flash size, even with 2 banks
+		 */
+		stm32_flash_layout[0].pages_count = FLASH_SIZE / FLASH_PAGE_SIZE;
+		stm32_flash_layout[0].pages_size = FLASH_PAGE_SIZE;
+
+		stm32_flash_layout_size = 1;
+	}
+
+	*layout_size = stm32_flash_layout_size;
+}
+#else
 void flash_stm32_page_layout(const struct device *dev,
 			     const struct flash_pages_layout **layout,
 			     size_t *layout_size)
@@ -301,3 +422,4 @@ void flash_stm32_page_layout(const struct device *dev,
 	*layout = &stm32wba_flash_layout;
 	*layout_size = 1;
 }
+#endif /* FLASH_OPTR_DUAL_BANK */
diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c
index 86a06cddff30f..a09e79dfa6c08 100644
--- a/drivers/flash/soc_flash_mcux.c
+++ b/drivers/flash/soc_flash_mcux.c
@@ -43,7 +43,7 @@ LOG_MODULE_REGISTER(flash_mcux);
 
 #if defined(SOC_HAS_IAP) && !defined(CONFIG_SOC_LPC55S36)
 #include "fsl_iap.h"
-#elif defined(CONFIG_SOC_MCXA156)
+#elif defined(CONFIG_SOC_SERIES_MCXA)
 #include "fsl_romapi.h"
 #define FLASH_Erase   FLASH_EraseSector
 #define FLASH_Program FLASH_ProgramPhrase
@@ -138,6 +138,11 @@ static void clear_flash_caches(void)
 	/* this bit clears the code cache */
 	*lpcac_ctrl |= BIT(1);
 }
+#elif CONFIG_SOC_SERIES_MCXA
+static void clear_flash_caches(void)
+{
+	SYSCON->LPCAC_CTRL |= SYSCON_LPCAC_CTRL_DIS_LPCAC(1U);
+}
 #else
 #undef SOC_FLASH_NEED_CLEAR_CACHES
 #define clear_flash_caches(...)
diff --git a/drivers/flash/soc_flash_nrf.h b/drivers/flash/soc_flash_nrf.h
index 6e6d9ad10892f..24b899aaf29c7 100644
--- a/drivers/flash/soc_flash_nrf.h
+++ b/drivers/flash/soc_flash_nrf.h
@@ -25,6 +25,9 @@ struct flash_context {
 #if defined(CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE)
 	uint32_t flash_addr_next;
 #endif /* CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE */
+#if defined(CONFIG_SOC_FLASH_NRF_CUSTOM_CONTEXT)
+	void *custom_context;
+#endif
 }; /*< Context type for f. @ref write_op @ref erase_op */
 
 #ifndef CONFIG_SOC_FLASH_NRF_RADIO_SYNC_NONE
diff --git a/drivers/flash/soc_flash_silabs_series2.c b/drivers/flash/soc_flash_silabs_series2.c
new file mode 100644
index 0000000000000..9b6e4968639b6
--- /dev/null
+++ b/drivers/flash/soc_flash_silabs_series2.c
@@ -0,0 +1,336 @@
+/*
+ * Copyright (c) 2018, Piotr Mienkowski
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT     silabs_series2_flash_controller
+#define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
+
+#include <stddef.h>
+#include <string.h>
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/dma.h>
+#include <soc.h>
+#include <em_msc.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(flash_silabs, CONFIG_FLASH_LOG_LEVEL);
+
+struct flash_silabs_data {
+	struct k_sem lock;
+#if defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_WRITE) || defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)
+	const struct device *dma_dev;
+	uint32_t dma_channel;
+#endif
+#if defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)
+	struct k_sem sync;
+	int sync_status;
+	struct dma_config dma_cfg;
+	struct dma_block_config dma_block_cfg;
+#endif
+};
+
+struct flash_silabs_config {
+	struct flash_parameters flash_parameters;
+	struct flash_pages_layout page_layout;
+	bool lpwrite;
+};
+
+static bool flash_silabs_read_range_is_valid(off_t offset, uint32_t size)
+{
+	return (offset >= 0) && (offset < DT_REG_SIZE(SOC_NV_FLASH_NODE)) &&
+	       ((DT_REG_SIZE(SOC_NV_FLASH_NODE) - offset) >= size);
+}
+
+static bool flash_silabs_write_range_is_valid(off_t offset, uint32_t size)
+{
+	/* Note:
+	 * - A flash address to write to must be aligned to words.
+	 * - Number of bytes to write must be divisible by 4.
+	 */
+	return flash_silabs_read_range_is_valid(offset, size) &&
+	       IS_ALIGNED(offset, sizeof(uint32_t)) && IS_ALIGNED(size, 4);
+}
+
+static void flash_silabs_write_protection(bool enable)
+{
+	if (enable) {
+		/* Lock the MSC module. */
+		MSC->LOCK = 0;
+	} else {
+		/* Unlock the MSC module. */
+		MSC->LOCK = MSC_LOCK_LOCKKEY_UNLOCK;
+	}
+}
+
+#if defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)
+static void flash_silabs_read_callback(const struct device *dma_dev, void *user_data,
+				       uint32_t channel, int status)
+{
+	const struct device *dev = user_data;
+	struct flash_silabs_data *data = dev->data;
+
+	data->sync_status = status;
+	k_sem_give(&data->sync);
+}
+#endif
+
+static int flash_silabs_read_dma(const struct device *dev, off_t offset, void *data, size_t size)
+{
+#if defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)
+	struct flash_silabs_data *const dev_data = dev->data;
+	size_t data_size = 1;
+	int err;
+
+	if (IS_ALIGNED(offset, sizeof(uint32_t)) && IS_ALIGNED(data, sizeof(uint32_t)) &&
+	    IS_ALIGNED(size, 4)) {
+		data_size = 4;
+	}
+
+	k_sem_take(&dev_data->lock, K_FOREVER);
+
+	dev_data->dma_cfg.source_data_size = data_size;
+	dev_data->dma_cfg.dest_data_size = data_size;
+	dev_data->dma_cfg.source_burst_length = data_size;
+	dev_data->dma_cfg.dest_burst_length = data_size;
+
+	dev_data->dma_block_cfg = (struct dma_block_config){
+		.block_size = size,
+		.source_address = DT_REG_ADDR(SOC_NV_FLASH_NODE) + offset,
+		.dest_address = (uint32_t)data,
+	};
+
+	err = dma_config(dev_data->dma_dev, dev_data->dma_channel, &dev_data->dma_cfg);
+	if (err < 0) {
+		goto cleanup;
+	}
+
+	err = dma_start(dev_data->dma_dev, dev_data->dma_channel);
+	if (err < 0) {
+		goto cleanup;
+	}
+
+	k_sem_take(&dev_data->sync, K_FOREVER);
+	if (dev_data->sync_status != DMA_STATUS_COMPLETE) {
+		err = dev_data->sync_status;
+	}
+
+cleanup:
+	k_sem_give(&dev_data->lock);
+	return err;
+#else
+	return -ENOTSUP;
+#endif
+}
+
+static int flash_silabs_read(const struct device *dev, off_t offset, void *data, size_t size)
+{
+	if (!flash_silabs_read_range_is_valid(offset, size)) {
+		return -EINVAL;
+	}
+
+	if (!size) {
+		return 0;
+	}
+
+	if (IS_ENABLED(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)) {
+		return flash_silabs_read_dma(dev, offset, data, size);
+	}
+
+	memcpy(data, (uint8_t *)DT_REG_ADDR(SOC_NV_FLASH_NODE) + offset, size);
+
+	return 0;
+}
+
+static int flash_silabs_write(const struct device *dev, off_t offset, const void *data, size_t size)
+{
+	struct flash_silabs_data *const dev_data = dev->data;
+	void *address;
+	int ret = 0;
+
+	if (!flash_silabs_write_range_is_valid(offset, size)) {
+		return -EINVAL;
+	}
+
+	if (!size) {
+		return 0;
+	}
+
+	k_sem_take(&dev_data->lock, K_FOREVER);
+	flash_silabs_write_protection(false);
+
+	address = (uint8_t *)DT_REG_ADDR(SOC_NV_FLASH_NODE) + offset;
+#ifdef CONFIG_SOC_FLASH_SILABS_S2_DMA_WRITE
+	/* If the DMA channel has previously been used for a different purpose,
+	 * clear any lingering configuration that the MSC API doesn't tolerate.
+	 */
+	LDMA->IEN_CLR = BIT(dev_data->dma_channel);
+	LDMA->CHDONE_CLR = BIT(dev_data->dma_channel);
+	ret = MSC_WriteWordDma(dev_data->dma_channel, address, data, size);
+#else
+	ret = MSC_WriteWord(address, data, size);
+#endif
+	if (ret < 0) {
+		ret = -EIO;
+	}
+
+	flash_silabs_write_protection(true);
+	k_sem_give(&dev_data->lock);
+
+	return ret;
+}
+
+static int flash_silabs_erase_block(off_t offset, size_t size)
+{
+	void *address;
+	int ret = 0;
+
+	for (off_t tmp = offset; tmp < offset + size;
+	     tmp += DT_PROP(SOC_NV_FLASH_NODE, erase_block_size)) {
+		address = (uint8_t *)DT_REG_ADDR(SOC_NV_FLASH_NODE) + tmp;
+		ret = MSC_ErasePage(address);
+		if (ret < 0) {
+			ret = -EIO;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+static int flash_silabs_erase(const struct device *dev, off_t offset, size_t size)
+{
+	struct flash_silabs_data *const dev_data = dev->data;
+	int ret;
+
+	if (!flash_silabs_read_range_is_valid(offset, size)) {
+		return -EINVAL;
+	}
+
+	if (!IS_ALIGNED(offset, DT_PROP(SOC_NV_FLASH_NODE, erase_block_size))) {
+		LOG_ERR("offset 0x%lx: not on a page boundary", (long)offset);
+		return -EINVAL;
+	}
+
+	if (!IS_ALIGNED(size, DT_PROP(SOC_NV_FLASH_NODE, erase_block_size))) {
+		LOG_ERR("size %zu: not multiple of a page size", size);
+		return -EINVAL;
+	}
+
+	if (!size) {
+		return 0;
+	}
+
+	k_sem_take(&dev_data->lock, K_FOREVER);
+	flash_silabs_write_protection(false);
+
+	ret = flash_silabs_erase_block(offset, size);
+
+	flash_silabs_write_protection(true);
+	k_sem_give(&dev_data->lock);
+
+	return ret;
+}
+
+#if CONFIG_FLASH_PAGE_LAYOUT
+void flash_silabs_page_layout(const struct device *dev, const struct flash_pages_layout **layout,
+			      size_t *layout_size)
+{
+	const struct flash_silabs_config *const config = dev->config;
+
+	*layout = &config->page_layout;
+	*layout_size = 1;
+}
+#endif
+
+static const struct flash_parameters *flash_silabs_get_parameters(const struct device *dev)
+{
+	const struct flash_silabs_config *const config = dev->config;
+
+	return &config->flash_parameters;
+}
+
+static int flash_silabs_get_size(const struct device *dev, uint64_t *size)
+{
+	ARG_UNUSED(dev);
+
+	*size = (uint64_t)DT_REG_SIZE(SOC_NV_FLASH_NODE);
+
+	return 0;
+}
+
+static int flash_silabs_init(const struct device *dev)
+{
+	__maybe_unused struct flash_silabs_data *const dev_data = dev->data;
+	const struct flash_silabs_config *config = dev->config;
+
+	MSC_Init();
+
+	if (config->lpwrite) {
+		MSC->WRITECTRL_SET = MSC_WRITECTRL_LPWRITE;
+	}
+
+	/* Lock the MSC module. */
+	flash_silabs_write_protection(true);
+
+#if defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_WRITE) || defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)
+	dev_data->dma_channel = dma_request_channel(dev_data->dma_dev, NULL);
+#endif
+
+	LOG_INF("Device %s initialized", dev->name);
+
+	return 0;
+}
+
+static DEVICE_API(flash, flash_silabs_driver_api) = {
+	.read = flash_silabs_read,
+	.write = flash_silabs_write,
+	.erase = flash_silabs_erase,
+	.get_parameters = flash_silabs_get_parameters,
+	.get_size = flash_silabs_get_size,
+#ifdef CONFIG_FLASH_PAGE_LAYOUT
+	.page_layout = flash_silabs_page_layout,
+#endif
+};
+
+/* clang-format off */
+static struct flash_silabs_data flash_silabs_data_0 = {
+	.lock = Z_SEM_INITIALIZER(flash_silabs_data_0.lock, 1, 1),
+#if defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_WRITE) || defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)
+	.dma_dev = DEVICE_DT_GET(DT_INST_DMAS_CTLR(0)),
+	.dma_channel = -1,
+#endif
+#if defined(CONFIG_SOC_FLASH_SILABS_S2_DMA_READ)
+	.sync = Z_SEM_INITIALIZER(flash_silabs_data_0.sync, 0, 1),
+	.sync_status = -EIO,
+	.dma_cfg = {
+		.channel_direction = MEMORY_TO_MEMORY,
+		.block_count = 1,
+		.head_block = &flash_silabs_data_0.dma_block_cfg,
+		.dma_callback = flash_silabs_read_callback,
+		.user_data = (void *)DEVICE_DT_INST_GET(0),
+	},
+#endif
+};
+
+static const struct flash_silabs_config flash_silabs_config_0 = {
+	.flash_parameters = {
+		.write_block_size = DT_PROP(SOC_NV_FLASH_NODE, write_block_size),
+		.erase_value = 0xff,
+	},
+	.page_layout = {
+		.pages_count = DT_REG_SIZE(SOC_NV_FLASH_NODE) /
+				DT_PROP(SOC_NV_FLASH_NODE, erase_block_size),
+		.pages_size = DT_PROP(SOC_NV_FLASH_NODE, erase_block_size),
+	},
+	.lpwrite = DT_INST_PROP(0, low_power_write),
+};
+/* clang-format on */
+
+DEVICE_DT_INST_DEFINE(0, flash_silabs_init, NULL, &flash_silabs_data_0, &flash_silabs_config_0,
+		      POST_KERNEL, CONFIG_FLASH_INIT_PRIORITY, &flash_silabs_driver_api);
diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c
index 9d4823243f11d..c02e77bf9a653 100644
--- a/drivers/flash/spi_nor.c
+++ b/drivers/flash/spi_nor.c
@@ -1139,13 +1139,26 @@ static int spi_nor_set_address_mode(const struct device *dev,
 
 	/* This currently only supports command 0xB7 (Enter 4-Byte
 	 * Address Mode), with or without preceding WREN.
+	 * Or when BIT(3) is set where the 4-byte address mode can be entered
+	 * by setting BIT(7) in a register via a 0x17 write
+	 * instruction. See JEDEC 216F 16th DWORD.
 	 */
-	if ((enter_4byte_addr & 0x03) == 0) {
+	if ((enter_4byte_addr & 0x0b) == 0) {
 		return -ENOTSUP;
 	}
 
 	acquire_device(dev);
 
+	if ((enter_4byte_addr & 0x08) != 0) {
+		/* Enter 4-byte address mode by setting BIT(7) in a register
+		 * via a 0x17 write instruction.
+		 */
+		uint8_t sr = BIT(7);
+
+		ret = spi_nor_access(dev, 0x17, NOR_ACCESS_WRITE, 0, &sr, sizeof(sr));
+		goto done;
+	}
+
 	if ((enter_4byte_addr & 0x02) != 0) {
 		/* Enter after WREN. */
 		ret = spi_nor_cmd_write(dev, SPI_NOR_CMD_WREN);
@@ -1153,12 +1166,13 @@ static int spi_nor_set_address_mode(const struct device *dev,
 
 	if (ret == 0) {
 		ret = spi_nor_cmd_write(dev, SPI_NOR_CMD_4BA);
+	}
 
-		if (ret == 0) {
-			struct spi_nor_data *data = dev->data;
+done:
+	if (ret == 0) {
+		struct spi_nor_data *data = dev->data;
 
-			data->flag_access_32bit = true;
-		}
+		data->flag_access_32bit = true;
 	}
 
 	release_device(dev);
@@ -1266,7 +1280,7 @@ static int spi_nor_process_sfdp(const struct device *dev)
 		uint16_t id = jesd216_param_id(php);
 
 		LOG_INF("PH%u: %04x rev %u.%u: %u DW @ %x",
-			(php - hp->phdr), id, php->rev_major, php->rev_minor,
+			(int)(php - hp->phdr), id, php->rev_major, php->rev_minor,
 			php->len_dw, jesd216_param_addr(php));
 
 		if (id == JESD216_SFDP_PARAM_ID_BFP) {
@@ -1391,7 +1405,7 @@ static int setup_pages_layout(const struct device *dev)
 
 	data->layout.pages_size = layout_page_size;
 	data->layout.pages_count = flash_size / layout_page_size;
-	LOG_DBG("layout %u x %u By pages", data->layout.pages_count, data->layout.pages_size);
+	LOG_DBG("layout %zu x %zu By pages", data->layout.pages_count, data->layout.pages_size);
 #elif defined(CONFIG_SPI_NOR_SFDP_DEVICETREE)
 	const struct spi_nor_config *cfg = dev->config;
 	const struct flash_pages_layout *layout = &cfg->layout;
diff --git a/drivers/fpga/fpga_ice40_bitbang.c b/drivers/fpga/fpga_ice40_bitbang.c
index 789f47009fac8..b4e0d7f6275cb 100644
--- a/drivers/fpga/fpga_ice40_bitbang.c
+++ b/drivers/fpga/fpga_ice40_bitbang.c
@@ -229,7 +229,7 @@ static int fpga_ice40_load(const struct device *dev, uint32_t *image_ptr, uint32
 	(void)gpio_pin_configure_dt(&config_bitbang->clk, GPIO_DISCONNECTED);
 	(void)gpio_pin_configure_dt(&config_bitbang->pico, GPIO_DISCONNECTED);
 #ifdef CONFIG_PINCTRL
-	(void)pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
+	(void)pinctrl_apply_state(config_bitbang->pincfg, PINCTRL_STATE_DEFAULT);
 #endif /* CONFIG_PINCTRL */
 
 	k_spin_unlock(&data->lock, key);
diff --git a/drivers/gnss/gnss_u_blox_m8.c b/drivers/gnss/gnss_u_blox_m8.c
index bc550422c8a2a..0139443ded777 100644
--- a/drivers/gnss/gnss_u_blox_m8.c
+++ b/drivers/gnss/gnss_u_blox_m8.c
@@ -300,6 +300,7 @@ static int ubx_m8_ubx_cfg_prt_set(const struct device *dev, uint32_t target_baud
 
 	ubx_cfg_prt_set_payload_default(&payload);
 	payload.baudrate = target_baudrate;
+	payload.out_proto_mask = UBX_CFG_PRT_OUT_PROTO_NMEA;
 
 	ret = ubx_m8_modem_ubx_script_init(dev, &payload, UBX_CFG_PRT_SET_PAYLOAD_SZ,
 					    UBX_CLASS_CFG, UBX_CFG_PRT);
diff --git a/drivers/gpio/CMakeLists.txt b/drivers/gpio/CMakeLists.txt
index 6ed5384f03d52..1e2b64e2859fd 100644
--- a/drivers/gpio/CMakeLists.txt
+++ b/drivers/gpio/CMakeLists.txt
@@ -36,6 +36,7 @@ zephyr_library_sources_ifdef(CONFIG_GPIO_IMX        gpio_imx.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_INFINEON_CAT1 gpio_ifx_cat1.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_INTEL      gpio_intel.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_IPROC      gpio_iproc.c)
+zephyr_library_sources_ifdef(CONFIG_GPIO_ITE_IT51XXX gpio_ite_it51xxx.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_ITE_IT8801 gpio_ite_it8801.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_ITE_IT8XXX2 gpio_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_ITE_IT8XXX2_V2 gpio_ite_it8xxx2_v2.c)
@@ -45,8 +46,9 @@ zephyr_library_sources_ifdef(CONFIG_GPIO_LMP90XXX   gpio_lmp90xxx.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_LPC11U6X   gpio_lpc11u6x.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_MAX14906   gpio_max14906.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_MAX14916   gpio_max14916.c)
+zephyr_library_sources_ifdef(CONFIG_GPIO_MAX14917   gpio_max14917.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_MAX22017   gpio_max22017.c)
-zephyr_library_sources_ifdef(CONFIG_GPIO_MAX22190   gpio_max22190.c)
+zephyr_library_sources_ifdef(CONFIG_GPIO_MAX2219X   gpio_max2219x.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_MAX32      gpio_max32.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_MCHP_MEC5  gpio_mchp_mec5.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_MCHP_MSS       gpio_mchp_mss.c)
@@ -80,7 +82,6 @@ zephyr_library_sources_ifdef(CONFIG_GPIO_PCF857X    gpio_pcf857x.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_PSOC6      gpio_psoc6.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RA_IOPORT  gpio_renesas_ra_ioport.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RCAR       gpio_rcar.c)
-zephyr_library_sources_ifdef(CONFIG_GPIO_RENESAS_RA gpio_renesas_ra.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RENESAS_RZ gpio_renesas_rz.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RP1        gpio_rp1.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_RPI_PICO   gpio_rpi_pico.c)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 1b8e33ad78ebb..e845592b49444 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -128,6 +128,7 @@ source "drivers/gpio/Kconfig.ifx_cat1"
 source "drivers/gpio/Kconfig.imx"
 source "drivers/gpio/Kconfig.intel"
 source "drivers/gpio/Kconfig.iproc"
+source "drivers/gpio/Kconfig.it51xxx"
 source "drivers/gpio/Kconfig.it8801"
 source "drivers/gpio/Kconfig.it8xxx2"
 source "drivers/gpio/Kconfig.litex"
@@ -135,8 +136,9 @@ source "drivers/gpio/Kconfig.lmp90xxx"
 source "drivers/gpio/Kconfig.lpc11u6x"
 source "drivers/gpio/Kconfig.max14906"
 source "drivers/gpio/Kconfig.max14916"
+source "drivers/gpio/Kconfig.max14917"
 source "drivers/gpio/Kconfig.max22017"
-source "drivers/gpio/Kconfig.max22190"
+source "drivers/gpio/Kconfig.max2219x"
 source "drivers/gpio/Kconfig.max32"
 source "drivers/gpio/Kconfig.mchp_mss"
 source "drivers/gpio/Kconfig.mcp23xxx"
@@ -165,7 +167,6 @@ source "drivers/gpio/Kconfig.pcal64xxa"
 source "drivers/gpio/Kconfig.pcf857x"
 source "drivers/gpio/Kconfig.psoc6"
 source "drivers/gpio/Kconfig.rcar"
-source "drivers/gpio/Kconfig.renesas_ra"
 source "drivers/gpio/Kconfig.renesas_ra_ioport"
 source "drivers/gpio/Kconfig.renesas_rz"
 source "drivers/gpio/Kconfig.rp1"
diff --git a/drivers/gpio/Kconfig.davinci b/drivers/gpio/Kconfig.davinci
index 2bd94cade4382..b7de108de7141 100644
--- a/drivers/gpio/Kconfig.davinci
+++ b/drivers/gpio/Kconfig.davinci
@@ -7,5 +7,6 @@ config GPIO_DAVINCI
 	bool "Davinci GPIO Driver"
 	default y
 	depends on DT_HAS_TI_DAVINCI_GPIO_ENABLED
+	select PINCTRL
 	help
 		Enable the Davinci GPIO controller support.
diff --git a/drivers/gpio/Kconfig.it51xxx b/drivers/gpio/Kconfig.it51xxx
new file mode 100644
index 0000000000000..cf4d0e7be6c97
--- /dev/null
+++ b/drivers/gpio/Kconfig.it51xxx
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config GPIO_ITE_IT51XXX
+	bool "ITE IT51XXX GPIO driver"
+	default y
+	depends on DT_HAS_ITE_IT51XXX_GPIO_ENABLED
+	help
+	  Enable driver for the IT51XXX series GPIO controller.
diff --git a/drivers/gpio/Kconfig.max14916 b/drivers/gpio/Kconfig.max14916
index dfdc1c4f76c53..f98c0bced3b59 100644
--- a/drivers/gpio/Kconfig.max14916
+++ b/drivers/gpio/Kconfig.max14916
@@ -7,7 +7,7 @@
 menuconfig GPIO_MAX14916
 	bool "MAX14916 GPIO driver"
 	default y
-	depends on DT_HAS_ADI_MAX14916_GPIO_ENABLED && SPI
+	depends on (DT_HAS_ADI_MAX14916_GPIO_ENABLED || DT_HAS_ADI_MAX14915_GPIO_ENABLED) && SPI
 	help
 	  Enabe MAX1416 octal industrial digital
 	  output with diagnostics
diff --git a/drivers/gpio/Kconfig.max14917 b/drivers/gpio/Kconfig.max14917
new file mode 100644
index 0000000000000..cd7f1af878dd0
--- /dev/null
+++ b/drivers/gpio/Kconfig.max14917
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Analog Devices Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+# MAX14917 GPIO configuration options
+
+menuconfig GPIO_MAX14917
+	bool "MAX14917 GPIO driver"
+	default y
+	select CRC
+	depends on DT_HAS_ADI_MAX14917_GPIO_ENABLED && SPI
+	help
+	  Enable MAX14917 octal industrial digital
+	  output with diagnostics
+
+config GPIO_MAX14917_INIT_PRIORITY
+	int "Driver init priority"
+	default 99
+	depends on GPIO_MAX14917
+	help
+	  Device driver initialization priority.
diff --git a/drivers/gpio/Kconfig.max22190 b/drivers/gpio/Kconfig.max22190
deleted file mode 100644
index c7e6dd4314b14..0000000000000
--- a/drivers/gpio/Kconfig.max22190
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2024 Analog Devices Inc.
-# Copyright (c) 2024 BayLibre SAS
-# SPDX-License-Identifier: Apache-2.0
-
-# MAX22190 GPIO configuration options
-
-menuconfig GPIO_MAX22190
-	bool "MAX22190 GPIO driver"
-	default y
-	depends on SPI
-	depends on DT_HAS_ADI_MAX22190_GPIO_ENABLED
-	help
-	  Enabe MAX22190 Octal industrial digital
-	  input with diagnostics
-
-config GPIO_MAX22190_INIT_PRIORITY
-	int "Driver init priority"
-	default 99
-	depends on GPIO_MAX22190
-	help
-	  Device driver initialization priority.
diff --git a/drivers/gpio/Kconfig.max2219x b/drivers/gpio/Kconfig.max2219x
new file mode 100644
index 0000000000000..e1051dd02e7c4
--- /dev/null
+++ b/drivers/gpio/Kconfig.max2219x
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 Analog Devices Inc.
+# Copyright (c) 2024 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+# MAX22190 GPIO configuration options
+
+menuconfig GPIO_MAX2219X
+	bool "MAX2219X GPIO driver"
+	default y
+	depends on SPI
+	depends on DT_HAS_ADI_MAX22190_GPIO_ENABLED || DT_HAS_ADI_MAX22199_GPIO_ENABLED
+	help
+	  Enabe MAX2219X Octal industrial digital
+	  input with diagnostics
+
+config GPIO_MAX22190_INIT_PRIORITY
+	int "Driver init priority"
+	default 99
+	depends on GPIO_MAX2219X
+	help
+	  Device driver initialization priority.
diff --git a/drivers/gpio/Kconfig.renesas_ra b/drivers/gpio/Kconfig.renesas_ra
deleted file mode 100644
index 2f6fb3c38c44e..0000000000000
--- a/drivers/gpio/Kconfig.renesas_ra
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config GPIO_RENESAS_RA
-	bool "Renesas RA Series GPIO driver"
-	default y
-	select GPIO_GET_CONFIG
-	select PINCTRL
-	depends on DT_HAS_RENESAS_RA_GPIO_ENABLED
-	help
-	  Enable Renesas RA series GPIO driver.
diff --git a/drivers/gpio/Kconfig.renesas_ra_ioport b/drivers/gpio/Kconfig.renesas_ra_ioport
index c09361cb1cad9..257475b4f60bc 100644
--- a/drivers/gpio/Kconfig.renesas_ra_ioport
+++ b/drivers/gpio/Kconfig.renesas_ra_ioport
@@ -7,3 +7,8 @@ config GPIO_RA_IOPORT
 	depends on DT_HAS_RENESAS_RA_GPIO_IOPORT_ENABLED
 	help
 	  Enable the Renesas RA GPIO IO port driver.
+
+config GPIO_RA_HAS_VBTICTLR
+	bool "Support VBATT input control"
+	help
+	  Enable for Renesas RA which support VBATT input control.
diff --git a/drivers/gpio/Kconfig.renesas_rz b/drivers/gpio/Kconfig.renesas_rz
index ae2e08c85de62..5c9306ec2c4f9 100644
--- a/drivers/gpio/Kconfig.renesas_rz
+++ b/drivers/gpio/Kconfig.renesas_rz
@@ -8,3 +8,10 @@ config GPIO_RENESAS_RZ
 	select USE_RZ_FSP_IOPORT
 	help
 	  Enable Renesas RZ series gpio driver.
+
+config GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT
+	bool
+	default y
+	depends on DT_HAS_RENESAS_RZ_GPIO_INT_ENABLED
+	help
+	  GPIO pins can generate interrupts at port mode.
diff --git a/drivers/gpio/Kconfig.rpi_pico b/drivers/gpio/Kconfig.rpi_pico
index 64370be497c07..8d75fea44729e 100644
--- a/drivers/gpio/Kconfig.rpi_pico
+++ b/drivers/gpio/Kconfig.rpi_pico
@@ -3,7 +3,7 @@
 
 config GPIO_RPI_PICO
 	default y
-	depends on DT_HAS_RASPBERRYPI_PICO_GPIO_ENABLED
+	depends on DT_HAS_RASPBERRYPI_PICO_GPIO_PORT_ENABLED
 	select PICOSDK_USE_GPIO
 	select PINCTRL
 	bool "Raspberry Pi Pico GPIO driver"
diff --git a/drivers/gpio/gpio_adp5585.c b/drivers/gpio/gpio_adp5585.c
index 99f074a130dea..3011120726e2d 100644
--- a/drivers/gpio/gpio_adp5585.c
+++ b/drivers/gpio/gpio_adp5585.c
@@ -143,14 +143,14 @@ static int gpio_adp5585_config(const struct device *dev, gpio_pin_t pin, gpio_fl
 			data->output |= BIT(pin);
 		}
 		if (bank == 0) {
-			/* reg_value for ADP5585_GPO_OUT_MODE */
+			/* reg_value for ADP5585_GPO_DATA_OUT */
 			reg_value = (uint8_t)data->output;
 		} else {
-			/* reg_value for ADP5585_GPO_OUT_MODE */
+			/* reg_value for ADP5585_GPO_DATA_OUT */
 			reg_value = (uint8_t)(data->output >> 8);
 		}
 		ret = i2c_reg_write_byte_dt(&parent_cfg->i2c_bus,
-					ADP5585_GPO_OUT_MODE_A + bank,
+					ADP5585_GPO_DATA_OUT_A + bank,
 					reg_value);
 		if (ret != 0) {
 			goto out;
diff --git a/drivers/gpio/gpio_ambiq.c b/drivers/gpio/gpio_ambiq.c
index 530b8326fed3a..7026640dfff6b 100644
--- a/drivers/gpio/gpio_ambiq.c
+++ b/drivers/gpio/gpio_ambiq.c
@@ -14,7 +14,7 @@
 #include <zephyr/irq.h>
 #include <zephyr/spinlock.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 typedef void (*ambiq_gpio_cfg_func_t)(void);
 
diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c
index fae16ac315967..476f905fc80f2 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.c
+++ b/drivers/gpio/gpio_cmsdk_ahb.c
@@ -96,8 +96,7 @@ static int gpio_cmsdk_ahb_port_toggle_bits(const struct device *dev,
 	return 0;
 }
 
-static int cmsdk_ahb_gpio_config(const struct device *dev, uint32_t mask,
-				 gpio_flags_t flags)
+int cmsdk_ahb_gpio_config(const struct device *dev, uint32_t mask, gpio_flags_t flags)
 {
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config;
 
diff --git a/drivers/gpio/gpio_davinci.c b/drivers/gpio/gpio_davinci.c
index b0f30adf2d9c7..a116831100290 100644
--- a/drivers/gpio/gpio_davinci.c
+++ b/drivers/gpio/gpio_davinci.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2023 BeagleBoard.org Foundation
  * Copyright (C) 2023 S Prashanth
+ * Copyright (C) 2025 Siemens Mobility GmbH
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -53,8 +54,8 @@ struct gpio_davinci_data {
 };
 
 struct gpio_davinci_config {
-	void (*bank_config)(const struct device *dev);
 	struct gpio_driver_config common;
+	void (*bank_config)(const struct device *dev);
 
 	DEVICE_MMIO_NAMED_ROM(port_base);
 
diff --git a/drivers/gpio/gpio_ene_kb1200.c b/drivers/gpio/gpio_ene_kb1200.c
index fb72fd564b099..cc6074374195f 100644
--- a/drivers/gpio/gpio_ene_kb1200.c
+++ b/drivers/gpio/gpio_ene_kb1200.c
@@ -10,6 +10,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio/gpio_utils.h>
 #include <zephyr/sys/util_macro.h>
+#include <zephyr/dt-bindings/gpio/ene-kb1200-gpio.h>
 #include <reg/gpio.h>
 #include <reg/gptd.h>
 
@@ -42,35 +43,51 @@ static int kb1200_gpio_pin_configure(const struct device *dev, gpio_pin_t pin, g
 	const struct gpio_kb1200_config *config = dev->config;
 
 	WRITE_BIT(config->gpio_regs->GPIOFS, pin, 0);
-	if ((flags & GPIO_OUTPUT) != 0) {
-		WRITE_BIT(config->gpio_regs->GPIOIE, pin, 1);
-		if ((flags & GPIO_SINGLE_ENDED) != 0) {
+	/* ene specific flags. low voltage mode,input voltage threshold (ViH & ViL) support 1.8V */
+	if (flags & KB1200_GPIO_VOLTAGE_POS) {
+		WRITE_BIT(config->gpio_regs->GPIOLV, pin, 1);
+	} else {
+		WRITE_BIT(config->gpio_regs->GPIOLV, pin, 0);
+	}
+	/* ene specific flags. max current driving ability, max support 16 mA */
+	if (flags & KB1200_GPIO_DRIVING_16MA) {
+		WRITE_BIT(config->gpio_regs->GPIODC, pin, 1);
+	} else {
+		WRITE_BIT(config->gpio_regs->GPIODC, pin, 0);
+	}
+	/* pull-up function */
+	if (flags & GPIO_PULL_UP) {
+		WRITE_BIT(config->gpio_regs->GPIOPU, pin, 1);
+	} else {
+		WRITE_BIT(config->gpio_regs->GPIOPU, pin, 0);
+	}
+	/* output data high/low */
+	if (flags & GPIO_OUTPUT_INIT_HIGH) {
+		WRITE_BIT(config->gpio_regs->GPIOD, pin, 1);
+	} else if (flags & GPIO_OUTPUT_INIT_LOW) {
+		WRITE_BIT(config->gpio_regs->GPIOD, pin, 0);
+	}
+	/* output enable function */
+	if (flags & GPIO_OUTPUT) {
+		/* setting open-drain only when output is enabled */
+		/* output type push-pull/open-drain */
+		if (flags & GPIO_SINGLE_ENDED) {
 			if (flags & GPIO_LINE_OPEN_DRAIN) {
 				WRITE_BIT(config->gpio_regs->GPIOOD, pin, 1);
+			} else {
+				WRITE_BIT(config->gpio_regs->GPIOOD, pin, 0);
 			}
 		} else {
 			WRITE_BIT(config->gpio_regs->GPIOOD, pin, 0);
 		}
-		if (flags & GPIO_PULL_UP) {
-			WRITE_BIT(config->gpio_regs->GPIOPU, pin, 1);
-		} else {
-			WRITE_BIT(config->gpio_regs->GPIOPU, pin, 0);
-		}
-		if ((flags & GPIO_OUTPUT_INIT_HIGH) != 0) {
-			WRITE_BIT(config->gpio_regs->GPIOD, pin, 1);
-		} else if ((flags & GPIO_OUTPUT_INIT_LOW) != 0) {
-			WRITE_BIT(config->gpio_regs->GPIOD, pin, 0);
-		}
 		WRITE_BIT(config->gpio_regs->GPIOOE, pin, 1);
 	} else {
 		WRITE_BIT(config->gpio_regs->GPIOOE, pin, 0);
-		if (flags & GPIO_PULL_UP) {
-			WRITE_BIT(config->gpio_regs->GPIOPU, pin, 1);
-		} else {
-			WRITE_BIT(config->gpio_regs->GPIOPU, pin, 0);
-		}
-		WRITE_BIT(config->gpio_regs->GPIOIE, pin, 1);
+		/* disable open-drain when output is disabled */
+		WRITE_BIT(config->gpio_regs->GPIOOD, pin, 0);
 	}
+	/* input function always enable */
+	WRITE_BIT(config->gpio_regs->GPIOIE, pin, 1);
 	return 0;
 }
 
@@ -203,8 +220,8 @@ static DEVICE_API(gpio, kb1200_gpio_api) = {
 		.gptd_regs = (struct gptd_regs *)DT_INST_REG_ADDR_BY_IDX(n, 1),                    \
 	};                                                                                         \
 	static struct gpio_kb1200_data gpio_kb1200_##n##_data;                                     \
-	DEVICE_DT_INST_DEFINE(n, &kb1200_gpio_##n##_init, NULL, &gpio_kb1200_##n##_data,           \
-			      &port_##n##_kb1200_config, POST_KERNEL,                              \
-			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &kb1200_gpio_api);
+	DEVICE_DT_INST_DEFINE(n, kb1200_gpio_##n##_init, NULL, &gpio_kb1200_##n##_data,            \
+			      &port_##n##_kb1200_config, PRE_KERNEL_1, CONFIG_GPIO_INIT_PRIORITY,  \
+			      &kb1200_gpio_api);
 
 DT_INST_FOREACH_STATUS_OKAY(KB1200_GPIO_INIT)
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index 9460d3c75c832..be4348aba2dc7 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017 Intel Corporation
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2021-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -20,13 +20,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/dt-bindings/gpio/espressif-esp32-gpio.h>
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || \
-	defined(CONFIG_SOC_SERIES_ESP32C3) || \
-	defined(CONFIG_SOC_SERIES_ESP32C6)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 #include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 
@@ -41,8 +35,7 @@ LOG_MODULE_REGISTER(gpio_esp32, CONFIG_LOG_DEFAULT_LEVEL);
 #define out_w1ts out_w1ts.val
 #define out_w1tc out_w1tc.val
 /* arch_curr_cpu() is not available for riscv based chips */
-#define CPU_ID()  0
-#define ISR_HANDLER isr_handler_t
+#define ESP32_CPU_ID()  0
 #elif CONFIG_SOC_SERIES_ESP32C3
 /* gpio structs in esp32c3 series are different from xtensa ones */
 #define out out.data
@@ -50,8 +43,7 @@ LOG_MODULE_REGISTER(gpio_esp32, CONFIG_LOG_DEFAULT_LEVEL);
 #define out_w1ts out_w1ts.val
 #define out_w1tc out_w1tc.val
 /* arch_curr_cpu() is not available for riscv based chips */
-#define CPU_ID()  0
-#define ISR_HANDLER isr_handler_t
+#define ESP32_CPU_ID()  0
 #elif defined(CONFIG_SOC_SERIES_ESP32C6)
 /* gpio structs in esp32c6 are also different */
 #define out out.out_data_orig
@@ -59,11 +51,9 @@ LOG_MODULE_REGISTER(gpio_esp32, CONFIG_LOG_DEFAULT_LEVEL);
 #define out_w1ts out_w1ts.val
 #define out_w1tc out_w1tc.val
 /* arch_curr_cpu() is not available for riscv based chips */
-#define CPU_ID()  0
-#define ISR_HANDLER isr_handler_t
+#define ESP32_CPU_ID()  0
 #else
-#define CPU_ID() arch_curr_cpu()->id
-#define ISR_HANDLER intr_handler_t
+#define ESP32_CPU_ID() arch_curr_cpu()->id
 #endif
 
 #ifndef SOC_GPIO_SUPPORT_RTC_INDEPENDENT
@@ -423,7 +413,7 @@ static int gpio_esp32_pin_interrupt_configure(const struct device *port,
 	}
 
 	gpio_ll_set_intr_type(cfg->gpio_base, io_pin, intr_trig_mode);
-	gpio_ll_intr_enable_on_core(cfg->gpio_base, CPU_ID(), io_pin);
+	gpio_ll_intr_enable_on_core(cfg->gpio_base, ESP32_CPU_ID(), io_pin);
 	irq_unlock(key);
 
 	return 0;
@@ -442,7 +432,7 @@ static uint32_t gpio_esp32_get_pending_int(const struct device *dev)
 {
 	const struct gpio_esp32_config *const cfg = dev->config;
 	uint32_t irq_status;
-	uint32_t const core_id = CPU_ID();
+	uint32_t const core_id = ESP32_CPU_ID();
 
 	if (cfg->gpio_port == 0) {
 		gpio_ll_get_intr_status(cfg->gpio_base, core_id, &irq_status);
@@ -458,7 +448,7 @@ static void IRAM_ATTR gpio_esp32_fire_callbacks(const struct device *dev)
 	const struct gpio_esp32_config *const cfg = dev->config;
 	struct gpio_esp32_data *data = dev->data;
 	uint32_t irq_status;
-	uint32_t const core_id = CPU_ID();
+	uint32_t const core_id = ESP32_CPU_ID();
 
 	if (cfg->gpio_port == 0) {
 		gpio_ll_get_intr_status(cfg->gpio_base, core_id, &irq_status);
@@ -482,8 +472,9 @@ static int gpio_esp32_init(const struct device *dev)
 	if (!isr_connected) {
 		int ret = esp_intr_alloc(DT_IRQ_BY_IDX(DT_NODELABEL(gpio0), 0, irq),
 			ESP_PRIO_TO_FLAGS(DT_IRQ_BY_IDX(DT_NODELABEL(gpio0), 0, priority)) |
-			ESP_INT_FLAGS_CHECK(DT_IRQ_BY_IDX(DT_NODELABEL(gpio0), 0, flags)),
-			(ISR_HANDLER)gpio_esp32_isr,
+			ESP_INT_FLAGS_CHECK(DT_IRQ_BY_IDX(DT_NODELABEL(gpio0), 0, flags)) |
+				ESP_INTR_FLAG_IRAM,
+			(intr_handler_t)gpio_esp32_isr,
 			(void *)dev,
 			NULL);
 
diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c
index 942e56b409698..3b5dca8903cc2 100644
--- a/drivers/gpio/gpio_gecko.c
+++ b/drivers/gpio/gpio_gecko.c
@@ -292,10 +292,10 @@ static int gpio_gecko_pin_interrupt_configure(const struct device *dev,
 	} else {
 		/* Interrupt line is already in use */
 		if ((GPIO->IEN & BIT(pin)) != 0) {
-			/* TODO: Return an error only if request is done for
-			 * a pin from a different port.
-			 */
-			return -EBUSY;
+			/* Check if the interrupt is already configured for this port */
+			if (!(data->int_enabled_mask & BIT(pin))) {
+				return -EBUSY;
+			}
 		}
 
 		bool rising_edge = true;
diff --git a/drivers/gpio/gpio_ite_it51xxx.c b/drivers/gpio/gpio_ite_it51xxx.c
new file mode 100644
index 0000000000000..daa49180c5fe9
--- /dev/null
+++ b/drivers/gpio/gpio_ite_it51xxx.c
@@ -0,0 +1,465 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+#define DT_DRV_COMPAT ite_it51xxx_gpio
+
+#include <chip_chipregs.h>
+#include <soc.h>
+#include <soc_dt.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_utils.h>
+#include <zephyr/drivers/interrupt_controller/wuc_ite_it51xxx.h>
+#include <zephyr/dt-bindings/gpio/ite-it8xxx2-gpio.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(gpio_ite_it51xxx, LOG_LEVEL_ERR);
+
+#define IT515XX_GPIO_MAX_PINS 8
+
+struct it51xxx_gpio_wuc_map_cfg {
+	/* WUC control device structure */
+	const struct device *wucs;
+	/* WUC pin mask */
+	uint8_t mask;
+};
+
+/*
+ * Structure gpio_ite_cfg is about the setting of GPIO
+ * this config will be used at initial time
+ */
+struct gpio_ite_cfg {
+	/* gpio_driver_config needs to be first */
+	struct gpio_driver_config common;
+	/* gpio wake-up input source configuration list */
+	const struct it51xxx_gpio_wuc_map_cfg *wuc_map_list;
+	/* GPIO port data register (bit mapping to pin) */
+	uintptr_t reg_gpdr;
+	/* GPIO port data mirror register (bit mapping to pin) */
+	uintptr_t reg_gpdmr;
+	/* GPIO port output type register (bit mapping to pin) */
+	uintptr_t reg_gpotr;
+	/* GPIO port 1.8V select register (bit mapping to pin) */
+	uintptr_t reg_p18scr;
+	/* GPIO port control register (byte mapping to pin) */
+	uintptr_t reg_gpcr;
+	/* GPIO/KBS function selection register (bit mapping to pin) */
+	uintptr_t reg_ksfselr;
+	/* GPIO's irq */
+	uint8_t gpio_irq[8];
+	/* Support input voltage selection */
+	uint8_t has_volt_sel[8];
+	/* Number of pins per group of GPIO */
+	uint8_t num_pins;
+};
+
+/* Structure gpio_ite_data is about callback function */
+struct gpio_ite_data {
+	struct gpio_driver_data common;
+	struct k_spinlock lock;
+	sys_slist_t callbacks;
+	uint8_t volt_default_set;
+	uint8_t level_isr_high;
+	uint8_t level_isr_low;
+};
+
+/**
+ * Driver functions
+ */
+static int gpio_ite_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+	struct gpio_ite_data *data = dev->data;
+	uint8_t mask = BIT(pin);
+	int rc = 0;
+
+	/* Don't support "open source" mode */
+	if (((flags & GPIO_SINGLE_ENDED) != 0) && ((flags & GPIO_LINE_OPEN_DRAIN) == 0)) {
+		return -ENOTSUP;
+	}
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+
+	if (flags == GPIO_DISCONNECTED) {
+		sys_write8(GPCR_PORT_PIN_MODE_TRISTATE, config->reg_gpcr + pin);
+		/*
+		 * Since not all GPIOs can be to configured as tri-state,
+		 * prompt error if pin doesn't support the flag.
+		 */
+		if (sys_read8(config->reg_gpcr + pin) != GPCR_PORT_PIN_MODE_TRISTATE) {
+			/* Go back to default setting (input) */
+			sys_write8(GPCR_PORT_PIN_MODE_INPUT, config->reg_gpcr + pin);
+			LOG_ERR("Cannot config the node-gpio@%x, pin=%d as tri-state",
+				(uint32_t)config->reg_gpdr, pin);
+			rc = -ENOTSUP;
+			goto unlock_and_return;
+		}
+		/*
+		 * The following configuration isn't necessary because the pin
+		 * was configured as disconnected.
+		 */
+		rc = 0;
+		goto unlock_and_return;
+	}
+
+	/*
+	 * Select open drain first, so that we don't glitch the signal
+	 * when changing the line to an output.
+	 */
+	if ((uint8_t *)config->reg_gpotr != NULL) {
+		if (flags & GPIO_OPEN_DRAIN) {
+			sys_write8(sys_read8(config->reg_gpotr) | mask, config->reg_gpotr);
+		} else {
+			sys_write8(sys_read8(config->reg_gpotr) & ~mask, config->reg_gpotr);
+		}
+	}
+
+	/* 1.8V or 3.3V */
+	if (config->has_volt_sel[pin]) {
+		gpio_flags_t volt = flags & IT8XXX2_GPIO_VOLTAGE_MASK;
+
+		if (volt == IT8XXX2_GPIO_VOLTAGE_1P8) {
+			__ASSERT(!(flags & GPIO_PULL_UP),
+				 "Don't enable internal pullup if 1.8V voltage is used");
+			sys_write8(sys_read8(config->reg_p18scr) | mask, config->reg_p18scr);
+			data->volt_default_set &= ~mask;
+		} else if (volt == IT8XXX2_GPIO_VOLTAGE_3P3) {
+			sys_write8(sys_read8(config->reg_p18scr) & ~mask, config->reg_p18scr);
+			/*
+			 * A variable is needed to store the difference between
+			 * 3.3V and default so that the flag can be distinguished
+			 * between the two in gpio_ite_get_config.
+			 */
+			data->volt_default_set &= ~mask;
+		} else if (volt == IT8XXX2_GPIO_VOLTAGE_DEFAULT) {
+			sys_write8(sys_read8(config->reg_p18scr) & ~mask, config->reg_p18scr);
+			data->volt_default_set |= mask;
+		} else {
+			rc = -EINVAL;
+			goto unlock_and_return;
+		}
+	}
+
+	/* GPIOK, L N group have to set this register */
+	if ((uint8_t *)config->reg_ksfselr) {
+		sys_write8(sys_read8(config->reg_ksfselr) | mask, config->reg_ksfselr);
+	}
+
+	/* If output, set level before changing type to an output. */
+	if (flags & GPIO_OUTPUT) {
+		if (flags & GPIO_OUTPUT_INIT_HIGH) {
+			sys_write8(sys_read8(config->reg_gpdr) | mask, config->reg_gpdr);
+		} else if (flags & GPIO_OUTPUT_INIT_LOW) {
+			sys_write8(sys_read8(config->reg_gpdr) & ~mask, config->reg_gpdr);
+		}
+	}
+
+	uint8_t reg_gpcr = sys_read8(config->reg_gpcr + pin);
+	/* Set input or output. */
+	/* Handle regular GPIO controller */
+	if (flags & GPIO_OUTPUT) {
+		reg_gpcr = (reg_gpcr | GPCR_PORT_PIN_MODE_OUTPUT) & ~GPCR_PORT_PIN_MODE_INPUT;
+	} else {
+		reg_gpcr = (reg_gpcr | GPCR_PORT_PIN_MODE_INPUT) & ~GPCR_PORT_PIN_MODE_OUTPUT;
+	}
+
+	/* Handle pullup / pulldown */
+	/* Handle regular GPIO controller */
+	if (flags & GPIO_PULL_UP) {
+		reg_gpcr = (reg_gpcr | GPCR_PORT_PIN_MODE_PULLUP) & ~GPCR_PORT_PIN_MODE_PULLDOWN;
+	} else if (flags & GPIO_PULL_DOWN) {
+		reg_gpcr = (reg_gpcr | GPCR_PORT_PIN_MODE_PULLDOWN) & ~GPCR_PORT_PIN_MODE_PULLUP;
+	} else {
+		/* No pull up/down */
+		reg_gpcr &= ~(GPCR_PORT_PIN_MODE_PULLDOWN | GPCR_PORT_PIN_MODE_PULLUP);
+	}
+	sys_write8(reg_gpcr, config->reg_gpcr + pin);
+
+unlock_and_return:
+	k_spin_unlock(&data->lock, key);
+	return rc;
+}
+
+#ifdef CONFIG_GPIO_GET_CONFIG
+static int gpio_ite_get_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t *out_flags)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+	struct gpio_ite_data *data = dev->data;
+	uint8_t mask = BIT(pin);
+	gpio_flags_t flags = 0;
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+	/* push-pull or open-drain */
+	if (sys_read8(config->reg_gpotr) & mask) {
+		flags |= GPIO_OPEN_DRAIN;
+	}
+
+	/* 1.8V or 3.3V */
+	if (config->has_volt_sel[pin]) {
+		if (data->volt_default_set & mask) {
+			flags |= IT8XXX2_GPIO_VOLTAGE_DEFAULT;
+		} else {
+			if (sys_read8(config->reg_p18scr) & mask) {
+				flags |= IT8XXX2_GPIO_VOLTAGE_1P8;
+			} else {
+				flags |= IT8XXX2_GPIO_VOLTAGE_3P3;
+			}
+		}
+	}
+
+	/* set input or output. */
+	if (sys_read8(config->reg_gpcr + pin) & GPCR_PORT_PIN_MODE_OUTPUT) {
+		flags |= GPIO_OUTPUT;
+
+		/* set level */
+		if (sys_read8(config->reg_gpdr) & mask) {
+			flags |= GPIO_OUTPUT_HIGH;
+		} else {
+			flags |= GPIO_OUTPUT_LOW;
+		}
+	}
+
+	if (sys_read8(config->reg_gpcr + pin) & GPCR_PORT_PIN_MODE_INPUT) {
+		flags |= GPIO_INPUT;
+
+		/* pullup / pulldown */
+		if (sys_read8(config->reg_gpcr + pin) & GPCR_PORT_PIN_MODE_PULLUP) {
+			flags |= GPIO_PULL_UP;
+		}
+
+		if (sys_read8(config->reg_gpcr + pin) & GPCR_PORT_PIN_MODE_PULLDOWN) {
+			flags |= GPIO_PULL_DOWN;
+		}
+	}
+
+	*out_flags = flags;
+	k_spin_unlock(&data->lock, key);
+
+	return 0;
+}
+#endif
+
+static int gpio_ite_port_get_raw(const struct device *dev, gpio_port_value_t *value)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+
+	/* Get raw bits of GPIO mirror register */
+	*value = sys_read8(config->reg_gpdmr);
+
+	return 0;
+}
+
+static int gpio_ite_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask,
+					gpio_port_value_t value)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+	struct gpio_ite_data *data = dev->data;
+	uint8_t masked_value = value & mask;
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+	uint8_t out = sys_read8(config->reg_gpdr);
+
+	sys_write8(((out & ~mask) | masked_value), config->reg_gpdr);
+	k_spin_unlock(&data->lock, key);
+
+	return 0;
+}
+
+static int gpio_ite_port_set_bits_raw(const struct device *dev, gpio_port_pins_t pins)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+	struct gpio_ite_data *data = dev->data;
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+	/* Set raw bits of GPIO data register */
+	sys_write8(sys_read8(config->reg_gpdr) | pins, config->reg_gpdr);
+	k_spin_unlock(&data->lock, key);
+
+	return 0;
+}
+
+static int gpio_ite_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+	struct gpio_ite_data *data = dev->data;
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+	/* Clear raw bits of GPIO data register */
+	sys_write8(sys_read8(config->reg_gpdr) & ~pins, config->reg_gpdr);
+	k_spin_unlock(&data->lock, key);
+
+	return 0;
+}
+
+static int gpio_ite_port_toggle_bits(const struct device *dev, gpio_port_pins_t pins)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+	struct gpio_ite_data *data = dev->data;
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+	/* Toggle raw bits of GPIO data register */
+	sys_write8(sys_read8(config->reg_gpdr) ^ pins, config->reg_gpdr);
+	k_spin_unlock(&data->lock, key);
+
+	return 0;
+}
+
+static int gpio_ite_manage_callback(const struct device *dev, struct gpio_callback *callback,
+				    bool set)
+{
+	struct gpio_ite_data *data = dev->data;
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+	int rc = gpio_manage_callback(&data->callbacks, callback, set);
+
+	k_spin_unlock(&data->lock, key);
+
+	return rc;
+}
+
+static void gpio_ite_isr(const void *arg)
+{
+	const struct device *dev = arg;
+	const struct gpio_ite_cfg *config = dev->config;
+	struct gpio_ite_data *data = dev->data;
+	uint8_t irq = ite_intc_get_irq_num();
+	uint8_t num_pins = config->num_pins;
+	uint8_t pin;
+
+	for (pin = 0; pin < num_pins; pin++) {
+		if (irq == config->gpio_irq[pin]) {
+			/* Should be safe even without spinlock. */
+			/* Clear the WUC status register. */
+			it51xxx_wuc_clear_status(config->wuc_map_list[pin].wucs,
+						 config->wuc_map_list[pin].mask);
+			/* The callbacks are user code, and therefore should
+			 * not hold the lock.
+			 */
+			gpio_fire_callbacks(&data->callbacks, dev, BIT(pin));
+
+			break;
+		}
+	}
+}
+
+static int gpio_ite_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin,
+					    enum gpio_int_mode mode, enum gpio_int_trig trig)
+{
+	const struct gpio_ite_cfg *config = dev->config;
+	uint32_t flags;
+	uint8_t gpio_irq = config->gpio_irq[pin];
+	struct gpio_ite_data *data = dev->data;
+
+	if (!gpio_irq) {
+		LOG_ERR("Unsupport interrupt pin");
+		return -ENOTSUP;
+	}
+
+#ifdef CONFIG_GPIO_ENABLE_DISABLE_INTERRUPT
+	if (mode == GPIO_INT_MODE_DISABLED || mode == GPIO_INT_MODE_DISABLE_ONLY) {
+#else
+	if (mode == GPIO_INT_MODE_DISABLED) {
+#endif /* CONFIG_GPIO_ENABLE_DISABLE_INTERRUPT */
+		/* Disable GPIO interrupt */
+		irq_disable(gpio_irq);
+		return 0;
+#ifdef CONFIG_GPIO_ENABLE_DISABLE_INTERRUPT
+	} else if (mode == GPIO_INT_MODE_ENABLE_ONLY) {
+		/* Only enable GPIO interrupt */
+		irq_enable(gpio_irq);
+		return 0;
+#endif /* CONFIG_GPIO_ENABLE_DISABLE_INTERRUPT */
+	}
+
+	/* Disable irq before configuring it */
+	irq_disable(gpio_irq);
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+
+	if (mode == GPIO_INT_MODE_LEVEL) {
+		flags = WUC_TYPE_LEVEL_TRIG;
+		if (trig & GPIO_INT_TRIG_HIGH) {
+			flags |= WUC_TYPE_LEVEL_HIGH;
+		} else {
+			flags |= WUC_TYPE_LEVEL_LOW;
+		}
+	} else {
+		switch (trig) {
+		case GPIO_INT_TRIG_LOW:
+			flags = WUC_TYPE_EDGE_FALLING;
+			break;
+		case GPIO_INT_TRIG_HIGH:
+			flags = WUC_TYPE_EDGE_RISING;
+			break;
+		case GPIO_INT_TRIG_BOTH:
+			flags = WUC_TYPE_EDGE_BOTH;
+			break;
+		default:
+			k_spin_unlock(&data->lock, key);
+			return -EINVAL;
+		}
+	}
+	/* Select wakeup interrupt edge triggered type of GPIO pins */
+	it51xxx_wuc_set_polarity(config->wuc_map_list[pin].wucs, config->wuc_map_list[pin].mask,
+				 flags);
+	/*
+	 * Always write 1 to clear the WUC status register after
+	 * modifying edge mode selection register (WUBEMR and WUEMR).
+	 */
+	it51xxx_wuc_clear_status(config->wuc_map_list[pin].wucs, config->wuc_map_list[pin].mask);
+	/* Enable wakeup interrupt of GPIO pins */
+	it51xxx_wuc_enable(config->wuc_map_list[pin].wucs, config->wuc_map_list[pin].mask);
+
+	k_spin_unlock(&data->lock, key);
+
+	/* Enable GPIO interrupt */
+	irq_connect_dynamic(gpio_irq, 0, gpio_ite_isr, dev, 0);
+	irq_enable(gpio_irq);
+
+	return 0;
+}
+
+static DEVICE_API(gpio, gpio_ite_driver_api) = {
+	.pin_configure = gpio_ite_configure,
+#ifdef CONFIG_GPIO_GET_CONFIG
+	.pin_get_config = gpio_ite_get_config,
+#endif
+	.port_get_raw = gpio_ite_port_get_raw,
+	.port_set_masked_raw = gpio_ite_port_set_masked_raw,
+	.port_set_bits_raw = gpio_ite_port_set_bits_raw,
+	.port_clear_bits_raw = gpio_ite_port_clear_bits_raw,
+	.port_toggle_bits = gpio_ite_port_toggle_bits,
+	.pin_interrupt_configure = gpio_ite_pin_interrupt_configure,
+	.manage_callback = gpio_ite_manage_callback,
+};
+
+#define GPIO_ITE_DEV_CFG_DATA(inst)                                                                \
+	BUILD_ASSERT(DT_INST_PROP(inst, ngpios) <= IT515XX_GPIO_MAX_PINS,                          \
+		     "The maximum number of pins per port is 8.");                                 \
+	static const struct it51xxx_gpio_wuc_map_cfg                                               \
+		it51xxx_gpio_wuc_##inst[IT8XXX2_DT_INST_WUCCTRL_LEN(inst)] =                       \
+			IT8XXX2_DT_WUC_ITEMS_LIST(inst);                                           \
+	static struct gpio_ite_data gpio_ite_data_##inst;                                          \
+	static const struct gpio_ite_cfg gpio_ite_cfg_##inst = {                                   \
+		.common = {.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(inst)},                \
+		.wuc_map_list = it51xxx_gpio_wuc_##inst,                                           \
+		.reg_gpdr = DT_INST_REG_ADDR_BY_IDX(inst, 0),                                      \
+		.reg_gpdmr = DT_INST_REG_ADDR_BY_IDX(inst, 1),                                     \
+		.reg_gpotr = DT_INST_REG_ADDR_BY_IDX(inst, 2),                                     \
+		.reg_p18scr = DT_INST_REG_ADDR_BY_IDX(inst, 3),                                    \
+		.reg_gpcr = DT_INST_REG_ADDR_BY_IDX(inst, 4),                                      \
+		.reg_ksfselr = DT_INST_REG_ADDR_BY_IDX(inst, 5),                                   \
+		.gpio_irq = IT8XXX2_DT_GPIO_IRQ_LIST(inst),                                        \
+		.has_volt_sel = DT_INST_PROP_OR(inst, has_volt_sel, {0}),                          \
+		.num_pins = DT_INST_PROP(inst, ngpios),                                            \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &gpio_ite_data_##inst, &gpio_ite_cfg_##inst,       \
+			      PRE_KERNEL_1, CONFIG_GPIO_INIT_PRIORITY, &gpio_ite_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(GPIO_ITE_DEV_CFG_DATA)
diff --git a/drivers/gpio/gpio_ite_it8801.c b/drivers/gpio/gpio_ite_it8801.c
index ca2423f76f254..94cd36a0f1c13 100644
--- a/drivers/gpio/gpio_ite_it8801.c
+++ b/drivers/gpio/gpio_ite_it8801.c
@@ -60,7 +60,7 @@ static int gpio_it8801_configure(const struct device *dev, gpio_pin_t pin, gpio_
 	int ret;
 	uint8_t reg_gpcr = config->reg_gpcr + pin;
 	uint8_t mask = BIT(pin);
-	uint8_t new_value, control;
+	uint8_t control;
 
 	/* Don't support "open source" mode */
 	if (((flags & GPIO_SINGLE_ENDED) != 0) && ((flags & GPIO_LINE_OPEN_DRAIN) == 0)) {
@@ -86,13 +86,11 @@ static int gpio_it8801_configure(const struct device *dev, gpio_pin_t pin, gpio_
 	/* If output, set level before changing type to an output. */
 	if (flags & GPIO_OUTPUT) {
 		if (flags & GPIO_OUTPUT_INIT_HIGH) {
-			new_value = mask;
+			ret = i2c_reg_update_byte_dt(&config->i2c_dev, config->reg_sovr, mask,
+						     mask);
 		} else if (flags & GPIO_OUTPUT_INIT_LOW) {
-			new_value = 0;
-		} else {
-			new_value = 0;
+			ret = i2c_reg_update_byte_dt(&config->i2c_dev, config->reg_sovr, mask, 0);
 		}
-		ret = i2c_reg_update_byte_dt(&config->i2c_dev, config->reg_sovr, mask, new_value);
 		if (ret) {
 			LOG_ERR("Failed to set output value (ret %d)", ret);
 			return ret;
diff --git a/drivers/gpio/gpio_max14916.c b/drivers/gpio/gpio_max14916.c
index dd7f6a46beeb4..86dcb20372d59 100644
--- a/drivers/gpio/gpio_max14916.c
+++ b/drivers/gpio/gpio_max14916.c
@@ -20,8 +20,6 @@ LOG_MODULE_REGISTER(gpio_max14916);
 #include "gpio_max14916.h"
 #include "gpio_max149x6.h"
 
-#define DT_DRV_COMPAT adi_max14916_gpio
-
 static int gpio_max14916_diag_chan_get(const struct device *dev);
 
 static int max14916_pars_spi_diag(const struct device *dev, uint8_t *rx_diag_buff, uint8_t rw)
@@ -367,8 +365,8 @@ static DEVICE_API(gpio, gpio_max14916_api) = {
 	.port_toggle_bits = gpio_max14916_port_toggle_bits,
 };
 
-#define GPIO_MAX14906_DEVICE(id)                                                                   \
-	static const struct max14916_config max14916_##id##_cfg = {                                \
+#define GPIO_MAX14906_DEVICE(id, model)                                                            \
+	static const struct max14916_config max##model##_##id##_cfg = {                            \
 		.spi = SPI_DT_SPEC_INST_GET(id, SPI_OP_MODE_MASTER | SPI_WORD_SET(8U), 0U),        \
 		.ready_gpio = GPIO_DT_SPEC_INST_GET(id, drdy_gpios),                               \
 		.fault_gpio = GPIO_DT_SPEC_INST_GET(id, fault_gpios),                              \
@@ -391,10 +389,16 @@ static DEVICE_API(gpio, gpio_max14916_api) = {
 		.spi_addr = DT_INST_PROP(id, spi_addr),                                            \
 	};                                                                                         \
                                                                                                    \
-	static struct max14916_data max14916_##id##_data;                                          \
+	static struct max14916_data max##model##_##id##_data;                                      \
                                                                                                    \
-	DEVICE_DT_INST_DEFINE(id, &gpio_max14916_init, NULL, &max14916_##id##_data,                \
-			      &max14916_##id##_cfg, POST_KERNEL,                                   \
+	DEVICE_DT_INST_DEFINE(id, &gpio_max14916_init, NULL, &max##model##_##id##_data,            \
+			      &max##model##_##id##_cfg, POST_KERNEL,                               \
 			      CONFIG_GPIO_MAX14916_INIT_PRIORITY, &gpio_max14916_api);
 
-DT_INST_FOREACH_STATUS_OKAY(GPIO_MAX14906_DEVICE)
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT adi_max14915_gpio
+DT_INST_FOREACH_STATUS_OKAY_VARGS(GPIO_MAX14906_DEVICE, 14915)
+
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT adi_max14916_gpio
+DT_INST_FOREACH_STATUS_OKAY_VARGS(GPIO_MAX14906_DEVICE, 14916)
diff --git a/drivers/gpio/gpio_max14917.c b/drivers/gpio/gpio_max14917.c
new file mode 100644
index 0000000000000..74c87f4568803
--- /dev/null
+++ b/drivers/gpio/gpio_max14917.c
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2025 Analog Devices Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
+
+#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(gpio_max14917);
+
+#include <zephyr/drivers/gpio/gpio_utils.h>
+
+#include "gpio_max14917.h"
+
+#define DT_DRV_COMPAT adi_max14917_gpio
+
+static int max14917_reg_trans_spi_diag(const struct device *dev)
+{
+	int ret = 0;
+	uint8_t crc;
+
+	uint8_t local_tx_buff[MAX14917_MAX_PKT_SIZE] = {0};
+	uint8_t local_rx_buff[MAX14917_MAX_PKT_SIZE] = {0};
+
+	struct max14917_data *data = dev->data;
+	const struct max14917_config *config = dev->config;
+
+	struct spi_buf tx_buf = {
+		.buf = &local_tx_buff,
+		.len = config->pkt_size,
+	};
+	const struct spi_buf_set tx = {.buffers = &tx_buf, .count = 1};
+
+	struct spi_buf rx_buf = {
+		.buf = &local_rx_buff,
+		.len = config->pkt_size,
+	};
+	const struct spi_buf_set rx = {.buffers = &rx_buf, .count = 1};
+
+	local_tx_buff[0] = data->gpios_ON;
+
+	/* If CRC enabled calculate it */
+	if (config->crc_en) {
+		crc = crc8(&local_tx_buff[0], 1, MAX14917_CRC_POLY, MAX14917_CRC_INI_VAL, false);
+		local_tx_buff[1] = (crc & MAX14917_CRC_MASK);
+	}
+
+	/* Perform SPI transaction */
+	ret = spi_transceive_dt(&config->spi, &tx, &rx);
+	if (ret) {
+		LOG_ERR("SPI transfer failed");
+		return ret;
+	}
+
+	/* If CRC enabled check it */
+	if (config->crc_en) {
+		crc = crc8(&local_tx_buff[0], 1, MAX14917_CRC_POLY, MAX14917_CRC_INI_VAL, false);
+		crc = (crc & MAX14917_CRC_MASK);
+		if (crc != (local_rx_buff[1] & 0x1F)) {
+			LOG_ERR("READ CRC ERR (%d)-(%d)\n", crc, (local_rx_buff[1] & 0x1F));
+			return -EINVAL;
+		}
+		/* Set error flags in device data */
+		data->comm_err = (local_rx_buff[1] & MAX14917_COMM_ERR);
+		data->verr = (local_rx_buff[1] & MAX14917_VERR);
+		data->therm_err = (local_rx_buff[1] & MAX14917_THERM_ERR);
+	}
+
+	data->gpios_fault = local_rx_buff[0];
+
+	return 0;
+}
+
+static int max14917_fault_check(const struct device *dev)
+{
+	int ret;
+	const struct max14917_data *data = dev->data;
+	const struct max14917_config *config = dev->config;
+
+	if (gpio_pin_get_dt(&config->fault_gpio)) {
+		LOG_DBG("FAULT GPIO is high");
+	}
+
+	/* Update error flags */
+	ret = max14917_reg_trans_spi_diag(dev);
+	if (ret) {
+		return ret;
+	}
+
+	if (data->comm_err) {
+		LOG_DBG("COMMERR flag is active");
+	}
+	if (data->verr) {
+		LOG_DBG("VERR flag is active");
+	}
+	if (data->therm_err) {
+		LOG_DBG("THERMERR flag is active");
+	}
+
+	for (int i = 0; i < MAX14917_CHANNELS; i++) {
+		if (data->gpios_fault & BIT(i)) {
+			LOG_DBG("Channel %d has a fault", i);
+		}
+	}
+
+	return 0;
+}
+
+static int gpio_max14917_init(const struct device *dev)
+{
+	struct max14917_data *data = dev->data;
+	const struct max14917_config *config = dev->config;
+	int err = 0;
+
+	LOG_DBG(" --- GPIO max14917 init IN ---");
+
+	if (!spi_is_ready_dt(&config->spi)) {
+		LOG_ERR("SPI bus is not ready\n");
+		return -ENODEV;
+	}
+
+	/* Output GPIOS */
+	/* setup EN gpio - normal low */
+	if (!gpio_is_ready_dt(&config->en_gpio)) {
+		LOG_ERR("EN GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->en_gpio, GPIO_OUTPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure EN GPIO");
+		return err;
+	}
+
+	/* setup SYNC gpio - normal low */
+	if (!gpio_is_ready_dt(&config->sync_gpio)) {
+		LOG_ERR("SYNC GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->sync_gpio, GPIO_OUTPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure SYNC GPIO");
+		return err;
+	}
+	/* setup CRCEN gpio - normal low */
+	if (!gpio_is_ready_dt(&config->crcen_gpio)) {
+		LOG_ERR("CRCEN GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->crcen_gpio, GPIO_OUTPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure CRCEN GPIO");
+		return err;
+	}
+	/* Input GPIOS */
+	/* setup VDDOK gpio - normal low */
+	if (!gpio_is_ready_dt(&config->vddok_gpio)) {
+		LOG_ERR("VDDOK GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->vddok_gpio, GPIO_INPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure VDDOK GPIO");
+		return err;
+	}
+	/* setup READY gpio - normal low */
+	if (!gpio_is_ready_dt(&config->ready_gpio)) {
+		LOG_ERR("VDDOK READY device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->ready_gpio, GPIO_INPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure READY GPIO");
+		return err;
+	}
+	/* setup COMERR gpio - normal low */
+	if (!gpio_is_ready_dt(&config->comerr_gpio)) {
+		LOG_ERR("COMERR GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->comerr_gpio, GPIO_INPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure COMERR GPIO");
+		return err;
+	}
+	/* setup FAULT gpio - normal low */
+	if (!gpio_is_ready_dt(&config->fault_gpio)) {
+		LOG_ERR("FAULT GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->fault_gpio, GPIO_INPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure FAULT GPIO");
+		return err;
+	}
+
+	err = gpio_pin_set_dt(&config->en_gpio, 1);
+	if (err) {
+		return err;
+	}
+	err = gpio_pin_set_dt(&config->sync_gpio, 1);
+	if (err) {
+		return err;
+	}
+
+	if (config->crc_en) {
+		err = gpio_pin_set_dt(&config->crcen_gpio, 1);
+	} else {
+		err = gpio_pin_set_dt(&config->crcen_gpio, 0);
+	}
+
+	if (err) {
+		return err;
+	}
+
+	/* Initialize satus and fault flags to 0 */
+	data->gpios_ON = 0;
+	data->gpios_fault = 0;
+
+	err = max14917_fault_check(dev);
+
+	return err;
+}
+
+static int gpio_max14917_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags)
+{
+	int err = 0;
+
+	if ((flags & (GPIO_INPUT | GPIO_OUTPUT)) == GPIO_DISCONNECTED) {
+		return -ENOTSUP;
+	}
+
+	if ((flags & GPIO_SINGLE_ENDED) != 0) {
+		return -ENOTSUP;
+	}
+
+	if ((flags & (GPIO_PULL_UP | GPIO_PULL_DOWN)) != 0) {
+		return -ENOTSUP;
+	}
+
+	if (flags & GPIO_INT_ENABLE) {
+		return -ENOTSUP;
+	}
+
+	switch (flags & GPIO_DIR_MASK) {
+	case GPIO_OUTPUT:
+		break;
+	case GPIO_INPUT:
+	default:
+		LOG_ERR("NOT SUPPORTED OPTION!");
+		return -ENOTSUP;
+	}
+
+	return err;
+}
+
+static int gpio_max14917_port_get_raw(const struct device *dev, gpio_port_value_t *value)
+{
+	int ret;
+	const struct max14917_data *data = dev->data;
+
+	ret = max14917_fault_check(dev);
+	if (ret) {
+		return ret;
+	}
+
+	*value = data->gpios_ON;
+
+	return 0;
+}
+
+static int gpio_max14917_port_set_bits_raw(const struct device *dev, gpio_port_pins_t pins)
+{
+	int ret;
+	struct max14917_data *data = dev->data;
+
+	ret = max14917_fault_check(dev);
+	if (ret) {
+		return ret;
+	}
+
+	data->gpios_ON = data->gpios_ON | pins;
+
+	return max14917_reg_trans_spi_diag(dev);
+}
+
+static int gpio_max14917_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins)
+{
+	int ret;
+	struct max14917_data *data = dev->data;
+
+	ret = max14917_fault_check(dev);
+	if (ret) {
+		return ret;
+	}
+
+	data->gpios_ON = data->gpios_ON & ~pins;
+
+	return max14917_reg_trans_spi_diag(dev);
+}
+
+static int gpio_max14917_port_toggle_bits(const struct device *dev, gpio_port_pins_t pins)
+{
+	int ret;
+	struct max14917_data *data = dev->data;
+
+	ret = max14917_fault_check(dev);
+	if (ret) {
+		return ret;
+	}
+
+	data->gpios_ON ^= pins;
+
+	return max14917_reg_trans_spi_diag(dev);
+}
+
+static DEVICE_API(gpio, gpio_max14917_api) = {
+	.pin_configure = gpio_max14917_config,
+	.port_get_raw = gpio_max14917_port_get_raw,
+	.port_set_bits_raw = gpio_max14917_port_set_bits_raw,
+	.port_clear_bits_raw = gpio_max14917_port_clear_bits_raw,
+	.port_toggle_bits = gpio_max14917_port_toggle_bits,
+};
+
+#define GPIO_MAX14917_DEVICE(id)                                                                   \
+	static const struct max14917_config max14917_##id##_cfg = {                                \
+		.spi = SPI_DT_SPEC_INST_GET(id, SPI_OP_MODE_MASTER | SPI_WORD_SET(8U), 0U),        \
+		.vddok_gpio = GPIO_DT_SPEC_INST_GET(id, vddok_gpios),                              \
+		.ready_gpio = GPIO_DT_SPEC_INST_GET(id, ready_gpios),                              \
+		.comerr_gpio = GPIO_DT_SPEC_INST_GET(id, comerr_gpios),                            \
+		.fault_gpio = GPIO_DT_SPEC_INST_GET(id, fault_gpios),                              \
+		.en_gpio = GPIO_DT_SPEC_INST_GET(id, en_gpios),                                    \
+		.sync_gpio = GPIO_DT_SPEC_INST_GET(id, sync_gpios),                                \
+		.crcen_gpio = GPIO_DT_SPEC_INST_GET(id, crcen_gpios),                              \
+		.crc_en = DT_INST_PROP(id, crc_en),                                                \
+		.pkt_size = (DT_INST_PROP(id, crc_en) & 0x1) ? 2 : 1,                              \
+	};                                                                                         \
+                                                                                                   \
+	static struct max14917_data max14917_##id##_data;                                          \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(id, &gpio_max14917_init, NULL, &max14917_##id##_data,                \
+			      &max14917_##id##_cfg, POST_KERNEL,                                   \
+			      CONFIG_GPIO_MAX14917_INIT_PRIORITY, &gpio_max14917_api);
+
+DT_INST_FOREACH_STATUS_OKAY(GPIO_MAX14917_DEVICE)
diff --git a/drivers/gpio/gpio_max14917.h b/drivers/gpio/gpio_max14917.h
new file mode 100644
index 0000000000000..f23e1a14a9bd8
--- /dev/null
+++ b/drivers/gpio/gpio_max14917.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 Analog Devices Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_MAX14917_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_MAX14917_H_
+
+#define MAX14917_CHANNELS 8
+
+#define MAX14917_MAX_PKT_SIZE 2
+
+#define MAX14917_COMM_ERR  BIT(7)
+#define MAX14917_VERR      BIT(6)
+#define MAX14917_THERM_ERR BIT(5)
+
+#define MAX14917_CRC_POLY       0x15
+#define MAX14917_CRC_INI_VAL    0x1F
+#define MAX14917_CRC_EXTRA_BYTE 0x00
+#define MAX14917_CRC_MASK       0x1F
+
+struct max14917_config {
+	struct spi_dt_spec spi;
+	/* Input gpios */
+	struct gpio_dt_spec vddok_gpio;
+	struct gpio_dt_spec ready_gpio;
+	struct gpio_dt_spec comerr_gpio;
+	struct gpio_dt_spec fault_gpio;
+	/* Output gpios */
+	struct gpio_dt_spec en_gpio;
+	struct gpio_dt_spec sync_gpio;
+	struct gpio_dt_spec crcen_gpio;
+	bool crc_en;
+	uint8_t pkt_size;
+};
+
+struct max14917_data {
+	uint8_t gpios_ON; /* GPIO states */
+	uint8_t gpios_fault;
+	bool comm_err;
+	bool verr;
+	bool therm_err;
+};
+
+#endif
diff --git a/drivers/gpio/gpio_max22190.c b/drivers/gpio/gpio_max22190.c
deleted file mode 100644
index 8fa04821d08fe..0000000000000
--- a/drivers/gpio/gpio_max22190.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
- * Copyright (c) 2024 Analog Devices Inc.
- * Copyright (c) 2024 Baylibre SAS
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT adi_max22190_gpio
-
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/spi.h>
-#include <zephyr/kernel.h>
-#include <zephyr/sys/byteorder.h>
-
-#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(gpio_max22190);
-
-#include <zephyr/drivers/gpio/gpio_utils.h>
-
-#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 0
-#warning "GPIO MAX22190 driver enabled without any devices"
-#endif
-
-#define MAX22190_ENABLE  1
-#define MAX22190_DISABLE 0
-
-#define MAX22190_READ  0
-#define MAX22190_WRITE 1
-
-#define MAX22190_MAX_PKT_SIZE   3
-#define MAX22190_CHANNELS       8
-#define MAX22190_FAULT2_ENABLES 5
-
-#define MAX22190_WB_REG           0x0
-#define MAX22190_DI_REG           0x2
-#define MAX22190_FAULT1_REG       0x4
-#define MAX22190_FILTER_IN_REG(x) (0x6 + (2 * (x)))
-#define MAX22190_CFG_REG          0x18
-#define MAX22190_IN_EN_REG        0x1A
-#define MAX22190_FAULT2_REG       0x1C
-#define MAX22190_FAULT2_EN_REG    0x1E
-#define MAX22190_GPO_REG          0x22
-#define MAX22190_FAULT1_EN_REG    0x24
-#define MAX22190_NOP_REG          0x26
-
-#define MAX22190_CH_STATE_MASK(x) BIT(x)
-#define MAX22190_DELAY_MASK       GENMASK(2, 0)
-#define MAX22190_FBP_MASK         BIT(3)
-#define MAX22190_WBE_MASK         BIT(4)
-#define MAX22190_RW_MASK          BIT(7)
-#define MAX22190_ADDR_MASK        GENMASK(6, 0)
-#define MAX22190_ALARM_MASK       GENMASK(4, 3)
-#define MAX22190_POR_MASK         BIT(6)
-
-#define MAX22190_FAULT_MASK(x)   BIT(x)
-#define MAX22190_FAULT2_WBE_MASK BIT(4)
-
-#define MAX22190_FAULT2_EN_MASK GENMASK(5, 0)
-
-#define MAX22190_CFG_REFDI_MASK BIT(0)
-#define MAX22190_CFG_CLRF_MASK  BIT(3)
-#define MAX22190_CFG_24VF_MASK  BIT(4)
-
-#define PRINT_ERR_BIT(bit1, bit2)                                                                  \
-	if (bit1 & bit2) {                                                                         \
-		LOG_ERR("[%s] %d", #bit1, bit1);                                                   \
-	}
-
-#define MAX22190_CLEAN_POR(dev)                                                                    \
-	max22190_reg_update(dev, MAX22190_FAULT1_REG, MAX22190_POR_MASK,                           \
-			    FIELD_PREP(MAX22190_POR_MASK, 0))
-
-enum max22190_ch_state {
-	MAX22190_CH_OFF,
-	MAX22190_CH_ON
-};
-
-enum max22190_ch_wb_state {
-	MAX22190_CH_NO_WB_BREAK,
-	MAX22190_CH_WB_COND_DET
-};
-
-enum max22190_mode {
-	MAX22190_MODE_0,
-	MAX22190_MODE_1,
-	MAX22190_MODE_2,
-	MAX22190_MODE_3,
-};
-
-union max22190_fault1 {
-	uint8_t reg_raw;
-	struct {
-		uint8_t max22190_WBG: 1; /* BIT 0 */
-		uint8_t max22190_24VM: 1;
-		uint8_t max22190_24VL: 1;
-		uint8_t max22190_ALRMT1: 1;
-		uint8_t max22190_ALRMT2: 1;
-		uint8_t max22190_FAULT2: 1;
-		uint8_t max22190_POR: 1;
-		uint8_t max22190_CRC: 1; /* BIT 7 */
-	} reg_bits;
-};
-
-union max22190_fault1_en {
-	uint8_t reg_raw;
-	struct {
-		uint8_t max22190_WBGE: 1; /* BIT 0 */
-		uint8_t max22190_24VME: 1;
-		uint8_t max22190_24VLE: 1;
-		uint8_t max22190_ALRMT1E: 1;
-		uint8_t max22190_ALRMT2E: 1;
-		uint8_t max22190_FAULT2E: 1;
-		uint8_t max22190_PORE: 1;
-		uint8_t max22190_CRCE: 1; /* BIT 7 */
-	} reg_bits;
-};
-
-union max22190_fault2 {
-	uint8_t reg_raw;
-	struct {
-		uint8_t max22190_RFWBS: 1; /* BIT 0 */
-		uint8_t max22190_RFWBO: 1;
-		uint8_t max22190_RFDIS: 1;
-		uint8_t max22190_RFDIO: 1;
-		uint8_t max22190_OTSHDN: 1;
-		uint8_t max22190_FAULT8CK: 1;
-		uint8_t max22190_DUMMY: 2; /* BIT 7 */
-	} reg_bits;
-};
-
-union max22190_fault2_en {
-	uint8_t reg_raw;
-	struct {
-		uint8_t max22190_RFWBSE: 1; /* BIT 0 */
-		uint8_t max22190_RFWBOE: 1;
-		uint8_t max22190_RFDISE: 1;
-		uint8_t max22190_RFDIOE: 1;
-		uint8_t max22190_OTSHDNE: 1;
-		uint8_t max22190_FAULT8CKE: 1;
-		uint8_t max22190_DUMMY: 2; /* BIT 7 */
-	} reg_bits;
-};
-
-union max22190_cfg {
-	uint8_t reg_raw;
-	struct {
-		uint8_t max22190_DUMMY1: 3; /* BIT 0 */
-		uint8_t max22190_24VF: 1;
-		uint8_t max22190_CLRF: 1;
-		uint8_t max22190_DUMMY2: 2;
-		uint8_t max22190_REFDI_SH_EN: 1; /* BIT 7 */
-	} reg_bits;
-};
-
-union max22190_filter {
-	uint8_t reg_raw;
-	struct {
-		uint8_t max22190_DELAY: 3; /* BIT 0 */
-		uint8_t max22190_FBP: 1;
-		uint8_t max22190_WBE: 1;
-		uint8_t max22190_DUMMY: 2; /* BIT 7 */
-	} reg_bits;
-};
-
-enum max22190_delay {
-	MAX22190_DELAY_50US,
-	MAX22190_DELAY_100US,
-	MAX22190_DELAY_400US,
-	MAX22190_DELAY_800US,
-	MAX22190_DELAY_1800US,
-	MAX22190_DELAY_3200US,
-	MAX22190_DELAY_12800US,
-	MAX22190_DELAY_20000US
-};
-
-struct max22190_config {
-	struct spi_dt_spec spi;
-	struct gpio_dt_spec fault_gpio;
-	struct gpio_dt_spec ready_gpio;
-	struct gpio_dt_spec latch_gpio;
-	union max22190_filter filter[8];
-	bool crc_en;
-	enum max22190_mode mode;
-	uint8_t pkt_size;
-};
-
-struct max22190_data {
-	struct gpio_driver_data common;
-	enum max22190_ch_state channels[MAX22190_CHANNELS];
-	enum max22190_ch_wb_state wb[MAX22190_CHANNELS];
-	union max22190_cfg cfg;
-	union max22190_fault1 fault1;
-	union max22190_fault1_en fault1_en;
-	union max22190_fault2 fault2;
-	union max22190_fault2_en fault2_en;
-};
-
-/*
- * @brief Compute the CRC5 value for MAX22190
- * @param data - Data array to calculate CRC for.
- * @return CRC result.
- */
-static uint8_t max22190_crc(uint8_t *data)
-{
-	int length = 19;
-	uint8_t crc_step, tmp;
-	uint8_t crc_init = 0x7;
-	uint8_t crc_poly = 0x35;
-	int i;
-
-	/*
-	 * This is the C custom implementation of CRC function for MAX22190, and
-	 * can be found here:
-	 * https://www.analog.com/en/design-notes/guidelines-to-implement-crc-algorithm.html
-	 */
-	uint32_t datainput = (uint32_t)((data[0] << 16) + (data[1] << 8) + data[2]);
-
-	datainput = (datainput & 0xFFFFE0) + crc_init;
-
-	tmp = (uint8_t)((datainput & 0xFC0000) >> 18);
-
-	if ((tmp & 0x20) == 0x20) {
-		crc_step = (uint8_t)(tmp ^ crc_poly);
-	} else {
-		crc_step = tmp;
-	}
-
-	for (i = 0; i < length - 1; i++) {
-		tmp = (uint8_t)(((crc_step & 0x1F) << 1) +
-				((datainput >> (length - 2 - i)) & 0x01));
-
-		if ((tmp & 0x20) == 0x20) {
-			crc_step = (uint8_t)(tmp ^ crc_poly);
-		} else {
-			crc_step = tmp;
-		}
-	}
-
-	return (uint8_t)(crc_step & 0x1F);
-}
-
-/*
- * @brief Update chan WB state in max22190_data
- *
- * @param dev - MAX22190 device.
- * @param val - value to be set.
- */
-static void max22190_update_wb_stat(const struct device *dev, uint8_t val)
-{
-	struct max22190_data *data = dev->data;
-
-	for (int ch_n = 0; ch_n < 8; ch_n++) {
-		data->wb[ch_n] = (val >> ch_n) & 0x1;
-	}
-}
-
-/*
- * @brief Update chan IN state in max22190_data
- *
- * @param dev - MAX22190 device.
- * @param val - value to be set.
- */
-static void max22190_update_in_stat(const struct device *dev, uint8_t val)
-{
-	struct max22190_data *data = dev->data;
-
-	for (int ch_n = 0; ch_n < 8; ch_n++) {
-		data->channels[ch_n] = (val >> ch_n) & 0x1;
-	}
-}
-
-/*
- * @brief Register write function for MAX22190
- *
- * @param dev - MAX22190 device config.
- * @param addr - Register value to which data is written.
- * @param val - Value which is to be written to requested register.
- * @return 0 in case of success, negative error code otherwise.
- */
-static int max22190_reg_transceive(const struct device *dev, uint8_t addr, uint8_t val, uint8_t rw)
-{
-	uint8_t crc;
-	int ret;
-
-	uint8_t local_rx_buff[MAX22190_MAX_PKT_SIZE] = {0};
-	uint8_t local_tx_buff[MAX22190_MAX_PKT_SIZE] = {0};
-
-	const struct max22190_config *config = dev->config;
-
-	struct spi_buf tx_buf = {
-		.buf = &local_tx_buff,
-		.len = config->pkt_size,
-	};
-	const struct spi_buf_set tx = {.buffers = &tx_buf, .count = 1};
-
-	struct spi_buf rx_buf = {
-		.buf = &local_rx_buff,
-		.len = config->pkt_size,
-	};
-	const struct spi_buf_set rx = {.buffers = &rx_buf, .count = 1};
-
-	local_tx_buff[0] =
-		FIELD_PREP(MAX22190_ADDR_MASK, addr) | FIELD_PREP(MAX22190_RW_MASK, rw & 0x1);
-	local_tx_buff[1] = val;
-
-	/* If CRC enabled calculate it */
-	if (config->crc_en) {
-		local_tx_buff[2] = max22190_crc(&local_tx_buff[0]);
-	}
-
-	/* write cmd & read resp at once */
-	ret = spi_transceive_dt(&config->spi, &tx, &rx);
-
-	if (ret) {
-		LOG_ERR("Err spi_transcieve_dt  [%d]\n", ret);
-		return ret;
-	}
-
-	/* if CRC enabled check readed */
-	if (config->crc_en) {
-		crc = max22190_crc(&local_rx_buff[0]);
-		if (crc != (local_rx_buff[2] & 0x1F)) {
-			LOG_ERR("READ CRC ERR (%d)-(%d)\n", crc, (local_rx_buff[2] & 0x1F));
-			return -EINVAL;
-		}
-	}
-
-	/* always (R/W) get DI reg in first byte */
-	max22190_update_in_stat(dev, local_rx_buff[0]);
-
-	/* in case of writing register we get as second byte WB reg */
-	if (rw == MAX22190_WRITE) {
-		max22190_update_wb_stat(dev, local_rx_buff[1]);
-	} else {
-		/* in case of READ second byte is value we are looking for */
-		ret = local_rx_buff[1];
-	}
-
-	return ret;
-}
-
-#define max22190_reg_read(dev, addr)       max22190_reg_transceive(dev, addr, 0, MAX22190_READ)
-#define max22190_reg_write(dev, addr, val) max22190_reg_transceive(dev, addr, val, MAX22190_WRITE)
-
-/*
- * @brief Register update function for MAX22190
- *
- * @param dev - MAX22190 device.
- * @param addr - Register valueto wich data is updated.
- * @param mask - Corresponding mask to the data that will be updated.
- * @param val - Updated value to be written in the register at update.
- * @return 0 in case of success, negative error code otherwise.
- */
-static int max22190_reg_update(const struct device *dev, uint8_t addr, uint8_t mask, uint8_t val)
-{
-	int ret;
-	uint32_t reg_val = 0;
-
-	ret = max22190_reg_read(dev, addr);
-
-	reg_val = ret;
-	reg_val &= ~mask;
-	reg_val |= mask & val;
-
-	return max22190_reg_write(dev, addr, reg_val);
-}
-
-/*
- * @brief Check FAULT1 and FAULT2
- *
- * @param dev - MAX22190 device
- */
-static void max22190_fault_check(const struct device *dev)
-{
-	struct max22190_data *data = dev->data;
-
-	/* FAULT1 */
-	data->fault1.reg_raw = max22190_reg_read(dev, MAX22190_FAULT1_REG);
-
-	if (data->fault1.reg_raw) {
-		/* FAULT1_EN */
-		data->fault1_en.reg_raw = max22190_reg_read(dev, MAX22190_FAULT1_EN_REG);
-
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_CRC,
-			      data->fault1_en.reg_bits.max22190_CRCE);
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_POR,
-			      data->fault1_en.reg_bits.max22190_PORE);
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_FAULT2,
-			      data->fault1_en.reg_bits.max22190_FAULT2E);
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_ALRMT2,
-			      data->fault1_en.reg_bits.max22190_ALRMT2E);
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_ALRMT1,
-			      data->fault1_en.reg_bits.max22190_ALRMT1E);
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_24VL,
-			      data->fault1_en.reg_bits.max22190_24VLE);
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_24VM,
-			      data->fault1_en.reg_bits.max22190_24VME);
-		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_WBG,
-			      data->fault1_en.reg_bits.max22190_WBGE);
-
-		if (data->fault1.reg_bits.max22190_WBG & data->fault1_en.reg_bits.max22190_WBGE) {
-			uint8_t wb_val = max22190_reg_read(dev, MAX22190_WB_REG);
-
-			max22190_update_wb_stat(dev, (uint8_t)wb_val);
-		}
-
-		if (data->fault1.reg_bits.max22190_FAULT2) {
-			/* FAULT2 */
-			data->fault2.reg_raw = max22190_reg_read(dev, MAX22190_FAULT2_REG);
-
-			/* FAULT2_EN */
-			data->fault2_en.reg_raw = max22190_reg_read(dev, MAX22190_FAULT2_EN_REG);
-
-			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFWBS,
-				      data->fault2_en.reg_bits.max22190_RFWBSE);
-			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFWBO,
-				      data->fault2_en.reg_bits.max22190_RFWBOE);
-			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFDIS,
-				      data->fault2_en.reg_bits.max22190_RFDISE);
-			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFDIO,
-				      data->fault2_en.reg_bits.max22190_RFDIOE);
-			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_OTSHDN,
-				      data->fault2_en.reg_bits.max22190_OTSHDNE);
-			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_FAULT8CK,
-				      data->fault2_en.reg_bits.max22190_FAULT8CKE);
-		}
-	}
-}
-
-static void max22190_state_get(const struct device *dev)
-{
-	const struct max22190_config *config = dev->config;
-
-	if (gpio_pin_get_dt(&config->fault_gpio)) {
-		max22190_fault_check(dev);
-	}
-
-	/* We are reading WB reg because on first byte will be clocked out DI reg
-	 * on second byte we will ge WB value.
-	 */
-	uint8_t wb_val = max22190_reg_read(dev, MAX22190_WB_REG);
-
-	max22190_update_wb_stat(dev, (uint8_t)wb_val);
-}
-
-static int gpio_max22190_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags)
-{
-	int err = 0;
-
-	if ((flags & (GPIO_INPUT | GPIO_OUTPUT)) == GPIO_DISCONNECTED) {
-		return -ENOTSUP;
-	}
-
-	if ((flags & GPIO_SINGLE_ENDED) != 0) {
-		return -ENOTSUP;
-	}
-
-	if ((flags & (GPIO_PULL_UP | GPIO_PULL_DOWN)) != 0) {
-		return -ENOTSUP;
-	}
-
-	if (flags & GPIO_INT_ENABLE) {
-		return -ENOTSUP;
-	}
-
-	switch (flags & GPIO_DIR_MASK) {
-	case GPIO_INPUT:
-		LOG_INF("Nothing to do, only INPUT supported");
-		break;
-	default:
-		LOG_ERR("On MAX22190 only input option is available!");
-		return -ENOTSUP;
-	}
-
-	return err;
-}
-
-static void max22190_filter_set(const struct device *dev)
-{
-	const struct max22190_config *config = dev->config;
-
-	for (int ch_n = 0; ch_n < 8; ch_n++) {
-		max22190_reg_write(dev, MAX22190_FILTER_IN_REG(ch_n), config->filter[ch_n].reg_raw);
-	}
-}
-
-static int max22190_fault_set(const struct device *dev)
-{
-	const struct max22190_data *data = dev->data;
-	int ret = 0;
-
-	ret = max22190_reg_write(dev, MAX22190_FAULT1_EN_REG, data->fault1_en.reg_raw);
-	if (ret) {
-		goto exit_fault_set;
-	}
-
-	ret = max22190_reg_write(dev, MAX22190_FAULT1_REG, data->fault1.reg_raw);
-	if (ret) {
-		goto exit_fault_set;
-	}
-
-	ret = max22190_reg_write(dev, MAX22190_FAULT2_EN_REG, data->fault2_en.reg_raw);
-	if (ret) {
-		goto exit_fault_set;
-	}
-
-	ret = max22190_reg_write(dev, MAX22190_FAULT2_REG, data->fault2.reg_raw);
-	if (ret) {
-		goto exit_fault_set;
-	}
-
-	return ret;
-
-exit_fault_set:
-	LOG_ERR("Err spi_transcieve_dt  [%d]\n", ret);
-	return ret;
-}
-
-static int gpio_max22190_port_get_raw(const struct device *dev, gpio_port_value_t *value)
-{
-	const struct max22190_data *data = dev->data;
-
-	max22190_state_get(dev);
-	*value = 0;
-	for (int ch_n = 0; ch_n < 8; ch_n++) {
-		/* IN ch state */
-		*value |= data->channels[ch_n] << ch_n;
-	}
-
-	return 0;
-}
-
-static int gpio_max22190_init(const struct device *dev)
-{
-	const struct max22190_config *config = dev->config;
-	struct max22190_data *data = dev->data;
-
-	LOG_DBG("GPIO MAX22190 init IN\n");
-
-	int err = 0;
-
-	if (!spi_is_ready_dt(&config->spi)) {
-		LOG_ERR("SPI bus is not ready\n");
-		return -ENODEV;
-	}
-
-	/* setup READY gpio - normal low */
-	if (!gpio_is_ready_dt(&config->ready_gpio)) {
-		LOG_ERR("READY GPIO device not ready");
-		return -ENODEV;
-	}
-
-	err = gpio_pin_configure_dt(&config->ready_gpio, GPIO_INPUT);
-	if (err < 0) {
-		LOG_ERR("Failed to configure reset GPIO");
-		return err;
-	}
-
-	/* setup FAULT gpio - normal high */
-	if (!gpio_is_ready_dt(&config->fault_gpio)) {
-		LOG_ERR("FAULT GPIO device not ready");
-		return -ENODEV;
-	}
-
-	err = gpio_pin_configure_dt(&config->fault_gpio, GPIO_INPUT | GPIO_PULL_UP);
-	if (err < 0) {
-		LOG_ERR("Failed to configure DC GPIO");
-		return err;
-	}
-
-	/* setup LATCH gpio - normal high */
-	if (!gpio_is_ready_dt(&config->latch_gpio)) {
-		LOG_ERR("LATCH GPIO device not ready");
-		return -ENODEV;
-	}
-
-	err = gpio_pin_configure_dt(&config->latch_gpio, GPIO_OUTPUT_INACTIVE);
-	if (err < 0) {
-		LOG_ERR("Failed to configure busy GPIO");
-		return err;
-	}
-
-	for (int i = 0; i < 8; i++) {
-		LOG_DBG("IN%d WBE [%d] FBP[%d] DELAY[%d]\n", i,
-			config->filter[i].reg_bits.max22190_WBE,
-			config->filter[i].reg_bits.max22190_FBP,
-			config->filter[i].reg_bits.max22190_DELAY);
-	}
-
-	LOG_DBG(" > MAX22190 MODE: %x", config->mode);
-	LOG_DBG(" > MAX22190 PKT SIZE: %dbits (%dbytes)", config->pkt_size * 8, config->pkt_size);
-	LOG_DBG(" > MAX22190 CRC: %s", config->crc_en ? "enable" : "disable");
-
-	data->fault1_en.reg_bits.max22190_WBGE = 1;
-	data->fault1_en.reg_bits.max22190_PORE = 1;
-
-	/* Set all FAULT and FAULT_EN regs */
-	max22190_fault_set(dev);
-
-	/* Set channels filters */
-	max22190_filter_set(dev);
-
-	/* POR bit need to be cleared after start */
-	MAX22190_CLEAN_POR(dev);
-
-	LOG_DBG("GPIO MAX22190 init OUT\n");
-	return 0;
-}
-
-static DEVICE_API(gpio, gpio_max22190_api) = {
-	.pin_configure = gpio_max22190_config,
-	.port_get_raw = gpio_max22190_port_get_raw,
-};
-
-/* Assign appropriate value for FILTER delay*/
-#define MAX22190_FILTER_SET_DELAY(delay)                                                           \
-	delay == 20000   ? MAX22190_DELAY_20000US                                                  \
-	: delay == 12800 ? MAX22190_DELAY_12800US                                                  \
-	: delay == 3200  ? MAX22190_DELAY_3200US                                                   \
-	: delay == 1600  ? MAX22190_DELAY_1800US                                                   \
-	: delay == 800   ? MAX22190_DELAY_800US                                                    \
-	: delay == 400   ? MAX22190_DELAY_400US                                                    \
-	: delay == 100   ? MAX22190_DELAY_100US                                                    \
-	: delay == 50    ? MAX22190_DELAY_50US                                                     \
-			 : MAX22190_DELAY_20000US
-
-/* Set FILTERx reg */
-#define MAX22190_FILTER_BY_IDX(id, idx)                                                            \
-	{                                                                                          \
-		.reg_bits.max22190_DELAY =                                                         \
-			MAX22190_FILTER_SET_DELAY(DT_INST_PROP_BY_IDX(id, filter_delays, idx)),    \
-		.reg_bits.max22190_FBP = DT_INST_PROP_BY_IDX(id, filter_fbps, idx),                \
-		.reg_bits.max22190_WBE = DT_INST_PROP_BY_IDX(id, filter_wbes, idx),                \
-	}
-
-#define GPIO_MAX22190_DEVICE(id)                                                                   \
-	static const struct max22190_config max22190_##id##_cfg = {                                \
-		.spi = SPI_DT_SPEC_INST_GET(id, SPI_OP_MODE_MASTER | SPI_WORD_SET(8U), 0U),        \
-		.ready_gpio = GPIO_DT_SPEC_INST_GET(id, drdy_gpios),                               \
-		.fault_gpio = GPIO_DT_SPEC_INST_GET(id, fault_gpios),                              \
-		.latch_gpio = GPIO_DT_SPEC_INST_GET(id, latch_gpios),                              \
-		.mode = DT_INST_PROP(id, max22190_mode),                                           \
-		.crc_en = !(DT_INST_PROP(id, max22190_mode) & 0x1),                                \
-		.pkt_size = !(DT_INST_PROP(id, max22190_mode) & 0x1) ? 3 : 2,                      \
-		.filter =                                                                          \
-			{                                                                          \
-				MAX22190_FILTER_BY_IDX(id, 0),                                     \
-				MAX22190_FILTER_BY_IDX(id, 1),                                     \
-				MAX22190_FILTER_BY_IDX(id, 2),                                     \
-				MAX22190_FILTER_BY_IDX(id, 3),                                     \
-				MAX22190_FILTER_BY_IDX(id, 4),                                     \
-				MAX22190_FILTER_BY_IDX(id, 5),                                     \
-				MAX22190_FILTER_BY_IDX(id, 6),                                     \
-				MAX22190_FILTER_BY_IDX(id, 7),                                     \
-			},                                                                         \
-	};                                                                                         \
-                                                                                                   \
-	static struct max22190_data max22190_##id##_data;                                          \
-                                                                                                   \
-	DEVICE_DT_INST_DEFINE(id, &gpio_max22190_init, NULL, &max22190_##id##_data,                \
-			      &max22190_##id##_cfg, POST_KERNEL,                                   \
-			      CONFIG_GPIO_MAX22190_INIT_PRIORITY, &gpio_max22190_api);
-
-DT_INST_FOREACH_STATUS_OKAY(GPIO_MAX22190_DEVICE)
diff --git a/drivers/gpio/gpio_max2219x.c b/drivers/gpio/gpio_max2219x.c
new file mode 100644
index 0000000000000..e68f187df8b78
--- /dev/null
+++ b/drivers/gpio/gpio_max2219x.c
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 2024 Analog Devices Inc.
+ * Copyright (c) 2024 Baylibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+
+#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(gpio_max22190);
+
+#include <zephyr/drivers/gpio/gpio_utils.h>
+
+#define MAX22190_ENABLE  1
+#define MAX22190_DISABLE 0
+
+#define MAX22190_READ  0
+#define MAX22190_WRITE 1
+
+#define MAX22190_MAX_PKT_SIZE   3
+#define MAX22190_CHANNELS       8
+#define MAX22190_FAULT2_ENABLES 5
+
+#define MAX22190_WB_REG           0x0
+#define MAX22190_DI_REG           0x2
+#define MAX22190_FAULT1_REG       0x4
+#define MAX22190_FILTER_IN_REG(x) (0x6 + (2 * (x)))
+#define MAX22190_CFG_REG          0x18
+#define MAX22190_IN_EN_REG        0x1A
+#define MAX22190_FAULT2_REG       0x1C
+#define MAX22190_FAULT2_EN_REG    0x1E
+#define MAX22190_GPO_REG          0x22
+#define MAX22190_FAULT1_EN_REG    0x24
+#define MAX22190_NOP_REG          0x26
+
+#define MAX22190_CH_STATE_MASK(x) BIT(x)
+#define MAX22190_DELAY_MASK       GENMASK(2, 0)
+#define MAX22190_FBP_MASK         BIT(3)
+#define MAX22190_WBE_MASK         BIT(4)
+#define MAX22190_RW_MASK          BIT(7)
+#define MAX22190_ADDR_MASK        GENMASK(6, 0)
+#define MAX22190_ALARM_MASK       GENMASK(4, 3)
+#define MAX22190_POR_MASK         BIT(6)
+
+#define MAX22190_FAULT_MASK(x)   BIT(x)
+#define MAX22190_FAULT2_WBE_MASK BIT(4)
+
+#define MAX22190_FAULT2_EN_MASK GENMASK(5, 0)
+
+#define MAX22190_CFG_REFDI_MASK BIT(0)
+#define MAX22190_CFG_CLRF_MASK  BIT(3)
+#define MAX22190_CFG_24VF_MASK  BIT(4)
+
+#define PRINT_ERR_BIT(bit1, bit2)                                                                  \
+	if (bit1 & bit2) {                                                                         \
+		LOG_ERR("[%s] %d", #bit1, bit1);                                                   \
+	}
+
+#define MAX22190_CLEAN_POR(dev)                                                                    \
+	max22190_reg_update(dev, MAX22190_FAULT1_REG, MAX22190_POR_MASK,                           \
+			    FIELD_PREP(MAX22190_POR_MASK, 0))
+
+enum max22190_variants {
+	MAX22190,
+	MAX22199,
+};
+
+enum max22190_ch_state {
+	MAX22190_CH_OFF,
+	MAX22190_CH_ON
+};
+
+enum max22190_ch_wb_state {
+	MAX22190_CH_NO_WB_BREAK,
+	MAX22190_CH_WB_COND_DET
+};
+
+enum max22190_mode {
+	MAX22190_MODE_0,
+	MAX22190_MODE_1,
+	MAX22190_MODE_2,
+	MAX22190_MODE_3,
+};
+
+union max22190_fault1 {
+	uint8_t reg_raw;
+	struct {
+		uint8_t max22190_WBG: 1; /* BIT 0 */
+		uint8_t max22190_24VM: 1;
+		uint8_t max22190_24VL: 1;
+		uint8_t max22190_ALRMT1: 1;
+		uint8_t max22190_ALRMT2: 1;
+		uint8_t max22190_FAULT2: 1;
+		uint8_t max22190_POR: 1;
+		uint8_t max22190_CRC: 1; /* BIT 7 */
+	} reg_bits;
+};
+
+union max22190_fault1_en {
+	uint8_t reg_raw;
+	struct {
+		uint8_t max22190_WBGE: 1; /* BIT 0 */
+		uint8_t max22190_24VME: 1;
+		uint8_t max22190_24VLE: 1;
+		uint8_t max22190_ALRMT1E: 1;
+		uint8_t max22190_ALRMT2E: 1;
+		uint8_t max22190_FAULT2E: 1;
+		uint8_t max22190_PORE: 1;
+		uint8_t max22190_CRCE: 1; /* BIT 7 */
+	} reg_bits;
+};
+
+union max22190_fault2 {
+	uint8_t reg_raw;
+	struct {
+		uint8_t max22190_RFWBS: 1; /* BIT 0 */
+		uint8_t max22190_RFWBO: 1;
+		uint8_t max22190_RFDIS: 1;
+		uint8_t max22190_RFDIO: 1;
+		uint8_t max22190_OTSHDN: 1;
+		uint8_t max22190_FAULT8CK: 1;
+		uint8_t max22190_DUMMY: 2; /* BIT 7 */
+	} reg_bits;
+};
+
+union max22190_fault2_en {
+	uint8_t reg_raw;
+	struct {
+		uint8_t max22190_RFWBSE: 1; /* BIT 0 */
+		uint8_t max22190_RFWBOE: 1;
+		uint8_t max22190_RFDISE: 1;
+		uint8_t max22190_RFDIOE: 1;
+		uint8_t max22190_OTSHDNE: 1;
+		uint8_t max22190_FAULT8CKE: 1;
+		uint8_t max22190_DUMMY: 2; /* BIT 7 */
+	} reg_bits;
+};
+
+union max22190_cfg {
+	uint8_t reg_raw;
+	struct {
+		uint8_t max22190_DUMMY1: 3; /* BIT 0 */
+		uint8_t max22190_24VF: 1;
+		uint8_t max22190_CLRF: 1;
+		uint8_t max22190_DUMMY2: 2;
+		uint8_t max22190_REFDI_SH_EN: 1; /* BIT 7 */
+	} reg_bits;
+};
+
+union max22190_filter {
+	uint8_t reg_raw;
+	struct {
+		uint8_t max22190_DELAY: 3; /* BIT 0 */
+		uint8_t max22190_FBP: 1;
+		uint8_t max22190_WBE: 1;
+		uint8_t max22190_DUMMY: 2; /* BIT 7 */
+	} reg_bits;
+};
+
+enum max22190_delay {
+	MAX22190_DELAY_50US,
+	MAX22190_DELAY_100US,
+	MAX22190_DELAY_400US,
+	MAX22190_DELAY_800US,
+	MAX22190_DELAY_1800US,
+	MAX22190_DELAY_3200US,
+	MAX22190_DELAY_12800US,
+	MAX22190_DELAY_20000US
+};
+
+struct max22190_config {
+	struct spi_dt_spec spi;
+	struct gpio_dt_spec fault_gpio;
+	struct gpio_dt_spec ready_gpio;
+	struct gpio_dt_spec latch_gpio;
+	union max22190_filter filter[8];
+	bool crc_en;
+	enum max22190_mode mode;
+	uint8_t pkt_size;
+	uint8_t variant;
+};
+
+struct max22190_data {
+	struct gpio_driver_data common;
+	enum max22190_ch_state channels[MAX22190_CHANNELS];
+	enum max22190_ch_wb_state wb[MAX22190_CHANNELS];
+	union max22190_cfg cfg;
+	union max22190_fault1 fault1;
+	union max22190_fault1_en fault1_en;
+	union max22190_fault2 fault2;
+	union max22190_fault2_en fault2_en;
+};
+
+/*
+ * @brief Compute the CRC5 value for MAX22190
+ * @param data - Data array to calculate CRC for.
+ * @return CRC result.
+ */
+static uint8_t max22190_crc(uint8_t *data)
+{
+	int length = 19;
+	uint8_t crc_step, tmp;
+	uint8_t crc_init = 0x7;
+	uint8_t crc_poly = 0x35;
+	int i;
+
+	/*
+	 * This is the C custom implementation of CRC function for MAX22190, and
+	 * can be found here:
+	 * https://www.analog.com/en/design-notes/guidelines-to-implement-crc-algorithm.html
+	 */
+	uint32_t datainput = (uint32_t)((data[0] << 16) + (data[1] << 8) + data[2]);
+
+	datainput = (datainput & 0xFFFFE0) + crc_init;
+
+	tmp = (uint8_t)((datainput & 0xFC0000) >> 18);
+
+	if ((tmp & 0x20) == 0x20) {
+		crc_step = (uint8_t)(tmp ^ crc_poly);
+	} else {
+		crc_step = tmp;
+	}
+
+	for (i = 0; i < length - 1; i++) {
+		tmp = (uint8_t)(((crc_step & 0x1F) << 1) +
+				((datainput >> (length - 2 - i)) & 0x01));
+
+		if ((tmp & 0x20) == 0x20) {
+			crc_step = (uint8_t)(tmp ^ crc_poly);
+		} else {
+			crc_step = tmp;
+		}
+	}
+
+	return (uint8_t)(crc_step & 0x1F);
+}
+
+/*
+ * @brief Update chan WB state in max22190_data
+ *
+ * @param dev - MAX22190 device.
+ * @param val - value to be set.
+ */
+static void max22190_update_wb_stat(const struct device *dev, uint8_t val)
+{
+	struct max22190_data *data = dev->data;
+
+	for (int ch_n = 0; ch_n < 8; ch_n++) {
+		data->wb[ch_n] = (val >> ch_n) & 0x1;
+	}
+}
+
+/*
+ * @brief Update chan IN state in max22190_data
+ *
+ * @param dev - MAX22190 device.
+ * @param val - value to be set.
+ */
+static void max22190_update_in_stat(const struct device *dev, uint8_t val)
+{
+	struct max22190_data *data = dev->data;
+
+	for (int ch_n = 0; ch_n < 8; ch_n++) {
+		data->channels[ch_n] = (val >> ch_n) & 0x1;
+	}
+}
+
+/*
+ * @brief Register write function for MAX22190
+ *
+ * @param dev - MAX22190 device config.
+ * @param addr - Register value to which data is written.
+ * @param val - Value which is to be written to requested register.
+ * @return 0 in case of success, negative error code otherwise.
+ */
+static int max22190_reg_transceive(const struct device *dev, uint8_t addr, uint8_t val, uint8_t rw)
+{
+	uint8_t crc;
+	int ret;
+
+	uint8_t local_rx_buff[MAX22190_MAX_PKT_SIZE] = {0};
+	uint8_t local_tx_buff[MAX22190_MAX_PKT_SIZE] = {0};
+
+	const struct max22190_config *config = dev->config;
+
+	struct spi_buf tx_buf = {
+		.buf = &local_tx_buff,
+		.len = config->pkt_size,
+	};
+	const struct spi_buf_set tx = {.buffers = &tx_buf, .count = 1};
+
+	struct spi_buf rx_buf = {
+		.buf = &local_rx_buff,
+		.len = config->pkt_size,
+	};
+	const struct spi_buf_set rx = {.buffers = &rx_buf, .count = 1};
+
+	local_tx_buff[0] =
+		FIELD_PREP(MAX22190_ADDR_MASK, addr) | FIELD_PREP(MAX22190_RW_MASK, rw & 0x1);
+	local_tx_buff[1] = val;
+
+	/* If CRC enabled calculate it */
+	if (config->crc_en) {
+		local_tx_buff[2] = max22190_crc(&local_tx_buff[0]);
+	}
+
+	/* write cmd & read resp at once */
+	ret = spi_transceive_dt(&config->spi, &tx, &rx);
+
+	if (ret) {
+		LOG_ERR("Err spi_transcieve_dt  [%d]\n", ret);
+		return ret;
+	}
+
+	/* if CRC enabled check readed */
+	if (config->crc_en) {
+		crc = max22190_crc(&local_rx_buff[0]);
+		if (crc != (local_rx_buff[2] & 0x1F)) {
+			LOG_ERR("READ CRC ERR (%d)-(%d)\n", crc, (local_rx_buff[2] & 0x1F));
+			return -EINVAL;
+		}
+	}
+
+	/* always (R/W) get DI reg in first byte */
+	max22190_update_in_stat(dev, local_rx_buff[0]);
+
+	/* in case of writing register we get as second byte WB reg */
+	if (rw == MAX22190_WRITE) {
+		max22190_update_wb_stat(dev, local_rx_buff[1]);
+	} else {
+		/* in case of READ second byte is value we are looking for */
+		ret = local_rx_buff[1];
+	}
+
+	return ret;
+}
+
+#define max22190_reg_read(dev, addr)       max22190_reg_transceive(dev, addr, 0, MAX22190_READ)
+#define max22190_reg_write(dev, addr, val) max22190_reg_transceive(dev, addr, val, MAX22190_WRITE)
+
+/*
+ * @brief Register update function for MAX22190
+ *
+ * @param dev - MAX22190 device.
+ * @param addr - Register valueto wich data is updated.
+ * @param mask - Corresponding mask to the data that will be updated.
+ * @param val - Updated value to be written in the register at update.
+ * @return 0 in case of success, negative error code otherwise.
+ */
+static int max22190_reg_update(const struct device *dev, uint8_t addr, uint8_t mask, uint8_t val)
+{
+	int ret;
+	uint32_t reg_val = 0;
+
+	ret = max22190_reg_read(dev, addr);
+
+	reg_val = ret;
+	reg_val &= ~mask;
+	reg_val |= mask & val;
+
+	return max22190_reg_write(dev, addr, reg_val);
+}
+
+/*
+ * @brief Check FAULT1 and FAULT2
+ *
+ * @param dev - MAX22190 device
+ */
+static void max22190_fault_check(const struct device *dev)
+{
+	struct max22190_data *data = dev->data;
+	const struct max22190_config *config = dev->config;
+
+	/* FAULT1 */
+	data->fault1.reg_raw = max22190_reg_read(dev, MAX22190_FAULT1_REG);
+
+	if (data->fault1.reg_raw) {
+		/* FAULT1_EN */
+		data->fault1_en.reg_raw = max22190_reg_read(dev, MAX22190_FAULT1_EN_REG);
+
+		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_CRC,
+			      data->fault1_en.reg_bits.max22190_CRCE);
+		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_POR,
+			      data->fault1_en.reg_bits.max22190_PORE);
+		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_FAULT2,
+			      data->fault1_en.reg_bits.max22190_FAULT2E);
+		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_24VL,
+			      data->fault1_en.reg_bits.max22190_24VLE);
+		PRINT_ERR_BIT(data->fault1.reg_bits.max22190_24VM,
+			      data->fault1_en.reg_bits.max22190_24VME);
+		if (config->variant == MAX22190) {
+			PRINT_ERR_BIT(data->fault1.reg_bits.max22190_ALRMT2,
+				      data->fault1_en.reg_bits.max22190_ALRMT2E);
+			PRINT_ERR_BIT(data->fault1.reg_bits.max22190_ALRMT1,
+				      data->fault1_en.reg_bits.max22190_ALRMT1E);
+			PRINT_ERR_BIT(data->fault1.reg_bits.max22190_WBG,
+				      data->fault1_en.reg_bits.max22190_WBGE);
+			if (data->fault1.reg_bits.max22190_WBG &
+			    data->fault1_en.reg_bits.max22190_WBGE) {
+				uint8_t wb_val = max22190_reg_read(dev, MAX22190_WB_REG);
+
+				max22190_update_wb_stat(dev, (uint8_t)wb_val);
+			}
+		}
+		if (data->fault1.reg_bits.max22190_FAULT2) {
+			/* FAULT2 */
+			data->fault2.reg_raw = max22190_reg_read(dev, MAX22190_FAULT2_REG);
+
+			/* FAULT2_EN */
+			data->fault2_en.reg_raw = max22190_reg_read(dev, MAX22190_FAULT2_EN_REG);
+
+			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_OTSHDN,
+				      data->fault2_en.reg_bits.max22190_OTSHDNE);
+			PRINT_ERR_BIT(data->fault2.reg_bits.max22190_FAULT8CK,
+				      data->fault2_en.reg_bits.max22190_FAULT8CKE);
+			if (config->variant == MAX22190) {
+				PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFWBS,
+					      data->fault2_en.reg_bits.max22190_RFWBSE);
+				PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFWBO,
+					      data->fault2_en.reg_bits.max22190_RFWBOE);
+				PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFDIS,
+					      data->fault2_en.reg_bits.max22190_RFDISE);
+				PRINT_ERR_BIT(data->fault2.reg_bits.max22190_RFDIO,
+					      data->fault2_en.reg_bits.max22190_RFDIOE);
+			}
+		}
+	}
+}
+
+static void max22190_state_get(const struct device *dev)
+{
+	const struct max22190_config *config = dev->config;
+
+	if (gpio_pin_get_dt(&config->fault_gpio)) {
+		max22190_fault_check(dev);
+	}
+
+	/* We are reading WB reg because on first byte will be clocked out DI reg
+	 * on second byte we will ge WB value.
+	 */
+	uint8_t wb_val = max22190_reg_read(dev, MAX22190_WB_REG);
+
+	max22190_update_wb_stat(dev, (uint8_t)wb_val);
+}
+
+static int gpio_max22190_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags)
+{
+	int err = 0;
+
+	if ((flags & (GPIO_INPUT | GPIO_OUTPUT)) == GPIO_DISCONNECTED) {
+		return -ENOTSUP;
+	}
+
+	if ((flags & GPIO_SINGLE_ENDED) != 0) {
+		return -ENOTSUP;
+	}
+
+	if ((flags & (GPIO_PULL_UP | GPIO_PULL_DOWN)) != 0) {
+		return -ENOTSUP;
+	}
+
+	if (flags & GPIO_INT_ENABLE) {
+		return -ENOTSUP;
+	}
+
+	switch (flags & GPIO_DIR_MASK) {
+	case GPIO_INPUT:
+		LOG_INF("Nothing to do, only INPUT supported");
+		break;
+	default:
+		LOG_ERR("On MAX22190 only input option is available!");
+		return -ENOTSUP;
+	}
+
+	return err;
+}
+
+static void max22190_filter_set(const struct device *dev)
+{
+	const struct max22190_config *config = dev->config;
+
+	for (int ch_n = 0; ch_n < 8; ch_n++) {
+		max22190_reg_write(dev, MAX22190_FILTER_IN_REG(ch_n), config->filter[ch_n].reg_raw);
+	}
+}
+
+static int max22190_fault_set(const struct device *dev)
+{
+	const struct max22190_data *data = dev->data;
+	int ret = 0;
+
+	ret = max22190_reg_write(dev, MAX22190_FAULT1_EN_REG, data->fault1_en.reg_raw);
+	if (ret) {
+		goto exit_fault_set;
+	}
+
+	ret = max22190_reg_write(dev, MAX22190_FAULT1_REG, data->fault1.reg_raw);
+	if (ret) {
+		goto exit_fault_set;
+	}
+
+	ret = max22190_reg_write(dev, MAX22190_FAULT2_EN_REG, data->fault2_en.reg_raw);
+	if (ret) {
+		goto exit_fault_set;
+	}
+
+	ret = max22190_reg_write(dev, MAX22190_FAULT2_REG, data->fault2.reg_raw);
+	if (ret) {
+		goto exit_fault_set;
+	}
+
+	return ret;
+
+exit_fault_set:
+	LOG_ERR("Err spi_transcieve_dt  [%d]\n", ret);
+
+	return ret;
+}
+
+static int gpio_max22190_port_get_raw(const struct device *dev, gpio_port_value_t *value)
+{
+	const struct max22190_data *data = dev->data;
+
+	max22190_state_get(dev);
+	*value = 0;
+	for (int ch_n = 0; ch_n < 8; ch_n++) {
+		/* IN ch state */
+		*value |= data->channels[ch_n] << ch_n;
+	}
+
+	return 0;
+}
+
+static int gpio_max22190_init(const struct device *dev)
+{
+	const struct max22190_config *config = dev->config;
+	struct max22190_data *data = dev->data;
+
+	LOG_DBG("GPIO MAX22190 init IN\n");
+
+	int err = 0;
+
+	if (!spi_is_ready_dt(&config->spi)) {
+		LOG_ERR("SPI bus is not ready\n");
+		return -ENODEV;
+	}
+
+	/* setup READY gpio - normal low */
+	if (!gpio_is_ready_dt(&config->ready_gpio)) {
+		LOG_ERR("READY GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->ready_gpio, GPIO_INPUT);
+	if (err < 0) {
+		LOG_ERR("Failed to configure reset GPIO");
+		return err;
+	}
+
+	/* setup FAULT gpio - normal high */
+	if (!gpio_is_ready_dt(&config->fault_gpio)) {
+		LOG_ERR("FAULT GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->fault_gpio, GPIO_INPUT | GPIO_PULL_UP);
+	if (err < 0) {
+		LOG_ERR("Failed to configure DC GPIO");
+		return err;
+	}
+
+	/* setup LATCH gpio - normal high */
+	if (!gpio_is_ready_dt(&config->latch_gpio)) {
+		LOG_ERR("LATCH GPIO device not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&config->latch_gpio, GPIO_OUTPUT_INACTIVE);
+	if (err < 0) {
+		LOG_ERR("Failed to configure busy GPIO");
+		return err;
+	}
+
+	for (int i = 0; i < 8; i++) {
+		if (config->variant == MAX22190) {
+			LOG_DBG("IN%d WBE [%d] FBP[%d] DELAY[%d]\n", i,
+				config->filter[i].reg_bits.max22190_WBE,
+				config->filter[i].reg_bits.max22190_FBP,
+				config->filter[i].reg_bits.max22190_DELAY);
+		} else {
+			LOG_DBG("IN%d FBP[%d] DELAY[%d]\n", i,
+				config->filter[i].reg_bits.max22190_FBP,
+				config->filter[i].reg_bits.max22190_DELAY);
+		}
+	}
+
+	LOG_DBG(" > MAX22190 MODE: %x", config->mode);
+	LOG_DBG(" > MAX22190 PKT SIZE: %dbits (%dbytes)", config->pkt_size * 8, config->pkt_size);
+	LOG_DBG(" > MAX22190 CRC: %s", config->crc_en ? "enable" : "disable");
+
+	if (config->variant == MAX22190) {
+		data->fault1_en.reg_bits.max22190_WBGE = 1;
+	}
+	data->fault1_en.reg_bits.max22190_PORE = 1;
+
+	/* Set all FAULT and FAULT_EN regs */
+	max22190_fault_set(dev);
+
+	/* Set channels filters */
+	max22190_filter_set(dev);
+
+	/* POR bit need to be cleared after start */
+	MAX22190_CLEAN_POR(dev);
+
+	LOG_DBG("GPIO MAX22190 init OUT\n");
+	return 0;
+}
+
+static DEVICE_API(gpio, gpio_max22190_api) = {
+	.pin_configure = gpio_max22190_config,
+	.port_get_raw = gpio_max22190_port_get_raw,
+};
+
+/* Assign appropriate value for FILTER delay*/
+#define MAX22190_FILTER_SET_DELAY(delay)                                                           \
+	delay == 20000   ? MAX22190_DELAY_20000US                                                  \
+	: delay == 12800 ? MAX22190_DELAY_12800US                                                  \
+	: delay == 3200  ? MAX22190_DELAY_3200US                                                   \
+	: delay == 1600  ? MAX22190_DELAY_1800US                                                   \
+	: delay == 800   ? MAX22190_DELAY_800US                                                    \
+	: delay == 400   ? MAX22190_DELAY_400US                                                    \
+	: delay == 100   ? MAX22190_DELAY_100US                                                    \
+	: delay == 50    ? MAX22190_DELAY_50US                                                     \
+			 : MAX22190_DELAY_20000US
+
+/* Assigning proper variant for differentiating register map */
+#define MAX22190_CONFIG_SET_VARIANT(model)                                                         \
+	model == 22190   ? MAX22190 /* MAX22190 */                                                 \
+	: model == 22199 ? MAX22199 /* MAX22199 */                                                 \
+			 : MAX22190 /* Default fallback */
+
+/* Set FILTERx reg */
+#define MAX22190_FILTER_BY_IDX(id, model, idx)                                                     \
+	{                                                                                          \
+		.reg_bits.max22190_DELAY =                                                         \
+			MAX22190_FILTER_SET_DELAY(DT_INST_PROP_BY_IDX(id, filter_delays, idx)),    \
+		.reg_bits.max22190_FBP = DT_INST_PROP_BY_IDX(id, filter_fbps, idx),                \
+		.reg_bits.max22190_WBE =                                                           \
+			(model == 22190) ? DT_INST_PROP_BY_IDX(id, filter_wbes, idx) : 0,          \
+	}
+
+#define GPIO_MAX22190_DEVICE(id, model)                                                            \
+	static const struct max22190_config max##model##_##id##_cfg = {                            \
+		.spi = SPI_DT_SPEC_INST_GET(id, SPI_OP_MODE_MASTER | SPI_WORD_SET(8U), 0U),        \
+		.ready_gpio = GPIO_DT_SPEC_INST_GET(id, drdy_gpios),                               \
+		.fault_gpio = GPIO_DT_SPEC_INST_GET(id, fault_gpios),                              \
+		.latch_gpio = GPIO_DT_SPEC_INST_GET(id, latch_gpios),                              \
+		.mode = DT_INST_PROP(id, max22190_mode),                                           \
+		.crc_en = !(DT_INST_PROP(id, max22190_mode) & 0x1),                                \
+		.pkt_size = !(DT_INST_PROP(id, max22190_mode) & 0x1) ? 3 : 2,                      \
+		.variant = MAX22190_CONFIG_SET_VARIANT(model),                                     \
+		.filter =                                                                          \
+			{                                                                          \
+				MAX22190_FILTER_BY_IDX(id, model, 0),                              \
+				MAX22190_FILTER_BY_IDX(id, model, 1),                              \
+				MAX22190_FILTER_BY_IDX(id, model, 2),                              \
+				MAX22190_FILTER_BY_IDX(id, model, 3),                              \
+				MAX22190_FILTER_BY_IDX(id, model, 4),                              \
+				MAX22190_FILTER_BY_IDX(id, model, 5),                              \
+				MAX22190_FILTER_BY_IDX(id, model, 6),                              \
+				MAX22190_FILTER_BY_IDX(id, model, 7),                              \
+			},                                                                         \
+	};                                                                                         \
+                                                                                                   \
+	static struct max22190_data max##model##_##id##_data;                                      \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(id, &gpio_max22190_init, NULL, &max##model##_##id##_data,            \
+			      &max##model##_##id##_cfg, POST_KERNEL,                               \
+			      CONFIG_GPIO_MAX22190_INIT_PRIORITY, &gpio_max22190_api);
+
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT adi_max22190_gpio
+DT_INST_FOREACH_STATUS_OKAY_VARGS(GPIO_MAX22190_DEVICE, 22190)
+
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT adi_max22199_gpio
+DT_INST_FOREACH_STATUS_OKAY_VARGS(GPIO_MAX22190_DEVICE, 22199)
+
+#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 0
+#warning "GPIO MAX22190 driver enabled without any devices"
+#endif
diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c
index e1d1b82619b6b..df140eb55c36f 100644
--- a/drivers/gpio/gpio_mcux_igpio.c
+++ b/drivers/gpio/gpio_mcux_igpio.c
@@ -17,6 +17,7 @@
 #include <fsl_gpio.h>
 
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/gpio/nxp-imx-igpio.h>
 
 #include <zephyr/drivers/gpio/gpio_utils.h>
 
@@ -90,8 +91,13 @@ static int mcux_igpio_configure(const struct device *dev,
 	if (((flags & GPIO_PULL_UP) != 0) || ((flags & GPIO_PULL_DOWN) != 0)) {
 		reg |= IOMUXC_SW_PAD_CTL_PAD_PUE_MASK;
 		if (((flags & GPIO_PULL_UP) != 0)) {
-			/* Use 100K pullup */
-			reg |= IOMUXC_SW_PAD_CTL_PAD_PUS(2);
+			if ((flags & NXP_IGPIO_PULL_STRONG) != 0) {
+				/* Use 22K pullup */
+				reg |= IOMUXC_SW_PAD_CTL_PAD_PUS(3);
+			} else {
+				/* Use 100K pullup */
+				reg |= IOMUXC_SW_PAD_CTL_PAD_PUS(2);
+			}
 		} else {
 			/* 100K pulldown */
 			reg &= ~IOMUXC_SW_PAD_CTL_PAD_PUS_MASK;
diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c
index 6a103a77dc828..ab8d9981170a2 100644
--- a/drivers/gpio/gpio_mcux_lpc.c
+++ b/drivers/gpio/gpio_mcux_lpc.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/pm/device.h>
 #include <zephyr/irq.h>
 #include <soc.h>
 #include <fsl_common.h>
@@ -398,6 +399,13 @@ static int gpio_mcux_lpc_pin_interrupt_configure(const struct device *dev,
 #endif
 }
 
+void gpio_mcux_lpc_trigger_cb(const struct device *dev, uint32_t pins)
+{
+	struct gpio_mcux_lpc_data *data = dev->data;
+
+	gpio_fire_callbacks(&data->callbacks, dev, pins);
+}
+
 static int gpio_mcux_lpc_manage_cb(const struct device *port,
 				   struct gpio_callback *callback, bool set)
 {
@@ -406,14 +414,34 @@ static int gpio_mcux_lpc_manage_cb(const struct device *port,
 	return gpio_manage_callback(&data->callbacks, callback, set);
 }
 
-static int gpio_mcux_lpc_init(const struct device *dev)
+static int gpio_mcux_lpc_pm_action(const struct device *dev, enum pm_device_action action)
 {
 	const struct gpio_mcux_lpc_config *config = dev->config;
-	GPIO_PortInit(config->gpio_base, config->port_no);
 
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		break;
+	case PM_DEVICE_ACTION_TURN_OFF:
+		break;
+	case PM_DEVICE_ACTION_TURN_ON:
+		GPIO_PortInit(config->gpio_base, config->port_no);
+		break;
+	default:
+		return -ENOTSUP;
+	}
 	return 0;
 }
 
+static int gpio_mcux_lpc_init(const struct device *dev)
+{
+	/* Rest of the init is done from the PM_DEVICE_TURN_ON action
+	 * which is invoked by pm_device_driver_init().
+	 */
+	return pm_device_driver_init(dev, gpio_mcux_lpc_pm_action);
+}
+
 static DEVICE_API(gpio, gpio_mcux_lpc_driver_api) = {
 	.pin_configure = gpio_mcux_lpc_configure,
 	.port_get_raw = gpio_mcux_lpc_port_get_raw,
@@ -465,7 +493,10 @@ static DEVICE_API(gpio, gpio_mcux_lpc_driver_api) = {
 											\
 	static struct gpio_mcux_lpc_data gpio_mcux_lpc_data_##n;			\
 											\
-	DEVICE_DT_INST_DEFINE(n, lpc_gpio_init_##n, NULL,				\
+	PM_DEVICE_DT_INST_DEFINE(n, gpio_mcux_lpc_pm_action);				\
+											\
+	DEVICE_DT_INST_DEFINE(n, lpc_gpio_init_##n,					\
+		    PM_DEVICE_DT_INST_GET(n),						\
 		    &gpio_mcux_lpc_data_##n,						\
 		    &gpio_mcux_lpc_config_##n, PRE_KERNEL_1,				\
 		    CONFIG_GPIO_INIT_PRIORITY,						\
diff --git a/drivers/gpio/gpio_mmio32.c b/drivers/gpio/gpio_mmio32.c
index 5244f45f29e27..bcc6dd258f5cb 100644
--- a/drivers/gpio/gpio_mmio32.c
+++ b/drivers/gpio/gpio_mmio32.c
@@ -26,27 +26,50 @@
  * gpio_port_write.
  */
 
-#include <zephyr/drivers/gpio/gpio_mmio32.h>
+#define DT_DRV_COMPAT arm_mmio32_gpio
+
 #include <zephyr/irq.h>
 #include <errno.h>
 
-static int gpio_mmio32_config(const struct device *dev,
-			      gpio_pin_t pin, gpio_flags_t flags)
+#include <zephyr/drivers/gpio/gpio_utils.h>
+
+struct gpio_mmio32_config {
+	/* gpio_driver_config needs to be first */
+	struct gpio_driver_config common;
+	volatile uint32_t *reg;
+	bool is_input;
+};
+
+struct gpio_mmio32_context {
+	/* gpio_driver_data needs to be first */
+	struct gpio_driver_data common;
+	const struct gpio_mmio32_config *config;
+};
+
+int gpio_mmio32_init(const struct device *dev);
+
+static int gpio_mmio32_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags)
 {
 	struct gpio_mmio32_context *context = dev->data;
 	const struct gpio_mmio32_config *config = context->config;
 
-	if ((config->mask & (1 << pin)) == 0) {
+	if ((config->common.port_pin_mask & (1 << pin)) == 0) {
 		return -EINVAL; /* Pin not in our validity mask */
 	}
 
-	if (flags & ~(GPIO_INPUT | GPIO_OUTPUT |
-		      GPIO_OUTPUT_INIT_LOW | GPIO_OUTPUT_INIT_HIGH |
+	if (flags & ~(GPIO_INPUT | GPIO_OUTPUT | GPIO_OUTPUT_INIT_LOW | GPIO_OUTPUT_INIT_HIGH |
 		      GPIO_ACTIVE_LOW)) {
 		/* We ignore direction and fake polarity, rest is unsupported */
 		return -ENOTSUP;
 	}
 
+	if (config->is_input && ((flags & GPIO_OUTPUT) != 0)) {
+		return -ENOTSUP;
+	}
+	if (!config->is_input && ((flags & GPIO_INPUT) != 0)) {
+		return -ENOTSUP;
+	}
+
 	if ((flags & GPIO_OUTPUT) != 0) {
 		unsigned int key;
 		volatile uint32_t *reg = config->reg;
@@ -55,7 +78,7 @@ static int gpio_mmio32_config(const struct device *dev,
 		if ((flags & GPIO_OUTPUT_INIT_HIGH) != 0) {
 			*reg = (*reg | (1 << pin));
 		} else if ((flags & GPIO_OUTPUT_INIT_LOW) != 0) {
-			*reg = (*reg & (config->mask & ~(1 << pin)));
+			*reg = (*reg & (config->common.port_pin_mask & ~(1 << pin)));
 		}
 		irq_unlock(key);
 	}
@@ -68,21 +91,19 @@ static int gpio_mmio32_port_get_raw(const struct device *dev, uint32_t *value)
 	struct gpio_mmio32_context *context = dev->data;
 	const struct gpio_mmio32_config *config = context->config;
 
-	*value = *config->reg & config->mask;
+	*value = *config->reg & config->common.port_pin_mask;
 
 	return 0;
 }
 
-static int gpio_mmio32_port_set_masked_raw(const struct device *dev,
-					   uint32_t mask,
-					   uint32_t value)
+static int gpio_mmio32_port_set_masked_raw(const struct device *dev, uint32_t mask, uint32_t value)
 {
 	struct gpio_mmio32_context *context = dev->data;
 	const struct gpio_mmio32_config *config = context->config;
 	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
-	mask &= config->mask;
+	mask &= config->common.port_pin_mask;
 	value &= mask;
 
 	/* Update pin state atomically */
@@ -93,15 +114,14 @@ static int gpio_mmio32_port_set_masked_raw(const struct device *dev,
 	return 0;
 }
 
-static int gpio_mmio32_port_set_bits_raw(const struct device *dev,
-					 uint32_t mask)
+static int gpio_mmio32_port_set_bits_raw(const struct device *dev, uint32_t mask)
 {
 	struct gpio_mmio32_context *context = dev->data;
 	const struct gpio_mmio32_config *config = context->config;
 	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
-	mask &= config->mask;
+	mask &= config->common.port_pin_mask;
 
 	/* Update pin state atomically */
 	key = irq_lock();
@@ -111,15 +131,14 @@ static int gpio_mmio32_port_set_bits_raw(const struct device *dev,
 	return 0;
 }
 
-static int gpio_mmio32_port_clear_bits_raw(const struct device *dev,
-					   uint32_t mask)
+static int gpio_mmio32_port_clear_bits_raw(const struct device *dev, uint32_t mask)
 {
 	struct gpio_mmio32_context *context = dev->data;
 	const struct gpio_mmio32_config *config = context->config;
 	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
-	mask &= config->mask;
+	mask &= config->common.port_pin_mask;
 
 	/* Update pin state atomically */
 	key = irq_lock();
@@ -129,15 +148,14 @@ static int gpio_mmio32_port_clear_bits_raw(const struct device *dev,
 	return 0;
 }
 
-static int gpio_mmio32_port_toggle_bits(const struct device *dev,
-					uint32_t mask)
+static int gpio_mmio32_port_toggle_bits(const struct device *dev, uint32_t mask)
 {
 	struct gpio_mmio32_context *context = dev->data;
 	const struct gpio_mmio32_config *config = context->config;
 	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
-	mask &= config->mask;
+	mask &= config->common.port_pin_mask;
 
 	/* Update pin state atomically */
 	key = irq_lock();
@@ -147,9 +165,10 @@ static int gpio_mmio32_port_toggle_bits(const struct device *dev,
 	return 0;
 }
 
-int gpio_mmio_pin_interrupt_configure(const struct device *port,
+int gpio_mmio32_pin_interrupt_configure(const struct device *port,
 					gpio_pin_t pin,
-					enum gpio_int_mode, enum gpio_int_trig)
+					enum gpio_int_mode mode,
+					enum gpio_int_trig trig)
 {
 	return -ENOTSUP;
 }
@@ -161,7 +180,7 @@ DEVICE_API(gpio, gpio_mmio32_api) = {
 	.port_set_bits_raw = gpio_mmio32_port_set_bits_raw,
 	.port_clear_bits_raw = gpio_mmio32_port_clear_bits_raw,
 	.port_toggle_bits = gpio_mmio32_port_toggle_bits,
-	.pin_interrupt_configure = gpio_mmio_pin_interrupt_configure,
+	.pin_interrupt_configure = gpio_mmio32_pin_interrupt_configure,
 };
 
 int gpio_mmio32_init(const struct device *dev)
@@ -173,3 +192,21 @@ int gpio_mmio32_init(const struct device *dev)
 
 	return 0;
 }
+
+#define MMIO32_GPIO_DEVICE(n)                                                                      \
+	static struct gpio_mmio32_context gpio_mmio32_##n##_ctx;                                   \
+                                                                                                   \
+	static const struct gpio_mmio32_config gpio_mmio32_##n##_cfg = {                           \
+		.common =                                                                          \
+			{                                                                          \
+				.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(n),               \
+			},                                                                         \
+		.reg = (volatile uint32_t *)DT_INST_REG_ADDR(n),                                   \
+		.is_input = DT_INST_PROP(n, direction_input),                                      \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(n, gpio_mmio32_init, NULL, &gpio_mmio32_##n##_ctx,                   \
+			      &gpio_mmio32_##n##_cfg, PRE_KERNEL_1,                                \
+			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_mmio32_api);
+
+DT_INST_FOREACH_STATUS_OKAY(MMIO32_GPIO_DEVICE)
diff --git a/drivers/gpio/gpio_neorv32.c b/drivers/gpio/gpio_neorv32.c
index 51dc3ecd9edb2..90546ef1abe01 100644
--- a/drivers/gpio/gpio_neorv32.c
+++ b/drivers/gpio/gpio_neorv32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+ * Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -20,6 +20,10 @@ LOG_MODULE_REGISTER(gpio_neorv32, CONFIG_GPIO_LOG_LEVEL);
 
 #include <zephyr/drivers/gpio/gpio_utils.h>
 
+/* Register offsets */
+#define NEORV32_GPIO_PORT_IN  0x00
+#define NEORV32_GPIO_PORT_OUT 0x04
+
 /* Maximum number of GPIOs supported */
 #define MAX_GPIOS 32
 
@@ -27,8 +31,7 @@ struct neorv32_gpio_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
 	const struct device *syscon;
-	mm_reg_t input;
-	mm_reg_t output;
+	mm_reg_t base;
 };
 
 struct neorv32_gpio_data {
@@ -42,14 +45,14 @@ static inline uint32_t neorv32_gpio_read(const struct device *dev)
 {
 	const struct neorv32_gpio_config *config = dev->config;
 
-	return sys_read32(config->input);
+	return sys_read32(config->base + NEORV32_GPIO_PORT_IN);
 }
 
 static inline void neorv32_gpio_write(const struct device *dev, uint32_t val)
 {
 	const struct neorv32_gpio_config *config = dev->config;
 
-	sys_write32(val, config->output);
+	sys_write32(val, config->base + NEORV32_GPIO_PORT_OUT);
 }
 
 static int neorv32_gpio_pin_configure(const struct device *dev, gpio_pin_t pin,
@@ -179,13 +182,13 @@ static int neorv32_gpio_init(const struct device *dev)
 		return -EINVAL;
 	}
 
-	err = syscon_read_reg(config->syscon, NEORV32_SYSINFO_FEATURES, &features);
+	err = syscon_read_reg(config->syscon, NEORV32_SYSINFO_SOC, &features);
 	if (err < 0) {
 		LOG_ERR("failed to determine implemented features (err %d)", err);
 		return -EIO;
 	}
 
-	if ((features & NEORV32_SYSINFO_FEATURES_IO_GPIO) == 0) {
+	if ((features & NEORV32_SYSINFO_SOC_IO_GPIO) == 0) {
 		LOG_ERR("neorv32 gpio not supported");
 		return -ENODEV;
 	}
@@ -216,8 +219,7 @@ static DEVICE_API(gpio, neorv32_gpio_driver_api) = {
 			.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(n) \
 		},							\
 		.syscon = DEVICE_DT_GET(DT_INST_PHANDLE(n, syscon)),	\
-		.input = DT_INST_REG_ADDR_BY_NAME(n, input),		\
-		.output = DT_INST_REG_ADDR_BY_NAME(n, output),		\
+		.base = DT_INST_REG_ADDR(n),				\
 	};								\
 									\
 	DEVICE_DT_INST_DEFINE(n,					\
diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index e833017e7d5ef..3d2c1a12f46d7 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -241,6 +241,73 @@ static int gpio_nrfx_pin_configure(const struct device *port, gpio_pin_t pin,
 	return ret;
 }
 
+#ifdef CONFIG_GPIO_GET_CONFIG
+static int gpio_nrfx_pin_get_config(const struct device *port, gpio_pin_t pin,
+				    gpio_flags_t *flags)
+{
+	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
+	nrfx_gpiote_pin_t abs_pin = NRF_GPIO_PIN_MAP(cfg->port_num, pin);
+
+	*flags = 0U;
+
+	nrf_gpio_pin_dir_t dir = nrf_gpio_pin_dir_get(abs_pin);
+
+	if (dir == NRF_GPIO_PIN_DIR_OUTPUT) {
+		*flags |= GPIO_OUTPUT;
+	}
+
+	nrf_gpio_pin_input_t input = nrf_gpio_pin_input_get(abs_pin);
+
+	if (input == NRF_GPIO_PIN_INPUT_CONNECT) {
+		*flags |= GPIO_INPUT;
+	}
+
+	nrf_gpio_pin_pull_t pull = nrf_gpio_pin_pull_get(abs_pin);
+
+	switch (pull) {
+	case NRF_GPIO_PIN_PULLUP:
+		*flags |= GPIO_PULL_UP;
+	case NRF_GPIO_PIN_PULLDOWN:
+		*flags |= GPIO_PULL_DOWN;
+	default:
+		break;
+	}
+
+	nrf_gpio_pin_drive_t drive = nrf_gpio_pin_drive_get(abs_pin);
+
+	switch (drive) {
+	case NRF_GPIO_PIN_S0S1:
+		*flags |= NRF_GPIO_DRIVE_S0S1;
+		break;
+	case NRF_GPIO_PIN_S0H1:
+		*flags |= NRF_GPIO_DRIVE_S0H1;
+		break;
+	case NRF_GPIO_PIN_H0S1:
+		*flags |= NRF_GPIO_DRIVE_H0S1;
+		break;
+	case NRF_GPIO_PIN_H0H1:
+		*flags |= NRF_GPIO_DRIVE_H0H1;
+		break;
+	case NRF_GPIO_PIN_S0D1:
+		*flags |= NRF_GPIO_DRIVE_S0 | GPIO_OPEN_DRAIN;
+		break;
+	case NRF_GPIO_PIN_H0D1:
+		*flags |= NRF_GPIO_DRIVE_H0 | GPIO_OPEN_DRAIN;
+		break;
+	case NRF_GPIO_PIN_D0S1:
+		*flags |= NRF_GPIO_DRIVE_S1 | GPIO_OPEN_SOURCE;
+		break;
+	case NRF_GPIO_PIN_D0H1:
+		*flags |= NRF_GPIO_DRIVE_H1 | GPIO_OPEN_SOURCE;
+		break;
+	default:
+		break;
+	}
+
+	return 0;
+}
+#endif
+
 static int gpio_nrfx_port_get_raw(const struct device *port,
 				  gpio_port_value_t *value)
 {
@@ -520,6 +587,9 @@ static DEVICE_API(gpio, gpio_nrfx_drv_api_funcs) = {
 #ifdef CONFIG_GPIO_GET_DIRECTION
 	.port_get_direction = gpio_nrfx_port_get_direction,
 #endif
+#ifdef CONFIG_GPIO_GET_CONFIG
+	.pin_get_config = gpio_nrfx_pin_get_config,
+#endif
 };
 
 #define GPIOTE_PHANDLE(id) DT_INST_PHANDLE(id, gpiote_instance)
diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c
index 662a92465f3bb..c08094c8bb7ae 100644
--- a/drivers/gpio/gpio_pca95xx.c
+++ b/drivers/gpio/gpio_pca95xx.c
@@ -117,38 +117,6 @@ struct gpio_pca95xx_drv_data {
 #endif
 };
 
-static int read_port_reg(const struct device *dev, uint8_t reg, uint8_t pin,
-			 uint16_t *cache, uint16_t *buf)
-{
-	const struct gpio_pca95xx_config * const config = dev->config;
-	uint8_t b_buf;
-	int ret;
-
-	if (pin >= 8) {
-		reg++;
-	}
-
-	ret = i2c_reg_read_byte_dt(&config->bus, reg, &b_buf);
-	if (ret != 0) {
-		LOG_ERR("PCA95XX[0x%X]: error reading register 0x%X (%d)",
-			config->bus.addr, reg, ret);
-		return ret;
-	}
-
-	if (pin < 8) {
-		((uint8_t *)cache)[LOW_BYTE_LE16_IDX] = b_buf;
-	} else {
-		((uint8_t *)cache)[HIGH_BYTE_LE16_IDX] = b_buf;
-	}
-
-	*buf = *cache;
-
-	LOG_DBG("PCA95XX[0x%X]: Read: REG[0x%X] = 0x%X",
-		config->bus.addr, reg, b_buf);
-
-	return 0;
-}
-
 /**
  * @brief Read both port 0 and port 1 registers of certain register function.
  *
@@ -253,16 +221,6 @@ static int write_port_regs(const struct device *dev, uint8_t reg,
 	return ret;
 }
 
-static inline int update_input_reg(const struct device *dev, uint8_t pin,
-				   uint16_t *buf)
-{
-	struct gpio_pca95xx_drv_data * const drv_data =
-		(struct gpio_pca95xx_drv_data * const)dev->data;
-
-	return read_port_reg(dev, REG_INPUT_PORT0, pin,
-			     &drv_data->reg_cache.input, buf);
-}
-
 static inline int update_input_regs(const struct device *dev, uint16_t *buf)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
diff --git a/drivers/gpio/gpio_pca_series.c b/drivers/gpio/gpio_pca_series.c
index 7bfff83ce1ea0..87e13a3624425 100644
--- a/drivers/gpio/gpio_pca_series.c
+++ b/drivers/gpio/gpio_pca_series.c
@@ -2140,22 +2140,22 @@ const struct gpio_pca_series_part_config gpio_pca_series_part_cfg_pcal6524 = {
 
 static const uint8_t gpio_pca_series_reg_pcal6534[] = {
 	PCA_REG_INVALID, /** input_port if not PCA_HAS_OUT_CONFIG, non-cacheable */
-	0x04, /** output_port */
-/*	0x08,     polarity_inversion  (unused, omitted) */
-	0x0c, /** configuration */
-	0x40, /** 2b_output_drive_strength if PCA_HAS_LATCH*/
-	0x48, /** input_latch if PCA_HAS_LATCH*/
-	0x4c, /** pull_enable if PCA_HAS_PULL */
-	0x50, /** pull_select if PCA_HAS_PULL */
-	0x6c, /** input_status if PCA_HAS_OUT_CONFIG, non-cacheable */
-	0x70, /** output_config if PCA_HAS_OUT_CONFIG */
+	0x05, /** output_port */
+/*	0x0a,     polarity_inversion  (unused, omitted) */
+	0x0f, /** configuration */
+	0x30, /** 2b_output_drive_strength if PCA_HAS_LATCH*/
+	0x3a, /** input_latch if PCA_HAS_LATCH*/
+	0x3f, /** pull_enable if PCA_HAS_PULL */
+	0x44, /** pull_select if PCA_HAS_PULL */
+	0x63, /** input_status if PCA_HAS_OUT_CONFIG, non-cacheable */
+	0x68, /** output_config if PCA_HAS_OUT_CONFIG */
 #ifdef CONFIG_GPIO_PCA_SERIES_INTERRUPT
-	0x54, /** interrupt_mask if PCA_HAS_INT_MASK,
+	0x49, /** interrupt_mask if PCA_HAS_INT_MASK,
 		* non-cacheable if not PCA_HAS_INT_EXTEND
 		*/
-	0x58, /** int_status if PCA_HAS_INT_MASK */
-	0x60, /** 2b_interrupt_edge if PCA_HAS_INT_EXTEND */
-	0x68, /** interrupt_clear if PCA_HAS_INT_EXTEND, non-cacheable */
+	0x4e, /** int_status if PCA_HAS_INT_MASK */
+	0x54, /** 2b_interrupt_edge if PCA_HAS_INT_EXTEND */
+	0x5e, /** interrupt_clear if PCA_HAS_INT_EXTEND, non-cacheable */
 # ifdef CONFIG_GPIO_PCA_SERIES_CACHE_ALL
 	PCA_REG_INVALID, /** 1b_input_history if PCA_HAS_LATCH and not PCA_HAS_INT_EXTEND */
 	PCA_REG_INVALID, /** 1b_interrupt_rise if PCA_HAS_LATCH and not PCA_HAS_INT_EXTEND */
diff --git a/drivers/gpio/gpio_renesas_ra.c b/drivers/gpio/gpio_renesas_ra.c
deleted file mode 100644
index 69bb67c18d5d8..0000000000000
--- a/drivers/gpio/gpio_renesas_ra.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT renesas_ra_gpio
-
-#include <errno.h>
-#include <string.h>
-
-#include <zephyr/kernel.h>
-#include <zephyr/device.h>
-#include <zephyr/init.h>
-#include <zephyr/irq.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/gpio/gpio_utils.h>
-#include <zephyr/drivers/interrupt_controller/intc_ra_icu.h>
-#include <zephyr/drivers/pinctrl.h>
-
-enum {
-	PCNTR1_OFFSET = 0x0,
-	PCNTR2_OFFSET = 0x4,
-	PCNTR3_OFFSET = 0x8,
-	PCNTR4_OFFSET = 0xc
-};
-
-enum {
-	PCNTR1_PDR0_OFFSET = 0,
-	PCNTR1_PODR0_OFFSET = 16,
-};
-
-enum {
-	PCNTR2_PIDR0_OFFSET = 0,
-	PCNTR2_EIDR0_OFFSET = 16,
-};
-
-enum {
-	PCNTR3_POSR0_OFFSET = 0,
-	PCNTR3_PORR0_OFFSET = 16,
-};
-
-enum {
-	PCNTR4_EOSR0_OFFSET = 0,
-	PCNTR4_EORR0_OFFSET = 16,
-};
-
-struct gpio_ra_irq_info {
-	const uint8_t *const pins;
-	size_t num;
-	int port_irq;
-	int irq;
-	uint32_t priority;
-	uint32_t flags;
-	ra_isr_handler isr;
-};
-
-struct gpio_ra_pin_irq_info {
-	const struct gpio_ra_irq_info *info;
-	uint8_t pin;
-};
-
-struct gpio_ra_config {
-	struct gpio_driver_config common;
-	mem_addr_t regs;
-	struct gpio_ra_irq_info *irq_info;
-	uint32_t irq_info_size;
-	uint16_t port;
-};
-
-struct gpio_ra_data {
-	struct gpio_driver_data common;
-	struct gpio_ra_pin_irq_info port_irq_info[16];
-	sys_slist_t callbacks;
-};
-
-static inline uint32_t gpio_ra_irq_info_event(const struct gpio_ra_irq_info *info)
-{
-	return ((info->flags & RA_ICU_FLAG_EVENT_MASK) >> RA_ICU_FLAG_EVENT_OFFSET);
-}
-
-static void gpio_ra_isr(const struct device *dev, uint32_t port_irq)
-{
-	struct gpio_ra_data *data = dev->data;
-	const struct gpio_ra_pin_irq_info *pin_irq = &data->port_irq_info[port_irq];
-	const int irq = ra_icu_query_exists_irq(gpio_ra_irq_info_event(pin_irq->info));
-
-	if (irq >= 0) {
-		gpio_fire_callbacks(&data->callbacks, dev, BIT(pin_irq->pin));
-		ra_icu_clear_int_flag(irq);
-	}
-}
-
-static const struct gpio_ra_irq_info *query_irq_info(const struct device *dev, uint32_t pin)
-{
-	const struct gpio_ra_config *config = dev->config;
-
-	for (int i = 0; i < config->irq_info_size; i++) {
-		const struct gpio_ra_irq_info *info = &config->irq_info[i];
-
-		for (int j = 0; j < info->num; j++) {
-			if (info->pins[j] == pin) {
-				return info;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-static inline uint32_t reg_read(const struct device *dev, size_t offset)
-{
-	const struct gpio_ra_config *config = dev->config;
-
-	return sys_read32(config->regs + offset);
-}
-
-static inline void reg_write(const struct device *dev, size_t offset, uint32_t value)
-{
-	const struct gpio_ra_config *config = dev->config;
-
-	sys_write32(value, config->regs + offset);
-}
-
-static inline uint32_t port_read(const struct device *dev)
-{
-	return reg_read(dev, PCNTR2_OFFSET) & UINT16_MAX;
-}
-
-static int port_write(const struct device *dev, uint16_t value, uint16_t mask)
-{
-	const uint16_t set = value & mask;
-	const uint16_t clr = (~value) & mask;
-
-	reg_write(dev, PCNTR3_OFFSET, (clr << PCNTR3_PORR0_OFFSET) | set << PCNTR3_POSR0_OFFSET);
-
-	return 0;
-}
-
-static int gpio_ra_pin_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags)
-{
-	const enum gpio_int_mode mode =
-		flags & (GPIO_INT_EDGE | GPIO_INT_DISABLE | GPIO_INT_ENABLE);
-	const enum gpio_int_trig trig = flags & (GPIO_INT_LOW_0 | GPIO_INT_HIGH_1);
-	const struct gpio_ra_config *config = dev->config;
-	struct gpio_ra_data *data = dev->data;
-	struct ra_pinctrl_soc_pin pincfg = {0};
-
-	if ((flags & GPIO_OUTPUT) && (flags & GPIO_INPUT)) {
-		/* Pin cannot be configured as input and output */
-		return -ENOTSUP;
-	} else if (!(flags & (GPIO_INPUT | GPIO_OUTPUT))) {
-		/* Pin has to be configured as input or output */
-		return -ENOTSUP;
-	}
-
-	if (flags & GPIO_OUTPUT) {
-		pincfg.cfg |= BIT(R_PFS_PORT_PIN_PmnPFS_PDR_Pos);
-	}
-
-	if (flags & GPIO_PULL_UP) {
-		pincfg.cfg |= BIT(R_PFS_PORT_PIN_PmnPFS_PCR_Pos);
-	}
-
-	if ((flags & GPIO_SINGLE_ENDED) && (flags & GPIO_LINE_OPEN_DRAIN)) {
-		pincfg.cfg |= BIT(R_PFS_PORT_PIN_PmnPFS_NCODR_Pos);
-	}
-
-	if (flags & GPIO_INT_ENABLE) {
-		pincfg.cfg |= BIT(R_PFS_PORT_PIN_PmnPFS_ISEL_Pos);
-	}
-
-	pincfg.cfg &= ~BIT(R_PFS_PORT_PIN_PmnPFS_PMR_Pos);
-
-	pincfg.pin_num = pin;
-	pincfg.port_num = config->port;
-
-	if (flags & GPIO_INT_ENABLE) {
-		const struct gpio_ra_irq_info *irq_info;
-		uint32_t intcfg;
-		int irqn;
-
-		if (mode == GPIO_INT_MODE_LEVEL) {
-			if (trig != GPIO_INT_TRIG_LOW) {
-				return -ENOTSUP;
-			}
-
-			intcfg = ICU_LOW_LEVEL;
-		} else if (mode == GPIO_INT_MODE_EDGE) {
-			switch (trig) {
-			case GPIO_INT_TRIG_LOW:
-				intcfg = ICU_FALLING;
-				break;
-			case GPIO_INT_TRIG_HIGH:
-				intcfg = ICU_RISING;
-				break;
-			case GPIO_INT_TRIG_BOTH:
-				intcfg = ICU_BOTH_EDGE;
-				break;
-			default:
-				return -ENOTSUP;
-			}
-		} else {
-			return -ENOTSUP;
-		}
-
-		irq_info = query_irq_info(dev, pin);
-		if (irq_info == NULL) {
-			return -EINVAL;
-		}
-
-		irqn = ra_icu_irq_connect_dynamic(
-			irq_info->irq, irq_info->priority, irq_info->isr, dev,
-			(intcfg << RA_ICU_FLAG_INTCFG_OFFSET) | irq_info->flags);
-		if (irqn < 0) {
-			return irqn;
-		}
-
-		data->port_irq_info[irq_info->port_irq].pin = pin;
-		data->port_irq_info[irq_info->port_irq].info = irq_info;
-
-		irq_enable(irqn);
-	}
-
-	return pinctrl_configure_pins(&pincfg, 1, PINCTRL_REG_NONE);
-}
-
-#ifdef CONFIG_GPIO_GET_CONFIG
-static int gpio_ra_pin_get_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t *flags)
-{
-	const struct gpio_ra_config *config = dev->config;
-	const struct gpio_ra_irq_info *irq_info;
-	struct ra_pinctrl_soc_pin pincfg;
-	ra_isr_handler cb;
-	const void *cbarg;
-	uint32_t intcfg;
-	int irqn;
-	int err;
-
-	memset(flags, 0, sizeof(gpio_flags_t));
-
-	err = ra_pinctrl_query_config(config->port, pin, &pincfg);
-	if (err < 0) {
-		return err;
-	}
-
-	if (pincfg.cfg & BIT(R_PFS_PORT_PIN_PmnPFS_PDR_Pos)) {
-		*flags |= GPIO_OUTPUT;
-	} else {
-		*flags |= GPIO_INPUT;
-	}
-
-	if (pincfg.cfg & BIT(R_PFS_PORT_PIN_PmnPFS_ISEL_Pos)) {
-		*flags |= GPIO_INT_ENABLE;
-	}
-
-	if (pincfg.cfg & BIT(R_PFS_PORT_PIN_PmnPFS_PCR_Pos)) {
-		*flags |= GPIO_PULL_UP;
-	}
-
-	irq_info = query_irq_info(dev, pin);
-	if (irq_info == NULL) {
-		return 0;
-	}
-
-	irqn = ra_icu_query_exists_irq(gpio_ra_irq_info_event(irq_info));
-	if (irqn < 0) {
-		return 0;
-	}
-
-	ra_icu_query_irq_config(irqn, &intcfg, &cb, &cbarg);
-
-	if (cbarg != dev) {
-		return 0;
-	}
-
-	if (intcfg == ICU_FALLING) {
-		*flags |= GPIO_INT_TRIG_LOW;
-		*flags |= GPIO_INT_MODE_EDGE;
-	} else if (intcfg == ICU_RISING) {
-		*flags |= GPIO_INT_TRIG_HIGH;
-		*flags |= GPIO_INT_MODE_EDGE;
-	} else if (intcfg == ICU_BOTH_EDGE) {
-		*flags |= GPIO_INT_TRIG_BOTH;
-		*flags |= GPIO_INT_MODE_EDGE;
-	} else if (intcfg == ICU_LOW_LEVEL) {
-		*flags |= GPIO_INT_TRIG_LOW;
-		*flags |= GPIO_INT_MODE_LEVEL;
-	}
-
-	return 0;
-}
-#endif
-
-static int gpio_ra_port_get_raw(const struct device *dev, gpio_port_value_t *value)
-{
-	*value = port_read(dev);
-
-	return 0;
-}
-
-static int gpio_ra_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask,
-				       gpio_port_value_t value)
-{
-	uint16_t port_val;
-
-	port_val = port_read(dev);
-	port_val = (port_val & ~mask) | (value & mask);
-	return port_write(dev, port_val, UINT16_MAX);
-}
-
-static int gpio_ra_port_set_bits_raw(const struct device *dev, gpio_port_pins_t pins)
-{
-	uint16_t port_val;
-
-	port_val = port_read(dev);
-	port_val |= pins;
-	return port_write(dev, port_val, UINT16_MAX);
-}
-
-static int gpio_ra_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins)
-{
-	uint16_t port_val;
-
-	port_val = port_read(dev);
-	port_val &= ~pins;
-	return port_write(dev, port_val, UINT16_MAX);
-}
-
-static int gpio_ra_port_toggle_bits(const struct device *dev, gpio_port_pins_t pins)
-{
-	uint16_t port_val;
-
-	port_val = port_read(dev);
-	port_val ^= pins;
-	return port_write(dev, port_val, UINT16_MAX);
-}
-
-static int gpio_ra_manage_callback(const struct device *dev, struct gpio_callback *callback,
-				   bool set)
-{
-	struct gpio_ra_data *data = dev->data;
-
-	return gpio_manage_callback(&data->callbacks, callback, set);
-}
-
-static int gpio_ra_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin,
-					   enum gpio_int_mode mode, enum gpio_int_trig trig)
-{
-	gpio_flags_t pincfg;
-	int err;
-
-	err = gpio_ra_pin_get_config(dev, pin, &pincfg);
-	if (err < 0) {
-		return err;
-	}
-
-	return gpio_ra_pin_configure(dev, pin, pincfg | mode | trig);
-}
-
-static DEVICE_API(gpio, gpio_ra_driver_api) = {
-	.pin_configure = gpio_ra_pin_configure,
-#ifdef CONFIG_GPIO_GET_CONFIG
-	.pin_get_config = gpio_ra_pin_get_config,
-#endif
-	.port_get_raw = gpio_ra_port_get_raw,
-	.port_set_masked_raw = gpio_ra_port_set_masked_raw,
-	.port_set_bits_raw = gpio_ra_port_set_bits_raw,
-	.port_clear_bits_raw = gpio_ra_port_clear_bits_raw,
-	.port_toggle_bits = gpio_ra_port_toggle_bits,
-	.pin_interrupt_configure = gpio_ra_pin_interrupt_configure,
-	.manage_callback = gpio_ra_manage_callback,
-};
-
-#define RA_NUM_PORT_IRQ0  0
-#define RA_NUM_PORT_IRQ1  1
-#define RA_NUM_PORT_IRQ2  2
-#define RA_NUM_PORT_IRQ3  3
-#define RA_NUM_PORT_IRQ4  4
-#define RA_NUM_PORT_IRQ5  5
-#define RA_NUM_PORT_IRQ6  6
-#define RA_NUM_PORT_IRQ7  7
-#define RA_NUM_PORT_IRQ8  8
-#define RA_NUM_PORT_IRQ9  9
-#define RA_NUM_PORT_IRQ10 10
-#define RA_NUM_PORT_IRQ11 11
-#define RA_NUM_PORT_IRQ12 12
-#define RA_NUM_PORT_IRQ13 13
-#define RA_NUM_PORT_IRQ14 14
-#define RA_NUM_PORT_IRQ15 15
-
-#define GPIO_RA_DECL_PINS(n, p, i)                                                                 \
-	const uint8_t _CONCAT(n, ___pins##i[]) = {DT_FOREACH_PROP_ELEM_SEP(                        \
-		n, _CONCAT(DT_STRING_TOKEN_BY_IDX(n, p, i), _pins), DT_PROP_BY_IDX, (,))};
-
-#define GPIO_RA_IRQ_INFO(n, p, i)                                                                  \
-	{                                                                                          \
-		.port_irq = _CONCAT(RA_NUM_, DT_STRING_UPPER_TOKEN_BY_IDX(n, p, i)),               \
-		.irq = DT_IRQ_BY_IDX(n, i, irq),                                                   \
-		.flags = DT_IRQ_BY_IDX(n, i, flags),                                               \
-		.priority = DT_IRQ_BY_IDX(n, i, priority),                                         \
-		.pins = _CONCAT(n, ___pins##i),                                                    \
-		.num = ARRAY_SIZE(_CONCAT(n, ___pins##i)),                                         \
-		.isr = _CONCAT(n, _CONCAT(gpio_ra_isr_, DT_STRING_TOKEN_BY_IDX(n, p, i))),         \
-	},
-
-#define GPIO_RA_ISR_DECL(n, p, i)                                                                  \
-	static void _CONCAT(n, _CONCAT(gpio_ra_isr_, DT_STRING_TOKEN_BY_IDX(n, p, i)))(            \
-		const void *arg)                                                                   \
-	{                                                                                          \
-		gpio_ra_isr((const struct device *)arg,                                            \
-			    _CONCAT(RA_NUM_, DT_STRING_UPPER_TOKEN_BY_IDX(n, p, i)));              \
-	}
-
-#define GPIO_RA_INIT(idx)                                                                          \
-	static struct gpio_ra_data gpio_ra_data_##idx = {};                                        \
-	DT_INST_FOREACH_PROP_ELEM(idx, interrupt_names, GPIO_RA_DECL_PINS);                        \
-	DT_INST_FOREACH_PROP_ELEM(idx, interrupt_names, GPIO_RA_ISR_DECL);                         \
-	struct gpio_ra_irq_info gpio_ra_irq_info_##idx[] = {                                       \
-		DT_INST_FOREACH_PROP_ELEM(idx, interrupt_names, GPIO_RA_IRQ_INFO)};                \
-	static struct gpio_ra_config gpio_ra_config_##idx = {                                      \
-		.common = {                                                                        \
-			.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(idx),                     \
-		},                                                                                 \
-		.regs = DT_INST_REG_ADDR(idx),                                                     \
-		.port = (DT_INST_REG_ADDR(idx) - DT_REG_ADDR(DT_NODELABEL(ioport0))) /             \
-			DT_INST_REG_SIZE(idx),                                                     \
-		.irq_info = gpio_ra_irq_info_##idx,                                                \
-		.irq_info_size = ARRAY_SIZE(gpio_ra_irq_info_##idx),                               \
-	};                                                                                         \
-                                                                                                   \
-	DEVICE_DT_INST_DEFINE(idx, NULL, NULL, &gpio_ra_data_##idx, &gpio_ra_config_##idx,         \
-			      PRE_KERNEL_1, CONFIG_GPIO_INIT_PRIORITY, &gpio_ra_driver_api);
-
-DT_INST_FOREACH_STATUS_OKAY(GPIO_RA_INIT)
diff --git a/drivers/gpio/gpio_renesas_ra_ioport.c b/drivers/gpio/gpio_renesas_ra_ioport.c
index 9ea6ab6d9f59c..68d5334c67595 100644
--- a/drivers/gpio/gpio_renesas_ra_ioport.c
+++ b/drivers/gpio/gpio_renesas_ra_ioport.c
@@ -78,6 +78,7 @@ static int gpio_ra_pin_configure(const struct device *dev, gpio_pin_t pin, gpio_
 		return -ENOTSUP;
 	}
 
+#if CONFIG_GPIO_RA_HAS_VBTICTLR
 	if (config->vbatt_pins[0] != 0xFF) {
 		uint32_t clear = 0;
 
@@ -93,6 +94,7 @@ static int gpio_ra_pin_configure(const struct device *dev, gpio_pin_t pin, gpio_
 
 		R_BSP_RegisterProtectEnable(BSP_REG_PROTECT_OM_LPC_BATT);
 	}
+#endif
 
 	pincfg.port_num = config->port_num;
 	pincfg.pin_num = pin;
@@ -175,6 +177,37 @@ static int gpio_ra_pin_configure(const struct device *dev, gpio_pin_t pin, gpio_
 	return pinctrl_configure_pins(&pincfg, 1, PINCTRL_REG_NONE);
 }
 
+__maybe_unused static int gpio_ra_pin_get_config(const struct device *dev, gpio_pin_t pin,
+						 gpio_flags_t *flags)
+{
+	const struct gpio_ra_config *config = dev->config;
+	uint32_t pincfg;
+
+	if (pin >= RA_PINCTRL_PIN_NUM) {
+		return -EINVAL;
+	}
+
+	memset(flags, 0, sizeof(gpio_flags_t));
+
+	pincfg = R_PFS->PORT[config->port_num].PIN[pin].PmnPFS;
+
+	if (pincfg & BIT(R_PFS_PORT_PIN_PmnPFS_PDR_Pos)) {
+		*flags |= GPIO_OUTPUT;
+	} else {
+		*flags |= GPIO_INPUT;
+	}
+
+	if (pincfg & BIT(R_PFS_PORT_PIN_PmnPFS_NCODR_Pos)) {
+		*flags |= GPIO_LINE_OPEN_DRAIN;
+	}
+
+	if (pincfg & BIT(R_PFS_PORT_PIN_PmnPFS_PCR_Pos)) {
+		*flags |= GPIO_PULL_UP;
+	}
+
+	return 0;
+}
+
 static int gpio_ra_port_get_raw(const struct device *dev, uint32_t *value)
 {
 	const struct gpio_ra_config *config = dev->config;
@@ -230,7 +263,15 @@ static int gpio_ra_port_toggle_bits(const struct device *dev, gpio_port_pins_t p
 static int gpio_ra_pin_interrupt_configure(const struct device *port, gpio_pin_t pin,
 					   enum gpio_int_mode mode, enum gpio_int_trig trig)
 {
-	return gpio_ra_pin_configure(port, pin, (mode | trig));
+	gpio_flags_t flags;
+	int err;
+
+	err = gpio_ra_pin_get_config(port, pin, &flags);
+	if (err) {
+		return err;
+	}
+
+	return gpio_ra_pin_configure(port, pin, (flags | mode | trig));
 }
 
 static int gpio_ra_manage_callback(const struct device *dev, struct gpio_callback *callback,
@@ -244,6 +285,9 @@ static int gpio_ra_manage_callback(const struct device *dev, struct gpio_callbac
 
 static DEVICE_API(gpio, gpio_ra_drv_api_funcs) = {
 	.pin_configure = gpio_ra_pin_configure,
+#ifdef CONFIG_GPIO_GET_CONFIG
+	.pin_get_config = gpio_ra_pin_get_config,
+#endif
 	.port_get_raw = gpio_ra_port_get_raw,
 	.port_set_masked_raw = gpio_ra_port_set_masked_raw,
 	.port_set_bits_raw = gpio_ra_port_set_bits_raw,
diff --git a/drivers/gpio/gpio_renesas_rz.c b/drivers/gpio/gpio_renesas_rz.c
index 386bae12bfb1d..fa0b525ef2023 100644
--- a/drivers/gpio/gpio_renesas_rz.c
+++ b/drivers/gpio/gpio_renesas_rz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,6 +15,10 @@
 #include <zephyr/drivers/gpio/gpio_utils.h>
 #include "gpio_renesas_rz.h"
 #include <zephyr/logging/log.h>
+#if defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+#include "r_icu.h"
+#include <zephyr/drivers/interrupt_controller/intc_rz_ext_irq.h>
+#endif
 LOG_MODULE_REGISTER(rz_gpio, CONFIG_GPIO_LOG_LEVEL);
 
 #define LOG_DEV_ERR(dev, format, ...) LOG_ERR("%s:" #format, (dev)->name, ##__VA_ARGS__)
@@ -28,7 +32,12 @@ struct gpio_rz_config {
 	const ioport_cfg_t *fsp_cfg;
 	const ioport_api_t *fsp_api;
 	const struct device *int_dev;
-	uint8_t tint_num[GPIO_RZ_MAX_TINT_NUM];
+	uint8_t int_num[GPIO_RZ_MAX_INT_NUM];
+#if defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+	const struct device *eirq_dev[GPIO_RZ_MAX_INT_NUM];
+
+	void (*cb_list[GPIO_RZ_MAX_INT_NUM])(void *arg);
+#endif
 };
 
 struct gpio_rz_data {
@@ -36,62 +45,74 @@ struct gpio_rz_data {
 	sys_slist_t cb;
 	ioport_instance_ctrl_t *fsp_ctrl;
 	struct k_spinlock lock;
+#if defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+	uint8_t pin[GPIO_RZ_MAX_INT_NUM];
+#endif
 };
 
-struct gpio_rz_tint_isr_data {
+struct gpio_rz_isr_data {
 	const struct device *gpio_dev;
 	gpio_pin_t pin;
 };
 
-struct gpio_rz_tint_data {
-	struct gpio_rz_tint_isr_data tint_data[GPIO_RZ_MAX_TINT_NUM];
+struct gpio_rz_int_data {
+	struct gpio_rz_isr_data gpio_mapping[GPIO_RZ_MAX_INT_NUM];
 	uint32_t irq_set_edge;
 };
 
+struct gpio_rz_hw_config {
+	gpio_flags_t p_pm;
+	uint8_t pfc;
+};
+
 struct gpio_rz_tint_config {
 	void (*gpio_int_init)(void);
 };
 
-static int gpio_rz_pin_config_get_raw(bsp_io_port_pin_t port_pin, uint32_t *flags);
+static int gpio_rz_pin_config_get_raw(bsp_io_port_pin_t port_pin, struct gpio_rz_hw_config *flags);
 
 #ifdef CONFIG_GPIO_GET_CONFIG
 static int gpio_rz_pin_get_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t *flags)
 {
 	const struct gpio_rz_config *config = dev->config;
 	bsp_io_port_pin_t port_pin = config->fsp_port | pin;
+	struct gpio_rz_hw_config hw_flags;
+
+	gpio_rz_pin_config_get_raw(port_pin, &hw_flags);
+	*flags = hw_flags.p_pm;
 
-	gpio_rz_pin_config_get_raw(port_pin, flags);
 	return 0;
 }
 #endif
 
 /* Get previous pin's configuration, used by pin_configure/pin_interrupt_configure api */
-static int gpio_rz_pin_config_get_raw(bsp_io_port_pin_t port_pin, uint32_t *flags)
+static int gpio_rz_pin_config_get_raw(bsp_io_port_pin_t port_pin, struct gpio_rz_hw_config *flags)
 {
 	bsp_io_port_t port = (port_pin >> 8U) & 0xFF;
 	gpio_pin_t pin = port_pin & 0xFF;
-	volatile uint8_t *p_p = GPIO_RZ_IOPORT_P_REG_BASE_GET;
-	volatile uint16_t *p_pm = GPIO_RZ_IOPORT_PM_REG_BASE_GET;
+	volatile uint8_t *p_p = GPIO_RZ_IOPORT_P_REG_GET(port, pin);
+	volatile uint16_t *p_pm = GPIO_RZ_IOPORT_PM_REG_GET(port, pin);
+	volatile uint32_t *p_pfc = GPIO_RZ_IOPORT_PFC_REG_GET(port, pin);
 
-	uint8_t adr_offset;
 	uint8_t p_value;
 	uint16_t pm_value;
-
-	adr_offset = (uint8_t)GPIO_RZ_REG_OFFSET(port, pin);
-
-	p_p = &p_p[adr_offset];
-	p_pm = &p_pm[adr_offset];
+	uint32_t pfc_value;
 
 	p_value = GPIO_RZ_P_VALUE_GET(*p_p, pin);
 	pm_value = GPIO_RZ_PM_VALUE_GET(*p_pm, pin);
+	pfc_value = GPIO_RZ_PFC_VALUE_GET(*p_pfc, pin);
+
+	flags->p_pm = 0;
+	flags->pfc = 0;
 
 	if (p_value) {
-		*flags |= GPIO_OUTPUT_INIT_HIGH;
+		flags->p_pm |= GPIO_OUTPUT_INIT_HIGH;
 	} else {
-		*flags |= GPIO_OUTPUT_INIT_LOW;
+		flags->p_pm |= GPIO_OUTPUT_INIT_LOW;
 	}
 
-	*flags |= ((pm_value << 16));
+	flags->p_pm |= (pm_value << 16);
+	flags->pfc |= pfc_value;
 	return 0;
 }
 
@@ -101,14 +122,14 @@ static int gpio_rz_pin_configure(const struct device *dev, gpio_pin_t pin, gpio_
 	struct gpio_rz_data *data = dev->data;
 	bsp_io_port_pin_t port_pin = config->fsp_port | pin;
 	uint32_t ioport_config_data = 0;
-	gpio_flags_t pre_flags;
+	struct gpio_rz_hw_config pre_flags;
 	fsp_err_t err;
 
 	gpio_rz_pin_config_get_raw(port_pin, &pre_flags);
 
 	if (!flags) {
 		/* Disconnect mode */
-		ioport_config_data = 0;
+		GPIO_RZ_PIN_DISCONNECT(config->fsp_port, pin);
 	} else if (!(flags & GPIO_OPEN_DRAIN)) {
 		/* PM register */
 		ioport_config_data &= GPIO_RZ_PIN_CONFIGURE_INPUT_OUTPUT_RESET;
@@ -124,7 +145,7 @@ static int gpio_rz_pin_configure(const struct device *dev, gpio_pin_t pin, gpio_
 		}
 		/* P register */
 		if (!(flags & (GPIO_OUTPUT_INIT_HIGH | GPIO_OUTPUT_INIT_LOW))) {
-			flags |= pre_flags & (GPIO_OUTPUT_INIT_HIGH | GPIO_OUTPUT_INIT_LOW);
+			flags |= pre_flags.p_pm & (GPIO_OUTPUT_INIT_HIGH | GPIO_OUTPUT_INIT_LOW);
 		}
 
 		if (flags & GPIO_OUTPUT_INIT_HIGH) {
@@ -136,21 +157,36 @@ static int gpio_rz_pin_configure(const struct device *dev, gpio_pin_t pin, gpio_
 		if (flags & GPIO_PULL_UP) {
 			ioport_config_data |= IOPORT_CFG_PULLUP_ENABLE;
 		} else if (flags & GPIO_PULL_DOWN) {
-			ioport_config_data |= IOPORT_CFG_PULLUP_ENABLE;
+			ioport_config_data |= IOPORT_CFG_PULLDOWN_ENABLE;
 		}
 
-		/* ISEL register */
+		/*
+		 * Interrupt register
+		 * RZG: ISEL
+		 * RZTN: PMC
+		 */
 		if (flags & GPIO_INT_ENABLE) {
 			ioport_config_data |= GPIO_RZ_PIN_CONFIGURE_INT_ENABLE;
 		} else if (flags & GPIO_INT_DISABLE) {
 			ioport_config_data &= GPIO_RZ_PIN_CONFIGURE_INT_DISABLE;
 		}
 
-		/* Drive Ability register */
-		ioport_config_data |= GPIO_RZ_PIN_CONFIGURE_GET_DRIVE_ABILITY(flags);
-
-		/* Filter register, see in renesas-rz-gpio-ioport.h */
-		ioport_config_data |= GPIO_RZ_PIN_CONFIGURE_GET_FILTER(flags);
+		/*
+		 * Drive ability register
+		 * RZG: IOLH
+		 * RZTN: DRCTL
+		 */
+		ioport_config_data |= GPIO_RZ_PIN_CONFIGURE_GET(flags);
+
+		/* PFC register */
+		ioport_config_data |= GPIO_RZ_IOPORT_PFC_SET(pre_flags.pfc);
+
+		/*
+		 * Specific register
+		 * RZG: FILONOFF, FILNUM, FILCLKSEL
+		 * RZTN: RSELP
+		 */
+		ioport_config_data |= GPIO_RZ_PIN_SPECIAL_FLAG_GET(flags);
 	} else {
 		return -ENOTSUP;
 	}
@@ -228,7 +264,7 @@ static int gpio_rz_port_toggle_bits(const struct device *dev, gpio_port_pins_t p
 	const struct gpio_rz_config *config = dev->config;
 	struct gpio_rz_data *data = dev->data;
 	bsp_io_port_pin_t port_pin;
-	gpio_flags_t pre_flags;
+	struct gpio_rz_hw_config pre_flags;
 	ioport_size_t value = 0;
 	fsp_err_t err;
 
@@ -236,9 +272,9 @@ static int gpio_rz_port_toggle_bits(const struct device *dev, gpio_port_pins_t p
 		if (pins & (1U << idx)) {
 			port_pin = config->fsp_port | idx;
 			gpio_rz_pin_config_get_raw(port_pin, &pre_flags);
-			if (pre_flags & GPIO_OUTPUT_INIT_HIGH) {
+			if (pre_flags.p_pm & GPIO_OUTPUT_INIT_HIGH) {
 				value &= (1U << idx);
-			} else if (pre_flags & GPIO_OUTPUT_INIT_LOW) {
+			} else if (pre_flags.p_pm & GPIO_OUTPUT_INIT_LOW) {
 				value |= (1U << idx);
 			}
 		}
@@ -251,60 +287,88 @@ static int gpio_rz_port_toggle_bits(const struct device *dev, gpio_port_pins_t p
 	return 0;
 }
 
-#define GPIO_RZ_HAS_INTERRUPT DT_HAS_COMPAT_STATUS_OKAY(renesas_rz_gpio_int)
-
-#if GPIO_RZ_HAS_INTERRUPT
-static int gpio_rz_int_disable(const struct device *dev, uint8_t tint_num)
+#if defined(CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT) || defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+static int gpio_rz_int_disable(const struct device *dev, const struct device *gpio_dev,
+			       uint8_t int_num, gpio_pin_t pin)
 {
-	struct gpio_rz_tint_data *data = dev->data;
-	volatile uint32_t *tssr = &R_INTC_IM33->TSSR0;
-	volatile uint32_t *titsr = &R_INTC_IM33->TITSR0;
-	volatile uint32_t *tscr = &R_INTC_IM33->TSCR;
+#if defined(CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT)
+	volatile uint32_t *tssr = &R_INTC->TSSR0;
+	volatile uint32_t *titsr = &R_INTC->TITSR0;
+	volatile uint32_t *tscr = &R_INTC->TSCR;
+	struct gpio_rz_int_data *data = dev->data;
 
 	/* Get register offset base on interrupt number. */
-	tssr = &tssr[tint_num / 4];
-	titsr = &titsr[tint_num / 16];
+	tssr = &tssr[int_num / 4];
+	titsr = &titsr[int_num / 16];
 
-	irq_disable(GPIO_RZ_TINT_IRQ_GET(tint_num));
+	irq_disable(GPIO_RZ_TINT_IRQ_GET(int_num));
 	/* Disable interrupt and clear interrupt source. */
-	*tssr &= ~(0xFF << GPIO_RZ_TSSR_OFFSET(tint_num));
+	*tssr &= ~(0xFF << GPIO_RZ_TSSR_OFFSET(int_num));
 	/* Reset interrupt dectect type to default. */
-	*titsr &= ~(0x3 << GPIO_RZ_TITSR_OFFSET(tint_num));
+	*titsr &= ~(0x3 << GPIO_RZ_TITSR_OFFSET(int_num));
 
 	/* Clear interrupt detection status. */
-	if (data->irq_set_edge & BIT(tint_num)) {
-		*tscr &= ~BIT(tint_num);
-		data->irq_set_edge &= ~BIT(tint_num);
+	if (data->irq_set_edge & BIT(int_num)) {
+		*tscr &= ~BIT(int_num);
+		data->irq_set_edge &= ~BIT(int_num);
+	}
+
+	data->gpio_mapping[int_num].gpio_dev = NULL;
+	data->gpio_mapping[int_num].pin = UINT8_MAX;
+#elif defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+	const struct gpio_rz_config *gpio_config = gpio_dev->config;
+	const struct device *eirq_dev = gpio_config->eirq_dev[pin];
+
+	if (device_is_ready(eirq_dev)) {
+		intc_rz_ext_irq_disable(eirq_dev);
 	}
-	data->tint_data[tint_num].gpio_dev = NULL;
-	data->tint_data[tint_num].pin = UINT8_MAX;
+#endif /* CONFIG_RENESAS_RZ_EXT_IRQ */
 
 	return 0;
 }
 
 static int gpio_rz_int_enable(const struct device *int_dev, const struct device *gpio_dev,
-			      uint8_t tint_num, uint8_t irq_type, gpio_pin_t pin)
+			      uint8_t int_num, uint8_t irq_type, gpio_pin_t pin)
 {
-	struct gpio_rz_tint_data *int_data = int_dev->data;
+	if (irq_type == GPIO_RZ_INT_UNSUPPORTED) {
+		return -ENOTSUP;
+	}
+
 	const struct gpio_rz_config *gpio_config = gpio_dev->config;
-	volatile uint32_t *tssr = &R_INTC_IM33->TSSR0;
-	volatile uint32_t *titsr = &R_INTC_IM33->TITSR0;
 
-	tssr = &tssr[tint_num / 4];
-	titsr = &titsr[tint_num / 16];
+#if defined(CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT)
+	volatile uint32_t *tssr = &R_INTC->TSSR0;
+	volatile uint32_t *titsr = &R_INTC->TITSR0;
+	struct gpio_rz_int_data *int_data = int_dev->data;
+
+	tssr = &tssr[int_num / 4];
+	titsr = &titsr[int_num / 16];
 	/* Select interrupt detect type. */
-	*titsr |= (irq_type << GPIO_RZ_TITSR_OFFSET(tint_num));
-	/* Select interrupt source base on port and pin number.*/
-	*tssr |= (GPIO_RZ_TSSR_VAL(gpio_config->port_num, pin)) << GPIO_RZ_TSSR_OFFSET(tint_num);
+	*titsr &= ~(3U << GPIO_RZ_TITSR_OFFSET(int_num));
+	*titsr |= (irq_type << GPIO_RZ_TITSR_OFFSET(int_num));
+	/* Select interrupt source base on port and pin number. */
+	*tssr |= (GPIO_RZ_TSSR_VAL(gpio_config->port_num, pin)) << GPIO_RZ_TSSR_OFFSET(int_num);
 
-	if (irq_type == GPIO_RZ_TINT_EDGE_RISING || irq_type == GPIO_RZ_TINT_EDGE_FALLING) {
-		int_data->irq_set_edge |= BIT(tint_num);
+	if (irq_type == GPIO_RZ_INT_EDGE_RISING || irq_type == GPIO_RZ_INT_EDGE_FALLING) {
+		int_data->irq_set_edge |= BIT(int_num);
 		/* Clear interrupt status. */
-		R_INTC_IM33->TSCR &= ~BIT(tint_num);
+		R_INTC->TSCR &= ~BIT(int_num);
+	}
+	irq_enable(GPIO_RZ_TINT_IRQ_GET(int_num));
+	int_data->gpio_mapping[int_num].gpio_dev = gpio_dev;
+	int_data->gpio_mapping[int_num].pin = pin;
+#elif defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+	const struct device *eirq_dev = gpio_config->eirq_dev[pin];
+	struct gpio_rz_data *gpio_data = gpio_dev->data;
+
+	gpio_data->pin[int_num] = pin;
+	if (device_is_ready(eirq_dev)) {
+		intc_rz_ext_irq_set_type(eirq_dev, irq_type);
+		intc_rz_ext_irq_enable(eirq_dev);
+		intc_rz_ext_irq_set_callback(eirq_dev, gpio_config->cb_list[int_num],
+					     (void *)gpio_dev);
 	}
-	int_data->tint_data[tint_num].gpio_dev = gpio_dev;
-	int_data->tint_data[tint_num].pin = pin;
-	irq_enable(GPIO_RZ_TINT_IRQ_GET(tint_num));
+#endif /* CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT */
 
 	return 0;
 }
@@ -315,54 +379,56 @@ static int gpio_rz_pin_interrupt_configure(const struct device *dev, gpio_pin_t
 	const struct gpio_rz_config *config = dev->config;
 	struct gpio_rz_data *data = dev->data;
 	bsp_io_port_pin_t port_pin = config->fsp_port | pin;
-	uint8_t tint_num = config->tint_num[pin];
+	uint8_t int_num = config->int_num[pin];
 	uint8_t irq_type = 0;
-	gpio_flags_t pre_flags = 0;
+	struct gpio_rz_hw_config pre_flags;
 	k_spinlock_key_t key;
+	int ret = 0;
 
-	if (tint_num >= GPIO_RZ_MAX_TINT_NUM) {
-		LOG_DEV_ERR(dev, "Invalid TINT interrupt:%d >= %d", tint_num, GPIO_RZ_MAX_TINT_NUM);
+	if (int_num >= GPIO_RZ_MAX_INT_NUM) {
+		LOG_DEV_ERR(dev, "Invalid interrupt:%d >= %d", int_num, GPIO_RZ_MAX_INT_NUM);
 	}
 
 	if (pin > config->ngpios) {
 		return -EINVAL;
 	}
 
-	if (trig == GPIO_INT_TRIG_BOTH) {
-		return -ENOTSUP;
-	}
-
 	key = k_spin_lock(&data->lock);
 
 	if (mode == GPIO_INT_MODE_DISABLED) {
 		gpio_rz_pin_config_get_raw(port_pin, &pre_flags);
-		pre_flags |= GPIO_INT_DISABLE;
-		gpio_rz_pin_configure(dev, pin, pre_flags);
-		gpio_rz_int_disable(config->int_dev, tint_num);
+		pre_flags.p_pm |= GPIO_INT_DISABLE;
+		gpio_rz_pin_configure(dev, pin, pre_flags.p_pm);
+		gpio_rz_int_disable(config->int_dev, dev, int_num, pin);
 		goto exit_unlock;
 	}
 
 	if (mode == GPIO_INT_MODE_EDGE) {
-		irq_type = GPIO_RZ_TINT_EDGE_RISING;
 		if (trig == GPIO_INT_TRIG_LOW) {
-			irq_type = GPIO_RZ_TINT_EDGE_FALLING;
+			irq_type = GPIO_RZ_INT_EDGE_FALLING;
+		} else if (trig == GPIO_INT_TRIG_HIGH) {
+			irq_type = GPIO_RZ_INT_EDGE_RISING;
+		} else if (trig == GPIO_INT_TRIG_BOTH) {
+			irq_type = GPIO_RZ_INT_BOTH_EDGE;
 		}
 	} else {
-		irq_type = GPIO_RZ_TINT_LEVEL_HIGH;
 		if (trig == GPIO_INT_TRIG_LOW) {
-			irq_type = GPIO_RZ_TINT_LEVEL_LOW;
+			irq_type = GPIO_RZ_INT_LEVEL_LOW;
+		} else if (trig == GPIO_INT_TRIG_HIGH) {
+			irq_type = GPIO_RZ_INT_LEVEL_HIGH;
 		}
 	}
 
-	/* Set register ISEL */
-	gpio_rz_pin_config_get_raw(port_pin, &pre_flags);
-	pre_flags |= GPIO_INT_ENABLE;
-	gpio_rz_pin_configure(dev, pin, pre_flags);
-	gpio_rz_int_enable(config->int_dev, dev, tint_num, irq_type, pin);
+	ret = gpio_rz_int_enable(config->int_dev, dev, int_num, irq_type, pin);
+	if (ret == 0) {
+		gpio_rz_pin_config_get_raw(port_pin, &pre_flags);
+		pre_flags.p_pm |= GPIO_INT_ENABLE;
+		gpio_rz_pin_configure(dev, pin, pre_flags.p_pm);
+	}
 
 exit_unlock:
 	k_spin_unlock(&data->lock, key);
-	return 0;
+	return ret;
 }
 
 static int gpio_rz_manage_callback(const struct device *dev, struct gpio_callback *callback,
@@ -373,41 +439,37 @@ static int gpio_rz_manage_callback(const struct device *dev, struct gpio_callbac
 	return gpio_manage_callback(&data->cb, callback, set);
 }
 
-static void gpio_rz_isr(const struct device *dev, uint8_t pin)
-{
-	struct gpio_rz_data *data = dev->data;
-
-	gpio_fire_callbacks(&data->cb, dev, BIT(pin));
-}
-
-static void gpio_rz_tint_isr(uint16_t irq, const struct device *dev)
+static void gpio_rz_isr(uint16_t irq, void *param)
 {
-	struct gpio_rz_tint_data *data = dev->data;
-	volatile uint32_t *tscr = &R_INTC_IM33->TSCR;
-	uint8_t tint_num;
+#if defined(CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT)
+	const struct device *dev = param;
+	struct gpio_rz_int_data *int_data = dev->data;
+	volatile uint32_t *tscr = &R_INTC->TSCR;
 
-	tint_num = irq - GPIO_RZ_TINT_IRQ_OFFSET;
-
-	if (!(*tscr & BIT(tint_num))) {
-		LOG_DEV_DBG(dev, "tint:%u spurious irq, status 0", tint_num);
+	if (!(*tscr & BIT(irq))) {
+		LOG_DEV_DBG(dev, "tint:%u spurious irq, status 0", irq);
 		return;
 	}
 
-	if (data->irq_set_edge & BIT(tint_num)) {
-		*tscr &= ~BIT(tint_num);
+	if (int_data->irq_set_edge & BIT(irq)) {
+		*tscr &= ~BIT(irq);
 	}
 
-	gpio_rz_isr(data->tint_data[tint_num].gpio_dev, data->tint_data[tint_num].pin);
-}
+	uint8_t pin = int_data->gpio_mapping[irq].pin;
+	const struct device *gpio_dev = int_data->gpio_mapping[irq].gpio_dev;
+	struct gpio_rz_data *gpio_data = gpio_dev->data;
 
-static int gpio_rz_int_init(const struct device *dev)
-{
-	const struct gpio_rz_tint_config *config = dev->config;
+	gpio_fire_callbacks(&gpio_data->cb, gpio_dev, BIT(pin));
+#elif defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+	const struct device *gpio_dev = (const struct device *)param;
+	struct gpio_rz_data *gpio_data = gpio_dev->data;
+	uint8_t pin = gpio_data->pin[irq];
 
-	config->gpio_int_init();
-	return 0;
+	gpio_fire_callbacks(&gpio_data->cb, gpio_dev, BIT(pin));
+#endif /* CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT */
 }
-#endif
+
+#endif /* CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT || CONFIG_RENESAS_RZ_EXT_IRQ */
 
 static DEVICE_API(gpio, gpio_rz_driver_api) = {
 	.pin_configure = gpio_rz_pin_configure,
@@ -419,25 +481,37 @@ static DEVICE_API(gpio, gpio_rz_driver_api) = {
 	.port_set_bits_raw = gpio_rz_port_set_bits_raw,
 	.port_clear_bits_raw = gpio_rz_port_clear_bits_raw,
 	.port_toggle_bits = gpio_rz_port_toggle_bits,
-#if GPIO_RZ_HAS_INTERRUPT
+#if defined(CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT) || defined(CONFIG_RENESAS_RZ_EXT_IRQ)
 	.pin_interrupt_configure = gpio_rz_pin_interrupt_configure,
 	.manage_callback = gpio_rz_manage_callback,
 #endif
 };
 
-/*Initialize GPIO interrupt device*/
-#define GPIO_RZ_TINT_ISR_DECLARE(irq_num, node_id)                                                 \
-	static void rz_gpio_isr_##irq_num(void *param)                                             \
+/* Initialize GPIO interrupt device */
+#define GPIO_RZ_ISR_DEFINE(irq_num, _)                                                             \
+	static void rz_gpio_isr##irq_num(void *param)                                              \
 	{                                                                                          \
-		gpio_rz_tint_isr(DT_IRQ_BY_IDX(node_id, irq_num, irq), param);                     \
+		gpio_rz_isr(irq_num, param);                                                       \
 	}
 
-#define GPIO_RZ_TINT_ISR_INIT(node_id, irq_num) LISTIFY(irq_num,                                   \
-							GPIO_RZ_TINT_ISR_DECLARE, (), node_id)
+#define GPIO_RZ_ALL_ISR_DEFINE(irq_num) LISTIFY(irq_num, GPIO_RZ_ISR_DEFINE, ())
+
+#if defined(CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT) || defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+#if defined(CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT)
+
+#define GPIO_RZ_INT_DEFINE(inst) .int_dev = DEVICE_DT_GET_OR_NULL(DT_INST(0, renesas_rz_gpio_int))
+
+static int gpio_rz_int_init(const struct device *dev)
+{
+	const struct gpio_rz_tint_config *config = dev->config;
+
+	config->gpio_int_init();
+	return 0;
+}
 
 #define GPIO_RZ_TINT_CONNECT(irq_num, node_id)                                                     \
 	IRQ_CONNECT(DT_IRQ_BY_IDX(node_id, irq_num, irq),                                          \
-		    DT_IRQ_BY_IDX(node_id, irq_num, priority), rz_gpio_isr_##irq_num,              \
+		    DT_IRQ_BY_IDX(node_id, irq_num, priority), rz_gpio_isr##irq_num,               \
 		    DEVICE_DT_GET(node_id), 0);
 
 #define GPIO_RZ_TINT_CONNECT_FUNC(node_id)                                                         \
@@ -447,20 +521,47 @@ static DEVICE_API(gpio, gpio_rz_driver_api) = {
 			GPIO_RZ_TINT_CONNECT, (;),               \
 			node_id)                                 \
 	}
-/* Initialize GPIO device*/
+/* Initialize GPIO device */
 #define GPIO_RZ_INT_INIT(node_id)                                                                  \
-	GPIO_RZ_TINT_ISR_INIT(node_id, DT_NUM_IRQS(node_id))                                       \
+	GPIO_RZ_ALL_ISR_DEFINE(DT_NUM_IRQS(node_id))                                               \
 	GPIO_RZ_TINT_CONNECT_FUNC(node_id)                                                         \
 	static const struct gpio_rz_tint_config rz_gpio_tint_cfg_##node_id = {                     \
 		.gpio_int_init = rz_gpio_tint_connect_func##node_id,                               \
 	};                                                                                         \
-	static struct gpio_rz_tint_data rz_gpio_tint_data_##node_id = {};                          \
+	static struct gpio_rz_int_data rz_gpio_tint_data_##node_id = {};                           \
 	DEVICE_DT_DEFINE(node_id, gpio_rz_int_init, NULL, &rz_gpio_tint_data_##node_id,            \
 			 &rz_gpio_tint_cfg_##node_id, POST_KERNEL,                                 \
 			 UTIL_DEC(CONFIG_GPIO_INIT_PRIORITY), NULL);
-
 DT_FOREACH_STATUS_OKAY(renesas_rz_gpio_int, GPIO_RZ_INT_INIT)
 
+#elif defined(CONFIG_RENESAS_RZ_EXT_IRQ)
+
+GPIO_RZ_ALL_ISR_DEFINE(GPIO_RZ_MAX_INT_NUM)
+
+#define EIRQ_CB_GET(eirq_line, _) [eirq_line] = rz_gpio_isr##eirq_line
+
+#define EIRQ_DEV_LABEL_GET(inst, idx) CONCAT(irq, DT_INST_PROP_BY_IDX(inst, irqs, UTIL_INC(idx)))
+
+#define EIRQ_DEV_GET(idx, inst)                                                                    \
+	COND_CODE_1(DT_INST_PROP_HAS_IDX(inst, irqs, idx),                                         \
+		    ([DT_INST_PROP_BY_IDX(inst, irqs, idx)] =                                      \
+			     DEVICE_DT_GET_OR_NULL(DT_NODELABEL(EIRQ_DEV_LABEL_GET(inst, idx))),), \
+		    ())
+
+#define ALL_EIRQ_DEV_GET(inst)                                                                     \
+	FOR_EACH_FIXED_ARG(EIRQ_DEV_GET, (), inst,                                                 \
+			   LISTIFY(DT_INST_PROP_LEN_OR(inst, irqs, 0), VALUE_2X, (,)))
+
+#define GPIO_RZ_INT_DEFINE(inst)                                                                   \
+	.eirq_dev = {ALL_EIRQ_DEV_GET(inst)},                                                      \
+	.cb_list = {LISTIFY(GPIO_RZ_MAX_INT_NUM, EIRQ_CB_GET, (,))}
+
+#endif /* CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT */
+
+#else
+#define GPIO_RZ_INT_DEFINE(inst)
+#endif /* CONFIG_GPIO_RENESAS_RZ_HAS_GPIO_INTERRUPT || CONFIG_RENESAS_RZ_EXT_IRQ */
+
 #define VALUE_2X(i, _) UTIL_X2(i)
 #define PIN_IRQ_GET(idx, inst)                                                                     \
 	COND_CODE_1(DT_INST_PROP_HAS_IDX(inst, irqs, idx),                                         \
@@ -472,7 +573,7 @@ DT_FOREACH_STATUS_OKAY(renesas_rz_gpio_int, GPIO_RZ_INT_INIT)
 	FOR_EACH_FIXED_ARG(PIN_IRQ_GET, (), inst,                                                  \
 			   LISTIFY(DT_INST_PROP_LEN_OR(inst, irqs, 0), VALUE_2X, (,)))
 
-#define RZG_GPIO_PORT_INIT(inst)                                                                   \
+#define RZ_GPIO_PORT_INIT(inst)                                                                    \
 	static ioport_cfg_t g_ioport_##inst##_cfg = {                                              \
 		.number_of_pins = 0,                                                               \
 		.p_pin_cfg_data = NULL,                                                            \
@@ -489,9 +590,8 @@ DT_FOREACH_STATUS_OKAY(renesas_rz_gpio_int, GPIO_RZ_INT_INIT)
 		.ngpios = (uint8_t)DT_INST_PROP(inst, ngpios),                                     \
 		.fsp_cfg = &g_ioport_##inst##_cfg,                                                 \
 		.fsp_api = &g_ioport_on_ioport,                                                    \
-		.int_dev = DEVICE_DT_GET_OR_NULL(DT_INST(0, renesas_rz_gpio_int)),                 \
-		.tint_num = {PIN_IRQS_GET(inst)},                                                  \
-	};                                                                                         \
+		.int_num = {PIN_IRQS_GET(inst)},                                                   \
+		GPIO_RZ_INT_DEFINE(inst)};                                                         \
 	static ioport_instance_ctrl_t g_ioport_##inst##_ctrl;                                      \
 	static struct gpio_rz_data gpio_rz_##inst##_data = {                                       \
 		.fsp_ctrl = &g_ioport_##inst##_ctrl,                                               \
@@ -499,4 +599,4 @@ DT_FOREACH_STATUS_OKAY(renesas_rz_gpio_int, GPIO_RZ_INT_INIT)
 	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &gpio_rz_##inst##_data, &gpio_rz_##inst##_config,  \
 			      POST_KERNEL, CONFIG_GPIO_INIT_PRIORITY, &gpio_rz_driver_api);
 
-DT_INST_FOREACH_STATUS_OKAY(RZG_GPIO_PORT_INIT)
+DT_INST_FOREACH_STATUS_OKAY(RZ_GPIO_PORT_INIT)
diff --git a/drivers/gpio/gpio_renesas_rz.h b/drivers/gpio/gpio_renesas_rz.h
index 6980450f40c9a..c9570ef9e8443 100644
--- a/drivers/gpio/gpio_renesas_rz.h
+++ b/drivers/gpio/gpio_renesas_rz.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,40 +7,126 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_RENESAS_RZ_H_
 #define ZEPHYR_DRIVERS_GPIO_RENESAS_RZ_H_
 
-#include <zephyr/dt-bindings/gpio/renesas-rz-gpio.h>
 #include "r_ioport.h"
 
-#define GPIO_RZ_IOPORT_P_REG_BASE_GET  (&R_GPIO->P_20)
-#define GPIO_RZ_IOPORT_PM_REG_BASE_GET (&R_GPIO->PM_20)
+#define GPIO_RZ_INT_UNSUPPORTED 0xF
+
+#if defined(CONFIG_SOC_SERIES_RZG3S) || defined(CONFIG_SOC_SERIES_RZA3UL) ||                       \
+	defined(CONFIG_SOC_SERIES_RZV2L) || defined(CONFIG_SOC_SERIES_RZG2L)
+#include <zephyr/dt-bindings/gpio/renesas-rz-gpio.h>
+
+#if defined(CONFIG_SOC_SERIES_RZG3S)
+#define GPIO_RZ_IOPORT_P_REG_BASE_GET   (&R_GPIO->P_20)
+#define GPIO_RZ_IOPORT_PM_REG_BASE_GET  (&R_GPIO->PM_20)
+#define GPIO_RZ_IOPORT_PFC_REG_BASE_GET (&R_GPIO->PFC_20)
+#define GPIO_RZ_MAX_PORT_NUM            19
+#define GPIO_RZ_TINT_IRQ_OFFSET         429
+#define R_INTC                          R_INTC_IM33
+static const uint8_t gpio_rz_int[GPIO_RZ_MAX_PORT_NUM] = {0,  4,  9,  13, 17, 23, 28, 33, 38, 43,
+							  47, 52, 56, 58, 63, 66, 70, 72, 76};
+
+#elif defined(CONFIG_SOC_SERIES_RZA3UL)
+#define GPIO_RZ_IOPORT_P_REG_BASE_GET   (&R_GPIO->P10)
+#define GPIO_RZ_IOPORT_PM_REG_BASE_GET  (&R_GPIO->PM10)
+#define GPIO_RZ_IOPORT_PFC_REG_BASE_GET (&R_GPIO->PFC10)
+#define GPIO_RZ_MAX_PORT_NUM            19
+#define GPIO_RZ_TINT_IRQ_OFFSET         476
+#define R_INTC                          R_INTC_IA55
+static const uint8_t gpio_rz_int[GPIO_RZ_MAX_PORT_NUM] = {0,  4,  9,  13, 17, 23, 28, 33, 38, 43,
+							  47, 52, 56, 58, 63, 66, 70, 72, 76};
+
+#elif defined(CONFIG_SOC_SERIES_RZV2L) || defined(CONFIG_SOC_SERIES_RZG2L)
+#define GPIO_RZ_IOPORT_P_REG_BASE_GET   (&R_GPIO->P10)
+#define GPIO_RZ_IOPORT_PM_REG_BASE_GET  (&R_GPIO->PM10)
+#define GPIO_RZ_IOPORT_PFC_REG_BASE_GET (&R_GPIO->PFC10)
+#define GPIO_RZ_MAX_PORT_NUM            49
+#define GPIO_RZ_TINT_IRQ_OFFSET         444
+#define R_INTC                          R_INTC_IM33
+static const uint8_t gpio_rz_int[GPIO_RZ_MAX_PORT_NUM] = {
+	0,  2,  4,  6,  8,  10, 13, 15, 18, 21, 24,  25,  27,  29,  32, 34, 36,
+	38, 41, 43, 45, 48, 50, 52, 54, 56, 58, 60,  62,  64,  66,  68, 70, 72,
+	74, 76, 78, 80, 83, 85, 88, 91, 93, 98, 102, 106, 110, 114, 118};
+#endif
+
+#define GPIO_RZ_IOPORT_P_REG_GET(port, pin)   (&GPIO_RZ_IOPORT_P_REG_BASE_GET[port])
+#define GPIO_RZ_IOPORT_PM_REG_GET(port, pin)  (&GPIO_RZ_IOPORT_PM_REG_BASE_GET[port])
+#define GPIO_RZ_IOPORT_PFC_REG_GET(port, pin) (&GPIO_RZ_IOPORT_PFC_REG_BASE_GET[port])
 
-#define GPIO_RZ_REG_OFFSET(port, pin) (port + (pin / 4))
+#define GPIO_RZ_P_VALUE_GET(value, pin)   ((value >> pin) & 1U)
+#define GPIO_RZ_PM_VALUE_GET(value, pin)  ((value >> (pin * 2)) & 3U)
+#define GPIO_RZ_PFC_VALUE_GET(value, pin) ((value >> (pin * 4)) & 0xF)
 
-#define GPIO_RZ_P_VALUE_GET(value, pin)  ((value >> pin) & 1U)
-#define GPIO_RZ_PM_VALUE_GET(value, pin) ((value >> (pin * 2)) & 3U)
+#define GPIO_RZ_IOPORT_PFC_SET(value) (value << 24)
 
-#define GPIO_RZ_MAX_PORT_NUM 19
-#define GPIO_RZ_MAX_TINT_NUM 32
+#define GPIO_RZ_PIN_DISCONNECT(port, pin) /* do nothing */
+
+#define GPIO_RZ_MAX_INT_NUM 32
 
-#define GPIO_RZ_TINT_IRQ_OFFSET        429
 #define GPIO_RZ_TINT_IRQ_GET(tint_num) (tint_num + GPIO_RZ_TINT_IRQ_OFFSET)
 
-#define GPIO_RZ_TINT_EDGE_RISING  0x0
-#define GPIO_RZ_TINT_EDGE_FALLING 0x1
-#define GPIO_RZ_TINT_LEVEL_HIGH   0x2
-#define GPIO_RZ_TINT_LEVEL_LOW    0x3
+#define GPIO_RZ_INT_EDGE_RISING  0x0
+#define GPIO_RZ_INT_EDGE_FALLING 0x1
+#define GPIO_RZ_INT_LEVEL_HIGH   0x2
+#define GPIO_RZ_INT_LEVEL_LOW    0x3
+#define GPIO_RZ_INT_BOTH_EDGE    GPIO_RZ_INT_UNSUPPORTED
 
 #define GPIO_RZ_TSSR_VAL(port, pin) (0x80 | (gpio_rz_int[port] + pin))
 #define GPIO_RZ_TSSR_OFFSET(irq)    ((irq % 4) * 8)
 #define GPIO_RZ_TITSR_OFFSET(irq)   ((irq % 16) * 2)
 
-#define GPIO_RZ_PIN_CONFIGURE_GET_FILTER(flag) (((flags >> RZG3S_GPIO_FILTER_SHIFT) & 0x1F) << 19U)
-#define GPIO_RZ_PIN_CONFIGURE_GET_DRIVE_ABILITY(flag)                                              \
-	(((flag >> RZG3S_GPIO_IOLH_SHIFT) & 0x3) << 10U)
+#define GPIO_RZ_PIN_CONFIGURE_GET_FILTER(flag) (((flags >> RZ_GPIO_FILTER_SHIFT) & 0x1F) << 19U)
+#define GPIO_RZ_PIN_CONFIGURE_GET(flag)        (((flag >> RZ_GPIO_IOLH_SHIFT) & 0x3) << 10U)
 
 #define GPIO_RZ_PIN_CONFIGURE_INT_ENABLE         IOPORT_CFG_TINT_ENABLE
 #define GPIO_RZ_PIN_CONFIGURE_INT_DISABLE        (~(IOPORT_CFG_TINT_ENABLE))
 #define GPIO_RZ_PIN_CONFIGURE_INPUT_OUTPUT_RESET (~(0x3 << 2))
+#define GPIO_RZ_PIN_SPECIAL_FLAG_GET(flag)       GPIO_RZ_PIN_CONFIGURE_GET_FILTER(flag)
+
+#elif defined(CONFIG_SOC_SERIES_RZN2L) || defined(CONFIG_SOC_SERIES_RZT2L) ||                      \
+	defined(CONFIG_SOC_SERIES_RZT2M)
+#include <zephyr/dt-bindings/gpio/renesas-rztn-gpio.h>
+#define GPIO_RZ_IOPORT_REG_REGION_GET(p) (R_BSP_IoRegionGet(p) == BSP_IO_REGION_NOT_SAFE ? 1 : 0)
+
+#define GPIO_RZ_IOPORT_P_REG_BASE_GET(port, pin)                                                   \
+	(GPIO_RZ_IOPORT_REG_REGION_GET((port << 8U) | pin) == 1 ? &R_PORT_NSR->P[port]             \
+								: &R_PORT_SR->P[port])
+
+#define GPIO_RZ_IOPORT_PM_REG_BASE_GET(port, pin)                                                  \
+	(GPIO_RZ_IOPORT_REG_REGION_GET((port << 8U) | pin) == 1 ? &R_PORT_NSR->PM[port]            \
+								: &R_PORT_SR->PM[port])
+
+#define GPIO_RZ_IOPORT_PFC_REG_BASE_GET(port, pin)                                                 \
+	(GPIO_RZ_IOPORT_REG_REGION_GET((port << 8U) | pin) == 1 ? &R_PORT_NSR->PFC[port]           \
+								: &R_PORT_SR->PFC[port])
+
+#define GPIO_RZ_IOPORT_P_REG_GET(port, pin)   (GPIO_RZ_IOPORT_P_REG_BASE_GET(port, pin))
+#define GPIO_RZ_IOPORT_PM_REG_GET(port, pin)  (GPIO_RZ_IOPORT_PM_REG_BASE_GET(port, pin))
+#define GPIO_RZ_IOPORT_PFC_REG_GET(port, pin) (GPIO_RZ_IOPORT_PFC_REG_BASE_GET(port, pin))
+
+#define GPIO_RZ_P_VALUE_GET(value, pin)   ((value >> pin) & 1U)
+#define GPIO_RZ_PM_VALUE_GET(value, pin)  ((value >> (pin * 2)) & 3U)
+#define GPIO_RZ_PFC_VALUE_GET(value, pin) ((value >> (pin * 4)) & 0xF)
+
+#define GPIO_RZ_IOPORT_PFC_SET(value) (value << 4)
+
+#define GPIO_RZ_PIN_DISCONNECT(port, pin)                                                          \
+	*GPIO_RZ_IOPORT_PM_REG_GET((port >> 8U), pin) &= ~(3U << (pin * 2))
+
+#define GPIO_RZ_MAX_INT_NUM 16
+
+#define GPIO_RZ_INT_EDGE_FALLING 0x0
+#define GPIO_RZ_INT_EDGE_RISING  0x1
+#define GPIO_RZ_INT_BOTH_EDGE    0x2
+#define GPIO_RZ_INT_LEVEL_LOW    0x3
+#define GPIO_RZ_INT_LEVEL_HIGH   GPIO_RZ_INT_UNSUPPORTED
+
+#define GPIO_RZ_PIN_CONFIGURE_GET(flag) (((flag >> RZTN_GPIO_DRCTL_SHIFT) & 0x33) << 8U)
+
+#define GPIO_RZ_PIN_CONFIGURE_INT_ENABLE         (1U << 3)
+#define GPIO_RZ_PIN_CONFIGURE_INT_DISABLE        (~(1U << 3))
+#define GPIO_RZ_PIN_CONFIGURE_INPUT_OUTPUT_RESET (~(0x3 << 2))
+#define GPIO_RZ_PIN_SPECIAL_FLAG_GET(flag)       IOPORT_CFG_REGION_NSAFETY
+
+#endif /* CONFIG_SOC_* */
 
-static const uint8_t gpio_rz_int[GPIO_RZ_MAX_PORT_NUM] = {0,  4,  9,  13, 17, 23, 28, 33, 38, 43,
-							  47, 52, 56, 58, 63, 66, 70, 72, 76};
 #endif /* ZEPHYR_DRIVERS_GPIO_RENESAS_RZ_H_ */
diff --git a/drivers/gpio/gpio_rpi_pico.c b/drivers/gpio/gpio_rpi_pico.c
index 1950144cc7260..198820f9244ed 100644
--- a/drivers/gpio/gpio_rpi_pico.c
+++ b/drivers/gpio/gpio_rpi_pico.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, Yonatan Schachter
+ * Copyright (c) 2025, Andrew Featherstone
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,40 +16,138 @@
 
 #include <zephyr/drivers/gpio/gpio_utils.h>
 
-#define DT_DRV_COMPAT raspberrypi_pico_gpio
+#define DT_DRV_COMPAT raspberrypi_pico_gpio_port
 
 #define ALL_EVENTS (GPIO_IRQ_EDGE_FALL | GPIO_IRQ_EDGE_RISE \
 		| GPIO_IRQ_LEVEL_LOW | GPIO_IRQ_LEVEL_HIGH)
 
+#define GPIO_RPI_PINS_PER_PORT 32
+
+#define ADDR_IS_ZERO(n, x)     (DT_INST_REG_ADDR(n) == 0) |
+#define ADDR_IS_NON_ZERO(n, x) (DT_INST_REG_ADDR(n) != 0) |
+#define GPIO_RPI_LO_AVAILABLE  (DT_INST_FOREACH_STATUS_OKAY_VARGS(ADDR_IS_ZERO) 0)
+#define GPIO_RPI_HI_AVAILABLE  (DT_INST_FOREACH_STATUS_OKAY_VARGS(ADDR_IS_NON_ZERO) 0)
+
+#if GPIO_RPI_HI_AVAILABLE
+#define PORT_NO(port) ((((struct gpio_rpi_config *)port->config)->high_dev != NULL) ? 0 : 1)
+#else
+#define PORT_NO(port) ((int)port & 0) /* generate zero and suppress unused warning */
+#endif
+
 struct gpio_rpi_config {
 	struct gpio_driver_config common;
 	void (*bank_config_func)(void);
+#if GPIO_RPI_HI_AVAILABLE
+	const struct device *high_dev;
+#endif
 };
 
 struct gpio_rpi_data {
 	struct gpio_driver_data common;
 	sys_slist_t callbacks;
-	uint32_t int_enabled_mask;
 	uint32_t single_ended_mask;
 	uint32_t open_drain_mask;
 };
 
+static inline void gpio_set_dir_out_masked_n(uint n, uint32_t mask)
+{
+	if (!n) {
+		gpio_set_dir_out_masked(mask);
+	} else if (n == 1) {
+#if PICO_USE_GPIO_COPROCESSOR
+		gpioc_hi_oe_set(mask);
+#else
+		sio_hw->gpio_hi_oe_set = mask;
+#endif
+	}
+}
+
+static inline void gpio_set_dir_in_masked_n(uint n, uint32_t mask)
+{
+	if (!n) {
+		gpio_set_dir_in_masked(mask);
+	} else if (n == 1) {
+#if PICO_USE_GPIO_COPROCESSOR
+		gpioc_hi_oe_clr(mask);
+#else
+		sio_hw->gpio_hi_oe_clr = mask;
+#endif
+	}
+}
+
+static inline void gpio_set_dir_masked_n(uint n, uint32_t mask, uint32_t value)
+{
+	if (!n) {
+		gpio_set_dir_masked(mask, value);
+	} else if (n == 1) {
+#if PICO_USE_GPIO_COPROCESSOR
+		gpioc_hi_oe_xor((gpioc_hi_oe_get() ^ value) & mask);
+#else
+		sio_hw->gpio_oe_togl = (sio_hw->gpio_hi_oe ^ value) & mask;
+#endif
+	}
+}
+
+static inline uint32_t gpio_get_all_n(uint n)
+{
+	if (!n) {
+		return gpio_get_all();
+	} else if (n == 1) {
+#if PICO_USE_GPIO_COPROCESSOR
+		return gpioc_hi_in_get();
+#else
+		return sio_hw->gpio_hi_in;
+#endif
+	}
+
+	return 0;
+}
+
+static inline void gpio_toggle_dir_masked_n(uint n, uint32_t mask)
+{
+	if (!n) {
+#if PICO_USE_GPIO_COPROCESSOR
+		gpioc_lo_oe_xor(mask);
+#else
+		sio_hw->gpio_oe_togl = mask;
+#endif
+	} else if (n == 1) {
+#if PICO_USE_GPIO_COPROCESSOR
+		gpioc_hi_oe_xor(mask);
+#else
+		sio_hw->gpio_hi_oe_togl = mask;
+#endif
+	}
+}
+
 static int gpio_rpi_configure(const struct device *dev,
 				gpio_pin_t pin,
 				gpio_flags_t flags)
 {
+	const int offset = GPIO_RPI_PINS_PER_PORT * PORT_NO(dev);
 	struct gpio_rpi_data *data = dev->data;
 
-	if ((flags & GPIO_DIR_MASK) == GPIO_DISCONNECTED) {
-		return -ENOTSUP;
+	if (flags == GPIO_DISCONNECTED) {
+		gpio_disable_pulls(pin);
+		/* This is almost the opposite of the Pico SDK's gpio_set_function. */
+		hw_write_masked(&pads_bank0_hw->io[pin], PADS_BANK0_GPIO0_OD_BITS,
+				PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS);
+#ifdef SOC_SERIES_RP2350
+		hw_set_bits(&pads_bank0_hw->io[gpio], PADS_BANK0_GPIO0_ISO_BITS);
+#endif
+		return 0;
 	}
 
-	gpio_set_pulls(pin,
-		(flags & GPIO_PULL_UP) != 0U,
-		(flags & GPIO_PULL_DOWN) != 0U);
+	gpio_set_pulls(pin + offset, (flags & GPIO_PULL_UP) != 0U, (flags & GPIO_PULL_DOWN) != 0U);
 
 	/* Avoid gpio_init, since that also clears previously set direction/high/low */
-	gpio_set_function(pin, GPIO_FUNC_SIO);
+	gpio_set_function(pin + offset, GPIO_FUNC_SIO);
+
+	if (flags & GPIO_INPUT) {
+		gpio_set_dir(pin + offset, GPIO_IN);
+	} else {
+		gpio_set_input_enabled(pin + offset, false);
+	}
 
 	if (flags & GPIO_OUTPUT) {
 		if (flags & GPIO_SINGLE_ENDED) {
@@ -61,32 +160,63 @@ static int gpio_rpi_configure(const struct device *dev,
 			 */
 			if (flags & GPIO_LINE_OPEN_DRAIN) {
 				data->open_drain_mask |= BIT(pin);
-				gpio_put(pin, 0);
-				gpio_set_dir(pin, flags & GPIO_OUTPUT_INIT_LOW);
+				gpio_put(pin + offset, 0);
+				gpio_set_dir(pin + offset, flags & GPIO_OUTPUT_INIT_LOW);
 			} else {
 				data->open_drain_mask &= ~(BIT(pin));
-				gpio_put(pin, 1);
-				gpio_set_dir(pin, flags & GPIO_OUTPUT_INIT_HIGH);
+				gpio_put(pin + offset, 1);
+				gpio_set_dir(pin + offset, flags & GPIO_OUTPUT_INIT_HIGH);
 			}
 		} else {
 			data->single_ended_mask &= ~(BIT(pin));
 			if (flags & GPIO_OUTPUT_INIT_HIGH) {
-				gpio_put(pin, 1);
+				gpio_put(pin + offset, 1);
 			} else if (flags & GPIO_OUTPUT_INIT_LOW) {
-				gpio_put(pin, 0);
+				gpio_put(pin + offset, 0);
 			}
-			gpio_set_dir(pin, GPIO_OUT);
+			gpio_set_dir(pin + offset, GPIO_OUT);
+		}
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_GPIO_GET_CONFIG
+static int gpio_rpi_get_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t *flags)
+{
+	const int offset = GPIO_RPI_PINS_PER_PORT * PORT_NO(dev);
+	struct gpio_rpi_data *data = dev->data;
+
+	*flags = 0;
+
+	/* RP2xxxx supports Bus Keeper mode where both pull-up and pull-down are enabled. */
+	if (gpio_is_pulled_up(pin + offset)) {
+		*flags |= GPIO_PULL_UP;
+	}
+	if (gpio_is_pulled_down(pin + offset)) {
+		*flags |= GPIO_PULL_DOWN;
+	}
+
+	if (gpio_get_dir(pin + offset)) {
+		*flags |= gpio_get_out_level(pin + offset) ? GPIO_OUTPUT_HIGH : GPIO_OUTPUT_LOW;
+		if (data->single_ended_mask & BIT(pin)) {
+			*flags |=
+				data->open_drain_mask & BIT(pin) ? GPIO_OPEN_DRAIN : GPIO_PUSH_PULL;
 		}
-	} else if (flags & GPIO_INPUT) {
-		gpio_set_dir(pin, GPIO_IN);
+	}
+
+	if (pads_bank0_hw->io[pin] & PADS_BANK0_GPIO0_IE_BITS) {
+		*flags |= GPIO_INPUT;
 	}
 
 	return 0;
 }
+#endif
 
-static int gpio_rpi_port_get_raw(const struct device *dev, uint32_t *value)
+static int gpio_rpi_port_get_raw(const struct device *port, uint32_t *value)
 {
-	*value = gpio_get_all();
+	*value = gpio_get_all_n(PORT_NO(port));
+
 	return 0;
 }
 
@@ -94,12 +224,16 @@ static int gpio_rpi_port_set_masked_raw(const struct device *port,
 					uint32_t mask, uint32_t value)
 {
 	struct gpio_rpi_data *data = port->data;
+
 	/* First handle push-pull pins: */
-	gpio_put_masked(mask & ~data->single_ended_mask, value);
+	gpio_put_masked_n(PORT_NO(port), mask & ~data->single_ended_mask, value);
 	/* Then handle open-drain pins: */
-	gpio_set_dir_masked(mask & data->single_ended_mask & data->open_drain_mask, ~value);
+	gpio_set_dir_masked_n(PORT_NO(port), mask & data->single_ended_mask & data->open_drain_mask,
+			      ~value);
 	/* Then handle open-source pins: */
-	gpio_set_dir_masked(mask & data->single_ended_mask & ~data->open_drain_mask, value);
+	gpio_set_dir_masked_n(PORT_NO(port),
+			      mask & data->single_ended_mask & ~data->open_drain_mask, value);
+
 	return 0;
 }
 
@@ -107,12 +241,16 @@ static int gpio_rpi_port_set_bits_raw(const struct device *port,
 					uint32_t pins)
 {
 	struct gpio_rpi_data *data = port->data;
+
 	/* First handle push-pull pins: */
-	gpio_set_mask(pins & ~data->single_ended_mask);
+	gpio_set_mask_n(PORT_NO(port), pins & ~data->single_ended_mask);
 	/* Then handle open-drain pins: */
-	gpio_set_dir_in_masked(pins & data->single_ended_mask & data->open_drain_mask);
+	gpio_set_dir_in_masked_n(PORT_NO(port),
+				 pins & data->single_ended_mask & data->open_drain_mask);
 	/* Then handle open-source pins: */
-	gpio_set_dir_out_masked(pins & data->single_ended_mask & ~data->open_drain_mask);
+	gpio_set_dir_out_masked_n(PORT_NO(port),
+				  pins & data->single_ended_mask & ~data->open_drain_mask);
+
 	return 0;
 }
 
@@ -120,12 +258,16 @@ static int gpio_rpi_port_clear_bits_raw(const struct device *port,
 					uint32_t pins)
 {
 	struct gpio_rpi_data *data = port->data;
+
 	/* First handle push-pull pins: */
-	gpio_clr_mask(pins & ~data->single_ended_mask);
+	gpio_clr_mask_n(PORT_NO(port), pins & ~data->single_ended_mask);
 	/* Then handle open-drain pins: */
-	gpio_set_dir_out_masked(pins & data->single_ended_mask & data->open_drain_mask);
+	gpio_set_dir_out_masked_n(PORT_NO(port),
+				  pins & data->single_ended_mask & data->open_drain_mask);
 	/* Then handle open-source pins: */
-	gpio_set_dir_in_masked(pins & data->single_ended_mask & ~data->open_drain_mask);
+	gpio_set_dir_in_masked_n(PORT_NO(port),
+				 pins & data->single_ended_mask & ~data->open_drain_mask);
+
 	return 0;
 }
 
@@ -133,13 +275,12 @@ static int gpio_rpi_port_toggle_bits(const struct device *port,
 					uint32_t pins)
 {
 	struct gpio_rpi_data *data = port->data;
+
 	/* First handle push-pull pins: */
-	gpio_xor_mask(pins & ~data->single_ended_mask);
+	gpio_xor_mask_n(PORT_NO(port), pins & ~data->single_ended_mask);
 	/* Then handle single-ended pins: */
-	/* (unfortunately there's no pico-sdk api call that can be used for this,
-	 * but it's possible by accessing the registers directly)
-	 */
-	sio_hw->gpio_oe_togl = (pins & data->single_ended_mask);
+	gpio_toggle_dir_masked_n(PORT_NO(port), pins & data->single_ended_mask);
+
 	return 0;
 }
 
@@ -148,10 +289,10 @@ static int gpio_rpi_pin_interrupt_configure(const struct device *dev,
 						enum gpio_int_mode mode,
 						enum gpio_int_trig trig)
 {
-	struct gpio_rpi_data *data = dev->data;
+	const int offset = GPIO_RPI_PINS_PER_PORT * PORT_NO(dev);
 	uint32_t events = 0;
 
-	gpio_set_irq_enabled(pin, ALL_EVENTS, false);
+	gpio_set_irq_enabled(pin + offset, ALL_EVENTS, false);
 	if (mode != GPIO_INT_DISABLE) {
 		if (mode & GPIO_INT_EDGE) {
 			if (trig & GPIO_INT_LOW_0) {
@@ -168,9 +309,9 @@ static int gpio_rpi_pin_interrupt_configure(const struct device *dev,
 				events |= GPIO_IRQ_LEVEL_HIGH;
 			}
 		}
-		gpio_set_irq_enabled(pin, events, true);
+		gpio_set_irq_enabled(pin + offset, events, true);
 	}
-	WRITE_BIT(data->int_enabled_mask, pin, mode != GPIO_INT_DISABLE);
+
 	return 0;
 }
 
@@ -182,8 +323,50 @@ static int gpio_rpi_manage_callback(const struct device *dev,
 	return gpio_manage_callback(&data->callbacks, callback, set);
 }
 
+static uint32_t gpio_rpi_get_pending_int(const struct device *dev)
+{
+	io_bank0_irq_ctrl_hw_t *irq_ctrl_base =
+		get_core_num() ? &io_bank0_hw->proc1_irq_ctrl : &io_bank0_hw->proc0_irq_ctrl;
+	ARRAY_FOR_EACH_PTR(irq_ctrl_base->ints, p) {
+		if (*p) {
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_GPIO_GET_DIRECTION
+static int gpio_rpi_port_get_direction(const struct device *port, gpio_port_pins_t map,
+				  gpio_port_pins_t *inputs, gpio_port_pins_t *outputs)
+{
+	/* The Zephyr API considers a disconnected pin to be neither an input nor output.
+	 * Since we disable both OE and IE for disconnected pins clear the mask bits.
+	 */
+	for (int pin = 0; pin < NUM_BANK0_GPIOS; pin++) {
+		if (pads_bank0_hw->io[pin] & PADS_BANK0_GPIO0_OD_BITS) {
+			map &= ~BIT(pin);
+		}
+		if (inputs && (pads_bank0_hw->io[pin] & PADS_BANK0_GPIO0_IE_BITS)) {
+			*inputs |= BIT(pin);
+		}
+	}
+	if (inputs) {
+		*inputs &= map;
+	}
+	if (outputs) {
+		*outputs = sio_hw->gpio_oe & map;
+	}
+
+	return 0;
+}
+#endif
+
 static DEVICE_API(gpio, gpio_rpi_driver_api) = {
 	.pin_configure = gpio_rpi_configure,
+#ifdef CONFIG_GPIO_GET_CONFIG
+	.pin_get_config = gpio_rpi_get_config,
+#endif
 	.port_get_raw = gpio_rpi_port_get_raw,
 	.port_set_masked_raw = gpio_rpi_port_set_masked_raw,
 	.port_set_bits_raw = gpio_rpi_port_set_bits_raw,
@@ -191,6 +374,10 @@ static DEVICE_API(gpio, gpio_rpi_driver_api) = {
 	.port_toggle_bits = gpio_rpi_port_toggle_bits,
 	.pin_interrupt_configure = gpio_rpi_pin_interrupt_configure,
 	.manage_callback = gpio_rpi_manage_callback,
+	.get_pending_int = gpio_rpi_get_pending_int,
+#ifdef CONFIG_GPIO_GET_DIRECTION
+	.port_get_direction = gpio_rpi_port_get_direction,
+#endif
 };
 
 static void gpio_rpi_isr(const struct device *dev)
@@ -207,6 +394,18 @@ static void gpio_rpi_isr(const struct device *dev)
 		events = (*status_reg >> 4 * (pin % 8)) & ALL_EVENTS;
 		if (events) {
 			gpio_acknowledge_irq(pin, ALL_EVENTS);
+
+#if GPIO_RPI_HI_AVAILABLE
+			if (pin >= GPIO_RPI_PINS_PER_PORT) {
+				const struct gpio_rpi_config *config = dev->config;
+				struct gpio_rpi_data *high_data = config->high_dev->data;
+
+				gpio_fire_callbacks(&high_data->callbacks, config->high_dev,
+						    BIT(pin - GPIO_RPI_PINS_PER_PORT));
+				continue;
+			}
+#endif
+
 			gpio_fire_callbacks(&data->callbacks, dev, BIT(pin));
 		}
 	}
@@ -216,31 +415,56 @@ static int gpio_rpi_bank_init(const struct device *dev)
 {
 	const struct gpio_rpi_config *config = dev->config;
 
-	config->bank_config_func();
+	if (config->bank_config_func != NULL) {
+		config->bank_config_func();
+	}
+
 	return 0;
 }
 
-#define GPIO_RPI_INIT(idx)							\
-	static void bank_##idx##_config_func(void)				\
-	{									\
-		IRQ_CONNECT(DT_INST_IRQN(idx), DT_INST_IRQ(idx, priority),	\
-			    gpio_rpi_isr, DEVICE_DT_INST_GET(idx), 0);		\
-		irq_enable(DT_INST_IRQN(idx));					\
-	}									\
-	static const struct gpio_rpi_config gpio_rpi_##idx##_config = {		\
-		.bank_config_func = bank_##idx##_config_func,			\
-		.common =							\
-		{								\
-			.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(idx),	\
-		}								\
-	};									\
-										\
-	static struct gpio_rpi_data gpio_rpi_##idx##_data;			\
-										\
-	DEVICE_DT_INST_DEFINE(idx, gpio_rpi_bank_init, NULL,			\
-				&gpio_rpi_##idx##_data,				\
-				&gpio_rpi_##idx##_config,			\
-				POST_KERNEL, CONFIG_GPIO_INIT_PRIORITY,		\
-				&gpio_rpi_driver_api);
+#define GPIO_REG_0U            1
+#define IS_GPIO_RPI_LO_NODE(n) UTIL_CAT(GPIO_REG_, DT_REG_ADDR(n))
+
+#define DEVICE_IF_GPIO_RPI_HI_NODE(n) COND_CODE_1(IS_GPIO_RPI_LO_NODE(n), (), (DEVICE_DT_GET(n)))
+
+#define FIND_GPIO_RPI_HI_DEVICE(n)                                                                 \
+	COND_CODE_1(UTIL_CAT(GPIO_REG_, DT_REG_ADDR(n)),                                           \
+			(DT_FOREACH_CHILD(DT_PARENT(n), DEVICE_IF_GPIO_RPI_HI_NODE)), (NULL))
+
+#if GPIO_RPI_HI_AVAILABLE
+#define GPIO_RPI_INIT_HIGH_DEV(idx) .high_dev = FIND_GPIO_RPI_HI_DEVICE(DT_DRV_INST(idx)),
+#else
+#define GPIO_RPI_INIT_HIGH_DEV(idx)
+#endif
+
+#define GPIO_RPI_INIT(idx)                                                                         \
+	BUILD_ASSERT(DT_CHILD_NUM(DT_INST_PARENT(idx)) > 0 &&                                      \
+			     DT_CHILD_NUM(DT_INST_PARENT(idx)) <= 2,                               \
+		     "raspberrypi,pico-gpio node must have one or two child node.");               \
+	BUILD_ASSERT(GPIO_RPI_LO_AVAILABLE,                                                        \
+		     "raspberrypi,pico-gpio node must have reg=0 child node.");                    \
+	IF_ENABLED(IS_GPIO_RPI_LO_NODE(DT_DRV_INST(idx)), (                                        \
+		static void bank_##idx##_config_func(void)                                         \
+		{                                                                                  \
+			IRQ_CONNECT(DT_IRQN(DT_INST_PARENT(idx)),                                  \
+				    DT_IRQ(DT_INST_PARENT(idx), priority),                         \
+				    gpio_rpi_isr, DEVICE_DT_INST_GET(idx), 0);                     \
+			irq_enable(DT_IRQN(DT_INST_PARENT(idx)));                                  \
+		}                                                                                  \
+	))                                                                                         \
+	static const struct gpio_rpi_config gpio_rpi_##idx##_config = {                            \
+		.common = {                                                                        \
+			.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(idx),                     \
+		},                                                                                 \
+		IF_ENABLED(IS_GPIO_RPI_LO_NODE(DT_DRV_INST(idx)), (                                \
+			.bank_config_func = bank_##idx##_config_func,                              \
+		))                                                                                 \
+		GPIO_RPI_INIT_HIGH_DEV(idx)                                                        \
+	};                                                                                         \
+	static struct gpio_rpi_data gpio_rpi_##idx##_data;                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(idx, gpio_rpi_bank_init, NULL, &gpio_rpi_##idx##_data,               \
+			      &gpio_rpi_##idx##_config, POST_KERNEL, CONFIG_GPIO_INIT_PRIORITY,    \
+			      &gpio_rpi_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(GPIO_RPI_INIT)
diff --git a/drivers/gpio/gpio_shell.c b/drivers/gpio/gpio_shell.c
index d85b72e2dca34..514b6cc44b4a5 100644
--- a/drivers/gpio/gpio_shell.c
+++ b/drivers/gpio/gpio_shell.c
@@ -101,10 +101,6 @@ static void port_pin_get(gpio_port_pins_t reserved_mask, const char **line_names
 #define GPIO_CTRL_PIN_GET_FN(node_id)                                                              \
 	static const char *node_id##line_names[] = DT_PROP_OR(node_id, gpio_line_names, {NULL});   \
                                                                                                    \
-	static void node_id##cmd_gpio_pin_get(size_t idx, struct shell_static_entry *entry);       \
-                                                                                                   \
-	SHELL_DYNAMIC_CMD_CREATE(node_id##sub_gpio_pin, node_id##cmd_gpio_pin_get);                \
-                                                                                                   \
 	static void node_id##cmd_gpio_pin_get(size_t idx, struct shell_static_entry *entry)        \
 	{                                                                                          \
 		gpio_port_pins_t reserved_mask = GPIO_DT_RESERVED_RANGES_NGPIOS_SHELL(node_id);    \
@@ -112,7 +108,9 @@ static void port_pin_get(gpio_port_pins_t reserved_mask, const char **line_names
                                                                                                    \
 		port_pin_get(reserved_mask, node_id##line_names, line_names_len, idx, entry);      \
 		entry->subcmd = NULL;                                                              \
-	}
+	}                                                                                          \
+                                                                                                   \
+	SHELL_DYNAMIC_CMD_CREATE(node_id##sub_gpio_pin, node_id##cmd_gpio_pin_get);
 
 #define IS_GPIO_CTRL_PIN_GET(node_id)                                                              \
 	COND_CODE_1(DT_PROP(node_id, gpio_controller), (GPIO_CTRL_PIN_GET_FN(node_id)), ())
@@ -152,7 +150,7 @@ static const struct gpio_ctrl *get_gpio_ctrl(const char *name)
 	return NULL;
 }
 
-int line_cmp(const char *input, const char *line_name)
+static int line_cmp(const char *input, const char *line_name)
 {
 	int i = 0;
 
@@ -174,7 +172,7 @@ static int get_gpio_pin(const struct shell *sh, const struct gpio_ctrl *ctrl, ch
 	gpio_pin_t i;
 	int result;
 
-	for (i = 0; i < ctrl->ngpios; i++) {
+	for (i = 0; i < ctrl->ngpios && i < ctrl->line_names_len; i++) {
 		result = line_cmp(line_name, ctrl->line_names[i]);
 		if (result == 0) {
 			if ((BIT64(i) & ctrl->reserved_mask) != 0) {
@@ -224,12 +222,13 @@ static int get_sh_gpio(const struct shell *sh, char **argv, struct sh_gpio *gpio
 	return 0;
 }
 
-static int cmd_gpio_conf(const struct shell *sh, size_t argc, char **argv, void *data)
+static int cmd_gpio_conf(const struct shell *sh, size_t argc, char **argv)
 {
 	gpio_flags_t flags = 0;
 	gpio_flags_t vendor_specific;
 	struct sh_gpio gpio;
-	int ret = 0;
+	int ret;
+	size_t len;
 
 	ret = get_sh_gpio(sh, argv, &gpio);
 	if (ret != 0) {
@@ -237,7 +236,8 @@ static int cmd_gpio_conf(const struct shell *sh, size_t argc, char **argv, void
 		return SHELL_CMD_HELP_PRINTED;
 	}
 
-	for (int i = 0; i < strlen(argv[ARGV_CONF]); i++) {
+	len = strlen(argv[ARGV_CONF]);
+	for (int i = 0; i < len; i++) {
 		switch (argv[ARGV_CONF][i]) {
 		case 'i':
 			flags |= GPIO_INPUT;
@@ -363,7 +363,7 @@ static int cmd_gpio_set(const struct shell *sh, size_t argc, char **argv)
 {
 	struct sh_gpio gpio;
 	unsigned long value;
-	int ret = 0;
+	int ret;
 
 	ret = get_sh_gpio(sh, argv, &gpio);
 	if (ret != 0) {
@@ -389,7 +389,7 @@ static int cmd_gpio_set(const struct shell *sh, size_t argc, char **argv)
 static int cmd_gpio_toggle(const struct shell *sh, size_t argc, char **argv)
 {
 	struct sh_gpio gpio;
-	int ret = 0;
+	int ret;
 
 	ret = get_sh_gpio(sh, argv, &gpio);
 	if (ret != 0) {
@@ -474,14 +474,28 @@ static int cmd_gpio_blink(const struct shell *sh, size_t argc, char **argv)
 	return 0;
 }
 
+static const char *gpio_device_name(const struct device *dev)
+{
+#ifdef CONFIG_DEVICE_DT_METADATA
+	const struct device_dt_nodelabels *nl = device_get_dt_nodelabels(dev);
+
+	if (nl != NULL && nl->num_nodelabels > 0) {
+		return nl->nodelabels[0];
+	}
+#endif
+	return dev->name;
+}
+
 static void device_name_get(size_t idx, struct shell_static_entry *entry)
 {
+	const struct device *dev = gpio_list[idx].dev;
+
 	if (idx >= ARRAY_SIZE(gpio_list)) {
 		entry->syntax = NULL;
 		return;
 	}
 
-	entry->syntax = gpio_list[idx].dev->name;
+	entry->syntax = gpio_device_name(dev);
 	entry->handler = NULL;
 	entry->help = "Device";
 	entry->subcmd = gpio_list[idx].subcmd;
@@ -511,9 +525,7 @@ static void print_gpio_ctrl_info(const struct shell *sh, const struct gpio_ctrl
 	const char *line_name;
 
 	shell_print(sh, " ngpios: %u", ctrl->ngpios);
-	shell_print(sh, " Reserved pin mask: 0x%08X", ctrl->reserved_mask);
-
-	shell_print(sh, "");
+	shell_print(sh, " Reserved pin mask: 0x%08X\n", ctrl->reserved_mask);
 
 	shell_print(sh, " Reserved  Pin  Line Name");
 	for (pin = 0; pin < ctrl->ngpios; pin++) {
@@ -599,7 +611,7 @@ static void pin_ordered(const struct pin_info *info, void *user_data)
 	shell_print(data->sh, "   %-12s %-8c %-16s %2u",
 		    data->next.line_name,
 		    data->next.reserved ? '*' : ' ',
-		    data->next.dev->name,
+		    gpio_device_name(data->next.dev),
 		    data->next.pin);
 
 	data->prev = data->next;
diff --git a/drivers/gpio/gpio_stm32.h b/drivers/gpio/gpio_stm32.h
index 65b6bcc95da76..57578dc4952e5 100644
--- a/drivers/gpio/gpio_stm32.h
+++ b/drivers/gpio/gpio_stm32.h
@@ -19,186 +19,6 @@
 #include <zephyr/dt-bindings/pinctrl/stm32-pinctrl.h>
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
 
-/* GPIO buses definitions */
-
-#define STM32_PORT_NOT_AVAILABLE 0xFFFFFFFF
-
-#ifdef CONFIG_SOC_SERIES_STM32F0X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB1
-#define STM32_PERIPH_GPIOA LL_AHB1_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB1_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB1_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB1_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB1_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB1_GRP1_PERIPH_GPIOF
-#elif CONFIG_SOC_SERIES_STM32F1X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_APB2
-#define STM32_PERIPH_GPIOA LL_APB2_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_APB2_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_APB2_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_APB2_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_APB2_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_APB2_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_APB2_GRP1_PERIPH_GPIOG
-#elif CONFIG_SOC_SERIES_STM32F2X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB1
-#define STM32_PERIPH_GPIOA LL_AHB1_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB1_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB1_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB1_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB1_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB1_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB1_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB1_GRP1_PERIPH_GPIOH
-#define STM32_PERIPH_GPIOI LL_AHB1_GRP1_PERIPH_GPIOI
-#elif CONFIG_SOC_SERIES_STM32F3X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB1
-#define STM32_PERIPH_GPIOA LL_AHB1_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB1_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB1_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB1_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB1_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB1_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB1_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB1_GRP1_PERIPH_GPIOH
-#elif CONFIG_SOC_SERIES_STM32F4X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB1
-#define STM32_PERIPH_GPIOA LL_AHB1_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB1_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB1_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB1_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB1_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB1_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB1_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB1_GRP1_PERIPH_GPIOH
-#define STM32_PERIPH_GPIOI LL_AHB1_GRP1_PERIPH_GPIOI
-#define STM32_PERIPH_GPIOJ LL_AHB1_GRP1_PERIPH_GPIOJ
-#define STM32_PERIPH_GPIOK LL_AHB1_GRP1_PERIPH_GPIOK
-#elif CONFIG_SOC_SERIES_STM32F7X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB1
-#define STM32_PERIPH_GPIOA LL_AHB1_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB1_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB1_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB1_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB1_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB1_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB1_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB1_GRP1_PERIPH_GPIOH
-#define STM32_PERIPH_GPIOI LL_AHB1_GRP1_PERIPH_GPIOI
-#define STM32_PERIPH_GPIOJ LL_AHB1_GRP1_PERIPH_GPIOJ
-#define STM32_PERIPH_GPIOK LL_AHB1_GRP1_PERIPH_GPIOK
-#elif CONFIG_SOC_SERIES_STM32H7X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB4
-#define STM32_PERIPH_GPIOA LL_AHB4_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB4_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB4_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB4_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB4_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB4_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB4_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB4_GRP1_PERIPH_GPIOH
-#define STM32_PERIPH_GPIOI LL_AHB4_GRP1_PERIPH_GPIOI
-#define STM32_PERIPH_GPIOJ LL_AHB4_GRP1_PERIPH_GPIOJ
-#define STM32_PERIPH_GPIOK LL_AHB4_GRP1_PERIPH_GPIOK
-#elif CONFIG_SOC_SERIES_STM32H7RSX
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB4
-#define STM32_PERIPH_GPIOA LL_AHB4_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB4_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB4_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB4_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB4_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB4_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB4_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB4_GRP1_PERIPH_GPIOH
-#define STM32_PERIPH_GPIOM LL_AHB4_GRP1_PERIPH_GPIOM
-#define STM32_PERIPH_GPION LL_AHB4_GRP1_PERIPH_GPION
-#define STM32_PERIPH_GPIOO LL_AHB4_GRP1_PERIPH_GPIOO
-#define STM32_PERIPH_GPIOP LL_AHB4_GRP1_PERIPH_GPIOP
-#elif CONFIG_SOC_SERIES_STM32G0X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_IOP
-#define STM32_PERIPH_GPIOA LL_IOP_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_IOP_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_IOP_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_IOP_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_IOP_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_IOP_GRP1_PERIPH_GPIOF
-#elif CONFIG_SOC_SERIES_STM32L0X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_IOP
-#define STM32_PERIPH_GPIOA LL_IOP_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_IOP_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_IOP_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_IOP_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_IOP_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOH LL_IOP_GRP1_PERIPH_GPIOH
-#elif CONFIG_SOC_SERIES_STM32L1X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB1
-#define STM32_PERIPH_GPIOA LL_AHB1_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB1_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB1_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB1_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB1_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB1_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB1_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB1_GRP1_PERIPH_GPIOH
-#elif CONFIG_SOC_SERIES_STM32L4X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB2
-#define STM32_PERIPH_GPIOA LL_AHB2_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB2_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB2_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB2_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB2_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB2_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB2_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB2_GRP1_PERIPH_GPIOH
-#define STM32_PERIPH_GPIOI LL_AHB2_GRP1_PERIPH_GPIOI
-#elif CONFIG_SOC_SERIES_STM32L5X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB2
-#define STM32_PERIPH_GPIOA LL_AHB2_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB2_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB2_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB2_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB2_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB2_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB2_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB2_GRP1_PERIPH_GPIOH
-#elif CONFIG_SOC_SERIES_STM32MP1X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB4
-#define STM32_PERIPH_GPIOA LL_AHB4_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB4_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB4_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB4_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB4_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB4_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB4_GRP1_PERIPH_GPIOG
-#define STM32_PERIPH_GPIOH LL_AHB4_GRP1_PERIPH_GPIOH
-#define STM32_PERIPH_GPIOI LL_AHB4_GRP1_PERIPH_GPIOI
-#define STM32_PERIPH_GPIOJ LL_AHB4_GRP1_PERIPH_GPIOJ
-#define STM32_PERIPH_GPIOK LL_AHB4_GRP1_PERIPH_GPIOK
-#elif CONFIG_SOC_SERIES_STM32WBX
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB2
-#define STM32_PERIPH_GPIOA LL_AHB2_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB2_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB2_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB2_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB2_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOH LL_AHB2_GRP1_PERIPH_GPIOH
-#elif CONFIG_SOC_SERIES_STM32G4X
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB2
-#define STM32_PERIPH_GPIOA LL_AHB2_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB2_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB2_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOD LL_AHB2_GRP1_PERIPH_GPIOD
-#define STM32_PERIPH_GPIOE LL_AHB2_GRP1_PERIPH_GPIOE
-#define STM32_PERIPH_GPIOF LL_AHB2_GRP1_PERIPH_GPIOF
-#define STM32_PERIPH_GPIOG LL_AHB2_GRP1_PERIPH_GPIOG
-#elif CONFIG_SOC_SERIES_STM32WLX
-#define STM32_CLOCK_BUS_GPIO STM32_CLOCK_BUS_AHB2
-#define STM32_PERIPH_GPIOA LL_AHB2_GRP1_PERIPH_GPIOA
-#define STM32_PERIPH_GPIOB LL_AHB2_GRP1_PERIPH_GPIOB
-#define STM32_PERIPH_GPIOC LL_AHB2_GRP1_PERIPH_GPIOC
-#define STM32_PERIPH_GPIOH LL_AHB2_GRP1_PERIPH_GPIOH
-#endif /* CONFIG_SOC_SERIES_* */
-
 #ifdef CONFIG_SOC_SERIES_STM32F1X
 #define STM32_PINCFG_MODE_OUTPUT        (STM32_MODE_OUTPUT     \
 					 | STM32_CNF_GP_OUTPUT \
diff --git a/drivers/gpio/gpio_sy1xx.c b/drivers/gpio/gpio_sy1xx.c
index 300b436f3dcf4..7bb57472838a9 100644
--- a/drivers/gpio/gpio_sy1xx.c
+++ b/drivers/gpio/gpio_sy1xx.c
@@ -18,9 +18,10 @@ LOG_MODULE_REGISTER(sy1xx_gpio, CONFIG_GPIO_LOG_LEVEL);
 #include <pinctrl_soc.h>
 #include <zephyr/drivers/pinctrl.h>
 
-#define SY1XX_GPIO_GET_OFFS 0x00
-#define SY1XX_GPIO_SET_OFFS 0x1c
-#define SY1XX_GPIO_CLR_OFFS 0x20
+#define SY1XX_GPIO_GET_IN_OFFS  0x00
+#define SY1XX_GPIO_GET_OUT_OFFS 0x04
+#define SY1XX_GPIO_SET_OFFS     0x1c
+#define SY1XX_GPIO_CLR_OFFS     0x20
 
 struct sy1xx_gpio_config {
 	/* Base address for GPIO port*/
@@ -104,7 +105,7 @@ int sy1xx_gpio_driver_port_get_raw(const struct device *dev, gpio_port_value_t *
 {
 	const struct sy1xx_gpio_config *const cfg = dev->config;
 
-	*value = sys_read32(cfg->port_base_addr | SY1XX_GPIO_GET_OFFS);
+	*value = sys_read32(cfg->port_base_addr | SY1XX_GPIO_GET_IN_OFFS);
 	return 0;
 }
 
@@ -143,7 +144,7 @@ int sy1xx_gpio_driver_port_toggle_bits(const struct device *dev, gpio_port_pins_
 {
 	const struct sy1xx_gpio_config *const cfg = dev->config;
 
-	uint32_t current = sys_read32(cfg->port_base_addr | SY1XX_GPIO_GET_OFFS);
+	uint32_t current = sys_read32(cfg->port_base_addr | SY1XX_GPIO_GET_OUT_OFFS);
 
 	sy1xx_gpio_driver_port_set_masked_raw(dev, pins, ~current);
 	return 0;
diff --git a/drivers/gpio/gpio_xlnx_ps_bank.c b/drivers/gpio/gpio_xlnx_ps_bank.c
index c06479c8f53f7..8f62dc95da259 100644
--- a/drivers/gpio/gpio_xlnx_ps_bank.c
+++ b/drivers/gpio/gpio_xlnx_ps_bank.c
@@ -454,7 +454,7 @@ static const struct gpio_xlnx_ps_bank_dev_cfg gpio_xlnx_ps_bank##idx##_cfg = {\
 	.common = {\
 		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(idx),\
 	},\
-	.bank_index = idx,\
+	.bank_index = DT_INST_REG_ADDR(idx),\
 };\
 static struct gpio_xlnx_ps_bank_dev_data gpio_xlnx_ps_bank##idx##_data = {\
 	.base = 0,\
diff --git a/drivers/gpio/wch_gpio_ch32v00x.c b/drivers/gpio/wch_gpio_ch32v00x.c
index bc8566e12c512..c8d3d4954a841 100644
--- a/drivers/gpio/wch_gpio_ch32v00x.c
+++ b/drivers/gpio/wch_gpio_ch32v00x.c
@@ -53,7 +53,12 @@ static int gpio_ch32v00x_configure(const struct device *dev, gpio_pin_t pin, gpi
 		cnf_mode = 0x00;
 	}
 
-	regs->CFGLR = (regs->CFGLR & ~(0x0F << (4 * pin))) | (cnf_mode << (4 * pin));
+	if (pin < 8) {
+		regs->CFGLR = (regs->CFGLR & ~(0x0F << (4 * pin))) | (cnf_mode << (4 * pin));
+	} else {
+		regs->CFGHR =
+			(regs->CFGHR & ~(0x0F << ((pin - 8) * 4))) | (cnf_mode << ((pin - 8) * 4));
+	}
 	regs->BSHR = bshr;
 
 	return 0;
diff --git a/drivers/hwinfo/CMakeLists.txt b/drivers/hwinfo/CMakeLists.txt
index bfabe8c8bb65d..548577d05bf62 100644
--- a/drivers/hwinfo/CMakeLists.txt
+++ b/drivers/hwinfo/CMakeLists.txt
@@ -26,6 +26,7 @@ zephyr_library_sources_ifdef(CONFIG_HWINFO_NRF         hwinfo_nrf.c)
 zephyr_library_sources_ifdef(CONFIG_HWINFO_NUMAKER     hwinfo_numaker.c)
 zephyr_library_sources_ifdef(CONFIG_HWINFO_NUMAKER_RMC hwinfo_numaker_rmc.c)
 zephyr_library_sources_ifdef(CONFIG_HWINFO_PSOC6       hwinfo_psoc6.c)
+zephyr_library_sources_ifdef(CONFIG_HWINFO_RENESAS_RA  hwinfo_renesas_ra.c)
 zephyr_library_sources_ifdef(CONFIG_HWINFO_RPI_PICO    hwinfo_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_HWINFO_RW61X       hwinfo_rw61x.c)
 zephyr_library_sources_ifdef(CONFIG_HWINFO_SAM         hwinfo_sam.c)
diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig
index dca4ca30d0ca4..966f3d399b3ab 100644
--- a/drivers/hwinfo/Kconfig
+++ b/drivers/hwinfo/Kconfig
@@ -273,4 +273,12 @@ config HWINFO_MAX32
 	help
 	  Enable MAX32 hwinfo driver.
 
+config HWINFO_RENESAS_RA
+	bool "Renesas RA device ID"
+	default y
+	depends on SOC_FAMILY_RENESAS_RA
+	select HWINFO_HAS_DRIVER
+	help
+	  Enable RENESAS RA hwinfo driver
+
 endif
diff --git a/drivers/hwinfo/hwinfo_ambiq.c b/drivers/hwinfo/hwinfo_ambiq.c
index 80bcf62763ad5..c8173e0f813fe 100644
--- a/drivers/hwinfo/hwinfo_ambiq.c
+++ b/drivers/hwinfo/hwinfo_ambiq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/drivers/hwinfo/hwinfo_max32.c b/drivers/hwinfo/hwinfo_max32.c
index 61c841380d8a0..e0ec75dd72259 100644
--- a/drivers/hwinfo/hwinfo_max32.c
+++ b/drivers/hwinfo/hwinfo_max32.c
@@ -6,17 +6,16 @@
 
 #include <zephyr/drivers/hwinfo.h>
 #include <soc.h>
-#include <mxc_sys.h>
+#include <wrap_max32_sys.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
 
 ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	uint8_t usn[MXC_SYS_USN_LEN];
-	uint8_t checksum[MXC_SYS_USN_CHECKSUM_LEN];
 	int error;
 
-	error = MXC_SYS_GetUSN(usn, checksum);
+	error = Wrap_MXC_SYS_GetUSN(usn);
 	if (error != E_NO_ERROR) {
 		/* Error reading USN */
 		return error;
diff --git a/drivers/hwinfo/hwinfo_renesas_ra.c b/drivers/hwinfo/hwinfo_renesas_ra.c
new file mode 100644
index 0000000000000..0b326d855fe58
--- /dev/null
+++ b/drivers/hwinfo/hwinfo_renesas_ra.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/drivers/hwinfo.h>
+
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
+{
+	bsp_unique_id_t const *unique_id = R_BSP_UniqueIdGet();
+	size_t len = MIN(length, sizeof(unique_id->unique_id_bytes));
+
+	memcpy(buffer, &unique_id->unique_id_bytes[0], len);
+
+	return len;
+}
diff --git a/drivers/hwinfo/hwinfo_stm32.c b/drivers/hwinfo/hwinfo_stm32.c
index 1cd9688acc1e9..1af82ec1c3c11 100644
--- a/drivers/hwinfo/hwinfo_stm32.c
+++ b/drivers/hwinfo/hwinfo_stm32.c
@@ -15,6 +15,21 @@
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
 
+#if defined(CONFIG_SOC_SERIES_STM32MP13X)
+
+/* No ll_utils for the stm32mp13x series, instead use the HAL functions */
+#define STM32_UID_WORD_0 HAL_GetUIDw2()
+#define STM32_UID_WORD_1 HAL_GetUIDw1()
+#define STM32_UID_WORD_2 HAL_GetUIDw0()
+
+#else
+
+#define STM32_UID_WORD_0 LL_GetUID_Word2()
+#define STM32_UID_WORD_1 LL_GetUID_Word1()
+#define STM32_UID_WORD_2 LL_GetUID_Word0()
+
+#endif /* CONFIG_SOC_SERIES_STM32MP13X */
+
 struct stm32_uid {
 	uint32_t id[3];
 };
@@ -27,9 +42,9 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 	LL_ICACHE_Disable();
 #endif /* CONFIG_SOC_SERIES_STM32H5X */
 
-	dev_id.id[0] = sys_cpu_to_be32(LL_GetUID_Word2());
-	dev_id.id[1] = sys_cpu_to_be32(LL_GetUID_Word1());
-	dev_id.id[2] = sys_cpu_to_be32(LL_GetUID_Word0());
+	dev_id.id[0] = sys_cpu_to_be32(STM32_UID_WORD_2);
+	dev_id.id[1] = sys_cpu_to_be32(STM32_UID_WORD_1);
+	dev_id.id[2] = sys_cpu_to_be32(STM32_UID_WORD_0);
 
 #if defined(CONFIG_SOC_SERIES_STM32H5X)
 	LL_ICACHE_Enable();
@@ -146,6 +161,10 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
 	if (LL_PWR_MCU_IsActiveFlag_SB()) {
 		flags |= RESET_LOW_POWER_WAKE;
 	}
+#elif defined(CONFIG_SOC_SERIES_STM32MP13X)
+	if (LL_PWR_MPU_IsActiveFlag_SB()) {
+		flags |= RESET_LOW_POWER_WAKE;
+	}
 #elif defined(CONFIG_SOC_SERIES_STM32WLX) || defined(CONFIG_SOC_SERIES_STM32WBX)
 	if (LL_PWR_IsActiveFlag_C1SB()) {
 		flags |= RESET_LOW_POWER_WAKE;
@@ -173,6 +192,8 @@ int z_impl_hwinfo_clear_reset_cause(void)
 	LL_PWR_ClearFlag_STOP_SB();
 #elif defined(CONFIG_SOC_SERIES_STM32MP1X)
 	LL_PWR_ClearFlag_MCU();
+#elif defined(CONFIG_SOC_SERIES_STM32MP13X)
+	LL_PWR_ClearFlag_MPU();
 #elif defined(CONFIG_SOC_SERIES_STM32WLX) || defined(CONFIG_SOC_SERIES_STM32WBX)
 	LL_PWR_ClearFlag_C1STOP_C1STB();
 #elif defined(CONFIG_SOC_SERIES_STM32U0X) && defined(PWR_FLAG_SB)
diff --git a/drivers/i2c/CMakeLists.txt b/drivers/i2c/CMakeLists.txt
index 6419417db1c86..7a4dbfc538989 100644
--- a/drivers/i2c/CMakeLists.txt
+++ b/drivers/i2c/CMakeLists.txt
@@ -25,6 +25,7 @@ add_subdirectory_ifdef(CONFIG_I2C_TARGET target)
 # zephyr-keep-sorted-start
 zephyr_library_sources_ifdef(CONFIG_I2C_AMBIQ		i2c_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_ANDES_ATCIIC100	i2c_andes_atciic100.c)
+zephyr_library_sources_ifdef(CONFIG_I2C_CADENCE         i2c_cdns.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_CC13XX_CC26XX	i2c_cc13xx_cc26xx.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_CC32XX		i2c_cc32xx.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_DW		i2c_dw.c)
@@ -39,6 +40,7 @@ zephyr_library_sources_ifdef(CONFIG_I2C_IPROC		i2c_bcm_iproc.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_ITE_ENHANCE	i2c_ite_enhance.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_ITE_IT8XXX2	i2c_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_LITEX		i2c_litex.c)
+zephyr_library_sources_ifdef(CONFIG_I2C_LITEX_LITEI2C	i2c_litex_litei2c.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_LPC11U6X	i2c_lpc11u6x.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_MCHP_MSS	i2c_mchp_mss.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_MCUX		i2c_mcux.c)
@@ -52,6 +54,8 @@ zephyr_library_sources_ifdef(CONFIG_I2C_NXP_II2C	i2c_nxp_ii2c.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_OMAP		i2c_omap.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_RCAR		i2c_rcar.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_RENESAS_RA_IIC	i2c_renesas_ra_iic.c)
+zephyr_library_sources_ifdef(CONFIG_I2C_RENESAS_RA_SCI_B	i2c_renesas_ra_sci_b.c)
+zephyr_library_sources_ifdef(CONFIG_I2C_RENESAS_RZ_RIIC i2c_renesas_rz_riic.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_RV32M1_LPI2C	i2c_rv32m1_lpi2c.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_SAM0		i2c_sam0.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWI		i2c_sam_twi.c)
@@ -69,8 +73,10 @@ zephyr_library_sources_ifdef(CONFIG_I2C_STM32_V2
 	i2c_ll_stm32_v2.c
 	i2c_ll_stm32.c
  )
+zephyr_library_sources_ifdef(CONFIG_I2C_SY1XX		i2c_sy1xx.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_TCA954X		i2c_tca954x.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_TELINK_B91	i2c_b91.c)
+zephyr_library_sources_ifdef(CONFIG_I2C_WCH		i2c_wch.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_XEC		i2c_mchp_xec.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_XEC_V2		i2c_mchp_xec_v2.c)
 zephyr_library_sources_ifdef(CONFIG_I2C_XILINX_AXI	i2c_xilinx_axi.c)
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index c1180acf51d6a..25bd2dfea781b 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -123,6 +123,7 @@ source "drivers/i2c/Kconfig.andes_atciic100"
 source "drivers/i2c/Kconfig.b91"
 source "drivers/i2c/Kconfig.bcm_iproc"
 source "drivers/i2c/Kconfig.cc13xx_cc26xx"
+source "drivers/i2c/Kconfig.cdns"
 source "drivers/i2c/Kconfig.dw"
 source "drivers/i2c/Kconfig.ene"
 source "drivers/i2c/Kconfig.esp32"
@@ -143,6 +144,7 @@ source "drivers/i2c/Kconfig.numaker"
 source "drivers/i2c/Kconfig.omap"
 source "drivers/i2c/Kconfig.rcar"
 source "drivers/i2c/Kconfig.renesas_ra"
+source "drivers/i2c/Kconfig.renesas_rz"
 source "drivers/i2c/Kconfig.sam0"
 source "drivers/i2c/Kconfig.sam_twihs"
 source "drivers/i2c/Kconfig.sbcon"
@@ -151,8 +153,10 @@ source "drivers/i2c/Kconfig.sedi"
 source "drivers/i2c/Kconfig.sifive"
 source "drivers/i2c/Kconfig.smartbond"
 source "drivers/i2c/Kconfig.stm32"
+source "drivers/i2c/Kconfig.sy1xx"
 source "drivers/i2c/Kconfig.tca954x"
 source "drivers/i2c/Kconfig.test"
+source "drivers/i2c/Kconfig.wch"
 source "drivers/i2c/Kconfig.xec"
 source "drivers/i2c/Kconfig.xilinx_axi"
 # zephyr-keep-sorted-stop
diff --git a/drivers/i2c/Kconfig.cdns b/drivers/i2c/Kconfig.cdns
new file mode 100644
index 0000000000000..f03dbaf462a78
--- /dev/null
+++ b/drivers/i2c/Kconfig.cdns
@@ -0,0 +1,11 @@
+# Copyright 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config I2C_CADENCE
+	bool "Cadence I2C driver"
+	default y
+	depends on DT_HAS_CDNS_I2C_ENABLED
+	select EVENTS
+	help
+	  Enable Cadence I2C driver.
diff --git a/drivers/i2c/Kconfig.dw b/drivers/i2c/Kconfig.dw
index 750798143779a..d666b2aceb2f6 100644
--- a/drivers/i2c/Kconfig.dw
+++ b/drivers/i2c/Kconfig.dw
@@ -5,7 +5,7 @@ menuconfig I2C_DW
 	bool "Design Ware I2C support"
 	default y
 	depends on DT_HAS_SNPS_DESIGNWARE_I2C_ENABLED
-	select PINCTRL if DT_HAS_RASPBERRYPI_PICO_I2C_ENABLED
+	select PINCTRL if $(dt_compat_any_has_prop,$(DT_COMPAT_SNPS_DESIGNWARE_I2C),pinctrl-0)
 	help
 	  Enable the Design Ware I2C driver
 
diff --git a/drivers/i2c/Kconfig.it8xxx2 b/drivers/i2c/Kconfig.it8xxx2
index 71e6b0ded52c2..def24ca2411a1 100644
--- a/drivers/i2c/Kconfig.it8xxx2
+++ b/drivers/i2c/Kconfig.it8xxx2
@@ -6,6 +6,7 @@ config I2C_ITE_IT8XXX2
 	default y
 	depends on DT_HAS_ITE_IT8XXX2_I2C_ENABLED
 	select PINCTRL
+	select I2C_BITBANG
 	help
 	  Enable I2C support on it8xxx2_evb.
 	  Supported Speeds: 100kHz, 400kHz and 1MHz.
@@ -32,6 +33,7 @@ config I2C_ITE_ENHANCE
 	default y
 	depends on DT_HAS_ITE_ENHANCE_I2C_ENABLED
 	select PINCTRL
+	select I2C_BITBANG
 	help
 	  This option can enable the enhance I2C
 	  of IT8XXX2 and support three channels.
diff --git a/drivers/i2c/Kconfig.litex b/drivers/i2c/Kconfig.litex
index d768c4ef8d517..9637f44f5a6bb 100644
--- a/drivers/i2c/Kconfig.litex
+++ b/drivers/i2c/Kconfig.litex
@@ -8,3 +8,10 @@ config I2C_LITEX
 	select I2C_BITBANG
 	help
 	  Enable support for Litex I2C driver
+
+config I2C_LITEX_LITEI2C
+	bool "LiteX LiteI2C I2C driver"
+	default y
+	depends on DT_HAS_LITEX_LITEI2C_ENABLED
+	help
+	  Enable support for Litex I2C driver
diff --git a/drivers/i2c/Kconfig.omap b/drivers/i2c/Kconfig.omap
index 8081cfc6ebdd9..4b7951eb0e83c 100644
--- a/drivers/i2c/Kconfig.omap
+++ b/drivers/i2c/Kconfig.omap
@@ -7,6 +7,7 @@ config I2C_OMAP
 	bool "TI OMAP I2C Driver"
 	default y
 	depends on DT_HAS_TI_OMAP_I2C_ENABLED
+	select PINCTRL
 	help
 	  Enable the I2C driver for TI OMAP SoCs.
 
diff --git a/drivers/i2c/Kconfig.renesas_ra b/drivers/i2c/Kconfig.renesas_ra
index a0cd23a6b6477..4a64daf5b42e6 100644
--- a/drivers/i2c/Kconfig.renesas_ra
+++ b/drivers/i2c/Kconfig.renesas_ra
@@ -1,6 +1,6 @@
 # Renesas RA Family
 
-# Copyright (c) 2024 Renesas Electronics Corporation
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 config I2C_RENESAS_RA_IIC
@@ -11,3 +11,23 @@ config I2C_RENESAS_RA_IIC
 	select PINCTRL
 	help
 	  Enable Renesas RA I2C IIC Driver.
+
+config I2C_RENESAS_RA_SCI_B
+	bool "Renesas RA SCI-B I2C"
+	default y
+	depends on DT_HAS_RENESAS_RA_I2C_SCI_B_ENABLED
+	select USE_RA_FSP_SCI_B_I2C
+	select PINCTRL
+	help
+	  Enable Renesas RA SCI-B I2C Driver.
+
+if I2C_RENESAS_RA_SCI_B
+
+config I2C_RENESAS_RA_SCI_B_DTC
+	bool "DTC on Transmission and Reception"
+	default y
+	select USE_RA_FSP_DTC
+	help
+	   Enable DTC on transmission and reception
+
+endif
diff --git a/drivers/i2c/Kconfig.renesas_rz b/drivers/i2c/Kconfig.renesas_rz
new file mode 100644
index 0000000000000..16ebd19c54ece
--- /dev/null
+++ b/drivers/i2c/Kconfig.renesas_rz
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config I2C_RENESAS_RZ_RIIC
+	bool "Renesas RZ I2C RIIC Master"
+	default y
+	depends on DT_HAS_RENESAS_RZ_RIIC_ENABLED
+	select USE_RZ_FSP_RIIC_MASTER
+	help
+	  Enable Renesas RZ I2C RIIC Driver.
diff --git a/drivers/i2c/Kconfig.sam0 b/drivers/i2c/Kconfig.sam0
index 2096dbf4627b0..6cc8b57d67f45 100644
--- a/drivers/i2c/Kconfig.sam0
+++ b/drivers/i2c/Kconfig.sam0
@@ -21,6 +21,7 @@ config I2C_SAM0_DMA_DRIVEN
 
 config I2C_SAM0_TRANSFER_TIMEOUT
 	int "Transfer timeout [ms]"
+	depends on I2C_SAM0
 	default 500
 	help
 	  Timeout in milliseconds used for each I2C transfer.
diff --git a/drivers/i2c/Kconfig.sbcon b/drivers/i2c/Kconfig.sbcon
index 8a8a6a1ddf6e3..2f82720c5d2b2 100644
--- a/drivers/i2c/Kconfig.sbcon
+++ b/drivers/i2c/Kconfig.sbcon
@@ -6,3 +6,4 @@ config I2C_SBCON
 	default y
 	depends on DT_HAS_ARM_VERSATILE_I2C_ENABLED
 	select I2C_BITBANG
+	select PINCTRL
diff --git a/drivers/i2c/Kconfig.stm32 b/drivers/i2c/Kconfig.stm32
index b07dc5ca589c7..3b7bf71b5517a 100644
--- a/drivers/i2c/Kconfig.stm32
+++ b/drivers/i2c/Kconfig.stm32
@@ -55,4 +55,13 @@ config I2C_STM32_V2_TIMING
 	help
 	  Enable STM32 driver bus to calculate the Timing.
 
+config I2C_STM32_V2_DMA
+	bool "DMA support"
+	depends on I2C_STM32_V2
+	select DMA
+	select CACHE_MANAGEMENT if CPU_HAS_DCACHE
+	select EXPERIMENTAL
+	help
+	  Enable DMA support for the STM32 I2C driver.
+
 endif # I2C_STM32
diff --git a/drivers/i2c/Kconfig.sy1xx b/drivers/i2c/Kconfig.sy1xx
new file mode 100644
index 0000000000000..b02b7a146b70c
--- /dev/null
+++ b/drivers/i2c/Kconfig.sy1xx
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+config I2C_SY1XX
+	bool "Sensry SY1XX I2C driver"
+	default y
+	depends on DT_HAS_SENSRY_SY1XX_I2C_ENABLED
+	help
+	  Enable Sensry SY1xx SOC Family I2C driver.
diff --git a/drivers/i2c/Kconfig.wch b/drivers/i2c/Kconfig.wch
new file mode 100644
index 0000000000000..f07114e836486
--- /dev/null
+++ b/drivers/i2c/Kconfig.wch
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Andrei-Edward Popa
+# SPDX-License-Identifier: Apache-2.0
+
+config I2C_WCH
+	bool "WCH I2C driver"
+	default y
+	depends on DT_HAS_WCH_I2C_ENABLED
+	select PINCTRL
+	help
+	  Enable I2C support on WCH platforms
+
+config I2C_WCH_XFER_TIMEOUT_MS
+	int "Set the transfer timeout in milliseconds"
+	depends on I2C_WCH
+	default 500
diff --git a/drivers/i2c/i2c_ambiq.c b/drivers/i2c/i2c_ambiq.c
index 50536a5dd5313..8d2be5eccc240 100644
--- a/drivers/i2c/i2c_ambiq.c
+++ b/drivers/i2c/i2c_ambiq.c
@@ -13,7 +13,25 @@
 #include <zephyr/pm/policy.h>
 #include <zephyr/pm/device_runtime.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
+
+#include <zephyr/mem_mgmt/mem_attr.h>
+
+#ifdef CONFIG_DCACHE
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#endif /* CONFIG_DCACHE */
+
+#ifdef CONFIG_NOCACHE_MEMORY
+#include <zephyr/linker/linker-defs.h>
+#elif defined(CONFIG_CACHE_MANAGEMENT)
+#include <zephyr/arch/cache.h>
+#endif /* CONFIG_NOCACHE_MEMORY */
+
+#if defined(CONFIG_DCACHE) && !defined(CONFIG_NOCACHE_MEMORY)
+#define I2C_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED 1
+#else
+#define I2C_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED 0
+#endif /* defined(CONFIG_DCACHE) && !defined(CONFIG_NOCACHE_MEMORY) */
 
 #ifdef CONFIG_I2C_AMBIQ_BUS_RECOVERY
 #include <zephyr/drivers/gpio.h>
@@ -25,9 +43,6 @@
 
 LOG_MODULE_REGISTER(ambiq_i2c, CONFIG_I2C_LOG_LEVEL);
 
-typedef int (*ambiq_i2c_pwr_func_t)(void);
-
-#define PWRCTRL_MAX_WAIT_US       5
 #define I2C_TRANSFER_TIMEOUT_MSEC 500 /* Transfer timeout period */
 
 #include "i2c-priv.h"
@@ -39,9 +54,9 @@ struct i2c_ambiq_config {
 #endif /* CONFIG_I2C_AMBIQ_BUS_RECOVERY */
 	uint32_t base;
 	int size;
+	int inst_idx;
 	uint32_t bitrate;
 	const struct pinctrl_dev_config *pcfg;
-	ambiq_i2c_pwr_func_t pwr_func;
 	void (*irq_config_func)(void);
 };
 
@@ -54,7 +69,6 @@ struct i2c_ambiq_data {
 	struct k_sem transfer_sem;
 	i2c_ambiq_callback_t callback;
 	void *callback_data;
-	int inst_idx;
 	uint32_t transfer_status;
 	bool pm_policy_state_on;
 };
@@ -86,9 +100,15 @@ static void i2c_ambiq_pm_policy_state_lock_put(const struct device *dev)
 }
 
 #ifdef CONFIG_I2C_AMBIQ_DMA
+/*
+ * If Nocache Memory is supported, buffer will be placed in nocache region by
+ * the linker to avoid potential DMA cache-coherency problems.
+ * If Nocache Memory is not supported, cache coherency might need to be kept
+ * manually. See I2C_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED.
+ */
 static __aligned(32) struct {
 	__aligned(32) uint32_t buf[CONFIG_I2C_DMA_TCB_BUFFER_SIZE];
-} i2c_dma_tcb_buf[DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)] __attribute__((__section__(".nocache")));
+} i2c_dma_tcb_buf[DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)] __nocache;
 
 static void i2c_ambiq_callback(void *callback_ctxt, uint32_t status)
 {
@@ -100,6 +120,39 @@ static void i2c_ambiq_callback(void *callback_ctxt, uint32_t status)
 	}
 	data->transfer_status = status;
 }
+
+#ifdef CONFIG_DCACHE
+static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
+{
+	bool buf_within_nocache = false;
+
+#ifdef CONFIG_NOCACHE_MEMORY
+	/* Check if buffer is in nocache region defined by the linker */
+	buf_within_nocache = (buf >= ((uintptr_t)_nocache_ram_start)) &&
+			     ((buf + len_bytes - 1) <= ((uintptr_t)_nocache_ram_end));
+	if (buf_within_nocache) {
+		return true;
+	}
+#endif /* CONFIG_NOCACHE_MEMORY */
+
+	/* Check if buffer is in nocache memory region defined in DT */
+	buf_within_nocache =
+		mem_attr_check_buf((void *)buf, len_bytes, DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)) == 0;
+
+	return buf_within_nocache;
+}
+
+static bool i2c_buf_set_in_nocache(const struct i2c_msg *msgs, uint8_t num_msgs)
+{
+	for (int i = 0; i < num_msgs; i++) {
+		if (!buf_in_nocache((uintptr_t)msgs[i]->buf, msgs[i]->len)) {
+			return false;
+		}
+	}
+	return true;
+}
+#endif /* CONFIG_DCACHE */
+
 #endif
 
 static void i2c_ambiq_isr(const struct device *dev)
@@ -113,7 +166,8 @@ static void i2c_ambiq_isr(const struct device *dev)
 	k_sem_give(&data->transfer_sem);
 }
 
-static int i2c_ambiq_read(const struct device *dev, struct i2c_msg *msg, uint16_t addr)
+static int i2c_ambiq_read(const struct device *dev, struct i2c_msg *hdr_msg,
+			   struct i2c_msg *data_msg, uint16_t addr)
 {
 	struct i2c_ambiq_data *data = dev->data;
 
@@ -124,8 +178,19 @@ static int i2c_ambiq_read(const struct device *dev, struct i2c_msg *msg, uint16_
 	trans.ui8Priority = 1;
 	trans.eDirection = AM_HAL_IOM_RX;
 	trans.uPeerInfo.ui32I2CDevAddr = addr;
-	trans.ui32NumBytes = msg->len;
-	trans.pui32RxBuffer = (uint32_t *)msg->buf;
+	trans.ui32NumBytes = data_msg->len;
+	trans.pui32RxBuffer = (uint32_t *)data_msg->buf;
+	if (hdr_msg) {
+		if (hdr_msg->len > AM_HAL_IOM_MAX_OFFSETSIZE) {
+			return -E2BIG;
+		}
+#if defined(CONFIG_SOC_SERIES_APOLLO3X)
+		trans.ui32Instr = (*(uint32_t *)hdr_msg->buf) & (0xFFFFFFFF >> (32 - (hdr_msg->len * 8)));
+#else
+		trans.ui64Instr = (*(uint64_t *)hdr_msg->buf) & (0xFFFFFFFFFFFFFFFF >> (64 - (hdr_msg->len * 8)));
+#endif
+		trans.ui32InstrLen = hdr_msg->len;
+	}
 
 #ifdef CONFIG_I2C_AMBIQ_DMA
 	data->transfer_status = -EFAULT;
@@ -140,6 +205,10 @@ static int i2c_ambiq_read(const struct device *dev, struct i2c_msg *msg, uint16_
 		am_hal_iom_enable(data->iom_handler);
 		return -ETIMEDOUT;
 	}
+#if I2C_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED
+	/* Invalidate Dcache after DMA read */
+	sys_cache_data_invd_range((void *)trans.pui32RxBuffer, trans.ui32NumBytes);
+#endif /* I2C_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED */
 	ret = data->transfer_status;
 #else
 	ret = am_hal_iom_blocking_transfer(data->iom_handler, &trans);
@@ -147,7 +216,8 @@ static int i2c_ambiq_read(const struct device *dev, struct i2c_msg *msg, uint16_
 	return (ret != AM_HAL_STATUS_SUCCESS) ? -EIO : 0;
 }
 
-static int i2c_ambiq_write(const struct device *dev, struct i2c_msg *msg, uint16_t addr)
+static int i2c_ambiq_write(const struct device *dev, struct i2c_msg *hdr_msg,
+			   struct i2c_msg *data_msg, uint16_t addr)
 {
 	struct i2c_ambiq_data *data = dev->data;
 
@@ -158,11 +228,26 @@ static int i2c_ambiq_write(const struct device *dev, struct i2c_msg *msg, uint16
 	trans.ui8Priority = 1;
 	trans.eDirection = AM_HAL_IOM_TX;
 	trans.uPeerInfo.ui32I2CDevAddr = addr;
-	trans.ui32NumBytes = msg->len;
-	trans.pui32TxBuffer = (uint32_t *)msg->buf;
+	trans.ui32NumBytes = data_msg->len;
+	trans.pui32TxBuffer = (uint32_t *)data_msg->buf;
+	if (hdr_msg) {
+		if (hdr_msg->len > AM_HAL_IOM_MAX_OFFSETSIZE) {
+			return -E2BIG;
+		}
+#if defined(CONFIG_SOC_SERIES_APOLLO3X)
+		trans.ui32Instr = (*(uint32_t *)hdr_msg->buf) & (0xFFFFFFFF >> (32 - (hdr_msg->len * 8)));
+#else
+		trans.ui64Instr = (*(uint64_t *)hdr_msg->buf) & (0xFFFFFFFFFFFFFFFF >> (64 - (hdr_msg->len * 8)));
+#endif
+		trans.ui32InstrLen = hdr_msg->len;
+	}
 
 #ifdef CONFIG_I2C_AMBIQ_DMA
 	data->transfer_status = -EFAULT;
+#if I2C_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED
+	/* Clean Dcache before DMA write */
+	sys_cache_data_flush_range((void *)trans.pui32TxBuffer, trans.ui32NumBytes);
+#endif /* I2C_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED */
 	ret = am_hal_iom_nonblocking_transfer(data->iom_handler, &trans, i2c_ambiq_callback,
 					      (void *)dev);
 
@@ -206,7 +291,9 @@ static int i2c_ambiq_configure(const struct device *dev, uint32_t dev_config)
 	}
 
 #ifdef CONFIG_I2C_AMBIQ_DMA
-	data->iom_cfg.pNBTxnBuf = i2c_dma_tcb_buf[data->inst_idx].buf;
+	const struct i2c_ambiq_config *cfg = dev->config;
+
+	data->iom_cfg.pNBTxnBuf = i2c_dma_tcb_buf[cfg->inst_idx].buf;
 	data->iom_cfg.ui32NBTxnBufLength = CONFIG_I2C_DMA_TCB_BUFFER_SIZE;
 #endif
 
@@ -225,6 +312,12 @@ static int i2c_ambiq_transfer(const struct device *dev, struct i2c_msg *msgs, ui
 		return 0;
 	}
 
+#if defined(CONFIG_I2C_AMBIQ_DMA) && defined(CONFIG_DCACHE)
+	if (!i2c_buf_set_in_nocache(msgs, num_msgs)) {
+		return -EFAULT;
+	}
+#endif /* CONFIG_DCACHE */
+
 	i2c_ambiq_pm_policy_state_lock_get(dev);
 
 	/* Send out messages */
@@ -232,9 +325,16 @@ static int i2c_ambiq_transfer(const struct device *dev, struct i2c_msg *msgs, ui
 
 	for (int i = 0; i < num_msgs; i++) {
 		if (msgs[i].flags & I2C_MSG_READ) {
-			ret = i2c_ambiq_read(dev, &(msgs[i]), addr);
+			ret = i2c_ambiq_read(dev, NULL, &(msgs[i]), addr);
+		} else if ((i + 1) < num_msgs) {
+			if (msgs[i + 1].flags & I2C_MSG_READ) {
+				ret = i2c_ambiq_read(dev, &(msgs[i]), &(msgs[i + 1]), addr);
+			} else {
+				ret = i2c_ambiq_write(dev, &(msgs[i]), &(msgs[i + 1]), addr);
+			}
+			i++;
 		} else {
-			ret = i2c_ambiq_write(dev, &(msgs[i]), addr);
+			ret = i2c_ambiq_write(dev, NULL, &(msgs[i]), addr);
 		}
 
 		if (ret != 0) {
@@ -343,14 +443,12 @@ static int i2c_ambiq_init(const struct device *dev)
 
 	data->iom_cfg.eInterfaceMode = AM_HAL_IOM_I2C_MODE;
 
-	if (AM_HAL_STATUS_SUCCESS !=
-	    am_hal_iom_initialize((config->base - IOM0_BASE) / config->size,
-				  &data->iom_handler)) {
+	if (AM_HAL_STATUS_SUCCESS != am_hal_iom_initialize(config->inst_idx, &data->iom_handler)) {
 		LOG_ERR("Fail to initialize I2C\n");
 		return -ENXIO;
 	}
 
-	ret = config->pwr_func();
+	ret = am_hal_iom_power_ctrl(data->iom_handler, AM_HAL_SYSCTRL_WAKE, false);
 
 	ret |= i2c_ambiq_configure(dev, I2C_MODE_CONTROLLER | bitrate_cfg);
 	if (ret < 0) {
@@ -422,35 +520,26 @@ static int i2c_ambiq_pm_action(const struct device *dev, enum pm_device_action a
 
 #define AMBIQ_I2C_DEFINE(n)                                                                        \
 	PINCTRL_DT_INST_DEFINE(n);                                                                 \
-	static int pwr_on_ambiq_i2c_##n(void)                                                      \
-	{                                                                                          \
-		uint32_t addr = DT_REG_ADDR(DT_INST_PHANDLE(n, ambiq_pwrcfg)) +                    \
-				DT_INST_PHA(n, ambiq_pwrcfg, offset);                              \
-		sys_write32((sys_read32(addr) | DT_INST_PHA(n, ambiq_pwrcfg, mask)), addr);        \
-		k_busy_wait(PWRCTRL_MAX_WAIT_US);                                                  \
-		return 0;                                                                          \
-	}                                                                                          \
 	static void i2c_irq_config_func_##n(void)                                                  \
 	{                                                                                          \
-		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), i2c_ambiq_isr,              \
-			    DEVICE_DT_INST_GET(n), 0);                                             \
-		irq_enable(DT_INST_IRQN(n));                                                       \
+		IRQ_CONNECT(DT_IRQN(DT_INST_PARENT(n)), DT_IRQ(DT_INST_PARENT(n), priority),       \
+			    i2c_ambiq_isr, DEVICE_DT_INST_GET(n), 0);                              \
+		irq_enable(DT_IRQN(DT_INST_PARENT(n)));                                            \
 	};                                                                                         \
 	static struct i2c_ambiq_data i2c_ambiq_data##n = {                                         \
 		.bus_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.bus_sem, 1, 1),                     \
-		.transfer_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.transfer_sem, 0, 1),           \
-		.inst_idx = n,                                                                     \
-	};                                                                                         \
+		.transfer_sem = Z_SEM_INITIALIZER(i2c_ambiq_data##n.transfer_sem, 0, 1)};          \
 	static const struct i2c_ambiq_config i2c_ambiq_config##n = {                               \
-		.base = DT_INST_REG_ADDR(n),                                                       \
-		.size = DT_INST_REG_SIZE(n),                                                       \
+		.base = DT_REG_ADDR(DT_INST_PARENT(n)),                                            \
+		.size = DT_REG_SIZE(DT_INST_PARENT(n)),                                            \
+		.inst_idx =                                                                        \
+			(DT_REG_ADDR(DT_INST_PARENT(n)) - IOM0_BASE) / (IOM1_BASE - IOM0_BASE),    \
 		.bitrate = DT_INST_PROP(n, clock_frequency),                                       \
 		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                         \
 		.irq_config_func = i2c_irq_config_func_##n,                                        \
-		.pwr_func = pwr_on_ambiq_i2c_##n,                                                  \
-		IF_ENABLED(CONFIG_I2C_AMBIQ_BUS_RECOVERY,			\
-		(.scl = GPIO_DT_SPEC_INST_GET_OR(n, scl_gpios, {0}),\
-		 .sda = GPIO_DT_SPEC_INST_GET_OR(n, sda_gpios, {0}),)) };      \
+		IF_ENABLED(CONFIG_I2C_AMBIQ_BUS_RECOVERY,                                          \
+		(.scl = GPIO_DT_SPEC_INST_GET_OR(n, scl_gpios, {0}),                               \
+		 .sda = GPIO_DT_SPEC_INST_GET_OR(n, sda_gpios, {0}),)) };                          \
 	PM_DEVICE_DT_INST_DEFINE(n, i2c_ambiq_pm_action);                                          \
 	I2C_DEVICE_DT_INST_DEFINE(n, i2c_ambiq_init, PM_DEVICE_DT_INST_GET(n), &i2c_ambiq_data##n, \
 				  &i2c_ambiq_config##n, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,     \
diff --git a/drivers/i2c/i2c_cdns.c b/drivers/i2c/i2c_cdns.c
new file mode 100644
index 0000000000000..8738076997902
--- /dev/null
+++ b/drivers/i2c/i2c_cdns.c
@@ -0,0 +1,1081 @@
+/*
+ * Copyright (c) 2025 Advanced Micro Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
+
+LOG_MODULE_REGISTER(i2c_cadence, CONFIG_I2C_LOG_LEVEL);
+
+/* Register offsets for the I2C device. */
+#define CDNS_I2C_CR_OFFSET		0x00 /* Control Register, RW */
+#define CDNS_I2C_SR_OFFSET		0x04 /* Status Register, RO */
+#define CDNS_I2C_ADDR_OFFSET		0x08 /* I2C Address Register, RW */
+#define CDNS_I2C_DATA_OFFSET		0x0C /* I2C Data Register, RW */
+#define CDNS_I2C_ISR_OFFSET		0x10 /* IRQ Status Register, RW */
+#define CDNS_I2C_XFER_SIZE_OFFSET	0x14 /* Transfer Size Register, RW */
+#define CDNS_I2C_TIME_OUT_OFFSET	0x1C /* Time Out Register, RW */
+#define CDNS_I2C_IMR_OFFSET		0x20 /* IRQ Mask Register, RO */
+#define CDNS_I2C_IER_OFFSET		0x24 /* IRQ Enable Register, WO */
+#define CDNS_I2C_IDR_OFFSET		0x28 /* IRQ Disable Register, WO */
+#define CDNS_I2C_GFR_OFFSET		0x2C /* Glitch Filter Register, RW */
+
+/* Control Register Bit mask definitions */
+#define CDNS_I2C_CR_HOLD		BIT(4) /* Hold the I2C Bus */
+#define CDNS_I2C_CR_ACK_EN		BIT(3) /* Enables or disables acknowledgment */
+#define CDNS_I2C_CR_NEA			BIT(2) /* No Extended addressing */
+#define CDNS_I2C_CR_MS			BIT(1) /* 0 = Slave Mode, 1 = Master Mode */
+#define CDNS_I2C_CR_RW			BIT(0) /* Transfer Dir: 0 = Transmitter, 1 = Receiver */
+#define CDNS_I2C_CR_CLR_FIFO		BIT(6) /* Clears the FIFO on initialization */
+
+/* Master Enable Mask */
+#define CDNS_I2C_CR_MASTER_EN_MASK	(CDNS_I2C_CR_ACK_EN | \
+					 CDNS_I2C_CR_NEA | \
+					 CDNS_I2C_CR_MS)
+
+/* Dividers for clock generation */
+#define CDNS_I2C_CR_DIVA_SHIFT		14U
+#define CDNS_I2C_CR_DIVA_MASK		((uint32_t)3U << CDNS_I2C_CR_DIVA_SHIFT)
+#define CDNS_I2C_CR_DIVB_SHIFT		8U
+#define CDNS_I2C_CR_DIVB_MASK		((uint32_t)0x3f << CDNS_I2C_CR_DIVB_SHIFT)
+
+/* Status Register Bit mask definitions */
+#define CDNS_I2C_SR_BA			BIT(8) /* Bus is available */
+#define CDNS_I2C_SR_TXDV		BIT(6) /* Transmit data is valid */
+#define CDNS_I2C_SR_RXDV		BIT(5) /* Received data is valid */
+#define CDNS_I2C_SR_RXRW		BIT(3) /* Read or Write operation */
+
+/*
+ * I2C Address Register Bit mask definitions
+ * Normal addressing mode uses [6:0] bits.
+ * Extended addressing mode uses [9:0] bits.
+ * A write access to this register always initiates a transfer if the I2C is in master mode.
+ */
+#define CDNS_I2C_ADDR_MASK		0x000003FFU /* I2C Address Mask */
+
+/*
+ * I2C Interrupt Registers Bit mask definitions
+ * All the four interrupt registers (Status/Mask/Enable/Disable) have the same bit definitions.
+ */
+#define CDNS_I2C_IXR_ARB_LOST		BIT(9) /* Arbitration Lost Interrupt */
+#define CDNS_I2C_IXR_RX_UNF		BIT(7) /* RX FIFO Underflow Interrupt */
+#define CDNS_I2C_IXR_TX_OVF		BIT(6) /* TX FIFO Overflow Interrupt */
+#define CDNS_I2C_IXR_RX_OVF		BIT(5) /* RX FIFO Overflow Interrupt */
+#define CDNS_I2C_IXR_SLV_RDY		BIT(4) /* Slave Ready Interrupt */
+#define CDNS_I2C_IXR_TO			BIT(3) /* Timeout Interrupt */
+#define CDNS_I2C_IXR_NACK		BIT(2) /* NACK Interrupt */
+#define CDNS_I2C_IXR_DATA		BIT(1) /* Data Interrupt */
+#define CDNS_I2C_IXR_COMP		BIT(0) /* Transfer Complete Interrupt */
+
+/* All Interrupt Mask */
+#define CDNS_I2C_IXR_ALL_INTR_MASK	(CDNS_I2C_IXR_ARB_LOST | \
+					 CDNS_I2C_IXR_RX_UNF | \
+					 CDNS_I2C_IXR_TX_OVF | \
+					 CDNS_I2C_IXR_RX_OVF | \
+					 CDNS_I2C_IXR_SLV_RDY | \
+					 CDNS_I2C_IXR_TO | \
+					 CDNS_I2C_IXR_NACK | \
+					 CDNS_I2C_IXR_DATA | \
+					 CDNS_I2C_IXR_COMP)
+
+/* Error Interrupt Mask */
+#define CDNS_I2C_IXR_ERR_INTR_MASK	(CDNS_I2C_IXR_ARB_LOST | \
+					 CDNS_I2C_IXR_RX_UNF | \
+					 CDNS_I2C_IXR_TX_OVF | \
+					 CDNS_I2C_IXR_RX_OVF | \
+					 CDNS_I2C_IXR_NACK)
+
+/* Enabled Interrupt Mask */
+#define CDNS_I2C_ENABLED_INTR_MASK	(CDNS_I2C_IXR_ARB_LOST | \
+					 CDNS_I2C_IXR_RX_UNF | \
+					 CDNS_I2C_IXR_TX_OVF | \
+					 CDNS_I2C_IXR_RX_OVF | \
+					 CDNS_I2C_IXR_NACK | \
+					 CDNS_I2C_IXR_DATA | \
+					 CDNS_I2C_IXR_COMP)
+
+/* System clock frequency for I2C ticks */
+#define CDNS_I2C_TICKS_PER_SEC		CONFIG_SYS_CLOCK_TICKS_PER_SEC
+
+/* Default timeout ticks for I2C operations */
+#define CDNS_I2C_TIMEOUT_TICKS		CDNS_I2C_TICKS_PER_SEC
+
+#define CDNS_I2C_MAX_TRANSFER_SIZE	255U /* Maximum transfer size for I2C data */
+
+/* Default transfer size */
+#define CDNS_I2C_TRANSFER_SIZE_DEFAULT	(CDNS_I2C_MAX_TRANSFER_SIZE - 3U)
+
+/* Maximum dividers for I2C clock */
+#define CDNS_I2C_DIVA_MAX		4U
+#define CDNS_I2C_DIVB_MAX		64U
+#define CDNS_I2C_CLK_DIV_FACTOR		22U
+
+#define CDNS_I2C_TIMEOUT_MAX		  0xFFU /* Maximum value for Timeout Register */
+#define CDNS_I2C_POLL_US		100000U /* Polling interval in microseconds */
+#define CDNS_I2C_TIMEOUT_US		500000U /* Timeout value for I2C operations */
+
+/* Event flag for I2C transfer completion */
+#define I2C_XFER_COMPLETION_EVENT	BIT(0)
+
+/**
+ * struct cdns_i2c_config - Cadence I2C device private constant structure
+ * @irq_config_func: function pointer to configure I2C IRQ
+ */
+struct cdns_i2c_config {
+	void (*irq_config_func)(void);
+};
+
+/**
+ * struct cdns_i2c_data - Cadence I2C device private data structure
+ * @membase: Base address of the I2C device.
+ * @ctrl_reg: Cached value of the control register.
+ * @input_clk: Input clock to I2C controller.
+ * @i2c_clk: Actual I2C clock speed.
+ * @fifo_depth: The depth of the transfer FIFO.
+ * @transfer_size: The maximum number of bytes in one transfer.
+ * @bus_hold_flag: Flag used in repeated start for clearing HOLD bit.
+ * @xfer_done: Transfer complete event.
+ * @err_status: Error status in Interrupt Status Register.
+ * @p_msg: Message pointer for I2C communication.
+ * @p_send_buf:	Pointer to transmit buffer.
+ * @p_recv_buf:	Pointer to receive buffer.
+ * @send_count:	Number of bytes still expected to send.
+ * @recv_count:	Number of bytes still expected to receive.
+ * @curr_recv_count: Number of bytes to be received in current transfer.
+ * @bus_mutex: Mutex for bus access synchronization
+ */
+struct cdns_i2c_data {
+	mem_addr_t membase;
+	uint32_t ctrl_reg;
+	uint32_t input_clk;
+	uint32_t i2c_clk;
+	uint32_t fifo_depth;
+	uint32_t transfer_size;
+	uint32_t bus_hold_flag;
+
+	struct k_event xfer_done;
+	uint32_t err_status;
+	struct i2c_msg *p_msg;
+	uint8_t *p_send_buf;
+	uint8_t *p_recv_buf;
+	uint32_t send_count;
+	uint32_t recv_count;
+	uint32_t curr_recv_count;
+
+	struct k_mutex bus_mutex;
+};
+
+/**
+ * cdns_i2c_writereg - Write a 32-bit value to a specific offset in the I2C register space.
+ * @i2c_bus: Pointer to the I2C data structure.
+ * @value: The 32-bit value to write to the register.
+ * @offset: The offset in the I2C register space where the value will be written.
+ */
+static inline void cdns_i2c_writereg(const struct cdns_i2c_data *i2c_bus,
+				     uint32_t value, uintptr_t offset)
+{
+	uintptr_t reg_address = (uintptr_t)(i2c_bus->membase) + offset;
+
+	sys_write32(value, reg_address);
+}
+
+/**
+ * cdns_i2c_readreg - Read a 32-bit value from a specific offset in the I2C register space.
+ * @i2c_bus: Pointer to the I2C data structure.
+ * @offset: The offset in the I2C register space from which the value will be read.
+ *
+ * Return: The 32-bit value read from the register.
+ */
+static inline uint32_t cdns_i2c_readreg(const struct cdns_i2c_data *i2c_bus, uintptr_t offset)
+{
+	uintptr_t reg_address = (uintptr_t)(i2c_bus->membase) + offset;
+
+	return sys_read32(reg_address);
+}
+
+/**
+ * cdns_i2c_enable_peripheral - Enable the Cadence I2C controller
+ * @i2c_bus: Pointer to the device's private data structure for the I2C controller
+ */
+static void cdns_i2c_enable_peripheral(struct cdns_i2c_data *i2c_bus)
+{
+	cdns_i2c_writereg(i2c_bus, i2c_bus->ctrl_reg, CDNS_I2C_CR_OFFSET);
+
+	/*
+	 * Cadence I2C controller has a bug causing invalid reads after a timeout
+	 * in master receiver mode. While the timeout feature is disabled,
+	 * writing the max value to the timeout register reduces the issue.
+	 */
+	cdns_i2c_writereg(i2c_bus, CDNS_I2C_TIMEOUT_MAX, CDNS_I2C_TIME_OUT_OFFSET);
+}
+
+/**
+ * cdns_i2c_calc_divs - Calculate clock dividers for I2C frequency
+ * @f: Pointer to the I2C target frequency (input/output)
+ * @input_clk: Input clock frequency in Hz
+ * @a: Pointer to the first divider (output)
+ * @b: Pointer to the second divider (output)
+ *
+ * On entry, @f holds the target I2C frequency. On exit, @f will hold the
+ * actual I2C frequency generated by the calculated dividers.
+ *
+ * Return: 0 on success, negative errno otherwise.
+ */
+static int32_t cdns_i2c_calc_divs(uint32_t *f, uint32_t input_clk,
+				  uint32_t *a, uint32_t *b)
+{
+	uint32_t fscl = *f;
+	uint32_t best_fscl = *f;
+	uint32_t actual_fscl, temp;
+	uint32_t div_a, div_b;
+	uint32_t calc_div_a = 0, calc_div_b = 0;
+	uint32_t last_error, current_error;
+	int32_t ret = 0;
+
+	/* calculate initial estimate for divisor_a and divisor_b */
+	temp = input_clk / (CDNS_I2C_CLK_DIV_FACTOR * fscl);
+
+	/* Check if the calculated value is out of range */
+	if ((temp == 0U) || (temp > (CDNS_I2C_DIVA_MAX * CDNS_I2C_DIVB_MAX))) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* Initialize the last error to a large value (no error yet) */
+	last_error = UINT32_MAX;
+
+	/* Iterate over possible values for divisor_a */
+	for (div_a = 0; div_a < CDNS_I2C_DIVA_MAX; div_a++) {
+		/* Calculate the corresponding divisor_b for this div_a */
+		div_b = DIV_ROUND_UP(input_clk, CDNS_I2C_CLK_DIV_FACTOR * fscl * (div_a + 1U));
+
+		/* Skip invalid values of div_b */
+		if ((div_b < 1U) || (div_b > CDNS_I2C_DIVB_MAX)) {
+			continue;
+		}
+
+		/* Adjust div_b for zero-based indexing */
+		div_b--;
+
+		/* Calculate the actual fscl based on the current divisors */
+		actual_fscl = input_clk / (CDNS_I2C_CLK_DIV_FACTOR * (div_a + 1U) * (div_b + 1U));
+
+		/* Skip if the actual fscl exceeds the target fscl */
+		if (actual_fscl > fscl) {
+			continue;
+		}
+
+		/* Calculate the error between the target fscl and the actual fscl */
+		current_error = fscl - actual_fscl;
+
+		/* Update the best divisors if a smaller error is found */
+		if (last_error > current_error) {
+			calc_div_a = div_a;
+			calc_div_b = div_b;
+			best_fscl = actual_fscl;
+			last_error = current_error;
+		}
+	}
+
+	/* Set the output values */
+	*a = calc_div_a;
+	*b = calc_div_b;
+	*f = best_fscl;
+
+out:
+	return ret;
+}
+
+/**
+ * cdns_i2c_setclk - Set the serial clock rate for the I2C device
+ * @i2c_bus: Pointer to the I2C data structure
+ * @req_i2c_speed: requested I2C clock frequency in Hz
+ *
+ * This function sets the serial clock rate for the I2C device by configuring
+ * the clock divisors in the device's control register. The device must be idle
+ * (i.e., not actively transferring data) before calling this function.
+ *
+ * The clock rate is determined by the following formula:
+ *	Fscl = Fpclk / (22 * (divisor_a + 1) * (divisor_b + 1))
+ * Where:
+ *	- Fscl is the desired I2C clock rate
+ *	- Fpclk is the input clock frequency
+ *	- divisor_a and divisor_b are the calculated divisors to achieve the desired clock rate
+ *
+ * The serial clock rate cannot exceed the input clock divided by 22. Common I2C clock
+ * rates are 100 KHz and 400 KHz.
+ *
+ * Return: 0 on success, negative error code on failure
+ */
+static int32_t cdns_i2c_setclk(struct cdns_i2c_data *i2c_bus, uint32_t req_i2c_speed)
+{
+	uint32_t div_a, div_b;
+	uint32_t ctrl_reg;
+	int32_t ret = 0;
+	uint32_t fscl = req_i2c_speed;
+
+	/* Calculate the divider values */
+	ret = cdns_i2c_calc_divs(&fscl, i2c_bus->input_clk, &div_a, &div_b);
+	if (ret != 0) {
+		goto out;
+	}
+	i2c_bus->i2c_clk = fscl; /* Update true SCL value */
+
+	/* Set new divider values in the control register */
+	ctrl_reg = i2c_bus->ctrl_reg;
+	ctrl_reg &= ~(CDNS_I2C_CR_DIVA_MASK | CDNS_I2C_CR_DIVB_MASK);
+	ctrl_reg |= ((div_a << CDNS_I2C_CR_DIVA_SHIFT) |
+		     (div_b << CDNS_I2C_CR_DIVB_SHIFT));
+	i2c_bus->ctrl_reg = ctrl_reg;
+	cdns_i2c_writereg(i2c_bus, ctrl_reg, CDNS_I2C_CR_OFFSET);
+
+out:
+	return ret;
+}
+
+/**
+ * cdns_i2c_configure - Configures the I2C bus speed and initializes the I2C peripheral
+ * @dev: Pointer to the device structure representing the I2C bus
+ * @dev_config: Configuration value containing the desired I2C bus speed
+ *
+ * This function configures the I2C bus speed based on the value provided in @dev_config
+ * It then sets the appropriate clock for the I2C bus, verifies the clock is valid, and
+ * initializes the I2C peripheral. The configuration is saved to the device's data structure.
+ *
+ * Return: 0 on success, negative error value on failure
+ */
+static int32_t cdns_i2c_configure(const struct device *dev, uint32_t dev_config)
+{
+	int32_t ret = 0;
+	struct cdns_i2c_data *i2c_bus = (struct cdns_i2c_data *)dev->data;
+	uint32_t i2c_speed = 0U;
+
+	(void)k_mutex_lock(&i2c_bus->bus_mutex, K_FOREVER);
+
+	/* Check requested I2C Speed */
+	switch (I2C_SPEED_GET(dev_config)) {
+	case I2C_SPEED_STANDARD:
+		i2c_speed = I2C_BITRATE_STANDARD; /* 100 KHz */
+		break;
+	case I2C_SPEED_FAST:
+		i2c_speed = I2C_BITRATE_FAST; /* 400 KHz */
+		break;
+	case I2C_SPEED_FAST_PLUS:
+		i2c_speed = I2C_BITRATE_FAST_PLUS; /* 1 MHz */
+		break;
+	default:
+		LOG_ERR("Unsupported I2C speed requested: %u", i2c_speed);
+		ret = -ERANGE;
+		goto out;
+	}
+
+	/* Set I2C Speed (SCL frequency) */
+	ret = cdns_i2c_setclk(i2c_bus, i2c_speed);
+	if (ret != 0) {
+		LOG_ERR("Invalid SCL clock: %u Hz", i2c_speed);
+		ret = -EIO;
+		goto out;
+	}
+
+	/* Enable the I2C peripheral */
+	i2c_bus->ctrl_reg |= CDNS_I2C_CR_MASTER_EN_MASK;
+	cdns_i2c_enable_peripheral(i2c_bus);
+
+out:
+	(void)k_mutex_unlock(&i2c_bus->bus_mutex);
+
+	return ret;
+}
+
+/**
+ * cdns_i2c_get_config - Retrieve the current I2C configuration.
+ * @dev: Pointer to the device structure.
+ * @dev_config: Pointer to a variable where the configuration will be stored.
+ *
+ * Return: 0 on success, or a negative error code on failure.
+ */
+static int32_t cdns_i2c_get_config(const struct device *dev, uint32_t *dev_config)
+{
+	int32_t ret = 0;
+	struct cdns_i2c_data *i2c_bus = (struct cdns_i2c_data *)dev->data;
+	uint32_t bus_speed = i2c_bus->i2c_clk;
+	uint32_t speed_cfg = 0U;
+
+	/* Retrieve Speed configuration from Actual Bus Speed */
+	if ((bus_speed > 0U) && (bus_speed <= I2C_BITRATE_STANDARD)) {
+		speed_cfg = I2C_SPEED_SET(I2C_SPEED_STANDARD);
+	} else if ((bus_speed > I2C_BITRATE_STANDARD) &&
+		   (bus_speed <= I2C_BITRATE_FAST)) {
+		speed_cfg = I2C_SPEED_SET(I2C_SPEED_FAST);
+	} else if ((bus_speed > I2C_BITRATE_FAST) &&
+		   (bus_speed <= I2C_BITRATE_FAST_PLUS)) {
+		speed_cfg = I2C_SPEED_SET(I2C_SPEED_FAST_PLUS);
+	} else {
+		ret = -ERANGE;
+		goto out;
+	}
+
+	/* Return current configuration */
+	*dev_config = (speed_cfg | I2C_MODE_CONTROLLER);
+
+out:
+	return ret;
+}
+
+/**
+ * cdns_i2c_clear_bus_hold - Clear bus hold bit in the controller's register
+ * @i2c_bus: Pointer to the I2C controller driver data structure
+ */
+static void cdns_i2c_clear_bus_hold(struct cdns_i2c_data *i2c_bus)
+{
+	uint32_t reg = cdns_i2c_readreg(i2c_bus, CDNS_I2C_CR_OFFSET);
+
+	if ((reg & CDNS_I2C_CR_HOLD) == CDNS_I2C_CR_HOLD) {
+		cdns_i2c_writereg(i2c_bus, reg & ~CDNS_I2C_CR_HOLD, CDNS_I2C_CR_OFFSET);
+	}
+}
+
+/**
+ * cdns_is_fifo_hold_quirk - Check if the FIFO hold quirk is triggered for I2C
+ * @i2c_bus: Pointer to the I2C controller driver data structure
+ * @hold_wrkaround: Boolean indicating if hold workarounds should be applied
+ *
+ * Return: True if the quirk condition is met, false otherwise.
+ */
+static inline bool cdns_is_fifo_hold_quirk(const struct cdns_i2c_data *i2c_bus,
+					   bool hold_wrkaround)
+{
+	return (hold_wrkaround && (i2c_bus->curr_recv_count == (i2c_bus->fifo_depth + 1U)));
+}
+
+/**
+ * cdns_i2c_master_handle_receive_interrupt - Handles I2C master receive interrupts
+ * @i2c_bus: Pointer to the I2C data structure
+ * @isr_status: Interrupt status, indicating the cause of the interrupt
+ */
+static void cdns_i2c_master_handle_receive_interrupt(struct cdns_i2c_data *i2c_bus,
+						     uint32_t isr_status)
+{
+	uint32_t transfer_size;
+	uint32_t xfer_size;
+
+	/* Handle reception interrupt (data available or transfer complete) */
+	if (((isr_status & CDNS_I2C_IXR_COMP) == 0U) && ((isr_status & CDNS_I2C_IXR_DATA) == 0U)) {
+		return;
+	}
+
+	/* Receiving Data: Keep reading as long as data is available */
+	while ((cdns_i2c_readreg(i2c_bus, CDNS_I2C_SR_OFFSET) & CDNS_I2C_SR_RXDV) != 0U) {
+		/* Ensure there's space to store received data */
+		if (i2c_bus->recv_count > 0U) {
+			*(i2c_bus->p_recv_buf) = (uint8_t)cdns_i2c_readreg(i2c_bus,
+									   CDNS_I2C_DATA_OFFSET);
+			i2c_bus->p_recv_buf++;
+			i2c_bus->recv_count--;
+			i2c_bus->curr_recv_count--;
+		} else {
+			/* Handle receive buffer overflow or unexpected condition */
+			LOG_ERR("I2C receive buffer overflow. Transfer aborted!");
+			i2c_bus->err_status |= CDNS_I2C_IXR_TO;
+			break;
+		}
+
+		/* Handle issues with receiving more data than expected */
+		if (cdns_is_fifo_hold_quirk(i2c_bus,
+					i2c_bus->recv_count > i2c_bus->curr_recv_count)) {
+			break;
+		}
+	}
+
+	/* Workaround for large data receive in case of FIFO space issues */
+	if (cdns_is_fifo_hold_quirk(i2c_bus, i2c_bus->recv_count > i2c_bus->curr_recv_count)) {
+		transfer_size = i2c_bus->recv_count - i2c_bus->fifo_depth;
+
+		if (transfer_size > i2c_bus->transfer_size) {
+			xfer_size = i2c_bus->transfer_size;
+		} else {
+			xfer_size = transfer_size;
+		}
+
+		/* Busy-wait until FIFO has space for more data */
+		while (cdns_i2c_readreg(i2c_bus, CDNS_I2C_XFER_SIZE_OFFSET) !=
+		       (i2c_bus->curr_recv_count - i2c_bus->fifo_depth)) {
+		}
+
+		/* Update the transfer size for the next batch of data */
+		cdns_i2c_writereg(i2c_bus, xfer_size, CDNS_I2C_XFER_SIZE_OFFSET);
+		i2c_bus->curr_recv_count = xfer_size + i2c_bus->fifo_depth;
+	}
+
+	/* Complete transfer if all data has been received and no more data is expected */
+	if (((isr_status & CDNS_I2C_IXR_COMP) == CDNS_I2C_IXR_COMP) &&
+	    (i2c_bus->recv_count == 0U)) {
+		/* Release bus hold if no longer needed */
+		if (i2c_bus->bus_hold_flag == 0U) {
+			cdns_i2c_clear_bus_hold(i2c_bus);
+		}
+		/* Notify completion of the transfer */
+		(void)k_event_post(&i2c_bus->xfer_done, I2C_XFER_COMPLETION_EVENT);
+	}
+}
+
+/**
+ * cdns_i2c_master_handle_transmit_interrupt - Handles I2C master transmit interrupts
+ * @i2c_bus: Pointer to the I2C data structure
+ * @isr_status: Interrupt status, indicating the cause of the interrupt
+ */
+static void cdns_i2c_master_handle_transmit_interrupt(struct cdns_i2c_data *i2c_bus,
+						      uint32_t isr_status)
+{
+	uint32_t avail_bytes;
+	uint32_t bytes_to_send;
+
+	/* Handle transmission interrupt (data sent or transfer complete) */
+	if ((isr_status & CDNS_I2C_IXR_COMP) == 0U) {
+		return;
+	}
+
+	/* Sending data: Check if there is any data left to send */
+	if (i2c_bus->send_count > 0U) {
+		/* Calculate how many bytes can be sent based on FIFO availability */
+		avail_bytes = i2c_bus->fifo_depth - cdns_i2c_readreg(i2c_bus,
+								     CDNS_I2C_XFER_SIZE_OFFSET);
+
+		if (i2c_bus->send_count > avail_bytes) {
+			bytes_to_send = avail_bytes;
+		} else {
+			bytes_to_send = i2c_bus->send_count;
+		}
+
+		/* Write data to the I2C data register */
+		while (bytes_to_send > 0U) {
+			cdns_i2c_writereg(i2c_bus, *(i2c_bus->p_send_buf), CDNS_I2C_DATA_OFFSET);
+			i2c_bus->p_send_buf++;
+			i2c_bus->send_count--;
+			bytes_to_send--;
+		}
+	} else {
+		/* If there is no data to send, signal transfer completion */
+		(void)k_event_post(&i2c_bus->xfer_done, I2C_XFER_COMPLETION_EVENT);
+	}
+
+	/* Clear bus hold if no more data is pending */
+	if ((i2c_bus->send_count == 0U) && (i2c_bus->bus_hold_flag == 0U)) {
+		cdns_i2c_clear_bus_hold(i2c_bus);
+	}
+}
+
+/**
+ * cdns_i2c_master_isr - Interrupt handler for the I2C device in master role
+ * @i2c_bus: Pointer to I2C device private data structure
+ *
+ * This function handles various interrupt events including data received,
+ * transfer complete, and error interrupts for the I2C master role.
+ */
+static void cdns_i2c_master_isr(struct cdns_i2c_data *i2c_bus)
+{
+	uint32_t isr_status;
+
+	/* Read the interrupt status register */
+	isr_status = cdns_i2c_readreg(i2c_bus, CDNS_I2C_ISR_OFFSET);
+
+	/* Clear interrupt status */
+	cdns_i2c_writereg(i2c_bus, isr_status, CDNS_I2C_ISR_OFFSET);
+
+	/* Update the error status based on interrupt flags */
+	i2c_bus->err_status = isr_status & CDNS_I2C_IXR_ERR_INTR_MASK;
+
+	/* Handling NACK or arbitration lost interrupts */
+	if ((isr_status & (CDNS_I2C_IXR_NACK | CDNS_I2C_IXR_ARB_LOST)) != 0U) {
+		(void)k_event_post(&i2c_bus->xfer_done, I2C_XFER_COMPLETION_EVENT);
+		return;
+	}
+
+	/* Handle reception interrupt */
+	if (i2c_bus->p_recv_buf != NULL) {
+		cdns_i2c_master_handle_receive_interrupt(i2c_bus, isr_status);
+	}
+
+	/* Handle transmission interrupt */
+	if (i2c_bus->p_recv_buf == NULL) {
+		cdns_i2c_master_handle_transmit_interrupt(i2c_bus, isr_status);
+	}
+}
+
+/**
+ * cdns_i2c_isr - Interrupt handler for the I2C controller
+ * @dev: Pointer to I2C device
+ */
+static void cdns_i2c_isr(const struct device *dev)
+{
+	struct cdns_i2c_data *i2c_bus = (struct cdns_i2c_data *)dev->data;
+
+	/* Handle the interrupt for master mode */
+	cdns_i2c_master_isr(i2c_bus);
+}
+
+/**
+ * cdns_i2c_mrecv - Prepare and start a master receive operation
+ * @i2c_bus: Pointer to the I2C data structure
+ * @msg_addr: The address of the slave device to receive data from
+ */
+static void cdns_i2c_mrecv(struct cdns_i2c_data *i2c_bus, uint16_t msg_addr)
+{
+	uint32_t ctrl_reg;
+	uint32_t isr_status;
+	bool hold_clear = false;
+	uint32_t addr;
+
+	/* Initialize the receive buffer and count */
+	i2c_bus->p_recv_buf = i2c_bus->p_msg->buf;
+	i2c_bus->recv_count = i2c_bus->p_msg->len;
+	i2c_bus->curr_recv_count = i2c_bus->recv_count;
+
+	/* Prepare controller for master receive mode and clear FIFO */
+	ctrl_reg = cdns_i2c_readreg(i2c_bus, CDNS_I2C_CR_OFFSET);
+	ctrl_reg |= CDNS_I2C_CR_RW | CDNS_I2C_CR_CLR_FIFO;
+
+	/* Check if the message size exceeds FIFO depth, hold the bus if true */
+	if (i2c_bus->recv_count > i2c_bus->fifo_depth) {
+		ctrl_reg |= CDNS_I2C_CR_HOLD;
+	}
+
+	cdns_i2c_writereg(i2c_bus, ctrl_reg, CDNS_I2C_CR_OFFSET);
+
+	/* Clear the interrupts in interrupt status register */
+	isr_status = cdns_i2c_readreg(i2c_bus, CDNS_I2C_ISR_OFFSET);
+	cdns_i2c_writereg(i2c_bus, isr_status, CDNS_I2C_ISR_OFFSET);
+
+	/* Set transfer size register and enable interrupts */
+	if ((i2c_bus->recv_count) > (i2c_bus->transfer_size)) {
+		cdns_i2c_writereg(i2c_bus, i2c_bus->transfer_size,
+				  CDNS_I2C_XFER_SIZE_OFFSET);
+		i2c_bus->curr_recv_count = i2c_bus->transfer_size;
+	} else {
+		cdns_i2c_writereg(i2c_bus, i2c_bus->recv_count, CDNS_I2C_XFER_SIZE_OFFSET);
+	}
+
+	/* Determine whether to clear the hold bit based on conditions */
+	if ((i2c_bus->bus_hold_flag == 0U) && (i2c_bus->recv_count <= i2c_bus->fifo_depth)) {
+		if ((ctrl_reg & CDNS_I2C_CR_HOLD) != 0U) {
+			hold_clear = true;
+		}
+	}
+
+	/* Mask address and prepare for I2C communication */
+	addr = msg_addr;
+	addr &= CDNS_I2C_ADDR_MASK;
+
+	/* Handle clearing of the hold bit */
+	if (hold_clear) {
+		ctrl_reg &= ~CDNS_I2C_CR_HOLD;
+		ctrl_reg &= ~CDNS_I2C_CR_CLR_FIFO;
+
+		/* Write the address and control register values */
+		cdns_i2c_writereg(i2c_bus, addr, CDNS_I2C_ADDR_OFFSET);
+		cdns_i2c_writereg(i2c_bus, ctrl_reg, CDNS_I2C_CR_OFFSET);
+		/* Read back to ensure write completion */
+		(void)cdns_i2c_readreg(i2c_bus, CDNS_I2C_CR_OFFSET);
+	} else {
+		/* Directly write the address if no need to clear the hold bit */
+		cdns_i2c_writereg(i2c_bus, addr, CDNS_I2C_ADDR_OFFSET);
+	}
+
+	/* Enable interrupts */
+	cdns_i2c_writereg(i2c_bus, CDNS_I2C_ENABLED_INTR_MASK, CDNS_I2C_IER_OFFSET);
+}
+
+/**
+ * cdns_i2c_msend - Prepare and start a master send operation
+ * @i2c_bus: Pointer to the I2C data structure
+ * @msg_addr: I2C address of the slave to communicate with
+ */
+static void cdns_i2c_msend(struct cdns_i2c_data *i2c_bus, uint16_t msg_addr)
+{
+	uint32_t avail_bytes;
+	uint32_t bytes_to_send;
+	uint32_t ctrl_reg;
+	uint32_t isr_status;
+
+	/* Initialize send buffer and update send count */
+	i2c_bus->p_recv_buf = NULL;
+	i2c_bus->p_send_buf = i2c_bus->p_msg->buf;
+	i2c_bus->send_count = i2c_bus->p_msg->len;
+
+	/* Configure the controller in Master transmit mode and clear FIFO. */
+	ctrl_reg = cdns_i2c_readreg(i2c_bus, CDNS_I2C_CR_OFFSET);
+	ctrl_reg &= ~CDNS_I2C_CR_RW;
+	ctrl_reg |= CDNS_I2C_CR_CLR_FIFO;
+
+	/* Check if the message size exceeds FIFO depth, hold the bus if true */
+	if (i2c_bus->send_count > i2c_bus->fifo_depth) {
+		ctrl_reg |= CDNS_I2C_CR_HOLD;
+	}
+	cdns_i2c_writereg(i2c_bus, ctrl_reg, CDNS_I2C_CR_OFFSET);
+
+	/* Clear any previous interrupt flags */
+	isr_status = cdns_i2c_readreg(i2c_bus, CDNS_I2C_ISR_OFFSET);
+	cdns_i2c_writereg(i2c_bus, isr_status, CDNS_I2C_ISR_OFFSET);
+
+	/* Calculate available FIFO space and determine how many bytes to send */
+	avail_bytes = i2c_bus->fifo_depth - cdns_i2c_readreg(i2c_bus, CDNS_I2C_XFER_SIZE_OFFSET);
+	bytes_to_send = (i2c_bus->send_count > avail_bytes) ? avail_bytes : i2c_bus->send_count;
+
+	/* Send data to FIFO until all bytes are transmitted */
+	while (bytes_to_send > 0U) {
+		cdns_i2c_writereg(i2c_bus, (*(i2c_bus->p_send_buf)), CDNS_I2C_DATA_OFFSET);
+		(i2c_bus->p_send_buf)++;
+		i2c_bus->send_count--;
+		bytes_to_send--;
+	}
+
+	/* Clear the 'hold bus' flag if there's no more data and it's the last message */
+	if ((i2c_bus->bus_hold_flag == 0U) && (i2c_bus->send_count == 0U)) {
+		cdns_i2c_clear_bus_hold(i2c_bus);
+	}
+
+	/* Set the slave address to trigger operation. */
+	cdns_i2c_writereg(i2c_bus, ((uint32_t)msg_addr & CDNS_I2C_ADDR_MASK),
+				   CDNS_I2C_ADDR_OFFSET);
+
+	/* Enable interrupts after data transmission starts */
+	cdns_i2c_writereg(i2c_bus, CDNS_I2C_ENABLED_INTR_MASK, CDNS_I2C_IER_OFFSET);
+}
+
+/**
+ * cdns_i2c_master_reset - Reset the I2C master interface
+ * @i2c_bus: Pointer to the i2c driver instance
+ *
+ * This function performs a full reset of the I2C master interface
+ * The reset ensures that the interface is returned to a known idle state.
+ */
+static void cdns_i2c_master_reset(struct cdns_i2c_data *i2c_bus)
+{
+	uint32_t regval;
+
+	/* Disable the interrupts */
+	cdns_i2c_writereg(i2c_bus, CDNS_I2C_IXR_ALL_INTR_MASK, CDNS_I2C_IDR_OFFSET);
+
+	/* Clear the hold bit and flush FIFOs */
+	regval = cdns_i2c_readreg(i2c_bus, CDNS_I2C_CR_OFFSET);
+	regval &= ~CDNS_I2C_CR_HOLD;
+	regval |= CDNS_I2C_CR_CLR_FIFO;
+	cdns_i2c_writereg(i2c_bus, regval, CDNS_I2C_CR_OFFSET);
+
+	/* Reset transfer count register to zero */
+	cdns_i2c_writereg(i2c_bus, 0, CDNS_I2C_XFER_SIZE_OFFSET);
+
+	/* Clear the interrupt status register */
+	regval = cdns_i2c_readreg(i2c_bus, CDNS_I2C_ISR_OFFSET);
+	cdns_i2c_writereg(i2c_bus, regval, CDNS_I2C_ISR_OFFSET);
+
+	/* Clear the status register */
+	regval = cdns_i2c_readreg(i2c_bus, CDNS_I2C_SR_OFFSET);
+	cdns_i2c_writereg(i2c_bus, regval, CDNS_I2C_SR_OFFSET);
+}
+
+/**
+ * cdns_i2c_process_msg - Processes an I2C message on the specified I2C bus
+ * @i2c_bus: Pointer to the I2C data structure
+ * @msg: Pointer to the I2C message to be processed
+ * @addr: The 7-bit or 10-bit I2C address of the slave device
+ *
+ * Return: 0 on success, negative error code on failure.
+ */
+static int32_t cdns_i2c_process_msg(struct cdns_i2c_data *i2c_bus, struct i2c_msg *msg,
+				    uint16_t addr)
+{
+	int32_t ret = 0;
+	uint32_t reg;
+	k_timeout_t msg_timeout;
+	uint32_t events;
+
+	/* Initialize message processing state */
+	i2c_bus->p_msg = msg;
+	i2c_bus->err_status = 0U;
+	(void)k_event_clear(&i2c_bus->xfer_done, (uint32_t)I2C_XFER_COMPLETION_EVENT);
+
+	/* Handle 10-bit addressing mode */
+	reg = cdns_i2c_readreg(i2c_bus, CDNS_I2C_CR_OFFSET);
+	if ((msg->flags & I2C_MSG_ADDR_10_BITS) != 0U) {
+		/* Enable 10-bit address mode if not already enabled */
+		if ((reg & CDNS_I2C_CR_NEA) == CDNS_I2C_CR_NEA) {
+			cdns_i2c_writereg(i2c_bus,
+					reg & ~CDNS_I2C_CR_NEA,
+					CDNS_I2C_CR_OFFSET);
+		}
+	} else {
+		/* Disable 10-bit address mode if currently enabled */
+		if ((reg & CDNS_I2C_CR_NEA) == 0U) {
+			cdns_i2c_writereg(i2c_bus,
+					reg | CDNS_I2C_CR_NEA,
+					CDNS_I2C_CR_OFFSET);
+		}
+	}
+
+	/* Handle read/write flag and perform the appropriate action */
+	if ((msg->flags & I2C_MSG_READ) != 0U) {
+		cdns_i2c_mrecv(i2c_bus, addr); /* Receive data */
+	} else {
+		cdns_i2c_msend(i2c_bus, addr); /* Send data */
+	}
+
+	/* Calculate the minimal timeout based on message length */
+	msg_timeout.ticks = (((k_ticks_t)(msg->len) * 8)*(CDNS_I2C_TICKS_PER_SEC)) /
+			     ((k_ticks_t)(i2c_bus->i2c_clk));
+	msg_timeout.ticks += (CDNS_I2C_TICKS_PER_SEC / 2);
+	if (msg_timeout.ticks < CDNS_I2C_TIMEOUT_TICKS) {
+		msg_timeout.ticks = CDNS_I2C_TIMEOUT_TICKS;
+	}
+
+	/* Wait for the completion signal or timeout */
+	events = k_event_wait(&i2c_bus->xfer_done, (uint32_t)I2C_XFER_COMPLETION_EVENT,
+			      false, msg_timeout);
+	if ((events & I2C_XFER_COMPLETION_EVENT) == 0U) {
+		/* Timeout occurred, reset the master */
+		cdns_i2c_master_reset(i2c_bus);
+		ret = -ETIMEDOUT;
+		goto out;
+	}
+
+	/* Disable interrupt masking for the current transfer */
+	cdns_i2c_writereg(i2c_bus, CDNS_I2C_IXR_ALL_INTR_MASK, CDNS_I2C_IDR_OFFSET);
+
+	/* If it is bus arbitration error, try again */
+	if ((i2c_bus->err_status & CDNS_I2C_IXR_ARB_LOST) == CDNS_I2C_IXR_ARB_LOST) {
+		ret = -EAGAIN;
+	}
+
+out:
+	return ret;
+}
+
+/**
+ * cdns_i2c_wait_for_bus_free - Wait for the I2C bus to become free.
+ * @i2c_bus: Pointer to the I2C data structure that holds bus state information.
+ * @timeout_us: Maximum time (in microseconds) to wait for the bus to become free.
+ *
+ * This function waits for the I2C bus to become idle. It checks the bus state
+ * register periodically until the bus is free or the timeout occurs.
+ *
+ * Return: true if the bus is free within the timeout, false otherwise.
+ */
+static bool cdns_i2c_wait_for_bus_free(struct cdns_i2c_data *i2c_bus, uint32_t timeout_us)
+{
+	bool ret_flag = false;
+	uint32_t reg;
+
+	/* Poll until the bus is free or the timeout is reached */
+	while (timeout_us > 0U) {
+		reg = cdns_i2c_readreg(i2c_bus, CDNS_I2C_SR_OFFSET);
+		if ((reg & CDNS_I2C_SR_BA) == 0U) {
+			/* Bus Available (BA) bit is cleared, the bus is free */
+			ret_flag = true;
+			break;
+		}
+
+		/* Wait for a small period before checking again */
+		(void)k_usleep((int32_t)CDNS_I2C_POLL_US);
+		timeout_us -= CDNS_I2C_POLL_US;
+	}
+
+	if (timeout_us == 0U) {
+		/* Timeout reached, bus not available */
+		ret_flag = false;
+	}
+
+	return ret_flag;
+}
+
+/**
+ * cdns_i2c_master_handle_repeated_start - Handle repeated start during I2C master transfer
+ * @i2c_bus: Pointer to the I2C data structure that holds bus state information
+ * @msgs: Array of I2C messages to be processed
+ * @num_msgs: Number of messages in the @msgs array
+ *
+ * Return: 0 on success
+ */
+static int32_t cdns_i2c_master_handle_repeated_start(struct cdns_i2c_data *i2c_bus,
+						     struct i2c_msg *msgs, uint8_t num_msgs)
+{
+	uint32_t reg;
+	(void)msgs;
+	(void)num_msgs;
+
+	/* Set the hold flag and register */
+	i2c_bus->bus_hold_flag = 1;
+	reg = cdns_i2c_readreg(i2c_bus, CDNS_I2C_CR_OFFSET);
+	reg |= CDNS_I2C_CR_HOLD;
+	cdns_i2c_writereg(i2c_bus, reg, CDNS_I2C_CR_OFFSET);
+
+	return 0;
+}
+
+/**
+ * cdns_i2c_master_handle_transfer_error - Handle errors during I2C master transfer.
+ * @i2c_bus: Pointer to the I2C data structure
+ *
+ * Return: -EIO or -ENXIO.
+ */
+static int32_t cdns_i2c_master_handle_transfer_error(struct cdns_i2c_data *i2c_bus)
+{
+	int32_t ret;
+
+	/* Perform a reset of the I2C master to clear the error condition */
+	cdns_i2c_master_reset(i2c_bus);
+
+	if ((i2c_bus->err_status & CDNS_I2C_IXR_NACK) != 0U) {
+		ret = -ENXIO; /* No device found (NACK) */
+	} else {
+		ret = -EIO; /* General I/O error */
+	}
+
+	return ret;
+}
+
+/**
+ * cdns_i2c_master_transfer - Performs an I2C master transfer using the Cadence I2C controller.
+ * @dev: Pointer to the device structure representing the I2C controller.
+ * @msgs: Array of I2C message structures representing the messages to be sent/received.
+ * @num_msgs: Number of messages in the msgs array.
+ * @addr: The 7-bit or 10-bit I2C address of the slave device.
+ *
+ * Return: 0 on success, negative error code on failure.
+ */
+static int32_t cdns_i2c_master_transfer(const struct device *dev, struct i2c_msg *msgs,
+					uint8_t num_msgs, uint16_t addr)
+{
+	struct cdns_i2c_data *i2c_bus = (struct cdns_i2c_data *)dev->data;
+	int32_t ret = 0;
+	uint32_t count;
+	struct i2c_msg *msg_ptr = msgs;
+
+	(void)k_mutex_lock(&i2c_bus->bus_mutex, K_FOREVER);
+
+	/* Wait for the bus to be free */
+	if (cdns_i2c_wait_for_bus_free(i2c_bus, CDNS_I2C_TIMEOUT_US) == false) {
+		ret = -EAGAIN;
+		goto out;
+	}
+
+	/* Handle repeated start for multiple messages */
+	if (num_msgs > 1U) {
+		ret = cdns_i2c_master_handle_repeated_start(i2c_bus, msgs, num_msgs);
+		if (ret != 0) {
+			goto out;
+		}
+	}
+
+	/* Process each message individually */
+	for (count = 0; count < num_msgs; count++) {
+		/* Reset hold flag for the last message */
+		if (count == ((uint32_t)num_msgs - 1U)) {
+			i2c_bus->bus_hold_flag = 0;
+		}
+
+		/* Process the current message */
+		ret = cdns_i2c_process_msg(i2c_bus, msg_ptr, addr);
+		if (ret != 0) {
+			goto out;
+		}
+
+		/* Handle any errors during the transfer */
+		if ((i2c_bus->err_status) != 0U) {
+			ret = cdns_i2c_master_handle_transfer_error(i2c_bus);
+			if (ret != 0) {
+				goto out;
+			}
+		}
+
+		msg_ptr++;
+	}
+
+out:
+	(void)k_mutex_unlock(&i2c_bus->bus_mutex);
+
+	return ret;
+}
+
+/**
+ * cdns_i2c_init - Initialize the Cadence I2C controller
+ * @dev: Pointer to the device
+ *
+ * Return: 0 on success, negative error code on failure.
+ */
+static int32_t cdns_i2c_init(const struct device *dev)
+{
+	const struct cdns_i2c_config *config = (const struct cdns_i2c_config *)dev->config;
+	struct cdns_i2c_data *i2c_bus = (struct cdns_i2c_data *)dev->data;
+	int32_t ret;
+
+	(void)k_mutex_init(&i2c_bus->bus_mutex);
+	k_event_init(&i2c_bus->xfer_done);
+
+	/* Configure the control reg flags, transfer size */
+	i2c_bus->ctrl_reg = CDNS_I2C_CR_MASTER_EN_MASK;
+	i2c_bus->transfer_size = CDNS_I2C_TRANSFER_SIZE_DEFAULT;
+
+	/* Set the I2C clock frequency */
+	ret = cdns_i2c_setclk(i2c_bus, i2c_bus->i2c_clk);
+	if (ret != 0) {
+		LOG_ERR("Invalid SCL clock: %u Hz", i2c_bus->i2c_clk);
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* Configure IRQ */
+	config->irq_config_func();
+
+	/* Enable the I2C peripheral */
+	cdns_i2c_enable_peripheral(i2c_bus);
+
+	LOG_INF("%u KHz mmio %08lx", i2c_bus->i2c_clk/1000U, i2c_bus->membase);
+
+out:
+	return ret;
+}
+
+/* I2C driver API structure for the Cadence I2C controller */
+static DEVICE_API(i2c, cdns_i2c_driver_api) = {
+	.configure = cdns_i2c_configure,
+	.get_config = cdns_i2c_get_config,
+	.transfer = cdns_i2c_master_transfer,
+#ifdef CONFIG_I2C_RTIO
+	.iodev_submit = i2c_iodev_submit_fallback,
+#endif
+};
+
+#define CADENCE_I2C_INIT(n, compat)							\
+	static void cdns_i2c_config_func_##compat##_##n(void);				\
+											\
+	static const struct cdns_i2c_config cdns_i2c_config_##compat##_##n = {		\
+		.irq_config_func = cdns_i2c_config_func_##compat##_##n,			\
+	};										\
+											\
+	static struct cdns_i2c_data cdns_i2c_data_##compat##_##n = {			\
+		.membase = DT_INST_REG_ADDR(n),						\
+		.input_clk = DT_INST_PROP_BY_PHANDLE(n, clocks, clock_frequency),	\
+		.i2c_clk = DT_INST_PROP(n, clock_frequency),				\
+		.fifo_depth = DT_INST_PROP(n, fifo_depth),				\
+	};										\
+											\
+	I2C_DEVICE_DT_INST_DEFINE(n, cdns_i2c_init, NULL,				\
+				&cdns_i2c_data_##compat##_##n,				\
+				&cdns_i2c_config_##compat##_##n, POST_KERNEL,		\
+				CONFIG_I2C_INIT_PRIORITY, &cdns_i2c_driver_api);	\
+											\
+	static void cdns_i2c_config_func_##compat##_##n(void)				\
+	{										\
+		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), cdns_i2c_isr,	\
+			    DEVICE_DT_INST_GET(n), 0);					\
+											\
+		irq_enable(DT_INST_IRQN(n));						\
+	}
+
+#define DT_DRV_COMPAT cdns_i2c
+DT_INST_FOREACH_STATUS_OKAY_VARGS(CADENCE_I2C_INIT, DT_DRV_COMPAT)
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index 2915a79debc66..1ee30a647dcf5 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -707,8 +707,15 @@ static int i2c_dw_transfer(const struct device *dev, struct i2c_msg *msgs, uint8
 		/* Wait for transfer to be done */
 		ret = k_sem_take(&dw->device_sync_sem, K_MSEC(CONFIG_I2C_DW_RW_TIMEOUT_MS));
 		if (ret != 0) {
+			if (test_bit_con_master_mode(reg_base)) {
+				/* Trigger abort and wait for it to complete. */
+				set_bit_enable_abort(reg_base);
+				(void)k_sem_take(&dw->device_sync_sem, K_MSEC(1));
+			}
 			write_intr_mask(DW_DISABLE_ALL_I2C_INT, reg_base);
 			value = read_clr_intr(reg_base);
+			ret = -ETIMEDOUT;
+			k_sem_reset(&dw->device_sync_sem);
 			break;
 		}
 
diff --git a/drivers/i2c/i2c_dw_registers.h b/drivers/i2c/i2c_dw_registers.h
index 117fcb196d08f..12966b6ab7de4 100644
--- a/drivers/i2c/i2c_dw_registers.h
+++ b/drivers/i2c/i2c_dw_registers.h
@@ -203,9 +203,11 @@ DEFINE_MM_REG_READ(clr_rx_done, DW_IC_REG_CLR_RX_DONE, 32)
 DEFINE_MM_REG_READ(clr_rd_req, DW_IC_REG_CLR_RD_REQ, 32)
 DEFINE_MM_REG_READ(clr_activity, DW_IC_REG_CLR_ACTIVITY, 32)
 
-#define DW_IC_ENABLE_EN_BIT (0)
+#define DW_IC_ENABLE_EN_BIT    (0)
+#define DW_IC_ENABLE_ABORT_BIT (1)
 DEFINE_CLEAR_BIT_OP(enable_en, DW_IC_REG_ENABLE, DW_IC_ENABLE_EN_BIT)
 DEFINE_SET_BIT_OP(enable_en, DW_IC_REG_ENABLE, DW_IC_ENABLE_EN_BIT)
+DEFINE_SET_BIT_OP(enable_abort, DW_IC_REG_ENABLE, DW_IC_ENABLE_ABORT_BIT)
 
 #define DW_IC_STATUS_ACTIVITY_BIT (0)
 #define DW_IC_STATUS_TFNT_BIT     (1)
diff --git a/drivers/i2c/i2c_ite_enhance.c b/drivers/i2c/i2c_ite_enhance.c
index e67083218ff79..1cfb68071d763 100644
--- a/drivers/i2c/i2c_ite_enhance.c
+++ b/drivers/i2c/i2c_ite_enhance.c
@@ -19,7 +19,7 @@
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ite_enhance, CONFIG_I2C_LOG_LEVEL);
-
+#include "i2c_bitbang.h"
 #include "i2c-priv.h"
 
 /* Start smbus session from idle state */
@@ -121,6 +121,7 @@ struct i2c_enhance_data {
 	struct i2c_msg *active_msg;
 	struct k_mutex mutex;
 	struct k_sem device_sync_sem;
+	struct i2c_bitbang bitbang;
 	/* Index into output data */
 	size_t widx;
 	/* Index into input data */
@@ -1263,10 +1264,40 @@ static int i2c_enhance_init(const struct device *dev)
 	return 0;
 }
 
+static void i2c_enhance_set_scl(void *io_context, int state)
+{
+	const struct i2c_enhance_config *config = io_context;
+
+	gpio_pin_set_dt(&config->scl_gpios, state);
+}
+
+static void i2c_enhance_set_sda(void *io_context, int state)
+{
+	const struct i2c_enhance_config *config = io_context;
+
+	gpio_pin_set_dt(&config->sda_gpios, state);
+}
+
+static int i2c_enhance_get_sda(void *io_context)
+{
+	const struct i2c_enhance_config *config = io_context;
+	int ret = gpio_pin_get_dt(&config->sda_gpios);
+
+	/* Default high as that would be a NACK */
+	return ret != 0;
+}
+
+static const struct i2c_bitbang_io i2c_enhance_bitbang_io = {
+	.set_scl = i2c_enhance_set_scl,
+	.set_sda = i2c_enhance_set_sda,
+	.get_sda = i2c_enhance_get_sda,
+};
+
 static int i2c_enhance_recover_bus(const struct device *dev)
 {
 	const struct i2c_enhance_config *config = dev->config;
-	int i, status;
+	struct i2c_enhance_data *data = dev->data;
+	int status, ret;
 
 	/* Output type selection */
 	gpio_flags_t flags = GPIO_OUTPUT | (config->push_pull_recovery ? 0 : GPIO_OPEN_DRAIN);
@@ -1275,42 +1306,12 @@ static int i2c_enhance_recover_bus(const struct device *dev)
 	/* Set SDA of I2C as GPIO pin */
 	gpio_pin_configure_dt(&config->sda_gpios, flags);
 
-	/*
-	 * In I2C recovery bus, 1ms sleep interval for bitbanging i2c
-	 * is mainly to ensure that gpio has enough time to go from
-	 * low to high or high to low.
-	 */
-	/* Pull SCL and SDA pin to high */
-	gpio_pin_set_dt(&config->scl_gpios, 1);
-	gpio_pin_set_dt(&config->sda_gpios, 1);
-	k_msleep(1);
-
-	/* Start condition */
-	gpio_pin_set_dt(&config->sda_gpios, 0);
-	k_msleep(1);
-	gpio_pin_set_dt(&config->scl_gpios, 0);
-	k_msleep(1);
-
-	/* 9 cycles of SCL with SDA held high */
-	for (i = 0; i < 9; i++) {
-		/* SDA */
-		gpio_pin_set_dt(&config->sda_gpios, 1);
-		/* SCL */
-		gpio_pin_set_dt(&config->scl_gpios, 1);
-		k_msleep(1);
-		/* SCL */
-		gpio_pin_set_dt(&config->scl_gpios, 0);
-		k_msleep(1);
+	i2c_bitbang_init(&data->bitbang, &i2c_enhance_bitbang_io, (void *)config);
+
+	ret = i2c_bitbang_recover_bus(&data->bitbang);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to recover bus (err %d)", dev->name, ret);
 	}
-	/* SDA */
-	gpio_pin_set_dt(&config->sda_gpios, 0);
-	k_msleep(1);
-
-	/* Stop condition */
-	gpio_pin_set_dt(&config->scl_gpios, 1);
-	k_msleep(1);
-	gpio_pin_set_dt(&config->sda_gpios, 1);
-	k_msleep(1);
 
 	/* Set GPIO back to I2C alternate function */
 	status = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
diff --git a/drivers/i2c/i2c_ite_it8xxx2.c b/drivers/i2c/i2c_ite_it8xxx2.c
index 203eaaa3d339e..fd4311fb60f99 100644
--- a/drivers/i2c/i2c_ite_it8xxx2.c
+++ b/drivers/i2c/i2c_ite_it8xxx2.c
@@ -21,7 +21,7 @@
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ite_it8xxx2, CONFIG_I2C_LOG_LEVEL);
-
+#include "i2c_bitbang.h"
 #include "i2c-priv.h"
 
 /* Start smbus session from idle state */
@@ -74,6 +74,7 @@ struct i2c_it8xxx2_data {
 	struct i2c_msg *active_msg;
 	struct k_mutex mutex;
 	struct k_sem device_sync_sem;
+	struct i2c_bitbang bitbang;
 #ifdef CONFIG_I2C_IT8XXX2_FIFO_MODE
 	struct i2c_msg *msgs_list;
 	/* Read or write byte counts. */
@@ -1186,10 +1187,40 @@ static int i2c_it8xxx2_init(const struct device *dev)
 	return 0;
 }
 
+static void i2c_it8xxx2_set_scl(void *io_context, int state)
+{
+	const struct i2c_it8xxx2_config *config = io_context;
+
+	gpio_pin_set_dt(&config->scl_gpios, state);
+}
+
+static void i2c_it8xxx2_set_sda(void *io_context, int state)
+{
+	const struct i2c_it8xxx2_config *config = io_context;
+
+	gpio_pin_set_dt(&config->sda_gpios, state);
+}
+
+static int i2c_it8xxx2_get_sda(void *io_context)
+{
+	const struct i2c_it8xxx2_config *config = io_context;
+	int ret = gpio_pin_get_dt(&config->sda_gpios);
+
+	/* Default high as that would be a NACK */
+	return ret != 0;
+}
+
+static const struct i2c_bitbang_io i2c_it8xxx2_bitbang_io = {
+	.set_scl = i2c_it8xxx2_set_scl,
+	.set_sda = i2c_it8xxx2_set_sda,
+	.get_sda = i2c_it8xxx2_get_sda,
+};
+
 static int i2c_it8xxx2_recover_bus(const struct device *dev)
 {
 	const struct i2c_it8xxx2_config *config = dev->config;
-	int i, status;
+	struct i2c_it8xxx2_data *data = dev->data;
+	int status, ret;
 
 	/* Output type selection */
 	gpio_flags_t flags = GPIO_OUTPUT | (config->push_pull_recovery ? 0 : GPIO_OPEN_DRAIN);
@@ -1198,42 +1229,12 @@ static int i2c_it8xxx2_recover_bus(const struct device *dev)
 	/* Set SDA of I2C as GPIO pin */
 	gpio_pin_configure_dt(&config->sda_gpios, flags);
 
-	/*
-	 * In I2C recovery bus, 1ms sleep interval for bitbanging i2c
-	 * is mainly to ensure that gpio has enough time to go from
-	 * low to high or high to low.
-	 */
-	/* Pull SCL and SDA pin to high */
-	gpio_pin_set_dt(&config->scl_gpios, 1);
-	gpio_pin_set_dt(&config->sda_gpios, 1);
-	k_msleep(1);
-
-	/* Start condition */
-	gpio_pin_set_dt(&config->sda_gpios, 0);
-	k_msleep(1);
-	gpio_pin_set_dt(&config->scl_gpios, 0);
-	k_msleep(1);
-
-	/* 9 cycles of SCL with SDA held high */
-	for (i = 0; i < 9; i++) {
-		/* SDA */
-		gpio_pin_set_dt(&config->sda_gpios, 1);
-		/* SCL */
-		gpio_pin_set_dt(&config->scl_gpios, 1);
-		k_msleep(1);
-		/* SCL */
-		gpio_pin_set_dt(&config->scl_gpios, 0);
-		k_msleep(1);
+	i2c_bitbang_init(&data->bitbang, &i2c_it8xxx2_bitbang_io, (void *)config);
+
+	ret = i2c_bitbang_recover_bus(&data->bitbang);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to recover bus (err %d)", dev->name, ret);
 	}
-	/* SDA */
-	gpio_pin_set_dt(&config->sda_gpios, 0);
-	k_msleep(1);
-
-	/* Stop condition */
-	gpio_pin_set_dt(&config->scl_gpios, 1);
-	k_msleep(1);
-	gpio_pin_set_dt(&config->sda_gpios, 1);
-	k_msleep(1);
 
 	/* Set GPIO back to I2C alternate function of SCL */
 	status = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
diff --git a/drivers/i2c/i2c_litex_litei2c.c b/drivers/i2c/i2c_litex_litei2c.c
new file mode 100644
index 0000000000000..d73c8230854e6
--- /dev/null
+++ b/drivers/i2c/i2c_litex_litei2c.c
@@ -0,0 +1,352 @@
+/*
+ * Copyright (c) 2024 Vogl Electronic GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT litex_litei2c
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(i2c_litex_litei2c, CONFIG_I2C_LOG_LEVEL);
+
+#include "i2c-priv.h"
+
+#include <soc.h>
+
+#define MASTER_STATUS_TX_READY_OFFSET 0x0
+#define MASTER_STATUS_RX_READY_OFFSET 0x1
+#define MASTER_STATUS_NACK_OFFSET     0x8
+
+struct i2c_litex_litei2c_config {
+	uint32_t phy_speed_mode_addr;
+	uint32_t master_active_addr;
+	uint32_t master_settings_addr;
+	uint32_t master_addr_addr;
+	uint32_t master_rxtx_addr;
+	uint32_t master_status_addr;
+	uint32_t bitrate;
+};
+
+struct i2c_litex_litei2c_data {
+	struct k_mutex mutex;
+};
+
+static int i2c_litex_configure(const struct device *dev, uint32_t dev_config)
+{
+	const struct i2c_litex_litei2c_config *config = dev->config;
+	struct i2c_litex_litei2c_data *data = dev->data;
+
+	if (I2C_ADDR_10_BITS & dev_config) {
+		return -ENOTSUP;
+	}
+
+	if (!(I2C_MODE_CONTROLLER & dev_config)) {
+		return -ENOTSUP;
+	}
+
+	k_mutex_lock(&data->mutex, K_FOREVER);
+
+	/* Setup speed to use */
+	switch (I2C_SPEED_GET(dev_config)) {
+	case I2C_SPEED_STANDARD:
+		litex_write8(0, config->phy_speed_mode_addr);
+		break;
+	case I2C_SPEED_FAST:
+		litex_write8(1, config->phy_speed_mode_addr);
+		break;
+	case I2C_SPEED_FAST_PLUS:
+		litex_write8(2, config->phy_speed_mode_addr);
+		break;
+	default:
+		k_mutex_unlock(&data->mutex);
+		return -ENOTSUP;
+	}
+
+	k_mutex_unlock(&data->mutex);
+
+	return 0;
+}
+
+static int i2c_litex_get_config(const struct device *dev, uint32_t *config)
+{
+	const struct i2c_litex_litei2c_config *dev_config = dev->config;
+
+	*config = I2C_MODE_CONTROLLER;
+
+	switch (litex_read8(dev_config->phy_speed_mode_addr)) {
+	case 0:
+		*config |= I2C_SPEED_SET(I2C_SPEED_STANDARD);
+		break;
+	case 1:
+		*config |= I2C_SPEED_SET(I2C_SPEED_FAST);
+		break;
+	case 2:
+		*config |= I2C_SPEED_SET(I2C_SPEED_FAST_PLUS);
+		break;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+static int i2c_litex_write_settings(const struct device *dev, uint8_t len_tx, uint8_t len_rx,
+				    bool recover)
+{
+	const struct i2c_litex_litei2c_config *config = dev->config;
+
+	uint32_t settings = len_tx | (len_rx << 8) | (recover << 16);
+
+	litex_write32(settings, config->master_settings_addr);
+
+	return 0;
+}
+
+static int i2c_litex_transfer(const struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs,
+			      uint16_t addr)
+{
+	const struct i2c_litex_litei2c_config *config = dev->config;
+	struct i2c_litex_litei2c_data *data = dev->data;
+	uint32_t len_tx_buf = 0;
+	uint32_t len_rx_buf = 0;
+	uint8_t len_tx = 0;
+	uint8_t len_rx = 0;
+
+	uint8_t *tx_buf_ptr;
+	uint8_t *rx_buf_ptr;
+
+	uint32_t tx_buf;
+	uint32_t rx_buf;
+
+	uint32_t tx_j = 0;
+	uint32_t rx_j = 0;
+
+	int ret = 0;
+
+	k_mutex_lock(&data->mutex, K_FOREVER);
+
+	litex_write8(1, config->master_active_addr);
+
+	LOG_DBG("addr: 0x%x", addr);
+	litex_write8((uint8_t)addr, config->master_addr_addr);
+
+	for (uint8_t i = 0; i < num_msgs; i++) {
+		if (msgs[i].flags & I2C_MSG_READ) {
+			len_tx_buf = 0;
+			len_rx_buf = msgs[i].len;
+			rx_buf_ptr = msgs[i].buf;
+			tx_buf_ptr = NULL;
+		} else {
+			len_tx_buf = msgs[i].len;
+			tx_buf_ptr = msgs[i].buf;
+			if (!(msgs[i].flags & I2C_MSG_STOP) && (i + 1 < num_msgs) &&
+			    (msgs[i + 1].flags & I2C_MSG_READ) &&
+			    (msgs[i + 1].flags & I2C_MSG_RESTART)) {
+				i++;
+				len_rx_buf = msgs[i].len;
+				rx_buf_ptr = msgs[i].buf;
+			} else {
+				len_rx_buf = 0;
+				rx_buf_ptr = NULL;
+			}
+		}
+
+		LOG_HEXDUMP_DBG(tx_buf_ptr, len_tx_buf, "tx_buf");
+
+		tx_j = 0;
+		rx_j = 0;
+		do {
+
+			if (len_tx_buf > (tx_j + 4)) {
+				len_tx = 5;
+				len_rx = 0;
+			} else {
+				len_tx = len_tx_buf - tx_j;
+
+				if (len_rx_buf > (rx_j + 4)) {
+					len_rx = 5;
+				} else {
+					len_rx = len_rx_buf - rx_j;
+				}
+			}
+
+			tx_buf = 0;
+
+			switch (len_tx) {
+			case 5:
+			case 4:
+				tx_buf |= tx_buf_ptr[0 + tx_j] << 24;
+				tx_buf |= tx_buf_ptr[1 + tx_j] << 16;
+				tx_buf |= tx_buf_ptr[2 + tx_j] << 8;
+				tx_buf |= tx_buf_ptr[3 + tx_j];
+				tx_j += 4;
+				break;
+			case 3:
+				tx_buf |= tx_buf_ptr[0 + tx_j] << 16;
+				tx_buf |= tx_buf_ptr[1 + tx_j] << 8;
+				tx_buf |= tx_buf_ptr[2 + tx_j];
+				tx_j += 3;
+				break;
+			case 2:
+				tx_buf |= tx_buf_ptr[0 + tx_j] << 8;
+				tx_buf |= tx_buf_ptr[1 + tx_j];
+				tx_j += 2;
+				break;
+			case 1:
+				tx_buf |= tx_buf_ptr[0 + tx_j];
+				tx_j += 1;
+				break;
+			default:
+				break;
+			}
+
+			LOG_DBG("len_tx: %d, len_rx: %d", len_tx, len_rx);
+			i2c_litex_write_settings(dev, len_tx, len_rx, false);
+
+			while (!(litex_read8(config->master_status_addr) &
+				 BIT(MASTER_STATUS_TX_READY_OFFSET))) {
+				;
+			}
+
+			LOG_DBG("tx_buf: 0x%x", tx_buf);
+			litex_write32(tx_buf, config->master_rxtx_addr);
+
+			while (!(litex_read8(config->master_status_addr) &
+				 BIT(MASTER_STATUS_RX_READY_OFFSET))) {
+				;
+			}
+
+			if (litex_read16(config->master_status_addr) &
+			    BIT(MASTER_STATUS_NACK_OFFSET)) {
+				LOG_DBG("NACK received (addr: 0x%x)", addr);
+				ret = -EIO;
+			}
+
+			rx_buf = litex_read32(config->master_rxtx_addr);
+			LOG_DBG("rx_buf: 0x%x", rx_buf);
+
+			switch (len_rx) {
+			case 5:
+			case 4:
+				rx_buf_ptr[0 + rx_j] = rx_buf >> 24;
+				rx_buf_ptr[1 + rx_j] = rx_buf >> 16;
+				rx_buf_ptr[2 + rx_j] = rx_buf >> 8;
+				rx_buf_ptr[3 + rx_j] = rx_buf;
+				rx_j += 4;
+				break;
+			case 3:
+				rx_buf_ptr[0 + rx_j] = rx_buf >> 16;
+				rx_buf_ptr[1 + rx_j] = rx_buf >> 8;
+				rx_buf_ptr[2 + rx_j] = rx_buf;
+				rx_j += 3;
+				break;
+			case 2:
+				rx_buf_ptr[0 + rx_j] = rx_buf >> 8;
+				rx_buf_ptr[1 + rx_j] = rx_buf;
+				rx_j += 2;
+				break;
+			case 1:
+				rx_buf_ptr[0 + rx_j] = rx_buf;
+				rx_j += 1;
+				break;
+			default:
+				break;
+			}
+
+			if (ret < 0) {
+				goto transfer_end;
+			}
+
+		} while ((tx_j < len_tx_buf) || (rx_j < len_rx_buf));
+
+		LOG_HEXDUMP_DBG(rx_buf_ptr, len_rx_buf, "rx_buf");
+	}
+
+transfer_end:
+
+	litex_write8(0, config->master_active_addr);
+
+	k_mutex_unlock(&data->mutex);
+
+	return ret;
+}
+
+static int i2c_litex_recover_bus(const struct device *dev)
+{
+	const struct i2c_litex_litei2c_config *config = dev->config;
+	struct i2c_litex_litei2c_data *data = dev->data;
+
+	k_mutex_lock(&data->mutex, K_FOREVER);
+
+	litex_write8(1, config->master_active_addr);
+
+	i2c_litex_write_settings(dev, 0, 0, true);
+
+	while (!(litex_read8(config->master_status_addr) & BIT(MASTER_STATUS_TX_READY_OFFSET))) {
+		;
+	}
+
+	litex_write32(0, config->master_rxtx_addr);
+
+	while (!(litex_read8(config->master_status_addr) & BIT(MASTER_STATUS_RX_READY_OFFSET))) {
+		;
+	}
+
+	(void)litex_read32(config->master_rxtx_addr);
+
+	litex_write8(0, config->master_active_addr);
+
+	k_mutex_unlock(&data->mutex);
+
+	return 0;
+}
+
+static int i2c_litex_init(const struct device *dev)
+{
+	const struct i2c_litex_litei2c_config *config = dev->config;
+	struct i2c_litex_litei2c_data *data = dev->data;
+	int ret;
+
+	k_mutex_init(&data->mutex);
+
+	ret = i2c_litex_configure(dev, I2C_MODE_CONTROLLER | i2c_map_dt_bitrate(config->bitrate));
+	if (ret != 0) {
+		LOG_ERR("failed to configure I2C: %d", ret);
+	}
+
+	return ret;
+}
+
+static DEVICE_API(i2c, i2c_litex_litei2c_driver_api) = {
+	.configure = i2c_litex_configure,
+	.get_config = i2c_litex_get_config,
+	.transfer = i2c_litex_transfer,
+	.recover_bus = i2c_litex_recover_bus,
+#ifdef CONFIG_I2C_RTIO
+	.iodev_submit = i2c_iodev_submit_fallback,
+#endif
+};
+
+/* Device Instantiation */
+
+#define I2C_LITEX_INIT(n)                                                                          \
+	static struct i2c_litex_litei2c_data i2c_litex_litei2c_data_##n;                           \
+												   \
+	static const struct i2c_litex_litei2c_config i2c_litex_litei2c_config_##n = {              \
+		.phy_speed_mode_addr = DT_INST_REG_ADDR_BY_NAME(n, phy_speed_mode),                \
+		.master_active_addr = DT_INST_REG_ADDR_BY_NAME(n, master_active),                  \
+		.master_settings_addr = DT_INST_REG_ADDR_BY_NAME(n, master_settings),              \
+		.master_addr_addr = DT_INST_REG_ADDR_BY_NAME(n, master_addr),                      \
+		.master_rxtx_addr = DT_INST_REG_ADDR_BY_NAME(n, master_rxtx),                      \
+		.master_status_addr = DT_INST_REG_ADDR_BY_NAME(n, master_status),                  \
+		.bitrate = DT_INST_PROP(n, clock_frequency),                                       \
+	};                                                                                         \
+                                                                                                   \
+	I2C_DEVICE_DT_INST_DEFINE(n, i2c_litex_init, NULL, &i2c_litex_litei2c_data_##n,            \
+				  &i2c_litex_litei2c_config_##n, POST_KERNEL,                      \
+				  CONFIG_I2C_INIT_PRIORITY, &i2c_litex_litei2c_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(I2C_LITEX_INIT)
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index 6e1d2c48f2c4c..315c522da7d40 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -5,6 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/dma/dma_stm32.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/pm/device.h>
@@ -143,7 +145,8 @@ static int i2c_stm32_transfer(const struct device *dev, struct i2c_msg *msg,
 			      uint8_t num_msgs, uint16_t slave)
 {
 	struct i2c_stm32_data *data = dev->data;
-	struct i2c_msg *current, *next;
+	struct i2c_msg *current;
+	struct i2c_msg *next = NULL;
 	int ret = 0;
 
 	/* Check for validity of all messages, to prevent having to abort
@@ -582,6 +585,20 @@ static void i2c_stm32_irq_config_func_##index(const struct device *dev)	\
 
 #endif /* CONFIG_I2C_STM32_INTERRUPT */
 
+#ifdef CONFIG_I2C_STM32_V2_DMA
+
+#define I2C_DMA_INIT(index, dir)                                                                   \
+	.dir##_dma = {.dev_dma = COND_CODE_1(DT_INST_DMAS_HAS_NAME(index, dir),                    \
+				(DEVICE_DT_GET(STM32_DMA_CTLR(index, dir))), (NULL)),              \
+			       .dma_channel = COND_CODE_1(DT_INST_DMAS_HAS_NAME(index, dir),       \
+					(DT_INST_DMAS_CELL_BY_NAME(index, dir, channel)), (-1))},
+
+#else
+
+#define I2C_DMA_INIT(index, dir)
+
+#endif /* CONFIG_I2C_STM32_V2_DMA */
+
 #define STM32_I2C_INIT(index)						\
 STM32_I2C_IRQ_HANDLER_DECL(index);					\
 									\
@@ -607,6 +624,8 @@ static const struct i2c_stm32_config i2c_stm32_cfg_##index = {		\
 	IF_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32_i2c_v2),		\
 		(.timings = (const struct i2c_config_timing *) i2c_timings_##index,\
 		 .n_timings = ARRAY_SIZE(i2c_timings_##index),))	\
+	I2C_DMA_INIT(index, tx) \
+	I2C_DMA_INIT(index, rx) \
 };									\
 									\
 static struct i2c_stm32_data i2c_stm32_dev_data_##index;		\
diff --git a/drivers/i2c/i2c_ll_stm32.h b/drivers/i2c/i2c_ll_stm32.h
index ec6db5b32a083..e22aeff26202f 100644
--- a/drivers/i2c/i2c_ll_stm32.h
+++ b/drivers/i2c/i2c_ll_stm32.h
@@ -15,6 +15,8 @@
 #include <zephyr/drivers/gpio.h>
 #endif /* CONFIG_I2C_STM32_BUS_RECOVERY */
 
+#include <zephyr/drivers/dma.h>
+
 typedef void (*irq_config_func_t)(const struct device *port);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_i2c_v2)
@@ -31,6 +33,13 @@ struct i2c_config_timing {
 };
 #endif
 
+#ifdef CONFIG_I2C_STM32_V2_DMA
+struct stream {
+	const struct device *dev_dma;
+	int32_t dma_channel;
+};
+#endif /* CONFIG_I2C_STM32_V2_DMA */
+
 struct i2c_stm32_config {
 #ifdef CONFIG_I2C_STM32_INTERRUPT
 	irq_config_func_t irq_config_func;
@@ -48,6 +57,10 @@ struct i2c_stm32_config {
 	const struct i2c_config_timing *timings;
 	size_t n_timings;
 #endif
+#ifdef CONFIG_I2C_STM32_V2_DMA
+	struct stream tx_dma;
+	struct stream rx_dma;
+#endif /* CONFIG_I2C_STM32_V2_DMA */
 };
 
 struct i2c_stm32_data {
@@ -91,12 +104,16 @@ struct i2c_stm32_data {
 	i2c_stm32_smbalert_cb_func_t smbalert_cb_func;
 	const struct device *smbalert_cb_dev;
 #endif
+#ifdef CONFIG_I2C_STM32_V2_DMA
+	struct dma_config dma_cfg;
+	struct dma_block_config dma_blk_cfg;
+#endif /* CONFIG_I2C_STM32_V2_DMA */
 };
 
-int32_t stm32_i2c_transaction(const struct device *dev,
+int stm32_i2c_transaction(const struct device *dev,
 			    struct i2c_msg msg, uint8_t *next_msg_flags,
 			    uint16_t periph);
-int32_t stm32_i2c_configure_timing(const struct device *dev, uint32_t clk);
+int stm32_i2c_configure_timing(const struct device *dev, uint32_t clk);
 int i2c_stm32_runtime_configure(const struct device *dev, uint32_t config);
 int i2c_stm32_get_config(const struct device *dev, uint32_t *config);
 
diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c
index e434672638440..84624c53aa892 100644
--- a/drivers/i2c/i2c_ll_stm32_v1.c
+++ b/drivers/i2c/i2c_ll_stm32_v1.c
@@ -993,7 +993,7 @@ static int32_t stm32_i2c_msg_read(const struct device *dev, struct i2c_msg *msg,
 }
 #endif /* CONFIG_I2C_STM32_INTERRUPT */
 
-int32_t stm32_i2c_configure_timing(const struct device *dev, uint32_t clock)
+int stm32_i2c_configure_timing(const struct device *dev, uint32_t clock)
 {
 	const struct i2c_stm32_config *cfg = dev->config;
 	struct i2c_stm32_data *data = dev->data;
diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c
index 8e97fffbf09b8..56a11b7a602e1 100644
--- a/drivers/i2c/i2c_ll_stm32_v2.c
+++ b/drivers/i2c/i2c_ll_stm32_v2.c
@@ -21,6 +21,11 @@
 #include <zephyr/pm/device_runtime.h>
 #include "i2c_ll_stm32.h"
 
+#include <zephyr/cache.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/mem_mgmt/mem_attr.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ll_stm32_v2);
@@ -117,6 +122,36 @@ static struct stm32_i2c_timings_t i2c_valid_timing[STM32_I2C_VALID_TIMING_NBR];
 static uint32_t i2c_valid_timing_nbr;
 #endif /* CONFIG_I2C_STM32_V2_TIMING */
 
+#ifdef CONFIG_I2C_STM32_V2_DMA
+static int configure_dma(struct stream const *dma, struct dma_config *dma_cfg,
+			 struct dma_block_config *blk_cfg)
+{
+	if (!device_is_ready(dma->dev_dma)) {
+		LOG_ERR("DMA device not ready");
+		return -ENODEV;
+	}
+
+	dma_cfg->head_block = blk_cfg;
+	dma_cfg->block_count = 1;
+
+	int ret = dma_config(dma->dev_dma, dma->dma_channel, dma_cfg);
+
+	if (ret != 0) {
+		LOG_ERR("Problem setting up DMA: %d", ret);
+		return ret;
+	}
+
+	ret = dma_start(dma->dev_dma, dma->dma_channel);
+
+	if (ret != 0) {
+		LOG_ERR("Problem starting DMA: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_I2C_STM32_V2_DMA */
+
 static inline void msg_init(const struct device *dev, struct i2c_msg *msg,
 			    uint8_t *next_msg_flags, uint16_t slave,
 			    uint32_t transfer)
@@ -151,6 +186,45 @@ static inline void msg_init(const struct device *dev, struct i2c_msg *msg,
 #if defined(CONFIG_I2C_TARGET)
 		data->master_active = true;
 #endif
+
+#ifdef CONFIG_I2C_STM32_V2_DMA
+		if (msg->len) {
+			if (msg->flags & I2C_MSG_READ) {
+				/* Configure RX DMA */
+				data->dma_blk_cfg.source_address = LL_I2C_DMA_GetRegAddr(
+					cfg->i2c, LL_I2C_DMA_REG_DATA_RECEIVE);
+				data->dma_blk_cfg.dest_address = (uint32_t)msg->buf;
+				data->dma_blk_cfg.block_size = msg->len;
+
+				if (configure_dma(&cfg->rx_dma, &data->dma_cfg,
+						  &data->dma_blk_cfg) != 0) {
+					LOG_ERR("Problem setting up RX DMA");
+					return;
+				}
+				data->current.buf += msg->len;
+				data->current.len -= msg->len;
+				LL_I2C_EnableDMAReq_RX(i2c);
+			} else {
+				if (data->current.len) {
+					/* Configure TX DMA */
+					data->dma_blk_cfg.source_address =
+						(uint32_t)data->current.buf;
+					data->dma_blk_cfg.dest_address = LL_I2C_DMA_GetRegAddr(
+						cfg->i2c, LL_I2C_DMA_REG_DATA_TRANSMIT);
+					data->dma_blk_cfg.block_size = msg->len;
+					if (configure_dma(&cfg->tx_dma, &data->dma_cfg,
+							  &data->dma_blk_cfg) != 0) {
+						LOG_ERR("Problem setting up TX DMA");
+						return;
+					}
+					data->current.buf += data->current.len;
+					data->current.len -= data->current.len;
+					LL_I2C_EnableDMAReq_TX(i2c);
+				}
+			}
+		}
+#endif /* CONFIG_I2C_STM32_V2_DMA */
+
 		LL_I2C_Enable(i2c);
 
 		LL_I2C_GenerateStartCondition(i2c);
@@ -209,6 +283,17 @@ static void stm32_i2c_master_mode_end(const struct device *dev)
 		LL_I2C_Disable(i2c);
 	}
 #endif
+
+#ifdef CONFIG_I2C_STM32_V2_DMA
+	if (data->current.msg->flags & I2C_MSG_READ) {
+		dma_stop(cfg->rx_dma.dev_dma, cfg->rx_dma.dma_channel);
+		LL_I2C_DisableDMAReq_RX(i2c);
+	} else {
+		dma_stop(cfg->tx_dma.dev_dma, cfg->tx_dma.dma_channel);
+		LL_I2C_DisableDMAReq_TX(i2c);
+	}
+#endif /* CONFIG_I2C_STM32_V2_DMA */
+
 	k_sem_give(&data->device_sync_sem);
 }
 
@@ -508,6 +593,17 @@ static void stm32_i2c_event(const struct device *dev)
 			LL_I2C_GenerateStopCondition(i2c);
 		} else {
 			stm32_i2c_disable_transfer_interrupts(dev);
+
+#ifdef CONFIG_I2C_STM32_V2_DMA
+			if (data->current.msg->flags & I2C_MSG_READ) {
+				dma_stop(cfg->rx_dma.dev_dma, cfg->rx_dma.dma_channel);
+				LL_I2C_DisableDMAReq_RX(i2c);
+			} else {
+				dma_stop(cfg->tx_dma.dev_dma, cfg->tx_dma.dma_channel);
+				LL_I2C_DisableDMAReq_TX(i2c);
+			}
+#endif /* CONFIG_I2C_STM32_V2_DMA */
+
 			k_sem_give(&data->device_sync_sem);
 		}
 	}
@@ -585,6 +681,37 @@ void stm32_i2c_error_isr(void *arg)
 }
 #endif
 
+#if defined(CONFIG_DCACHE) && defined(CONFIG_I2C_STM32_V2_DMA)
+static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
+{
+	bool buf_within_nocache = false;
+
+#ifdef CONFIG_NOCACHE_MEMORY
+	/* Check if buffer is in nocache region defined by the linker */
+	buf_within_nocache = (buf >= ((uintptr_t)_nocache_ram_start)) &&
+		((buf + len_bytes - 1) <= ((uintptr_t)_nocache_ram_end));
+	if (buf_within_nocache) {
+		return true;
+	}
+#endif /* CONFIG_NOCACHE_MEMORY */
+
+#ifdef CONFIG_MEM_ATTR
+	/* Check if buffer is in nocache memory region defined in DT */
+	buf_within_nocache = mem_attr_check_buf(
+		(void *)buf, len_bytes, DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)) == 0;
+	if (buf_within_nocache) {
+		return true;
+	}
+#endif /* CONFIG_MEM_ATTR */
+
+	/* Check if buffer is in RO region (Flash..) */
+	buf_within_nocache = (buf >= ((uintptr_t)__rodata_region_start)) &&
+		((buf + len_bytes - 1) <= ((uintptr_t)__rodata_region_end));
+
+	return buf_within_nocache;
+}
+#endif /* CONFIG_DCACHE && CONFIG_I2C_STM32_V2_DMA */
+
 static int stm32_i2c_msg_write(const struct device *dev, struct i2c_msg *msg,
 			uint8_t *next_msg_flags, uint16_t slave)
 {
@@ -600,6 +727,14 @@ static int stm32_i2c_msg_write(const struct device *dev, struct i2c_msg *msg,
 	data->current.is_err = 0U;
 	data->current.msg = msg;
 
+#if defined(CONFIG_DCACHE) && defined(CONFIG_I2C_STM32_V2_DMA)
+	if (!buf_in_nocache((uintptr_t)msg->buf, msg->len)) {
+		LOG_DBG("Tx buffer at %p (len %zu) is in cached memory; cleaning cache", msg->buf,
+			msg->len);
+		sys_cache_data_flush_range((void *)msg->buf, msg->len);
+	}
+#endif /* CONFIG_DCACHE && CONFIG_I2C_STM32_V2_DMA*/
+
 	msg_init(dev, msg, next_msg_flags, slave, LL_I2C_REQUEST_WRITE);
 
 	stm32_i2c_enable_transfer_interrupts(dev);
@@ -671,6 +806,14 @@ static int stm32_i2c_msg_read(const struct device *dev, struct i2c_msg *msg,
 		is_timeout = true;
 	}
 
+#if defined(CONFIG_DCACHE) && defined(CONFIG_I2C_STM32_V2_DMA)
+	if (!buf_in_nocache((uintptr_t)msg->buf, msg->len)) {
+		LOG_DBG("Rx buffer at %p (len %zu) is in cached memory; invalidating cache",
+			msg->buf, msg->len);
+		sys_cache_data_invd_range((void *)msg->buf, msg->len);
+	}
+#endif /* CONFIG_DCACHE && CONFIG_I2C_STM32_V2_DMA */
+
 	if (data->current.is_nack || data->current.is_err ||
 	    data->current.is_arlo || is_timeout) {
 		goto error;
diff --git a/drivers/i2c/i2c_max32.c b/drivers/i2c/i2c_max32.c
index c42f837bf3efe..db370b9955b71 100644
--- a/drivers/i2c/i2c_max32.c
+++ b/drivers/i2c/i2c_max32.c
@@ -292,11 +292,13 @@ static void i2c_max32_dma_callback(const struct device *dev, void *arg, uint32_t
 
 	if (status < 0) {
 		data->err = -EIO;
+		Wrap_MXC_I2C_SetIntEn(cfg->regs, 0, 0);
+		k_sem_give(&data->xfer);
 	} else {
-		if (data->req.restart) {
-			Wrap_MXC_I2C_Restart(cfg->regs);
-		} else {
+		if (data->flags & I2C_MSG_STOP) {
 			Wrap_MXC_I2C_Stop(cfg->regs);
+		} else if (!(data->flags & I2C_MSG_READ)) {
+			MXC_I2C_EnableInt(cfg->regs, ADI_MAX32_I2C_INT_EN0_TX_THD, 0);
 		}
 	}
 }
@@ -366,48 +368,75 @@ static int i2c_max32_transfer_dma(const struct device *dev, struct i2c_msg *msgs
 	const struct max32_i2c_config *const cfg = dev->config;
 	struct max32_i2c_data *data = dev->data;
 	mxc_i2c_regs_t *i2c = cfg->regs;
+	mxc_i2c_req_t *req = &data->req;
 	uint8_t target_rw;
 	unsigned int i = 0;
 
 	k_sem_take(&data->lock, K_FOREVER);
 
+	req->addr = target_address;
+	req->i2c = i2c;
+
 	MXC_I2C_SetRXThreshold(i2c, 1);
 	MXC_I2C_SetTXThreshold(i2c, 2);
 	MXC_I2C_ClearTXFIFO(i2c);
 	MXC_I2C_ClearRXFIFO(i2c);
 
+	/* First message should always begin with a START condition */
+	msgs[0].flags |= I2C_MSG_RESTART;
+
 	for (i = 0; i < num_msgs; i++) {
-		data->req.restart = !(msgs[i].flags & I2C_MSG_STOP);
 		if (msgs[i].flags & I2C_MSG_READ) {
+			req->rx_len = msgs[i].len;
+			req->tx_len = 0;
 			target_rw = (target_address << 1) | 0x1;
-			MXC_I2C_WriteTXFIFO(i2c, &target_rw, 1);
-			Wrap_MXC_I2C_SetRxCount(i2c, msgs[i].len);
 			ret = i2c_max32_rx_dma_load(dev, &msgs[i]);
 			if (ret < 0) {
 				break;
 			}
-
-			MXC_I2C_EnableInt(
-				i2c, ADI_MAX32_I2C_INT_EN0_DONE | ADI_MAX32_I2C_INT_EN0_ERR, 0);
-			i2c->dma |= ADI_MAX32_I2C_DMA_RX_EN;
 		} else {
+			req->tx_len = msgs[i].len;
+			req->rx_len = 0;
 			target_rw = (target_address << 1) & ~0x1;
-			MXC_I2C_WriteTXFIFO(i2c, &target_rw, 1);
 			ret = i2c_max32_tx_dma_load(dev, &msgs[i]);
 			if (ret < 0) {
 				break;
 			}
+		}
 
-			MXC_I2C_EnableInt(
-				i2c, ADI_MAX32_I2C_INT_EN0_DONE | ADI_MAX32_I2C_INT_EN0_ERR, 0);
-			i2c->dma |= ADI_MAX32_I2C_DMA_TX_EN;
+		/*
+		 *  If previous message ends with a STOP condition, this message
+		 *  should begin with a START
+		 */
+		if (i > 0) {
+			if ((msgs[i - 1].flags & (I2C_MSG_STOP | I2C_MSG_READ))) {
+				msgs[i].flags |= I2C_MSG_RESTART;
+			}
 		}
+
+		data->flags = msgs[i].flags;
+		data->readb = 0;
+		data->written = 0;
 		data->err = 0;
 
-		Wrap_MXC_I2C_Start(i2c);
+		MXC_I2C_ClearFlags(i2c, ADI_MAX32_I2C_INT_FL0_MASK, ADI_MAX32_I2C_INT_FL1_MASK);
+		MXC_I2C_EnableInt(i2c, ADI_MAX32_I2C_INT_EN0_ERR, 0);
+		Wrap_MXC_I2C_SetRxCount(i2c, req->rx_len);
+
+		if ((data->flags & I2C_MSG_RESTART)) {
+			MXC_I2C_EnableInt(i2c, ADI_MAX32_I2C_INT_EN0_ADDR_ACK, 0);
+			MXC_I2C_Start(i2c);
+			Wrap_MXC_I2C_WaitForRestart(i2c);
+			MXC_I2C_WriteTXFIFO(i2c, &target_rw, 1);
+		} else if (req->tx_len) {
+			MXC_I2C_EnableInt(i2c, ADI_MAX32_I2C_INT_EN0_DONE, 0);
+			i2c->dma |= ADI_MAX32_I2C_DMA_TX_EN;
+		}
+
 		ret = k_sem_take(&data->xfer, K_FOREVER);
-		Wrap_MXC_I2C_SetIntEn(i2c, 0, 0);
-		i2c->dma &= ~(ADI_MAX32_I2C_DMA_TX_EN | ADI_MAX32_I2C_DMA_RX_EN);
+
+		i2c->dma &= ~(ADI_MAX32_I2C_DMA_TX_EN);
+		i2c->dma &= ~(ADI_MAX32_I2C_DMA_RX_EN);
 
 		if (data->err) {
 			ret = data->err;
@@ -416,6 +445,7 @@ static int i2c_max32_transfer_dma(const struct device *dev, struct i2c_msg *msgs
 			MXC_I2C_Stop(i2c);
 			dma_stop(cfg->tx_dma.dev, cfg->tx_dma.channel);
 			dma_stop(cfg->rx_dma.dev, cfg->rx_dma.channel);
+			break;
 		}
 	}
 
@@ -785,6 +815,8 @@ static void i2c_max32_isr_controller(const struct device *dev, mxc_i2c_regs_t *i
 static void i2c_max32_isr_controller_dma(const struct device *dev, mxc_i2c_regs_t *i2c)
 {
 	struct max32_i2c_data *data = dev->data;
+	const struct max32_i2c_config *cfg = dev->config;
+	struct dma_status dma_stat;
 	uint32_t int_fl0, int_fl1;
 	uint32_t int_en0, int_en1;
 
@@ -797,7 +829,34 @@ static void i2c_max32_isr_controller_dma(const struct device *dev, mxc_i2c_regs_
 		Wrap_MXC_I2C_SetIntEn(i2c, 0, 0);
 		k_sem_give(&data->xfer);
 	} else {
-		if (!data->err && (int_en0 & ADI_MAX32_I2C_INT_EN0_DONE)) {
+		/* Run DMA once address is acknowledged */
+		if ((int_fl0 & ADI_MAX32_I2C_INT_FL0_ADDR_ACK)) {
+			MXC_I2C_DisableInt(i2c, ADI_MAX32_I2C_INT_EN0_ADDR_ACK, 0);
+			MXC_I2C_EnableInt(i2c, ADI_MAX32_I2C_INT_EN0_DONE, 0);
+			if (data->flags & I2C_MSG_READ) {
+				i2c->dma |= ADI_MAX32_I2C_DMA_RX_EN;
+			} else {
+				i2c->dma |= ADI_MAX32_I2C_DMA_TX_EN;
+			}
+		} else if ((int_fl0 & ADI_MAX32_I2C_INT_FL0_DONE)) {
+			MXC_I2C_DisableInt(i2c, ADI_MAX32_I2C_INT_EN0_DONE, 0);
+			if ((data->flags & I2C_MSG_READ)) {
+				dma_get_status(cfg->rx_dma.dev, cfg->rx_dma.channel, &dma_stat);
+				/* Send RESTART if more data is expected */
+				if (dma_stat.pending_length > 0) {
+					Wrap_MXC_I2C_SetRxCount(i2c, dma_stat.pending_length);
+					MXC_I2C_EnableInt(i2c, ADI_MAX32_I2C_INT_EN0_ADDR_ACK, 0);
+					i2c->fifo = (data->req.addr << 1) | 0x1;
+					Wrap_MXC_I2C_Restart(i2c);
+				} else {
+					k_sem_give(&data->xfer);
+				}
+			} else {
+				k_sem_give(&data->xfer);
+			}
+		} else if ((int_fl0 & ADI_MAX32_I2C_INT_FL0_TX_THD)) {
+			MXC_I2C_DisableInt(
+				i2c, ADI_MAX32_I2C_INT_EN0_DONE | ADI_MAX32_I2C_INT_EN0_TX_THD, 0);
 			k_sem_give(&data->xfer);
 		}
 	}
diff --git a/drivers/i2c/i2c_mcux_lpi2c_rtio.c b/drivers/i2c/i2c_mcux_lpi2c_rtio.c
index f267b7ada4ce1..a4ac9a2f20c38 100644
--- a/drivers/i2c/i2c_mcux_lpi2c_rtio.c
+++ b/drivers/i2c/i2c_mcux_lpi2c_rtio.c
@@ -16,6 +16,9 @@
 #include <zephyr/kernel.h>
 #include <zephyr/irq.h>
 #include <fsl_lpi2c.h>
+#if CONFIG_NXP_LP_FLEXCOMM
+#include <zephyr/drivers/mfd/nxp_lp_flexcomm.h>
+#endif
 
 #include <zephyr/drivers/pinctrl.h>
 
@@ -280,7 +283,11 @@ static void mcux_lpi2c_isr(const struct device *dev)
 	struct mcux_lpi2c_data *data = dev->data;
 	LPI2C_Type *base = (LPI2C_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
 
+#if CONFIG_HAS_MCUX_FLEXCOMM
+	LPI2C_MasterTransferHandleIRQ(LPI2C_GetInstance(base), &data->handle);
+#else
 	LPI2C_MasterTransferHandleIRQ(base, &data->handle);
+#endif
 }
 
 static int mcux_lpi2c_init(const struct device *dev)
@@ -346,10 +353,41 @@ static DEVICE_API(i2c, mcux_lpi2c_driver_api) = {
 #define I2C_MCUX_LPI2C_SDA_INIT(n)
 #endif /* CONFIG_I2C_MCUX_LPI2C_BUS_RECOVERY */
 
+#define I2C_MCUX_LPI2C_MODULE_IRQ_CONNECT(n)				\
+	do {								\
+		IRQ_CONNECT(DT_INST_IRQN(n),				\
+			DT_INST_IRQ(n, priority),			\
+			mcux_lpi2c_isr,					\
+			DEVICE_DT_INST_GET(n), 0);			\
+		irq_enable(DT_INST_IRQN(n));				\
+	} while (false)
+
+#define I2C_MCUX_LPI2C_MODULE_IRQ(n)					\
+	IF_ENABLED(DT_INST_IRQ_HAS_IDX(n, 0),				\
+		(I2C_MCUX_LPI2C_MODULE_IRQ_CONNECT(n)))
+
+/* When using LP Flexcomm driver, register the interrupt handler
+ * so we receive notification from the LP Flexcomm interrupt handler.
+ */
+#define I2C_MCUX_LPI2C_LPFLEXCOMM_IRQ_FUNC(n)				\
+	nxp_lp_flexcomm_setirqhandler(DEVICE_DT_GET(DT_INST_PARENT(n)), \
+					DEVICE_DT_INST_GET(n),		\
+					LP_FLEXCOMM_PERIPH_LPI2C,	\
+					mcux_lpi2c_isr)
+
+#define I2C_MCUX_LPI2C_IRQ_SETUP_FUNC(n)				\
+	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_INST_PARENT(n),		\
+					nxp_lp_flexcomm),		\
+		    (I2C_MCUX_LPI2C_LPFLEXCOMM_IRQ_FUNC(n)),		\
+		    (I2C_MCUX_LPI2C_MODULE_IRQ(n)))
+
 #define I2C_MCUX_LPI2C_INIT(n)						\
 	PINCTRL_DT_INST_DEFINE(n);					\
 									\
-	static void mcux_lpi2c_config_func_##n(const struct device *dev); \
+	static void mcux_lpi2c_config_func_##n(const struct device *dev)\
+	{								\
+		I2C_MCUX_LPI2C_IRQ_SETUP_FUNC(n);			\
+	}								\
 									\
 	static const struct mcux_lpi2c_config mcux_lpi2c_config_##n = {	\
 		DEVICE_MMIO_NAMED_ROM_INIT(reg_base, DT_DRV_INST(n)),	\
@@ -378,16 +416,6 @@ static DEVICE_API(i2c, mcux_lpi2c_driver_api) = {
 				&mcux_lpi2c_data_##n,			\
 				&mcux_lpi2c_config_##n, POST_KERNEL,	\
 				CONFIG_I2C_INIT_PRIORITY,		\
-				&mcux_lpi2c_driver_api);		\
-									\
-	static void mcux_lpi2c_config_func_##n(const struct device *dev)\
-	{								\
-		IRQ_CONNECT(DT_INST_IRQN(n),				\
-				DT_INST_IRQ(n, priority),		\
-				mcux_lpi2c_isr,				\
-				DEVICE_DT_INST_GET(n), 0);		\
-									\
-		irq_enable(DT_INST_IRQN(n));				\
-	}
+				&mcux_lpi2c_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(I2C_MCUX_LPI2C_INIT)
diff --git a/drivers/i2c/i2c_npcx_controller.c b/drivers/i2c/i2c_npcx_controller.c
index 6c6cac01c7cdb..ceded75ed1654 100644
--- a/drivers/i2c/i2c_npcx_controller.c
+++ b/drivers/i2c/i2c_npcx_controller.c
@@ -108,6 +108,8 @@ LOG_MODULE_REGISTER(i2c_npcx, CONFIG_I2C_LOG_LEVEL);
 #define I2C_RECOVER_SCL_RETRY    10
 #define I2C_RECOVER_SDA_RETRY    3
 
+#define NPCX_SMBADDR_SAEN NPCX_SMBADDR1_SAEN /* All the SAEN in SMBADDR is bit_7 */
+
 /* Supported I2C bus frequency */
 enum npcx_i2c_freq {
 	NPCX_I2C_BUS_SPEED_100KHZ,
@@ -116,7 +118,14 @@ enum npcx_i2c_freq {
 };
 
 enum npcx_i2c_flag {
-	NPCX_I2C_FLAG_TARGET,
+	NPCX_I2C_FLAG_TARGET1,
+	NPCX_I2C_FLAG_TARGET2,
+	NPCX_I2C_FLAG_TARGET3,
+	NPCX_I2C_FLAG_TARGET4,
+	NPCX_I2C_FLAG_TARGET5,
+	NPCX_I2C_FLAG_TARGET6,
+	NPCX_I2C_FLAG_TARGET7,
+	NPCX_I2C_FLAG_TARGET8,
 	NPCX_I2C_FLAG_COUNT,
 };
 
@@ -168,15 +177,19 @@ struct i2c_ctrl_data {
 	enum npcx_i2c_oper_state oper_state; /* controller operation state */
 	int trans_err;  /* error code during transaction */
 	struct i2c_msg *msg; /* cache msg for transaction state machine */
+	struct i2c_msg *msg_head;
 	int is_write; /* direction of current msg */
 	uint8_t *ptr_msg; /* current msg pointer for FIFO read/write */
 	uint16_t addr; /* slave address of transaction */
+	uint8_t msg_max_num;
+	uint8_t msg_curr_idx;
 	uint8_t port; /* current port used the controller */
 	bool is_configured; /* is port configured? */
 	const struct npcx_i2c_timing_cfg *ptr_speed_confs;
 #ifdef CONFIG_I2C_TARGET
-	struct i2c_target_config *target_cfg;
-	atomic_t flags;
+	struct i2c_target_config *target_cfg[NPCX_I2C_FLAG_COUNT];
+	uint8_t target_idx; /* current target_cfg index */
+	atomic_t registered_target_mask;
 	/* i2c wake-up callback configuration */
 	struct miwu_callback smb_wk_cb;
 #endif /* CONFIG_I2C_TARGET */
@@ -639,6 +652,24 @@ static void i2c_ctrl_handle_write_int_event(const struct device *dev)
 			/* Wait for STOP completed */
 			data->oper_state = NPCX_I2C_WAIT_STOP;
 		} else {
+			uint8_t next_msg_idx = data->msg_curr_idx + 1;
+
+			if (next_msg_idx < data->msg_max_num) {
+				struct i2c_msg *msg;
+
+				data->msg_curr_idx = next_msg_idx;
+				msg = data->msg_head + next_msg_idx;
+				data->msg = msg;
+				data->ptr_msg = msg->buf;
+				if ((msg->flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) {
+					data->oper_state = NPCX_I2C_WRITE_FIFO;
+				} else {
+					data->is_write = 0;
+					data->oper_state = NPCX_I2C_WAIT_RESTART;
+					i2c_ctrl_start(dev);
+				}
+				return;
+			}
 			/* Disable interrupt and handle next message */
 			i2c_ctrl_irq_enable(dev, 0);
 		}
@@ -702,6 +733,27 @@ static void i2c_ctrl_handle_read_int_event(const struct device *dev)
 			/* Release bus */
 			i2c_ctrl_hold_bus(dev, 0);
 			return;
+		} else if ((data->msg->flags & I2C_MSG_STOP) == 0) {
+			uint8_t next_msg_idx = data->msg_curr_idx + 1;
+
+			if (next_msg_idx < data->msg_max_num) {
+				struct i2c_msg *msg;
+
+				msg = data->msg_head + next_msg_idx;
+				if ((msg->flags & I2C_MSG_RW_MASK) == I2C_MSG_READ) {
+
+					data->msg_curr_idx = next_msg_idx;
+					data->msg = msg;
+					data->ptr_msg = msg->buf;
+
+					/* Setup threshold of RX FIFO first */
+					i2c_ctrl_fifo_rx_setup_threshold_nack(
+						dev, msg->len, (msg->flags & I2C_MSG_STOP) != 0);
+					/* Release bus */
+					i2c_ctrl_hold_bus(dev, 0);
+					return;
+				}
+			}
 		}
 	}
 
@@ -805,7 +857,7 @@ static void i2c_ctrl_target_isr(const struct device *dev, uint8_t status)
 {
 	struct smb_reg *const inst = HAL_I2C_INSTANCE(dev);
 	struct i2c_ctrl_data *const data = dev->data;
-	const struct i2c_target_callbacks *target_cb = data->target_cfg->callbacks;
+	const struct i2c_target_callbacks *target_cb = NULL;
 	uint8_t val = 0;
 
 	/* A 'Bus Error' has been identified */
@@ -813,9 +865,11 @@ static void i2c_ctrl_target_isr(const struct device *dev, uint8_t status)
 		/* Clear BER Bit */
 		inst->SMBST = BIT(NPCX_SMBST_BER);
 
+		target_cb = data->target_cfg[data->target_idx]->callbacks;
+
 		/* Notify upper layer the end of transaction */
-		if (target_cb->stop) {
-			target_cb->stop(data->target_cfg);
+		if ((target_cb != NULL) && target_cb->stop) {
+			target_cb->stop(data->target_cfg[data->target_idx]);
 		}
 
 		/* Reset i2c module in target mode */
@@ -845,8 +899,9 @@ static void i2c_ctrl_target_isr(const struct device *dev, uint8_t status)
 		/* End of transaction */
 		data->oper_state = NPCX_I2C_IDLE;
 		/* Notify upper layer a STOP condition received */
-		if (target_cb->stop) {
-			target_cb->stop(data->target_cfg);
+		target_cb = data->target_cfg[data->target_idx]->callbacks;
+		if ((target_cb != NULL) && target_cb->stop) {
+			target_cb->stop(data->target_cfg[data->target_idx]);
 		}
 
 #ifdef CONFIG_PM
@@ -868,21 +923,36 @@ static void i2c_ctrl_target_isr(const struct device *dev, uint8_t status)
 		/* Clear NMATCH Bit */
 		inst->SMBST = BIT(NPCX_SMBST_NMATCH);
 
+		/* Check MATCH1F ~ MATCH7F */
+		if (inst->SMBCST2 & ~BIT(NPCX_SMBCST2_INTSTS)) {
+			for (uint8_t addr_idx = NPCX_I2C_FLAG_TARGET1;
+			     addr_idx <= NPCX_I2C_FLAG_TARGET7; addr_idx++) {
+				if (inst->SMBCST2 & BIT(addr_idx)) {
+					data->target_idx = addr_idx;
+					break;
+				}
+			}
+		} else if (inst->SMBCST3 & BIT(NPCX_SMBCST3_MATCHA8F)) {
+			data->target_idx = NPCX_I2C_FLAG_TARGET8;
+		}
+
+		target_cb = data->target_cfg[data->target_idx]->callbacks;
+
 		/* Distinguish the direction of i2c target mode by reading XMIT bit */
 		if (IS_BIT_SET(inst->SMBST, NPCX_SMBST_XMIT)) {
 			/* Start transmitting data in i2c target mode */
 			data->oper_state = NPCX_I2C_WRITE_FIFO;
 			/* Write first requested byte after repeated start */
-			if (target_cb->read_requested) {
-				target_cb->read_requested(data->target_cfg, &val);
+			if ((target_cb != NULL) && target_cb->read_requested) {
+				target_cb->read_requested(data->target_cfg[data->target_idx], &val);
 			}
 			inst->SMBSDA = val;
 		} else {
 			/* Start receiving data in i2c target mode */
 			data->oper_state = NPCX_I2C_READ_FIFO;
 
-			if (target_cb->write_requested) {
-				target_cb->write_requested(data->target_cfg);
+			if ((target_cb != NULL) && target_cb->write_requested) {
+				target_cb->write_requested(data->target_cfg[data->target_idx]);
 			}
 		}
 		return;
@@ -890,17 +960,19 @@ static void i2c_ctrl_target_isr(const struct device *dev, uint8_t status)
 
 	/* Tx byte empty or Rx byte full has occurred */
 	if (IS_BIT_SET(status, NPCX_SMBST_SDAST)) {
+		target_cb = data->target_cfg[data->target_idx]->callbacks;
+
 		if (data->oper_state == NPCX_I2C_WRITE_FIFO) {
 			/* Notify upper layer one byte will be transmitted */
-			if (target_cb->read_processed) {
-				target_cb->read_processed(data->target_cfg, &val);
+			if ((target_cb != NULL) && target_cb->read_processed) {
+				target_cb->read_processed(data->target_cfg[data->target_idx], &val);
 			}
 			inst->SMBSDA = val;
 		} else if (data->oper_state == NPCX_I2C_READ_FIFO) {
-			if (target_cb->write_received) {
+			if ((target_cb != NULL) && target_cb->write_received) {
 				val = inst->SMBSDA;
 				/* Notify upper layer one byte received */
-				target_cb->write_received(data->target_cfg, val);
+				target_cb->write_received(data->target_cfg[data->target_idx], val);
 			}
 		} else {
 			LOG_ERR("Unexpected oper state %d on i2c target port%02x!",
@@ -929,7 +1001,7 @@ static void i2c_ctrl_isr(const struct device *dev)
 	LOG_DBG("status: %02x, %d", status, data->oper_state);
 
 #ifdef CONFIG_I2C_TARGET
-	if (atomic_test_bit(&data->flags, NPCX_I2C_FLAG_TARGET)) {
+	if (atomic_get(&data->registered_target_mask) != (atomic_val_t) 0) {
 		i2c_ctrl_target_isr(dev, status);
 		return;
 	}
@@ -1128,6 +1200,34 @@ int npcx_i2c_ctrl_recover_bus(const struct device *dev)
 }
 
 #ifdef CONFIG_I2C_TARGET
+static volatile uint8_t *npcx_i2c_ctrl_target_get_reg_smbaddr(const struct device *i2c_dev,
+							      int index)
+{
+	struct smb_reg *const inst = HAL_I2C_INSTANCE(i2c_dev);
+
+	switch (index) {
+	case 0:
+		return &inst->SMBADDR1;
+	case 1:
+		return &inst->SMBADDR2;
+	case 2:
+		return &inst->SMBADDR3;
+	case 3:
+		return &inst->SMBADDR4;
+	case 4:
+		return &inst->SMBADDR5;
+	case 5:
+		return &inst->SMBADDR6;
+	case 6:
+		return &inst->SMBADDR7;
+	case 7:
+		return &inst->SMBADDR8;
+	default:
+		LOG_ERR("Invalid SMBADDR index: %d", index);
+		return NULL;
+	}
+}
+
 int npcx_i2c_ctrl_target_register(const struct device *i2c_dev,
 				 struct i2c_target_config *target_cfg, uint8_t port)
 {
@@ -1136,22 +1236,50 @@ int npcx_i2c_ctrl_target_register(const struct device *i2c_dev,
 	struct i2c_ctrl_data *const data = i2c_dev->data;
 	int idx_ctrl = (port & 0xF0) >> 4;
 	int idx_port = (port & 0x0F);
-	uint8_t addr = BIT(NPCX_SMBADDR1_SAEN) | target_cfg->address;
-
-	/* I2c module has been configured to target mode */
-	if (atomic_test_and_set_bit(&data->flags, NPCX_I2C_FLAG_TARGET)) {
-		return -EBUSY;
-	}
+	int avail_addr_slot;
+	volatile uint8_t *reg_smbaddr;
+	uint8_t smbaddr_val = BIT(NPCX_SMBADDR_SAEN) | target_cfg->address;
+	uint32_t i2c_tgt_mask = (uint32_t)atomic_get(&data->registered_target_mask);
+	int addr_idx;
 
 	/* A transiaction is ongoing */
 	if (data->oper_state != NPCX_I2C_IDLE) {
-		atomic_clear_bit(&data->flags, NPCX_I2C_FLAG_TARGET);
 		return -EBUSY;
 	}
 
-	data->target_cfg = target_cfg;
+	/* Find valid smbaddr location */
+	avail_addr_slot = find_lsb_set(~i2c_tgt_mask) - 1;
+	if (avail_addr_slot == -1 || avail_addr_slot >= NPCX_I2C_FLAG_COUNT) {
+		LOG_ERR("No available smbaddr register, smbaddr_idx: %d", avail_addr_slot);
+		return -ENOSPC;
+	}
+
+	/* Check if the address is duplicated */
+	while (i2c_tgt_mask) {
+		addr_idx = find_lsb_set(i2c_tgt_mask) - 1;
+		reg_smbaddr = npcx_i2c_ctrl_target_get_reg_smbaddr(i2c_dev, addr_idx);
+
+		/* Check if the address is duplicated */
+		if (*reg_smbaddr == smbaddr_val) {
+			LOG_ERR("Address %#x is already set", target_cfg->address);
+			return -EINVAL;
+		}
+
+		i2c_tgt_mask &= ~BIT(addr_idx);
+	}
+
+	/* Mark the selected address slot */
+	atomic_set_bit(&data->registered_target_mask, avail_addr_slot);
 
 	i2c_ctrl_irq_enable(i2c_dev, 0);
+
+	data->port = port; /* Update the I2C port index */
+
+	/* Config new address */
+	reg_smbaddr = npcx_i2c_ctrl_target_get_reg_smbaddr(i2c_dev, avail_addr_slot);
+	*reg_smbaddr = smbaddr_val; /* Set address register */
+	data->target_cfg[avail_addr_slot] = target_cfg; /* Set target config */
+
 	/* Switch correct port for i2c controller first */
 	npcx_pinctrl_i2c_port_sel(idx_ctrl, idx_port);
 	/* Reset I2C module */
@@ -1161,7 +1289,6 @@ int npcx_i2c_ctrl_target_register(const struct device *i2c_dev,
 	/* Select normal bank and single byte mode for i2c target mode */
 	i2c_ctrl_bank_sel(i2c_dev, NPCX_I2C_BANK_NORMAL);
 	inst->SMBFIF_CTL &= ~BIT(NPCX_SMBFIF_CTL_FIFO_EN);
-	inst->SMBADDR1 = addr; /* Enable target mode and configure its address */
 
 	/* Reconfigure SMBCTL1 */
 	inst->SMBCTL1 |= BIT(NPCX_SMBCTL1_NMINTE) | BIT(NPCX_SMBCTL1_INTEN);
@@ -1176,6 +1303,7 @@ int npcx_i2c_ctrl_target_register(const struct device *i2c_dev,
 		/* Enable SMB's MIWU interrupts */
 		npcx_miwu_irq_enable(&config->smb_wui);
 	}
+
 	i2c_ctrl_irq_enable(i2c_dev, 1);
 
 	return 0;
@@ -1188,9 +1316,14 @@ int npcx_i2c_ctrl_target_unregister(const struct device *i2c_dev,
 	const struct i2c_ctrl_config *const config = i2c_dev->config;
 	struct i2c_ctrl_data *const data = i2c_dev->data;
 	int idx_ctrl = (port & 0xF0) >> 4;
+	int cur_addr_slot;
+	volatile uint8_t *reg_smbaddr;
+	uint8_t smbaddr_val = BIT(NPCX_SMBADDR_SAEN) | target_cfg->address;
+	uint32_t i2c_tgt_mask = (uint32_t)atomic_get(&data->registered_target_mask);
 
 	/* No I2c module has been configured to target mode */
-	if (!atomic_test_bit(&data->flags, NPCX_I2C_FLAG_TARGET)) {
+	if (atomic_get(&data->registered_target_mask) == (atomic_val_t) 0) {
+		LOG_ERR("No available target to ungister");
 		return -EINVAL;
 	}
 
@@ -1198,34 +1331,63 @@ int npcx_i2c_ctrl_target_unregister(const struct device *i2c_dev,
 	if (data->oper_state != NPCX_I2C_IDLE) {
 		return -EBUSY;
 	}
-	data->target_cfg = NULL;
+
+	/* Find target address in smbaddr */
+	while (i2c_tgt_mask) {
+		cur_addr_slot = find_lsb_set(i2c_tgt_mask) - 1;
+		reg_smbaddr = npcx_i2c_ctrl_target_get_reg_smbaddr(i2c_dev, cur_addr_slot);
+		if (reg_smbaddr == NULL) {
+			LOG_ERR("Invalid smbaddr register");
+			return -EINVAL;
+		}
+
+		/* Target address found */
+		if (*reg_smbaddr == smbaddr_val) {
+			break;
+		}
+
+		i2c_tgt_mask &= ~BIT(cur_addr_slot);
+	}
+
+	/* Input addrss is not in the smbaddr */
+	if (i2c_tgt_mask == 0 || reg_smbaddr == NULL) {
+		LOG_ERR("Address %#x is not found", target_cfg->address);
+		return -EINVAL;
+	}
 
 	i2c_ctrl_irq_enable(i2c_dev, 0);
-	/* Reset I2C module */
-	inst->SMBCTL2 &= ~BIT(NPCX_SMBCTL2_ENABLE);
-	inst->SMBCTL2 |= BIT(NPCX_SMBCTL2_ENABLE);
 
-	inst->SMBADDR1 = 0; /* Disable target mode and clear address setting */
-	/* Enable FIFO mode and select to FIFO bank for i2c controller mode */
-	inst->SMBFIF_CTL |= BIT(NPCX_SMBFIF_CTL_FIFO_EN);
-	i2c_ctrl_bank_sel(i2c_dev, NPCX_I2C_BANK_FIFO);
+	*reg_smbaddr = 0; /* Disable target mode and clear address setting */
+	data->target_cfg[cur_addr_slot] = NULL; /* Clear target config */
 
-	/* Reconfigure SMBCTL1 */
-	inst->SMBCTL1 |= BIT(NPCX_SMBCTL1_NMINTE) | BIT(NPCX_SMBCTL1_INTEN);
+	/* Mark it as controller mode */
+	atomic_clear_bit(&data->registered_target_mask, cur_addr_slot);
+
+	/* Switch I2C to controller mode if no any other valid address in smbaddr */
+	if (atomic_get(&data->registered_target_mask) == (atomic_val_t) 0) {
+		/* Reset I2C module */
+		inst->SMBCTL2 &= ~BIT(NPCX_SMBCTL2_ENABLE);
+		inst->SMBCTL2 |= BIT(NPCX_SMBCTL2_ENABLE);
+
+		/* Enable FIFO mode and select to FIFO bank for i2c controller mode */
+		inst->SMBFIF_CTL |= BIT(NPCX_SMBFIF_CTL_FIFO_EN);
+		i2c_ctrl_bank_sel(i2c_dev, NPCX_I2C_BANK_FIFO);
 
-	/* Disable irq of smb wake-up event */
-	if (IS_ENABLED(CONFIG_PM)) {
-		/* Disable SMB wake up detection */
-		npcx_i2c_target_start_wk_enable(idx_ctrl, false);
-		/* Disable start detect in IDLE */
-		inst->SMBCTL3 &= ~BIT(NPCX_SMBCTL3_IDL_START);
-		/* Disable SMB's MIWU interrupts */
-		npcx_miwu_irq_disable(&config->smb_wui);
+		/* Reconfigure SMBCTL1 */
+		inst->SMBCTL1 |= BIT(NPCX_SMBCTL1_NMINTE) | BIT(NPCX_SMBCTL1_INTEN);
 
+		/* Disable irq of smb wake-up event */
+		if (IS_ENABLED(CONFIG_PM)) {
+			/* Disable SMB wake up detection */
+			npcx_i2c_target_start_wk_enable(idx_ctrl, false);
+			/* Disable start detect in IDLE */
+			inst->SMBCTL3 &= ~BIT(NPCX_SMBCTL3_IDL_START);
+			/* Disable SMB's MIWU interrupts */
+			npcx_miwu_irq_disable(&config->smb_wui);
+		}
 	}
+
 	i2c_ctrl_irq_enable(i2c_dev, 1);
-	/* Mark it as controller mode */
-	atomic_clear_bit(&data->flags, NPCX_I2C_FLAG_TARGET);
 
 	return 0;
 }
@@ -1258,11 +1420,11 @@ int npcx_i2c_ctrl_transfer(const struct device *i2c_dev, struct i2c_msg *msgs,
 {
 	struct i2c_ctrl_data *const data = i2c_dev->data;
 	int ret = 0;
-	uint8_t i;
+	struct i2c_msg *msg = msgs;
 
 #ifdef CONFIG_I2C_TARGET
 	/* I2c module has been configured to target mode */
-	if (atomic_test_bit(&data->flags, NPCX_I2C_FLAG_TARGET)) {
+	if (atomic_get(&data->registered_target_mask) != (atomic_val_t) 0) {
 		return -EBUSY;
 	}
 #endif /* CONFIG_I2C_TARGET */
@@ -1297,6 +1459,10 @@ int npcx_i2c_ctrl_transfer(const struct device *i2c_dev, struct i2c_msg *msgs,
 	data->trans_err = 0;
 	data->addr = addr;
 
+	data->msg_head = msgs;
+	data->msg_max_num = num_msgs;
+	data->msg_curr_idx = 0;
+
 	/*
 	 * Reset i2c event-completed semaphore before starting transactions.
 	 * Some interrupt events such as BUS_ERROR might change its counter
@@ -1304,18 +1470,10 @@ int npcx_i2c_ctrl_transfer(const struct device *i2c_dev, struct i2c_msg *msgs,
 	 */
 	k_sem_reset(&data->sync_sem);
 
-	for (i = 0U; i < num_msgs; i++) {
-		struct i2c_msg *msg = msgs + i;
-
-		/* Handle write transaction */
-		if ((msg->flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) {
-			ret = i2c_ctrl_proc_write_msg(i2c_dev, msg);
-		} else {/* Handle read transaction */
-			ret = i2c_ctrl_proc_read_msg(i2c_dev, msg);
-		}
-		if (ret < 0) {
-			break;
-		}
+	if ((msg->flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) {
+		ret = i2c_ctrl_proc_write_msg(i2c_dev, msg);
+	} else { /* Handle read transaction */
+		ret = i2c_ctrl_proc_read_msg(i2c_dev, msg);
 	}
 
 	/* Check STOP completed? */
diff --git a/drivers/i2c/i2c_npcx_port.c b/drivers/i2c/i2c_npcx_port.c
index 37505787319d1..61f65cd6683b6 100644
--- a/drivers/i2c/i2c_npcx_port.c
+++ b/drivers/i2c/i2c_npcx_port.c
@@ -147,6 +147,7 @@ static int i2c_npcx_port_recover_bus(const struct device *dev)
 static int i2c_npcx_target_register(const struct device *dev,
 				  struct i2c_target_config *target_cfg)
 {
+	int ret;
 	const struct i2c_npcx_port_config *const config = dev->config;
 
 	if (!target_cfg) {
@@ -158,12 +159,21 @@ static int i2c_npcx_target_register(const struct device *dev,
 		return -EIO;
 	}
 
-	return npcx_i2c_ctrl_target_register(config->i2c_ctrl, target_cfg, config->port);
+	/* Lock mutex of i2c/smb controller */
+	npcx_i2c_ctrl_mutex_lock(config->i2c_ctrl);
+
+	ret = npcx_i2c_ctrl_target_register(config->i2c_ctrl, target_cfg, config->port);
+
+	/* Unlock mutex of i2c/smb controller */
+	npcx_i2c_ctrl_mutex_unlock(config->i2c_ctrl);
+
+	return ret;
 }
 
 static int i2c_npcx_target_unregister(const struct device *dev,
 				     struct i2c_target_config *target_cfg)
 {
+	int ret;
 	const struct i2c_npcx_port_config *const config = dev->config;
 
 	if (config->i2c_ctrl == NULL) {
@@ -171,7 +181,15 @@ static int i2c_npcx_target_unregister(const struct device *dev,
 		return -EIO;
 	}
 
-	return npcx_i2c_ctrl_target_unregister(config->i2c_ctrl, target_cfg, config->port);
+	/* Lock mutex of i2c/smb controller */
+	npcx_i2c_ctrl_mutex_lock(config->i2c_ctrl);
+
+	ret = npcx_i2c_ctrl_target_unregister(config->i2c_ctrl, target_cfg, config->port);
+
+	/* Unlock mutex of i2c/smb controller */
+	npcx_i2c_ctrl_mutex_unlock(config->i2c_ctrl);
+
+	return ret;
 }
 #endif
 
diff --git a/drivers/i2c/i2c_nrfx_twi_rtio.c b/drivers/i2c/i2c_nrfx_twi_rtio.c
index 9dc1b54914cd6..8775522b66a06 100644
--- a/drivers/i2c/i2c_nrfx_twi_rtio.c
+++ b/drivers/i2c/i2c_nrfx_twi_rtio.c
@@ -41,6 +41,8 @@ static bool i2c_nrfx_twi_rtio_msg_start(const struct device *dev, uint8_t flags,
 	struct i2c_nrfx_twi_rtio_data *const dev_data = dev->data;
 	struct i2c_rtio *ctx = dev_data->ctx;
 	int ret = 0;
+	bool more_msgs = (rtio_txn_next(ctx->txn_curr) != NULL) &&
+			 ((ctx->txn_curr->next->sqe.iodev_flags & RTIO_IODEV_I2C_RESTART) == 0);
 
 	/** Enabling while already enabled ends up in a failed assertion: skip it. */
 	if (!dev_data->twi_enabled) {
@@ -48,7 +50,7 @@ static bool i2c_nrfx_twi_rtio_msg_start(const struct device *dev, uint8_t flags,
 		dev_data->twi_enabled = true;
 	}
 
-	ret = i2c_nrfx_twi_msg_transfer(dev, flags, buf, buf_len, i2c_addr, false);
+	ret = i2c_nrfx_twi_msg_transfer(dev, flags, buf, buf_len, i2c_addr, more_msgs);
 	if (ret != 0) {
 		nrfx_twi_disable(&config->twi);
 		dev_data->twi_enabled = false;
@@ -80,7 +82,11 @@ static bool i2c_nrfx_twi_rtio_start(const struct device *dev)
 						   sqe->tx.buf_len, dt_spec->addr);
 	case RTIO_OP_I2C_CONFIGURE:
 		(void)i2c_nrfx_twi_configure(dev, sqe->i2c_config);
-		return false;
+		/** This request will not generate an event therefore, this
+		 * code immediately submits a CQE in order to unblock
+		 * i2c_rtio_configure.
+		 */
+		return i2c_rtio_complete(ctx, 0);
 	case RTIO_OP_I2C_RECOVER:
 		(void)i2c_nrfx_twi_recover_bus(dev);
 		return false;
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 6be4b1c1050a7..953a03a7b73d2 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c/i2c_nrfx_twim.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
@@ -33,6 +34,29 @@ struct i2c_nrfx_twim_data {
 	volatile nrfx_err_t res;
 };
 
+int i2c_nrfx_twim_exclusive_access_acquire(const struct device *dev, k_timeout_t timeout)
+{
+	struct i2c_nrfx_twim_data *dev_data = dev->data;
+	int ret;
+
+	ret = k_sem_take(&dev_data->transfer_sync, timeout);
+
+	if (ret == 0) {
+		(void)pm_device_runtime_get(dev);
+	}
+
+	return ret;
+}
+
+void i2c_nrfx_twim_exclusive_access_release(const struct device *dev)
+{
+	struct i2c_nrfx_twim_data *dev_data = dev->data;
+
+	(void)pm_device_runtime_put(dev);
+
+	k_sem_give(&dev_data->transfer_sync);
+}
+
 static int i2c_nrfx_twim_transfer(const struct device *dev,
 				  struct i2c_msg *msgs,
 				  uint8_t num_msgs, uint16_t addr)
@@ -46,13 +70,11 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 	uint8_t *buf;
 	uint16_t buf_len;
 
-	k_sem_take(&dev_data->transfer_sync, K_FOREVER);
+	(void)i2c_nrfx_twim_exclusive_access_acquire(dev, K_FOREVER);
 
 	/* Dummy take on completion_sync sem to be sure that it is empty */
 	k_sem_take(&dev_data->completion_sync, K_NO_WAIT);
 
-	(void)pm_device_runtime_get(dev);
-
 	for (size_t i = 0; i < num_msgs; i++) {
 		if (I2C_MSG_ADDR_10_BITS & msgs[i].flags) {
 			ret = -ENOTSUP;
@@ -164,9 +186,7 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
 		msg_buf_used = 0;
 	}
 
-	(void)pm_device_runtime_put(dev);
-
-	k_sem_give(&dev_data->transfer_sync);
+	i2c_nrfx_twim_exclusive_access_release(dev);
 
 	return ret;
 }
diff --git a/drivers/i2c/i2c_nrfx_twim_rtio.c b/drivers/i2c/i2c_nrfx_twim_rtio.c
index c41901f8702eb..d2cf14e1a05a5 100644
--- a/drivers/i2c/i2c_nrfx_twim_rtio.c
+++ b/drivers/i2c/i2c_nrfx_twim_rtio.c
@@ -15,6 +15,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_twim.h>
+#include <zephyr/linker/devicetree_regions.h>
 
 #include "i2c_nrfx_twim_common.h"
 
@@ -25,6 +26,11 @@ struct i2c_nrfx_twim_rtio_config {
 	struct i2c_rtio *ctx;
 };
 
+struct i2c_nrfx_twim_rtio_data {
+	uint8_t *user_rx_buf;
+	uint16_t user_rx_buf_size;
+};
+
 static bool i2c_nrfx_twim_rtio_msg_start(const struct device *dev, uint8_t flags, uint8_t *buf,
 					 size_t buf_len, uint16_t i2c_addr)
 {
@@ -43,12 +49,28 @@ static bool i2c_nrfx_twim_rtio_msg_start(const struct device *dev, uint8_t flags
 static bool i2c_nrfx_twim_rtio_start(const struct device *dev)
 {
 	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_nrfx_twim_rtio_data *data = dev->data;
 	struct i2c_rtio *ctx = config->ctx;
 	struct rtio_sqe *sqe = &ctx->txn_curr->sqe;
 	struct i2c_dt_spec *dt_spec = sqe->iodev->data;
 
 	switch (sqe->op) {
 	case RTIO_OP_RX:
+		if (!nrf_dma_accessible_check(&config->common.twim, sqe->rx.buf)) {
+			if (sqe->rx.buf_len > config->common.msg_buf_size) {
+				return i2c_rtio_complete(ctx, -ENOSPC);
+			}
+
+			data->user_rx_buf = sqe->rx.buf;
+			data->user_rx_buf_size = sqe->rx.buf_len;
+			return i2c_nrfx_twim_rtio_msg_start(dev,
+							    I2C_MSG_READ | sqe->iodev_flags,
+							    config->common.msg_buf,
+							    data->user_rx_buf_size,
+							    dt_spec->addr);
+		}
+
+		data->user_rx_buf = NULL;
 		return i2c_nrfx_twim_rtio_msg_start(dev, I2C_MSG_READ | sqe->iodev_flags,
 						    sqe->rx.buf, sqe->rx.buf_len, dt_spec->addr);
 	case RTIO_OP_TINY_TX:
@@ -78,7 +100,11 @@ static bool i2c_nrfx_twim_rtio_start(const struct device *dev)
 						    dt_spec->addr);
 	case RTIO_OP_I2C_CONFIGURE:
 		(void)i2c_nrfx_twim_configure(dev, sqe->i2c_config);
-		return false;
+		/** This request will not generate an event therefore, this
+		 * code immediately submits a CQE in order to unblock
+		 * i2c_rtio_configure.
+		 */
+		return i2c_rtio_complete(ctx, 0);
 	case RTIO_OP_I2C_RECOVER:
 		(void)i2c_nrfx_twim_recover_bus(dev);
 		return false;
@@ -144,8 +170,14 @@ static void i2c_nrfx_twim_rtio_submit(const struct device *dev, struct rtio_iode
 static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 {
 	const struct device *dev = p_context;
+	const struct i2c_nrfx_twim_rtio_config *config = dev->config;
+	struct i2c_nrfx_twim_rtio_data *data = dev->data;
 	int status = p_event->type == NRFX_TWIM_EVT_DONE ? 0 : -EIO;
 
+	if (data->user_rx_buf) {
+		memcpy(data->user_rx_buf, config->common.msg_buf, data->user_rx_buf_size);
+	}
+
 	i2c_nrfx_twim_rtio_complete(dev, status);
 }
 
@@ -175,6 +207,31 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 	COND_CODE_0(CONCAT_BUF_SIZE(idx), (COND_CODE_0(FLASH_BUF_MAX_SIZE(idx), (0), (1))), (1))
 #define MSG_BUF_SIZE(idx) MAX(CONCAT_BUF_SIZE(idx), FLASH_BUF_MAX_SIZE(idx))
 
+#define MSG_BUF_HAS_MEMORY_REGIONS(idx) \
+	DT_NODE_HAS_PROP(I2C(idx), memory_regions)
+
+#define MSG_BUF_LINKER_REGION_NAME(idx) \
+	LINKER_DT_NODE_REGION_NAME(DT_PHANDLE(I2C(idx), memory_regions))
+
+#define MSG_BUF_ATTR_SECTION(idx) \
+	__attribute__((__section__(MSG_BUF_LINKER_REGION_NAME(idx))))
+
+#define MSG_BUF_ATTR(idx)                                                                          \
+	COND_CODE_1(                                                                               \
+		MSG_BUF_HAS_MEMORY_REGIONS(idx),                                                   \
+		(MSG_BUF_ATTR_SECTION(idx)),                                                       \
+		()                                                                                 \
+	)
+
+#define MSG_BUF_SYM(idx) \
+	_CONCAT_3(twim_, idx, _msg_buf)
+
+#define MSG_BUF_DEFINE(idx) \
+	static uint8_t MSG_BUF_SYM(idx)[MSG_BUF_SIZE(idx)] MSG_BUF_ATTR(idx)
+
+#define MAX_TRANSFER_SIZE(idx) \
+	BIT_MASK(DT_PROP(I2C(idx), easydma_maxcnt_bits))
+
 #define I2C_NRFX_TWIM_RTIO_DEVICE(idx)                                                             \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(I2C(idx));                                             \
 	BUILD_ASSERT(I2C_FREQUENCY(idx) != I2C_NRFX_TWIM_INVALID_FREQUENCY,                        \
@@ -184,13 +241,12 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 		IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), nrfx_isr,               \
 			    nrfx_twim_##idx##_irq_handler, 0);                                     \
 	}                                                                                          \
-	IF_ENABLED(                                                                                \
-		USES_MSG_BUF(idx),                                                                 \
-		(static uint8_t twim_##idx##_msg_buf[MSG_BUF_SIZE(idx)] I2C_MEMORY_SECTION(idx);)) \
+	IF_ENABLED(USES_MSG_BUF(idx), (MSG_BUF_DEFINE(idx);))                                      \
 	I2C_RTIO_DEFINE(_i2c##idx##_twim_rtio,                                                     \
 			DT_INST_PROP_OR(n, sq_size, CONFIG_I2C_RTIO_SQ_SIZE),                      \
 			DT_INST_PROP_OR(n, cq_size, CONFIG_I2C_RTIO_CQ_SIZE));                     \
 	PINCTRL_DT_DEFINE(I2C(idx));                                                               \
+	static struct i2c_nrfx_twim_rtio_data twim_##idx##z_data;                                  \
 	static const struct i2c_nrfx_twim_rtio_config twim_##idx##z_config = {                     \
 		.common =                                                                          \
 			{                                                                          \
@@ -205,22 +261,15 @@ int i2c_nrfx_twim_rtio_init(const struct device *dev)
 				.msg_buf_size = MSG_BUF_SIZE(idx),                                 \
 				.irq_connect = irq_connect##idx,                                   \
 				.pcfg = PINCTRL_DT_DEV_CONFIG_GET(I2C(idx)),                       \
-				IF_ENABLED(USES_MSG_BUF(idx), (.msg_buf = twim_##idx##_msg_buf,))  \
-					.max_transfer_size =                                       \
-					BIT_MASK(DT_PROP(I2C(idx), easydma_maxcnt_bits)),          \
+				IF_ENABLED(USES_MSG_BUF(idx), (.msg_buf = MSG_BUF_SYM(idx),))      \
+				.max_transfer_size = MAX_TRANSFER_SIZE(idx),                       \
 			},                                                                         \
 		.ctx = &_i2c##idx##_twim_rtio,                                                     \
 	};                                                                                         \
 	PM_DEVICE_DT_DEFINE(I2C(idx), twim_nrfx_pm_action, PM_DEVICE_ISR_SAFE);                    \
-	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)), NULL,  \
-			     &twim_##idx##z_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,         \
-			     &i2c_nrfx_twim_driver_api)
-
-#define I2C_MEMORY_SECTION(idx)                                                                    \
-	COND_CODE_1(I2C_HAS_PROP(idx, memory_regions),                                             \
-		    (__attribute__((__section__(                                                   \
-			    LINKER_DT_NODE_REGION_NAME(DT_PHANDLE(I2C(idx), memory_regions)))))),  \
-		    ())
+	I2C_DEVICE_DT_DEFINE(I2C(idx), i2c_nrfx_twim_rtio_init, PM_DEVICE_DT_GET(I2C(idx)),        \
+			     &twim_##idx##z_data, &twim_##idx##z_config, POST_KERNEL,              \
+			     CONFIG_I2C_INIT_PRIORITY, &i2c_nrfx_twim_driver_api);
 
 #ifdef CONFIG_HAS_HW_NRF_TWIM0
 I2C_NRFX_TWIM_RTIO_DEVICE(0);
diff --git a/drivers/i2c/i2c_omap.c b/drivers/i2c/i2c_omap.c
index ea953978614ac..222232d106e57 100644
--- a/drivers/i2c/i2c_omap.c
+++ b/drivers/i2c/i2c_omap.c
@@ -12,6 +12,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #ifdef CONFIG_I2C_OMAP_BUS_RECOVERY
 #include "i2c_bitbang.h"
@@ -104,6 +105,7 @@ struct i2c_omap_cfg {
 	DEVICE_MMIO_NAMED_ROM(base);
 	uint32_t irq;
 	uint32_t speed;
+	const struct pinctrl_dev_config *pcfg;
 };
 
 enum i2c_omap_speed {
@@ -680,6 +682,13 @@ static int i2c_omap_init(const struct device *dev)
 {
 	struct i2c_omap_data *data = DEV_DATA(dev);
 	const struct i2c_omap_cfg *cfg = DEV_CFG(dev);
+	int ret;
+
+	ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		LOG_ERR("failed to apply pinctrl");
+		return ret;
+	}
 
 	k_sem_init(&data->lock, 1, 1);
 	/* Set the speed for I2C */
@@ -692,17 +701,24 @@ static int i2c_omap_init(const struct device *dev)
 }
 
 #define I2C_OMAP_INIT(inst)                                                                        \
+	PINCTRL_DT_INST_DEFINE(inst);                                                              \
 	LOG_INSTANCE_REGISTER(omap_i2c, inst, CONFIG_I2C_LOG_LEVEL);                               \
 	static const struct i2c_omap_cfg i2c_omap_cfg_##inst = {                                   \
 		DEVICE_MMIO_NAMED_ROM_INIT(base, DT_DRV_INST(inst)),                               \
 		.irq = DT_INST_IRQN(inst),                                                         \
 		.speed = DT_INST_PROP(inst, clock_frequency),                                      \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),                                      \
 	};                                                                                         \
                                                                                                    \
 	static struct i2c_omap_data i2c_omap_data_##inst;                                          \
                                                                                                    \
-	I2C_DEVICE_DT_INST_DEFINE(inst, i2c_omap_init, NULL, &i2c_omap_data_##inst,                \
-				  &i2c_omap_cfg_##inst, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,     \
-				  &i2c_omap_api);
+	I2C_DEVICE_DT_INST_DEFINE(inst,                                                            \
+		i2c_omap_init,                                                                     \
+		NULL,                                                                              \
+		&i2c_omap_data_##inst,                                                             \
+		&i2c_omap_cfg_##inst,                                                              \
+		POST_KERNEL,                                                                       \
+		CONFIG_I2C_INIT_PRIORITY,                                                          \
+		&i2c_omap_api);
 
 DT_INST_FOREACH_STATUS_OKAY(I2C_OMAP_INIT)
diff --git a/drivers/i2c/i2c_renesas_ra_iic.c b/drivers/i2c/i2c_renesas_ra_iic.c
index 8643b0c3d2e70..a58fd3323b438 100644
--- a/drivers/i2c/i2c_renesas_ra_iic.c
+++ b/drivers/i2c/i2c_renesas_ra_iic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -479,15 +479,10 @@ static DEVICE_API(i2c, i2c_ra_iic_driver_api) = {
 	.transfer = i2c_ra_iic_transfer,
 };
 
-#define _ELC_EVENT_IIC_RXI(channel) ELC_EVENT_IIC##channel##_RXI
-#define _ELC_EVENT_IIC_TXI(channel) ELC_EVENT_IIC##channel##_TXI
-#define _ELC_EVENT_IIC_TEI(channel) ELC_EVENT_IIC##channel##_TEI
-#define _ELC_EVENT_IIC_ERI(channel) ELC_EVENT_IIC##channel##_ERI
-
-#define ELC_EVENT_IIC_RXI(channel) _ELC_EVENT_IIC_RXI(channel)
-#define ELC_EVENT_IIC_TXI(channel) _ELC_EVENT_IIC_TXI(channel)
-#define ELC_EVENT_IIC_TEI(channel) _ELC_EVENT_IIC_TEI(channel)
-#define ELC_EVENT_IIC_ERI(channel) _ELC_EVENT_IIC_ERI(channel)
+#define EVENT_IIC_RXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_IIC, channel, _RXI))
+#define EVENT_IIC_TXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_IIC, channel, _TXI))
+#define EVENT_IIC_TEI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_IIC, channel, _TEI))
+#define EVENT_IIC_ERI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_IIC, channel, _ERI))
 
 #define I2C_RA_IIC_INIT(index)                                                                     \
                                                                                                    \
@@ -496,13 +491,13 @@ static DEVICE_API(i2c, i2c_ra_iic_driver_api) = {
 	static void i2c_ra_iic_irq_config_func##index(const struct device *dev)                    \
 	{                                                                                          \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, rxi, irq)] =                               \
-			ELC_EVENT_IIC_RXI(DT_INST_PROP(index, channel));                           \
+			EVENT_IIC_RXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, txi, irq)] =                               \
-			ELC_EVENT_IIC_TXI(DT_INST_PROP(index, channel));                           \
+			EVENT_IIC_TXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, tei, irq)] =                               \
-			ELC_EVENT_IIC_TEI(DT_INST_PROP(index, channel));                           \
+			EVENT_IIC_TEI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, eri, irq)] =                               \
-			ELC_EVENT_IIC_ERI(DT_INST_PROP(index, channel));                           \
+			EVENT_IIC_ERI(DT_INST_PROP(index, channel));                               \
                                                                                                    \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, rxi, irq),                                  \
 			    DT_INST_IRQ_BY_NAME(index, rxi, priority), iic_master_rxi_isr,         \
diff --git a/drivers/i2c/i2c_renesas_ra_sci_b.c b/drivers/i2c/i2c_renesas_ra_sci_b.c
new file mode 100644
index 0000000000000..4c3f5f29dc943
--- /dev/null
+++ b/drivers/i2c/i2c_renesas_ra_sci_b.c
@@ -0,0 +1,728 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT renesas_ra_i2c_sci_b
+
+#define MDDR_DISABLE 256
+
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
+
+#include "r_sci_b_i2c.h"
+#ifdef CONFIG_I2C_RENESAS_RA_SCI_B_DTC
+#include "r_dtc.h"
+#endif
+
+#include <soc.h>
+
+LOG_MODULE_REGISTER(renesas_ra_i2c_sci_b, CONFIG_I2C_LOG_LEVEL);
+
+#define I2C_MAX_MSG_LEN (1 << (sizeof(uint8_t) * 8))
+
+typedef void (*init_func_t)(const struct device *dev);
+struct sci_b_i2c_config {
+	void (*irq_config_func)(const struct device *dev);
+	const struct pinctrl_dev_config *pcfg;
+	uint16_t sda_output_delay;
+};
+
+struct sci_b_i2c_data {
+	sci_b_i2c_instance_ctrl_t ctrl;
+	i2c_master_cfg_t i2c_config;
+	sci_b_i2c_extended_cfg_t ext_cfg;
+	struct k_sem bus_lock;
+	struct k_sem complete_sem;
+	i2c_master_event_t event;
+	uint32_t dev_config;
+
+#ifdef CONFIG_I2C_CALLBACK
+	uint16_t addr;
+	uint32_t msg_idx;
+	struct i2c_msg *msgs;
+	uint32_t num_msgs;
+	i2c_callback_t cb;
+	void *p_context;
+#endif /* CONFIG_I2C_CALLBACK */
+
+#ifdef CONFIG_I2C_RENESAS_RA_SCI_B_DTC
+	/* RX */
+	transfer_instance_t rx_transfer;
+	transfer_info_t rx_transfer_info;
+	transfer_cfg_t rx_transfer_cfg;
+	dtc_instance_ctrl_t rx_transfer_ctrl;
+	dtc_extended_cfg_t rx_transfer_cfg_extend;
+
+	/* TX */
+	transfer_instance_t tx_transfer;
+	transfer_info_t tx_transfer_info;
+	transfer_cfg_t tx_transfer_cfg;
+	dtc_instance_ctrl_t tx_transfer_ctrl;
+	dtc_extended_cfg_t tx_transfer_cfg_extend;
+#endif /* CONFIG_I2C_RENESAS_RA_SCI_B_DTC */
+};
+
+static void calc_sci_b_iic_clock_setting(const struct device *dev, const uint32_t fsp_i2c_rate,
+					 sci_b_i2c_clock_settings_t *clk_cfg);
+
+/* FSP interruption handlers. */
+void sci_b_i2c_txi_isr(void);
+void sci_b_i2c_tei_isr(void);
+void sci_b_i2c_rxi_isr(void);
+
+static int renesas_ra_sci_b_i2c_configure(const struct device *dev, uint32_t dev_config)
+{
+	struct sci_b_i2c_data *data = (struct sci_b_i2c_data *const)dev->data;
+
+	if (!(dev_config & I2C_MODE_CONTROLLER)) {
+		LOG_ERR("Only I2C Master mode supported.");
+		return -EIO;
+	}
+
+	switch (I2C_SPEED_GET(dev_config)) {
+	case I2C_SPEED_STANDARD:
+		data->i2c_config.rate = I2C_MASTER_RATE_STANDARD;
+		break;
+	case I2C_SPEED_FAST:
+		data->i2c_config.rate = I2C_MASTER_RATE_FAST;
+		break;
+	default:
+		LOG_ERR("Invalid I2C speed rate flag: %d", I2C_SPEED_GET(dev_config));
+		return -EIO;
+	}
+
+	calc_sci_b_iic_clock_setting(dev, data->i2c_config.rate, &data->ext_cfg.clock_settings);
+
+	R_SCI_B_I2C_Close(&data->ctrl);
+	R_SCI_B_I2C_Open(&data->ctrl, &data->i2c_config);
+
+	/* save current devconfig. */
+	data->dev_config = dev_config;
+
+	return 0;
+}
+
+static int renesas_ra_sci_b_i2c_get_config(const struct device *dev, uint32_t *dev_config)
+{
+	struct sci_b_i2c_data *data = (struct sci_b_i2c_data *const)dev->data;
+	*dev_config = data->dev_config;
+	return 0;
+}
+
+#define OPERATION(msg) (((struct i2c_msg *)msg)->flags & I2C_MSG_RW_MASK)
+
+static int renesas_ra_sci_b_i2c_transfer(const struct device *dev, struct i2c_msg *msgs,
+					 uint8_t num_msgs, uint16_t addr)
+{
+	struct sci_b_i2c_data *data = (struct sci_b_i2c_data *const)dev->data;
+	struct i2c_msg *current, *next;
+	fsp_err_t fsp_err;
+	int ret;
+
+	if (!num_msgs) {
+		return 0;
+	}
+
+	/* Handle i2c burst write, restructure message to be compatible with HAL*/
+	if (num_msgs == 2) {
+		if (msgs[0].len == 1U && !(msgs[0].flags & I2C_MSG_READ) &&
+		    !(msgs[1].flags & I2C_MSG_READ)) {
+			uint16_t tmp_len = msgs[0].len + msgs[1].len;
+
+			if (tmp_len <= I2C_MAX_MSG_LEN) {
+				static uint8_t merge_buf[I2C_MAX_MSG_LEN];
+				struct i2c_msg tmp_msg;
+
+				memcpy(&merge_buf[0], msgs[0].buf, msgs[0].len);
+				memcpy(&merge_buf[msgs[0].len], msgs[1].buf, msgs[1].len);
+				tmp_msg.buf = &merge_buf[0];
+				tmp_msg.flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+				tmp_msg.len = (uint8_t)tmp_len;
+				/* Merge 2 msgs into 1 msg */
+				msgs[0] = tmp_msg;
+				num_msgs = 1;
+			} else {
+				LOG_DBG("messages are too large to merge");
+			}
+		}
+	}
+
+	current = msgs;
+	ret = 0;
+
+	/* Check for validity of all messages before transfer */
+	for (int i = 1; i <= num_msgs; i++) {
+		if (i < num_msgs) {
+			next = current + 1;
+
+			/*
+			 * Restart condition between messages
+			 * of different directions is required
+			 */
+			if (OPERATION(current) != OPERATION(next)) {
+				if (!(next->flags & I2C_MSG_RESTART)) {
+					LOG_ERR("Restart condition between messages of "
+						"different directions is required."
+						"Current/Total: [%d/%d]",
+						i, num_msgs);
+					ret = -EIO;
+					break;
+				}
+			}
+
+			/* Stop condition is only allowed on last message */
+			if (current->flags & I2C_MSG_STOP) {
+				LOG_ERR("Invalid stop flag. Stop condition is only allowed on "
+					"last message. "
+					"Current/Total: [%d/%d]",
+					i, num_msgs);
+				ret = -EIO;
+				break;
+			}
+		} else {
+			current->flags |= I2C_MSG_STOP;
+		}
+
+		current++;
+	}
+
+	if (ret) {
+		return ret;
+	}
+
+	k_sem_take(&data->bus_lock, K_FOREVER);
+
+	/* Set destination address with configured address mode before sending msg. */
+
+	i2c_master_addr_mode_t addr_mode = 0;
+
+	if (I2C_MSG_ADDR_10_BITS & data->dev_config) {
+		addr_mode = I2C_MASTER_ADDR_MODE_10BIT;
+	} else {
+		addr_mode = I2C_MASTER_ADDR_MODE_7BIT;
+	}
+
+	R_SCI_B_I2C_SlaveAddressSet(&data->ctrl, addr, addr_mode);
+
+	/* Process input `msgs`. */
+
+	current = msgs;
+
+	while (num_msgs > 0) {
+		if (num_msgs > 1) {
+			next = current + 1;
+		} else {
+			next = NULL;
+		}
+
+		if (current->flags & I2C_MSG_READ) {
+			fsp_err = R_SCI_B_I2C_Read(&data->ctrl, current->buf, current->len,
+						   next != NULL && (next->flags & I2C_MSG_RESTART));
+		} else {
+			fsp_err =
+				R_SCI_B_I2C_Write(&data->ctrl, current->buf, current->len,
+						  next != NULL && (next->flags & I2C_MSG_RESTART));
+		}
+
+		if (fsp_err != FSP_SUCCESS) {
+			switch (fsp_err) {
+			case FSP_ERR_INVALID_SIZE:
+				LOG_ERR("Provided number of bytes more than uint16_t size "
+					"(65535) while DTC is used for data transfer.");
+				break;
+			case FSP_ERR_IN_USE:
+				LOG_ERR("Bus busy condition. Another transfer was in progress.");
+				break;
+			default:
+				LOG_ERR("Unknown error.");
+				break;
+			}
+
+			ret = -EIO;
+			goto RELEASE_BUS;
+		}
+
+		/* Wait for callback to return. */
+		k_sem_take(&data->complete_sem, K_FOREVER);
+
+		/* Handle event msg from callback. */
+		switch (data->event) {
+		case I2C_MASTER_EVENT_ABORTED:
+			LOG_ERR("%s failed.", (current->flags & I2C_MSG_READ) ? "Read" : "Write");
+			ret = -EIO;
+			goto RELEASE_BUS;
+		case I2C_MASTER_EVENT_RX_COMPLETE:
+			break;
+		case I2C_MASTER_EVENT_TX_COMPLETE:
+			break;
+		default:
+			break;
+		}
+
+		current++;
+		num_msgs--;
+	}
+
+RELEASE_BUS:
+	k_sem_give(&data->bus_lock);
+
+	return ret;
+}
+
+#ifdef CONFIG_I2C_CALLBACK
+
+static void renesas_ra_sci_b_i2c_async_done(const struct device *dev, struct sci_b_i2c_data *data,
+					    int result)
+{
+
+	i2c_callback_t cb = data->cb;
+	void *p_context = data->p_context;
+
+	data->msg_idx = 0;
+	data->msgs = NULL;
+	data->num_msgs = 0;
+	data->cb = NULL;
+	data->p_context = NULL;
+	data->addr = 0;
+
+	k_sem_give(&data->bus_lock);
+
+	/* Callback may wish to start another transfer */
+	cb(dev, result, p_context);
+}
+
+/* Start a transfer asynchronously */
+static void renesas_ra_sci_b_i2c_async_iter(const struct device *dev)
+{
+	struct sci_b_i2c_data *data = dev->data;
+	fsp_err_t fsp_err;
+	struct i2c_msg *current, *next;
+
+	struct i2c_msg *msg = &data->msgs[data->msg_idx];
+
+	/* Check for validity of all messages before transfer */
+	current = msg;
+	if (data->msg_idx < (data->num_msgs - 1)) {
+		next = current + 1;
+
+		/*
+		 * Restart condition between messages
+		 * of different directions is required
+		 */
+		if (OPERATION(current) != OPERATION(next)) {
+			if (!(next->flags & I2C_MSG_RESTART)) {
+				LOG_ERR("Restart condition between messages of "
+					"different directions is required."
+					"Current/Total: [%d/%d]",
+					data->msg_idx + 1, data->num_msgs);
+				renesas_ra_sci_b_i2c_async_done(dev, data, -EIO);
+				return;
+			}
+		}
+
+		if (current->flags & I2C_MSG_STOP) {
+			LOG_ERR("Invalid stop flag. Stop condition is only allowed on "
+				"last message. "
+				"Current/Total: [%d/%d]",
+				data->msg_idx + 1, data->num_msgs);
+			renesas_ra_sci_b_i2c_async_done(dev, data, -EIO);
+			return;
+		}
+	} else {
+		current->flags |= I2C_MSG_STOP;
+		next = NULL;
+	}
+
+	if (current->flags & I2C_MSG_READ) {
+		fsp_err = R_SCI_B_I2C_Read(&data->ctrl, current->buf, current->len,
+					   (next != NULL) && (next->flags & I2C_MSG_RESTART));
+	} else {
+		fsp_err = R_SCI_B_I2C_Write(&data->ctrl, current->buf, current->len,
+					    (next != NULL) && (next->flags & I2C_MSG_RESTART));
+	}
+
+	/* Return an error if the transfer didn't start successfully
+	 * e.g., if the bus was busy
+	 */
+	if (fsp_err != FSP_SUCCESS) {
+		switch (fsp_err) {
+		case FSP_ERR_INVALID_SIZE:
+			LOG_ERR("Provided number of bytes more than uint16_t size "
+				"(65535) while DTC is used for data transfer.");
+			break;
+		case FSP_ERR_IN_USE:
+			LOG_ERR("Bus busy condition. Another transfer was in progress.");
+			break;
+		default:
+			LOG_ERR("Unknown error.");
+			break;
+		}
+
+		R_SCI_B_I2C_Abort(&data->ctrl);
+		return;
+	}
+}
+
+static int renesas_ra_sci_b_i2c_transfer_cb(const struct device *dev, struct i2c_msg *msgs,
+					    uint8_t num_msgs, uint16_t addr, i2c_callback_t cb,
+					    void *p_context)
+{
+	struct sci_b_i2c_data *data = dev->data;
+
+	int res = k_sem_take(&data->bus_lock, K_NO_WAIT);
+
+	if (res != 0) {
+		return -EWOULDBLOCK;
+	}
+
+	data->msg_idx = 0;
+	data->msgs = msgs;
+	data->num_msgs = num_msgs;
+	data->addr = addr;
+	data->cb = cb;
+	data->p_context = p_context;
+
+	renesas_ra_sci_b_i2c_async_iter(dev);
+
+	return 0;
+}
+
+#endif /* CONFIG_I2C_CALLBACK */
+
+static void renesas_ra_sci_b_i2c_callback(i2c_master_callback_args_t *p_args)
+{
+	const struct device *dev = p_args->p_context;
+	struct sci_b_i2c_data *data = dev->data;
+
+#ifdef CONFIG_I2C_CALLBACK
+	if (data->cb != NULL) {
+		/* Async transfer */
+		if (p_args->event == I2C_MASTER_EVENT_ABORTED) {
+			R_SCI_B_I2C_Abort(&data->ctrl);
+			renesas_ra_sci_b_i2c_async_done(dev, data, -EIO);
+		} else if (data->msg_idx == data->num_msgs - 1) {
+			renesas_ra_sci_b_i2c_async_done(dev, data, 0);
+		} else {
+			data->msg_idx++;
+			renesas_ra_sci_b_i2c_async_iter(dev);
+		}
+		return;
+	}
+#endif /* CONFIG_I2C_CALLBACK */
+
+	data->event = p_args->event;
+
+	k_sem_give(&data->complete_sem);
+}
+
+static int renesas_ra_sci_b_i2c_init(const struct device *dev)
+{
+	const struct sci_b_i2c_config *config = dev->config;
+	struct sci_b_i2c_data *data = (struct sci_b_i2c_data *)dev->data;
+	fsp_err_t fsp_err;
+	int ret;
+
+	data->dev_config |= I2C_MODE_CONTROLLER;
+
+	/* Configure dt provided device signals when available */
+	ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+
+	if (ret < 0) {
+		LOG_ERR("Pinctrl config failed.");
+		return ret;
+	}
+
+	k_sem_init(&data->bus_lock, 1, 1);
+	k_sem_init(&data->complete_sem, 0, 1);
+
+	switch (data->i2c_config.rate) {
+	case I2C_MASTER_RATE_STANDARD:
+		calc_sci_b_iic_clock_setting(dev, data->i2c_config.rate,
+					     &data->ext_cfg.clock_settings);
+		data->i2c_config.p_extend = &data->ext_cfg;
+		data->dev_config |= I2C_SPEED_SET(I2C_SPEED_STANDARD);
+		break;
+	case I2C_MASTER_RATE_FAST:
+		calc_sci_b_iic_clock_setting(dev, data->i2c_config.rate,
+					     &data->ext_cfg.clock_settings);
+		data->i2c_config.p_extend = &data->ext_cfg;
+		data->dev_config |= I2C_SPEED_SET(I2C_SPEED_FAST);
+		break;
+	default:
+		LOG_ERR("Invalid I2C speed rate: %d", data->i2c_config.rate);
+		return -ENOTSUP;
+	}
+
+#ifdef CONFIG_I2C_RENESAS_RA_SCI_B_DTC
+	data->i2c_config.p_transfer_rx = &data->rx_transfer;
+	data->i2c_config.p_transfer_tx = &data->tx_transfer;
+#endif
+
+	fsp_err = R_SCI_B_I2C_Open(&data->ctrl, &data->i2c_config);
+
+	if (fsp_err != FSP_SUCCESS) {
+		LOG_ERR("I2C init failed.");
+	}
+
+	config->irq_config_func(dev);
+
+	return 0;
+};
+
+static void calc_sci_b_iic_clock_setting(const struct device *dev, const uint32_t fsp_i2c_rate,
+					 sci_b_i2c_clock_settings_t *clk_cfg)
+{
+	const struct sci_b_i2c_config *config = dev->config;
+
+	uint32_t bitrate = 0;
+	bool use_mddr = clk_cfg->bitrate_modulation;
+
+	uint32_t divisor = 0;
+	uint32_t divisor_bitrate_multiple = 0;
+	uint32_t brr = 0;
+	int32_t cks = 0;
+	uint32_t delta_error = 0;
+
+	uint32_t sda_delay_clock = 0;
+	uint32_t sda_delay_counts = 0;
+	uint32_t temp_mddr;
+	uint32_t calculated_bitrate = 0;
+
+	uint32_t mddr = MDDR_DISABLE;
+
+	uint32_t peripheral_clock = R_FSP_SciClockHzGet();
+
+	uint32_t sda_delay_ns = config->sda_output_delay;
+
+	if (I2C_MASTER_RATE_FAST == fsp_i2c_rate) {
+		bitrate = 400000;
+	} else {
+		bitrate = 100000;
+	}
+
+	for (uint32_t i = 0; i <= 3; i++) {
+
+		divisor_bitrate_multiple = (1 << (2 * (i + 1))) * 8;
+		divisor = divisor_bitrate_multiple * bitrate;
+
+		/* Calculate BRR so that the bit rate is the largest possible value less than or
+		 * equal to the desired bitrate.
+		 */
+		brr = (uint32_t)ceil(((double)peripheral_clock) / divisor - 1);
+		if (brr <= 255) {
+			break;
+		}
+		cks++;
+	}
+	calculated_bitrate = (uint32_t)((double)peripheral_clock) /
+			     (divisor_bitrate_multiple * (256 / mddr) * (brr + 1));
+	delta_error = bitrate - calculated_bitrate;
+
+	if (use_mddr) {
+		for (uint32_t temp_brr = brr; temp_brr > 0; temp_brr--) {
+
+			/** Calculate the MDDR (M) value if bit rate modulation is enabled,
+			 * The formula to calculate MBBR (from the M and N relationship given in the
+			 * hardware manual) is as follows and it must be between 128 and 256. MDDR =
+			 * ((divisor * 256) * (BRR + 1)) / PCLK
+			 */
+			temp_mddr = (uint32_t)floor(((double)divisor) * 256 * (temp_brr + 1) /
+						    peripheral_clock);
+
+			/* The maximum value that could result from the calculation above is 256,
+			 * which is a valid MDDR value, so only the lower bound is checked.
+			 */
+			if (temp_mddr < 128) {
+				break;
+			}
+
+			/* The maximum for MDDR is 256 (MDDR unused). */
+			if (temp_mddr > 256) {
+				continue;
+			}
+
+			calculated_bitrate =
+				(uint32_t)(peripheral_clock /
+					   (divisor_bitrate_multiple * (256 / ((double)temp_mddr)) *
+					    (temp_brr + 1)));
+
+			/** If the bit rate error is less than the previous lowest bit rate error,
+			 * then store these settings as the best value.
+			 */
+			if ((bitrate - calculated_bitrate) < delta_error) {
+				delta_error = bitrate - calculated_bitrate;
+				brr = temp_brr;
+				mddr = temp_mddr;
+			}
+		}
+	}
+
+	/* If MDDR == 256, disable bitrate modulation and set MDDR to a valid value. */
+	if (mddr == 256) {
+		mddr = 255;
+		use_mddr = false;
+	}
+
+	/* Calculate SDA delay. */
+	sda_delay_clock = peripheral_clock >> cks;
+	sda_delay_counts = (uint32_t)ceil(((double)sda_delay_ns) * sda_delay_clock / 1000000000);
+	if (sda_delay_counts > 31) {
+		sda_delay_counts = 31;
+	}
+
+	clk_cfg->clk_divisor_value = (uint8_t)cks;
+	clk_cfg->brr_value = (uint8_t)brr;
+	clk_cfg->mddr_value = (uint8_t)mddr;
+	clk_cfg->bitrate_modulation = use_mddr;
+	clk_cfg->cycles_value = (uint8_t)sda_delay_counts;
+}
+
+static const struct i2c_driver_api renesas_ra_sci_b_i2c_driver_api = {
+	.configure = renesas_ra_sci_b_i2c_configure,
+	.get_config = renesas_ra_sci_b_i2c_get_config,
+	.transfer = renesas_ra_sci_b_i2c_transfer,
+#ifdef CONFIG_I2C_CALLBACK
+	.transfer_cb = renesas_ra_sci_b_i2c_transfer_cb,
+#endif /* CONFIG_I2C_CALLBACK */
+};
+
+#define _ELC_EVENT_SCI_RXI(channel) ELC_EVENT_SCI##channel##_RXI
+#define _ELC_EVENT_SCI_TXI(channel) ELC_EVENT_SCI##channel##_TXI
+#define _ELC_EVENT_SCI_TEI(channel) ELC_EVENT_SCI##channel##_TEI
+
+#define ELC_EVENT_SCI_RXI(channel) _ELC_EVENT_SCI_RXI(channel)
+#define ELC_EVENT_SCI_TXI(channel) _ELC_EVENT_SCI_TXI(channel)
+#define ELC_EVENT_SCI_TEI(channel) _ELC_EVENT_SCI_TEI(channel)
+
+#ifndef CONFIG_I2C_RENESAS_RA_SCI_B_DTC
+#define SCI_B_I2C_DTC_INIT(index)
+#define RXI_TRANSFER(index)
+#else
+#define SCI_B_I2C_DTC_INIT(index)                                                                  \
+	.rx_transfer_info =                                                                        \
+		{                                                                                  \
+			.transfer_settings_word_b.dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED, \
+			.transfer_settings_word_b.repeat_area = TRANSFER_REPEAT_AREA_DESTINATION,  \
+			.transfer_settings_word_b.irq = TRANSFER_IRQ_END,                          \
+			.transfer_settings_word_b.chain_mode = TRANSFER_CHAIN_MODE_DISABLED,       \
+			.transfer_settings_word_b.src_addr_mode = TRANSFER_ADDR_MODE_FIXED,        \
+			.transfer_settings_word_b.size = TRANSFER_SIZE_1_BYTE,                     \
+			.transfer_settings_word_b.mode = TRANSFER_MODE_NORMAL,                     \
+			.p_dest = (void *)NULL,                                                    \
+			.p_src = (void const *)NULL,                                               \
+			.num_blocks = 0,                                                           \
+			.length = 0,                                                               \
+	},                                                                                         \
+	.rx_transfer_cfg_extend = {.activation_source =                                            \
+					   DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq)},       \
+	.rx_transfer_cfg =                                                                         \
+		{                                                                                  \
+			.p_info = &sci_b_i2c_data_##index.rx_transfer_info,                        \
+			.p_extend = &sci_b_i2c_data_##index.rx_transfer_cfg_extend,                \
+	},                                                                                         \
+	.rx_transfer =                                                                             \
+		{                                                                                  \
+			.p_ctrl = &sci_b_i2c_data_##index.rx_transfer_ctrl,                        \
+			.p_cfg = &sci_b_i2c_data_##index.rx_transfer_cfg,                          \
+			.p_api = &g_transfer_on_dtc,                                               \
+	},                                                                                         \
+	.tx_transfer_info =                                                                        \
+		{                                                                                  \
+			.transfer_settings_word_b.dest_addr_mode = TRANSFER_ADDR_MODE_FIXED,       \
+			.transfer_settings_word_b.repeat_area = TRANSFER_REPEAT_AREA_SOURCE,       \
+			.transfer_settings_word_b.irq = TRANSFER_IRQ_END,                          \
+			.transfer_settings_word_b.chain_mode = TRANSFER_CHAIN_MODE_DISABLED,       \
+			.transfer_settings_word_b.src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,  \
+			.transfer_settings_word_b.size = TRANSFER_SIZE_1_BYTE,                     \
+			.transfer_settings_word_b.mode = TRANSFER_MODE_NORMAL,                     \
+			.p_dest = (void *)NULL,                                                    \
+			.p_src = (void const *)NULL,                                               \
+			.num_blocks = 0,                                                           \
+			.length = 0,                                                               \
+	},                                                                                         \
+	.tx_transfer_cfg_extend = {.activation_source =                                            \
+					   DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, irq)},       \
+	.tx_transfer_cfg =                                                                         \
+		{                                                                                  \
+			.p_info = &sci_b_i2c_data_##index.tx_transfer_info,                        \
+			.p_extend = &sci_b_i2c_data_##index.tx_transfer_cfg_extend,                \
+	},                                                                                         \
+	.tx_transfer = {                                                                           \
+		.p_ctrl = &sci_b_i2c_data_##index.tx_transfer_ctrl,                                \
+		.p_cfg = &sci_b_i2c_data_##index.tx_transfer_cfg,                                  \
+		.p_api = &g_transfer_on_dtc,                                                       \
+	},
+
+#define RXI_TRANSFER(index)                                                                        \
+	/* rxi */                                                                                  \
+	R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq)] =                            \
+		ELC_EVENT_SCI_RXI(DT_INST_PROP(index, channel));                                   \
+	IRQ_CONNECT(DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq),                               \
+		    DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, priority), sci_b_i2c_rxi_isr,       \
+		    DEVICE_DT_INST_GET(index), 0);                                                 \
+	irq_enable(DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq));
+#endif
+
+#define SCI_B_I2C_RA_INIT(index)                                                                   \
+	static void renesas_ra_sci_b_i2c_irq_config_func##index(const struct device *dev)          \
+	{                                                                                          \
+		RXI_TRANSFER(index)                                                                \
+                                                                                                   \
+		/* txi */                                                                          \
+		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, irq)] =                    \
+			ELC_EVENT_SCI_TXI(DT_INST_PROP(index, channel));                           \
+		IRQ_CONNECT(DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, irq),                       \
+			    DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, priority),                  \
+			    sci_b_i2c_txi_isr, DEVICE_DT_INST_GET(index), 0);                      \
+		irq_enable(DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, irq));                       \
+                                                                                                   \
+		/* tei */                                                                          \
+		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), tei, irq)] =                    \
+			ELC_EVENT_SCI_TEI(DT_INST_PROP(index, channel));                           \
+		IRQ_CONNECT(DT_IRQ_BY_NAME(DT_INST_PARENT(index), tei, irq),                       \
+			    DT_IRQ_BY_NAME(DT_INST_PARENT(index), tei, priority),                  \
+			    sci_b_i2c_tei_isr, DEVICE_DT_INST_GET(index), 0);                      \
+		irq_enable(DT_IRQ_BY_NAME(DT_INST_PARENT(index), tei, irq));                       \
+	}                                                                                          \
+	PINCTRL_DT_DEFINE(DT_INST_PARENT(index));                                                  \
+                                                                                                   \
+	static const struct sci_b_i2c_config sci_b_i2c_config_##index = {                          \
+		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(DT_INST_PARENT(index)),                          \
+		.irq_config_func = renesas_ra_sci_b_i2c_irq_config_func##index,                    \
+		.sda_output_delay = DT_INST_PROP(index, sda_output_delay),                         \
+	};                                                                                         \
+	static struct sci_b_i2c_data sci_b_i2c_data_##index = {                                    \
+		.i2c_config =                                                                      \
+			{                                                                          \
+				.channel = DT_INST_PROP(index, channel),                           \
+				.slave = 0,                                                        \
+				.rate = I2C_MASTER_RATE_STANDARD,                                  \
+				.addr_mode = I2C_MASTER_ADDR_MODE_7BIT,                            \
+				.ipl = DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, priority),       \
+				.rxi_irq = DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq),        \
+				.txi_irq = DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, irq),        \
+				.tei_irq = DT_IRQ_BY_NAME(DT_INST_PARENT(index), tei, irq),        \
+				.p_callback = renesas_ra_sci_b_i2c_callback,                       \
+				.p_context = DEVICE_DT_GET(DT_DRV_INST(index)),                    \
+			},                                                                         \
+		.ext_cfg =                                                                         \
+			{                                                                          \
+				.clock_settings.snfr_value =                                       \
+					DT_INST_PROP(index, noise_filter_clock_select),            \
+				.clock_settings.bitrate_modulation = DT_INST_NODE_HAS_PROP(        \
+					DT_DRV_INST(index), bit_rate_modulation),                  \
+				.clock_settings.clock_source = SCI_B_I2C_CLOCK_SOURCE_SCISPICLK,   \
+			},                                                                         \
+		SCI_B_I2C_DTC_INIT(index)};                                                        \
+	I2C_DEVICE_DT_INST_DEFINE(index, renesas_ra_sci_b_i2c_init, NULL, &sci_b_i2c_data_##index, \
+				  &sci_b_i2c_config_##index, POST_KERNEL,                          \
+				  CONFIG_I2C_INIT_PRIORITY, &renesas_ra_sci_b_i2c_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(SCI_B_I2C_RA_INIT)
diff --git a/drivers/i2c/i2c_renesas_rz_riic.c b/drivers/i2c/i2c_renesas_rz_riic.c
new file mode 100644
index 0000000000000..8a43561ef590c
--- /dev/null
+++ b/drivers/i2c/i2c_renesas_rz_riic.c
@@ -0,0 +1,539 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT renesas_rz_riic
+
+#include <math.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <instances/rzg/r_riic_master.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(renesas_rz_riic);
+
+typedef void (*init_func_t)(const struct device *dev);
+
+struct i2c_rz_riic_config {
+	const struct pinctrl_dev_config *pin_config;
+	i2c_master_cfg_t *fsp_cfg;
+	riic_master_extended_cfg_t *riic_master_ext_cfg;
+	const i2c_master_api_t *fsp_api;
+	double rise_time_s;
+	double fall_time_s;
+	double duty_cycle_percent;
+};
+
+struct i2c_rz_riic_data {
+	i2c_master_ctrl_t *fsp_ctrl;
+	struct k_mutex bus_mutex;
+	struct k_sem complete_sem;
+	i2c_master_event_t event;
+	uint32_t dev_config;
+};
+
+/* IIC master clock setting calculation function. */
+static void calc_riic_master_clock_setting(const struct device *dev, const uint32_t fsp_i2c_rate,
+					   iic_master_clock_settings_t *clk_cfg);
+
+/* FSP interruption handlers. */
+void riic_master_rxi_isr(void);
+void riic_master_txi_isr(void);
+void riic_master_tei_isr(void);
+void riic_master_naki_isr(void);
+void riic_master_sti_isr(void);
+void riic_master_spi_isr(void);
+void riic_master_ali_isr(void);
+void riic_master_tmoi_isr(void);
+
+struct rz_riic_master_bitrate {
+	uint32_t bitrate;
+	uint32_t duty;
+	uint32_t divider;
+	uint32_t brl;
+	uint32_t brh;
+	double duty_error_percent;
+};
+
+static int i2c_rz_riic_configure(const struct device *dev, uint32_t dev_config)
+{
+	const struct i2c_rz_riic_config *config = dev->config;
+	struct i2c_rz_riic_data *data = dev->data;
+
+	if (!(dev_config & I2C_MODE_CONTROLLER)) {
+		LOG_ERR("Only I2C Master mode supported.");
+		return -EIO;
+	}
+
+	switch (I2C_SPEED_GET(dev_config)) {
+	case I2C_SPEED_STANDARD:
+		config->fsp_cfg->rate = I2C_MASTER_RATE_STANDARD;
+		break;
+	case I2C_SPEED_FAST:
+		config->fsp_cfg->rate = I2C_MASTER_RATE_FAST;
+		break;
+	case I2C_SPEED_FAST_PLUS:
+		config->fsp_cfg->rate = I2C_MASTER_RATE_FASTPLUS;
+		break;
+	default:
+		LOG_ERR("%s: Invalid I2C speed rate flag: %d", __func__, I2C_SPEED_GET(dev_config));
+		return -EIO;
+	}
+
+	/* Recalc clock setting after updating config. */
+	calc_riic_master_clock_setting(dev, config->fsp_cfg->rate,
+				       &config->riic_master_ext_cfg->clock_settings);
+
+	config->fsp_api->close(data->fsp_ctrl);
+	config->fsp_api->open(data->fsp_ctrl, config->fsp_cfg);
+
+	/* save current devconfig. */
+	data->dev_config = dev_config;
+
+	return 0;
+}
+
+static int i2c_rz_riic_get_config(const struct device *dev, uint32_t *dev_config)
+{
+	struct i2c_rz_riic_data *data = (struct i2c_rz_riic_data *const)dev->data;
+	*dev_config = data->dev_config;
+
+	return 0;
+}
+
+#define OPERATION(msg) (((struct i2c_msg *)msg)->flags & I2C_MSG_RW_MASK)
+
+static int i2c_rz_riic_transfer(const struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs,
+				uint16_t addr)
+{
+	const struct i2c_rz_riic_config *config = dev->config;
+	struct i2c_rz_riic_data *data = (struct i2c_rz_riic_data *const)dev->data;
+	struct i2c_msg *current, *next;
+	fsp_err_t err = FSP_SUCCESS;
+	int ret = 0;
+
+	if (!num_msgs) {
+		return 0;
+	}
+
+	/* Check for validity of all messages before transfer */
+	current = msgs;
+
+	/*
+	 * Set I2C_MSG_RESTART flag on first message in order to send start
+	 * condition
+	 */
+	current->flags |= I2C_MSG_RESTART;
+
+	for (int i = 1; i <= num_msgs; i++) {
+		if (i < num_msgs) {
+			next = current + 1;
+
+			/*
+			 * Restart condition between messages
+			 * of different directions is required
+			 */
+			if (OPERATION(current) != OPERATION(next)) {
+				if (!(next->flags & I2C_MSG_RESTART)) {
+					LOG_ERR("%s: Restart condition between messages of "
+						"different directions is required."
+						"Current/Total: [%d/%d]",
+						__func__, i, num_msgs);
+					ret = -EIO;
+					break;
+				}
+			}
+
+			/* Stop condition is only allowed on last message */
+			if (current->flags & I2C_MSG_STOP) {
+				LOG_ERR("%s: Invalid stop flag. Stop condition is only allowed on "
+					"last message. "
+					"Current/Total: [%d/%d]",
+					__func__, i, num_msgs);
+				ret = -EIO;
+				break;
+			}
+		} else {
+			current->flags |= I2C_MSG_STOP;
+		}
+
+		current++;
+	}
+
+	if (ret) {
+		return ret;
+	}
+
+	k_mutex_lock(&data->bus_mutex, K_FOREVER);
+
+	/* Set destination address with configured address mode before sending msg. */
+
+	i2c_master_addr_mode_t addr_mode = 0;
+
+	if (I2C_MSG_ADDR_10_BITS & data->dev_config) {
+		addr_mode = I2C_MASTER_ADDR_MODE_10BIT;
+	} else {
+		addr_mode = I2C_MASTER_ADDR_MODE_7BIT;
+	}
+
+	config->fsp_api->slaveAddressSet(data->fsp_ctrl, addr, addr_mode);
+
+	/* Process input `msgs`. */
+
+	current = msgs;
+
+	while (num_msgs > 0) {
+		if (num_msgs > 1) {
+			next = current + 1;
+		} else {
+			next = NULL;
+		}
+
+		if (current->flags & I2C_MSG_READ) {
+			err = config->fsp_api->read(data->fsp_ctrl, current->buf, current->len,
+						    next != NULL &&
+							    (next->flags & I2C_MSG_RESTART));
+		} else {
+			err = config->fsp_api->write(data->fsp_ctrl, current->buf, current->len,
+						     next != NULL &&
+							     (next->flags & I2C_MSG_RESTART));
+		}
+
+		if (err != FSP_SUCCESS) {
+			switch (err) {
+			case FSP_ERR_IN_USE:
+				LOG_ERR("%s: Bus busy condition. Another transfer was in progress.",
+					__func__);
+				break;
+			default:
+				/* Should not reach here. */
+				LOG_ERR("%s: Unknown error. FSP_ERR=%d\n", __func__, err);
+				break;
+			}
+
+			ret = -EIO;
+			goto RELEASE_BUS;
+		}
+
+		/* Wait for callback to return. */
+		k_sem_take(&data->complete_sem, K_FOREVER);
+
+		/* Handle event msg from callback. */
+		switch (data->event) {
+		case I2C_MASTER_EVENT_ABORTED:
+			LOG_ERR("%s: %s failed.", __func__,
+				(current->flags & I2C_MSG_READ) ? "Read" : "Write");
+			ret = -EIO;
+			goto RELEASE_BUS;
+		case I2C_MASTER_EVENT_RX_COMPLETE:
+			break;
+		case I2C_MASTER_EVENT_TX_COMPLETE:
+			break;
+		default:
+			break;
+		}
+
+		current++;
+		num_msgs--;
+	}
+
+RELEASE_BUS:
+	k_mutex_unlock(&data->bus_mutex);
+
+	return ret;
+}
+
+static void i2c_rz_riic_callback(i2c_master_callback_args_t *p_args)
+{
+	const struct device *dev = p_args->p_context;
+	struct i2c_rz_riic_data *data = dev->data;
+
+	data->event = p_args->event;
+
+	k_sem_give(&data->complete_sem);
+}
+
+static int i2c_rz_riic_init(const struct device *dev)
+{
+	const struct i2c_rz_riic_config *config = dev->config;
+	struct i2c_rz_riic_data *data = dev->data;
+	fsp_err_t err = FSP_SUCCESS;
+	int ret = 0;
+
+	/* Configure dt provided device signals when available */
+	if (!config->pin_config) {
+		ret = pinctrl_apply_state(config->pin_config, PINCTRL_STATE_DEFAULT);
+
+		if (ret < 0) {
+			LOG_ERR("%s: pinctrl config failed.", __func__);
+			return ret;
+		}
+	}
+
+	k_mutex_init(&data->bus_mutex);
+	k_sem_init(&data->complete_sem, 0, 1);
+
+	switch (config->fsp_cfg->rate) {
+	case I2C_MASTER_RATE_STANDARD:
+	case I2C_MASTER_RATE_FAST:
+	case I2C_MASTER_RATE_FASTPLUS:
+		calc_riic_master_clock_setting(dev, config->fsp_cfg->rate,
+					       &config->riic_master_ext_cfg->clock_settings);
+		config->riic_master_ext_cfg->timeout_mode = IIC_MASTER_TIMEOUT_MODE_SHORT;
+		config->riic_master_ext_cfg->timeout_scl_low = IIC_MASTER_TIMEOUT_SCL_LOW_ENABLED;
+		break;
+	default:
+		LOG_ERR("%s: Invalid I2C speed rate: %d", __func__, config->fsp_cfg->rate);
+		return -ENOTSUP;
+	}
+
+	err = config->fsp_api->open(data->fsp_ctrl, config->fsp_cfg);
+
+	if (err != FSP_SUCCESS) {
+		LOG_ERR("I2C initialization failed");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static void calc_riic_master_bitrate(const struct i2c_rz_riic_config *config,
+				     uint32_t total_brl_brh, uint32_t brh, uint32_t divider,
+				     struct rz_riic_master_bitrate *result)
+{
+	const uint32_t noise_filter_stages = config->riic_master_ext_cfg->noise_filter_stage;
+	const double rise_time_s = config->rise_time_s;
+	const double fall_time_s = config->fall_time_s;
+	const double requested_duty = config->duty_cycle_percent;
+	const uint32_t peripheral_clock = R_FSP_SystemClockHzGet(FSP_PRIV_CLOCK_P0CLK);
+	uint32_t constant_add = 0;
+
+	/* A constant is added to BRL and BRH in all formulas. This constand is 3 + nf when CKS ==
+	 * 0, or 2 + nf when CKS != 0.
+	 */
+	if (divider == 0) {
+		constant_add = 3 + noise_filter_stages;
+	} else {
+		/* All dividers other than 0 use an addition of 2 + noise_filter_stages. */
+		constant_add = 2 + noise_filter_stages;
+	}
+
+	/* Converts all divided numbers to double to avoid data loss. */
+	double divided_p0 = (peripheral_clock >> divider);
+
+	result->bitrate =
+		1 / ((total_brl_brh + 2 * constant_add) / divided_p0 + rise_time_s + fall_time_s);
+	result->duty =
+		100 *
+		((rise_time_s + ((brh + constant_add) / divided_p0)) /
+		 (rise_time_s + fall_time_s + ((total_brl_brh + 2 * constant_add)) / divided_p0));
+	result->divider = divider;
+	result->brh = brh;
+	result->brl = total_brl_brh - brh;
+	result->duty_error_percent =
+		(result->duty > requested_duty ? (result->duty - requested_duty)
+					       : (requested_duty - result->duty)) /
+		requested_duty;
+}
+
+static void calc_riic_master_clock_setting(const struct device *dev, const uint32_t fsp_i2c_rate,
+					   iic_master_clock_settings_t *clk_cfg)
+{
+	const struct i2c_rz_riic_config *config = dev->config;
+	const uint32_t noise_filter_stages = config->riic_master_ext_cfg->noise_filter_stage;
+	const double rise_time_s = config->rise_time_s;
+	const double fall_time_s = config->fall_time_s;
+	const uint32_t requested_duty = config->duty_cycle_percent;
+	const uint32_t peripheral_clock = R_FSP_SystemClockHzGet(FSP_PRIV_CLOCK_P0CLK);
+
+	uint32_t requested_bitrate = 0;
+
+	switch (fsp_i2c_rate) {
+	case I2C_MASTER_RATE_STANDARD:
+	case I2C_MASTER_RATE_FAST:
+	case I2C_MASTER_RATE_FASTPLUS:
+		requested_bitrate = fsp_i2c_rate;
+		break;
+	default:
+		LOG_ERR("%s: Invalid I2C speed rate: %d", __func__, fsp_i2c_rate);
+		return;
+	}
+
+	/* Start with maximum possible bitrate. */
+	uint32_t min_brh = noise_filter_stages + 1;
+	uint32_t min_brl_brh = 2 * min_brh;
+	struct rz_riic_master_bitrate bitrate = {};
+
+	calc_riic_master_bitrate(config, min_brl_brh, min_brh, 0, &bitrate);
+
+	/* Start with the smallest divider because it gives the most resolution. */
+	uint32_t constant_add = 3 + noise_filter_stages;
+
+	for (int temp_divider = 0; temp_divider <= 7; ++temp_divider) {
+		if (1 == temp_divider) {
+			/* All dividers other than 0 use an addition of 2 + noise_filter_stages. */
+			constant_add = 2 + noise_filter_stages;
+		}
+
+		/* If the requested bitrate cannot be achieved with this divider, continue. */
+		double divided_p0 = (peripheral_clock >> temp_divider);
+		uint32_t total_brl_brh =
+			ceil(((1 / (double)requested_bitrate) - (rise_time_s + fall_time_s)) *
+				     divided_p0 -
+			     (2 * constant_add));
+
+		if ((total_brl_brh > 62) || (total_brl_brh < min_brl_brh)) {
+			continue;
+		}
+
+		uint32_t temp_brh = total_brl_brh * requested_duty / 100;
+
+		if (temp_brh < min_brh) {
+			temp_brh = min_brh;
+		}
+
+		/* Calculate the actual bitrate and duty cycle. */
+		struct rz_riic_master_bitrate temp_bitrate = {};
+
+		calc_riic_master_bitrate(config, total_brl_brh, temp_brh, temp_divider,
+					 &temp_bitrate);
+
+		/* Adjust duty cycle down if it helps. */
+		struct rz_riic_master_bitrate test_bitrate = temp_bitrate;
+
+		while (test_bitrate.duty > requested_duty) {
+			temp_brh -= 1;
+
+			if ((temp_brh < min_brh) || ((total_brl_brh - temp_brh) > 31)) {
+				break;
+			}
+
+			struct rz_riic_master_bitrate new_bitrate = {};
+
+			calc_riic_master_bitrate(config, total_brl_brh, temp_brh, temp_divider,
+						 &new_bitrate);
+
+			if (new_bitrate.duty_error_percent < temp_bitrate.duty_error_percent) {
+				temp_bitrate = new_bitrate;
+			} else {
+				break;
+			}
+		}
+
+		/* Adjust duty cycle up if it helps. */
+		while (test_bitrate.duty < requested_duty) {
+			++temp_brh;
+
+			if ((temp_brh > total_brl_brh) || (temp_brh > 31) ||
+			    ((total_brl_brh - temp_brh) < min_brh)) {
+				break;
+			}
+
+			struct rz_riic_master_bitrate new_bitrate = {};
+
+			calc_riic_master_bitrate(config, total_brl_brh, temp_brh, temp_divider,
+						 &new_bitrate);
+
+			if (new_bitrate.duty_error_percent < temp_bitrate.duty_error_percent) {
+				temp_bitrate = new_bitrate;
+			} else {
+				break;
+			}
+		}
+
+		if ((temp_bitrate.brh < 32) && (temp_bitrate.brl < 32)) {
+			/* Valid setting found. */
+			bitrate = temp_bitrate;
+			break;
+		}
+	}
+
+	clk_cfg->brl_value = bitrate.brl;
+	clk_cfg->brh_value = bitrate.brh;
+	clk_cfg->cks_value = bitrate.divider;
+}
+
+static DEVICE_API(i2c, i2c_rz_riic_driver_api) = {
+	.configure = i2c_rz_riic_configure,
+	.get_config = i2c_rz_riic_get_config,
+	.transfer = i2c_rz_riic_transfer,
+};
+
+#define I2C_RZG_IRQ_CONNECT(index, irq_name, isr)                                                  \
+	do {                                                                                       \
+		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, irq_name, irq),                             \
+			    DT_INST_IRQ_BY_NAME(index, irq_name, priority), isr,                   \
+			    DEVICE_DT_INST_GET(index), 0);                                         \
+		irq_enable(DT_INST_IRQ_BY_NAME(index, irq_name, irq));                             \
+	} while (0)
+
+#define I2C_RZG_CONFIG_FUNC(index)                                                                 \
+	I2C_RZG_IRQ_CONNECT(index, rxi, riic_master_rxi_isr);                                      \
+	I2C_RZG_IRQ_CONNECT(index, txi, riic_master_txi_isr);                                      \
+	I2C_RZG_IRQ_CONNECT(index, tei, riic_master_tei_isr);                                      \
+	I2C_RZG_IRQ_CONNECT(index, naki, riic_master_naki_isr);                                    \
+	I2C_RZG_IRQ_CONNECT(index, sti, riic_master_sti_isr);                                      \
+	I2C_RZG_IRQ_CONNECT(index, spi, riic_master_spi_isr);                                      \
+	I2C_RZG_IRQ_CONNECT(index, ali, riic_master_ali_isr);                                      \
+	I2C_RZG_IRQ_CONNECT(index, tmoi, riic_master_tmoi_isr);
+
+#define I2C_RZG_RIIC_INIT(index)                                                                   \
+	static const double RZG_RIIC_MASTER_DIV_TIME_NS = 1000000000;                              \
+                                                                                                   \
+	static riic_master_extended_cfg_t g_i2c_master##index##_extend = {                         \
+		.noise_filter_stage = DT_INST_PROP(index, noise_filter_stages),                    \
+		.naki_irq = DT_INST_IRQ_BY_NAME(index, naki, irq),                                 \
+		.sti_irq = DT_INST_IRQ_BY_NAME(index, sti, irq),                                   \
+		.spi_irq = DT_INST_IRQ_BY_NAME(index, spi, irq),                                   \
+		.ali_irq = DT_INST_IRQ_BY_NAME(index, ali, irq),                                   \
+		.tmoi_irq = DT_INST_IRQ_BY_NAME(index, tmoi, irq),                                 \
+	};                                                                                         \
+                                                                                                   \
+	static i2c_master_cfg_t g_i2c_master##index##_cfg = {                                      \
+		.channel = DT_INST_PROP(index, channel),                                           \
+		.rate = DT_INST_PROP(index, clock_frequency),                                      \
+		.slave = 0x00,                                                                     \
+		.addr_mode = I2C_MASTER_ADDR_MODE_7BIT,                                            \
+		.p_transfer_tx = NULL,                                                             \
+		.p_transfer_rx = NULL,                                                             \
+		.p_callback = i2c_rz_riic_callback,                                                \
+		.p_context = DEVICE_DT_GET(DT_DRV_INST(index)),                                    \
+		.rxi_irq = DT_INST_IRQ_BY_NAME(index, rxi, irq),                                   \
+		.txi_irq = DT_INST_IRQ_BY_NAME(index, txi, irq),                                   \
+		.tei_irq = DT_INST_IRQ_BY_NAME(index, tei, irq),                                   \
+		.ipl = DT_INST_IRQ_BY_NAME(index, rxi, priority),                                  \
+		.p_extend = &g_i2c_master##index##_extend,                                         \
+	};                                                                                         \
+                                                                                                   \
+	PINCTRL_DT_INST_DEFINE(index);                                                             \
+                                                                                                   \
+	static struct i2c_rz_riic_config i2c_rz_riic_config_##index = {                            \
+		.pin_config = PINCTRL_DT_INST_DEV_CONFIG_GET(index),                               \
+		.fsp_cfg = &g_i2c_master##index##_cfg,                                             \
+		.riic_master_ext_cfg = &g_i2c_master##index##_extend,                              \
+		.fsp_api = &g_i2c_master_on_iic,                                                   \
+		.rise_time_s = DT_INST_PROP(index, rise_time_ns) / RZG_RIIC_MASTER_DIV_TIME_NS,    \
+		.fall_time_s = DT_INST_PROP(index, fall_time_ns) / RZG_RIIC_MASTER_DIV_TIME_NS,    \
+		.duty_cycle_percent = DT_INST_PROP(index, duty_cycle_percent),                     \
+	};                                                                                         \
+                                                                                                   \
+	static iic_master_instance_ctrl_t g_i2c_master##index##_ctrl;                              \
+                                                                                                   \
+	static struct i2c_rz_riic_data i2c_rz_riic_data_##index = {                                \
+		.fsp_ctrl = (i2c_master_ctrl_t *)&g_i2c_master##index##_ctrl,                      \
+	};                                                                                         \
+                                                                                                   \
+	static int i2c_rz_riic_init_##index(const struct device *dev)                              \
+	{                                                                                          \
+		I2C_RZG_CONFIG_FUNC(index)                                                         \
+		return i2c_rz_riic_init(dev);                                                      \
+	};                                                                                         \
+                                                                                                   \
+	I2C_DEVICE_DT_INST_DEFINE(index, i2c_rz_riic_init_##index, NULL,                           \
+				  &i2c_rz_riic_data_##index, &i2c_rz_riic_config_##index,          \
+				  PRE_KERNEL_2, CONFIG_I2C_INIT_PRIORITY,                          \
+				  &i2c_rz_riic_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(I2C_RZG_RIIC_INIT)
diff --git a/drivers/i2c/i2c_rtio.c b/drivers/i2c/i2c_rtio.c
index d921f5604efe4..a44e2e61fee87 100644
--- a/drivers/i2c/i2c_rtio.c
+++ b/drivers/i2c/i2c_rtio.c
@@ -52,6 +52,47 @@ struct rtio_sqe *i2c_rtio_copy(struct rtio *r, struct rtio_iodev *iodev, const s
 	return sqe;
 }
 
+struct rtio_sqe *i2c_rtio_copy_reg_write_byte(struct rtio *r, struct rtio_iodev *iodev,
+					      uint8_t reg_addr, uint8_t data)
+{
+	uint8_t msg[2];
+
+	struct rtio_sqe *sqe = rtio_sqe_acquire(r);
+
+	if (sqe == NULL) {
+		rtio_sqe_drop_all(r);
+		return NULL;
+	}
+	msg[0] = reg_addr;
+	msg[1] = data;
+	rtio_sqe_prep_tiny_write(sqe, iodev, RTIO_PRIO_NORM, msg, sizeof(msg), NULL);
+	sqe->iodev_flags = RTIO_IODEV_I2C_STOP;
+	return sqe;
+}
+
+struct rtio_sqe *i2c_rtio_copy_reg_burst_read(struct rtio *r, struct rtio_iodev *iodev,
+					      uint8_t start_addr, void *buf, size_t num_bytes)
+{
+	struct rtio_sqe *sqe = rtio_sqe_acquire(r);
+
+	if (sqe == NULL) {
+		rtio_sqe_drop_all(r);
+		return NULL;
+	}
+	rtio_sqe_prep_tiny_write(sqe, iodev, RTIO_PRIO_NORM, &start_addr, 1, NULL);
+	sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	sqe = rtio_sqe_acquire(r);
+	if (sqe == NULL) {
+		rtio_sqe_drop_all(r);
+		return NULL;
+	}
+	rtio_sqe_prep_read(sqe, iodev, RTIO_PRIO_NORM, buf, num_bytes, NULL);
+	sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
+
+	return sqe;
+}
+
 void i2c_rtio_init(struct i2c_rtio *ctx, const struct device *dev)
 {
 	k_sem_init(&ctx->lock, 1, 1);
diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c
index bf77fcdf352bc..2a28ae829d8a0 100644
--- a/drivers/i2c/i2c_sbcon.c
+++ b/drivers/i2c/i2c_sbcon.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017 Linaro Ltd.
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,7 +18,7 @@
 #include <zephyr/device.h>
 #include <errno.h>
 #include <zephyr/drivers/i2c.h>
-
+#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_sbcon, CONFIG_I2C_LOG_LEVEL);
 
@@ -41,6 +42,7 @@ struct sbcon {
 struct i2c_sbcon_config {
 	struct sbcon *sbcon;		/* Address of hardware registers */
 	uint32_t bitrate;		/* I2C bus speed in Hz */
+	const struct pinctrl_dev_config *pctrl;
 };
 
 /* Driver instance data */
@@ -128,7 +130,14 @@ static int i2c_sbcon_init(const struct device *dev)
 	struct i2c_sbcon_context *context = dev->data;
 	const struct i2c_sbcon_config *config = dev->config;
 	int ret;
+	ret = pinctrl_apply_state(config->pctrl, PINCTRL_STATE_DEFAULT);
 
+	/* some pins are not available externally so,
+	 * ignore if there is no entry for them
+	 */
+	if (ret != -ENOENT) {
+		return ret;
+	}
 	i2c_bitbang_init(&context->bitbang, &io_fns, config->sbcon);
 
 	ret = i2c_bitbang_configure(&context->bitbang,
@@ -136,24 +145,24 @@ static int i2c_sbcon_init(const struct device *dev)
 	if (ret != 0) {
 		LOG_ERR("failed to configure I2C bitbang: %d", ret);
 	}
-
 	return ret;
 }
 
-#define	DEFINE_I2C_SBCON(_num)						\
-									\
-static struct i2c_sbcon_context i2c_sbcon_dev_data_##_num;		\
-									\
-static const struct i2c_sbcon_config i2c_sbcon_dev_cfg_##_num = {	\
-	.sbcon		= (void *)DT_INST_REG_ADDR(_num),		\
-	.bitrate	= DT_INST_PROP(_num, clock_frequency),		\
-};									\
-									\
-I2C_DEVICE_DT_INST_DEFINE(_num,						\
-	    i2c_sbcon_init,						\
-	    NULL,							\
-	    &i2c_sbcon_dev_data_##_num,					\
-	    &i2c_sbcon_dev_cfg_##_num,					\
-	    PRE_KERNEL_2, CONFIG_I2C_INIT_PRIORITY, &api);
+#define DEFINE_I2C_SBCON(_num)							\
+	PINCTRL_DT_INST_DEFINE(_num);						\
+	static struct i2c_sbcon_context i2c_sbcon_dev_data_##_num;		\
+										\
+	static const struct i2c_sbcon_config i2c_sbcon_dev_cfg_##_num = {	\
+		.sbcon		= (void *)DT_INST_REG_ADDR(_num),		\
+		.bitrate	= DT_INST_PROP(_num, clock_frequency),		\
+		.pctrl = PINCTRL_DT_INST_DEV_CONFIG_GET(_num),			\
+	};									\
+										\
+	I2C_DEVICE_DT_INST_DEFINE(_num,						\
+		    i2c_sbcon_init,						\
+		    NULL,							\
+		    &i2c_sbcon_dev_data_##_num,					\
+		    &i2c_sbcon_dev_cfg_##_num,					\
+		    PRE_KERNEL_2, CONFIG_I2C_INIT_PRIORITY, &api);
 
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_I2C_SBCON)
diff --git a/drivers/i2c/i2c_shell.c b/drivers/i2c/i2c_shell.c
index 0817f27aae501..41f0518780c4d 100644
--- a/drivers/i2c/i2c_shell.c
+++ b/drivers/i2c/i2c_shell.c
@@ -48,8 +48,7 @@ static int get_bytes_count_for_hex(char *arg)
  * https://manpages.debian.org/buster/i2c-tools/i2cdetect.8.en.html
  */
 /* i2c scan <device> */
-static int cmd_i2c_scan(const struct shell *shell_ctx,
-			size_t argc, char **argv)
+static int cmd_i2c_scan(const struct shell *sh, size_t argc, char **argv)
 {
 	const struct device *dev;
 	uint8_t cnt = 0, first = 0x04, last = 0x77;
@@ -57,18 +56,16 @@ static int cmd_i2c_scan(const struct shell *shell_ctx,
 	dev = shell_device_get_binding(argv[ARGV_DEV]);
 
 	if (!dev) {
-		shell_error(shell_ctx, "I2C: Device driver %s not found.",
-			    argv[ARGV_DEV]);
+		shell_error(sh, "I2C: Device driver %s not found.", argv[ARGV_DEV]);
 		return -ENODEV;
 	}
 
-	shell_print(shell_ctx,
-		    "     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f");
+	shell_print(sh, "     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f");
 	for (uint8_t i = 0; i <= last; i += 16) {
-		shell_fprintf(shell_ctx, SHELL_NORMAL, "%02x: ", i);
+		shell_fprintf_normal(sh, "%02x: ", i);
 		for (uint8_t j = 0; j < 16; j++) {
 			if (i + j < first || i + j > last) {
-				shell_fprintf(shell_ctx, SHELL_NORMAL, "   ");
+				shell_fprintf_normal(sh, "   ");
 				continue;
 			}
 
@@ -80,47 +77,42 @@ static int cmd_i2c_scan(const struct shell *shell_ctx,
 			msgs[0].len = 0U;
 			msgs[0].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
 			if (i2c_transfer(dev, &msgs[0], 1, i + j) == 0) {
-				shell_fprintf(shell_ctx, SHELL_NORMAL,
-					      "%02x ", i + j);
+				shell_fprintf_normal(sh, "%02x ", i + j);
 				++cnt;
 			} else {
-				shell_fprintf(shell_ctx, SHELL_NORMAL, "-- ");
+				shell_fprintf_normal(sh, "-- ");
 			}
 		}
-		shell_print(shell_ctx, "");
+		shell_print(sh, "");
 	}
 
-	shell_print(shell_ctx, "%u devices found on %s",
-		    cnt, argv[ARGV_DEV]);
+	shell_print(sh, "%u devices found on %s", cnt, argv[ARGV_DEV]);
 
 	return 0;
 }
 
 /* i2c recover <device> */
-static int cmd_i2c_recover(const struct shell *shell_ctx,
-			   size_t argc, char **argv)
+static int cmd_i2c_recover(const struct shell *sh, size_t argc, char **argv)
 {
 	const struct device *dev;
 	int err;
 
 	dev = shell_device_get_binding(argv[ARGV_DEV]);
 	if (!dev) {
-		shell_error(shell_ctx, "I2C: Device driver %s not found.",
-			    argv[1]);
+		shell_error(sh, "I2C: Device driver %s not found.", argv[1]);
 		return -ENODEV;
 	}
 
 	err = i2c_recover_bus(dev);
 	if (err) {
-		shell_error(shell_ctx, "I2C: Bus recovery failed (err %d)",
-			    err);
+		shell_error(sh, "I2C: Bus recovery failed (err %d)", err);
 		return err;
 	}
 
 	return 0;
 }
 
-static int i2c_write_from_buffer(const struct shell *shell_ctx,
+static int i2c_write_from_buffer(const struct shell *sh,
 		char *s_dev_name, char *s_dev_addr, char *s_reg_addr,
 		char **data, uint8_t data_length)
 {
@@ -138,8 +130,7 @@ static int i2c_write_from_buffer(const struct shell *shell_ctx,
 
 	dev = shell_device_get_binding(s_dev_name);
 	if (!dev) {
-		shell_error(shell_ctx, "I2C: Device driver %s not found.",
-			    s_dev_name);
+		shell_error(sh, "I2C: Device driver %s not found.", s_dev_name);
 		return -ENODEV;
 	}
 
@@ -151,7 +142,7 @@ static int i2c_write_from_buffer(const struct shell *shell_ctx,
 
 	if (data_length + reg_addr_bytes > MAX_I2C_BYTES) {
 		data_length = MAX_I2C_BYTES - reg_addr_bytes;
-		shell_info(shell_ctx, "Too many bytes provided, limit is %d",
+		shell_info(sh, "Too many bytes provided, limit is %d",
 			   MAX_I2C_BYTES - reg_addr_bytes);
 	}
 
@@ -164,8 +155,7 @@ static int i2c_write_from_buffer(const struct shell *shell_ctx,
 			buf + MAX_BYTES_FOR_REGISTER_INDEX - reg_addr_bytes,
 			reg_addr_bytes + data_length, dev_addr);
 	if (ret < 0) {
-		shell_error(shell_ctx, "Failed to write to device: %s",
-			    s_dev_addr);
+		shell_error(sh, "Failed to write to device: %s", s_dev_addr);
 		return -EIO;
 	}
 
@@ -173,24 +163,22 @@ static int i2c_write_from_buffer(const struct shell *shell_ctx,
 }
 
 /* i2c write <device> <dev_addr> <reg_addr> [<byte1>, ...] */
-static int cmd_i2c_write(const struct shell *shell_ctx,
-			 size_t argc, char **argv)
+static int cmd_i2c_write(const struct shell *sh, size_t argc, char **argv)
 {
-	return i2c_write_from_buffer(shell_ctx, argv[ARGV_DEV],
+	return i2c_write_from_buffer(sh, argv[ARGV_DEV],
 				     argv[ARGV_ADDR], argv[ARGV_REG],
 				     &argv[4], argc - 4);
 }
 
 /* i2c write_byte <device> <dev_addr> <reg_addr> <value> */
-static int cmd_i2c_write_byte(const struct shell *shell_ctx,
-			      size_t argc, char **argv)
+static int cmd_i2c_write_byte(const struct shell *sh, size_t argc, char **argv)
 {
-	return i2c_write_from_buffer(shell_ctx, argv[ARGV_DEV],
+	return i2c_write_from_buffer(sh, argv[ARGV_DEV],
 				     argv[ARGV_ADDR], argv[ARGV_REG],
 				     &argv[4], 1);
 }
 
-static int i2c_read_to_buffer(const struct shell *shell_ctx,
+static int i2c_read_to_buffer(const struct shell *sh,
 			      char *s_dev_name,
 			      char *s_dev_addr, char *s_reg_addr,
 			      uint8_t *buf, uint8_t buf_length)
@@ -201,8 +189,7 @@ static int i2c_read_to_buffer(const struct shell *shell_ctx,
 
 	dev = shell_device_get_binding(s_dev_name);
 	if (!dev) {
-		shell_error(shell_ctx, "I2C: Device driver %s not found.",
-			    s_dev_name);
+		shell_error(sh, "I2C: Device driver %s not found.", s_dev_name);
 		return -ENODEV;
 	}
 
@@ -225,8 +212,7 @@ static int i2c_read_to_buffer(const struct shell *shell_ctx,
 	}
 
 	if (ret < 0) {
-		shell_error(shell_ctx, "Failed to read from device: %s",
-			    s_dev_addr);
+		shell_error(sh, "Failed to read from device: %s", s_dev_addr);
 		return -EIO;
 	}
 
@@ -234,24 +220,22 @@ static int i2c_read_to_buffer(const struct shell *shell_ctx,
 }
 
 /* i2c read_byte <device> <dev_addr> <reg_addr> */
-static int cmd_i2c_read_byte(const struct shell *shell_ctx,
-			     size_t argc, char **argv)
+static int cmd_i2c_read_byte(const struct shell *sh, size_t argc, char **argv)
 {
 	uint8_t out;
 	int ret;
 
-
-	ret = i2c_read_to_buffer(shell_ctx, argv[ARGV_DEV],
+	ret = i2c_read_to_buffer(sh, argv[ARGV_DEV],
 				 argv[ARGV_ADDR], argv[ARGV_REG], &out, 1);
 	if (ret == 0) {
-		shell_print(shell_ctx, "Output: 0x%x", out);
+		shell_print(sh, "Output: 0x%x", out);
 	}
 
 	return ret;
 }
 
 /* i2c read <device> <dev_addr> <reg_addr> [<numbytes>] */
-static int cmd_i2c_read(const struct shell *shell_ctx, size_t argc, char **argv)
+static int cmd_i2c_read(const struct shell *sh, size_t argc, char **argv)
 {
 	uint8_t buf[MAX_I2C_BYTES];
 	int num_bytes;
@@ -266,18 +250,18 @@ static int cmd_i2c_read(const struct shell *shell_ctx, size_t argc, char **argv)
 		num_bytes = MAX_I2C_BYTES;
 	}
 
-	ret = i2c_read_to_buffer(shell_ctx, argv[ARGV_DEV],
+	ret = i2c_read_to_buffer(sh, argv[ARGV_DEV],
 				 argv[ARGV_ADDR], argv[ARGV_REG],
 				 buf, num_bytes);
 	if (ret == 0) {
-		shell_hexdump(shell_ctx, buf, num_bytes);
+		shell_hexdump(sh, buf, num_bytes);
 	}
 
 	return ret;
 }
 
 /* i2c direct_read <device> <dev_addr> [<numbytes>] */
-static int cmd_i2c_direct_read(const struct shell *shell_ctx, size_t argc, char **argv)
+static int cmd_i2c_direct_read(const struct shell *sh, size_t argc, char **argv)
 {
 	uint8_t buf[MAX_I2C_BYTES];
 	int num_bytes;
@@ -292,9 +276,9 @@ static int cmd_i2c_direct_read(const struct shell *shell_ctx, size_t argc, char
 		num_bytes = MAX_I2C_BYTES;
 	}
 
-	ret = i2c_read_to_buffer(shell_ctx, argv[ARGV_DEV], argv[ARGV_ADDR], NULL, buf, num_bytes);
+	ret = i2c_read_to_buffer(sh, argv[ARGV_DEV], argv[ARGV_ADDR], NULL, buf, num_bytes);
 	if (ret == 0) {
-		shell_hexdump(shell_ctx, buf, num_bytes);
+		shell_hexdump(sh, buf, num_bytes);
 	}
 
 	return ret;
@@ -303,7 +287,7 @@ static int cmd_i2c_direct_read(const struct shell *shell_ctx, size_t argc, char
 /* i2c speed <device> <speed>
  * For: speed see constants like I2C_SPEED_STANDARD
  */
-static int cmd_i2c_speed(const struct shell *shell_ctx, size_t argc, char **argv)
+static int cmd_i2c_speed(const struct shell *sh, size_t argc, char **argv)
 {
 	char *s_dev_name = argv[ARGV_DEV];
 	const struct device *dev;
@@ -313,8 +297,7 @@ static int cmd_i2c_speed(const struct shell *shell_ctx, size_t argc, char **argv
 
 	dev = shell_device_get_binding(s_dev_name);
 	if (!dev) {
-		shell_error(shell_ctx, "I2C: Device driver %s not found.",
-			    s_dev_name);
+		shell_error(sh, "I2C: Device driver %s not found.", s_dev_name);
 		return -ENODEV;
 	}
 
@@ -330,8 +313,7 @@ static int cmd_i2c_speed(const struct shell *shell_ctx, size_t argc, char **argv
 
 	ret = i2c_configure(dev, dev_config);
 	if (ret < 0) {
-		shell_error(shell_ctx, "I2C: Failed to configure device: %s",
-			    s_dev_name);
+		shell_error(sh, "I2C: Failed to configure device: %s", s_dev_name);
 		return -EIO;
 	}
 	return 0;
diff --git a/drivers/i2c/i2c_sy1xx.c b/drivers/i2c/i2c_sy1xx.c
new file mode 100644
index 0000000000000..300d800a8ba8c
--- /dev/null
+++ b/drivers/i2c/i2c_sy1xx.c
@@ -0,0 +1,406 @@
+/*
+ * Copyright (c) 2025 sensry.io
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT sensry_sy1xx_i2c
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(sy1xx_i2c, CONFIG_I2C_LOG_LEVEL);
+
+#include <soc.h>
+#include <udma.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+
+/** cmds for the udma of i2c */
+#define SY1XX_I2C_CMD_OFFSET  4
+#define SY1XX_I2C_CMD_START   (0x0 << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_STOP    (0x2 << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_RD_ACK  (0x4 << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_RD_NACK (0x6 << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_WR      (0x8 << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_WAIT    (0xA << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_RPT     (0xC << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_CFG     (0xE << SY1XX_I2C_CMD_OFFSET)
+#define SY1XX_I2C_CMD_WAIT_EV (0x1 << SY1XX_I2C_CMD_OFFSET)
+
+#define SY1XX_I2C_ADDR_WRITE (0x0)
+#define SY1XX_I2C_ADDR_READ  (0x1)
+
+enum sy1xx_i2c_speeds {
+	SY1XX_I2C_SPEED_STANDARD = 100000,
+	SY1XX_I2C_SPEED_FAST = 400000,
+	SY1XX_I2C_SPEED_FAST_PLUS = 1000000,
+	SY1XX_I2C_SPEED_HIGH = 3400000,
+	SY1XX_I2C_SPEED_ULTRA = 5000000,
+};
+
+#define DEVICE_MAX_BUFFER_SIZE (512)
+
+enum sy1xx_i2c_mode {
+	UNDEF,
+	READ,
+	WRITE,
+};
+
+struct sy1xx_i2c_dev_config {
+	uint32_t base;
+	uint32_t inst;
+	uint32_t clock_frequency;
+	const struct pinctrl_dev_config *pcfg;
+};
+
+struct sy1xx_i2c_dev_data {
+	struct k_sem lock;
+
+	bool error_active;
+	uint32_t bitrate;
+
+	uint8_t write[DEVICE_MAX_BUFFER_SIZE];
+	uint8_t read[DEVICE_MAX_BUFFER_SIZE];
+};
+
+static void sy1xx_i2c_ctrl_init(const struct device *dev)
+{
+	const struct sy1xx_i2c_dev_config *const cfg = dev->config;
+	struct sy1xx_i2c_dev_data *const data = dev->data;
+	uint16_t divider;
+	uint32_t idx;
+	uint8_t *buf;
+
+	k_sem_take(&data->lock, K_FOREVER);
+
+	/* reset the i2c controller */
+	SY1XX_UDMA_WRITE_REG(cfg->base, SY1XX_UDMA_SETUP_REG, 0x1);
+	k_sleep(K_MSEC(10));
+	SY1XX_UDMA_WRITE_REG(cfg->base, SY1XX_UDMA_SETUP_REG, 0x0);
+	k_sleep(K_MSEC(10));
+
+	/* prepare udma transfer buffer */
+	buf = data->write;
+	idx = 0;
+
+	/* fixed pre-scaler 1:5 */
+	divider = (sy1xx_soc_get_peripheral_clock() / 5) / data->bitrate;
+	buf[idx++] = SY1XX_I2C_CMD_CFG;
+	buf[idx++] = (divider & 0xff00) >> 8;
+	buf[idx++] = (divider & 0x00ff);
+
+	SY1XX_UDMA_START_RX(cfg->base, (uint32_t)data->read, 3, 0);
+	SY1XX_UDMA_START_TX(cfg->base, (uint32_t)buf, idx, 0);
+
+	/* wait for udma run empty */
+	k_sleep(K_MSEC(1));
+
+	/* reset udma channels */
+	SY1XX_UDMA_CANCEL_RX(cfg->base);
+	SY1XX_UDMA_CANCEL_TX(cfg->base);
+
+	data->error_active = false;
+
+	k_sem_give(&data->lock);
+}
+
+static int sy1xx_i2c_configure(const struct device *dev, uint32_t flags)
+{
+	const struct sy1xx_i2c_dev_config *const cfg = dev->config;
+	struct sy1xx_i2c_dev_data *const data = dev->data;
+
+	if (!(flags & I2C_MODE_CONTROLLER)) {
+		LOG_ERR("Master Mode is required");
+		return -EIO;
+	}
+
+	if (flags & I2C_ADDR_10_BITS) {
+		LOG_ERR("I2C 10-bit addressing is currently not supported");
+		LOG_ERR("Please submit a patch");
+		return -EIO;
+	}
+
+	/* Configure clock */
+	switch (I2C_SPEED_GET(flags)) {
+	case I2C_SPEED_STANDARD:
+		data->bitrate = SY1XX_I2C_SPEED_STANDARD;
+		break;
+	case I2C_SPEED_FAST:
+		data->bitrate = SY1XX_I2C_SPEED_FAST;
+		break;
+	case I2C_SPEED_FAST_PLUS:
+		data->bitrate = SY1XX_I2C_SPEED_FAST_PLUS;
+		break;
+	case I2C_SPEED_DT:
+		data->bitrate = cfg->clock_frequency;
+		break;
+
+	default:
+		LOG_ERR("Unsupported I2C speed value");
+		return -EIO;
+	}
+
+	sy1xx_i2c_ctrl_init(dev);
+
+	return 0;
+}
+
+static int sy1xx_i2c_initialize(const struct device *dev)
+{
+	const struct sy1xx_i2c_dev_config *const cfg = dev->config;
+	struct sy1xx_i2c_dev_data *const data = dev->data;
+	int ret;
+	uint32_t flags;
+
+	/* UDMA clock enable */
+	sy1xx_udma_enable_clock(SY1XX_UDMA_MODULE_I2C, cfg->inst);
+
+	/* PAD config */
+	ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		return ret;
+	}
+
+	k_sem_init(&data->lock, 1, 1);
+
+	/* check if DT has bitrate preset */
+	flags = I2C_MODE_CONTROLLER;
+	if (cfg->clock_frequency > 0) {
+		flags |= I2C_SPEED_SET(I2C_SPEED_DT);
+	} else {
+		flags |= I2C_SPEED_SET(I2C_SPEED_STANDARD);
+	}
+
+	return sy1xx_i2c_configure(dev, flags);
+}
+
+/**
+ *
+ * reading expects to receive all line data from i2c lines;
+ * so we have to wait until rx fifo fully empty, so
+ * we add wait states to the second queue and wait
+ * for the switch to second queue - which in that case indicates
+ * that reading (of first queue) is complete.
+ * then the first queue can immediately take the next transfer
+ * and so on.
+ *
+ */
+static int sy1xx_i2c_read(const struct device *dev, struct i2c_msg *msg, uint16_t addr, bool start,
+			  bool stop)
+{
+	const struct sy1xx_i2c_dev_config *const cfg = dev->config;
+	struct sy1xx_i2c_dev_data *const data = dev->data;
+	int ret;
+	uint32_t idx;
+	uint8_t *buf;
+	uint8_t *wait;
+	uint32_t wait_cnt;
+
+	/* prepare udma transfer buffer */
+	buf = data->write;
+	idx = 0;
+
+	if (start) {
+		buf[idx++] = SY1XX_I2C_CMD_START;
+		buf[idx++] = SY1XX_I2C_CMD_WR;
+		buf[idx++] = ((addr & 0x7F) << 1) | SY1XX_I2C_ADDR_READ;
+	}
+
+	if (msg->len > 1) {
+		/* repeat byte reads incl. ackn */
+		buf[idx++] = SY1XX_I2C_CMD_RPT;
+		buf[idx++] = msg->len - 1;
+		buf[idx++] = SY1XX_I2C_CMD_RD_ACK;
+	}
+
+	/* last read without ack */
+	buf[idx++] = SY1XX_I2C_CMD_RD_NACK;
+
+	if (stop) {
+		buf[idx++] = SY1XX_I2C_CMD_STOP;
+	} else {
+		/* add wait cycle for potentially restart condition */
+		buf[idx++] = SY1XX_I2C_CMD_WAIT;
+		buf[idx++] = 1;
+	}
+
+	/* fill 1st fifo queue with reading cmds */
+	SY1XX_UDMA_START_RX(cfg->base, (uint32_t)data->read, msg->len, 0);
+	SY1XX_UDMA_START_TX(cfg->base, (uint32_t)buf, idx, 0);
+
+	/* fill 2nd fifo queue with one waiting cycle */
+	wait = &buf[idx];
+	wait_cnt = 0;
+	wait[wait_cnt++] = SY1XX_I2C_CMD_WAIT;
+	wait[wait_cnt++] = 1;
+
+	SY1XX_UDMA_START_TX(cfg->base, (uint32_t)wait, wait_cnt, 0);
+
+	/* finally wait for the switch from 1st to 2nd queue */
+	SY1XX_UDMA_WAIT_FOR_FINISHED_TX(cfg->base);
+	SY1XX_UDMA_WAIT_FOR_FINISHED_RX(cfg->base);
+
+	/* make sure all is transferred to fifo */
+	if (SY1XX_UDMA_GET_REMAINING_TX(cfg->base)) {
+		LOG_ERR("filling fifo failed");
+		return -EINVAL;
+	}
+
+	if (SY1XX_UDMA_GET_REMAINING_RX(cfg->base)) {
+		LOG_ERR("missing read bytes, %d bytes left",
+			SY1XX_UDMA_GET_REMAINING_RX(cfg->base));
+		return -EINVAL;
+	}
+
+	/* copy data back to msg */
+	memcpy(msg->buf, data->read, msg->len);
+
+	return 0;
+}
+
+/**
+ *
+ * we just fill the outgoing tx fifo of i2c controller;
+ * after leaving this routine, not all bytes may have left the controller to the i2c lines
+ *
+ * filling the fifo is done by dma transfer to one of the two available queues
+ *
+ */
+static int sy1xx_i2c_write(const struct device *dev, struct i2c_msg *msg, uint16_t addr, bool start,
+			   bool stop)
+{
+	const struct sy1xx_i2c_dev_config *const cfg = dev->config;
+	struct sy1xx_i2c_dev_data *const data = dev->data;
+	int ret;
+	uint32_t idx;
+	uint8_t *buf;
+	uint8_t *wait;
+
+	/* prepare udma transfer buffer */
+	buf = data->write;
+	idx = 0;
+
+	if (start) {
+		buf[idx++] = SY1XX_I2C_CMD_START;
+		buf[idx++] = SY1XX_I2C_CMD_WR;
+		buf[idx++] = ((addr & 0x7F) << 1) | SY1XX_I2C_ADDR_WRITE;
+	}
+
+	if (msg->len) {
+		/* repeat byte write for all given data */
+		buf[idx++] = SY1XX_I2C_CMD_RPT;
+		buf[idx++] = msg->len;
+		buf[idx++] = SY1XX_I2C_CMD_WR;
+
+		/* add data */
+		for (uint32_t i = 0; i < msg->len; i++) {
+			buf[idx++] = msg->buf[i];
+		}
+	}
+
+	if (stop) {
+		buf[idx++] = SY1XX_I2C_CMD_STOP;
+	} else {
+		/* add wait cycle for potentially restart condition */
+		buf[idx++] = SY1XX_I2C_CMD_WAIT;
+		buf[idx++] = 1;
+	}
+
+	/* fill next tx fifo queue */
+	SY1XX_UDMA_START_TX(cfg->base, (uint32_t)buf, idx, 0);
+
+	/* wait for udma has filled i2c controller tx fifo */
+	SY1XX_UDMA_WAIT_FOR_FINISHED_TX(cfg->base);
+
+	/* make sure all is transferred to fifo */
+	if (SY1XX_UDMA_GET_REMAINING_TX(cfg->base)) {
+		LOG_ERR("filling fifo failed");
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int sy1xx_i2c_transfer(const struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs,
+			      uint16_t addr)
+{
+	struct sy1xx_i2c_dev_data *const data = dev->data;
+	int ret;
+	bool start_cond, stop_cond;
+	enum sy1xx_i2c_mode prv_xfer, cur_xfer;
+
+	if (num_msgs < 0) {
+		return 0;
+	}
+
+	if (data->error_active) {
+		sy1xx_i2c_ctrl_init(dev);
+	}
+
+	k_sem_take(&data->lock, K_FOREVER);
+
+	prv_xfer = UNDEF;
+	for (uint32_t n = 0; n < num_msgs; n++) {
+
+		/* detect transfer type */
+		if ((msgs[n].flags & I2C_MSG_READ) == I2C_MSG_READ) {
+			/* read msg */
+			cur_xfer = READ;
+		} else {
+			/* write msg */
+			cur_xfer = WRITE;
+		}
+
+		/* transfer switched from read to write; or vice versa */
+		if (prv_xfer != cur_xfer) {
+			prv_xfer = cur_xfer;
+			start_cond = true;
+		} else {
+			start_cond = false;
+		}
+
+		/* stop on last msg */
+		if (n == (num_msgs - 1)) {
+			stop_cond = true;
+		} else {
+			stop_cond = false;
+		}
+
+		if (cur_xfer == READ) {
+			ret = sy1xx_i2c_read(dev, &msgs[n], addr, start_cond, stop_cond);
+		} else {
+			ret = sy1xx_i2c_write(dev, &msgs[n], addr, start_cond, stop_cond);
+		}
+
+		if (ret) {
+			data->error_active = true;
+			break;
+		}
+	}
+
+	k_sem_give(&data->lock);
+
+	return ret;
+}
+
+static DEVICE_API(i2c, sy1xx_i2c_driver_api) = {
+	.configure = sy1xx_i2c_configure,
+	.transfer = sy1xx_i2c_transfer,
+};
+
+#define SY1XX_I2C_INIT(n)                                                                          \
+                                                                                                   \
+	PINCTRL_DT_INST_DEFINE(n);                                                                 \
+                                                                                                   \
+	static const struct sy1xx_i2c_dev_config sy1xx_i2c_dev_config_##n = {                      \
+		.base = DT_INST_REG_ADDR(n),                                                       \
+		.inst = DT_INST_PROP(n, instance),                                                 \
+		.clock_frequency = DT_INST_PROP_OR(n, clock_frequency, 0),                         \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                         \
+	};                                                                                         \
+	static struct sy1xx_i2c_dev_data __attribute__((section(".udma_access")))                  \
+	__aligned(4) sy1xx_i2c_dev_data_##n = {};                                                  \
+	I2C_DEVICE_DT_INST_DEFINE(n, sy1xx_i2c_initialize, NULL, &sy1xx_i2c_dev_data_##n,          \
+				  &sy1xx_i2c_dev_config_##n, POST_KERNEL,                          \
+				  CONFIG_I2C_INIT_PRIORITY, &sy1xx_i2c_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(SY1XX_I2C_INIT)
diff --git a/drivers/i2c/i2c_tca954x.c b/drivers/i2c/i2c_tca954x.c
index ab8c3f0101341..07e7785229995 100644
--- a/drivers/i2c/i2c_tca954x.c
+++ b/drivers/i2c/i2c_tca954x.c
@@ -18,6 +18,7 @@ struct tca954x_root_config {
 	struct i2c_dt_spec i2c;
 	uint8_t nchans;
 	const struct gpio_dt_spec reset_gpios;
+	bool idle_disconnect;
 };
 
 struct tca954x_root_data {
@@ -82,7 +83,7 @@ static int tca954x_transfer(const struct device *dev,
 	const struct tca954x_root_config *config =
 			get_root_config_from_channel(dev);
 	const struct tca954x_channel_config *down_cfg = dev->config;
-	int res;
+	int res, disconnect_res;
 
 	res = k_mutex_lock(&data->lock, K_MSEC(5000));
 	if (res != 0) {
@@ -96,6 +97,14 @@ static int tca954x_transfer(const struct device *dev,
 
 	res = i2c_transfer(config->i2c.bus, msgs, num_msgs, addr);
 
+	if (config->idle_disconnect) {
+		/* Always attempt to disconnect, even if i2c_transfer fails */
+		disconnect_res = tca954x_set_channel(down_cfg->root, 0);
+		if (disconnect_res != 0 && res == 0) {
+			res = disconnect_res;
+		}
+	}
+
 end_trans:
 	k_mutex_unlock(&data->lock);
 	return res;
@@ -186,6 +195,7 @@ BUILD_ASSERT(CONFIG_I2C_TCA954X_CHANNEL_INIT_PRIO > CONFIG_I2C_TCA954X_ROOT_INIT
 		.nchans = ch,							  \
 		.reset_gpios = GPIO_DT_SPEC_GET_OR(			          \
 				DT_INST(inst, ti_tca##n##a), reset_gpios, {0}),	  \
+		.idle_disconnect = DT_INST_PROP(inst, i2c_mux_idle_disconnect),	  \
 	};								          \
 	static struct tca954x_root_data tca##n##a_data_##inst = {		  \
 		.lock = Z_MUTEX_INITIALIZER(tca##n##a_data_##inst.lock),	  \
diff --git a/drivers/i2c/i2c_wch.c b/drivers/i2c/i2c_wch.c
new file mode 100644
index 0000000000000..e8176c257f0f2
--- /dev/null
+++ b/drivers/i2c/i2c_wch.c
@@ -0,0 +1,444 @@
+/*
+ * Copyright (c) 2025 Andrei-Edward Popa
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT wch_i2c
+
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(i2c_wch);
+
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/device.h>
+
+#include "i2c-priv.h"
+
+#include <ch32fun.h>
+
+typedef void (*irq_config_func_t)(const struct device *port);
+
+struct i2c_wch_config {
+	const struct pinctrl_dev_config *pcfg;
+	irq_config_func_t irq_config_func;
+	const struct device *clk_dev;
+	I2C_TypeDef *regs;
+	uint32_t bitrate;
+	uint8_t clk_id;
+};
+
+struct i2c_wch_data {
+	struct k_sem xfer_done;
+	struct {
+		struct i2c_msg *msg;
+		uint32_t idx;
+		union {
+			struct {
+				uint16_t addr : 10;
+				uint16_t err : 6;
+			};
+			uint16_t: 16;
+		};
+	} current;
+};
+
+static void wch_i2c_handle_start_bit(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+
+	if ((data->current.msg->flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) {
+		regs->DATAR = ((data->current.addr << 1) & 0xFF);
+	} else {
+		regs->DATAR = ((data->current.addr << 1) & 0xFF) | 1;
+		if (data->current.msg->len == 2U) {
+			regs->CTLR1 |= I2C_CTLR1_POS;
+		}
+	}
+}
+
+static void wch_i2c_handle_addr(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+
+	if ((data->current.msg->flags & I2C_MSG_RW_MASK) == I2C_MSG_READ) {
+		if (data->current.msg->len <= 2U) {
+			regs->CTLR1 &= ~I2C_CTLR1_ACK;
+			if (data->current.msg->len == 2U) {
+				regs->CTLR1 |= I2C_CTLR1_POS;
+			}
+		}
+	}
+
+	regs->STAR1;
+	regs->STAR2;
+}
+
+static void wch_i2c_handle_txe(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+
+	if (data->current.idx < data->current.msg->len) {
+		regs->DATAR = data->current.msg->buf[data->current.idx++];
+		if (data->current.idx == data->current.msg->len) {
+			regs->CTLR2 &= ~I2C_CTLR2_ITBUFEN;
+		}
+	} else {
+		if (data->current.msg->flags & I2C_MSG_STOP) {
+			regs->CTLR1 |= I2C_CTLR1_STOP;
+		}
+
+		if (regs->STAR1 & I2C_STAR1_BTF) {
+			regs->DATAR;
+		}
+
+		k_sem_give(&data->xfer_done);
+	}
+}
+
+static void wch_i2c_handle_rxne(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+
+	if (data->current.idx < data->current.msg->len) {
+		switch (data->current.msg->len - data->current.idx) {
+		case 1:
+			if (data->current.msg->flags & I2C_MSG_STOP) {
+				regs->CTLR1 |= I2C_CTLR1_STOP;
+			}
+			regs->CTLR2 &= ~I2C_CTLR2_ITBUFEN;
+			data->current.msg->buf[data->current.idx++] = regs->DATAR;
+			k_sem_give(&data->xfer_done);
+			break;
+		case 2:
+			regs->CTLR1 &= ~I2C_CTLR1_ACK;
+			regs->CTLR1 |= I2C_CTLR1_POS;
+			__fallthrough;
+		default:
+			data->current.msg->buf[data->current.idx++] = regs->DATAR;
+		}
+	} else {
+		if (data->current.msg->flags & I2C_MSG_STOP) {
+			regs->CTLR1 |= I2C_CTLR1_STOP;
+		}
+		k_sem_give(&data->xfer_done);
+	}
+}
+
+static void i2c_wch_event_isr(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+	uint16_t status = regs->STAR1;
+	bool write;
+
+	write = ((data->current.msg->flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE);
+
+	if (status & I2C_STAR1_SB) {
+		wch_i2c_handle_start_bit(dev);
+	} else if (status & I2C_STAR1_ADDR) {
+		wch_i2c_handle_addr(dev);
+	} else if ((status & (I2C_STAR1_TXE | I2C_STAR1_BTF)) && write) {
+		wch_i2c_handle_txe(dev);
+	} else if ((status & (I2C_STAR1_RXNE | I2C_STAR1_BTF)) && (!write)) {
+		wch_i2c_handle_rxne(dev);
+	}
+}
+
+static void i2c_wch_error_isr(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+	uint16_t status = regs->STAR1;
+
+	if (status & (I2C_STAR1_AF | I2C_STAR1_ARLO | I2C_STAR1_BERR)) {
+		if (status & I2C_STAR1_AF) {
+			regs->CTLR1 |= I2C_CTLR1_STOP;
+		}
+
+		data->current.err |= ((status >> 8) & 0x7);
+
+		regs->STAR1 &= ~(I2C_STAR1_AF | I2C_STAR1_ARLO | I2C_STAR1_BERR);
+
+		k_sem_give(&data->xfer_done);
+	}
+}
+
+static void wch_i2c_msg_init(const struct device *dev, struct i2c_msg *msg,
+			     uint16_t addr, bool first_msg)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+
+	k_sem_reset(&data->xfer_done);
+
+	data->current.msg = msg;
+	data->current.idx = 0U;
+	data->current.err = 0U;
+	data->current.addr = addr;
+
+	regs->CTLR1 |= I2C_CTLR1_PE;
+	regs->CTLR1 |= I2C_CTLR1_ACK;
+
+	if (first_msg || (msg->flags & I2C_MSG_RESTART)) {
+		if (regs->CTLR1 & I2C_CTLR1_STOP) {
+			regs->CTLR1 &= ~I2C_CTLR1_STOP;
+		}
+		regs->CTLR1 |= I2C_CTLR1_START;
+	}
+}
+
+static int32_t wch_i2c_msg_end(const struct device *dev)
+{
+	struct i2c_wch_data *data = dev->data;
+
+	if (!data->current.err) {
+		return 0;
+	}
+
+	if (data->current.err & (I2C_STAR1_ARLO >> 8)) {
+		LOG_DBG("ARLO");
+	}
+
+	if (data->current.err & (I2C_STAR1_AF >> 8)) {
+		LOG_DBG("NACK");
+	}
+
+	if (data->current.err & (I2C_STAR1_BERR >> 8)) {
+		LOG_DBG("ERR");
+	}
+
+	data->current.err = 0;
+
+	return -EIO;
+}
+
+static void wch_i2c_config_interrupts(I2C_TypeDef *regs, bool enable)
+{
+	if (enable) {
+		regs->CTLR2 |= (I2C_CTLR2_ITERREN | I2C_CTLR2_ITEVTEN | I2C_CTLR2_ITBUFEN);
+	} else {
+		regs->CTLR2 &= ~(I2C_CTLR2_ITERREN | I2C_CTLR2_ITEVTEN | I2C_CTLR2_ITBUFEN);
+	}
+}
+
+static int32_t wch_i2c_begin_transfer(const struct device *dev, struct i2c_msg *msg,
+				      uint16_t addr, bool first_msg)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	I2C_TypeDef *regs = config->regs;
+
+	wch_i2c_msg_init(dev, msg, addr, first_msg);
+
+	wch_i2c_config_interrupts(regs, true);
+
+	if (k_sem_take(&data->xfer_done, K_MSEC(CONFIG_I2C_WCH_XFER_TIMEOUT_MS)) < 0) {
+		return -ETIMEDOUT;
+	}
+
+	return wch_i2c_msg_end(dev);
+}
+
+static void wch_i2c_finish_transfer(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	I2C_TypeDef *regs = config->regs;
+
+	wch_i2c_config_interrupts(regs, false);
+
+	while (regs->STAR2 & I2C_STAR2_BUSY) {
+	}
+
+	regs->CTLR1 &= ~I2C_CTLR1_PE;
+}
+
+static int wch_i2c_configure_timing(I2C_TypeDef *regs, uint32_t clock_rate,
+				    uint32_t speed)
+{
+	uint16_t freq_range = (uint16_t)(clock_rate / 1000000);
+	uint16_t clock_config;
+
+#ifndef CONFIG_SOC_CH32V003
+	uint16_t trise;
+
+	switch (speed) {
+	case I2C_SPEED_STANDARD:
+		trise = freq_range + 1;
+		break;
+	case I2C_SPEED_FAST:
+		trise = (freq_range * 3 / 10) + 1;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	regs->RTR = trise;
+#endif
+
+	switch (speed) {
+	case I2C_SPEED_STANDARD:
+		clock_config = MAX((uint16_t)(clock_rate / (100000 * 2)), 4);
+		break;
+	case I2C_SPEED_FAST:
+		clock_config = MAX((uint16_t)(clock_rate / (400000 * 3)), 1) | I2C_CKCFGR_FS;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	regs->CKCFGR = clock_config;
+	regs->CTLR2 = (regs->CTLR2 & ~I2C_CTLR2_FREQ) | freq_range;
+
+	return 0;
+}
+
+static int i2c_wch_configure(const struct device *dev, uint32_t dev_config)
+{
+	const struct i2c_wch_config *config = dev->config;
+	I2C_TypeDef *regs = config->regs;
+	clock_control_subsys_t clk_sys;
+	uint32_t clock_rate;
+	int err;
+
+	if (!(dev_config & I2C_MODE_CONTROLLER)) {
+		return -ENOTSUP;
+	}
+
+	if (dev_config & I2C_ADDR_10_BITS) {
+		return -ENOTSUP;
+	}
+
+	clk_sys = (clock_control_subsys_t)(uintptr_t)config->clk_id;
+
+	err = clock_control_get_rate(config->clk_dev, clk_sys, &clock_rate);
+	if (err != 0) {
+		return err;
+	}
+
+	regs->CTLR1 &= ~I2C_CTLR1_PE;
+
+	err = wch_i2c_configure_timing(regs, clock_rate, I2C_SPEED_GET(dev_config));
+	if (err != 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+static int i2c_wch_transfer(const struct device *dev, struct i2c_msg *msg,
+			    uint8_t num_msgs, uint16_t addr)
+{
+	int ret = 0;
+
+	for (uint8_t i = 1; i < num_msgs; i++) {
+		if ((msg[i - 1].flags & I2C_MSG_RW_MASK) != (msg[i].flags & I2C_MSG_RW_MASK)) {
+			if (!(msg[i].flags & I2C_MSG_RESTART)) {
+				return -EINVAL;
+			}
+		}
+
+		if (msg[i - 1].flags & I2C_MSG_STOP) {
+			return -EINVAL;
+		}
+	}
+
+	for (uint8_t i = 0; i < num_msgs && ret == 0; i++) {
+		ret = wch_i2c_begin_transfer(dev, &msg[i], addr, i == 0);
+	}
+
+	wch_i2c_finish_transfer(dev);
+
+	return ret;
+}
+
+static int i2c_wch_init(const struct device *dev)
+{
+	const struct i2c_wch_config *config = dev->config;
+	struct i2c_wch_data *data = dev->data;
+	clock_control_subsys_t clk_sys;
+	int err;
+
+	k_sem_init(&data->xfer_done, 0, 1);
+
+	clk_sys = (clock_control_subsys_t)(uintptr_t)config->clk_id;
+
+	err = clock_control_on(config->clk_dev, clk_sys);
+	if (err < 0) {
+		return err;
+	}
+
+	err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (err < 0) {
+		return err;
+	}
+
+	err = i2c_wch_configure(dev, I2C_MODE_CONTROLLER | i2c_map_dt_bitrate(config->bitrate));
+	if (err < 0) {
+		return err;
+	}
+
+	config->irq_config_func(dev);
+
+	return 0;
+}
+
+static DEVICE_API(i2c, i2c_wch_api) = {
+	.configure = i2c_wch_configure,
+	.transfer = i2c_wch_transfer,
+#ifdef CONFIG_I2C_RTIO
+	.iodev_submit = i2c_iodev_submit_fallback,
+#endif
+};
+
+#define I2C_WCH_INIT(inst)								\
+	PINCTRL_DT_INST_DEFINE(inst);							\
+											\
+	static void i2c_wch_config_func_##inst(const struct device *dev);		\
+											\
+	static struct i2c_wch_config i2c_wch_cfg_##inst = {				\
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),				\
+		.irq_config_func = i2c_wch_config_func_##inst,				\
+		.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(inst)),			\
+		.regs = (I2C_TypeDef *)DT_INST_REG_ADDR(inst),				\
+		.bitrate = DT_INST_PROP(inst, clock_frequency),				\
+		.clk_id = DT_INST_CLOCKS_CELL(inst, id)					\
+	};										\
+											\
+	static struct i2c_wch_data i2c_wch_data_##inst;					\
+											\
+	I2C_DEVICE_DT_INST_DEFINE(inst, i2c_wch_init, NULL, &i2c_wch_data_##inst,	\
+				 &i2c_wch_cfg_##inst, PRE_KERNEL_1,			\
+				 CONFIG_I2C_INIT_PRIORITY, &i2c_wch_api);		\
+											\
+	static void i2c_wch_config_func_##inst(const struct device *dev)		\
+	{										\
+		ARG_UNUSED(dev);							\
+											\
+		IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, 0, irq),				\
+			    DT_INST_IRQ_BY_IDX(inst, 0, priority),			\
+			    i2c_wch_event_isr, DEVICE_DT_INST_GET(inst), 0);		\
+		irq_enable(DT_INST_IRQ_BY_IDX(inst, 0, irq));				\
+											\
+		IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, 1, irq),				\
+			    DT_INST_IRQ_BY_IDX(inst, 1, priority),			\
+			    i2c_wch_error_isr, DEVICE_DT_INST_GET(inst), 0);		\
+		irq_enable(DT_INST_IRQ_BY_IDX(inst, 1, irq));				\
+	}
+
+DT_INST_FOREACH_STATUS_OKAY(I2C_WCH_INIT)
diff --git a/drivers/i2c/i2c_xilinx_axi.c b/drivers/i2c/i2c_xilinx_axi.c
index 61f9108b53607..42a716f19add9 100644
--- a/drivers/i2c/i2c_xilinx_axi.c
+++ b/drivers/i2c/i2c_xilinx_axi.c
@@ -283,15 +283,24 @@ static uint32_t i2c_xilinx_axi_wait_interrupt(const struct i2c_xilinx_axi_config
 	return events;
 }
 
-static void i2c_xilinx_axi_clear_interrupt(const struct i2c_xilinx_axi_config *config,
-					   struct i2c_xilinx_axi_data *data, uint32_t int_mask)
+static void i2c_xilinx_axi_clear_interrupt_no_lock(const struct i2c_xilinx_axi_config *config,
+						   struct i2c_xilinx_axi_data *data,
+						   uint32_t int_mask)
 {
-	const k_spinlock_key_t key = k_spin_lock(&data->lock);
 	const uint32_t int_status = sys_read32(config->base + REG_ISR);
 
 	if (int_status & int_mask) {
 		sys_write32(int_status & int_mask, config->base + REG_ISR);
 	}
+}
+
+static void i2c_xilinx_axi_clear_interrupt(const struct i2c_xilinx_axi_config *config,
+					   struct i2c_xilinx_axi_data *data, uint32_t int_mask)
+{
+	const k_spinlock_key_t key = k_spin_lock(&data->lock);
+
+	i2c_xilinx_axi_clear_interrupt_no_lock(config, data, int_mask);
+
 	k_spin_unlock(&data->lock, key);
 }
 
@@ -521,7 +530,8 @@ static int i2c_xilinx_axi_write(const struct i2c_xilinx_axi_config *config,
 			bytes_to_send--;
 			bytes_left--;
 		}
-		i2c_xilinx_axi_clear_interrupt(config, data, ISR_TX_FIFO_EMPTY | ISR_BUS_NOT_BUSY);
+		i2c_xilinx_axi_clear_interrupt_no_lock(config, data,
+						       ISR_TX_FIFO_EMPTY | ISR_BUS_NOT_BUSY);
 		k_spin_unlock(&data->lock, key);
 
 		ret = i2c_xilinx_axi_wait_tx_done(config, data);
diff --git a/drivers/i2s/Kconfig.esp32 b/drivers/i2s/Kconfig.esp32
index b7044b142885f..8cc13d01dc92e 100644
--- a/drivers/i2s/Kconfig.esp32
+++ b/drivers/i2s/Kconfig.esp32
@@ -6,8 +6,7 @@ config I2S_ESP32
 	bool "ESP32 I2S driver"
 	default y
 	depends on DT_HAS_ESPRESSIF_ESP32_I2S_ENABLED
-	depends on DT_HAS_ESPRESSIF_ESP32_GDMA_ENABLED
-	select DMA
+	select DMA if DT_HAS_ESPRESSIF_ESP32_GDMA_ENABLED
 	help
 	  Enables the ESP32 I2S driver (GDMA SoCs only).
 
@@ -25,4 +24,11 @@ config I2S_ESP32_TX_BLOCK_COUNT
 	help
 	  Max number of blocks waiting to be transmitted by the I2S TX channel.
 
+config I2S_ESP32_DMA_DESC_NUM_MAX
+	int "ESP32 I2S number of link descriptors"
+	default 10
+	depends on !DT_HAS_ESPRESSIF_ESP32_GDMA_ENABLED
+	help
+	  Max number of link descriptor available for DMA transfers on each I2S channel
+
 endif
diff --git a/drivers/i2s/i2s_esp32.c b/drivers/i2s/i2s_esp32.c
index 1570c85efcfe4..ab29e02a90220 100644
--- a/drivers/i2s/i2s_esp32.c
+++ b/drivers/i2s/i2s_esp32.c
@@ -1,70 +1,97 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) CO LTD
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #define DT_DRV_COMPAT espressif_esp32_i2s
 
-#include <zephyr/drivers/dma.h>
 #include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/dma.h>
 #include <zephyr/drivers/dma/dma_esp32.h>
-#include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
-
-#include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
-
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+#include <soc.h>
 #include <esp_clk_tree.h>
 #include <hal/i2s_hal.h>
 
+#if !SOC_GDMA_SUPPORTED
+#include <soc/lldesc.h>
+#include <esp_memory_utils.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
+#endif /* !SOC_GDMA_SUPPORTED */
+
+#if SOC_GDMA_SUPPORTED && !DT_HAS_COMPAT_STATUS_OKAY(espressif_esp32_gdma)
+#error "DMA peripheral is not enabled!"
+#endif /* SOC_GDMA_SUPPORTED */
+
 LOG_MODULE_REGISTER(i2s_esp32, CONFIG_I2S_LOG_LEVEL);
 
-#if !SOC_GDMA_SUPPORTED
-#error "Only SoCs with GDMA peripheral are supported!"
-#endif
+#define I2S_ESP32_CLK_SRC             I2S_CLK_SRC_DEFAULT
+#define I2S_ESP32_DMA_BUFFER_MAX_SIZE 4092
 
-#define I2S_ESP32_CLK_SRC I2S_CLK_SRC_DEFAULT
+#define I2S_ESP32_NUM_INST_OK DT_NUM_INST_STATUS_OKAY(espressif_esp32_i2s)
+#define I2S_ESP32_IS_DIR_INST_EN(i, d) DT_INST_DMAS_HAS_NAME(i, d) || DT_INST_IRQ_HAS_NAME(i, d)
+#define I2S_ESP32_IS_DIR_EN(d)  LISTIFY(I2S_ESP32_NUM_INST_OK, I2S_ESP32_IS_DIR_INST_EN, (||), d)
 
 struct queue_item {
 	void *buffer;
 	size_t size;
 };
 
-struct i2s_esp32_stream {
+struct i2s_esp32_stream;
+
+struct i2s_esp32_stream_data {
 	int32_t state;
-	struct i2s_config i2s_cfg;
 	bool is_slave;
-
-	const struct device *dma_dev;
-	uint32_t dma_channel;
-
-	bool stop_without_draining;
-
+	struct i2s_config i2s_cfg;
 	void *mem_block;
 	size_t mem_block_len;
 	bool last_block;
-
+	bool stop_without_draining;
 	struct k_msgq queue;
-	void (*queue_drop)(struct i2s_esp32_stream *stream);
+	struct intr_handle_data_t *irq_handle;
+	bool dma_pending;
+	uint8_t chunks_rem;
+	uint8_t chunk_idx;
+};
 
+struct i2s_esp32_stream_conf {
+	void (*queue_drop)(const struct i2s_esp32_stream *stream);
 	int (*start_transfer)(const struct device *dev);
 	void (*stop_transfer)(const struct device *dev);
+	const struct device *dma_dev;
+	uint32_t dma_channel;
+#if SOC_GDMA_SUPPORTED
+	void *dma_desc;
+#else
+	lldesc_t *dma_desc;
+#endif
+	int irq_source;
+	int irq_priority;
+	int irq_flags;
+};
+
+struct i2s_esp32_stream {
+	struct i2s_esp32_stream_data *data;
+	const struct i2s_esp32_stream_conf *conf;
 };
 
 struct i2s_esp32_cfg {
 	const int unit;
-	i2s_hal_context_t hal_cxt;
+	i2s_hal_context_t hal;
 	const struct pinctrl_dev_config *pcfg;
 	const struct device *clock_dev;
 	clock_control_subsys_t clock_subsys;
+	struct i2s_esp32_stream rx;
+	struct i2s_esp32_stream tx;
 };
 
 struct i2s_esp32_data {
 	i2s_hal_clock_info_t clk_info;
-	struct i2s_esp32_stream rx;
-	struct i2s_esp32_stream tx;
 };
 
 uint32_t i2s_esp32_get_source_clk_freq(i2s_clock_src_t clk_src)
@@ -117,136 +144,163 @@ static esp_err_t i2s_esp32_calculate_clock(const struct i2s_config *i2s_cfg, uin
 	return ESP_OK;
 }
 
-static void i2s_esp32_queue_drop(struct i2s_esp32_stream *stream)
+static void i2s_esp32_queue_drop(const struct i2s_esp32_stream *stream)
 {
 	struct queue_item item;
 
-	while (k_msgq_get(&stream->queue, &item, K_NO_WAIT) == 0) {
-		k_mem_slab_free(stream->i2s_cfg.mem_slab, item.buffer);
+	while (k_msgq_get(&stream->data->queue, &item, K_NO_WAIT) == 0) {
+		k_mem_slab_free(stream->data->i2s_cfg.mem_slab, item.buffer);
 	}
 }
 
-static void i2s_esp32_rx_callback(const struct device *dma_dev, void *arg, uint32_t channel,
-				  int status);
-static void i2s_esp32_tx_callback(const struct device *dma_dev, void *arg, uint32_t channel,
-				  int status);
+static int i2s_esp32_restart_dma(const struct device *dev, enum i2s_dir dir);
+static int i2s_esp32_start_dma(const struct device *dev, enum i2s_dir dir);
 
-static int i2s_esp32_restart_dma(const struct device *dev, enum i2s_dir i2s_dir)
+#if I2S_ESP32_IS_DIR_EN(rx)
+
+#if SOC_GDMA_SUPPORTED
+static void i2s_esp32_rx_callback(const struct device *dma_dev, void *arg, uint32_t channel,
+				  int status)
+#else
+static void i2s_esp32_rx_callback(void *arg, int status)
+#endif /* SOC_GDMA_SUPPORTED */
 {
+	const struct device *dev = (const struct device *)arg;
 	const struct i2s_esp32_cfg *dev_cfg = dev->config;
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream;
-	void *src = NULL, *dst = NULL;
+	const struct i2s_esp32_stream *stream = &dev_cfg->rx;
 	int err;
 
-	if (i2s_dir == I2S_DIR_RX) {
-		stream = &dev_data->rx;
-		dst = stream->mem_block;
-	} else if (i2s_dir == I2S_DIR_TX) {
-		stream = &dev_data->tx;
-		src = stream->mem_block;
-	} else {
-		LOG_ERR("Invalid DMA direction");
-		return -EINVAL;
+#if SOC_GDMA_SUPPORTED
+	if (status < 0) {
+#else
+	if (status & I2S_LL_EVENT_RX_DSCR_ERR) {
+#endif /* SOC_GDMA_SUPPORTED */
+		stream->data->state = I2S_STATE_ERROR;
+		LOG_ERR("RX status bad: %d", status);
+		goto rx_disable;
 	}
 
-	err = dma_reload(stream->dma_dev, stream->dma_channel, (uint32_t)src, (uint32_t)dst,
-			 stream->mem_block_len);
-	if (err < 0) {
-		LOG_ERR("Error reloading DMA channel[%d]: %d", (int)stream->dma_channel, err);
-		return -EIO;
+	if (stream->data->mem_block == NULL) {
+		if (stream->data->state != I2S_STATE_READY) {
+			stream->data->state = I2S_STATE_ERROR;
+			LOG_ERR("RX mem_block NULL");
+			goto rx_disable;
+		} else {
+			return;
+		}
 	}
 
-	if (i2s_dir == I2S_DIR_RX) {
-		i2s_ll_rx_set_eof_num(dev_cfg->hal_cxt.dev, stream->mem_block_len);
-	}
+#if SOC_GDMA_SUPPORTED
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+	uint16_t chunk_len;
 
-	err = dma_start(stream->dma_dev, stream->dma_channel);
-	if (err < 0) {
-		LOG_ERR("Error starting DMA channel[%d]: %d", (int)stream->dma_channel, err);
-		return -EIO;
-	}
+	if (stream->data->chunks_rem) {
+		uint32_t dst;
 
-	return 0;
-}
+		stream->data->chunk_idx++;
+		stream->data->chunks_rem--;
+		if (stream->data->chunks_rem) {
+			chunk_len = I2S_ESP32_DMA_BUFFER_MAX_SIZE;
+		} else {
+			chunk_len = stream->data->mem_block_len % I2S_ESP32_DMA_BUFFER_MAX_SIZE;
+			if (chunk_len == 0) {
+				chunk_len = I2S_ESP32_DMA_BUFFER_MAX_SIZE;
+			}
+		}
 
-static int i2s_esp32_start_dma(const struct device *dev, enum i2s_dir i2s_dir)
-{
-	const struct i2s_esp32_cfg *dev_cfg = dev->config;
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream = NULL;
-	struct dma_config dma_cfg = {0};
-	struct dma_block_config dma_blk = {0};
-	unsigned int key;
-	int err, ret = 0;
+		dst = (uint32_t)stream->data->mem_block + (stream->data->chunk_idx *
+							   I2S_ESP32_DMA_BUFFER_MAX_SIZE);
+		err = dma_reload(stream->conf->dma_dev, stream->conf->dma_channel, (uint32_t)NULL,
+				(uint32_t)dst, chunk_len);
+		if (err < 0) {
+			LOG_ERR("Failed to reload DMA channel: %"PRIu32, stream->conf->dma_channel);
+			goto rx_disable;
+		}
 
-	if (i2s_dir == I2S_DIR_RX) {
-		stream = &dev_data->rx;
-	} else if (i2s_dir == I2S_DIR_TX) {
-		stream = &dev_data->tx;
-	} else {
-		LOG_ERR("Invalid DMA direction");
-		return -EINVAL;
-	}
+		i2s_ll_rx_set_eof_num(hal->dev, chunk_len);
 
-	key = irq_lock();
+		err = dma_start(stream->conf->dma_dev, stream->conf->dma_channel);
+		if (err < 0) {
+			LOG_ERR("Failed to start DMA channel: %"PRIu32, stream->conf->dma_channel);
+			goto rx_disable;
+		}
 
-	dma_blk.block_size = stream->mem_block_len;
-	if (i2s_dir == I2S_DIR_RX) {
-		dma_blk.dest_address = (uint32_t)stream->mem_block;
-		dma_cfg.channel_direction = PERIPHERAL_TO_MEMORY;
-		dma_cfg.dma_callback = i2s_esp32_rx_callback;
-	} else {
-		dma_blk.source_address = (uint32_t)stream->mem_block;
-		dma_cfg.channel_direction = MEMORY_TO_PERIPHERAL;
-		dma_cfg.dma_callback = i2s_esp32_tx_callback;
+		stream->data->dma_pending = true;
+
+		return;
 	}
-	dma_cfg.user_data = (void *)dev;
-	dma_cfg.dma_slot =
-		dev_cfg->unit == 0 ? ESP_GDMA_TRIG_PERIPH_I2S0 : ESP_GDMA_TRIG_PERIPH_I2S1;
-	dma_cfg.block_count = 1;
-	dma_cfg.head_block = &dma_blk;
+#endif /* SOC_GDMA_SUPPORTED */
 
-	err = dma_config(stream->dma_dev, stream->dma_channel, &dma_cfg);
+	struct queue_item item = {
+		.buffer = stream->data->mem_block,
+		.size = stream->data->mem_block_len
+	};
+
+	err = k_msgq_put(&stream->data->queue, &item, K_NO_WAIT);
 	if (err < 0) {
-		LOG_ERR("Error configuring DMA channel[%d]: %d", (int)stream->dma_channel, err);
-		ret = -EINVAL;
-		goto unlock;
+		stream->data->state = I2S_STATE_ERROR;
+		goto rx_disable;
 	}
 
-	if (i2s_dir == I2S_DIR_RX) {
-		i2s_ll_rx_set_eof_num(dev_cfg->hal_cxt.dev, stream->mem_block_len);
+	if (stream->data->state == I2S_STATE_STOPPING) {
+		stream->data->state = I2S_STATE_READY;
+		goto rx_disable;
 	}
 
-	err = dma_start(stream->dma_dev, stream->dma_channel);
+	err = k_mem_slab_alloc(stream->data->i2s_cfg.mem_slab, &stream->data->mem_block, K_NO_WAIT);
 	if (err < 0) {
-		LOG_ERR("Error starting DMA channel[%d]: %d", (int)stream->dma_channel, err);
-		ret = -EIO;
-		goto unlock;
+		LOG_ERR("RX failed to allocate memory from slab: %i:", err);
+		stream->data->state = I2S_STATE_ERROR;
+		goto rx_disable;
 	}
+	stream->data->mem_block_len = stream->data->i2s_cfg.block_size;
 
-unlock:
-	irq_unlock(key);
-	return ret;
+	err = i2s_esp32_restart_dma(dev, I2S_DIR_RX);
+	if (err < 0) {
+		stream->data->state = I2S_STATE_ERROR;
+		LOG_ERR("Failed to restart RX transfer: %d", err);
+		goto rx_disable;
+	}
+
+	return;
+
+rx_disable:
+	stream->conf->stop_transfer(dev);
 }
 
+#if !SOC_GDMA_SUPPORTED
+
+static void IRAM_ATTR i2s_esp32_rx_handler(void *arg)
+{
+	if (arg == NULL) {
+		return;
+	}
+
+	struct device *dev = (struct device *)arg;
+	const struct i2s_esp32_cfg *const dev_cfg = dev->config;
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+	uint32_t status = i2s_hal_get_intr_status(hal);
+
+	i2s_hal_clear_intr_status(hal, status);
+	if (status & I2S_LL_EVENT_RX_EOF) {
+		i2s_esp32_rx_callback((void *)arg, status);
+	}
+}
+
+#endif /* !SOC_GDMA_SUPPORTED */
+
 static int i2s_esp32_rx_start_transfer(const struct device *dev)
 {
-	struct i2s_esp32_data *const dev_data = dev->data;
 	const struct i2s_esp32_cfg *dev_cfg = dev->config;
-	struct i2s_esp32_stream *stream = &dev_data->rx;
-	const i2s_hal_context_t *hal_cxt = &dev_cfg->hal_cxt;
+	const struct i2s_esp32_stream *stream = &dev_cfg->rx;
+	const i2s_hal_context_t *hal = &dev_cfg->hal;
 	int err;
 
-	err = k_mem_slab_alloc(stream->i2s_cfg.mem_slab, &stream->mem_block, K_NO_WAIT);
+	err = k_mem_slab_alloc(stream->data->i2s_cfg.mem_slab, &stream->data->mem_block, K_NO_WAIT);
 	if (err < 0) {
 		return -ENOMEM;
 	}
-	stream->mem_block_len = stream->i2s_cfg.block_size;
-
-	i2s_hal_rx_stop(hal_cxt);
-	i2s_hal_rx_reset(hal_cxt);
-	i2s_hal_rx_reset_fifo(hal_cxt);
+	stream->data->mem_block_len = stream->data->i2s_cfg.block_size;
 
 	err = i2s_esp32_start_dma(dev, I2S_DIR_RX);
 	if (err < 0) {
@@ -254,213 +308,481 @@ static int i2s_esp32_rx_start_transfer(const struct device *dev)
 		return -EIO;
 	}
 
-	i2s_hal_rx_start(hal_cxt);
+	i2s_hal_rx_start(hal);
+
+#if !SOC_GDMA_SUPPORTED
+	esp_intr_enable(stream->data->irq_handle);
+#endif /* !SOC_GDMA_SUPPORTED */
 
 	return 0;
 }
 
-static int i2s_esp32_tx_start_transfer(const struct device *dev)
+static void i2s_esp32_rx_stop_transfer(const struct device *dev)
 {
 	const struct i2s_esp32_cfg *dev_cfg = dev->config;
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream = &dev_data->tx;
-	const i2s_hal_context_t *hal_cxt = &dev_cfg->hal_cxt;
+	const struct i2s_esp32_stream *stream = &dev_cfg->rx;
+
+#if SOC_GDMA_SUPPORTED
+	dma_stop(stream->conf->dma_dev, stream->conf->dma_channel);
+#else
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+
+	esp_intr_disable(stream->data->irq_handle);
+	i2s_hal_rx_stop_link(hal);
+	i2s_hal_rx_disable_intr(hal);
+	i2s_hal_rx_disable_dma(hal);
+	i2s_hal_clear_intr_status(hal, I2S_INTR_MAX);
+#endif /* SOC_GDMA_SUPPORTED */
+
+	if (stream->data->mem_block != NULL) {
+		k_mem_slab_free(stream->data->i2s_cfg.mem_slab, stream->data->mem_block);
+		stream->data->mem_block = NULL;
+		stream->data->mem_block_len = 0;
+	}
+}
+
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+
+#if I2S_ESP32_IS_DIR_EN(tx)
+
+#if SOC_GDMA_SUPPORTED
+static void i2s_esp32_tx_callback(const struct device *dma_dev, void *arg, uint32_t channel,
+				  int status)
+#else
+static void i2s_esp32_tx_callback(void *arg, int status)
+#endif /* SOC_GDMA_SUPPORTED */
+{
+	const struct device *dev = (const struct device *)arg;
+	const struct i2s_esp32_cfg *const dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream = &dev_cfg->tx;
 	struct queue_item item;
+	void *mem_block_tmp;
 	int err;
 
-	err = k_msgq_get(&stream->queue, &item, K_NO_WAIT);
+	if (!stream->data->dma_pending) {
+		return;
+	}
+
+	stream->data->dma_pending = false;
+
+#if SOC_GDMA_SUPPORTED
+	if (status < 0) {
+#else
+	if (status & I2S_LL_EVENT_TX_DSCR_ERR) {
+#endif /* SOC_GDMA_SUPPORTED */
+		stream->data->state = I2S_STATE_ERROR;
+		LOG_ERR("TX bad status: %d", status);
+		goto tx_disable;
+	}
+
+	if (stream->data->mem_block == NULL) {
+		if (stream->data->state != I2S_STATE_READY) {
+			stream->data->state = I2S_STATE_ERROR;
+			LOG_ERR("TX mem_block NULL");
+			goto tx_disable;
+		} else {
+			return;
+		}
+	}
+
+	if (stream->data->state == I2S_STATE_STOPPING) {
+		if (k_msgq_num_used_get(&stream->data->queue) == 0) {
+			stream->data->state = I2S_STATE_READY;
+			goto tx_disable;
+		} else if (stream->data->stop_without_draining == true) {
+			stream->conf->queue_drop(stream);
+			stream->data->state = I2S_STATE_READY;
+			goto tx_disable;
+		}
+	}
+
+	if (stream->data->last_block) {
+		stream->data->state = I2S_STATE_READY;
+		goto tx_disable;
+	}
+
+	err = k_msgq_get(&stream->data->queue, &item, K_NO_WAIT);
 	if (err < 0) {
-		return -ENOMEM;
+		stream->data->state = I2S_STATE_ERROR;
+		LOG_ERR("TX queue empty: %d", err);
+		goto tx_disable;
 	}
 
-	stream->mem_block = item.buffer;
-	stream->mem_block_len = item.size;
+	mem_block_tmp = stream->data->mem_block;
 
-	i2s_hal_tx_stop(hal_cxt);
-	i2s_hal_tx_reset(hal_cxt);
-	i2s_hal_tx_reset_fifo(hal_cxt);
+	stream->data->mem_block = item.buffer;
+	stream->data->mem_block_len = item.size;
 
-	err = i2s_esp32_start_dma(dev, I2S_DIR_TX);
+	err = i2s_esp32_restart_dma(dev, I2S_DIR_TX);
 	if (err < 0) {
-		LOG_ERR("Failed to start TX DMA transfer: %d", err);
-		return -EIO;
+		stream->data->state = I2S_STATE_ERROR;
+		LOG_ERR("Failed to restart TX transfer: %d", err);
+		goto tx_disable;
 	}
 
-	i2s_hal_tx_start(hal_cxt);
+	k_mem_slab_free(stream->data->i2s_cfg.mem_slab, mem_block_tmp);
 
-	return 0;
+	return;
+
+tx_disable:
+	stream->conf->stop_transfer(dev);
 }
 
-static void i2s_esp32_rx_stop_transfer(const struct device *dev)
+#if !SOC_GDMA_SUPPORTED
+
+static void IRAM_ATTR i2s_esp32_tx_handler(void *arg)
 {
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream = &dev_data->rx;
+	if (arg == NULL) {
+		return;
+	}
 
-	dma_stop(stream->dma_dev, stream->dma_channel);
+	struct device *dev = (struct device *)arg;
+	const struct i2s_esp32_cfg *const dev_cfg = dev->config;
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+	uint32_t status = i2s_hal_get_intr_status(hal);
 
-	if (stream->mem_block != NULL) {
-		k_mem_slab_free(stream->i2s_cfg.mem_slab, stream->mem_block);
-		stream->mem_block = NULL;
-		stream->mem_block_len = 0;
+	i2s_hal_clear_intr_status(hal, status);
+	if (status & I2S_LL_EVENT_TX_EOF) {
+		i2s_esp32_tx_callback((void *)arg, status);
 	}
 }
 
-static void i2s_esp32_tx_stop_transfer(const struct device *dev)
+#endif /* !SOC_GDMA_SUPPORTED */
+
+static int i2s_esp32_tx_start_transfer(const struct device *dev)
 {
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream = &dev_data->tx;
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream = &dev_cfg->tx;
+	const i2s_hal_context_t *hal = &dev_cfg->hal;
+	struct queue_item item;
+	int err;
+
+	err = k_msgq_get(&stream->data->queue, &item, K_NO_WAIT);
+	if (err < 0) {
+		return -ENOMEM;
+	}
 
-	dma_stop(stream->dma_dev, stream->dma_channel);
+	stream->data->mem_block = item.buffer;
+	stream->data->mem_block_len = item.size;
 
-	if (stream->mem_block != NULL) {
-		k_mem_slab_free(stream->i2s_cfg.mem_slab, stream->mem_block);
-		stream->mem_block = NULL;
-		stream->mem_block_len = 0;
+	err = i2s_esp32_start_dma(dev, I2S_DIR_TX);
+	if (err < 0) {
+		LOG_ERR("Failed to start TX DMA transfer: %d", err);
+		return -EIO;
 	}
+
+	i2s_hal_tx_start(hal);
+
+#if !SOC_GDMA_SUPPORTED
+	esp_intr_enable(stream->data->irq_handle);
+#endif /* !SOC_GDMA_SUPPORTED */
+
+	return 0;
 }
 
-static void i2s_esp32_rx_callback(const struct device *dma_dev, void *arg, uint32_t channel,
-				  int status)
+static void i2s_esp32_tx_stop_transfer(const struct device *dev)
 {
-	const struct device *dev = (const struct device *)arg;
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream = &dev_data->rx;
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream = &dev_cfg->tx;
+
+#if SOC_GDMA_SUPPORTED
+	dma_stop(stream->conf->dma_dev, stream->conf->dma_channel);
+#else
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+
+	esp_intr_disable(stream->data->irq_handle);
+	i2s_hal_tx_stop_link(hal);
+	i2s_hal_tx_disable_intr(hal);
+	i2s_hal_tx_disable_dma(hal);
+	i2s_hal_clear_intr_status(hal, I2S_INTR_MAX);
+#endif /* SOC_GDMA_SUPPORTED */
+
+	if (stream->data->mem_block != NULL) {
+		k_mem_slab_free(stream->data->i2s_cfg.mem_slab, stream->data->mem_block);
+		stream->data->mem_block = NULL;
+		stream->data->mem_block_len = 0;
+	}
+}
+
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+
+int i2s_esp32_config_dma(const struct device *dev, enum i2s_dir dir,
+			 const struct i2s_esp32_stream *stream)
+{
+	uint32_t mem_block = (uint32_t)stream->data->mem_block;
+	uint32_t mem_block_size = stream->data->mem_block_len;
+
+#if SOC_GDMA_SUPPORTED
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	struct dma_config dma_cfg = {0};
+	struct dma_block_config dma_blk = {0};
 	int err;
 
-	if (status < 0) {
-		stream->state = I2S_STATE_ERROR;
-		LOG_ERR("RX status bad: %d", status);
-		goto rx_disable;
+	dma_blk.block_size = mem_block_size;
+	if (dir == I2S_DIR_RX) {
+#if I2S_ESP32_IS_DIR_EN(rx)
+		dma_blk.dest_address = mem_block;
+		dma_cfg.channel_direction = PERIPHERAL_TO_MEMORY;
+		dma_cfg.dma_callback = i2s_esp32_rx_callback;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+	} else {
+#if I2S_ESP32_IS_DIR_EN(tx)
+		dma_blk.source_address = mem_block;
+		dma_cfg.channel_direction = MEMORY_TO_PERIPHERAL;
+		dma_cfg.dma_callback = i2s_esp32_tx_callback;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
 	}
+	dma_cfg.user_data = (void *)dev;
+	dma_cfg.dma_slot =
+		dev_cfg->unit == 0 ? ESP_GDMA_TRIG_PERIPH_I2S0 : ESP_GDMA_TRIG_PERIPH_I2S1;
+	dma_cfg.block_count = 1;
+	dma_cfg.head_block = &dma_blk;
 
-	if (stream->mem_block == NULL) {
-		if (stream->state != I2S_STATE_READY) {
-			stream->state = I2S_STATE_ERROR;
-			LOG_ERR("RX mem_block NULL");
-			goto rx_disable;
+	err = dma_config(stream->conf->dma_dev, stream->conf->dma_channel, &dma_cfg);
+	if (err < 0) {
+		LOG_ERR("Failed to configure DMA channel: %"PRIu32, stream->conf->dma_channel);
+		return -EINVAL;
+	}
+#else
+	lldesc_t *desc_iter = stream->conf->dma_desc;
+
+	if (!mem_block) {
+		LOG_ERR("At least one dma block is required");
+		return -EINVAL;
+	}
+
+	if (!esp_ptr_dma_capable((void *)mem_block)) {
+		LOG_ERR("Buffer is not in DMA capable memory: %p",
+			(uint32_t *)mem_block);
+
+		return -EINVAL;
+	}
+
+	for (int i = 0; i < CONFIG_I2S_ESP32_DMA_DESC_NUM_MAX; ++i) {
+		uint32_t buffer_size;
+
+		if (mem_block_size > I2S_ESP32_DMA_BUFFER_MAX_SIZE) {
+			buffer_size = I2S_ESP32_DMA_BUFFER_MAX_SIZE;
 		} else {
-			return;
+			buffer_size = mem_block_size;
 		}
-	}
 
-	struct queue_item item = {.buffer = stream->mem_block, .size = stream->mem_block_len};
+		memset(desc_iter, 0, sizeof(lldesc_t));
+		desc_iter->owner = 1;
+		desc_iter->sosf = 0;
+		desc_iter->buf = (uint8_t *)mem_block;
+		desc_iter->offset = 0;
+		desc_iter->length = buffer_size;
+		desc_iter->size = buffer_size;
+		desc_iter->eof = 0;
+
+		mem_block += buffer_size;
+		mem_block_size -= buffer_size;
+
+		if (mem_block_size > 0) {
+			desc_iter->empty = (uint32_t)(desc_iter + 1);
+			desc_iter += 1;
+		} else {
+			stream->data->dma_pending = true;
+			desc_iter->empty = 0;
+			if (dir == I2S_DIR_TX) {
+				desc_iter->eof = 1;
+			}
+			break;
+		}
+	}
 
-	err = k_msgq_put(&stream->queue, &item, K_NO_WAIT);
-	if (err < 0) {
-		stream->state = I2S_STATE_ERROR;
-		goto rx_disable;
+	if (desc_iter->empty)  {
+		stream->data->dma_pending = false;
+		LOG_ERR("Run out of descriptors. Increase CONFIG_I2S_ESP32_DMA_DESC_NUM_MAX");
+		return -EINVAL;
 	}
+#endif /* SOC_GDMA_SUPPORTED */
 
-	if (stream->state == I2S_STATE_STOPPING) {
-		stream->state = I2S_STATE_READY;
-		goto rx_disable;
+	return 0;
+}
+
+static int i2s_esp32_start_dma(const struct device *dev, enum i2s_dir dir)
+{
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream = NULL;
+	unsigned int key;
+	int err = 0;
+
+#if !SOC_GDMA_SUPPORTED || I2S_ESP32_IS_DIR_EN(rx)
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+#endif /* SOC_GDMA_SUPPORTED || I2S_ESP32_IS_DIR_EN(rx) */
+
+	if (dir == I2S_DIR_RX) {
+		stream = &dev_cfg->rx;
+	} else if (dir == I2S_DIR_TX) {
+		stream = &dev_cfg->tx;
+	} else {
+		LOG_ERR("Invalid DMA direction");
+		return -EINVAL;
 	}
 
-	err = k_mem_slab_alloc(stream->i2s_cfg.mem_slab, &stream->mem_block, K_NO_WAIT);
+	key = irq_lock();
+
+	err = i2s_esp32_config_dma(dev, dir, stream);
 	if (err < 0) {
-		stream->state = I2S_STATE_ERROR;
-		goto rx_disable;
+		LOG_ERR("Dma configuration failed: %i", err);
+		goto unlock;
 	}
-	stream->mem_block_len = stream->i2s_cfg.block_size;
 
-	err = i2s_esp32_restart_dma(dev, I2S_DIR_RX);
+#if I2S_ESP32_IS_DIR_EN(rx)
+	if (dir == I2S_DIR_RX) {
+		uint16_t chunk_len;
+
+#if SOC_GDMA_SUPPORTED
+		if (stream->data->mem_block_len < I2S_ESP32_DMA_BUFFER_MAX_SIZE) {
+			chunk_len = stream->data->mem_block_len;
+			stream->data->chunks_rem = 0;
+		} else {
+			chunk_len = I2S_ESP32_DMA_BUFFER_MAX_SIZE;
+			stream->data->chunks_rem = ((stream->data->mem_block_len +
+						     (I2S_ESP32_DMA_BUFFER_MAX_SIZE - 1)) /
+						    I2S_ESP32_DMA_BUFFER_MAX_SIZE) - 1;
+		}
+		stream->data->chunk_idx = 0;
+#else
+		chunk_len = stream->data->mem_block_len;
+#endif
+		i2s_ll_rx_set_eof_num(hal->dev, chunk_len);
+	}
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+
+#if SOC_GDMA_SUPPORTED
+	err = dma_start(stream->conf->dma_dev, stream->conf->dma_channel);
 	if (err < 0) {
-		stream->state = I2S_STATE_ERROR;
-		LOG_ERR("Failed to restart RX transfer: %d", err);
-		goto rx_disable;
+		LOG_ERR("Failed to start DMA channel: %"PRIu32, stream->conf->dma_channel);
+		goto unlock;
 	}
+	stream->data->dma_pending = true;
+#else
+#if I2S_ESP32_IS_DIR_EN(rx)
+	if (dir == I2S_DIR_RX) {
+		i2s_hal_rx_enable_dma(hal);
+		i2s_hal_rx_enable_intr(hal);
+		i2s_hal_rx_start_link(hal, (uint32_t)&(stream->conf->dma_desc[0]));
+	}
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
 
-	return;
+#if I2S_ESP32_IS_DIR_EN(tx)
+	if (dir == I2S_DIR_TX) {
+		i2s_hal_tx_enable_dma(hal);
+		i2s_hal_tx_enable_intr(hal);
+		i2s_hal_tx_start_link(hal, (uint32_t)&(stream->conf->dma_desc[0]));
+	}
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+#endif /* SOC_GDMA_SUPPORTED */
 
-rx_disable:
-	stream->stop_transfer(dev);
+unlock:
+	irq_unlock(key);
+	return err;
 }
 
-static void i2s_esp32_tx_callback(const struct device *dma_dev, void *arg, uint32_t channel,
-				  int status)
+static int i2s_esp32_restart_dma(const struct device *dev, enum i2s_dir dir)
 {
-	const struct device *dev = (const struct device *)arg;
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream = &dev_data->tx;
-	struct queue_item item;
-	void *mem_block_tmp;
-	int err;
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream;
+	int err = 0;
 
-	if (status < 0) {
-		stream->state = I2S_STATE_ERROR;
-		LOG_ERR("TX bad status: %d", status);
-		goto tx_disable;
-	}
+#if !SOC_GDMA_SUPPORTED || I2S_ESP32_IS_DIR_EN(rx)
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+#endif /* SOC_GDMA_SUPPORTED || I2S_ESP32_IS_DIR_EN(rx) */
 
-	if (stream->mem_block == NULL) {
-		if (stream->state != I2S_STATE_READY) {
-			stream->state = I2S_STATE_ERROR;
-			LOG_ERR("TX mem_block NULL");
-			goto tx_disable;
-		} else {
-			return;
-		}
+	if (dir == I2S_DIR_RX) {
+		stream = &dev_cfg->rx;
+	} else if (dir == I2S_DIR_TX) {
+		stream = &dev_cfg->tx;
+	} else {
+		LOG_ERR("Invalid DMA direction");
+		return -EINVAL;
 	}
 
-	if (stream->state == I2S_STATE_STOPPING) {
-		if (k_msgq_num_used_get(&stream->queue) == 0) {
-			stream->state = I2S_STATE_READY;
-			goto tx_disable;
-		} else if (stream->stop_without_draining == true) {
-			stream->queue_drop(stream);
-			stream->state = I2S_STATE_READY;
-			goto tx_disable;
+#if SOC_GDMA_SUPPORTED
+	uint16_t chunk_len;
+	void *src = NULL, *dst = NULL;
+
+#if I2S_ESP32_IS_DIR_EN(rx)
+	if (dir == I2S_DIR_RX) {
+		dst = stream->data->mem_block;
+
+		if (stream->data->mem_block_len < I2S_ESP32_DMA_BUFFER_MAX_SIZE) {
+			chunk_len = stream->data->mem_block_len;
+			stream->data->chunks_rem = 0;
+		} else {
+			chunk_len = I2S_ESP32_DMA_BUFFER_MAX_SIZE;
+			stream->data->chunks_rem = ((stream->data->mem_block_len +
+						     (I2S_ESP32_DMA_BUFFER_MAX_SIZE - 1)) /
+						    I2S_ESP32_DMA_BUFFER_MAX_SIZE) - 1;
 		}
-		/*else: DRAIN trigger, so continue until queue is empty*/
+		stream->data->chunk_idx = 0;
 	}
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
 
-	if (stream->last_block) {
-		stream->state = I2S_STATE_READY;
-		goto tx_disable;
+#if I2S_ESP32_IS_DIR_EN(tx)
+	if (dir == I2S_DIR_TX) {
+		src = stream->data->mem_block;
+		chunk_len = stream->data->mem_block_len;
 	}
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
 
-	err = k_msgq_get(&stream->queue, &item, K_NO_WAIT);
+	err = dma_reload(stream->conf->dma_dev, stream->conf->dma_channel, (uint32_t)src,
+			(uint32_t)dst, chunk_len);
 	if (err < 0) {
-		stream->state = I2S_STATE_ERROR;
-		goto tx_disable;
+		LOG_ERR("Failed to reload DMA channel: %"PRIu32, stream->conf->dma_channel);
+		return -EIO;
 	}
 
-	mem_block_tmp = stream->mem_block;
-
-	stream->mem_block = item.buffer;
-	stream->mem_block_len = item.size;
+#if I2S_ESP32_IS_DIR_EN(rx)
+	if (dir == I2S_DIR_RX) {
+		i2s_ll_rx_set_eof_num(hal->dev, chunk_len);
+	}
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
 
-	err = i2s_esp32_restart_dma(dev, I2S_DIR_TX);
+	err = dma_start(stream->conf->dma_dev, stream->conf->dma_channel);
 	if (err < 0) {
-		stream->state = I2S_STATE_ERROR;
-		LOG_ERR("Failed to restart TX transfer: %d", err);
-		goto tx_disable;
+		LOG_ERR("Failed to start DMA channel: %"PRIu32, stream->conf->dma_channel);
+		return -EIO;
+	}
+#else
+	err = i2s_esp32_config_dma(dev, dir, stream);
+	if (err < 0) {
+		LOG_ERR("Failed to configure DMA");
+		return -EIO;
 	}
 
-	k_mem_slab_free(stream->i2s_cfg.mem_slab, mem_block_tmp);
+#if I2S_ESP32_IS_DIR_EN(rx)
+	if (dir == I2S_DIR_RX) {
+		i2s_ll_rx_set_eof_num(hal->dev, stream->data->mem_block_len);
+		i2s_hal_rx_start_link(hal, (uint32_t)stream->conf->dma_desc);
+	}
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
 
-	return;
+#if I2S_ESP32_IS_DIR_EN(tx)
+	if (dir == I2S_DIR_TX) {
+		i2s_hal_tx_start_link(hal, (uint32_t)stream->conf->dma_desc);
+	}
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+#endif /* SOC_GDMA_SUPPORTED */
 
-tx_disable:
-	stream->stop_transfer(dev);
+	stream->data->dma_pending = true;
+
+	return 0;
 }
 
 static int i2s_esp32_initialize(const struct device *dev)
 {
 	const struct i2s_esp32_cfg *dev_cfg = dev->config;
-	struct i2s_esp32_data *const dev_data = dev->data;
 	const struct device *clk_dev = dev_cfg->clock_dev;
+	const struct i2s_esp32_stream *stream;
 	int err;
 
-	if (dev_data->tx.dma_dev && !device_is_ready(dev_data->tx.dma_dev)) {
-		LOG_ERR("%s device not ready", dev_data->tx.dma_dev->name);
-		return -ENODEV;
-	}
-
-	if (dev_data->rx.dma_dev && !device_is_ready(dev_data->rx.dma_dev)) {
-		LOG_ERR("%s device not ready", dev_data->rx.dma_dev->name);
-		return -ENODEV;
-	}
+#if !SOC_GDMA_SUPPORTED
+	const i2s_hal_context_t *hal = &(dev_cfg->hal);
+#endif /* !SOC_GDMA_SUPPORTED */
 
 	if (!device_is_ready(clk_dev)) {
 		LOG_ERR("clock control device not ready");
@@ -473,70 +795,133 @@ static int i2s_esp32_initialize(const struct device *dev)
 		return -EIO;
 	}
 
-	if (dev_data->tx.dma_dev) {
-		err = k_msgq_alloc_init(&dev_data->tx.queue, sizeof(struct queue_item),
-					CONFIG_I2S_ESP32_TX_BLOCK_COUNT);
+#if I2S_ESP32_IS_DIR_EN(rx)
+	if (dev_cfg->rx.data && dev_cfg->rx.conf) {
+		stream = &dev_cfg->rx;
+#if SOC_GDMA_SUPPORTED
+		if (stream->conf->dma_dev && !device_is_ready(stream->conf->dma_dev)) {
+			LOG_ERR("%s device not ready", stream->conf->dma_dev->name);
+			return -ENODEV;
+		}
+#else
+		int irq_flags = ESP_PRIO_TO_FLAGS(stream->conf->irq_priority) |
+				ESP_INT_FLAGS_CHECK(stream->conf->irq_flags) |
+				ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_INTRDISABLED |
+				ESP_INTR_FLAG_SHARED;
+
+		err = esp_intr_alloc_intrstatus(stream->conf->irq_source, irq_flags,
+						(uint32_t)i2s_ll_get_intr_status_reg(hal->dev),
+						I2S_LL_RX_EVENT_MASK, i2s_esp32_rx_handler,
+						(void *)dev, &(stream->data->irq_handle));
+		if (err != 0) {
+			LOG_ERR("Could not allocate rx interrupt (err %d)", err);
+			return err;
+		}
+#endif /* SOC_GDMA_SUPPORTED */
+
+		err = k_msgq_alloc_init(&stream->data->queue, sizeof(struct queue_item),
+					CONFIG_I2S_ESP32_RX_BLOCK_COUNT);
 		if (err < 0) {
 			return err;
 		}
 	}
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+
+#if I2S_ESP32_IS_DIR_EN(tx)
+	if (dev_cfg->tx.data && dev_cfg->tx.conf) {
+		stream = &dev_cfg->tx;
+#if SOC_GDMA_SUPPORTED
+		if (stream->conf->dma_dev && !device_is_ready(stream->conf->dma_dev)) {
+			LOG_ERR("%s device not ready", stream->conf->dma_dev->name);
+			return -ENODEV;
+		}
+#else
+		int irq_flags = ESP_PRIO_TO_FLAGS(stream->conf->irq_priority) |
+				ESP_INT_FLAGS_CHECK(stream->conf->irq_flags) |
+				ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_INTRDISABLED |
+				ESP_INTR_FLAG_SHARED;
+
+		err = esp_intr_alloc_intrstatus(stream->conf->irq_source, irq_flags,
+						(uint32_t)i2s_ll_get_intr_status_reg(hal->dev),
+						I2S_LL_TX_EVENT_MASK, i2s_esp32_tx_handler,
+						(void *)dev, &(stream->data->irq_handle));
+		if (err != 0) {
+			LOG_ERR("Could not allocate tx interrupt (err %d)", err);
+			return err;
+		}
+#endif /* SOC_GDMA_SUPPORTED */
 
-	if (dev_data->rx.dma_dev) {
-		err = k_msgq_alloc_init(&dev_data->rx.queue, sizeof(struct queue_item),
-					CONFIG_I2S_ESP32_RX_BLOCK_COUNT);
+		err = k_msgq_alloc_init(&stream->data->queue, sizeof(struct queue_item),
+					CONFIG_I2S_ESP32_TX_BLOCK_COUNT);
 		if (err < 0) {
 			return err;
 		}
 	}
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
 
-	i2s_ll_enable_clock(dev_cfg->hal_cxt.dev);
+#if !SOC_GDMA_SUPPORTED
+	i2s_ll_clear_intr_status(hal->dev, I2S_INTR_MAX);
+#endif /* !SOC_GDMA_SUPPORTED */
 
-	LOG_INF("%s initialized", dev->name);
+	LOG_DBG("%s initialized", dev->name);
 
 	return 0;
 }
 
-static int i2s_esp32_configure(const struct device *dev, enum i2s_dir dir,
-			       const struct i2s_config *i2s_cfg)
+static int i2s_esp32_configure_dir(const struct device *dev, enum i2s_dir dir,
+				   const struct i2s_esp32_stream *stream,
+				   const struct i2s_config *i2s_cfg)
 {
-	const struct i2s_esp32_cfg *const dev_cfg = dev->config;
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream;
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
 	uint8_t data_format;
+	int err;
 
 	switch (dir) {
+#if I2S_ESP32_IS_DIR_EN(rx)
 	case I2S_DIR_RX:
-		stream = &dev_data->rx;
-		if (stream->dma_dev == NULL) {
-			LOG_ERR("RX DMA controller not available");
-			return -EINVAL;
+		if (stream->conf) {
+#if SOC_GDMA_SUPPORTED
+			if (stream->conf->dma_dev == NULL) {
+				LOG_ERR("RX DMA controller not available");
+#else
+			if (stream->conf->irq_source == -1) {
+				LOG_ERR("RX IRQ source not available");
+#endif /* SOC_GDMA_SUPPORTED */
+				return -EINVAL;
+			}
 		}
 		break;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+#if I2S_ESP32_IS_DIR_EN(tx)
 	case I2S_DIR_TX:
-		stream = &dev_data->tx;
-		if (stream->dma_dev == NULL) {
-			LOG_ERR("TX DMA controller not available");
-			return -EINVAL;
+		if (stream->conf) {
+#if SOC_GDMA_SUPPORTED
+			if (stream->conf->dma_dev == NULL) {
+				LOG_ERR("TX DMA controller not available");
+#else
+			if (stream->conf->irq_source == -1) {
+				LOG_ERR("TX IRQ source not available");
+#endif /* SOC_GDMA_SUPPORTED */
+				return -EINVAL;
+			}
 		}
 		break;
-	case I2S_DIR_BOTH:
-		LOG_ERR("I2S_DIR_BOTH is not supported");
-		return -ENOSYS;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
 	default:
 		LOG_ERR("Invalid direction");
 		return -EINVAL;
 	}
 
-	if (stream->state != I2S_STATE_NOT_READY && stream->state != I2S_STATE_READY) {
-		LOG_ERR("Invalid state: %d", (int)stream->state);
+	if (stream->data->state != I2S_STATE_NOT_READY && stream->data->state != I2S_STATE_READY) {
+		LOG_ERR("Invalid state: %d", (int)stream->data->state);
 		return -EINVAL;
 	}
 
 	if (i2s_cfg->frame_clk_freq == 0U) {
-		stream->queue_drop(stream);
-		memset(&stream->i2s_cfg, 0, sizeof(struct i2s_config));
-		stream->is_slave = false;
-		stream->state = I2S_STATE_NOT_READY;
+		stream->conf->queue_drop(stream);
+		memset(&stream->data->i2s_cfg, 0, sizeof(struct i2s_config));
+		stream->data->is_slave = false;
+		stream->data->state = I2S_STATE_NOT_READY;
 		return 0;
 	}
 
@@ -572,10 +957,10 @@ static int i2s_esp32_configure(const struct device *dev, enum i2s_dir dir,
 
 	if ((i2s_cfg->options & I2S_OPT_FRAME_CLK_SLAVE) != 0 &&
 	    (i2s_cfg->options & I2S_OPT_BIT_CLK_SLAVE) != 0) {
-		stream->is_slave = true;
+		stream->data->is_slave = true;
 	} else if ((i2s_cfg->options & I2S_OPT_FRAME_CLK_SLAVE) == 0 &&
 		   (i2s_cfg->options & I2S_OPT_BIT_CLK_SLAVE) == 0) {
-		stream->is_slave = false;
+		stream->data->is_slave = false;
 	} else {
 		LOG_ERR("I2S_OPT_FRAME_CLK and I2S_OPT_BIT_CLK options must both be"
 			" MASTER or SLAVE");
@@ -590,26 +975,33 @@ static int i2s_esp32_configure(const struct device *dev, enum i2s_dir dir,
 	if (data_format == I2S_FMT_DATA_FORMAT_I2S) {
 		slot_cfg.std.ws_pol = i2s_cfg->format & I2S_FMT_FRAME_CLK_INV ? true : false;
 		slot_cfg.std.bit_shift = true;
+#if SOC_I2S_HW_VERSION_2
 		slot_cfg.std.left_align = true;
+#endif /* SOC_I2S_HW_VERSION_2 */
 	} else {
 		slot_cfg.std.ws_pol = i2s_cfg->format & I2S_FMT_FRAME_CLK_INV ? false : true;
 		slot_cfg.std.bit_shift = false;
 		if (data_format == I2S_FMT_DATA_FORMAT_LEFT_JUSTIFIED) {
+#if SOC_I2S_HW_VERSION_2
 			slot_cfg.std.left_align = true;
 		} else if (data_format == I2S_FMT_DATA_FORMAT_RIGHT_JUSTIFIED) {
 			slot_cfg.std.left_align = false;
+#endif /* SOC_I2S_HW_VERSION_2 */
 		} else {
-			LOG_ERR("Invalid data format: %u", (unsigned int)data_format);
+			LOG_ERR("Unsupported data format: %u", (unsigned int)data_format);
 		}
 	}
 	slot_cfg.std.ws_width = slot_cfg.slot_bit_width;
 	slot_cfg.std.slot_mask = I2S_STD_SLOT_BOTH;
+#if SOC_I2S_HW_VERSION_1
+	slot_cfg.std.msb_right = true;
+#elif SOC_I2S_HW_VERSION_2
 	slot_cfg.std.big_endian = false;
 	slot_cfg.std.bit_order_lsb = i2s_cfg->format & I2S_FMT_DATA_ORDER_LSB ? true : false;
+#endif /* SOC_I2S_HW_VERSION_1 */
 
-	int err;
 	i2s_hal_clock_info_t i2s_hal_clock_info;
-	i2s_hal_context_t *hal_cxt = (i2s_hal_context_t *)&dev_cfg->hal_cxt;
+	i2s_hal_context_t *hal = (i2s_hal_context_t *)&(dev_cfg->hal);
 
 	err = i2s_esp32_calculate_clock(i2s_cfg, slot_cfg.slot_bit_width, &i2s_hal_clock_info);
 	if (err != ESP_OK) {
@@ -617,149 +1009,239 @@ static int i2s_esp32_configure(const struct device *dev, enum i2s_dir dir,
 	}
 
 	if (dir == I2S_DIR_TX) {
-		if (dev_data->rx.state != I2S_STATE_NOT_READY) {
-			if (stream->is_slave && !dev_data->rx.is_slave) { /*full duplex*/
-				i2s_ll_share_bck_ws(hal_cxt->dev, true);
+#if I2S_ESP32_IS_DIR_EN(tx)
+		i2s_hal_std_enable_tx_channel(hal);
+		if (dev_cfg->rx.data != NULL && dev_cfg->rx.data->state != I2S_STATE_NOT_READY) {
+			if (stream->data->is_slave && !dev_cfg->rx.data->is_slave) { /*full duplex*/
+				i2s_ll_share_bck_ws(hal->dev, true);
 			} else {
-				i2s_ll_share_bck_ws(hal_cxt->dev, false);
+				i2s_ll_share_bck_ws(hal->dev, false);
 			}
 		} else {
-			i2s_ll_share_bck_ws(hal_cxt->dev, false);
+			i2s_ll_share_bck_ws(hal->dev, false);
 		}
 
-		i2s_hal_std_set_tx_slot(hal_cxt, stream->is_slave, &slot_cfg);
+		i2s_hal_std_set_tx_slot(hal, stream->data->is_slave, &slot_cfg);
+		i2s_hal_set_tx_clock(hal, &i2s_hal_clock_info, I2S_ESP32_CLK_SRC);
 
-		i2s_hal_set_tx_clock(hal_cxt, &i2s_hal_clock_info, I2S_ESP32_CLK_SRC);
-
-		err = pinctrl_apply_state(dev_cfg->pcfg, PINCTRL_STATE_DEFAULT);
-		if (err < 0) {
-			LOG_ERR("Pins setup failed: %d", err);
-			return -EIO;
-		}
-
-		if (dev_data->tx.state != I2S_STATE_NOT_READY) {
-			if (stream->is_slave && dev_data->rx.is_slave) {
-				i2s_ll_mclk_bind_to_tx_clk(hal_cxt->dev);
+#if SOC_I2S_HW_VERSION_2
+		if (dev_cfg->rx.data != NULL && dev_cfg->rx.data->state != I2S_STATE_NOT_READY) {
+			if (stream->data->is_slave && !dev_cfg->rx.data->is_slave) { /*full duplex*/
+				i2s_ll_mclk_bind_to_rx_clk(hal->dev);
 			}
 		}
-
-		i2s_hal_std_enable_tx_channel(hal_cxt);
+#endif /* SOC_I2S_HW_VERSION_2 */
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
 	} else if (dir == I2S_DIR_RX) {
-		if (dev_data->tx.state != I2S_STATE_NOT_READY) {
-			if (stream->is_slave && !dev_data->tx.is_slave) { /*full duplex*/
-				i2s_ll_share_bck_ws(hal_cxt->dev, true);
+#if I2S_ESP32_IS_DIR_EN(rx)
+		i2s_hal_std_enable_rx_channel(hal);
+		if (dev_cfg->tx.data != NULL && dev_cfg->tx.data->state != I2S_STATE_NOT_READY) {
+			if (stream->data->is_slave && !dev_cfg->tx.data->is_slave) { /*full duplex*/
+				i2s_ll_share_bck_ws(hal->dev, true);
 			} else {
-				i2s_ll_share_bck_ws(hal_cxt->dev, false);
+				i2s_ll_share_bck_ws(hal->dev, false);
 			}
 		} else {
-			i2s_ll_share_bck_ws(hal_cxt->dev, false);
+			i2s_ll_share_bck_ws(hal->dev, false);
 		}
 
-		i2s_hal_std_set_rx_slot(hal_cxt, stream->is_slave, &slot_cfg);
+		i2s_hal_std_set_rx_slot(hal, stream->data->is_slave, &slot_cfg);
+		i2s_hal_set_rx_clock(hal, &i2s_hal_clock_info, I2S_ESP32_CLK_SRC);
 
-		i2s_hal_set_rx_clock(hal_cxt, &i2s_hal_clock_info, I2S_ESP32_CLK_SRC);
-
-		err = pinctrl_apply_state(dev_cfg->pcfg, PINCTRL_STATE_DEFAULT);
-		if (err < 0) {
-			LOG_ERR("Pins setup failed: %d", err);
-			return -EIO;
-		}
-
-		if (dev_data->tx.state != I2S_STATE_NOT_READY) {
-			if (!stream->is_slave && !dev_data->tx.is_slave) {
-				i2s_ll_mclk_bind_to_rx_clk(hal_cxt->dev);
+#if SOC_I2S_HW_VERSION_2
+		if (dev_cfg->tx.data != NULL && dev_cfg->tx.data->state != I2S_STATE_NOT_READY) {
+			if (stream->data->is_slave && !dev_cfg->tx.data->is_slave) { /*full duplex*/
+				i2s_ll_mclk_bind_to_tx_clk(hal->dev);
 			}
 		}
+#endif /* SOC_I2S_HW_VERSION_2 */
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+	}
 
-		i2s_hal_std_enable_rx_channel(hal_cxt);
+	err = pinctrl_apply_state(dev_cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (err < 0) {
+		LOG_ERR("Pins setup failed: %d", err);
+		return -EIO;
 	}
-	memcpy(&stream->i2s_cfg, i2s_cfg, sizeof(struct i2s_config));
 
-	stream->state = I2S_STATE_READY;
+	memcpy(&stream->data->i2s_cfg, i2s_cfg, sizeof(struct i2s_config));
+
+	stream->data->state = I2S_STATE_READY;
 
 	return 0;
 }
 
+static int i2s_esp32_configure(const struct device *dev, enum i2s_dir dir,
+			       const struct i2s_config *i2s_cfg)
+{
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream;
+	int err;
+
+	switch (dir) {
+	case I2S_DIR_RX:
+#if I2S_ESP32_IS_DIR_EN(rx)
+		stream = &dev_cfg->rx;
+		if (stream) {
+			err = i2s_esp32_configure_dir(dev, I2S_DIR_RX, stream, i2s_cfg);
+		} else {
+			LOG_ERR("I2S_DIR_RX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_RX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+		break;
+	case I2S_DIR_TX:
+#if I2S_ESP32_IS_DIR_EN(tx)
+		stream = &dev_cfg->tx;
+		if (stream) {
+			err = i2s_esp32_configure_dir(dev, I2S_DIR_TX, stream, i2s_cfg);
+		} else {
+			LOG_ERR("I2S_DIR_TX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_TX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+		break;
+	case I2S_DIR_BOTH:
+#if I2S_ESP32_IS_DIR_EN(tx)
+		stream = &dev_cfg->tx;
+		if (stream) {
+			err = i2s_esp32_configure_dir(dev, I2S_DIR_TX, stream, i2s_cfg);
+		} else {
+			LOG_ERR("I2S_DIR_TX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_TX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+		if (err < 0) {
+			break;
+		}
+#if I2S_ESP32_IS_DIR_EN(rx)
+		stream = &dev_cfg->rx;
+		if (stream) {
+			err = i2s_esp32_configure_dir(dev, I2S_DIR_RX, stream, i2s_cfg);
+		} else {
+			LOG_ERR("I2S_DIR_RX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_RX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+		break;
+	default:
+		LOG_ERR("Invalid direction: %d", (int)dir);
+		return -EINVAL;
+	}
+
+	return err;
+}
+
 static const struct i2s_config *i2s_esp32_config_get(const struct device *dev, enum i2s_dir dir)
 {
-	struct i2s_esp32_data *dev_data = dev->data;
-	struct i2s_esp32_stream *stream;
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream;
 
 	if (dir == I2S_DIR_RX) {
-		stream = &dev_data->rx;
+#if I2S_ESP32_IS_DIR_EN(rx)
+		stream = &dev_cfg->rx;
+		if (!stream) {
+			LOG_ERR("I2S_DIR_RX not enabled");
+			return NULL;
+		}
+#else
+		LOG_ERR("I2S_DIR_RX not enabled");
+		return NULL;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+	} else if (dir == I2S_DIR_TX) {
+#if I2S_ESP32_IS_DIR_EN(tx)
+		stream = &dev_cfg->tx;
+		if (!stream) {
+			LOG_ERR("I2S_DIR_TX not enabled");
+			return NULL;
+		}
+#else
+		LOG_ERR("I2S_DIR_TX not enabled");
+		return NULL;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
 	} else {
-		stream = &dev_data->tx;
+		LOG_ERR("Invalid direction: %d", (int)dir);
+		return NULL;
 	}
 
-	if (stream->state == I2S_STATE_NOT_READY) {
+	if (stream->data->state == I2S_STATE_NOT_READY) {
 		return NULL;
 	}
 
-	return &stream->i2s_cfg;
+	return &stream->data->i2s_cfg;
 }
 
-static int i2s_esp32_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd)
+static int i2s_esp32_trigger_stream(const struct device *dev, const struct i2s_esp32_stream *stream,
+				    enum i2s_dir dir, enum i2s_trigger_cmd cmd)
 {
-	struct i2s_esp32_data *const dev_data = dev->data;
-	struct i2s_esp32_stream *stream;
-	struct dma_status dma_channel_status;
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const i2s_hal_context_t *hal = &dev_cfg->hal;
 	unsigned int key;
 	int err;
 
-	switch (dir) {
-	case I2S_DIR_RX:
-		stream = &dev_data->rx;
-		break;
-	case I2S_DIR_TX:
-		stream = &dev_data->tx;
-		break;
-	case I2S_DIR_BOTH:
-		LOG_ERR("Unsupported direction: %d", (int)dir);
-		return -ENOSYS;
-	default:
-		LOG_ERR("Invalid direction: %d", (int)dir);
-		return -EINVAL;
-	}
-
 	switch (cmd) {
 	case I2S_TRIGGER_START:
-		if (stream->state != I2S_STATE_READY) {
-			LOG_ERR("START - Invalid state: %d", (int)stream->state);
+		if (stream->data->state != I2S_STATE_READY) {
+			LOG_ERR("START - Invalid state: %d", (int)stream->data->state);
 			return -EIO;
 		}
 
-		err = stream->start_transfer(dev);
+		key = irq_lock();
+
+		if (dir == I2S_DIR_RX) {
+			i2s_hal_rx_stop(hal);
+			i2s_hal_rx_reset(hal);
+#if !SOC_GDMA_SUPPORTED
+			i2s_hal_rx_reset_dma(hal);
+#endif /* !SOC_GDMA_SUPPORTED */
+			i2s_hal_rx_reset_fifo(hal);
+		} else if (dir == I2S_DIR_TX) {
+			i2s_hal_tx_stop(hal);
+			i2s_hal_tx_reset(hal);
+#if !SOC_GDMA_SUPPORTED
+			i2s_hal_tx_reset_dma(hal);
+#endif /* !SOC_GDMA_SUPPORTED */
+			i2s_hal_tx_reset_fifo(hal);
+		}
+
+		err = stream->conf->start_transfer(dev);
 		if (err < 0) {
 			LOG_ERR("START - Transfer start failed: %d", err);
+			irq_unlock(key);
 			return -EIO;
 		}
-		stream->last_block = false;
-		stream->state = I2S_STATE_RUNNING;
+		stream->data->last_block = false;
+		stream->data->state = I2S_STATE_RUNNING;
+		irq_unlock(key);
 		break;
 
 	case I2S_TRIGGER_STOP:
 		key = irq_lock();
-		if (stream->state != I2S_STATE_RUNNING) {
-			irq_unlock(key);
-			LOG_ERR("STOP - Invalid state: %d", (int)stream->state);
-			return -EIO;
-		}
-
-		err = dma_get_status(stream->dma_dev, stream->dma_channel, &dma_channel_status);
-		if (err < 0) {
+		if (stream->data->state != I2S_STATE_RUNNING) {
 			irq_unlock(key);
-			LOG_ERR("Unable to get DMA channel[%d] status: %d",
-				(int)stream->dma_channel, err);
+			LOG_ERR("STOP - Invalid state: %d", (int)stream->data->state);
 			return -EIO;
 		}
 
-		if (dma_channel_status.busy) {
-			stream->stop_without_draining = true;
-			stream->state = I2S_STATE_STOPPING;
+		if (stream->data->dma_pending) {
+			stream->data->stop_without_draining = true;
+			stream->data->state = I2S_STATE_STOPPING;
 		} else {
-			stream->stop_transfer(dev);
-			stream->last_block = true;
-			stream->state = I2S_STATE_READY;
+			stream->conf->stop_transfer(dev);
+			stream->data->last_block = true;
+			stream->data->state = I2S_STATE_READY;
 		}
 
 		irq_unlock(key);
@@ -767,63 +1249,58 @@ static int i2s_esp32_trigger(const struct device *dev, enum i2s_dir dir, enum i2
 
 	case I2S_TRIGGER_DRAIN:
 		key = irq_lock();
-		if (stream->state != I2S_STATE_RUNNING) {
+		if (stream->data->state != I2S_STATE_RUNNING) {
 			irq_unlock(key);
-			LOG_ERR("DRAIN - Invalid state: %d", (int)stream->state);
-			return -EIO;
-		}
-
-		err = dma_get_status(stream->dma_dev, stream->dma_channel, &dma_channel_status);
-		if (err < 0) {
-			irq_unlock(key);
-			LOG_ERR("Unable to get DMA channel[%d] status: %d",
-				(int)stream->dma_channel, err);
+			LOG_ERR("DRAIN - Invalid state: %d", (int)stream->data->state);
 			return -EIO;
 		}
 
+#if I2S_ESP32_IS_DIR_EN(tx)
 		if (dir == I2S_DIR_TX) {
-			if (k_msgq_num_used_get(&stream->queue) > 0 || dma_channel_status.busy) {
-				stream->stop_without_draining = false;
-				stream->state = I2S_STATE_STOPPING;
+			if (k_msgq_num_used_get(&stream->data->queue) > 0 ||
+			    stream->data->dma_pending) {
+				stream->data->stop_without_draining = false;
+				stream->data->state = I2S_STATE_STOPPING;
 			} else {
-				stream->stop_transfer(dev);
-				stream->state = I2S_STATE_READY;
+				stream->conf->stop_transfer(dev);
+				stream->data->state = I2S_STATE_READY;
 			}
-		} else if (dir == I2S_DIR_RX) {
-			if (dma_channel_status.busy) {
-				stream->stop_without_draining = true;
-				stream->state = I2S_STATE_STOPPING;
+		}
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+
+#if I2S_ESP32_IS_DIR_EN(rx)
+		if (dir == I2S_DIR_RX) {
+			if (stream->data->dma_pending) {
+				stream->data->stop_without_draining = true;
+				stream->data->state = I2S_STATE_STOPPING;
 			} else {
-				stream->stop_transfer(dev);
-				stream->last_block = true;
-				stream->state = I2S_STATE_READY;
+				stream->conf->stop_transfer(dev);
+				stream->data->last_block = true;
+				stream->data->state = I2S_STATE_READY;
 			}
-		} else {
-			irq_unlock(key);
-			LOG_ERR("Invalid direction: %d", (int)dir);
-			return -EINVAL;
 		}
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
 
 		irq_unlock(key);
 		break;
 
 	case I2S_TRIGGER_DROP:
-		if (stream->state == I2S_STATE_NOT_READY) {
-			LOG_ERR("DROP - invalid state: %d", (int)stream->state);
+		if (stream->data->state == I2S_STATE_NOT_READY) {
+			LOG_ERR("DROP - invalid state: %d", (int)stream->data->state);
 			return -EIO;
 		}
-		stream->stop_transfer(dev);
-		stream->queue_drop(stream);
-		stream->state = I2S_STATE_READY;
+		stream->conf->stop_transfer(dev);
+		stream->conf->queue_drop(stream);
+		stream->data->state = I2S_STATE_READY;
 		break;
 
 	case I2S_TRIGGER_PREPARE:
-		if (stream->state != I2S_STATE_ERROR) {
-			LOG_ERR("PREPARE - invalid state: %d", (int)stream->state);
+		if (stream->data->state != I2S_STATE_ERROR) {
+			LOG_ERR("PREPARE - invalid state: %d", (int)stream->data->state);
 			return -EIO;
 		}
-		stream->queue_drop(stream);
-		stream->state = I2S_STATE_READY;
+		stream->conf->queue_drop(stream);
+		stream->data->state = I2S_STATE_READY;
 		break;
 
 	default:
@@ -834,22 +1311,105 @@ static int i2s_esp32_trigger(const struct device *dev, enum i2s_dir dir, enum i2
 	return 0;
 }
 
+static int i2s_esp32_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd)
+{
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream;
+	int err;
+
+	switch (dir) {
+	case I2S_DIR_RX:
+#if I2S_ESP32_IS_DIR_EN(rx)
+		stream = &dev_cfg->rx;
+		if (stream) {
+			err = i2s_esp32_trigger_stream(dev, stream, I2S_DIR_RX, cmd);
+		} else {
+			LOG_ERR("I2S_DIR_RX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_RX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+		break;
+	case I2S_DIR_TX:
+#if I2S_ESP32_IS_DIR_EN(tx)
+		stream = &dev_cfg->tx;
+		if (stream) {
+			err = i2s_esp32_trigger_stream(dev, stream, I2S_DIR_TX, cmd);
+		} else {
+			LOG_ERR("I2S_DIR_TX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_TX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+		break;
+	case I2S_DIR_BOTH:
+#if I2S_ESP32_IS_DIR_EN(tx)
+		stream = &dev_cfg->tx;
+		if (stream) {
+			err = i2s_esp32_trigger_stream(dev, stream, I2S_DIR_TX, cmd);
+		} else {
+			LOG_ERR("I2S_DIR_TX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_TX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
+		if (err < 0) {
+			break;
+		}
+#if I2S_ESP32_IS_DIR_EN(rx)
+		stream = &dev_cfg->rx;
+		if (stream) {
+			err = i2s_esp32_trigger_stream(dev, stream, I2S_DIR_RX, cmd);
+		} else {
+			LOG_ERR("I2S_DIR_RX not enabled");
+			err = -EINVAL;
+		}
+#else
+		LOG_ERR("I2S_DIR_RX not enabled");
+		err = -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
+		break;
+	default:
+		LOG_ERR("Invalid direction: %d", (int)dir);
+		err = -EINVAL;
+	}
+
+	return err;
+}
+
 static int i2s_esp32_read(const struct device *dev, void **mem_block, size_t *size)
 {
-	struct i2s_esp32_data *const dev_data = dev->data;
+#if I2S_ESP32_IS_DIR_EN(rx)
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream = &dev_cfg->rx;
 	struct queue_item item;
 	int err;
 
-	if (dev_data->rx.state == I2S_STATE_NOT_READY) {
-		LOG_ERR("RX invalid state: %d", (int)dev_data->rx.state);
+	if (!stream) {
+		*mem_block = NULL;
+		*size = 0;
+
+		LOG_ERR("I2S_DIR_RX not enabled");
+		return -EINVAL;
+	}
+
+	if (stream->data->state == I2S_STATE_NOT_READY) {
+		LOG_ERR("RX invalid state: %d", (int)stream->data->state);
 		return -EIO;
-	} else if (dev_data->rx.state == I2S_STATE_ERROR &&
-		   k_msgq_num_used_get(&dev_data->rx.queue) == 0) {
+	} else if (stream->data->state == I2S_STATE_ERROR &&
+		   k_msgq_num_used_get(&stream->data->queue) == 0) {
 		LOG_ERR("RX queue empty");
 		return -EIO;
 	}
 
-	err = k_msgq_get(&dev_data->rx.queue, &item, K_MSEC(dev_data->rx.i2s_cfg.timeout));
+	err = k_msgq_get(&stream->data->queue, &item,
+			 K_MSEC(stream->data->i2s_cfg.timeout));
 	if (err < 0) {
 		LOG_ERR("RX queue empty");
 		return err;
@@ -859,32 +1419,52 @@ static int i2s_esp32_read(const struct device *dev, void **mem_block, size_t *si
 	*size = item.size;
 
 	return 0;
+#else
+	*mem_block = NULL;
+	*size = 0;
+
+	LOG_ERR("I2S_DIR_RX not enabled");
+	return -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(rx) */
 }
 
 static int i2s_esp32_write(const struct device *dev, void *mem_block, size_t size)
 {
-	struct i2s_esp32_data *const dev_data = dev->data;
+#if I2S_ESP32_IS_DIR_EN(tx)
+	const struct i2s_esp32_cfg *dev_cfg = dev->config;
+	const struct i2s_esp32_stream *stream = &dev_cfg->tx;
 	int err;
 
-	if (dev_data->tx.state != I2S_STATE_RUNNING && dev_data->tx.state != I2S_STATE_READY) {
-		LOG_ERR("TX Invalid state: %d", (int)dev_data->tx.state);
+	if (!stream) {
+		LOG_ERR("I2S_DIR_TX not enabled");
+		return -EINVAL;
+	}
+
+	if (stream->data->state != I2S_STATE_RUNNING &&
+	    stream->data->state != I2S_STATE_READY) {
+		LOG_ERR("TX Invalid state: %d", (int)stream->data->state);
 		return -EIO;
 	}
 
-	if (size > dev_data->tx.i2s_cfg.block_size) {
-		LOG_ERR("Max write size is: %u", (unsigned int)dev_data->tx.i2s_cfg.block_size);
+	if (size > stream->data->i2s_cfg.block_size) {
+		LOG_ERR("Max write size is: %zu", stream->data->i2s_cfg.block_size);
 		return -EINVAL;
 	}
 
 	struct queue_item item = {.buffer = mem_block, .size = size};
 
-	err = k_msgq_put(&dev_data->tx.queue, &item, K_MSEC(dev_data->tx.i2s_cfg.timeout));
+	err = k_msgq_put(&stream->data->queue, &item,
+			 K_MSEC(stream->data->i2s_cfg.timeout));
 	if (err < 0) {
 		LOG_ERR("TX queue full");
 		return err;
 	}
 
 	return 0;
+#else
+	LOG_ERR("I2S_DIR_TX not enabled");
+	return -EINVAL;
+#endif /* I2S_ESP32_IS_DIR_EN(tx) */
 }
 
 static DEVICE_API(i2s, i2s_esp32_driver_api) = {
@@ -892,36 +1472,79 @@ static DEVICE_API(i2s, i2s_esp32_driver_api) = {
 	.config_get = i2s_esp32_config_get,
 	.trigger = i2s_esp32_trigger,
 	.read = i2s_esp32_read,
-	.write = i2s_esp32_write,
+	.write = i2s_esp32_write
 };
 
-#define I2S_ESP32_DMA_CHANNEL_INIT(index, dir)                                                     \
-	.dir = {.state = I2S_STATE_NOT_READY,                                                      \
+#define I2S_ESP32_STREAM_DECLARE_DMA_DESC(index, dir)                                              \
+	lldesc_t i2s_esp32_stream_##index##_##dir##_dma_desc[CONFIG_I2S_ESP32_DMA_DESC_NUM_MAX]
+
+#define I2S_ESP32_STREAM_DECL_DMA_DESC(index, dir)                                                 \
+	COND_CODE_1(DT_INST_IRQ_HAS_NAME(index, dir),                                              \
+		    (I2S_ESP32_STREAM_DECLARE_DMA_DESC(index, dir)), ())
+
+#define I2S_ESP32_STREAM_DECLARE(index, dir)                                                       \
+	struct i2s_esp32_stream_data i2s_esp32_stream_##index##_##dir##_data = {                   \
+		.state = I2S_STATE_NOT_READY,                                                      \
 		.is_slave = false,                                                                 \
-		.dma_dev = UTIL_AND(DT_INST_DMAS_HAS_NAME(index, dir),                             \
-				    DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(index, dir))),         \
-		.dma_channel = UTIL_AND(DT_INST_DMAS_HAS_NAME(index, dir),                         \
-					DT_INST_DMAS_CELL_BY_NAME(index, dir, channel)),           \
+		.i2s_cfg = {0},                                                                    \
 		.mem_block = NULL,                                                                 \
 		.mem_block_len = 0,                                                                \
+		.last_block = false,                                                               \
+		.stop_without_draining = false,                                                    \
+		.queue = {},                                                                       \
+		.irq_handle = NULL,                                                                \
+		.dma_pending = false                                                               \
+	};                                                                                         \
+                                                                                                   \
+	const struct i2s_esp32_stream_conf i2s_esp32_stream_##index##_##dir##_conf = {             \
+		.queue_drop = i2s_esp32_queue_drop,                                                \
 		.start_transfer = i2s_esp32_##dir##_start_transfer,                                \
 		.stop_transfer = i2s_esp32_##dir##_stop_transfer,                                  \
-		.queue_drop = i2s_esp32_queue_drop,                                                \
-		.last_block = false,                                                               \
-		.stop_without_draining = false}
+		.dma_dev = UTIL_AND(DT_INST_DMAS_HAS_NAME(index, dir),                             \
+				    DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(index, dir))),         \
+		.dma_channel = UTIL_AND(DT_INST_DMAS_HAS_NAME(index, dir),                         \
+					DT_INST_DMAS_CELL_BY_NAME(index, dir, channel)),           \
+		.dma_desc = UTIL_AND(DT_INST_IRQ_HAS_NAME(index, dir),                             \
+					i2s_esp32_stream_##index##_##dir##_dma_desc),              \
+		.irq_source = COND_CODE_1(DT_INST_IRQ_HAS_NAME(index, dir),                        \
+					  (DT_INST_IRQ_BY_NAME(index, dir, irq)), (-1)),           \
+		.irq_priority = COND_CODE_1(DT_INST_IRQ_HAS_NAME(index, dir),                      \
+					    (DT_INST_IRQ_BY_NAME(index, dir, priority)), (-1)),    \
+		.irq_flags = COND_CODE_1(DT_INST_IRQ_HAS_NAME(index, dir),                         \
+					 (DT_INST_IRQ_BY_NAME(index, dir, flags)), (-1))           \
+	}
+
+#define I2S_ESP32_STREAM_DECL(index, dir) \
+	COND_CODE_1(UTIL_OR(DT_INST_DMAS_HAS_NAME(index, dir), DT_INST_IRQ_HAS_NAME(index, dir)),  \
+		    (I2S_ESP32_STREAM_DECLARE(index, dir)), ())
+
+#define I2S_ESP32_STREAM_INIT(index, dir)                                                          \
+	.dir = {.conf = UTIL_AND(UTIL_OR(DT_INST_DMAS_HAS_NAME(index, dir),                        \
+					 DT_INST_IRQ_HAS_NAME(index, dir)),                        \
+				 &i2s_esp32_stream_##index##_##dir##_conf),                        \
+		.data = UTIL_AND(UTIL_OR(DT_INST_DMAS_HAS_NAME(index, dir),                        \
+					 DT_INST_IRQ_HAS_NAME(index, dir)),                        \
+				 &i2s_esp32_stream_##index##_##dir##_data)}
 
 #define I2S_ESP32_INIT(index)                                                                      \
 	PINCTRL_DT_INST_DEFINE(index);                                                             \
                                                                                                    \
+	I2S_ESP32_STREAM_DECL_DMA_DESC(index, rx);                                                 \
+	I2S_ESP32_STREAM_DECL(index, rx);                                                          \
+                                                                                                   \
+	I2S_ESP32_STREAM_DECL_DMA_DESC(index, tx);                                                 \
+	I2S_ESP32_STREAM_DECL(index, tx);                                                          \
+                                                                                                   \
+	static struct i2s_esp32_data i2s_esp32_data_##index = {                                    \
+		.clk_info = {0}};                                                                  \
+                                                                                                   \
 	static const struct i2s_esp32_cfg i2s_esp32_config_##index = {                             \
 		.unit = DT_PROP(DT_DRV_INST(index), unit),                                         \
-		.hal_cxt = {.dev = (i2s_dev_t *)DT_INST_REG_ADDR(index)},                          \
+		.hal = {.dev = (i2s_dev_t *)DT_INST_REG_ADDR(index)},                              \
 		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(index),                                     \
 		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(index)),                            \
-		.clock_subsys = (clock_control_subsys_t)DT_INST_CLOCKS_CELL(index, offset)};       \
-                                                                                                   \
-	static struct i2s_esp32_data i2s_esp32_data_##index = {                                    \
-		I2S_ESP32_DMA_CHANNEL_INIT(index, rx), I2S_ESP32_DMA_CHANNEL_INIT(index, tx)};     \
+		.clock_subsys = (clock_control_subsys_t)DT_INST_CLOCKS_CELL(index, offset),        \
+		I2S_ESP32_STREAM_INIT(index, rx), I2S_ESP32_STREAM_INIT(index, tx)};               \
                                                                                                    \
 	DEVICE_DT_INST_DEFINE(index, &i2s_esp32_initialize, NULL, &i2s_esp32_data_##index,         \
 			      &i2s_esp32_config_##index, POST_KERNEL, CONFIG_I2S_INIT_PRIORITY,    \
diff --git a/drivers/i2s/i2s_mcux_sai.c b/drivers/i2s/i2s_mcux_sai.c
index a6982a055cac4..2cfd9da8fbb96 100644
--- a/drivers/i2s/i2s_mcux_sai.c
+++ b/drivers/i2s/i2s_mcux_sai.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021,2023-2024 NXP Semiconductor INC.
+ * Copyright 2021,2023-2025 NXP Semiconductor INC.
  * All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -97,6 +97,7 @@ struct i2s_mcux_config {
 	uint32_t mclk_control_base;
 	uint32_t mclk_pin_mask;
 	uint32_t mclk_pin_offset;
+	bool mclk_output;
 	uint32_t tx_channel;
 	clock_control_subsys_t clk_sub_sys;
 	const struct device *ccm_dev;
@@ -487,9 +488,7 @@ static int i2s_mcux_config(const struct device *dev, enum i2s_dir dir,
 
 	memset(&config, 0, sizeof(config));
 
-	const bool is_mclk_slave = i2s_cfg->options & I2S_OPT_BIT_CLK_SLAVE;
-
-	enable_mclk_direction(dev, !is_mclk_slave);
+	enable_mclk_direction(dev, dev_cfg->mclk_output);
 
 	get_mclk_rate(dev, &mclk);
 	LOG_DBG("mclk is %d", mclk);
@@ -1185,6 +1184,7 @@ static DEVICE_API(i2s, i2s_mcux_driver_api) = {
 		.mclk_control_base = DT_REG_ADDR(DT_PHANDLE(DT_DRV_INST(i2s_id), pinmuxes)),       \
 		.mclk_pin_mask = DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), pinmuxes, 0, mask),            \
 		.mclk_pin_offset = DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), pinmuxes, 0, offset),        \
+		.mclk_output = DT_INST_PROP_OR(i2s_id, mclk_output, 0),                            \
 		.clk_sub_sys =                                                                     \
 			(clock_control_subsys_t)DT_INST_CLOCKS_CELL_BY_IDX(i2s_id, 0, name),       \
 		.ccm_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(i2s_id)),                             \
diff --git a/drivers/i3c/CMakeLists.txt b/drivers/i3c/CMakeLists.txt
index 9a597952dcd6d..39419267933c9 100644
--- a/drivers/i3c/CMakeLists.txt
+++ b/drivers/i3c/CMakeLists.txt
@@ -5,17 +5,14 @@
 zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/i3c.h)
 
 zephyr_library()
+zephyr_library_sources_ifdef(CONFIG_I3C_CONTROLLER i3c_ccc.c)
+zephyr_library_sources_ifdef(CONFIG_I3C_CONTROLLER i3c_common.c)
 
-zephyr_library_sources(
-  i3c_ccc.c
-  i3c_common.c
-)
-
-if(CONFIG_I3C_NUM_OF_DESC_MEM_SLABS GREATER 0)
+if(DEFINED CONFIG_I3C_NUM_OF_DESC_MEM_SLABS AND CONFIG_I3C_NUM_OF_DESC_MEM_SLABS GREATER 0)
   zephyr_library_sources(i3c_mem_slab.c)
 endif()
 
-if(CONFIG_I3C_I2C_NUM_OF_DESC_MEM_SLABS GREATER 0)
+if(DEFINED CONFIG_I3C_I2C_NUM_OF_DESC_MEM_SLABS AND CONFIG_I3C_I2C_NUM_OF_DESC_MEM_SLABS GREATER 0)
   zephyr_library_sources(i3c_i2c_mem_slab.c)
 endif()
 
@@ -54,6 +51,11 @@ zephyr_library_sources_ifdef(
   i3c_stm32.c
 )
 
+zephyr_library_sources_ifdef(
+  CONFIG_I3C_DW
+  i3c_dw.c
+)
+
 zephyr_library_sources_ifdef(
   CONFIG_I3C_TEST
   i3c_test.c
diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig
index 0f84acda8b795..31f79b78f18b9 100644
--- a/drivers/i3c/Kconfig
+++ b/drivers/i3c/Kconfig
@@ -15,6 +15,34 @@ module = I3C
 module-str = i3c
 source "subsys/logging/Kconfig.template.log_config"
 
+choice I3C_MODE
+	prompt "I3C Mode Selection"
+	default I3C_DUAL_ROLE
+	help
+	  Select the role in which I3C is enabled.
+	  At least one of Controller or Target must be enabled.
+
+	  Selecting only one can reduce the code footprint size.
+
+config I3C_CONTROLLER_ROLE_ONLY
+	bool "I3C Controller only"
+
+config I3C_TARGET_ROLE_ONLY
+	bool "I3C Target only"
+
+config I3C_DUAL_ROLE
+	bool "Both I3C Controller and Target"
+
+endchoice
+
+config I3C_CONTROLLER
+	bool
+	default y if I3C_DUAL_ROLE || I3C_CONTROLLER_ROLE_ONLY
+
+config I3C_TARGET
+	bool
+	default y if I3C_DUAL_ROLE || I3C_TARGET_ROLE_ONLY
+
 config I3C_SHELL
 	bool "I3C Shell"
 	depends on SHELL
@@ -24,17 +52,9 @@ config I3C_SHELL
 	  The I3C shell supports info, bus recovery, CCC, I3C read and
 	  write operations.
 
-config I3C_USE_GROUP_ADDR
-	bool "Use Group Addresses"
-	default y
-	help
-	  Enable this to use group addresses if supported
-	  by the controllers and target devices.
-
-	  Says Y if unsure.
-
 config I3C_TARGET_BUFFER_MODE
 	bool "I3C target driver for buffer mode"
+	depends on I3C_TARGET
 	help
 	  This is an option to enable buffer mode.
 
@@ -117,6 +137,8 @@ config I3C_INIT_RSTACT
 	  This determines whether the bus initialization routine
 	  sends a reset action command to I3C targets.
 
+if I3C_CONTROLLER && I3C_TARGET
+
 config I3C_NUM_OF_DESC_MEM_SLABS
 	int "Number of I3C Device Descriptors Mem Slabs"
 	default 3
@@ -133,6 +155,10 @@ config I3C_I2C_NUM_OF_DESC_MEM_SLABS
 	  there is a device encounted through DEFTGTS that is not
 	  within known I2C devices.
 
+endif # I3C_CONTROLLER && I3C_TARGET
+
+if I3C_CONTROLLER
+
 config I3C_RTIO
 	bool "I3C RTIO API"
 	select EXPERIMENTAL
@@ -177,11 +203,14 @@ config I3C_RTIO_FALLBACK_MSGS
 
 endif # I3C_RTIO
 
+endif # I3C_CONTROLLER
+
 comment "Device Drivers"
 
 rsource "Kconfig.nxp"
 rsource "Kconfig.cdns"
 rsource "Kconfig.npcx"
+rsource "Kconfig.dw"
 rsource "Kconfig.test"
 rsource "Kconfig.stm32"
 
diff --git a/drivers/i3c/Kconfig.cdns b/drivers/i3c/Kconfig.cdns
index f401235c84bfd..9b13a1bb89152 100644
--- a/drivers/i3c/Kconfig.cdns
+++ b/drivers/i3c/Kconfig.cdns
@@ -8,7 +8,7 @@ source "subsys/logging/Kconfig.template.log_config"
 
 config I3C_CADENCE
 	bool "Cadence I3C driver"
-	select I3C_IBI_WORKQUEUE if I3C_USE_IBI
+	select I3C_IBI_WORKQUEUE if I3C_USE_IBI && I3C_CONTROLLER
 	depends on DT_HAS_CDNS_I3C_ENABLED
 	default y
 	help
diff --git a/drivers/i3c/Kconfig.dw b/drivers/i3c/Kconfig.dw
new file mode 100644
index 0000000000000..813a95ebaeb5b
--- /dev/null
+++ b/drivers/i3c/Kconfig.dw
@@ -0,0 +1,24 @@
+# Copyright (c) 2023 Meta Platforms, Inc. and its affiliates.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module = I3C_DW
+module-str = i3c-dw
+source "subsys/logging/Kconfig.template.log_config"
+
+menuconfig I3C_DW
+	bool "DW I3C support"
+	select I3C_IBI_WORKQUEUE if I3C_USE_IBI && I3C_CONTROLLER
+	depends on DT_HAS_SNPS_DESIGNWARE_I3C_ENABLED
+	depends on CLOCK_CONTROL
+	default y
+	help
+	  Enable the Synopsys Designware I3C driver
+
+if I3C_DW
+
+config I3C_DW_RW_TIMEOUT_MS
+	int "Set the Read/Write timeout in milliseconds"
+	default 100
+
+endif # I3C_DW
diff --git a/drivers/i3c/i3c_ccc.c b/drivers/i3c/i3c_ccc.c
index f0a50dd7674c5..c670476412af0 100644
--- a/drivers/i3c/i3c_ccc.c
+++ b/drivers/i3c/i3c_ccc.c
@@ -137,6 +137,26 @@ int i3c_ccc_do_rstact(const struct i3c_device_desc *target,
 	return i3c_do_ccc(target->bus, &ccc_payload);
 }
 
+int i3c_ccc_do_rstdaa(struct i3c_device_desc *target)
+{
+	struct i3c_ccc_payload ccc_payload;
+	struct i3c_ccc_target_payload ccc_tgt_payload;
+
+	__ASSERT_NO_MSG(target != NULL);
+	__ASSERT_NO_MSG(target->bus != NULL);
+
+	ccc_tgt_payload.addr = target->dynamic_addr;
+	ccc_tgt_payload.rnw = 1;
+	ccc_tgt_payload.data_len = 0;
+
+	memset(&ccc_payload, 0, sizeof(ccc_payload));
+	ccc_payload.ccc.id = I3C_CCC_RSTDAA_DC;
+	ccc_payload.targets.payloads = &ccc_tgt_payload;
+	ccc_payload.targets.num_targets = 1;
+
+	return i3c_do_ccc(target->bus, &ccc_payload);
+}
+
 int i3c_ccc_do_rstdaa_all(const struct device *controller)
 {
 	struct i3c_ccc_payload ccc_payload;
@@ -255,6 +275,7 @@ int i3c_ccc_do_entas(const struct i3c_device_desc *target, uint8_t as)
 
 	ccc_tgt_payload.addr = target->dynamic_addr;
 	ccc_tgt_payload.rnw = 0;
+	ccc_tgt_payload.data_len = 0;
 
 	ccc_payload.ccc.id = I3C_CCC_ENTAS(as, false);
 	ccc_payload.targets.payloads = &ccc_tgt_payload;
diff --git a/drivers/i3c/i3c_cdns.c b/drivers/i3c/i3c_cdns.c
index b66cd8ff52ca1..e4eafaa422f7d 100644
--- a/drivers/i3c/i3c_cdns.c
+++ b/drivers/i3c/i3c_cdns.c
@@ -458,9 +458,6 @@
  * Local Constants Definition
  ******************************************************************************/
 
-/* TODO: this needs to be configurable in the dts...somehow */
-#define I3C_CONTROLLER_ADDR 0x08
-
 /* Maximum i3c devices that the IP can be built with */
 #define I3C_MAX_DEVS                     11
 #define I3C_MAX_MSGS                     10
@@ -486,8 +483,6 @@
 #define I3C_CMDR_THR 1
 /* command tx fifo threshold - unused */
 #define I3C_CMDD_THR 1
-/* in-band-interrupt data fifo threshold - unused */
-#define I3C_IBID_THR 1
 /* in-band-interrupt response queue threshold */
 #define I3C_IBIR_THR 1
 /* tx data threshold - unused */
@@ -577,21 +572,29 @@ struct cdns_i3c_config {
 struct cdns_i3c_data {
 	/* common must be first! */
 	struct i3c_driver_data common;
-	const struct device *dev;
 	struct cdns_i3c_hw_config hw_cfg;
-#ifdef CONFIG_I3C_USE_IBI
-	struct cdns_i3c_ibi_buf ibi_buf;
-#endif
 	struct k_mutex bus_lock;
+#ifdef CONFIG_I3C_CONTROLLER
 	struct cdns_i3c_i2c_dev_data cdns_i3c_i2c_priv_data[I3C_MAX_DEVS];
+#endif /* CONFIG_I3C_CONTROLLER */
 	struct cdns_i3c_xfer xfer;
+#ifdef CONFIG_I3C_TARGET
 	struct i3c_target_config *target_config;
-	struct k_work deftgts_work;
+#endif /* CONFIG_I3C_TARGET */
 #ifdef CONFIG_I3C_USE_IBI
+	struct cdns_i3c_ibi_buf ibi_buf;
+#ifdef CONFIG_I3C_TARGET
 	struct k_sem ibi_hj_complete;
+#ifdef CONFIG_I3C_CONTROLLER
 	struct k_sem ibi_cr_complete;
-#endif
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_USE_IBI*/
+#if defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)
+	const struct device *dev;
+	struct k_work deftgts_work;
 	struct k_sem ch_complete;
+#endif /* CONFIG_I3C_CONTROLLER && CONFIG_I3C_TARGET */
 	uint32_t free_rr_slots;
 	uint16_t fifo_bytes_read;
 	uint8_t max_devs;
@@ -666,7 +669,7 @@ static uint16_t prepare_ddr_cmd_parity_adjustment_bit(uint16_t word)
 
 	return word;
 }
-
+#ifdef CONFIG_I3C_CONTROLLER
 /* Computes and sets parity */
 /* Returns [7:1] 7-bit addr, [0] even/xor parity */
 static uint8_t cdns_i3c_even_parity_byte(uint8_t byte)
@@ -682,6 +685,7 @@ static uint8_t cdns_i3c_even_parity_byte(uint8_t byte)
 
 	return b;
 }
+#endif /* CONFIG_I3C_CONTROLLER */
 
 /* Check if command response fifo is empty */
 static inline bool cdns_i3c_cmd_rsp_fifo_empty(const struct cdns_i3c_config *config)
@@ -777,6 +781,7 @@ static void cdns_i3c_write_tx_fifo(const struct cdns_i3c_config *config, const v
 	}
 }
 
+#ifdef CONFIG_I3C_TARGET
 static void cdns_i3c_write_ddr_tx_fifo(const struct cdns_i3c_config *config, const void *buf,
 				       uint32_t len)
 {
@@ -794,8 +799,10 @@ static void cdns_i3c_write_ddr_tx_fifo(const struct cdns_i3c_config *config, con
 		sys_write32(val, config->base + SLV_DDR_TX_FIFO);
 	}
 }
+#endif /* CONFIG_I3C_TARGET */
 
 #ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_TARGET
 static void cdns_i3c_write_ibi_fifo(const struct cdns_i3c_config *config, const void *buf,
 				    uint32_t len)
 {
@@ -813,8 +820,9 @@ static void cdns_i3c_write_ibi_fifo(const struct cdns_i3c_config *config, const
 		sys_write32(val, config->base + IBI_DATA_FIFO);
 	}
 }
+#endif /* CONFIG_I3C_TARGET */
 #endif /* CONFIG_I3C_USE_IBI */
-
+#ifdef CONFIG_I3C_TARGET
 static void cdns_i3c_target_read_rx_fifo(const struct device *dev)
 {
 	const struct cdns_i3c_config *config = dev->config;
@@ -849,7 +857,8 @@ static void cdns_i3c_target_read_rx_fifo(const struct device *dev)
 		target_cb->write_received_cb(data->target_config, rx_data);
 	}
 }
-
+#endif /* CONFIG_I3C_TARGET */
+#ifdef CONFIG_I3C_CONTROLLER
 static int cdns_i3c_read_rx_fifo(const struct cdns_i3c_config *config, void *buf, uint32_t len)
 {
 	uint32_t *ptr = buf;
@@ -983,7 +992,7 @@ static void cdns_i3c_set_prescalers(const struct device *dev)
 		sys_write32(CTRL_DEV_EN | ctrl, config->base + CTRL);
 	}
 }
-
+#ifdef CONFIG_I3C_CONTROLLER
 /**
  * @brief Compute RR0 Value from addr
  *
@@ -1005,6 +1014,7 @@ static uint32_t prepare_rr0_dev_address(uint16_t addr)
 
 	return ret;
 }
+#endif /* CONFIG_I3C_CONTROLLER */
 
 /**
  * @brief Program Retaining Registers with device lists
@@ -1018,21 +1028,32 @@ static void cdns_i3c_program_controller_retaining_reg(const struct device *dev)
 {
 	const struct cdns_i3c_config *config = dev->config;
 	struct cdns_i3c_data *data = dev->data;
-	/* Set controller retaining register */
-	uint8_t controller_da = I3C_CONTROLLER_ADDR;
+	uint8_t controller_da;
 
-	if (!i3c_addr_slots_is_free(&data->common.attached_dev.addr_slots, controller_da)) {
+	/* Set controller retaining register */
+	if (config->common.primary_controller_da) {
+		if (!i3c_addr_slots_is_free(&data->common.attached_dev.addr_slots,
+					    config->common.primary_controller_da)) {
+			controller_da = i3c_addr_slots_next_free_find(
+				&data->common.attached_dev.addr_slots, 0);
+			LOG_WRN("%s: 0x%02x DA selected for controller as 0x%02x is unavailable",
+				dev->name, controller_da, config->common.primary_controller_da);
+		} else {
+			controller_da = config->common.primary_controller_da;
+		}
+	} else {
 		controller_da =
 			i3c_addr_slots_next_free_find(&data->common.attached_dev.addr_slots, 0);
-		LOG_DBG("%s: 0x%02x DA selected for controller", dev->name, controller_da);
 	}
 	sys_write32(prepare_rr0_dev_address(controller_da) | DEV_ID_RR0_IS_I3C,
 		    config->base + DEV_ID_RR0(0));
 	/* Mark the address as I3C device */
 	i3c_addr_slots_mark_i3c(&data->common.attached_dev.addr_slots, controller_da);
 }
+#endif /* CONFIG_I3C_CONTROLLER */
 
 #ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_CONTROLLER
 static int cdns_i3c_ibi_hj_response(const struct device *dev, bool ack)
 {
 	const struct cdns_i3c_config *config = dev->config;
@@ -1125,7 +1146,8 @@ static int cdns_i3c_controller_ibi_disable(const struct device *dev, struct i3c_
 
 	return ret;
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
 static int cdns_i3c_target_ibi_raise_hj(const struct device *dev)
 {
 	const struct cdns_i3c_config *config = dev->config;
@@ -1156,7 +1178,7 @@ static int cdns_i3c_target_ibi_raise_hj(const struct device *dev)
 	}
 	return 0;
 }
-
+#ifdef CONFIG_I3C_CONTROLLER
 static int cdns_i3c_target_ibi_raise_cr(const struct device *dev)
 {
 	const struct cdns_i3c_config *config = dev->config;
@@ -1181,7 +1203,7 @@ static int cdns_i3c_target_ibi_raise_cr(const struct device *dev)
 	}
 	return 0;
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
 static int cdns_i3c_target_ibi_raise_intr(const struct device *dev, struct i3c_ibi *request)
 {
 	const struct cdns_i3c_config *config = dev->config;
@@ -1244,15 +1266,21 @@ static int cdns_i3c_target_ibi_raise(const struct device *dev, struct i3c_ibi *r
 			return -ENOTSUP;
 		}
 	case I3C_IBI_CONTROLLER_ROLE_REQUEST:
+#ifdef CONFIG_I3C_CONTROLLER
 		return cdns_i3c_target_ibi_raise_cr(dev);
+#else
+		return -ENOTSUP;
+#endif
 	case I3C_IBI_HOTJOIN:
 		return cdns_i3c_target_ibi_raise_hj(dev);
 	default:
 		return -EINVAL;
 	}
 }
-#endif
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_USE_IBI */
 
+#ifdef CONFIG_I3C_CONTROLLER
 static void cdns_i3c_cancel_transfer(const struct device *dev)
 {
 	struct cdns_i3c_data *data = dev->data;
@@ -1548,12 +1576,13 @@ static int cdns_i3c_do_ccc(const struct device *dev, struct i3c_ccc_payload *pay
 	}
 
 	ret = data->xfer.ret;
-
+#if defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)
 	/* TODO: decide if this is the right approach or add a new separate API for CH */
 	/* Wait for Controller Handoff to finish */
 	if (payload->ccc.id == I3C_CCC_GETACCCR) {
 		ret = k_sem_take(&data->ch_complete, K_MSEC(1000));
 	}
+#endif /* CONFIG_I3C_CONTROLLER && CONFIG_I3C_TARGET */
 error:
 	k_mutex_unlock(&data->bus_lock);
 
@@ -1573,14 +1602,8 @@ static int cdns_i3c_do_daa(const struct device *dev)
 {
 	struct cdns_i3c_data *data = dev->data;
 	const struct cdns_i3c_config *config = dev->config;
-	struct i3c_config_controller *ctrl_config = &data->common.ctrl_config;
 	uint8_t last_addr = 0;
 
-	/* DAA should not be done by secondary controllers */
-	if (ctrl_config->is_secondary) {
-		return -EACCES;
-	}
-
 	/* read dev active reg */
 	uint32_t olddevs = sys_read32(config->base + DEVS_CTRL) & DEVS_CTRL_DEVS_ACTIVE_MASK;
 	/* ignore the controller register */
@@ -1742,6 +1765,7 @@ static int cdns_i3c_i2c_api_configure(const struct device *dev, uint32_t config)
 
 	return 0;
 }
+#endif /* CONFIG_I3C_CONTROLLER */
 
 /**
  * @brief Configure I3C hardware.
@@ -1758,23 +1782,38 @@ static int cdns_i3c_i2c_api_configure(const struct device *dev, uint32_t config)
  */
 static int cdns_i3c_configure(const struct device *dev, enum i3c_config_type type, void *config)
 {
-	struct cdns_i3c_data *data = dev->data;
-	struct i3c_config_controller *ctrl_cfg = config;
+	if (type == I3C_CONFIG_CONTROLLER) {
+#ifdef CONFIG_I3C_CONTROLLER
+		struct cdns_i3c_data *data = dev->data;
+		struct i3c_config_controller *ctrl_cfg = config;
 
-	if ((ctrl_cfg->scl.i2c == 0U) || (ctrl_cfg->scl.i3c == 0U)) {
-		return -EINVAL;
-	}
+		if ((ctrl_cfg->scl.i2c == 0U) || (ctrl_cfg->scl.i3c == 0U)) {
+			return -EINVAL;
+		}
 
-	data->common.ctrl_config.scl.i3c = ctrl_cfg->scl.i3c;
-	data->common.ctrl_config.scl.i2c = ctrl_cfg->scl.i2c;
+		data->common.ctrl_config.scl.i3c = ctrl_cfg->scl.i3c;
+		data->common.ctrl_config.scl.i2c = ctrl_cfg->scl.i2c;
 
-	k_mutex_lock(&data->bus_lock, K_FOREVER);
-	cdns_i3c_set_prescalers(dev);
-	k_mutex_unlock(&data->bus_lock);
+		k_mutex_lock(&data->bus_lock, K_FOREVER);
+		cdns_i3c_set_prescalers(dev);
+		k_mutex_unlock(&data->bus_lock);
+#else
+		return -ENOTSUP;
+#endif
+	} else if (type == I3C_CONFIG_TARGET) {
+#ifdef CONFIG_I3C_TARGET
+		return 0;
+#else
+		return -ENOTSUP;
+#endif
+	} else {
+		return -EINVAL;
+	}
 
 	return 0;
 }
 
+#ifdef CONFIG_I3C_CONTROLLER
 /**
  * @brief Complete a I3C/I2C Transfer
  *
@@ -1956,7 +1995,8 @@ static void cdns_i3c_complete_transfer(const struct device *dev)
 
 	k_sem_give(&data->xfer.complete);
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#if CONFIG_I3C_CONTROLLER
 /**
  * @brief Transfer messages in I2C mode.
  *
@@ -2337,14 +2377,12 @@ static int cdns_i3c_transfer(const struct device *dev, struct i3c_device_desc *t
 			cmd->cmd0 |= CMD0_FIFO_DEV_ADDR(target->dynamic_addr);
 			if ((msgs[i].flags & I3C_MSG_RW_MASK) == I3C_MSG_READ) {
 				cmd->cmd0 |= CMD0_FIFO_RNW;
-				/*
-				 * For I3C_XMIT_MODE_NO_ADDR reads in SDN mode,
-				 * CMD0_FIFO_PL_LEN specifies the abort limit not bytes to read
-				 */
-				cmd->cmd0 |= CMD0_FIFO_PL_LEN(pl + 1);
-			} else {
-				cmd->cmd0 |= CMD0_FIFO_PL_LEN(pl);
 			}
+			/*
+			 * For I3C_XMIT_MODE_NO_ADDR reads in SDN mode,
+			 * CMD0_FIFO_PL_LEN specifies the abort limit not bytes to read
+			 */
+			cmd->cmd0 |= CMD0_FIFO_PL_LEN(pl);
 
 			/* Send broadcast header on first transfer or after a STOP. */
 			if (!(msgs[i].flags & I3C_MSG_NBCH) && (send_broadcast)) {
@@ -2445,8 +2483,10 @@ static int cdns_i3c_transfer(const struct device *dev, struct i3c_device_desc *t
 
 	return ret;
 }
+#endif /* CONFIG_I3C_CONTROLLER */
 
 #ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_CONTROLLER
 static int cdns_i3c_read_ibi_fifo(const struct cdns_i3c_config *config, void *buf, uint32_t len)
 {
 	uint32_t *ptr = buf;
@@ -2524,7 +2564,7 @@ static void cdns_i3c_handle_ibi(const struct device *dev, uint32_t ibir)
 		LOG_ERR("%s: Error enqueue IBI IRQ work", dev->name);
 	}
 }
-
+#ifdef CONFIG_I3C_TARGET
 static void cdns_i3c_handle_cr(const struct device *dev, uint32_t ibir)
 {
 	const struct cdns_i3c_config *config = dev->config;
@@ -2564,6 +2604,13 @@ static void cdns_i3c_handle_cr(const struct device *dev, uint32_t ibir)
 	}
 }
 
+static void cdns_i3c_target_ibi_cr_complete(const struct device *dev)
+{
+	struct cdns_i3c_data *data = dev->data;
+
+	k_sem_give(&data->ibi_cr_complete);
+}
+#endif /* CONFIG_I3C_TARGET */
 static void cdns_i3c_handle_hj(const struct device *dev, uint32_t ibir)
 {
 	if (!(IBIR_ACKED & ibir)) {
@@ -2593,29 +2640,27 @@ static void cnds_i3c_master_demux_ibis(const struct device *dev)
 			cdns_i3c_handle_hj(dev, ibir);
 			break;
 		case IBIR_TYPE_MR:
+#ifdef CONFIG_I3C_TARGET
 			cdns_i3c_handle_cr(dev, ibir);
+#endif /* CONFIG_I3C_TARGET */
 			break;
 		default:
 			break;
 		}
 	}
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
 static void cdns_i3c_target_ibi_hj_complete(const struct device *dev)
 {
 	struct cdns_i3c_data *data = dev->data;
 
 	k_sem_give(&data->ibi_hj_complete);
 }
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_USE_IBI */
 
-static void cdns_i3c_target_ibi_cr_complete(const struct device *dev)
-{
-	struct cdns_i3c_data *data = dev->data;
-
-	k_sem_give(&data->ibi_cr_complete);
-}
-#endif
-
+#ifdef CONFIG_I3C_TARGET
 static void cdns_i3c_target_sdr_tx_thr_int_handler(const struct device *dev,
 						   const struct i3c_target_callbacks *target_cb)
 {
@@ -2669,11 +2714,13 @@ static void cdns_i3c_target_sdr_tx_thr_int_handler(const struct device *dev,
 		}
 	}
 }
+#endif /* CONFIG_I3C_TARGET */
 
 static void cdns_i3c_irq_handler(const struct device *dev)
 {
 	const struct cdns_i3c_config *config = dev->config;
 	struct cdns_i3c_data *data = dev->data;
+#ifdef CONFIG_I3C_CONTROLLER
 	uint32_t int_st = sys_read32(config->base + MST_ISR);
 
 	sys_write32(int_st, config->base + MST_ICR);
@@ -2726,12 +2773,14 @@ static void cdns_i3c_irq_handler(const struct device *dev)
 	if (int_st & MST_INT_RX_UNF) {
 		LOG_ERR("%s: controller rx buffer underflow,", dev->name);
 	}
-
+#ifdef CONFIG_I3C_TARGET
 	if (int_st & MST_INT_MR_DONE) {
 		LOG_DBG("%s: controller CR Handoff done,", dev->name);
 		k_sem_give(&data->ch_complete);
 	}
-
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
 	uint32_t int_sl = sys_read32(config->base + SLV_ISR);
 	const struct i3c_target_callbacks *target_cb =
 		data->target_config ? data->target_config->callbacks : NULL;
@@ -2786,18 +2835,6 @@ static void cdns_i3c_irq_handler(const struct device *dev)
 
 	/* HJ complete and DA has been assigned or HJ NACK'ed or DISEC disabled HJ */
 	if (int_sl & SLV_INT_HJ_DONE) {
-
-	}
-
-	/* Controllership has been been given to us */
-	if (int_sl & SLV_INT_MR_DONE) {
-#ifdef CONFIG_I3C_USE_IBI
-		cdns_i3c_target_ibi_cr_complete(dev);
-		i3c_ibi_work_enqueue_cb(dev, i3c_sec_handoffed);
-		if (target_cb != NULL && target_cb->controller_handoff_cb) {
-			target_cb->controller_handoff_cb(data->target_config);
-		}
-#endif
 	}
 
 	/* EISC or DISEC has been received */
@@ -2901,12 +2938,25 @@ static void cdns_i3c_irq_handler(const struct device *dev)
 			}
 		}
 	}
+#ifdef CONFIG_I3C_CONTROLLER
+	/* Controllership has been been given to us */
+	if (int_sl & SLV_INT_MR_DONE) {
+#ifdef CONFIG_I3C_USE_IBI
+		cdns_i3c_target_ibi_cr_complete(dev);
+		i3c_ibi_work_enqueue_cb(dev, i3c_sec_handoffed);
+		if (target_cb != NULL && target_cb->controller_handoff_cb) {
+			target_cb->controller_handoff_cb(data->target_config);
+		}
+#endif
+	}
 
 	/* DEFTGTS */
 	if (int_sl & SLV_INT_DEFSLVS) {
 		/* Execute outside of the ISR context */
 		k_work_submit(&data->deftgts_work);
 	}
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_TARGET */
 }
 
 static void cdns_i3c_read_hw_cfg(const struct device *dev)
@@ -2980,14 +3030,18 @@ static void cdns_i3c_read_hw_cfg(const struct device *dev)
  */
 static int cdns_i3c_config_get(const struct device *dev, enum i3c_config_type type, void *config)
 {
-	const struct cdns_i3c_config *dev_config = dev->config;
 	struct cdns_i3c_data *data = dev->data;
-
 	__ASSERT_NO_MSG(config != NULL);
 
 	if (type == I3C_CONFIG_CONTROLLER) {
+#ifdef CONFIG_I3C_CONTROLLER
 		(void)memcpy(config, &data->common.ctrl_config, sizeof(data->common.ctrl_config));
+#else
+		return -EINVAL;
+#endif
 	} else if (type == I3C_CONFIG_TARGET) {
+#ifdef CONFIG_I3C_TARGET
+		const struct cdns_i3c_config *dev_config = dev->config;
 		struct i3c_config_target *target_config = (struct i3c_config_target *)config;
 		/* Read RR_0 registers for itself */
 		uint32_t dev_id_rr0 = sys_read32(dev_config->base + DEV_ID_RR0(0));
@@ -2996,7 +3050,7 @@ static int cdns_i3c_config_get(const struct device *dev, enum i3c_config_type ty
 		uint32_t slv_status1 = sys_read32(dev_config->base + SLV_STATUS1);
 
 		/* if we are currently a target */
-		target_config->enable =
+		target_config->enabled =
 			!!!(sys_read32(dev_config->base + MST_STATUS0) & MST_STATUS0_MASTER_MODE);
 		if (data->common.ctrl_config.is_secondary) {
 			target_config->dynamic_addr = SLV_STATUS1_DA(slv_status1);
@@ -3019,13 +3073,16 @@ static int cdns_i3c_config_get(const struct device *dev, enum i3c_config_type ty
 			target_config->max_write_len = 0;
 		}
 		target_config->supported_hdr = data->common.ctrl_config.supported_hdr;
+#else
+		return -EINVAL;
+#endif
 	} else {
 		return -EINVAL;
 	}
 
 	return 0;
 }
-
+#ifdef CONFIG_I3C_TARGET
 static int cdns_i3c_target_tx_ddr_write(const struct device *dev, uint8_t *buf, uint16_t len)
 {
 	const struct cdns_i3c_config *config = dev->config;
@@ -3216,7 +3273,8 @@ static int cdns_i3c_target_unregister(const struct device *dev, struct i3c_targe
 	/* no way to disable? maybe write DA to 0? */
 	return 0;
 }
-
+#endif /* CONFIG_I3C_TARGET */
+#ifdef CONFIG_I3C_CONTROLLER
 /**
  * @brief Find a registered I3C target device.
  *
@@ -3253,7 +3311,8 @@ static struct i3c_i2c_device_desc *cdns_i3c_i2c_device_find(const struct device
 {
 	return i3c_dev_list_i2c_addr_find(dev, addr);
 }
-
+#endif
+#ifdef CONFIG_I3C_CONTROLLER
 /**
  * @brief Transfer messages in I2C mode.
  *
@@ -3280,7 +3339,8 @@ static int cdns_i3c_i2c_api_transfer(const struct device *dev, struct i2c_msg *m
 
 	return ret;
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#if defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)
 /**
  * ACK or NACK Controller Handoffs
  *
@@ -3305,7 +3365,8 @@ static int cdns_i3c_target_controller_handoff(const struct device *dev, bool acc
 
 	return 0;
 }
-
+#endif
+#ifdef CONFIG_I3C_CONTROLLER
 /**
  * Determine I3C bus mode from the i2c devices on the bus
  *
@@ -3367,32 +3428,21 @@ static uint8_t cdns_i3c_sda_data_hold(const struct device *dev)
 
 	return (THD_DELAY_MAX - thd_delay);
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#if defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)
 static void i3c_cdns_deftgts_work_fn(struct k_work *work)
 {
 	const struct cdns_i3c_config *config;
 	struct cdns_i3c_data *data;
-	struct i3c_ccc_deftgts *deftgts;
 	const struct device *dev;
 	uint32_t devs;
+	uint8_t count;
 	uint8_t n = 0;
 
 	data = CONTAINER_OF(work, struct cdns_i3c_data, deftgts_work);
 	dev = data->dev;
 	config = dev->config;
 	data = dev->data;
-	deftgts = data->common.deftgts;
-
-	/* Allocate memory for deftgts if not already */
-	if (!deftgts) {
-		deftgts =
-			malloc(sizeof(uint8_t) + sizeof(struct i3c_ccc_deftgts_active_controller) +
-			       (data->max_devs * sizeof(struct i3c_ccc_deftgts_target)));
-		if (!deftgts) {
-			LOG_ERR("%s: Failed to allocate memory for DEFTGTS", dev->name);
-			return;
-		}
-	}
 
 	devs = sys_read32(config->base + DEVS_CTRL) & DEVS_CTRL_DEVS_ACTIVE_MASK;
 	data->free_rr_slots = GENMASK(data->max_devs, 1) & ~devs;
@@ -3402,7 +3452,24 @@ static void i3c_cdns_deftgts_work_fn(struct k_work *work)
 	 * it was in DEFTGTS. Also, if the IP never had a DA, then the deftgts interrupt will
 	 * never fire. Subtract 1 as the active controller is not included in `count`.
 	 */
-	deftgts->count = POPCOUNT(devs) - 1;
+	count = POPCOUNT(devs) - 1;
+
+	/* Free memory if it was previously allocated */
+	if (data->common.deftgts) {
+		free(data->common.deftgts);
+		data->common.deftgts = NULL;
+	}
+
+	/* Allocate memory for deftgts */
+	data->common.deftgts =
+		malloc(sizeof(uint8_t) + sizeof(struct i3c_ccc_deftgts_active_controller) +
+		       (count * sizeof(struct i3c_ccc_deftgts_target)));
+	if (!data->common.deftgts) {
+		LOG_ERR("%s: Failed to allocate memory for DEFTGTS", dev->name);
+		return;
+	}
+
+	data->common.deftgts->count = count;
 
 	for (uint8_t i = find_lsb_set(devs); i <= find_msb_set(devs); i++) {
 		uint8_t rr_idx = i - 1;
@@ -3417,35 +3484,35 @@ static void i3c_cdns_deftgts_work_fn(struct k_work *work)
 			uint8_t dcr_lvr = dev_id_rr2 & 0xFF;
 			bool is_i3c = !!(dev_id_rr0 & DEV_ID_RR0_IS_I3C);
 
-
 			/* RR IDX 1 should always be expected to be the AC */
 			if (rr_idx == 1) {
-				deftgts->active_controller.addr = addr;
-				deftgts->active_controller.dcr = dcr_lvr;
-				deftgts->active_controller.bcr = bcr;
-				deftgts->active_controller.static_addr = 0;
+				data->common.deftgts->active_controller.addr = addr;
+				data->common.deftgts->active_controller.dcr = dcr_lvr;
+				data->common.deftgts->active_controller.bcr = bcr;
+				data->common.deftgts->active_controller.static_addr = 0;
 			} else if (is_i3c) {
-				deftgts->targets[n].addr = addr;
-				deftgts->targets[n].dcr = dcr_lvr;
-				deftgts->targets[n].bcr = bcr;
-				deftgts->targets[n].static_addr = 0;
+				data->common.deftgts->targets[n].addr = addr;
+				data->common.deftgts->targets[n].dcr = dcr_lvr;
+				data->common.deftgts->targets[n].bcr = bcr;
+				data->common.deftgts->targets[n].static_addr = 0;
 				n++;
 			} else {
-				deftgts->targets[n].addr = 0;
-				deftgts->targets[n].lvr = dcr_lvr;
-				deftgts->targets[n].bcr = 0;
-				deftgts->targets[n].static_addr = addr;
+				data->common.deftgts->targets[n].addr = 0;
+				data->common.deftgts->targets[n].lvr = dcr_lvr;
+				data->common.deftgts->targets[n].bcr = 0;
+				data->common.deftgts->targets[n].static_addr = addr;
 				n++;
 			}
 		}
 	}
 	data->common.deftgts_refreshed = true;
-	LOG_HEXDUMP_DBG((uint8_t *)deftgts,
-			sizeof(uint8_t) + sizeof(struct i3c_ccc_deftgts_active_controller) +
-				(deftgts->count * sizeof(struct i3c_ccc_deftgts_target)),
-			"DEFTGTS Received");
+	LOG_HEXDUMP_DBG(
+		(uint8_t *)data->common.deftgts,
+		sizeof(uint8_t) + sizeof(struct i3c_ccc_deftgts_active_controller) +
+			(data->common.deftgts->count * sizeof(struct i3c_ccc_deftgts_target)),
+		"DEFTGTS Received");
 }
-
+#endif
 /**
  * @brief Initialize the hardware.
  *
@@ -3457,8 +3524,6 @@ static int cdns_i3c_bus_init(const struct device *dev)
 	const struct cdns_i3c_config *config = dev->config;
 	struct i3c_config_controller *ctrl_config = &data->common.ctrl_config;
 
-	data->dev = dev;
-
 	cdns_i3c_read_hw_cfg(dev);
 
 	/* Clear all retaining regs */
@@ -3481,13 +3546,27 @@ static int cdns_i3c_bus_init(const struct device *dev)
 			(conf0 & CONF_STATUS0_SUPPORTS_DDR) ? I3C_MSG_HDR_DDR : 0;
 		ctrl_config->is_secondary = (conf0 & CONF_STATUS0_SEC_MASTER) ? true : false;
 	}
+	/*
+	 * Ensure that is_secondary is only set when CONFIG_I3C_TARGET is enabled,
+	 * or ensure that it is false when CONFIG_I3C_CONTROLLER is enabled.
+	 */
+	__ASSERT_NO_MSG((IS_ENABLED(CONFIG_I3C_TARGET) && ctrl_config->is_secondary) ||
+			(IS_ENABLED(CONFIG_I3C_CONTROLLER) && !ctrl_config->is_secondary));
+
 	k_mutex_init(&data->bus_lock);
 	k_sem_init(&data->xfer.complete, 0, 1);
+#if defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)
+	data->dev = dev;
 	k_sem_init(&data->ch_complete, 0, 1);
 	k_work_init(&data->deftgts_work, i3c_cdns_deftgts_work_fn);
+#endif /* defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET) */
 #ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_TARGET
 	k_sem_init(&data->ibi_hj_complete, 0, 1);
+#ifdef CONFIG_I3C_CONTROLLER
 	k_sem_init(&data->ibi_cr_complete, 0, 1);
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_CONTROLLER */
 #endif
 
 	cdns_i3c_interrupts_disable(config);
@@ -3497,7 +3576,7 @@ static int cdns_i3c_bus_init(const struct device *dev)
 
 	/* Ensure the bus is disabled. */
 	sys_write32(~CTRL_DEV_EN & sys_read32(config->base + CTRL), config->base + CTRL);
-
+#if defined(CONFIG_I3C_CONTROLLER)
 	/* determine prescaler timings for i3c and i2c scl */
 	cdns_i3c_set_prescalers(dev);
 
@@ -3520,7 +3599,7 @@ static int cdns_i3c_bus_init(const struct device *dev)
 	default:
 		return -EINVAL;
 	}
-
+#endif
 	/*
 	 * When a Hot-Join request happens, disable all events coming from this device.
 	 * We will issue ENTDAA afterwards from the threaded IRQ handler.
@@ -3528,15 +3607,20 @@ static int cdns_i3c_bus_init(const struct device *dev)
 	 *
 	 * Set the I3C Bus Mode based on the LVR of the I2C devices
 	 */
-	uint32_t ctrl =
-		CTRL_HJ_DISEC | CTRL_MCS_EN | CTRL_MST_ACK | (CTRL_BUS_MODE_MASK & cdns_mode);
+	uint32_t ctrl = CTRL_HJ_DISEC | CTRL_MCS_EN;
+#if defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)
+	ctrl |= CTRL_MST_ACK;
+#endif
 
+#ifdef CONFIG_I3C_CONTROLLER
+	ctrl |= (CTRL_BUS_MODE_MASK & cdns_mode);
 	/*
 	 * Cadence I3C release r104v1p0 and above support configuration of the sda data hold time
 	 */
 	if (REV_ID_REV(data->hw_cfg.rev_id) >= REV_ID_VERSION(1, 4)) {
 		ctrl |= CTRL_THD_DELAY(cdns_i3c_sda_data_hold(dev));
 	}
+#endif /* CONFIG_I3C_CONTROLLER */
 
 	/*
 	 * Cadence I3C release r105v1p0 and above support I3C v1.1 timing change
@@ -3554,8 +3638,8 @@ static int cdns_i3c_bus_init(const struct device *dev)
 	sys_write32(CTRL_DEV_EN | ctrl, config->base + CTRL);
 
 	/* Set fifo thresholds. */
-	sys_write32(CMD_THR(I3C_CMDD_THR) | IBI_THR(I3C_IBID_THR) | CMDR_THR(I3C_CMDR_THR) |
-			    IBIR_THR(config->ibid_thr),
+	sys_write32(CMD_THR(I3C_CMDD_THR) | IBI_THR(config->ibid_thr) | CMDR_THR(I3C_CMDR_THR) |
+			    IBIR_THR(I3C_IBIR_THR),
 		    config->base + CMD_IBI_THR_CTRL);
 
 	/* Set TX/RX interrupt thresholds. */
@@ -3567,7 +3651,7 @@ static int cdns_i3c_bus_init(const struct device *dev)
 		sys_write32(SLV_DDR_TX_THR(0) | SLV_DDR_RX_THR(1),
 			    config->base + SLV_DDR_TX_RX_THR_CTRL);
 	}
-
+#ifdef CONFIG_I3C_TARGET
 	/* enable target interrupts */
 	sys_write32(SLV_INT_DA_UPD | SLV_INT_SDR_RD_COMP | SLV_INT_SDR_WR_COMP |
 			    SLV_INT_SDR_RX_THR | SLV_INT_SDR_TX_THR | SLV_INT_SDR_RX_UNF |
@@ -3575,7 +3659,8 @@ static int cdns_i3c_bus_init(const struct device *dev)
 			    SLV_INT_DEFSLVS | SLV_INT_DDR_WR_COMP | SLV_INT_DDR_RD_COMP |
 			    SLV_INT_DDR_RX_THR | SLV_INT_DDR_TX_THR,
 		    config->base + SLV_IER);
-
+#endif /* CONFIG_I3C_TARGET */
+#ifdef CONFIG_I3C_CONTROLLER
 	/* Enable controller interrupts. */
 	sys_write32(MST_INT_IBIR_THR | MST_INT_RX_UNF | MST_INT_HALTED | MST_INT_MR_DONE |
 			    MST_INT_TX_OVF | MST_INT_IBIR_OVF | MST_INT_IBID_THR,
@@ -3600,20 +3685,22 @@ static int cdns_i3c_bus_init(const struct device *dev)
 		sys_write32(CTRL_HJ_ACK | sys_read32(config->base + CTRL), config->base + CTRL);
 #endif
 	}
-
+#endif /* CONFIG_I3C_CONTROLLER */
 	return 0;
 }
 
 static DEVICE_API(i3c, api) = {
+#ifdef CONFIG_I3C_CONTROLLER
 	.i2c_api.configure = cdns_i3c_i2c_api_configure,
 	.i2c_api.transfer = cdns_i3c_i2c_api_transfer,
 #ifdef CONFIG_I2C_RTIO
 	.i2c_api.iodev_submit = i2c_iodev_submit_fallback,
 #endif
+#endif /* CONFIG_I3C_CONTROLLER */
 
 	.configure = cdns_i3c_configure,
 	.config_get = cdns_i3c_config_get,
-
+#ifdef CONFIG_I3C_CONTROLLER
 	.attach_i3c_device = cdns_i3c_attach_device,
 	.reattach_i3c_device = cdns_i3c_reattach_device,
 	.detach_i3c_device = cdns_i3c_detach_device,
@@ -3626,17 +3713,24 @@ static DEVICE_API(i3c, api) = {
 	.i3c_device_find = cdns_i3c_device_find,
 
 	.i3c_xfers = cdns_i3c_transfer,
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
 	.target_tx_write = cdns_i3c_target_tx_write,
 	.target_register = cdns_i3c_target_register,
 	.target_unregister = cdns_i3c_target_unregister,
+#ifdef CONFIG_I3C_CONTROLLER
 	.target_controller_handoff = cdns_i3c_target_controller_handoff,
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_TARGET */
 #ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_CONTROLLER
 	.ibi_hj_response = cdns_i3c_ibi_hj_response,
 	.ibi_enable = cdns_i3c_controller_ibi_enable,
 	.ibi_disable = cdns_i3c_controller_ibi_disable,
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
 	.ibi_raise = cdns_i3c_target_ibi_raise,
+#endif /* CONFIG_I3C_TARGET */
 #endif
 
 #ifdef CONFIG_I3C_RTIO
@@ -3646,22 +3740,26 @@ static DEVICE_API(i3c, api) = {
 
 #define CADENCE_I3C_INSTANTIATE(n)                                                                 \
 	static void cdns_i3c_config_func_##n(const struct device *dev);                            \
-	static struct i3c_device_desc cdns_i3c_device_array_##n[] = I3C_DEVICE_ARRAY_DT_INST(n);   \
+	IF_ENABLED(CONFIG_I3C_CONTROLLER,                                                          \
+	(static struct i3c_device_desc cdns_i3c_device_array_##n[] = I3C_DEVICE_ARRAY_DT_INST(n);  \
 	static struct i3c_i2c_device_desc cdns_i3c_i2c_device_array_##n[] =                        \
-		I3C_I2C_DEVICE_ARRAY_DT_INST(n);                                                   \
+		I3C_I2C_DEVICE_ARRAY_DT_INST(n);))                                                 \
 	static const struct cdns_i3c_config i3c_config_##n = {                                     \
 		.base = DT_INST_REG_ADDR(n),                                                       \
 		.input_frequency = DT_INST_PROP(n, input_clock_frequency),                         \
 		.irq_config_func = cdns_i3c_config_func_##n,                                       \
 		.ibid_thr = DT_INST_PROP(n, ibid_thr),                                             \
-		.common.dev_list.i3c = cdns_i3c_device_array_##n,                                  \
-		.common.dev_list.num_i3c = ARRAY_SIZE(cdns_i3c_device_array_##n),                  \
-		.common.dev_list.i2c = cdns_i3c_i2c_device_array_##n,                              \
-		.common.dev_list.num_i2c = ARRAY_SIZE(cdns_i3c_i2c_device_array_##n),              \
+		IF_ENABLED(CONFIG_I3C_CONTROLLER,                                                  \
+			(.common.dev_list.i3c = cdns_i3c_device_array_##n,                         \
+			.common.dev_list.num_i3c = ARRAY_SIZE(cdns_i3c_device_array_##n),          \
+			.common.dev_list.i2c = cdns_i3c_i2c_device_array_##n,                      \
+			.common.dev_list.num_i2c = ARRAY_SIZE(cdns_i3c_i2c_device_array_##n),      \
+			.common.primary_controller_da = DT_INST_PROP_OR(n, primary_controller_da, 0x00),)) \
 	};                                                                                         \
 	static struct cdns_i3c_data i3c_data_##n = {                                               \
-		.common.ctrl_config.scl.i3c = DT_INST_PROP_OR(n, i3c_scl_hz, 0),                   \
-		.common.ctrl_config.scl.i2c = DT_INST_PROP_OR(n, i2c_scl_hz, 0),                   \
+		IF_ENABLED(CONFIG_I3C_CONTROLLER,                                                  \
+			(.common.ctrl_config.scl.i3c = DT_INST_PROP(n, i3c_scl_hz),                \
+			.common.ctrl_config.scl.i2c = DT_INST_PROP(n, i2c_scl_hz),))               \
 	};                                                                                         \
 	DEVICE_DT_INST_DEFINE(n, cdns_i3c_bus_init, NULL, &i3c_data_##n, &i3c_config_##n,          \
 			      POST_KERNEL, CONFIG_I3C_CONTROLLER_INIT_PRIORITY, &api);             \
diff --git a/drivers/i3c/i3c_common.c b/drivers/i3c/i3c_common.c
index 8a5b1234e4ffc..2f1b402a6eec1 100644
--- a/drivers/i3c/i3c_common.c
+++ b/drivers/i3c/i3c_common.c
@@ -17,23 +17,21 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i3c, CONFIG_I3C_LOG_LEVEL);
 
-void i3c_dump_msgs(const char *name, const struct i3c_msg *msgs,
-		   uint8_t num_msgs, struct i3c_device_desc *target)
+void i3c_dump_msgs(const char *name, const struct i3c_msg *msgs, uint8_t num_msgs,
+		   struct i3c_device_desc *target)
 {
 	LOG_DBG("I3C msg: %s, addr=%x", name, target->dynamic_addr);
 	for (unsigned int i = 0; i < num_msgs; i++) {
 		const struct i3c_msg *msg = &msgs[i];
 
-		LOG_DBG("   %c len=%02x: ",
-			msg->flags & I3C_MSG_READ ? 'R' : 'W', msg->len);
+		LOG_DBG("   %c len=%02x: ", msg->flags & I3C_MSG_READ ? 'R' : 'W', msg->len);
 		if (!(msg->flags & I3C_MSG_READ)) {
 			LOG_HEXDUMP_DBG(msg->buf, msg->len, "contents:");
 		}
 	}
 }
 
-void i3c_addr_slots_set(struct i3c_addr_slots *slots,
-			uint8_t dev_addr,
+void i3c_addr_slots_set(struct i3c_addr_slots *slots, uint8_t dev_addr,
 			enum i3c_addr_slot_status status)
 {
 	int bitpos;
@@ -54,9 +52,7 @@ void i3c_addr_slots_set(struct i3c_addr_slots *slots,
 	slots->slots[idx] |= status << bitpos;
 }
 
-enum i3c_addr_slot_status
-i3c_addr_slots_status(struct i3c_addr_slots *slots,
-		      uint8_t dev_addr)
+enum i3c_addr_slot_status i3c_addr_slots_status(struct i3c_addr_slots *slots, uint8_t dev_addr)
 {
 	unsigned long status;
 	int bitpos;
@@ -82,13 +78,10 @@ i3c_addr_slots_status(struct i3c_addr_slots *slots,
 	return status;
 }
 
-
 int i3c_addr_slots_init(const struct device *dev)
 {
-	struct i3c_driver_data *data =
-		(struct i3c_driver_data *)dev->data;
-	const struct i3c_driver_config *config =
-		(const struct i3c_driver_config *)dev->config;
+	struct i3c_driver_data *data = (struct i3c_driver_data *)dev->data;
+	const struct i3c_driver_config *config = (const struct i3c_driver_config *)dev->config;
 	int i, ret = 0;
 	struct i3c_device_desc *i3c_dev;
 	struct i3c_i2c_device_desc *i2c_dev;
@@ -110,7 +103,6 @@ int i3c_addr_slots_init(const struct device *dev)
 		 */
 		i3c_addr_slots_set(&data->attached_dev.addr_slots, I3C_BROADCAST_ADDR ^ BIT(i),
 				   I3C_ADDR_SLOT_STATUS_RSVD);
-
 	}
 
 	/* The broadcast address is reserved */
@@ -149,8 +141,7 @@ int i3c_addr_slots_init(const struct device *dev)
 	return ret;
 }
 
-bool i3c_addr_slots_is_free(struct i3c_addr_slots *slots,
-			    uint8_t dev_addr)
+bool i3c_addr_slots_is_free(struct i3c_addr_slots *slots, uint8_t dev_addr)
 {
 	enum i3c_addr_slot_status status;
 
@@ -198,8 +189,7 @@ struct i3c_device_desc *i3c_dev_list_find(const struct i3c_dev_list *dev_list,
 	return ret;
 }
 
-struct i3c_device_desc *i3c_dev_list_i3c_addr_find(const struct device *dev,
-						   uint8_t addr)
+struct i3c_device_desc *i3c_dev_list_i3c_addr_find(const struct device *dev, uint8_t addr)
 {
 	struct i3c_device_desc *ret = NULL;
 	struct i3c_device_desc *desc;
@@ -216,8 +206,24 @@ struct i3c_device_desc *i3c_dev_list_i3c_addr_find(const struct device *dev,
 	return ret;
 }
 
-struct i3c_i2c_device_desc *i3c_dev_list_i2c_addr_find(const struct device *dev,
-							   uint16_t addr)
+struct i3c_device_desc *i3c_dev_list_i3c_static_addr_find(const struct device *dev, uint8_t addr)
+{
+	struct i3c_device_desc *ret = NULL;
+	struct i3c_device_desc *desc;
+
+	__ASSERT_NO_MSG(dev != NULL);
+
+	I3C_BUS_FOR_EACH_I3CDEV(dev, desc) {
+		if (desc->static_addr == addr) {
+			ret = desc;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+struct i3c_i2c_device_desc *i3c_dev_list_i2c_addr_find(const struct device *dev, uint16_t addr)
 {
 	struct i3c_i2c_device_desc *ret = NULL;
 	struct i3c_i2c_device_desc *desc;
@@ -382,9 +388,9 @@ int i3c_detach_i2c_device(struct i3c_i2c_device_desc *target)
 
 	return status;
 }
-
-int i3c_sec_get_basic_info(const struct device *dev,
-	uint8_t dynamic_addr, uint8_t static_addr, uint8_t bcr, uint8_t dcr)
+#ifdef CONFIG_I3C_TARGET
+int i3c_sec_get_basic_info(const struct device *dev, uint8_t dynamic_addr, uint8_t static_addr,
+			   uint8_t bcr, uint8_t dcr)
 {
 	struct i3c_ccc_getpid getpid;
 	struct i3c_device_desc temp_desc;
@@ -393,11 +399,11 @@ int i3c_sec_get_basic_info(const struct device *dev,
 	const struct i3c_driver_config *config = dev->config;
 	int ret;
 
-	*(const struct device **)&temp_desc.bus = dev;
+	temp_desc.bus = dev;
 	temp_desc.dynamic_addr = dynamic_addr;
 	temp_desc.bcr = bcr;
 	temp_desc.dcr = dcr;
-	/* attach it first with a temperary value so we can at least get the pid */
+	/* attach it first with a temporary value so we can at least get the pid */
 	ret = i3c_attach_i3c_device(&temp_desc);
 	if (ret != 0) {
 		return ret;
@@ -409,7 +415,7 @@ int i3c_sec_get_basic_info(const struct device *dev,
 		return ret;
 	}
 
-	*(uint64_t *)&id = sys_get_be48(getpid.pid);
+	id.pid = sys_get_be48(getpid.pid);
 
 	/* try to see if we already have a device statically allocated */
 	desc = i3c_dev_list_find(&config->dev_list, &id);
@@ -419,8 +425,8 @@ int i3c_sec_get_basic_info(const struct device *dev,
 		if (!desc) {
 			return -ENOMEM;
 		}
-		*(uint64_t *)&desc->pid = id.pid;
-		*(uint16_t *)&temp_desc.static_addr = (uint16_t)static_addr;
+		desc->pid = id.pid;
+		temp_desc.static_addr = (uint16_t)static_addr;
 	}
 	desc->dynamic_addr = dynamic_addr;
 	desc->bcr = bcr;
@@ -456,8 +462,8 @@ int i3c_sec_i2c_attach(const struct device *dev, uint8_t static_addr, uint8_t lv
 			return -ENOMEM;
 		}
 		*(const struct device **)&i2c_desc->bus = dev;
-		*(uint16_t *)&i2c_desc->addr = (uint16_t)static_addr;
-		*(uint8_t *)&i2c_desc->lvr = lvr;
+		i2c_desc->addr = (uint16_t)static_addr;
+		i2c_desc->lvr = lvr;
 	}
 
 	ret = i3c_attach_i2c_device(i2c_desc);
@@ -505,7 +511,7 @@ void i3c_sec_handoffed(struct k_work *work)
 	/*
 	 * Retrieve the active controller information
 	 */
-	ret = i3c_config_get(dev, I3C_CONFIG_TARGET, &config_target);
+	ret = i3c_config_get_target(dev, &config_target);
 	if (ret != 0) {
 		LOG_ERR("Failed to retrieve active controller info");
 		return;
@@ -514,10 +520,9 @@ void i3c_sec_handoffed(struct k_work *work)
 	cur_dyn_addr = config_target.dynamic_addr;
 
 	/* Attach the previous AC */
-	ret = i3c_sec_get_basic_info(dev, deftgts->active_controller.addr,
-				deftgts->active_controller.static_addr,
-				deftgts->active_controller.bcr,
-				deftgts->active_controller.dcr);
+	ret = i3c_sec_get_basic_info(
+		dev, deftgts->active_controller.addr, deftgts->active_controller.static_addr,
+		deftgts->active_controller.bcr, deftgts->active_controller.dcr);
 
 	/* Attach all Targets */
 	for (n = 0; n < deftgts->count; n++) {
@@ -525,27 +530,26 @@ void i3c_sec_handoffed(struct k_work *work)
 			/* Must be an I3C device and skip itself */
 			if (deftgts->targets[n].addr != cur_dyn_addr) {
 				ret = i3c_sec_get_basic_info(dev, deftgts->targets[n].addr,
-					deftgts->targets[n].static_addr, deftgts->targets[n].bcr,
-					deftgts->targets[n].dcr);
+							     deftgts->targets[n].static_addr,
+							     deftgts->targets[n].bcr,
+							     deftgts->targets[n].dcr);
 			}
 		} else {
 			/* Must be an I2C device */
 			ret = i3c_sec_i2c_attach(dev, deftgts->targets[n].static_addr,
-				deftgts->targets[n].lvr);
+						 deftgts->targets[n].lvr);
 		}
 	}
 
 	/* Set false, so the next handoff doesn't retrigger regathering info */
 	data->deftgts_refreshed = false;
 }
-#endif
+#endif /* CONFIG_I3C_USE_IBI */
+#endif /* CONFIG_I3C_TARGET */
 
 int i3c_dev_list_daa_addr_helper(struct i3c_addr_slots *addr_slots,
-				 const struct i3c_dev_list *dev_list,
-				 uint64_t pid, bool must_match,
-				 bool assigned_okay,
-				 struct i3c_device_desc **target,
-				 uint8_t *addr)
+				 const struct i3c_dev_list *dev_list, uint64_t pid, bool must_match,
+				 bool assigned_okay, struct i3c_device_desc **target, uint8_t *addr)
 {
 	struct i3c_device_desc *desc;
 	const uint16_t vendor_id = (uint16_t)(pid >> 32);
@@ -566,8 +570,7 @@ int i3c_dev_list_daa_addr_helper(struct i3c_addr_slots *addr_slots,
 		 */
 		ret = -ENODEV;
 
-		LOG_DBG("PID 0x%04x%08x is not in registered device list",
-			vendor_id, part_no);
+		LOG_DBG("PID 0x%04x%08x is not in registered device list", vendor_id, part_no);
 
 		goto out;
 	}
@@ -620,7 +623,7 @@ int i3c_dev_list_daa_addr_helper(struct i3c_addr_slots *addr_slots,
 err:
 	return ret;
 }
-
+#ifdef CONFIG_I3C_TARGET
 uint8_t i3c_odd_parity(uint8_t p)
 {
 	p ^= p >> 4;
@@ -738,7 +741,7 @@ int i3c_device_controller_handoff(const struct i3c_device_desc *target, bool req
 
 	return ret;
 }
-
+#endif /* CONFIG_I3C_TARGET */
 int i3c_device_basic_info_get(struct i3c_device_desc *target)
 {
 	int ret;
@@ -774,33 +777,33 @@ int i3c_device_adv_info_get(struct i3c_device_desc *target)
 	/* GETMRL */
 	if (i3c_ccc_do_getmrl(target, &mrl) != 0) {
 		/* GETMRL may be optionally supported if no settable limit */
-		LOG_DBG("No settable limit for GETMRL");
+		LOG_DBG("%s: No settable limit for GETMRL", target->dev->name);
 	}
 
 	/* GETMWL */
 	if (i3c_ccc_do_getmwl(target, &mwl) != 0) {
 		/* GETMWL may be optionally supported if no settable limit */
-		LOG_DBG("No settable limit for GETMWL");
+		LOG_DBG("%s: No settable limit for GETMWL", target->dev->name);
 	}
 
 	/* GETCAPS */
-	ret = i3c_ccc_do_getcaps_fmt1(target, &caps);
-	/*
-	 * GETCAPS (GETHDRCAP) is required to be supported for I3C v1.0 targets that support HDR
-	 * modes and required if the Target's I3C version is v1.1 or later, but which the version it
-	 * supports it can't be known ahead of time. So if the BCR bit for Advanced capabilities is
-	 * set, then it is expected for GETCAPS to always be supported. Otherwise, then it's a I3C
-	 * v1.0 device without any HDR modes so do not treat as an error if no valid response.
-	 */
-	if ((ret != 0) && (target->bcr & I3C_BCR_ADV_CAPABILITIES)) {
-		return ret;
-	} else {
-		ret = 0;
+	if (((target->flags & I3C_V1P0_SUPPORT) && (target->bcr & I3C_BCR_ADV_CAPABILITIES)) ||
+	    (!(target->flags & I3C_V1P0_SUPPORT))) {
+		/*
+		 * GETCAPS (GETHDRCAP) is required to be supported for I3C v1.0 targets that support
+		 * HDR modes and required if the Target's I3C version is v1.1 or later.
+		 * It is also possible for this function to be called on an 'unknown' device such as
+		 * from a secondary controller gathering info about a target it found about through
+		 * DEFTGTS, and it can't be known ahead of time if it is a v1.0 or v1.1 device.
+		 */
+		if (i3c_ccc_do_getcaps_fmt1(target, &caps) != 0) {
+			LOG_DBG("%s: GETCAPS not received", target->dev->name);
+		}
 	}
 
 	/* CRCAPS */
 	if ((target->getcaps.getcap3 & I3C_CCC_GETCAPS3_GETCAPS_DEFINING_BYTE_SUPPORT) &&
-		    (i3c_device_is_controller_capable(target))) {
+	    (i3c_device_is_controller_capable(target))) {
 		ret = i3c_ccc_do_getcaps_fmt2(target, &caps, GETCAPS_FORMAT_2_CRCAPS);
 		if (ret != 0) {
 			return ret;
@@ -842,8 +845,7 @@ int i3c_device_adv_info_get(struct i3c_device_desc *target)
  *
  * @retval 0 if successful.
  */
-static int i3c_bus_setdasa(const struct device *dev,
-			   const struct i3c_dev_list *dev_list,
+static int i3c_bus_setdasa(const struct device *dev, const struct i3c_dev_list *dev_list,
 			   bool *need_daa, bool *need_aasa)
 {
 	int i, ret;
@@ -871,8 +873,9 @@ static int i3c_bus_setdasa(const struct device *dev,
 		 * address as its static address if a different dynamic address
 		 * is not requested
 		 */
-		if ((desc->supports_setaasa) && ((desc->init_dynamic_addr == 0) ||
-					       desc->init_dynamic_addr == desc->static_addr)) {
+		if ((desc->flags & I3C_SUPPORTS_SETAASA) &&
+		    ((desc->init_dynamic_addr == 0) ||
+		     desc->init_dynamic_addr == desc->static_addr)) {
 			*need_aasa = true;
 			continue;
 		}
@@ -884,9 +887,9 @@ static int i3c_bus_setdasa(const struct device *dev,
 		 * if configured
 		 */
 		if ((desc->init_dynamic_addr != 0) &&
-			(desc->init_dynamic_addr != desc->static_addr)) {
+		    (desc->init_dynamic_addr != desc->static_addr)) {
 			if (!i3c_addr_slots_is_free(&bus_data->attached_dev.addr_slots,
-				desc->init_dynamic_addr)) {
+						    desc->init_dynamic_addr)) {
 				if (i3c_detach_i3c_device(desc) != 0) {
 					LOG_ERR("Failed to detach %s", desc->dev->name);
 				}
@@ -898,8 +901,9 @@ static int i3c_bus_setdasa(const struct device *dev,
 		 * Note that the 7-bit address needs to start at bit 1
 		 * (aka left-justified). So shift left by 1;
 		 */
-		dyn_addr.addr = (desc->init_dynamic_addr ?
-					desc->init_dynamic_addr : desc->static_addr) << 1;
+		dyn_addr.addr =
+			(desc->init_dynamic_addr ? desc->init_dynamic_addr : desc->static_addr)
+			<< 1;
 
 		ret = i3c_ccc_do_setdasa(desc, dyn_addr);
 		if (ret == 0) {
@@ -914,8 +918,7 @@ static int i3c_bus_setdasa(const struct device *dev,
 			if (i3c_detach_i3c_device(desc) != 0) {
 				LOG_ERR("Failed to detach %s (%d)", desc->dev->name, ret);
 			}
-			LOG_ERR("SETDASA error on address 0x%x (%d)",
-				desc->static_addr, ret);
+			LOG_ERR("SETDASA error on address 0x%x (%d)", desc->static_addr, ret);
 		}
 	}
 
@@ -934,7 +937,7 @@ bool i3c_bus_has_sec_controller(const struct device *dev)
 
 	return false;
 }
-
+#ifdef CONFIG_I3C_TARGET
 int i3c_bus_deftgts(const struct device *dev)
 {
 	struct i3c_driver_data *data = (struct i3c_driver_data *)dev->data;
@@ -946,9 +949,8 @@ int i3c_bus_deftgts(const struct device *dev)
 	uint8_t n = 0;
 	size_t num_of_targets = sys_slist_len(&data->attached_dev.devices.i3c) +
 				sys_slist_len(&data->attached_dev.devices.i2c);
-	size_t data_len = sizeof(uint8_t) +
-				   sizeof(struct i3c_ccc_deftgts_active_controller) +
-				   (num_of_targets * sizeof(struct i3c_ccc_deftgts_target));
+	size_t data_len = sizeof(uint8_t) + sizeof(struct i3c_ccc_deftgts_active_controller) +
+			  (num_of_targets * sizeof(struct i3c_ccc_deftgts_target));
 
 	/*
 	 * Retrieve the active controller information
@@ -1008,7 +1010,7 @@ int i3c_bus_deftgts(const struct device *dev)
 
 	return ret;
 }
-
+#endif /* CONFIG_I3C_TARGET */
 int i3c_bus_init(const struct device *dev, const struct i3c_dev_list *dev_list)
 {
 	int i, ret = 0;
@@ -1070,13 +1072,16 @@ int i3c_bus_init(const struct device *dev, const struct i3c_dev_list *dev_list)
 	if (need_aasa) {
 		ret = i3c_ccc_do_setaasa_all(dev);
 		if (ret != 0) {
+			LOG_ERR("failed to perform setaasa");
+		} else {
 			for (i = 0; i < dev_list->num_i3c; i++) {
 				struct i3c_device_desc *desc = &dev_list->i3c[i];
 				/*
 				 * Only set for devices that support SETAASA and do not
 				 * request a different dynamic address than its SA
 				 */
-				if ((desc->supports_setaasa) && (desc->static_addr != 0) &&
+				if ((desc->flags & I3C_SUPPORTS_SETAASA) &&
+				    (desc->static_addr != 0) &&
 				    ((desc->init_dynamic_addr == 0) ||
 				     desc->init_dynamic_addr == desc->static_addr)) {
 					desc->dynamic_addr = desc->static_addr;
@@ -1126,23 +1131,21 @@ int i3c_bus_init(const struct device *dev, const struct i3c_dev_list *dev_list)
 		ret = (desc->static_addr == 0) ? i3c_device_adv_info_get(desc)
 					       : i3c_device_info_get(desc);
 		if (ret != 0) {
-			LOG_ERR("Error getting device info for 0x%02x",
-				desc->static_addr);
+			LOG_ERR("Error getting device info for 0x%02x", desc->static_addr);
 		} else {
 			LOG_DBG("Target 0x%02x, BCR 0x%02x, DCR 0x%02x, MRL %d, MWL %d, IBI %d",
-				desc->dynamic_addr, desc->bcr, desc->dcr,
-				desc->data_length.mrl, desc->data_length.mwl,
-				desc->data_length.max_ibi);
+				desc->dynamic_addr, desc->bcr, desc->dcr, desc->data_length.mrl,
+				desc->data_length.mwl, desc->data_length.max_ibi);
 		}
 	}
-
+#ifdef CONFIG_I3C_TARGET
 	if (i3c_bus_has_sec_controller(dev)) {
 		ret = i3c_bus_deftgts(dev);
 		if (ret != 0) {
 			LOG_ERR("Error sending DEFTGTS");
 		}
 	}
-
+#endif /* CONFIG_I3C_TARGET */
 	/*
 	 * Only re-enable Hot-Join from targets.
 	 * Target interrupts will be enabled when IBI is enabled.
diff --git a/drivers/i3c/i3c_dw.c b/drivers/i3c/i3c_dw.c
new file mode 100644
index 0000000000000..4d13ec2e79170
--- /dev/null
+++ b/drivers/i3c/i3c_dw.c
@@ -0,0 +1,2512 @@
+/*
+ * Copyright (C) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (C) 2023 Meta Platforms
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/i3c.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/util.h>
+#include <assert.h>
+
+#if defined(CONFIG_PINCTRL)
+#include <zephyr/drivers/pinctrl.h>
+#endif
+
+#define NANO_SEC        1000000000ULL
+#define BYTES_PER_DWORD 4
+
+LOG_MODULE_REGISTER(i3c_dw, CONFIG_I3C_DW_LOG_LEVEL);
+
+#define DEVICE_CTRL                0x0
+#define DEV_CTRL_ENABLE            BIT(31)
+#define DEV_CTRL_RESUME            BIT(30)
+#define DEV_CTRL_HOT_JOIN_NACK     BIT(8)
+#define DEV_CTRL_I2C_SLAVE_PRESENT BIT(7)
+#define DEV_CTRL_IBA_INCLUDE       BIT(0)
+
+#define DEVICE_ADDR                    0x4
+#define DEVICE_ADDR_DYNAMIC_ADDR_VALID BIT(31)
+#define DEVICE_ADDR_DYNAMIC(x)         (((x) << 16) & GENMASK(22, 16))
+#define DEVICE_ADDR_STATIC_ADDR_VALID  BIT(15)
+#define DEVICE_ADDR_STATIC_MASK        GENMASK(6, 0)
+#define DEVICE_ADDR_STATIC(x)          ((x) & DEVICE_ADDR_STATIC_MASK)
+
+#define HW_CAPABILITY                         0x8
+#define HW_CAPABILITY_SLV_IBI_CAP             BIT(19)
+#define HW_CAPABILITY_SLV_HJ_CAP              BIT(18)
+#define HW_CAPABILITY_HDR_TS_EN               BIT(4)
+#define HW_CAPABILITY_HDR_DDR_EN              BIT(3)
+#define HW_CAPABILITY_DEVICE_ROLE_CONFIG_MASK GENMASK(2, 0)
+
+#define COMMAND_QUEUE_PORT         0xc
+#define COMMAND_PORT_TOC           BIT(30)
+#define COMMAND_PORT_READ_TRANSFER BIT(28)
+#define COMMAND_PORT_SDAP          BIT(27)
+#define COMMAND_PORT_ROC           BIT(26)
+#define COMMAND_PORT_DBP           BIT(25)
+#define COMMAND_PORT_SPEED(x)      (((x) << 21) & GENMASK(23, 21))
+#define COMMAND_PORT_SPEED_I2C_FM  0
+#define COMMAND_PORT_SPEED_I2C_FMP 1
+#define COMMAND_PORT_SPEED_I3C_DDR 6
+#define COMMAND_PORT_SPEED_I3C_TS  7
+#define COMMAND_PORT_DEV_INDEX(x)  (((x) << 16) & GENMASK(20, 16))
+#define COMMAND_PORT_CP            BIT(15)
+#define COMMAND_PORT_CMD(x)        (((x) << 7) & GENMASK(14, 7))
+#define COMMAND_PORT_TID(x)        (((x) << 3) & GENMASK(6, 3))
+
+#define COMMAND_PORT_ARG_DATA_LEN(x)  (((x) << 16) & GENMASK(31, 16))
+#define COMMAND_PORT_ARG_DB(x)        (((x) << 8) & GENMASK(15, 8))
+#define COMMAND_PORT_ARG_DATA_LEN_MAX 65536
+#define COMMAND_PORT_TRANSFER_ARG     0x01
+
+#define COMMAND_PORT_SDA_DATA_BYTE_3(x) (((x) << 24) & GENMASK(31, 24))
+#define COMMAND_PORT_SDA_DATA_BYTE_2(x) (((x) << 16) & GENMASK(23, 16))
+#define COMMAND_PORT_SDA_DATA_BYTE_1(x) (((x) << 8) & GENMASK(15, 8))
+#define COMMAND_PORT_SDA_BYTE_STRB_3    BIT(5)
+#define COMMAND_PORT_SDA_BYTE_STRB_2    BIT(4)
+#define COMMAND_PORT_SDA_BYTE_STRB_1    BIT(3)
+#define COMMAND_PORT_SHORT_DATA_ARG     0x02
+
+#define COMMAND_PORT_DEV_COUNT(x)   (((x) << 21) & GENMASK(25, 21))
+#define COMMAND_PORT_ADDR_ASSGN_CMD 0x03
+
+#define RESPONSE_QUEUE_PORT            0x10
+#define RESPONSE_PORT_ERR_STATUS(x)    (((x) & GENMASK(31, 28)) >> 28)
+#define RESPONSE_NO_ERROR              0
+#define RESPONSE_ERROR_CRC             1
+#define RESPONSE_ERROR_PARITY          2
+#define RESPONSE_ERROR_FRAME           3
+#define RESPONSE_ERROR_IBA_NACK        4
+#define RESPONSE_ERROR_ADDRESS_NACK    5
+#define RESPONSE_ERROR_OVER_UNDER_FLOW 6
+#define RESPONSE_ERROR_TRANSF_ABORT    8
+#define RESPONSE_ERROR_I2C_W_NACK_ERR  9
+#define RESPONSE_PORT_TID(x)           (((x) & GENMASK(27, 24)) >> 24)
+#define RESPONSE_PORT_DATA_LEN(x)      ((x) & GENMASK(15, 0))
+
+#define RX_TX_DATA_PORT              0x14
+#define IBI_QUEUE_STATUS             0x18
+#define IBI_QUEUE_STATUS_IBI_STS(x)  (((x) & GENMASK(31, 28)) >> 28)
+#define IBI_QUEUE_STATUS_IBI_ID(x)   (((x) & GENMASK(15, 8)) >> 8)
+#define IBI_QUEUE_STATUS_DATA_LEN(x) ((x) & GENMASK(7, 0))
+#define IBI_QUEUE_IBI_ADDR(x)        (IBI_QUEUE_STATUS_IBI_ID(x) >> 1)
+#define IBI_QUEUE_IBI_RNW(x)         (IBI_QUEUE_STATUS_IBI_ID(x) & BIT(0))
+#define IBI_TYPE_MR(x) \
+	((IBI_QUEUE_IBI_ADDR(x) != I3C_HOT_JOIN_ADDR) && !IBI_QUEUE_IBI_RNW(x))
+#define IBI_TYPE_HJ(x) \
+	((IBI_QUEUE_IBI_ADDR(x) == I3C_HOT_JOIN_ADDR) && !IBI_QUEUE_IBI_RNW(x))
+#define IBI_TYPE_SIRQ(x) \
+	((IBI_QUEUE_IBI_ADDR(x) != I3C_HOT_JOIN_ADDR) && IBI_QUEUE_IBI_RNW(x))
+
+#define QUEUE_THLD_CTRL               0x1c
+#define QUEUE_THLD_CTRL_IBI_STS_MASK  GENMASK(31, 24)
+#define QUEUE_THLD_CTRL_RESP_BUF_MASK GENMASK(15, 8)
+#define QUEUE_THLD_CTRL_RESP_BUF(x)   (((x) - 1) << 8)
+
+#define DATA_BUFFER_THLD_CTRL        0x20
+#define DATA_BUFFER_THLD_CTRL_RX_BUF GENMASK(11, 8)
+
+#define IBI_QUEUE_CTRL     0x24
+#define IBI_MR_REQ_REJECT  0x2C
+#define IBI_SIR_REQ_REJECT 0x30
+#define IBI_SIR_REQ_ID(x)  ((((x) & GENMASK(6, 5)) >> 5) + ((x) & GENMASK(4, 0)))
+#define IBI_REQ_REJECT_ALL GENMASK(31, 0)
+
+#define RESET_CTRL            0x34
+#define RESET_CTRL_IBI_QUEUE  BIT(5)
+#define RESET_CTRL_RX_FIFO    BIT(4)
+#define RESET_CTRL_TX_FIFO    BIT(3)
+#define RESET_CTRL_RESP_QUEUE BIT(2)
+#define RESET_CTRL_CMD_QUEUE  BIT(1)
+#define RESET_CTRL_SOFT       BIT(0)
+#define RESET_CTRL_ALL                                                                             \
+	(RESET_CTRL_IBI_QUEUE | RESET_CTRL_RX_FIFO | RESET_CTRL_TX_FIFO | RESET_CTRL_RESP_QUEUE |  \
+	 RESET_CTRL_CMD_QUEUE | RESET_CTRL_SOFT)
+
+#define SLV_EVENT_STATUS        0x38
+#define SLV_EVENT_STATUS_HJ_EN  BIT(3)
+#define SLV_EVENT_STATUS_MR_EN  BIT(1)
+#define SLV_EVENT_STATUS_SIR_EN BIT(0)
+
+#define INTR_STATUS               0x3c
+#define INTR_STATUS_EN            0x40
+#define INTR_SIGNAL_EN            0x44
+#define INTR_FORCE                0x48
+#define INTR_BUSOWNER_UPDATE_STAT BIT(13)
+#define INTR_IBI_UPDATED_STAT     BIT(12)
+#define INTR_READ_REQ_RECV_STAT   BIT(11)
+#define INTR_DEFSLV_STAT          BIT(10)
+#define INTR_TRANSFER_ERR_STAT    BIT(9)
+#define INTR_DYN_ADDR_ASSGN_STAT  BIT(8)
+#define INTR_CCC_UPDATED_STAT     BIT(6)
+#define INTR_TRANSFER_ABORT_STAT  BIT(5)
+#define INTR_RESP_READY_STAT      BIT(4)
+#define INTR_CMD_QUEUE_READY_STAT BIT(3)
+#define INTR_IBI_THLD_STAT        BIT(2)
+#define INTR_RX_THLD_STAT         BIT(1)
+#define INTR_TX_THLD_STAT         BIT(0)
+#define INTR_ALL                                                                                   \
+	(INTR_BUSOWNER_UPDATE_STAT | INTR_IBI_UPDATED_STAT | INTR_READ_REQ_RECV_STAT |             \
+	 INTR_DEFSLV_STAT | INTR_TRANSFER_ERR_STAT | INTR_DYN_ADDR_ASSGN_STAT |                    \
+	 INTR_CCC_UPDATED_STAT | INTR_TRANSFER_ABORT_STAT | INTR_RESP_READY_STAT |                 \
+	 INTR_CMD_QUEUE_READY_STAT | INTR_IBI_THLD_STAT | INTR_TX_THLD_STAT | INTR_RX_THLD_STAT)
+
+#ifdef CONFIG_I3C_USE_IBI
+#define INTR_MASTER_MASK (INTR_TRANSFER_ERR_STAT | INTR_RESP_READY_STAT | INTR_IBI_THLD_STAT)
+#else
+#define INTR_MASTER_MASK (INTR_TRANSFER_ERR_STAT | INTR_RESP_READY_STAT)
+#endif
+#define INTR_SLAVE_MASK                                                                            \
+	(INTR_TRANSFER_ERR_STAT | INTR_IBI_UPDATED_STAT | INTR_READ_REQ_RECV_STAT |                \
+	 INTR_DYN_ADDR_ASSGN_STAT | INTR_RESP_READY_STAT)
+
+#define QUEUE_STATUS_LEVEL             0x4c
+#define QUEUE_STATUS_IBI_STATUS_CNT(x) (((x) & GENMASK(28, 24)) >> 24)
+#define QUEUE_STATUS_IBI_BUF_BLR(x)    (((x) & GENMASK(23, 16)) >> 16)
+#define QUEUE_STATUS_LEVEL_RESP(x)     (((x) & GENMASK(15, 8)) >> 8)
+#define QUEUE_STATUS_LEVEL_CMD(x)      ((x) & GENMASK(7, 0))
+
+#define DATA_BUFFER_STATUS_LEVEL       0x50
+#define DATA_BUFFER_STATUS_LEVEL_RX(x) (((x) & GENMASK(23, 16)) >> 16)
+#define DATA_BUFFER_STATUS_LEVEL_TX(x) ((x) & GENMASK(7, 0))
+
+#define PRESENT_STATE                0x54
+#define PRESENT_STATE_CURRENT_MASTER BIT(2)
+
+#define CCC_DEVICE_STATUS          0x58
+#define DEVICE_ADDR_TABLE_POINTER  0x5c
+#define DEVICE_ADDR_TABLE_DEPTH(x) (((x) & GENMASK(31, 16)) >> 16)
+#define DEVICE_ADDR_TABLE_ADDR(x)  ((x) & GENMASK(15, 0))
+
+#define DEV_CHAR_TABLE_POINTER      0x60
+#define DEVICE_CHAR_TABLE_ADDR(x)   ((x) & GENMASK(11, 0))
+#define VENDOR_SPECIFIC_REG_POINTER 0x6c
+
+#define SLV_MIPI_ID_VALUE                      0x70
+#define SLV_MIPI_ID_VALUE_SLV_MIPI_MFG_ID_MASK GENMASK(15, 1)
+#define SLV_MIPI_ID_VALUE_SLV_MIPI_MFG_ID(x)   ((x) & SLV_MIPI_ID_VALUE_SLV_MIPI_MFG_ID_MASK)
+#define SLV_MIPI_ID_VALUE_SLV_PROV_ID_SEL      BIT(0)
+
+#define SLV_PID_VALUE 0x74
+
+#define SLV_CHAR_CTRL                      0x78
+#define SLV_CHAR_CTRL_MAX_DATA_SPEED_LIMIT BIT(0)
+#define SLV_CHAR_CTRL_IBI_REQUEST_CAPABLE  BIT(1)
+#define SLV_CHAR_CTRL_IBI_PAYLOAD          BIT(2)
+#define SLV_CHAR_CTRL_BCR_MASK             GENMASK(7, 0)
+#define SLV_CHAR_CTRL_BCR(x)               ((x) & SLV_CHAR_CTRL_BCR_MASK)
+#define SLV_CHAR_CTRL_DCR_MASK             GENMASK(15, 8)
+#define SLV_CHAR_CTRL_DCR(x)               (((x) & SLV_CHAR_CTRL_DCR_MASK) >> 8)
+#define SLV_CHAR_CTRL_HDR_CAP_MASK         GENMASK(23, 16)
+#define SLV_CHAR_CTRL_HDR_CAP(x)           (((x) & SLV_CHAR_CTRL_HDR_CAP_MASK) >> 16)
+
+#define SLV_MAX_LEN        0x7c
+#define SLV_MAX_LEN_MRL(x) (((x) & GENMASK(31, 16)) >> 16)
+#define SLV_MAX_LEN_MWL(x) ((x) & GENMASK(15, 0))
+
+#define MAX_READ_TURNAROUND                     0x80
+#define MAX_READ_TURNAROUND_MXDX_MAX_RD_TURN(x) ((x) & GENMASK(23, 0))
+
+#define MAX_DATA_SPEED   0x84
+#define SLV_DEBUG_STATUS 0x88
+
+#define SLV_INTR_REQ                        0x8c
+#define SLV_INTR_REQ_SIR_DATA_LENGTH(x)     (((x) << 16) & GENMASK(23, 16))
+#define SLV_INTR_REQ_MDB(x)                 (((x) << 8) & GENMASK(15, 8))
+#define SLV_INTR_REQ_IBI_STS(x)             (((x) & GENMASK(9, 8)) >> 8)
+#define SLV_INTR_REQ_IBI_STS_IBI_ACCEPT     0x01
+#define SLV_INTR_REQ_IBI_STS_IBI_NO_ATTEMPT 0x03
+#define SLV_INTR_REQ_TS                     BIT(4)
+#define SLV_INTR_REQ_MR                     BIT(3)
+#define SLV_INTR_REQ_SIR_CTRL(x)            (((x) & GENMASK(2, 1)) >> 1)
+#define SLV_INTR_REQ_SIR                    BIT(0)
+
+#define SLV_SIR_DATA          0x94
+#define SLV_SIR_DATA_BYTE3(x) (((x) << 24) & GENMASK(31, 24))
+#define SLV_SIR_DATA_BYTE2(x) (((x) << 16) & GENMASK(23, 16))
+#define SLV_SIR_DATA_BYTE1(x) (((x) << 8) & GENMASK(15, 8))
+#define SLV_SIR_DATA_BYTE0(x) ((x) & GENMASK(7, 0))
+
+#define SLV_IBI_RESP                         0x98
+#define SLV_IBI_RESP_DATA_LENGTH(x)          (((x) & GENMASK(23, 8)) >> 8)
+#define SLV_IBI_RESP_IBI_STS(x)              ((x) & GENMASK(1, 0))
+#define SLV_IBI_RESP_IBI_STS_ACK             0x01
+#define SLV_IBI_RESP_IBI_STS_EARLY_TERMINATE 0x02
+#define SLV_IBI_RESP_IBI_STS_NACK            0x03
+
+#define SLV_NACK_REQ               0x9c
+#define SLV_NACK_REQ_NACK_REQ(x)   ((x) & GENMASK(1, 0))
+#define SLV_NACK_REQ_NACK_REQ_ACK  0x00
+#define SLV_NACK_REQ_NACK_REQ_NACK 0x01
+
+#define DEVICE_CTRL_EXTENDED                           0xb0
+#define DEVICE_CTRL_EXTENDED_DEV_OPERATION_MODE(x)     ((x) & GENMASK(1, 0))
+#define DEVICE_CTRL_EXTENDED_DEV_OPERATION_MODE_MASTER 0
+#define DEVICE_CTRL_EXTENDED_DEV_OPERATION_MODE_SLAVE  1
+
+#define SCL_I3C_OD_TIMING      0xb4
+#define SCL_I3C_PP_TIMING      0xb8
+#define SCL_I3C_TIMING_HCNT(x) (((x) << 16) & GENMASK(23, 16))
+#define SCL_I3C_TIMING_LCNT(x) ((x) & GENMASK(7, 0))
+#define SCL_I3C_TIMING_CNT_MIN 5
+#define SCL_I3C_TIMING_CNT_MAX 255
+
+#define SCL_I2C_FM_TIMING         0xbc
+#define SCL_I2C_FM_TIMING_HCNT(x) (((x) << 16) & GENMASK(31, 16))
+#define SCL_I2C_FM_TIMING_LCNT(x) ((x) & GENMASK(15, 0))
+
+#define SCL_I2C_FMP_TIMING         0xc0
+#define SCL_I2C_FMP_TIMING_HCNT(x) (((x) << 16) & GENMASK(23, 16))
+#define SCL_I2C_FMP_TIMING_LCNT(x) ((x) & GENMASK(15, 0))
+
+#define SCL_EXT_LCNT_TIMING 0xc8
+#define SCL_EXT_LCNT_4(x)   (((x) << 24) & GENMASK(31, 24))
+#define SCL_EXT_LCNT_3(x)   (((x) << 16) & GENMASK(23, 16))
+#define SCL_EXT_LCNT_2(x)   (((x) << 8) & GENMASK(15, 8))
+#define SCL_EXT_LCNT_1(x)   ((x) & GENMASK(7, 0))
+
+#define SCL_EXT_TERMN_LCNT_TIMING 0xcc
+
+#define SDA_HOLD_SWITCH_DLY_TIMING                         0xd0
+#define SDA_HOLD_SWITCH_DLY_TIMING_SDA_TX_HOLD(x)          (((x)&GENMASK(18, 16)) >> 16)
+#define SDA_HOLD_SWITCH_DLY_TIMING_SDA_PP_OD_SWITCH_DLY(x) (((x)&GENMASK(10, 8)) >> 8)
+#define SDA_HOLD_SWITCH_DLY_TIMING_SDA_OD_PP_SWITCH_DLY(x) ((x)&GENMASK(2, 0))
+
+#define BUS_FREE_TIMING           0xd4
+/* Bus available time of 1us in ns */
+#define I3C_BUS_AVAILABLE_TIME_NS 1000U
+#define BUS_I3C_MST_FREE(x)       ((x) & GENMASK(15, 0))
+#define BUS_I3C_AVAIL_TIME(x)     ((x << 16) & GENMASK(31, 16))
+
+#define BUS_IDLE_TIMING      0xd8
+/* Bus Idle time of 1ms in ns */
+#define I3C_BUS_IDLE_TIME_NS 1000000U
+#define BUS_I3C_IDLE_TIME(x) ((x) & GENMASK(19, 0))
+
+#define I3C_VER_ID          0xe0
+#define I3C_VER_TYPE        0xe4
+#define EXTENDED_CAPABILITY 0xe8
+#define SLAVE_CONFIG        0xec
+
+#define QUEUE_SIZE_CAPABILITY                        0xe8
+#define QUEUE_SIZE_CAPABILITY_IBI_BUF_DWORD_SIZE(x)  (2 << (((x) & GENMASK(19, 16)) >> 16))
+#define QUEUE_SIZE_CAPABILITY_RESP_BUF_DWORD_SIZE(x) (2 << (((x) & GENMASK(15, 12)) >> 12))
+#define QUEUE_SIZE_CAPABILITY_CMD_BUF_DWORD_SIZE(x)  (2 << (((x) & GENMASK(11, 8)) >> 8))
+#define QUEUE_SIZE_CAPABILITY_RX_BUF_DWORD_SIZE(x)   (2 << (((x) & GENMASK(7, 4)) >> 4))
+#define QUEUE_SIZE_CAPABILITY_TX_BUF_DWORD_SIZE(x)   (2 << ((x) & GENMASK(3, 0)))
+
+#define DEV_ADDR_TABLE_LEGACY_I2C_DEV    BIT(31)
+#define DEV_ADDR_TABLE_DYNAMIC_ADDR_MASK GENMASK(23, 16)
+#define DEV_ADDR_TABLE_DYNAMIC_ADDR(x)   (((x) << 16) & GENMASK(23, 16))
+#define DEV_ADDR_TABLE_SIR_REJECT        BIT(13)
+#define DEV_ADDR_TABLE_IBI_WITH_DATA     BIT(12)
+#define DEV_ADDR_TABLE_STATIC_ADDR(x)    ((x) & GENMASK(6, 0))
+#define DEV_ADDR_TABLE_LOC(start, idx)   ((start) + ((idx) << 2))
+
+#define DEV_CHAR_TABLE_LOC1(start, idx) ((start) + ((idx) << 4))
+#define DEV_CHAR_TABLE_MSB_PID(x)       ((x) & GENMASK(31, 16))
+#define DEV_CHAR_TABLE_LSB_PID(x)       ((x) & GENMASK(15, 0))
+#define DEV_CHAR_TABLE_LOC2(start, idx) ((DEV_CHAR_TABLE_LOC1(start, idx)) + 4)
+#define DEV_CHAR_TABLE_LOC3(start, idx) ((DEV_CHAR_TABLE_LOC1(start, idx)) + 8)
+#define DEV_CHAR_TABLE_DCR(x)           ((x) & GENMASK(7, 0))
+#define DEV_CHAR_TABLE_BCR(x)           (((x) & GENMASK(15, 8)) >> 8)
+
+#define I3C_BUS_SDR1_SCL_RATE       8000000
+#define I3C_BUS_SDR2_SCL_RATE       6000000
+#define I3C_BUS_SDR3_SCL_RATE       4000000
+#define I3C_BUS_SDR4_SCL_RATE       2000000
+#define I3C_BUS_I2C_FM_TLOW_MIN_NS  1300
+#define I3C_BUS_I2C_FMP_TLOW_MIN_NS 500
+#define I3C_BUS_THIGH_MAX_NS        41
+#define I3C_PERIOD_NS               1000000000ULL
+
+#define I3C_BUS_MAX_I3C_SCL_RATE     12900000
+#define I3C_BUS_TYP_I3C_SCL_RATE     12500000
+#define I3C_BUS_I2C_FM_PLUS_SCL_RATE 1000000
+#define I3C_BUS_I2C_FM_SCL_RATE      400000
+#define I3C_BUS_TLOW_OD_MIN_NS       200
+
+#define I3C_HOT_JOIN_ADDR 0x02
+
+#define DW_I3C_MAX_DEVS         32
+#define DW_I3C_MAX_CMD_BUF_SIZE 16
+
+/* Snps I3C/I2C Device Private Data */
+struct dw_i3c_i2c_dev_data {
+	/* Device id within the retaining registers. This is set after bus initialization by the
+	 * controller.
+	 */
+	uint8_t id;
+};
+
+struct dw_i3c_cmd {
+	uint32_t cmd_lo;
+	uint32_t cmd_hi;
+	void *buf;
+	uint16_t tx_len;
+	uint16_t rx_len;
+	uint8_t error;
+};
+
+struct dw_i3c_xfer {
+	int32_t ret;
+	uint32_t ncmds;
+	struct dw_i3c_cmd cmds[DW_I3C_MAX_CMD_BUF_SIZE];
+};
+
+struct dw_i3c_config {
+	struct i3c_driver_config common;
+	const struct device *clock;
+	uint32_t regs;
+
+	/* Initial clk configuration */
+	/* Maximum OD high clk pulse length */
+	uint32_t od_thigh_max_ns;
+	/* Minimum OD low clk pulse length */
+	uint32_t od_tlow_min_ns;
+
+	void (*irq_config_func)();
+
+#if defined(CONFIG_PINCTRL)
+	const struct pinctrl_dev_config *pcfg;
+#endif
+};
+
+struct dw_i3c_data {
+	struct i3c_driver_data common;
+	uint32_t free_pos;
+
+	uint16_t datstartaddr;
+	uint16_t dctstartaddr;
+	uint16_t maxdevs;
+
+	/* fifo depth is in words (32b) */
+	uint8_t ibififodepth;
+	uint8_t respfifodepth;
+	uint8_t cmdfifodepth;
+	uint8_t rxfifodepth;
+	uint8_t txfifodepth;
+
+#ifdef CONFIG_I3C_TARGET
+	struct i3c_target_config *target_config;
+#endif /* CONFIG_I3C_TARGET */
+	struct k_sem sem_xfer;
+	struct k_mutex mt;
+
+#ifdef CONFIG_I3C_USE_IBI
+	struct k_sem ibi_sts_sem;
+	struct k_sem sem_hj;
+#endif
+
+	struct dw_i3c_xfer xfer;
+#ifdef CONFIG_I3C_CONTROLLER
+	enum i3c_bus_mode mode;
+	struct dw_i3c_i2c_dev_data dw_i3c_i2c_priv_data[DW_I3C_MAX_DEVS];
+#endif /* CONFIG_I3C_CONTROLLER */
+};
+#ifdef CONFIG_I3C_CONTROLLER
+static uint8_t get_free_pos(uint32_t free_pos)
+{
+	return find_lsb_set(free_pos) - 1;
+}
+
+/**
+ * @brief Read data from the Receive FIFO of the I3C device.
+ *
+ * This function reads data from the Receive FIFO of the I3C device specified by
+ * the given device structure and stores it in the provided buffer.
+ *
+ * @param dev Pointer to the I3C device structure.
+ * @param buf Pointer to the buffer where the received data will be stored.
+ * @param nbytes Number of bytes to read from the Receive FIFO.
+ */
+static void read_rx_fifo(const struct device *dev, uint8_t *buf, int32_t nbytes)
+{
+	__ASSERT((buf != NULL), "Rx buffer should not be NULL");
+
+	const struct dw_i3c_config *config = dev->config;
+	int32_t i;
+	uint32_t tmp;
+
+	if (nbytes >= 4) {
+		for (i = 0; i <= nbytes - 4; i += 4) {
+			tmp = sys_read32(config->regs + RX_TX_DATA_PORT);
+			memcpy(buf + i, &tmp, 4);
+		}
+	}
+	if (nbytes & 3) {
+		tmp = sys_read32(config->regs + RX_TX_DATA_PORT);
+		memcpy(buf + (nbytes & ~3), &tmp, nbytes & 3);
+	}
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+/**
+ * @brief Write data to the Transmit FIFO of the I3C device.
+ *
+ * This function writes data to the Transmit FIFO of the I3C device specified by
+ * the given device structure from the provided buffer.
+ *
+ * @param dev Pointer to the I3C device structure.
+ * @param buf Pointer to the buffer containing the data to be written.
+ * @param nbytes Number of bytes to write to the Transmit FIFO.
+ */
+static void write_tx_fifo(const struct device *dev, const uint8_t *buf, int32_t nbytes)
+{
+	__ASSERT((buf != NULL), "Tx buffer should not be NULL");
+
+	const struct dw_i3c_config *config = dev->config;
+	int32_t i;
+	uint32_t tmp;
+
+	if (nbytes >= 4) {
+		for (i = 0; i <= nbytes - 4; i += 4) {
+			memcpy(&tmp, buf + i, 4);
+			sys_write32(tmp, config->regs + RX_TX_DATA_PORT);
+		}
+	}
+
+	if (nbytes & 3) {
+		tmp = 0;
+		memcpy(&tmp, buf + (nbytes & ~3), nbytes & 3);
+		sys_write32(tmp, config->regs + RX_TX_DATA_PORT);
+	}
+}
+
+#ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_CONTROLLER
+/**
+ * @brief Read data from the In-Band Interrupt (IBI) FIFO of the I3C device.
+ *
+ * This function reads data from the In-Band Interrupt (IBI) FIFO of the I3C device
+ * specified by the given device structure and stores it in the provided buffer.
+ *
+ * @param dev Pointer to the I3C device structure.
+ * @param buf Pointer to the buffer where the received IBI data will be stored.
+ * @param nbytes Number of bytes to read from the IBI FIFO.
+ */
+static void read_ibi_fifo(const struct device *dev, uint8_t *buf, int32_t nbytes)
+{
+	__ASSERT((buf != NULL), "Rx IBI buffer should not be NULL");
+
+	const struct dw_i3c_config *config = dev->config;
+	int32_t i;
+	uint32_t tmp;
+
+	if (nbytes >= 4) {
+		for (i = 0; i <= nbytes - 4; i += 4) {
+			tmp = sys_read32(config->regs + IBI_QUEUE_STATUS);
+			memcpy(buf + i, &tmp, 4);
+		}
+	}
+	if (nbytes & 3) {
+		tmp = sys_read32(config->regs + IBI_QUEUE_STATUS);
+		memcpy(buf + (nbytes & ~3), &tmp, nbytes & 3);
+	}
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_USE_IBI */
+
+/**
+ * @brief End the I3C transfer and process responses.
+ *
+ * This function is responsible for ending the I3C transfer on the specified
+ * I3C device. It processes the responses received from the I3C bus, updating the
+ * status and error information in the transfer structure.
+ *
+ * @param dev Pointer to the I3C device structure.
+ */
+static void dw_i3c_end_xfer(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_xfer *xfer = &data->xfer;
+	struct dw_i3c_cmd *cmd;
+	uint32_t nresp, resp;
+	int i, ret = 0;
+#ifdef CONFIG_I3C_TARGET
+	uint32_t rx_data;
+	int j, k;
+#endif /* CONFIG_I3C_TARGET */
+
+	nresp = QUEUE_STATUS_LEVEL_RESP(sys_read32(config->regs + QUEUE_STATUS_LEVEL));
+	for (i = 0; i < nresp; i++) {
+		uint8_t tid;
+
+		resp = sys_read32(config->regs + RESPONSE_QUEUE_PORT);
+		tid = RESPONSE_PORT_TID(resp);
+		if (tid == 0xf) {
+			/* TODO: handle vendor extension ccc or hdr header in target mode */
+			continue;
+		}
+
+		cmd = &xfer->cmds[tid];
+		cmd->rx_len = RESPONSE_PORT_DATA_LEN(resp);
+		cmd->error = RESPONSE_PORT_ERR_STATUS(resp);
+#ifdef CONFIG_I3C_TARGET
+		/* if we are in target mode */
+		if (!(sys_read32(config->regs + PRESENT_STATE) & PRESENT_STATE_CURRENT_MASTER)) {
+			const struct i3c_target_callbacks *target_cb =
+				data->target_config->callbacks;
+
+			for (j = 0; j < cmd->rx_len; j += 4) {
+				rx_data = sys_read32(config->regs + RX_TX_DATA_PORT);
+				/* Call write received cb for each remaining byte  */
+				for (k = 0; k < MIN(4, cmd->rx_len - j); k++) {
+					target_cb->write_received_cb(data->target_config,
+								    (rx_data >> (8 * k)) & 0xff);
+				}
+			}
+
+			if (target_cb != NULL && target_cb->stop_cb != NULL) {
+				/*
+				 * TODO: modify API to include status, such as success or aborted
+				 * transfer
+				 */
+				target_cb->stop_cb(data->target_config);
+			}
+		}
+#endif /* CONFIG_I3C_TARGET */
+	}
+
+	for (i = 0; i < nresp; i++) {
+		switch (xfer->cmds[i].error) {
+		case RESPONSE_NO_ERROR:
+			break;
+		case RESPONSE_ERROR_PARITY:
+		case RESPONSE_ERROR_IBA_NACK:
+		case RESPONSE_ERROR_TRANSF_ABORT:
+		case RESPONSE_ERROR_CRC:
+		case RESPONSE_ERROR_FRAME:
+			ret = -EIO;
+			break;
+		case RESPONSE_ERROR_OVER_UNDER_FLOW:
+			ret = -ENOSPC;
+			break;
+		case RESPONSE_ERROR_I2C_W_NACK_ERR:
+		case RESPONSE_ERROR_ADDRESS_NACK:
+			ret = -ENXIO;
+			break;
+		default:
+			ret = -EINVAL;
+			break;
+		}
+	}
+	xfer->ret = ret;
+
+	if (ret < 0) {
+		sys_write32(RESET_CTRL_RX_FIFO | RESET_CTRL_TX_FIFO | RESET_CTRL_RESP_QUEUE |
+			    RESET_CTRL_CMD_QUEUE,
+			    config->regs + RESET_CTRL);
+		sys_write32(sys_read32(config->regs + DEVICE_CTRL) | DEV_CTRL_RESUME,
+			    config->regs + DEVICE_CTRL);
+	}
+	k_sem_give(&data->sem_xfer);
+}
+
+/**
+ * @brief Start an I3C transfer on the specified device.
+ *
+ * This function initiates an I3C transfer on the specified I3C device by pushing
+ * data to the Transmit FIFO (TXFIFO) and enqueuing commands to the command queue.
+ *
+ * @param dev Pointer to the I3C device structure.
+ */
+static void start_xfer(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_xfer *xfer = &data->xfer;
+	struct dw_i3c_cmd *cmd;
+	uint32_t thld_ctrl, present_state;
+	int32_t i;
+
+	present_state = sys_read32(config->regs + PRESENT_STATE);
+
+	/* Push data to TXFIFO */
+	for (i = 0; i < xfer->ncmds; i++) {
+		cmd = &xfer->cmds[i];
+		/* Not all the commands use write_tx_fifo function */
+		if (cmd->buf != NULL) {
+			write_tx_fifo(dev, cmd->buf, cmd->tx_len);
+		}
+	}
+
+	thld_ctrl = sys_read32(config->regs + QUEUE_THLD_CTRL);
+	thld_ctrl &= ~QUEUE_THLD_CTRL_RESP_BUF_MASK;
+	thld_ctrl |= QUEUE_THLD_CTRL_RESP_BUF(xfer->ncmds);
+	sys_write32(thld_ctrl, config->regs + QUEUE_THLD_CTRL);
+
+	/* Enqueue CMD */
+	for (i = 0; i < xfer->ncmds; i++) {
+		cmd = &xfer->cmds[i];
+		/* Only cmd_lo is used when it is a target */
+		if (present_state & PRESENT_STATE_CURRENT_MASTER) {
+			sys_write32(cmd->cmd_hi, config->regs + COMMAND_QUEUE_PORT);
+		}
+		sys_write32(cmd->cmd_lo, config->regs + COMMAND_QUEUE_PORT);
+	}
+}
+#ifdef CONFIG_I3C_CONTROLLER
+/**
+ * @brief Get the position of an I3C device with the specified address.
+ *
+ * This function retrieves the position (ID) of an I3C device with the specified
+ * address on the I3C bus associated with the provided I3C device structure. This
+ * utilizes the controller private data for where the id reg is stored.
+ *
+ * @param dev Pointer to the I3C device structure.
+ * @param addr I3C address of the device whose position is to be retrieved.
+ * @param sa True if looking up by Static Address, False if by Dynamic Address
+ *
+ * @return The position (ID) of the device on success, or a negative error code
+ *         if the device with the given address is not found.
+ */
+static int get_i3c_addr_pos(const struct device *dev, uint8_t addr, bool sa)
+{
+	struct dw_i3c_i2c_dev_data *dw_i3c_device_data;
+	struct i3c_device_desc *desc = sa ? i3c_dev_list_i3c_static_addr_find(dev, addr)
+					  : i3c_dev_list_i3c_addr_find(dev, addr);
+
+	if (desc == NULL) {
+		return -ENODEV;
+	}
+
+	dw_i3c_device_data = desc->controller_priv;
+
+	return dw_i3c_device_data->id;
+}
+
+/**
+ * @brief Transfer messages in I3C mode.
+ *
+ * @param dev Pointer to device driver instance.
+ * @param target Pointer to target device descriptor.
+ * @param msgs Pointer to I3C messages.
+ * @param num_msgs Number of messages to transfers.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ * @retval -EINVAL Address not registered
+ */
+static int dw_i3c_xfers(const struct device *dev, struct i3c_device_desc *target,
+			struct i3c_msg *msgs, uint8_t num_msgs)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_xfer *xfer = &data->xfer;
+	int32_t ret, i, pos, nrxwords = 0, ntxwords = 0;
+	uint32_t present_state;
+
+	present_state = sys_read32(config->regs + PRESENT_STATE);
+	if (!(present_state & PRESENT_STATE_CURRENT_MASTER)) {
+		return -EACCES;
+	}
+
+	if (num_msgs > data->cmdfifodepth) {
+		return -ENOTSUP;
+	}
+
+	pos = get_i3c_addr_pos(dev, target->dynamic_addr, false);
+	if (pos < 0) {
+		LOG_ERR("%s: Invalid slave device", dev->name);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < num_msgs; i++) {
+		if (msgs[i].flags & I2C_MSG_READ) {
+			nrxwords += DIV_ROUND_UP(msgs[i].len, 4);
+		} else {
+			ntxwords += DIV_ROUND_UP(msgs[i].len, 4);
+		}
+	}
+
+	if (ntxwords > data->txfifodepth || nrxwords > data->rxfifodepth) {
+		return -ENOTSUP;
+	}
+
+	ret = k_mutex_lock(&data->mt, K_MSEC(1000));
+	if (ret) {
+		LOG_ERR("%s: Mutex err (%d)", dev->name, ret);
+		return ret;
+	}
+
+	pm_device_busy_set(dev);
+
+	memset(xfer, 0, sizeof(struct dw_i3c_xfer));
+
+	xfer->ncmds = num_msgs;
+	xfer->ret = -1;
+
+	for (i = 0; i < num_msgs; i++) {
+		struct dw_i3c_cmd *cmd = &xfer->cmds[i];
+
+		cmd->cmd_hi = COMMAND_PORT_ARG_DATA_LEN(msgs[i].len) | COMMAND_PORT_TRANSFER_ARG;
+		cmd->cmd_lo = COMMAND_PORT_TID(i) | COMMAND_PORT_DEV_INDEX(pos) | COMMAND_PORT_ROC;
+
+		cmd->buf = msgs[i].buf;
+
+		if (msgs[i].flags & I3C_MSG_NBCH) {
+			sys_write32(sys_read32(config->regs + DEVICE_CTRL) & ~DEV_CTRL_IBA_INCLUDE,
+				    config->regs + DEVICE_CTRL);
+		} else {
+			sys_write32(sys_read32(config->regs + DEVICE_CTRL) | DEV_CTRL_IBA_INCLUDE,
+				    config->regs + DEVICE_CTRL);
+		}
+
+		if (msgs[i].flags & I3C_MSG_READ) {
+			uint8_t rd_speed;
+
+			if (msgs[i].flags & I3C_MSG_HDR) {
+				/* Set read command bit for DDR and TS */
+				cmd->cmd_lo |= COMMAND_PORT_CP |
+					       COMMAND_PORT_CMD(BIT(7) | (msgs[i].hdr_cmd_code &
+									  GENMASK(6, 0)));
+				if (msgs[i].hdr_mode & I3C_MSG_HDR_DDR) {
+					if (data->common.ctrl_config.supported_hdr &
+					    I3C_MSG_HDR_DDR) {
+						rd_speed = COMMAND_PORT_SPEED_I3C_DDR;
+					} else {
+						/* DDR support not configured with this */
+						LOG_ERR("%s: HDR-DDR not supported", dev->name);
+						ret = -ENOTSUP;
+						goto error;
+					}
+				} else if (msgs[i].hdr_mode & I3C_MSG_HDR_TSP ||
+					   msgs[i].hdr_mode & I3C_MSG_HDR_TSL) {
+					if (data->common.ctrl_config.supported_hdr &
+					    (I3C_MSG_HDR_TSP | I3C_MSG_HDR_TSL)) {
+						rd_speed = COMMAND_PORT_SPEED_I3C_TS;
+					} else {
+						/* TS support not configured with this */
+						LOG_ERR("%s: HDR-TS not supported", dev->name);
+						ret = -ENOTSUP;
+						goto error;
+					}
+				} else {
+					LOG_ERR("%s: HDR %d not supported", dev->name,
+						msgs[i].hdr_mode);
+					ret = -ENOTSUP;
+					goto error;
+				}
+			} else {
+				rd_speed = I3C_CCC_GETMXDS_MAXRD_MAX_SDR_FSCL(
+					target->data_speed.maxrd);
+			}
+
+			cmd->cmd_lo |= (COMMAND_PORT_READ_TRANSFER | COMMAND_PORT_SPEED(rd_speed));
+			cmd->rx_len = msgs[i].len;
+		} else {
+			uint8_t wr_speed;
+
+			if (msgs[i].flags & I3C_MSG_HDR) {
+				cmd->cmd_lo |=
+					COMMAND_PORT_CP |
+					COMMAND_PORT_CMD(msgs[i].hdr_cmd_code & GENMASK(6, 0));
+				if (msgs[i].hdr_mode & I3C_MSG_HDR_DDR) {
+					if (data->common.ctrl_config.supported_hdr &
+					    I3C_MSG_HDR_DDR) {
+						wr_speed = COMMAND_PORT_SPEED_I3C_DDR;
+					} else {
+						/* DDR support not configured with this */
+						LOG_ERR("%s: HDR-DDR not supported", dev->name);
+						ret = -ENOTSUP;
+						goto error;
+					}
+				} else if (msgs[i].hdr_mode & I3C_MSG_HDR_TSP ||
+					   msgs[i].hdr_mode & I3C_MSG_HDR_TSL) {
+					if (data->common.ctrl_config.supported_hdr &
+					    (I3C_MSG_HDR_TSP | I3C_MSG_HDR_TSL)) {
+						wr_speed = COMMAND_PORT_SPEED_I3C_TS;
+					} else {
+						/* TS support not configured with this */
+						LOG_ERR("%s: HDR-TS not supported", dev->name);
+						ret = -ENOTSUP;
+						goto error;
+					}
+				} else {
+					LOG_ERR("%s: HDR %d not supported", dev->name,
+						msgs[i].hdr_mode);
+					ret = -ENOTSUP;
+					goto error;
+				}
+			} else {
+				wr_speed = I3C_CCC_GETMXDS_MAXWR_MAX_SDR_FSCL(
+					target->data_speed.maxwr);
+			}
+
+			cmd->cmd_lo |= COMMAND_PORT_SPEED(wr_speed);
+			cmd->tx_len = msgs[i].len;
+		}
+
+		if (i == (num_msgs - 1)) {
+			cmd->cmd_lo |= COMMAND_PORT_TOC;
+		}
+	}
+
+	start_xfer(dev);
+
+	ret = k_sem_take(&data->sem_xfer, K_MSEC(CONFIG_I3C_DW_RW_TIMEOUT_MS));
+	if (ret) {
+		LOG_ERR("%s: Semaphore err (%d)", dev->name, ret);
+		goto error;
+	}
+
+	for (i = 0; i < xfer->ncmds; i++) {
+		msgs[i].num_xfer = (msgs[i].flags & I3C_MSG_READ) ? xfer->cmds[i].rx_len
+								  : xfer->cmds[i].tx_len;
+		if (xfer->cmds[i].rx_len && !xfer->cmds[i].error) {
+			read_rx_fifo(dev, xfer->cmds[i].buf, xfer->cmds[i].rx_len);
+		}
+	}
+
+	ret = xfer->ret;
+
+error:
+	pm_device_busy_clear(dev);
+	k_mutex_unlock(&data->mt);
+
+	return ret;
+}
+
+static int dw_i3c_i2c_attach_device(const struct device *dev, struct i3c_i2c_device_desc *desc)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	uint8_t pos;
+
+	pos = get_free_pos(data->free_pos);
+	if (pos < 0) {
+		return -ENOSPC;
+	}
+
+	data->dw_i3c_i2c_priv_data[pos].id = pos;
+	desc->controller_priv = &(data->dw_i3c_i2c_priv_data[pos]);
+	data->free_pos &= ~BIT(pos);
+
+	sys_write32(DEV_ADDR_TABLE_LEGACY_I2C_DEV | DEV_ADDR_TABLE_STATIC_ADDR(desc->addr),
+		    config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, pos));
+
+	return 0;
+}
+
+static void dw_i3c_i2c_detach_device(const struct device *dev, struct i3c_i2c_device_desc *desc)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_i2c_dev_data *dw_i2c_device_data = desc->controller_priv;
+
+	__ASSERT_NO_MSG(dw_i2c_device_data != NULL);
+
+	sys_write32(0,
+		    config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, dw_i2c_device_data->id));
+	data->free_pos |= BIT(dw_i2c_device_data->id);
+	desc->controller_priv = NULL;
+}
+
+/**
+ * @brief Transfer messages in I2C mode.
+ *
+ * @param dev Pointer to device driver instance.
+ * @param target Pointer to target device descriptor.
+ * @param msgs Pointer to I2C messages.
+ * @param num_msgs Number of messages to transfers.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General input / output error.
+ * @retval -EINVAL Address not registered
+ */
+static int dw_i3c_i2c_transfer(const struct device *dev, struct i3c_i2c_device_desc *target,
+			       struct i2c_msg *msgs, uint8_t num_msgs)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_xfer *xfer = &data->xfer;
+	int32_t ret, i, pos, nrxwords = 0, ntxwords = 0;
+	uint32_t present_state;
+
+	present_state = sys_read32(config->regs + PRESENT_STATE);
+	if (!(present_state & PRESENT_STATE_CURRENT_MASTER)) {
+		return -EACCES;
+	}
+
+	if (num_msgs > data->cmdfifodepth) {
+		return -ENOTSUP;
+	}
+
+	for (i = 0; i < num_msgs; i++) {
+		if (msgs[i].flags & I2C_MSG_READ) {
+			nrxwords += DIV_ROUND_UP(msgs[i].len, 4);
+		} else {
+			ntxwords += DIV_ROUND_UP(msgs[i].len, 4);
+		}
+	}
+
+	if (ntxwords > data->txfifodepth || nrxwords > data->rxfifodepth) {
+		return -ENOTSUP;
+	}
+
+	ret = k_mutex_lock(&data->mt, K_MSEC(1000));
+	if (ret) {
+		LOG_ERR("%s: Mutex err (%d)", dev->name, ret);
+		return ret;
+	}
+
+	pm_device_busy_set(dev);
+
+	/* In order limit the number of retaining registers occupied by connected devices,
+	 * I2C devices are only configured during transfers. This allows the number of devices
+	 * to be larger than the number of retaining registers on mixed buses.
+	 */
+	ret = dw_i3c_i2c_attach_device(dev, target);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to attach I2C device (%d)", dev->name, ret);
+		goto error_attach;
+	}
+	pos = ((struct dw_i3c_i2c_dev_data *)target->controller_priv)->id;
+
+	memset(xfer, 0, sizeof(struct dw_i3c_xfer));
+
+	xfer->ncmds = num_msgs;
+	xfer->ret = -1;
+
+	for (i = 0; i < num_msgs; i++) {
+		struct dw_i3c_cmd *cmd = &xfer->cmds[i];
+
+		cmd->cmd_hi = COMMAND_PORT_ARG_DATA_LEN(msgs[i].len) | COMMAND_PORT_TRANSFER_ARG;
+		cmd->cmd_lo = COMMAND_PORT_TID(i) | COMMAND_PORT_DEV_INDEX(pos) | COMMAND_PORT_ROC;
+
+		cmd->buf = msgs[i].buf;
+
+		if (msgs[i].flags & I2C_MSG_READ) {
+			uint8_t rd_speed = I3C_LVR_I2C_MODE(target->lvr) == I3C_LVR_I2C_FM_MODE
+						   ? COMMAND_PORT_SPEED_I2C_FM
+						   : COMMAND_PORT_SPEED_I2C_FMP;
+
+			cmd->cmd_lo |= (COMMAND_PORT_READ_TRANSFER | COMMAND_PORT_SPEED(rd_speed));
+			cmd->rx_len = msgs[i].len;
+		} else {
+			uint8_t wr_speed = I3C_LVR_I2C_MODE(target->lvr) == I3C_LVR_I2C_FM_MODE
+						   ? COMMAND_PORT_SPEED_I2C_FM
+						   : COMMAND_PORT_SPEED_I2C_FMP;
+
+			cmd->cmd_lo |= COMMAND_PORT_SPEED(wr_speed);
+			cmd->tx_len = msgs[i].len;
+		}
+
+		if (i == (num_msgs - 1)) {
+			cmd->cmd_lo |= COMMAND_PORT_TOC;
+		}
+	}
+
+	/* Do not send broadcast address (0x7E) with I2C transfers */
+	sys_write32(sys_read32(config->regs + DEVICE_CTRL) & ~DEV_CTRL_IBA_INCLUDE,
+		    config->regs + DEVICE_CTRL);
+
+	start_xfer(dev);
+
+	ret = k_sem_take(&data->sem_xfer, K_MSEC(CONFIG_I3C_DW_RW_TIMEOUT_MS));
+	if (ret) {
+		LOG_ERR("%s: Semaphore err (%d)", dev->name, ret);
+		goto error;
+	}
+
+	for (i = 0; i < xfer->ncmds; i++) {
+		if (xfer->cmds[i].rx_len && !xfer->cmds[i].error) {
+			read_rx_fifo(dev, xfer->cmds[i].buf, xfer->cmds[i].rx_len);
+		}
+	}
+
+	ret = xfer->ret;
+
+error:
+	dw_i3c_i2c_detach_device(dev, target);
+error_attach:
+	pm_device_busy_clear(dev);
+	k_mutex_unlock(&data->mt);
+
+	return ret;
+}
+
+/**
+ * Find a registered I2C target device.
+ *
+ * Controller only API.
+ *
+ * This returns the I2C device descriptor of the I2C device
+ * matching the device address @p addr.
+ *
+ * @param dev Pointer to controller device driver instance.
+ * @param id I2C target device address.
+ *
+ * @return @see i3c_i2c_device_find.
+ */
+static struct i3c_i2c_device_desc *dw_i3c_i2c_device_find(const struct device *dev, uint16_t addr)
+{
+	return i3c_dev_list_i2c_addr_find(dev, addr);
+}
+
+/**
+ * @brief Transfer messages in I2C mode.
+ *
+ * @see i2c_transfer
+ *
+ * @param dev Pointer to device driver instance.
+ * @param msgs Pointer to I2C messages.
+ * @param num_msgs Number of messages to transfers.
+ * @param addr Address of the I2C target device.
+ *
+ * @return @see i2c_transfer
+ */
+static int dw_i3c_i2c_api_transfer(const struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs,
+				   uint16_t addr)
+{
+	struct i3c_i2c_device_desc *i2c_dev = dw_i3c_i2c_device_find(dev, addr);
+
+	if (i2c_dev == NULL) {
+		return -ENODEV;
+	}
+
+	return dw_i3c_i2c_transfer(dev, i2c_dev, msgs, num_msgs);
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_CONTROLLER
+static int dw_i3c_controller_ibi_hj_response(const struct device *dev, bool ack)
+{
+	const struct dw_i3c_config *config = dev->config;
+	uint32_t ctrl = sys_read32(config->regs + DEVICE_CTRL);
+
+	if (ack) {
+		ctrl &= ~DEV_CTRL_HOT_JOIN_NACK;
+	} else {
+		ctrl |= DEV_CTRL_HOT_JOIN_NACK;
+	}
+
+	sys_write32(ctrl, config->regs + DEVICE_CTRL);
+
+	return 0;
+}
+
+static int i3c_dw_endis_ibi(const struct device *dev, struct i3c_device_desc *target, bool en)
+{
+	struct dw_i3c_data *data = dev->data;
+	const struct dw_i3c_config *config = dev->config;
+	uint32_t bitpos, sir_con;
+	struct i3c_ccc_events i3c_events;
+	int ret;
+	int pos;
+
+	pos = get_i3c_addr_pos(dev, target->dynamic_addr, false);
+	if (pos < 0) {
+		LOG_ERR("%s: Invalid Slave address", dev->name);
+		return pos;
+	}
+
+	uint32_t reg = sys_read32(config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, pos));
+
+	if (i3c_ibi_has_payload(target)) {
+		reg |= DEV_ADDR_TABLE_IBI_WITH_DATA;
+	} else {
+		reg &= ~DEV_ADDR_TABLE_IBI_WITH_DATA;
+	}
+	if (en) {
+		reg &= ~DEV_ADDR_TABLE_SIR_REJECT;
+	} else {
+		reg |= DEV_ADDR_TABLE_SIR_REJECT;
+	}
+	sys_write32(reg, config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, pos));
+
+	sir_con = sys_read32(config->regs + IBI_SIR_REQ_REJECT);
+	/* TODO: what is this macro doing?? */
+	bitpos = IBI_SIR_REQ_ID(target->dynamic_addr);
+
+	if (en) {
+		sir_con &= ~BIT(bitpos);
+	} else {
+		sir_con |= BIT(bitpos);
+	}
+	sys_write32(sir_con, config->regs + IBI_SIR_REQ_REJECT);
+
+	/* Tell target to enable IBI */
+	i3c_events.events = I3C_CCC_EVT_INTR;
+	ret = i3c_ccc_do_events_set(target, en, &i3c_events);
+	if (ret != 0) {
+		LOG_ERR("%s: Error sending IBI ENEC for 0x%02x (%d)", dev->name,
+			target->dynamic_addr, ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int dw_i3c_controller_enable_ibi(const struct device *dev, struct i3c_device_desc *target)
+{
+	return i3c_dw_endis_ibi(dev, target, true);
+}
+
+static int dw_i3c_controller_disable_ibi(const struct device *dev, struct i3c_device_desc *target)
+{
+	return i3c_dw_endis_ibi(dev, target, false);
+}
+
+static void dw_i3c_handle_tir(const struct device *dev, uint32_t ibi_status)
+{
+	uint8_t ibi_data[CONFIG_I3C_IBI_MAX_PAYLOAD_SIZE];
+	uint8_t addr, len;
+	int pos;
+
+	addr = IBI_QUEUE_IBI_ADDR(ibi_status);
+	len = IBI_QUEUE_STATUS_DATA_LEN(ibi_status);
+
+	pos = get_i3c_addr_pos(dev, addr, false);
+	if (pos < 0) {
+		LOG_ERR("%s: Invalid Slave address", dev->name);
+		return;
+	}
+
+	struct i3c_device_desc *desc = i3c_dev_list_i3c_addr_find(dev, addr);
+
+	if (desc == NULL) {
+		return;
+	}
+
+	if (len > 0) {
+		read_ibi_fifo(dev, ibi_data, len);
+	}
+
+	if (i3c_ibi_work_enqueue_target_irq(desc, ibi_data, len) != 0) {
+		LOG_ERR("%s: Error enqueue IBI IRQ work", dev->name);
+	}
+}
+
+static void dw_i3c_handle_hj(const struct device *dev, uint32_t ibi_status)
+{
+	if (IBI_QUEUE_STATUS_IBI_STS(ibi_status) & BIT(3)) {
+		LOG_DBG("%s: NAK for HJ", dev->name);
+		return;
+	}
+
+	if (i3c_ibi_work_enqueue_hotjoin(dev) != 0) {
+		LOG_ERR("%s: Error enqueue IBI HJ work", dev->name);
+	}
+}
+
+static void ibis_handle(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	uint32_t nibis, ibi_stat;
+	int32_t i;
+
+	nibis = sys_read32(config->regs + QUEUE_STATUS_LEVEL);
+	nibis = QUEUE_STATUS_IBI_BUF_BLR(nibis);
+	for (i = 0; i < nibis; i++) {
+		ibi_stat = sys_read32(config->regs + IBI_QUEUE_STATUS);
+		if (IBI_TYPE_SIRQ(ibi_stat)) {
+			dw_i3c_handle_tir(dev, ibi_stat);
+		} else if (IBI_TYPE_HJ(ibi_stat)) {
+			dw_i3c_handle_hj(dev, ibi_stat);
+		} else {
+			LOG_WRN("%s: Controller Role Request Not implemented", dev->name);
+		}
+	}
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
+static int dw_i3c_target_ibi_raise_hj(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	int ret;
+
+	if (!(sys_read32(config->regs + HW_CAPABILITY) & HW_CAPABILITY_SLV_HJ_CAP)) {
+		LOG_ERR("%s: HJ not supported", dev->name);
+		return -ENOTSUP;
+	}
+	if (sys_read32(config->regs + DEVICE_ADDR) & DEVICE_ADDR_DYNAMIC_ADDR_VALID) {
+		LOG_ERR("%s: HJ not available, DA already assigned", dev->name);
+		return -EACCES;
+	}
+	/* if this is set, then it is assumed it is already trying */
+	if ((sys_read32(config->regs + SLV_EVENT_STATUS) & SLV_EVENT_STATUS_HJ_EN)) {
+		LOG_ERR("%s: HJ requests are currently disabled by DISEC", dev->name);
+		return -EAGAIN;
+	}
+
+	/*
+	 * This is issued auto-magically by the IP when certain conditions are meet.
+	 * These include:
+	 * 1. SLV_EVENT_STATUS[HJ_EN] = 1 (or a controller issues Enables HJ events with
+	 * the CCC ENEC, This can be set to 0 with CCC DISEC from a controller)
+	 * 2. The Dynamic address is invalid. (not assigned yet)
+	 * 3. Bus Idle condition is met (1ms) as programmed in the Bus Timing Register
+	 */
+
+	/* enable HJ */
+	sys_write32(sys_read32(config->regs + SLV_EVENT_STATUS) | SLV_EVENT_STATUS_HJ_EN,
+		    config->regs + SLV_EVENT_STATUS);
+
+	ret = k_sem_take(&data->sem_hj, K_MSEC(CONFIG_I3C_DW_RW_TIMEOUT_MS));
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int dw_i3c_target_ibi_raise_tir(const struct device *dev, struct i3c_ibi *request)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	int status;
+	uint32_t slv_intr_req, slv_ibi_resp;
+
+	if (!(sys_read32(config->regs + HW_CAPABILITY) & HW_CAPABILITY_SLV_IBI_CAP)) {
+		LOG_ERR("%s: IBI TIR not supported", dev->name);
+		return -ENOTSUP;
+	}
+
+	if (!(sys_read32(config->regs + DEVICE_ADDR) & DEVICE_ADDR_DYNAMIC_ADDR_VALID)) {
+		LOG_ERR("%s: IBI TIR not available, DA not assigned", dev->name);
+		return -EACCES;
+	}
+
+	if (!(sys_read32(config->regs + SLV_EVENT_STATUS) & SLV_EVENT_STATUS_SIR_EN)) {
+		LOG_ERR("%s: IBI TIR requests are currently disabled by DISEC", dev->name);
+		return -EAGAIN;
+	}
+
+	slv_intr_req = sys_read32(config->regs + SLV_INTR_REQ);
+	if (sys_read32(config->regs + SLV_CHAR_CTRL) & SLV_CHAR_CTRL_IBI_PAYLOAD) {
+		uint32_t tir_data = 0;
+
+		/* max support length is DA + MDB (1 byte) + 4 data bytes, MDB must be at least
+		 * included
+		 */
+		if ((request->payload_len > 5) || (request->payload_len == 0)) {
+			return -EINVAL;
+		}
+
+		/* MDB should be the first byte of the payload */
+		slv_intr_req |= SLV_INTR_REQ_MDB(request->payload[0]) |
+				SLV_INTR_REQ_SIR_DATA_LENGTH(request->payload_len - 1);
+
+		/* program the tir data packet */
+		tir_data |=
+			SLV_SIR_DATA_BYTE0((request->payload_len > 1) ? request->payload[1] : 0);
+		tir_data |=
+			SLV_SIR_DATA_BYTE1((request->payload_len > 2) ? request->payload[2] : 0);
+		tir_data |=
+			SLV_SIR_DATA_BYTE2((request->payload_len > 3) ? request->payload[3] : 0);
+		tir_data |=
+			SLV_SIR_DATA_BYTE3((request->payload_len > 4) ? request->payload[4] : 0);
+		sys_write32(tir_data, config->regs + SLV_SIR_DATA);
+	}
+
+	/* kick off the ibi tir request */
+	slv_intr_req |= SLV_INTR_REQ_SIR;
+	sys_write32(slv_intr_req, config->regs + SLV_INTR_REQ);
+
+	/* wait for SLV_IBI_RESP update */
+	status = k_sem_take(&data->ibi_sts_sem, K_MSEC(100));
+	if (status != 0) {
+		return -ETIMEDOUT;
+	}
+
+	slv_ibi_resp = sys_read32(config->regs + SLV_INTR_REQ);
+	switch (SLV_IBI_RESP_IBI_STS(slv_ibi_resp)) {
+	case SLV_IBI_RESP_IBI_STS_ACK:
+		LOG_DBG("%s: Controller ACKed IBI TIR", dev->name);
+		return 0;
+	case SLV_IBI_RESP_IBI_STS_NACK:
+		LOG_ERR("%s: Controller NACKed IBI TIR", dev->name);
+		return -EAGAIN;
+	case SLV_IBI_RESP_IBI_STS_EARLY_TERMINATE:
+		LOG_ERR("%s: Controller aborted IBI TIR with %lu remaining", dev->name,
+			SLV_IBI_RESP_DATA_LENGTH(slv_ibi_resp));
+		return -EIO;
+	default:
+		return -EIO;
+	}
+}
+
+static int dw_i3c_target_ibi_raise(const struct device *dev, struct i3c_ibi *request)
+{
+	if (request == NULL) {
+		return -EINVAL;
+	}
+
+	switch (request->ibi_type) {
+	case I3C_IBI_TARGET_INTR:
+		return dw_i3c_target_ibi_raise_tir(dev, request);
+	case I3C_IBI_CONTROLLER_ROLE_REQUEST:
+		/* TODO: Synopsys I3C can support CR, but not implemented yet */
+		return -ENOTSUP;
+	case I3C_IBI_HOTJOIN:
+		return dw_i3c_target_ibi_raise_hj(dev);
+	default:
+		return -EINVAL;
+	}
+}
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_USE_IBI */
+
+static int i3c_dw_irq(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	uint32_t status;
+#ifdef CONFIG_I3C_TARGET
+	struct dw_i3c_data *data = dev->data;
+	uint32_t present_state;
+#endif /* CONFIG_I3C_TARGET */
+
+	status = sys_read32(config->regs + INTR_STATUS);
+	if (status & (INTR_TRANSFER_ERR_STAT | INTR_RESP_READY_STAT)) {
+		dw_i3c_end_xfer(dev);
+
+		if (status & INTR_TRANSFER_ERR_STAT) {
+			sys_write32(INTR_TRANSFER_ERR_STAT, config->regs + INTR_STATUS);
+		}
+	}
+#ifdef CONFIG_I3C_CONTROLLER
+	if (status & INTR_IBI_THLD_STAT) {
+#ifdef CONFIG_I3C_USE_IBI
+		ibis_handle(dev);
+#endif /* CONFIG_I3C_USE_IBI */
+	}
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
+	/* target mode related interrupts */
+	present_state = sys_read32(config->regs + PRESENT_STATE);
+	if (!(present_state & PRESENT_STATE_CURRENT_MASTER)) {
+		const struct i3c_target_callbacks *target_cb =
+			data->target_config ? data->target_config->callbacks : NULL;
+
+		/* Read Requested when the CMDQ is empty*/
+		if (status & INTR_READ_REQ_RECV_STAT) {
+			if (target_cb != NULL && target_cb->read_requested_cb != NULL) {
+				/* Inform app so that it can send data. */
+				target_cb->read_requested_cb(data->target_config, NULL);
+			}
+			sys_write32(INTR_READ_REQ_RECV_STAT, config->regs + INTR_STATUS);
+		}
+#ifdef CONFIG_I3C_USE_IBI
+		/* IBI TIR request register is addressed and status is updated*/
+		if (status & INTR_IBI_UPDATED_STAT) {
+			k_sem_give(&data->ibi_sts_sem);
+			sys_write32(INTR_IBI_UPDATED_STAT, config->regs + INTR_STATUS);
+		}
+		/* DA has been assigned, could happen after a IBI HJ request */
+		if (status & INTR_DYN_ADDR_ASSGN_STAT) {
+			/* TODO: handle IBI HJ with semaphore */
+			sys_write32(INTR_DYN_ADDR_ASSGN_STAT, config->regs + INTR_STATUS);
+		}
+#endif /* CONFIG_I3C_USE_IBI */
+	}
+#endif /* CONFIG_I3C_TARGET */
+	return 0;
+}
+
+static int init_scl_timing(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	uint32_t core_rate, scl_timing;
+#ifdef CONFIG_I3C_CONTROLLER
+	struct dw_i3c_data *data = dev->data;
+	uint32_t hcnt, lcnt;
+#endif /* CONFIG_I3C_CONTROLLER */
+
+	if (clock_control_get_rate(config->clock, NULL, &core_rate) != 0) {
+		LOG_ERR("%s: get clock rate failed", dev->name);
+		return -EINVAL;
+	}
+#ifdef CONFIG_I3C_CONTROLLER
+	/* I3C_OD */
+	hcnt = DIV_ROUND_UP(config->od_thigh_max_ns * (uint64_t)core_rate, I3C_PERIOD_NS) - 1;
+	hcnt = CLAMP(hcnt, SCL_I3C_TIMING_CNT_MIN, SCL_I3C_TIMING_CNT_MAX);
+
+	lcnt = DIV_ROUND_UP(config->od_tlow_min_ns * (uint64_t)core_rate, I3C_PERIOD_NS);
+	lcnt = CLAMP(lcnt, SCL_I3C_TIMING_CNT_MIN, SCL_I3C_TIMING_CNT_MAX);
+
+	scl_timing = SCL_I3C_TIMING_HCNT(hcnt) | SCL_I3C_TIMING_LCNT(lcnt);
+	sys_write32(scl_timing, config->regs + SCL_I3C_OD_TIMING);
+
+	/* Set bus free timing to match tlow setting for OD clk config. */
+	sys_write32(BUS_I3C_MST_FREE(lcnt), config->regs + BUS_FREE_TIMING);
+
+	/* I3C_PP */
+	hcnt = DIV_ROUND_UP(I3C_BUS_THIGH_MAX_NS * (uint64_t)core_rate, I3C_PERIOD_NS) - 1;
+	hcnt = CLAMP(hcnt, SCL_I3C_TIMING_CNT_MIN, SCL_I3C_TIMING_CNT_MAX);
+
+	lcnt = DIV_ROUND_UP(core_rate, data->common.ctrl_config.scl.i3c) - hcnt;
+	lcnt = CLAMP(lcnt, SCL_I3C_TIMING_CNT_MIN, SCL_I3C_TIMING_CNT_MAX);
+
+	scl_timing = SCL_I3C_TIMING_HCNT(hcnt) | SCL_I3C_TIMING_LCNT(lcnt);
+	sys_write32(scl_timing, config->regs + SCL_I3C_PP_TIMING);
+
+	/* I3C */
+	lcnt = DIV_ROUND_UP(core_rate, I3C_BUS_SDR1_SCL_RATE) - hcnt;
+	scl_timing = SCL_EXT_LCNT_1(lcnt);
+	lcnt = DIV_ROUND_UP(core_rate, I3C_BUS_SDR2_SCL_RATE) - hcnt;
+	scl_timing |= SCL_EXT_LCNT_2(lcnt);
+	lcnt = DIV_ROUND_UP(core_rate, I3C_BUS_SDR3_SCL_RATE) - hcnt;
+	scl_timing |= SCL_EXT_LCNT_3(lcnt);
+	lcnt = DIV_ROUND_UP(core_rate, I3C_BUS_SDR4_SCL_RATE) - hcnt;
+	scl_timing |= SCL_EXT_LCNT_4(lcnt);
+	sys_write32(scl_timing, config->regs + SCL_EXT_LCNT_TIMING);
+
+	/* I2C FM+ */
+	lcnt = DIV_ROUND_UP(I3C_BUS_I2C_FMP_TLOW_MIN_NS * (uint64_t)core_rate, I3C_PERIOD_NS);
+	hcnt = DIV_ROUND_UP(core_rate, I3C_BUS_I2C_FM_PLUS_SCL_RATE) - lcnt;
+	scl_timing = SCL_I2C_FMP_TIMING_HCNT(hcnt) | SCL_I2C_FMP_TIMING_LCNT(lcnt);
+	sys_write32(scl_timing, config->regs + SCL_I2C_FMP_TIMING);
+
+	/* I2C FM */
+	lcnt = DIV_ROUND_UP(I3C_BUS_I2C_FM_TLOW_MIN_NS * (uint64_t)core_rate, I3C_PERIOD_NS);
+	hcnt = DIV_ROUND_UP(core_rate, I3C_BUS_I2C_FM_SCL_RATE) - lcnt;
+	scl_timing = SCL_I2C_FM_TIMING_HCNT(hcnt) | SCL_I2C_FM_TIMING_LCNT(lcnt);
+	sys_write32(scl_timing, config->regs + SCL_I2C_FM_TIMING);
+
+	if (data->mode != I3C_BUS_MODE_PURE) {
+		sys_write32(BUS_I3C_MST_FREE(lcnt), config->regs + BUS_FREE_TIMING);
+		sys_write32(sys_read32(config->regs + DEVICE_CTRL) | DEV_CTRL_I2C_SLAVE_PRESENT,
+			    config->regs + DEVICE_CTRL);
+	}
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
+	/* I3C Bus Available Time */
+	scl_timing = DIV_ROUND_UP(I3C_BUS_AVAILABLE_TIME_NS * (uint64_t)core_rate,
+					I3C_PERIOD_NS);
+	sys_write32(BUS_I3C_AVAIL_TIME(scl_timing), config->regs + BUS_FREE_TIMING);
+
+	/* I3C Bus Idle Time */
+	scl_timing =
+		DIV_ROUND_UP(I3C_BUS_IDLE_TIME_NS * (uint64_t)core_rate, I3C_PERIOD_NS);
+	sys_write32(BUS_I3C_IDLE_TIME(scl_timing), config->regs + BUS_IDLE_TIMING);
+#endif /* CONFIG_I3C_TARGET */
+	return 0;
+}
+#ifdef CONFIG_I3C_CONTROLLER
+/**
+ * Determine I3C bus mode from the i2c devices on the bus
+ *
+ * Reads the LVR of all I2C devices and returns the I3C bus
+ * Mode
+ *
+ * @param dev_list Pointer to device list
+ *
+ * @return @see enum i3c_bus_mode.
+ */
+static enum i3c_bus_mode i3c_bus_mode(const struct i3c_dev_list *dev_list)
+{
+	enum i3c_bus_mode mode = I3C_BUS_MODE_PURE;
+
+	for (int i = 0; i < dev_list->num_i2c; i++) {
+		switch (I3C_LVR_I2C_DEV_IDX(dev_list->i2c[i].lvr)) {
+		case I3C_LVR_I2C_DEV_IDX_0:
+			if (mode < I3C_BUS_MODE_MIXED_FAST) {
+				mode = I3C_BUS_MODE_MIXED_FAST;
+			}
+			break;
+		case I3C_LVR_I2C_DEV_IDX_1:
+			if (mode < I3C_BUS_MODE_MIXED_LIMITED) {
+				mode = I3C_BUS_MODE_MIXED_LIMITED;
+			}
+			break;
+		case I3C_LVR_I2C_DEV_IDX_2:
+			if (mode < I3C_BUS_MODE_MIXED_SLOW) {
+				mode = I3C_BUS_MODE_MIXED_SLOW;
+			}
+			break;
+		default:
+			mode = I3C_BUS_MODE_INVALID;
+			break;
+		}
+	}
+	return mode;
+}
+
+static int dw_i3c_attach_device(const struct device *dev, struct i3c_device_desc *desc)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	uint8_t pos = get_free_pos(data->free_pos);
+	uint8_t addr = desc->dynamic_addr ? desc->dynamic_addr : desc->static_addr;
+
+	if (pos < 0) {
+		LOG_ERR("%s: no space for i3c device: %s", dev->name, desc->dev->name);
+		return -ENOSPC;
+	}
+
+	data->dw_i3c_i2c_priv_data[pos].id = pos;
+	desc->controller_priv = &(data->dw_i3c_i2c_priv_data[pos]);
+	data->free_pos &= ~BIT(pos);
+
+	LOG_DBG("%s: Attaching %s", dev->name, desc->dev->name);
+
+	sys_write32(DEV_ADDR_TABLE_DYNAMIC_ADDR(addr),
+		    config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, pos));
+
+	return 0;
+}
+
+static int dw_i3c_reattach_device(const struct device *dev, struct i3c_device_desc *desc,
+				  uint8_t old_dyn_addr)
+{
+	ARG_UNUSED(old_dyn_addr);
+
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_i2c_dev_data *dw_i3c_device_data = desc->controller_priv;
+	uint32_t dat;
+
+	if (dw_i3c_device_data == NULL) {
+		LOG_ERR("%s: %s: device not attached", dev->name, desc->dev->name);
+		return -EINVAL;
+	}
+	/* TODO: investigate clearing table beforehand */
+
+	LOG_DBG("Reattaching %s", desc->dev->name);
+
+	dat = sys_read32(config->regs +
+			 DEV_ADDR_TABLE_LOC(data->datstartaddr, dw_i3c_device_data->id));
+	dat &= ~DEV_ADDR_TABLE_DYNAMIC_ADDR_MASK;
+	sys_write32(DEV_ADDR_TABLE_DYNAMIC_ADDR(desc->dynamic_addr) | dat,
+		    config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, dw_i3c_device_data->id));
+
+	return 0;
+}
+
+static int dw_i3c_detach_device(const struct device *dev, struct i3c_device_desc *desc)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_i2c_dev_data *dw_i3c_device_data = desc->controller_priv;
+
+	if (dw_i3c_device_data == NULL) {
+		LOG_ERR("%s: %s: device not attached", dev->name, desc->dev->name);
+		return -EINVAL;
+	}
+
+	LOG_DBG("%s: Detaching %s", dev->name, desc->dev->name);
+
+	sys_write32(0,
+		    config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, dw_i3c_device_data->id));
+	data->free_pos |= BIT(dw_i3c_device_data->id);
+	desc->controller_priv = NULL;
+
+	return 0;
+}
+
+static int set_controller_info(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	uint8_t controller_da;
+
+	if (config->common.primary_controller_da) {
+		if (!i3c_addr_slots_is_free(&data->common.attached_dev.addr_slots,
+					    config->common.primary_controller_da)) {
+			controller_da = i3c_addr_slots_next_free_find(
+				&data->common.attached_dev.addr_slots, 0);
+			LOG_WRN("%s: 0x%02x DA selected for controller as 0x%02x is unavailable",
+				dev->name, controller_da, config->common.primary_controller_da);
+		} else {
+			controller_da = config->common.primary_controller_da;
+		}
+	} else {
+		controller_da =
+			i3c_addr_slots_next_free_find(&data->common.attached_dev.addr_slots, 0);
+	}
+
+	sys_write32(DEVICE_ADDR_DYNAMIC_ADDR_VALID | DEVICE_ADDR_DYNAMIC(controller_da),
+		    config->regs + DEVICE_ADDR);
+	/* Mark the address as I3C device */
+	i3c_addr_slots_mark_i3c(&data->common.attached_dev.addr_slots, controller_da);
+
+	return 0;
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+static void enable_interrupts(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	uint32_t thld_ctrl, intr_mask;
+
+	config->irq_config_func();
+
+	thld_ctrl = sys_read32(config->regs + QUEUE_THLD_CTRL);
+	thld_ctrl &= (~QUEUE_THLD_CTRL_RESP_BUF_MASK & ~QUEUE_THLD_CTRL_IBI_STS_MASK);
+	sys_write32(thld_ctrl, config->regs + QUEUE_THLD_CTRL);
+
+	thld_ctrl = sys_read32(config->regs + DATA_BUFFER_THLD_CTRL);
+	thld_ctrl &= ~DATA_BUFFER_THLD_CTRL_RX_BUF;
+	sys_write32(thld_ctrl, config->regs + DATA_BUFFER_THLD_CTRL);
+
+	sys_write32(INTR_ALL, config->regs + INTR_STATUS);
+
+	/* Enable interrupts */
+#if defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)
+	intr_mask = INTR_MASTER_MASK | INTR_SLAVE_MASK;
+#elif defined(CONFIG_I3C_CONTROLLER)
+	intr_mask = INTR_MASTER_MASK;
+#elif defined(CONFIG_I3C_TARGET)
+	intr_mask = INTR_SLAVE_MASK;
+#endif
+	sys_write32(intr_mask, config->regs + INTR_STATUS_EN);
+	sys_write32(intr_mask, config->regs + INTR_SIGNAL_EN);
+}
+#ifdef CONFIG_I3C_CONTROLLER
+/**
+ * @brief Calculate the odd parity of a byte.
+ *
+ * This function calculates the odd parity of the input byte, returning 1 if the
+ * number of set bits is odd and 0 otherwise.
+ *
+ * @param p The byte for which odd parity is to be calculated.
+ *
+ * @return The odd parity result (1 if odd, 0 if even).
+ */
+static uint8_t odd_parity(uint8_t p)
+{
+	p ^= p >> 4;
+	p &= 0xf;
+	return (0x9669 >> p) & 1;
+}
+
+/**
+ * @brief Send Common Command Code (CCC).
+ *
+ * @see i3c_do_ccc
+ *
+ * @param dev Pointer to controller device driver instance.
+ * @param payload Pointer to CCC payload.
+ *
+ * @return @see i3c_do_ccc
+ */
+static int dw_i3c_do_ccc(const struct device *dev, struct i3c_ccc_payload *payload)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_xfer *xfer = &data->xfer;
+	struct dw_i3c_cmd *cmd;
+	int ret, i, pos;
+	uint32_t present_state;
+
+	present_state = sys_read32(config->regs + PRESENT_STATE);
+	if (!(present_state & PRESENT_STATE_CURRENT_MASTER)) {
+		return -EACCES;
+	}
+
+	ret = k_mutex_lock(&data->mt, K_MSEC(1000));
+	if (ret) {
+		LOG_DBG("%s: Mutex err (%d)", dev->name, ret);
+		return ret;
+	}
+
+	pm_device_busy_set(dev);
+
+	memset(xfer, 0, sizeof(struct dw_i3c_xfer));
+	xfer->ret = -1;
+
+	/* in the case of multiple targets in a CCC, each command queue must have the same CCC ID
+	 * loaded along with different dev index fields pointing to the targets
+	 */
+	if (i3c_ccc_is_payload_broadcast(payload)) {
+		xfer->ncmds = 1;
+		cmd = &xfer->cmds[0];
+		cmd->buf = payload->ccc.data;
+
+		cmd->cmd_hi = COMMAND_PORT_ARG_DATA_LEN(payload->ccc.data_len) |
+			      COMMAND_PORT_TRANSFER_ARG;
+		cmd->cmd_lo = COMMAND_PORT_CP | COMMAND_PORT_TOC | COMMAND_PORT_ROC |
+			      COMMAND_PORT_CMD(payload->ccc.id);
+
+		if ((payload->targets.payloads) && (payload->targets.payloads[0].rnw)) {
+			cmd->cmd_lo |= COMMAND_PORT_READ_TRANSFER;
+			cmd->rx_len = payload->ccc.data_len;
+		} else {
+			cmd->tx_len = payload->ccc.data_len;
+		}
+	} else {
+		if (!(payload->targets.payloads)) {
+			LOG_ERR("%s: Direct CCC Payload structure Empty", dev->name);
+			ret = -EINVAL;
+			goto error;
+		}
+		xfer->ncmds = payload->targets.num_targets;
+		for (i = 0; i < payload->targets.num_targets; i++) {
+			cmd = &xfer->cmds[i];
+			/* Look up position, SETDASA will perform the look up by static addr */
+			pos = get_i3c_addr_pos(dev, payload->targets.payloads[i].addr,
+					       payload->ccc.id == I3C_CCC_SETDASA);
+			if (pos < 0) {
+				LOG_ERR("%s: Invalid Slave address with pos %d", dev->name, pos);
+				ret = -ENOSPC;
+				goto error;
+			}
+			cmd->buf = payload->targets.payloads[i].data;
+
+			cmd->cmd_hi =
+				COMMAND_PORT_ARG_DATA_LEN(payload->targets.payloads[i].data_len) |
+				COMMAND_PORT_TRANSFER_ARG;
+			cmd->cmd_lo = COMMAND_PORT_CP | COMMAND_PORT_DEV_INDEX(pos) |
+				      COMMAND_PORT_ROC | COMMAND_PORT_CMD(payload->ccc.id);
+			/* last command queue with multiple targets must have TOC set */
+			if (i == (payload->targets.num_targets - 1)) {
+				cmd->cmd_lo |= COMMAND_PORT_TOC;
+			}
+			/* If there is a defining byte for direct CCC */
+			if (payload->ccc.data_len == 1) {
+				cmd->cmd_lo |= COMMAND_PORT_DBP;
+				cmd->cmd_hi |= COMMAND_PORT_ARG_DB(payload->ccc.data[0]);
+			} else if (payload->ccc.data_len > 1) {
+				LOG_ERR("%s: direct CCCs defining byte >1", dev->name);
+				ret = -EINVAL;
+				goto error;
+			}
+
+			if (payload->targets.payloads[i].rnw) {
+				cmd->cmd_lo |= COMMAND_PORT_READ_TRANSFER;
+				cmd->rx_len = payload->targets.payloads[i].data_len;
+			} else {
+				cmd->tx_len = payload->targets.payloads[i].data_len;
+			}
+		}
+	}
+
+	start_xfer(dev);
+
+	ret = k_sem_take(&data->sem_xfer, K_MSEC(CONFIG_I3C_DW_RW_TIMEOUT_MS));
+	if (ret) {
+		LOG_ERR("%s: Semaphore err (%d)", dev->name, ret);
+		goto error;
+	}
+
+	/* the only way data_len would not equal num_xfer would be if an abort happened */
+	payload->ccc.num_xfer = payload->ccc.data_len;
+	for (i = 0; i < xfer->ncmds; i++) {
+		/* if this is a direct ccc, then write back the number of bytes tx or rx */
+		if (!i3c_ccc_is_payload_broadcast(payload)) {
+			payload->targets.payloads[i].num_xfer = payload->targets.payloads[i].rnw
+									? xfer->cmds[i].rx_len
+									: xfer->cmds[i].tx_len;
+		}
+		if (xfer->cmds[i].rx_len && !xfer->cmds[i].error) {
+			read_rx_fifo(dev, xfer->cmds[i].buf, xfer->cmds[i].rx_len);
+		}
+	}
+
+	ret = xfer->ret;
+error:
+	pm_device_busy_clear(dev);
+	k_mutex_unlock(&data->mt);
+
+	return ret;
+}
+
+/**
+ * @brief Add a slave device from Dynamic Address Assignment (DAA) information.
+ *
+ * This function adds a slave device to the I3C controller based on the Dynamic
+ * Address Assignment (DAA) information at the specified position. It retrieves
+ * the dynamic address, PID (Provisional ID), and additional device characteristics
+ * from the corresponding tables and associates the device with a registered device
+ * descriptor if the PID is known.
+ *
+ * @param dev Pointer to the I3C device structure.
+ * @param pos Position of the device in the DAA and DCT tables.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int add_slave_from_daa(const struct device *dev, int32_t pos)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	uint32_t tmp;
+	uint64_t pid;
+	uint8_t dyn_addr;
+
+	/* retrieve dynamic address assigned */
+	tmp = sys_read32(config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, pos));
+	dyn_addr = (((tmp) & GENMASK(22, 16)) >> 16);
+
+	/* retrieve pid */
+	tmp = sys_read32(config->regs + DEV_CHAR_TABLE_LOC1(data->dctstartaddr, pos));
+	pid = ((uint64_t)DEV_CHAR_TABLE_MSB_PID(tmp) << 16) + (DEV_CHAR_TABLE_LSB_PID(tmp) << 16);
+	tmp = sys_read32(config->regs + DEV_CHAR_TABLE_LOC2(data->dctstartaddr, pos));
+	pid |= DEV_CHAR_TABLE_LSB_PID(tmp);
+
+	/* lookup known pids */
+	const struct i3c_device_id i3c_id = I3C_DEVICE_ID(pid);
+	struct i3c_device_desc *target = i3c_device_find(dev, &i3c_id);
+
+	if (target == NULL) {
+		LOG_INF("%s: PID 0x%012llx is not in registered device "
+			"list, given DA 0x%02x",
+			dev->name, pid, dyn_addr);
+	} else {
+		target->dynamic_addr = dyn_addr;
+		tmp = sys_read32(config->regs + DEV_CHAR_TABLE_LOC3(data->dctstartaddr, pos));
+		target->bcr = DEV_CHAR_TABLE_BCR(tmp);
+		target->dcr = DEV_CHAR_TABLE_DCR(tmp);
+
+		LOG_DBG("%s: PID 0x%012llx assigned dynamic address 0x%02x", dev->name, pid,
+			dyn_addr);
+	}
+	i3c_addr_slots_mark_i3c(&data->common.attached_dev.addr_slots, dyn_addr);
+
+	return 0;
+}
+
+/**
+ * @brief Perform Dynamic Address Assignment.
+ *
+ * @see i3c_do_daa
+ *
+ * @param dev Pointer to controller device driver instance.
+ *
+ * @return @see i3c_do_daa
+ */
+static int dw_i3c_do_daa(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_xfer *xfer = &data->xfer;
+	struct dw_i3c_cmd *cmd;
+	uint32_t olddevs, newdevs;
+	uint8_t p, idx, last_addr = 0;
+	int32_t pos, addr, ret;
+	uint32_t present_state;
+
+	present_state = sys_read32(config->regs + PRESENT_STATE);
+	if (!(present_state & PRESENT_STATE_CURRENT_MASTER)) {
+		return -EACCES;
+	}
+
+	olddevs = ~(data->free_pos);
+
+	/* Prepare DAT before launching DAA. */
+	for (pos = 0; pos < data->maxdevs; pos++) {
+		if (olddevs & BIT(pos)) {
+			continue;
+		}
+
+		addr = i3c_addr_slots_next_free_find(&data->common.attached_dev.addr_slots,
+						     last_addr + 1);
+		if (addr == 0) {
+			return -ENOSPC;
+		}
+
+		p = odd_parity(addr);
+		last_addr = addr;
+		addr |= (p << 7);
+		sys_write32(DEV_ADDR_TABLE_DYNAMIC_ADDR(addr),
+			    config->regs + DEV_ADDR_TABLE_LOC(data->datstartaddr, pos));
+	}
+
+	pos = get_free_pos(data->free_pos);
+	if (pos < 0) {
+		LOG_ERR("%s: find free pos failed", dev->name);
+		return -ENOSPC;
+	}
+
+	ret = k_mutex_lock(&data->mt, K_MSEC(1000));
+	if (ret) {
+		LOG_ERR("%s: Mutex err (%d)", dev->name, ret);
+		return ret;
+	}
+
+	pm_device_busy_set(dev);
+
+	memset(xfer, 0, sizeof(struct dw_i3c_xfer));
+
+	xfer->ncmds = 1;
+	xfer->ret = -1;
+
+	cmd = &xfer->cmds[0];
+	cmd->cmd_hi = COMMAND_PORT_TRANSFER_ARG;
+	cmd->cmd_lo = COMMAND_PORT_TOC | COMMAND_PORT_ROC |
+		      COMMAND_PORT_DEV_COUNT(data->maxdevs - pos) | COMMAND_PORT_DEV_INDEX(pos) |
+		      COMMAND_PORT_CMD(I3C_CCC_ENTDAA) | COMMAND_PORT_ADDR_ASSGN_CMD;
+
+	start_xfer(dev);
+	ret = k_sem_take(&data->sem_xfer, K_MSEC(CONFIG_I3C_DW_RW_TIMEOUT_MS));
+
+	pm_device_busy_clear(dev);
+	k_mutex_unlock(&data->mt);
+
+	if (ret) {
+		LOG_ERR("%s: Semaphore err (%d)", dev->name, ret);
+		return ret;
+	}
+
+	if (data->maxdevs == cmd->rx_len) {
+		newdevs = 0;
+	} else {
+		newdevs = GENMASK(data->maxdevs - cmd->rx_len - 1, 0);
+	}
+	newdevs &= ~olddevs;
+
+	for (pos = find_lsb_set(newdevs); pos <= find_msb_set(newdevs); pos++) {
+		idx = pos - 1;
+		if (newdevs & BIT(idx)) {
+			add_slave_from_daa(dev, idx);
+		}
+	}
+
+	return 0;
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+
+static void dw_i3c_enable_controller(const struct dw_i3c_config *config, bool enable)
+{
+	uint32_t reg = sys_read32(config->regs + DEVICE_CTRL);
+
+	if (enable) {
+		reg |= DEV_CTRL_ENABLE;
+	} else {
+		reg &= ~DEV_CTRL_ENABLE;
+	}
+
+	sys_write32(reg, config->regs + DEVICE_CTRL);
+}
+
+/**
+ * @brief Get configuration of the I3C hardware.
+ *
+ * This provides a way to get the current configuration of the I3C hardware.
+ *
+ * This can return cached config or probed hardware parameters, but it has to
+ * be up to date with current configuration.
+ *
+ * @param[in] dev Pointer to controller device driver instance.
+ * @param[in] type Type of configuration parameters being passed
+ *                 in @p config.
+ * @param[in,out] config Pointer to the configuration parameters.
+ *
+ * Note that if @p type is @c I3C_CONFIG_CUSTOM, @p config must contain
+ * the ID of the parameter to be retrieved.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General Input/Output errors.
+ * @retval -ENOSYS If not implemented.
+ */
+static int dw_i3c_config_get(const struct device *dev, enum i3c_config_type type, void *config)
+{
+#ifdef CONFIG_I3C_TARGET
+	const struct dw_i3c_config *dev_config = dev->config;
+#endif /* CONFIG_I3C_TARGET */
+#ifdef CONFIG_I3C_CONTROLLER
+	struct dw_i3c_data *data = dev->data;
+#endif /* CONFIG_I3C_CONTROLLER */
+	int ret = 0;
+
+	if (type == I3C_CONFIG_CONTROLLER) {
+#ifdef CONFIG_I3C_CONTROLLER
+		(void)memcpy(config, &data->common.ctrl_config, sizeof(data->common.ctrl_config));
+#else
+		return -ENOTSUP;
+#endif /* CONFIG_I3C_CONTROLLER */
+	} else if (type == I3C_CONFIG_TARGET) {
+#ifdef CONFIG_I3C_TARGET
+		struct i3c_config_target *target_config = config;
+		uint32_t reg;
+
+		reg = sys_read32(dev_config->regs + SLV_MAX_LEN);
+		target_config->max_read_len = SLV_MAX_LEN_MRL(reg);
+		target_config->max_write_len = SLV_MAX_LEN_MWL(reg);
+
+		reg = sys_read32(dev_config->regs + DEVICE_ADDR);
+		if (reg & DEVICE_ADDR_STATIC_ADDR_VALID) {
+			target_config->static_addr = DEVICE_ADDR_STATIC(reg);
+		} else {
+			target_config->static_addr = 0x00;
+		}
+
+		reg = sys_read32(dev_config->regs + SLV_CHAR_CTRL);
+		target_config->bcr = SLV_CHAR_CTRL_BCR(reg);
+		target_config->dcr = SLV_CHAR_CTRL_DCR(reg);
+		target_config->supported_hdr = SLV_CHAR_CTRL_HDR_CAP(reg);
+
+		reg = sys_read32(dev_config->regs + SLV_MIPI_ID_VALUE);
+		target_config->pid = ((uint64_t)reg) << 32;
+		target_config->pid_random = (bool)!!(reg & SLV_MIPI_ID_VALUE_SLV_PROV_ID_SEL);
+		reg = sys_read32(dev_config->regs + SLV_PID_VALUE);
+		target_config->pid |= reg;
+
+		if (!(sys_read32(dev_config->regs + PRESENT_STATE) &
+		      PRESENT_STATE_CURRENT_MASTER)) {
+			target_config->enabled = true;
+		} else {
+			target_config->enabled = false;
+		}
+#else
+		return -ENOTSUP;
+#endif /* CONFIG_I3C_TARGET */
+	} else {
+		return -EINVAL;
+	}
+
+	return ret;
+}
+
+/**
+ * @brief Configure I3C hardware.
+ *
+ * @param dev Pointer to controller device driver instance.
+ * @param type Type of configuration parameters being passed
+ *             in @p config.
+ * @param config Pointer to the configuration parameters.
+ *
+ * @retval 0 If successful.
+ * @retval -EINVAL If invalid configure parameters.
+ * @retval -EIO General Input/Output errors.
+ * @retval -ENOSYS If not implemented.
+ */
+static int dw_i3c_configure(const struct device *dev, enum i3c_config_type type, void *config)
+{
+#ifdef CONFIG_I3C_TARGET
+	const struct dw_i3c_config *dev_config = dev->config;
+#endif /* CONFIG_I3C_TARGET */
+
+	if (type == I3C_CONFIG_CONTROLLER) {
+		/* struct i3c_config_controller *ctrl_cfg = config; */
+		/* TODO: somehow determine i3c rate? snps is complicated */
+		return -ENOTSUP;
+	} else if (type == I3C_CONFIG_TARGET) {
+#ifdef CONFIG_I3C_TARGET
+		struct i3c_config_target *target_cfg = config;
+		uint32_t val;
+
+		/* TODO: some how randomly generate pid */
+		if (target_cfg->pid_random) {
+			return -EINVAL;
+		}
+
+		val = SLV_MAX_LEN_MWL(target_cfg->max_write_len) |
+		      (SLV_MAX_LEN_MRL(target_cfg->max_read_len) << 16);
+		sys_write32(val, dev_config->regs + SLV_MAX_LEN);
+
+		/* set static address */
+		val = sys_read32(dev_config->regs + DEVICE_ADDR);
+		/* if static address is set to 0x00, then disable static_addr_en */
+		if (target_cfg->static_addr != 0x00) {
+			val |= DEVICE_ADDR_STATIC_ADDR_VALID;
+		} else {
+			val &= ~DEVICE_ADDR_STATIC_ADDR_VALID;
+		}
+		val &= ~DEVICE_ADDR_STATIC_MASK;
+		val |= DEVICE_ADDR_STATIC(target_cfg->static_addr);
+		sys_write32(val, dev_config->regs + DEVICE_ADDR);
+
+		val = sys_read32(dev_config->regs + SLV_CHAR_CTRL);
+		val &= ~(SLV_CHAR_CTRL_BCR_MASK | SLV_CHAR_CTRL_DCR_MASK);
+		/* Bridge identifier, offline capable, ibi_payload, ibi_request_capable can not be
+		 * written to in bcr
+		 */
+		val |= SLV_CHAR_CTRL_BCR(target_cfg->bcr);
+		val |= SLV_CHAR_CTRL_DCR(target_cfg->dcr) << 8;
+		/* HDR CAPs is not settable */
+		sys_write32(val, dev_config->regs + SLV_CHAR_CTRL);
+
+		val = sys_read32(dev_config->regs + SLV_MIPI_ID_VALUE);
+		val &= ~(SLV_MIPI_ID_VALUE_SLV_MIPI_MFG_ID_MASK |
+			 SLV_MIPI_ID_VALUE_SLV_PROV_ID_SEL);
+		val |= (uint32_t)(target_cfg->pid >> 16);
+		sys_write32(val, dev_config->regs + SLV_MIPI_ID_VALUE);
+
+		val = (uint32_t)(target_cfg->pid & 0xFFFFFFFF);
+		sys_write32(val, dev_config->regs + SLV_PID_VALUE);
+#else
+		return -ENOTSUP;
+#endif /* CONFIG_I3C_TARGET */
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#ifdef CONFIG_I3C_CONTROLLER
+/**
+ * @brief Find a registered I3C target device.
+ *
+ * This returns the I3C device descriptor of the I3C device
+ * matching the incoming @p id.
+ *
+ * @param dev Pointer to controller device driver instance.
+ * @param id Pointer to I3C device ID.
+ *
+ * @return @see i3c_device_find.
+ */
+static struct i3c_device_desc *dw_i3c_device_find(const struct device *dev,
+						  const struct i3c_device_id *id)
+{
+	const struct dw_i3c_config *config = dev->config;
+
+	return i3c_dev_list_find(&config->common.dev_list, id);
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
+/**
+ * @brief Writes to the Target's TX FIFO
+ *
+ * The Synopsys I3C will then ACK read requests to it's TX FIFO from a
+ * Controller, if there is no tx cmd in cmd Q. Then it will NACK.
+ *
+ * @param dev Pointer to the device structure for an I3C controller
+ *            driver configured in target mode.
+ * @param buf Pointer to the buffer
+ * @param len Length of the buffer
+ *
+ * @retval Total number of bytes written
+ * @retval -EACCES Not in Target Mode
+ * @retval -ENOSPC No space in Tx FIFO
+ */
+static int dw_i3c_target_tx_write(const struct device *dev, uint8_t *buf, uint16_t len,
+				  uint8_t hdr_mode)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct dw_i3c_xfer *xfer = &data->xfer;
+	uint32_t present_state;
+
+	/* check if we are in target mode */
+	present_state = sys_read32(config->regs + PRESENT_STATE);
+	if (present_state & PRESENT_STATE_CURRENT_MASTER) {
+		return -EACCES;
+	}
+
+	/*
+	 * TODO: if len is greater than fifo size, then it will need to be written to based
+	 * on the threshold interrupt
+	 */
+	if (len > (data->txfifodepth * BYTES_PER_DWORD)) {
+		return -ENOSPC;
+	}
+
+	k_mutex_lock(&data->mt, K_FOREVER);
+
+	if ((hdr_mode == 0) || (hdr_mode & data->common.ctrl_config.supported_hdr)) {
+		/* Write to CMD */
+		memset(xfer, 0, sizeof(struct dw_i3c_xfer));
+		xfer->ncmds = 1;
+
+		/* TODO: write_tx_fifo needs to check that the fifo doesn't fill up */
+		struct dw_i3c_cmd *cmd = &xfer->cmds[0];
+
+		cmd->cmd_hi = 0;
+		cmd->cmd_lo = COMMAND_PORT_TID(0) | COMMAND_PORT_ARG_DATA_LEN(len);
+		cmd->buf = buf;
+		cmd->tx_len = len;
+
+		start_xfer(dev);
+	} else {
+		k_mutex_unlock(&data->mt);
+		LOG_ERR("%s: Unsupported HDR Mode %d", dev->name, hdr_mode);
+		return -ENOTSUP;
+	}
+
+	k_mutex_unlock(&data->mt);
+
+	/* return total bytes written */
+	return (int)len;
+}
+
+/**
+ * @brief Instructs the I3C Target device to register itself to the I3C Controller
+ *
+ * This routine instructs the I3C Target device to register itself to the I3C
+ * Controller via its parent controller's i3c_target_register() API.
+ *
+ * @param dev Pointer to target device driver instance.
+ * @param cfg Config struct with functions and parameters used by the I3C driver
+ * to send bus events
+ *
+ * @return @see i3c_device_find.
+ */
+static int dw_i3c_target_register(const struct device *dev, struct i3c_target_config *cfg)
+{
+	struct dw_i3c_data *data = dev->data;
+
+	data->target_config = cfg;
+	return 0;
+}
+
+/**
+ * @brief Unregisters the provided config as Target device
+ *
+ * This routine disables I3C target mode for the 'dev' I3C bus driver using
+ * the provided 'config' struct containing the functions and parameters
+ * to send bus events.
+ *
+ * @param dev Pointer to target device driver instance.
+ * @param cfg Config struct with functions and parameters used by the I3C driver
+ * to send bus events
+ *
+ * @return @see i3c_device_find.
+ */
+static int dw_i3c_target_unregister(const struct device *dev, struct i3c_target_config *cfg)
+{
+	/* no way to disable? maybe write DA to 0? */
+	return 0;
+}
+#endif /* CONFIG_I3C_TARGET */
+
+static int dw_i3c_pinctrl_enable(const struct device *dev, bool enable)
+{
+#ifdef CONFIG_PINCTRL
+	const struct dw_i3c_config *config = dev->config;
+	uint8_t state = enable ? PINCTRL_STATE_DEFAULT : PINCTRL_STATE_SLEEP;
+	int ret;
+
+	ret = pinctrl_apply_state(config->pcfg, state);
+	if (ret == -ENOENT) {
+		/* State not defined; ignore and return success. */
+		ret = 0;
+	}
+
+	return ret;
+#else
+	ARG_UNUSED(dev);
+	ARG_UNUSED(enable);
+	return 0;
+#endif
+}
+
+static int dw_i3c_init(const struct device *dev)
+{
+	const struct dw_i3c_config *config = dev->config;
+	struct dw_i3c_data *data = dev->data;
+	struct i3c_config_controller *ctrl_config = &data->common.ctrl_config;
+	int ret;
+	uint32_t hw_capabilities;
+	uint32_t queue_capability;
+	uint32_t device_ctrl_ext;
+
+	if (!device_is_ready(config->clock)) {
+		return -ENODEV;
+	}
+
+	ret = clock_control_on(config->clock, NULL);
+	if (ret < 0) {
+		return ret;
+	}
+
+#ifdef CONFIG_I3C_USE_IBI
+	k_sem_init(&data->ibi_sts_sem, 0, 1);
+#endif /* CONFIG_I3C_USE_IBI */
+	k_sem_init(&data->sem_xfer, 0, 1);
+	k_mutex_init(&data->mt);
+
+	dw_i3c_pinctrl_enable(dev, true);
+#ifdef CONFIG_I3C_CONTROLLER
+	data->mode = i3c_bus_mode(&config->common.dev_list);
+#endif /* CONFIG_I3C_CONTROLLER */
+	/* reset all */
+	sys_write32(RESET_CTRL_ALL, config->regs + RESET_CTRL);
+
+	/* get DAT, DCT pointer */
+	data->datstartaddr =
+		DEVICE_ADDR_TABLE_ADDR(sys_read32(config->regs + DEVICE_ADDR_TABLE_POINTER));
+	data->dctstartaddr =
+		DEVICE_CHAR_TABLE_ADDR(sys_read32(config->regs + DEV_CHAR_TABLE_POINTER));
+
+	/* get max devices based on table depth */
+	data->maxdevs =
+		DEVICE_ADDR_TABLE_DEPTH(sys_read32(config->regs + DEVICE_ADDR_TABLE_POINTER));
+	data->free_pos = GENMASK(data->maxdevs - 1, 0);
+
+	/* get fifo sizes */
+	queue_capability = sys_read32(config->regs + QUEUE_SIZE_CAPABILITY);
+	data->txfifodepth = QUEUE_SIZE_CAPABILITY_TX_BUF_DWORD_SIZE(queue_capability);
+	data->rxfifodepth = QUEUE_SIZE_CAPABILITY_RX_BUF_DWORD_SIZE(queue_capability);
+	data->cmdfifodepth = QUEUE_SIZE_CAPABILITY_CMD_BUF_DWORD_SIZE(queue_capability);
+	data->respfifodepth = QUEUE_SIZE_CAPABILITY_RESP_BUF_DWORD_SIZE(queue_capability);
+	data->ibififodepth = QUEUE_SIZE_CAPABILITY_IBI_BUF_DWORD_SIZE(queue_capability);
+
+	/* get HDR capabilities */
+	ctrl_config->supported_hdr = 0;
+	hw_capabilities = sys_read32(config->regs + HW_CAPABILITY);
+	if (hw_capabilities & HW_CAPABILITY_HDR_TS_EN) {
+		ctrl_config->supported_hdr |= I3C_MSG_HDR_TSP | I3C_MSG_HDR_TSL;
+	}
+	if (hw_capabilities & HW_CAPABILITY_HDR_DDR_EN) {
+		ctrl_config->supported_hdr |= I3C_MSG_HDR_DDR;
+	}
+
+	/* if the boot condition starts as a target, then it's a secondary controller */
+	device_ctrl_ext = sys_read32(config->regs + DEVICE_CTRL_EXTENDED);
+	if (DEVICE_CTRL_EXTENDED_DEV_OPERATION_MODE(device_ctrl_ext) &
+	    DEVICE_CTRL_EXTENDED_DEV_OPERATION_MODE_SLAVE) {
+		ctrl_config->is_secondary = true;
+	} else {
+		ctrl_config->is_secondary = false;
+	}
+	/*
+	 * Ensure that is_secondary is only set when CONFIG_I3C_TARGET is enabled,
+	 * or ensure that it is false when CONFIG_I3C_CONTROLLER is enabled.
+	 */
+	__ASSERT_NO_MSG((IS_ENABLED(CONFIG_I3C_TARGET) && ctrl_config->is_secondary) ||
+			(IS_ENABLED(CONFIG_I3C_CONTROLLER) && !ctrl_config->is_secondary));
+
+	ret = init_scl_timing(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	enable_interrupts(dev);
+
+	/* disable ibi */
+	sys_write32(IBI_REQ_REJECT_ALL, config->regs + IBI_SIR_REQ_REJECT);
+	sys_write32(IBI_REQ_REJECT_ALL, config->regs + IBI_MR_REQ_REJECT);
+
+	/* disable hot-join */
+	sys_write32(sys_read32(config->regs + DEVICE_CTRL) | (DEV_CTRL_HOT_JOIN_NACK),
+		    config->regs + DEVICE_CTRL);
+#ifdef CONFIG_I3C_CONTROLLER
+	ret = i3c_addr_slots_init(dev);
+	if (ret != 0) {
+		return ret;
+	}
+#endif /* CONFIG_I3C_CONTROLLER */
+	dw_i3c_enable_controller(config, true);
+#ifdef CONFIG_I3C_CONTROLLER
+	if (!(ctrl_config->is_secondary)) {
+		ret = set_controller_info(dev);
+		if (ret) {
+			return ret;
+		}
+		/* Perform bus initialization - skip if no I3C devices are known. */
+		if (config->common.dev_list.num_i3c > 0) {
+			ret = i3c_bus_init(dev, &config->common.dev_list);
+		}
+		/* Bus Initialization Complete, allow HJ ACKs */
+		sys_write32(sys_read32(config->regs + DEVICE_CTRL) & ~(DEV_CTRL_HOT_JOIN_NACK),
+			    config->regs + DEVICE_CTRL);
+	}
+#endif /* CONFIG_I3C_CONTROLLER */
+
+	return 0;
+}
+
+#if defined(CONFIG_PM_DEVICE)
+static int dw_i3c_pm_ctrl(const struct device *dev, enum pm_device_action action)
+{
+	const struct dw_i3c_config *config = dev->config;
+
+	LOG_DBG("PM action: %d", (int)action);
+
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		dw_i3c_enable_controller(config, false);
+		dw_i3c_pinctrl_enable(dev, false);
+		break;
+
+	case PM_DEVICE_ACTION_RESUME:
+		dw_i3c_pinctrl_enable(dev, true);
+		dw_i3c_enable_controller(config, true);
+		break;
+
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+#endif
+
+static DEVICE_API(i3c, dw_i3c_api) = {
+#ifdef CONFIG_I3C_CONTROLLER
+	.i2c_api.transfer = dw_i3c_i2c_api_transfer,
+#ifdef CONFIG_I2C_RTIO
+	.i2c_api.iodev_submit = i2c_iodev_submit_fallback,
+#endif
+#endif /* CONFIG_I3C_CONTROLLER */
+
+	.configure = dw_i3c_configure,
+	.config_get = dw_i3c_config_get,
+#ifdef CONFIG_I3C_CONTROLLER
+	.attach_i3c_device = dw_i3c_attach_device,
+	.reattach_i3c_device = dw_i3c_reattach_device,
+	.detach_i3c_device = dw_i3c_detach_device,
+
+	.do_daa = dw_i3c_do_daa,
+	.do_ccc = dw_i3c_do_ccc,
+
+	.i3c_device_find = dw_i3c_device_find,
+
+	.i3c_xfers = dw_i3c_xfers,
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
+	.target_tx_write = dw_i3c_target_tx_write,
+	.target_register = dw_i3c_target_register,
+	.target_unregister = dw_i3c_target_unregister,
+#endif /* CONFIG_I3C_TARGET */
+#ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_CONTROLLER
+	.ibi_hj_response = dw_i3c_controller_ibi_hj_response,
+	.ibi_enable = dw_i3c_controller_enable_ibi,
+	.ibi_disable = dw_i3c_controller_disable_ibi,
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
+	.ibi_raise = dw_i3c_target_ibi_raise,
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_USE_IBI */
+
+#ifdef CONFIG_I3C_RTIO
+	.iodev_submit = i3c_iodev_submit_fallback,
+#endif
+};
+
+#define I3C_DW_IRQ_HANDLER(n)                                                                      \
+	static void i3c_dw_irq_config_##n(void)                                                    \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), i3c_dw_irq,                 \
+			    DEVICE_DT_INST_GET(n), 0);                                             \
+		irq_enable(DT_INST_IRQN(n));                                                       \
+	}
+
+#if defined(CONFIG_PINCTRL)
+#define I3C_DW_PINCTRL_DEFINE(n) PINCTRL_DT_INST_DEFINE(n)
+#define I3C_DW_PINCTRL_INIT(n)   .pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),
+#else
+#define I3C_DW_PINCTRL_DEFINE(n)
+#define I3C_DW_PINCTRL_INIT(n)
+#endif
+
+#define DEFINE_DEVICE_FN(n)                                                                        \
+	I3C_DW_IRQ_HANDLER(n)                                                                      \
+	I3C_DW_PINCTRL_DEFINE(n);                                                                  \
+	IF_ENABLED(CONFIG_I3C_CONTROLLER,                                                          \
+		   (static struct i3c_device_desc dw_i3c_device_array_##n[] =                      \
+			    I3C_DEVICE_ARRAY_DT_INST(n);                                           \
+		    static struct i3c_i2c_device_desc dw_i3c_i2c_device_array_##n[] =              \
+			    I3C_I2C_DEVICE_ARRAY_DT_INST(n);))                                     \
+	static struct dw_i3c_data dw_i3c_data_##n = {                                              \
+		.common.ctrl_config.scl.i3c =                                                      \
+			DT_INST_PROP_OR(n, i3c_scl_hz, I3C_BUS_TYP_I3C_SCL_RATE),                  \
+		.common.ctrl_config.scl.i2c = DT_INST_PROP_OR(n, i2c_scl_hz, 0),                   \
+	};                                                                                         \
+	static const struct dw_i3c_config dw_i3c_cfg_##n = {                                       \
+		.regs = DT_INST_REG_ADDR(n),                                                       \
+		.clock = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),                                    \
+		.od_thigh_max_ns = DT_INST_PROP(n, od_thigh_max_ns),                               \
+		.od_tlow_min_ns = DT_INST_PROP(n, od_tlow_min_ns),                                 \
+		.irq_config_func = &i3c_dw_irq_config_##n,                                         \
+		IF_ENABLED(CONFIG_I3C_CONTROLLER,                                                  \
+			(.common.dev_list.i3c = dw_i3c_device_array_##n,                           \
+			.common.dev_list.num_i3c = ARRAY_SIZE(dw_i3c_device_array_##n),            \
+			.common.dev_list.i2c = dw_i3c_i2c_device_array_##n,                        \
+			.common.dev_list.num_i2c = ARRAY_SIZE(dw_i3c_i2c_device_array_##n),        \
+			.common.primary_controller_da = DT_INST_PROP_OR(n, primary_controller_da, 0x00),)) \
+		I3C_DW_PINCTRL_INIT(n)};                                                           \
+	PM_DEVICE_DT_INST_DEFINE(n, dw_i3c_pm_action);                                             \
+	DEVICE_DT_INST_DEFINE(n, dw_i3c_init, PM_DEVICE_DT_INST_GET(n), &dw_i3c_data_##n,          \
+			      &dw_i3c_cfg_##n, POST_KERNEL, CONFIG_I3C_CONTROLLER_INIT_PRIORITY,   \
+			      &dw_i3c_api);
+
+#define DT_DRV_COMPAT snps_designware_i3c
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_DEVICE_FN);
diff --git a/drivers/i3c/i3c_ibi_workq.c b/drivers/i3c/i3c_ibi_workq.c
index 45cc1585b788a..b0b2088626bfb 100644
--- a/drivers/i3c/i3c_ibi_workq.c
+++ b/drivers/i3c/i3c_ibi_workq.c
@@ -208,13 +208,14 @@ static void i3c_ibi_work_handler(struct k_work *work)
 		if ((ret != 0) && (ret != -EBUSY)) {
 			LOG_ERR("i3c_do_daa returns %d", ret);
 		}
-
+#ifdef CONFIG_I3C_TARGET
 		if (i3c_bus_has_sec_controller(ibi_node->controller)) {
 			ret = i3c_bus_deftgts(ibi_node->controller);
 			if (ret != 0) {
 				LOG_ERR("Error sending DEFTGTS");
 			}
 		}
+#endif /* CONFIG_I3C_TARGET */
 		break;
 
 	case I3C_IBI_WORKQUEUE_CB:
@@ -224,10 +225,12 @@ static void i3c_ibi_work_handler(struct k_work *work)
 		break;
 
 	case I3C_IBI_CONTROLLER_ROLE_REQUEST:
+#ifdef CONFIG_I3C_TARGET
 		ret = i3c_device_controller_handoff(ibi_node->target, true);
 		if (ret != 0) {
 			LOG_ERR("i3c_device_controller_handoff returns %d", ret);
 		}
+#endif /* CONFIG_I3C_TARGET */
 		break;
 
 	default:
diff --git a/drivers/i3c/i3c_shell.c b/drivers/i3c/i3c_shell.c
index d440c5f7eb4ea..7a37919016c02 100644
--- a/drivers/i3c/i3c_shell.c
+++ b/drivers/i3c/i3c_shell.c
@@ -24,10 +24,12 @@ LOG_MODULE_REGISTER(i3c_shell, CONFIG_LOG_DEFAULT_LEVEL);
 
 struct i3c_ctrl {
 	const struct device *dev;
+#ifdef CONFIG_I3C_CONTROLLER
 	const union shell_cmd_entry *i3c_attached_dev_subcmd;
 	const union shell_cmd_entry *i3c_list_dev_subcmd;
+#endif
 };
-
+#ifdef CONFIG_I3C_CONTROLLER
 #define I3C_ATTACHED_DEV_GET_FN(node_id)                                                           \
 	static void node_id##cmd_i3c_attached_get(size_t idx, struct shell_static_entry *entry);   \
                                                                                                    \
@@ -82,14 +84,16 @@ struct i3c_ctrl {
 DT_FOREACH_STATUS_OKAY(cdns_i3c, I3C_CTRL_FN)
 DT_FOREACH_STATUS_OKAY(nuvoton_npcx_i3c, I3C_CTRL_FN)
 DT_FOREACH_STATUS_OKAY(nxp_mcux_i3c, I3C_CTRL_FN)
+DT_FOREACH_STATUS_OKAY(snps_designware_i3c, I3C_CTRL_FN)
 DT_FOREACH_STATUS_OKAY(st_stm32_i3c, I3C_CTRL_FN)
 /* zephyr-keep-sorted-stop */
-
+#endif /* CONFIG_I3C_CONTROLLER */
 #define I3C_CTRL_LIST_ENTRY(node_id)                                                               \
 	{                                                                                          \
 		.dev = DEVICE_DT_GET(node_id),                                                     \
-		.i3c_attached_dev_subcmd = &node_id##sub_i3c_attached,                             \
-		.i3c_list_dev_subcmd = &node_id##sub_i3c_list,                                     \
+		IF_ENABLED(CONFIG_I3C_CONTROLLER,                                                  \
+			   (.i3c_attached_dev_subcmd = &node_id##sub_i3c_attached,                 \
+			    .i3c_list_dev_subcmd = &node_id##sub_i3c_list,))                       \
 	},
 
 const struct i3c_ctrl i3c_list[] = {
@@ -97,10 +101,11 @@ const struct i3c_ctrl i3c_list[] = {
 	DT_FOREACH_STATUS_OKAY(cdns_i3c, I3C_CTRL_LIST_ENTRY)
 	DT_FOREACH_STATUS_OKAY(nuvoton_npcx_i3c, I3C_CTRL_LIST_ENTRY)
 	DT_FOREACH_STATUS_OKAY(nxp_mcux_i3c, I3C_CTRL_LIST_ENTRY)
+	DT_FOREACH_STATUS_OKAY(snps_designware_i3c, I3C_CTRL_LIST_ENTRY)
 	DT_FOREACH_STATUS_OKAY(st_stm32_i3c, I3C_CTRL_LIST_ENTRY)
 	/* zephyr-keep-sorted-stop */
 };
-
+#ifdef CONFIG_I3C_CONTROLLER
 static int get_bytes_count_for_hex(char *arg)
 {
 	int length = (strlen(arg) + 1) / 2;
@@ -198,9 +203,6 @@ static int cmd_i3c_info(const struct shell *sh, size_t argc, char **argv)
 						    "\tpid: 0x%012llx\n"
 						    "\tstatic_addr: 0x%02x\n"
 						    "\tdynamic_addr: 0x%02x\n"
-#if defined(CONFIG_I3C_USE_GROUP_ADDR)
-						    "\tgroup_addr: 0x%02x\n"
-#endif
 						    "\tbcr: 0x%02x\n"
 						    "\tdcr: 0x%02x\n"
 						    "\tmaxrd: 0x%02x\n"
@@ -214,9 +216,6 @@ static int cmd_i3c_info(const struct shell *sh, size_t argc, char **argv)
 						    "\tcrcaps: 0x%02x; 0x%02x",
 						    desc->dev->name, (uint64_t)desc->pid,
 						    desc->static_addr, desc->dynamic_addr,
-#if defined(CONFIG_I3C_USE_GROUP_ADDR)
-						    desc->group_addr,
-#endif
 						    desc->bcr, desc->dcr, desc->data_speed.maxrd,
 						    desc->data_speed.maxwr,
 						    desc->data_speed.max_read_turnaround,
@@ -247,9 +246,6 @@ static int cmd_i3c_info(const struct shell *sh, size_t argc, char **argv)
 					    "\tpid: 0x%012llx\n"
 					    "\tstatic_addr: 0x%02x\n"
 					    "\tdynamic_addr: 0x%02x\n"
-#if defined(CONFIG_I3C_USE_GROUP_ADDR)
-					    "\tgroup_addr: 0x%02x\n"
-#endif
 					    "\tbcr: 0x%02x\n"
 					    "\tdcr: 0x%02x\n"
 					    "\tmaxrd: 0x%02x\n"
@@ -263,9 +259,6 @@ static int cmd_i3c_info(const struct shell *sh, size_t argc, char **argv)
 					    "\tcrcaps: 0x%02x; 0x%02x",
 					    desc->dev->name, (uint64_t)desc->pid, desc->static_addr,
 					    desc->dynamic_addr,
-#if defined(CONFIG_I3C_USE_GROUP_ADDR)
-					    desc->group_addr,
-#endif
 					    desc->bcr, desc->dcr, desc->data_speed.maxrd,
 					    desc->data_speed.maxwr,
 					    desc->data_speed.max_read_turnaround,
@@ -573,6 +566,36 @@ static int cmd_i3c_hdr_ddr_read(const struct shell *sh, size_t argc, char **argv
 	return ret;
 }
 
+/* i3c ccc rstdaa_dc <device> <target> */
+static int cmd_i3c_ccc_rstdaa_dc(const struct shell *sh, size_t argc, char **argv)
+{
+	const struct device *dev, *tdev;
+	struct i3c_device_desc *desc;
+	int ret;
+
+	ret = i3c_parse_args(sh, argv, &dev, &tdev, &desc);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (!(desc->flags & I3C_V1P0_SUPPORT)) {
+		shell_error(sh, "I3C: %s does not support RSTDAA_DC.", tdev->name);
+		return -ENOTSUP;
+	}
+
+	ret = i3c_ccc_do_rstdaa(desc);
+	if (ret < 0) {
+		shell_error(sh, "I3C: unable to send CCC RSTDAA.");
+		return ret;
+	}
+
+	/* reset device DA */
+	desc->dynamic_addr = 0;
+	shell_print(sh, "Reset dynamic address for device %s", desc->dev->name);
+
+	return ret;
+}
+
 /* i3c ccc rstdaa <device> */
 static int cmd_i3c_ccc_rstdaa(const struct shell *sh, size_t argc, char **argv)
 {
@@ -636,7 +659,7 @@ static int cmd_i3c_ccc_setaasa(const struct shell *sh, size_t argc, char **argv)
 
 	/* set all devices DA to SA */
 	I3C_BUS_FOR_EACH_I3CDEV(dev, desc) {
-		if ((desc->supports_setaasa) && (desc->dynamic_addr == 0) &&
+		if (((desc->flags) & I3C_SUPPORTS_SETAASA) && (desc->dynamic_addr == 0) &&
 		    (desc->static_addr != 0)) {
 			desc->dynamic_addr = desc->static_addr;
 		}
@@ -973,7 +996,7 @@ static int cmd_i3c_ccc_setmwl_bc(const struct shell *sh, size_t argc, char **arg
 		return -ENODEV;
 	}
 
-	mwl.len = strtol(argv[3], NULL, 16);
+	mwl.len = strtol(argv[2], NULL, 16);
 
 	ret = i3c_ccc_do_setmwl_all(dev, &mwl);
 	if (ret < 0) {
@@ -987,7 +1010,7 @@ static int cmd_i3c_ccc_setmwl_bc(const struct shell *sh, size_t argc, char **arg
 
 	return ret;
 }
-
+#ifdef CONFIG_I3C_TARGET
 /* i3c ccc deftgts <device> */
 static int cmd_i3c_ccc_deftgts(const struct shell *sh, size_t argc, char **argv)
 {
@@ -1013,7 +1036,7 @@ static int cmd_i3c_ccc_deftgts(const struct shell *sh, size_t argc, char **argv)
 
 	return ret;
 }
-
+#endif /* CONFIG_I3C_TARGET */
 /* i3c ccc enttm <device> <defining byte> */
 static int cmd_i3c_ccc_enttm(const struct shell *sh, size_t argc, char **argv)
 {
@@ -1037,7 +1060,7 @@ static int cmd_i3c_ccc_enttm(const struct shell *sh, size_t argc, char **argv)
 
 	return ret;
 }
-
+#ifdef CONFIG_I3C_TARGET
 /* i3c ccc getacccr <device> <target> */
 static int cmd_i3c_ccc_getacccr(const struct shell *sh, size_t argc, char **argv)
 {
@@ -1074,7 +1097,7 @@ static int cmd_i3c_ccc_getacccr(const struct shell *sh, size_t argc, char **argv
 
 	return ret;
 }
-
+#endif /* CONFIG_I3C_TARGET */
 /* i3c ccc rstact_bc <device> <defining byte> */
 static int cmd_i3c_ccc_rstact_bc(const struct shell *sh, size_t argc, char **argv)
 {
@@ -1428,7 +1451,7 @@ static int cmd_i3c_ccc_getstatus(const struct shell *sh, size_t argc, char **arg
 	if (argc > 3) {
 		fmt = GETSTATUS_FORMAT_2;
 		defbyte = strtol(argv[3], NULL, 16);
-		if (defbyte != GETSTATUS_FORMAT_2_TGTSTAT || defbyte != GETSTATUS_FORMAT_2_PRECR) {
+		if (defbyte != GETSTATUS_FORMAT_2_TGTSTAT && defbyte != GETSTATUS_FORMAT_2_PRECR) {
 			shell_error(sh, "Invalid defining byte.");
 			return -EINVAL;
 		}
@@ -1474,8 +1497,8 @@ static int cmd_i3c_ccc_getcaps(const struct shell *sh, size_t argc, char **argv)
 	if (argc > 3) {
 		fmt = GETCAPS_FORMAT_2;
 		defbyte = strtol(argv[3], NULL, 16);
-		if (defbyte != GETCAPS_FORMAT_2_TGTCAPS || defbyte != GETCAPS_FORMAT_2_TESTPAT ||
-		    defbyte != GETCAPS_FORMAT_2_CRCAPS || defbyte != GETCAPS_FORMAT_2_VTCAPS ||
+		if (defbyte != GETCAPS_FORMAT_2_TGTCAPS && defbyte != GETCAPS_FORMAT_2_TESTPAT &&
+		    defbyte != GETCAPS_FORMAT_2_CRCAPS && defbyte != GETCAPS_FORMAT_2_VTCAPS &&
 		    defbyte != GETCAPS_FORMAT_2_DBGCAPS) {
 			shell_error(sh, "Invalid defining byte.");
 			return -EINVAL;
@@ -1709,7 +1732,7 @@ static int cmd_i3c_ccc_getmxds(const struct shell *sh, size_t argc, char **argv)
 	if (argc > 3) {
 		fmt = GETMXDS_FORMAT_3;
 		defbyte = strtol(argv[3], NULL, 16);
-		if (defbyte != GETMXDS_FORMAT_3_CRHDLY || defbyte != GETMXDS_FORMAT_3_WRRDTURN) {
+		if (defbyte != GETMXDS_FORMAT_3_CRHDLY && defbyte != GETMXDS_FORMAT_3_WRRDTURN) {
 			shell_error(sh, "Invalid defining byte.");
 			return -EINVAL;
 		}
@@ -1972,8 +1995,9 @@ static int cmd_i3c_i2c_scan(const struct shell *sh, size_t argc, char **argv)
 
 	return 0;
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
 #ifdef CONFIG_I3C_USE_IBI
+#ifdef CONFIG_I3C_CONTROLLER
 /* i3c ibi hj_response <device> <"ack"/"nack"> */
 static int cmd_i3c_ibi_hj_response(const struct shell *sh, size_t argc, char **argv)
 {
@@ -2006,7 +2030,8 @@ static int cmd_i3c_ibi_hj_response(const struct shell *sh, size_t argc, char **a
 
 	return 0;
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_TARGET
 /* i3c ibi hj <device> */
 static int cmd_i3c_ibi_hj(const struct shell *sh, size_t argc, char **argv)
 {
@@ -2031,7 +2056,7 @@ static int cmd_i3c_ibi_hj(const struct shell *sh, size_t argc, char **argv)
 
 	return 0;
 }
-
+#ifdef CONFIG_I3C_CONTROLLER
 /* i3c ibi cr <device> */
 static int cmd_i3c_ibi_cr(const struct shell *sh, size_t argc, char **argv)
 {
@@ -2056,7 +2081,7 @@ static int cmd_i3c_ibi_cr(const struct shell *sh, size_t argc, char **argv)
 
 	return 0;
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
 /* i3c ibi tir <device> [<bytes>]*/
 static int cmd_i3c_ibi_tir(const struct shell *sh, size_t argc, char **argv)
 {
@@ -2073,9 +2098,9 @@ static int cmd_i3c_ibi_tir(const struct shell *sh, size_t argc, char **argv)
 		return -ENODEV;
 	}
 
-	data_length = argc - 3;
+	data_length = argc - 2;
 	for (i = 0; i < data_length; i++) {
-		buf[i] = (uint8_t)strtol(argv[3 + i], NULL, 16);
+		buf[i] = (uint8_t)strtol(argv[2 + i], NULL, 16);
 	}
 
 	request.ibi_type = I3C_IBI_TARGET_INTR;
@@ -2092,7 +2117,8 @@ static int cmd_i3c_ibi_tir(const struct shell *sh, size_t argc, char **argv)
 
 	return 0;
 }
-
+#endif /* CONFIG_I3C_TARGET */
+#ifdef CONFIG_I3C_CONTROLLER
 /* i3c ibi enable <device> <target> */
 static int cmd_i3c_ibi_enable(const struct shell *sh, size_t argc, char **argv)
 {
@@ -2138,8 +2164,9 @@ static int cmd_i3c_ibi_disable(const struct shell *sh, size_t argc, char **argv)
 
 	return 0;
 }
-#endif
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_USE_IBI */
+#ifdef CONFIG_I3C_CONTROLLER
 static void i3c_device_list_target_name_get(size_t idx, struct shell_static_entry *entry)
 {
 	if (idx < ARRAY_SIZE(i3c_list)) {
@@ -2167,6 +2194,7 @@ static void i3c_device_attached_target_name_get(size_t idx, struct shell_static_
 }
 
 SHELL_DYNAMIC_CMD_CREATE(dsub_i3c_device_attached_name, i3c_device_attached_target_name_get);
+#endif /* CONFIG_I3C_CONTROLLER */
 
 static void i3c_device_name_get(size_t idx, struct shell_static_entry *entry)
 {
@@ -2186,10 +2214,7 @@ SHELL_DYNAMIC_CMD_CREATE(dsub_i3c_device_name, i3c_device_name_get);
 /* L2 I3C IBI Shell Commands*/
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	sub_i3c_ibi_cmds,
-	SHELL_CMD_ARG(hj_response, &dsub_i3c_device_name,
-		      "Set IBI HJ Response\n"
-		      "Usage: ibi hj_response <device> <\"ack\"/\"nack\">",
-		      cmd_i3c_ibi_hj_response, 3, 0),
+#ifdef CONFIG_I3C_TARGET
 	SHELL_CMD_ARG(hj, &dsub_i3c_device_name,
 		      "Send IBI HJ\n"
 		      "Usage: ibi hj <device>",
@@ -2198,10 +2223,18 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      "Send IBI TIR\n"
 		      "Usage: ibi tir <device> [<byte1>, ...]",
 		      cmd_i3c_ibi_tir, 2, MAX_I3C_BYTES),
+#ifdef CONFIG_I3C_CONTROLLER
 	SHELL_CMD_ARG(cr, &dsub_i3c_device_name,
 		      "Send IBI CR\n"
 		      "Usage: ibi cr <device>",
 		      cmd_i3c_ibi_cr, 2, 0),
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_TARGET */
+#ifdef CONFIG_I3C_CONTROLLER
+	SHELL_CMD_ARG(hj_response, &dsub_i3c_device_name,
+		      "Set IBI HJ Response\n"
+		      "Usage: ibi hj_response <device> <\"ack\"/\"nack\">",
+		      cmd_i3c_ibi_hj_response, 3, 0),
 	SHELL_CMD_ARG(enable, &dsub_i3c_device_attached_name,
 		      "Enable receiving IBI from target\n"
 		      "Usage: ibi enable <device> <target>",
@@ -2210,10 +2243,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      "Disable receiving IBI from target\n"
 		      "Usage: ibi disable <device> <target>",
 		      cmd_i3c_ibi_disable, 3, 0),
+#endif /* CONFIG_I3C_CONTROLLER */
 	SHELL_SUBCMD_SET_END /* Array terminated. */
 );
 #endif
 
+#ifdef CONFIG_I3C_CONTROLLER
 /* L3 I3C HDR DDR Shell Commands*/
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	sub_i3c_hdr_ddr_cmds,
@@ -2241,6 +2276,10 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 /* L2 I3C CCC Shell Commands*/
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	sub_i3c_ccc_cmds,
+	SHELL_CMD_ARG(rstdaa_dc, &dsub_i3c_device_attached_name,
+		      "Send CCC RSTDAA\n"
+		      "Usage: ccc rstdaa_dc <device> <target>",
+		      cmd_i3c_ccc_rstdaa_dc, 3, 0),
 	SHELL_CMD_ARG(rstdaa, &dsub_i3c_device_name,
 		      "Send CCC RSTDAA\n"
 		      "Usage: ccc rstdaa <device>",
@@ -2297,10 +2336,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      "Send CCC SETMWL BC\n"
 		      "Usage: ccc setmwl_bc <device> <max write length>",
 		      cmd_i3c_ccc_setmwl_bc, 3, 0),
+#ifdef CONFIG_I3C_TARGET
 	SHELL_CMD_ARG(deftgts, &dsub_i3c_device_name,
 		      "Send CCC DEFTGTS\n"
 		      "Usage: ccc deftgts <device>",
 		      cmd_i3c_ccc_deftgts, 2, 0),
+#endif
 	SHELL_CMD_ARG(enttm, &dsub_i3c_device_name,
 		      "Send CCC ENTTM\n"
 		      "Usage: ccc enttm <device> <defining byte>",
@@ -2309,10 +2350,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      "Send CCC RSTACT\n"
 		      "Usage: ccc rstact <device> <target> <\"set\"/\"get\"> <defining byte>",
 		      cmd_i3c_ccc_rstact, 5, 0),
+#ifdef CONFIG_I3C_TARGET
 	SHELL_CMD_ARG(getacccr, &dsub_i3c_device_attached_name,
 		      "Send CCC GETACCCR\n"
 		      "Usage: ccc getacccr <device> <target>",
 		      cmd_i3c_ccc_getacccr, 3, 0),
+#endif /* CONFIG_I3C_TARGET */
 	SHELL_CMD_ARG(rstact_bc, &dsub_i3c_device_name,
 		      "Send CCC RSTACT BC\n"
 		      "Usage: ccc rstact_bc <device> <defining byte>",
@@ -2395,10 +2438,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_i3c_ccc_setvendor_bc, 3, MAX_I3C_BYTES),
 	SHELL_SUBCMD_SET_END /* Array terminated. */
 );
+#endif /* CONFIG_I3C_CONTROLLER */
 
 /* L1 I3C Shell Commands*/
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	sub_i3c_cmds,
+#ifdef CONFIG_I3C_CONTROLLER
 	SHELL_CMD_ARG(info, &dsub_i3c_device_attached_name,
 		      "Get I3C device info\n"
 		      "Usage: info <device> [<target>]",
@@ -2459,12 +2504,13 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      "Send I3C HDR\n"
 		      "Usage: hdr <sub cmd>",
 		      NULL, 3, 0),
+#endif /* CONFIG_I3C_CONTROLLER */
 #ifdef CONFIG_I3C_USE_IBI
 	SHELL_CMD_ARG(ibi, &sub_i3c_ibi_cmds,
 		      "Send I3C IBI\n"
 		      "Usage: ibi <sub cmd>",
 		      NULL, 3, 0),
-#endif
+#endif /* CONFIG_I3C_USE_IBI */
 	SHELL_SUBCMD_SET_END /* Array terminated. */
 );
 
diff --git a/drivers/i3c/i3c_stm32.c b/drivers/i3c/i3c_stm32.c
index eb5525e4a7541..80ae2b0a45683 100644
--- a/drivers/i3c/i3c_stm32.c
+++ b/drivers/i3c/i3c_stm32.c
@@ -103,7 +103,7 @@ struct i3c_stm32_msg {
 	size_t num_msgs;                  /* Number of messages */
 	size_t ctrl_msg_idx;              /* Current control message index */
 	size_t status_msg_idx;            /* Current status message index */
-	size_t xfer_msg_idx;              /* Current trasnfer message index */
+	size_t xfer_msg_idx;              /* Current transfer message index */
 	size_t xfer_offset;               /* Current message transfer offset */
 	uint32_t msg_type;                /* Either LL_I3C_CONTROLLER_MTYPE_PRIVATE or
 					   * LL_I3C_CONTROLLER_MTYPE_LEGACY_I2C
@@ -1563,7 +1563,7 @@ static int i3c_stm32_init(const struct device *dev)
 
 #ifdef CONFIG_I3C_USE_IBI
 	LL_I3C_EnableHJAck(i3c);
-	hj_pm_lock = true;
+	data->hj_pm_lock = true;
 	(void)pm_device_runtime_get(dev);
 	pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
 #endif
@@ -1902,6 +1902,7 @@ static void i3c_stm32_error_isr(void *arg)
 int i3c_stm32_ibi_hj_response(const struct device *dev, bool ack)
 {
 	const struct i3c_stm32_config *config = dev->config;
+	struct i3c_stm32_data *data = dev->data;
 	I3C_TypeDef *i3c = config->i3c;
 
 	if (ack) {
@@ -1909,16 +1910,16 @@ int i3c_stm32_ibi_hj_response(const struct device *dev, bool ack)
 		 * This prevents pm_device_runtime from being called multiple times
 		 * with redunant calls
 		 */
-		if (!hj_pm_lock) {
-			hj_pm_lock = true;
+		if (!data->hj_pm_lock) {
+			data->hj_pm_lock = true;
 			(void)pm_device_runtime_get(dev);
 			pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
 		}
 		LL_I3C_EnableHJAck(i3c);
 	} else {
 		LL_I3C_DisableHJAck(i3c);
-		if (hj_pm_lock) {
-			hj_pm_lock = false;
+		if (data->hj_pm_lock) {
+			data->hj_pm_lock = false;
 			(void)pm_device_runtime_put(dev);
 			pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
 		}
diff --git a/drivers/ieee802154/CMakeLists.txt b/drivers/ieee802154/CMakeLists.txt
index 3fdb65790afeb..f731bdb9f55bf 100644
--- a/drivers/ieee802154/CMakeLists.txt
+++ b/drivers/ieee802154/CMakeLists.txt
@@ -15,6 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_IEEE802154_CC2520		ieee802154_cc2520.c)
 zephyr_library_sources_ifdef(CONFIG_IEEE802154_DW1000		ieee802154_dw1000.c)
 zephyr_library_sources_ifdef(CONFIG_IEEE802154_KW41Z		ieee802154_kw41z.c)
 zephyr_library_sources_ifdef(CONFIG_IEEE802154_MCR20A		ieee802154_mcr20a.c)
+zephyr_library_sources_ifdef(CONFIG_IEEE802154_MCXW		ieee802154_mcxw.c		ieee802154_mcxw_utils.c)
 zephyr_library_sources_ifdef(CONFIG_IEEE802154_NRF5		ieee802154_nrf5.c)
 zephyr_library_sources_ifdef(CONFIG_IEEE802154_RF2XX		ieee802154_rf2xx.c)
 zephyr_library_sources_ifdef(CONFIG_IEEE802154_RF2XX		ieee802154_rf2xx_iface.c)
diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index 447b32ccbe061..a3f89c72665b9 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -76,6 +76,8 @@ source "drivers/ieee802154/Kconfig.kw41z"
 
 source "drivers/ieee802154/Kconfig.mcr20a"
 
+source "drivers/ieee802154/Kconfig.mcxw"
+
 source "drivers/ieee802154/Kconfig.nrf5"
 
 source "drivers/ieee802154/Kconfig.cc1200"
diff --git a/drivers/ieee802154/Kconfig.mcxw b/drivers/ieee802154/Kconfig.mcxw
new file mode 100644
index 0000000000000..5829a8f9736f4
--- /dev/null
+++ b/drivers/ieee802154/Kconfig.mcxw
@@ -0,0 +1,28 @@
+# NXP MCXW 802.15.4 configuration options
+
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig IEEE802154_MCXW
+	bool "NXP MCXW series IEEE 802.15.4 Driver"
+	default y
+	depends on DT_HAS_NXP_MCXW_IEEE802154_ENABLED
+	depends on COUNTER
+
+if IEEE802154_MCXW
+
+config IEEE802154_MCXW_INIT_PRIO
+	int "Initial priority for the IEEE802154 driver"
+	default 80
+
+config IEEE802154_MCXW_RX_STACK_SIZE
+	int "Driver's internal RX thread stack size"
+	default 800
+
+
+config IEEE802154_MCXW_CSL_ACCURACY
+	int "Csl accuracy for delayed operations"
+	default 100
+
+
+endif
diff --git a/drivers/ieee802154/ieee802154_dw1000_regs.h b/drivers/ieee802154/ieee802154_dw1000_regs.h
index ae0433ad92780..886765f79dc99 100644
--- a/drivers/ieee802154/ieee802154_dw1000_regs.h
+++ b/drivers/ieee802154/ieee802154_dw1000_regs.h
@@ -151,7 +151,7 @@
 #define DWT_TX_FCTRL_PE_MASK        0x00300000UL
 /* Bit mask to access Transmit Preamble Symbol Repetitions (PSR). */
 #define DWT_TX_FCTRL_TXPSR_PE_MASK  0x003C0000UL
-/* FSCTRL has fields which should always be writen zero */
+/* FSCTRL has fields which should always be written zero */
 #define DWT_TX_FCTRL_SAFE_MASK_32   0xFFFFE3FFUL
 /* Transmit Bit Rate = 110k */
 #define DWT_TX_FCTRL_TXBR_110k      0x00000000UL
@@ -227,7 +227,7 @@
 #define DWT_SYS_CTRL_LEN            4
 /*
  * System Control Register access mask
- * (all unused fields should always be writen as zero)
+ * (all unused fields should always be written as zero)
  */
 #define DWT_SYS_CTRL_MASK_32        0x010003CFUL
 /* Suppress Auto-FCS Transmission (on this frame) */
@@ -262,7 +262,7 @@
 #define DWT_SYS_MASK_LEN            4
 /*
  * System Event Mask Register access mask
- * (all unused fields should always be writen as zero)
+ * (all unused fields should always be written as zero)
  */
 #define DWT_SYS_MASK_MASK_32        0x3FF7FFFEUL
 /* Mask clock PLL lock event */
@@ -329,7 +329,7 @@
 #define DWT_SYS_STATUS_LEN          5
 /*
  * System event Status Register access mask
- * (all unused fields should always be writen as zero)
+ * (all unused fields should always be written as zero)
  */
 #define DWT_SYS_STATUS_MASK_32      0xFFF7FFFFUL
 /* Interrupt Request Status READ ONLY */
@@ -453,7 +453,7 @@
 #define DWT_RX_FINFO_LEN            4
 /*
  * System event Status Register access mask
- * (all unused fields should always be writen as zero)
+ * (all unused fields should always be written as zero)
  */
 #define DWT_RX_FINFO_MASK_32        0xFFFFFBFFUL
 /* Receive Frame Length (0 to 127) */
@@ -558,7 +558,7 @@
 #define DWT_RX_TTCKO_LEN            5
 /*
  * Receiver Time Tracking Offset access mask
- * (all unused fields should always be writen as zero)
+ * (all unused fields should always be written as zero)
  */
 #define DWT_RX_TTCKO_MASK_32        0xFF07FFFFUL
 /* RX time tracking offset. This RXTOFS value is a 19-bit signed quantity */
diff --git a/drivers/ieee802154/ieee802154_mcxw.c b/drivers/ieee802154/ieee802154_mcxw.c
new file mode 100644
index 0000000000000..247342e66a132
--- /dev/null
+++ b/drivers/ieee802154/ieee802154_mcxw.c
@@ -0,0 +1,1360 @@
+/* ieee802154_mcxw.c - NXP MCXW 802.15.4 driver */
+
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nxp_mcxw_ieee802154
+
+#define LOG_MODULE_NAME ieee802154_mcxw
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(LOG_MODULE_NAME);
+
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+
+#if defined(CONFIG_NET_L2_OPENTHREAD)
+#include <zephyr/net/openthread.h>
+#include <zephyr/net/ieee802154_radio_openthread.h>
+#endif
+
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/random/random.h>
+
+#include <zephyr/net/ieee802154_radio.h>
+
+#include <soc.h>
+#include <errno.h>
+#include <string.h>
+
+#include "EmbeddedTypes.h"
+#include "Phy.h"
+
+#include "fwk_platform_ot.h"
+
+#include "ieee802154_mcxw.h"
+#include "ieee802154_mcxw_utils.h"
+
+void PLATFORM_RemoteActiveReq(void);
+void PLATFORM_RemoteActiveRel(void);
+
+#if CONFIG_IEEE802154_CSL_ENDPOINT
+
+#define CMP_OVHD (4 * IEEE802154_SYMBOL_TIME_US) /* 2 LPTRM (32 kHz) ticks */
+
+static bool_t csl_rx = FALSE;
+
+static void set_csl_sample_time(void);
+static void start_csl_receiver(void);
+static void stop_csl_receiver(void);
+static uint16_t rf_compute_csl_phase(uint32_t aTimeUs);
+
+#else /* CONFIG_IEEE802154_CSL_ENDPOINT */
+#define start_csl_receiver()
+#define stop_csl_receiver()
+#endif /* CONFIG_IEEE802154_CSL_ENDPOINT */
+
+static volatile uint32_t sun_rx_mode = RX_ON_IDLE_START;
+
+/* Private functions */
+static void rf_abort(void);
+static void rf_set_channel(uint8_t channel);
+static void rf_set_tx_power(int8_t tx_power);
+static uint64_t rf_adjust_tstamp_from_phy(uint64_t ts);
+
+#if CONFIG_IEEE802154_CSL_ENDPOINT || CONFIG_NET_PKT_TXTIME
+static uint32_t rf_adjust_tstamp_from_app(uint32_t time);
+#endif /* CONFIG_IEEE802154_CSL_ENDPOINT || CONFIG_NET_PKT_TXTIME */
+
+static void rf_rx_on_idle(uint32_t newValue);
+
+static uint8_t ot_phy_ctx = (uint8_t)(-1);
+
+static struct mcxw_context mcxw_ctx;
+
+/**
+ * Stub function used for controlling low power mode
+ */
+WEAK void app_allow_device_to_slepp(void)
+{
+}
+
+/**
+ * Stub function used for controlling low power mode
+ */
+WEAK void app_disallow_device_to_slepp(void)
+{
+}
+
+void mcxw_get_eui64(uint8_t *eui64)
+{
+	__ASSERT_NO_MSG(eui64);
+
+	/* PLATFORM_GetIeee802_15_4Addr(); */
+	sys_rand_get(eui64, sizeof(mcxw_ctx.mac));
+
+	eui64[0] = (eui64[0] & ~0x01) | 0x02;
+}
+
+static int mcxw_set_pan_id(const struct device *dev, uint16_t aPanId)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibPanId_c;
+	msg.msgData.setReq.PibAttributeValue = (uint64_t)aPanId;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+	mcxw_radio->pan_id = aPanId;
+
+	return 0;
+}
+
+static int mcxw_set_extended_address(const struct device *dev, const uint8_t *ieee_addr)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibLongAddress_c;
+	msg.msgData.setReq.PibAttributeValue = *(uint64_t *)ieee_addr;
+
+	memcpy(mcxw_radio->mac, ieee_addr, 8);
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+	return 0;
+}
+
+static int mcxw_set_short_address(const struct device *dev, uint16_t aShortAddress)
+{
+	ARG_UNUSED(dev);
+
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibShortAddress_c;
+	msg.msgData.setReq.PibAttributeValue = (uint64_t)aShortAddress;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+	return 0;
+}
+
+static int mcxw_filter(const struct device *dev, bool set, enum ieee802154_filter_type type,
+		       const struct ieee802154_filter *filter)
+{
+	LOG_DBG("Applying filter %u", type);
+
+	if (!set) {
+		return -ENOTSUP;
+	}
+
+	if (type == IEEE802154_FILTER_TYPE_IEEE_ADDR) {
+		return mcxw_set_extended_address(dev, filter->ieee_addr);
+	} else if (type == IEEE802154_FILTER_TYPE_SHORT_ADDR) {
+		return mcxw_set_short_address(dev, filter->short_addr);
+	} else if (type == IEEE802154_FILTER_TYPE_PAN_ID) {
+		return mcxw_set_pan_id(dev, filter->pan_id);
+	}
+
+	return -ENOTSUP;
+}
+
+void mcxw_radio_receive(void)
+{
+	macToPlmeMessage_t msg;
+	phyStatus_t phy_status;
+
+	app_disallow_device_to_slepp();
+
+	__ASSERT(mcxw_ctx.state != RADIO_STATE_DISABLED, "Radio RX invalid state");
+
+	mcxw_ctx.state = RADIO_STATE_RECEIVE;
+
+	rf_abort();
+	rf_set_channel(mcxw_ctx.channel);
+
+	if (sun_rx_mode) {
+		start_csl_receiver();
+
+		/* restart Rx on idle only if it was enabled */
+		msg.msgType = gPlmeSetReq_c;
+		msg.msgData.setReq.PibAttribute = gPhyPibRxOnWhenIdle;
+		msg.msgData.setReq.PibAttributeValue = (uint64_t)1;
+
+		phy_status = MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+		__ASSERT_NO_MSG(phy_status == gPhySuccess_c);
+	}
+}
+
+static uint8_t mcxw_get_acc(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	return CONFIG_IEEE802154_MCXW_CSL_ACCURACY;
+}
+
+static int mcxw_start(const struct device *dev)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	__ASSERT(mcxw_radio->state == RADIO_STATE_DISABLED, "%s", __func__);
+
+	mcxw_radio->state = RADIO_STATE_SLEEP;
+
+	rf_rx_on_idle(RX_ON_IDLE_START);
+
+	mcxw_radio_receive();
+
+	return 0;
+}
+
+static int mcxw_stop(const struct device *dev)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	__ASSERT(mcxw_radio->state != RADIO_STATE_DISABLED, "%s", __func__);
+
+	stop_csl_receiver();
+
+	mcxw_radio->state = RADIO_STATE_DISABLED;
+
+	return 0;
+}
+
+void mcxw_radio_sleep(void)
+{
+	__ASSERT_NO_MSG(((mcxw_ctx.state != RADIO_STATE_TRANSMIT) &&
+			 (mcxw_ctx.state != RADIO_STATE_DISABLED)));
+
+	rf_abort();
+
+	stop_csl_receiver();
+
+	app_allow_device_to_slepp();
+
+	mcxw_ctx.state = RADIO_STATE_SLEEP;
+}
+
+static void mcxw_enable_src_match(bool enable)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetSAMState_c;
+	msg.msgData.SAMState = enable;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static int mcxw_src_match_entry(bool extended, uint8_t *address)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeAddToSapTable_c;
+	msg.msgData.deviceAddr.panId = mcxw_ctx.pan_id;
+
+	if (extended) {
+		msg.msgData.deviceAddr.mode = 3;
+		memcpy(msg.msgData.deviceAddr.addr, address, 8);
+	} else {
+		msg.msgData.deviceAddr.mode = 2;
+		memcpy(msg.msgData.deviceAddr.addr, address, 2);
+	}
+
+	if (gPhySuccess_c != MAC_PLME_SapHandler(&msg, ot_phy_ctx)) {
+		/* the status is not returned from PHY over RPMSG */
+		return -ENOMEM;
+	}
+
+	return 0;
+}
+
+static int mcxw_src_clear_entry(bool extended, uint8_t *address)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeRemoveFromSAMTable_c;
+	msg.msgData.deviceAddr.panId = mcxw_ctx.pan_id;
+
+	if (extended) {
+		msg.msgData.deviceAddr.mode = 3;
+		memcpy(msg.msgData.deviceAddr.addr, address, 8);
+	} else {
+		msg.msgData.deviceAddr.mode = 2;
+		memcpy(msg.msgData.deviceAddr.addr, address, 2);
+	}
+
+	if (gPhySuccess_c != MAC_PLME_SapHandler(&msg, ot_phy_ctx)) {
+		/* the status is not returned from PHY over RPMSG */
+		return -ENOENT;
+	}
+
+	return 0;
+}
+
+static int handle_ack(struct mcxw_context *mcxw_radio)
+{
+	uint8_t len;
+	struct net_pkt *pkt;
+	int err = 0;
+
+	len = mcxw_radio->rx_ack_frame.length;
+	pkt = net_pkt_rx_alloc_with_buffer(mcxw_radio->iface, len, AF_UNSPEC, 0, K_NO_WAIT);
+	if (!pkt) {
+		LOG_ERR("No free packet available.");
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	if (net_pkt_write(pkt, mcxw_radio->rx_ack_frame.psdu, len) < 0) {
+		LOG_ERR("Failed to write to a packet.");
+		err = -ENOMEM;
+		goto free_ack;
+	}
+
+	/* Use some fake values for LQI and RSSI. */
+	net_pkt_set_ieee802154_lqi(pkt, 80);
+	net_pkt_set_ieee802154_rssi_dbm(pkt, -40);
+
+	net_pkt_set_timestamp_ns(pkt, mcxw_radio->rx_ack_frame.timestamp);
+
+	net_pkt_cursor_init(pkt);
+
+	if (ieee802154_handle_ack(mcxw_radio->iface, pkt) != NET_OK) {
+		LOG_ERR("ACK packet not handled - releasing.");
+	}
+
+free_ack:
+	net_pkt_unref(pkt);
+
+exit:
+	mcxw_radio->rx_ack_frame.length = 0;
+	return err;
+}
+
+static int mcxw_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt,
+		   struct net_buf *frag)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+	/* tx_data buffer has reserved memory for both macToPdDataMessage_t and actual data frame
+	 * after
+	 */
+	macToPdDataMessage_t *msg = (macToPdDataMessage_t *)mcxw_radio->tx_data;
+	phyStatus_t phy_status;
+
+	uint8_t payload_len = frag->len;
+	uint8_t *payload = frag->data;
+
+	app_disallow_device_to_slepp();
+
+	__ASSERT(mcxw_radio->state != RADIO_STATE_DISABLED, "%s: radio disabled", __func__);
+
+	if (payload_len > IEEE802154_MTU) {
+		LOG_ERR("Payload too large: %d", payload_len);
+		return -EMSGSIZE;
+	}
+
+	mcxw_radio->tx_frame.length = payload_len + IEEE802154_FCS_LENGTH;
+	memcpy(mcxw_radio->tx_frame.psdu, payload, payload_len);
+
+	mcxw_radio->tx_frame.sec_processed = net_pkt_ieee802154_frame_secured(pkt);
+	mcxw_radio->tx_frame.hdr_updated = net_pkt_ieee802154_mac_hdr_rdy(pkt);
+
+	rf_set_channel(mcxw_radio->channel);
+
+	msg->msgType = gPdDataReq_c;
+	msg->msgData.dataReq.slottedTx = gPhyUnslottedMode_c;
+	msg->msgData.dataReq.psduLength = mcxw_radio->tx_frame.length;
+	msg->msgData.dataReq.CCABeforeTx = gPhyNoCCABeforeTx_c;
+	msg->msgData.dataReq.startTime = gPhySeqStartAsap_c;
+
+	/* tx_frame.psdu will point to tx_frame.tx_data data buffer after macToPdDataMessage_t
+	 * structure
+	 */
+	msg->msgData.dataReq.pPsdu = mcxw_radio->tx_frame.psdu;
+
+	if (ieee802154_is_ar_flag_set(frag)) {
+		msg->msgData.dataReq.ackRequired = gPhyRxAckRqd_c;
+		/* The 3 bytes are 1 byte frame length and 2 bytes FCS */
+		msg->msgData.dataReq.txDuration =
+			IEEE802154_CCA_LEN_SYM + IEEE802154_PHY_SHR_LEN_SYM +
+			(3 + mcxw_radio->tx_frame.length) * RADIO_SYMBOLS_PER_OCTET +
+			IEEE802154_TURNAROUND_LEN_SYM;
+
+		if (is_frame_version_2015(frag->data, frag->len)) {
+			/* Because enhanced ack can be of variable length we need to set the timeout
+			 * value to account for the FCF and addressing fields only, and stop the
+			 * timeout timer after they are received and validated as a valid ACK
+			 */
+			msg->msgData.dataReq.txDuration += IEEE802154_ENH_ACK_WAIT_SYM;
+		} else {
+			msg->msgData.dataReq.txDuration += IEEE802154_IMM_ACK_WAIT_SYM;
+		}
+	} else {
+		msg->msgData.dataReq.ackRequired = gPhyNoAckRqd_c;
+		msg->msgData.dataReq.txDuration = 0xFFFFFFFFU;
+	}
+
+	switch (mode) {
+	case IEEE802154_TX_MODE_DIRECT:
+		msg->msgData.dataReq.CCABeforeTx = gPhyNoCCABeforeTx_c;
+		break;
+	case IEEE802154_TX_MODE_CCA:
+		msg->msgData.dataReq.CCABeforeTx = gPhyCCAMode1_c;
+		break;
+
+#if defined(CONFIG_NET_PKT_TXTIME)
+	case IEEE802154_TX_MODE_TXTIME:
+	case IEEE802154_TX_MODE_TXTIME_CCA:
+		mcxw_radio->tx_frame.tx_delay = net_pkt_timestamp_ns(pkt);
+		msg->msgData.dataReq.startTime =
+			rf_adjust_tstamp_from_app(mcxw_radio->tx_frame.tx_delay);
+		msg->msgData.dataReq.startTime /= IEEE802154_SYMBOL_TIME_US;
+		break;
+#endif
+	default:
+		break;
+	}
+
+	msg->msgData.dataReq.flags = 0;
+
+#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
+	if (is_keyid_mode_1(mcxw_radio->tx_frame.psdu, mcxw_radio->tx_frame.length)) {
+		if (!net_pkt_ieee802154_frame_secured(pkt)) {
+			msg->msgData.dataReq.flags |= gPhyEncFrame;
+
+			if (!net_pkt_ieee802154_mac_hdr_rdy(pkt)) {
+				msg->msgData.dataReq.flags |= gPhyUpdHDr;
+
+#if CONFIG_IEEE802154_CSL_ENDPOINT
+				/* Previously aFrame->mInfo.mTxInfo.mCslPresent was used to
+				 * determine if the radio code should update the IE header. This
+				 * field is no longer set by the OT stack. Until the issue is fixed
+				 * in OT stack check if CSL period is > 0 and always update CSL IE
+				 * in that case.
+				 */
+				if (mcxw_radio->csl_period) {
+					uint32_t hdr_time_us;
+
+					start_csl_receiver();
+
+					/* Add TX_ENCRYPT_DELAY_SYM symbols delay to allow
+					 * encryption to finish
+					 */
+					msg->msgData.dataReq.startTime =
+						PhyTime_ReadClock() + TX_ENCRYPT_DELAY_SYM;
+
+					hdr_time_us = mcxw_get_time(NULL) +
+						    (TX_ENCRYPT_DELAY_SYM +
+						     IEEE802154_PHY_SHR_LEN_SYM) *
+							    IEEE802154_SYMBOL_TIME_US;
+					set_csl_ie(mcxw_radio->tx_frame.psdu,
+						 mcxw_radio->tx_frame.length,
+						 mcxw_radio->csl_period,
+						 rf_compute_csl_phase(hdr_time_us));
+				}
+#endif /* CONFIG_IEEE802154_CSL_ENDPOINT */
+			}
+		}
+	}
+
+#endif
+
+	k_sem_reset(&mcxw_radio->tx_wait);
+
+	phy_status = MAC_PD_SapHandler(msg, ot_phy_ctx);
+	if (phy_status == gPhySuccess_c) {
+		mcxw_radio->tx_status = 0;
+		mcxw_radio->state = RADIO_STATE_TRANSMIT;
+	} else {
+		return -EIO;
+	}
+
+	k_sem_take(&mcxw_radio->tx_wait, K_FOREVER);
+
+	/* PWR_AllowDeviceToSleep(); */
+
+	mcxw_radio_receive();
+
+	switch (mcxw_radio->tx_status) {
+	case 0:
+		if (mcxw_radio->rx_ack_frame.length) {
+			return handle_ack(mcxw_radio);
+		}
+		return 0;
+
+	default:
+		return -(mcxw_radio->tx_status);
+	}
+}
+
+void mcxw_rx_thread(void *arg1, void *arg2, void *arg3)
+{
+	struct mcxw_context *mcxw_radio = (struct mcxw_context *)arg1;
+	struct net_pkt *pkt;
+	struct mcxw_rx_frame rx_frame;
+
+	ARG_UNUSED(arg2);
+	ARG_UNUSED(arg3);
+
+	while (true) {
+		pkt = NULL;
+
+		LOG_DBG("Waiting for frame");
+
+		if (k_msgq_get(&mcxw_radio->rx_msgq, &rx_frame, K_FOREVER) < 0) {
+			LOG_ERR("Failed to get RX data from message queue");
+			continue;
+		}
+
+		pkt = net_pkt_rx_alloc_with_buffer(mcxw_radio->iface, rx_frame.length, AF_UNSPEC, 0,
+						   K_FOREVER);
+
+		if (net_pkt_write(pkt, rx_frame.psdu, rx_frame.length)) {
+			goto drop;
+		}
+
+		net_pkt_set_ieee802154_lqi(pkt, rx_frame.lqi);
+		net_pkt_set_ieee802154_rssi_dbm(pkt, rx_frame.rssi);
+		net_pkt_set_ieee802154_ack_fpb(pkt, rx_frame.ack_fpb);
+
+#if defined(CONFIG_NET_PKT_TIMESTAMP)
+		net_pkt_set_timestamp_ns(pkt, rx_frame.timestamp);
+#endif
+
+#if defined(CONFIG_NET_L2_OPENTHREAD)
+		net_pkt_set_ieee802154_ack_seb(pkt, rx_frame.ack_seb);
+#endif
+		if (net_recv_data(mcxw_radio->iface, pkt) < 0) {
+			LOG_ERR("Packet dropped by NET stack");
+			goto drop;
+		}
+
+		k_free(rx_frame.phy_buffer);
+		rx_frame.phy_buffer = NULL;
+
+		/* restart rx on idle if enough space in message queue */
+		if (k_msgq_num_free_get(&mcxw_radio->rx_msgq) >= 2) {
+			rf_rx_on_idle(RX_ON_IDLE_START);
+		}
+
+		continue;
+
+drop:
+		/* PWR_AllowDeviceToSleep(); */
+		net_pkt_unref(pkt);
+	}
+}
+
+int8_t mcxw_get_rssi(void)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeGetReq_c;
+	msg.msgData.getReq.PibAttribute = gPhyGetRSSILevel_c;
+	msg.msgData.getReq.PibAttributeValue = 127; /* RSSI is invalid*/
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+	return (int8_t)msg.msgData.getReq.PibAttributeValue;
+}
+
+void mcxw_set_promiscuous(bool aEnable)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibPromiscuousMode_c;
+	msg.msgData.setReq.PibAttributeValue = (uint64_t)aEnable;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+void mcxw_set_pan_coord(bool aEnable)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibPanCoordinator_c;
+	msg.msgData.setReq.PibAttributeValue = (uint64_t)aEnable;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static int mcxw_energy_scan(const struct device *dev, uint16_t duration,
+			    energy_scan_done_cb_t done_cb)
+{
+
+	int status = 0;
+	phyStatus_t phy_status;
+	macToPlmeMessage_t msg;
+
+	app_disallow_device_to_slepp();
+
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	__ASSERT_NO_MSG(((mcxw_radio->state != RADIO_STATE_TRANSMIT) &&
+			 (mcxw_radio->state != RADIO_STATE_DISABLED)));
+
+	rf_abort();
+
+	rf_set_channel(mcxw_radio->channel);
+
+	mcxw_radio->energy_scan_done = done_cb;
+
+	msg.msgType = gPlmeEdReq_c;
+	msg.msgData.edReq.startTime = gPhySeqStartAsap_c;
+	msg.msgData.edReq.measureDurationSym = duration * 1000;
+
+	phy_status = MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+	if (phy_status != gPhySuccess_c) {
+		mcxw_radio->energy_scan_done = NULL;
+		status = -EIO;
+	}
+
+	return status;
+}
+
+static int mcxw_set_txpower(const struct device *dev, int16_t dbm)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	LOG_DBG("%d", dbm);
+
+	if (dbm != mcxw_radio->tx_pwr_lvl) {
+		/* Set Power level for TX */
+		rf_set_tx_power(dbm);
+		mcxw_radio->tx_pwr_lvl = dbm;
+	}
+
+	return 0;
+}
+
+static void mcxw_configure_enh_ack_probing(const struct ieee802154_config *config)
+{
+	uint32_t ie_param = 0;
+	macToPlmeMessage_t msg;
+
+	uint8_t *header_ie_buf = (uint8_t *)(config->ack_ie.header_ie);
+
+	ie_param = (header_ie_buf[6] == 0x03 ? IeData_Lqi_c : 0) |
+		   (header_ie_buf[7] == 0x02 ? IeData_LinkMargin_c : 0) |
+		   (header_ie_buf[8] == 0x01 ? IeData_Rssi_c : 0);
+
+	msg.msgType = gPlmeConfigureAckIeData_c;
+	msg.msgData.AckIeData.param = (ie_param > 0 ? IeData_MSB_VALID_DATA : 0);
+	msg.msgData.AckIeData.param |= ie_param;
+	msg.msgData.AckIeData.shortAddr = config->ack_ie.short_addr;
+	memcpy(msg.msgData.AckIeData.extAddr, config->ack_ie.ext_addr, 8);
+	memcpy(msg.msgData.AckIeData.data, config->ack_ie.header_ie,
+	       config->ack_ie.header_ie->length);
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static void mcxw_set_mac_key(struct ieee802154_key *mac_keys)
+{
+	macToPlmeMessage_t msg;
+
+	__ASSERT_NO_MSG(mac_keys);
+	__ASSERT_NO_MSG(mac_keys[0].key_id && mac_keys[0].key_value);
+	__ASSERT_NO_MSG(mac_keys[1].key_id && mac_keys[1].key_value);
+	__ASSERT_NO_MSG(mac_keys[2].key_id && mac_keys[2].key_value);
+
+	msg.msgType = gPlmeSetMacKey_c;
+	msg.msgData.MacKeyData.keyId = *(mac_keys[1].key_id);
+
+	memcpy(msg.msgData.MacKeyData.prevKey, mac_keys[0].key_value, 16);
+	memcpy(msg.msgData.MacKeyData.currKey, mac_keys[1].key_value, 16);
+	memcpy(msg.msgData.MacKeyData.nextKey, mac_keys[2].key_value, 16);
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+void mcxw_set_mac_frame_counter(uint32_t frame_counter)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetMacFrameCounter_c;
+	msg.msgData.MacFrameCounter = frame_counter;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+void mcxw_set_mac_frame_counter_if_larger(uint32_t frame_counter)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetMacFrameCounterIfLarger_c;
+	msg.msgData.MacFrameCounter = frame_counter;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+#if CONFIG_IEEE802154_CSL_ENDPOINT
+
+static void mcxw_receive_at(uint8_t channel, uint32_t start, uint32_t duration)
+{
+	macToPlmeMessage_t msg;
+
+	__ASSERT_NO_MSG(mcxw_ctx.state == RADIO_STATE_SLEEP);
+	mcxw_ctx.state = RADIO_STATE_RECEIVE;
+
+	/* checks internally if the channel needs to be changed */
+	rf_set_channel(mcxw_ctx.channel);
+
+	start = rf_adjust_tstamp_from_app(start);
+
+	msg.msgType = gPlmeSetTRxStateReq_c;
+	msg.msgData.setTRxStateReq.slottedMode = gPhyUnslottedMode_c;
+	msg.msgData.setTRxStateReq.state = gPhySetRxOn_c;
+	msg.msgData.setTRxStateReq.rxDuration = duration / IEEE802154_SYMBOL_TIME_US;
+	msg.msgData.setTRxStateReq.startTime = start / IEEE802154_SYMBOL_TIME_US;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static void mcxw_enable_csl(uint16_t period)
+{
+	mcxw_ctx.csl_period = period;
+
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeCslEnable_c;
+	msg.msgData.cslPeriod = period;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static void set_csl_sample_time(void)
+{
+	if (!mcxw_ctx.csl_period) {
+		return;
+	}
+
+	macToPlmeMessage_t msg;
+	uint32_t csl_period = mcxw_ctx.csl_period * 10 * IEEE802154_SYMBOL_TIME_US;
+	uint32_t dt = mcxw_ctx.csl_sample_time - (uint32_t)mcxw_get_time(NULL);
+
+	/* next channel sample should be in the future */
+	while ((dt <= CMP_OVHD) || (dt > (CMP_OVHD + 2 * csl_period))) {
+		mcxw_ctx.csl_sample_time += csl_period;
+		dt = mcxw_ctx.csl_sample_time - (uint32_t)mcxw_get_time(NULL);
+	}
+
+	/* The CSL sample time is in microseconds and PHY function expects also microseconds */
+	msg.msgType = gPlmeCslSetSampleTime_c;
+	msg.msgData.cslSampleTime = rf_adjust_tstamp_from_app(mcxw_ctx.csl_sample_time);
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static void start_csl_receiver(void)
+{
+	if (!mcxw_ctx.csl_period) {
+		return;
+	}
+
+	/* NBU has to be awake during CSL receiver trx  so that conversion from
+	 * PHY timebase (NBU) to TMR timebase (host) is valid
+	 */
+	if (!csl_rx) {
+		PLATFORM_RemoteActiveReq();
+
+		csl_rx = TRUE;
+	}
+
+	/* sample time is converted to PHY time */
+	set_csl_sample_time();
+}
+
+static void stop_csl_receiver(void)
+{
+	if (csl_rx) {
+		PLATFORM_RemoteActiveRel();
+
+		csl_rx = FALSE;
+	}
+}
+
+/*
+ * Compute the CSL Phase for the time_us - i.e. the time from the time_us to
+ * mcxw_ctx.csl_sample_time. The assumption is that mcxw_ctx.csl_sample_time > time_us. Since the
+ * time is kept with a limited timer in reality it means that sometimes mcxw_ctx.csl_sample_time <
+ * time_us, when the timer overflows. Therefore the formula should be:
+ *
+ * if (time_us <= mcxw_ctx.csl_sample_time)
+ *         csl_phase_us = mcxw_ctx.csl_sample_time - time_us;
+ * else
+ *         csl_phase_us = MAX_TIMER_VALUE - time_us + mcxw_ctx.csl_sample_time;
+ *
+ * For simplicity the formula below has been used.
+ */
+static uint16_t rf_compute_csl_phase(uint32_t time_us)
+{
+	/* convert CSL Period in microseconds - it was given in 10 symbols */
+	uint32_t csl_period_us = mcxw_ctx.csl_period * 10 * IEEE802154_SYMBOL_TIME_US;
+	uint32_t csl_phase_us =
+		(csl_period_us - (time_us % csl_period_us) +
+		(mcxw_ctx.csl_sample_time % csl_period_us)) % csl_period_us;
+
+	return (uint16_t)(csl_phase_us / (10 * IEEE802154_SYMBOL_TIME_US) + 1);
+}
+#endif /* CONFIG_IEEE802154_CSL_ENDPOINT */
+
+/*************************************************************************************************/
+static void rf_abort(void)
+{
+	macToPlmeMessage_t msg;
+
+	sun_rx_mode = RX_ON_IDLE_START;
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibRxOnWhenIdle;
+	msg.msgData.setReq.PibAttributeValue = (uint64_t)0;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+	msg.msgType = gPlmeSetTRxStateReq_c;
+	msg.msgData.setTRxStateReq.state = gPhyForceTRxOff_c;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static void rf_set_channel(uint8_t channel)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibCurrentChannel_c;
+	msg.msgData.setReq.PibAttributeValue = (uint64_t)channel;
+
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+static int mcxw_cca(const struct device *dev)
+{
+	macToPlmeMessage_t msg;
+	phyStatus_t phy_status;
+
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	msg.msgType = gPlmeCcaReq_c;
+	msg.msgData.ccaReq.ccaType = gPhyCCAMode1_c;
+	msg.msgData.ccaReq.contCcaMode = gPhyContCcaDisabled;
+
+	phy_status = MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+	__ASSERT_NO_MSG(phy_status == gPhySuccess_c);
+
+	k_sem_take(&mcxw_radio->cca_wait, K_FOREVER);
+
+	return (mcxw_radio->tx_status == OT_ERROR_CHANNEL_ACCESS_FAILURE) ? -EBUSY : 0;
+}
+
+static int mcxw_set_channel(const struct device *dev, uint16_t channel)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	LOG_DBG("%u", channel);
+
+	if (channel != mcxw_radio->channel) {
+
+		if (channel < 11 || channel > 26) {
+			return channel < 11 ? -ENOTSUP : -EINVAL;
+		}
+
+		mcxw_radio->channel = channel;
+	}
+
+	return 0;
+}
+
+static net_time_t mcxw_get_time(const struct device *dev)
+{
+	static uint64_t sw_timestamp;
+	static uint64_t hw_timestamp;
+
+	ARG_UNUSED(dev);
+
+	/* Get new 32bit HW timestamp */
+	uint32_t ticks;
+	uint64_t hw_timestamp_new;
+	uint64_t wrapped_val = 0;
+	uint64_t increment;
+	unsigned int key;
+
+	key = irq_lock();
+
+	if (counter_get_value(mcxw_ctx.counter, &ticks)) {
+		irq_unlock(key);
+		return -1;
+	}
+
+	hw_timestamp_new = counter_ticks_to_us(mcxw_ctx.counter, ticks);
+
+	/* Check if the timestamp has wrapped around */
+	if (hw_timestamp > hw_timestamp_new) {
+		wrapped_val =
+			COUNT_TO_USEC(((uint64_t)1 << 32), counter_get_frequency(mcxw_ctx.counter));
+	}
+
+	increment = (hw_timestamp_new + wrapped_val) - hw_timestamp;
+	sw_timestamp += increment;
+
+	/* Store new HW timestamp for next iteration */
+	hw_timestamp = hw_timestamp_new;
+
+	irq_unlock(key);
+
+	return (net_time_t)sw_timestamp;
+}
+
+static void rf_set_tx_power(int8_t tx_power)
+{
+	macToPlmeMessage_t msg;
+
+	msg.msgType = gPlmeSetReq_c;
+	msg.msgData.setReq.PibAttribute = gPhyPibTransmitPower_c;
+	msg.msgData.setReq.PibAttributeValue = (uint64_t)tx_power;
+
+	MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+}
+
+/* Used to convert from phy clock timestamp (in symbols) to platform time (in us)
+ * the reception timestamp which must use a true 64bit timestamp source
+ */
+static uint64_t rf_adjust_tstamp_from_phy(uint64_t ts)
+{
+	uint64_t now = PhyTime_ReadClock();
+	uint64_t delta;
+
+	delta = (now >= ts) ? (now - ts) : ((PHY_TMR_MAX_VALUE + now) - ts);
+	delta *= IEEE802154_SYMBOL_TIME_US;
+
+	return mcxw_get_time(NULL) - delta;
+}
+
+#if CONFIG_IEEE802154_CSL_ENDPOINT || CONFIG_NET_PKT_TXTIME
+static uint32_t rf_adjust_tstamp_from_app(uint32_t time)
+{
+	/* The phy timestamp is in symbols so we need to convert it to microseconds */
+	uint64_t ts = PhyTime_ReadClock() * IEEE802154_SYMBOL_TIME_US;
+	uint32_t delta = time - (uint32_t)mcxw_get_time(NULL);
+
+	return (uint32_t)(ts + delta);
+}
+#endif /* CONFIG_IEEE802154_CSL_ENDPOINT || CONFIG_NET_PKT_TXTIME */
+
+/* Phy Data Service Access Point handler
+ * Called by Phy to notify when Tx has been done or Rx data is available
+ */
+phyStatus_t pd_mac_sap_handler(void *msg, instanceId_t instance)
+{
+	pdDataToMacMessage_t *data_msg = (pdDataToMacMessage_t *)msg;
+
+	__ASSERT_NO_MSG(msg != NULL);
+
+	/* PWR_DisallowDeviceToSleep(); */
+
+	switch (data_msg->msgType) {
+	case gPdDataCnf_c:
+		/* TX is done */
+#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
+		if (is_keyid_mode_1(mcxw_ctx.tx_frame.psdu, mcxw_ctx.tx_frame.length) &&
+		    !mcxw_ctx.tx_frame.sec_processed && !mcxw_ctx.tx_frame.hdr_updated) {
+			set_frame_counter(mcxw_ctx.tx_frame.psdu, mcxw_ctx.tx_frame.length,
+					data_msg->fc);
+			mcxw_ctx.tx_frame.hdr_updated = true;
+		}
+#endif
+
+		mcxw_ctx.tx_frame.length = 0;
+		mcxw_ctx.tx_status = 0;
+		mcxw_ctx.state = RADIO_STATE_RECEIVE;
+
+		mcxw_ctx.rx_ack_frame.channel = mcxw_ctx.channel;
+		mcxw_ctx.rx_ack_frame.length = data_msg->msgData.dataCnf.ackLength;
+		mcxw_ctx.rx_ack_frame.timestamp = data_msg->msgData.dataCnf.timeStamp;
+		memcpy(mcxw_ctx.rx_ack_frame.psdu, data_msg->msgData.dataCnf.ackData,
+		       mcxw_ctx.rx_ack_frame.length);
+
+		k_sem_give(&mcxw_ctx.tx_wait);
+
+		k_free(msg);
+		break;
+
+	case gPdDataInd_c:
+		/* RX is done */
+		struct mcxw_rx_frame rx_frame;
+
+		/* retrieve frame information and data */
+		rx_frame.lqi = data_msg->msgData.dataInd.ppduLinkQuality;
+		rx_frame.rssi = data_msg->msgData.dataInd.ppduRssi;
+		rx_frame.timestamp = rf_adjust_tstamp_from_phy(data_msg->msgData.dataInd.timeStamp);
+		rx_frame.ack_fpb = data_msg->msgData.dataInd.rxAckFp;
+		rx_frame.length = data_msg->msgData.dataInd.psduLength;
+		rx_frame.psdu = data_msg->msgData.dataInd.pPsdu;
+		rx_frame.ack_seb = data_msg->msgData.dataInd.ackedWithSecEnhAck;
+
+		rx_frame.phy_buffer = (void *)msg;
+
+		/* stop rx on idle if message queue is almost full */
+		if (k_msgq_num_free_get(&mcxw_ctx.rx_msgq) == 1) {
+			rf_rx_on_idle(RX_ON_IDLE_STOP);
+		}
+
+		/* add the rx message in queue */
+		if (k_msgq_put(&mcxw_ctx.rx_msgq, &rx_frame, K_NO_WAIT) < 0) {
+			LOG_ERR("Failed to push RX data to message queue");
+		}
+		break;
+
+	default:
+		/* PWR_AllowDeviceToSleep(); */
+		break;
+	}
+
+	stop_csl_receiver();
+
+	return gPhySuccess_c;
+}
+
+/* Phy Layer Management Entities Service Access Point handler
+ * Called by Phy to notify PLME event
+ */
+phyStatus_t plme_mac_sap_handler(void *msg, instanceId_t instance)
+{
+	plmeToMacMessage_t *plme_msg = (plmeToMacMessage_t *)msg;
+
+	__ASSERT_NO_MSG(msg != NULL);
+
+	/* PWR_DisallowDeviceToSleep(); */
+
+	switch (plme_msg->msgType) {
+	case gPlmeCcaCnf_c:
+		if (plme_msg->msgData.ccaCnf.status == gPhyChannelBusy_c) {
+			/* Channel is busy */
+			mcxw_ctx.tx_status = EBUSY;
+		} else {
+			mcxw_ctx.tx_status = 0;
+		}
+		mcxw_ctx.state = RADIO_STATE_RECEIVE;
+
+		k_sem_give(&mcxw_ctx.cca_wait);
+		break;
+	case gPlmeEdCnf_c:
+		/* Scan done */
+		if (mcxw_ctx.energy_scan_done != NULL) {
+			energy_scan_done_cb_t callback = mcxw_ctx.energy_scan_done;
+
+			mcxw_ctx.max_ed = plme_msg->msgData.edCnf.maxEnergyLeveldB;
+
+			mcxw_ctx.energy_scan_done = NULL;
+			callback(net_if_get_device(mcxw_ctx.iface), mcxw_ctx.max_ed);
+		}
+		break;
+	case gPlmeTimeoutInd_c:
+		if (RADIO_STATE_TRANSMIT == mcxw_ctx.state) {
+			/* Ack timeout */
+#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
+			if (is_keyid_mode_1(mcxw_ctx.tx_frame.psdu, mcxw_ctx.tx_frame.length) &&
+			    !mcxw_ctx.tx_frame.sec_processed && !mcxw_ctx.tx_frame.hdr_updated) {
+				set_frame_counter(mcxw_ctx.tx_frame.psdu, mcxw_ctx.tx_frame.length,
+						plme_msg->fc);
+				mcxw_ctx.tx_frame.hdr_updated = true;
+			}
+#endif
+
+			mcxw_ctx.state = RADIO_STATE_RECEIVE;
+			/* No ack */
+			mcxw_ctx.tx_status = ENOMSG;
+
+			k_sem_give(&mcxw_ctx.tx_wait);
+		} else if (RADIO_STATE_RECEIVE == mcxw_ctx.state) {
+			/* CSL Receive AT state has ended with timeout and we are returning to SLEEP
+			 * state
+			 */
+			mcxw_ctx.state = RADIO_STATE_SLEEP;
+			/* PWR_AllowDeviceToSleep(); */
+		}
+		break;
+	case gPlmeAbortInd_c:
+		/* TX Packet was loaded into TX Packet RAM but the TX/TR seq did not ended ok */
+#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
+		if (is_keyid_mode_1(mcxw_ctx.tx_frame.psdu, mcxw_ctx.tx_frame.length) &&
+		    !mcxw_ctx.tx_frame.sec_processed && !mcxw_ctx.tx_frame.hdr_updated) {
+			set_frame_counter(mcxw_ctx.tx_frame.psdu, mcxw_ctx.tx_frame.length,
+					plme_msg->fc);
+			mcxw_ctx.tx_frame.hdr_updated = true;
+		}
+#endif
+
+		mcxw_ctx.state = RADIO_STATE_RECEIVE;
+		mcxw_ctx.tx_status = EIO;
+
+		k_sem_give(&mcxw_ctx.tx_wait);
+		break;
+	default:
+		/* PWR_AllowDeviceToSleep(); */
+		break;
+	}
+	/* The message has been allocated by the Phy, we have to free it */
+	k_free(msg);
+
+	stop_csl_receiver();
+
+	return gPhySuccess_c;
+}
+
+static int mcxw_configure(const struct device *dev, enum ieee802154_config_type type,
+			  const struct ieee802154_config *config)
+{
+	ARG_UNUSED(dev);
+
+	switch (type) {
+
+	case IEEE802154_CONFIG_AUTO_ACK_FPB:
+		if (config->auto_ack_fpb.mode == IEEE802154_FPB_ADDR_MATCH_THREAD) {
+			mcxw_enable_src_match(config->auto_ack_fpb.enabled);
+		}
+		/* TODO IEEE802154_FPB_ADDR_MATCH_ZIGBEE */
+		break;
+
+	case IEEE802154_CONFIG_ACK_FPB:
+		if (config->ack_fpb.enabled) {
+			return mcxw_src_match_entry(config->ack_fpb.extended, config->ack_fpb.addr);
+		} else {
+			return mcxw_src_clear_entry(config->ack_fpb.extended, config->ack_fpb.addr);
+		}
+
+		/* TODO otPlatRadioClearSrcMatchShortEntries */
+		/* TODO otPlatRadioClearSrcMatchExtEntries */
+		break;
+
+	case IEEE802154_CONFIG_PAN_COORDINATOR:
+		mcxw_set_pan_coord(config->pan_coordinator);
+		break;
+
+	case IEEE802154_CONFIG_PROMISCUOUS:
+		mcxw_set_promiscuous(config->promiscuous);
+		break;
+
+	case IEEE802154_CONFIG_MAC_KEYS:
+		mcxw_set_mac_key(config->mac_keys);
+		break;
+
+	case IEEE802154_CONFIG_FRAME_COUNTER:
+		mcxw_set_mac_frame_counter(config->frame_counter);
+		break;
+
+	case IEEE802154_CONFIG_FRAME_COUNTER_IF_LARGER:
+		mcxw_set_mac_frame_counter_if_larger(config->frame_counter);
+		break;
+
+	case IEEE802154_CONFIG_ENH_ACK_HEADER_IE:
+		mcxw_configure_enh_ack_probing(config);
+		break;
+
+#if defined(CONFIG_IEEE802154_CSL_ENDPOINT)
+	case IEEE802154_CONFIG_EXPECTED_RX_TIME:
+		mcxw_ctx.csl_sample_time = config->expected_rx_time;
+		break;
+
+	case IEEE802154_CONFIG_RX_SLOT:
+		mcxw_receive_at(config->rx_slot.channel, config->rx_slot.start / NSEC_PER_USEC,
+				config->rx_slot.duration / NSEC_PER_USEC);
+		break;
+
+	case IEEE802154_CONFIG_CSL_PERIOD:
+		mcxw_enable_csl(config->csl_period);
+		break;
+#endif /* CONFIG_IEEE802154_CSL_ENDPOINT */
+
+	case IEEE802154_CONFIG_RX_ON_WHEN_IDLE:
+		if (config->rx_on_when_idle) {
+			rf_rx_on_idle(RX_ON_IDLE_START);
+		} else {
+			rf_rx_on_idle(RX_ON_IDLE_STOP);
+		}
+		break;
+
+	case IEEE802154_CONFIG_EVENT_HANDLER:
+		break;
+
+	case IEEE802154_OPENTHREAD_CONFIG_MAX_EXTRA_CCA_ATTEMPTS:
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+IEEE802154_DEFINE_PHY_SUPPORTED_CHANNELS(drv_attr, 11, 26);
+
+static int mcxw_attr_get(const struct device *dev, enum ieee802154_attr attr,
+			 struct ieee802154_attr_value *value)
+{
+	ARG_UNUSED(dev);
+
+	if (ieee802154_attr_get_channel_page_and_range(
+		    attr, IEEE802154_ATTR_PHY_CHANNEL_PAGE_ZERO_OQPSK_2450_BPSK_868_915,
+		    &drv_attr.phy_supported_channels, value) == 0) {
+		return 0;
+	}
+
+	return -EIO;
+}
+
+static enum ieee802154_hw_caps mcxw_get_capabilities(const struct device *dev)
+{
+	enum ieee802154_hw_caps caps;
+
+	caps = IEEE802154_HW_FCS | IEEE802154_HW_PROMISC | IEEE802154_HW_FILTER |
+	       IEEE802154_HW_TX_RX_ACK | IEEE802154_HW_RX_TX_ACK | IEEE802154_HW_ENERGY_SCAN |
+	       IEEE802154_HW_TXTIME | IEEE802154_HW_RXTIME | IEEE802154_HW_SLEEP_TO_TX |
+	       IEEE802154_RX_ON_WHEN_IDLE | IEEE802154_HW_TX_SEC |
+	       IEEE802154_OPENTHREAD_HW_MULTIPLE_CCA | IEEE802154_HW_SELECTIVE_TXCHANNEL |
+	       IEEE802154_OPENTHREAD_HW_CST;
+	return caps;
+}
+
+static int mcxw_init(const struct device *dev)
+{
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	macToPlmeMessage_t msg;
+
+	if (PLATFORM_InitOT() < 0) {
+		return -EIO;
+	}
+
+	Phy_Init();
+
+	ot_phy_ctx = PHY_get_ctx();
+
+	/* Register Phy Data Service Access Point and Phy Layer Management Entities Service Access
+	 * Point handlers
+	 */
+	Phy_RegisterSapHandlers((PD_MAC_SapHandler_t)pd_mac_sap_handler,
+				(PLME_MAC_SapHandler_t)plme_mac_sap_handler, ot_phy_ctx);
+
+	msg.msgType = gPlmeEnableEncryption_c;
+	(void)MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+	mcxw_radio->state = RADIO_STATE_DISABLED;
+	mcxw_radio->energy_scan_done = NULL;
+
+	mcxw_radio->channel = DEFAULT_CHANNEL;
+	rf_set_channel(mcxw_radio->channel);
+
+	mcxw_radio->tx_frame.length = 0;
+	/* Make the psdu point to the space after macToPdDataMessage_t in the data buffer */
+	mcxw_radio->tx_frame.psdu = mcxw_radio->tx_data + sizeof(macToPdDataMessage_t);
+
+	/* Get and start LPTRM counter */
+	mcxw_radio->counter = DEVICE_DT_GET(DT_NODELABEL(lptmr0));
+	if (counter_start(mcxw_radio->counter)) {
+		return -EIO;
+	}
+
+	/* Init TX semaphore */
+	k_sem_init(&mcxw_radio->tx_wait, 0, 1);
+	/* Init CCA semaphore */
+	k_sem_init(&mcxw_radio->cca_wait, 0, 1);
+
+	/* Init RX message queue */
+	k_msgq_init(&mcxw_radio->rx_msgq, mcxw_radio->rx_msgq_buffer, sizeof(mcxw_rx_frame),
+		    NMAX_RXRING_BUFFERS);
+
+	memset(&(mcxw_radio->rx_ack_frame), 0, sizeof(mcxw_radio->rx_ack_frame));
+	mcxw_radio->rx_ack_frame.psdu = mcxw_radio->rx_ack_data;
+
+	k_thread_create(&mcxw_radio->rx_thread, mcxw_radio->rx_stack,
+			CONFIG_IEEE802154_MCXW_RX_STACK_SIZE, mcxw_rx_thread, mcxw_radio, NULL,
+			NULL, K_PRIO_COOP(2), 0, K_NO_WAIT);
+
+	k_thread_name_set(&mcxw_radio->rx_thread, "mcxw_rx");
+
+	return 0;
+}
+
+static void mcxw_iface_init(struct net_if *iface)
+{
+	const struct device *dev = net_if_get_device(iface);
+	struct mcxw_context *mcxw_radio = dev->data;
+
+	mcxw_get_eui64(mcxw_radio->mac);
+
+	net_if_set_link_addr(iface, mcxw_radio->mac, sizeof(mcxw_radio->mac), NET_LINK_IEEE802154);
+	mcxw_radio->iface = iface;
+	ieee802154_init(iface);
+}
+
+static void rf_rx_on_idle(uint32_t new_val)
+{
+	macToPlmeMessage_t msg;
+	phyStatus_t phy_status;
+
+	new_val %= 2;
+	if (sun_rx_mode != new_val) {
+		sun_rx_mode = new_val;
+		msg.msgType = gPlmeSetReq_c;
+		msg.msgData.setReq.PibAttribute = gPhyPibRxOnWhenIdle;
+		msg.msgData.setReq.PibAttributeValue = (uint64_t)sun_rx_mode;
+
+		phy_status = MAC_PLME_SapHandler(&msg, ot_phy_ctx);
+
+		__ASSERT_NO_MSG(phy_status == gPhySuccess_c);
+	}
+}
+
+static const struct ieee802154_radio_api mcxw71_radio_api = {
+	.iface_api.init = mcxw_iface_init,
+
+	.get_capabilities = mcxw_get_capabilities,
+	.cca = mcxw_cca,
+	.set_channel = mcxw_set_channel,
+	.filter = mcxw_filter,
+	.set_txpower = mcxw_set_txpower,
+	.start = mcxw_start,
+	.stop = mcxw_stop,
+	.configure = mcxw_configure,
+	.tx = mcxw_tx,
+	.ed_scan = mcxw_energy_scan,
+	.get_time = mcxw_get_time,
+	.get_sch_acc = mcxw_get_acc,
+	.attr_get = mcxw_attr_get,
+};
+
+#if defined(CONFIG_NET_L2_IEEE802154)
+#define L2          IEEE802154_L2
+#define L2_CTX_TYPE NET_L2_GET_CTX_TYPE(IEEE802154_L2)
+#define MTU         IEEE802154_MTU
+#elif defined(CONFIG_NET_L2_OPENTHREAD)
+#define L2          OPENTHREAD_L2
+#define L2_CTX_TYPE NET_L2_GET_CTX_TYPE(OPENTHREAD_L2)
+#define MTU         1280
+#elif defined(CONFIG_NET_L2_CUSTOM_IEEE802154)
+#define L2          CUSTOM_IEEE802154_L2
+#define L2_CTX_TYPE NET_L2_GET_CTX_TYPE(CUSTOM_IEEE802154_L2)
+#define MTU         CONFIG_NET_L2_CUSTOM_IEEE802154_MTU
+#endif
+
+NET_DEVICE_DT_INST_DEFINE(0, mcxw_init, NULL, &mcxw_ctx, NULL, CONFIG_IEEE802154_MCXW_INIT_PRIO,
+			  &mcxw71_radio_api, L2, L2_CTX_TYPE, MTU);
diff --git a/drivers/ieee802154/ieee802154_mcxw.h b/drivers/ieee802154/ieee802154_mcxw.h
new file mode 100644
index 0000000000000..eb3fb284dc6ef
--- /dev/null
+++ b/drivers/ieee802154/ieee802154_mcxw.h
@@ -0,0 +1,125 @@
+/* ieee802154_mcxw.h - NXP MCXW 802.15.4 driver */
+
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCXW_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCXW_H_
+
+#include <zephyr/net/ieee802154_radio.h>
+
+#include "PhyInterface.h"
+
+#define TX_ENCRYPT_DELAY_SYM 200
+
+#define DEFAULT_CHANNEL                  (11)
+#define DEFAULT_CCA_MODE                 (gPhyCCAMode1_c)
+#define IEEE802154_ACK_REQUEST           (1 << 5)
+#define IEEE802154_MIN_LENGTH            (5)
+#define IEEE802154_FRM_CTL_LO_OFFSET     (0)
+#define IEEE802154_DSN_OFFSET            (2)
+#define IEEE802154_FRM_TYPE_MASK         (0x7)
+#define IEEE802154_FRM_TYPE_ACK          (0x2)
+#define IEEE802154_SYMBOL_TIME_US        (16)
+#define IEEE802154_TURNAROUND_LEN_SYM    (12)
+#define IEEE802154_CCA_LEN_SYM           (8)
+#define IEEE802154_PHY_SHR_LEN_SYM       (10)
+#define IEEE802154_IMM_ACK_WAIT_SYM      (54)
+#define IEEE802154_ENH_ACK_WAIT_SYM      (90)
+
+#define NMAX_RXRING_BUFFERS              (8)
+#define RX_ON_IDLE_START                 (1)
+#define RX_ON_IDLE_STOP                  (0)
+
+#define PHY_TMR_MAX_VALUE                (0x00FFFFFF)
+
+/* The Uncertainty of the scheduling CSL of transmission by the parent, in ±10 us units. */
+#define CSL_UNCERT 32
+
+#define RADIO_SYMBOLS_PER_OCTET			(2)
+
+typedef enum mcxw_radio_state {
+	RADIO_STATE_DISABLED = 0,
+	RADIO_STATE_SLEEP    = 1,
+	RADIO_STATE_RECEIVE  = 2,
+	RADIO_STATE_TRANSMIT = 3,
+	RADIO_STATE_INVALID  = 255,
+} mcxw_radio_state;
+
+typedef struct mcxw_rx_frame {
+	uint8_t *psdu;
+	uint8_t length;
+	int8_t rssi;
+	uint8_t lqi;
+	uint32_t timestamp;
+	bool ack_fpb;
+	bool ack_seb;
+	uint64_t time;
+	void *phy_buffer;
+	uint8_t channel;
+} mcxw_rx_frame;
+
+typedef struct mcxw_tx_frame {
+	uint8_t *psdu;
+	uint8_t length;
+	uint32_t tx_delay;
+	uint32_t tx_delay_base;
+	bool sec_processed;
+	bool hdr_updated;
+} mcxw_tx_frame;
+
+struct mcxw_context {
+	/* Pointer to the network interface. */
+	struct net_if *iface;
+	/* Pointer to the LPTMR counter device structure*/
+	const struct device *counter;
+	/* 802.15.4 HW address. */
+	uint8_t mac[8];
+	/* RX thread stack. */
+	K_KERNEL_STACK_MEMBER(rx_stack, CONFIG_IEEE802154_MCXW_RX_STACK_SIZE);
+	/* RX thread control block. */
+	struct k_thread rx_thread;
+	/* RX message queue */
+	struct k_msgq rx_msgq;
+	/* RX message queue buffer */
+	char rx_msgq_buffer[NMAX_RXRING_BUFFERS * sizeof(mcxw_rx_frame)];
+	/* TX synchronization semaphore */
+	struct k_sem tx_wait;
+	/* TX synchronization semaphore */
+	struct k_sem cca_wait;
+	/* Radio state */
+	mcxw_radio_state state;
+	/* Pan ID */
+	uint16_t pan_id;
+	/* Channel */
+	uint8_t channel;
+	/* Maximum energy detected during ED scan */
+	int8_t max_ed;
+	/* TX power level */
+	int8_t tx_pwr_lvl;
+	/* Enery detect */
+	energy_scan_done_cb_t energy_scan_done;
+	/* TX Status */
+	int tx_status;
+	/* TX frame */
+	mcxw_tx_frame tx_frame;
+	/* TX data */
+	uint8_t tx_data[sizeof(macToPdDataMessage_t) + IEEE802154_MAX_PHY_PACKET_SIZE];
+	/* RX mode */
+	uint32_t rx_mode;
+	/* RX ACK buffers */
+	mcxw_rx_frame rx_ack_frame;
+	/* RX ACK data */
+	uint8_t rx_ack_data[IEEE802154_MAX_PHY_PACKET_SIZE];
+	/* CSL period */
+	uint32_t csl_period;
+	/* CSL sample time in microseconds */
+	uint32_t csl_sample_time;
+	/* PHY context */
+	uint8_t ot_phy_ctx;
+};
+
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCXW_H_ */
diff --git a/drivers/ieee802154/ieee802154_mcxw_utils.c b/drivers/ieee802154/ieee802154_mcxw_utils.c
new file mode 100644
index 0000000000000..0367f8a26b64c
--- /dev/null
+++ b/drivers/ieee802154/ieee802154_mcxw_utils.c
@@ -0,0 +1,356 @@
+/* ieee802154_mcxw_utils.c - NXP MCXW 802.15.4 driver utils*/
+
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <errno.h>
+
+#include "ieee802154_mcxw_utils.h"
+
+/* TODO IEEE 802.15.4 MAC Multipurpose frame format */
+/* TODO add function checks */
+
+enum offset_fcf_fields {
+	OffsetFrameType = 0x00,
+	OffsetSecurityEnabled = 0x03,
+	OffsetFramePending = 0x04,
+	OffsetAR = 0x05,
+	OffsetPanIdCompression = 0x06,
+	OffsetSeqNumberSuppression = 0x08,
+	OffsetIEPresent = 0x09,
+	OffsetDstAddrMode = 0x0A,
+	OffsetFrameVersion = 0x0C,
+	OffsetSrcAddrMode = 0x0E,
+};
+
+enum mask_fcf_fields {
+	MaskFrameType = (0x7 << OffsetFrameType),
+	MaskSecurityEnabled = (0x01 << OffsetSecurityEnabled),
+	MaskFramePending = (0x01 << OffsetFramePending),
+	MaskAR = (0x01 << OffsetAR),
+	MaskPanIdCompression = (0x01 << OffsetPanIdCompression),
+	MaskSeqNumberSuppression = (0x01 << OffsetSeqNumberSuppression),
+	MaskIEPresent = (0x01 << OffsetIEPresent),
+	MaskDstAddrMode = (0x03 << OffsetDstAddrMode),
+	MaskFrameVersion = (0x03 << OffsetFrameVersion),
+	MaskSrcAddrMode = (0x03 << OffsetSrcAddrMode),
+};
+
+enum modes_dst_addr {
+	ModeDstAddrNone = 0x00,
+	ModeDstAddrShort = (0x02 << OffsetDstAddrMode),
+	ModeDstAddrExt = (0x03 << OffsetDstAddrMode),
+};
+
+enum version_frame {
+	VersionIeee2003 = 0x00,
+	VersionIeee2006 = 0x01,
+	VersionIeee2015 = 0x02,
+};
+
+enum modes_src_addr {
+	ModeSrcAddrNone = 0x00,
+	ModeSrcAddrShort = (0x02 << OffsetSrcAddrMode),
+	ModeSrcAddrExt = (0x03 << OffsetSrcAddrMode),
+};
+
+enum offset_scf_fields {
+	OffsetSecurityLevel = 0x00,
+	OffsetKeyIdMode = 0x03,
+	OffsetFrameCntSuppression = 0x05,
+	OffsetASNinNonce = 0x06,
+};
+
+enum mask_scf_fields {
+	MaskSecurityLevel = (0x07 << OffsetSecurityLevel),
+	MaskKeyIdMode = (0x03 << OffsetKeyIdMode),
+	MaskFrameCntSuppression = (0x1 << OffsetFrameCntSuppression),
+	MaskASNinNonce = (0x01 << OffsetASNinNonce),
+};
+
+static uint16_t get_frame_control_field(uint8_t *pdu, uint16_t length)
+{
+	if ((pdu == NULL) || (length < 3)) {
+		return 0x00;
+	}
+
+	return (uint16_t)(pdu[0] | (pdu[1] << 8));
+}
+
+static bool is_security_enabled(uint16_t fcf)
+{
+	if (fcf) {
+		return (bool)(fcf & MaskSecurityEnabled);
+	}
+
+	return false;
+}
+
+static bool is_ie_present(uint16_t fcf)
+{
+	if (fcf) {
+		return (bool)(fcf & MaskIEPresent);
+	}
+
+	return false;
+}
+
+static uint8_t get_frame_version(uint16_t fcf)
+{
+	if (fcf) {
+		return (uint8_t)((fcf & MaskFrameVersion) >> OffsetFrameVersion);
+	}
+
+	return 0xFF;
+}
+
+static bool is_frame_version_2015_fcf(uint16_t fcf)
+{
+	if (fcf) {
+		return get_frame_version(fcf) == VersionIeee2015;
+	}
+
+	return false;
+}
+
+bool is_frame_version_2015(uint8_t *pdu, uint16_t length)
+{
+	uint16_t fcf = get_frame_control_field(pdu, length);
+
+	if (fcf) {
+		return get_frame_version(fcf) == VersionIeee2015;
+	}
+
+	return false;
+}
+
+static bool is_sequence_number_suppression(uint16_t fcf)
+{
+	if (fcf) {
+		return (bool)(fcf & MaskSeqNumberSuppression);
+	}
+
+	return false;
+}
+
+static bool is_dst_panid_present(uint16_t fcf)
+{
+	bool present;
+
+	if (!fcf) {
+		return false;
+	}
+
+	if (is_frame_version_2015_fcf(fcf)) {
+		switch (fcf & (MaskDstAddrMode | MaskSrcAddrMode | MaskPanIdCompression)) {
+		case (ModeDstAddrNone | ModeSrcAddrNone):
+		case (ModeDstAddrShort | ModeSrcAddrNone | MaskPanIdCompression):
+		case (ModeDstAddrExt | ModeSrcAddrNone | MaskPanIdCompression):
+		case (ModeDstAddrNone | ModeSrcAddrShort):
+		case (ModeDstAddrNone | ModeSrcAddrExt):
+		case (ModeDstAddrNone | ModeSrcAddrShort | MaskPanIdCompression):
+		case (ModeDstAddrNone | ModeSrcAddrExt | MaskPanIdCompression):
+		case (ModeDstAddrExt | ModeSrcAddrExt | MaskPanIdCompression):
+			present = false;
+			break;
+		default:
+			present = true;
+		}
+	} else {
+		present = (bool)(fcf & MaskDstAddrMode);
+	}
+
+	return present;
+}
+
+static bool is_src_panid_present(uint16_t fcf)
+{
+	bool present;
+
+	if (!fcf) {
+		return false;
+	}
+
+	if (is_frame_version_2015_fcf(fcf)) {
+		switch (fcf & (MaskDstAddrMode | MaskSrcAddrMode | MaskPanIdCompression)) {
+		case (ModeDstAddrNone | ModeSrcAddrShort):
+		case (ModeDstAddrNone | ModeSrcAddrExt):
+		case (ModeDstAddrShort | ModeSrcAddrShort):
+		case (ModeDstAddrShort | ModeSrcAddrExt):
+		case (ModeDstAddrExt | ModeSrcAddrShort):
+			present = true;
+			break;
+		default:
+			present = false;
+		}
+
+	} else {
+		present = ((fcf & MaskSrcAddrMode) != 0) && ((fcf & MaskPanIdCompression) == 0);
+	}
+
+	return present;
+}
+
+static uint8_t calculate_addr_field_size(uint16_t fcf)
+{
+	uint8_t size = 2;
+
+	if (!fcf) {
+		return 0;
+	}
+
+	if (!is_sequence_number_suppression(fcf)) {
+		size += 1;
+	}
+
+	if (is_dst_panid_present(fcf)) {
+		size += 2;
+	}
+
+	/* destination addressing mode */
+	switch (fcf & MaskDstAddrMode) {
+	case ModeDstAddrShort:
+		size += 2;
+		break;
+	case ModeDstAddrExt:
+		size += 8;
+		break;
+	default:
+		break;
+	}
+
+	if (is_src_panid_present(fcf)) {
+		size += 2;
+	}
+
+	/* source addressing mode */
+	switch (fcf & MaskSrcAddrMode) {
+	case ModeSrcAddrShort:
+		size += 2;
+		break;
+	case ModeSrcAddrExt:
+		size += 8;
+		break;
+	default:
+		break;
+	}
+
+	return size;
+}
+
+static uint8_t get_keyid_mode(uint8_t *pdu, uint16_t length)
+{
+	uint16_t fcf = get_frame_control_field(pdu, length);
+	uint8_t ash_start;
+
+	if (is_security_enabled(fcf)) {
+		ash_start = calculate_addr_field_size(fcf);
+		return (uint8_t)((pdu[ash_start] & MaskKeyIdMode) >> OffsetKeyIdMode);
+	}
+
+	return 0xFF;
+}
+
+bool is_keyid_mode_1(uint8_t *pdu, uint16_t length)
+{
+	uint8_t key_mode = get_keyid_mode(pdu, length);
+
+	if (key_mode == 0x01) {
+		return true;
+	}
+
+	return false;
+}
+
+void set_frame_counter(uint8_t *pdu, uint16_t length, uint32_t fc)
+{
+	uint16_t fcf = get_frame_control_field(pdu, length);
+
+	if (is_security_enabled(fcf)) {
+		uint8_t ash_start = calculate_addr_field_size(fcf);
+		uint8_t scf = pdu[ash_start];
+
+		/* check that Frame Counter Suppression is not set */
+		if (!(scf & MaskFrameCntSuppression)) {
+			sys_put_le32(fc, &pdu[ash_start + 1]);
+		}
+	}
+}
+
+static uint8_t get_asn_size(uint8_t *pdu, uint16_t length)
+{
+	uint16_t fcf = get_frame_control_field(pdu, length);
+
+	if (is_security_enabled(fcf)) {
+		uint8_t ash_start = calculate_addr_field_size(fcf);
+		uint8_t scf = pdu[ash_start];
+		uint8_t size = 1;
+
+		/* Frame Counter Suppression is not set */
+		if (!(scf & MaskFrameCntSuppression)) {
+			size += 4;
+		}
+
+		uint8_t key_mode = get_keyid_mode(pdu, length);
+
+		switch (key_mode) {
+		case 0x01:
+			size += 1;
+			break;
+		case 0x02:
+			size += 5;
+		case 0x03:
+			size += 9;
+		default:
+			break;
+		}
+
+		return size;
+	}
+	return 0;
+}
+
+static uint8_t *get_csl_ie_content_start(uint8_t *pdu, uint16_t length)
+{
+	uint16_t fcf = get_frame_control_field(pdu, length);
+
+	if (is_ie_present(fcf)) {
+		uint8_t ie_start_idx = calculate_addr_field_size(fcf) + get_asn_size(pdu, length);
+		uint8_t *cur_ie = &pdu[ie_start_idx];
+
+		uint8_t ie_header = (uint16_t)(cur_ie[0] | (cur_ie[1] << 8));
+		uint8_t ie_length = ie_header & 0x7F;
+		uint8_t ie_el_id = ie_header & 0x7F80;
+
+		while ((ie_el_id != 0x7e) && (ie_el_id != 0x7f)) {
+			if (ie_el_id == 0x1a) {
+				return (cur_ie + 2);
+			}
+			cur_ie += (2 + ie_length);
+			ie_header = (uint16_t)(cur_ie[0] | (cur_ie[1] << 8));
+			ie_length = ie_header & 0x7F;
+			ie_el_id = ie_header & 0x7F80;
+		}
+	}
+
+	return NULL;
+}
+
+void set_csl_ie(uint8_t *pdu, uint16_t length, uint16_t period, uint16_t phase)
+{
+	uint8_t *csl_ie_content = get_csl_ie_content_start(pdu, length);
+
+	if (csl_ie_content) {
+		sys_put_le16(phase, csl_ie_content);
+		sys_put_le16(period, csl_ie_content + 2);
+	}
+}
diff --git a/drivers/ieee802154/ieee802154_mcxw_utils.h b/drivers/ieee802154/ieee802154_mcxw_utils.h
new file mode 100644
index 0000000000000..2b37538eeeb05
--- /dev/null
+++ b/drivers/ieee802154/ieee802154_mcxw_utils.h
@@ -0,0 +1,16 @@
+/* ieee802154_mcxw_utils.h - NXP MCXW 802.15.4 driver utils*/
+
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+bool is_frame_version_2015(uint8_t *pdu, uint16_t length);
+
+bool is_keyid_mode_1(uint8_t *pdu, uint16_t length);
+
+void set_frame_counter(uint8_t *pdu, uint16_t length, uint32_t fc);
+
+void set_csl_ie(uint8_t *pdu, uint16_t length, uint16_t period, uint16_t phase);
diff --git a/drivers/input/CMakeLists.txt b/drivers/input/CMakeLists.txt
index ab28b03f03e2c..f8d04e4094f39 100644
--- a/drivers/input/CMakeLists.txt
+++ b/drivers/input/CMakeLists.txt
@@ -19,6 +19,7 @@ zephyr_library_sources_ifdef(CONFIG_INPUT_GPIO_KEYS input_gpio_keys.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_GPIO_QDEC input_gpio_qdec.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_GT911 input_gt911.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_ILI2132A input_ili2132a.c)
+zephyr_library_sources_ifdef(CONFIG_INPUT_ITE_IT51XXX_KBD input_ite_it51xxx_kbd.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_ITE_IT8801_KBD input_ite_it8801_kbd.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_ITE_IT8XXX2_KBD input_ite_it8xxx2_kbd.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_KBD_MATRIX input_kbd_matrix.c)
@@ -28,7 +29,9 @@ zephyr_library_sources_ifdef(CONFIG_INPUT_PAT912X input_pat912x.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_PAW32XX input_paw32xx.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_PINNACLE input_pinnacle.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_PMW3610 input_pmw3610.c)
+zephyr_library_sources_ifdef(CONFIG_INPUT_REALTEK_RTS5912_KBD input_realtek_rts5912_kbd.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_SBUS input_sbus.c)
+zephyr_library_sources_ifdef(CONFIG_INPUT_STM32_TSC_KEYS input_tsc_keys.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_STMPE811 input_stmpe811.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_TOUCH input_touch.c)
 zephyr_library_sources_ifdef(CONFIG_INPUT_XEC_KBD input_xec_kbd.c)
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 726916675b3f1..889702e48db82 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -21,6 +21,7 @@ source "drivers/input/Kconfig.gpio_keys"
 source "drivers/input/Kconfig.gpio_qdec"
 source "drivers/input/Kconfig.gt911"
 source "drivers/input/Kconfig.ili2132a"
+source "drivers/input/Kconfig.it51xxx"
 source "drivers/input/Kconfig.it8801"
 source "drivers/input/Kconfig.it8xxx2"
 source "drivers/input/Kconfig.kbd_matrix"
@@ -30,10 +31,12 @@ source "drivers/input/Kconfig.pat912x"
 source "drivers/input/Kconfig.paw32xx"
 source "drivers/input/Kconfig.pinnacle"
 source "drivers/input/Kconfig.pmw3610"
+source "drivers/input/Kconfig.rts5912"
 source "drivers/input/Kconfig.sbus"
 source "drivers/input/Kconfig.sdl"
 source "drivers/input/Kconfig.stmpe811"
 source "drivers/input/Kconfig.touch"
+source "drivers/input/Kconfig.tsc_keys"
 source "drivers/input/Kconfig.xec"
 source "drivers/input/Kconfig.xpt2046"
 # zephyr-keep-sorted-stop
diff --git a/drivers/input/Kconfig.it51xxx b/drivers/input/Kconfig.it51xxx
new file mode 100644
index 0000000000000..5bcd9bc103a06
--- /dev/null
+++ b/drivers/input/Kconfig.it51xxx
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config INPUT_ITE_IT51XXX_KBD
+	bool "ITE keyboard scanning driver"
+	default y
+	depends on DT_HAS_ITE_IT51XXX_KBD_ENABLED
+	select INPUT_KBD_MATRIX
+	select PINCTRL
+	help
+	  This option enables the ITE keyboard scan driver.
diff --git a/drivers/input/Kconfig.rts5912 b/drivers/input/Kconfig.rts5912
new file mode 100644
index 0000000000000..7bd631a2ecd6b
--- /dev/null
+++ b/drivers/input/Kconfig.rts5912
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Realtek Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+config INPUT_REALTEK_RTS5912_KBD
+	bool "Realtek RTS5912 keyboard scanning driver"
+	default y
+	depends on DT_HAS_REALTEK_RTS5912_KBD_ENABLED
+	select INPUT_KBD_MATRIX
+	help
+	  This option enables the Realtek keyboard scan driver.
diff --git a/drivers/input/Kconfig.tsc_keys b/drivers/input/Kconfig.tsc_keys
new file mode 100644
index 0000000000000..57b05321a6731
--- /dev/null
+++ b/drivers/input/Kconfig.tsc_keys
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config INPUT_STM32_TSC_KEYS
+	bool "STM32 TSC touch library"
+	default y
+	depends on DT_HAS_ST_STM32_TSC_ENABLED
+	select RING_BUFFER
+	help
+	  Enable support for STM32 TSC touch library.
+
+config INPUT_STM32_TSC_KEYS_BUFFER_WORD_SIZE
+	int "STM32 TSC touch buffer size in words"
+	default 10
+	depends on INPUT_STM32_TSC_KEYS
+	help
+	  Size of the ring buffer for the STM32 TSC touch library. The size of this
+	  buffer together with the sampling-interval property in the tsc-keys
+	  device tree node determines the time window of interest. A slope value is
+	  calculated between the oldest and the newest value in the buffer to
+	  generate a press or release input event.
diff --git a/drivers/input/input_ite_it51xxx_kbd.c b/drivers/input/input_ite_it51xxx_kbd.c
new file mode 100644
index 0000000000000..388fdc6f29281
--- /dev/null
+++ b/drivers/input/input_ite_it51xxx_kbd.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ite_it51xxx_kbd
+
+#include <errno.h>
+#include <soc.h>
+#include <soc_dt.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/interrupt_controller/wuc_ite_it51xxx.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-it51xxx-wuc.h>
+#include <zephyr/input/input.h>
+#include <zephyr/input/input_kbd_matrix.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util_macro.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(input_ite_it51xxx_kbd);
+
+#define KEYBOARD_KSI_PIN_COUNT IT8XXX2_DT_INST_WUCCTRL_LEN(0)
+
+/* 0x04: Keyboard Scan In Data */
+#define REG_KBS_KSI 0x04
+/* 0x80: Keyboard Scan Out Data (3 bytes value and 4 bytes aligned) */
+#define REG_KBS_KSO 0x80
+
+struct it51xxx_kbd_wuc_map_cfg {
+	/* WUC control device structure */
+	const struct device *wucs;
+	/* WUC pin mask */
+	uint8_t mask;
+};
+
+struct it51xxx_kbd_config {
+	struct input_kbd_matrix_common_config common;
+	/* Keyboard scan controller base address */
+	uintptr_t base;
+	/* Keyboard scan input (KSI) wake-up irq */
+	int irq;
+	/* KSI[7:0] wake-up input source configuration list */
+	const struct it51xxx_kbd_wuc_map_cfg *wuc_map_list;
+	/* keyboard scan alternate configuration */
+	const struct pinctrl_dev_config *pcfg;
+	/* KSO16 GPIO cells */
+	struct gpio_dt_spec kso16_gpios;
+	/* KSO17 GPIO cells */
+	struct gpio_dt_spec kso17_gpios;
+	/* Mask of signals to ignore */
+	uint32_t kso_ignore_mask;
+};
+
+struct it51xxx_kbd_data {
+	struct input_kbd_matrix_common_data common;
+	/* KSI[7:0] wake-up interrupt status mask */
+	uint8_t ksi_pin_mask;
+};
+
+INPUT_KBD_STRUCT_CHECK(struct it51xxx_kbd_config, struct it51xxx_kbd_data);
+
+static void it51xxx_kbd_drive_column(const struct device *dev, int col)
+{
+	const struct it51xxx_kbd_config *const config = dev->config;
+	const struct input_kbd_matrix_common_config *common = &config->common;
+	const uintptr_t base = config->base;
+	const uint32_t kso_mask = BIT_MASK(common->col_size) & ~config->kso_ignore_mask;
+	uint32_t kso_val, reg_val;
+	unsigned int key;
+
+	if (col == INPUT_KBD_MATRIX_COLUMN_DRIVE_NONE) {
+		/* Tri-state all outputs */
+		kso_val = kso_mask;
+	} else if (col == INPUT_KBD_MATRIX_COLUMN_DRIVE_ALL) {
+		/* Assert all outputs */
+		kso_val = 0;
+	} else {
+		/* Assert a single output */
+		kso_val = kso_mask ^ BIT(col);
+	}
+
+	/*
+	 * Set keyboard scan output data, disable global interrupts for critical section.
+	 * The KBS_KSO registers contains both keyboard and GPIO output settings.
+	 * Not all bits are for the keyboard will be driven, so a critical section
+	 * is needed to avoid race conditions.
+	 */
+	key = irq_lock();
+	reg_val = sys_read32(base + REG_KBS_KSO) & ~kso_mask;
+	sys_write32((reg_val | (kso_val & kso_mask)), base + REG_KBS_KSO);
+	irq_unlock(key);
+}
+
+static kbd_row_t it51xxx_kbd_read_row(const struct device *dev)
+{
+	const struct it51xxx_kbd_config *const config = dev->config;
+	const uintptr_t base = config->base;
+	uint8_t reg_val;
+
+	/* Bits are active-low, so toggle it (return 1 means key pressed) */
+	reg_val = sys_read8(base + REG_KBS_KSI);
+
+	return reg_val ^ 0xff;
+}
+
+static void it51xxx_kbd_clear_status(const struct device *dev)
+{
+	const struct it51xxx_kbd_config *const config = dev->config;
+	struct it51xxx_kbd_data *data = dev->data;
+
+	/*
+	 * W/C wakeup interrupt status of KSI[7:0] pins
+	 *
+	 * NOTE: We want to clear the status as soon as possible,
+	 *       so clear KSI[7:0] pins at a time.
+	 */
+	it51xxx_wuc_clear_status(config->wuc_map_list[0].wucs, data->ksi_pin_mask);
+
+	/* W/C interrupt status of KSI[7:0] pins */
+	ite_intc_isr_clear(config->irq);
+}
+
+static void it51xxx_kbd_isr(const struct device *dev)
+{
+	it51xxx_kbd_clear_status(dev);
+
+	input_kbd_matrix_poll_start(dev);
+}
+
+static void it51xxx_kbd_set_detect_mode(const struct device *dev, bool enable)
+{
+	const struct it51xxx_kbd_config *const config = dev->config;
+
+	if (enable) {
+		it51xxx_kbd_clear_status(dev);
+
+		irq_enable(config->irq);
+	} else {
+		irq_disable(config->irq);
+	}
+}
+
+static int it51xxx_kbd_init(const struct device *dev)
+{
+	const struct it51xxx_kbd_config *const config = dev->config;
+	const struct input_kbd_matrix_common_config *common = &config->common;
+	struct it51xxx_kbd_data *data = dev->data;
+	const uintptr_t base = config->base;
+	const uint32_t kso_mask = BIT_MASK(common->col_size) & ~config->kso_ignore_mask;
+	int status;
+	uint32_t reg_val;
+
+	/* Disable wakeup and interrupt of KSI pins before configuring */
+	it51xxx_kbd_set_detect_mode(dev, false);
+
+	if (common->col_size > 16) {
+		/*
+		 * For KSO[16] and KSO[17]:
+		 * Set pull up and open-drain by their GPIO ports corresponding
+		 * GPCRx and GPOTx registers.
+		 */
+		gpio_pin_configure_dt(&config->kso16_gpios, (GPIO_OPEN_DRAIN | GPIO_PULL_UP));
+		gpio_pin_configure_dt(&config->kso17_gpios, (GPIO_OPEN_DRAIN | GPIO_PULL_UP));
+	}
+	/* Enable keyboard scan alternate function */
+	status = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (status < 0) {
+		LOG_ERR("Failed to enable keyboard scan alternate function");
+		return status;
+	}
+
+	/* KSO[col_size:0] pins output low */
+	reg_val = sys_read32(base + REG_KBS_KSO) & ~kso_mask;
+	sys_write32(reg_val, base + REG_KBS_KSO);
+
+	for (int i = 0; i < KEYBOARD_KSI_PIN_COUNT; i++) {
+		/* Select wakeup interrupt falling-edge triggered of KSI[7:0] pins */
+		it51xxx_wuc_set_polarity(config->wuc_map_list[i].wucs, config->wuc_map_list[i].mask,
+					 WUC_TYPE_EDGE_FALLING);
+		/* W/C wakeup interrupt status of KSI[7:0] pins */
+		it51xxx_wuc_clear_status(config->wuc_map_list[i].wucs,
+					 config->wuc_map_list[i].mask);
+		/* Enable wakeup interrupt of KSI[7:0] pins */
+		it51xxx_wuc_enable(config->wuc_map_list[i].wucs, config->wuc_map_list[i].mask);
+
+		/*
+		 * We want to clear KSI[7:0] pins status at a time when wakeup
+		 * interrupt fire, so gather the KSI[7:0] pin mask value here.
+		 */
+		if (config->wuc_map_list[i].wucs != config->wuc_map_list[0].wucs) {
+			LOG_ERR("KSI%d pin isn't in the same wuc node!", i);
+		}
+		data->ksi_pin_mask |= config->wuc_map_list[i].mask;
+	}
+
+	/* W/C interrupt status of KSI[7:0] pins */
+	ite_intc_isr_clear(config->irq);
+
+	irq_connect_dynamic(DT_INST_IRQN(0), 0, (void (*)(const void *))it51xxx_kbd_isr,
+			    (const void *)dev, 0);
+
+	return input_kbd_matrix_common_init(dev);
+}
+
+static const struct it51xxx_kbd_wuc_map_cfg it51xxx_kbd_wuc[IT8XXX2_DT_INST_WUCCTRL_LEN(0)] =
+	IT8XXX2_DT_WUC_ITEMS_LIST(0);
+
+PINCTRL_DT_INST_DEFINE(0);
+
+INPUT_KBD_MATRIX_DT_INST_DEFINE(0);
+
+static const struct input_kbd_matrix_api it51xxx_kbd_api = {
+	.drive_column = it51xxx_kbd_drive_column,
+	.read_row = it51xxx_kbd_read_row,
+	.set_detect_mode = it51xxx_kbd_set_detect_mode,
+};
+
+static const struct it51xxx_kbd_config it51xxx_kbd_cfg_0 = {
+	.common = INPUT_KBD_MATRIX_DT_INST_COMMON_CONFIG_INIT(0, &it51xxx_kbd_api),
+	.base = DT_INST_REG_ADDR(0),
+	.irq = DT_INST_IRQN(0),
+	.wuc_map_list = it51xxx_kbd_wuc,
+	.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(0),
+	.kso16_gpios = GPIO_DT_SPEC_INST_GET(0, kso16_gpios),
+	.kso17_gpios = GPIO_DT_SPEC_INST_GET(0, kso17_gpios),
+	.kso_ignore_mask = DT_INST_PROP(0, kso_ignore_mask),
+};
+
+static struct it51xxx_kbd_data it51xxx_kbd_data_0;
+
+PM_DEVICE_DT_INST_DEFINE(0, input_kbd_matrix_pm_action);
+
+DEVICE_DT_INST_DEFINE(0, &it51xxx_kbd_init, PM_DEVICE_DT_INST_GET(0), &it51xxx_kbd_data_0,
+		      &it51xxx_kbd_cfg_0, POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);
+
+BUILD_ASSERT(!IS_ENABLED(CONFIG_PM_DEVICE_SYSTEM_MANAGED) || IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME),
+	     "CONFIG_PM_DEVICE_RUNTIME must be enabled when using CONFIG_PM_DEVICE_SYSTEM_MANAGED");
+
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	     "only one ite,it51xxx-kbd compatible node can be supported");
+BUILD_ASSERT(IN_RANGE(DT_INST_PROP(0, row_size), 1, 8), "invalid row-size");
+BUILD_ASSERT(IN_RANGE(DT_INST_PROP(0, col_size), 1, 18), "invalid col-size");
diff --git a/drivers/input/input_realtek_rts5912_kbd.c b/drivers/input/input_realtek_rts5912_kbd.c
new file mode 100644
index 0000000000000..ba8314a2932c1
--- /dev/null
+++ b/drivers/input/input_realtek_rts5912_kbd.c
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2025 Realtek Corporation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_kbd
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_control_rts5912.h>
+#include <zephyr/irq.h>
+#include <zephyr/input/input.h>
+#include <zephyr/input/input_kbd_matrix.h>
+#include <zephyr/sys/util_macro.h>
+#include "reg/reg_kbm.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(input_realtek_rts5912_kbd, CONFIG_INPUT_LOG_LEVEL);
+
+struct rts5912_kbd_config {
+	struct input_kbd_matrix_common_config common;
+	/* Keyboard scan controller base address */
+	volatile struct kbm_regs *base;
+	/* Keyboard scan input (KSI) wake-up irq */
+	uint32_t irq;
+	/* KSI/KSO keyboard scan alternate configuration */
+	const struct pinctrl_dev_config *pcfg;
+	const struct device *clk_dev;
+	struct rts5912_sccon_subsys sccon_cfg;
+	/* For user ignore specific pin of kso*/
+	uint32_t kso_ignore_mask;
+};
+
+struct rts5912_kbd_data {
+	struct input_kbd_matrix_common_data common;
+};
+
+INPUT_KBD_STRUCT_CHECK(struct rts5912_kbd_config, struct rts5912_kbd_data);
+
+static void rts5912_kbd_drive_column(const struct device *dev, int col)
+{
+	const struct rts5912_kbd_config *config = dev->config;
+	const struct input_kbd_matrix_common_config *common = &config->common;
+	volatile struct kbm_regs *inst = config->base;
+	const uint32_t kso_mask = BIT_MASK(common->col_size) & ~config->kso_ignore_mask;
+	uint32_t kso_val;
+	uint32_t key;
+
+	/* Tri-state all outputs */
+	if (col == INPUT_KBD_MATRIX_COLUMN_DRIVE_NONE) {
+		kso_val = kso_mask;
+		/* Assert all outputs */
+	} else if (col == INPUT_KBD_MATRIX_COLUMN_DRIVE_ALL) {
+		kso_val = 0;
+		/* Assert a single output */
+	} else {
+		kso_val = kso_mask ^ BIT(col);
+	}
+
+	/* Set KSO output data */
+	key = irq_lock();
+	inst->scan_out = kso_val;
+	irq_unlock(key);
+}
+
+static kbd_row_t rts5912_kbd_read_row(const struct device *dev)
+{
+	const struct rts5912_kbd_config *config = dev->config;
+	volatile struct kbm_regs *inst = config->base;
+	const struct input_kbd_matrix_common_config *common = &config->common;
+	const uint32_t ksi_mask = BIT_MASK(common->row_size);
+
+	/* Bits are active-low, so toggle it (return 1 means key pressed) */
+	return (inst->scan_in ^ ksi_mask);
+}
+
+static void rts5912_intc_isr_clear(const struct device *dev)
+{
+	const struct rts5912_kbd_config *config = dev->config;
+	volatile struct kbm_regs *inst = config->base;
+
+	inst->ctrl |= KBM_CTRL_KSIINTSTS_Msk;
+}
+
+static void rts5912_kbd_isr(const struct device *dev)
+{
+	/* W/C interrupt status of KSI pins */
+	rts5912_intc_isr_clear(dev);
+	input_kbd_matrix_poll_start(dev);
+}
+
+static void rts5912_kbd_set_detect_mode(const struct device *dev, bool enable)
+{
+	const struct rts5912_kbd_config *config = dev->config;
+
+	if (enable) {
+		/* W/C interrupt status of KSI pins */
+		rts5912_intc_isr_clear(dev);
+
+		irq_enable(config->irq);
+	} else {
+		irq_disable(config->irq);
+	}
+}
+
+static int rts5912_kbd_init(const struct device *dev)
+{
+	const struct rts5912_kbd_config *config = dev->config;
+	const struct input_kbd_matrix_common_config *common = &config->common;
+
+	volatile struct kbm_regs *inst = config->base;
+
+	const uint32_t kso_mask = BIT_MASK(common->col_size) & ~config->kso_ignore_mask;
+	const uint32_t ksi_mask = BIT_MASK(common->row_size);
+
+	uint32_t status;
+
+	/* Disable wakeup and interrupt of KSI pins before configuring */
+	rts5912_kbd_set_detect_mode(dev, false);
+
+	/*
+	 * Enable the internal pull-up and kbs mode of the KSI pins.
+	 * Enable the internal pull-up and kbs mode of the KSO pins.
+	 * Enable the open-drain mode of the KSO pins.
+	 */
+	status = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (status < 0) {
+		LOG_ERR("Failed to configure KSI and KSO pins");
+		return status;
+	}
+
+	if (!device_is_ready(config->clk_dev)) {
+		LOG_ERR("clock kbd device not ready");
+		return -ENODEV;
+	}
+
+	status = clock_control_on(config->clk_dev, (clock_control_subsys_t)&config->sccon_cfg);
+	if (status != 0) {
+		LOG_ERR("kbd clock power on fail");
+		return status;
+	}
+
+	/* KSO pins output low */
+	inst->scan_out = 0x00;
+
+	/* Enable KSI 8 if RAW Size more than 8*/
+	if (ksi_mask & BIT(8)) {
+		inst->ctrl |= KBM_CTRL_KSI8EN_Msk;
+	}
+
+	/* Enable KSI 9 if RAW Size more than 9*/
+	if (ksi_mask & BIT(9)) {
+		inst->ctrl |= KBM_CTRL_KSI9EN_Msk;
+	}
+
+	/* Enable KSO 18 if COL Size more than 18*/
+	if (kso_mask & BIT(18)) {
+		inst->ctrl |= KBM_CTRL_KSO18EN_Msk;
+	}
+
+	/* Enable KSO 19 if COL Size more than 19*/
+	if (kso_mask & BIT(19)) {
+		inst->ctrl |= KBM_CTRL_KSO19EN_Msk;
+	}
+
+	/* Enable KSO OpenDrain Output Type */
+	inst->ctrl |= KBM_CTRL_KSOTYPE_Msk;
+
+	/* Enable Scan Interrupt*/
+	inst->int_en |= ksi_mask;
+
+	/* W/C interrupt status of KSI pins */
+	rts5912_intc_isr_clear(dev);
+
+	/* Interrupts are enabled in the thread function */
+	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
+		    rts5912_kbd_isr, DEVICE_DT_INST_GET(0), 0);
+
+	return input_kbd_matrix_common_init(dev);
+}
+
+PINCTRL_DT_INST_DEFINE(0);
+
+INPUT_KBD_MATRIX_DT_INST_DEFINE(0);
+
+static const struct input_kbd_matrix_api rts5912_kbd_api = {
+	.drive_column = rts5912_kbd_drive_column,
+	.read_row = rts5912_kbd_read_row,
+	.set_detect_mode = rts5912_kbd_set_detect_mode,
+};
+
+static const struct rts5912_kbd_config rts5912_kbd_cfg_0 = {
+	.common = INPUT_KBD_MATRIX_DT_INST_COMMON_CONFIG_INIT(0, &rts5912_kbd_api),
+	.base = (volatile struct kbm_regs *)DT_INST_REG_ADDR_BY_IDX(0, 0),
+	.irq = DT_INST_IRQN(0),
+	.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(0),
+	.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(0)),
+	.sccon_cfg = {
+		.clk_grp = DT_CLOCKS_CELL(DT_NODELABEL(kbd), clk_grp),
+		.clk_idx = DT_CLOCKS_CELL(DT_NODELABEL(kbd), clk_idx),
+	},
+	.kso_ignore_mask = DT_INST_PROP_OR(0, kso_ignore_mask, 0x00),
+};
+
+static struct rts5912_kbd_data rts5912_kbd_data_0;
+
+PM_DEVICE_DT_INST_DEFINE(0, input_kbd_matrix_pm_action);
+
+DEVICE_DT_INST_DEFINE(0, &rts5912_kbd_init, PM_DEVICE_DT_INST_GET(0), &rts5912_kbd_data_0,
+		      &rts5912_kbd_cfg_0, POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);
+
+BUILD_ASSERT(!IS_ENABLED(CONFIG_PM_DEVICE_SYSTEM_MANAGED) || IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME),
+	     "CONFIG_PM_DEVICE_RUNTIME must be enabled when using CONFIG_PM_DEVICE_SYSTEM_MANAGED");
+
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	     "only one realtek,rts5912-kbd compatible node can be supported");
+BUILD_ASSERT(IN_RANGE(DT_INST_PROP(0, row_size), 1, 9), "invalid row-size");
+BUILD_ASSERT(IN_RANGE(DT_INST_PROP(0, col_size), 1, 19), "invalid col-size");
diff --git a/drivers/input/input_sbus.c b/drivers/input/input_sbus.c
index 10e6498a698e7..80f365e0be71f 100644
--- a/drivers/input/input_sbus.c
+++ b/drivers/input/input_sbus.c
@@ -247,7 +247,7 @@ static void sbus_uart_isr(const struct device *uart_dev, void *user_data)
 		return;
 	}
 
-	while (uart_irq_rx_ready(uart_dev) && data->xfer_bytes <= SBUS_FRAME_LEN) {
+	while (uart_irq_rx_ready(uart_dev) && data->xfer_bytes < SBUS_FRAME_LEN) {
 		if (data->in_sync) {
 			if (data->xfer_bytes == 0) {
 				data->last_rx_time = k_uptime_get_32();
@@ -324,10 +324,10 @@ static int input_sbus_init(const struct device *dev)
 		return ret;
 	}
 
-	uart_irq_rx_enable(config->uart_dev);
-
 	k_sem_init(&data->report_lock, 0, 1);
 
+	uart_irq_rx_enable(config->uart_dev);
+
 	k_thread_create(&data->thread, data->thread_stack,
 			K_KERNEL_STACK_SIZEOF(data->thread_stack),
 			(k_thread_entry_t)input_sbus_input_report_thread, (void *)dev, NULL, NULL,
diff --git a/drivers/input/input_sdl_touch.c b/drivers/input/input_sdl_touch.c
index 14ed5469e17b1..1034919d43913 100644
--- a/drivers/input/input_sdl_touch.c
+++ b/drivers/input/input_sdl_touch.c
@@ -41,7 +41,11 @@ static int sdl_init(const struct device *dev)
 	return 0;
 }
 
-static struct sdl_input_data sdl_data_0;
-
-DEVICE_DT_INST_DEFINE(0, sdl_init, NULL, &sdl_data_0, NULL,
-		    POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);
+#define INPUT_SDL_TOUCH_DEFINE(inst)                                                               \
+	static struct sdl_input_data sdl_data_##inst = {                                           \
+		.display_dev = DEVICE_DT_GET_OR_NULL(DT_INST_PHANDLE(inst, display)),              \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, sdl_init, NULL, &sdl_data_##inst, NULL, POST_KERNEL,           \
+			      CONFIG_INPUT_INIT_PRIORITY, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(INPUT_SDL_TOUCH_DEFINE)
diff --git a/drivers/input/input_sdl_touch_bottom.c b/drivers/input/input_sdl_touch_bottom.c
index eb03f89ca1132..266dcccd8dbd0 100644
--- a/drivers/input/input_sdl_touch_bottom.c
+++ b/drivers/input/input_sdl_touch_bottom.c
@@ -8,10 +8,41 @@
 #include <SDL.h>
 #include "input_sdl_touch_bottom.h"
 
+static bool event_targets_display(SDL_Event *event, struct sdl_input_data *data)
+{
+	SDL_Window *window = NULL;
+	const void *display_dev;
+
+	if (!data->display_dev) {
+		return true;
+	}
+
+	if (event->type == SDL_MOUSEBUTTONDOWN || event->type == SDL_MOUSEBUTTONUP) {
+		window = SDL_GetWindowFromID(event->button.windowID);
+	} else if (event->type == SDL_MOUSEMOTION) {
+		window = SDL_GetWindowFromID(event->motion.windowID);
+	} else {
+		return false;
+	}
+
+	if (!window) {
+		return false;
+	}
+
+	/* Get the zephyr display associated with the window */
+	display_dev = SDL_GetWindowData(window, "zephyr_display");
+
+	return !display_dev || display_dev == data->display_dev;
+}
+
 static int sdl_filter(void *arg, SDL_Event *event)
 {
 	struct sdl_input_data *data = arg;
 
+	if (!event_targets_display(event, data)) {
+		return 1;
+	}
+
 	switch (event->type) {
 	case SDL_MOUSEBUTTONUP:
 		data->pressed = false;
diff --git a/drivers/input/input_sdl_touch_bottom.h b/drivers/input/input_sdl_touch_bottom.h
index 397715686ca1b..8472517b62c14 100644
--- a/drivers/input/input_sdl_touch_bottom.h
+++ b/drivers/input/input_sdl_touch_bottom.h
@@ -22,6 +22,7 @@ extern "C" {
 
 struct sdl_input_data {
 	const void *dev; /* device structure pointer */
+	const void *display_dev;
 	void (*callback)(struct sdl_input_data *data);
 	int x;
 	int y;
diff --git a/drivers/input/input_tsc_keys.c b/drivers/input/input_tsc_keys.c
new file mode 100644
index 0000000000000..a09afc53782b4
--- /dev/null
+++ b/drivers/input/input_tsc_keys.c
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <autoconf.h>
+#include <zephyr/irq.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/input/input.h>
+#include <zephyr/drivers/reset.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+
+LOG_MODULE_REGISTER(tsc_keys, CONFIG_INPUT_LOG_LEVEL);
+
+#define DT_DRV_COMPAT st_stm32_tsc
+
+/* each group only has 4 configurable I/O */
+#define GET_GROUP_BITS(val, group) (uint32_t)(((val) & 0x0f) << ((group - 1) * 4))
+
+struct stm32_tsc_group_config {
+	uint8_t group;
+	uint8_t channel_ios;
+	uint8_t sampling_io;
+	bool use_as_shield;
+};
+
+typedef void (*stm32_tsc_group_ready_cb)(uint32_t count_value, void *user_data);
+
+struct stm32_tsc_group_data {
+	stm32_tsc_group_ready_cb cb;
+	void *user_data;
+};
+
+struct stm32_tsc_config {
+	const TSC_TypeDef *tsc;
+	const struct stm32_pclken *pclken;
+	struct reset_dt_spec reset;
+	const struct pinctrl_dev_config *pcfg;
+	const struct stm32_tsc_group_config *group_config;
+	struct stm32_tsc_group_data *group_data;
+	uint8_t group_cnt;
+
+	uint32_t pgpsc;
+	uint8_t ctph;
+	uint8_t ctpl;
+	bool spread_spectrum;
+	uint8_t sscpsc;
+	uint8_t ssd;
+	uint16_t max_count;
+	bool iodef;
+	bool sync_acq;
+	bool sync_pol;
+	void (*irq_func)(void);
+};
+
+int stm32_tsc_group_register_callback(const struct device *dev, uint8_t group_idx,
+				      stm32_tsc_group_ready_cb cb, void *user_data)
+{
+	const struct stm32_tsc_config *config = dev->config;
+
+	if (group_idx >= config->group_cnt) {
+		LOG_ERR("%s: group index %d is out of range", dev->name, group_idx);
+		return -EINVAL;
+	}
+
+	struct stm32_tsc_group_data *group_data = &config->group_data[group_idx];
+
+	group_data->cb = cb;
+	group_data->user_data = user_data;
+
+	return 0;
+}
+
+void stm32_tsc_start(const struct device *dev)
+{
+	const struct stm32_tsc_config *config = dev->config;
+
+	/* clear interrupts */
+	sys_set_bits((mem_addr_t)&config->tsc->ICR, TSC_ICR_EOAIC | TSC_ICR_MCEIC);
+
+	/* enable end of acquisition and max count error interrupts */
+	sys_set_bits((mem_addr_t)&config->tsc->IER, TSC_IER_EOAIE | TSC_IER_MCEIE);
+
+	/* TODO: When sync acqusition mode is enabled, both this bit and an external input signal
+	 * should be set. When the acqusition stops this bit is cleared, so even if a sync signal is
+	 * present, the next acqusition will not start until this bit is set again.
+	 */
+	/* start acquisition */
+	sys_set_bit((mem_addr_t)&config->tsc->CR, TSC_CR_START_Pos);
+}
+
+static int get_group_index(const struct device *dev, uint8_t group, uint8_t *group_idx)
+{
+	const struct stm32_tsc_config *config = dev->config;
+	const struct stm32_tsc_group_config *groups = config->group_config;
+
+	for (int i = 0; i < config->group_cnt; i++) {
+		if (groups[i].group == group) {
+			*group_idx = i;
+			return 0;
+		}
+	}
+
+	return -ENODEV;
+}
+
+static int stm32_tsc_handle_incoming_data(const struct device *dev)
+{
+	const struct stm32_tsc_config *config = dev->config;
+
+	if (sys_test_bit((mem_addr_t)&config->tsc->ISR, TSC_ISR_MCEF_Pos)) {
+		/* clear max count error flag */
+		sys_set_bit((mem_addr_t)&config->tsc->ICR, TSC_ICR_MCEIC_Pos);
+		LOG_ERR("%s: max count error", dev->name);
+		LOG_HEXDUMP_DBG(config->tsc, sizeof(TSC_TypeDef), "TSC Registers");
+		return -EIO;
+	}
+
+	if (sys_test_bit((mem_addr_t)&config->tsc->ISR, TSC_ISR_EOAF_Pos)) {
+		/* clear end of acquisition flag */
+		sys_set_bit((mem_addr_t)&config->tsc->ICR, TSC_ICR_EOAIC_Pos);
+
+		/* read values */
+		for (uint8_t i = 0; i < config->group_cnt; i++) {
+			const struct stm32_tsc_group_config *group = &config->group_config[i];
+			uint32_t group_bit = BIT(group->group - 1) << 16;
+
+			if (config->tsc->IOGCSR & group_bit) {
+				uint32_t count_value = sys_read32(
+					(mem_addr_t)&config->tsc->IOGXCR[group->group - 1]);
+
+				uint8_t group_idx = 0;
+
+				int ret = get_group_index(dev, group->group, &group_idx);
+
+				if (ret < 0) {
+					LOG_ERR("%s: group %d not found", dev->name, group->group);
+					return ret;
+				}
+
+				struct stm32_tsc_group_data *data = &config->group_data[group_idx];
+
+				if (data->cb) {
+					data->cb(count_value, data->user_data);
+				}
+			}
+		}
+	}
+
+	return 0;
+}
+
+static void stm32_tsc_isr(const struct device *dev)
+{
+	const struct stm32_tsc_config *config = dev->config;
+
+	/* disable interrupts */
+	sys_clear_bits((mem_addr_t)&config->tsc->IER, TSC_IER_EOAIE | TSC_IER_MCEIE);
+
+	stm32_tsc_handle_incoming_data(dev);
+}
+
+static int stm32_tsc_init(const struct device *dev)
+{
+	const struct stm32_tsc_config *config = dev->config;
+	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
+
+	int ret;
+
+	if (!device_is_ready(clk)) {
+		LOG_ERR("%s: clock controller device not ready", dev->name);
+		return -ENODEV;
+	}
+
+	/* reset TSC values to default */
+	ret = reset_line_toggle_dt(&config->reset);
+	if (ret < 0) {
+		LOG_ERR("Failed to reset %s (%d)", dev->name, ret);
+		return ret;
+	}
+
+	ret = clock_control_on(clk, (clock_control_subsys_t)&config->pclken[0]);
+	if (ret < 0) {
+		LOG_ERR("Failed to enable clock for %s (%d)", dev->name, ret);
+		return ret;
+	}
+
+	ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		LOG_ERR("Failed to configure %s pins (%d)", dev->name, ret);
+		return ret;
+	}
+
+	/* set ctph (bits 31:28) and ctpl (bits 27:24) */
+	sys_set_bits((mem_addr_t)&config->tsc->CR, (((config->ctph - 1) << 4) | (config->ctpl - 1))
+							   << TSC_CR_CTPL_Pos);
+
+	/* set spread spectrum deviation (bits 23:17) */
+	sys_set_bits((mem_addr_t)&config->tsc->CR, config->ssd << TSC_CR_SSD_Pos);
+
+	/* set pulse generator prescaler (bits 14:12) */
+	sys_set_bits((mem_addr_t)&config->tsc->CR, config->pgpsc << TSC_CR_PGPSC_Pos);
+
+	/* set max count value (bits 7:5) */
+	sys_set_bits((mem_addr_t)&config->tsc->CR, config->max_count << TSC_CR_MCV_Pos);
+
+	/* set spread spectrum prescaler (bit 15) */
+	if (config->sscpsc == 2) {
+		sys_set_bit((mem_addr_t)&config->tsc->CR, TSC_CR_SSPSC_Pos);
+	}
+
+	/* set sync bit polarity */
+	if (config->sync_pol) {
+		sys_set_bit((mem_addr_t)&config->tsc->CR, TSC_CR_SYNCPOL_Pos);
+	}
+
+	/* set sync acquisition */
+	if (config->sync_acq) {
+		sys_set_bit((mem_addr_t)&config->tsc->CR, TSC_CR_AM_Pos);
+	}
+
+	/* set I/O default mode */
+	if (config->iodef) {
+		sys_set_bit((mem_addr_t)&config->tsc->CR, TSC_CR_IODEF_Pos);
+	}
+
+	/* set spread spectrum */
+	if (config->spread_spectrum) {
+		sys_set_bit((mem_addr_t)&config->tsc->CR, TSC_CR_SSE_Pos);
+	}
+
+	/* group configuration */
+	for (int i = 0; i < config->group_cnt; i++) {
+		const struct stm32_tsc_group_config *group = &config->group_config[i];
+
+		if (group->channel_ios & group->sampling_io) {
+			LOG_ERR("%s: group %d has the same channel and sampling I/O", dev->name,
+				group->group);
+			return -EINVAL;
+		}
+
+		/* if use_as_shield is true, the channel I/Os are used as shield, and can only have
+		 * values 1,2,4,8
+		 */
+		if (group->use_as_shield && group->channel_ios != 1 && group->channel_ios != 2 &&
+		    group->channel_ios != 4 && group->channel_ios != 8) {
+			LOG_ERR("%s: group %d is used as shield, but has invalid channel I/Os. "
+				"Can only have one",
+				dev->name, group->group);
+			return -EINVAL;
+		}
+
+		/* clear schmitt trigger hysteresis for enabled I/Os */
+		sys_clear_bits(
+			(mem_addr_t)&config->tsc->IOHCR,
+			GET_GROUP_BITS(group->channel_ios | group->sampling_io, group->group));
+
+		/* set channel I/Os */
+		sys_set_bits((mem_addr_t)&config->tsc->IOCCR,
+			     GET_GROUP_BITS(group->channel_ios, group->group));
+
+		/* set sampling I/O */
+		sys_set_bits((mem_addr_t)&config->tsc->IOSCR,
+			     GET_GROUP_BITS(group->sampling_io, group->group));
+
+		/* enable group */
+		if (!group->use_as_shield) {
+			sys_set_bit((mem_addr_t)&config->tsc->IOGCSR, group->group - 1);
+		}
+	}
+
+	/* disable interrupts */
+	sys_clear_bits((mem_addr_t)&config->tsc->IER, TSC_IER_EOAIE | TSC_IER_MCEIE);
+
+	/* clear interrupts */
+	sys_set_bits((mem_addr_t)&config->tsc->ICR, TSC_ICR_EOAIC | TSC_ICR_MCEIC);
+
+	/* enable peripheral */
+	sys_set_bit((mem_addr_t)&config->tsc->CR, TSC_CR_TSCE_Pos);
+
+	config->irq_func();
+
+	return 0;
+}
+
+#define STM32_TSC_GROUP_DEFINE(node_id)                                                            \
+	{                                                                                          \
+		.group = DT_PROP(node_id, group),                                                  \
+		.channel_ios = DT_PROP(node_id, channel_ios),                                      \
+		.sampling_io = DT_PROP(node_id, sampling_io),                                      \
+		.use_as_shield = DT_PROP(node_id, st_use_as_shield),                               \
+	}
+
+#define STM32_TSC_INIT(index)                                                                      \
+	static const struct stm32_pclken pclken_##index[] = STM32_DT_INST_CLOCKS(index);           \
+                                                                                                   \
+	PINCTRL_DT_INST_DEFINE(index);                                                             \
+                                                                                                   \
+	static void stm32_tsc_irq_init_##index(void)                                               \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(index), DT_INST_IRQ(index, priority), stm32_tsc_isr,      \
+			    DEVICE_DT_INST_GET(index), 0);                                         \
+		irq_enable(DT_INST_IRQN(index));                                                   \
+	};                                                                                         \
+                                                                                                   \
+	static const struct stm32_tsc_group_config group_config_cfg_##index[] = {                  \
+		DT_INST_FOREACH_CHILD_STATUS_OKAY_SEP(index, STM32_TSC_GROUP_DEFINE, (,))};        \
+                                                                                                   \
+	static struct stm32_tsc_group_data                                                         \
+		group_data_cfg_##index[DT_INST_CHILD_NUM_STATUS_OKAY(index)];                      \
+                                                                                                   \
+	static const struct stm32_tsc_config stm32_tsc_cfg_##index = {                             \
+		.tsc = (TSC_TypeDef *)DT_INST_REG_ADDR(index),                                     \
+		.pclken = pclken_##index,                                                          \
+		.reset = RESET_DT_SPEC_INST_GET(index),                                            \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(index),                                     \
+		.group_config = group_config_cfg_##index,                                          \
+		.group_data = group_data_cfg_##index,                                              \
+		.group_cnt = DT_INST_CHILD_NUM_STATUS_OKAY(index),                                 \
+		.pgpsc = LOG2CEIL(DT_INST_PROP(index, st_pulse_generator_prescaler)),              \
+		.ctph = DT_INST_PROP(index, st_charge_transfer_pulse_high),                        \
+		.ctpl = DT_INST_PROP(index, st_charge_transfer_pulse_low),                         \
+		.spread_spectrum = DT_INST_PROP(index, st_spread_spectrum),                        \
+		.sscpsc = DT_INST_PROP(index, st_spread_spectrum_prescaler),                       \
+		.ssd = DT_INST_PROP(index, st_spread_spectrum_deviation),                          \
+		.max_count = LOG2CEIL(DT_INST_PROP(index, st_max_count_value) + 1) - 8,            \
+		.iodef = DT_INST_PROP(index, st_iodef_float),                                      \
+		.sync_acq = DT_INST_PROP(index, st_synced_acquisition),                            \
+		.sync_pol = DT_INST_PROP(index, st_syncpol_rising),                                \
+		.irq_func = stm32_tsc_irq_init_##index,                                            \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(index, stm32_tsc_init, NULL, NULL, &stm32_tsc_cfg_##index,           \
+			      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(STM32_TSC_INIT)
+
+struct input_tsc_keys_data {
+	uint32_t buffer[CONFIG_INPUT_STM32_TSC_KEYS_BUFFER_WORD_SIZE];
+	struct ring_buf rb;
+	bool expect_release;
+	struct k_timer sampling_timer;
+};
+
+struct input_tsc_keys_config {
+	const struct device *tsc_dev;
+	uint32_t sampling_interval_ms;
+	int32_t noise_threshold;
+	int zephyr_code;
+	uint8_t group;
+};
+
+static void input_tsc_sampling_timer_callback(struct k_timer *timer)
+{
+	const struct device *dev = k_timer_user_data_get(timer);
+
+	stm32_tsc_start(dev);
+}
+
+static void input_tsc_callback_handler(uint32_t count_value, void *user_data)
+{
+	const struct device *dev = (const struct device *)user_data;
+	const struct input_tsc_keys_config *config =
+		(const struct input_tsc_keys_config *)dev->config;
+	struct input_tsc_keys_data *data = (struct input_tsc_keys_data *)dev->data;
+
+	if (ring_buf_item_space_get(&data->rb) == 0) {
+		uint32_t oldest_point;
+		int32_t slope;
+
+		(void)ring_buf_get(&data->rb, (uint8_t *)&oldest_point, sizeof(oldest_point));
+
+		slope = count_value - oldest_point;
+		if (slope < -config->noise_threshold && !data->expect_release) {
+			data->expect_release = true;
+			input_report_key(dev, config->zephyr_code, 1, false, K_NO_WAIT);
+		} else if (slope > config->noise_threshold && data->expect_release) {
+			data->expect_release = false;
+			input_report_key(dev, config->zephyr_code, 0, false, K_NO_WAIT);
+		}
+	}
+
+	(void)ring_buf_put(&data->rb, (uint8_t *)&count_value, sizeof(count_value));
+}
+
+static int input_tsc_keys_init(const struct device *dev)
+{
+	const struct input_tsc_keys_config *config = dev->config;
+	struct input_tsc_keys_data *data = dev->data;
+
+	if (!device_is_ready(config->tsc_dev)) {
+		LOG_ERR("%s: TSC device not ready", config->tsc_dev->name);
+		return -ENODEV;
+	}
+
+	ring_buf_item_init(&data->rb, CONFIG_INPUT_STM32_TSC_KEYS_BUFFER_WORD_SIZE, data->buffer);
+
+	uint8_t group_index = 0;
+
+	int ret = get_group_index(config->tsc_dev, config->group, &group_index);
+
+	if (ret) {
+		LOG_ERR("%s: group %d not found", config->tsc_dev->name, config->group);
+		return ret;
+	}
+
+	ret = stm32_tsc_group_register_callback(config->tsc_dev, group_index,
+						input_tsc_callback_handler, (void *)dev);
+
+	if (ret) {
+		LOG_ERR("%s: failed to register callback for group %d", config->tsc_dev->name,
+			config->group);
+		return ret;
+	}
+
+	k_timer_init(&data->sampling_timer, input_tsc_sampling_timer_callback, NULL);
+	k_timer_user_data_set(&data->sampling_timer, (void *)config->tsc_dev);
+	k_timer_start(&data->sampling_timer, K_NO_WAIT, K_MSEC(config->sampling_interval_ms));
+
+	return 0;
+}
+
+#define TSC_KEYS_INIT(inst)                                                                        \
+                                                                                                   \
+	static struct input_tsc_keys_data tsc_keys_data_##inst;                                    \
+                                                                                                   \
+	static const struct input_tsc_keys_config tsc_keys_config_##inst = {                       \
+		.tsc_dev = DEVICE_DT_GET(DT_GPARENT(inst)),                                        \
+		.sampling_interval_ms = DT_PROP(inst, sampling_interval_ms),                       \
+		.zephyr_code = DT_PROP(inst, zephyr_code),                                         \
+		.noise_threshold = DT_PROP(inst, noise_threshold),                                 \
+		.group = DT_PROP(DT_PARENT(inst), group),                                          \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_DEFINE(inst, input_tsc_keys_init, NULL, &tsc_keys_data_##inst,                   \
+			 &tsc_keys_config_##inst, POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);
+
+DT_FOREACH_STATUS_OKAY(tsc_keys, TSC_KEYS_INIT);
diff --git a/drivers/interrupt_controller/CMakeLists.txt b/drivers/interrupt_controller/CMakeLists.txt
index 8f3b279eda626..2bb2dbe16336d 100644
--- a/drivers/interrupt_controller/CMakeLists.txt
+++ b/drivers/interrupt_controller/CMakeLists.txt
@@ -15,8 +15,10 @@ zephyr_library_sources_ifdef(CONFIG_GIC_V3_ITS              intc_gicv3_its.c)
 zephyr_library_sources_ifdef(CONFIG_GPIO_INTC_STM32WB0      intc_gpio_stm32wb0.c)
 zephyr_library_sources_ifdef(CONFIG_INTEL_VTD_ICTL          intc_intel_vtd.c)
 zephyr_library_sources_ifdef(CONFIG_IOAPIC                  intc_ioapic.c)
+zephyr_library_sources_ifdef(CONFIG_ITE_IT51XXX_INTC        intc_ite_it51xxx.c)
 zephyr_library_sources_ifdef(CONFIG_ITE_IT8XXX2_INTC        intc_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_ITE_IT8XXX2_INTC_V2     intc_ite_it8xxx2_v2.c)
+zephyr_library_sources_ifdef(CONFIG_ITE_IT51XXX_WUC         wuc_ite_it51xxx.c)
 zephyr_library_sources_ifdef(CONFIG_ITE_IT8XXX2_WUC         wuc_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_LEON_IRQMP              intc_irqmp.c)
 zephyr_library_sources_ifdef(CONFIG_LOAPIC                  intc_loapic.c intc_system_apic.c)
@@ -28,19 +30,17 @@ zephyr_library_sources_ifdef(CONFIG_RV32M1_INTMUX           intc_rv32m1_intmux.c
 zephyr_library_sources_ifdef(CONFIG_SAM0_EIC                intc_sam0_eic.c)
 zephyr_library_sources_ifdef(CONFIG_SHARED_IRQ              intc_shared_irq.c)
 zephyr_library_sources_ifdef(CONFIG_INTC_ESP32              intc_esp32.c)
-zephyr_library_sources_ifdef(CONFIG_INTC_ESP32C3            intc_esp32c3.c)
 zephyr_library_sources_ifdef(CONFIG_SWERV_PIC               intc_swerv_pic.c)
 zephyr_library_sources_ifdef(CONFIG_VEXRISCV_LITEX_IRQ      intc_vexriscv_litex.c)
 zephyr_library_sources_ifdef(CONFIG_VIM                     intc_vim.c)
-zephyr_library_sources_ifdef(CONFIG_NUCLEI_ECLIC            intc_nuclei_eclic.c)
-zephyr_library_sources_ifdef(CONFIG_NUCLEI_ECLIC            intc_nuclei_eclic.S)
+zephyr_library_sources_ifdef(CONFIG_CLIC                    intc_clic.c)
+zephyr_library_sources_ifdef(CONFIG_CLIC                    intc_clic.S)
 zephyr_library_sources_ifdef(CONFIG_NRFX_CLIC               intc_nrfx_clic.c)
 zephyr_library_sources_ifdef(CONFIG_NRFX_CLIC               intc_nrfx_clic.S)
 zephyr_library_sources_ifdef(CONFIG_NXP_S32_EIRQ            intc_eirq_nxp_s32.c)
 zephyr_library_sources_ifdef(CONFIG_NXP_S32_WKPU            intc_wkpu_nxp_s32.c)
 zephyr_library_sources_ifdef(CONFIG_XMC4XXX_INTC            intc_xmc4xxx.c)
 zephyr_library_sources_ifdef(CONFIG_NXP_PINT                intc_nxp_pint.c)
-zephyr_library_sources_ifdef(CONFIG_RENESAS_RA_ICU          intc_renesas_ra_icu.c)
 zephyr_library_sources_ifdef(CONFIG_RENESAS_RZ_EXT_IRQ      intc_renesas_rz_ext_irq.c)
 zephyr_library_sources_ifdef(CONFIG_NXP_IRQSTEER            intc_nxp_irqsteer.c)
 zephyr_library_sources_ifdef(CONFIG_INTC_MTK_ADSP           intc_mtk_adsp.c)
diff --git a/drivers/interrupt_controller/Kconfig b/drivers/interrupt_controller/Kconfig
index 388bfd2eb9fb7..3468cf4f3f233 100644
--- a/drivers/interrupt_controller/Kconfig
+++ b/drivers/interrupt_controller/Kconfig
@@ -66,6 +66,8 @@ source "drivers/interrupt_controller/Kconfig.loapic"
 
 source "drivers/interrupt_controller/Kconfig.dw"
 
+source "drivers/interrupt_controller/Kconfig.it51xxx"
+
 source "drivers/interrupt_controller/Kconfig.it8xxx2"
 
 source "drivers/interrupt_controller/Kconfig.stm32"
@@ -84,8 +86,6 @@ source "drivers/interrupt_controller/Kconfig.intel_vtd"
 
 source "drivers/interrupt_controller/Kconfig.esp32"
 
-source "drivers/interrupt_controller/Kconfig.esp32c3"
-
 source "drivers/interrupt_controller/Kconfig.xec"
 
 source "drivers/interrupt_controller/Kconfig.clic"
@@ -102,8 +102,6 @@ source "drivers/interrupt_controller/Kconfig.nxp_pint"
 
 source "drivers/interrupt_controller/Kconfig.vim"
 
-source "drivers/interrupt_controller/Kconfig.renesas_ra"
-
 source "drivers/interrupt_controller/Kconfig.renesas_rz"
 
 source "drivers/interrupt_controller/Kconfig.nxp_irqsteer"
diff --git a/drivers/interrupt_controller/Kconfig.clic b/drivers/interrupt_controller/Kconfig.clic
index f27301323ee2c..aba90ff0086e8 100644
--- a/drivers/interrupt_controller/Kconfig.clic
+++ b/drivers/interrupt_controller/Kconfig.clic
@@ -1,12 +1,23 @@
 # Copyright (c) 2021 Tokita, Hiroshi <tokita.hiroshi@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
+config CLIC
+	bool "RISC-V Core Local Interrupt Controller (CLIC)"
+	default y
+	depends on DT_HAS_NUCLEI_ECLIC_ENABLED || DT_HAS_RISCV_CLIC_ENABLED
+	select RISCV_SOC_HAS_CUSTOM_IRQ_HANDLING
+	help
+	  Core Local Interrupt Controller provide low-latency, vectored,
+	  preemptive interrupts for RISC-V systems.
+
 config NUCLEI_ECLIC
 	bool "Enhanced Core Local Interrupt Controller (ECLIC)"
 	default y
 	depends on DT_HAS_NUCLEI_ECLIC_ENABLED
-	select RISCV_SOC_HAS_CUSTOM_IRQ_HANDLING
+	select CLIC
 	select CLIC_SMCLICSHV_EXT if RISCV_VECTORED_MODE
+	select CLIC_SMCLICCONFIG_EXT
+	select LEGACY_CLIC_MEMORYMAP_ACCESS
 	help
 	  Interrupt controller for Nuclei SoC core.
 
@@ -18,6 +29,8 @@ config NRFX_CLIC
 	help
 	  Interrupt controller for Nordic VPR cores.
 
+if CLIC
+
 config CLIC_SMCLICSHV_EXT
 	bool
 	help
@@ -25,7 +38,33 @@ config CLIC_SMCLICSHV_EXT
 	  to select the behavior for each interrupt. The CLIC driver needs to
 	  implement the riscv_clic_irq_vector_set() function.
 
-if NUCLEI_ECLIC
+config CLIC_SMCLICCONFIG_EXT
+	bool
+	help
+	  Enables the SMCLICCONFIG extension, allowing configuration of CLIC
+	  parameters such as the number of interrupt level bits.
+
+config CLIC_PARAMETER_INTCTLBITS
+	int "The number of modifiable bits in the clicintctl registers"
+	range 0 8
+	default 8
+	help
+	  This option specifies the number of modifiable bits in the clicintctl
+	  registers.
+
+config CLIC_PARAMETER_MNLBITS
+	int "The number of bits in CLICINTCTLBITS to encode the interrupt level"
+	range 0 CLIC_PARAMETER_INTCTLBITS
+	default 0
+	help
+	  This option specifies the number of bits in CLICINTCTLBITS assigned to
+	  encode the interrupt level at machine mode.
+
+config LEGACY_CLIC_MEMORYMAP_ACCESS
+	bool
+	help
+	  Enables legacy CLIC, allowing access to CLIC registers through
+	  memory-mapped access instead of indirect CSR access.
 
 config LEGACY_CLIC
 	bool "Use the legacy clic specification"
@@ -34,4 +73,4 @@ config LEGACY_CLIC
 	  Enables legacy clic, where smclicshv extension is not supported and
 	  hardware vectoring is set via mode bits of mtvec.
 
-endif # NUCLEI_ECLIC
+endif # CLIC
diff --git a/drivers/interrupt_controller/Kconfig.esp32 b/drivers/interrupt_controller/Kconfig.esp32
index 507161fb613c5..35699cce56faf 100644
--- a/drivers/interrupt_controller/Kconfig.esp32
+++ b/drivers/interrupt_controller/Kconfig.esp32
@@ -4,10 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config INTC_ESP32
-	bool "Interrupt allocator for Xtensa-based Espressif SoCs"
+	bool "Interrupt allocator for Espressif SoCs"
 	default y
 	depends on SOC_FAMILY_ESPRESSIF_ESP32
-	depends on !SOC_SERIES_ESP32C2 && !SOC_SERIES_ESP32C3 && !SOC_SERIES_ESP32C6
 	help
 	  Enable custom interrupt allocator for Espressif SoCs based on Xtensa
 	  architecture.
diff --git a/drivers/interrupt_controller/Kconfig.esp32c3 b/drivers/interrupt_controller/Kconfig.esp32c3
deleted file mode 100644
index c1a72395648b8..0000000000000
--- a/drivers/interrupt_controller/Kconfig.esp32c3
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
-# SPDX-License-Identifier: Apache-2.0
-
-config INTC_ESP32C3
-	bool "ESP32C3 interrupt controller driver"
-	depends on SOC_FAMILY_ESPRESSIF_ESP32
-	depends on SOC_SERIES_ESP32C2 || SOC_SERIES_ESP32C3 || SOC_SERIES_ESP32C6
-	default y
-	help
-	  Enables the esp32c3 interrupt controller driver to handle ISR
-	  management at SoC level.
-
-config INTC_ESP32C3_DECISIONS_LOG
-	bool "Espressif's interrupt allocator logging"
-	depends on INTC_ESP32C3
-	select LOG
-	help
-	  Enable this option to visualize information on decisions made by the
-	  interrupt allocator. This has no impact on the interrupt allocator usage
-	  but may be valuable for debugging purposes. When enabled, messages are
-	  print to the serial console.
diff --git a/drivers/interrupt_controller/Kconfig.it51xxx b/drivers/interrupt_controller/Kconfig.it51xxx
new file mode 100644
index 0000000000000..a3237c9690697
--- /dev/null
+++ b/drivers/interrupt_controller/Kconfig.it51xxx
@@ -0,0 +1,26 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config HAS_ITE_INTC
+	bool
+	help
+	  This option is selected when ITE_IT51XXX_INTC is enabled.
+
+config ITE_IT51XXX_INTC
+	def_bool DT_HAS_ITE_IT51XXX_INTC_ENABLED
+	depends on DT_HAS_ITE_IT51XXX_INTC_ENABLED
+	select HAS_ITE_INTC
+	help
+	  This option mainly collects several interrupts from modules.
+	  Configurable level-triggered and dege-triggered mode.
+	  Configurable interrupt polarity of triggered mode.
+	  Each interrupt source able to enabled/masked individually.
+
+config ITE_IT51XXX_WUC
+	bool "ITE it51xxx Wakeup controller (WUC) interface"
+	default y
+	depends on DT_HAS_ITE_IT51XXX_WUC_ENABLED
+	help
+	  This option enables the wakeup controller interface for IT51XXX
+	  family.
+	  This is required for KSCAN, UART, eSPI, GPIO etc., interrupt support.
diff --git a/drivers/interrupt_controller/Kconfig.nxp_irqsteer b/drivers/interrupt_controller/Kconfig.nxp_irqsteer
index b2dbc9b2afac5..e3c5c9d68e427 100644
--- a/drivers/interrupt_controller/Kconfig.nxp_irqsteer
+++ b/drivers/interrupt_controller/Kconfig.nxp_irqsteer
@@ -6,7 +6,6 @@ config NXP_IRQSTEER
 	default y
 	depends on DT_HAS_NXP_IRQSTEER_INTC_ENABLED
 	depends on MULTI_LEVEL_INTERRUPTS
-	depends on XTENSA
 	help
 		The IRQSTEER INTC provides support for MUX-ing
 		multiple interrupts from peripheral to one or
diff --git a/drivers/interrupt_controller/Kconfig.renesas_ra b/drivers/interrupt_controller/Kconfig.renesas_ra
deleted file mode 100644
index 45cb171d26dc1..0000000000000
--- a/drivers/interrupt_controller/Kconfig.renesas_ra
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config RENESAS_RA_ICU
-	bool "Renesas RA series interrupt controller unit"
-	default y
-	depends on DT_HAS_RENESAS_RA_INTERRUPT_CONTROLLER_UNIT_ENABLED
-	select GEN_ISR_TABLES
-	help
-	  Renesas RA series interrupt controller unit
diff --git a/drivers/interrupt_controller/intc_clic.S b/drivers/interrupt_controller/intc_clic.S
new file mode 100644
index 0000000000000..3a03b8d417c0f
--- /dev/null
+++ b/drivers/interrupt_controller/intc_clic.S
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2024 Baumer Electric AG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief Assembler-hooks specific to RISC-V Core Local Interrupt Controller
+ */
+
+#include <zephyr/arch/cpu.h>
+#include "intc_clic.h"
+
+#ifdef CONFIG_64BIT
+	/* register-wide load/store based on ld/sd (XLEN = 64) */
+
+	.macro lr, rd, mem
+	ld \rd, \mem
+	.endm
+
+	.macro sr, rs, mem
+	sd \rs, \mem
+	.endm
+
+#else
+	/* register-wide load/store based on lw/sw (XLEN = 32) */
+
+	.macro lr, rd, mem
+	lw \rd, \mem
+	.endm
+
+	.macro sr, rs, mem
+	sw \rs, \mem
+	.endm
+
+#endif
+
+GTEXT(__soc_handle_irq)
+/*
+ * In an CLIC, pending interrupts don't have to be cleared by hand.
+ * In vectored mode, interrupts are cleared automatically.
+ * In non-vectored mode, interrupts are cleared when writing the mnxti register (done in
+ * __soc_handle_all_irqs).
+ * Thus this function can directly return.
+ */
+SECTION_FUNC(exception.other, __soc_handle_irq)
+	ret
+
+GTEXT(__soc_handle_all_irqs)
+
+#ifdef CONFIG_TRACING
+/* imports */
+GTEXT(sys_trace_isr_enter)
+GTEXT(sys_trace_isr_exit)
+#endif
+
+/*
+ * This function services and clears all pending interrupts for an CLIC in non-vectored mode.
+ */
+SECTION_FUNC(exception.other, __soc_handle_all_irqs)
+	addi sp, sp, -16
+	sr ra, 0(sp)
+
+	/* Read and clear mnxti to get highest current interrupt and enable interrupts. Will return
+	 * original interrupt if no others appear. */
+	csrrci a0, CSR_MNXTI, MSTATUS_IEN
+	beqz a0, irq_done /* Check if original interrupt vanished. */
+
+irq_loop:
+
+#ifdef CONFIG_TRACING_ISR
+	call sys_trace_isr_enter
+#endif
+
+	/* Call corresponding registered function in _sw_isr_table. a0 is offset in pointer with
+	 * the mtvt, sw irq table is 2-pointer wide -> shift by one. */
+	csrr t0, CSR_MTVT
+	sub a0, a0, t0
+	la t0, _sw_isr_table
+	slli a0, a0, (1)
+	add t0, t0, a0
+
+	/* Load argument in a0 register */
+	lr a0, 0(t0)
+
+	/* Load ISR function address in register t1 */
+	lr t1, RV_REGSIZE(t0)
+
+	/* Call ISR function */
+	jalr ra, t1, 0
+
+#ifdef CONFIG_TRACING_ISR
+	call sys_trace_isr_exit
+#endif
+
+	/* Read and clear mnxti to get highest current interrupt and enable interrupts. */
+	csrrci a0, CSR_MNXTI, MSTATUS_IEN
+	bnez a0, irq_loop
+
+irq_done:
+	lr ra, 0(sp)
+	addi sp, sp, 16
+	ret
diff --git a/drivers/interrupt_controller/intc_clic.c b/drivers/interrupt_controller/intc_clic.c
new file mode 100644
index 0000000000000..4cbf2de6f2a77
--- /dev/null
+++ b/drivers/interrupt_controller/intc_clic.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2021 Tokita, Hiroshi <tokita.hiroshi@gmail.com>
+ * Copyright (c) 2025 Andes Technology Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief Driver for Core Local Interrupt Controller
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/arch/riscv/csr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/riscv_clic.h>
+#include "intc_clic.h"
+
+#if DT_HAS_COMPAT_STATUS_OKAY(riscv_clic)
+#define DT_DRV_COMPAT riscv_clic
+#elif DT_HAS_COMPAT_STATUS_OKAY(nuclei_eclic)
+#define DT_DRV_COMPAT nuclei_eclic
+#else
+#error "Unknown CLIC controller compatible for this configuration"
+#endif
+
+struct clic_data {
+	uint8_t nlbits;
+	uint8_t intctlbits;
+};
+
+struct clic_config {
+	mem_addr_t base;
+};
+
+struct pmp_stack_guard_key_t {
+	unsigned long mstatus;
+	unsigned int irq_key;
+};
+
+/*
+ * M-mode CLIC memory-mapped registers are accessible only in M-mode.
+ * Temporarily disable the PMP stack guard (set mstatus.MPRV = 0) to configure
+ * CLIC registers, then restore the PMP stack guard using these functions.
+ */
+static ALWAYS_INLINE void disable_pmp_stack_guard(struct pmp_stack_guard_key_t *key)
+{
+	if (IS_ENABLED(CONFIG_PMP_STACK_GUARD)) {
+		key->irq_key = irq_lock();
+		key->mstatus = csr_read_clear(mstatus, MSTATUS_MPRV);
+	} else {
+		ARG_UNUSED(key);
+	}
+}
+
+static ALWAYS_INLINE void restore_pmp_stack_guard(struct pmp_stack_guard_key_t key)
+{
+	if (IS_ENABLED(CONFIG_PMP_STACK_GUARD)) {
+		csr_write(mstatus, key.mstatus);
+		irq_unlock(key.irq_key);
+	} else {
+		ARG_UNUSED(key);
+	}
+}
+
+static ALWAYS_INLINE void write_clic32(const struct device *dev, uint32_t offset, uint32_t value)
+{
+	const struct clic_config *config = dev->config;
+	mem_addr_t reg_addr = config->base + offset;
+	struct pmp_stack_guard_key_t key;
+
+	disable_pmp_stack_guard(&key);
+	sys_write32(value, reg_addr);
+	restore_pmp_stack_guard(key);
+}
+
+static ALWAYS_INLINE uint32_t read_clic32(const struct device *dev, uint32_t offset)
+{
+	const struct clic_config *config = dev->config;
+	mem_addr_t reg_addr = config->base + offset;
+	struct pmp_stack_guard_key_t key;
+	uint32_t reg;
+
+	disable_pmp_stack_guard(&key);
+	reg = sys_read32(reg_addr);
+	restore_pmp_stack_guard(key);
+
+	return reg;
+}
+
+static ALWAYS_INLINE void write_clic8(const struct device *dev, uint32_t offset, uint8_t value)
+{
+	const struct clic_config *config = dev->config;
+	mem_addr_t reg_addr = config->base + offset;
+	struct pmp_stack_guard_key_t key;
+
+	disable_pmp_stack_guard(&key);
+	sys_write8(value, reg_addr);
+	restore_pmp_stack_guard(key);
+}
+
+static ALWAYS_INLINE uint8_t read_clic8(const struct device *dev, uint32_t offset)
+{
+	const struct clic_config *config = dev->config;
+	mem_addr_t reg_addr = config->base + offset;
+	struct pmp_stack_guard_key_t key;
+	uint32_t reg;
+
+	disable_pmp_stack_guard(&key);
+	reg = sys_read8(reg_addr);
+	restore_pmp_stack_guard(key);
+
+	return reg;
+}
+
+/**
+ * @brief Enable interrupt
+ */
+void riscv_clic_irq_enable(uint32_t irq)
+{
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		const struct device *dev = DEVICE_DT_INST_GET(0);
+		union CLICINTIE clicintie = {.b = {.IE = 0x1}};
+
+		write_clic8(dev, CLIC_INTIE(irq), clicintie.w);
+	} else {
+		csr_write(CSR_MISELECT, CLIC_INTIE(irq));
+		csr_set(CSR_MIREG2, BIT(irq % 32));
+	}
+}
+
+/**
+ * @brief Disable interrupt
+ */
+void riscv_clic_irq_disable(uint32_t irq)
+{
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		const struct device *dev = DEVICE_DT_INST_GET(0);
+		union CLICINTIE clicintie = {.b = {.IE = 0x0}};
+
+		write_clic8(dev, CLIC_INTIE(irq), clicintie.w);
+	} else {
+		csr_write(CSR_MISELECT, CLIC_INTIE(irq));
+		csr_clear(CSR_MIREG2, BIT(irq % 32));
+	}
+}
+
+/**
+ * @brief Get enable status of interrupt
+ */
+int riscv_clic_irq_is_enabled(uint32_t irq)
+{
+	int is_enabled = 0;
+
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		const struct device *dev = DEVICE_DT_INST_GET(0);
+		union CLICINTIE clicintie = {.w = read_clic8(dev, CLIC_INTIE(irq))};
+
+		is_enabled = clicintie.b.IE;
+	} else {
+		csr_write(CSR_MISELECT, CLIC_INTIE(irq));
+		is_enabled = csr_read(CSR_MIREG2) & BIT(irq % 32);
+	}
+
+	return !!is_enabled;
+}
+
+/**
+ * @brief Set priority and level of interrupt
+ */
+void riscv_clic_irq_priority_set(uint32_t irq, uint32_t pri, uint32_t flags)
+{
+	const struct device *dev = DEVICE_DT_INST_GET(0);
+	const struct clic_data *data = dev->data;
+
+	/*
+	 * Set the interrupt level and the interrupt priority.
+	 * Examples of mcliccfg settings:
+	 * CLICINTCTLBITS mnlbits clicintctl[i] interrupt levels
+	 *       0         2      ........      255
+	 *       1         2      l.......      127,255
+	 *       2         2      ll......      63,127,191,255
+	 *       3         3      lll.....      31,63,95,127,159,191,223,255
+	 *       4         1      lppp....      127,255
+	 * "." bits are non-existent bits for level encoding, assumed to be 1
+	 * "l" bits are available variable bits in level specification
+	 * "p" bits are available variable bits in priority specification
+	 */
+	const uint8_t max_level = BIT_MASK(data->nlbits);
+	const uint8_t max_prio = BIT_MASK(data->intctlbits - data->nlbits);
+	uint8_t intctrl = (MIN(pri, max_prio) << (8U - data->intctlbits)) |
+			  (MIN(pri, max_level) << (8U - data->nlbits)) |
+			  BIT_MASK(8U - data->intctlbits);
+
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		write_clic8(dev, CLIC_INTCTRL(irq), intctrl);
+	} else {
+		uint32_t clicintctl, bit_offset = 8 * (irq % 4);
+
+		csr_write(CSR_MISELECT, CLIC_INTCTRL(irq));
+		clicintctl = csr_read(CSR_MIREG);
+		clicintctl &= ~GENMASK(bit_offset + 7, bit_offset);
+		clicintctl |= intctrl << bit_offset;
+		csr_write(CSR_MIREG, clicintctl);
+	}
+
+	/* Set the IRQ operates in machine mode, non-vectoring and the trigger type. */
+	union CLICINTATTR clicattr = {.b = {.mode = 0x3, .shv = 0x0, .trg = flags & BIT_MASK(3)}};
+
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		write_clic8(dev, CLIC_INTATTR(irq), clicattr.w);
+	} else {
+		uint32_t clicintattr, bit_offset = 8 * (irq % 4);
+
+		csr_write(CSR_MISELECT, CLIC_INTATTR(irq));
+		clicintattr = csr_read(CSR_MIREG2);
+		clicintattr &= ~GENMASK(bit_offset + 7, bit_offset);
+		clicintattr |= clicattr.w << bit_offset;
+		csr_write(CSR_MIREG2, clicintattr);
+	}
+}
+
+/**
+ * @brief Set vector mode of interrupt
+ */
+void riscv_clic_irq_vector_set(uint32_t irq)
+{
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		const struct device *dev = DEVICE_DT_INST_GET(0);
+		union CLICINTATTR clicattr = {.w = read_clic8(dev, CLIC_INTATTR(irq))};
+
+		/* Set Selective Hardware Vectoring. */
+		clicattr.b.shv = 1;
+		write_clic8(dev, CLIC_INTATTR(irq), clicattr.w);
+	} else {
+		uint32_t clicintattr, bit_offset = 8 * (irq % 4);
+		union CLICINTATTR clicattr = {.b = {.shv = 1}};
+
+		csr_write(CSR_MISELECT, CLIC_INTATTR(irq));
+		clicintattr = csr_read(CSR_MIREG2);
+		clicintattr |= clicattr.w << bit_offset;
+		csr_write(CSR_MIREG2, clicintattr);
+	}
+}
+
+/**
+ * @brief Set pending bit of an interrupt
+ */
+void riscv_clic_irq_set_pending(uint32_t irq)
+{
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		const struct device *dev = DEVICE_DT_INST_GET(0);
+		union CLICINTIP clicintip = {.b = {.IP = 0x1}};
+
+		write_clic8(dev, CLIC_INTIP(irq), clicintip.w);
+	} else {
+		csr_write(CSR_MISELECT, CLIC_INTIP(irq));
+		csr_set(CSR_MIREG, BIT(irq % 32));
+	}
+}
+
+static int clic_init(const struct device *dev)
+{
+	struct clic_data *data = dev->data;
+
+	if (IS_ENABLED(CONFIG_NUCLEI_ECLIC)) {
+		/* Configure the interrupt level threshold. */
+		union CLICMTH clicmth = {.b = {.mth = 0x0}};
+
+		write_clic32(dev, CLIC_MTH, clicmth.qw);
+
+		/* Detect the number of bits for the clicintctl register. */
+		union CLICINFO clicinfo = {.qw = read_clic32(dev, CLIC_INFO)};
+
+		data->intctlbits = clicinfo.b.intctlbits;
+
+		if (data->nlbits > data->intctlbits) {
+			data->nlbits = data->intctlbits;
+		}
+	} else {
+		/* Configure the interrupt level threshold by CSR mintthresh. */
+		csr_write(CSR_MINTTHRESH, 0x0);
+	}
+
+	if (IS_ENABLED(CONFIG_CLIC_SMCLICCONFIG_EXT)) {
+		if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+			/* Configure the number of bits assigned to interrupt levels. */
+			union CLICCFG cliccfg = {.qw = read_clic32(dev, CLIC_CFG)};
+
+			cliccfg.w.nlbits = data->nlbits;
+			write_clic32(dev, CLIC_CFG, cliccfg.qw);
+		} else {
+			csr_write(CSR_MISELECT, CLIC_CFG);
+			union CLICCFG cliccfg = {.qw = csr_read(CSR_MIREG)};
+
+			cliccfg.w.nlbits = data->nlbits;
+			csr_write(CSR_MIREG, cliccfg.qw);
+		}
+	}
+
+	if (IS_ENABLED(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS)) {
+		/* Reset all interrupt control register. */
+		for (int i = 0; i < CONFIG_NUM_IRQS; i++) {
+			write_clic32(dev, CLIC_CTRL(i), 0);
+		}
+	} else {
+		/* Reset all clicintip, clicintie register. */
+		for (int i = 0; i < CONFIG_NUM_IRQS; i += 32) {
+			csr_write(CSR_MISELECT, CLIC_INTIP(i));
+			csr_write(CSR_MIREG, 0);
+			csr_write(CSR_MIREG2, 0);
+		}
+
+		/* Reset all clicintctl, clicintattr register. */
+		for (int i = 0; i < CONFIG_NUM_IRQS; i += 4) {
+			csr_write(CSR_MISELECT, CLIC_INTCTRL(i));
+			csr_write(CSR_MIREG, 0);
+			csr_write(CSR_MIREG2, 0);
+		}
+	}
+
+	return 0;
+}
+
+#define CLIC_INTC_DATA_INIT(n)                                                                     \
+	static struct clic_data clic_data_##n = {                                                  \
+		.nlbits = CONFIG_CLIC_PARAMETER_MNLBITS,                                           \
+		.intctlbits = CONFIG_CLIC_PARAMETER_INTCTLBITS,                                    \
+	};
+#define CLIC_INTC_CONFIG_INIT(n)                                                                   \
+	const static struct clic_config clic_config_##n = {                                        \
+		.base = COND_CODE_1(CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS,                           \
+				   (DT_REG_ADDR(DT_DRV_INST(n))), (0)),                            \
+	};
+#define CLIC_INTC_DEVICE_INIT(n)                                                                   \
+	CLIC_INTC_DATA_INIT(n)                                                                     \
+	CLIC_INTC_CONFIG_INIT(n)                                                                   \
+	DEVICE_DT_INST_DEFINE(n, &clic_init, NULL, &clic_data_##n, &clic_config_##n, PRE_KERNEL_1, \
+			      CONFIG_INTC_INIT_PRIORITY, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(CLIC_INTC_DEVICE_INIT)
diff --git a/drivers/interrupt_controller/intc_clic.h b/drivers/interrupt_controller/intc_clic.h
new file mode 100644
index 0000000000000..b63e40b31cda1
--- /dev/null
+++ b/drivers/interrupt_controller/intc_clic.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2021 Tokita, Hiroshi <tokita.hiroshi@gmail.com>
+ * Copyright (c) 2025 Andes Technology Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_CLIC_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_CLIC_H_
+
+/* CLIC relative CSR number */
+#define CSR_MTVT       (0x307)
+#define CSR_MNXTI      (0x345)
+#define CSR_MINTTHRESH (0x347)
+#define CSR_MISELECT   (0x350)
+#define CSR_MIREG      (0x351)
+#define CSR_MIREG2     (0x352)
+
+#ifndef __ASSEMBLER__
+
+#include <stddef.h>
+
+#ifdef CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS
+/* CLIC Memory mapped register offset */
+#define CLIC_CFG          (0x0)
+#define CLIC_CTRL(irq)    (0x1000 + 4 * (irq))
+#define CLIC_INTIP(irq)   (CLIC_CTRL(irq) + offsetof(union CLICCTRL, w.INTIP))
+#define CLIC_INTIE(irq)   (CLIC_CTRL(irq) + offsetof(union CLICCTRL, w.INTIE))
+#define CLIC_INTATTR(irq) (CLIC_CTRL(irq) + offsetof(union CLICCTRL, w.INTATTR))
+#define CLIC_INTCTRL(irq) (CLIC_CTRL(irq) + offsetof(union CLICCTRL, w.INTCTRL))
+#else
+/* Indirect CSR Access miselect offset */
+#define CLIC_CFG          (0x14A0)
+#define CLIC_CTRL(irq)    (0x0) /* Dummy value for driver compatibility */
+#define CLIC_INTIP(irq)   (0x1400 + (irq) / 32)
+#define CLIC_INTIE(irq)   (0x1400 + (irq) / 32)
+#define CLIC_INTATTR(irq) (0x1000 + (irq) / 4)
+#define CLIC_INTCTRL(irq) (0x1000 + (irq) / 4)
+#endif /* !CONFIG_LEGACY_CLIC_MEMORYMAP_ACCESS */
+
+/* Nuclei ECLIC memory mapped register offset */
+#define CLIC_INFO (0x4)
+#define CLIC_MTH  (0x8)
+
+/* CLIC register structure */
+union CLICCFG {
+	struct {
+#ifdef CONFIG_NUCLEI_ECLIC
+		uint32_t _reserved0: 1;
+#endif /* CONFIG_NUCLEI_ECLIC */
+		/** number of interrupt level bits */
+		uint32_t nlbits: 4;
+		/** number of clicintattr[i].MODE bits */
+		uint32_t nmbits: 2;
+		uint32_t _reserved1: 25;
+	} w;
+	uint32_t qw;
+};
+
+union CLICINTIP {
+	struct {
+		/** Interrupt Pending */
+		uint8_t IP: 1;
+		uint8_t reserved0: 7;
+	} b;
+	uint8_t w;
+};
+
+union CLICINTIE {
+	struct {
+		/** Interrupt Enabled */
+		uint8_t IE: 1;
+		uint8_t reserved0: 7;
+	} b;
+	uint8_t w;
+};
+
+union CLICINTATTR {
+	struct {
+		/** 0: non-vectored 1:vectored */
+		uint8_t shv: 1;
+		/** 0: level 1: rising edge 2: falling edge */
+		uint8_t trg: 2;
+		uint8_t reserved0: 3;
+		uint8_t mode: 2;
+	} b;
+	uint8_t w;
+};
+
+union CLICCTRL {
+	struct {
+		volatile union CLICINTIP INTIP;
+		volatile union CLICINTIE INTIE;
+		volatile union CLICINTATTR INTATTR;
+		volatile uint8_t INTCTRL;
+	} w;
+	uint32_t qw;
+};
+
+/* Nuclei ECLIC register structure */
+union CLICINFO {
+	struct {
+		/** number of max supported interrupts */
+		uint32_t numint: 13;
+		/** architecture version */
+		uint32_t version: 8;
+		/** supported bits in the clicintctl */
+		uint32_t intctlbits: 4;
+		uint32_t _reserved0: 7;
+	} b;
+	uint32_t qw;
+};
+
+union CLICMTH {
+	struct {
+		uint32_t reserved0: 24;
+		/**  machine mode interrupt level threshold */
+		uint32_t mth: 8;
+	} b;
+	uint32_t qw;
+};
+
+#endif /*__ASSEMBLER__*/
+
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_CLIC_H_ */
diff --git a/drivers/interrupt_controller/intc_esp32.c b/drivers/interrupt_controller/intc_esp32.c
index 23073d80edc50..d6980b3e6151c 100644
--- a/drivers/interrupt_controller/intc_esp32.c
+++ b/drivers/interrupt_controller/intc_esp32.c
@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2021-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/irq.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,13 +16,14 @@
 #include <esp_memory_utils.h>
 #include <esp_attr.h>
 #include <esp_cpu.h>
+#include <esp_rom_sys.h>
 #include <esp_private/rtc_ctrl.h>
 #include <limits.h>
 #include <assert.h>
 #include <soc/soc.h>
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(esp32_intc, CONFIG_LOG_DEFAULT_LEVEL);
+LOG_MODULE_REGISTER(intc_esp32, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define ETS_INTERNAL_TIMER0_INTR_NO 6
 #define ETS_INTERNAL_TIMER1_INTR_NO 15
@@ -47,7 +49,6 @@ LOG_MODULE_REGISTER(esp32_intc, CONFIG_LOG_DEFAULT_LEVEL);
 #endif
 
 /* Typedef for C-callable interrupt handler function */
-typedef void (*intc_handler_t)(void *);
 typedef void (*intc_dyn_handler_t)(const void *);
 
 /* shared critical section context */
@@ -63,32 +64,6 @@ static inline void esp_intr_unlock(void)
 	irq_unlock(esp_intc_csec);
 }
 
-/*
- * Interrupt handler table and unhandled interrupt routine. Duplicated
- * from xtensa_intr.c... it's supposed to be private, but we need to look
- * into it in order to see if someone allocated an int using
- * set_interrupt_handler.
- */
-struct intr_alloc_table_entry {
-	void (*handler)(void *arg);
-	void *arg;
-};
-
-/* Default handler for unhandled interrupts. */
-void IRAM_ATTR default_intr_handler(void *arg)
-{
-	esp_rom_printf("Unhandled interrupt %d on cpu %d!\n", (int)arg, esp_cpu_get_core_id());
-}
-
-static struct intr_alloc_table_entry intr_alloc_table[ESP_INTC_INTS_NUM * CONFIG_MP_MAX_NUM_CPUS];
-
-static void set_interrupt_handler(int n, intc_handler_t f, void *arg)
-{
-	irq_disable(n);
-	intr_alloc_table[n * CONFIG_MP_MAX_NUM_CPUS].handler = f;
-	irq_connect_dynamic(n, 0, (intc_dyn_handler_t)f, arg, 0);
-}
-
 /* Linked list of vector descriptions, sorted by cpu.intno value */
 static struct vector_desc_t *vector_desc_head; /* implicitly initialized to NULL */
 
@@ -201,19 +176,9 @@ static struct vector_desc_t *find_desc_for_source(int source, int cpu)
 	return vd;
 }
 
-void esp_intr_initialize(void)
-{
-	unsigned int num_cpus = arch_num_cpus();
-
-	for (size_t i = 0; i < (ESP_INTC_INTS_NUM * num_cpus); ++i) {
-		intr_alloc_table[i].handler = default_intr_handler;
-		intr_alloc_table[i].arg = (void *)i;
-	}
-}
-
 int esp_intr_mark_shared(int intno, int cpu, bool is_int_ram)
 {
-	if (intno >= ESP_INTC_INTS_NUM) {
+	if (intno >= SOC_CPU_INTR_NUM) {
 		return -EINVAL;
 	}
 	if (cpu >= arch_num_cpus()) {
@@ -238,7 +203,7 @@ int esp_intr_mark_shared(int intno, int cpu, bool is_int_ram)
 
 int esp_intr_reserve(int intno, int cpu)
 {
-	if (intno >= ESP_INTC_INTS_NUM) {
+	if (intno >= SOC_CPU_INTR_NUM) {
 		return -EINVAL;
 	}
 	if (cpu >= arch_num_cpus()) {
@@ -263,7 +228,7 @@ static bool intr_has_handler(int intr, int cpu)
 {
 	bool r;
 
-	r = intr_alloc_table[intr * CONFIG_MP_MAX_NUM_CPUS + cpu].handler != default_intr_handler;
+	r = _sw_isr_table[intr * CONFIG_MP_MAX_NUM_CPUS + cpu].isr != z_irq_spurious;
 
 	return r;
 }
@@ -273,7 +238,6 @@ static bool is_vect_desc_usable(struct vector_desc_t *vd, int flags, int cpu, in
 	/* Check if interrupt is not reserved by design */
 	int x = vd->intno;
 	esp_cpu_intr_desc_t intr_desc;
-
 	esp_cpu_intr_get_desc(cpu, x, &intr_desc);
 
 	if (intr_desc.flags & ESP_CPU_INTR_DESC_FLAG_RESVD) {
@@ -286,14 +250,14 @@ static bool is_vect_desc_usable(struct vector_desc_t *vd, int flags, int cpu, in
 	}
 
 #ifndef SOC_CPU_HAS_FLEXIBLE_INTC
-	/* Check if the interrupt priority is acceptable */
+	/* Check if the interrupt level is acceptable */
 	if (!(flags & (1 << intr_desc.priority))) {
-		INTC_LOG("....Unusable: incompatible priority");
+		INTC_LOG("....Unusable: incompatible level");
 		return false;
 	}
 	/* check if edge/level type matches what we want */
 	if (((flags & ESP_INTR_FLAG_EDGE) && (intr_desc.type == ESP_CPU_INTR_TYPE_LEVEL)) ||
-		(((!(flags & ESP_INTR_FLAG_EDGE)) && (intr_desc.type == ESP_CPU_INTR_TYPE_EDGE)))) {
+	    (((!(flags & ESP_INTR_FLAG_EDGE)) && (intr_desc.type == ESP_CPU_INTR_TYPE_EDGE)))) {
 		INTC_LOG("....Unusable: incompatible trigger type");
 		return false;
 	}
@@ -335,7 +299,6 @@ static bool is_vect_desc_usable(struct vector_desc_t *vd, int flags, int cpu, in
 			return false;
 		}
 	} else if (intr_has_handler(x, cpu)) {
-		/* Check if interrupt already is allocated by set_interrupt_handler */
 		INTC_LOG("....Unusable: already allocated");
 		return false;
 	}
@@ -400,7 +363,7 @@ static int get_available_int(int flags, int cpu, int force, int source)
 
 	INTC_LOG("%s: start looking. Current cpu: %d", __func__, cpu);
 	/* No allocated handlers as well as forced intr, iterate over the 32 possible interrupts */
-	for (x = 0; x < ESP_INTC_INTS_NUM; x++) {
+	for (x = 0; x < SOC_CPU_INTR_NUM; x++) {
 		/* Grab the vector_desc for this vector. */
 		vd = find_desc_for_int(x, cpu);
 		if (vd == NULL) {
@@ -409,12 +372,10 @@ static int get_available_int(int flags, int cpu, int force, int source)
 		}
 
 		esp_cpu_intr_desc_t intr_desc;
-
 		esp_cpu_intr_get_desc(cpu, x, &intr_desc);
 
 		INTC_LOG("Int %d reserved %d level %d %s hasIsr %d",
-			 x, intr_desc.flags & ESP_CPU_INTR_DESC_FLAG_RESVD,
-			 intr_desc.priority,
+			 x, intr_desc.flags & ESP_CPU_INTR_DESC_FLAG_RESVD, intr_desc.priority,
 			 intr_desc.type == ESP_CPU_INTR_TYPE_LEVEL ? "LEVEL" : "EDGE",
 			 intr_has_handler(x, cpu));
 
@@ -438,7 +399,8 @@ static int get_available_int(int flags, int cpu, int force, int source)
 					no++;
 					svdesc = svdesc->next;
 				}
-				if (no < best_shared_ct || best_level > intr_desc.priority) {
+				if (no < best_shared_ct ||
+					best_level > intr_desc.priority) {
 					/*
 					 * Seems like this shared vector is both okay and has
 					 * the least amount of ISRs already attached to it.
@@ -500,8 +462,7 @@ static void IRAM_ATTR shared_intr_isr(void *arg)
 	esp_intr_lock();
 	while (sh_vec) {
 		if (!sh_vec->disabled) {
-			if ((sh_vec->statusreg == NULL) ||
-				(*sh_vec->statusreg & sh_vec->statusmask)) {
+			if (!(sh_vec->statusreg) || (*sh_vec->statusreg & sh_vec->statusmask)) {
 				sh_vec->isr(sh_vec->arg);
 			}
 		}
@@ -516,9 +477,9 @@ int esp_intr_alloc_intrstatus(int source,
 			      uint32_t intrstatusmask,
 			      intr_handler_t handler,
 			      void *arg,
-			      struct intr_handle_data_t **ret_handle)
+			     intr_handle_t *ret_handle)
 {
-	struct intr_handle_data_t *ret = NULL;
+	intr_handle_data_t *ret = NULL;
 	int force = -1;
 
 	INTC_LOG("%s (cpu %d): checking args", __func__, esp_cpu_get_core_id());
@@ -544,8 +505,8 @@ int esp_intr_alloc_intrstatus(int source,
 	 * we need to make sure the interrupt is connected to the CPU0.
 	 * CPU1 does not have access to the RTC fast memory through this region.
 	 */
-	if ((flags & ESP_INTR_FLAG_IRAM) && handler && !esp_ptr_in_iram(handler) &&
-		!esp_ptr_in_rtc_iram_fast(handler)) {
+	if ((flags & ESP_INTR_FLAG_IRAM) && handler &&
+	    !esp_ptr_in_iram(handler) && !esp_ptr_in_rtc_iram_fast(handler)) {
 		return -EINVAL;
 	}
 
@@ -636,16 +597,20 @@ int esp_intr_alloc_intrstatus(int source,
 		sv->disabled = 0;
 		vd->shared_vec_info = sv;
 		vd->flags |= VECDESC_FL_SHARED;
+
+		/* Disable interrupt to avoid assert at IRQ install */
+		irq_disable(intr);
+
 		/* (Re-)set shared isr handler to new value. */
-		set_interrupt_handler(intr, shared_intr_isr, vd);
+		irq_connect_dynamic(intr, 0, (intc_dyn_handler_t)shared_intr_isr, vd, 0);
 	} else {
 		/* Mark as unusable for other interrupt sources. This is ours now! */
 		vd->flags = VECDESC_FL_NONSHARED;
 		if (handler) {
-			set_interrupt_handler(intr, handler, arg);
+			irq_connect_dynamic(intr, 0, (intc_dyn_handler_t)handler, arg, 0);
 		}
 		if (flags & ESP_INTR_FLAG_EDGE) {
-			xthal_set_intclear(1 << intr);
+			esp_cpu_intr_edge_ack(intr);
 		}
 		vd->source = source;
 	}
@@ -675,10 +640,9 @@ int esp_intr_alloc_intrstatus(int source,
 		esp_intr_disable(ret);
 	}
 
-#ifdef SOC_CPU_HAS_FLEXIBLE_INTC
+#if SOC_CPU_HAS_FLEXIBLE_INTC
 	/* Extract the level from the interrupt passed flags */
 	int level = esp_intr_flags_to_level(flags);
-
 	esp_cpu_intr_set_priority(intr, level);
 
 	if (flags & ESP_INTR_FLAG_EDGE) {
@@ -688,6 +652,11 @@ int esp_intr_alloc_intrstatus(int source,
 	}
 #endif
 
+#if SOC_INT_PLIC_SUPPORTED
+	/* Make sure the interrupt is not delegated to user mode (IDF uses machine mode only) */
+	RV_CLEAR_CSR(mideleg, BIT(intr));
+#endif
+
 	esp_intr_unlock();
 
 	/* Fill return handle if needed, otherwise free handle. */
@@ -698,6 +667,7 @@ int esp_intr_alloc_intrstatus(int source,
 	}
 
 	LOG_DBG("Connected src %d to int %d (cpu %d)", source, intr, cpu);
+
 	return 0;
 }
 
@@ -705,7 +675,7 @@ int esp_intr_alloc(int source,
 		int flags,
 		intr_handler_t handler,
 		void *arg,
-		struct intr_handle_data_t **ret_handle)
+		intr_handle_t *ret_handle)
 {
 	/*
 	 * As an optimization, we can create a table with the possible interrupt status
@@ -715,7 +685,7 @@ int esp_intr_alloc(int source,
 	return esp_intr_alloc_intrstatus(source, flags, 0, 0, handler, arg, ret_handle);
 }
 
-int IRAM_ATTR esp_intr_set_in_iram(struct intr_handle_data_t *handle, bool is_in_iram)
+int IRAM_ATTR esp_intr_set_in_iram(intr_handle_t handle, bool is_in_iram)
 {
 	if (!handle) {
 		return -EINVAL;
@@ -739,7 +709,7 @@ int IRAM_ATTR esp_intr_set_in_iram(struct intr_handle_data_t *handle, bool is_in
 	return 0;
 }
 
-int esp_intr_free(struct intr_handle_data_t *handle)
+int esp_intr_free(intr_handle_t handle)
 {
 	bool free_shared_vector = false;
 
@@ -780,18 +750,20 @@ int esp_intr_free(struct intr_handle_data_t *handle)
 
 	if ((handle->vector_desc->flags & VECDESC_FL_NONSHARED) || free_shared_vector) {
 		INTC_LOG("%s: Disabling int, killing handler", __func__);
-		/* Reset to normal handler */
-		set_interrupt_handler(handle->vector_desc->intno,
-				      default_intr_handler,
-				      (void *)((int)handle->vector_desc->intno));
+
+		/* Disable interrupt to avoid assert at IRQ install */
+		irq_disable(handle->vector_desc->intno);
+
+		/* Reset IRQ handler */
+		irq_connect_dynamic(handle->vector_desc->intno, 0,
+				      (intc_dyn_handler_t)z_irq_spurious,
+				      (void *)((int)handle->vector_desc->intno), 0);
 		/*
 		 * Theoretically, we could free the vector_desc... not sure if that's worth the
 		 * few bytes of memory we save.(We can also not use the same exit path for empty
 		 * shared ints anymore if we delete the desc.) For now, just mark it as free.
 		 */
-		handle->vector_desc->flags &= ~(VECDESC_FL_NONSHARED |
-			VECDESC_FL_RESERVED | VECDESC_FL_SHARED);
-
+		handle->vector_desc->flags &= !(VECDESC_FL_NONSHARED | VECDESC_FL_RESERVED);
 		/* Also kill non_iram mask bit. */
 		non_iram_int_mask[handle->vector_desc->cpu] &= ~(1 << (handle->vector_desc->intno));
 	}
@@ -800,12 +772,12 @@ int esp_intr_free(struct intr_handle_data_t *handle)
 	return 0;
 }
 
-int esp_intr_get_intno(struct intr_handle_data_t *handle)
+int esp_intr_get_intno(intr_handle_t handle)
 {
 	return handle->vector_desc->intno;
 }
 
-int esp_intr_get_cpu(struct intr_handle_data_t *handle)
+int esp_intr_get_cpu(intr_handle_t handle)
 {
 	return handle->vector_desc->cpu;
 }
@@ -824,7 +796,7 @@ int esp_intr_get_cpu(struct intr_handle_data_t *handle)
  */
 #define INT_MUX_DISABLED_INTNO 6
 
-int IRAM_ATTR esp_intr_enable(struct intr_handle_data_t *handle)
+int IRAM_ATTR esp_intr_enable(intr_handle_t handle)
 {
 	if (!handle) {
 		return -EINVAL;
@@ -840,8 +812,8 @@ int IRAM_ATTR esp_intr_enable(struct intr_handle_data_t *handle)
 	}
 	if (source >= 0) {
 		/* Disabled using int matrix; re-connect to enable */
-		esp_rom_route_intr_matrix(handle->vector_desc->cpu,
-			source, handle->vector_desc->intno);
+		esp_rom_route_intr_matrix(handle->vector_desc->cpu, source,
+			handle->vector_desc->intno);
 	} else {
 		/* Re-enable using cpu int ena reg */
 		if (handle->vector_desc->cpu != esp_cpu_get_core_id()) {
@@ -854,7 +826,7 @@ int IRAM_ATTR esp_intr_enable(struct intr_handle_data_t *handle)
 	return 0;
 }
 
-int IRAM_ATTR esp_intr_disable(struct intr_handle_data_t *handle)
+int IRAM_ATTR esp_intr_disable(intr_handle_t handle)
 {
 	if (!handle) {
 		return -EINVAL;
@@ -884,8 +856,8 @@ int IRAM_ATTR esp_intr_disable(struct intr_handle_data_t *handle)
 	if (source >= 0) {
 		if (disabled) {
 			/* Disable using int matrix */
-			esp_rom_route_intr_matrix(handle->vector_desc->cpu,
-				source, INT_MUX_DISABLED_INTNO);
+			esp_rom_route_intr_matrix(handle->vector_desc->cpu, source,
+				INT_MUX_DISABLED_INTNO);
 		}
 	} else {
 		/* Disable using per-cpu regs */
@@ -899,7 +871,6 @@ int IRAM_ATTR esp_intr_disable(struct intr_handle_data_t *handle)
 	return 0;
 }
 
-
 void IRAM_ATTR esp_intr_noniram_disable(void)
 {
 	esp_intr_lock();
@@ -914,6 +885,7 @@ void IRAM_ATTR esp_intr_noniram_disable(void)
 	oldint = esp_cpu_intr_get_enabled_mask();
 	esp_cpu_intr_disable(non_iram_ints);
 	rtc_isr_noniram_disable(cpu);
+	/* Save which ints we did disable */
 	non_iram_int_disabled[cpu] = oldint & non_iram_ints;
 	esp_intr_unlock();
 }
@@ -932,3 +904,29 @@ void IRAM_ATTR esp_intr_noniram_enable(void)
 	rtc_isr_noniram_enable(cpu);
 	esp_intr_unlock();
 }
+
+#if defined(CONFIG_RISCV)
+/*
+ * Functions below are implemented to keep consistency with current
+ * Xtensa chips API behavior. When accessing Zephyr's API
+ * directly, the CPU IRQs can be enabled or disabled directly. This
+ * is mostly used to control lines that are not muxed, thus bypass the
+ * interrupt matrix. For RISCV, these functions are not expected to
+ * be used via user API, as peripherals are all routed through INTMUX
+ * and shared interrupts require managing sources state.
+ */
+void arch_irq_enable(unsigned int irq)
+{
+	esp_cpu_intr_enable(1 << irq);
+}
+
+void arch_irq_disable(unsigned int irq)
+{
+	esp_cpu_intr_disable(1 << irq);
+}
+
+int arch_irq_is_enabled(unsigned int irq)
+{
+	return !!(esp_cpu_intr_get_enabled_mask() & (1 << irq));
+}
+#endif
diff --git a/drivers/interrupt_controller/intc_esp32c3.c b/drivers/interrupt_controller/intc_esp32c3.c
deleted file mode 100644
index da889a8f0afb9..0000000000000
--- a/drivers/interrupt_controller/intc_esp32c3.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <soc/periph_defs.h>
-#include <limits.h>
-#include <assert.h>
-#include "soc/soc.h"
-#include <soc.h>
-#include <zephyr/kernel.h>
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#include <zephyr/sw_isr_table.h>
-#include <riscv/interrupt.h>
-
-#define ESP32C3_INTC_DEFAULT_PRIO			15
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(intc_esp32c3, CONFIG_LOG_DEFAULT_LEVEL);
-
-/*
- * Define this to debug the choices made when allocating the interrupt. This leads to much debugging
- * output within a critical region, which can lead to weird effects like e.g. the interrupt watchdog
- * being triggered, that is why it is separate from the normal LOG* scheme.
- */
-#ifdef CONFIG_INTC_ESP32C3_DECISIONS_LOG
-# define INTC_LOG(...) LOG_INF(__VA_ARGS__)
-#else
-# define INTC_LOG(...) do {} while (0)
-#endif
-
-#define ESP32C3_INTC_DEFAULT_PRIORITY   15
-#define ESP32C3_INTC_DEFAULT_THRESHOLD  1
-#define ESP32C3_INTC_DISABLED_SLOT      31
-#define ESP32C3_INTC_SRCS_PER_IRQ       2
-#define ESP32C3_INTC_AVAILABLE_IRQS     30
-
-#if defined(CONFIG_SOC_SERIES_ESP32C6)
-
-#define IRQ_NA		0xFF	/* IRQ not available */
-#define IRQ_FREE	0xFE
-
-#define ESP32C6_INTC_SRCS_PER_IRQ       2
-#define ESP32C6_INTC_AVAILABLE_IRQS     31
-
-/* Interrupt overview for ESP32C6:
- * - 0, 3, 4, and 7 are used by the CPU for core-local interrupts (CLINT)
- * - 1 is used for Wi-Fi in Espressif HAL
- * - 2, 5, 6, 8 .. 31 are available for Zephyr
- * - 31 is reserved for disabled interrupts
- */
-static uint8_t esp_intr_irq_alloc[ESP32C6_INTC_AVAILABLE_IRQS][ESP32C6_INTC_SRCS_PER_IRQ] = {
-	[0] = {IRQ_NA, IRQ_NA},
-	[1] = {IRQ_NA, IRQ_NA},
-	[2] = {IRQ_FREE, IRQ_FREE},
-	[3] = {IRQ_NA, IRQ_NA},
-	[4] = {IRQ_NA, IRQ_NA},
-	[5 ... 6] = {IRQ_FREE, IRQ_FREE},
-	[7] = {IRQ_NA, IRQ_NA},
-	[8 ... 30] = {IRQ_FREE, IRQ_FREE}
-};
-#endif
-
-#define STATUS_MASK_NUM		3
-
-static uint32_t esp_intr_enabled_mask[STATUS_MASK_NUM] = {0, 0, 0};
-
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || defined(CONFIG_SOC_SERIES_ESP32C3)
-
-static uint32_t esp_intr_find_irq_for_source(uint32_t source)
-{
-	/* in general case, each 2 sources goes routed to
-	 * 1 IRQ line.
-	 */
-	uint32_t irq = (source / ESP32C3_INTC_SRCS_PER_IRQ);
-
-	if (irq > ESP32C3_INTC_AVAILABLE_IRQS) {
-		INTC_LOG("Clamping the source: %d no more IRQs available", source);
-		irq = ESP32C3_INTC_AVAILABLE_IRQS;
-	} else if (irq == 0) {
-		irq = 1;
-	}
-
-	INTC_LOG("Found IRQ: %d for source: %d", irq, source);
-
-	return irq;
-}
-
-#elif defined(CONFIG_SOC_SERIES_ESP32C6)
-
-static uint32_t esp_intr_find_irq_for_source(uint32_t source)
-{
-	uint32_t irq = IRQ_NA;
-	uint32_t irq_free = IRQ_NA;
-	uint8_t *irq_ptr = NULL;
-
-	/* First allocate one source per IRQ, then two
-	 * if there are more sources than free IRQs
-	 */
-	for (int j = 0; j < ESP32C6_INTC_SRCS_PER_IRQ; j++) {
-		for (int i = 0; i < ESP32C6_INTC_AVAILABLE_IRQS; i++) {
-			/* Find first free slot but keep searching to see
-			 * if source is already associated to an IRQ
-			 */
-			if (esp_intr_irq_alloc[i][j] == source) {
-				/* Source is already associated to an IRQ */
-				irq = i;
-				goto found;
-			} else if ((irq_free == IRQ_NA) && (esp_intr_irq_alloc[i][j] == IRQ_FREE)) {
-				irq_free = i;
-				irq_ptr = &esp_intr_irq_alloc[i][j];
-			}
-		}
-	}
-
-	if (irq_ptr != NULL) {
-		*irq_ptr = (uint8_t)source;
-		irq = irq_free;
-	} else {
-		return IRQ_NA;
-	}
-
-found:
-	INTC_LOG("Found IRQ: %d for source: %d", irq, source);
-
-	return irq;
-}
-
-#endif
-
-void esp_intr_initialize(void)
-{
-	/* IRQ 31 is reserved for disabled interrupts,
-	 * so route all sources to it
-	 */
-	for (int i = 0 ; i < ESP32C3_INTC_AVAILABLE_IRQS + 2; i++) {
-		irq_disable(i);
-	}
-
-	for (int i = 0; i < ETS_MAX_INTR_SOURCE; i++) {
-		esp_rom_intr_matrix_set(0, i, ESP32C3_INTC_DISABLED_SLOT);
-	}
-
-#if defined(CONFIG_SOC_SERIES_ESP32C6)
-	/* Clear up IRQ allocation */
-	for (int j = 0; j < ESP32C6_INTC_SRCS_PER_IRQ; j++) {
-		for (int i = 0; i < ESP32C6_INTC_AVAILABLE_IRQS; i++) {
-			/* screen out reserved IRQs */
-			if (esp_intr_irq_alloc[i][j] != IRQ_NA) {
-				esp_intr_irq_alloc[i][j] = IRQ_FREE;
-			}
-		}
-	}
-#endif
-
-	/* set global esp32c3's INTC masking level */
-	esprv_intc_int_set_threshold(ESP32C3_INTC_DEFAULT_THRESHOLD);
-}
-
-int esp_intr_alloc(int source,
-		int flags,
-		isr_handler_t handler,
-		void *arg,
-		void **ret_handle)
-{
-	ARG_UNUSED(flags);
-	ARG_UNUSED(ret_handle);
-
-	if (handler == NULL) {
-		return -EINVAL;
-	}
-
-	if (source < 0 || source >= ETS_MAX_INTR_SOURCE) {
-		return -EINVAL;
-	}
-
-	uint32_t key = irq_lock();
-
-	irq_connect_dynamic(source,
-		ESP32C3_INTC_DEFAULT_PRIORITY,
-		handler,
-		arg,
-		0);
-
-	if (source < 32) {
-		esp_intr_enabled_mask[0] |= (1 << source);
-	} else if (source < 64) {
-		esp_intr_enabled_mask[1] |= (1 << (source - 32));
-	} else if (source < 96) {
-		esp_intr_enabled_mask[2] |= (1 << (source - 64));
-	}
-
-	INTC_LOG("Enabled ISRs -- 0: 0x%X -- 1: 0x%X -- 2: 0x%X",
-		esp_intr_enabled_mask[0], esp_intr_enabled_mask[1], esp_intr_enabled_mask[2]);
-
-	irq_unlock(key);
-	int ret = esp_intr_enable(source);
-
-	return ret;
-}
-
-int esp_intr_disable(int source)
-{
-	if (source < 0 || source >= ETS_MAX_INTR_SOURCE) {
-		return -EINVAL;
-	}
-
-	uint32_t key = irq_lock();
-
-	esp_rom_intr_matrix_set(0,
-		source,
-		ESP32C3_INTC_DISABLED_SLOT);
-
-#if defined(CONFIG_SOC_SERIES_ESP32C6)
-	for (int j = 0; j < ESP32C6_INTC_SRCS_PER_IRQ; j++) {
-		for (int i = 0; i < ESP32C6_INTC_AVAILABLE_IRQS; i++) {
-			if (esp_intr_irq_alloc[i][j] == source) {
-				esp_intr_irq_alloc[i][j] = IRQ_FREE;
-				goto freed;
-			}
-		}
-	}
-freed:
-#endif
-
-	if (source < 32) {
-		esp_intr_enabled_mask[0] &= ~(1 << source);
-	} else if (source < 64) {
-		esp_intr_enabled_mask[1] &= ~(1 << (source - 32));
-	} else if (source < 96) {
-		esp_intr_enabled_mask[2] &= ~(1 << (source - 64));
-	}
-
-	INTC_LOG("Enabled ISRs -- 0: 0x%X -- 1: 0x%X -- 2: 0x%X",
-		esp_intr_enabled_mask[0], esp_intr_enabled_mask[1], esp_intr_enabled_mask[2]);
-
-	irq_unlock(key);
-
-	return 0;
-}
-
-int esp_intr_enable(int source)
-{
-	if (source < 0 || source >= ETS_MAX_INTR_SOURCE) {
-		return -EINVAL;
-	}
-
-	uint32_t key = irq_lock();
-	uint32_t irq = esp_intr_find_irq_for_source(source);
-
-#if defined(CONFIG_SOC_SERIES_ESP32C6)
-	if (irq == IRQ_NA) {
-		irq_unlock(key);
-		return -ENOMEM;
-	}
-#endif
-
-	esp_rom_intr_matrix_set(0, source, irq);
-
-	if (source < 32) {
-		esp_intr_enabled_mask[0] |= (1 << source);
-	} else if (source < 64) {
-		esp_intr_enabled_mask[1] |= (1 << (source - 32));
-	} else if (source < 96) {
-		esp_intr_enabled_mask[2] |= (1 << (source - 64));
-	}
-
-	INTC_LOG("Enabled ISRs -- 0: 0x%X -- 1: 0x%X -- 2: 0x%X",
-		esp_intr_enabled_mask[0], esp_intr_enabled_mask[1], esp_intr_enabled_mask[2]);
-
-	esprv_intc_int_set_priority(irq, ESP32C3_INTC_DEFAULT_PRIO);
-	esprv_intc_int_set_type(irq, INTR_TYPE_LEVEL);
-	esprv_intc_int_enable(1 << irq);
-
-	irq_unlock(key);
-
-	return 0;
-}
-
-uint32_t esp_intr_get_enabled_intmask(int status_mask_number)
-{
-	INTC_LOG("Enabled ISRs -- 0: 0x%X -- 1: 0x%X -- 2: 0x%X",
-		esp_intr_enabled_mask[0], esp_intr_enabled_mask[1], esp_intr_enabled_mask[2]);
-
-	if (status_mask_number < STATUS_MASK_NUM) {
-		return esp_intr_enabled_mask[status_mask_number];
-	} else {
-		return 0;	/* error */
-	}
-}
diff --git a/drivers/interrupt_controller/intc_gic_common_priv.h b/drivers/interrupt_controller/intc_gic_common_priv.h
index f07d66a7cf532..4223196182fd6 100644
--- a/drivers/interrupt_controller/intc_gic_common_priv.h
+++ b/drivers/interrupt_controller/intc_gic_common_priv.h
@@ -8,29 +8,53 @@
 #define ZEPHYR_INCLUDE_DRIVERS_INTC_GIC_COMMON_PRIV_H_
 
 /* Offsets from GICD base or GICR(n) SGI_base */
-#define GIC_DIST_IGROUPR		0x0080
-#define GIC_DIST_ISENABLER		0x0100
-#define GIC_DIST_ICENABLER		0x0180
-#define GIC_DIST_ISPENDR		0x0200
-#define GIC_DIST_ICPENDR		0x0280
-#define GIC_DIST_ISACTIVER		0x0300
-#define GIC_DIST_ICACTIVER		0x0380
-#define GIC_DIST_IPRIORITYR		0x0400
-#define GIC_DIST_ITARGETSR		0x0800
-#define GIC_DIST_ICFGR			0x0c00
-#define GIC_DIST_IGROUPMODR		0x0d00
-#define GIC_DIST_SGIR			0x0f00
+#define GIC_DIST_IGROUPR    0x0080
+#define GIC_DIST_ISENABLER  0x0100
+#define GIC_DIST_ICENABLER  0x0180
+#define GIC_DIST_ISPENDR    0x0200
+#define GIC_DIST_ICPENDR    0x0280
+#define GIC_DIST_ISACTIVER  0x0300
+#define GIC_DIST_ICACTIVER  0x0380
+#define GIC_DIST_IPRIORITYR 0x0400
+#define GIC_DIST_ITARGETSR  0x0800
+#define GIC_DIST_ICFGR      0x0c00
+#define GIC_DIST_IGROUPMODR 0x0d00
+#define GIC_DIST_SGIR       0x0f00
+
+/* GICv3.1 Support for Extended SPI Range */
+#define GIC_ESPI_START        4096
+#define GIC_ESPI_END          5119
+#define GIC_DIST_IGROUPRnE    0x1000
+#define GIC_DIST_ISENABLERnE  0x1200
+#define GIC_DIST_ICENABLERnE  0x1400
+#define GIC_DIST_ISPENDRnE    0x1600
+#define GIC_DIST_ICPENDRnE    0x1800
+#define GIC_DIST_ISACTIVERnE  0x1a00
+#define GIC_DIST_ICACTIVERnE  0x1c00
+#define GIC_DIST_IPRIORITYRnE 0x2000
+#define GIC_DIST_ICFGRnE      0x3000
+#define GIC_DIST_IGROUPMODRnE 0x3400
 
 /* GICD GICR common access macros */
-#define IGROUPR(base, n)		(base + GIC_DIST_IGROUPR + (n) * 4)
-#define ISENABLER(base, n)		(base + GIC_DIST_ISENABLER + (n) * 4)
-#define ICENABLER(base, n)		(base + GIC_DIST_ICENABLER + (n) * 4)
-#define ISPENDR(base, n)		(base + GIC_DIST_ISPENDR + (n) * 4)
-#define ICPENDR(base, n)		(base + GIC_DIST_ICPENDR + (n) * 4)
-#define IPRIORITYR(base, n)		(base + GIC_DIST_IPRIORITYR + n)
-#define ITARGETSR(base, n)		(base + GIC_DIST_ITARGETSR + (n) * 4)
-#define ICFGR(base, n)			(base + GIC_DIST_ICFGR + (n) * 4)
-#define IGROUPMODR(base, n)		(base + GIC_DIST_IGROUPMODR + (n) * 4)
+#define IGROUPR(base, n)    (base + GIC_DIST_IGROUPR + (n) * 4)
+#define ISENABLER(base, n)  (base + GIC_DIST_ISENABLER + (n) * 4)
+#define ICENABLER(base, n)  (base + GIC_DIST_ICENABLER + (n) * 4)
+#define ISPENDR(base, n)    (base + GIC_DIST_ISPENDR + (n) * 4)
+#define ICPENDR(base, n)    (base + GIC_DIST_ICPENDR + (n) * 4)
+#define IPRIORITYR(base, n) (base + GIC_DIST_IPRIORITYR + n)
+#define ITARGETSR(base, n)  (base + GIC_DIST_ITARGETSR + (n) * 4)
+#define ICFGR(base, n)      (base + GIC_DIST_ICFGR + (n) * 4)
+#define IGROUPMODR(base, n) (base + GIC_DIST_IGROUPMODR + (n) * 4)
+
+/* GICD Extended SPI (GICv3.1) common access macros */
+#define IGROUPRnE(base, n)    (base + GIC_DIST_IGROUPRnE + (n) * 4)
+#define ISENABLERnE(base, n)  (base + GIC_DIST_ISENABLERnE + (n) * 4)
+#define ICENABLERnE(base, n)  (base + GIC_DIST_ICENABLERnE + (n) * 4)
+#define ISPENDRnE(base, n)    (base + GIC_DIST_ISPENDRnE + (n) * 4)
+#define ICPENDRnE(base, n)    (base + GIC_DIST_ICPENDRnE + (n) * 4)
+#define IPRIORITYRnE(base, n) (base + GIC_DIST_IPRIORITYRnE + n)
+#define ICFGRnE(base, n)      (base + GIC_DIST_ICFGRnE + (n) * 4)
+#define IGROUPMODRnE(base, n) (base + GIC_DIST_IGROUPMODRnE + (n) * 4)
 
 /*
  * selects redistributor SGI_base for current core for PPI and SGI
@@ -39,10 +63,11 @@
  */
 
 #if CONFIG_GIC_VER <= 2
-#define GET_DIST_BASE(intid)	GIC_DIST_BASE
+#define GET_DIST_BASE(intid) GIC_DIST_BASE
+#define GIC_IS_ESPI(intid)   0
 #else
-#define GET_DIST_BASE(intid)	((intid < GIC_SPI_INT_BASE) ? \
-				(gic_get_rdist() + GICR_SGI_BASE_OFF) \
-				: GIC_DIST_BASE)
+#define GET_DIST_BASE(intid)                                                                       \
+	((intid < GIC_SPI_INT_BASE) ? (gic_get_rdist() + GICR_SGI_BASE_OFF) : GIC_DIST_BASE)
+#define GIC_IS_ESPI(intid) ((intid >= GIC_ESPI_START) && (intid <= GIC_ESPI_END))
 #endif
 #endif /* ZEPHYR_INCLUDE_DRIVERS_INTC_GIC_COMMON_PRIV_H */
diff --git a/drivers/interrupt_controller/intc_gicv3.c b/drivers/interrupt_controller/intc_gicv3.c
index 50e36f1e87ae1..cc22eaedb17f8 100644
--- a/drivers/interrupt_controller/intc_gicv3.c
+++ b/drivers/interrupt_controller/intc_gicv3.c
@@ -21,15 +21,15 @@
 
 #define DT_DRV_COMPAT arm_gic_v3
 
-#define GIC_V3_NODE	DT_COMPAT_GET_ANY_STATUS_OKAY(DT_DRV_COMPAT)
+#define GIC_V3_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(DT_DRV_COMPAT)
 
-#define GIC_REDISTRIBUTOR_STRIDE	DT_PROP_OR(GIC_V3_NODE, redistributor_stride, 0)
-#define GIC_NUM_REDISTRIBUTOR_REGIONS	DT_PROP_OR(GIC_V3_NODE, redistributor_regions, 1)
+#define GIC_REDISTRIBUTOR_STRIDE      DT_PROP_OR(GIC_V3_NODE, redistributor_stride, 0)
+#define GIC_NUM_REDISTRIBUTOR_REGIONS DT_PROP_OR(GIC_V3_NODE, redistributor_regions, 1)
 
-#define GIC_REG_REGION(idx, node_id)				\
-	{							\
-		.base = DT_REG_ADDR_BY_IDX(node_id, idx),	\
-		.size = DT_REG_SIZE_BY_IDX(node_id, idx),	\
+#define GIC_REG_REGION(idx, node_id)                                                               \
+	{                                                                                          \
+		.base = DT_REG_ADDR_BY_IDX(node_id, idx),                                          \
+		.size = DT_REG_SIZE_BY_IDX(node_id, idx),                                          \
 	}
 
 /*
@@ -44,17 +44,15 @@ struct gic_reg_region {
  * GIC register regions info table
  */
 static struct gic_reg_region gic_reg_regions[] = {
-	LISTIFY(DT_NUM_REGS(GIC_V3_NODE), GIC_REG_REGION, (,), GIC_V3_NODE)
-};
-
+	LISTIFY(DT_NUM_REGS(GIC_V3_NODE), GIC_REG_REGION, (,), GIC_V3_NODE) };
 
 /* Redistributor base addresses for each core */
 mem_addr_t gic_rdists[CONFIG_MP_MAX_NUM_CPUS];
 
 #if defined(CONFIG_ARMV8_A_NS) || defined(CONFIG_GIC_SINGLE_SECURITY_STATE)
-#define IGROUPR_VAL	0xFFFFFFFFU
+#define IGROUPR_VAL 0xFFFFFFFFU
 #else
-#define IGROUPR_VAL	0x0U
+#define IGROUPR_VAL 0x0U
 #endif
 
 /*
@@ -62,10 +60,10 @@ mem_addr_t gic_rdists[CONFIG_MP_MAX_NUM_CPUS];
  * deal with (one configuration byte per interrupt). PENDBASE has to
  * be 64kB aligned (one bit per LPI, plus 8192 bits for SPI/PPI/SGI).
  */
-#define ITS_MAX_LPI_NRBITS	16 /* 64K LPIs */
+#define ITS_MAX_LPI_NRBITS 16 /* 64K LPIs */
 
-#define LPI_PROPBASE_SZ(nrbits)	ROUND_UP(BIT(nrbits), KB(64))
-#define LPI_PENDBASE_SZ(nrbits)	ROUND_UP(BIT(nrbits) / 8, KB(64))
+#define LPI_PROPBASE_SZ(nrbits) ROUND_UP(BIT(nrbits), KB(64))
+#define LPI_PENDBASE_SZ(nrbits) ROUND_UP(BIT(nrbits) / 8, KB(64))
 
 #ifdef CONFIG_GIC_V3_ITS
 static uintptr_t lpi_prop_table;
@@ -141,7 +139,13 @@ static bool arm_gic_lpi_is_enabled(unsigned int intid)
 #if defined(CONFIG_ARMV8_A_NS) || defined(CONFIG_GIC_SINGLE_SECURITY_STATE)
 static inline void arm_gic_write_irouter(uint64_t val, unsigned int intid)
 {
-	mem_addr_t addr = IROUTER(GET_DIST_BASE(intid), intid);
+	mem_addr_t addr;
+
+	if (GIC_IS_ESPI(intid)) {
+		addr = IROUTERnE(GET_DIST_BASE(intid), intid - GIC_ESPI_START);
+	} else {
+		addr = IROUTER(GET_DIST_BASE(intid), intid);
+	}
 
 #ifdef CONFIG_ARM
 	sys_write32((uint32_t)val, addr);
@@ -152,8 +156,7 @@ static inline void arm_gic_write_irouter(uint64_t val, unsigned int intid)
 }
 #endif
 
-void arm_gic_irq_set_priority(unsigned int intid,
-			      unsigned int prio, uint32_t flags)
+void arm_gic_irq_set_priority(unsigned int intid, unsigned int prio, uint32_t flags)
 {
 #ifdef CONFIG_GIC_V3_ITS
 	if (intid >= 8192) {
@@ -162,29 +165,45 @@ void arm_gic_irq_set_priority(unsigned int intid,
 	}
 #endif
 	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_INTR_PER_REG)
+					  : (intid / GIC_NUM_INTR_PER_REG);
 	uint32_t shift;
 	uint32_t val;
 	mem_addr_t base = GET_DIST_BASE(intid);
 
 	/* Disable the interrupt */
-	sys_write32(mask, ICENABLER(base, idx));
+	if (GIC_IS_ESPI(intid)) {
+		sys_write32(mask, ICENABLERnE(base, idx));
+	} else {
+		sys_write32(mask, ICENABLER(base, idx));
+	}
+
 	gic_wait_rwp(intid);
 
 	/* PRIORITYR registers provide byte access */
-	sys_write8(prio & GIC_PRI_MASK, IPRIORITYR(base, intid));
+	if (GIC_IS_ESPI(intid)) {
+		sys_write8(prio & GIC_PRI_MASK, IPRIORITYRnE(base, intid - GIC_ESPI_START));
+	} else {
+		sys_write8(prio & GIC_PRI_MASK, IPRIORITYR(base, intid));
+	}
 
 	/* Interrupt type config */
 	if (!GIC_IS_SGI(intid)) {
-		idx = intid / GIC_NUM_CFG_PER_REG;
+		idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_CFG_PER_REG)
+					 : (intid / GIC_NUM_CFG_PER_REG);
 		shift = (intid & (GIC_NUM_CFG_PER_REG - 1)) * 2;
 
-		val = sys_read32(ICFGR(base, idx));
+		val = GIC_IS_ESPI(intid) ? sys_read32(ICFGRnE(base, idx))
+					 : sys_read32(ICFGR(base, idx));
 		val &= ~(GICD_ICFGR_MASK << shift);
 		if (flags & IRQ_TYPE_EDGE) {
 			val |= (GICD_ICFGR_TYPE << shift);
 		}
-		sys_write32(val, ICFGR(base, idx));
+		if (GIC_IS_ESPI(intid)) {
+			sys_write32(val, ICFGRnE(base, idx));
+		} else {
+			sys_write32(val, ICFGR(base, idx));
+		}
 	}
 }
 
@@ -197,7 +216,8 @@ void arm_gic_irq_enable(unsigned int intid)
 	}
 #endif
 	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_INTR_PER_REG)
+					  : (intid / GIC_NUM_INTR_PER_REG);
 
 #if defined(CONFIG_ARMV8_A_NS) || defined(CONFIG_GIC_SINGLE_SECURITY_STATE)
 	/*
@@ -205,12 +225,16 @@ void arm_gic_irq_enable(unsigned int intid)
 	 * is set to '1') and for GIC single security state (GICD_CTRL.ARE is set to '1'),
 	 * so need to set SPI's affinity, now set it to be the PE on which it is enabled.
 	 */
-	if (GIC_IS_SPI(intid)) {
+	if (GIC_IS_SPI(intid) || GIC_IS_ESPI(intid)) {
 		arm_gic_write_irouter(MPIDR_TO_CORE(GET_MPIDR()), intid);
 	}
 #endif
 
-	sys_write32(mask, ISENABLER(GET_DIST_BASE(intid), idx));
+	if (GIC_IS_ESPI(intid)) {
+		sys_write32(mask, ISENABLERnE(GET_DIST_BASE(intid), idx));
+	} else {
+		sys_write32(mask, ISENABLER(GET_DIST_BASE(intid), idx));
+	}
 }
 
 void arm_gic_irq_disable(unsigned int intid)
@@ -222,9 +246,15 @@ void arm_gic_irq_disable(unsigned int intid)
 	}
 #endif
 	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_INTR_PER_REG)
+					  : (intid / GIC_NUM_INTR_PER_REG);
+
+	if (GIC_IS_ESPI(intid)) {
+		sys_write32(mask, ICENABLERnE(GET_DIST_BASE(intid), idx));
+	} else {
+		sys_write32(mask, ICENABLER(GET_DIST_BASE(intid), idx));
+	}
 
-	sys_write32(mask, ICENABLER(GET_DIST_BASE(intid), idx));
 	/* poll to ensure write is complete */
 	gic_wait_rwp(intid);
 }
@@ -237,10 +267,12 @@ bool arm_gic_irq_is_enabled(unsigned int intid)
 	}
 #endif
 	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_INTR_PER_REG)
+					  : (intid / GIC_NUM_INTR_PER_REG);
 	uint32_t val;
 
-	val = sys_read32(ISENABLER(GET_DIST_BASE(intid), idx));
+	val = GIC_IS_ESPI(intid) ? sys_read32(ISENABLERnE(GET_DIST_BASE(intid), idx))
+				 : sys_read32(ISENABLER(GET_DIST_BASE(intid), idx));
 
 	return (val & mask) != 0;
 }
@@ -248,10 +280,12 @@ bool arm_gic_irq_is_enabled(unsigned int intid)
 bool arm_gic_irq_is_pending(unsigned int intid)
 {
 	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_INTR_PER_REG)
+					  : (intid / GIC_NUM_INTR_PER_REG);
 	uint32_t val;
 
-	val = sys_read32(ISPENDR(GET_DIST_BASE(intid), idx));
+	val = GIC_IS_ESPI(intid) ? sys_read32(ISPENDRnE(GET_DIST_BASE(intid), idx))
+				 : sys_read32(ISPENDR(GET_DIST_BASE(intid), idx));
 
 	return (val & mask) != 0;
 }
@@ -259,17 +293,27 @@ bool arm_gic_irq_is_pending(unsigned int intid)
 void arm_gic_irq_set_pending(unsigned int intid)
 {
 	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_INTR_PER_REG)
+					  : (intid / GIC_NUM_INTR_PER_REG);
 
-	sys_write32(mask, ISPENDR(GET_DIST_BASE(intid), idx));
+	if (GIC_IS_ESPI(intid)) {
+		sys_write32(mask, ISPENDRnE(GET_DIST_BASE(intid), idx));
+	} else {
+		sys_write32(mask, ISPENDR(GET_DIST_BASE(intid), idx));
+	}
 }
 
 void arm_gic_irq_clear_pending(unsigned int intid)
 {
 	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t idx = GIC_IS_ESPI(intid) ? ((intid - GIC_ESPI_START) / GIC_NUM_INTR_PER_REG)
+					  : (intid / GIC_NUM_INTR_PER_REG);
 
-	sys_write32(mask, ICPENDR(GET_DIST_BASE(intid), idx));
+	if (GIC_IS_ESPI(intid)) {
+		sys_write32(mask, ICPENDRnE(GET_DIST_BASE(intid), idx));
+	} else {
+		sys_write32(mask, ICPENDR(GET_DIST_BASE(intid), idx));
+	}
 }
 
 unsigned int arm_gic_get_active(void)
@@ -301,8 +345,7 @@ void arm_gic_eoi(unsigned int intid)
 	write_sysreg(intid, ICC_EOIR1_EL1);
 }
 
-void gic_raise_sgi(unsigned int sgi_id, uint64_t target_aff,
-		   uint16_t target_list)
+void gic_raise_sgi(unsigned int sgi_id, uint64_t target_aff, uint16_t target_list)
 {
 	uint32_t aff3, aff2, aff1;
 	uint64_t sgi_val;
@@ -318,8 +361,7 @@ void gic_raise_sgi(unsigned int sgi_id, uint64_t target_aff,
 #else
 	aff3 = MPIDR_AFFLVL(target_aff, 3);
 #endif
-	sgi_val = GICV3_SGIR_VALUE(aff3, aff2, aff1, sgi_id,
-				   SGIR_IRM_TO_AFF, target_list);
+	sgi_val = GICV3_SGIR_VALUE(aff3, aff2, aff1, sgi_id, SGIR_IRM_TO_AFF, target_list);
 
 	barrier_dsync_fence_full();
 	write_sysreg(sgi_val, ICC_SGI1R);
@@ -361,8 +403,8 @@ static void gicv3_rdist_enable(mem_addr_t rdist)
  */
 static void gicv3_rdist_setup_lpis(mem_addr_t rdist)
 {
-	unsigned int lpi_id_bits = MIN(GICD_TYPER_IDBITS(sys_read32(GICD_TYPER)),
-				       ITS_MAX_LPI_NRBITS);
+	unsigned int lpi_id_bits =
+		MIN(GICD_TYPER_IDBITS(sys_read32(GICD_TYPER)), ITS_MAX_LPI_NRBITS);
 	uintptr_t lpi_pend_table;
 	uint64_t reg;
 	uint32_t ctlr;
@@ -393,8 +435,7 @@ static void gicv3_rdist_setup_lpis(mem_addr_t rdist)
 	reg = (GIC_BASER_SHARE_INNER << GITR_PENDBASER_SHAREABILITY_SHIFT) |
 	      (GIC_BASER_CACHE_RAWAWB << GITR_PENDBASER_INNER_CACHE_SHIFT) |
 	      (lpi_pend_table & (GITR_PENDBASER_ADDR_MASK << GITR_PENDBASER_ADDR_SHIFT)) |
-	      (GIC_BASER_CACHE_INNERLIKE << GITR_PENDBASER_OUTER_CACHE_SHIFT) |
-	      GITR_PENDBASER_PTZ;
+	      (GIC_BASER_CACHE_INNERLIKE << GITR_PENDBASER_OUTER_CACHE_SHIFT) | GITR_PENDBASER_PTZ;
 	sys_write64(reg, rdist + GICR_PENDBASER);
 	/* TOFIX: check SHAREABILITY validity */
 
@@ -434,8 +475,7 @@ static void gicv3_cpuif_init(void)
 	/*
 	 * Configure default priorities for SGI 0:15 and PPI 0:15.
 	 */
-	for (intid = 0; intid < GIC_SPI_INT_BASE;
-	     intid += GIC_NUM_PRI_PER_REG) {
+	for (intid = 0; intid < GIC_SPI_INT_BASE; intid += GIC_NUM_PRI_PER_REG) {
 		sys_write32(GIC_INT_DEF_PRI_X4, IPRIORITYR(base, intid));
 	}
 
@@ -451,8 +491,8 @@ static void gicv3_cpuif_init(void)
 	icc_sre = read_sysreg(ICC_SRE_EL1);
 
 	if (!(icc_sre & ICC_SRE_ELx_SRE_BIT)) {
-		icc_sre = (icc_sre | ICC_SRE_ELx_SRE_BIT |
-			   ICC_SRE_ELx_DIB_BIT | ICC_SRE_ELx_DFB_BIT);
+		icc_sre =
+			(icc_sre | ICC_SRE_ELx_SRE_BIT | ICC_SRE_ELx_DIB_BIT | ICC_SRE_ELx_DFB_BIT);
 		write_sysreg(icc_sre, ICC_SRE_EL1);
 		icc_sre = read_sysreg(ICC_SRE_EL1);
 
@@ -470,7 +510,7 @@ static void gicv3_cpuif_init(void)
  */
 static void gicv3_dist_init(void)
 {
-	unsigned int num_ints;
+	unsigned int num_ints, num_espi;
 	unsigned int intid;
 	unsigned int idx;
 	mem_addr_t base = GIC_DIST_BASE;
@@ -487,6 +527,7 @@ static void gicv3_dist_init(void)
 #endif
 
 	num_ints = sys_read32(GICD_TYPER);
+	num_espi = (num_ints & GICD_TYPER_ESPI_MASK) ? ((num_ints >> 27) + 1) * 32 : 0;
 	num_ints &= GICD_TYPER_ITLINESNUM_MASK;
 	num_ints = (num_ints + 1) << 5;
 
@@ -501,46 +542,63 @@ static void gicv3_dist_init(void)
 	 */
 	sys_set_bit(GICD_CTLR, GICD_CTRL_NS);
 	__ASSERT(sys_test_bit(GICD_CTLR, GICD_CTRL_NS),
-		"Current GIC does not support single security state");
+		 "Current GIC does not support single security state");
 #endif
 
 	/*
 	 * Default configuration of all SPIs
 	 */
-	for (intid = GIC_SPI_INT_BASE; intid < num_ints;
-	     intid += GIC_NUM_INTR_PER_REG) {
+	for (intid = GIC_SPI_INT_BASE; intid < num_ints; intid += GIC_NUM_INTR_PER_REG) {
 		idx = intid / GIC_NUM_INTR_PER_REG;
 		/* Disable interrupt */
-		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG),
-			    ICENABLER(base, idx));
+		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG), ICENABLER(base, idx));
 		/* Clear pending */
-		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG),
-			    ICPENDR(base, idx));
+		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG), ICPENDR(base, idx));
 		sys_write32(IGROUPR_VAL, IGROUPR(base, idx));
-		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG),
-			    IGROUPMODR(base, idx));
+		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG), IGROUPMODR(base, idx));
+	}
 
+	/*
+	 * Default configuration of all ESPIs
+	 */
+	for (intid = 0; intid < num_espi; intid += GIC_NUM_INTR_PER_REG) {
+		idx = intid / GIC_NUM_INTR_PER_REG;
+		/* Disable interrupt */
+		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG), ICENABLERnE(base, idx));
+		/* Clear pending */
+		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG), ICPENDRnE(base, idx));
+		sys_write32(IGROUPR_VAL, IGROUPRnE(base, idx));
+		sys_write32(BIT64_MASK(GIC_NUM_INTR_PER_REG), IGROUPMODRnE(base, idx));
 	}
+
 	/* wait for rwp on GICD */
 	gic_wait_rwp(GIC_SPI_INT_BASE);
 
 	/* Configure default priorities for all SPIs. */
-	for (intid = GIC_SPI_INT_BASE; intid < num_ints;
-	     intid += GIC_NUM_PRI_PER_REG) {
+	for (intid = GIC_SPI_INT_BASE; intid < num_ints; intid += GIC_NUM_PRI_PER_REG) {
 		sys_write32(GIC_INT_DEF_PRI_X4, IPRIORITYR(base, intid));
 	}
 
+	/* Configure default priorities for all ESPIs. */
+	for (intid = 0; intid < num_espi; intid += GIC_NUM_PRI_PER_REG) {
+		sys_write32(GIC_INT_DEF_PRI_X4, IPRIORITYRnE(base, intid));
+	}
+
 	/* Configure all SPIs as active low, level triggered by default */
-	for (intid = GIC_SPI_INT_BASE; intid < num_ints;
-	     intid += GIC_NUM_CFG_PER_REG) {
+	for (intid = GIC_SPI_INT_BASE; intid < num_ints; intid += GIC_NUM_CFG_PER_REG) {
 		idx = intid / GIC_NUM_CFG_PER_REG;
 		sys_write32(0, ICFGR(base, idx));
 	}
 
+	/* Configure all ESPIs as active low, level triggered by default */
+	for (intid = 0; intid < num_espi; intid += GIC_NUM_CFG_PER_REG) {
+		idx = intid / GIC_NUM_CFG_PER_REG;
+		sys_write32(0, ICFGRnE(base, idx));
+	}
+
 #ifdef CONFIG_ARMV8_A_NS
 	/* Enable distributor with ARE */
-	sys_write32(BIT(GICD_CTRL_ARE_NS) | BIT(GICD_CTLR_ENABLE_G1NS),
-		    GICD_CTLR);
+	sys_write32(BIT(GICD_CTRL_ARE_NS) | BIT(GICD_CTLR_ENABLE_G1NS), GICD_CTLR);
 #elif defined(CONFIG_GIC_SINGLE_SECURITY_STATE)
 	/*
 	 * For GIC single security state, the config GIC_SINGLE_SECURITY_STATE
@@ -552,8 +610,7 @@ static void gicv3_dist_init(void)
 	 * similarly the GICD_CTLR_ENABLE_G1 and GICD_CTLR_ENABLE_G1NS share
 	 * BIT(1), we can reuse them.
 	 */
-	sys_write32(BIT(GICD_CTRL_ARE_S) | BIT(GICD_CTLR_ENABLE_G1NS),
-		    GICD_CTLR);
+	sys_write32(BIT(GICD_CTRL_ARE_S) | BIT(GICD_CTLR_ENABLE_G1NS), GICD_CTLR);
 #else
 	/* enable Group 1 secure interrupts */
 	sys_set_bit(GICD_CTLR, GICD_CTLR_ENABLE_G1S);
@@ -668,8 +725,8 @@ int arm_gic_init(const struct device *dev)
 
 	return 0;
 }
-DEVICE_DT_INST_DEFINE(0, arm_gic_init, NULL, NULL, NULL,
-		      PRE_KERNEL_1, CONFIG_INTC_INIT_PRIORITY, NULL);
+DEVICE_DT_INST_DEFINE(0, arm_gic_init, NULL, NULL, NULL, PRE_KERNEL_1, CONFIG_INTC_INIT_PRIORITY,
+		      NULL);
 
 #ifdef CONFIG_SMP
 void arm_gic_secondary_init(void)
diff --git a/drivers/interrupt_controller/intc_gicv3_priv.h b/drivers/interrupt_controller/intc_gicv3_priv.h
index 30c7a6fa84ddd..4beda8c0496d9 100644
--- a/drivers/interrupt_controller/intc_gicv3_priv.h
+++ b/drivers/interrupt_controller/intc_gicv3_priv.h
@@ -13,263 +13,267 @@
 #include <zephyr/sys/atomic.h>
 
 /* Cache and Share ability for ITS & Redistributor LPI state tables */
-#define GIC_BASER_CACHE_NGNRNE		0x0UL /* Device-nGnRnE */
-#define GIC_BASER_CACHE_INNERLIKE	0x0UL /* Same as Inner Cacheability. */
-#define GIC_BASER_CACHE_NCACHEABLE	0x1UL /* Non-cacheable */
-#define GIC_BASER_CACHE_RAWT		0x2UL /* Cacheable R-allocate, W-through */
-#define GIC_BASER_CACHE_RAWB		0x3UL /* Cacheable R-allocate, W-back */
-#define GIC_BASER_CACHE_WAWT		0x4UL /* Cacheable W-allocate, W-through */
-#define GIC_BASER_CACHE_WAWB		0x5UL /* Cacheable W-allocate, W-back */
-#define GIC_BASER_CACHE_RAWAWT		0x6UL /* Cacheable R-allocate, W-allocate, W-through */
-#define GIC_BASER_CACHE_RAWAWB		0x7UL /* Cacheable R-allocate, W-allocate, W-back */
-#define GIC_BASER_SHARE_NO		0x0UL /* Non-shareable */
-#define GIC_BASER_SHARE_INNER		0x1UL /* Inner Shareable */
-#define GIC_BASER_SHARE_OUTER		0x2UL /* Outer Shareable */
+#define GIC_BASER_CACHE_NGNRNE     0x0UL /* Device-nGnRnE */
+#define GIC_BASER_CACHE_INNERLIKE  0x0UL /* Same as Inner Cacheability. */
+#define GIC_BASER_CACHE_NCACHEABLE 0x1UL /* Non-cacheable */
+#define GIC_BASER_CACHE_RAWT       0x2UL /* Cacheable R-allocate, W-through */
+#define GIC_BASER_CACHE_RAWB       0x3UL /* Cacheable R-allocate, W-back */
+#define GIC_BASER_CACHE_WAWT       0x4UL /* Cacheable W-allocate, W-through */
+#define GIC_BASER_CACHE_WAWB       0x5UL /* Cacheable W-allocate, W-back */
+#define GIC_BASER_CACHE_RAWAWT     0x6UL /* Cacheable R-allocate, W-allocate, W-through */
+#define GIC_BASER_CACHE_RAWAWB     0x7UL /* Cacheable R-allocate, W-allocate, W-back */
+#define GIC_BASER_SHARE_NO         0x0UL /* Non-shareable */
+#define GIC_BASER_SHARE_INNER      0x1UL /* Inner Shareable */
+#define GIC_BASER_SHARE_OUTER      0x2UL /* Outer Shareable */
 
 /* SGI base is at 64K offset from Redistributor */
-#define GICR_SGI_BASE_OFF		0x10000
+#define GICR_SGI_BASE_OFF 0x10000
 
 /* GICR registers offset from RD_base(n) */
-#define GICR_CTLR			0x0000
-#define GICR_IIDR			0x0004
-#define GICR_TYPER			0x0008
-#define GICR_STATUSR			0x0010
-#define GICR_WAKER			0x0014
-#define GICR_PWRR			0x0024
-#define GICR_PROPBASER			0x0070
-#define GICR_PENDBASER			0x0078
+#define GICR_CTLR      0x0000
+#define GICR_IIDR      0x0004
+#define GICR_TYPER     0x0008
+#define GICR_STATUSR   0x0010
+#define GICR_WAKER     0x0014
+#define GICR_PWRR      0x0024
+#define GICR_PROPBASER 0x0070
+#define GICR_PENDBASER 0x0078
 
 /* Register bit definitions */
 
 /* GICD_CTLR Interrupt group definitions */
-#define GICD_CTLR_ENABLE_G0		0
-#define GICD_CTLR_ENABLE_G1NS		1
-#define GICD_CTLR_ENABLE_G1S		2
-#define GICD_CTRL_ARE_S			4
-#define GICD_CTRL_ARE_NS		5
-#define GICD_CTRL_NS			6
-#define GICD_CGRL_E1NWF			7
+#define GICD_CTLR_ENABLE_G0   0
+#define GICD_CTLR_ENABLE_G1NS 1
+#define GICD_CTLR_ENABLE_G1S  2
+#define GICD_CTRL_ARE_S       4
+#define GICD_CTRL_ARE_NS      5
+#define GICD_CTRL_NS          6
+#define GICD_CGRL_E1NWF       7
 
 /* GICD_CTLR Register write progress bit */
-#define GICD_CTLR_RWP			31
+#define GICD_CTLR_RWP 31
 
 /* GICR_CTLR */
-#define GICR_CTLR_ENABLE_LPIS		BIT(0)
-#define GICR_CTLR_RWP			3
+#define GICR_CTLR_ENABLE_LPIS BIT(0)
+#define GICR_CTLR_RWP         3
 
 /* GICR_IIDR */
-#define GICR_IIDR_PRODUCT_ID_SHIFT		24
-#define GICR_IIDR_PRODUCT_ID_MASK		0xFFUL
-#define GICR_IIDR_PRODUCT_ID_GET(_val)		MASK_GET(_val, GICR_IIDR_PRODUCT_ID)
+#define GICR_IIDR_PRODUCT_ID_SHIFT     24
+#define GICR_IIDR_PRODUCT_ID_MASK      0xFFUL
+#define GICR_IIDR_PRODUCT_ID_GET(_val) MASK_GET(_val, GICR_IIDR_PRODUCT_ID)
 
 /* GICR_TYPER */
-#define GICR_TYPER_AFFINITY_VALUE_SHIFT		32
-#define GICR_TYPER_AFFINITY_VALUE_MASK		0xFFFFFFFFUL
-#define GICR_TYPER_AFFINITY_VALUE_GET(_val)	MASK_GET(_val, GICR_TYPER_AFFINITY_VALUE)
-#define GICR_TYPER_LAST_SHIFT			4
-#define GICR_TYPER_LAST_MASK			0x1UL
-#define GICR_TYPER_LAST_GET(_val)		MASK_GET(_val, GICR_TYPER_LAST)
-#define GICR_TYPER_PROCESSOR_NUMBER_SHIFT	8
-#define GICR_TYPER_PROCESSOR_NUMBER_MASK	0xFFFFUL
-#define GICR_TYPER_PROCESSOR_NUMBER_GET(_val)	MASK_GET(_val, GICR_TYPER_PROCESSOR_NUMBER)
+#define GICR_TYPER_AFFINITY_VALUE_SHIFT       32
+#define GICR_TYPER_AFFINITY_VALUE_MASK        0xFFFFFFFFUL
+#define GICR_TYPER_AFFINITY_VALUE_GET(_val)   MASK_GET(_val, GICR_TYPER_AFFINITY_VALUE)
+#define GICR_TYPER_LAST_SHIFT                 4
+#define GICR_TYPER_LAST_MASK                  0x1UL
+#define GICR_TYPER_LAST_GET(_val)             MASK_GET(_val, GICR_TYPER_LAST)
+#define GICR_TYPER_PROCESSOR_NUMBER_SHIFT     8
+#define GICR_TYPER_PROCESSOR_NUMBER_MASK      0xFFFFUL
+#define GICR_TYPER_PROCESSOR_NUMBER_GET(_val) MASK_GET(_val, GICR_TYPER_PROCESSOR_NUMBER)
 
 /* GICR_WAKER */
-#define GICR_WAKER_PS			1
-#define GICR_WAKER_CA			2
+#define GICR_WAKER_PS 1
+#define GICR_WAKER_CA 2
 
 /* GICR_PWRR */
-#define GICR_PWRR_RDPD			0
-#define GICR_PWRR_RDAG			1
-#define GICR_PWRR_RDGPO			3
+#define GICR_PWRR_RDPD  0
+#define GICR_PWRR_RDAG  1
+#define GICR_PWRR_RDGPO 3
 
 /* GICR_PROPBASER */
-#define GITR_PROPBASER_ID_BITS_MASK		0x1fUL
-#define GITR_PROPBASER_INNER_CACHE_SHIFT	7
-#define GITR_PROPBASER_INNER_CACHE_MASK		0x7UL
-#define GITR_PROPBASER_SHAREABILITY_SHIFT	10
-#define GITR_PROPBASER_SHAREABILITY_MASK	0x3UL
-#define GITR_PROPBASER_ADDR_SHIFT		12
-#define GITR_PROPBASER_ADDR_MASK		0xFFFFFFFFFFUL
-#define GITR_PROPBASER_OUTER_CACHE_SHIFT	56
-#define GITR_PROPBASER_OUTER_CACHE_MASK		0x7UL
+#define GITR_PROPBASER_ID_BITS_MASK       0x1fUL
+#define GITR_PROPBASER_INNER_CACHE_SHIFT  7
+#define GITR_PROPBASER_INNER_CACHE_MASK   0x7UL
+#define GITR_PROPBASER_SHAREABILITY_SHIFT 10
+#define GITR_PROPBASER_SHAREABILITY_MASK  0x3UL
+#define GITR_PROPBASER_ADDR_SHIFT         12
+#define GITR_PROPBASER_ADDR_MASK          0xFFFFFFFFFFUL
+#define GITR_PROPBASER_OUTER_CACHE_SHIFT  56
+#define GITR_PROPBASER_OUTER_CACHE_MASK   0x7UL
 
 /* GICR_PENDBASER */
-#define GITR_PENDBASER_INNER_CACHE_SHIFT	7
-#define GITR_PENDBASER_INNER_CACHE_MASK		0x7UL
-#define GITR_PENDBASER_SHAREABILITY_SHIFT	10
-#define GITR_PENDBASER_SHAREABILITY_MASK	0x3UL
-#define GITR_PENDBASER_ADDR_SHIFT		16
-#define GITR_PENDBASER_ADDR_MASK		0xFFFFFFFFFUL
-#define GITR_PENDBASER_OUTER_CACHE_SHIFT	56
-#define GITR_PENDBASER_OUTER_CACHE_MASK		0x7UL
-#define GITR_PENDBASER_PTZ			BIT64(62)
-
-/* GITCD_IROUTER */
-#define GIC_DIST_IROUTER		0x6000
-#define IROUTER(base, n)		(base + GIC_DIST_IROUTER + (n) * 8)
+#define GITR_PENDBASER_INNER_CACHE_SHIFT  7
+#define GITR_PENDBASER_INNER_CACHE_MASK   0x7UL
+#define GITR_PENDBASER_SHAREABILITY_SHIFT 10
+#define GITR_PENDBASER_SHAREABILITY_MASK  0x3UL
+#define GITR_PENDBASER_ADDR_SHIFT         16
+#define GITR_PENDBASER_ADDR_MASK          0xFFFFFFFFFUL
+#define GITR_PENDBASER_OUTER_CACHE_SHIFT  56
+#define GITR_PENDBASER_OUTER_CACHE_MASK   0x7UL
+#define GITR_PENDBASER_PTZ                BIT64(62)
+
+/* GICD_IROUTER */
+#define GIC_DIST_IROUTER 0x6000
+#define IROUTER(base, n) (base + GIC_DIST_IROUTER + (n) * 8)
+
+/* GICD_IROUTERnE for GICv3.1 Extended SPI Range */
+#define GIC_DIST_IROUTERnE 0x8000
+#define IROUTERnE(base, n) (base + GIC_DIST_IROUTERnE + (n) * 8)
 
 /*
  * ITS registers, offsets from ITS_base
  */
-#define GITS_CTLR				0x0000
-#define GITS_IIDR				0x0004
-#define GITS_TYPER				0x0008
-#define GITS_STATUSR				0x0040
-#define GITS_UMSIR				0x0048
-#define GITS_CBASER				0x0080
-#define GITS_CWRITER				0x0088
-#define GITS_CREADR				0x0090
-#define GITS_BASER(n)				(0x0100 + ((n) * 8))
-
-#define GITS_TRANSLATER				0x10040
+#define GITS_CTLR     0x0000
+#define GITS_IIDR     0x0004
+#define GITS_TYPER    0x0008
+#define GITS_STATUSR  0x0040
+#define GITS_UMSIR    0x0048
+#define GITS_CBASER   0x0080
+#define GITS_CWRITER  0x0088
+#define GITS_CREADR   0x0090
+#define GITS_BASER(n) (0x0100 + ((n) * 8))
+
+#define GITS_TRANSLATER 0x10040
 
 /* ITS CTLR register */
-#define GITS_CTLR_ENABLED_SHIFT			0
-#define GITS_CTLR_ENABLED_MASK			0x1UL
-#define GITS_CTLR_ITS_NUMBER_SHIFT		4
-#define GITS_CTLR_ITS_NUMBER_MASK		0xfUL
-#define GITS_CTLR_QUIESCENT_SHIFT		31
-#define GITS_CTLR_QUIESCENT_MASK		0x1UL
+#define GITS_CTLR_ENABLED_SHIFT    0
+#define GITS_CTLR_ENABLED_MASK     0x1UL
+#define GITS_CTLR_ITS_NUMBER_SHIFT 4
+#define GITS_CTLR_ITS_NUMBER_MASK  0xfUL
+#define GITS_CTLR_QUIESCENT_SHIFT  31
+#define GITS_CTLR_QUIESCENT_MASK   0x1UL
 
-#define GITS_CTLR_ENABLED_GET(_val)		MASK_GET(_val, GITS_CTLR_ENABLED)
-#define GITS_CTLR_QUIESCENT_GET(_val)		MASK_GET(_val, GITS_CTLR_QUIESCENT)
+#define GITS_CTLR_ENABLED_GET(_val)   MASK_GET(_val, GITS_CTLR_ENABLED)
+#define GITS_CTLR_QUIESCENT_GET(_val) MASK_GET(_val, GITS_CTLR_QUIESCENT)
 
 /* ITS TYPER register */
-#define GITS_TYPER_PHY_SHIFT			0
-#define GITS_TYPER_PHY_MASK			0x1UL
-#define GITS_TYPER_VIRT_SHIFT			1
-#define GITS_TYPER_VIRT_MASK			0x1UL
-#define GITS_TYPER_ITT_ENTRY_SIZE_SHIFT		4
-#define GITS_TYPER_ITT_ENTRY_SIZE_MASK		0xfUL
-#define GITS_TYPER_IDBITS_SHIFT			8
-#define GITS_TYPER_IDBITS_MASK			0x1fUL
-#define GITS_TYPER_DEVBITS_SHIFT		13
-#define GITS_TYPER_DEVBITS_MASK			0x1fUL
-#define GITS_TYPER_SEIS_SHIFT			18
-#define GITS_TYPER_SEIS_MASK			0x1UL
-#define GITS_TYPER_PTA_SHIFT			19
-#define GITS_TYPER_PTA_MASK			0x1UL
-#define GITS_TYPER_HCC_SHIFT			24
-#define GITS_TYPER_HCC_MASK			0xffUL
-#define GITS_TYPER_CIDBITS_SHIFT		32
-#define GITS_TYPER_CIDBITS_MASK			0xfUL
-#define GITS_TYPER_CIL_SHIFT			36
-#define GITS_TYPER_CIL_MASK			0x1UL
-
-#define GITS_TYPER_ITT_ENTRY_SIZE_GET(_val)	MASK_GET(_val, GITS_TYPER_ITT_ENTRY_SIZE)
-#define GITS_TYPER_PTA_GET(_val)		MASK_GET(_val, GITS_TYPER_PTA)
-#define GITS_TYPER_HCC_GET(_val)		MASK_GET(_val, GITS_TYPER_HCC)
-#define GITS_TYPER_DEVBITS_GET(_val)		MASK_GET(_val, GITS_TYPER_DEVBITS)
+#define GITS_TYPER_PHY_SHIFT            0
+#define GITS_TYPER_PHY_MASK             0x1UL
+#define GITS_TYPER_VIRT_SHIFT           1
+#define GITS_TYPER_VIRT_MASK            0x1UL
+#define GITS_TYPER_ITT_ENTRY_SIZE_SHIFT 4
+#define GITS_TYPER_ITT_ENTRY_SIZE_MASK  0xfUL
+#define GITS_TYPER_IDBITS_SHIFT         8
+#define GITS_TYPER_IDBITS_MASK          0x1fUL
+#define GITS_TYPER_DEVBITS_SHIFT        13
+#define GITS_TYPER_DEVBITS_MASK         0x1fUL
+#define GITS_TYPER_SEIS_SHIFT           18
+#define GITS_TYPER_SEIS_MASK            0x1UL
+#define GITS_TYPER_PTA_SHIFT            19
+#define GITS_TYPER_PTA_MASK             0x1UL
+#define GITS_TYPER_HCC_SHIFT            24
+#define GITS_TYPER_HCC_MASK             0xffUL
+#define GITS_TYPER_CIDBITS_SHIFT        32
+#define GITS_TYPER_CIDBITS_MASK         0xfUL
+#define GITS_TYPER_CIL_SHIFT            36
+#define GITS_TYPER_CIL_MASK             0x1UL
+
+#define GITS_TYPER_ITT_ENTRY_SIZE_GET(_val) MASK_GET(_val, GITS_TYPER_ITT_ENTRY_SIZE)
+#define GITS_TYPER_PTA_GET(_val)            MASK_GET(_val, GITS_TYPER_PTA)
+#define GITS_TYPER_HCC_GET(_val)            MASK_GET(_val, GITS_TYPER_HCC)
+#define GITS_TYPER_DEVBITS_GET(_val)        MASK_GET(_val, GITS_TYPER_DEVBITS)
 
 /* ITS COMMON BASER / CBASER register */
 
 /* ITS CBASER register */
-#define GITS_CBASER_SIZE_SHIFT			0
-#define GITS_CBASER_SIZE_MASK			0xffUL
-#define GITS_CBASER_SHAREABILITY_SHIFT		10
-#define GITS_CBASER_SHAREABILITY_MASK		0x3UL
-#define GITS_CBASER_ADDR_SHIFT			12
-#define GITS_CBASER_ADDR_MASK			0xfffffffffUL
-#define GITS_CBASER_OUTER_CACHE_SHIFT		53
-#define GITS_CBASER_OUTER_CACHE_MASK		0x7UL
-#define GITS_CBASER_INNER_CACHE_SHIFT		59
-#define GITS_CBASER_INNER_CACHE_MASK		0x7UL
-#define GITS_CBASER_VALID_SHIFT			63
-#define GITS_CBASER_VALID_MASK			0x1UL
+#define GITS_CBASER_SIZE_SHIFT         0
+#define GITS_CBASER_SIZE_MASK          0xffUL
+#define GITS_CBASER_SHAREABILITY_SHIFT 10
+#define GITS_CBASER_SHAREABILITY_MASK  0x3UL
+#define GITS_CBASER_ADDR_SHIFT         12
+#define GITS_CBASER_ADDR_MASK          0xfffffffffUL
+#define GITS_CBASER_OUTER_CACHE_SHIFT  53
+#define GITS_CBASER_OUTER_CACHE_MASK   0x7UL
+#define GITS_CBASER_INNER_CACHE_SHIFT  59
+#define GITS_CBASER_INNER_CACHE_MASK   0x7UL
+#define GITS_CBASER_VALID_SHIFT        63
+#define GITS_CBASER_VALID_MASK         0x1UL
 
 /* ITS BASER<n> register */
-#define GITS_BASER_SIZE_SHIFT			0
-#define GITS_BASER_SIZE_MASK			0xffUL
-#define GITS_BASER_PAGE_SIZE_SHIFT		8
-#define GITS_BASER_PAGE_SIZE_MASK		0x3UL
-#define GITS_BASER_PAGE_SIZE_4K			0
-#define GITS_BASER_PAGE_SIZE_16K		1
-#define GITS_BASER_PAGE_SIZE_64K		2
-#define GITS_BASER_SHAREABILITY_SHIFT		10
-#define GITS_BASER_SHAREABILITY_MASK		0x3UL
-#define GITS_BASER_ADDR_SHIFT			12
-#define GITS_BASER_ADDR_MASK			0xfffffffff
-#define GITS_BASER_ENTRY_SIZE_SHIFT		48
-#define GITS_BASER_ENTRY_SIZE_MASK		0x1fUL
-#define GITS_BASER_OUTER_CACHE_SHIFT		53
-#define GITS_BASER_OUTER_CACHE_MASK		0x7UL
-#define GITS_BASER_TYPE_SHIFT			56
-#define GITS_BASER_TYPE_MASK			0x7UL
-#define GITS_BASER_INNER_CACHE_SHIFT		59
-#define GITS_BASER_INNER_CACHE_MASK		0x7UL
-#define GITS_BASER_INDIRECT_SHIFT		62
-#define GITS_BASER_INDIRECT_MASK		0x1UL
-#define GITS_BASER_VALID_SHIFT			63
-#define GITS_BASER_VALID_MASK			0x1UL
-
-#define GITS_BASER_TYPE_NONE			0
-#define GITS_BASER_TYPE_DEVICE			1
-#define GITS_BASER_TYPE_COLLECTION		4
-
-#define GITS_BASER_TYPE_GET(_val)		MASK_GET(_val, GITS_BASER_TYPE)
-#define GITS_BASER_PAGE_SIZE_GET(_val)		MASK_GET(_val, GITS_BASER_PAGE_SIZE)
-#define GITS_BASER_ENTRY_SIZE_GET(_val)		MASK_GET(_val, GITS_BASER_ENTRY_SIZE)
-#define GITS_BASER_INDIRECT_GET(_val)		MASK_GET(_val, GITS_BASER_INDIRECT)
-
-#define GITS_BASER_NR_REGS		8
+#define GITS_BASER_SIZE_SHIFT         0
+#define GITS_BASER_SIZE_MASK          0xffUL
+#define GITS_BASER_PAGE_SIZE_SHIFT    8
+#define GITS_BASER_PAGE_SIZE_MASK     0x3UL
+#define GITS_BASER_PAGE_SIZE_4K       0
+#define GITS_BASER_PAGE_SIZE_16K      1
+#define GITS_BASER_PAGE_SIZE_64K      2
+#define GITS_BASER_SHAREABILITY_SHIFT 10
+#define GITS_BASER_SHAREABILITY_MASK  0x3UL
+#define GITS_BASER_ADDR_SHIFT         12
+#define GITS_BASER_ADDR_MASK          0xfffffffff
+#define GITS_BASER_ENTRY_SIZE_SHIFT   48
+#define GITS_BASER_ENTRY_SIZE_MASK    0x1fUL
+#define GITS_BASER_OUTER_CACHE_SHIFT  53
+#define GITS_BASER_OUTER_CACHE_MASK   0x7UL
+#define GITS_BASER_TYPE_SHIFT         56
+#define GITS_BASER_TYPE_MASK          0x7UL
+#define GITS_BASER_INNER_CACHE_SHIFT  59
+#define GITS_BASER_INNER_CACHE_MASK   0x7UL
+#define GITS_BASER_INDIRECT_SHIFT     62
+#define GITS_BASER_INDIRECT_MASK      0x1UL
+#define GITS_BASER_VALID_SHIFT        63
+#define GITS_BASER_VALID_MASK         0x1UL
+
+#define GITS_BASER_TYPE_NONE       0
+#define GITS_BASER_TYPE_DEVICE     1
+#define GITS_BASER_TYPE_COLLECTION 4
+
+#define GITS_BASER_TYPE_GET(_val)       MASK_GET(_val, GITS_BASER_TYPE)
+#define GITS_BASER_PAGE_SIZE_GET(_val)  MASK_GET(_val, GITS_BASER_PAGE_SIZE)
+#define GITS_BASER_ENTRY_SIZE_GET(_val) MASK_GET(_val, GITS_BASER_ENTRY_SIZE)
+#define GITS_BASER_INDIRECT_GET(_val)   MASK_GET(_val, GITS_BASER_INDIRECT)
+
+#define GITS_BASER_NR_REGS 8
 
 /* ITS Commands */
 
-#define GITS_CMD_ID_MOVI			0x01
-#define GITS_CMD_ID_INT				0x03
-#define GITS_CMD_ID_CLEAR			0x04
-#define GITS_CMD_ID_SYNC			0x05
-#define GITS_CMD_ID_MAPD			0x08
-#define GITS_CMD_ID_MAPC			0x09
-#define GITS_CMD_ID_MAPTI			0x0a
-#define GITS_CMD_ID_MAPI			0x0b
-#define GITS_CMD_ID_INV				0x0c
-#define GITS_CMD_ID_INVALL			0x0d
-#define GITS_CMD_ID_MOVALL			0x0e
-#define GITS_CMD_ID_DISCARD			0x0f
-
-#define GITS_CMD_ID_OFFSET			0
-#define GITS_CMD_ID_SHIFT			0
-#define GITS_CMD_ID_MASK			0xffUL
-
-#define GITS_CMD_DEVICEID_OFFSET		0
-#define GITS_CMD_DEVICEID_SHIFT			32
-#define GITS_CMD_DEVICEID_MASK			0xffffffffUL
-
-#define GITS_CMD_SIZE_OFFSET			1
-#define GITS_CMD_SIZE_SHIFT			0
-#define GITS_CMD_SIZE_MASK			0x1fUL
-
-#define GITS_CMD_EVENTID_OFFSET			1
-#define GITS_CMD_EVENTID_SHIFT			0
-#define GITS_CMD_EVENTID_MASK			0xffffffffUL
-
-#define GITS_CMD_PINTID_OFFSET			1
-#define GITS_CMD_PINTID_SHIFT			32
-#define GITS_CMD_PINTID_MASK			0xffffffffUL
-
-#define GITS_CMD_ICID_OFFSET			2
-#define GITS_CMD_ICID_SHIFT			0
-#define GITS_CMD_ICID_MASK			0xffffUL
-
-#define GITS_CMD_ITTADDR_OFFSET			2
-#define GITS_CMD_ITTADDR_SHIFT			8
-#define GITS_CMD_ITTADDR_MASK			0xffffffffffUL
-#define GITS_CMD_ITTADDR_ALIGN			GITS_CMD_ITTADDR_SHIFT
-#define GITS_CMD_ITTADDR_ALIGN_SZ		(BIT(0) << GITS_CMD_ITTADDR_ALIGN)
-
-#define GITS_CMD_RDBASE_OFFSET			2
-#define GITS_CMD_RDBASE_SHIFT			16
-#define GITS_CMD_RDBASE_MASK			0xffffffffUL
-#define GITS_CMD_RDBASE_ALIGN			GITS_CMD_RDBASE_SHIFT
-
-#define GITS_CMD_VALID_OFFSET			2
-#define GITS_CMD_VALID_SHIFT			63
-#define GITS_CMD_VALID_MASK			0x1UL
-
-#define MASK(__basename)		(__basename##_MASK << __basename##_SHIFT)
-#define MASK_SET(__val, __basename)	(((__val) & __basename##_MASK) << __basename##_SHIFT)
-#define MASK_GET(__reg, __basename)	(((__reg) >> __basename##_SHIFT) & __basename##_MASK)
+#define GITS_CMD_ID_MOVI    0x01
+#define GITS_CMD_ID_INT     0x03
+#define GITS_CMD_ID_CLEAR   0x04
+#define GITS_CMD_ID_SYNC    0x05
+#define GITS_CMD_ID_MAPD    0x08
+#define GITS_CMD_ID_MAPC    0x09
+#define GITS_CMD_ID_MAPTI   0x0a
+#define GITS_CMD_ID_MAPI    0x0b
+#define GITS_CMD_ID_INV     0x0c
+#define GITS_CMD_ID_INVALL  0x0d
+#define GITS_CMD_ID_MOVALL  0x0e
+#define GITS_CMD_ID_DISCARD 0x0f
+
+#define GITS_CMD_ID_OFFSET 0
+#define GITS_CMD_ID_SHIFT  0
+#define GITS_CMD_ID_MASK   0xffUL
+
+#define GITS_CMD_DEVICEID_OFFSET 0
+#define GITS_CMD_DEVICEID_SHIFT  32
+#define GITS_CMD_DEVICEID_MASK   0xffffffffUL
+
+#define GITS_CMD_SIZE_OFFSET 1
+#define GITS_CMD_SIZE_SHIFT  0
+#define GITS_CMD_SIZE_MASK   0x1fUL
+
+#define GITS_CMD_EVENTID_OFFSET 1
+#define GITS_CMD_EVENTID_SHIFT  0
+#define GITS_CMD_EVENTID_MASK   0xffffffffUL
+
+#define GITS_CMD_PINTID_OFFSET 1
+#define GITS_CMD_PINTID_SHIFT  32
+#define GITS_CMD_PINTID_MASK   0xffffffffUL
+
+#define GITS_CMD_ICID_OFFSET 2
+#define GITS_CMD_ICID_SHIFT  0
+#define GITS_CMD_ICID_MASK   0xffffUL
+
+#define GITS_CMD_ITTADDR_OFFSET   2
+#define GITS_CMD_ITTADDR_SHIFT    8
+#define GITS_CMD_ITTADDR_MASK     0xffffffffffUL
+#define GITS_CMD_ITTADDR_ALIGN    GITS_CMD_ITTADDR_SHIFT
+#define GITS_CMD_ITTADDR_ALIGN_SZ (BIT(0) << GITS_CMD_ITTADDR_ALIGN)
+
+#define GITS_CMD_RDBASE_OFFSET 2
+#define GITS_CMD_RDBASE_SHIFT  16
+#define GITS_CMD_RDBASE_MASK   0xffffffffUL
+#define GITS_CMD_RDBASE_ALIGN  GITS_CMD_RDBASE_SHIFT
+
+#define GITS_CMD_VALID_OFFSET 2
+#define GITS_CMD_VALID_SHIFT  63
+#define GITS_CMD_VALID_MASK   0x1UL
+
+#define MASK(__basename)            (__basename##_MASK << __basename##_SHIFT)
+#define MASK_SET(__val, __basename) (((__val) & __basename##_MASK) << __basename##_SHIFT)
+#define MASK_GET(__reg, __basename) (((__reg) >> __basename##_SHIFT) & __basename##_MASK)
 
 #ifdef CONFIG_GIC_V3_ITS
 void its_rdist_map(void);
diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c
index 0748ddccf7682..6671da982cae6 100644
--- a/drivers/interrupt_controller/intc_ioapic.c
+++ b/drivers/interrupt_controller/intc_ioapic.c
@@ -84,7 +84,7 @@ DEVICE_MMIO_TOPLEVEL_STATIC(ioapic_regs, DT_DRV_INST(0));
  * In either case, regardless how many CPUs in the system, 0xff implies that
  * it's intended to deliver to all possible 8 local APICs.
  */
-#define DEFAULT_RTE_DEST	(0xFF << 24)
+#define DEFAULT_RTE_DEST (0xFFU << 24)
 
 static __pinned_bss uint32_t ioapic_rtes;
 
diff --git a/drivers/interrupt_controller/intc_ite_it51xxx.c b/drivers/interrupt_controller/intc_ite_it51xxx.c
new file mode 100644
index 0000000000000..3e70f8449df76
--- /dev/null
+++ b/drivers/interrupt_controller/intc_ite_it51xxx.c
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-it51xxx-intc.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(intc_ite_it51xxx, LOG_LEVEL_DBG);
+
+/* it51xxx INTC registers definition */
+#define INTC_REG_OFFSET(n) ((n) < 3 ? 1 : 2)
+#define INTC_GRPNISR(n)    (4 * ((n) + INTC_REG_OFFSET(n)))
+#define INTC_GRPNIER(n)    (4 * ((n) + INTC_REG_OFFSET(n)) + 1)
+#define INTC_GRPNIELMR(n)  (4 * ((n) + INTC_REG_OFFSET(n)) + 2)
+#define INTC_GRPNIPOLR(n)  (4 * ((n) + INTC_REG_OFFSET(n)) + 3)
+#define INTC_IVECT         0x10
+
+#define II51XXX_INTC_GROUP_COUNT 29
+#define MAX_REGISR_IRQ_NUM       8
+#define IVECT_OFFSET_WITH_IRQ    0x10
+
+static mm_reg_t intc_base = DT_REG_ADDR(DT_NODELABEL(intc));
+/* Interrupt number of INTC module */
+static uint8_t intc_irq;
+static uint8_t ier_setting[II51XXX_INTC_GROUP_COUNT];
+
+void ite_intc_save_and_disable_interrupts(void)
+{
+	volatile uint8_t _ier __unused;
+	/* Disable global interrupt for critical section */
+	unsigned int key = irq_lock();
+
+	/* Save and disable interrupts */
+	for (int i = 0; i < II51XXX_INTC_GROUP_COUNT; i++) {
+		ier_setting[i] = sys_read8(intc_base + INTC_GRPNIER(i));
+		sys_write8(0, intc_base + INTC_GRPNIER(i));
+	}
+	/*
+	 * This load operation will guarantee the above modification of
+	 * SOC's register can be seen by any following instructions.
+	 * Note: Barrier instruction can not synchronize chip register,
+	 * so we introduce workaround here.
+	 */
+	_ier = sys_read8(intc_base + INTC_GRPNIER(II51XXX_INTC_GROUP_COUNT - 1));
+
+	irq_unlock(key);
+}
+
+void ite_intc_restore_interrupts(void)
+{
+	/*
+	 * Ensure the highest priority interrupt will be the first fired
+	 * interrupt when soc is ready to go.
+	 */
+	unsigned int key = irq_lock();
+
+	/* Restore interrupt state */
+	for (int i = 0; i < II51XXX_INTC_GROUP_COUNT; i++) {
+		sys_write8(ier_setting[i], intc_base + INTC_GRPNIER(i));
+	}
+
+	irq_unlock(key);
+}
+
+void ite_intc_isr_clear(unsigned int irq)
+{
+	uint32_t g, i;
+
+	if (irq > CONFIG_NUM_IRQS) {
+		return;
+	}
+	g = irq / MAX_REGISR_IRQ_NUM;
+	i = irq % MAX_REGISR_IRQ_NUM;
+
+	sys_write8(BIT(i), intc_base + INTC_GRPNISR(g));
+}
+
+void ite_intc_irq_enable(unsigned int irq)
+{
+	uint32_t g, i;
+	uint8_t en;
+
+	if (irq > CONFIG_NUM_IRQS) {
+		return;
+	}
+	g = irq / MAX_REGISR_IRQ_NUM;
+	i = irq % MAX_REGISR_IRQ_NUM;
+
+	/* critical section due to run a bit-wise OR operation */
+	unsigned int key = irq_lock();
+
+	en = sys_read8(intc_base + INTC_GRPNIER(g));
+	sys_write8(en | BIT(i), intc_base + INTC_GRPNIER(g));
+
+	irq_unlock(key);
+}
+
+void ite_intc_irq_disable(unsigned int irq)
+{
+	uint32_t g, i;
+	uint8_t en;
+
+	volatile uint8_t _ier __unused;
+
+	if (irq > CONFIG_NUM_IRQS) {
+		return;
+	}
+	g = irq / MAX_REGISR_IRQ_NUM;
+	i = irq % MAX_REGISR_IRQ_NUM;
+
+	/* critical section due to run a bit-wise OR operation */
+	unsigned int key = irq_lock();
+
+	en = sys_read8(intc_base + INTC_GRPNIER(g));
+	sys_write8(en & ~BIT(i), intc_base + INTC_GRPNIER(g));
+	/*
+	 * This load operation will guarantee the above modification of
+	 * SOC's register can be seen by any following instructions.
+	 */
+	_ier = sys_read8(intc_base + INTC_GRPNIER(g));
+
+	irq_unlock(key);
+}
+
+void ite_intc_irq_polarity_set(unsigned int irq, unsigned int flags)
+{
+	uint32_t g, i;
+	uint8_t tri;
+
+	if ((irq > CONFIG_NUM_IRQS) || ((flags & IRQ_TYPE_EDGE_BOTH) == IRQ_TYPE_EDGE_BOTH)) {
+		return;
+	}
+	g = irq / MAX_REGISR_IRQ_NUM;
+	i = irq % MAX_REGISR_IRQ_NUM;
+
+	tri = sys_read8(intc_base + INTC_GRPNIPOLR(g));
+	if ((flags & IRQ_TYPE_LEVEL_HIGH) || (flags & IRQ_TYPE_EDGE_RISING)) {
+		sys_write8(tri & ~BIT(i), intc_base + INTC_GRPNIPOLR(g));
+	} else {
+		sys_write8(tri | BIT(i), intc_base + INTC_GRPNIPOLR(g));
+	}
+
+	tri = sys_read8(intc_base + INTC_GRPNIELMR(g));
+	if ((flags & IRQ_TYPE_LEVEL_LOW) || (flags & IRQ_TYPE_LEVEL_HIGH)) {
+		sys_write8(tri & ~BIT(i), intc_base + INTC_GRPNIELMR(g));
+	} else {
+		sys_write8(tri | BIT(i), intc_base + INTC_GRPNIELMR(g));
+	}
+
+	/* W/C interrupt status of the pin */
+	sys_write8(BIT(i), intc_base + INTC_GRPNISR(g));
+}
+
+int ite_intc_irq_is_enable(unsigned int irq)
+{
+	uint32_t g, i;
+	uint8_t en;
+
+	if (irq > CONFIG_NUM_IRQS) {
+		return 0;
+	}
+	g = irq / MAX_REGISR_IRQ_NUM;
+	i = irq % MAX_REGISR_IRQ_NUM;
+
+	en = sys_read8(intc_base + INTC_GRPNIER(g));
+
+	return (en & BIT(i));
+}
+
+uint8_t ite_intc_get_irq_num(void)
+{
+	return intc_irq;
+}
+
+uint8_t get_irq(void *arg)
+{
+	ARG_UNUSED(arg);
+	/* wait until two equal interrupt values are read */
+	do {
+		/* Read interrupt number from interrupt vector register */
+		intc_irq = sys_read8(intc_base + INTC_IVECT);
+		/*
+		 * WORKAROUND: when the interrupt vector register (INTC_VECT)
+		 * isn't latched in a load operation, we read it again to make
+		 * sure the value we got is the correct value.
+		 */
+	} while (intc_irq != sys_read8(intc_base + INTC_IVECT));
+	/* determine interrupt number */
+	intc_irq -= IVECT_OFFSET_WITH_IRQ;
+	/* clear interrupt status */
+	ite_intc_isr_clear(intc_irq);
+	/* return interrupt number */
+	return intc_irq;
+}
+
+void soc_interrupt_init(void)
+{
+	/* Ensure interrupts of soc are disabled at default */
+	for (int i = 0; i < II51XXX_INTC_GROUP_COUNT; i++) {
+		sys_write8(0, intc_base + INTC_GRPNIER(i));
+	}
+
+	/* Enable M-mode external interrupt */
+	csr_set(mie, MIP_MEIP);
+}
diff --git a/drivers/interrupt_controller/intc_nuclei_eclic.S b/drivers/interrupt_controller/intc_nuclei_eclic.S
deleted file mode 100644
index 60577413395ed..0000000000000
--- a/drivers/interrupt_controller/intc_nuclei_eclic.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2024 Baumer Electric AG
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @brief Assembler-hooks specific to Nuclei's Extended Core Interrupt Controller
- */
-
-#include <zephyr/arch/cpu.h>
-
-
-GTEXT(__soc_handle_irq)
-/*
- * In an ECLIC, pending interrupts don't have to be cleared by hand.
- * In vectored mode, interrupts are cleared automatically.
- * In non-vectored mode, interrupts are cleared when writing the mnxti register (done in
- * __soc_handle_all_irqs).
- * Thus this function can directly return.
- */
-SECTION_FUNC(exception.other, __soc_handle_irq)
-	ret
-
-GTEXT(__soc_handle_all_irqs)
-
-#ifdef CONFIG_TRACING
-/* imports */
-GTEXT(sys_trace_isr_enter)
-GTEXT(sys_trace_isr_exit)
-#endif
-
-/*
- * This function services and clears all pending interrupts for an ECLIC in non-vectored mode.
- */
-SECTION_FUNC(exception.other, __soc_handle_all_irqs)
-	addi sp, sp, -16
-	sw ra, 0(sp)
-
-	/* Read and clear mnxti to get highest current interrupt and enable interrupts. Will return
-	 * original interrupt if no others appear. */
-	csrrci a0, 0x345, MSTATUS_IEN
-	beqz a0, irq_done /* Check if original interrupt vanished. */
-
-irq_loop:
-
-#ifdef CONFIG_TRACING_ISR
-	call sys_trace_isr_enter
-#endif
-
-	/* Call corresponding registered function in _sw_isr_table. a0 is offset in pointer with
-	 * the mtvt, sw irq table is 2-pointer wide -> shift by one. */
-	csrr t0, 0x307 /* mtvt */
-	sub a0, a0, t0
-	la t0, _sw_isr_table
-	slli a0, a0, (1)
-	add t0, t0, a0
-
-	/* Load argument in a0 register */
-	lw a0, 0(t0)
-
-	/* Load ISR function address in register t1 */
-	lw t1, RV_REGSIZE(t0)
-
-	/* Call ISR function */
-	jalr ra, t1, 0
-
-#ifdef CONFIG_TRACING_ISR
-	call sys_trace_isr_exit
-#endif
-
-	/* Read and clear mnxti to get highest current interrupt and enable interrupts. */
-	csrrci a0, 0x345, MSTATUS_IEN
-	bnez a0, irq_loop
-
-irq_done:
-	lw ra, 0(sp)
-	addi sp, sp, 16
-	ret
diff --git a/drivers/interrupt_controller/intc_nuclei_eclic.c b/drivers/interrupt_controller/intc_nuclei_eclic.c
deleted file mode 100644
index f141864bbf041..0000000000000
--- a/drivers/interrupt_controller/intc_nuclei_eclic.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2021 Tokita, Hiroshi <tokita.hiroshi@gmail.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @brief Driver for Nuclie's Extended Core Interrupt Controller
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/arch/cpu.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/device.h>
-
-#include <zephyr/sw_isr_table.h>
-#include <zephyr/drivers/interrupt_controller/riscv_clic.h>
-
-#define DT_DRV_COMPAT nuclei_eclic
-
-union CLICCFG {
-	struct {
-		uint8_t _reserved0 : 1;
-		/** number of interrupt level bits */
-		uint8_t nlbits : 4;
-		uint8_t _reserved1 : 2;
-		uint8_t _reserved2 : 1;
-	} b;
-	uint8_t w;
-};
-
-union CLICINFO {
-	struct {
-		/** number of max supported interrupts */
-		uint32_t numint : 13;
-		/** architecture version */
-		uint32_t version : 8;
-		/** supported bits in the clicintctl */
-		uint32_t intctlbits : 4;
-		uint32_t _reserved0 : 7;
-	} b;
-	uint32_t qw;
-};
-
-union CLICMTH {
-	uint8_t w;
-};
-
-union CLICINTIP {
-	struct {
-		/** Interrupt Pending */
-		uint8_t IP : 1;
-		uint8_t reserved0 : 7;
-	} b;
-	uint8_t w;
-};
-
-union CLICINTIE {
-	struct {
-		/** Interrupt Enabled */
-		uint8_t IE : 1;
-		uint8_t reserved0 : 7;
-	} b;
-	uint8_t w;
-};
-
-union CLICINTATTR {
-	struct {
-		/** 0: non-vectored 1:vectored */
-		uint8_t shv : 1;
-		/** 0: level 1: rising edge 2: falling edge */
-		uint8_t trg : 2;
-		uint8_t reserved0 : 3;
-		uint8_t reserved1 : 2;
-	} b;
-	uint8_t w;
-};
-
-struct CLICCTRL {
-	volatile union CLICINTIP INTIP;
-	volatile union CLICINTIE INTIE;
-	volatile union CLICINTATTR INTATTR;
-	volatile uint8_t INTCTRL;
-};
-
-/** CLIC INTATTR: TRIG Mask */
-#define CLIC_INTATTR_TRIG_Msk  0x3U
-
-#define ECLIC_CFG       (*((volatile union CLICCFG  *)(DT_REG_ADDR_BY_IDX(DT_NODELABEL(eclic), 0))))
-#define ECLIC_INFO      (*((volatile union CLICINFO *)(DT_REG_ADDR_BY_IDX(DT_NODELABEL(eclic), 1))))
-#define ECLIC_MTH       (*((volatile union CLICMTH  *)(DT_REG_ADDR_BY_IDX(DT_NODELABEL(eclic), 2))))
-#define ECLIC_CTRL      ((volatile  struct CLICCTRL *)(DT_REG_ADDR_BY_IDX(DT_NODELABEL(eclic), 3)))
-#define ECLIC_CTRL_SIZE (DT_REG_SIZE_BY_IDX(DT_NODELABEL(eclic), 3))
-
-static uint8_t nlbits;
-static uint8_t intctlbits;
-static uint8_t max_prio;
-static uint8_t max_level;
-static uint8_t intctrl_mask;
-
-static inline uint8_t leftalign8(uint8_t val, uint8_t shift)
-{
-	return (val << (8U - shift));
-}
-
-static inline uint8_t mask8(uint8_t len)
-{
-	return ((1 << len) - 1) & 0xFFFFU;
-}
-
-/**
- * @brief Enable interrupt
- */
-void riscv_clic_irq_enable(uint32_t irq)
-{
-	ECLIC_CTRL[irq].INTIE.b.IE = 1;
-}
-
-/**
- * @brief Disable interrupt
- */
-void riscv_clic_irq_disable(uint32_t irq)
-{
-	ECLIC_CTRL[irq].INTIE.b.IE = 0;
-}
-
-/**
- * @brief Get enable status of interrupt
- */
-int riscv_clic_irq_is_enabled(uint32_t irq)
-{
-	return ECLIC_CTRL[irq].INTIE.b.IE;
-}
-
-/**
- * @brief Set priority and level of interrupt
- */
-void riscv_clic_irq_priority_set(uint32_t irq, uint32_t pri, uint32_t flags)
-{
-	const uint8_t prio = leftalign8(MIN(pri, max_prio), intctlbits);
-	const uint8_t level =  leftalign8(max_level, nlbits);
-	const uint8_t intctrl = (prio | level) | (~intctrl_mask);
-
-	ECLIC_CTRL[irq].INTCTRL = intctrl;
-
-	union CLICINTATTR intattr = {.w = 0};
-
-	/* Set non-vectoring as default. */
-	intattr.b.shv = 0;
-	intattr.b.trg = (uint8_t)(flags & CLIC_INTATTR_TRIG_Msk);
-	ECLIC_CTRL[irq].INTATTR = intattr;
-}
-
-/**
- * @brief Set vector mode of interrupt
- */
-void riscv_clic_irq_vector_set(uint32_t irq)
-{
-	/* Set Selective Hardware Vectoring. */
-	union CLICINTATTR intattr = ECLIC_CTRL[irq].INTATTR;
-
-	intattr.b.shv = 1;
-	ECLIC_CTRL[irq].INTATTR = intattr;
-}
-
-/**
- * @brief Set pending bit of an interrupt
- */
-void riscv_clic_irq_set_pending(uint32_t irq)
-{
-	ECLIC_CTRL[irq].INTIP.b.IP = 1;
-}
-
-static int nuclei_eclic_init(const struct device *dev)
-{
-	ECLIC_MTH.w = 0;
-	ECLIC_CFG.w = 0;
-	ECLIC_CFG.b.nlbits = 0;
-	for (int i = 0; i < ECLIC_CTRL_SIZE; i++) {
-		ECLIC_CTRL[i] = (struct CLICCTRL) { 0 };
-	}
-
-	nlbits = ECLIC_CFG.b.nlbits;
-	intctlbits = ECLIC_INFO.b.intctlbits;
-	max_prio = mask8(intctlbits - nlbits);
-	max_level = mask8(nlbits);
-	intctrl_mask = leftalign8(mask8(intctlbits), intctlbits);
-
-	return 0;
-}
-
-DEVICE_DT_INST_DEFINE(0, nuclei_eclic_init, NULL, NULL, NULL,
-		      PRE_KERNEL_1, CONFIG_INTC_INIT_PRIORITY, NULL);
diff --git a/drivers/interrupt_controller/intc_nxp_irqsteer.c b/drivers/interrupt_controller/intc_nxp_irqsteer.c
index 02c310dfbe666..c20b8b1ffdec3 100644
--- a/drivers/interrupt_controller/intc_nxp_irqsteer.c
+++ b/drivers/interrupt_controller/intc_nxp_irqsteer.c
@@ -265,6 +265,18 @@ LOG_MODULE_REGISTER(nxp_irqstr);
 #define DISPATCHER_REGMAP(disp) \
 	(((const struct irqsteer_config *)disp->dev->config)->regmap_phys)
 
+#if defined(CONFIG_XTENSA)
+#define irqsteer_level1_irq_enable(irq)     xtensa_irq_enable(XTENSA_IRQ_NUMBER(irq))
+#define irqsteer_level1_irq_disable(irq)    xtensa_irq_disable(XTENSA_IRQ_NUMBER(irq))
+#define irqsteer_level1_irq_is_enabled(irq) xtensa_irq_is_enabled(XTENSA_IRQ_NUMBER(irq))
+#elif defined(CONFIG_ARM)
+#define irqsteer_level1_irq_enable(irq)     arm_irq_enable(irq)
+#define irqsteer_level1_irq_disable(irq)    arm_irq_disable(irq)
+#define irqsteer_level1_irq_is_enabled(irq) arm_irq_is_enabled(irq)
+#else
+#error ARCH not supported
+#endif
+
 struct irqsteer_config {
 	uint32_t regmap_phys;
 	uint32_t regmap_size;
@@ -295,7 +307,7 @@ static int to_zephyr_irq(uint32_t regmap, uint32_t irq,
 {
 	int i, idx;
 
-	idx = irq;
+	idx = irq - FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;
 
 	for (i = dispatcher->master_index - 1; i >= 0; i--) {
 		idx -= IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);
@@ -313,10 +325,10 @@ static int to_system_irq(uint32_t regmap, int irq, int master_index)
 		irq += IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);
 	}
 
-	return irq;
+	return irq + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;
 }
 
-/* used to convert zephyr INTID to system INTID */
+/* used to convert zephyr INTID (level 2) to system INTID */
 static int from_zephyr_irq(uint32_t regmap, uint32_t irq, uint32_t master_index)
 {
 	int i, idx;
@@ -327,7 +339,7 @@ static int from_zephyr_irq(uint32_t regmap, uint32_t irq, uint32_t master_index)
 		idx += IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);
 	}
 
-	return idx;
+	return idx + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;
 }
 
 static void _irqstr_disp_enable_disable(struct irqsteer_dispatcher *disp,
@@ -336,13 +348,11 @@ static void _irqstr_disp_enable_disable(struct irqsteer_dispatcher *disp,
 	uint32_t regmap = DISPATCHER_REGMAP(disp);
 
 	if (enable) {
-		xtensa_irq_enable(XTENSA_IRQ_NUMBER(disp->irq));
-
+		irqsteer_level1_irq_enable(disp->irq);
 		IRQSTEER_EnableMasterInterrupt(UINT_TO_IRQSTEER(regmap), disp->irq);
 	} else {
 		IRQSTEER_DisableMasterInterrupt(UINT_TO_IRQSTEER(regmap), disp->irq);
-
-		xtensa_irq_disable(XTENSA_IRQ_NUMBER(disp->irq));
+		irqsteer_level1_irq_disable(disp->irq);
 	}
 }
 
@@ -467,9 +477,9 @@ void z_soc_irq_enable_disable(uint32_t irq, bool enable)
 	if (irq_get_level(irq) == 1) {
 		/* LEVEL 1 interrupts are DSP direct */
 		if (enable) {
-			xtensa_irq_enable(XTENSA_IRQ_NUMBER(irq));
+			irqsteer_level1_irq_enable(irq);
 		} else {
-			xtensa_irq_disable(XTENSA_IRQ_NUMBER(irq));
+			irqsteer_level1_irq_disable(irq);
 		}
 		return;
 	}
@@ -513,8 +523,7 @@ int z_soc_irq_is_enabled(unsigned int irq)
 	bool enabled;
 
 	if (irq_get_level(irq) == 1) {
-		/* LEVEL 1 interrupts are DSP direct */
-		return xtensa_irq_is_enabled(XTENSA_IRQ_NUMBER(irq));
+		return irqsteer_level1_irq_is_enabled(irq);
 	}
 
 	parent_irq = irq_parent_level_2(irq);
@@ -538,6 +547,18 @@ int z_soc_irq_is_enabled(unsigned int irq)
 	return false;
 }
 
+#if defined(CONFIG_ARM)
+void z_soc_irq_priority_set(unsigned int irq, unsigned int prio, unsigned int flags)
+{
+	uint32_t level1_irq = irq;
+
+	if (irq_get_level(irq) != 1) {
+		level1_irq = irq_parent_level_2(irq);
+	}
+
+	arm_irq_priority_set(level1_irq, prio, flags);
+}
+#endif
 
 static void irqsteer_isr_dispatcher(const void *data)
 {
diff --git a/drivers/interrupt_controller/intc_renesas_ra_icu.c b/drivers/interrupt_controller/intc_renesas_ra_icu.c
deleted file mode 100644
index 57b9ac731abef..0000000000000
--- a/drivers/interrupt_controller/intc_renesas_ra_icu.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITTA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT renesas_ra_interrupt_controller_unit
-
-#include <zephyr/device.h>
-#include <zephyr/irq.h>
-#include <soc.h>
-#include <zephyr/drivers/interrupt_controller/intc_ra_icu.h>
-#include <zephyr/sw_isr_table.h>
-#include <errno.h>
-
-#define IELSRn_REG(n) (DT_INST_REG_ADDR(0) + IELSRn_OFFSET + (n * 4))
-#define IRQCRi_REG(i) (DT_INST_REG_ADDR(0) + IRQCRi_OFFSET + (i))
-
-#define IRQCRi_IRQMD_POS  0
-#define IRQCRi_IRQMD_MASK BIT_MASK(2)
-#define IELSRn_IR_POS     16
-#define IELSRn_IR_MASK    BIT_MASK(1)
-
-enum {
-	IRQCRi_OFFSET = 0x0,
-	IELSRn_OFFSET = 0x300,
-};
-
-int ra_icu_query_exists_irq(uint32_t event)
-{
-	for (uint32_t i = 0; i < CONFIG_NUM_IRQS; i++) {
-		uint32_t els = sys_read32(IELSRn_REG(i)) & UINT8_MAX;
-
-		if (event == els) {
-			return i;
-		}
-	}
-
-	return -EINVAL;
-}
-
-int ra_icu_query_available_irq(uint32_t event)
-{
-	int irq = -EINVAL;
-
-	if (ra_icu_query_exists_irq(event) > 0) {
-		return -EINVAL;
-	}
-
-	for (uint32_t i = 0; i < CONFIG_NUM_IRQS; i++) {
-		if (_sw_isr_table[i].isr == z_irq_spurious) {
-			irq = i;
-			break;
-		}
-	}
-
-	return irq;
-}
-
-void ra_icu_clear_int_flag(unsigned int irqn)
-{
-	uint32_t cfg = sys_read32(IELSRn_REG(irqn));
-
-	sys_write32(cfg & ~BIT(IELSRn_IR_POS), IELSRn_REG(irqn));
-}
-
-void ra_icu_query_irq_config(unsigned int irq, uint32_t *intcfg, ra_isr_handler *cb,
-			     const void **cbarg)
-{
-	*intcfg = sys_read32(IELSRn_REG(irq));
-	*cb = _sw_isr_table[irq].isr;
-	*cbarg = (void *)_sw_isr_table[irq].arg;
-}
-
-static void ra_icu_irq_configure(unsigned int irqn, uint32_t intcfg)
-{
-	uint8_t reg = sys_read8(IRQCRi_REG(irqn)) & ~(IRQCRi_IRQMD_MASK);
-
-	sys_write8(reg | (intcfg & IRQCRi_IRQMD_MASK), IRQCRi_REG(irqn));
-}
-
-int ra_icu_irq_connect_dynamic(unsigned int irq, unsigned int priority,
-			       void (*routine)(const void *parameter), const void *parameter,
-			       uint32_t flags)
-{
-	uint32_t event = ((flags & RA_ICU_FLAG_EVENT_MASK) >> RA_ICU_FLAG_EVENT_OFFSET);
-	uint32_t intcfg = ((flags & RA_ICU_FLAG_INTCFG_MASK) >> RA_ICU_FLAG_INTCFG_OFFSET);
-	int irqn = irq;
-
-	if (irq == RA_ICU_IRQ_UNSPECIFIED) {
-		irqn = ra_icu_query_available_irq(event);
-		if (irqn < 0) {
-			return irqn;
-		}
-	}
-
-	irq_disable(irqn);
-	sys_write32(event, IELSRn_REG(irqn));
-	z_isr_install(irqn, routine, parameter);
-	z_arm_irq_priority_set(irqn, priority, flags);
-	ra_icu_irq_configure(event, intcfg);
-
-	return irqn;
-}
-
-int ra_icu_irq_disconnect_dynamic(unsigned int irq, unsigned int priority,
-				  void (*routine)(const void *parameter), const void *parameter,
-				  uint32_t flags)
-{
-	int irqn = irq;
-
-	if (irq == RA_ICU_IRQ_UNSPECIFIED) {
-		return -EINVAL;
-	}
-
-	irq_disable(irqn);
-	sys_write32(0, IELSRn_REG(irqn));
-	z_isr_install(irqn, z_irq_spurious, NULL);
-	z_arm_irq_priority_set(irqn, 0, 0);
-
-	return 0;
-}
-
-DEVICE_DT_INST_DEFINE(0, NULL, NULL, NULL, NULL, PRE_KERNEL_1, CONFIG_INTC_INIT_PRIORITY, NULL);
diff --git a/drivers/interrupt_controller/intc_renesas_rz_ext_irq.c b/drivers/interrupt_controller/intc_renesas_rz_ext_irq.c
index 7447441086c76..a6358e0734548 100644
--- a/drivers/interrupt_controller/intc_renesas_rz_ext_irq.c
+++ b/drivers/interrupt_controller/intc_renesas_rz_ext_irq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,12 +9,18 @@
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
-#include <zephyr/irq.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
+#if defined(CONFIG_SOC_SERIES_RZG3S)
 #include <instances/rzg/r_intc_irq.h>
 #include <instances/rzg/r_intc_nmi.h>
+#elif defined(CONFIG_SOC_SERIES_RZN2L) || defined(CONFIG_SOC_SERIES_RZT2L) ||                      \
+	defined(CONFIG_SOC_SERIES_RZT2M)
+#include <instances/rzn/r_icu.h>
+#endif /* CONFIG_SOC_SERIES_* */
 #include <zephyr/drivers/interrupt_controller/intc_rz_ext_irq.h>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
 
 LOG_MODULE_REGISTER(rz_ext_irq, CONFIG_INTC_LOG_LEVEL);
 
@@ -31,8 +37,13 @@ struct intc_rz_ext_irq_data {
 };
 
 /* FSP interruption handlers. */
+#if defined(CONFIG_SOC_SERIES_RZG3S)
 void r_intc_irq_isr(void);
 void r_intc_nmi_isr(void);
+#elif defined(CONFIG_SOC_SERIES_RZN2L) || defined(CONFIG_SOC_SERIES_RZT2L) ||                      \
+	defined(CONFIG_SOC_SERIES_RZT2M)
+void r_icu_isr(void);
+#endif /* CONFIG_SOC_SERIES_* */
 
 int intc_rz_ext_irq_enable(const struct device *dev)
 {
@@ -74,6 +85,29 @@ int intc_rz_ext_irq_set_callback(const struct device *dev, intc_rz_ext_irq_callb
 	return 0;
 }
 
+int intc_rz_ext_irq_set_type(const struct device *dev, uint8_t trig)
+{
+	const struct intc_rz_ext_irq_config *config = dev->config;
+	struct intc_rz_ext_irq_data *data = dev->data;
+	fsp_err_t err = FSP_SUCCESS;
+	external_irq_cfg_t *p_cfg = (external_irq_cfg_t *)config->fsp_cfg;
+
+	p_cfg->trigger = (external_irq_trigger_t)trig;
+	err = config->fsp_api->close(data->fsp_ctrl);
+
+	if (err != FSP_SUCCESS) {
+		return -EIO;
+	}
+
+	err = config->fsp_api->open(data->fsp_ctrl, config->fsp_cfg);
+
+	if (err != FSP_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
 static int intc_rz_ext_irq_init(const struct device *dev)
 {
 	const struct intc_rz_ext_irq_config *config = dev->config;
@@ -109,16 +143,22 @@ static void intc_rz_ext_irq_callback(external_irq_callback_args_t *args)
 	}
 }
 
-#define EXT_IRQ_RZG_IRQ_CONNECT(index, isr, isr_nmi)                                               \
+#ifdef CONFIG_CPU_CORTEX_M
+#define GET_IRQ_FLAGS(index) 0
+#else /* Cortex-A/R */
+#define GET_IRQ_FLAGS(index) DT_INST_IRQ_BY_IDX(index, 0, flags)
+#endif
+
+#define EXT_IRQ_RZ_IRQ_CONNECT(index, isr, isr_nmi)                                                \
 	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(index, 0, irq), DT_INST_IRQ_BY_IDX(index, 0, priority),     \
 		    COND_CODE_0(DT_INST_IRQ_BY_IDX(index, 0, irq),                                 \
-		    (isr_nmi), (isr)), NULL, 0);
+		    (isr_nmi), (isr)), NULL, GET_IRQ_FLAGS(index));
 
 #define INTC_RZG_EXT_IRQ_INIT(index)                                                               \
 	static const external_irq_cfg_t g_external_irq##index##_cfg = {                            \
 		.trigger = DT_INST_ENUM_IDX_OR(index, trigger_type, 0),                            \
 		.filter_enable = true,                                                             \
-		.pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_1,                                            \
+		.clock_source_div = EXTERNAL_IRQ_CLOCK_SOURCE_DIV_1,                               \
 		.p_callback = intc_rz_ext_irq_callback,                                            \
 		.p_context = DEVICE_DT_INST_GET(index),                                            \
 		.p_extend = NULL,                                                                  \
@@ -149,7 +189,44 @@ static void intc_rz_ext_irq_callback(external_irq_callback_args_t *args)
                                                                                                    \
 	static int intc_rz_ext_irq_init_##index(const struct device *dev)                          \
 	{                                                                                          \
-		EXT_IRQ_RZG_IRQ_CONNECT(index, r_intc_irq_isr, r_intc_nmi_isr)                     \
+		EXT_IRQ_RZ_IRQ_CONNECT(index, r_intc_irq_isr, r_intc_nmi_isr)                      \
+		return intc_rz_ext_irq_init(dev);                                                  \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(index, intc_rz_ext_irq_init_##index, NULL,                           \
+			      &intc_rz_ext_irq_data##index, &intc_rz_ext_irq_config##index,        \
+			      PRE_KERNEL_1, CONFIG_INTC_INIT_PRIORITY, NULL);
+
+#define INTC_RZTN_EXT_IRQ_INIT(index)                                                              \
+	static const external_irq_cfg_t g_external_irq##index##_cfg = {                            \
+		.trigger = DT_INST_ENUM_IDX_OR(index, trigger_type, 0),                            \
+		.filter_enable = true,                                                             \
+		.clock_source_div = EXTERNAL_IRQ_CLOCK_SOURCE_DIV_1,                               \
+		.p_callback = intc_rz_ext_irq_callback,                                            \
+		.p_context = DEVICE_DT_INST_GET(index),                                            \
+		.p_extend = NULL,                                                                  \
+		.ipl = DT_INST_IRQ_BY_IDX(index, 0, priority),                                     \
+		.irq = DT_INST_IRQ_BY_IDX(index, 0, irq),                                          \
+		.channel = DT_INST_REG_ADDR(index),                                                \
+	};                                                                                         \
+                                                                                                   \
+	PINCTRL_DT_INST_DEFINE(index);                                                             \
+                                                                                                   \
+	struct intc_rz_ext_irq_config intc_rz_ext_irq_config##index = {                            \
+		.pin_config = PINCTRL_DT_INST_DEV_CONFIG_GET(index),                               \
+		.fsp_cfg = (external_irq_cfg_t *)&g_external_irq##index##_cfg,                     \
+		.fsp_api = &g_external_irq_on_icu,                                                 \
+	};                                                                                         \
+                                                                                                   \
+	icu_instance_ctrl_t g_external_irq##index##_ctrl;                                          \
+                                                                                                   \
+	static struct intc_rz_ext_irq_data intc_rz_ext_irq_data##index = {                         \
+		.fsp_ctrl = (icu_instance_ctrl_t *)&g_external_irq##index##_ctrl,                  \
+	};                                                                                         \
+                                                                                                   \
+	static int intc_rz_ext_irq_init_##index(const struct device *dev)                          \
+	{                                                                                          \
+		EXT_IRQ_RZ_IRQ_CONNECT(index, r_icu_isr, NULL);                                    \
 		return intc_rz_ext_irq_init(dev);                                                  \
 	};                                                                                         \
                                                                                                    \
@@ -157,4 +234,9 @@ static void intc_rz_ext_irq_callback(external_irq_callback_args_t *args)
 			      &intc_rz_ext_irq_data##index, &intc_rz_ext_irq_config##index,        \
 			      PRE_KERNEL_1, CONFIG_INTC_INIT_PRIORITY, NULL);
 
+#if defined(CONFIG_SOC_SERIES_RZG3S)
 DT_INST_FOREACH_STATUS_OKAY(INTC_RZG_EXT_IRQ_INIT)
+#elif defined(CONFIG_SOC_SERIES_RZN2L) || defined(CONFIG_SOC_SERIES_RZT2L) ||                      \
+	defined(CONFIG_SOC_SERIES_RZT2M)
+DT_INST_FOREACH_STATUS_OKAY(INTC_RZTN_EXT_IRQ_INIT)
+#endif
diff --git a/drivers/interrupt_controller/intc_vim.c b/drivers/interrupt_controller/intc_vim.c
index 01d2633413d57..d37aac051d169 100644
--- a/drivers/interrupt_controller/intc_vim.c
+++ b/drivers/interrupt_controller/intc_vim.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 2023 BeagleBoard.org Foundation
  * Copyright (C) 2023 S Prashanth
+ * Copyright (C) 2025 Siemens Mobility GmbH
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,6 +15,7 @@
 #include <zephyr/drivers/interrupt_controller/intc_vim.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include "zephyr/sys/__assert.h"
 #include <zephyr/sys/util_macro.h>
 
 LOG_MODULE_REGISTER(vim);
@@ -56,8 +58,12 @@ void z_vim_irq_eoi(unsigned int irq)
 
 void z_vim_irq_init(void)
 {
-	uint32_t num_of_irqs = sys_read32(VIM_INFO_INTERRUPTS_MASK);
+	uint32_t num_of_irqs = sys_read32(VIM_INFO) & VIM_INFO_INTERRUPTS_MASK;
 
+	__ASSERT(CONFIG_NUM_IRQS == num_of_irqs,
+		 "Number of configured interrupts (%d) doesn't match reported "
+		 "(%" PRIu32 ") interrupts",
+		 CONFIG_NUM_IRQS, num_of_irqs);
 	LOG_DBG("VIM: Number of IRQs = %u\n", num_of_irqs);
 }
 
diff --git a/drivers/interrupt_controller/wuc_ite_it51xxx.c b/drivers/interrupt_controller/wuc_ite_it51xxx.c
new file mode 100644
index 0000000000000..41f3627e1774f
--- /dev/null
+++ b/drivers/interrupt_controller/wuc_ite_it51xxx.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ite_it51xxx_wuc
+
+#include <soc.h>
+#include <zephyr/drivers/interrupt_controller/wuc_ite_it51xxx.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-it51xxx-wuc.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
+
+LOG_MODULE_REGISTER(wuc_ite_it51xxx, CONFIG_INTC_LOG_LEVEL);
+
+/* Driver config */
+struct it51xxx_wuc_cfg {
+	/* WUC wakeup edge mode register */
+	uint8_t *reg_wuemr;
+	/* WUC wakeup edge sense register */
+	uint8_t *reg_wuesr;
+	/* WUC wakeup enable register */
+	uint8_t *reg_wuenr;
+	/* WUC level or edge mode register */
+	uint8_t *reg_wuler;
+	bool wakeup_ctrl;
+	bool both_edge_trigger;
+};
+
+void it51xxx_wuc_enable(const struct device *dev, uint8_t mask)
+{
+	const struct it51xxx_wuc_cfg *config = dev->config;
+	volatile uint8_t *reg_wuenr = config->reg_wuenr;
+
+	if (!config->wakeup_ctrl) {
+		LOG_ERR("Wakeup control(enable) is not supported.");
+		return;
+	}
+	/*
+	 * WUC group only 1, 3, and 4 have enable/disable register,
+	 * others are always enabled.
+	 */
+	if (reg_wuenr == IT51XXX_WUC_UNUSED_REG) {
+		return;
+	}
+
+	/* Enable wakeup interrupt of the pin */
+	*reg_wuenr |= mask;
+}
+
+void it51xxx_wuc_disable(const struct device *dev, uint8_t mask)
+{
+	const struct it51xxx_wuc_cfg *config = dev->config;
+	volatile uint8_t *reg_wuenr = config->reg_wuenr;
+
+	if (!config->wakeup_ctrl) {
+		LOG_ERR("Wakeup control(disable) is not supported.");
+		return;
+	}
+	/*
+	 * WUC group only 1, 3, and 4 have enable/disable register,
+	 * others are always enabled.
+	 */
+	if (reg_wuenr == IT51XXX_WUC_UNUSED_REG) {
+		return;
+	}
+
+	/* Disable wakeup interrupt of the pin */
+	*reg_wuenr &= ~mask;
+}
+
+void it51xxx_wuc_clear_status(const struct device *dev, uint8_t mask)
+{
+	const struct it51xxx_wuc_cfg *config = dev->config;
+	volatile uint8_t *reg_wuesr = config->reg_wuesr;
+
+	if (!config->wakeup_ctrl) {
+		LOG_ERR("Wakeup control of clear status is not supported.");
+		return;
+	}
+
+	if (reg_wuesr == IT51XXX_WUC_UNUSED_REG) {
+		return;
+	}
+
+	/* W/C wakeup interrupt status of the pin */
+	*reg_wuesr = mask;
+}
+
+void it51xxx_wuc_set_polarity(const struct device *dev, uint8_t mask, uint32_t flags)
+{
+	const struct it51xxx_wuc_cfg *config = dev->config;
+	volatile uint8_t *reg_wuemr = config->reg_wuemr;
+	volatile uint8_t *reg_wuler = config->reg_wuler;
+	volatile uint8_t *reg_wuesr = config->reg_wuesr;
+
+	if (!config->wakeup_ctrl) {
+		LOG_ERR("Wakeup control of set polarity is not supported.");
+		return;
+	}
+
+	if (reg_wuemr == IT51XXX_WUC_UNUSED_REG) {
+		return;
+	}
+
+	if (flags & WUC_TYPE_LEVEL_TRIG) {
+		*reg_wuler |= mask;
+		if (flags & WUC_TYPE_LEVEL_HIGH) {
+			*reg_wuemr &= ~mask;
+		} else {
+			*reg_wuemr |= mask;
+		}
+	} else {
+		*reg_wuler &= ~mask;
+		if ((flags & WUC_TYPE_EDGE_BOTH) == WUC_TYPE_EDGE_RISING) {
+			/* Rising-edge trigger mode */
+			*reg_wuemr &= ~mask;
+		} else {
+			if (((flags & WUC_TYPE_EDGE_BOTH) == WUC_TYPE_EDGE_FALLING) &&
+			    config->both_edge_trigger) {
+				LOG_WRN("Group 7, 10, 12 do not support falling edge mode.");
+			}
+			if (((flags & WUC_TYPE_EDGE_BOTH) == WUC_TYPE_EDGE_BOTH) &&
+			    !config->both_edge_trigger) {
+				LOG_WRN("Both edge trigger mode only support group 7, 10, 12.\n"
+					"Not support dev = %s",
+					dev->name);
+			}
+			/* Falling-edge or both edge trigger mode */
+			*reg_wuemr |= mask;
+		}
+	}
+	/* W/C wakeup interrupt status of the pin */
+	*reg_wuesr = mask;
+}
+
+#define IT51XXX_WUC_INIT(inst)                                                                     \
+	static const struct it51xxx_wuc_cfg it51xxx_wuc_cfg_##inst = {                             \
+		.reg_wuemr = (uint8_t *)DT_INST_REG_ADDR_BY_IDX(inst, 0),                          \
+		.reg_wuesr = (uint8_t *)DT_INST_REG_ADDR_BY_IDX(inst, 1),                          \
+		.reg_wuenr = (uint8_t *)DT_INST_REG_ADDR_BY_IDX(inst, 2),                          \
+		.reg_wuler = (uint8_t *)DT_INST_REG_ADDR_BY_IDX(inst, 3),                          \
+		.wakeup_ctrl = DT_INST_PROP(inst, wakeup_controller),                              \
+		.both_edge_trigger = DT_INST_PROP(inst, both_edge_trigger),                        \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, NULL, &it51xxx_wuc_cfg_##inst, PRE_KERNEL_1,       \
+			      CONFIG_KERNEL_INIT_PRIORITY_OBJECTS, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(IT51XXX_WUC_INIT)
diff --git a/drivers/ipm/Kconfig b/drivers/ipm/Kconfig
index 0648cdd32c89d..8d7a3f3288e04 100644
--- a/drivers/ipm/Kconfig
+++ b/drivers/ipm/Kconfig
@@ -59,7 +59,7 @@ config IPM_MBOX
 	bool "IPM over MBOX driver"
 	default y
 	depends on DT_HAS_ZEPHYR_MBOX_IPM_ENABLED
-	depends on MBOX
+	select MBOX
 	help
 	  IPM driver using a MBOX driver as the backend mechanism.
 
diff --git a/drivers/ipm/Kconfig.stm32 b/drivers/ipm/Kconfig.stm32
index 9fd3f60263e97..456168783dd84 100644
--- a/drivers/ipm/Kconfig.stm32
+++ b/drivers/ipm/Kconfig.stm32
@@ -5,7 +5,6 @@ config IPM_STM32_IPCC
 	bool "STM32 IPCC controller"
 	default y
 	depends on DT_HAS_ST_STM32_IPCC_MAILBOX_ENABLED
-	select USE_STM32_LL_IPCC
 	help
 	  Driver for stm32 IPCC mailboxes
 
diff --git a/drivers/kscan/CMakeLists.txt b/drivers/kscan/CMakeLists.txt
deleted file mode 100644
index 1108cd616290a..0000000000000
--- a/drivers/kscan/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/kscan.h)
-
-zephyr_library()
-
-zephyr_library_sources_ifdef(CONFIG_KSCAN_INPUT		kscan_input.c)
-
-zephyr_library_sources_ifdef(CONFIG_USERSPACE	    kscan_handlers.c)
diff --git a/drivers/kscan/Kconfig b/drivers/kscan/Kconfig
deleted file mode 100644
index 0ed9acc7e066d..0000000000000
--- a/drivers/kscan/Kconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# Keyboard scan configuration options
-
-# Copyright (c) 2019 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-menuconfig KSCAN
-	bool "Keyboard scan drivers [DEPRECATED]"
-	select DEPRECATED
-	help
-	  Include Keyboard scan drivers in system config.
-
-if KSCAN
-
-source "drivers/kscan/Kconfig.input"
-
-module = KSCAN
-module-str = kscan
-source "subsys/logging/Kconfig.template.log_config"
-
-config KSCAN_INIT_PRIORITY
-	int "Keyboard scan driver init priority"
-	default 90
-	help
-	  Keyboard scan device driver initialization priority.
-
-endif # KSCAN
diff --git a/drivers/kscan/Kconfig.input b/drivers/kscan/Kconfig.input
deleted file mode 100644
index 85168a9a12970..0000000000000
--- a/drivers/kscan/Kconfig.input
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2023 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-config KSCAN_INPUT
-	bool "Input subsystem to kscan adapter driver"
-	default y
-	depends on INPUT
-	depends on DT_HAS_ZEPHYR_KSCAN_INPUT_ENABLED
diff --git a/drivers/kscan/kscan_handlers.c b/drivers/kscan/kscan_handlers.c
deleted file mode 100644
index 81c97c19d04f7..0000000000000
--- a/drivers/kscan/kscan_handlers.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2019 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/kscan.h>
-#include <zephyr/internal/syscall_handler.h>
-
-static inline int z_vrfy_kscan_config(const struct device *dev,
-				      kscan_callback_t callback_isr)
-{
-	K_OOPS(K_SYSCALL_DRIVER_KSCAN(dev, config));
-	K_OOPS(K_SYSCALL_VERIFY_MSG(callback_isr == 0,
-				    "callback cannot be set from user mode"));
-	return z_impl_kscan_config((const struct device *)dev, callback_isr);
-}
-#include <zephyr/syscalls/kscan_config_mrsh.c>
-
-static inline int z_vrfy_kscan_disable_callback(const struct device *dev)
-{
-	K_OOPS(K_SYSCALL_DRIVER_KSCAN(dev, disable_callback));
-
-	return z_impl_kscan_disable_callback((const struct device *)dev);
-}
-#include <zephyr/syscalls/kscan_disable_callback_mrsh.c>
-
-static int z_vrfy_kscan_enable_callback(const struct device *dev)
-{
-	K_OOPS(K_SYSCALL_DRIVER_KSCAN(dev, enable_callback));
-
-	return z_impl_kscan_enable_callback((const struct device *)dev);
-}
-#include <zephyr/syscalls/kscan_enable_callback_mrsh.c>
diff --git a/drivers/kscan/kscan_input.c b/drivers/kscan/kscan_input.c
deleted file mode 100644
index 52c23f21ca32d..0000000000000
--- a/drivers/kscan/kscan_input.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#define DT_DRV_COMPAT zephyr_kscan_input
-
-#include <zephyr/drivers/kscan.h>
-#include <zephyr/input/input.h>
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(kscan_input, CONFIG_KSCAN_LOG_LEVEL);
-
-struct kscan_input_config {
-	const struct device *input_dev;
-};
-
-struct kscan_input_data {
-	bool enabled;
-	kscan_callback_t callback;
-	int row;
-	int col;
-	bool pressed;
-};
-
-static void kscan_input_cb(struct input_event *evt, void *user_data)
-{
-	const struct device *dev = user_data;
-	struct kscan_input_data *data = dev->data;
-
-	switch (evt->code) {
-	case INPUT_ABS_X:
-		data->col = evt->value;
-		break;
-	case INPUT_ABS_Y:
-		data->row = evt->value;
-		break;
-	case INPUT_BTN_TOUCH:
-		data->pressed = evt->value;
-		break;
-	}
-
-	if (evt->sync) {
-		LOG_DBG("input event: %3d %3d %d",
-			data->row, data->col, data->pressed);
-		if (data->callback) {
-			data->callback(dev, data->row, data->col, data->pressed);
-		}
-	}
-}
-
-static int kscan_input_configure(const struct device *dev,
-				      kscan_callback_t callback)
-{
-	struct kscan_input_data *data = dev->data;
-
-	if (!callback) {
-		LOG_ERR("Invalid callback (NULL)");
-		return -EINVAL;
-	}
-
-	data->callback = callback;
-
-	return 0;
-}
-
-static int kscan_input_enable_callback(const struct device *dev)
-{
-	struct kscan_input_data *data = dev->data;
-
-	data->enabled = true;
-
-	return 0;
-}
-
-static int kscan_input_disable_callback(const struct device *dev)
-{
-	struct kscan_input_data *data = dev->data;
-
-	data->enabled = false;
-
-	return 0;
-}
-
-static int kscan_input_init(const struct device *dev)
-{
-	const struct kscan_input_config *cfg = dev->config;
-
-	if (!device_is_ready(cfg->input_dev)) {
-		LOG_ERR("Input device not ready");
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static DEVICE_API(kscan, kscan_input_driver_api) = {
-	.config = kscan_input_configure,
-	.enable_callback = kscan_input_enable_callback,
-	.disable_callback = kscan_input_disable_callback,
-};
-
-#define KSCAN_INPUT_INIT(index) \
-	INPUT_CALLBACK_DEFINE_NAMED(DEVICE_DT_GET(DT_INST_PARENT(index)),      \
-				    kscan_input_cb,                            \
-				    (void *)DEVICE_DT_INST_GET(index),         \
-				    kscan_input_cb_##index);                   \
-	static const struct kscan_input_config kscan_input_config_##index = {  \
-		.input_dev = DEVICE_DT_GET(DT_INST_PARENT(index)),             \
-	};                                                                     \
-	static struct kscan_input_data kscan_input_data_##index;               \
-	DEVICE_DT_INST_DEFINE(index, kscan_input_init, NULL,                   \
-			      &kscan_input_data_##index,                       \
-			      &kscan_input_config_##index,                     \
-			      POST_KERNEL, CONFIG_KSCAN_INIT_PRIORITY,         \
-			      &kscan_input_driver_api);
-
-DT_INST_FOREACH_STATUS_OKAY(KSCAN_INPUT_INIT)
diff --git a/drivers/led/lp50xx.c b/drivers/led/lp50xx.c
index 57ffb1db3b0d8..bd1fd11b529e7 100644
--- a/drivers/led/lp50xx.c
+++ b/drivers/led/lp50xx.c
@@ -153,7 +153,8 @@ static int lp50xx_set_color(const struct device *dev, uint32_t led,
 {
 	const struct lp50xx_config *config = dev->config;
 	const struct led_info *led_info = lp50xx_led_to_info(config, led);
-	uint8_t buf[4];
+	uint8_t buf[LP50XX_COLORS_PER_LED + 1];
+	uint8_t i;
 
 	if (!led_info) {
 		return -ENODEV;
@@ -170,11 +171,11 @@ static int lp50xx_set_color(const struct device *dev, uint32_t led,
 	buf[0] = LP50XX_OUT0_COLOR(config->num_modules);
 	buf[0] += LP50XX_COLORS_PER_LED * led_info->index;
 
-	buf[1] = color[0];
-	buf[2] = color[1];
-	buf[3] = color[2];
+	for (i = 0; i < led_info->num_colors; i++) {
+		buf[1 + i] = color[i];
+	}
 
-	return i2c_write_dt(&config->bus, buf, sizeof(buf));
+	return i2c_write_dt(&config->bus, buf, led_info->num_colors + 1);
 }
 
 static int lp50xx_write_channels(const struct device *dev,
@@ -266,6 +267,7 @@ static int lp50xx_enable(const struct device *dev, bool enable)
 static int lp50xx_init(const struct device *dev)
 {
 	const struct lp50xx_config *config = dev->config;
+	uint8_t led;
 	int err;
 
 	if (!i2c_is_ready_dt(&config->bus)) {
@@ -273,6 +275,7 @@ static int lp50xx_init(const struct device *dev)
 		return -ENODEV;
 	}
 
+	/* Check LED configuration found in DT */
 	if (config->num_leds > config->max_leds) {
 		LOG_ERR("%s: invalid number of LEDs %d (max %d)",
 			dev->name,
@@ -280,6 +283,16 @@ static int lp50xx_init(const struct device *dev)
 			config->max_leds);
 		return -EINVAL;
 	}
+	for (led = 0; led < config->num_leds; led++) {
+		const struct led_info *led_info =
+			lp50xx_led_to_info(config, led);
+
+		if (led_info->num_colors > LP50XX_COLORS_PER_LED) {
+			LOG_ERR("%s: LED %d: invalid number of colors (max %d)",
+				dev->name, led, LP50XX_COLORS_PER_LED);
+			return -EINVAL;
+		}
+	}
 
 	/* Configure GPIO if present */
 	if (config->gpio_enable.port != NULL) {
diff --git a/drivers/led_strip/Kconfig.ws2812 b/drivers/led_strip/Kconfig.ws2812
index c9125b06d3e64..eb6cec6732a21 100644
--- a/drivers/led_strip/Kconfig.ws2812
+++ b/drivers/led_strip/Kconfig.ws2812
@@ -99,4 +99,4 @@ config WS2812_STRIP_RPI_PICO_PIO
 	select PICOSDK_USE_PIO
 	help
 	  Enable driver for WS2812 (and compatibles) LED strip using
-	  the RaspberryPi Pico's PIO.
+	  the Raspberry Pi Pico's PIO.
diff --git a/drivers/lora/rylrxxx.c b/drivers/lora/rylrxxx.c
index 6ed47d4c90e56..7dd4d21a8c1bb 100644
--- a/drivers/lora/rylrxxx.c
+++ b/drivers/lora/rylrxxx.c
@@ -335,7 +335,7 @@ static int rylr_config(const struct device *dev, struct lora_modem_config *confi
 	}
 
 	if (RYLR_IS_ASYNC_OP_PENDING(data->pending_async_flags)) {
-		LOG_ERR("pending async opperation");
+		LOG_ERR("pending async operation");
 		err = -EBUSY;
 		goto exit;
 	}
@@ -379,7 +379,7 @@ int rylr_send(const struct device *dev, uint8_t *payload, uint32_t payload_len)
 	}
 
 	if (RYLR_IS_ASYNC_OP_PENDING(data->pending_async_flags)) {
-		LOG_ERR("pending async opperation");
+		LOG_ERR("pending async operation");
 		err = -EBUSY;
 		goto exit;
 	}
@@ -423,7 +423,7 @@ int rylr_send_async(const struct device *dev, uint8_t *payload, uint32_t payload
 	}
 
 	if (RYLR_IS_ASYNC_OP_PENDING(data->pending_async_flags)) {
-		LOG_ERR("pending async opperation");
+		LOG_ERR("pending async operation");
 		err = -EBUSY;
 		goto bail;
 	}
@@ -484,7 +484,7 @@ int rylr_recv(const struct device *dev, uint8_t *ret_msg, uint8_t size, k_timeou
 	}
 
 	if (RYLR_IS_ASYNC_OP_PENDING(data->pending_async_flags)) {
-		LOG_ERR("pending async opperation");
+		LOG_ERR("pending async operation");
 		ret = -EBUSY;
 		goto exit;
 	}
@@ -542,7 +542,7 @@ int rylr_recv_async(const struct device *dev, lora_recv_cb cb, void *user_data)
 	data->async_rx_cb = cb;
 	data->async_user_data = user_data;
 	if (RYLR_IS_ASYNC_OP_PENDING(data->pending_async_flags)) {
-		LOG_ERR("pending async opperation");
+		LOG_ERR("pending async operation");
 		err = -EBUSY;
 		goto bail;
 	}
diff --git a/drivers/mbox/CMakeLists.txt b/drivers/mbox/CMakeLists.txt
index bc1a38cb0b0ef..5e4f61b9d03c8 100644
--- a/drivers/mbox/CMakeLists.txt
+++ b/drivers/mbox/CMakeLists.txt
@@ -20,3 +20,5 @@ zephyr_library_sources_ifdef(CONFIG_MBOX_NRF_BELLBOARD_TX mbox_nrf_bellboard_tx.
 zephyr_library_sources_ifdef(CONFIG_MBOX_STM32_HSEM   mbox_stm32_hsem.c)
 zephyr_library_sources_ifdef(CONFIG_MBOX_IVSHMEM mbox_ivshmem.c)
 zephyr_library_sources_ifdef(CONFIG_MBOX_TI_OMAP_MAILBOX   mbox_ti_omap.c)
+zephyr_library_sources_ifdef(CONFIG_MBOX_RENESAS_RZ_MHU mbox_renesas_rz_mhu.c)
+zephyr_library_sources_ifdef(CONFIG_MBOX_MHUV3   mbox_mhuv3.c)
diff --git a/drivers/mbox/Kconfig b/drivers/mbox/Kconfig
index 7c614849907d7..fe456b0b89e4c 100644
--- a/drivers/mbox/Kconfig
+++ b/drivers/mbox/Kconfig
@@ -24,6 +24,8 @@ source "drivers/mbox/Kconfig.stm32_hsem"
 source "drivers/mbox/Kconfig.esp32"
 source "drivers/mbox/Kconfig.ivshmem"
 source "drivers/mbox/Kconfig.ti_omap"
+source "drivers/mbox/Kconfig.renesas_rz"
+source "drivers/mbox/Kconfig.mhuv3"
 
 
 config MBOX_INIT_PRIORITY
diff --git a/drivers/mbox/Kconfig.mhuv3 b/drivers/mbox/Kconfig.mhuv3
new file mode 100644
index 0000000000000..6e28dae1f2fe5
--- /dev/null
+++ b/drivers/mbox/Kconfig.mhuv3
@@ -0,0 +1,27 @@
+#
+# SPDX-FileCopyrightText: <text>Copyright 2024-2025 Arm Limited and/or its
+# affiliates <open-source-office@arm.com></text>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config MBOX_MHUV3
+	bool "ARM MHUv3 mailbox driver"
+	depends on DT_HAS_ARM_MHUV3_ENABLED
+	default y
+	help
+	  Driver for Arm MHUv3 (Message Handling Unit v3)
+
+if MBOX_MHUV3
+
+config MBOX_MHUV3_NUM_DBCH
+	int "ARM MHUv3 mailbox doorbell number of channels"
+	default 0
+	help
+	  Maximum number of doorbell channels allowed in the Postbox/Mailbox.
+	  This number has to be less than or equal to (NUM_DBCH + 1) in PBX_DBCH_CFG0/MBX_DBCH_CFG0 registers.
+	  If the doorbell extension is supported then this number has to be bigger than zero.
+	  MHUv3 allows up to 128 doorbell channels.
+	  This configuration parameter is needed to avoid the dynamic memory allocation of doorbell channels
+	  data structures.
+
+endif
diff --git a/drivers/mbox/Kconfig.renesas_rz b/drivers/mbox/Kconfig.renesas_rz
new file mode 100644
index 0000000000000..0f58505945c03
--- /dev/null
+++ b/drivers/mbox/Kconfig.renesas_rz
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config MBOX_RENESAS_RZ_MHU
+	bool "Renesas RZ MHU Driver"
+	default y
+	depends on DT_HAS_RENESAS_RZ_MHU_MBOX_ENABLED
+	select USE_RZ_FSP_MHU
+	help
+	  Enable the RZ MHU driver.
+
+if MBOX_RENESAS_RZ_MHU
+
+config MBOX_BUSY_WAIT_TIMEOUT_US
+	int "MBOX send api timeout in microseconds"
+	default 10
+	help
+	  This option specifies the timeout duration for the `mbox_send` API to busy-wait for the
+	  remote processor to consume the previous message before sending a new one. If the
+	  message is not consumed within this time, `mbox_send` will return an error.
+	  Setting this value to 0 or a negative number will cause `mbox_send` to wait indefinitely
+	  until the previous message is consumed before sending a new one.
+
+endif
diff --git a/drivers/mbox/mbox_mhuv3.c b/drivers/mbox/mbox_mhuv3.c
new file mode 100644
index 0000000000000..b32a412939834
--- /dev/null
+++ b/drivers/mbox/mbox_mhuv3.c
@@ -0,0 +1,1563 @@
+/*
+ * SPDX-FileCopyrightText: <text>Copyright 2024-2025 Arm Limited and/or its
+ * affiliates <open-source-office@arm.com></text>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT	arm_mhuv3
+
+#include <zephyr/drivers/mbox.h>
+
+#include <zephyr/irq.h>
+#include <zephyr/kernel.h>
+
+#define LOG_LEVEL	CONFIG_MBOX_LOG_LEVEL
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(mbox_mhuv3);
+
+/* ====== MHUv3 Registers ====== */
+
+/* Maximum number of Doorbell channel windows */
+#define MHUV3_DBCW_MAX		      128
+/* Number of DBCH combined interrupt status registers */
+#define MHUV3_DBCH_CMB_INT_ST_REG_CNT 4
+
+/* Number of FFCH combined interrupt status registers */
+#define MHUV3_FFCH_CMB_INT_ST_REG_CNT 2
+
+#define MHUV3_FLAG_BITS		      32
+
+#define MHUV3_MAJOR_VERSION	      2
+
+/* Postbox/Mailbox Block Identifier */
+#define BLK_ID_BLK_ID		   GENMASK(3, 0)
+/* Postbox/Mailbox Feature Support 0 */
+#define FEAT_SPT0_DBE_SPT	   GENMASK(3, 0)
+#define FEAT_SPT0_FE_SPT	   GENMASK(7, 4)
+#define FEAT_SPT0_FCE_SPT	   GENMASK(11, 8)
+/* Postbox/Mailbox Feature Support 1 */
+#define FEAT_SPT1_AUTO_OP_SPT      GENMASK(3, 0)
+/* Postbox/Mailbox Doorbell Channel Configuration 0 */
+#define DBCH_CFG0_NUM_DBCH	   GENMASK(7, 0)
+/* Postbox/Mailbox FIFO Channel Configuration 0 */
+#define FFCH_CFG0_NUM_FFCH	   GENMASK(7, 0)
+#define FFCH_CFG0_P8BA_SPT	   BIT(8)
+#define FFCH_CFG0_P16BA_SPT	   BIT(9)
+#define FFCH_CFG0_P32BA_SPT	   BIT(10)
+#define FFCH_CFG0_P64BA_SPT	   BIT(11)
+#define FFCH_CFG0_FFCH_DEPTH	   GENMASK(25, 16)
+/* Postbox/Mailbox Fast Channel Configuration 0 */
+#define FCH_CFG0_NUM_FCH	   GENMASK(9, 0)
+#define FCH_CFG0_FCGI_SPT	   BIT(10)	/* MBX-only */
+#define FCH_CFG0_NUM_FCG	   GENMASK(15, 11)
+#define FCH_CFG0_NUM_FCH_PER_FCG   GENMASK(20, 16)
+#define FCH_CFG0_FCH_WS		   GENMASK(28, 21)
+/* Postbox/Mailbox Control */
+#define CTRL_OP_REQ		   BIT(0)
+#define	CTRL_CH_OP_MSK		   BIT(1)
+/* Mailbox Fast Channel Control */
+#define FCH_CTRL_INT_EN		   BIT(2)
+/* Postbox/Mailbox Implementer Identification Register */
+#define IIDR_IMPLEMENTER	   GENMASK(11, 0)
+#define IIDR_REVISION		   GENMASK(15, 12)
+#define IIDR_VARIANT		   GENMASK(19, 16)
+#define IIDR_PRODUCT_ID		   GENMASK(31, 20)
+/* Postbox/Mailbox Architecture Identification Register */
+#define AIDR_ARCH_MINOR_REV	   GENMASK(3, 0)
+#define AIDR_ARCH_MAJOR_REV	   GENMASK(7, 4)
+/* Postbox/Mailbox Doorbell/FIFO/Fast Channel Control */
+#define XBCW_CTRL_COMB_EN	   BIT(0)
+/* Postbox Doorbell Interrupt Status/Clear/Enable */
+#define PDBCW_INT_TFR_ACK	   BIT(0)
+
+/* Padding bitfields/fields represents hole in the regs MMIO */
+
+/* CTRL_Page */
+struct ctrl_page {
+	uint32_t blk_id;
+	uint8_t reserved0[12];
+	uint32_t feat_spt0;
+	uint32_t feat_spt1;
+	uint8_t reserved1[8];
+	uint32_t dbch_cfg0;
+	uint8_t reserved2[12];
+	uint32_t ffch_cfg0;
+	uint8_t reserved3[12];
+	uint32_t fch_cfg0;
+	uint8_t reserved4[188];
+	uint32_t x_ctrl;
+	/*-- MBX-only registers --*/
+	uint8_t reserved5[60];
+	uint32_t fch_ctrl;
+	uint32_t fcg_int_en;
+	uint8_t reserved6[696];
+	/*-- End of MBX-only ---- */
+	uint32_t dbch_int_st[MHUV3_DBCH_CMB_INT_ST_REG_CNT];
+	uint32_t ffch_int_st[MHUV3_FFCH_CMB_INT_ST_REG_CNT];
+	/*-- MBX-only registers --*/
+	uint8_t reserved7[88];
+	uint32_t fcg_int_st;
+	uint8_t reserved8[12];
+	uint32_t fcg_grp_int_st[32];
+	uint8_t reserved9[2760];
+	/*-- End of MBX-only ---- */
+	uint32_t iidr;
+	uint32_t aidr;
+	uint32_t imp_def_id[12];
+} __packed;
+
+/* DBCW_Page */
+struct pdbcw_page {
+	uint32_t st;
+	uint8_t reserved0[8];
+	uint32_t set;
+	uint32_t int_st;
+	uint32_t int_clr;
+	uint32_t int_en;
+	uint32_t ctrl;
+} __packed;
+
+struct mdbcw_page {
+	uint32_t st;
+	uint32_t st_msk;
+	uint32_t clr;
+	uint8_t reserved0[4];
+	uint32_t msk_st;
+	uint32_t msk_set;
+	uint32_t msk_clr;
+	uint32_t ctrl;
+} __packed;
+
+struct dummy_page {
+	uint8_t reserved0[KB(4)];
+} __packed;
+
+struct mhuv3_pbx_frame_reg {
+	struct ctrl_page ctrl;
+	struct pdbcw_page dbcw[MHUV3_DBCW_MAX];
+	struct dummy_page ffcw;
+	struct dummy_page fcw;
+	uint8_t reserved0[KB(4) * 11];
+	struct dummy_page impdef;
+} __packed;
+
+struct mhuv3_mbx_frame_reg {
+	struct ctrl_page ctrl;
+	struct mdbcw_page dbcw[MHUV3_DBCW_MAX];
+	struct dummy_page ffcw;
+	struct dummy_page fcw;
+	uint8_t reserved0[KB(4) * 11];
+	struct dummy_page impdef;
+} __packed;
+
+/* ====== MHUv3 data structures ====== */
+
+enum mbox_mhuv3_frame {
+	PBX_FRAME,
+	MBX_FRAME,
+};
+
+static char *mbox_mhuv3_str[] = {
+	"PBX",
+	"MBX"
+};
+
+enum mbox_mhuv3_extension_type {
+	DBE_EXT,
+	FCE_EXT,
+	FE_EXT,
+	NUM_EXT
+};
+
+static char *mbox_mhuv3_ext_str[] = {
+	"DBE",
+	"FCE",
+	"FE"
+};
+
+/** @brief MHUv3 channel information. */
+struct mbox_mhuv3_channel {
+	/** Channel window index associated to this mailbox channel. */
+	uint32_t ch_idx;
+	/**
+	 * Doorbell bit number within the @ch_idx window.
+	 * Only relevant to Doorbell transport.
+	 */
+	uint32_t doorbell;
+	/** Transport protocol specific operations for this channel. */
+	const struct mbox_mhuv3_protocol_ops *ops;
+	/** Callback function to execute on incoming message interrupts. */
+	mbox_callback_t cb;
+	/** Pointer to some private data provided at registration time */
+	void *user_data;
+};
+
+/** @brief MHUv3 operations */
+struct mbox_mhuv3_protocol_ops {
+	/** Receiver enable callback. */
+	int (*rx_enable)(const struct device *dev, struct mbox_mhuv3_channel *chan);
+	/** Receiver disable callback. */
+	int (*rx_disable)(const struct device *dev, struct mbox_mhuv3_channel *chan);
+	/** Read available Sender in-band LE data (if any). */
+	int *(*read_data)(const struct device *dev, struct mbox_mhuv3_channel *chan);
+	/**
+	 * Acknowledge data reception to the Sender. Any out-of-band data
+	 * has to have been already retrieved before calling this.
+	 */
+	int (*rx_complete)(const struct device *dev, struct mbox_mhuv3_channel *chan);
+	/** Sender enable callback. */
+	int (*tx_enable)(const struct device *dev, struct mbox_mhuv3_channel *chan);
+	/** Sender disable callback. */
+	int (*tx_disable)(const struct device *dev, struct mbox_mhuv3_channel *chan);
+	/** Report back to the Sender if the last transfer has completed. */
+	int (*last_tx_done)(const struct device *dev, struct mbox_mhuv3_channel *chan);
+	/** Send data to the receiver. */
+	int (*send_data)(const struct device *dev, struct mbox_mhuv3_channel *chan,
+			 const struct mbox_msg *msg);
+};
+
+/**
+ * @brief MHUv3 extension descriptor
+ */
+struct mbox_mhuv3_extension {
+	/** Type of extension. */
+	enum mbox_mhuv3_extension_type type;
+	/** Max number of channels found for this extension. */
+	uint32_t num_chans;
+	/**
+	 * First channel number assigned to this extension, picked from
+	 * the set of all mailbox channels descriptors created.
+	 */
+	uint32_t base_ch_idx;
+	/** Extension specific helper to parse DT and lookup associated
+	 *  channel from the related 'mboxes' property.
+	 */
+	struct mbox_mhuv3_channel *(*get_channel)(const struct device *dev,
+						  uint32_t channel,
+						  uint32_t param);
+	/** Extension specific helper to setup the combined irq. */
+	void (*combined_irq_setup)(const struct device *dev);
+	/** Extension specific helper to initialize channels. */
+	int (*channels_init)(const struct device *dev, uint32_t *base_ch_idx);
+	/**
+	 * Extension specific helper to lookup which channel
+	 * triggered the combined irq.
+	 */
+	struct mbox_mhuv3_channel *(*chan_from_comb_irq_get)(const struct device *dev);
+	/** Extension specifier helper to get maximum data size. */
+	int (*mtu_get)(void);
+	/** Array of per-channel pending doorbells. */
+	uint32_t pending_db[MHUV3_DBCW_MAX];
+	/** Protect access to pending_db */
+	struct k_spinlock pending_lock;
+};
+
+/**
+ * @brief MHUv3 mailbox configuration data
+ */
+struct mbox_mhuv3_config {
+	/** A reference to the MHUv3 control page for this block. */
+	struct ctrl_page *ctrl;
+	union {
+		/** Base address of the PBX register mapping region. */
+		struct mhuv3_pbx_frame_reg *pbx;
+		/** Base address of the MBX register mapping region. */
+		struct mhuv3_mbx_frame_reg *mbx;
+	};
+	/** Interrupt configuration function pointer. */
+	void (*cmb_irq_config)(const struct device *dev);
+};
+
+/**
+ * @brief MHUv3 mailbox controller data
+ */
+struct mbox_mhuv3_data {
+	/** Frame type: MBX_FRAME or PBX_FRAME. */
+	enum mbox_mhuv3_frame frame;
+	/** Flag to indicate if the MHU supports AutoOp full mode. */
+	bool auto_op_full;
+	/** MHUv3 controller architectural major version. */
+	uint32_t major;
+	/** MHUv3 controller architectural minor version. */
+	uint32_t minor;
+	/** MHUv3 controller IIDR implementer. */
+	uint32_t implem;
+	/** MHUv3 controller IIDR revision. */
+	uint32_t rev;
+	/** MHUv3 controller IIDR variant. */
+	uint32_t var;
+	/** MHUv3 controller IIDR product_id. */
+	uint32_t prod_id;
+	/** The total number of channels discovered across all extensions. */
+	uint32_t num_chans;
+	/** Array holding descriptors for any found implemented extension. */
+	struct mbox_mhuv3_extension ext[NUM_EXT];
+	/** Array of channels */
+	/**
+	 * TODO: The total number of channels should be increased when the rest of the
+	 * extensions get supported.
+	 */
+	struct mbox_mhuv3_channel channels[CONFIG_MBOX_MHUV3_NUM_DBCH][MHUV3_FLAG_BITS];
+};
+
+typedef int (*mhuv3_extension_initializer)(const struct device *dev);
+
+/* =========================== Utility Functions =========================== */
+
+/**
+ * @brief Reads a bitmask from a 32-bit memory-mapped register.
+ *
+ * Extracts and returns the value of bits specified by a bitmask
+ * from the register at the given memory address.
+ *
+ * @param addr Address of the 32-bit register.
+ * @param bitmask Bitmask specifying the bits to extract.
+ *
+ * @return Extracted bitmask value.
+ */
+static ALWAYS_INLINE uint32_t read_bitmask32(mem_addr_t addr, uint32_t bitmask)
+{
+	uint32_t reg = sys_read32(addr);
+
+	return FIELD_GET(bitmask, reg);
+}
+
+/**
+ * @brief Writes a bitmask to a 32-bit memory-mapped register.
+ *
+ * Updates bits specified by a bitmask in the register at the given
+ * memory address with the provided data value.
+ *
+ * @param data Value to write to the specified bits.
+ * @param addr Address of the 32-bit register.
+ * @param bitmask Bitmask specifying the bits to update.
+ */
+static ALWAYS_INLINE void write_bitmask32(uint32_t data, mem_addr_t addr, uint32_t bitmask)
+{
+	uint32_t reg = sys_read32(addr);
+
+	reg &= ~bitmask;
+	reg |= FIELD_PREP(bitmask, data);
+	sys_write32(reg, addr);
+}
+
+/* =================== Doorbell transport protocol operations =============== */
+
+/**
+ * @brief Enables transfer acknowledgment events for a channel.
+ *
+ * @param dev Pointer to the device structure.
+ * @param chan Pointer to the MHUv3 channel structure.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_doorbell_tx_enable(const struct device *dev, struct mbox_mhuv3_channel *chan)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+
+	if (chan->ch_idx >= MHUV3_DBCW_MAX) {
+		return -EINVAL;
+	}
+
+	/* Enable Transfer Acknowledgment events */
+	write_bitmask32(0x1,
+			(mem_addr_t)&cfg->pbx->dbcw[chan->ch_idx].int_en,
+			PDBCW_INT_TFR_ACK);
+
+	return 0;
+}
+
+/**
+ * @brief Disables transfer acknowledgment events for a channel.
+ *
+ * Disables Transfer Acknowledgment events and clears the corresponding
+ * interrupt and pending doorbell for the specified channel.
+ *
+ * @param dev Pointer to the device structure.
+ * @param chan Pointer to the MHUv3 channel structure.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_doorbell_tx_disable(const struct device *dev, struct mbox_mhuv3_channel *chan)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+	struct pdbcw_page *dbcw = cfg->pbx->dbcw;
+
+	if (chan->ch_idx >= MHUV3_DBCW_MAX) {
+		return -EINVAL;
+	}
+
+	/* Disable Channel Transfer Acknowledgment events */
+	write_bitmask32(0x0, (mem_addr_t)&dbcw[chan->ch_idx].int_en, PDBCW_INT_TFR_ACK);
+
+	/* Clear Channel Transfer Acknowledgment and pending doorbell */
+	write_bitmask32(0x1, (mem_addr_t)&dbcw[chan->ch_idx].int_clr, PDBCW_INT_TFR_ACK);
+	K_SPINLOCK(&ext->pending_lock) {
+		ext->pending_db[chan->ch_idx] = 0;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Enables transfer events for a channel.
+ *
+ * @param dev Pointer to the device structure.
+ * @param chan Pointer to the MHUv3 channel structure.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_doorbell_rx_enable(const struct device *dev, struct mbox_mhuv3_channel *chan)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+
+	if (chan->ch_idx >= MHUV3_DBCW_MAX) {
+		return -EINVAL;
+	}
+
+	/* Unmask Channel Transfer events */
+	sys_set_bit((mem_addr_t)&cfg->mbx->dbcw[chan->ch_idx].msk_clr, chan->doorbell);
+
+	return 0;
+}
+
+/**
+ * @brief Disables transfer events for a channel.
+ *
+ * @param dev Pointer to the device structure.
+ * @param chan Pointer to the MHUv3 channel structure.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_doorbell_rx_disable(const struct device *dev, struct mbox_mhuv3_channel *chan)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+
+	if (chan->ch_idx >= MHUV3_DBCW_MAX) {
+		return -EINVAL;
+	}
+
+	/* Mask Channel Transfer events */
+	sys_set_bit((mem_addr_t)&cfg->mbx->dbcw[chan->ch_idx].msk_set, chan->doorbell);
+
+	return 0;
+}
+
+/**
+ * @brief Completes a transfer event for a channel.
+ *
+ * @param dev Pointer to the device structure.
+ * @param chan Pointer to the MHUv3 channel structure.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_doorbell_rx_complete(const struct device *dev,
+					   struct mbox_mhuv3_channel *chan)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+
+	if (chan->ch_idx >= MHUV3_DBCW_MAX) {
+		return -EINVAL;
+	}
+
+	/* Clearing the pending transfer generates the Channel Transfer Acknowledge */
+	sys_set_bit((mem_addr_t)&cfg->mbx->dbcw[chan->ch_idx].clr, chan->doorbell);
+
+	return 0;
+}
+
+/**
+ * @brief Checks if the last transfer for a channel is complete.
+ *
+ * Determines whether the last transfer for the specified channel in the
+ * Doorbell Channel Window (DBCW) register is complete. If the transfer is
+ * complete, it also clears the pending doorbell for the channel.
+ *
+ * @param dev Pointer to the device structure.
+ * @param chan Pointer to the MHUv3 channel structure.
+ *
+ * @return 0 if the last transfer is complete, or a negative error code otherwise.
+ */
+static int mbox_mhuv3_doorbell_last_tx_done(const struct device *dev,
+					    struct mbox_mhuv3_channel *chan)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+
+	if (chan->ch_idx >= MHUV3_DBCW_MAX) {
+		return -EINVAL;
+	}
+
+	bool done = !(sys_test_bit((mem_addr_t)&cfg->pbx->dbcw[chan->ch_idx].st, chan->doorbell));
+
+	if (done) {
+		struct mbox_mhuv3_data *data = dev->data;
+		struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+
+		/* Take care to clear the pending doorbell also when polling */
+		K_SPINLOCK(&ext->pending_lock) {
+			sys_clear_bit((mem_addr_t)&ext->pending_db[chan->ch_idx], chan->doorbell);
+		}
+
+		return 0;
+	}
+
+	return -EBUSY;
+}
+
+/**
+ * @brief Sends data via the specified channel.
+ *
+ * Attempts to send data using the specified channel. If the channel is
+ * busy (i.e., a transfer is already in progress), it returns an error.
+ * It also sets the appropriate flags to indicate pending data.
+ *
+ * @param dev Pointer to the device structure.
+ * @param chan Pointer to the MHUv3 channel structure.
+ * @param msg Pointer to the message structure containing data to be sent.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_doorbell_send_data(const struct device *dev,
+					 struct mbox_mhuv3_channel *chan,
+					 const struct mbox_msg *msg)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+	int ret = 0;
+
+	if (chan->ch_idx >= MHUV3_DBCW_MAX) {
+		return -EINVAL;
+	}
+
+	if (msg) {
+		LOG_WRN("Doorbell extension does not support sending data");
+	}
+
+	K_SPINLOCK(&ext->pending_lock) {
+		if (sys_test_bit((mem_addr_t)&ext->pending_db[chan->ch_idx], chan->doorbell)) {
+			ret = -EBUSY;
+		} else {
+			sys_set_bit((mem_addr_t)&ext->pending_db[chan->ch_idx], chan->doorbell);
+		}
+	}
+
+	if (ret == 0) {
+		sys_set_bit((mem_addr_t)&cfg->pbx->dbcw[chan->ch_idx].set, chan->doorbell);
+	}
+
+	return ret;
+}
+
+static const struct mbox_mhuv3_protocol_ops mhuv3_doorbell_ops = {
+	.tx_enable = mbox_mhuv3_doorbell_tx_enable,
+	.tx_disable = mbox_mhuv3_doorbell_tx_disable,
+	.rx_enable = mbox_mhuv3_doorbell_rx_enable,
+	.rx_disable = mbox_mhuv3_doorbell_rx_disable,
+	.rx_complete = mbox_mhuv3_doorbell_rx_complete,
+	.last_tx_done = mbox_mhuv3_doorbell_last_tx_done,
+	.send_data = mbox_mhuv3_doorbell_send_data,
+};
+
+/**
+ * @brief Retrieves the MHUv3 channel based on the provided channel ID.
+ *
+ * This function extracts the channel and doorbell numbers from the
+ * given Flattened Channel ID, and retrieves the corresponding channel
+ * from the Doorbell extension. The Flattened Channel ID is calculated
+ * using the formula: Channel ID * MHUV3_FLAG_BITS + Doorbell.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel_id The Flattened Channel ID that contains both the
+ *		     channel and doorbell information.
+ *
+ * @return Pointer to the corresponding MHUv3 channel structure.
+ */
+static struct mbox_mhuv3_channel *mbox_mhuv3_get_channel(const struct device *dev,
+							 mbox_channel_id_t channel_id)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+	uint32_t channel, doorbell;
+
+	/**
+	 * TODO: The type of extension, channel and doorbell should be
+	 * extracted from a struct passed to this function from device tree,
+	 * but mbox_channel_id_t is only a Flattened Channel ID,
+	 * where Flattened Channel ID = Channel ID * MHUV3_FLAG_BITS + Doorbell
+	 * Until this is changed, Pin the type to Doorbell extension and use
+	 * the next formula to get the actual channel and doorbell numbers.
+	 */
+	enum mbox_mhuv3_extension_type type = DBE_EXT;
+
+	channel = channel_id / MHUV3_FLAG_BITS;
+	doorbell = channel_id % MHUV3_FLAG_BITS;
+
+	return data->ext[type].get_channel(dev, channel, doorbell);
+}
+
+/**
+ * @brief Sends data using the specified MHUv3 sender channel.
+ *
+ * This function checks if the last transmission is complete for the
+ * specified channel. If not, it returns an error. If the channel is
+ * available, it proceeds to send the data using the channel's send_data
+ * operation.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel_id The ID of the channel to use for sending data.
+ * @param msg Pointer to the message structure containing the data to be sent.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_sender_send_data(const struct device *dev,
+				       mbox_channel_id_t channel_id,
+				       const struct mbox_msg *msg)
+{
+	struct mbox_mhuv3_channel *chan = mbox_mhuv3_get_channel(dev, channel_id);
+	int ret;
+
+	ret = chan->ops->last_tx_done(dev, chan);
+	if (ret) {
+		return ret;
+	}
+
+	return chan->ops->send_data(dev, chan, msg);
+}
+
+/**
+ * @brief Attempts to send data using the MHUv3 receiver channel (not supported).
+ *
+ * This function logs an error as transmitting data on an MHUv3 receiver channel
+ * is not supported and returns an I/O error.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel_id The ID of the channel (unused).
+ * @param msg Pointer to the message structure (unused).
+ *
+ * @return -ENOTSUP to indicate an I/O error as transmission is not supported.
+ */
+static int mbox_mhuv3_receiver_send_data(const struct device *dev,
+					 mbox_channel_id_t channel_id,
+					 const struct mbox_msg *msg)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(channel_id);
+	ARG_UNUSED(msg);
+
+	LOG_ERR("Trying to transmit on a MBX MHUv3 frame");
+
+	return -ENOTSUP;
+}
+
+/**
+ * @brief Sends data based on the frame type.
+ *
+ * This function determines whether to send data using the sender or receiver
+ * functions based on the current frame type.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel_id The ID of the channel to use for sending data.
+ * @param msg Pointer to the message structure containing the data to be sent.
+ *
+ * @return 0 on success, an error code on failure.
+ */
+static int mbox_mhuv3_send_data(const struct device *dev,
+				mbox_channel_id_t channel_id,
+				const struct mbox_msg *msg)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+
+	if (data->frame == PBX_FRAME) {
+		return mbox_mhuv3_sender_send_data(dev, channel_id, msg);
+	}
+
+	return mbox_mhuv3_receiver_send_data(dev, channel_id, msg);
+}
+
+/**
+ * @brief Retrieves the MHUv3 channel based on the specified channel and doorbell.
+ *
+ * This function returns the channel structure for the given channel and doorbell
+ * numbers.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel The channel number to retrieve.
+ * @param doorbell The doorbell number to retrieve.
+ *
+ * @return Pointer to the corresponding MHUv3 channel structure, or NULL if invalid.
+ */
+static struct mbox_mhuv3_channel *mbox_mhuv3_dbe_get_channel(const struct device *dev,
+							     uint32_t channel,
+							     uint32_t doorbell)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+
+	if (channel >= ext->num_chans || doorbell >= MHUV3_FLAG_BITS) {
+		LOG_ERR("Couldn't find a valid channel (%d: %d)", channel, doorbell);
+		return NULL;
+	}
+
+	return &data->channels[ext->base_ch_idx + channel][doorbell];
+}
+
+/**
+ * @brief Configures the combined IRQ for the MHUv3 device.
+ *
+ * This function sets up the combined interrupt handling for the specified device,
+ * configuring the interrupt enable, clear, and control registers for each channel.
+ * It handles both PBX and non-PBX frame types differently.
+ *
+ * @param dev Pointer to the device structure.
+ */
+static void mbox_mhuv3_dbe_combined_irq_setup(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+	uint32_t i;
+
+	if (data->frame == PBX_FRAME) {
+		struct pdbcw_page *dbcw = cfg->pbx->dbcw;
+
+		for (i = 0; i < ext->num_chans; i++) {
+			write_bitmask32(0x1, (mem_addr_t)&dbcw[i].int_clr, PDBCW_INT_TFR_ACK);
+			write_bitmask32(0x0, (mem_addr_t)&dbcw[i].int_en, PDBCW_INT_TFR_ACK);
+			write_bitmask32(0x1, (mem_addr_t)&dbcw[i].ctrl, XBCW_CTRL_COMB_EN);
+		}
+	} else {
+		struct mdbcw_page *dbcw = cfg->mbx->dbcw;
+
+		for (i = 0; i < ext->num_chans; i++) {
+			sys_write32(0xFFFFFFFFU, (mem_addr_t)&dbcw[i].clr);
+			sys_write32(0xFFFFFFFFU, (mem_addr_t)&dbcw[i].msk_set);
+			write_bitmask32(0x1, (mem_addr_t)&dbcw[i].ctrl, XBCW_CTRL_COMB_EN);
+		}
+	}
+}
+
+/**
+ * @brief Initializes the MHUv3 DBE channels.
+ *
+ * This function initializes the MHUv3 DBE channels by assigning the base index,
+ * configuring each channel with its corresponding index and doorbell, and
+ * setting the appropriate channel operations. It updates the base channel index
+ * after initialization.
+ *
+ * @param dev Pointer to the device structure.
+ * @param base_ch_idx Pointer to the base channel index.
+ *
+ * @return 0 on success.
+ */
+static int mbox_mhuv3_dbe_channels_init(const struct device *dev, uint32_t *base_ch_idx)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+	struct mbox_mhuv3_channel *chan;
+
+	__ASSERT(((*base_ch_idx + ext->num_chans) * MHUV3_FLAG_BITS) < data->num_chans,
+		 "The number of allocated channels is less than required by the MHUv3 extension");
+
+	ext->base_ch_idx = *base_ch_idx;
+	chan = &data->channels[*base_ch_idx];
+
+	for (uint32_t i = 0; i < ext->num_chans; i++) {
+		for (uint32_t k = 0; k < MHUV3_FLAG_BITS; k++) {
+			chan->ch_idx = i;
+			chan->doorbell = k;
+			chan->ops = &mhuv3_doorbell_ops;
+			chan++;
+		}
+	}
+
+	*base_ch_idx += ext->num_chans;
+
+	return 0;
+}
+
+/**
+ * @brief Searches for the active doorbell for the given MHUv3 DBE channel.
+ *
+ * This function checks the interrupt status and identifies which doorbell has been
+ * triggered for the specified channel. It returns the doorbell index if found or
+ * logs a warning if an unexpected interrupt occurs.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel The channel to check for the doorbell.
+ * @param doorbell Pointer to store the found doorbell index.
+ *
+ * @return true if a doorbell is found, false if an unexpected IRQ is encountered.
+ */
+static bool mbox_mhuv3_dbe_doorbell_search(const struct device *dev,
+					   uint32_t channel,
+					   uint32_t *doorbell)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+	uint32_t st;
+
+	__ASSERT(channel < MHUV3_DBCW_MAX,
+		 "Number of channels exceeds the maximum number of doorbell channel windows.");
+
+	if (data->frame == PBX_FRAME) {
+		uint32_t active_doorbells, fired_doorbells;
+
+		st = read_bitmask32((mem_addr_t)&cfg->pbx->dbcw[channel].int_st, PDBCW_INT_TFR_ACK);
+		if (!st) {
+			goto unexpected_irq;
+		}
+		active_doorbells = sys_read32((mem_addr_t)&cfg->pbx->dbcw[channel].st);
+		K_SPINLOCK(&ext->pending_lock) {
+			fired_doorbells = ext->pending_db[channel] & ~active_doorbells;
+			if (!fired_doorbells) {
+				K_SPINLOCK_BREAK;
+			}
+
+			*doorbell = find_lsb_set(fired_doorbells) - 1;
+			ext->pending_db[channel] &= ~BIT(*doorbell);
+		}
+		if (!fired_doorbells) {
+			goto unexpected_irq;
+		}
+		/* If no other pending doorbells, clear the transfer acknowledge */
+		if (!(fired_doorbells & ~BIT(*doorbell))) {
+			write_bitmask32(0x1, (mem_addr_t)&cfg->pbx->dbcw[channel].int_clr,
+					PDBCW_INT_TFR_ACK);
+		}
+	} else {
+		st = sys_read32((mem_addr_t)&cfg->mbx->dbcw[channel].st_msk);
+		if (!st) {
+			goto unexpected_irq;
+		}
+
+		*doorbell = find_lsb_set(st) - 1;
+	}
+
+	return true;
+
+unexpected_irq:
+	LOG_WRN("Unexpected IRQ on %s channel:%d", mbox_mhuv3_str[data->frame], channel);
+
+	return false;
+}
+
+/**
+ * @brief Retrieves the channel corresponding to a combined interrupt.
+ *
+ * This function checks the combined interrupt status for the MHUv3 DBE device and
+ * identifies the channel and doorbell associated with the interrupt. It returns the
+ * matching channel if found, or NULL if no valid channel is identified.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return Pointer to the mbox_mhuv3_channel if a valid channel is found, NULL otherwise.
+ */
+static struct mbox_mhuv3_channel *mbox_mhuv3_dbe_chan_from_comb_irq_get(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+
+	for (uint32_t i = 0; i < MHUV3_DBCH_CMB_INT_ST_REG_CNT; i++) {
+		uint32_t channel, doorbell, int_st;
+
+		int_st = sys_read32((mem_addr_t)&cfg->ctrl->dbch_int_st[i]);
+		if (!int_st) {
+			continue;
+		}
+
+		channel = i * MHUV3_FLAG_BITS + (find_lsb_set(int_st) - 1);
+		if (channel >= ext->num_chans) {
+			LOG_ERR("Invalid %s channel: %d", mbox_mhuv3_str[data->frame], channel);
+			return NULL;
+		}
+
+		if (!mbox_mhuv3_dbe_doorbell_search(dev, channel, &doorbell)) {
+			continue;
+		}
+
+		LOG_DBG("Found %s channel [%d], doorbell[%d]",
+			mbox_mhuv3_str[data->frame], channel, doorbell);
+		return &data->channels[channel][doorbell];
+	}
+
+	return NULL;
+}
+
+/**
+ * @brief Retrieves the maximum transmit units for doorbell extension.
+ *
+ * @return 0 as doorbell extension does not support transmitting data.
+ */
+static int mbox_mhuv3_dbe_mtu_get(void)
+{
+	return 0;
+}
+
+/**
+ * @brief Initializes the Doorbell Extension (DBE) for the MHUv3 device.
+ *
+ * This function initializes the Doorbell Extension (DBE) by reading the number
+ * of channels from the device's control registers, and setting up necessary handlers.
+ * If the feature is not supported, it returns early. It also updates the device's
+ * data with the number of channels available and the extension's function pointers.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return 0 if initialization is successful, negative error code if there is a failure.
+ */
+static int mbox_mhuv3_dbe_init(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_extension *ext = &data->ext[DBE_EXT];
+	uint32_t num_chans;
+
+	if (!read_bitmask32((mem_addr_t)&cfg->ctrl->feat_spt0, FEAT_SPT0_DBE_SPT)) {
+		return 0;
+	}
+
+	LOG_DBG("%s: Initializing Doorbell Extension.", mbox_mhuv3_str[data->frame]);
+
+	ext->type = DBE_EXT;
+	/* Note that, by the spec, the number of channels is (num_dbch + 1) */
+	num_chans = read_bitmask32((mem_addr_t)&cfg->ctrl->dbch_cfg0, DBCH_CFG0_NUM_DBCH) + 1;
+	__ASSERT(CONFIG_MBOX_MHUV3_NUM_DBCH >= num_chans,
+		"The number of configured doorbell channels is less than required by the MHUv3 extension");
+	ext->num_chans = num_chans;
+	ext->get_channel = mbox_mhuv3_dbe_get_channel;
+	ext->combined_irq_setup = mbox_mhuv3_dbe_combined_irq_setup;
+	ext->channels_init = mbox_mhuv3_dbe_channels_init;
+	ext->chan_from_comb_irq_get = mbox_mhuv3_dbe_chan_from_comb_irq_get;
+	ext->mtu_get = mbox_mhuv3_dbe_mtu_get;
+
+	data->num_chans += ext->num_chans * MHUV3_FLAG_BITS;
+
+	LOG_DBG("%s: found %d DBE channels.", mbox_mhuv3_str[data->frame], ext->num_chans);
+
+	return 0;
+}
+
+/**
+ * @brief Initializes the Fast Channel Extension (FCE) for the MHUv3 device.
+ *
+ * This function initializes the Fast Channel Extension (FCE). Currently,
+ * FCE is not supported.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return 0, indicating that the function completes successfully.
+ */
+static int mbox_mhuv3_fce_init(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+
+	if (!read_bitmask32((mem_addr_t)&cfg->ctrl->feat_spt0, FEAT_SPT0_FCE_SPT)) {
+		return 0;
+	}
+
+	LOG_DBG("%s: Fast Channel Extension is not supported by driver.",
+		mbox_mhuv3_str[data->frame]);
+
+	return 0;
+}
+
+/**
+ * @brief Initializes the FIFO Extension (FE) for the MHUv3 device.
+ *
+ * This function initializes the FIFO Extension (FE). Currently,
+ * FE is not supported.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return 0, indicating that the function completes successfully.
+ */
+static int mbox_mhuv3_fe_init(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+
+	if (!read_bitmask32((mem_addr_t)&cfg->ctrl->feat_spt0, FEAT_SPT0_FE_SPT)) {
+		return 0;
+	}
+
+	LOG_DBG("%s: FIFO Extension is not supported by driver.", mbox_mhuv3_str[data->frame]);
+
+	return 0;
+}
+
+static mhuv3_extension_initializer mhuv3_extension_init[NUM_EXT] = {
+	mbox_mhuv3_dbe_init,
+	mbox_mhuv3_fce_init,
+	mbox_mhuv3_fe_init,
+};
+
+/**
+ * @brief Initializes the channels for the MHUv3 device.
+ *
+ * This function allocates memory for the channels array and initializes
+ * each channel based on the device's extensions. It calls the `channels_init`
+ * function for each extension and updates the base channel index accordingly.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_initialize_channels(const struct device *dev)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+	uint32_t base_ch_idx = 0;
+	int ret = 0;
+
+	for (uint32_t i = 0; i < NUM_EXT && !ret; i++) {
+		struct mbox_mhuv3_extension *ext = &data->ext[i];
+
+		if (ext->num_chans > 0) {
+			ret = ext->channels_init(dev, &base_ch_idx);
+		}
+	}
+
+	return ret;
+}
+
+/**
+ * @brief Initializes the MHUv3 frame for the device.
+ *
+ * This function reads the block ID to determine the frame type (PBX or MBX),
+ * retrieves the version and implementer information, and checks if the frame
+ * is supported. It also handles the initialization of extensions for the MHUv3 device.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return 0 on success, or a negative error code on failure (e.g., -EIO, -ENOMEM).
+ */
+static int mbox_mhuv3_frame_init(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+	struct mbox_mhuv3_data *data = dev->data;
+
+	data->frame = read_bitmask32((mem_addr_t)&cfg->ctrl->blk_id, BLK_ID_BLK_ID);
+	if (data->frame > MBX_FRAME) {
+		LOG_ERR("Invalid Frame type- %d", data->frame);
+		return -EIO;
+	}
+
+	data->major = read_bitmask32((mem_addr_t)&cfg->ctrl->aidr, AIDR_ARCH_MAJOR_REV);
+	data->minor = read_bitmask32((mem_addr_t)&cfg->ctrl->aidr, AIDR_ARCH_MINOR_REV);
+	data->implem = read_bitmask32((mem_addr_t)&cfg->ctrl->iidr, IIDR_IMPLEMENTER);
+	data->rev = read_bitmask32((mem_addr_t)&cfg->ctrl->iidr, IIDR_REVISION);
+	data->var = read_bitmask32((mem_addr_t)&cfg->ctrl->iidr, IIDR_VARIANT);
+	data->prod_id = read_bitmask32((mem_addr_t)&cfg->ctrl->iidr, IIDR_PRODUCT_ID);
+	if (data->major != MHUV3_MAJOR_VERSION) {
+		LOG_ERR("Unsupported MHU %s block - major:%d  minor:%d",
+			mbox_mhuv3_str[data->frame], data->major, data->minor);
+		return -EIO;
+	}
+
+	data->auto_op_full = !!read_bitmask32((mem_addr_t)&cfg->ctrl->feat_spt1,
+					      FEAT_SPT1_AUTO_OP_SPT);
+	/* Request the PBX/MBX to remain operational */
+	if (data->auto_op_full) {
+		write_bitmask32(0x1, (mem_addr_t)&cfg->ctrl->x_ctrl, CTRL_OP_REQ);
+	}
+
+	LOG_DBG("Found MHU %s block - major:%d  minor:%d\n"
+		"  implem:0x%X  rev:0x%X  var:0x%X  prod_id:0x%X",
+		mbox_mhuv3_str[data->frame], data->major, data->minor,
+		data->implem, data->rev, data->var, data->prod_id);
+
+	for (uint32_t i = 0; i < NUM_EXT; i++) {
+		uint32_t ret;
+		/*
+		 * Note that extensions initialization fails only when such
+		 * extension initialization routine fails and the extensions
+		 * was found to be supported in hardware and in software.
+		 */
+		ret = mhuv3_extension_init[i](dev);
+		if (ret) {
+			LOG_ERR("Failed to initialize %s %s: %d",
+				mbox_mhuv3_str[data->frame],
+				mbox_mhuv3_ext_str[i],
+				ret);
+			return -EIO;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Handles the PBX combined interrupt for the MHUv3 device.
+ *
+ * This function iterates through all available extensions and checks for channels
+ * that are part of the combined interrupt mechanism.
+ *
+ * @param dev Pointer to the device structure.
+ */
+static void mbox_mhuv3_pbx_comb_interrupt(const struct device *dev)
+{
+	uint32_t found = 0;
+
+	for (uint32_t i = 0; i < NUM_EXT; i++) {
+		struct mbox_mhuv3_data *data = dev->data;
+		struct mbox_mhuv3_extension *ext = &data->ext[i];
+		struct mbox_mhuv3_channel *chan;
+
+		/* FCE does not participate to the PBX combined */
+		if (i == FCE_EXT || ext->num_chans == 0) {
+			continue;
+		}
+
+		chan = ext->chan_from_comb_irq_get(dev);
+		if (!chan) {
+			continue;
+		}
+
+		found++;
+
+		if (!chan->ops) {
+			LOG_WRN("TX Ack on UNBOUND channel (%u)", chan->ch_idx);
+			continue;
+		}
+	}
+
+	if (found == 0) {
+		LOG_WRN("Failed to find channel for the TX interrupt");
+	}
+}
+
+/**
+ * @brief Handles the MBX combined interrupt for the MHUv3 device.
+ *
+ * This function iterates through all available extensions and checks for channels
+ * that are part of the combined interrupt mechanism. It reads data from the channel
+ * if available and invokes the appropriate callback for the channel.
+ *
+ * @param dev Pointer to the device structure.
+ */
+static void mbox_mhuv3_mbx_comb_interrupt(const struct device *dev)
+{
+	uint32_t found = 0;
+
+	for (uint32_t i = 0; i < NUM_EXT; i++) {
+		struct mbox_mhuv3_data *data = dev->data;
+		struct mbox_mhuv3_extension *ext = &data->ext[i];
+		struct mbox_mhuv3_channel *chan;
+		uint32_t flattened_ch_idx;
+
+		if (ext->num_chans == 0) {
+			continue;
+		}
+
+		chan = ext->chan_from_comb_irq_get(dev);
+		if (!chan) {
+			continue;
+		}
+
+		found++;
+
+		if (!chan->ops) {
+			LOG_WRN("RX Data on UNBOUND channel (%u)", chan->ch_idx);
+		}
+
+		if (chan->ops->read_data) {
+			void *data = chan->ops->read_data(dev, chan);
+
+			if (!data) {
+				LOG_ERR("Failed to read in-band data.");
+				goto rx_ack;
+			}
+		}
+
+		/* Call channel call back */
+		flattened_ch_idx = chan->ch_idx * MHUV3_FLAG_BITS + chan->doorbell;
+		chan->cb(dev, flattened_ch_idx, chan->user_data, NULL);
+
+rx_ack:
+		if (chan->ops->rx_complete) {
+			chan->ops->rx_complete(dev, chan);
+		}
+	}
+
+	if (found == 0) {
+		LOG_ERR("Failed to find channel for the RX interrupt");
+	}
+}
+
+/**
+ * @brief Handles the combined interrupt for the MHUv3 device, based on the frame type.
+ *
+ * This function checks the current frame type of the MHUv3 device (PBX or MBX) and
+ * delegates the interrupt handling to the appropriate function.
+ *
+ * @param dev Pointer to the device structure.
+ */
+static void mbox_mhuv3_comb_interrupt(const struct device *dev)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+
+	if (data->frame == PBX_FRAME) {
+		mbox_mhuv3_pbx_comb_interrupt(dev);
+	} else {
+		mbox_mhuv3_mbx_comb_interrupt(dev);
+	}
+}
+
+/**
+ * @brief Sets up the PBX for the MHUv3 device.
+ *
+ * This function initializes the PBX-related IRQs (interrupts) for the MHUv3 device.
+ * If no combined IRQ configuration is provided, it defaults to using PBX in Tx polling mode.
+ *
+ * @param dev Pointer to the device structure.
+ * @return 0 on success.
+ */
+static int mbox_mhuv3_setup_pbx(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+
+	if (cfg->cmb_irq_config != NULL) {
+		cfg->cmb_irq_config(dev);
+
+		for (uint32_t i = 0; i < NUM_EXT; i++) {
+			struct mbox_mhuv3_data *data = dev->data;
+
+			if (data->ext[i].num_chans > 0) {
+				data->ext[i].combined_irq_setup(dev);
+			}
+		}
+
+		LOG_DBG("MHUv3 PBX IRQs initialized.");
+
+		return 0;
+	}
+
+	LOG_INF("Using PBX in Tx polling mode.");
+
+	return 0;
+}
+
+/**
+ * @brief Sets up the MBX for the MHUv3 device.
+ *
+ * This function initializes the MBX-related IRQs (interrupts) for the MHUv3 device.
+ *
+ * @param dev Pointer to the device structure.
+ * @return 0 on success, -EINVAL if combined IRQ configuration is missing.
+ */
+static int mbox_mhuv3_setup_mbx(const struct device *dev)
+{
+	const struct mbox_mhuv3_config *cfg = dev->config;
+
+	if (cfg->cmb_irq_config == NULL) {
+		LOG_ERR("MBX combined IRQ is missing!");
+		return -EINVAL;
+	}
+
+	cfg->cmb_irq_config(dev);
+
+	for (uint32_t i = 0; i < NUM_EXT; i++) {
+		struct mbox_mhuv3_data *data = dev->data;
+
+		if (data->ext[i].num_chans > 0) {
+			data->ext[i].combined_irq_setup(dev);
+		}
+	}
+
+	LOG_DBG("MHUv3 MBX IRQs initialized.");
+
+	return 0;
+}
+
+/**
+ * @brief Initializes the IRQs for the MHUv3 device.
+ *
+ * This function initializes the IRQs (interrupts) based on the frame type
+ * of the MHUv3 device.
+ *
+ * @param dev Pointer to the device structure.
+ * @return 0 on success, or the error code returned by the setup functions.
+ */
+static int mbox_mhuv3_irqs_init(const struct device *dev)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+
+	LOG_DBG("Initializing %s block.", mbox_mhuv3_str[data->frame]);
+
+	if (data->frame == PBX_FRAME) {
+		return mbox_mhuv3_setup_pbx(dev);
+	}
+
+	return mbox_mhuv3_setup_mbx(dev);
+}
+
+/**
+ * @brief Initializes the MHUv3 device.
+ *
+ * This function initializes the MHUv3 device by performing the following steps:
+ * 1. Initializes the frame type.
+ * 2. Initializes the IRQs.
+ * 3. Initializes the channels.
+ *
+ * If any of the initialization steps fail, the error code is returned immediately.
+ *
+ * @param dev Pointer to the device structure.
+ * @return 0 on success, or the error code from any of the initialization functions.
+ */
+static int mbox_mhuv3_init(const struct device *dev)
+{
+	int ret;
+
+	ret = mbox_mhuv3_frame_init(dev);
+	if (ret) {
+		return ret;
+	}
+
+	ret = mbox_mhuv3_irqs_init(dev);
+	if (ret) {
+		return ret;
+	}
+
+	ret = mbox_mhuv3_initialize_channels(dev);
+	if (ret) {
+		return ret;
+	}
+
+	return ret;
+}
+
+/**
+ * @brief Attempts to register a callback for a specified channel on the sender.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel_id The ID of the channel for the callback.
+ * @param cb The callback function to be registered.
+ * @param user_data User data to be passed to the callback.
+ *
+ * @return Always returns -ENOTSUP as callback registration for a sender device is not supported.
+ */
+static int mbox_mhuv3_sender_register_callback(const struct device *dev,
+					       mbox_channel_id_t channel_id,
+					       mbox_callback_t cb, void *user_data)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(channel_id);
+	ARG_UNUSED(cb);
+	ARG_UNUSED(user_data);
+
+	LOG_ERR("Trying to register a callback on a PBX MHUv3 frame");
+
+	return -ENOTSUP;
+}
+
+/**
+ * @brief Registers a callback function for a specified channel on the receiver.
+ *
+ * This function associates a callback with the specified channel. The callback
+ * will be invoked when the receiver processes data for that channel. The user
+ * data will be passed to the callback when it is called.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel_id The channel ID for which the callback is being registered.
+ * @param cb The callback function to register for the receiver.
+ * @param user_data User-specific data that will be passed to the callback.
+ *
+ * @return 0 on success, or -EINVAL if the specified channel is invalid.
+ */
+static int mbox_mhuv3_receiver_register_callback(const struct device *dev,
+						 mbox_channel_id_t channel_id,
+						 mbox_callback_t cb, void *user_data)
+{
+	struct mbox_mhuv3_channel *chan = mbox_mhuv3_get_channel(dev, channel_id);
+
+	if (!chan) {
+		return -EINVAL;
+	}
+
+	chan->cb = cb;
+	chan->user_data = user_data;
+
+	return 0;
+}
+
+/**
+ * @brief Registers a callback function for a specified channel, based on the frame type.
+ *
+ * @param dev Pointer to the device structure.
+ * @param channel_id The channel ID for which the callback is being registered.
+ * @param cb The callback function to register.
+ * @param user_data User-specific data that will be passed to the callback.
+ *
+ * @return 0 on success, or an error code from the sender or receiver callback registration.
+ */
+static int mbox_mhuv3_register_callback(const struct device *dev,
+					mbox_channel_id_t channel_id,
+					mbox_callback_t cb, void *user_data)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+
+	if (data->frame == PBX_FRAME) {
+		return mbox_mhuv3_sender_register_callback(dev, channel_id, cb, user_data);
+	}
+
+	return mbox_mhuv3_receiver_register_callback(dev, channel_id, cb, user_data);
+}
+
+/**
+ * @brief Retrieves the maximum transmission unit (MTU) for the sender device.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return The MTU size for the sender channel.
+ */
+static int mbox_mhuv3_sender_mtu_get(const struct device *dev)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+
+	/**
+	 * TODO: The maximum transmit units depends on the channel extension.
+	 * The type of extension, channel and doorbell should be
+	 * extracted from a struct passed to this function from device tree.
+	 * Until this is changed, Pin the type to Doorbell extension which
+	 * is the only supported extension.
+	 */
+
+	enum mbox_mhuv3_extension_type type = DBE_EXT;
+
+	return data->ext[type].mtu_get();
+}
+
+/**
+ * @brief Attempts to retrieve the maximum transmission unit (MTU) for the receiver device.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return Always returns 0.
+ */
+static int mbox_mhuv3_receiver_mtu_get(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	LOG_ERR("Trying to get maximum transmit units on a MBX MHUv3 frame");
+
+	return 0;
+}
+
+/**
+ * @brief Retrieves the Maximum Transmission Unit (MTU) for the MHUv3 device.
+ *
+ * This function determines the MTU based on the frame type (PBX or MBX) and calls
+ * the appropriate function to retrieve the MTU for the sender or receiver.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return The MTU value for the sender or receiver, depending on the frame type.
+ */
+static int mbox_mhuv3_mtu_get(const struct device *dev)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+
+	if (data->frame == PBX_FRAME) {
+		return mbox_mhuv3_sender_mtu_get(dev);
+	}
+
+	return mbox_mhuv3_receiver_mtu_get(dev);
+}
+
+/**
+ * @brief Retrieves the maximum number of channels available in the MHUv3 device.
+ *
+ * @param dev Pointer to the device structure.
+ *
+ * @return The number of available channels for the MHUv3 device.
+ */
+static uint32_t mbox_mhuv3_max_channels_get(const struct device *dev)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+
+	return data->num_chans;
+}
+
+/**
+ * @brief Enables or disables a channel based on the MHUv3 frame type.
+ *
+ * This function handles enabling or disabling the transmission (TX) or reception (RX)
+ * functionality of a channel.
+ *
+ * @param dev The device handle representing the MHUv3 system.
+ * @param channel_id The ID of the channel to enable or disable.
+ * @param enabled Boolean flag to enable (true) or disable (false) the channel.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+static int mbox_mhuv3_set_enabled(const struct device *dev,
+				  mbox_channel_id_t channel_id, bool enabled)
+{
+	struct mbox_mhuv3_data *data = dev->data;
+	struct mbox_mhuv3_channel *chan = mbox_mhuv3_get_channel(dev, channel_id);
+	int ret;
+
+	if (!chan) {
+		return -EINVAL;
+	}
+
+	if (data->frame == PBX_FRAME) {
+		if (enabled) {
+			ret = chan->ops->tx_enable(dev, chan);
+		} else {
+			ret = chan->ops->tx_disable(dev, chan);
+		}
+	} else {
+		if (enabled) {
+			ret = chan->ops->rx_enable(dev, chan);
+		} else {
+			ret = chan->ops->rx_disable(dev, chan);
+		}
+	}
+
+	return ret;
+}
+
+static DEVICE_API(mbox, mhuv3_driver_api) = {
+	.send = mbox_mhuv3_send_data,
+	.register_callback = mbox_mhuv3_register_callback,
+	.mtu_get = mbox_mhuv3_mtu_get,
+	.max_channels_get = mbox_mhuv3_max_channels_get,
+	.set_enabled = mbox_mhuv3_set_enabled,
+};
+
+#define MHUV3_INIT(n)							\
+									\
+static void mbox_mhuv3_cmb_irq_config_##n(const struct device *dev)	\
+{									\
+	IRQ_CONNECT(DT_INST_IRQ_BY_NAME(n, combined, irq),		\
+		    DT_INST_IRQ_BY_NAME(n, combined, priority),		\
+		    mbox_mhuv3_comb_interrupt,				\
+		    DEVICE_DT_INST_GET(n),				\
+		    0);							\
+	irq_enable(DT_INST_IRQ_BY_NAME(n, combined, irq));		\
+}									\
+									\
+static const struct mbox_mhuv3_config mhuv3_cfg_##n = {			\
+	(struct ctrl_page *)DT_INST_REG_ADDR(n),			\
+	DT_INST_REG_ADDR(n),						\
+	mbox_mhuv3_cmb_irq_config_##n,					\
+};									\
+									\
+struct mbox_mhuv3_data mhuv3_data_##n;					\
+									\
+DEVICE_DT_INST_DEFINE(n,						\
+		      &mbox_mhuv3_init,					\
+		      NULL,						\
+		      &mhuv3_data_##n,					\
+		      &mhuv3_cfg_##n,					\
+		      POST_KERNEL,					\
+		      CONFIG_MBOX_INIT_PRIORITY,			\
+		      &mhuv3_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(MHUV3_INIT);
diff --git a/drivers/mbox/mbox_nrf_vevif_event_tx.c b/drivers/mbox/mbox_nrf_vevif_event_tx.c
index f7703c8d3b806..38898d37bf793 100644
--- a/drivers/mbox/mbox_nrf_vevif_event_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_event_tx.c
@@ -40,7 +40,7 @@ static int vevif_event_tx_send(const struct device *dev, uint32_t id, const stru
 	nrf_vpr_csr_vevif_events_trigger(BIT(id));
 
 #if defined(CONFIG_MBOX_NRF_VEVIF_EVENT_USE_54L_ERRATA_16)
-	while (!nrf_vpr_csr_vevif_events_get()) {
+	while (!(nrf_vpr_csr_vevif_events_get() & BIT(id))) {
 		;
 	}
 	nrf_vpr_csr_vevif_events_set(0);
diff --git a/drivers/mbox/mbox_nxp_imx_mu.c b/drivers/mbox/mbox_nxp_imx_mu.c
index 762ea6670d668..8b5dfd3b73868 100644
--- a/drivers/mbox/mbox_nxp_imx_mu.c
+++ b/drivers/mbox/mbox_nxp_imx_mu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -21,6 +21,25 @@ LOG_MODULE_REGISTER(nxp_mbox_imx_mu);
 #define MU_MAX_CHANNELS 4
 #define MU_MBOX_SIZE    sizeof(uint32_t)
 
+/*
+ * Arrays to translate the channel number to Generic Interrupt Mask for mu driver.
+ * The kMU_GenInt[0..3]Flag comes from MU driver header mu.h.
+ * There are more MU drivers implementations. For the `mu` driver
+ * the kMU_GenInt0Flag goes from 3 to 0 relative bit for the
+ * `mu1` driver kMU_GenInt0Flag goes from 0 to 3.
+ * Same for kMU_GenInt0InterruptTrigger and kMU_Rx0FullFlag.
+ * Therefore use this mapping table to select correct mask based on channel index.
+ */
+const static uint32_t g_gen_int_pend_mask[MU_MAX_CHANNELS] = {kMU_GenInt0Flag, kMU_GenInt1Flag,
+							      kMU_GenInt2Flag, kMU_GenInt3Flag};
+
+const static uint32_t g_gen_int_trig_mask[MU_MAX_CHANNELS] = {
+	kMU_GenInt0InterruptTrigger, kMU_GenInt1InterruptTrigger, kMU_GenInt2InterruptTrigger,
+	kMU_GenInt3InterruptTrigger};
+
+const static uint32_t g_rx_flag_mask[MU_MAX_CHANNELS] = {kMU_Rx0FullFlag, kMU_Rx1FullFlag,
+							 kMU_Rx2FullFlag, kMU_Rx3FullFlag};
+
 struct nxp_imx_mu_data {
 	mbox_callback_t cb[MU_MAX_CHANNELS];
 	void *user_data[MU_MAX_CHANNELS];
@@ -42,7 +61,7 @@ static int nxp_imx_mu_send(const struct device *dev, uint32_t channel, const str
 
 	/* Signalling mode. */
 	if (msg == NULL) {
-		return MU_TriggerInterrupts(cfg->base, kMU_GenInt0InterruptTrigger >> channel);
+		return MU_TriggerInterrupts(cfg->base, g_gen_int_trig_mask[channel]);
 	}
 
 	/* Data transfer mode. */
@@ -159,10 +178,13 @@ static void handle_irq(const struct device *dev)
 {
 	struct nxp_imx_mu_data *data = dev->data;
 	const struct nxp_imx_mu_config *config = dev->config;
-	const uint32_t flag = MU_GetStatusFlags(config->base);
+	const uint32_t flags = MU_GetStatusFlags(config->base);
 
 	for (int i_channel = 0; i_channel < MU_MAX_CHANNELS; i_channel++) {
-		if ((flag & (kMU_Rx0FullFlag >> i_channel)) == (kMU_Rx0FullFlag >> i_channel)) {
+		const uint32_t rx_int_mask = g_rx_flag_mask[i_channel];
+		const uint32_t gen_int_mask = g_gen_int_pend_mask[i_channel];
+
+		if ((flags & rx_int_mask) == rx_int_mask) {
 			data->received_data = MU_ReceiveMsgNonBlocking(config->base, i_channel);
 			struct mbox_msg msg = {(const void *)&data->received_data, MU_MBOX_SIZE};
 
@@ -170,9 +192,8 @@ static void handle_irq(const struct device *dev)
 				data->cb[i_channel](dev, i_channel, data->user_data[i_channel],
 						    &msg);
 			}
-		} else if ((flag & (kMU_GenInt0Flag >> i_channel)) ==
-			   (kMU_GenInt0Flag >> i_channel)) {
-			MU_ClearStatusFlags(config->base, (kMU_GenInt0Flag >> i_channel));
+		} else if ((flags & gen_int_mask) == gen_int_mask) {
+			MU_ClearStatusFlags(config->base, gen_int_mask);
 			if (data->cb[i_channel]) {
 				data->cb[i_channel](dev, i_channel, data->user_data[i_channel],
 						    NULL);
diff --git a/drivers/mbox/mbox_renesas_rz_mhu.c b/drivers/mbox/mbox_renesas_rz_mhu.c
new file mode 100644
index 0000000000000..67753474170b0
--- /dev/null
+++ b/drivers/mbox/mbox_renesas_rz_mhu.c
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT renesas_rz_mhu_mbox
+
+#include <stdint.h>
+#include <string.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/mbox.h>
+#include <zephyr/logging/log.h>
+
+#include "r_mhu_ns.h"
+
+LOG_MODULE_REGISTER(mbox_renesas_rz_mhu, CONFIG_MBOX_LOG_LEVEL);
+
+/* Global dummy value required for FSP driver implementation */
+#define MHU_SHM_START_ADDR 0
+const uint32_t *const __mhu_shmem_start = (uint32_t *)MHU_SHM_START_ADDR;
+
+/* FSP interrupt handlers. */
+void mhu_ns_int_isr(void);
+
+static volatile uint32_t callback_msg;
+static void mhu_ns_callback(mhu_callback_args_t *p_args)
+{
+	callback_msg = p_args->msg;
+}
+
+struct mbox_rz_mhu_config {
+	const mhu_api_t *fsp_api;
+	uint16_t mhu_ch_size;
+	/* Number of supported channels */
+	uint32_t num_channels;
+	/* TX channels mask */
+	uint32_t tx_mask;
+	/* RX channels mask */
+	uint32_t rx_mask;
+};
+
+struct mbox_rz_mhu_data {
+	const struct device *dev;
+	mhu_ns_instance_ctrl_t *fsp_ctrl;
+	mhu_cfg_t *fsp_cfg;
+	mbox_callback_t cb;
+	void *user_data;
+	uint32_t channel_id;
+};
+
+/**
+ * @brief Return true if the channel of the MBOX device is an inbound channel.
+ */
+static inline bool is_rx_channel_valid(const struct device *dev, uint32_t ch)
+{
+	const struct mbox_rz_mhu_config *config = dev->config;
+
+	return ((ch < config->num_channels) && (config->rx_mask & BIT(ch)));
+}
+
+/**
+ * @brief Return true if the channel of the MBOX device is an outbound channel.
+ */
+static inline bool is_tx_channel_valid(const struct device *dev, uint32_t ch)
+{
+	const struct mbox_rz_mhu_config *config = dev->config;
+
+	return ((ch < config->num_channels) && (config->tx_mask & BIT(ch)));
+}
+
+/**
+ * Interrupt handler
+ */
+static void mbox_rz_mhu_isr(const struct device *dev)
+{
+	struct mbox_rz_mhu_data *data = dev->data;
+	struct mbox_msg msg;
+
+	mhu_ns_int_isr();
+	if (data->cb && data->fsp_cfg->p_shared_memory) {
+		uint32_t local_msg = callback_msg;
+
+		msg.data = &local_msg;
+
+		/* On the receiving end, the size of the message is always 4 bytes since the FSP MHU
+		 * driver requires the message to be of type uint32_t
+		 */
+		msg.size = sizeof(local_msg);
+
+		data->cb(dev, data->channel_id, data->user_data, &msg);
+	}
+}
+
+/**
+ * @brief Try to send a message over the MBOX device.
+ */
+static int mbox_rz_mhu_send(const struct device *dev, mbox_channel_id_t channel_id,
+			    const struct mbox_msg *msg)
+{
+	const struct mbox_rz_mhu_config *config = dev->config;
+	struct mbox_rz_mhu_data *data = dev->data;
+	fsp_err_t fsp_err = FSP_SUCCESS;
+
+	/* FSP driver implementation requires the message to be of type uint32_t */
+	uint32_t message = 0;
+
+	if (!is_tx_channel_valid(dev, channel_id)) {
+		if (!is_rx_channel_valid(dev, channel_id)) {
+			/* Channel is neither RX nor TX */
+			LOG_ERR("Invalid MBOX channel number: %d", channel_id);
+			return -EINVAL;
+		}
+
+		/* Channel is a RX channel, but this function only accepts TX */
+		LOG_ERR("Channel ID %d is a RX channel, but only TX channels are allowed",
+			channel_id);
+		return -ENOSYS;
+	}
+
+	if (msg != NULL) {
+		/* Maximum size allowed is 4 bytes */
+		if (msg->size > config->mhu_ch_size) {
+			LOG_ERR("Size %d is not valid. Maximum size is 4 bytes", msg->size);
+			return -EMSGSIZE;
+		}
+
+		if (msg->data && msg->size) {
+			/* Copy message */
+			memcpy(&message, msg->data, msg->size);
+		} else {
+			/* Clear Message */
+			message = 0;
+		}
+	} else {
+		message = 0;
+	}
+
+	if (data->fsp_cfg->p_shared_memory) {
+
+#if CONFIG_MBOX_BUSY_WAIT_TIMEOUT_US > 0
+		/* The FSP MHU "msgSend" API continuously polls until the
+		 * previous message is consumed before sending a new one. To avoid
+		 * blocking indefinitely, we need to check if the remote clears the message
+		 * within the allowed time before sending a new one
+		 */
+		if (MHU_SEND_TYPE_MSG == data->fsp_ctrl->send_type) {
+			if (data->fsp_ctrl->p_regs->MSG_INT_STSn != 0) {
+				k_busy_wait(CONFIG_MBOX_BUSY_WAIT_TIMEOUT_US);
+				if (data->fsp_ctrl->p_regs->MSG_INT_STSn != 0) {
+					LOG_ERR("Remote is busy");
+					return -EBUSY;
+				}
+			}
+		} else {
+			if (data->fsp_ctrl->p_regs->RSP_INT_STSn != 0) {
+				k_busy_wait(CONFIG_MBOX_BUSY_WAIT_TIMEOUT_US);
+				if (data->fsp_ctrl->p_regs->RSP_INT_STSn != 0) {
+					LOG_ERR("Remote is busy");
+					return -EBUSY;
+				}
+			}
+		}
+#endif
+
+		/* Send message to shared memory, this will also invoke interrupt on the receiving
+		 * core
+		 */
+		fsp_err = config->fsp_api->msgSend(data->fsp_ctrl, message);
+	}
+
+	if (fsp_err) {
+		LOG_ERR("Message send failed");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Register a callback function on a channel for incoming messages.
+ */
+static int mbox_rz_mhu_reg_callback(const struct device *dev, mbox_channel_id_t channel_id,
+				    mbox_callback_t cb, void *user_data)
+{
+	struct mbox_rz_mhu_data *data = dev->data;
+
+	if (!is_rx_channel_valid(dev, channel_id)) {
+		if (!is_tx_channel_valid(dev, channel_id)) {
+			/* Channel is neither RX nor TX */
+			LOG_ERR("Invalid MBOX channel number: %d", channel_id);
+			return -EINVAL;
+		}
+
+		/* Channel is a TX channel, but this function only accepts RX */
+		LOG_ERR("Channel ID %d is a TX channel, but only RX channels are allowed",
+			channel_id);
+		return -ENOSYS;
+	}
+
+	if (!cb) {
+		LOG_ERR("Must provide callback");
+		return -EINVAL;
+	}
+
+	data->cb = cb;
+	data->user_data = user_data;
+	data->channel_id = channel_id;
+
+	return 0;
+}
+
+/**
+ * @brief Initialize the module.
+ */
+static int mbox_rz_mhu_init(const struct device *dev)
+{
+	const struct mbox_rz_mhu_config *config = dev->config;
+	struct mbox_rz_mhu_data *data = dev->data;
+	fsp_err_t fsp_err = FSP_SUCCESS;
+
+	fsp_err = config->fsp_api->open(data->fsp_ctrl, data->fsp_cfg);
+
+	if (fsp_err) {
+		LOG_ERR("MBOX initialization failed");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Enable (disable) interrupts and callbacks for inbound channels.
+ */
+static int mbox_rz_mhu_set_enabled(const struct device *dev, mbox_channel_id_t channel_id,
+				   bool enabled)
+{
+	if (!is_rx_channel_valid(dev, channel_id)) {
+		if (!is_tx_channel_valid(dev, channel_id)) {
+			/* Channel is neither RX nor TX */
+			LOG_ERR("Invalid MBOX channel number: %d", channel_id);
+			return -EINVAL;
+		}
+
+		/* Channel is a TX channel, but this function only accepts RX */
+		LOG_ERR("Channel ID %d is a TX channel, but only RX channels are allowed",
+			channel_id);
+		return -ENOSYS;
+	}
+
+	ARG_UNUSED(enabled);
+	return 0;
+}
+
+/**
+ * @brief Return the maximum number of bytes possible in an outbound message.
+ */
+static int mbox_rz_mhu_mtu_get(const struct device *dev)
+{
+	const struct mbox_rz_mhu_config *config = dev->config;
+
+	return config->mhu_ch_size;
+}
+
+/**
+ * @brief Return the maximum number of channels.
+ */
+static uint32_t mbox_rz_mhu_max_channels_get(const struct device *dev)
+{
+	const struct mbox_rz_mhu_config *config = dev->config;
+
+	return config->num_channels;
+}
+
+static DEVICE_API(mbox, mbox_rz_mhu_driver_api) = {
+	.send = mbox_rz_mhu_send,
+	.register_callback = mbox_rz_mhu_reg_callback,
+	.mtu_get = mbox_rz_mhu_mtu_get,
+	.max_channels_get = mbox_rz_mhu_max_channels_get,
+	.set_enabled = mbox_rz_mhu_set_enabled,
+};
+
+/*
+ * ************************* DRIVER REGISTER SECTION ***************************
+ */
+
+#define MHU_RZG_IRQ_CONNECT(idx, irq_name, isr)                                                    \
+	do {                                                                                       \
+		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, irq_name, irq),                               \
+			    DT_INST_IRQ_BY_NAME(idx, irq_name, priority), isr,                     \
+			    DEVICE_DT_INST_GET(idx), 0);                                           \
+		irq_enable(DT_INST_IRQ_BY_NAME(idx, irq_name, irq));                               \
+	} while (0)
+
+#define MHU_RZG_CONFIG_FUNC(idx) MHU_RZG_IRQ_CONNECT(idx, mhuns, mbox_rz_mhu_isr);
+
+#define MHU_RZG_INIT(idx)                                                                          \
+	static mhu_ns_instance_ctrl_t g_mhu_ns##idx##_ctrl;                                        \
+	static mhu_cfg_t g_mhu_ns##idx##_cfg = {                                                   \
+		.channel = DT_INST_PROP(idx, channel),                                             \
+		.rx_ipl = DT_INST_IRQ_BY_NAME(idx, mhuns, priority),                               \
+		.rx_irq = DT_INST_IRQ_BY_NAME(idx, mhuns, irq),                                    \
+		.p_callback = mhu_ns_callback,                                                     \
+		.p_context = NULL,                                                                 \
+		.p_shared_memory = (void *)COND_CODE_1(DT_INST_NODE_HAS_PROP(idx, shared_memory),  \
+		      (DT_REG_ADDR(DT_INST_PHANDLE(idx, shared_memory))), (NULL)),                 \
+	};                                                                                         \
+	static const struct mbox_rz_mhu_config mbox_rz_mhu_config_##idx = {                        \
+		.fsp_api = &g_mhu_ns_on_mhu_ns,                                                    \
+		.mhu_ch_size = 4,                                                                  \
+		.num_channels = DT_INST_PROP(idx, channels_count),                                 \
+		.tx_mask = DT_INST_PROP(idx, tx_mask),                                             \
+		.rx_mask = DT_INST_PROP(idx, rx_mask),                                             \
+	};                                                                                         \
+	static struct mbox_rz_mhu_data mbox_rz_mhu_data_##idx = {                                  \
+		.dev = DEVICE_DT_INST_GET(idx),                                                    \
+		.fsp_ctrl = &g_mhu_ns##idx##_ctrl,                                                 \
+		.fsp_cfg = &g_mhu_ns##idx##_cfg,                                                   \
+	};                                                                                         \
+	static int mbox_rz_mhu_init_##idx(const struct device *dev)                                \
+	{                                                                                          \
+		MHU_RZG_CONFIG_FUNC(idx)                                                           \
+		return mbox_rz_mhu_init(dev);                                                      \
+	}                                                                                          \
+	DEVICE_DT_INST_DEFINE(idx, mbox_rz_mhu_init_##idx, NULL, &mbox_rz_mhu_data_##idx,          \
+			      &mbox_rz_mhu_config_##idx, PRE_KERNEL_1,                             \
+			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mbox_rz_mhu_driver_api)
+
+DT_INST_FOREACH_STATUS_OKAY(MHU_RZG_INIT);
diff --git a/drivers/mdio/CMakeLists.txt b/drivers/mdio/CMakeLists.txt
index 9c1f1d47fe0ca..fc3ce620c202e 100644
--- a/drivers/mdio/CMakeLists.txt
+++ b/drivers/mdio/CMakeLists.txt
@@ -19,3 +19,4 @@ zephyr_library_sources_ifdef(CONFIG_MDIO_DWCXGMAC	mdio_dwcxgmac.c)
 zephyr_library_sources_ifdef(CONFIG_MDIO_RENESAS_RA	mdio_renesas_ra.c)
 zephyr_library_sources_ifdef(CONFIG_MDIO_LAN865X	mdio_lan865x.c)
 zephyr_library_sources_ifdef(CONFIG_MDIO_SENSRY_SY1XX   mdio_sy1xx.c)
+zephyr_library_sources_ifdef(CONFIG_MDIO_XILINX_AXI_ENET        mdio_xilinx_axienet.c)
diff --git a/drivers/mdio/Kconfig b/drivers/mdio/Kconfig
index dea9bea190976..658bbe78b7b99 100644
--- a/drivers/mdio/Kconfig
+++ b/drivers/mdio/Kconfig
@@ -40,6 +40,7 @@ source "drivers/mdio/Kconfig.dwcxgmac"
 source "drivers/mdio/Kconfig.renesas_ra"
 source "drivers/mdio/Kconfig.lan865x"
 source "drivers/mdio/Kconfig.sy1xx"
+source "drivers/mdio/Kconfig.xilinx_axienet"
 
 config MDIO_INIT_PRIORITY
 	int "Init priority"
diff --git a/drivers/mdio/Kconfig.stm32_hal b/drivers/mdio/Kconfig.stm32_hal
index e92573e3234e6..e54844a4f7088 100644
--- a/drivers/mdio/Kconfig.stm32_hal
+++ b/drivers/mdio/Kconfig.stm32_hal
@@ -5,8 +5,8 @@
 config MDIO_ST_STM32_HAL
 	bool "STM32 MDIO controller driver"
 	default y
-	depends on ETH_STM32_HAL_API_V2
 	depends on DT_HAS_ST_STM32_MDIO_ENABLED
+	depends on ETH_STM32_HAL
 	select PINCTRL
 	help
 	  Enable STM32 MDIO support.
diff --git a/drivers/mdio/Kconfig.xilinx_axienet b/drivers/mdio/Kconfig.xilinx_axienet
new file mode 100644
index 0000000000000..96bf7dd3945d4
--- /dev/null
+++ b/drivers/mdio/Kconfig.xilinx_axienet
@@ -0,0 +1,9 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+config MDIO_XILINX_AXI_ENET
+	bool "Xilinx AXI Ethernet MDIO driver"
+	default y
+	depends on DT_HAS_XLNX_AXI_ETHERNET_1_00_A_MDIO_ENABLED
+	help
+	  Enable Xilinx AXI Ethernet MDIO bus driver.
diff --git a/drivers/mdio/mdio_shell.c b/drivers/mdio/mdio_shell.c
index e3366f4299332..61bc39f4d502c 100644
--- a/drivers/mdio/mdio_shell.c
+++ b/drivers/mdio/mdio_shell.c
@@ -45,6 +45,8 @@ LOG_MODULE_REGISTER(mdio_shell, CONFIG_LOG_DEFAULT_LEVEL);
 #define DT_DRV_COMPAT snps_dwcxgmac_mdio
 #elif DT_HAS_COMPAT_STATUS_OKAY(sensry_sy1xx_mdio)
 #define DT_DRV_COMPAT sensry_sy1xx_mdio
+#elif DT_HAS_COMPAT_STATUS_OKAY(xlnx_axi_ethernet_1_00_a_mdio)
+#define DT_DRV_COMPAT xlnx_axi_ethernet_1_00_a_mdio
 #else
 #error "No known devicetree compatible match for MDIO shell"
 #endif
diff --git a/drivers/mdio/mdio_stm32_hal.c b/drivers/mdio/mdio_stm32_hal.c
index aba789d705a07..de9672fda94a3 100644
--- a/drivers/mdio/mdio_stm32_hal.c
+++ b/drivers/mdio/mdio_stm32_hal.c
@@ -9,6 +9,8 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/kernel.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/mdio.h>
 #include <zephyr/net/ethernet.h>
@@ -28,6 +30,7 @@ struct mdio_stm32_data {
 
 struct mdio_stm32_config {
 	const struct pinctrl_dev_config *pincfg;
+	struct stm32_pclken pclken;
 };
 
 static int mdio_stm32_read(const struct device *dev, uint8_t prtad,
@@ -40,7 +43,13 @@ static int mdio_stm32_read(const struct device *dev, uint8_t prtad,
 
 	k_sem_take(&dev_data->sem, K_FOREVER);
 
+#ifdef CONFIG_ETH_STM32_HAL_API_V2
 	ret = HAL_ETH_ReadPHYRegister(heth, prtad, regad, &read);
+#else
+	heth->Init.PhyAddress = prtad;
+
+	ret = HAL_ETH_ReadPHYRegister(heth, regad, &read);
+#endif
 
 	k_sem_give(&dev_data->sem);
 
@@ -62,7 +71,13 @@ static int mdio_stm32_write(const struct device *dev, uint8_t prtad,
 
 	k_sem_take(&dev_data->sem, K_FOREVER);
 
+#ifdef CONFIG_ETH_STM32_HAL_API_V2
 	ret = HAL_ETH_WritePHYRegister(heth, prtad, regad, data);
+#else
+	heth->Init.PhyAddress = prtad;
+
+	ret = HAL_ETH_WritePHYRegister(heth, regad, data);
+#endif
 
 	k_sem_give(&dev_data->sem);
 
@@ -73,27 +88,84 @@ static int mdio_stm32_write(const struct device *dev, uint8_t prtad,
 	return ret;
 }
 
-static void mdio_stm32_bus_enable(const struct device *dev)
+#ifdef CONFIG_ETH_STM32_HAL_API_V1
+static void eth_set_mdio_clock_range_for_hal_v1(ETH_HandleTypeDef *heth)
 {
-	ARG_UNUSED(dev);
-}
+	uint32_t tmpreg1 = 0U;
+
+	/* Get the ETHERNET MACMIIAR value */
+	tmpreg1 = (heth->Instance)->MACMIIAR;
+	/* Clear CSR Clock Range CR[2:0] bits */
+	tmpreg1 &= ETH_MACMIIAR_CR_MASK;
+
+	/* Set CR bits depending on CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC value */
+#ifdef SOC_SERIES_STM32F1X
+	if ((CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= 20000000U) &&
+	    (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC < 35000000U)) {
+		/* CSR Clock Range between 20-35 MHz */
+		tmpreg1 |= (uint32_t)ETH_MACMIIAR_CR_DIV16;
+	} else if ((CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= 35000000U) &&
+		   (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC < 60000000U)) {
+		/* CSR Clock Range between 35-60 MHz */
+		tmpreg1 |= (uint32_t)ETH_MACMIIAR_CR_DIV26;
+	} else {
+		/* CSR Clock Range between 60-72 MHz */
+		tmpreg1 |= (uint32_t)ETH_MACMIIAR_CR_DIV42;
+	}
+#else  /* SOC_SERIES_STM32F2X */
+	if ((CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= 20000000U) &&
+	    (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC < 35000000U)) {
+		/* CSR Clock Range between 20-35 MHz */
+		tmpreg1 |= (uint32_t)ETH_MACMIIAR_CR_Div16;
+	} else if ((CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= 35000000U) &&
+		   (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC < 60000000U)) {
+		/* CSR Clock Range between 35-60 MHz */
+		tmpreg1 |= (uint32_t)ETH_MACMIIAR_CR_Div26;
+	} else if ((CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC >= 60000000U) &&
+		   (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC < 100000000U)) {
+		/* CSR Clock Range between 60-100 MHz */
+		tmpreg1 |= (uint32_t)ETH_MACMIIAR_CR_Div42;
+	} else {
+		/* CSR Clock Range between 100-120 MHz */
+		tmpreg1 |= (uint32_t)ETH_MACMIIAR_CR_Div62;
+	}
+#endif /* SOC_SERIES_STM32F2X */
 
-static void mdio_stm32_bus_disable(const struct device *dev)
-{
-	ARG_UNUSED(dev);
+	/* Write to ETHERNET MAC MIIAR: Configure the ETHERNET CSR Clock Range */
+	(heth->Instance)->MACMIIAR = (uint32_t)tmpreg1;
 }
+#endif /* CONFIG_ETH_STM32_HAL_API_V1 */
 
 static int mdio_stm32_init(const struct device *dev)
 {
 	struct mdio_stm32_data *const dev_data = dev->data;
 	const struct mdio_stm32_config *const config = dev->config;
+	ETH_HandleTypeDef *heth = &dev_data->heth;
 	int ret;
 
+	/* enable clock */
+	ret = clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+			       (clock_control_subsys_t)&config->pclken);
+	if (ret < 0) {
+		LOG_ERR("Failed to enable ethernet clock needed for MDIO (%d)", ret);
+		return ret;
+	}
+
 	ret = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
 	if (ret < 0) {
 		return ret;
 	}
 
+#ifdef CONFIG_ETH_STM32_HAL_API_V2
+	HAL_ETH_SetMDIOClockRange(heth);
+#else
+	/* The legacy V1 HAL API does not provide a way to set the MDC clock range
+	 * via a separated function call. Implement an equivalent function ourselves
+	 * based on what the V1 HAL performs in HAL_ETH_Init().
+	 */
+	eth_set_mdio_clock_range_for_hal_v1(heth);
+#endif
+
 	k_sem_init(&dev_data->sem, 1, 1);
 
 	return 0;
@@ -102,22 +174,21 @@ static int mdio_stm32_init(const struct device *dev)
 static DEVICE_API(mdio, mdio_stm32_api) = {
 	.read = mdio_stm32_read,
 	.write = mdio_stm32_write,
-	.bus_enable = mdio_stm32_bus_enable,
-	.bus_disable = mdio_stm32_bus_disable,
 };
 
-#define MDIO_STM32_HAL_DEVICE(inst)								\
-	PINCTRL_DT_INST_DEFINE(inst);								\
-												\
-	static struct mdio_stm32_data mdio_stm32_data_##inst = {				\
-		.heth = {.Instance = (ETH_TypeDef *)DT_REG_ADDR(DT_INST_PARENT(inst))},		\
-	};											\
-	static struct mdio_stm32_config mdio_stm32_config_##inst = {				\
-		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),					\
-	};											\
-	DEVICE_DT_INST_DEFINE(inst, &mdio_stm32_init, NULL,					\
-				&mdio_stm32_data_##inst, &mdio_stm32_config_##inst,		\
-				POST_KERNEL, CONFIG_ETH_INIT_PRIORITY,				\
-				&mdio_stm32_api);
+#define MDIO_STM32_HAL_DEVICE(inst)                                                                \
+	PINCTRL_DT_INST_DEFINE(inst);                                                              \
+                                                                                                   \
+	static struct mdio_stm32_data mdio_stm32_data_##inst = {                                   \
+		.heth = {.Instance = (ETH_TypeDef *)DT_REG_ADDR(DT_INST_PARENT(inst))},            \
+	};                                                                                         \
+	static struct mdio_stm32_config mdio_stm32_config_##inst = {                               \
+		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),                                    \
+		.pclken = {.bus = DT_CLOCKS_CELL_BY_NAME(DT_INST_PARENT(inst), stm_eth, bus),      \
+			   .enr = DT_CLOCKS_CELL_BY_NAME(DT_INST_PARENT(inst), stm_eth, bits)},    \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, &mdio_stm32_init, NULL, &mdio_stm32_data_##inst,               \
+			      &mdio_stm32_config_##inst, POST_KERNEL, CONFIG_MDIO_INIT_PRIORITY,   \
+			      &mdio_stm32_api);
 
 DT_INST_FOREACH_STATUS_OKAY(MDIO_STM32_HAL_DEVICE)
diff --git a/drivers/mdio/mdio_xilinx_axienet.c b/drivers/mdio/mdio_xilinx_axienet.c
new file mode 100644
index 0000000000000..f06434a81d429
--- /dev/null
+++ b/drivers/mdio/mdio_xilinx_axienet.c
@@ -0,0 +1,338 @@
+/*
+ * Xilinx AXI 1G / 2.5G Ethernet Subsystem
+ *
+ * Copyright(c) 2024, CISPA Helmholtz Center for Information Security
+ * SPDX - License - Identifier : Apache-2.0
+ */
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(eth_xilinx_axienet_mdio, CONFIG_ETHERNET_LOG_LEVEL);
+
+#include <sys/types.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/mdio.h>
+#include <zephyr/sys/barrier.h>
+
+#define XILINX_AXIENET_MDIO_SETUP_REG_OFFSET                  0x00000500
+#define XILINX_AXIENET_MDIO_SETUP_REG_MDIO_DISABLE_MASK       BIT_MASK(0)
+#define XILINX_AXIENET_MDIO_SETUP_REG_MDIO_ENABLE_MASK        BIT(6)
+#define XILINX_AXIENET_MDIO_SETUP_REG_MDIO_CLOCK_DIVIDER_MASK BIT_MASK(6)
+#define XILINX_AXIENET_MDIO_CONTROL_REG_OFFSET                0x00000504
+#define XILINX_AXIENET_MDIO_CONTROL_REG_MASK_READY            BIT(7)
+#define XILINX_AXIENET_MDIO_CONTROL_REG_SHIFT_PHYADDR         24
+#define XILINX_AXIENET_MDIO_CONTROL_REG_SHIFT_REGADDR         16
+#define XILINX_AXIENET_MDIO_CONTROL_REG_SHIFT_TXOP            14
+#define XILINX_AXIENET_MDIO_CONTROL_REG_MASK_READ             BIT(15)
+#define XILINX_AXIENET_MDIO_CONTROL_REG_MASK_WRITE            BIT(14)
+#define XILINX_AXIENET_MDIO_CONTROL_REG_MASK_INITIATE         BIT(11)
+#define XILINX_AXIENET_MDIO_WRITE_DATA_REG_OFFSET             0x00000508
+#define XILINX_AXIENET_MDIO_READ_DATA_REG_OFFSET              0x0000050C
+#define XILINX_AXIENET_MDIO_READ_DATA_REG_DATA_MASK           BIT_MASK(16)
+/* same mask for all interrupt-related registers */
+#define XILINX_AXIENET_MDIO_INTERRUPT_MASK                    BIT(0)
+#define XILINX_AXIENET_MDIO_INTERRUPT_STATUS_REG_OFFSET       0x00000600
+#define XILINX_AXIENET_MDIO_INTERRUPT_PENDING_REG_OFFSET      0x00000610
+#define XILINX_AXIENET_MDIO_INTERRUPT_ENABLE_REG_OFFSET       0x00000620
+#define XILINX_AXIENET_MDIO_INTERRUPT_DISABLE_ALL_MASK        BIT_MASK(0)
+#define XILINX_AXIENET_MDIO_INTERRUPT_CLEAR_REG_OFFSET        0x00000630
+#define XILINX_AXIENET_MDIO_INTERRUPT_CLEAR_ALL_MASK          BIT_MASK(8)
+
+/* 2.5 MHz, i.e., max MDIO clock according to IEEE spec */
+#define XILINX_AXIENET_MDIO_MDIO_TARGET_FREQUENCY_HZ 2500000
+#define XILINX_AXIENET_MDIO_INTERRUPT_TIMEOUT_MS     100
+
+struct mdio_xilinx_axienet_data {
+	struct k_sem irq_sema;
+	uint16_t clock_divider;
+	bool bus_enabled;
+};
+
+struct mdio_xilinx_axienet_config {
+	void *reg;
+	unsigned int clock_frequency_hz;
+	void (*config_func)(const struct mdio_xilinx_axienet_data *data);
+	bool have_irq;
+};
+
+static void xilinx_axienet_mdio_write_register(const struct mdio_xilinx_axienet_config *config,
+					       uintptr_t reg_offset, uint32_t value)
+{
+	volatile uint32_t *reg_addr = (uint32_t *)((uint8_t *)(config->reg) + reg_offset);
+	*reg_addr = value;
+	barrier_dmem_fence_full(); /* make sure that write commits */
+}
+
+static uint32_t xilinx_axienet_read_mdio_register(const struct mdio_xilinx_axienet_config *config,
+						  uintptr_t reg_offset)
+{
+	const volatile uint32_t *reg_addr = (uint32_t *)((uint8_t *)(config->reg) + reg_offset);
+	const uint32_t ret = *reg_addr;
+
+	barrier_dmem_fence_full(); /* make sure that read commits */
+	return ret;
+}
+
+static void mdio_xilinx_axienet_bus_disable(const struct device *dev)
+{
+	const struct mdio_xilinx_axienet_config *config = dev->config;
+	struct mdio_xilinx_axienet_data *data = dev->data;
+
+	LOG_INF("Disable MDIO Bus!");
+
+	xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_INTERRUPT_ENABLE_REG_OFFSET,
+					   XILINX_AXIENET_MDIO_INTERRUPT_DISABLE_ALL_MASK);
+
+	xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_SETUP_REG_OFFSET,
+					   XILINX_AXIENET_MDIO_SETUP_REG_MDIO_DISABLE_MASK);
+	data->bus_enabled = false;
+}
+
+static void enable_mdio_bus(const struct mdio_xilinx_axienet_config *config,
+			    struct mdio_xilinx_axienet_data *data)
+{
+
+	if ((xilinx_axienet_read_mdio_register(config, XILINX_AXIENET_MDIO_SETUP_REG_OFFSET) &
+	     XILINX_AXIENET_MDIO_SETUP_REG_MDIO_ENABLE_MASK) == 0) {
+		int err;
+
+		xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_SETUP_REG_OFFSET,
+						   XILINX_AXIENET_MDIO_SETUP_REG_MDIO_ENABLE_MASK |
+							   data->clock_divider);
+
+		xilinx_axienet_mdio_write_register(config,
+						   XILINX_AXIENET_MDIO_INTERRUPT_ENABLE_REG_OFFSET,
+						   XILINX_AXIENET_MDIO_INTERRUPT_MASK);
+
+		if (config->have_irq) {
+			LOG_DBG("Waiting for bus enable!");
+			err = k_sem_take(&data->irq_sema,
+					 K_MSEC(XILINX_AXIENET_MDIO_INTERRUPT_TIMEOUT_MS));
+
+			if (err != 0) {
+				LOG_ERR("Could not enable MDIO bus: %d (%s)", err, strerror(-err));
+			}
+		}
+
+		while ((xilinx_axienet_read_mdio_register(config,
+							  XILINX_AXIENET_MDIO_SETUP_REG_OFFSET) &
+			XILINX_AXIENET_MDIO_SETUP_REG_MDIO_ENABLE_MASK) == 0) {
+			LOG_DBG("Waiting for bus enable!");
+		}
+
+	} else {
+		data->bus_enabled = true;
+	}
+}
+
+static void mdio_xilinx_axienet_bus_enable(const struct device *dev)
+{
+	const struct mdio_xilinx_axienet_config *config = dev->config;
+	struct mdio_xilinx_axienet_data *data = dev->data;
+	uint16_t clock_divider, clock_divider_full;
+
+	if (!config->clock_frequency_hz) {
+		LOG_ERR("No clock frequency specified for ethernet device!");
+		return;
+	}
+
+	/* this might result in a MDIO frequency that is a bit lower than the max frequency */
+	clock_divider_full = DIV_ROUND_UP(config->clock_frequency_hz,
+					  XILINX_AXIENET_MDIO_MDIO_TARGET_FREQUENCY_HZ * 2);
+	clock_divider = clock_divider_full & XILINX_AXIENET_MDIO_SETUP_REG_MDIO_CLOCK_DIVIDER_MASK;
+
+	if (clock_divider != clock_divider_full) {
+		LOG_ERR("Clock divider overflow!");
+		/* maximum divider value - lowest MDIO frequency we can achieve */
+		clock_divider = XILINX_AXIENET_MDIO_SETUP_REG_MDIO_CLOCK_DIVIDER_MASK;
+	}
+
+	data->clock_divider = clock_divider;
+
+	LOG_INF("Enable MDIO Bus assuming ethernet clock frequency %u divider %u!",
+		config->clock_frequency_hz, clock_divider);
+
+	xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_SETUP_REG_OFFSET,
+					   clock_divider);
+
+	enable_mdio_bus(config, data);
+
+	LOG_INF("MDIO ready!");
+}
+
+static int mdio_xilinx_axienet_read(const struct device *dev, uint8_t prtad, uint8_t devad,
+				    uint16_t *data)
+{
+	const struct mdio_xilinx_axienet_config *config = dev->config;
+	struct mdio_xilinx_axienet_data *dev_data = dev->data;
+	int err;
+
+	if (k_is_in_isr()) {
+		LOG_ERR("Called MDIO read in ISR!");
+		return -EWOULDBLOCK;
+	}
+
+	enable_mdio_bus(config, dev_data);
+
+	if (!dev_data->bus_enabled) {
+		LOG_ERR("Bus needs to be enabled!");
+		return -EIO;
+	}
+
+	LOG_DBG("Waiting for IRQ from MDIO!");
+
+	xilinx_axienet_mdio_write_register(
+		config, XILINX_AXIENET_MDIO_CONTROL_REG_OFFSET,
+		XILINX_AXIENET_MDIO_CONTROL_REG_MASK_INITIATE |
+			(prtad << XILINX_AXIENET_MDIO_CONTROL_REG_SHIFT_PHYADDR) |
+			(devad << XILINX_AXIENET_MDIO_CONTROL_REG_SHIFT_REGADDR) |
+			XILINX_AXIENET_MDIO_CONTROL_REG_MASK_READ);
+
+	xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_INTERRUPT_ENABLE_REG_OFFSET,
+					   XILINX_AXIENET_MDIO_INTERRUPT_MASK);
+
+	if (config->have_irq) {
+		err = k_sem_take(&dev_data->irq_sema,
+				 K_MSEC(XILINX_AXIENET_MDIO_INTERRUPT_TIMEOUT_MS));
+
+		if (err != 0) {
+			LOG_DBG("Error %d (%s) from IRQ semaphore - polling!", err, strerror(-err));
+		}
+	}
+
+	while ((xilinx_axienet_read_mdio_register(config, XILINX_AXIENET_MDIO_CONTROL_REG_OFFSET) &
+		XILINX_AXIENET_MDIO_CONTROL_REG_MASK_READY) == 0x0) {
+		LOG_DBG("Transfer is not yet ready!");
+	}
+
+	LOG_DBG("IRQ from MDIO received - read complete!");
+
+	*data = (uint16_t)(xilinx_axienet_read_mdio_register(
+				   config, XILINX_AXIENET_MDIO_READ_DATA_REG_OFFSET) &
+			   XILINX_AXIENET_MDIO_READ_DATA_REG_DATA_MASK);
+
+	LOG_DBG("Read %" PRIu16 " from MDIO!", *data);
+
+	return 0;
+}
+
+static int mdio_xilinx_axienet_write(const struct device *dev, uint8_t prtad, uint8_t devad,
+				     uint16_t data)
+{
+	const struct mdio_xilinx_axienet_config *config = dev->config;
+	struct mdio_xilinx_axienet_data *dev_data = dev->data;
+	int err;
+
+	if (k_is_in_isr()) {
+		LOG_ERR("Called MDIO write in ISR!");
+		return -EWOULDBLOCK;
+	}
+
+	enable_mdio_bus(config, dev_data);
+
+	if (!dev_data->bus_enabled) {
+		LOG_ERR("Bus needs to be enabled!");
+		return -EIO;
+	}
+
+	LOG_DBG("Waiting for IRQ from MDIO!");
+
+	xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_WRITE_DATA_REG_OFFSET, data);
+
+	xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_INTERRUPT_ENABLE_REG_OFFSET,
+					   XILINX_AXIENET_MDIO_INTERRUPT_MASK);
+
+	xilinx_axienet_mdio_write_register(
+		config, XILINX_AXIENET_MDIO_CONTROL_REG_OFFSET,
+		XILINX_AXIENET_MDIO_CONTROL_REG_MASK_INITIATE |
+			(prtad << XILINX_AXIENET_MDIO_CONTROL_REG_SHIFT_PHYADDR) |
+			(devad << XILINX_AXIENET_MDIO_CONTROL_REG_SHIFT_REGADDR) |
+			XILINX_AXIENET_MDIO_CONTROL_REG_MASK_WRITE);
+
+	if (config->have_irq) {
+		err = k_sem_take(&dev_data->irq_sema,
+				 K_MSEC(XILINX_AXIENET_MDIO_INTERRUPT_TIMEOUT_MS));
+		if (err != 0) {
+			LOG_DBG("Error %d (%s) from IRQ semaphore - polling!", err, strerror(-err));
+		}
+	}
+	while ((xilinx_axienet_read_mdio_register(config, XILINX_AXIENET_MDIO_CONTROL_REG_OFFSET) &
+		XILINX_AXIENET_MDIO_CONTROL_REG_MASK_READY) == 0x0) {
+		LOG_DBG("IRQ from MDIO received but transfer is not yet ready!");
+	}
+
+	LOG_DBG("IRQ from MDIO received - write complete!");
+
+	return 0;
+}
+
+static inline void xilinx_axienet_mdio_isr(const struct device *dev)
+{
+	const struct mdio_xilinx_axienet_config *config = dev->config;
+	struct mdio_xilinx_axienet_data *data = dev->data;
+	uint32_t interrupt_status;
+
+	interrupt_status = xilinx_axienet_read_mdio_register(
+		config, XILINX_AXIENET_MDIO_INTERRUPT_STATUS_REG_OFFSET);
+
+	if (interrupt_status & XILINX_AXIENET_MDIO_INTERRUPT_MASK) {
+		k_sem_give(&data->irq_sema);
+		LOG_DBG("MDIO interrupt received!");
+	} else {
+		LOG_DBG("Unknown interrupt received: %x!", interrupt_status);
+	}
+	xilinx_axienet_mdio_write_register(config, XILINX_AXIENET_MDIO_INTERRUPT_CLEAR_REG_OFFSET,
+					   XILINX_AXIENET_MDIO_INTERRUPT_MASK);
+}
+
+static int xilinx_axienet_mdio_probe(const struct device *dev)
+{
+	const struct mdio_xilinx_axienet_config *config = dev->config;
+	struct mdio_xilinx_axienet_data *data = dev->data;
+	int err;
+
+	if (config->have_irq) {
+		err = k_sem_init(&data->irq_sema, 0, K_SEM_MAX_LIMIT);
+
+		if (err != 0) {
+			LOG_ERR("Could not init semaphore: error %d (%s)", err, strerror(-err));
+			return err;
+		}
+	}
+
+	LOG_INF("Enabling IRQ!");
+	config->config_func(data);
+
+	return 0;
+}
+
+static const struct mdio_driver_api mdio_xilinx_axienet_api = {
+	.bus_disable = mdio_xilinx_axienet_bus_disable,
+	.bus_enable = mdio_xilinx_axienet_bus_enable,
+	.read = mdio_xilinx_axienet_read,
+	.write = mdio_xilinx_axienet_write};
+
+#define SETUP_IRQS(inst)                                                                           \
+	IRQ_CONNECT(DT_INST_IRQN(inst), DT_INST_IRQ(inst, priority), xilinx_axienet_mdio_isr,      \
+		    DEVICE_DT_INST_GET(inst), 0);                                                  \
+                                                                                                   \
+	irq_enable(DT_INST_IRQN(inst))
+
+#define XILINX_AXIENET_MDIO_INIT(inst)                                                             \
+                                                                                                   \
+	static void xilinx_axienet_mdio_config_##inst(const struct mdio_xilinx_axienet_data *data) \
+	{                                                                                          \
+                                                                                                   \
+		COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, interrupts), (SETUP_IRQS(inst)),           \
+			    (LOG_INF("No IRQs defined!")));        \
+	}                                                                                          \
+	static const struct mdio_xilinx_axienet_config mdio_xilinx_axienet_config##inst = {        \
+		.config_func = xilinx_axienet_mdio_config_##inst,                                  \
+		.reg = (void *)(uintptr_t)DT_REG_ADDR(DT_INST_PARENT(inst)),                       \
+		.clock_frequency_hz = DT_INST_PROP(inst, clock_frequency),                         \
+		.have_irq = DT_INST_NODE_HAS_PROP(inst, interrupts)};                              \
+	static struct mdio_xilinx_axienet_data mdio_xilinx_axienet_data##inst = {0};               \
+	DEVICE_DT_INST_DEFINE(inst, xilinx_axienet_mdio_probe, NULL,                               \
+			      &mdio_xilinx_axienet_data##inst, &mdio_xilinx_axienet_config##inst,  \
+			      POST_KERNEL, CONFIG_MDIO_INIT_PRIORITY, &mdio_xilinx_axienet_api);
+
+#define DT_DRV_COMPAT xlnx_axi_ethernet_1_00_a_mdio
+DT_INST_FOREACH_STATUS_OKAY(XILINX_AXIENET_MDIO_INIT)
diff --git a/drivers/memc/CMakeLists.txt b/drivers/memc/CMakeLists.txt
index fcdc5f06e4556..188a40dfcd6aa 100644
--- a/drivers/memc/CMakeLists.txt
+++ b/drivers/memc/CMakeLists.txt
@@ -6,6 +6,7 @@ zephyr_library_sources_ifdef(CONFIG_MEMC_STM32 memc_stm32.c)
 zephyr_library_sources_ifdef(CONFIG_MEMC_STM32_SDRAM memc_stm32_sdram.c)
 zephyr_linker_sources_ifdef(CONFIG_MEMC_STM32_SDRAM SECTIONS memc_stm32_sdram.ld)
 zephyr_library_sources_ifdef(CONFIG_MEMC_STM32_NOR_PSRAM memc_stm32_nor_psram.c)
+zephyr_library_sources_ifdef(CONFIG_MEMC_STM32_XSPI_PSRAM memc_stm32_xspi_psram.c)
 
 zephyr_library_sources_ifdef(CONFIG_MEMC_MCUX_FLEXSPI memc_mcux_flexspi.c)
 zephyr_library_sources_ifdef(CONFIG_MEMC_MCUX_FLEXSPI_W956A8MBYA memc_mcux_flexspi_w956a8mbya.c)
diff --git a/drivers/memc/Kconfig.stm32 b/drivers/memc/Kconfig.stm32
index a4b3b96e81647..b9e5fb02158fd 100644
--- a/drivers/memc/Kconfig.stm32
+++ b/drivers/memc/Kconfig.stm32
@@ -31,3 +31,12 @@ config MEMC_STM32_NOR_PSRAM
 	  Enable STM32 FMC NOR/PSRAM controller.
 
 endif
+
+config MEMC_STM32_XSPI_PSRAM
+	bool "STM32 XSPI PSRAM"
+	default y
+	depends on DT_HAS_ST_STM32_XSPI_PSRAM_ENABLED
+	select USE_STM32_HAL_XSPI
+	select PINCTRL
+	help
+	  Enable STM32 XSPI Memory Controller.
diff --git a/drivers/memc/memc_stm32_xspi_psram.c b/drivers/memc/memc_stm32_xspi_psram.c
new file mode 100644
index 0000000000000..676ec8c7f27fc
--- /dev/null
+++ b/drivers/memc/memc_stm32_xspi_psram.c
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT st_stm32_xspi_psram
+
+#include <errno.h>
+#include <soc.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(memc_stm32_xspi_psram, CONFIG_MEMC_LOG_LEVEL);
+
+#define STM32_XSPI_NODE DT_INST_PARENT(0)
+
+/* Memory registers definition */
+#define MR0		0x00000000U
+#define MR1		0x00000001U
+#define MR2		0x00000002U
+#define MR3		0x00000003U
+#define MR4		0x00000004U
+#define MR8		0x00000008U
+
+/* Memory commands */
+#define SYNC_READ_CMD	0x00U
+#define SYNC_WRITE_CMD	0x80U
+#define BURST_READ_CMD	0x20U
+#define BURST_WRITE_CMD	0xA0U
+#define READ_REG_CMD	0x40U
+#define WRITE_REG_CMD	0xC0U
+#define RESET_CMD	0xFFU
+
+/* Memory default dummy clocks cycles */
+#define DUMMY_CLK_CYCLES_READ	6U
+#define DUMMY_CLK_CYCLES_WRITE	6U
+
+struct memc_stm32_xspi_psram_config {
+	const struct pinctrl_dev_config *pcfg;
+	const struct stm32_pclken pclken;
+	const struct stm32_pclken pclken_ker;
+	const struct stm32_pclken pclken_mgr;
+	size_t memory_size;
+};
+
+struct memc_stm32_xspi_psram_data {
+	XSPI_HandleTypeDef hxspi;
+};
+
+static int ap_memory_write_reg(XSPI_HandleTypeDef *hxspi, uint32_t address, uint8_t *value)
+{
+	XSPI_RegularCmdTypeDef cmd = {0};
+
+	/* Initialize the write register command.
+	 * The following fields are already set to 0 thanks to cmd = {0}.
+	 * They are kept in comment for better understanding of the command.
+	 * cmd.OperationType = HAL_XSPI_OPTYPE_COMMON_CFG;
+	 * cmd.InstructionWidth = HAL_XSPI_INSTRUCTION_8_BITS;
+	 * cmd.AlternateBytesMode = HAL_XSPI_ALT_BYTES_NONE;
+	 * cmd.DQSMode = HAL_XSPI_DQS_DISABLE;
+	 */
+	cmd.Instruction = WRITE_REG_CMD;
+	cmd.InstructionMode = HAL_XSPI_INSTRUCTION_8_LINES;
+	cmd.InstructionDTRMode = HAL_XSPI_INSTRUCTION_DTR_DISABLE;
+	cmd.Address = address;
+	cmd.AddressMode = HAL_XSPI_ADDRESS_8_LINES;
+	cmd.AddressWidth = HAL_XSPI_ADDRESS_32_BITS;
+	cmd.AddressDTRMode = HAL_XSPI_ADDRESS_DTR_ENABLE;
+	cmd.DataMode = HAL_XSPI_DATA_8_LINES;
+	cmd.DataLength = 2U;
+	cmd.DataDTRMode = HAL_XSPI_DATA_DTR_ENABLE;
+
+	/* Configure the command */
+	if (HAL_XSPI_Command(hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
+		LOG_ERR("XSPI write command failed");
+		return -EIO;
+	}
+
+	/* Transmission of the data */
+	if (HAL_XSPI_Transmit(hxspi, value, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
+		LOG_ERR("XSPI transmit failed");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int ap_memory_read_reg(XSPI_HandleTypeDef *hxspi, uint32_t address, uint8_t *value,
+			      uint32_t latency_cycles)
+{
+	XSPI_RegularCmdTypeDef cmd = {0};
+
+	/* Initialize the read register command
+	 * The following fields are already set to 0 thanks to cmd = {0}.
+	 * They are kept in comment for better understanding of the command.
+	 * cmd.OperationType = HAL_XSPI_OPTYPE_COMMON_CFG;
+	 * cmd.InstructionWidth = HAL_XSPI_INSTRUCTION_8_BITS;
+	 * cmd.InstructionDTRMode = HAL_XSPI_INSTRUCTION_DTR_DISABLE;
+	 * cmd.AlternateBytesMode = HAL_XSPI_ALT_BYTES_NONE;
+	 */
+	cmd.Instruction = READ_REG_CMD;
+	cmd.InstructionMode = HAL_XSPI_INSTRUCTION_8_LINES;
+	cmd.Address = address;
+	cmd.AddressMode = HAL_XSPI_ADDRESS_8_LINES;
+	cmd.AddressWidth = HAL_XSPI_ADDRESS_32_BITS;
+	cmd.AddressDTRMode = HAL_XSPI_ADDRESS_DTR_ENABLE;
+	cmd.DataMode = HAL_XSPI_DATA_8_LINES;
+	cmd.DataLength = 2U;
+	cmd.DataDTRMode = HAL_XSPI_DATA_DTR_ENABLE;
+	cmd.DummyCycles = latency_cycles;
+	cmd.DQSMode = HAL_XSPI_DQS_ENABLE;
+
+	/* Configure the command */
+	if (HAL_XSPI_Command(hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
+		LOG_ERR("XSPI read command failed");
+		return -EIO;
+	}
+
+	/* Reception of the data */
+	if (HAL_XSPI_Receive(hxspi, value, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
+		LOG_ERR("XSPI receive failed");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int ap_memory_configure(XSPI_HandleTypeDef *hxspi)
+{
+	uint8_t read_latency_code = DT_INST_PROP(0, read_latency);
+	uint8_t read_latency_cycles = read_latency_code + 3U; /* Code 0 <=> 3 cycles... */
+
+	/* MR0 register for read and write */
+	uint8_t regW_MR0[2] = {(DT_INST_PROP(0, fixed_latency) ? 0x20U : 0x00U) |
+			       (read_latency_code << 2) |
+			       (DT_INST_PROP(0, drive_strength)), 0x8DU};
+	uint8_t regR_MR0[2] = {0};
+
+	/* MR4 register for read and write */
+	uint8_t regW_MR4[2] = {(DT_INST_PROP(0, write_latency) << 5) |
+			      (DT_INST_PROP(0, refresh_rate) << 3) |
+			      (DT_INST_PROP(0, pasr)), 0x05U};
+	uint8_t regR_MR4[2] = {0};
+
+	/* MR8 register for read and write */
+	uint8_t regW_MR8[2] = {(DT_INST_PROP(0, io_x16_mode) ? 0x40U : 0x00U) |
+			       (DT_INST_PROP(0, rbx) ? 0x08U : 0x00U) |
+			       (DT_INST_PROP(0, burst_type_hybrid_wrap) ? 0x04U : 0x00U) |
+			       (DT_INST_PROP(0, burst_length)), 0x08U};
+	uint8_t regR_MR8[2] = {0};
+
+	/* Configure Read Latency and drive Strength */
+	if (ap_memory_write_reg(hxspi, MR0, regW_MR0) != 0) {
+		return -EIO;
+	}
+
+	/* Check MR0 configuration */
+	if (ap_memory_read_reg(hxspi, MR0, regR_MR0, read_latency_cycles) != 0) {
+		return -EIO;
+	}
+	if (regR_MR0[0] != regW_MR0[0]) {
+		return -EIO;
+	}
+
+	/* Configure Write Latency and refresh rate */
+	if (ap_memory_write_reg(hxspi, MR4, regW_MR4) != 0) {
+		return -EIO;
+	}
+
+	/* Check MR4 configuration */
+	if (ap_memory_read_reg(hxspi, MR4, regR_MR4, read_latency_cycles) != 0) {
+		return -EIO;
+	}
+	if (regR_MR4[0] != regW_MR4[0]) {
+		return -EIO;
+	}
+
+	/* Configure Burst Length */
+	if (ap_memory_write_reg(hxspi, MR8, regW_MR8) != 0) {
+		return -EIO;
+	}
+
+	/* Check MR8 configuration */
+	if (ap_memory_read_reg(hxspi, MR8, regR_MR8, read_latency_cycles) != 0) {
+		return -EIO;
+	}
+	if (regR_MR8[0] != regW_MR8[0]) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int memc_stm32_xspi_psram_init(const struct device *dev)
+{
+	const struct memc_stm32_xspi_psram_config *dev_cfg = dev->config;
+	struct memc_stm32_xspi_psram_data *dev_data = dev->data;
+	XSPI_HandleTypeDef hxspi = dev_data->hxspi;
+	XSPI_TypeDef *xspi = hxspi.Instance;
+	uint32_t ahb_clock_freq;
+	XSPIM_CfgTypeDef cfg = {0};
+	XSPI_RegularCmdTypeDef cmd = {0};
+	XSPI_MemoryMappedTypeDef mem_mapped_cfg = {0};
+	int ret;
+
+	/* Signals configuration */
+	ret = pinctrl_apply_state(dev_cfg->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		LOG_ERR("XSPI pinctrl setup failed (%d)", ret);
+		return ret;
+	}
+
+	if (!device_is_ready(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE))) {
+		LOG_ERR("clock control device not ready");
+		return -ENODEV;
+	}
+
+	/* Clock configuration */
+	if (clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+			     (clock_control_subsys_t) &dev_cfg->pclken) != 0) {
+		LOG_ERR("Could not enable XSPI clock");
+		return -EIO;
+	}
+	if (clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+				   (clock_control_subsys_t) &dev_cfg->pclken,
+				   &ahb_clock_freq) < 0) {
+		LOG_ERR("Failed call clock_control_get_rate(pclken)");
+		return -EIO;
+	}
+
+#if DT_CLOCKS_HAS_NAME(STM32_XSPI_NODE, xspi_ker)
+	/* Kernel clock config for peripheral if any */
+	if (clock_control_configure(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					(clock_control_subsys_t) &dev_cfg->pclken_ker,
+					NULL) != 0) {
+		LOG_ERR("Could not select XSPI domain clock");
+		return -EIO;
+	}
+
+	if (clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					(clock_control_subsys_t) &dev_cfg->pclken_ker,
+					&ahb_clock_freq) < 0) {
+		LOG_ERR("Failed call clock_control_get_rate(pclken_ker)");
+		return -EIO;
+	}
+#endif
+
+#if DT_CLOCKS_HAS_NAME(STM32_XSPI_NODE, xspi_mgr)
+	/* Clock domain corresponding to the IO-Mgr (XSPIM) */
+	if (clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+				(clock_control_subsys_t) &dev_cfg->pclken_mgr) != 0) {
+		LOG_ERR("Could not enable XSPI Manager clock");
+		return -EIO;
+	}
+#endif
+
+	hxspi.Init.MemorySize = find_msb_set(dev_cfg->memory_size) - 2;
+
+	if (HAL_XSPI_Init(&hxspi) != HAL_OK) {
+		LOG_ERR("XSPI Init failed");
+		return -EIO;
+	}
+
+	cfg.nCSOverride = HAL_XSPI_CSSEL_OVR_NCS1;
+	cfg.IOPort = HAL_XSPIM_IOPORT_1;
+
+	if (HAL_XSPIM_Config(&hxspi, &cfg, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
+		LOG_ERR("XSPIMgr Init failed");
+		return -EIO;
+	}
+
+	/* Configure AP memory registers */
+	ret = ap_memory_configure(&hxspi);
+	if (ret != 0) {
+		LOG_ERR("AP memory configuration failed");
+		return -EIO;
+	}
+
+	/* The following fields are already set to 0 thanks to cmd = {0}.
+	 * They are kept in comment for better understanding of the command.
+	 * cmd.InstructionWidth = HAL_XSPI_INSTRUCTION_8_BITS;
+	 * cmd.InstructionDTRMode = HAL_XSPI_INSTRUCTION_DTR_DISABLE;
+	 * cmd.Address = 0x0U;
+	 * cmd.AlternateBytesMode = HAL_XSPI_ALT_BYTES_NONE;
+	 */
+	cmd.OperationType = HAL_XSPI_OPTYPE_WRITE_CFG;
+	cmd.InstructionMode = HAL_XSPI_INSTRUCTION_8_LINES;
+	cmd.Instruction = BURST_WRITE_CMD;
+	cmd.AddressMode = HAL_XSPI_ADDRESS_8_LINES;
+	cmd.AddressWidth = HAL_XSPI_ADDRESS_32_BITS;
+	cmd.AddressDTRMode = HAL_XSPI_ADDRESS_DTR_ENABLE;
+	cmd.DataMode = HAL_XSPI_DATA_16_LINES;
+	cmd.DataDTRMode = HAL_XSPI_DATA_DTR_ENABLE;
+	cmd.DummyCycles = DUMMY_CLK_CYCLES_WRITE;
+	cmd.DQSMode = HAL_XSPI_DQS_ENABLE;
+
+	if (HAL_XSPI_Command(&hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
+		return -EIO;
+	}
+
+	cmd.OperationType = HAL_XSPI_OPTYPE_READ_CFG;
+	cmd.Instruction = BURST_READ_CMD;
+	cmd.DummyCycles = DUMMY_CLK_CYCLES_READ;
+
+	if (HAL_XSPI_Command(&hxspi, &cmd, HAL_XSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) {
+		return -EIO;
+	}
+
+	mem_mapped_cfg.TimeOutActivation = HAL_XSPI_TIMEOUT_COUNTER_DISABLE;
+	mem_mapped_cfg.NoPrefetchData = HAL_XSPI_AUTOMATIC_PREFETCH_ENABLE;
+	mem_mapped_cfg.NoPrefetchAXI = HAL_XSPI_AXI_PREFETCH_DISABLE;
+
+	if (HAL_XSPI_MemoryMapped(&hxspi, &mem_mapped_cfg) != HAL_OK) {
+		return -EIO;
+	}
+
+	MODIFY_REG(xspi->CR, XSPI_CR_NOPREF, HAL_XSPI_AUTOMATIC_PREFETCH_DISABLE);
+
+	return 0;
+}
+
+PINCTRL_DT_DEFINE(STM32_XSPI_NODE);
+
+static const struct memc_stm32_xspi_psram_config memc_stm32_xspi_cfg = {
+	.pcfg = PINCTRL_DT_DEV_CONFIG_GET(STM32_XSPI_NODE),
+	.pclken = {.bus = DT_CLOCKS_CELL_BY_NAME(STM32_XSPI_NODE, xspix, bus),
+		   .enr = DT_CLOCKS_CELL_BY_NAME(STM32_XSPI_NODE, xspix, bits)},
+#if DT_CLOCKS_HAS_NAME(STM32_XSPI_NODE, xspi_ker)
+	.pclken_ker = {.bus = DT_CLOCKS_CELL_BY_NAME(STM32_XSPI_NODE, xspi_ker, bus),
+		       .enr = DT_CLOCKS_CELL_BY_NAME(STM32_XSPI_NODE, xspi_ker, bits)},
+#endif
+#if DT_CLOCKS_HAS_NAME(STM32_XSPI_NODE, xspi_mgr)
+	.pclken_mgr = {.bus = DT_CLOCKS_CELL_BY_NAME(STM32_XSPI_NODE, xspi_mgr, bus),
+		       .enr = DT_CLOCKS_CELL_BY_NAME(STM32_XSPI_NODE, xspi_mgr, bits)},
+#endif
+	.memory_size = DT_INST_REG_ADDR_BY_IDX(0, 1),
+};
+
+static struct memc_stm32_xspi_psram_data memc_stm32_xspi_data = {
+	.hxspi = {
+		.Instance = (XSPI_TypeDef *)DT_REG_ADDR(STM32_XSPI_NODE),
+		.Init = {
+			.FifoThresholdByte = 8U,
+			.MemoryMode = HAL_XSPI_SINGLE_MEM,
+			.MemoryType = (DT_INST_PROP(0, io_x16_mode) ?
+					HAL_XSPI_MEMTYPE_APMEM_16BITS :
+					HAL_XSPI_MEMTYPE_APMEM),
+			.ChipSelectHighTimeCycle = 1U,
+			.FreeRunningClock = HAL_XSPI_FREERUNCLK_DISABLE,
+			.ClockMode = HAL_XSPI_CLOCK_MODE_0,
+			.WrapSize = HAL_XSPI_WRAP_NOT_SUPPORTED,
+			.ClockPrescaler = 3U,
+			.SampleShifting = HAL_XSPI_SAMPLE_SHIFT_NONE,
+			.DelayHoldQuarterCycle = HAL_XSPI_DHQC_ENABLE,
+			.ChipSelectBoundary = HAL_XSPI_BONDARYOF_16KB,
+			.MaxTran = 0U,
+			.Refresh = 0x81U,
+			.MemorySelect = HAL_XSPI_CSSEL_NCS1,
+		},
+	},
+};
+
+DEVICE_DT_INST_DEFINE(0, &memc_stm32_xspi_psram_init, NULL,
+		      &memc_stm32_xspi_data, &memc_stm32_xspi_cfg,
+		      POST_KERNEL, CONFIG_MEMC_INIT_PRIORITY,
+		      NULL);
diff --git a/drivers/mfd/CMakeLists.txt b/drivers/mfd/CMakeLists.txt
index 5a7f5faee90ac..7a479bdc9dc36 100644
--- a/drivers/mfd/CMakeLists.txt
+++ b/drivers/mfd/CMakeLists.txt
@@ -9,11 +9,12 @@ zephyr_library_sources_ifdef(CONFIG_MFD_NCT38XX mfd_nct38xx.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_NPM1300 mfd_npm1300.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_NPM2100 mfd_npm2100.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_NPM6001 mfd_npm6001.c)
-zephyr_library_sources_ifdef(CONFIG_MFD_AXP192 mfd_axp192.c)
+zephyr_library_sources_ifdef(CONFIG_MFD_AXP192_AXP2101 mfd_axp192.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_AD559X mfd_ad559x.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_AD559X_BUS_I2C mfd_ad559x_i2c.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_AD559X_BUS_SPI mfd_ad559x_spi.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_MAX31790 mfd_max31790.c)
+zephyr_library_sources_ifdef(CONFIG_MFD_MAXQ10XX mfd_maxq10xx.c)
 zephyr_library_sources_ifdef(CONFIG_NXP_LP_FLEXCOMM mfd_nxp_lp_flexcomm.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_BD8LB600FS mfd_bd8lb600fs.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_TLE9104 mfd_tle9104.c)
@@ -22,3 +23,4 @@ zephyr_library_sources_ifdef(CONFIG_MFD_ITE_IT8801_ALTCTRL mfd_it8801_altctrl.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_AW9523B mfd_aw9523b.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_DS3231 mfd_ds3231.c)
 zephyr_library_sources_ifdef(CONFIG_MFD_MAX22017 mfd_max22017.c)
+zephyr_library_sources_ifdef(CONFIG_MFD_PF1550 mfd_pf1550.c)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 0ccb41f6ba1b6..74184f231f49a 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -27,10 +27,12 @@ source "drivers/mfd/Kconfig.ds3231"
 source "drivers/mfd/Kconfig.max20335"
 source "drivers/mfd/Kconfig.max22017"
 source "drivers/mfd/Kconfig.max31790"
+source "drivers/mfd/Kconfig.maxq10xx"
 source "drivers/mfd/Kconfig.nct38xx"
 source "drivers/mfd/Kconfig.npm1300"
 source "drivers/mfd/Kconfig.npm2100"
 source "drivers/mfd/Kconfig.npm6001"
+source "drivers/mfd/Kconfig.pf1550"
 source "drivers/mfd/Kconfig.lpflexcomm"
 source "drivers/mfd/Kconfig.tle9104"
 source "drivers/mfd/Kconfig.it8801"
diff --git a/drivers/mfd/Kconfig.axp192 b/drivers/mfd/Kconfig.axp192
index da76c4cc615a8..93bef1b72ffb1 100644
--- a/drivers/mfd/Kconfig.axp192
+++ b/drivers/mfd/Kconfig.axp192
@@ -1,10 +1,10 @@
 # Copyright (c) 2023 Martin Kiepfer <mrmarteng@teleschirm.org>
 # SPDX-License-Identifier: Apache-2.0
 
-config MFD_AXP192
-	bool "AXP192 PMIC multi-function device driver"
+config MFD_AXP192_AXP2101
+	bool "AXP192/AXP2101 PMIC multi-function device driver"
 	default y
-	depends on DT_HAS_X_POWERS_AXP192_ENABLED
+	depends on DT_HAS_X_POWERS_AXP192_ENABLED || DT_HAS_X_POWERS_AXP2101_ENABLED
 	select I2C
 	help
-	  Enable the X-Powers AXP192 PMIC multi-function device driver
+	  Enable the X-Powers AXP192/AXP2101 PMIC multi-function device driver
diff --git a/drivers/mfd/Kconfig.maxq10xx b/drivers/mfd/Kconfig.maxq10xx
new file mode 100644
index 0000000000000..e6fdc680c277c
--- /dev/null
+++ b/drivers/mfd/Kconfig.maxq10xx
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Vogl Electronic GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+config MFD_MAXQ10XX
+	bool "MAXQ10xx mfd driver"
+	default y
+	depends on DT_HAS_ADI_MAXQ10XX_ENABLED
+	# using select SPI at this point introduces a cyclic dependency
+	depends on SPI
+	help
+	  This option enables the mfd driver for the
+	  MAXQ10xx crypto chips.
+
+if MFD_MAXQ10XX
+
+config MFD_MAXQ10XX_INIT_PRIORITY
+	int "MAXQ10xx init priority"
+	default 51
+	help
+	  Device driver initialization priority.
+	  Device is connected to SPI bus, it has to
+	  be initialized after SPI driver.
+
+endif # MFD_MAXQ10XX
diff --git a/drivers/mfd/Kconfig.pf1550 b/drivers/mfd/Kconfig.pf1550
new file mode 100644
index 0000000000000..127bcbabe0b52
--- /dev/null
+++ b/drivers/mfd/Kconfig.pf1550
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+config MFD_PF1550
+	bool "PF1550 PMIC multi-function device driver"
+	default y
+	depends on DT_HAS_NXP_PF1550_ENABLED
+	select I2C
+	help
+	  Enable the NXP PF1550 PMIC multi-function device driver
diff --git a/drivers/mfd/mfd_axp192.c b/drivers/mfd/mfd_axp192.c
index 421f5d19a37cb..b15fdeac75d8a 100644
--- a/drivers/mfd/mfd_axp192.c
+++ b/drivers/mfd/mfd_axp192.c
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define DT_DRV_COMPAT x_powers_axp192
-
 #include <errno.h>
 #include <stdbool.h>
 
@@ -15,6 +13,19 @@
 
 LOG_MODULE_REGISTER(mfd_axp192, CONFIG_MFD_LOG_LEVEL);
 
+struct mfd_axp192_config {
+	struct i2c_dt_spec i2c;
+#ifdef CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED
+	bool vbusen_disable;
+#endif
+	uint8_t reg_chip_id;
+	uint8_t vbus_config_reg;
+	uint8_t chip_id;
+	uint8_t val_vbusen_disable;
+};
+
+#ifdef CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED
+
 /* Chip ID value */
 #define AXP192_CHIP_ID 0x03U
 
@@ -97,11 +108,6 @@ LOG_MODULE_REGISTER(mfd_axp192, CONFIG_MFD_LOG_LEVEL);
 #define AXP192_GPIO5_OUTPUT_VAL   0x04U
 #define AXP192_GPIO5_OUTPUT_SHIFT 3U
 
-struct mfd_axp192_config {
-	struct i2c_dt_spec i2c;
-	bool vbusen_disable;
-};
-
 struct mfd_axp192_data {
 	const struct device *gpio_mask_used[AXP192_GPIO_MAX_NUM];
 	uint8_t gpio_mask_output;
@@ -139,12 +145,27 @@ const struct mfd_axp192_func_reg_desc gpio_reg_desc[AXP192_GPIO_MAX_NUM] = {
 		.mask = AXP192_GPIO4_FUNC_MASK,
 	},
 };
+#endif /* CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED */
+
+#ifdef CONFIG_DT_HAS_X_POWERS_AXP2101_ENABLED
+
+/* Chip ID value */
+#define AXP2101_CHIP_ID		0x4AU
+
+/* Registers definitions */
+#define AXP2101_REG_CHIP_ID	0x03U
+
+/* AXP210 GPIO register addresses */
+#define AXP2101_VBUS_CFG_REG	0x00U
+
+/* VBUS control reg values */
+#define AXP2101_VBUS_CFG_VAL_VBUSEN_DISABLE	0x00U
+#endif /* CONFIG_DT_HAS_X_POWERS_AXP2101_ENABLED */
 
 static int mfd_axp192_init(const struct device *dev)
 {
 	const struct mfd_axp192_config *config = dev->config;
 	uint8_t chip_id;
-	uint8_t vbus_val;
 	int ret;
 
 	LOG_DBG("Initializing instance");
@@ -155,29 +176,29 @@ static int mfd_axp192_init(const struct device *dev)
 	}
 
 	/* Check if axp192 chip is available */
-	ret = i2c_reg_read_byte_dt(&config->i2c, AXP192_REG_CHIP_ID, &chip_id);
+	ret = i2c_reg_read_byte_dt(&config->i2c, config->reg_chip_id, &chip_id);
 	if (ret < 0) {
 		return ret;
 	}
-	if (chip_id != AXP192_CHIP_ID) {
+	if (chip_id != config->chip_id) {
 		LOG_ERR("Invalid Chip detected (%d)", chip_id);
 		return -EINVAL;
 	}
 
+#ifdef CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED
 	/* Disable N_VBUSEN */
-	vbus_val = 0;
-	if (config->vbusen_disable) {
-		vbus_val = AXP192_VBUS_CFG_VAL_VBUSEN_DISABLE;
-	}
-	ret = i2c_reg_update_byte_dt(&config->i2c, AXP192_VBUS_CFG_REG,
-				     AXP192_VBUS_CFG_VAL_VBUSEN_DISABLE, vbus_val);
+	ret = i2c_reg_update_byte_dt(
+		&config->i2c, config->vbus_config_reg, config->val_vbusen_disable,
+		config->vbusen_disable ? config->val_vbusen_disable : 0);
 	if (ret < 0) {
 		return ret;
 	}
+#endif
 
 	return 0;
 }
 
+#ifdef CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED
 int mfd_axp192_gpio_func_get(const struct device *dev, uint8_t gpio, enum axp192_gpio_func *func)
 {
 	const struct mfd_axp192_config *config = dev->config;
@@ -605,16 +626,29 @@ int mfd_axp192_gpio_write_port(const struct device *dev, uint8_t value, uint8_t
 
 	return 0;
 }
-
-#define MFD_AXP192_DEFINE(inst)                                                                    \
-	static const struct mfd_axp192_config config##inst = {                                     \
-		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
-		.vbusen_disable = DT_INST_PROP_OR(inst, vbusen_disable, false),                    \
+#endif
+
+#define MFD_AXP192_CONST_CONFIG(model)                                                             \
+	.reg_chip_id = AXP##model##_REG_CHIP_ID,                                                   \
+	.vbus_config_reg = AXP##model##_VBUS_CFG_REG,                                              \
+	.chip_id = AXP##model##_CHIP_ID,                                                           \
+	.val_vbusen_disable = AXP##model##_CHIP_ID,
+
+#define MFD_AXP192_AXP2101_DEFINE(node, model)                                                     \
+	static const struct mfd_axp192_config config##node = {                                     \
+		.i2c = I2C_DT_SPEC_GET(node),                                                      \
+		IF_ENABLED(CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED,                                  \
+		(.vbusen_disable = DT_PROP_OR(node, vbusen_disable, false),))                      \
+		MFD_AXP192_CONST_CONFIG(model)                                                     \
 	};                                                                                         \
                                                                                                    \
-	static struct mfd_axp192_data data##inst;                                                  \
+	IF_ENABLED(CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED,                                          \
+		   (static struct mfd_axp192_data data##node;))                                    \
                                                                                                    \
-	DEVICE_DT_INST_DEFINE(inst, mfd_axp192_init, NULL, &data##inst, &config##inst,             \
-			      POST_KERNEL, CONFIG_MFD_INIT_PRIORITY, NULL);
+	DEVICE_DT_DEFINE(node, mfd_axp192_init, NULL,                                              \
+			 COND_CODE_1(CONFIG_DT_HAS_X_POWERS_AXP192_ENABLED,                        \
+				     (&data##node), (NULL)),                                       \
+			 &config##node, POST_KERNEL, CONFIG_MFD_INIT_PRIORITY, NULL);
 
-DT_INST_FOREACH_STATUS_OKAY(MFD_AXP192_DEFINE);
+DT_FOREACH_STATUS_OKAY_VARGS(x_powers_axp192, MFD_AXP192_AXP2101_DEFINE, 192);
+DT_FOREACH_STATUS_OKAY_VARGS(x_powers_axp2101, MFD_AXP192_AXP2101_DEFINE, 2101);
diff --git a/drivers/mfd/mfd_maxq10xx.c b/drivers/mfd/mfd_maxq10xx.c
new file mode 100644
index 0000000000000..d5c5642783f3e
--- /dev/null
+++ b/drivers/mfd/mfd_maxq10xx.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025 Vogl Electronic GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT adi_maxq10xx
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/mfd/mfd_maxq10xx.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(mfd_maxq10xx, CONFIG_MFD_LOG_LEVEL);
+
+struct mfd_maxq10xx_config {
+	struct spi_dt_spec spi;
+};
+
+struct mfd_maxq10xx_data {
+	struct k_sem sem_lock;
+};
+
+struct k_sem *mfd_maxq10xx_get_lock(const struct device *dev)
+{
+	struct mfd_maxq10xx_data *data = dev->data;
+
+	return &data->sem_lock;
+}
+
+static int mfd_maxq10xx_init(const struct device *dev)
+{
+	const struct mfd_maxq10xx_config *config = dev->config;
+
+	if (!spi_is_ready_dt(&config->spi)) {
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+BUILD_ASSERT(CONFIG_SPI_INIT_PRIORITY < CONFIG_MFD_MAXQ10XX_INIT_PRIORITY,
+	     "SPI driver must be initialized before maxq10xx mfd driver");
+
+#define DEFINE_MAXQ10XX_MFD(_num)                                                                  \
+	static const struct mfd_maxq10xx_config mfd_maxq10xx_config##_num = {                      \
+		.spi = SPI_DT_SPEC_INST_GET(_num, SPI_WORD_SET(8), 0),                             \
+	};                                                                                         \
+	static struct mfd_maxq10xx_data mfd_maxq10xx_data##_num = {                                \
+		.sem_lock = Z_SEM_INITIALIZER(mfd_maxq10xx_data##_num.sem_lock, 1, 1),             \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(_num, mfd_maxq10xx_init, NULL, &mfd_maxq10xx_data##_num,             \
+			      &mfd_maxq10xx_config##_num, POST_KERNEL,                             \
+			      CONFIG_MFD_MAXQ10XX_INIT_PRIORITY, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_MAXQ10XX_MFD);
diff --git a/drivers/mfd/mfd_npm2100.c b/drivers/mfd/mfd_npm2100.c
index 78049dff56e6c..6cbe0e070ae73 100644
--- a/drivers/mfd/mfd_npm2100.c
+++ b/drivers/mfd/mfd_npm2100.c
@@ -55,9 +55,11 @@
 
 #define EVENTS_SIZE 5U
 
-#define GPIO_USAGE_INTLO   0x01U
-#define GPIO_USAGE_INTHI   0x02U
-#define GPIO_CONFIG_OUTPUT 0x02U
+#define GPIO_USAGE_INTLO      0x01U
+#define GPIO_USAGE_INTHI      0x02U
+#define GPIO_CONFIG_OUTPUT    0x02U
+#define GPIO_CONFIG_OPENDRAIN 0x04U
+#define GPIO_CONFIG_PULLUP    0x10U
 
 #define RESET_STICKY_PWRBUT 0x04U
 
@@ -171,10 +173,17 @@ static int config_pmic_int(const struct device *dev)
 {
 	const struct mfd_npm2100_config *config = dev->config;
 	uint8_t usage = GPIO_USAGE_INTHI;
+	uint8_t gpio_config = GPIO_CONFIG_OUTPUT;
 
 	if (config->pmic_int_flags & GPIO_ACTIVE_LOW) {
 		usage = GPIO_USAGE_INTLO;
 	}
+	if ((config->pmic_int_flags & GPIO_SINGLE_ENDED) != 0U) {
+		gpio_config |= GPIO_CONFIG_OPENDRAIN;
+	}
+	if (config->pmic_int_flags & GPIO_PULL_UP) {
+		gpio_config |= GPIO_CONFIG_PULLUP;
+	}
 
 	/* Set specified PMIC pin to be interrupt output */
 	int ret = i2c_reg_write_byte_dt(&config->i2c, GPIO_USAGE + config->pmic_int_pin, usage);
@@ -184,8 +193,7 @@ static int config_pmic_int(const struct device *dev)
 	}
 
 	/* Configure PMIC output pin */
-	return i2c_reg_write_byte_dt(&config->i2c, GPIO_CONFIG + config->pmic_int_pin,
-				     GPIO_CONFIG_OUTPUT);
+	return i2c_reg_write_byte_dt(&config->i2c, GPIO_CONFIG + config->pmic_int_pin, gpio_config);
 }
 
 static int config_shphold(const struct device *dev)
diff --git a/drivers/mfd/mfd_pf1550.c b/drivers/mfd/mfd_pf1550.c
new file mode 100644
index 0000000000000..492f516e25335
--- /dev/null
+++ b/drivers/mfd/mfd_pf1550.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Arduino SA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nxp_pf1550
+
+#include <errno.h>
+
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+
+#define PF1550_REG_CHIP_ID 0x00
+#define PF1550_CHIP_ID_VAL ((15 << 3) | 4)
+
+struct mfd_pf1550_config {
+	struct i2c_dt_spec bus;
+};
+
+static int mfd_pf1550_init(const struct device *dev)
+{
+	const struct mfd_pf1550_config *config = dev->config;
+	uint8_t val;
+	int ret;
+
+	if (!i2c_is_ready_dt(&config->bus)) {
+		return -ENODEV;
+	}
+
+	ret = i2c_reg_read_byte_dt(&config->bus, PF1550_REG_CHIP_ID, &val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (val != PF1550_CHIP_ID_VAL) {
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+#define MFD_PF1550_DEFINE(inst)                                                                    \
+	static const struct mfd_pf1550_config mfd_pf1550_config##inst = {                          \
+		.bus = I2C_DT_SPEC_INST_GET(inst),                                                 \
+	};                                                                                         \
+												   \
+	DEVICE_DT_INST_DEFINE(inst, mfd_pf1550_init, NULL, NULL, &mfd_pf1550_config##inst,         \
+			      POST_KERNEL, CONFIG_MFD_INIT_PRIORITY, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(MFD_PF1550_DEFINE)
diff --git a/drivers/mipi_dsi/dsi_renesas_ra.c b/drivers/mipi_dsi/dsi_renesas_ra.c
index 608bbb6867fab..8087284b8f233 100644
--- a/drivers/mipi_dsi/dsi_renesas_ra.c
+++ b/drivers/mipi_dsi/dsi_renesas_ra.c
@@ -1,46 +1,20 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #define DT_DRV_COMPAT renesas_ra_mipi_dsi
 
-#include <zephyr/device.h>
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/clock_control.h>
+#include <soc.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/drivers/clock_control/renesas_ra_cgc.h>
-#include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/mipi_dsi.h>
-#include <zephyr/drivers/reset.h>
-#include <zephyr/irq.h>
-#include <zephyr/logging/log.h>
 #include "r_mipi_dsi.h"
-#include "r_mipi_phy.h"
 
 LOG_MODULE_REGISTER(dsi_renesas_ra, CONFIG_MIPI_DSI_LOG_LEVEL);
 
-/* MIPI PHY Macros */
-#define MIPI_PHY_CLKSTPT (1183)
-#define MIPI_PHY_CLKBFHT (11)
-#define MIPI_PHY_CLKKPT  (26)
-#define MIPI_PHY_GOLPBKT (40)
-
-#define MIPI_PHY_TINIT     (71999)
-#define MIPI_PHY_TCLKPREP  (8)
-#define MIPI_PHY_THSPREP   (5)
-#define MIPI_PHY_TCLKTRAIL (7)
-#define MIPI_PHY_TCLKPOST  (19)
-#define MIPI_PHY_TCLKPRE   (1)
-#define MIPI_PHY_TCLKZERO  (27)
-#define MIPI_PHY_THSEXIT   (11)
-#define MIPI_PHY_THSTRAIL  (8)
-#define MIPI_PHY_THSZERO   (19)
-#define MIPI_PHY_TLPEXIT   (7)
-#define LP_DIVISOR         (4)
-#define PLL_MUL_SETTING    (49)
-#define VIDEO_MODE_DELAY   (186)
-#define ULPS_WAKEUP_PERIOD (97)
 struct mipi_dsi_renesas_ra_config {
 	const struct device *clock_dev;
 	struct clock_control_ra_subsys_cfg clock_dsi_subsys;
@@ -50,40 +24,20 @@ struct mipi_dsi_renesas_ra_config {
 struct mipi_dsi_renesas_ra_data {
 	mipi_dsi_instance_ctrl_t mipi_dsi_ctrl;
 	mipi_dsi_cfg_t mipi_dsi_cfg;
-	volatile bool message_sent;
-	volatile bool fatal_error;
+	struct k_sem in_transmission;
+	atomic_t status;
 };
 
-void mipi_dsi_seq0(void);
-void mipi_dsi_ferr(void);
-void mipi_dsi_callback(mipi_dsi_callback_args_t *p_args);
-
-typedef struct {
-	unsigned char size;
-	unsigned char buffer[256];
-	mipi_dsi_cmd_id_t cmd_id;
-	mipi_dsi_cmd_flag_t flags;
-} lcd_table_setting_t;
+void mipi_dsi_seq0_isr(void);
 
 void mipi_dsi_callback(mipi_dsi_callback_args_t *p_args)
 {
 	const struct device *dev = (struct device *)p_args->p_context;
 	struct mipi_dsi_renesas_ra_data *data = dev->data;
 
-	switch (p_args->event) {
-	case MIPI_DSI_EVENT_SEQUENCE_0: {
-		if (MIPI_DSI_SEQUENCE_STATUS_DESCRIPTORS_FINISHED == p_args->tx_status) {
-			data->message_sent = true;
-		}
-		break;
-	}
-	case MIPI_DSI_EVENT_FATAL: {
-		data->fatal_error = true;
-		break;
-	}
-	default: {
-		break;
-	}
+	if (p_args->event == MIPI_DSI_EVENT_SEQUENCE_0) {
+		atomic_set(&data->status, p_args->tx_status);
+		k_sem_give(&data->in_transmission);
 	}
 }
 
@@ -92,19 +46,29 @@ static int mipi_dsi_renesas_ra_attach(const struct device *dev, uint8_t channel,
 {
 	struct mipi_dsi_renesas_ra_data *data = dev->data;
 	mipi_dsi_cfg_t cfg = data->mipi_dsi_cfg;
-	int ret;
+	fsp_err_t err;
 
 	if (!(mdev->mode_flags & MIPI_DSI_MODE_VIDEO)) {
 		LOG_ERR("DSI host supports video mode only!");
 		return -ENOTSUP;
 	}
+
+	if (channel == 0 && (mdev->mode_flags & MIPI_DSI_MODE_LPM) == 0) {
+		LOG_ERR("This channel support LP mode transfer only");
+		return -ENOTSUP;
+	}
+
 	cfg.virtual_channel_id = channel;
 	cfg.num_lanes = mdev->data_lanes;
+
 	if (mdev->pixfmt == MIPI_DSI_PIXFMT_RGB888) {
 		cfg.data_type = MIPI_DSI_VIDEO_DATA_24RGB_PIXEL_STREAM;
 	} else if (mdev->pixfmt == MIPI_DSI_PIXFMT_RGB565) {
 		cfg.data_type = MIPI_DSI_VIDEO_DATA_16RGB_PIXEL_STREAM;
+	} else {
+		return -ENOTSUP;
 	}
+
 	cfg.horizontal_active_lines = mdev->timings.hactive;
 	cfg.horizontal_front_porch = mdev->timings.hfp;
 	cfg.horizontal_back_porch = mdev->timings.hbp;
@@ -115,68 +79,119 @@ static int mipi_dsi_renesas_ra_attach(const struct device *dev, uint8_t channel,
 	cfg.vertical_back_porch = mdev->timings.vbp;
 	cfg.vertical_sync_lines = mdev->timings.vsync;
 
-	ret = R_MIPI_DSI_Open(&data->mipi_dsi_ctrl, &cfg);
-	if (ret) {
-		LOG_ERR("Open DSI failed (%d)", ret);
+	err = R_MIPI_DSI_Open(&data->mipi_dsi_ctrl, &cfg);
+	if (err != FSP_SUCCESS) {
+		LOG_ERR("Open DSI failed (%d)", err);
 		return -EIO;
 	}
 
-	ret = R_MIPI_DSI_Start(&data->mipi_dsi_ctrl);
-	if (ret) {
-		LOG_ERR("Start DSI host failed! (%d)", ret);
+	err = R_MIPI_DSI_Start(&data->mipi_dsi_ctrl);
+	if (err != FSP_SUCCESS) {
+		LOG_ERR("Start DSI host failed! (%d)", err);
 		return -EIO;
 	}
 
 	return 0;
 }
 
-static ssize_t mipi_dsi_renesas_ra_transfer(const struct device *dev, uint8_t channel,
-					    struct mipi_dsi_msg *msg)
+#define MIPI_DSI_SEQUENCE_STATUS_ERROR                                                             \
+	(MIPI_DSI_SEQUENCE_STATUS_DESCRIPTOR_ABORT | MIPI_DSI_SEQUENCE_STATUS_SIZE_ERROR |         \
+	 MIPI_DSI_SEQUENCE_STATUS_TX_INTERNAL_BUS_ERROR |                                          \
+	 MIPI_DSI_SEQUENCE_STATUS_RX_FATAL_ERROR | MIPI_DSI_SEQUENCE_STATUS_RX_FAIL |              \
+	 MIPI_DSI_SEQUENCE_STATUS_RX_PACKET_DATA_FAIL |                                            \
+	 MIPI_DSI_SEQUENCE_STATUS_RX_CORRECTABLE_ERROR |                                           \
+	 MIPI_DSI_SEQUENCE_STATUS_RX_ACK_AND_ERROR)
+
+static ssize_t mipi_dsi_renesas_ra_dcs_write(const struct device *dev, uint8_t channel,
+					     struct mipi_dsi_msg *msg)
 {
 	struct mipi_dsi_renesas_ra_data *data = dev->data;
-	ssize_t len;
-	int ret;
-	uint8_t combined_tx_buffer[msg->tx_len + 1];
+	uint8_t payload[msg->tx_len + 1];
+	mipi_dsi_cmd_t fsp_msg = {.channel = channel,
+				  .cmd_id = msg->type,
+				  .p_tx_buffer = payload,
+				  .tx_len = msg->tx_len + 1,
+				  .flags = (msg->flags & MIPI_DSI_MSG_USE_LPM) != 0
+						   ? MIPI_DSI_CMD_FLAG_LOW_POWER
+						   : 0};
 
-	combined_tx_buffer[0] = msg->cmd;
-	memcpy(&combined_tx_buffer[1], msg->tx_buf, msg->tx_len);
+	payload[0] = msg->cmd;
+	memcpy(&payload[1], msg->tx_buf, msg->tx_len);
 
-	mipi_dsi_cmd_t fsp_msg = {
-		.channel = channel,
-		.cmd_id = msg->type,
-		.flags = MIPI_DSI_CMD_FLAG_LOW_POWER,
-		.tx_len = msg->tx_len + 1,
-		.p_tx_buffer = combined_tx_buffer,
-	};
-	data->message_sent = false;
-	data->fatal_error = false;
+	atomic_clear(&data->status);
+	k_sem_reset(&data->in_transmission);
 
-	switch (msg->type) {
-	case MIPI_DSI_DCS_READ:
-		LOG_ERR("DCS Read not yet implemented or used");
+	if (R_MIPI_DSI_Command(&data->mipi_dsi_ctrl, &fsp_msg) != FSP_SUCCESS) {
+		LOG_ERR("DSI write fail");
+		return -EIO;
+	}
+
+	k_sem_take(&data->in_transmission, K_FOREVER);
+
+	if ((data->status & MIPI_DSI_SEQUENCE_STATUS_ERROR) != MIPI_DSI_SEQUENCE_STATUS_NONE) {
+		return -EIO;
+	}
+
+	return (ssize_t)msg->tx_len;
+}
+
+static ssize_t mipi_dsi_renesas_ra_generic_write(const struct device *dev, uint8_t channel,
+						 struct mipi_dsi_msg *msg)
+{
+	struct mipi_dsi_renesas_ra_data *data = dev->data;
+	mipi_dsi_cmd_t fsp_msg = {.channel = channel,
+				  .cmd_id = msg->type,
+				  .p_tx_buffer = msg->tx_buf,
+				  .tx_len = msg->tx_len,
+				  .flags = (msg->flags & MIPI_DSI_MSG_USE_LPM) != 0
+						   ? MIPI_DSI_CMD_FLAG_LOW_POWER
+						   : 0};
+
+	atomic_clear(&data->status);
+	k_sem_reset(&data->in_transmission);
+
+	if (R_MIPI_DSI_Command(&data->mipi_dsi_ctrl, &fsp_msg) != FSP_SUCCESS) {
+		LOG_ERR("DSI write fail");
+		return -EIO;
+	}
+
+	k_sem_take(&data->in_transmission, K_FOREVER);
+
+	if ((data->status & MIPI_DSI_SEQUENCE_STATUS_ERROR) != MIPI_DSI_SEQUENCE_STATUS_NONE) {
+		return -EIO;
+	}
+
+	return (ssize_t)msg->tx_len;
+}
+
+static ssize_t mipi_dsi_renesas_ra_transfer(const struct device *dev, uint8_t channel,
+					    struct mipi_dsi_msg *msg)
+{
+	if (channel == 0 && (msg->flags & MIPI_DSI_MSG_USE_LPM) == 0) {
+		LOG_ERR("This channel support LP mode transfer only");
 		return -ENOTSUP;
+	}
+
+	switch (msg->type) {
 	case MIPI_DSI_DCS_SHORT_WRITE:
+		__fallthrough;
 	case MIPI_DSI_DCS_SHORT_WRITE_PARAM:
+		__fallthrough;
 	case MIPI_DSI_DCS_LONG_WRITE:
-		ret = R_MIPI_DSI_Command(&data->mipi_dsi_ctrl, &fsp_msg);
-		if (ret) {
-			LOG_ERR("DSI write fail: err: (%d)", ret);
-			return -EIO;
-		}
-		while (!(data->message_sent)) {
-			if (data->fatal_error) {
-				LOG_ERR("fatal error");
-				return -EIO;
-			}
-		}
-		len = msg->tx_len;
-		break;
+		return mipi_dsi_renesas_ra_dcs_write(dev, channel, msg);
+	case MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM:
+		__fallthrough;
+	case MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM:
+		__fallthrough;
+	case MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM:
+		__fallthrough;
+	case MIPI_DSI_GENERIC_LONG_WRITE:
+		return mipi_dsi_renesas_ra_generic_write(dev, channel, msg);
 	default:
-		LOG_ERR("Unsupported message type (%d)", msg->type);
 		return -ENOTSUP;
 	}
 
-	return len;
+	return 0;
 }
 
 static DEVICE_API(mipi_dsi, mipi_dsi_api) = {
@@ -197,60 +212,90 @@ static int mipi_dsi_renesas_ra_init(const struct device *dev)
 
 	ret = clock_control_on(config->clock_dev,
 			       (clock_control_subsys_t)&config->clock_dsi_subsys);
-	if (ret) {
+	if (ret != 0) {
 		LOG_ERR("Enable DSI peripheral clock failed! (%d)", ret);
 		return ret;
 	}
 
+	k_sem_init(&data->in_transmission, 0, 1);
+
 	config->irq_configure();
-	data->mipi_dsi_cfg.p_context = dev;
 
 	return 0;
 }
 
-#define IRQ_CONFIGURE_FUNC(id)                                                                     \
+#define RENESAS_RA_MIPI_PHYS_SETTING_DEFINE(n)                                                     \
+	static const mipi_phy_timing_t mipi_phy_##n##_timing = {                                   \
+		.t_init = CLAMP(DT_PROP(DT_INST_CHILD(n, phys_timing), t_init), 0, 0x7FFF),        \
+		.t_clk_prep = CLAMP(DT_PROP(DT_INST_CHILD(n, phys_timing), t_clk_prep), 0, 0xFF),  \
+		.t_hs_prep = CLAMP(DT_PROP(DT_INST_CHILD(n, phys_timing), t_hs_prep), 0, 0xFF),    \
+		.t_lp_exit = CLAMP(DT_PROP(DT_INST_CHILD(n, phys_timing), t_lp_exit), 0, 0xFF),    \
+		.dphytim4_b =                                                                      \
+			{                                                                          \
+				.t_clk_zero = DT_PROP_BY_IDX(DT_INST_CHILD(n, phys_timing),        \
+							     dphytim4, 0),                         \
+				.t_clk_pre = DT_PROP_BY_IDX(DT_INST_CHILD(n, phys_timing),         \
+							    dphytim4, 1),                          \
+				.t_clk_post = DT_PROP_BY_IDX(DT_INST_CHILD(n, phys_timing),        \
+							     dphytim4, 2),                         \
+				.t_clk_trail = DT_PROP_BY_IDX(DT_INST_CHILD(n, phys_timing),       \
+							      dphytim4, 3),                        \
+			},                                                                         \
+		.dphytim5_b =                                                                      \
+			{                                                                          \
+				.t_hs_zero = DT_PROP_BY_IDX(DT_INST_CHILD(n, phys_timing),         \
+							    dphytim5, 0),                          \
+				.t_hs_trail = DT_PROP_BY_IDX(DT_INST_CHILD(n, phys_timing),        \
+							     dphytim5, 1),                         \
+				.t_hs_exit = DT_PROP_BY_IDX(DT_INST_CHILD(n, phys_timing),         \
+							    dphytim5, 2),                          \
+			},                                                                         \
+	};                                                                                         \
+                                                                                                   \
+	static const mipi_phy_cfg_t mipi_phy_##n##_cfg = {                                         \
+		.pll_settings =                                                                    \
+			{                                                                          \
+				.div = DT_INST_PROP(n, pll_div) - 1,                               \
+				.mul_frac = DT_INST_ENUM_IDX(n, pll_mul_frac),                     \
+				.mul_int = CLAMP(DT_INST_PROP(n, pll_mul_int), 20, 180) - 1,       \
+			},                                                                         \
+		.lp_divisor = CLAMP(DT_INST_PROP(n, lp_divisor), 1, 32) - 1,                       \
+		.p_timing = &mipi_phy_##n##_timing,                                                \
+	};                                                                                         \
+                                                                                                   \
+	mipi_phy_ctrl_t mipi_phy_##n##_ctrl;                                                       \
+                                                                                                   \
+	static const mipi_phy_instance_t mipi_phy##n = {                                           \
+		.p_ctrl = &mipi_phy_##n##_ctrl,                                                    \
+		.p_cfg = &mipi_phy_##n##_cfg,                                                      \
+		.p_api = &g_mipi_phy,                                                              \
+	};
+
+#define RENESAS_RA_MIPI_DSI_PHYS_GET(n) &mipi_phy##n
+
+#define RENESAS_RA_MIPI_DSI_TIMING_DEFINE(n)                                                       \
+	static const mipi_dsi_timing_t mipi_dsi_##n##_timing = {                                   \
+		.clock_stop_time = DT_INST_PROP_BY_IDX(n, timing, 0),                              \
+		.clock_beforehand_time = DT_INST_PROP_BY_IDX(n, timing, 1),                        \
+		.clock_keep_time = DT_INST_PROP_BY_IDX(n, timing, 2),                              \
+		.go_lp_and_back = DT_INST_PROP_BY_IDX(n, timing, 3),                               \
+	};
+
+#define RENESAS_RA_MIPI_DSI_TIMING_GET(n) &mipi_dsi_##n##_timing
+
+#define RENESAS_MIPI_DSI_DEVICE(id)                                                                \
 	static void mipi_dsi_ra_configure_func_##id(void)                                          \
 	{                                                                                          \
-		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(id, sq0, irq)] = ELC_EVENT_MIPIDSI_SEQ0;          \
+		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(id, sq0, irq)] =                                  \
+			BSP_PRV_IELS_ENUM(EVENT_MIPIDSI_SEQ0);                                     \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(id, sq0, irq),                                     \
-			    DT_INST_IRQ_BY_NAME(id, sq0, priority), mipi_dsi_seq0,                 \
-			    DEVICE_DT_INST_GET(id), 0);                                            \
+			    DT_INST_IRQ_BY_NAME(id, sq0, priority), mipi_dsi_seq0_isr, NULL, 0);   \
 		irq_enable(DT_INST_IRQ_BY_NAME(id, sq0, irq));                                     \
-		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(id, ferr, irq)] = ELC_EVENT_MIPIDSI_FERR;         \
-		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(id, ferr, irq),                                    \
-			    DT_INST_IRQ_BY_NAME(id, ferr, priority), mipi_dsi_ferr,                \
-			    DEVICE_DT_INST_GET(id), 0);                                            \
-		irq_enable(DT_INST_IRQ_BY_NAME(id, ferr, irq));                                    \
-	}
-
-#define IRQ_CONFIGURE_DEFINE(id) .irq_configure = mipi_dsi_ra_configure_func_##id
-
-#define RENESAS_MIPI_DSI_DEVICE(id)                                                                \
-	IRQ_CONFIGURE_FUNC(id)                                                                     \
-	mipi_phy_ctrl_t mipi_phy_##id##_ctrl;                                                      \
-	static const mipi_phy_timing_t mipi_phy_##id##_timing = {                                  \
-		.t_init = 0x3FFFF & (uint32_t)MIPI_PHY_TINIT,                                      \
-		.t_clk_prep = (uint8_t)MIPI_PHY_TCLKPREP,                                          \
-		.t_hs_prep = (uint8_t)MIPI_PHY_THSPREP,                                            \
-		.dphytim4_b.t_clk_trail = (uint32_t)MIPI_PHY_TCLKTRAIL,                            \
-		.dphytim4_b.t_clk_post = (uint32_t)MIPI_PHY_TCLKPOST,                              \
-		.dphytim4_b.t_clk_pre = (uint32_t)MIPI_PHY_TCLKPRE,                                \
-		.dphytim4_b.t_clk_zero = (uint32_t)MIPI_PHY_TCLKZERO,                              \
-		.dphytim5_b.t_hs_exit = (uint32_t)MIPI_PHY_THSEXIT,                                \
-		.dphytim5_b.t_hs_trail = (uint32_t)MIPI_PHY_THSTRAIL,                              \
-		.dphytim5_b.t_hs_zero = (uint32_t)MIPI_PHY_THSZERO,                                \
-		.t_lp_exit = (uint32_t)MIPI_PHY_TLPEXIT,                                           \
-	};                                                                                         \
-	static const mipi_phy_cfg_t mipi_phy_##id##_cfg = {                                        \
-		.pll_settings = {.div = 0, .mul_int = PLL_MUL_SETTING, .mul_frac = 0},             \
-		.lp_divisor = LP_DIVISOR,                                                          \
-		.p_timing = &mipi_phy_##id##_timing,                                               \
-	};                                                                                         \
-	static const mipi_phy_instance_t mipi_phy##id = {                                          \
-		.p_ctrl = &mipi_phy_##id##_ctrl,                                                   \
-		.p_cfg = &mipi_phy_##id##_cfg,                                                     \
-		.p_api = &g_mipi_phy,                                                              \
-	};                                                                                         \
+	}                                                                                          \
+                                                                                                   \
+	RENESAS_RA_MIPI_DSI_TIMING_DEFINE(id)                                                      \
+	RENESAS_RA_MIPI_PHYS_SETTING_DEFINE(id)                                                    \
+                                                                                                   \
 	static const mipi_dsi_extended_cfg_t mipi_dsi_##id##_extended_cfg = {                      \
 		.dsi_seq0.ipl = DT_INST_IRQ_BY_NAME(id, sq0, priority),                            \
 		.dsi_seq0.irq = DT_INST_IRQ_BY_NAME(id, sq0, irq),                                 \
@@ -273,58 +318,54 @@ static int mipi_dsi_renesas_ra_init(const struct device *dev)
 			    R_DSILINK_RXIER_CRCERR_Msk | R_DSILINK_RXIER_IBERR_Msk |               \
 			    R_DSILINK_RXIER_RXOVFERR_Msk | R_DSILINK_RXIER_PRTOERR_Msk |           \
 			    R_DSILINK_RXIER_NORESERR_Msk | R_DSILINK_RXIER_RSIZEERR_Msk |          \
-			    R_DSILINK_RXIER_ECCERRS_Msk | R_DSILINK_RXIER_RXAKE_Msk | 0x0,         \
+			    R_DSILINK_RXIER_ECCERRS_Msk | R_DSILINK_RXIER_RXAKE_Msk,               \
 		.dsi_ferrie = R_DSILINK_FERRIER_HTXTO_Msk | R_DSILINK_FERRIER_LRXHTO_Msk |         \
 			      R_DSILINK_FERRIER_TATO_Msk | R_DSILINK_FERRIER_ESCENT_Msk |          \
 			      R_DSILINK_FERRIER_SYNCESC_Msk | R_DSILINK_FERRIER_CTRL_Msk |         \
-			      R_DSILINK_FERRIER_CLP0_Msk | R_DSILINK_FERRIER_CLP1_Msk | 0x0,       \
-		.dsi_plie = R_DSILINK_PLIER_DLULPENT_Msk | R_DSILINK_PLIER_DLULPEXT_Msk | 0x0,     \
-		.dsi_vmie = R_DSILINK_VMIER_VBUFUDF_Msk | R_DSILINK_VMIER_VBUFOVF_Msk | 0x0,       \
+			      R_DSILINK_FERRIER_CLP0_Msk | R_DSILINK_FERRIER_CLP1_Msk,             \
+		.dsi_plie = R_DSILINK_PLIER_DLULPENT_Msk | R_DSILINK_PLIER_DLULPEXT_Msk,           \
+		.dsi_vmie = R_DSILINK_VMIER_VBUFUDF_Msk | R_DSILINK_VMIER_VBUFOVF_Msk,             \
 		.dsi_sqch0ie = R_DSILINK_SQCH0IER_AACTFIN_Msk | R_DSILINK_SQCH0IER_ADESFIN_Msk |   \
 			       R_DSILINK_SQCH0IER_TXIBERR_Msk | R_DSILINK_SQCH0IER_RXFERR_Msk |    \
 			       R_DSILINK_SQCH0IER_RXFAIL_Msk | R_DSILINK_SQCH0IER_RXPFAIL_Msk |    \
-			       R_DSILINK_SQCH0IER_RXCORERR_Msk | R_DSILINK_SQCH0IER_RXAKE_Msk |    \
-			       0x0,                                                                \
+			       R_DSILINK_SQCH0IER_RXCORERR_Msk | R_DSILINK_SQCH0IER_RXAKE_Msk,     \
 		.dsi_sqch1ie = R_DSILINK_SQCH1IER_AACTFIN_Msk | R_DSILINK_SQCH1IER_ADESFIN_Msk |   \
 			       R_DSILINK_SQCH1IER_SIZEERR_Msk | R_DSILINK_SQCH1IER_TXIBERR_Msk |   \
 			       R_DSILINK_SQCH1IER_RXFERR_Msk | R_DSILINK_SQCH1IER_RXFAIL_Msk |     \
 			       R_DSILINK_SQCH1IER_RXPFAIL_Msk | R_DSILINK_SQCH1IER_RXCORERR_Msk |  \
-			       R_DSILINK_SQCH1IER_RXAKE_Msk | 0x0,                                 \
-	};                                                                                         \
-	static const mipi_dsi_timing_t mipi_dsi_##id##_timing = {                                  \
-		.clock_stop_time = MIPI_PHY_CLKSTPT,                                               \
-		.clock_beforehand_time = MIPI_PHY_CLKBFHT,                                         \
-		.clock_keep_time = MIPI_PHY_CLKKPT,                                                \
-		.go_lp_and_back = MIPI_PHY_GOLPBKT,                                                \
+			       R_DSILINK_SQCH1IER_RXAKE_Msk,                                       \
 	};                                                                                         \
+                                                                                                   \
 	static const struct mipi_dsi_renesas_ra_config ra_config_##id = {                          \
 		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(id)),                               \
-		IRQ_CONFIGURE_DEFINE(id),                                                          \
-		.clock_dsi_subsys = {.mstp = (uint32_t)DT_INST_CLOCKS_CELL_BY_IDX(id, 0, mstp),    \
-				     .stop_bit = DT_INST_CLOCKS_CELL_BY_IDX(id, 0, stop_bit)}};    \
+		.clock_dsi_subsys =                                                                \
+			{                                                                          \
+				.mstp = DT_INST_CLOCKS_CELL(id, mstp),                             \
+				.stop_bit = DT_INST_CLOCKS_CELL(id, stop_bit),                     \
+			},                                                                         \
+		.irq_configure = mipi_dsi_ra_configure_func_##id,                                  \
+	};                                                                                         \
+                                                                                                   \
 	static struct mipi_dsi_renesas_ra_data ra_data_##id = {                                    \
 		.mipi_dsi_cfg =                                                                    \
 			{                                                                          \
-				.p_mipi_phy_instance = &mipi_phy##id,                              \
-				.p_timing = &mipi_dsi_##id##_timing,                               \
+				.p_mipi_phy_instance = RENESAS_RA_MIPI_DSI_PHYS_GET(id),           \
+				.p_timing = RENESAS_RA_MIPI_DSI_TIMING_GET(id),                    \
 				.sync_pulse = (0),                                                 \
-				.data_type = MIPI_DSI_PACKED_PIXEL_STREAM_24,                      \
 				.vertical_sync_polarity = 1,                                       \
 				.horizontal_sync_polarity = 1,                                     \
-				.video_mode_delay = VIDEO_MODE_DELAY,                              \
-				.hsa_no_lp = ((0x0) & R_DSILINK_VMSET0R_HSANOLP_Msk),              \
-				.hbp_no_lp = ((0x0) & R_DSILINK_VMSET0R_HBPNOLP_Msk),              \
-				.hfp_no_lp = ((0x0) & R_DSILINK_VMSET0R_HFPNOLP_Msk),              \
-				.num_lanes =                                                       \
-					DT_PROP_BY_IDX(DT_NODELABEL(ili9806e), data_lanes, 0),     \
-				.ulps_wakeup_period = ULPS_WAKEUP_PERIOD,                          \
+				.video_mode_delay = DT_INST_PROP(id, video_mode_delay),            \
+				.hsa_no_lp = R_DSILINK_VMSET0R_HSANOLP_Msk,                        \
+				.hbp_no_lp = R_DSILINK_VMSET0R_HBPNOLP_Msk,                        \
+				.hfp_no_lp = R_DSILINK_VMSET0R_HFPNOLP_Msk,                        \
+				.ulps_wakeup_period = DT_INST_PROP(id, ulps_wakeup_period),        \
 				.continuous_clock = (1),                                           \
 				.hs_tx_timeout = 0,                                                \
 				.lp_rx_timeout = 0,                                                \
 				.turnaround_timeout = 0,                                           \
 				.bta_timeout = 0,                                                  \
-				.lprw_timeout = (0 << R_DSILINK_PRESPTOLPSETR_LPRTO_Pos) | 0,      \
-				.hsrw_timeout = (0 << R_DSILINK_PRESPTOHSSETR_HSRTO_Pos) | 0,      \
+				.lprw_timeout = 0,                                                 \
+				.hsrw_timeout = 0,                                                 \
 				.max_return_packet_size = 1,                                       \
 				.ecc_enable = (1),                                                 \
 				.crc_check_mask = (mipi_dsi_vc_t)(0x0),                            \
@@ -333,9 +374,10 @@ static int mipi_dsi_renesas_ra_init(const struct device *dev)
 				.eotp_enable = (1),                                                \
 				.p_extend = &mipi_dsi_##id##_extended_cfg,                         \
 				.p_callback = mipi_dsi_callback,                                   \
-				.p_context = NULL,                                                 \
+				.p_context = DEVICE_DT_INST_GET(id),                               \
 			},                                                                         \
 	};                                                                                         \
+                                                                                                   \
 	DEVICE_DT_INST_DEFINE(id, &mipi_dsi_renesas_ra_init, NULL, &ra_data_##id, &ra_config_##id, \
 			      POST_KERNEL, CONFIG_MIPI_DSI_INIT_PRIORITY, &mipi_dsi_api);
 
diff --git a/drivers/misc/coresight/nrf_etr.c b/drivers/misc/coresight/nrf_etr.c
index 11d2240d86160..bf1aecd6f5b47 100644
--- a/drivers/misc/coresight/nrf_etr.c
+++ b/drivers/misc/coresight/nrf_etr.c
@@ -203,13 +203,13 @@ static void trace_point_process(struct log_frontend_stmesp_demux_trace_point *pa
 	static const char *tp_d32 = "%d %08x";
 	const char *dname = stm_m_name[packet->major];
 	static const char *sname = "tp";
-	const char **lptr;
+	const char *lptr;
 
 	if (packet->id >= CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG_BASE) {
-		TYPE_SECTION_GET(const char *, log_stmesp_ptr,
-				 packet->id - CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG_BASE, &lptr);
-		uint8_t level = (uint8_t)((*lptr)[0]) - (uint8_t)'0';
-		const char *ptr = *lptr + 1;
+		lptr = log_frontend_stmesp_demux_str_get(packet->major,
+				packet->id - CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG_BASE);
+		uint8_t level = (uint8_t)(lptr[0]) - (uint8_t)'0';
+		const char *ptr = lptr + 1;
 		static const union cbprintf_package_hdr desc0 = {
 			.desc = {.len = 2 /* hdr + fmt */}};
 		static const union cbprintf_package_hdr desc1 = {
diff --git a/drivers/misc/devmux/devmux.c b/drivers/misc/devmux/devmux.c
index b01ebdae45f78..f4e64fdb385b2 100644
--- a/drivers/misc/devmux/devmux.c
+++ b/drivers/misc/devmux/devmux.c
@@ -129,7 +129,7 @@ int z_vrfy_devmux_select_set(struct device *dev, size_t index)
 #include <zephyr/syscalls/devmux_select_set_mrsh.c>
 #endif
 
-static int devmux_init(struct device *const dev)
+static int devmux_init(const struct device *dev)
 {
 	size_t inst = devmux_inst_get(dev);
 	struct devmux_data *const data = dev->data;
@@ -143,7 +143,7 @@ static int devmux_init(struct device *const dev)
 		return -ENODEV;
 	}
 
-	*dev = *config->devs[sel];
+	*(struct device *)dev = *config->devs[sel];
 
 	return 0;
 }
diff --git a/drivers/misc/ft8xx/ft8xx_copro.c b/drivers/misc/ft8xx/ft8xx_copro.c
index 7b4c599cb077e..9e8e969228fb2 100644
--- a/drivers/misc/ft8xx/ft8xx_copro.c
+++ b/drivers/misc/ft8xx/ft8xx_copro.c
@@ -86,11 +86,11 @@ void ft8xx_copro_cmd_text(const struct device *dev,
 			   int16_t y,
 			   int16_t font,
 			   uint16_t options,
-			   const char *s)
+			   const char *string)
 {
 	struct ft8xx_data *data = dev->data;
 
-	const uint16_t str_bytes = strlen(s) + 1;
+	const uint16_t str_bytes = strlen(string) + 1;
 	const uint16_t padding_bytes = (4 - (str_bytes % 4)) % 4;
 	const uint16_t cmd_size = sizeof(CMD_TEXT) +
 				   sizeof(x) +
@@ -119,7 +119,8 @@ void ft8xx_copro_cmd_text(const struct device *dev,
 	ft8xx_wr16(dev, FT800_RAM_CMD + data->reg_cmd_write, options);
 	increase_reg_cmd_write(dev, sizeof(options));
 
-	(void)ft8xx_drv_write(dev, FT800_RAM_CMD + data->reg_cmd_write, (uint8_t *)s, str_bytes);
+	(void)ft8xx_drv_write(dev, FT800_RAM_CMD + data->reg_cmd_write, (uint8_t *)string,
+			      str_bytes);
 	increase_reg_cmd_write(dev, str_bytes + padding_bytes);
 
 	flush_reg_cmd_write(dev);
@@ -130,7 +131,7 @@ void ft8xx_copro_cmd_number(const struct device *dev,
 			     int16_t y,
 			     int16_t font,
 			     uint16_t options,
-			     int32_t n)
+			     int32_t number)
 {
 	struct ft8xx_data *data = dev->data;
 
@@ -139,7 +140,7 @@ void ft8xx_copro_cmd_number(const struct device *dev,
 				   sizeof(y) +
 				   sizeof(font) +
 				   sizeof(options) +
-				   sizeof(n);
+				   sizeof(number);
 
 	while (ram_cmd_freespace(dev) < cmd_size) {
 		refresh_reg_cmd_read(dev);
@@ -160,8 +161,8 @@ void ft8xx_copro_cmd_number(const struct device *dev,
 	ft8xx_wr16(dev, FT800_RAM_CMD + data->reg_cmd_write, options);
 	increase_reg_cmd_write(dev, sizeof(options));
 
-	ft8xx_wr32(dev, FT800_RAM_CMD + data->reg_cmd_write, n);
-	increase_reg_cmd_write(dev, sizeof(n));
+	ft8xx_wr32(dev, FT800_RAM_CMD + data->reg_cmd_write, number);
+	increase_reg_cmd_write(dev, sizeof(number));
 
 	flush_reg_cmd_write(dev);
 }
diff --git a/drivers/misc/nordic_vpr_launcher/Kconfig b/drivers/misc/nordic_vpr_launcher/Kconfig
index 6aeabcd251c13..d00bcc583f96d 100644
--- a/drivers/misc/nordic_vpr_launcher/Kconfig
+++ b/drivers/misc/nordic_vpr_launcher/Kconfig
@@ -4,7 +4,8 @@
 config NORDIC_VPR_LAUNCHER
 	bool "Nordic VPR coprocessor launcher"
 	default y
-	depends on DT_HAS_NORDIC_NRF_VPR_COPROCESSOR_ENABLED
+	depends on DT_HAS_NORDIC_NRF_VPR_COPROCESSOR_ENABLED && \
+		   $(dt_compat_any_has_prop,$(DT_COMPAT_NORDIC_NRF_VPR_COPROCESSOR),execution-memory)
 	help
 	  When enabled, the VPR coprocessors will be automatically launched
 	  during system initialization.
diff --git a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
index 5bd43f87fb914..b28ebec6b5c9e 100644
--- a/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
+++ b/drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c
@@ -34,6 +34,11 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 {
 	const struct nordic_vpr_launcher_config *config = dev->config;
 
+	/* Do nothing if execution memory is not specified for a given VPR. */
+	if (config->exec_addr == 0) {
+		return 0;
+	}
+
 #if DT_ANY_INST_HAS_PROP_STATUS_OKAY(source_memory)
 	if (config->size > 0U) {
 		LOG_DBG("Loading VPR (%p) from %p to %p (%zu bytes)", config->vpr,
@@ -63,16 +68,20 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 	(DT_REG_ADDR(node_id) +                                                                    \
 	 COND_CODE_0(DT_FIXED_PARTITION_EXISTS(node_id), (0), (DT_REG_ADDR(DT_GPARENT(node_id)))))
 
+#define NEEDS_COPYING(inst) UTIL_AND(DT_INST_NODE_HAS_PROP(inst, execution_memory),                \
+				     DT_INST_NODE_HAS_PROP(inst, source_memory))
+
 #define NORDIC_VPR_LAUNCHER_DEFINE(inst)                                                           \
-	IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, source_memory),                                     \
+	IF_ENABLED(NEEDS_COPYING(inst),                                                            \
 		   (BUILD_ASSERT((DT_REG_SIZE(DT_INST_PHANDLE(inst, execution_memory)) <=          \
 				  DT_REG_SIZE(DT_INST_PHANDLE(inst, source_memory))),              \
 				 "Execution memory exceeds source memory size");))                 \
                                                                                                    \
 	static const struct nordic_vpr_launcher_config config##inst = {                            \
 		.vpr = (NRF_VPR_Type *)DT_INST_REG_ADDR(inst),                                     \
-		.exec_addr = VPR_ADDR(DT_INST_PHANDLE(inst, execution_memory)),                    \
-		IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, source_memory),                             \
+		IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, execution_memory),                          \
+			   (.exec_addr = VPR_ADDR(DT_INST_PHANDLE(inst, execution_memory)),))      \
+		IF_ENABLED(NEEDS_COPYING(inst),                                                    \
 			   (.src_addr = VPR_ADDR(DT_INST_PHANDLE(inst, source_memory)),            \
 			    .size = DT_REG_SIZE(DT_INST_PHANDLE(inst, execution_memory)),))};      \
                                                                                                    \
diff --git a/drivers/misc/pio_rpi_pico/Kconfig b/drivers/misc/pio_rpi_pico/Kconfig
index 718acc6bd1c1d..5e78a53bb3986 100644
--- a/drivers/misc/pio_rpi_pico/Kconfig
+++ b/drivers/misc/pio_rpi_pico/Kconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config PIO_RPI_PICO
-	bool "RaspberryPi Pico PIO"
+	bool "Raspberry Pi Pico PIO"
 	default y
 	depends on DT_HAS_RASPBERRYPI_PICO_PIO_ENABLED
 	depends on RESET
diff --git a/drivers/misc/renesas_ra_external_interrupt/renesas_ra_external_interrupt.c b/drivers/misc/renesas_ra_external_interrupt/renesas_ra_external_interrupt.c
index a8da3c622e35d..f669446a3f03f 100644
--- a/drivers/misc/renesas_ra_external_interrupt/renesas_ra_external_interrupt.c
+++ b/drivers/misc/renesas_ra_external_interrupt/renesas_ra_external_interrupt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -152,7 +152,7 @@ static int gpio_ra_interrupt_init(const struct device *dev)
 	static int gpio_ra_irq_init##index(const struct device *dev)                               \
 	{                                                                                          \
 		R_ICU->IELSR[DT_INST_IRQ(index, irq)] =                                            \
-			UTIL_CAT(ELC_EVENT_ICU_IRQ, DT_INST_PROP(index, channel));                 \
+			BSP_PRV_IELS_ENUM(UTIL_CAT(EVENT_ICU_IRQ, DT_INST_PROP(index, channel)));  \
 		IRQ_CONNECT(DT_INST_IRQ(index, irq), DT_INST_IRQ(index, priority), gpio_ra_isr,    \
 			    DEVICE_DT_INST_GET(index), 0);                                         \
 		return gpio_ra_interrupt_init(dev);                                                \
diff --git a/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c b/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
index ac0d56072d2e8..e2c369cb90436 100644
--- a/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
+++ b/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
@@ -850,7 +850,7 @@ static void adsp_mm_save_context(void *storage_buffer)
 
 #ifdef CONFIG_MMU
 			arch_mem_map(UINT_TO_POINTER(phys_addr), phys_addr, CONFIG_MM_DRV_PAGE_SIZE,
-				     K_MEM_CACHE_WB);
+				     K_MEM_CACHE_WB | K_MEM_PERM_RW);
 #endif
 
 			/* Invalidate cache to avoid stalled data
diff --git a/drivers/mm/mm_drv_ti_rat.c b/drivers/mm/mm_drv_ti_rat.c
index b82bbc162acc6..44a9cd30627b2 100644
--- a/drivers/mm/mm_drv_ti_rat.c
+++ b/drivers/mm/mm_drv_ti_rat.c
@@ -24,7 +24,21 @@
 #include <zephyr/drivers/mm/system_mm.h>
 #include <zephyr/sys/__assert.h>
 
-static struct address_trans_params translate_config;
+#define ADDR_TRANSLATE_MAX_REGIONS (16u)
+#define RAT_CTRL(base_addr, i)     (base_addr + 0x20 + 0x10 * (i))
+#define RAT_BASE(base_addr, i)     (base_addr + 0x24 + 0x10 * (i))
+#define RAT_TRANS_L(base_addr, i)  (base_addr + 0x28 + 0x10 * (i))
+#define RAT_TRANS_H(base_addr, i)  (base_addr + 0x2C + 0x10 * (i))
+#define RAT_CTRL_W(enable, size)   (((enable & 0x1) << 31u) | (size & 0x3F))
+
+/**
+ * @brief Parameters for address_trans_init
+ */
+static struct address_trans_params {
+	uint32_t num_regions;
+	uint32_t rat_base_addr;
+	struct address_trans_region_config *region_config;
+} translate_config;
 
 /**
  * @brief Set registers for the address regions being used
@@ -34,13 +48,13 @@ static struct address_trans_params translate_config;
  * @param enable Region status
  */
 
-static void address_trans_set_region(struct address_trans_params *addr_translate_config,
+static void address_trans_set_region(struct address_trans_region_config *region_config,
 			uint16_t region_num, uint32_t enable)
 {
-	uint32_t rat_base_addr = addr_translate_config->rat_base_addr;
-	uint64_t system_addr = addr_translate_config->region_config[region_num].system_addr;
-	uint32_t local_addr = addr_translate_config->region_config[region_num].local_addr;
-	uint32_t size = addr_translate_config->region_config[region_num].size;
+	uint32_t rat_base_addr = translate_config.rat_base_addr;
+	uint64_t system_addr = region_config->system_addr;
+	uint32_t local_addr = region_config->local_addr;
+	uint32_t size = region_config->size;
 	uint32_t system_addrL, system_addrH;
 
 	if (size > address_trans_region_size_4G) {
@@ -57,27 +71,6 @@ static void address_trans_set_region(struct address_trans_params *addr_translate
 	sys_write32(RAT_CTRL_W(enable, size), RAT_CTRL(rat_base_addr, region_num));
 }
 
-static void address_trans_init(struct address_trans_params *params)
-{
-	uint32_t i;
-
-	if (params != NULL) {
-		translate_config = *params;
-	}
-
-	__ASSERT(translate_config.num_regions < ADDR_TRANSLATE_MAX_REGIONS,
-		 "Exceeding maximum number of regions");
-
-	for (i = 0; i < translate_config.num_regions; i++) {
-		__ASSERT(translate_config.rat_base_addr != 0, "RAT base address cannot be 0");
-		__ASSERT(translate_config.region_config != NULL,
-			 "RAT region config cannot be NULL");
-
-		/* enable regions setup by user */
-		address_trans_set_region(&translate_config, i, 1);
-	}
-}
-
 /**
  * @brief Initialise RAT module
  *
@@ -86,59 +79,60 @@ static void address_trans_init(struct address_trans_params *params)
  * @param translate_regions Number of regions being initialised
  */
 
-void sys_mm_drv_ti_rat_init(void *region_config, uint64_t rat_base_addr, uint8_t translate_regions)
+void sys_mm_drv_ti_rat_init(struct address_trans_region_config *region_config,
+			    uint64_t rat_base_addr, uint8_t translate_regions)
 {
+	uint32_t i;
+
+	__ASSERT(translate_regions < ADDR_TRANSLATE_MAX_REGIONS, "Maximum regions exceeded");
+	__ASSERT(rat_base_addr != 0, "RAT base address cannot be 0");
+	__ASSERT(region_config != NULL, "RAT region config cannot be NULL");
+
 	translate_config.num_regions = translate_regions;
 	translate_config.rat_base_addr = rat_base_addr;
-	translate_config.region_config = (struct address_trans_region_config *)region_config;
+	translate_config.region_config = region_config;
 
-	address_trans_init(&translate_config);
+	/* enable regions setup by user */
+	for (i = 0; i < translate_regions; i++) {
+		address_trans_set_region(&region_config[i], i, 1);
+	}
 }
 
 int sys_mm_drv_page_phys_get(void *virt, uintptr_t *phys)
 {
-	if (virt == NULL) {
-		return -EINVAL;
+	if (phys == NULL) {
+		/*
+		 * NULL phys means the caller wants to check if a virtual address is
+		 * valid. For RAT, even addresses without a mapping are still valid and
+		 * are mapped as pass-through in HW, so we always return 0(valid) here.
+		 */
+		return 0;
 	}
 	uintptr_t pa = (uintptr_t) virt;
 	uintptr_t *va = phys;
 
-	uint32_t found, regionId;
-
-	__ASSERT(translate_config.num_regions < ADDR_TRANSLATE_MAX_REGIONS,
-		 "Exceeding maximum number of regions");
-
-	found = 0;
+	uint32_t regionId;
 
 	for (regionId = 0; regionId < translate_config.num_regions; regionId++) {
-		uint64_t start_addr, end_addr;
-		uint32_t size_mask;
+		struct address_trans_region_config *region_config =
+			&translate_config.region_config[regionId];
 
-		size_mask =
-			((uint32_t)((BIT64_MASK(translate_config.region_config[regionId].size))));
+		uint64_t start_addr = region_config->system_addr;
+		uint64_t end_addr = start_addr + BIT64_MASK(region_config->size);
 
-		start_addr = translate_config.region_config[regionId].system_addr;
-
-		end_addr = start_addr + size_mask;
-
-		if (pa >= start_addr && pa <= end_addr) {
-			found = 1;
-			break;
+		if (pa < start_addr || pa > end_addr) {
+			continue;
 		}
-	}
-	if (found) {
+
 		/* translate input address to output address */
-		uint32_t offset =
-			pa - translate_config.region_config[regionId].system_addr;
+		uint32_t offset = pa - start_addr;
+		*va = region_config->local_addr + offset;
 
-		*va = (translate_config.region_config[regionId].local_addr + offset);
-	} else {
-		/* no mapping found, set output = input with 32b truncation */
-		*va = pa;
+		return 0;
 	}
 
-	if (va == NULL) {
-		return -EFAULT;
-	}
+	/* no mapping found, set output = input with 32b truncation */
+	*va = pa;
+
 	return 0;
 }
diff --git a/drivers/modem/Kconfig.cellular b/drivers/modem/Kconfig.cellular
index 5e1a38b99dd37..adc66f574b7d3 100644
--- a/drivers/modem/Kconfig.cellular
+++ b/drivers/modem/Kconfig.cellular
@@ -42,15 +42,8 @@ config MODEM_CELLULAR_UART_BUFFER_SIZES
 	int "The UART receive and transmit buffer sizes in bytes."
 	default 512
 
-config MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE
-	int "The maximum CMUX frame size in bytes."
-	default 32 if DT_HAS_U_BLOX_LARA_R6_ENABLED
-	default 128
-	help
-	  This value affects the size of buffers used to receive and transmit CMUX frames.
-
-config MODEM_CELLULAR_CHAT_BUFFER_SIZES
-	int "The size of the buffers used for the chat scripts in bytes."
+config MODEM_CELLULAR_CHAT_BUFFER_SIZE
+	int "The size of the buffer used for the chat scripts in bytes."
 	default 128
 
 config MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES
diff --git a/drivers/modem/modem_cellular.c b/drivers/modem/modem_cellular.c
index 317c76dd847b8..2af67a01c7a76 100644
--- a/drivers/modem/modem_cellular.c
+++ b/drivers/modem/modem_cellular.c
@@ -90,8 +90,8 @@ struct modem_cellular_data {
 
 	/* CMUX */
 	struct modem_cmux cmux;
-	uint8_t cmux_receive_buf[CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE];
-	uint8_t cmux_transmit_buf[2 * CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE];
+	uint8_t cmux_receive_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
+	uint8_t cmux_transmit_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
 
 	struct modem_cmux_dlci dlci1;
 	struct modem_cmux_dlci dlci2;
@@ -99,13 +99,13 @@ struct modem_cellular_data {
 	struct modem_pipe *dlci2_pipe;
 	/* Points to dlci2_pipe or NULL. Used for shutdown script if not NULL */
 	struct modem_pipe *cmd_pipe;
-	uint8_t dlci1_receive_buf[CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE];
+	uint8_t dlci1_receive_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
 	/* DLCI 2 is only used for chat scripts. */
-	uint8_t dlci2_receive_buf[CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZES];
+	uint8_t dlci2_receive_buf[CONFIG_MODEM_CMUX_WORK_BUFFER_SIZE];
 
 	/* Modem chat */
 	struct modem_chat chat;
-	uint8_t chat_receive_buf[CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZES];
+	uint8_t chat_receive_buf[CONFIG_MODEM_CELLULAR_CHAT_BUFFER_SIZE];
 	uint8_t *chat_delimiter;
 	uint8_t *chat_filter;
 	uint8_t *chat_argv[32];
@@ -154,6 +154,7 @@ struct modem_cellular_config {
 	const struct device *uart;
 	struct gpio_dt_spec power_gpio;
 	struct gpio_dt_spec reset_gpio;
+	struct gpio_dt_spec wake_gpio;
 	uint16_t power_pulse_duration_ms;
 	uint16_t reset_pulse_duration_ms;
 	uint16_t startup_time_ms;
@@ -599,6 +600,10 @@ static int modem_cellular_on_idle_state_enter(struct modem_cellular_data *data)
 	const struct modem_cellular_config *config =
 		(const struct modem_cellular_config *)data->dev->config;
 
+	if (modem_cellular_gpio_is_enabled(&config->wake_gpio)) {
+		gpio_pin_set_dt(&config->wake_gpio, 0);
+	}
+
 	if (modem_cellular_gpio_is_enabled(&config->reset_gpio)) {
 		gpio_pin_set_dt(&config->reset_gpio, 1);
 	}
@@ -662,6 +667,10 @@ static int modem_cellular_on_idle_state_leave(struct modem_cellular_data *data)
 		gpio_pin_set_dt(&config->reset_gpio, 0);
 	}
 
+	if (modem_cellular_gpio_is_enabled(&config->wake_gpio)) {
+		gpio_pin_set_dt(&config->wake_gpio, 1);
+	}
+
 	return 0;
 }
 
@@ -670,6 +679,10 @@ static int modem_cellular_on_reset_pulse_state_enter(struct modem_cellular_data
 	const struct modem_cellular_config *config =
 		(const struct modem_cellular_config *)data->dev->config;
 
+	if (modem_cellular_gpio_is_enabled(&config->wake_gpio)) {
+		gpio_pin_set_dt(&config->wake_gpio, 0);
+	}
+
 	gpio_pin_set_dt(&config->reset_gpio, 1);
 	modem_cellular_start_timer(data, K_MSEC(config->reset_pulse_duration_ms));
 	return 0;
@@ -698,6 +711,11 @@ static int modem_cellular_on_reset_pulse_state_leave(struct modem_cellular_data
 		(const struct modem_cellular_config *)data->dev->config;
 
 	gpio_pin_set_dt(&config->reset_gpio, 0);
+
+	if (modem_cellular_gpio_is_enabled(&config->wake_gpio)) {
+		gpio_pin_set_dt(&config->wake_gpio, 1);
+	}
+
 	modem_cellular_stop_timer(data);
 	return 0;
 }
@@ -1715,6 +1733,10 @@ static int modem_cellular_init(const struct device *dev)
 
 	k_sem_init(&data->suspended_sem, 0, 1);
 
+	if (modem_cellular_gpio_is_enabled(&config->wake_gpio)) {
+		gpio_pin_configure_dt(&config->wake_gpio, GPIO_OUTPUT_INACTIVE);
+	}
+
 	if (modem_cellular_gpio_is_enabled(&config->power_gpio)) {
 		gpio_pin_configure_dt(&config->power_gpio, GPIO_OUTPUT_INACTIVE);
 	}
@@ -2127,10 +2149,16 @@ MODEM_CHAT_SCRIPT_DEFINE(u_blox_lara_r6_periodic_chat_script,
 
 #if DT_HAS_COMPAT_STATUS_OKAY(swir_hl7800)
 MODEM_CHAT_SCRIPT_CMDS_DEFINE(swir_hl7800_init_chat_script_cmds,
-			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),
-			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),
-			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),
-			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),
+			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 1000),
+			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 1000),
+			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 1000),
+			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 1000),
+			      /* Turn off sleep mode */
+			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+KSLEEP=2", ok_match),
+			      /* Turn off PSM */
+			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CPSMS=0", ok_match),
+			      /* Turn off eDRX */
+			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CEDRXS=0", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("ATE0", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CFUN=1", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP_MULT("AT+CGACT=0", allow_match),
@@ -2388,6 +2416,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
 		.uart = DEVICE_DT_GET(DT_INST_BUS(inst)),                                          \
 		.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}),                 \
 		.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}),                 \
+		.wake_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_wake_gpios, {}),                   \
 		.power_pulse_duration_ms = (power_ms),                                             \
 		.reset_pulse_duration_ms = (reset_ms),                                             \
 		.startup_time_ms  = (startup_ms),                                                  \
diff --git a/drivers/mspi/CMakeLists.txt b/drivers/mspi/CMakeLists.txt
index f248cb0b53337..78f704393f428 100644
--- a/drivers/mspi/CMakeLists.txt
+++ b/drivers/mspi/CMakeLists.txt
@@ -4,4 +4,5 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/mspi.h)
 
 zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_MSPI_AMBIQ_AP3   mspi_ambiq_ap3.c)
+zephyr_library_sources_ifdef(CONFIG_MSPI_DW          mspi_dw.c)
 zephyr_library_sources_ifdef(CONFIG_MSPI_EMUL        mspi_emul.c)
diff --git a/drivers/mspi/Kconfig b/drivers/mspi/Kconfig
index 0adb2a3439338..269d8d16f04ac 100644
--- a/drivers/mspi/Kconfig
+++ b/drivers/mspi/Kconfig
@@ -60,6 +60,7 @@ module-str = mspi
 source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/mspi/Kconfig.ambiq"
+source "drivers/mspi/Kconfig.dw"
 source "drivers/mspi/Kconfig.mspi_emul"
 
 endif # MSPI
diff --git a/drivers/mspi/Kconfig.dw b/drivers/mspi/Kconfig.dw
new file mode 100644
index 0000000000000..1ab82da0e8547
--- /dev/null
+++ b/drivers/mspi/Kconfig.dw
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config MSPI_DW
+	bool "DesignWare SSI controller driver"
+	default y
+	depends on DT_HAS_SNPS_DESIGNWARE_SSI_ENABLED
+	select PINCTRL if $(dt_compat_any_has_prop,$(DT_COMPAT_SNPS_DESIGNWARE_SSI),pinctrl-0)
+	imply MSPI_XIP
diff --git a/drivers/mspi/mspi_ambiq.h b/drivers/mspi/mspi_ambiq.h
index b289f190f7da9..f8ca6789ae4ba 100644
--- a/drivers/mspi/mspi_ambiq.h
+++ b/drivers/mspi/mspi_ambiq.h
@@ -7,7 +7,7 @@
 #ifndef MSPI_AMBIQ_H_
 #define MSPI_AMBIQ_H_
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 /* Hand-calculated minimum heap sizes needed to return a successful
  * 1-byte allocation.  See details in lib/os/heap.[ch]
diff --git a/drivers/mspi/mspi_ambiq_ap3.c b/drivers/mspi/mspi_ambiq_ap3.c
index 12bdae882ae65..0e2148c1e594b 100644
--- a/drivers/mspi/mspi_ambiq_ap3.c
+++ b/drivers/mspi/mspi_ambiq_ap3.c
@@ -26,6 +26,14 @@ LOG_MODULE_REGISTER(mspi_ambiq_ap3);
 #define PWRCTRL_MAX_WAIT_US  5
 #define MSPI_BUSY            BIT(2)
 
+#if defined(CONFIG_SOC_APOLLO3_BLUE)
+#define MSPI_BASE_ADDR       MSPI_BASE
+#define MSPI_ADDR_INTERVAL   1
+#else
+#define MSPI_BASE_ADDR       MSPI0_BASE
+#define MSPI_ADDR_INTERVAL   (MSPI1_BASE - MSPI0_BASE)
+#endif
+
 typedef int (*mspi_ambiq_pwr_func_t)(void);
 typedef void (*irq_config_func_t)(void);
 
@@ -1356,8 +1364,8 @@ static DEVICE_API(mspi, mspi_ambiq_driver_api) = {
 
 #define MSPI_CONFIG(n)                                                                           \
 	{                                                                                        \
-		.channel_num           = (DT_INST_REG_ADDR(n) - MSPI0_BASE) /                    \
-					 (DT_INST_REG_SIZE(n) * 4),                              \
+		.channel_num           = (DT_INST_REG_ADDR(n) - MSPI_BASE_ADDR) /                \
+									 MSPI_ADDR_INTERVAL,     \
 		.op_mode               = MSPI_OP_MODE_CONTROLLER,                                \
 		.duplex                = MSPI_HALF_DUPLEX,                                       \
 		.max_freq              = MSPI_MAX_FREQ,                                          \
diff --git a/drivers/mspi/mspi_dw.c b/drivers/mspi/mspi_dw.c
new file mode 100644
index 0000000000000..39cf463f4beec
--- /dev/null
+++ b/drivers/mspi/mspi_dw.c
@@ -0,0 +1,1374 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT snps_designware_ssi
+
+#include <zephyr/drivers/mspi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+
+#include "mspi_dw.h"
+#include "mspi_dw_vendor_specific.h"
+
+LOG_MODULE_REGISTER(mspi_dw, CONFIG_MSPI_LOG_LEVEL);
+
+#define DUMMY_BYTE 0xAA
+
+#if defined(CONFIG_MSPI_XIP)
+struct xip_params {
+	uint32_t read_cmd;
+	uint32_t write_cmd;
+	uint16_t rx_dummy;
+	uint16_t tx_dummy;
+	uint8_t cmd_length;
+	uint8_t addr_length;
+	enum mspi_io_mode io_mode;
+};
+
+struct xip_ctrl {
+	uint32_t read;
+	uint32_t write;
+};
+#endif
+
+struct mspi_dw_data {
+	const struct mspi_dev_id *dev_id;
+	uint32_t packets_done;
+	uint8_t *buf_pos;
+	const uint8_t *buf_end;
+
+	uint32_t ctrlr0;
+	uint32_t spi_ctrlr0;
+	uint32_t baudr;
+
+#if defined(CONFIG_MSPI_XIP)
+	uint32_t xip_freq;
+	struct xip_params xip_params_stored;
+	struct xip_params xip_params_active;
+	uint16_t xip_enabled;
+	enum mspi_cpp_mode xip_cpp;
+#endif
+
+	uint16_t dummy_bytes;
+	uint8_t bytes_to_discard;
+	uint8_t bytes_per_frame_exp;
+	bool standard_spi;
+	bool suspended;
+
+	struct k_sem finished;
+	/* For synchronization of API calls made from different contexts. */
+	struct k_sem ctx_lock;
+	/* For locking of controller configuration. */
+	struct k_sem cfg_lock;
+	struct mspi_xfer xfer;
+};
+
+struct mspi_dw_config {
+	DEVICE_MMIO_ROM;
+	void (*irq_config)(void);
+	uint32_t clock_frequency;
+#if defined(CONFIG_PINCTRL)
+	const struct pinctrl_dev_config *pcfg;
+#endif
+	const struct gpio_dt_spec *ce_gpios;
+	uint8_t ce_gpios_len;
+	uint8_t tx_fifo_depth_minus_1;
+	uint8_t tx_fifo_threshold;
+	uint8_t rx_fifo_threshold;
+	DECLARE_REG_ACCESS();
+	bool sw_multi_periph;
+};
+
+/* Register access helpers. */
+#define DEFINE_MM_REG_RD_WR(reg, off) \
+	DEFINE_MM_REG_RD(reg, off) \
+	DEFINE_MM_REG_WR(reg, off)
+
+DEFINE_MM_REG_WR(ctrlr0,	0x00)
+DEFINE_MM_REG_WR(ctrlr1,	0x04)
+DEFINE_MM_REG_WR(ssienr,	0x08)
+DEFINE_MM_REG_WR(ser,		0x10)
+DEFINE_MM_REG_WR(baudr,		0x14)
+DEFINE_MM_REG_RD_WR(txftlr,	0x18)
+DEFINE_MM_REG_RD_WR(rxftlr,	0x1c)
+DEFINE_MM_REG_RD(txflr,		0x20)
+DEFINE_MM_REG_RD(rxflr,		0x24)
+DEFINE_MM_REG_RD(sr,		0x28)
+DEFINE_MM_REG_WR(imr,		0x2c)
+DEFINE_MM_REG_RD(isr,		0x30)
+DEFINE_MM_REG_RD_WR(dr,		0x60)
+DEFINE_MM_REG_WR(spi_ctrlr0,	0xf4)
+
+#if defined(CONFIG_MSPI_XIP)
+DEFINE_MM_REG_WR(xip_incr_inst,		0x100)
+DEFINE_MM_REG_WR(xip_wrap_inst,		0x104)
+DEFINE_MM_REG_WR(xip_ctrl,		0x108)
+DEFINE_MM_REG_WR(xip_write_incr_inst,	0x140)
+DEFINE_MM_REG_WR(xip_write_wrap_inst,	0x144)
+DEFINE_MM_REG_WR(xip_write_ctrl,	0x148)
+#endif
+
+static void tx_data(const struct device *dev,
+		    const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = dev_data->buf_end;
+	/* When the function is called, it is known that at least one item
+	 * can be written to the FIFO. The loop below writes to the FIFO
+	 * the number of items that is known to fit and then updates that
+	 * number basing on the actual FIFO level (because some data may get
+	 * sent while the FIFO is written; especially for high frequencies
+	 * this may often occur) and continues until the FIFO is filled up
+	 * or the buffer end is reached.
+	 */
+	uint32_t room = 1;
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+	uint32_t data;
+
+	do {
+		if (bytes_per_frame_exp == 2) {
+			data = sys_get_be32(buf_pos);
+			buf_pos += 4;
+		} else if (bytes_per_frame_exp == 1) {
+			data = sys_get_be16(buf_pos);
+			buf_pos += 2;
+		} else {
+			data = *buf_pos;
+			buf_pos += 1;
+		}
+		write_dr(dev, data);
+
+		if (buf_pos >= buf_end) {
+			write_txftlr(dev, 0);
+			break;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->buf_pos = (uint8_t *)buf_pos;
+}
+
+static bool make_rx_cycles(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint16_t dummy_bytes = dev_data->dummy_bytes;
+	/* See tx_data(). */
+	uint32_t room = 1;
+	uint8_t tx_fifo_depth = dev_config->tx_fifo_depth_minus_1 + 1;
+
+	do {
+		write_dr(dev, DUMMY_BYTE);
+
+		--dummy_bytes;
+		if (!dummy_bytes) {
+			dev_data->dummy_bytes = 0;
+			return true;
+		}
+
+		if (--room == 0) {
+			room = tx_fifo_depth
+			     - FIELD_GET(TXFLR_TXTFL_MASK, read_txflr(dev));
+		}
+	} while (room);
+
+	dev_data->dummy_bytes = dummy_bytes;
+	return false;
+}
+
+static void read_rx_fifo(const struct device *dev,
+			 const struct mspi_xfer_packet *packet)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	uint8_t bytes_to_discard = dev_data->bytes_to_discard;
+	uint8_t *buf_pos = dev_data->buf_pos;
+	const uint8_t *buf_end = &packet->data_buf[packet->num_bytes];
+	uint8_t bytes_per_frame_exp = dev_data->bytes_per_frame_exp;
+	/* See `room` in tx_data(). */
+	uint32_t in_fifo = 1;
+	uint32_t remaining_frames;
+
+	do {
+		uint32_t data = read_dr(dev);
+
+		if (bytes_to_discard) {
+			--bytes_to_discard;
+		} else {
+			if (bytes_per_frame_exp == 2) {
+				sys_put_be32(data, buf_pos);
+				buf_pos += 4;
+			} else if (bytes_per_frame_exp == 1) {
+				sys_put_be16(data, buf_pos);
+				buf_pos += 2;
+			} else {
+				*buf_pos = (uint8_t)data;
+				buf_pos += 1;
+			}
+
+			if (buf_pos >= buf_end) {
+				dev_data->bytes_to_discard = bytes_to_discard;
+				dev_data->buf_pos = buf_pos;
+				return;
+			}
+		}
+
+		if (--in_fifo == 0) {
+			in_fifo = FIELD_GET(RXFLR_RXTFL_MASK, read_rxflr(dev));
+		}
+	} while (in_fifo);
+
+	remaining_frames = (bytes_to_discard + buf_end - buf_pos)
+			   >> bytes_per_frame_exp;
+	if (remaining_frames - 1 < dev_config->rx_fifo_threshold) {
+		write_rxftlr(dev, remaining_frames - 1);
+	}
+
+	dev_data->bytes_to_discard = bytes_to_discard;
+	dev_data->buf_pos = buf_pos;
+}
+
+static void mspi_dw_isr(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	uint32_t int_status = read_isr(dev);
+
+	if (int_status & ISR_RXFIS_BIT) {
+		read_rx_fifo(dev, packet);
+	}
+
+	if (dev_data->buf_pos >= dev_data->buf_end) {
+		write_imr(dev, 0);
+		/* It may happen that at this point the controller is still
+		 * shifting out the last frame (the last interrupt occurs when
+		 * the TX FIFO is empty). Wait if it signals that it is busy.
+		 */
+		while (read_sr(dev) & SR_BUSY_BIT) {
+		}
+
+		k_sem_give(&dev_data->finished);
+	} else {
+		if (int_status & ISR_TXEIS_BIT) {
+			if (dev_data->dummy_bytes) {
+				if (make_rx_cycles(dev)) {
+					write_imr(dev, IMR_RXFIM_BIT);
+				}
+			} else {
+				tx_data(dev, packet);
+			}
+		}
+	}
+
+	vendor_specific_irq_clear(dev);
+}
+
+static int api_config(const struct mspi_dt_spec *spec)
+{
+	ARG_UNUSED(spec);
+
+	return -ENOTSUP;
+}
+
+static bool apply_io_mode(struct mspi_dw_data *dev_data,
+			  enum mspi_io_mode io_mode)
+{
+	dev_data->ctrlr0 &= ~CTRLR0_SPI_FRF_MASK;
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_TRANS_TYPE_MASK;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_STANDARD);
+		dev_data->standard_spi = true;
+		return true;
+	}
+
+	dev_data->standard_spi = false;
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SPI_FRF_MASK,
+					       CTRLR0_SPI_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_TRANS_TYPE_MASK,
+						   SPI_CTRLR0_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_cmd_length(struct mspi_dw_data *dev_data, uint32_t cmd_length)
+{
+	switch (cmd_length) {
+	case 0:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L0);
+		break;
+	case 1:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L8);
+		break;
+	case 2:
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_INST_L_MASK,
+						   SPI_CTRLR0_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_addr_length(struct mspi_dw_data *dev_data,
+			      uint32_t addr_length)
+{
+	dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_ADDR_L_MASK,
+					   addr_length * 2);
+
+	return true;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static bool apply_xip_io_mode(const struct mspi_dw_data *dev_data,
+			      struct xip_ctrl *ctrl)
+{
+	enum mspi_io_mode io_mode = dev_data->xip_params_active.io_mode;
+
+	/* Frame format used for transferring data. */
+
+	if (io_mode == MSPI_IO_MODE_SINGLE) {
+		LOG_ERR("XIP not available in single line mode");
+		return false;
+	}
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL:
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_DUAL_1_2_2:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_DUAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_DUAL);
+		break;
+	case MSPI_IO_MODE_QUAD:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_QUAD);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_QUAD);
+		break;
+	case MSPI_IO_MODE_OCTAL:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_FRF_MASK,
+					 XIP_CTRL_FRF_OCTAL);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_FRF_MASK,
+					  XIP_WRITE_CTRL_FRF_OCTAL);
+		break;
+	default:
+		LOG_ERR("IO mode %d not supported", io_mode);
+		return false;
+	}
+
+	/* Transfer format used for Address and Instruction: */
+
+	switch (io_mode) {
+	case MSPI_IO_MODE_DUAL_1_1_2:
+	case MSPI_IO_MODE_QUAD_1_1_4:
+	case MSPI_IO_MODE_OCTAL_1_1_8:
+		/* - both sent in Standard SPI mode */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT0);
+		break;
+	case MSPI_IO_MODE_DUAL_1_2_2:
+	case MSPI_IO_MODE_QUAD_1_4_4:
+	case MSPI_IO_MODE_OCTAL_1_8_8:
+		/* - Instruction sent in Standard SPI mode,
+		 *   Address sent the same way as data
+		 */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT1);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT1);
+		break;
+	default:
+		/* - both sent the same way as data. */
+		ctrl->read |= FIELD_PREP(XIP_CTRL_TRANS_TYPE_MASK,
+					 XIP_CTRL_TRANS_TYPE_TT2);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_TRANS_TYPE_MASK,
+					  XIP_WRITE_CTRL_TRANS_TYPE_TT2);
+		break;
+	}
+
+	return true;
+}
+
+static bool apply_xip_cmd_length(const struct mspi_dw_data *dev_data,
+				 struct xip_ctrl *ctrl)
+{
+	uint8_t cmd_length = dev_data->xip_params_active.cmd_length;
+
+	switch (cmd_length) {
+	case 0:
+		ctrl->read |= FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L0);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L0);
+		break;
+	case 1:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L8);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L8);
+		break;
+	case 2:
+		ctrl->read |= XIP_CTRL_INST_EN_BIT
+			   |  FIELD_PREP(XIP_CTRL_INST_L_MASK,
+					 XIP_CTRL_INST_L16);
+		ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_INST_L_MASK,
+					  XIP_WRITE_CTRL_INST_L16);
+		break;
+	default:
+		LOG_ERR("Command length %d not supported", cmd_length);
+		return false;
+	}
+
+	return true;
+}
+
+static bool apply_xip_addr_length(const struct mspi_dw_data *dev_data,
+				  struct xip_ctrl *ctrl)
+{
+	uint8_t addr_length = dev_data->xip_params_active.addr_length;
+
+	ctrl->read |= FIELD_PREP(XIP_CTRL_ADDR_L_MASK, addr_length * 2);
+	ctrl->write |= FIELD_PREP(XIP_WRITE_CTRL_ADDR_L_MASK, addr_length * 2);
+
+	return true;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int _api_dev_config(const struct device *dev,
+			   const enum mspi_dev_cfg_mask param_mask,
+			   const struct mspi_dev_cfg *cfg)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (param_mask & MSPI_DEVICE_CONFIG_ENDIAN) {
+		if (cfg->endian != MSPI_XFER_BIG_ENDIAN) {
+			LOG_ERR("Only big endian transfers are supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CE_POL) {
+		if (cfg->ce_polarity != MSPI_CE_ACTIVE_LOW) {
+			LOG_ERR("Only active low CE is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_MEM_BOUND) {
+		if (cfg->mem_boundary) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_BREAK_TIME) {
+		if (cfg->time_to_break) {
+			LOG_ERR("Auto CE break is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_IO_MODE) {
+#if defined(CONFIG_MSPI_XIP)
+		dev_data->xip_params_stored.io_mode = cfg->io_mode;
+#endif
+
+		if (!apply_io_mode(dev_data, cfg->io_mode)) {
+			return -EINVAL;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_CPP) {
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_cpp = cfg->cpp;
+		} else if (dev_data->xip_cpp != cfg->cpp) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->ctrlr0 &= ~(CTRLR0_SCPOL_BIT | CTRLR0_SCPH_BIT);
+
+		switch (cfg->cpp) {
+		default:
+		case MSPI_CPP_MODE_0:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_1:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 0) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		case MSPI_CPP_MODE_2:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  0);
+			break;
+		case MSPI_CPP_MODE_3:
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_SCPOL_BIT, 1) |
+					    FIELD_PREP(CTRLR0_SCPH_BIT,  1);
+			break;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_FREQUENCY) {
+		if (cfg->freq > dev_config->clock_frequency / 2 ||
+		    cfg->freq < dev_config->clock_frequency / 65534) {
+			LOG_ERR("Invalid frequency: %u, MIN: %u, MAX: %u",
+				cfg->freq, dev_config->clock_frequency / 65534,
+				dev_config->clock_frequency / 2);
+			return -EINVAL;
+		}
+
+#if defined(CONFIG_MSPI_XIP)
+		/* Make sure the new setting is compatible with the one used
+		 * for XIP if it is enabled.
+		 */
+		if (!dev_data->xip_enabled) {
+			dev_data->xip_freq = cfg->freq;
+		} else if (dev_data->xip_freq != cfg->freq) {
+			LOG_ERR("Conflict with configuration used for XIP.");
+			return -EINVAL;
+		}
+#endif
+
+		dev_data->baudr = dev_config->clock_frequency / cfg->freq;
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DATA_RATE) {
+		/* TODO: add support for DDR */
+		if (cfg->data_rate != MSPI_DATA_RATE_SINGLE) {
+			LOG_ERR("Only single data rate is supported.");
+			return -ENOTSUP;
+		}
+	}
+
+	if (param_mask & MSPI_DEVICE_CONFIG_DQS) {
+		/* TODO: add support for DQS */
+		if (cfg->dqs_enable) {
+			LOG_ERR("DQS line is not supported.");
+			return -ENOTSUP;
+		}
+	}
+
+#if defined(CONFIG_MSPI_XIP)
+	if (param_mask & MSPI_DEVICE_CONFIG_READ_CMD) {
+		dev_data->xip_params_stored.read_cmd = cfg->read_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_WRITE_CMD) {
+		dev_data->xip_params_stored.write_cmd = cfg->write_cmd;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_RX_DUMMY) {
+		dev_data->xip_params_stored.rx_dummy = cfg->rx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_TX_DUMMY) {
+		dev_data->xip_params_stored.tx_dummy = cfg->tx_dummy;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_CMD_LEN) {
+		dev_data->xip_params_stored.cmd_length = cfg->cmd_length;
+	}
+	if (param_mask & MSPI_DEVICE_CONFIG_ADDR_LEN) {
+		dev_data->xip_params_stored.addr_length = cfg->addr_length;
+	}
+#endif
+
+	/* Always use Motorola SPI frame format. */
+	dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_FRF_MASK, CTRLR0_FRF_SPI);
+	/* Enable clock stretching. */
+	dev_data->spi_ctrlr0 |= SPI_CTRLR0_CLK_STRETCH_EN_BIT;
+
+	return 0;
+}
+
+static int api_dev_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const enum mspi_dev_cfg_mask param_mask,
+			  const struct mspi_dev_cfg *cfg)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (dev_id != dev_data->dev_id) {
+		rc = k_sem_take(&dev_data->cfg_lock,
+				K_MSEC(CONFIG_MSPI_COMPLETION_TIMEOUT_TOLERANCE));
+		if (rc < 0) {
+			LOG_ERR("Failed to switch controller to device");
+			return -EBUSY;
+		}
+
+		dev_data->dev_id = dev_id;
+	}
+
+	if (param_mask == MSPI_DEVICE_CONFIG_NONE &&
+	    !dev_config->sw_multi_periph) {
+		return 0;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	rc = _api_dev_config(dev, param_mask, cfg);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	if (rc < 0) {
+		dev_data->dev_id = NULL;
+		k_sem_give(&dev_data->cfg_lock);
+	}
+
+	return rc;
+}
+
+static int api_get_channel_status(const struct device *dev, uint8_t ch)
+{
+	ARG_UNUSED(ch);
+
+	struct mspi_dw_data *dev_data = dev->data;
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	dev_data->dev_id = NULL;
+	k_sem_give(&dev_data->cfg_lock);
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	return 0;
+}
+
+static void tx_control_field(const struct device *dev,
+			     uint32_t field, uint8_t len)
+{
+	uint8_t shift = 8 * len;
+
+	do {
+		shift -= 8;
+		write_dr(dev, field >> shift);
+	} while (shift);
+}
+
+static int start_next_packet(const struct device *dev, k_timeout_t timeout)
+{
+	const struct mspi_dw_config *dev_config = dev->config;
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_xfer_packet *packet =
+		&dev_data->xfer.packets[dev_data->packets_done];
+	bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+				       (dev_data->xip_enabled != 0),
+				       (false));
+	unsigned int key;
+	uint8_t tx_fifo_threshold;
+	uint32_t packet_frames;
+	uint32_t imr;
+	int rc = 0;
+
+	if (packet->num_bytes == 0 &&
+	    dev_data->xfer.cmd_length == 0 &&
+	    dev_data->xfer.addr_length == 0) {
+		return 0;
+	}
+
+	dev_data->dummy_bytes = 0;
+
+	dev_data->ctrlr0 &= ~CTRLR0_TMOD_MASK
+			 &  ~CTRLR0_DFS_MASK;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK;
+
+	if (dev_data->standard_spi &&
+	    (dev_data->xfer.cmd_length != 0 ||
+	     dev_data->xfer.addr_length != 0)) {
+		dev_data->bytes_per_frame_exp = 0;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+	} else {
+		if ((packet->num_bytes % 4) == 0) {
+			dev_data->bytes_per_frame_exp = 2;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 31);
+		} else if ((packet->num_bytes % 2) == 0) {
+			dev_data->bytes_per_frame_exp = 1;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 15);
+		} else {
+			dev_data->bytes_per_frame_exp = 0;
+			dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_DFS_MASK, 7);
+		}
+	}
+
+	packet_frames = packet->num_bytes >> dev_data->bytes_per_frame_exp;
+
+	if (packet_frames > UINT16_MAX + 1) {
+		LOG_ERR("Packet length (%u) exceeds supported maximum",
+			packet->num_bytes);
+		return -EINVAL;
+	}
+
+	if (packet->dir == MSPI_TX || packet->num_bytes == 0) {
+		imr = IMR_TXEIM_BIT;
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK,
+					       CTRLR0_TMOD_TX);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.tx_dummy);
+
+		write_rxftlr(dev, 0);
+		tx_fifo_threshold = dev_config->tx_fifo_threshold;
+	} else {
+		uint32_t tmod;
+		uint8_t rx_fifo_threshold;
+
+		/* In Standard SPI Mode, the controller does not support
+		 * sending the command and address fields separately, they
+		 * need to be sent as data; hence, for RX packets with these
+		 * fields, the TX/RX transfer mode needs to be used and
+		 * consequently, dummy bytes need to be transmitted so that
+		 * clock cycles for the RX part are provided (the controller
+		 * does not do it automatically in the TX/RX mode).
+		 */
+		if (dev_data->standard_spi &&
+		    (dev_data->xfer.cmd_length != 0 ||
+		     dev_data->xfer.addr_length != 0)) {
+			uint32_t rx_total_bytes;
+
+			dev_data->bytes_to_discard = dev_data->xfer.cmd_length
+						   + dev_data->xfer.addr_length;
+			rx_total_bytes = dev_data->bytes_to_discard
+				       + packet->num_bytes;
+
+			dev_data->dummy_bytes = packet->num_bytes;
+
+			imr = IMR_TXEIM_BIT | IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_TX_RX;
+			tx_fifo_threshold = dev_config->tx_fifo_threshold;
+			/* For standard SPI, only 1-byte frames are used. */
+			rx_fifo_threshold = MIN(rx_total_bytes - 1,
+						dev_config->rx_fifo_threshold);
+		} else {
+			imr = IMR_RXFIM_BIT;
+			tmod = CTRLR0_TMOD_RX;
+			tx_fifo_threshold = 0;
+			rx_fifo_threshold = MIN(packet_frames - 1,
+						dev_config->rx_fifo_threshold);
+		}
+
+		dev_data->ctrlr0 |= FIELD_PREP(CTRLR0_TMOD_MASK, tmod);
+		dev_data->spi_ctrlr0 |= FIELD_PREP(SPI_CTRLR0_WAIT_CYCLES_MASK,
+						   dev_data->xfer.rx_dummy);
+
+		write_rxftlr(dev, FIELD_PREP(RXFTLR_RFT_MASK,
+					     rx_fifo_threshold));
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		rc = gpio_pin_set_dt(&dev_data->dev_id->ce, 1);
+		if (rc < 0) {
+			LOG_ERR("Failed to activate CE line (%d)", rc);
+			return rc;
+		}
+	}
+
+	if (xip_enabled) {
+		key = irq_lock();
+		write_ssienr(dev, 0);
+	}
+
+	/* These registers cannot be written when the controller is enabled,
+	 * that's why it is temporarily disabled above; with locked interrupts,
+	 * to prevent potential XIP transfers during that period.
+	 */
+	write_ctrlr0(dev, dev_data->ctrlr0);
+	write_ctrlr1(dev, packet_frames > 0
+		? FIELD_PREP(CTRLR1_NDF_MASK, packet_frames - 1)
+		: 0);
+	write_spi_ctrlr0(dev, dev_data->spi_ctrlr0);
+	write_baudr(dev, dev_data->baudr);
+	write_ser(dev, BIT(dev_data->dev_id->dev_idx));
+
+	if (xip_enabled) {
+		write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+		irq_unlock(key);
+	}
+
+	dev_data->buf_pos = packet->data_buf;
+	dev_data->buf_end = &packet->data_buf[packet->num_bytes];
+
+	if ((imr & IMR_TXEIM_BIT) && dev_data->buf_pos < dev_data->buf_end) {
+		uint32_t start_level = tx_fifo_threshold;
+
+		if (dev_data->dummy_bytes) {
+			uint32_t tx_total = dev_data->bytes_to_discard
+					  + dev_data->dummy_bytes;
+
+			if (start_level > tx_total - 1) {
+				start_level = tx_total - 1;
+			}
+		}
+
+		write_txftlr(dev,
+			FIELD_PREP(TXFTLR_TXFTHR_MASK, start_level) |
+			FIELD_PREP(TXFTLR_TFT_MASK, tx_fifo_threshold));
+	} else {
+		write_txftlr(dev, 0);
+	}
+
+	/* Ensure that there will be no interrupt from the controller yet. */
+	write_imr(dev, 0);
+	/* Enable the controller. This must be done before DR is written. */
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	if (dev_data->standard_spi) {
+		if (dev_data->xfer.cmd_length) {
+			tx_control_field(dev, packet->cmd,
+					 dev_data->xfer.cmd_length);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			tx_control_field(dev, packet->address,
+					 dev_data->xfer.addr_length);
+		}
+	} else {
+		if (dev_data->xfer.cmd_length) {
+			write_dr(dev, packet->cmd);
+		}
+
+		if (dev_data->xfer.addr_length) {
+			write_dr(dev, packet->address);
+		}
+	}
+
+	if (dev_data->dummy_bytes) {
+		if (make_rx_cycles(dev)) {
+			imr = IMR_RXFIM_BIT;
+		}
+	} else if (packet->dir == MSPI_TX && packet->num_bytes) {
+		tx_data(dev, packet);
+	}
+
+	/* Enable interrupts now and wait until the packet is done. */
+	write_imr(dev, imr);
+
+	rc = k_sem_take(&dev_data->finished, timeout);
+	if (rc < 0) {
+		rc = -ETIMEDOUT;
+	}
+
+	/* Disable the controller. This will immediately halt the transfer
+	 * if it hasn't finished yet.
+	 */
+	if (xip_enabled) {
+		/* If XIP is enabled, the controller must be kept enabled,
+		 * so disable it only momentarily if there's a need to halt
+		 * a transfer that has timeout out.
+		 */
+		if (rc == -ETIMEDOUT) {
+			key = irq_lock();
+
+			write_ssienr(dev, 0);
+			write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+			irq_unlock(key);
+		}
+	} else {
+		write_ssienr(dev, 0);
+	}
+
+	if (dev_data->dev_id->ce.port) {
+		int rc2;
+
+		/* Do not use `rc` to not overwrite potential timeout error. */
+		rc2 = gpio_pin_set_dt(&dev_data->dev_id->ce, 0);
+		if (rc2 < 0) {
+			LOG_ERR("Failed to deactivate CE line (%d)", rc2);
+			return rc2;
+		}
+	}
+
+	return rc;
+}
+
+static int _api_transceive(const struct device *dev,
+			   const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	dev_data->spi_ctrlr0 &= ~SPI_CTRLR0_WAIT_CYCLES_MASK
+			     &  ~SPI_CTRLR0_INST_L_MASK
+			     &  ~SPI_CTRLR0_ADDR_L_MASK;
+
+	if (!apply_cmd_length(dev_data, req->cmd_length) ||
+	    !apply_addr_length(dev_data, req->addr_length)) {
+		return -EINVAL;
+	}
+
+	if (dev_data->standard_spi &&
+	    (req->rx_dummy != 0 || req->tx_dummy != 0)) {
+		LOG_ERR("Dummy cycles unsupported in single line mode");
+		return -EINVAL;
+	} else if (req->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		   req->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+		LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+			req->rx_dummy, req->tx_dummy);
+		return -EINVAL;
+	}
+
+	dev_data->xfer = *req;
+
+	for (dev_data->packets_done = 0;
+	     dev_data->packets_done < dev_data->xfer.num_packet;
+	     dev_data->packets_done++) {
+		rc = start_next_packet(dev, K_MSEC(dev_data->xfer.timeout));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	return 0;
+}
+
+static int api_transceive(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xfer *req)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	/* TODO: add support for asynchronous transfers */
+	if (req->async) {
+		LOG_ERR("Asynchronous transfers are not supported");
+		return -ENOTSUP;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	if (dev_data->suspended) {
+		rc = -EFAULT;
+	} else {
+		rc = _api_transceive(dev, req);
+	}
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static int _api_xip_config(const struct device *dev,
+			   const struct mspi_dev_id *dev_id,
+			   const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc;
+
+	if (!cfg->enable) {
+		rc = vendor_specific_xip_disable(dev, dev_id, cfg);
+		if (rc < 0) {
+			return rc;
+		}
+
+		dev_data->xip_enabled &= ~BIT(dev_id->dev_idx);
+
+		if (!dev_data->xip_enabled) {
+			write_ssienr(dev, 0);
+
+			/* Since XIP is disabled, it is okay for the controller
+			 * to be suspended.
+			 */
+			rc = pm_device_runtime_put(dev);
+			if (rc < 0) {
+				LOG_ERR("pm_device_runtime_put() failed: %d", rc);
+				return rc;
+			}
+		}
+
+		return 0;
+	}
+
+	if (!dev_data->xip_enabled) {
+		struct xip_params *params = &dev_data->xip_params_active;
+		struct xip_ctrl ctrl = {0};
+
+		*params = dev_data->xip_params_stored;
+
+		if (!apply_xip_io_mode(dev_data, &ctrl) ||
+		    !apply_xip_cmd_length(dev_data, &ctrl) ||
+		    !apply_xip_addr_length(dev_data, &ctrl)) {
+			return -EINVAL;
+		}
+
+		if (params->rx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX ||
+		    params->tx_dummy > SPI_CTRLR0_WAIT_CYCLES_MAX) {
+			LOG_ERR("Unsupported RX (%u) or TX (%u) dummy cycles",
+				params->rx_dummy, params->tx_dummy);
+			return -EINVAL;
+		}
+
+		/* Increase usage count additionally to prevent the controller
+		 * from being suspended as long as XIP is active.
+		 */
+		rc = pm_device_runtime_get(dev);
+		if (rc < 0) {
+			LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+			return rc;
+		}
+
+		ctrl.read |= FIELD_PREP(XIP_CTRL_WAIT_CYCLES_MASK,
+					params->rx_dummy);
+		ctrl.write |= FIELD_PREP(XIP_WRITE_CTRL_WAIT_CYCLES_MASK,
+					 params->tx_dummy);
+
+		/* Make sure the baud rate and serial clock phase/polarity
+		 * registers are configured properly. They may not be if
+		 * non-XIP transfers have not been performed yet.
+		 */
+		write_ctrlr0(dev, dev_data->ctrlr0);
+		write_baudr(dev, dev_data->baudr);
+
+		write_xip_incr_inst(dev, params->read_cmd);
+		write_xip_wrap_inst(dev, params->read_cmd);
+		write_xip_ctrl(dev, ctrl.read);
+		write_xip_write_incr_inst(dev, params->write_cmd);
+		write_xip_write_wrap_inst(dev, params->write_cmd);
+		write_xip_write_ctrl(dev, ctrl.write);
+	} else if (dev_data->xip_params_active.read_cmd !=
+		   dev_data->xip_params_stored.read_cmd ||
+		   dev_data->xip_params_active.write_cmd !=
+		   dev_data->xip_params_stored.write_cmd ||
+		   dev_data->xip_params_active.cmd_length !=
+		   dev_data->xip_params_stored.cmd_length ||
+		   dev_data->xip_params_active.addr_length !=
+		   dev_data->xip_params_stored.addr_length ||
+		   dev_data->xip_params_active.rx_dummy !=
+		   dev_data->xip_params_stored.rx_dummy ||
+		   dev_data->xip_params_active.tx_dummy !=
+		   dev_data->xip_params_stored.tx_dummy) {
+		LOG_ERR("Conflict with configuration already used for XIP.");
+		return -EINVAL;
+	}
+
+	rc = vendor_specific_xip_enable(dev, dev_id, cfg);
+	if (rc < 0) {
+		return rc;
+	}
+
+	write_ssienr(dev, SSIENR_SSIC_EN_BIT);
+
+	dev_data->xip_enabled |= BIT(dev_id->dev_idx);
+
+	return 0;
+}
+
+static int api_xip_config(const struct device *dev,
+			  const struct mspi_dev_id *dev_id,
+			  const struct mspi_xip_cfg *cfg)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	int rc, rc2;
+
+	if (cfg->enable && dev_id != dev_data->dev_id) {
+		LOG_ERR("Controller is not configured for this device");
+		return -EINVAL;
+	}
+
+	rc = pm_device_runtime_get(dev);
+	if (rc < 0) {
+		LOG_ERR("pm_device_runtime_get() failed: %d", rc);
+		return rc;
+	}
+
+	(void)k_sem_take(&dev_data->ctx_lock, K_FOREVER);
+
+	if (dev_data->suspended) {
+		rc = -EFAULT;
+	} else {
+		rc = _api_xip_config(dev, dev_id, cfg);
+	}
+
+	k_sem_give(&dev_data->ctx_lock);
+
+	rc2 = pm_device_runtime_put(dev);
+	if (rc2 < 0) {
+		LOG_ERR("pm_device_runtime_put() failed: %d", rc2);
+		rc = (rc < 0 ? rc : rc2);
+	}
+
+	return rc;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+static int dev_pm_action_cb(const struct device *dev,
+			    enum pm_device_action action)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+
+	if (action == PM_DEVICE_ACTION_RESUME) {
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_DEFAULT);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply default pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		vendor_specific_resume(dev);
+
+		dev_data->suspended = false;
+
+		return 0;
+	}
+
+	if (IS_ENABLED(CONFIG_PM_DEVICE) &&
+	    action == PM_DEVICE_ACTION_SUSPEND) {
+		bool xip_enabled = COND_CODE_1(CONFIG_MSPI_XIP,
+					       (dev_data->xip_enabled != 0),
+					       (false));
+
+#if defined(CONFIG_PINCTRL)
+		const struct mspi_dw_config *dev_config = dev->config;
+		int rc = pinctrl_apply_state(dev_config->pcfg,
+					     PINCTRL_STATE_SLEEP);
+
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+#endif
+		if (xip_enabled ||
+		    k_sem_take(&dev_data->ctx_lock, K_NO_WAIT) != 0) {
+			LOG_ERR("Controller in use, cannot be suspended");
+			return -EBUSY;
+		}
+
+		dev_data->suspended = true;
+
+		vendor_specific_suspend(dev);
+
+		k_sem_give(&dev_data->ctx_lock);
+
+		return 0;
+	}
+
+	return -ENOTSUP;
+}
+
+static int dev_init(const struct device *dev)
+{
+	struct mspi_dw_data *dev_data = dev->data;
+	const struct mspi_dw_config *dev_config = dev->config;
+	const struct gpio_dt_spec *ce_gpio;
+	int rc;
+
+	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
+
+	vendor_specific_init(dev);
+
+	dev_config->irq_config();
+
+	k_sem_init(&dev_data->finished, 0, 1);
+	k_sem_init(&dev_data->cfg_lock, 1, 1);
+	k_sem_init(&dev_data->ctx_lock, 1, 1);
+
+	for (ce_gpio = dev_config->ce_gpios;
+	     ce_gpio < &dev_config->ce_gpios[dev_config->ce_gpios_len];
+	     ce_gpio++) {
+		if (!device_is_ready(ce_gpio->port)) {
+			LOG_ERR("CE GPIO port %s is not ready",
+				ce_gpio->port->name);
+			return -ENODEV;
+		}
+
+		rc = gpio_pin_configure_dt(ce_gpio, GPIO_OUTPUT_INACTIVE);
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+#if defined(CONFIG_PINCTRL)
+	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) {
+		rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+		if (rc < 0) {
+			LOG_ERR("Cannot apply sleep pins state (%d)", rc);
+			return rc;
+		}
+	}
+#endif
+
+	return pm_device_driver_init(dev, dev_pm_action_cb);
+}
+
+static DEVICE_API(mspi, drv_api) = {
+	.config             = api_config,
+	.dev_config         = api_dev_config,
+	.get_channel_status = api_get_channel_status,
+	.transceive         = api_transceive,
+#if defined(CONFIG_MSPI_XIP)
+	.xip_config         = api_xip_config,
+#endif
+};
+
+#define MSPI_DW_INST_IRQ(idx, inst)					\
+	IRQ_CONNECT(DT_INST_IRQ_BY_IDX(inst, idx, irq),			\
+		    DT_INST_IRQ_BY_IDX(inst, idx, priority),		\
+		    mspi_dw_isr, DEVICE_DT_INST_GET(inst), 0);		\
+	irq_enable(DT_INST_IRQ_BY_IDX(inst, idx, irq))
+
+#define MSPI_DW_MMIO_ROM_INIT(node_id)					\
+	COND_CODE_1(DT_REG_HAS_NAME(node_id, core),			\
+		(Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, node_id)),	\
+		(DEVICE_MMIO_ROM_INIT(node_id)))
+
+#define MSPI_DW_CLOCK_FREQUENCY(inst)					\
+	COND_CODE_1(DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks),	\
+				     clock_frequency),			\
+		(DT_INST_PROP_BY_PHANDLE(inst, clocks,			\
+					 clock_frequency)),		\
+		(DT_INST_PROP(inst, clock_frequency)))
+
+#define MSPI_DW_DT_INST_PROP(inst, prop) .prop = DT_INST_PROP(inst, prop)
+
+#define FOREACH_CE_GPIOS_ELEM(inst)					\
+	DT_INST_FOREACH_PROP_ELEM_SEP(inst, ce_gpios,			\
+				      GPIO_DT_SPEC_GET_BY_IDX, (,))
+#define MSPI_DW_CE_GPIOS(inst)						\
+	.ce_gpios = (const struct gpio_dt_spec [])			\
+		{ FOREACH_CE_GPIOS_ELEM(inst) },			\
+	.ce_gpios_len = DT_INST_PROP_LEN(inst, ce_gpios)
+
+#define TX_FIFO_DEPTH(inst) DT_INST_PROP(inst, fifo_depth)
+#define RX_FIFO_DEPTH(inst) DT_INST_PROP_OR(inst, rx_fifo_depth,	\
+					    TX_FIFO_DEPTH(inst))
+#define MSPI_DW_FIFO_PROPS(inst)					\
+	.tx_fifo_depth_minus_1 = TX_FIFO_DEPTH(inst) - 1,		\
+	.tx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, tx_fifo_threshold,		\
+				7 * TX_FIFO_DEPTH(inst) / 8 - 1),	\
+	.rx_fifo_threshold =						\
+		DT_INST_PROP_OR(inst, rx_fifo_threshold,		\
+				1 * RX_FIFO_DEPTH(inst) / 8 - 1)
+
+#define MSPI_DW_INST(inst)						\
+	PM_DEVICE_DT_INST_DEFINE(inst, dev_pm_action_cb);		\
+	IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_INST_DEFINE(inst);))	\
+	static void irq_config##inst(void)				\
+	{								\
+		LISTIFY(DT_INST_NUM_IRQS(inst),				\
+			MSPI_DW_INST_IRQ, (;), inst);			\
+	}								\
+	static struct mspi_dw_data dev##inst##_data;			\
+	static const struct mspi_dw_config dev##inst##_config = {	\
+		MSPI_DW_MMIO_ROM_INIT(DT_DRV_INST(inst)),		\
+		.irq_config = irq_config##inst,				\
+		.clock_frequency = MSPI_DW_CLOCK_FREQUENCY(inst),	\
+	IF_ENABLED(CONFIG_PINCTRL,					\
+		(.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),))	\
+	IF_ENABLED(DT_INST_NODE_HAS_PROP(inst, ce_gpios),		\
+		(MSPI_DW_CE_GPIOS(inst),))				\
+		MSPI_DW_FIFO_PROPS(inst),				\
+		DEFINE_REG_ACCESS(inst)					\
+		.sw_multi_periph =					\
+			DT_INST_PROP(inst, software_multiperipheral),	\
+	};								\
+	DEVICE_DT_INST_DEFINE(inst,					\
+		dev_init, PM_DEVICE_DT_INST_GET(inst),			\
+		&dev##inst##_data, &dev##inst##_config,			\
+		POST_KERNEL, CONFIG_MSPI_INIT_PRIORITY,			\
+		&drv_api);
+
+DT_INST_FOREACH_STATUS_OKAY(MSPI_DW_INST)
diff --git a/drivers/mspi/mspi_dw.h b/drivers/mspi/mspi_dw.h
new file mode 100644
index 0000000000000..bd81d061e09ac
--- /dev/null
+++ b/drivers/mspi/mspi_dw.h
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This header is part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+/* CTRLR0 - Control Register 0 */
+#define CTRLR0_SPI_FRF_MASK	GENMASK(23, 22)
+#define CTRLR0_SPI_FRF_STANDARD	0UL
+#define CTRLR0_SPI_FRF_DUAL	1UL
+#define CTRLR0_SPI_FRF_QUAD	2UL
+#define CTRLR0_SPI_FRF_OCTAL	3UL
+#define CTRLR0_TMOD_MASK	GENMASK(11, 10)
+#define CTRLR0_TMOD_TX_RX	0UL
+#define CTRLR0_TMOD_TX		1UL
+#define CTRLR0_TMOD_RX		2UL
+#define CTRLR0_TMOD_EEPROM	3UL
+#define CTRLR0_SCPOL_BIT	BIT(9)
+#define CTRLR0_SCPH_BIT		BIT(8)
+#define CTRLR0_FRF_MASK		GENMASK(7, 6)
+#define CTRLR0_FRF_SPI		0UL
+#define CTRLR0_FRF_SSP		1UL
+#define CTRLR0_FRF_MICROWIRE	2UL
+#define CTRLR0_DFS_MASK		GENMASK(4, 0)
+
+/* CTRLR1- Control Register 1 */
+#define CTRLR1_NDF_MASK		GENMASK(15, 0)
+
+/* SSIENR - SSI Enable Register */
+#define SSIENR_SSIC_EN_BIT	BIT(0)
+
+/* TXFTLR - Transmit FIFO Threshold Level */
+#define TXFTLR_TXFTHR_MASK	GENMASK(23, 16)
+#define TXFTLR_TFT_MASK		GENMASK(7, 0)
+
+/* RXFTLR - Receive FIFO Threshold Level */
+#define RXFTLR_RFT_MASK		GENMASK(7, 0)
+
+/* TXFLR - Transmit FIFO Level Register */
+#define TXFLR_TXTFL_MASK	GENMASK(7, 0)
+
+/* RXFLR - Receive FIFO Level Register */
+#define RXFLR_RXTFL_MASK	GENMASK(7, 0)
+
+/* SR - Status Register */
+#define SR_BUSY_BIT	        BIT(0)
+
+/* IMR - Interrupt Mask Register */
+#define IMR_TXEIM_BIT		BIT(0)
+#define IMR_TXOIM_BIT		BIT(1)
+#define IMR_RXUIM_BIT		BIT(2)
+#define IMR_RXOIM_BIT		BIT(3)
+#define IMR_RXFIM_BIT		BIT(4)
+#define IMR_MSTIM_BIT		BIT(5)
+
+/* ISR - Interrupt Status Register */
+#define ISR_TXEIS_BIT		BIT(0)
+#define ISR_TXOIS_BIT		BIT(1)
+#define ISR_RXUIS_BIT		BIT(2)
+#define ISR_RXOIS_BIT		BIT(3)
+#define ISR_RXFIS_BIT		BIT(4)
+#define ISR_MSTIS_BIT		BIT(5)
+
+/* SPI_CTRLR0 - SPI Control Register */
+#define SPI_CTRLR0_CLK_STRETCH_EN_BIT		BIT(30)
+#define SPI_CTRLR0_XIP_PREFETCH_EN_BIT		BIT(29)
+#define SPI_CTRLR0_XIP_MBL_BIT			BIT(26)
+#define SPI_CTRLR0_SPI_RXDS_SIG_EN_BIT		BIT(25)
+#define SPI_CTRLR0_SPI_DM_EN_BIT		BIT(24)
+#define SPI_CTRLR0_RXDS_VL_EN_BIT		BIT(23)
+#define SPI_CTRLR0_SSIC_XIP_CONT_XFER_EN_BIT	BIT(21)
+#define SPI_CTRLR0_XIP_INST_EN_BIT		BIT(20)
+#define SPI_CTRLR0_XIP_DFS_HC_BIT		BIT(19)
+#define SPI_CTRLR0_SPI_RXDS_EN_BIT		BIT(18)
+#define SPI_CTRLR0_INST_DDR_EN_BIT		BIT(17)
+#define SPI_CTRLR0_SPI_DDR_EN_BIT		BIT(16)
+#define SPI_CTRLR0_WAIT_CYCLES_MASK		GENMASK(15, 11)
+#define SPI_CTRLR0_WAIT_CYCLES_MAX		BIT_MASK(5)
+#define SPI_CTRLR0_INST_L_MASK			GENMASK(9, 8)
+#define SPI_CTRLR0_INST_L0			0UL
+#define SPI_CTRLR0_INST_L4			1UL
+#define SPI_CTRLR0_INST_L8			2UL
+#define SPI_CTRLR0_INST_L16			3UL
+#define SPI_CTRLR0_XIP_MD_BIT_EN_BIT		BIT(7)
+#define SPI_CTRLR0_ADDR_L_MASK			GENMASK(5, 2)
+#define SPI_CTRLR0_TRANS_TYPE_MASK		GENMASK(1, 0)
+#define SPI_CTRLR0_TRANS_TYPE_TT0		0UL
+#define SPI_CTRLR0_TRANS_TYPE_TT1		1UL
+#define SPI_CTRLR0_TRANS_TYPE_TT2		2UL
+#define SPI_CTRLR0_TRANS_TYPE_TT3		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_RXDS_SIG_EN_BIT	BIT(25)
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+#define XIP_CTRL_WAIT_CYCLES_MASK	GENMASK(17, 13)
+#define XIP_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_CTRL_MD_BITS_EN_BIT		BIT(12)
+#define XIP_CTRL_INST_L_MASK		GENMASK(10, 9)
+#define XIP_CTRL_INST_L0		0UL
+#define XIP_CTRL_INST_L4		1UL
+#define XIP_CTRL_INST_L8		2UL
+#define XIP_CTRL_INST_L16		3UL
+#define XIP_CTRL_ADDR_L_MASK		GENMASK(7, 4)
+#define XIP_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_CTRL_TRANS_TYPE_TT0		0UL
+#define XIP_CTRL_TRANS_TYPE_TT1		1UL
+#define XIP_CTRL_TRANS_TYPE_TT2		2UL
+#define XIP_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_CTRL_FRF_DUAL		1UL
+#define XIP_CTRL_FRF_QUAD		2UL
+#define XIP_CTRL_FRF_OCTAL		3UL
+
+/* XIP_CTRL - XIP Control Register */
+#define XIP_CTRL_XIP_PREFETCH_EN_BIT	BIT(28)
+#define XIP_CTRL_XIP_MBL_MASK		GENMASK(27, 26)
+#define XIP_CTRL_XIP_MBL_2		0UL
+#define XIP_CTRL_XIP_MBL_4		1UL
+#define XIP_CTRL_XIP_MBL_8		2UL
+#define XIP_CTRL_XIP_MBL_16		3UL
+#define XIP_CTRL_XIP_HYBERBUS_EN_BIT	BIT(24)
+#define XIP_CTRL_CONT_XFER_EN_BIT	BIT(23)
+#define XIP_CTRL_INST_EN_BIT		BIT(22)
+#define XIP_CTRL_RXDS_EN_BIT		BIT(21)
+#define XIP_CTRL_INST_DDR_EN_BIT	BIT(20)
+#define XIP_CTRL_DDR_EN_BIT		BIT(19)
+#define XIP_CTRL_DFS_HC_BIT		BIT(18)
+
+/* XIP_WRITE_CTRL - XIP Write Control Register */
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MASK	GENMASK(20, 16)
+#define XIP_WRITE_CTRL_WAIT_CYCLES_MAX	BIT_MASK(5)
+#define XIP_WRITE_CTRL_RXDS_SIG_EN_BIT	BIT(13)
+#define XIP_WRITE_CTRL_HYBERBUS_EN_BIT	BIT(12)
+#define XIP_WRITE_CTRL_INST_DDR_EN_BIT	BIT(11)
+#define XIP_WRITE_CTRL_SPI_DDR_EN_BIT	BIT(10)
+#define XIP_WRITE_CTRL_INST_L_MASK	GENMASK(9, 8)
+#define XIP_WRITE_CTRL_INST_L0		0UL
+#define XIP_WRITE_CTRL_INST_L4		1UL
+#define XIP_WRITE_CTRL_INST_L8		2UL
+#define XIP_WRITE_CTRL_INST_L16		3UL
+#define XIP_WRITE_CTRL_ADDR_L_MASK	GENMASK(7, 4)
+#define XIP_WRITE_CTRL_TRANS_TYPE_MASK	GENMASK(3, 2)
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT0	0UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT1	1UL
+#define XIP_WRITE_CTRL_TRANS_TYPE_TT2	2UL
+#define XIP_WRITE_CTRL_FRF_MASK		GENMASK(1, 0)
+#define XIP_WRITE_CTRL_FRF_DUAL		1UL
+#define XIP_WRITE_CTRL_FRF_QUAD		2UL
+#define XIP_WRITE_CTRL_FRF_OCTAL	3UL
+
+/* Register access helpers. */
+#define USES_AUX_REG(inst) + DT_INST_PROP(inst, aux_reg_enable)
+#define AUX_REG_INSTANCES (0 DT_INST_FOREACH_STATUS_OKAY(USES_AUX_REG))
+#define BASE_ADDR(dev) (mm_reg_t)DEVICE_MMIO_GET(dev)
+
+#if AUX_REG_INSTANCES != 0
+static uint32_t aux_reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_in32(BASE_ADDR(dev) + off/4);
+}
+static void aux_reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_out32(data, BASE_ADDR(dev) + off/4);
+}
+#endif
+
+#if AUX_REG_INSTANCES != DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+static uint32_t reg_read(const struct device *dev, uint32_t off)
+{
+	return sys_read32(BASE_ADDR(dev) + off);
+}
+static void reg_write(uint32_t data, const struct device *dev, uint32_t off)
+{
+	sys_write32(data, BASE_ADDR(dev) + off);
+}
+#endif
+
+#if AUX_REG_INSTANCES == 0
+/* If no instance uses aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ reg_write(data, dev, off); }
+
+#elif AUX_REG_INSTANCES == DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)
+/* If all instances use aux-reg access. */
+#define DECLARE_REG_ACCESS()
+#define DEFINE_REG_ACCESS(inst)
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ return aux_reg_read(dev, off); }
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ aux_reg_write(data, dev, off); }
+
+#else
+/* If register access varies by instance. */
+#define DECLARE_REG_ACCESS() \
+	uint32_t (*read)(const struct device *dev, uint32_t off); \
+	void (*write)(uint32_t data, const struct device *dev, uint32_t off)
+#define DEFINE_REG_ACCESS(inst) \
+	COND_CODE_1(DT_INST_PROP(inst, aux_reg_enable), \
+		(.read = aux_reg_read, \
+		.write = aux_reg_write,), \
+		(.read = reg_read, \
+		.write = reg_write,))
+#define DEFINE_MM_REG_RD(reg, off) \
+	static inline uint32_t read_##reg(const struct device *dev) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		return dev_config->read(dev, off); \
+	}
+#define DEFINE_MM_REG_WR(reg, off) \
+	static inline void write_##reg(const struct device *dev, uint32_t data) \
+	{ \
+		const struct mspi_dw_config *dev_config = dev->config; \
+		dev_config->write(data, dev, off); \
+	}
+#endif
diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h
new file mode 100644
index 0000000000000..4913e536c92d9
--- /dev/null
+++ b/drivers/mspi/mspi_dw_vendor_specific.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This header is part of mspi_dw.c extracted only for clarity.
+ * It is not supposed to be included by any file other than mspi_dw.c.
+ */
+
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+
+#include <nrf.h>
+
+static inline void vendor_specific_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+	NRF_EXMIF->INTENSET = BIT(EXMIF_INTENSET_CORE_Pos);
+}
+
+static inline void vendor_specific_suspend(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_STOP = 1;
+}
+
+static inline void vendor_specific_resume(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->TASKS_START = 1;
+}
+
+static inline void vendor_specific_irq_clear(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	NRF_EXMIF->EVENTS_CORE = 0;
+}
+
+#if defined(CONFIG_MSPI_XIP)
+static inline int vendor_specific_xip_enable(const struct device *dev,
+					     const struct mspi_dev_id *dev_id,
+					     const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF1.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF1.ENABLE = 1;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.OFFSET = cfg->address_offset;
+		NRF_EXMIF->EXTCONF2.SIZE = cfg->address_offset
+					 + cfg->size - 1;
+		NRF_EXMIF->EXTCONF2.ENABLE = 1;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static inline int vendor_specific_xip_disable(const struct device *dev,
+					      const struct mspi_dev_id *dev_id,
+					      const struct mspi_xip_cfg *cfg)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(cfg);
+
+	if (dev_id->dev_idx == 0) {
+		NRF_EXMIF->EXTCONF1.ENABLE = 0;
+	} else if (dev_id->dev_idx == 1) {
+		NRF_EXMIF->EXTCONF2.ENABLE = 0;
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+#endif /* defined(CONFIG_MSPI_XIP) */
+
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
diff --git a/drivers/net/CMakeLists.txt b/drivers/net/CMakeLists.txt
index 456d27c02e952..ba3e44fd1f4a0 100644
--- a/drivers/net/CMakeLists.txt
+++ b/drivers/net/CMakeLists.txt
@@ -14,7 +14,6 @@ if(CONFIG_NET_NATIVE_OFFLOADED_SOCKETS)
   zephyr_library_include_directories(
     ${ZEPHYR_BASE}/subsys/net/lib/sockets
   )
-  zephyr_library_sources(nsos_errno.c)
   zephyr_library_sources(nsos_fcntl.c)
   zephyr_library_sources(nsos_netdb.c)
   zephyr_library_sources(nsos_sockets.c)
@@ -23,7 +22,6 @@ if(CONFIG_NET_NATIVE_OFFLOADED_SOCKETS)
     -DNSOS_EPOLL_WAIT_INTERVAL=${CONFIG_NET_NATIVE_OFFLOADED_SOCKETS_EPOLL_WAIT_INTERVAL}
   )
   target_sources(native_simulator INTERFACE nsos_adapt.c)
-  target_sources(native_simulator INTERFACE nsos_errno.c)
   target_sources(native_simulator INTERFACE nsos_fcntl.c)
   target_sources(native_simulator INTERFACE nsos_netdb.c)
 endif()
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fc316d0f0296b..7b176606cfbb3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -249,6 +249,7 @@ menuconfig NET_NATIVE_OFFLOADED_SOCKETS
 	depends on ARCH_POSIX
 	depends on NATIVE_LIBRARY
 	depends on NET_SOCKETS_OFFLOAD
+	select NATIVE_USE_NSI_ERRNO
 	help
 	  Offloaded sockets for Native Simulator utilize host BSD sockets API (like socket(),
 	  connect(), send(), recvfrom(), etc.) in order to provide networking capability.
diff --git a/drivers/net/nsos_adapt.c b/drivers/net/nsos_adapt.c
index 09da353f73115..d1631efc651f7 100644
--- a/drivers/net/nsos_adapt.c
+++ b/drivers/net/nsos_adapt.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "nsos.h"
-#include "nsos_errno.h"
+#include "nsi_errno.h"
 #include "nsos_fcntl.h"
 #include "nsos_netdb.h"
 #include "nsos_socket.h"
@@ -56,7 +56,7 @@ static int nsos_adapt_nfds;
 
 int nsos_adapt_get_errno(void)
 {
-	return errno_to_nsos_mid(errno);
+	return nsi_errno_to_mid(errno);
 }
 
 static int socket_family_from_nsos_mid(int family_mid, int *family)
@@ -79,7 +79,7 @@ static int socket_family_from_nsos_mid(int family_mid, int *family)
 		break;
 	default:
 		nsi_print_warning("%s: socket family %d not supported\n", __func__, family_mid);
-		return -NSOS_MID_EAFNOSUPPORT;
+		return -NSI_ERRNO_MID_EAFNOSUPPORT;
 	}
 
 	return 0;
@@ -105,7 +105,7 @@ static int socket_family_to_nsos_mid(int family, int *family_mid)
 		break;
 	default:
 		nsi_print_warning("%s: socket family %d not supported\n", __func__, family);
-		return -NSOS_MID_EAFNOSUPPORT;
+		return -NSI_ERRNO_MID_EAFNOSUPPORT;
 	}
 
 	return 0;
@@ -143,7 +143,7 @@ static int socket_proto_from_nsos_mid(int proto_mid, int *proto)
 		break;
 	default:
 		nsi_print_warning("%s: socket protocol %d not supported\n", __func__, proto_mid);
-		return -NSOS_MID_EPROTONOSUPPORT;
+		return -NSI_ERRNO_MID_EPROTONOSUPPORT;
 	}
 
 	return 0;
@@ -181,7 +181,7 @@ static int socket_proto_to_nsos_mid(int proto, int *proto_mid)
 		break;
 	default:
 		nsi_print_warning("%s: socket protocol %d not supported\n", __func__, proto);
-		return -NSOS_MID_EPROTONOSUPPORT;
+		return -NSI_ERRNO_MID_EPROTONOSUPPORT;
 	}
 
 	return 0;
@@ -201,7 +201,7 @@ static int socket_type_from_nsos_mid(int type_mid, int *type)
 		break;
 	default:
 		nsi_print_warning("%s: socket type %d not supported\n", __func__, type_mid);
-		return -NSOS_MID_ESOCKTNOSUPPORT;
+		return -NSI_ERRNO_MID_ESOCKTNOSUPPORT;
 	}
 
 	return 0;
@@ -221,7 +221,7 @@ static int socket_type_to_nsos_mid(int type, int *type_mid)
 		break;
 	default:
 		nsi_print_warning("%s: socket type %d not supported\n", __func__, type);
-		return -NSOS_MID_ESOCKTNOSUPPORT;
+		return -NSI_ERRNO_MID_ESOCKTNOSUPPORT;
 	}
 
 	return 0;
@@ -241,7 +241,7 @@ static int socket_flags_from_nsos_mid(int flags_mid)
 				 &flags, MSG_WAITALL);
 
 	if (flags_mid != 0) {
-		return -NSOS_MID_EINVAL;
+		return -NSI_ERRNO_MID_EINVAL;
 	}
 
 	return flags;
@@ -271,7 +271,7 @@ int nsos_adapt_socket(int family_mid, int type_mid, int proto_mid)
 
 	ret = socket(family, type, proto);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return ret;
@@ -350,7 +350,7 @@ static int sockaddr_from_nsos_mid(struct sockaddr **addr, socklen_t *addrlen,
 	}
 	}
 
-	return -NSOS_MID_EINVAL;
+	return -NSI_ERRNO_MID_EINVAL;
 }
 
 static int sockaddr_to_nsos_mid(const struct sockaddr *addr, socklen_t addrlen,
@@ -437,7 +437,7 @@ static int sockaddr_to_nsos_mid(const struct sockaddr *addr, socklen_t addrlen,
 
 	nsi_print_warning("%s: socket family %d not supported\n", __func__, addr->sa_family);
 
-	return -NSOS_MID_EINVAL;
+	return -NSI_ERRNO_MID_EINVAL;
 }
 
 int nsos_adapt_bind(int fd, const struct nsos_mid_sockaddr *addr_mid, size_t addrlen_mid)
@@ -454,7 +454,7 @@ int nsos_adapt_bind(int fd, const struct nsos_mid_sockaddr *addr_mid, size_t add
 
 	ret = bind(fd, addr, addrlen);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return ret;
@@ -474,7 +474,7 @@ int nsos_adapt_connect(int fd, const struct nsos_mid_sockaddr *addr_mid, size_t
 
 	ret = connect(fd, addr, addrlen);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return ret;
@@ -486,7 +486,7 @@ int nsos_adapt_listen(int fd, int backlog)
 
 	ret = listen(fd, backlog);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return ret;
@@ -502,7 +502,7 @@ int nsos_adapt_accept(int fd, struct nsos_mid_sockaddr *addr_mid, size_t *addrle
 
 	ret = accept(fd, addr, &addrlen);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	err = sockaddr_to_nsos_mid(addr, addrlen, addr_mid, addrlen_mid);
@@ -531,7 +531,7 @@ int nsos_adapt_sendto(int fd, const void *buf, size_t len, int flags,
 		     socket_flags_from_nsos_mid(flags) | MSG_NOSIGNAL,
 		     addr, addrlen);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return ret;
@@ -572,7 +572,7 @@ int nsos_adapt_sendmsg(int fd, const struct nsos_mid_msghdr *msg_mid, int flags)
 
 	ret = sendmsg(fd, &msg, socket_flags_from_nsos_mid(flags) | MSG_NOSIGNAL);
 	if (ret < 0) {
-		ret = -errno_to_nsos_mid(errno);
+		ret = -nsi_errno_to_mid(errno);
 	}
 
 	free(msg_iov);
@@ -592,7 +592,7 @@ int nsos_adapt_recvfrom(int fd, void *buf, size_t len, int flags,
 	ret = recvfrom(fd, buf, len, socket_flags_from_nsos_mid(flags),
 		       addr, &addrlen);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	err = sockaddr_to_nsos_mid(addr, addrlen, addr_mid, addrlen_mid);
@@ -611,7 +611,7 @@ static int nsos_adapt_getsockopt_int(int fd, int level, int optname,
 
 	ret = getsockopt(fd, level, optname, optval, &optlen);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	*nsos_mid_optlen = optlen;
@@ -632,10 +632,10 @@ int nsos_adapt_getsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 
 			ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &optlen);
 			if (ret < 0) {
-				return -errno_to_nsos_mid(errno);
+				return -nsi_errno_to_mid(errno);
 			}
 
-			*(int *)nsos_mid_optval = errno_to_nsos_mid(err);
+			*(int *)nsos_mid_optval = nsi_errno_to_mid(err);
 
 			return 0;
 		}
@@ -647,7 +647,7 @@ int nsos_adapt_getsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 
 			ret = getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &optlen);
 			if (ret < 0) {
-				return -errno_to_nsos_mid(errno);
+				return -nsi_errno_to_mid(errno);
 			}
 
 			err = socket_type_to_nsos_mid(type, nsos_mid_optval);
@@ -665,7 +665,7 @@ int nsos_adapt_getsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 
 			ret = getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &proto, &optlen);
 			if (ret < 0) {
-				return -errno_to_nsos_mid(errno);
+				return -nsi_errno_to_mid(errno);
 			}
 
 			err = socket_proto_to_nsos_mid(proto, nsos_mid_optval);
@@ -683,7 +683,7 @@ int nsos_adapt_getsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 
 			ret = getsockopt(fd, SOL_SOCKET, SO_DOMAIN, &family, &optlen);
 			if (ret < 0) {
-				return -errno_to_nsos_mid(errno);
+				return -nsi_errno_to_mid(errno);
 			}
 
 			err = socket_family_to_nsos_mid(family, nsos_mid_optval);
@@ -740,7 +740,7 @@ int nsos_adapt_getsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 		break;
 	}
 
-	return -NSOS_MID_EOPNOTSUPP;
+	return -NSI_ERRNO_MID_EOPNOTSUPP;
 }
 
 static int nsos_adapt_setsockopt_int(int fd, int level, int optname,
@@ -750,7 +750,7 @@ static int nsos_adapt_setsockopt_int(int fd, int level, int optname,
 
 	ret = setsockopt(fd, level, optname, optval, optlen);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return 0;
@@ -777,7 +777,7 @@ int nsos_adapt_setsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 			ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO,
 					 &tv, sizeof(tv));
 			if (ret < 0) {
-				return -errno_to_nsos_mid(errno);
+				return -nsi_errno_to_mid(errno);
 			}
 
 			return 0;
@@ -793,7 +793,7 @@ int nsos_adapt_setsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 			ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO,
 					 &tv, sizeof(tv));
 			if (ret < 0) {
-				return -errno_to_nsos_mid(errno);
+				return -nsi_errno_to_mid(errno);
 			}
 
 			return 0;
@@ -845,7 +845,7 @@ int nsos_adapt_setsockopt(int fd, int nsos_mid_level, int nsos_mid_optname,
 		break;
 	}
 
-	return -NSOS_MID_EOPNOTSUPP;
+	return -NSI_ERRNO_MID_EOPNOTSUPP;
 }
 
 #define MAP_POLL_EPOLL(_event_from, _event_to)	\
@@ -958,7 +958,7 @@ static int addrinfo_to_nsos_mid(struct addrinfo *res,
 
 	nsos_res_wraps = calloc(n_res, sizeof(*nsos_res_wraps));
 	if (!nsos_res_wraps) {
-		return -NSOS_MID_ENOMEM;
+		return -NSI_ERRNO_MID_ENOMEM;
 	}
 
 	for (struct addrinfo *res_p = res; res_p; res_p = res_p->ai_next, idx_res++) {
@@ -1092,7 +1092,7 @@ int nsos_adapt_fcntl_setfl(int fd, int flags)
 
 	ret = fcntl(fd, F_SETFL, fl_from_nsos_mid(flags));
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return 0;
@@ -1104,7 +1104,7 @@ int nsos_adapt_fionread(int fd, int *avail)
 
 	ret = ioctl(fd, FIONREAD, avail);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return 0;
@@ -1116,7 +1116,7 @@ int nsos_adapt_dup(int oldfd)
 
 	ret = dup(oldfd);
 	if (ret < 0) {
-		return -errno_to_nsos_mid(errno);
+		return -nsi_errno_to_mid(errno);
 	}
 
 	return ret;
diff --git a/drivers/net/nsos_errno.c b/drivers/net/nsos_errno.c
deleted file mode 100644
index 417c1af4f062e..0000000000000
--- a/drivers/net/nsos_errno.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Copyright (c) 2023-2024 Marcin Niestroj
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "nsos_errno.h"
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-#endif
-
-struct nsos_mid_errno_map {
-	/** Zephyr/host error code */
-	int err;
-	/** NSOS middleground error code */
-	int mid_err;
-};
-
-#define ERR(_name)				\
-	{ _name, NSOS_MID_ ## _name }
-
-static const struct nsos_mid_errno_map map[] = {
-	ERR(EPERM),
-	ERR(ENOENT),
-	ERR(ESRCH),
-	ERR(EINTR),
-	ERR(EIO),
-	ERR(ENXIO),
-	ERR(E2BIG),
-	ERR(ENOEXEC),
-	ERR(EBADF),
-	ERR(ECHILD),
-	ERR(EAGAIN),
-	ERR(ENOMEM),
-	ERR(EACCES),
-	ERR(EFAULT),
-	ERR(ENOTBLK),
-	ERR(EBUSY),
-	ERR(EEXIST),
-	ERR(EXDEV),
-	ERR(ENODEV),
-	ERR(ENOTDIR),
-	ERR(EISDIR),
-	ERR(EINVAL),
-	ERR(ENFILE),
-	ERR(EMFILE),
-	ERR(ENOTTY),
-	ERR(ETXTBSY),
-	ERR(EFBIG),
-	ERR(ENOSPC),
-	ERR(ESPIPE),
-	ERR(EROFS),
-	ERR(EMLINK),
-	ERR(EPIPE),
-	ERR(EDOM),
-	ERR(ERANGE),
-	ERR(ENOMSG),
-	ERR(EDEADLK),
-	ERR(ENOLCK),
-	ERR(ENOSTR),
-	ERR(ENODATA),
-	ERR(ETIME),
-	ERR(ENOSR),
-	ERR(EPROTO),
-	ERR(EBADMSG),
-	ERR(ENOSYS),
-	ERR(ENOTEMPTY),
-	ERR(ENAMETOOLONG),
-	ERR(ELOOP),
-	ERR(EOPNOTSUPP),
-	ERR(EPFNOSUPPORT),
-	ERR(ECONNRESET),
-	ERR(ENOBUFS),
-	ERR(EAFNOSUPPORT),
-	ERR(EPROTOTYPE),
-	ERR(ENOTSOCK),
-	ERR(ENOPROTOOPT),
-	ERR(ESHUTDOWN),
-	ERR(ECONNREFUSED),
-	ERR(EADDRINUSE),
-	ERR(ECONNABORTED),
-	ERR(ENETUNREACH),
-	ERR(ENETDOWN),
-	ERR(ETIMEDOUT),
-	ERR(EHOSTDOWN),
-	ERR(EHOSTUNREACH),
-	ERR(EINPROGRESS),
-	ERR(EALREADY),
-	ERR(EDESTADDRREQ),
-	ERR(EMSGSIZE),
-	ERR(EPROTONOSUPPORT),
-	ERR(ESOCKTNOSUPPORT),
-	ERR(EADDRNOTAVAIL),
-	ERR(ENETRESET),
-	ERR(EISCONN),
-	ERR(ENOTCONN),
-	ERR(ETOOMANYREFS),
-	ERR(ENOTSUP),
-	ERR(EILSEQ),
-	ERR(EOVERFLOW),
-	ERR(ECANCELED),
-};
-
-int errno_to_nsos_mid(int err)
-{
-	for (int i = 0; i < ARRAY_SIZE(map); i++) {
-		if (map[i].err == err) {
-			return map[i].mid_err;
-		}
-	}
-
-	return err;
-}
-
-int errno_from_nsos_mid(int err)
-{
-	for (int i = 0; i < ARRAY_SIZE(map); i++) {
-		if (map[i].mid_err == err) {
-			return map[i].err;
-		}
-	}
-
-	return err;
-}
diff --git a/drivers/net/nsos_errno.h b/drivers/net/nsos_errno.h
deleted file mode 100644
index 8e9b6214671e8..0000000000000
--- a/drivers/net/nsos_errno.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2023-2024 Marcin Niestroj
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef __DRIVERS_NET_NSOS_ERRNO_H__
-#define __DRIVERS_NET_NSOS_ERRNO_H__
-
-#include <errno.h>
-
-#define NSOS_MID_EPERM 1         /**< Not owner */
-#define NSOS_MID_ENOENT 2        /**< No such file or directory */
-#define NSOS_MID_ESRCH 3         /**< No such context */
-#define NSOS_MID_EINTR 4         /**< Interrupted system call */
-#define NSOS_MID_EIO 5           /**< I/O error */
-#define NSOS_MID_ENXIO 6         /**< No such device or address */
-#define NSOS_MID_E2BIG 7         /**< Arg list too long */
-#define NSOS_MID_ENOEXEC 8       /**< Exec format error */
-#define NSOS_MID_EBADF 9         /**< Bad file number */
-#define NSOS_MID_ECHILD 10       /**< No children */
-#define NSOS_MID_EAGAIN 11       /**< No more contexts */
-#define NSOS_MID_ENOMEM 12       /**< Not enough core */
-#define NSOS_MID_EACCES 13       /**< Permission denied */
-#define NSOS_MID_EFAULT 14       /**< Bad address */
-#define NSOS_MID_ENOTBLK 15      /**< Block device required */
-#define NSOS_MID_EBUSY 16        /**< Mount device busy */
-#define NSOS_MID_EEXIST 17       /**< File exists */
-#define NSOS_MID_EXDEV 18        /**< Cross-device link */
-#define NSOS_MID_ENODEV 19       /**< No such device */
-#define NSOS_MID_ENOTDIR 20      /**< Not a directory */
-#define NSOS_MID_EISDIR 21       /**< Is a directory */
-#define NSOS_MID_EINVAL 22       /**< Invalid argument */
-#define NSOS_MID_ENFILE 23       /**< File table overflow */
-#define NSOS_MID_EMFILE 24       /**< Too many open files */
-#define NSOS_MID_ENOTTY 25       /**< Not a typewriter */
-#define NSOS_MID_ETXTBSY 26      /**< Text file busy */
-#define NSOS_MID_EFBIG 27        /**< File too large */
-#define NSOS_MID_ENOSPC 28       /**< No space left on device */
-#define NSOS_MID_ESPIPE 29       /**< Illegal seek */
-#define NSOS_MID_EROFS 30        /**< Read-only file system */
-#define NSOS_MID_EMLINK 31       /**< Too many links */
-#define NSOS_MID_EPIPE 32        /**< Broken pipe */
-#define NSOS_MID_EDOM 33         /**< Argument too large */
-#define NSOS_MID_ERANGE 34       /**< Result too large */
-#define NSOS_MID_ENOMSG 35       /**< Unexpected message type */
-#define NSOS_MID_EDEADLK 45      /**< Resource deadlock avoided */
-#define NSOS_MID_ENOLCK 46       /**< No locks available */
-#define NSOS_MID_ENOSTR 60       /**< STREAMS device required */
-#define NSOS_MID_ENODATA 61      /**< Missing expected message data */
-#define NSOS_MID_ETIME 62        /**< STREAMS timeout occurred */
-#define NSOS_MID_ENOSR 63        /**< Insufficient memory */
-#define NSOS_MID_EPROTO 71       /**< Generic STREAMS error */
-#define NSOS_MID_EBADMSG 77      /**< Invalid STREAMS message */
-#define NSOS_MID_ENOSYS 88       /**< Function not implemented */
-#define NSOS_MID_ENOTEMPTY 90    /**< Directory not empty */
-#define NSOS_MID_ENAMETOOLONG 91 /**< File name too long */
-#define NSOS_MID_ELOOP 92        /**< Too many levels of symbolic links */
-#define NSOS_MID_EOPNOTSUPP 95   /**< Operation not supported on socket */
-#define NSOS_MID_EPFNOSUPPORT 96 /**< Protocol family not supported */
-#define NSOS_MID_ECONNRESET 104   /**< Connection reset by peer */
-#define NSOS_MID_ENOBUFS 105      /**< No buffer space available */
-#define NSOS_MID_EAFNOSUPPORT 106 /**< Addr family not supported */
-#define NSOS_MID_EPROTOTYPE 107   /**< Protocol wrong type for socket */
-#define NSOS_MID_ENOTSOCK 108     /**< Socket operation on non-socket */
-#define NSOS_MID_ENOPROTOOPT 109  /**< Protocol not available */
-#define NSOS_MID_ESHUTDOWN 110    /**< Can't send after socket shutdown */
-#define NSOS_MID_ECONNREFUSED 111 /**< Connection refused */
-#define NSOS_MID_EADDRINUSE 112   /**< Address already in use */
-#define NSOS_MID_ECONNABORTED 113 /**< Software caused connection abort */
-#define NSOS_MID_ENETUNREACH 114  /**< Network is unreachable */
-#define NSOS_MID_ENETDOWN 115     /**< Network is down */
-#define NSOS_MID_ETIMEDOUT 116    /**< Connection timed out */
-#define NSOS_MID_EHOSTDOWN 117    /**< Host is down */
-#define NSOS_MID_EHOSTUNREACH 118 /**< No route to host */
-#define NSOS_MID_EINPROGRESS 119  /**< Operation now in progress */
-#define NSOS_MID_EALREADY 120     /**< Operation already in progress */
-#define NSOS_MID_EDESTADDRREQ 121 /**< Destination address required */
-#define NSOS_MID_EMSGSIZE 122        /**< Message size */
-#define NSOS_MID_EPROTONOSUPPORT 123 /**< Protocol not supported */
-#define NSOS_MID_ESOCKTNOSUPPORT 124 /**< Socket type not supported */
-#define NSOS_MID_EADDRNOTAVAIL 125   /**< Can't assign requested address */
-#define NSOS_MID_ENETRESET 126       /**< Network dropped connection on reset */
-#define NSOS_MID_EISCONN 127         /**< Socket is already connected */
-#define NSOS_MID_ENOTCONN 128        /**< Socket is not connected */
-#define NSOS_MID_ETOOMANYREFS 129    /**< Too many references: can't splice */
-#define NSOS_MID_ENOTSUP 134         /**< Unsupported value */
-#define NSOS_MID_EILSEQ 138          /**< Illegal byte sequence */
-#define NSOS_MID_EOVERFLOW 139       /**< Value overflow */
-#define NSOS_MID_ECANCELED 140       /**< Operation canceled */
-
-int errno_to_nsos_mid(int err);
-int errno_from_nsos_mid(int err);
-
-#endif /* __DRIVERS_NET_NSOS_ERRNO_H__ */
diff --git a/drivers/net/nsos_fcntl.c b/drivers/net/nsos_fcntl.c
index ab4d22ce51a24..ad6a61285c921 100644
--- a/drivers/net/nsos_fcntl.c
+++ b/drivers/net/nsos_fcntl.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "nsos_errno.h"
+#include "nsi_errno.h"
 #include "nsos_fcntl.h"
 
 #include <stdbool.h>
@@ -51,7 +51,7 @@ static int fl_to_nsos_mid_(int flags, bool strict)
 #undef TO_NSOS_MID
 
 	if (strict && flags != 0) {
-		return -NSOS_MID_EINVAL;
+		return -NSI_ERRNO_MID_EINVAL;
 	}
 
 	return flags_mid;
diff --git a/drivers/net/nsos_sockets.c b/drivers/net/nsos_sockets.c
index 7aa4e3cb9245b..a4a29605ef021 100644
--- a/drivers/net/nsos_sockets.c
+++ b/drivers/net/nsos_sockets.c
@@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(nsos_sockets);
 
 #include "sockets_internal.h"
 #include "nsos.h"
-#include "nsos_errno.h"
+#include "nsi_errno.h"
 #include "nsos_fcntl.h"
 #include "nsos_netdb.h"
 #include "nsos_socket.h"
@@ -79,7 +79,7 @@ static int socket_family_to_nsos_mid(int family, int *family_mid)
 		*family_mid = NSOS_MID_AF_PACKET;
 		break;
 	default:
-		return -NSOS_MID_EAFNOSUPPORT;
+		return -NSI_ERRNO_MID_EAFNOSUPPORT;
 	}
 
 	return 0;
@@ -116,7 +116,7 @@ static int socket_proto_to_nsos_mid(int proto, int *proto_mid)
 		*proto_mid = NSOS_MID_IPPROTO_ETH_P_ALL;
 		break;
 	default:
-		return -NSOS_MID_EPROTONOSUPPORT;
+		return -NSI_ERRNO_MID_EPROTONOSUPPORT;
 	}
 
 	return 0;
@@ -135,7 +135,7 @@ static int socket_type_to_nsos_mid(int type, int *type_mid)
 		*type_mid = NSOS_MID_SOCK_RAW;
 		break;
 	default:
-		return -NSOS_MID_ESOCKTNOSUPPORT;
+		return -NSI_ERRNO_MID_ESOCKTNOSUPPORT;
 	}
 
 	return 0;
@@ -155,7 +155,7 @@ static int socket_flags_to_nsos_mid(int flags)
 				 &flags_mid, NSOS_MID_MSG_WAITALL);
 
 	if (flags != 0) {
-		return -NSOS_MID_EINVAL;
+		return -NSI_ERRNO_MID_EINVAL;
 	}
 
 	return flags_mid;
@@ -174,19 +174,19 @@ static int nsos_socket_create(int family, int type, int proto)
 
 	err = socket_family_to_nsos_mid(family, &family_mid);
 	if (err) {
-		errno = errno_from_nsos_mid(-err);
+		errno = nsi_errno_from_mid(-err);
 		return -1;
 	}
 
 	err = socket_type_to_nsos_mid(type, &type_mid);
 	if (err) {
-		errno = errno_from_nsos_mid(-err);
+		errno = nsi_errno_from_mid(-err);
 		return -1;
 	}
 
 	err = socket_proto_to_nsos_mid(proto, &proto_mid);
 	if (err) {
-		errno = errno_from_nsos_mid(-err);
+		errno = nsi_errno_from_mid(-err);
 		return -1;
 	}
 
@@ -207,7 +207,7 @@ static int nsos_socket_create(int family, int type, int proto)
 
 	sock->poll.mid.fd = nsos_adapt_socket(family_mid, type_mid, proto_mid);
 	if (sock->poll.mid.fd < 0) {
-		errno = errno_from_nsos_mid(-sock->poll.mid.fd);
+		errno = nsi_errno_from_mid(-sock->poll.mid.fd);
 		goto free_sock;
 	}
 
@@ -226,7 +226,7 @@ static int nsos_socket_create(int family, int type, int proto)
 
 static int nsos_adapt_get_zephyr_errno(void)
 {
-	return errno_from_nsos_mid(nsos_adapt_get_errno());
+	return nsi_errno_from_mid(nsos_adapt_get_errno());
 }
 
 static ssize_t nsos_read(void *obj, void *buf, size_t sz)
@@ -395,12 +395,12 @@ static int nsos_ioctl(void *obj, unsigned int request, va_list args)
 
 		ret = fl_to_nsos_mid_strict(flags);
 		if (ret < 0) {
-			return -errno_from_nsos_mid(-ret);
+			return -nsi_errno_from_mid(-ret);
 		}
 
 		ret = nsos_adapt_fcntl_setfl(sock->poll.mid.fd, flags);
 
-		return -errno_from_nsos_mid(-ret);
+		return -nsi_errno_from_mid(-ret);
 	}
 
 	case ZFD_IOCTL_FIONREAD: {
@@ -409,7 +409,7 @@ static int nsos_ioctl(void *obj, unsigned int request, va_list args)
 
 		ret = nsos_adapt_fionread(sock->poll.mid.fd, avail);
 
-		return -errno_from_nsos_mid(-ret);
+		return -nsi_errno_from_mid(-ret);
 	}
 	}
 
@@ -434,7 +434,7 @@ static int sockaddr_to_nsos_mid(const struct sockaddr *addr, socklen_t addrlen,
 			(struct nsos_mid_sockaddr_in *)*addr_mid;
 
 		if (addrlen < sizeof(*addr_in)) {
-			return -NSOS_MID_EINVAL;
+			return -NSI_ERRNO_MID_EINVAL;
 		}
 
 		addr_in_mid->sin_family = NSOS_MID_AF_INET;
@@ -452,7 +452,7 @@ static int sockaddr_to_nsos_mid(const struct sockaddr *addr, socklen_t addrlen,
 			(struct nsos_mid_sockaddr_in6 *)*addr_mid;
 
 		if (addrlen < sizeof(*addr_in)) {
-			return -NSOS_MID_EINVAL;
+			return -NSI_ERRNO_MID_EINVAL;
 		}
 
 		addr_in_mid->sin6_family = NSOS_MID_AF_INET6;
@@ -472,7 +472,7 @@ static int sockaddr_to_nsos_mid(const struct sockaddr *addr, socklen_t addrlen,
 			(struct nsos_mid_sockaddr_un *)*addr_mid;
 
 		if (addrlen < sizeof(*addr_un)) {
-			return -NSOS_MID_EINVAL;
+			return -NSI_ERRNO_MID_EINVAL;
 		}
 
 		addr_un_mid->sun_family = NSOS_MID_AF_UNIX;
@@ -490,7 +490,7 @@ static int sockaddr_to_nsos_mid(const struct sockaddr *addr, socklen_t addrlen,
 			(struct nsos_mid_sockaddr_ll *)*addr_mid;
 
 		if (addrlen < sizeof(*addr_ll)) {
-			return -NSOS_MID_EINVAL;
+			return -NSI_ERRNO_MID_EINVAL;
 		}
 
 		addr_ll_mid->sll_family = NSOS_MID_AF_UNIX;
@@ -508,7 +508,7 @@ static int sockaddr_to_nsos_mid(const struct sockaddr *addr, socklen_t addrlen,
 	}
 	}
 
-	return -NSOS_MID_EINVAL;
+	return -NSI_ERRNO_MID_EINVAL;
 }
 
 static int sockaddr_from_nsos_mid(struct sockaddr *addr, socklen_t *addrlen,
@@ -551,7 +551,7 @@ static int sockaddr_from_nsos_mid(struct sockaddr *addr, socklen_t *addrlen,
 	}
 	}
 
-	return -NSOS_MID_EINVAL;
+	return -NSI_ERRNO_MID_EINVAL;
 }
 
 static int nsos_wait_for_poll(struct nsos_socket *sock, int events,
@@ -598,7 +598,7 @@ static int nsos_wait_for_poll(struct nsos_socket *sock, int events,
 
 return_ret:
 	if (ret < 0) {
-		return -errno_to_nsos_mid(-ret);
+		return -nsi_errno_to_mid(-ret);
 	}
 
 	return 0;
@@ -641,7 +641,7 @@ static int nsos_bind(void *obj, const struct sockaddr *addr, socklen_t addrlen)
 
 return_ret:
 	if (ret < 0) {
-		errno = errno_from_nsos_mid(-ret);
+		errno = nsi_errno_from_mid(-ret);
 		return -1;
 	}
 
@@ -662,7 +662,7 @@ static int nsos_connect_blocking(struct nsos_socket *sock,
 	}
 
 	ret = nsos_adapt_connect(sock->poll.mid.fd, addr_mid, addrlen_mid);
-	if (ret == -NSOS_MID_EINPROGRESS) {
+	if (ret == -NSI_ERRNO_MID_EINPROGRESS) {
 		int so_err;
 		size_t so_err_len = sizeof(so_err);
 
@@ -677,7 +677,7 @@ static int nsos_connect_blocking(struct nsos_socket *sock,
 			goto clear_nonblock;
 		}
 
-		ret = so_err;
+		ret = -nsi_errno_to_mid(so_err);
 	}
 
 clear_nonblock:
@@ -713,7 +713,7 @@ static int nsos_connect(void *obj, const struct sockaddr *addr, socklen_t addrle
 
 return_ret:
 	if (ret < 0) {
-		errno = errno_from_nsos_mid(-ret);
+		errno = nsi_errno_from_mid(-ret);
 		return -1;
 	}
 
@@ -727,7 +727,7 @@ static int nsos_listen(void *obj, int backlog)
 
 	ret = nsos_adapt_listen(sock->poll.mid.fd, backlog);
 	if (ret < 0) {
-		errno = errno_from_nsos_mid(-ret);
+		errno = nsi_errno_from_mid(-ret);
 		return -1;
 	}
 
@@ -765,13 +765,13 @@ static int nsos_accept(void *obj, struct sockaddr *addr, socklen_t *addrlen)
 
 	zephyr_fd = zvfs_reserve_fd();
 	if (zephyr_fd < 0) {
-		ret = -errno_to_nsos_mid(-zephyr_fd);
+		ret = -nsi_errno_to_mid(-zephyr_fd);
 		goto close_adapt_fd;
 	}
 
 	conn_sock = k_malloc(sizeof(*conn_sock));
 	if (!conn_sock) {
-		ret = -NSOS_MID_ENOMEM;
+		ret = -NSI_ERRNO_MID_ENOMEM;
 		goto free_zephyr_fd;
 	}
 
@@ -790,7 +790,7 @@ static int nsos_accept(void *obj, struct sockaddr *addr, socklen_t *addrlen)
 	nsi_host_close(adapt_fd);
 
 return_ret:
-	errno = errno_from_nsos_mid(-ret);
+	errno = nsi_errno_from_mid(-ret);
 	return -1;
 }
 
@@ -826,7 +826,7 @@ static ssize_t nsos_sendto(void *obj, const void *buf, size_t len, int flags,
 
 return_ret:
 	if (ret < 0) {
-		errno = errno_from_nsos_mid(-ret);
+		errno = nsi_errno_from_mid(-ret);
 		return -1;
 	}
 
@@ -858,7 +858,7 @@ static ssize_t nsos_sendmsg(void *obj, const struct msghdr *msg, int flags)
 
 	msg_iov = k_calloc(msg->msg_iovlen, sizeof(*msg_iov));
 	if (!msg_iov) {
-		ret = -NSOS_MID_ENOMEM;
+		ret = -NSI_ERRNO_MID_ENOMEM;
 		goto return_ret;
 	}
 
@@ -887,7 +887,7 @@ static ssize_t nsos_sendmsg(void *obj, const struct msghdr *msg, int flags)
 
 return_ret:
 	if (ret < 0) {
-		errno = errno_from_nsos_mid(-ret);
+		errno = nsi_errno_from_mid(-ret);
 		return -1;
 	}
 
@@ -926,7 +926,7 @@ static ssize_t nsos_recvfrom(void *obj, void *buf, size_t len, int flags,
 
 return_ret:
 	if (ret < 0) {
-		errno = errno_from_nsos_mid(-ret);
+		errno = nsi_errno_from_mid(-ret);
 		return -1;
 	}
 
@@ -952,7 +952,7 @@ static int socket_type_from_nsos_mid(int type_mid, int *type)
 		*type = SOCK_RAW;
 		break;
 	default:
-		return -NSOS_MID_ESOCKTNOSUPPORT;
+		return -NSI_ERRNO_MID_ESOCKTNOSUPPORT;
 	}
 
 	return 0;
@@ -989,7 +989,7 @@ static int socket_proto_from_nsos_mid(int proto_mid, int *proto)
 		*proto = htons(IPPROTO_ETH_P_ALL);
 		break;
 	default:
-		return -NSOS_MID_EPROTONOSUPPORT;
+		return -NSI_ERRNO_MID_EPROTONOSUPPORT;
 	}
 
 	return 0;
@@ -1014,7 +1014,7 @@ static int socket_family_from_nsos_mid(int family_mid, int *family)
 		*family = AF_PACKET;
 		break;
 	default:
-		return -NSOS_MID_EAFNOSUPPORT;
+		return -NSI_ERRNO_MID_EAFNOSUPPORT;
 	}
 
 	return 0;
@@ -1034,7 +1034,7 @@ static int nsos_getsockopt_int(struct nsos_socket *sock, int nsos_mid_level, int
 	err = nsos_adapt_getsockopt(sock->poll.mid.fd, NSOS_MID_SOL_SOCKET,
 				    NSOS_MID_SO_KEEPALIVE, optval, &nsos_mid_optlen);
 	if (err) {
-		errno = errno_from_nsos_mid(-err);
+		errno = nsi_errno_from_mid(-err);
 		return -1;
 	}
 
@@ -1063,11 +1063,11 @@ static int nsos_getsockopt(void *obj, int level, int optname,
 			err = nsos_adapt_getsockopt(sock->poll.mid.fd, NSOS_MID_SOL_SOCKET,
 						    NSOS_MID_SO_ERROR, &nsos_mid_err, NULL);
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
-			*(int *)optval = errno_from_nsos_mid(nsos_mid_err);
+			*(int *)optval = nsi_errno_from_mid(nsos_mid_err);
 
 			return 0;
 		}
@@ -1083,13 +1083,13 @@ static int nsos_getsockopt(void *obj, int level, int optname,
 			err = nsos_adapt_getsockopt(sock->poll.mid.fd, NSOS_MID_SOL_SOCKET,
 						    NSOS_MID_SO_TYPE, &nsos_mid_type, NULL);
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
 			err = socket_type_from_nsos_mid(nsos_mid_type, optval);
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
@@ -1107,13 +1107,13 @@ static int nsos_getsockopt(void *obj, int level, int optname,
 			err = nsos_adapt_getsockopt(sock->poll.mid.fd, NSOS_MID_SOL_SOCKET,
 						    NSOS_MID_SO_PROTOCOL, &nsos_mid_proto, NULL);
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
 			err = socket_proto_from_nsos_mid(nsos_mid_proto, optval);
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
@@ -1131,13 +1131,13 @@ static int nsos_getsockopt(void *obj, int level, int optname,
 			err = nsos_adapt_getsockopt(sock->poll.mid.fd, NSOS_MID_SOL_SOCKET,
 						    NSOS_MID_SO_DOMAIN, &nsos_mid_family, NULL);
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
 			err = socket_family_from_nsos_mid(nsos_mid_family, optval);
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
@@ -1214,7 +1214,7 @@ static int nsos_setsockopt_int(struct nsos_socket *sock, int nsos_mid_level, int
 	err = nsos_adapt_setsockopt(sock->poll.mid.fd, nsos_mid_level, nsos_mid_optname,
 				    optval, optlen);
 	if (err) {
-		errno = errno_from_nsos_mid(-err);
+		errno = nsi_errno_from_mid(-err);
 		return -1;
 	}
 
@@ -1244,7 +1244,7 @@ static int nsos_setsockopt(void *obj, int level, int optname,
 						    NSOS_MID_SO_PRIORITY, &nsos_mid_priority,
 						    sizeof(nsos_mid_priority));
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
@@ -1267,7 +1267,7 @@ static int nsos_setsockopt(void *obj, int level, int optname,
 						    NSOS_MID_SO_RCVTIMEO, &nsos_mid_tv,
 						    sizeof(nsos_mid_tv));
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
@@ -1296,7 +1296,7 @@ static int nsos_setsockopt(void *obj, int level, int optname,
 						    NSOS_MID_SO_SNDTIMEO, &nsos_mid_tv,
 						    sizeof(nsos_mid_tv));
 			if (err) {
-				errno = errno_from_nsos_mid(-err);
+				errno = nsi_errno_from_mid(-err);
 				return -1;
 			}
 
@@ -1512,7 +1512,7 @@ static int nsos_getaddrinfo(const char *node, const char *service,
 				     &system_errno);
 	if (ret < 0) {
 		if (ret == NSOS_MID_EAI_SYSTEM) {
-			errno = errno_from_nsos_mid(system_errno);
+			errno = nsi_errno_from_mid(system_errno);
 		}
 
 		return eai_from_nsos_mid(ret);
diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c
index 99d3eef881f97..022e728e755bb 100644
--- a/drivers/net/ppp.c
+++ b/drivers/net/ppp.c
@@ -976,8 +976,7 @@ static int ppp_driver_init(const struct device *dev)
 
 static inline struct net_linkaddr *ppp_get_mac(struct ppp_driver_context *ppp)
 {
-	ppp->ll_addr.addr = ppp->mac_addr;
-	ppp->ll_addr.len = sizeof(ppp->mac_addr);
+	(void)net_linkaddr_set(&ppp->ll_addr, ppp->mac_addr, sizeof(ppp->mac_addr));
 
 	return &ppp->ll_addr;
 }
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index c9f9fd7bb62fc..cea09b9f570c7 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -366,8 +366,8 @@ int slip_init(const struct device *dev)
 
 static inline struct net_linkaddr *slip_get_mac(struct slip_context *slip)
 {
-	slip->ll_addr.addr = slip->mac_addr;
-	slip->ll_addr.len = sizeof(slip->mac_addr);
+	(void)net_linkaddr_set(&slip->ll_addr, slip->mac_addr,
+			       sizeof(slip->mac_addr));
 
 	return &slip->ll_addr;
 }
diff --git a/drivers/pinctrl/CMakeLists.txt b/drivers/pinctrl/CMakeLists.txt
index 08ecc2fc65e70..cc5d1c18a532d 100644
--- a/drivers/pinctrl/CMakeLists.txt
+++ b/drivers/pinctrl/CMakeLists.txt
@@ -1,10 +1,14 @@
 # Copyright (c) 2021 Nordic Semiconductor ASA
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library()
 zephyr_library_sources(common.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_TELINK_B91 pinctrl_b91.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_AMBIQ pinctrl_ambiq.c)
+zephyr_library_sources_ifdef(CONFIG_PINCTRL_ARM_MPS2 pinctrl_arm_mps2.c)
+zephyr_library_sources_ifdef(CONFIG_PINCTRL_ARM_MPS3 pinctrl_arm_mps3.c)
+zephyr_library_sources_ifdef(CONFIG_PINCTRL_ARM_V2M_BEETLE pinctrl_arm_v2m_beetle.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_GD32_AF pinctrl_gd32_af.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_GD32_AFIO pinctrl_gd32_afio.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_ITE_IT8XXX2 pinctrl_ite_it8xxx2.c)
@@ -46,5 +50,6 @@ zephyr_library_sources_ifdef(CONFIG_PINCTRL_MCHP_MEC5 pinctrl_mchp_mec5.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_WCH_AFIO pinctrl_wch_afio.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_SY1XX pinctrl_sy1xx.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_REALTEK_RTS5912 pinctrl_realtek_rts5912.c)
+zephyr_library_sources_ifdef(CONFIG_PINCTRL_WCH_20X_30X_AFIO pinctrl_wch_20x_30x_afio.c)
 
 add_subdirectory(renesas)
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index e5a7da34c6f9e..95dcd8d67d410 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -1,4 +1,5 @@
 # Copyright (c) 2021 Nordic Semiconductor ASA
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig PINCTRL
@@ -35,6 +36,9 @@ config PINCTRL_DYNAMIC
 
 source "drivers/pinctrl/Kconfig.b91"
 source "drivers/pinctrl/Kconfig.ambiq"
+source "drivers/pinctrl/Kconfig.arm_mps2"
+source "drivers/pinctrl/Kconfig.arm_mps3"
+source "drivers/pinctrl/Kconfig.arm_v2m_beetle"
 source "drivers/pinctrl/Kconfig.gd32"
 source "drivers/pinctrl/Kconfig.it8xxx2"
 source "drivers/pinctrl/Kconfig.npcx"
@@ -73,6 +77,7 @@ source "drivers/pinctrl/Kconfig.mec5"
 source "drivers/pinctrl/Kconfig.wch_afio"
 source "drivers/pinctrl/Kconfig.sy1xx"
 source "drivers/pinctrl/Kconfig.realtek_rts5912"
+source "drivers/pinctrl/Kconfig.wch_20x_30x_afio"
 
 rsource "renesas/Kconfig"
 
diff --git a/drivers/pinctrl/Kconfig.arm_mps2 b/drivers/pinctrl/Kconfig.arm_mps2
new file mode 100644
index 0000000000000..0820a671087f4
--- /dev/null
+++ b/drivers/pinctrl/Kconfig.arm_mps2
@@ -0,0 +1,10 @@
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: Apache-2.0
+
+
+config PINCTRL_ARM_MPS2
+	bool "Arm MPS2 pin controller driver"
+	default y
+	depends on DT_HAS_ARM_MPS2_PINCTRL_ENABLED
+	help
+	  Arm MPS2 pinctrl driver
diff --git a/drivers/pinctrl/Kconfig.arm_mps3 b/drivers/pinctrl/Kconfig.arm_mps3
new file mode 100644
index 0000000000000..335b4f055c522
--- /dev/null
+++ b/drivers/pinctrl/Kconfig.arm_mps3
@@ -0,0 +1,9 @@
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config PINCTRL_ARM_MPS3
+	bool "Arm MPS3 pin controller driver"
+	default y
+	depends on DT_HAS_ARM_MPS3_PINCTRL_ENABLED
+	help
+	  Arm MPS2 pinctrl driver
diff --git a/drivers/pinctrl/Kconfig.arm_v2m_beetle b/drivers/pinctrl/Kconfig.arm_v2m_beetle
new file mode 100644
index 0000000000000..218ea12301144
--- /dev/null
+++ b/drivers/pinctrl/Kconfig.arm_v2m_beetle
@@ -0,0 +1,9 @@
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config PINCTRL_ARM_V2M_BEETLE
+	bool "Arm V2M Beetle pin controller driver"
+	default y
+	depends on DT_HAS_ARM_V2M_BEETLE_PINCTRL_ENABLED
+	help
+	  Arm MPS2 V2M Beetle driver
diff --git a/drivers/pinctrl/Kconfig.rpi_pico b/drivers/pinctrl/Kconfig.rpi_pico
index 7ce46bdafa091..9fc8d19085b0b 100644
--- a/drivers/pinctrl/Kconfig.rpi_pico
+++ b/drivers/pinctrl/Kconfig.rpi_pico
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config PINCTRL_RPI_PICO
-	bool "RaspberryPi Pico pin controller driver"
+	bool "Raspberry Pi Pico pin controller driver"
 	default y
 	depends on DT_HAS_RASPBERRYPI_PICO_PINCTRL_ENABLED
 	select PICOSDK_USE_GPIO
 	help
-	  RaspberryPi Pico pinctrl driver
+	  Raspberry Pi Pico pinctrl driver
diff --git a/drivers/pinctrl/Kconfig.wch_20x_30x_afio b/drivers/pinctrl/Kconfig.wch_20x_30x_afio
new file mode 100644
index 0000000000000..a13e7ac09d46f
--- /dev/null
+++ b/drivers/pinctrl/Kconfig.wch_20x_30x_afio
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.sapce)
+# SPDX-License-Identifier: Apache-2.0
+
+config PINCTRL_WCH_20X_30X_AFIO
+	bool "WCH AFIO pin controller driver for CH32V20x/30x"
+	default y
+	depends on DT_HAS_WCH_20X_30X_AFIO_ENABLED
+	help
+	  WCH CH32V20x/30x AFIO pin controller driver.
diff --git a/drivers/pinctrl/pinctrl_ambiq.c b/drivers/pinctrl/pinctrl_ambiq.c
index 0be5a24052a33..351714064873c 100644
--- a/drivers/pinctrl/pinctrl_ambiq.c
+++ b/drivers/pinctrl/pinctrl_ambiq.c
@@ -7,7 +7,7 @@
 #include <zephyr/drivers/pinctrl.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 static void pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
 {
@@ -22,7 +22,8 @@ static void pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
 			       : pin->tristate   ? AM_HAL_GPIO_PIN_OUTCFG_TRISTATE
 						 : AM_HAL_GPIO_PIN_OUTCFG_DISABLE;
 	pin_config.eDriveStrength = pin->drive_strength;
-	pin_config.uNCE = pin->iom_nce;
+	pin_config.uNCE = pin->nce;
+	pin_config.eCEpol = pin->nce_pol;
 #if defined(CONFIG_SOC_APOLLO3P_BLUE)
 	pin_config.bIomMSPIn = pin->iom_mspi;
 #endif
@@ -42,9 +43,11 @@ static void pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
 					: pin->tristate   ? AM_HAL_GPIO_PIN_OUTCFG_TRISTATE
 							  : AM_HAL_GPIO_PIN_OUTCFG_DISABLE;
 	pin_config.GP.cfg_b.eDriveStrength = pin->drive_strength;
+#if defined(CONFIG_SOC_SERIES_APOLLO4X)
 	pin_config.GP.cfg_b.uSlewRate = pin->slew_rate;
-	pin_config.GP.cfg_b.uNCE = pin->iom_nce;
-	pin_config.GP.cfg_b.eIntDir = pin->interrupt_direction;
+#endif
+	pin_config.GP.cfg_b.uNCE = pin->nce;
+	pin_config.GP.cfg_b.eCEpol = pin->nce_pol;
 
 	if (pin->bias_pull_up) {
 		pin_config.GP.cfg_b.ePullup = pin->ambiq_pull_up_ohms + AM_HAL_GPIO_PIN_PULLUP_1_5K;
diff --git a/drivers/pinctrl/pinctrl_arm_mps2.c b/drivers/pinctrl/pinctrl_arm_mps2.c
new file mode 100644
index 0000000000000..c78a007fdf324
--- /dev/null
+++ b/drivers/pinctrl/pinctrl_arm_mps2.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "zephyr/device.h"
+#include "zephyr/drivers/gpio.h"
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/devicetree/gpio.h>
+#include <zephyr/drivers/gpio/gpio_cmsdk_ahb.h>
+
+/**
+ * The ARM MPS2 Board has 4 GPIO controllers. These controllers
+ * are responsible for pin muxing, input/output, pull-up, etc.
+ *
+ * All GPIO controller pins are exposed via the following sequence of pin
+ * numbers:
+ *   Pins  0 -  15 are for GPIO0
+ *   Pins 16 -  31 are for GPIO1
+ *   Pins 32 -  47 are for GPIO2
+ *   Pins 48 -  51 are for GPIO3
+ *
+ * For the GPIO controllers configuration ARM MPS2 Board follows the
+ * Arduino compliant pin out.
+ */
+
+static const struct device *const gpio_ports[] = {
+	DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio0)),
+	DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio1)),
+	DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio2)),
+	DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio3)),
+};
+
+static int pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
+{
+	uint32_t flags = pin->input_enable ? GPIO_INPUT : GPIO_OUTPUT;
+
+	/* Each gpio has 16 pins, so divide by 16 to get specific gpio*/
+	const struct device *gpio_dev = gpio_ports[pin->pin_num >> 4];
+
+	return cmsdk_ahb_gpio_config(gpio_dev, pin->pin_num % 16, flags);
+}
+
+int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintptr_t reg)
+{
+	ARG_UNUSED(reg);
+	for (uint8_t i = 0U; i < pin_cnt; i++) {
+		if (pinctrl_configure_pin(pins++) == -ENOTSUP) {
+			return -ENOTSUP;
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/pinctrl/pinctrl_arm_mps3.c b/drivers/pinctrl/pinctrl_arm_mps3.c
new file mode 100644
index 0000000000000..c3b1eb2402fd4
--- /dev/null
+++ b/drivers/pinctrl/pinctrl_arm_mps3.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "zephyr/device.h"
+#include "zephyr/drivers/gpio.h"
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/devicetree/gpio.h>
+#include <zephyr/drivers/gpio/gpio_cmsdk_ahb.h>
+
+static const struct device *const gpio_ports[] = {DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio0)),
+						  DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio1)),
+						  DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio2))};
+
+static int pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
+{
+	uint32_t flags = pin->input_enable ? GPIO_INPUT : GPIO_OUTPUT;
+
+	/* Each gpio has 16 pins, so divide by 16 to get specific gpio*/
+	const struct device *gpio_dev = gpio_ports[pin->pin_num >> 4];
+
+	return cmsdk_ahb_gpio_config(gpio_dev, pin->pin_num % 16, flags);
+}
+
+int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintptr_t reg)
+{
+	ARG_UNUSED(reg);
+	for (uint8_t i = 0U; i < pin_cnt; i++) {
+		if (pinctrl_configure_pin(pins++) == -ENOTSUP) {
+			return -ENOTSUP;
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/pinctrl/pinctrl_arm_v2m_beetle.c b/drivers/pinctrl/pinctrl_arm_v2m_beetle.c
new file mode 100644
index 0000000000000..47fba5a6a2ba6
--- /dev/null
+++ b/drivers/pinctrl/pinctrl_arm_v2m_beetle.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "zephyr/device.h"
+#include "zephyr/drivers/gpio.h"
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/devicetree/gpio.h>
+#include <zephyr/drivers/gpio/gpio_cmsdk_ahb.h>
+
+#define EXPANSION_SHIELD_POWER_ENABLE_MASK	BIT(15)
+
+static const struct device *const gpio_ports[] = {DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio0)),
+						  DEVICE_DT_GET_OR_NULL(DT_NODELABEL(gpio1))};
+
+static int pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
+{
+	uint32_t flags = pin->input_enable ? GPIO_INPUT : GPIO_OUTPUT;
+
+	/* Each gpio has 16 pins, so divide by 16 to get specific gpio*/
+	const struct device *gpio_dev = gpio_ports[pin->pin_num >> 4];
+
+	return cmsdk_ahb_gpio_config(gpio_dev, pin->pin_num % 16, flags);
+}
+
+int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintptr_t reg)
+{
+	ARG_UNUSED(reg);
+	for (uint8_t i = 0U; i < pin_cnt; i++) {
+		if (pinctrl_configure_pin(pins++) == -ENOTSUP) {
+			return -ENOTSUP;
+		}
+	}
+
+	const struct gpio_cmsdk_ahb_cfg *const cfg = gpio_ports[1]->config;
+	/* Set the ARD_PWR_EN GPIO1[15] as an output */
+	cfg->port->outenableset |= EXPANSION_SHIELD_POWER_ENABLE_MASK;
+	/* Set on 3v3 (for ARDUINO HDR compliance) */
+	cfg->port->data |= EXPANSION_SHIELD_POWER_ENABLE_MASK;
+
+	return 0;
+}
diff --git a/drivers/pinctrl/pinctrl_ite_it8xxx2.c b/drivers/pinctrl/pinctrl_ite_it8xxx2.c
index 422f8c6c67ff9..1416af0480912 100644
--- a/drivers/pinctrl/pinctrl_ite_it8xxx2.c
+++ b/drivers/pinctrl/pinctrl_ite_it8xxx2.c
@@ -14,8 +14,6 @@
 
 LOG_MODULE_REGISTER(pinctrl_ite_it8xxx2, LOG_LEVEL_ERR);
 
-#define GPIO_IT8XXX2_REG_BASE \
-	((struct gpio_it8xxx2_regs *)DT_REG_ADDR(DT_NODELABEL(gpiogcr)))
 #define GPIO_GROUP_MEMBERS  8
 
 struct pinctrl_it8xxx2_gpio {
@@ -291,7 +289,7 @@ static int pinctrl_kscan_it8xxx2_configure_pins(const pinctrl_soc_pin_t *pins)
 		return -EINVAL;
 	}
 
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+#if defined(CONFIG_SOC_IT8XXX2_REG_SET_V1) || defined(CONFIG_SOC_SERIES_IT51XXX)
 	uint8_t pin_mask = BIT(pins->pin);
 	volatile uint8_t *reg_gctrl = ksi_kso->reg_gctrl;
 
@@ -356,14 +354,14 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 
 static int pinctrl_it8xxx2_init(const struct device *dev)
 {
-	struct gpio_it8xxx2_regs *const gpio_base = GPIO_IT8XXX2_REG_BASE;
+	struct gpio_ite_ec_regs *const gpio_base = GPIO_ITE_EC_REGS_BASE;
 
 	/*
 	 * The default value of LPCRSTEN is bit2:1 = 10b(GPD2) in GCR.
 	 * If LPC reset is enabled on GPB7, we have to clear bit2:1
 	 * to 00b.
 	 */
-	gpio_base->GPIO_GCR &= ~IT8XXX2_GPIO_LPCRSTEN;
+	gpio_base->GPIO_GCR &= ~ITE_EC_GPIO_LPCRSTEN;
 
 #ifdef CONFIG_SOC_IT8XXX2_REG_SET_V2
 #if defined(CONFIG_I2C_ITE_ENHANCE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(i2c5))
diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 3a05e3a3618da..77387e4880661 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -99,6 +99,15 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #define NRF_PSEL_TWIS(reg, line) ((NRF_TWIS_Type *)reg)->PSEL.line
 #endif
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) || defined(CONFIG_NRFX_GRTC)
+#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_fast_frequency_hz)
+#define NRF_GRTC_CLKOUT_FAST 1
+#endif
+#if DT_NODE_HAS_PROP(DT_NODELABEL(grtc), clkout_32k)
+#define NRF_GRTC_CLKOUT_SLOW 1
+#endif
+#endif
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -345,6 +354,24 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* defined(NRF_PSEL_QSPI) */
+#if defined(NRF_GRTC_CLKOUT_FAST)
+		case NRF_FUN_GRTC_CLKOUT_FAST:
+#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
+			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
+#endif
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_GRTC_CLKOUT_FAST) */
+#if defined(NRF_GRTC_CLKOUT_SLOW)
+		case NRF_FUN_GRTC_CLKOUT_32K:
+#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
+			nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
+#endif
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_GRTC_CLKOUT_SLOW) */
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_CAN_TX:
@@ -356,6 +383,24 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+		/* Pin routing is controlled by secure domain, via UICR */
+		case NRF_FUN_EXMIF_CK:
+		case NRF_FUN_EXMIF_DQ0:
+		case NRF_FUN_EXMIF_DQ1:
+		case NRF_FUN_EXMIF_DQ2:
+		case NRF_FUN_EXMIF_DQ3:
+		case NRF_FUN_EXMIF_DQ4:
+		case NRF_FUN_EXMIF_DQ5:
+		case NRF_FUN_EXMIF_DQ6:
+		case NRF_FUN_EXMIF_DQ7:
+		case NRF_FUN_EXMIF_CS0:
+		case NRF_FUN_EXMIF_CS1:
+		case NRF_FUN_EXMIF_RWDS:
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) */
 #if defined(NRF_PSEL_TWIS)
 		case NRF_FUN_TWIS_SCL:
 			NRF_PSEL_TWIS(reg, SCL) = psel;
diff --git a/drivers/pinctrl/pinctrl_silabs_dbus.c b/drivers/pinctrl/pinctrl_silabs_dbus.c
index 488c1090162e1..edca73d6db43f 100644
--- a/drivers/pinctrl/pinctrl_silabs_dbus.c
+++ b/drivers/pinctrl/pinctrl_silabs_dbus.c
@@ -37,10 +37,16 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 			     (pins[i].base_offset * sizeof(mem_addr_t));
 		route_reg = enable_reg + (pins[i].route_offset * sizeof(mem_addr_t));
 
-		sys_write32(pins[i].port | FIELD_PREP(PIN_MASK, pins[i].pin), route_reg);
+		if (pins[i].route_offset != SILABS_PINCTRL_UNUSED) {
+			sys_write32(pins[i].port | FIELD_PREP(PIN_MASK, pins[i].pin), route_reg);
+		}
 
 		if (pins[i].en_bit != SILABS_PINCTRL_UNUSED) {
-			sys_set_bit(enable_reg, pins[i].en_bit);
+			if (pins[i].mode == gpioModeDisabled) {
+				sys_clear_bit(enable_reg, pins[i].en_bit);
+			} else {
+				sys_set_bit(enable_reg, pins[i].en_bit);
+			}
 		}
 	}
 
diff --git a/drivers/pinctrl/pinctrl_wch_20x_30x_afio.c b/drivers/pinctrl/pinctrl_wch_20x_30x_afio.c
new file mode 100644
index 0000000000000..ae22af8b648d3
--- /dev/null
+++ b/drivers/pinctrl/pinctrl_wch_20x_30x_afio.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h>
+
+#include <ch32fun.h>
+
+static GPIO_TypeDef *const wch_afio_pinctrl_regs[] = {
+	(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioa)),
+	(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpiob)),
+	(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioc)),
+	(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpiod)),
+#if DT_NODE_EXISTS(DT_NODELABEL(gpioe))
+	(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioe)),
+#endif
+};
+
+int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintptr_t reg)
+{
+	int i;
+
+	for (i = 0; i < pin_cnt; i++, pins++) {
+		uint8_t port = FIELD_GET(CH32V20X_V30X_PINCTRL_PORT_MASK, pins->config);
+		uint8_t pin = FIELD_GET(CH32V20X_V30X_PINCTRL_PIN_MASK, pins->config);
+		uint8_t bit0 = FIELD_GET(CH32V20X_V30X_PINCTRL_RM_BASE_MASK, pins->config);
+		uint8_t pcfr_id = FIELD_GET(CH32V20X_V30X_PINCTRL_PCFR_ID_MASK, pins->config);
+		uint8_t remap = FIELD_GET(CH32V20X_V30X_PINCTRL_RM_MASK, pins->config);
+		GPIO_TypeDef *regs = wch_afio_pinctrl_regs[port];
+		uint32_t pcfr = pcfr_id == 0 ? AFIO->PCFR1 : AFIO->PCFR2;
+		uint8_t cfg = 0;
+
+		if (pins->output_high || pins->output_low) {
+			cfg |= (pins->slew_rate + 1);
+			if (pins->drive_open_drain) {
+				cfg |= BIT(2);
+			}
+			/* Select the alternate function */
+			cfg |= BIT(3);
+		} else {
+			if (pins->bias_pull_up || pins->bias_pull_down) {
+				cfg |= BIT(3);
+			}
+		}
+
+		if (pin < 8) {
+			regs->CFGLR = (regs->CFGLR & ~(0x0F << (pin * 4))) | (cfg << (pin * 4));
+		} else {
+			regs->CFGHR = (regs->CFGHR & ~(0x0F << ((pin - 8) * 4))) |
+				      (cfg << ((pin - 8) * 4));
+		}
+		if (pins->output_high) {
+			regs->OUTDR |= BIT(pin);
+			regs->BSHR |= BIT(pin);
+		} else if (pins->output_low) {
+			regs->OUTDR |= BIT(pin);
+			/* Reset the pin. */
+			regs->BSHR |= BIT(pin + 16);
+		} else {
+			regs->OUTDR &= ~BIT(pin);
+			if (pins->bias_pull_up) {
+				regs->BSHR = BIT(pin);
+			}
+			if (pins->bias_pull_down) {
+				regs->BCR = BIT(pin);
+			}
+		}
+
+		pcfr |= remap << bit0;
+
+		if (pcfr_id == 0) {
+			AFIO->PCFR1 = pcfr;
+		} else {
+			AFIO->PCFR2 = pcfr;
+		}
+
+		if (bit0 == CH32V20X_V30X_PINMUX_USART1_RM) {
+			pcfr = AFIO->PCFR2;
+			pcfr |= ((uint32_t)((remap >> 1) & 1)
+				 << (CH32V20X_V30X_PINMUX_USART1_RM1 & 0x1F));
+			AFIO->PCFR2 = pcfr;
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/pinctrl/renesas/ra/pinctrl_ra.c b/drivers/pinctrl/renesas/ra/pinctrl_ra.c
index 0f2bc85bd6005..efaac2f34f740 100644
--- a/drivers/pinctrl/renesas/ra/pinctrl_ra.c
+++ b/drivers/pinctrl/renesas/ra/pinctrl_ra.c
@@ -26,16 +26,3 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 
 	return 0;
 }
-
-int ra_pinctrl_query_config(uint32_t port, uint32_t pin, pinctrl_soc_pin_t *pincfg)
-{
-	if (port >= RA_PINCTRL_PORT_NUM || pin >= RA_PINCTRL_PIN_NUM) {
-		return -EINVAL;
-	}
-
-	pincfg->port_num = port;
-	pincfg->pin_num = pin;
-
-	pincfg->cfg = R_PFS->PORT[port].PIN[pin].PmnPFS;
-	return 0;
-}
diff --git a/drivers/pinctrl/renesas/rz/Kconfig b/drivers/pinctrl/renesas/rz/Kconfig
index 745496b8f1700..42fa2b4d7c5c3 100644
--- a/drivers/pinctrl/renesas/rz/Kconfig
+++ b/drivers/pinctrl/renesas/rz/Kconfig
@@ -1,5 +1,5 @@
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
-# Copyright (c) 2024 Renesas Electronics Corporation
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 config PINCTRL_RZT2M
@@ -12,7 +12,11 @@ config PINCTRL_RZT2M
 config PINCTRL_RENESAS_RZ
 	bool "Renesas RZ pin controller driver"
 	default y
-	depends on DT_HAS_RENESAS_RZG_PINCTRL_ENABLED
+	depends on DT_HAS_RENESAS_RZG_PINCTRL_ENABLED \
+		|| DT_HAS_RENESAS_RZN_PINCTRL_ENABLED \
+		|| DT_HAS_RENESAS_RZT_PINCTRL_ENABLED \
+		|| DT_HAS_RENESAS_RZA_PINCTRL_ENABLED \
+		|| DT_HAS_RENESAS_RZV_PINCTRL_ENABLED
 	select USE_RZ_FSP_IOPORT
 	help
 	  Enable Renesas RZ pinctrl driver.
diff --git a/drivers/power_domain/CMakeLists.txt b/drivers/power_domain/CMakeLists.txt
index dedd7a50dffa6..d459e0d88c372 100644
--- a/drivers/power_domain/CMakeLists.txt
+++ b/drivers/power_domain/CMakeLists.txt
@@ -7,3 +7,4 @@ zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_GPIO power_domain_gpio.c)
 zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_GPIO_MONITOR power_domain_gpio_monitor.c)
 zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_INTEL_ADSP power_domain_intel_adsp.c)
 zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_NXP_SCU power_domain_nxp_scu.c)
+zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_SOC_PM_STATE power_domain_soc_state_change.c)
diff --git a/drivers/power_domain/Kconfig b/drivers/power_domain/Kconfig
index f29057acf5c9d..7bf5fe42470fe 100644
--- a/drivers/power_domain/Kconfig
+++ b/drivers/power_domain/Kconfig
@@ -90,4 +90,13 @@ config POWER_DOMAIN_NXP_SCU_INIT_PRIORITY
 
 endif #POWER_DOMAIN_NXP_SCU
 
+config POWER_DOMAIN_SOC_PM_STATE
+	bool "SoC PM state power domain"
+	default y
+	depends on DT_HAS_POWER_DOMAIN_SOC_STATE_CHANGE_ENABLED
+	select DEVICE_DEPS
+	help
+	  Generic power domain control to turn on/off devices when the
+	  PM subsystem transitions in and out certain power states.
+
 endif
diff --git a/drivers/power_domain/power_domain_soc_state_change.c b/drivers/power_domain/power_domain_soc_state_change.c
new file mode 100644
index 0000000000000..e177c60b4e4be
--- /dev/null
+++ b/drivers/power_domain/power_domain_soc_state_change.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2024-25 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/pm/pm.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(power_domain_soc_state_change, CONFIG_POWER_DOMAIN_LOG_LEVEL);
+
+/* Indicates the end of the onoff_power_states array */
+#define POWER_DOMAIN_DEVICE_ONOFF_STATE_MARKER 0xFF
+
+struct pd_deviceonoff_config {
+	uint8_t *onoff_power_states;
+};
+
+struct pd_visitor_context {
+	const struct device *domain;
+	enum pm_device_action action;
+};
+
+static int pd_domain_visitor(const struct device *dev, void *context)
+{
+	struct pd_visitor_context *visitor_context = context;
+
+	/* Only run action if the device is on the specified domain */
+	if (!dev->pm || (dev->pm_base->domain != visitor_context->domain)) {
+		return 0;
+	}
+
+	/* In case device is active, first suspend it before turning it off */
+	if ((visitor_context->action == PM_DEVICE_ACTION_TURN_OFF) &&
+	    (dev->pm_base->state == PM_DEVICE_STATE_ACTIVE)) {
+		(void)pm_device_action_run(dev, PM_DEVICE_ACTION_SUSPEND);
+	}
+	(void)pm_device_action_run(dev, visitor_context->action);
+	return 0;
+}
+
+static int pd_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct pd_deviceonoff_config *config = dev->config;
+	uint8_t i = 0;
+	/* Get the next power state that will be used */
+	enum pm_state state = pm_state_next_get(_current_cpu->id)->state;
+	struct pd_visitor_context context = {.domain = dev};
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		LOG_DBG("%s: resuming", dev->name);
+		while (config->onoff_power_states[i] != POWER_DOMAIN_DEVICE_ONOFF_STATE_MARKER) {
+			/* Check if we need do the turn on action for this state */
+			if (state == config->onoff_power_states[i]) {
+				/* Notify devices on the domain they are now powered */
+				context.action = PM_DEVICE_ACTION_TURN_ON;
+				(void)device_supported_foreach(dev, pd_domain_visitor, &context);
+				/* No need to go through the rest of the array of states */
+				break;
+			}
+			i++;
+		}
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		LOG_DBG("%s: suspending", dev->name);
+		while (config->onoff_power_states[i] != POWER_DOMAIN_DEVICE_ONOFF_STATE_MARKER) {
+			/* Check if need to do the turn off action for this state */
+			if (state == config->onoff_power_states[i]) {
+				/* Notify devices on the domain that power is going down */
+				context.action = PM_DEVICE_ACTION_TURN_OFF;
+				(void)device_supported_foreach(dev, pd_domain_visitor, &context);
+				/* No need to go through the rest of the array of states */
+				break;
+			}
+			i++;
+		}
+		break;
+	case PM_DEVICE_ACTION_TURN_ON:
+		break;
+	case PM_DEVICE_ACTION_TURN_OFF:
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+#define DT_DRV_COMPAT power_domain_soc_state_change
+
+#define PM_STATE_FROM_DT(i, node_id, prop_name)						\
+	COND_CODE_1(DT_NODE_HAS_STATUS(DT_PHANDLE_BY_IDX(node_id, prop_name, i), okay),	\
+		(PM_STATE_DT_INIT(DT_PHANDLE_BY_IDX(node_id, prop_name, i)),), ())
+
+#define POWER_DOMAIN_DEVICE_ONOFF_STATES(id, node_id)					\
+	uint8_t onoff_states_##id[] = {							\
+		LISTIFY(DT_PROP_LEN_OR(node_id, onoff_power_states, 0),			\
+			PM_STATE_FROM_DT, (), node_id, onoff_power_states)		\
+		POWER_DOMAIN_DEVICE_ONOFF_STATE_MARKER					\
+	};
+
+#define POWER_DOMAIN_DEVICE(id)								\
+	POWER_DOMAIN_DEVICE_ONOFF_STATES(id, DT_DRV_INST(id))				\
+											\
+	static const struct pd_deviceonoff_config pd_deviceonoff_##id##_cfg = {		\
+		.onoff_power_states = onoff_states_##id,				\
+	};										\
+	PM_DEVICE_DT_INST_DEFINE(id, pd_pm_action);					\
+	DEVICE_DT_INST_DEFINE(id, NULL, PM_DEVICE_DT_INST_GET(id),			\
+			      NULL, &pd_deviceonoff_##id##_cfg, PRE_KERNEL_1,		\
+			      CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(POWER_DOMAIN_DEVICE)
diff --git a/drivers/pwm/CMakeLists.txt b/drivers/pwm/CMakeLists.txt
index c194ac8485fb0..4c1b22e9c6301 100644
--- a/drivers/pwm/CMakeLists.txt
+++ b/drivers/pwm/CMakeLists.txt
@@ -31,6 +31,7 @@ zephyr_library_sources_ifdef(CONFIG_PWM_NPCX		pwm_npcx.c)
 zephyr_library_sources_ifdef(CONFIG_PWM_XLNX_AXI_TIMER	pwm_xlnx_axi_timer.c)
 zephyr_library_sources_ifdef(CONFIG_PWM_MCUX_PWT 	pwm_mcux_pwt.c)
 zephyr_library_sources_ifdef(CONFIG_PWM_GECKO		pwm_gecko.c)
+zephyr_library_sources_ifdef(CONFIG_PWM_SILABS_SIWX91X	pwm_silabs_siwx91x.c)
 zephyr_library_sources_ifdef(CONFIG_PWM_GD32		pwm_gd32.c)
 zephyr_library_sources_ifdef(CONFIG_PWM_RCAR		pwm_rcar.c)
 zephyr_library_sources_ifdef(CONFIG_PWM_PCA9685 	pwm_pca9685.c)
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 0dd835a8973c2..57a684ca2d160 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -84,6 +84,8 @@ source "drivers/pwm/Kconfig.mcux_pwt"
 
 source "drivers/pwm/Kconfig.gecko"
 
+source "drivers/pwm/Kconfig.siwx91x"
+
 source "drivers/pwm/Kconfig.gd32"
 
 source "drivers/pwm/Kconfig.rcar"
diff --git a/drivers/pwm/Kconfig.siwx91x b/drivers/pwm/Kconfig.siwx91x
new file mode 100644
index 0000000000000..6cf16ade50df8
--- /dev/null
+++ b/drivers/pwm/Kconfig.siwx91x
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Silicon Laboratories Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config PWM_SILABS_SIWX91X
+	bool "Silabs SiWx91x PWM driver"
+	default y
+	depends on DT_HAS_SILABS_SIWX91X_PWM_ENABLED
+	help
+	  Enable the PWM driver for the Silabs SiWx91x SoC series.
diff --git a/drivers/pwm/pwm_cc13xx_cc26xx_timer.c b/drivers/pwm/pwm_cc13xx_cc26xx_timer.c
index 19837ad08b88b..ea07f706d256d 100644
--- a/drivers/pwm/pwm_cc13xx_cc26xx_timer.c
+++ b/drivers/pwm/pwm_cc13xx_cc26xx_timer.c
@@ -34,6 +34,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_PWM_LOG_LEVEL);
 #define PWM_INITIAL_DUTY   0U /* initially off */
 
 struct pwm_cc13xx_cc26xx_data {
+	bool standby_disabled;
 };
 
 struct pwm_cc13xx_cc26xx_config {
@@ -56,14 +57,17 @@ static void write_value(const struct pwm_cc13xx_cc26xx_config *config, uint32_t
 }
 
 static int set_period_and_pulse(const struct pwm_cc13xx_cc26xx_config *config, uint32_t period,
-				uint32_t pulse)
+				uint32_t pulse, struct pwm_cc13xx_cc26xx_data *data)
 {
 	uint32_t match_value = pulse;
 
 	if (pulse == 0U) {
 		TimerDisable(config->gpt_base, TIMER_B);
 #ifdef CONFIG_PM
-		Power_releaseConstraint(PowerCC26XX_DISALLOW_STANDBY);
+		if (data->standby_disabled) {
+			Power_releaseConstraint(PowerCC26XX_DISALLOW_STANDBY);
+			data->standby_disabled = false;
+		}
 #endif
 		match_value = period + 1;
 	}
@@ -86,7 +90,10 @@ static int set_period_and_pulse(const struct pwm_cc13xx_cc26xx_config *config, u
 
 	if (pulse > 0U) {
 #ifdef CONFIG_PM
-		Power_setConstraint(PowerCC26XX_DISALLOW_STANDBY);
+		if (!data->standby_disabled) {
+			Power_setConstraint(PowerCC26XX_DISALLOW_STANDBY);
+			data->standby_disabled = true;
+		}
 #endif
 		TimerEnable(config->gpt_base, TIMER_B);
 	}
@@ -110,7 +117,7 @@ static int set_cycles(const struct device *dev, uint32_t channel, uint32_t perio
 		HWREG(config->gpt_base + GPT_O_CTL) |= GPT_CTL_TBPWML_NORMAL;
 	}
 
-	set_period_and_pulse(config, period, pulse);
+	set_period_and_pulse(config, period, pulse, dev->data);
 
 	return 0;
 }
@@ -223,7 +230,7 @@ static int init_pwm(const struct device *dev)
 	HWREG(config->gpt_base + GPT_O_TBMR) = GPT_TBMR_TBAMS_PWM | GPT_TBMR_TBMRSU_TOUPDATE |
 					       GPT_TBMR_TBPWMIE_EN | GPT_TBMR_TBMR_PERIODIC;
 
-	set_period_and_pulse(config, PWM_INITIAL_PERIOD, PWM_INITIAL_DUTY);
+	set_period_and_pulse(config, PWM_INITIAL_PERIOD, PWM_INITIAL_DUTY, dev->data);
 
 	return 0;
 }
diff --git a/drivers/pwm/pwm_mc_esp32.c b/drivers/pwm/pwm_mc_esp32.c
index b7bb59f1cd5ab..2e15355a64253 100644
--- a/drivers/pwm/pwm_mc_esp32.c
+++ b/drivers/pwm/pwm_mc_esp32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -19,21 +19,11 @@
 #include <zephyr/drivers/clock_control.h>
 #include <esp_clk_tree.h>
 #ifdef CONFIG_PWM_CAPTURE
-#if defined(CONFIG_RISCV)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 #endif /* CONFIG_PWM_CAPTURE */
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mcpwm_esp32, CONFIG_PWM_LOG_LEVEL);
 
-#if defined(CONFIG_RISCV)
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
-
 #ifdef CONFIG_PWM_CAPTURE
 #define SKIP_IRQ_NUM        4U
 #define CAP_INT_MASK        7U
@@ -554,7 +544,7 @@ static DEVICE_API(pwm, mcpwm_esp32_api) = {
 				ESP_PRIO_TO_FLAGS(DT_INST_IRQ_BY_IDX(idx, 0, priority)) |          \
 				ESP_INT_FLAGS_CHECK(DT_INST_IRQ_BY_IDX(idx, 0, flags)) |          \
 					ESP_INTR_FLAG_IRAM,                                        \
-				(ISR_HANDLER)mcpwm_esp32_isr, (void *)dev, NULL);                  \
+				(intr_handler_t)mcpwm_esp32_isr, (void *)dev, NULL);               \
 		return ret;                                                                \
 	}
 #define CAPTURE_INIT(idx) .irq_config_func = mcpwm_esp32_irq_config_func_##idx
diff --git a/drivers/pwm/pwm_mcux_tpm.c b/drivers/pwm/pwm_mcux_tpm.c
index ae869c51815a0..c647d67385857 100644
--- a/drivers/pwm/pwm_mcux_tpm.c
+++ b/drivers/pwm/pwm_mcux_tpm.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2019 Henrik Brix Andersen <henrik@brixandersen.dk>
- * Copyright 2020, 2024 NXP
+ * Copyright 2020, 2024-2025 NXP
  *
  * Heavily based on pwm_mcux_ftm.c, which is:
  * Copyright (c) 2017, NXP
@@ -20,6 +20,10 @@
 
 #include <zephyr/logging/log.h>
 
+#if defined(CONFIG_SOC_MIMX9596)
+#include <zephyr/dt-bindings/clock/imx95_clock.h>
+#endif
+
 LOG_MODULE_REGISTER(pwm_mcux_tpm, CONFIG_PWM_LOG_LEVEL);
 
 #if defined(TPM0)
@@ -51,29 +55,22 @@ static int mcux_tpm_set_cycles(const struct device *dev, uint32_t channel,
 {
 	const struct mcux_tpm_config *config = dev->config;
 	struct mcux_tpm_data *data = dev->data;
-	uint8_t duty_cycle;
-
-	if (period_cycles == 0U) {
-		LOG_ERR("Channel can not be set to inactive level");
-		return -ENOTSUP;
-	}
 
 	if (channel >= config->channel_count) {
 		LOG_ERR("Invalid channel");
 		return -ENOTSUP;
 	}
 
-	duty_cycle = pulse_cycles * 100U / period_cycles;
-	data->channel[channel].dutyCyclePercent = duty_cycle;
+	if (period_cycles == 0 || period_cycles == TPM_MAX_COUNTER_VALUE(base)) {
+		return -ENOTSUP;
+	}
 
-	if ((flags & PWM_POLARITY_INVERTED) == 0) {
-		data->channel[channel].level = kTPM_HighTrue;
-	} else {
-		data->channel[channel].level = kTPM_LowTrue;
+	if ((TPM_MAX_COUNTER_VALUE(base) == 0xFFFFU) &&
+	    (pulse_cycles > TPM_MAX_COUNTER_VALUE(base))) {
+		return -ENOTSUP;
 	}
 
-	LOG_DBG("pulse_cycles=%d, period_cycles=%d, duty_cycle=%d, flags=%d",
-		pulse_cycles, period_cycles, duty_cycle, flags);
+	LOG_DBG("pulse_cycles=%d, period_cycles=%d, flags=%d", pulse_cycles, period_cycles, flags);
 
 	if (period_cycles != data->period_cycles) {
 		uint32_t pwm_freq;
@@ -102,6 +99,9 @@ static int mcux_tpm_set_cycles(const struct device *dev, uint32_t channel,
 
 		TPM_StopTimer(config->base);
 
+		/* Set counter back to zero */
+		config->base->CNT = 0;
+
 		status = TPM_SetupPwm(config->base, data->channel,
 				      config->channel_count, config->mode,
 				      pwm_freq, data->clock_freq);
@@ -111,13 +111,24 @@ static int mcux_tpm_set_cycles(const struct device *dev, uint32_t channel,
 			return -ENOTSUP;
 		}
 		TPM_StartTimer(config->base, config->tpm_clock_source);
-	} else {
-		TPM_UpdateChnlEdgeLevelSelect(config->base, channel,
-					      data->channel[channel].level);
-		TPM_UpdatePwmDutycycle(config->base, channel, config->mode,
-				       duty_cycle);
 	}
 
+	if ((flags & PWM_POLARITY_INVERTED) == 0 &&
+		   data->channel[channel].level != kTPM_HighTrue) {
+		data->channel[channel].level = kTPM_HighTrue;
+		TPM_UpdateChnlEdgeLevelSelect(config->base, channel, kTPM_HighTrue);
+	} else if ((flags & PWM_POLARITY_INVERTED) != 0 &&
+		   data->channel[channel].level != kTPM_LowTrue) {
+		data->channel[channel].level = kTPM_LowTrue;
+		TPM_UpdateChnlEdgeLevelSelect(config->base, channel, kTPM_LowTrue);
+	}
+
+	if (pulse_cycles == period_cycles) {
+		pulse_cycles = period_cycles + 1U;
+	}
+
+	config->base->CONTROLS[channel].CnV = pulse_cycles;
+
 	return 0;
 }
 
@@ -151,10 +162,18 @@ static int mcux_tpm_init(const struct device *dev)
 		return -ENODEV;
 	}
 
-	if (clock_control_on(config->clock_dev, config->clock_subsys)) {
-		LOG_ERR("Could not turn on clock");
-		return -EINVAL;
+#if defined(CONFIG_SOC_MIMX9596)
+	/* IMX9596 AON and WAKEUP clocks aren't controllable */
+	if (config->clock_subsys != (clock_control_subsys_t)IMX95_CLK_BUSWAKEUP &&
+	    config->clock_subsys != (clock_control_subsys_t)IMX95_CLK_BUSAON) {
+#endif
+		if (clock_control_on(config->clock_dev, config->clock_subsys)) {
+			LOG_ERR("Could not turn on clock");
+			return -EINVAL;
+		}
+#if defined(CONFIG_SOC_MIMX9596)
 	}
+#endif
 
 	if (clock_control_get_rate(config->clock_dev, config->clock_subsys,
 				   &data->clock_freq)) {
diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 8b853537375f2..bab8b0f003e7a 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -48,6 +48,11 @@ LOG_MODULE_REGISTER(pwm_nrfx, CONFIG_PWM_LOG_LEVEL);
 
 #if NRFX_FOREACH_PRESENT(PWM, PWM_NRFX_IS_FAST, (||), (0))
 #define PWM_NRFX_FAST_PRESENT 1
+/* If fast instances are used then system managed device PM cannot be used because
+ * it may call PM actions from locked context and fast PWM PM actions can only be
+ * called in a thread context.
+ */
+BUILD_ASSERT(!IS_ENABLED(CONFIG_PM_DEVICE_SYSTEM_MANAGED));
 #endif
 
 #if defined(PWM_NRFX_FAST_PRESENT) && CONFIG_CLOCK_CONTROL_NRF2_GLOBAL_HSFLL
diff --git a/drivers/pwm/pwm_renesas_ra.c b/drivers/pwm/pwm_renesas_ra.c
index 8942b76aa0fdf..fa745a0aa37cb 100644
--- a/drivers/pwm/pwm_renesas_ra.c
+++ b/drivers/pwm/pwm_renesas_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -485,11 +485,10 @@ static int pwm_renesas_ra_init(const struct device *dev)
 	return 0;
 }
 
-#define _ELC_EVENT_GPT_CAPTURE_COMPARE_A(channel) ELC_EVENT_GPT##channel##_CAPTURE_COMPARE_A
-#define _ELC_EVENT_GPT_COUNTER_OVERFLOW(channel)  ELC_EVENT_GPT##channel##_COUNTER_OVERFLOW
-
-#define ELC_EVENT_GPT_CAPTURE_COMPARE_A(channel) _ELC_EVENT_GPT_CAPTURE_COMPARE_A(channel)
-#define ELC_EVENT_GPT_COUNTER_OVERFLOW(channel)  _ELC_EVENT_GPT_COUNTER_OVERFLOW(channel)
+#define EVENT_GPT_CAPTURE_COMPARE_A(channel)                                                       \
+	BSP_PRV_IELS_ENUM(CONCAT(EVENT_GPT, channel, _CAPTURE_COMPARE_A))
+#define EVENT_GPT_COUNTER_OVERFLOW(channel)                                                        \
+	BSP_PRV_IELS_ENUM(CONCAT(EVENT_GPT, channel, _COUNTER_OVERFLOW))
 
 #ifdef CONFIG_PWM_CAPTURE
 #define PWM_RA_IRQ_CONFIG_INIT(index)                                                              \
@@ -546,8 +545,8 @@ static int pwm_renesas_ra_init(const struct device *dev)
 				.cycle_end_irq = DT_INST_IRQ_BY_NAME(index, overflow, irq),        \
 			},                                                                         \
 		.extend_cfg = g_timer1_extend_##index,                                             \
-		.capture_a_event = ELC_EVENT_GPT_CAPTURE_COMPARE_A(DT_INST_PROP(index, channel)),  \
-		.overflow_event = ELC_EVENT_GPT_COUNTER_OVERFLOW(DT_INST_PROP(index, channel)),    \
+		.capture_a_event = EVENT_GPT_CAPTURE_COMPARE_A(DT_INST_PROP(index, channel)),      \
+		.overflow_event = EVENT_GPT_COUNTER_OVERFLOW(DT_INST_PROP(index, channel)),        \
 	};                                                                                         \
 	static const struct pwm_renesas_ra_config pwm_renesas_ra_config_##index = {                \
 		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(index),                                   \
diff --git a/drivers/pwm/pwm_silabs_siwx91x.c b/drivers/pwm/pwm_silabs_siwx91x.c
new file mode 100644
index 0000000000000..520776a371744
--- /dev/null
+++ b/drivers/pwm/pwm_silabs_siwx91x.c
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/types.h>
+#include "sl_si91x_pwm.h"
+
+#define DT_DRV_COMPAT silabs_siwx91x_pwm
+
+#define PWM_CHANNELS  4
+#define DEFAULT_VALUE 0xFF
+
+struct pwm_siwx91x_channel_config {
+	uint8_t duty_cycle;
+	uint32_t frequency;
+	bool is_chan_active;
+};
+
+struct pwm_siwx91x_config {
+	/* Pointer to the clock device structure */
+	const struct device *clock_dev;
+	/* Clock control subsystem */
+	clock_control_subsys_t clock_subsys;
+	/* Pointer to the pin control device configuration */
+	const struct pinctrl_dev_config *pcfg;
+	/* Prescaler information of the channels */
+	uint8_t ch_prescaler[PWM_CHANNELS];
+	/* Common PWM polarity for all the channels */
+	uint8_t pwm_polarity;
+};
+
+struct pwm_siwx91x_data {
+	struct pwm_siwx91x_channel_config pwm_channel_cfg[PWM_CHANNELS];
+};
+
+/* Function to convert prescaler value to a programmable reg value */
+static int siwx91x_prescale_convert(uint8_t prescale)
+{
+	switch (prescale) {
+	case 1:
+		return SL_TIME_PERIOD_PRESCALE_1;
+	case 2:
+		return SL_TIME_PERIOD_PRESCALE_2;
+	case 4:
+		return SL_TIME_PERIOD_PRESCALE_4;
+	case 8:
+		return SL_TIME_PERIOD_PRESCALE_8;
+	case 16:
+		return SL_TIME_PERIOD_PRESCALE_16;
+	case 32:
+		return SL_TIME_PERIOD_PRESCALE_32;
+	case 64:
+		return SL_TIME_PERIOD_PRESCALE_64;
+	default:
+		return -EINVAL;
+	}
+}
+
+/* Program PWM channel with the default configurations */
+static int siwx91x_default_channel_config(const struct device *dev, uint32_t channel)
+{
+	const struct pwm_siwx91x_config *config = dev->config;
+	int prescale_reg_value = siwx91x_prescale_convert(config->ch_prescaler[channel]);
+	int ret;
+
+	if (prescale_reg_value < 0) {
+		return -EINVAL;
+	}
+
+	ret = sl_si91x_pwm_set_output_mode(SL_MODE_INDEPENDENT, channel);
+	if (ret) {
+		return -EINVAL;
+	}
+
+	ret = sl_si91x_pwm_set_base_timer_mode(SL_FREE_RUN_MODE, channel);
+	if (ret) {
+		return -EINVAL;
+	}
+
+	ret = sl_si91x_pwm_control_base_timer(SL_BASE_TIMER_EACH_CHANNEL);
+	if (ret) {
+		return -EINVAL;
+	}
+
+	ret = sl_si91x_pwm_control_period(SL_TIME_PERIOD_POSTSCALE_1_1, prescale_reg_value,
+					  channel);
+	if (ret) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int pwm_siwx91x_set_cycles(const struct device *dev, uint32_t channel,
+				  uint32_t period_cycles, uint32_t pulse_cycles, pwm_flags_t flags)
+{
+	const struct pwm_siwx91x_config *config = dev->config;
+	struct pwm_siwx91x_data *data = dev->data;
+	uint32_t prev_period;
+	uint32_t duty_cycle;
+	int ret;
+
+	if (channel >= ARRAY_SIZE(data->pwm_channel_cfg)) {
+		return -EINVAL;
+	}
+
+	if (config->pwm_polarity != flags) {
+		/* Polarity mismatch */
+		return -ENOTSUP;
+	}
+
+	if (data->pwm_channel_cfg[channel].is_chan_active == false) {
+		/* Configure the channel with default parameters */
+		ret = siwx91x_default_channel_config(dev, channel);
+		if (ret) {
+			return -EINVAL;
+		}
+	}
+
+	ret = sl_si91x_pwm_get_time_period(channel, (uint16_t *)&prev_period);
+	if (ret) {
+		return -EINVAL;
+	}
+
+	if (period_cycles != prev_period) {
+		ret = sl_si91x_pwm_set_time_period(channel, period_cycles, 0);
+		if (ret) {
+			/* Programmed value must be out of range (>65535) */
+			return -EINVAL;
+		}
+	}
+
+	/* Calculate the duty cycle */
+	duty_cycle = pulse_cycles * 100;
+	duty_cycle /= period_cycles;
+
+	if (duty_cycle != data->pwm_channel_cfg[channel].duty_cycle) {
+		ret = sl_si91x_pwm_set_duty_cycle(pulse_cycles, channel);
+		if (ret) {
+			return -EINVAL;
+		}
+		data->pwm_channel_cfg[channel].duty_cycle = duty_cycle;
+	}
+
+	if (data->pwm_channel_cfg[channel].is_chan_active == false) {
+		/* Start PWM after configuring the channel for first time */
+		ret = sl_si91x_pwm_start(channel);
+		if (ret) {
+			return -EINVAL;
+		}
+		data->pwm_channel_cfg[channel].is_chan_active = true;
+	}
+
+	return 0;
+}
+
+static int pwm_siwx91x_get_cycles_per_sec(const struct device *dev, uint32_t channel,
+					  uint64_t *cycles)
+{
+	struct pwm_siwx91x_data *data = dev->data;
+
+	if (channel >= ARRAY_SIZE(data->pwm_channel_cfg)) {
+		return -EINVAL;
+	}
+
+	*cycles = (uint64_t)data->pwm_channel_cfg[channel].frequency;
+
+	return 0;
+}
+
+static int pwm_siwx91x_init(const struct device *dev)
+{
+	const struct pwm_siwx91x_config *config = dev->config;
+	struct pwm_siwx91x_data *data = dev->data;
+	bool polarity_inverted = (config->pwm_polarity == PWM_POLARITY_INVERTED);
+	uint32_t pwm_frequency;
+	int ret;
+
+	ret = clock_control_on(config->clock_dev, config->clock_subsys);
+	if (ret) {
+		return ret;
+	}
+
+	ret = clock_control_get_rate(config->clock_dev, config->clock_subsys, &pwm_frequency);
+	if (ret) {
+		return ret;
+	}
+
+	ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret) {
+		return ret;
+	}
+
+	ARRAY_FOR_EACH(data->pwm_channel_cfg, i) {
+		data->pwm_channel_cfg[i].frequency = pwm_frequency / config->ch_prescaler[i];
+	}
+
+	ret = sl_si91x_pwm_set_output_polarity(polarity_inverted, !polarity_inverted);
+	if (ret) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(pwm, pwm_siwx91x_driver_api) = {
+	.set_cycles = pwm_siwx91x_set_cycles,
+	.get_cycles_per_sec = pwm_siwx91x_get_cycles_per_sec,
+};
+
+#define SIWX91X_PWM_INIT(inst)                                                                     \
+	PINCTRL_DT_INST_DEFINE(inst);                                                              \
+	static struct pwm_siwx91x_data pwm_siwx91x_data_##inst;                                    \
+	static const struct pwm_siwx91x_config pwm_config_##inst = {                               \
+		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(inst)),                             \
+		.clock_subsys = (clock_control_subsys_t)DT_INST_PHA(inst, clocks, clkid),          \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),                                      \
+		.ch_prescaler = DT_INST_PROP(inst, silabs_ch_prescaler),                           \
+		.pwm_polarity = DT_INST_PROP(inst, silabs_pwm_polarity),                           \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, &pwm_siwx91x_init, NULL, &pwm_siwx91x_data_##inst,             \
+			      &pwm_config_##inst, PRE_KERNEL_1, CONFIG_PWM_INIT_PRIORITY,          \
+			      &pwm_siwx91x_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(SIWX91X_PWM_INIT)
diff --git a/drivers/regulator/CMakeLists.txt b/drivers/regulator/CMakeLists.txt
index 7ed90137c3f24..ed5a1996da9b3 100644
--- a/drivers/regulator/CMakeLists.txt
+++ b/drivers/regulator/CMakeLists.txt
@@ -4,7 +4,7 @@
 zephyr_library()
 
 zephyr_library_sources(regulator_common.c)
-zephyr_library_sources_ifdef(CONFIG_REGULATOR_AXP192 regulator_axp192.c)
+zephyr_library_sources_ifdef(CONFIG_REGULATOR_AXP192_AXP2101 regulator_axp192.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_ADP5360 regulator_adp5360.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_CP9314 regulator_cp9314.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_DA1469X regulator_da1469x.c)
@@ -17,6 +17,7 @@ zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM1300 regulator_npm1300.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM2100 regulator_npm2100.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_NPM6001 regulator_npm6001.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_PCA9420 regulator_pca9420.c)
+zephyr_library_sources_ifdef(CONFIG_REGULATOR_PF1550 regulator_pf1550.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_SHELL regulator_shell.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_RPI_PICO regulator_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_REGULATOR_NXP_VREF regulator_nxp_vref.c)
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index d4b70e6b76add..dc331b2139d36 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -39,6 +39,7 @@ source "drivers/regulator/Kconfig.npm1300"
 source "drivers/regulator/Kconfig.npm2100"
 source "drivers/regulator/Kconfig.npm6001"
 source "drivers/regulator/Kconfig.pca9420"
+source "drivers/regulator/Kconfig.pf1550"
 source "drivers/regulator/Kconfig.rpi_pico"
 source "drivers/regulator/Kconfig.nxp_vref"
 source "drivers/regulator/Kconfig.mpm54304"
diff --git a/drivers/regulator/Kconfig.axp192 b/drivers/regulator/Kconfig.axp192
index b56868ccdb7a1..42a28044bfc2b 100644
--- a/drivers/regulator/Kconfig.axp192
+++ b/drivers/regulator/Kconfig.axp192
@@ -1,23 +1,23 @@
 # Copyright (c) 2023 Martin Kiepfer
 # SPDX-License-Identifier: Apache-2.0
 
-config REGULATOR_AXP192
-	bool "X-Power AXP192 PMIC regulator driver"
+config REGULATOR_AXP192_AXP2101
+	bool "X-Powers AXP192/AXP2101 PMIC regulator driver"
 	default y
-	depends on DT_HAS_X_POWERS_AXP192_REGULATOR_ENABLED
-	depends on DT_HAS_X_POWERS_AXP192_ENABLED
+	depends on DT_HAS_X_POWERS_AXP192_REGULATOR_ENABLED || DT_HAS_X_POWERS_AXP2101_REGULATOR_ENABLED
+	depends on DT_HAS_X_POWERS_AXP192_ENABLED || DT_HAS_X_POWERS_AXP2101_ENABLED
 	select I2C
 	select MFD
 	help
 	  Enable the AXP PMIC regulator driver
 
-if REGULATOR_AXP192
+if REGULATOR_AXP192_AXP2101
 
-config REGULATOR_AXP192_INIT_PRIORITY
-	int "AXP192 regulator driver init priority"
+config REGULATOR_AXP192_AXP2101_INIT_PRIORITY
+	int "AXP192/AXP2101 regulator driver init priority"
 	default 86
 	help
-	  Init priority for the axp192 regulator driver. It must be
+	  Init priority for the axp192/axp2101 regulator driver. It must be
 	  greater than MFD_INIT_PRIORITY.
 
 endif
diff --git a/drivers/regulator/Kconfig.pf1550 b/drivers/regulator/Kconfig.pf1550
new file mode 100644
index 0000000000000..667a4b411ee02
--- /dev/null
+++ b/drivers/regulator/Kconfig.pf1550
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+config REGULATOR_PF1550
+	bool "NXP PF1550 PMIC regulator driver"
+	default y
+	depends on DT_HAS_NXP_PF1550_REGULATOR_ENABLED
+	select I2C
+	select MFD
+	help
+	  Enable the NXP PF1550 PMIC regulator driver
diff --git a/drivers/regulator/Kconfig.rpi_pico b/drivers/regulator/Kconfig.rpi_pico
index fe97a524464a2..1900cf53381fb 100644
--- a/drivers/regulator/Kconfig.rpi_pico
+++ b/drivers/regulator/Kconfig.rpi_pico
@@ -2,18 +2,18 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config REGULATOR_RPI_PICO
-	bool "RaspberryPi Pico regulator driver"
+	bool "Raspberry Pi Pico regulator driver"
 	default y
 	depends on DT_HAS_RASPBERRYPI_CORE_SUPPLY_REGULATOR_ENABLED
 	help
-	  Enable support for the RaspberryPi Pico regulator.
+	  Enable support for the Raspberry Pi Pico regulator.
 
 if REGULATOR_RPI_PICO
 
 config REGULATOR_RPI_PICO_INIT_PRIORITY
-	int "RaspberryPi Pico regulator driver init priority"
+	int "Raspberry Pi Pico regulator driver init priority"
 	default KERNEL_INIT_PRIORITY_DEVICE
 	help
-	  Init priority for the RaspberryPi Pico regulator driver.
+	  Init priority for the Raspberry Pi Pico regulator driver.
 
 endif
diff --git a/drivers/regulator/regulator_axp192.c b/drivers/regulator/regulator_axp192.c
index c6e09682384bf..8d37287a7efa1 100644
--- a/drivers/regulator/regulator_axp192.c
+++ b/drivers/regulator/regulator_axp192.c
@@ -1,11 +1,10 @@
 /*
  * Copyright (c) 2021 NXP
  * Copyright (c) 2023 Martin Kiepfer <mrmarteng@teleschirm.org>
+ * Copyright (c) 2024 Lothar Felten <lothar.felten@gmail.com>
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define DT_DRV_COMPAT x_powers_axp192_regulator
-
 #include <errno.h>
 
 #include <zephyr/kernel.h>
@@ -20,7 +19,7 @@
 
 LOG_MODULE_REGISTER(regulator_axp192, CONFIG_REGULATOR_LOG_LEVEL);
 
-/* Output control registers */
+/* AXP192 register defines */
 #define AXP192_REG_EXTEN_DCDC2_CONTROL   0x10U
 #define AXP192_REG_DCDC123_LDO23_CONTROL 0x12U
 #define AXP192_REG_DCDC2_VOLTAGE         0x23U
@@ -32,6 +31,39 @@ LOG_MODULE_REGISTER(regulator_axp192, CONFIG_REGULATOR_LOG_LEVEL);
 #define AXP192_REG_GPIO0_CONTROL         0x90U
 #define AXP192_REG_LDOIO0_VOLTAGE        0x91U
 
+/* AXP2101 register defines */
+#define AXP2101_REG_CHGLED            0x69U
+#define AXP2101_REG_DCDC12345_CONTROL 0x80U
+#define AXP2101_REG_DCDCS_PWM_CONTROL 0x81U
+#define AXP2101_REG_DCDC1_VOLTAGE     0x82U
+#define AXP2101_REG_DCDC2_VOLTAGE     0x83U
+#define AXP2101_REG_DCDC3_VOLTAGE     0x84U
+#define AXP2101_REG_DCDC4_VOLTAGE     0x85U
+#define AXP2101_REG_DCDC5_VOLTAGE     0x86U
+#define AXP2101_REG_LDOGRP1_CONTROL   0x90U
+#define AXP2101_REG_LDOGRP2_CONTROL   0x91U
+#define AXP2101_REG_ALDO1_VOLTAGE     0x92U
+#define AXP2101_REG_ALDO2_VOLTAGE     0x93U
+#define AXP2101_REG_ALDO3_VOLTAGE     0x94U
+#define AXP2101_REG_ALDO4_VOLTAGE     0x95U
+#define AXP2101_REG_BLDO1_VOLTAGE     0x96U
+#define AXP2101_REG_BLDO2_VOLTAGE     0x97U
+#define AXP2101_REG_CPUSLDO_VOLTAGE   0x98U
+#define AXP2101_REG_DLDO1_VOLTAGE     0x99U
+#define AXP2101_REG_DLDO2_VOLTAGE     0x9AU
+
+#define AXP2101_CHGLED_CTRL_MASK   0x3
+#define AXP2101_CHGLED_CTRL_OFFSET 1
+
+#define AXP2101_VBUS_CFG_REG                0
+#define AXP2101_VBUS_CFG_VAL_VBUSEN_DISABLE 0
+
+#define AXP_NODE_HAS_CHILD(node, child) DT_NODE_HAS_STATUS_OKAY(DT_CHILD(node, child)) |
+#define AXP192_ANY_HAS_CHILD(child)                                                                \
+	(DT_FOREACH_STATUS_OKAY_VARGS(x_powers_axp192_regulator, AXP_NODE_HAS_CHILD, child) 0)
+#define AXP2101_ANY_HAS_CHILD(child)                                                               \
+	(DT_FOREACH_STATUS_OKAY_VARGS(x_powers_axp2101_regulator, AXP_NODE_HAS_CHILD, child) 0)
+
 struct regulator_axp192_desc {
 	const uint8_t enable_reg;
 	const uint8_t enable_mask;
@@ -56,15 +88,13 @@ struct regulator_axp192_config {
 	const struct regulator_axp192_desc *desc;
 	const struct device *mfd;
 	const struct i2c_dt_spec i2c;
-
-	LOG_INSTANCE_PTR_DECLARE(log);
 };
 
-static const struct linear_range dcdc1_ranges[] = {
+static const struct linear_range axp192_dcdc1_ranges[] = {
 	LINEAR_RANGE_INIT(700000U, 25000U, 0x00U, 0x7FU),
 };
 
-__maybe_unused static const struct regulator_axp192_desc dcdc1_desc = {
+__maybe_unused static const struct regulator_axp192_desc axp192_dcdc1_desc = {
 	.enable_reg = AXP192_REG_DCDC123_LDO23_CONTROL,
 	.enable_mask = 0x01U,
 	.enable_val = 0x01U,
@@ -75,15 +105,15 @@ __maybe_unused static const struct regulator_axp192_desc dcdc1_desc = {
 	.workmode_reg = AXP192_REG_DCDC123_WORKMODE,
 	.workmode_mask = 0x08U,
 	.workmode_pwm_val = 0x08U,
-	.ranges = dcdc1_ranges,
-	.num_ranges = ARRAY_SIZE(dcdc1_ranges),
+	.ranges = axp192_dcdc1_ranges,
+	.num_ranges = ARRAY_SIZE(axp192_dcdc1_ranges),
 };
 
-static const struct linear_range dcdc2_ranges[] = {
+static const struct linear_range axp192_dcdc2_ranges[] = {
 	LINEAR_RANGE_INIT(700000U, 25000U, 0x00U, 0x3FU),
 };
 
-__maybe_unused static const struct regulator_axp192_desc dcdc2_desc = {
+__maybe_unused static const struct regulator_axp192_desc axp192_dcdc2_desc = {
 	.enable_reg = AXP192_REG_EXTEN_DCDC2_CONTROL,
 	.enable_mask = 0x01U,
 	.enable_val = 0x01U,
@@ -94,15 +124,15 @@ __maybe_unused static const struct regulator_axp192_desc dcdc2_desc = {
 	.workmode_reg = AXP192_REG_DCDC123_WORKMODE,
 	.workmode_mask = 0x04U,
 	.workmode_pwm_val = 0x04U,
-	.ranges = dcdc2_ranges,
-	.num_ranges = ARRAY_SIZE(dcdc2_ranges),
+	.ranges = axp192_dcdc2_ranges,
+	.num_ranges = ARRAY_SIZE(axp192_dcdc2_ranges),
 };
 
-static const struct linear_range dcdc3_ranges[] = {
+static const struct linear_range axp192_dcdc3_ranges[] = {
 	LINEAR_RANGE_INIT(700000U, 25000U, 0x00U, 0x7FU),
 };
 
-__maybe_unused static const struct regulator_axp192_desc dcdc3_desc = {
+__maybe_unused static const struct regulator_axp192_desc axp192_dcdc3_desc = {
 	.enable_reg = AXP192_REG_DCDC123_LDO23_CONTROL,
 	.enable_mask = 0x02U,
 	.enable_val = 0x02U,
@@ -113,15 +143,15 @@ __maybe_unused static const struct regulator_axp192_desc dcdc3_desc = {
 	.workmode_reg = AXP192_REG_DCDC123_WORKMODE,
 	.workmode_mask = 0x02U,
 	.workmode_pwm_val = 0x02U,
-	.ranges = dcdc3_ranges,
-	.num_ranges = ARRAY_SIZE(dcdc3_ranges),
+	.ranges = axp192_dcdc3_ranges,
+	.num_ranges = ARRAY_SIZE(axp192_dcdc3_ranges),
 };
 
-static const struct linear_range ldoio0_ranges[] = {
+static const struct linear_range axp192_ldoio0_ranges[] = {
 	LINEAR_RANGE_INIT(1800000u, 100000u, 0x00u, 0x0Fu),
 };
 
-__maybe_unused static const struct regulator_axp192_desc ldoio0_desc = {
+__maybe_unused static const struct regulator_axp192_desc axp192_ldoio0_desc = {
 	.enable_reg = AXP192_REG_GPIO0_CONTROL,
 	.enable_mask = 0x07u,
 	.enable_val = 0x03u,
@@ -131,15 +161,15 @@ __maybe_unused static const struct regulator_axp192_desc ldoio0_desc = {
 	.max_ua = 50000u,
 	.workmode_reg = 0u,
 	.workmode_mask = 0u,
-	.ranges = ldoio0_ranges,
-	.num_ranges = ARRAY_SIZE(ldoio0_ranges),
+	.ranges = axp192_ldoio0_ranges,
+	.num_ranges = ARRAY_SIZE(axp192_ldoio0_ranges),
 };
 
-static const struct linear_range ldo2_ranges[] = {
+static const struct linear_range axp192_ldo2_ranges[] = {
 	LINEAR_RANGE_INIT(1800000U, 100000U, 0x00U, 0x0FU),
 };
 
-__maybe_unused static const struct regulator_axp192_desc ldo2_desc = {
+__maybe_unused static const struct regulator_axp192_desc axp192_ldo2_desc = {
 	.enable_reg = AXP192_REG_DCDC123_LDO23_CONTROL,
 	.enable_mask = 0x04U,
 	.enable_val = 0x04U,
@@ -149,15 +179,15 @@ __maybe_unused static const struct regulator_axp192_desc ldo2_desc = {
 	.max_ua = 200000U,
 	.workmode_reg = 0U,
 	.workmode_mask = 0U,
-	.ranges = ldo2_ranges,
-	.num_ranges = ARRAY_SIZE(ldo2_ranges),
+	.ranges = axp192_ldo2_ranges,
+	.num_ranges = ARRAY_SIZE(axp192_ldo2_ranges),
 };
 
-static const struct linear_range ldo3_ranges[] = {
+static const struct linear_range axp192_ldo3_ranges[] = {
 	LINEAR_RANGE_INIT(1800000U, 100000U, 0x00U, 0x0FU),
 };
 
-__maybe_unused static const struct regulator_axp192_desc ldo3_desc = {
+__maybe_unused static const struct regulator_axp192_desc axp192_ldo3_desc = {
 	.enable_reg = AXP192_REG_DCDC123_LDO23_CONTROL,
 	.enable_mask = 0x08U,
 	.enable_val = 0x08U,
@@ -167,8 +197,238 @@ __maybe_unused static const struct regulator_axp192_desc ldo3_desc = {
 	.max_ua = 200000U,
 	.workmode_reg = 0U,
 	.workmode_mask = 0U,
-	.ranges = ldo3_ranges,
-	.num_ranges = ARRAY_SIZE(ldo3_ranges),
+	.ranges = axp192_ldo3_ranges,
+	.num_ranges = ARRAY_SIZE(axp192_ldo3_ranges),
+};
+
+static const struct linear_range axp2101_dcdc1_ranges[] = {
+	LINEAR_RANGE_INIT(1500000U, 100000U, 0U, 19U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_dcdc1_desc = {
+	.enable_reg = AXP2101_REG_DCDC12345_CONTROL,
+	.enable_mask = 0x01U,
+	.enable_val = 0x01U,
+	.vsel_reg = AXP2101_REG_DCDC1_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 2000000U,
+	.ranges = axp2101_dcdc1_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_dcdc1_ranges),
+	.workmode_reg = AXP2101_REG_DCDCS_PWM_CONTROL,
+	.workmode_mask = BIT(2),
+	.workmode_pwm_val = BIT(2),
+};
+
+static const struct linear_range axp2101_dcdc2_ranges[] = {
+	LINEAR_RANGE_INIT(500000U, 10000U, 0U, 70U),
+	LINEAR_RANGE_INIT(1220000U, 20000U, 71U, 87U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_dcdc2_desc = {
+	.enable_reg = AXP2101_REG_DCDC12345_CONTROL,
+	.enable_mask = 0x02U,
+	.enable_val = 0x02U,
+	.vsel_reg = AXP2101_REG_DCDC2_VOLTAGE,
+	.vsel_mask = 0x7FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 2000000U,
+	.ranges = axp2101_dcdc2_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_dcdc2_ranges),
+	.workmode_reg = AXP2101_REG_DCDCS_PWM_CONTROL,
+	.workmode_mask = BIT(3),
+	.workmode_pwm_val = BIT(3),
+};
+
+static const struct linear_range axp2101_dcdc3_ranges[] = {
+	LINEAR_RANGE_INIT(500000U, 10000U, 0U, 70U),
+	LINEAR_RANGE_INIT(1220000U, 20000U, 71U, 87U),
+	LINEAR_RANGE_INIT(1600000U, 100000U, 88U, 106U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_dcdc3_desc = {
+	.enable_reg = AXP2101_REG_DCDC12345_CONTROL,
+	.enable_mask = 0x04U,
+	.enable_val = 0x04U,
+	.vsel_reg = AXP2101_REG_DCDC3_VOLTAGE,
+	.vsel_mask = 0x7FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 2000000U,
+	.ranges = axp2101_dcdc3_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_dcdc3_ranges),
+	.workmode_reg = AXP2101_REG_DCDCS_PWM_CONTROL,
+	.workmode_mask = BIT(4),
+	.workmode_pwm_val = BIT(4),
+};
+
+static const struct linear_range axp2101_dcdc4_ranges[] = {
+	LINEAR_RANGE_INIT(500000U, 10000U, 0U, 70U),
+	LINEAR_RANGE_INIT(1220000U, 20000U, 71U, 102U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_dcdc4_desc = {
+	.enable_reg = AXP2101_REG_DCDC12345_CONTROL,
+	.enable_mask = 0x08U,
+	.enable_val = 0x08U,
+	.vsel_reg = AXP2101_REG_DCDC4_VOLTAGE,
+	.vsel_mask = 0x7FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 1500000U,
+	.ranges = axp2101_dcdc4_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_dcdc4_ranges),
+	.workmode_reg = AXP2101_REG_DCDCS_PWM_CONTROL,
+	.workmode_mask = BIT(5),
+	.workmode_pwm_val = BIT(5),
+};
+
+static const struct linear_range axp2101_dcdc5_ranges[] = {
+	LINEAR_RANGE_INIT(1400000U, 100000U, 0U, 23U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_dcdc5_desc = {
+	.enable_reg = AXP2101_REG_DCDC12345_CONTROL,
+	.enable_mask = 0x10U,
+	.enable_val = 0x10U,
+	.vsel_reg = AXP2101_REG_DCDC5_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 1000000U,
+	.ranges = axp2101_dcdc5_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_dcdc5_ranges),
+};
+
+static const struct linear_range axp2101_abldox_ranges[] = {
+	LINEAR_RANGE_INIT(500000U, 100000U, 0U, 30U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_aldo1_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x01U,
+	.enable_val = 0x01U,
+	.vsel_reg = AXP2101_REG_ALDO1_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_abldox_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_abldox_ranges),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_aldo2_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x02U,
+	.enable_val = 0x02U,
+	.vsel_reg = AXP2101_REG_ALDO2_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_abldox_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_abldox_ranges),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_aldo3_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x04U,
+	.enable_val = 0x04U,
+	.vsel_reg = AXP2101_REG_ALDO3_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_abldox_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_abldox_ranges),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_aldo4_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x08U,
+	.enable_val = 0x08U,
+	.vsel_reg = AXP2101_REG_ALDO4_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_abldox_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_abldox_ranges),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_bldo1_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x10U,
+	.enable_val = 0x10U,
+	.vsel_reg = AXP2101_REG_BLDO1_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_abldox_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_abldox_ranges),
+	.workmode_reg = 0U,
+	.workmode_mask = 0U,
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_bldo2_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x20U,
+	.enable_val = 0x20U,
+	.vsel_reg = AXP2101_REG_BLDO2_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_abldox_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_abldox_ranges),
+	.workmode_reg = 0U,
+	.workmode_mask = 0U,
+};
+
+static const struct linear_range axp2101_cpusldo_ranges[] = {
+	LINEAR_RANGE_INIT(500000U, 50000U, 0U, 19U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_cpusldo_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x40U,
+	.enable_val = 0x40U,
+	.vsel_reg = AXP2101_REG_CPUSLDO_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 30000U,
+	.ranges = axp2101_cpusldo_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_cpusldo_ranges),
+	.workmode_reg = 0U,
+	.workmode_mask = 0U,
+};
+
+static const struct linear_range axp2101_dldo1_ranges[] = {
+	LINEAR_RANGE_INIT(500000U, 100000U, 0U, 28U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_dldo1_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP1_CONTROL,
+	.enable_mask = 0x80U,
+	.enable_val = 0x80U,
+	.vsel_reg = AXP2101_REG_DLDO1_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_dldo1_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_dldo1_ranges),
+	.workmode_reg = 0U,
+	.workmode_mask = 0U,
+};
+
+static const struct linear_range axp2101_dldo2_ranges[] = {
+	LINEAR_RANGE_INIT(500000U, 50000U, 0U, 19U),
+};
+
+__maybe_unused static const struct regulator_axp192_desc axp2101_dldo2_desc = {
+	.enable_reg = AXP2101_REG_LDOGRP2_CONTROL,
+	.enable_mask = 0x01U,
+	.enable_val = 0x01U,
+	.vsel_reg = AXP2101_REG_DLDO2_VOLTAGE,
+	.vsel_mask = 0x1FU,
+	.vsel_bitpos = 0U,
+	.max_ua = 300000U,
+	.ranges = axp2101_dldo2_ranges,
+	.num_ranges = ARRAY_SIZE(axp2101_dldo2_ranges),
+	.workmode_reg = 0U,
+	.workmode_mask = 0U,
 };
 
 static int axp192_enable(const struct device *dev)
@@ -176,20 +436,24 @@ static int axp192_enable(const struct device *dev)
 	const struct regulator_axp192_config *config = dev->config;
 	int ret;
 
-	LOG_INST_DBG(config->log, "Enabling regulator");
-	LOG_INST_DBG(config->log, "[0x%02x]=0x%02x mask=0x%02x", config->desc->enable_reg,
+	LOG_DBG("Enabling regulator");
+	LOG_DBG("[0x%02x]=0x%02x mask=0x%02x", config->desc->enable_reg,
 		     config->desc->enable_val, config->desc->enable_mask);
 
+#if AXP192_ANY_HAS_CHILD(ldoio0)
 	/* special case for LDOIO0, which is multiplexed with GPIO0 */
 	if (config->desc->enable_reg == AXP192_REG_GPIO0_CONTROL) {
 		ret = mfd_axp192_gpio_func_ctrl(config->mfd, dev, 0, AXP192_GPIO_FUNC_LDO);
 	} else {
+#endif
 		ret = i2c_reg_update_byte_dt(&config->i2c, config->desc->enable_reg,
 					     config->desc->enable_mask, config->desc->enable_val);
+#if AXP192_ANY_HAS_CHILD(ldoio0)
 	}
+#endif
 
 	if (ret != 0) {
-		LOG_INST_ERR(config->log, "Failed to enable regulator");
+		LOG_ERR("Failed to enable regulator");
 	}
 
 	return ret;
@@ -200,19 +464,24 @@ static int axp192_disable(const struct device *dev)
 	const struct regulator_axp192_config *config = dev->config;
 	int ret;
 
-	LOG_INST_DBG(config->log, "Disabling regulator");
-	LOG_INST_DBG(config->log, "[0x%02x]=0 mask=0x%x", config->desc->enable_reg,
+	LOG_DBG("Disabling regulator");
+	LOG_DBG("[0x%02x]=0 mask=0x%x", config->desc->enable_reg,
 		     config->desc->enable_mask);
 
+#if AXP192_ANY_HAS_CHILD(ldoio0)
 	/* special case for LDOIO0, which is multiplexed with GPIO0 */
 	if (config->desc->enable_reg == AXP192_REG_GPIO0_CONTROL) {
 		ret = mfd_axp192_gpio_func_ctrl(config->mfd, dev, 0, AXP192_GPIO_FUNC_OUTPUT_LOW);
 	} else {
+#endif
 		ret = i2c_reg_update_byte_dt(&config->i2c, config->desc->enable_reg,
 					     config->desc->enable_mask, 0u);
+#if AXP192_ANY_HAS_CHILD(ldoio0)
 	}
+#endif
+
 	if (ret != 0) {
-		LOG_INST_ERR(config->log, "Failed to disable regulator");
+		LOG_ERR("Failed to disable regulator");
 	}
 
 	return ret;
@@ -239,24 +508,24 @@ static int axp192_set_voltage(const struct device *dev, int32_t min_uv, int32_t
 	uint16_t idx;
 	int ret;
 
-	LOG_INST_DBG(config->log, "voltage = [min=%d, max=%d]", min_uv, max_uv);
+	LOG_DBG("voltage = [min=%d, max=%d]", min_uv, max_uv);
 
 	/* set voltage */
 	ret = linear_range_group_get_win_index(config->desc->ranges, config->desc->num_ranges,
 					       min_uv, max_uv, &idx);
 	if (ret != 0) {
-		LOG_INST_ERR(config->log, "No voltage range window could be detected");
+		LOG_ERR("No voltage range window could be detected");
 		return ret;
 	}
 
 	idx <<= config->desc->vsel_bitpos;
 
-	LOG_INST_DBG(config->log, "[0x%x]=0x%x mask=0x%x", config->desc->vsel_reg, idx,
+	LOG_DBG("[0x%x]=0x%x mask=0x%x", config->desc->vsel_reg, idx,
 		     config->desc->vsel_mask);
 	ret = i2c_reg_update_byte_dt(&config->i2c, config->desc->vsel_reg, config->desc->vsel_mask,
 				     (uint8_t)idx);
 	if (ret != 0) {
-		LOG_INST_ERR(config->log, "Failed to set regulator voltage");
+		LOG_ERR("Failed to set regulator voltage");
 	}
 
 	return ret;
@@ -291,7 +560,7 @@ static int axp192_set_mode(const struct device *dev, regulator_mode_t mode)
 	if ((mode == AXP192_DCDC_MODE_PWM) && (config->desc->workmode_reg != 0)) {
 
 		/* configure PWM mode */
-		LOG_INST_DBG(config->log, "PWM mode enabled");
+		LOG_DBG("PWM mode enabled");
 		ret = i2c_reg_update_byte_dt(&config->i2c, config->desc->workmode_reg,
 					     config->desc->workmode_mask,
 					     config->desc->workmode_pwm_val);
@@ -313,7 +582,7 @@ static int axp192_set_mode(const struct device *dev, regulator_mode_t mode)
 			return 0;
 		}
 	} else {
-		LOG_INST_ERR(config->log, "Setting DCDC workmode failed");
+		LOG_ERR("Setting DCDC workmode failed");
 		return -ENOTSUP;
 	}
 
@@ -350,44 +619,63 @@ static int regulator_axp192_init(const struct device *dev)
 	regulator_common_data_init(dev);
 
 	if (!device_is_ready(config->mfd)) {
-		LOG_INST_ERR(config->log, "Parent instance not ready!");
+		LOG_ERR("Parent instance not ready!");
 		return -ENODEV;
 	}
 
 	/* read regulator state */
 	ret = i2c_reg_read_byte_dt(&config->i2c, config->desc->enable_reg, &enabled_val);
 	if (ret != 0) {
-		LOG_INST_ERR(config->log, "Reading enable status failed!");
+		LOG_ERR("Reading enable status failed!");
 		return ret;
 	}
 	is_enabled = ((enabled_val & config->desc->enable_mask) == config->desc->enable_val);
-	LOG_INST_DBG(config->log, "is_enabled: %d", is_enabled);
+	LOG_DBG("is_enabled: %d", is_enabled);
 
 	return regulator_common_init(dev, is_enabled);
 }
 
 #define REGULATOR_AXP192_DEFINE(node_id, id, name)                                                 \
 	static struct regulator_axp192_data data_##id;                                             \
-	LOG_INSTANCE_REGISTER(name, node_id, CONFIG_REGULATOR_LOG_LEVEL);                          \
 	static const struct regulator_axp192_config config_##id = {                                \
 		.common = REGULATOR_DT_COMMON_CONFIG_INIT(node_id),                                \
-		.desc = &name##_desc,                                                              \
+		.desc = &id##_desc,                                                                \
 		.mfd = DEVICE_DT_GET(DT_GPARENT(node_id)),                                         \
-		.i2c = I2C_DT_SPEC_GET(DT_GPARENT(node_id)),                                       \
-		LOG_INSTANCE_PTR_INIT(log, name, node_id)};                                        \
+		.i2c = I2C_DT_SPEC_GET(DT_GPARENT(node_id))};                                      \
 	DEVICE_DT_DEFINE(node_id, regulator_axp192_init, NULL, &data_##id, &config_##id,           \
-			 POST_KERNEL, CONFIG_REGULATOR_AXP192_INIT_PRIORITY, &api);
-
-#define REGULATOR_AXP192_DEFINE_COND(inst, child)                                                  \
-	COND_CODE_1(DT_NODE_EXISTS(DT_INST_CHILD(inst, child)),                                    \
-		    (REGULATOR_AXP192_DEFINE(DT_INST_CHILD(inst, child), child##inst, child)), ())
-
-#define REGULATOR_AXP192_DEFINE_ALL(inst)                                                          \
-	REGULATOR_AXP192_DEFINE_COND(inst, dcdc1)                                                  \
-	REGULATOR_AXP192_DEFINE_COND(inst, dcdc2)                                                  \
-	REGULATOR_AXP192_DEFINE_COND(inst, dcdc3)                                                  \
-	REGULATOR_AXP192_DEFINE_COND(inst, ldoio0)                                                 \
-	REGULATOR_AXP192_DEFINE_COND(inst, ldo2)                                                   \
-	REGULATOR_AXP192_DEFINE_COND(inst, ldo3)
-
-DT_INST_FOREACH_STATUS_OKAY(REGULATOR_AXP192_DEFINE_ALL)
+			 POST_KERNEL, CONFIG_REGULATOR_AXP192_AXP2101_INIT_PRIORITY, &api);
+
+#define REGULATOR_AXP192_DEFINE_COND(node, child)                                                  \
+	COND_CODE_1(DT_NODE_EXISTS(DT_CHILD(node, child)),                                         \
+		    (REGULATOR_AXP192_DEFINE(DT_CHILD(node, child), axp192_##child, child)), ())
+
+#define REGULATOR_AXP2101_DEFINE_COND(node, child)                                                 \
+	COND_CODE_1(DT_NODE_EXISTS(DT_CHILD(node, child)),                                         \
+		    (REGULATOR_AXP192_DEFINE(DT_CHILD(node, child), axp2101_##child, child)), ())
+
+#define REGULATOR_AXP192_DEFINE_ALL(node)                                                          \
+	REGULATOR_AXP192_DEFINE_COND(node, dcdc1)                                                  \
+	REGULATOR_AXP192_DEFINE_COND(node, dcdc2)                                                  \
+	REGULATOR_AXP192_DEFINE_COND(node, dcdc3)                                                  \
+	REGULATOR_AXP192_DEFINE_COND(node, ldoio0)                                                 \
+	REGULATOR_AXP192_DEFINE_COND(node, ldo2)                                                   \
+	REGULATOR_AXP192_DEFINE_COND(node, ldo3)
+
+#define REGULATOR_AXP2101_DEFINE_ALL(node)                                                         \
+	REGULATOR_AXP2101_DEFINE_COND(node, dcdc1)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, dcdc2)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, dcdc3)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, dcdc4)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, dcdc5)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, aldo1)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, aldo2)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, aldo3)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, aldo4)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, bldo1)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, bldo2)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, cpusldo)                                               \
+	REGULATOR_AXP2101_DEFINE_COND(node, dldo1)                                                 \
+	REGULATOR_AXP2101_DEFINE_COND(node, dldo2)
+
+DT_FOREACH_STATUS_OKAY(x_powers_axp192_regulator, REGULATOR_AXP192_DEFINE_ALL)
+DT_FOREACH_STATUS_OKAY(x_powers_axp2101_regulator, REGULATOR_AXP2101_DEFINE_ALL)
diff --git a/drivers/regulator/regulator_fake.c b/drivers/regulator/regulator_fake.c
index e48bd8cdb398a..9e483ae7d3bfa 100644
--- a/drivers/regulator/regulator_fake.c
+++ b/drivers/regulator/regulator_fake.c
@@ -32,6 +32,9 @@ DEFINE_FAKE_VALUE_FUNC(int, regulator_fake_set_voltage, const struct device *,
 		       int32_t, int32_t);
 DEFINE_FAKE_VALUE_FUNC(int, regulator_fake_get_voltage, const struct device *,
 		       int32_t *);
+DEFINE_FAKE_VALUE_FUNC(unsigned int, regulator_fake_count_current_limits, const struct device *);
+DEFINE_FAKE_VALUE_FUNC(int, regulator_fake_list_current_limit, const struct device *, unsigned int,
+		       int32_t *);
 DEFINE_FAKE_VALUE_FUNC(int, regulator_fake_set_current_limit,
 		       const struct device *, int32_t, int32_t);
 DEFINE_FAKE_VALUE_FUNC(int, regulator_fake_get_current_limit,
@@ -54,6 +57,8 @@ static DEVICE_API(regulator, api) = {
 	.list_voltage = regulator_fake_list_voltage,
 	.set_voltage = regulator_fake_set_voltage,
 	.get_voltage = regulator_fake_get_voltage,
+	.count_current_limits = regulator_fake_count_current_limits,
+	.list_current_limit = regulator_fake_list_current_limit,
 	.set_current_limit = regulator_fake_set_current_limit,
 	.get_current_limit = regulator_fake_get_current_limit,
 	.set_mode = regulator_fake_set_mode,
diff --git a/drivers/regulator/regulator_npm1300.c b/drivers/regulator/regulator_npm1300.c
index c44339ccabfec..e049fab8d9d6a 100644
--- a/drivers/regulator/regulator_npm1300.c
+++ b/drivers/regulator/regulator_npm1300.c
@@ -673,7 +673,7 @@ static DEVICE_API(regulator, api) = {
 		.enable_gpios = GPIO_DT_SPEC_GET_OR(node_id, enable_gpios, {0}),                   \
 		.retention_gpios = GPIO_DT_SPEC_GET_OR(node_id, retention_gpios, {0}),             \
 		.pwm_gpios = GPIO_DT_SPEC_GET_OR(node_id, pwm_gpios, {0}),                         \
-		.ldo_disable_workaround = DT_PROP(node_id, nordic_ldo_disable_workaround)};        \
+		.ldo_disable_workaround = DT_PROP(node_id, nordic_anomaly38_disable_workaround)};  \
                                                                                                    \
 	DEVICE_DT_DEFINE(node_id, regulator_npm1300_init, NULL, &data_##id, &config_##id,          \
 			 POST_KERNEL, CONFIG_REGULATOR_NPM1300_INIT_PRIORITY, &api);
diff --git a/drivers/regulator/regulator_pf1550.c b/drivers/regulator/regulator_pf1550.c
new file mode 100644
index 0000000000000..7cbfd0cd7713d
--- /dev/null
+++ b/drivers/regulator/regulator_pf1550.c
@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 2024 Arduino SA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT nxp_pf1550_regulator
+
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/regulator.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/linear_range.h>
+
+#define PMIC_DEVICE_ID         0x00
+#define PMIC_OTP_FLAVOR        0x01
+#define PMIC_SILICON_REV       0x02
+#define PMIC_INT_CATEGORY      0x06
+#define PMIC_SW_INT_STAT0      0x08
+#define PMIC_SW_INT_MASK0      0x09
+#define PMIC_SW_INT_SENSE0     0x0A
+#define PMIC_SW_INT_STAT1      0x0B
+#define PMIC_SW_INT_MASK1      0x0C
+#define PMIC_SW_INT_SENSE1     0x0D
+#define PMIC_SW_INT_STAT2      0x0E
+#define PMIC_SW_INT_MASK2      0x0F
+#define PMIC_SW_INT_SENSE2     0x10
+#define PMIC_LDO_INT_STAT0     0x18
+#define PMIC_LDO_INT_MASK0     0x19
+#define PMIC_LDO_INT_SENSE0    0x1A
+#define PMIC_TEMP_INT_STAT0    0x20
+#define PMIC_TEMP_INT_MASK0    0x21
+#define PMIC_TEMP_INT_SENSE0   0x22
+#define PMIC_ONKEY_INT_STAT0   0x24
+#define PMIC_ONKEY_INT_MASK0   0x25
+#define PMIC_ONKEY_INT_SENSE0  0x26
+#define PMIC_MISC_INT_STAT0    0x28
+#define PMIC_MISC_INT_MASK0    0x29
+#define PMIC_MISC_INT_SENSE0   0x2A
+#define PMIC_COINCELL_CONTROL  0x30
+#define PMIC_SW1_VOLT          0x32
+#define PMIC_SW1_STBY_VOLT     0x33
+#define PMIC_SW1_SLP_VOLT      0x34
+#define PMIC_SW1_CTRL          0x35
+#define PMIC_SW1_CTRL1         0x36
+#define PMIC_SW2_VOLT          0x38
+#define PMIC_SW2_STBY_VOLT     0x39
+#define PMIC_SW2_SLP_VOLT      0x3A
+#define PMIC_SW2_CTRL          0x3B
+#define PMIC_SW2_CTRL1         0x3C
+#define PMIC_SW3_VOLT          0x3E
+#define PMIC_SW3_STBY_VOLT     0x3F
+#define PMIC_SW3_SLP_VOLT      0x40
+#define PMIC_SW3_CTRL          0x41
+#define PMIC_SW3_CTRL1         0x42
+#define PMIC_VSNVS_CTRL        0x48
+#define PMIC_VREFDDR_CTRL      0x4A
+#define PMIC_LDO1_VOLT         0x4C
+#define PMIC_LDO1_CTRL         0x4D
+#define PMIC_LDO2_VOLT         0x4F
+#define PMIC_LDO2_CTRL         0x50
+#define PMIC_LDO3_VOLT         0x52
+#define PMIC_LDO3_CTRL         0x53
+#define PMIC_PWRCTRL0          0x58
+#define PMIC_PWRCTRL1          0x59
+#define PMIC_PWRCTRL2          0x5A
+#define PMIC_PWRCTRL3          0x5B
+#define PMIC_SW1_PWRDN_SEQ     0x5F
+#define PMIC_SW2_PWRDN_SEQ     0x60
+#define PMIC_SW3_PWRDN_SEQ     0x61
+#define PMIC_LDO1_PWRDN_SEQ    0x62
+#define PMIC_LDO2_PWRDN_SEQ    0x63
+#define PMIC_LDO3_PWRDN_SEQ    0x64
+#define PMIC_VREFDDR_PWRDN_SEQ 0x65
+#define PMIC_STATE_INFO        0x67
+#define PMIC_I2C_ADDR          0x68
+#define PMIC_RC_16MHZ          0x6B
+#define PMIC_KEY1              0x6B
+
+enum pf1550_pmic_sources {
+	PF1550_PMIC_SOURCE_BUCK1,
+	PF1550_PMIC_SOURCE_BUCK2,
+	PF1550_PMIC_SOURCE_BUCK3,
+	PF1550_PMIC_SOURCE_LDO1,
+	PF1550_PMIC_SOURCE_LDO2,
+	PF1550_PMIC_SOURCE_LDO3,
+};
+
+struct regulator_pf1550_desc {
+	uint8_t vsel_reg;
+	uint8_t enable_mask;
+	uint8_t enable_val;
+	uint8_t cfg_reg;
+	const struct linear_range *uv_range;
+	uint8_t uv_nranges;
+	const struct linear_range *ua_range;
+	uint8_t ua_nranges;
+};
+
+struct regulator_pf1550_common_config {
+	struct i2c_dt_spec bus;
+};
+
+struct regulator_pf1550_config {
+	struct regulator_common_config common;
+	struct i2c_dt_spec bus;
+	const struct regulator_pf1550_desc *desc;
+	uint8_t source;
+};
+
+struct regulator_pf1550_data {
+	struct regulator_common_data common;
+};
+
+/*
+ * Output voltage for BUCK1/2 with DVS disabled (OTP_SWx_DVS_SEL =  1).
+ * This is needed to reach the 3V3 maximum range
+ */
+static const struct linear_range buck12_range[] = {
+	LINEAR_RANGE_INIT(1100000, 0, 0, 0), LINEAR_RANGE_INIT(1200000, 0, 1, 1),
+	LINEAR_RANGE_INIT(1350000, 0, 2, 2), LINEAR_RANGE_INIT(1500000, 0, 3, 3),
+	LINEAR_RANGE_INIT(1800000, 0, 4, 4), LINEAR_RANGE_INIT(2500000, 0, 5, 5),
+	LINEAR_RANGE_INIT(3000000, 0, 6, 6), LINEAR_RANGE_INIT(3300000, 0, 7, 7),
+};
+static const struct linear_range buck3_range[] = {
+	LINEAR_RANGE_INIT(1800000, 100000, 0, 15),
+};
+static const struct linear_range buck123_current_limit_range[] = {
+	LINEAR_RANGE_INIT(1000000, 0, 0, 0),
+	LINEAR_RANGE_INIT(1200000, 0, 0, 0),
+	LINEAR_RANGE_INIT(1500000, 0, 0, 0),
+	LINEAR_RANGE_INIT(2000000, 0, 0, 0),
+};
+static const struct linear_range ldo13_range[] = {
+	LINEAR_RANGE_INIT(750000, 50000, 0, 15),
+	LINEAR_RANGE_INIT(1800000, 100000, 16, 31),
+};
+static const struct linear_range ldo2_range[] = {
+	LINEAR_RANGE_INIT(1800000, 100000, 0, 15),
+};
+
+#define PF1550_RAIL_EN        BIT(0)
+#define PF1550_RAIL_EN_MASK   GENMASK(1, 0)
+#define PF1550_GOTO_SHIP      BIT(0)
+#define PF1550_GOTO_SHIP_MASK GENMASK(1, 0)
+
+static const struct regulator_pf1550_desc __maybe_unused buck1_desc = {
+	.vsel_reg = PMIC_SW1_VOLT,
+	.enable_mask = PF1550_RAIL_EN,
+	.enable_val = PF1550_RAIL_EN_MASK,
+	.cfg_reg = PMIC_SW1_CTRL,
+	.uv_range = buck12_range,
+	.uv_nranges = ARRAY_SIZE(buck12_range),
+	.ua_range = buck123_current_limit_range,
+	.ua_nranges = ARRAY_SIZE(buck123_current_limit_range),
+};
+
+static const struct regulator_pf1550_desc __maybe_unused buck2_desc = {
+	.vsel_reg = PMIC_SW2_VOLT,
+	.enable_mask = PF1550_RAIL_EN,
+	.enable_val = PF1550_RAIL_EN_MASK,
+	.cfg_reg = PMIC_SW2_CTRL,
+	.uv_range = buck12_range,
+	.uv_nranges = ARRAY_SIZE(buck12_range),
+	.ua_range = buck123_current_limit_range,
+	.ua_nranges = ARRAY_SIZE(buck123_current_limit_range),
+};
+
+static const struct regulator_pf1550_desc __maybe_unused buck3_desc = {
+	.vsel_reg = PMIC_SW3_VOLT,
+	.enable_mask = PF1550_RAIL_EN,
+	.enable_val = PF1550_RAIL_EN_MASK,
+	.cfg_reg = PMIC_SW3_CTRL,
+	.uv_range = buck3_range,
+	.uv_nranges = ARRAY_SIZE(buck3_range),
+	.ua_range = buck123_current_limit_range,
+	.ua_nranges = ARRAY_SIZE(buck123_current_limit_range),
+};
+
+static const struct regulator_pf1550_desc __maybe_unused ldo1_desc = {
+	.vsel_reg = PMIC_LDO1_VOLT,
+	.enable_mask = PF1550_RAIL_EN,
+	.enable_val = PF1550_RAIL_EN_MASK,
+	.cfg_reg = PMIC_LDO1_CTRL,
+	.uv_range = ldo13_range,
+	.uv_nranges = ARRAY_SIZE(ldo13_range),
+};
+
+static const struct regulator_pf1550_desc __maybe_unused ldo2_desc = {
+	.vsel_reg = PMIC_LDO2_VOLT,
+	.enable_mask = PF1550_RAIL_EN,
+	.enable_val = PF1550_RAIL_EN_MASK,
+	.cfg_reg = PMIC_LDO2_CTRL,
+	.uv_range = ldo2_range,
+	.uv_nranges = ARRAY_SIZE(ldo2_range),
+};
+
+static const struct regulator_pf1550_desc __maybe_unused ldo3_desc = {
+	.vsel_reg = PMIC_LDO3_VOLT,
+	.enable_mask = PF1550_RAIL_EN,
+	.enable_val = PF1550_RAIL_EN_MASK,
+	.cfg_reg = PMIC_LDO3_CTRL,
+	.uv_range = ldo13_range,
+	.uv_nranges = ARRAY_SIZE(ldo13_range),
+};
+
+static int regulator_pf1550_set_enable(const struct device *dev, bool enable)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	return i2c_reg_update_byte_dt(&config->bus, config->desc->cfg_reg,
+				      config->desc->enable_mask,
+				      enable ? config->desc->enable_val : 0);
+}
+
+static int regulator_pf1550_enable(const struct device *dev)
+{
+	return regulator_pf1550_set_enable(dev, true);
+}
+
+static int regulator_pf1550_disable(const struct device *dev)
+{
+	return regulator_pf1550_set_enable(dev, false);
+}
+
+static unsigned int regulator_pf1550_count_voltages(const struct device *dev)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	return linear_range_group_values_count(config->desc->uv_range, config->desc->uv_nranges);
+}
+
+static int regulator_pf1550_list_voltage(const struct device *dev, unsigned int idx,
+					 int32_t *volt_uv)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	return linear_range_group_get_value(config->desc->uv_range, config->desc->uv_nranges, idx,
+					    volt_uv);
+}
+
+static int regulator_pf1550_set_buck_ldo_voltage(const struct device *dev, int32_t min_uv,
+						 int32_t max_uv, const struct linear_range *range,
+						 const uint8_t nranges, uint8_t vout_reg)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+	uint16_t idx;
+	int ret;
+
+	ret = linear_range_group_get_win_index(range, nranges, min_uv, max_uv, &idx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return i2c_reg_write_byte_dt(&config->bus, vout_reg, (uint8_t)idx);
+}
+
+static int regulator_pf1550_buck12_ldo123_get_voltage(const struct device *dev,
+						      const struct linear_range *range,
+						      const uint8_t nranges, uint8_t vout_reg,
+						      int32_t *volt_uv)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+	uint8_t idx;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&config->bus, vout_reg, &idx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return linear_range_group_get_value(range, nranges, idx, volt_uv);
+}
+
+static int regulator_pf1550_get_voltage(const struct device *dev, int32_t *volt_uv)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	return regulator_pf1550_buck12_ldo123_get_voltage(dev, config->desc->uv_range,
+							  config->desc->uv_nranges,
+							  config->desc->vsel_reg, volt_uv);
+}
+
+static int regulator_pf1550_set_voltage(const struct device *dev, int32_t min_uv, int32_t max_uv)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	return regulator_pf1550_set_buck_ldo_voltage(dev, min_uv, max_uv, config->desc->uv_range,
+						     config->desc->uv_nranges,
+						     config->desc->vsel_reg);
+}
+
+static unsigned int regulator_pf1550_count_current_limits(const struct device *dev)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	if (config->source != PF1550_PMIC_SOURCE_BUCK1 &&
+	    config->source != PF1550_PMIC_SOURCE_BUCK2 &&
+	    config->source != PF1550_PMIC_SOURCE_BUCK3) {
+		return -ENOTSUP;
+	}
+
+	return linear_range_group_values_count(config->desc->ua_range, config->desc->ua_nranges);
+}
+
+static int regulator_pf1550_list_current_limit(const struct device *dev, unsigned int idx,
+					       int32_t *current_ua)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	if (config->source != PF1550_PMIC_SOURCE_BUCK1 &&
+	    config->source != PF1550_PMIC_SOURCE_BUCK2 &&
+	    config->source != PF1550_PMIC_SOURCE_BUCK3) {
+		return -ENOTSUP;
+	}
+
+	return linear_range_group_get_value(config->desc->ua_range, config->desc->ua_nranges, idx,
+					    current_ua);
+}
+
+static int regulator_pf1550_set_current_limit(const struct device *dev, int32_t min_ua,
+					      int32_t max_ua)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+	uint8_t val;
+	uint16_t idx;
+	int ret;
+
+	if (config->source != PF1550_PMIC_SOURCE_BUCK1 &&
+	    config->source != PF1550_PMIC_SOURCE_BUCK2 &&
+	    config->source != PF1550_PMIC_SOURCE_BUCK3) {
+		return -ENOTSUP;
+	}
+
+	/* Current is stored in SW*_CTRL1 register */
+	ret = i2c_reg_read_byte_dt(&config->bus, config->desc->cfg_reg + 1, &val);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = linear_range_group_get_win_index(config->desc->ua_range, config->desc->ua_nranges,
+					       min_ua, max_ua, &idx);
+	if (ret < 0) {
+		return ret;
+	}
+
+	val |= idx;
+	return i2c_reg_write_byte_dt(&config->bus, config->desc->cfg_reg + 1, val);
+}
+
+static int regulator_pf1550_power_off(const struct device *dev)
+{
+	const struct regulator_pf1550_common_config *common_config = dev->config;
+
+	return i2c_reg_update_byte_dt(&common_config->bus, PMIC_PWRCTRL3, PF1550_GOTO_SHIP_MASK,
+				      PF1550_GOTO_SHIP);
+}
+
+static int regulator_pf1550_init(const struct device *dev)
+{
+	const struct regulator_pf1550_config *config = dev->config;
+
+	if (!i2c_is_ready_dt(&config->bus)) {
+		return -ENODEV;
+	}
+
+	regulator_common_data_init(dev);
+
+	return regulator_common_init(dev, false);
+}
+
+static int regulator_pf1550_common_init(const struct device *dev)
+{
+	const struct regulator_pf1550_common_config *common_config = dev->config;
+
+	if (!i2c_is_ready_dt(&common_config->bus)) {
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(regulator_parent, parent_api) = {
+	.ship_mode = regulator_pf1550_power_off,
+};
+
+static DEVICE_API(regulator, api) = {
+	.enable = regulator_pf1550_enable,
+	.disable = regulator_pf1550_disable,
+	.count_voltages = regulator_pf1550_count_voltages,
+	.list_voltage = regulator_pf1550_list_voltage,
+	.set_voltage = regulator_pf1550_set_voltage,
+	.get_voltage = regulator_pf1550_get_voltage,
+	.count_current_limits = regulator_pf1550_count_current_limits,
+	.list_current_limit = regulator_pf1550_list_current_limit,
+	.set_current_limit = regulator_pf1550_set_current_limit,
+};
+
+#define REGULATOR_PF1550_DEFINE(node_id, id, child_name, _source)                                  \
+	static const struct regulator_pf1550_config regulator_pf1550_config_##id = {               \
+		.common = REGULATOR_DT_COMMON_CONFIG_INIT(node_id),                                \
+		.bus = I2C_DT_SPEC_GET(DT_GPARENT(node_id)),                                       \
+		.desc = &child_name##_desc,                                                        \
+		.source = _source,                                                                 \
+	};                                                                                         \
+												   \
+	static struct regulator_pf1550_data regulator_pf1550_data_##id;                            \
+	DEVICE_DT_DEFINE(node_id, regulator_pf1550_init, NULL, &regulator_pf1550_data_##id,        \
+			 &regulator_pf1550_config_##id, POST_KERNEL,                               \
+			 CONFIG_MFD_INIT_PRIORITY, &api);
+
+#define REGULATOR_PF1550_DEFINE_COND(inst, child, source)                                          \
+	COND_CODE_1(                                                                               \
+		DT_NODE_EXISTS(DT_INST_CHILD(inst, child)),                                        \
+		(REGULATOR_PF1550_DEFINE(DT_INST_CHILD(inst, child), child##inst, child, source)), \
+		())
+
+#define REGULATOR_PF1550_DEFINE_ALL(inst)                                                          \
+	static const struct regulator_pf1550_common_config common_config_##inst = {                \
+		.bus = I2C_DT_SPEC_GET(DT_INST_PARENT(inst)),                                      \
+	};                                                                                         \
+												   \
+	DEVICE_DT_INST_DEFINE(inst, regulator_pf1550_common_init, NULL, NULL,                      \
+			      &common_config_##inst, POST_KERNEL,                                  \
+			      CONFIG_MFD_INIT_PRIORITY, &parent_api);                              \
+												   \
+	REGULATOR_PF1550_DEFINE_COND(inst, buck1, PF1550_PMIC_SOURCE_BUCK1)                        \
+	REGULATOR_PF1550_DEFINE_COND(inst, buck2, PF1550_PMIC_SOURCE_BUCK2)                        \
+	REGULATOR_PF1550_DEFINE_COND(inst, buck3, PF1550_PMIC_SOURCE_BUCK3)                        \
+	REGULATOR_PF1550_DEFINE_COND(inst, ldo1, PF1550_PMIC_SOURCE_LDO1)                          \
+	REGULATOR_PF1550_DEFINE_COND(inst, ldo2, PF1550_PMIC_SOURCE_LDO2)                          \
+	REGULATOR_PF1550_DEFINE_COND(inst, ldo3, PF1550_PMIC_SOURCE_LDO3)
+
+DT_INST_FOREACH_STATUS_OKAY(REGULATOR_PF1550_DEFINE_ALL)
diff --git a/drivers/reset/CMakeLists.txt b/drivers/reset/CMakeLists.txt
index 84f0443cabb5f..e94d51e2d2aa4 100644
--- a/drivers/reset/CMakeLists.txt
+++ b/drivers/reset/CMakeLists.txt
@@ -12,3 +12,4 @@ zephyr_library_sources_ifdef(CONFIG_RESET_INTEL_SOCFPGA reset_intel_socfpga.c)
 zephyr_library_sources_ifdef(CONFIG_RESET_NPCX reset_npcx.c)
 zephyr_library_sources_ifdef(CONFIG_RESET_NXP_SYSCON reset_lpc_syscon.c)
 zephyr_library_sources_ifdef(CONFIG_RESET_NXP_RSTCTL reset_nxp_rstctl.c)
+zephyr_library_sources_ifdef(CONFIG_RESET_MMIO reset_mmio.c)
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 87ba9c7576cac..10e34c47f0b4f 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -36,5 +36,6 @@ rsource "Kconfig.intel_socfpga"
 rsource "Kconfig.npcx"
 rsource "Kconfig.lpc_syscon"
 rsource "Kconfig.nxp_rstctl"
+rsource "Kconfig.mmio"
 
 endif # RESET
diff --git a/drivers/reset/Kconfig.mmio b/drivers/reset/Kconfig.mmio
new file mode 100644
index 0000000000000..dc1c88a233d09
--- /dev/null
+++ b/drivers/reset/Kconfig.mmio
@@ -0,0 +1,11 @@
+# MMIO reset driver configuration options
+
+# Copyright (c) 2025 Google LLC
+# SPDX-License-Identifier: Apache-2.0
+
+config RESET_MMIO
+	bool "Generic MMIO reset driver"
+	default y
+	depends on DT_HAS_RESET_MMIO_ENABLED
+	help
+	  This option enables the generic MMIO reset driver. This is meant for IPs with a single memory mapped reset bit required to take them out of reset.
diff --git a/drivers/reset/reset_mmio.c b/drivers/reset/reset_mmio.c
new file mode 100644
index 0000000000000..033e8e00c667f
--- /dev/null
+++ b/drivers/reset/reset_mmio.c
@@ -0,0 +1,111 @@
+/* Copyright (c) 2025 Google LLC.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/reset.h>
+#include <zephyr/kernel.h>
+
+struct reset_mmio_dev_config {
+	uint32_t base;
+	uint8_t num_resets;
+	bool active_low;
+};
+
+struct reset_mmio_dev_data {
+	struct k_spinlock lock;
+};
+
+static inline int reset_mmio_status(const struct device *dev, uint32_t id, uint8_t *status)
+{
+	const struct reset_mmio_dev_config *config = dev->config;
+	uint32_t value;
+
+	if (id >= config->num_resets) {
+		return -EINVAL;
+	}
+
+	value = sys_read32(config->base);
+	*status = FIELD_GET(BIT(id), value);
+
+	/* If active low, invert the logic */
+	if (config->active_low) {
+		*status = !(*status);
+	}
+
+	return 0;
+}
+
+static inline int reset_mmio_update(const struct device *dev, uint32_t id, uint8_t assert)
+{
+	const struct reset_mmio_dev_config *config = dev->config;
+	struct reset_mmio_dev_data *data = dev->data;
+	uint32_t value;
+	bool set;
+
+	if (id >= config->num_resets) {
+		return -EINVAL;
+	}
+
+	/* If active low, invert the logic */
+	set = config->active_low ? !assert : assert;
+
+	K_SPINLOCK(&data->lock) {
+		value = sys_read32(config->base);
+
+		if (set) {
+			value |= BIT(id);
+		} else {
+			value &= ~BIT(id);
+		}
+
+		sys_write32(value, config->base);
+	}
+
+	return 0;
+}
+
+static int reset_mmio_line_assert(const struct device *dev, uint32_t id)
+{
+	return reset_mmio_update(dev, id, 1);
+}
+
+static int reset_mmio_line_deassert(const struct device *dev, uint32_t id)
+{
+	return reset_mmio_update(dev, id, 0);
+}
+
+static int reset_mmio_line_toggle(const struct device *dev, uint32_t id)
+{
+	uint8_t reset_status = 0;
+	int status;
+
+	status = reset_mmio_status(dev, id, &reset_status);
+	if (status) {
+		return status;
+	}
+
+	return reset_mmio_update(dev, id, !reset_status);
+}
+
+static DEVICE_API(reset, reset_mmio_driver_api) = {
+	.status = reset_mmio_status,
+	.line_assert = reset_mmio_line_assert,
+	.line_deassert = reset_mmio_line_deassert,
+	.line_toggle = reset_mmio_line_toggle,
+};
+
+#define DT_DRV_COMPAT reset_mmio
+#define RESET_MMIO_INIT(n)                                                                         \
+	BUILD_ASSERT(DT_INST_PROP(n, num_resets) > 0 && DT_INST_PROP(n, num_resets) < 32,          \
+		     "num-resets needs to be in [1, 31].");                                        \
+	static const struct reset_mmio_dev_config reset_mmio_dev_config_##n = {                    \
+		.base = DT_INST_REG_ADDR(n),                                                       \
+		.num_resets = DT_INST_PROP(n, num_resets),                                         \
+		.active_low = DT_INST_PROP(n, active_low)};                                        \
+	static struct reset_mmio_dev_data reset_mmio_dev_data_##n;                                 \
+	DEVICE_DT_INST_DEFINE(n, NULL, NULL, &reset_mmio_dev_data_##n, &reset_mmio_dev_config_##n, \
+			      POST_KERNEL, CONFIG_RESET_INIT_PRIORITY, &reset_mmio_driver_api);
+DT_INST_FOREACH_STATUS_OKAY(RESET_MMIO_INIT)
diff --git a/drivers/reset/reset_numaker.c b/drivers/reset/reset_numaker.c
index 2054d661fff14..52144fd274110 100644
--- a/drivers/reset/reset_numaker.c
+++ b/drivers/reset/reset_numaker.c
@@ -11,11 +11,16 @@
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/reset.h>
 
+#if defined(CONFIG_SOC_SERIES_M55M1X)
+#define NUMAKER_RESET_IP_OFFSET(id) (((id) >> 20UL) & 0xfffUL)
+#define NUMAKER_RESET_IP_BIT(id)    (id & 0x000fffffUL)
+#else
 /* Reset controller module IPRST offset */
 #define NUMAKER_RESET_IPRST0_OFFSET (8UL)
 #define NUMAKER_RESET_IP_OFFSET(id) (NUMAKER_RESET_IPRST0_OFFSET + (((id) >> 24UL) & 0xffUL))
 /* Reset controller module configuration bit */
 #define NUMAKER_RESET_IP_BIT(id)    (id & 0x00ffffffUL)
+#endif
 
 struct reset_numaker_config {
 	uint32_t base;
@@ -59,7 +64,7 @@ static int reset_numaker_line_toggle(const struct device *dev, uint32_t id)
 	return 0;
 }
 
-static DEVICE_API(reset, reset_numaker_driver_api) = {
+static const struct reset_driver_api reset_numaker_driver_api = {
 	.status = reset_numaker_status,
 	.line_assert = reset_numaker_line_assert,
 	.line_deassert = reset_numaker_line_deassert,
diff --git a/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c b/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
index 08e777aa6fa11..380c288fd1e6c 100644
--- a/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
+++ b/drivers/retained_mem/retained_mem_nrf_ram_ctrl.c
@@ -12,7 +12,7 @@
 
 #define _BUILD_MEM_REGION(node_id)		    \
 	{.dt_addr = DT_REG_ADDR(DT_PARENT(node_id)),\
-	 .dt_size = DT_REG_SIZE(DT_PARENT(node_id))}
+	 .dt_size = DT_REG_SIZE(DT_PARENT(node_id))},
 
 struct ret_mem_region {
 	uintptr_t dt_addr;
diff --git a/drivers/rtc/CMakeLists.txt b/drivers/rtc/CMakeLists.txt
index d2cbe253bc17b..703ada100a713 100644
--- a/drivers/rtc/CMakeLists.txt
+++ b/drivers/rtc/CMakeLists.txt
@@ -15,6 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_RTC_DS3231 rtc_ds3231.c)
 zephyr_library_sources_ifdef(CONFIG_USERSPACE rtc_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_EMUL rtc_emul.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_INFINEON_CAT1 rtc_ifx_cat1.c)
+zephyr_library_sources_ifdef(CONFIG_RTC_PCF2123 rtc_pcf2123.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_PCF8523 rtc_pcf8523.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_PCF8563 rtc_pcf8563.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_MOTOROLA_MC146818 rtc_mc146818.c)
@@ -25,6 +26,7 @@ zephyr_library_sources_ifdef(CONFIG_RTC_SMARTBOND rtc_smartbond.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_ATMEL_SAM rtc_sam.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_ATMEL_SAM0 rtc_sam0.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_RPI_PICO rtc_rpi_pico.c)
+zephyr_library_sources_ifdef(CONFIG_RTC_RTS5912 rtc_rts5912.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_RV3028 rtc_rv3028.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_NUMAKER rtc_numaker.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_XMC4XXX rtc_xmc4xxx.c)
@@ -32,3 +34,4 @@ zephyr_library_sources_ifdef(CONFIG_RTC_NXP_IRTC rtc_nxp_irtc.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_RV8803 rtc_rv8803.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_BQ32002 rtc_bq32002.c)
 zephyr_library_sources_ifdef(CONFIG_RTC_RX8130CE rtc_rx8130ce.c)
+zephyr_library_sources_ifdef(CONFIG_RTC_DS1337 rtc_ds1337.c)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index b8779c77201e6..d84003ec3a18e 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -49,9 +49,11 @@ source "drivers/rtc/Kconfig.emul"
 source "drivers/rtc/Kconfig.fake"
 source "drivers/rtc/Kconfig.ifx_cat1"
 source "drivers/rtc/Kconfig.mc146818"
+source "drivers/rtc/Kconfig.pcf2123"
 source "drivers/rtc/Kconfig.pcf8523"
 source "drivers/rtc/Kconfig.pcf8563"
 source "drivers/rtc/Kconfig.rpi_pico"
+source "drivers/rtc/Kconfig.rts5912"
 source "drivers/rtc/Kconfig.rv3028"
 source "drivers/rtc/Kconfig.sam"
 source "drivers/rtc/Kconfig.sam0"
@@ -64,5 +66,6 @@ source "drivers/rtc/Kconfig.nxp_irtc"
 source "drivers/rtc/Kconfig.rv8803"
 source "drivers/rtc/Kconfig.bq32002"
 source "drivers/rtc/Kconfig.rx8130ce"
+source "drivers/rtc/Kconfig.ds1337"
 
 endif # RTC
diff --git a/drivers/rtc/Kconfig.ds1337 b/drivers/rtc/Kconfig.ds1337
new file mode 100644
index 0000000000000..9d2079f46551c
--- /dev/null
+++ b/drivers/rtc/Kconfig.ds1337
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Marcin Lyda <elektromarcin@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config RTC_DS1337
+	bool "Maxim DS1337 RTC driver"
+	default y
+	depends on DT_HAS_MAXIM_DS1337_ENABLED
+	select I2C
+	help
+	    Enable Maxim DS1337 RTC driver.
diff --git a/drivers/rtc/Kconfig.pcf2123 b/drivers/rtc/Kconfig.pcf2123
new file mode 100644
index 0000000000000..85c781ae2d34b
--- /dev/null
+++ b/drivers/rtc/Kconfig.pcf2123
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Lukas Gunnarsson <lukasgunnarsson@protonmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config RTC_PCF2123
+	bool "NXP PCF2123 Real-Time Clock driver"
+	default y
+	depends on DT_HAS_NXP_PCF2123_ENABLED
+	select SPI
+	help
+	  Enable NXP PCF2123 SPI RTC driver.
diff --git a/drivers/rtc/Kconfig.rts5912 b/drivers/rtc/Kconfig.rts5912
new file mode 100644
index 0000000000000..d064bf39fb02a
--- /dev/null
+++ b/drivers/rtc/Kconfig.rts5912
@@ -0,0 +1,10 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+config RTC_RTS5912
+	bool "Realtek RTS5912 rtc driver"
+	default y
+	depends on CLOCK_CONTROL
+	depends on DT_HAS_REALTEK_RTS5912_RTC_ENABLED
+	help
+	  Enable support for Realtek RTC driver.
diff --git a/drivers/rtc/Kconfig.stm32 b/drivers/rtc/Kconfig.stm32
index 1cdbe99ca0ba1..777343c5286fa 100644
--- a/drivers/rtc/Kconfig.stm32
+++ b/drivers/rtc/Kconfig.stm32
@@ -6,7 +6,5 @@ config RTC_STM32
 	default y if !COUNTER
 	depends on DT_HAS_ST_STM32_RTC_ENABLED && !SOC_SERIES_STM32F1X
 	select USE_STM32_LL_RTC
-	select USE_STM32_LL_PWR
-	select USE_STM32_LL_RCC
 	help
 	  Build RTC driver for STM32 SoCs, excluding STM32F1 series.
diff --git a/drivers/rtc/rtc_ambiq.c b/drivers/rtc/rtc_ambiq.c
index 39459e3b38a01..83ce35f0ea32b 100644
--- a/drivers/rtc/rtc_ambiq.c
+++ b/drivers/rtc/rtc_ambiq.c
@@ -15,7 +15,7 @@
 
 LOG_MODULE_REGISTER(ambiq_rtc, CONFIG_RTC_LOG_LEVEL);
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #define AMBIQ_RTC_ALARM_TIME_MASK                                                              \
 	(RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |      \
diff --git a/drivers/rtc/rtc_ds1337.c b/drivers/rtc/rtc_ds1337.c
new file mode 100644
index 0000000000000..209f5086d1c82
--- /dev/null
+++ b/drivers/rtc/rtc_ds1337.c
@@ -0,0 +1,737 @@
+/*
+ * Copyright (c) 2025 Marcin Lyda <elektromarcin@gmail.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/rtc.h>
+#include <zephyr/drivers/gpio.h>
+#include "rtc_utils.h"
+
+LOG_MODULE_REGISTER(ds1337, CONFIG_RTC_LOG_LEVEL);
+
+#define DT_DRV_COMPAT maxim_ds1337
+
+#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 0
+#warning "Maxim DS1337 RTC driver enabled without any devices"
+#endif
+
+/* Registers */
+#define DS1337_SECONDS_REG          0x00
+#define DS1337_ALARM_1_SECONDS_REG  0x07
+#define DS1337_ALARM_2_MINUTES_REG  0x0B
+#define DS1337_CONTROL_REG          0x0E
+#define DS1337_STATUS_REG           0x0F
+
+/* Bitmasks */
+#define DS1337_SECONDS_MASK       GENMASK(6, 0)
+#define DS1337_MINUTES_MASK       GENMASK(6, 0)
+#define DS1337_HOURS_MASK         GENMASK(5, 0)
+#define DS1337_DAY_MASK           GENMASK(2, 0)
+#define DS1337_DATE_MASK          GENMASK(5, 0)
+#define DS1337_MONTH_MASK         GENMASK(4, 0)
+#define DS1337_YEAR_MASK          GENMASK(7, 0)
+#define DS1337_ALARM_SECONDS_MASK GENMASK(6, 0)
+#define DS1337_ALARM_MINUTES_MASK GENMASK(6, 0)
+#define DS1337_ALARM_HOURS_MASK   GENMASK(5, 0)
+#define DS1337_ALARM_DAY_MASK     GENMASK(3, 0)
+#define DS1337_ALARM_DATE_MASK    GENMASK(5, 0)
+
+#define DS1337_12_24_MODE_MASK BIT(6)
+#define DS1337_CENTURY_MASK    BIT(7)
+#define DS1337_DY_DT_MASK      BIT(6)
+
+#define DS1337_ALARM_DISABLE_MASK BIT(7)
+
+#define DS1337_EOSC_MASK  BIT(7)
+#define DS1337_RS_MASK    GENMASK(4, 3)
+#define DS1337_INTCN_MASK BIT(2)
+#define DS1337_A2IE_MASK  BIT(1)
+#define DS1337_A1IE_MASK  BIT(0)
+
+#define DS1337_OSF_MASK BIT(7)
+#define DS1337_A2F_MASK BIT(1)
+#define DS1337_A1F_MASK BIT(0)
+
+#define DS1337_SQW_FREQ_1Hz     FIELD_PREP(DS1337_RS_MASK, 0x00)
+#define DS1337_SQW_FREQ_4096Hz  FIELD_PREP(DS1337_RS_MASK, 0x01)
+#define DS1337_SQW_FREQ_8192Hz  FIELD_PREP(DS1337_RS_MASK, 0x02)
+#define DS1337_SQW_FREQ_32768Hz FIELD_PREP(DS1337_RS_MASK, 0x03)
+
+/* DS1337 features two independent alarms */
+#define DS1337_ALARM_1_ID   0
+#define DS1337_ALARM_2_ID   1
+#define DS1337_ALARMS_COUNT 2
+
+/* SQW frequency property enum values */
+#define DS1337_SQW_PROP_ENUM_1HZ     0
+#define DS1337_SQW_PROP_ENUM_4096HZ  1
+#define DS1337_SQW_PROP_ENUM_8192HZ  2
+#define DS1337_SQW_PROP_ENUM_32768HZ 3
+
+/* DS1337 counts weekdays from 1 to 7 */
+#define DS1337_DAY_OFFSET -1
+
+/* DS1337 counts months 1 to 12 */
+#define DS1337_MONTH_OFFSET -1
+
+/* Year 2000 value represented as tm_year value */
+#define DS1337_TM_YEAR_2000 (2000 - 1900)
+
+/* RTC time fields supported by DS1337 */
+#define DS1337_RTC_TIME_MASK                                                                       \
+	(RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |      \
+	 RTC_ALARM_TIME_MASK_MONTH | RTC_ALARM_TIME_MASK_MONTHDAY | RTC_ALARM_TIME_MASK_YEAR |     \
+	 RTC_ALARM_TIME_MASK_WEEKDAY)
+
+/* RTC alarm 1 fields supported by DS1337 */
+#define DS1337_RTC_ALARM_TIME_1_MASK                                                               \
+	(RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |      \
+	 RTC_ALARM_TIME_MASK_MONTHDAY | RTC_ALARM_TIME_MASK_WEEKDAY)
+
+/* RTC alarm 2 fields supported by DS1337 */
+#define DS1337_RTC_ALARM_TIME_2_MASK                                                               \
+	(RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR | RTC_ALARM_TIME_MASK_MONTHDAY |    \
+	 RTC_ALARM_TIME_MASK_WEEKDAY)
+
+/* Helper macro to guard GPIO interrupt related stuff */
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int_gpios) && defined(CONFIG_RTC_ALARM)
+#define DS1337_INT_GPIOS_IN_USE 1
+#endif
+
+struct ds1337_config {
+	const struct i2c_dt_spec i2c;
+#ifdef DS1337_INT_GPIOS_IN_USE
+	struct gpio_dt_spec gpio_int;
+#endif
+	uint8_t sqw_freq;
+};
+
+struct ds1337_data {
+	struct k_sem lock;
+#ifdef DS1337_INT_GPIOS_IN_USE
+	const struct device *dev;
+	struct gpio_callback irq_callback;
+	struct k_work work;
+#ifdef CONFIG_RTC_ALARM
+	rtc_alarm_callback alarm_callbacks[DS1337_ALARMS_COUNT];
+	void *alarm_user_data[DS1337_ALARMS_COUNT];
+#endif
+#endif
+};
+
+static void ds1337_lock_sem(const struct device *dev)
+{
+	struct ds1337_data *data = dev->data;
+
+	(void)k_sem_take(&data->lock, K_FOREVER);
+}
+
+static void ds1337_unlock_sem(const struct device *dev)
+{
+	struct ds1337_data *data = dev->data;
+
+	k_sem_give(&data->lock);
+}
+
+static bool ds1337_validate_alarm_mask(uint16_t alarm_mask, uint16_t alarm_id)
+{
+	const uint16_t allowed_configs[6] = {
+		0,
+		RTC_ALARM_TIME_MASK_SECOND,
+		RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE,
+		RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR,
+		RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |
+			RTC_ALARM_TIME_MASK_WEEKDAY,
+		RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |
+			RTC_ALARM_TIME_MASK_MONTHDAY
+	};
+
+	const uint16_t available_fields =
+		(alarm_id == 0) ? DS1337_RTC_ALARM_TIME_1_MASK : DS1337_RTC_ALARM_TIME_2_MASK;
+	if (alarm_mask & ~available_fields) {
+		return false;
+	}
+
+	ARRAY_FOR_EACH_PTR(allowed_configs, config) {
+		if (alarm_mask == (*config & available_fields)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+#ifdef DS1337_INT_GPIOS_IN_USE
+
+static void ds1337_work_callback(struct k_work *work)
+{
+	struct ds1337_data *data = CONTAINER_OF(work, struct ds1337_data, work);
+	const struct device *dev = data->dev;
+	const struct ds1337_config *config = dev->config;
+	rtc_alarm_callback alarm_callbacks[DS1337_ALARMS_COUNT] = {NULL};
+	void *alarm_user_data[DS1337_ALARMS_COUNT] = {NULL};
+	uint8_t status_reg;
+	int err;
+
+	ds1337_lock_sem(dev);
+
+	/* Read status register */
+	err = i2c_reg_read_byte_dt(&config->i2c, DS1337_STATUS_REG, &status_reg);
+	if (err) {
+		goto out_unlock;
+	}
+
+#ifdef CONFIG_RTC_ALARM
+	/* Handle alarm 1 event */
+	if ((status_reg & DS1337_A1F_MASK) && (data->alarm_callbacks[DS1337_ALARM_1_ID] != NULL)) {
+		status_reg &= ~DS1337_A1F_MASK;
+		alarm_callbacks[DS1337_ALARM_1_ID] = data->alarm_callbacks[DS1337_ALARM_1_ID];
+		alarm_user_data[DS1337_ALARM_1_ID] = data->alarm_user_data[DS1337_ALARM_1_ID];
+	}
+
+	/* Handle alarm 2 event */
+	if ((status_reg & DS1337_A2F_MASK) && (data->alarm_callbacks[DS1337_ALARM_2_ID] != NULL)) {
+		status_reg &= ~DS1337_A2F_MASK;
+		alarm_callbacks[DS1337_ALARM_2_ID] = data->alarm_callbacks[DS1337_ALARM_2_ID];
+		alarm_user_data[DS1337_ALARM_2_ID] = data->alarm_user_data[DS1337_ALARM_2_ID];
+	}
+#endif
+
+	/* Clear alarm flag(s) */
+	err = i2c_reg_write_byte_dt(&config->i2c, DS1337_STATUS_REG, status_reg);
+	if (err) {
+		goto out_unlock;
+	}
+
+	/* Check if any interrupt occurred between flags register read/write */
+	err = i2c_reg_read_byte_dt(&config->i2c, DS1337_STATUS_REG, &status_reg);
+	if (err) {
+		goto out_unlock;
+	}
+
+	if (((status_reg & DS1337_A1F_MASK) && (alarm_callbacks[0] != NULL)) ||
+	    ((status_reg & DS1337_A2F_MASK) && (alarm_callbacks[1] != NULL))) {
+		/* Another interrupt occurred while servicing this one */
+		(void)k_work_submit(&data->work);
+	}
+
+out_unlock:
+	ds1337_unlock_sem(dev);
+
+	/* Execute alarm callback(s) */
+	for (uint8_t alarm_id = DS1337_ALARM_1_ID; alarm_id < DS1337_ALARMS_COUNT; ++alarm_id) {
+		if (alarm_callbacks[alarm_id] != NULL) {
+			alarm_callbacks[alarm_id](dev, alarm_id, alarm_user_data[alarm_id]);
+			alarm_callbacks[alarm_id] = NULL;
+		}
+	}
+}
+
+static void ds1337_irq_handler(const struct device *port, struct gpio_callback *callback,
+			       gpio_port_pins_t pins)
+{
+	ARG_UNUSED(port);
+	ARG_UNUSED(pins);
+
+	struct ds1337_data *data = CONTAINER_OF(callback, struct ds1337_data, irq_callback);
+
+	(void)k_work_submit(&data->work);
+}
+
+#endif
+
+static int ds1337_set_time(const struct device *dev, const struct rtc_time *timeptr)
+{
+	const struct ds1337_config *config = dev->config;
+	uint8_t regs[7];
+	int err;
+
+	if ((timeptr == NULL) || !rtc_utils_validate_rtc_time(timeptr, DS1337_RTC_TIME_MASK)) {
+		return -EINVAL;
+	}
+
+	ds1337_lock_sem(dev);
+
+	regs[0] = bin2bcd(timeptr->tm_sec) & DS1337_SECONDS_MASK;
+	regs[1] = bin2bcd(timeptr->tm_min) & DS1337_MINUTES_MASK;
+	regs[2] = bin2bcd(timeptr->tm_hour) & DS1337_HOURS_MASK;
+	regs[3] = bin2bcd(timeptr->tm_wday - DS1337_DAY_OFFSET) & DS1337_DAY_MASK;
+	regs[4] = bin2bcd(timeptr->tm_mday) & DS1337_DATE_MASK;
+	regs[5] = bin2bcd(timeptr->tm_mon - DS1337_MONTH_OFFSET) & DS1337_MONTH_MASK;
+
+	/* Determine which century we're in */
+	if (timeptr->tm_year >= DS1337_TM_YEAR_2000) {
+		regs[5] |= DS1337_CENTURY_MASK;
+		regs[6] = bin2bcd(timeptr->tm_year - DS1337_TM_YEAR_2000) & DS1337_YEAR_MASK;
+	} else {
+		regs[6] = bin2bcd(timeptr->tm_year) & DS1337_YEAR_MASK;
+	}
+
+	/* Set new time */
+	err = i2c_burst_write_dt(&config->i2c, DS1337_SECONDS_REG, regs, sizeof(regs));
+	if (err) {
+		goto out_unlock;
+	}
+
+	/* Clear Oscillator Stop Flag, indicating data validity */
+	err = i2c_reg_update_byte_dt(&config->i2c, DS1337_STATUS_REG, DS1337_OSF_MASK, 0);
+
+out_unlock:
+	ds1337_unlock_sem(dev);
+
+	if (!err) {
+		LOG_DBG("Set time: year: %d, month: %d, month day: %d, week day: %d, hour: %d, "
+			"minute: %d, second: %d",
+			timeptr->tm_year, timeptr->tm_mon, timeptr->tm_mday, timeptr->tm_wday,
+			timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec);
+	}
+
+	return err;
+}
+
+static int ds1337_get_time(const struct device *dev, struct rtc_time *timeptr)
+{
+	const struct ds1337_config *config = dev->config;
+	uint8_t regs[7];
+	uint8_t status_reg;
+	int err;
+
+	if (timeptr == NULL) {
+		return -EINVAL;
+	}
+
+	ds1337_lock_sem(dev);
+
+	/* Check data validity */
+	err = i2c_reg_read_byte_dt(&config->i2c, DS1337_STATUS_REG, &status_reg);
+	if (err) {
+		goto out_unlock;
+	}
+	if (status_reg & DS1337_OSF_MASK) {
+		err = -ENODATA;
+		goto out_unlock;
+	}
+
+	/* Read time data */
+	err = i2c_burst_read_dt(&config->i2c, DS1337_SECONDS_REG, regs, sizeof(regs));
+	if (err) {
+		goto out_unlock;
+	}
+
+	timeptr->tm_sec = bcd2bin(regs[0] & DS1337_SECONDS_MASK);
+	timeptr->tm_min = bcd2bin(regs[1] & DS1337_MINUTES_MASK);
+	timeptr->tm_hour = bcd2bin(regs[2] & DS1337_HOURS_MASK);
+	timeptr->tm_wday = bcd2bin(regs[3] & DS1337_DAY_MASK) + DS1337_DAY_OFFSET;
+	timeptr->tm_mday = bcd2bin(regs[4] & DS1337_DATE_MASK);
+	timeptr->tm_mon = bcd2bin(regs[5] & DS1337_MONTH_MASK) + DS1337_MONTH_OFFSET;
+	timeptr->tm_year = bcd2bin(regs[6] & DS1337_YEAR_MASK);
+	timeptr->tm_yday = -1;  /* Unsupported */
+	timeptr->tm_isdst = -1; /* Unsupported */
+	timeptr->tm_nsec = 0;   /* Unsupported */
+
+	/* Apply century offset */
+	if (regs[5] & DS1337_CENTURY_MASK) {
+		timeptr->tm_year += DS1337_TM_YEAR_2000;
+	}
+
+out_unlock:
+	ds1337_unlock_sem(dev);
+
+	if (!err) {
+		LOG_DBG("Read time: year: %d, month: %d, month day: %d, week day: %d, hour: %d, "
+			"minute: %d, second: %d",
+			timeptr->tm_year, timeptr->tm_mon, timeptr->tm_mday, timeptr->tm_wday,
+			timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec);
+	}
+
+	return err;
+}
+
+#ifdef CONFIG_RTC_ALARM
+
+static int ds1337_alarm_get_supported_fields(const struct device *dev, uint16_t id, uint16_t *mask)
+{
+	ARG_UNUSED(dev);
+
+	if (id == DS1337_ALARM_1_ID) {
+		*mask = DS1337_RTC_ALARM_TIME_1_MASK;
+		return 0;
+	} else if (id == DS1337_ALARM_2_ID) {
+		*mask = DS1337_RTC_ALARM_TIME_2_MASK;
+		return 0;
+	}
+
+	LOG_ERR("Invalid alarm ID: %d", id);
+	return -EINVAL;
+}
+
+static int ds1337_alarm_set_time(const struct device *dev, uint16_t id, uint16_t mask,
+				 const struct rtc_time *timeptr)
+{
+	const struct ds1337_config *config = dev->config;
+	uint8_t regs[4];
+	uint8_t reg_addr;
+	uint8_t reg_offset;
+	int err;
+
+	if (id >= DS1337_ALARMS_COUNT) {
+		LOG_ERR("Invalid alarm ID: %d", id);
+		return -EINVAL;
+	}
+
+	if ((mask & RTC_ALARM_TIME_MASK_MONTHDAY) && (mask & RTC_ALARM_TIME_MASK_WEEKDAY)) {
+		LOG_ERR("Month day and week day alarms cannot be set simultaneously");
+		return -EINVAL;
+	}
+
+	if (!ds1337_validate_alarm_mask(mask, id)) {
+		LOG_ERR("Unsupported mask 0x%04X for alarm %d", mask, id);
+		return -EINVAL;
+	}
+
+	if (!rtc_utils_validate_rtc_time(timeptr, mask)) {
+		LOG_ERR("Invalid alarm time");
+		return -EINVAL;
+	}
+
+	if (mask & RTC_ALARM_TIME_MASK_SECOND) {
+		regs[0] = bin2bcd(timeptr->tm_sec) & DS1337_ALARM_SECONDS_MASK;
+	} else {
+		regs[0] = DS1337_ALARM_DISABLE_MASK;
+	}
+
+	if (mask & RTC_ALARM_TIME_MASK_MINUTE) {
+		regs[1] = bin2bcd(timeptr->tm_min) & DS1337_ALARM_MINUTES_MASK;
+	} else {
+		regs[1] = DS1337_ALARM_DISABLE_MASK;
+	}
+
+	if (mask & RTC_ALARM_TIME_MASK_HOUR) {
+		regs[2] = bin2bcd(timeptr->tm_hour) & DS1337_ALARM_HOURS_MASK;
+	} else {
+		regs[2] = DS1337_ALARM_DISABLE_MASK;
+	}
+
+	if (mask & RTC_ALARM_TIME_MASK_MONTHDAY) {
+		regs[3] = bin2bcd(timeptr->tm_mday) & DS1337_ALARM_DATE_MASK;
+	} else if (mask & RTC_ALARM_TIME_MASK_WEEKDAY) {
+		regs[3] = bin2bcd(timeptr->tm_wday - DS1337_DAY_OFFSET) & DS1337_ALARM_DAY_MASK;
+		regs[3] |= DS1337_DY_DT_MASK;
+	} else {
+		regs[3] = DS1337_ALARM_DISABLE_MASK;
+	}
+
+	/* Update alarm registers */
+	if (id == DS1337_ALARM_1_ID) {
+		reg_addr = DS1337_ALARM_1_SECONDS_REG;
+		reg_offset = 0;
+	} else {
+		reg_addr = DS1337_ALARM_2_MINUTES_REG;
+		reg_offset = 1;
+	}
+
+	err = i2c_burst_write_dt(&config->i2c, reg_addr, &regs[reg_offset],
+				 sizeof(regs) - reg_offset);
+	if (err) {
+		return err;
+	}
+
+	LOG_DBG("Set alarm: month day: %d, week day: %d, hour: %d, minute: %d, second: %d mask: "
+		"0x%04X",
+		timeptr->tm_mday, timeptr->tm_wday, timeptr->tm_hour, timeptr->tm_min,
+		timeptr->tm_sec, mask);
+
+	return 0;
+}
+
+static int ds1337_alarm_get_time(const struct device *dev, uint16_t id, uint16_t *mask,
+				 struct rtc_time *timeptr)
+{
+	const struct ds1337_config *config = dev->config;
+	uint8_t regs[4];
+	uint8_t reg_addr;
+	uint8_t reg_offset;
+	int err;
+
+	if (id >= DS1337_ALARMS_COUNT) {
+		LOG_ERR("Invalid alarm ID: %d", id);
+		return -EINVAL;
+	}
+
+	/* Read alarm registers */
+	if (id == DS1337_ALARM_1_ID) {
+		reg_addr = DS1337_ALARM_1_SECONDS_REG;
+		reg_offset = 0;
+	} else {
+		reg_addr = DS1337_ALARM_2_MINUTES_REG;
+		reg_offset = 1;
+	}
+	err = i2c_burst_read_dt(&config->i2c, reg_addr, &regs[reg_offset],
+				sizeof(regs) - reg_offset);
+	if (err) {
+		return err;
+	}
+
+	(void)memset(timeptr, 0, sizeof(*timeptr));
+	*mask = 0;
+
+	if ((regs[0] & DS1337_ALARM_DISABLE_MASK) == 0) {
+		timeptr->tm_sec = bcd2bin(regs[0] & DS1337_ALARM_SECONDS_MASK);
+		*mask |= RTC_ALARM_TIME_MASK_SECOND;
+	}
+
+	if ((regs[1] & DS1337_ALARM_DISABLE_MASK) == 0) {
+		timeptr->tm_min = bcd2bin(regs[1] & DS1337_ALARM_MINUTES_MASK);
+		*mask |= RTC_ALARM_TIME_MASK_MINUTE;
+	}
+
+	if ((regs[2] & DS1337_ALARM_DISABLE_MASK) == 0) {
+		timeptr->tm_hour = bcd2bin(regs[2] & DS1337_ALARM_HOURS_MASK);
+		*mask |= RTC_ALARM_TIME_MASK_HOUR;
+	}
+
+	if ((regs[3] & DS1337_ALARM_DISABLE_MASK) == 0) {
+		if ((regs[3] & DS1337_DY_DT_MASK) == 0) {
+			timeptr->tm_mday = bcd2bin(regs[3] & DS1337_ALARM_DATE_MASK);
+			*mask |= RTC_ALARM_TIME_MASK_MONTHDAY;
+		} else {
+			timeptr->tm_wday =
+				bcd2bin(regs[3] & DS1337_ALARM_DAY_MASK) + DS1337_DAY_OFFSET;
+			*mask |= RTC_ALARM_TIME_MASK_WEEKDAY;
+		}
+	}
+
+	LOG_DBG("Get alarm: month day: %d, week day: %d, hour: %d, minute: %d, second: %d mask: "
+		"0x%04X",
+		timeptr->tm_mday, timeptr->tm_wday, timeptr->tm_hour, timeptr->tm_min,
+		timeptr->tm_sec, *mask);
+
+	return 0;
+}
+
+static int ds1337_alarm_is_pending(const struct device *dev, uint16_t id)
+{
+	const struct ds1337_config *config = dev->config;
+	uint8_t pending = 0;
+	uint8_t status_reg;
+	int err;
+
+	if (id >= DS1337_ALARMS_COUNT) {
+		LOG_ERR("Invalid alarm ID: %d", id);
+		return -EINVAL;
+	}
+
+	ds1337_lock_sem(dev);
+
+	err = i2c_reg_read_byte_dt(&config->i2c, DS1337_STATUS_REG, &status_reg);
+	if (err) {
+		goto out_unlock;
+	}
+
+	if (id == DS1337_ALARM_1_ID) {
+		if (status_reg & DS1337_A1F_MASK) {
+			status_reg &= ~DS1337_A1F_MASK;
+			pending = 1;
+		}
+	} else {
+		if (status_reg & DS1337_A2F_MASK) {
+			status_reg &= ~DS1337_A2F_MASK;
+			pending = 1;
+		}
+	}
+
+	err = i2c_reg_write_byte_dt(&config->i2c, DS1337_STATUS_REG, status_reg);
+	if (err) {
+		goto out_unlock;
+	}
+
+out_unlock:
+	ds1337_unlock_sem(dev);
+
+	if (err) {
+		return err;
+	}
+	return pending;
+}
+
+#ifdef DS1337_INT_GPIOS_IN_USE
+
+static int ds1337_alarm_set_callback(const struct device *dev, uint16_t id,
+				     rtc_alarm_callback callback, void *user_data)
+{
+	const struct ds1337_config *config = dev->config;
+	struct ds1337_data *data = dev->data;
+	uint8_t reg_val = 0;
+	uint8_t mask = 0;
+	int err;
+
+	if (config->gpio_int.port == NULL) {
+		return -ENOTSUP;
+	}
+
+	if (id >= DS1337_ALARMS_COUNT) {
+		LOG_ERR("Invalid alarm ID: %d", id);
+		return -EINVAL;
+	}
+
+	ds1337_lock_sem(dev);
+
+	data->alarm_callbacks[id] = callback;
+	data->alarm_user_data[id] = user_data;
+
+	/* Enable alarm interrupt if callback provided */
+	if (id == DS1337_ALARM_1_ID) {
+		mask = DS1337_A1IE_MASK;
+		reg_val = (callback != NULL) ? DS1337_A1IE_MASK : 0;
+	} else {
+		mask = DS1337_A2IE_MASK;
+		reg_val = (callback != NULL) ? DS1337_A2IE_MASK : 0;
+	}
+	err = i2c_reg_update_byte_dt(&config->i2c, DS1337_CONTROL_REG, mask, reg_val);
+
+	ds1337_unlock_sem(dev);
+
+	/* Alarm IRQ might have already been triggered */
+	(void)k_work_submit(&data->work);
+
+	return err;
+}
+
+#endif
+
+#endif
+
+static int ds1337_init(const struct device *dev)
+{
+	const struct ds1337_config *config = dev->config;
+	struct ds1337_data *data = dev->data;
+	uint8_t reg_val;
+	int err;
+
+	(void)k_sem_init(&data->lock, 1, 1);
+
+	if (!i2c_is_ready_dt(&config->i2c)) {
+		LOG_ERR("I2C bus not ready");
+		return -ENODEV;
+	}
+
+#ifdef DS1337_INT_GPIOS_IN_USE
+	if (config->gpio_int.port != NULL) {
+		if (!gpio_is_ready_dt(&config->gpio_int)) {
+			LOG_ERR("GPIO not ready");
+			return -ENODEV;
+		}
+
+		err = gpio_pin_configure_dt(&config->gpio_int, GPIO_INPUT);
+		if (err) {
+			LOG_ERR("Failed to configure interrupt GPIO, error: %d", err);
+			return err;
+		}
+
+		err = gpio_pin_interrupt_configure_dt(&config->gpio_int, GPIO_INT_EDGE_TO_ACTIVE);
+		if (err) {
+			LOG_ERR("Failed to enable GPIO interrupt, error: %d", err);
+			return err;
+		}
+
+		gpio_init_callback(&data->irq_callback, ds1337_irq_handler,
+				   BIT(config->gpio_int.pin));
+
+		err = gpio_add_callback_dt(&config->gpio_int, &data->irq_callback);
+		if (err) {
+			LOG_ERR("Failed to add GPIO callback, error: %d", err);
+			return err;
+		}
+
+		data->dev = dev;
+		data->work.handler = ds1337_work_callback;
+	}
+#endif
+
+	/* Display warning if alarm flags are set */
+	err = i2c_reg_read_byte_dt(&config->i2c, DS1337_STATUS_REG, &reg_val);
+	if (err) {
+		return err;
+	}
+	if (reg_val & DS1337_A1F_MASK) {
+		LOG_WRN("Alarm 1 might have been missed!");
+	}
+	if (reg_val & DS1337_A2F_MASK) {
+		LOG_WRN("Alarm 2 might have been missed!");
+	}
+
+	/* Enable oscillator */
+	err = i2c_reg_update_byte_dt(&config->i2c, DS1337_CONTROL_REG, DS1337_EOSC_MASK, 0);
+	if (err) {
+		return err;
+	}
+
+	/* Configure SQW output frequency */
+	switch (config->sqw_freq) {
+	case DS1337_SQW_PROP_ENUM_1HZ:
+		reg_val = DS1337_SQW_FREQ_1Hz;
+		break;
+	case DS1337_SQW_PROP_ENUM_4096HZ:
+		reg_val = DS1337_SQW_FREQ_4096Hz;
+		break;
+	case DS1337_SQW_PROP_ENUM_8192HZ:
+		reg_val = DS1337_SQW_FREQ_8192Hz;
+		break;
+	case DS1337_SQW_PROP_ENUM_32768HZ:
+	default:
+		reg_val = DS1337_SQW_FREQ_32768Hz;
+		break;
+	}
+
+	/*
+	 * Set SQW frequency, enable oscillator, clear INTCN (both alarms will trigger INTA),
+	 * disable IRQs
+	 */
+	err = i2c_reg_write_byte_dt(&config->i2c, DS1337_CONTROL_REG, reg_val);
+	if (err) {
+		return err;
+	}
+
+	/* Clear alarm flags */
+	err = i2c_reg_update_byte_dt(&config->i2c, DS1337_STATUS_REG,
+				     DS1337_A1F_MASK | DS1337_A2F_MASK, 0);
+	if (err) {
+		return err;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(rtc, ds1337_driver_api) = {
+	.get_time = ds1337_get_time,
+	.set_time = ds1337_set_time,
+#ifdef CONFIG_RTC_ALARM
+	.alarm_get_supported_fields = ds1337_alarm_get_supported_fields,
+	.alarm_set_time = ds1337_alarm_set_time,
+	.alarm_get_time = ds1337_alarm_get_time,
+	.alarm_is_pending = ds1337_alarm_is_pending,
+#ifdef DS1337_INT_GPIOS_IN_USE
+	.alarm_set_callback = ds1337_alarm_set_callback,
+#endif
+#endif
+};
+
+#define DS1337_INIT(inst)                                                                          \
+	static struct ds1337_data ds1337_data_##inst;                                              \
+	static const struct ds1337_config ds1337_config_##inst = {                                 \
+		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
+		.sqw_freq = DT_INST_ENUM_IDX_OR(inst, sqw_frequency, DS1337_SQW_PROP_ENUM_1HZ),    \
+		IF_ENABLED(                                                                        \
+			DS1337_INT_GPIOS_IN_USE,                                                   \
+			(.gpio_int = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, {0}))               \
+		)										   \
+		};										   \
+	DEVICE_DT_INST_DEFINE(inst, &ds1337_init, NULL, &ds1337_data_##inst,                       \
+			      &ds1337_config_##inst, POST_KERNEL, CONFIG_RTC_INIT_PRIORITY,        \
+			      &ds1337_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DS1337_INIT)
diff --git a/drivers/rtc/rtc_ll_stm32.c b/drivers/rtc/rtc_ll_stm32.c
index 4b284f2e1337c..84c6f10272c7b 100644
--- a/drivers/rtc/rtc_ll_stm32.c
+++ b/drivers/rtc/rtc_ll_stm32.c
@@ -14,6 +14,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/devicetree.h>
+#include <zephyr/spinlock.h>
 #include <zephyr/drivers/rtc.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/drivers/clock_control.h>
@@ -78,7 +79,7 @@ LOG_MODULE_REGISTER(rtc_stm32, CONFIG_RTC_LOG_LEVEL);
 /* Timeout in microseconds used to wait for flags */
 #define RTC_TIMEOUT 1000000
 
-#ifdef CONFIG_RTC_ALARM
+#ifdef STM32_RTC_ALARM_ENABLED
 #define RTC_STM32_ALARMS_COUNT	DT_INST_PROP(0, alarms_count)
 
 #define RTC_STM32_ALRM_A	0U
@@ -95,7 +96,7 @@ LOG_MODULE_REGISTER(rtc_stm32, CONFIG_RTC_LOG_LEVEL);
 #else
 #define RTC_STM32_EXTI_LINE	0
 #endif /* DT_INST_NODE_HAS_PROP(0, alrm_exti_line) */
-#endif /* CONFIG_RTC_ALARM */
+#endif /* STM32_RTC_ALARM_ENABLED */
 
 #if defined(PWR_CR_DBP) || defined(PWR_CR1_DBP) || defined(PWR_DBPCR_DBP) || defined(PWR_DBPR_DBP)
 /*
@@ -120,7 +121,7 @@ struct rtc_stm32_config {
 #endif
 };
 
-#ifdef CONFIG_RTC_ALARM
+#ifdef STM32_RTC_ALARM_ENABLED
 struct rtc_stm32_alrm {
 	LL_RTC_AlarmTypeDef ll_rtc_alrm;
 	/* user-defined alarm mask, values from RTC_ALARM_TIME_MASK */
@@ -129,14 +130,14 @@ struct rtc_stm32_alrm {
 	void *user_data;
 	bool is_pending;
 };
-#endif /* CONFIG_RTC_ALARM */
+#endif /* STM32_RTC_ALARM_ENABLED */
 
 struct rtc_stm32_data {
-	struct k_mutex lock;
-#ifdef CONFIG_RTC_ALARM
+	struct k_spinlock lock;
+#ifdef STM32_RTC_ALARM_ENABLED
 	struct rtc_stm32_alrm rtc_alrm_a;
 	struct rtc_stm32_alrm rtc_alrm_b;
-#endif /* CONFIG_RTC_ALARM */
+#endif /* STM32_RTC_ALARM_ENABLED */
 };
 
 static int rtc_stm32_configure(const struct device *dev)
@@ -185,7 +186,7 @@ static int rtc_stm32_configure(const struct device *dev)
 	return err;
 }
 
-#ifdef CONFIG_RTC_ALARM
+#ifdef STM32_RTC_ALARM_ENABLED
 static inline ErrorStatus rtc_stm32_init_alarm(RTC_TypeDef *rtc, uint32_t format,
 					LL_RTC_AlarmTypeDef *ll_alarm_struct, uint16_t id)
 {
@@ -329,13 +330,13 @@ static void rtc_stm32_irq_config(const struct device *dev)
 		    rtc_stm32_isr, DEVICE_DT_INST_GET(0), 0);
 	irq_enable(DT_INST_IRQN(0));
 }
-#endif /* CONFIG_RTC_ALARM */
+#endif /* STM32_RTC_ALARM_ENABLED */
 
 static int rtc_stm32_init(const struct device *dev)
 {
 	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
 	const struct rtc_stm32_config *cfg = dev->config;
-	struct rtc_stm32_data *data = dev->data;
+	__maybe_unused struct rtc_stm32_data *data = dev->data;
 
 	int err = 0;
 
@@ -350,7 +351,35 @@ static int rtc_stm32_init(const struct device *dev)
 		return -EIO;
 	}
 
-	k_mutex_init(&data->lock);
+#if defined(CONFIG_SOC_SERIES_STM32WB0X)
+	/**
+	 * The STM32WB0 series has no bit for clock gating of RTC's APB
+	 * interface. On the other hand, the RTCEN bit that would control
+	 * whether the RTC IP is clock gated or not exists, and has been
+	 * placed in APB0ENR. The call to clock_control_on() that just
+	 * completed should have set this bit to 1.
+	 *
+	 * However, according to RefMan, the software must wait two slow
+	 * clock cycles before the IP is actually usable, due to clock
+	 * resynchronization delays. Sadly, there is no hardware register
+	 * we can poll to wait until RTC is ready...
+	 *
+	 * In worst case scenario of 24 kHz LSI, we have to wait for:
+	 *		tREADY = (2 cycles / 24'000 Hz) ≅ 84µs
+	 *
+	 * Spin until that much time has elapsed, and RTC should be up.
+	 *
+	 * N.B.: we can't use k_busy_wait because it uses the SysTick
+	 * as time base, but SysTick is initialized after the RTC...
+	 */
+	const uint32_t cycles_to_waste =
+		84 * (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / USEC_PER_SEC);
+	volatile uint32_t i = cycles_to_waste;
+
+	while (--i > 0) {
+		/* Do nothing - loop itself burns enough cycles */
+	}
+#endif /* CONFIG_SOC_SERIES_STM32WB0X */
 
 	/* Enable Backup access */
 #if RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION
@@ -362,16 +391,22 @@ static int rtc_stm32_init(const struct device *dev)
 	LL_RCC_SetRTC_HSEPrescaler(cfg->hse_prescaler);
 #endif
 	/* Enable RTC clock source */
-	if (clock_control_configure(clk, (clock_control_subsys_t)&cfg->pclken[1], NULL) != 0) {
-		LOG_ERR("clock configure failed\n");
-		return -EIO;
+	if (cfg->pclken[1].enr != NO_SEL) {
+		err = clock_control_configure(clk, (clock_control_subsys_t)&cfg->pclken[1], NULL);
+
+		if (err < 0) {
+			LOG_ERR("clock configure failed\n");
+			return -EIO;
+		}
 	}
 
 /*
  * On STM32WBAX series, there is no bit in BCDR register to enable RTC.
  * Enabling RTC is done directly via the RCC APB register bit.
+ * On STM32WB0 series, LL_RCC_EnableRTC is not provided by STM32CubeWB0,
+ * but RTC IP clock has already been turned on - skip the call as well.
  */
-#ifndef CONFIG_SOC_SERIES_STM32WBAX
+#if !defined(CONFIG_SOC_SERIES_STM32WBAX) && !defined(CONFIG_SOC_SERIES_STM32WB0X)
 	z_stm32_hsem_lock(CFG_HW_RCC_SEMID, HSEM_LOCK_DEFAULT_RETRY);
 
 	LL_RCC_EnableRTC();
@@ -385,15 +420,15 @@ static int rtc_stm32_init(const struct device *dev)
 	LL_PWR_DisableBkUpAccess();
 #endif /* RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION */
 
-#ifdef CONFIG_RTC_ALARM
+#ifdef STM32_RTC_ALARM_ENABLED
 	rtc_stm32_irq_config(dev);
 
 	ll_func_exti_enable_rtc_alarm_it(RTC_STM32_EXTI_LINE);
 
-	k_mutex_lock(&data->lock, K_FOREVER);
-	memset(&(data->rtc_alrm_a), 0, sizeof(struct rtc_stm32_alrm));
-	memset(&(data->rtc_alrm_b), 0, sizeof(struct rtc_stm32_alrm));
-	k_mutex_unlock(&data->lock);
+	K_SPINLOCK(&data->lock) {
+		memset(&(data->rtc_alrm_a), 0, sizeof(struct rtc_stm32_alrm));
+		memset(&(data->rtc_alrm_b), 0, sizeof(struct rtc_stm32_alrm));
+	}
 #endif /* CONFIG_RTC_ALARM */
 
 	return err;
@@ -405,7 +440,6 @@ static int rtc_stm32_set_time(const struct device *dev, const struct rtc_time *t
 	LL_RTC_TimeTypeDef rtc_time;
 	LL_RTC_DateTypeDef rtc_date;
 	uint32_t real_year = timeptr->tm_year + TM_YEAR_REF;
-	int err = 0;
 
 	if (real_year < RTC_YEAR_REF) {
 		/* RTC does not support years before 2000 */
@@ -417,22 +451,10 @@ static int rtc_stm32_set_time(const struct device *dev, const struct rtc_time *t
 		return -EINVAL;
 	}
 
-	err = k_mutex_lock(&data->lock, K_NO_WAIT);
-	if (err) {
-		return err;
-	}
-
-	LOG_DBG("Setting clock");
-
-#if RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION
-	LL_PWR_EnableBkUpAccess();
-#endif /* RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION */
-
 	/* Enter Init mode inside the LL_RTC_Time and Date Init functions */
 	rtc_time.Hours = bin2bcd(timeptr->tm_hour);
 	rtc_time.Minutes = bin2bcd(timeptr->tm_min);
 	rtc_time.Seconds = bin2bcd(timeptr->tm_sec);
-	LL_RTC_TIME_Init(RTC, LL_RTC_FORMAT_BCD, &rtc_time);
 
 	/* Set Date after Time to be sure the DR is correctly updated on stm32F2 serie. */
 	rtc_date.Year = bin2bcd((real_year - RTC_YEAR_REF));
@@ -442,6 +464,16 @@ static int rtc_stm32_set_time(const struct device *dev, const struct rtc_time *t
 	/* WeekDay sunday (tm_wday = 0) is not represented by the same value in hardware,
 	 * all the other values are consistent with what is expected by hardware.
 	 */
+
+	LOG_DBG("Setting clock");
+
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
+
+#if RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION
+	LL_PWR_EnableBkUpAccess();
+#endif /* RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION */
+
+	LL_RTC_TIME_Init(RTC, LL_RTC_FORMAT_BCD, &rtc_time);
 	LL_RTC_DATE_Init(RTC, LL_RTC_FORMAT_BCD, &rtc_date);
 
 #if RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION
@@ -458,8 +490,6 @@ static int rtc_stm32_set_time(const struct device *dev, const struct rtc_time *t
 	}
 #endif /* CONFIG_SOC_SERIES_STM32F2X */
 
-	k_mutex_unlock(&data->lock);
-
 	LOG_DBG("Calendar set : %d/%d/%d - %dh%dm%ds",
 			LL_RTC_DATE_GetDay(RTC),
 			LL_RTC_DATE_GetMonth(RTC),
@@ -469,7 +499,9 @@ static int rtc_stm32_set_time(const struct device *dev, const struct rtc_time *t
 			LL_RTC_TIME_GetSecond(RTC)
 	);
 
-	return err;
+	k_spin_unlock(&data->lock, key);
+
+	return 0;
 }
 
 static int rtc_stm32_get_time(const struct device *dev, struct rtc_time *timeptr)
@@ -488,18 +520,14 @@ static int rtc_stm32_get_time(const struct device *dev, struct rtc_time *timeptr
 		return -EINVAL;
 	}
 
-	int err = k_mutex_lock(&data->lock, K_NO_WAIT);
-
-	if (err) {
-		return err;
-	}
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
 
 	if (!LL_RTC_IsActiveFlag_INITS(RTC)) {
 		/* INITS flag is set when the calendar has been initialiazed. This flag is
 		 * reset only on backup domain reset, so it can be read after a system
 		 * reset to check if the calendar has been initialized.
 		 */
-		k_mutex_unlock(&data->lock);
+		k_spin_unlock(&data->lock, key);
 		return -ENODATA;
 	}
 
@@ -519,7 +547,7 @@ static int rtc_stm32_get_time(const struct device *dev, struct rtc_time *timeptr
 		} while (rtc_time != LL_RTC_TIME_Get(RTC));
 	} while (rtc_date != LL_RTC_DATE_Get(RTC));
 
-	k_mutex_unlock(&data->lock);
+	k_spin_unlock(&data->lock, key);
 
 	/* tm_year is the value since 1900 and Rtc year is from 2000 */
 	timeptr->tm_year = bcd2bin(__LL_RTC_GET_YEAR(rtc_date)) + (RTC_YEAR_REF - TM_YEAR_REF);
@@ -564,7 +592,7 @@ static int rtc_stm32_get_time(const struct device *dev, struct rtc_time *timeptr
 	return 0;
 }
 
-#ifdef CONFIG_RTC_ALARM
+#ifdef STM32_RTC_ALARM_ENABLED
 static void rtc_stm32_init_ll_alrm_struct(LL_RTC_AlarmTypeDef *p_rtc_alarm,
 					const struct rtc_time *timeptr, uint16_t mask)
 {
@@ -721,7 +749,7 @@ static int rtc_stm32_alarm_get_time(const struct device *dev, uint16_t id, uint1
 		return -EINVAL;
 	}
 
-	k_mutex_lock(&data->lock, K_FOREVER);
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
 
 	if (id == RTC_STM32_ALRM_A) {
 		p_rtc_alrm = &(data->rtc_alrm_a);
@@ -749,7 +777,7 @@ static int rtc_stm32_alarm_get_time(const struct device *dev, uint16_t id, uint1
 		timeptr->tm_min, timeptr->tm_sec, *mask);
 
 unlock:
-	k_mutex_unlock(&data->lock);
+	k_spin_unlock(&data->lock, key);
 
 	return err;
 }
@@ -763,7 +791,7 @@ static int rtc_stm32_alarm_set_time(const struct device *dev, uint16_t id, uint1
 	LL_RTC_TimeTypeDef *p_ll_rtc_alrm_time;
 	int err = 0;
 
-	k_mutex_lock(&data->lock, K_FOREVER);
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
 
 	if (id == RTC_STM32_ALRM_A) {
 		p_rtc_alrm = &(data->rtc_alrm_a);
@@ -882,7 +910,7 @@ static int rtc_stm32_alarm_set_time(const struct device *dev, uint16_t id, uint1
 #endif /* RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION */
 
 unlock:
-	k_mutex_unlock(&data->lock);
+	k_spin_unlock(&data->lock, key);
 
 	if (id == RTC_STM32_ALRM_A) {
 		LOG_DBG("Alarm A : %dh%dm%ds   mask = 0x%x",
@@ -910,7 +938,7 @@ static int rtc_stm32_alarm_set_callback(const struct device *dev, uint16_t id,
 	struct rtc_stm32_alrm *p_rtc_alrm;
 	int err = 0;
 
-	k_mutex_lock(&data->lock, K_FOREVER);
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
 
 	if (id == RTC_STM32_ALRM_A) {
 		p_rtc_alrm = &(data->rtc_alrm_a);
@@ -927,7 +955,7 @@ static int rtc_stm32_alarm_set_callback(const struct device *dev, uint16_t id,
 	p_rtc_alrm->user_data = user_data;
 
 unlock:
-	k_mutex_unlock(&data->lock);
+	k_spin_unlock(&data->lock, key);
 
 	return err;
 }
@@ -938,7 +966,7 @@ static int rtc_stm32_alarm_is_pending(const struct device *dev, uint16_t id)
 	struct rtc_stm32_alrm *p_rtc_alrm;
 	int ret = 0;
 
-	k_mutex_lock(&data->lock, K_FOREVER);
+	k_spinlock_key_t key = k_spin_lock(&data->lock);
 
 	if (id == RTC_STM32_ALRM_A) {
 		p_rtc_alrm = &(data->rtc_alrm_a);
@@ -956,10 +984,10 @@ static int rtc_stm32_alarm_is_pending(const struct device *dev, uint16_t id)
 	__enable_irq();
 
 unlock:
-	k_mutex_unlock(&data->lock);
+	k_spin_unlock(&data->lock, key);
 	return ret;
 }
-#endif /* CONFIG_RTC_ALARM */
+#endif /* STM32_RTC_ALARM_ENABLED */
 
 #ifdef CONFIG_RTC_CALIBRATION
 #if !defined(CONFIG_SOC_SERIES_STM32F2X) && \
@@ -1042,13 +1070,13 @@ static int rtc_stm32_get_calibration(const struct device *dev, int32_t *calibrat
 static DEVICE_API(rtc, rtc_stm32_driver_api) = {
 	.set_time = rtc_stm32_set_time,
 	.get_time = rtc_stm32_get_time,
-#ifdef CONFIG_RTC_ALARM
+#ifdef STM32_RTC_ALARM_ENABLED
 	.alarm_get_supported_fields = rtc_stm32_alarm_get_supported_fields,
 	.alarm_set_time = rtc_stm32_alarm_set_time,
 	.alarm_get_time = rtc_stm32_alarm_get_time,
 	.alarm_set_callback = rtc_stm32_alarm_set_callback,
 	.alarm_is_pending = rtc_stm32_alarm_is_pending,
-#endif /* CONFIG_RTC_ALARM */
+#endif /* STM32_RTC_ALARM_ENABLED */
 #ifdef CONFIG_RTC_CALIBRATION
 #if !defined(CONFIG_SOC_SERIES_STM32F2X) && \
 	!(defined(CONFIG_SOC_SERIES_STM32L1X) && !defined(RTC_SMOOTHCALIB_SUPPORT))
diff --git a/drivers/rtc/rtc_ll_stm32.h b/drivers/rtc/rtc_ll_stm32.h
index 16f381081c174..5199724edd8d3 100644
--- a/drivers/rtc/rtc_ll_stm32.h
+++ b/drivers/rtc/rtc_ll_stm32.h
@@ -7,7 +7,23 @@
 #ifndef ZEPHYR_DRIVERS_RTC_RTC_LL_STM32_H_
 #define ZEPHYR_DRIVERS_RTC_RTC_LL_STM32_H_
 
-#ifdef CONFIG_RTC_ALARM
+/**
+ * ES0584 / ES0631 §2.5.2; ES0632 §2.6.2 (both Rev. 2)
+ * """
+ * RTC interrupts cannot be reliably used for real-time
+ * control functions, since some occurences of RTC
+ * interrupts may be missed.
+ * """
+ * Since alarm IRQs are unreliable, don't allow RTC alarm
+ * to be used on STM32WB0 series. For this, we have to
+ * create a #define only valid when both the Kconfig is
+ * enabled, and we're on a supported series. This must
+ * be done because the RTC driver has to build properly
+ * on all targets regardless of which Kconfig options have
+ * been enabled.
+ */
+#if defined(CONFIG_RTC_ALARM) && !defined(CONFIG_SOC_SERIES_STM32WB0X)
+#define STM32_RTC_ALARM_ENABLED	1
 
 /* STM32 RTC alarms, A & B, LL masks are equal */
 #define RTC_STM32_ALRM_MASK_ALL		LL_RTC_ALMA_MASK_ALL
@@ -44,6 +60,6 @@ static inline void ll_func_exti_clear_rtc_alarm_flag(uint32_t exti_line)
 	LL_EXTI_ClearFlag_0_31(exti_line);
 #endif /* CONFIG_SOC_SERIES_STM32H7X and CONFIG_CPU_CORTEX_M4 */
 }
-#endif /* CONFIG_RTC_ALARM */
+#endif /* CONFIG_RTC_ALARM && !CONFIG_SOC_SERIES_STM32WB0X */
 
 #endif	/* ZEPHYR_DRIVERS_RTC_RTC_LL_STM32_H_ */
diff --git a/drivers/rtc/rtc_pcf2123.c b/drivers/rtc/rtc_pcf2123.c
new file mode 100644
index 0000000000000..7d69d6744852f
--- /dev/null
+++ b/drivers/rtc/rtc_pcf2123.c
@@ -0,0 +1,669 @@
+/**
+ * Copyright (c) 2025 Lukas Gunnarsson <lukasgunnarsson@protonmail.com>
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Supported features:
+ * - Base RTC functionality (set/get time)
+ * - Alarm interrupts
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/rtc.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
+
+#include "rtc_utils.h"
+
+#define DT_DRV_COMPAT nxp_pcf2123
+
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(int1_gpios) &&                                                \
+	(defined(CONFIG_RTC_ALARM) || defined(CONFIG_RTC_UPDATE))
+#define PCF2123_INT1_GPIOS_IN_USE 1
+#endif
+
+LOG_MODULE_REGISTER(pcf2123, CONFIG_RTC_LOG_LEVEL);
+
+/**
+ * Datasheet: https://www.nxp.com/docs/en/data-sheet/PCF2123.pdf
+ */
+
+/* Control registers. */
+#define PCF2123_REG_CTRL_1        0x00
+#define PCF2123_REG_CTRL_2        0x01
+/* Time and date registers. */
+#define PCF2123_REG_SECONDS       0x02
+#define PCF2123_REG_MINUTES       0x03
+#define PCF2123_REG_HOURS         0x04
+#define PCF2123_REG_DAYS          0x05
+#define PCF2123_REG_WEEKDAYS      0x06
+#define PCF2123_REG_MONTHS        0x07
+#define PCF2123_REG_YEARS         0x08
+/* Alarm registers. */
+#define PCF2123_REG_ALARM_MINUTE  0x09
+#define PCF2123_REG_ALARM_HOUR    0x0A
+#define PCF2123_REG_ALARM_DAY     0x0B
+#define PCF2123_REG_ALARM_WEEKDAY 0x0C
+/* Offset register. */
+#define PCF2123_REG_OFFSET        0x0D
+/* Timer registers. */
+#define PCF2123_TIMER_CLKOUT      0x0E
+#define PCF2123_TIMER_COUNTDOWN   0x0F
+
+/**
+ * Control register 1 bits (page 9 in the datasheet).
+ * Bits 6, 3 and 0 are unused.
+ */
+#define PCF2123_CTRL_1_EXT_TEST BIT(7)
+#define PCF2123_CTRL_1_STOP     BIT(5)
+#define PCF2123_CTRL_1_SR       BIT(4)
+#define PCF2123_CTRL_1_12_24    BIT(2)
+#define PCF2123_CTRL_1_CIE      BIT(1)
+
+/**
+ * Control register 2 bits (page 11 in the datasheet).
+ */
+#define PCF2123_CTRL_2_MI    BIT(7)
+#define PCF2123_CTRL_2_SI    BIT(6)
+#define PCF2123_CTRL_2_MSF   BIT(5)
+#define PCF2123_CTRL_2_TI_TP BIT(4)
+#define PCF2123_CTRL_2_AF    BIT(3)
+#define PCF2123_CTRL_2_TF    BIT(2)
+#define PCF2123_CTRL_2_AIE   BIT(1)
+#define PCF2123_CTRL_2_TIE   BIT(0)
+
+/**
+ * Alarm register bits (page 17 in the datasheet).
+ */
+#define PCF2123_ALARM_MINUTE_AE_M  (0UL << 7)
+#define PCF2123_ALARM_HOUR_AE_H    (0UL << 7)
+#define PCF2123_ALARM_DAY_AE_D     (0UL << 7)
+#define PCF2123_ALARM_WEEKDAY_AE_W (0UL << 7)
+
+/**
+ * The masks have been gathered from the register overview (page 8 in the datasheet).
+ */
+#define PCF2123_SECONDS_MASK  GENMASK(6, 0)
+#define PCF2123_MINUTES_MASK  GENMASK(6, 0)
+#define PCF2123_HOURS_MASK    GENMASK(5, 0)
+#define PCF2123_DAYS_MASK     GENMASK(5, 0)
+#define PCF2123_WEEKDAYS_MASK GENMASK(2, 0)
+#define PCF2123_MONTHS_MASK   GENMASK(4, 0)
+#define PCF2123_YEARS_MASK    GENMASK(7, 0)
+
+#define PCF2123_RTC_TIME_MASK                                                                      \
+	(RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |      \
+	 RTC_ALARM_TIME_MASK_MONTHDAY | RTC_ALARM_TIME_MASK_WEEKDAY | RTC_ALARM_TIME_MASK_MONTH |  \
+	 RTC_ALARM_TIME_MASK_YEAR)
+
+#define PCF2123_RTC_ALARM_TIME_MASK                                                                \
+	(RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR | RTC_ALARM_TIME_MASK_MONTHDAY |    \
+	 RTC_ALARM_TIME_MASK_WEEKDAY)
+
+/* The PCF2123 supports two-digit years (0-99). */
+#define PCF2123_YEARS_OFFSET  (2000 - 1900)
+#define PCF2123_MONTHS_OFFSET 1
+
+/**
+ * Command byte definition (page 36 in the datasheet).
+ *  Bit 7:   R/W (0 write, 1 read)
+ *  Bit 6-4: SA  (Subaddress, required to be 0b001)
+ *  Bit 3-0: RA  (Register address range)
+ *
+ * The PCF2123 starts from the address RA and auto-increments for every byte.
+ */
+#define PCF2123_CMD_READ  ((1U << 7) | (0b001 << 4))
+#define PCF2123_CMD_WRITE ((0U << 7) | (0b001 << 4))
+
+#ifdef PCF2123_INT1_GPIOS_IN_USE
+void callback_work_handler(struct k_work *work);
+K_WORK_DEFINE(callback_work, callback_work_handler);
+
+static void gpio_int1_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins);
+#endif
+
+struct pcf2123_config {
+	const struct spi_dt_spec spi;
+#ifdef PCF2123_INT1_GPIOS_IN_USE
+	struct gpio_dt_spec int1;
+#endif
+};
+
+struct pcf2123_data {
+#ifdef PCF2123_INT1_GPIOS_IN_USE
+	const struct device *dev;
+	rtc_alarm_callback alarm_callback;
+	void *alarm_user_data;
+	struct gpio_callback int1_callback;
+	struct k_work callback_work;
+#endif
+};
+
+/**
+ * @brief Read from a single or multiple PCF2123 registers.
+ *
+ * @param dev The RTC device.
+ * @param start_addr The first memory address to start reading from.
+ * @param buf Buffer to store read data.
+ * @param len Number of bytes to read.
+ * @retval 0 on success, else -ERRNO.
+ *
+ * @note The PCF2123 auto-increments the selected memory address for every byte sent.
+ */
+static int pcf2123_reg_read(const struct device *dev, const uint8_t start_addr, uint8_t *buf,
+			    const size_t len)
+{
+	if (!buf) {
+		return -EINVAL;
+	}
+	if (len <= 0) {
+		return -EINVAL;
+	}
+
+	const struct pcf2123_config *config = dev->config;
+	int ret;
+
+	uint8_t cmd_byte = PCF2123_CMD_READ | start_addr;
+	struct spi_buf tx_buf = {.buf = &cmd_byte, .len = sizeof(cmd_byte)};
+	const struct spi_buf_set tx_bufs = {.buffers = &tx_buf, .count = 1};
+
+	uint8_t rx_dummy; /* Dummy byte. */
+	struct spi_buf rx_buf[2] = {{.buf = &rx_dummy, .len = 1}, {.buf = buf, .len = len}};
+	const struct spi_buf_set rx_bufs = {.buffers = rx_buf, .count = 2};
+
+	ret = spi_transceive_dt(&config->spi, &tx_bufs, &rx_bufs);
+	if (ret < 0) {
+		LOG_ERR("Failed to read from register with start address %d (err %d)", start_addr,
+			ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Write to a single or multiple PCF2123 registers.
+ *
+ * @param dev The RTC device.
+ * @param start_addr The first memory address to start writing towards.
+ * @param buf Data to write.
+ * @param len Data size in bytes.
+ * @retval 0 on success, else -ERRNO.
+ *
+ * @note The PCF2123 auto-increments the selected memory address for every byte sent.
+ */
+static int pcf2123_reg_write(const struct device *dev, const uint8_t start_addr, uint8_t *buf,
+			     const size_t len)
+{
+	if (!buf) {
+		return -EINVAL;
+	}
+	if (len <= 0) {
+		return -EINVAL;
+	}
+
+	const struct pcf2123_config *config = dev->config;
+	int ret;
+
+	uint8_t cmd_byte = PCF2123_CMD_WRITE | start_addr;
+	struct spi_buf cmd_buf = {.buf = &cmd_byte, .len = sizeof(cmd_byte)};
+	struct spi_buf data_buf = {.buf = buf, .len = len};
+	struct spi_buf tx_buf[] = {cmd_buf, data_buf};
+	const struct spi_buf_set tx_bufs = {.buffers = tx_buf, .count = 2};
+
+	ret = spi_write_dt(&config->spi, &tx_bufs);
+	if (ret < 0) {
+		LOG_ERR("Failed to set RTC time (err %d)", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int pcf2123_set_time(const struct device *dev, const struct rtc_time *timeptr)
+{
+	LOG_DBG("Set time: year=%d mon=%d mday=%d wday=%d hour=%d min=%d sec=%d", timeptr->tm_year,
+		timeptr->tm_mon, timeptr->tm_mday, timeptr->tm_wday, timeptr->tm_hour,
+		timeptr->tm_min, timeptr->tm_sec);
+
+	if (!rtc_utils_validate_rtc_time(timeptr, PCF2123_RTC_TIME_MASK)) {
+		LOG_ERR("RTC time validation failed");
+		return -EINVAL;
+	}
+
+	if ((timeptr->tm_year < PCF2123_YEARS_OFFSET) ||
+	    (timeptr->tm_year > PCF2123_YEARS_OFFSET + 99)) {
+		LOG_ERR("Invalid tm_year value: %d", timeptr->tm_year);
+		return -EINVAL;
+	}
+
+	/* There are 7 time registers ranging from 02h-08h. */
+	uint8_t regs[7];
+
+	/* Set seconds. */
+	regs[0] = bin2bcd(timeptr->tm_sec) & PCF2123_SECONDS_MASK;
+
+	/* Set minutes. */
+	regs[1] = bin2bcd(timeptr->tm_min) & PCF2123_MINUTES_MASK;
+
+	/* Set hours. */
+	regs[2] = bin2bcd(timeptr->tm_hour) & PCF2123_HOURS_MASK;
+
+	/* Set days. */
+	regs[3] = bin2bcd(timeptr->tm_mday) & PCF2123_DAYS_MASK;
+
+	/* Set weekdays. The values are not BCD encoded. */
+	regs[4] = timeptr->tm_wday;
+
+	/* Set month. */
+	regs[5] = bin2bcd(timeptr->tm_mon + PCF2123_MONTHS_OFFSET) & PCF2123_MONTHS_MASK;
+
+	/* Set year. */
+	regs[6] = bin2bcd(timeptr->tm_year - PCF2123_YEARS_OFFSET) & PCF2123_YEARS_MASK;
+
+	pcf2123_reg_write(dev, PCF2123_REG_SECONDS, regs, sizeof(regs));
+
+	return 0;
+}
+
+static int pcf2123_get_time(const struct device *dev, struct rtc_time *timeptr)
+{
+	uint8_t regs[7];
+	int ret;
+
+	ret = pcf2123_reg_read(dev, PCF2123_REG_SECONDS, regs, sizeof(regs));
+	if (ret < 0) {
+		return -ENODATA;
+	}
+
+	/**
+	 * Validate clock integrity.
+	 * The seconds register use bit 7 for checking integrity (page 12 in the datasheet).
+	 */
+	if (bcd2bin(regs[0]) & BIT(7)) {
+		LOG_WRN("Clock integrity failed");
+		LOG_HEXDUMP_DBG(regs, sizeof(regs), "Read data");
+		return -ENODATA;
+	}
+
+	/* Nanoseconds, unused. */
+	timeptr->tm_nsec = 0;
+
+	/* Seconds. */
+	timeptr->tm_sec = bcd2bin(regs[0] & PCF2123_SECONDS_MASK);
+
+	/* Minutes. */
+	timeptr->tm_min = bcd2bin(regs[1] & PCF2123_MINUTES_MASK);
+
+	/* Hours. */
+	timeptr->tm_hour = bcd2bin(regs[2] & PCF2123_HOURS_MASK);
+
+	/* Days. */
+	timeptr->tm_mday = bcd2bin(regs[3] & PCF2123_DAYS_MASK);
+
+	/* Weekdays. */
+	timeptr->tm_wday = bcd2bin(regs[4] & PCF2123_WEEKDAYS_MASK);
+
+	/* Year days, unused. */
+	timeptr->tm_yday = -1;
+
+	/**
+	 * Months range from 1-12 (table 5, page 8 in the datasheet).
+	 * The struct rtc_time expects months in the 0-11 range therefore
+	 * we need to offset the month by 1.
+	 */
+	timeptr->tm_mon = bcd2bin(regs[5] & PCF2123_MONTHS_MASK) - PCF2123_MONTHS_OFFSET;
+
+	/* Years range from 0-99 (table 5, page 8 in the datasheet). */
+	timeptr->tm_year = bcd2bin(regs[6] & PCF2123_YEARS_MASK) + PCF2123_YEARS_OFFSET;
+
+	timeptr->tm_isdst = -1; /* Unused. */
+
+	LOG_DBG("Get time: year=%d mon=%d mday=%d wday=%d hour=%d min=%d sec=%d", timeptr->tm_year,
+		timeptr->tm_mon, timeptr->tm_mday, timeptr->tm_wday, timeptr->tm_hour,
+		timeptr->tm_min, timeptr->tm_sec);
+
+	return 0;
+}
+
+#ifdef CONFIG_RTC_ALARM
+static int pcf2123_clear_alarm_flag(const struct device *dev)
+{
+	/* Clearing of the alarm flag can be found in page 19 in the datasheet. */
+	uint8_t ctrl2;
+	int ret;
+
+	ret = pcf2123_reg_read(dev, PCF2123_REG_CTRL_2, &ctrl2, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to read from control register 2 to clear AF bit (err %d)", ret);
+		return ret;
+	}
+
+	/* Clear the AF bit. */
+	ctrl2 &= ~PCF2123_CTRL_2_AF;
+	ret = pcf2123_reg_write(dev, PCF2123_REG_CTRL_2, &ctrl2, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed write to control register 2 to clear the AF bit (err %d)", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int pcf2123_alarm_get_supported_fields(const struct device *dev, uint16_t id, uint16_t *mask)
+{
+	ARG_UNUSED(dev);
+
+	if (id != 0U) {
+		LOG_ERR("Invalid ID: %d", id);
+		return -EINVAL;
+	}
+
+	*mask = PCF2123_RTC_ALARM_TIME_MASK;
+
+	return 0;
+}
+
+static int pcf2123_alarm_set_time(const struct device *dev, uint16_t id, uint16_t mask,
+				  const struct rtc_time *timeptr)
+{
+	if (id != 0) {
+		LOG_ERR("Invalid ID: %d", id);
+		return -EINVAL;
+	}
+
+	if ((mask & ~(PCF2123_RTC_ALARM_TIME_MASK)) != 0) {
+		LOG_ERR("Invalid alarm mask: 0x%04X", mask);
+		return -EINVAL;
+	}
+
+	if (!rtc_utils_validate_rtc_time(timeptr, mask)) {
+		LOG_ERR("Failed to validate the RTC time");
+		return -EINVAL;
+	}
+
+	uint8_t regs[4];
+	int ret;
+
+	/* The alarms are disabled if bit 7 is 1 (page 17 in the datasheet). */
+
+	/* Alarm register: MINUTE */
+	if ((mask & RTC_ALARM_TIME_MASK_MINUTE) != 0) {
+		regs[0] = bin2bcd(timeptr->tm_min) & PCF2123_MINUTES_MASK;
+	} else {
+		regs[0] = BIT(7);
+	}
+
+	/* Alarm register: HOUR */
+	if ((mask & RTC_ALARM_TIME_MASK_HOUR) != 0) {
+		regs[1] = bin2bcd(timeptr->tm_hour) & PCF2123_HOURS_MASK;
+	} else {
+		regs[1] = BIT(7);
+	}
+
+	/* Alarm register: DAY */
+	if ((mask & RTC_ALARM_TIME_MASK_MONTHDAY) != 0) {
+		regs[2] = bin2bcd(timeptr->tm_mday) & PCF2123_DAYS_MASK;
+	} else {
+		regs[2] = BIT(7);
+	}
+
+	/* Alarm register: WEEKDAY */
+	if ((mask & RTC_ALARM_TIME_MASK_WEEKDAY) != 0) {
+		regs[3] = bin2bcd(timeptr->tm_wday) & PCF2123_WEEKDAYS_MASK;
+	} else {
+		regs[3] = BIT(7);
+	}
+
+	/* Clear the alarm flag. */
+	ret = pcf2123_clear_alarm_flag(dev);
+	if (ret < 0) {
+		LOG_ERR("Failed to clear alarm flag (err %d)", ret);
+		return -ENOMSG;
+	}
+
+	ret = pcf2123_reg_write(dev, PCF2123_REG_ALARM_MINUTE, regs, sizeof(regs));
+	if (ret) {
+		LOG_ERR("Failed to write to alarm registers (err %d)", ret);
+		return -ENOMSG;
+	}
+
+	/* Make sure interrupts are enabled. */
+	uint8_t ctrl2;
+
+	ret = pcf2123_reg_read(dev, PCF2123_REG_CTRL_2, &ctrl2, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to read from control register 2 (err %d)", ret);
+		return ret;
+	}
+
+	if ((ctrl2 & PCF2123_CTRL_2_AIE) == 0) {
+		ctrl2 |= PCF2123_CTRL_2_AIE;
+		ret = pcf2123_reg_write(dev, PCF2123_REG_CTRL_2, &ctrl2, 1);
+		if (ret < 0) {
+			LOG_ERR("Failed to enable interrupts in control register 2 (err %d)", ret);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
+static int pcf2123_alarm_get_time(const struct device *dev, uint16_t id, uint16_t *mask,
+				  struct rtc_time *timeptr)
+{
+	uint8_t regs[4];
+	int ret;
+
+	ret = pcf2123_reg_read(dev, PCF2123_REG_ALARM_MINUTE, regs, sizeof(regs));
+	if (ret < 0) {
+		LOG_ERR("Failed to read alarm registers (err %d)", ret);
+		return ret;
+	}
+
+	*mask = 0;
+
+	/* Alarm register: MINUTE */
+	if ((regs[0] & BIT(7)) == 0) {
+		*mask |= RTC_ALARM_TIME_MASK_MINUTE;
+		timeptr->tm_min = bcd2bin(regs[0] & PCF2123_MINUTES_MASK);
+	} else {
+		timeptr->tm_min = 0;
+	}
+
+	/* Alarm register: HOUR */
+	if ((regs[1] & BIT(7)) == 0) {
+		*mask |= RTC_ALARM_TIME_MASK_HOUR;
+		timeptr->tm_hour = bcd2bin(regs[1] & PCF2123_HOURS_MASK);
+	} else {
+		timeptr->tm_hour = 0;
+	}
+
+	/* Alarm register: DAY */
+	if ((regs[2] & BIT(7)) == 0) {
+		*mask |= RTC_ALARM_TIME_MASK_MONTHDAY;
+		timeptr->tm_mday = bcd2bin(regs[2] & PCF2123_DAYS_MASK);
+	} else {
+		timeptr->tm_mday = 1;
+	}
+
+	/* Alarm register: WEEKDAY */
+	if ((regs[3] & BIT(7)) == 0) {
+		*mask |= RTC_ALARM_TIME_MASK_WEEKDAY;
+		timeptr->tm_wday = bcd2bin(regs[3] & PCF2123_WEEKDAYS_MASK);
+	} else {
+		timeptr->tm_wday = -1;
+	}
+
+	return 0;
+}
+
+static int pcf2123_alarm_is_pending(const struct device *dev, uint16_t id)
+{
+	int ret;
+	uint8_t ctrl2;
+
+	if (id != 0) {
+		LOG_ERR("Invalid ID: %d", id);
+		return -EINVAL;
+	}
+
+	ret = pcf2123_reg_read(dev, PCF2123_REG_CTRL_2, &ctrl2, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to read from control register 2 (err %d)", ret);
+		return ret;
+	}
+
+	/* Clear the alarm flag. */
+	if (ctrl2 & PCF2123_CTRL_2_AF) {
+		ret = pcf2123_clear_alarm_flag(dev);
+		if (ret < 0) {
+			LOG_ERR("Failed to clear alarm flag (err %d)", ret);
+			return -ENOMSG;
+		}
+
+		return 1;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_RTC_ALARM */
+
+static int pcf2123_alarm_set_callback(const struct device *dev, uint16_t id,
+				      rtc_alarm_callback callback, void *user_data)
+{
+#ifndef PCF2123_INT1_GPIOS_IN_USE
+	ARG_UNUSED(dev);
+	ARG_UNUSED(id);
+	ARG_UNUSED(callback);
+	ARG_UNUSED(user_data);
+
+	return -ENOTSUP;
+#else
+	const struct pcf2123_config *config = dev->config;
+	struct pcf2123_data *data = dev->data;
+	int ret;
+
+	if (config->int1.port == NULL) {
+		LOG_ERR("The int1 port is NULL");
+		return -ENOTSUP;
+	}
+
+	if (id != 0U) {
+		LOG_ERR("Invalid ID %d", id);
+		return -EINVAL;
+	}
+
+	data->dev = dev;
+	data->alarm_callback = callback;
+	data->alarm_user_data = user_data;
+
+	ret = gpio_pin_configure_dt(&config->int1, GPIO_INPUT | GPIO_PULL_UP);
+	if (ret < 0) {
+		LOG_ERR("Failed to configure int1 (err %d)", ret);
+		return ret;
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&config->int1, GPIO_INT_EDGE_FALLING);
+	if (ret < 0) {
+		LOG_ERR("Failed to configure edge on int1 (err %d)", ret);
+		return ret;
+	}
+
+	gpio_init_callback(&data->int1_callback, gpio_int1_callback, BIT(config->int1.pin));
+	ret = gpio_add_callback(config->int1.port, &data->int1_callback);
+	if (ret < 0) {
+		LOG_ERR("Failed to add callback to int1 (err %d)", ret);
+		return ret;
+	}
+
+	return 0;
+#endif
+}
+
+#ifdef PCF2123_INT1_GPIOS_IN_USE
+static void gpio_int1_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
+{
+	struct pcf2123_data *data = CONTAINER_OF(cb, struct pcf2123_data, int1_callback);
+
+	LOG_DBG("PCF2123 interrupt detected");
+	k_work_submit(&(data->callback_work));
+}
+
+void callback_work_handler(struct k_work *work)
+{
+	struct pcf2123_data *data = CONTAINER_OF(work, struct pcf2123_data, callback_work);
+
+	if (data->alarm_callback) {
+		data->alarm_callback(data->dev, 0, data->alarm_user_data);
+	} else {
+		LOG_WRN("Missing PCF2123 alarm callback");
+	}
+}
+#endif /* PCF2123_INT1_GPIOS_IN_USE */
+
+static DEVICE_API(rtc, pcf2123_driver_api) = {
+	.set_time = pcf2123_set_time,
+	.get_time = pcf2123_get_time,
+#ifdef CONFIG_RTC_ALARM
+	.alarm_get_supported_fields = pcf2123_alarm_get_supported_fields,
+	.alarm_set_time = pcf2123_alarm_set_time,
+	.alarm_get_time = pcf2123_alarm_get_time,
+	.alarm_is_pending = pcf2123_alarm_is_pending,
+	.alarm_set_callback = pcf2123_alarm_set_callback,
+#endif
+};
+
+int pcf2123_init(const struct device *dev)
+{
+	const struct pcf2123_config *config = dev->config;
+	int ret;
+	uint8_t dummy_check;
+
+#ifdef PCF2123_INT1_GPIOS_IN_USE
+	struct pcf2123_data *data = dev->data;
+
+	data->callback_work = callback_work;
+#endif
+
+	if (!device_is_ready(config->spi.bus)) {
+		LOG_ERR("SPI device not ready: %s", config->spi.bus->name);
+		return -ENODEV;
+	}
+
+	/* Determine if the SPI device is alive by attempting to read from control register 1. */
+	ret = pcf2123_reg_read(dev, PCF2123_REG_CTRL_1, &dummy_check, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to communicate with PCF2123 (err %d)", ret);
+		return -ENODEV;
+	}
+
+#ifdef PCF2123_INT1_GPIOS_IN_USE
+	uint8_t ctrl2 = PCF2123_CTRL_2_AIE; /* Enable alarm interrupts (AIE). */
+
+	ret = pcf2123_reg_write(dev, PCF2123_REG_CTRL_2, &ctrl2, 1);
+	if (ret < 0) {
+		LOG_ERR("Failed to write to control register 2 during initialization");
+		return -ENODEV;
+	}
+#endif
+
+	LOG_DBG("%s initialized", dev->name);
+
+	return 0;
+}
+
+#define PCF2123_INIT(inst)                                                                         \
+	static const struct pcf2123_config pcf2123_config_##inst = {                               \
+		.spi = SPI_DT_SPEC_INST_GET(inst, SPI_WORD_SET(8) | SPI_TRANSFER_MSB, 0U),         \
+		IF_ENABLED(PCF2123_INT1_GPIOS_IN_USE,\
+			(.int1 = GPIO_DT_SPEC_INST_GET_OR(inst, int1_gpios, {0})) \
+		)};                \
+                                                                                                   \
+	static struct pcf2123_data pcf2123_data_##inst;                                            \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(inst, &pcf2123_init, NULL, &pcf2123_data_##inst,                     \
+			      &pcf2123_config_##inst, POST_KERNEL, CONFIG_RTC_INIT_PRIORITY,       \
+			      &pcf2123_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(PCF2123_INIT)
diff --git a/drivers/rtc/rtc_pcf8563.c b/drivers/rtc/rtc_pcf8563.c
index a994f133361cb..acf2822da4c5a 100644
--- a/drivers/rtc/rtc_pcf8563.c
+++ b/drivers/rtc/rtc_pcf8563.c
@@ -103,7 +103,7 @@ struct pcf8563_data {
  * the datasheet because they may contain unexpected values. Applying a mask will help us
  * to sanitize the read values
  */
-int pcf8563_set_time(const struct device *dev, const struct rtc_time *timeptr)
+static int pcf8563_set_time(const struct device *dev, const struct rtc_time *timeptr)
 {
 	const struct pcf8563_config *config = dev->config;
 	int ret;
@@ -146,7 +146,7 @@ int pcf8563_set_time(const struct device *dev, const struct rtc_time *timeptr)
 	return 0;
 }
 
-int pcf8563_get_time(const struct device *dev, struct rtc_time *timeptr)
+static int pcf8563_get_time(const struct device *dev, struct rtc_time *timeptr)
 {
 	const struct pcf8563_config *config = dev->config;
 	int ret;
@@ -198,7 +198,34 @@ int pcf8563_get_time(const struct device *dev, struct rtc_time *timeptr)
 	return 0;
 }
 
+#ifdef PCF8563_INT1_GPIOS_IN_USE
+
+/* The logic related to the pin interrupt logic */
+static void callback_work_handler(struct k_work *work)
+{
+	/* This function is run as a work so the user can spend here all the necessary time */
+	struct pcf8563_data *data = CONTAINER_OF(work, struct pcf8563_data, callback_work);
+
+	if (data->alarm_callback == NULL) {
+		LOG_WRN("No PCF8563 alarm callback function provided");
+	} else {
+		data->alarm_callback(data->dev, 0, data->alarm_user_data);
+	}
+}
+
+/* The function called when the clock alarm activates the interrupt*/
+static void gpio_callback_function(const struct device *dev, struct gpio_callback *cb,
+		    uint32_t pins)
+{
+	struct pcf8563_data *data = CONTAINER_OF(cb, struct pcf8563_data, int1_callback);
+
+	LOG_DBG("PCF8563 interrupt detected");
+	/* By using a work we are able to run "heavier" code */
+	k_work_submit(&(data->callback_work));
+
+}
 
+#endif /* PCF8563_INT1_GPIOS_IN_USE */
 
 #ifdef CONFIG_RTC_ALARM
 
@@ -366,37 +393,6 @@ static int pcf8563_alarm_is_pending(const struct device *dev, uint16_t id)
 	/* No alarms */
 	return 0;
 }
-#endif
-
-#ifdef PCF8563_INT1_GPIOS_IN_USE
-/* The logic related to the pin interrupt logic */
-
-void callback_work_handler(struct k_work *work)
-{
-	/* This function is run as a work so the user can spend here all the necessary time */
-	struct pcf8563_data *data = CONTAINER_OF(work, struct pcf8563_data, callback_work);
-
-	if (data->alarm_callback == NULL) {
-		LOG_WRN("No PCF8563 alarm callback function provided");
-	} else {
-		data->alarm_callback(data->dev, 0, data->alarm_user_data);
-	}
-}
-
-
-/* The function called when the clock alarm activates the interrupt*/
-void gpio_callback_function(const struct device *dev, struct gpio_callback *cb,
-		    uint32_t pins)
-{
-	struct pcf8563_data *data = CONTAINER_OF(cb, struct pcf8563_data, int1_callback);
-
-	LOG_DBG("PCF8563 interrupt detected");
-	/* By using a work we are able to run "heavier" code */
-	k_work_submit(&(data->callback_work));
-
-}
-
-#endif
 
 static int pcf8563_alarm_set_callback(const struct device *dev, uint16_t id,
 				      rtc_alarm_callback callback, void *user_data)
@@ -408,7 +404,7 @@ static int pcf8563_alarm_set_callback(const struct device *dev, uint16_t id,
 	ARG_UNUSED(user_data);
 
 	return -ENOTSUP;
-#else
+#else /* PCF8563_INT1_GPIOS_IN_USE */
 	const struct pcf8563_config *config = dev->config;
 	struct pcf8563_data *data = dev->data;
 	int ret;
@@ -446,9 +442,11 @@ static int pcf8563_alarm_set_callback(const struct device *dev, uint16_t id,
 	gpio_add_callback(config->int1.port, &data->int1_callback);
 	LOG_DBG("Alarm set");
 	return 0;
-#endif
+#endif /* PCF8563_INT1_GPIOS_IN_USE */
 }
 
+#endif /* CONFIG_RTC_ALARM */
+
 static DEVICE_API(rtc, pcf8563_driver_api) = {
 	.set_time = pcf8563_set_time,
 	.get_time = pcf8563_get_time,
@@ -462,7 +460,7 @@ static DEVICE_API(rtc, pcf8563_driver_api) = {
 };
 
 
-int pcf8563_init(const struct device *dev)
+static int pcf8563_init(const struct device *dev)
 {
 	const struct pcf8563_config *config = dev->config;
 	int ret;
diff --git a/drivers/rtc/rtc_rts5912.c b/drivers/rtc/rtc_rts5912.c
new file mode 100644
index 0000000000000..6dba0a2ab2c45
--- /dev/null
+++ b/drivers/rtc/rtc_rts5912.c
@@ -0,0 +1,158 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Realtek Semiconductor Corporation, SIBG-SD7
+ * Author: Chia-Yang Lin <cylin0708@realtek.com>
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_rtc
+
+#include <soc.h>
+#include <errno.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/rtc.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_control_rts5912.h>
+#include "rtc_utils.h"
+
+#include "reg/reg_system.h"
+#include "reg/reg_rtc.h"
+
+LOG_MODULE_REGISTER(rtc_rts5912, CONFIG_RTC_LOG_LEVEL);
+
+#define RTS5912_RTC_TIME_MASK                                                                      \
+	(RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |      \
+	 RTC_ALARM_TIME_MASK_WEEKDAY | RTC_ALARM_TIME_MASK_MONTHDAY | RTC_ALARM_TIME_MASK_MONTH |  \
+	 RTC_ALARM_TIME_MASK_YEAR)
+
+#define RTS5912_RTC_DIVCTL_NORMAL_OPERATION BIT(1)
+
+#define RTS5912_RTC_DAYWEEK_OFFSET 1
+#define RTS5912_RTC_MONTH_OFFSET   1
+#define RTS5912_RTC_YEAR_OFFSET    100
+
+struct rtc_rts5912_config {
+	RTC_Type *regs;
+	uint32_t rtc_base;
+	uint32_t rtc_clk_grp;
+	uint32_t rtc_clk_idx;
+	const struct device *clk_dev;
+};
+
+struct rtc_rts5912_data {
+	struct k_spinlock lock;
+};
+
+static void rtc_rts5912_reset_rtc_time(const struct device *dev)
+{
+	const struct rtc_rts5912_config *const dev_cfg = dev->config;
+	RTC_Type *rtc_regs = dev_cfg->regs;
+
+	rtc_regs->CTRL1 |= RTC_CTRL1_SETMODE_Msk;
+	rtc_regs->CTRL0 &= ~RTC_CTRL0_DIVCTL_Msk;
+	rtc_regs->CTRL0 |= (RTS5912_RTC_DIVCTL_NORMAL_OPERATION << RTC_CTRL0_DIVCTL_Pos);
+	rtc_regs->CTRL1 |= RTC_CTRL1_DATEMODE_Msk;
+	rtc_regs->CTRL1 |= RTC_CTRL1_HRMODE_Msk;
+	rtc_regs->SEC = 0;
+	rtc_regs->MIN = 0;
+	rtc_regs->HR &= ~(RTC_HR_AMPM_Msk | RTC_HR_VAL_Msk);
+	rtc_regs->DAYWEEK = BIT(0);
+	rtc_regs->DAYMONTH = BIT(0);
+	rtc_regs->MONTH = BIT(0);
+	rtc_regs->YEAR = 0;
+	rtc_regs->WEEK &= ~RTC_WEEK_NUM_Msk;
+}
+
+static int rtc_rts5912_set_time(const struct device *dev, const struct rtc_time *timeptr)
+{
+	const struct rtc_rts5912_config *const dev_cfg = dev->config;
+	RTC_Type *rtc_regs = dev_cfg->regs;
+
+	if (!rtc_utils_validate_rtc_time(timeptr, RTS5912_RTC_TIME_MASK)) {
+		rtc_rts5912_reset_rtc_time(dev);
+		k_msleep(1);
+		return -EINVAL;
+	}
+
+	rtc_regs->CTRL1 |= RTC_CTRL1_SETMODE_Msk;
+	rtc_regs->SEC = timeptr->tm_sec;
+	rtc_regs->MIN = timeptr->tm_min;
+	rtc_regs->HR = timeptr->tm_hour;
+	rtc_regs->DAYWEEK = timeptr->tm_wday + RTS5912_RTC_DAYWEEK_OFFSET;
+	rtc_regs->DAYMONTH = timeptr->tm_mday;
+	rtc_regs->MONTH = timeptr->tm_mon + RTS5912_RTC_MONTH_OFFSET;
+	rtc_regs->YEAR = timeptr->tm_year % RTS5912_RTC_YEAR_OFFSET;
+	/* Need to delay in order to update register after setting RTC time */
+	k_msleep(1);
+	rtc_regs->CTRL1 &= ~RTC_CTRL1_SETMODE_Msk;
+
+	return 0;
+}
+
+static int rtc_rts5912_get_time(const struct device *dev, struct rtc_time *timeptr)
+{
+	const struct rtc_rts5912_config *const dev_cfg = dev->config;
+	RTC_Type *rtc_regs = dev_cfg->regs;
+
+	timeptr->tm_sec = rtc_regs->SEC;
+	timeptr->tm_min = rtc_regs->MIN;
+	timeptr->tm_hour = rtc_regs->HR;
+	timeptr->tm_wday = rtc_regs->DAYWEEK - RTS5912_RTC_DAYWEEK_OFFSET;
+	timeptr->tm_mday = rtc_regs->DAYMONTH;
+	timeptr->tm_mon = rtc_regs->MONTH - RTS5912_RTC_MONTH_OFFSET;
+	timeptr->tm_year = rtc_regs->YEAR + RTS5912_RTC_YEAR_OFFSET;
+
+	/* No support for daylight saving time flag and nanoseconds in rts5912 RTC */
+	timeptr->tm_isdst = -1;
+	timeptr->tm_nsec = 0;
+
+	return 0;
+}
+
+static DEVICE_API(rtc, rtc_rts5912_driver_api) = {
+	.set_time = rtc_rts5912_set_time,
+	.get_time = rtc_rts5912_get_time,
+};
+
+static int rtc_rts5912_init(const struct device *dev)
+{
+	const struct rtc_rts5912_config *const rtc_config = dev->config;
+	struct rts5912_sccon_subsys sccon;
+
+	int rc;
+
+	if (!device_is_ready(rtc_config->clk_dev)) {
+		LOG_ERR("RTC device not ready");
+		return -ENODEV;
+	}
+
+	sccon.clk_grp = rtc_config->rtc_clk_grp;
+	sccon.clk_idx = rtc_config->rtc_clk_idx;
+	rc = clock_control_on(rtc_config->clk_dev, (clock_control_subsys_t)&sccon);
+	if (rc < 0) {
+		LOG_ERR("Failed to turn on RTC clock (%d)", rc);
+		return rc;
+	}
+
+	rtc_rts5912_reset_rtc_time(dev);
+
+	return rc;
+}
+
+#define RTC_RTS5912_CONFIG(inst)                                                                   \
+	static struct rtc_rts5912_config rtc_rts5912_config_##inst = {                             \
+		.regs = (RTC_Type *)(DT_INST_REG_ADDR(inst)),                                      \
+		.rtc_base = DT_INST_REG_ADDR(inst),                                                \
+		.rtc_clk_grp = DT_INST_CLOCKS_CELL_BY_NAME(inst, rtc, clk_grp),                    \
+		.rtc_clk_idx = DT_INST_CLOCKS_CELL_BY_NAME(inst, rtc, clk_idx),                    \
+		.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(inst)),                               \
+	};
+
+#define RTC_RTS5912_DEVICE_INIT(index)                                                             \
+	RTC_RTS5912_CONFIG(index)                                                                  \
+	DEVICE_DT_INST_DEFINE(index, &rtc_rts5912_init, NULL, NULL, &rtc_rts5912_config_##index,   \
+			      POST_KERNEL, CONFIG_RTC_INIT_PRIORITY, &rtc_rts5912_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(RTC_RTS5912_DEVICE_INIT)
diff --git a/drivers/rtc/rtc_rx8130ce.c b/drivers/rtc/rtc_rx8130ce.c
index d181bea8a0f1b..89a5430d51ca6 100644
--- a/drivers/rtc/rtc_rx8130ce.c
+++ b/drivers/rtc/rtc_rx8130ce.c
@@ -316,7 +316,7 @@ static int rx8130ce_alarm_set_time(const struct device *dev, uint16_t id, uint16
 					const struct rtc_time *timeptr)
 {
 	int rc = 0;
-	bool alarm_enabled;
+	bool alarm_enabled = false;
 	struct rx8130ce_alarm alarm_time;
 	struct rx8130ce_data *data = dev->data;
 	const struct rx8130ce_config *cfg = dev->config;
@@ -358,7 +358,7 @@ static int rx8130ce_alarm_set_time(const struct device *dev, uint16_t id, uint16
 	alarm_time.minute = bin2bcd(timeptr->tm_min);
 	alarm_time.hour = bin2bcd(timeptr->tm_hour);
 	alarm_time.day = bin2bcd(timeptr->tm_mday);
-	data->reg.extension &= ~EXT_WADA;
+	data->reg.extension |= EXT_WADA;
 
 	if ((mask & RTC_ALARM_TIME_MASK_MINUTE) == 0U) {
 		alarm_time.minute |= ALARM_DISABLE;
@@ -426,15 +426,15 @@ static int rx8130ce_alarm_get_time(const struct device *dev, uint16_t id, uint16
 		*mask |= RTC_ALARM_TIME_MASK_HOUR;
 	}
 	if (data->reg.extension & EXT_WADA) {
-		timeptr->tm_wday = rtc2wday(alarm_time.wday & RX8130CE_WEEKDAYS_MASK);
-		if (!(alarm_time.wday & ALARM_DISABLE)) {
-			*mask |= RTC_ALARM_TIME_MASK_WEEKDAY;
-		}
-	} else {
-		timeptr->tm_mday = bcd2bin(alarm_time.day & RX8130CE_DAYS_MASK);
+		timeptr->tm_mday = bcd2bin(alarm_time.day);
 		if (!(alarm_time.day & ALARM_DISABLE)) {
 			*mask |= RTC_ALARM_TIME_MASK_MONTHDAY;
 		}
+	} else {
+		timeptr->tm_wday = rtc2wday(alarm_time.wday);
+		if (!(alarm_time.wday & ALARM_DISABLE)) {
+			*mask |= RTC_ALARM_TIME_MASK_WEEKDAY;
+		}
 	}
 error:
 	k_sem_give(&data->lock);
diff --git a/drivers/sdhc/CMakeLists.txt b/drivers/sdhc/CMakeLists.txt
index 269f1a419c08a..589ba209eb3e9 100644
--- a/drivers/sdhc/CMakeLists.txt
+++ b/drivers/sdhc/CMakeLists.txt
@@ -13,4 +13,6 @@ zephyr_library_sources_ifdef(CONFIG_SDHC_INFINEON_CAT1 ifx_cat1_sdio.c)
 zephyr_library_sources_ifdef(CONFIG_CDNS_SDHC sdhc_cdns_ll.c sdhc_cdns.c)
 zephyr_library_sources_ifdef(CONFIG_SDHC_ESP32 sdhc_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_SDHC_RENESAS_RA sdhc_renesas_ra.c)
+zephyr_library_sources_ifdef(CONFIG_SDHC_MAX32 sdhc_max32.c)
+zephyr_library_sources_ifdef(CONFIG_SDHC_AMBIQ sdhc_ambiq.c)
 endif()
diff --git a/drivers/sdhc/Kconfig b/drivers/sdhc/Kconfig
index 89fa669a5e522..3c8a7bd869cd0 100644
--- a/drivers/sdhc/Kconfig
+++ b/drivers/sdhc/Kconfig
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig SDHC
-	bool "Secure Digital High Capacity (SDHC) drivers"
+	bool "Secure Digital (SD card) host controller drivers"
 	help
-	  Include drivers for SD host controller
+	  Include drivers for interacting with SD cards
 
 if SDHC
 
@@ -18,6 +18,8 @@ source "drivers/sdhc/Kconfig.intel"
 source "drivers/sdhc/Kconfig.sdhc_cdns"
 source "drivers/sdhc/Kconfig.esp32"
 source "drivers/sdhc/Kconfig.renesas_ra"
+source "drivers/sdhc/Kconfig.max32"
+source "drivers/sdhc/Kconfig.ambiq"
 
 config SDHC_INIT_PRIORITY
 	int "SDHC driver init priority"
diff --git a/drivers/sdhc/Kconfig.ambiq b/drivers/sdhc/Kconfig.ambiq
new file mode 100644
index 0000000000000..44e465aca947c
--- /dev/null
+++ b/drivers/sdhc/Kconfig.ambiq
@@ -0,0 +1,31 @@
+# Copyright (c) 2025 Ambiq Micro Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config SDHC_AMBIQ
+	bool "Ambiq SDHC driver"
+	default y
+	depends on DT_HAS_AMBIQ_SDIO_ENABLED
+	select AMBIQ_HAL
+	select AMBIQ_HAL_USE_SDIO
+	select PINCTRL
+	select GPIO
+	select SDHC_SUPPORTS_NATIVE_MODE
+	help
+	  This option enables the SDHC driver for Ambiq Apollo family.
+
+if SDHC_AMBIQ
+
+config AMBIQ_SDIO_ASYNC
+	bool "Ambiq SDIO Async Mode"
+	default y
+	depends on DT_HAS_AMBIQ_SDIO_ENABLED
+	help
+	  This option enables Ambiq SDIO Async Mode.
+
+config SDHC_BUFFER_ALIGNMENT
+	default 32 if DCACHE
+	default 16
+	help
+	  SDHC buffer should be 32bytes aligned when placed in cachable region.
+
+endif
diff --git a/drivers/sdhc/Kconfig.max32 b/drivers/sdhc/Kconfig.max32
new file mode 100644
index 0000000000000..71212042ae137
--- /dev/null
+++ b/drivers/sdhc/Kconfig.max32
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config SDHC_MAX32
+	bool "Analog Devices MAX32 SDHC driver"
+	default y
+	depends on DT_HAS_ADI_MAX32_SDHC_ENABLED
+	select SDHC_SUPPORTS_NATIVE_MODE
+	help
+	  sdhc driver for max32 family.
diff --git a/drivers/sdhc/intel_emmc_host.c b/drivers/sdhc/intel_emmc_host.c
index 0b0695ffecb4b..2ac32d82898ea 100644
--- a/drivers/sdhc/intel_emmc_host.c
+++ b/drivers/sdhc/intel_emmc_host.c
@@ -417,7 +417,7 @@ static int emmc_dma_init(const struct device *dev, struct sdhc_data *data, bool
 	if (IS_ENABLED(CONFIG_INTEL_EMMC_HOST_ADMA)) {
 		uint8_t *buff = data->data;
 
-		/* Setup DMA trasnfer using ADMA2 */
+		/* Setup DMA transfer using ADMA2 */
 		memset(emmc->desc_table, 0, sizeof(emmc->desc_table));
 
 #if defined(CONFIG_INTEL_EMMC_HOST_ADMA_DESC_SIZE)
@@ -446,7 +446,7 @@ static int emmc_dma_init(const struct device *dev, struct sdhc_data *data, bool
 		LOG_DBG("adma: %llx %x %p", emmc->desc_table[0], regs->adma_sys_addr1,
 			emmc->desc_table);
 	} else {
-		/* Setup DMA trasnfer using SDMA */
+		/* Setup DMA transfer using SDMA */
 		regs->sdma_sysaddr = (uint32_t)((uintptr_t)data->data);
 		LOG_DBG("sdma_sysaddr: %x", regs->sdma_sysaddr);
 	}
diff --git a/drivers/sdhc/sdhc_ambiq.c b/drivers/sdhc/sdhc_ambiq.c
new file mode 100644
index 0000000000000..b58949a855742
--- /dev/null
+++ b/drivers/sdhc/sdhc_ambiq.c
@@ -0,0 +1,828 @@
+/*
+ * Copyright (c) 2025 Ambiq Micro Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ambiq_sdio
+
+#include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/cache.h>
+#include <zephyr/irq.h>
+#include <zephyr/drivers/sdhc.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/pm/device_runtime.h>
+
+#include <soc.h>
+
+LOG_MODULE_REGISTER(ambiq_sdio, CONFIG_SDHC_LOG_LEVEL);
+
+#define CACHABLE_START_ADDR SSRAM_BASEADDR
+
+struct ambiq_sdio_config {
+	SDIO_Type *pSDHC;
+	const struct pinctrl_dev_config *pincfg;
+	void (*irq_config_func)(const struct device *dev);
+	uint32_t inst;
+	uint8_t tx_delay;
+	uint8_t rx_delay;
+	uint32_t max_bus_freq;
+	uint32_t min_bus_freq;
+	uint32_t power_delay_ms;
+};
+
+struct ambiq_sdio_data {
+	am_hal_card_t card;
+	am_hal_card_host_t *host;
+	sdhc_interrupt_cb_t sdio_cb;
+	void *sdio_cb_user_data;
+	struct k_mutex access_mutex;
+#ifdef CONFIG_AMBIQ_SDIO_ASYNC
+	struct k_sem *async_sem;
+#endif /* CONFIG_AMBIQ_SDIO_ASYNC */
+};
+
+#ifdef CONFIG_AMBIQ_SDIO_ASYNC
+/* Semaphore for SDIO0 Async Data Transfer */
+static K_SEM_DEFINE(sdio_async_sem_0, 0, 1);
+
+/*
+ * SDIO0 Async Data Transfer Callback Function
+ */
+static void ambiq_sdio_event_cb_0(am_hal_host_evt_t *pEvt)
+{
+	am_hal_card_host_t *pHost = (am_hal_card_host_t *)pEvt->pCtx;
+
+	if (AM_HAL_EVT_XFER_COMPLETE == pEvt->eType &&
+	    pHost->AsyncCmdData.dir == AM_HAL_DATA_DIR_READ) {
+		LOG_DBG("Last Read Xfered block %d\n", pEvt->ui32BlkCnt);
+		k_sem_give(&sdio_async_sem_0);
+	} else if (AM_HAL_EVT_XFER_COMPLETE == pEvt->eType &&
+		   pHost->AsyncCmdData.dir == AM_HAL_DATA_DIR_WRITE) {
+		LOG_DBG("Last Write Xfered block %d\n", pEvt->ui32BlkCnt);
+		k_sem_give(&sdio_async_sem_0);
+	} else if (AM_HAL_EVT_CARD_INT == pEvt->eType) {
+		LOG_DBG("SDIO Card Interrupt\n");
+	}
+}
+
+/* Semaphore for SDIO1 Async Data Transfer */
+static K_SEM_DEFINE(sdio_async_sem_1, 0, 1);
+
+/*
+ * SDIO1 Async Data Transfer Callback Function
+ */
+static void ambiq_sdio_event_cb_1(am_hal_host_evt_t *pEvt)
+{
+	am_hal_card_host_t *pHost = (am_hal_card_host_t *)pEvt->pCtx;
+
+	if (AM_HAL_EVT_XFER_COMPLETE == pEvt->eType &&
+	    pHost->AsyncCmdData.dir == AM_HAL_DATA_DIR_READ) {
+		LOG_DBG("Last Read Xfered block %d\n", pEvt->ui32BlkCnt);
+		k_sem_give(&sdio_async_sem_1);
+	} else if (AM_HAL_EVT_XFER_COMPLETE == pEvt->eType &&
+		   pHost->AsyncCmdData.dir == AM_HAL_DATA_DIR_WRITE) {
+		LOG_DBG("Last Write Xfered block %d\n", pEvt->ui32BlkCnt);
+		k_sem_give(&sdio_async_sem_1);
+	} else if (AM_HAL_EVT_CARD_INT == pEvt->eType) {
+		LOG_DBG("SDIO Card Interrupt\n");
+	}
+}
+#endif /* CONFIG_AMBIQ_SDIO_ASYNC */
+
+/*
+ * Ambiq SDIO interrupt service routine
+ */
+static void ambiq_sdio_isr(const struct device *dev)
+{
+	uint32_t ui32IntStatus;
+	struct ambiq_sdio_data *data = dev->data;
+
+	am_hal_sdhc_intr_status_get(data->host->pHandle, &ui32IntStatus, true);
+	am_hal_sdhc_intr_status_clear(data->host->pHandle, ui32IntStatus);
+	am_hal_sdhc_interrupt_service(data->host->pHandle, ui32IntStatus);
+	if (data->sdio_cb != NULL && data->host->Evt.eType == AM_HAL_EVT_CARD_INT) {
+		data->sdio_cb(dev, SDHC_INT_SDIO, data->sdio_cb_user_data);
+	}
+}
+
+/*
+ * Ambiq SDIO host controller software reset
+ */
+static int ambiq_sdio_reset(const struct device *dev)
+{
+	const struct ambiq_sdio_config *config = dev->config;
+	uint32_t ui32Status = 0;
+	int ret = 0;
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	ret = pm_device_runtime_get(dev);
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_get failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+	LOG_DBG("SDHC Software Reset");
+	ui32Status = am_hal_sdhc_software_reset(config->pSDHC, AM_HAL_SDHC_SW_RESET_ALL);
+	if (ui32Status) {
+		LOG_ERR("SDHC software reset failed, ui32Status = %u", ui32Status);
+		ret = -EIO;
+	}
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	/* Use async put to avoid useless device suspension/resumption
+	 * when doing consecutive transmission.
+	 */
+	ret = pm_device_runtime_put_async(dev, K_MSEC(2));
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_put failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+	return ret;
+}
+
+/*
+ * Get Ambiq SDIO Host controller properties
+ */
+static int ambiq_sdio_get_host_props(const struct device *dev, struct sdhc_host_props *props)
+{
+	const struct ambiq_sdio_config *config = dev->config;
+
+	LOG_DBG("SDHC get host props");
+	memset(props, 0, sizeof(*props));
+	props->f_max = config->max_bus_freq;
+	props->f_min = config->min_bus_freq;
+	props->power_delay = config->power_delay_ms;
+	props->host_caps.suspend_res_support = true;
+	props->host_caps.adma_2_support = true;
+	props->host_caps.sdio_async_interrupt_support = true;
+	props->host_caps.vol_180_support = true;
+	props->host_caps.bus_4_bit_support = true;
+	props->host_caps.bus_8_bit_support = true;
+	props->host_caps.high_spd_support = true;
+	props->host_caps.sdr50_support = true;
+	props->host_caps.sdr104_support = true;
+	props->host_caps.ddr50_support = true;
+	props->host_caps.hs200_support = true;
+	props->max_current_330 = 1020;
+	props->max_current_300 = 1020;
+	props->max_current_180 = 1020;
+	props->is_spi = false;
+	return 0;
+}
+
+/*
+ * Set I/O properties of SDIO host controller
+ */
+static int ambiq_sdio_set_io(const struct device *dev, struct sdhc_io *ios)
+{
+	const struct ambiq_sdio_config *config = dev->config;
+	struct ambiq_sdio_data *data = dev->data;
+	am_hal_host_bus_voltage_e eBusVoltage;
+	am_hal_host_bus_width_e eBusWidth;
+	am_hal_host_uhs_mode_e eUHSMode = AM_HAL_HOST_UHS_SDR50;
+	uint32_t ui32Status = 0;
+	int ret = 0;
+
+	LOG_DBG("(SDIO clock_freq=%d, bus_width=%d, timing_mode=%d, bus_mode=%d)", ios->clock,
+		ios->bus_width, ios->timing, ios->bus_mode);
+
+	if (ios->clock != 0 && (ios->clock <= config->max_bus_freq) &&
+	    (ios->clock >= config->min_bus_freq)) {
+		data->card.cfg.ui32Clock = ios->clock;
+	} else if (ios->clock != 0 && (ios->clock > config->max_bus_freq) &&
+		   (ios->clock <= MMC_CLOCK_HS200)) {
+		/*Limit HS200 frequency to config->max_bus_freq*/
+		data->card.cfg.ui32Clock = config->max_bus_freq;
+		eUHSMode = AM_HAL_HOST_UHS_SDR104;
+	} else if (ios->clock != 0) {
+		return -ENOTSUP;
+	}
+
+	if (ios->bus_mode != SDHC_BUSMODE_PUSHPULL) {
+		return -ENOTSUP;
+	}
+
+	switch (ios->bus_width) {
+	case SDHC_BUS_WIDTH1BIT:
+		eBusWidth = AM_HAL_HOST_BUS_WIDTH_1;
+		break;
+	case SDHC_BUS_WIDTH4BIT:
+		eBusWidth = AM_HAL_HOST_BUS_WIDTH_4;
+		break;
+	case SDHC_BUS_WIDTH8BIT:
+		eBusWidth = AM_HAL_HOST_BUS_WIDTH_8;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	switch (ios->signal_voltage) {
+	case SD_VOL_3_3_V:
+		eBusVoltage = AM_HAL_HOST_BUS_VOLTAGE_3_3;
+		break;
+	case SD_VOL_3_0_V:
+		eBusVoltage = AM_HAL_HOST_BUS_VOLTAGE_3_0;
+		break;
+	case SD_VOL_1_8_V:
+		eBusVoltage = AM_HAL_HOST_BUS_VOLTAGE_1_8;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	ret = pm_device_runtime_get(dev);
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_get failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+	/* Change SDIO Host Bus Voltage */
+	if (eBusVoltage != data->card.cfg.eIoVoltage) {
+		data->card.cfg.eIoVoltage = eBusVoltage;
+		ui32Status = data->host->ops->set_bus_voltage(data->host->pHandle, eBusVoltage);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+#ifdef CONFIG_PM_DEVICE_RUNTIME
+			pm_device_runtime_put(dev);
+#endif
+			return -ENOTSUP;
+		}
+	}
+
+	/* Change SDIO Host Bus Width */
+	if (eBusWidth != data->card.cfg.eBusWidth) {
+		data->card.cfg.eBusWidth = eBusWidth;
+		ui32Status = data->host->ops->set_bus_width(data->host->pHandle, eBusWidth);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+#ifdef CONFIG_PM_DEVICE_RUNTIME
+			pm_device_runtime_put(dev);
+#endif
+			return -ENOTSUP;
+		}
+	}
+
+	/* Change SDIO Host Clock Speed */
+	ui32Status = data->host->ops->set_bus_clock(data->host->pHandle, data->card.cfg.ui32Clock);
+	if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+#ifdef CONFIG_PM_DEVICE_RUNTIME
+		pm_device_runtime_put(dev);
+#endif
+		return -ENOTSUP;
+	}
+
+	if (ios->timing == SDHC_TIMING_DDR52) {
+		LOG_DBG("MMC Card DDR50 Mode");
+		/* DDR50 mode must be 4bit or 8bit width according to EMMC Spec */
+		if (eBusWidth == AM_HAL_HOST_BUS_WIDTH_1) {
+#ifdef CONFIG_PM_DEVICE_RUNTIME
+			pm_device_runtime_put(dev);
+#endif
+			return -ENOTSUP;
+		}
+		eUHSMode = AM_HAL_HOST_UHS_DDR50;
+	}
+
+	/* Change SDIO Host UHS mode */
+	if (eUHSMode != data->card.cfg.eUHSMode) {
+		data->card.cfg.eUHSMode = eUHSMode;
+		ui32Status = data->host->ops->set_uhs_mode(data->host->pHandle, eUHSMode);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+#ifdef CONFIG_PM_DEVICE_RUNTIME
+			pm_device_runtime_put(dev);
+#endif
+			return -ENOTSUP;
+		}
+	}
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	/* Use async put to avoid useless device suspension/resumption
+	 * when doing consecutive transmission.
+	 */
+	ret = pm_device_runtime_put_async(dev, K_MSEC(2));
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_put failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+	return ret;
+}
+
+/*
+ * Ambiq SDIO Host Initialization Function
+ */
+static int ambiq_sdio_init(const struct device *dev)
+{
+	const struct ambiq_sdio_config *config = dev->config;
+	struct ambiq_sdio_data *data = dev->data;
+	int ret;
+
+	LOG_DBG("Ambiq SDIO Initialize Host #%d", config->inst);
+
+	ret = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
+	if (ret) {
+		return ret;
+	}
+
+	/* Get the uderlying SDHC host instance */
+	data->host = am_hal_get_card_host(AM_HAL_SDHC_CARD_HOST + config->inst, true);
+
+	if (data->host == NULL) {
+		LOG_ERR("No such card host and stop");
+		return -ENODEV;
+	}
+
+	config->irq_config_func(dev);
+
+	/* Fill the Card default setting with the host's default value  */
+	data->card.pHost = data->host;
+	data->card.cfg.eBusWidth = data->host->eBusWidth;
+	data->card.cfg.eIoVoltage = data->host->eBusVoltage;
+	data->card.cfg.ui32Clock = data->host->ui32MinClock;
+	data->card.cfg.eUHSMode = data->host->eUHSMode;
+
+	/* Set AM_HAL_CARD_PWR_CTRL_SDHC_OFF as default SDIO power control policy  */
+	data->card.eCardPwrCtrlPolicy = AM_HAL_CARD_PWR_CTRL_SDHC_OFF;
+	data->card.eState = AM_HAL_CARD_STATE_PWRON;
+	data->card.pCardPwrCtrlFunc = NULL;
+
+#ifdef CONFIG_AMBIQ_SDIO_ASYNC
+	/* Register callback function for Async data transfer  */
+	if (config->inst == 0) {
+		data->async_sem = &sdio_async_sem_0;
+		am_hal_card_register_evt_callback(&data->card, ambiq_sdio_event_cb_0);
+	} else if (config->inst == 1) {
+		data->async_sem = &sdio_async_sem_1;
+		am_hal_card_register_evt_callback(&data->card, ambiq_sdio_event_cb_1);
+	} else {
+		return -ENODEV;
+	}
+#endif /* CONFIG_AMBIQ_SDIO_ASYNC */
+
+	k_mutex_init(&data->access_mutex);
+
+	return 0;
+}
+
+/*
+ * Set TX & RX delay for Ambiq SDIO Timing Tuning
+ */
+static int ambiq_sdio_execute_tuning(const struct device *dev)
+{
+	const struct ambiq_sdio_config *config = dev->config;
+	struct ambiq_sdio_data *data = dev->data;
+	uint8_t ui8TxRxDelays[2] = {0};
+	int ret = 0;
+
+	/* SDIO TX delay setting range is 0 ~ 15 */
+	if (config->tx_delay < 16) {
+		ui8TxRxDelays[0] = config->tx_delay;
+	} else {
+		return -EINVAL;
+	}
+
+	/* SDIO RX delay setting range is 0 ~ 31 */
+	if (config->rx_delay < 32) {
+		ui8TxRxDelays[1] = config->rx_delay;
+	} else {
+		return -EINVAL;
+	}
+
+	/* Timing delay is disabled if both TX and RX delay are set into 0 */
+	if (ui8TxRxDelays[0] != 0 || ui8TxRxDelays[1] != 0) {
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+		ret = pm_device_runtime_get(dev);
+
+		if (ret < 0) {
+			LOG_ERR("pm_device_runtime_get failed: %d", ret);
+		}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+		am_hal_card_host_set_txrx_delay(data->host, ui8TxRxDelays);
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+		/* Use async put to avoid useless device suspension/resumption
+		 * when doing consecutive transmission.
+		 */
+		ret = pm_device_runtime_put_async(dev, K_MSEC(2));
+
+		if (ret < 0) {
+			LOG_ERR("pm_device_runtime_put failed: %d", ret);
+		}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+	}
+
+	return ret;
+}
+
+/*
+ * Check for Card Presence
+ */
+static int ambiq_sdio_get_card_present(const struct device *dev)
+{
+	struct ambiq_sdio_data *data = dev->data;
+	int status = 0;
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	int ret = 0;
+
+	ret = pm_device_runtime_get(dev);
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_get failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+	LOG_DBG("Get card present status");
+	status = data->host->ops->get_cd(data->host->pHandle);
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	/* Use async put to avoid useless device suspension/resumption
+	 * when doing consecutive transmission.
+	 */
+	ret = pm_device_runtime_put_async(dev, K_MSEC(2));
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_put failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+	return status;
+}
+
+/*
+ * Check for Card Busy Status
+ */
+static int ambiq_sdio_card_busy(const struct device *dev)
+{
+	struct ambiq_sdio_data *data = dev->data;
+	uint32_t ui32Status;
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	int ret = 0;
+
+	ret = pm_device_runtime_get(dev);
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_get failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+	ui32Status = data->host->ops->card_busy(data->host->pHandle, DEFAULT_GET_STATUS_TIMEOUT_MS);
+	LOG_DBG("Check card busy status");
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	/* Use async put to avoid useless device suspension/resumption
+	 * when doing consecutive transmission.
+	 */
+	ret = pm_device_runtime_put_async(dev, K_MSEC(2));
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_put failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+	return (ui32Status != AM_HAL_STATUS_SUCCESS) ? 1 : 0;
+}
+
+/*
+ * Ambiq SDIO Command and Data Request Function
+ */
+static int ambiq_sdio_request(const struct device *dev, struct sdhc_command *cmd,
+			      struct sdhc_data *data)
+{
+	struct ambiq_sdio_data *dev_data = dev->data;
+	uint32_t ui32Status = 0;
+	int ret = 0;
+
+	am_hal_card_cmd_t sdio_cmd = {0};
+	am_hal_card_cmd_data_t cmd_data = {0};
+
+	if (cmd) {
+		sdio_cmd.ui8Idx = cmd->opcode;
+		sdio_cmd.ui32Arg = cmd->arg;
+		sdio_cmd.ui32RespType = cmd->response_type;
+		sdio_cmd.bASync = false;
+	} else {
+		LOG_ERR("Invalid CMD");
+		return -EINVAL;
+	}
+
+	if (data) {
+		cmd_data.ui32BlkCnt = data->blocks;
+		cmd_data.ui32BlkSize = data->block_size;
+		cmd_data.pui8Buf = data->data;
+
+		if (sdio_cmd.ui8Idx == MMC_CMD_READ_MULTIPLE_BLOCK ||
+		    sdio_cmd.ui8Idx == MMC_CMD_WRITE_MULTIPLE_BLOCK) {
+			sdio_cmd.bAutoCMD23 = true;
+		}
+
+		if (sdio_cmd.ui8Idx == MMC_CMD_WRITE_SINGLE_BLOCK ||
+		    sdio_cmd.ui8Idx == MMC_CMD_WRITE_MULTIPLE_BLOCK) {
+			cmd_data.dir = AM_HAL_DATA_DIR_WRITE;
+		} else if ((sdio_cmd.ui8Idx == SDIO_CMD_IO_RW_EXTENDED) &&
+			   (sdio_cmd.ui32Arg & BIT(SDIO_CMD_ARG_RW_SHIFT))) {
+			cmd_data.dir = AM_HAL_DATA_DIR_WRITE;
+		} else {
+			cmd_data.dir = AM_HAL_DATA_DIR_READ;
+		}
+	}
+
+	LOG_DBG("Send SDIO CMD%d", sdio_cmd.ui8Idx);
+	LOG_DBG("CMD->Arg = 0x%x CMD->RespType = 0x%x", sdio_cmd.ui32Arg, sdio_cmd.ui32RespType);
+
+	if (sdio_cmd.ui8Idx == 1) {
+		LOG_DBG("Config CMD1 RespType");
+		sdio_cmd.ui32RespType = MMC_RSP_R3;
+	} else if (sdio_cmd.ui8Idx == 3) {
+		LOG_DBG("Config CMD3 RespType");
+		sdio_cmd.ui32RespType = MMC_RSP_R6;
+	} else if ((sdio_cmd.ui8Idx == 52) || (sdio_cmd.ui8Idx == 53)) {
+		LOG_DBG("Config CMD%d RespType", sdio_cmd.ui8Idx);
+		sdio_cmd.ui32RespType = MMC_RSP_R5;
+	} else if (sdio_cmd.ui8Idx == 6 || sdio_cmd.ui8Idx == 38) {
+		LOG_DBG("Set CheckBusyCmd");
+		sdio_cmd.bCheckBusyCmd = true;
+		sdio_cmd.ui32RespType = MMC_RSP_R1b;
+	} else if (sdio_cmd.ui8Idx == 17 || sdio_cmd.ui8Idx == 18 || sdio_cmd.ui8Idx == 24 ||
+		   sdio_cmd.ui8Idx == 25) {
+		sdio_cmd.ui32RespType = MMC_RSP_R1;
+	}
+
+#ifdef CONFIG_AMBIQ_SDIO_ASYNC
+	if (data) {
+		sdio_cmd.bASync = true;
+		dev_data->host->AsyncCmd = sdio_cmd;
+		dev_data->host->AsyncCmdData = cmd_data;
+	}
+#endif /* CONFIG_AMBIQ_SDIO_ASYNC */
+
+	ret = k_mutex_lock(&dev_data->access_mutex, K_MSEC(cmd->timeout_ms));
+	if (ret) {
+		LOG_ERR("Could not access card");
+		return -EBUSY;
+	}
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	ret = pm_device_runtime_get(dev);
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_get failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+	if (data) {
+#if defined(CONFIG_CACHE_MANAGEMENT) && defined(CONFIG_DCACHE)
+		/* Clean Dcache before DMA write */
+		if (cmd_data.dir == AM_HAL_DATA_DIR_WRITE &&
+		    (uint32_t)(data->data) >= CACHABLE_START_ADDR) {
+			sys_cache_data_flush_range(data->data, data->blocks * data->block_size);
+		}
+#endif
+
+#ifdef CONFIG_AMBIQ_SDIO_ASYNC
+		k_sem_reset(dev_data->async_sem);
+#endif /* CONFIG_AMBIQ_SDIO_ASYNC */
+		ui32Status = dev_data->host->ops->execute_cmd(dev_data->host->pHandle, &sdio_cmd,
+							      &cmd_data);
+#ifdef CONFIG_AMBIQ_SDIO_ASYNC
+		if ((ui32Status & 0xFFFF) == AM_HAL_STATUS_SUCCESS) {
+			if (k_sem_take(dev_data->async_sem, K_MSEC(data->timeout_ms))) {
+				return -ETIMEDOUT;
+			}
+		}
+#endif /* CONFIG_AMBIQ_SDIO_ASYNC */
+
+#if defined(CONFIG_CACHE_MANAGEMENT) && defined(CONFIG_DCACHE)
+		/* Invalidate Dcache after DMA read */
+		if (cmd_data.dir == AM_HAL_DATA_DIR_READ &&
+		    (uint32_t)(data->data) >= CACHABLE_START_ADDR) {
+			sys_cache_data_invd_range(data->data, data->blocks * data->block_size);
+		}
+#endif
+
+	} else {
+		ui32Status =
+			dev_data->host->ops->execute_cmd(dev_data->host->pHandle, &sdio_cmd, NULL);
+	}
+	if ((ui32Status & 0xFFFF) != AM_HAL_STATUS_SUCCESS) {
+		if ((ui32Status & 0xFFFF) == AM_HAL_STATUS_TIMEOUT) {
+			LOG_DBG("CMD%d Timeout!", sdio_cmd.ui8Idx);
+			ret = -ETIMEDOUT;
+		} else {
+			LOG_DBG("Failed to send CMD%d, ui32Status = 0x%x", sdio_cmd.ui8Idx,
+				ui32Status);
+			ret = -EIO;
+		}
+	}
+
+	k_mutex_unlock(&dev_data->access_mutex);
+
+	memcpy(cmd->response, sdio_cmd.ui32Resp, sizeof(cmd->response));
+
+	LOG_DBG("Resp0 = 0x%x, Resp1 = 0x%x, Resp2 = 0x%x, Resp3 = 0x%x", cmd->response[0],
+		cmd->response[1], cmd->response[2], cmd->response[3]);
+
+	if (data) {
+		data->bytes_xfered = (ui32Status >> 16) & 0xFFFF;
+	}
+
+#if defined(CONFIG_PM_DEVICE_RUNTIME)
+	/* Use async put to avoid useless device suspension/resumption
+	 * when doing consecutive transmission.
+	 */
+	ret = pm_device_runtime_put_async(dev, K_MSEC(2));
+
+	if (ret < 0) {
+		LOG_ERR("pm_device_runtime_put failed: %d", ret);
+	}
+#endif /* CONFIG_PM_DEVICE_RUNTIME */
+
+	return ret;
+}
+
+/*
+ * Enable Card Interrupts
+ */
+static int ambiq_sdio_card_interrupt_enable(const struct device *dev, sdhc_interrupt_cb_t callback,
+					    int sources, void *user_data)
+{
+	struct ambiq_sdio_data *data = dev->data;
+	uint32_t ui32Status = 0;
+
+	data->sdio_cb = callback;
+	data->sdio_cb_user_data = user_data;
+
+	if (sources & SDHC_INT_SDIO) {
+		/* Enable SDIO Card Interrupt */
+		ui32Status = am_hal_sdhc_intr_signal_enable(data->host->pHandle,
+							    SDIO_INTSIG_CARDINTEN_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+		ui32Status = am_hal_sdhc_intr_status_enable(
+			data->host->pHandle, SDIO_INTENABLE_CARDINTERRUPTSTATUSENABLE_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+	}
+
+	if (sources & SDHC_INT_INSERTED) {
+		/* Enable Card Insert Interrupt */
+		ui32Status = am_hal_sdhc_intr_signal_enable(data->host->pHandle,
+							    SDIO_INTSIG_CARDINSERTEN_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+		ui32Status = am_hal_sdhc_intr_status_enable(
+			data->host->pHandle, SDIO_INTENABLE_CARDINSERTIONSTATUSENABLE_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+	}
+
+	if (sources & SDHC_INT_REMOVED) {
+		/* Enable Card Removal Interrupt */
+		ui32Status = am_hal_sdhc_intr_signal_enable(data->host->pHandle,
+							    SDIO_INTSIG_CARDREMOVALEN_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+		ui32Status = am_hal_sdhc_intr_status_enable(
+			data->host->pHandle, SDIO_INTENABLE_CARDREMOVALSTATUSENABLE_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+	}
+
+	return 0;
+}
+
+/*
+ * Disable Card Interrupts
+ */
+static int ambiq_sdio_card_interrupt_disable(const struct device *dev, int sources)
+{
+	struct ambiq_sdio_data *data = dev->data;
+	uint32_t ui32Status = 0;
+
+	data->sdio_cb = NULL;
+	data->sdio_cb_user_data = NULL;
+
+	if (sources & SDHC_INT_SDIO) {
+		/* Disable SDIO Card Interrupt */
+		ui32Status = am_hal_sdhc_intr_signal_disable(data->host->pHandle,
+							     SDIO_INTSIG_CARDINTEN_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+		ui32Status = am_hal_sdhc_intr_status_disable(
+			data->host->pHandle, SDIO_INTENABLE_CARDINTERRUPTSTATUSENABLE_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+	}
+
+	if (sources & SDHC_INT_INSERTED) {
+		/* Disable Card Insert Interrupt */
+		ui32Status = am_hal_sdhc_intr_signal_disable(data->host->pHandle,
+							     SDIO_INTSIG_CARDINSERTEN_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+		ui32Status = am_hal_sdhc_intr_status_disable(
+			data->host->pHandle, SDIO_INTENABLE_CARDINSERTIONSTATUSENABLE_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+	}
+
+	if (sources & SDHC_INT_REMOVED) {
+		/* Disable Card Removal Interrupt */
+		ui32Status = am_hal_sdhc_intr_signal_disable(data->host->pHandle,
+							     SDIO_INTSIG_CARDREMOVALEN_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+		ui32Status = am_hal_sdhc_intr_status_disable(
+			data->host->pHandle, SDIO_INTENABLE_CARDREMOVALSTATUSENABLE_Msk);
+		if (ui32Status != AM_HAL_STATUS_SUCCESS) {
+			return -EIO;
+		}
+	}
+
+	return 0;
+}
+
+static const struct sdhc_driver_api ambiq_sdio_api = {
+	.reset = ambiq_sdio_reset,
+	.request = ambiq_sdio_request,
+	.set_io = ambiq_sdio_set_io,
+	.get_card_present = ambiq_sdio_get_card_present,
+	.execute_tuning = ambiq_sdio_execute_tuning,
+	.card_busy = ambiq_sdio_card_busy,
+	.get_host_props = ambiq_sdio_get_host_props,
+	.enable_interrupt = ambiq_sdio_card_interrupt_enable,
+	.disable_interrupt = ambiq_sdio_card_interrupt_disable,
+};
+
+#ifdef CONFIG_PM_DEVICE
+/*
+ * Ambiq SDIO peripheral power management function
+ */
+static int ambiq_sdio_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	struct ambiq_sdio_data *data = dev->data;
+	int ret;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ret = am_hal_card_pwrctrl_wakeup(&data->card);
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		ret = am_hal_card_pwrctrl_sleep(&data->card);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	if (ret != AM_HAL_STATUS_SUCCESS) {
+		return -EPERM;
+	} else {
+		return 0;
+	}
+}
+#endif /* CONFIG_PM_DEVICE */
+
+#define AMBIQ_SDIO_INIT(n)                                                                         \
+	static void sdio_##n##_irq_config_func(const struct device *dev)                           \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), ambiq_sdio_isr,             \
+			    DEVICE_DT_INST_GET(n), 0);                                             \
+		irq_enable(DT_INST_IRQN(n));                                                       \
+	}                                                                                          \
+                                                                                                   \
+	PINCTRL_DT_INST_DEFINE(n);                                                                 \
+                                                                                                   \
+	static const struct ambiq_sdio_config ambiq_sdio_config_##n = {                            \
+		.pSDHC = (SDIO_Type *)DT_INST_REG_ADDR(n),                                         \
+		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                       \
+		.irq_config_func = sdio_##n##_irq_config_func,                                     \
+		.inst = n,                                                                         \
+		.tx_delay = DT_INST_PROP(n, txdelay),                                              \
+		.rx_delay = DT_INST_PROP(n, rxdelay),                                              \
+		.max_bus_freq = DT_INST_PROP(n, max_bus_freq),                                     \
+		.min_bus_freq = DT_INST_PROP(n, min_bus_freq),                                     \
+		.power_delay_ms = DT_INST_PROP(n, power_delay_ms),                                 \
+	};                                                                                         \
+                                                                                                   \
+	static struct ambiq_sdio_data ambiq_sdio_data_##n;                                         \
+	PM_DEVICE_DT_INST_DEFINE(n, ambiq_sdio_pm_action);                                         \
+	DEVICE_DT_INST_DEFINE(n, &ambiq_sdio_init, PM_DEVICE_DT_INST_GET(n), &ambiq_sdio_data_##n, \
+			      &ambiq_sdio_config_##n, POST_KERNEL, CONFIG_SDHC_INIT_PRIORITY,      \
+			      &ambiq_sdio_api);
+
+DT_INST_FOREACH_STATUS_OKAY(AMBIQ_SDIO_INIT)
diff --git a/drivers/sdhc/sdhc_cdns_ll.c b/drivers/sdhc/sdhc_cdns_ll.c
index 773b92b0e0502..485f6c008ec4b 100644
--- a/drivers/sdhc/sdhc_cdns_ll.c
+++ b/drivers/sdhc/sdhc_cdns_ll.c
@@ -165,7 +165,7 @@ void cdns_sdhc_set_sdmmc_params(struct sdhc_cdns_combo_phy *sdhc_cdns_combo_phy_
 	sdhc_cdns_sdmmc_reg->sdhc_wrdata1_sdclk_dly = 0;
 }
 
-/* Phy register programing for phy init */
+/* Phy register programming for phy init */
 static int sdhc_cdns_program_phy_reg(struct sdhc_cdns_combo_phy *sdhc_cdns_combo_phy_reg,
 	struct sdhc_cdns_sdmmc *sdhc_cdns_sdmmc_reg)
 {
diff --git a/drivers/sdhc/sdhc_max32.c b/drivers/sdhc/sdhc_max32.c
new file mode 100644
index 0000000000000..0bc8caa3233c0
--- /dev/null
+++ b/drivers/sdhc/sdhc_max32.c
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2024 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT adi_max32_sdhc
+
+#include <errno.h>
+#include <zephyr/drivers/clock_control/adi_max32_clock_control.h>
+#include <zephyr/drivers/sdhc.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/sys/util_macro.h>
+#include <wrap_max32_sdhc.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
+
+LOG_MODULE_REGISTER(sdhc_max32, CONFIG_SDHC_LOG_LEVEL);
+
+static int cmd_opcode_converter(int opcode, unsigned int *cmd);
+static int convert_freq_to_divider(int freq);
+
+/* **** Definitions ****
+ * todo: added from sdhc_resp_regs.h cmd51 is mandatory and is missing in msdk.
+ * SDHC commands and associated cmd register bits which inform hardware to wait for response, etc.
+ */
+#define MXC_SDHC_LIB_CMD0  0x0000
+#define MXC_SDHC_LIB_CMD1  0x0102
+#define MXC_SDHC_LIB_CMD2  0x0209
+#define MXC_SDHC_LIB_CMD3  0x031A
+#define MXC_SDHC_LIB_CMD4  0x0400
+#define MXC_SDHC_LIB_CMD5  0x051A
+#define MXC_SDHC_LIB_CMD6  0x060A
+#define MXC_SDHC_LIB_CMD7  0x071B
+#define MXC_SDHC_LIB_CMD8  0x081A
+#define MXC_SDHC_LIB_CMD9  0x0901
+#define MXC_SDHC_LIB_CMD10 0x0A01
+#define MXC_SDHC_LIB_CMD11 0x0B1A
+#define MXC_SDHC_LIB_CMD12 0x0C1B
+#define MXC_SDHC_LIB_CMD13 0x0D1A
+#define MXC_SDHC_LIB_CMD16 0x101A
+#define MXC_SDHC_LIB_CMD17 0x113A
+#define MXC_SDHC_LIB_CMD18 0x123A
+#define MXC_SDHC_LIB_CMD23 0x171A
+#define MXC_SDHC_LIB_CMD24 0x183E
+#define MXC_SDHC_LIB_CMD25 0x193E
+#define MXC_SDHC_LIB_CMD55 0x371A
+
+/* Application commands (SD Card) which are prefixed by CMD55 */
+#define MXC_SDHC_LIB_ACMD6  0x061B
+#define MXC_SDHC_LIB_ACMD41 0x2902
+#define MXC_SDHC_LIB_ACMD51 0x331B
+
+/* todo: GCR dependent division might be 4 as well. if set to = 1 sdhcfrq. add support in msdk */
+#define SDHC_CLOCK (ADI_MAX32_CLK_IPO_FREQ / 2)
+
+#define SDHC_SDHC_MAX_DIV_VAL 0x3FF
+#define SDHC_SDHC_PCLK_DIV 2
+
+/* todo: cmd.arg = SD_IF_COND_VHS_3V3 | check_pattern;
+ * todo: zephyr always configures response types. msdk needs to support this as well.
+ * todo: add host io support
+ */
+
+struct sdhc_max32_data {
+	struct sdhc_host_props props;
+};
+
+/* SDHC configuration. */
+struct sdhc_max32_config {
+	void (*irq_func)(void);
+	const struct pinctrl_dev_config *pcfg;
+	unsigned int power_delay_ms;
+	unsigned int bus_volt;
+	const struct device *clock;
+	struct max32_perclk perclk;
+};
+
+static void sdhc_max32_init_props(const struct device *dev)
+{
+	struct sdhc_max32_data *sdhc_data = dev->data;
+	const struct sdhc_max32_config *sdhc_config = dev->config;
+
+	memset(sdhc_data, 0, sizeof(struct sdhc_max32_data));
+
+	sdhc_data->props.f_min = SDHC_CLOCK / (SDHC_SDHC_PCLK_DIV * SDHC_SDHC_MAX_DIV_VAL);
+	sdhc_data->props.f_max = SDHC_CLOCK;
+	sdhc_data->props.is_spi = 0;
+	sdhc_data->props.max_current_180 = 0;
+	sdhc_data->props.max_current_300 = 0;
+	sdhc_data->props.max_current_330 = 0;
+	sdhc_data->props.host_caps.timeout_clk_freq = 0x01;
+	sdhc_data->props.host_caps.timeout_clk_unit = 1;
+	sdhc_data->props.host_caps.sd_base_clk = 0x00;
+	sdhc_data->props.host_caps.max_blk_len = 0b10;
+	sdhc_data->props.host_caps.bus_8_bit_support = false;
+	sdhc_data->props.host_caps.bus_4_bit_support = false;
+	sdhc_data->props.host_caps.adma_2_support = true;
+	sdhc_data->props.host_caps.high_spd_support = true;
+	sdhc_data->props.host_caps.sdma_support = true;
+	sdhc_data->props.host_caps.suspend_res_support = true;
+	sdhc_data->props.host_caps.vol_330_support = true;
+	sdhc_data->props.host_caps.vol_300_support = false;
+	sdhc_data->props.host_caps.vol_180_support = false;
+	sdhc_data->props.host_caps.address_64_bit_support_v4 = false;
+	sdhc_data->props.host_caps.address_64_bit_support_v3 = false;
+	sdhc_data->props.host_caps.sdio_async_interrupt_support = true;
+	sdhc_data->props.host_caps.slot_type = 00;
+	sdhc_data->props.host_caps.sdr50_support = true;
+	sdhc_data->props.host_caps.sdr104_support = true;
+	sdhc_data->props.host_caps.ddr50_support = true;
+	sdhc_data->props.host_caps.uhs_2_support = false;
+	sdhc_data->props.host_caps.drv_type_a_support = true;
+	sdhc_data->props.host_caps.drv_type_c_support = true;
+	sdhc_data->props.host_caps.drv_type_d_support = true;
+	sdhc_data->props.host_caps.retune_timer_count = 0;
+	sdhc_data->props.host_caps.sdr50_needs_tuning = 0;
+	sdhc_data->props.host_caps.retuning_mode = 0;
+	sdhc_data->props.host_caps.clk_multiplier = 0;
+	sdhc_data->props.host_caps.adma3_support = false;
+	sdhc_data->props.host_caps.vdd2_180_support = false;
+	sdhc_data->props.host_caps.hs200_support = false;
+	sdhc_data->props.host_caps.hs400_support = false;
+	sdhc_data->props.power_delay = sdhc_config->power_delay_ms;
+}
+
+static int sdhc_max32_init(const struct device *dev)
+{
+	const struct sdhc_max32_config *sdhc_config = dev->config;
+	int ret = 0;
+	mxc_sdhc_cfg_t cfg;
+
+	ret = pinctrl_apply_state(sdhc_config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		LOG_ERR("Pinctrl apply error:%d", ret);
+		return ret;
+	}
+
+	ret = clock_control_on(sdhc_config->clock, (clock_control_subsys_t)&sdhc_config->perclk);
+	if (ret) {
+		LOG_ERR("Clock control on error:%d", ret);
+		return ret;
+	}
+
+	cfg.bus_voltage = MXC_SDHC_Bus_Voltage_3_3;
+	cfg.block_gap = 0;
+	/* Maximum divide ratio, frequency must be 100 - 400 kHz during Card Identification"*/
+	cfg.clk_div = SDHC_SDHC_MAX_DIV_VAL;
+
+	ret = MXC_SDHC_Init(&cfg);
+	if (ret != E_NO_ERROR) {
+		LOG_ERR("MXC_SDHC_Init error:%d", ret);
+		return ret;
+	}
+
+/* note: init delay, without it applications fail. 5ms found empirically.
+ * todo: investigate why fails, see if it can be removed via polling a register bit etc.
+ */
+	k_sleep(K_MSEC(5));
+
+	sdhc_max32_init_props(dev);
+
+	return 0;
+}
+
+static int sdhc_max32_card_busy(const struct device *dev)
+{
+	int ret = 0;
+
+	ret = MXC_SDHC_Card_Busy();
+
+	return ret;
+}
+
+static int sdhc_max32_reset(const struct device *dev)
+{
+	MXC_SDHC_Reset();
+
+	return 0;
+}
+
+static int sdhc_max32_request(const struct device *dev, struct sdhc_command *cmd,
+			      struct sdhc_data *data)
+{
+	int ret = 0;
+	unsigned int mxc_cmd = 0;
+	mxc_sdhc_cmd_cfg_t sd_cmd_cfg;
+	bool card_size_workaround = false;
+
+	if (data) {
+		sd_cmd_cfg.sdma = (unsigned int)data->data;
+		sd_cmd_cfg.block_size = data->block_size;
+		sd_cmd_cfg.block_count = data->blocks;
+	}
+
+	sd_cmd_cfg.arg_1 = cmd->arg;
+	sd_cmd_cfg.dma = true; /* todo: add config depending on config_dma etc. */
+
+	switch (cmd->opcode) {
+	case SD_READ_SINGLE_BLOCK:
+	case SD_READ_MULTIPLE_BLOCK:
+		sd_cmd_cfg.direction = MXC_SDHC_DIRECTION_READ;
+		sd_cmd_cfg.arg_1 = data->block_addr;
+		break;
+	case SD_WRITE_SINGLE_BLOCK:
+	case SD_WRITE_MULTIPLE_BLOCK:
+		sd_cmd_cfg.direction = MXC_SDHC_DIRECTION_WRITE;
+		sd_cmd_cfg.arg_1 = data->block_addr;
+		break;
+	case SD_SEND_CSD:
+		card_size_workaround = true;
+	default:
+		sd_cmd_cfg.direction = MXC_SDHC_DIRECTION_CFG;
+		break;
+	}
+
+	ret = cmd_opcode_converter(cmd->opcode, &mxc_cmd);
+	if (ret) {
+		return ret;
+	}
+	sd_cmd_cfg.command = mxc_cmd;
+	sd_cmd_cfg.host_control_1 = MXC_SDHC_Get_Host_Cn_1();
+	sd_cmd_cfg.callback = NULL;
+
+	/*
+	 * todo: this was also needed, otherwise applications failed randomly. it would be good to
+	 * remove this with a better solution in future.
+	 */
+	k_sleep(K_MSEC(1));
+	ret = MXC_SDHC_SendCommand(&sd_cmd_cfg);
+	if (ret) {
+		LOG_ERR("MXC_SDHC_SendCommand error:%d, SD opcode: %d", ret, cmd->opcode);
+		return ret;
+	}
+
+	MXC_SDHC_Get_Response128((char *)(cmd->response));
+
+	if (card_size_workaround) {
+		/*
+		 * this workaround is required for only CMD9. This fixes size problem. Otherwise
+		 * it doesn't give the correct device size information.
+		 */
+		cmd->response[1] <<= 8;
+		cmd->response[3] <<= 8;
+	}
+
+	return 0;
+}
+
+static int sdhc_max32_get_card_present(const struct device *dev)
+{
+	return MXC_SDHC_Card_Inserted();
+}
+
+static int sdhc_max32_get_host_props(const struct device *dev, struct sdhc_host_props *props)
+{
+	struct sdhc_max32_data *sdhc_data = dev->data;
+
+	memcpy(props, &sdhc_data->props, sizeof(struct sdhc_host_props));
+
+	return 0;
+}
+
+static int sdhc_max32_set_io(const struct device *dev, struct sdhc_io *ios)
+{
+	struct sdhc_max32_data *data = dev->data;
+	struct sdhc_host_props *props = &data->props;
+	enum sdhc_clock_speed speed = ios->clock;
+	unsigned int clk_div = 0;
+
+	if (speed) {
+		if (speed < props->f_min || speed > props->f_max) {
+			LOG_ERR("Speed range error %d", speed);
+			return -ENOTSUP;
+		}
+		clk_div = convert_freq_to_divider(speed);
+		MXC_SDHC_Set_Clock_Config(clk_div);
+	}
+
+	if (ios->power_mode == SDHC_POWER_OFF) {
+		MXC_SDHC_PowerDown();
+	} else {
+		MXC_SDHC_PowerUp();
+	}
+
+	return 0;
+}
+
+static DEVICE_API(sdhc, sdhc_max32_driver_api) = {
+	.reset = sdhc_max32_reset,
+	.request = sdhc_max32_request,
+	.set_io = sdhc_max32_set_io,
+	.get_card_present = sdhc_max32_get_card_present,
+	.card_busy = sdhc_max32_card_busy,
+	.get_host_props = sdhc_max32_get_host_props,
+	.enable_interrupt = NULL,
+	.disable_interrupt = NULL,
+	.execute_tuning = NULL,
+};
+
+static int cmd_opcode_converter(int opcode, unsigned int *cmd)
+{
+	switch (opcode) {
+	case SD_GO_IDLE_STATE:
+		*cmd = MXC_SDHC_LIB_CMD0;
+		break;
+	case MMC_SEND_OP_COND:
+		*cmd = MXC_SDHC_LIB_CMD1;
+		break;
+	case SD_ALL_SEND_CID:
+		*cmd = MXC_SDHC_LIB_CMD2;
+		break;
+	case SD_SEND_RELATIVE_ADDR:
+		*cmd = MXC_SDHC_LIB_CMD3;
+		break;
+	case SDIO_SEND_OP_COND:
+		*cmd = MXC_SDHC_LIB_CMD5;
+		break;
+	case SD_SWITCH:
+		*cmd = MXC_SDHC_LIB_CMD6;
+		break;
+	case SD_SELECT_CARD:
+		*cmd = MXC_SDHC_LIB_CMD7;
+		break;
+	case SD_SEND_IF_COND:
+		*cmd = MXC_SDHC_LIB_CMD8;
+		break;
+	case SD_SEND_CSD:
+		*cmd = MXC_SDHC_LIB_CMD9;
+		break;
+	case SD_SEND_CID:
+		*cmd = MXC_SDHC_LIB_CMD10;
+		break;
+	case SD_VOL_SWITCH:
+		*cmd = MXC_SDHC_LIB_CMD11;
+		break;
+	case SD_STOP_TRANSMISSION:
+		*cmd = MXC_SDHC_LIB_CMD12;
+		break;
+	case SD_SEND_STATUS:
+		*cmd = MXC_SDHC_LIB_CMD13;
+		break;
+	case SD_SET_BLOCK_SIZE:
+		*cmd = MXC_SDHC_LIB_CMD16;
+		break;
+	case SD_READ_SINGLE_BLOCK:
+		*cmd = MXC_SDHC_LIB_CMD17;
+		break;
+	case SD_READ_MULTIPLE_BLOCK:
+		*cmd = MXC_SDHC_LIB_CMD18;
+		break;
+	case SD_SET_BLOCK_COUNT:
+		*cmd = MXC_SDHC_LIB_CMD23;
+		break;
+	case SD_WRITE_SINGLE_BLOCK:
+		*cmd = MXC_SDHC_LIB_CMD24;
+		break;
+	case SD_WRITE_MULTIPLE_BLOCK:
+		*cmd = MXC_SDHC_LIB_CMD25;
+		break;
+	case SD_APP_CMD:
+		*cmd = MXC_SDHC_LIB_CMD55;
+		break;
+	case SD_APP_SEND_OP_COND:
+		*cmd = MXC_SDHC_LIB_ACMD41;
+		break;
+	case SD_APP_SEND_SCR:
+		*cmd = MXC_SDHC_LIB_ACMD51;
+		break;
+		/* todo: below are not defined in msdk, support might be added later */
+	case SD_ERASE_BLOCK_START:
+	case SD_ERASE_BLOCK_END:
+	case SD_ERASE_BLOCK_OPERATION:
+	case SDIO_RW_DIRECT:
+	case SD_SEND_TUNING_BLOCK:
+	case SD_GO_INACTIVE_STATE:
+	case SDIO_RW_EXTENDED:
+	default:
+		LOG_ERR("Opcode convert error %d", opcode);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int convert_freq_to_divider(int freq)
+{
+	if (!freq) {
+		return 0;
+	}
+
+	int divider = 0;
+	/* note: this causes a bit different speed than exact number. */
+	divider = SDHC_CLOCK / (2 * freq);
+
+	return divider;
+}
+
+#define DEFINE_SDHC_MAX32(_num)                                                                    \
+	PINCTRL_DT_INST_DEFINE(_num);                                                              \
+	static struct sdhc_max32_data sdhc_max32_data_##_num;                                      \
+	static const struct sdhc_max32_config sdhc_max32_config_##_num = {                         \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(_num),                                      \
+		.power_delay_ms = DT_INST_PROP(_num, power_delay_ms),                              \
+		.clock = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(_num)),                                 \
+		.perclk.bus = DT_INST_CLOCKS_CELL(_num, offset),                                   \
+		.perclk.bit = DT_INST_CLOCKS_CELL(_num, bit),                                      \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(_num, sdhc_max32_init, NULL, &sdhc_max32_data_##_num,                \
+			      &sdhc_max32_config_##_num, POST_KERNEL, 2, &sdhc_max32_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_SDHC_MAX32)
diff --git a/drivers/sdhc/sdhc_renesas_ra.c b/drivers/sdhc/sdhc_renesas_ra.c
index 9993d5be3bf3b..7dda458b0dc1c 100644
--- a/drivers/sdhc/sdhc_renesas_ra.c
+++ b/drivers/sdhc/sdhc_renesas_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -591,24 +591,20 @@ static DEVICE_API(sdhc, sdhc_api) = {
 	.get_host_props = sdhc_ra_get_host_props,
 };
 
-#define _ELC_EVENT_SDMMC_ACCS(channel)    ELC_EVENT_SDHIMMC##channel##_ACCS
-#define _ELC_EVENT_SDMMC_CARD(channel)    ELC_EVENT_SDHIMMC##channel##_CARD
-#define _ELC_EVENT_SDMMC_DMA_REQ(channel) ELC_EVENT_SDHIMMC##channel##_DMA_REQ
-
-#define ELC_EVENT_SDMMC_ACCS(channel)    _ELC_EVENT_SDMMC_ACCS(channel)
-#define ELC_EVENT_SDMMC_CARD(channel)    _ELC_EVENT_SDMMC_CARD(channel)
-#define ELC_EVENT_SDMMC_DMA_REQ(channel) _ELC_EVENT_SDMMC_DMA_REQ(channel)
+#define EVENT_SDMMC_ACCS(channel)    BSP_PRV_IELS_ENUM(CONCAT(EVENT_SDHIMMC, channel, _ACCS))
+#define EVENT_SDMMC_CARD(channel)    BSP_PRV_IELS_ENUM(CONCAT(EVENT_SDHIMMC, channel, _CARD))
+#define EVENT_SDMMC_DMA_REQ(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SDHIMMC, channel, _DMA_REQ))
 
 #define RA_SDMMC_IRQ_CONFIG_INIT(index)                                                            \
 	do {                                                                                       \
 		ARG_UNUSED(dev);                                                                   \
                                                                                                    \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, accs, irq)] =                              \
-			ELC_EVENT_SDMMC_ACCS(DT_INST_PROP(index, channel));                        \
+			EVENT_SDMMC_ACCS(DT_INST_PROP(index, channel));                            \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, card, irq)] =                              \
-			ELC_EVENT_SDMMC_CARD(DT_INST_PROP(index, channel));                        \
+			EVENT_SDMMC_CARD(DT_INST_PROP(index, channel));                            \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, dma_req, irq)] =                           \
-			ELC_EVENT_SDMMC_DMA_REQ(DT_INST_PROP(index, channel));                     \
+			EVENT_SDMMC_DMA_REQ(DT_INST_PROP(index, channel));                         \
                                                                                                    \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, accs, irq),                                 \
 			    DT_INST_IRQ_BY_NAME(index, accs, priority), ra_sdmmc_accs_isr,         \
diff --git a/drivers/sdhc/sdhc_spi.c b/drivers/sdhc/sdhc_spi.c
index d6ec2429ace9e..aaf75ebf10007 100644
--- a/drivers/sdhc/sdhc_spi.c
+++ b/drivers/sdhc/sdhc_spi.c
@@ -183,8 +183,13 @@ static int sdhc_spi_card_busy(const struct device *dev)
 	int ret;
 	uint8_t response;
 
+	/* Request SPI bus to be active */
+	if (pm_device_runtime_get(config->spi_dev) < 0) {
+		return -EIO;
+	}
 
 	ret = sdhc_spi_rx(config->spi_dev, data->spi_cfg, &response, 1);
+	(void)pm_device_runtime_put(config->spi_dev);
 	if (ret) {
 		return -EIO;
 	}
diff --git a/drivers/sensor/CMakeLists.txt b/drivers/sensor/CMakeLists.txt
index 5b7f168f250f1..7b26ff5d2fa9a 100644
--- a/drivers/sensor/CMakeLists.txt
+++ b/drivers/sensor/CMakeLists.txt
@@ -7,10 +7,12 @@ add_subdirectory(aosong)
 add_subdirectory(asahi_kasei)
 add_subdirectory(bosch)
 add_subdirectory(espressif)
+add_subdirectory(everlight)
 add_subdirectory(honeywell)
 add_subdirectory(infineon)
 add_subdirectory(ite)
 add_subdirectory(jedec)
+add_subdirectory(liteon)
 add_subdirectory(maxim)
 add_subdirectory(meas)
 add_subdirectory(melexis)
@@ -19,6 +21,8 @@ add_subdirectory(microchip)
 add_subdirectory(nordic)
 add_subdirectory(nuvoton)
 add_subdirectory(nxp)
+add_subdirectory(pixart)
+add_subdirectory(realtek)
 add_subdirectory(renesas)
 add_subdirectory(rohm)
 add_subdirectory(seeed)
@@ -49,7 +53,6 @@ add_subdirectory_ifdef(CONFIG_IST8310 ist8310)
 add_subdirectory_ifdef(CONFIG_LM35 lm35)
 add_subdirectory_ifdef(CONFIG_LM75 lm75)
 add_subdirectory_ifdef(CONFIG_LM77 lm77)
-add_subdirectory_ifdef(CONFIG_LTR_F216A ltrf216a)
 add_subdirectory_ifdef(CONFIG_MHZ19B mhz19b)
 add_subdirectory_ifdef(CONFIG_NCT75 nct75)
 add_subdirectory_ifdef(CONFIG_NTC_THERMISTOR ntc_thermistor)
@@ -63,6 +66,7 @@ add_subdirectory_ifdef(CONFIG_TH02 th02)
 add_subdirectory_ifdef(CONFIG_TSIC_XX6 tsic_xx6)
 add_subdirectory_ifdef(CONFIG_VEAA_X_3 veaa_x_3)
 add_subdirectory_ifdef(CONFIG_VOLTAGE_DIVIDER voltage_divider)
+add_subdirectory_ifdef(CONFIG_XBR818 xbr818)
 add_subdirectory_ifdef(CONFIG_TACH_ENE_KB1200 ene_tach_kb1200)
 
 zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/sensor.h)
diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig
index 091d8153ab8d6..8cda03acc0899 100644
--- a/drivers/sensor/Kconfig
+++ b/drivers/sensor/Kconfig
@@ -93,10 +93,12 @@ source "drivers/sensor/aosong/Kconfig"
 source "drivers/sensor/asahi_kasei/Kconfig"
 source "drivers/sensor/bosch/Kconfig"
 source "drivers/sensor/espressif/Kconfig"
+source "drivers/sensor/everlight/Kconfig"
 source "drivers/sensor/honeywell/Kconfig"
 source "drivers/sensor/infineon/Kconfig"
 source "drivers/sensor/ite/Kconfig"
 source "drivers/sensor/jedec/Kconfig"
+source "drivers/sensor/liteon/Kconfig"
 source "drivers/sensor/maxim/Kconfig"
 source "drivers/sensor/meas/Kconfig"
 source "drivers/sensor/melexis/Kconfig"
@@ -105,6 +107,8 @@ source "drivers/sensor/microchip/Kconfig"
 source "drivers/sensor/nordic/Kconfig"
 source "drivers/sensor/nuvoton/Kconfig"
 source "drivers/sensor/nxp/Kconfig"
+source "drivers/sensor/pixart/Kconfig"
+source "drivers/sensor/realtek/Kconfig"
 source "drivers/sensor/renesas/Kconfig"
 source "drivers/sensor/rohm/Kconfig"
 source "drivers/sensor/seeed/Kconfig"
@@ -117,13 +121,15 @@ source "drivers/sensor/vishay/Kconfig"
 source "drivers/sensor/wsen/Kconfig"
 # zephyr-keep-sorted-stop
 
+# zephyr-keep-sorted-start
 source "drivers/sensor/a01nyub/Kconfig"
 source "drivers/sensor/amd_sb_tsi/Kconfig"
 source "drivers/sensor/amg88xx/Kconfig"
 source "drivers/sensor/apds9253/Kconfig"
-source "drivers/sensor/apds9960/Kconfig"
 source "drivers/sensor/apds9306/Kconfig"
+source "drivers/sensor/apds9960/Kconfig"
 source "drivers/sensor/current_amp/Kconfig"
+source "drivers/sensor/ene_tach_kb1200/Kconfig"
 source "drivers/sensor/ens160/Kconfig"
 source "drivers/sensor/explorir_m/Kconfig"
 source "drivers/sensor/f75303/Kconfig"
@@ -135,7 +141,6 @@ source "drivers/sensor/ist8310/Kconfig"
 source "drivers/sensor/lm35/Kconfig"
 source "drivers/sensor/lm75/Kconfig"
 source "drivers/sensor/lm77/Kconfig"
-source "drivers/sensor/ltrf216a/Kconfig"
 source "drivers/sensor/mhz19b/Kconfig"
 source "drivers/sensor/nct75/Kconfig"
 source "drivers/sensor/ntc_thermistor/Kconfig"
@@ -149,6 +154,7 @@ source "drivers/sensor/th02/Kconfig"
 source "drivers/sensor/tsic_xx6/Kconfig"
 source "drivers/sensor/veaa_x_3/Kconfig"
 source "drivers/sensor/voltage_divider/Kconfig"
-source "drivers/sensor/ene_tach_kb1200/Kconfig"
+source "drivers/sensor/xbr818/Kconfig"
+# zephyr-keep-sorted-stop
 
 endif # SENSOR
diff --git a/drivers/sensor/adi/adxl345/Kconfig b/drivers/sensor/adi/adxl345/Kconfig
index 481ddd404ad86..e9799f51a61cd 100644
--- a/drivers/sensor/adi/adxl345/Kconfig
+++ b/drivers/sensor/adi/adxl345/Kconfig
@@ -13,6 +13,8 @@ config ADXL345
 	help
 	  Enable driver for ADXL345 Three-Axis Digital Accelerometer.
 
+if ADXL345
+
 choice ADXL345_TRIGGER_MODE
 	prompt "Trigger mode"
 	default ADXL345_TRIGGER_NONE
@@ -58,3 +60,5 @@ config ADXL345_THREAD_STACK_SIZE
 	default 1024
 	help
 	  Stack size of thread used by the driver to handle interrupts.
+
+endif # ADXL345
diff --git a/drivers/sensor/adi/adxl367/adxl367_decoder.c b/drivers/sensor/adi/adxl367/adxl367_decoder.c
index 85c3f466b8993..daeb8f88f9cfa 100644
--- a/drivers/sensor/adi/adxl367/adxl367_decoder.c
+++ b/drivers/sensor/adi/adxl367/adxl367_decoder.c
@@ -75,7 +75,7 @@ static inline void adxl367_temp_convert_q31(q31_t *out, const uint8_t *buff,
 		}
 		break;
 
-	case ADXL367_14B_CHID:
+	case ADXL367_14B_CHID: {
 		uint16_t *tmp_buf = (uint16_t *)buff;
 
 		data_in = (int16_t)(((*tmp_buf >> 8) & 0xFF) | ((*tmp_buf << 8) & 0xFF00));
@@ -85,6 +85,7 @@ static inline void adxl367_temp_convert_q31(q31_t *out, const uint8_t *buff,
 			convert_value = 1;
 		}
 		break;
+	}
 
 	default:
 		break;
@@ -136,7 +137,7 @@ static inline void adxl367_accel_convert_q31(q31_t *out, const uint8_t *buff,
 		}
 		break;
 
-	case ADXL367_14B_CHID:
+	case ADXL367_14B_CHID: {
 		uint16_t *tmp_buf = (uint16_t *)buff;
 
 		data_in = (int16_t)(((*tmp_buf >> 8) & 0xFF) | ((*tmp_buf << 8) & 0xFF00));
@@ -146,6 +147,7 @@ static inline void adxl367_accel_convert_q31(q31_t *out, const uint8_t *buff,
 			convert_value = 1;
 		}
 		break;
+	}
 
 	default:
 		break;
diff --git a/drivers/sensor/adi/adxl367/adxl367_stream.c b/drivers/sensor/adi/adxl367/adxl367_stream.c
index eb57349a2997c..27fd5f1fe510d 100644
--- a/drivers/sensor/adi/adxl367/adxl367_stream.c
+++ b/drivers/sensor/adi/adxl367/adxl367_stream.c
@@ -206,7 +206,7 @@ static void adxl367_process_fifo_samples_cb(struct rtio *r, const struct rtio_sq
 	case ADXL367_8B:
 		fifo_bytes = fifo_packet_cnt;
 		break;
-	case ADXL367_12B:
+	case ADXL367_12B: {
 		unsigned int fifo_bits = fifo_packet_cnt * sample_numb * 12;
 
 		if (fifo_bits % 8 == 0) {
@@ -235,7 +235,7 @@ static void adxl367_process_fifo_samples_cb(struct rtio *r, const struct rtio_sq
 			packet_size++;
 		}
 		break;
-
+	}
 	default:
 		fifo_bytes = fifo_packet_cnt * 2;
 		packet_size *= 2;
@@ -363,7 +363,7 @@ static void adxl367_process_fifo_samples_cb(struct rtio *r, const struct rtio_sq
 
 	((struct adxl367_fifo_data *)buf)->fifo_byte_count = read_len;
 
-	__ASSERT_NO_MSG(read_len % pkt_size == 0);
+	__ASSERT_NO_MSG(read_len % packet_size == 0);
 
 	uint8_t *read_buf = buf + sizeof(*hdr);
 
diff --git a/drivers/sensor/adi/adxl372/adxl372_decoder.c b/drivers/sensor/adi/adxl372/adxl372_decoder.c
index eaa3ce7f5c3cf..9964d2868a38e 100644
--- a/drivers/sensor/adi/adxl372/adxl372_decoder.c
+++ b/drivers/sensor/adi/adxl372/adxl372_decoder.c
@@ -50,7 +50,7 @@ static int adxl372_decode_stream(const uint8_t *buffer, struct sensor_chan_spec
 	memset(data, 0, sizeof(struct sensor_three_axis_data));
 	data->header.base_timestamp_ns = enc_data->timestamp;
 	data->header.reading_count = 1;
-	data->header.shift = 11; /* Sensor shift */
+	data->shift = 11; /* Sensor shift */
 
 	buffer += sizeof(struct adxl372_fifo_data);
 
diff --git a/drivers/sensor/adi/adxl372/adxl372_stream.c b/drivers/sensor/adi/adxl372/adxl372_stream.c
index 71624344ec233..c2ecc42dffbf5 100644
--- a/drivers/sensor/adi/adxl372/adxl372_stream.c
+++ b/drivers/sensor/adi/adxl372/adxl372_stream.c
@@ -249,7 +249,7 @@ static void adxl372_process_fifo_samples_cb(struct rtio *r, const struct rtio_sq
 
 	((struct adxl372_fifo_data *)buf)->fifo_byte_count = read_len;
 
-	__ASSERT_NO_MSG(read_len % pkt_size == 0);
+	__ASSERT_NO_MSG(read_len % sample_set_size == 0);
 
 	uint8_t *read_buf = buf + sizeof(*hdr);
 
diff --git a/drivers/sensor/apds9253/apds9253.c b/drivers/sensor/apds9253/apds9253.c
index b20507e9da9ee..57d8a2d6bfb9c 100644
--- a/drivers/sensor/apds9253/apds9253.c
+++ b/drivers/sensor/apds9253/apds9253.c
@@ -121,9 +121,97 @@ static int apds9253_channel_get(const struct device *dev, enum sensor_channel ch
 	return 0;
 }
 
+static int apds9253_attr_set_gain(const struct device *dev, uint8_t gain)
+{
+	const struct apds9253_config *config = dev->config;
+	struct apds9253_data *drv_data = dev->data;
+	uint8_t value;
+
+	if (drv_data->gain == gain) {
+		return 0;
+	}
+
+	static uint8_t value_map[] = {
+		APDS9253_LS_GAIN_RANGE_1, APDS9253_LS_GAIN_RANGE_3,  APDS9253_LS_GAIN_RANGE_6,
+		APDS9253_LS_GAIN_RANGE_9, APDS9253_LS_GAIN_RANGE_18,
+	};
+
+	if (gain < APDS9253_LS_GAIN_RANGE_1 || gain > APDS9253_LS_GAIN_RANGE_18) {
+		return -EINVAL;
+	}
+	value = value_map[gain];
+
+	if (i2c_reg_update_byte_dt(&config->i2c, APDS9253_LS_GAIN_REG, APDS9253_LS_GAIN_MASK,
+				   (value & APDS9253_LS_GAIN_MASK))) {
+		LOG_ERR("Not able to set light, sensor gain is not set");
+		return -EIO;
+	}
+
+	drv_data->gain = gain;
+
+	return 0;
+}
+
+static int apds9253_attr_set_sampl_freq(const struct device *dev,
+					const struct sensor_value *sampl_freq)
+{
+	const struct apds9253_config *config = dev->config;
+	struct apds9253_data *drv_data = dev->data;
+	uint8_t period_val;
+	uint32_t freq_mhz = sampl_freq->val1 * 1000 + (sampl_freq->val2 / 1000);
+
+	if (freq_mhz >= 40000) {
+		period_val = APDS9253_LS_MEAS_RATE_MES_25MS;
+	} else if (freq_mhz >= 20000) {
+		period_val = APDS9253_LS_MEAS_RATE_MES_50MS;
+	} else if (freq_mhz >= 10000) {
+		period_val = APDS9253_LS_MEAS_RATE_MES_100MS;
+	} else if (freq_mhz >= 5000) {
+		period_val = APDS9253_LS_MEAS_RATE_MES_200MS;
+	} else if (freq_mhz >= 2000) {
+		period_val = APDS9253_LS_MEAS_RATE_MES_500MS;
+	} else if (freq_mhz >= 1000) {
+		period_val = APDS9253_LS_MEAS_RATE_MES_1000MS;
+	} else if (freq_mhz >= 500) {
+		period_val = APDS9253_LS_MEAS_RATE_MES_2000MS;
+	} else {
+		LOG_INF("Frequency below minimum range, setting to minimum supported value: "
+			"0.5Hz.");
+		period_val = APDS9253_LS_MEAS_RATE_MES_2000MS;
+	}
+
+	if (i2c_reg_update_byte_dt(&config->i2c, APDS9253_LS_MEAS_RATE_REG,
+				   APDS9253_LS_MEAS_RATE_MES_MASK,
+				   (period_val & APDS9253_LS_MEAS_RATE_MES_MASK))) {
+		LOG_ERR("Not able to set light sensor measurement rate is not set");
+		return -EIO;
+	}
+
+	drv_data->meas_rate_mes = period_val;
+
+	return 0;
+}
+
+static int apds9253_attr_set(const struct device *dev, enum sensor_channel chan,
+			     enum sensor_attribute attr, const struct sensor_value *val)
+{
+	switch (attr) {
+	case SENSOR_ATTR_GAIN:
+		return apds9253_attr_set_gain(dev, val->val1);
+	case SENSOR_ATTR_SAMPLING_FREQUENCY:
+		return apds9253_attr_set_sampl_freq(dev, val);
+	default:
+		LOG_DBG("Sensor attribute not supported.");
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
 static int apds9253_sensor_setup(const struct device *dev)
 {
 	const struct apds9253_config *config = dev->config;
+	struct apds9253_data *drv_data = dev->data;
 	uint8_t chip_id;
 
 	if (i2c_reg_read_byte_dt(&config->i2c, APDS9253_PART_ID, &chip_id)) {
@@ -162,6 +250,9 @@ static int apds9253_sensor_setup(const struct device *dev)
 		return -EIO;
 	}
 
+	drv_data->gain = config->ls_gain;
+	drv_data->meas_rate_mes = config->ls_rate;
+
 	return 0;
 }
 
@@ -229,6 +320,7 @@ static int apds9253_init(const struct device *dev)
 static DEVICE_API(sensor, apds9253_driver_api) = {
 	.sample_fetch = &apds9253_sample_fetch,
 	.channel_get = &apds9253_channel_get,
+	.attr_set = &apds9253_attr_set,
 };
 
 #define APDS9253_INIT(n)                                                                           \
diff --git a/drivers/sensor/apds9253/apds9253.h b/drivers/sensor/apds9253/apds9253.h
index 9fbe4a43bc38a..b4ab49eb32721 100644
--- a/drivers/sensor/apds9253/apds9253.h
+++ b/drivers/sensor/apds9253/apds9253.h
@@ -100,6 +100,8 @@ struct apds9253_data {
 	const struct device *dev;
 	uint32_t sample_crgb[4];
 	uint8_t pdata;
+	uint8_t gain;
+	uint8_t meas_rate_mes;
 	struct k_sem data_sem;
 };
 
diff --git a/drivers/sensor/asahi_kasei/akm09918c/Kconfig b/drivers/sensor/asahi_kasei/akm09918c/Kconfig
index d7dac11f424dc..301165106aa48 100644
--- a/drivers/sensor/asahi_kasei/akm09918c/Kconfig
+++ b/drivers/sensor/asahi_kasei/akm09918c/Kconfig
@@ -7,6 +7,7 @@ config AKM09918C
 	default y
 	depends on DT_HAS_ASAHI_KASEI_AKM09918C_ENABLED
 	select I2C
+	select I2C_RTIO if SENSOR_ASYNC_API
 	select RTIO_WORKQ if SENSOR_ASYNC_API
 	help
 	  Enable driver for AK8975 magnetometer.
diff --git a/drivers/sensor/asahi_kasei/akm09918c/akm09918c.c b/drivers/sensor/asahi_kasei/akm09918c/akm09918c.c
index 9bc9efaa2234e..b8c5e9a68fe7f 100644
--- a/drivers/sensor/asahi_kasei/akm09918c/akm09918c.c
+++ b/drivers/sensor/asahi_kasei/akm09918c/akm09918c.c
@@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(AKM09918C, CONFIG_SENSOR_LOG_LEVEL);
  * @param chan Channel ID for starting the measurement
  * @return int 0 if successful or error code
  */
-int akm09918c_start_measurement(const struct device *dev, enum sensor_channel chan)
+int akm09918c_start_measurement_blocking(const struct device *dev, enum sensor_channel chan)
 {
 	struct akm09918c_data *data = dev->data;
 	const struct akm09918c_config *cfg = dev->config;
@@ -59,7 +59,8 @@ int akm09918c_start_measurement(const struct device *dev, enum sensor_channel ch
  * @param z Location to write Z channel sample.
  * @return int 0 if successful or error code
  */
-int akm09918c_fetch_measurement(const struct device *dev, int16_t *x, int16_t *y, int16_t *z)
+int akm09918c_fetch_measurement_blocking(const struct device *dev, int16_t *x, int16_t *y,
+					 int16_t *z)
 {
 	const struct akm09918c_config *cfg = dev->config;
 	uint8_t buf[9] = {0};
@@ -86,7 +87,7 @@ static int akm09918c_sample_fetch(const struct device *dev, enum sensor_channel
 {
 	struct akm09918c_data *data = dev->data;
 
-	int ret = akm09918c_start_measurement(dev, chan);
+	int ret = akm09918c_start_measurement_blocking(dev, chan);
 
 	if (ret) {
 		return ret;
@@ -95,7 +96,8 @@ static int akm09918c_sample_fetch(const struct device *dev, enum sensor_channel
 	LOG_DBG("Waiting for sample...");
 	k_usleep(AKM09918C_MEASURE_TIME_US);
 
-	return akm09918c_fetch_measurement(dev, &data->x_sample, &data->y_sample, &data->z_sample);
+	return akm09918c_fetch_measurement_blocking(dev, &data->x_sample, &data->y_sample,
+						    &data->z_sample);
 }
 
 static void akm09918c_convert(struct sensor_value *val, int16_t sample)
@@ -249,8 +251,13 @@ static DEVICE_API(sensor, akm09918c_driver_api) = {
 };
 
 #define AKM09918C_DEFINE(inst)                                                                     \
-	static struct akm09918c_data akm09918c_data_##inst;                                        \
-                                                                                                   \
+	IF_ENABLED(CONFIG_I2C_RTIO, \
+		(I2C_DT_IODEV_DEFINE(akm09918c_iodev_##inst, DT_DRV_INST(inst));)) \
+	IF_ENABLED(CONFIG_I2C_RTIO, (RTIO_DEFINE( \
+		akm09918c_rtio_ctx_##inst, CONFIG_I2C_RTIO_SQ_SIZE, CONFIG_I2C_RTIO_CQ_SIZE);)) \
+	static struct akm09918c_data akm09918c_data_##inst = {                                     \
+		IF_ENABLED(CONFIG_I2C_RTIO, (.rtio_ctx = \
+			&akm09918c_rtio_ctx_##inst, .iodev = &akm09918c_iodev_##inst)) }; \
 	static const struct akm09918c_config akm09918c_config_##inst = {                           \
 		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
 	};                                                                                         \
diff --git a/drivers/sensor/asahi_kasei/akm09918c/akm09918c.h b/drivers/sensor/asahi_kasei/akm09918c/akm09918c.h
index f8a4f5c7c4395..d8929a4c7c0b7 100644
--- a/drivers/sensor/asahi_kasei/akm09918c/akm09918c.h
+++ b/drivers/sensor/asahi_kasei/akm09918c/akm09918c.h
@@ -41,6 +41,9 @@ struct akm09918c_data {
 		uint64_t timestamp;
 		struct k_work_delayable async_fetch_work;
 	} work_ctx;
+	/* for communication to the bus controller */
+	struct rtio *rtio_ctx;
+	struct rtio_iodev *iodev;
 #endif
 };
 
@@ -82,9 +85,10 @@ static inline void akm09918c_reg_to_hz(uint8_t reg, struct sensor_value *val)
 		break;
 	}
 }
-int akm09918c_start_measurement(const struct device *dev, enum sensor_channel chan);
+int akm09918c_start_measurement_blocking(const struct device *dev, enum sensor_channel chan);
 
-int akm09918c_fetch_measurement(const struct device *dev, int16_t *x, int16_t *y, int16_t *z);
+int akm09918c_fetch_measurement_blocking(const struct device *dev, int16_t *x, int16_t *y,
+					 int16_t *z);
 /*
  * RTIO types
  */
@@ -95,7 +99,12 @@ struct akm09918c_decoder_header {
 
 struct akm09918c_encoded_data {
 	struct akm09918c_decoder_header header;
-	int16_t readings[3];
+	struct __packed {
+		uint8_t st1;
+		int16_t data[3];
+		uint8_t tmps; /* not used  - only for padding */
+		uint8_t st2;  /* not used but includes overflow data */
+	} reading;
 };
 
 void akm09918_async_fetch(struct k_work *work);
@@ -103,5 +112,7 @@ void akm09918_async_fetch(struct k_work *work);
 int akm09918c_get_decoder(const struct device *dev, const struct sensor_decoder_api **decoder);
 
 void akm09918c_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe);
+void akm09918_after_start_cb(struct rtio *rtio_ctx, const struct rtio_sqe *sqe, void *arg0);
+void akm09918_complete_cb(struct rtio *rtio_ctx, const struct rtio_sqe *sqe, void *arg0);
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_AKM09918C_AKM09918C_H_ */
diff --git a/drivers/sensor/asahi_kasei/akm09918c/akm09918c_async.c b/drivers/sensor/asahi_kasei/akm09918c/akm09918c_async.c
index dedc2411489a1..2ae54305330c1 100644
--- a/drivers/sensor/asahi_kasei/akm09918c/akm09918c_async.c
+++ b/drivers/sensor/asahi_kasei/akm09918c/akm09918c_async.c
@@ -7,22 +7,39 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/rtio/work.h>
+#include <zephyr/rtio/rtio.h>
 #include <zephyr/drivers/sensor_clock.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "akm09918c.h"
 
 LOG_MODULE_DECLARE(AKM09918C, CONFIG_SENSOR_LOG_LEVEL);
 
-void akm09918c_submit_sync(struct rtio_iodev_sqe *iodev_sqe)
+static int akm09918c_flush_cqes(struct rtio *rtio_ctx)
+{
+	/* Flush completions */
+	struct rtio_cqe *cqe;
+	int res = 0;
+
+	do {
+		cqe = rtio_cqe_consume(rtio_ctx);
+		if (cqe != NULL) {
+			if ((cqe->result < 0 && res == 0)) {
+				LOG_ERR("Bus error: %d", cqe->result);
+				res = cqe->result;
+			}
+			rtio_cqe_release(rtio_ctx, cqe);
+		}
+	} while (cqe != NULL);
+	return res;
+}
+
+void akm09918c_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
 {
 	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
-	const struct device *dev = cfg->sensor;
 	struct akm09918c_data *data = dev->data;
 	const struct sensor_chan_spec *const channels = cfg->channels;
 	const size_t num_channels = cfg->count;
-	uint64_t cycles;
-	int rc;
 
 	/* Check if the requested channels are supported */
 	for (size_t i = 0; i < num_channels; i++) {
@@ -39,14 +56,30 @@ void akm09918c_submit_sync(struct rtio_iodev_sqe *iodev_sqe)
 			return;
 		}
 	}
+	struct rtio_sqe *writeByte_sqe = i2c_rtio_copy_reg_write_byte(
+		data->rtio_ctx, data->iodev, AKM09918C_REG_CNTL2, AKM09918C_CNTL2_SINGLE_MEASURE);
+	struct rtio_sqe *cb_sqe = rtio_sqe_acquire(data->rtio_ctx);
 
-	/* start the measurement in the sensor */
-	rc = akm09918c_start_measurement(dev, SENSOR_CHAN_MAGN_XYZ);
-	if (rc != 0) {
-		LOG_ERR("Failed to fetch samples.");
-		rtio_iodev_sqe_err(iodev_sqe, rc);
-		return;
+	writeByte_sqe->flags |= RTIO_SQE_CHAINED;
+	rtio_sqe_prep_callback_no_cqe(cb_sqe, akm09918_after_start_cb, (void *)iodev_sqe, NULL);
+
+	if (writeByte_sqe != NULL && cb_sqe != NULL) {
+		rtio_submit(data->rtio_ctx, 0);
+	} else {
+		rtio_sqe_drop_all(data->rtio_ctx);
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
 	}
+}
+
+void akm09918_after_start_cb(struct rtio *rtio_ctx, const struct rtio_sqe *sqe, void *arg0)
+{
+	const struct rtio_iodev_sqe *parent_iodev_sqe = (struct rtio_iodev_sqe *)arg0;
+	const struct sensor_read_config *cfg = parent_iodev_sqe->sqe.iodev->data;
+	const struct device *dev = cfg->sensor;
+	struct akm09918c_data *data = dev->data;
+	struct rtio_iodev_sqe *iodev_sqe = (struct rtio_iodev_sqe *)arg0;
+	uint64_t cycles;
+	int rc;
 
 	rc = sensor_clock_get_cycles(&cycles);
 	if (rc != 0) {
@@ -59,6 +92,12 @@ void akm09918c_submit_sync(struct rtio_iodev_sqe *iodev_sqe)
 	data->work_ctx.timestamp = sensor_clock_cycles_to_ns(cycles);
 	data->work_ctx.iodev_sqe = iodev_sqe;
 
+	rc = akm09918c_flush_cqes(data->rtio_ctx);
+	if (rc != 0) {
+		rtio_iodev_sqe_err(iodev_sqe, rc);
+		return;
+	}
+
 	rc = k_work_schedule(&data->work_ctx.async_fetch_work, K_USEC(AKM09918C_MEASURE_TIME_US));
 	if (rc == 0) {
 		LOG_ERR("The last fetch has not finished yet. "
@@ -68,20 +107,6 @@ void akm09918c_submit_sync(struct rtio_iodev_sqe *iodev_sqe)
 	return;
 }
 
-void akm09918c_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
-{
-	struct rtio_work_req *req = rtio_work_req_alloc();
-
-	if (req == NULL) {
-		LOG_ERR("RTIO work item allocation failed. Consider to increase "
-			"CONFIG_RTIO_WORKQ_POOL_ITEMS.");
-		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
-		return;
-	}
-
-	rtio_work_req_submit(req, iodev_sqe, akm09918c_submit_sync);
-}
-
 void akm09918_async_fetch(struct k_work *work)
 {
 	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
@@ -89,6 +114,7 @@ void akm09918_async_fetch(struct k_work *work)
 		CONTAINER_OF(dwork, struct akm09918c_async_fetch_ctx, async_fetch_work);
 	const struct sensor_read_config *cfg = ctx->iodev_sqe->sqe.iodev->data;
 	const struct device *dev = cfg->sensor;
+	struct akm09918c_data *data = dev->data;
 	uint32_t req_buf_len = sizeof(struct akm09918c_encoded_data);
 	uint32_t buf_len;
 	uint8_t *buf;
@@ -103,11 +129,49 @@ void akm09918_async_fetch(struct k_work *work)
 		return;
 	}
 	edata = (struct akm09918c_encoded_data *)buf;
-	rc = akm09918c_fetch_measurement(dev, &edata->readings[0], &edata->readings[1],
-					 &edata->readings[2]);
+
+	struct rtio_sqe *burstRead_sqe =
+		i2c_rtio_copy_reg_burst_read(data->rtio_ctx, data->iodev, AKM09918C_REG_ST1,
+					     &(edata->reading), sizeof(edata->reading));
+
+	edata->header.timestamp = ctx->timestamp;
+
+	struct rtio_sqe *cb_sqe = rtio_sqe_acquire(data->rtio_ctx);
+
+	rtio_sqe_prep_callback_no_cqe(cb_sqe, akm09918_complete_cb, (void *)ctx->iodev_sqe, NULL);
+
+	if (burstRead_sqe != NULL && cb_sqe != NULL) {
+		burstRead_sqe->flags |= RTIO_SQE_CHAINED;
+		rtio_submit(data->rtio_ctx, 0);
+	} else {
+		rtio_sqe_drop_all(data->rtio_ctx);
+		rtio_iodev_sqe_err(ctx->iodev_sqe, -ENOMEM);
+	}
+}
+
+void akm09918_complete_cb(struct rtio *rtio_ctx, const struct rtio_sqe *sqe, void *arg0)
+{
+	struct rtio_iodev_sqe *parent_iodev_sqe = (struct rtio_iodev_sqe *)arg0;
+	struct rtio_sqe *parent_sqe = &parent_iodev_sqe->sqe;
+	struct akm09918c_encoded_data *edata =
+		(struct akm09918c_encoded_data *)(parent_sqe->rx.buf);
+	int rc;
+
+	rc = akm09918c_flush_cqes(rtio_ctx);
 	if (rc != 0) {
-		rtio_iodev_sqe_err(ctx->iodev_sqe, rc);
+		rtio_iodev_sqe_err(parent_iodev_sqe, rc);
+		return;
+	}
+
+	if (FIELD_GET(AKM09918C_ST1_DRDY, edata->reading.st1) == 0) {
+		LOG_ERR("Data not ready, st1=0x%02x", edata->reading.st1);
+		rtio_iodev_sqe_err(parent_iodev_sqe, -EBUSY);
 		return;
 	}
-	rtio_iodev_sqe_ok(ctx->iodev_sqe, 0);
+
+	edata->reading.data[0] = sys_le16_to_cpu(edata->reading.data[0]);
+	edata->reading.data[1] = sys_le16_to_cpu(edata->reading.data[1]);
+	edata->reading.data[2] = sys_le16_to_cpu(edata->reading.data[2]);
+
+	rtio_iodev_sqe_ok(parent_iodev_sqe, 0);
 }
diff --git a/drivers/sensor/asahi_kasei/akm09918c/akm09918c_decoder.c b/drivers/sensor/asahi_kasei/akm09918c/akm09918c_decoder.c
index 7a17e959dc4dd..b282e9f834770 100644
--- a/drivers/sensor/asahi_kasei/akm09918c/akm09918c_decoder.c
+++ b/drivers/sensor/asahi_kasei/akm09918c/akm09918c_decoder.c
@@ -70,9 +70,9 @@ static int akm09918c_decoder_decode(const uint8_t *buffer, struct sensor_chan_sp
 		out->header.reading_count = 1;
 		out->shift = AKM09918C_SHIFT;
 
-		akm09918c_convert_raw_to_q31(edata->readings[0], &out->readings[0].x);
-		akm09918c_convert_raw_to_q31(edata->readings[1], &out->readings[0].y);
-		akm09918c_convert_raw_to_q31(edata->readings[2], &out->readings[0].z);
+		akm09918c_convert_raw_to_q31(edata->reading.data[0], &out->readings[0].x);
+		akm09918c_convert_raw_to_q31(edata->reading.data[1], &out->readings[0].y);
+		akm09918c_convert_raw_to_q31(edata->reading.data[2], &out->readings[0].z);
 		*fit = 1;
 
 		return 1;
diff --git a/drivers/sensor/bosch/CMakeLists.txt b/drivers/sensor/bosch/CMakeLists.txt
index 4125ab1e7ed19..8c1207bfa2007 100644
--- a/drivers/sensor/bosch/CMakeLists.txt
+++ b/drivers/sensor/bosch/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory_ifdef(CONFIG_BMI160 bmi160)
 add_subdirectory_ifdef(CONFIG_BMI270 bmi270)
 add_subdirectory_ifdef(CONFIG_BMI323 bmi323)
 add_subdirectory_ifdef(CONFIG_BMM150 bmm150)
+add_subdirectory_ifdef(CONFIG_BMM350 bmm350)
 add_subdirectory_ifdef(CONFIG_BMP180 bmp180)
 add_subdirectory_ifdef(CONFIG_BMP388 bmp388)
 add_subdirectory_ifdef(CONFIG_BMP581 bmp581)
diff --git a/drivers/sensor/bosch/Kconfig b/drivers/sensor/bosch/Kconfig
index 795284d3a2d5f..b0232edfce00c 100644
--- a/drivers/sensor/bosch/Kconfig
+++ b/drivers/sensor/bosch/Kconfig
@@ -13,6 +13,7 @@ source "drivers/sensor/bosch/bmi160/Kconfig"
 source "drivers/sensor/bosch/bmi270/Kconfig"
 source "drivers/sensor/bosch/bmi323/Kconfig"
 source "drivers/sensor/bosch/bmm150/Kconfig"
+source "drivers/sensor/bosch/bmm350/Kconfig"
 source "drivers/sensor/bosch/bmp180/Kconfig"
 source "drivers/sensor/bosch/bmp388/Kconfig"
 source "drivers/sensor/bosch/bmp581/Kconfig"
diff --git a/drivers/sensor/bosch/bma4xx/CMakeLists.txt b/drivers/sensor/bosch/bma4xx/CMakeLists.txt
index a0151e081d61e..0f8556e22dc39 100644
--- a/drivers/sensor/bosch/bma4xx/CMakeLists.txt
+++ b/drivers/sensor/bosch/bma4xx/CMakeLists.txt
@@ -2,6 +2,15 @@
 
 zephyr_library()
 
-zephyr_library_sources(bma4xx.c)
-zephyr_library_sources(bma4xx_i2c.c)
-zephyr_library_sources(bma4xx_spi.c)
+zephyr_library_sources(
+    bma4xx.c
+    bma4xx_common.c
+    bma4xx_decoder.c
+    bma4xx_rtio.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_I2C bma4xx_i2c.c)
+zephyr_library_sources_ifdef(CONFIG_SPI bma4xx_spi.c)
+zephyr_library_sources_ifdef(CONFIG_BMA4XX_STREAM bma4xx_rtio_stream.c)
+zephyr_library_sources_ifdef(CONFIG_BMA4XX_STREAM bma4xx_interrupt.c)
+zephyr_library_sources_ifdef(CONFIG_EMUL_BMA4XX bma4xx_emul.c)
diff --git a/drivers/sensor/bosch/bma4xx/Kconfig b/drivers/sensor/bosch/bma4xx/Kconfig
index 1d980635b80f9..12aee6a403ac2 100644
--- a/drivers/sensor/bosch/bma4xx/Kconfig
+++ b/drivers/sensor/bosch/bma4xx/Kconfig
@@ -2,23 +2,26 @@
 #
 # Copyright (c) 2023 Google LLC
 # Copyright (c) 2024 Croxel Inc.
+# Copyright (c) 2024 Cienet
 #
 # SPDX-License-Identifier: Apache-2.0
 
-config BMA4XX
+menuconfig BMA4XX
 	bool "BMA4XX 3-axis acceleration sensor"
 	default y
 	depends on DT_HAS_BOSCH_BMA4XX_ENABLED
 	depends on SENSOR_ASYNC_API
 	select I2C
+	select I2C_RTIO
 	select RTIO_WORKQ
 	help
 	  Enable driver for Bosch BMA4XX (I2C-based)
 
+if BMA4XX
+
 config BMA4XX_TEMPERATURE
 	bool "Allow reading the BMA4XX die temperature"
 	default n
-	depends on BMA4XX
 	help
 	  Allow reading the BMA4xx's on-chip temperature sensor. This creates
 	  extra bus activity and increases code size.
@@ -26,8 +29,17 @@ config BMA4XX_TEMPERATURE
 config EMUL_BMA4XX
 	bool "Emulator for the BMA4XX"
 	default y
-	depends on BMA4XX
 	depends on EMUL
 	help
 	  Enable the hardware emulator for the BMA4XX. Doing so allows exercising
 	  sensor APIs for this sensor in native_sim and qemu.
+
+config BMA4XX_STREAM
+	bool "Use hardware FIFO to stream data"
+	default y
+	depends on GPIO
+	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_BOSCH_BMA4XX),int1-gpios)
+	help
+	  Use this config option to enable streaming sensor data via RTIO subsystem.
+
+endif # BMA4XX
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx.c b/drivers/sensor/bosch/bma4xx/bma4xx.c
index 0340f20ed4782..a9afda946bbf4 100644
--- a/drivers/sensor/bosch/bma4xx/bma4xx.c
+++ b/drivers/sensor/bosch/bma4xx/bma4xx.c
@@ -2,6 +2,7 @@
  *
  * Copyright (c) 2023 Google LLC
  * Copyright (c) 2024 Croxel Inc.
+ * Copyright (c) 2024 Cienet
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,10 +15,13 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/rtio/work.h>
-#include <zephyr/drivers/sensor_clock.h>
 
-LOG_MODULE_REGISTER(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
 #include "bma4xx.h"
+#include "bma4xx_interrupt.h"
+#include "bma4xx_decoder.h"
+#include "bma4xx_rtio.h"
+
+LOG_MODULE_REGISTER(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
 
 /**
  * @brief Helper for converting m/s^2 offset values into register values
@@ -109,12 +113,11 @@ static int bma4xx_odr_to_reg(uint32_t microhertz, uint8_t *reg_val)
 }
 
 /**
- * Set the sensor's acceleration offset (per axis). Use bma4xx_commit_nvm() to save these
- * offsets to nonvolatile memory so they are automatically set during power-on-reset.
+ * Set the sensor's acceleration offset (per axis).
  */
-static int bma4xx_attr_set_odr(const struct device *dev, const struct sensor_value *val)
+static int bma4xx_attr_set_odr(const struct sensor_value *val,
+			       struct bma4xx_runtime_config *new_config)
 {
-	struct bma4xx_data *bma4xx = dev->data;
 	int status;
 	uint8_t reg_val;
 
@@ -124,13 +127,8 @@ static int bma4xx_attr_set_odr(const struct device *dev, const struct sensor_val
 		return status;
 	}
 
-	status = bma4xx->hw_ops->update_reg(dev, BMA4XX_REG_ACCEL_CONFIG, BMA4XX_MASK_ACC_CONF_ODR,
-					    reg_val);
-	if (status < 0) {
-		return status;
-	}
+	new_config->accel_odr = reg_val;
 
-	bma4xx->accel_odr = reg_val;
 	return 0;
 }
 
@@ -164,9 +162,9 @@ static int bma4xx_fs_to_reg(int32_t range_ug, uint8_t *reg_val)
 /**
  * Set the sensor's full-scale range
  */
-static int bma4xx_attr_set_range(const struct device *dev, const struct sensor_value *val)
+static int bma4xx_attr_set_range(const struct sensor_value *val,
+				 struct bma4xx_runtime_config *new_config)
 {
-	struct bma4xx_data *bma4xx = dev->data;
 	int status;
 	uint8_t reg_val;
 
@@ -176,30 +174,25 @@ static int bma4xx_attr_set_range(const struct device *dev, const struct sensor_v
 		return status;
 	}
 
-	status = bma4xx->hw_ops->update_reg(dev, BMA4XX_REG_ACCEL_RANGE, BMA4XX_MASK_ACC_RANGE,
-					    reg_val);
-	if (status < 0) {
-		return status;
-	}
+	new_config->accel_fs_range = reg_val;
 
-	bma4xx->accel_fs_range = reg_val;
 	return 0;
 }
 
 /**
  * Set the sensor's bandwidth parameter (one of BMA4XX_BWP_*)
  */
-static int bma4xx_attr_set_bwp(const struct device *dev, const struct sensor_value *val)
+static int bma4xx_attr_set_bwp(const struct sensor_value *val,
+			       struct bma4xx_runtime_config *new_config)
 {
 	/* Require that `val2` is unused, and that `val1` is in range of a valid BWP */
 	if (val->val2 || val->val1 < BMA4XX_BWP_OSR4_AVG1 || val->val1 > BMA4XX_BWP_RES_AVG128) {
 		return -EINVAL;
 	}
 
-	struct bma4xx_data *bma4xx = dev->data;
+	new_config->accel_bwp = (((uint8_t)val->val1) << BMA4XX_SHIFT_ACC_CONF_BWP);
 
-	return bma4xx->hw_ops->update_reg(dev, BMA4XX_REG_ACCEL_CONFIG, BMA4XX_MASK_ACC_CONF_BWP,
-					  (((uint8_t)val->val1) << BMA4XX_SHIFT_ACC_CONF_BWP));
+	return 0;
 }
 
 /**
@@ -208,19 +201,54 @@ static int bma4xx_attr_set_bwp(const struct device *dev, const struct sensor_val
 static int bma4xx_attr_set(const struct device *dev, enum sensor_channel chan,
 			   enum sensor_attribute attr, const struct sensor_value *val)
 {
-	switch (attr) {
-	case SENSOR_ATTR_SAMPLING_FREQUENCY:
-		return bma4xx_attr_set_odr(dev, val);
-	case SENSOR_ATTR_FULL_SCALE:
-		return bma4xx_attr_set_range(dev, val);
-	case SENSOR_ATTR_OFFSET:
-		return bma4xx_attr_set_offset(dev, chan, val);
-	case SENSOR_ATTR_CONFIGURATION:
-		/* Use for setting the bandwidth parameter (BWP) */
-		return bma4xx_attr_set_bwp(dev, val);
+	const struct bma4xx_data *data = dev->data;
+	struct bma4xx_runtime_config new_config = data->cfg;
+	int res = 0;
+
+	__ASSERT_NO_MSG(val != NULL);
+
+	switch (chan) {
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+	case SENSOR_CHAN_ACCEL_XYZ:
+		if (attr == SENSOR_ATTR_SAMPLING_FREQUENCY) {
+			res = bma4xx_attr_set_odr(val, &new_config);
+		} else if (attr == SENSOR_ATTR_FULL_SCALE) {
+			res = bma4xx_attr_set_range(val, &new_config);
+		} else if (attr == SENSOR_ATTR_OFFSET) {
+			res = bma4xx_attr_set_offset(dev, chan, val);
+		} else if (attr == SENSOR_ATTR_CONFIGURATION) {
+			/* Use for setting the bandwidth parameter (BWP) */
+			res = bma4xx_attr_set_bwp(val, &new_config);
+		} else {
+			LOG_ERR("Unsupported attribute");
+			res = -ENOTSUP;
+		}
+		break;
+	case SENSOR_CHAN_ALL:
+		if (attr == SENSOR_ATTR_BATCH_DURATION) {
+			if (val->val1 < 0) {
+				return -EINVAL;
+			}
+			new_config.batch_ticks = val->val1;
+		} else {
+			LOG_ERR("Unsupported attribute");
+			res = -EINVAL;
+		}
+		break;
 	default:
-		return -ENOTSUP;
+		LOG_ERR("Unsupported channel");
+		res = -EINVAL;
+		break;
+	}
+
+	if (res) {
+		LOG_ERR("Failed to set attribute");
+		return res;
 	}
+
+	return bma4xx_safely_configure(dev, &new_config);
 }
 
 /**
@@ -235,7 +263,7 @@ static int bma4xx_chip_init(const struct device *dev)
 	/* Sensor bus-specific initialization */
 	status = cfg->bus_init(dev);
 	if (status) {
-		LOG_ERR("bus_init failed: %d", status);
+		LOG_ERR("Failed to initialize bus: %d", status);
 		return status;
 	}
 
@@ -258,433 +286,25 @@ static int bma4xx_chip_init(const struct device *dev)
 		return status;
 	}
 
-	k_sleep(K_USEC(1000));
-
-	/* Default is: range = +/-4G, ODR = 100 Hz, BWP = "NORM_AVG4" */
-	bma4xx->accel_fs_range = BMA4XX_RANGE_4G;
-	bma4xx->accel_bwp = BMA4XX_BWP_NORM_AVG4;
-	bma4xx->accel_odr = BMA4XX_ODR_100;
-
-	/* Switch to performance power mode */
-	status = bma4xx->hw_ops->update_reg(dev, BMA4XX_REG_ACCEL_CONFIG, BMA4XX_BIT_ACC_PERF_MODE,
-					    BMA4XX_BIT_ACC_PERF_MODE);
-	if (status) {
-		LOG_ERR("Could not enable performance power save mode: %d", status);
-		return status;
-	}
-
-	/* Enable accelerometer */
-	status = bma4xx->hw_ops->update_reg(dev, BMA4XX_REG_POWER_CTRL, BMA4XX_BIT_ACC_EN,
-					    BMA4XX_BIT_ACC_EN);
-	if (status) {
-		LOG_ERR("Could not enable accel: %d", status);
-		return status;
-	}
-
-	return status;
-}
-
-/*
- * Sample fetch and conversion
- */
-
-/**
- * @brief Read accelerometer data from the BMA4xx
- */
-static int bma4xx_sample_fetch(const struct device *dev, int16_t *x, int16_t *y, int16_t *z)
-{
-	struct bma4xx_data *bma4xx = dev->data;
-	uint8_t read_data[6];
-	int status;
-
-	/* Burst read regs DATA_8 through DATA_13, which holds the accel readings */
-	status = bma4xx->hw_ops->read_data(dev, BMA4XX_REG_DATA_8, (uint8_t *)&read_data,
-					   BMA4XX_REG_DATA_13 - BMA4XX_REG_DATA_8 + 1);
-	if (status < 0) {
-		LOG_ERR("Cannot read accel data: %d", status);
-		return status;
+	if (IS_ENABLED(CONFIG_BMA4XX_STREAM)) {
+		status = bma4xx_init_interrupt(dev);
+		if (status != 0) {
+			LOG_ERR("Failed to initialize bma4xx interrupt");
+			return status;
+		}
 	}
 
-	LOG_DBG("Raw values [0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x]", read_data[0],
-		read_data[1], read_data[2], read_data[3], read_data[4], read_data[5]);
-	/* Values in accel_data[N] are left-aligned and will read 16x actual */
-	*x = ((int16_t)read_data[1] << 4) | FIELD_GET(GENMASK(7, 4), read_data[0]);
-	*y = ((int16_t)read_data[3] << 4) | FIELD_GET(GENMASK(7, 4), read_data[2]);
-	*z = ((int16_t)read_data[5] << 4) | FIELD_GET(GENMASK(7, 4), read_data[4]);
-
-	LOG_DBG("XYZ reg vals are %d, %d, %d", *x, *y, *z);
-
-	return 0;
-}
-
-#ifdef CONFIG_BMA4XX_TEMPERATURE
-/**
- * @brief Read temperature register on BMA4xx
- */
-static int bma4xx_temp_fetch(const struct device *dev, int8_t *temp)
-{
-	struct bma4xx_data *bma4xx = dev->data;
-	int status;
+	/* Default is: range = +/-4G, ODR = 100 Hz, BWP = "NORM_AVG4" */
+	bma4xx->cfg.accel_fs_range = BMA4XX_RANGE_4G;
+	bma4xx->cfg.accel_bwp = BMA4XX_BWP_NORM_AVG4;
+	bma4xx->cfg.accel_odr = BMA4XX_ODR_100;
 
-	status = bma4xx->hw_ops->read_reg(dev, BMA4XX_REG_TEMPERATURE, temp);
+	status = bma4xx_configure(dev, &bma4xx->cfg);
 	if (status) {
-		LOG_ERR("could not read temp reg: %d", status);
+		LOG_ERR("Failed to initialize bma4xx trigger");
 		return status;
 	}
 
-	LOG_DBG("temp reg val is %d", *temp);
-	return 0;
-}
-#endif
-
-/*
- * RTIO submit and encoding
- */
-
-static void bma4xx_submit_one_shot(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
-{
-	struct bma4xx_data *bma4xx = dev->data;
-
-	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
-	const struct sensor_chan_spec *const channels = cfg->channels;
-	const size_t num_channels = cfg->count;
-
-	uint32_t min_buf_len = sizeof(struct bma4xx_encoded_data);
-	struct bma4xx_encoded_data *edata;
-	uint8_t *buf;
-	uint32_t buf_len;
-	uint64_t cycles;
-	int rc;
-
-	/* Get the buffer for the frame, it may be allocated dynamically by the rtio context */
-	rc = rtio_sqe_rx_buf(iodev_sqe, min_buf_len, min_buf_len, &buf, &buf_len);
-	if (rc != 0) {
-		LOG_ERR("Failed to get a read buffer of size %u bytes", min_buf_len);
-		rtio_iodev_sqe_err(iodev_sqe, rc);
-		return;
-	}
-
-	rc = sensor_clock_get_cycles(&cycles);
-	if (rc != 0) {
-		LOG_ERR("Failed to get sensor clock cycles");
-		rtio_iodev_sqe_err(iodev_sqe, rc);
-		return;
-	}
-
-	/* Prepare response */
-	edata = (struct bma4xx_encoded_data *)buf;
-	edata->header.is_fifo = false;
-	edata->header.accel_fs = bma4xx->accel_fs_range;
-	edata->header.timestamp = sensor_clock_cycles_to_ns(cycles);
-	edata->has_accel = 0;
-	edata->has_temp = 0;
-
-	/* Determine what channels we need to fetch */
-	for (int i = 0; i < num_channels; i++) {
-		if (channels[i].chan_idx != 0) {
-			LOG_ERR("Only channel index 0 supported");
-			rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
-			return;
-		}
-		switch (channels[i].chan_type) {
-		case SENSOR_CHAN_ALL:
-			edata->has_accel = 1;
-#ifdef CONFIG_BMA4XX_TEMPERATURE
-			edata->has_temp = 1;
-#endif /* CONFIG_BMA4XX_TEMPERATURE */
-			break;
-		case SENSOR_CHAN_ACCEL_X:
-		case SENSOR_CHAN_ACCEL_Y:
-		case SENSOR_CHAN_ACCEL_Z:
-		case SENSOR_CHAN_ACCEL_XYZ:
-			edata->has_accel = 1;
-			break;
-#ifdef CONFIG_BMA4XX_TEMPERATURE
-		case SENSOR_CHAN_DIE_TEMP:
-			edata->has_temp = 1;
-			break;
-#endif /* CONFIG_BMA4XX_TEMPERATURE */
-		default:
-			LOG_ERR("Requested unsupported channel type %d, idx %d",
-				channels[i].chan_type, channels[i].chan_idx);
-			rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
-			return;
-		}
-	}
-
-	if (edata->has_accel) {
-		rc = bma4xx_sample_fetch(dev, &edata->accel_xyz[0], &edata->accel_xyz[1],
-					 &edata->accel_xyz[2]);
-		if (rc != 0) {
-			LOG_ERR("Failed to fetch accel samples");
-			rtio_iodev_sqe_err(iodev_sqe, rc);
-			return;
-		}
-	}
-
-#ifdef CONFIG_BMA4XX_TEMPERATURE
-	if (edata->has_temp) {
-		rc = bma4xx_temp_fetch(dev, &edata->temp);
-		if (rc != 0) {
-			LOG_ERR("Failed to fetch temp sample");
-			rtio_iodev_sqe_err(iodev_sqe, rc);
-			return;
-		}
-	}
-#endif /* CONFIG_BMA4XX_TEMPERATURE */
-
-	rtio_iodev_sqe_ok(iodev_sqe, 0);
-}
-
-static void bma4xx_submit_sync(struct rtio_iodev_sqe *iodev_sqe)
-{
-	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
-	const struct device *dev = cfg->sensor;
-
-	/* TODO: Add streaming support */
-	if (!cfg->is_streaming) {
-		bma4xx_submit_one_shot(dev, iodev_sqe);
-	} else {
-		rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
-	}
-}
-
-static void bma4xx_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
-{
-	struct rtio_work_req *req = rtio_work_req_alloc();
-
-	if (req == NULL) {
-		LOG_ERR("RTIO work item allocation failed. Consider to increase "
-			"CONFIG_RTIO_WORKQ_POOL_ITEMS.");
-		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
-		return;
-	}
-
-	rtio_work_req_submit(req, iodev_sqe, bma4xx_submit_sync);
-}
-
-/*
- * RTIO decoder
- */
-
-static int bma4xx_decoder_get_frame_count(const uint8_t *buffer, struct sensor_chan_spec ch,
-					  uint16_t *frame_count)
-{
-	const struct bma4xx_encoded_data *edata = (const struct bma4xx_encoded_data *)buffer;
-	const struct bma4xx_decoder_header *header = &edata->header;
-
-	if (ch.chan_idx != 0) {
-		return -ENOTSUP;
-	}
-
-	if (!header->is_fifo) {
-		switch (ch.chan_type) {
-		case SENSOR_CHAN_ACCEL_X:
-		case SENSOR_CHAN_ACCEL_Y:
-		case SENSOR_CHAN_ACCEL_Z:
-		case SENSOR_CHAN_ACCEL_XYZ:
-			*frame_count = edata->has_accel ? 1 : 0;
-			return 0;
-		case SENSOR_CHAN_DIE_TEMP:
-			*frame_count = edata->has_temp ? 1 : 0;
-			return 0;
-		default:
-			return -ENOTSUP;
-		}
-		return 0;
-	}
-
-	/* FIFO (streaming) mode operation is not yet supported */
-	return -ENOTSUP;
-}
-
-static int bma4xx_decoder_get_size_info(struct sensor_chan_spec ch, size_t *base_size,
-					size_t *frame_size)
-{
-	switch (ch.chan_type) {
-	case SENSOR_CHAN_ACCEL_X:
-	case SENSOR_CHAN_ACCEL_Y:
-	case SENSOR_CHAN_ACCEL_Z:
-	case SENSOR_CHAN_ACCEL_XYZ:
-		*base_size = sizeof(struct sensor_three_axis_data);
-		*frame_size = sizeof(struct sensor_three_axis_sample_data);
-		return 0;
-	case SENSOR_CHAN_DIE_TEMP:
-		*base_size = sizeof(struct sensor_q31_data);
-		*frame_size = sizeof(struct sensor_q31_sample_data);
-		return 0;
-	default:
-		return -ENOTSUP;
-	}
-}
-
-static int bma4xx_get_shift(struct sensor_chan_spec ch, uint8_t accel_fs, int8_t *shift)
-{
-	switch (ch.chan_type) {
-	case SENSOR_CHAN_ACCEL_X:
-	case SENSOR_CHAN_ACCEL_Y:
-	case SENSOR_CHAN_ACCEL_Z:
-	case SENSOR_CHAN_ACCEL_XYZ:
-		switch (accel_fs) {
-		case BMA4XX_RANGE_2G:
-			/* 2 G's = 19.62 m/s^2. Use shift of 5 (+/-32) */
-			*shift = 5;
-			return 0;
-		case BMA4XX_RANGE_4G:
-			*shift = 6;
-			return 0;
-		case BMA4XX_RANGE_8G:
-			*shift = 7;
-			return 0;
-		case BMA4XX_RANGE_16G:
-			*shift = 8;
-			return 0;
-		default:
-			return -EINVAL;
-		}
-	case SENSOR_CHAN_DIE_TEMP:
-		*shift = BMA4XX_TEMP_SHIFT;
-		return 0;
-	default:
-		return -EINVAL;
-	}
-}
-
-static void bma4xx_convert_raw_accel_to_q31(int16_t raw_val, q31_t *out)
-{
-	/* The full calculation is (assuming floating math):
-	 *   value_ms2 = raw_value * range * 9.8065 / BIT(11)
-	 * We can treat 'range * 9.8065' as a scale, the scale is calculated by first getting 1g
-	 * represented as a q31 value with the same shift as our result:
-	 *   1g = (9.8065 * BIT(31)) >> shift
-	 * Next, we need to multiply it by our range in g, which for this driver is one of
-	 * [2, 4, 8, 16] and maps to a left shift of [1, 2, 3, 4]:
-	 *   1g <<= log2(range)
-	 * Note we used a right shift by 'shift' and left shift by log2(range). 'shift' is
-	 * [5, 6, 7, 8] for range values [2, 4, 8, 16] since it's the final shift in m/s2. It is
-	 * calculated via:
-	 *   shift = ceil(log2(range * 9.8065))
-	 * This means that we can shorten the above 1g alterations to:
-	 *   1g = (1g >> ceil(log2(range * 9.8065))) << log2(range)
-	 * For the range values [2, 4, 8, 16], the following is true:
-	 *   (x >> ceil(log2(range * 9.8065))) << log2(range)
-	 *   = x >> 4
-	 * Since the range cancels out in the right and left shift, we've now reduced the following:
-	 *   range * 9.8065 = 9.8065 * BIT(31 - 4)
-	 * All that's left is to divide by the bma4xx's maximum range BIT(11).
-	 */
-	const int64_t scale = (int64_t)(9.8065 * BIT64(31 - 4));
-
-	*out = CLAMP(((int64_t)raw_val * scale) >> 11, INT32_MIN, INT32_MAX);
-}
-
-#ifdef CONFIG_BMA4XX_TEMPERATURE
-/**
- * @brief Convert the 8-bit temp register value into a Q31 celsius value
- */
-static void bma4xx_convert_raw_temp_to_q31(int8_t raw_val, q31_t *out)
-{
-	/* Value of 0 equals 23 degrees C. Each bit count equals 1 degree C */
-
-	int64_t intermediate =
-		((int64_t)raw_val + 23) * ((int64_t)INT32_MAX + 1) / (1 << BMA4XX_TEMP_SHIFT);
-
-	*out = CLAMP(intermediate, INT32_MIN, INT32_MAX);
-}
-#endif /* CONFIG_BMA4XX_TEMPERATURE */
-
-static int bma4xx_one_shot_decode(const uint8_t *buffer, struct sensor_chan_spec ch,
-				  uint32_t *fit, uint16_t max_count, void *data_out)
-{
-	const struct bma4xx_encoded_data *edata = (const struct bma4xx_encoded_data *)buffer;
-	const struct bma4xx_decoder_header *header = &edata->header;
-	int rc;
-
-	if (*fit != 0) {
-		return 0;
-	}
-	if (max_count == 0 || ch.chan_idx != 0) {
-		return -EINVAL;
-	}
-
-	switch (ch.chan_type) {
-	case SENSOR_CHAN_ACCEL_X:
-	case SENSOR_CHAN_ACCEL_Y:
-	case SENSOR_CHAN_ACCEL_Z:
-	case SENSOR_CHAN_ACCEL_XYZ: {
-		if (!edata->has_accel) {
-			return -ENODATA;
-		}
-
-		struct sensor_three_axis_data *out = (struct sensor_three_axis_data *)data_out;
-
-		out->header.base_timestamp_ns = edata->header.timestamp;
-		out->header.reading_count = 1;
-		rc = bma4xx_get_shift((struct sensor_chan_spec){.chan_type = SENSOR_CHAN_ACCEL_XYZ,
-								.chan_idx = 0},
-				      header->accel_fs, &out->shift);
-		if (rc != 0) {
-			return -EINVAL;
-		}
-
-		bma4xx_convert_raw_accel_to_q31(edata->accel_xyz[0], &out->readings[0].x);
-		bma4xx_convert_raw_accel_to_q31(edata->accel_xyz[1], &out->readings[0].y);
-		bma4xx_convert_raw_accel_to_q31(edata->accel_xyz[2], &out->readings[0].z);
-
-		*fit = 1;
-		return 1;
-	}
-#ifdef CONFIG_BMA4XX_TEMPERATURE
-	case SENSOR_CHAN_DIE_TEMP: {
-		if (!edata->has_temp) {
-			return -ENODATA;
-		}
-
-		struct sensor_q31_data *out = (struct sensor_q31_data *)data_out;
-
-		out->header.base_timestamp_ns = edata->header.timestamp;
-		out->header.reading_count = 1;
-		rc = bma4xx_get_shift(SENSOR_CHAN_DIE_TEMP, 0, &out->shift);
-		if (rc != 0) {
-			return -EINVAL;
-		}
-
-		bma4xx_convert_raw_temp_to_q31(edata->temp, &out->readings[0].temperature);
-
-		*fit = 1;
-		return 1;
-	}
-#endif /* CONFIG_BMA4XX_TEMPERATURE */
-	default:
-		return -EINVAL;
-	}
-}
-
-static int bma4xx_decoder_decode(const uint8_t *buffer, struct sensor_chan_spec ch,
-				 uint32_t *fit, uint16_t max_count,
-				 void *data_out)
-{
-	const struct bma4xx_decoder_header *header = (const struct bma4xx_decoder_header *)buffer;
-
-	if (header->is_fifo) {
-		/* FIFO (streaming) mode operation is not yet supported */
-		return -ENOTSUP;
-	}
-
-	return bma4xx_one_shot_decode(buffer, ch, fit, max_count, data_out);
-}
-
-SENSOR_DECODER_API_DT_DEFINE() = {
-	.get_frame_count = bma4xx_decoder_get_frame_count,
-	.get_size_info = bma4xx_decoder_get_size_info,
-	.decode = bma4xx_decoder_decode,
-};
-
-static int bma4xx_get_decoder(const struct device *dev, const struct sensor_decoder_api **decoder)
-{
-	ARG_UNUSED(dev);
-	*decoder = &SENSOR_DECODER_NAME();
-
 	return 0;
 }
 
@@ -694,40 +314,71 @@ static int bma4xx_get_decoder(const struct device *dev, const struct sensor_deco
 
 static DEVICE_API(sensor, bma4xx_driver_api) = {
 	.attr_set = bma4xx_attr_set,
-	.submit = bma4xx_submit,
 	.get_decoder = bma4xx_get_decoder,
+	.submit = bma4xx_submit,
 };
 
 /*
  * Device instantiation macros
  */
 
+#define BMA4XX_RTIO_I2C_DEFINE(inst)                                                               \
+	I2C_DT_IODEV_DEFINE(bma4xx_iodev_##inst, DT_DRV_INST(inst));                               \
+	RTIO_DEFINE(bma4xx_rtio_##inst, 8, 8);
+
+#define BMA4XX_RTIO_SPI_DEFINE(inst)                                                               \
+	SPI_DT_IODEV_DEFINE(bma4xx_iodev_##inst, DT_DRV_INST(inst));                               \
+	RTIO_DEFINE(bma4xx_rtio_##inst, 8, 8);
+
+#define BMA4XX_DEFINE_RTIO(inst)                                                                   \
+	COND_CODE_1(DT_INST_ON_BUS(inst, spi), (BMA4XX_RTIO_SPI_DEFINE(inst)), \
+	(BMA4XX_RTIO_I2C_DEFINE(inst)))
+
 /* Initializes a struct bma4xx_config for an instance on a SPI bus.
  * SPI operation is not currently supported.
  */
-
 #define BMA4XX_CONFIG_SPI(inst)                                                                    \
-	{                                                                                          \
-		.bus_cfg.spi = SPI_DT_SPEC_INST_GET(inst, 0, 0), .bus_init = &bma_spi_init,        \
-	}
+	.bus_cfg.spi = SPI_DT_SPEC_INST_GET(inst, 0, 0), .bus_init = &bma4xx_spi_init,             \
+	.bus_type = BMA4XX_BUS_SPI,
 
 /* Initializes a struct bma4xx_config for an instance on an I2C bus. */
 #define BMA4XX_CONFIG_I2C(inst)                                                                    \
+	.bus_cfg.i2c = I2C_DT_SPEC_INST_GET(inst), .bus_init = &bma4xx_i2c_init,                   \
+	.bus_type = BMA4XX_BUS_I2C,
+
+#define BMA4XX_DEFINE_BUS(inst)                                                                    \
+	COND_CODE_1(DT_INST_ON_BUS(inst, spi), (BMA4XX_CONFIG_SPI(inst)), (BMA4XX_CONFIG_I2C(inst)))
+
+#define BMA4XX_DT_CONFIG_INIT(inst)                                                                \
 	{                                                                                          \
-		.bus_cfg.i2c = I2C_DT_SPEC_INST_GET(inst), .bus_init = &bma4xx_i2c_init,           \
+		.fifo_en = IS_ENABLED(CONFIG_BMA4XX_STREAM),                                       \
+		.batch_ticks = 0,                                                                  \
+		.interrupt1_fifo_wm = false,                                                       \
+		.interrupt1_fifo_full = false,                                                     \
 	}
 
+#define BMA4XX_DEFINE_DATA(inst)                                                                   \
+	BMA4XX_DEFINE_RTIO(inst);                                                                  \
+	static struct bma4xx_data bma4xx_driver_##inst = {                                         \
+		.cfg = BMA4XX_DT_CONFIG_INIT(inst),                                                \
+		.r = &bma4xx_rtio_##inst,                                                          \
+		.iodev = &bma4xx_iodev_##inst,                                                     \
+	};
+
 /*
  * Main instantiation macro, which selects the correct bus-specific
  * instantiation macros for the instance.
  */
-#define BMA4XX_DEFINE(inst)                                                                        \
-	static struct bma4xx_data bma4xx_data_##inst;                                              \
-	static const struct bma4xx_config bma4xx_config_##inst = COND_CODE_1(                      \
-		DT_INST_ON_BUS(inst, spi), (BMA4XX_CONFIG_SPI(inst)), (BMA4XX_CONFIG_I2C(inst)));  \
+#define BMA4XX_INIT(inst)                                                                          \
+	BMA4XX_DEFINE_DATA(inst);                                                                  \
+                                                                                                   \
+	static const struct bma4xx_config bma4xx_config_##inst = {                                 \
+		BMA4XX_DEFINE_BUS(inst)                                                            \
+			IF_ENABLED(CONFIG_BMA4XX_STREAM, ( \
+		.gpio_interrupt = GPIO_DT_SPEC_INST_GET_OR(inst, int1_gpios, {0}),))};         \
                                                                                                    \
-	SENSOR_DEVICE_DT_INST_DEFINE(inst, bma4xx_chip_init, NULL, &bma4xx_data_##inst,            \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, bma4xx_chip_init, NULL, &bma4xx_driver_##inst,          \
 				     &bma4xx_config_##inst, POST_KERNEL,                           \
 				     CONFIG_SENSOR_INIT_PRIORITY, &bma4xx_driver_api);
 
-DT_INST_FOREACH_STATUS_OKAY(BMA4XX_DEFINE)
+DT_INST_FOREACH_STATUS_OKAY(BMA4XX_INIT);
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx.h b/drivers/sensor/bosch/bma4xx/bma4xx.h
index 6184e40b06256..e07f2fe6fff85 100644
--- a/drivers/sensor/bosch/bma4xx/bma4xx.h
+++ b/drivers/sensor/bosch/bma4xx/bma4xx.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2023 Google LLC
+ * Copyright (c) 2024 Cienet
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,6 +11,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include "bma4xx_defs.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 #include <zephyr/drivers/spi.h>
@@ -19,157 +22,13 @@
 #include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
-/*
- * Register definitions
- */
-
-#define BMA4XX_REG_CHIP_ID         (0x00)
-#define BMA4XX_REG_ERROR           (0x02)
-#define BMA4XX_REG_STATUS          (0x03)
-#define BMA4XX_REG_DATA_0          (0x0A)
-#define BMA4XX_REG_DATA_1          (0x0B)
-#define BMA4XX_REG_DATA_2          (0x0C)
-#define BMA4XX_REG_DATA_3          (0x0D)
-#define BMA4XX_REG_DATA_4          (0x0E)
-#define BMA4XX_REG_DATA_5          (0x0F)
-#define BMA4XX_REG_DATA_6          (0x10)
-#define BMA4XX_REG_DATA_7          (0x11)
-#define BMA4XX_REG_DATA_8          (0x12)
-#define BMA4XX_REG_DATA_9          (0x13)
-#define BMA4XX_REG_DATA_10         (0x14)
-#define BMA4XX_REG_DATA_11         (0x15)
-#define BMA4XX_REG_DATA_12         (0x16)
-#define BMA4XX_REG_DATA_13         (0x17)
-#define BMA4XX_REG_SENSORTIME_0    (0x18)
-#define BMA4XX_REG_INT_STAT_0      (0x1C)
-#define BMA4XX_REG_INT_STAT_1      (0x1D)
-#define BMA4XX_REG_STEP_CNT_OUT_0  (0x1E)
-#define BMA4XX_REG_HIGH_G_OUT      (0x1F)
-#define BMA4XX_REG_TEMPERATURE     (0x22)
-#define BMA4XX_REG_FIFO_LENGTH_0   (0x24)
-#define BMA4XX_REG_FIFO_LENGTH_1   (0x25)
-#define BMA4XX_REG_FIFO_DATA       (0x26)
-#define BMA4XX_REG_ACTIVITY_OUT    (0x27)
-#define BMA4XX_REG_ORIENTATION_OUT (0x28)
-#define BMA4XX_REG_ACCEL_CONFIG    (0x40)
-#define BMA4XX_REG_ACCEL_RANGE     (0x41)
-#define BMA4XX_REG_AUX_CONFIG      (0x44)
-#define BMA4XX_REG_FIFO_DOWN       (0x45)
-#define BMA4XX_REG_FIFO_WTM_0      (0x46)
-#define BMA4XX_REG_FIFO_CONFIG_0   (0x48)
-#define BMA4XX_REG_FIFO_CONFIG_1   (0x49)
-#define BMA4XX_REG_AUX_DEV_ID      (0x4B)
-#define BMA4XX_REG_AUX_IF_CONF     (0x4C)
-#define BMA4XX_REG_AUX_RD          (0x4D)
-#define BMA4XX_REG_AUX_WR          (0x4E)
-#define BMA4XX_REG_AUX_WR_DATA     (0x4F)
-#define BMA4XX_REG_INT1_IO_CTRL    (0x53)
-#define BMA4XX_REG_INT2_IO_CTRL    (0x54)
-#define BMA4XX_REG_INT_LATCH       (0x55)
-#define BMA4XX_REG_INT_MAP_1       (0x56)
-#define BMA4XX_REG_INT_MAP_2       (0x57)
-#define BMA4XX_REG_INT_MAP_DATA    (0x58)
-#define BMA4XX_REG_INIT_CTRL       (0x59)
-#define BMA4XX_REG_RESERVED_REG_5B (0x5B)
-#define BMA4XX_REG_RESERVED_REG_5C (0x5C)
-#define BMA4XX_REG_FEATURE_CONFIG  (0x5E)
-#define BMA4XX_REG_IF_CONFIG       (0x6B)
-#define BMA4XX_REG_ACC_SELF_TEST   (0x6D)
-#define BMA4XX_REG_NV_CONFIG       (0x70)
-#define BMA4XX_REG_OFFSET_0        (0x71)
-#define BMA4XX_REG_OFFSET_1        (0x72)
-#define BMA4XX_REG_OFFSET_2        (0x73)
-#define BMA4XX_REG_POWER_CONF      (0x7C)
-#define BMA4XX_REG_POWER_CTRL      (0x7D)
-#define BMA4XX_REG_CMD             (0x7E)
-
-/*
- * Bit positions and masks
- */
-
-#define BMA4XX_BIT_ADV_PWR_SAVE BIT(0)
-
-#define BMA4XX_MASK_ACC_CONF_ODR  GENMASK(3, 0)
-#define BMA4XX_MASK_ACC_CONF_BWP  GENMASK(6, 4)
-#define BMA4XX_SHIFT_ACC_CONF_BWP (4)
-
-#define BMA4XX_MASK_ACC_RANGE GENMASK(1, 0)
-
-#define BMA4XX_BIT_ACC_PERF_MODE BIT(7)
-
-#define BMA4XX_BIT_ACC_EN BIT(2)
-
-/* INT_STATUS_1 accelerometer data ready to interrupt */
-#define BMA4XX_ACC_DRDY_INT BIT(7)
-
-/* CMD: Clears all data in FIFO, does not change FIFO_CONFIG and FIFO_DOWNS register */
-#define BMA4XX_CMD_FIFO_FLUSH (0xB0)
-
-/* FIFO_CONFIG_1 enable: Store Accelerometer data in FIFO (all 3 axes) */
-#define BMA4XX_FIFO_ACC_EN BIT(6)
-
-/* Bandwidth parameters */
-#define BMA4XX_BWP_OSR4_AVG1  (0x0)
-#define BMA4XX_BWP_OSR2_AVG2  (0x1)
-#define BMA4XX_BWP_NORM_AVG4  (0x2)
-#define BMA4XX_BWP_CIC_AVG8   (0x3)
-#define BMA4XX_BWP_RES_AVG16  (0x4)
-#define BMA4XX_BWP_RES_AVG32  (0x5)
-#define BMA4XX_BWP_RES_AVG64  (0x6)
-#define BMA4XX_BWP_RES_AVG128 (0x7)
-
-/* Full-scale ranges */
-#define BMA4XX_RANGE_2G  (0x0)
-#define BMA4XX_RANGE_4G  (0x1)
-#define BMA4XX_RANGE_8G  (0x2)
-#define BMA4XX_RANGE_16G (0x3)
-
-/* Output data rates (ODR) */
-#define BMA4XX_ODR_RESERVED (0x00)
-#define BMA4XX_ODR_0_78125  (0x01)
-#define BMA4XX_ODR_1_5625   (0x02)
-#define BMA4XX_ODR_3_125    (0x03)
-#define BMA4XX_ODR_6_25     (0x04)
-#define BMA4XX_ODR_12_5     (0x05)
-#define BMA4XX_ODR_25       (0x06)
-#define BMA4XX_ODR_50       (0x07)
-#define BMA4XX_ODR_100      (0x08)
-#define BMA4XX_ODR_200      (0x09)
-#define BMA4XX_ODR_400      (0x0a)
-#define BMA4XX_ODR_800      (0x0b)
-#define BMA4XX_ODR_1600     (0x0c)
-#define BMA4XX_ODR_3200     (0x0d)
-#define BMA4XX_ODR_6400     (0x0e)
-#define BMA4XX_ODR_12800    (0x0f)
-
-/*
- * BMA4xx commands
- */
-
-#define BMA4XX_CMD_SOFT_RESET (0xB6)
-
-#define BMA4XX_CHIP_ID_BMA422 (0x12)
-#define BMA4XX_CHIP_ID_BMA423 (0x13)
-
-/*
- * Other constants
- */
-
-/* Each bit count is 3.9mG or 3900uG */
-#define BMA4XX_OFFSET_MICROG_PER_BIT (3900)
-#define BMA4XX_OFFSET_MICROG_MIN     (INT8_MIN * BMA4XX_OFFSET_MICROG_PER_BIT)
-#define BMA4XX_OFFSET_MICROG_MAX     (INT8_MAX * BMA4XX_OFFSET_MICROG_PER_BIT)
-
-/* Range is -104C to 150C. Use shift of 8 (+/-256) */
-#define BMA4XX_TEMP_SHIFT (8)
-
-/* The total number of used registers specified in bma422 datasheet is 7E */
-#define BMA4XX_NUM_REGS 0x7E
-
 /*
  * Types
  */
 
+#define BMA4XX_BUS_I2C 0
+#define BMA4XX_BUS_SPI 1
+
 union bma4xx_bus_cfg {
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
 	struct i2c_dt_spec i2c;
@@ -183,6 +42,9 @@ union bma4xx_bus_cfg {
 struct bma4xx_config {
 	int (*bus_init)(const struct device *dev);
 	const union bma4xx_bus_cfg bus_cfg;
+	uint8_t bus_type;
+
+	const struct gpio_dt_spec gpio_interrupt;
 };
 
 /** Used to implement bus-specific R/W operations. See bma4xx_i2c.c and
@@ -196,46 +58,101 @@ struct bma4xx_hw_operations {
 	int (*update_reg)(const struct device *dev, uint8_t reg_addr, uint8_t mask, uint8_t value);
 };
 
-struct bma4xx_data {
+struct bma4xx_runtime_config {
+	bool fifo_en;
+	int32_t batch_ticks;
+
+	bool interrupt1_fifo_wm;
+	bool interrupt1_fifo_full;
+
+	uint8_t accel_pwr_mode;
+	uint8_t aux_pwr_mode;
+
 	/** Current full-scale range setting as a register value */
 	uint8_t accel_fs_range;
 	/** Current bandwidth parameter (BWP) as a register value */
 	uint8_t accel_bwp;
 	/** Current output data rate as a register value */
 	uint8_t accel_odr;
+};
+
+struct bma4xx_data {
+	struct bma4xx_runtime_config cfg;
 	/** Pointer to bus-specific I/O API */
 	const struct bma4xx_hw_operations *hw_ops;
 	/** Chip ID value stored in BMA4XX_REG_CHIP_ID */
 	uint8_t chip_id;
+	struct rtio *r;
+	struct rtio_iodev *iodev;
+#ifdef CONFIG_BMA4XX_STREAM
+	struct rtio_iodev_sqe *streaming_sqe;
+	uint8_t int_status;
+	uint16_t fifo_count;
+	uint64_t timestamp;
+	const struct device *dev;
+	struct gpio_callback gpio_cb;
+#endif /* CONFIG_BMA4XX_STREAM */
 };
 
-/*
- * RTIO types
- */
+static inline int bma4xx_accel_reg_to_hz(uint8_t odr, struct sensor_value *out)
+{
+	static const struct sensor_value odr_values[] = {
+		{0, 0},    {0, 781250}, {1, 562500}, {3, 125000}, {6, 250000}, {12, 500000},
+		{25, 0},   {50, 0},     {100, 0},    {200, 0},    {400, 0},    {800, 0},
+		{1600, 0}, {3200, 0},   {6400, 0},   {12800, 0},
+	};
 
-struct bma4xx_decoder_header {
-	uint64_t timestamp;
-	uint8_t is_fifo: 1;
-	uint8_t accel_fs: 2;
-	uint8_t reserved: 5;
-} __attribute__((__packed__));
-
-struct bma4xx_encoded_data {
-	struct bma4xx_decoder_header header;
-	struct {
-		/** Set if `accel_xyz` has data */
-		uint8_t has_accel: 1;
-		/** Set if `temp` has data */
-		uint8_t has_temp: 1;
-		uint8_t reserved: 6;
-	} __attribute__((__packed__));
-	int16_t accel_xyz[3];
-#ifdef CONFIG_BMA4XX_TEMPERATURE
-	int8_t temp;
-#endif /* CONFIG_BMA4XX_TEMPERATURE */
-};
+	if (odr >= ARRAY_SIZE(odr_values)) {
+		return -EINVAL;
+	}
 
+	*out = odr_values[odr];
+
+	return 0;
+}
+
+/**
+ * @brief Initialize the SPI bus
+ *
+ * @param dev bma4xx device pointer
+ *
+ * @retval 0 success
+ * @retval -errdev Error
+ */
 int bma4xx_spi_init(const struct device *dev);
+
+/**
+ * @brief Initialize the I2C bus
+ *
+ * @param dev bma4xx device pointer
+ *
+ * @retval 0 success
+ * @retval -errdev Error
+ */
 int bma4xx_i2c_init(const struct device *dev);
 
+/**
+ * @brief (Re)Configure the sensor with the given configuration
+ *
+ * @param dev bma4xx device pointer
+ * @param cfg bma4xx_runtime_config pointer
+ *
+ * @retval 0 success
+ * @retval -errno Error
+ */
+int bma4xx_configure(const struct device *dev, struct bma4xx_runtime_config *cfg);
+
+/**
+ * @brief Safely (re)Configure the sensor with the given configuration
+ *
+ * Will rollback to prior configuration if new configuration is invalid
+ *
+ * @param dev bma4xx device pointer
+ * @param cfg bma4xx_runtime_config pointer
+ *
+ * @retval 0 success
+ * @retval -errno Error
+ */
+int bma4xx_safely_configure(const struct device *dev, struct bma4xx_runtime_config *cfg);
+
 #endif /* ZEPHYR_DRIVERS_SENSOR_BMA4XX_BMA4XX_H_ */
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_common.c b/drivers/sensor/bosch/bma4xx/bma4xx_common.c
new file mode 100644
index 0000000000000..0609e9285db15
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_common.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT bosch_bma4xx
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor_clock.h>
+#include "bma4xx.h"
+#include "bma4xx_interrupt.h"
+#include "bma4xx_defs.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
+
+#ifdef CONFIG_BMA4XX_STREAM
+
+static uint16_t bma4xx_compute_fifo_wm(const struct bma4xx_runtime_config *new_cfg)
+{
+	int64_t odr;
+	int rc;
+	const bool accel_enabled = new_cfg->accel_pwr_mode != 0;
+	const bool aux_enabled = new_cfg->aux_pwr_mode != 0;
+
+	if (new_cfg->batch_ticks == 0 || !accel_enabled) {
+		return 0;
+	}
+
+	const int pkt_size = (accel_enabled && aux_enabled)
+				     ? BMA4XX_FIFO_MA_LENGTH + BMA4XX_FIFO_HEADER_LENGTH
+				     : BMA4XX_FIFO_A_LENGTH + BMA4XX_FIFO_HEADER_LENGTH;
+
+	struct sensor_value val = {0};
+
+	rc = bma4xx_accel_reg_to_hz(new_cfg->accel_odr, &val);
+
+	if (rc) {
+		LOG_ERR("Invalid ord value");
+		return -EINVAL;
+	}
+
+	/* Measured in Hz */
+	odr = sensor_value_to_micro(&val) / INT64_C(1000000);
+
+	/* Convert 'odr' to bytes * batch_ticks / sec */
+	odr *= (int64_t)new_cfg->batch_ticks * pkt_size;
+
+	/* 'odr' = byte_ticks_per_sec * sensor_ns_per_tick / NSEC_PER_SEC = bytes */
+	odr = DIV_ROUND_UP(sensor_clock_cycles_to_ns(odr), NSEC_PER_SEC);
+
+	return (uint16_t)MIN(odr, 0x3ff);
+}
+
+#endif /* CONFIG_BMA4XX_STREAM */
+
+int bma4xx_configure(const struct device *dev, struct bma4xx_runtime_config *cfg)
+{
+	struct bma4xx_data *dev_data = dev->data;
+	int res;
+	uint8_t value;
+
+	/* Disable interrupts, reconfigured at end */
+	res = dev_data->hw_ops->write_reg(dev, BMA4XX_REG_INT_MAP_DATA, 0);
+	__ASSERT(res == 0, "%s could not disable interrupts", __func__);
+
+	/* If FIFO is enabled now, disable and flush */
+	if (dev_data->cfg.fifo_en) {
+		res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_FIFO_CONFIG_1,
+						   FIELD_PREP(BMA4XX_FIFO_ACC_EN, 0));
+		__ASSERT(res == 0, "%s could not disable fifo acceleration", __func__);
+
+		res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_CMD,
+						   FIELD_PREP(BMA4XX_CMD_FIFO_FLUSH, 1));
+		__ASSERT(res == 0, "%s could not flush fifo", __func__);
+	}
+
+	/* Switch to performance power mode */
+	res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_ACCEL_CONFIG,
+					   FIELD_PREP(BMA4XX_BIT_ACC_PERF_MODE, 1));
+	__ASSERT(res == 0, "%s could not enable performance power mode", __func__);
+
+	/* Enable non-latch mode
+	 * Regarding the discussion in the Bosch Community, enabling latch mode on bma4xx
+	 * might result in multiple FIFO interrupts. Therefore, it is recommended to use
+	 * non-latch mode instead.
+	 * Reference:
+	 * https://community.bosch-sensortec.com/mems-sensors-forum-jrmujtaw/post/bma456-sends-multiple-fifo-interrupt-bma4-fifo-wm-int-vWCT2Uz7Alv6flK
+	 */
+	res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_INT_LATCH, 0);
+	__ASSERT(res == 0, "%s could not enable non-latch mode", __func__);
+
+	if (dev_data->cfg.accel_odr > 0) {
+		/* Enable accelerometer */
+		res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_POWER_CTRL,
+						   FIELD_PREP(BMA4XX_BIT_POWER_CTRL_ACC_EN, 1));
+		__ASSERT(res == 0, "%s could not enable accelerometer", __func__);
+	} else {
+		LOG_DBG("Sample rate is 0, accelerometer not enabled");
+	}
+
+	/* Disable advance power save mode */
+	res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_POWER_CONF,
+					   FIELD_PREP(BMA4XX_BIT_POWER_CONF_ADV_PWR_SAVE, 0));
+	__ASSERT(res == 0, "%s could not disable advance power save mode", __func__);
+
+	/* Write acceleration range */
+	res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_ACCEL_RANGE,
+					   FIELD_PREP(BMA4XX_MASK_ACC_RANGE, cfg->accel_fs_range));
+	__ASSERT(res == 0, "%s could not write acceleration range", __func__);
+
+	/* Write data rate and bandwidth */
+	uint8_t odr_bw_value = FIELD_PREP(BMA4XX_MASK_ACC_CONF_ODR, cfg->accel_odr) |
+			       FIELD_PREP(BMA4XX_MASK_ACC_CONF_BWP, cfg->accel_bwp);
+
+	res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_ACCEL_CONFIG, odr_bw_value);
+	__ASSERT(res == 0, "%s could not write data rate and bandwidth", __func__);
+
+	res |= dev_data->hw_ops->read_reg(dev, BMA4XX_REG_INT_STAT_1, &value);
+	__ASSERT(res == 0, "%s could not clear interrupt status", __func__);
+
+#ifdef CONFIG_BMA4XX_STREAM
+	if (cfg->fifo_en) {
+		LOG_INF("FIFO ENABLED");
+
+		/* Enable FIFO header mode and FIFO acceleration data and
+		 * disable FIFO auxiliary data.
+		 */
+		uint8_t fifo_config_1_value = FIELD_PREP(BMA4XX_FIFO_HEADER_EN, 1) |
+					      FIELD_PREP(BMA4XX_FIFO_ACC_EN, 1) |
+					      FIELD_PREP(BMA4XX_FIFO_AUX_EN, 0);
+
+		LOG_DBG("FIFO_CONFIG1 (0x%x) 0x%x", BMA4XX_REG_FIFO_CONFIG_1, fifo_config_1_value);
+		res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_FIFO_CONFIG_1,
+						   fifo_config_1_value);
+		__ASSERT(res == 0, "%s could not write fifo config 1", __func__);
+
+		uint8_t pwr_ctrl_value = 0;
+
+		res |= dev_data->hw_ops->read_reg(dev, BMA4XX_REG_POWER_CTRL, &pwr_ctrl_value);
+		__ASSERT(res == 0, "%s could not read power ctrl value", __func__);
+
+		cfg->accel_pwr_mode = FIELD_GET(BMA4XX_BIT_POWER_CTRL_ACC_EN, pwr_ctrl_value);
+		cfg->aux_pwr_mode = FIELD_GET(BMA4XX_BIT_POWER_CTRL_AUX_EN, pwr_ctrl_value);
+
+		/* Set watermark and interrupt handling first */
+		uint16_t fifo_wm = bma4xx_compute_fifo_wm(cfg);
+
+		__ASSERT(fifo_wm >= 0, "%s could not get valid watermark value", __func__);
+
+		uint8_t fifo_wml = fifo_wm & 0xFF;
+
+		LOG_DBG("FIFO_WTM_0( (0x%x)) (WM Low) 0x%x", BMA4XX_REG_FIFO_WTM_0, fifo_wml);
+		res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_FIFO_WTM_0, fifo_wml);
+		__ASSERT(res == 0, "%s could not write watermark level LSB", __func__);
+
+		uint8_t fifo_wmh = (fifo_wm >> 8) & 0x0F;
+
+		LOG_DBG("FIFO_WTM_1 (0x%x) (WM High) 0x%x", BMA4XX_REG_FIFO_WTM_1, fifo_wmh);
+		res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_FIFO_WTM_1, fifo_wmh);
+		__ASSERT(res == 0, "%s could not write watermark level MSB", __func__);
+
+		res |= bma4xx_enable_interrupt1(dev, cfg);
+		__ASSERT(res == 0, "%s could not enable interrupts", __func__);
+
+	} else {
+#endif /* CONFIG_BMA4XX_STREAM */
+		LOG_INF("FIFO DISABLED");
+
+		/* No fifo mode so set data ready as interrupt source */
+		uint8_t int_map_data = FIELD_PREP(BMA4XX_BIT_INT_MAP_DATA_INT1_DRDY, 1);
+
+		LOG_DBG("MAP_DATA (0x%x) 0x%x", BMA4XX_REG_INT_MAP_DATA, int_map_data);
+		res |= dev_data->hw_ops->write_reg(dev, BMA4XX_REG_INT_MAP_DATA, int_map_data);
+		__ASSERT(res == 0, "%s could not enable FIFO data ready interrupt", __func__);
+
+#ifdef CONFIG_BMA4XX_STREAM
+	}
+#endif /* CONFIG_BMA4XX_STREAM */
+
+	return res;
+}
+
+int bma4xx_safely_configure(const struct device *dev, struct bma4xx_runtime_config *cfg)
+{
+	struct bma4xx_data *drv_data = dev->data;
+	int ret = bma4xx_configure(dev, cfg);
+
+	if (ret == 0) {
+		memcpy(&drv_data->cfg, cfg, sizeof(struct bma4xx_runtime_config));
+	} else {
+		ret = bma4xx_configure(dev, &drv_data->cfg);
+	}
+
+	return ret;
+}
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_decoder.c b/drivers/sensor/bosch/bma4xx/bma4xx_decoder.c
new file mode 100644
index 0000000000000..58172173eca2d
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_decoder.c
@@ -0,0 +1,411 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT bosch_bma4xx
+
+#include "bma4xx_decoder.h"
+#include "bma4xx_defs.h"
+#include "bma4xx.h"
+#include <errno.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
+
+#define IS_ACCEL(chan)                                                                             \
+	((chan) == SENSOR_CHAN_ACCEL_X || (chan) == SENSOR_CHAN_ACCEL_Y ||                         \
+	 (chan) == SENSOR_CHAN_ACCEL_Z || (chan) == SENSOR_CHAN_ACCEL_XYZ)
+
+#ifdef CONFIG_BMA4XX_STREAM
+
+static uint64_t accel_period_ns[] = {
+	[BMA4XX_ODR_0_78125] = UINT64_C(100000000000000) / 78125,
+	[BMA4XX_ODR_1_5625] = UINT64_C(10000000000000) / 15625,
+	[BMA4XX_ODR_3_125] = UINT64_C(10000000000000) / 31250,
+	[BMA4XX_ODR_6_25] = UINT64_C(10000000000000) / 62500,
+	[BMA4XX_ODR_12_5] = UINT64_C(1000000000000) / 12500,
+	[BMA4XX_ODR_25] = UINT64_C(1000000000) / 25,
+	[BMA4XX_ODR_50] = UINT64_C(1000000000) / 50,
+	[BMA4XX_ODR_100] = UINT64_C(1000000000) / 100,
+	[BMA4XX_ODR_200] = UINT64_C(1000000000) / 200,
+	[BMA4XX_ODR_400] = UINT64_C(1000000000) / 400,
+	[BMA4XX_ODR_800] = UINT64_C(1000000000) / 800,
+	[BMA4XX_ODR_1600] = UINT64_C(10000000) / 16,
+	[BMA4XX_ODR_3200] = UINT64_C(10000000) / 32,
+	[BMA4XX_ODR_6400] = UINT64_C(10000000) / 64,
+	[BMA4XX_ODR_12800] = UINT64_C(10000000) / 128,
+};
+
+#endif /* CONFIG_BMA4XX_STREAM */
+
+/*
+ * RTIO decoder
+ */
+
+static int bma4xx_decoder_get_frame_count(const uint8_t *buffer, struct sensor_chan_spec ch,
+					  uint16_t *frame_count)
+{
+	const struct bma4xx_fifo_data *edata = (const struct bma4xx_fifo_data *)buffer;
+	const struct bma4xx_decoder_header *header = &edata->header;
+
+	if (ch.chan_idx != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!header->is_fifo) {
+		switch (ch.chan_type) {
+		case SENSOR_CHAN_ACCEL_X:
+		case SENSOR_CHAN_ACCEL_Y:
+		case SENSOR_CHAN_ACCEL_Z:
+		case SENSOR_CHAN_ACCEL_XYZ:
+		case SENSOR_CHAN_DIE_TEMP:
+			*frame_count = 1;
+			return 0;
+		default:
+			return -ENOTSUP;
+		}
+	}
+
+	if (!IS_ACCEL(ch.chan_type)) {
+		return -ENOTSUP;
+	}
+	/* Skip the header */
+	buffer += sizeof(struct bma4xx_fifo_data);
+
+	uint16_t count = 0;
+	const uint8_t *end = buffer + edata->fifo_count;
+
+	while (buffer < end) {
+		uint8_t size = BMA4XX_FIFO_HEADER_LENGTH;
+		const bool has_accel = FIELD_GET(BMA4XX_BIT_FIFO_HEADER_ACCEL, buffer[0]) == 1;
+		const bool has_aux = FIELD_GET(BMA4XX_BIT_FIFO_HEADER_AUX, buffer[0]) == 1;
+
+		if (FIELD_GET(BMA4XX_BIT_FIFO_HEADER_REGULAR, buffer[0])) {
+			if (has_accel && has_aux) {
+				size += BMA4XX_FIFO_MA_LENGTH;
+			} else if (has_accel) {
+				size += BMA4XX_FIFO_A_LENGTH;
+			} else if (has_aux) {
+				size += BMA4XX_FIFO_M_LENGTH;
+			}
+			++count;
+		} else if (FIELD_GET(BMA4XX_BIT_FIFO_HEADER_CONTROL, buffer[0])) {
+			if (FIELD_GET(BMA4XX_BIT_FIFO_HEADER_SENSORTIME, buffer[0])) {
+				size += BMA4XX_FIFO_ST_LENGTH;
+			} else if (FIELD_GET(BMA4XX_BIT_FIFO_HEAD_OVER_READ_MSB, buffer[0])) {
+				size = *end;
+			} else {
+				size += BMA4XX_FIFO_CF_LENGTH;
+			}
+		}
+
+		buffer += size;
+	}
+
+	*frame_count = count;
+
+	return 0;
+}
+
+static int bma4xx_decoder_get_size_info(struct sensor_chan_spec ch, size_t *base_size,
+					size_t *frame_size)
+{
+	switch (ch.chan_type) {
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+	case SENSOR_CHAN_ACCEL_XYZ:
+		*base_size = sizeof(struct sensor_three_axis_data);
+		*frame_size = sizeof(struct sensor_three_axis_sample_data);
+		return 0;
+	case SENSOR_CHAN_DIE_TEMP:
+		*base_size = sizeof(struct sensor_q31_data);
+		*frame_size = sizeof(struct sensor_q31_sample_data);
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int bma4xx_get_shift(struct sensor_chan_spec ch, uint8_t accel_fs, int8_t *shift)
+{
+	switch (ch.chan_type) {
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+	case SENSOR_CHAN_ACCEL_XYZ:
+		switch (accel_fs) {
+		case BMA4XX_RANGE_2G:
+			/* 2 G's = 19.62 m/s^2. Use shift of 5 (+/-32) */
+			*shift = 5;
+			return 0;
+		case BMA4XX_RANGE_4G:
+			*shift = 6;
+			return 0;
+		case BMA4XX_RANGE_8G:
+			*shift = 7;
+			return 0;
+		case BMA4XX_RANGE_16G:
+			*shift = 8;
+			return 0;
+		default:
+			return -EINVAL;
+		}
+	case SENSOR_CHAN_DIE_TEMP:
+		*shift = BMA4XX_TEMP_SHIFT;
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
+
+static void bma4xx_convert_raw_accel_to_q31(int16_t raw_val, q31_t *out)
+{
+	/* The full calculation is (assuming floating math):
+	 *   value_ms2 = raw_value * range * 9.80665 / BIT(11)
+	 * We can treat 'range * 9.80665' as a scale, the scale is calculated by first getting 1g
+	 * represented as a q31 value with the same shift as our result:
+	 *   1g = (9.80665 * BIT(31)) >> shift
+	 * Next, we need to multiply it by our range in g, which for this driver is one of
+	 * [2, 4, 8, 16] and maps to a left shift of [1, 2, 3, 4]:
+	 *   1g <<= log2(range)
+	 * Note we used a right shift by 'shift' and left shift by log2(range). 'shift' is
+	 * [5, 6, 7, 8] for range values [2, 4, 8, 16] since it's the final shift in m/s2. It is
+	 * calculated via:
+	 *   shift = ceil(log2(range * 9.80665))
+	 * This means that we can shorten the above 1g alterations to:
+	 *   1g = (1g >> ceil(log2(range * 9.80665))) << log2(range)
+	 * For the range values [2, 4, 8, 16], the following is true:
+	 *   (x >> ceil(log2(range * 9.80665))) << log2(range)
+	 *   = x >> 4
+	 * Since the range cancels out in the right and left shift, we've now reduced the following:
+	 *   range * 9.80665 = 9.80665 * BIT(31 - 4)
+	 * All that's left is to divide by the bma4xx's maximum range BIT(11).
+	 */
+
+	int16_t value = (int16_t)sys_le16_to_cpu(raw_val << 4) >> 4;
+
+	const int64_t scale = (int64_t)(9.80665 * BIT64(31 - 4));
+
+	*out = CLAMP(((int64_t)value * scale) >> 11, INT32_MIN, INT32_MAX);
+}
+
+#ifdef CONFIG_BMA4XX_STREAM
+
+static void bma4xx_unpack_accel_data(const uint8_t *pkt, uint8_t data_start_index, q31_t *out)
+{
+	uint8_t offset = BMA4XX_FIFO_HEADER_LENGTH + (data_start_index * 2);
+	const bool has_aux = FIELD_GET(BMA4XX_BIT_FIFO_HEADER_AUX, pkt[0]) == 1;
+
+	if (has_aux) {
+		offset += BMA4XX_FIFO_M_LENGTH;
+	}
+
+	int16_t value = (pkt[offset + 1] << 4) | FIELD_GET(GENMASK(7, 4), pkt[offset]);
+
+	bma4xx_convert_raw_accel_to_q31((int16_t)value, out);
+}
+
+#endif /* CONFIG_BMA4XX_STREAM */
+
+#ifdef CONFIG_BMA4XX_TEMPERATURE
+/**
+ * @brief Convert the 8-bit temp register value into a Q31 celsius value
+ */
+static void bma4xx_convert_raw_temp_to_q31(int8_t raw_val, q31_t *out)
+{
+	/* Value of 0 equals 23 degrees C. Each bit count equals 1 degree C */
+
+	int64_t intermediate =
+		((int64_t)raw_val + 23) * ((int64_t)INT32_MAX + 1) / (1 << BMA4XX_TEMP_SHIFT);
+
+	*out = CLAMP(intermediate, INT32_MIN, INT32_MAX);
+}
+#endif /* CONFIG_BMA4XX_TEMPERATURE */
+
+static int bma4xx_one_shot_decode(const uint8_t *buffer, struct sensor_chan_spec ch, uint32_t *fit,
+				  uint16_t max_count, void *data_out)
+{
+	const struct bma4xx_encoded_data *edata = (const struct bma4xx_encoded_data *)buffer;
+	const struct bma4xx_decoder_header *header = &edata->header;
+	int16_t raw_x, raw_y, raw_z;
+	int rc;
+
+	if (*fit != 0) {
+		return 0;
+	}
+	if (max_count == 0 || ch.chan_idx != 0) {
+		return -EINVAL;
+	}
+
+	switch (ch.chan_type) {
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+	case SENSOR_CHAN_ACCEL_XYZ: {
+		struct sensor_three_axis_data *out = (struct sensor_three_axis_data *)data_out;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+		rc = bma4xx_get_shift((struct sensor_chan_spec){.chan_type = SENSOR_CHAN_ACCEL_XYZ,
+								.chan_idx = 3},
+				      header->accel_fs, &out->shift);
+		if (rc != 0) {
+			return -EINVAL;
+		}
+
+		raw_x = (((int16_t)edata->accel_xyz_raw_data[1]) << 4) |
+			FIELD_GET(GENMASK(7, 4), edata->accel_xyz_raw_data[0]);
+		raw_y = (((int16_t)edata->accel_xyz_raw_data[3]) << 4) |
+			FIELD_GET(GENMASK(7, 4), edata->accel_xyz_raw_data[2]);
+		raw_z = (((int16_t)edata->accel_xyz_raw_data[5]) << 4) |
+			FIELD_GET(GENMASK(7, 4), edata->accel_xyz_raw_data[4]);
+
+		bma4xx_convert_raw_accel_to_q31(raw_x, &out->readings[0].x);
+		bma4xx_convert_raw_accel_to_q31(raw_y, &out->readings[0].y);
+		bma4xx_convert_raw_accel_to_q31(raw_z, &out->readings[0].z);
+
+		*fit = 1;
+		return 1;
+	}
+#ifdef CONFIG_BMA4XX_TEMPERATURE
+	case SENSOR_CHAN_DIE_TEMP: {
+		struct sensor_q31_data *out = (struct sensor_q31_data *)data_out;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+		rc = bma4xx_get_shift((struct sensor_chan_spec){.chan_type = SENSOR_CHAN_DIE_TEMP,
+								.chan_idx = 12},
+				      0, &out->shift);
+
+		if (rc != 0) {
+			return -EINVAL;
+		}
+
+		bma4xx_convert_raw_temp_to_q31(edata->temp, &out->readings[0].temperature);
+
+		*fit = 1;
+		return 1;
+	}
+#endif /* CONFIG_BMA4XX_TEMPERATURE */
+	default:
+		return -EINVAL;
+	}
+}
+
+#ifdef CONFIG_BMA4XX_STREAM
+
+static int bma4xx_fifo_decode(const uint8_t *buffer, struct sensor_chan_spec ch, uint32_t *fit,
+			      uint16_t max_count, void *data_out)
+{
+	const struct bma4xx_fifo_data *edata = (const struct bma4xx_fifo_data *)buffer;
+	const uint8_t *buffer_end = buffer + sizeof(struct bma4xx_fifo_data) + edata->fifo_count;
+	int accel_frame_count = 0;
+	int count = 0;
+
+	if ((uintptr_t)buffer_end <= *fit || ch.chan_idx != 0) {
+		return 0;
+	}
+
+	if (!IS_ACCEL(ch.chan_type)) {
+		return -ENOTSUP;
+	}
+
+	((struct sensor_data_header *)data_out)->base_timestamp_ns = edata->header.timestamp;
+
+	buffer += sizeof(struct bma4xx_fifo_data);
+
+	while (count < max_count && buffer < buffer_end) {
+		const bool has_accel = FIELD_GET(BMA4XX_BIT_FIFO_HEADER_ACCEL, buffer[0]) == 1;
+		const bool has_aux = FIELD_GET(BMA4XX_BIT_FIFO_HEADER_AUX, buffer[0]) == 1;
+		const uint8_t *frame_end = buffer;
+
+		if (FIELD_GET(BMA4XX_BIT_FIFO_HEADER_REGULAR, buffer[0])) {
+			if (has_accel && has_aux) {
+				frame_end += BMA4XX_FIFO_MA_LENGTH + BMA4XX_FIFO_HEADER_LENGTH;
+				accel_frame_count++;
+			} else if (has_accel) {
+				frame_end += BMA4XX_FIFO_A_LENGTH + BMA4XX_FIFO_HEADER_LENGTH;
+				accel_frame_count++;
+			} else if (has_aux) {
+				frame_end += BMA4XX_FIFO_M_LENGTH + BMA4XX_FIFO_HEADER_LENGTH;
+			}
+		} else if (FIELD_GET(BMA4XX_BIT_FIFO_HEADER_CONTROL, buffer[0])) {
+			if (FIELD_GET(BMA4XX_BIT_FIFO_HEADER_SENSORTIME, buffer[0])) {
+				frame_end += BMA4XX_FIFO_ST_LENGTH + BMA4XX_FIFO_HEADER_LENGTH;
+			} else if (FIELD_GET(BMA4XX_BIT_FIFO_HEAD_OVER_READ_MSB, buffer[0])) {
+				frame_end = buffer_end;
+			} else {
+				frame_end += BMA4XX_FIFO_CF_LENGTH + BMA4XX_FIFO_HEADER_LENGTH;
+			}
+		}
+
+		if ((uintptr_t)buffer < *fit) {
+			/* This frame was already decoded, move on to the next frame */
+			buffer = frame_end;
+			continue;
+		}
+
+		if (has_accel) {
+			struct sensor_three_axis_data *data =
+				(struct sensor_three_axis_data *)data_out;
+
+			uint64_t period_ns = accel_period_ns[edata->accel_odr];
+
+			bma4xx_get_shift(
+				(struct sensor_chan_spec){.chan_type = SENSOR_CHAN_ACCEL_XYZ,
+							  .chan_idx = 3},
+				edata->header.accel_fs, &data->shift);
+			data->readings[count].timestamp_delta = (accel_frame_count - 1) * period_ns;
+			bma4xx_unpack_accel_data(buffer, 0, &data->readings[count].x);
+			bma4xx_unpack_accel_data(buffer, 1, &data->readings[count].y);
+			bma4xx_unpack_accel_data(buffer, 2, &data->readings[count].z);
+		}
+
+		buffer = frame_end;
+		*fit = (uintptr_t)frame_end;
+		count++;
+	}
+
+	return count;
+}
+
+#endif /* CONFIG_BMA4XX_STREAM */
+
+static int bma4xx_decoder_decode(const uint8_t *buffer, struct sensor_chan_spec ch, uint32_t *fit,
+				 uint16_t max_count, void *data_out)
+{
+#ifdef CONFIG_BMA4XX_STREAM
+
+	const struct bma4xx_decoder_header *header = (const struct bma4xx_decoder_header *)buffer;
+
+	if (header->is_fifo) {
+		return bma4xx_fifo_decode(buffer, ch, fit, max_count, data_out);
+	}
+#endif
+
+	return bma4xx_one_shot_decode(buffer, ch, fit, max_count, data_out);
+}
+
+static bool bma4xx_decoder_has_trigger(const uint8_t *buffer, enum sensor_trigger_type trigger)
+{
+	return false;
+}
+
+SENSOR_DECODER_API_DT_DEFINE() = {
+	.get_frame_count = bma4xx_decoder_get_frame_count,
+	.get_size_info = bma4xx_decoder_get_size_info,
+	.decode = bma4xx_decoder_decode,
+	.has_trigger = bma4xx_decoder_has_trigger,
+};
+
+int bma4xx_get_decoder(const struct device *dev, const struct sensor_decoder_api **decoder)
+{
+	ARG_UNUSED(dev);
+	*decoder = &SENSOR_DECODER_NAME();
+
+	return 0;
+}
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_decoder.h b/drivers/sensor/bosch/bma4xx/bma4xx_decoder.h
new file mode 100644
index 0000000000000..5be6883ecc8c7
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_decoder.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMA4XX_DECODER_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMA4XX_DECODER_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/sensor.h>
+
+/*
+ * RTIO types
+ */
+
+struct bma4xx_decoder_header {
+	uint64_t timestamp;
+	uint8_t is_fifo: 1;
+	uint8_t accel_fs: 2;
+	uint8_t reserved: 5;
+} __attribute__((__packed__));
+
+struct bma4xx_fifo_data {
+	struct bma4xx_decoder_header header;
+	uint8_t int_status;
+	uint16_t accel_odr: 4;
+	uint16_t fifo_count: 10;
+	uint16_t reserved: 1;
+} __attribute__((__packed__));
+
+struct bma4xx_encoded_data {
+	struct bma4xx_decoder_header header;
+	uint8_t accel_xyz_raw_data[6];
+#ifdef CONFIG_BMA4XX_TEMPERATURE
+	int8_t temp;
+#endif /* CONFIG_BMA4XX_TEMPERATURE */
+};
+
+int bma4xx_get_decoder(const struct device *dev, const struct sensor_decoder_api **decoder);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMA4XX_DECODER_H_ */
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_defs.h b/drivers/sensor/bosch/bma4xx/bma4xx_defs.h
new file mode 100644
index 0000000000000..243b8eafd3e88
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_defs.h
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMA4XX_REG_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMA4XX_REG_H_
+
+#include <zephyr/sys/util.h>
+
+/*
+ * Register definitions
+ */
+
+#define BMA4XX_REG_CHIP_ID         (0x00)
+#define BMA4XX_REG_ERROR           (0x02)
+#define BMA4XX_REG_STATUS          (0x03)
+#define BMA4XX_REG_DATA_0          (0x0A)
+#define BMA4XX_REG_DATA_1          (0x0B)
+#define BMA4XX_REG_DATA_2          (0x0C)
+#define BMA4XX_REG_DATA_3          (0x0D)
+#define BMA4XX_REG_DATA_4          (0x0E)
+#define BMA4XX_REG_DATA_5          (0x0F)
+#define BMA4XX_REG_DATA_6          (0x10)
+#define BMA4XX_REG_DATA_7          (0x11)
+#define BMA4XX_REG_DATA_8          (0x12)
+#define BMA4XX_REG_DATA_9          (0x13)
+#define BMA4XX_REG_DATA_10         (0x14)
+#define BMA4XX_REG_DATA_11         (0x15)
+#define BMA4XX_REG_DATA_12         (0x16)
+#define BMA4XX_REG_DATA_13         (0x17)
+#define BMA4XX_REG_SENSORTIME_0    (0x18)
+#define BMA4XX_REG_EVENT           (0x1B)
+#define BMA4XX_REG_INT_STAT_0      (0x1C)
+#define BMA4XX_REG_INT_STAT_1      (0x1D)
+#define BMA4XX_REG_STEP_CNT_OUT_0  (0x1E)
+#define BMA4XX_REG_HIGH_G_OUT      (0x1F)
+#define BMA4XX_REG_TEMPERATURE     (0x22)
+#define BMA4XX_REG_FIFO_LENGTH_0   (0x24)
+#define BMA4XX_REG_FIFO_LENGTH_1   (0x25)
+#define BMA4XX_REG_FIFO_DATA       (0x26)
+#define BMA4XX_REG_ACTIVITY_OUT    (0x27)
+#define BMA4XX_REG_ORIENTATION_OUT (0x28)
+#define BMA4XX_REG_ACCEL_CONFIG    (0x40)
+#define BMA4XX_REG_ACCEL_RANGE     (0x41)
+#define BMA4XX_REG_AUX_CONFIG      (0x44)
+#define BMA4XX_REG_FIFO_DOWN       (0x45)
+#define BMA4XX_REG_FIFO_WTM_0      (0x46)
+#define BMA4XX_REG_FIFO_WTM_1      (0x47)
+#define BMA4XX_REG_FIFO_CONFIG_0   (0x48)
+#define BMA4XX_REG_FIFO_CONFIG_1   (0x49)
+#define BMA4XX_REG_AUX_DEV_ID      (0x4B)
+#define BMA4XX_REG_AUX_IF_CONF     (0x4C)
+#define BMA4XX_REG_AUX_RD          (0x4D)
+#define BMA4XX_REG_AUX_WR          (0x4E)
+#define BMA4XX_REG_AUX_WR_DATA     (0x4F)
+#define BMA4XX_REG_INT1_IO_CTRL    (0x53)
+#define BMA4XX_REG_INT2_IO_CTRL    (0x54)
+#define BMA4XX_REG_INT_LATCH       (0x55)
+#define BMA4XX_REG_INT_MAP_1       (0x56)
+#define BMA4XX_REG_INT_MAP_2       (0x57)
+#define BMA4XX_REG_INT_MAP_DATA    (0x58)
+#define BMA4XX_REG_INIT_CTRL       (0x59)
+#define BMA4XX_REG_RESERVED_REG_5B (0x5B)
+#define BMA4XX_REG_RESERVED_REG_5C (0x5C)
+#define BMA4XX_REG_FEATURE_CONFIG  (0x5E)
+#define BMA4XX_REG_IF_CONFIG       (0x6B)
+#define BMA4XX_REG_ACC_SELF_TEST   (0x6D)
+#define BMA4XX_REG_NV_CONFIG       (0x70)
+#define BMA4XX_REG_OFFSET_0        (0x71)
+#define BMA4XX_REG_OFFSET_1        (0x72)
+#define BMA4XX_REG_OFFSET_2        (0x73)
+#define BMA4XX_REG_POWER_CONF      (0x7C)
+#define BMA4XX_REG_POWER_CTRL      (0x7D)
+#define BMA4XX_REG_CMD             (0x7E)
+
+/* BMA4xx I2C register */
+#define BMA4XX_REG_I2C_SDO_HIGH (0x19)
+#define BMA4XX_REG_I2C_SDO_LOW  (0x18)
+
+/*
+ * Bit positions and masks
+ */
+
+#define BMA4XX_REG_ADDRESS_MASK GENMASK(7, 0)
+
+#define BMA4XX_BIT_ADV_PWR_SAVE BIT(0)
+
+#define BMA4XX_MASK_ACC_CONF_ODR  GENMASK(3, 0)
+#define BMA4XX_MASK_ACC_CONF_BWP  GENMASK(6, 4)
+#define BMA4XX_SHIFT_ACC_CONF_BWP (4)
+
+#define BMA4XX_MASK_ACC_RANGE GENMASK(1, 0)
+
+#define BMA4XX_BIT_ACC_PERF_MODE BIT(7)
+
+/* CMD: Clears all data in FIFO, does not change FIFO_CONFIG and FIFO_DOWNS register */
+#define BMA4XX_CMD_FIFO_FLUSH (0xB0)
+
+/* BMA4xx EVENT bit definition */
+#define BMA4XX_BIT_POR_DETECTED BIT(0)
+
+/* BMA4xx INT1_IO_CTRL bit definition */
+#define BMA4XX_BIT_INT1_IO_CTRL_EDGE_CTRL BIT(0)
+#define BMA4XX_BIT_INT1_IO_CTRL_LVL       BIT(1)
+#define BMA4XX_BIT_INT1_IO_CTRL_OD        BIT(2)
+#define BMA4XX_BIT_INT1_IO_CTRL_OUTPUT_EN BIT(3)
+#define BMA4XX_BIT_INT1_IO_CTRL_INPUT_EN  BIT(4)
+
+/* BMA4xx INT_MAP_DATA bit definition */
+#define BMA4XX_BIT_INT_MAP_DATA_INT1_FFUL BIT(0)
+#define BMA4XX_BIT_INT_MAP_DATA_INT1_FWM  BIT(1)
+#define BMA4XX_BIT_INT_MAP_DATA_INT1_DRDY BIT(2)
+
+/* BMA4xx INT_STATUS_1 bit definition */
+#define BMA4XX_BIT_INT_STAT_1_FFULL_INT    BIT(0)
+#define BMA4XX_BIT_INT_STAT_1_FWM_INT      BIT(1)
+#define BMA4XX_BIT_INT_STAT_1_ACC_DRDY_INT BIT(7)
+
+/* BMA4xx PWR_CTRL bit definition */
+#define BMA4XX_BIT_POWER_CTRL_AUX_EN BIT(0)
+#define BMA4XX_BIT_POWER_CTRL_ACC_EN BIT(2)
+
+/* BMA4xx PWR_CONF bit definition */
+#define BMA4XX_BIT_POWER_CONF_ADV_PWR_SAVE BIT(0)
+
+/* BMA4xx EVENT bit definition */
+#define BMA4XX_BIT_EVENT_POR_DETECTED BIT(0)
+
+/* BMA4xx FIFO_CONFIG_1 bit definition */
+#define BMA4XX_FIFO_ACC_EN    BIT(6)
+#define BMA4XX_FIFO_AUX_EN    BIT(5)
+#define BMA4XX_FIFO_HEADER_EN BIT(4)
+
+/* Bandwidth parameters */
+#define BMA4XX_BWP_OSR4_AVG1  (0x0)
+#define BMA4XX_BWP_OSR2_AVG2  (0x1)
+#define BMA4XX_BWP_NORM_AVG4  (0x2)
+#define BMA4XX_BWP_CIC_AVG8   (0x3)
+#define BMA4XX_BWP_RES_AVG16  (0x4)
+#define BMA4XX_BWP_RES_AVG32  (0x5)
+#define BMA4XX_BWP_RES_AVG64  (0x6)
+#define BMA4XX_BWP_RES_AVG128 (0x7)
+
+/* Full-scale ranges */
+#define BMA4XX_RANGE_2G  (0x0)
+#define BMA4XX_RANGE_4G  (0x1)
+#define BMA4XX_RANGE_8G  (0x2)
+#define BMA4XX_RANGE_16G (0x3)
+
+/* Output data rates (ODR) */
+#define BMA4XX_ODR_RESERVED (0x00)
+#define BMA4XX_ODR_0_78125  (0x01)
+#define BMA4XX_ODR_1_5625   (0x02)
+#define BMA4XX_ODR_3_125    (0x03)
+#define BMA4XX_ODR_6_25     (0x04)
+#define BMA4XX_ODR_12_5     (0x05)
+#define BMA4XX_ODR_25       (0x06)
+#define BMA4XX_ODR_50       (0x07)
+#define BMA4XX_ODR_100      (0x08)
+#define BMA4XX_ODR_200      (0x09)
+#define BMA4XX_ODR_400      (0x0a)
+#define BMA4XX_ODR_800      (0x0b)
+#define BMA4XX_ODR_1600     (0x0c)
+#define BMA4XX_ODR_3200     (0x0d)
+#define BMA4XX_ODR_6400     (0x0e)
+#define BMA4XX_ODR_12800    (0x0f)
+
+/* BMA4xx soft-reset commands */
+#define BMA4XX_CMD_SOFT_RESET (0xB6)
+
+/* BMA4xx chip id */
+#define BMA4XX_CHIP_ID_BMA422 (0x12)
+#define BMA4XX_CHIP_ID_BMA423 (0x13)
+
+#define BMA4XX_REG_I2C_READ_BIT BIT(7)
+
+/*
+ * BMA4xx FIFO Header bit definition
+ */
+
+/* fh_parm, regular */
+#define BMA4XX_BIT_FIFO_HEADER_ACCEL BIT(2)
+#define BMA4XX_BIT_FIFO_HEADER_AUX   BIT(4)
+
+/* fh_mode */
+#define BMA4XX_BIT_FIFO_HEADER_CONTROL BIT(6)
+#define BMA4XX_BIT_FIFO_HEADER_REGULAR BIT(7)
+
+/* fh_parm, control */
+#define BMA4XX_BIT_FIFO_HEADER_SENSORTIME  BIT(2)
+#define BMA4XX_BIT_FIFO_HEAD_OVER_READ_MSB BIT(5)
+
+/*
+ * Other constants
+ */
+
+/* BMA4xx FIFO Length definition */
+#define BMA4XX_FIFO_HEADER_LENGTH UINT8_C(1)
+#define BMA4XX_FIFO_A_LENGTH      UINT8_C(6)
+#define BMA4XX_FIFO_M_LENGTH      UINT8_C(8)
+#define BMA4XX_FIFO_MA_LENGTH     UINT8_C(14)
+#define BMA4XX_FIFO_ST_LENGTH     UINT8_C(3)
+#define BMA4XX_FIFO_CF_LENGTH     UINT8_C(1)
+#define BMA4XX_FIFO_DATA_LENGTH   UINT8_C(2)
+
+/* Each bit count is 3.9mG or 3900uG */
+#define BMA4XX_OFFSET_MICROG_PER_BIT (3900)
+#define BMA4XX_OFFSET_MICROG_MIN     (INT8_MIN * BMA4XX_OFFSET_MICROG_PER_BIT)
+#define BMA4XX_OFFSET_MICROG_MAX     (INT8_MAX * BMA4XX_OFFSET_MICROG_PER_BIT)
+
+/* Range is -104C to 150C. Use shift of 8 (+/-256) */
+#define BMA4XX_TEMP_SHIFT (8)
+
+/* The total number of used registers specified in bma422 datasheet is 7E */
+#define BMA4XX_NUM_REGS 0x7E
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMA4XX_REG_H_ */
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_emul.c b/drivers/sensor/bosch/bma4xx/bma4xx_emul.c
index ec5f069da536e..65818c91767a9 100644
--- a/drivers/sensor/bosch/bma4xx/bma4xx_emul.c
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_emul.c
@@ -22,7 +22,7 @@
 
 #define DT_DRV_COMPAT bosch_bma4xx
 
-LOG_MODULE_REGISTER(bma4xx_emul, CONFIG_SENSOR_LOG_LEVEL);
+LOG_MODULE_DECLARE(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
 
 struct bma4xx_emul_data {
 	/* Holds register data. */
@@ -44,6 +44,7 @@ void bma4xx_emul_set_reg(const struct emul *target, uint8_t reg_addr, const uint
 void bma4xx_emul_get_reg(const struct emul *target, uint8_t reg_addr, uint8_t *val, size_t count)
 {
 	struct bma4xx_emul_data *data = target->data;
+	LOG_INF("*** bma4xx_emul_get_reg: %x, %d", reg_addr, count);
 
 	__ASSERT_NO_MSG(reg_addr + count <= BMA4XX_NUM_REGS);
 	memcpy(val, data->regs + reg_addr, count);
@@ -125,11 +126,11 @@ static int bma4xx_emul_write_byte(const struct emul *target, int reg, uint8_t va
 		data->regs[reg] = val;
 		return 0;
 	case BMA4XX_REG_POWER_CTRL:
-		if ((val & ~BMA4XX_BIT_ACC_EN) != 0) {
+		if ((val & ~BMA4XX_BIT_POWER_CTRL_ACC_EN) != 0) {
 			LOG_ERR("unhandled bits in POWER_CTRL write: %#x", val);
 			return -ENOTSUP;
 		}
-		data->regs[reg] = (val & BMA4XX_BIT_ACC_EN) != 0;
+		data->regs[reg] = (val & BMA4XX_BIT_POWER_CTRL_ACC_EN) != 0;
 		return 0;
 	case BMA4XX_REG_CMD:
 		if (val == BMA4XX_CMD_FIFO_FLUSH) { /* fifo_flush */
@@ -151,6 +152,7 @@ static int bma4xx_emul_init(const struct emul *target, const struct device *pare
 
 	data->regs[BMA4XX_REG_CHIP_ID] = BMA4XX_CHIP_ID_BMA422;
 	data->regs[BMA4XX_REG_ACCEL_RANGE] = BMA4XX_RANGE_4G;
+	data->regs[BMA4XX_REG_EVENT] = 0x01;
 
 	return 0;
 }
@@ -209,6 +211,8 @@ void bma4xx_emul_set_accel_data(const struct emul *target, q31_t value, int8_t s
 
 	intermediate /= accel_range;
 
+	intermediate = intermediate > 0 ? intermediate + 1 : intermediate;
+
 	reg_val = CLAMP(intermediate, -2048, 2047);
 
 	/* lsb register uses top 12 of 16 bits to hold value so shift by 4 to fill it */
@@ -245,7 +249,7 @@ static int bma4xx_emul_backend_set_channel(const struct emul *target, struct sen
 	}
 
 	/* Set data ready flag */
-	data->regs[BMA4XX_REG_INT_STAT_1] |= BMA4XX_ACC_DRDY_INT;
+	data->regs[BMA4XX_REG_INT_STAT_1] |= BMA4XX_BIT_INT_STAT_1_ACC_DRDY_INT;
 
 	return 0;
 }
@@ -270,34 +274,36 @@ static int bma4xx_emul_backend_get_sample_range(const struct emul *target,
 
 	struct bma4xx_emul_data *data = target->data;
 
+	int16_t upper_bound_scale = (BIT(11) - 1);
+
 	switch (data->regs[BMA4XX_REG_ACCEL_RANGE]) {
 	case BMA4XX_RANGE_2G:
 		*shift = 5;
-		*upper = (q31_t)(2 * 9.80665 * BIT(31 - 5));
-		*lower = -*upper;
-		/* (1 << (31 - shift) >> 12) * 2 (where 2 comes from 2g range) */
-		*epsilon = BIT(31 - 5 - 12 + 1);
+		*upper = (q31_t)(2 * 9.80665 * upper_bound_scale * BIT(31 - 11 - 5));
+		*lower = -(q31_t)(2 * 9.80665 * BIT(31 - 5));
+		/* (1 << (31 - shift) >> 11) * 2 (where 2 comes from 2g range) */
+		*epsilon = 9.80665 * BIT(31 - 5 - 11 + 1);
 		break;
 	case BMA4XX_RANGE_4G:
 		*shift = 6;
-		*upper = (q31_t)(4 * 9.80665 * BIT(31 - 6));
-		*lower = -*upper;
-		/* (1 << (31 - shift) >> 12) * 4 (where 4 comes from 4g range) */
-		*epsilon = BIT(31 - 6 - 12 + 2);
+		*upper = (q31_t)(4 * 9.80665 * upper_bound_scale * BIT(31 - 11 - 6));
+		*lower = -(q31_t)(4 * 9.80665 * BIT(31 - 6));
+		/* (1 << (31 - shift) >> 11) * 4 (where 4 comes from 4g range) */
+		*epsilon = 9.80665 * BIT(31 - 6 - 11 + 2);
 		break;
 	case BMA4XX_RANGE_8G:
 		*shift = 7;
-		*upper = (q31_t)(8 * 9.80665 * BIT(31 - 7));
-		*lower = -*upper;
-		/* (1 << (31 - shift) >> 12) * 8 (where 8 comes from 8g range) */
-		*epsilon = BIT(31 - 7 - 12 + 3);
+		*upper = (q31_t)(8 * 9.80665 * upper_bound_scale * BIT(31 - 11 - 7));
+		*lower = -(q31_t)(8 * 9.80665 * BIT(31 - 7));
+		/* (1 << (31 - shift) >> 11) * 8 (where 8 comes from 8g range) */
+		*epsilon = 9.80665 * BIT(31 - 7 - 11 + 3);
 		break;
 	case BMA4XX_RANGE_16G:
 		*shift = 8;
-		*upper = (q31_t)(16 * 9.80665 * BIT(31 - 8));
-		*lower = -*upper;
-		/* (1 << (31 - shift) >> 12) * 16 (where 16 comes from 16g range) */
-		*epsilon = BIT(31 - 8 - 12 + 4);
+		*upper = (q31_t)(16 * 9.80665 * upper_bound_scale * BIT(31 - 11 - 8));
+		*lower = -(q31_t)(16 * 9.80665 * BIT(31 - 8));
+		/* (1 << (31 - shift) >> 11) * 16 (where 16 comes from 16g range) */
+		*epsilon = 9.80665 * BIT(31 - 8 - 11 + 4);
 		break;
 	default:
 		return -ENOTSUP;
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_i2c.c b/drivers/sensor/bosch/bma4xx/bma4xx_i2c.c
index e21631c45fe1a..321be8cc232d8 100644
--- a/drivers/sensor/bosch/bma4xx/bma4xx_i2c.c
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_i2c.c
@@ -29,9 +29,26 @@ static int bma4xx_i2c_write_data(const struct device *dev, uint8_t reg_addr,
 				  uint8_t *value, uint8_t len)
 {
 	const struct bma4xx_config *cfg = dev->config;
+	const struct bma4xx_data *bma4xx = dev->data;
+	int res = 0;
 
-	return i2c_burst_write_dt(&cfg->bus_cfg.i2c, reg_addr, value,
-				  len);
+	res = i2c_burst_write_dt(&cfg->bus_cfg.i2c, reg_addr, value, len);
+	if (res) {
+		LOG_ERR("Could not perform i2c write data");
+		return -ENOTSUP;
+	}
+
+	/* A 1.3us delay is required after write operation when device operates in
+	 * power performance mode whereas 1000us is required when the device operates
+	 * in low power mode.
+	 */
+	if (bma4xx->cfg.accel_pwr_mode) {
+		k_sleep(K_NSEC(1300));
+	} else {
+		k_sleep(K_USEC(1000));
+	}
+
+	return 0;
 }
 
 static int bma4xx_i2c_read_reg(const struct device *dev, uint8_t reg_addr,
@@ -46,16 +63,51 @@ static int bma4xx_i2c_write_reg(const struct device *dev, uint8_t reg_addr,
 				uint8_t value)
 {
 	const struct bma4xx_config *cfg = dev->config;
+	const struct bma4xx_data *bma4xx = dev->data;
+	int res = 0;
+
+	res = i2c_reg_write_byte_dt(&cfg->bus_cfg.i2c, reg_addr, value);
+	if (res) {
+		LOG_ERR("Could not perform i2c write reg");
+		return -ENOTSUP;
+	}
 
-	return i2c_reg_write_byte_dt(&cfg->bus_cfg.i2c, reg_addr, value);
+	/* A 1.3us delay is required after write operation when device operates in
+	 * power performance mode whereas 1000us is required when the device operates
+	 * in low power mode.
+	 */
+	if (bma4xx->cfg.accel_pwr_mode) {
+		k_sleep(K_NSEC(1300));
+	} else {
+		k_sleep(K_USEC(1000));
+	}
+
+	return 0;
 }
 
 static int bma4xx_i2c_update_reg(const struct device *dev, uint8_t reg_addr,
 				  uint8_t mask, uint8_t value)
 {
 	const struct bma4xx_config *cfg = dev->config;
+	const struct bma4xx_data *bma4xx = dev->data;
+	int res = 0;
 
-	return i2c_reg_update_byte_dt(&cfg->bus_cfg.i2c, reg_addr, mask, value);
+	res = i2c_reg_update_byte_dt(&cfg->bus_cfg.i2c, reg_addr, mask, value);
+	if (res) {
+		LOG_ERR("Could not perform i2c update data");
+		return -ENOTSUP;
+	}
+
+	/* A 1.3us delay is required after write operation when device operates in
+	 * power performance mode whereas 1000us is required when the device operates
+	 * in low power mode.
+	 */
+	if (bma4xx->cfg.accel_pwr_mode) {
+		k_sleep(K_NSEC(1300));
+	} else {
+		k_sleep(K_USEC(1000));
+	}
+	return 0;
 }
 
 static const struct bma4xx_hw_operations i2c_ops = {
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_interrupt.c b/drivers/sensor/bosch/bma4xx/bma4xx_interrupt.c
new file mode 100644
index 0000000000000..4eacdb3059f58
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_interrupt.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT bosch_bma4xx
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
+
+#include "bma4xx.h"
+#include "bma4xx_interrupt.h"
+#include "bma4xx_defs.h"
+#include "bma4xx_rtio.h"
+
+LOG_MODULE_DECLARE(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
+
+#ifdef CONFIG_BMA4XX_STREAM
+
+static void bma4xx_gpio_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
+{
+	struct bma4xx_data *data = CONTAINER_OF(cb, struct bma4xx_data, gpio_cb);
+
+	ARG_UNUSED(dev);
+	ARG_UNUSED(pins);
+
+	bma4xx_fifo_event(data->dev);
+}
+
+int bma4xx_init_interrupt(const struct device *dev)
+{
+	struct bma4xx_data *data = dev->data;
+	const struct bma4xx_config *cfg = dev->config;
+	int ret = 0;
+
+	if (!cfg->gpio_interrupt.port) {
+		LOG_ERR("Stream enabled but no interrupt gpio supplied");
+		return -ENODEV;
+	}
+
+	if (!gpio_is_ready_dt(&cfg->gpio_interrupt)) {
+		LOG_ERR("GPIO interrupt not ready");
+		return -ENODEV;
+	}
+
+	ret = gpio_pin_configure_dt(&cfg->gpio_interrupt, GPIO_INPUT);
+	if (ret < 0) {
+		LOG_ERR("Failed to configure gpio pin");
+		return ret;
+	}
+
+	gpio_init_callback(&data->gpio_cb, bma4xx_gpio_callback, BIT(cfg->gpio_interrupt.pin));
+
+	ret = gpio_add_callback(cfg->gpio_interrupt.port, &data->gpio_cb);
+	if (ret < 0) {
+		LOG_ERR("Failed to add gpio callback");
+		return ret;
+	}
+
+	data->dev = dev;
+
+	return 0;
+}
+
+int bma4xx_enable_interrupt1(const struct device *dev, struct bma4xx_runtime_config *new_cfg)
+{
+	struct bma4xx_data *data = dev->data;
+	uint8_t value = 0;
+
+	if (new_cfg->interrupt1_fifo_wm) {
+		value |= FIELD_PREP(BMA4XX_BIT_INT_MAP_DATA_INT1_FWM, 1);
+	}
+	if (new_cfg->interrupt1_fifo_full) {
+		value |= FIELD_PREP(BMA4XX_BIT_INT_MAP_DATA_INT1_FFUL, 1);
+	}
+
+	return data->hw_ops->write_reg(dev, BMA4XX_REG_INT_MAP_DATA, value);
+}
+
+#endif /* CONFIG_BMA4XX_STREAM */
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_interrupt.h b/drivers/sensor/bosch/bma4xx/bma4xx_interrupt.h
new file mode 100644
index 0000000000000..51802ff522943
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_interrupt.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMA4XX_INTERRUPT_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMA4XX_INTERRUPT_H_
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+
+/**
+ * @brief Initialize the bma4xx interrupt system
+ *
+ * @param dev bma4xx device pointer
+ * @return int 0 on success, negative error code otherwise
+ */
+int bma4xx_init_interrupt(const struct device *dev);
+
+/**
+ * @brief Enable the trigger gpio interrupt1
+ *
+ * @param dev bma4xx device pointer
+ * @param new_cfg New configuration to use for the device
+ * @return int 0 on success, negative error code otherwise
+ */
+int bma4xx_enable_interrupt1(const struct device *dev, struct bma4xx_runtime_config *new_cfg);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMA4XX_INTERRUPT_H_ */
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_rtio.c b/drivers/sensor/bosch/bma4xx/bma4xx_rtio.c
new file mode 100644
index 0000000000000..5027646aecd55
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_rtio.c
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT bosch_bma4xx
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/rtio/work.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor_clock.h>
+
+#include "bma4xx.h"
+#include "bma4xx_decoder.h"
+#include "bma4xx_defs.h"
+#include "bma4xx_rtio.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
+
+static void bma4xx_complete_result(struct rtio *ctx, const struct rtio_sqe *sqe, void *arg)
+{
+	struct rtio_iodev_sqe *iodev_sqe = (struct rtio_iodev_sqe *)sqe->userdata;
+	struct rtio_cqe *cqe;
+	int err = 0;
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+	if (err) {
+		rtio_iodev_sqe_err(iodev_sqe, err);
+	} else {
+		rtio_iodev_sqe_ok(iodev_sqe, 0);
+	}
+	LOG_DBG("bma4xx_submit_fetch completed");
+}
+
+/*
+ * RTIO submit and encoding
+ */
+
+static void bma4xx_submit_one_shot(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct bma4xx_data *bma4xx = dev->data;
+	const struct bma4xx_config *drv_cfg = dev->config;
+	struct bma4xx_encoded_data *edata;
+	uint8_t *buf;
+	uint32_t buf_len;
+	uint32_t min_buf_len = sizeof(struct bma4xx_encoded_data);
+	uint64_t cycles;
+	int rc;
+
+	/* Get the buffer for the frame, it may be allocated dynamically by the rtio context */
+	rc = rtio_sqe_rx_buf(iodev_sqe, min_buf_len, min_buf_len, &buf, &buf_len);
+	if (rc != 0) {
+		LOG_ERR("Failed to get a read buffer of size %u bytes", min_buf_len);
+		rtio_iodev_sqe_err(iodev_sqe, rc);
+		return;
+	}
+
+	/* Prepare response */
+	edata = (struct bma4xx_encoded_data *)buf;
+
+	if (IS_ENABLED(CONFIG_BMA4XX_STREAM)) {
+		edata->header.is_fifo = false;
+	}
+
+	edata->header.accel_fs = bma4xx->cfg.accel_fs_range;
+
+	rc = sensor_clock_get_cycles(&cycles);
+	if (rc != 0) {
+		LOG_ERR("Failed to get sensor clock cycles");
+		rtio_iodev_sqe_err(iodev_sqe, rc);
+		return;
+	}
+
+	edata->header.timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	struct rtio_sqe *write_accel_sqe = rtio_sqe_acquire(bma4xx->r);
+	struct rtio_sqe *read_accel_sqe = rtio_sqe_acquire(bma4xx->r);
+
+	if (!write_accel_sqe || !read_accel_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQEs");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	const uint8_t reg_accel = BMA4XX_REG_DATA_8;
+
+	rtio_sqe_prep_tiny_write(write_accel_sqe, bma4xx->iodev, RTIO_PRIO_HIGH, &reg_accel, 1,
+				 NULL);
+	write_accel_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_accel_sqe, bma4xx->iodev, RTIO_PRIO_HIGH, edata->accel_xyz_raw_data,
+			   BMA4XX_REG_DATA_13 - BMA4XX_REG_DATA_8 + 1, NULL);
+	read_accel_sqe->flags |= RTIO_SQE_CHAINED;
+
+	if (drv_cfg->bus_type == BMA4XX_BUS_I2C) {
+		read_accel_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
+	}
+
+#ifdef CONFIG_BMA4XX_TEMPERATURE
+	struct rtio_sqe *write_temp_sqe = rtio_sqe_acquire(bma4xx->r);
+	struct rtio_sqe *read_temp_sqe = rtio_sqe_acquire(bma4xx->r);
+
+	if (!write_temp_sqe || !read_temp_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQEs");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	const uint8_t reg_temp = BMA4XX_REG_TEMPERATURE;
+
+	rtio_sqe_prep_tiny_write(write_temp_sqe, bma4xx->iodev, RTIO_PRIO_HIGH, &reg_temp, 1, NULL);
+	write_temp_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_temp_sqe, bma4xx->iodev, RTIO_PRIO_HIGH, &edata->temp, 1, NULL);
+	read_temp_sqe->flags |= RTIO_SQE_CHAINED;
+
+	if (drv_cfg->bus_type == BMA4XX_BUS_I2C) {
+		read_temp_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
+	}
+#endif /* CONFIG_BMA4XX_TEMPERATURE */
+
+	struct rtio_sqe *complete_sqe = rtio_sqe_acquire(bma4xx->r);
+
+	if (!complete_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQEs");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	rtio_sqe_prep_callback_no_cqe(complete_sqe, bma4xx_complete_result, (void *)dev, iodev_sqe);
+	rtio_submit(bma4xx->r, 0);
+}
+
+void bma4xx_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+
+	if (!cfg->is_streaming) {
+		bma4xx_submit_one_shot(dev, iodev_sqe);
+	} else if (IS_ENABLED(CONFIG_BMA4XX_STREAM)) {
+		bma4xx_submit_stream(dev, iodev_sqe);
+	} else {
+		rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+	}
+}
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_rtio.h b/drivers/sensor/bosch/bma4xx/bma4xx_rtio.h
new file mode 100644
index 0000000000000..382d6f8be3792
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_rtio.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2023 Google LLC
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMA4XX_RTIO_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMA4XX_RTIO_H_
+
+#include <zephyr/device.h>
+#include <zephyr/rtio/rtio.h>
+
+void bma4xx_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe);
+
+void bma4xx_submit_stream(const struct device *sensor, struct rtio_iodev_sqe *iodev_sqe);
+
+void bma4xx_fifo_event(const struct device *dev);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMA4XX_RTIO_H_ */
diff --git a/drivers/sensor/bosch/bma4xx/bma4xx_rtio_stream.c b/drivers/sensor/bosch/bma4xx/bma4xx_rtio_stream.c
new file mode 100644
index 0000000000000..563c0f3cd816c
--- /dev/null
+++ b/drivers/sensor/bosch/bma4xx/bma4xx_rtio_stream.c
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2024 Cienet
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT bosch_bma4xx
+
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/sensor_clock.h>
+
+#include "bma4xx.h"
+#include "bma4xx_defs.h"
+#include "bma4xx_decoder.h"
+#include "bma4xx_rtio.h"
+
+#ifdef CONFIG_BMA4XX_STREAM
+
+LOG_MODULE_DECLARE(bma4xx, CONFIG_SENSOR_LOG_LEVEL);
+
+void bma4xx_submit_stream(const struct device *sensor, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+	struct bma4xx_data *data = sensor->data;
+	struct bma4xx_runtime_config new_config = data->cfg;
+	const struct bma4xx_config *cfg_bma4xx = sensor->config;
+	int ret;
+
+	ret = gpio_pin_interrupt_configure_dt(&cfg_bma4xx->gpio_interrupt, GPIO_INT_DISABLE);
+	if (ret) {
+		LOG_DBG("Failed to disable interrupt");
+		rtio_iodev_sqe_err(iodev_sqe, ret);
+		return;
+	}
+
+	new_config.interrupt1_fifo_wm = false;
+	new_config.interrupt1_fifo_full = false;
+	/* Only one trigger will be sent per time */
+	for (int i = 0; i < cfg->count; ++i) {
+		switch (cfg->triggers[i].trigger) {
+		case SENSOR_TRIG_FIFO_WATERMARK:
+			new_config.interrupt1_fifo_wm = true;
+			break;
+		case SENSOR_TRIG_FIFO_FULL:
+			new_config.interrupt1_fifo_full = true;
+			break;
+		default:
+			LOG_DBG("Trigger (%d) not supported", cfg->triggers[i].trigger);
+			rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+			return;
+		}
+	}
+
+	if (new_config.interrupt1_fifo_wm != data->cfg.interrupt1_fifo_wm ||
+	    new_config.interrupt1_fifo_full != data->cfg.interrupt1_fifo_full) {
+
+		ret = bma4xx_safely_configure(sensor, &new_config);
+
+		if (ret != 0) {
+			LOG_ERR("Failed to configure sensor");
+			rtio_iodev_sqe_err(iodev_sqe, ret);
+			return;
+		}
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&cfg_bma4xx->gpio_interrupt, GPIO_INT_EDGE_TO_ACTIVE);
+	if (ret) {
+		LOG_DBG("Failed to set interrupt");
+		rtio_iodev_sqe_err(iodev_sqe, ret);
+		return;
+	}
+
+	data->streaming_sqe = iodev_sqe;
+}
+
+static struct sensor_stream_trigger *
+bma4xx_get_read_config_trigger(const struct sensor_read_config *cfg, enum sensor_trigger_type trig)
+{
+	for (int i = 0; i < cfg->count; ++i) {
+		if (cfg->triggers[i].trigger == trig) {
+			return &cfg->triggers[i];
+		}
+	}
+	LOG_DBG("Unsupported trigger (%d)", trig);
+	return NULL;
+}
+
+static void bma4xx_complete_cb(struct rtio *r, const struct rtio_sqe *sqe, void *arg)
+{
+	const struct device *dev = arg;
+	struct bma4xx_data *drv_data = dev->data;
+	const struct bma4xx_config *drv_cfg = dev->config;
+	struct rtio_iodev_sqe *iodev_sqe = sqe->userdata;
+
+	rtio_iodev_sqe_ok(iodev_sqe, drv_data->fifo_count);
+
+	gpio_pin_interrupt_configure_dt(&drv_cfg->gpio_interrupt, GPIO_INT_EDGE_TO_ACTIVE);
+}
+
+static void bma4xx_fifo_count_cb(struct rtio *r, const struct rtio_sqe *sqe, void *arg)
+{
+	const struct device *dev = arg;
+	struct bma4xx_data *drv_data = dev->data;
+	const struct bma4xx_config *drv_cfg = dev->config;
+	struct rtio_iodev *iodev = drv_data->iodev;
+	uint8_t *fifo_count_buf = (uint8_t *)&drv_data->fifo_count;
+	uint16_t fifo_count = (((fifo_count_buf[1] & 0x3F) << 8) | fifo_count_buf[0]);
+
+	drv_data->fifo_count = fifo_count;
+
+	/* Pull a operation from our device iodev queue, validated to only be reads */
+	struct rtio_iodev_sqe *iodev_sqe = drv_data->streaming_sqe;
+
+	drv_data->streaming_sqe = NULL;
+
+	/* Not inherently an underrun/overrun as we may have a buffer to fill next time */
+	if (iodev_sqe == NULL) {
+		LOG_DBG("No pending SQE");
+		gpio_pin_interrupt_configure_dt(&drv_cfg->gpio_interrupt, GPIO_INT_EDGE_TO_ACTIVE);
+		return;
+	}
+
+	const size_t packet_size = (drv_data->cfg.accel_pwr_mode && drv_data->cfg.aux_pwr_mode)
+					   ? BMA4XX_FIFO_MA_LENGTH + BMA4XX_FIFO_HEADER_LENGTH
+					   : BMA4XX_FIFO_A_LENGTH + BMA4XX_FIFO_HEADER_LENGTH;
+	const size_t min_read_size = sizeof(struct bma4xx_fifo_data) + packet_size;
+	const size_t ideal_read_size = sizeof(struct bma4xx_fifo_data) + fifo_count;
+	uint8_t *buf;
+	uint32_t buf_len;
+
+	if (rtio_sqe_rx_buf(iodev_sqe, min_read_size, ideal_read_size, &buf, &buf_len) != 0) {
+		LOG_ERR("Failed to get buffer");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+	LOG_DBG("Requesting buffer [%u, %u] got %u", (unsigned int)min_read_size,
+		(unsigned int)ideal_read_size, buf_len);
+
+	/* Read FIFO and call back to rtio with rtio_sqe completion */
+	struct bma4xx_fifo_data hdr;
+
+	hdr.header.is_fifo = true;
+	hdr.header.accel_fs = drv_data->cfg.accel_fs_range;
+	hdr.header.timestamp = drv_data->timestamp;
+	hdr.int_status = drv_data->int_status;
+	hdr.accel_odr = drv_data->cfg.accel_odr;
+
+	uint32_t buf_avail = buf_len;
+
+	memcpy(buf, &hdr, sizeof(hdr));
+	buf_avail -= sizeof(hdr);
+
+	uint32_t read_len = MIN(fifo_count, buf_avail);
+	uint32_t pkts = read_len / packet_size;
+
+	read_len = pkts * packet_size;
+	((struct bma4xx_fifo_data *)buf)->fifo_count = read_len;
+
+	__ASSERT_NO_MSG(read_len % packet_size == 0);
+
+	uint8_t *read_buf = buf + sizeof(hdr);
+
+	/* Flush out completions  */
+	struct rtio_cqe *cqe;
+
+	do {
+		cqe = rtio_cqe_consume(r);
+		if (cqe != NULL) {
+			rtio_cqe_release(r, cqe);
+		}
+	} while (cqe != NULL);
+
+	/* Setup new rtio chain to read the fifo data and report then check the
+	 * result
+	 */
+	struct rtio_sqe *write_fifo_addr = rtio_sqe_acquire(r);
+	struct rtio_sqe *read_fifo_data = rtio_sqe_acquire(r);
+	struct rtio_sqe *complete_op = rtio_sqe_acquire(r);
+	const uint8_t reg_addr = BMA4XX_REG_FIFO_DATA;
+
+	rtio_sqe_prep_tiny_write(write_fifo_addr, iodev, RTIO_PRIO_NORM, &reg_addr, 1, NULL);
+	write_fifo_addr->flags = RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_read(read_fifo_data, iodev, RTIO_PRIO_NORM, read_buf, read_len, iodev_sqe);
+	read_fifo_data->flags = RTIO_SQE_CHAINED;
+
+	if (drv_cfg->bus_type == BMA4XX_BUS_I2C) {
+		read_fifo_data->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
+	}
+
+	rtio_sqe_prep_callback(complete_op, bma4xx_complete_cb, (void *)dev, iodev_sqe);
+
+	rtio_submit(r, 0);
+}
+
+static void bma4xx_int_status_cb(struct rtio *r, const struct rtio_sqe *sqr, void *arg)
+{
+	const struct device *dev = arg;
+	struct bma4xx_data *drv_data = dev->data;
+	const struct bma4xx_config *drv_cfg = dev->config;
+	struct rtio_iodev *iodev = drv_data->iodev;
+	struct rtio_iodev_sqe *streaming_sqe = drv_data->streaming_sqe;
+	struct sensor_read_config *read_config;
+
+	if (streaming_sqe == NULL) {
+		return;
+	}
+
+	read_config = (struct sensor_read_config *)streaming_sqe->sqe.iodev->data;
+	__ASSERT_NO_MSG(read_config != NULL);
+
+	if (!read_config->is_streaming) {
+		return;
+	}
+
+	gpio_pin_interrupt_configure_dt(&drv_cfg->gpio_interrupt, GPIO_INT_DISABLE);
+
+	struct sensor_stream_trigger *fifo_wm_cfg =
+		bma4xx_get_read_config_trigger(read_config, SENSOR_TRIG_FIFO_WATERMARK);
+	bool has_fifo_wm_trig = fifo_wm_cfg != NULL &&
+				FIELD_GET(BMA4XX_BIT_INT_STAT_1_FWM_INT, drv_data->int_status) != 0;
+
+	struct sensor_stream_trigger *fifo_full_cfg =
+		bma4xx_get_read_config_trigger(read_config, SENSOR_TRIG_FIFO_FULL);
+	bool has_fifo_full_trig =
+		fifo_full_cfg != NULL &&
+		FIELD_GET(BMA4XX_BIT_INT_STAT_1_FFULL_INT, drv_data->int_status) != 0;
+
+	if (!has_fifo_wm_trig && !has_fifo_full_trig) {
+		gpio_pin_interrupt_configure_dt(&drv_cfg->gpio_interrupt, GPIO_INT_EDGE_TO_ACTIVE);
+		return;
+	}
+
+	/* Flush completions */
+	struct rtio_cqe *cqe;
+
+	do {
+		cqe = rtio_cqe_consume(r);
+		if (cqe != NULL) {
+			rtio_cqe_release(r, cqe);
+		}
+	} while (cqe != NULL);
+
+	enum sensor_stream_data_opt data_opt;
+
+	if (has_fifo_wm_trig && !has_fifo_full_trig) {
+		/* Only care about fifo threshold */
+		data_opt = fifo_wm_cfg->opt;
+	} else if (!has_fifo_wm_trig && has_fifo_full_trig) {
+		/* Only care about fifo full */
+		data_opt = fifo_full_cfg->opt;
+	} else {
+		/* Both fifo threshold and full */
+		data_opt = MIN(fifo_wm_cfg->opt, fifo_full_cfg->opt);
+	}
+
+	if (data_opt == SENSOR_STREAM_DATA_NOP || data_opt == SENSOR_STREAM_DATA_DROP) {
+		uint8_t *buf;
+		uint32_t buf_len;
+
+		/* Clear streaming_sqe since we're done with the call */
+		drv_data->streaming_sqe = NULL;
+		if (rtio_sqe_rx_buf(streaming_sqe, sizeof(struct bma4xx_fifo_data),
+				    sizeof(struct bma4xx_fifo_data), &buf, &buf_len) != 0) {
+			rtio_iodev_sqe_err(streaming_sqe, -ENOMEM);
+			return;
+		}
+
+		struct bma4xx_fifo_data *data = (struct bma4xx_fifo_data *)buf;
+
+		memset(buf, 0, buf_len);
+		data->header.timestamp = drv_data->timestamp;
+		data->int_status = drv_data->int_status;
+		data->fifo_count = 0;
+		data->header.is_fifo = true;
+		rtio_iodev_sqe_ok(streaming_sqe, 0);
+		gpio_pin_interrupt_configure_dt(&drv_cfg->gpio_interrupt, GPIO_INT_EDGE_TO_ACTIVE);
+		if (data_opt == SENSOR_STREAM_DATA_DROP) {
+			/* Flush the FIFO */
+			struct rtio_sqe *write_signal_path_reset = rtio_sqe_acquire(r);
+			uint8_t write_buffer[] = {
+				FIELD_GET(BMA4XX_REG_ADDRESS_MASK, BMA4XX_REG_CMD),
+				BMA4XX_CMD_FIFO_FLUSH,
+			};
+
+			rtio_sqe_prep_tiny_write(write_signal_path_reset, iodev, RTIO_PRIO_NORM,
+						 write_buffer, ARRAY_SIZE(write_buffer), NULL);
+			rtio_submit(r, 0);
+			ARG_UNUSED(rtio_cqe_consume(r));
+		}
+		return;
+	}
+
+	/* We need the data, read the fifo length */
+	struct rtio_sqe *write_fifo_count_reg = rtio_sqe_acquire(r);
+	struct rtio_sqe *read_fifo_count = rtio_sqe_acquire(r);
+	struct rtio_sqe *check_fifo_count = rtio_sqe_acquire(r);
+	uint8_t reg = BMA4XX_REG_FIFO_LENGTH_0;
+	uint8_t *read_buf = (uint8_t *)&drv_data->fifo_count;
+
+	rtio_sqe_prep_tiny_write(write_fifo_count_reg, iodev, RTIO_PRIO_NORM, &reg, 1, NULL);
+	write_fifo_count_reg->flags = RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_read(read_fifo_count, iodev, RTIO_PRIO_NORM, read_buf,
+			   BMA4XX_FIFO_DATA_LENGTH, NULL);
+	read_fifo_count->flags = RTIO_SQE_CHAINED;
+
+	if (drv_cfg->bus_type == BMA4XX_BUS_I2C) {
+		read_fifo_count->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
+	}
+
+	rtio_sqe_prep_callback(check_fifo_count, bma4xx_fifo_count_cb, arg, NULL);
+
+	rtio_submit(r, 0);
+}
+
+void bma4xx_fifo_event(const struct device *dev)
+{
+	struct bma4xx_data *drv_data = dev->data;
+	const struct bma4xx_config *drv_cfg = dev->config;
+	struct rtio_iodev *iodev = drv_data->iodev;
+	struct rtio *r = drv_data->r;
+	uint64_t cycles;
+	int rc;
+
+	if (drv_data->streaming_sqe == NULL) {
+		return;
+	}
+
+	rc = sensor_clock_get_cycles(&cycles);
+	if (rc != 0) {
+		LOG_ERR("Failed to get sensor clock cycles");
+		rtio_iodev_sqe_err(drv_data->streaming_sqe, rc);
+		return;
+	}
+
+	drv_data->timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	struct rtio_sqe *write_int_reg = rtio_sqe_acquire(r);
+	struct rtio_sqe *read_int_reg = rtio_sqe_acquire(r);
+	struct rtio_sqe *check_int_status = rtio_sqe_acquire(r);
+	uint8_t reg = BMA4XX_REG_INT_STAT_1;
+
+	rtio_sqe_prep_tiny_write(write_int_reg, iodev, RTIO_PRIO_NORM, &reg, 1, NULL);
+	write_int_reg->flags = RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_read(read_int_reg, iodev, RTIO_PRIO_NORM, &drv_data->int_status, 1, NULL);
+	read_int_reg->flags = RTIO_SQE_CHAINED;
+
+	if (drv_cfg->bus_type == BMA4XX_BUS_I2C) {
+		read_int_reg->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
+	}
+
+	rtio_sqe_prep_callback(check_int_status, bma4xx_int_status_cb, (void *)dev, NULL);
+	rtio_submit(r, 0);
+}
+
+#endif /* CONFIG_BMA4XX_STREAM */
diff --git a/drivers/sensor/bosch/bme280/bme280.c b/drivers/sensor/bosch/bme280/bme280.c
index 327e25a1cc8bf..e96b3c1b46d97 100644
--- a/drivers/sensor/bosch/bme280/bme280.c
+++ b/drivers/sensor/bosch/bme280/bme280.c
@@ -126,6 +126,7 @@ static uint32_t bme280_compensate_humidity(struct bme280_data *data,
 	h = (h - (((((h >> 15) * (h >> 15)) >> 7) *
 		((int32_t)data->dig_h1)) >> 4));
 	h = (h > 419430400 ? 419430400 : h);
+	h = (h < 0 ? 0 : h);
 
 	return (uint32_t)(h >> 12);
 }
diff --git a/drivers/sensor/bosch/bme680/bme680.c b/drivers/sensor/bosch/bme680/bme680.c
index 88b774e114a5a..363a8cd8fe42f 100644
--- a/drivers/sensor/bosch/bme680/bme680.c
+++ b/drivers/sensor/bosch/bme680/bme680.c
@@ -207,7 +207,9 @@ static uint8_t bme680_calc_gas_wait(uint16_t dur)
 			dur = dur / 4;
 			factor += 1;
 		}
-		durval = dur + (factor * 64);
+		const uint16_t max_duration = dur + (factor * 64);
+
+		durval = CLAMP(max_duration, 0, 0xff);
 	}
 
 	return durval;
diff --git a/drivers/sensor/bosch/bmg160/bmg160.c b/drivers/sensor/bosch/bmg160/bmg160.c
index da16a6080bdd3..463c3630f61a6 100644
--- a/drivers/sensor/bosch/bmg160/bmg160.c
+++ b/drivers/sensor/bosch/bmg160/bmg160.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  * Datasheet:
- * http://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMG160-DS000-09.pdf
+ * https://web.archive.org/web/20181111220522/https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMG160-DS000-09.pdf
  */
 
 #define DT_DRV_COMPAT bosch_bmg160
diff --git a/drivers/sensor/bosch/bmi323/CMakeLists.txt b/drivers/sensor/bosch/bmi323/CMakeLists.txt
index 8cd774e4898c0..e17497a4f4beb 100644
--- a/drivers/sensor/bosch/bmi323/CMakeLists.txt
+++ b/drivers/sensor/bosch/bmi323/CMakeLists.txt
@@ -5,3 +5,4 @@ zephyr_library()
 
 zephyr_library_sources(bmi323.c)
 zephyr_library_sources_ifdef(CONFIG_BMI323_BUS_SPI bmi323_spi.c)
+zephyr_library_sources_ifdef(CONFIG_BMI323_BUS_I2C bmi323_i2c.c)
diff --git a/drivers/sensor/bosch/bmi323/Kconfig b/drivers/sensor/bosch/bmi323/Kconfig
index 01045a353fc95..355d2c71eedaf 100644
--- a/drivers/sensor/bosch/bmi323/Kconfig
+++ b/drivers/sensor/bosch/bmi323/Kconfig
@@ -34,4 +34,10 @@ config BMI323_BUS_SPI
 	depends on $(dt_compat_on_bus,$(DT_COMPAT_BOSCH_BMI323),spi)
 	select SPI
 
+config BMI323_BUS_I2C
+	bool "BMI323 driver support for I2C bus"
+	default y
+	depends on $(dt_compat_on_bus,$(DT_COMPAT_BOSCH_BMI323),i2c)
+	select I2C
+
 endif # BMI323
diff --git a/drivers/sensor/bosch/bmi323/bmi323.c b/drivers/sensor/bosch/bmi323/bmi323.c
index c91fc7ba4f8c3..1293f709f3f10 100644
--- a/drivers/sensor/bosch/bmi323/bmi323.c
+++ b/drivers/sensor/bosch/bmi323/bmi323.c
@@ -6,6 +6,7 @@
 
 #include "bmi323.h"
 #include "bmi323_spi.h"
+#include "bmi323_i2c.h"
 
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
@@ -22,8 +23,8 @@ LOG_MODULE_REGISTER(bosch_bmi323);
 /* Value taken from BMI323 Datasheet section 5.8.1 */
 #define IMU_BOSCH_FEATURE_ENGINE_STARTUP_CONFIG (0x012C)
 
-#define IMU_BOSCH_DIE_TEMP_OFFSET_MICRO_DEG_CELCIUS (23000000LL)
-#define IMU_BOSCH_DIE_TEMP_MICRO_DEG_CELCIUS_LSB    (1953L)
+#define IMU_BOSCH_DIE_TEMP_OFFSET_MICRO_DEG_CELSIUS (23000000LL)
+#define IMU_BOSCH_DIE_TEMP_MICRO_DEG_CELSIUS_LSB    (1953L)
 
 typedef void (*bosch_bmi323_gpio_callback_ptr)(const struct device *dev, struct gpio_callback *cb,
 					       uint32_t pins);
@@ -991,9 +992,9 @@ static int bosch_bmi323_driver_api_fetch_temperature(const struct device *dev)
 		return -ENODATA;
 	}
 
-	micro = bosch_bmi323_value_to_micro(buf, IMU_BOSCH_DIE_TEMP_MICRO_DEG_CELCIUS_LSB);
+	micro = bosch_bmi323_value_to_micro(buf, IMU_BOSCH_DIE_TEMP_MICRO_DEG_CELSIUS_LSB);
 
-	micro += IMU_BOSCH_DIE_TEMP_OFFSET_MICRO_DEG_CELCIUS;
+	micro += IMU_BOSCH_DIE_TEMP_OFFSET_MICRO_DEG_CELSIUS;
 
 	bosch_bmi323_sensor_value_from_micro(&data->temperature, micro);
 
@@ -1320,8 +1321,9 @@ static int bosch_bmi323_init(const struct device *dev)
  * select the appropriate bus once I2C is implemented.
  */
 #define BMI323_DEVICE_BUS(inst)                                                                    \
-	BUILD_ASSERT(DT_INST_ON_BUS(inst, spi), "Unimplemented bus");                              \
-	BMI323_DEVICE_SPI_BUS(inst)
+	COND_CODE_1(DT_INST_ON_BUS(inst, i2c),			\
+			(BMI323_DEVICE_I2C_BUS(inst)),			\
+			(BMI323_DEVICE_SPI_BUS(inst)))
 
 #define BMI323_DEVICE(inst)                                                                        \
 	static struct bosch_bmi323_data bosch_bmi323_data_##inst;                                  \
@@ -1336,7 +1338,7 @@ static int bosch_bmi323_init(const struct device *dev)
                                                                                                    \
 	static const struct bosch_bmi323_config bosch_bmi323_config_##inst = {                     \
 		.bus = &bosch_bmi323_bus_api##inst,                                                \
-		.int_gpio = GPIO_DT_SPEC_INST_GET(inst, int_gpios),                                \
+		.int_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, {0}),                         \
 		.int_gpio_callback = bosch_bmi323_irq_callback##inst,                              \
 	};                                                                                         \
                                                                                                    \
diff --git a/drivers/sensor/bosch/bmi323/bmi323_i2c.c b/drivers/sensor/bosch/bmi323/bmi323_i2c.c
new file mode 100644
index 0000000000000..0f869e52db458
--- /dev/null
+++ b/drivers/sensor/bosch/bmi323/bmi323_i2c.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2023 Trackunit Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "bmi323.h"
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+
+static int bosch_bmi323_i2c_read_words(const void *context, uint8_t offset, uint16_t *words,
+				       uint16_t words_count)
+{
+	const struct i2c_dt_spec *i2c = (const struct i2c_dt_spec *)context;
+	uint8_t address;
+	uint8_t rxbuf[2 + (words_count * 2)];
+	struct i2c_msg msg[3];
+	int ret;
+
+	address = offset & 0x7F;
+
+	msg[0].buf = &address;
+	msg[0].len = sizeof(address);
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = rxbuf;
+	msg[1].len = 2 + (words_count * 2);
+	msg[1].flags = I2C_MSG_RESTART | I2C_MSG_READ | I2C_MSG_STOP;
+
+	ret = i2c_transfer_dt(i2c, msg, 2);
+	
+	// memcpy((uint8_t *)words, rxbuf + 2, words_count * 2);
+	memcpy((uint8_t *)words, rxbuf + 2, words_count * 2);
+
+	k_usleep(2);
+
+	return ret;
+}
+
+static int bosch_bmi323_i2c_write_words(const void *context, uint8_t offset, uint16_t *words,
+					uint16_t words_count)
+{
+	const struct i2c_dt_spec *i2c = (const struct i2c_dt_spec *)context;
+	uint8_t address;
+	struct i2c_msg msg[2];
+	int ret;
+
+	address = offset & 0x7F;
+
+	msg[0].buf = &address;
+	msg[0].len = 1;
+	msg[0].flags = I2C_MSG_WRITE;
+
+	msg[1].buf = (uint8_t *)words;
+	msg[1].len = (words_count * 2);
+	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
+
+	ret = i2c_transfer_dt(i2c, msg, 2);
+
+	k_usleep(2);
+
+	return ret;
+}
+
+static int bosch_bmi323_i2c_init(const void *context)
+{
+	const struct i2c_dt_spec *i2c = (const struct i2c_dt_spec *)context;
+	int ret;
+
+	if (i2c_is_ready_dt(i2c) == false) {
+		return -ENODEV;
+	}
+
+	uint16_t cmd[1] = {(uint16_t)0xDEAF};
+	ret = bosch_bmi323_i2c_write_words(i2c, 0x7E, cmd, 1);
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	k_usleep(1500);
+
+	ret = bosch_bmi323_i2c_read_words(i2c, 0x00, cmd, 1);
+
+	if ((cmd[0] & 0x00FF) != 0x43) {
+		return -ENODEV;
+	}
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	k_usleep(1500);
+
+	return 0;
+}
+
+const struct bosch_bmi323_bus_api bosch_bmi323_i2c_bus_api = {
+	.read_words = bosch_bmi323_i2c_read_words,
+	.write_words = bosch_bmi323_i2c_write_words,
+	.init = bosch_bmi323_i2c_init};
diff --git a/drivers/sensor/bosch/bmi323/bmi323_i2c.h b/drivers/sensor/bosch/bmi323/bmi323_i2c.h
new file mode 100644
index 0000000000000..9117486856921
--- /dev/null
+++ b/drivers/sensor/bosch/bmi323/bmi323_i2c.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2023 Trackunit Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMI323_BMI323_I2C_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMI323_BMI323_I2C_H_
+
+#include "bmi323.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/i2c.h>
+
+#define BMI323_DEVICE_I2C_BUS(inst)                                                                \
+	extern const struct bosch_bmi323_bus_api bosch_bmi323_i2c_bus_api;                         \
+                                                                                                   \
+	static const struct i2c_dt_spec i2c_spec##inst =                                           \
+		I2C_DT_SPEC_INST_GET(inst);                                                            \
+                                                                                                   \
+	static const struct bosch_bmi323_bus bosch_bmi323_bus_api##inst = {                        \
+		.context = &i2c_spec##inst, .api = &bosch_bmi323_i2c_bus_api}
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMI323_BMI323_I2C_H_ */
diff --git a/drivers/sensor/bosch/bmm350/CMakeLists.txt b/drivers/sensor/bosch/bmm350/CMakeLists.txt
new file mode 100644
index 0000000000000..3ccf040f8b83f
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(bmm350.c bmm350_i2c.c)
+zephyr_library_sources_ifdef(CONFIG_BMM350_TRIGGER bmm350_trigger.c)
diff --git a/drivers/sensor/bosch/bmm350/Kconfig b/drivers/sensor/bosch/bmm350/Kconfig
new file mode 100644
index 0000000000000..1280f009a7039
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/Kconfig
@@ -0,0 +1,22 @@
+# BMM350 Geomagnetic sensor configuration options
+
+# Copyright (c) 2024 Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig BMM350
+	bool "BMM350 I2C Geomagnetic Chip"
+	default y
+	depends on DT_HAS_BOSCH_BMM350_ENABLED
+	select I2C
+	help
+	  Enable driver for BMM350 I2C-based Geomagnetic sensor.
+
+if BMM350
+
+module = BMM350
+thread_priority = 10
+thread_stack_size = 1024
+source "drivers/sensor/Kconfig.trigger_template"
+
+endif # BMM350
diff --git a/drivers/sensor/bosch/bmm350/bmm350.c b/drivers/sensor/bosch/bmm350/bmm350.c
new file mode 100644
index 0000000000000..901d3ffa73415
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350.c
@@ -0,0 +1,988 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for BMM350s accessed via I2C.
+ * version 1.0.0
+ */
+
+#include <zephyr/logging/log.h>
+#include "bmm350.h"
+
+LOG_MODULE_REGISTER(BMM350, CONFIG_SENSOR_LOG_LEVEL);
+
+static inline int bmm350_bus_check(const struct device *dev)
+{
+	const struct bmm350_config *cfg = dev->config;
+
+	return cfg->bus_io->check(&cfg->bus);
+}
+
+static inline int bmm350_reg_read(const struct device *dev, uint8_t start, uint8_t *buf, int size)
+{
+	const struct bmm350_config *cfg = dev->config;
+
+	return cfg->bus_io->read(&cfg->bus, start, buf, size);
+}
+
+int bmm350_reg_write(const struct device *dev, uint8_t reg, uint8_t val)
+{
+	const struct bmm350_config *cfg = dev->config;
+
+	return cfg->bus_io->write(&cfg->bus, reg, val);
+}
+
+static int8_t bmm350_read_otp_word(const struct device *dev, uint8_t addr, uint16_t *lsb_msb)
+{
+	int8_t ret = 0;
+	uint8_t tx_buf = 0;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t otp_status = 0;
+	uint8_t otp_err = BMM350_OTP_STATUS_NO_ERROR;
+	uint8_t lsb = 0, msb = 0;
+
+	if (lsb_msb) {
+		/* Set OTP command at specified address */
+		tx_buf = BMM350_OTP_CMD_DIR_READ | (addr & BMM350_OTP_WORD_ADDR_MSK);
+		ret = bmm350_reg_write(dev, BMM350_REG_OTP_CMD_REG, tx_buf);
+		if (ret) {
+			LOG_ERR("i2c xfer failed! read addr = 0x%02x, ret = %d\n", tx_buf, ret);
+			return ret;
+		}
+
+		do {
+			/* Get OTP status */
+			ret += bmm350_reg_read(dev, BMM350_REG_OTP_STATUS_REG, &rx_buf[0], 3);
+			otp_status = rx_buf[2];
+			otp_err = BMM350_OTP_STATUS_ERROR(otp_status);
+			if (otp_err != BMM350_OTP_STATUS_NO_ERROR) {
+				break;
+			}
+		} while ((!(otp_status & BMM350_OTP_STATUS_CMD_DONE)) && (ret == BMM350_OK));
+
+		if (otp_err != BMM350_OTP_STATUS_NO_ERROR) {
+			LOG_ERR("OTP error code: 0x%02x\n", otp_err);
+			return -EIO;
+		}
+
+		/* Get OTP L/MSB data */
+		ret += bmm350_reg_read(dev, BMM350_REG_OTP_DATA_MSB_REG, &rx_buf[0], 3);
+		msb = rx_buf[2];
+		ret += bmm350_reg_read(dev, BMM350_REG_OTP_DATA_LSB_REG, &rx_buf[0], 3);
+		lsb = rx_buf[2];
+		*lsb_msb = ((uint16_t)(msb << 8) | lsb) & 0xFFFF;
+	}
+
+	return ret;
+}
+
+static int32_t fix_sign(uint32_t inval, int8_t number_of_bits)
+{
+	int32_t ret = 0;
+	int32_t power = 0;
+
+	switch ((enum bmm350_signed_bit)number_of_bits) {
+	case BMM350_SIGNED_8_BIT:
+		power = 128; /* 2^7 */
+		break;
+	case BMM350_SIGNED_12_BIT:
+		power = 2048; /* 2^11 */
+		break;
+	case BMM350_SIGNED_16_BIT:
+		power = 32768; /* 2^15 */
+		break;
+	case BMM350_SIGNED_21_BIT:
+		power = 1048576; /* 2^20 */
+		break;
+	case BMM350_SIGNED_24_BIT:
+		power = 8388608; /* 2^23 */
+		break;
+	default:
+		power = 0;
+		break;
+	}
+
+	ret = (int32_t)inval;
+	if (ret >= power) {
+		ret = ret - (power * 2);
+	}
+
+	return ret;
+}
+
+static void bmm350_update_mag_off_sens(struct bmm350_data *data)
+{
+	uint16_t off_x_lsb_msb, off_y_lsb_msb, off_z_lsb_msb, t_off = 0;
+	uint8_t sens_x, sens_y, sens_z, t_sens = 0;
+	uint8_t tco_x, tco_y, tco_z = 0;
+	uint8_t tcs_x, tcs_y, tcs_z = 0;
+	uint8_t cross_x_y, cross_y_x, cross_z_x, cross_z_y = 0;
+
+	off_x_lsb_msb = data->otp_data[BMM350_MAG_OFFSET_X] & 0x0FFF;
+	off_y_lsb_msb = ((data->otp_data[BMM350_MAG_OFFSET_X] & 0xF000) >> 4) +
+			(data->otp_data[BMM350_MAG_OFFSET_Y] & BMM350_LSB_MASK);
+	off_z_lsb_msb = (data->otp_data[BMM350_MAG_OFFSET_Y] & 0x0F00) +
+			(data->otp_data[BMM350_MAG_OFFSET_Z] & BMM350_LSB_MASK);
+	t_off = data->otp_data[BMM350_TEMP_OFF_SENS] & BMM350_LSB_MASK;
+
+	data->mag_comp.dut_offset_coef.offset_x = fix_sign(off_x_lsb_msb, BMM350_SIGNED_12_BIT);
+	data->mag_comp.dut_offset_coef.offset_y = fix_sign(off_y_lsb_msb, BMM350_SIGNED_12_BIT);
+	data->mag_comp.dut_offset_coef.offset_z = fix_sign(off_z_lsb_msb, BMM350_SIGNED_12_BIT);
+	data->mag_comp.dut_offset_coef.t_offs =
+		fix_sign(t_off, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_offset_coef.t_offs = data->mag_comp.dut_offset_coef.t_offs / 5;
+
+	sens_x = (data->otp_data[BMM350_MAG_SENS_X] & BMM350_MSB_MASK) >> 8;
+	sens_y = (data->otp_data[BMM350_MAG_SENS_Y] & BMM350_LSB_MASK);
+	sens_z = (data->otp_data[BMM350_MAG_SENS_Z] & BMM350_MSB_MASK) >> 8;
+	t_sens = (data->otp_data[BMM350_TEMP_OFF_SENS] & BMM350_MSB_MASK) >> 8;
+
+	data->mag_comp.dut_sensit_coef.sens_x =
+		fix_sign(sens_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_sensit_coef.sens_y =
+		fix_sign(sens_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_sensit_coef.sens_z =
+		fix_sign(sens_z, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_sensit_coef.t_sens =
+		fix_sign(t_sens, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.dut_sensit_coef.sens_x = (data->mag_comp.dut_sensit_coef.sens_x / 256);
+	data->mag_comp.dut_sensit_coef.sens_y = (data->mag_comp.dut_sensit_coef.sens_y / 256);
+	data->mag_comp.dut_sensit_coef.sens_z = (data->mag_comp.dut_sensit_coef.sens_z / 256);
+	data->mag_comp.dut_sensit_coef.t_sens = (data->mag_comp.dut_sensit_coef.t_sens / 512);
+
+	tco_x = (data->otp_data[BMM350_MAG_TCO_X] & BMM350_LSB_MASK);
+	tco_y = (data->otp_data[BMM350_MAG_TCO_Y] & BMM350_LSB_MASK);
+	tco_z = (data->otp_data[BMM350_MAG_TCO_Z] & BMM350_LSB_MASK);
+
+	data->mag_comp.dut_tco.tco_x =
+		fix_sign(tco_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tco.tco_y =
+		fix_sign(tco_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tco.tco_z =
+		fix_sign(tco_z, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.dut_tco.tco_x = (data->mag_comp.dut_tco.tco_x / 32);
+	data->mag_comp.dut_tco.tco_y = (data->mag_comp.dut_tco.tco_y / 32);
+	data->mag_comp.dut_tco.tco_z = (data->mag_comp.dut_tco.tco_z / 32);
+
+	tcs_x = (data->otp_data[BMM350_MAG_TCS_X] & BMM350_MSB_MASK) >> 8;
+	tcs_y = (data->otp_data[BMM350_MAG_TCS_Y] & BMM350_MSB_MASK) >> 8;
+	tcs_z = (data->otp_data[BMM350_MAG_TCS_Z] & BMM350_MSB_MASK) >> 8;
+
+	data->mag_comp.dut_tcs.tcs_x =
+		fix_sign(tcs_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tcs.tcs_y =
+		fix_sign(tcs_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.dut_tcs.tcs_z =
+		fix_sign(tcs_z, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.dut_tcs.tcs_x = (data->mag_comp.dut_tcs.tcs_x / 16384);
+	data->mag_comp.dut_tcs.tcs_y = (data->mag_comp.dut_tcs.tcs_y / 16384);
+	data->mag_comp.dut_tcs.tcs_z = (data->mag_comp.dut_tcs.tcs_z / 16384);
+
+	data->mag_comp.dut_t0 =
+		(fix_sign(data->otp_data[BMM350_MAG_DUT_T_0], BMM350_SIGNED_16_BIT) / 512) + 23;
+
+	cross_x_y = (data->otp_data[BMM350_CROSS_X_Y] & BMM350_LSB_MASK);
+	cross_y_x = (data->otp_data[BMM350_CROSS_Y_X] & BMM350_MSB_MASK) >> 8;
+	cross_z_x = (data->otp_data[BMM350_CROSS_Z_X] & BMM350_LSB_MASK);
+	cross_z_y = (data->otp_data[BMM350_CROSS_Z_Y] & BMM350_MSB_MASK) >> 8;
+
+	data->mag_comp.cross_axis.cross_x_y =
+		fix_sign(cross_x_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.cross_axis.cross_y_x =
+		fix_sign(cross_y_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.cross_axis.cross_z_x =
+		fix_sign(cross_z_x, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+	data->mag_comp.cross_axis.cross_z_y =
+		fix_sign(cross_z_y, BMM350_SIGNED_8_BIT) * BMM350_MAG_COMP_COEFF_SCALING;
+
+	data->mag_comp.cross_axis.cross_x_y = (data->mag_comp.cross_axis.cross_x_y / 800);
+	data->mag_comp.cross_axis.cross_y_x = (data->mag_comp.cross_axis.cross_y_x / 800);
+	data->mag_comp.cross_axis.cross_z_x = (data->mag_comp.cross_axis.cross_z_x / 800);
+	data->mag_comp.cross_axis.cross_z_y = (data->mag_comp.cross_axis.cross_z_y / 800);
+}
+
+static int bmm350_otp_dump_after_boot(const struct device *dev)
+{
+	struct bmm350_data *data = dev->data;
+	int ret = 0;
+	uint16_t otp_word = 0;
+
+	for (uint8_t idx = 0; idx < BMM350_OTP_DATA_LENGTH; idx++) {
+		ret = bmm350_read_otp_word(dev, idx, &otp_word);
+		data->otp_data[idx] = otp_word;
+	}
+
+	data->var_id = (data->otp_data[30] & 0x7f00) >> 9;
+	/* Set the default auto bit reset configuration */
+	data->enable_auto_br = ((data->var_id > BMM350_CURRENT_SHUTTLE_VARIANT_ID) ? BMM350_DISABLE
+										   : BMM350_ENABLE);
+
+	LOG_DBG("bmm350 Find the var id %d\n", data->var_id);
+	/* Update magnetometer offset and sensitivity data. */
+	bmm350_update_mag_off_sens(data);
+
+	if (ret) {
+		LOG_ERR("i2c xfer failed, ret = %d\n", ret);
+	}
+
+	return ret;
+}
+
+/*!
+ * @brief This API gets the PMU command status 0 value
+ */
+static int8_t bmm350_get_pmu_cmd_status_0(const struct device *dev,
+					  struct bmm350_pmu_cmd_status_0 *pmu_cmd_stat_0)
+{
+	/* Variable to store the function result */
+	int8_t ret;
+	uint8_t rx_buf[3] = {0x00};
+
+	if (pmu_cmd_stat_0 != NULL) {
+		/* Get PMU command status 0 data */
+		ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD_STATUS_0, &rx_buf[0], 3);
+		LOG_DBG("pmu cmd status 0:0x%x\n", rx_buf[2]);
+		if (ret == BMM350_OK) {
+			pmu_cmd_stat_0->pmu_cmd_busy =
+				BMM350_GET_BITS_POS_0(rx_buf[2], BMM350_PMU_CMD_BUSY);
+			pmu_cmd_stat_0->odr_ovwr = BMM350_GET_BITS(rx_buf[2], BMM350_ODR_OVWR);
+			pmu_cmd_stat_0->avr_ovwr = BMM350_GET_BITS(rx_buf[2], BMM350_AVG_OVWR);
+			pmu_cmd_stat_0->pwr_mode_is_normal =
+				BMM350_GET_BITS(rx_buf[2], BMM350_PWR_MODE_IS_NORMAL);
+			pmu_cmd_stat_0->cmd_is_illegal =
+				BMM350_GET_BITS(rx_buf[2], BMM350_CMD_IS_ILLEGAL);
+			pmu_cmd_stat_0->pmu_cmd_value =
+				BMM350_GET_BITS(rx_buf[2], BMM350_PMU_CMD_VALUE);
+		}
+	} else {
+		ret = -EINVAL;
+	}
+	return ret;
+}
+
+/*!
+ * @brief This internal API is used to switch from suspend mode to normal mode or forced mode.
+ */
+static int8_t set_powermode(const struct device *dev, enum bmm350_power_modes powermode)
+{
+	/* Variable to store the function result */
+	int8_t ret = 0;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t reg_data = powermode;
+
+	/* Array to store suspend to forced mode delay */
+	uint32_t sus_to_forced_mode[4] = {
+		BMM350_SUS_TO_FORCEDMODE_NO_AVG_DELAY, BMM350_SUS_TO_FORCEDMODE_AVG_2_DELAY,
+		BMM350_SUS_TO_FORCEDMODE_AVG_4_DELAY, BMM350_SUS_TO_FORCEDMODE_AVG_8_DELAY};
+
+	/* Array to store suspend to forced mode fast delay */
+	uint32_t sus_to_forced_mode_fast[4] = {BMM350_SUS_TO_FORCEDMODE_FAST_NO_AVG_DELAY,
+					       BMM350_SUS_TO_FORCEDMODE_FAST_AVG_2_DELAY,
+					       BMM350_SUS_TO_FORCEDMODE_FAST_AVG_4_DELAY,
+					       BMM350_SUS_TO_FORCEDMODE_FAST_AVG_8_DELAY};
+
+	uint8_t avg = 0;
+	uint32_t delay_us = 0;
+
+	if (ret == BMM350_OK) {
+		/* Get average configuration */
+		ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD_AGGR_SET, &rx_buf[0], 3);
+		/* Mask the average value */
+		avg = ((rx_buf[2] & BMM350_AVG_MSK) >> BMM350_AVG_POS);
+		if (ret == BMM350_OK) {
+			/* Get average configuration */
+			if (powermode == BMM350_NORMAL_MODE) {
+				delay_us = BMM350_SUSPEND_TO_NORMAL_DELAY;
+			}
+
+			/* Check if desired power mode is forced mode */
+			if (powermode == BMM350_FORCED_MODE) {
+				/* Store delay based on averaging mode */
+				delay_us = sus_to_forced_mode[avg];
+			}
+
+			/* Check if desired power mode is forced mode fast */
+			if (powermode == BMM350_FORCED_MODE_FAST) {
+				/* Store delay based on averaging mode */
+				delay_us = sus_to_forced_mode_fast[avg];
+			}
+
+			/* Set PMU command configuration to desired power mode */
+			ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, reg_data);
+			k_usleep(delay_us);
+		}
+	}
+
+	LOG_DBG("pmu cmd agget set powermode %d\n", powermode);
+
+	return ret;
+}
+
+/*!
+ * @brief This API is used to set the power mode of the sensor
+ */
+static int8_t bmm350_set_powermode(const struct device *dev, enum bmm350_power_modes powermode)
+{
+	/* Variable to store the function result */
+	int8_t ret = 0;
+	uint8_t rx_buf[3] = {0x00};
+
+	if (ret == BMM350_OK) {
+		ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD, &rx_buf[0], 3);
+		if (ret == BMM350_OK) {
+			if (rx_buf[2] > BMM350_PMU_CMD_NM_TC) {
+				ret = -EINVAL;
+			}
+
+			if ((ret == BMM350_OK) && ((rx_buf[2] == BMM350_PMU_CMD_NM) ||
+						   (rx_buf[2] == BMM350_PMU_CMD_UPD_OAE))) {
+				/* Set PMU command configuration */
+				ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, BMM350_PMU_CMD_SUS);
+			}
+
+			if (ret == BMM350_OK) {
+				ret = set_powermode(dev, powermode);
+			}
+		}
+	}
+
+	return ret;
+}
+
+/*!
+ * used to perform the magnetic reset of the sensor
+ * which is necessary after a field shock ( 400mT field applied to sensor )
+ */
+static int8_t bmm350_magnetic_reset_and_wait(const struct device *dev)
+{
+	/* Variable to store the function result */
+	int8_t ret = 0;
+	struct bmm350_pmu_cmd_status_0 pmu_cmd_stat_0 = {0};
+	uint8_t restore_normal = BMM350_DISABLE;
+
+	/* Read PMU CMD status */
+	ret = bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+	LOG_DBG("get status result 0:%d\n", ret);
+
+	/* Check the powermode is normal before performing magnetic reset */
+	if ((ret == BMM350_OK) && (pmu_cmd_stat_0.pwr_mode_is_normal == BMM350_ENABLE)) {
+		restore_normal = BMM350_ENABLE;
+		/* Reset can only be triggered in suspend */
+		ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+		LOG_DBG("set power mode 0:%d\n", ret);
+	}
+	if (ret == BMM350_OK) {
+		/* Set BR to PMU_CMD register */
+		ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, BMM350_PMU_CMD_BR);
+		k_usleep(BMM350_BR_DELAY);
+	}
+
+	if (ret == BMM350_OK) {
+		/* Verify if PMU_CMD_STATUS_0 register has BR set */
+		ret = bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+		LOG_DBG("get status result 1:%d\n", ret);
+		if ((ret == BMM350_OK) &&
+		    (pmu_cmd_stat_0.pmu_cmd_value != BMM350_PMU_CMD_STATUS_0_BR)) {
+			ret = -EIO;
+		}
+	}
+
+	if (ret == BMM350_OK) {
+		/* Set FGR to PMU_CMD register */
+		ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, BMM350_PMU_CMD_FGR);
+		k_usleep(BMM350_FGR_DELAY);
+	}
+	if (ret == BMM350_OK) {
+		/* Verify if PMU_CMD_STATUS_0 register has FGR set */
+		ret = bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+		LOG_DBG("get status result 2:%d\n", ret);
+
+		if ((ret == BMM350_OK) &&
+		    (pmu_cmd_stat_0.pmu_cmd_value != BMM350_PMU_CMD_STATUS_0_FGR)) {
+			ret = -EIO;
+		}
+	}
+
+	if ((ret == BMM350_OK) && (restore_normal == BMM350_ENABLE)) {
+		ret = bmm350_set_powermode(dev, BMM350_NORMAL_MODE);
+		LOG_DBG("set power mode 1:%d\n", ret);
+	} else {
+		if (ret == BMM350_OK) {
+			/* Reset PMU_CMD register */
+			ret = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, 0x00);
+		}
+	}
+	return ret;
+}
+/*!
+ * @brief This API is used to read uncompensated mag and temperature data.
+ */
+int8_t bmm350_read_uncomp_mag_temp_data(const struct device *dev,
+					struct bmm350_raw_mag_data *raw_data)
+{
+	struct bmm350_data *data = dev->data;
+	int8_t rslt = BMM350_OK;
+	uint8_t mag_data[14] = {0};
+	uint32_t raw_mag_x, raw_mag_y, raw_mag_z, raw_temp;
+
+	if (raw_data != NULL) {
+		/* Get uncompensated mag data */
+		rslt = bmm350_reg_read(dev, BMM350_REG_MAG_X_XLSB, mag_data, 14);
+
+		if (rslt == BMM350_OK) {
+			raw_mag_x = (uint32_t)mag_data[2] + ((uint32_t)mag_data[3] << 8) +
+				    ((uint32_t)mag_data[4] << 16);
+			raw_mag_y = (uint32_t)mag_data[5] + ((uint32_t)mag_data[6] << 8) +
+				    ((uint32_t)mag_data[7] << 16);
+			raw_mag_z = (uint32_t)mag_data[8] + ((uint32_t)mag_data[9] << 8) +
+				    ((uint32_t)mag_data[10] << 16);
+			raw_temp = (uint32_t)mag_data[11] + ((uint32_t)mag_data[12] << 8) +
+				   ((uint32_t)mag_data[13] << 16);
+
+			if ((data->axis_en & BMM350_EN_X_MSK) == BMM350_DISABLE) {
+				raw_data->raw_xdata = BMM350_DISABLE;
+			} else {
+				raw_data->raw_xdata = fix_sign(raw_mag_x, BMM350_SIGNED_24_BIT);
+			}
+
+			if ((data->axis_en & BMM350_EN_Y_MSK) == BMM350_DISABLE) {
+				raw_data->raw_ydata = BMM350_DISABLE;
+			} else {
+				raw_data->raw_ydata = fix_sign(raw_mag_y, BMM350_SIGNED_24_BIT);
+			}
+
+			if ((data->axis_en & BMM350_EN_Z_MSK) == BMM350_DISABLE) {
+				raw_data->raw_zdata = BMM350_DISABLE;
+			} else {
+				raw_data->raw_zdata = fix_sign(raw_mag_z, BMM350_SIGNED_24_BIT);
+			}
+
+			raw_data->raw_data_temp = fix_sign(raw_temp, BMM350_SIGNED_24_BIT);
+		}
+	} else {
+		rslt = -EINVAL;
+	}
+
+	return rslt;
+}
+static int8_t read_out_raw_data(const struct device *dev, int32_t *out_data)
+{
+	int8_t rslt = BMM350_OK;
+	int32_t temp = 0;
+	struct bmm350_raw_mag_data raw_data = {0};
+
+	if (out_data != NULL) {
+		rslt = bmm350_read_uncomp_mag_temp_data(dev, &raw_data);
+
+		if (rslt == BMM350_OK) {
+			/* Convert mag lsb to uT and temp lsb to degC */
+			out_data[0] = ((raw_data.raw_xdata * BMM350_LSB_TO_UT_XY_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+			out_data[1] = ((raw_data.raw_ydata * BMM350_LSB_TO_UT_XY_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+			out_data[2] = ((raw_data.raw_zdata * BMM350_LSB_TO_UT_Z_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+			out_data[3] = ((raw_data.raw_data_temp * BMM350_LSB_TO_UT_TEMP_COEFF) /
+				       BMM350_LSB_TO_UT_COEFF_DIV);
+
+			if (out_data[3] > 0) {
+				temp = (out_data[3] - (2549 / 100));
+			} else if (out_data[3] < 0) {
+				temp = (out_data[3] + (2549 / 100));
+			} else {
+				temp = out_data[3];
+			}
+
+			out_data[3] = temp;
+		}
+	} else {
+		rslt = -EINVAL;
+	}
+
+	return rslt;
+}
+
+int8_t bmm350_get_compensated_mag_xyz_temp_data_fixed(const struct device *dev,
+						      struct bmm350_mag_temp_data *mag_temp_data)
+{
+	struct bmm350_data *data = dev->data;
+	int8_t rslt = BMM350_OK;
+	uint8_t indx;
+	int32_t out_data[4] = {0};
+	int32_t dut_offset_coef[3], dut_sensit_coef[3], dut_tco[3], dut_tcs[3];
+	int32_t cr_ax_comp_x, cr_ax_comp_y, cr_ax_comp_z;
+
+	if (mag_temp_data != NULL) {
+		/* Reads raw magnetic x,y and z axis along with temperature */
+		rslt = read_out_raw_data(dev, out_data);
+
+		if (rslt == BMM350_OK) {
+			/* Apply compensation to temperature reading */
+			out_data[3] = (((BMM350_MAG_COMP_COEFF_SCALING +
+					 data->mag_comp.dut_sensit_coef.t_sens) *
+					out_data[3]) +
+				       data->mag_comp.dut_offset_coef.t_offs) /
+				      BMM350_MAG_COMP_COEFF_SCALING;
+
+			/* Store magnetic compensation structure to an array */
+			dut_offset_coef[0] = data->mag_comp.dut_offset_coef.offset_x;
+			dut_offset_coef[1] = data->mag_comp.dut_offset_coef.offset_y;
+			dut_offset_coef[2] = data->mag_comp.dut_offset_coef.offset_z;
+
+			dut_sensit_coef[0] = data->mag_comp.dut_sensit_coef.sens_x;
+			dut_sensit_coef[1] = data->mag_comp.dut_sensit_coef.sens_y;
+			dut_sensit_coef[2] = data->mag_comp.dut_sensit_coef.sens_z;
+
+			dut_tco[0] = data->mag_comp.dut_tco.tco_x;
+			dut_tco[1] = data->mag_comp.dut_tco.tco_y;
+			dut_tco[2] = data->mag_comp.dut_tco.tco_z;
+
+			dut_tcs[0] = data->mag_comp.dut_tcs.tcs_x;
+			dut_tcs[1] = data->mag_comp.dut_tcs.tcs_y;
+			dut_tcs[2] = data->mag_comp.dut_tcs.tcs_z;
+
+			/* Compensate raw magnetic data */
+			for (indx = 0; indx < 3; indx++) {
+				out_data[indx] = (out_data[indx] * (BMM350_MAG_COMP_COEFF_SCALING +
+								    dut_sensit_coef[indx])) /
+						 BMM350_MAG_COMP_COEFF_SCALING;
+				out_data[indx] = (out_data[indx] + dut_offset_coef[indx]);
+				out_data[indx] =
+					((out_data[indx] * BMM350_MAG_COMP_COEFF_SCALING) +
+					 (dut_tco[indx] * (out_data[3] - data->mag_comp.dut_t0))) /
+					BMM350_MAG_COMP_COEFF_SCALING;
+				out_data[indx] =
+					(out_data[indx] * BMM350_MAG_COMP_COEFF_SCALING) /
+					(BMM350_MAG_COMP_COEFF_SCALING +
+					 (dut_tcs[indx] * (out_data[3] - data->mag_comp.dut_t0)));
+			}
+
+			cr_ax_comp_x =
+				((((out_data[0] * BMM350_MAG_COMP_COEFF_SCALING) -
+				   (data->mag_comp.cross_axis.cross_x_y * out_data[1])) *
+				  BMM350_MAG_COMP_COEFF_SCALING) /
+				 ((BMM350_MAG_COMP_COEFF_SCALING * BMM350_MAG_COMP_COEFF_SCALING) -
+				  (data->mag_comp.cross_axis.cross_y_x *
+				   data->mag_comp.cross_axis.cross_x_y)));
+
+			cr_ax_comp_y =
+				((((out_data[1] * BMM350_MAG_COMP_COEFF_SCALING) -
+				   (data->mag_comp.cross_axis.cross_y_x * out_data[0])) *
+				  BMM350_MAG_COMP_COEFF_SCALING) /
+				 ((BMM350_MAG_COMP_COEFF_SCALING * BMM350_MAG_COMP_COEFF_SCALING) -
+				  (data->mag_comp.cross_axis.cross_y_x *
+				   data->mag_comp.cross_axis.cross_x_y)));
+
+			cr_ax_comp_z =
+				(out_data[2] +
+				 (((out_data[0] * ((data->mag_comp.cross_axis.cross_y_x *
+						    data->mag_comp.cross_axis.cross_z_y) -
+						   (data->mag_comp.cross_axis.cross_z_x *
+						    BMM350_MAG_COMP_COEFF_SCALING))) -
+				   (out_data[1] * ((data->mag_comp.cross_axis.cross_z_y *
+						    BMM350_MAG_COMP_COEFF_SCALING) -
+						   (data->mag_comp.cross_axis.cross_x_y *
+						    data->mag_comp.cross_axis.cross_z_x))))) /
+					 (((BMM350_MAG_COMP_COEFF_SCALING *
+					    BMM350_MAG_COMP_COEFF_SCALING) -
+					   data->mag_comp.cross_axis.cross_y_x *
+						   data->mag_comp.cross_axis.cross_x_y)));
+
+			out_data[0] = (int32_t)cr_ax_comp_x;
+			out_data[1] = (int32_t)cr_ax_comp_y;
+			out_data[2] = (int32_t)cr_ax_comp_z;
+		}
+		LOG_DBG("mag data %d %d %d\n", out_data[0], out_data[1], out_data[2]);
+
+		if (rslt == BMM350_OK) {
+			if ((data->axis_en & BMM350_EN_X_MSK) == BMM350_DISABLE) {
+				mag_temp_data->x = BMM350_DISABLE;
+			} else {
+				mag_temp_data->x = out_data[0];
+			}
+
+			if ((data->axis_en & BMM350_EN_Y_MSK) == BMM350_DISABLE) {
+				mag_temp_data->y = BMM350_DISABLE;
+			} else {
+				mag_temp_data->y = out_data[1];
+			}
+
+			if ((data->axis_en & BMM350_EN_Z_MSK) == BMM350_DISABLE) {
+				mag_temp_data->z = BMM350_DISABLE;
+			} else {
+				mag_temp_data->z = out_data[2];
+			}
+			mag_temp_data->temperature = out_data[3];
+		}
+	} else {
+		rslt = -EINVAL;
+	}
+	return rslt;
+}
+
+static int bmm350_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	struct bmm350_data *drv_data = dev->data;
+	struct bmm350_mag_temp_data mag_temp_data;
+
+	if (bmm350_get_compensated_mag_xyz_temp_data_fixed(dev, &mag_temp_data) < 0) {
+		LOG_ERR("failed to read sample");
+		return -EIO;
+	}
+	drv_data->mag_temp_data.x = mag_temp_data.x;
+	drv_data->mag_temp_data.y = mag_temp_data.y;
+	drv_data->mag_temp_data.z = mag_temp_data.z;
+	return 0;
+}
+
+/*
+ * ut change to Gauss
+ */
+static void bmm350_convert(struct sensor_value *val, int raw_val)
+{
+	val->val1 = raw_val / 100;
+	val->val2 = (raw_val % 100) * 10000;
+}
+
+static int bmm350_channel_get(const struct device *dev, enum sensor_channel chan,
+			      struct sensor_value *val)
+{
+	struct bmm350_data *drv_data = dev->data;
+
+	switch (chan) {
+	case SENSOR_CHAN_MAGN_X:
+		bmm350_convert(val, drv_data->mag_temp_data.x);
+		break;
+	case SENSOR_CHAN_MAGN_Y:
+		bmm350_convert(val, drv_data->mag_temp_data.y);
+		break;
+	case SENSOR_CHAN_MAGN_Z:
+		bmm350_convert(val, drv_data->mag_temp_data.z);
+		break;
+	case SENSOR_CHAN_MAGN_XYZ:
+		bmm350_convert(val, drv_data->mag_temp_data.x);
+		bmm350_convert(val + 1, drv_data->mag_temp_data.y);
+		bmm350_convert(val + 2, drv_data->mag_temp_data.z);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+static uint8_t acc_odr_to_reg(const struct sensor_value *val)
+{
+	double odr = sensor_value_to_double((struct sensor_value *)val);
+
+	uint8_t reg = BMM350_DATA_RATE_100HZ;
+
+	if ((odr >= 0.78125) && (odr <= 1.5625)) {
+		reg = BMM350_DATA_RATE_1_5625HZ;
+	} else if ((odr > 1.5625) && (odr <= 3.125)) {
+		reg = BMM350_DATA_RATE_3_125HZ;
+	} else if ((odr > 3.125) && (odr <= 6.25)) {
+		reg = BMM350_DATA_RATE_6_25HZ;
+	} else if ((odr > 6.25) && (odr <= 12.5)) {
+		reg = BMM350_DATA_RATE_12_5HZ;
+	} else if ((odr > 12.5) && (odr <= 25.0)) {
+		reg = BMM350_DATA_RATE_25HZ;
+	} else if ((odr > 25.0) && (odr <= 50.0)) {
+		reg = BMM350_DATA_RATE_50HZ;
+	} else if ((odr > 50.0) && (odr <= 100.0)) {
+		reg = BMM350_DATA_RATE_100HZ;
+	} else if ((odr > 100.0) && (odr <= 200.0)) {
+		reg = BMM350_DATA_RATE_200HZ;
+	} else if ((odr > 200.0) && (odr <= 400.0)) {
+		reg = BMM350_DATA_RATE_400HZ;
+	} else if (odr > 400.0) {
+		reg = BMM350_DATA_RATE_400HZ;
+	}
+	return reg;
+}
+
+static uint8_t acc_osr_to_reg(const struct sensor_value *val)
+{
+	switch (val->val1) {
+	case 0:
+		return BMM350_NO_AVERAGING;
+	case 2:
+		return BMM350_AVERAGING_2;
+	case 4:
+		return BMM350_AVERAGING_4;
+	case 8:
+		return BMM350_AVERAGING_8;
+	default:
+		return 0xFF;
+	}
+}
+
+/*!
+ * @brief This API sets the ODR and averaging factor.
+ */
+int8_t bmm350_set_odr_performance(enum bmm350_data_rates odr,
+				  enum bmm350_performance_parameters performance,
+				  const struct device *dev)
+{
+	/* Variable to store the function result */
+	int8_t rslt = 0x00;
+	/* Variable to get PMU command */
+	uint8_t reg_data = 0;
+	enum bmm350_performance_parameters performance_fix = performance;
+
+	/* Reduce the performance setting when too high for the chosen ODR */
+	if ((odr == BMM350_DATA_RATE_400HZ) && (performance >= BMM350_AVERAGING_2)) {
+		performance_fix = BMM350_NO_AVERAGING;
+	} else if ((odr == BMM350_DATA_RATE_200HZ) && (performance >= BMM350_AVERAGING_4)) {
+		performance_fix = BMM350_AVERAGING_2;
+	} else if ((odr == BMM350_DATA_RATE_100HZ) && (performance >= BMM350_AVERAGING_8)) {
+		performance_fix = BMM350_AVERAGING_4;
+	}
+	if (performance_fix != performance) {
+		LOG_WRN("performance adjusted to %d", performance_fix);
+	}
+
+	/* ODR is an enum taking the generated constants from the register map */
+	reg_data = ((uint8_t)odr & BMM350_ODR_MSK);
+	/* AVG / performance is an enum taking the generated constants from the register map */
+	reg_data = BMM350_SET_BITS(reg_data, BMM350_AVG, (uint8_t)performance_fix);
+	/* Set PMU command configurations for ODR and performance */
+	rslt = bmm350_reg_write(dev, BMM350_REG_PMU_CMD_AGGR_SET, reg_data);
+	LOG_DBG("odr index %d odr_reg_data 0x%x", odr, reg_data);
+
+	if (rslt == BMM350_OK) {
+		/* Set PMU command configurations to update odr and average */
+		reg_data = BMM350_PMU_CMD_UPD_OAE;
+		/* Set PMU command configuration */
+		rslt = bmm350_reg_write(dev, BMM350_REG_PMU_CMD, reg_data);
+		if (rslt == BMM350_OK) {
+			k_usleep(BMM350_UPD_OAE_DELAY);
+		}
+	}
+
+	return rslt;
+}
+static int set_mag_odr_osr(const struct device *dev, const struct sensor_value *odr,
+			   const struct sensor_value *osr)
+{
+	int ret;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t osr_bits;
+	uint8_t odr_bits;
+
+	/* read current state */
+	ret = bmm350_reg_read(dev, BMM350_REG_PMU_CMD_AGGR_SET, &rx_buf[0], 3);
+	if (ret < 0) {
+		LOG_ERR("failed to read PMU_CMD_AGGR_SET");
+		return -EIO;
+	}
+	osr_bits = ((rx_buf[2] & BMM350_AVG_MSK) >> BMM350_AVG_POS);
+	odr_bits = ((rx_buf[2] & BMM350_ODR_MSK) >> BMM350_ODR_POS);
+
+	/* to change sampling rate, device needs to suspend first */
+	ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+	if (ret < 0) {
+		LOG_ERR("failed to set suspend mode");
+		return -EIO;
+	}
+
+	if (odr) {
+		odr_bits = acc_odr_to_reg(odr);
+	}
+	if (osr) {
+		osr_bits = acc_osr_to_reg(osr);
+		if (osr_bits == 0xFF) {
+			LOG_ERR("unsupported oversampling rate");
+			return -EINVAL;
+		}
+	}
+	if (bmm350_set_odr_performance((enum bmm350_data_rates)odr_bits, osr_bits, dev) < 0) {
+		LOG_ERR("bmm350_set_odr_performance failed");
+		return -EIO;
+	}
+
+	/* go to normal mode now, measurements are requested. */
+	ret = bmm350_set_powermode(dev, BMM350_NORMAL_MODE);
+	if (ret < 0) {
+		LOG_ERR("failed to set suspend mode");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int bmm350_attr_set(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, const struct sensor_value *val)
+{
+	switch (attr) {
+	case SENSOR_ATTR_SAMPLING_FREQUENCY:
+		if (set_mag_odr_osr(dev, val, NULL) < 0) {
+			return -EIO;
+		}
+		break;
+	case SENSOR_ATTR_OVERSAMPLING:
+		if (set_mag_odr_osr(dev, NULL, val) < 0) {
+			return -EIO;
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+static DEVICE_API(sensor, bmm350_api_funcs) = {
+	.attr_set = bmm350_attr_set,
+	.sample_fetch = bmm350_sample_fetch,
+	.channel_get = bmm350_channel_get,
+#ifdef CONFIG_BMM350_TRIGGER
+	.trigger_set = bmm350_trigger_set,
+#endif
+};
+
+static int bmm350_init_chip(const struct device *dev)
+{
+	struct bmm350_pmu_cmd_status_0 pmu_cmd_stat_0 = {0};
+	/* Variable to store soft-reset command */
+	uint8_t soft_reset;
+	uint8_t rx_buf[3] = {0x00};
+	uint8_t chip_id[3] = {0x00};
+	int ret = 0;
+	/* Read chip ID (can only be read in sleep mode)*/
+	if (bmm350_reg_read(dev, BMM350_REG_CHIP_ID, &chip_id[0], 3) < 0) {
+		LOG_ERR("failed reading chip id");
+		goto err_poweroff;
+	}
+	if (chip_id[2] != BMM350_CHIP_ID) {
+		LOG_ERR("invalid chip id 0x%x", chip_id[2]);
+		goto err_poweroff;
+	}
+	/* Soft-reset */
+	soft_reset = BMM350_CMD_SOFTRESET;
+
+	/* Set the command in the command register */
+	ret = bmm350_reg_write(dev, BMM350_REG_CMD, soft_reset);
+	k_usleep(BMM350_SOFT_RESET_DELAY);
+	/* Read chip ID (can only be read in sleep mode)*/
+	if (bmm350_reg_read(dev, BMM350_REG_CHIP_ID, &chip_id[0], 3) < 0) {
+		LOG_ERR("failed reading chip id");
+		goto err_poweroff;
+	}
+	if (chip_id[2] != BMM350_CHIP_ID) {
+		LOG_ERR("invalid chip id 0x%x", chip_id[2]);
+		goto err_poweroff;
+	}
+	ret = bmm350_otp_dump_after_boot(dev);
+	LOG_DBG("bmm350 chip_id 0x%x otp dump after boot %d\n", chip_id[2], ret);
+
+	if (bmm350_reg_write(dev, BMM350_REG_OTP_CMD_REG, BMM350_OTP_CMD_PWR_OFF_OTP) < 0) {
+		LOG_ERR("failed to set REP");
+		goto err_poweroff;
+	}
+
+	ret += bmm350_magnetic_reset_and_wait(dev);
+
+	LOG_DBG("bmm350 setup result %d\n", ret);
+
+	ret += bmm350_get_pmu_cmd_status_0(dev, &pmu_cmd_stat_0);
+	ret += bmm350_reg_read(dev, BMM350_REG_ERR_REG, &rx_buf[0], 3);
+	if (ret != 0) {
+		LOG_ERR("%s %d", __func__, ret);
+	}
+
+	return 0;
+
+err_poweroff:
+	ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+	if (ret != 0) {
+		return -EIO;
+	}
+	return -EIO;
+}
+
+#ifdef CONFIG_PM_DEVICE
+static int pm_action(const struct device *dev, enum pm_device_action action)
+{
+	int ret;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ret = bmm350_set_powermode(dev, BMM350_NORMAL_MODE);
+		if (ret != 0) {
+			LOG_ERR("failed to enter normal mode: %d", ret);
+		}
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		ret = bmm350_set_powermode(dev, BMM350_SUSPEND_MODE);
+		if (ret != 0) {
+			LOG_ERR("failed to enter suspend mode: %d", ret);
+		}
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return ret;
+}
+#endif
+
+static int bmm350_init(const struct device *dev)
+{
+	int err = 0;
+	struct bmm350_data *data = dev->data;
+	const struct sensor_value odr = {100, 0};
+	const struct sensor_value osr = {2, 0};
+
+	err = bmm350_bus_check(dev);
+	if (err < 0) {
+		LOG_ERR("bus check failed: %d", err);
+		return err;
+	}
+
+	if (bmm350_init_chip(dev) < 0) {
+		LOG_ERR("failed to initialize chip");
+		return -EIO;
+	}
+
+#ifdef CONFIG_BMM350_TRIGGER
+	if (bmm350_trigger_mode_init(dev) < 0) {
+		LOG_ERR("Cannot set up trigger mode.");
+		return -EINVAL;
+	}
+#endif
+
+	/* Assign axis_en with all axis enabled (BMM350_EN_XYZ_MSK) */
+	data->axis_en = BMM350_EN_XYZ_MSK;
+
+	/* Initialize to 100Hz, averaging between 2 samples by default */
+	if (set_mag_odr_osr(dev, &odr, &osr) < 0) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+/* Initializes a struct bmm350_config for an instance on an I2C bus. */
+#define BMM350_CONFIG_I2C(inst) .bus.i2c = I2C_DT_SPEC_INST_GET(inst), .bus_io = &bmm350_bus_io_i2c,
+#define BMM350_INT_CFG(inst)    .drdy_int = GPIO_DT_SPEC_INST_GET_OR(inst, drdy_gpios, {0}),
+
+#define BMM350_DEFINE(inst)                                                                        \
+	static struct bmm350_data bmm350_data_##inst;                                              \
+	static const struct bmm350_config bmm350_config_##inst = {                                 \
+		.bus.i2c = I2C_DT_SPEC_INST_GET(inst),                                             \
+		.bus_io = &bmm350_bus_io_i2c,                                                      \
+		BMM350_INT_CFG(inst)};                                                             \
+                                                                                                   \
+	PM_DEVICE_DT_INST_DEFINE(inst, pm_action);                                                 \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, bmm350_init, PM_DEVICE_DT_INST_GET(inst),               \
+				     &bmm350_data_##inst, &bmm350_config_##inst, POST_KERNEL,      \
+				     CONFIG_SENSOR_INIT_PRIORITY, &bmm350_api_funcs);
+
+/* Create the struct device for every status "okay" node in the devicetree. */
+DT_INST_FOREACH_STATUS_OKAY(BMM350_DEFINE)
diff --git a/drivers/sensor/bosch/bmm350/bmm350.h b/drivers/sensor/bosch/bmm350/bmm350.h
new file mode 100644
index 0000000000000..adf23a068e855
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350.h
@@ -0,0 +1,497 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for BMM350s accessed via I2C.
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMM350_BMM350_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMM350_BMM350_H_
+
+#include <zephyr/types.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/i2c.h>
+
+#define DT_DRV_COMPAT bosch_bmm350
+
+#define BMM350_BUS_I2C DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
+
+struct bmm350_bus {
+	struct i2c_dt_spec i2c;
+};
+
+typedef int (*bmm350_bus_check_fn)(const struct bmm350_bus *bus);
+typedef int (*bmm350_reg_read_fn)(const struct bmm350_bus *bus, uint8_t start, uint8_t *buf,
+				  int size);
+typedef int (*bmm350_reg_write_fn)(const struct bmm350_bus *bus, uint8_t reg, uint8_t val);
+
+struct bmm350_bus_io {
+	bmm350_bus_check_fn check;
+	bmm350_reg_read_fn read;
+	bmm350_reg_write_fn write;
+};
+
+extern const struct bmm350_bus_io bmm350_bus_io_i2c;
+
+#include <zephyr/types.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/gpio.h>
+
+#define DT_DRV_COMPAT  bosch_bmm350
+#define BMM350_OK      (0)
+#define BMM350_DISABLE UINT8_C(0x0)
+#define BMM350_ENABLE  UINT8_C(0x1)
+
+#define BMM350_REG_CHIP_ID           UINT8_C(0x00)
+#define BMM350_REG_REV_ID            UINT8_C(0x01)
+#define BMM350_REG_ERR_REG           UINT8_C(0x02)
+#define BMM350_REG_PAD_CTRL          UINT8_C(0x03)
+#define BMM350_REG_PMU_CMD_AGGR_SET  UINT8_C(0x04)
+#define BMM350_REG_PMU_CMD_AXIS_EN   UINT8_C(0x05)
+#define BMM350_REG_PMU_CMD           UINT8_C(0x06)
+#define BMM350_REG_PMU_CMD_STATUS_0  UINT8_C(0x07)
+#define BMM350_REG_PMU_CMD_STATUS_1  UINT8_C(0x08)
+#define BMM350_REG_I3C_ERR           UINT8_C(0x09)
+#define BMM350_REG_I2C_WDT_SET       UINT8_C(0x0A)
+#define BMM350_REG_TRSDCR_REV_ID     UINT8_C(0x0D)
+#define BMM350_REG_TC_SYNC_TU        UINT8_C(0x21)
+#define BMM350_REG_TC_SYNC_ODR       UINT8_C(0x22)
+#define BMM350_REG_TC_SYNC_TPH_1     UINT8_C(0x23)
+#define BMM350_REG_TC_SYNC_TPH_2     UINT8_C(0x24)
+#define BMM350_REG_TC_SYNC_DT        UINT8_C(0x25)
+#define BMM350_REG_TC_SYNC_ST_0      UINT8_C(0x26)
+#define BMM350_REG_TC_SYNC_ST_1      UINT8_C(0x27)
+#define BMM350_REG_TC_SYNC_ST_2      UINT8_C(0x28)
+#define BMM350_REG_TC_SYNC_STATUS    UINT8_C(0x29)
+#define BMM350_REG_INT_CTRL          UINT8_C(0x2E)
+#define BMM350_REG_INT_CTRL_IBI      UINT8_C(0x2F)
+#define BMM350_REG_INT_STATUS        UINT8_C(0x30)
+#define BMM350_REG_MAG_X_XLSB        UINT8_C(0x31)
+#define BMM350_REG_MAG_X_LSB         UINT8_C(0x32)
+#define BMM350_REG_MAG_X_MSB         UINT8_C(0x33)
+#define BMM350_REG_MAG_Y_XLSB        UINT8_C(0x34)
+#define BMM350_REG_MAG_Y_LSB         UINT8_C(0x35)
+#define BMM350_REG_MAG_Y_MSB         UINT8_C(0x36)
+#define BMM350_REG_MAG_Z_XLSB        UINT8_C(0x37)
+#define BMM350_REG_MAG_Z_LSB         UINT8_C(0x38)
+#define BMM350_REG_MAG_Z_MSB         UINT8_C(0x39)
+#define BMM350_REG_TEMP_XLSB         UINT8_C(0x3A)
+#define BMM350_REG_TEMP_LSB          UINT8_C(0x3B)
+#define BMM350_REG_TEMP_MSB          UINT8_C(0x3C)
+#define BMM350_REG_SENSORTIME_XLSB   UINT8_C(0x3D)
+#define BMM350_REG_SENSORTIME_LSB    UINT8_C(0x3E)
+#define BMM350_REG_SENSORTIME_MSB    UINT8_C(0x3F)
+#define BMM350_REG_OTP_CMD_REG       UINT8_C(0x50)
+#define BMM350_REG_OTP_DATA_MSB_REG  UINT8_C(0x52)
+#define BMM350_REG_OTP_DATA_LSB_REG  UINT8_C(0x53)
+#define BMM350_REG_OTP_STATUS_REG    UINT8_C(0x55)
+#define BMM350_REG_TMR_SELFTEST_USER UINT8_C(0x60)
+#define BMM350_REG_CTRL_USER         UINT8_C(0x61)
+#define BMM350_REG_CMD               UINT8_C(0x7E)
+
+/************************* Sensor Shuttle Variant **************************/
+#define BMM350_LEGACY_SHUTTLE_VARIANT_ID  UINT8_C(0x10)
+#define BMM350_CURRENT_SHUTTLE_VARIANT_ID UINT8_C(0x11)
+
+/********************* Sensor interface success code **********************/
+#define BMM350_INTF_RET_SUCCESS INT8_C(0)
+
+/* default value */
+#define BMM350_CHIP_ID                 UINT8_C(0x33)
+#define BMM350_REV_ID                  UINT8_C(0x00)
+#define BMM350_OTP_CMD_DIR_READ        UINT8_C(0x20)
+#define BMM350_OTP_WORD_ADDR_MSK       UINT8_C(0x1F)
+#define BMM350_OTP_STATUS_ERROR_MSK    UINT8_C(0xE0)
+#define BMM350_OTP_STATUS_ERROR(val)   (val & BMM350_OTP_STATUS_ERROR_MSK)
+#define BMM350_OTP_STATUS_NO_ERROR     UINT8_C(0x00)
+#define BMM350_OTP_STATUS_BOOT_ERR     (0x20)
+#define BMM350_OTP_STATUS_PAGE_RD_ERR  (0x40)
+#define BMM350_OTP_STATUS_PAGE_PRG_ERR (0x60)
+#define BMM350_OTP_STATUS_SIGN_ERR     (0x80)
+#define BMM350_OTP_STATUS_INV_CMD_ERR  (0xA0)
+#define BMM350_OTP_STATUS_CMD_DONE     UINT8_C(0x01)
+#define BMM350_CMD_SOFTRESET           UINT8_C(0xB6)
+
+/****************************** OTP indices ***************************/
+#define BMM350_TEMP_OFF_SENS UINT8_C(0x0D)
+#define BMM350_MAG_OFFSET_X  UINT8_C(0x0E)
+#define BMM350_MAG_OFFSET_Y  UINT8_C(0x0F)
+#define BMM350_MAG_OFFSET_Z  UINT8_C(0x10)
+
+#define BMM350_MAG_SENS_X UINT8_C(0x10)
+#define BMM350_MAG_SENS_Y UINT8_C(0x11)
+#define BMM350_MAG_SENS_Z UINT8_C(0x11)
+
+#define BMM350_MAG_TCO_X UINT8_C(0x12)
+#define BMM350_MAG_TCO_Y UINT8_C(0x13)
+#define BMM350_MAG_TCO_Z UINT8_C(0x14)
+
+#define BMM350_MAG_TCS_X UINT8_C(0x12)
+#define BMM350_MAG_TCS_Y UINT8_C(0x13)
+#define BMM350_MAG_TCS_Z UINT8_C(0x14)
+
+#define BMM350_MAG_DUT_T_0 UINT8_C(0x18)
+
+#define BMM350_CROSS_X_Y UINT8_C(0x15)
+#define BMM350_CROSS_Y_X UINT8_C(0x15)
+#define BMM350_CROSS_Z_X UINT8_C(0x16)
+#define BMM350_CROSS_Z_Y UINT8_C(0x16)
+
+/**************************** Signed bit macros **********************/
+enum bmm350_signed_bit {
+	BMM350_SIGNED_8_BIT = 8,
+	BMM350_SIGNED_12_BIT = 12,
+	BMM350_SIGNED_16_BIT = 16,
+	BMM350_SIGNED_21_BIT = 21,
+	BMM350_SIGNED_24_BIT = 24
+};
+
+/********************* Power modes *************************/
+#define BMM350_PMU_CMD_SUS        0x00
+#define BMM350_PMU_CMD_NM         0x01
+#define BMM350_PMU_CMD_UPD_OAE    UINT8_C(0x02)
+#define BMM350_PMU_CMD_FM         0x03
+#define BMM350_PMU_CMD_FM_FAST    0x04
+#define BMM350_PMU_CMD_FGR        UINT8_C(0x05)
+#define BMM350_PMU_CMD_FGR_FAST   UINT8_C(0x06)
+#define BMM350_PMU_CMD_BR         UINT8_C(0x07)
+#define BMM350_PMU_CMD_BR_FAST    UINT8_C(0x08)
+#define BMM350_PMU_CMD_ENABLE_XYZ UINT8_C(0x70)
+#define BMM350_PMU_STATUS_0       UINT8_C(0x00)
+
+/**************************** PMU command status 0 macros **********************/
+#define BMM350_PMU_CMD_STATUS_0_SUS      UINT8_C(0x00)
+#define BMM350_PMU_CMD_STATUS_0_NM       UINT8_C(0x01)
+#define BMM350_PMU_CMD_STATUS_0_UPD_OAE  UINT8_C(0x02)
+#define BMM350_PMU_CMD_STATUS_0_FM       UINT8_C(0x03)
+#define BMM350_PMU_CMD_STATUS_0_FM_FAST  UINT8_C(0x04)
+#define BMM350_PMU_CMD_STATUS_0_FGR      UINT8_C(0x05)
+#define BMM350_PMU_CMD_STATUS_0_FGR_FAST UINT8_C(0x06)
+#define BMM350_PMU_CMD_STATUS_0_BR       UINT8_C(0x07)
+#define BMM350_PMU_CMD_STATUS_0_BR_FAST  UINT8_C(0x07)
+
+/*********************** Macros for bit masking ***************************/
+#define BMM350_AVG_MSK                (0x30)
+#define BMM350_AVG_POS                UINT8_C(0x04)
+#define BMM350_PMU_CMD_BUSY_MSK       UINT8_C(0x01)
+#define BMM350_PMU_CMD_BUSY_POS       UINT8_C(0x00)
+#define BMM350_ODR_OVWR_MSK           UINT8_C(0x02)
+#define BMM350_ODR_OVWR_POS           UINT8_C(0x01)
+#define BMM350_AVG_OVWR_MSK           UINT8_C(0x04)
+#define BMM350_AVG_OVWR_POS           UINT8_C(0x02)
+#define BMM350_PWR_MODE_IS_NORMAL_MSK UINT8_C(0x08)
+#define BMM350_PWR_MODE_IS_NORMAL_POS UINT8_C(0x03)
+#define BMM350_CMD_IS_ILLEGAL_MSK     UINT8_C(0x10)
+#define BMM350_CMD_IS_ILLEGAL_POS     UINT8_C(0x04)
+#define BMM350_PMU_CMD_VALUE_MSK      UINT8_C(0xE0)
+#define BMM350_PMU_CMD_VALUE_POS      UINT8_C(0x05)
+
+/**************************** Self-test macros **********************/
+#define BMM350_SELF_TEST_DISABLE UINT8_C(0x00)
+#define BMM350_SELF_TEST_POS_X   UINT8_C(0x0D)
+#define BMM350_SELF_TEST_NEG_X   UINT8_C(0x0B)
+#define BMM350_SELF_TEST_POS_Y   UINT8_C(0x15)
+#define BMM350_SELF_TEST_NEG_Y   UINT8_C(0x13)
+
+/************************* Sensor delay time settings in microseconds **************************/
+#define BMM350_SOFT_RESET_DELAY       UINT32_C(24000)
+#define BMM350_MAGNETIC_RESET_DELAY   UINT32_C(40000)
+#define BMM350_START_UP_TIME_FROM_POR UINT32_C(3000)
+
+#define BMM350_GOTO_SUSPEND_DELAY      UINT32_C(6000)
+#define BMM350_SUSPEND_TO_NORMAL_DELAY UINT32_C(38000)
+
+#define BMM350_SUS_TO_FORCEDMODE_NO_AVG_DELAY (15000)
+#define BMM350_SUS_TO_FORCEDMODE_AVG_2_DELAY  (17000)
+#define BMM350_SUS_TO_FORCEDMODE_AVG_4_DELAY  (20000)
+#define BMM350_SUS_TO_FORCEDMODE_AVG_8_DELAY  (28000)
+
+#define BMM350_SUS_TO_FORCEDMODE_FAST_NO_AVG_DELAY (4000)
+#define BMM350_SUS_TO_FORCEDMODE_FAST_AVG_2_DELAY  (5000)
+#define BMM350_SUS_TO_FORCEDMODE_FAST_AVG_4_DELAY  (9000)
+#define BMM350_SUS_TO_FORCEDMODE_FAST_AVG_8_DELAY  (16000)
+
+#define BMM350_PMU_CMD_NM_TC       UINT8_C(0x09)
+#define BMM350_OTP_DATA_LENGTH     UINT8_C(32)
+#define BMM350_READ_BUFFER_LENGTH  UINT8_C(127)
+#define BMM350_MAG_TEMP_DATA_LEN   UINT8_C(12)
+#define BMM350_OTP_CMD_PWR_OFF_OTP UINT8_C(0x80)
+#define BMM350_UPD_OAE_DELAY       UINT16_C(1000)
+
+#define BMM350_BR_DELAY         UINT16_C(14000)
+#define BMM350_FGR_DELAY        UINT16_C(18000)
+#define BMM350_SOFT_RESET_DELAY UINT32_C(24000)
+
+#define BMM350_LSB_MASK UINT16_C(0x00FF)
+#define BMM350_MSB_MASK UINT16_C(0xFF00)
+
+#define BMM350_LSB_TO_UT_XY_COEFF     71
+#define BMM350_LSB_TO_UT_Z_COEFF      72
+#define BMM350_LSB_TO_UT_TEMP_COEFF   10
+#define BMM350_LSB_TO_UT_COEFF_DIV    10000
+#define BMM350_MAG_COMP_COEFF_SCALING 1000
+
+#define BMM350_SENS_CORR_Y 1
+#define BMM350_TCS_CORR_Z  1
+
+#define BMM350_EN_X_MSK            UINT8_C(0x01)
+#define BMM350_EN_X_POS            UINT8_C(0x0)
+#define BMM350_EN_Y_MSK            UINT8_C(0x02)
+#define BMM350_EN_Y_POS            UINT8_C(0x1)
+#define BMM350_EN_Z_MSK            UINT8_C(0x04)
+#define BMM350_EN_Z_POS            UINT8_C(0x2)
+#define BMM350_EN_XYZ_MSK          UINT8_C(0x7)
+#define BMM350_EN_XYZ_POS          UINT8_C(0x0)
+/************************ Averaging macros **********************/
+#define BMM350_AVG_NO_AVG          0x0
+#define BMM350_AVG_2               0x1
+#define BMM350_AVG_4               0x2
+#define BMM350_AVG_8               0x3
+/******************************* ODR **************************/
+#define BMM350_ODR_400HZ           UINT8_C(0x2)
+#define BMM350_ODR_200HZ           UINT8_C(0x3)
+#define BMM350_ODR_100HZ           UINT8_C(0x4)
+#define BMM350_ODR_50HZ            UINT8_C(0x5)
+#define BMM350_ODR_25HZ            UINT8_C(0x6)
+#define BMM350_ODR_12_5HZ          UINT8_C(0x7)
+#define BMM350_ODR_6_25HZ          UINT8_C(0x8)
+#define BMM350_ODR_3_125HZ         UINT8_C(0x9)
+#define BMM350_ODR_1_5625HZ        UINT8_C(0xA)
+#define BMM350_ODR_MSK             UINT8_C(0xf)
+#define BMM350_ODR_POS             UINT8_C(0x0)
+#define BMM350_DATA_READY_INT_CTRL UINT8_C(0x8e)
+
+/* Macro to SET and GET BITS of a register*/
+#define BMM350_SET_BITS(reg_data, bitname, data)                                                   \
+	((reg_data & ~(bitname##_MSK)) | ((data << bitname##_POS) & bitname##_MSK))
+
+#define BMM350_GET_BITS(reg_data, bitname) ((reg_data & (bitname##_MSK)) >> (bitname##_POS))
+
+#define BMM350_GET_BITS_POS_0(reg_data, bitname) (reg_data & (bitname##_MSK))
+
+#define BMM350_SET_BITS_POS_0(reg_data, bitname, data)                                             \
+	((reg_data & ~(bitname##_MSK)) | (data & bitname##_MSK))
+
+enum bmm350_power_modes {
+	BMM350_SUSPEND_MODE = BMM350_PMU_CMD_SUS,
+	BMM350_NORMAL_MODE = BMM350_PMU_CMD_NM,
+	BMM350_FORCED_MODE = BMM350_PMU_CMD_FM,
+	BMM350_FORCED_MODE_FAST = BMM350_PMU_CMD_FM_FAST
+};
+
+enum bmm350_data_rates {
+	BMM350_DATA_RATE_400HZ = 2,    /* BMM350_ODR_400HZ */
+	BMM350_DATA_RATE_200HZ = 3,    /* BMM350_ODR_200HZ */
+	BMM350_DATA_RATE_100HZ = 4,    /* BMM350_ODR_100HZ */
+	BMM350_DATA_RATE_50HZ = 5,     /* BMM350_ODR_50HZ */
+	BMM350_DATA_RATE_25HZ = 6,     /* BMM350_ODR_25HZ */
+	BMM350_DATA_RATE_12_5HZ = 7,   /* BMM350_ODR_12_5HZ */
+	BMM350_DATA_RATE_6_25HZ = 8,   /* BMM350_ODR_6_25HZ */
+	BMM350_DATA_RATE_3_125HZ = 9,  /* BMM350_ODR_3_125HZ */
+	BMM350_DATA_RATE_1_5625HZ = 10 /* BMM350_ODR_1_5625HZ */
+};
+enum bmm350_performance_parameters {
+	BMM350_NO_AVERAGING = BMM350_AVG_NO_AVG,
+	BMM350_AVERAGING_2 = BMM350_AVG_2,
+	BMM350_AVERAGING_4 = BMM350_AVG_4,
+	BMM350_AVERAGING_8 = BMM350_AVG_8,
+	BMM350_ULTRALOWNOISE = BMM350_AVG_8,
+	BMM350_LOWNOISE = BMM350_AVG_4,
+	BMM350_REGULARPOWER = BMM350_AVG_2,
+	BMM350_LOWPOWER = BMM350_AVG_NO_AVG
+};
+
+/*!
+ * @brief bmm350 compensated magnetometer data and temperature data
+ */
+struct bmm350_mag_temp_data {
+	/*! Compensated mag X data */
+	int32_t x;
+
+	/*! Compensated mag Y data */
+	int32_t y;
+
+	/*! Compensated mag Z data */
+	int32_t z;
+
+	/*! Temperature */
+	int32_t temperature;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut offset coefficient structure
+ */
+struct bmm350_dut_offset_coef {
+	/*! Temperature offset */
+	int32_t t_offs;
+
+	/*! Offset x-axis */
+	int32_t offset_x;
+
+	/*! Offset y-axis */
+	int32_t offset_y;
+
+	/*! Offset z-axis */
+	int32_t offset_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut sensitivity coefficient structure
+ */
+struct bmm350_dut_sensit_coef {
+	/*! Temperature sensitivity */
+	int32_t t_sens;
+
+	/*! Sensitivity x-axis */
+	int32_t sens_x;
+
+	/*! Sensitivity y-axis */
+	int32_t sens_y;
+
+	/*! Sensitivity z-axis */
+	int32_t sens_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut tco structure
+ */
+struct bmm350_dut_tco {
+	int32_t tco_x;
+	int32_t tco_y;
+	int32_t tco_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer dut tcs structure
+ */
+struct bmm350_dut_tcs {
+	int32_t tcs_x;
+	int32_t tcs_y;
+	int32_t tcs_z;
+};
+
+/*!
+ * @brief bmm350 magnetometer cross axis compensation structure
+ */
+struct bmm350_cross_axis {
+	int32_t cross_x_y;
+	int32_t cross_y_x;
+	int32_t cross_z_x;
+	int32_t cross_z_y;
+};
+struct mag_compensate {
+	/*! Structure to store dut offset coefficient */
+	struct bmm350_dut_offset_coef dut_offset_coef;
+
+	/*! Structure to store dut sensitivity coefficient */
+	struct bmm350_dut_sensit_coef dut_sensit_coef;
+
+	/*! Structure to store dut tco */
+	struct bmm350_dut_tco dut_tco;
+
+	/*! Structure to store dut tcs */
+	struct bmm350_dut_tcs dut_tcs;
+
+	/*! Initialize T0_reading parameter */
+	int32_t dut_t0;
+
+	/*! Structure to define cross axis compensation */
+	struct bmm350_cross_axis cross_axis;
+};
+
+struct bmm350_pmu_cmd_status_0 {
+	/*! The previous PMU CMD is still in processing */
+	uint8_t pmu_cmd_busy;
+
+	/*! The previous PMU_CMD_AGGR_SET.odr has been overwritten */
+	uint8_t odr_ovwr;
+
+	/*! The previous PMU_CMD_AGGR_SET.avg has been overwritten */
+	uint8_t avr_ovwr;
+
+	/*! The chip is in normal power mode */
+	uint8_t pwr_mode_is_normal;
+
+	/*! CMD value is not allowed */
+	uint8_t cmd_is_illegal;
+
+	/*! Stores the latest PMU_CMD code processed */
+	uint8_t pmu_cmd_value;
+};
+
+/*!
+ * @brief bmm350 un-compensated (raw) magnetometer data, signed integer
+ */
+struct bmm350_raw_mag_data {
+	/*! Raw mag X data */
+	int32_t raw_xdata;
+
+	/*! Raw mag Y data */
+	int32_t raw_ydata;
+
+	/*! Raw mag Z data */
+	int32_t raw_zdata;
+
+	/*! Raw mag temperature value */
+	int32_t raw_data_temp;
+};
+
+struct bmm350_config {
+	struct bmm350_bus bus;
+	const struct bmm350_bus_io *bus_io;
+	struct gpio_dt_spec drdy_int;
+};
+
+struct bmm350_data {
+
+	/*! Variable to store status of axes enabled */
+	uint8_t axis_en;
+	struct mag_compensate mag_comp;
+	/*! Array to store OTP data */
+	uint16_t otp_data[BMM350_OTP_DATA_LENGTH];
+	/*! Variant ID */
+	uint8_t var_id;
+	/*! Variable to enable/disable xy bit reset */
+	uint8_t enable_auto_br;
+	struct bmm350_mag_temp_data mag_temp_data;
+
+#ifdef CONFIG_BMM350_TRIGGER
+	struct gpio_callback gpio_cb;
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER_OWN_THREAD
+	struct k_sem sem;
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER_GLOBAL_THREAD
+	struct k_work work;
+#endif
+
+#if defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	const struct device *dev;
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER
+	const struct sensor_trigger *drdy_trigger;
+	sensor_trigger_handler_t drdy_handler;
+#endif /* CONFIG_BMM350_TRIGGER */
+};
+
+int bmm350_trigger_mode_init(const struct device *dev);
+
+int bmm350_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+		       sensor_trigger_handler_t handler);
+int bmm350_reg_write(const struct device *dev, uint8_t reg, uint8_t val);
+#endif /* __SENSOR_BMM350_H__ */
diff --git a/drivers/sensor/bosch/bmm350/bmm350_i2c.c b/drivers/sensor/bosch/bmm350/bmm350_i2c.c
new file mode 100644
index 0000000000000..5c230d0e8098f
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350_i2c.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "bmm350.h"
+
+static int bmm350_bus_check_i2c(const struct bmm350_bus *bus)
+{
+	return i2c_is_ready_dt(&bus->i2c) ? 0 : -ENODEV;
+}
+
+static int bmm350_reg_read_i2c(const struct bmm350_bus *bus, uint8_t start, uint8_t *buf, int size)
+{
+	return i2c_burst_read_dt(&bus->i2c, start, buf, size);
+}
+
+static int bmm350_reg_write_i2c(const struct bmm350_bus *bus, uint8_t reg, uint8_t val)
+{
+	return i2c_reg_write_byte_dt(&bus->i2c, reg, val);
+}
+
+const struct bmm350_bus_io bmm350_bus_io_i2c = {
+	.check = bmm350_bus_check_i2c,
+	.read = bmm350_reg_read_i2c,
+	.write = bmm350_reg_write_i2c,
+};
diff --git a/drivers/sensor/bosch/bmm350/bmm350_trigger.c b/drivers/sensor/bosch/bmm350/bmm350_trigger.c
new file mode 100644
index 0000000000000..f5e0cb04a4fc2
--- /dev/null
+++ b/drivers/sensor/bosch/bmm350/bmm350_trigger.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2024 Bosch Sensortec GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for BMM350s accessed via I2C.
+ */
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/logging/log.h>
+
+#include "bmm350.h"
+
+LOG_MODULE_DECLARE(BMM350, CONFIG_SENSOR_LOG_LEVEL);
+
+static void bmm350_handle_interrupts(const void *arg)
+{
+	const struct device *dev = (const struct device *)arg;
+	struct bmm350_data *data = dev->data;
+
+	if (data->drdy_handler) {
+		data->drdy_handler(dev, data->drdy_trigger);
+	}
+}
+
+#ifdef CONFIG_BMM350_TRIGGER_OWN_THREAD
+static K_THREAD_STACK_DEFINE(bmm350_thread_stack, CONFIG_BMM350_THREAD_STACK_SIZE);
+static struct k_thread bmm350_thread;
+
+static void bmm350_thread_main(void *arg1, void *unused1, void *unused2)
+{
+	ARG_UNUSED(unused1);
+	ARG_UNUSED(unused2);
+	const struct device *dev = (const struct device *)arg1;
+	struct bmm350_data *data = dev->data;
+
+	while (1) {
+		k_sem_take(&data->sem, K_FOREVER);
+		bmm350_handle_interrupts(dev);
+	}
+}
+#endif
+
+#ifdef CONFIG_BMM350_TRIGGER_GLOBAL_THREAD
+static void bmm350_work_handler(struct k_work *work)
+{
+	struct bmm350_data *data = CONTAINER_OF(work, struct bmm350_data, work);
+
+	bmm350_handle_interrupts(data->dev);
+}
+#endif
+
+static void bmm350_gpio_callback(const struct device *port, struct gpio_callback *cb, uint32_t pin)
+{
+	struct bmm350_data *data = CONTAINER_OF(cb, struct bmm350_data, gpio_cb);
+
+	ARG_UNUSED(port);
+	ARG_UNUSED(pin);
+
+#if defined(CONFIG_BMM350_TRIGGER_OWN_THREAD)
+	k_sem_give(&data->sem);
+#elif defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	k_work_submit(&data->work);
+#endif
+}
+
+int bmm350_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+		       sensor_trigger_handler_t handler)
+{
+	struct bmm350_data *data = dev->data;
+	int ret = 0;
+
+#ifdef CONFIG_PM_DEVICE
+	enum pm_device_state state;
+
+	(void)pm_device_state_get(dev, &state);
+	if (state != PM_DEVICE_STATE_ACTIVE) {
+		return -EBUSY;
+	}
+#endif
+
+	if (trig->type != SENSOR_TRIG_DATA_READY) {
+		return -ENOTSUP;
+	}
+
+	data->drdy_trigger = trig;
+	data->drdy_handler = handler;
+
+	/* Set PMU command configuration */
+	ret = bmm350_reg_write(dev, BMM350_REG_INT_CTRL, BMM350_DATA_READY_INT_CTRL);
+	if (ret < 0) {
+		return ret;
+	}
+	return 0;
+}
+
+int bmm350_trigger_mode_init(const struct device *dev)
+{
+	struct bmm350_data *data = dev->data;
+	const struct bmm350_config *cfg = dev->config;
+	int ret;
+
+	if (!device_is_ready(cfg->drdy_int.port)) {
+		LOG_ERR("INT device is not ready");
+		return -ENODEV;
+	}
+
+#if defined(CONFIG_BMM350_TRIGGER_OWN_THREAD)
+	k_sem_init(&data->sem, 0, 1);
+	k_thread_create(&bmm350_thread, bmm350_thread_stack, CONFIG_BMM350_THREAD_STACK_SIZE,
+			bmm350_thread_main, (void *)dev, NULL, NULL,
+			K_PRIO_COOP(CONFIG_BMM350_THREAD_PRIORITY), 0, K_NO_WAIT);
+#elif defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	k_work_init(&data->work, bmm350_work_handler);
+#endif
+
+#if defined(CONFIG_BMM350_TRIGGER_GLOBAL_THREAD)
+	data->dev = dev;
+#endif
+
+	ret = gpio_pin_configure_dt(&cfg->drdy_int, GPIO_INPUT);
+	if (ret < 0) {
+		return ret;
+	}
+
+	gpio_init_callback(&data->gpio_cb, bmm350_gpio_callback, BIT(cfg->drdy_int.pin));
+
+	ret = gpio_add_callback(cfg->drdy_int.port, &data->gpio_cb);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&cfg->drdy_int, GPIO_INT_EDGE_TO_ACTIVE);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
diff --git a/drivers/sensor/bosch/bmp581/bmp581.c b/drivers/sensor/bosch/bmp581/bmp581.c
index 732a92d364926..0927c3395a1ab 100644
--- a/drivers/sensor/bosch/bmp581/bmp581.c
+++ b/drivers/sensor/bosch/bmp581/bmp581.c
@@ -408,7 +408,7 @@ static int bmp581_channel_get(const struct device *dev, enum sensor_channel chan
 		*val = drv->last_sample.pressure;
 		return BMP5_OK;
 	case SENSOR_CHAN_AMBIENT_TEMP:
-		/* returns temperature in Celcius */
+		/* returns temperature in Celsius */
 		*val = drv->last_sample.temperature;
 		return BMP5_OK;
 	default:
diff --git a/drivers/sensor/current_amp/current_amp.c b/drivers/sensor/current_amp/current_amp.c
index b801d533e46c9..b85e9b01e0a52 100644
--- a/drivers/sensor/current_amp/current_amp.c
+++ b/drivers/sensor/current_amp/current_amp.c
@@ -6,6 +6,8 @@
 
 #define DT_DRV_COMPAT current_sense_amplifier
 
+#include <stdlib.h>
+
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/adc/current_sense_amplifier.h>
 #include <zephyr/drivers/gpio.h>
@@ -53,6 +55,10 @@ static int get(const struct device *dev, enum sensor_channel chan, struct sensor
 		return -ENOTSUP;
 	}
 
+	if (abs(raw_val) < config->noise_threshold) {
+		return sensor_value_from_micro(val, 0);
+	}
+
 	ret = adc_raw_to_millivolts_dt(&config->port, &raw_val);
 	if (ret != 0) {
 		LOG_ERR("raw_to_mv: %d", ret);
@@ -152,7 +158,7 @@ static int current_init(const struct device *dev)
 
 	data->sequence.buffer = &data->raw;
 	data->sequence.buffer_size = sizeof(data->raw);
-	data->sequence.calibrate = true;
+	data->sequence.calibrate = config->enable_calibration;
 
 	return 0;
 }
diff --git a/drivers/sensor/everlight/CMakeLists.txt b/drivers/sensor/everlight/CMakeLists.txt
new file mode 100644
index 0000000000000..5cc686d3928c8
--- /dev/null
+++ b/drivers/sensor/everlight/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Dipak Shetty <shetty.dipak@gmx.com>
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+add_subdirectory_ifdef(CONFIG_EVERLIGHT_ALS_PT19 als_pt19)
+# zephyr-keep-sorted-stop
diff --git a/drivers/sensor/everlight/Kconfig b/drivers/sensor/everlight/Kconfig
new file mode 100644
index 0000000000000..efe1c3df3124c
--- /dev/null
+++ b/drivers/sensor/everlight/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Dipak Shetty <shetty.dipak@gmx.com>
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+source "drivers/sensor/everlight/als_pt19/Kconfig"
+# zephyr-keep-sorted-stop
diff --git a/drivers/sensor/everlight/als_pt19/CMakeLists.txt b/drivers/sensor/everlight/als_pt19/CMakeLists.txt
new file mode 100644
index 0000000000000..f4a1b23326554
--- /dev/null
+++ b/drivers/sensor/everlight/als_pt19/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Dipak Shetty <shetty.dipak@gmx.com>
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources(als_pt19.c)
diff --git a/drivers/sensor/everlight/als_pt19/Kconfig b/drivers/sensor/everlight/als_pt19/Kconfig
new file mode 100644
index 0000000000000..ed73606a55487
--- /dev/null
+++ b/drivers/sensor/everlight/als_pt19/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Dipak Shetty <shetty.dipak@gmx.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config EVERLIGHT_ALS_PT19
+	bool "Everlight ALS-PT19 Ambient Light Sensor"
+	default y
+	depends on DT_HAS_EVERLIGHT_ALS_PT19_ENABLED
+	select ADC
+	help
+	  Enable support for the Everlight ALS-PT19 ambient light sensor.
diff --git a/drivers/sensor/everlight/als_pt19/als_pt19.c b/drivers/sensor/everlight/als_pt19/als_pt19.c
new file mode 100644
index 0000000000000..a346746379b7b
--- /dev/null
+++ b/drivers/sensor/everlight/als_pt19/als_pt19.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2025 Dipak Shetty <shetty.dipak@gmx.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT everlight_als_pt19
+
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(ALS_PT19, CONFIG_SENSOR_LOG_LEVEL);
+
+struct als_pt19_data {
+	struct adc_sequence sequence;
+	uint16_t raw;
+};
+
+struct als_pt19_config {
+	struct adc_dt_spec adc;
+	uint32_t load_resistor;
+};
+
+static int als_pt19_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	const struct als_pt19_config *config = dev->config;
+	struct als_pt19_data *data = dev->data;
+	int ret;
+
+	if (chan != SENSOR_CHAN_ALL && chan != SENSOR_CHAN_LIGHT) {
+		LOG_ERR("Unsupported sensor channel");
+		return -ENOTSUP;
+	}
+
+	ret = adc_read_dt(&config->adc, &data->sequence);
+	if (ret != 0) {
+		LOG_ERR("adc_read: %d", ret);
+	}
+
+	return ret;
+}
+
+static int als_pt19_channel_get(const struct device *dev, enum sensor_channel chan,
+				struct sensor_value *val)
+{
+	const struct als_pt19_config *config = dev->config;
+	struct als_pt19_data *data = dev->data;
+	int32_t raw_val = data->raw;
+	int ret;
+
+	__ASSERT_NO_MSG(val != NULL);
+
+	if (chan != SENSOR_CHAN_ALL && chan != SENSOR_CHAN_LIGHT) {
+		LOG_ERR("Unsupported sensor channel");
+		return -ENOTSUP;
+	}
+
+	ret = adc_raw_to_millivolts_dt(&config->adc, &raw_val);
+	if (ret != 0) {
+		LOG_ERR("to_mv: %d", ret);
+		return ret;
+	}
+
+	LOG_DBG("Raw voltage: %d mV", raw_val);
+
+	/* Calculate current through the load resistor (in microamps) */
+	const int32_t current_ua = (raw_val * 1000) / config->load_resistor;
+
+	/* Convert current to Lux (200µA = 1000 Lux) */
+	const int32_t lux = (current_ua * 1000) / 200;
+
+	/* Convert to sensor_value format */
+	val->val1 = lux;
+	val->val2 = 0;
+
+	LOG_DBG("ADC: %d/%dmV, Current: %duA, Lux: %d", raw_val, config->adc.vref_mv, current_ua,
+		val->val1);
+
+	return 0;
+}
+
+static DEVICE_API(sensor, als_pt19_driver_api) = {
+	.sample_fetch = als_pt19_sample_fetch,
+	.channel_get = als_pt19_channel_get,
+};
+
+static int als_pt19_init(const struct device *dev)
+{
+	const struct als_pt19_config *config = dev->config;
+	struct als_pt19_data *data = dev->data;
+	int ret;
+
+	if (!adc_is_ready_dt(&config->adc)) {
+		LOG_ERR("ADC is not ready");
+		return -ENODEV;
+	}
+
+	ret = adc_channel_setup_dt(&config->adc);
+	if (ret != 0) {
+		LOG_ERR("ADC channel setup: %d", ret);
+		return ret;
+	}
+
+	ret = adc_sequence_init_dt(&config->adc, &data->sequence);
+	if (ret != 0) {
+		LOG_ERR("ADC sequence: %d", ret);
+		return ret;
+	}
+
+	data->sequence.buffer = &data->raw;
+	data->sequence.buffer_size = sizeof(data->raw);
+
+	return 0;
+}
+
+#define ALS_PT19_INST(inst)                                                                        \
+	static struct als_pt19_data als_pt19_data_##inst;                                          \
+                                                                                                   \
+	static const struct als_pt19_config als_pt19_cfg_##inst = {                                \
+		.adc = ADC_DT_SPEC_INST_GET(inst),                                                 \
+		.load_resistor = DT_INST_PROP(inst, load_resistor)};                               \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, &als_pt19_init, NULL, &als_pt19_data_##inst,            \
+				     &als_pt19_cfg_##inst, POST_KERNEL,                            \
+				     CONFIG_SENSOR_INIT_PRIORITY, &als_pt19_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(ALS_PT19_INST)
diff --git a/drivers/sensor/explorir_m/explorir_m.c b/drivers/sensor/explorir_m/explorir_m.c
index 67eabb7a5107c..3a4d8cfbffb11 100644
--- a/drivers/sensor/explorir_m/explorir_m.c
+++ b/drivers/sensor/explorir_m/explorir_m.c
@@ -23,12 +23,13 @@ LOG_MODULE_REGISTER(explorir_m_sensor, CONFIG_SENSOR_LOG_LEVEL);
 
 #define EXPLORIR_M_BEGIN_CHAR ' '
 
-#define EXPLORIR_M_SET_FILTER_CHAR     'A'
-#define EXPLORIR_M_GET_FILTER_CHAR     'a'
-#define EXPLORIR_M_MODE_CHAR           'K'
-#define EXPLORIR_M_CO2_FILTERED_CHAR   'Z'
-#define EXPLORIR_M_SCALING_CHAR        '.'
-#define EXPLORIR_M_NOT_RECOGNISED_CHAR '?'
+#define EXPLORIR_M_SET_FILTER_CHAR       'A'
+#define EXPLORIR_M_GET_FILTER_CHAR       'a'
+#define EXPLORIR_M_MODE_CHAR             'K'
+#define EXPLORIR_M_ZERO_POINT_KNOWN_CHAR 'X'
+#define EXPLORIR_M_CO2_FILTERED_CHAR     'Z'
+#define EXPLORIR_M_SCALING_CHAR          '.'
+#define EXPLORIR_M_NOT_RECOGNISED_CHAR   '?'
 
 #define EXPLORIR_M_SEPARATOR_CHAR ' '
 #define EXPLORIR_M_PRE_END_CHAR   '\r'
@@ -39,7 +40,7 @@ LOG_MODULE_REGISTER(explorir_m_sensor, CONFIG_SENSOR_LOG_LEVEL);
 
 #define EXPLORIR_M_BUFFER_LENGTH 16
 
-#define EXPLORIR_M_MAX_RESPONSE_DELAY 200 /* Add margin to the specified 100 in datasheet */
+#define EXPLORIR_M_MAX_RESPONSE_DELAY 300 /* Add margin to the specified 100 in datasheet */
 #define EXPLORIR_M_CO2_VALID_DELAY    1200
 
 struct explorir_m_data {
@@ -130,6 +131,7 @@ static int explorir_m_buffer_process(struct explorir_m_data *data, char type,
 	switch (type) {
 	case EXPLORIR_M_SET_FILTER_CHAR:
 	case EXPLORIR_M_MODE_CHAR:
+	case EXPLORIR_M_ZERO_POINT_KNOWN_CHAR:
 		break;
 
 	case EXPLORIR_M_CO2_FILTERED_CHAR:
@@ -198,18 +200,6 @@ static void explorir_m_uart_terminate(const struct device *uart_dev)
 	uart_poll_out(uart_dev, EXPLORIR_M_END_CHAR);
 }
 
-static int explorir_m_await_receive(struct explorir_m_data *data)
-{
-	int rc = k_sem_take(&data->uart_rx_sem, K_MSEC(EXPLORIR_M_MAX_RESPONSE_DELAY));
-
-	/* Reset semaphore if sensor did not respond within maximum specified response time */
-	if (rc == -EAGAIN) {
-		k_sem_reset(&data->uart_rx_sem);
-	}
-
-	return rc;
-}
-
 static int explorir_m_uart_transceive(const struct device *dev, char type, struct sensor_value *val,
 				      enum explorir_m_uart_set_usage set)
 {
@@ -225,8 +215,6 @@ static int explorir_m_uart_transceive(const struct device *dev, char type, struc
 
 	k_mutex_lock(&data->uart_mutex, K_FOREVER);
 
-	explorir_m_buffer_reset(data);
-
 	uart_poll_out(cfg->uart_dev, type);
 
 	if (set == EXPLORIR_M_SET_VAL_ONE) {
@@ -246,9 +234,12 @@ static int explorir_m_uart_transceive(const struct device *dev, char type, struc
 		uart_poll_out(cfg->uart_dev, buf[i]);
 	}
 
+	explorir_m_buffer_reset(data);
+	k_sem_reset(&data->uart_rx_sem);
+
 	explorir_m_uart_terminate(cfg->uart_dev);
 
-	rc = explorir_m_await_receive(data);
+	rc = k_sem_take(&data->uart_rx_sem, K_MSEC(EXPLORIR_M_MAX_RESPONSE_DELAY));
 	if (rc != 0) {
 		LOG_WRN("%c did not receive a response: %d", type, rc);
 	}
@@ -262,6 +253,52 @@ static int explorir_m_uart_transceive(const struct device *dev, char type, struc
 	return rc;
 }
 
+/*
+ * This calibrate function uses a known gas concentration [ppm] via val->val1 to calibrate.
+ * Calibration should be done when temperature is stabile and gas is fully diffused into the sensor.
+ */
+static int explorir_m_calibrate(const struct device *dev, struct sensor_value *val)
+{
+	struct explorir_m_data *data = dev->data;
+	struct sensor_value original;
+	struct sensor_value tmp;
+	int restore_rc;
+	int rc;
+
+	/* Prevent sensor interaction while using calibration filter value */
+	k_mutex_lock(&data->uart_mutex, K_FOREVER);
+
+	rc = explorir_m_uart_transceive(dev, EXPLORIR_M_GET_FILTER_CHAR, &original,
+					EXPLORIR_M_SET_NONE);
+	if (rc != 0) {
+		goto unlock;
+	}
+
+	/*
+	 * From datasheet section "Zero point setting":
+	 * To improve zeroing accuracy, the recommended digital filter setting is 32.
+	 */
+	tmp.val1 = 32;
+	rc = explorir_m_uart_transceive(dev, EXPLORIR_M_SET_FILTER_CHAR, &tmp,
+					EXPLORIR_M_SET_VAL_ONE);
+	if (rc == 0) {
+		tmp.val1 = val->val1 / data->filtered;
+		rc = explorir_m_uart_transceive(dev, EXPLORIR_M_ZERO_POINT_KNOWN_CHAR, &tmp,
+						EXPLORIR_M_SET_VAL_ONE);
+	}
+
+	restore_rc = explorir_m_uart_transceive(dev, EXPLORIR_M_SET_FILTER_CHAR, &original,
+						EXPLORIR_M_SET_VAL_ONE);
+	if (restore_rc != 0) {
+		LOG_ERR("Could not restore filter value");
+	}
+
+unlock:
+	k_mutex_unlock(&data->uart_mutex);
+
+	return rc != 0 ? rc : restore_rc;
+}
+
 static int explorir_m_attr_get(const struct device *dev, enum sensor_channel chan,
 			       enum sensor_attribute attr, struct sensor_value *val)
 {
@@ -286,6 +323,8 @@ static int explorir_m_attr_set(const struct device *dev, enum sensor_channel cha
 	}
 
 	switch (attr) {
+	case SENSOR_ATTR_CALIBRATION:
+		return explorir_m_calibrate(dev, (struct sensor_value *)val);
 	case SENSOR_ATTR_EXPLORIR_M_FILTER:
 		if (val->val1 < 0 || val->val1 > 255) {
 			return -ERANGE;
diff --git a/drivers/sensor/ite/ite_tach_it8xxx2/tach_ite_it8xxx2.c b/drivers/sensor/ite/ite_tach_it8xxx2/tach_ite_it8xxx2.c
index 3bd4281fdfa24..61188e4ae93e6 100644
--- a/drivers/sensor/ite/ite_tach_it8xxx2/tach_ite_it8xxx2.c
+++ b/drivers/sensor/ite/ite_tach_it8xxx2/tach_ite_it8xxx2.c
@@ -56,7 +56,7 @@ LOG_MODULE_REGISTER(tach_ite_it8xxx2, CONFIG_SENSOR_LOG_LEVEL);
  * NOTE: The PWM output maximum is 324Hz in EC LPM, so if we need fan to work
  *       then don't let EC enter LPM.
  */
-#define TACH_FREQ		EC_FREQ
+#define TACH_FREQ EC_FREQ
 
 struct tach_it8xxx2_config {
 	/* Fan x tachometer LSB reading register */
@@ -110,8 +110,7 @@ static bool tach_ch_is_valid(const struct device *dev, int tach_ch)
 	return valid;
 }
 
-static int tach_it8xxx2_sample_fetch(const struct device *dev,
-				     enum sensor_channel chan)
+static int tach_it8xxx2_sample_fetch(const struct device *dev, enum sensor_channel chan)
 {
 	const struct tach_it8xxx2_config *const config = dev->config;
 	volatile uint8_t *reg_fxtlrr = (uint8_t *)config->reg_fxtlrr;
@@ -127,8 +126,14 @@ static int tach_it8xxx2_sample_fetch(const struct device *dev,
 	if (tach_ch_is_valid(dev, tach_ch)) {
 		/* If channel data of tachometer is valid, then save it */
 		data->capture = ((*reg_fxtmrr) << 8) | (*reg_fxtlrr);
-		/* Clear tachometer data valid status */
-		*reg_tswctlr |= config->dvs_bit;
+
+		if (config->dvs_bit == IT8XXX2_PWM_T0DVS) {
+			/* Only W/C tach 0 data valid status */
+			*reg_tswctlr = (*reg_tswctlr & ~IT8XXX2_PWM_T1DVS);
+		} else {
+			/* Only W/C tach 1 data valid status */
+			*reg_tswctlr = (*reg_tswctlr & ~IT8XXX2_PWM_T0DVS);
+		}
 	} else {
 		/* If channel data of tachometer isn't valid, then clear it */
 		data->capture = 0;
@@ -137,8 +142,7 @@ static int tach_it8xxx2_sample_fetch(const struct device *dev,
 	return 0;
 }
 
-static int tach_it8xxx2_channel_get(const struct device *dev,
-				    enum sensor_channel chan,
+static int tach_it8xxx2_channel_get(const struct device *dev, enum sensor_channel chan,
 				    struct sensor_value *val)
 {
 	const struct tach_it8xxx2_config *const config = dev->config;
@@ -200,13 +204,17 @@ static int tach_it8xxx2_init(const struct device *dev)
 	if (tach_ch == IT8XXX2_TACH_CHANNEL_A) {
 		/* Select IT8XXX2_TACH_CHANNEL_A output to tachometer */
 		*reg_tswctlr &= ~(config->chsel_bit);
-		/* Clear tachometer data valid status */
-		*reg_tswctlr |= config->dvs_bit;
 	} else {
 		/* Select IT8XXX2_TACH_CHANNEL_B output to tachometer */
 		*reg_tswctlr |= config->chsel_bit;
-		/* Clear tachometer data valid status */
-		*reg_tswctlr |= config->dvs_bit;
+	}
+
+	if (config->dvs_bit == IT8XXX2_PWM_T0DVS) {
+		/* Only W/C tach 0 data valid status */
+		*reg_tswctlr = (*reg_tswctlr & ~IT8XXX2_PWM_T1DVS);
+	} else {
+		/* Only W/C tach 1 data valid status */
+		*reg_tswctlr = (*reg_tswctlr & ~IT8XXX2_PWM_T0DVS);
 	}
 
 	/* Tachometer sensor already start */
@@ -218,29 +226,24 @@ static DEVICE_API(sensor, tach_it8xxx2_driver_api) = {
 	.channel_get = tach_it8xxx2_channel_get,
 };
 
-#define TACH_IT8XXX2_INIT(inst)						       \
-	PINCTRL_DT_INST_DEFINE(inst);					       \
-									       \
-	static const struct tach_it8xxx2_config tach_it8xxx2_cfg_##inst = {    \
-		.reg_fxtlrr = DT_INST_REG_ADDR_BY_IDX(inst, 0),		       \
-		.reg_fxtmrr = DT_INST_REG_ADDR_BY_IDX(inst, 1),		       \
-		.reg_tswctlr = DT_INST_REG_ADDR_BY_IDX(inst, 2),	       \
-		.dvs_bit = DT_INST_PROP(inst, dvs_bit),			       \
-		.chsel_bit = DT_INST_PROP(inst, chsel_bit),		       \
-		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),		       \
-		.channel = DT_INST_PROP(inst, channel),			       \
-		.pulses_per_round = DT_INST_PROP(inst, pulses_per_round),      \
-	};								       \
-									       \
-	static struct tach_it8xxx2_data tach_it8xxx2_data_##inst;	       \
-									       \
-	SENSOR_DEVICE_DT_INST_DEFINE(inst,				       \
-			      tach_it8xxx2_init,			       \
-			      NULL,					       \
-			      &tach_it8xxx2_data_##inst,		       \
-			      &tach_it8xxx2_cfg_##inst,			       \
-			      POST_KERNEL,				       \
-			      CONFIG_SENSOR_INIT_PRIORITY,		       \
-			      &tach_it8xxx2_driver_api);
+#define TACH_IT8XXX2_INIT(inst)                                                                    \
+	PINCTRL_DT_INST_DEFINE(inst);                                                              \
+                                                                                                   \
+	static const struct tach_it8xxx2_config tach_it8xxx2_cfg_##inst = {                        \
+		.reg_fxtlrr = DT_INST_REG_ADDR_BY_IDX(inst, 0),                                    \
+		.reg_fxtmrr = DT_INST_REG_ADDR_BY_IDX(inst, 1),                                    \
+		.reg_tswctlr = DT_INST_REG_ADDR_BY_IDX(inst, 2),                                   \
+		.dvs_bit = DT_INST_PROP(inst, dvs_bit),                                            \
+		.chsel_bit = DT_INST_PROP(inst, chsel_bit),                                        \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),                                      \
+		.channel = DT_INST_PROP(inst, channel),                                            \
+		.pulses_per_round = DT_INST_PROP(inst, pulses_per_round),                          \
+	};                                                                                         \
+                                                                                                   \
+	static struct tach_it8xxx2_data tach_it8xxx2_data_##inst;                                  \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, tach_it8xxx2_init, NULL, &tach_it8xxx2_data_##inst,     \
+				     &tach_it8xxx2_cfg_##inst, POST_KERNEL,                        \
+				     CONFIG_SENSOR_INIT_PRIORITY, &tach_it8xxx2_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(TACH_IT8XXX2_INIT)
diff --git a/drivers/sensor/liteon/CMakeLists.txt b/drivers/sensor/liteon/CMakeLists.txt
new file mode 100644
index 0000000000000..b3d699fd44fc8
--- /dev/null
+++ b/drivers/sensor/liteon/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Konrad Sikora
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+add_subdirectory_ifdef(CONFIG_LTR329 ltr329)
+add_subdirectory_ifdef(CONFIG_LTR_F216A ltrf216a)
+# zephyr-keep-sorted-stop
diff --git a/drivers/sensor/liteon/Kconfig b/drivers/sensor/liteon/Kconfig
new file mode 100644
index 0000000000000..802a8c57e87ff
--- /dev/null
+++ b/drivers/sensor/liteon/Kconfig
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Konrad Sikora
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+source "drivers/sensor/liteon/ltr329/Kconfig"
+source "drivers/sensor/liteon/ltrf216a/Kconfig"
+# zephyr-keep-sorted-stop
diff --git a/drivers/sensor/liteon/ltr329/CMakeLists.txt b/drivers/sensor/liteon/ltr329/CMakeLists.txt
new file mode 100644
index 0000000000000..e1282068ddd1f
--- /dev/null
+++ b/drivers/sensor/liteon/ltr329/CMakeLists.txt
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources(ltr329.c)
diff --git a/drivers/sensor/liteon/ltr329/Kconfig b/drivers/sensor/liteon/ltr329/Kconfig
new file mode 100644
index 0000000000000..3a08aabc59010
--- /dev/null
+++ b/drivers/sensor/liteon/ltr329/Kconfig
@@ -0,0 +1,12 @@
+# Lite-On LTR-329 light sensor driver configuration
+
+# Copyright (c) 2025 Konrad Sikora
+# SPDX-License-Identifier: Apache-2.0
+
+config LTR329
+	bool "LiteOn LTR-329 Ambient light sensor support"
+	default y
+	depends on DT_HAS_LITEON_LTR329_ENABLED
+	select I2C
+	help
+	  Enable driver for Lite-On LTR-329 ambient light sensor.
diff --git a/drivers/sensor/liteon/ltr329/ltr329.c b/drivers/sensor/liteon/ltr329/ltr329.c
new file mode 100644
index 0000000000000..1ee317af3435a
--- /dev/null
+++ b/drivers/sensor/liteon/ltr329/ltr329.c
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2025 Konrad Sikora
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT liteon_ltr329
+
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+
+LOG_MODULE_REGISTER(LTR329, CONFIG_SENSOR_LOG_LEVEL);
+
+/* Register addresses */
+#define LTR329_ALS_CONTR      0x80
+#define LTR329_MEAS_RATE      0x85
+#define LTR329_PART_ID        0x86
+#define LTR329_MANUFAC_ID     0x87
+#define LTR329_ALS_DATA_CH1_0 0x88
+#define LTR329_ALS_DATA_CH1_1 0x89
+#define LTR329_ALS_DATA_CH0_0 0x8A
+#define LTR329_ALS_DATA_CH0_1 0x8B
+#define LTR329_ALS_STATUS     0x8C
+
+/* Bit masks and shifts for ALS_CONTR register */
+#define LTR329_ALS_CONTR_MODE_MASK      BIT(0)
+#define LTR329_ALS_CONTR_MODE_SHIFT     0
+#define LTR329_ALS_CONTR_SW_RESET_MASK  BIT(1)
+#define LTR329_ALS_CONTR_SW_RESET_SHIFT 1
+#define LTR329_ALS_CONTR_GAIN_MASK      GENMASK(4, 2)
+#define LTR329_ALS_CONTR_GAIN_SHIFT     2
+
+/* Bit masks and shifts for MEAS_RATE register */
+#define LTR329_MEAS_RATE_REPEAT_MASK    GENMASK(2, 0)
+#define LTR329_MEAS_RATE_REPEAT_SHIFT   0
+#define LTR329_MEAS_RATE_INT_TIME_MASK  GENMASK(5, 3)
+#define LTR329_MEAS_RATE_INT_TIME_SHIFT 3
+
+/* Bit masks and shifts for PART_ID register */
+#define LTR329_PART_ID_REVISION_MASK  GENMASK(3, 0)
+#define LTR329_PART_ID_REVISION_SHIFT 0
+#define LTR329_PART_ID_NUMBER_MASK    GENMASK(7, 4)
+#define LTR329_PART_ID_NUMBER_SHIFT   4
+
+/* Bit masks and shifts for MANUFAC_ID register */
+#define LTR329_MANUFAC_ID_IDENTIFICATION_MASK  GENMASK(7, 0)
+#define LTR329_MANUFAC_ID_IDENTIFICATION_SHIFT 0
+
+/* Bit masks and shifts for ALS_STATUS register */
+#define LTR329_ALS_STATUS_DATA_MASK        GENMASK(7, 0)
+#define LTR329_ALS_STATUS_DATA_SHIFT       0
+#define LTR329_ALS_STATUS_DATA_READY_MASK  BIT(2)
+#define LTR329_ALS_STATUS_DATA_READY_SHIFT 2
+#define LTR329_ALS_STATUS_DATA_GAIN_MASK   GENMASK(6, 4)
+#define LTR329_ALS_STATUS_DATA_GAIN_SHIFT  4
+#define LTR329_ALS_STATUS_DATA_VALID_MASK  BIT(7)
+#define LTR329_ALS_STATUS_DATA_VALID_SHIFT 7
+
+/* Expected sensor IDs */
+#define LTR329_PART_ID_VALUE         0xA0
+#define LTR329_MANUFACTURER_ID_VALUE 0x05
+
+/* Timing definitions - refer to LTR-329ALS-01 datasheet */
+#define LTR329_INIT_STARTUP_MS        100
+#define LTR329_WAKEUP_FROM_STANDBY_MS 10
+
+/* Macros to set and get register fields */
+#define LTR329_REG_SET(reg, field, value)				\
+	(((value) << reg##_##field##_SHIFT) & reg##_##field##_MASK)
+#define LTR329_REG_GET(reg, field, value)				\
+	(((value) & reg##_##field##_MASK) >> reg##_##field##_SHIFT)
+
+struct ltr329_config {
+	const struct i2c_dt_spec bus;
+	uint8_t gain;
+	uint8_t integration_time;
+	uint8_t measurement_rate;
+};
+
+struct ltr329_data {
+	uint16_t ch0;
+	uint16_t ch1;
+};
+
+static int ltr329_check_device_id(const struct i2c_dt_spec *bus)
+{
+	uint8_t id;
+	int rc;
+
+	rc = i2c_reg_read_byte_dt(bus, LTR329_PART_ID, &id);
+	if (rc < 0) {
+		LOG_ERR("Failed to read PART_ID");
+		return rc;
+	}
+	if (id != LTR329_PART_ID_VALUE) {
+		LOG_ERR("PART_ID mismatch: expected 0x%02X, got 0x%02X", LTR329_PART_ID_VALUE, id);
+		return -ENODEV;
+	}
+
+	rc = i2c_reg_read_byte_dt(bus, LTR329_MANUFAC_ID, &id);
+	if (rc < 0) {
+		LOG_ERR("Failed to read MANUFAC_ID");
+		return rc;
+	}
+	if (id != LTR329_MANUFACTURER_ID_VALUE) {
+		LOG_ERR("MANUFAC_ID mismatch: expected 0x%02X, got 0x%02X",
+			LTR329_MANUFACTURER_ID_VALUE, id);
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static int ltr329_init_registers(const struct i2c_dt_spec *bus, const struct ltr329_config *cfg)
+{
+	const uint8_t control_reg = LTR329_REG_SET(LTR329_ALS_CONTR, MODE, 1) |
+				    LTR329_REG_SET(LTR329_ALS_CONTR, GAIN, cfg->gain);
+	const uint8_t meas_reg = LTR329_REG_SET(LTR329_MEAS_RATE, REPEAT, cfg->measurement_rate) |
+				 LTR329_REG_SET(LTR329_MEAS_RATE, INT_TIME, cfg->integration_time);
+	uint8_t buffer;
+	int rc;
+
+	rc = i2c_reg_write_byte_dt(bus, LTR329_ALS_CONTR, control_reg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set ALS_CONTR register");
+		return rc;
+	}
+
+	rc = i2c_reg_write_byte_dt(bus, LTR329_MEAS_RATE, meas_reg);
+	if (rc < 0) {
+		LOG_ERR("Failed to set MEAS_RATE register");
+		return rc;
+	}
+
+	/* Read back the MEAS_RATE register to verify the settings */
+	rc = i2c_reg_read_byte_dt(bus, LTR329_MEAS_RATE, &buffer);
+	if (rc < 0) {
+		LOG_ERR("Failed to read back MEAS_RATE register");
+		return rc;
+	}
+	if (LTR329_REG_GET(LTR329_MEAS_RATE, REPEAT, buffer) != cfg->measurement_rate) {
+		LOG_ERR("Measurement rate mismatch: expected %u, got %u", cfg->measurement_rate,
+			(uint8_t)LTR329_REG_GET(LTR329_MEAS_RATE, REPEAT, buffer));
+		return -ENODEV;
+	}
+	if (LTR329_REG_GET(LTR329_MEAS_RATE, INT_TIME, buffer) != cfg->integration_time) {
+		LOG_ERR("Integration time mismatch: expected %u, got %u", cfg->integration_time,
+			(uint8_t)LTR329_REG_GET(LTR329_MEAS_RATE, INT_TIME, buffer));
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static int ltr329_init(const struct device *dev)
+{
+	const struct ltr329_config *cfg = dev->config;
+	int rc;
+
+	if (!i2c_is_ready_dt(&cfg->bus)) {
+		LOG_ERR("I2C bus not ready");
+		return -ENODEV;
+	}
+
+	/* Wait for sensor startup */
+	k_sleep(K_MSEC(LTR329_INIT_STARTUP_MS));
+
+	rc = ltr329_check_device_id(&cfg->bus);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* Init register to enable sensor to active mode */
+	rc = ltr329_init_registers(&cfg->bus, cfg);
+	if (rc < 0) {
+		return rc;
+	}
+
+	return 0;
+}
+
+static int ltr329_check_data_ready(const struct i2c_dt_spec *bus)
+{
+	uint8_t status;
+	int rc;
+
+	rc = i2c_reg_read_byte_dt(bus, LTR329_ALS_STATUS, &status);
+	if (rc < 0) {
+		LOG_ERR("Failed to read ALS_STATUS register");
+		return rc;
+	}
+
+	if (!LTR329_REG_GET(LTR329_ALS_STATUS, DATA_READY, status)) {
+		LOG_WRN("Data not ready");
+		return -EBUSY;
+	}
+
+	return 0;
+}
+
+static int ltr329_read_als_data(const struct i2c_dt_spec *bus, struct ltr329_data *data)
+{
+	uint8_t reg = LTR329_ALS_DATA_CH1_0;
+	uint8_t buff[4];
+	int rc;
+
+	rc = i2c_write_read_dt(bus, &reg, sizeof(reg), buff, sizeof(buff));
+	if (rc < 0) {
+		LOG_ERR("Failed to read ALS data registers");
+		return rc;
+	}
+
+	data->ch1 = sys_get_le16(buff);
+	data->ch0 = sys_get_le16(buff + 2);
+
+	return 0;
+}
+
+static int ltr329_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	const struct ltr329_config *cfg = dev->config;
+	struct ltr329_data *data = dev->data;
+	int rc;
+
+	if ((chan != SENSOR_CHAN_ALL) && (chan != SENSOR_CHAN_LIGHT)) {
+		return -ENOTSUP;
+	}
+
+	rc = ltr329_check_data_ready(&cfg->bus);
+	if (rc < 0) {
+		return rc;
+	}
+
+	rc = ltr329_read_als_data(&cfg->bus, data);
+	if (rc < 0) {
+		return rc;
+	}
+
+	return 0;
+}
+
+static int ltr329_get_mapped_gain(const uint8_t reg_val, uint8_t *const output)
+{
+	/* Map the register value to the gain used in the lux calculation
+	 * Indices 4 and 5 are invalid.
+	 */
+	static const uint8_t gain_lux_calc[] = {1, 2, 4, 8, 0, 0, 48, 96};
+
+	if (reg_val < ARRAY_SIZE(gain_lux_calc)) {
+		*output = gain_lux_calc[reg_val];
+		/* 0 is not a valid value */
+		return (*output == 0) ? -EINVAL : 0;
+	}
+
+	return -EINVAL;
+}
+
+static int ltr329_get_mapped_int_time(const uint8_t reg_val, uint8_t *const output)
+{
+	/* Map the register value to the integration time used in the lux calculation */
+	static const uint8_t int_time_lux_calc[] = {10, 5, 20, 40, 15, 25, 30, 35};
+
+	if (reg_val < ARRAY_SIZE(int_time_lux_calc)) {
+		*output = int_time_lux_calc[reg_val];
+		return 0;
+	}
+
+	*output = 0;
+	return -EINVAL;
+}
+
+static int ltr329_channel_get(const struct device *dev, enum sensor_channel chan,
+			      struct sensor_value *val)
+{
+	const struct ltr329_data *data = dev->data;
+	const struct ltr329_config *cfg = dev->config;
+	uint8_t gain_value;
+	uint8_t integration_time_value;
+
+	if (chan != SENSOR_CHAN_LIGHT) {
+		return -ENOTSUP;
+	}
+
+	if (ltr329_get_mapped_gain(cfg->gain, &gain_value) != 0) {
+		LOG_ERR("Invalid gain configuration");
+		return -EINVAL;
+	}
+
+	if (ltr329_get_mapped_int_time(cfg->integration_time, &integration_time_value) != 0) {
+		LOG_ERR("Invalid integration time configuration");
+		return -EINVAL;
+	}
+
+	if ((data->ch0 == 0) && (data->ch1 == 0)) {
+		LOG_WRN("Both channels are zero; cannot compute ratio");
+		return -EINVAL;
+	}
+
+	/* Calculate lux value according to the appendix A of the datasheet. */
+	uint64_t lux;
+	/* The calculation is scaled by 1000000 to avoid floating point. */
+	uint64_t scaled_ratio = (data->ch1 * UINT64_C(1000000)) / (uint64_t)(data->ch0 + data->ch1);
+
+	if (scaled_ratio < UINT64_C(450000)) {
+		lux = (UINT64_C(1774300) * data->ch0 + UINT64_C(1105900) * data->ch1);
+	} else if (scaled_ratio < UINT64_C(640000)) {
+		lux = (UINT64_C(4278500) * data->ch0 - UINT64_C(1954800) * data->ch1);
+	} else if (scaled_ratio < UINT64_C(850000)) {
+		lux = (UINT64_C(592600) * data->ch0 + UINT64_C(118500) * data->ch1);
+	} else {
+		LOG_WRN("Invalid ratio: %llu", scaled_ratio);
+		return -EINVAL;
+	}
+
+	/* Adjust lux value for gain and integration time.
+	 * Multiply by 10 before to compensate for the integration time scaling.
+	 */
+	lux = (lux * 10) / (gain_value * integration_time_value);
+
+	/* Get the integer and fractional parts from fixed point value */
+	val->val1 = (int32_t)(lux / UINT64_C(1000000));
+	val->val2 = (int32_t)(lux % UINT64_C(1000000));
+
+	return 0;
+}
+
+static DEVICE_API(sensor, ltr329_driver_api) = {
+	.sample_fetch = ltr329_sample_fetch,
+	.channel_get = ltr329_channel_get,
+};
+
+#define DEFINE_LTR329(_num)									\
+	static struct ltr329_data ltr329_data_##_num;						\
+	static const struct ltr329_config ltr329_config_##_num = {				\
+		.bus = I2C_DT_SPEC_INST_GET(_num),						\
+		.gain = DT_INST_PROP(_num, gain),						\
+		.integration_time = DT_INST_PROP(_num, integration_time),			\
+		.measurement_rate = DT_INST_PROP(_num, measurement_rate),			\
+	};											\
+	SENSOR_DEVICE_DT_INST_DEFINE(_num, ltr329_init, NULL, &ltr329_data_##_num,		\
+				     &ltr329_config_##_num, POST_KERNEL,			\
+				     CONFIG_SENSOR_INIT_PRIORITY, &ltr329_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_LTR329)
diff --git a/drivers/sensor/ltrf216a/CMakeLists.txt b/drivers/sensor/liteon/ltrf216a/CMakeLists.txt
similarity index 100%
rename from drivers/sensor/ltrf216a/CMakeLists.txt
rename to drivers/sensor/liteon/ltrf216a/CMakeLists.txt
diff --git a/drivers/sensor/liteon/ltrf216a/Kconfig b/drivers/sensor/liteon/ltrf216a/Kconfig
new file mode 100644
index 0000000000000..cac1486e8b912
--- /dev/null
+++ b/drivers/sensor/liteon/ltrf216a/Kconfig
@@ -0,0 +1,12 @@
+# LTR-F216A light sensor configuration options
+
+# Copyright (c) 2023 Tridonic
+# SPDX-License-Identifier: Apache-2.0
+
+config LTR_F216A
+	bool "LiteOn LTR-F216A Light Sensor"
+	default y
+	depends on DT_HAS_LITEON_LTRF216A_ENABLED
+	select I2C
+	help
+	  Enable driver for LiteOn LTR-F216A light sensors.
diff --git a/drivers/sensor/ltrf216a/ltrf216a.c b/drivers/sensor/liteon/ltrf216a/ltrf216a.c
similarity index 99%
rename from drivers/sensor/ltrf216a/ltrf216a.c
rename to drivers/sensor/liteon/ltrf216a/ltrf216a.c
index 60a860828e887..aaa2b849937c7 100644
--- a/drivers/sensor/ltrf216a/ltrf216a.c
+++ b/drivers/sensor/liteon/ltrf216a/ltrf216a.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define DT_DRV_COMPAT ltr_f216a
+#define DT_DRV_COMPAT liteon_ltrf216a
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
diff --git a/drivers/sensor/ltrf216a/Kconfig b/drivers/sensor/ltrf216a/Kconfig
deleted file mode 100644
index fa9cfe9fdbfa9..0000000000000
--- a/drivers/sensor/ltrf216a/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# LTR-F216A light sensor configuration options
-
-# Copyright (c) 2023 Tridonic
-# SPDX-License-Identifier: Apache-2.0
-
-config LTR_F216A
-	bool "LiteOn LTR-F216A Light Sensor"
-	default y
-	depends on DT_HAS_LTR_F216A_ENABLED
-	select I2C
-	help
-	  Enable driver for LiteOn LTR-F216A light sensors.
diff --git a/drivers/sensor/meas/ms5837/Kconfig b/drivers/sensor/meas/ms5837/Kconfig
index d758d5970a0ce..96443c8ff1297 100644
--- a/drivers/sensor/meas/ms5837/Kconfig
+++ b/drivers/sensor/meas/ms5837/Kconfig
@@ -1,12 +1,13 @@
 # MS5837 pressure sensor configuration options
 
 # Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
+# Copyright (c) 2025 Ivan Wagner <ivan.wagner@tecinvent.ch>
 # SPDX-License-Identifier: Apache-2.0
 
 config MS5837
 	bool "MS5837 pressure and temperature sensor"
 	default y
-	depends on DT_HAS_MEAS_MS5837_ENABLED
+	depends on DT_HAS_MEAS_MS5837_02BA_ENABLED || DT_HAS_MEAS_MS5837_30BA_ENABLED
 	select I2C
 	help
 	  Enable driver for MS5837 pressure and temperature sensor.
diff --git a/drivers/sensor/meas/ms5837/ms5837.c b/drivers/sensor/meas/ms5837/ms5837.c
index fb83ec4c80279..08375da6e6949 100644
--- a/drivers/sensor/meas/ms5837/ms5837.c
+++ b/drivers/sensor/meas/ms5837/ms5837.c
@@ -1,12 +1,11 @@
 /* Driver for MS5837 pressure sensor
  *
  * Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
+ * Copyright (c) 2025 Ivan Wagner <ivan.wagner@tecinvent.ch>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define DT_DRV_COMPAT meas_ms5837
-
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
@@ -45,6 +44,8 @@ static int ms5837_get_measurement(const struct device *dev, uint32_t *val,
 	return 0;
 }
 
+#if DT_HAS_COMPAT_STATUS_OKAY(meas_ms5837_30ba)
+
 static void ms5837_compensate_30(const struct device *dev,
 				 const int32_t adc_temperature,
 				 const int32_t adc_pressure)
@@ -94,10 +95,14 @@ static void ms5837_compensate_30(const struct device *dev,
 	SENS -= SENSi;
 
 	data->temperature -= Ti;
-	data->pressure =
-	    (((SENS * adc_pressure) / (1ll << 21)) - OFF) / (1ll << 13);
+	/* Result is in mbar * 10 but store result as mbar * 100 same as 02 sensor variant */
+	data->pressure = ((((SENS * adc_pressure) / (1ll << 21)) - OFF) / (1ll << 13)) * 10;
 }
 
+#endif
+
+#if DT_HAS_COMPAT_STATUS_OKAY(meas_ms5837_02ba)
+
 /*
  * First and second order pressure and temperature calculations, as per the flowchart in the
  * MS5837-02B datasheet. (see "Pressure and Temperature Calculation", pages 6 and 7, REV a8 12/2019)
@@ -135,12 +140,16 @@ static void ms5837_compensate_02(const struct device *dev,
 	SENS -= SENSi;
 
 	data->temperature -= Ti;
+	/* Result is in mbar * 100 */
 	data->pressure = (((SENS * adc_pressure) / (1ll << 21)) - OFF) / (1ll << 15);
 }
 
+#endif
+
 static int ms5837_sample_fetch(const struct device *dev,
 			       enum sensor_channel channel)
 {
+	const struct ms5837_config *cfg = dev->config;
 	struct ms5837_data *data = dev->data;
 	int err;
 	uint32_t adc_pressure;
@@ -161,7 +170,7 @@ static int ms5837_sample_fetch(const struct device *dev,
 		return err;
 	}
 
-	data->comp_func(dev, adc_temperature, adc_pressure);
+	cfg->comp_func(dev, adc_temperature, adc_pressure);
 
 	return 0;
 }
@@ -348,34 +357,25 @@ static int ms5837_init(const struct device *dev)
 		return err;
 	}
 
-	const int type_id = (data->factory >> 5) & 0x7f;
-
-	switch (type_id) {
-	case  MS5837_02BA01:
-	case MS5837_02BA21:
-		data->comp_func = ms5837_compensate_02;
-		break;
-	case MS5837_30BA26:
-		data->comp_func = ms5837_compensate_30;
-		break;
-	default:
-		LOG_WRN(" unrecognized type: '%2x', defaulting to MS5837-30", type_id);
-		data->comp_func = ms5837_compensate_30;
-		break;
-	}
-
 	return 0;
 }
 
-#define MS5837_DEFINE(inst)								\
-	static struct ms5837_data ms5837_data_##inst;					\
-											\
-	static const struct ms5837_config ms5837_config_##inst = {			\
-		.i2c = I2C_DT_SPEC_INST_GET(inst),					\
-	};										\
-											\
-	SENSOR_DEVICE_DT_INST_DEFINE(inst, ms5837_init, NULL,				\
-			      &ms5837_data_##inst, &ms5837_config_##inst, POST_KERNEL,	\
-			      CONFIG_SENSOR_INIT_PRIORITY, &ms5837_api_funcs);		\
-
-DT_INST_FOREACH_STATUS_OKAY(MS5837_DEFINE)
+#define MS5837_DEFINE(inst, type)                                                                  \
+	static struct ms5837_data ms5837_##type##_data_##inst;                                     \
+                                                                                                   \
+	static const struct ms5837_config ms5837_##type##_config_##inst = {                        \
+		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
+		.comp_func = ms5837_compensate_##type                                              \
+	};                                                                                         \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, ms5837_init, NULL, &ms5837_##type##_data_##inst,        \
+				     &ms5837_##type##_config_##inst, POST_KERNEL,                  \
+				     CONFIG_SENSOR_INIT_PRIORITY, &ms5837_api_funcs);
+
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT meas_ms5837_02ba
+DT_INST_FOREACH_STATUS_OKAY_VARGS(MS5837_DEFINE, 02)
+
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT meas_ms5837_30ba
+DT_INST_FOREACH_STATUS_OKAY_VARGS(MS5837_DEFINE, 30)
diff --git a/drivers/sensor/meas/ms5837/ms5837.h b/drivers/sensor/meas/ms5837/ms5837.h
index e4f8fc650bb31..5917e709022d9 100644
--- a/drivers/sensor/meas/ms5837/ms5837.h
+++ b/drivers/sensor/meas/ms5837/ms5837.h
@@ -44,12 +44,6 @@
 #define MS5837_ADC_READ_DELAY_4086 10
 #define MS5837_ADC_READ_DELAY_8129 20
 
-enum ms5837_type {
-	MS5837_02BA01 = 0x00,
-	MS5837_02BA21 = 0x15,
-	MS5837_30BA26 = 0x1A
-};
-
 typedef void (*ms5837_compensate_func)(const struct device *dev,
 				       const int32_t adc_temperature,
 				       const int32_t adc_pressure);
@@ -76,11 +70,11 @@ struct ms5837_data {
 	uint8_t presure_conv_delay;
 	uint8_t temperature_conv_delay;
 
-	ms5837_compensate_func comp_func;
 };
 
 struct ms5837_config {
 	struct i2c_dt_spec i2c;
+	ms5837_compensate_func comp_func;
 };
 
 #endif /* __SENSOR_MS5837_H__ */
diff --git a/drivers/sensor/nordic/npm1300_charger/npm1300_charger.c b/drivers/sensor/nordic/npm1300_charger/npm1300_charger.c
index eb49859f3e819..838cb2b673487 100644
--- a/drivers/sensor/nordic/npm1300_charger/npm1300_charger.c
+++ b/drivers/sensor/nordic/npm1300_charger/npm1300_charger.c
@@ -166,7 +166,7 @@ static void calc_temp(const struct npm1300_charger_config *const config, uint16_
 static void calc_dietemp(const struct npm1300_charger_config *const config, uint16_t code,
 			 struct sensor_value *valp)
 {
-	/* Ref: Datasheet Figure 36: Die temperature (Celcius) */
+	/* Ref: Datasheet Figure 36: Die temperature (Celsius) */
 	int32_t temp =
 		DIETEMP_OFFSET_MDEGC - (((int32_t)code * DIETEMP_FACTOR_MUL) / DIETEMP_FACTOR_DIV);
 
diff --git a/drivers/sensor/nxp/fxls8974/fxls8974.c b/drivers/sensor/nxp/fxls8974/fxls8974.c
index 708bfe9a1784e..bb9f6d43ec431 100644
--- a/drivers/sensor/nxp/fxls8974/fxls8974.c
+++ b/drivers/sensor/nxp/fxls8974/fxls8974.c
@@ -491,11 +491,10 @@ static int fxls8974_init(const struct device *dev)
 			return -EIO;
 		}
 
-		if (data->whoami == WHOAMI_ID_FXLS8974) {
-			LOG_DBG("Device ID 0x%x, FXLS8974", data->whoami);
-		} else {
+		if (data->whoami != WHOAMI_ID_FXLS8964 &&
+		data->whoami != WHOAMI_ID_FXLS8974) {
 			LOG_ERR("Unknown Device ID 0x%x", data->whoami);
-			return -EIO;
+			return -ENXIO;
 		}
 
 		if (fxls8974_get_active(dev, &regVal)) {
diff --git a/drivers/sensor/nxp/fxls8974/fxls8974.h b/drivers/sensor/nxp/fxls8974/fxls8974.h
index 42114f169d17b..01ffc4eef562a 100644
--- a/drivers/sensor/nxp/fxls8974/fxls8974.h
+++ b/drivers/sensor/nxp/fxls8974/fxls8974.h
@@ -26,6 +26,7 @@
 #define FXLS8974_REG_CTRLREG4				0x18
 #define FXLS8974_REG_CTRLREG5				0x19
 
+#define WHOAMI_ID_FXLS8964				0x84
 #define WHOAMI_ID_FXLS8974				0x86
 
 #define FXLS8974_CTRLREG1_ACTIVE_MASK			0x01
diff --git a/drivers/sensor/nxp/mcux_acmp/Kconfig b/drivers/sensor/nxp/mcux_acmp/Kconfig
index 1934e4d93f7a0..9b68edbc8ce52 100644
--- a/drivers/sensor/nxp/mcux_acmp/Kconfig
+++ b/drivers/sensor/nxp/mcux_acmp/Kconfig
@@ -9,7 +9,6 @@ config SENSOR_MCUX_ACMP
 	default y
 	depends on DT_HAS_NXP_KINETIS_ACMP_ENABLED
 	select PINCTRL
-	select MCUX_ACMP
 	help
 	  Enable driver for the NXP MCUX Analog Comparator (ACMP).
 
diff --git a/drivers/sensor/pixart/CMakeLists.txt b/drivers/sensor/pixart/CMakeLists.txt
new file mode 100644
index 0000000000000..010b153254b81
--- /dev/null
+++ b/drivers/sensor/pixart/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory_ifdef(CONFIG_PAA3905 paa3905)
+add_subdirectory_ifdef(CONFIG_PAT9136 pat9136)
diff --git a/drivers/sensor/pixart/Kconfig b/drivers/sensor/pixart/Kconfig
new file mode 100644
index 0000000000000..68d521e26001d
--- /dev/null
+++ b/drivers/sensor/pixart/Kconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+source "drivers/sensor/pixart/paa3905/Kconfig"
+source "drivers/sensor/pixart/pat9136/Kconfig"
+# zephyr-keep-sorted-stop
diff --git a/drivers/sensor/pixart/paa3905/CMakeLists.txt b/drivers/sensor/pixart/paa3905/CMakeLists.txt
new file mode 100644
index 0000000000000..79655203746f2
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(
+	paa3905.c
+	paa3905_decoder.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_PAA3905_STREAM
+	paa3905_stream.c
+)
diff --git a/drivers/sensor/pixart/paa3905/Kconfig b/drivers/sensor/pixart/paa3905/Kconfig
new file mode 100644
index 0000000000000..201998e9b5b93
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/Kconfig
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+config PAA3905
+	bool "Optical Flow Sensor PAA3905"
+	default y
+	depends on DT_HAS_PIXART_PAA3905_ENABLED
+	select SPI
+	select SPI_RTIO
+	select SENSOR_ASYNC_API
+	help
+	  Enable driver for PAA3905 Optical Flow sensor.
+
+if PAA3905
+
+config PAA3905_STREAM
+	bool "Streaming mode"
+	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_PIXART_PAA3905),int-gpios)
+	select RTIO_WORKQ
+	help
+	  Enable streaming mode for the PAA3905 sensor.
+
+endif # PAA3905
diff --git a/drivers/sensor/pixart/paa3905/paa3905.c b/drivers/sensor/pixart/paa3905/paa3905.c
new file mode 100644
index 0000000000000..8b845108e6df2
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905.c
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT pixart_paa3905
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/rtio/rtio.h>
+
+#include "paa3905.h"
+#include "paa3905_bus.h"
+#include "paa3905_stream.h"
+#include "paa3905_decoder.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(PAA3905, CONFIG_SENSOR_LOG_LEVEL);
+
+/* Helper struct used to set reg-val sequences for op-modes */
+struct reg_val_pair {
+	uint8_t reg;
+	uint8_t val;
+};
+
+static void paa3905_complete_result(struct rtio *ctx,
+				    const struct rtio_sqe *sqe,
+				    void *arg)
+{
+	struct rtio_iodev_sqe *iodev_sqe = (struct rtio_iodev_sqe *)sqe->userdata;
+	struct rtio_cqe *cqe;
+	int err = 0;
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	if (err) {
+		rtio_iodev_sqe_err(iodev_sqe, err);
+	} else {
+		rtio_iodev_sqe_ok(iodev_sqe, 0);
+	}
+
+	LOG_DBG("One-shot fetch completed");
+}
+
+static void paa3905_submit_one_shot(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+	const struct sensor_chan_spec *const channels = cfg->channels;
+	struct paa3905_data *data = dev->data;
+	const size_t num_channels = cfg->count;
+	uint32_t min_buf_len = sizeof(struct paa3905_encoded_data);
+	int err;
+	uint8_t *buf;
+	uint32_t buf_len;
+	struct paa3905_encoded_data *edata;
+
+	err = rtio_sqe_rx_buf(iodev_sqe, min_buf_len, min_buf_len, &buf, &buf_len);
+	if (err) {
+		LOG_ERR("Failed to get a read buffer of size %u bytes", min_buf_len);
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	edata = (struct paa3905_encoded_data *)buf;
+
+	err = paa3905_encode(dev, channels, num_channels, buf);
+	if (err != 0) {
+		LOG_ERR("Failed to encode sensor data");
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *complete_sqe = rtio_sqe_acquire(data->rtio.ctx);
+
+	if (!write_sqe || !read_sqe | !complete_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQEs");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	uint8_t val = REG_BURST_READ | REG_SPI_READ_BIT;
+
+	rtio_sqe_prep_tiny_write(write_sqe,
+				 data->rtio.iodev,
+				 RTIO_PRIO_HIGH,
+				 &val,
+				 1,
+				NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_sqe,
+			   data->rtio.iodev,
+			   RTIO_PRIO_HIGH,
+			   edata->buf,
+			   sizeof(edata->buf),
+			   NULL);
+	read_sqe->flags |= RTIO_SQE_CHAINED;
+
+	rtio_sqe_prep_callback_no_cqe(complete_sqe,
+				      paa3905_complete_result,
+				      (void *)dev,
+				      iodev_sqe);
+
+	rtio_submit(data->rtio.ctx, 0);
+}
+
+static void paa3905_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+
+	if (!cfg->is_streaming) {
+		paa3905_submit_one_shot(dev, iodev_sqe);
+	} else if (IS_ENABLED(CONFIG_PAA3905_STREAM)) {
+		paa3905_stream_submit(dev, iodev_sqe);
+	} else {
+		LOG_ERR("Streaming not supported");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+	}
+}
+
+static DEVICE_API(sensor, paa3905_driver_api) = {
+	.submit = paa3905_submit,
+	.get_decoder = paa3905_get_decoder,
+};
+
+static int detection_mode_standard(const struct device *dev)
+{
+	int err;
+	/** As per datasheet, set of values configure the sensor in Standard mode. */
+	const static struct reg_val_pair paa3905_detection_mode_std[] = {
+		{.reg = 0x7F, .val = 0x00}, {.reg = 0x51, .val = 0xFF}, {.reg = 0x4E, .val = 0x2A},
+		{.reg = 0x66, .val = 0x3E}, {.reg = 0x7F, .val = 0x14}, {.reg = 0x7E, .val = 0x71},
+		{.reg = 0x55, .val = 0x00}, {.reg = 0x59, .val = 0x00}, {.reg = 0x6F, .val = 0x2C},
+		{.reg = 0x7F, .val = 0x05}, {.reg = 0x4D, .val = 0xAC}, {.reg = 0x4E, .val = 0x32},
+		{.reg = 0x7F, .val = 0x09}, {.reg = 0x5C, .val = 0xAF}, {.reg = 0x5F, .val = 0xAF},
+		{.reg = 0x70, .val = 0x08}, {.reg = 0x71, .val = 0x04}, {.reg = 0x72, .val = 0x06},
+		{.reg = 0x74, .val = 0x3C}, {.reg = 0x75, .val = 0x28}, {.reg = 0x76, .val = 0x20},
+		{.reg = 0x4E, .val = 0xBF}, {.reg = 0x7F, .val = 0x03}, {.reg = 0x64, .val = 0x14},
+		{.reg = 0x65, .val = 0x0A}, {.reg = 0x66, .val = 0x10}, {.reg = 0x55, .val = 0x3C},
+		{.reg = 0x56, .val = 0x28}, {.reg = 0x57, .val = 0x20}, {.reg = 0x4A, .val = 0x2D},
+		{.reg = 0x4B, .val = 0x2D}, {.reg = 0x4E, .val = 0x4B}, {.reg = 0x69, .val = 0xFA},
+		{.reg = 0x7F, .val = 0x05}, {.reg = 0x69, .val = 0x1F}, {.reg = 0x47, .val = 0x1F},
+		{.reg = 0x48, .val = 0x0C}, {.reg = 0x5A, .val = 0x20}, {.reg = 0x75, .val = 0x0F},
+		{.reg = 0x4A, .val = 0x0F}, {.reg = 0x42, .val = 0x02}, {.reg = 0x45, .val = 0x03},
+		{.reg = 0x65, .val = 0x00}, {.reg = 0x67, .val = 0x76}, {.reg = 0x68, .val = 0x76},
+		{.reg = 0x6A, .val = 0xC5}, {.reg = 0x43, .val = 0x00}, {.reg = 0x7F, .val = 0x06},
+		{.reg = 0x4A, .val = 0x18}, {.reg = 0x4B, .val = 0x0C}, {.reg = 0x4C, .val = 0x0C},
+		{.reg = 0x4D, .val = 0x0C}, {.reg = 0x46, .val = 0x0A}, {.reg = 0x59, .val = 0xCD},
+		{.reg = 0x7F, .val = 0x0A}, {.reg = 0x4A, .val = 0x2A}, {.reg = 0x48, .val = 0x96},
+		{.reg = 0x52, .val = 0xB4}, {.reg = 0x7F, .val = 0x00}, {.reg = 0x5B, .val = 0xA0},
+	};
+
+	for (size_t i = 0 ; i < ARRAY_SIZE(paa3905_detection_mode_std) ; i++) {
+		err = paa3905_bus_write(dev,
+					paa3905_detection_mode_std[i].reg,
+					&paa3905_detection_mode_std[i].val,
+					1);
+		if (err) {
+			LOG_ERR("Failed to write detection mode standard");
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+static int paa3905_configure(const struct device *dev)
+{
+	const struct paa3905_config *cfg = dev->config;
+	uint8_t val;
+	int err;
+
+	/* Configure registers for Standard detection mode */
+	err = detection_mode_standard(dev);
+	if (err) {
+		LOG_ERR("Failed to configure detection mode");
+		return err;
+	}
+
+	val = cfg->resolution;
+	err = paa3905_bus_write(dev, REG_RESOLUTION, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to configure resolution");
+		return err;
+	}
+
+	if (cfg->led_control) {
+		struct reg_val_pair led_control_regs[] = {
+			{.reg = 0x7F, .val = 0x14},
+			{.reg = 0x6F, .val = 0x0C},
+			{.reg = 0x7F, .val = 0x00},
+		};
+
+		for (size_t i = 0 ; i < ARRAY_SIZE(led_control_regs) ; i++) {
+			err = paa3905_bus_write(dev,
+						led_control_regs[i].reg,
+						&led_control_regs[i].val,
+						1);
+			if (err) {
+				LOG_ERR("Failed to write LED control reg");
+				return err;
+			}
+		}
+	}
+
+	return 0;
+}
+
+int paa3905_recover(const struct device *dev)
+{
+	int err;
+	uint8_t val;
+
+	/* Write 0x5A to Power up reset reg */
+	val = POWER_UP_RESET_VAL;
+	err = paa3905_bus_write(dev, REG_POWER_UP_RESET, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to write Power up reset reg");
+		return err;
+	}
+	/* As per datasheet, writing power-up reset requires 1-ms afterwards. */
+	k_sleep(K_MSEC(1));
+
+	/* Configure registers for Standard detection mode */
+	err = paa3905_configure(dev);
+	if (err) {
+		LOG_ERR("Failed to configure");
+		return err;
+	}
+
+	return err;
+}
+
+static int paa3905_init(const struct device *dev)
+{
+	int err;
+	uint8_t val;
+	uint8_t motion_data[6];
+
+	/* Power-up sequence delay */
+	k_sleep(K_MSEC(140));
+
+	/* Read Product ID */
+	err = paa3905_bus_read(dev, REG_PRODUCT_ID, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to read Product ID");
+		return err;
+	} else if (val != PRODUCT_ID) {
+		LOG_ERR("Invalid Product ID: 0x%02X", val);
+		return -EIO;
+	}
+
+	/* Write 0x5A to Power up reset reg */
+	val = POWER_UP_RESET_VAL;
+	err = paa3905_bus_write(dev, REG_POWER_UP_RESET, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to write Power up reset reg");
+		return err;
+	}
+	/* As per datasheet, writing power-up reset requires 1-ms afterwards. */
+	k_sleep(K_MSEC(1));
+
+	/* Read reg's 0x02-0x06 to clear motion data. */
+	err = paa3905_bus_read(dev, REG_MOTION, motion_data, sizeof(motion_data));
+	if (err) {
+		LOG_ERR("Failed to read motion data");
+		return err;
+	}
+
+	if (IS_ENABLED(CONFIG_PAA3905_STREAM)) {
+		err = paa3905_stream_init(dev);
+		if (err) {
+			LOG_ERR("Failed to initialize streaming");
+			return err;
+		}
+	}
+
+	err = paa3905_configure(dev);
+	if (err) {
+		LOG_ERR("Failed to configure");
+		return err;
+	}
+
+	return 0;
+}
+
+#define PAA3905_INIT(inst)									   \
+												   \
+	BUILD_ASSERT(DT_PROP(DT_DRV_INST(inst), resolution) > 0 &&				   \
+		     DT_PROP(DT_DRV_INST(inst), resolution) <= 0xFF,				   \
+		     "Resolution must be in range 1-255");					   \
+												   \
+	RTIO_DEFINE(paa3905_rtio_ctx_##inst, 8, 8);						   \
+	SPI_DT_IODEV_DEFINE(paa3905_bus_##inst,							   \
+			    DT_DRV_INST(inst),							   \
+			    SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_TRANSFER_MSB,		   \
+			    0U);								   \
+												   \
+	static const struct paa3905_config paa3905_cfg_##inst = {				   \
+		.int_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, {0}),			   \
+		.backup_timer_period = DT_PROP(DT_DRV_INST(inst), backup_timer_ms),		   \
+		.resolution = DT_PROP(DT_DRV_INST(inst), resolution),				   \
+		.led_control = DT_PROP_OR(DT_DRV_INST(inst), led_control, false),		   \
+	};											   \
+												   \
+	static struct paa3905_data paa3905_data_##inst = {					   \
+		.rtio = {									   \
+			.iodev = &paa3905_bus_##inst,						   \
+			.ctx = &paa3905_rtio_ctx_##inst,					   \
+		},										   \
+	};											   \
+												   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst,							   \
+				     paa3905_init,						   \
+				     NULL,							   \
+				     &paa3905_data_##inst,					   \
+				     &paa3905_cfg_##inst,					   \
+				     POST_KERNEL,						   \
+				     CONFIG_SENSOR_INIT_PRIORITY,				   \
+				     &paa3905_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(PAA3905_INIT)
diff --git a/drivers/sensor/pixart/paa3905/paa3905.h b/drivers/sensor/pixart/paa3905/paa3905.h
new file mode 100644
index 0000000000000..23ed177e4ea0b
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAA3905_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAA3905_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/rtio/rtio.h>
+
+struct paa3905_encoded_data {
+	struct {
+		uint64_t timestamp;
+		uint8_t channels : 3;
+		struct {
+			bool drdy : 1;
+			bool motion : 1;
+		} events;
+	} header;
+	union {
+		uint8_t buf[14];
+		struct {
+			uint8_t motion;
+			uint8_t observation;
+			struct {
+				int16_t x;
+				int16_t y;
+			} delta;
+			uint8_t challenging_conditions;
+			uint8_t squal;
+			uint8_t raw_sum;
+			uint8_t raw_max;
+			uint8_t raw_min;
+			uint32_t shutter : 24;
+		} __attribute__((__packed__));
+	};
+};
+
+struct paa3905_stream {
+	struct gpio_callback cb;
+	const struct device *dev;
+	struct rtio_iodev_sqe *iodev_sqe;
+	struct k_timer timer;
+	struct {
+		struct {
+			bool drdy : 1;
+			bool motion : 1;
+		} enabled;
+		struct {
+			enum sensor_stream_data_opt drdy;
+			enum sensor_stream_data_opt motion;
+		} opt;
+	} settings;
+};
+
+struct paa3905_data {
+	struct {
+		struct rtio_iodev *iodev;
+		struct rtio *ctx;
+	} rtio;
+#if defined(CONFIG_PAA3905_STREAM)
+	struct paa3905_stream stream;
+#endif /* CONFIG_PAA3905_STREAM */
+};
+
+struct paa3905_config {
+	struct gpio_dt_spec int_gpio;
+	int resolution;
+	bool led_control;
+	uint32_t backup_timer_period;
+};
+
+/** Made public in order to perform chip recovery if erratic behavior
+ * is detected.
+ */
+int paa3905_recover(const struct device *dev);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAA3905_H_ */
diff --git a/drivers/sensor/pixart/paa3905/paa3905_bus.h b/drivers/sensor/pixart/paa3905/paa3905_bus.h
new file mode 100644
index 0000000000000..9b39049f97cc1
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905_bus.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAA3905_BUS_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAA3905_BUS_H_
+
+#include <stdint.h>
+#include <zephyr/rtio/rtio.h>
+
+#include "paa3905.h"
+#include "paa3905_reg.h"
+
+static inline int paa3905_bus_read(const struct device *dev,
+				   uint8_t reg,
+				   uint8_t *buf,
+				   uint16_t len)
+{
+	struct paa3905_data *data = dev->data;
+	struct rtio *ctx = data->rtio.ctx;
+	struct rtio_iodev *iodev = data->rtio.iodev;
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_cqe *cqe;
+	int err;
+
+	if (!write_sqe || !read_sqe) {
+		return -ENOMEM;
+	}
+
+	reg = reg | REG_SPI_READ_BIT;
+
+	rtio_sqe_prep_write(write_sqe, iodev, RTIO_PRIO_HIGH, &reg, 1, NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_read(read_sqe, iodev, RTIO_PRIO_HIGH, buf, len, NULL);
+
+	err = rtio_submit(ctx, 2);
+	if (err) {
+		return err;
+	}
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	return err;
+}
+
+static inline int paa3905_bus_write(const struct device *dev,
+				    uint8_t reg,
+				    const uint8_t *buf,
+				    uint16_t len)
+{
+	struct paa3905_data *data = dev->data;
+	struct rtio *ctx = data->rtio.ctx;
+	struct rtio_iodev *iodev = data->rtio.iodev;
+	struct rtio_sqe *write_reg_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_sqe *write_buf_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_cqe *cqe;
+	int err;
+
+	if (!write_reg_sqe || !write_buf_sqe) {
+		return -ENOMEM;
+	}
+
+	reg = reg | REG_SPI_WRITE_BIT;
+
+	rtio_sqe_prep_write(write_reg_sqe, iodev, RTIO_PRIO_HIGH, &reg, 1, NULL);
+	write_reg_sqe->flags |= RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_write(write_buf_sqe, iodev, RTIO_PRIO_HIGH, buf, len, NULL);
+
+	err = rtio_submit(ctx, 2);
+	if (err) {
+		return err;
+	}
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	return err;
+}
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAA3905_BUS_H_ */
diff --git a/drivers/sensor/pixart/paa3905/paa3905_decoder.c b/drivers/sensor/pixart/paa3905/paa3905_decoder.c
new file mode 100644
index 0000000000000..9ef3beb463167
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905_decoder.c
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/sensor_clock.h>
+#include <zephyr/sys/byteorder.h>
+
+#include "paa3905.h"
+#include "paa3905_reg.h"
+#include "paa3905_decoder.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(PAA3905_DECODER, CONFIG_SENSOR_LOG_LEVEL);
+
+#define DT_DRV_COMPAT pixart_paa3905
+
+uint8_t paa3905_encode_channel(enum sensor_channel chan)
+{
+	switch (chan) {
+	case SENSOR_CHAN_POS_DX:
+		return BIT(0);
+	case SENSOR_CHAN_POS_DY:
+		return BIT(1);
+	case SENSOR_CHAN_POS_DXYZ:
+		return BIT(2);
+	default:
+		return 0;
+	}
+}
+
+static bool is_data_valid(const struct paa3905_encoded_data *edata)
+{
+	uint8_t squal_min;
+	uint32_t shutter_max;
+	uint32_t shutter;
+
+	if (!REG_MOTION_DETECTED(edata->motion)) {
+		LOG_WRN("Invalid data - No motion detected");
+		return false;
+	}
+
+	if (REG_MOTION_CHALLENGING_COND(edata->motion)) {
+		LOG_WRN("Invalid data - Challenging conditions");
+		return false;
+	}
+
+	switch (REG_OBSERVATION_MODE(edata->observation)) {
+	case OBSERVATION_MODE_BRIGHT:
+		squal_min = SQUAL_MIN_BRIGHT;
+		shutter_max = SHUTTER_MAX_BRIGHT;
+		break;
+	case OBSERVATION_MODE_LOW_LIGHT:
+		squal_min = SQUAL_MIN_LOW_LIGHT;
+		shutter_max = SHUTTER_MAX_LOW_LIGHT;
+		break;
+	case OBSERVATION_MODE_SUPER_LOW_LIGHT:
+		squal_min = SQUAL_MIN_SUPER_LOW_LIGHT;
+		shutter_max = SHUTTER_MAX_SUPER_LOW_LIGHT;
+		break;
+	default:
+		LOG_ERR("Invalid op mode");
+		return false;
+	}
+
+	shutter = sys_be24_to_cpu(edata->shutter);
+
+	if (edata->squal < squal_min || shutter >= shutter_max) {
+		LOG_WRN("Invalid data - mode: %d squal: 0x%02X shutter: 0x%06X",
+			(uint8_t)REG_OBSERVATION_MODE(edata->observation), edata->squal, shutter);
+
+		return false;
+	}
+
+	return true;
+}
+
+static int paa3905_decoder_get_frame_count(const uint8_t *buffer,
+					   struct sensor_chan_spec chan_spec,
+					   uint16_t *frame_count)
+{
+	struct paa3905_encoded_data *edata = (struct paa3905_encoded_data *)buffer;
+
+	if (chan_spec.chan_idx != 0) {
+		return -ENOTSUP;
+	}
+
+	uint8_t channel_request = paa3905_encode_channel(chan_spec.chan_type);
+
+	if (((edata->header.channels & channel_request) != channel_request) ||
+	    !is_data_valid(edata)) {
+		return -ENODATA;
+	}
+
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY:
+	case SENSOR_CHAN_POS_DXYZ:
+		*frame_count = 1;
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+
+	return -1;
+}
+
+static int paa3905_decoder_get_size_info(struct sensor_chan_spec chan_spec,
+					 size_t *base_size,
+					 size_t *frame_size)
+{
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY:
+		*base_size = sizeof(struct sensor_q31_data);
+		*frame_size = sizeof(struct sensor_q31_sample_data);
+		return 0;
+	case SENSOR_CHAN_POS_DXYZ:
+		*base_size = sizeof(struct sensor_three_axis_data);
+		*frame_size = sizeof(struct sensor_three_axis_data);
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int paa3905_decoder_decode(const uint8_t *buffer,
+				  struct sensor_chan_spec chan_spec,
+				  uint32_t *fit,
+				  uint16_t max_count,
+				  void *data_out)
+{
+	struct paa3905_encoded_data *edata = (struct paa3905_encoded_data *)buffer;
+	uint8_t channel_request;
+
+	if (*fit != 0) {
+		return 0;
+	}
+
+	if (max_count == 0 || chan_spec.chan_idx != 0) {
+		return -EINVAL;
+	}
+
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY: {
+		channel_request = paa3905_encode_channel(chan_spec.chan_type);
+		if (((edata->header.channels & channel_request) != channel_request) ||
+		    !is_data_valid(edata)) {
+			LOG_ERR("No data available");
+			return -ENODATA;
+		}
+
+		struct sensor_q31_data *out = (struct sensor_q31_data *)data_out;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+		out->shift = 31;
+
+		out->readings->value = (chan_spec.chan_type == SENSOR_CHAN_POS_DX) ?
+				       edata->delta.x :
+				       edata->delta.y;
+
+		*fit = 1;
+		return 1;
+	}
+	case SENSOR_CHAN_POS_DXYZ: {
+		channel_request = paa3905_encode_channel(chan_spec.chan_type);
+		if (((edata->header.channels & channel_request) != channel_request) ||
+		    !is_data_valid(edata)) {
+			LOG_ERR("No data available");
+			return -ENODATA;
+		}
+
+		struct sensor_three_axis_data *out = (struct sensor_three_axis_data *)data_out;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+		out->shift = 31;
+
+		out->readings[0].x = edata->delta.x;
+		out->readings[0].y = edata->delta.y;
+		out->readings[0].z = 0;
+
+		*fit = 1;
+		return 1;
+	}
+	default:
+		return -EINVAL;
+	}
+
+	return -1;
+}
+
+static bool paa3905_decoder_has_trigger(const uint8_t *buffer, enum sensor_trigger_type trigger)
+{
+	struct paa3905_encoded_data *edata = (struct paa3905_encoded_data *)buffer;
+
+	switch (trigger) {
+	case SENSOR_TRIG_DATA_READY:
+		return edata->header.events.drdy;
+	case SENSOR_TRIG_MOTION:
+		return edata->header.events.motion;
+	default:
+		return false;
+	}
+}
+
+SENSOR_DECODER_API_DT_DEFINE() = {
+	.get_frame_count = paa3905_decoder_get_frame_count,
+	.get_size_info = paa3905_decoder_get_size_info,
+	.decode = paa3905_decoder_decode,
+	.has_trigger = paa3905_decoder_has_trigger,
+};
+
+int paa3905_get_decoder(const struct device *dev,
+	const struct sensor_decoder_api **decoder)
+{
+	ARG_UNUSED(dev);
+	*decoder = &SENSOR_DECODER_NAME();
+
+	return 0;
+}
+
+int paa3905_encode(const struct device *dev,
+		   const struct sensor_chan_spec *const channels,
+		   size_t num_channels,
+		   uint8_t *buf)
+{
+	struct paa3905_encoded_data *edata = (struct paa3905_encoded_data *)buf;
+	uint64_t cycles;
+	int err;
+
+	edata->header.channels = 0;
+	edata->header.events.drdy = false;
+	edata->header.events.motion = false;
+
+	for (size_t i = 0 ; i < num_channels; i++) {
+		edata->header.channels |= paa3905_encode_channel(channels[i].chan_type);
+	}
+
+	err = sensor_clock_get_cycles(&cycles);
+	if (err != 0) {
+		return err;
+	}
+
+	edata->header.timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	return 0;
+}
diff --git a/drivers/sensor/pixart/paa3905/paa3905_decoder.h b/drivers/sensor/pixart/paa3905/paa3905_decoder.h
new file mode 100644
index 0000000000000..c010368893f12
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905_decoder.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAA3905_DECODER_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAA3905_DECODER_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/sensor.h>
+#include "paa3905.h"
+
+int paa3905_encode(const struct device *dev,
+		   const struct sensor_chan_spec *const channels,
+		   size_t num_channels,
+		   uint8_t *buf);
+
+uint8_t paa3905_encode_channel(enum sensor_channel chan);
+
+int paa3905_get_decoder(const struct device *dev,
+			const struct sensor_decoder_api **decoder);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAA3905_DECODER_H_ */
diff --git a/drivers/sensor/pixart/paa3905/paa3905_reg.h b/drivers/sensor/pixart/paa3905/paa3905_reg.h
new file mode 100644
index 0000000000000..7cd1333a246f0
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905_reg.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAA3905_REG_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAA3905_REG_H_
+
+#define REG_SPI_READ_BIT			0
+#define REG_SPI_WRITE_BIT			BIT(7)
+
+/* Registers */
+#define REG_PRODUCT_ID				0x00
+#define REG_MOTION				0x02
+#define REG_DELTA_X_L				0x03
+#define REG_DELTA_X_H				0x04
+#define REG_DELTA_Y_L				0x05
+#define REG_DELTA_Y_H				0x06
+#define REG_BURST_READ				0x16
+#define REG_POWER_UP_RESET			0x3A
+#define REG_RESOLUTION				0x4E
+
+/* Misc. Defines */
+#define PRODUCT_ID				0xA2
+#define POWER_UP_RESET_VAL			0x5A
+
+#define REG_MOTION_DETECTED(val)		((val) & BIT(7))
+#define REG_MOTION_CHALLENGING_COND(val)	((val) & BIT(0))
+
+#define REG_OBSERVATION_MODE(val)		(((val) & (BIT(7) | BIT(6))) >> 6)
+#define REG_OBSERVATION_CHIP_OK(val)		(((val) & BIT_MASK(6)) == 0x3F)
+
+#define OBSERVATION_MODE_BRIGHT			0
+#define OBSERVATION_MODE_LOW_LIGHT		1
+#define OBSERVATION_MODE_SUPER_LOW_LIGHT	2
+
+/* Data validation boundaries */
+#define SQUAL_MIN_BRIGHT			0x19
+#define SHUTTER_MAX_BRIGHT			0x00FF80
+
+#define SQUAL_MIN_LOW_LIGHT			0x46
+#define SHUTTER_MAX_LOW_LIGHT			0x00FF80
+
+#define SQUAL_MIN_SUPER_LOW_LIGHT		0x55
+#define SHUTTER_MAX_SUPER_LOW_LIGHT		0x025998
+
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAA3905_REG_H_ */
diff --git a/drivers/sensor/pixart/paa3905/paa3905_stream.c b/drivers/sensor/pixart/paa3905/paa3905_stream.c
new file mode 100644
index 0000000000000..d888be1c6dc32
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905_stream.c
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor_clock.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/rtio/rtio.h>
+#include <zephyr/rtio/work.h>
+
+#include "paa3905.h"
+#include "paa3905_reg.h"
+#include "paa3905_stream.h"
+#include "paa3905_decoder.h"
+#include "paa3905_bus.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(PAA3905_STREAM, CONFIG_SENSOR_LOG_LEVEL);
+
+static void paa3905_chip_recovery_handler(struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+	const struct device *dev = cfg->sensor;
+	int err;
+
+	err = paa3905_recover(dev);
+
+	if (err) {
+		rtio_iodev_sqe_err(iodev_sqe, err);
+	} else {
+		rtio_iodev_sqe_ok(iodev_sqe, 0);
+	}
+}
+
+static void start_drdy_backup_timer(const struct device *dev)
+{
+	struct paa3905_data *data = dev->data;
+	const struct paa3905_config *cfg = dev->config;
+
+	k_timer_start(&data->stream.timer,
+		      K_MSEC(cfg->backup_timer_period),
+		      K_NO_WAIT);
+}
+
+static void paa3905_complete_result(struct rtio *ctx,
+				    const struct rtio_sqe *sqe,
+				    void *arg)
+{
+	const struct device *dev = (const struct device *)arg;
+	struct paa3905_data *data = dev->data;
+	struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+	struct paa3905_encoded_data *edata = sqe->userdata;
+	struct rtio_cqe *cqe;
+	int err;
+
+	edata->header.events.drdy = true &&
+				    data->stream.settings.enabled.drdy;
+	edata->header.events.motion = REG_MOTION_DETECTED(edata->motion) &&
+				      data->stream.settings.enabled.motion;
+	edata->header.channels = 0;
+
+	if ((data->stream.settings.enabled.drdy &&
+	      data->stream.settings.opt.drdy == SENSOR_STREAM_DATA_INCLUDE) ||
+	    (data->stream.settings.enabled.motion &&
+	      data->stream.settings.opt.motion == SENSOR_STREAM_DATA_INCLUDE)) {
+		edata->header.channels |= paa3905_encode_channel(SENSOR_CHAN_POS_DXYZ);
+	}
+
+	if (data->stream.settings.enabled.drdy) {
+		start_drdy_backup_timer(dev);
+	}
+
+	/** Attempt chip recovery if erratic behavior is detected  */
+	if (!REG_OBSERVATION_CHIP_OK(edata->observation)) {
+
+		LOG_WRN("CHIP OK register indicates issues. Attempting chip recovery");
+		struct rtio_work_req *req = rtio_work_req_alloc();
+
+		CHECKIF(!req) {
+			LOG_ERR("Failed to allocate RTIO work request");
+			rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+			return;
+		}
+
+		rtio_work_req_submit(req, iodev_sqe, paa3905_chip_recovery_handler);
+	} else {
+		rtio_iodev_sqe_ok(iodev_sqe, 0);
+	}
+
+	/* Flush RTIO bus CQEs */
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+}
+
+static void paa3905_stream_get_data(const struct device *dev)
+{
+	struct paa3905_data *data = dev->data;
+	uint64_t cycles;
+	int err;
+
+	CHECKIF(!data->stream.iodev_sqe) {
+		LOG_WRN("No RTIO submission with an INT GPIO event");
+		return;
+	}
+
+	struct paa3905_encoded_data *buf;
+	uint32_t buf_len;
+	uint32_t buf_len_required = sizeof(struct paa3905_encoded_data);
+
+	err = rtio_sqe_rx_buf(data->stream.iodev_sqe,
+			      buf_len_required,
+			      buf_len_required,
+			      (uint8_t **)&buf,
+			      &buf_len);
+	__ASSERT(err == 0, "Failed to acquire buffer (len: %d) for encoded data: %d. "
+			   "Please revisit RTIO queue sizing and look for "
+			   "bottlenecks during sensor data processing",
+			   buf_len_required, err);
+
+	/** Still throw an error even if asserts are off */
+	if (err) {
+		struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+		LOG_ERR("Failed to acquire buffer for encoded data: %d", err);
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *cb_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	uint8_t val;
+
+	err = sensor_clock_get_cycles(&cycles);
+	CHECKIF(err) {
+		struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+		LOG_ERR("Failed to get timestamp: %d", err);
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+	buf->header.timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	CHECKIF(!write_sqe || !read_sqe || !cb_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQE's");
+		rtio_iodev_sqe_err(data->stream.iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	val = REG_BURST_READ | REG_SPI_READ_BIT;
+
+	rtio_sqe_prep_tiny_write(write_sqe,
+				 data->rtio.iodev,
+				 RTIO_PRIO_HIGH,
+				 &val,
+				 1,
+				 NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_sqe,
+			   data->rtio.iodev,
+			   RTIO_PRIO_HIGH,
+			   buf->buf,
+			   sizeof(buf->buf),
+			   NULL);
+	read_sqe->flags |= RTIO_SQE_CHAINED;
+
+	rtio_sqe_prep_callback_no_cqe(cb_sqe,
+				      paa3905_complete_result,
+				      (void *)dev,
+				      buf);
+
+	rtio_submit(data->rtio.ctx, 0);
+}
+
+static void paa3905_gpio_callback(const struct device *gpio_dev,
+				  struct gpio_callback *cb,
+				  uint32_t pins)
+{
+	struct paa3905_stream *stream = CONTAINER_OF(cb,
+						     struct paa3905_stream,
+						     cb);
+	const struct device *dev = stream->dev;
+	const struct paa3905_config *cfg = dev->config;
+	int err;
+
+	/* Disable interrupts */
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+					      GPIO_INT_MODE_DISABLED);
+	if (err) {
+		LOG_ERR("Failed to disable interrupt");
+		return;
+	}
+
+	paa3905_stream_get_data(dev);
+}
+
+static void paa3905_stream_drdy_timeout(struct k_timer *timer)
+{
+	struct paa3905_stream *stream = CONTAINER_OF(timer,
+						     struct paa3905_stream,
+						     timer);
+	const struct device *dev = stream->dev;
+	const struct paa3905_config *cfg = dev->config;
+	int err;
+
+	/* Disable interrupts */
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+					      GPIO_INT_MODE_DISABLED);
+	if (err) {
+		LOG_ERR("Failed to disable interrupt");
+		return;
+	}
+
+	paa3905_stream_get_data(dev);
+}
+
+static inline bool settings_changed(const struct paa3905_stream *a,
+				    const struct paa3905_stream *b)
+{
+	return (a->settings.enabled.drdy != b->settings.enabled.drdy) ||
+	       (a->settings.opt.drdy != b->settings.opt.drdy) ||
+	       (a->settings.enabled.motion != b->settings.enabled.motion) ||
+	       (a->settings.opt.motion != b->settings.opt.motion);
+}
+
+void paa3905_stream_submit(const struct device *dev,
+			   struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *read_config = iodev_sqe->sqe.iodev->data;
+	struct paa3905_data *data = dev->data;
+	const struct paa3905_config *cfg = dev->config;
+	int err;
+
+	/** This separate struct is required due to the streaming API using a
+	 * multi-shot RTIO submission: meaning, re-submitting itself after
+	 * completion; hence, we don't have context to determine if this was
+	 * the first submission that kicked things off. We're then, inferring
+	 * this by comparing if the read-config has changed, and only restart
+	 * in such case.
+	 */
+	struct paa3905_stream stream = {0};
+
+	for (size_t i = 0 ; i < read_config->count ; i++) {
+		switch (read_config->channels[i].chan_type) {
+		case SENSOR_TRIG_DATA_READY:
+			stream.settings.enabled.drdy = true;
+			stream.settings.opt.drdy = read_config->triggers[i].opt;
+			break;
+		case SENSOR_TRIG_MOTION:
+			stream.settings.enabled.motion = true;
+			stream.settings.opt.motion = read_config->triggers[i].opt;
+			break;
+		default:
+			LOG_ERR("Unsupported trigger (%d)", read_config->triggers[i].trigger);
+			rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+			return;
+		}
+	}
+
+	/* Store context for next submission (handled within callbacks) */
+	data->stream.iodev_sqe = iodev_sqe;
+
+	if (settings_changed(&data->stream, &stream)) {
+		uint8_t motion_data[6];
+
+		data->stream.settings = stream.settings;
+
+		/* Disable interrupts */
+		err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+						      GPIO_INT_MODE_DISABLED);
+		if (err) {
+			LOG_ERR("Failed to disable interrupt");
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		/* Read reg's 0x02-0x06 to clear motion data. */
+		err = paa3905_bus_read(dev, REG_MOTION, motion_data, sizeof(motion_data));
+		if (err) {
+			LOG_ERR("Failed to read motion data");
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+	}
+
+	/* Re-enable interrupts */
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+						GPIO_INT_LEVEL_ACTIVE);
+	if (err) {
+		LOG_ERR("Failed to enable interrupt");
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	/** Back-up timer allows us to keep checking in with the sensor in
+	 * spite of not having any motion. This results in allowing sensor
+	 * recovery if falling in erratic state.
+	 */
+	if (data->stream.settings.enabled.drdy) {
+		start_drdy_backup_timer(dev);
+	}
+}
+
+int paa3905_stream_init(const struct device *dev)
+{
+	const struct paa3905_config *cfg = dev->config;
+	struct paa3905_data *data = dev->data;
+	int err;
+
+	/** Needed to get back the device handle from the callback context */
+	data->stream.dev = dev;
+
+	if (!cfg->int_gpio.port) {
+		LOG_ERR("Interrupt GPIO not supplied");
+		return -ENODEV;
+	}
+
+	if (!gpio_is_ready_dt(&cfg->int_gpio)) {
+		LOG_ERR("Interrupt GPIO not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&cfg->int_gpio, GPIO_INPUT);
+	if (err) {
+		LOG_ERR("Failed to configure interrupt GPIO");
+		return -EIO;
+	}
+
+	gpio_init_callback(&data->stream.cb,
+			   paa3905_gpio_callback,
+			   BIT(cfg->int_gpio.pin));
+
+	err = gpio_add_callback(cfg->int_gpio.port, &data->stream.cb);
+	if (err) {
+		LOG_ERR("Failed to add interrupt callback");
+		return -EIO;
+	}
+
+	k_timer_init(&data->stream.timer, paa3905_stream_drdy_timeout, NULL);
+
+	return err;
+}
diff --git a/drivers/sensor/pixart/paa3905/paa3905_stream.h b/drivers/sensor/pixart/paa3905/paa3905_stream.h
new file mode 100644
index 0000000000000..5eb36be971314
--- /dev/null
+++ b/drivers/sensor/pixart/paa3905/paa3905_stream.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/rtio/rtio.h>
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAA3905_STREAM_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAA3905_STREAM_H_
+
+int paa3905_stream_init(const struct device *dev);
+
+void paa3905_stream_submit(const struct device *dev,
+			   struct rtio_iodev_sqe *iodev_sqe);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAA3905_STREAM_H_ */
diff --git a/drivers/sensor/pixart/pat9136/CMakeLists.txt b/drivers/sensor/pixart/pat9136/CMakeLists.txt
new file mode 100644
index 0000000000000..7a5fa5e3950a8
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(
+	pat9136.c
+	pat9136_decoder.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_PAT9136_STREAM
+	pat9136_stream.c
+)
diff --git a/drivers/sensor/pixart/pat9136/Kconfig b/drivers/sensor/pixart/pat9136/Kconfig
new file mode 100644
index 0000000000000..5123088bb6076
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/Kconfig
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+config PAT9136
+	bool "Optical Flow Sensor PAT9136"
+	default y
+	depends on DT_HAS_PIXART_PAT9136_ENABLED
+	select SPI
+	select SPI_RTIO
+	select RTIO_WORKQ
+	select SENSOR_ASYNC_API
+	help
+	  Enable driver for PAT9136 Optical Flow sensor.
+
+if PAT9136
+
+config PAT9136_STREAM
+	bool "Streaming mode"
+	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_PIXART_PAT9136),int-gpios)
+	help
+	  Enable streaming mode for the PAT9136 sensor.
+
+endif # PAT9136
diff --git a/drivers/sensor/pixart/pat9136/pat9136.c b/drivers/sensor/pixart/pat9136/pat9136.c
new file mode 100644
index 0000000000000..4ccb66fa791ae
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136.c
@@ -0,0 +1,470 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT pixart_pat9136
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/rtio/rtio.h>
+#include <zephyr/rtio/work.h>
+#include <zephyr/sys/check.h>
+
+#include "pat9136.h"
+#include "pat9136_reg.h"
+#include "pat9136_bus.h"
+#include "pat9136_decoder.h"
+#include "pat9136_stream.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(PAT9136, CONFIG_SENSOR_LOG_LEVEL);
+
+struct reg_val_pair {
+	uint8_t reg;
+	uint8_t val;
+	bool op_read;
+	int (*handler)(const struct device *dev, const struct reg_val_pair *self);
+};
+
+static int perform_reg_ops(const struct device *dev, const struct reg_val_pair *ops, size_t len)
+{
+	int err;
+
+	for (size_t i = 0 ; i < len ; i++) {
+
+		/* Copying in order to allow reading data back and keeping the ops array const. */
+		struct reg_val_pair op = ops[i];
+
+		if (op.op_read) {
+			err = pat9136_bus_read(dev, op.reg, &op.val, 1);
+		} else {
+			err = pat9136_bus_write(dev, op.reg, &op.val, 1);
+		}
+
+		if (err) {
+			LOG_ERR("Failed op: %s, idx: %d, reg: 0x%02X, val: 0x%02X",
+				op.op_read ? "read" : "write", i,
+				op.reg, op.val);
+			return err;
+		}
+
+		if (op.handler) {
+			err = op.handler(dev, &op);
+			if (err) {
+				LOG_ERR("Failed to handle op: %d", err);
+				return err;
+			}
+		}
+	}
+
+	return 0;
+}
+
+static void pat9136_complete_result(struct rtio *ctx,
+				    const struct rtio_sqe *sqe,
+				    void *arg)
+{
+	struct rtio_iodev_sqe *iodev_sqe = (struct rtio_iodev_sqe *)sqe->userdata;
+	struct rtio_cqe *cqe;
+	int err = 0;
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	if (err) {
+		rtio_iodev_sqe_err(iodev_sqe, err);
+	} else {
+		rtio_iodev_sqe_ok(iodev_sqe, 0);
+	}
+
+	LOG_DBG("One-shot fetch completed");
+}
+
+static void pat9136_submit_one_shot(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+	const struct sensor_chan_spec *const channels = cfg->channels;
+	const size_t num_channels = cfg->count;
+	uint32_t min_buf_len = sizeof(struct pat9136_encoded_data);
+	int err;
+	uint8_t *buf;
+	uint32_t buf_len;
+	struct pat9136_encoded_data *edata;
+	struct pat9136_data *data = dev->data;
+
+	err = rtio_sqe_rx_buf(iodev_sqe, min_buf_len, min_buf_len, &buf, &buf_len);
+	CHECKIF(err) {
+		LOG_ERR("Failed to get a read buffer of size %u bytes", min_buf_len);
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	edata = (struct pat9136_encoded_data *)buf;
+
+	err = pat9136_encode(dev, channels, num_channels, buf);
+	if (err != 0) {
+		LOG_ERR("Failed to encode sensor data");
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(data->rtio.ctx);
+
+	CHECKIF(!write_sqe || !read_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQEs");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	uint8_t val = REG_BURST_READ | REG_SPI_READ_BIT;
+
+	rtio_sqe_prep_tiny_write(write_sqe,
+				 data->rtio.iodev,
+				 RTIO_PRIO_HIGH,
+				 &val,
+				 1,
+				 NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_sqe,
+			   data->rtio.iodev,
+			   RTIO_PRIO_HIGH,
+			   edata->buf,
+			   sizeof(edata->buf),
+			   NULL);
+	read_sqe->flags |= RTIO_SQE_CHAINED;
+
+	/** Chip only supports "burst reads" for the Data, and hence we can't
+	 * just perform a multi-byte read here. Hence, we're iterating over all
+	 * resolution registers.
+	 */
+	for (size_t i = 0 ; i < sizeof(edata->header.resolution.buf) ; i++) {
+		struct rtio_sqe *res_write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+		struct rtio_sqe *res_read_sqe = rtio_sqe_acquire(data->rtio.ctx);
+
+		CHECKIF(!res_write_sqe || !res_read_sqe) {
+			LOG_ERR("Failed to acquire RTIO SQEs");
+			rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+			return;
+		}
+
+		val = (REG_RESOLUTION_X_LOWER + i) | REG_SPI_READ_BIT;
+
+		rtio_sqe_prep_tiny_write(res_write_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 &val,
+					 1,
+					 NULL);
+		res_write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+		rtio_sqe_prep_read(res_read_sqe,
+				   data->rtio.iodev,
+				   RTIO_PRIO_HIGH,
+				   (uint8_t *)&edata->header.resolution.buf[i],
+				   1,
+				   NULL);
+		res_read_sqe->flags |= RTIO_SQE_CHAINED;
+	}
+
+	struct rtio_sqe *cb_sqe = rtio_sqe_acquire(data->rtio.ctx);
+
+	CHECKIF(!cb_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQEs");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	rtio_sqe_prep_callback_no_cqe(cb_sqe,
+				      pat9136_complete_result,
+				      NULL,
+				      iodev_sqe);
+
+
+	rtio_submit(data->rtio.ctx, 0);
+}
+
+static void pat9136_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+
+	if (!cfg->is_streaming) {
+		pat9136_submit_one_shot(dev, iodev_sqe);
+	} else if (IS_ENABLED(CONFIG_PAT9136_STREAM)) {
+		pat9136_stream_submit(dev, iodev_sqe);
+	} else {
+		LOG_ERR("Streaming not supported");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+	}
+}
+
+static DEVICE_API(sensor, pat9136_driver_api) = {
+	.submit = pat9136_submit,
+	.get_decoder = pat9136_get_decoder,
+};
+
+static int conditional_write_fn(const struct device *dev, const struct reg_val_pair *self)
+{
+	struct reg_val_pair cond_write[] = {
+		{.reg = 0x58, .val = 0},
+		{.reg = 0x57, .val = 0},
+	};
+
+	if (self->val & BIT(7)) {
+		cond_write[0].val = 0x04;
+		cond_write[1].val = 0x80;
+	} else {
+		cond_write[0].val = 0x84;
+		cond_write[1].val = 0x00;
+	}
+
+	return perform_reg_ops(dev, cond_write, ARRAY_SIZE(cond_write));
+}
+
+static int delay_100ms_fn(const struct device *dev, const struct reg_val_pair *self)
+{
+	k_sleep(K_MSEC(100));
+
+	return 0;
+}
+
+static int pat9136_init_sequence(const struct device *dev)
+{
+	const static struct reg_val_pair paa9136_init_sequence[] = {
+		{.reg = 0x3A, .val = 0x5A}, {.reg = 0x7F, .val = 0x00}, {.reg = 0x40, .val = 0x80},
+		{.reg = 0x7F, .val = 0x14}, {.reg = 0x4D, .val = 0x00}, {.reg = 0x53, .val = 0x0D},
+		{.reg = 0x4B, .val = 0x20}, {.reg = 0x42, .val = 0xBC}, {.reg = 0x43, .val = 0x74},
+		{.reg = 0x58, .val = 0x4C}, {.reg = 0x79, .val = 0x00}, {.reg = 0x7F, .val = 0x0E},
+		{.reg = 0x54, .val = 0x04}, {.reg = 0x7F, .val = 0x0E}, {.reg = 0x55, .val = 0x0D},
+		{.reg = 0x58, .val = 0xD5}, {.reg = 0x56, .val = 0xFB}, {.reg = 0x57, .val = 0xEB},
+		{.reg = 0x7F, .val = 0x15},
+
+		/** Per datasheet, depending on the value read for this register,
+		 * the written content will vary:
+		 * - BIT(7) = 0 -> reg(0x58) = 0x04, reg(0x57) = 0x80.
+		 * - BIT(7) = 1 -> reg(0x58) = 0x84, reg(0x57) = 0x00.
+		 */
+		{
+			.reg = 0x58,
+			.op_read = true,
+			.handler = conditional_write_fn,
+		},
+
+		{.reg = 0x7F, .val = 0x07}, {.reg = 0x40, .val = 0x43}, {.reg = 0x7F, .val = 0x13},
+		{.reg = 0x49, .val = 0x20}, {.reg = 0x7F, .val = 0x14}, {.reg = 0x54, .val = 0x02},
+		{.reg = 0x7F, .val = 0x15}, {.reg = 0x60, .val = 0x00}, {.reg = 0x7F, .val = 0x06},
+		{.reg = 0x74, .val = 0x50}, {.reg = 0x7B, .val = 0x02}, {.reg = 0x7F, .val = 0x00},
+		{.reg = 0x64, .val = 0x74}, {.reg = 0x65, .val = 0x03}, {.reg = 0x72, .val = 0x0E},
+		{.reg = 0x73, .val = 0x00}, {.reg = 0x7F, .val = 0x14}, {.reg = 0x61, .val = 0x3E},
+		{.reg = 0x62, .val = 0x1E}, {.reg = 0x63, .val = 0x1E}, {.reg = 0x7F, .val = 0x15},
+		{.reg = 0x69, .val = 0x1E}, {.reg = 0x7F, .val = 0x07}, {.reg = 0x40, .val = 0x40},
+		{.reg = 0x7F, .val = 0x00}, {.reg = 0x61, .val = 0x00}, {.reg = 0x7F, .val = 0x15},
+		{.reg = 0x63, .val = 0x00}, {.reg = 0x62, .val = 0x00}, {.reg = 0x7F, .val = 0x00},
+		{.reg = 0x61, .val = 0xAD}, {.reg = 0x7F, .val = 0x15}, {.reg = 0x5D, .val = 0x2C},
+
+		/** Per datasheet, on this write we need to wait for 100-ms before moving on */
+		{
+			.reg = 0x5E,
+			.val = 0xC4,
+			.op_read = false,
+			.handler = delay_100ms_fn,
+		},
+
+		{.reg = 0x5D, .val = 0x04}, {.reg = 0x5E, .val = 0xEC},
+		{.reg = 0x7F, .val = 0x05}, {.reg = 0x42, .val = 0x48}, {.reg = 0x43, .val = 0xE7},
+		{.reg = 0x7F, .val = 0x06}, {.reg = 0x71, .val = 0x03}, {.reg = 0x7F, .val = 0x09},
+		{.reg = 0x60, .val = 0x1C}, {.reg = 0x61, .val = 0x1E}, {.reg = 0x62, .val = 0x02},
+		{.reg = 0x63, .val = 0x04}, {.reg = 0x64, .val = 0x1E}, {.reg = 0x65, .val = 0x1F},
+		{.reg = 0x66, .val = 0x01}, {.reg = 0x67, .val = 0x02}, {.reg = 0x68, .val = 0x02},
+		{.reg = 0x69, .val = 0x01}, {.reg = 0x6A, .val = 0x1F}, {.reg = 0x6B, .val = 0x1E},
+		{.reg = 0x6C, .val = 0x04}, {.reg = 0x6D, .val = 0x02}, {.reg = 0x6E, .val = 0x1E},
+		{.reg = 0x6F, .val = 0x1C}, {.reg = 0x7F, .val = 0x05}, {.reg = 0x45, .val = 0x94},
+		{.reg = 0x45, .val = 0x14}, {.reg = 0x44, .val = 0x45}, {.reg = 0x45, .val = 0x17},
+		{.reg = 0x7F, .val = 0x09}, {.reg = 0x47, .val = 0x4F}, {.reg = 0x4F, .val = 0x00},
+		{.reg = 0x52, .val = 0x04}, {.reg = 0x7F, .val = 0x0C}, {.reg = 0x4E, .val = 0x00},
+		{.reg = 0x5B, .val = 0x00}, {.reg = 0x7F, .val = 0x0D}, {.reg = 0x71, .val = 0x92},
+		{.reg = 0x70, .val = 0x07}, {.reg = 0x73, .val = 0x92}, {.reg = 0x72, .val = 0x07},
+		{.reg = 0x7F, .val = 0x00}, {.reg = 0x5B, .val = 0x20}, {.reg = 0x48, .val = 0x13},
+		{.reg = 0x49, .val = 0x00}, {.reg = 0x4A, .val = 0x13}, {.reg = 0x4B, .val = 0x00},
+		{.reg = 0x47, .val = 0x01}, {.reg = 0x54, .val = 0x55}, {.reg = 0x5A, .val = 0x50},
+		{.reg = 0x66, .val = 0x03}, {.reg = 0x67, .val = 0x00}, {.reg = 0x7F, .val = 0x07},
+		{.reg = 0x40, .val = 0x43}, {.reg = 0x7F, .val = 0x05}, {.reg = 0x4D, .val = 0x00},
+		{.reg = 0x6D, .val = 0x96}, {.reg = 0x55, .val = 0x62}, {.reg = 0x59, .val = 0x21},
+		{.reg = 0x5F, .val = 0xD8}, {.reg = 0x6A, .val = 0x22}, {.reg = 0x7F, .val = 0x07},
+		{.reg = 0x42, .val = 0x30}, {.reg = 0x43, .val = 0x00}, {.reg = 0x7F, .val = 0x06},
+		{.reg = 0x4C, .val = 0x01}, {.reg = 0x54, .val = 0x02}, {.reg = 0x62, .val = 0x01},
+		{.reg = 0x7F, .val = 0x09}, {.reg = 0x41, .val = 0x01}, {.reg = 0x4F, .val = 0x00},
+		{.reg = 0x7F, .val = 0x0A}, {.reg = 0x4C, .val = 0x18}, {.reg = 0x51, .val = 0x8F},
+		{.reg = 0x7F, .val = 0x07}, {.reg = 0x40, .val = 0x40}, {.reg = 0x7F, .val = 0x00},
+		{.reg = 0x40, .val = 0x80}, {.reg = 0x7F, .val = 0x09}, {.reg = 0x40, .val = 0x03},
+		{.reg = 0x44, .val = 0x08}, {.reg = 0x4F, .val = 0x08}, {.reg = 0x7F, .val = 0x0A},
+		{.reg = 0x51, .val = 0x8E}, {.reg = 0x7F, .val = 0x00}, {.reg = 0x66, .val = 0x11},
+		{.reg = 0x67, .val = 0x08},
+	};
+
+	return perform_reg_ops(dev, paa9136_init_sequence, ARRAY_SIZE(paa9136_init_sequence));
+}
+
+static int pat9136_set_resolution(const struct device *dev)
+{
+	const struct pat9136_config *cfg = dev->config;
+	struct reg_val_pair paa9136_resolution_ops[] = {
+		{.reg = REG_RESOLUTION_X_LOWER, .val = cfg->resolution & 0xFF},
+		{.reg = REG_RESOLUTION_X_UPPER, .val = 0},
+		{.reg = REG_RESOLUTION_Y_LOWER, .val = cfg->resolution & 0xFF},
+		{.reg = REG_RESOLUTION_Y_UPPER, .val = 0},
+		{.reg = REG_RESOLUTION_SET, .val = 0x01},
+	};
+
+	return perform_reg_ops(dev, paa9136_resolution_ops, ARRAY_SIZE(paa9136_resolution_ops));
+}
+
+static int pat9136_configure(const struct device *dev)
+{
+	int err;
+	uint8_t val;
+	uint8_t motion_data[6];
+
+	/* Clear device config by issuing a software reset request */
+	val = POWER_UP_RESET_VAL;
+	err = pat9136_bus_write(dev, REG_POWER_UP_RESET, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to write Power up reset reg");
+		return err;
+	}
+	k_sleep(K_MSEC(50));
+
+	/* Clear observation register and read back the register, */
+	uint8_t retries = 3;
+
+	do {
+		val = 0x00;
+		err = pat9136_bus_write(dev, REG_OBSERVATION, &val, 1);
+		if (err) {
+			LOG_ERR("Failed to read Product ID");
+			return err;
+		}
+		k_sleep(K_MSEC(1));
+
+		err = pat9136_bus_read(dev, REG_OBSERVATION, &val, 1);
+		if (err) {
+			LOG_ERR("Failed to read observation register");
+			return err;
+		}
+		if (REG_OBSERVATION_READ_IS_VALID(val)) {
+			break;
+		}
+	} while (err == 0 && (retries-- > 0));
+
+	if (!REG_OBSERVATION_READ_IS_VALID(val)) {
+		LOG_ERR("Invalid observation register value: 0x%02X", val);
+		return -EIO;
+	}
+
+	/** Load performance optimization settings */
+	err = pat9136_init_sequence(dev);
+	if (err) {
+		LOG_ERR("Failed to init sequence");
+		return err;
+	}
+
+	/* Set resolution */
+	err = pat9136_set_resolution(dev);
+	if (err) {
+		LOG_ERR("Failed to set resolution");
+		return err;
+	}
+
+	/* Read reg's 0x02-0x06 to clear motion data. */
+	err = pat9136_bus_read(dev, REG_MOTION, motion_data, sizeof(motion_data));
+	if (err) {
+		LOG_ERR("Failed to read motion data");
+		return err;
+	}
+
+	return 0;
+}
+
+static int pat9136_init(const struct device *dev)
+{
+	int err;
+	uint8_t val;
+
+	/* Power-up sequence delay */
+	k_sleep(K_MSEC(50));
+
+	/* Read Product ID */
+	err = pat9136_bus_read(dev, REG_PRODUCT_ID, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to read Product ID");
+		return err;
+	} else if (val != PRODUCT_ID) {
+		LOG_ERR("Invalid Product ID: 0x%02X", val);
+		return -EIO;
+	}
+
+	if (IS_ENABLED(CONFIG_PAT9136_STREAM)) {
+		err = pat9136_stream_init(dev);
+		if (err) {
+			LOG_ERR("Failed to initialize streaming");
+			return err;
+		}
+	}
+
+	err = pat9136_configure(dev);
+	if (err) {
+		LOG_ERR("Failed to configure");
+		return err;
+	}
+
+	return 0;
+}
+
+#define PAT9136_INIT(inst)									   \
+												   \
+	BUILD_ASSERT(DT_PROP(DT_DRV_INST(inst), resolution) >= 0 &&				   \
+		     DT_PROP(DT_DRV_INST(inst), resolution) <= 0xC7,				   \
+		     "Resolution must be in range 0-199");					   \
+	BUILD_ASSERT(DT_PROP(DT_DRV_INST(inst), cooldown_timer_ms) <				   \
+		     DT_PROP(DT_DRV_INST(inst), backup_timer_ms),				   \
+		     "Cooldown timer must be less than backup timer");				   \
+												   \
+	RTIO_DEFINE(pat9136_rtio_ctx_##inst, 16, 16);						   \
+	SPI_DT_IODEV_DEFINE(pat9136_bus_##inst,							   \
+			    DT_DRV_INST(inst),							   \
+			    SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_TRANSFER_MSB,		   \
+			    0U);								   \
+												   \
+	static const struct pat9136_config pat9136_cfg_##inst = {				   \
+		.int_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, {0}),			   \
+		.backup_timer_period = DT_PROP(DT_DRV_INST(inst), backup_timer_ms),		   \
+		.cooldown_timer_period = DT_PROP(DT_DRV_INST(inst), cooldown_timer_ms),		   \
+		.resolution = DT_INST_PROP(inst, resolution),					   \
+	};											   \
+												   \
+	static struct pat9136_data pat9136_data_##inst = {					   \
+		.rtio = {									   \
+			.iodev = &pat9136_bus_##inst,						   \
+			.ctx = &pat9136_rtio_ctx_##inst,					   \
+		},										   \
+	};											   \
+												   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst,							   \
+				     pat9136_init,						   \
+				     NULL,							   \
+				     &pat9136_data_##inst,					   \
+				     &pat9136_cfg_##inst,					   \
+				     POST_KERNEL,						   \
+				     CONFIG_SENSOR_INIT_PRIORITY,				   \
+				     &pat9136_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(PAT9136_INIT)
diff --git a/drivers/sensor/pixart/pat9136/pat9136.h b/drivers/sensor/pixart/pat9136/pat9136.h
new file mode 100644
index 0000000000000..94aaaa64c4920
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAT9136_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAT9136_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/rtio/rtio.h>
+
+struct pat9136_encoded_data {
+	struct {
+		uint64_t timestamp;
+		uint8_t channels : 6;
+		struct {
+			bool drdy : 1;
+			bool motion : 1;
+		} events;
+		union {
+			uint8_t buf[4];
+			struct {
+				uint16_t x;
+				uint16_t y;
+			} __attribute__((__packed__));
+		} resolution;
+	} header;
+	union {
+		uint8_t buf[12];
+		struct {
+			uint8_t motion;
+			uint8_t observation;
+			struct {
+				int16_t x;
+				int16_t y;
+			} delta;
+			uint8_t squal;
+			uint8_t raw_sum;
+			uint8_t raw_max;
+			uint8_t raw_min;
+			uint16_t shutter;
+		} __attribute__((__packed__));
+	};
+};
+
+struct pat9136_stream {
+	struct gpio_callback cb;
+	const struct device *dev;
+	struct rtio_iodev_sqe *iodev_sqe;
+	struct {
+		struct k_timer backup;
+		struct {
+			atomic_t armed;
+			struct k_timer timer;
+		} cooldown;
+	} timer;
+	struct {
+		struct {
+			bool drdy : 1;
+			bool motion : 1;
+		} enabled;
+		struct {
+			enum sensor_stream_data_opt drdy;
+			enum sensor_stream_data_opt motion;
+		} opt;
+	} settings;
+};
+
+struct pat9136_data {
+	struct {
+		struct rtio_iodev *iodev;
+		struct rtio *ctx;
+	} rtio;
+#if defined(CONFIG_PAT9136_STREAM)
+	struct pat9136_stream stream;
+#endif /* CONFIG_PAT9136_STREAM */
+};
+
+struct pat9136_config {
+	struct gpio_dt_spec int_gpio;
+	uint16_t resolution;
+	uint32_t backup_timer_period;
+	uint32_t cooldown_timer_period;
+};
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAT9136_H_ */
diff --git a/drivers/sensor/pixart/pat9136/pat9136_bus.h b/drivers/sensor/pixart/pat9136/pat9136_bus.h
new file mode 100644
index 0000000000000..db61b54b9b994
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136_bus.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAT9136_BUS_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAT9136_BUS_H_
+
+#include <stdint.h>
+#include <zephyr/rtio/rtio.h>
+
+#include "pat9136.h"
+#include "pat9136_reg.h"
+
+static inline int pat9136_bus_read(const struct device *dev,
+				   uint8_t reg,
+				   uint8_t *buf,
+				   uint16_t len)
+{
+	struct pat9136_data *data = dev->data;
+	struct rtio *ctx = data->rtio.ctx;
+	struct rtio_iodev *iodev = data->rtio.iodev;
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_cqe *cqe;
+	int err;
+
+	if (!write_sqe || !read_sqe) {
+		return -ENOMEM;
+	}
+
+	reg = reg | REG_SPI_READ_BIT;
+
+	rtio_sqe_prep_write(write_sqe, iodev, RTIO_PRIO_HIGH, &reg, 1, NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_read(read_sqe, iodev, RTIO_PRIO_HIGH, buf, len, NULL);
+
+	err = rtio_submit(ctx, 2);
+	if (err) {
+		return err;
+	}
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	return err;
+}
+
+static inline int pat9136_bus_write(const struct device *dev,
+				    uint8_t reg,
+				    const uint8_t *buf,
+				    uint16_t len)
+{
+	struct pat9136_data *data = dev->data;
+	struct rtio *ctx = data->rtio.ctx;
+	struct rtio_iodev *iodev = data->rtio.iodev;
+	struct rtio_sqe *write_reg_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_sqe *write_buf_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_cqe *cqe;
+	int err;
+
+	if (!write_reg_sqe || !write_buf_sqe) {
+		return -ENOMEM;
+	}
+
+	reg = reg | REG_SPI_WRITE_BIT;
+
+	rtio_sqe_prep_write(write_reg_sqe, iodev, RTIO_PRIO_HIGH, &reg, 1, NULL);
+	write_reg_sqe->flags |= RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_write(write_buf_sqe, iodev, RTIO_PRIO_HIGH, buf, len, NULL);
+
+	err = rtio_submit(ctx, 2);
+	if (err) {
+		return err;
+	}
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	return err;
+}
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAT9136_BUS_H_ */
diff --git a/drivers/sensor/pixart/pat9136/pat9136_decoder.c b/drivers/sensor/pixart/pat9136/pat9136_decoder.c
new file mode 100644
index 0000000000000..6fc869fe1c874
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136_decoder.c
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/sensor_clock.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor/pat9136.h>
+
+#include "pat9136.h"
+#include "pat9136_reg.h"
+#include "pat9136_decoder.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(PAT9136_DECODER, CONFIG_SENSOR_LOG_LEVEL);
+
+#define DT_DRV_COMPAT pixart_pat9136
+
+static int pat9136_get_shift(uint16_t channel,
+			     uint16_t res_x,
+			     uint16_t res_y,
+			     int8_t *shift)
+{
+	/** Table generated based on calculation of required bits:
+	 * - resolution_cpi (per datasheet) = (1 + resolution) * 100
+	 * - value_mm = value * 25.4 / resolution_cpi
+	 *  - Bits Required = round_up( Log2(value_mm) )
+	 */
+	struct {
+		uint16_t min;
+		uint16_t max;
+		int8_t shift;
+	} const static shift_based_on_ranges[] = {
+		{.min = 0, .max = 0, .shift = 14},
+		{.min = 1, .max = 1, .shift = 13},
+		{.min = 2, .max = 3, .shift = 12},
+		{.min = 4, .max = 7, .shift = 11},
+		{.min = 8, .max = 15, .shift = 10},
+		{.min = 16, .max = 31, .shift = 9},
+		{.min = 32, .max = 63, .shift = 8},
+		{.min = 64, .max = 127, .shift = 7},
+		{.min = 128, .max = 199, .shift = 6},
+	};
+	/** Going with lowest resolution to be able to represent biggest value */
+	uint16_t resolution = MIN(res_x, res_y);
+
+	switch (channel) {
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY:
+	case SENSOR_CHAN_POS_DXYZ:
+		*shift = 31;
+		return 0;
+	case SENSOR_CHAN_POS_DX_MM:
+	case SENSOR_CHAN_POS_DY_MM:
+	case SENSOR_CHAN_POS_DXYZ_MM:
+		for (size_t i = 0 ; i < ARRAY_SIZE(shift_based_on_ranges) ; i++) {
+			if (resolution >= shift_based_on_ranges[i].min &&
+			    resolution <= shift_based_on_ranges[i].max) {
+				*shift = shift_based_on_ranges[i].shift;
+				return 0;
+			}
+		}
+	default:
+		return -EINVAL;
+	}
+
+	return -EIO;
+}
+
+static void pat9136_convert_raw_to_q31(struct pat9136_encoded_data *edata,
+				       uint16_t chan,
+				       int32_t reading,
+				       q31_t *out)
+{
+	int8_t shift;
+	uint32_t resolution_setting = MIN(edata->header.resolution.x,
+					  edata->header.resolution.y);
+	int64_t intermediate;
+
+	(void)pat9136_get_shift(chan,
+				resolution_setting,
+				resolution_setting,
+				&shift);
+
+	switch (chan) {
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY:
+		*out = (q31_t)reading;
+		return;
+	case SENSOR_CHAN_POS_DX_MM:
+	case SENSOR_CHAN_POS_DY_MM: {
+		uint32_t resolution = (chan == SENSOR_CHAN_POS_DX_MM) ?
+				      (edata->header.resolution.x + 1) * 100 :
+				      (edata->header.resolution.y + 1) * 100;
+
+		intermediate = (((int64_t)reading * INT64_C(1000000) * 25.4));
+		intermediate /= resolution;
+
+		intermediate *= ((int64_t)INT32_MAX + 1) / ((1 << shift) * INT64_C(1000000));
+
+		*out = CLAMP(intermediate, INT32_MIN, INT32_MAX);
+
+		return;
+	}
+	default:
+		CODE_UNREACHABLE;
+	}
+}
+
+uint8_t pat9136_encode_channel(uint16_t chan)
+{
+	switch (chan) {
+	case SENSOR_CHAN_POS_DX:
+		return BIT(0);
+	case SENSOR_CHAN_POS_DY:
+		return BIT(1);
+	case SENSOR_CHAN_POS_DXYZ:
+		return BIT(2);
+	case SENSOR_CHAN_POS_DX_MM:
+		return BIT(3);
+	case SENSOR_CHAN_POS_DY_MM:
+		return BIT(4);
+	case SENSOR_CHAN_POS_DXYZ_MM:
+		return BIT(5);
+	case SENSOR_CHAN_ALL:
+		return BIT_MASK(6);
+	default:
+		return 0;
+	}
+}
+
+static bool is_data_valid(const struct pat9136_encoded_data *edata)
+{
+	if (!REG_MOTION_DETECTED(edata->motion)) {
+		LOG_WRN("Invalid data - No motion detected");
+		return false;
+	}
+
+	if (!REG_OBSERVATION_READ_IS_VALID(edata->observation)) {
+		LOG_WRN("Invalid data - Observation read is not valid");
+		return false;
+	}
+
+	return true;
+}
+
+static int pat9136_decoder_get_frame_count(const uint8_t *buffer,
+					   struct sensor_chan_spec chan_spec,
+					   uint16_t *frame_count)
+{
+	struct pat9136_encoded_data *edata = (struct pat9136_encoded_data *)buffer;
+
+	if (chan_spec.chan_idx != 0) {
+		return -ENOTSUP;
+	}
+
+	uint8_t channel_request = pat9136_encode_channel(chan_spec.chan_type);
+
+	if (((edata->header.channels & channel_request) != channel_request) ||
+	    !is_data_valid(edata)) {
+		return -ENODATA;
+	}
+
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY:
+	case SENSOR_CHAN_POS_DXYZ:
+	case SENSOR_CHAN_POS_DX_MM:
+	case SENSOR_CHAN_POS_DY_MM:
+	case SENSOR_CHAN_POS_DXYZ_MM:
+		*frame_count = 1;
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+
+	return -1;
+}
+
+static int pat9136_decoder_get_size_info(struct sensor_chan_spec chan_spec,
+					 size_t *base_size,
+					 size_t *frame_size)
+{
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY:
+	case SENSOR_CHAN_POS_DX_MM:
+	case SENSOR_CHAN_POS_DY_MM:
+		*base_size = sizeof(struct sensor_q31_data);
+		*frame_size = sizeof(struct sensor_q31_sample_data);
+		return 0;
+	case SENSOR_CHAN_POS_DXYZ:
+	case SENSOR_CHAN_POS_DXYZ_MM:
+		*base_size = sizeof(struct sensor_three_axis_data);
+		*frame_size = sizeof(struct sensor_three_axis_data);
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int pat9136_decoder_decode(const uint8_t *buffer,
+				  struct sensor_chan_spec chan_spec,
+				  uint32_t *fit,
+				  uint16_t max_count,
+				  void *data_out)
+{
+	struct pat9136_encoded_data *edata = (struct pat9136_encoded_data *)buffer;
+	uint8_t channel_request;
+
+	if (*fit != 0) {
+		return 0;
+	}
+
+	if (max_count == 0 || chan_spec.chan_idx != 0) {
+		return -EINVAL;
+	}
+
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_POS_DX_MM:
+	case SENSOR_CHAN_POS_DY_MM:
+	case SENSOR_CHAN_POS_DX:
+	case SENSOR_CHAN_POS_DY: {
+		channel_request = pat9136_encode_channel(chan_spec.chan_type);
+		if (((edata->header.channels & channel_request) != channel_request) ||
+		    !is_data_valid(edata)) {
+			LOG_ERR("No data available");
+			return -ENODATA;
+		}
+
+		struct sensor_q31_data *out = (struct sensor_q31_data *)data_out;
+		int16_t raw_value = (chan_spec.chan_type == SENSOR_CHAN_POS_DX ||
+				     chan_spec.chan_type == SENSOR_CHAN_POS_DX_MM) ?
+				    edata->delta.x :
+				    edata->delta.y;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+
+		(void)pat9136_get_shift(chan_spec.chan_type,
+					edata->header.resolution.x,
+					edata->header.resolution.y,
+					&out->shift);
+
+		(void)pat9136_convert_raw_to_q31(edata,
+						 chan_spec.chan_type,
+						 raw_value,
+						 &out->readings->value);
+
+		*fit = 1;
+		return 1;
+	}
+	case SENSOR_CHAN_POS_DXYZ_MM:
+	case SENSOR_CHAN_POS_DXYZ: {
+		channel_request = pat9136_encode_channel(chan_spec.chan_type);
+		if (((edata->header.channels & channel_request) != channel_request) ||
+		    !is_data_valid(edata)) {
+			LOG_ERR("No data available");
+			return -ENODATA;
+		}
+
+		struct sensor_three_axis_data *out = (struct sensor_three_axis_data *)data_out;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+
+		(void)pat9136_get_shift(chan_spec.chan_type,
+					edata->header.resolution.x,
+					edata->header.resolution.y,
+					&out->shift);
+
+		(void)pat9136_convert_raw_to_q31(edata,
+						 chan_spec.chan_type - 3,
+						 edata->delta.x,
+						 &out->readings[0].x);
+		(void)pat9136_convert_raw_to_q31(edata,
+						 chan_spec.chan_type - 2,
+						 edata->delta.y,
+						 &out->readings[0].y);
+		out->readings[0].z = 0;
+
+		*fit = 1;
+		return 1;
+	}
+	default:
+		return -EINVAL;
+	}
+
+	return -1;
+}
+
+static bool pat9136_decoder_has_trigger(const uint8_t *buffer, enum sensor_trigger_type trigger)
+{
+	struct pat9136_encoded_data *edata = (struct pat9136_encoded_data *)buffer;
+
+	switch (trigger) {
+	case SENSOR_TRIG_DATA_READY:
+		return edata->header.events.drdy;
+	case SENSOR_TRIG_MOTION:
+		return edata->header.events.motion;
+	default:
+		return false;
+	}
+}
+
+SENSOR_DECODER_API_DT_DEFINE() = {
+	.get_frame_count = pat9136_decoder_get_frame_count,
+	.get_size_info = pat9136_decoder_get_size_info,
+	.decode = pat9136_decoder_decode,
+	.has_trigger = pat9136_decoder_has_trigger,
+};
+
+int pat9136_get_decoder(const struct device *dev,
+	const struct sensor_decoder_api **decoder)
+{
+	ARG_UNUSED(dev);
+	*decoder = &SENSOR_DECODER_NAME();
+
+	return 0;
+}
+
+int pat9136_encode(const struct device *dev,
+		   const struct sensor_chan_spec *const channels,
+		   size_t num_channels,
+		   uint8_t *buf)
+{
+	struct pat9136_encoded_data *edata = (struct pat9136_encoded_data *)buf;
+	uint64_t cycles;
+	int err;
+
+	edata->header.channels = 0;
+	edata->header.events.drdy = 0;
+	edata->header.events.motion = 0;
+
+	for (size_t i = 0 ; i < num_channels; i++) {
+		edata->header.channels |= pat9136_encode_channel(channels[i].chan_type);
+	}
+
+	err = sensor_clock_get_cycles(&cycles);
+	if (err != 0) {
+		return err;
+	}
+
+	edata->header.timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	return 0;
+}
diff --git a/drivers/sensor/pixart/pat9136/pat9136_decoder.h b/drivers/sensor/pixart/pat9136/pat9136_decoder.h
new file mode 100644
index 0000000000000..5d7e77fceddae
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136_decoder.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAT9136_DECODER_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAT9136_DECODER_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/sensor.h>
+#include "pat9136.h"
+
+int pat9136_encode(const struct device *dev,
+		   const struct sensor_chan_spec *const channels,
+		   size_t num_channels,
+		   uint8_t *buf);
+
+uint8_t pat9136_encode_channel(uint16_t chan);
+
+int pat9136_get_decoder(const struct device *dev,
+			const struct sensor_decoder_api **decoder);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAT9136_DECODER_H_ */
diff --git a/drivers/sensor/pixart/pat9136/pat9136_reg.h b/drivers/sensor/pixart/pat9136/pat9136_reg.h
new file mode 100644
index 0000000000000..0a5e56dcab0ed
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136_reg.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAT9136_REG_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAT9136_REG_H_
+
+#define REG_SPI_READ_BIT			0
+#define REG_SPI_WRITE_BIT			BIT(7)
+
+/* Registers */
+#define REG_PRODUCT_ID				0x00
+#define REG_MOTION				0x02
+#define REG_OBSERVATION				0x15
+#define REG_BURST_READ				0x16
+#define REG_POWER_UP_RESET			0x3A
+#define REG_RESOLUTION_SET			0x47
+#define REG_RESOLUTION_X_LOWER			0x48
+#define REG_RESOLUTION_X_UPPER			0x49
+#define REG_RESOLUTION_Y_LOWER			0x4A
+#define REG_RESOLUTION_Y_UPPER			0x4B
+
+/* Misc. Defines */
+#define PRODUCT_ID				0x4F
+#define POWER_UP_RESET_VAL			0x5A
+
+#define REG_MOTION_DETECTED(val)		((val) & BIT(7))
+
+#define REG_OBSERVATION_READ_IS_VALID(val)	(((val) == 0xB7) || ((val) == 0xBF))
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAT9136_REG_H_ */
diff --git a/drivers/sensor/pixart/pat9136/pat9136_stream.c b/drivers/sensor/pixart/pat9136/pat9136_stream.c
new file mode 100644
index 0000000000000..3f7bff784f211
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136_stream.c
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor_clock.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/rtio/rtio.h>
+#include <zephyr/rtio/work.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/sensor/pat9136.h>
+
+#include "pat9136.h"
+#include "pat9136_reg.h"
+#include "pat9136_stream.h"
+#include "pat9136_decoder.h"
+#include "pat9136_bus.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(PAT9136_STREAM, CONFIG_SENSOR_LOG_LEVEL);
+
+static void start_drdy_backup_timer(const struct device *dev)
+{
+	struct pat9136_data *data = dev->data;
+	const struct pat9136_config *cfg = dev->config;
+
+	k_timer_start(&data->stream.timer.backup,
+		      K_MSEC(cfg->backup_timer_period),
+		      K_NO_WAIT);
+}
+
+static void start_drdy_cooldown_timer(const struct device *dev)
+{
+	struct pat9136_data *data = dev->data;
+	const struct pat9136_config *cfg = dev->config;
+
+	k_timer_start(&data->stream.timer.cooldown.timer,
+		      K_MSEC(cfg->cooldown_timer_period),
+		      K_NO_WAIT);
+}
+
+static void pat9136_complete_result(struct rtio *ctx,
+				    const struct rtio_sqe *sqe,
+				    void *arg)
+{
+	const struct device *dev = (const struct device *)arg;
+	struct pat9136_data *data = dev->data;
+	struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+	struct pat9136_encoded_data *edata = sqe->userdata;
+
+	data->stream.iodev_sqe = NULL;
+
+	edata->header.events.drdy = true &&
+				    data->stream.settings.enabled.drdy;
+	edata->header.events.motion = REG_MOTION_DETECTED(edata->motion) &&
+				      data->stream.settings.enabled.motion;
+	edata->header.channels = 0;
+
+	if ((data->stream.settings.enabled.drdy &&
+	      data->stream.settings.opt.drdy == SENSOR_STREAM_DATA_INCLUDE) ||
+	    (data->stream.settings.enabled.motion &&
+	      data->stream.settings.opt.motion == SENSOR_STREAM_DATA_INCLUDE)) {
+		edata->header.channels |= pat9136_encode_channel(SENSOR_CHAN_POS_DXYZ);
+		edata->header.channels |= pat9136_encode_channel(SENSOR_CHAN_POS_DXYZ_MM);
+	}
+
+	if (data->stream.settings.enabled.drdy) {
+		start_drdy_backup_timer(dev);
+	}
+
+	/** Attempt chip recovery if erratic behavior is detected  */
+	if (!REG_OBSERVATION_READ_IS_VALID(edata->observation)) {
+
+		LOG_WRN("CHIP OK register indicates issues. Attempting chip recovery: 0x%02X",
+			edata->observation);
+
+		rtio_iodev_sqe_err(iodev_sqe, -EAGAIN);
+	} else {
+		rtio_iodev_sqe_ok(iodev_sqe, 0);
+	}
+}
+
+static void pat9136_stream_get_data(const struct device *dev)
+{
+	struct pat9136_data *data = dev->data;
+	uint64_t cycles;
+	int err;
+
+	CHECKIF(!data->stream.iodev_sqe) {
+		LOG_WRN("No RTIO submission with an INT GPIO event");
+		return;
+	}
+
+	/** This sensor may trigger data at a very fast pace (20,000 fps) and this
+	 * may not be useful for the application. Instead, it may affect its
+	 * proper functioning. Therefore, this timer keeps the INT line disabled
+	 * (which happens on every submission) until the cool-down the time has expired.
+	 * This, in order to "throttle" the interrupt-servicing rate of this sensor
+	 * (see: pat9136_stream_cooldown_timeout).
+	 *
+	 * Please note that this does not mean the sensor discards data: as the
+	 * value is accumulative until read by the application.
+	 */
+	start_drdy_cooldown_timer(dev);
+
+	struct pat9136_encoded_data *buf;
+	uint32_t buf_len;
+	uint32_t buf_len_required = sizeof(struct pat9136_encoded_data);
+
+	err = rtio_sqe_rx_buf(data->stream.iodev_sqe,
+			      buf_len_required,
+			      buf_len_required,
+			      (uint8_t **)&buf,
+			      &buf_len);
+	__ASSERT(err == 0, "Failed to acquire buffer (len: %d) for encoded data: %d. "
+			   "Please revisit RTIO queue sizing and look for "
+			   "bottlenecks during sensor data processing",
+			   buf_len_required, err);
+
+	/** Still throw an error even if asserts are off */
+	if (err) {
+		struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+		LOG_ERR("Failed to acquire buffer for encoded data: %d", err);
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	struct rtio_sqe *write_res_x_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_res_x_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *write_res_y_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_res_y_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *cb_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	uint8_t val;
+
+	err = sensor_clock_get_cycles(&cycles);
+	CHECKIF(err) {
+		struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+		LOG_ERR("Failed to get timestamp: %d", err);
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+	buf->header.timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	CHECKIF(!write_res_x_sqe || !read_res_x_sqe ||
+		!write_res_y_sqe || !read_res_y_sqe ||
+		!write_sqe || !read_sqe || !cb_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQE's. Dropping all pending SQE's");
+		rtio_sqe_drop_all(data->rtio.ctx);
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(data->stream.iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	/* X Resolution used for decoding DXY in mm */
+	{
+		val = REG_RESOLUTION_X_LOWER | REG_SPI_READ_BIT;
+
+		rtio_sqe_prep_tiny_write(write_res_x_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 &val,
+					 1,
+					 NULL);
+		write_res_x_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+		rtio_sqe_prep_read(read_res_x_sqe,
+				   data->rtio.iodev,
+				   RTIO_PRIO_HIGH,
+				   &buf->header.resolution.buf[0],
+				   1,
+				   NULL);
+		read_res_x_sqe->flags |= RTIO_SQE_CHAINED;
+	}
+
+	/* Y Resolution used for decoding DY in mm */
+	{
+		val = REG_RESOLUTION_Y_LOWER | REG_SPI_READ_BIT;
+
+		rtio_sqe_prep_tiny_write(write_res_y_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 &val,
+					 1,
+					 NULL);
+		write_res_y_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+		rtio_sqe_prep_read(read_res_y_sqe,
+				   data->rtio.iodev,
+				   RTIO_PRIO_HIGH,
+				   &buf->header.resolution.buf[2],
+				   1,
+				   NULL);
+		read_res_y_sqe->flags |= RTIO_SQE_CHAINED;
+	}
+
+	/* Pull out data */
+	{
+		val = REG_BURST_READ | REG_SPI_READ_BIT;
+
+		rtio_sqe_prep_tiny_write(write_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 &val,
+					 1,
+					 NULL);
+		write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+		rtio_sqe_prep_read(read_sqe,
+				   data->rtio.iodev,
+				   RTIO_PRIO_HIGH,
+				   buf->buf,
+				   sizeof(buf->buf),
+				   NULL);
+		read_sqe->flags |= RTIO_SQE_CHAINED;
+	}
+
+	rtio_sqe_prep_callback_no_cqe(cb_sqe,
+				      pat9136_complete_result,
+				      (void *)dev,
+				      buf);
+
+	rtio_submit(data->rtio.ctx, 0);
+}
+
+static void pat9136_gpio_callback(const struct device *gpio_dev,
+				  struct gpio_callback *cb,
+				  uint32_t pins)
+{
+	struct pat9136_stream *stream = CONTAINER_OF(cb,
+						     struct pat9136_stream,
+						     cb);
+	const struct device *dev = stream->dev;
+	const struct pat9136_config *cfg = dev->config;
+	int err;
+
+	/* Disable interrupts until cool-down expires */
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+					      GPIO_INT_MODE_DISABLED);
+	if (err) {
+		LOG_ERR("Failed to disable interrupt");
+		return;
+	}
+
+	pat9136_stream_get_data(dev);
+}
+
+static void pat9136_stream_drdy_timeout(struct k_timer *timer)
+{
+	struct pat9136_stream *stream = CONTAINER_OF(timer,
+						     struct pat9136_stream,
+						     timer.backup);
+	const struct device *dev = stream->dev;
+	const struct pat9136_config *cfg = dev->config;
+	int err;
+
+	/* Disable interrupts */
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+					      GPIO_INT_MODE_DISABLED);
+	if (err) {
+		LOG_ERR("Failed to disable interrupt");
+		return;
+	}
+
+	pat9136_stream_get_data(dev);
+}
+
+static void pat9136_stream_cooldown_timeout(struct k_timer *timer)
+{
+	struct pat9136_stream *stream = CONTAINER_OF(timer,
+						     struct pat9136_stream,
+						     timer.cooldown.timer);
+	const struct device *dev = stream->dev;
+	const struct pat9136_config *cfg = dev->config;
+	int err;
+
+	/** Disarm Cooldown timer as it has expired. Needs another
+	 * submission to re-enable.
+	 */
+	if (!atomic_cas(&stream->timer.cooldown.armed, 1, 0)) {
+		return;
+	}
+
+	/* Re-enable interrupts */
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+					      GPIO_INT_LEVEL_ACTIVE);
+	if (err) {
+		LOG_ERR("Failed to enable interrupt");
+		return;
+	}
+}
+
+static inline bool settings_changed(const struct pat9136_stream *a,
+				    const struct pat9136_stream *b)
+{
+	return (a->settings.enabled.drdy != b->settings.enabled.drdy) ||
+	       (a->settings.opt.drdy != b->settings.opt.drdy) ||
+	       (a->settings.enabled.motion != b->settings.enabled.motion) ||
+	       (a->settings.opt.motion != b->settings.opt.motion);
+}
+
+void pat9136_stream_submit(const struct device *dev,
+			   struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *read_config = iodev_sqe->sqe.iodev->data;
+	struct pat9136_data *data = dev->data;
+	const struct pat9136_config *cfg = dev->config;
+	int err;
+
+	/** This separate struct is required due to the streaming API using a
+	 * multi-shot RTIO submission: meaning, re-submitting itself after
+	 * completion; hence, we don't have context to determine if this was
+	 * the first submission that kicked things off. We're then, inferring
+	 * this by comparing if the read-config has changed, and only restart
+	 * in such case.
+	 */
+	struct pat9136_stream stream = {0};
+
+	for (size_t i = 0 ; i < read_config->count ; i++) {
+		switch (read_config->channels[i].chan_type) {
+		case SENSOR_TRIG_DATA_READY:
+			stream.settings.enabled.drdy = true;
+			stream.settings.opt.drdy = read_config->triggers[i].opt;
+			break;
+		case SENSOR_TRIG_MOTION:
+			stream.settings.enabled.motion = true;
+			stream.settings.opt.motion = read_config->triggers[i].opt;
+			break;
+		default:
+			LOG_ERR("Unsupported trigger (%d)", read_config->triggers[i].trigger);
+			rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+			return;
+		}
+	}
+
+	/* Store context for next submission (handled within callbacks) */
+	data->stream.iodev_sqe = iodev_sqe;
+
+	if (settings_changed(&data->stream, &stream)) {
+		uint8_t motion_data[6];
+
+		data->stream.settings = stream.settings;
+
+		/* Disable interrupts */
+		err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+						      GPIO_INT_MODE_DISABLED);
+		if (err) {
+			LOG_ERR("Failed to disable interrupt");
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		/* Read reg's 0x02-0x06 to clear motion data. */
+		err = pat9136_bus_read(dev, REG_MOTION, motion_data, sizeof(motion_data));
+		if (err) {
+			LOG_ERR("Failed to read motion data");
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		/** Re-enable interrupts if settings changed. Otherwise wait
+		 * for cooldown timeout in the event of periodic streaming
+		 * submission.
+		 */
+		err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+						      GPIO_INT_LEVEL_ACTIVE);
+		if (err) {
+			LOG_ERR("Failed to enable interrupt");
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+	}
+
+	/** Back-up timer allows us to keep checking in with the sensor in
+	 * spite of not having any motion. This results in allowing sensor
+	 * recovery if falling in erratic state.
+	 */
+	if (data->stream.settings.enabled.drdy) {
+		start_drdy_backup_timer(dev);
+	}
+
+	/** Arm cooldown timer once for each submission. */
+	atomic_set(&data->stream.timer.cooldown.armed, 1);
+}
+
+int pat9136_stream_init(const struct device *dev)
+{
+	const struct pat9136_config *cfg = dev->config;
+	struct pat9136_data *data = dev->data;
+	int err;
+
+	/** Needed to get back the device handle from the callback context */
+	data->stream.dev = dev;
+
+	if (!cfg->int_gpio.port) {
+		LOG_ERR("Interrupt GPIO not supplied");
+		return -ENODEV;
+	}
+
+	if (!gpio_is_ready_dt(&cfg->int_gpio)) {
+		LOG_ERR("Interrupt GPIO not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&cfg->int_gpio, GPIO_INPUT);
+	if (err) {
+		LOG_ERR("Failed to configure interrupt GPIO");
+		return -EIO;
+	}
+
+	gpio_init_callback(&data->stream.cb,
+			   pat9136_gpio_callback,
+			   BIT(cfg->int_gpio.pin));
+
+	err = gpio_add_callback(cfg->int_gpio.port, &data->stream.cb);
+	if (err) {
+		LOG_ERR("Failed to add interrupt callback");
+		return -EIO;
+	}
+
+	k_timer_init(&data->stream.timer.backup, pat9136_stream_drdy_timeout, NULL);
+	k_timer_init(&data->stream.timer.cooldown.timer, pat9136_stream_cooldown_timeout, NULL);
+
+	atomic_clear(&data->stream.timer.cooldown.armed);
+
+	return err;
+}
diff --git a/drivers/sensor/pixart/pat9136/pat9136_stream.h b/drivers/sensor/pixart/pat9136/pat9136_stream.h
new file mode 100644
index 0000000000000..d7af57770d2a5
--- /dev/null
+++ b/drivers/sensor/pixart/pat9136/pat9136_stream.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/rtio/rtio.h>
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_PAT9136_STREAM_H_
+#define ZEPHYR_DRIVERS_SENSOR_PAT9136_STREAM_H_
+
+int pat9136_stream_init(const struct device *dev);
+
+void pat9136_stream_submit(const struct device *dev,
+			   struct rtio_iodev_sqe *iodev_sqe);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_PAT9136_STREAM_H_ */
diff --git a/drivers/sensor/realtek/CMakeLists.txt b/drivers/sensor/realtek/CMakeLists.txt
new file mode 100644
index 0000000000000..c69984afe4aa3
--- /dev/null
+++ b/drivers/sensor/realtek/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory_ifdef(CONFIG_TACH_RTS5912 rts5912)
diff --git a/drivers/sensor/realtek/Kconfig b/drivers/sensor/realtek/Kconfig
new file mode 100644
index 0000000000000..bca4a9dcc89a2
--- /dev/null
+++ b/drivers/sensor/realtek/Kconfig
@@ -0,0 +1,4 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+source "drivers/sensor/realtek/rts5912/Kconfig"
diff --git a/drivers/sensor/realtek/rts5912/CMakeLists.txt b/drivers/sensor/realtek/rts5912/CMakeLists.txt
new file mode 100644
index 0000000000000..bc870db466b09
--- /dev/null
+++ b/drivers/sensor/realtek/rts5912/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources(rts5912.c)
diff --git a/drivers/sensor/realtek/rts5912/Kconfig b/drivers/sensor/realtek/rts5912/Kconfig
new file mode 100644
index 0000000000000..649567dfab194
--- /dev/null
+++ b/drivers/sensor/realtek/rts5912/Kconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+config TACH_RTS5912
+	bool "RTS5912 Tachometer sensor"
+	default y
+	depends on DT_HAS_REALTEK_RTS5912_TACH_ENABLED
+	help
+	  Enable the Realtek RTS5912 tachometer sensor.
diff --git a/drivers/sensor/realtek/rts5912/rts5912.c b/drivers/sensor/realtek/rts5912/rts5912.c
new file mode 100644
index 0000000000000..5b6fcf740d2da
--- /dev/null
+++ b/drivers/sensor/realtek/rts5912/rts5912.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2025 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_tach
+
+#include <errno.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_control_rts5912.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/logging/log.h>
+
+#include "reg/reg_tacho.h"
+
+LOG_MODULE_REGISTER(tach_rts5912, CONFIG_SENSOR_LOG_LEVEL);
+
+struct tach_rts5912_config {
+	volatile struct tacho_regs *regs;
+	uint32_t clk_grp;
+	uint32_t clk_idx;
+	uint32_t clk_src;
+	uint32_t clk_div;
+	const struct device *clk_dev;
+	const struct pinctrl_dev_config *pcfg;
+	int pulses_per_round;
+};
+
+struct tach_rts5912_data {
+	uint16_t count;
+};
+
+#define COUNT_100KHZ_SEC  100000U
+#define SEC_TO_MINUTE     60U
+#define PIN_STUCK_TIMEOUT (100U * USEC_PER_MSEC)
+
+int tach_rts5912_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	const struct tach_rts5912_config *const cfg = dev->config;
+	struct tach_rts5912_data *const data = dev->data;
+	volatile struct tacho_regs *const tach = cfg->regs;
+
+	if (chan != SENSOR_CHAN_RPM && chan != SENSOR_CHAN_ALL) {
+		return -ENOTSUP;
+	}
+
+	tach->status = TACHO_STS_CNTRDY;
+
+	if (WAIT_FOR(tach->status & TACHO_STS_CNTRDY, PIN_STUCK_TIMEOUT, k_msleep(1))) {
+		/* See whether internal counter is already latched */
+		if (tach->status & TACHO_STS_CNTRDY) {
+			tach->status = TACHO_STS_CNTRDY;
+			data->count = (tach->ctrl & TACHO_CTRL_CNT_Msk) >> TACHO_CTRL_CNT_Pos;
+		}
+	} else {
+		data->count = 0;
+	}
+
+	return 0;
+}
+
+static int tach_rts5912_channel_get(const struct device *dev, enum sensor_channel chan,
+				    struct sensor_value *val)
+{
+	const struct tach_rts5912_config *const cfg = dev->config;
+	struct tach_rts5912_data *const data = dev->data;
+
+	if (chan != SENSOR_CHAN_RPM) {
+		return -ENOTSUP;
+	}
+
+	/* Convert the count per 100khz cycles to rpm */
+	if (data->count != 0U) {
+		val->val1 =
+			(SEC_TO_MINUTE * COUNT_100KHZ_SEC) / (cfg->pulses_per_round * data->count);
+	} else {
+		val->val1 = 0U;
+	}
+
+	val->val2 = 0U;
+
+	return 0;
+}
+
+static int tach_rts5912_init(const struct device *dev)
+{
+	const struct tach_rts5912_config *const cfg = dev->config;
+	volatile struct tacho_regs *const tach = cfg->regs;
+	int ret;
+
+	struct rts5912_sccon_subsys sccon_subsys = {
+		.clk_grp = cfg->clk_grp,
+		.clk_idx = cfg->clk_idx,
+	};
+
+	if (!device_is_ready(cfg->clk_dev)) {
+		return -ENODEV;
+	}
+
+	ret = clock_control_on(cfg->clk_dev, (clock_control_subsys_t)&sccon_subsys);
+	if (ret != 0) {
+		LOG_ERR("RTS5912 Tachometer clock control failed (%d)", ret);
+		return ret;
+	}
+
+#ifdef CONFIG_PINCTRL
+	ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+
+	if (ret != 0) {
+		LOG_ERR("RTS5912 pinctrl failed (%d)", ret);
+		return ret;
+	}
+#endif
+
+	/* write one clear the status */
+	tach->status = TACHO_STS_LIMIT | TACHO_STS_CHG | TACHO_STS_CNTRDY;
+	tach->ctrl &= ~TACHO_CTRL_SELEDGE_Msk;
+	tach->ctrl = ((0x01ul << TACHO_CTRL_SELEDGE_Pos) | TACHO_CTRL_READMODE | TACHO_CTRL_EN);
+
+	return 0;
+}
+
+static DEVICE_API(sensor, tach_rts5912_driver_api) = {
+	.sample_fetch = tach_rts5912_sample_fetch,
+	.channel_get = tach_rts5912_channel_get,
+};
+
+#define REALTEK_TACH_INIT(inst)                                                                    \
+	PINCTRL_DT_INST_DEFINE(inst);                                                              \
+                                                                                                   \
+	static const struct tach_rts5912_config tach_cfg_##inst = {                                \
+		.regs = (struct tacho_regs *const)DT_INST_REG_ADDR(inst),                          \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),                                      \
+		.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(inst)),                               \
+		.clk_grp = DT_INST_CLOCKS_CELL_BY_NAME(inst, tacho, clk_grp),                      \
+		.clk_idx = DT_INST_CLOCKS_CELL_BY_NAME(inst, tacho, clk_idx),                      \
+		.pulses_per_round = DT_INST_PROP(inst, pulses_per_round),                          \
+	};                                                                                         \
+                                                                                                   \
+	static struct tach_rts5912_data tach_data_##inst;                                          \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, tach_rts5912_init, NULL, &tach_data_##inst,             \
+				     &tach_cfg_##inst, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,   \
+				     &tach_rts5912_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(REALTEK_TACH_INIT)
diff --git a/drivers/sensor/renesas/hs400x/hs400x.c b/drivers/sensor/renesas/hs400x/hs400x.c
index a739a0256daea..44f6f394ef371 100644
--- a/drivers/sensor/renesas/hs400x/hs400x.c
+++ b/drivers/sensor/renesas/hs400x/hs400x.c
@@ -80,9 +80,9 @@ static int hs400x_sample_fetch(const struct device *dev, enum sensor_channel cha
 
 	/*
 	 * According to datasheet maximum time to make temperature and humidity
-	 * measurements is 33ms, add a little safety margin...
+	 * measurements is 1.7 ms, add a little safety margin...
 	 */
-	k_msleep(50);
+	k_msleep(3);
 
 	rc = hs400x_read_sample(dev, &data->t_sample, &data->rh_sample);
 	if (rc < 0) {
@@ -137,15 +137,45 @@ static int hs400x_channel_get(const struct device *dev, enum sensor_channel chan
 	return 0;
 }
 
+static void hs400x_all_measurements_stop(const struct device *dev)
+{
+	const struct hs400x_config *cfg = dev->config;
+	const uint8_t periodic_measurement_stop = 0x30;
+	uint8_t dummy[2];
+
+	/*
+	 * Stop previous periodic measurement.
+	 * If a periodic measurement is not running, HS400x device replies with NACK.
+	 */
+	i2c_write_dt(&cfg->bus, &periodic_measurement_stop, 1);
+
+	/*
+	 * Clear previous no-hold measurement.
+	 * If a measurement is not complete, HS400x device replies with NACK.
+	 */
+	i2c_read_dt(&cfg->bus, dummy, 2);
+}
+
 static int hs400x_init(const struct device *dev)
 {
 	const struct hs400x_config *cfg = dev->config;
+	const uint8_t reset_command = 0xFE;
+	int rc;
 
 	if (!i2c_is_ready_dt(&cfg->bus)) {
 		LOG_ERR("I2C dev %s not ready", cfg->bus.bus->name);
 		return -ENODEV;
 	}
 
+	hs400x_all_measurements_stop(dev);
+
+	rc = i2c_write_dt(&cfg->bus, &reset_command, 1);
+	if (rc < 0) {
+		LOG_ERR("Failed to send reset command.");
+		return rc;
+	}
+	k_msleep(500);
+
 	return 0;
 }
 
diff --git a/drivers/sensor/sensirion/scd4x/scd4x.c b/drivers/sensor/sensirion/scd4x/scd4x.c
index e989c155d5037..cdefce2d5c54f 100644
--- a/drivers/sensor/sensirion/scd4x/scd4x.c
+++ b/drivers/sensor/sensirion/scd4x/scd4x.c
@@ -630,7 +630,7 @@ static int scd4x_channel_get(const struct device *dev, enum sensor_channel chan,
 			     struct sensor_value *val)
 {
 	const struct scd4x_data *data = dev->data;
-	int32_t tmp_val;
+	int64_t tmp_val;
 
 	switch ((enum sensor_channel)chan) {
 	case SENSOR_CHAN_AMBIENT_TEMP:
diff --git a/drivers/sensor/sensirion/scd4x/scd4x.h b/drivers/sensor/sensirion/scd4x/scd4x.h
index 3955d2021990f..2e7c8e0dcc42a 100644
--- a/drivers/sensor/sensirion/scd4x/scd4x.h
+++ b/drivers/sensor/sensirion/scd4x/scd4x.h
@@ -29,7 +29,7 @@
 #define SCD4X_CMD_FACTORY_RESET                  17
 #define SCD4X_CMD_MEASURE_SINGLE_SHOT            18
 #define SCD4X_CMD_MEASURE_SINGLE_SHOT_RHT        19
-#define SCD4X_CMD_POWER_DOWN                     10
+#define SCD4X_CMD_POWER_DOWN                     20
 #define SCD4X_CMD_WAKE_UP                        21
 #define SCD4X_CMD_SET_SELF_CALIB_INITIAL_PERIOD  22
 #define SCD4X_CMD_GET_SELF_CALIB_INITIAL_PERIOD  23
diff --git a/drivers/sensor/sensor_shell.c b/drivers/sensor/sensor_shell.c
index 2bddf8b9b0070..775c53d009f2f 100644
--- a/drivers/sensor/sensor_shell.c
+++ b/drivers/sensor/sensor_shell.c
@@ -283,7 +283,7 @@ static int parse_sensor_value(const char *val_str, struct sensor_value *out)
 {
 	const bool is_negative = val_str[0] == '-';
 	const char *decimal_pos = strchr(val_str, '.');
-	long value;
+	int64_t value;
 	char *endptr;
 
 	/* Parse int portion */
diff --git a/drivers/sensor/silabs/si7055/si7055.c b/drivers/sensor/silabs/si7055/si7055.c
index 198e8e6e35b13..96943110fdfc2 100644
--- a/drivers/sensor/silabs/si7055/si7055.c
+++ b/drivers/sensor/silabs/si7055/si7055.c
@@ -101,14 +101,13 @@ static int si7055_channel_get(const struct device *dev,
 
 	if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
 
-		int32_t temp_ucelcius = (((SI7055_CONV_FACTOR_1 *
-					(int32_t)si_data->temperature) /
-					(__UINT16_MAX__ + 1)) -
-					SI7055_CONV_FACTOR_2) *
+		int32_t temp_ucelsius = (((SI7055_CONV_FACTOR_1 * (int32_t)si_data->temperature) /
+					  (__UINT16_MAX__ + 1)) -
+					 SI7055_CONV_FACTOR_2) *
 					SI7055_MULTIPLIER;
 
-		val->val1 = temp_ucelcius / SI7055_DIVIDER;
-		val->val2 = temp_ucelcius % SI7055_DIVIDER;
+		val->val1 = temp_ucelsius / SI7055_DIVIDER;
+		val->val2 = temp_ucelsius % SI7055_DIVIDER;
 
 		LOG_DBG("temperature = val1:%d, val2:%d",
 			val->val1, val->val2);
diff --git a/drivers/sensor/silabs/si7060/si7060.c b/drivers/sensor/silabs/si7060/si7060.c
index 47bd44669ab98..ec98709f3e789 100644
--- a/drivers/sensor/silabs/si7060/si7060.c
+++ b/drivers/sensor/silabs/si7060/si7060.c
@@ -58,15 +58,20 @@ static int si7060_sample_fetch(const struct device *dev,
 	uint8_t dspsigl;
 
 	retval = si7060_reg_read(dev, SI7060_REG_TEMP_HIGH, &dspsigm);
-	retval += si7060_reg_read(dev, SI7060_REG_TEMP_LOW, &dspsigl);
+	if (retval != 0) {
+		LOG_ERR("Error reading temperature high register");
+		return retval;
+	}
 
-	if (retval == 0) {
-		drv_data->temperature = (256 * (dspsigm & SIGN_BIT_MASK))
-		+ dspsigl;
-	} else {
-		LOG_ERR("Read register err");
+	retval = si7060_reg_read(dev, SI7060_REG_TEMP_LOW, &dspsigl);
+	if (retval != 0) {
+		LOG_ERR("Error reading temperature low register");
+		return retval;
 	}
 
+	drv_data->temperature = (256 * (dspsigm & SIGN_BIT_MASK))
+	+ dspsigl;
+
 	LOG_DBG("Sample_fetch retval: %d", retval);
 
 	return retval;
diff --git a/drivers/sensor/st/ism330dhcx/ism330dhcx.c b/drivers/sensor/st/ism330dhcx/ism330dhcx.c
index da1cef97a0475..44b8506664e6d 100644
--- a/drivers/sensor/st/ism330dhcx/ism330dhcx.c
+++ b/drivers/sensor/st/ism330dhcx/ism330dhcx.c
@@ -104,20 +104,6 @@ static int ism330dhcx_gyro_range_to_fs_val(int32_t range)
 	return -EINVAL;
 }
 
-static inline int ism330dhcx_reboot(const struct device *dev)
-{
-	struct ism330dhcx_data *data = dev->data;
-
-	if (ism330dhcx_boot_set(data->ctx, 1) < 0) {
-		return -EIO;
-	}
-
-	/* Wait sensor turn-on time as per datasheet */
-	k_busy_wait(35 * USEC_PER_MSEC);
-
-	return 0;
-}
-
 static int ism330dhcx_accel_set_fs_raw(const struct device *dev, uint8_t fs)
 {
 	struct ism330dhcx_data *data = dev->data;
diff --git a/drivers/sensor/st/lis2dw12/lis2dw12.c b/drivers/sensor/st/lis2dw12/lis2dw12.c
index e36043f47d61c..93e223b65780a 100644
--- a/drivers/sensor/st/lis2dw12/lis2dw12.c
+++ b/drivers/sensor/st/lis2dw12/lis2dw12.c
@@ -97,11 +97,11 @@ static inline void lis2dw12_channel_get_temp(const struct device *dev, struct se
 	struct lis2dw12_data *lis2dw12 = dev->data;
 	int64_t dval_uc;
 
-	/* The calcul is in micro Celcius to keep it efficient */
+	/* The calcul is in micro Celsius to keep it efficient */
 	dval_uc = ((lis2dw12->temp >> LIS2DW12_SHIFT_TEMP) * LIS2DW12_TEMP_SCALE_FACTOR);
 	dval_uc += 25000000;
 
-	/* switch to Celcius when we split the integer and fractional parts of the value */
+	/* switch to Celsius when we split the integer and fractional parts of the value */
 	val->val1 = dval_uc / 1000000LL;
 	val->val2 = dval_uc % 1000000LL;
 }
diff --git a/drivers/sensor/st/lis3mdl/lis3mdl.c b/drivers/sensor/st/lis3mdl/lis3mdl.c
index 49c73ddff44d0..14bd64dc0ad6d 100644
--- a/drivers/sensor/st/lis3mdl/lis3mdl.c
+++ b/drivers/sensor/st/lis3mdl/lis3mdl.c
@@ -11,6 +11,7 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
 #include <string.h>
 #include <zephyr/logging/log.h>
 
@@ -162,6 +163,41 @@ int lis3mdl_init(const struct device *dev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_DEVICE
+static int lis3mdl_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct lis3mdl_config *config = dev->config;
+	uint8_t ctrl_reg3;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ctrl_reg3 = LIS3MDL_MD_CONTINUOUS;
+
+		if (i2c_reg_write_byte_dt(&config->i2c, LIS3MDL_REG_CTRL3, ctrl_reg3) < 0) {
+			LOG_DBG("Failed to configure chip.");
+			return -EIO;
+		}
+
+		LOG_DBG("State changed to active");
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		ctrl_reg3 = LIS3MDL_MD_POWER_DOWN;
+
+		if (i2c_reg_write_byte_dt(&config->i2c, LIS3MDL_REG_CTRL3, ctrl_reg3) < 0) {
+			LOG_DBG("Failed to configure chip.");
+			return -EIO;
+		}
+
+		LOG_DBG("State changed to inactive");
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+#endif
+
 #define LIS3MDL_DEFINE(inst)									\
 	static struct lis3mdl_data lis3mdl_data_##inst;						\
 												\
@@ -171,7 +207,10 @@ int lis3mdl_init(const struct device *dev)
 			   (.irq_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, irq_gpios, { 0 }),))	\
 	};											\
 												\
-	SENSOR_DEVICE_DT_INST_DEFINE(inst, lis3mdl_init, NULL,					\
+	PM_DEVICE_DT_INST_DEFINE(inst, lis3mdl_pm_action);					\
+												\
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, lis3mdl_init,					\
+				PM_DEVICE_DT_INST_GET(inst),					\
 			      &lis3mdl_data_##inst, &lis3mdl_config_##inst, POST_KERNEL,	\
 			      CONFIG_SENSOR_INIT_PRIORITY, &lis3mdl_driver_api);		\
 
diff --git a/drivers/sensor/st/lsm6dsv16x/Kconfig b/drivers/sensor/st/lsm6dsv16x/Kconfig
index 9d41fdda25599..06f713cf4a116 100644
--- a/drivers/sensor/st/lsm6dsv16x/Kconfig
+++ b/drivers/sensor/st/lsm6dsv16x/Kconfig
@@ -4,13 +4,16 @@
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig LSM6DSV16X
-	bool "LSM6DSV16X I3C/I2C/SPI accelerometer and gyroscope Chip"
+	bool "LSM6DSV16X/LSM6DSV32X I3C/I2C/SPI accelerometer and gyroscope chip"
 	default y
-	depends on DT_HAS_ST_LSM6DSV16X_ENABLED
+	depends on DT_HAS_ST_LSM6DSV16X_ENABLED || DT_HAS_ST_LSM6DSV32X_ENABLED
 	depends on ZEPHYR_HAL_ST_MODULE
-	select I2C if $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i2c)
-	select I3C if $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i3c)
-	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),spi)
+	select I2C if $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i2c) ||\
+		      $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV32X),i2c)
+	select I3C if $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i3c) ||\
+		      $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV32X),i3c)
+	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),spi) ||\
+		      $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV32X),spi)
 	select HAS_STMEMSC
 	select USE_STDC_LSM6DSV16X
 	select RTIO_WORKQ if SENSOR_ASYNC_API
@@ -44,7 +47,10 @@ config LSM6DSV16X_TRIGGER_GLOBAL_THREAD
 	depends on GPIO || I3C
 	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV16X),int1-gpios) ||\
 		   $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV16X),int2-gpios) ||\
-		   $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i3c)
+		   $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i3c) ||\
+		   $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV32X),int1-gpios) ||\
+		   $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV32X),int2-gpios) ||\
+		   $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV32X),i3c)
 	select LSM6DSV16X_TRIGGER
 
 config LSM6DSV16X_TRIGGER_OWN_THREAD
@@ -52,7 +58,10 @@ config LSM6DSV16X_TRIGGER_OWN_THREAD
 	depends on GPIO || I3C
 	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV16X),int1-gpios) ||\
 		   $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV16X),int2-gpios) ||\
-		   $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i3c)
+		   $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV16X),i3c) ||\
+		   $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV32X),int1-gpios) ||\
+		   $(dt_compat_any_has_prop,$(DT_COMPAT_ST_LSM6DSV32X),int2-gpios) ||\
+		   $(dt_compat_on_bus,$(DT_COMPAT_ST_LSM6DSV32X),i3c)
 	select LSM6DSV16X_TRIGGER
 
 endchoice
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.c b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.c
index 4dadcebeff726..2c3d143bb1d76 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.c
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.c
@@ -4,12 +4,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- * Datasheet:
+ * Datasheets:
  * https://www.st.com/resource/en/datasheet/lsm6dsv16x.pdf
+ * https://www.st.com/resource/en/datasheet/lsm6dsv32x.pdf
  */
 
-#define DT_DRV_COMPAT st_lsm6dsv16x
-
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
@@ -82,14 +81,21 @@ static int lsm6dsv16x_freq_to_odr_val(const struct device *dev, uint16_t freq)
 	return -EINVAL;
 }
 
+#define ACCEL_FS_MAP_SIZE 4
+#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT_LSM6DSV16X)
 static const uint16_t lsm6dsv16x_accel_fs_map[] = {2, 4, 8, 16};
+#endif
+#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT_LSM6DSV32X)
+static const uint16_t lsm6dsv32x_accel_fs_map[] = {4, 8, 16, 32};
+#endif
 
-static int lsm6dsv16x_accel_range_to_fs_val(int32_t range)
+static int lsm6dsv16x_accel_range_to_fs_val(const struct device *dev, int32_t range)
 {
+	const struct lsm6dsv16x_config *cfg = dev->config;
 	size_t i;
 
-	for (i = 0; i < ARRAY_SIZE(lsm6dsv16x_accel_fs_map); i++) {
-		if (range == lsm6dsv16x_accel_fs_map[i]) {
+	for (i = 0; i < ACCEL_FS_MAP_SIZE; i++) {
+		if (range == cfg->accel_fs_map[i]) {
 			return i;
 		}
 	}
@@ -101,12 +107,14 @@ static const uint16_t lsm6dsv16x_gyro_fs_map[] = {125, 250, 500, 1000, 2000, 0,
 						  0,   0,   0,   0,    0,    4000};
 static const uint16_t lsm6dsv16x_gyro_fs_sens[] = {1, 2, 4, 8, 16, 0, 0, 0, 0, 0, 0, 0, 32};
 
-int lsm6dsv16x_calc_accel_gain(uint8_t fs)
+static int lsm6dsv16x_calc_accel_gain(const struct device *dev, uint8_t fs)
 {
-	return lsm6dsv16x_accel_fs_map[fs] * GAIN_UNIT_XL / 2;
+	const struct lsm6dsv16x_config *cfg = dev->config;
+
+	return cfg->accel_fs_map[fs] * GAIN_UNIT_XL / 2;
 }
 
-int lsm6dsv16x_calc_gyro_gain(uint8_t fs)
+static int lsm6dsv16x_calc_gyro_gain(uint8_t fs)
 {
 	return lsm6dsv16x_gyro_fs_sens[fs] * GAIN_UNIT_G;
 }
@@ -157,7 +165,7 @@ static int lsm6dsv16x_accel_set_fs_raw(const struct device *dev, uint8_t fs)
 	return 0;
 }
 
-static int lsm6dsv16x_accel_set_odr_raw(const struct device *dev, uint8_t odr)
+int lsm6dsv16x_accel_set_odr_raw(const struct device *dev, uint8_t odr)
 {
 	const struct lsm6dsv16x_config *cfg = dev->config;
 	stmdev_ctx_t *ctx = (stmdev_ctx_t *)&cfg->ctx;
@@ -186,15 +194,17 @@ static int lsm6dsv16x_gyro_set_fs_raw(const struct device *dev, uint8_t fs)
 	return 0;
 }
 
-static int lsm6dsv16x_gyro_set_odr_raw(const struct device *dev, uint8_t odr)
+int lsm6dsv16x_gyro_set_odr_raw(const struct device *dev, uint8_t odr)
 {
 	const struct lsm6dsv16x_config *cfg = dev->config;
 	stmdev_ctx_t *ctx = (stmdev_ctx_t *)&cfg->ctx;
+	struct lsm6dsv16x_data *data = dev->data;
 
 	if (lsm6dsv16x_gy_data_rate_set(ctx, odr) < 0) {
 		return -EIO;
 	}
 
+	data->gyro_freq = odr;
 	return 0;
 }
 
@@ -220,7 +230,7 @@ static int lsm6dsv16x_accel_range_set(const struct device *dev, int32_t range)
 	int fs;
 	struct lsm6dsv16x_data *data = dev->data;
 
-	fs = lsm6dsv16x_accel_range_to_fs_val(range);
+	fs = lsm6dsv16x_accel_range_to_fs_val(dev, range);
 	if (fs < 0) {
 		return fs;
 	}
@@ -230,7 +240,7 @@ static int lsm6dsv16x_accel_range_set(const struct device *dev, int32_t range)
 		return -EIO;
 	}
 
-	data->acc_gain = lsm6dsv16x_calc_accel_gain(fs);
+	data->acc_gain = lsm6dsv16x_calc_accel_gain(dev, fs);
 	return 0;
 }
 
@@ -447,6 +457,10 @@ static int lsm6dsv16x_attr_set(const struct device *dev,
 
 		return lsm6dsv16x_shub_config(dev, chan, attr, val);
 #endif /* CONFIG_LSM6DSV16X_SENSORHUB */
+#ifdef CONFIG_LSM6DSV16X_STREAM
+	case SENSOR_CHAN_GBIAS_XYZ:
+		return lsm6dsv16x_gbias_config(dev, chan, attr, val);
+#endif /* CONFIG_LSM6DSV16X_STREAM */
 	default:
 		LOG_WRN("attr_set() not supported on this channel.");
 		return -ENOTSUP;
@@ -503,7 +517,7 @@ static int lsm6dsv16x_accel_get_config(const struct device *dev,
 
 	switch (attr) {
 	case SENSOR_ATTR_FULL_SCALE:
-		sensor_g_to_ms2(lsm6dsv16x_accel_fs_map[data->accel_fs], val);
+		sensor_g_to_ms2(cfg->accel_fs_map[data->accel_fs], val);
 		break;
 	case SENSOR_ATTR_SAMPLING_FREQUENCY: {
 		lsm6dsv16x_data_rate_t odr;
@@ -635,6 +649,10 @@ static int lsm6dsv16x_attr_get(const struct device *dev, enum sensor_channel cha
 		return lsm6dsv16x_accel_get_config(dev, chan, attr, val);
 	case SENSOR_CHAN_GYRO_XYZ:
 		return lsm6dsv16x_gyro_get_config(dev, chan, attr, val);
+#ifdef CONFIG_LSM6DSV16X_STREAM
+	case SENSOR_CHAN_GBIAS_XYZ:
+		return lsm6dsv16x_gbias_get_config(dev, chan, attr, val);
+#endif /* CONFIG_LSM6DSV16X_STREAM */
 	default:
 		LOG_WRN("attr_get() not supported on this channel.");
 		return -ENOTSUP;
@@ -1072,7 +1090,7 @@ static int lsm6dsv16x_init_chip(const struct device *dev)
 	uint8_t chip_id;
 	uint8_t odr, fs;
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	if (cfg->i3c.bus != NULL) {
 		/*
 		 * Need to grab the pointer to the I3C device descriptor
@@ -1135,7 +1153,7 @@ static int lsm6dsv16x_init_chip(const struct device *dev)
 		LOG_ERR("failed to set accelerometer range %d", fs);
 		return -EIO;
 	}
-	lsm6dsv16x->acc_gain = lsm6dsv16x_calc_accel_gain(fs);
+	lsm6dsv16x->acc_gain = lsm6dsv16x_calc_accel_gain(dev, fs);
 
 	odr = cfg->accel_odr;
 	LOG_DBG("accel odr is %d", odr);
@@ -1154,13 +1172,12 @@ static int lsm6dsv16x_init_chip(const struct device *dev)
 
 	odr = cfg->gyro_odr;
 	LOG_DBG("gyro odr is %d", odr);
-	lsm6dsv16x->gyro_freq = odr;
 	if (lsm6dsv16x_gyro_set_odr_raw(dev, odr) < 0) {
 		LOG_ERR("failed to set gyroscope odr %d", odr);
 		return -EIO;
 	}
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	if (IS_ENABLED(CONFIG_LSM6DSV16X_STREAM) && (ON_I3C_BUS(cfg))) {
 		/*
 		 * Set MRL to the Max Size of the FIFO so the entire FIFO can be read
@@ -1260,7 +1277,8 @@ static int lsm6dsv16x_pm_action(const struct device *dev, enum pm_device_action
 }
 #endif /* CONFIG_PM_DEVICE */
 
-#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 0
+#if DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT_LSM6DSV16X) == 0 &&                                      \
+	DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT_LSM6DSV32X) == 0
 #warning "LSM6DSV16X driver enabled without any devices"
 #endif
 
@@ -1269,11 +1287,13 @@ static int lsm6dsv16x_pm_action(const struct device *dev, enum pm_device_action
  * LSM6DSV16X_DEFINE_I2C().
  */
 
-#define LSM6DSV16X_DEVICE_INIT(inst)                                                               \
-	PM_DEVICE_DT_INST_DEFINE(inst, lsm6dsv16x_pm_action);                                      \
-	SENSOR_DEVICE_DT_INST_DEFINE(inst, lsm6dsv16x_init, PM_DEVICE_DT_INST_GET(inst),           \
-				     &lsm6dsv16x_data_##inst, &lsm6dsv16x_config_##inst,           \
-				     POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,                     \
+/* clang-format off */
+
+#define LSM6DSV16X_DEVICE_INIT(inst, prefix)							\
+	PM_DEVICE_DT_INST_DEFINE(inst, lsm6dsv16x_pm_action);					\
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, lsm6dsv16x_init, PM_DEVICE_DT_INST_GET(inst),	\
+				     &prefix##_data_##inst, &prefix##_config_##inst,		\
+				     POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,			\
 				     &lsm6dsv16x_driver_api);
 
 #ifdef CONFIG_LSM6DSV16X_TRIGGER
@@ -1287,9 +1307,10 @@ static int lsm6dsv16x_pm_action(const struct device *dev, enum pm_device_action
 #define LSM6DSV16X_CFG_IRQ(inst)
 #endif /* CONFIG_LSM6DSV16X_TRIGGER */
 
-#define LSM6DSV16X_CONFIG_COMMON(inst)						\
+#define LSM6DSV16X_CONFIG_COMMON(inst, prefix)					\
 	.accel_odr = DT_INST_PROP(inst, accel_odr),				\
-	.accel_range = DT_INST_PROP(inst, accel_range),				\
+	.accel_range = DT_INST_ENUM_IDX(inst, accel_range),			\
+	.accel_fs_map = prefix##_accel_fs_map,					\
 	.gyro_odr = DT_INST_PROP(inst, gyro_odr),				\
 	.gyro_range = DT_INST_PROP(inst, gyro_range),				\
 	IF_ENABLED(CONFIG_LSM6DSV16X_STREAM,					\
@@ -1312,111 +1333,126 @@ static int lsm6dsv16x_pm_action(const struct device *dev, enum pm_device_action
 			 SPI_MODE_CPOL |				\
 			 SPI_MODE_CPHA)					\
 
-#define LSM6DSV16X_SPI_RTIO_DEFINE(inst)				\
-	SPI_DT_IODEV_DEFINE(lsm6dsv16x_iodev_##inst,			\
+#define LSM6DSV16X_SPI_RTIO_DEFINE(inst, prefix)			\
+	SPI_DT_IODEV_DEFINE(prefix##_iodev_##inst,			\
 		DT_DRV_INST(inst), LSM6DSV16X_SPI_OP, 0U);		\
-	RTIO_DEFINE(lsm6dsv16x_rtio_ctx_##inst, 4, 4);
+	RTIO_DEFINE(prefix##_rtio_ctx_##inst, 4, 4);
 
-#define LSM6DSV16X_CONFIG_SPI(inst)					\
+#define LSM6DSV16X_CONFIG_SPI(inst, prefix)				\
 	{								\
-		STMEMSC_CTX_SPI(&lsm6dsv16x_config_##inst.stmemsc_cfg),	\
+		STMEMSC_CTX_SPI(&prefix##_config_##inst.stmemsc_cfg),	\
 		.stmemsc_cfg = {					\
 			.spi = SPI_DT_SPEC_INST_GET(inst,		\
 					   LSM6DSV16X_SPI_OP,		\
 					   0),				\
 		},							\
-		LSM6DSV16X_CONFIG_COMMON(inst)				\
-	}
-
-#define LSM6DSV16X_DEFINE_SPI(inst)					\
-	IF_ENABLED(CONFIG_LSM6DSV16X_STREAM, (LSM6DSV16X_SPI_RTIO_DEFINE(inst))); \
-	static struct lsm6dsv16x_data lsm6dsv16x_data_##inst =	{	\
-		IF_ENABLED(CONFIG_LSM6DSV16X_STREAM,			\
-			(.rtio_ctx = &lsm6dsv16x_rtio_ctx_##inst,	\
-			 .iodev = &lsm6dsv16x_iodev_##inst,		\
+		LSM6DSV16X_CONFIG_COMMON(inst, prefix)			\
+	}
+
+#define LSM6DSV16X_DEFINE_SPI(inst, prefix)				\
+	IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,			\
+			    CONFIG_SPI_RTIO),				\
+		   (LSM6DSV16X_SPI_RTIO_DEFINE(inst, prefix)));		\
+	static struct lsm6dsv16x_data prefix##_data_##inst =	{	\
+		IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,		\
+				    CONFIG_SPI_RTIO),			\
+			(.rtio_ctx = &prefix##_rtio_ctx_##inst,	\
+			 .iodev = &prefix##_iodev_##inst,		\
 			 .bus_type = BUS_SPI,))				\
 	};								\
-	static const struct lsm6dsv16x_config lsm6dsv16x_config_##inst = \
-		LSM6DSV16X_CONFIG_SPI(inst);				\
+	static const struct lsm6dsv16x_config prefix##_config_##inst =	\
+		LSM6DSV16X_CONFIG_SPI(inst, prefix);
 
 /*
  * Instantiation macros used when a device is on an I2C bus.
  */
 
-#define LSM6DSV16X_I2C_RTIO_DEFINE(inst)				\
-	I2C_DT_IODEV_DEFINE(lsm6dsv16x_iodev_##inst, DT_DRV_INST(inst));\
-	RTIO_DEFINE(lsm6dsv16x_rtio_ctx_##inst, 4, 4);
+#define LSM6DSV16X_I2C_RTIO_DEFINE(inst, prefix)			\
+	I2C_DT_IODEV_DEFINE(prefix##_iodev_##inst, DT_DRV_INST(inst));	\
+	RTIO_DEFINE(prefix##_rtio_ctx_##inst, 4, 4);
 
-#define LSM6DSV16X_CONFIG_I2C(inst)					\
+#define LSM6DSV16X_CONFIG_I2C(inst, prefix)				\
 	{								\
-		STMEMSC_CTX_I2C(&lsm6dsv16x_config_##inst.stmemsc_cfg),	\
+		STMEMSC_CTX_I2C(&prefix##_config_##inst.stmemsc_cfg),	\
 		.stmemsc_cfg = {					\
 			.i2c = I2C_DT_SPEC_INST_GET(inst),		\
 		},							\
-		LSM6DSV16X_CONFIG_COMMON(inst)				\
+		LSM6DSV16X_CONFIG_COMMON(inst, prefix)			\
 	}
 
-
-#define LSM6DSV16X_DEFINE_I2C(inst)					\
-	IF_ENABLED(CONFIG_LSM6DSV16X_STREAM, (LSM6DSV16X_I2C_RTIO_DEFINE(inst))); \
-	static struct lsm6dsv16x_data lsm6dsv16x_data_##inst =	{	\
-		IF_ENABLED(CONFIG_LSM6DSV16X_STREAM,			\
+#define LSM6DSV16X_DEFINE_I2C(inst, prefix)				\
+	IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,			\
+			    CONFIG_I2C_RTIO),				\
+		   (LSM6DSV16X_I2C_RTIO_DEFINE(inst, prefix)));		\
+	static struct lsm6dsv16x_data prefix##_data_##inst =	{	\
+		IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,		\
+				    CONFIG_I2C_RTIO),			\
 			(.rtio_ctx = &lsm6dsv16x_rtio_ctx_##inst,	\
 			 .iodev = &lsm6dsv16x_iodev_##inst,		\
 			 .bus_type = BUS_I2C,))				\
 	};								\
-	static const struct lsm6dsv16x_config lsm6dsv16x_config_##inst = \
-		LSM6DSV16X_CONFIG_I2C(inst);				\
+	static const struct lsm6dsv16x_config prefix##_config_##inst =	\
+		LSM6DSV16X_CONFIG_I2C(inst, prefix);
 
 /*
  * Instantiation macros used when a device is on an I3C bus.
  */
 
-#define LSM6DSV16X_I3C_RTIO_DEFINE(inst)                                       \
-	I3C_DT_IODEV_DEFINE(lsm6dsv16x_i3c_iodev_##inst, DT_DRV_INST(inst));   \
-	RTIO_DEFINE(lsm6dsv16x_rtio_ctx_##inst, 4, 4);
-
-#define LSM6DSV16X_CONFIG_I3C(inst)					            \
-	{								            \
-		STMEMSC_CTX_I3C(&lsm6dsv16x_config_##inst.stmemsc_cfg),	            \
-		.stmemsc_cfg = {					            \
-			.i3c = &lsm6dsv16x_data_##inst.i3c_dev,		            \
-		},							            \
-		.i3c.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),		            \
-		.i3c.dev_id = I3C_DEVICE_ID_DT_INST(inst),		            \
-		IF_ENABLED(CONFIG_LSM6DSV16X_TRIGGER,                               \
-			  (.int_en_i3c = DT_INST_PROP(inst, int_en_i3c),            \
-			   .bus_act_sel = DT_INST_ENUM_IDX(inst, bus_act_sel_us),)) \
-		LSM6DSV16X_CONFIG_COMMON(inst)				            \
-	}
-
-#define LSM6DSV16X_DEFINE_I3C(inst)					\
-	IF_ENABLED(CONFIG_LSM6DSV16X_STREAM, (LSM6DSV16X_I3C_RTIO_DEFINE(inst))); \
-	static struct lsm6dsv16x_data lsm6dsv16x_data_##inst = {	\
-		IF_ENABLED(CONFIG_LSM6DSV16X_STREAM,			\
-			(.rtio_ctx = &lsm6dsv16x_rtio_ctx_##inst,	\
-			 .iodev = &lsm6dsv16x_i3c_iodev_##inst,		\
+#define LSM6DSV16X_I3C_RTIO_DEFINE(inst, prefix)				\
+	I3C_DT_IODEV_DEFINE(prefix##_i3c_iodev_##inst, DT_DRV_INST(inst));	\
+	RTIO_DEFINE(prefix##_rtio_ctx_##inst, 4, 4);
+
+#define LSM6DSV16X_CONFIG_I3C(inst, prefix)						\
+	{										\
+		STMEMSC_CTX_I3C(&prefix##_config_##inst.stmemsc_cfg),			\
+		.stmemsc_cfg = {							\
+			.i3c = &prefix##_data_##inst.i3c_dev,				\
+		},									\
+		.i3c.bus = DEVICE_DT_GET(DT_INST_BUS(inst)),				\
+		.i3c.dev_id = I3C_DEVICE_ID_DT_INST(inst),				\
+		IF_ENABLED(CONFIG_LSM6DSV16X_TRIGGER,					\
+			  (.int_en_i3c = DT_INST_PROP(inst, int_en_i3c),		\
+			   .bus_act_sel = DT_INST_ENUM_IDX(inst, bus_act_sel_us),))	\
+		LSM6DSV16X_CONFIG_COMMON(inst, prefix)					\
+	}
+
+#define LSM6DSV16X_DEFINE_I3C(inst, prefix)				\
+	IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,			\
+			    CONFIG_I3C_RTIO),				\
+		   (LSM6DSV16X_I3C_RTIO_DEFINE(inst, prefix)));		\
+	static struct lsm6dsv16x_data prefix##_data_##inst = {		\
+		IF_ENABLED(UNTIL_AND(CONFIG_LSM6DSV16X_STREAM,		\
+				     CONFIG_I3C_RTIO),			\
+			(.rtio_ctx = &prefix##_rtio_ctx_##inst,		\
+			 .iodev = &prefix##_i3c_iodev_##inst,		\
 			 .bus_type = BUS_I3C,))				\
 	};								\
-	static const struct lsm6dsv16x_config lsm6dsv16x_config_##inst = \
-		LSM6DSV16X_CONFIG_I3C(inst);				\
+	static const struct lsm6dsv16x_config prefix##_config_##inst =	\
+		LSM6DSV16X_CONFIG_I3C(inst, prefix);
 
-#define LSM6DSV16X_DEFINE_I3C_OR_I2C(inst)				\
+#define LSM6DSV16X_DEFINE_I3C_OR_I2C(inst, prefix)			\
 	COND_CODE_0(DT_INST_PROP_BY_IDX(inst, reg, 1),			\
-		    (LSM6DSV16X_DEFINE_I2C(inst)),			\
-		    (LSM6DSV16X_DEFINE_I3C(inst)))
+		    (LSM6DSV16X_DEFINE_I2C(inst, prefix)),		\
+		    (LSM6DSV16X_DEFINE_I3C(inst, prefix)))
 
 /*
  * Main instantiation macro. Use of COND_CODE_1() selects the right
  * bus-specific macro at preprocessor time.
  */
 
-#define LSM6DSV16X_DEFINE(inst)							\
+#define LSM6DSV16X_DEFINE(inst, prefix)						\
 	COND_CODE_1(DT_INST_ON_BUS(inst, spi),					\
-		(LSM6DSV16X_DEFINE_SPI(inst)),					\
+		(LSM6DSV16X_DEFINE_SPI(inst, prefix)),				\
 		(COND_CODE_1(DT_INST_ON_BUS(inst, i3c),				\
-			(LSM6DSV16X_DEFINE_I3C_OR_I2C(inst)),			\
-			(LSM6DSV16X_DEFINE_I2C(inst)))));			\
-	LSM6DSV16X_DEVICE_INIT(inst)
+			     (LSM6DSV16X_DEFINE_I3C_OR_I2C(inst, prefix)),	\
+			     (LSM6DSV16X_DEFINE_I2C(inst, prefix)))));		\
+	LSM6DSV16X_DEVICE_INIT(inst, prefix)
+
+/* clang-format on */
+
+#define DT_DRV_COMPAT DT_DRV_COMPAT_LSM6DSV16X
+DT_INST_FOREACH_STATUS_OKAY_VARGS(LSM6DSV16X_DEFINE, lsm6dsv16x)
 
-DT_INST_FOREACH_STATUS_OKAY(LSM6DSV16X_DEFINE)
+#undef DT_DRV_COMPAT
+#define DT_DRV_COMPAT DT_DRV_COMPAT_LSM6DSV32X
+DT_INST_FOREACH_STATUS_OKAY_VARGS(LSM6DSV16X_DEFINE, lsm6dsv32x)
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.h b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.h
index 343d1befbc2d4..244be1b24acb5 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.h
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.h
@@ -18,26 +18,33 @@
 #include <stmemsc.h>
 #include "lsm6dsv16x_reg.h"
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
+#define DT_DRV_COMPAT_LSM6DSV16X st_lsm6dsv16x
+#define DT_DRV_COMPAT_LSM6DSV32X st_lsm6dsv32x
+
+#define LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(bus)                                                \
+	(DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(DT_DRV_COMPAT_LSM6DSV16X, bus) ||                        \
+	 DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(DT_DRV_COMPAT_LSM6DSV32X, bus))
+
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 #include <zephyr/drivers/spi.h>
-#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
+#endif /* LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
 #include <zephyr/drivers/i2c.h>
-#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
+#endif /* LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 #include <zephyr/drivers/i3c.h>
-#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c) */
+#endif /* LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c) */
 
 bool lsm6dsv16x_is_active(const struct device *dev);
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
-	#define ON_I3C_BUS(cfg)  (cfg->i3c.bus != NULL)
-	#define I3C_INT_PIN(cfg) (cfg->int_en_i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#define ON_I3C_BUS(cfg)  (cfg->i3c.bus != NULL)
+#define I3C_INT_PIN(cfg) (cfg->int_en_i3c)
 #else
-	#define ON_I3C_BUS(cfg)  (false)
-	#define I3C_INT_PIN(cfg) (false)
+#define ON_I3C_BUS(cfg)  (false)
+#define I3C_INT_PIN(cfg) (false)
 #endif
 
 #define LSM6DSV16X_EN_BIT					0x01
@@ -49,25 +56,23 @@ bool lsm6dsv16x_is_active(const struct device *dev);
 /* Gyro sensor sensitivity grain is 4.375 udps/LSB */
 #define GAIN_UNIT_G				(4375LL)
 
-int lsm6dsv16x_calc_accel_gain(uint8_t fs);
-int lsm6dsv16x_calc_gyro_gain(uint8_t fs);
-
 struct lsm6dsv16x_config {
 	stmdev_ctx_t ctx;
 	union {
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
 		const struct i2c_dt_spec i2c;
 #endif
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 		const struct spi_dt_spec spi;
 #endif
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 		struct i3c_device_desc **i3c;
 #endif
 	} stmemsc_cfg;
 	uint8_t accel_pm;
 	uint8_t accel_odr;
 	uint8_t accel_range;
+	const uint16_t *accel_fs_map;
 	uint8_t gyro_pm;
 	uint8_t gyro_odr;
 	uint8_t gyro_range;
@@ -85,13 +90,13 @@ struct lsm6dsv16x_config {
 	const struct gpio_dt_spec int2_gpio;
 	uint8_t drdy_pin;
 	bool trig_enabled;
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	bool int_en_i3c;
 	lsm6dsv16x_i3c_ibi_time_t bus_act_sel;
-#endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c) */
+#endif /* LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c) */
 #endif /* CONFIG_LSM6DSV16X_TRIGGER */
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	struct {
 		const struct device *bus;
 		const struct i3c_device_id dev_id;
@@ -164,6 +169,9 @@ struct lsm6dsv16x_data {
 	uint8_t bus_type : 2; /* I2C is 0, SPI is 1, I3C is 2 */
 	uint8_t sflp_batch_odr : 3;
 	uint8_t reserved : 1;
+	int32_t gbias_x_udps;
+	int32_t gbias_y_udps;
+	int32_t gbias_z_udps;
 #endif
 
 #ifdef CONFIG_LSM6DSV16X_TRIGGER
@@ -186,7 +194,7 @@ struct lsm6dsv16x_data {
 #endif
 #endif /* CONFIG_LSM6DSV16X_TRIGGER */
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	struct i3c_device_desc *i3c_dev;
 	struct lsm6dsv16x_ibi_payload ibi_payload;
 #endif
@@ -206,6 +214,9 @@ static inline uint8_t lsm6dsv16x_bus_reg(struct lsm6dsv16x_data *data, uint8_t x
 #define LSM6DSV16X_FIFO_SIZE(x) (x * LSM6DSV16X_FIFO_ITEM_LEN)
 #endif
 
+int lsm6dsv16x_accel_set_odr_raw(const struct device *dev, uint8_t odr);
+int lsm6dsv16x_gyro_set_odr_raw(const struct device *dev, uint8_t odr);
+
 #if defined(CONFIG_LSM6DSV16X_SENSORHUB)
 int lsm6dsv16x_shub_init(const struct device *dev);
 int lsm6dsv16x_shub_fetch_external_devs(const struct device *dev);
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.c b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.c
index 1ea21ace988b9..3c9b05e6852cf 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.c
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.c
@@ -66,7 +66,7 @@ static const uint32_t sflp_period_ns[] = {
  * Expand val to q31_t according to its range; this is achieved multiplying by 2^31/2^range.
  */
 #define Q31_SHIFT_VAL(val, range) \
-	(q31_t) (round((val) * ((int64_t)1 << (31 - (range)))))
+	(q31_t) (roundf((val) * ((int64_t)1 << (31 - (range)))))
 
 /*
  * Expand micro_val (a generic micro unit) to q31_t according to its range; this is achieved
@@ -75,12 +75,18 @@ static const uint32_t sflp_period_ns[] = {
 #define Q31_SHIFT_MICROVAL(micro_val, range) \
 	(q31_t) ((int64_t)(micro_val) * ((int64_t)1 << (31 - (range))) / 1000000LL)
 
-/* bit range for Accelerometer for a given fs */
+/* bit range for Accelerometer for a given accel_fs_idx value */
 static const int8_t accel_range[] = {
-	[LSM6DSV16X_DT_FS_2G] = 5,
-	[LSM6DSV16X_DT_FS_4G] = 6,
-	[LSM6DSV16X_DT_FS_8G] = 7,
-	[LSM6DSV16X_DT_FS_16G] = 8,
+	/* LSM6DSV16X_DT_FS_2G */
+	5,
+	/* LSM6DSV16X_DT_FS_4G / LSM6DSV32X_DT_FS_4G*/
+	6,
+	/* LSM6DSV16X_DT_FS_8G / LSM6DSV32X_DT_FS_8G */
+	7,
+	/* LSM6DSV16X_DT_FS_16G / LSM6DSV32X_DT_FS_16G */
+	8,
+	/* LSM6DSV32X_DT_FS_32G */
+	9,
 };
 
 /* bit range for Gyroscope for a given fs */
@@ -108,14 +114,20 @@ static const int8_t temp_range = 9;
 	(int32_t)((ug_lsb) * SENSOR_G / 1000000LL)
 
 /*
- * Accelerometer scaling factors table (indexed by full scale)
+ * Accelerometer scaling factors table for a given accel_fs_idx value
  * GAIN_UNIT_XL is expressed in ug/LSB.
  */
 static const int32_t accel_scaler[] = {
-	[LSM6DSV16X_DT_FS_2G] = SENSOR_SCALE_UG_TO_UMS2(GAIN_UNIT_XL),
-	[LSM6DSV16X_DT_FS_4G] = SENSOR_SCALE_UG_TO_UMS2(2 * GAIN_UNIT_XL),
-	[LSM6DSV16X_DT_FS_8G] = SENSOR_SCALE_UG_TO_UMS2(4 * GAIN_UNIT_XL),
-	[LSM6DSV16X_DT_FS_16G] = SENSOR_SCALE_UG_TO_UMS2(8 * GAIN_UNIT_XL),
+	/* LSM6DSV16X_DT_FS_2G */
+	SENSOR_SCALE_UG_TO_UMS2(GAIN_UNIT_XL),
+	/* LSM6DSV16X_DT_FS_4G / LSM6DSV32X_DT_FS_4G */
+	SENSOR_SCALE_UG_TO_UMS2(2 * GAIN_UNIT_XL),
+	/* LSM6DSV16X_DT_FS_8G / LSM6DSV32X_DT_FS_8G*/
+	SENSOR_SCALE_UG_TO_UMS2(4 * GAIN_UNIT_XL),
+	/* LSM6DSV16X_DT_FS_16G / LSM6DSV32X_DT_FS_16G */
+	SENSOR_SCALE_UG_TO_UMS2(8 * GAIN_UNIT_XL),
+	/* LSM6DSV32X_DT_FS_32G */
+	SENSOR_SCALE_UG_TO_UMS2(16 * GAIN_UNIT_XL),
 };
 
 /* Calculate scaling factor to transform micro-dps/LSB unit into micro-rads/LSB */
@@ -318,7 +330,7 @@ static int lsm6dsv16x_decode_fifo(const uint8_t *buffer, struct sensor_chan_spec
 		case LSM6DSV16X_XL_NC_TAG: {
 			struct sensor_three_axis_data *out = data_out;
 			int16_t x, y, z;
-			const int32_t scale = accel_scaler[header->accel_fs];
+			const int32_t scale = accel_scaler[header->accel_fs_idx];
 
 			xl_count++;
 			if ((uintptr_t)buffer < *fit) {
@@ -339,7 +351,7 @@ static int lsm6dsv16x_decode_fifo(const uint8_t *buffer, struct sensor_chan_spec
 			y = *(int16_t *)&buffer[3];
 			z = *(int16_t *)&buffer[5];
 
-			out->shift = accel_range[header->accel_fs];
+			out->shift = accel_range[header->accel_fs_idx];
 
 			out->readings[count].x = Q31_SHIFT_MICROVAL(scale * x, out->shift);
 			out->readings[count].y = Q31_SHIFT_MICROVAL(scale * y, out->shift);
@@ -561,7 +573,7 @@ static int lsm6dsv16x_decode_sample(const uint8_t *buffer, struct sensor_chan_sp
 	case SENSOR_CHAN_ACCEL_Y:
 	case SENSOR_CHAN_ACCEL_Z:
 	case SENSOR_CHAN_ACCEL_XYZ: {
-		const int32_t scale = accel_scaler[header->accel_fs];
+		const int32_t scale = accel_scaler[header->accel_fs_idx];
 
 		if (edata->has_accel == 0) {
 			return -ENODATA;
@@ -572,7 +584,7 @@ static int lsm6dsv16x_decode_sample(const uint8_t *buffer, struct sensor_chan_sp
 		out->header.base_timestamp_ns = edata->header.timestamp;
 		out->header.reading_count = 1;
 
-		out->shift = accel_range[header->accel_fs];
+		out->shift = accel_range[header->accel_fs_idx];
 
 		out->readings[0].x = Q31_SHIFT_MICROVAL(scale * edata->acc[0], out->shift);
 		out->readings[0].y = Q31_SHIFT_MICROVAL(scale * edata->acc[1], out->shift);
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.h b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.h
index 22553c9665174..4ec25ec974f38 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.h
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.h
@@ -12,12 +12,17 @@
 #include <stdint.h>
 #include <zephyr/drivers/sensor.h>
 
+/*
+ * This macro converts the Accelerometer full-scale range value (which should be a power of 2) to
+ * an index value used by the decoder. Note: this index is not the same as the RAW register value.
+ */
+#define LSM6DSV16X_ACCEL_FS_VAL_TO_FS_IDX(x) (__builtin_ctz(x) - 1)
+
 struct lsm6dsv16x_decoder_header {
 	uint64_t timestamp;
 	uint8_t is_fifo: 1;
 	uint8_t gyro_fs: 4;
-	uint8_t accel_fs: 2;
-	uint8_t reserved: 1;
+	uint8_t accel_fs_idx: 3;
 } __attribute__((__packed__));
 
 struct lsm6dsv16x_fifo_data {
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.c b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.c
index b039ad2f5bbe8..4d5cc6f9f4412 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.c
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.c
@@ -122,7 +122,8 @@ static void lsm6dsv16x_submit_sample(const struct device *dev, struct rtio_iodev
 	}
 
 	edata->header.is_fifo = false;
-	edata->header.accel_fs = data->accel_fs;
+	edata->header.accel_fs_idx =
+		LSM6DSV16X_ACCEL_FS_VAL_TO_FS_IDX(config->accel_fs_map[data->accel_fs]);
 	edata->header.gyro_fs = data->gyro_fs;
 	edata->header.timestamp = sensor_clock_cycles_to_ns(cycles);
 
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.h b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.h
index 9aa838ddd455e..dc32327c85231 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.h
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio.h
@@ -12,6 +12,11 @@
 #include <zephyr/device.h>
 #include <zephyr/rtio/rtio.h>
 
+int lsm6dsv16x_gbias_config(const struct device *dev, enum sensor_channel chan,
+			    enum sensor_attribute attr,
+			    const struct sensor_value *val);
+int lsm6dsv16x_gbias_get_config(const struct device *dev, enum sensor_channel chan,
+				enum sensor_attribute attr, struct sensor_value *val);
 void lsm6dsv16x_submit(const struct device *sensor, struct rtio_iodev_sqe *iodev_sqe);
 
 void lsm6dsv16x_submit_stream(const struct device *sensor, struct rtio_iodev_sqe *iodev_sqe);
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio_stream.c b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio_stream.c
index b2b1614977921..011d4dfbcaf12 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio_stream.c
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio_stream.c
@@ -6,8 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define DT_DRV_COMPAT st_lsm6dsv16x
-
 #include <zephyr/dt-bindings/sensor/lsm6dsv16x.h>
 #include <zephyr/drivers/sensor.h>
 #include "lsm6dsv16x.h"
@@ -21,6 +19,45 @@ LOG_MODULE_DECLARE(LSM6DSV16X_RTIO);
 #define FIFO_TH 1
 #define FIFO_FULL 2
 
+int lsm6dsv16x_gbias_config(const struct device *dev, enum sensor_channel chan,
+			    enum sensor_attribute attr,
+			    const struct sensor_value *val)
+{
+	struct lsm6dsv16x_data *lsm6dsv16x = dev->data;
+
+	switch (attr) {
+	case SENSOR_ATTR_OFFSET:
+		lsm6dsv16x->gbias_x_udps = 10 * sensor_rad_to_10udegrees(&val[0]);
+		lsm6dsv16x->gbias_y_udps = 10 * sensor_rad_to_10udegrees(&val[1]);
+		lsm6dsv16x->gbias_z_udps = 10 * sensor_rad_to_10udegrees(&val[2]);
+		break;
+	default:
+		LOG_DBG("Accel attribute not supported.");
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+int lsm6dsv16x_gbias_get_config(const struct device *dev, enum sensor_channel chan,
+				enum sensor_attribute attr, struct sensor_value *val)
+{
+	struct lsm6dsv16x_data *lsm6dsv16x = dev->data;
+
+	switch (attr) {
+	case SENSOR_ATTR_OFFSET:
+		sensor_10udegrees_to_rad(lsm6dsv16x->gbias_x_udps / 10, &val[0]);
+		sensor_10udegrees_to_rad(lsm6dsv16x->gbias_y_udps / 10, &val[1]);
+		sensor_10udegrees_to_rad(lsm6dsv16x->gbias_z_udps / 10, &val[2]);
+		break;
+	default:
+		LOG_DBG("Accel attribute not supported.");
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
 static void lsm6dsv16x_config_fifo(const struct device *dev, uint8_t fifo_irq)
 {
 	struct lsm6dsv16x_data *lsm6dsv16x = dev->data;
@@ -34,6 +71,7 @@ static void lsm6dsv16x_config_fifo(const struct device *dev, uint8_t fifo_irq)
 	lsm6dsv16x_fifo_mode_t fifo_mode = LSM6DSV16X_BYPASS_MODE;
 	lsm6dsv16x_sflp_data_rate_t sflp_odr = LSM6DSV16X_SFLP_120Hz;
 	lsm6dsv16x_fifo_sflp_raw_t sflp_fifo = { 0 };
+	lsm6dsv16x_sflp_gbias_t gbias;
 
 	/* disable FIFO as first thing */
 	lsm6dsv16x_fifo_mode_set(ctx, LSM6DSV16X_BYPASS_MODE);
@@ -91,6 +129,52 @@ static void lsm6dsv16x_config_fifo(const struct device *dev, uint8_t fifo_irq)
 	lsm6dsv16x_fifo_sflp_batch_set(ctx, sflp_fifo);
 	lsm6dsv16x_sflp_game_rotation_set(ctx, PROPERTY_ENABLE);
 
+	/*
+	 * Temporarly set Accel and gyro odr same as sensor fusion LP in order to
+	 * make the SFLP gbias setting effective. Then restore it to saved values.
+	 */
+	switch (sflp_odr) {
+	case LSM6DSV16X_DT_SFLP_ODR_AT_480Hz:
+		lsm6dsv16x_accel_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_480Hz);
+		lsm6dsv16x_gyro_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_480Hz);
+		break;
+
+	case LSM6DSV16X_DT_SFLP_ODR_AT_240Hz:
+		lsm6dsv16x_accel_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_240Hz);
+		lsm6dsv16x_gyro_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_240Hz);
+		break;
+
+	case LSM6DSV16X_DT_SFLP_ODR_AT_120Hz:
+		lsm6dsv16x_accel_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_120Hz);
+		lsm6dsv16x_gyro_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_120Hz);
+		break;
+
+	case LSM6DSV16X_DT_SFLP_ODR_AT_60Hz:
+		lsm6dsv16x_accel_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_60Hz);
+		lsm6dsv16x_gyro_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_60Hz);
+		break;
+
+	case LSM6DSV16X_DT_SFLP_ODR_AT_30Hz:
+		lsm6dsv16x_accel_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_30Hz);
+		lsm6dsv16x_gyro_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_30Hz);
+		break;
+
+	case LSM6DSV16X_DT_SFLP_ODR_AT_15Hz:
+		lsm6dsv16x_accel_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_15Hz);
+		lsm6dsv16x_gyro_set_odr_raw(dev, LSM6DSV16X_DT_ODR_AT_15Hz);
+		break;
+	}
+
+	/* set sflp gbias */
+	gbias.gbias_x = (float)lsm6dsv16x->gbias_x_udps / 1000000;
+	gbias.gbias_y = (float)lsm6dsv16x->gbias_y_udps / 1000000;
+	gbias.gbias_z = (float)lsm6dsv16x->gbias_z_udps / 1000000;
+	lsm6dsv16x_sflp_game_gbias_set(ctx, &gbias);
+
+	/* restore accel/gyro odr to saved values */
+	lsm6dsv16x_accel_set_odr_raw(dev, lsm6dsv16x->accel_freq);
+	lsm6dsv16x_gyro_set_odr_raw(dev, lsm6dsv16x->gyro_freq);
+
 	/* Set pin interrupt (fifo_th could be on or off) */
 	if ((config->drdy_pin == 1) || (ON_I3C_BUS(config) && (!I3C_INT_PIN(config)))) {
 		lsm6dsv16x_pin_int1_route_set(ctx, &pin_int);
@@ -102,7 +186,7 @@ static void lsm6dsv16x_config_fifo(const struct device *dev, uint8_t fifo_irq)
 void lsm6dsv16x_submit_stream(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
 {
 	struct lsm6dsv16x_data *lsm6dsv16x = dev->data;
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	const struct lsm6dsv16x_config *config = dev->config;
 #endif
 	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
@@ -138,7 +222,7 @@ void lsm6dsv16x_submit_stream(const struct device *dev, struct rtio_iodev_sqe *i
 static void lsm6dsv16x_complete_op_cb(struct rtio *r, const struct rtio_sqe *sqe, void *arg)
 {
 	const struct device *dev = arg;
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	const struct lsm6dsv16x_config *config = dev->config;
 #endif
 	struct lsm6dsv16x_data *lsm6dsv16x = dev->data;
@@ -156,9 +240,7 @@ static void lsm6dsv16x_complete_op_cb(struct rtio *r, const struct rtio_sqe *sqe
 static void lsm6dsv16x_read_fifo_cb(struct rtio *r, const struct rtio_sqe *sqe, void *arg)
 {
 	const struct device *dev = arg;
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	const struct lsm6dsv16x_config *config = dev->config;
-#endif
 	struct lsm6dsv16x_data *lsm6dsv16x = dev->data;
 	struct gpio_dt_spec *irq_gpio = lsm6dsv16x->drdy_gpio;
 	struct rtio_iodev *iodev = lsm6dsv16x->iodev;
@@ -315,10 +397,12 @@ static void lsm6dsv16x_read_fifo_cb(struct rtio *r, const struct rtio_sqe *sqe,
 		return;
 	}
 
+	/* clang-format off */
 	struct lsm6dsv16x_fifo_data hdr = {
 		.header = {
 			.is_fifo = true,
-			.accel_fs = lsm6dsv16x->accel_fs,
+			.accel_fs_idx = LSM6DSV16X_ACCEL_FS_VAL_TO_FS_IDX(
+				config->accel_fs_map[lsm6dsv16x->accel_fs]),
 			.gyro_fs = lsm6dsv16x->gyro_fs,
 			.timestamp = lsm6dsv16x->fifo_timestamp,
 		},
@@ -330,6 +414,7 @@ static void lsm6dsv16x_read_fifo_cb(struct rtio *r, const struct rtio_sqe *sqe,
 #endif
 		.sflp_batch_odr = lsm6dsv16x->sflp_batch_odr,
 	};
+	/* clang-format on */
 
 	memcpy(buf, &hdr, sizeof(hdr));
 	read_buf = buf + sizeof(hdr);
@@ -375,7 +460,7 @@ void lsm6dsv16x_stream_irq_handler(const struct device *dev)
 {
 	struct lsm6dsv16x_data *lsm6dsv16x = dev->data;
 	struct rtio_iodev *iodev = lsm6dsv16x->iodev;
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	const struct lsm6dsv16x_config *config = dev->config;
 #endif
 	uint64_t cycles;
@@ -395,7 +480,7 @@ void lsm6dsv16x_stream_irq_handler(const struct device *dev)
 	/* get timestamp as soon as the irq is served */
 	lsm6dsv16x->fifo_timestamp = sensor_clock_cycles_to_ns(cycles);
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	if (ON_I3C_BUS(config) && (!I3C_INT_PIN(config))) {
 		/*
 		 * If we are on an I3C bus, then it should be expected that the fifo status was
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_shub.c b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_shub.c
index 93d92290ac6be..8445983c2e600 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_shub.c
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_shub.c
@@ -8,8 +8,6 @@
  * https://www.st.com/resource/en/datasheet/lsm6dsv16x.pdf
  */
 
-#define DT_DRV_COMPAT st_lsm6dsv16x
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/sys/__assert.h>
diff --git a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_trigger.c b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_trigger.c
index a6a52f2ea9e2b..46ce9cbd16126 100644
--- a/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_trigger.c
+++ b/drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_trigger.c
@@ -8,8 +8,6 @@
  * https://www.st.com/resource/en/datasheet/lsm6dsv16x.pdf
  */
 
-#define DT_DRV_COMPAT st_lsm6dsv16x
-
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/gpio.h>
@@ -341,7 +339,7 @@ static void lsm6dsv16x_work_cb(struct k_work *work)
 }
 #endif /* CONFIG_LSM6DSV16X_TRIGGER_GLOBAL_THREAD */
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 static int lsm6dsv16x_ibi_cb(struct i3c_device_desc *target,
 			  struct i3c_ibi_payload *payload)
 {
@@ -446,7 +444,7 @@ int lsm6dsv16x_init_interrupt(const struct device *dev)
 		return ret;
 	}
 
-#if DT_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
+#if LSM6DSVXXX_ANY_INST_ON_BUS_STATUS_OKAY(i3c)
 	if (ON_I3C_BUS(cfg)) {
 		if (I3C_INT_PIN(cfg)) {
 			/* Enable INT Pins when using I3C */
diff --git a/drivers/sensor/tdk/CMakeLists.txt b/drivers/sensor/tdk/CMakeLists.txt
index 7e6c4090391a3..09936cd4d8b08 100644
--- a/drivers/sensor/tdk/CMakeLists.txt
+++ b/drivers/sensor/tdk/CMakeLists.txt
@@ -5,7 +5,9 @@
 add_subdirectory_ifdef(CONFIG_ICM42605 icm42605)
 add_subdirectory_ifdef(CONFIG_ICM42688 icm42688)
 add_subdirectory_ifdef(CONFIG_ICM42X70 icm42x70)
+add_subdirectory_ifdef(CONFIG_ICM45686 icm45686)
 add_subdirectory_ifdef(CONFIG_ICP101XX icp101xx)
+add_subdirectory_ifdef(CONFIG_ICP201XX icp201xx)
 add_subdirectory_ifdef(CONFIG_MPU6050 mpu6050)
 add_subdirectory_ifdef(CONFIG_MPU9250 mpu9250)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/tdk/Kconfig b/drivers/sensor/tdk/Kconfig
index c903842785121..2b9163a7409da 100644
--- a/drivers/sensor/tdk/Kconfig
+++ b/drivers/sensor/tdk/Kconfig
@@ -5,7 +5,9 @@
 source "drivers/sensor/tdk/icm42605/Kconfig"
 source "drivers/sensor/tdk/icm42688/Kconfig"
 source "drivers/sensor/tdk/icm42x70/Kconfig"
+source "drivers/sensor/tdk/icm45686/Kconfig"
 source "drivers/sensor/tdk/icp101xx/Kconfig"
+source "drivers/sensor/tdk/icp201xx/Kconfig"
 source "drivers/sensor/tdk/mpu6050/Kconfig"
 source "drivers/sensor/tdk/mpu9250/Kconfig"
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/tdk/icm42688/icm42688.h b/drivers/sensor/tdk/icm42688/icm42688.h
index 410f0f983fbd0..65c534495d291 100644
--- a/drivers/sensor/tdk/icm42688/icm42688.h
+++ b/drivers/sensor/tdk/icm42688/icm42688.h
@@ -412,10 +412,10 @@ int icm42688_read_all(const struct device *dev, uint8_t data[14]);
  * @param cfg icm42688_cfg current device configuration
  * @param in raw data value in int32_t format
  * @param out_g whole G's output in int32_t
- * @param out_ug micro (1/1000000) of a G output as uint32_t
+ * @param out_ug micro (1/1000000) of a G output as int32_t
  */
 static inline void icm42688_accel_g(struct icm42688_cfg *cfg, int32_t in, int32_t *out_g,
-				    uint32_t *out_ug)
+				    int32_t *out_ug)
 {
 	int32_t sensitivity;
 
@@ -449,10 +449,10 @@ static inline void icm42688_accel_g(struct icm42688_cfg *cfg, int32_t in, int32_
  * @param cfg icm42688_cfg current device configuration
  * @param in raw data value in int32_t format
  * @param out_dps whole deg/s output in int32_t
- * @param out_udps micro (1/1000000) deg/s as uint32_t
+ * @param out_udps micro (1/1000000) deg/s as int32_t
  */
 static inline void icm42688_gyro_dps(const struct icm42688_cfg *cfg, int32_t in, int32_t *out_dps,
-				     uint32_t *out_udps)
+				     int32_t *out_udps)
 {
 	int64_t sensitivity;
 
@@ -501,7 +501,7 @@ static inline void icm42688_gyro_dps(const struct icm42688_cfg *cfg, int32_t in,
  * @param cfg icm42688_cfg current device configuration
  * @param in raw data value in int32_t format
  * @param out_ms meters/s^2 (whole) output in int32_t
- * @param out_ums micrometers/s^2 output as uint32_t
+ * @param out_ums micrometers/s^2 output as int32_t
  */
 static inline void icm42688_accel_ms(const struct icm42688_cfg *cfg, int32_t in, int32_t *out_ms,
 				     int32_t *out_ums)
@@ -541,7 +541,7 @@ static inline void icm42688_accel_ms(const struct icm42688_cfg *cfg, int32_t in,
  * @param cfg icm42688_cfg current device configuration
  * @param in raw data value in int32_t format
  * @param out_rads whole rad/s output in int32_t
- * @param out_urads microrad/s as uint32_t
+ * @param out_urads microrad/s as int32_t
  */
 static inline void icm42688_gyro_rads(const struct icm42688_cfg *cfg, int32_t in, int32_t *out_rads,
 				      int32_t *out_urads)
@@ -593,9 +593,9 @@ static inline void icm42688_gyro_rads(const struct icm42688_cfg *cfg, int32_t in
  * @param cfg icm42688_cfg current device configuration
  * @param in raw data value in int32_t format
  * @param out_c whole celsius output in int32_t
- * @param out_uc micro (1/1000000) celsius as uint32_t
+ * @param out_uc micro (1/1000000) celsius as int32_t
  */
-static inline void icm42688_temp_c(int32_t in, int32_t *out_c, uint32_t *out_uc)
+static inline void icm42688_temp_c(int32_t in, int32_t *out_c, int32_t *out_uc)
 {
 	int64_t sensitivity = 13248; /* value equivalent for x100 1c */
 
diff --git a/drivers/sensor/tdk/icm45686/CMakeLists.txt b/drivers/sensor/tdk/icm45686/CMakeLists.txt
new file mode 100644
index 0000000000000..084c244c0e38c
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_include_directories(.)
+zephyr_library_sources(
+	icm45686.c
+)
+zephyr_library_sources_ifdef(CONFIG_SENSOR_ASYNC_API
+	icm45686_decoder.c
+)
+zephyr_library_sources_ifdef(CONFIG_ICM45686_TRIGGER
+	icm45686_trigger.c
+)
+zephyr_library_sources_ifdef(CONFIG_ICM45686_STREAM
+	icm45686_stream.c
+)
diff --git a/drivers/sensor/tdk/icm45686/Kconfig b/drivers/sensor/tdk/icm45686/Kconfig
new file mode 100644
index 0000000000000..14fa7a6e9e318
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/Kconfig
@@ -0,0 +1,66 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig ICM45686
+	bool "ICM45686 High-precision 6-Axis Motion Tracking Device"
+	default y
+	depends on DT_HAS_INVENSENSE_ICM45686_ENABLED
+	select SPI
+	select SPI_RTIO
+	help
+	  Enable driver for ICM45686 High-precision 6-axis motion
+	  tracking device.
+
+if ICM45686
+
+choice
+	prompt "Trigger mode"
+	default ICM45686_TRIGGER_GLOBAL_THREAD
+	help
+	  Specify the type of triggering to be used by the driver
+
+config ICM45686_TRIGGER_NONE
+	bool "No trigger"
+
+config ICM45686_TRIGGER_GLOBAL_THREAD
+	bool "Use global thread"
+	depends on GPIO
+	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_INVENSENSE_ICM45686),int-gpios)
+	depends on !ICM45686_STREAM
+	select ICM45686_TRIGGER
+
+config ICM45686_TRIGGER_OWN_THREAD
+	bool "Use own thread"
+	depends on GPIO
+	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_INVENSENSE_ICM45686),int-gpios)
+	depends on !ICM45686_STREAM
+	select ICM45686_TRIGGER
+
+endchoice
+
+config ICM45686_TRIGGER
+	bool
+
+config ICM45686_THREAD_PRIORITY
+	int "Own thread priority"
+	depends on ICM45686_TRIGGER_OWN_THREAD
+	default 10
+	help
+	  The priority of the thread used for handling triggers.
+
+config ICM45686_THREAD_STACK_SIZE
+	int "Own thread stack size"
+	depends on ICM45686_TRIGGER_OWN_THREAD
+	default 1024
+	help
+	  The thread stack size.
+
+config ICM45686_STREAM
+	bool "Streaming mode"
+	depends on GPIO
+	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_INVENSENSE_ICM45686),int-gpios)
+	help
+	  Enable streaming of sensor data.
+
+endif # ICM45686
diff --git a/drivers/sensor/tdk/icm45686/icm45686.c b/drivers/sensor/tdk/icm45686/icm45686.c
new file mode 100644
index 0000000000000..9965183c62329
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686.c
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2022 Intel Corporation
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT invensense_icm45686
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/rtio/rtio.h>
+
+#if defined(CONFIG_SENSOR_ASYNC_API)
+#include <zephyr/rtio/work.h>
+#endif /* CONFIG_SENSOR_ASYNC_API */
+
+#include "icm45686.h"
+#include "icm45686_reg.h"
+#include "icm45686_bus.h"
+#include "icm45686_decoder.h"
+#include "icm45686_trigger.h"
+#include "icm45686_stream.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(ICM45686, CONFIG_SENSOR_LOG_LEVEL);
+
+static inline int reg_write(const struct device *dev, uint8_t reg, uint8_t val)
+{
+	return icm45686_bus_write(dev, reg, &val, 1);
+}
+
+static inline int reg_read(const struct device *dev, uint8_t reg, uint8_t *val)
+{
+	return icm45686_bus_read(dev, reg, val, 1);
+}
+
+static int icm45686_sample_fetch(const struct device *dev,
+				 enum sensor_channel chan)
+{
+	int err;
+	struct icm45686_data *data = dev->data;
+	struct icm45686_encoded_data *edata = &data->edata;
+
+	if (chan != SENSOR_CHAN_ALL) {
+		return -ENOTSUP;
+	}
+
+	err = icm45686_bus_read(dev,
+				REG_ACCEL_DATA_X1_UI,
+				edata->payload.buf,
+				sizeof(edata->payload.buf));
+
+	LOG_HEXDUMP_DBG(edata->payload.buf,
+			sizeof(edata->payload.buf),
+			"ICM45686 data");
+
+	return err;
+}
+
+static int icm45686_channel_get(const struct device *dev,
+				enum sensor_channel chan,
+				struct sensor_value *val)
+{
+	struct icm45686_data *data = dev->data;
+
+	switch (chan) {
+	case SENSOR_CHAN_ACCEL_X:
+		icm45686_accel_ms(data->edata.header.accel_fs, data->edata.payload.accel.x, false,
+				  &val->val1, &val->val2);
+		break;
+	case SENSOR_CHAN_ACCEL_Y:
+		icm45686_accel_ms(data->edata.header.accel_fs, data->edata.payload.accel.y, false,
+				  &val->val1, &val->val2);
+		break;
+	case SENSOR_CHAN_ACCEL_Z:
+		icm45686_accel_ms(data->edata.header.accel_fs, data->edata.payload.accel.z, false,
+				  &val->val1, &val->val2);
+		break;
+	case SENSOR_CHAN_GYRO_X:
+		icm45686_gyro_rads(data->edata.header.gyro_fs, data->edata.payload.gyro.x, false,
+				   &val->val1, &val->val2);
+		break;
+	case SENSOR_CHAN_GYRO_Y:
+		icm45686_gyro_rads(data->edata.header.gyro_fs, data->edata.payload.gyro.y, false,
+				   &val->val1, &val->val2);
+		break;
+	case SENSOR_CHAN_GYRO_Z:
+		icm45686_gyro_rads(data->edata.header.gyro_fs, data->edata.payload.gyro.z, false,
+				   &val->val1, &val->val2);
+		break;
+	case SENSOR_CHAN_DIE_TEMP:
+		icm45686_temp_c(data->edata.payload.temp, &val->val1, &val->val2);
+		break;
+	case SENSOR_CHAN_ACCEL_XYZ:
+		icm45686_accel_ms(data->edata.header.accel_fs, data->edata.payload.accel.x, false,
+				  &val[0].val1, &val[0].val2);
+		icm45686_accel_ms(data->edata.header.accel_fs, data->edata.payload.accel.y, false,
+				  &val[1].val1, &val[1].val2);
+		icm45686_accel_ms(data->edata.header.accel_fs, data->edata.payload.accel.z, false,
+				  &val[2].val1, &val[2].val2);
+		break;
+	case SENSOR_CHAN_GYRO_XYZ:
+		icm45686_gyro_rads(data->edata.header.gyro_fs, data->edata.payload.gyro.x, false,
+				   &val->val1, &val->val2);
+		icm45686_gyro_rads(data->edata.header.gyro_fs, data->edata.payload.gyro.y, false,
+				   &val[1].val1, &val[1].val2);
+		icm45686_gyro_rads(data->edata.header.gyro_fs, data->edata.payload.gyro.z, false,
+				   &val[2].val1, &val[2].val2);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_SENSOR_ASYNC_API)
+
+static void icm45686_complete_result(struct rtio *ctx,
+				     const struct rtio_sqe *sqe,
+				     void *arg)
+{
+	struct rtio_iodev_sqe *iodev_sqe = (struct rtio_iodev_sqe *)sqe->userdata;
+	struct rtio_cqe *cqe;
+	int err = 0;
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	if (err) {
+		rtio_iodev_sqe_err(iodev_sqe, err);
+	} else {
+		rtio_iodev_sqe_ok(iodev_sqe, 0);
+	}
+
+	LOG_DBG("One-shot fetch completed");
+}
+
+static inline void icm45686_submit_one_shot(const struct device *dev,
+					    struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+	const struct sensor_chan_spec *const channels = cfg->channels;
+	const size_t num_channels = cfg->count;
+	uint32_t min_buf_len = sizeof(struct icm45686_encoded_data);
+	int err;
+	uint8_t *buf;
+	uint32_t buf_len;
+	struct icm45686_encoded_data *edata;
+	struct icm45686_data *data = dev->data;
+
+	err = rtio_sqe_rx_buf(iodev_sqe, min_buf_len, min_buf_len, &buf, &buf_len);
+	if (err != 0) {
+		LOG_ERR("Failed to get a read buffer of size %u bytes", min_buf_len);
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	edata = (struct icm45686_encoded_data *)buf;
+
+	err = icm45686_encode(dev, channels, num_channels, buf);
+	if (err != 0) {
+		LOG_ERR("Failed to encode sensor data");
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *complete_sqe = rtio_sqe_acquire(data->rtio.ctx);
+
+	if (!write_sqe || !read_sqe | !complete_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQEs");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	uint8_t val = REG_ACCEL_DATA_X1_UI | REG_SPI_READ_BIT;
+
+	rtio_sqe_prep_tiny_write(write_sqe,
+				 data->rtio.iodev,
+				 RTIO_PRIO_HIGH,
+				 &val,
+				 1,
+				NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_sqe,
+			   data->rtio.iodev,
+			   RTIO_PRIO_HIGH,
+			   edata->payload.buf,
+			   sizeof(edata->payload.buf),
+			   NULL);
+	read_sqe->flags |= RTIO_SQE_CHAINED;
+
+	rtio_sqe_prep_callback_no_cqe(complete_sqe,
+				      icm45686_complete_result,
+				      (void *)dev,
+				      iodev_sqe);
+
+	rtio_submit(data->rtio.ctx, 0);
+}
+
+static void icm45686_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *cfg = iodev_sqe->sqe.iodev->data;
+
+	if (!cfg->is_streaming) {
+		icm45686_submit_one_shot(dev, iodev_sqe);
+	} else if (IS_ENABLED(CONFIG_ICM45686_STREAM)) {
+		icm45686_stream_submit(dev, iodev_sqe);
+	} else {
+		LOG_ERR("Streaming not supported");
+		rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+	}
+}
+
+#endif /* CONFIG_SENSOR_ASYNC_API */
+
+static DEVICE_API(sensor, icm45686_driver_api) = {
+	.sample_fetch = icm45686_sample_fetch,
+	.channel_get = icm45686_channel_get,
+#if defined(CONFIG_ICM45686_TRIGGER)
+	.trigger_set = icm45686_trigger_set,
+#endif /* CONFIG_ICM45686_TRIGGER */
+#if defined(CONFIG_SENSOR_ASYNC_API)
+	.get_decoder = icm45686_get_decoder,
+	.submit = icm45686_submit,
+#endif /* CONFIG_SENSOR_ASYNC_API */
+};
+
+static int icm45686_init(const struct device *dev)
+{
+	struct icm45686_data *data = dev->data;
+	const struct icm45686_config *cfg = dev->config;
+	uint8_t read_val = 0;
+	uint8_t val;
+	int err;
+
+	if (!spi_is_ready_iodev(data->rtio.iodev)) {
+		LOG_ERR("Bus is not ready");
+		return -ENODEV;
+	}
+
+	/* Soft-reset sensor to restore config to defaults */
+
+	err = reg_write(dev, REG_MISC2, REG_MISC2_SOFT_RST(1));
+	if (err) {
+		LOG_ERR("Failed to write soft-reset: %d", err);
+		return err;
+	}
+	/* Wait for soft-reset to take effect */
+	k_sleep(K_MSEC(1));
+
+	/* A complete soft-reset clears the bit */
+	err = reg_read(dev, REG_MISC2, &read_val);
+	if (err) {
+		LOG_ERR("Failed to read soft-reset: %d", err);
+		return err;
+	}
+	if ((read_val & REG_MISC2_SOFT_RST(1)) != 0) {
+		LOG_ERR("Soft-reset command failed");
+		return -EIO;
+	}
+
+	/* Set Slew-rate to 10-ns typical, to allow proper SPI readouts */
+
+	err = reg_write(dev, REG_DRIVE_CONFIG0, REG_DRIVE_CONFIG0_SPI_SLEW(2));
+	if (err) {
+		LOG_ERR("Failed to write slew-rate: %d", err);
+		return err;
+	}
+	/* Wait for register to take effect */
+	k_sleep(K_USEC(2));
+
+	/* Confirm ID Value matches */
+	err = reg_read(dev, REG_WHO_AM_I, &read_val);
+	if (err) {
+		LOG_ERR("Failed to read WHO_AM_I: %d", err);
+		return err;
+	}
+	if (read_val != WHO_AM_I_ICM45686) {
+		LOG_ERR("Unexpected WHO_AM_I value - expected: 0x%02x, actual: 0x%02x",
+			WHO_AM_I_ICM45686, read_val);
+		return -EIO;
+	}
+
+	/* Sensor Configuration */
+
+	val = REG_PWR_MGMT0_ACCEL_MODE(cfg->settings.accel.pwr_mode) |
+	      REG_PWR_MGMT0_GYRO_MODE(cfg->settings.gyro.pwr_mode);
+	err = reg_write(dev, REG_PWR_MGMT0, val);
+	if (err) {
+		LOG_ERR("Failed to write Power settings: %d", err);
+		return err;
+	}
+
+	val = REG_ACCEL_CONFIG0_ODR(cfg->settings.accel.odr) |
+	      REG_ACCEL_CONFIG0_FS(cfg->settings.accel.fs);
+	err = reg_write(dev, REG_ACCEL_CONFIG0, val);
+	if (err) {
+		LOG_ERR("Failed to write Accel settings: %d", err);
+		return err;
+	}
+
+	val = REG_GYRO_CONFIG0_ODR(cfg->settings.gyro.odr) |
+	      REG_GYRO_CONFIG0_FS(cfg->settings.gyro.fs);
+	err = reg_write(dev, REG_GYRO_CONFIG0, val);
+	if (err) {
+		LOG_ERR("Failed to write Gyro settings: %d", err);
+		return err;
+	}
+
+	/** Write Low-pass filter settings through indirect register access */
+	uint8_t gyro_lpf_write_array[] = REG_IREG_PREPARE_WRITE_ARRAY(
+						REG_IPREG_SYS1_OFFSET,
+						REG_IPREG_SYS1_REG_172,
+						REG_IPREG_SYS1_REG_172_GYRO_LPFBW_SEL(
+							cfg->settings.gyro.lpf));
+
+	err = icm45686_bus_write(dev, REG_IREG_ADDR_15_8, gyro_lpf_write_array,
+				 sizeof(gyro_lpf_write_array));
+	if (err) {
+		LOG_ERR("Failed to set Gyro BW settings: %d", err);
+		return err;
+	}
+
+	/** Wait before indirect register write is made effective
+	 * before proceeding with next one.
+	 */
+	k_sleep(K_MSEC(1));
+
+	uint8_t accel_lpf_write_array[] = REG_IREG_PREPARE_WRITE_ARRAY(
+						REG_IPREG_SYS2_OFFSET,
+						REG_IPREG_SYS2_REG_131,
+						REG_IPREG_SYS2_REG_131_ACCEL_LPFBW_SEL(
+							cfg->settings.accel.lpf));
+
+	err = icm45686_bus_write(dev, REG_IREG_ADDR_15_8, accel_lpf_write_array,
+				 sizeof(accel_lpf_write_array));
+	if (err) {
+		LOG_ERR("Failed to set Accel BW settings: %d", err);
+		return err;
+	}
+
+	if (IS_ENABLED(CONFIG_ICM45686_TRIGGER)) {
+		err = icm45686_trigger_init(dev);
+		if (err) {
+			LOG_ERR("Failed to initialize triggers: %d", err);
+			return err;
+		}
+	} else if (IS_ENABLED(CONFIG_ICM45686_STREAM)) {
+		err = icm45686_stream_init(dev);
+		if (err) {
+			LOG_ERR("Failed to initialize streaming: %d", err);
+			return err;
+		}
+	}
+
+	LOG_DBG("Init OK");
+
+	return 0;
+}
+
+#define ICM45686_VALID_ACCEL_ODR(pwr_mode, odr)							   \
+	((pwr_mode == ICM45686_DT_ACCEL_LP && odr >= ICM45686_DT_ACCEL_ODR_400) ||		   \
+	 (pwr_mode == ICM45686_DT_ACCEL_LN && odr <= ICM45686_DT_ACCEL_ODR_12_5) ||		   \
+	 (pwr_mode == ICM45686_DT_ACCEL_OFF))
+
+#define ICM45686_VALID_GYRO_ODR(pwr_mode, odr)							   \
+	((pwr_mode == ICM45686_DT_GYRO_LP && odr >= ICM45686_DT_GYRO_ODR_400) ||		   \
+	 (pwr_mode == ICM45686_DT_GYRO_LN && odr <= ICM45686_DT_GYRO_ODR_12_5) ||		   \
+	 (pwr_mode == ICM45686_DT_GYRO_OFF))
+
+#define ICM45686_INIT(inst)									   \
+												   \
+	RTIO_DEFINE(icm45686_rtio_ctx_##inst, 8, 8);						   \
+	SPI_DT_IODEV_DEFINE(icm45686_bus_##inst,						   \
+			    DT_DRV_INST(inst),							   \
+			    SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_TRANSFER_MSB,		   \
+			    0U);								   \
+												   \
+	static const struct icm45686_config icm45686_cfg_##inst = {				   \
+		.settings = {									   \
+			.accel = {								   \
+				.pwr_mode = DT_INST_PROP(inst, accel_pwr_mode),			   \
+				.fs = DT_INST_PROP(inst, accel_fs),				   \
+				.odr = DT_INST_PROP(inst, accel_odr),				   \
+				.lpf = DT_INST_PROP_OR(inst, accel_lpf, 0),			   \
+			},									   \
+			.gyro = {								   \
+				.pwr_mode = DT_INST_PROP(inst, gyro_pwr_mode),			   \
+				.fs = DT_INST_PROP(inst, gyro_fs),				   \
+				.odr = DT_INST_PROP(inst, gyro_odr),				   \
+				.lpf = DT_INST_PROP_OR(inst, gyro_lpf, 0),			   \
+			},									   \
+			.fifo_watermark = DT_INST_PROP_OR(inst, fifo_watermark, 0),		   \
+		},										   \
+		.int_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, {0}),			   \
+	};											   \
+	static struct icm45686_data icm45686_data_##inst = {					   \
+		.edata.header = {								   \
+			.accel_fs = DT_INST_PROP(inst, accel_fs),				   \
+			.gyro_fs = DT_INST_PROP(inst, gyro_fs),					   \
+		},										   \
+		.rtio = {									   \
+			.iodev = &icm45686_bus_##inst,						   \
+			.ctx = &icm45686_rtio_ctx_##inst,					   \
+		},										   \
+	};											   \
+												   \
+	/* Build-time settings verification: Inform the user of invalid settings at build time */  \
+	BUILD_ASSERT(ICM45686_VALID_ACCEL_ODR(DT_INST_PROP(inst, accel_pwr_mode),		   \
+					      DT_INST_PROP(inst, accel_odr)),			   \
+		     "Invalid accel ODR setting. Please check supported ODRs for LP and LN");	   \
+	BUILD_ASSERT(ICM45686_VALID_GYRO_ODR(DT_INST_PROP(inst, gyro_pwr_mode),			   \
+					     DT_INST_PROP(inst, gyro_odr)),			   \
+		     "Invalid gyro ODR setting. Please check supported ODRs for LP and LN");	   \
+												   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, icm45686_init,					   \
+				     NULL,							   \
+				     &icm45686_data_##inst,					   \
+				     &icm45686_cfg_##inst,					   \
+				     POST_KERNEL,						   \
+				     CONFIG_SENSOR_INIT_PRIORITY,				   \
+				     &icm45686_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(ICM45686_INIT)
diff --git a/drivers/sensor/tdk/icm45686/icm45686.h b/drivers/sensor/tdk/icm45686/icm45686.h
new file mode 100644
index 0000000000000..3fcf86c025e0c
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686.h
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2022 Intel Corporation
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_ICM45686_H_
+#define ZEPHYR_DRIVERS_SENSOR_ICM45686_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/sensor/icm45686.h>
+#include <zephyr/rtio/rtio.h>
+
+struct icm45686_encoded_payload {
+	union {
+		uint8_t buf[14];
+		int16_t readings[7];
+		struct {
+			struct {
+				int16_t x;
+				int16_t y;
+				int16_t z;
+			} accel;
+			struct {
+				int16_t x;
+				int16_t y;
+				int16_t z;
+			} gyro;
+			int16_t temp;
+		} __attribute__((__packed__));
+	};
+};
+
+struct icm45686_encoded_fifo_payload {
+	union {
+		uint8_t buf[20];
+		struct {
+			uint8_t header;
+			struct {
+				int16_t x;
+				int16_t y;
+				int16_t z;
+			} accel;
+			struct {
+				int16_t x;
+				int16_t y;
+				int16_t z;
+			} gyro;
+			int16_t temp;
+			uint16_t timestamp;
+			struct {
+				uint8_t gyro_x : 4;
+				uint8_t accel_x : 4;
+				uint8_t gyro_y : 4;
+				uint8_t accel_y : 4;
+				uint8_t gyro_z : 4;
+				uint8_t accel_z : 4;
+			} lsb;
+		} __attribute__((__packed__));
+	};
+};
+
+struct icm45686_encoded_header {
+	uint64_t timestamp;
+	uint8_t accel_fs : 4;
+	uint8_t gyro_fs : 4;
+	uint8_t events : 3;
+	uint8_t channels : 7;
+	uint16_t fifo_count;
+};
+
+struct icm45686_encoded_data {
+	struct icm45686_encoded_header header;
+	union {
+		struct icm45686_encoded_payload payload;
+		struct icm45686_encoded_fifo_payload fifo_payload;
+	};
+};
+
+struct icm45686_triggers {
+		struct gpio_callback cb;
+		const struct device *dev;
+		struct k_mutex lock;
+		struct {
+			struct sensor_trigger trigger;
+			sensor_trigger_handler_t handler;
+		} entry;
+#if defined(CONFIG_ICM45686_TRIGGER_OWN_THREAD)
+		K_KERNEL_STACK_MEMBER(thread_stack, CONFIG_ICM45686_THREAD_STACK_SIZE);
+		struct k_thread thread;
+		struct k_sem sem;
+#elif defined(CONFIG_ICM45686_TRIGGER_GLOBAL_THREAD)
+		struct k_work work;
+#endif
+};
+
+struct icm45686_stream {
+	struct gpio_callback cb;
+	const struct device *dev;
+	struct rtio_iodev_sqe *iodev_sqe;
+	atomic_t in_progress;
+	struct {
+		struct {
+			bool drdy : 1;
+			bool fifo_ths : 1;
+			bool fifo_full : 1;
+		} enabled;
+		struct {
+			enum sensor_stream_data_opt drdy;
+			enum sensor_stream_data_opt fifo_ths;
+			enum sensor_stream_data_opt fifo_full;
+		} opt;
+		bool drdy : 1;
+		bool fifo_ths : 1;
+		bool fifo_full : 1;
+	} settings;
+	struct {
+		uint64_t timestamp;
+		uint8_t int_status;
+		uint16_t fifo_count;
+		struct {
+			bool drdy : 1;
+			bool fifo_ths : 1;
+			bool fifo_full : 1;
+		} events;
+	} data;
+};
+
+struct icm45686_data {
+	struct {
+		struct rtio_iodev *iodev;
+		struct rtio *ctx;
+	} rtio;
+	/** Single-shot encoded data instance to support fetch/get API */
+	struct icm45686_encoded_data edata;
+#if defined(CONFIG_ICM45686_TRIGGER)
+	struct icm45686_triggers triggers;
+#elif defined(CONFIG_ICM45686_STREAM)
+	struct icm45686_stream stream;
+#endif /* CONFIG_ICM45686_TRIGGER */
+};
+
+struct icm45686_config {
+	struct {
+		struct {
+			uint8_t pwr_mode : 2;
+			uint8_t fs : 4;
+			uint8_t odr : 4;
+			uint8_t lpf : 3;
+		} accel;
+		struct {
+			uint8_t pwr_mode : 2;
+			uint8_t fs : 4;
+			uint8_t odr : 4;
+			uint8_t lpf : 3;
+		} gyro;
+		uint16_t fifo_watermark;
+	} settings;
+	struct gpio_dt_spec int_gpio;
+};
+
+static inline void icm45686_accel_ms(uint8_t fs,
+				     int32_t in,
+				     bool high_res,
+				     int32_t *out_ms,
+				     int32_t *out_ums)
+{
+	int64_t sensitivity;
+	uint64_t full_scale_range_lsb = high_res ? 524288 : 32768;
+
+	switch (fs) {
+	case ICM45686_DT_ACCEL_FS_32:
+		sensitivity = full_scale_range_lsb / 32;
+		break;
+	case ICM45686_DT_ACCEL_FS_16:
+		sensitivity = full_scale_range_lsb / 16;
+		break;
+	case ICM45686_DT_ACCEL_FS_8:
+		sensitivity = full_scale_range_lsb / 8;
+		break;
+	case ICM45686_DT_ACCEL_FS_4:
+		sensitivity = full_scale_range_lsb / 4;
+		break;
+	case ICM45686_DT_ACCEL_FS_2:
+		sensitivity = full_scale_range_lsb / 2;
+		break;
+	default:
+		CODE_UNREACHABLE;
+	}
+
+	/* Convert to micrometers/s^2 */
+	int64_t in_ms = in * SENSOR_G;
+
+	/* meters/s^2 whole values */
+	*out_ms = in_ms / (sensitivity * 1000000LL);
+
+	/* micrometers/s^2 */
+	*out_ums = (in_ms - (*out_ms * sensitivity * 1000000LL)) / sensitivity;
+}
+
+static inline void icm45686_gyro_rads(uint8_t fs,
+				      int32_t in,
+				      bool high_res,
+				      int32_t *out_rads,
+				      int32_t *out_urads)
+{
+	int64_t sensitivity_x10;
+	uint64_t full_scale_range_lsb = high_res ? 524288 : 32768;
+
+	switch (fs) {
+	case ICM45686_DT_GYRO_FS_4000:
+		sensitivity_x10 = full_scale_range_lsb * 10 / 4000;
+		break;
+	case ICM45686_DT_GYRO_FS_2000:
+		sensitivity_x10 = full_scale_range_lsb * 10 / 2000;
+		break;
+	case ICM45686_DT_GYRO_FS_1000:
+		sensitivity_x10 = full_scale_range_lsb * 10 / 1000;
+		break;
+	case ICM45686_DT_GYRO_FS_500:
+		sensitivity_x10 = full_scale_range_lsb * 10 / 500;
+		break;
+	case ICM45686_DT_GYRO_FS_250:
+		sensitivity_x10 = full_scale_range_lsb * 10 / 250;
+		break;
+	case ICM45686_DT_GYRO_FS_125:
+		sensitivity_x10 = full_scale_range_lsb * 10 / 125;
+		break;
+	case ICM45686_DT_GYRO_FS_62_5:
+		sensitivity_x10 = full_scale_range_lsb * 10 * 10 / 625;
+		break;
+	case ICM45686_DT_GYRO_FS_31_25:
+		sensitivity_x10 = full_scale_range_lsb * 10 * 100 / 3125;
+		break;
+	case ICM45686_DT_GYRO_FS_15_625:
+		sensitivity_x10 = full_scale_range_lsb * 10 * 1000 / 15625;
+		break;
+	default:
+		CODE_UNREACHABLE;
+	}
+
+	int64_t in10_rads = (int64_t)in * SENSOR_PI * 10LL;
+
+	/* Whole rad/s */
+	*out_rads = in10_rads / (sensitivity_x10 * 180LL * 1000000LL);
+
+	/* microrad/s */
+	*out_urads = (in10_rads - (*out_rads * sensitivity_x10 * 180LL * 1000000LL)) /
+		     (sensitivity_x10 * 180LL);
+}
+
+static inline void icm45686_temp_c(int32_t in, int32_t *out_c, uint32_t *out_uc)
+{
+	int64_t sensitivity = 13248; /* value equivalent for x100 1c */
+
+	/* Offset by 25 degrees Celsius */
+	int64_t in100 = (in * 100) + (25 * sensitivity);
+
+	/* Whole celsius */
+	*out_c = in100 / sensitivity;
+
+	/* Micro celsius */
+	*out_uc = ((in100 - (*out_c) * sensitivity) * INT64_C(1000000)) / sensitivity;
+}
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_ICM45686_H_ */
diff --git a/drivers/sensor/tdk/icm45686/icm45686_bus.h b/drivers/sensor/tdk/icm45686/icm45686_bus.h
new file mode 100644
index 0000000000000..a43fb82a137c3
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_bus.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_ICM45686_BUS_H_
+#define ZEPHYR_DRIVERS_SENSOR_ICM45686_BUS_H_
+
+#include <stdint.h>
+#include <zephyr/rtio/rtio.h>
+
+#include "icm45686.h"
+#include "icm45686_reg.h"
+
+static inline int icm45686_bus_read(const struct device *dev,
+				    uint8_t reg,
+				    uint8_t *buf,
+				    uint16_t len)
+{
+	struct icm45686_data *data = dev->data;
+	struct rtio *ctx = data->rtio.ctx;
+	struct rtio_iodev *iodev = data->rtio.iodev;
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_cqe *cqe;
+	int err;
+
+	if (!write_sqe || !read_sqe) {
+		return -ENOMEM;
+	}
+
+	reg = reg | REG_SPI_READ_BIT;
+
+	rtio_sqe_prep_write(write_sqe, iodev, RTIO_PRIO_HIGH, &reg, 1, NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_read(read_sqe, iodev, RTIO_PRIO_HIGH, buf, len, NULL);
+
+	err = rtio_submit(ctx, 2);
+	if (err) {
+		return err;
+	}
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	return err;
+}
+
+static inline int icm45686_bus_write(const struct device *dev,
+				     uint8_t reg,
+				     const uint8_t *buf,
+				     uint16_t len)
+{
+	struct icm45686_data *data = dev->data;
+	struct rtio *ctx = data->rtio.ctx;
+	struct rtio_iodev *iodev = data->rtio.iodev;
+	struct rtio_sqe *write_reg_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_sqe *write_buf_sqe = rtio_sqe_acquire(ctx);
+	struct rtio_cqe *cqe;
+	int err;
+
+	if (!write_reg_sqe || !write_buf_sqe) {
+		return -ENOMEM;
+	}
+
+	rtio_sqe_prep_write(write_reg_sqe, iodev, RTIO_PRIO_HIGH, &reg, 1, NULL);
+	write_reg_sqe->flags |= RTIO_SQE_TRANSACTION;
+	rtio_sqe_prep_write(write_buf_sqe, iodev, RTIO_PRIO_HIGH, buf, len, NULL);
+
+	err = rtio_submit(ctx, 2);
+	if (err) {
+		return err;
+	}
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	return err;
+}
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_ICM45686_BUS_H_ */
diff --git a/drivers/sensor/tdk/icm45686/icm45686_decoder.c b/drivers/sensor/tdk/icm45686/icm45686_decoder.c
new file mode 100644
index 0000000000000..5905e8a68a25f
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_decoder.c
@@ -0,0 +1,591 @@
+/*
+ * Copyright (c) 2023 Google LLC
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/sensor_clock.h>
+
+#include "icm45686.h"
+#include "icm45686_reg.h"
+#include "icm45686_decoder.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(ICM45686_DECODER, CONFIG_SENSOR_LOG_LEVEL);
+
+#define DT_DRV_COMPAT invensense_icm45686
+
+static int icm45686_get_shift(enum sensor_channel channel,
+			      int accel_fs,
+			      int gyro_fs,
+			      int8_t *shift)
+{
+	switch (channel) {
+	case SENSOR_CHAN_ACCEL_XYZ:
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+		switch (accel_fs) {
+		case ICM45686_DT_ACCEL_FS_32:
+			*shift = 9;
+			return 0;
+		case ICM45686_DT_ACCEL_FS_16:
+			*shift = 8;
+			return 0;
+		case ICM45686_DT_ACCEL_FS_8:
+			*shift = 7;
+			return 0;
+		case ICM45686_DT_ACCEL_FS_4:
+			*shift = 6;
+			return 0;
+		case ICM45686_DT_ACCEL_FS_2:
+			*shift = 5;
+			return 0;
+		default:
+			return -EINVAL;
+		}
+	case SENSOR_CHAN_GYRO_XYZ:
+	case SENSOR_CHAN_GYRO_X:
+	case SENSOR_CHAN_GYRO_Y:
+	case SENSOR_CHAN_GYRO_Z:
+		switch (gyro_fs) {
+		case ICM45686_DT_GYRO_FS_4000:
+			*shift = 12;
+			return 0;
+		case ICM45686_DT_GYRO_FS_2000:
+			*shift = 11;
+			return 0;
+		case ICM45686_DT_GYRO_FS_1000:
+			*shift = 10;
+			return 0;
+		case ICM45686_DT_GYRO_FS_500:
+			*shift = 9;
+			return 0;
+		case ICM45686_DT_GYRO_FS_250:
+			*shift = 8;
+			return 0;
+		case ICM45686_DT_GYRO_FS_125:
+			*shift = 7;
+			return 0;
+		case ICM45686_DT_GYRO_FS_62_5:
+			*shift = 6;
+			return 0;
+		case ICM45686_DT_GYRO_FS_31_25:
+			*shift = 5;
+			return 0;
+		default:
+			return -EINVAL;
+		}
+	case SENSOR_CHAN_DIE_TEMP:
+		*shift = 9;
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
+
+int icm45686_convert_raw_to_q31(struct icm45686_encoded_data *edata,
+				enum sensor_channel chan,
+				int32_t reading,
+				q31_t *out)
+{
+	int32_t whole;
+	int32_t fraction;
+	int64_t intermediate;
+	int8_t shift;
+	int rc;
+
+	rc = icm45686_get_shift(chan, edata->header.accel_fs, edata->header.gyro_fs, &shift);
+	if (rc != 0) {
+		return rc;
+	}
+
+	switch (chan) {
+	case SENSOR_CHAN_ACCEL_XYZ:
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+		icm45686_accel_ms(edata->header.accel_fs, reading, false, &whole, &fraction);
+		break;
+	case SENSOR_CHAN_GYRO_XYZ:
+	case SENSOR_CHAN_GYRO_X:
+	case SENSOR_CHAN_GYRO_Y:
+	case SENSOR_CHAN_GYRO_Z:
+		icm45686_gyro_rads(edata->header.gyro_fs, reading, false, &whole, &fraction);
+		break;
+	case SENSOR_CHAN_DIE_TEMP:
+		icm45686_temp_c(reading, &whole, &fraction);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	intermediate = ((int64_t)whole * INT64_C(1000000) + fraction);
+	if (shift < 0) {
+		intermediate =
+			intermediate * ((int64_t)INT32_MAX + 1) * (1 << -shift) / INT64_C(1000000);
+	} else if (shift > 0) {
+		intermediate =
+			intermediate * ((int64_t)INT32_MAX + 1) / ((1 << shift) * INT64_C(1000000));
+	}
+	*out = CLAMP(intermediate, INT32_MIN, INT32_MAX);
+
+	return 0;
+}
+
+static int icm45686_get_channel_position(enum sensor_channel chan)
+{
+	switch (chan) {
+	case SENSOR_CHAN_ACCEL_XYZ:
+	case SENSOR_CHAN_ACCEL_X:
+		return offsetof(struct icm45686_encoded_payload, accel.x) / sizeof(int16_t);
+	case SENSOR_CHAN_ACCEL_Y:
+		return offsetof(struct icm45686_encoded_payload, accel.y) / sizeof(int16_t);
+	case SENSOR_CHAN_ACCEL_Z:
+		return offsetof(struct icm45686_encoded_payload, accel.z) / sizeof(int16_t);
+	case SENSOR_CHAN_GYRO_XYZ:
+	case SENSOR_CHAN_GYRO_X:
+		return offsetof(struct icm45686_encoded_payload, gyro.x) / sizeof(int16_t);
+	case SENSOR_CHAN_GYRO_Y:
+		return offsetof(struct icm45686_encoded_payload, gyro.y) / sizeof(int16_t);
+	case SENSOR_CHAN_GYRO_Z:
+		return offsetof(struct icm45686_encoded_payload, gyro.z) / sizeof(int16_t);
+	case SENSOR_CHAN_DIE_TEMP:
+		return offsetof(struct icm45686_encoded_payload, temp) / sizeof(int16_t);
+	default:
+		return 0;
+	}
+}
+
+static uint8_t icm45686_encode_channel(enum sensor_channel chan)
+{
+	uint8_t encode_bmask = 0;
+
+	switch (chan) {
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+	case SENSOR_CHAN_GYRO_X:
+	case SENSOR_CHAN_GYRO_Y:
+	case SENSOR_CHAN_GYRO_Z:
+	case SENSOR_CHAN_DIE_TEMP:
+		encode_bmask = BIT(icm45686_get_channel_position(chan));
+		break;
+	case SENSOR_CHAN_ACCEL_XYZ:
+		encode_bmask = BIT(icm45686_get_channel_position(SENSOR_CHAN_ACCEL_X)) |
+			       BIT(icm45686_get_channel_position(SENSOR_CHAN_ACCEL_Y)) |
+			       BIT(icm45686_get_channel_position(SENSOR_CHAN_ACCEL_Z));
+		break;
+	case SENSOR_CHAN_GYRO_XYZ:
+		encode_bmask = BIT(icm45686_get_channel_position(SENSOR_CHAN_GYRO_X)) |
+			       BIT(icm45686_get_channel_position(SENSOR_CHAN_GYRO_Y)) |
+			       BIT(icm45686_get_channel_position(SENSOR_CHAN_GYRO_Z));
+		break;
+	default:
+		break;
+	}
+
+	return encode_bmask;
+}
+
+int icm45686_encode(const struct device *dev,
+		    const struct sensor_chan_spec *const channels,
+		    const size_t num_channels,
+		    uint8_t *buf)
+{
+	struct icm45686_encoded_data *edata = (struct icm45686_encoded_data *)buf;
+	const struct icm45686_config *dev_config = dev->config;
+	uint64_t cycles;
+	int err;
+
+	edata->header.channels = 0;
+
+	for (size_t i = 0 ; i < num_channels ; i++) {
+		edata->header.channels |= icm45686_encode_channel(channels[i].chan_type);
+	}
+
+	err = sensor_clock_get_cycles(&cycles);
+	if (err != 0) {
+		return err;
+	}
+
+	edata->header.events = 0;
+	edata->header.accel_fs = dev_config->settings.accel.fs;
+	edata->header.gyro_fs = dev_config->settings.gyro.fs;
+	edata->header.timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	return 0;
+}
+
+static int icm45686_decoder_get_frame_count(const uint8_t *buffer,
+					    struct sensor_chan_spec chan_spec,
+					    uint16_t *frame_count)
+{
+	struct icm45686_encoded_data *edata = (struct icm45686_encoded_data *)buffer;
+
+	if (chan_spec.chan_idx != 0) {
+		return -ENOTSUP;
+	}
+
+	uint8_t channel_request = icm45686_encode_channel(chan_spec.chan_type);
+
+	if ((edata->header.channels & channel_request) != channel_request) {
+		return -ENODATA;
+	}
+
+	if (!edata->header.events ||
+	    (edata->header.events & REG_INT1_STATUS0_DRDY(true))) {
+		switch (chan_spec.chan_type) {
+		case SENSOR_CHAN_ACCEL_X:
+		case SENSOR_CHAN_ACCEL_Y:
+		case SENSOR_CHAN_ACCEL_Z:
+		case SENSOR_CHAN_ACCEL_XYZ:
+		case SENSOR_CHAN_GYRO_X:
+		case SENSOR_CHAN_GYRO_Y:
+		case SENSOR_CHAN_GYRO_Z:
+		case SENSOR_CHAN_GYRO_XYZ:
+		case SENSOR_CHAN_DIE_TEMP:
+			*frame_count = 1;
+			return 0;
+		default:
+			return -ENOTSUP;
+		}
+	}
+
+	if (edata->header.events & REG_INT1_STATUS0_FIFO_THS(true) ||
+	    edata->header.events & REG_INT1_STATUS0_FIFO_FULL(true)) {
+		switch (chan_spec.chan_type) {
+		case SENSOR_CHAN_ACCEL_XYZ:
+		case SENSOR_CHAN_GYRO_XYZ:
+		case SENSOR_CHAN_DIE_TEMP:
+			*frame_count = edata->header.fifo_count;
+			return 0;
+		/** We're skipping individual axis for fifo packets */
+		default:
+			return -ENOTSUP;
+		}
+	}
+
+	return -1;
+}
+
+static int icm45686_decoder_get_size_info(struct sensor_chan_spec chan_spec,
+					  size_t *base_size,
+					  size_t *frame_size)
+{
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_ACCEL_XYZ:
+	case SENSOR_CHAN_GYRO_XYZ:
+		*base_size = sizeof(struct sensor_three_axis_data);
+		*frame_size = sizeof(struct sensor_three_axis_sample_data);
+		return 0;
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+	case SENSOR_CHAN_GYRO_X:
+	case SENSOR_CHAN_GYRO_Y:
+	case SENSOR_CHAN_GYRO_Z:
+	case SENSOR_CHAN_DIE_TEMP:
+		*base_size = sizeof(struct sensor_q31_data);
+		*frame_size = sizeof(struct sensor_q31_sample_data);
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int icm45686_one_shot_decode(const uint8_t *buffer,
+				    struct sensor_chan_spec chan_spec,
+				    uint32_t *fit,
+				    uint16_t max_count,
+				    void *data_out)
+{
+	struct icm45686_encoded_data *edata = (struct icm45686_encoded_data *)buffer;
+	uint8_t channel_request;
+	int err;
+
+	if (*fit != 0) {
+		return 0;
+	}
+
+	if (max_count == 0 || chan_spec.chan_idx != 0) {
+		return -EINVAL;
+	}
+
+	switch (chan_spec.chan_type) {
+	case SENSOR_CHAN_ACCEL_X:
+	case SENSOR_CHAN_ACCEL_Y:
+	case SENSOR_CHAN_ACCEL_Z:
+	case SENSOR_CHAN_GYRO_X:
+	case SENSOR_CHAN_GYRO_Y:
+	case SENSOR_CHAN_GYRO_Z:
+	case SENSOR_CHAN_DIE_TEMP: {
+		channel_request = icm45686_encode_channel(chan_spec.chan_type);
+		if ((channel_request & edata->header.channels) != channel_request) {
+			return -ENODATA;
+		}
+
+		struct sensor_q31_data *out = data_out;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+
+		err = icm45686_get_shift(chan_spec.chan_type,
+					 edata->header.accel_fs,
+					 edata->header.gyro_fs,
+					 &out->shift);
+		if (err != 0) {
+			return -EINVAL;
+		}
+
+		icm45686_convert_raw_to_q31(
+			edata,
+			chan_spec.chan_type,
+			edata->payload.readings[icm45686_get_channel_position(chan_spec.chan_type)],
+			&out->readings[0].value);
+		*fit = 1;
+		return 1;
+	}
+	case SENSOR_CHAN_ACCEL_XYZ:
+	case SENSOR_CHAN_GYRO_XYZ: {
+		channel_request = icm45686_encode_channel(chan_spec.chan_type);
+		if ((channel_request & edata->header.channels) != channel_request) {
+			return -ENODATA;
+		}
+
+		struct sensor_three_axis_data *out = data_out;
+		struct icm45686_encoded_payload *payload = &edata->payload;
+
+		out->header.base_timestamp_ns = edata->header.timestamp;
+		out->header.reading_count = 1;
+
+		icm45686_convert_raw_to_q31(
+			edata,
+			chan_spec.chan_type - 3,
+			payload->readings[icm45686_get_channel_position(chan_spec.chan_type - 3)],
+			&out->readings[0].x);
+		icm45686_convert_raw_to_q31(
+			edata,
+			chan_spec.chan_type - 2,
+			payload->readings[icm45686_get_channel_position(chan_spec.chan_type - 2)],
+			&out->readings[0].y);
+		icm45686_convert_raw_to_q31(
+			edata,
+			chan_spec.chan_type - 1,
+			payload->readings[icm45686_get_channel_position(chan_spec.chan_type - 1)],
+			&out->readings[0].z);
+		*fit = 1;
+		return 1;
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
+static q31_t icm45686_fifo_read_temp_from_packet(const uint8_t *pkt)
+{
+	struct icm45686_encoded_fifo_payload *fdata = (struct icm45686_encoded_fifo_payload *)pkt;
+
+	int32_t whole;
+	uint32_t fraction;
+	int64_t intermediate;
+	int8_t shift;
+	int err;
+
+	err = icm45686_get_shift(SENSOR_CHAN_DIE_TEMP, 0, 0, &shift);
+	if (err != 0) {
+		return -1;
+	}
+
+	icm45686_temp_c(fdata->temp, &whole, &fraction);
+
+	intermediate = ((int64_t)whole * INT64_C(1000000) + fraction);
+	if (shift < 0) {
+		intermediate =
+			intermediate * ((int64_t)INT32_MAX + 1) * (1 << -shift) / INT64_C(1000000);
+	} else if (shift > 0) {
+		intermediate =
+			intermediate * ((int64_t)INT32_MAX + 1) / ((1 << shift) * INT64_C(1000000));
+	}
+
+	return CLAMP(intermediate, INT32_MIN, INT32_MAX);
+}
+
+static int icm45686_fifo_read_imu_from_packet(const uint8_t *pkt,
+					      bool is_accel,
+					      uint8_t axis_offset,
+					      q31_t *out)
+{
+	uint32_t unsigned_value;
+	int32_t signed_value;
+	int offset = 1 + (axis_offset * 2)  + (is_accel ? 0 : 6);
+	uint32_t mask = is_accel ? GENMASK(7, 4) : GENMASK(3, 0);
+	uint8_t accel_fs = ICM45686_DT_ACCEL_FS_32;
+	uint8_t gyro_fs = ICM45686_DT_GYRO_FS_4000;
+
+	int32_t whole;
+	int32_t fraction;
+	int64_t intermediate;
+	int8_t shift;
+
+	unsigned_value = (pkt[offset] | (pkt[offset + 1] << 8));
+	if (unsigned_value == FIFO_NO_DATA) {
+		return -ENODATA;
+	}
+
+	unsigned_value = (unsigned_value << 4) |
+			 ((pkt[17 + axis_offset] & mask) >> (is_accel ? 4 : 0));
+	signed_value = sign_extend(unsigned_value, 19);
+
+	if (!is_accel) {
+		icm45686_get_shift(SENSOR_CHAN_GYRO_XYZ, accel_fs, gyro_fs, &shift);
+		icm45686_gyro_rads(gyro_fs, signed_value, true, &whole, &fraction);
+	} else {
+		icm45686_get_shift(SENSOR_CHAN_ACCEL_XYZ, accel_fs, gyro_fs, &shift);
+		icm45686_accel_ms(accel_fs, signed_value, true, &whole, &fraction);
+	}
+
+	intermediate = ((int64_t)whole * INT64_C(1000000) + fraction);
+	if (shift < 0) {
+		intermediate =
+			intermediate * ((int64_t)INT32_MAX + 1) * (1 << -shift) / INT64_C(1000000);
+	} else if (shift > 0) {
+		intermediate =
+			intermediate * ((int64_t)INT32_MAX + 1) / ((1 << shift) * INT64_C(1000000));
+	}
+
+	*out = CLAMP(intermediate, INT32_MIN, INT32_MAX);
+
+	return 0;
+}
+
+static int icm45686_fifo_decode(const uint8_t *buffer,
+				struct sensor_chan_spec chan_spec,
+				uint32_t *fit,
+				uint16_t max_count,
+				void *data_out)
+{
+	struct icm45686_encoded_data *edata = (struct icm45686_encoded_data *)buffer;
+	struct icm45686_encoded_fifo_payload *frame_begin = &edata->fifo_payload;
+	int count = 0;
+	int err;
+
+	if (*fit >= edata->header.fifo_count || chan_spec.chan_idx != 0) {
+		return 0;
+	}
+
+	while (count < max_count && (*fit < edata->header.fifo_count)) {
+		struct icm45686_encoded_fifo_payload *fdata = &frame_begin[*fit];
+
+		/** This driver assumes 20-byte fifo packets, with both accel and gyro,
+		 * and no auxiliary sensors.
+		 */
+		__ASSERT(!(fdata->header & FIFO_HEADER_EXT_HEADER_EN(true)) &&
+			(fdata->header & FIFO_HEADER_ACCEL_EN(true)) &&
+			(fdata->header & FIFO_HEADER_GYRO_EN(true)) &&
+			(fdata->header & FIFO_HEADER_HIRES_EN(true)),
+			"Unsupported FIFO packet format");
+
+		switch (chan_spec.chan_type) {
+		case SENSOR_CHAN_ACCEL_XYZ:
+		case SENSOR_CHAN_GYRO_XYZ: {
+			struct sensor_three_axis_data *out = data_out;
+			bool is_accel = chan_spec.chan_type == SENSOR_CHAN_ACCEL_XYZ;
+
+			icm45686_get_shift(chan_spec.chan_type,
+					   edata->header.accel_fs,
+					   edata->header.gyro_fs,
+					   &out->shift);
+
+			out->header.base_timestamp_ns = edata->header.timestamp;
+
+			err = icm45686_fifo_read_imu_from_packet((uint8_t *)fdata,
+								 is_accel,
+								 0,
+								 &out->readings[count].x);
+			err |= icm45686_fifo_read_imu_from_packet((uint8_t *)fdata,
+								  is_accel,
+								  1,
+								  &out->readings[count].y);
+			err |= icm45686_fifo_read_imu_from_packet((uint8_t *)fdata,
+								  is_accel,
+								  2,
+								  &out->readings[count].z);
+			if (err != 0) {
+				count--;
+			}
+			break;
+		}
+		case SENSOR_CHAN_DIE_TEMP: {
+			struct sensor_q31_data *out = data_out;
+
+			icm45686_get_shift(chan_spec.chan_type,
+					edata->header.accel_fs,
+					edata->header.gyro_fs,
+					&out->shift);
+
+			out->header.base_timestamp_ns = edata->header.timestamp;
+			out->readings[count].temperature =
+				icm45686_fifo_read_temp_from_packet((uint8_t *)fdata);
+			break;
+		}
+		default:
+			return 0;
+		}
+		*fit = *fit + 1;
+		count++;
+	}
+
+	return count;
+}
+
+static int icm45686_decoder_decode(const uint8_t *buffer,
+				   struct sensor_chan_spec chan_spec,
+				   uint32_t *fit,
+				   uint16_t max_count,
+				   void *data_out)
+{
+	struct icm45686_encoded_data *edata = (struct icm45686_encoded_data *)buffer;
+
+	if (edata->header.events & REG_INT1_STATUS0_FIFO_THS(true) ||
+	    edata->header.events & REG_INT1_STATUS0_FIFO_FULL(true)) {
+		return icm45686_fifo_decode(buffer, chan_spec, fit, max_count, data_out);
+	} else {
+		return icm45686_one_shot_decode(buffer, chan_spec, fit, max_count, data_out);
+	}
+}
+
+static bool icm45686_decoder_has_trigger(const uint8_t *buffer, enum sensor_trigger_type trigger)
+{
+	struct icm45686_encoded_data *edata = (struct icm45686_encoded_data *)buffer;
+
+	switch (trigger) {
+	case SENSOR_TRIG_DATA_READY:
+		return edata->header.events & REG_INT1_STATUS0_DRDY(true);
+	case SENSOR_TRIG_FIFO_WATERMARK:
+		return edata->header.events & REG_INT1_STATUS0_FIFO_THS(true);
+	case SENSOR_TRIG_FIFO_FULL:
+		return edata->header.events & REG_INT1_STATUS0_FIFO_FULL(true);
+	default:
+		break;
+	}
+
+	return false;
+}
+
+SENSOR_DECODER_API_DT_DEFINE() = {
+	.get_frame_count = icm45686_decoder_get_frame_count,
+	.get_size_info = icm45686_decoder_get_size_info,
+	.decode = icm45686_decoder_decode,
+	.has_trigger = icm45686_decoder_has_trigger,
+};
+
+int icm45686_get_decoder(const struct device *dev,
+			 const struct sensor_decoder_api **decoder)
+{
+	ARG_UNUSED(dev);
+	*decoder = &SENSOR_DECODER_NAME();
+
+	return 0;
+}
diff --git a/drivers/sensor/tdk/icm45686/icm45686_decoder.h b/drivers/sensor/tdk/icm45686/icm45686_decoder.h
new file mode 100644
index 0000000000000..bb669c842c8f6
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_decoder.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 Google LLC
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_ICM45686_DECODER_H_
+#define ZEPHYR_DRIVERS_SENSOR_ICM45686_DECODER_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/sensor.h>
+#include "icm45686.h"
+
+int icm45686_encode(const struct device *dev,
+		    const struct sensor_chan_spec *const channels,
+		    const size_t num_channels,
+		    uint8_t *buf);
+
+int icm45686_get_decoder(const struct device *dev,
+			 const struct sensor_decoder_api **decoder);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_ICM45686_DECODER_H_ */
diff --git a/drivers/sensor/tdk/icm45686/icm45686_reg.h b/drivers/sensor/tdk/icm45686/icm45686_reg.h
new file mode 100644
index 0000000000000..1b540cf999e33
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_reg.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2022 Intel Corporation
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_ICM45686_REG_H_
+#define ZEPHYR_DRIVERS_SENSOR_ICM45686_REG_H_
+
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+
+/* Address value has a read bit */
+#define REG_SPI_READ_BIT BIT(7)
+
+/* Registers */
+/* Register Bank 0 */
+#define REG_ACCEL_DATA_X1_UI			0x00
+#define REG_ACCEL_DATA_X0_UI			0x01
+#define REG_ACCEL_DATA_Y1_UI			0x02
+#define REG_ACCEL_DATA_Y0_UI			0x03
+#define REG_ACCEL_DATA_Z1_UI			0x04
+#define REG_ACCEL_DATA_Z0_UI			0x05
+#define REG_GYRO_DATA_X1_UI			0x06
+#define REG_GYRO_DATA_X0_UI			0x07
+#define REG_GYRO_DATA_Y1_UI			0x08
+#define REG_GYRO_DATA_Y0_UI			0x09
+#define REG_GYRO_DATA_Z1_UI			0x0A
+#define REG_GYRO_DATA_Z0_UI			0x0B
+#define REG_TEMP_DATA1_UI			0x0C
+#define REG_TEMP_DATA0_UI			0x0D
+#define REG_PWR_MGMT0				0x10
+#define REG_FIFO_COUNT_0			0x12
+#define REG_FIFO_COUNT_1			0x13
+#define REG_FIFO_DATA				0x14
+#define REG_INT1_CONFIG0			0x16
+#define REG_INT1_CONFIG1			0x17
+#define REG_INT1_CONFIG2			0x18
+#define REG_INT1_STATUS0			0x19
+#define REG_INT1_STATUS1			0x1A
+#define REG_ACCEL_CONFIG0			0x1B
+#define REG_GYRO_CONFIG0			0x1C
+#define REG_FIFO_CONFIG0			0x1D
+#define REG_FIFO_CONFIG1_0			0x1E
+#define REG_FIFO_CONFIG1_1			0x1F
+#define REG_FIFO_CONFIG2			0x20
+#define REG_FIFO_CONFIG3			0x21
+#define REG_FIFO_CONFIG4			0x22
+#define REG_DRIVE_CONFIG0			0x32
+#define REG_WHO_AM_I				0x72
+#define REG_IREG_ADDR_15_8			0x7C
+#define REG_IREG_ADDR_7_0			0x7D
+#define REG_IREG_DATA				0x7E
+#define REG_MISC2				0x7F
+
+/* User Bank IPREG_SYS1 - Gyro-related config settings */
+#define REG_IPREG_SYS1_OFFSET			0xA400
+#define REG_IPREG_SYS1_REG_172			0xAC
+
+/* User Bank IPREG_SYS2 - Accel-related config settings */
+#define REG_IPREG_SYS2_OFFSET			0xA500
+#define REG_IPREG_SYS2_REG_131			0x83
+
+/* Helper Macros for register manipulation */
+#define REG_PWR_MGMT0_ACCEL_MODE(val)			((val) & BIT_MASK(2))
+#define REG_PWR_MGMT0_GYRO_MODE(val)			(((val) & BIT_MASK(2)) << 2)
+
+#define REG_ACCEL_CONFIG0_ODR(val)			((val) & BIT_MASK(4))
+#define REG_ACCEL_CONFIG0_FS(val)			(((val) & BIT_MASK(3)) << 4)
+
+#define REG_GYRO_CONFIG0_ODR(val)			((val) & BIT_MASK(4))
+#define REG_GYRO_CONFIG0_FS(val)			(((val) & BIT_MASK(4)) << 4)
+
+#define REG_DRIVE_CONFIG0_SPI_SLEW(val)			(((val) & BIT_MASK(2)) << 1)
+
+#define REG_MISC2_SOFT_RST(val)				((val << 1) & BIT(1))
+
+#define REG_IPREG_SYS1_REG_172_GYRO_LPFBW_SEL(val)	(val & BIT_MASK(3))
+
+#define REG_IPREG_SYS2_REG_131_ACCEL_LPFBW_SEL(val)	(val & BIT_MASK(3))
+
+#define REG_INT1_CONFIG0_STATUS_EN_DRDY(val)		(((val) & BIT_MASK(1)) << 2)
+#define REG_INT1_CONFIG0_STATUS_EN_FIFO_THS(val)	(((val) & BIT_MASK(1)) << 1)
+#define REG_INT1_CONFIG0_STATUS_EN_FIFO_FULL(val)	((val) & BIT_MASK(1))
+
+#define REG_INT1_CONFIG2_EN_OPEN_DRAIN(val)		(((val) & BIT_MASK(1)) << 2)
+#define REG_INT1_CONFIG2_EN_LATCH_MODE(val)		(((val) & BIT_MASK(1)) << 1)
+#define REG_INT1_CONFIG2_EN_ACTIVE_HIGH(val)		((val) & BIT_MASK(1))
+
+#define REG_INT1_STATUS0_DRDY(val)			(((val) & BIT_MASK(1)) << 2)
+#define REG_INT1_STATUS0_FIFO_THS(val)			(((val) & BIT_MASK(1)) << 1)
+#define REG_INT1_STATUS0_FIFO_FULL(val)			((val) & BIT_MASK(1))
+
+#define REG_FIFO_CONFIG0_FIFO_MODE_BYPASS		0
+#define REG_FIFO_CONFIG0_FIFO_MODE_STREAM		1
+#define REG_FIFO_CONFIG0_FIFO_MODE_STOP_ON_FULL		2
+
+#define REG_FIFO_CONFIG0_FIFO_DEPTH_2K			0x07
+#define REG_FIFO_CONFIG0_FIFO_DEPTH_8K			0x1F
+
+#define REG_FIFO_CONFIG0_FIFO_MODE(val)			(((val) & BIT_MASK(2)) << 6)
+#define REG_FIFO_CONFIG0_FIFO_DEPTH(val)		((val) & BIT_MASK(6))
+
+#define REG_FIFO_CONFIG1_0_FIFO_WM_THS(val)		((val) & BIT_MASK(8))
+#define REG_FIFO_CONFIG1_1_FIFO_WM_THS(val)		(((val) >> 8) & BIT_MASK(8))
+
+#define REG_FIFO_CONFIG2_FIFO_FLUSH(val)		(((val) & BIT_MASK(1)) << 7)
+#define REG_FIFO_CONFIG2_FIFO_WM_GT_THS(val)		(((val) & BIT_MASK(1)) << 3)
+
+#define REG_FIFO_CONFIG3_FIFO_HIRES_EN(val)		(((val) & BIT_MASK(1)) << 3)
+#define REG_FIFO_CONFIG3_FIFO_GYRO_EN(val)		(((val) & BIT_MASK(1)) << 2)
+#define REG_FIFO_CONFIG3_FIFO_ACCEL_EN(val)		(((val) & BIT_MASK(1)) << 1)
+#define REG_FIFO_CONFIG3_FIFO_EN(val)			((val) & BIT_MASK(1))
+
+/* Misc. Defines */
+#define WHO_AM_I_ICM45686 0xE9
+
+#define REG_IREG_PREPARE_WRITE_ARRAY(base, reg, val)	{((base) >> 8) & 0xFF, reg, val}
+
+#define FIFO_HEADER_EXT_HEADER_EN(val)			(((val) & BIT_MASK(1)) << 7)
+#define FIFO_HEADER_ACCEL_EN(val)			(((val) & BIT_MASK(1)) << 6)
+#define FIFO_HEADER_GYRO_EN(val)			(((val) & BIT_MASK(1)) << 5)
+#define FIFO_HEADER_HIRES_EN(val)			(((val) & BIT_MASK(1)) << 4)
+
+#define FIFO_NO_DATA					0x8000
+#define FIFO_COUNT_MAX_HIGH_RES				104
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_ICM45686_REG_H_ */
diff --git a/drivers/sensor/tdk/icm45686/icm45686_stream.c b/drivers/sensor/tdk/icm45686/icm45686_stream.c
new file mode 100644
index 0000000000000..b5565ec5120ec
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_stream.c
@@ -0,0 +1,645 @@
+/*
+ * Copyright (c) 2023 Google LLC
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor_clock.h>
+#include <zephyr/rtio/rtio.h>
+#include <zephyr/sys/atomic.h>
+
+#include "icm45686.h"
+#include "icm45686_bus.h"
+#include "icm45686_stream.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(ICM45686_STREAM, CONFIG_SENSOR_LOG_LEVEL);
+
+static struct sensor_stream_trigger *get_read_config_trigger(const struct sensor_read_config *cfg,
+							     enum sensor_trigger_type trig)
+{
+	for (int i = 0; i < cfg->count; ++i) {
+		if (cfg->triggers[i].trigger == trig) {
+			return &cfg->triggers[i];
+		}
+	}
+	LOG_DBG("Unsupported trigger (%d)", trig);
+	return NULL;
+}
+
+static inline bool should_flush_fifo(const struct sensor_read_config *read_cfg,
+				     uint8_t int_status)
+{
+	struct sensor_stream_trigger *trig_fifo_ths = get_read_config_trigger(
+		read_cfg,
+		SENSOR_TRIG_FIFO_WATERMARK);
+	struct sensor_stream_trigger *trig_fifo_full = get_read_config_trigger(
+		read_cfg,
+		SENSOR_TRIG_FIFO_FULL);
+
+	bool fifo_ths = int_status & REG_INT1_STATUS0_FIFO_THS(true);
+	bool fifo_full = int_status & REG_INT1_STATUS0_FIFO_FULL(true);
+
+	if ((trig_fifo_ths && trig_fifo_ths->opt == SENSOR_STREAM_DATA_DROP && fifo_ths) ||
+	    (trig_fifo_full && trig_fifo_full->opt == SENSOR_STREAM_DATA_DROP && fifo_full)) {
+		return true;
+	}
+
+	return false;
+}
+
+static inline bool should_read_fifo(const struct sensor_read_config *read_cfg,
+				    uint8_t int_status)
+{
+	struct sensor_stream_trigger *trig_fifo_ths = get_read_config_trigger(
+		read_cfg,
+		SENSOR_TRIG_FIFO_WATERMARK);
+	struct sensor_stream_trigger *trig_fifo_full = get_read_config_trigger(
+		read_cfg,
+		SENSOR_TRIG_FIFO_FULL);
+
+	bool fifo_ths = int_status & REG_INT1_STATUS0_FIFO_THS(true);
+	bool fifo_full = int_status & REG_INT1_STATUS0_FIFO_FULL(true);
+
+	if ((trig_fifo_ths && trig_fifo_ths->opt == SENSOR_STREAM_DATA_INCLUDE && fifo_ths) ||
+	    (trig_fifo_full && trig_fifo_full->opt == SENSOR_STREAM_DATA_INCLUDE && fifo_full)) {
+		return true;
+	}
+
+	return false;
+}
+
+static inline bool should_read_data(const struct sensor_read_config *read_cfg,
+				    uint8_t int_status)
+{
+	struct sensor_stream_trigger *trig_drdy = get_read_config_trigger(
+		read_cfg,
+		SENSOR_TRIG_DATA_READY);
+
+	bool drdy = int_status & REG_INT1_STATUS0_DRDY(true);
+
+	if (trig_drdy && trig_drdy->opt == SENSOR_STREAM_DATA_INCLUDE && drdy) {
+		return true;
+	}
+
+	return false;
+}
+
+static void icm45686_complete_result(struct rtio *ctx,
+				     const struct rtio_sqe *sqe,
+				     void *arg)
+{
+	const struct device *dev = (const struct device *)arg;
+	struct icm45686_data *data = dev->data;
+
+	struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+	memset(&data->stream.data, 0, sizeof(data->stream.data));
+
+	rtio_iodev_sqe_ok(iodev_sqe, 0);
+}
+
+static void icm45686_handle_event_actions(struct rtio *ctx,
+					  const struct rtio_sqe *sqe,
+					  void *arg)
+{
+	const struct device *dev = (const struct device *)arg;
+	struct icm45686_data *data = dev->data;
+	const struct sensor_read_config *read_cfg = data->stream.iodev_sqe->sqe.iodev->data;
+	uint8_t int_status = data->stream.data.int_status;
+	int err;
+
+	data->stream.data.events.drdy = int_status & REG_INT1_STATUS0_DRDY(true);
+	data->stream.data.events.fifo_ths = int_status & REG_INT1_STATUS0_FIFO_THS(true);
+	data->stream.data.events.fifo_full = int_status & REG_INT1_STATUS0_FIFO_FULL(true);
+
+	__ASSERT(data->stream.data.fifo_count > 0 &&
+		 data->stream.data.fifo_count <= FIFO_COUNT_MAX_HIGH_RES,
+		 "Invalid fifo count: %d", data->stream.data.fifo_count);
+
+	struct icm45686_encoded_data *buf;
+	uint32_t buf_len;
+	uint32_t buf_len_required = sizeof(struct icm45686_encoded_header);
+
+	/** We just need the header to communicate the events occurred during
+	 * this SQE. Only include more data if the associated trigger needs it.
+	 */
+	if (should_read_fifo(read_cfg, int_status)) {
+		buf_len_required += (data->stream.data.fifo_count *
+				     sizeof(struct icm45686_encoded_fifo_payload));
+	} else if (should_read_data(read_cfg, int_status)) {
+		buf_len_required += sizeof(struct icm45686_encoded_payload);
+	}
+
+	err = rtio_sqe_rx_buf(data->stream.iodev_sqe,
+			      buf_len_required,
+			      buf_len_required,
+			      (uint8_t **)&buf,
+			      &buf_len);
+	__ASSERT(err == 0, "Failed to acquire buffer (len: %d) for encoded data: %d. "
+			   "Please revisit RTIO queue sizing and look for "
+			   "bottlenecks during sensor data processing",
+			   buf_len_required, err);
+
+	/** Still throw an error even if asserts are off */
+	if (err) {
+		struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+		LOG_ERR("Failed to acquire buffer for encoded data: %d", err);
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	LOG_DBG("Alloc buf - required: %d, alloc: %d", buf_len_required, buf_len);
+
+	buf->header.timestamp = data->stream.data.timestamp;
+	buf->header.fifo_count = 0;
+	buf->header.channels = 0;
+	buf->header.events = REG_INT1_STATUS0_DRDY(data->stream.data.events.drdy) |
+			     REG_INT1_STATUS0_FIFO_THS(data->stream.data.events.fifo_ths) |
+			     REG_INT1_STATUS0_FIFO_FULL(data->stream.data.events.fifo_full);
+
+	if (should_read_fifo(read_cfg, int_status)) {
+
+		struct rtio_sqe *data_wr_sqe = rtio_sqe_acquire(ctx);
+		struct rtio_sqe *data_rd_sqe = rtio_sqe_acquire(ctx);
+		uint8_t read_reg;
+
+		if (!data_wr_sqe || !data_rd_sqe) {
+			struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+			LOG_ERR("Failed to acquire RTIO SQEs");
+
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+			return;
+		}
+
+		/** In FIFO data, the scale is fixed, irrespective of
+		 * the configured settings.
+		 */
+		buf->header.accel_fs = ICM45686_DT_ACCEL_FS_32;
+		buf->header.gyro_fs = ICM45686_DT_GYRO_FS_4000;
+		buf->header.channels = 0x7F; /* Signal all channels are available */
+		buf->header.fifo_count = data->stream.data.fifo_count;
+
+		read_reg = REG_FIFO_DATA | REG_SPI_READ_BIT;
+		rtio_sqe_prep_tiny_write(data_wr_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 &read_reg,
+					 1,
+					 NULL);
+		data_wr_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+		rtio_sqe_prep_read(data_rd_sqe,
+				   data->rtio.iodev,
+				   RTIO_PRIO_HIGH,
+				   (uint8_t *)&buf->fifo_payload,
+				   (buf->header.fifo_count *
+				   sizeof(struct icm45686_encoded_fifo_payload)),
+				   NULL);
+		data_rd_sqe->flags |= RTIO_SQE_CHAINED;
+
+	} else if (should_flush_fifo(read_cfg, int_status)) {
+
+		struct rtio_sqe *write_sqe = rtio_sqe_acquire(ctx);
+
+		if (!write_sqe) {
+			struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+			LOG_ERR("Failed to acquire RTIO SQE");
+
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+			return;
+		}
+
+		uint8_t write_reg[] = {
+			REG_FIFO_CONFIG2,
+			REG_FIFO_CONFIG2_FIFO_FLUSH(true) |
+			REG_FIFO_CONFIG2_FIFO_WM_GT_THS(true)
+		};
+
+		rtio_sqe_prep_tiny_write(write_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 write_reg,
+					 sizeof(write_reg),
+					 NULL);
+		write_sqe->flags |= RTIO_SQE_CHAINED;
+
+	} else if (should_read_data(read_cfg, int_status)) {
+
+		buf->header.accel_fs = data->edata.header.accel_fs;
+		buf->header.gyro_fs = data->edata.header.gyro_fs;
+		buf->header.channels = 0x7F; /* Signal all channels are available */
+
+		struct rtio_sqe *write_sqe = rtio_sqe_acquire(ctx);
+		struct rtio_sqe *read_sqe = rtio_sqe_acquire(ctx);
+
+		if (!write_sqe || !read_sqe) {
+			struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+			LOG_ERR("Failed to acquire RTIO SQEs");
+
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+			return;
+		}
+
+		uint8_t read_reg = REG_ACCEL_DATA_X1_UI | REG_SPI_READ_BIT;
+
+		rtio_sqe_prep_tiny_write(write_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 &read_reg,
+					 1,
+					 NULL);
+		write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+		rtio_sqe_prep_read(read_sqe,
+				   data->rtio.iodev,
+				   RTIO_PRIO_HIGH,
+				   buf->payload.buf,
+				   sizeof(buf->payload.buf),
+				   NULL);
+		read_sqe->flags |= RTIO_SQE_CHAINED;
+	}
+
+	struct rtio_cqe *cqe;
+
+	do {
+		cqe = rtio_cqe_consume(ctx);
+		if (cqe != NULL) {
+			err = cqe->result;
+			rtio_cqe_release(ctx, cqe);
+		}
+	} while (cqe != NULL);
+
+	struct rtio_sqe *cb_sqe = rtio_sqe_acquire(ctx);
+
+	if (!cb_sqe) {
+		LOG_ERR("Failed to acquire RTIO SQE for completion callback");
+		rtio_iodev_sqe_err(data->stream.iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	rtio_sqe_prep_callback_no_cqe(cb_sqe,
+				      icm45686_complete_result,
+				      (void *)dev,
+				      data->stream.iodev_sqe);
+
+	rtio_submit(ctx, 0);
+}
+
+static void icm45686_event_handler(const struct device *dev)
+{
+	struct icm45686_data *data = dev->data;
+	uint8_t val = 0;
+	uint64_t cycles;
+	int err;
+
+	if (!data->stream.iodev_sqe ||
+	    FIELD_GET(RTIO_SQE_CANCELED, data->stream.iodev_sqe->sqe.flags)) {
+		LOG_WRN("Callback triggered with no streaming submission - Disabling interrupts");
+
+		struct rtio_sqe *write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+		uint8_t wr_data[] = {REG_INT1_CONFIG0, 0x00};
+
+		rtio_sqe_prep_tiny_write(write_sqe,
+					 data->rtio.iodev,
+					 RTIO_PRIO_HIGH,
+					 wr_data,
+					 sizeof(wr_data),
+					 NULL);
+		rtio_submit(data->rtio.ctx, 0);
+
+		data->stream.settings.enabled.drdy = false;
+		data->stream.settings.enabled.fifo_ths = false;
+		data->stream.settings.enabled.fifo_full = false;
+		return;
+	} else if (!atomic_cas(&data->stream.in_progress, 0, 1)) {
+		/** There's an on-going */
+		return;
+	}
+
+	err = sensor_clock_get_cycles(&cycles);
+	if (err) {
+		struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+		LOG_ERR("Failed to get timestamp: %d", err);
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(iodev_sqe, err);
+		return;
+	}
+
+	data->stream.data.timestamp = sensor_clock_cycles_to_ns(cycles);
+
+	/** Prepare an asynchronous read of the INT status register */
+	struct rtio_sqe *write_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *write_fifo_ct_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *read_fifo_ct_sqe = rtio_sqe_acquire(data->rtio.ctx);
+	struct rtio_sqe *complete_sqe = rtio_sqe_acquire(data->rtio.ctx);
+
+	if (!write_sqe || !read_sqe || !complete_sqe) {
+		struct rtio_iodev_sqe *iodev_sqe = data->stream.iodev_sqe;
+
+		LOG_ERR("Failed to acquire RTIO SQEs");
+
+		data->stream.iodev_sqe = NULL;
+		rtio_iodev_sqe_err(iodev_sqe, -ENOMEM);
+		return;
+	}
+
+	/** Directly read Status Register to determine what triggered the event */
+	val = REG_INT1_STATUS0 | REG_SPI_READ_BIT;
+	rtio_sqe_prep_tiny_write(write_sqe,
+				 data->rtio.iodev,
+				 RTIO_PRIO_HIGH,
+				 &val,
+				 1,
+				 NULL);
+	write_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_sqe,
+			   data->rtio.iodev,
+			   RTIO_PRIO_HIGH,
+			   &data->stream.data.int_status,
+			   1,
+			   NULL);
+	read_sqe->flags |= RTIO_SQE_CHAINED;
+
+	/** Preemptively read FIFO count so we can decide on the next callback
+	 * how much FIFO data we'd read (if needed).
+	 */
+	val = REG_FIFO_COUNT_0 | REG_SPI_READ_BIT;
+	rtio_sqe_prep_tiny_write(write_fifo_ct_sqe,
+				 data->rtio.iodev,
+				 RTIO_PRIO_HIGH,
+				 &val,
+				 1,
+				 NULL);
+	write_fifo_ct_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	rtio_sqe_prep_read(read_fifo_ct_sqe,
+			   data->rtio.iodev,
+			   RTIO_PRIO_HIGH,
+			   (uint8_t *)&data->stream.data.fifo_count,
+			   2,
+			   NULL);
+	read_fifo_ct_sqe->flags |= RTIO_SQE_CHAINED;
+
+	rtio_sqe_prep_callback_no_cqe(complete_sqe,
+				      icm45686_handle_event_actions,
+				      (void *)dev,
+				      data->stream.iodev_sqe);
+
+	rtio_submit(data->rtio.ctx, 0);
+}
+
+static void icm45686_gpio_callback(const struct device *gpio_dev,
+				   struct gpio_callback *cb,
+				   uint32_t pins)
+{
+	struct icm45686_stream *stream = CONTAINER_OF(cb,
+						      struct icm45686_stream,
+						      cb);
+	const struct device *dev = stream->dev;
+
+	icm45686_event_handler(dev);
+}
+
+static inline bool settings_changed(const struct icm45686_stream *a,
+				    const struct icm45686_stream *b)
+{
+	return (a->settings.enabled.drdy != b->settings.enabled.drdy) ||
+	       (a->settings.opt.drdy != b->settings.opt.drdy) ||
+	       (a->settings.enabled.fifo_ths != b->settings.enabled.fifo_ths) ||
+	       (a->settings.opt.fifo_ths != b->settings.opt.fifo_ths) ||
+	       (a->settings.enabled.fifo_full != b->settings.enabled.fifo_full) ||
+	       (a->settings.opt.fifo_full != b->settings.opt.fifo_full);
+}
+
+void icm45686_stream_submit(const struct device *dev,
+			    struct rtio_iodev_sqe *iodev_sqe)
+{
+	const struct sensor_read_config *read_cfg = iodev_sqe->sqe.iodev->data;
+	struct icm45686_data *data = dev->data;
+	const struct icm45686_config *cfg = dev->config;
+	uint8_t val = 0;
+	int err;
+
+	/** This separate struct is required due to the streaming API using a
+	 * multi-shot RTIO submission: meaning, re-submitting itself after
+	 * completion; hence, we don't have context to determine if this was
+	 * the first submission that kicked things off. We're then, inferring
+	 * this by comparing if the read-config has changed, and only restart
+	 * in such case.
+	 */
+	struct icm45686_stream stream = {0};
+
+	for (size_t i = 0 ; i  < read_cfg->count ; i++) {
+		switch (read_cfg->triggers[i].trigger) {
+		case SENSOR_TRIG_DATA_READY:
+			stream.settings.enabled.drdy = true;
+			stream.settings.opt.drdy = read_cfg->triggers[i].opt;
+			break;
+		case SENSOR_TRIG_FIFO_WATERMARK:
+			stream.settings.enabled.fifo_ths = true;
+			stream.settings.opt.fifo_ths = read_cfg->triggers[i].opt;
+			break;
+		case SENSOR_TRIG_FIFO_FULL:
+			stream.settings.enabled.fifo_full = true;
+			stream.settings.opt.fifo_full = read_cfg->triggers[i].opt;
+			break;
+		default:
+			LOG_ERR("Unsupported trigger (%d)", read_cfg->triggers[i].trigger);
+			rtio_iodev_sqe_err(iodev_sqe, -ENOTSUP);
+			return;
+		}
+	}
+
+	__ASSERT(stream.settings.enabled.drdy ^
+		 ((stream.settings.enabled.fifo_ths || stream.settings.enabled.fifo_full)),
+		 "DRDY should not be enabled alongside FIFO triggers");
+
+	__ASSERT(!stream.settings.enabled.fifo_ths ||
+		 (stream.settings.enabled.fifo_ths && cfg->settings.fifo_watermark),
+		 "FIFO watermark trigger requires a watermark level. Please "
+		 "configure it on the device-tree");
+
+	/* Store context for next submission (handled within callbacks) */
+	data->stream.iodev_sqe = iodev_sqe;
+
+	(void)atomic_clear(&data->stream.in_progress);
+
+	if (settings_changed(&data->stream, &stream)) {
+
+		data->stream.settings = stream.settings;
+
+		/* Disable all interrupts before re-configuring */
+		err = icm45686_bus_write(dev, REG_INT1_CONFIG0, &val, 1);
+		if (err) {
+			LOG_ERR("Failed to disable interrupts on INT1_CONFIG0: %d", err);
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		/* Read flags to clear them */
+		err = icm45686_bus_read(dev, REG_INT1_STATUS0, &val, 1);
+		if (err) {
+			LOG_ERR("Failed to read INT1_STATUS0: %d", err);
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		val = REG_FIFO_CONFIG3_FIFO_EN(false) |
+		      REG_FIFO_CONFIG3_FIFO_ACCEL_EN(false) |
+		      REG_FIFO_CONFIG3_FIFO_GYRO_EN(false) |
+		      REG_FIFO_CONFIG3_FIFO_HIRES_EN(false);
+		err = icm45686_bus_write(dev, REG_FIFO_CONFIG3, &val, 1);
+		if (err) {
+			LOG_ERR("Failed to disable all FIFO settings: %d", err);
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		val = REG_INT1_CONFIG0_STATUS_EN_DRDY(data->stream.settings.enabled.drdy) |
+		      REG_INT1_CONFIG0_STATUS_EN_FIFO_THS(data->stream.settings.enabled.fifo_ths) |
+		      REG_INT1_CONFIG0_STATUS_EN_FIFO_FULL(data->stream.settings.enabled.fifo_full);
+		err = icm45686_bus_write(dev, REG_INT1_CONFIG0, &val, 1);
+		if (err) {
+			LOG_ERR("Failed to configure INT1_CONFIG0: %d", err);
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		val = REG_FIFO_CONFIG0_FIFO_MODE(REG_FIFO_CONFIG0_FIFO_MODE_BYPASS) |
+		      REG_FIFO_CONFIG0_FIFO_DEPTH(REG_FIFO_CONFIG0_FIFO_DEPTH_2K);
+		err = icm45686_bus_write(dev, REG_FIFO_CONFIG0, &val, 1);
+		if (err) {
+			LOG_ERR("Failed to disable FIFO: %d", err);
+			data->stream.iodev_sqe = NULL;
+			rtio_iodev_sqe_err(iodev_sqe, err);
+			return;
+		}
+
+		if (data->stream.settings.enabled.fifo_ths ||
+		    data->stream.settings.enabled.fifo_full) {
+			uint16_t fifo_ths = data->stream.settings.enabled.fifo_ths ?
+					    cfg->settings.fifo_watermark : 0;
+
+			val = REG_FIFO_CONFIG2_FIFO_WM_GT_THS(true) |
+			      REG_FIFO_CONFIG2_FIFO_FLUSH(true);
+			err = icm45686_bus_write(dev, REG_FIFO_CONFIG2, &val, 1);
+			if (err) {
+				LOG_ERR("Failed to configure greater-than FIFO threshold: %d", err);
+				data->stream.iodev_sqe = NULL;
+				rtio_iodev_sqe_err(iodev_sqe, err);
+				return;
+			}
+
+			err = icm45686_bus_write(dev, REG_FIFO_CONFIG1_0, (uint8_t *)&fifo_ths, 2);
+			if (err) {
+				LOG_ERR("Failed to configure FIFO watermark: %d", err);
+				data->stream.iodev_sqe = NULL;
+				rtio_iodev_sqe_err(iodev_sqe, err);
+				return;
+			}
+
+			val = REG_FIFO_CONFIG0_FIFO_MODE(REG_FIFO_CONFIG0_FIFO_MODE_STREAM) |
+			      REG_FIFO_CONFIG0_FIFO_DEPTH(REG_FIFO_CONFIG0_FIFO_DEPTH_2K);
+			err = icm45686_bus_write(dev, REG_FIFO_CONFIG0, &val, 1);
+			if (err) {
+				LOG_ERR("Failed to disable FIFO: %d", err);
+				data->stream.iodev_sqe = NULL;
+				rtio_iodev_sqe_err(iodev_sqe, err);
+				return;
+			}
+
+			val = REG_FIFO_CONFIG3_FIFO_EN(true) |
+			      REG_FIFO_CONFIG3_FIFO_ACCEL_EN(true) |
+			      REG_FIFO_CONFIG3_FIFO_GYRO_EN(true) |
+			      REG_FIFO_CONFIG3_FIFO_HIRES_EN(true);
+			err = icm45686_bus_write(dev, REG_FIFO_CONFIG3, &val, 1);
+			if (err) {
+				LOG_ERR("Failed to enable FIFO: %d", err);
+				data->stream.iodev_sqe = NULL;
+				rtio_iodev_sqe_err(iodev_sqe, err);
+				return;
+			}
+		}
+	}
+}
+
+int icm45686_stream_init(const struct device *dev)
+{
+	const struct icm45686_config *cfg = dev->config;
+	struct icm45686_data *data = dev->data;
+	uint8_t val = 0;
+	int err;
+
+	/** Needed to get back the device handle from the callback context */
+	data->stream.dev = dev;
+
+	(void)atomic_clear(&data->stream.in_progress);
+
+	if (!cfg->int_gpio.port) {
+		LOG_ERR("Interrupt GPIO not supplied");
+		return -ENODEV;
+	}
+
+	if (!gpio_is_ready_dt(&cfg->int_gpio)) {
+		LOG_ERR("Interrupt GPIO not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&cfg->int_gpio, GPIO_INPUT);
+	if (err) {
+		LOG_ERR("Failed to configure interrupt GPIO");
+		return -EIO;
+	}
+
+	gpio_init_callback(&data->stream.cb,
+			   icm45686_gpio_callback,
+			   BIT(cfg->int_gpio.pin));
+
+	err = gpio_add_callback(cfg->int_gpio.port, &data->stream.cb);
+	if (err) {
+		LOG_ERR("Failed to add interrupt callback");
+		return -EIO;
+	}
+
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+					      GPIO_INT_EDGE_TO_ACTIVE);
+	if (err) {
+		LOG_ERR("Failed to configure interrupt");
+	}
+
+	err = icm45686_bus_write(dev, REG_INT1_CONFIG0, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to disable all INTs");
+	}
+
+	val = REG_INT1_CONFIG2_EN_OPEN_DRAIN(false) |
+	      REG_INT1_CONFIG2_EN_ACTIVE_HIGH(true);
+
+	err = icm45686_bus_write(dev, REG_INT1_CONFIG2, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to configure INT as push-pull: %d", err);
+	}
+
+	return 0;
+}
diff --git a/drivers/sensor/tdk/icm45686/icm45686_stream.h b/drivers/sensor/tdk/icm45686/icm45686_stream.h
new file mode 100644
index 0000000000000..18f4a02be4f16
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_stream.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_ICM45686_STREAM_H_
+#define ZEPHYR_DRIVERS_SENSOR_ICM45686_STREAM_H_
+
+int icm45686_stream_init(const struct device *dev);
+
+void icm45686_stream_submit(const struct device *dev,
+			    struct rtio_iodev_sqe *iodev_sqe);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_ICM45686_STREAM_H_ */
diff --git a/drivers/sensor/tdk/icm45686/icm45686_trigger.c b/drivers/sensor/tdk/icm45686/icm45686_trigger.c
new file mode 100644
index 0000000000000..62411593446ee
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_trigger.c
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2022 Intel Corporation
+ * Copyright (c) 2023 Google LLC
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+
+#include "icm45686.h"
+#include "icm45686_bus.h"
+#include "icm45686_trigger.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(ICM45686_TRIGGER, CONFIG_SENSOR_LOG_LEVEL);
+
+static void icm45686_gpio_callback(const struct device *dev,
+				   struct gpio_callback *cb,
+				   uint32_t pins)
+{
+	struct icm45686_data *data = CONTAINER_OF(cb,
+						  struct icm45686_data,
+						  triggers.cb);
+
+	ARG_UNUSED(dev);
+	ARG_UNUSED(pins);
+
+#if defined(CONFIG_ICM45686_TRIGGER_OWN_THREAD)
+	k_sem_give(&data->triggers.sem);
+#elif defined(CONFIG_ICM45686_TRIGGER_GLOBAL_THREAD)
+	k_work_submit(&data->triggers.work);
+#endif
+}
+
+static void icm45686_thread_cb(const struct device *dev)
+{
+	struct icm45686_data *data = dev->data;
+
+	(void)k_mutex_lock(&data->triggers.lock, K_FOREVER);
+
+	if (data->triggers.entry.handler) {
+		data->triggers.entry.handler(dev, &data->triggers.entry.trigger);
+	}
+
+	(void)k_mutex_unlock(&data->triggers.lock);
+}
+
+#if defined(CONFIG_ICM45686_TRIGGER_OWN_THREAD)
+
+static void icm45686_thread(void *p1, void *p2, void *p3)
+{
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+
+	struct icm45686_data *data = p1;
+
+	while (true) {
+		k_sem_take(&data->triggers.sem, K_FOREVER);
+
+		icm45686_thread_cb(data->triggers.dev);
+	}
+}
+
+#elif defined(CONFIG_ICM45686_TRIGGER_GLOBAL_THREAD)
+
+static void icm45686_work_handler(struct k_work *work)
+{
+	struct icm45686_data *data = CONTAINER_OF(work,
+						  struct icm45686_data,
+						  triggers.work);
+
+	icm45686_thread_cb(data->triggers.dev);
+}
+
+#endif
+
+static int icm45686_enable_drdy(const struct device *dev, bool enable)
+{
+	uint8_t val;
+	int err;
+
+	err = icm45686_bus_read(dev, REG_INT1_CONFIG0, &val, 1);
+	if (err) {
+		return err;
+	}
+
+	val &= ~REG_INT1_CONFIG0_STATUS_EN_DRDY(true);
+	err = icm45686_bus_write(dev, REG_INT1_CONFIG0, &val, 1);
+	if (err) {
+		return err;
+	}
+
+	if (enable) {
+		val |= REG_INT1_CONFIG0_STATUS_EN_DRDY(true);
+	}
+
+	return icm45686_bus_write(dev, REG_INT1_CONFIG0, &val, 1);
+}
+
+int icm45686_trigger_set(const struct device *dev,
+			 const struct sensor_trigger *trig,
+			 sensor_trigger_handler_t handler)
+{
+	int err = 0;
+	struct icm45686_data *data = dev->data;
+
+	(void)k_mutex_lock(&data->triggers.lock, K_FOREVER);
+
+	switch (trig->type) {
+	case SENSOR_TRIG_DATA_READY:
+		data->triggers.entry.trigger = *trig;
+		data->triggers.entry.handler = handler;
+
+		if (handler) {
+			/* Enable data ready interrupt */
+			err = icm45686_enable_drdy(dev, true);
+		} else {
+			/* Disable data ready interrupt */
+			err = icm45686_enable_drdy(dev, false);
+		}
+		break;
+	default:
+		err = -ENOTSUP;
+		break;
+	}
+
+	(void)k_mutex_unlock(&data->triggers.lock);
+
+	return err;
+}
+
+int icm45686_trigger_init(const struct device *dev)
+{
+	const struct icm45686_config *cfg = dev->config;
+	struct icm45686_data *data = dev->data;
+	uint8_t val = 0;
+	int err;
+
+	err = k_mutex_init(&data->triggers.lock);
+	__ASSERT_NO_MSG(!err);
+
+	/** Needed to get back the device handle from the callback context */
+	data->triggers.dev = dev;
+
+#if defined(CONFIG_ICM45686_TRIGGER_OWN_THREAD)
+
+	err = k_sem_init(&data->triggers.sem, 0, 1);
+	__ASSERT_NO_MSG(!err);
+
+	(void)k_thread_create(&data->triggers.thread,
+			      data->triggers.thread_stack,
+			      K_KERNEL_STACK_SIZEOF(data->triggers.thread_stack),
+			      icm45686_thread,
+			      data,
+			      NULL,
+			      NULL,
+			      K_PRIO_COOP(CONFIG_ICM45686_THREAD_PRIORITY),
+			      0,
+			      K_NO_WAIT);
+
+#elif defined(CONFIG_ICM45686_TRIGGER_GLOBAL_THREAD)
+	k_work_init(&data->triggers.work, icm45686_work_handler);
+#endif
+
+	if (!cfg->int_gpio.port) {
+		LOG_ERR("Interrupt GPIO not supplied");
+		return -ENODEV;
+	}
+
+	if (!gpio_is_ready_dt(&cfg->int_gpio)) {
+		LOG_ERR("Interrupt GPIO not ready");
+		return -ENODEV;
+	}
+
+	err = gpio_pin_configure_dt(&cfg->int_gpio, GPIO_INPUT);
+	if (err) {
+		LOG_ERR("Failed to configure interrupt GPIO");
+		return -EIO;
+	}
+
+	gpio_init_callback(&data->triggers.cb,
+			icm45686_gpio_callback,
+			BIT(cfg->int_gpio.pin));
+
+	err = gpio_add_callback(cfg->int_gpio.port, &data->triggers.cb);
+	if (err) {
+		LOG_ERR("Failed to add interrupt callback");
+		return -EIO;
+	}
+
+	err = gpio_pin_interrupt_configure_dt(&cfg->int_gpio,
+					      GPIO_INT_EDGE_TO_ACTIVE);
+	if (err) {
+		LOG_ERR("Failed to configure interrupt");
+	}
+
+	err = icm45686_bus_write(dev, REG_INT1_CONFIG0, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to disable all INTs");
+	}
+
+	val = REG_INT1_CONFIG2_EN_OPEN_DRAIN(false) |
+	      REG_INT1_CONFIG2_EN_ACTIVE_HIGH(true);
+
+	err = icm45686_bus_write(dev, REG_INT1_CONFIG2, &val, 1);
+	if (err) {
+		LOG_ERR("Failed to configure INT as push-pull: %d", err);
+	}
+
+	return err;
+}
diff --git a/drivers/sensor/tdk/icm45686/icm45686_trigger.h b/drivers/sensor/tdk/icm45686/icm45686_trigger.h
new file mode 100644
index 0000000000000..0c15ff41ba2a0
--- /dev/null
+++ b/drivers/sensor/tdk/icm45686/icm45686_trigger.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 Intel Corporation
+ * Copyright (c) 2023 Google LLC
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_ICM45686_TRIGGER_H_
+#define ZEPHYR_DRIVERS_SENSOR_ICM45686_TRIGGER_H_
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+
+/* Configure triggers for the icm45686 sensor */
+int icm45686_trigger_set(const struct device *dev,
+			 const struct sensor_trigger *trig,
+			 sensor_trigger_handler_t handler);
+
+/* Initialization for icm45686 Triggers module */
+int icm45686_trigger_init(const struct device *dev);
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_ICM45686_TRIGGER_H_ */
diff --git a/drivers/sensor/tdk/icp201xx/CMakeLists.txt b/drivers/sensor/tdk/icp201xx/CMakeLists.txt
new file mode 100644
index 0000000000000..6bc760701d1d5
--- /dev/null
+++ b/drivers/sensor/tdk/icp201xx/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources(icp201xx_drv.c)
+zephyr_library_sources_ifdef(CONFIG_SPI icp201xx_spi.c)
+zephyr_library_sources_ifdef(CONFIG_I2C icp201xx_i2c.c)
+
+zephyr_library_sources_ifdef(CONFIG_ICP201XX_TRIGGER icp201xx_trigger.c)
+zephyr_library_include_directories(.)
diff --git a/drivers/sensor/tdk/icp201xx/Kconfig b/drivers/sensor/tdk/icp201xx/Kconfig
new file mode 100644
index 0000000000000..facb97d916f63
--- /dev/null
+++ b/drivers/sensor/tdk/icp201xx/Kconfig
@@ -0,0 +1,25 @@
+# ICP201xx High Accuracy, Low Power, Barometric Pressure and Temperature Sensor IC
+#
+# Copyright (c) 2025 TDK Invensense
+#
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig ICP201XX
+	bool "ICP201xx Barometric Pressure and Temperature Sensor"
+	default y
+	depends on DT_HAS_INVENSENSE_ICP201XX_ENABLED
+	select I2C if $(dt_compat_on_bus,$(DT_COMPAT_INVENSENSE_ICP201XX),i2c)
+	select SPI if $(dt_compat_on_bus,$(DT_COMPAT_INVENSENSE_ICP201XX),spi)
+	select USE_EMD_ICP201XX
+	select FPU if CPU_HAS_FPU
+	help
+		Enable driver for ICP101xx Barometric Pressure and Temperature Sensor.
+
+if ICP201XX
+
+module = ICP201XX
+thread_priority = 10
+thread_stack_size = 1024
+source "drivers/sensor/Kconfig.trigger_template"
+
+endif # ICP201XX
diff --git a/drivers/sensor/tdk/icp201xx/icp201xx_drv.c b/drivers/sensor/tdk/icp201xx/icp201xx_drv.c
new file mode 100644
index 0000000000000..dd385a0a1e916
--- /dev/null
+++ b/drivers/sensor/tdk/icp201xx/icp201xx_drv.c
@@ -0,0 +1,445 @@
+/*
+ * Copyright (c) 2025 TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+
+#include <zephyr/logging/log.h>
+
+#include "icp201xx_drv.h"
+#include "Icp201xxDriver.h"
+
+LOG_MODULE_REGISTER(ICP201XX, CONFIG_SENSOR_LOG_LEVEL);
+
+#ifdef CONFIG_FPU
+#include <math.h>
+#define ATMOSPHERICAL_PRESSURE_KPA ((float)101.325)
+#define TO_KELVIN(temp_C)          (((float)273.15) + temp_C)
+/* Constant in altitude formula:
+ * M*g/R = (0,0289644 * 9,80665 / 8,31432)
+ * with M the molar mass of air.
+ * with g the gravitational force acceleration.
+ * with R the universal gaz constant.
+ */
+#define HEIGHT_TO_PRESSURE_COEFF   ((float)0.03424)
+
+/* Constant in altitude formula:
+ * R / (M*g) = 8,31432 / (0,0289644 * 9,80665)
+ * with M the molar mass of air.
+ * with g the gravitational force acceleration.
+ * with R the universal gaz constant.
+ */
+#define PRESSURE_TO_HEIGHT_COEFF   ((float)29.27127)
+/* Constant for altitude formula:
+ * logarithm of pressure at 0m
+ * ln(101.325)
+ */
+#define LOG_ATMOSPHERICAL_PRESSURE ((float)4.61833)
+#endif
+
+#define IO_DRIVE_STRENGTH_ADDR 0x0D
+
+void inv_icp201xx_sleep_us(int us)
+{
+	k_sleep(K_USEC(us));
+}
+
+static int inv_io_hal_read_reg(void *ctx, uint8_t reg, uint8_t *rbuffer, uint32_t rlen)
+{
+	struct device *dev = (struct device *)ctx;
+	const struct icp201xx_config *cfg = (const struct icp201xx_config *)dev->config;
+
+	return cfg->bus_io->read(&cfg->bus, reg, rbuffer, rlen);
+}
+
+static int inv_io_hal_write_reg(void *ctx, uint8_t reg, const uint8_t *wbuffer, uint32_t wlen)
+{
+	struct device *dev = (struct device *)ctx;
+	const struct icp201xx_config *cfg = (const struct icp201xx_config *)dev->config;
+
+	return cfg->bus_io->write(&cfg->bus, reg, (uint8_t *)wbuffer, wlen);
+}
+
+#ifdef CONFIG_FPU
+static float convertToHeight(float pressure_kp, float temperature_C)
+{
+	return PRESSURE_TO_HEIGHT_COEFF * TO_KELVIN(temperature_C) *
+	       (LOG_ATMOSPHERICAL_PRESSURE - logf(pressure_kp));
+}
+#endif
+
+/*
+ * ICP201xx warm up.
+ * If FIR filter is enabled, it will cause a settling effect on the first 14 pressure values.
+ * Therefore the first 14 pressure output values are discarded.
+ *
+ */
+void inv_icp201xx_app_warmup(inv_icp201xx_t *icp_device, icp201xx_op_mode_t op_mode,
+			     icp201xx_meas_mode_t meas_mode)
+{
+	volatile uint8_t fifo_packets = 0;
+	uint8_t fifo_packets_to_skip = 14;
+
+	do {
+		fifo_packets = 0;
+		if (!inv_icp201xx_get_fifo_count(icp_device, (uint8_t *)&fifo_packets) &&
+		    (fifo_packets >= fifo_packets_to_skip)) {
+			uint8_t i_status = 0;
+
+			inv_icp201xx_flush_fifo(icp_device);
+
+			inv_icp201xx_get_int_status(icp_device, &i_status);
+			if (i_status) {
+				inv_icp201xx_clear_int_status(icp_device, i_status);
+			}
+			break;
+		}
+		inv_icp201xx_sleep_us(2000);
+	} while (1);
+}
+
+static int icp201xx_attr_set(const struct device *dev, enum sensor_channel chan,
+			     enum sensor_attribute attr, const struct sensor_value *val)
+{
+	int err = 0;
+	struct icp201xx_data *data = (struct icp201xx_data *)dev->data;
+
+	__ASSERT_NO_MSG(val != NULL);
+	icp201xx_mutex_lock(dev);
+	if (chan == SENSOR_CHAN_PRESS) {
+		if (attr == SENSOR_ATTR_CONFIGURATION) {
+			if ((val->val1 >= ICP201XX_OP_MODE0) && (val->val1 <= ICP201XX_OP_MODE4)) {
+				data->op_mode = val->val1;
+				err = inv_icp201xx_soft_reset(&(data->icp_device));
+				err = inv_icp201xx_config(&(data->icp_device), data->op_mode,
+							  ICP201XX_FIFO_READOUT_MODE_PRES_TEMP);
+				inv_icp201xx_app_warmup(&(data->icp_device), data->op_mode,
+							ICP201XX_MEAS_MODE_CONTINUOUS);
+			} else {
+				LOG_ERR("Not supported ATTR value");
+				icp201xx_mutex_unlock(dev);
+				return -EINVAL;
+			}
+#ifdef CONFIG_ICP201XX_TRIGGER
+		} else if (attr == SENSOR_ATTR_SLOPE_TH) {
+			data->pressure_change = *val;
+		} else if ((attr == SENSOR_ATTR_LOWER_THRESH) ||
+			   (attr == SENSOR_ATTR_UPPER_THRESH)) {
+			if (val->val1 > 0) {
+				data->pressure_threshold = *val;
+			} else {
+				LOG_ERR("Not supported ATTR value");
+				icp201xx_mutex_unlock(dev);
+				return -EINVAL;
+			}
+#endif
+		} else {
+			LOG_ERR("Not supported ATTR");
+			icp201xx_mutex_unlock(dev);
+			return -EINVAL;
+		}
+	};
+	icp201xx_mutex_unlock(dev);
+	return err;
+}
+
+static int icp201xx_sample_fetch(const struct device *dev, const enum sensor_channel chan)
+{
+	struct icp201xx_data *data = (struct icp201xx_data *)dev->data;
+	uint8_t fifo_packets;
+	uint8_t fifo_data[6];
+
+	icp201xx_mutex_lock(dev);
+
+	/** Read measurements count in FIFO **/
+	if (inv_icp201xx_get_fifo_count(&(data->icp_device), &fifo_packets)) {
+		icp201xx_mutex_unlock(dev);
+		return -2;
+	}
+	if (fifo_packets == 0) {
+		icp201xx_mutex_unlock(dev);
+		return -1;
+	}
+
+	for (int i = 0; i < fifo_packets; i++) {
+		inv_icp201xx_get_fifo_data(&(data->icp_device), 1, fifo_data);
+		if (data->icp_device.serif.if_mode == ICP201XX_IF_I2C) {
+			/*
+			 * Perform dummy read to 0x00 register as last transaction after FIFO read
+			 * for I2C interface
+			 */
+			do {
+				uint8_t dummy_reg = 0;
+
+				inv_io_hal_read_reg((struct device *)dev, 0, &dummy_reg, 1);
+			} while (0);
+		}
+	}
+	inv_icp201xx_process_raw_data(&(data->icp_device), 1, fifo_data, &data->raw_pressure,
+				      &data->raw_temperature);
+	icp201xx_mutex_unlock(dev);
+	return 0;
+}
+
+static void icp201xx_convert_pressure(struct sensor_value *val, int32_t raw_val)
+{
+	/* Raw value is coded on 20-bits */
+	if (raw_val & 0x080000) {
+		raw_val |= 0xFFF00000;
+	}
+	/* P = (POUT/2^17)*40kPa + 70kPa */
+	val->val1 = (raw_val * 40) / 131072 + 70;
+	val->val2 = ((uint64_t)(raw_val * 40) % 131072) * 1000000 / 131072;
+}
+
+static void icp201xx_convert_temperature(struct sensor_value *val, int32_t raw_val)
+{
+	/* Raw value is coded on 20-bits */
+	if (raw_val & 0x080000) {
+		raw_val |= 0xFFF00000;
+	}
+	/* T = (TOUT/2^18)*65C + 25C */
+	val->val1 = (raw_val * 65) / 262144 + 25;
+	val->val2 = ((uint64_t)(raw_val * 65) % 262144) * 1000000 / 262144;
+}
+
+static int icp201xx_channel_get(const struct device *dev, enum sensor_channel chan,
+				struct sensor_value *val)
+{
+	struct icp201xx_data *data = (struct icp201xx_data *)dev->data;
+
+	if (!(chan == SENSOR_CHAN_AMBIENT_TEMP || chan == SENSOR_CHAN_PRESS ||
+	      chan == SENSOR_CHAN_ALTITUDE)) {
+		return -ENOTSUP;
+	}
+	icp201xx_mutex_lock(dev);
+
+	if (chan == SENSOR_CHAN_PRESS) {
+		icp201xx_convert_pressure(val, data->raw_pressure);
+	} else if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
+		icp201xx_convert_temperature(val, data->raw_temperature);
+#ifdef CONFIG_FPU
+	} else if (chan == SENSOR_CHAN_ALTITUDE) {
+		struct sensor_value pressure_val, temp_val;
+		float pressure, temperature, altitude;
+
+		icp201xx_convert_pressure(&pressure_val, data->raw_pressure);
+		icp201xx_convert_temperature(&temp_val, data->raw_pressure);
+		pressure = pressure_val.val1 + ((float)pressure_val.val2 / 1000000);
+		temperature = temp_val.val1 + ((float)temp_val.val2 / 1000000);
+		altitude = convertToHeight(pressure, temperature);
+		sensor_value_from_float(val, altitude);
+#endif
+	} else {
+		icp201xx_mutex_unlock(dev);
+		return -ENOTSUP;
+	}
+
+	icp201xx_mutex_unlock(dev);
+	return 0;
+}
+
+static int icp201xx_set_drive_strength(const struct device *dev, uint8_t drive)
+{
+	int rc = 0;
+	const uint8_t active_mode = 0x4;
+	const uint8_t normal_mode = 0x0;
+	const uint8_t unlock = 0x1F;
+	const uint8_t lock = 0x0;
+
+	inv_icp201xx_sleep_us(4000);
+
+	/* Set Active power mode */
+	rc |= inv_io_hal_write_reg((struct device *)dev, MPUREG_MODE_SELECT, &active_mode, 1);
+	inv_icp201xx_sleep_us(4000);
+
+	/* Unlock main register write access */
+	rc |= inv_io_hal_write_reg((struct device *)dev, MPUREG_MASTER_LOCK, &unlock, 1);
+	inv_icp201xx_sleep_us(4000);
+
+	/* Write IO drive strength */
+	rc |= inv_io_hal_write_reg((struct device *)dev, IO_DRIVE_STRENGTH_ADDR, &drive, 1);
+
+	/* Lock main register write access */
+	rc |= inv_io_hal_write_reg((struct device *)dev, MPUREG_MASTER_LOCK, &lock, 1);
+
+	/* Set Normal power mode */
+	rc |= inv_io_hal_write_reg((struct device *)dev, MPUREG_MODE_SELECT, &normal_mode, 1);
+
+	inv_icp201xx_sleep_us(4000);
+
+	return rc;
+}
+
+static int icp201xx_init(const struct device *dev)
+{
+	struct icp201xx_data *data = (struct icp201xx_data *)dev->data;
+	struct icp201xx_config *config = (struct icp201xx_config *)dev->config;
+	inv_icp201xx_serif_t icp_serif;
+	int rc = 0;
+	uint8_t who_am_i;
+	uint8_t icp_version;
+
+	icp_serif.if_mode = config->if_mode;
+
+	/* Initialize serial interface between MCU and Icp201xx */
+	icp_serif.context = (void *)dev;
+	icp_serif.read_reg = inv_io_hal_read_reg;
+	icp_serif.write_reg = inv_io_hal_write_reg;
+	icp_serif.max_read = 2048;  /* maximum number of bytes allowed per serial read */
+	icp_serif.max_write = 2048; /* maximum number of bytes allowed per serial write */
+
+	data->op_mode = config->op_mode;
+
+	rc = icp201xx_set_drive_strength(dev, config->drive_strength);
+	if (rc != INV_ERROR_SUCCESS) {
+		LOG_ERR("Drive strength error");
+		return rc;
+	}
+
+	rc = inv_icp201xx_init(&(data->icp_device), &icp_serif);
+	if (rc != INV_ERROR_SUCCESS) {
+		LOG_ERR("Init error");
+		return rc;
+	}
+
+	rc = inv_icp201xx_soft_reset(&(data->icp_device));
+	if (rc != INV_ERROR_SUCCESS) {
+		LOG_ERR("Reset error");
+		return rc;
+	}
+
+	/* Check WHOAMI */
+	rc = inv_icp201xx_get_devid_version(&(data->icp_device), &who_am_i, &icp_version);
+	if (rc != 0) {
+		LOG_ERR("Device id error");
+		return -2;
+	}
+
+	if (who_am_i != EXPECTED_DEVICE_ID) {
+		LOG_ERR("Wrong device id");
+		return -3;
+	}
+
+	/* Boot up OTP config */
+	rc = inv_icp201xx_OTP_bootup_cfg(&(data->icp_device));
+	if (rc != 0) {
+		LOG_ERR("Bootup error");
+		return rc;
+	}
+	rc = inv_icp201xx_soft_reset(&(data->icp_device));
+	if (rc != 0) {
+		LOG_ERR("Reset error");
+		return rc;
+	}
+	rc = inv_icp201xx_config(&(data->icp_device), data->op_mode,
+				 ICP201XX_FIFO_READOUT_MODE_PRES_TEMP);
+	if (rc != 0) {
+		LOG_ERR("Config error");
+		return rc;
+	}
+	inv_icp201xx_app_warmup(&(data->icp_device), data->op_mode, ICP201XX_MEAS_MODE_CONTINUOUS);
+
+	if (IS_ENABLED(CONFIG_ICP201XX_TRIGGER)) {
+		rc = icp201xx_trigger_init(dev);
+		if (rc < 0) {
+			LOG_ERR("Failed to initialize interrupt.");
+			return rc;
+		}
+	}
+
+	/* successful init, return 0 */
+	return 0;
+}
+
+void icp201xx_mutex_lock(const struct device *dev)
+{
+#ifdef CONFIG_ICP201XX_TRIGGER
+	const struct icp201xx_config *config = dev->config;
+
+	if (config->gpio_int.port) {
+		struct icp201xx_data *data = dev->data;
+
+		k_mutex_lock(&data->mutex, K_FOREVER);
+	}
+#else
+	ARG_UNUSED(dev);
+#endif
+}
+
+void icp201xx_mutex_unlock(const struct device *dev)
+{
+#ifdef CONFIG_ICP201XX_TRIGGER
+	const struct icp201xx_config *config = dev->config;
+
+	if (config->gpio_int.port) {
+		struct icp201xx_data *data = dev->data;
+
+		k_mutex_unlock(&data->mutex);
+	}
+#else
+	ARG_UNUSED(dev);
+#endif
+}
+
+static DEVICE_API(sensor, icp201xx_api_funcs) = {.sample_fetch = icp201xx_sample_fetch,
+							    .channel_get = icp201xx_channel_get,
+							    .attr_set = icp201xx_attr_set,
+#ifdef CONFIG_ICP201XX_TRIGGER
+							    .trigger_set = icp201xx_trigger_set
+#endif
+};
+
+/* Common initialization for icp201xx_config */
+#define ICP201XX_CONFIG(inst)                                              \
+	IF_ENABLED(CONFIG_ICP201XX_TRIGGER,                                  \
+		(.gpio_int = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, {0}),)) \
+		.op_mode = DT_INST_ENUM_IDX(inst, op_mode),                    \
+		.drive_strength = DT_INST_ENUM_IDX(inst, drive_strength)
+
+/* Initializes a struct icp201xx_config for an instance on an I2C bus. */
+#define ICP201XX_CONFIG_I2C(inst)                          \
+	{                                                      \
+		.if_mode = ICP201XX_IF_I2C,                        \
+		.bus.i2c = I2C_DT_SPEC_INST_GET(inst),                 \
+		.bus_io = &icp201xx_bus_io_i2c,                    \
+		ICP201XX_CONFIG(inst)                                  \
+	}
+
+/* Initializes a struct icp201xx_config for an instance on a SPI bus. */
+#define ICP201XX_CONFIG_SPI(inst)                                  \
+	{                                                              \
+		.if_mode = ICP201XX_IF_4_WIRE_SPI,                         \
+		.bus.spi = SPI_DT_SPEC_INST_GET(inst,                      \
+			(SPI_OP_MODE_MASTER | SPI_WORD_SET(8) |    \
+			SPI_TRANSFER_MSB | SPI_FULL_DUPLEX |      \
+			SPI_MODE_CPHA | SPI_MODE_CPOL),           \
+			0),                                        \
+		.bus_io = &icp201xx_bus_io_spi,                            \
+		ICP201XX_CONFIG(inst)                                          \
+	}
+
+/*
+ * Main instantiation macro, which selects the correct bus-specific
+ * instantiation macros for the instance.
+ */
+#define ICP201XX_DEFINE(inst)                                            \
+	static struct icp201xx_data icp201xx_drv_##inst;                       \
+	static const struct icp201xx_config icp201xx_config_##inst =           \
+		COND_CODE_1(DT_INST_ON_BUS(inst, spi),                               \
+		(ICP201XX_CONFIG_SPI(inst)),	                                       \
+		(ICP201XX_CONFIG_I2C(inst)));                                        \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, icp201xx_init, NULL, &icp201xx_drv_##inst, \
+		&icp201xx_config_##inst, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,   \
+		&icp201xx_api_funcs);
+
+#define DT_DRV_COMPAT invensense_icp201xx
+DT_INST_FOREACH_STATUS_OKAY(ICP201XX_DEFINE)
diff --git a/drivers/sensor/tdk/icp201xx/icp201xx_drv.h b/drivers/sensor/tdk/icp201xx/icp201xx_drv.h
new file mode 100644
index 0000000000000..32bc02991b277
--- /dev/null
+++ b/drivers/sensor/tdk/icp201xx/icp201xx_drv.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2025 TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_ICP201XXX_ICP101XXX_H_
+#define ZEPHYR_DRIVERS_SENSOR_ICP201XXX_ICP101XXX_H_
+
+#include <zephyr/types.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/sensor.h>
+#include "Icp201xx.h"
+#include "Icp201xxSerif.h"
+
+union icp201xx_bus {
+#if CONFIG_SPI
+	struct spi_dt_spec spi;
+#endif
+#if CONFIG_I2C
+	struct i2c_dt_spec i2c;
+#endif
+};
+
+typedef int (*icp201xx_reg_read_fn)(const union icp201xx_bus *bus, uint8_t reg, uint8_t *buf,
+				    uint32_t size);
+typedef int (*icp201xx_reg_write_fn)(const union icp201xx_bus *bus, uint8_t reg, uint8_t *buf,
+				     uint32_t size);
+
+struct icp201xx_bus_io {
+	icp201xx_reg_read_fn read;
+	icp201xx_reg_write_fn write;
+};
+
+extern const struct icp201xx_bus_io icp201xx_bus_io_spi;
+extern const struct icp201xx_bus_io icp201xx_bus_io_i2c;
+
+struct icp201xx_data {
+	int32_t raw_pressure;
+	int32_t raw_temperature;
+	icp201xx_op_mode_t op_mode;
+	inv_icp201xx_t icp_device;
+
+#ifdef CONFIG_ICP201XX_TRIGGER
+	struct sensor_value pressure_change;
+	struct sensor_value pressure_threshold;
+	const struct device *dev;
+	struct gpio_callback gpio_cb;
+	sensor_trigger_handler_t drdy_handler;
+	sensor_trigger_handler_t delta_handler;
+	sensor_trigger_handler_t threshold_handler;
+	const struct sensor_trigger *drdy_trigger;
+	const struct sensor_trigger *delta_trigger;
+	const struct sensor_trigger *threshold_trigger;
+	struct k_mutex mutex;
+#ifdef CONFIG_ICP201XX_TRIGGER_OWN_THREAD
+	K_KERNEL_STACK_MEMBER(thread_stack, CONFIG_ICP201XX_THREAD_STACK_SIZE);
+	struct k_thread thread;
+	struct k_sem gpio_sem;
+#endif
+#ifdef CONFIG_ICP201XX_TRIGGER_GLOBAL_THREAD
+	struct k_work work;
+#endif
+#endif
+};
+
+struct icp201xx_config {
+	union icp201xx_bus bus;
+	const struct icp201xx_bus_io *bus_io;
+	icp201xx_if_t if_mode;
+	struct gpio_dt_spec gpio_int;
+	icp201xx_op_mode_t op_mode;
+	uint8_t drive_strength;
+};
+
+int icp201xx_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+			 sensor_trigger_handler_t handler);
+
+int icp201xx_trigger_init(const struct device *dev);
+
+void icp201xx_mutex_lock(const struct device *dev);
+void icp201xx_mutex_unlock(const struct device *dev);
+void inv_icp201xx_app_warmup(inv_icp201xx_t *icp_device, icp201xx_op_mode_t op_mode,
+			     icp201xx_meas_mode_t meas_mode);
+#endif
diff --git a/drivers/sensor/tdk/icp201xx/icp201xx_i2c.c b/drivers/sensor/tdk/icp201xx/icp201xx_i2c.c
new file mode 100644
index 0000000000000..b84a9af8260b2
--- /dev/null
+++ b/drivers/sensor/tdk/icp201xx/icp201xx_i2c.c
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for ICP201XX accessed via I2C.
+ */
+
+#include "icp201xx_drv.h"
+
+static int icp201xx_read_reg_i2c(const union icp201xx_bus *bus, uint8_t reg, uint8_t *rbuffer,
+				 uint32_t rlen)
+{
+
+	return i2c_burst_read_dt(&bus->i2c, reg, (uint8_t *)rbuffer, rlen);
+}
+
+static int icp201xx_write_reg_i2c(const union icp201xx_bus *bus, uint8_t reg, uint8_t *wbuffer,
+				  uint32_t wlen)
+{
+	return i2c_burst_write_dt(&bus->i2c, reg, wbuffer, wlen);
+}
+
+const struct icp201xx_bus_io icp201xx_bus_io_i2c = {
+	.read = icp201xx_read_reg_i2c,
+	.write = icp201xx_write_reg_i2c,
+};
diff --git a/drivers/sensor/tdk/icp201xx/icp201xx_spi.c b/drivers/sensor/tdk/icp201xx/icp201xx_spi.c
new file mode 100644
index 0000000000000..983a01c64dc02
--- /dev/null
+++ b/drivers/sensor/tdk/icp201xx/icp201xx_spi.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025 TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Bus-specific functionality for ICP201XX accessed via SPI.
+ */
+
+#include "icp201xx_drv.h"
+
+#define ICP201XX_SERIF_SPI_REG_WRITE_CMD 0X33
+#define ICP201XX_SERIF_SPI_REG_READ_CMD  0X3C
+static int icp201xx_read_reg_spi(const union icp201xx_bus *bus, uint8_t reg, uint8_t *rbuffer,
+				 uint32_t rlen)
+{
+	if (reg != 0) {
+		int rc = 0;
+
+		uint8_t cmd[] = {ICP201XX_SERIF_SPI_REG_READ_CMD, reg};
+		const struct spi_buf tx_buf = {.buf = cmd, .len = 2};
+		const struct spi_buf_set tx = {.buffers = &tx_buf, .count = 1};
+		struct spi_buf rx_buf[] = {{.buf = NULL, .len = 2}, {.buf = rbuffer, .len = rlen}};
+		const struct spi_buf_set rx = {.buffers = rx_buf, .count = 2};
+
+		rc = spi_transceive_dt(&bus->spi, &tx, &rx);
+
+		return rc;
+	}
+	return 0;
+}
+
+static int icp201xx_write_reg_spi(const union icp201xx_bus *bus, uint8_t reg, uint8_t *wbuffer,
+				  uint32_t wlen)
+{
+	if (reg != 0) {
+		int rc = 0;
+		uint8_t cmd[] = {ICP201XX_SERIF_SPI_REG_WRITE_CMD, reg};
+		const struct spi_buf tx_buf[] = {{.buf = cmd, .len = 2},
+						 {.buf = (uint8_t *)wbuffer, .len = wlen}};
+		const struct spi_buf_set tx = {.buffers = tx_buf, .count = 2};
+
+		rc = spi_write_dt(&bus->spi, &tx);
+		return rc;
+	}
+	return 0;
+}
+
+const struct icp201xx_bus_io icp201xx_bus_io_spi = {
+	.read = icp201xx_read_reg_spi,
+	.write = icp201xx_write_reg_spi,
+};
diff --git a/drivers/sensor/tdk/icp201xx/icp201xx_trigger.c b/drivers/sensor/tdk/icp201xx/icp201xx_trigger.c
new file mode 100644
index 0000000000000..46a2dc0339a8f
--- /dev/null
+++ b/drivers/sensor/tdk/icp201xx/icp201xx_trigger.c
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2025 TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include "icp201xx_drv.h"
+#include "Icp201xxDriver.h"
+
+LOG_MODULE_DECLARE(ICP201XX, CONFIG_SENSOR_LOG_LEVEL);
+
+static void icp201xx_gpio_callback(const struct device *dev, struct gpio_callback *cb,
+				   uint32_t pins)
+{
+	struct icp201xx_data *drv_data = CONTAINER_OF(cb, struct icp201xx_data, gpio_cb);
+	const struct icp201xx_config *cfg = (const struct icp201xx_config *)drv_data->dev->config;
+
+	ARG_UNUSED(pins);
+	gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_DISABLE);
+
+#if defined(CONFIG_ICP201XX_TRIGGER_OWN_THREAD)
+	k_sem_give(&drv_data->gpio_sem);
+#elif defined(CONFIG_ICP201XX_TRIGGER_GLOBAL_THREAD)
+	k_work_submit(&drv_data->work);
+#endif
+}
+
+static void icp201xx_thread_cb(const struct device *dev)
+{
+	struct icp201xx_data *drv_data = dev->data;
+	const struct icp201xx_config *cfg = dev->config;
+	uint8_t i_status;
+
+	icp201xx_mutex_lock(dev);
+	gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_DISABLE);
+
+	inv_icp201xx_get_int_status(&drv_data->icp_device, &i_status);
+	if (i_status) {
+		if ((i_status & ICP201XX_INT_STATUS_FIFO_WMK_HIGH) &&
+		    (drv_data->drdy_handler != NULL)) {
+			drv_data->drdy_handler(dev, drv_data->drdy_trigger);
+		}
+		if ((i_status & ICP201XX_INT_STATUS_PRESS_DELTA) &&
+		    (drv_data->delta_handler != NULL)) {
+			drv_data->delta_handler(dev, drv_data->delta_trigger);
+		}
+		if ((i_status & ICP201XX_INT_STATUS_PRESS_ABS) &&
+		    (drv_data->threshold_handler != NULL)) {
+			drv_data->threshold_handler(dev, drv_data->threshold_trigger);
+		}
+		inv_icp201xx_clear_int_status(&drv_data->icp_device, i_status);
+	}
+	gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_LEVEL_LOW);
+	icp201xx_mutex_unlock(dev);
+}
+
+#if defined(CONFIG_ICP201XX_TRIGGER_OWN_THREAD)
+static void icp201xx_thread(void *p1, void *p2, void *p3)
+{
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+	struct device *dev = (struct device *)p1;
+	struct icp201xx_data *drv_data = (struct icp201xx_data *)dev->data;
+
+	while (1) {
+		k_sem_take(&drv_data->gpio_sem, K_FOREVER);
+		icp201xx_thread_cb(dev);
+	}
+}
+#elif defined(CONFIG_ICP201XX_TRIGGER_GLOBAL_THREAD)
+static void icp201xx_work_handler(struct k_work *work)
+{
+	struct icp201xx_data *data = CONTAINER_OF(work, struct icp201xx_data, work);
+
+	icp201xx_thread_cb(data->dev);
+}
+#endif
+
+static int icp201xx_fifo_interrupt(const struct device *dev, uint8_t fifo_watermark)
+{
+	int rc = 0;
+	struct icp201xx_data *data = (struct icp201xx_data *)dev->data;
+
+	inv_icp201xx_flush_fifo(&(data->icp_device));
+
+	rc |= inv_icp201xx_set_fifo_notification_config(
+		&(data->icp_device), ICP201XX_INT_MASK_FIFO_WMK_HIGH, fifo_watermark, 0);
+
+	inv_icp201xx_app_warmup(&(data->icp_device), data->op_mode, ICP201XX_MEAS_MODE_CONTINUOUS);
+	return rc;
+}
+
+static int icp201xx_pressure_interrupt(const struct device *dev, struct sensor_value pressure)
+{
+	int16_t pressure_value, pressure_delta_value;
+	uint8_t int_mask = 0;
+	int rc = 0;
+	struct icp201xx_data *data = (struct icp201xx_data *)dev->data;
+
+	inv_icp201xx_get_press_notification_config(&(data->icp_device), &int_mask, &pressure_value,
+						   &pressure_delta_value);
+	/* PABS = (P(kPa)-70kPa)/40kPa*2^13 */
+	pressure_value =
+		(8192 * (pressure.val1 - 70) + ((8192 * (uint64_t)pressure.val2) / 1000000)) / 40;
+	rc |= inv_icp201xx_set_press_notification_config(&(data->icp_device),
+							 ~int_mask | ICP201XX_INT_MASK_PRESS_ABS,
+							 pressure_value, pressure_delta_value);
+	return rc;
+}
+
+static int icp201xx_pressure_change_interrupt(const struct device *dev,
+					      struct sensor_value pressure_delta)
+{
+	int16_t pressure_value, pressure_delta_value;
+	uint8_t int_mask = 0;
+	int rc = 0;
+	struct icp201xx_data *data = (struct icp201xx_data *)dev->data;
+
+	inv_icp201xx_get_press_notification_config(&(data->icp_device), &int_mask, &pressure_value,
+						   &pressure_delta_value);
+	/* PDELTA = (P(kPa)/80)* 2^14 */
+	pressure_delta_value =
+		(16384 * pressure_delta.val1 + (16384 * (uint64_t)pressure_delta.val2 / 1000000)) /
+		80;
+	rc |= inv_icp201xx_set_press_notification_config(&(data->icp_device),
+							 ~int_mask | ICP201XX_INT_MASK_PRESS_DELTA,
+							 pressure_value, pressure_delta_value);
+	return rc;
+}
+
+int icp201xx_trigger_init(const struct device *dev)
+{
+	struct icp201xx_data *drv_data = dev->data;
+	const struct icp201xx_config *cfg = dev->config;
+	int result = 0;
+
+	if (!cfg->gpio_int.port) {
+		LOG_ERR("trigger enabled but no interrupt gpio supplied");
+		return -ENODEV;
+	}
+
+	if (!gpio_is_ready_dt(&cfg->gpio_int)) {
+		LOG_ERR("gpio_int gpio not ready");
+		return -ENODEV;
+	}
+
+	drv_data->dev = dev;
+	gpio_pin_configure_dt(&cfg->gpio_int, GPIO_INPUT);
+	gpio_init_callback(&drv_data->gpio_cb, icp201xx_gpio_callback, BIT(cfg->gpio_int.pin));
+	result = gpio_add_callback(cfg->gpio_int.port, &drv_data->gpio_cb);
+
+	if (result < 0) {
+		LOG_ERR("Failed to set gpio callback");
+		return result;
+	}
+
+	k_mutex_init(&drv_data->mutex);
+
+#if defined(CONFIG_ICP201XX_TRIGGER_OWN_THREAD)
+	k_sem_init(&drv_data->gpio_sem, 0, K_SEM_MAX_LIMIT);
+
+	k_thread_create(&drv_data->thread, drv_data->thread_stack,
+			CONFIG_ICP201XX_THREAD_STACK_SIZE, icp201xx_thread, (struct device *)dev,
+			NULL, NULL, K_PRIO_COOP(CONFIG_ICP201XX_THREAD_PRIORITY), 0, K_NO_WAIT);
+	k_thread_name_set(&drv_data->thread, "icp201xx");
+#elif defined(CONFIG_ICP201XX_TRIGGER_GLOBAL_THREAD)
+	drv_data->work.handler = icp201xx_work_handler;
+#endif
+
+	return 0;
+}
+
+int icp201xx_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+			 sensor_trigger_handler_t handler)
+{
+	int rc = 0;
+	struct icp201xx_data *drv_data = dev->data;
+	const struct icp201xx_config *cfg = dev->config;
+
+	icp201xx_mutex_lock(dev);
+	gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_DISABLE);
+	if (handler == NULL) {
+		return -1;
+	}
+
+	if ((trig->type != SENSOR_TRIG_DATA_READY) && (trig->type != SENSOR_TRIG_DELTA) &&
+	    (trig->type != SENSOR_TRIG_THRESHOLD)) {
+		icp201xx_mutex_unlock(dev);
+		return -ENOTSUP;
+	}
+
+	if (trig->type == SENSOR_TRIG_DATA_READY) {
+		rc = icp201xx_fifo_interrupt(dev, 1);
+		drv_data->drdy_handler = handler;
+		drv_data->drdy_trigger = trig;
+	} else if (trig->type == SENSOR_TRIG_DELTA) {
+		rc = icp201xx_pressure_change_interrupt(dev, drv_data->pressure_change);
+		drv_data->delta_handler = handler;
+		drv_data->delta_trigger = trig;
+	} else if (trig->type == SENSOR_TRIG_THRESHOLD) {
+		rc = icp201xx_pressure_interrupt(dev, drv_data->pressure_threshold);
+		drv_data->threshold_handler = handler;
+		drv_data->threshold_trigger = trig;
+	}
+
+	gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_LEVEL_LOW);
+	icp201xx_mutex_unlock(dev);
+
+	return rc;
+}
diff --git a/drivers/sensor/tdk/mpu6050/Kconfig b/drivers/sensor/tdk/mpu6050/Kconfig
index de42afe611faa..915655d95b46f 100644
--- a/drivers/sensor/tdk/mpu6050/Kconfig
+++ b/drivers/sensor/tdk/mpu6050/Kconfig
@@ -53,20 +53,4 @@ config MPU6050_THREAD_STACK_SIZE
 	help
 	  Stack size of thread used by the driver to handle interrupts.
 
-config MPU6050_ACCEL_FS
-	int "Accelerometer full-scale range"
-	default 2
-	help
-	  Magnetometer full-scale range.
-	  An X value for the config represents a range of +/- X g. Valid
-	  values are 2, 4, 8 and 16.
-
-config MPU6050_GYRO_FS
-	int "Gyroscope full-scale range"
-	default 250
-	help
-	  Gyroscope full-scale range.
-	  An X value for the config represents a range of +/- X degrees/second.
-	  Valid values are 250, 500, 1000, 2000.
-
 endif # MPU6050
diff --git a/drivers/sensor/tdk/mpu6050/mpu6050.c b/drivers/sensor/tdk/mpu6050/mpu6050.c
index 13d848a2084c1..0401ca412271f 100644
--- a/drivers/sensor/tdk/mpu6050/mpu6050.c
+++ b/drivers/sensor/tdk/mpu6050/mpu6050.c
@@ -186,7 +186,7 @@ int mpu6050_init(const struct device *dev)
 
 	/* set accelerometer full-scale range */
 	for (i = 0U; i < 4; i++) {
-		if (BIT(i+1) == CONFIG_MPU6050_ACCEL_FS) {
+		if (BIT(i+1) == cfg->accel_fs) {
 			break;
 		}
 	}
@@ -206,7 +206,7 @@ int mpu6050_init(const struct device *dev)
 
 	/* set gyroscope full-scale range */
 	for (i = 0U; i < 4; i++) {
-		if (BIT(i) * 250 == CONFIG_MPU6050_GYRO_FS) {
+		if (BIT(i) * 250 == cfg->gyro_fs) {
 			break;
 		}
 	}
@@ -224,6 +224,12 @@ int mpu6050_init(const struct device *dev)
 
 	drv_data->gyro_sensitivity_x10 = mpu6050_gyro_sensitivity_x10[i];
 
+	if (i2c_reg_write_byte_dt(&cfg->i2c, MPU6050_REG_SMPLRT_DIV,
+				  cfg->smplrt_div) < 0) {
+		LOG_ERR("Failed to write samplerate divider.");
+		return -EIO;
+	}
+
 #ifdef CONFIG_MPU6050_TRIGGER
 	if (cfg->int_gpio.port) {
 		if (mpu6050_init_interrupt(dev) < 0) {
@@ -241,6 +247,9 @@ int mpu6050_init(const struct device *dev)
 												\
 	static const struct mpu6050_config mpu6050_config_##inst = {				\
 		.i2c = I2C_DT_SPEC_INST_GET(inst),						\
+		.accel_fs = DT_INST_PROP(inst, accel_fs),					\
+		.gyro_fs = DT_INST_PROP(inst, gyro_fs),						\
+		.smplrt_div = DT_INST_PROP(inst, smplrt_div),					\
 		IF_ENABLED(CONFIG_MPU6050_TRIGGER,						\
 			   (.int_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, { 0 }),))	\
 	};											\
diff --git a/drivers/sensor/tdk/mpu6050/mpu6050.h b/drivers/sensor/tdk/mpu6050/mpu6050.h
index 9277873cd5f4d..3ea669d17d995 100644
--- a/drivers/sensor/tdk/mpu6050/mpu6050.h
+++ b/drivers/sensor/tdk/mpu6050/mpu6050.h
@@ -20,6 +20,8 @@
 #define MPU9250_CHIP_ID			0x71
 #define MPU6880_CHIP_ID			0x19
 
+#define MPU6050_REG_SMPLRT_DIV		0x19
+
 #define MPU6050_REG_GYRO_CFG		0x1B
 #define MPU6050_GYRO_FS_SHIFT		3
 
@@ -80,6 +82,9 @@ struct mpu6050_data {
 
 struct mpu6050_config {
 	struct i2c_dt_spec i2c;
+	uint8_t accel_fs;
+	uint16_t gyro_fs;
+	uint8_t smplrt_div;
 #ifdef CONFIG_MPU6050_TRIGGER
 	struct gpio_dt_spec int_gpio;
 #endif /* CONFIG_MPU6050_TRIGGER */
diff --git a/drivers/sensor/ti/CMakeLists.txt b/drivers/sensor/ti/CMakeLists.txt
index 8a497df294846..9ad90eddfe957 100644
--- a/drivers/sensor/ti/CMakeLists.txt
+++ b/drivers/sensor/ti/CMakeLists.txt
@@ -19,6 +19,6 @@ add_subdirectory_ifdef(CONFIG_TMP1075 tmp1075)
 add_subdirectory_ifdef(CONFIG_TMP108 tmp108)
 add_subdirectory_ifdef(CONFIG_TMP112 tmp112)
 add_subdirectory_ifdef(CONFIG_TMP114 tmp114)
-add_subdirectory_ifdef(CONFIG_TMP116 tmp116)
+add_subdirectory_ifdef(CONFIG_TMP11X tmp11x)
 add_subdirectory_ifdef(CONFIG_TMP435 tmp435)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/ti/Kconfig b/drivers/sensor/ti/Kconfig
index 7e9f0e95f291e..6c28e870da42f 100644
--- a/drivers/sensor/ti/Kconfig
+++ b/drivers/sensor/ti/Kconfig
@@ -19,6 +19,6 @@ source "drivers/sensor/ti/tmp1075/Kconfig"
 source "drivers/sensor/ti/tmp108/Kconfig"
 source "drivers/sensor/ti/tmp112/Kconfig"
 source "drivers/sensor/ti/tmp114/Kconfig"
-source "drivers/sensor/ti/tmp116/Kconfig"
+source "drivers/sensor/ti/tmp11x/Kconfig"
 source "drivers/sensor/ti/tmp435/Kconfig"
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/ti/opt3001/CMakeLists.txt b/drivers/sensor/ti/opt3001/CMakeLists.txt
index dac045ee40c44..9cd675cb0098b 100644
--- a/drivers/sensor/ti/opt3001/CMakeLists.txt
+++ b/drivers/sensor/ti/opt3001/CMakeLists.txt
@@ -3,3 +3,4 @@
 zephyr_library()
 
 zephyr_library_sources(opt3001.c)
+zephyr_library_sources_ifdef(CONFIG_OPT3001_TRIGGER opt3001_trigger.c)
diff --git a/drivers/sensor/ti/opt3001/Kconfig b/drivers/sensor/ti/opt3001/Kconfig
index 6151eb24b55d2..e5d6ce0f5caab 100644
--- a/drivers/sensor/ti/opt3001/Kconfig
+++ b/drivers/sensor/ti/opt3001/Kconfig
@@ -10,3 +10,12 @@ config OPT3001
 	select I2C
 	help
 	  Enable driver for OPT3001 light sensors.
+
+if OPT3001
+
+module = OPT3001
+thread_priority = 10
+thread_stack_size = 1024
+source "drivers/sensor/Kconfig.trigger_template"
+
+endif # OPT3001
diff --git a/drivers/sensor/ti/opt3001/opt3001.c b/drivers/sensor/ti/opt3001/opt3001.c
index 98ab3f253d106..ea6180c79f276 100644
--- a/drivers/sensor/ti/opt3001/opt3001.c
+++ b/drivers/sensor/ti/opt3001/opt3001.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Actinius
+ * Copyright (c) 2025 Bang & Olufsen A/S
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -16,7 +17,7 @@
 
 LOG_MODULE_REGISTER(opt3001, CONFIG_SENSOR_LOG_LEVEL);
 
-static int opt3001_reg_read(const struct device *dev, uint8_t reg,
+int opt3001_reg_read(const struct device *dev, uint8_t reg,
 			    uint16_t *val)
 {
 	const struct opt3001_config *config = dev->config;
@@ -45,7 +46,7 @@ static int opt3001_reg_write(const struct device *dev, uint8_t reg,
 	return i2c_write_dt(&config->i2c, tx_buf, sizeof(tx_buf));
 }
 
-static int opt3001_reg_update(const struct device *dev, uint8_t reg,
+int opt3001_reg_update(const struct device *dev, uint8_t reg,
 			      uint16_t mask, uint16_t val)
 {
 	uint16_t old_val;
@@ -85,6 +86,7 @@ static int opt3001_channel_get(const struct device *dev,
 			       struct sensor_value *val)
 {
 	struct opt3001_data *drv_data = dev->data;
+	uint16_t sample = drv_data->sample;
 	int32_t uval;
 
 	if (chan != SENSOR_CHAN_LIGHT) {
@@ -99,8 +101,7 @@ static int opt3001_channel_get(const struct device *dev,
 	 * lux is the integer obtained using the following formula:
 	 * (2^(exponent value)) * 0.01 * mantissa value
 	 */
-	uval = (1 << (drv_data->sample >> OPT3001_SAMPLE_EXPONENT_SHIFT))
-		* (drv_data->sample & OPT3001_MANTISSA_MASK);
+	uval = (1 << (sample >> OPT3001_SAMPLE_EXPONENT_SHIFT)) * (sample & OPT3001_MANTISSA_MASK);
 	val->val1 = uval / 100;
 	val->val2 = (uval % 100) * 10000;
 
@@ -108,6 +109,9 @@ static int opt3001_channel_get(const struct device *dev,
 }
 
 static DEVICE_API(sensor, opt3001_driver_api) = {
+#ifdef CONFIG_OPT3001_TRIGGER
+	.trigger_set = opt3001_trigger_set,
+#endif
 	.sample_fetch = opt3001_sample_fetch,
 	.channel_get = opt3001_channel_get,
 };
@@ -156,6 +160,13 @@ int opt3001_init(const struct device *dev)
 		return -EINVAL;
 	}
 
+#ifdef CONFIG_OPT3001_TRIGGER
+	if (opt3001_init_interrupt(dev)) {
+		LOG_ERR("Failed to initialize interrupt");
+		return -EIO;
+	}
+#endif
+
 	return 0;
 }
 
@@ -164,6 +175,8 @@ int opt3001_init(const struct device *dev)
 												\
 	static const struct opt3001_config opt3001_config_##inst = {				\
 		.i2c = I2C_DT_SPEC_INST_GET(inst),						\
+		IF_ENABLED(CONFIG_OPT3001_TRIGGER,						\
+			(.gpio_int = GPIO_DT_SPEC_INST_GET_OR(inst, int_gpios, {0}),))		\
 	};											\
 												\
 	SENSOR_DEVICE_DT_INST_DEFINE(inst, opt3001_init, NULL,					\
diff --git a/drivers/sensor/ti/opt3001/opt3001.h b/drivers/sensor/ti/opt3001/opt3001.h
index f14b162ad6a74..2ef9caba189ca 100644
--- a/drivers/sensor/ti/opt3001/opt3001.h
+++ b/drivers/sensor/ti/opt3001/opt3001.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Actinius
+ * Copyright (c) 2025 Bang & Olufsen A/S
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,9 +10,13 @@
 
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 
 #define OPT3001_REG_RESULT 0x00
 #define OPT3001_REG_CONFIG 0x01
+#define OPT3001_REG_LOW_LIMIT 0x02
 #define OPT3001_REG_MANUFACTURER_ID 0x7E
 #define OPT3001_REG_DEVICE_ID 0x7F
 
@@ -21,15 +26,51 @@
 #define OPT3001_CONVERSION_MODE_MASK (BIT(10) | BIT(9))
 #define OPT3001_CONVERSION_MODE_CONTINUOUS (BIT(10) | BIT(9))
 
+#define OPT3001_LIMIT_EXPONENT_MASK (BIT(15) | BIT(14) | BIT(13) | BIT(12))
+#define OPT3001_LIMIT_EXPONENT_DEFAULT 0x0000
+
 #define OPT3001_SAMPLE_EXPONENT_SHIFT 12
 #define OPT3001_MANTISSA_MASK 0xfff
 
+#ifdef CONFIG_OPT3001_TRIGGER
+int opt3001_init_interrupt(const struct device *dev);
+
+int opt3001_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+			sensor_trigger_handler_t handler);
+
+int opt3001_reg_update(const struct device *dev, uint8_t reg, uint16_t mask, uint16_t val);
+
+int opt3001_reg_read(const struct device *dev, uint8_t reg, uint16_t *val);
+
+#endif
+
 struct opt3001_data {
 	uint16_t sample;
+
+#ifdef CONFIG_OPT3001_TRIGGER
+	const struct device *dev;
+	struct gpio_callback gpio_cb_int;
+
+	const struct sensor_trigger *trigger;
+	sensor_trigger_handler_t handler;
+	struct k_mutex handler_mutex;
+
+#if defined(CONFIG_OPT3001_TRIGGER_OWN_THREAD)
+	K_KERNEL_STACK_MEMBER(thread_stack, CONFIG_OPT3001_THREAD_STACK_SIZE);
+	struct k_sem gpio_sem;
+	struct k_thread thread;
+#elif defined(CONFIG_OPT3001_TRIGGER_GLOBAL_THREAD)
+	struct k_work work_int;
+#endif
+
+#endif
 };
 
 struct opt3001_config {
 	struct i2c_dt_spec i2c;
+#ifdef CONFIG_OPT3001_TRIGGER
+	const struct gpio_dt_spec gpio_int;
+#endif
 };
 
 #endif /* _SENSOR_OPT3001_ */
diff --git a/drivers/sensor/ti/opt3001/opt3001_trigger.c b/drivers/sensor/ti/opt3001/opt3001_trigger.c
new file mode 100644
index 0000000000000..056f7214b42ae
--- /dev/null
+++ b/drivers/sensor/ti/opt3001/opt3001_trigger.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2025 Bang & Olufsen A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_opt3001
+
+#include "opt3001.h"
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
+
+LOG_MODULE_DECLARE(opt3001, CONFIG_SENSOR_LOG_LEVEL);
+
+static void opt3001_thread_cb(const struct device *dev)
+{
+	const struct opt3001_config *cfg = dev->config;
+	struct opt3001_data *dat = dev->data;
+	uint16_t reg_cfg;
+	int ret;
+
+	/* read result then clear interrupt by reading REG_CONFIG */
+	ret = opt3001_reg_read(dat->dev, OPT3001_REG_RESULT, &dat->sample);
+	if (ret) {
+		LOG_ERR("Failed to read result, ret: %d", ret);
+		return;
+	}
+
+	ret = opt3001_reg_read(dat->dev, OPT3001_REG_CONFIG, &reg_cfg);
+	if (ret) {
+		LOG_ERR("Failed to read config, ret: %d", ret);
+		return;
+	}
+
+	ret = k_mutex_lock(&dat->handler_mutex, K_FOREVER);
+	if (ret) {
+		LOG_ERR("Failed to lock trigger mutex, ret: %d", ret);
+		return;
+	}
+
+	if (dat->handler) {
+		dat->handler(dat->dev, dat->trigger);
+	}
+
+	/* recheck handler in case it was removed during the handler invocation */
+	if (dat->handler) {
+		/* enable interrupt again */
+		gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_EDGE_TO_ACTIVE);
+	}
+
+	ret = k_mutex_unlock(&dat->handler_mutex);
+	if (ret) {
+		LOG_ERR("Failed to unlock trigger mutex, ret: %d", ret);
+	}
+}
+
+static void opt3001_isr(const struct device *dev, struct gpio_callback *gpio_cb, uint32_t pins)
+{
+	struct opt3001_data *dat = CONTAINER_OF(gpio_cb, struct opt3001_data, gpio_cb_int);
+	const struct opt3001_config *cfg = dat->dev->config;
+
+	ARG_UNUSED(pins);
+
+	/* disable interrupt from gpio during handling */
+	gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_DISABLE);
+
+#if defined(CONFIG_OPT3001_TRIGGER_OWN_THREAD)
+	k_sem_give(&dat->gpio_sem);
+#elif defined(CONFIG_OPT3001_TRIGGER_GLOBAL_THREAD)
+	k_work_submit(&dat->work_int);
+#endif
+}
+
+#ifdef CONFIG_OPT3001_TRIGGER_OWN_THREAD
+static void opt3001_thread(void *p1, void *p2, void *p3)
+{
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+
+	struct opt3001_data *dat = p1;
+
+	while (1) {
+		k_sem_take(&dat->gpio_sem, K_FOREVER);
+		opt3001_thread_cb(dat->dev);
+	}
+}
+#endif
+
+#ifdef CONFIG_OPT3001_TRIGGER_GLOBAL_THREAD
+static void opt3001_int_work(struct k_work *work)
+{
+	struct opt3001_data *dat = CONTAINER_OF(work, struct opt3001_data, work_int);
+
+	opt3001_thread_cb(dat->dev);
+}
+#endif
+
+int opt3001_init_interrupt(const struct device *dev)
+{
+	const struct opt3001_config *cfg = dev->config;
+	struct opt3001_data *dat = dev->data;
+	int ret = 0;
+
+	/* setup interrupt if provided */
+	if (!cfg->gpio_int.port) {
+		LOG_DBG("int-gpios not provided, continuing without support for trigger");
+		return 0;
+	}
+
+	dat->dev = dev;
+
+	if (!gpio_is_ready_dt(&cfg->gpio_int)) {
+		LOG_ERR("Interrupt gpio not ready");
+		return -ENODEV;
+	}
+
+	ret = k_mutex_init(&dat->handler_mutex);
+	if (ret) {
+		LOG_ERR("Failed to init trigger mutex, ret: %d", ret);
+		return ret;
+	}
+
+	ret = gpio_pin_configure_dt(&cfg->gpio_int, GPIO_INPUT);
+	if (ret) {
+		LOG_ERR("Failed to configure int-gpios, ret: %d", ret);
+		return ret;
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&cfg->gpio_int, GPIO_INT_DISABLE);
+	if (ret) {
+		LOG_ERR("Failed to enable interrupt on int-gpios, ret: %d", ret);
+		return ret;
+	}
+
+	gpio_init_callback(&dat->gpio_cb_int, opt3001_isr, BIT(cfg->gpio_int.pin));
+
+	ret = gpio_add_callback(cfg->gpio_int.port, &dat->gpio_cb_int);
+	if (ret) {
+		LOG_ERR("Failed to add callback to int-gpios, ret: %d", ret);
+		return ret;
+	}
+
+#if defined(CONFIG_OPT3001_TRIGGER_OWN_THREAD)
+	k_sem_init(&dat->gpio_sem, 0, K_SEM_MAX_LIMIT);
+	k_thread_create(&dat->thread, dat->thread_stack, CONFIG_OPT3001_THREAD_STACK_SIZE,
+			opt3001_thread, dat, NULL, NULL,
+			K_PRIO_COOP(CONFIG_OPT3001_THREAD_PRIORITY), 0, K_NO_WAIT);
+	k_thread_name_set(&dat->thread, "opt3001_trigger");
+
+#elif defined(CONFIG_OPT3001_TRIGGER_GLOBAL_THREAD)
+	k_work_init(&dat->work_int, opt3001_int_work);
+#endif
+
+	return 0;
+}
+
+int opt3001_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+			sensor_trigger_handler_t handler)
+{
+	const struct opt3001_config *cfg = dev->config;
+	struct opt3001_data *dat = dev->data;
+	uint16_t reg_cfg;
+	int ret;
+
+	/* only allow trigger on a device with int-gpios specified */
+	if (!cfg->gpio_int.port) {
+		return -ENOSYS;
+	}
+
+	if (trig->chan != SENSOR_CHAN_LIGHT) {
+		return -EINVAL;
+	}
+
+	if (trig->type != SENSOR_TRIG_DATA_READY) {
+		return -EINVAL;
+	}
+
+	ret = k_mutex_lock(&dat->handler_mutex, K_FOREVER);
+	if (ret) {
+		LOG_ERR("Failed to lock trigger mutex, ret: %d", ret);
+		return ret;
+	}
+
+	dat->trigger = trig;
+	dat->handler = handler;
+
+	ret = gpio_pin_interrupt_configure_dt(&cfg->gpio_int,
+					      handler ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE);
+	if (ret) {
+		LOG_ERR("Failed to configure gpio interrupt, ret: %d", ret);
+		return ret;
+	}
+
+	/* enable/disable interrupt on every conversion */
+	ret = opt3001_reg_update(dev, OPT3001_REG_LOW_LIMIT, OPT3001_LIMIT_EXPONENT_MASK,
+				 handler ? OPT3001_LIMIT_EXPONENT_MASK
+					 : OPT3001_LIMIT_EXPONENT_DEFAULT);
+	if (ret) {
+		LOG_ERR("Failed to enable interrupt on conversions, ret: %d", ret);
+		return ret;
+	}
+
+	/* clear any asserted interrupt by reading REG_CONFIG */
+	ret = opt3001_reg_read(dat->dev, OPT3001_REG_CONFIG, &reg_cfg);
+	if (ret) {
+		LOG_ERR("Failed to read config, ret: %d", ret);
+		return ret;
+	}
+
+	ret = k_mutex_unlock(&dat->handler_mutex);
+	if (ret) {
+		LOG_ERR("Failed to unlock trigger mutex, ret: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
diff --git a/drivers/sensor/ti/tmp1075/tmp1075.c b/drivers/sensor/ti/tmp1075/tmp1075.c
index 83643b80df8b2..c2ebb3cf3cb4a 100644
--- a/drivers/sensor/ti/tmp1075/tmp1075.c
+++ b/drivers/sensor/ti/tmp1075/tmp1075.c
@@ -170,7 +170,7 @@ static int setup_interrupts(const struct device *dev)
 	int result;
 
 	if (!gpio_is_ready_dt(alert_gpio)) {
-		LOG_ERR("tmp1075: gpio controller %s not ready", alert_gpio->port->name);
+		LOG_ERR("gpio controller %s not ready", alert_gpio->port->name);
 		return -ENODEV;
 	}
 
diff --git a/drivers/sensor/ti/tmp112/tmp112.c b/drivers/sensor/ti/tmp112/tmp112.c
index fa73b22ca3dc0..0de33b4cdde4d 100644
--- a/drivers/sensor/ti/tmp112/tmp112.c
+++ b/drivers/sensor/ti/tmp112/tmp112.c
@@ -18,8 +18,7 @@
 
 LOG_MODULE_REGISTER(TMP112, CONFIG_SENSOR_LOG_LEVEL);
 
-static int tmp112_reg_read(const struct tmp112_config *cfg,
-			   uint8_t reg, uint16_t *val)
+static int tmp112_reg_read(const struct tmp112_config *cfg, uint8_t reg, uint16_t *val)
 {
 	if (i2c_burst_read_dt(&cfg->bus, reg, (uint8_t *)val, sizeof(*val)) < 0) {
 		return -EIO;
@@ -30,8 +29,7 @@ static int tmp112_reg_read(const struct tmp112_config *cfg,
 	return 0;
 }
 
-static int tmp112_reg_write(const struct tmp112_config *cfg,
-			    uint8_t reg, uint16_t val)
+static int tmp112_reg_write(const struct tmp112_config *cfg, uint8_t reg, uint16_t val)
 {
 	uint8_t buf[3];
 
@@ -41,14 +39,12 @@ static int tmp112_reg_write(const struct tmp112_config *cfg,
 	return i2c_write_dt(&cfg->bus, buf, sizeof(buf));
 }
 
-static uint16_t set_config_flags(struct tmp112_data *data, uint16_t mask,
-				 uint16_t value)
+static uint16_t set_config_flags(struct tmp112_data *data, uint16_t mask, uint16_t value)
 {
 	return (data->config_reg & ~mask) | (value & mask);
 }
 
-static int tmp112_update_config(const struct device *dev, uint16_t mask,
-				uint16_t val)
+static int tmp112_update_config(const struct device *dev, uint16_t mask, uint16_t val)
 {
 	int rc;
 	struct tmp112_data *data = dev->data;
@@ -62,10 +58,31 @@ static int tmp112_update_config(const struct device *dev, uint16_t mask,
 	return rc;
 }
 
-static int tmp112_attr_set(const struct device *dev,
-			   enum sensor_channel chan,
-			   enum sensor_attribute attr,
-			   const struct sensor_value *val)
+static int tmp112_set_threshold(const struct device *dev, uint8_t reg, int64_t micro_c)
+{
+	struct tmp112_data *drv_data = dev->data;
+	int64_t v;
+	uint16_t reg_value;
+
+	v = DIV_ROUND_CLOSEST(micro_c, TMP112_TEMP_SCALE);
+
+	if (drv_data->config_reg & TMP112_CONFIG_EM) {
+		if (!IN_RANGE(v, TMP112_TEMP_MIN_EM, TMP112_TEMP_MAX_EM)) {
+			return -EINVAL;
+		}
+		reg_value = (uint16_t)v << TMP112_DATA_EXTENDED_SHIFT;
+	} else {
+		if (!IN_RANGE(v, TMP112_TEMP_MIN, TMP112_TEMP_MAX)) {
+			return -EINVAL;
+		}
+		reg_value = (uint16_t)v << TMP112_DATA_NORMAL_SHIFT;
+	}
+
+	return tmp112_reg_write(dev->config, reg, reg_value);
+}
+
+static int tmp112_attr_set(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, const struct sensor_value *val)
 {
 	uint16_t value;
 	uint16_t cr;
@@ -93,8 +110,9 @@ static int tmp112_attr_set(const struct device *dev,
 		}
 		break;
 #endif
-	case SENSOR_ATTR_SAMPLING_FREQUENCY:
+
 #if CONFIG_TMP112_SAMPLING_FREQUENCY_RUNTIME
+	case SENSOR_ATTR_SAMPLING_FREQUENCY:
 		/* conversion rate in mHz */
 		cr = val->val1 * 1000 + val->val2 / 1000;
 
@@ -129,6 +147,12 @@ static int tmp112_attr_set(const struct device *dev,
 		break;
 #endif
 
+	case SENSOR_ATTR_LOWER_THRESH:
+		return tmp112_set_threshold(dev, TMP112_REG_TLOW, sensor_value_to_micro(val));
+
+	case SENSOR_ATTR_UPPER_THRESH:
+		return tmp112_set_threshold(dev, TMP112_REG_THIGH, sensor_value_to_micro(val));
+
 	default:
 		return -ENOTSUP;
 	}
@@ -136,8 +160,7 @@ static int tmp112_attr_set(const struct device *dev,
 	return 0;
 }
 
-static int tmp112_sample_fetch(const struct device *dev,
-			       enum sensor_channel chan)
+static int tmp112_sample_fetch(const struct device *dev, enum sensor_channel chan)
 {
 	struct tmp112_data *drv_data = dev->data;
 	const struct tmp112_config *cfg = dev->config;
@@ -150,32 +173,24 @@ static int tmp112_sample_fetch(const struct device *dev,
 	}
 
 	if (val & TMP112_DATA_EXTENDED) {
-		drv_data->sample = arithmetic_shift_right((int16_t)val,
-							  TMP112_DATA_EXTENDED_SHIFT);
+		drv_data->sample = arithmetic_shift_right((int16_t)val, TMP112_DATA_EXTENDED_SHIFT);
 	} else {
-		drv_data->sample = arithmetic_shift_right((int16_t)val,
-							  TMP112_DATA_NORMAL_SHIFT);
+		drv_data->sample = arithmetic_shift_right((int16_t)val, TMP112_DATA_NORMAL_SHIFT);
 	}
 
 	return 0;
 }
 
-static int tmp112_channel_get(const struct device *dev,
-			      enum sensor_channel chan,
+static int tmp112_channel_get(const struct device *dev, enum sensor_channel chan,
 			      struct sensor_value *val)
 {
 	struct tmp112_data *drv_data = dev->data;
-	int32_t uval;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
 	}
 
-	uval = (int32_t)drv_data->sample * TMP112_TEMP_SCALE;
-	val->val1 = uval / 1000000;
-	val->val2 = uval % 1000000;
-
-	return 0;
+	return sensor_value_from_micro(val, (int32_t)drv_data->sample * TMP112_TEMP_SCALE);
 }
 
 static DEVICE_API(sensor, tmp112_driver_api) = {
@@ -188,29 +203,49 @@ int tmp112_init(const struct device *dev)
 {
 	const struct tmp112_config *cfg = dev->config;
 	struct tmp112_data *data = dev->data;
+	int ret;
 
 	if (!device_is_ready(cfg->bus.bus)) {
 		LOG_ERR("I2C dev %s not ready", cfg->bus.bus->name);
 		return -EINVAL;
 	}
 
-	data->config_reg = TMP112_CONV_RATE(cfg->cr) | TMP112_CONV_RES_MASK
-			   | (cfg->extended_mode ? TMP112_CONFIG_EM : 0);
+	data->config_reg = TMP112_CONV_RATE(cfg->cr) | TMP112_CONV_RES_MASK |
+			   (cfg->extended_mode ? TMP112_CONFIG_EM : 0);
 
-	return tmp112_update_config(dev, 0, 0);
-}
+	ret = tmp112_update_config(dev, 0, 0);
+	if (ret) {
+		LOG_ERR("Failed to set configuration (%d)", ret);
+		return ret;
+	}
 
+	ret = tmp112_set_threshold(dev, TMP112_REG_TLOW, cfg->t_low_micro_c);
+	if (ret) {
+		LOG_ERR("Failed to set tLow threshold (%d)", ret);
+		return ret;
+	}
+
+	ret = tmp112_set_threshold(dev, TMP112_REG_THIGH, cfg->t_high_micro_c);
+	if (ret) {
+		LOG_ERR("Failed to set tHigh threshold (%d)", ret);
+		return ret;
+	}
+
+	return 0;
+}
 
-#define TMP112_INST(inst)						    \
-	static struct tmp112_data tmp112_data_##inst;			    \
-	static const struct tmp112_config tmp112_config_##inst = {	    \
-		.bus = I2C_DT_SPEC_INST_GET(inst),			    \
-		.cr = DT_INST_ENUM_IDX(inst, conversion_rate),		    \
-		.extended_mode = DT_INST_PROP(inst, extended_mode),	    \
-	};								    \
-									    \
-	SENSOR_DEVICE_DT_INST_DEFINE(inst, tmp112_init, NULL, &tmp112_data_##inst, \
-			      &tmp112_config_##inst, POST_KERNEL,	    \
-			      CONFIG_SENSOR_INIT_PRIORITY, &tmp112_driver_api);
+#define TMP112_INST(inst)                                                                          \
+	static struct tmp112_data tmp112_data_##inst;                                              \
+	static const struct tmp112_config tmp112_config_##inst = {                                 \
+		.bus = I2C_DT_SPEC_INST_GET(inst),                                                 \
+		.cr = DT_INST_ENUM_IDX(inst, conversion_rate),                                     \
+		.t_low_micro_c = DT_INST_PROP(inst, t_low_micro_c),                                \
+		.t_high_micro_c = DT_INST_PROP(inst, t_high_micro_c),                              \
+		.extended_mode = DT_INST_PROP(inst, extended_mode),                                \
+	};                                                                                         \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, tmp112_init, NULL, &tmp112_data_##inst,                 \
+				     &tmp112_config_##inst, POST_KERNEL,                           \
+				     CONFIG_SENSOR_INIT_PRIORITY, &tmp112_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(TMP112_INST)
diff --git a/drivers/sensor/ti/tmp112/tmp112.h b/drivers/sensor/ti/tmp112/tmp112.h
index 6f2b3f7b32b64..6ea1258115b1d 100644
--- a/drivers/sensor/ti/tmp112/tmp112.h
+++ b/drivers/sensor/ti/tmp112/tmp112.h
@@ -41,6 +41,16 @@
 /* scale in micro degrees Celsius */
 #define TMP112_TEMP_SCALE       62500
 
+/* RAW min/max temperature values - LSB=TMP112_TEMP_SCALE */
+/* 128C */
+#define TMP112_TEMP_MAX    2047
+/* -55C */
+#define TMP112_TEMP_MIN    -880
+/* 150C */
+#define TMP112_TEMP_MAX_EM 2400
+/* -55C */
+#define TMP112_TEMP_MIN_EM TMP112_TEMP_MIN
+
 struct tmp112_data {
 	int16_t sample;
 	uint16_t config_reg;
@@ -49,6 +59,8 @@ struct tmp112_data {
 struct tmp112_config {
 	const struct i2c_dt_spec bus;
 	uint8_t cr;
+	int32_t t_low_micro_c;
+	int32_t t_high_micro_c;
 	bool extended_mode : 1;
 };
 
diff --git a/drivers/sensor/ti/tmp114/tmp114.c b/drivers/sensor/ti/tmp114/tmp114.c
index 6d7409a6ff4e0..24e50d2e16d2f 100644
--- a/drivers/sensor/ti/tmp114/tmp114.c
+++ b/drivers/sensor/ti/tmp114/tmp114.c
@@ -9,6 +9,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/dt-bindings/sensor/tmp114.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log.h>
@@ -26,8 +27,10 @@ LOG_MODULE_REGISTER(TMP114, CONFIG_SENSOR_LOG_LEVEL);
 
 #define TMP114_DEVICE_ID	0x1114
 
-#define TMP114_ALERT_DATA_READY  BIT(0)
-#define TMP114_AVG_MASK          BIT(7)
+#define TMP114_ALERT_DATA_READY BIT(0)
+#define TMP114_CFGR_AVG		BIT(7)
+#define TMP114_AVG		BIT(7)
+#define TMP114_CFGR_CONV	(BIT(0) | BIT(1) | BIT(2))
 
 struct tmp114_data {
 	uint16_t sample;
@@ -36,15 +39,15 @@ struct tmp114_data {
 
 struct tmp114_dev_config {
 	struct i2c_dt_spec bus;
+	uint16_t odr;
+	bool oversampling;
 };
 
-static int tmp114_reg_read(const struct device *dev, uint8_t reg,
-			   uint16_t *val)
+static int tmp114_reg_read(const struct device *dev, uint8_t reg, uint16_t *val)
 {
 	const struct tmp114_dev_config *cfg = dev->config;
 
-	if (i2c_burst_read_dt(&cfg->bus, reg, (uint8_t *)val, 2)
-	    < 0) {
+	if (i2c_burst_read_dt(&cfg->bus, reg, (uint8_t *)val, 2) < 0) {
 		return -EIO;
 	}
 
@@ -53,8 +56,7 @@ static int tmp114_reg_read(const struct device *dev, uint8_t reg,
 	return 0;
 }
 
-static int tmp114_reg_write(const struct device *dev, uint8_t reg,
-			    uint16_t val)
+static int tmp114_reg_write(const struct device *dev, uint8_t reg, uint16_t val)
 {
 	const struct tmp114_dev_config *cfg = dev->config;
 	uint8_t tx_buf[3] = {reg, val >> 8, val & 0xFF};
@@ -62,6 +64,29 @@ static int tmp114_reg_write(const struct device *dev, uint8_t reg,
 	return i2c_write_dt(&cfg->bus, tx_buf, sizeof(tx_buf));
 }
 
+static int tmp114_write_config(const struct device *dev, uint16_t mask, uint16_t conf)
+{
+	uint16_t config = 0;
+	int result;
+
+	result = tmp114_reg_read(dev, TMP114_REG_CFGR, &config);
+
+	if (result < 0) {
+		return result;
+	}
+
+	config &= ~mask;
+	config |= conf;
+
+	result = tmp114_reg_write(dev, TMP114_REG_CFGR, config);
+
+	if (result < 0) {
+		return result;
+	}
+
+	return 0;
+}
+
 static inline int tmp114_device_id_check(const struct device *dev, uint16_t *id)
 {
 	if (tmp114_reg_read(dev, TMP114_REG_DEVICE_ID, id) != 0) {
@@ -116,8 +141,7 @@ static int tmp114_sample_fetch(const struct device *dev,
 	return 0;
 }
 
-static int tmp114_channel_get(const struct device *dev,
-			      enum sensor_channel chan,
+static int tmp114_channel_get(const struct device *dev, enum sensor_channel chan,
 			      struct sensor_value *val)
 {
 	struct tmp114_data *drv_data = dev->data;
@@ -165,13 +189,38 @@ static int tmp114_attr_get(const struct device *dev, enum sensor_channel chan,
 	return 0;
 }
 
-static int tmp114_attr_set(const struct device *dev,
-			   enum sensor_channel chan,
-			   enum sensor_attribute attr,
-			   const struct sensor_value *val)
+static int tmp114_odr_value(const struct sensor_value *frequency, uint16_t *config_value)
 {
-	int16_t value;
-	int rc;
+	const uint32_t freq_micro = sensor_value_to_micro(frequency);
+
+	if (freq_micro <= 500000) {
+		*config_value = TMP114_DT_ODR_2000_MS; /* 2 s */
+	} else if (freq_micro <= 1000000) {
+		*config_value = TMP114_DT_ODR_1000_MS; /* 1 s */
+	} else if (freq_micro <= 2000000) {
+		*config_value = TMP114_DT_ODR_500_MS; /* 500 ms */
+	} else if (freq_micro <= 4000000) {
+		*config_value = TMP114_DT_ODR_250_MS; /* 250 ms */
+	} else if (freq_micro <= 8000000) {
+		*config_value = TMP114_DT_ODR_125_MS; /* 125 ms */
+	} else if (freq_micro <= 16000000) {
+		*config_value = TMP114_DT_ODR_62_5_MS; /* 62.5 ms */
+	} else if (freq_micro <= 32000000) {
+		*config_value = TMP114_DT_ODR_31_25_MS; /* 32.25 ms */
+	} else if (freq_micro <= 156250000) {
+		*config_value = TMP114_DT_ODR_6_4_MS; /* 6.4 ms */
+	} else {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int tmp114_attr_set(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, const struct sensor_value *val)
+{
+	uint16_t value = 0;
+	int rc = 0;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
@@ -182,16 +231,20 @@ static int tmp114_attr_set(const struct device *dev,
 		/* Enable the AVG in tmp114. The chip will do 8 avg of 8 samples
 		 * to get a more accurate value.
 		 */
-		rc = tmp114_reg_read(dev, TMP114_REG_CFGR, &value);
+
+		if (val->val1) {
+			value = TMP114_AVG;
+		}
+
+		return tmp114_write_config(dev, TMP114_CFGR_AVG, value);
+	case SENSOR_ATTR_SAMPLING_FREQUENCY:
+		/* Set the output data rate tmp114. */
+		rc = tmp114_odr_value(val, &value);
 		if (rc < 0) {
 			return rc;
 		}
-		value = value & ~TMP114_AVG_MASK;
-		if (val->val1) {
-			value |= TMP114_AVG_MASK;
-		}
 
-		return tmp114_reg_write(dev, TMP114_REG_CFGR, value);
+		return tmp114_write_config(dev, TMP114_CFGR_CONV, value);
 	default:
 		return -ENOTSUP;
 	}
@@ -210,6 +263,7 @@ static int tmp114_init(const struct device *dev)
 	const struct tmp114_dev_config *cfg = dev->config;
 	int rc;
 	uint16_t id;
+	struct sensor_value val;
 
 	if (!i2c_is_ready_dt(&cfg->bus)) {
 		LOG_ERR("I2C dev %s not ready", cfg->bus.bus->name);
@@ -224,13 +278,28 @@ static int tmp114_init(const struct device *dev)
 	LOG_INF("Got device ID: %x", id);
 	drv_data->id = id;
 
+	rc = tmp114_write_config(dev, TMP114_CFGR_CONV, cfg->odr);
+	if (rc < 0) {
+		return rc;
+	}
+
+	val.val1 = cfg->oversampling ? 1 : 0;
+	val.val2 = 0;
+
+	rc = tmp114_attr_set(dev, SENSOR_CHAN_AMBIENT_TEMP, SENSOR_ATTR_OVERSAMPLING, &val);
+	if (rc < 0) {
+		return rc;
+	}
+
 	return 0;
 }
 
 #define DEFINE_TMP114(_num) \
 	static struct tmp114_data tmp114_data_##_num; \
 	static const struct tmp114_dev_config tmp114_config_##_num = { \
-		.bus = I2C_DT_SPEC_INST_GET(_num) \
+		.bus = I2C_DT_SPEC_INST_GET(_num), \
+		.odr = DT_INST_PROP(_num, odr), \
+		.oversampling = DT_INST_PROP(_num, oversampling), \
 	}; \
 	SENSOR_DEVICE_DT_INST_DEFINE(_num, tmp114_init, NULL, \
 		&tmp114_data_##_num, &tmp114_config_##_num, POST_KERNEL, \
diff --git a/drivers/sensor/ti/tmp116/CMakeLists.txt b/drivers/sensor/ti/tmp116/CMakeLists.txt
deleted file mode 100644
index ee8d2a6462183..0000000000000
--- a/drivers/sensor/ti/tmp116/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library()
-
-zephyr_library_sources(tmp116.c)
diff --git a/drivers/sensor/ti/tmp116/Kconfig b/drivers/sensor/ti/tmp116/Kconfig
deleted file mode 100644
index 37a5d60ed7729..0000000000000
--- a/drivers/sensor/ti/tmp116/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# TMP116 temperature sensor configuration options
-
-# Copyright (c) 2019 Centaur Analytics, Inc
-# SPDX-License-Identifier: Apache-2.0
-
-config TMP116
-	bool "TMP116 and TMP117 Temperature Sensors"
-	default y
-	depends on DT_HAS_TI_TMP116_ENABLED
-	select I2C
-	help
-	  Enable driver for TMP116 and TMP117 temperature sensors.
diff --git a/drivers/sensor/ti/tmp116/tmp116.c b/drivers/sensor/ti/tmp116/tmp116.c
deleted file mode 100644
index 26a7f8383ea5e..0000000000000
--- a/drivers/sensor/ti/tmp116/tmp116.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Copyright (c) 2019 Centaur Analytics, Inc
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT ti_tmp116
-
-#include <zephyr/device.h>
-#include <zephyr/drivers/i2c.h>
-#include <zephyr/drivers/sensor.h>
-#include <zephyr/drivers/sensor/tmp116.h>
-#include <zephyr/dt-bindings/sensor/tmp116.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/kernel.h>
-
-#include "tmp116.h"
-
-#define  EEPROM_SIZE_REG sizeof(uint16_t)
-#define  EEPROM_TMP117_RESERVED (2 * sizeof(uint16_t))
-#define  EEPROM_MIN_BUSY_MS 7
-
-LOG_MODULE_REGISTER(TMP116, CONFIG_SENSOR_LOG_LEVEL);
-
-static int tmp116_reg_read(const struct device *dev, uint8_t reg,
-			   uint16_t *val)
-{
-	const struct tmp116_dev_config *cfg = dev->config;
-
-	if (i2c_burst_read_dt(&cfg->bus, reg, (uint8_t *)val, 2)
-	    < 0) {
-		return -EIO;
-	}
-
-	*val = sys_be16_to_cpu(*val);
-
-	return 0;
-}
-
-static int tmp116_reg_write(const struct device *dev, uint8_t reg,
-			    uint16_t val)
-{
-	const struct tmp116_dev_config *cfg = dev->config;
-	uint8_t tx_buf[3] = {reg, val >> 8, val & 0xFF};
-
-	return i2c_write_dt(&cfg->bus, tx_buf, sizeof(tx_buf));
-}
-
-int tmp116_write_config(const struct device *dev, uint16_t mask, uint16_t conf)
-{
-	uint16_t config = 0;
-	int result;
-
-	result = tmp116_reg_read(dev, TMP116_REG_CFGR, &config);
-
-	if (result < 0) {
-		return result;
-	}
-
-	config &= ~mask;
-	config |= conf;
-
-	return tmp116_reg_write(dev, TMP116_REG_CFGR, config);
-}
-
-static bool check_eeprom_bounds(const struct device *dev, off_t offset,
-			       size_t len)
-{
-	struct tmp116_data *drv_data = dev->data;
-
-	if ((offset + len) > EEPROM_TMP116_SIZE ||
-	    offset % EEPROM_SIZE_REG != 0 ||
-	    len % EEPROM_SIZE_REG != 0) {
-		return false;
-	}
-
-	/* TMP117 uses EEPROM[2] as temperature offset register */
-	if (drv_data->id == TMP117_DEVICE_ID &&
-	    offset <= EEPROM_TMP117_RESERVED &&
-	    (offset + len) > EEPROM_TMP117_RESERVED) {
-		return false;
-	}
-
-	return true;
-}
-
-int tmp116_eeprom_write(const struct device *dev, off_t offset,
-			const void *data, size_t len)
-{
-	uint8_t reg;
-	const uint16_t *src = data;
-	int res;
-
-	if (!check_eeprom_bounds(dev, offset, len)) {
-		return -EINVAL;
-	}
-
-	res = tmp116_reg_write(dev, TMP116_REG_EEPROM_UL, TMP116_EEPROM_UL_UNLOCK);
-	if (res) {
-		return res;
-	}
-
-	for (reg = (offset / 2); reg < offset / 2 + len / 2; reg++) {
-		uint16_t val = *src;
-
-		res = tmp116_reg_write(dev, reg + TMP116_REG_EEPROM1, val);
-		if (res != 0) {
-			break;
-		}
-
-		k_sleep(K_MSEC(EEPROM_MIN_BUSY_MS));
-
-		do {
-			res = tmp116_reg_read(dev, TMP116_REG_EEPROM_UL, &val);
-			if (res != 0) {
-				break;
-			}
-		} while (val & TMP116_EEPROM_UL_BUSY);
-		src++;
-
-		if (res != 0) {
-			break;
-		}
-	}
-
-	res = tmp116_reg_write(dev, TMP116_REG_EEPROM_UL, 0);
-
-	return res;
-}
-
-int tmp116_eeprom_read(const struct device *dev, off_t offset, void *data,
-		       size_t len)
-{
-	uint8_t reg;
-	uint16_t *dst = data;
-	int res = 0;
-
-	if (!check_eeprom_bounds(dev, offset, len)) {
-		return -EINVAL;
-	}
-
-	for (reg = (offset / 2); reg < offset / 2 + len / 2; reg++) {
-		res = tmp116_reg_read(dev, reg + TMP116_REG_EEPROM1, dst);
-		if (res != 0) {
-			break;
-		}
-		dst++;
-	}
-
-	return res;
-}
-
-
-/**
- * @brief Check the Device ID
- *
- * @param[in]   dev     Pointer to the device structure
- * @param[in]	id	Pointer to the variable for storing the device id
- *
- * @retval 0 on success
- * @retval -EIO Otherwise
- */
-static inline int tmp116_device_id_check(const struct device *dev, uint16_t *id)
-{
-	if (tmp116_reg_read(dev, TMP116_REG_DEVICE_ID, id) != 0) {
-		LOG_ERR("%s: Failed to get Device ID register!",
-			dev->name);
-		return -EIO;
-	}
-
-	if ((*id != TMP116_DEVICE_ID) && (*id != TMP117_DEVICE_ID)) {
-		LOG_ERR("%s: Failed to match the device IDs!",
-			dev->name);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int tmp116_sample_fetch(const struct device *dev,
-			       enum sensor_channel chan)
-{
-	struct tmp116_data *drv_data = dev->data;
-	uint16_t value;
-	uint16_t cfg_reg = 0;
-	int rc;
-
-	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
-			chan == SENSOR_CHAN_AMBIENT_TEMP);
-
-	/* clear sensor values */
-	drv_data->sample = 0U;
-
-	/* Make sure that a data is available */
-	rc = tmp116_reg_read(dev, TMP116_REG_CFGR, &cfg_reg);
-	if (rc < 0) {
-		LOG_ERR("%s, Failed to read from CFGR register",
-			dev->name);
-		return rc;
-	}
-
-	if ((cfg_reg & TMP116_CFGR_DATA_READY) == 0) {
-		LOG_DBG("%s: no data ready", dev->name);
-		return -EBUSY;
-	}
-
-	/* Get the most recent temperature measurement */
-	rc = tmp116_reg_read(dev, TMP116_REG_TEMP, &value);
-	if (rc < 0) {
-		LOG_ERR("%s: Failed to read from TEMP register!",
-			dev->name);
-		return rc;
-	}
-
-	/* store measurements to the driver */
-	drv_data->sample = (int16_t)value;
-
-	return 0;
-}
-
-static int tmp116_channel_get(const struct device *dev,
-			      enum sensor_channel chan,
-			      struct sensor_value *val)
-{
-	struct tmp116_data *drv_data = dev->data;
-	int32_t tmp;
-
-	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
-		return -ENOTSUP;
-	}
-
-	/*
-	 * See datasheet "Temperature Results and Limits" section for more
-	 * details on processing sample data.
-	 */
-	tmp = ((int16_t)drv_data->sample * (int32_t)TMP116_RESOLUTION) / 10;
-	val->val1 = tmp / 1000000; /* uCelsius */
-	val->val2 = tmp % 1000000;
-
-	return 0;
-}
-
-static int16_t tmp116_conv_value(const struct sensor_value *val)
-{
-	uint32_t freq_micro = sensor_value_to_micro(val);
-
-	switch (freq_micro) {
-	case 64000000: /* 1 / 15.5 ms has been rounded down */
-		return TMP116_DT_ODR_15_5_MS;
-	case 8000000:
-		return TMP116_DT_ODR_125_MS;
-	case 4000000:
-		return TMP116_DT_ODR_250_MS;
-	case 2000000:
-		return TMP116_DT_ODR_500_MS;
-	case 1000000:
-		return TMP116_DT_ODR_1000_MS;
-	case 250000:
-		return TMP116_DT_ODR_4000_MS;
-	case 125000:
-		return TMP116_DT_ODR_8000_MS;
-	case 62500:
-		return TMP116_DT_ODR_16000_MS;
-	default:
-		LOG_ERR("%" PRIu32 " uHz not supported", freq_micro);
-		return -EINVAL;
-	}
-}
-
-static int tmp116_attr_set(const struct device *dev,
-			   enum sensor_channel chan,
-			   enum sensor_attribute attr,
-			   const struct sensor_value *val)
-{
-	struct tmp116_data *drv_data = dev->data;
-	int16_t value;
-	uint16_t avg;
-
-	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
-		return -ENOTSUP;
-	}
-
-	switch ((int)attr) {
-	case SENSOR_ATTR_SAMPLING_FREQUENCY:
-		value = tmp116_conv_value(val);
-		if (value < 0) {
-			return value;
-		}
-
-		return tmp116_write_config(dev, TMP116_CFGR_CONV, value);
-
-	case SENSOR_ATTR_OFFSET:
-		if (drv_data->id != TMP117_DEVICE_ID) {
-			LOG_ERR("%s: Offset is only supported by TMP117",
-			dev->name);
-			return -EINVAL;
-		}
-		/*
-		 * The offset is encoded into the temperature register format.
-		 */
-		value = (((val->val1) * 10000000) + ((val->val2) * 10))
-						/ (int32_t)TMP116_RESOLUTION;
-
-		return tmp116_reg_write(dev, TMP117_REG_TEMP_OFFSET, value);
-
-	case SENSOR_ATTR_OVERSAMPLING:
-		/* sensor supports averaging 1, 8, 32 and 64 samples */
-		switch (val->val1) {
-		case 1:
-			avg = TMP116_AVG_1_SAMPLE;
-			break;
-
-		case 8:
-			avg = TMP116_AVG_8_SAMPLES;
-			break;
-
-		case 32:
-			avg = TMP116_AVG_32_SAMPLES;
-			break;
-
-		case 64:
-			avg = TMP116_AVG_64_SAMPLES;
-			break;
-
-		default:
-			return -EINVAL;
-		}
-		return tmp116_write_config(dev, TMP116_CFGR_AVG, avg);
-	case SENSOR_ATTR_TMP116_SHUTDOWN_MODE:
-		return tmp116_write_config(dev, TMP116_CFGR_MODE, TMP116_MODE_SHUTDOWN);
-
-	case SENSOR_ATTR_TMP116_CONTINUOUS_CONVERSION_MODE:
-		return tmp116_write_config(dev, TMP116_CFGR_MODE, TMP116_MODE_CONTINUOUS);
-
-	case SENSOR_ATTR_TMP116_ONE_SHOT_MODE:
-		return tmp116_write_config(dev, TMP116_CFGR_MODE, TMP116_MODE_ONE_SHOT);
-
-	default:
-		return -ENOTSUP;
-	}
-}
-
-static int tmp116_attr_get(const struct device *dev, enum sensor_channel chan,
-			   enum sensor_attribute attr, struct sensor_value *val)
-{
-	uint16_t data;
-	int rc;
-
-	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
-		return -ENOTSUP;
-	}
-
-	switch (attr) {
-	case SENSOR_ATTR_CONFIGURATION:
-		rc = tmp116_reg_read(dev, TMP116_REG_CFGR, &data);
-		if (rc < 0) {
-			return rc;
-		}
-		break;
-	default:
-		return -ENOTSUP;
-	}
-
-	val->val1 = data;
-	val->val2 = 0;
-
-	return 0;
-}
-
-static DEVICE_API(sensor, tmp116_driver_api) = {
-	.attr_set = tmp116_attr_set,
-	.attr_get = tmp116_attr_get,
-	.sample_fetch = tmp116_sample_fetch,
-	.channel_get = tmp116_channel_get
-};
-
-static int tmp116_init(const struct device *dev)
-{
-	struct tmp116_data *drv_data = dev->data;
-	const struct tmp116_dev_config *cfg = dev->config;
-	int rc;
-	uint16_t id;
-
-	if (!device_is_ready(cfg->bus.bus)) {
-		LOG_ERR("I2C dev %s not ready", cfg->bus.bus->name);
-		return -EINVAL;
-	}
-
-	/* Check the Device ID */
-	rc = tmp116_device_id_check(dev, &id);
-	if (rc < 0) {
-		return rc;
-	}
-	LOG_DBG("Got device ID: %x", id);
-	drv_data->id = id;
-
-	rc = tmp116_write_config(dev, TMP116_CFGR_CONV, cfg->odr);
-	if (rc < 0) {
-		return rc;
-	}
-
-	rc = tmp116_write_config(dev, TMP116_CFGR_AVG, cfg->oversampling);
-
-	return rc;
-}
-
-#define DEFINE_TMP116(_num) \
-	static struct tmp116_data tmp116_data_##_num; \
-	static const struct tmp116_dev_config tmp116_config_##_num = { \
-		.bus = I2C_DT_SPEC_INST_GET(_num), \
-		.odr = DT_INST_PROP(_num, odr), \
-		.oversampling = DT_INST_PROP(_num, oversampling), \
-	}; \
-	SENSOR_DEVICE_DT_INST_DEFINE(_num, tmp116_init, NULL, \
-		&tmp116_data_##_num, &tmp116_config_##_num, POST_KERNEL, \
-		CONFIG_SENSOR_INIT_PRIORITY, &tmp116_driver_api);
-
-DT_INST_FOREACH_STATUS_OKAY(DEFINE_TMP116)
diff --git a/drivers/sensor/ti/tmp116/tmp116.h b/drivers/sensor/ti/tmp116/tmp116.h
deleted file mode 100644
index fc57feb055279..0000000000000
--- a/drivers/sensor/ti/tmp116/tmp116.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2019 Centaur Analytics, Inc
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_DRIVERS_SENSOR_TMP116_TMP116_H_
-#define ZEPHYR_DRIVERS_SENSOR_TMP116_TMP116_H_
-
-#include <zephyr/sys/util_macro.h>
-
-#define TMP116_REG_TEMP		0x0
-#define TMP116_REG_CFGR		0x1
-#define TMP116_REG_HIGH_LIM		0x2
-#define TMP116_REG_LOW_LIM		0x3
-#define TMP116_REG_EEPROM_UL		0x4
-#define TMP116_REG_EEPROM1		0x5
-#define TMP116_REG_EEPROM2		0x6
-#define TMP116_REG_EEPROM3		0x7
-#define TMP117_REG_TEMP_OFFSET		0x7
-#define TMP116_REG_EEPROM4		0x8
-#define TMP116_REG_DEVICE_ID		0xF
-
-#define TMP116_RESOLUTION		78125       /* in tens of uCelsius*/
-#define TMP116_RESOLUTION_DIV		10000000
-
-#define TMP116_DEVICE_ID		0x1116
-#define TMP117_DEVICE_ID		0x0117
-
-#define TMP116_CFGR_AVG			(BIT(5) | BIT(6))
-#define TMP116_CFGR_CONV		(BIT(7) | BIT(8) | BIT(9))
-#define TMP116_CFGR_MODE		(BIT(10) | BIT(11))
-#define TMP116_CFGR_DATA_READY  BIT(13)
-#define TMP116_EEPROM_UL_UNLOCK BIT(15)
-#define TMP116_EEPROM_UL_BUSY   BIT(14)
-
-#define TMP116_AVG_1_SAMPLE		0
-#define TMP116_AVG_8_SAMPLES	BIT(5)
-#define TMP116_AVG_32_SAMPLES	BIT(6)
-#define TMP116_AVG_64_SAMPLES	(BIT(5) | BIT(6))
-#define TMP116_MODE_CONTINUOUS	0
-#define TMP116_MODE_SHUTDOWN	BIT(10)
-#define TMP116_MODE_ONE_SHOT	(BIT(10) | BIT(11))
-
-struct tmp116_data {
-	uint16_t sample;
-	uint16_t id;
-};
-
-struct tmp116_dev_config {
-	struct i2c_dt_spec bus;
-	uint16_t odr;
-	uint16_t oversampling;
-};
-
-#endif /*  ZEPHYR_DRIVERS_SENSOR_TMP116_TMP116_H_ */
diff --git a/drivers/sensor/ti/tmp11x/CMakeLists.txt b/drivers/sensor/ti/tmp11x/CMakeLists.txt
new file mode 100644
index 0000000000000..48d083d2b1b8a
--- /dev/null
+++ b/drivers/sensor/ti/tmp11x/CMakeLists.txt
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources(tmp11x.c)
diff --git a/drivers/sensor/ti/tmp11x/Kconfig b/drivers/sensor/ti/tmp11x/Kconfig
new file mode 100644
index 0000000000000..e66ea0a7a543b
--- /dev/null
+++ b/drivers/sensor/ti/tmp11x/Kconfig
@@ -0,0 +1,12 @@
+# TMP11X temperature sensor configuration options
+
+# Copyright (c) 2019 Centaur Analytics, Inc
+# SPDX-License-Identifier: Apache-2.0
+
+config TMP11X
+	bool "TMP116, TMP117 and TMP119 Temperature Sensors"
+	default y
+	depends on DT_HAS_TI_TMP11X_ENABLED
+	select I2C
+	help
+	  Enable driver for TMP116, TMP117 and TMP119 temperature sensors.
diff --git a/drivers/sensor/ti/tmp11x/tmp11x.c b/drivers/sensor/ti/tmp11x/tmp11x.c
new file mode 100644
index 0000000000000..cfb1abd6a07b8
--- /dev/null
+++ b/drivers/sensor/ti/tmp11x/tmp11x.c
@@ -0,0 +1,420 @@
+/*
+ * Copyright (c) 2019 Centaur Analytics, Inc
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_tmp11x
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor/tmp11x.h>
+#include <zephyr/dt-bindings/sensor/tmp11x.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
+
+#include "tmp11x.h"
+
+#define  EEPROM_SIZE_REG sizeof(uint16_t)
+#define  EEPROM_TMP117_RESERVED (2 * sizeof(uint16_t))
+#define  EEPROM_MIN_BUSY_MS 7
+
+LOG_MODULE_REGISTER(TMP11X, CONFIG_SENSOR_LOG_LEVEL);
+
+static int tmp11x_reg_read(const struct device *dev, uint8_t reg,
+			   uint16_t *val)
+{
+	const struct tmp11x_dev_config *cfg = dev->config;
+
+	if (i2c_burst_read_dt(&cfg->bus, reg, (uint8_t *)val, 2)
+	    < 0) {
+		return -EIO;
+	}
+
+	*val = sys_be16_to_cpu(*val);
+
+	return 0;
+}
+
+static int tmp11x_reg_write(const struct device *dev, uint8_t reg,
+			    uint16_t val)
+{
+	const struct tmp11x_dev_config *cfg = dev->config;
+	uint8_t tx_buf[3] = {reg, val >> 8, val & 0xFF};
+
+	return i2c_write_dt(&cfg->bus, tx_buf, sizeof(tx_buf));
+}
+
+int tmp11x_write_config(const struct device *dev, uint16_t mask, uint16_t conf)
+{
+	uint16_t config = 0;
+	int result;
+
+	result = tmp11x_reg_read(dev, TMP11X_REG_CFGR, &config);
+
+	if (result < 0) {
+		return result;
+	}
+
+	config &= ~mask;
+	config |= conf;
+
+	return tmp11x_reg_write(dev, TMP11X_REG_CFGR, config);
+}
+
+static bool check_eeprom_bounds(const struct device *dev, off_t offset,
+			       size_t len)
+{
+	struct tmp11x_data *drv_data = dev->data;
+
+	if ((offset + len) > EEPROM_TMP11X_SIZE ||
+	    offset % EEPROM_SIZE_REG != 0 ||
+	    len % EEPROM_SIZE_REG != 0) {
+		return false;
+	}
+
+	/* TMP117 and TMP119 uses EEPROM[2] as temperature offset register */
+	if ((drv_data->id == TMP117_DEVICE_ID || drv_data->id == TMP119_DEVICE_ID) &&
+	    offset <= EEPROM_TMP117_RESERVED && (offset + len) > EEPROM_TMP117_RESERVED) {
+		return false;
+	}
+
+	return true;
+}
+
+int tmp11x_eeprom_write(const struct device *dev, off_t offset,
+			const void *data, size_t len)
+{
+	uint8_t reg;
+	const uint16_t *src = data;
+	int res;
+
+	if (!check_eeprom_bounds(dev, offset, len)) {
+		return -EINVAL;
+	}
+
+	res = tmp11x_reg_write(dev, TMP11X_REG_EEPROM_UL, TMP11X_EEPROM_UL_UNLOCK);
+	if (res) {
+		return res;
+	}
+
+	for (reg = (offset / 2); reg < offset / 2 + len / 2; reg++) {
+		uint16_t val = *src;
+
+		res = tmp11x_reg_write(dev, reg + TMP11X_REG_EEPROM1, val);
+		if (res != 0) {
+			break;
+		}
+
+		k_sleep(K_MSEC(EEPROM_MIN_BUSY_MS));
+
+		do {
+			res = tmp11x_reg_read(dev, TMP11X_REG_EEPROM_UL, &val);
+			if (res != 0) {
+				break;
+			}
+		} while (val & TMP11X_EEPROM_UL_BUSY);
+		src++;
+
+		if (res != 0) {
+			break;
+		}
+	}
+
+	res = tmp11x_reg_write(dev, TMP11X_REG_EEPROM_UL, 0);
+
+	return res;
+}
+
+int tmp11x_eeprom_read(const struct device *dev, off_t offset, void *data,
+		       size_t len)
+{
+	uint8_t reg;
+	uint16_t *dst = data;
+	int res = 0;
+
+	if (!check_eeprom_bounds(dev, offset, len)) {
+		return -EINVAL;
+	}
+
+	for (reg = (offset / 2); reg < offset / 2 + len / 2; reg++) {
+		res = tmp11x_reg_read(dev, reg + TMP11X_REG_EEPROM1, dst);
+		if (res != 0) {
+			break;
+		}
+		dst++;
+	}
+
+	return res;
+}
+
+
+/**
+ * @brief Check the Device ID
+ *
+ * @param[in]   dev     Pointer to the device structure
+ * @param[in]	id	Pointer to the variable for storing the device id
+ *
+ * @retval 0 on success
+ * @retval -EIO Otherwise
+ */
+static inline int tmp11x_device_id_check(const struct device *dev, uint16_t *id)
+{
+	if (tmp11x_reg_read(dev, TMP11X_REG_DEVICE_ID, id) != 0) {
+		LOG_ERR("%s: Failed to get Device ID register!",
+			dev->name);
+		return -EIO;
+	}
+
+	if ((*id != TMP116_DEVICE_ID) && (*id != TMP117_DEVICE_ID) && (*id != TMP119_DEVICE_ID)) {
+		LOG_ERR("%s: Failed to match the device IDs!",
+			dev->name);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int tmp11x_sample_fetch(const struct device *dev,
+			       enum sensor_channel chan)
+{
+	struct tmp11x_data *drv_data = dev->data;
+	uint16_t value;
+	uint16_t cfg_reg = 0;
+	int rc;
+
+	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
+			chan == SENSOR_CHAN_AMBIENT_TEMP);
+
+	/* clear sensor values */
+	drv_data->sample = 0U;
+
+	/* Make sure that a data is available */
+	rc = tmp11x_reg_read(dev, TMP11X_REG_CFGR, &cfg_reg);
+	if (rc < 0) {
+		LOG_ERR("%s, Failed to read from CFGR register",
+			dev->name);
+		return rc;
+	}
+
+	if ((cfg_reg & TMP11X_CFGR_DATA_READY) == 0) {
+		LOG_DBG("%s: no data ready", dev->name);
+		return -EBUSY;
+	}
+
+	/* Get the most recent temperature measurement */
+	rc = tmp11x_reg_read(dev, TMP11X_REG_TEMP, &value);
+	if (rc < 0) {
+		LOG_ERR("%s: Failed to read from TEMP register!",
+			dev->name);
+		return rc;
+	}
+
+	/* store measurements to the driver */
+	drv_data->sample = (int16_t)value;
+
+	return 0;
+}
+
+static int tmp11x_channel_get(const struct device *dev,
+			      enum sensor_channel chan,
+			      struct sensor_value *val)
+{
+	struct tmp11x_data *drv_data = dev->data;
+	int32_t tmp;
+
+	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
+		return -ENOTSUP;
+	}
+
+	/*
+	 * See datasheet "Temperature Results and Limits" section for more
+	 * details on processing sample data.
+	 */
+	tmp = ((int16_t)drv_data->sample * (int32_t)TMP11X_RESOLUTION) / 10;
+	val->val1 = tmp / 1000000; /* uCelsius */
+	val->val2 = tmp % 1000000;
+
+	return 0;
+}
+
+static int16_t tmp11x_conv_value(const struct sensor_value *val)
+{
+	uint32_t freq_micro = sensor_value_to_micro(val);
+
+	switch (freq_micro) {
+	case 64000000: /* 1 / 15.5 ms has been rounded down */
+		return TMP11X_DT_ODR_15_5_MS;
+	case 8000000:
+		return TMP11X_DT_ODR_125_MS;
+	case 4000000:
+		return TMP11X_DT_ODR_250_MS;
+	case 2000000:
+		return TMP11X_DT_ODR_500_MS;
+	case 1000000:
+		return TMP11X_DT_ODR_1000_MS;
+	case 250000:
+		return TMP11X_DT_ODR_4000_MS;
+	case 125000:
+		return TMP11X_DT_ODR_8000_MS;
+	case 62500:
+		return TMP11X_DT_ODR_16000_MS;
+	default:
+		LOG_ERR("%" PRIu32 " uHz not supported", freq_micro);
+		return -EINVAL;
+	}
+}
+
+static int tmp11x_attr_set(const struct device *dev,
+			   enum sensor_channel chan,
+			   enum sensor_attribute attr,
+			   const struct sensor_value *val)
+{
+	struct tmp11x_data *drv_data = dev->data;
+	int16_t value;
+	uint16_t avg;
+
+	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
+		return -ENOTSUP;
+	}
+
+	switch ((int)attr) {
+	case SENSOR_ATTR_SAMPLING_FREQUENCY:
+		value = tmp11x_conv_value(val);
+		if (value < 0) {
+			return value;
+		}
+
+		return tmp11x_write_config(dev, TMP11X_CFGR_CONV, value);
+
+	case SENSOR_ATTR_OFFSET:
+		if (drv_data->id != TMP117_DEVICE_ID && drv_data->id != TMP119_DEVICE_ID) {
+			LOG_ERR("%s: Offset is only supported by TMP117 and TMP119",
+			dev->name);
+			return -EINVAL;
+		}
+		/*
+		 * The offset is encoded into the temperature register format.
+		 */
+		value = (((val->val1) * 10000000) + ((val->val2) * 10))
+						/ (int32_t)TMP11X_RESOLUTION;
+
+		return tmp11x_reg_write(dev, TMP117_REG_TEMP_OFFSET, value);
+
+	case SENSOR_ATTR_OVERSAMPLING:
+		/* sensor supports averaging 1, 8, 32 and 64 samples */
+		switch (val->val1) {
+		case 1:
+			avg = TMP11X_AVG_1_SAMPLE;
+			break;
+
+		case 8:
+			avg = TMP11X_AVG_8_SAMPLES;
+			break;
+
+		case 32:
+			avg = TMP11X_AVG_32_SAMPLES;
+			break;
+
+		case 64:
+			avg = TMP11X_AVG_64_SAMPLES;
+			break;
+
+		default:
+			return -EINVAL;
+		}
+		return tmp11x_write_config(dev, TMP11X_CFGR_AVG, avg);
+	case SENSOR_ATTR_TMP11X_SHUTDOWN_MODE:
+		return tmp11x_write_config(dev, TMP11X_CFGR_MODE, TMP11X_MODE_SHUTDOWN);
+
+	case SENSOR_ATTR_TMP11X_CONTINUOUS_CONVERSION_MODE:
+		return tmp11x_write_config(dev, TMP11X_CFGR_MODE, TMP11X_MODE_CONTINUOUS);
+
+	case SENSOR_ATTR_TMP11X_ONE_SHOT_MODE:
+		return tmp11x_write_config(dev, TMP11X_CFGR_MODE, TMP11X_MODE_ONE_SHOT);
+
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static int tmp11x_attr_get(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, struct sensor_value *val)
+{
+	uint16_t data;
+	int rc;
+
+	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
+		return -ENOTSUP;
+	}
+
+	switch (attr) {
+	case SENSOR_ATTR_CONFIGURATION:
+		rc = tmp11x_reg_read(dev, TMP11X_REG_CFGR, &data);
+		if (rc < 0) {
+			return rc;
+		}
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	val->val1 = data;
+	val->val2 = 0;
+
+	return 0;
+}
+
+static DEVICE_API(sensor, tmp11x_driver_api) = {
+	.attr_set = tmp11x_attr_set,
+	.attr_get = tmp11x_attr_get,
+	.sample_fetch = tmp11x_sample_fetch,
+	.channel_get = tmp11x_channel_get
+};
+
+static int tmp11x_init(const struct device *dev)
+{
+	struct tmp11x_data *drv_data = dev->data;
+	const struct tmp11x_dev_config *cfg = dev->config;
+	int rc;
+	uint16_t id;
+
+	if (!device_is_ready(cfg->bus.bus)) {
+		LOG_ERR("I2C dev %s not ready", cfg->bus.bus->name);
+		return -EINVAL;
+	}
+
+	/* Check the Device ID */
+	rc = tmp11x_device_id_check(dev, &id);
+	if (rc < 0) {
+		return rc;
+	}
+	LOG_DBG("Got device ID: %x", id);
+	drv_data->id = id;
+
+	rc = tmp11x_write_config(dev, TMP11X_CFGR_CONV, cfg->odr);
+	if (rc < 0) {
+		return rc;
+	}
+
+	rc = tmp11x_write_config(dev, TMP11X_CFGR_AVG, cfg->oversampling);
+
+	return rc;
+}
+
+#define DEFINE_TMP11X(_num) \
+	static struct tmp11x_data tmp11x_data_##_num; \
+	static const struct tmp11x_dev_config tmp11x_config_##_num = { \
+		.bus = I2C_DT_SPEC_INST_GET(_num), \
+		.odr = DT_INST_PROP(_num, odr), \
+		.oversampling = DT_INST_PROP(_num, oversampling), \
+	}; \
+	SENSOR_DEVICE_DT_INST_DEFINE(_num, tmp11x_init, NULL, \
+		&tmp11x_data_##_num, &tmp11x_config_##_num, POST_KERNEL, \
+		CONFIG_SENSOR_INIT_PRIORITY, &tmp11x_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_TMP11X)
diff --git a/drivers/sensor/ti/tmp11x/tmp11x.h b/drivers/sensor/ti/tmp11x/tmp11x.h
new file mode 100644
index 0000000000000..c1e075955f2da
--- /dev/null
+++ b/drivers/sensor/ti/tmp11x/tmp11x.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019 Centaur Analytics, Inc
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_TMP11X_TMP11X_H_
+#define ZEPHYR_DRIVERS_SENSOR_TMP11X_TMP11X_H_
+
+#include <zephyr/sys/util_macro.h>
+
+#define TMP11X_REG_TEMP		0x0
+#define TMP11X_REG_CFGR		0x1
+#define TMP11X_REG_HIGH_LIM		0x2
+#define TMP11X_REG_LOW_LIM		0x3
+#define TMP11X_REG_EEPROM_UL		0x4
+#define TMP11X_REG_EEPROM1		0x5
+#define TMP11X_REG_EEPROM2		0x6
+#define TMP11X_REG_EEPROM3		0x7
+#define TMP117_REG_TEMP_OFFSET		0x7
+#define TMP11X_REG_EEPROM4		0x8
+#define TMP11X_REG_DEVICE_ID		0xF
+
+#define TMP11X_RESOLUTION		78125       /* in tens of uCelsius*/
+#define TMP11X_RESOLUTION_DIV		10000000
+
+#define TMP116_DEVICE_ID		0x1116
+#define TMP117_DEVICE_ID		0x0117
+#define TMP119_DEVICE_ID		0x2117
+
+#define TMP11X_CFGR_AVG			(BIT(5) | BIT(6))
+#define TMP11X_CFGR_CONV		(BIT(7) | BIT(8) | BIT(9))
+#define TMP11X_CFGR_MODE		(BIT(10) | BIT(11))
+#define TMP11X_CFGR_DATA_READY  BIT(13)
+#define TMP11X_EEPROM_UL_UNLOCK BIT(15)
+#define TMP11X_EEPROM_UL_BUSY   BIT(14)
+
+#define TMP11X_AVG_1_SAMPLE		0
+#define TMP11X_AVG_8_SAMPLES	BIT(5)
+#define TMP11X_AVG_32_SAMPLES	BIT(6)
+#define TMP11X_AVG_64_SAMPLES	(BIT(5) | BIT(6))
+#define TMP11X_MODE_CONTINUOUS	0
+#define TMP11X_MODE_SHUTDOWN	BIT(10)
+#define TMP11X_MODE_ONE_SHOT	(BIT(10) | BIT(11))
+
+struct tmp11x_data {
+	uint16_t sample;
+	uint16_t id;
+};
+
+struct tmp11x_dev_config {
+	struct i2c_dt_spec bus;
+	uint16_t odr;
+	uint16_t oversampling;
+};
+
+#endif /*  ZEPHYR_DRIVERS_SENSOR_TMP11X_TMP11X_H_ */
diff --git a/drivers/sensor/tsic_xx6/tsic_xx6.c b/drivers/sensor/tsic_xx6/tsic_xx6.c
index c223e222bb65c..d9db1467d7438 100644
--- a/drivers/sensor/tsic_xx6/tsic_xx6.c
+++ b/drivers/sensor/tsic_xx6/tsic_xx6.c
@@ -160,7 +160,7 @@ static void tsic_xx6_get_value(const struct tsic_xx6_config *config, struct tsic
 {
 	int64_t tmp;
 
-	/* Apply the datasheet formula scaled to micro celcius */
+	/* Apply the datasheet formula scaled to micro celsius */
 	tmp = (int64_t)data_bits *
 	      (config->higher_temperature_limit - config->lower_temperature_limit);
 	tmp = tmp * 1000000 / (BIT(config->data_bits) - 1);
diff --git a/drivers/sensor/vishay/CMakeLists.txt b/drivers/sensor/vishay/CMakeLists.txt
index 51f0b77fde799..c0462dba8620d 100644
--- a/drivers/sensor/vishay/CMakeLists.txt
+++ b/drivers/sensor/vishay/CMakeLists.txt
@@ -4,5 +4,6 @@
 # zephyr-keep-sorted-start
 add_subdirectory_ifdef(CONFIG_VCNL36825T vcnl36825t)
 add_subdirectory_ifdef(CONFIG_VCNL4040 vcnl4040)
+add_subdirectory_ifdef(CONFIG_VEML6031 veml6031)
 add_subdirectory_ifdef(CONFIG_VEML7700 veml7700)
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/vishay/Kconfig b/drivers/sensor/vishay/Kconfig
index e11eb2011936d..564a9740c9c8e 100644
--- a/drivers/sensor/vishay/Kconfig
+++ b/drivers/sensor/vishay/Kconfig
@@ -4,5 +4,6 @@
 # zephyr-keep-sorted-start
 source "drivers/sensor/vishay/vcnl36825t/Kconfig"
 source "drivers/sensor/vishay/vcnl4040/Kconfig"
+source "drivers/sensor/vishay/veml6031/Kconfig"
 source "drivers/sensor/vishay/veml7700/Kconfig"
 # zephyr-keep-sorted-stop
diff --git a/drivers/sensor/vishay/veml6031/CMakeLists.txt b/drivers/sensor/vishay/veml6031/CMakeLists.txt
new file mode 100644
index 0000000000000..c5439bd757b47
--- /dev/null
+++ b/drivers/sensor/vishay/veml6031/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Andreas Klinger
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_sources(veml6031.c)
diff --git a/drivers/sensor/vishay/veml6031/Kconfig b/drivers/sensor/vishay/veml6031/Kconfig
new file mode 100644
index 0000000000000..48914702933d0
--- /dev/null
+++ b/drivers/sensor/vishay/veml6031/Kconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Andreas Klinger
+# SPDX-License-Identifier: Apache-2.0
+
+# Vishay VEML6031 ambient light sensor driver options.
+
+config VEML6031
+	bool "Vishay VEML6031 ambient light sensor"
+	default y
+	depends on DT_HAS_VISHAY_VEML6031_ENABLED
+	select I2C
+	help
+	  Enable Vishay VEML6031 ambient light sensor driver.
diff --git a/drivers/sensor/vishay/veml6031/veml6031.c b/drivers/sensor/vishay/veml6031/veml6031.c
new file mode 100644
index 0000000000000..897c43e7eef0b
--- /dev/null
+++ b/drivers/sensor/vishay/veml6031/veml6031.c
@@ -0,0 +1,617 @@
+/*
+ * Copyright (c) 2025 Andreas Klinger
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT vishay_veml6031
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/drivers/sensor/veml6031.h>
+
+LOG_MODULE_REGISTER(VEML6031, CONFIG_SENSOR_LOG_LEVEL);
+
+/*
+ * ID code of device
+ */
+#define VEML6031_DEFAULT_ID 0x01
+
+/*
+ * Bit mask to check for data ready in single measurement.
+ */
+#define VEML6031_ALS_AF_DATA_READY BIT(3)
+
+/*
+ * Maximum value of ALS data which also means that the sensor is in saturation
+ * and that the measured value might be wrong.
+ * In such a case the user program should reduce one or more of the following
+ * attributes to get a relyable value:
+ *   gain
+ *   integration time
+ *   effective photodiode size
+ *
+ */
+#define VEML6031_ALS_DATA_OVERFLOW 0xFFFF
+
+/*
+ * 16-bit command register addresses
+ */
+#define VEML6031_CMDCODE_ALS_CONF_0 0x00
+#define VEML6031_CMDCODE_ALS_CONF_1 0x01
+#define VEML6031_CMDCODE_ALS_WH_L   0x04
+#define VEML6031_CMDCODE_ALS_WH_H   0x05
+#define VEML6031_CMDCODE_ALS_WL_L   0x06
+#define VEML6031_CMDCODE_ALS_WL_H   0x07
+#define VEML6031_CMDCODE_ALS_DATA_L 0x10
+#define VEML6031_CMDCODE_ALS_DATA_H 0x11
+#define VEML6031_CMDCODE_IR_DATA_L  0x12
+#define VEML6031_CMDCODE_IR_DATA_H  0x13
+#define VEML6031_CMDCODE_ID_L       0x14
+#define VEML6031_CMDCODE_ID_H       0x15
+#define VEML6031_CMDCODE_ALS_INT    0x17
+
+/*
+ * ALS integration time struct.
+ */
+struct veml6031_it_data {
+	enum veml6031_it num;
+	uint8_t val;
+	int us;
+};
+
+/*
+ * ALS integration time setting values.
+ *
+ * The enumerators of <tt>enum veml6031_it</tt> provide
+ * indices into this array to get the related value for the
+ * ALS_IT configuration bits.
+ */
+static const struct veml6031_it_data veml6031_it_values[] = {
+	{VEML6031_IT_3_125, 0x00, 3125}, /*   3.125 - 0b0000 */
+	{VEML6031_IT_6_25, 0x01, 6250},  /*   6.25  - 0b0001 */
+	{VEML6031_IT_12_5, 0x02, 12500}, /*  12.5   - 0b0010 */
+	{VEML6031_IT_25, 0x03, 25000},   /*  25     - 0b0011 */
+	{VEML6031_IT_50, 0x04, 50000},   /*  50     - 0b0100 */
+	{VEML6031_IT_100, 0x05, 100000}, /* 100     - 0b0101 */
+	{VEML6031_IT_200, 0x06, 200000}, /* 200     - 0b0110 */
+	{VEML6031_IT_400, 0x07, 400000}, /* 400     - 0b0111 */
+};
+
+/*
+ * Resolution matrix for values to convert between data provided
+ * by the sensor ("counts") and lux.
+ *
+ * These values depend on the current size, gain and integration time settings.
+ * The enumerators of <tt>enum veml6031_div4</tt>, <tt>enum veml6031_gain</tt>
+ * and <tt>enum veml6031_als_it</tt> are used for indices into this matrix.
+ */
+static const float
+	veml6031_resolution[VEML6031_DIV4_COUNT][VEML6031_GAIN_COUNT][VEML6031_IT_COUNT] = {
+		/*3.125ms   6.25ms   12.5ms     25ms     50ms    100ms    200ms     400ms IT */
+		/* size 4/4 */
+		{
+			{0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f, 0.0136f,
+			 0.0068f}, /* Gain 1    */
+			{0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f, 0.0136f, 0.0068f,
+			 0.0034f}, /* Gain 2    */
+			{1.3188f, 0.6504f, 0.3297f, 0.1648f, 0.0824f, 0.0412f, 0.0206f,
+			 0.0103f}, /* Gain 0.66 */
+			{1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f,
+			 0.0136f}, /* Gain 0.5  */
+		},
+		{
+			/* size 1/4 */
+			{3.4816f, 1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f,
+			 0.0272f}, /* Gain 1    */
+			{1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f, 0.0544f, 0.0272f,
+			 0.0136f}, /* Gain 2    */
+			{5.2752f, 2.6376f, 1.3188f, 0.6594f, 0.3297f, 0.1648f, 0.0824f,
+			 0.0412f}, /* Gain 0.66 */
+			{6.9632f, 3.4816f, 1.7408f, 0.8704f, 0.4352f, 0.2176f, 0.1088f,
+			 0.0544f}, /* Gain 0.5  */
+		},
+};
+
+struct veml6031_config {
+	struct i2c_dt_spec bus;
+};
+
+struct veml6031_data {
+	uint8_t sd;              /* Band gap and LDO shutdown */
+	uint8_t int_en;          /* ALS interrupt enable */
+	uint8_t trig;            /* ALS active force trigger */
+	uint8_t af;              /* Active force mode */
+	uint8_t ir_sd;           /* ALS and IR channel shutdown */
+	uint8_t cal;             /* Power on ready */
+	enum veml6031_div4 div4; /* effective photodiode size */
+	enum veml6031_gain gain; /* gain selection */
+	enum veml6031_it itim;   /* ALS integration time */
+	enum veml6031_pers pers; /* ALS persistens protect */
+	uint16_t thresh_high;
+	uint16_t thresh_low;
+	uint16_t als_data;
+	uint32_t als_lux;
+	uint16_t ir_data;
+	uint32_t int_flags;
+};
+
+static void veml6031_sleep_by_integration_time(const struct veml6031_data *data)
+{
+	k_sleep(K_USEC(veml6031_it_values[data->itim].us));
+}
+
+static int veml6031_check_gain(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_GAIN_1 && val->val1 <= VEML6031_GAIN_0_5;
+}
+
+static int veml6031_check_it(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_IT_3_125 && val->val1 <= VEML6031_IT_400;
+}
+
+static int veml6031_check_div4(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_SIZE_4_4 && val->val1 <= VEML6031_SIZE_1_4;
+}
+
+static int veml6031_check_pers(const struct sensor_value *val)
+{
+	return val->val1 >= VEML6031_PERS_1 && val->val1 <= VEML6031_PERS_8;
+}
+
+static int veml6031_read(const struct device *dev, uint8_t cmd, uint8_t *data)
+{
+	const struct veml6031_config *conf = dev->config;
+
+	uint8_t recv_buf;
+	int ret;
+
+	ret = i2c_reg_read_byte_dt(&conf->bus, cmd, &recv_buf);
+	if (ret < 0) {
+		return ret;
+	}
+
+	*data = recv_buf;
+
+	return 0;
+}
+
+static int veml6031_read16(const struct device *dev, uint8_t cmd, uint8_t *data)
+{
+	const struct veml6031_config *conf = dev->config;
+	int ret;
+
+	ret = i2c_burst_read_dt(&conf->bus, cmd, data, 2);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_write16(const struct device *dev, uint8_t cmd, uint8_t *data)
+{
+	const struct veml6031_config *conf = dev->config;
+
+	return i2c_burst_write_dt(&conf->bus, cmd, data, 2);
+}
+
+static int veml6031_write_conf(const struct device *dev)
+{
+	int ret;
+	struct veml6031_data *data = dev->data;
+	uint8_t conf[2] = {0, 0};
+
+	/* Bits 7 -> ALS and IR channel shutdown */
+	conf[1] |= data->ir_sd << 7;
+	/* Bits 6 -> Effective photodiode size */
+	conf[1] |= data->div4 << 6;
+	/* Bit 5 -> reserved */
+	/* Bits 4:3 -> Gain selection */
+	conf[1] |= data->gain << 3;
+	/* Bits 2:1 -> ALS persistence protect number */
+	conf[1] |= data->pers << 1;
+	/* Bit 0 -> Power on ready */
+	if (data->cal) {
+		conf[1] |= BIT(0);
+	}
+	/* Bit 7 -> reserved, have to be 0 */
+	/* Bits 6:4 -> integration time (ALS_IT) */
+	conf[0] |= data->itim << 4;
+	/* Bit 3 -> Active force mode enable */
+	if (data->af) {
+		conf[0] |= BIT(3);
+	}
+	/* Bit 2 -> ALS active force trigger */
+	if (data->trig) {
+		conf[0] |= BIT(2);
+	}
+	/* Bit 1 -> ALS interrupt enable */
+	if (data->int_en) {
+		conf[0] |= BIT(1);
+	}
+	/* Bit 0 -> shut down setting (SD) */
+	if (data->sd) {
+		conf[0] |= BIT(0);
+	}
+
+	ret = veml6031_write16(dev, VEML6031_CMDCODE_ALS_CONF_0, conf);
+	if (ret) {
+		LOG_ERR("Error while writing conf[0] ret: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_write_thresh_high(const struct device *dev)
+{
+	int ret;
+	const struct veml6031_data *data = dev->data;
+	uint8_t val[2];
+
+	val[0] = data->thresh_high & 0xFF;
+	val[1] = data->thresh_high >> 8;
+
+	LOG_DBG("Writing high threshold counts: %d", data->thresh_high);
+	ret = veml6031_write16(dev, VEML6031_CMDCODE_ALS_WH_L, val);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_write_thresh_low(const struct device *dev)
+{
+	int ret;
+	const struct veml6031_data *data = dev->data;
+	uint8_t val[2];
+
+	val[0] = data->thresh_low & 0xFF;
+	val[1] = data->thresh_low >> 8;
+
+	LOG_DBG("Writing low threshold counts: %d", data->thresh_low);
+	ret = veml6031_write16(dev, VEML6031_CMDCODE_ALS_WL_L, val);
+	if (ret) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int veml6031_fetch(const struct device *dev)
+{
+	struct veml6031_data *data = dev->data;
+	int ret;
+
+	ret = veml6031_read16(dev, VEML6031_CMDCODE_ALS_DATA_L, (uint8_t *)&data->als_data);
+	if (ret < 0) {
+		return ret;
+	}
+	data->als_data = sys_le16_to_cpu(data->als_data);
+
+	ret = veml6031_read16(dev, VEML6031_CMDCODE_IR_DATA_L, (uint8_t *)&data->ir_data);
+	if (ret < 0) {
+		return ret;
+	}
+	data->ir_data = sys_le16_to_cpu(data->ir_data);
+
+	data->als_lux = data->als_data * veml6031_resolution[data->div4][data->gain][data->itim];
+
+	LOG_DBG("Read ALS measurement: counts=%d, lux=%d ir=%d", data->als_data, data->als_lux,
+		data->ir_data);
+
+	if (data->als_data == VEML6031_ALS_DATA_OVERFLOW) {
+		return -E2BIG;
+	}
+
+	return 0;
+}
+
+static int veml6031_attr_set(const struct device *dev, enum sensor_channel chan,
+			     enum sensor_attribute attr, const struct sensor_value *val)
+{
+	struct veml6031_data *data = dev->data;
+
+	if (chan != SENSOR_CHAN_LIGHT) {
+		return -ENOTSUP;
+	}
+
+	/* SENSOR_ATTR_.*_THRESH are not in enum sensor_attribute_veml6031 */
+	switch ((int)attr) {
+	case SENSOR_ATTR_VEML6031_IT:
+		if (veml6031_check_it(val)) {
+			data->itim = (enum veml6031_it)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_VEML6031_DIV4:
+		if (veml6031_check_div4(val)) {
+			data->div4 = (enum veml6031_div4)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_VEML6031_GAIN:
+		if (veml6031_check_gain(val)) {
+			data->gain = (enum veml6031_gain)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_VEML6031_PERS:
+		if (veml6031_check_pers(val)) {
+			data->pers = (enum veml6031_pers)val->val1;
+		} else {
+			return -EINVAL;
+		}
+		break;
+	case SENSOR_ATTR_LOWER_THRESH:
+		data->thresh_low =
+			val->val1 / veml6031_resolution[data->div4][data->gain][data->itim];
+		return veml6031_write_thresh_low(dev);
+	case SENSOR_ATTR_UPPER_THRESH:
+		data->thresh_high =
+			val->val1 / veml6031_resolution[data->div4][data->gain][data->itim];
+		return veml6031_write_thresh_high(dev);
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int veml6031_attr_get(const struct device *dev, enum sensor_channel chan,
+			     enum sensor_attribute attr, struct sensor_value *val)
+{
+	struct veml6031_data *data = dev->data;
+
+	if (chan != SENSOR_CHAN_LIGHT) {
+		return -ENOTSUP;
+	}
+
+	/* SENSOR_ATTR_.*_THRESH are not in enum sensor_attribute_veml6031 */
+	switch ((int)attr) {
+	case SENSOR_ATTR_VEML6031_IT:
+		val->val1 = data->itim;
+		break;
+	case SENSOR_ATTR_VEML6031_DIV4:
+		val->val1 = data->div4;
+		break;
+	case SENSOR_ATTR_VEML6031_GAIN:
+		val->val1 = data->gain;
+		break;
+	case SENSOR_ATTR_VEML6031_PERS:
+		val->val1 = data->pers;
+		break;
+	case SENSOR_ATTR_LOWER_THRESH:
+		val->val1 = data->thresh_low;
+		break;
+	case SENSOR_ATTR_UPPER_THRESH:
+		val->val1 = data->thresh_high;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	val->val2 = 0;
+
+	return 0;
+}
+
+static int veml6031_perform_single_measurement(const struct device *dev)
+{
+	struct veml6031_data *data = dev->data;
+	int ret;
+	uint8_t val;
+	int cnt = 0;
+
+	data->ir_sd = 0;
+	data->cal = 1;
+	data->af = 1;
+	data->trig = 1;
+	data->int_en = 0;
+	data->sd = 0;
+
+	ret = veml6031_write_conf(dev);
+	if (ret) {
+		return ret;
+	}
+
+	ret = veml6031_read(dev, VEML6031_CMDCODE_ALS_INT, &val);
+
+	veml6031_sleep_by_integration_time(data);
+
+	while (1) {
+		ret = veml6031_read(dev, VEML6031_CMDCODE_ALS_INT, &val);
+		if (ret) {
+			return ret;
+		}
+
+		if (val & VEML6031_ALS_AF_DATA_READY) {
+			break;
+		}
+
+		k_sleep(K_MSEC(1));
+
+		cnt++;
+	}
+
+	LOG_DBG("read VEML6031_CMDCODE_ALS_INT: %02X (%d)", val, cnt);
+
+	return 0;
+}
+
+static int veml6031_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	int ret;
+
+	/* Start sensor for new measurement */
+	if (chan == SENSOR_CHAN_LIGHT || chan == SENSOR_CHAN_ALL) {
+		ret = veml6031_perform_single_measurement(dev);
+		if (ret < 0) {
+			return ret;
+		}
+
+		return veml6031_fetch(dev);
+	} else {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int veml6031_channel_get(const struct device *dev, enum sensor_channel chan,
+				struct sensor_value *val)
+{
+	struct veml6031_data *data = dev->data;
+
+	switch ((int)chan) {
+	case SENSOR_CHAN_LIGHT:
+		val->val1 = data->als_lux;
+		break;
+	case SENSOR_CHAN_VEML6031_ALS_RAW_COUNTS:
+		val->val1 = data->als_data;
+		break;
+	case SENSOR_CHAN_VEML6031_IR_RAW_COUNTS:
+		val->val1 = data->ir_data;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	val->val2 = 0;
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_DEVICE
+
+static int veml6031_set_shutdown_flag(const struct device *dev, uint8_t new_val)
+{
+	struct veml6031_data *data = dev->data;
+	uint8_t prev_sd;
+	uint8_t prev_ir_sd;
+	int ret;
+
+	prev_sd = data->sd;
+	prev_ir_sd = data->ir_sd;
+	data->sd = new_val;
+	data->ir_sd = new_val;
+
+	ret = veml6031_write_conf(dev);
+	if (ret < 0) {
+		data->ir_sd = prev_ir_sd;
+		data->sd = prev_sd;
+	}
+	return ret;
+}
+
+static int veml6031_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	struct veml6031_data *data = dev->data;
+
+	if (!data->sd) {
+		switch (action) {
+		case PM_DEVICE_ACTION_SUSPEND:
+			return veml6031_set_shutdown_flag(dev, 1);
+
+		case PM_DEVICE_ACTION_RESUME:
+			return veml6031_set_shutdown_flag(dev, 0);
+
+		default:
+			return -ENOTSUP;
+		}
+	}
+
+	return 0;
+}
+
+#endif /* CONFIG_PM_DEVICE */
+
+static int veml6031_init(const struct device *dev)
+{
+	const struct veml6031_config *conf = dev->config;
+	int ret;
+	uint8_t val8;
+
+	if (!i2c_is_ready_dt(&conf->bus)) {
+		LOG_ERR("VEML device not ready");
+		return -ENODEV;
+	}
+
+	ret = veml6031_read(dev, VEML6031_CMDCODE_ID_L, &val8);
+	if (ret < 0) {
+		LOG_ERR("Error while reading ID low. ret: %d", ret);
+		return ret;
+	}
+	if (val8 != VEML6031_DEFAULT_ID) {
+		LOG_ERR("Device ID wrong: %d", val8);
+		return -EIO;
+	}
+	ret = veml6031_read(dev, VEML6031_CMDCODE_ID_H, &val8);
+	if (ret < 0) {
+		LOG_ERR("Error while reading ID high. ret: %d", ret);
+		return ret;
+	}
+	LOG_DBG("veml6031 found package: %02d address: %02X version: %3s", val8 >> 6,
+		val8 >> 4 & 0x03 ? 0x10 : 0x29, val8 & 0x0F ? "XXX" : "A01");
+
+	/* Initialize sensor configuration */
+	ret = veml6031_write_thresh_low(dev);
+	if (ret < 0) {
+		LOG_ERR("Error while writing thresh low. ret: %d", ret);
+		return ret;
+	}
+
+	ret = veml6031_write_thresh_high(dev);
+	if (ret < 0) {
+		LOG_ERR("Error while writing thresh high. ret: %d", ret);
+		return ret;
+	}
+
+	ret = veml6031_write_conf(dev);
+	if (ret < 0) {
+		LOG_ERR("Error while writing conf. ret: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(sensor, veml6031_api) = {
+	.sample_fetch = veml6031_sample_fetch,
+	.channel_get = veml6031_channel_get,
+	.attr_set = veml6031_attr_set,
+	.attr_get = veml6031_attr_get,
+};
+
+#define VEML6031_INIT(n)                                                                           \
+	static struct veml6031_data veml6031_data_##n = {.trig = 1,                                \
+							 .af = 1,                                  \
+							 .div4 = VEML6031_SIZE_4_4,                \
+							 .gain = VEML6031_GAIN_1,                  \
+							 .itim = VEML6031_IT_100,                  \
+							 .pers = VEML6031_PERS_1,                  \
+							 .thresh_high = 0xFFFF};                   \
+                                                                                                   \
+	static const struct veml6031_config veml6031_config_##n = {                                \
+		.bus = I2C_DT_SPEC_INST_GET(n)};                                                   \
+                                                                                                   \
+	PM_DEVICE_DT_INST_DEFINE(n, veml6031_pm_action);                                           \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(n, veml6031_init, PM_DEVICE_DT_INST_GET(n),                   \
+				     &veml6031_data_##n, &veml6031_config_##n, POST_KERNEL,        \
+				     CONFIG_SENSOR_INIT_PRIORITY, &veml6031_api);
+
+DT_INST_FOREACH_STATUS_OKAY(VEML6031_INIT)
diff --git a/drivers/sensor/xbr818/CMakeLists.txt b/drivers/sensor/xbr818/CMakeLists.txt
new file mode 100644
index 0000000000000..96d6c578d64db
--- /dev/null
+++ b/drivers/sensor/xbr818/CMakeLists.txt
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources_ifdef(CONFIG_XBR818 xbr818.c)
diff --git a/drivers/sensor/xbr818/Kconfig b/drivers/sensor/xbr818/Kconfig
new file mode 100644
index 0000000000000..75b91c758ac78
--- /dev/null
+++ b/drivers/sensor/xbr818/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+config XBR818
+	bool "XBR818 Radar"
+	default y
+	depends on DT_HAS_PHOSENSE_XBR818_ENABLED
+	select I2C
+	help
+	  Enable driver for the Phosense XBR818 Radar Sensor
diff --git a/drivers/sensor/xbr818/xbr818.c b/drivers/sensor/xbr818/xbr818.c
new file mode 100644
index 0000000000000..1b426cbfefe59
--- /dev/null
+++ b/drivers/sensor/xbr818/xbr818.c
@@ -0,0 +1,434 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT phosense_xbr818
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(XBR818, CONFIG_SENSOR_LOG_LEVEL);
+
+#include "xbr818.h"
+#include <zephyr/drivers/sensor/xbr818.h>
+
+static int xbr818_enable_i2c(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+
+	if (config->i2c_en.port) {
+		ret = gpio_pin_set_dt(&config->i2c_en, 1);
+		if (ret != 0) {
+			LOG_ERR("%s: could not set i2c_en pin", dev->name);
+		}
+		k_usleep(10);
+		return ret;
+	}
+	return 0;
+}
+
+static int xbr818_disable_i2c(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+
+	if (config->i2c_en.port) {
+		ret = gpio_pin_set_dt(&config->i2c_en, 0);
+		if (ret != 0) {
+			LOG_ERR("%s: could not unset i2c_en pin", dev->name);
+		}
+		return ret;
+	}
+	return 0;
+}
+
+static int xbr818_sample_fetch(const struct device *dev, enum sensor_channel chan)
+{
+	const struct xbr818_config *config = dev->config;
+	struct xbr818_data *data = dev->data;
+	int ret;
+
+	if (chan != SENSOR_CHAN_PROX && chan != SENSOR_CHAN_ALL) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	ret = gpio_pin_get_dt(&config->io_val);
+	if (ret < 0) {
+		return ret;
+	}
+	data->value = (ret == 1 ? true : false);
+
+	return 0;
+}
+
+static int xbr818_channel_get(const struct device *dev, enum sensor_channel chan,
+			      struct sensor_value *val)
+{
+	struct xbr818_data *data = dev->data;
+
+	if (chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	val->val1 = (data->value ? 1 : 0);
+	val->val2 = 0;
+
+	return 0;
+}
+
+static int xbr818_attr_set(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, const struct sensor_value *val)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+	uint8_t tmp[3];
+	uint64_t tmpf;
+
+	if (chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	if (val->val1 < 0) {
+		return -EINVAL;
+	}
+
+	ret = xbr818_enable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (attr == SENSOR_ATTR_LOWER_THRESH) {
+		if (val->val1 > 0xFFFF || val->val1 < 0) {
+			return -EINVAL;
+		}
+		tmp[0] = val->val1 & 0xFF;
+		tmp[1] = (val->val1 & 0xFF00) >> 8;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_1, tmp, 2);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_NOISE_FLOOR) {
+		if (val->val1 > 0xFFFF || val->val1 < 0) {
+			return -EINVAL;
+		}
+		tmp[0] = val->val1 & 0xFF;
+		tmp[1] = (val->val1 & 0xFF00) >> 8;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_NOISE_1, tmp, 2);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_DELAY_TIME) {
+		if (val->val1 < 0 || val->val2 < 0) {
+			return -EINVAL;
+		}
+		tmpf = (uint64_t)val->val1 * 1000000 + (uint64_t)val->val2;
+		tmpf = (tmpf * SENSOR_XBR818_CLOCKRATE) / 1000000;
+		if (tmpf > 0xFFFFFF) {
+			return -EINVAL;
+		}
+		tmp[0] = tmpf & 0xFF;
+		tmp[1] = (tmpf & 0xFF00) >> 8;
+		tmp[2] = (tmpf & 0xFF0000) >> 16;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_DELAY_TIME_1, tmp, 3);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_LOCK_TIME) {
+		if (val->val1 < 0 || val->val2 < 0) {
+			return -EINVAL;
+		}
+		tmpf = (uint64_t)val->val1 * 1000000 + (uint64_t)val->val2;
+		tmpf = (tmpf * SENSOR_XBR818_CLOCKRATE) / 1000000;
+		if (tmpf > 0xFFFFFF) {
+			return -EINVAL;
+		}
+		tmp[0] = tmpf & 0xFF;
+		tmp[1] = (tmpf & 0xFF00) >> 8;
+		tmp[2] = (tmpf & 0xFF0000) >> 16;
+		ret = i2c_burst_write_dt(&config->i2c, XBR818_LOCK_TIME_1, tmp, 3);
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_RF_POWER) {
+		if (val->val1 > 0x7 || val->val1 < 0) {
+			return -EINVAL;
+		}
+		tmp[0] = val->val1 & 0x7;
+		ret = i2c_reg_write_byte_dt(&config->i2c, XBR818_RF_POWER, tmp[0]);
+	} else if (attr == SENSOR_ATTR_SAMPLING_FREQUENCY) {
+		if (val->val1 > SENSOR_XBR818_CLOCKRATE || val->val1 <= 0) {
+			return -EINVAL;
+		}
+		tmp[0] = SENSOR_XBR818_CLOCKRATE / val->val1;
+		if (tmp[0] > 0xFF) {
+			return -EINVAL;
+		}
+		ret = i2c_reg_write_byte_dt(&config->i2c, XBR818_SAMPLE_RATE_DIVIDER, tmp[0]);
+	} else {
+		ret = xbr818_disable_i2c(dev);
+		if (ret != 0) {
+			return ret;
+		}
+		return -ENODEV;
+	}
+
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = xbr818_disable_i2c(dev);
+
+	return ret;
+}
+
+static int xbr818_attr_get(const struct device *dev, enum sensor_channel chan,
+			   enum sensor_attribute attr, struct sensor_value *val)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret;
+	uint8_t tmp[3];
+	uint64_t tmpf;
+
+	if (chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, chan);
+		return -ENOTSUP;
+	}
+
+	ret = xbr818_enable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (attr == SENSOR_ATTR_LOWER_THRESH) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_THRESHOLD_1, tmp, 2);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_NOISE_FLOOR) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_THRESHOLD_NOISE_1, tmp, 2);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_DELAY_TIME) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_DELAY_TIME_1, tmp, 3);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+		val->val1 |= (uint32_t)tmp[2] << 16;
+		tmpf = (uint64_t)val->val1 * 1000000;
+		tmpf /= SENSOR_XBR818_CLOCKRATE;
+		val->val1 = tmpf / 1000000;
+		val->val2 = tmpf - val->val1 * 1000000;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_LOCK_TIME) {
+		ret = i2c_burst_read_dt(&config->i2c, XBR818_LOCK_TIME_1, tmp, 3);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = tmp[0] & 0xFF;
+		val->val1 |= (uint32_t)tmp[1] << 8;
+		val->val1 |= (uint32_t)tmp[2] << 16;
+		tmpf = (uint64_t)val->val1 * 1000000;
+		tmpf /= SENSOR_XBR818_CLOCKRATE;
+		val->val1 = tmpf / 1000000;
+		val->val2 = tmpf - val->val1 * 1000000;
+	} else if ((enum sensor_attribute_xbr818)attr == SENSOR_ATTR_XBR818_RF_POWER) {
+		ret = i2c_reg_read_byte_dt(&config->i2c, XBR818_RF_POWER, tmp);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = *tmp & 0x7;
+	} else if (attr == SENSOR_ATTR_SAMPLING_FREQUENCY) {
+		ret = i2c_reg_read_byte_dt(&config->i2c, XBR818_SAMPLE_RATE_DIVIDER, tmp);
+		if (ret != 0) {
+			return ret;
+		}
+		val->val1 = SENSOR_XBR818_CLOCKRATE / *tmp;
+	} else {
+		ret = xbr818_disable_i2c(dev);
+		if (ret != 0) {
+			return ret;
+		}
+		return -ENODEV;
+	}
+
+	ret = xbr818_disable_i2c(dev);
+
+	return ret;
+}
+
+static void xbr818_work(struct k_work *work)
+{
+	struct xbr818_data *data = CONTAINER_OF(work, struct xbr818_data, work);
+
+	if (likely(data->handler != NULL)) {
+		data->handler(data->dev, data->trigger);
+	}
+}
+
+static void xbr818_gpio_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
+{
+	struct xbr818_data *data = CONTAINER_OF(cb, struct xbr818_data, gpio_cb);
+
+	k_work_submit(&data->work);
+}
+
+static int xbr818_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
+			      sensor_trigger_handler_t handler)
+{
+	const struct xbr818_config *config = dev->config;
+	struct xbr818_data *data = dev->data;
+	int ret;
+
+	if (trig->chan != SENSOR_CHAN_PROX) {
+		LOG_ERR("%s: requesting unsupported channel %i", dev->name, trig->chan);
+		return -ENOTSUP;
+	}
+
+	if (trig->type != SENSOR_TRIG_MOTION) {
+		LOG_ERR("%s: requesting unsupported trigger %i", dev->name, trig->type);
+		return -ENOTSUP;
+	}
+
+	data->handler = handler;
+	data->trigger = trig;
+	ret = gpio_pin_interrupt_configure_dt(&config->io_val, GPIO_INT_EDGE_RISING);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (handler) {
+		ret = gpio_add_callback(config->io_val.port, &data->gpio_cb);
+	} else {
+		ret = gpio_remove_callback(config->io_val.port, &data->gpio_cb);
+	}
+
+	return ret;
+}
+
+static int xbr818_init_defaults(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	int ret = 0;
+	uint8_t data[3];
+
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_IO_ACTIVE_VALUE_REG, 0x03);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_IO_ACTIVE_VALUE_REG");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_RF_EN_SEL, 0x20);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_RF_EN_SEL");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_SAMPLE_RATE_DIVIDER, 0x20);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_SAMPLE_RATE_DIVIDER");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_RF_POWER, 0x45);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_RF_POWER");
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_TIMER_CTRL, 0x21);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_TIMER_CTRL");
+
+	data[0] = 0x5a;
+	data[1] = 0x01;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_1, data, 2);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_THRESHOLD");
+
+	data[0] = 0x55;
+	data[1] = 0x01;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_THRESHOLD_NOISE_1, data, 2);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_THRESHOLD_NOISE");
+
+	/* 0.1 seconds */
+	data[0] = 0x80;
+	data[1] = 0x0C;
+	data[2] = 0x00;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_DELAY_TIME_1, data, 3);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_DELAY_TIME");
+
+	/* 0.5 seconds */
+	data[0] = 0x80;
+	data[1] = 0x3E;
+	data[2] = 0x00;
+	ret |= i2c_burst_write_dt(&config->i2c, XBR818_LOCK_TIME_1, data, 3);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_LOCK_TIME");
+
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_PIN_SETTINGS, 0x0C);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_PIN_SETTINGS");
+
+	ret |= i2c_reg_write_byte_dt(&config->i2c, XBR818_I2C_OUT, 0x1);
+	__ASSERT(ret == 0, "Error sending XBR818 defaults for XBR818_I2C_OUT");
+
+	return ret;
+}
+
+static int xbr818_init(const struct device *dev)
+{
+	const struct xbr818_config *config = dev->config;
+	struct xbr818_data *data = dev->data;
+	int ret;
+
+	if (!i2c_is_ready_dt(&config->i2c)) {
+		LOG_ERR("I2C device not ready");
+		return -ENODEV;
+	}
+
+	data->dev = dev;
+	data->work.handler = xbr818_work;
+
+	ret = gpio_pin_configure_dt(&config->io_val, GPIO_INPUT);
+	if (ret != 0) {
+		LOG_ERR("%s: could not configure io_val(int) pin", dev->name);
+		return ret;
+	}
+
+	if (config->i2c_en.port) {
+		ret = gpio_pin_configure_dt(&config->i2c_en, GPIO_OUTPUT);
+		if (ret != 0) {
+			LOG_ERR("%s: could not configure i2c_en pin", dev->name);
+			return ret;
+		}
+	}
+
+	ret = xbr818_enable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = xbr818_init_defaults(dev);
+	if (ret != 0) {
+		LOG_ERR("%s: unable to configure", dev->name);
+	}
+
+	ret = xbr818_disable_i2c(dev);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = gpio_pin_interrupt_configure_dt(&config->io_val, GPIO_INT_DISABLE);
+	if (ret) {
+		LOG_ERR("%s: failed to configure gpio interrupt: %d", dev->name, ret);
+		return ret;
+	}
+
+	gpio_init_callback(&data->gpio_cb, xbr818_gpio_callback, BIT(config->io_val.pin));
+
+	return ret;
+}
+
+static DEVICE_API(sensor, xbr818_api) = {
+	.sample_fetch = xbr818_sample_fetch,
+	.channel_get = xbr818_channel_get,
+	.attr_set = xbr818_attr_set,
+	.attr_get = xbr818_attr_get,
+	.trigger_set = xbr818_trigger_set,
+};
+
+#define XBR818_INIT(inst)                                                                          \
+	static const struct xbr818_config xbr818_##inst##_config = {                               \
+		.i2c = I2C_DT_SPEC_INST_GET(inst),                                                 \
+		.i2c_en = GPIO_DT_SPEC_GET_OR(DT_INST(inst, phosense_xbr818), i2c_en_gpios, {0}),  \
+		.io_val = GPIO_DT_SPEC_GET(DT_INST(inst, phosense_xbr818), int_gpios),             \
+	};                                                                                         \
+                                                                                                   \
+	static struct xbr818_data xbr818_##inst##_data;                                            \
+                                                                                                   \
+	SENSOR_DEVICE_DT_INST_DEFINE(inst, xbr818_init, NULL, &xbr818_##inst##_data,               \
+				     &xbr818_##inst##_config, POST_KERNEL,                         \
+				     CONFIG_SENSOR_INIT_PRIORITY, &xbr818_api);
+
+DT_INST_FOREACH_STATUS_OKAY(XBR818_INIT);
diff --git a/drivers/sensor/xbr818/xbr818.h b/drivers/sensor/xbr818/xbr818.h
new file mode 100644
index 0000000000000..f30f6d5ed0d48
--- /dev/null
+++ b/drivers/sensor/xbr818/xbr818.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_SENSOR_XBR818_XBR818_H_
+#define ZEPHYR_DRIVERS_SENSOR_XBR818_XBR818_H_
+
+#include <stdint.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+
+/* 32Khz clockrate, most time values are multiple of this */
+#define SENSOR_XBR818_CLOCKRATE 32000
+
+struct xbr818_config {
+	struct i2c_dt_spec i2c;
+	struct gpio_dt_spec i2c_en;
+	struct gpio_dt_spec io_val;
+};
+
+struct xbr818_data {
+	bool value;
+	uint32_t trigger_type;
+	sensor_trigger_handler_t handler;
+	struct gpio_callback gpio_cb;
+	const struct sensor_trigger *trigger;
+	const struct device *dev;
+	struct k_work work;
+};
+
+/* reference rd-04 module manual for more information */
+/* [0-2]: power of PA
+ * [4-6]: mixer trim
+ */
+#define XBR818_RF_POWER            0x03
+#define XBR818_RF_EN_SEL           0x04
+/* minimum value of 2 */
+#define XBR818_SAMPLE_RATE_DIVIDER 0x10
+/* [0]: enable detection
+ * [1-2]: readable data. 0: det_dc_sum 1: det_ac_sum 2: det_dc_used 3: det_noise
+ * [3]: enable read on 0x28-0x29
+ * [4]: signal detection threshold. 0: auto by pin 1: register
+ * [7]: enable read on 0x26-0x29
+ */
+#define XBR818_I2C_OUT             0x13
+/* Threshold for detection
+ * [0-7]
+ */
+#define XBR818_THRESHOLD_1         0x18
+/* [8-15] */
+#define XBR818_THRESHOLD_2         0x19
+/* Threshold for noise
+ * [0-7]
+ */
+#define XBR818_THRESHOLD_NOISE_1   0x1A
+/* [8-15] */
+#define XBR818_THRESHOLD_NOISE_2   0x1B
+/* Delay Time (in 1/32000 seconds)
+ * [0-7]
+ */
+#define XBR818_DELAY_TIME_1        0x1D
+/* [8-15] */
+#define XBR818_DELAY_TIME_2        0x1E
+/* [16-23] */
+#define XBR818_DELAY_TIME_3        0x1F
+/* [0]: enable
+ * [1-2]: light sensor timer. 0: disabled 1: 4 sec 2: 1 minute 3: 1 hour
+ * [3-4]: output timer. 0: 1 sec 1: 1 minute 2: 1 hour 3: 1 day
+ * [5]: delay time. 0: 'configure by pin' 1: configure by register
+ */
+#define XBR818_TIMER_CTRL          0x1C
+/* Lock Time (in 1/32000 seconds)
+ * [0-7]
+ */
+#define XBR818_LOCK_TIME_1         0x20
+/* [8-15] */
+#define XBR818_LOCK_TIME_2         0x21
+/* [16-23] */
+#define XBR818_LOCK_TIME_3         0x22
+/* Pin settings
+ * [0-3]: IO_VAL pin
+ * 0xc: io_value_out, 0xd: io_value_out inverted, 0xf: GPIO
+ * [4-7]: INT_IRQ pin
+ * 0x0: t3_int_irq, 0x9: io_value_out, 0xa: io_value_out inverted, 0xf: GPIO
+ */
+#define XBR818_PIN_SETTINGS        0x23
+/* [0]: ADC1 is configured for VCO trimming. 0: enable, 1: disable
+ * [1]: Low power mode is pin or register. 0: pin 1: register
+ * [2]: If IO_VAL pin is GPIO, output. 0: no 1: yes
+ * [3]: if INT_IRQ pin is GPIO, output. 0:no 1:yes
+ */
+#define XBR818_IO_ACTIVE_VALUE_REG 0x24
+
+#endif /* ZEPHYR_DRIVERS_SENSOR_XBR818_XBR818_H_ */
diff --git a/drivers/serial/CMakeLists.txt b/drivers/serial/CMakeLists.txt
index 05ef5c3bdfcdf..aa97c9e0ae28c 100644
--- a/drivers/serial/CMakeLists.txt
+++ b/drivers/serial/CMakeLists.txt
@@ -15,6 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_USB_CDC_ACM ${ZEPHYR_BASE}/misc/empty_file.c
 
 # zephyr-keep-sorted-start
 zephyr_library_sources_ifdef(CONFIG_LEUART_GECKO leuart_gecko.c)
+zephyr_library_sources_ifdef(CONFIG_LPUART_ESP32 lpuart_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_SERIAL_ESP32_USB serial_esp32_usb.c)
 zephyr_library_sources_ifdef(CONFIG_UART_ALTERA uart_altera.c)
 zephyr_library_sources_ifdef(CONFIG_UART_ALTERA_JTAG uart_altera_jtag.c)
@@ -35,6 +36,7 @@ zephyr_library_sources_ifdef(CONFIG_UART_HOSTLINK uart_hostlink.c)
 zephyr_library_sources_ifdef(CONFIG_UART_IMX uart_imx.c)
 zephyr_library_sources_ifdef(CONFIG_UART_INFINEON_CAT1 uart_ifx_cat1.c)
 zephyr_library_sources_ifdef(CONFIG_UART_INTEL_LW uart_intel_lw.c)
+zephyr_library_sources_ifdef(CONFIG_UART_ITE_IT51XXX uart_ite_it51xxx.c)
 zephyr_library_sources_ifdef(CONFIG_UART_ITE_IT8XXX2 uart_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_UART_LITEX uart_litex.c)
 zephyr_library_sources_ifdef(CONFIG_UART_LPC11U6X uart_lpc11u6x.c)
@@ -61,7 +63,7 @@ zephyr_library_sources_ifdef(CONFIG_UART_PSOC6 uart_psoc6.c)
 zephyr_library_sources_ifdef(CONFIG_UART_QUICKLOGIC_USBSERIALPORT_S3B uart_ql_usbserialport_s3b.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RA8_SCI_B uart_renesas_ra8_sci_b.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RCAR uart_rcar.c)
-zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RA uart_renesas_ra.c)
+zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RZ_SCI uart_renesas_rz_sci.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RENESAS_RZ_SCIF uart_renesas_rz_scif.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RPI_PICO_PIO uart_rpi_pico_pio.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RTS5912 uart_realtek_rts5912.c)
@@ -103,13 +105,13 @@ if (CONFIG_UART_NRFX_UARTE)
   endif()
 endif()
 
-if(CONFIG_UART_NATIVE_POSIX)
+if(CONFIG_UART_NATIVE_PTY)
   zephyr_library_compile_definitions(NO_POSIX_CHEATS)
-  zephyr_library_sources(uart_native_ptty.c)
+  zephyr_library_sources(uart_native_pty.c)
   if (CONFIG_NATIVE_APPLICATION)
-    zephyr_library_sources(uart_native_ptty_bottom.c)
+    zephyr_library_sources(uart_native_pty_bottom.c)
   else()
-    target_sources(native_simulator INTERFACE uart_native_ptty_bottom.c)
+    target_sources(native_simulator INTERFACE uart_native_pty_bottom.c)
   endif()
 endif()
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 92e68f90741f2..ed68ef1904ec7 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -178,6 +178,7 @@ rsource "Kconfig.hostlink"
 rsource "Kconfig.ifx_cat1"
 rsource "Kconfig.imx"
 rsource "Kconfig.intel_lw"
+rsource "Kconfig.it51xxx"
 rsource "Kconfig.it8xxx2"
 rsource "Kconfig.leuart_gecko"
 rsource "Kconfig.litex"
@@ -191,7 +192,7 @@ rsource "Kconfig.mcux_lpuart"
 rsource "Kconfig.mec5"
 rsource "Kconfig.miv"
 rsource "Kconfig.msp432p4xx"
-rsource "Kconfig.native_posix"
+rsource "Kconfig.native_pty"
 rsource "Kconfig.native_tty"
 rsource "Kconfig.neorv32"
 rsource "Kconfig.npcx"
@@ -205,6 +206,7 @@ rsource "Kconfig.pl011"
 rsource "Kconfig.psoc6"
 rsource "Kconfig.ql_usbserialport_s3b"
 rsource "Kconfig.rcar"
+rsource "Kconfig.realtek_rts5912"
 rsource "Kconfig.renesas_ra"
 rsource "Kconfig.renesas_ra8"
 rsource "Kconfig.renesas_rz"
@@ -214,6 +216,7 @@ rsource "Kconfig.rv32m1_lpuart"
 rsource "Kconfig.rzt2m"
 rsource "Kconfig.sam0"
 rsource "Kconfig.sedi"
+rsource "Kconfig.si32"
 rsource "Kconfig.sifive"
 rsource "Kconfig.silabs_eusart"
 rsource "Kconfig.silabs_usart"
@@ -224,16 +227,11 @@ rsource "Kconfig.sy1xx"
 rsource "Kconfig.test"
 rsource "Kconfig.uart_sam"
 rsource "Kconfig.usart_sam"
+rsource "Kconfig.wch_usart"
 rsource "Kconfig.xec"
 rsource "Kconfig.xen"
 rsource "Kconfig.xlnx"
 rsource "Kconfig.xmc4xxx"
 # zephyr-keep-sorted-stop
 
-source "drivers/serial/Kconfig.si32"
-
-source "drivers/serial/Kconfig.wch_usart"
-
-source "drivers/serial/Kconfig.realtek_rts5912"
-
 endif # SERIAL
diff --git a/drivers/serial/Kconfig.cmsdk_apb b/drivers/serial/Kconfig.cmsdk_apb
index 141e8c12902f9..57650e5d9ca97 100644
--- a/drivers/serial/Kconfig.cmsdk_apb
+++ b/drivers/serial/Kconfig.cmsdk_apb
@@ -9,5 +9,6 @@ config UART_CMSDK_APB
 	depends on DT_HAS_ARM_CMSDK_UART_ENABLED
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
+	select PINCTRL
 	help
 	  This option enables the UART driver for ARM CMSDK APB UART.
diff --git a/drivers/serial/Kconfig.esp32 b/drivers/serial/Kconfig.esp32
index 83dcc3f878029..e4ea9b5d6eeeb 100644
--- a/drivers/serial/Kconfig.esp32
+++ b/drivers/serial/Kconfig.esp32
@@ -43,3 +43,11 @@ config UART_ESP32_RX_FIFO_THRESH
 	range 1 127
 	help
 	  Configure the RX FIFO threshold for ESP32 UART driver.
+
+config LPUART_ESP32
+	bool "ESP32 LP UART driver"
+	default y
+	depends on DT_HAS_ESPRESSIF_ESP32_LPUART_ENABLED
+	select SERIAL_HAS_DRIVER
+	help
+	  Enable the ESP32 LP UART.
diff --git a/drivers/serial/Kconfig.it51xxx b/drivers/serial/Kconfig.it51xxx
new file mode 100644
index 0000000000000..34647e84d26d9
--- /dev/null
+++ b/drivers/serial/Kconfig.it51xxx
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config UART_ITE_IT51XXX
+	bool "ITE IT51XXX UART driver"
+	default y
+	select UART_NS16550_ITE_HIGH_SPEED_BAUDRATE
+	depends on DT_HAS_ITE_IT51XXX_UART_ENABLED
+	select PINCTRL
+	help
+	  IT51XXX uses shared ns16550.c driver. This wrapper primarily
+	  registers an interrupt to wake up the EC from doze or deep
+	  doze mode back to active state.
diff --git a/drivers/serial/Kconfig.mec5 b/drivers/serial/Kconfig.mec5
index 6c46bf9b9c601..d02392a06234b 100644
--- a/drivers/serial/Kconfig.mec5
+++ b/drivers/serial/Kconfig.mec5
@@ -7,6 +7,7 @@ config UART_MCHP_MEC5
 	bool "Microchip MEC5 family ns16550 compatible UART driver"
 	default y
 	depends on DT_HAS_MICROCHIP_MEC5_UART_ENABLED
+	select PINCTRL
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
 	help
diff --git a/drivers/serial/Kconfig.native_posix b/drivers/serial/Kconfig.native_posix
deleted file mode 100644
index eaa13bb806577..0000000000000
--- a/drivers/serial/Kconfig.native_posix
+++ /dev/null
@@ -1,74 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-config UART_NATIVE_POSIX
-	bool "UART driver for native_sim/posix"
-	default y
-	depends on DT_HAS_ZEPHYR_NATIVE_POSIX_UART_ENABLED
-	select SERIAL_HAS_DRIVER
-	help
-	  This enables a UART driver for the POSIX ARCH with up to 2 UARTs.
-	  For the first UART port, the driver can be configured
-	  to either connect to the terminal from which the executable was run, or into
-	  one dedicated pseudoterminal for that UART.
-
-if UART_NATIVE_POSIX
-
-choice NATIVE_UART_0
-	prompt "Native UART Port 0 connection"
-	default NATIVE_UART_0_ON_OWN_PTY
-
-config NATIVE_UART_0_ON_OWN_PTY
-	bool "Connect the UART to its own pseudo terminal"
-	help
-	  Connect this UART to its own pseudoterminal. This is the preferred
-	  option for users who want to use Zephyr's shell.
-	  Moreover this option does not conflict with any other native
-	  backend which may use the invoking shell standard input/output.
-
-config NATIVE_UART_0_ON_STDINOUT
-	bool "Connect the UART to the invoking shell stdin/stdout"
-	help
-	  Connect this UART to the stdin & stdout of the calling shell/terminal
-	  which invoked the native executable. This is good enough for
-	  automated testing, or when feeding from a file/pipe.
-	  Note that other, non UART messages, will also be printed to the
-	  terminal.
-	  It is strongly discouraged to try to use this option with the new
-	  shell interactively, as the default terminal configuration is NOT
-	  appropriate for interactive use.
-
-endchoice
-
-config UART_NATIVE_WAIT_PTS_READY_ENABLE
-	bool "Support waiting for pseudo terminal client readiness"
-	depends on NATIVE_UART_0_ON_OWN_PTY || UART_NATIVE_POSIX_PORT_1_ENABLE
-	help
-	  When this option is selected a new command line switch is provided:
-	  ``--wait_uart``
-	  When ``--wait_uart`` is used, writes to the UART will be held until a
-	  client has connected to the slave side of the pseudoterminal.
-	  Otherwise writes are sent irrespectively.
-
-config UART_NATIVE_POSIX_PORT_1_ENABLE
-	bool "Second UART port"
-	help
-	  Useful if you need to have another serial connection to host.
-	  This is used for example in PPP (Point-to-Point Protocol)
-	  implementation.
-
-config NATIVE_UART_AUTOATTACH_DEFAULT_CMD
-	string "Default command to attach the UART to a new terminal"
-	default "xterm -e screen %s &"
-	help
-	  If the native executable is called with the --attach_uart
-	  command line option, this will be the default command which will be
-	  run to attach a new terminal to the 1st UART.
-	  Note that this command must have one, and only one, '%s' as
-	  placeholder for the pseudoterminal device name (e.g. /dev/pts/35)
-	  This is only applicable if the UART_0 is configured to use its own
-	  PTY with NATIVE_UART_0_ON_OWN_PTY.
-	  The 2nd UART will not be affected by this option.
-	  If you are using GNOME, then you can use this command string
-	  'gnome-terminal -- screen %s'
-
-endif # UART_NATIVE_POSIX
diff --git a/drivers/serial/Kconfig.native_pty b/drivers/serial/Kconfig.native_pty
new file mode 100644
index 0000000000000..5f98676d575ca
--- /dev/null
+++ b/drivers/serial/Kconfig.native_pty
@@ -0,0 +1,105 @@
+# Copyright (c) 2025, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config UART_NATIVE_PTY
+	bool "PTY based UART driver for native_sim"
+	default y
+	depends on (DT_HAS_ZEPHYR_NATIVE_PTY_UART_ENABLED || DT_HAS_ZEPHYR_NATIVE_POSIX_UART_ENABLED)
+	select SERIAL_HAS_DRIVER
+	help
+	  This enables a PTY based UART driver for the POSIX ARCH with up to 2 UARTs.
+	  For the first UART port, the driver can be configured
+	  to either connect to the terminal from which the executable was run, or into
+	  one dedicated pseudoterminal for that UART.
+
+config UART_NATIVE_POSIX
+	bool "UART driver for native_sim (deprecated)"
+	select SERIAL_HAS_DRIVER
+	select DEPRECATED
+	select UART_NATIVE_PTY
+	help
+	  Deprecated option, use UART_NATIVE_PTY instead
+
+if (UART_NATIVE_PTY || UART_NATIVE_POSIX)
+
+choice UART_NATIVE_PTY_0
+	prompt "Native PTY Port 0 connection"
+	default UART_NATIVE_PTY_0_ON_STDINOUT if NATIVE_UART_0_ON_STDINOUT
+	default UART_NATIVE_PTY_0_ON_OWN_PTY
+
+config UART_NATIVE_PTY_0_ON_OWN_PTY
+	bool "Connect the first PTY UART to its own pseudo terminal"
+	help
+	  Connect this UART to its own pseudoterminal. This is the preferred
+	  option for users who want to use Zephyr's shell.
+	  Moreover this option does not conflict with any other native
+	  backend which may use the invoking shell standard input/output.
+	  Note it can be overridden from command line
+
+config UART_NATIVE_PTY_0_ON_STDINOUT
+	bool "Connect the first PTY UART to the invoking shell stdin/stdout"
+	help
+	  Connect this UART to the stdin & stdout of the calling shell/terminal
+	  which invoked the native executable. This is good enough for
+	  automated testing, or when feeding from a file/pipe.
+	  Note that other, non UART messages, will also be printed to the
+	  terminal.
+	  It is strongly discouraged to try to use this option with the new
+	  shell interactively, as the default terminal configuration is NOT
+	  appropriate for interactive use.
+
+endchoice
+
+choice NATIVE_UART_0
+	prompt "Native UART Port 0 connection (deprecated)"
+	default NATIVE_UART_0_ON_OWN_PTY
+
+config NATIVE_UART_0_ON_OWN_PTY
+	bool "Connect the UART to its own pseudo terminal (deprecated)"
+	help
+	  Deprecated, use UART_NATIVE_PTY_0_ON_OWN_PTY instead.
+
+config NATIVE_UART_0_ON_STDINOUT
+	bool "Connect the UART to the invoking shell stdin/stdout (deprecated)"
+	select DEPRECATED
+	help
+	  Deprecated, use UART_NATIVE_PTY_0_ON_STDINOUT instead.
+
+endchoice
+
+config UART_NATIVE_WAIT_PTS_READY_ENABLE
+	bool "Support waiting for pseudo terminal client readiness (deprecated)"
+	select DEPRECATED
+	help
+	  This option is deprecated and does not do anything anymore. (The command line
+	  option --wait_uart is always available).
+
+config UART_NATIVE_POSIX_PORT_1_ENABLE
+	bool "Second UART port (deprecated)"
+	select DEPRECATED
+	help
+	  This option does not do anything anymore. Use DTS to instantiate as many
+	  "zephyr,native-pty-uart" compatible nodes as you want.
+
+config UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD
+	string "Default command to attach a PTY UART to a new terminal"
+	default NATIVE_UART_AUTOATTACH_DEFAULT_CMD
+	help
+	  If the native executable is called with the --attach_uart
+	  command line option, this will be the default command which will be
+	  run to attach a new terminal to the 1st UART.
+	  Note that this command must have one, and only one, '%s' as
+	  placeholder for the pseudoterminal device name (e.g. /dev/pts/35)
+	  This is only applicable if the UART_0 is configured to use its own
+	  PTY with NATIVE_UART_0_ON_OWN_PTY.
+	  The 2nd UART will not be affected by this option.
+	  If you are using GNOME, then you can use this command string
+	  'gnome-terminal -- screen %s'
+
+config NATIVE_UART_AUTOATTACH_DEFAULT_CMD
+	string "Default command to attach the UART to a new terminal (deprecated)"
+	default "xterm -e screen %s &"
+	help
+	  Deprecated. Use UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD instead
+
+endif # UART_NATIVE_PTY || UART_NATIVE_POSIX
diff --git a/drivers/serial/Kconfig.renesas_ra b/drivers/serial/Kconfig.renesas_ra
index d79081bc50635..20c399c0c6648 100644
--- a/drivers/serial/Kconfig.renesas_ra
+++ b/drivers/serial/Kconfig.renesas_ra
@@ -2,16 +2,6 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-config UART_RENESAS_RA
-	bool "Renesas RA Series UART Driver"
-	default y
-	depends on DT_HAS_RENESAS_RA_UART_SCI_ENABLED
-	select SERIAL_HAS_DRIVER
-	select SERIAL_SUPPORT_INTERRUPT
-	select PINCTRL
-	help
-	  Enable Renesas RA series UART driver.
-
 config UART_SCI_RA
 	bool "Renesas RA SCI UART"
 	default y
diff --git a/drivers/serial/Kconfig.renesas_rz b/drivers/serial/Kconfig.renesas_rz
index ea904e2c2e51f..90fa4ff2d3d30 100644
--- a/drivers/serial/Kconfig.renesas_rz
+++ b/drivers/serial/Kconfig.renesas_rz
@@ -12,6 +12,17 @@ config UART_RENESAS_RZ_SCIF
 	help
 	  Enable Renesas RZ SCIF UART Driver.
 
+config UART_RENESAS_RZ_SCI
+	bool "Renesas RZ SCI UART"
+	default y
+	depends on DT_HAS_RENESAS_RZ_SCI_UART_ENABLED
+	select PINCTRL
+	select SERIAL_HAS_DRIVER
+	select SERIAL_SUPPORT_INTERRUPT
+	select USE_RZ_FSP_SCI_UART
+	help
+	  Enable Renesas RZ SCI UART Driver.
+
 if UART_RENESAS_RZ_SCIF
 
 config UART_RENESAS_RZG_INIT_DELAY_MS
diff --git a/drivers/serial/Kconfig.silabs_eusart b/drivers/serial/Kconfig.silabs_eusart
index 156a75c4ec3bc..e13d80d37ec69 100644
--- a/drivers/serial/Kconfig.silabs_eusart
+++ b/drivers/serial/Kconfig.silabs_eusart
@@ -1,4 +1,5 @@
 # Copyright (c) 2024, Yishai Jaffe
+# Copyright (c) 2025, Silicon Laboratories Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 config UART_SILABS_EUSART
@@ -8,8 +9,22 @@ config UART_SILABS_EUSART
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
 	select SOC_GECKO_EUSART
+	select SERIAL_SUPPORT_ASYNC \
+		if DT_HAS_SILABS_LDMA_ENABLED
+	select DMA if UART_ASYNC_API
 	select PINCTRL
 	select CLOCK_CONTROL
-	select PM_DEVICE if PM
 	help
 	  Enable the eusart uart driver.
+
+if UART_SILABS_EUSART
+
+config UART_SILABS_EUSART_ASYNC
+	bool
+	depends on DMA_SILABS_LDMA
+	depends on UART_ASYNC_API
+	default y
+	help
+	  If 'y', Silabs eusart driver will compile with support for UART async API.
+
+endif
diff --git a/drivers/serial/Kconfig.silabs_usart b/drivers/serial/Kconfig.silabs_usart
index 078e09db9a870..a2088577d42af 100644
--- a/drivers/serial/Kconfig.silabs_usart
+++ b/drivers/serial/Kconfig.silabs_usart
@@ -15,3 +15,15 @@ config UART_SILABS_USART
 	select CLOCK_CONTROL
 	help
 	  Enable the Silicon Labs usart driver.
+
+if UART_SILABS_USART
+
+config UART_SILABS_USART_ASYNC
+	bool
+	default y
+	depends on DMA_SILABS_LDMA
+	depends on UART_ASYNC_API
+	help
+	  If 'y', Silabs usart driver will compile with support for UART async API.
+
+endif
diff --git a/drivers/serial/lpuart_esp32.c b/drivers/serial/lpuart_esp32.c
new file mode 100644
index 0000000000000..8e53a4f638bf8
--- /dev/null
+++ b/drivers/serial/lpuart_esp32.c
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT espressif_esp32_lpuart
+
+#include <zephyr/drivers/uart.h>
+#include <zephyr/dt-bindings/clock/esp32c6_clock.h>
+
+#include <hal/uart_hal.h>
+#if defined(CONFIG_SOC_ESP32C6_HPCORE)
+#include <hal/uart_ll.h>
+#include <hal/clk_tree_ll.h>
+#include <hal/clk_tree_hal.h>
+#include <hal/rtc_io_hal.h>
+#include <soc/uart_pins.h>
+#include <soc/rtc_io_periph.h>
+#include <esp_private/esp_clk_tree_common.h>
+#include <ulp_lp_core_uart.h>
+#endif
+
+#define ESP_LP_UART_TX_IDLE_NUM_DEFAULT (0U)
+
+struct lp_uart_esp32_data {
+	uart_hal_context_t hal;
+};
+
+struct lp_uart_esp32_config {
+	uint8_t tx_io_num;
+	uint8_t rx_io_num;
+	uint8_t rts_io_num;
+	uint8_t cts_io_num;
+	int baud_rate;
+	uint8_t data_bits;
+	uint8_t parity;
+	uint8_t stop_bits;
+	uint8_t flow_ctrl;
+	uint8_t rx_flow_ctrl_thresh;
+	uint8_t lp_uart_source_clk;
+};
+
+static int lp_uart_esp32_poll_in(const struct device *dev, unsigned char *p_char)
+{
+	struct lp_uart_esp32_data *data = dev->data;
+	int inout_rd_len = 1;
+
+	if (uart_hal_get_rxfifo_len(&data->hal) == 0) {
+		return -1;
+	}
+
+	uart_hal_read_rxfifo(&data->hal, p_char, &inout_rd_len);
+
+	return 0;
+}
+
+static void lp_uart_esp32_poll_out(const struct device *dev, unsigned char c)
+{
+	struct lp_uart_esp32_data *data = dev->data;
+	int tx_len = 0;
+
+	/* Wait for space in FIFO */
+	while (uart_hal_get_txfifo_len(&data->hal) == 0) {
+		; /* Wait */
+	}
+
+	uart_hal_write_txfifo(&data->hal, (const void *)&c, 1, &tx_len);
+}
+
+#if defined(CONFIG_SOC_ESP32C6_HPCORE)
+
+static int lp_uart_esp32_param_config(const struct device *dev)
+{
+	const struct lp_uart_esp32_config *const cfg = dev->config;
+	struct lp_uart_esp32_data *data = dev->data;
+	uint32_t sclk_freq = 0;
+
+	if ((cfg->rx_flow_ctrl_thresh > SOC_LP_UART_FIFO_LEN) ||
+	    (cfg->flow_ctrl > UART_CFG_FLOW_CTRL_RTS_CTS) ||
+	    (cfg->data_bits > UART_CFG_DATA_BITS_8)) {
+		return -EINVAL;
+	}
+
+	/* Get LP UART source clock frequency */
+	switch (clk_ll_rtc_fast_get_src()) {
+	case SOC_RTC_FAST_CLK_SRC_XTAL_DIV:
+#if CONFIG_SOC_SERIES_ESP32 || CONFIG_SOC_SERIES_ESP32S2 /* SOC_RTC_FAST_CLK_SRC_XTAL_D4 */
+		sclk_freq = clk_hal_xtal_get_freq_mhz() * MHZ(1) >> 2;
+#else /* SOC_RTC_FAST_CLK_SRC_XTAL_D2 */
+		sclk_freq = clk_hal_xtal_get_freq_mhz() * MHZ(1) >> 1;
+#endif
+		break;
+	case SOC_RTC_FAST_CLK_SRC_RC_FAST:
+		sclk_freq =
+			esp_clk_tree_rc_fast_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) /
+			clk_ll_rc_fast_get_divider();
+		break;
+#if SOC_CLK_LP_FAST_SUPPORT_LP_PLL
+	case SOC_RTC_FAST_CLK_SRC_LP_PLL:
+		sclk_freq = clk_ll_lp_pll_get_freq_mhz() * MHZ(1);
+		break;
+#endif
+	default:
+		return -EINVAL;
+	}
+
+	lp_uart_ll_enable_bus_clock(0, true);
+	lp_uart_ll_set_source_clk(data->hal.dev, cfg->lp_uart_source_clk);
+	lp_uart_ll_sclk_enable(0);
+
+	/* Initialize LP UART HAL with default parameters */
+	uart_hal_init(&data->hal, LP_UART_NUM_0);
+
+	/* Set protocol parameters from the configuration */
+	lp_uart_ll_set_baudrate(data->hal.dev, cfg->baud_rate, sclk_freq);
+	uart_hal_set_parity(&data->hal, cfg->parity);
+	uart_hal_set_data_bit_num(&data->hal, cfg->data_bits);
+	uart_hal_set_stop_bits(&data->hal, cfg->stop_bits);
+	uart_hal_set_tx_idle_num(&data->hal, ESP_LP_UART_TX_IDLE_NUM_DEFAULT);
+	uart_hal_set_hw_flow_ctrl(&data->hal, cfg->flow_ctrl, cfg->rx_flow_ctrl_thresh);
+
+	/* Reset Tx/Rx FIFOs */
+	uart_hal_rxfifo_rst(&data->hal);
+	uart_hal_txfifo_rst(&data->hal);
+
+	return 0;
+}
+
+static void lp_uart_esp32_config_io(int pin, int direction, int func)
+{
+	int rtc_io_num = rtc_io_num_map[pin];
+
+	rtcio_hal_function_select(rtc_io_num, RTCIO_FUNC_RTC);
+	rtcio_hal_set_direction(rtc_io_num, direction);
+	rtcio_hal_iomux_func_sel(rtc_io_num, func);
+}
+
+static void lp_uart_esp32_set_pin(const struct device *dev)
+{
+	const struct lp_uart_esp32_config *const cfg = dev->config;
+
+	/* Configure Tx Pin */
+	lp_uart_esp32_config_io(cfg->tx_io_num, RTC_GPIO_MODE_OUTPUT_ONLY, LP_U0TXD_MUX_FUNC);
+
+	/* Configure Rx Pin */
+	lp_uart_esp32_config_io(cfg->rx_io_num, RTC_GPIO_MODE_INPUT_ONLY, LP_U0RXD_GPIO_NUM);
+
+	/* Configure RTS Pin */
+	lp_uart_esp32_config_io(cfg->rts_io_num, RTC_GPIO_MODE_OUTPUT_ONLY, LP_U0RTS_MUX_FUNC);
+
+	/* Configure CTS Pin */
+	lp_uart_esp32_config_io(cfg->cts_io_num, RTC_GPIO_MODE_INPUT_ONLY, LP_U0CTS_MUX_FUNC);
+}
+
+static int lp_uart_esp32_init(const struct device *dev)
+{
+	int ret = 0;
+
+	ret = lp_uart_esp32_param_config(dev);
+	if (ret != 0) {
+		return -EINVAL;
+	}
+
+	/* Configure LP UART IO pins */
+	lp_uart_esp32_set_pin(dev);
+	return 0;
+}
+
+#endif /* CONFIG_SOC_ESP32C6_HPCORE */
+
+static DEVICE_API(uart, lp_uart_esp32_api) = {
+	.poll_in = lp_uart_esp32_poll_in,
+	.poll_out = lp_uart_esp32_poll_out,
+};
+
+static struct lp_uart_esp32_data lp_uart_esp32_data = {
+	.hal =	{
+			.dev = (uart_dev_t *)DT_REG_ADDR(DT_NODELABEL(lp_uart)),
+		},
+};
+
+static const struct lp_uart_esp32_config lp_uart_esp32_cfg = {
+	.tx_io_num = DT_PROP(DT_NODELABEL(lp_uart), tx_pin),
+	.rx_io_num = DT_PROP(DT_NODELABEL(lp_uart), rx_pin),
+	.rts_io_num = DT_PROP(DT_NODELABEL(lp_uart), rts_pin),
+	.cts_io_num = DT_PROP(DT_NODELABEL(lp_uart), cts_pin),
+	.baud_rate = DT_PROP(DT_NODELABEL(lp_uart), current_speed),
+	.data_bits = DT_PROP_OR(DT_NODELABEL(lp_uart), data_bits, UART_CFG_DATA_BITS_8),
+	.parity = DT_ENUM_IDX(DT_NODELABEL(lp_uart), parity),
+	.stop_bits = DT_PROP_OR(DT_NODELABEL(lp_uart), stop_bits, UART_CFG_STOP_BITS_1),
+	.flow_ctrl = DT_PROP_OR(DT_NODELABEL(lp_uart), flow_ctrl, UART_CFG_FLOW_CTRL_NONE),
+	.rx_flow_ctrl_thresh = 0,
+	.lp_uart_source_clk = LP_UART_SCLK_DEFAULT,
+};
+
+#if defined(CONFIG_SOC_ESP32C6_HPCORE)
+#define LP_UART_ESP32_INIT_FUNC lp_uart_esp32_init
+#else
+#define LP_UART_ESP32_INIT_FUNC NULL
+#endif
+
+DEVICE_DT_DEFINE(DT_NODELABEL(lp_uart), LP_UART_ESP32_INIT_FUNC, NULL, &lp_uart_esp32_data,
+		 &lp_uart_esp32_cfg, PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, &lp_uart_esp32_api);
diff --git a/drivers/serial/serial_esp32_usb.c b/drivers/serial/serial_esp32_usb.c
index 79ea1a18a55d5..de278ee27ab10 100644
--- a/drivers/serial/serial_esp32_usb.c
+++ b/drivers/serial/serial_esp32_usb.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022 Libre Solar Technologies GmbH
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -13,21 +14,11 @@
 #include <errno.h>
 #include <soc.h>
 #include <zephyr/drivers/uart.h>
-#if defined(CONFIG_SOC_SERIES_ESP32C3) || defined(CONFIG_SOC_SERIES_ESP32C6)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/sys/util.h>
 #include <esp_attr.h>
 
-#if defined(CONFIG_SOC_SERIES_ESP32C3) || defined(CONFIG_SOC_SERIES_ESP32C6)
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
-
 /*
  * Timeout after which the poll_out function stops waiting for space in the tx fifo.
  *
@@ -113,7 +104,7 @@ static int serial_esp32_usb_init(const struct device *dev)
 	ret = esp_intr_alloc(config->irq_source,
 			ESP_PRIO_TO_FLAGS(config->irq_priority) |
 			ESP_INT_FLAGS_CHECK(config->irq_flags),
-			(ISR_HANDLER)serial_esp32_usb_isr,
+			(intr_handler_t)serial_esp32_usb_isr,
 			(void *)dev, NULL);
 #endif
 	return ret;
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index 04aa0d069490a..3578209b3551e 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, Linaro Limited.
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,6 +16,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/drivers/clock_control/arm_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/init.h>
 #include <zephyr/drivers/uart.h>
@@ -64,6 +66,7 @@ struct uart_cmsdk_apb {
 struct uart_cmsdk_apb_config {
 	volatile struct uart_cmsdk_apb *uart;
 	uint32_t sys_clk_freq;
+	const struct pinctrl_dev_config *pctrl;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_config_func_t irq_config_func;
 #endif
@@ -124,6 +127,14 @@ static void baudrate_set(const struct device *dev)
 static int uart_cmsdk_apb_init(const struct device *dev)
 {
 	const struct uart_cmsdk_apb_config * const dev_cfg = dev->config;
+	int ret = pinctrl_apply_state(dev_cfg->pctrl, PINCTRL_STATE_DEFAULT);
+
+	/* some pins are not available externally so,
+	 * ignore if there is no entry for them
+	 */
+	if (ret != -ENOENT) {
+		return ret;
+	}
 
 #ifdef CONFIG_CLOCK_CONTROL
 	/* Enable clock for subsystem */
@@ -401,9 +412,7 @@ static void uart_cmsdk_apb_irq_err_disable(const struct device *dev)
  */
 static int uart_cmsdk_apb_irq_is_pending(const struct device *dev)
 {
-	const struct uart_cmsdk_apb_config *dev_cfg = dev->config;
-
-	return (dev_cfg->uart->intstatus & (UART_RX_IN | UART_TX_IN));
+	return uart_cmsdk_apb_irq_rx_ready(dev) || uart_cmsdk_apb_irq_tx_ready(dev);
 }
 
 /**
@@ -480,10 +489,11 @@ static DEVICE_API(uart, uart_cmsdk_apb_driver_api) = {
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev);
 #endif
-
+PINCTRL_DT_INST_DEFINE(0);
 static const struct uart_cmsdk_apb_config uart_cmsdk_apb_dev_cfg_0 = {
 	.uart = (volatile struct uart_cmsdk_apb *)DT_INST_REG_ADDR(0),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(0, clocks, clock_frequency),
+	.pctrl = PINCTRL_DT_INST_DEV_CONFIG_GET(0),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_0,
 #endif
@@ -545,10 +555,11 @@ static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev)
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev);
 #endif
-
+PINCTRL_DT_INST_DEFINE(1);
 static const struct uart_cmsdk_apb_config uart_cmsdk_apb_dev_cfg_1 = {
 	.uart = (volatile struct uart_cmsdk_apb *)DT_INST_REG_ADDR(1),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(1, clocks, clock_frequency),
+	.pctrl = PINCTRL_DT_INST_DEV_CONFIG_GET(1),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_1,
 #endif
@@ -610,10 +621,11 @@ static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev)
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev);
 #endif
-
+PINCTRL_DT_INST_DEFINE(2);
 static const struct uart_cmsdk_apb_config uart_cmsdk_apb_dev_cfg_2 = {
 	.uart = (volatile struct uart_cmsdk_apb *)DT_INST_REG_ADDR(2),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(2, clocks, clock_frequency),
+	.pctrl = PINCTRL_DT_INST_DEV_CONFIG_GET(2),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_2,
 #endif
@@ -675,10 +687,11 @@ static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev)
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev);
 #endif
-
+PINCTRL_DT_INST_DEFINE(3);
 static const struct uart_cmsdk_apb_config uart_cmsdk_apb_dev_cfg_3 = {
 	.uart = (volatile struct uart_cmsdk_apb *)DT_INST_REG_ADDR(3),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(3, clocks, clock_frequency),
+	.pctrl = PINCTRL_DT_INST_DEV_CONFIG_GET(3),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_3,
 #endif
@@ -736,14 +749,14 @@ static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev)
 #endif /* DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(3)) */
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(4))
-
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev);
 #endif
-
+PINCTRL_DT_INST_DEFINE(4);
 static const struct uart_cmsdk_apb_config uart_cmsdk_apb_dev_cfg_4 = {
 	.uart = (volatile struct uart_cmsdk_apb *)DT_INST_REG_ADDR(4),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(4, clocks, clock_frequency),
+	.pctrl = PINCTRL_DT_INST_DEV_CONFIG_GET(4),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_4,
 #endif
diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c
index 47d652b829141..2638b258767f9 100644
--- a/drivers/serial/uart_esp32.c
+++ b/drivers/serial/uart_esp32.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019 Mohamed ElShahawi (extremegtx@hotmail.com)
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2023-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -51,13 +51,7 @@
 #include <soc.h>
 #include <zephyr/drivers/uart.h>
 
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || \
-	defined(CONFIG_SOC_SERIES_ESP32C3) || \
-	defined(CONFIG_SOC_SERIES_ESP32C6)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 
 #include <zephyr/drivers/clock_control.h>
 #include <errno.h>
@@ -67,14 +61,6 @@
 
 LOG_MODULE_REGISTER(uart_esp32, CONFIG_UART_LOG_LEVEL);
 
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || \
-	defined(CONFIG_SOC_SERIES_ESP32C3) || \
-	defined(CONFIG_SOC_SERIES_ESP32C6)
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
-
 struct uart_esp32_config {
 	const struct device *clock_dev;
 	const struct pinctrl_dev_config *pcfg;
@@ -962,7 +948,7 @@ static int uart_esp32_init(const struct device *dev)
 	ret = esp_intr_alloc(config->irq_source,
 			ESP_PRIO_TO_FLAGS(config->irq_priority) |
 			ESP_INT_FLAGS_CHECK(config->irq_flags),
-			(ISR_HANDLER)uart_esp32_isr,
+			(intr_handler_t)uart_esp32_isr,
 			(void *)dev,
 			NULL);
 	if (ret < 0) {
@@ -1071,7 +1057,7 @@ static DEVICE_API(uart, uart_esp32_api) = {
 		ESP_UART_UHCI_INIT(idx)};                                                          \
                                                                                                    \
 	DEVICE_DT_INST_DEFINE(idx, uart_esp32_init, NULL, &uart_esp32_data_##idx,                  \
-			      &uart_esp32_cfg_port_##idx, PRE_KERNEL_1,                            \
+			      &uart_esp32_cfg_port_##idx, PRE_KERNEL_2,                            \
 			      CONFIG_SERIAL_INIT_PRIORITY, &uart_esp32_api);
 
 DT_INST_FOREACH_STATUS_OKAY(ESP32_UART_INIT);
diff --git a/drivers/serial/uart_ite_it51xxx.c b/drivers/serial/uart_ite_it51xxx.c
new file mode 100644
index 0000000000000..a68e6c1a15eeb
--- /dev/null
+++ b/drivers/serial/uart_ite_it51xxx.c
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ite_it51xxx_uart
+
+#include <soc.h>
+#include <soc_dt.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/interrupt_controller/wuc_ite_it51xxx.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
+
+LOG_MODULE_REGISTER(uart_ite_it51xxx, CONFIG_UART_LOG_LEVEL);
+
+struct it51xxx_uart_wuc_map_cfg {
+	/* WUC control device structure */
+	const struct device *wucs;
+	/* WUC pin mask */
+	uint8_t mask;
+};
+
+struct uart_it51xxx_config {
+	/* UART wake-up input source configuration list */
+	const struct it51xxx_uart_wuc_map_cfg *wuc_map_list;
+	const struct device *clk_dev;
+	/* clock configuration */
+	struct ite_clk_cfg clk_cfg;
+	/* UART interrupt */
+	uint8_t irq;
+};
+
+struct uart_it51xxx_data {
+#ifdef CONFIG_UART_CONSOLE_INPUT_EXPIRED
+	struct k_work_delayable rx_refresh_timeout_work;
+#endif
+};
+
+static void it51xxx_uart_wui_isr(const void *arg)
+{
+	const struct device *dev = arg;
+	const struct uart_it51xxx_config *const config = dev->config;
+
+	/* Disable interrupts on UART RX pin to avoid repeated interrupts. */
+	irq_disable(config->irq);
+	/* W/C wakeup interrupt status of UART pin */
+	it51xxx_wuc_clear_status(config->wuc_map_list[0].wucs, config->wuc_map_list[0].mask);
+
+	/* Refresh console expired time if got UART Rx wake-up event */
+#ifdef CONFIG_UART_CONSOLE_INPUT_EXPIRED
+	struct uart_it51xxx_data *data = dev->data;
+	k_timeout_t delay = K_MSEC(CONFIG_UART_CONSOLE_INPUT_EXPIRED_TIMEOUT);
+
+	/*
+	 * The pm state of it51xxx chip only supports standby, so here we
+	 * can directly set the constraint for standby.
+	 */
+	pm_policy_state_lock_get(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+	k_work_reschedule(&data->rx_refresh_timeout_work, delay);
+#endif
+}
+
+static inline int uart_it51xxx_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct uart_it51xxx_config *const config = dev->config;
+
+	switch (action) {
+	/* Next device power state is in active. */
+	case PM_DEVICE_ACTION_RESUME:
+		/* Nothing to do. */
+		break;
+	/* Next device power state is deep doze mode */
+	case PM_DEVICE_ACTION_SUSPEND:
+		/* W/C wake-up interrupt status of UART pin */
+		it51xxx_wuc_clear_status(config->wuc_map_list[0].wucs,
+					 config->wuc_map_list[0].mask);
+		/* W/C interrupt status of UART pin */
+		ite_intc_isr_clear(config->irq);
+		/* Enable UART interrupt */
+		irq_enable(config->irq);
+
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_UART_CONSOLE_INPUT_EXPIRED
+static void uart_it51xxx_rx_refresh_timeout(struct k_work *work)
+{
+	ARG_UNUSED(work);
+
+	pm_policy_state_lock_put(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+}
+#endif
+
+static int uart_it51xxx_init(const struct device *dev)
+{
+	const struct uart_it51xxx_config *const config = dev->config;
+	int ret;
+
+	/* Enable clock to specified peripheral */
+	ret = clock_control_on(config->clk_dev, (clock_control_subsys_t *)&config->clk_cfg);
+	if (ret < 0) {
+		LOG_ERR("Turn on clock fail %d", ret);
+		return ret;
+	}
+
+	/* Select wakeup interrupt falling-edge triggered of UART pin */
+	it51xxx_wuc_set_polarity(config->wuc_map_list[0].wucs, config->wuc_map_list[0].mask,
+				 WUC_TYPE_EDGE_FALLING);
+	/* W/C wakeup interrupt status of UART pin */
+	it51xxx_wuc_clear_status(config->wuc_map_list[0].wucs, config->wuc_map_list[0].mask);
+	/* Enable wakeup interrupt of UART pin */
+	it51xxx_wuc_enable(config->wuc_map_list[0].wucs, config->wuc_map_list[0].mask);
+
+	/*
+	 * We need to configure UART Rx interrupt as wakeup source and initialize
+	 * a delayable work for console expired time.
+	 */
+#ifdef CONFIG_UART_CONSOLE_INPUT_EXPIRED
+	struct uart_it51xxx_data *data = dev->data;
+
+	k_work_init_delayable(&data->rx_refresh_timeout_work, uart_it51xxx_rx_refresh_timeout);
+#endif
+	/*
+	 * When the system enters deep doze, all clocks are gated only the
+	 * 32.768k clock is active. We need to wakeup EC by configuring
+	 * UART Rx interrupt as a wakeup source. When the interrupt of UART
+	 * Rx falling, EC will be woken.
+	 */
+	irq_connect_dynamic(config->irq, 0, it51xxx_uart_wui_isr, dev, 0);
+
+	return 0;
+}
+
+#define UART_ITE_IT51XXX_INIT(inst)                                                                \
+	static const struct it51xxx_uart_wuc_map_cfg                                               \
+		it51xxx_uart_wuc_##inst[IT8XXX2_DT_INST_WUCCTRL_LEN(inst)] =                       \
+			IT8XXX2_DT_WUC_ITEMS_LIST(inst);                                           \
+	static struct uart_it51xxx_data uart_it51xxx_data_##inst;                                  \
+	static const struct uart_it51xxx_config uart_it51xxx_cfg_##inst = {                        \
+		.wuc_map_list = it51xxx_uart_wuc_##inst,                                           \
+		.clk_dev = DEVICE_DT_GET(DT_INST_PHANDLE(inst, clocks)),                           \
+		.clk_cfg = {.ctrl = DT_INST_CLOCKS_CELL(inst, ctrl),                               \
+			    .bits = DT_INST_CLOCKS_CELL(inst, bits)},                              \
+		.irq = DT_INST_IRQN(inst),                                                         \
+	};                                                                                         \
+	PM_DEVICE_DT_INST_DEFINE(inst, uart_it51xxx_pm_action);                                    \
+	DEVICE_DT_INST_DEFINE(inst, uart_it51xxx_init, PM_DEVICE_DT_INST_GET(inst),                \
+			      &uart_it51xxx_data_##inst, &uart_it51xxx_cfg_##inst, PRE_KERNEL_1,   \
+			      CONFIG_SERIAL_INIT_PRIORITY, NULL);
+
+DT_INST_FOREACH_STATUS_OKAY(UART_ITE_IT51XXX_INIT)
diff --git a/drivers/serial/uart_max32.c b/drivers/serial/uart_max32.c
index 9cd16a59066cc..2df1025ac2500 100644
--- a/drivers/serial/uart_max32.c
+++ b/drivers/serial/uart_max32.c
@@ -293,6 +293,12 @@ static int uart_max32_init(const struct device *dev)
 		return ret;
 	}
 
+	ret = Wrap_MXC_UART_SetClockSource(regs, cfg->perclk.clk_src);
+	if (ret != 0) {
+		LOG_ERR("Cannot set UART clock source");
+		return ret;
+	}
+
 	ret = pinctrl_apply_state(cfg->pctrl, PINCTRL_STATE_DEFAULT);
 	if (ret) {
 		return ret;
@@ -376,7 +382,7 @@ static int api_irq_tx_ready(const struct device *dev)
 	uint32_t inten = Wrap_MXC_UART_GetRegINTEN(cfg->regs);
 
 	return ((inten & (ADI_MAX32_UART_INT_TX | ADI_MAX32_UART_INT_TX_OEM)) &&
-		!(data->status & MXC_F_UART_STATUS_TX_FULL));
+		!(data->status & ADI_MAX32_UART_STATUS_TX_FULL));
 }
 
 static int api_irq_tx_complete(const struct device *dev)
diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c
index fcb7f41121e0e..9fdb3c26c6015 100644
--- a/drivers/serial/uart_mcux_flexcomm.c
+++ b/drivers/serial/uart_mcux_flexcomm.c
@@ -14,7 +14,9 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/pm/policy.h>
 #include <zephyr/irq.h>
+#include <zephyr/pm/device.h>
 #include <fsl_usart.h>
 #include <soc.h>
 #include <fsl_device_registers.h>
@@ -86,8 +88,33 @@ struct mcux_flexcomm_data {
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	struct uart_config uart_config;
 #endif
+#ifdef CONFIG_PM_POLICY_DEVICE_CONSTRAINTS
+	bool pm_policy_state_lock;
+#endif
 };
 
+#ifdef CONFIG_PM_POLICY_DEVICE_CONSTRAINTS
+static void mcux_flexcomm_pm_policy_state_lock_get(const struct device *dev)
+{
+	struct mcux_flexcomm_data *data = dev->data;
+
+	if (!data->pm_policy_state_lock) {
+		data->pm_policy_state_lock = true;
+		pm_policy_device_power_lock_get(dev);
+	}
+}
+
+static void mcux_flexcomm_pm_policy_state_lock_put(const struct device *dev)
+{
+	struct mcux_flexcomm_data *data = dev->data;
+
+	if (data->pm_policy_state_lock) {
+		data->pm_policy_state_lock = false;
+		pm_policy_device_power_lock_put(dev);
+	}
+}
+#endif
+
 static int mcux_flexcomm_poll_in(const struct device *dev, unsigned char *c)
 {
 	const struct mcux_flexcomm_config *config = dev->config;
@@ -179,6 +206,14 @@ static void mcux_flexcomm_irq_tx_enable(const struct device *dev)
 	const struct mcux_flexcomm_config *config = dev->config;
 	uint32_t mask = kUSART_TxLevelInterruptEnable;
 
+	/* Indicates that this device started a transaction that should
+	 * not be interrupted by putting the SoC in states that would
+	 * interfere with this transfer.
+	 */
+#ifdef CONFIG_PM_POLICY_DEVICE_CONSTRAINTS
+	mcux_flexcomm_pm_policy_state_lock_get(dev);
+#endif
+
 	USART_EnableInterrupts(config->base, mask);
 }
 
@@ -187,6 +222,10 @@ static void mcux_flexcomm_irq_tx_disable(const struct device *dev)
 	const struct mcux_flexcomm_config *config = dev->config;
 	uint32_t mask = kUSART_TxLevelInterruptEnable;
 
+#ifdef CONFIG_PM_POLICY_DEVICE_CONSTRAINTS
+	mcux_flexcomm_pm_policy_state_lock_put(dev);
+#endif
+
 	USART_DisableInterrupts(config->base, mask);
 }
 
@@ -467,11 +506,19 @@ static int mcux_flexcomm_uart_tx(const struct device *dev, const uint8_t *buf,
 	/* Enable TX DMA requests */
 	USART_EnableTxDMA(config->base, true);
 
+	/* Do not allow the system to suspend until the transmission has completed */
+#ifdef CONFIG_PM_POLICY_DEVICE_CONSTRAINTS
+	mcux_flexcomm_pm_policy_state_lock_get(dev);
+#endif
+
 	/* Trigger the DMA to start transfer */
 	ret = dma_start(config->tx_dma.dev, config->tx_dma.channel);
 	if (ret) {
 		irq_unlock(key);
-		return ret;
+#ifdef CONFIG_PM_POLICY_DEVICE_CONSTRAINTS
+		mcux_flexcomm_pm_policy_state_lock_put(dev);
+#endif
+	return ret;
 	}
 
 	/* Schedule a TX abort for @param timeout */
@@ -993,6 +1040,10 @@ static void mcux_flexcomm_isr(const struct device *dev)
 			data->tx_data.xfer_buf = NULL;
 
 			async_user_callback(dev, &tx_done_event);
+
+#ifdef CONFIG_PM_POLICY_DEVICE_CONSTRAINTS
+			mcux_flexcomm_pm_policy_state_lock_put(dev);
+#endif
 		}
 
 	}
@@ -1000,8 +1051,7 @@ static void mcux_flexcomm_isr(const struct device *dev)
 }
 #endif /* CONFIG_UART_MCUX_FLEXCOMM_ISR_SUPPORT */
 
-
-static int mcux_flexcomm_init(const struct device *dev)
+static int mcux_flexcomm_init_common(const struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config;
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
@@ -1067,6 +1117,41 @@ static int mcux_flexcomm_init(const struct device *dev)
 	return 0;
 }
 
+static uint32_t usart_intenset;
+static int mcux_flexcomm_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct mcux_flexcomm_config *config = dev->config;
+	int ret;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		break;
+	case PM_DEVICE_ACTION_TURN_OFF:
+		usart_intenset = USART_GetEnabledInterrupts(config->base);
+		break;
+	case PM_DEVICE_ACTION_TURN_ON:
+		ret = mcux_flexcomm_init_common(dev);
+		if (ret) {
+			return ret;
+		}
+		USART_EnableInterrupts(config->base, usart_intenset);
+		break;
+	default:
+		return -ENOTSUP;
+	}
+	return 0;
+}
+
+static int mcux_flexcomm_init(const struct device *dev)
+{
+	/* Rest of the init is done from the PM_DEVICE_TURN_ON action
+	 * which is invoked by pm_device_driver_init().
+	 */
+	return pm_device_driver_init(dev, mcux_flexcomm_pm_action);
+}
+
 static DEVICE_API(uart, mcux_flexcomm_driver_api) = {
 	.poll_in = mcux_flexcomm_poll_in,
 	.poll_out = mcux_flexcomm_poll_out,
@@ -1202,9 +1287,11 @@ static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config = {		\
 										\
 	static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config;	\
 										\
+	PM_DEVICE_DT_INST_DEFINE(n, mcux_flexcomm_pm_action);			\
+										\
 	DEVICE_DT_INST_DEFINE(n,						\
-			    mcux_flexcomm_init,					\
-			    NULL,						\
+			    &mcux_flexcomm_init,				\
+			    PM_DEVICE_DT_INST_GET(n),				\
 			    &mcux_flexcomm_##n##_data,				\
 			    &mcux_flexcomm_##n##_config,			\
 			    PRE_KERNEL_1,					\
diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c
index c39635b4128c4..9950f9ac87323 100644
--- a/drivers/serial/uart_mcux_lpuart.c
+++ b/drivers/serial/uart_mcux_lpuart.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017,2021,2023-2024 NXP
+ * Copyright 2017,2021,2023-2025 NXP
  * Copyright (c) 2020 Softube
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -30,6 +30,16 @@ LOG_MODULE_REGISTER(uart_mcux_lpuart, LOG_LEVEL_ERR);
 
 #define PINCTRL_STATE_FLOWCONTROL PINCTRL_STATE_PRIV_START
 
+/* Helper macros */
+#if defined(FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT) && \
+	FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT
+#define LPUART_HAS_MODEM 1
+#endif
+
+#if defined(FSL_FEATURE_LPUART_HAS_MCR) && FSL_FEATURE_LPUART_HAS_MCR
+#define LPUART_HAS_MCR 1
+#endif
+
 #if defined(CONFIG_UART_ASYNC_API) && defined(CONFIG_UART_INTERRUPT_DRIVEN)
 /* there are already going to be build errors, but at least this message will
  * be the first error from this driver making the reason clear
@@ -327,7 +337,7 @@ static int mcux_lpuart_irq_tx_ready(const struct device *dev)
 static void mcux_lpuart_irq_rx_enable(const struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config;
-	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable | kLPUART_RxOverrunInterruptEnable;
 
 	LPUART_EnableInterrupts(config->base, mask);
 }
@@ -335,7 +345,7 @@ static void mcux_lpuart_irq_rx_enable(const struct device *dev)
 static void mcux_lpuart_irq_rx_disable(const struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config;
-	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable | kLPUART_RxOverrunInterruptEnable;
 
 	LPUART_DisableInterrupts(config->base, mask);
 }
@@ -964,9 +974,43 @@ static void mcux_lpuart_isr(const struct device *dev)
 }
 #endif /* CONFIG_UART_MCUX_LPUART_ISR_SUPPORT */
 
+#if LPUART_HAS_MODEM
+static int mcux_lpuart_config_flowctrl(uint8_t flow_ctrl, lpuart_config_t *uart_config)
+{
+	switch (flow_ctrl) {
+	case UART_CFG_FLOW_CTRL_NONE:
+	case UART_CFG_FLOW_CTRL_RS485:
+		uart_config->enableTxCTS = false;
+		uart_config->enableRxRTS = false;
+		break;
+
+	case UART_CFG_FLOW_CTRL_RTS_CTS:
+		uart_config->enableTxCTS = true;
+		uart_config->enableRxRTS = true;
+		break;
+
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+#else
+static int mcux_lpuart_config_flowctrl(uint8_t flow_ctrl, lpuart_config_t *uart_config)
+{
+	if (flow_ctrl != UART_CFG_FLOW_CTRL_NONE) {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+#endif /* LPUART_HAS_MODEM */
+
 static int mcux_lpuart_configure_basic(const struct device *dev, const struct uart_config *cfg,
 					lpuart_config_t *uart_config)
 {
+	int ret;
+
 	/* Translate UART API enum to LPUART enum from HAL */
 	switch (cfg->parity) {
 	case UART_CFG_PARITY_NONE:
@@ -1010,22 +1054,15 @@ static int mcux_lpuart_configure_basic(const struct device *dev, const struct ua
 	}
 #endif
 
-#if defined(FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT) && \
-	FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT
-	switch (cfg->flow_ctrl) {
-	case UART_CFG_FLOW_CTRL_NONE:
-	case UART_CFG_FLOW_CTRL_RS485:
-		uart_config->enableTxCTS = false;
-		uart_config->enableRxRTS = false;
-		break;
-	case UART_CFG_FLOW_CTRL_RTS_CTS:
-		uart_config->enableTxCTS = true;
-		uart_config->enableRxRTS = true;
-		break;
-	default:
+	/* Configure for Flow Control option */
+	if (!IS_ENABLED(LPUART_HAS_MCR) && cfg->flow_ctrl == UART_CFG_FLOW_CTRL_DTR_DSR) {
 		return -ENOTSUP;
 	}
-#endif
+
+	ret = mcux_lpuart_config_flowctrl(cfg->flow_ctrl, uart_config);
+	if (ret) {
+		return ret;
+	}
 
 	uart_config->baudRate_Bps = cfg->baudrate;
 	uart_config->enableRx = true;
@@ -1099,8 +1136,7 @@ static int mcux_lpuart_configure_init(const struct device *dev, const struct uar
 
 	LPUART_Init(config->base, &uart_config, clock_freq);
 
-#if defined(FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT) && \
-	FSL_FEATURE_LPUART_HAS_MODEM_SUPPORT
+#ifdef LPUART_HAS_MODEM
 	if (cfg->flow_ctrl == UART_CFG_FLOW_CTRL_RS485) {
 		/* Set the LPUART into RS485 mode (tx driver enable using RTS) */
 		config->base->MODIR |= LPUART_MODIR_TXRTSE(true);
@@ -1179,6 +1215,98 @@ static int mcux_lpuart_configure(const struct device *dev,
 }
 #endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
 
+#ifdef CONFIG_UART_LINE_CTRL
+#if LPUART_HAS_MODEM
+static void mcux_lpuart_line_ctrl_set_rts(const struct device *dev, uint32_t val)
+{
+	const struct mcux_lpuart_config *config = dev->config;
+
+	/* Disable Transmitter and Receiver */
+	config->base->CTRL &= ~(LPUART_CTRL_TE_MASK | LPUART_CTRL_RE_MASK);
+
+	if (val >= 1U) {
+		/* Reset TXRTS to set RXRTSE bit, this provides high-level on RTS line */
+		config->base->MODIR &= ~(LPUART_MODIR_TXRTSPOL_MASK | LPUART_MODIR_TXRTSE_MASK);
+		config->base->MODIR |= LPUART_MODIR_RXRTSE_MASK;
+	} else {
+		/* Set TXRTSE to reset RXRTSE bit,this provide low-level on RTS line*/
+		config->base->MODIR &= ~(LPUART_MODIR_RXRTSE_MASK);
+		config->base->MODIR |= (LPUART_MODIR_TXRTSPOL_MASK | LPUART_MODIR_TXRTSE_MASK);
+	}
+}
+#else
+#define mcux_lpuart_line_ctrl_set_rts(dev, val) ret = -ENOTSUP
+#endif /* LPUART_HAS_MODEM */
+
+#if LPUART_HAS_MCR
+static void mcux_lpuart_set_dtr(const struct device *dev, uint32_t val)
+{
+	const struct mcux_lpuart_config *config = dev->config;
+
+	if (val >= 1U) {
+		/* assert DTR_b */
+		config->base->MCR &= ~LPUART_MCR_DTR_MASK;
+	} else {
+		/* deassert DTR_b */
+		config->base->MCR |= LPUART_MCR_DTR_MASK;
+	}
+}
+#else
+#define mcux_lpuart_set_dtr(dev, val) ret = -ENOTSUP
+#endif /* LPUART_HAS_MCR */
+
+static int mcux_lpuart_line_ctrl_set(const struct device *dev,
+		uint32_t ctrl, uint32_t val)
+{
+	int ret = 0;
+
+	switch (ctrl) {
+	case UART_LINE_CTRL_RTS:
+		mcux_lpuart_line_ctrl_set_rts(dev, val);
+		break;
+
+	case UART_LINE_CTRL_DTR:
+		mcux_lpuart_set_dtr(dev, val);
+		break;
+
+	default:
+		ret = -ENOTSUP;
+	}
+
+	return ret;
+}
+
+#if LPUART_HAS_MCR
+static int mcux_lpuart_line_ctrl_get(const struct device *dev,
+	uint32_t ctrl, uint32_t *val)
+{
+	const struct mcux_lpuart_config *config = dev->config;
+	int ret = 0;
+
+	switch (ctrl) {
+	case UART_LINE_CTRL_DSR:
+		*val = (config->base->MSR & LPUART_MSR_DSR_MASK) >> LPUART_MSR_DSR_SHIFT;
+		break;
+
+	case UART_LINE_CTRL_DCD:
+		*val = (config->base->MSR & LPUART_MSR_DCD_MASK) >> LPUART_MSR_DCD_SHIFT;
+		break;
+
+	default:
+		ret = -ENOTSUP;
+	}
+
+	return ret;
+}
+#else
+static int mcux_lpuart_line_ctrl_get(const struct device *dev,
+	uint32_t ctrl, uint32_t *val)
+{
+	return -ENOTSUP;
+}
+#endif /* LPUART_HAS_MCR */
+#endif /* CONFIG_UART_LINE_CTRL */
+
 static int mcux_lpuart_init(const struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config;
@@ -1257,6 +1385,10 @@ static DEVICE_API(uart, mcux_lpuart_driver_api) = {
 	.rx_buf_rsp = mcux_lpuart_rx_buf_rsp,
 	.rx_disable = mcux_lpuart_rx_disable,
 #endif /* CONFIG_UART_ASYNC_API */
+#ifdef CONFIG_UART_LINE_CTRL
+	.line_ctrl_set = mcux_lpuart_line_ctrl_set,
+	.line_ctrl_get = mcux_lpuart_line_ctrl_get,
+#endif  /* CONFIG_UART_LINE_CTRL */
 };
 
 
diff --git a/drivers/serial/uart_native_ptty.c b/drivers/serial/uart_native_ptty.c
deleted file mode 100644
index c0cf3036dd228..0000000000000
--- a/drivers/serial/uart_native_ptty.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2018, Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT zephyr_native_posix_uart
-
-#include <stdbool.h>
-
-#include <zephyr/drivers/uart.h>
-#include <zephyr/kernel.h>
-
-#include "cmdline.h" /* native_posix command line options header */
-#include "posix_native_task.h"
-#include "uart_native_ptty_bottom.h"
-#include "nsi_host_trampolines.h"
-
-/*
- * UART driver for POSIX ARCH based boards.
- * It can support up to two UARTs.
- *
- * For the first UART:
- *
- * It can either be connected to the process STDIN+STDOUT
- * OR
- * to a dedicated pseudo terminal
- *
- * The 2nd option is the recommended one for interactive use, as the pseudo
- * terminal driver will be configured in "raw" mode, and will therefore behave
- * more like a real UART.
- *
- * When connected to its own pseudo terminal, it may also auto attach a terminal
- * emulator to it, if set so from command line.
- */
-
-static int np_uart_stdin_poll_in(const struct device *dev,
-				 unsigned char *p_char);
-static int np_uart_tty_poll_in(const struct device *dev,
-			       unsigned char *p_char);
-static void np_uart_poll_out(const struct device *dev,
-				      unsigned char out_char);
-
-static bool auto_attach;
-static bool wait_pts;
-static char *auto_attach_cmd = CONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD;
-
-struct native_uart_status {
-	int out_fd; /* File descriptor used for output */
-	int in_fd; /* File descriptor used for input */
-};
-
-static struct native_uart_status native_uart_status_0;
-
-static DEVICE_API(uart, np_uart_driver_api_0) = {
-	.poll_out = np_uart_poll_out,
-#if defined(CONFIG_NATIVE_UART_0_ON_OWN_PTY)
-	.poll_in = np_uart_tty_poll_in,
-#else
-	.poll_in = np_uart_stdin_poll_in,
-#endif
-};
-
-#if defined(CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE)
-static struct native_uart_status native_uart_status_1;
-
-static DEVICE_API(uart, np_uart_driver_api_1) = {
-	.poll_out = np_uart_poll_out,
-	.poll_in = np_uart_tty_poll_in,
-};
-#endif /* CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE */
-
-#define ERROR posix_print_error_and_exit
-#define WARN posix_print_warning
-
-
-
-/**
- * @brief Initialize the first native_posix serial port
- *
- * @param dev UART_0 device struct
- *
- * @return 0 (if it fails catastrophically, the execution is terminated)
- */
-static int np_uart_0_init(const struct device *dev)
-{
-	struct native_uart_status *d;
-
-	d = (struct native_uart_status *)dev->data;
-
-	if (IS_ENABLED(CONFIG_NATIVE_UART_0_ON_OWN_PTY)) {
-		int tty_fn = np_uart_open_ptty(dev->name, auto_attach_cmd, auto_attach, wait_pts);
-
-		d->in_fd = tty_fn;
-		d->out_fd = tty_fn;
-	} else { /* NATIVE_UART_0_ON_STDINOUT */
-		d->in_fd  = np_uart_ptty_get_stdin_fileno();
-		d->out_fd = np_uart_ptty_get_stdout_fileno();
-	}
-
-	return 0;
-}
-
-#if defined(CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE)
-/*
- * Initialize the 2nd UART port.
- * This port will be always attached to its own new pseudoterminal.
- */
-static int np_uart_1_init(const struct device *dev)
-{
-	struct native_uart_status *d;
-	int tty_fn;
-
-	d = (struct native_uart_status *)dev->data;
-
-	tty_fn = np_uart_open_ptty(dev->name, NULL, false, wait_pts);
-
-	d->in_fd = tty_fn;
-	d->out_fd = tty_fn;
-
-	return 0;
-}
-#endif
-
-/*
- * @brief Output a character towards the serial port
- *
- * @param dev UART device struct
- * @param out_char Character to send.
- */
-static void np_uart_poll_out(const struct device *dev,
-				      unsigned char out_char)
-{
-	int ret;
-	struct native_uart_status *d = (struct native_uart_status *)dev->data;
-
-	if (wait_pts) {
-
-		while (1) {
-			int rc = np_uart_slave_connected(d->out_fd);
-
-			if (rc == 1) {
-				break;
-			}
-			k_sleep(K_MSEC(100));
-		}
-	}
-
-	/* The return value of write() cannot be ignored (there is a warning)
-	 * but we do not need the return value for anything.
-	 */
-	ret = nsi_host_write(d->out_fd, &out_char, 1);
-	(void) ret;
-}
-
-/**
- * @brief Poll the device for input.
- *
- * @param dev UART device structure.
- * @param p_char Pointer to character.
- *
- * @retval 0 If a character arrived and was stored in p_char
- * @retval -1 If no character was available to read
- */
-static int __maybe_unused np_uart_stdin_poll_in(const struct device *dev, unsigned char *p_char)
-{
-	int in_f = ((struct native_uart_status *)dev->data)->in_fd;
-	static bool disconnected;
-	int rc;
-
-	if (disconnected == true) {
-		return -1;
-	}
-
-	rc = np_uart_stdin_poll_in_bottom(in_f, p_char);
-	if (rc == -2) {
-		disconnected = true;
-		return -1;
-	}
-
-	return rc;
-}
-
-/**
- * @brief Poll the device for input.
- *
- * @param dev UART device structure.
- * @param p_char Pointer to character.
- *
- * @retval 0 If a character arrived and was stored in p_char
- * @retval -1 If no character was available to read
- */
-static int __maybe_unused np_uart_tty_poll_in(const struct device *dev, unsigned char *p_char)
-{
-	int n = -1;
-	int in_f = ((struct native_uart_status *)dev->data)->in_fd;
-
-	n = nsi_host_read(in_f, p_char, 1);
-	if (n == -1) {
-		return -1;
-	}
-	return 0;
-}
-
-DEVICE_DT_INST_DEFINE(0,
-	    np_uart_0_init, NULL,
-	    (void *)&native_uart_status_0, NULL,
-	    PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,
-	    &np_uart_driver_api_0);
-
-#if defined(CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE)
-DEVICE_DT_INST_DEFINE(1,
-	    np_uart_1_init, NULL,
-	    (void *)&native_uart_status_1, NULL,
-	    PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,
-	    &np_uart_driver_api_1);
-#endif /* CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE */
-
-static void auto_attach_cmd_cb(char *argv, int offset)
-{
-	auto_attach_cmd = &argv[offset];
-	auto_attach = true;
-}
-
-static void np_add_uart_options(void)
-{
-	if (!IS_ENABLED(CONFIG_NATIVE_UART_0_ON_OWN_PTY)) {
-		return;
-	}
-
-	static struct args_struct_t uart_options[] = {
-	{
-		.is_switch = true,
-		.option = "attach_uart",
-		.type = 'b',
-		.dest = (void *)&auto_attach,
-		.descript = "Automatically attach to the UART terminal"
-	},
-	{
-		.option = "attach_uart_cmd",
-		.name = "\"cmd\"",
-		.type = 's',
-		.call_when_found = auto_attach_cmd_cb,
-		.descript = "Command used to automatically attach to the terminal (implies "
-			    "auto_attach), by default: "
-			    "'" CONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD "'"
-	},
-	IF_ENABLED(CONFIG_UART_NATIVE_WAIT_PTS_READY_ENABLE, (
-		{
-		.is_switch = true,
-		.option = "wait_uart",
-		.type = 'b',
-		.dest = (void *)&wait_pts,
-		.descript = "Hold writes to the uart/pts until a client is connected/ready"
-		},
-	))
-	ARG_TABLE_ENDMARKER
-	};
-
-	native_add_command_line_opts(uart_options);
-}
-
-static void np_cleanup_uart(void)
-{
-	if (IS_ENABLED(CONFIG_NATIVE_UART_0_ON_OWN_PTY)) {
-		if (native_uart_status_0.in_fd != 0) {
-			nsi_host_close(native_uart_status_0.in_fd);
-		}
-	}
-
-#if defined(CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE)
-	if (native_uart_status_1.in_fd != 0) {
-		nsi_host_close(native_uart_status_1.in_fd);
-	}
-#endif
-}
-
-NATIVE_TASK(np_add_uart_options, PRE_BOOT_1, 11);
-NATIVE_TASK(np_cleanup_uart, ON_EXIT, 99);
diff --git a/drivers/serial/uart_native_ptty_bottom.c b/drivers/serial/uart_native_ptty_bottom.c
deleted file mode 100644
index 7c44ccf68cc82..0000000000000
--- a/drivers/serial/uart_native_ptty_bottom.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2018, Oticon A/S
- * Copyright (c) 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#undef _XOPEN_SOURCE
-/* Note: This is used only for interaction with the host C library, and is therefore exempt of
- * coding guidelines rule A.4&5 which applies to the embedded code using embedded libraries
- */
-#define _XOPEN_SOURCE 600
-
-#include <stdbool.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <pty.h>
-#include <fcntl.h>
-#include <sys/select.h>
-#include <unistd.h>
-#include <poll.h>
-#include <nsi_tracing.h>
-
-#define ERROR nsi_print_error_and_exit
-#define WARN nsi_print_warning
-
-/**
- * @brief Poll the device for input.
- *
- * @param in_f   Input file descriptor
- * @param p_char Pointer to character.
- *
- * @retval 0 If a character arrived and was stored in p_char
- * @retval -1 If no character was available to read
- * @retval -2 if the stdin is disconnected
- */
-int np_uart_stdin_poll_in_bottom(int in_f, unsigned char *p_char)
-{
-	if (feof(stdin)) {
-		/*
-		 * The stdinput is fed from a file which finished or the user
-		 * pressed Ctrl+D
-		 */
-		return -2;
-	}
-
-	int n = -1;
-
-	int ready;
-	fd_set readfds;
-	static struct timeval timeout; /* just zero */
-
-	FD_ZERO(&readfds);
-	FD_SET(in_f, &readfds);
-
-	ready = select(in_f+1, &readfds, NULL, NULL, &timeout);
-
-	if (ready == 0) {
-		return -1;
-	} else if (ready == -1) {
-		ERROR("%s: Error on select ()\n", __func__);
-	}
-
-	n = read(in_f, p_char, 1);
-	if ((n == -1) || (n == 0)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-/**
- * @brief Check if the output descriptor has something connected to the slave side
- *
- * @param fd file number
- *
- * @retval 0 Nothing connected yet
- * @retval 1 Something connected to the slave side
- */
-int np_uart_slave_connected(int fd)
-{
-	struct pollfd pfd = { .fd = fd, .events = POLLHUP };
-	int ret;
-
-	ret = poll(&pfd, 1, 0);
-	if (ret == -1) {
-		int err = errno;
-		/*
-		 * Possible errors are:
-		 *  * EINTR :A signal was received => ok
-		 *  * EFAULT and EINVAL: parameters/programming error
-		 *  * ENOMEM no RAM left
-		 */
-		if (err != EINTR) {
-			ERROR("%s: unexpected error during poll, errno=%i,%s\n",
-			      __func__, err, strerror(err));
-		}
-	}
-	if (!(pfd.revents & POLLHUP)) {
-		/* There is now a reader on the slave side */
-		return 1;
-	}
-	return 0;
-}
-
-/**
- * Attempt to connect a terminal emulator to the slave side of the pty
- * If -attach_uart_cmd=<cmd> is provided as a command line option, <cmd> will be
- * used. Otherwise, the default command,
- * CONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD, will be used instead
- */
-static void attach_to_tty(const char *slave_tty, const char *auto_attach_cmd)
-{
-	char command[strlen(auto_attach_cmd) + strlen(slave_tty) + 1];
-
-	sprintf(command, auto_attach_cmd, slave_tty);
-
-	int ret = system(command);
-
-	if (ret != 0) {
-		WARN("Could not attach to the UART with \"%s\"\n", command);
-		WARN("The command returned %i\n", WEXITSTATUS(ret));
-	}
-}
-/**
- * Attempt to allocate and open a new pseudoterminal
- *
- * Returns the file descriptor of the master side
- * If auto_attach was set, it will also attempt to connect a new terminal
- * emulator to its slave side.
- */
-int np_uart_open_ptty(const char *uart_name, const char *auto_attach_cmd,
-		      bool do_auto_attach, bool wait_pts)
-{
-	int master_pty;
-	char *slave_pty_name;
-	struct termios ter;
-	int err_nbr;
-	int ret;
-	int flags;
-
-	master_pty = posix_openpt(O_RDWR | O_NOCTTY);
-	if (master_pty == -1) {
-		ERROR("Could not open a new TTY for the UART\n");
-	}
-	ret = grantpt(master_pty);
-	if (ret == -1) {
-		err_nbr = errno;
-		close(master_pty);
-		ERROR("Could not grant access to the slave PTY side (%i)\n",
-			err_nbr);
-	}
-	ret = unlockpt(master_pty);
-	if (ret == -1) {
-		err_nbr = errno;
-		close(master_pty);
-		ERROR("Could not unlock the slave PTY side (%i)\n", err_nbr);
-	}
-	slave_pty_name = ptsname(master_pty);
-	if (slave_pty_name == NULL) {
-		err_nbr = errno;
-		close(master_pty);
-		ERROR("Error getting slave PTY device name (%i)\n", err_nbr);
-	}
-	/* Set the master PTY as non blocking */
-	flags = fcntl(master_pty, F_GETFL);
-	if (flags == -1) {
-		err_nbr = errno;
-		close(master_pty);
-		ERROR("Could not read the master PTY file status flags (%i)\n",
-			err_nbr);
-	}
-
-	ret = fcntl(master_pty, F_SETFL, flags | O_NONBLOCK);
-	if (ret == -1) {
-		err_nbr = errno;
-		close(master_pty);
-		ERROR("Could not set the master PTY as non-blocking (%i)\n",
-			err_nbr);
-	}
-
-	(void) err_nbr;
-
-	/*
-	 * Set terminal in "raw" mode:
-	 *  Not canonical (no line input)
-	 *  No signal generation from Ctr+{C|Z..}
-	 *  No echoing, no input or output processing
-	 *  No replacing of NL or CR
-	 *  No flow control
-	 */
-	ret = tcgetattr(master_pty, &ter);
-	if (ret == -1) {
-		ERROR("Could not read terminal driver settings\n");
-	}
-	ter.c_cc[VMIN] = 0;
-	ter.c_cc[VTIME] = 0;
-	ter.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO);
-	ter.c_iflag &= ~(BRKINT | ICRNL | IGNBRK | IGNCR | INLCR | INPCK
-			 | ISTRIP | IXON | PARMRK);
-	ter.c_oflag &= ~OPOST;
-	ret = tcsetattr(master_pty, TCSANOW, &ter);
-	if (ret == -1) {
-		ERROR("Could not change terminal driver settings\n");
-	}
-
-	nsi_print_trace("%s connected to pseudotty: %s\n",
-			  uart_name, slave_pty_name);
-
-	if (wait_pts) {
-		/*
-		 * This trick sets the HUP flag on the tty master, making it
-		 * possible to detect a client connection using poll.
-		 * The connection of the client would cause the HUP flag to be
-		 * cleared, and in turn set again at disconnect.
-		 */
-		ret = open(slave_pty_name, O_RDWR | O_NOCTTY);
-		if (ret == -1) {
-			err_nbr = errno;
-			ERROR("%s: Could not open terminal from the slave side (%i,%s)\n",
-				__func__, err_nbr, strerror(err_nbr));
-		}
-		ret = close(ret);
-		if (ret == -1) {
-			err_nbr = errno;
-			ERROR("%s: Could not close terminal from the slave side (%i,%s)\n",
-				__func__, err_nbr, strerror(err_nbr));
-		}
-	}
-	if (do_auto_attach) {
-		attach_to_tty(slave_pty_name, auto_attach_cmd);
-	}
-
-	return master_pty;
-}
-
-int np_uart_ptty_get_stdin_fileno(void)
-{
-	return STDIN_FILENO;
-}
-
-int np_uart_ptty_get_stdout_fileno(void)
-{
-	return STDOUT_FILENO;
-}
diff --git a/drivers/serial/uart_native_ptty_bottom.h b/drivers/serial/uart_native_ptty_bottom.h
deleted file mode 100644
index cc5ec282450f0..0000000000000
--- a/drivers/serial/uart_native_ptty_bottom.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2023, Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * "Bottom" of native ptty uart driver
- * When built with the native_simulator this will be built in the runner context,
- * that is, with the host C library, and with the host include paths.
- */
-
-#ifndef DRIVERS_SERIAL_UART_NATIVE_PTTY_BOTTOM_H
-#define DRIVERS_SERIAL_UART_NATIVE_PTTY_BOTTOM_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Note: None of these functions are public interfaces. But internal to the native ptty driver */
-
-int np_uart_stdin_poll_in_bottom(int in_f, unsigned char *p_char);
-int np_uart_slave_connected(int fd);
-int np_uart_open_ptty(const char *uart_name, const char *auto_attach_cmd,
-		      bool do_auto_attach, bool wait_pts);
-int np_uart_ptty_get_stdin_fileno(void);
-int np_uart_ptty_get_stdout_fileno(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* DRIVERS_SERIAL_UART_NATIVE_PTTY_BOTTOM_H */
diff --git a/drivers/serial/uart_native_pty.c b/drivers/serial/uart_native_pty.c
new file mode 100644
index 0000000000000..c4da0450b2518
--- /dev/null
+++ b/drivers/serial/uart_native_pty.c
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2018, Oticon A/S
+ * Copyright (c) 2025, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/devicetree.h>
+#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_native_posix_uart)
+#define DT_DRV_COMPAT zephyr_native_posix_uart
+#warning "zephyr,native-posix-uart is deprecated in favor of zephyr,native-pty-uart"
+#else
+#define DT_DRV_COMPAT zephyr_native_pty_uart
+#endif
+
+#include <stdbool.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <cmdline.h> /* native_sim command line options header */
+#include <posix_native_task.h>
+#include <nsi_host_trampolines.h>
+#include <nsi_tracing.h>
+#include "uart_native_pty_bottom.h"
+
+#define ERROR posix_print_error_and_exit
+#define WARN posix_print_warning
+
+/*
+ * UART driver for native simulator based boards.
+ * It can support a configurable number of UARTs.
+ *
+ * One (and only one) of this can be connected to the process STDIN+STDOUT otherwise, they are
+ * connected to a dedicated pseudo terminal.
+ *
+ * Connecting to a dedicated PTY is the recommended option for interactive use, as the pseudo
+ * terminal driver will be configured in "raw" mode and will therefore behave more like a real UART.
+ *
+ * When connected to its own pseudo terminal, it may also auto attach a terminal emulator to it,
+ * if set so from command line.
+ */
+
+struct native_pty_status {
+	int out_fd;       /* File descriptor used for output */
+	int in_fd;        /* File descriptor used for input */
+	bool on_stdinout; /* This UART is connected to a PTY and not STDIN/OUT */
+
+	bool auto_attach;      /* For PTY, attach a terminal emulator automatically */
+	char *auto_attach_cmd; /* If auto_attach, which command to launch the terminal emulator */
+	bool wait_pts;         /* Hold writes to the uart/pts until a client is connected/ready */
+	bool cmd_request_stdinout; /* User requested to connect this UART to the stdin/out */
+};
+
+static void np_uart_poll_out(const struct device *dev, unsigned char out_char);
+static int np_uart_poll_in(const struct device *dev, unsigned char *p_char);
+static int np_uart_init(const struct device *dev);
+
+static DEVICE_API(uart, np_uart_driver_api) = {
+	.poll_out = np_uart_poll_out,
+	.poll_in = np_uart_poll_in,
+};
+
+#define NATIVE_PTY_INSTANCE(inst)                                        \
+	static struct native_pty_status native_pty_status_##inst;        \
+								         \
+	DEVICE_DT_INST_DEFINE(inst, np_uart_init, NULL,                  \
+			      (void *)&native_pty_status_##inst, NULL,   \
+			      PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, \
+			      &np_uart_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(NATIVE_PTY_INSTANCE);
+
+/**
+ * @brief Initialize a native_pty serial port
+ *
+ * @param dev uart device struct
+ *
+ * @return 0 (if it fails catastrophically, the execution is terminated)
+ */
+static int np_uart_init(const struct device *dev)
+{
+
+	static bool stdinout_used;
+	struct native_pty_status *d;
+
+	d = (struct native_pty_status *)dev->data;
+
+	if (IS_ENABLED(CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT)) {
+		static bool first_node = true;
+
+		if (first_node) {
+			d->on_stdinout = true;
+		}
+		first_node = false;
+	}
+
+	if (d->cmd_request_stdinout) {
+		if (stdinout_used) {
+			nsi_print_warning("%s requested to connect to STDIN/OUT, but another UART"
+					  " is already connected to it => ignoring request.\n",
+					  dev->name);
+		} else {
+			d->on_stdinout = true;
+		}
+	}
+
+	if (d->on_stdinout == true) {
+		d->in_fd  = np_uart_pty_get_stdin_fileno();
+		d->out_fd = np_uart_pty_get_stdout_fileno();
+		stdinout_used = true;
+	} else {
+		if (d->auto_attach_cmd == NULL) {
+			d->auto_attach_cmd = CONFIG_UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD;
+		} else { /* Running with --attach_uart_cmd, implies --attach_uart */
+			d->auto_attach = true;
+		}
+		int tty_fn = np_uart_open_pty(dev->name, d->auto_attach_cmd, d->auto_attach,
+					      d->wait_pts);
+		d->in_fd = tty_fn;
+		d->out_fd = tty_fn;
+	}
+
+	return 0;
+}
+
+/*
+ * @brief Output a character towards the serial port
+ *
+ * @param dev UART device struct
+ * @param out_char Character to send.
+ */
+static void np_uart_poll_out(const struct device *dev, unsigned char out_char)
+{
+	int ret;
+	struct native_pty_status *d = (struct native_pty_status *)dev->data;
+
+	if (d->wait_pts) {
+		while (1) {
+			int rc = np_uart_slave_connected(d->out_fd);
+
+			if (rc == 1) {
+				break;
+			}
+			k_sleep(K_MSEC(100));
+		}
+	}
+
+	/* The return value of write() cannot be ignored (there is a warning)
+	 * but we do not need the return value for anything.
+	 */
+	ret = nsi_host_write(d->out_fd, &out_char, 1);
+	(void) ret;
+}
+
+/**
+ * @brief Poll the device for input.
+ *
+ * @param dev UART device structure.
+ * @param p_char Pointer to character.
+ *
+ * @retval 0 If a character arrived and was stored in p_char
+ * @retval -1 If no character was available to read
+ */
+static int np_uart_stdin_poll_in(const struct device *dev, unsigned char *p_char)
+{
+	int in_f = ((struct native_pty_status *)dev->data)->in_fd;
+	static bool disconnected;
+	int rc;
+
+	if (disconnected == true) {
+		return -1;
+	}
+
+	rc = np_uart_stdin_poll_in_bottom(in_f, p_char);
+	if (rc == -2) {
+		disconnected = true;
+		return -1;
+	}
+
+	return rc;
+}
+
+/**
+ * @brief Poll the device for input.
+ *
+ * @param dev UART device structure.
+ * @param p_char Pointer to character.
+ *
+ * @retval 0 If a character arrived and was stored in p_char
+ * @retval -1 If no character was available to read
+ */
+static int np_uart_pty_poll_in(const struct device *dev, unsigned char *p_char)
+{
+	int n = -1;
+	int in_f = ((struct native_pty_status *)dev->data)->in_fd;
+
+	n = nsi_host_read(in_f, p_char, 1);
+	if (n == -1) {
+		return -1;
+	}
+	return 0;
+}
+
+static int np_uart_poll_in(const struct device *dev, unsigned char *p_char)
+{
+	if (((struct native_pty_status *)dev->data)->on_stdinout) {
+		return np_uart_stdin_poll_in(dev, p_char);
+	} else {
+		return np_uart_pty_poll_in(dev, p_char);
+	}
+}
+
+#define NATIVE_PTY_SET_AUTO_ATTACH_CMD(inst, cmd)      \
+	native_pty_status_##inst.auto_attach_cmd = cmd;
+#define NATIVE_PTY_SET_AUTO_ATTACH(inst, value)        \
+	native_pty_status_##inst.auto_attach = value;
+#define NATIVE_PTY_SET_WAIT_PTS(inst, value)           \
+	native_pty_status_##inst.wait_pts = value;
+
+static void auto_attach_cmd_cb(char *argv, int offset)
+{
+	DT_INST_FOREACH_STATUS_OKAY_VARGS(NATIVE_PTY_SET_AUTO_ATTACH_CMD, &argv[offset]);
+	DT_INST_FOREACH_STATUS_OKAY_VARGS(NATIVE_PTY_SET_AUTO_ATTACH, true);
+}
+
+static void auto_attach_cb(char *argv, int offset)
+{
+	DT_INST_FOREACH_STATUS_OKAY_VARGS(NATIVE_PTY_SET_AUTO_ATTACH, true);
+}
+
+static void wait_pts_cb(char *argv, int offset)
+{
+	DT_INST_FOREACH_STATUS_OKAY_VARGS(NATIVE_PTY_SET_WAIT_PTS, true);
+}
+
+#define INST_NAME(inst) DEVICE_DT_NAME(DT_DRV_INST(inst))
+
+#define NATIVE_PTY_COMMAND_LINE_OPTS(inst)                                                         \
+	{                                                                                          \
+		.is_switch = true,                                                                 \
+		.option = INST_NAME(inst) "_stdinout",                                             \
+		.type = 'b',                                                                       \
+		.dest = &native_pty_status_##inst.cmd_request_stdinout,                            \
+		.descript = "Connect "INST_NAME(inst)" to STDIN/OUT instead of a PTY"              \
+			    " (can only be done for one UART)"                                     \
+	},                                                                                         \
+	{                                                                                          \
+		.is_switch = true,                                                                 \
+		.option = INST_NAME(inst) "_attach_uart",                                          \
+		.type = 'b',                                                                       \
+		.dest = &native_pty_status_##inst.auto_attach,                                     \
+		.descript = "Automatically attach "INST_NAME(inst)" to a terminal emulator."       \
+			    " (only applicable when connected to PTYs)"                            \
+	},                                                                                         \
+	{                                                                                          \
+		.option = INST_NAME(inst) "_attach_uart_cmd",                                      \
+		.name = "\"cmd\"",                                                                 \
+		.type = 's',                                                                       \
+		.dest = &native_pty_status_##inst.auto_attach_cmd,                                 \
+		.descript = "Command used to automatically attach to the terminal "INST_NAME(inst) \
+			    " (implies "INST_NAME(inst)"_auto_attach), by default: "               \
+			    "'" CONFIG_UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD "'"                  \
+			    " (only applicable when connected to PTYs)"                            \
+	},                                                                                         \
+	{                                                                                          \
+		.is_switch = true,                                                                 \
+		.option = INST_NAME(inst) "_wait_uart",                                            \
+		.type = 'b',                                                                       \
+		.dest = &native_pty_status_##inst.wait_pts,                                        \
+		.descript = "Hold writes to "INST_NAME(inst)" until a client is connected/ready"   \
+			   " (only applicable when connected to PTYs)"                             \
+	},
+
+static void np_add_uart_options(void)
+{
+	static struct args_struct_t uart_options[] = {
+	/* Set of parameters that apply to all PTY UARTs: */
+	{
+		.is_switch = true,
+		.option = "attach_uart",
+		.type = 'b',
+		.call_when_found = auto_attach_cb,
+		.descript = "Automatically attach all PTY UARTs to a terminal emulator."
+			    " (only applicable when connected to PTYs)"
+	},
+	{
+		.option = "attach_uart_cmd",
+		.name = "\"cmd\"",
+		.type = 's',
+		.call_when_found = auto_attach_cmd_cb,
+		.descript = "Command used to automatically attach all PTY UARTs to a terminal "
+			    "emulator (implies auto_attach), by default: "
+			    "'" CONFIG_UART_NATIVE_PTY_AUTOATTACH_DEFAULT_CMD "'"
+			    " (only applicable when connected to PTYs)"
+	},
+	{
+		.is_switch = true,
+		.option = "wait_uart",
+		.type = 'b',
+		.call_when_found = wait_pts_cb,
+		.descript = "Hold writes to all PTY UARTs until a client is connected/ready"
+			    " (only applicable when connected to PTYs)"
+	},
+	/* Set of parameters that apply to each individual PTY UART: */
+	DT_INST_FOREACH_STATUS_OKAY(NATIVE_PTY_COMMAND_LINE_OPTS)
+	ARG_TABLE_ENDMARKER
+	};
+
+	native_add_command_line_opts(uart_options);
+}
+
+#define NATIVE_PTY_CLEANUP(inst)                                                                \
+	if ((!native_pty_status_##inst.on_stdinout) && (native_pty_status_##inst.in_fd != 0)) { \
+		nsi_host_close(native_pty_status_##inst.in_fd);                                 \
+		native_pty_status_##inst.in_fd = 0;                                             \
+	}
+
+static void np_cleanup_uart(void)
+{
+	DT_INST_FOREACH_STATUS_OKAY(NATIVE_PTY_CLEANUP);
+}
+
+NATIVE_TASK(np_add_uart_options, PRE_BOOT_1, 11);
+NATIVE_TASK(np_cleanup_uart, ON_EXIT, 99);
diff --git a/drivers/serial/uart_native_pty_bottom.c b/drivers/serial/uart_native_pty_bottom.c
new file mode 100644
index 0000000000000..0c5546cdeda13
--- /dev/null
+++ b/drivers/serial/uart_native_pty_bottom.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2018, Oticon A/S
+ * Copyright (c) 2023, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#undef _XOPEN_SOURCE
+/* Note: This is used only for interaction with the host C library, and is therefore exempt of
+ * coding guidelines rule A.4&5 which applies to the embedded code using embedded libraries
+ */
+#define _XOPEN_SOURCE 600
+
+#include <stdbool.h>
+#include <errno.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <pty.h>
+#include <fcntl.h>
+#include <sys/select.h>
+#include <unistd.h>
+#include <poll.h>
+#include <nsi_tracing.h>
+
+#define ERROR nsi_print_error_and_exit
+#define WARN nsi_print_warning
+
+/**
+ * @brief Poll the device for input.
+ *
+ * @param in_f   Input file descriptor
+ * @param p_char Pointer to character.
+ *
+ * @retval 0 If a character arrived and was stored in p_char
+ * @retval -1 If no character was available to read
+ * @retval -2 if the stdin is disconnected
+ */
+int np_uart_stdin_poll_in_bottom(int in_f, unsigned char *p_char)
+{
+	if (feof(stdin)) {
+		/*
+		 * The stdinput is fed from a file which finished or the user
+		 * pressed Ctrl+D
+		 */
+		return -2;
+	}
+
+	int n = -1;
+
+	int ready;
+	fd_set readfds;
+	static struct timeval timeout; /* just zero */
+
+	FD_ZERO(&readfds);
+	FD_SET(in_f, &readfds);
+
+	ready = select(in_f+1, &readfds, NULL, NULL, &timeout);
+
+	if (ready == 0) {
+		return -1;
+	} else if (ready == -1) {
+		ERROR("%s: Error on select ()\n", __func__);
+	}
+
+	n = read(in_f, p_char, 1);
+	if ((n == -1) || (n == 0)) {
+		return -1;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Check if the output descriptor has something connected to the slave side
+ *
+ * @param fd file number
+ *
+ * @retval 0 Nothing connected yet
+ * @retval 1 Something connected to the slave side
+ */
+int np_uart_slave_connected(int fd)
+{
+	struct pollfd pfd = { .fd = fd, .events = POLLHUP };
+	int ret;
+
+	ret = poll(&pfd, 1, 0);
+	if (ret == -1) {
+		int err = errno;
+		/*
+		 * Possible errors are:
+		 *  * EINTR :A signal was received => ok
+		 *  * EFAULT and EINVAL: parameters/programming error
+		 *  * ENOMEM no RAM left
+		 */
+		if (err != EINTR) {
+			ERROR("%s: unexpected error during poll, errno=%i,%s\n",
+			      __func__, err, strerror(err));
+		}
+	}
+	if (!(pfd.revents & POLLHUP)) {
+		/* There is now a reader on the slave side */
+		return 1;
+	}
+	return 0;
+}
+
+/**
+ * Attempt to connect a terminal emulator to the slave side of the pty
+ * If -attach_uart_cmd=<cmd> is provided as a command line option, <cmd> will be
+ * used. Otherwise, the default command,
+ * CONFIG_NATIVE_UART_AUTOATTACH_DEFAULT_CMD, will be used instead
+ */
+static void attach_to_pty(const char *slave_pty, const char *auto_attach_cmd)
+{
+	char command[strlen(auto_attach_cmd) + strlen(slave_pty) + 1];
+
+	sprintf(command, auto_attach_cmd, slave_pty);
+
+	int ret = system(command);
+
+	if (ret != 0) {
+		WARN("Could not attach to the UART with \"%s\"\n", command);
+		WARN("The command returned %i\n", WEXITSTATUS(ret));
+	}
+}
+/**
+ * Attempt to allocate and open a new pseudoterminal
+ *
+ * Returns the file descriptor of the master side
+ * If auto_attach was set, it will also attempt to connect a new terminal
+ * emulator to its slave side.
+ */
+int np_uart_open_pty(const char *uart_name, const char *auto_attach_cmd,
+		     bool do_auto_attach, bool wait_pts)
+{
+	int master_pty;
+	char *slave_pty_name;
+	struct termios ter;
+	int err_nbr;
+	int ret;
+	int flags;
+
+	master_pty = posix_openpt(O_RDWR | O_NOCTTY);
+	if (master_pty == -1) {
+		ERROR("Could not open a new PTY for the UART\n");
+	}
+	ret = grantpt(master_pty);
+	if (ret == -1) {
+		err_nbr = errno;
+		close(master_pty);
+		ERROR("Could not grant access to the slave PTY side (%i)\n",
+			err_nbr);
+	}
+	ret = unlockpt(master_pty);
+	if (ret == -1) {
+		err_nbr = errno;
+		close(master_pty);
+		ERROR("Could not unlock the slave PTY side (%i)\n", err_nbr);
+	}
+	slave_pty_name = ptsname(master_pty);
+	if (slave_pty_name == NULL) {
+		err_nbr = errno;
+		close(master_pty);
+		ERROR("Error getting slave PTY device name (%i)\n", err_nbr);
+	}
+	/* Set the master PTY as non blocking */
+	flags = fcntl(master_pty, F_GETFL);
+	if (flags == -1) {
+		err_nbr = errno;
+		close(master_pty);
+		ERROR("Could not read the master PTY file status flags (%i)\n",
+			err_nbr);
+	}
+
+	ret = fcntl(master_pty, F_SETFL, flags | O_NONBLOCK);
+	if (ret == -1) {
+		err_nbr = errno;
+		close(master_pty);
+		ERROR("Could not set the master PTY as non-blocking (%i)\n",
+			err_nbr);
+	}
+
+	(void) err_nbr;
+
+	/*
+	 * Set terminal in "raw" mode:
+	 *  Not canonical (no line input)
+	 *  No signal generation from Ctr+{C|Z..}
+	 *  No echoing, no input or output processing
+	 *  No replacing of NL or CR
+	 *  No flow control
+	 */
+	ret = tcgetattr(master_pty, &ter);
+	if (ret == -1) {
+		ERROR("Could not read terminal driver settings\n");
+	}
+	ter.c_cc[VMIN] = 0;
+	ter.c_cc[VTIME] = 0;
+	ter.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO);
+	ter.c_iflag &= ~(BRKINT | ICRNL | IGNBRK | IGNCR | INLCR | INPCK
+			 | ISTRIP | IXON | PARMRK);
+	ter.c_oflag &= ~OPOST;
+	ret = tcsetattr(master_pty, TCSANOW, &ter);
+	if (ret == -1) {
+		ERROR("Could not change terminal driver settings\n");
+	}
+
+	nsi_print_trace("%s connected to pseudotty: %s\n",
+			  uart_name, slave_pty_name);
+
+	if (wait_pts) {
+		/*
+		 * This trick sets the HUP flag on the pty master, making it
+		 * possible to detect a client connection using poll.
+		 * The connection of the client would cause the HUP flag to be
+		 * cleared, and in turn set again at disconnect.
+		 */
+		ret = open(slave_pty_name, O_RDWR | O_NOCTTY);
+		if (ret == -1) {
+			err_nbr = errno;
+			ERROR("%s: Could not open terminal from the slave side (%i,%s)\n",
+				__func__, err_nbr, strerror(err_nbr));
+		}
+		ret = close(ret);
+		if (ret == -1) {
+			err_nbr = errno;
+			ERROR("%s: Could not close terminal from the slave side (%i,%s)\n",
+				__func__, err_nbr, strerror(err_nbr));
+		}
+	}
+	if (do_auto_attach) {
+		attach_to_pty(slave_pty_name, auto_attach_cmd);
+	}
+
+	return master_pty;
+}
+
+int np_uart_pty_get_stdin_fileno(void)
+{
+	return STDIN_FILENO;
+}
+
+int np_uart_pty_get_stdout_fileno(void)
+{
+	return STDOUT_FILENO;
+}
diff --git a/drivers/serial/uart_native_pty_bottom.h b/drivers/serial/uart_native_pty_bottom.h
new file mode 100644
index 0000000000000..5cbf278379599
--- /dev/null
+++ b/drivers/serial/uart_native_pty_bottom.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2023, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * "Bottom" of native PTY UART driver
+ * When built with the native_simulator this will be built in the runner context,
+ * that is, with the host C library, and with the host include paths.
+ */
+
+#ifndef DRIVERS_SERIAL_UART_NATIVE_PTTY_BOTTOM_H
+#define DRIVERS_SERIAL_UART_NATIVE_PTTY_BOTTOM_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Note: None of these functions are public interfaces. But internal to the native ptty driver */
+
+int np_uart_stdin_poll_in_bottom(int in_f, unsigned char *p_char);
+int np_uart_slave_connected(int fd);
+int np_uart_open_pty(const char *uart_name, const char *auto_attach_cmd,
+		     bool do_auto_attach, bool wait_pts);
+int np_uart_pty_get_stdin_fileno(void);
+int np_uart_pty_get_stdout_fileno(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DRIVERS_SERIAL_UART_NATIVE_PTTY_BOTTOM_H */
diff --git a/drivers/serial/uart_native_tty.c b/drivers/serial/uart_native_tty.c
index 98006616a5a35..2c559c7bd36ec 100644
--- a/drivers/serial/uart_native_tty.c
+++ b/drivers/serial/uart_native_tty.c
@@ -48,6 +48,10 @@ struct native_tty_data {
 	uart_irq_callback_user_data_t callback;
 	/* IRQ callback data */
 	void *cb_data;
+	/* Instance-specific RX thread. */
+	struct k_thread rx_thread;
+	/* RX thread stack. */
+	K_KERNEL_STACK_MEMBER(rx_stack, CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);
 #endif
 };
 
@@ -56,8 +60,6 @@ struct native_tty_config {
 };
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static struct k_thread rx_thread;
-static K_KERNEL_STACK_DEFINE(rx_stack, CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);
 #define NATIVE_TTY_INIT_LEVEL POST_KERNEL
 #else
 #define NATIVE_TTY_INIT_LEVEL PRE_KERNEL_1
@@ -311,8 +313,10 @@ static void native_tty_uart_irq_callback_set(const struct device *dev,
 
 static void native_tty_irq_init(const struct device *dev)
 {
+	struct native_tty_data *data = dev->data;
+
 	/* Create a thread which will wait for data - replacement for IRQ */
-	k_thread_create(&rx_thread, rx_stack, K_KERNEL_STACK_SIZEOF(rx_stack),
+	k_thread_create(&data->rx_thread, data->rx_stack, K_KERNEL_STACK_SIZEOF(data->rx_stack),
 			native_tty_uart_irq_function,
 			(void *)dev, NULL, NULL,
 			K_HIGHEST_THREAD_PRIO, 0, K_NO_WAIT);
diff --git a/drivers/serial/uart_neorv32.c b/drivers/serial/uart_neorv32.c
index 8165ff7277eb8..2dff1ea7ee8d9 100644
--- a/drivers/serial/uart_neorv32.c
+++ b/drivers/serial/uart_neorv32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+ * Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,40 +9,46 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/syscon.h>
 #include <zephyr/drivers/uart.h>
+#include <zephyr/irq.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
+#include <zephyr/spinlock.h>
 #include <zephyr/sys/sys_io.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/irq.h>
 
 #include <soc.h>
 
 LOG_MODULE_REGISTER(uart_neorv32, CONFIG_UART_LOG_LEVEL);
 
 /* NEORV32 UART registers offsets */
-#define NEORV32_UART_CTRL_OFFSET 0x00
-#define NEORV32_UART_DATA_OFFSET 0x04
-
-/* UART_CTRL register bits */
-#define NEORV32_UART_CTRL_EN              BIT(0)
-#define NEORV32_UART_CTRL_SIM_MODE        BIT(1)
-#define NEORV32_UART_CTRL_HWFC_EN         BIT(2)
-#define NEORV32_UART_CTRL_PRSC_POS        3U
-#define NEORV32_UART_CTRL_PRSC_MASK       BIT_MASK(3)
-#define NEORV32_UART_CTRL_BAUD_POS        6U
-#define NEORV32_UART_CTRL_BAUD_MASK       BIT_MASK(10)
-#define NEORV32_UART_CTRL_RX_NEMPTY       BIT(16)
-#define NEORV32_UART_CTRL_RX_HALF         BIT(17)
-#define NEORV32_UART_CTRL_RX_FULL         BIT(18)
-#define NEORV32_UART_CTRL_TX_NEMPTY       BIT(19)
-#define NEORV32_UART_CTRL_TX_HALF         BIT(20)
-#define NEORV32_UART_CTRL_TX_FULL         BIT(21)
-#define NEORV32_UART_CTRL_IRQ_RX_NEMPTY   BIT(22)
-#define NEORV32_UART_CTRL_IRQ_RX_HALF     BIT(23)
-#define NEORV32_UART_CTRL_IRQ_RX_FULL     BIT(24)
-#define NEORV32_UART_CTRL_IRQ_TX_EMPTY    BIT(25)
-#define NEORV32_UART_CTRL_IRQ_TX_NHALF    BIT(26)
-#define NEORV32_UART_CTRL_RX_OVER         BIT(30)
-#define NEORV32_UART_CTRL_TX_BUSY         BIT(31)
+#define NEORV32_UART_CTRL 0x00
+#define NEORV32_UART_DATA 0x04
+
+/* NEORV32 UART CTRL register bits */
+#define NEORV32_UART_CTRL_EN               BIT(0)
+#define NEORV32_UART_CTRL_SIM_MODE         BIT(1)
+#define NEORV32_UART_CTRL_HWFC_EN          BIT(2)
+#define NEORV32_UART_CTRL_PRSC             GENMASK(5, 3)
+#define NEORV32_UART_CTRL_BAUD             GENMASK(15, 6)
+#define NEORV32_UART_CTRL_RX_NEMPTY        BIT(16)
+#define NEORV32_UART_CTRL_RX_HALF          BIT(17)
+#define NEORV32_UART_CTRL_RX_FULL          BIT(18)
+#define NEORV32_UART_CTRL_TX_EMPTY         BIT(19)
+#define NEORV32_UART_CTRL_TX_NHALF         BIT(20)
+#define NEORV32_UART_CTRL_TX_FULL          BIT(21)
+#define NEORV32_UART_CTRL_IRQ_RX_NEMPTY    BIT(22)
+#define NEORV32_UART_CTRL_IRQ_RX_HALF      BIT(23)
+#define NEORV32_UART_CTRL_IRQ_RX_FULL      BIT(24)
+#define NEORV32_UART_CTRL_IRQ_TX_EMPTY     BIT(25)
+#define NEORV32_UART_CTRL_IRQ_TX_NHALF     BIT(26)
+#define NEORV32_UART_CTRL_UART_CTRL_RX_CLR BIT(28)
+#define NEORV32_UART_CTRL_UART_CTRL_TX_CLR BIT(29)
+#define NEORV32_UART_CTRL_RX_OVER          BIT(30)
+#define NEORV32_UART_CTRL_TX_BUSY          BIT(31)
+
+/* NEORV32 UART DATA register bits */
+#define NEORV32_UART_DATA_RTX          GENMASK(7, 0)
+#define NEORV32_UART_DATA_RX_FIFO_SIZE GENMASK(11, 8)
+#define NEORV32_UART_DATA_TX_FIFO_SIZE GENMASK(15, 12)
 
 struct neorv32_uart_config {
 	const struct device *syscon;
@@ -50,18 +56,16 @@ struct neorv32_uart_config {
 	mm_reg_t base;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(const struct device *dev);
-	unsigned int tx_irq;
-	unsigned int rx_irq;
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 };
 
 struct neorv32_uart_data {
 	struct uart_config uart_cfg;
-	uint32_t last_data;
+	struct k_spinlock lock;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	struct k_timer timer;
 	uart_irq_callback_user_data_t callback;
 	void *callback_data;
+	uint32_t last_ctrl;
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 };
 
@@ -69,44 +73,37 @@ static inline uint32_t neorv32_uart_read_ctrl(const struct device *dev)
 {
 	const struct neorv32_uart_config *config = dev->config;
 
-	return sys_read32(config->base + NEORV32_UART_CTRL_OFFSET);
+	return sys_read32(config->base + NEORV32_UART_CTRL);
 }
 
 static inline void neorv32_uart_write_ctrl(const struct device *dev, uint32_t ctrl)
 {
 	const struct neorv32_uart_config *config = dev->config;
 
-	sys_write32(ctrl, config->base + NEORV32_UART_CTRL_OFFSET);
+	sys_write32(ctrl, config->base + NEORV32_UART_CTRL);
 }
 
 static inline uint32_t neorv32_uart_read_data(const struct device *dev)
 {
 	const struct neorv32_uart_config *config = dev->config;
-	struct neorv32_uart_data *data = dev->data;
-	uint32_t reg;
-
-	/* Cache status bits as they are cleared upon read */
-	reg = sys_read32(config->base + NEORV32_UART_DATA_OFFSET);
-	data->last_data = reg;
 
-	return reg;
+	return sys_read32(config->base + NEORV32_UART_DATA);
 }
 
 static inline void neorv32_uart_write_data(const struct device *dev, uint32_t data)
 {
 	const struct neorv32_uart_config *config = dev->config;
 
-	sys_write32(data, config->base + NEORV32_UART_DATA_OFFSET);
+	sys_write32(data, config->base + NEORV32_UART_DATA);
 }
 
 static int neorv32_uart_poll_in(const struct device *dev, unsigned char *c)
 {
-	uint32_t data;
-
-	data = neorv32_uart_read_data(dev);
+	uint32_t ctrl;
 
-	if ((data & NEORV32_UART_CTRL_RX_NEMPTY) != 0) {
-		*c = data & BIT_MASK(8);
+	ctrl = neorv32_uart_read_ctrl(dev);
+	if ((ctrl & NEORV32_UART_CTRL_RX_NEMPTY) != 0U) {
+		*c = neorv32_uart_read_data(dev) & NEORV32_UART_DATA_RTX;
 		return 0;
 	}
 
@@ -115,7 +112,7 @@ static int neorv32_uart_poll_in(const struct device *dev, unsigned char *c)
 
 static void neorv32_uart_poll_out(const struct device *dev, unsigned char c)
 {
-	while ((neorv32_uart_read_ctrl(dev) & NEORV32_UART_CTRL_TX_BUSY) != 0) {
+	while ((neorv32_uart_read_ctrl(dev) & NEORV32_UART_CTRL_TX_FULL) != 0U) {
 	}
 
 	neorv32_uart_write_data(dev, c);
@@ -123,11 +120,15 @@ static void neorv32_uart_poll_out(const struct device *dev, unsigned char c)
 
 static int neorv32_uart_configure(const struct device *dev, const struct uart_config *cfg)
 {
+	const uint16_t baudxx_max = FIELD_GET(NEORV32_UART_CTRL_BAUD, NEORV32_UART_CTRL_BAUD);
+	const uint8_t prscx_max = FIELD_GET(NEORV32_UART_CTRL_PRSC, NEORV32_UART_CTRL_PRSC);
 	const struct neorv32_uart_config *config = dev->config;
 	struct neorv32_uart_data *data = dev->data;
-	uint32_t ctrl = NEORV32_UART_CTRL_EN;
+	k_spinlock_key_t key;
 	uint16_t baudxx = 0;
 	uint8_t prscx = 0;
+	uint32_t ctrl;
+	bool hwfc_en;
 	uint32_t clk;
 	int err;
 
@@ -143,20 +144,17 @@ static int neorv32_uart_configure(const struct device *dev, const struct uart_co
 		return -ENOTSUP;
 	}
 
-	switch (cfg->parity) {
-	case UART_CFG_PARITY_NONE:
-		break;
-	default:
-		LOG_ERR("unsupported parity mode %d", cfg->parity);
+	if (cfg->parity != UART_CFG_PARITY_NONE) {
+		LOG_ERR("hardware only supports parity mode none");
 		return -ENOTSUP;
 	}
 
 	switch (cfg->flow_ctrl) {
 	case UART_CFG_FLOW_CTRL_NONE:
-		ctrl |= 0;
+		hwfc_en = false;
 		break;
 	case UART_CFG_FLOW_CTRL_RTS_CTS:
-		ctrl |= NEORV32_UART_CTRL_HWFC_EN;
+		hwfc_en = true;
 		break;
 	default:
 		LOG_ERR("unsupported flow control mode %d", cfg->flow_ctrl);
@@ -179,7 +177,7 @@ static int neorv32_uart_configure(const struct device *dev, const struct uart_co
 	 * clock / 2.
 	 */
 	baudxx = clk / (2 * cfg->baudrate);
-	while (baudxx >= NEORV32_UART_CTRL_BAUD_MASK) {
+	while (baudxx >= baudxx_max) {
 		if ((prscx == 2) || (prscx == 4)) {
 			baudxx >>= 3;
 		} else {
@@ -189,20 +187,35 @@ static int neorv32_uart_configure(const struct device *dev, const struct uart_co
 		prscx++;
 	}
 
-	if (prscx > NEORV32_UART_CTRL_PRSC_MASK) {
+	if (prscx > prscx_max) {
 		LOG_ERR("unsupported baud rate %d", cfg->baudrate);
 		return -ENOTSUP;
 	}
 
-	ctrl |= (baudxx - 1) << NEORV32_UART_CTRL_BAUD_POS;
-	ctrl |= prscx << NEORV32_UART_CTRL_PRSC_POS;
+	key = k_spin_lock(&data->lock);
+
+	ctrl = neorv32_uart_read_ctrl(dev);
+	ctrl |= NEORV32_UART_CTRL_EN;
+
+	if (hwfc_en) {
+		ctrl |= NEORV32_UART_CTRL_HWFC_EN;
+	} else {
+		ctrl &= ~NEORV32_UART_CTRL_HWFC_EN;
+	}
+
+	ctrl &= ~(NEORV32_UART_CTRL_BAUD | NEORV32_UART_CTRL_PRSC);
+	ctrl |= FIELD_PREP(NEORV32_UART_CTRL_BAUD, baudxx - 1U) |
+		FIELD_PREP(NEORV32_UART_CTRL_PRSC, prscx);
 
-	data->uart_cfg = *cfg;
 	neorv32_uart_write_ctrl(dev, ctrl);
+	data->uart_cfg = *cfg;
+
+	k_spin_unlock(&data->lock, key);
 
 	return 0;
 }
 
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 static int neorv32_uart_config_get(const struct device *dev, struct uart_config *cfg)
 {
 	struct neorv32_uart_data *data = dev->data;
@@ -213,30 +226,28 @@ static int neorv32_uart_config_get(const struct device *dev, struct uart_config
 
 	return 0;
 }
+#endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int neorv32_uart_fifo_fill(const struct device *dev, const uint8_t *tx_data, int len)
+static int neorv32_uart_fifo_fill(const struct device *dev, const uint8_t *tx_data, int size)
 {
-	uint32_t ctrl;
+	int count = 0;
 
-	if (len <= 0) {
+	if (size <= 0) {
 		return 0;
 	}
 
 	__ASSERT_NO_MSG(tx_data != NULL);
 
-	ctrl = neorv32_uart_read_ctrl(dev);
-	if ((ctrl & NEORV32_UART_CTRL_TX_BUSY) == 0) {
-		neorv32_uart_write_data(dev, *tx_data);
-		return 1;
+	while (count < size && (neorv32_uart_read_ctrl(dev) & NEORV32_UART_CTRL_TX_FULL) == 0U) {
+		neorv32_uart_write_data(dev, tx_data[count++]);
 	}
 
-	return 0;
+	return count;
 }
 
 static int neorv32_uart_fifo_read(const struct device *dev, uint8_t *rx_data, const int size)
 {
-	struct neorv32_uart_data *data = dev->data;
 	int count = 0;
 
 	if (size <= 0) {
@@ -245,104 +256,100 @@ static int neorv32_uart_fifo_read(const struct device *dev, uint8_t *rx_data, co
 
 	__ASSERT_NO_MSG(rx_data != NULL);
 
-	while ((data->last_data & NEORV32_UART_CTRL_RX_NEMPTY) != 0) {
-		rx_data[count++] = data->last_data & BIT_MASK(8);
-		data->last_data &= ~(NEORV32_UART_CTRL_RX_NEMPTY);
-
-		if (count >= size) {
-			break;
-		}
-
-		(void)neorv32_uart_read_data(dev);
+	while (count < size && (neorv32_uart_read_ctrl(dev) & NEORV32_UART_CTRL_RX_NEMPTY) != 0U) {
+		rx_data[count++] = neorv32_uart_read_data(dev) & NEORV32_UART_DATA_RTX;
 	}
 
 	return count;
 }
 
-static void neorv32_uart_tx_soft_isr(struct k_timer *timer)
-{
-	const struct device *dev = k_timer_user_data_get(timer);
-	struct neorv32_uart_data *data = dev->data;
-	uart_irq_callback_user_data_t callback = data->callback;
-
-	if (callback) {
-		callback(dev, data->callback_data);
-	}
-}
-
 static void neorv32_uart_irq_tx_enable(const struct device *dev)
 {
-	const struct neorv32_uart_config *config = dev->config;
 	struct neorv32_uart_data *data = dev->data;
+	k_spinlock_key_t key;
 	uint32_t ctrl;
 
-	irq_enable(config->tx_irq);
+	key = k_spin_lock(&data->lock);
 
 	ctrl = neorv32_uart_read_ctrl(dev);
-	if ((ctrl & NEORV32_UART_CTRL_TX_BUSY) == 0) {
-		/*
-		 * TX done event already generated an edge interrupt. Generate a
-		 * soft interrupt and have it call the callback function in
-		 * timer isr context.
-		 */
-		k_timer_start(&data->timer, K_NO_WAIT, K_NO_WAIT);
-	}
+	ctrl |= NEORV32_UART_CTRL_IRQ_TX_EMPTY;
+	neorv32_uart_write_ctrl(dev, ctrl);
+
+	k_spin_unlock(&data->lock, key);
 }
 
 static void neorv32_uart_irq_tx_disable(const struct device *dev)
 {
-	const struct neorv32_uart_config *config = dev->config;
+	struct neorv32_uart_data *data = dev->data;
+	k_spinlock_key_t key;
+	uint32_t ctrl;
 
-	irq_disable(config->tx_irq);
+	key = k_spin_lock(&data->lock);
+
+	ctrl = neorv32_uart_read_ctrl(dev);
+	ctrl &= ~NEORV32_UART_CTRL_IRQ_TX_EMPTY;
+	neorv32_uart_write_ctrl(dev, ctrl);
+
+	k_spin_unlock(&data->lock, key);
 }
 
 static int neorv32_uart_irq_tx_ready(const struct device *dev)
 {
-	const struct neorv32_uart_config *config = dev->config;
-	uint32_t ctrl;
+	struct neorv32_uart_data *data = dev->data;
 
-	if (!irq_is_enabled(config->tx_irq)) {
+	if ((data->last_ctrl & NEORV32_UART_CTRL_IRQ_TX_EMPTY) == 0U) {
 		return 0;
 	}
 
-	ctrl = neorv32_uart_read_ctrl(dev);
-
-	return (ctrl & NEORV32_UART_CTRL_TX_BUSY) == 0;
+	return (data->last_ctrl & NEORV32_UART_CTRL_TX_FULL) == 0U;
 }
 
 static void neorv32_uart_irq_rx_enable(const struct device *dev)
 {
-	const struct neorv32_uart_config *config = dev->config;
+	struct neorv32_uart_data *data = dev->data;
+	k_spinlock_key_t key;
+	uint32_t ctrl;
+
+	key = k_spin_lock(&data->lock);
+
+	ctrl = neorv32_uart_read_ctrl(dev);
+	ctrl |= NEORV32_UART_CTRL_IRQ_RX_NEMPTY;
+	neorv32_uart_write_ctrl(dev, ctrl);
 
-	irq_enable(config->rx_irq);
+	k_spin_unlock(&data->lock, key);
 }
 
 static void neorv32_uart_irq_rx_disable(const struct device *dev)
 {
-	const struct neorv32_uart_config *config = dev->config;
+	struct neorv32_uart_data *data = dev->data;
+	k_spinlock_key_t key;
+	uint32_t ctrl;
 
-	irq_disable(config->rx_irq);
+	key = k_spin_lock(&data->lock);
+
+	ctrl = neorv32_uart_read_ctrl(dev);
+	ctrl &= ~NEORV32_UART_CTRL_IRQ_RX_NEMPTY;
+	neorv32_uart_write_ctrl(dev, ctrl);
+
+	k_spin_unlock(&data->lock, key);
 }
 
 static int neorv32_uart_irq_tx_complete(const struct device *dev)
 {
-	uint32_t ctrl;
-
-	ctrl = neorv32_uart_read_ctrl(dev);
+	struct neorv32_uart_data *data = dev->data;
 
-	return (ctrl & NEORV32_UART_CTRL_TX_BUSY) == 0;
+	return (data->last_ctrl & NEORV32_UART_CTRL_TX_BUSY) == 0U;
 }
 
 static int neorv32_uart_irq_rx_ready(const struct device *dev)
 {
-	const struct neorv32_uart_config *config = dev->config;
 	struct neorv32_uart_data *data = dev->data;
 
-	if (!irq_is_enabled(config->rx_irq)) {
+	if ((data->last_ctrl & NEORV32_UART_CTRL_IRQ_RX_NEMPTY) == 0U) {
 		return 0;
 	}
 
-	return (data->last_data & NEORV32_UART_CTRL_RX_NEMPTY) != 0;
+	return (data->last_ctrl & NEORV32_UART_CTRL_RX_NEMPTY) != 0U;
 }
 
 static int neorv32_uart_irq_is_pending(const struct device *dev)
@@ -353,12 +360,14 @@ static int neorv32_uart_irq_is_pending(const struct device *dev)
 
 static int neorv32_uart_irq_update(const struct device *dev)
 {
-	const struct neorv32_uart_config *config = dev->config;
+	struct neorv32_uart_data *data = dev->data;
 
-	if (irq_is_enabled(config->rx_irq)) {
-		/* Cache data for use by rx_ready() and fifo_read() */
-		(void)neorv32_uart_read_data(dev);
-	}
+	/* Cache the CTRL register for use in the following functions:
+	 * - neorv32_uart_irq_tx_complete()
+	 * - neorv32_uart_irq_tx_ready()
+	 * - neorv32_uart_irq_rx_ready()
+	 */
+	data->last_ctrl = neorv32_uart_read_ctrl(dev);
 
 	return 1;
 }
@@ -395,7 +404,7 @@ static int neorv32_uart_init(const struct device *dev)
 		return -EINVAL;
 	}
 
-	err = syscon_read_reg(config->syscon, NEORV32_SYSINFO_FEATURES, &features);
+	err = syscon_read_reg(config->syscon, NEORV32_SYSINFO_SOC, &features);
 	if (err < 0) {
 		LOG_ERR("failed to determine implemented features (err %d)", err);
 		return -EIO;
@@ -407,9 +416,6 @@ static int neorv32_uart_init(const struct device *dev)
 	}
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	k_timer_init(&data->timer, &neorv32_uart_tx_soft_isr, NULL);
-	k_timer_user_data_set(&data->timer, (void *)dev);
-
 	config->irq_config_func(dev);
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 
@@ -420,7 +426,12 @@ static int neorv32_uart_init(const struct device *dev)
 static int neorv32_uart_pm_action(const struct device *dev,
 				  enum pm_device_action action)
 {
-	uint32_t ctrl = neorv32_uart_read_ctrl(dev);
+	struct neorv32_uart_data *data = dev->data;
+	k_spinlock_key_t key;
+	uint32_t ctrl;
+
+	key = k_spin_lock(&data->lock);
+	ctrl = neorv32_uart_read_ctrl(dev);
 
 	switch (action) {
 	case PM_DEVICE_ACTION_SUSPEND:
@@ -434,6 +445,7 @@ static int neorv32_uart_pm_action(const struct device *dev,
 	}
 
 	neorv32_uart_write_ctrl(dev, ctrl);
+	k_spin_unlock(&data->lock, key);
 
 	return 0;
 }
@@ -470,16 +482,16 @@ static DEVICE_API(uart, neorv32_uart_driver_api) = {
 			    DT_IRQ_BY_NAME(node_id, tx, priority),	\
 			    neorv32_uart_isr,				\
 			    DEVICE_DT_GET(node_id), 0);			\
+		irq_enable(DT_IRQ_BY_NAME(node_id, tx, irq));		\
 									\
 		IRQ_CONNECT(DT_IRQ_BY_NAME(node_id, rx, irq),		\
 			    DT_IRQ_BY_NAME(node_id, rx, priority),	\
 			    neorv32_uart_isr,				\
 			    DEVICE_DT_GET(node_id), 0);			\
+		irq_enable(DT_IRQ_BY_NAME(node_id, rx, irq));		\
 	}
 #define NEORV32_UART_CONFIG_INIT(node_id, n)				\
-	.irq_config_func = neorv32_uart_config_func_##n,		\
-	.tx_irq = DT_IRQ_BY_NAME(node_id, tx, irq),			\
-	.rx_irq = DT_IRQ_BY_NAME(node_id, rx, irq),
+	.irq_config_func = neorv32_uart_config_func_##n,
 #else
 #define NEORV32_UART_CONFIG_FUNC(node_id, n)
 #define NEORV32_UART_CONFIG_INIT(node_id, n)
@@ -502,7 +514,7 @@ static DEVICE_API(uart, neorv32_uart_driver_api) = {
 									\
 	static const struct neorv32_uart_config neorv32_uart_##n##_config = { \
 		.syscon = DEVICE_DT_GET(DT_PHANDLE(node_id, syscon)),	\
-		.feature_mask = NEORV32_SYSINFO_FEATURES_IO_UART##n,	\
+		.feature_mask = NEORV32_SYSINFO_SOC_IO_UART##n,	\
 		.base = DT_REG_ADDR(node_id),				\
 		NEORV32_UART_CONFIG_INIT(node_id, n)			\
 	};								\
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index b973ce9fd7af9..d2136acf88394 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -605,6 +605,12 @@ static int uarte_nrfx_configure(const struct device *dev,
 #ifdef UARTE_HAS_FRAME_TIMEOUT
 	uarte_cfg.frame_timeout = NRF_UARTE_FRAME_TIMEOUT_EN;
 #endif
+
+#if NRF_UARTE_HAS_FRAME_SIZE
+	uarte_cfg.frame_size = NRF_UARTE_FRAME_SIZE_8_BIT;
+	uarte_cfg.endian = NRF_UARTE_ENDIAN_MSB;
+#endif
+
 	nrf_uarte_configure(get_uarte_instance(dev), &uarte_cfg);
 
 	data->uart_config = *cfg;
@@ -2506,6 +2512,18 @@ static int uarte_instance_init(const struct device *dev,
 			     : UART_CFG_FLOW_CTRL_NONE,			       \
 	}
 
+/* Macro determines if PM actions are interrupt safe. They are in case of
+ * asynchronous API (except for instance in fast power domain) and non-asynchronous
+ * API if RX is disabled. Macro must resolve to a literal 1 or 0.
+ */
+#define UARTE_PM_ISR_SAFE(idx)						       \
+	COND_CODE_1(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _),		       \
+		    (0),						       \
+		    (COND_CODE_1(CONFIG_UART_##idx##_ASYNC,		       \
+				 (PM_DEVICE_ISR_SAFE),			       \
+				 (COND_CODE_1(UARTE_PROP(idx, disable_rx),     \
+					      (PM_DEVICE_ISR_SAFE), (0))))))   \
+
 #define UART_NRF_UARTE_DEVICE(idx)					       \
 	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(UARTE(idx));		       \
 	UARTE_INT_DRIVEN(idx);						       \
@@ -2578,8 +2596,7 @@ static int uarte_instance_init(const struct device *dev,
 	}								       \
 									       \
 	PM_DEVICE_DT_DEFINE(UARTE(idx), uarte_nrfx_pm_action,		       \
-			    COND_CODE_1(INSTANCE_IS_FAST_PD(_, /*empty*/, idx, _),\
-				    (0), (PM_DEVICE_ISR_SAFE)));	       \
+			    UARTE_PM_ISR_SAFE(idx));			       \
 									       \
 	DEVICE_DT_DEFINE(UARTE(idx),					       \
 		      uarte_##idx##_init,				       \
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index 283f0cbffe082..e56ef61a9e248 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -621,7 +621,7 @@ static int uart_ns16550_configure(const struct device *dev,
 		}
 
 		ret = clock_control_on(dev_cfg->clock_dev, dev_cfg->clock_subsys);
-		if (ret != 0 && ret != -EALREADY) {
+		if (ret != 0 && ret != -EALREADY && ret != -ENOSYS) {
 			goto out;
 		}
 
diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index 1a43a26b0d728..7ee021c0bea7c 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -61,6 +61,7 @@ struct pl011_config {
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_config_func_t irq_config_func;
 #endif
+	bool fifo_disable;
 	int (*clk_enable_func)(const struct device *dev, uint32_t clk);
 	int (*pwr_on_func)(void);
 };
@@ -74,6 +75,7 @@ struct pl011_data {
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	volatile bool sw_call_txdrdy;
 	uart_irq_callback_user_data_t irq_cb;
+	struct k_spinlock irq_cb_lock;
 	void *irq_cb_data;
 #endif
 };
@@ -205,6 +207,7 @@ static int pl011_runtime_configure_internal(const struct device *dev,
 					const struct uart_config *cfg,
 					bool disable)
 {
+	const struct pl011_config *config = dev->config;
 	struct pl011_data *data = dev->data;
 	uint32_t lcrh;
 	int ret = -ENOTSUP;
@@ -286,7 +289,9 @@ static int pl011_runtime_configure_internal(const struct device *dev,
 
 enable:
 	if (disable) {
-		pl011_enable_fifo(dev);
+		if (!config->fifo_disable) {
+			pl011_enable_fifo(dev);
+		}
 		pl011_enable(dev);
 	}
 
@@ -342,26 +347,36 @@ static void pl011_irq_tx_enable(const struct device *dev)
 	struct pl011_data *data = dev->data;
 
 	get_uart(dev)->imsc |= PL011_IMSC_TXIM;
-	if (data->sw_call_txdrdy) {
-		data->sw_call_txdrdy = false;
-
-		/* Verify if the callback has been registered */
-		if (data->irq_cb) {
-			/*
-			 * Due to HW limitation, the first TX interrupt should
-			 * be triggered by the software.
-			 *
-			 * PL011 TX interrupt is based on a transition through
-			 * a level, rather than on the level itself[1]. So that,
-			 * enable TX interrupt can not trigger TX interrupt if
-			 * no data was filled to TX FIFO at the beginning.
-			 *
-			 * [1]: PrimeCell UART (PL011) Technical Reference Manual
-			 *      functional-overview/interrupts
-			 */
-			while (get_uart(dev)->imsc & PL011_IMSC_TXIM) {
-				data->irq_cb(dev, data->irq_cb_data);
-			}
+	if (!data->sw_call_txdrdy) {
+		return;
+	}
+	data->sw_call_txdrdy = false;
+
+	/*
+	 * Verify if the callback has been registered. Due to HW limitation, the
+	 * first TX interrupt should be triggered by the software.
+	 *
+	 * PL011 TX interrupt is based on a transition through a level, rather
+	 * than on the level itself[1]. So that, enable TX interrupt can not
+	 * trigger TX interrupt if no data was filled to TX FIFO at the
+	 * beginning.
+	 *
+	 * [1]: PrimeCell UART (PL011) Technical Reference Manual
+	 *      functional-overview/interrupts
+	 */
+	if (!data->irq_cb) {
+		return;
+	}
+
+	/*
+	 * Execute callback while TX interrupt remains enabled. If
+	 * uart_fifo_fill() is called with small amounts of data, the 1/8 TX
+	 * FIFO threshold may never be reached, and the hardware TX interrupt
+	 * will never trigger.
+	 */
+	while (get_uart(dev)->imsc & PL011_IMSC_TXIM) {
+		K_SPINLOCK(&data->irq_cb_lock) {
+			data->irq_cb(dev, data->irq_cb_data);
 		}
 	}
 }
@@ -533,7 +548,9 @@ static int pl011_init(const struct device *dev)
 			| FIELD_PREP(PL011_IFLS_RXIFLSEL_M, RXIFLSEL_1_2_FULL);
 
 		/* Enabling the FIFOs */
-		pl011_enable_fifo(dev);
+		if (!config->fifo_disable) {
+			pl011_enable_fifo(dev);
+		}
 	}
 	/* initialize all IRQs as masked */
 	get_uart(dev)->imsc = 0U;
@@ -626,7 +643,9 @@ void pl011_isr(const struct device *dev)
 
 	/* Verify if the callback has been registered */
 	if (data->irq_cb) {
-		data->irq_cb(dev, data->irq_cb_data);
+		K_SPINLOCK(&data->irq_cb_lock) {
+			data->irq_cb(dev, data->irq_cb_data);
+		}
 	}
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
@@ -654,6 +673,7 @@ void pl011_isr(const struct device *dev)
 		CLOCK_INIT(n)                                                           \
 		PINCTRL_INIT(n)	                                                        \
 		.irq_config_func = pl011_irq_config_func_##n,				\
+		.fifo_disable = DT_INST_PROP(n, fifo_disable),                          \
 		.clk_enable_func = COMPAT_SPECIFIC_CLK_ENABLE_FUNC(n),		        \
 		.pwr_on_func = COMPAT_SPECIFIC_PWR_ON_FUNC(n),			        \
 	};
diff --git a/drivers/serial/uart_pl011_ambiq.h b/drivers/serial/uart_pl011_ambiq.h
index 5efb0e5e62cfc..305fc992e7c3b 100644
--- a/drivers/serial/uart_pl011_ambiq.h
+++ b/drivers/serial/uart_pl011_ambiq.h
@@ -13,9 +13,7 @@
 #include <zephyr/pm/policy.h>
 
 #include "uart_pl011_registers.h"
-#include <am_mcu_apollo.h>
-
-#define PWRCTRL_MAX_WAIT_US 5
+#include <soc.h>
 
 static inline void pl011_ambiq_enable_clk(const struct device *dev)
 {
diff --git a/drivers/serial/uart_renesas_ra.c b/drivers/serial/uart_renesas_ra.c
deleted file mode 100644
index 60758db553b4c..0000000000000
--- a/drivers/serial/uart_renesas_ra.c
+++ /dev/null
@@ -1,733 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT renesas_ra_uart_sci
-
-#include <zephyr/drivers/uart.h>
-#include <zephyr/drivers/clock_control.h>
-#include <zephyr/drivers/clock_control/renesas_ra_cgc.h>
-#include <zephyr/drivers/interrupt_controller/intc_ra_icu.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <zephyr/irq.h>
-#include <zephyr/spinlock.h>
-
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(ra_uart_sci, CONFIG_UART_LOG_LEVEL);
-
-enum {
-	UART_RA_INT_RXI,
-	UART_RA_INT_TXI,
-	UART_RA_INT_ERI,
-	NUM_OF_UART_RA_INT,
-};
-
-struct uart_ra_cfg {
-	mem_addr_t regs;
-	const struct device *clock_dev;
-	const struct clock_control_ra_subsys_cfg clock_id;
-	const struct pinctrl_dev_config *pcfg;
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	int (*irq_config_func)(const struct device *dev);
-#endif
-};
-
-struct uart_ra_data {
-	struct uart_config current_config;
-	uint32_t clk_rate;
-	struct k_spinlock lock;
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	uint32_t irqn[NUM_OF_UART_RA_INT];
-	uart_irq_callback_user_data_t callback;
-	void *cb_data;
-#endif
-};
-
-#define REG_MASK(reg) (BIT_MASK(_CONCAT(reg, _LEN)) << _CONCAT(reg, _POS))
-
-/* Registers */
-#define SMR  0x00 /*!< Serial Mode Register             */
-#define BRR  0x01 /*!< Bit Rate Register                */
-#define SCR  0x02 /*!< Serial Control Register          */
-#define TDR  0x03 /*!< Transmit Data Register           */
-#define SSR  0x04 /*!< Serial Status Register           */
-#define RDR  0x05 /*!< Receive Data Register            */
-#define SEMR 0x07 /*!< Serial Extended Mode Register    */
-#define MDDR 0x12 /*!< Modulation Duty Register         */
-#define LSR  0x18 /*!< Line Status Register             */
-
-/*
- * SMR (Serial Mode Register)
- *
- * - CKS[0..2]:  Clock Select
- * - MP[2..3]:   Multi-Processor Mode(Valid only in asynchronous mode)
- * - STOP[3..4]: Stop Bit Length(Valid only in asynchronous mode)
- * - PM[4..5]:   Parity Mode (Valid only when the PE bit is 1)
- * - PE[5..6]:   Parity Enable(Valid only in asynchronous mode)
- * - CHR[6..7]:  Character Length(Valid only in asynchronous mode)
- * - CM[7..8]:   Communication Mode
- */
-#define SMR_CKS_POS  (0)
-#define SMR_CKS_LEN  (2)
-#define SMR_MP_POS   (2)
-#define SMR_MP_LEN   (1)
-#define SMR_STOP_POS (3)
-#define SMR_STOP_LEN (1)
-#define SMR_PM_POS   (4)
-#define SMR_PM_LEN   (1)
-#define SMR_PE_POS   (5)
-#define SMR_PE_LEN   (1)
-#define SMR_CHR_POS  (6)
-#define SMR_CHR_LEN  (1)
-#define SMR_CM_POS   (7)
-#define SMR_CM_LEN   (1)
-
-/**
- * SCR (Serial Control Register)
- *
- * - CKE[0..2]:  Clock Enable
- * - TEIE[2..3]: Transmit End Interrupt Enable
- * - MPIE[3..4]: Multi-Processor Interrupt Enable (Valid in asynchronous
- * - RE[4..5]:   Receive Enable
- * - TE[5..6]:   Transmit Enable
- * - RIE[6..7]:  Receive Interrupt Enable
- * - TIE[7..8]:  Transmit Interrupt Enable
- */
-#define SCR_CKE_POS  (0)
-#define SCR_CKE_LEN  (2)
-#define SCR_TEIE_POS (2)
-#define SCR_TEIE_LEN (1)
-#define SCR_MPIE_POS (3)
-#define SCR_MPIE_LEN (1)
-#define SCR_RE_POS   (4)
-#define SCR_RE_LEN   (1)
-#define SCR_TE_POS   (5)
-#define SCR_TE_LEN   (1)
-#define SCR_RIE_POS  (6)
-#define SCR_RIE_LEN  (1)
-#define SCR_TIE_POS  (7)
-#define SCR_TIE_LEN  (1)
-
-/**
- * SSR (Serial Status Register)
- *
- * - MPBT[0..1]: Multi-Processor Bit Transfer
- * - MPB[1..2]:  Multi-Processor
- * - TEND[2..3]: Transmit End Flag
- * - PER[3..4]:  Parity Error Flag
- * - FER[4..5]:  Framing Error Flag
- * - ORER[5..6]: Overrun Error Flag
- * - RDRF[6..7]: Receive Data Full Flag
- * - TDRE[7..8]: Transmit Data Empty Flag
- */
-#define SSR_MPBT_POS (0)
-#define SSR_MPBT_LEN (1)
-#define SSR_MPB_POS  (1)
-#define SSR_MPB_LEN  (1)
-#define SSR_TEND_POS (2)
-#define SSR_TEND_LEN (1)
-#define SSR_PER_POS  (3)
-#define SSR_PER_LEN  (1)
-#define SSR_FER_POS  (4)
-#define SSR_FER_LEN  (1)
-#define SSR_ORER_POS (5)
-#define SSR_ORER_LEN (1)
-#define SSR_RDRF_POS (6)
-#define SSR_RDRF_LEN (1)
-#define SSR_TDRE_POS (7)
-#define SSR_TDRE_LEN (1)
-
-/**
- * SEMR (Serial Extended Mode Register)
- *
- * - ACS0[0..1]:    Asynchronous Mode Clock Source Select
- * - PADIS[1..2]:   Preamble function Disable
- * - BRME[2..3]:    Bit Rate Modulation Enable
- * - ABCSE[3..4]:   Asynchronous Mode Extended Base Clock Select
- * - ABCS[4..5]:    Asynchronous Mode Base Clock Select
- * - NFEN[5..6]:    Digital Noise Filter Function Enable
- * - BGDM[6..7]:    Baud Rate Generator Double-Speed Mode Select
- * - RXDESEL[7..8]: Asynchronous Start Bit Edge Detection Select
- */
-#define SEMR_ACS0_POS    (0)
-#define SEMR_ACS0_LEN    (1)
-#define SEMR_PADIS_POS   (1)
-#define SEMR_PADIS_LEN   (1)
-#define SEMR_BRME_POS    (2)
-#define SEMR_BRME_LEN    (1)
-#define SEMR_ABCSE_POS   (3)
-#define SEMR_ABCSE_LEN   (1)
-#define SEMR_ABCS_POS    (4)
-#define SEMR_ABCS_LEN    (1)
-#define SEMR_NFEN_POS    (5)
-#define SEMR_NFEN_LEN    (1)
-#define SEMR_BGDM_POS    (6)
-#define SEMR_BGDM_LEN    (1)
-#define SEMR_RXDESEL_POS (7)
-#define SEMR_RXDESEL_LEN (1)
-
-/**
- * LSR (Line Status Register)
- *
- * - ORER[0..1]:  Overrun Error Flag
- * - FNUM[2..7]:  Framing Error Count
- * - PNUM[8..13]: Parity Error Count
- */
-#define LSR_ORER_POS (0)
-#define LSR_ORER_LEN (1)
-#define LSR_FNUM_POS (2)
-#define LSR_FNUM_LEN (5)
-#define LSR_PNUM_POS (8)
-#define LSR_PNUM_LEN (5)
-
-static uint8_t uart_ra_read_8(const struct device *dev, uint32_t offs)
-{
-	const struct uart_ra_cfg *config = dev->config;
-
-	return sys_read8(config->regs + offs);
-}
-
-static void uart_ra_write_8(const struct device *dev, uint32_t offs, uint8_t value)
-{
-	const struct uart_ra_cfg *config = dev->config;
-
-	sys_write8(value, config->regs + offs);
-}
-
-static uint16_t uart_ra_read_16(const struct device *dev, uint32_t offs)
-{
-	const struct uart_ra_cfg *config = dev->config;
-
-	return sys_read16(config->regs + offs);
-}
-
-static void uart_ra_write_16(const struct device *dev, uint32_t offs, uint16_t value)
-{
-	const struct uart_ra_cfg *config = dev->config;
-
-	sys_write16(value, config->regs + offs);
-}
-
-static void uart_ra_set_baudrate(const struct device *dev, uint32_t baud_rate)
-{
-	struct uart_ra_data *data = dev->data;
-	uint8_t reg_val;
-
-	reg_val = uart_ra_read_8(dev, SEMR);
-	reg_val |= (REG_MASK(SEMR_BGDM) | REG_MASK(SEMR_ABCS));
-	reg_val &= ~(REG_MASK(SEMR_BRME) | REG_MASK(SEMR_ABCSE));
-	uart_ra_write_8(dev, SEMR, reg_val);
-
-	reg_val = (data->clk_rate / (8 * data->current_config.baudrate)) - 1;
-	uart_ra_write_8(dev, BRR, reg_val);
-}
-
-static int uart_ra_poll_in(const struct device *dev, unsigned char *p_char)
-{
-	struct uart_ra_data *data = dev->data;
-	int ret = 0;
-
-	k_spinlock_key_t key = k_spin_lock(&data->lock);
-
-	/* If interrupts are enabled, return -EINVAL */
-	if ((uart_ra_read_8(dev, SCR) & REG_MASK(SCR_RIE))) {
-		ret = -EINVAL;
-		goto unlock;
-	}
-
-	if ((uart_ra_read_8(dev, SSR) & REG_MASK(SSR_RDRF)) == 0) {
-		ret = -1;
-		goto unlock;
-	}
-
-	*p_char = uart_ra_read_8(dev, RDR);
-unlock:
-	k_spin_unlock(&data->lock, key);
-
-	return ret;
-}
-
-static void uart_ra_poll_out(const struct device *dev, unsigned char out_char)
-{
-	struct uart_ra_data *data = dev->data;
-	uint8_t reg_val;
-	k_spinlock_key_t key = k_spin_lock(&data->lock);
-
-	while (!(uart_ra_read_8(dev, SSR) & REG_MASK(SSR_TEND)) ||
-	       !(uart_ra_read_8(dev, SSR) & REG_MASK(SSR_TDRE))) {
-		;
-	}
-
-	/* If interrupts are enabled, temporarily disable them */
-	reg_val = uart_ra_read_8(dev, SCR);
-	uart_ra_write_8(dev, SCR, reg_val & ~REG_MASK(SCR_TIE));
-
-	uart_ra_write_8(dev, TDR, out_char);
-	while (!(uart_ra_read_8(dev, SSR) & REG_MASK(SSR_TEND)) ||
-	       !(uart_ra_read_8(dev, SSR) & REG_MASK(SSR_TDRE))) {
-		;
-	}
-
-	uart_ra_write_8(dev, SCR, reg_val);
-	k_spin_unlock(&data->lock, key);
-}
-
-static int uart_ra_err_check(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-
-	uint8_t reg_val;
-	int errors = 0;
-	k_spinlock_key_t key;
-
-	key = k_spin_lock(&data->lock);
-	reg_val = uart_ra_read_8(dev, SSR);
-
-	if (reg_val & REG_MASK(SSR_PER)) {
-		errors |= UART_ERROR_PARITY;
-	}
-
-	if (reg_val & REG_MASK(SSR_FER)) {
-		errors |= UART_ERROR_FRAMING;
-	}
-
-	if (reg_val & REG_MASK(SSR_ORER)) {
-		errors |= UART_ERROR_OVERRUN;
-	}
-
-	reg_val &= ~(REG_MASK(SSR_PER) | REG_MASK(SSR_FER) | REG_MASK(SSR_ORER));
-	uart_ra_write_8(dev, SSR, reg_val);
-
-	k_spin_unlock(&data->lock, key);
-
-	return errors;
-}
-
-static int uart_ra_configure(const struct device *dev, const struct uart_config *cfg)
-{
-	struct uart_ra_data *data = dev->data;
-
-	uint16_t reg_val;
-	k_spinlock_key_t key;
-
-	if (cfg->parity != UART_CFG_PARITY_NONE || cfg->stop_bits != UART_CFG_STOP_BITS_1 ||
-	    cfg->data_bits != UART_CFG_DATA_BITS_8 || cfg->flow_ctrl != UART_CFG_FLOW_CTRL_NONE) {
-		return -ENOTSUP;
-	}
-
-	key = k_spin_lock(&data->lock);
-
-	/* Disable Transmit and Receive */
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val &= ~(REG_MASK(SCR_TE) | REG_MASK(SCR_RE));
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	/* Resetting Errors Registers */
-	reg_val = uart_ra_read_8(dev, SSR);
-	reg_val &= ~(REG_MASK(SSR_PER) | REG_MASK(SSR_FER) | REG_MASK(SSR_ORER) |
-		     REG_MASK(SSR_RDRF) | REG_MASK(SSR_TDRE));
-	uart_ra_write_8(dev, SSR, reg_val);
-
-	reg_val = uart_ra_read_16(dev, LSR);
-	reg_val &= ~(REG_MASK(LSR_ORER));
-	uart_ra_write_16(dev, LSR, reg_val);
-
-	/* Select internal clock */
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val &= ~(REG_MASK(SCR_CKE));
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	/* Serial Configuration (8N1) & Clock divider selection */
-	reg_val = uart_ra_read_8(dev, SMR);
-	reg_val &= ~(REG_MASK(SMR_CM) | REG_MASK(SMR_CHR) | REG_MASK(SMR_PE) | REG_MASK(SMR_PM) |
-		     REG_MASK(SMR_STOP) | REG_MASK(SMR_CKS));
-	uart_ra_write_8(dev, SMR, reg_val);
-
-	/* Set baudrate */
-	uart_ra_set_baudrate(dev, cfg->baudrate);
-
-	/* Enable Transmit & Receive + disable Interrupts */
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val |= (REG_MASK(SCR_TE) | REG_MASK(SCR_RE));
-	reg_val &=
-		~(REG_MASK(SCR_TIE) | REG_MASK(SCR_RIE) | REG_MASK(SCR_MPIE) | REG_MASK(SCR_TEIE));
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	data->current_config = *cfg;
-
-	k_spin_unlock(&data->lock, key);
-
-	return 0;
-}
-
-#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
-static int uart_ra_config_get(const struct device *dev, struct uart_config *cfg)
-{
-	struct uart_ra_data *data = dev->data;
-
-	*cfg = data->current_config;
-
-	return 0;
-}
-#endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
-
-static int uart_ra_init(const struct device *dev)
-{
-	const struct uart_ra_cfg *config = dev->config;
-	struct uart_ra_data *data = dev->data;
-	int ret;
-
-	/* Configure dt provided device signals when available */
-	ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-	if (ret < 0) {
-		return ret;
-	}
-
-	if (!device_is_ready(config->clock_dev)) {
-		return -ENODEV;
-	}
-
-	ret = clock_control_on(config->clock_dev, (clock_control_subsys_t)&config->clock_id);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = clock_control_get_rate(config->clock_dev, (clock_control_subsys_t)&config->clock_id,
-				     &data->clk_rate);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = uart_ra_configure(dev, &data->current_config);
-	if (ret != 0) {
-		return ret;
-	}
-
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	ret = config->irq_config_func(dev);
-	if (ret != 0) {
-		return ret;
-	}
-#endif
-
-	return 0;
-}
-
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-
-static bool uart_ra_irq_is_enabled(const struct device *dev, uint32_t irq)
-{
-	return uart_ra_read_8(dev, SCR) & irq;
-}
-
-static int uart_ra_fifo_fill(const struct device *dev, const uint8_t *tx_data, int len)
-{
-	struct uart_ra_data *data = dev->data;
-	uint8_t reg_val;
-	k_spinlock_key_t key;
-
-	if (len <= 0 || tx_data == NULL) {
-		return 0;
-	}
-
-	key = k_spin_lock(&data->lock);
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val &= ~(REG_MASK(SCR_TIE));
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	uart_ra_write_8(dev, TDR, tx_data[0]);
-
-	reg_val |= REG_MASK(SCR_TIE);
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	k_spin_unlock(&data->lock, key);
-
-	return 1;
-}
-
-static int uart_ra_fifo_read(const struct device *dev, uint8_t *rx_data, const int size)
-{
-	uint8_t data;
-
-	if (size <= 0) {
-		return 0;
-	}
-
-	if ((uart_ra_read_8(dev, SSR) & REG_MASK(SSR_RDRF)) == 0) {
-		return 0;
-	}
-
-	data = uart_ra_read_8(dev, RDR);
-
-	if (rx_data) {
-		rx_data[0] = data;
-	}
-
-	return 1;
-}
-
-static void uart_ra_irq_tx_enable(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-	k_spinlock_key_t key;
-	uint16_t reg_val;
-
-	key = k_spin_lock(&data->lock);
-
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val |= (REG_MASK(SCR_TIE));
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	irq_enable(data->irqn[UART_RA_INT_TXI]);
-
-	k_spin_unlock(&data->lock, key);
-}
-
-static void uart_ra_irq_tx_disable(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-	k_spinlock_key_t key;
-	uint16_t reg_val;
-
-	key = k_spin_lock(&data->lock);
-
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val &= ~(REG_MASK(SCR_TIE));
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	irq_disable(data->irqn[UART_RA_INT_TXI]);
-
-	k_spin_unlock(&data->lock, key);
-}
-
-static int uart_ra_irq_tx_ready(const struct device *dev)
-{
-	const uint8_t reg_val = uart_ra_read_8(dev, SSR);
-	const uint8_t mask = REG_MASK(SSR_TEND) & REG_MASK(SSR_TDRE);
-
-	return (reg_val & mask) == mask;
-}
-
-static void uart_ra_irq_rx_enable(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-	k_spinlock_key_t key;
-	uint16_t reg_val;
-
-	key = k_spin_lock(&data->lock);
-
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val |= REG_MASK(SCR_RIE);
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	irq_enable(data->irqn[UART_RA_INT_RXI]);
-
-	k_spin_unlock(&data->lock, key);
-}
-
-static void uart_ra_irq_rx_disable(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-	k_spinlock_key_t key;
-	uint16_t reg_val;
-
-	key = k_spin_lock(&data->lock);
-
-	reg_val = uart_ra_read_8(dev, SCR);
-	reg_val &= ~REG_MASK(SCR_RIE);
-	uart_ra_write_8(dev, SCR, reg_val);
-
-	irq_disable(data->irqn[UART_RA_INT_RXI]);
-
-	k_spin_unlock(&data->lock, key);
-}
-
-static int uart_ra_irq_rx_ready(const struct device *dev)
-{
-	return !!(uart_ra_read_8(dev, SSR) & REG_MASK(SSR_RDRF));
-}
-
-static void uart_ra_irq_err_enable(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-
-	irq_enable(data->irqn[UART_RA_INT_ERI]);
-}
-
-static void uart_ra_irq_err_disable(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-
-	irq_disable(data->irqn[UART_RA_INT_ERI]);
-}
-
-static int uart_ra_irq_is_pending(const struct device *dev)
-{
-	return (uart_ra_irq_rx_ready(dev) && uart_ra_irq_is_enabled(dev, REG_MASK(SCR_RIE))) ||
-	       (uart_ra_irq_tx_ready(dev) && uart_ra_irq_is_enabled(dev, REG_MASK(SCR_TIE)));
-}
-
-static int uart_ra_irq_update(const struct device *dev)
-{
-	return 1;
-}
-
-static void uart_ra_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb,
-				     void *cb_data)
-{
-	struct uart_ra_data *data = dev->data;
-
-	data->callback = cb;
-	data->cb_data = cb_data;
-}
-
-/**
- * @brief Interrupt service routine.
- *
- * This simply calls the callback function, if one exists.
- *
- * @param arg Argument to ISR.
- */
-static inline void uart_ra_isr(const struct device *dev)
-{
-	struct uart_ra_data *data = dev->data;
-
-	if (data->callback) {
-		data->callback(dev, data->cb_data);
-	}
-}
-
-static void uart_ra_isr_rxi(const void *param)
-{
-	const struct device *dev = param;
-	struct uart_ra_data *data = dev->data;
-
-	uart_ra_isr(dev);
-	ra_icu_clear_int_flag(data->irqn[UART_RA_INT_RXI]);
-}
-
-static void uart_ra_isr_txi(const void *param)
-{
-	const struct device *dev = param;
-	struct uart_ra_data *data = dev->data;
-
-	uart_ra_isr(dev);
-	ra_icu_clear_int_flag(data->irqn[UART_RA_INT_TXI]);
-}
-
-static void uart_ra_isr_eri(const void *param)
-{
-	const struct device *dev = param;
-	struct uart_ra_data *data = dev->data;
-
-	uart_ra_isr(dev);
-	ra_icu_clear_int_flag(data->irqn[UART_RA_INT_ERI]);
-}
-
-#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
-
-static DEVICE_API(uart, uart_ra_driver_api) = {
-	.poll_in = uart_ra_poll_in,
-	.poll_out = uart_ra_poll_out,
-	.err_check = uart_ra_err_check,
-#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
-	.configure = uart_ra_configure,
-	.config_get = uart_ra_config_get,
-#endif
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	.fifo_fill = uart_ra_fifo_fill,
-	.fifo_read = uart_ra_fifo_read,
-	.irq_tx_enable = uart_ra_irq_tx_enable,
-	.irq_tx_disable = uart_ra_irq_tx_disable,
-	.irq_tx_ready = uart_ra_irq_tx_ready,
-	.irq_rx_enable = uart_ra_irq_rx_enable,
-	.irq_rx_disable = uart_ra_irq_rx_disable,
-	.irq_rx_ready = uart_ra_irq_rx_ready,
-	.irq_err_enable = uart_ra_irq_err_enable,
-	.irq_err_disable = uart_ra_irq_err_disable,
-	.irq_is_pending = uart_ra_irq_is_pending,
-	.irq_update = uart_ra_irq_update,
-	.irq_callback_set = uart_ra_irq_callback_set,
-#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
-};
-
-/* Device Instantiation */
-#define UART_RA_INIT_CFG(n)                                                                        \
-	PINCTRL_DT_DEFINE(DT_INST_PARENT(n));                                                      \
-	static const struct uart_ra_cfg uart_ra_cfg_##n = {                                        \
-		.regs = DT_REG_ADDR(DT_INST_PARENT(n)),                                            \
-		.clock_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(DT_INST_PARENT(n))),                     \
-		.clock_id =                                                                        \
-			{                                                                          \
-				.mstp = DT_CLOCKS_CELL_BY_IDX(DT_INST_PARENT(n), 0, mstp),         \
-				.stop_bit = DT_CLOCKS_CELL_BY_IDX(DT_INST_PARENT(n), 0, stop_bit), \
-			},                                                                         \
-		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(DT_INST_PARENT(n)),                              \
-		IF_ENABLED(CONFIG_UART_INTERRUPT_DRIVEN,                                           \
-			   (.irq_config_func = irq_config_func_##n,))}
-
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-
-#define RA_IRQ_CONNECT_DYNAMIC(n, name, dev, isr)                                                  \
-	ra_icu_irq_connect_dynamic(DT_IRQ_BY_NAME(DT_INST_PARENT(n), name, irq),                   \
-				   DT_IRQ_BY_NAME(DT_INST_PARENT(n), name, priority), isr, dev,    \
-				   DT_IRQ_BY_NAME(DT_INST_PARENT(n), name, flags));
-
-#define RA_IRQ_DISCONNECT_DYNAMIC(n, name, dev, isr)                                               \
-	ra_icu_irq_disconnect_dynamic(irqn, 0, NULL, NULL, 0)
-
-#define UART_RA_CONFIG_FUNC(n)                                                                     \
-	static int irq_config_func_##n(const struct device *dev)                                   \
-	{                                                                                          \
-		struct uart_ra_data *data = dev->data;                                             \
-		int irqn;                                                                          \
-                                                                                                   \
-		irqn = RA_IRQ_CONNECT_DYNAMIC(n, rxi, dev, uart_ra_isr_rxi);                       \
-		if (irqn < 0) {                                                                    \
-			return irqn;                                                               \
-		}                                                                                  \
-		data->irqn[UART_RA_INT_RXI] = irqn;                                                \
-		irqn = RA_IRQ_CONNECT_DYNAMIC(n, txi, dev, uart_ra_isr_txi);                       \
-		if (irqn < 0) {                                                                    \
-			goto err_txi;                                                              \
-		}                                                                                  \
-		data->irqn[UART_RA_INT_TXI] = irqn;                                                \
-		irqn = RA_IRQ_CONNECT_DYNAMIC(n, eri, dev, uart_ra_isr_eri);                       \
-		if (irqn < 0) {                                                                    \
-			goto err_eri;                                                              \
-		}                                                                                  \
-		data->irqn[UART_RA_INT_ERI] = irqn;                                                \
-		return 0;                                                                          \
-                                                                                                   \
-err_eri:                                                                                           \
-		RA_IRQ_DISCONNECT_DYNAMIC(data->irq[UART_RA_INT_TXI], eri, dev, uart_ra_isr_eri);  \
-err_txi:                                                                                           \
-		RA_IRQ_DISCONNECT_DYNAMIC(data->irq[UART_RA_INT_RXI], txi, dev, uart_ra_isr_txi);  \
-                                                                                                   \
-		return irqn;                                                                       \
-	}
-#else
-#define UART_RA_CONFIG_FUNC(n)
-#endif
-
-#define UART_RA_INIT(n)                                                                            \
-	UART_RA_CONFIG_FUNC(n)                                                                     \
-	UART_RA_INIT_CFG(n);                                                                       \
-                                                                                                   \
-	static struct uart_ra_data uart_ra_data_##n = {                                            \
-		.current_config = {                                                                \
-			.baudrate = DT_INST_PROP(n, current_speed),                                \
-			.parity = UART_CFG_PARITY_NONE,                                            \
-			.stop_bits = UART_CFG_STOP_BITS_1,                                         \
-			.data_bits = UART_CFG_DATA_BITS_8,                                         \
-			.flow_ctrl = UART_CFG_FLOW_CTRL_NONE,                                      \
-		},                                                                                 \
-	};                                                                                         \
-                                                                                                   \
-	DEVICE_DT_INST_DEFINE(n, uart_ra_init, NULL, &uart_ra_data_##n, &uart_ra_cfg_##n,          \
-			      PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, &uart_ra_driver_api);
-
-DT_INST_FOREACH_STATUS_OKAY(UART_RA_INIT)
diff --git a/drivers/serial/uart_renesas_ra8_sci_b.c b/drivers/serial/uart_renesas_ra8_sci_b.c
index e9209ffcc29f4..cfb8c923f6c6b 100644
--- a/drivers/serial/uart_renesas_ra8_sci_b.c
+++ b/drivers/serial/uart_renesas_ra8_sci_b.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,6 +10,9 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/irq.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/pm/device_runtime.h>
 #include <soc.h>
 #include "r_sci_b_uart.h"
 #include "r_dtc.h"
@@ -73,8 +76,78 @@ struct uart_ra_sci_b_data {
 	uart_callback_t async_user_cb;
 	void *async_user_cb_data;
 #endif
+#ifdef CONFIG_PM
+	bool rx_ongoing;
+	bool tx_ongoing;
+#endif
 };
 
+#if CONFIG_PM
+static inline void uart_ra_sci_b_rx_pm_policy_state_lock_get(const struct device *dev)
+{
+	struct uart_ra_sci_b_data *data = dev->data;
+
+	if (!data->rx_ongoing) {
+		data->rx_ongoing = true;
+#if CONFIG_PM_NEED_ALL_DEVICES_IDLE
+		pm_device_busy_set(dev);
+#else
+		pm_policy_state_lock_get(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES);
+		pm_policy_state_lock_get(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+#endif
+	}
+}
+
+static inline void uart_ra_sci_b_rx_pm_policy_state_lock_put(const struct device *dev)
+{
+	struct uart_ra_sci_b_data *data = dev->data;
+
+	if (data->rx_ongoing) {
+		data->rx_ongoing = false;
+#if CONFIG_PM_NEED_ALL_DEVICES_IDLE
+		if (!data->tx_ongoing) {
+			pm_device_busy_clear(dev);
+		}
+#else
+		pm_policy_state_lock_put(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES);
+		pm_policy_state_lock_put(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+#endif
+	}
+}
+
+static inline void uart_ra_sci_b_tx_pm_policy_state_lock_get(const struct device *dev)
+{
+	struct uart_ra_sci_b_data *data = dev->data;
+
+	if (!data->tx_ongoing) {
+		data->tx_ongoing = true;
+#if CONFIG_PM_NEED_ALL_DEVICES_IDLE
+		pm_device_busy_set(dev);
+#else
+		pm_policy_state_lock_get(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES);
+		pm_policy_state_lock_get(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+#endif
+	}
+}
+
+static inline void uart_ra_sci_b_tx_pm_policy_state_lock_put(const struct device *dev)
+{
+	struct uart_ra_sci_b_data *data = dev->data;
+
+	if (data->tx_ongoing) {
+		data->tx_ongoing = false;
+#if CONFIG_PM_NEED_ALL_DEVICES_IDLE
+		if (!data->rx_ongoing) {
+			pm_device_busy_clear(dev);
+		}
+#else
+		pm_policy_state_lock_put(PM_STATE_RUNTIME_IDLE, PM_ALL_SUBSTATES);
+		pm_policy_state_lock_put(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+#endif
+	}
+}
+#endif
+
 static int uart_ra_sci_b_poll_in(const struct device *dev, unsigned char *c)
 {
 	const struct uart_ra_sci_b_config *cfg = dev->config;
@@ -100,10 +173,21 @@ static void uart_ra_sci_b_poll_out(const struct device *dev, unsigned char c)
 {
 	const struct uart_ra_sci_b_config *cfg = dev->config;
 
+#if CONFIG_PM
+	uart_ra_sci_b_tx_pm_policy_state_lock_get(dev);
+#endif
+
 	while (cfg->regs->CSR_b.TEND == 0U) {
 	}
 
 	cfg->regs->TDR_BY = c;
+
+	while (cfg->regs->CSR_b.TEND == 0U) {
+	}
+
+#if CONFIG_PM
+	uart_ra_sci_b_tx_pm_policy_state_lock_put(dev);
+#endif
 }
 
 static int uart_ra_sci_b_err_check(const struct device *dev)
@@ -311,6 +395,10 @@ static void uart_ra_sci_b_irq_tx_enable(const struct device *dev)
 {
 	const struct uart_ra_sci_b_config *cfg = dev->config;
 
+#if CONFIG_PM
+	uart_ra_sci_b_tx_pm_policy_state_lock_get(dev);
+#endif
+
 	cfg->regs->CCR0 |= (BIT(R_SCI_B0_CCR0_TIE_Pos) | BIT(R_SCI_B0_CCR0_TEIE_Pos));
 }
 
@@ -319,6 +407,10 @@ static void uart_ra_sci_b_irq_tx_disable(const struct device *dev)
 	const struct uart_ra_sci_b_config *cfg = dev->config;
 
 	cfg->regs->CCR0 &= ~(BIT(R_SCI_B0_CCR0_TIE_Pos) | BIT(R_SCI_B0_CCR0_TEIE_Pos));
+
+#if CONFIG_PM
+	uart_ra_sci_b_tx_pm_policy_state_lock_put(dev);
+#endif
 }
 
 static int uart_ra_sci_b_irq_tx_ready(const struct device *dev)
@@ -342,6 +434,10 @@ static void uart_ra_sci_b_irq_rx_enable(const struct device *dev)
 {
 	const struct uart_ra_sci_b_config *cfg = dev->config;
 
+#if CONFIG_PM
+	uart_ra_sci_b_rx_pm_policy_state_lock_get(dev);
+#endif
+
 	cfg->regs->CCR0_b.RIE = 1U;
 }
 
@@ -350,6 +446,10 @@ static void uart_ra_sci_b_irq_rx_disable(const struct device *dev)
 	const struct uart_ra_sci_b_config *cfg = dev->config;
 
 	cfg->regs->CCR0_b.RIE = 0U;
+
+#if CONFIG_PM
+	uart_ra_sci_b_rx_pm_policy_state_lock_put(dev);
+#endif
 }
 
 static int uart_ra_sci_b_irq_rx_ready(const struct device *dev)
@@ -637,6 +737,10 @@ static int uart_ra_sci_b_async_tx(const struct device *dev, const uint8_t *buf,
 	data->tx_buffer = (uint8_t *)buf;
 	data->tx_buffer_cap = len;
 
+#if CONFIG_PM
+	uart_ra_sci_b_tx_pm_policy_state_lock_get(dev);
+#endif
+
 	uart_ra_sci_b_async_timer_start(&data->tx_timeout_work, timeout);
 
 unlock:
@@ -687,6 +791,10 @@ static int uart_ra_sci_b_async_tx_abort(const struct device *dev)
 
 	async_tx_abort(dev);
 
+#if CONFIG_PM
+	uart_ra_sci_b_tx_pm_policy_state_lock_put(dev);
+#endif
+
 	return 0;
 }
 
@@ -720,6 +828,10 @@ static int uart_ra_sci_b_async_rx_enable(const struct device *dev, uint8_t *buf,
 		goto unlock;
 	}
 
+#if CONFIG_PM
+	uart_ra_sci_b_rx_pm_policy_state_lock_get(dev);
+#endif
+
 	data->rx_timeout = timeout;
 	data->rx_buffer = buf;
 	data->rx_buffer_cap = len;
@@ -772,6 +884,10 @@ static int uart_ra_sci_b_async_rx_disable(const struct device *dev)
 	cfg->regs->CFCLR_b.RDRFC = 1U;
 
 unlock:
+#if CONFIG_PM
+	uart_ra_sci_b_rx_pm_policy_state_lock_put(dev);
+#endif
+
 	irq_unlock(key);
 	return err;
 }
@@ -833,6 +949,40 @@ static void uart_ra_sci_b_callback_adapter(struct st_uart_callback_arg *fsp_args
 
 #endif /* CONFIG_UART_ASYNC_API */
 
+#ifdef CONFIG_PM_DEVICE
+static int uart_ra_sci_b_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	struct uart_ra_sci_b_data *data = dev->data;
+	fsp_err_t fsp_err;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		/* Deinitialize the device */
+		fsp_err = R_SCI_B_UART_Close(&data->sci);
+		__ASSERT(fsp_err == 0, "sci_uart: initialization: close failed");
+		break;
+
+	case PM_DEVICE_ACTION_RESUME:
+		/* Reinitialize the device */
+		int ret = uart_ra_sci_b_apply_config(&data->uart_config, &data->fsp_config,
+						     &data->fsp_config_extend,
+						     &data->fsp_baud_setting);
+		if (ret < 0) {
+			return ret;
+		}
+
+		fsp_err = R_SCI_B_UART_Open(&data->sci, &data->fsp_config);
+		__ASSERT(fsp_err == 0, "sci_uart: initialization: open failed");
+		break;
+
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_PM_DEVICE */
+
 static DEVICE_API(uart, uart_ra_sci_b_driver_api) = {
 	.poll_in = uart_ra_sci_b_poll_in,
 	.poll_out = uart_ra_sci_b_poll_out,
@@ -971,6 +1121,9 @@ static void uart_ra_sci_b_tei_isr(const struct device *dev)
 #if defined(CONFIG_UART_ASYNC_API)
 	k_work_cancel_delayable(&data->tx_timeout_work);
 	sci_b_uart_tei_isr();
+#if CONFIG_PM
+	uart_ra_sci_b_tx_pm_policy_state_lock_put(dev);
+#endif
 #else
 	R_ICU->IELSR_b[data->fsp_config.tei_irq].IR = 0U;
 #endif
@@ -995,28 +1148,23 @@ static void uart_ra_sci_b_eri_isr(const struct device *dev)
 
 #endif /* defined(CONFIG_UART_INTERRUPT_DRIVEN) || defined(CONFIG_UART_ASYNC_API) */
 
-#define _ELC_EVENT_SCI_RXI(channel) ELC_EVENT_SCI##channel##_RXI
-#define _ELC_EVENT_SCI_TXI(channel) ELC_EVENT_SCI##channel##_TXI
-#define _ELC_EVENT_SCI_TEI(channel) ELC_EVENT_SCI##channel##_TEI
-#define _ELC_EVENT_SCI_ERI(channel) ELC_EVENT_SCI##channel##_ERI
-
-#define ELC_EVENT_SCI_RXI(channel) _ELC_EVENT_SCI_RXI(channel)
-#define ELC_EVENT_SCI_TXI(channel) _ELC_EVENT_SCI_TXI(channel)
-#define ELC_EVENT_SCI_TEI(channel) _ELC_EVENT_SCI_TEI(channel)
-#define ELC_EVENT_SCI_ERI(channel) _ELC_EVENT_SCI_ERI(channel)
+#define EVENT_SCI_RXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _RXI))
+#define EVENT_SCI_TXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _TXI))
+#define EVENT_SCI_TEI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _TEI))
+#define EVENT_SCI_ERI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _ERI))
 
 #if defined(CONFIG_UART_INTERRUPT_DRIVEN) || defined(CONFIG_UART_ASYNC_API)
 
 #define UART_RA_SCI_B_IRQ_CONFIG_INIT(index)                                                       \
 	do {                                                                                       \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq)] =                    \
-			ELC_EVENT_SCI_RXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_RXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, irq)] =                    \
-			ELC_EVENT_SCI_TXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_TXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), tei, irq)] =                    \
-			ELC_EVENT_SCI_TEI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_TEI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), eri, irq)] =                    \
-			ELC_EVENT_SCI_ERI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_ERI(DT_INST_PROP(index, channel));                               \
                                                                                                    \
 		IRQ_CONNECT(DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq),                       \
 			    DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, priority),                  \
@@ -1108,6 +1256,10 @@ static void uart_ra_sci_b_eri_isr(const struct device *dev)
 #define UART_RA_SCI_B_DTC_INIT(index)
 #endif
 
+#define FLOW_CTRL_PARAMETER(index)                                                                 \
+	COND_CODE_1(DT_INST_PROP(index, hw_flow_control),                                          \
+	(UART_CFG_FLOW_CTRL_RTS_CTS), (UART_CFG_FLOW_CTRL_NONE))
+
 #define UART_RA_SCI_B_INIT(index)                                                                  \
 	PINCTRL_DT_DEFINE(DT_INST_PARENT(index));                                                  \
                                                                                                    \
@@ -1123,9 +1275,7 @@ static void uart_ra_sci_b_eri_isr(const struct device *dev)
 				.parity = UART_CFG_PARITY_NONE,                                    \
 				.stop_bits = UART_CFG_STOP_BITS_1,                                 \
 				.data_bits = UART_CFG_DATA_BITS_8,                                 \
-				.flow_ctrl = COND_CODE_1(DT_INST_PROP(index, hw_flow_control),     \
-							 (UART_CFG_FLOW_CTRL_RTS_CTS),             \
-							 (UART_CFG_FLOW_CTRL_NONE)),               \
+				.flow_ctrl = FLOW_CTRL_PARAMETER(index),                           \
 			},                                                                         \
 		.fsp_config =                                                                      \
 			{                                                                          \
@@ -1155,7 +1305,8 @@ static void uart_ra_sci_b_eri_isr(const struct device *dev)
 		return 0;                                                                          \
 	}                                                                                          \
                                                                                                    \
-	DEVICE_DT_INST_DEFINE(index, uart_ra_sci_b_init_##index, NULL,                             \
+	PM_DEVICE_DT_INST_DEFINE(index, uart_ra_sci_b_pm_action);                                  \
+	DEVICE_DT_INST_DEFINE(index, uart_ra_sci_b_init_##index, PM_DEVICE_DT_INST_GET(index),     \
 			      &uart_ra_sci_b_data_##index, &uart_ra_sci_b_config_##index,          \
 			      PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,                           \
 			      &uart_ra_sci_b_driver_api);
diff --git a/drivers/serial/uart_renesas_ra_sci.c b/drivers/serial/uart_renesas_ra_sci.c
index 24ce1f0a2f8b7..a6fa77332afbe 100644
--- a/drivers/serial/uart_renesas_ra_sci.c
+++ b/drivers/serial/uart_renesas_ra_sci.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -33,7 +33,6 @@ void sci_uart_eri_isr(void);
 
 struct uart_ra_sci_config {
 	const struct pinctrl_dev_config *pcfg;
-
 	R_SCI0_Type * const regs;
 };
 
@@ -1054,15 +1053,10 @@ static void uart_ra_sci_eri_isr(const struct device *dev)
 }
 #endif
 
-#define _ELC_EVENT_SCI_RXI(channel) ELC_EVENT_SCI##channel##_RXI
-#define _ELC_EVENT_SCI_TXI(channel) ELC_EVENT_SCI##channel##_TXI
-#define _ELC_EVENT_SCI_TEI(channel) ELC_EVENT_SCI##channel##_TEI
-#define _ELC_EVENT_SCI_ERI(channel) ELC_EVENT_SCI##channel##_ERI
-
-#define ELC_EVENT_SCI_RXI(channel) _ELC_EVENT_SCI_RXI(channel)
-#define ELC_EVENT_SCI_TXI(channel) _ELC_EVENT_SCI_TXI(channel)
-#define ELC_EVENT_SCI_TEI(channel) _ELC_EVENT_SCI_TEI(channel)
-#define ELC_EVENT_SCI_ERI(channel) _ELC_EVENT_SCI_ERI(channel)
+#define EVENT_SCI_RXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _RXI))
+#define EVENT_SCI_TXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _TXI))
+#define EVENT_SCI_TEI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _TEI))
+#define EVENT_SCI_ERI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SCI, channel, _ERI))
 
 #if CONFIG_UART_ASYNC_API
 #define UART_RA_SCI_ASYNC_INIT(index)                                                              \
@@ -1137,13 +1131,13 @@ static void uart_ra_sci_eri_isr(const struct device *dev)
 #define UART_RA_SCI_IRQ_INIT(index)                                                                \
 	{                                                                                          \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq)] =                    \
-			ELC_EVENT_SCI_RXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_RXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), txi, irq)] =                    \
-			ELC_EVENT_SCI_TXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_TXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), tei, irq)] =                    \
-			ELC_EVENT_SCI_TEI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_TEI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_INST_PARENT(index), eri, irq)] =                    \
-			ELC_EVENT_SCI_ERI(DT_INST_PROP(index, channel));                           \
+			EVENT_SCI_ERI(DT_INST_PROP(index, channel));                               \
                                                                                                    \
 		IRQ_CONNECT(DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, irq),                       \
 			    DT_IRQ_BY_NAME(DT_INST_PARENT(index), rxi, priority),                  \
@@ -1166,6 +1160,10 @@ static void uart_ra_sci_eri_isr(const struct device *dev)
 #define UART_RA_SCI_IRQ_INIT(index)
 #endif
 
+#define FLOW_CTRL_PARAMETER(index)                                                                 \
+	COND_CODE_1(DT_INST_PROP(index, hw_flow_control),                                          \
+	(UART_CFG_FLOW_CTRL_RTS_CTS), (UART_CFG_FLOW_CTRL_NONE))
+
 #define UART_RA_SCI_INIT(index)                                                                    \
 	PINCTRL_DT_DEFINE(DT_INST_PARENT(index));                                                  \
 	static const struct uart_ra_sci_config uart_ra_sci_config_##index = {                      \
@@ -1180,9 +1178,7 @@ static void uart_ra_sci_eri_isr(const struct device *dev)
 				.parity = UART_CFG_PARITY_NONE,                                    \
 				.stop_bits = UART_CFG_STOP_BITS_1,                                 \
 				.data_bits = UART_CFG_DATA_BITS_8,                                 \
-				.flow_ctrl = COND_CODE_1(DT_INST_PROP(index, hw_flow_control),     \
-							 (UART_CFG_FLOW_CTRL_RTS_CTS),             \
-							 (UART_CFG_FLOW_CTRL_NONE)),               \
+				.flow_ctrl = FLOW_CTRL_PARAMETER(index),                           \
 			},                                                                         \
 		.fsp_config =                                                                      \
 			{                                                                          \
diff --git a/drivers/serial/uart_renesas_rz_sci.c b/drivers/serial/uart_renesas_rz_sci.c
new file mode 100644
index 0000000000000..3cd63a4f75d4a
--- /dev/null
+++ b/drivers/serial/uart_renesas_rz_sci.c
@@ -0,0 +1,501 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT renesas_rz_sci_uart
+
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
+#include "r_sci_uart.h"
+
+LOG_MODULE_REGISTER(rz_sci_uart);
+
+struct uart_rz_sci_config {
+	const struct pinctrl_dev_config *pin_config;
+	const uart_api_t *fsp_api;
+};
+
+struct uart_rz_sci_int {
+	bool rx_fifo_busy;
+	bool irq_rx_enable;
+	bool irq_tx_enable;
+	uint8_t rx_byte;
+	uint8_t tx_byte;
+	uart_event_t event;
+};
+
+struct uart_rz_sci_data {
+	struct uart_config uart_config;
+	uart_cfg_t *fsp_cfg;
+	struct uart_rz_sci_int int_data;
+	sci_uart_instance_ctrl_t *fsp_ctrl;
+#ifdef CONFIG_UART_INTERRUPT_DRIVEN
+	uart_irq_callback_user_data_t callback;
+	void *callback_data;
+#endif
+};
+
+#define SCI_UART_ERROR_RATE_x1000 (5000)
+
+#ifdef CONFIG_UART_INTERRUPT_DRIVEN
+void sci_uart_rxi_isr(void);
+void sci_uart_txi_isr(void);
+void sci_uart_tei_isr(void);
+void sci_uart_eri_isr(void);
+#endif
+
+static int uart_rz_sci_poll_in(const struct device *dev, unsigned char *c)
+{
+	struct uart_rz_sci_data *data = dev->data;
+	R_SCI0_Type *reg = data->fsp_ctrl->p_reg;
+
+	if (reg->FRSR_b.R == 0U) {
+		/* There are no characters available to read. */
+		return -1;
+	}
+
+	*c = (unsigned char)reg->RDR_b.RDAT;
+	return 0;
+}
+
+static void uart_rz_sci_poll_out(const struct device *dev, unsigned char c)
+{
+	struct uart_rz_sci_data *data = dev->data;
+	R_SCI0_Type *reg = data->fsp_ctrl->p_reg;
+	uint8_t key;
+
+	key = irq_lock();
+	while (!reg->CSR_b.TDRE) {
+		;
+	}
+
+	reg->TDR_b.TDAT = c;
+	reg->CFCLR_b.TDREC = 1;
+
+	while (!reg->CSR_b.TEND) {
+		;
+	}
+	irq_unlock(key);
+}
+
+static int uart_rz_sci_err_check(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+	uart_event_t event = data->int_data.event;
+	int err = 0;
+
+	if (event & UART_EVENT_ERR_OVERFLOW) {
+		err |= UART_ERROR_OVERRUN;
+	}
+	if (event & UART_EVENT_ERR_FRAMING) {
+		err |= UART_ERROR_FRAMING;
+	}
+	if (event & UART_EVENT_ERR_PARITY) {
+		err |= UART_ERROR_PARITY;
+	}
+
+	return err;
+}
+
+static int uart_rz_sci_apply_config(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	struct uart_config *uart_config = &data->uart_config;
+	uart_cfg_t *fsp_cfg = data->fsp_cfg;
+
+	sci_baud_setting_t baud_setting;
+	sci_uart_extended_cfg_t *fsp_config_extend = (sci_uart_extended_cfg_t *)fsp_cfg->p_extend;
+
+	fsp_err_t fsp_err;
+	sci_uart_baud_calculation_t baud_target;
+
+	baud_target.baudrate = uart_config->baudrate;
+	baud_target.bitrate_modulation = false;
+	baud_target.baud_rate_error_x_1000 = SCI_UART_ERROR_RATE_x1000;
+
+	fsp_err = R_SCI_UART_BaudCalculate(&baud_target, fsp_config_extend->clock_source,
+					   &baud_setting);
+	if (fsp_err) {
+		return -EIO;
+	}
+
+	memcpy(fsp_config_extend->p_baud_setting, &baud_setting, sizeof(sci_baud_setting_t));
+
+	switch (uart_config->data_bits) {
+	case UART_CFG_DATA_BITS_7:
+		fsp_cfg->data_bits = UART_DATA_BITS_7;
+		break;
+	case UART_CFG_DATA_BITS_8:
+		fsp_cfg->data_bits = UART_DATA_BITS_8;
+		break;
+	case UART_CFG_DATA_BITS_9:
+		fsp_cfg->data_bits = UART_DATA_BITS_9;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	switch (uart_config->parity) {
+	case UART_CFG_PARITY_NONE:
+		fsp_cfg->parity = UART_PARITY_OFF;
+		break;
+	case UART_CFG_PARITY_ODD:
+		fsp_cfg->parity = UART_PARITY_ODD;
+		break;
+	case UART_CFG_PARITY_EVEN:
+		fsp_cfg->parity = UART_PARITY_EVEN;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	switch (uart_config->stop_bits) {
+	case UART_CFG_STOP_BITS_1:
+		fsp_cfg->stop_bits = UART_STOP_BITS_1;
+		break;
+	case UART_CFG_STOP_BITS_2:
+		fsp_cfg->stop_bits = UART_STOP_BITS_2;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	switch (uart_config->flow_ctrl) {
+	case UART_CFG_FLOW_CTRL_NONE:
+		fsp_config_extend->flow_control = 0;
+		fsp_config_extend->rs485_setting.enable = SCI_UART_RS485_DISABLE;
+		break;
+	case UART_CFG_FLOW_CTRL_RTS_CTS:
+		fsp_config_extend->flow_control = SCI_UART_FLOW_CONTROL_HARDWARE_CTSRTS;
+		fsp_config_extend->rs485_setting.enable = SCI_UART_RS485_DISABLE;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+
+static int uart_rz_sci_configure(const struct device *dev, const struct uart_config *cfg)
+{
+	int err;
+	fsp_err_t fsp_err;
+	const struct uart_rz_sci_config *config = dev->config;
+	struct uart_rz_sci_data *data = dev->data;
+
+	memcpy(&data->uart_config, cfg, sizeof(struct uart_config));
+
+	err = uart_rz_sci_apply_config(dev);
+	if (err) {
+		return err;
+	}
+
+	fsp_err = config->fsp_api->close(data->fsp_ctrl);
+	if (fsp_err) {
+		return -EIO;
+	}
+
+	fsp_err = config->fsp_api->open(data->fsp_ctrl, data->fsp_cfg);
+	if (fsp_err) {
+		return -EIO;
+	}
+
+	return err;
+}
+
+static int uart_rz_sci_config_get(const struct device *dev, struct uart_config *cfg)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	memcpy(cfg, &data->uart_config, sizeof(struct uart_config));
+	return 0;
+}
+
+#endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
+
+#ifdef CONFIG_UART_INTERRUPT_DRIVEN
+
+static int uart_rz_sci_fifo_fill(const struct device *dev, const uint8_t *tx_data, int size)
+{
+	struct uart_rz_sci_data *data = dev->data;
+	sci_uart_instance_ctrl_t *fsp_ctrl = data->fsp_ctrl;
+
+	fsp_ctrl->tx_src_bytes = size;
+	fsp_ctrl->p_tx_src = tx_data;
+
+	sci_uart_txi_isr();
+
+	return (size - fsp_ctrl->tx_src_bytes);
+}
+
+static int uart_rz_sci_fifo_read(const struct device *dev, uint8_t *rx_data, const int size)
+{
+	struct uart_rz_sci_data *data = dev->data;
+	sci_uart_instance_ctrl_t *fsp_ctrl = data->fsp_ctrl;
+
+	fsp_ctrl->rx_dest_bytes = size;
+	fsp_ctrl->p_rx_dest = rx_data;
+
+	sci_uart_rxi_isr();
+
+	data->int_data.rx_fifo_busy = false;
+
+	return (size - fsp_ctrl->rx_dest_bytes);
+}
+
+static void uart_rz_sci_irq_rx_enable(const struct device *dev)
+{
+	const struct uart_rz_sci_config *config = dev->config;
+	struct uart_rz_sci_data *data = dev->data;
+
+	data->int_data.irq_rx_enable = true;
+
+	/* Prepare 1-byte buffer to receive, it will be overwritten by fifo read */
+	config->fsp_api->read(data->fsp_ctrl, &(data->int_data.rx_byte), 1);
+}
+
+static void uart_rz_sci_irq_rx_disable(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	data->int_data.irq_rx_enable = false;
+}
+
+static void uart_rz_sci_irq_tx_enable(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+	const struct uart_rz_sci_config *config = dev->config;
+
+	data->int_data.irq_tx_enable = true;
+
+	/* Trigger TX with a NULL frame */
+	/* It is expected not to be sent, and will be overwritten by the fifo fill */
+	data->int_data.tx_byte = '\0';
+	config->fsp_api->write(data->fsp_ctrl, &data->int_data.tx_byte, 1);
+}
+
+static void uart_rz_sci_irq_tx_disable(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	data->int_data.irq_tx_enable = false;
+}
+
+static int uart_rz_sci_irq_tx_ready(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	return data->int_data.irq_tx_enable;
+}
+
+static int uart_rz_sci_irq_rx_ready(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	return data->int_data.rx_fifo_busy && data->int_data.irq_rx_enable;
+}
+
+static int uart_rz_sci_irq_is_pending(const struct device *dev)
+{
+	return (uart_rz_sci_irq_tx_ready(dev)) || (uart_rz_sci_irq_rx_ready(dev));
+}
+
+static void uart_rz_sci_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb,
+					 void *cb_data)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	data->callback = cb;
+	data->callback_data = cb_data;
+}
+
+static int uart_rz_sci_irq_update(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+	return 1;
+}
+#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
+
+static DEVICE_API(uart, uart_rz_sci_driver_api) = {
+	.poll_in = uart_rz_sci_poll_in,
+	.poll_out = uart_rz_sci_poll_out,
+	.err_check = uart_rz_sci_err_check,
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+	.configure = uart_rz_sci_configure,
+	.config_get = uart_rz_sci_config_get,
+#endif
+#ifdef CONFIG_UART_INTERRUPT_DRIVEN
+	.fifo_fill = uart_rz_sci_fifo_fill,
+	.fifo_read = uart_rz_sci_fifo_read,
+	.irq_rx_enable = uart_rz_sci_irq_rx_enable,
+	.irq_rx_disable = uart_rz_sci_irq_rx_disable,
+	.irq_tx_enable = uart_rz_sci_irq_tx_enable,
+	.irq_tx_disable = uart_rz_sci_irq_tx_disable,
+	.irq_tx_ready = uart_rz_sci_irq_tx_ready,
+	.irq_rx_ready = uart_rz_sci_irq_rx_ready,
+	.irq_is_pending = uart_rz_sci_irq_is_pending,
+	.irq_callback_set = uart_rz_sci_irq_callback_set,
+	.irq_update = uart_rz_sci_irq_update,
+#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
+};
+
+static int uart_rz_init(const struct device *dev)
+{
+	const struct uart_rz_sci_config *config = dev->config;
+	struct uart_rz_sci_data *data = dev->data;
+	int ret;
+
+	ret = pinctrl_apply_state(config->pin_config, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* uart_rz_sci_apply_config must be called first before open api */
+	ret = uart_rz_sci_apply_config(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	config->fsp_api->open(data->fsp_ctrl, data->fsp_cfg);
+
+	return 0;
+}
+
+static void uart_rz_sci_rxi_isr(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	data->int_data.rx_fifo_busy = true;
+	if (data->callback) {
+		data->callback(dev, data->callback_data);
+	}
+}
+
+static void uart_rz_sci_txi_isr(const struct device *dev)
+{
+	struct uart_rz_sci_data *data = dev->data;
+
+	if (data->callback) {
+		data->callback(dev, data->callback_data);
+	}
+}
+
+static void uart_rz_sci_tei_isr(const struct device *dev)
+{
+	sci_uart_tei_isr();
+}
+
+static void uart_rz_sci_eri_isr(const struct device *dev)
+{
+	sci_uart_eri_isr();
+}
+
+static void uart_rz_sci_event_handler(uart_callback_args_t *p_args)
+{
+	const struct device *dev = (const struct device *)p_args->p_context;
+	struct uart_rz_sci_data *data = dev->data;
+
+	data->int_data.event = p_args->event;
+	switch (p_args->event) {
+	case UART_EVENT_RX_CHAR:
+		data->int_data.rx_byte = p_args->data;
+		break;
+	case UART_EVENT_RX_COMPLETE:
+		break;
+	case UART_EVENT_TX_DATA_EMPTY:
+		break;
+	case UART_EVENT_TX_COMPLETE:
+		break;
+	default:
+		break;
+	}
+}
+
+#define SCI_NODE(idx) DT_INST_PARENT(idx)
+#define UART_RZ_IRQ_CONNECT(n, irq_name, isr)                                                      \
+	do {                                                                                       \
+		IRQ_CONNECT(DT_IRQ_BY_NAME(SCI_NODE(n), irq_name, irq),                            \
+			    DT_IRQ_BY_NAME(SCI_NODE(n), irq_name, priority), isr,                  \
+			    DEVICE_DT_INST_GET(n), DT_IRQ_BY_NAME(SCI_NODE(n), irq_name, flags));  \
+		irq_enable(DT_IRQ_BY_NAME(SCI_NODE(n), irq_name, irq));                            \
+	} while (0)
+
+#define UART_RZ_CONFIG_FUNC(n)                                                                     \
+	UART_RZ_IRQ_CONNECT(n, eri, uart_rz_sci_eri_isr);                                          \
+	UART_RZ_IRQ_CONNECT(n, rxi, uart_rz_sci_rxi_isr);                                          \
+	UART_RZ_IRQ_CONNECT(n, txi, uart_rz_sci_txi_isr);                                          \
+	UART_RZ_IRQ_CONNECT(n, tei, uart_rz_sci_tei_isr);
+
+#define UART_RZ_INIT(n)                                                                            \
+	static sci_baud_setting_t g_uart##n##_baud_setting;                                        \
+	static sci_uart_extended_cfg_t g_uart##n##_cfg_extend = {                                  \
+		.clock = SCI_UART_CLOCK_INT,                                                       \
+		.rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,                                  \
+		.noise_cancel = SCI_UART_NOISE_CANCELLATION_ENABLE,                                \
+		.rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,                                   \
+		.p_baud_setting = &g_uart##n##_baud_setting,                                       \
+		.clock_source = SCI_UART_CLOCK_SOURCE_SCI0ASYNCCLK,                                \
+		.flow_control = SCI_UART_FLOW_CONTROL_RTS,                                         \
+		.flow_control_pin = 0xFF,                                                          \
+		.rs485_setting =                                                                   \
+			{                                                                          \
+				.enable = SCI_UART_RS485_DISABLE,                                  \
+				.polarity = SCI_UART_RS485_DE_POLARITY_HIGH,                       \
+				.assertion_time = 1,                                               \
+				.negation_time = 1,                                                \
+			},                                                                         \
+	};                                                                                         \
+	static uart_cfg_t g_uart##n##_cfg = {                                                      \
+		.channel = DT_PROP(SCI_NODE(n), channel),                                          \
+		.p_extend = &g_uart##n##_cfg_extend,                                               \
+		.p_transfer_tx = NULL,                                                             \
+		.p_transfer_rx = NULL,                                                             \
+		.rxi_ipl = DT_IRQ_BY_NAME(SCI_NODE(n), rxi, priority),                             \
+		.rxi_irq = DT_IRQ_BY_NAME(SCI_NODE(n), rxi, irq),                                  \
+		.txi_ipl = DT_IRQ_BY_NAME(SCI_NODE(n), txi, priority),                             \
+		.txi_irq = DT_IRQ_BY_NAME(SCI_NODE(n), txi, irq),                                  \
+		.tei_ipl = DT_IRQ_BY_NAME(SCI_NODE(n), tei, priority),                             \
+		.tei_irq = DT_IRQ_BY_NAME(SCI_NODE(n), tei, irq),                                  \
+		.eri_ipl = DT_IRQ_BY_NAME(SCI_NODE(n), eri, priority),                             \
+		.eri_irq = DT_IRQ_BY_NAME(SCI_NODE(n), eri, irq),                                  \
+		IF_ENABLED(CONFIG_UART_INTERRUPT_DRIVEN, (                                         \
+			 .p_callback = uart_rz_sci_event_handler,                                  \
+			 .p_context = (void *)DEVICE_DT_INST_GET(n),)) };                          \
+	PINCTRL_DT_DEFINE(SCI_NODE(n));                                                            \
+	static struct uart_rz_sci_config uart_rz_config_##n = {                                    \
+		.pin_config = PINCTRL_DT_DEV_CONFIG_GET(SCI_NODE(n)),                              \
+		.fsp_api = &g_uart_on_sci,                                                         \
+	};                                                                                         \
+	static sci_uart_instance_ctrl_t g_uart##n##_ctrl;                                          \
+	static struct uart_rz_sci_data uart_rz_sci_data_##n = {                                    \
+		.fsp_ctrl = &g_uart##n##_ctrl,                                                     \
+		.fsp_cfg = &g_uart##n##_cfg,                                                       \
+		.uart_config =                                                                     \
+			{                                                                          \
+				.baudrate = DT_INST_PROP_OR(n, current_speed, 115200),             \
+				.parity = DT_INST_ENUM_IDX_OR(n, parity, UART_CFG_PARITY_NONE),    \
+				.stop_bits =                                                       \
+					DT_INST_ENUM_IDX_OR(n, stop_bits, UART_CFG_STOP_BITS_1),   \
+				.data_bits =                                                       \
+					DT_INST_ENUM_IDX_OR(n, data_bits, UART_CFG_DATA_BITS_8),   \
+				.flow_ctrl = DT_INST_PROP_OR(n, hw_flow_control,                   \
+							     UART_CFG_FLOW_CTRL_NONE),             \
+			},                                                                         \
+	};                                                                                         \
+	static int uart_rz_init_##n(const struct device *dev)                                      \
+	{                                                                                          \
+		IF_ENABLED(CONFIG_UART_INTERRUPT_DRIVEN,                  \
+			(UART_RZ_CONFIG_FUNC(n);))                        \
+		return uart_rz_init(dev);                                                          \
+	}                                                                                          \
+	DEVICE_DT_INST_DEFINE(n, &uart_rz_init_##n, NULL, &uart_rz_sci_data_##n,                   \
+			      &uart_rz_config_##n, PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,      \
+			      &uart_rz_sci_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(UART_RZ_INIT)
diff --git a/drivers/serial/uart_renesas_rz_scif.c b/drivers/serial/uart_renesas_rz_scif.c
index 92fe28cdc8ff2..37506e3415c12 100644
--- a/drivers/serial/uart_renesas_rz_scif.c
+++ b/drivers/serial/uart_renesas_rz_scif.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -41,11 +41,11 @@ struct uart_rz_scif_data {
 };
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-void scif_uart_rxi_isr(void);
-void scif_uart_txi_isr(void);
-void scif_uart_tei_isr(void);
-void scif_uart_eri_isr(void);
-void scif_uart_bri_isr(void);
+void scif_uart_rxi_isr(void *irq);
+void scif_uart_txi_isr(void *irq);
+void scif_uart_tei_isr(void *irq);
+void scif_uart_eri_isr(void *irq);
+void scif_uart_bri_isr(void *irq);
 #endif
 
 static int uart_rz_scif_poll_in(const struct device *dev, unsigned char *c)
@@ -106,10 +106,10 @@ static int uart_rz_scif_apply_config(const struct device *dev)
 
 	struct uart_config *uart_config = &data->uart_config;
 	uart_cfg_t *fsp_cfg = data->fsp_cfg;
+	data->fsp_ctrl->p_cfg = data->fsp_cfg;
 
 	scif_baud_setting_t baud_setting;
-	scif_uart_extended_cfg_t config_extend;
-	const scif_uart_extended_cfg_t *fsp_config_extend = fsp_cfg->p_extend;
+	scif_uart_extended_cfg_t *fsp_config_extend = (scif_uart_extended_cfg_t *)fsp_cfg->p_extend;
 
 	fsp_err_t fsp_err;
 
@@ -157,25 +157,21 @@ static int uart_rz_scif_apply_config(const struct device *dev)
 		return -ENOTSUP;
 	}
 
-	memcpy(&config_extend, fsp_config_extend->p_baud_setting, sizeof(scif_baud_setting_t));
-
 	switch (uart_config->flow_ctrl) {
 	case UART_CFG_FLOW_CTRL_NONE:
-		config_extend.flow_control = SCIF_UART_FLOW_CONTROL_NONE;
-		config_extend.uart_mode = SCIF_UART_MODE_RS232;
-		config_extend.rs485_setting.enable = SCI_UART_RS485_DISABLE;
+		fsp_config_extend->flow_control = SCIF_UART_FLOW_CONTROL_NONE;
+		fsp_config_extend->uart_mode = SCIF_UART_MODE_RS232;
+		fsp_config_extend->rs485_setting.enable = 0;
 		break;
 	case UART_CFG_FLOW_CTRL_RTS_CTS:
-		config_extend.flow_control = SCIF_UART_FLOW_CONTROL_AUTO;
-		config_extend.uart_mode = SCIF_UART_MODE_RS232;
-		config_extend.rs485_setting.enable = SCI_UART_RS485_DISABLE;
+		fsp_config_extend->flow_control = SCIF_UART_FLOW_CONTROL_AUTO;
+		fsp_config_extend->uart_mode = SCIF_UART_MODE_RS232;
+		fsp_config_extend->rs485_setting.enable = 0;
 		break;
 	default:
 		return -ENOTSUP;
 	}
 
-	memcpy(fsp_config_extend->p_baud_setting, &config_extend, sizeof(scif_baud_setting_t));
-
 	return 0;
 }
 
@@ -229,7 +225,7 @@ static int uart_rz_scif_fifo_fill(const struct device *dev, const uint8_t *tx_da
 	fsp_ctrl->tx_src_bytes = size;
 	fsp_ctrl->p_tx_src = tx_data;
 
-	scif_uart_txi_isr();
+	scif_uart_txi_isr((void *)fsp_ctrl->p_cfg->txi_irq);
 
 	return (size - fsp_ctrl->tx_src_bytes);
 }
@@ -246,9 +242,9 @@ static int uart_rz_scif_fifo_read(const struct device *dev, uint8_t *rx_data, co
 	/* Read all available data in the FIFO */
 	/* If there are more available data than required, they will be lost */
 	if (data->int_data.rxi_flag) {
-		scif_uart_rxi_isr();
+		scif_uart_rxi_isr((void *)fsp_ctrl->p_cfg->rxi_irq);
 	} else {
-		scif_uart_tei_isr();
+		scif_uart_tei_isr((void *)fsp_ctrl->p_cfg->tei_irq);
 	}
 
 	data->int_data.rx_fifo_busy = false;
@@ -353,9 +349,10 @@ static void uart_rz_scif_txi_isr(const struct device *dev)
 static void uart_rz_scif_tei_isr(const struct device *dev)
 {
 	struct uart_rz_scif_data *data = dev->data;
+	scif_uart_instance_ctrl_t *fsp_ctrl = data->fsp_ctrl;
 
 	if (data->int_data.tei_flag) {
-		scif_uart_tei_isr();
+		scif_uart_tei_isr((void *)fsp_ctrl->p_cfg->tei_irq);
 	} else {
 		data->int_data.rxi_flag = false;
 		data->int_data.rx_fifo_busy = true;
@@ -367,12 +364,19 @@ static void uart_rz_scif_tei_isr(const struct device *dev)
 
 static void uart_rz_scif_eri_isr(const struct device *dev)
 {
-	scif_uart_eri_isr();
+	struct uart_rz_scif_data *data = dev->data;
+	scif_uart_instance_ctrl_t *fsp_ctrl = data->fsp_ctrl;
+
+	scif_uart_eri_isr((void *)fsp_ctrl->p_cfg->eri_irq);
 }
 
 static void uart_rz_scif_bri_isr(const struct device *dev)
 {
-	scif_uart_bri_isr();
+	struct uart_rz_scif_data *data = dev->data;
+	uart_cfg_t *fsp_cfg = data->fsp_cfg;
+	scif_uart_extended_cfg_t *fsp_extend = (scif_uart_extended_cfg_t *)fsp_cfg->p_extend;
+
+	scif_uart_bri_isr((void *)fsp_extend->bri_irq);
 }
 
 static void uart_rz_scif_event_handler(uart_callback_args_t *p_args)
@@ -446,22 +450,28 @@ static int uart_rz_scif_init(const struct device *dev)
 	return 0;
 }
 
-#define UART_RZG_IRQ_CONNECT(n, irq_name, isr)                                                     \
+#ifdef CONFIG_CPU_CORTEX_M
+#define GET_IRQ_FLAGS(index) 0
+#else /* Cortex-A/R */
+#define GET_IRQ_FLAGS(index) DT_INST_IRQ_BY_IDX(index, 0, flags)
+#endif
+
+#define UART_RZ_IRQ_CONNECT(n, irq_name, isr)                                                      \
 	do {                                                                                       \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(n, irq_name, irq),                                 \
 			    DT_INST_IRQ_BY_NAME(n, irq_name, priority), isr,                       \
-			    DEVICE_DT_INST_GET(n), 0);                                             \
+			    DEVICE_DT_INST_GET(n), GET_IRQ_FLAGS(n));                              \
 		irq_enable(DT_INST_IRQ_BY_NAME(n, irq_name, irq));                                 \
 	} while (0)
 
-#define UART_RZG_CONFIG_FUNC(n)                                                                    \
-	UART_RZG_IRQ_CONNECT(n, eri, uart_rz_scif_eri_isr);                                        \
-	UART_RZG_IRQ_CONNECT(n, rxi, uart_rz_scif_rxi_isr);                                        \
-	UART_RZG_IRQ_CONNECT(n, txi, uart_rz_scif_txi_isr);                                        \
-	UART_RZG_IRQ_CONNECT(n, tei, uart_rz_scif_tei_isr);                                        \
-	UART_RZG_IRQ_CONNECT(n, bri, uart_rz_scif_bri_isr);
+#define UART_RZ_CONFIG_FUNC(n)                                                                     \
+	UART_RZ_IRQ_CONNECT(n, eri, uart_rz_scif_eri_isr);                                         \
+	UART_RZ_IRQ_CONNECT(n, rxi, uart_rz_scif_rxi_isr);                                         \
+	UART_RZ_IRQ_CONNECT(n, txi, uart_rz_scif_txi_isr);                                         \
+	UART_RZ_IRQ_CONNECT(n, tei, uart_rz_scif_tei_isr);                                         \
+	UART_RZ_IRQ_CONNECT(n, bri, uart_rz_scif_bri_isr);
 
-#define UART_RZG_INIT(n)                                                                           \
+#define UART_RZ_INIT(n)                                                                            \
 	static scif_uart_instance_ctrl_t g_uart##n##_ctrl;                                         \
 	static scif_baud_setting_t g_uart##n##_baud_setting;                                       \
 	static scif_uart_extended_cfg_t g_uart##n##_cfg_extend = {                                 \
@@ -470,14 +480,14 @@ static int uart_rz_scif_init(const struct device *dev)
 		.clock = SCIF_UART_CLOCK_INT,                                                      \
 		.noise_cancel = SCIF_UART_NOISE_CANCELLATION_ENABLE,                               \
 		.p_baud_setting = &g_uart##n##_baud_setting,                                       \
-		.rx_fifo_trigger = SCIF_UART_RECEIVE_TRIGGER_MAX,                                  \
+		.rx_fifo_trigger = 3,                                                              \
 		.rts_fifo_trigger = SCIF_UART_RTS_TRIGGER_14,                                      \
 		.uart_mode = SCIF_UART_MODE_RS232,                                                 \
 		.flow_control = SCIF_UART_FLOW_CONTROL_NONE,                                       \
 		.rs485_setting =                                                                   \
 			{                                                                          \
-				.enable = (sci_uart_rs485_enable_t)NULL,                           \
-				.polarity = SCI_UART_RS485_DE_POLARITY_HIGH,                       \
+				.enable = 0,                                                       \
+				.polarity = 0,                                                     \
 				.de_control_pin =                                                  \
 					(bsp_io_port_pin_t)SCIF_UART_INVALID_16BIT_PARAM,          \
 			},                                                                         \
@@ -519,11 +529,11 @@ static int uart_rz_scif_init(const struct device *dev)
 	static int uart_rz_scif_init_##n(const struct device *dev)                                 \
 	{                                                                                          \
 		IF_ENABLED(CONFIG_UART_INTERRUPT_DRIVEN,                    \
-			   (UART_RZG_CONFIG_FUNC(n);))                      \
+			    (UART_RZ_CONFIG_FUNC(n);))                      \
 		return uart_rz_scif_init(dev);                                                     \
 	}                                                                                          \
 	DEVICE_DT_INST_DEFINE(n, &uart_rz_scif_init_##n, NULL, &uart_rz_scif_data_##n,             \
 			      &uart_rz_scif_config_##n, PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, \
 			      &uart_rz_scif_driver_api);
 
-DT_INST_FOREACH_STATUS_OKAY(UART_RZG_INIT)
+DT_INST_FOREACH_STATUS_OKAY(UART_RZ_INIT)
diff --git a/drivers/serial/uart_silabs_eusart.c b/drivers/serial/uart_silabs_eusart.c
index 01dc3cff196ab..e9244dfa3e1fe 100644
--- a/drivers/serial/uart_silabs_eusart.c
+++ b/drivers/serial/uart_silabs_eusart.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2024, Yishai Jaffe
+ * Copyright (c) 2025 Silicon Laboratories Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,30 +13,122 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/irq.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
 #include <em_eusart.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/dma/dma_silabs_ldma.h>
+
+LOG_MODULE_REGISTER(uart_silabs_eusart, CONFIG_UART_LOG_LEVEL);
+
+struct eusart_dma_channel {
+	const struct device *dma_dev;
+	uint32_t dma_channel;
+	struct dma_block_config blk_cfg;
+	struct dma_config dma_cfg;
+	uint8_t priority;
+	uint8_t *buffer;
+	size_t buffer_length;
+	size_t counter;
+	size_t offset;
+	struct k_work_delayable timeout_work;
+	int32_t timeout;
+	bool enabled;
+};
 
-struct uart_silabs_eusart_config {
+struct eusart_config {
 	EUSART_TypeDef *eusart;
 	const struct pinctrl_dev_config *pcfg;
 	const struct device *clock_dev;
 	const struct silabs_clock_control_cmu_config clock_cfg;
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(const struct device *dev);
-#endif
 };
 
-struct uart_silabs_eusart_data {
+enum eusart_pm_lock {
+	EUSART_PM_LOCK_TX,
+	EUSART_PM_LOCK_TX_POLL,
+	EUSART_PM_LOCK_RX,
+	EUSART_PM_LOCK_COUNT,
+};
+
+struct eusart_data {
 	struct uart_config uart_cfg;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_callback_user_data_t callback;
 	void *cb_data;
 #endif
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+	const struct device *uart_dev;
+	uart_callback_t async_cb;
+	void *async_user_data;
+	struct eusart_dma_channel dma_rx;
+	struct eusart_dma_channel dma_tx;
+	uint8_t *rx_next_buffer;
+	size_t rx_next_buffer_len;
+#endif
+#ifdef CONFIG_PM
+	ATOMIC_DEFINE(pm_lock, EUSART_PM_LOCK_COUNT);
+#endif
 };
 
-static int uart_silabs_eusart_poll_in(const struct device *dev, unsigned char *c)
+static int eusart_pm_action(const struct device *dev, enum pm_device_action action);
+
+/**
+ * @brief Get PM lock on low power states
+ *
+ * @param dev  UART device struct
+ * @param lock UART PM lock type
+ *
+ * @return true if lock was taken, false otherwise
+ */
+static bool eusart_pm_lock_get(const struct device *dev, enum eusart_pm_lock lock)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+#ifdef CONFIG_PM
+	struct eusart_data *data = dev->data;
+	bool was_locked = atomic_test_and_set_bit(data->pm_lock, lock);
+
+	if (!was_locked) {
+		/* Lock out low-power states that would interfere with UART traffic */
+		pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+		pm_policy_state_lock_get(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+	}
+
+	return !was_locked;
+#else
+	return false;
+#endif
+}
+
+/**
+ * @brief Release PM lock on low power states
+ *
+ * @param dev  UART device struct
+ * @param lock UART PM lock type
+ *
+ * @return true if lock was released, false otherwise
+ */
+static bool eusart_pm_lock_put(const struct device *dev, enum eusart_pm_lock lock)
+{
+#ifdef CONFIG_PM
+	struct eusart_data *data = dev->data;
+	bool was_locked = atomic_test_and_clear_bit(data->pm_lock, lock);
+
+	if (was_locked) {
+		/* Unlock low-power states that would interfere with UART traffic */
+		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+		pm_policy_state_lock_put(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+	}
+
+	return was_locked;
+#else
+	return false;
+#endif
+}
+
+static int eusart_poll_in(const struct device *dev, unsigned char *c)
+{
+	const struct eusart_config *config = dev->config;
 
 	if (EUSART_StatusGet(config->eusart) & EUSART_STATUS_RXFL) {
 		*c = EUSART_Rx(config->eusart);
@@ -45,19 +138,22 @@ static int uart_silabs_eusart_poll_in(const struct device *dev, unsigned char *c
 	return -1;
 }
 
-static void uart_silabs_eusart_poll_out(const struct device *dev, unsigned char c)
+static void eusart_poll_out(const struct device *dev, unsigned char c)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
+	if (eusart_pm_lock_get(dev, EUSART_PM_LOCK_TX_POLL)) {
+		EUSART_IntEnable(config->eusart, EUSART_IF_TXC);
+	}
 	/* EUSART_Tx function already waits for the transmit buffer being empty
 	 * and waits for the bus to be free to transmit.
 	 */
 	EUSART_Tx(config->eusart, c);
 }
 
-static int uart_silabs_eusart_err_check(const struct device *dev)
+static int eusart_err_check(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 	uint32_t flags = EUSART_IntGet(config->eusart);
 	int err = 0;
 
@@ -79,150 +175,647 @@ static int uart_silabs_eusart_err_check(const struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int uart_silabs_eusart_fifo_fill(const struct device *dev,
-				  const uint8_t *tx_data,
-				  int len)
+static int eusart_fifo_fill(const struct device *dev, const uint8_t *tx_data, int len)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
-	int num_tx = 0;
+	const struct eusart_config *config = dev->config;
+	int i = 0;
 
-	while ((len - num_tx > 0) &&
-	       (EUSART_StatusGet(config->eusart) & EUSART_STATUS_TXFL)) {
-
-		config->eusart->TXDATA = (uint32_t)tx_data[num_tx++];
+	while ((i < len) && (EUSART_StatusGet(config->eusart) & EUSART_STATUS_TXFL)) {
+		config->eusart->TXDATA = (uint32_t)tx_data[i++];
 	}
 
 	if (!(EUSART_StatusGet(config->eusart) & EUSART_STATUS_TXFL)) {
 		EUSART_IntClear(config->eusart, EUSART_IF_TXFL);
 	}
 
-	return num_tx;
+	return i;
 }
 
-static int uart_silabs_eusart_fifo_read(const struct device *dev, uint8_t *rx_data,
-				  const int len)
+static int eusart_fifo_read(const struct device *dev, uint8_t *rx_data, const int len)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
-	int num_rx = 0;
+	const struct eusart_config *config = dev->config;
+	int i = 0;
 
-	while ((len - num_rx > 0) &&
-	       (EUSART_StatusGet(config->eusart) & EUSART_STATUS_RXFL)) {
-		rx_data[num_rx++] = (uint8_t)config->eusart->RXDATA;
+	while ((i < len) && (EUSART_StatusGet(config->eusart) & EUSART_STATUS_RXFL)) {
+		rx_data[i++] = (uint8_t)config->eusart->RXDATA;
 	}
 
 	if (!(EUSART_StatusGet(config->eusart) & EUSART_STATUS_RXFL)) {
 		EUSART_IntClear(config->eusart, EUSART_IF_RXFL);
 	}
 
-	return num_rx;
+	return i;
 }
 
-static void uart_silabs_eusart_irq_tx_enable(const struct device *dev)
+static void eusart_irq_tx_enable(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
+	eusart_pm_lock_get(dev, EUSART_PM_LOCK_TX);
 	EUSART_IntClear(config->eusart, EUSART_IEN_TXFL | EUSART_IEN_TXC);
 	EUSART_IntEnable(config->eusart, EUSART_IEN_TXFL | EUSART_IEN_TXC);
 }
 
-static void uart_silabs_eusart_irq_tx_disable(const struct device *dev)
+static void eusart_irq_tx_disable(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
 	EUSART_IntDisable(config->eusart, EUSART_IEN_TXFL | EUSART_IEN_TXC);
 	EUSART_IntClear(config->eusart, EUSART_IEN_TXFL | EUSART_IEN_TXC);
+	eusart_pm_lock_put(dev, EUSART_PM_LOCK_TX);
 }
 
-static int uart_silabs_eusart_irq_tx_complete(const struct device *dev)
+static int eusart_irq_tx_complete(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 	uint32_t flags = EUSART_IntGet(config->eusart);
 
 	EUSART_IntClear(config->eusart, EUSART_IF_TXC);
 
-	return (flags & EUSART_IF_TXC) != 0;
+	return !!(flags & EUSART_IF_TXC);
 }
 
-static int uart_silabs_eusart_irq_tx_ready(const struct device *dev)
+static int eusart_irq_tx_ready(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
-	return (config->eusart->IEN & EUSART_IEN_TXFL)
-		&& (EUSART_IntGet(config->eusart) & EUSART_IF_TXFL);
+	return (config->eusart->IEN & EUSART_IEN_TXFL) &&
+	       (EUSART_IntGet(config->eusart) & EUSART_IF_TXFL);
 }
 
-static void uart_silabs_eusart_irq_rx_enable(const struct device *dev)
+static void eusart_irq_rx_enable(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
+	eusart_pm_lock_get(dev, EUSART_PM_LOCK_RX);
 	EUSART_IntClear(config->eusart, EUSART_IEN_RXFL);
 	EUSART_IntEnable(config->eusart, EUSART_IEN_RXFL);
 }
 
-static void uart_silabs_eusart_irq_rx_disable(const struct device *dev)
+static void eusart_irq_rx_disable(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
 	EUSART_IntDisable(config->eusart, EUSART_IEN_RXFL);
 	EUSART_IntClear(config->eusart, EUSART_IEN_RXFL);
+	eusart_pm_lock_put(dev, EUSART_PM_LOCK_RX);
 }
 
-static int uart_silabs_eusart_irq_rx_ready(const struct device *dev)
+static int eusart_irq_rx_ready(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
-	return (config->eusart->IEN & EUSART_IEN_RXFL)
-		&& (EUSART_IntGet(config->eusart) & EUSART_IF_RXFL);
+	return (config->eusart->IEN & EUSART_IEN_RXFL) &&
+	       (EUSART_IntGet(config->eusart) & EUSART_IF_RXFL);
 }
 
-static void uart_silabs_eusart_irq_err_enable(const struct device *dev)
+static void eusart_irq_err_enable(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
 	EUSART_IntClear(config->eusart, EUSART_IF_RXOF | EUSART_IF_PERR | EUSART_IF_FERR);
 	EUSART_IntEnable(config->eusart, EUSART_IF_RXOF | EUSART_IF_PERR | EUSART_IF_FERR);
 }
 
-static void uart_silabs_eusart_irq_err_disable(const struct device *dev)
+static void eusart_irq_err_disable(const struct device *dev)
 {
-	const struct uart_silabs_eusart_config *config = dev->config;
+	const struct eusart_config *config = dev->config;
 
 	EUSART_IntDisable(config->eusart, EUSART_IF_RXOF | EUSART_IF_PERR | EUSART_IF_FERR);
 	EUSART_IntClear(config->eusart, EUSART_IF_RXOF | EUSART_IF_PERR | EUSART_IF_FERR);
 }
 
-static int uart_silabs_eusart_irq_is_pending(const struct device *dev)
+static int eusart_irq_is_pending(const struct device *dev)
 {
-	return uart_silabs_eusart_irq_tx_ready(dev) || uart_silabs_eusart_irq_rx_ready(dev);
+	return eusart_irq_tx_ready(dev) || eusart_irq_rx_ready(dev);
 }
 
-static int uart_silabs_eusart_irq_update(const struct device *dev)
+static int eusart_irq_update(const struct device *dev)
 {
 	return 1;
 }
 
-static void uart_silabs_eusart_irq_callback_set(const struct device *dev,
-					  uart_irq_callback_user_data_t cb,
-					  void *cb_data)
+static void eusart_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb,
+				    void *cb_data)
 {
-	struct uart_silabs_eusart_data *data = dev->data;
+	struct eusart_data *data = dev->data;
 
 	data->callback = cb;
 	data->cb_data = cb_data;
 }
+#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
+
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+static void eusart_async_user_callback(struct eusart_data *data, struct uart_event *event)
+{
+	if (data->async_cb) {
+		data->async_cb(data->uart_dev, event, data->async_user_data);
+	}
+}
+
+static void eusart_async_timer_start(struct k_work_delayable *work, int32_t timeout)
+{
+	if (timeout != SYS_FOREVER_US && timeout != 0) {
+		k_work_reschedule(work, K_USEC(timeout));
+	}
+}
+
+static void eusart_async_evt_rx_rdy(struct eusart_data *data)
+{
+	struct uart_event event = {
+		.type = UART_RX_RDY,
+		.data.rx.buf = data->dma_rx.buffer,
+		.data.rx.len = data->dma_rx.counter - data->dma_rx.offset,
+		.data.rx.offset = data->dma_rx.offset
+	};
+
+	data->dma_rx.offset = data->dma_rx.counter;
+
+	if (event.data.rx.len > 0) {
+		eusart_async_user_callback(data, &event);
+	}
+}
+
+static void eusart_async_evt_tx_done(struct eusart_data *data)
+{
+	struct uart_event event = {
+		.type = UART_TX_DONE,
+		.data.tx.buf = data->dma_tx.buffer,
+		.data.tx.len = data->dma_tx.counter
+	};
+
+	data->dma_tx.buffer_length = 0;
+	data->dma_tx.counter = 0;
+
+	eusart_async_user_callback(data, &event);
+}
+
+static void eusart_async_evt_tx_abort(struct eusart_data *data)
+{
+	struct uart_event event = {
+		.type = UART_TX_ABORTED,
+		.data.tx.buf = data->dma_tx.buffer,
+		.data.tx.len = data->dma_tx.counter
+	};
+
+	data->dma_tx.buffer_length = 0;
+	data->dma_tx.counter = 0;
+
+	eusart_async_user_callback(data, &event);
+}
+
+static void eusart_async_evt_rx_err(struct eusart_data *data, int err_code)
+{
+	struct uart_event event = {
+		.type = UART_RX_STOPPED,
+		.data.rx_stop.reason = err_code,
+		.data.rx_stop.data.len = data->dma_rx.counter,
+		.data.rx_stop.data.offset = 0,
+		.data.rx_stop.data.buf = data->dma_rx.buffer
+	};
+
+	eusart_async_user_callback(data, &event);
+}
+
+static void eusart_async_evt_rx_buf_release(struct eusart_data *data)
+{
+	struct uart_event evt = {
+		.type = UART_RX_BUF_RELEASED,
+		.data.rx_buf.buf = data->dma_rx.buffer,
+	};
+
+	eusart_async_user_callback(data, &evt);
+}
+
+static void eusart_async_evt_rx_buf_request(struct eusart_data *data)
+{
+	struct uart_event evt = {
+		.type = UART_RX_BUF_REQUEST,
+	};
+
+	eusart_async_user_callback(data, &evt);
+}
+
+static int eusart_async_callback_set(const struct device *dev, uart_callback_t callback,
+				     void *user_data)
+{
+	struct eusart_data *data = dev->data;
+
+	data->async_cb = callback;
+	data->async_user_data = user_data;
+
+	return 0;
+}
 
-static void uart_silabs_eusart_isr(const struct device *dev)
+static void eusart_dma_replace_buffer(const struct device *dev)
 {
-	struct uart_silabs_eusart_data *data = dev->data;
+	struct eusart_data *data = dev->data;
+
+	data->dma_rx.offset = 0;
+	data->dma_rx.counter = 0;
+	data->dma_rx.buffer = data->rx_next_buffer;
+	data->dma_rx.buffer_length = data->rx_next_buffer_len;
+	data->rx_next_buffer = NULL;
+	data->rx_next_buffer_len = 0;
+
+	eusart_async_evt_rx_buf_request(data);
+}
+
+static void eusart_dma_rx_flush(struct eusart_data *data)
+{
+	struct dma_status stat;
+	size_t rx_rcv_len;
+
+	if (!dma_get_status(data->dma_rx.dma_dev, data->dma_rx.dma_channel, &stat)) {
+		rx_rcv_len = data->dma_rx.buffer_length - stat.pending_length;
+		if (rx_rcv_len > data->dma_rx.offset) {
+			data->dma_rx.counter = rx_rcv_len;
+			eusart_async_evt_rx_rdy(data);
+		}
+	}
+}
+
+__maybe_unused static void eusart_dma_rx_cb(const struct device *dma_dev, void *user_data,
+					    uint32_t channel, int status)
+{
+	const struct device *uart_dev = user_data;
+	struct eusart_data *data = uart_dev->data;
+	struct uart_event disabled_event = {
+		.type = UART_RX_DISABLED
+	};
+
+	if (status < 0) {
+		eusart_async_evt_rx_err(data, status);
+		return;
+	}
+
+	k_work_cancel_delayable(&data->dma_rx.timeout_work);
+
+	data->dma_rx.counter = data->dma_rx.buffer_length;
+
+	eusart_async_evt_rx_rdy(data);
+
+	if (data->rx_next_buffer) {
+		eusart_async_evt_rx_buf_release(data);
+		eusart_dma_replace_buffer(uart_dev);
+	} else {
+		dma_stop(data->dma_rx.dma_dev, data->dma_rx.dma_channel);
+		data->dma_rx.enabled = false;
+		eusart_async_evt_rx_buf_release(data);
+		eusart_async_user_callback(data, &disabled_event);
+	}
+}
+
+__maybe_unused static void eusart_dma_tx_cb(const struct device *dma_dev, void *user_data,
+					    uint32_t channel, int status)
+{
+	const struct device *uart_dev = user_data;
+	struct eusart_data *data = uart_dev->data;
+
+	dma_stop(data->dma_tx.dma_dev, data->dma_tx.dma_channel);
+	data->dma_tx.enabled = false;
+}
+
+static int eusart_async_tx(const struct device *dev, const uint8_t *tx_data, size_t buf_size,
+			   int32_t timeout)
+{
+	const struct eusart_config *config = dev->config;
+	struct eusart_data *data = dev->data;
+	int ret;
+
+	if (!data->dma_tx.dma_dev) {
+		return -ENODEV;
+	}
+
+	if (data->dma_tx.buffer_length) {
+		return -EBUSY;
+	}
+
+	data->dma_tx.buffer = (uint8_t *)tx_data;
+	data->dma_tx.buffer_length = buf_size;
+	data->dma_tx.timeout = timeout;
+
+	data->dma_tx.blk_cfg.source_address = (uint32_t)data->dma_tx.buffer;
+	data->dma_tx.blk_cfg.block_size = data->dma_tx.buffer_length;
+
+	eusart_pm_lock_get(dev, EUSART_PM_LOCK_TX);
+
+	EUSART_IntClear(config->eusart, EUSART_IF_TXC);
+	EUSART_IntEnable(config->eusart, EUSART_IF_TXC);
+
+	ret = dma_config(data->dma_tx.dma_dev, data->dma_tx.dma_channel, &data->dma_tx.dma_cfg);
+	if (ret) {
+		LOG_ERR("dma tx config error!");
+		return ret;
+	}
+
+	/* These 2 lines need to be call before dma_start otherwise uart and dma callback are
+	 * called just after before the execution of these lines.
+	 */
+	data->dma_tx.enabled = true;
+
+	eusart_async_timer_start(&data->dma_tx.timeout_work, data->dma_tx.timeout);
+
+	ret = dma_start(data->dma_tx.dma_dev, data->dma_tx.dma_channel);
+	if (ret) {
+		LOG_ERR("UART err: TX DMA start failed!");
+		data->dma_tx.enabled = false;
+		k_work_cancel_delayable(&data->dma_tx.timeout_work);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int eusart_async_tx_abort(const struct device *dev)
+{
+	const struct eusart_config *config = dev->config;
+	struct eusart_data *data = dev->data;
+	size_t tx_buffer_length = data->dma_tx.buffer_length;
+	struct dma_status stat;
+
+	if (!tx_buffer_length) {
+		return -EFAULT;
+	}
+
+	dma_stop(data->dma_tx.dma_dev, data->dma_tx.dma_channel);
+
+	EUSART_IntDisable(config->eusart, EUSART_IF_TXC);
+	EUSART_IntClear(config->eusart, EUSART_IF_TXC);
+	eusart_pm_lock_put(dev, EUSART_PM_LOCK_TX);
+
+	k_work_cancel_delayable(&data->dma_tx.timeout_work);
+
+	if (!dma_get_status(data->dma_tx.dma_dev, data->dma_tx.dma_channel, &stat)) {
+		data->dma_tx.counter = tx_buffer_length - stat.pending_length;
+	}
+
+	data->dma_tx.enabled = false;
+
+	eusart_async_evt_tx_abort(data);
+
+	return 0;
+}
+
+static int eusart_async_rx_enable(const struct device *dev, uint8_t *rx_buf, size_t buf_size,
+				  int32_t timeout)
+{
+	const struct eusart_config *config = dev->config;
+	struct eusart_data *data = dev->data;
+	int ret;
+
+	if (!data->dma_rx.dma_dev) {
+		return -ENODEV;
+	}
+
+	if (data->dma_rx.enabled) {
+		LOG_WRN("RX was already enabled");
+		return -EBUSY;
+	}
+
+	data->dma_rx.offset = 0;
+	data->dma_rx.buffer = rx_buf;
+	data->dma_rx.buffer_length = buf_size;
+	data->dma_rx.counter = 0;
+	data->dma_rx.timeout = timeout;
+	data->dma_rx.blk_cfg.block_size = buf_size;
+	data->dma_rx.blk_cfg.dest_address = (uint32_t)data->dma_rx.buffer;
+
+	ret = dma_config(data->dma_rx.dma_dev, data->dma_rx.dma_channel, &data->dma_rx.dma_cfg);
+
+	if (ret) {
+		LOG_ERR("UART ERR: RX DMA config failed!");
+		return -EINVAL;
+	}
+
+	if (dma_start(data->dma_rx.dma_dev, data->dma_rx.dma_channel)) {
+		LOG_ERR("UART ERR: RX DMA start failed!");
+		return -EFAULT;
+	}
+
+	eusart_pm_lock_get(dev, EUSART_PM_LOCK_RX);
+	EUSART_IntClear(config->eusart, EUSART_IF_RXOF | EUSART_IF_RXTO);
+	EUSART_IntEnable(config->eusart, EUSART_IF_RXOF);
+	EUSART_IntEnable(config->eusart, EUSART_IF_RXTO);
+
+	data->dma_rx.enabled = true;
+
+	eusart_async_evt_rx_buf_request(data);
+
+	return ret;
+}
 
+static int eusart_async_rx_disable(const struct device *dev)
+{
+	const struct eusart_config *config = dev->config;
+	EUSART_TypeDef *eusart = config->eusart;
+	struct eusart_data *data = dev->data;
+	struct uart_event disabled_event = {
+		.type = UART_RX_DISABLED
+	};
+
+	if (!data->dma_rx.enabled) {
+		return -EFAULT;
+	}
+
+	dma_stop(data->dma_rx.dma_dev, data->dma_rx.dma_channel);
+
+	EUSART_IntDisable(eusart, EUSART_IF_RXOF);
+	EUSART_IntDisable(eusart, EUSART_IF_RXTO);
+	EUSART_IntClear(eusart, EUSART_IF_RXOF | EUSART_IF_RXTO);
+	eusart_pm_lock_put(dev, EUSART_PM_LOCK_RX);
+
+	k_work_cancel_delayable(&data->dma_rx.timeout_work);
+
+	eusart_dma_rx_flush(data);
+
+	eusart_async_evt_rx_buf_release(data);
+
+	if (data->rx_next_buffer) {
+		struct uart_event rx_next_buf_release_evt = {
+			.type = UART_RX_BUF_RELEASED,
+			.data.rx_buf.buf = data->rx_next_buffer,
+		};
+		eusart_async_user_callback(data, &rx_next_buf_release_evt);
+	}
+
+	data->rx_next_buffer = NULL;
+	data->rx_next_buffer_len = 0;
+
+	data->dma_rx.enabled = false;
+
+	eusart_async_user_callback(data, &disabled_event);
+
+	return 0;
+}
+
+static int eusart_async_rx_buf_rsp(const struct device *dev, uint8_t *buf, size_t len)
+{
+	struct eusart_data *data = dev->data;
+	unsigned int key;
+	int ret;
+
+	key = irq_lock();
+
+	if (data->rx_next_buffer) {
+		return -EBUSY;
+	} else if (!data->dma_rx.enabled) {
+		return -EACCES;
+	}
+
+	data->rx_next_buffer = buf;
+	data->rx_next_buffer_len = len;
+	data->dma_rx.blk_cfg.dest_address = (uint32_t)buf;
+	data->dma_rx.blk_cfg.block_size = len;
+
+	irq_unlock(key);
+
+	ret = silabs_ldma_append_block(data->dma_rx.dma_dev, data->dma_rx.dma_channel,
+				       &data->dma_rx.dma_cfg);
+	if (ret) {
+		LOG_ERR("UART ERR: RX DMA append failed!");
+		return -EINVAL;
+	}
+
+	return ret;
+}
+
+static void eusart_async_rx_timeout(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct eusart_dma_channel *rx_channel =
+		CONTAINER_OF(dwork, struct eusart_dma_channel, timeout_work);
+	struct eusart_data *data = CONTAINER_OF(rx_channel, struct eusart_data, dma_rx);
+
+	eusart_dma_rx_flush(data);
+}
+
+static void eusart_async_tx_timeout(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct eusart_dma_channel *tx_channel =
+		CONTAINER_OF(dwork, struct eusart_dma_channel, timeout_work);
+	struct eusart_data *data = CONTAINER_OF(tx_channel, struct eusart_data, dma_tx);
+	const struct device *dev = data->uart_dev;
+
+	eusart_async_tx_abort(dev);
+}
+
+static int eusart_async_init(const struct device *dev)
+{
+	const struct eusart_config *config = dev->config;
+	EUSART_TypeDef *eusart = config->eusart;
+	struct eusart_data *data = dev->data;
+
+	data->uart_dev = dev;
+
+	if (data->dma_rx.dma_dev) {
+		if (!device_is_ready(data->dma_rx.dma_dev)) {
+			return -ENODEV;
+		}
+
+		data->dma_rx.dma_channel = dma_request_channel(data->dma_rx.dma_dev, NULL);
+	}
+
+	if (data->dma_tx.dma_dev) {
+		if (!device_is_ready(data->dma_tx.dma_dev)) {
+			return -ENODEV;
+		}
+
+		data->dma_tx.dma_channel = dma_request_channel(data->dma_tx.dma_dev, NULL);
+	}
+
+	data->dma_rx.enabled = false;
+	data->dma_tx.enabled = false;
+
+	k_work_init_delayable(&data->dma_rx.timeout_work, eusart_async_rx_timeout);
+	k_work_init_delayable(&data->dma_tx.timeout_work, eusart_async_tx_timeout);
+
+	memset(&data->dma_rx.blk_cfg, 0, sizeof(data->dma_rx.blk_cfg));
+	data->dma_rx.blk_cfg.source_address = (uintptr_t)&(eusart->RXDATA);
+	data->dma_rx.blk_cfg.dest_address = 0;
+	data->dma_rx.blk_cfg.source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
+	data->dma_rx.blk_cfg.dest_addr_adj = DMA_ADDR_ADJ_INCREMENT;
+	data->dma_rx.dma_cfg.complete_callback_en = 1;
+	data->dma_rx.dma_cfg.channel_priority = 3;
+	data->dma_rx.dma_cfg.channel_direction = PERIPHERAL_TO_MEMORY;
+	data->dma_rx.dma_cfg.head_block = &data->dma_rx.blk_cfg;
+	data->dma_rx.dma_cfg.user_data = (void *)dev;
+	data->rx_next_buffer = NULL;
+	data->rx_next_buffer_len = 0;
+
+	memset(&data->dma_tx.blk_cfg, 0, sizeof(data->dma_tx.blk_cfg));
+	data->dma_tx.blk_cfg.dest_address = (uintptr_t)&(eusart->TXDATA);
+	data->dma_tx.blk_cfg.source_address = 0;
+	data->dma_tx.blk_cfg.source_addr_adj = DMA_ADDR_ADJ_INCREMENT;
+	data->dma_tx.blk_cfg.dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
+	data->dma_tx.dma_cfg.complete_callback_en = 1;
+	data->dma_tx.dma_cfg.channel_direction = MEMORY_TO_PERIPHERAL;
+	data->dma_tx.dma_cfg.head_block = &data->dma_tx.blk_cfg;
+	data->dma_tx.dma_cfg.user_data = (void *)dev;
+
+	return 0;
+}
+#endif /* CONFIG_UART_SILABS_EUSART_ASYNC */
+
+static void eusart_isr(const struct device *dev)
+{
+	__maybe_unused struct eusart_data *data = dev->data;
+	const struct eusart_config *config = dev->config;
+	EUSART_TypeDef *eusart = config->eusart;
+	uint32_t flags = EUSART_IntGet(eusart);
+	__maybe_unused struct dma_status stat;
+
+	if (flags & EUSART_IF_TXC) {
+		if (eusart_pm_lock_put(dev, EUSART_PM_LOCK_TX_POLL)) {
+			EUSART_IntDisable(eusart, EUSART_IEN_TXC);
+			EUSART_IntClear(eusart, EUSART_IF_TXC);
+		}
+	}
+#ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	if (data->callback) {
 		data->callback(dev, data->cb_data);
 	}
+#endif
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+
+	if (flags & EUSART_IF_RXTO) {
+		if (data->dma_rx.timeout == 0) {
+			eusart_dma_rx_flush(data);
+		} else {
+			eusart_async_timer_start(&data->dma_rx.timeout_work, data->dma_rx.timeout);
+		}
+
+		EUSART_IntClear(eusart, EUSART_IF_RXTO);
+	}
+
+	if (flags & EUSART_IF_RXOF) {
+		eusart_async_evt_rx_err(data, UART_ERROR_OVERRUN);
+
+		eusart_async_rx_disable(dev);
+
+		EUSART_IntClear(eusart, EUSART_IF_RXOF);
+	}
+
+	if (flags & EUSART_IF_TXC) {
+		k_work_cancel_delayable(&data->dma_tx.timeout_work);
+
+		if (!dma_get_status(data->dma_tx.dma_dev, data->dma_tx.dma_channel, &stat)) {
+			data->dma_tx.counter = data->dma_tx.buffer_length - stat.pending_length;
+		}
+
+		if (data->dma_tx.counter == data->dma_tx.buffer_length) {
+			EUSART_IntDisable(eusart, EUSART_IF_TXC);
+			EUSART_IntClear(eusart, EUSART_IF_TXC);
+			eusart_pm_lock_put(dev, EUSART_PM_LOCK_TX);
+		}
+
+		eusart_async_evt_tx_done(data);
+	}
+#endif /* CONFIG_UART_SILABS_EUSART_ASYNC */
 }
-#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 
-static inline EUSART_Parity_TypeDef uart_silabs_eusart_cfg2ll_parity(
-	enum uart_config_parity parity)
+static EUSART_Parity_TypeDef eusart_cfg2ll_parity(enum uart_config_parity parity)
 {
 	switch (parity) {
 	case UART_CFG_PARITY_ODD:
@@ -235,8 +828,7 @@ static inline EUSART_Parity_TypeDef uart_silabs_eusart_cfg2ll_parity(
 	}
 }
 
-static inline enum uart_config_parity uart_silabs_eusart_ll2cfg_parity(
-	EUSART_Parity_TypeDef parity)
+static inline enum uart_config_parity eusart_ll2cfg_parity(EUSART_Parity_TypeDef parity)
 {
 	switch (parity) {
 	case eusartOddParity:
@@ -249,8 +841,7 @@ static inline enum uart_config_parity uart_silabs_eusart_ll2cfg_parity(
 	}
 }
 
-static inline EUSART_Stopbits_TypeDef uart_silabs_eusart_cfg2ll_stopbits(
-	enum uart_config_stop_bits sb)
+static EUSART_Stopbits_TypeDef eusart_cfg2ll_stopbits(enum uart_config_stop_bits sb)
 {
 	switch (sb) {
 	case UART_CFG_STOP_BITS_0_5:
@@ -266,8 +857,7 @@ static inline EUSART_Stopbits_TypeDef uart_silabs_eusart_cfg2ll_stopbits(
 	}
 }
 
-static inline enum uart_config_stop_bits uart_silabs_eusart_ll2cfg_stopbits(
-	EUSART_Stopbits_TypeDef sb)
+static inline enum uart_config_stop_bits eusart_ll2cfg_stopbits(EUSART_Stopbits_TypeDef sb)
 {
 	switch (sb) {
 	case eusartStopbits0p5:
@@ -283,8 +873,8 @@ static inline enum uart_config_stop_bits uart_silabs_eusart_ll2cfg_stopbits(
 	}
 }
 
-static inline EUSART_Databits_TypeDef uart_silabs_eusart_cfg2ll_databits(
-	enum uart_config_data_bits db, enum uart_config_parity p)
+static EUSART_Databits_TypeDef eusart_cfg2ll_databits(enum uart_config_data_bits db,
+						      enum uart_config_parity p)
 {
 	switch (db) {
 	case UART_CFG_DATA_BITS_7:
@@ -306,8 +896,8 @@ static inline EUSART_Databits_TypeDef uart_silabs_eusart_cfg2ll_databits(
 	}
 }
 
-static inline enum uart_config_data_bits uart_silabs_eusart_ll2cfg_databits(
-	EUSART_Databits_TypeDef db, EUSART_Parity_TypeDef p)
+static inline enum uart_config_data_bits eusart_ll2cfg_databits(EUSART_Databits_TypeDef db,
+								EUSART_Parity_TypeDef p)
 {
 	switch (db) {
 	case eusartDataBits7:
@@ -332,15 +922,7 @@ static inline enum uart_config_data_bits uart_silabs_eusart_ll2cfg_databits(
 	}
 }
 
-/**
- * @brief  Get LL hardware flow control define from
- *         Zephyr hardware flow control option.
- * @note   Supports only UART_CFG_FLOW_CTRL_RTS_CTS and UART_CFG_FLOW_CTRL_RS485.
- * @param  fc: Zephyr hardware flow control option.
- * @retval eusartHwFlowControlCtsAndRts, or eusartHwFlowControlNone.
- */
-static inline EUSART_HwFlowControl_TypeDef uart_silabs_eusart_cfg2ll_hwctrl(
-	enum uart_config_flow_control fc)
+static EUSART_HwFlowControl_TypeDef eusart_cfg2ll_hwctrl(enum uart_config_flow_control fc)
 {
 	if (fc == UART_CFG_FLOW_CTRL_RTS_CTS) {
 		return eusartHwFlowControlCtsAndRts;
@@ -349,15 +931,7 @@ static inline EUSART_HwFlowControl_TypeDef uart_silabs_eusart_cfg2ll_hwctrl(
 	return eusartHwFlowControlNone;
 }
 
-/**
- * @brief  Get Zephyr hardware flow control option from
- *         LL hardware flow control define.
- * @note   Supports only eusartHwFlowControlCtsAndRts.
- * @param  fc: LL hardware flow control definition.
- * @retval UART_CFG_FLOW_CTRL_RTS_CTS, or UART_CFG_FLOW_CTRL_NONE.
- */
-static inline enum uart_config_flow_control uart_silabs_eusart_ll2cfg_hwctrl(
-	EUSART_HwFlowControl_TypeDef fc)
+static inline enum uart_config_flow_control eusart_ll2cfg_hwctrl(EUSART_HwFlowControl_TypeDef fc)
 {
 	if (fc == eusartHwFlowControlCtsAndRts) {
 		return UART_CFG_FLOW_CTRL_RTS_CTS;
@@ -366,153 +940,247 @@ static inline enum uart_config_flow_control uart_silabs_eusart_ll2cfg_hwctrl(
 	return UART_CFG_FLOW_CTRL_NONE;
 }
 
-/**
- * @brief Main initializer for UART
- *
- * @param dev UART device to be initialized
- * @return int 0
- */
-static int uart_silabs_eusart_init(const struct device *dev)
+static void eusart_configure_peripheral(const struct device *dev, bool enable)
 {
-	int err;
-	const struct uart_silabs_eusart_config *config = dev->config;
-	struct uart_silabs_eusart_data *data = dev->data;
-	struct uart_config *uart_cfg = &data->uart_cfg;
-
+	const struct eusart_config *config = dev->config;
+	const struct eusart_data *data = dev->data;
+	const struct uart_config *uart_cfg = &data->uart_cfg;
 	EUSART_UartInit_TypeDef eusartInit = EUSART_UART_INIT_DEFAULT_HF;
 	EUSART_AdvancedInit_TypeDef advancedSettings = EUSART_ADVANCED_INIT_DEFAULT;
 
-	/* The peripheral and gpio clock are already enabled from soc and gpio
-	 * driver
-	 */
+	eusartInit.baudrate = uart_cfg->baudrate;
+	eusartInit.parity = eusart_cfg2ll_parity(uart_cfg->parity);
+	eusartInit.stopbits = eusart_cfg2ll_stopbits(uart_cfg->stop_bits);
+	eusartInit.databits = eusart_cfg2ll_databits(uart_cfg->data_bits, uart_cfg->parity);
+	advancedSettings.hwFlowControl = eusart_cfg2ll_hwctrl(uart_cfg->flow_ctrl);
+	eusartInit.advancedSettings = &advancedSettings;
+	eusartInit.enable = eusartDisable;
+
+	EUSART_UartInitHf(config->eusart, &eusartInit);
+
+	if (IS_ENABLED(CONFIG_UART_SILABS_EUSART_ASYNC)) {
+		config->eusart->CFG1 |= EUSART_CFG1_RXTIMEOUT_ONEFRAME;
+	}
+
+	if (enable) {
+		EUSART_Enable(config->eusart, eusartEnable);
+	}
+}
+
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+static int eusart_configure(const struct device *dev, const struct uart_config *cfg)
+{
+	const struct eusart_config *config = dev->config;
+	EUSART_TypeDef *eusart = config->eusart;
+	struct eusart_data *data = dev->data;
+	struct uart_config *uart_cfg = &data->uart_cfg;
+
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+	if (data->dma_rx.enabled || data->dma_tx.enabled) {
+		return -EBUSY;
+	}
+#endif
+
+	if (cfg->parity == UART_CFG_PARITY_MARK || cfg->parity == UART_CFG_PARITY_SPACE) {
+		return -ENOSYS;
+	}
+
+	if (cfg->flow_ctrl == UART_CFG_FLOW_CTRL_DTR_DSR ||
+	    cfg->flow_ctrl == UART_CFG_FLOW_CTRL_RS485) {
+		return -ENOSYS;
+	}
+
+	*uart_cfg = *cfg;
+
+	EUSART_Enable(eusart, eusartDisable);
+	eusart_configure_peripheral(dev, true);
+
+	return 0;
+};
+
+static int eusart_config_get(const struct device *dev, struct uart_config *cfg)
+{
+	struct eusart_data *data = dev->data;
+	struct uart_config *uart_cfg = &data->uart_cfg;
+
+	*cfg = *uart_cfg;
+
+	return 0;
+}
+#endif /* CONFIG_UART_USE_RUNTIME_CONFIGURE */
+
+static int eusart_init(const struct device *dev)
+{
+	int err;
+	const struct eusart_config *config = dev->config;
+
+	/* The peripheral and gpio clock are already enabled from soc and gpio driver */
 	/* Enable EUSART clock */
 	err = clock_control_on(config->clock_dev, (clock_control_subsys_t)&config->clock_cfg);
 	if (err < 0) {
 		return err;
 	}
 
-	err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	eusart_configure_peripheral(dev, false);
+
+	config->irq_config_func(dev);
+
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+	err = eusart_async_init(dev);
 	if (err < 0) {
 		return err;
 	}
-
-	/* Init EUSART */
-	eusartInit.baudrate = uart_cfg->baudrate;
-	eusartInit.parity = uart_silabs_eusart_cfg2ll_parity(uart_cfg->parity);
-	eusartInit.stopbits = uart_silabs_eusart_cfg2ll_stopbits(uart_cfg->stop_bits);
-	eusartInit.databits = uart_silabs_eusart_cfg2ll_databits(uart_cfg->data_bits,
-								 uart_cfg->parity);
-	advancedSettings.hwFlowControl = uart_silabs_eusart_cfg2ll_hwctrl(uart_cfg->flow_ctrl);
-	eusartInit.advancedSettings = &advancedSettings;
-
-	EUSART_UartInitHf(config->eusart, &eusartInit);
-
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	config->irq_config_func(dev);
 #endif
 
-	return 0;
+	return pm_device_driver_init(dev, eusart_pm_action);
 }
 
-#ifdef CONFIG_PM_DEVICE
-static int uart_silabs_eusart_pm_action(const struct device *dev, enum pm_device_action action)
+static int eusart_pm_action(const struct device *dev, enum pm_device_action action)
 {
-	__maybe_unused const struct uart_silabs_eusart_config *config = dev->config;
+	__maybe_unused struct eusart_data *data = dev->data;
+	const struct eusart_config *config = dev->config;
+	int err;
+
+	if (action == PM_DEVICE_ACTION_RESUME) {
+		err = clock_control_on(config->clock_dev,
+				       (clock_control_subsys_t)&config->clock_cfg);
+		if (err < 0 && err != -EALREADY) {
+			return err;
+		}
 
-	switch (action) {
-	case PM_DEVICE_ACTION_SUSPEND:
-#ifdef EUSART_STATUS_TXIDLE
-		/* Wait for TX FIFO to flush before suspending */
-		while (!(EUSART_StatusGet(config->eusart) & EUSART_STATUS_TXIDLE)) {
+		err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+		if (err < 0) {
+			return err;
 		}
+
+		EUSART_Enable(config->eusart, eusartEnable);
+	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+		/* Entering suspend requires there to be no active asynchronous calls. */
+		__ASSERT_NO_MSG(!data->dma_rx.enabled);
+		__ASSERT_NO_MSG(!data->dma_tx.enabled);
 #endif
-		break;
+		EUSART_Enable(config->eusart, eusartDisable);
 
-	case PM_DEVICE_ACTION_RESUME:
-		break;
+		err = clock_control_off(config->clock_dev,
+					(clock_control_subsys_t)&config->clock_cfg);
+		if (err < 0) {
+			return err;
+		}
 
-	default:
+		err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_SLEEP);
+		if (err < 0 && err != -ENOENT) {
+			return err;
+		}
+
+	} else {
 		return -ENOTSUP;
 	}
 
 	return 0;
 }
-#endif
 
-static DEVICE_API(uart, uart_silabs_eusart_driver_api) = {
-	.poll_in = uart_silabs_eusart_poll_in,
-	.poll_out = uart_silabs_eusart_poll_out,
-	.err_check = uart_silabs_eusart_err_check,
+static DEVICE_API(uart, eusart_driver_api) = {
+	.poll_in = eusart_poll_in,
+	.poll_out = eusart_poll_out,
+	.err_check = eusart_err_check,
+#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+	.configure = eusart_configure,
+	.config_get = eusart_config_get,
+#endif
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	.fifo_fill = uart_silabs_eusart_fifo_fill,
-	.fifo_read = uart_silabs_eusart_fifo_read,
-	.irq_tx_enable = uart_silabs_eusart_irq_tx_enable,
-	.irq_tx_disable = uart_silabs_eusart_irq_tx_disable,
-	.irq_tx_complete = uart_silabs_eusart_irq_tx_complete,
-	.irq_tx_ready = uart_silabs_eusart_irq_tx_ready,
-	.irq_rx_enable = uart_silabs_eusart_irq_rx_enable,
-	.irq_rx_disable = uart_silabs_eusart_irq_rx_disable,
-	.irq_rx_ready = uart_silabs_eusart_irq_rx_ready,
-	.irq_err_enable = uart_silabs_eusart_irq_err_enable,
-	.irq_err_disable = uart_silabs_eusart_irq_err_disable,
-	.irq_is_pending = uart_silabs_eusart_irq_is_pending,
-	.irq_update = uart_silabs_eusart_irq_update,
-	.irq_callback_set = uart_silabs_eusart_irq_callback_set,
+	.fifo_fill = eusart_fifo_fill,
+	.fifo_read = eusart_fifo_read,
+	.irq_tx_enable = eusart_irq_tx_enable,
+	.irq_tx_disable = eusart_irq_tx_disable,
+	.irq_tx_complete = eusart_irq_tx_complete,
+	.irq_tx_ready = eusart_irq_tx_ready,
+	.irq_rx_enable = eusart_irq_rx_enable,
+	.irq_rx_disable = eusart_irq_rx_disable,
+	.irq_rx_ready = eusart_irq_rx_ready,
+	.irq_err_enable = eusart_irq_err_enable,
+	.irq_err_disable = eusart_irq_err_disable,
+	.irq_is_pending = eusart_irq_is_pending,
+	.irq_update = eusart_irq_update,
+	.irq_callback_set = eusart_irq_callback_set,
+#endif
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+	.callback_set = eusart_async_callback_set,
+	.tx = eusart_async_tx,
+	.tx_abort = eusart_async_tx_abort,
+	.rx_enable = eusart_async_rx_enable,
+	.rx_disable = eusart_async_rx_disable,
+	.rx_buf_rsp = eusart_async_rx_buf_rsp,
 #endif
 };
 
-#ifdef CONFIG_UART_INTERRUPT_DRIVEN
-#define UART_IRQ_HANDLER_FUNC(idx)							\
-	.irq_config_func = uart_silabs_eusart_config_func_##idx,
-#define UART_IRQ_HANDLER(idx)								\
-	static void uart_silabs_eusart_config_func_##idx(const struct device *dev)	\
-	{										\
-		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, rx, irq),				\
-			    DT_INST_IRQ_BY_NAME(idx, rx, priority),			\
-			    uart_silabs_eusart_isr, DEVICE_DT_INST_GET(idx), 0);	\
-		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, tx, irq),				\
-			    DT_INST_IRQ_BY_NAME(idx, tx, priority),			\
-			    uart_silabs_eusart_isr, DEVICE_DT_INST_GET(idx), 0);	\
-											\
-		irq_enable(DT_INST_IRQ_BY_NAME(idx, rx, irq));				\
-		irq_enable(DT_INST_IRQ_BY_NAME(idx, tx, irq));				\
-	}
+#ifdef CONFIG_UART_SILABS_EUSART_ASYNC
+
+#define EUSART_DMA_CHANNEL_INIT(index, dir)                                                        \
+	.dma_##dir = {                                                                             \
+		.dma_dev = DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(index, dir)),                   \
+		.dma_cfg = {                                                                       \
+			.dma_slot = SILABS_LDMA_REQSEL_TO_SLOT(                                    \
+				    DT_INST_DMAS_CELL_BY_NAME(index, dir, slot)),                  \
+			.source_data_size = 1,                                                     \
+			.dest_data_size = 1,                                                       \
+			.source_burst_length = 1,                                                  \
+			.dest_burst_length = 1,                                                    \
+			.dma_callback = eusart_dma_##dir##_cb,                                     \
+		}                                                                                  \
+	},
+#define EUSART_DMA_CHANNEL(index, dir)                                                             \
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(index, dmas),                                            \
+		 (EUSART_DMA_CHANNEL_INIT(index, dir)), ())
 #else
-#define UART_IRQ_HANDLER_FUNC(idx)
-#define UART_IRQ_HANDLER(idx)
+#define EUSART_DMA_CHANNEL(index, dir)
 #endif
 
-#define UART_INIT(idx)								\
-UART_IRQ_HANDLER(idx)								\
-										\
-PINCTRL_DT_INST_DEFINE(idx);							\
-										\
-static const struct uart_silabs_eusart_config uart_silabs_eusart_cfg_##idx = {	\
-	.eusart = (EUSART_TypeDef *)DT_INST_REG_ADDR(idx),			\
-	.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx),				\
-	.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(idx)),			\
-	.clock_cfg = SILABS_DT_INST_CLOCK_CFG(idx),				\
-	UART_IRQ_HANDLER_FUNC(idx)						\
-};										\
-										\
-static struct uart_silabs_eusart_data uart_silabs_eusart_data_##idx = {		\
-	.uart_cfg = {								\
-		.baudrate  = DT_INST_PROP(idx, current_speed),			\
-		.parity	   = DT_INST_ENUM_IDX(idx, parity),			\
-		.stop_bits = DT_INST_ENUM_IDX(idx, stop_bits),			\
-		.data_bits = DT_INST_ENUM_IDX(idx, data_bits),			\
-		.flow_ctrl = DT_INST_PROP(idx, hw_flow_control)			\
-					? UART_CFG_FLOW_CTRL_RTS_CTS		\
-					: UART_CFG_FLOW_CTRL_NONE,		\
-	},									\
-};										\
-										\
-PM_DEVICE_DT_INST_DEFINE(idx, uart_silabs_eusart_pm_action);			\
-										\
-DEVICE_DT_INST_DEFINE(idx, uart_silabs_eusart_init, PM_DEVICE_DT_INST_GET(idx),	\
-		      &uart_silabs_eusart_data_##idx,				\
-		      &uart_silabs_eusart_cfg_##idx, PRE_KERNEL_1,		\
-		      CONFIG_SERIAL_INIT_PRIORITY,				\
-		      &uart_silabs_eusart_driver_api);
-
-DT_INST_FOREACH_STATUS_OKAY(UART_INIT)
+
+#define SILABS_EUSART_IRQ_HANDLER_FUNC(idx) .irq_config_func = eusart_config_func_##idx,
+#define SILABS_EUSART_IRQ_HANDLER(idx)                                                             \
+	static void eusart_config_func_##idx(const struct device *dev)                             \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, rx, irq),                                     \
+			    DT_INST_IRQ_BY_NAME(idx, rx, priority), eusart_isr,                    \
+			    DEVICE_DT_INST_GET(idx), 0);                                           \
+		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(idx, tx, irq),                                     \
+			    DT_INST_IRQ_BY_NAME(idx, tx, priority), eusart_isr,                    \
+			    DEVICE_DT_INST_GET(idx), 0);                                           \
+                                                                                                   \
+		irq_enable(DT_INST_IRQ_BY_NAME(idx, rx, irq));                                     \
+		irq_enable(DT_INST_IRQ_BY_NAME(idx, tx, irq));                                     \
+	}
+
+#define SILABS_EUSART_INIT(idx)                                                                    \
+	SILABS_EUSART_IRQ_HANDLER(idx);                                                            \
+	PINCTRL_DT_INST_DEFINE(idx);                                                               \
+	PM_DEVICE_DT_INST_DEFINE(idx, eusart_pm_action);                                           \
+                                                                                                   \
+	static const struct eusart_config eusart_cfg_##idx = {                                     \
+		.eusart = (EUSART_TypeDef *)DT_INST_REG_ADDR(idx),                                 \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx),                                       \
+		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(idx)),                              \
+		.clock_cfg = SILABS_DT_INST_CLOCK_CFG(idx),                                        \
+		SILABS_EUSART_IRQ_HANDLER_FUNC(idx)                                                \
+	};                                                                                         \
+                                                                                                   \
+	static struct eusart_data eusart_data_##idx = {                                            \
+		.uart_cfg = {                                                                      \
+			.baudrate  = DT_INST_PROP(idx, current_speed),                             \
+			.parity    = DT_INST_ENUM_IDX(idx, parity),                                \
+			.stop_bits = DT_INST_ENUM_IDX(idx, stop_bits),                             \
+			.data_bits = DT_INST_ENUM_IDX(idx, data_bits),                             \
+			.flow_ctrl = DT_INST_PROP(idx, hw_flow_control)                            \
+						? UART_CFG_FLOW_CTRL_RTS_CTS                       \
+						: UART_CFG_FLOW_CTRL_NONE,                         \
+		},                                                                                 \
+		EUSART_DMA_CHANNEL(idx, rx)                                                        \
+		EUSART_DMA_CHANNEL(idx, tx)                                                        \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(idx, eusart_init, PM_DEVICE_DT_INST_GET(idx), &eusart_data_##idx,    \
+			      &eusart_cfg_##idx, PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,        \
+			      &eusart_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(SILABS_EUSART_INIT)
diff --git a/drivers/serial/uart_silabs_usart.c b/drivers/serial/uart_silabs_usart.c
index ee330c5fdee4d..3937ffbf07be8 100644
--- a/drivers/serial/uart_silabs_usart.c
+++ b/drivers/serial/uart_silabs_usart.c
@@ -16,7 +16,7 @@
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/policy.h>
 #include <em_usart.h>
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 #include <zephyr/drivers/dma.h>
 #include <zephyr/drivers/dma/dma_silabs_ldma.h>
 #endif
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(uart_silabs_usart, CONFIG_UART_LOG_LEVEL);
 #define SILABS_USART_TIMEOUT_TO_TIMERCOUNTER(timeout, baudrate)                                    \
 	((timeout * NSEC_PER_USEC) / ((NSEC_PER_SEC / baudrate) * SILABS_USART_TIMER_COMPARE_VALUE))
 
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 struct uart_dma_channel {
 	const struct device *dma_dev;
 	uint32_t dma_channel;
@@ -64,7 +64,7 @@ struct uart_silabs_data {
 	uart_irq_callback_user_data_t callback;
 	void *cb_data;
 #endif
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 	const struct device *uart_dev;
 	uart_callback_t async_cb;
 	void *async_user_data;
@@ -303,7 +303,7 @@ static void uart_silabs_irq_callback_set(const struct device *dev, uart_irq_call
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 static inline void async_user_callback(struct uart_silabs_data *data, struct uart_event *event)
 {
 	if (data->async_cb) {
@@ -741,7 +741,7 @@ static int uart_silabs_async_init(const struct device *dev)
 
 	return 0;
 }
-#endif /* CONFIG_UART_ASYNC_API */
+#endif /* CONFIG_UART_SILABS_USART_ASYNC */
 
 static void uart_silabs_isr(const struct device *dev)
 {
@@ -749,7 +749,7 @@ static void uart_silabs_isr(const struct device *dev)
 	const struct uart_silabs_config *config = dev->config;
 	USART_TypeDef *usart = config->base;
 	uint32_t flags = USART_IntGet(usart);
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 	struct dma_status stat;
 #endif
 
@@ -764,7 +764,7 @@ static void uart_silabs_isr(const struct device *dev)
 		data->callback(dev, data->cb_data);
 	}
 #endif
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 	if (flags & USART_IF_TCMP1) {
 
 		data->dma_rx.timeout_cnt++;
@@ -814,7 +814,7 @@ static void uart_silabs_isr(const struct device *dev)
 
 		USART_IntClear(usart, USART_IF_TCMP2);
 	}
-#endif /* CONFIG_UART_ASYNC_API */
+#endif /* CONFIG_UART_SILABS_USART_ASYNC */
 }
 
 static inline USART_Parity_TypeDef uart_silabs_cfg2ll_parity(
@@ -971,7 +971,7 @@ static int uart_silabs_configure(const struct device *dev,
 	USART_TypeDef *base = config->base;
 	struct uart_silabs_data *data = dev->data;
 
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 	if (data->dma_rx.enabled || data->dma_tx.enabled) {
 		return -EBUSY;
 	}
@@ -1027,7 +1027,7 @@ static int uart_silabs_init(const struct device *dev)
 
 	config->irq_config_func(dev);
 
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 	err = uart_silabs_async_init(dev);
 	if (err < 0) {
 		return err;
@@ -1056,7 +1056,7 @@ static int uart_silabs_pm_action(const struct device *dev, enum pm_device_action
 
 		USART_Enable(config->base, usartEnable);
 	} else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) {
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 		/* Entering suspend requires there to be no active asynchronous calls. */
 		__ASSERT_NO_MSG(!data->dma_rx.enabled);
 		__ASSERT_NO_MSG(!data->dma_tx.enabled);
@@ -1105,7 +1105,7 @@ static DEVICE_API(uart, uart_silabs_driver_api) = {
 	.irq_update = uart_silabs_irq_update,
 	.irq_callback_set = uart_silabs_irq_callback_set,
 #endif
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 	.callback_set = uart_silabs_async_callback_set,
 	.tx = uart_silabs_async_tx,
 	.tx_abort = uart_silabs_async_tx_abort,
@@ -1115,7 +1115,7 @@ static DEVICE_API(uart, uart_silabs_driver_api) = {
 #endif
 };
 
-#ifdef CONFIG_UART_ASYNC_API
+#ifdef CONFIG_UART_SILABS_USART_ASYNC
 
 #define UART_DMA_CHANNEL_INIT(index, dir)                                                          \
 	.dma_##dir = {                                                                             \
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index 13c85a5066dd0..f1e560dba9c8b 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -39,11 +39,9 @@
 #include <stm32_ll_exti.h>
 #endif /* CONFIG_PM */
 
-#ifdef CONFIG_DCACHE
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
 #include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
-#endif /* CONFIG_DCACHE */
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
@@ -104,16 +102,29 @@ uint32_t lpuartdiv_calc(const uint64_t clock_rate, const uint32_t baud_rate)
 #endif
 
 #ifdef CONFIG_PM
+static void uart_stm32_pm_policy_state_lock_get_unconditional(void)
+{
+	pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+	if (IS_ENABLED(CONFIG_PM_S2RAM)) {
+		pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_RAM, PM_ALL_SUBSTATES);
+	}
+}
+
 static void uart_stm32_pm_policy_state_lock_get(const struct device *dev)
 {
 	struct uart_stm32_data *data = dev->data;
 
 	if (!data->pm_policy_state_on) {
 		data->pm_policy_state_on = true;
-		pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
-		if (IS_ENABLED(CONFIG_PM_S2RAM)) {
-			pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_RAM, PM_ALL_SUBSTATES);
-		}
+		uart_stm32_pm_policy_state_lock_get_unconditional();
+	}
+}
+
+static void uart_stm32_pm_policy_state_lock_put_unconditional(void)
+{
+	pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+	if (IS_ENABLED(CONFIG_PM_S2RAM)) {
+		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_RAM, PM_ALL_SUBSTATES);
 	}
 }
 
@@ -123,10 +134,7 @@ static void uart_stm32_pm_policy_state_lock_put(const struct device *dev)
 
 	if (data->pm_policy_state_on) {
 		data->pm_policy_state_on = false;
-		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
-		if (IS_ENABLED(CONFIG_PM_S2RAM)) {
-			pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_RAM, PM_ALL_SUBSTATES);
-		}
+		uart_stm32_pm_policy_state_lock_put_unconditional();
 	}
 }
 #endif /* CONFIG_PM */
@@ -1163,6 +1171,9 @@ static inline void async_evt_tx_done(struct uart_stm32_data *data)
 	/* Reset tx buffer */
 	data->dma_tx.buffer_length = 0;
 	data->dma_tx.counter = 0;
+#ifdef CONFIG_PM
+	data->tx_int_stream_on = false;
+#endif
 
 	async_user_callback(data, &event);
 }
@@ -1180,6 +1191,9 @@ static inline void async_evt_tx_abort(struct uart_stm32_data *data)
 	/* Reset tx buffer */
 	data->dma_tx.buffer_length = 0;
 	data->dma_tx.counter = 0;
+#ifdef CONFIG_PM
+	data->tx_int_stream_on = false;
+#endif
 
 	async_user_callback(data, &event);
 }
@@ -1294,6 +1308,26 @@ static void uart_stm32_isr(const struct device *dev)
 	}
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 
+#if defined(CONFIG_PM) && defined(IS_UART_WAKEUP_FROMSTOP_INSTANCE) \
+	&& defined(USART_CR3_WUFIE)
+	if (LL_USART_IsEnabledIT_WKUP(usart) &&
+		LL_USART_IsActiveFlag_WKUP(usart)) {
+
+		LL_USART_ClearFlag_WKUP(usart);
+
+		if (!data->rx_woken) {
+			/* Prevent SoC from entering STOP mode until RX goes IDLE */
+			uart_stm32_pm_policy_state_lock_get_unconditional();
+			data->rx_woken = true;
+		}
+
+#ifdef USART_ISR_REACK
+		while (LL_USART_IsActiveFlag_REACK(usart) == 0) {
+		}
+#endif
+	}
+#endif
+
 #ifdef CONFIG_UART_ASYNC_API
 	if (LL_USART_IsEnabledIT_IDLE(usart) &&
 			LL_USART_IsActiveFlag_IDLE(usart)) {
@@ -1302,6 +1336,14 @@ static void uart_stm32_isr(const struct device *dev)
 
 		LOG_DBG("idle interrupt occurred");
 
+#ifdef CONFIG_PM
+		if (data->rx_woken) {
+			/* Allow SoC to enter STOP mode now that RX is IDLE */
+			uart_stm32_pm_policy_state_lock_put_unconditional();
+			data->rx_woken = false;
+		}
+#endif
+
 		if (data->dma_rx.timeout == 0) {
 			uart_stm32_dma_rx_flush(dev, STM32_ASYNC_STATUS_TIMEOUT);
 		} else {
@@ -1315,9 +1357,8 @@ static void uart_stm32_isr(const struct device *dev)
 		LL_USART_DisableIT_TC(usart);
 		/* Generate TX_DONE event when transmission is done */
 		async_evt_tx_done(data);
-
 #ifdef CONFIG_PM
-		uart_stm32_pm_policy_state_lock_put(dev);
+		uart_stm32_pm_policy_state_lock_put_unconditional();
 #endif
 	} else if (LL_USART_IsEnabledIT_RXNE(usart) &&
 			LL_USART_IsActiveFlag_RXNE(usart)) {
@@ -1334,18 +1375,6 @@ static void uart_stm32_isr(const struct device *dev)
 	uart_stm32_err_check(dev);
 #endif /* CONFIG_UART_ASYNC_API */
 
-#if defined(CONFIG_PM) && defined(IS_UART_WAKEUP_FROMSTOP_INSTANCE) \
-	&& defined(USART_CR3_WUFIE)
-	if (LL_USART_IsEnabledIT_WKUP(usart) &&
-		LL_USART_IsActiveFlag_WKUP(usart)) {
-
-		LL_USART_ClearFlag_WKUP(usart);
-#ifdef USART_ISR_REACK
-		while (LL_USART_IsActiveFlag_REACK(usart) == 0) {
-		}
-#endif
-	}
-#endif
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN || CONFIG_UART_ASYNC_API || CONFIG_PM */
 
@@ -1364,11 +1393,13 @@ static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
 	}
 #endif /* CONFIG_NOCACHE_MEMORY */
 
+#ifdef CONFIG_MEM_ATTR
 	buf_within_nocache = mem_attr_check_buf(
 		(void *)buf, len_bytes, DT_MEM_ARM_MPU_RAM_NOCACHE) == 0;
 	if (buf_within_nocache) {
 		return true;
 	}
+#endif /* CONFIG_MEM_ATTR */
 
 	buf_within_nocache = (buf >= ((uintptr_t)__rodata_region_start)) &&
 		((buf + len_bytes - 1) <= ((uintptr_t)__rodata_region_end));
@@ -1603,6 +1634,10 @@ static int uart_stm32_async_tx(const struct device *dev,
 	}
 #endif /* CONFIG_DCACHE */
 
+#ifdef CONFIG_PM
+	data->tx_poll_stream_on = false;
+	data->tx_int_stream_on = true;
+#endif
 	data->dma_tx.buffer = (uint8_t *)tx_data;
 	data->dma_tx.buffer_length = buf_size;
 	data->dma_tx.timeout = timeout;
@@ -1638,7 +1673,7 @@ static int uart_stm32_async_tx(const struct device *dev,
 #ifdef CONFIG_PM
 
 	/* Do not allow system to suspend until transmission has completed */
-	uart_stm32_pm_policy_state_lock_get(dev);
+	uart_stm32_pm_policy_state_lock_get_unconditional();
 #endif
 
 	/* Enable TX DMA requests */
diff --git a/drivers/serial/uart_stm32.h b/drivers/serial/uart_stm32.h
index 6420f67f64eda..d50dbc77c0d98 100644
--- a/drivers/serial/uart_stm32.h
+++ b/drivers/serial/uart_stm32.h
@@ -103,6 +103,7 @@ struct uart_stm32_data {
 	bool tx_poll_stream_on;
 	bool tx_int_stream_on;
 	bool pm_policy_state_on;
+	bool rx_woken;
 #endif
 };
 
diff --git a/drivers/serial/uart_wch_usart.c b/drivers/serial/uart_wch_usart.c
index 25a10b2ed0694..720da6f17f5c0 100644
--- a/drivers/serial/uart_wch_usart.c
+++ b/drivers/serial/uart_wch_usart.c
@@ -312,7 +312,7 @@ static DEVICE_API(uart, usart_wch_driver_api) = {
 #define USART_WCH_IRQ_HANDLER(idx)                                                                 \
 	static void usart_wch_irq_config_func_##idx(const struct device *dev)                      \
 	{                                                                                          \
-		IRQ_CONNECT(DT_INST_IRQN(idx), DT_INST_IRQ(index, priority), usart_wch_isr,        \
+		IRQ_CONNECT(DT_INST_IRQN(idx), DT_INST_IRQ(idx, priority), usart_wch_isr,        \
 			    DEVICE_DT_INST_GET(idx), 0);                                           \
 		irq_enable(DT_INST_IRQN(idx));                                                     \
 	}
diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c
index 122ac11a80d94..c8aad9049c1dd 100644
--- a/drivers/serial/uart_xlnx_ps.c
+++ b/drivers/serial/uart_xlnx_ps.c
@@ -25,7 +25,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/types.h>
-#include <soc.h>
 
 #include <zephyr/init.h>
 #include <zephyr/toolchain.h>
@@ -43,98 +42,98 @@
  */
 
 /* Register offsets within the UART device's register space */
-#define XUARTPS_CR_OFFSET	0x0000U  /**< Control Register [8:0] */
-#define XUARTPS_MR_OFFSET	0x0004U  /**< Mode Register [9:0] */
-#define XUARTPS_IER_OFFSET	0x0008U  /**< Interrupt Enable [12:0] */
-#define XUARTPS_IDR_OFFSET	0x000CU  /**< Interrupt Disable [12:0] */
-#define XUARTPS_IMR_OFFSET	0x0010U  /**< Interrupt Mask [12:0] */
-#define XUARTPS_ISR_OFFSET	0x0014U  /**< Interrupt Status [12:0]*/
-#define XUARTPS_BAUDGEN_OFFSET	0x0018U  /**< Baud Rate Generator [15:0] */
-#define XUARTPS_RXTOUT_OFFSET	0x001CU  /**< RX Timeout [7:0] */
-#define XUARTPS_RXWM_OFFSET	0x0020U  /**< RX FIFO Trigger Level [5:0] */
-#define XUARTPS_MODEMCR_OFFSET	0x0024U  /**< Modem Control [5:0] */
-#define XUARTPS_MODEMSR_OFFSET	0x0028U  /**< Modem Status [8:0] */
-#define XUARTPS_SR_OFFSET	0x002CU  /**< Channel Status [14:0] */
-#define XUARTPS_FIFO_OFFSET	0x0030U  /**< FIFO [7:0] */
-#define XUARTPS_BAUDDIV_OFFSET	0x0034U  /**< Baud Rate Divider [7:0] */
-#define XUARTPS_FLOWDEL_OFFSET	0x0038U  /**< Flow Delay [5:0] */
-#define XUARTPS_TXWM_OFFSET	0x0044U  /**< TX FIFO Trigger Level [5:0] */
-#define XUARTPS_RXBS_OFFSET	0x0048U  /**< RX FIFO Byte Status [11:0] */
+#define XUARTPS_CR_OFFSET      0x0000U /**< Control Register [8:0] */
+#define XUARTPS_MR_OFFSET      0x0004U /**< Mode Register [9:0] */
+#define XUARTPS_IER_OFFSET     0x0008U /**< Interrupt Enable [12:0] */
+#define XUARTPS_IDR_OFFSET     0x000CU /**< Interrupt Disable [12:0] */
+#define XUARTPS_IMR_OFFSET     0x0010U /**< Interrupt Mask [12:0] */
+#define XUARTPS_ISR_OFFSET     0x0014U /**< Interrupt Status [12:0]*/
+#define XUARTPS_BAUDGEN_OFFSET 0x0018U /**< Baud Rate Generator [15:0] */
+#define XUARTPS_RXTOUT_OFFSET  0x001CU /**< RX Timeout [7:0] */
+#define XUARTPS_RXWM_OFFSET    0x0020U /**< RX FIFO Trigger Level [5:0] */
+#define XUARTPS_MODEMCR_OFFSET 0x0024U /**< Modem Control [5:0] */
+#define XUARTPS_MODEMSR_OFFSET 0x0028U /**< Modem Status [8:0] */
+#define XUARTPS_SR_OFFSET      0x002CU /**< Channel Status [14:0] */
+#define XUARTPS_FIFO_OFFSET    0x0030U /**< FIFO [7:0] */
+#define XUARTPS_BAUDDIV_OFFSET 0x0034U /**< Baud Rate Divider [7:0] */
+#define XUARTPS_FLOWDEL_OFFSET 0x0038U /**< Flow Delay [5:0] */
+#define XUARTPS_TXWM_OFFSET    0x0044U /**< TX FIFO Trigger Level [5:0] */
+#define XUARTPS_RXBS_OFFSET    0x0048U /**< RX FIFO Byte Status [11:0] */
 
 /* Control Register Bits Definition */
-#define XUARTPS_CR_STOPBRK	0x00000100U  /**< Stop transmission of break */
-#define XUARTPS_CR_STARTBRK	0x00000080U  /**< Set break */
-#define XUARTPS_CR_TORST	0x00000040U  /**< RX timeout counter restart */
-#define XUARTPS_CR_TX_DIS	0x00000020U  /**< TX disabled. */
-#define XUARTPS_CR_TX_EN	0x00000010U  /**< TX enabled */
-#define XUARTPS_CR_RX_DIS	0x00000008U  /**< RX disabled. */
-#define XUARTPS_CR_RX_EN	0x00000004U  /**< RX enabled */
-#define XUARTPS_CR_EN_DIS_MASK	0x0000003CU  /**< Enable/disable Mask */
-#define XUARTPS_CR_TXRST	0x00000002U  /**< TX logic reset */
-#define XUARTPS_CR_RXRST	0x00000001U  /**< RX logic reset */
+#define XUARTPS_CR_STOPBRK     0x00000100U /**< Stop transmission of break */
+#define XUARTPS_CR_STARTBRK    0x00000080U /**< Set break */
+#define XUARTPS_CR_TORST       0x00000040U /**< RX timeout counter restart */
+#define XUARTPS_CR_TX_DIS      0x00000020U /**< TX disabled. */
+#define XUARTPS_CR_TX_EN       0x00000010U /**< TX enabled */
+#define XUARTPS_CR_RX_DIS      0x00000008U /**< RX disabled. */
+#define XUARTPS_CR_RX_EN       0x00000004U /**< RX enabled */
+#define XUARTPS_CR_EN_DIS_MASK 0x0000003CU /**< Enable/disable Mask */
+#define XUARTPS_CR_TXRST       0x00000002U /**< TX logic reset */
+#define XUARTPS_CR_RXRST       0x00000001U /**< RX logic reset */
 
 /* Mode Register Bits Definition */
-#define XUARTPS_MR_CCLK			0x00000400U /**< Input clock select */
-#define XUARTPS_MR_CHMODE_R_LOOP	0x00000300U /**< Remote loopback mode */
-#define XUARTPS_MR_CHMODE_L_LOOP	0x00000200U /**< Local loopback mode */
-#define XUARTPS_MR_CHMODE_ECHO		0x00000100U /**< Auto echo mode */
-#define XUARTPS_MR_CHMODE_NORM		0x00000000U /**< Normal mode */
-#define XUARTPS_MR_CHMODE_SHIFT		8U  /**< Mode shift */
-#define XUARTPS_MR_CHMODE_MASK		0x00000300U /**< Mode mask */
-#define XUARTPS_MR_STOPMODE_2_BIT	0x00000080U /**< 2 stop bits */
-#define XUARTPS_MR_STOPMODE_1_5_BIT	0x00000040U /**< 1.5 stop bits */
-#define XUARTPS_MR_STOPMODE_1_BIT	0x00000000U /**< 1 stop bit */
-#define XUARTPS_MR_STOPMODE_SHIFT	6U  /**< Stop bits shift */
-#define XUARTPS_MR_STOPMODE_MASK	0x000000A0U /**< Stop bits mask */
-#define XUARTPS_MR_PARITY_NONE		0x00000020U /**< No parity mode */
-#define XUARTPS_MR_PARITY_MARK		0x00000018U /**< Mark parity mode */
-#define XUARTPS_MR_PARITY_SPACE		0x00000010U /**< Space parity mode */
-#define XUARTPS_MR_PARITY_ODD		0x00000008U /**< Odd parity mode */
-#define XUARTPS_MR_PARITY_EVEN		0x00000000U /**< Even parity mode */
-#define XUARTPS_MR_PARITY_SHIFT		3U  /**< Parity setting shift */
-#define XUARTPS_MR_PARITY_MASK		0x00000038U /**< Parity mask */
-#define XUARTPS_MR_CHARLEN_6_BIT	0x00000006U /**< 6 bits data */
-#define XUARTPS_MR_CHARLEN_7_BIT	0x00000004U /**< 7 bits data */
-#define XUARTPS_MR_CHARLEN_8_BIT	0x00000000U /**< 8 bits data */
-#define XUARTPS_MR_CHARLEN_SHIFT	1U  /**< Data Length shift */
-#define XUARTPS_MR_CHARLEN_MASK		0x00000006U /**< Data length mask */
-#define XUARTPS_MR_CLKSEL		0x00000001U /**< Input clock select */
+#define XUARTPS_MR_CCLK             0x00000400U /**< Input clock select */
+#define XUARTPS_MR_CHMODE_R_LOOP    0x00000300U /**< Remote loopback mode */
+#define XUARTPS_MR_CHMODE_L_LOOP    0x00000200U /**< Local loopback mode */
+#define XUARTPS_MR_CHMODE_ECHO      0x00000100U /**< Auto echo mode */
+#define XUARTPS_MR_CHMODE_NORM      0x00000000U /**< Normal mode */
+#define XUARTPS_MR_CHMODE_SHIFT     8U          /**< Mode shift */
+#define XUARTPS_MR_CHMODE_MASK      0x00000300U /**< Mode mask */
+#define XUARTPS_MR_STOPMODE_2_BIT   0x00000080U /**< 2 stop bits */
+#define XUARTPS_MR_STOPMODE_1_5_BIT 0x00000040U /**< 1.5 stop bits */
+#define XUARTPS_MR_STOPMODE_1_BIT   0x00000000U /**< 1 stop bit */
+#define XUARTPS_MR_STOPMODE_SHIFT   6U          /**< Stop bits shift */
+#define XUARTPS_MR_STOPMODE_MASK    0x000000A0U /**< Stop bits mask */
+#define XUARTPS_MR_PARITY_NONE      0x00000020U /**< No parity mode */
+#define XUARTPS_MR_PARITY_MARK      0x00000018U /**< Mark parity mode */
+#define XUARTPS_MR_PARITY_SPACE     0x00000010U /**< Space parity mode */
+#define XUARTPS_MR_PARITY_ODD       0x00000008U /**< Odd parity mode */
+#define XUARTPS_MR_PARITY_EVEN      0x00000000U /**< Even parity mode */
+#define XUARTPS_MR_PARITY_SHIFT     3U          /**< Parity setting shift */
+#define XUARTPS_MR_PARITY_MASK      0x00000038U /**< Parity mask */
+#define XUARTPS_MR_CHARLEN_6_BIT    0x00000006U /**< 6 bits data */
+#define XUARTPS_MR_CHARLEN_7_BIT    0x00000004U /**< 7 bits data */
+#define XUARTPS_MR_CHARLEN_8_BIT    0x00000000U /**< 8 bits data */
+#define XUARTPS_MR_CHARLEN_SHIFT    1U          /**< Data Length shift */
+#define XUARTPS_MR_CHARLEN_MASK     0x00000006U /**< Data length mask */
+#define XUARTPS_MR_CLKSEL           0x00000001U /**< Input clock select */
 
 /* Interrupt Register Bits Definition */
-#define XUARTPS_IXR_RBRK	0x00002000U /**< Rx FIFO break detect interrupt */
-#define XUARTPS_IXR_TOVR	0x00001000U /**< Tx FIFO Overflow interrupt */
-#define XUARTPS_IXR_TNFUL	0x00000800U /**< Tx FIFO Nearly Full interrupt */
-#define XUARTPS_IXR_TTRIG	0x00000400U /**< Tx Trig interrupt */
-#define XUARTPS_IXR_DMS		0x00000200U /**< Modem status change interrupt */
-#define XUARTPS_IXR_TOUT	0x00000100U /**< Timeout error interrupt */
-#define XUARTPS_IXR_PARITY	0x00000080U /**< Parity error interrupt */
-#define XUARTPS_IXR_FRAMING	0x00000040U /**< Framing error interrupt */
-#define XUARTPS_IXR_RXOVR	0x00000020U /**< Overrun error interrupt */
-#define XUARTPS_IXR_TXFULL	0x00000010U /**< TX FIFO full interrupt. */
-#define XUARTPS_IXR_TXEMPTY	0x00000008U /**< TX FIFO empty interrupt. */
-#define XUARTPS_IXR_RXFULL	0x00000004U /**< RX FIFO full interrupt. */
-#define XUARTPS_IXR_RXEMPTY	0x00000002U /**< RX FIFO empty interrupt. */
-#define XUARTPS_IXR_RTRIG	0x00000001U /**< RX FIFO trigger interrupt. */
-#define XUARTPS_IXR_MASK	0x00003FFFU /**< Valid bit mask */
+#define XUARTPS_IXR_RBRK    0x00002000U /**< Rx FIFO break detect interrupt */
+#define XUARTPS_IXR_TOVR    0x00001000U /**< Tx FIFO Overflow interrupt */
+#define XUARTPS_IXR_TNFUL   0x00000800U /**< Tx FIFO Nearly Full interrupt */
+#define XUARTPS_IXR_TTRIG   0x00000400U /**< Tx Trig interrupt */
+#define XUARTPS_IXR_DMS     0x00000200U /**< Modem status change interrupt */
+#define XUARTPS_IXR_TOUT    0x00000100U /**< Timeout error interrupt */
+#define XUARTPS_IXR_PARITY  0x00000080U /**< Parity error interrupt */
+#define XUARTPS_IXR_FRAMING 0x00000040U /**< Framing error interrupt */
+#define XUARTPS_IXR_RXOVR   0x00000020U /**< Overrun error interrupt */
+#define XUARTPS_IXR_TXFULL  0x00000010U /**< TX FIFO full interrupt. */
+#define XUARTPS_IXR_TXEMPTY 0x00000008U /**< TX FIFO empty interrupt. */
+#define XUARTPS_IXR_RXFULL  0x00000004U /**< RX FIFO full interrupt. */
+#define XUARTPS_IXR_RXEMPTY 0x00000002U /**< RX FIFO empty interrupt. */
+#define XUARTPS_IXR_RTRIG   0x00000001U /**< RX FIFO trigger interrupt. */
+#define XUARTPS_IXR_MASK    0x00003FFFU /**< Valid bit mask */
 
 /* Modem Control Register Bits Definition */
-#define XUARTPS_MODEMCR_FCM_RTS_CTS	0x00000020 /**< RTS/CTS hardware flow control. */
-#define XUARTPS_MODEMCR_FCM_NONE	0x00000000 /**< No hardware flow control. */
-#define XUARTPS_MODEMCR_FCM_MASK	0x00000020 /**< Hardware flow control mask. */
-#define XUARTPS_MODEMCR_RTS_SHIFT	1U         /**< RTS bit shift */
-#define XUARTPS_MODEMCR_DTR_SHIFT	0U         /**< DTR bit shift */
+#define XUARTPS_MODEMCR_FCM_RTS_CTS 0x00000020 /**< RTS/CTS hardware flow control. */
+#define XUARTPS_MODEMCR_FCM_NONE    0x00000000 /**< No hardware flow control. */
+#define XUARTPS_MODEMCR_FCM_MASK    0x00000020 /**< Hardware flow control mask. */
+#define XUARTPS_MODEMCR_RTS_SHIFT   1U         /**< RTS bit shift */
+#define XUARTPS_MODEMCR_DTR_SHIFT   0U         /**< DTR bit shift */
 
 /* Channel Status Register */
-#define XUARTPS_SR_TNFUL	0x00004000U /**< TX FIFO Nearly Full Status */
-#define XUARTPS_SR_TTRIG	0x00002000U /**< TX FIFO Trigger Status */
-#define XUARTPS_SR_FLOWDEL	0x00001000U /**< RX FIFO fill over flow delay */
-#define XUARTPS_SR_TACTIVE	0x00000800U /**< TX active */
-#define XUARTPS_SR_RACTIVE	0x00000400U /**< RX active */
-#define XUARTPS_SR_TXFULL	0x00000010U /**< TX FIFO full */
-#define XUARTPS_SR_TXEMPTY	0x00000008U /**< TX FIFO empty */
-#define XUARTPS_SR_RXFULL	0x00000004U /**< RX FIFO full */
-#define XUARTPS_SR_RXEMPTY	0x00000002U /**< RX FIFO empty */
-#define XUARTPS_SR_RTRIG	0x00000001U /**< RX FIFO fill over trigger */
+#define XUARTPS_SR_TNFUL   0x00004000U /**< TX FIFO Nearly Full Status */
+#define XUARTPS_SR_TTRIG   0x00002000U /**< TX FIFO Trigger Status */
+#define XUARTPS_SR_FLOWDEL 0x00001000U /**< RX FIFO fill over flow delay */
+#define XUARTPS_SR_TACTIVE 0x00000800U /**< TX active */
+#define XUARTPS_SR_RACTIVE 0x00000400U /**< RX active */
+#define XUARTPS_SR_TXFULL  0x00000010U /**< TX FIFO full */
+#define XUARTPS_SR_TXEMPTY 0x00000008U /**< TX FIFO empty */
+#define XUARTPS_SR_RXFULL  0x00000004U /**< RX FIFO full */
+#define XUARTPS_SR_RXEMPTY 0x00000002U /**< RX FIFO empty */
+#define XUARTPS_SR_RTRIG   0x00000001U /**< RX FIFO fill over trigger */
 
 /** Device configuration structure */
 struct uart_xlnx_ps_dev_config {
@@ -158,6 +157,8 @@ struct uart_xlnx_ps_dev_data_t {
 	uint32_t flowctrl;
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
+	const struct device *dev;
+	struct k_timer timer;
 	uart_irq_callback_user_data_t user_cb;
 	void *user_data;
 #endif
@@ -254,7 +255,7 @@ static void set_baudrate(const struct device *dev, uint32_t baud_rate)
 			} else {
 				bauderr = tmpbaud - baud;
 			}
-			if (((bauderr * 100) / baud) < 3) {
+			if (((bauderr * 1000) / baud) < 3) {
 				break;
 			}
 		}
@@ -270,6 +271,25 @@ static void set_baudrate(const struct device *dev, uint32_t baud_rate)
 	}
 }
 
+#ifdef CONFIG_UART_INTERRUPT_DRIVEN
+
+/**
+ * @brief Trigger a UART callback based on a timer.
+ *
+ * @param timer Timer that triggered the callback
+ */
+static void uart_xlnx_ps_soft_isr(struct k_timer *timer)
+{
+	struct uart_xlnx_ps_dev_data_t *data =
+		CONTAINER_OF(timer, struct uart_xlnx_ps_dev_data_t, timer);
+
+	if (data->user_cb) {
+		data->user_cb(data->dev, data->user_data);
+	}
+}
+
+#endif
+
 /**
  * @brief Initialize individual UART port
  *
@@ -290,9 +310,6 @@ static int uart_xlnx_ps_init(const struct device *dev)
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
 
-	/* Disable RX/TX before changing any configuration data */
-	xlnx_ps_disable_uart(reg_base);
-
 #ifdef CONFIG_PINCTRL
 	err = pinctrl_apply_state(dev_cfg->pincfg, PINCTRL_STATE_DEFAULT);
 	if (err < 0) {
@@ -300,12 +317,15 @@ static int uart_xlnx_ps_init(const struct device *dev)
 	}
 #endif
 
+	/* Set RX/TX reset and disable RX/TX */
+	sys_write32(XUARTPS_CR_STOPBRK | XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS | XUARTPS_CR_TXRST |
+			    XUARTPS_CR_RXRST,
+		    reg_base + XUARTPS_CR_OFFSET);
+
 	/* Set initial character length / start/stop bit / parity configuration */
 	reg_val = sys_read32(reg_base + XUARTPS_MR_OFFSET);
-	reg_val &= (~(XUARTPS_MR_CHARLEN_MASK | XUARTPS_MR_STOPMODE_MASK |
-		    XUARTPS_MR_PARITY_MASK));
-	reg_val |= XUARTPS_MR_CHARLEN_8_BIT | XUARTPS_MR_STOPMODE_1_BIT |
-		   XUARTPS_MR_PARITY_NONE;
+	reg_val &= (~(XUARTPS_MR_CHARLEN_MASK | XUARTPS_MR_STOPMODE_MASK | XUARTPS_MR_PARITY_MASK));
+	reg_val |= XUARTPS_MR_CHARLEN_8_BIT | XUARTPS_MR_STOPMODE_1_BIT | XUARTPS_MR_PARITY_NONE;
 	sys_write32(reg_val, reg_base + XUARTPS_MR_OFFSET);
 
 	/* Set RX FIFO trigger at 1 data bytes. */
@@ -318,10 +338,14 @@ static int uart_xlnx_ps_init(const struct device *dev)
 	set_baudrate(dev, dev_cfg->baud_rate);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
+	struct uart_xlnx_ps_dev_data_t *dev_data = dev->data;
 
 	/* Clear any pending interrupt flags */
 	sys_write32(XUARTPS_IXR_MASK, reg_base + XUARTPS_ISR_OFFSET);
 
+	dev_data->dev = dev;
+	k_timer_init(&dev_data->timer, &uart_xlnx_ps_soft_isr, NULL);
+
 	/* Attach to & unmask the corresponding interrupt vector */
 	dev_cfg->irq_config_func(dev);
 
@@ -356,7 +380,7 @@ static int uart_xlnx_ps_poll_in(const struct device *dev, unsigned char *c)
 /**
  * @brief Output a character in polled mode.
  *
- * Checks if the transmitter is empty. If empty, a character is written to
+ * Checks if the transmitter has available TX FIFO space. If so, a character is written to
  * the data register.
  *
  * If the hardware flow control is enabled then the handshake signal CTS has to
@@ -370,18 +394,54 @@ static int uart_xlnx_ps_poll_in(const struct device *dev, unsigned char *c)
 static void uart_xlnx_ps_poll_out(const struct device *dev, unsigned char c)
 {
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
-	uint32_t reg_val;
 
-	/* wait for transmitter to ready to accept a character */
-	do {
-		reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
-	} while ((reg_val & XUARTPS_SR_TXEMPTY) == 0);
+	/* wait for transmitter to be ready to accept a character */
+	while ((sys_read32(reg_base + XUARTPS_SR_OFFSET) & XUARTPS_SR_TXFULL) != 0) {
+	}
 
 	sys_write32((uint32_t)(c & 0xFF), reg_base + XUARTPS_FIFO_OFFSET);
+}
+
+/**
+ * Check for pending TX/TX errors on the port.
+ *
+ * @param dev UART device struct
+ * @return 0 if no errors, UART_ERROR_* flags otherwise
+ */
+static int uart_xlnx_ps_err_check(const struct device *dev)
+{
+	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
+	uint32_t reg_val = sys_read32(reg_base + XUARTPS_ISR_OFFSET);
+	int err = 0;
+
+	if (reg_val & XUARTPS_IXR_RBRK) {
+		err |= UART_BREAK;
+	}
+
+	if (reg_val & XUARTPS_IXR_TOVR) {
+		err |= UART_ERROR_OVERRUN;
+	}
+
+	if (reg_val & XUARTPS_IXR_TOUT) {
+		err |= UART_ERROR_NOISE;
+	}
 
-	do {
-		reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
-	} while ((reg_val & XUARTPS_SR_TXEMPTY) == 0);
+	if (reg_val & XUARTPS_IXR_PARITY) {
+		err |= UART_ERROR_PARITY;
+	}
+
+	if (reg_val & XUARTPS_IXR_FRAMING) {
+		err |= UART_ERROR_FRAMING;
+	}
+
+	if (reg_val & XUARTPS_IXR_RXOVR) {
+		err |= UART_ERROR_OVERRUN;
+	}
+	sys_write32(reg_val & (XUARTPS_IXR_RBRK | XUARTPS_IXR_TOVR | XUARTPS_IXR_TOUT |
+			       XUARTPS_IXR_PARITY | XUARTPS_IXR_FRAMING | XUARTPS_IXR_RXOVR),
+		    reg_base + XUARTPS_ISR_OFFSET);
+
+	return err;
 }
 
 /**
@@ -403,9 +463,7 @@ static void uart_xlnx_ps_poll_out(const struct device *dev, unsigned char c)
  *         as all parity modes supported by the API are also supported
  *         by the hardware.
  */
-static inline bool uart_xlnx_ps_cfg2ll_parity(
-	uint32_t *mode_reg,
-	enum uart_config_parity parity)
+static inline bool uart_xlnx_ps_cfg2ll_parity(uint32_t *mode_reg, enum uart_config_parity parity)
 {
 	/*
 	 * Translate the new parity configuration to the mode register's
@@ -457,9 +515,8 @@ static inline bool uart_xlnx_ps_cfg2ll_parity(
  * @return Indication of success or failure in case of an unsupported
  *         stop bit configuration being provided by the caller.
  */
-static inline bool uart_xlnx_ps_cfg2ll_stopbits(
-	uint32_t *mode_reg,
-	enum uart_config_stop_bits stopbits)
+static inline bool uart_xlnx_ps_cfg2ll_stopbits(uint32_t *mode_reg,
+						enum uart_config_stop_bits stopbits)
 {
 	/*
 	 * Translate the new stop bit configuration to the mode register's
@@ -507,9 +564,8 @@ static inline bool uart_xlnx_ps_cfg2ll_stopbits(
  * @return Indication of success or failure in case of an unsupported
  *         data bit configuration being provided by the caller.
  */
-static inline bool uart_xlnx_ps_cfg2ll_databits(
-	uint32_t *mode_reg,
-	enum uart_config_data_bits databits)
+static inline bool uart_xlnx_ps_cfg2ll_databits(uint32_t *mode_reg,
+						enum uart_config_data_bits databits)
 {
 	/*
 	 * Translate the new data bit configuration to the mode register's
@@ -559,9 +615,8 @@ static inline bool uart_xlnx_ps_cfg2ll_databits(
  * @return Indication of success or failure in case of an unsupported
  *         flow control configuration being provided by the caller.
  */
-static inline bool uart_xlnx_ps_cfg2ll_hwctrl(
-	uint32_t *modemcr_reg,
-	enum uart_config_flow_control hwctrl)
+static inline bool uart_xlnx_ps_cfg2ll_hwctrl(uint32_t *modemcr_reg,
+					      enum uart_config_flow_control hwctrl)
 {
 	/*
 	 * Translate the new flow control configuration to the modem
@@ -572,7 +627,7 @@ static inline bool uart_xlnx_ps_cfg2ll_hwctrl(
 
 	if (hwctrl == UART_CFG_FLOW_CTRL_RTS_CTS) {
 		*modemcr_reg |= XUARTPS_MODEMCR_FCM_RTS_CTS;
-	} else if (hwctrl ==  UART_CFG_FLOW_CTRL_NONE) {
+	} else if (hwctrl == UART_CFG_FLOW_CTRL_NONE) {
 		*modemcr_reg |= XUARTPS_MODEMCR_FCM_NONE;
 	} else {
 		/* Only no flow control or RTS/CTS is supported. */
@@ -595,31 +650,29 @@ static inline bool uart_xlnx_ps_cfg2ll_hwctrl(
  * @return 0 if the configuration completed successfully, ENOTSUP
  *         error if an unsupported configuration parameter is detected.
  */
-static int uart_xlnx_ps_configure(const struct device *dev,
-				  const struct uart_config *cfg)
+static int uart_xlnx_ps_configure(const struct device *dev, const struct uart_config *cfg)
 {
-	struct uart_xlnx_ps_dev_config *dev_cfg =
-	(struct uart_xlnx_ps_dev_config *)dev->config;
+	struct uart_xlnx_ps_dev_config *dev_cfg = (struct uart_xlnx_ps_dev_config *)dev->config;
 
-	uintptr_t reg_base   = DEVICE_MMIO_GET(dev);
-	uint32_t mode_reg    = 0;
+	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
+	uint32_t mode_reg = 0;
 	uint32_t modemcr_reg = 0;
 
 	/* Read the current mode register & modem control register values */
-	mode_reg    = sys_read32(reg_base + XUARTPS_MR_OFFSET);
+	mode_reg = sys_read32(reg_base + XUARTPS_MR_OFFSET);
 	modemcr_reg = sys_read32(reg_base + XUARTPS_MODEMCR_OFFSET);
 
 	/* Mask out all items that might be re-configured */
-	mode_reg    &= (~XUARTPS_MR_PARITY_MASK);
-	mode_reg    &= (~XUARTPS_MR_STOPMODE_MASK);
-	mode_reg    &= (~XUARTPS_MR_CHARLEN_MASK);
+	mode_reg &= (~XUARTPS_MR_PARITY_MASK);
+	mode_reg &= (~XUARTPS_MR_STOPMODE_MASK);
+	mode_reg &= (~XUARTPS_MR_CHARLEN_MASK);
 	modemcr_reg &= (~XUARTPS_MODEMCR_FCM_MASK);
 
 	/* Assemble the updated registers, validity checks contained within */
 	if ((!uart_xlnx_ps_cfg2ll_parity(&mode_reg, cfg->parity)) ||
-		(!uart_xlnx_ps_cfg2ll_stopbits(&mode_reg, cfg->stop_bits)) ||
-		(!uart_xlnx_ps_cfg2ll_databits(&mode_reg, cfg->data_bits)) ||
-		(!uart_xlnx_ps_cfg2ll_hwctrl(&modemcr_reg, cfg->flow_ctrl))) {
+	    (!uart_xlnx_ps_cfg2ll_stopbits(&mode_reg, cfg->stop_bits)) ||
+	    (!uart_xlnx_ps_cfg2ll_databits(&mode_reg, cfg->data_bits)) ||
+	    (!uart_xlnx_ps_cfg2ll_hwctrl(&modemcr_reg, cfg->flow_ctrl))) {
 		return -ENOTSUP;
 	}
 
@@ -631,7 +684,7 @@ static int uart_xlnx_ps_configure(const struct device *dev,
 	dev_cfg->baud_rate = cfg->baudrate;
 
 	/* Write the two control registers */
-	sys_write32(mode_reg,    reg_base + XUARTPS_MR_OFFSET);
+	sys_write32(mode_reg, reg_base + XUARTPS_MR_OFFSET);
 	sys_write32(modemcr_reg, reg_base + XUARTPS_MODEMCR_OFFSET);
 
 	/* Re-enable the controller */
@@ -655,8 +708,7 @@ static int uart_xlnx_ps_configure(const struct device *dev,
  * @return The current parity setting mapped to the UART driver API's
  *         enum type.
  */
-static inline enum uart_config_parity uart_xlnx_ps_ll2cfg_parity(
-	uint32_t mode_reg)
+static inline enum uart_config_parity uart_xlnx_ps_ll2cfg_parity(uint32_t mode_reg)
 {
 	/*
 	 * Obtain the current parity configuration from the mode register's
@@ -697,8 +749,7 @@ static inline enum uart_config_parity uart_xlnx_ps_ll2cfg_parity(
  * @return The current stop bit setting mapped to the UART driver API's
  *         enum type.
  */
-static inline enum uart_config_stop_bits uart_xlnx_ps_ll2cfg_stopbits(
-	uint32_t mode_reg)
+static inline enum uart_config_stop_bits uart_xlnx_ps_ll2cfg_stopbits(uint32_t mode_reg)
 {
 	/*
 	 * Obtain the current stop bit configuration from the mode register's
@@ -734,8 +785,7 @@ static inline enum uart_config_stop_bits uart_xlnx_ps_ll2cfg_stopbits(
  * @return The current data bit setting mapped to the UART driver API's
  *         enum type.
  */
-static inline enum uart_config_data_bits uart_xlnx_ps_ll2cfg_databits(
-	uint32_t mode_reg)
+static inline enum uart_config_data_bits uart_xlnx_ps_ll2cfg_databits(uint32_t mode_reg)
 {
 	/*
 	 * Obtain the current data bit configuration from the mode register's
@@ -770,8 +820,7 @@ static inline enum uart_config_data_bits uart_xlnx_ps_ll2cfg_databits(
  * @return The current flow control setting mapped to the UART driver API's
  *         enum type.
  */
-static inline enum uart_config_flow_control uart_xlnx_ps_ll2cfg_hwctrl(
-	uint32_t modemcr_reg)
+static inline enum uart_config_flow_control uart_xlnx_ps_ll2cfg_hwctrl(uint32_t modemcr_reg)
 {
 	/*
 	 * Obtain the current flow control configuration from the modem
@@ -780,8 +829,7 @@ static inline enum uart_config_flow_control uart_xlnx_ps_ll2cfg_hwctrl(
 	 *  1b : RTS/CTS
 	 */
 
-	if ((modemcr_reg & XUARTPS_MODEMCR_FCM_MASK)
-		== XUARTPS_MODEMCR_FCM_RTS_CTS) {
+	if ((modemcr_reg & XUARTPS_MODEMCR_FCM_MASK) == XUARTPS_MODEMCR_FCM_RTS_CTS) {
 		return UART_CFG_FLOW_CTRL_RTS_CTS;
 	}
 
@@ -802,8 +850,7 @@ static inline enum uart_config_flow_control uart_xlnx_ps_ll2cfg_hwctrl(
  *
  * @return always 0.
  */
-static int uart_xlnx_ps_config_get(const struct device *dev,
-				   struct uart_config *cfg)
+static int uart_xlnx_ps_config_get(const struct device *dev, struct uart_config *cfg)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = dev->config;
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
@@ -814,11 +861,11 @@ static int uart_xlnx_ps_config_get(const struct device *dev,
 	 * Register) and the current flow control setting (Modem
 	 * Control register).
 	 */
-	uint32_t mode_reg    = sys_read32(reg_base + XUARTPS_MR_OFFSET);
+	uint32_t mode_reg = sys_read32(reg_base + XUARTPS_MR_OFFSET);
 	uint32_t modemcr_reg = sys_read32(reg_base + XUARTPS_MODEMCR_OFFSET);
 
-	cfg->baudrate  = dev_cfg->baud_rate;
-	cfg->parity    = uart_xlnx_ps_ll2cfg_parity(mode_reg);
+	cfg->baudrate = dev_cfg->baud_rate;
+	cfg->parity = uart_xlnx_ps_ll2cfg_parity(mode_reg);
 	cfg->stop_bits = uart_xlnx_ps_ll2cfg_stopbits(mode_reg);
 	cfg->data_bits = uart_xlnx_ps_ll2cfg_databits(mode_reg);
 	cfg->flow_ctrl = uart_xlnx_ps_ll2cfg_hwctrl(modemcr_reg);
@@ -838,22 +885,17 @@ static int uart_xlnx_ps_config_get(const struct device *dev,
  *
  * @return Number of bytes sent
  */
-static int uart_xlnx_ps_fifo_fill(const struct device *dev,
-				  const uint8_t *tx_data,
-				  int size)
+static int uart_xlnx_ps_fifo_fill(const struct device *dev, const uint8_t *tx_data, int size)
 {
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
-	uint32_t data_iter = 0;
+	int count = 0;
 
-	sys_write32(XUARTPS_IXR_TXEMPTY, reg_base + XUARTPS_IDR_OFFSET);
-	while (size--) {
-		while ((sys_read32(reg_base + XUARTPS_SR_OFFSET) & XUARTPS_SR_TXFULL) != 0) {
-		}
-		sys_write32((uint32_t)tx_data[data_iter++], reg_base + XUARTPS_FIFO_OFFSET);
+	while (count < size &&
+	       (sys_read32(reg_base + XUARTPS_SR_OFFSET) & XUARTPS_SR_TXFULL) == 0) {
+		sys_write32((uint32_t)tx_data[count++], reg_base + XUARTPS_FIFO_OFFSET);
 	}
-	sys_write32(XUARTPS_IXR_TXEMPTY, reg_base + XUARTPS_IER_OFFSET);
 
-	return data_iter;
+	return count;
 }
 
 /**
@@ -865,21 +907,17 @@ static int uart_xlnx_ps_fifo_fill(const struct device *dev,
  *
  * @return Number of bytes read
  */
-static int uart_xlnx_ps_fifo_read(const struct device *dev, uint8_t *rx_data,
-				  const int size)
+static int uart_xlnx_ps_fifo_read(const struct device *dev, uint8_t *rx_data, const int size)
 {
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
-	uint32_t reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
-	int inum = 0;
+	int count = 0;
 
-	while (inum < size && (reg_val & XUARTPS_SR_RXEMPTY) == 0) {
-		rx_data[inum] = (uint8_t)sys_read32(reg_base
-				+ XUARTPS_FIFO_OFFSET);
-		inum++;
-		reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
+	while (count < size &&
+	       (sys_read32(reg_base + XUARTPS_SR_OFFSET) & XUARTPS_SR_RXEMPTY) == 0) {
+		rx_data[count++] = (uint8_t)sys_read32(reg_base + XUARTPS_FIFO_OFFSET);
 	}
 
-	return inum;
+	return count;
 }
 
 /**
@@ -889,11 +927,20 @@ static int uart_xlnx_ps_fifo_read(const struct device *dev, uint8_t *rx_data,
  */
 static void uart_xlnx_ps_irq_tx_enable(const struct device *dev)
 {
+	struct uart_xlnx_ps_dev_data_t *dev_data = dev->data;
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
 
-	sys_write32(
-		(XUARTPS_IXR_TTRIG | XUARTPS_IXR_TXEMPTY),
-		reg_base + XUARTPS_IER_OFFSET);
+	sys_write32((XUARTPS_IXR_TTRIG | XUARTPS_IXR_TXEMPTY), reg_base + XUARTPS_IER_OFFSET);
+	if ((sys_read32(reg_base + XUARTPS_SR_OFFSET) & (XUARTPS_SR_TTRIG | XUARTPS_SR_TXEMPTY)) !=
+	    0) {
+		/*
+		 * Enabling TX empty interrupts does not cause an interrupt
+		 * if the FIFO is already empty.
+		 * Generate a soft interrupt and have it call the
+		 * callback function in timer isr context.
+		 */
+		k_timer_start(&dev_data->timer, K_NO_WAIT, K_NO_WAIT);
+	}
 }
 
 /**
@@ -905,9 +952,7 @@ static void uart_xlnx_ps_irq_tx_disable(const struct device *dev)
 {
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
 
-	sys_write32(
-		(XUARTPS_IXR_TTRIG | XUARTPS_IXR_TXEMPTY),
-		reg_base + XUARTPS_IDR_OFFSET);
+	sys_write32((XUARTPS_IXR_TTRIG | XUARTPS_IXR_TXEMPTY), reg_base + XUARTPS_IDR_OFFSET);
 }
 
 /**
@@ -941,11 +986,7 @@ static int uart_xlnx_ps_irq_tx_complete(const struct device *dev)
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
 	uint32_t reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
 
-	if ((reg_val & XUARTPS_SR_TXEMPTY) == 0) {
-		return 0;
-	} else {
-		return 1;
-	}
+	return (reg_val & XUARTPS_SR_TXEMPTY) != 0;
 }
 
 /**
@@ -955,9 +996,19 @@ static int uart_xlnx_ps_irq_tx_complete(const struct device *dev)
  */
 static void uart_xlnx_ps_irq_rx_enable(const struct device *dev)
 {
+	struct uart_xlnx_ps_dev_data_t *dev_data = dev->data;
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
 
 	sys_write32(XUARTPS_IXR_RTRIG, reg_base + XUARTPS_IER_OFFSET);
+	if ((sys_read32(reg_base + XUARTPS_SR_OFFSET) & XUARTPS_SR_RXEMPTY) == 0) {
+		/*
+		 * Enabling RX trigger interrupts does not cause an interrupt
+		 * if the FIFO already contains RX data.
+		 * Generate a soft interrupt and have it call the
+		 * callback function in timer isr context.
+		 */
+		k_timer_start(&dev_data->timer, K_NO_WAIT, K_NO_WAIT);
+	}
 }
 
 /**
@@ -982,14 +1033,9 @@ static void uart_xlnx_ps_irq_rx_disable(const struct device *dev)
 static int uart_xlnx_ps_irq_rx_ready(const struct device *dev)
 {
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
-	uint32_t reg_val = sys_read32(reg_base + XUARTPS_ISR_OFFSET);
+	uint32_t reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
 
-	if ((reg_val & XUARTPS_IXR_RTRIG) == 0) {
-		return 0;
-	} else {
-		sys_write32(XUARTPS_IXR_RTRIG, reg_base + XUARTPS_ISR_OFFSET);
-		return 1;
-	}
+	return (reg_val & XUARTPS_SR_RXEMPTY) == 0;
 }
 
 /**
@@ -1001,13 +1047,13 @@ static void uart_xlnx_ps_irq_err_enable(const struct device *dev)
 {
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
 
-	sys_write32(
-		  XUARTPS_IXR_TOVR    /* [12] Transmitter FIFO Overflow */
-		| XUARTPS_IXR_TOUT    /* [8]  Receiver Timerout */
-		| XUARTPS_IXR_PARITY  /* [7]  Parity Error */
-		| XUARTPS_IXR_FRAMING /* [6]  Receiver Framing Error */
-		| XUARTPS_IXR_RXOVR,  /* [5]  Receiver Overflow Error */
-	    reg_base + XUARTPS_IER_OFFSET);
+	sys_write32(XUARTPS_IXR_RBRK              /* [13] Receiver Break */
+			    | XUARTPS_IXR_TOVR    /* [12] Transmitter FIFO Overflow */
+			    | XUARTPS_IXR_TOUT    /* [8]  Receiver Timerout */
+			    | XUARTPS_IXR_PARITY  /* [7]  Parity Error */
+			    | XUARTPS_IXR_FRAMING /* [6]  Receiver Framing Error */
+			    | XUARTPS_IXR_RXOVR,  /* [5]  Receiver Overflow Error */
+		    reg_base + XUARTPS_IER_OFFSET);
 }
 
 /**
@@ -1021,13 +1067,13 @@ static void uart_xlnx_ps_irq_err_disable(const struct device *dev)
 {
 	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
 
-	sys_write32(
-		  XUARTPS_IXR_TOVR    /* [12] Transmitter FIFO Overflow */
-		| XUARTPS_IXR_TOUT    /* [8]  Receiver Timerout */
-		| XUARTPS_IXR_PARITY  /* [7]  Parity Error */
-		| XUARTPS_IXR_FRAMING /* [6]  Receiver Framing Error */
-		| XUARTPS_IXR_RXOVR,  /* [5]  Receiver Overflow Error */
-	    reg_base + XUARTPS_IDR_OFFSET);
+	sys_write32(XUARTPS_IXR_RBRK              /* [13] Receiver Break */
+			    | XUARTPS_IXR_TOVR    /* [12] Transmitter FIFO Overflow */
+			    | XUARTPS_IXR_TOUT    /* [8]  Receiver Timerout */
+			    | XUARTPS_IXR_PARITY  /* [7]  Parity Error */
+			    | XUARTPS_IXR_FRAMING /* [6]  Receiver Framing Error */
+			    | XUARTPS_IXR_RXOVR,  /* [5]  Receiver Overflow Error */
+		    reg_base + XUARTPS_IDR_OFFSET);
 }
 
 /**
@@ -1059,7 +1105,11 @@ static int uart_xlnx_ps_irq_is_pending(const struct device *dev)
  */
 static int uart_xlnx_ps_irq_update(const struct device *dev)
 {
-	ARG_UNUSED(dev);
+	uintptr_t reg_base = DEVICE_MMIO_GET(dev);
+
+	/* Clear RX/TX interrupts */
+	sys_write32(XUARTPS_IXR_TTRIG | XUARTPS_IXR_TXEMPTY | XUARTPS_IXR_RTRIG,
+		    reg_base + XUARTPS_ISR_OFFSET);
 	return 1;
 }
 
@@ -1070,8 +1120,7 @@ static int uart_xlnx_ps_irq_update(const struct device *dev)
  * @param cb Callback function pointer.
  */
 static void uart_xlnx_ps_irq_callback_set(const struct device *dev,
-					    uart_irq_callback_user_data_t cb,
-					    void *cb_data)
+					  uart_irq_callback_user_data_t cb, void *cb_data)
 {
 	struct uart_xlnx_ps_dev_data_t *dev_data = dev->data;
 
@@ -1099,6 +1148,7 @@ static void uart_xlnx_ps_isr(const struct device *dev)
 static DEVICE_API(uart, uart_xlnx_ps_driver_api) = {
 	.poll_in = uart_xlnx_ps_poll_in,
 	.poll_out = uart_xlnx_ps_poll_out,
+	.err_check = uart_xlnx_ps_err_check,
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
 	.configure = uart_xlnx_ps_configure,
 	.config_get = uart_xlnx_ps_config_get,
@@ -1123,18 +1173,15 @@ static DEVICE_API(uart, uart_xlnx_ps_driver_api) = {
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
-#define UART_XLNX_PS_IRQ_CONF_FUNC_SET(port) \
-	.irq_config_func = uart_xlnx_ps_irq_config_##port,
-
-#define UART_XLNX_PS_IRQ_CONF_FUNC(port) \
-static void uart_xlnx_ps_irq_config_##port(const struct device *dev) \
-{ \
-	IRQ_CONNECT(DT_INST_IRQN(port), \
-	DT_INST_IRQ(port, priority), \
-	uart_xlnx_ps_isr, DEVICE_DT_INST_GET(port), \
-	0); \
-	irq_enable(DT_INST_IRQN(port)); \
-}
+#define UART_XLNX_PS_IRQ_CONF_FUNC_SET(port) .irq_config_func = uart_xlnx_ps_irq_config_##port,
+
+#define UART_XLNX_PS_IRQ_CONF_FUNC(port)                                                           \
+	static void uart_xlnx_ps_irq_config_##port(const struct device *dev)                       \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(port), DT_INST_IRQ(port, priority), uart_xlnx_ps_isr,     \
+			    DEVICE_DT_INST_GET(port), 0);                                          \
+		irq_enable(DT_INST_IRQN(port));                                                    \
+	}
 
 #else
 
@@ -1143,40 +1190,34 @@ static void uart_xlnx_ps_irq_config_##port(const struct device *dev) \
 
 #endif /*CONFIG_UART_INTERRUPT_DRIVEN */
 
-#define UART_XLNX_PS_DEV_DATA(port) \
-static struct uart_xlnx_ps_dev_data_t uart_xlnx_ps_dev_data_##port
+#define UART_XLNX_PS_DEV_DATA(port)                                                                \
+	static struct uart_xlnx_ps_dev_data_t uart_xlnx_ps_dev_data_##port
 
 #if CONFIG_PINCTRL
 #define UART_XLNX_PS_PINCTRL_DEFINE(port) PINCTRL_DT_INST_DEFINE(port);
-#define UART_XLNX_PS_PINCTRL_INIT(port) .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(port),
+#define UART_XLNX_PS_PINCTRL_INIT(port)   .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(port),
 #else
 #define UART_XLNX_PS_PINCTRL_DEFINE(port)
 #define UART_XLNX_PS_PINCTRL_INIT(port)
 #endif /* CONFIG_PINCTRL */
 
-#define UART_XLNX_PS_DEV_CFG(port) \
-static struct uart_xlnx_ps_dev_config uart_xlnx_ps_dev_cfg_##port = { \
-	DEVICE_MMIO_ROM_INIT(DT_DRV_INST(port)), \
-	.sys_clk_freq = DT_INST_PROP(port, clock_frequency), \
-	.baud_rate = DT_INST_PROP(port, current_speed), \
-	UART_XLNX_PS_IRQ_CONF_FUNC_SET(port) \
-	UART_XLNX_PS_PINCTRL_INIT(port) \
-}
-
-#define UART_XLNX_PS_INIT(port) \
-DEVICE_DT_INST_DEFINE(port, \
-	uart_xlnx_ps_init, \
-	NULL, \
-	&uart_xlnx_ps_dev_data_##port, \
-	&uart_xlnx_ps_dev_cfg_##port, \
-	PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, \
-	&uart_xlnx_ps_driver_api)
-
-#define UART_XLNX_INSTANTIATE(inst)		\
-	UART_XLNX_PS_PINCTRL_DEFINE(inst)	\
-	UART_XLNX_PS_IRQ_CONF_FUNC(inst);	\
-	UART_XLNX_PS_DEV_DATA(inst);		\
-	UART_XLNX_PS_DEV_CFG(inst);		\
+#define UART_XLNX_PS_DEV_CFG(port)                                                                 \
+	static struct uart_xlnx_ps_dev_config uart_xlnx_ps_dev_cfg_##port = {                      \
+		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(port)),                                           \
+		.sys_clk_freq = DT_INST_PROP(port, clock_frequency),                               \
+		.baud_rate = DT_INST_PROP(port, current_speed),                                    \
+		UART_XLNX_PS_IRQ_CONF_FUNC_SET(port) UART_XLNX_PS_PINCTRL_INIT(port)}
+
+#define UART_XLNX_PS_INIT(port)                                                                    \
+	DEVICE_DT_INST_DEFINE(port, uart_xlnx_ps_init, NULL, &uart_xlnx_ps_dev_data_##port,        \
+			      &uart_xlnx_ps_dev_cfg_##port, PRE_KERNEL_1,                          \
+			      CONFIG_SERIAL_INIT_PRIORITY, &uart_xlnx_ps_driver_api)
+
+#define UART_XLNX_INSTANTIATE(inst)                                                                \
+	UART_XLNX_PS_PINCTRL_DEFINE(inst)                                                          \
+	UART_XLNX_PS_IRQ_CONF_FUNC(inst);                                                          \
+	UART_XLNX_PS_DEV_DATA(inst);                                                               \
+	UART_XLNX_PS_DEV_CFG(inst);                                                                \
 	UART_XLNX_PS_INIT(inst);
 
 DT_INST_FOREACH_STATUS_OKAY(UART_XLNX_INSTANTIATE)
diff --git a/drivers/spi/CMakeLists.txt b/drivers/spi/CMakeLists.txt
index c120d75ea9cf1..57724a71ad5d8 100644
--- a/drivers/spi/CMakeLists.txt
+++ b/drivers/spi/CMakeLists.txt
@@ -20,6 +20,8 @@ zephyr_library_sources_ifdef(CONFIG_SPI_AMBIQ_SPID spi_ambiq_spid.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_ANDES_ATCSPI200 spi_andes_atcspi200.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_BITBANG spi_bitbang.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_CC13XX_CC26XX spi_cc13xx_cc26xx.c)
+zephyr_library_sources_ifdef(CONFIG_SPI_CC23X0 spi_cc23x0.c)
+zephyr_library_sources_ifdef(CONFIG_SPI_CDNS spi_cdns.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_DW spi_dw.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_EMUL spi_emul.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_GD32 spi_gd32.c)
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index e335051daca92..7f2a5996ff040 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -37,6 +37,24 @@ config SPI_RTIO
 	  This option enables the RTIO API calls. RTIO support is
 	  experimental as the API itself is unstable.
 
+if SPI_RTIO
+
+config SPI_RTIO_FALLBACK_MSGS
+	int "Number of available spi_buf structs for the default handler to use"
+	default 4
+	help
+		When RTIO is used with a driver that does not yet implement the submit API
+		natively the submissions are converted back to struct spi_buf values that
+		are given to spi_transfer. This requires some number of msgs be available to convert
+		the submissions into on the stack. MISRA rules dictate we must know this in
+		advance.
+
+		In all likelihood 4 is going to work for everyone, but in case you do end up with
+		an issue where you are using RTIO, your driver does not implement submit natively,
+		and get an error relating to not enough spi msgs this is the Kconfig to manipulate.
+
+endif # SPI_RTIO
+
 config SPI_SLAVE
 	bool "Slave support [EXPERIMENTAL]"
 	select EXPERIMENTAL
@@ -81,6 +99,8 @@ source "drivers/spi/Kconfig.andes_atcspi200"
 source "drivers/spi/Kconfig.b91"
 source "drivers/spi/Kconfig.bitbang"
 source "drivers/spi/Kconfig.cc13xx_cc26xx"
+source "drivers/spi/Kconfig.cc23x0"
+source "drivers/spi/Kconfig.cdns"
 source "drivers/spi/Kconfig.dw"
 source "drivers/spi/Kconfig.esp32"
 source "drivers/spi/Kconfig.gd32"
diff --git a/drivers/spi/Kconfig.cc23x0 b/drivers/spi/Kconfig.cc23x0
new file mode 100644
index 0000000000000..83747b563430a
--- /dev/null
+++ b/drivers/spi/Kconfig.cc23x0
@@ -0,0 +1,12 @@
+# TI CC23x0 SPI configuration options
+
+# Copyright (c) 2024 BayLibre, SAS
+# SPDX-License-Identifier: Apache-2.0
+
+config SPI_CC23X0
+	bool "TI SimpleLink CC23x0 SPI driver"
+	default y
+	depends on DT_HAS_TI_CC23X0_SPI_ENABLED
+	select PINCTRL
+	help
+	  Enable support for the TI SimpleLink CC23x0 SPI peripheral
diff --git a/drivers/spi/Kconfig.cdns b/drivers/spi/Kconfig.cdns
new file mode 100644
index 0000000000000..7bc3166c9b294
--- /dev/null
+++ b/drivers/spi/Kconfig.cdns
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Meta Platforms
+# SPDX-License-Identifier: Apache-2.0
+
+config SPI_CDNS
+	bool "Cadence SPI controller driver"
+	depends on DT_HAS_CDNS_SPI_ENABLED
+	help
+	  Enable the SPI peripherals based on Cadence IP6524
diff --git a/drivers/spi/Kconfig.rpi_pico b/drivers/spi/Kconfig.rpi_pico
index 70bd45f19ecad..64d15b40daf37 100644
--- a/drivers/spi/Kconfig.rpi_pico
+++ b/drivers/spi/Kconfig.rpi_pico
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SPI_RPI_PICO_PIO
-	bool "Raspberry Pi PICO PIO SPI controller driver"
+	bool "Raspberry Pi Pico PIO SPI controller driver"
 	default y
 	depends on DT_HAS_RASPBERRYPI_PICO_SPI_PIO_ENABLED
 	select PICOSDK_USE_PIO
 	select PICOSDK_USE_CLAIM
 	select PINCTRL
 	help
-	  Enable driving SPI via PIO on the PICO
+	  Enable driving SPI via PIO on the Pico
diff --git a/drivers/spi/Kconfig.silabs_eusart b/drivers/spi/Kconfig.silabs_eusart
index 8bffdd7f9d92a..a2644fd13ed8e 100644
--- a/drivers/spi/Kconfig.silabs_eusart
+++ b/drivers/spi/Kconfig.silabs_eusart
@@ -1,6 +1,7 @@
 # Silabs EUSART SPI configuration option
 
 # Copyright (c) 2024 Daikin Comfort Technologies North America, Inc.
+# Copyright (c) 2025 Silicon Laboratories Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 config SPI_SILABS_EUSART
@@ -12,3 +13,16 @@ config SPI_SILABS_EUSART
 	select PINCTRL if SOC_FAMILY_SILABS_S2
 	help
 	  Enable the EUSART SPI driver
+
+config SPI_SILABS_EUSART_DMA
+	bool "Silabs EUSART SPI controller driver DMA enabled transfer"
+	depends on SPI_SILABS_EUSART
+	select DMA
+	default y if SPI_ASYNC
+
+config SPI_SILABS_EUSART_DMA_MAX_BLOCKS
+	int "Silabs EUSART SPI controller driver maximum DMA transfer block per channel for a transaction."
+	depends on SPI_SILABS_EUSART_DMA
+	default 8
+	help
+	  One block is needed for every chunk found in the SPI transaction and every 2048 bytes
diff --git a/drivers/spi/Kconfig.stm32 b/drivers/spi/Kconfig.stm32
index 895cc2c190da9..60fe2742babd5 100644
--- a/drivers/spi/Kconfig.stm32
+++ b/drivers/spi/Kconfig.stm32
@@ -8,7 +8,6 @@ menuconfig SPI_STM32
 	default y
 	depends on DT_HAS_ST_STM32_SPI_ENABLED
 	select PINCTRL
-	select USE_STM32_LL_SPI
 	help
 	  Enable SPI support on the STM32 family of processors.
 
diff --git a/drivers/spi/spi_ambiq_bleif.c b/drivers/spi/spi_ambiq_bleif.c
index 299920842fff8..075edc4f8025c 100644
--- a/drivers/spi/spi_ambiq_bleif.c
+++ b/drivers/spi/spi_ambiq_bleif.c
@@ -21,17 +21,12 @@ LOG_MODULE_REGISTER(spi_ambiq_bleif);
 #include <stdlib.h>
 #include <errno.h>
 #include "spi_context.h"
-#include <am_mcu_apollo.h>
-
-#define PWRCTRL_MAX_WAIT_US 5
-
-typedef int (*ambiq_spi_pwr_func_t)(void);
+#include <soc.h>
 
 struct spi_ambiq_config {
 	uint32_t base;
 	int size;
 	const struct pinctrl_dev_config *pcfg;
-	ambiq_spi_pwr_func_t pwr_func;
 };
 
 struct spi_ambiq_data {
@@ -170,17 +165,18 @@ static DEVICE_API(spi, spi_ambiq_driver_api) = {
 static int spi_ambiq_init(const struct device *dev)
 {
 	struct spi_ambiq_data *data = dev->data;
-	const struct spi_ambiq_config *cfg = dev->config;
 	int ret;
 
 #if defined(CONFIG_SPI_AMBIQ_BLEIF_TIMING_TRACE)
+	const struct spi_ambiq_config *cfg = dev->config;
+
 	ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
 	if (ret) {
 		return ret;
 	}
 #endif /* CONFIG_SPI_AMBIQ_BLEIF_TIMING_TRACE */
 
-	ret = am_hal_ble_initialize((cfg->base - BLEIF_BASE) / cfg->size, &data->BLEhandle);
+	ret = am_hal_ble_initialize(0, &data->BLEhandle);
 	if (ret) {
 		return ret;
 	}
@@ -190,29 +186,18 @@ static int spi_ambiq_init(const struct device *dev)
 		return ret;
 	}
 
-	ret = cfg->pwr_func();
-
 	return ret;
 }
 
 #define AMBIQ_SPI_BLEIF_INIT(n)                                                                    \
 	PINCTRL_DT_INST_DEFINE(n);                                                                 \
-	static int pwr_on_ambiq_spi_##n(void)                                                      \
-	{                                                                                          \
-		uint32_t addr = DT_REG_ADDR(DT_INST_PHANDLE(n, ambiq_pwrcfg)) +                    \
-				DT_INST_PHA(n, ambiq_pwrcfg, offset);                              \
-		sys_write32((sys_read32(addr) | DT_INST_PHA(n, ambiq_pwrcfg, mask)), addr);        \
-		k_busy_wait(PWRCTRL_MAX_WAIT_US);                                                  \
-		return 0;                                                                          \
-	}                                                                                          \
 	static struct spi_ambiq_data spi_ambiq_data##n = {                                         \
 		SPI_CONTEXT_INIT_LOCK(spi_ambiq_data##n, ctx),                                     \
 		SPI_CONTEXT_INIT_SYNC(spi_ambiq_data##n, ctx)};                                    \
 	static const struct spi_ambiq_config spi_ambiq_config##n = {                               \
 		.base = DT_INST_REG_ADDR(n),                                                       \
 		.size = DT_INST_REG_SIZE(n),                                                       \
-		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                         \
-		.pwr_func = pwr_on_ambiq_spi_##n};                                                 \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n)};                                        \
 	SPI_DEVICE_DT_INST_DEFINE(n, spi_ambiq_init, NULL, &spi_ambiq_data##n,                     \
 				  &spi_ambiq_config##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,     \
 				  &spi_ambiq_driver_api);
diff --git a/drivers/spi/spi_ambiq_spic.c b/drivers/spi/spi_ambiq_spic.c
index 19e7bf1d14562..3f65b8496dd7a 100644
--- a/drivers/spi/spi_ambiq_spic.c
+++ b/drivers/spi/spi_ambiq_spic.c
@@ -21,18 +21,32 @@ LOG_MODULE_REGISTER(spi_ambiq);
 #include <stdlib.h>
 #include <errno.h>
 #include "spi_context.h"
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
-#define PWRCTRL_MAX_WAIT_US 5
+#include <zephyr/mem_mgmt/mem_attr.h>
 
-typedef int (*ambiq_spi_pwr_func_t)(void);
+#ifdef CONFIG_DCACHE
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#endif /* CONFIG_DCACHE */
+
+#ifdef CONFIG_NOCACHE_MEMORY
+#include <zephyr/linker/linker-defs.h>
+#elif defined(CONFIG_CACHE_MANAGEMENT)
+#include <zephyr/arch/cache.h>
+#endif /* CONFIG_NOCACHE_MEMORY */
+
+#if defined(CONFIG_DCACHE) && !defined(CONFIG_NOCACHE_MEMORY)
+#define SPI_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED 1
+#else
+#define SPI_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED 0
+#endif /* defined(CONFIG_DCACHE) && !defined(CONFIG_NOCACHE_MEMORY) */
 
 struct spi_ambiq_config {
 	uint32_t base;
 	int size;
+	int inst_idx;
 	uint32_t clock_freq;
 	const struct pinctrl_dev_config *pcfg;
-	ambiq_spi_pwr_func_t pwr_func;
 	void (*irq_config_func)(void);
 };
 
@@ -40,7 +54,6 @@ struct spi_ambiq_data {
 	struct spi_context ctx;
 	am_hal_iom_config_t iom_cfg;
 	void *iom_handler;
-	int inst_idx;
 	bool cont;
 	bool pm_policy_state_on;
 };
@@ -76,9 +89,15 @@ static void spi_ambiq_pm_policy_state_lock_put(const struct device *dev)
 }
 
 #ifdef CONFIG_SPI_AMBIQ_DMA
+/*
+ * If Nocache Memory is supported, buffer will be placed in nocache region by
+ * the linker to avoid potential DMA cache-coherency problems.
+ * If Nocache Memory is not supported, cache coherency might need to be kept
+ * manually. See SPI_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED.
+ */
 static __aligned(32) struct {
 	__aligned(32) uint32_t buf[CONFIG_SPI_DMA_TCB_BUFFER_SIZE];
-} spi_dma_tcb_buf[DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)] __attribute__((__section__(".nocache")));
+} spi_dma_tcb_buf[DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT)] __nocache;
 
 static void spi_ambiq_callback(void *callback_ctxt, uint32_t status)
 {
@@ -92,6 +111,41 @@ static void spi_ambiq_callback(void *callback_ctxt, uint32_t status)
 	}
 	spi_context_complete(ctx, dev, (status == AM_HAL_STATUS_SUCCESS) ? 0 : -EIO);
 }
+
+#ifdef CONFIG_DCACHE
+static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
+{
+	bool buf_within_nocache = false;
+
+#ifdef CONFIG_NOCACHE_MEMORY
+	/* Check if buffer is in nocache region defined by the linker */
+	buf_within_nocache = (buf >= ((uintptr_t)_nocache_ram_start)) &&
+			     ((buf + len_bytes - 1) <= ((uintptr_t)_nocache_ram_end));
+	if (buf_within_nocache) {
+		return true;
+	}
+#endif /* CONFIG_NOCACHE_MEMORY */
+
+	/* Check if buffer is in nocache memory region defined in DT */
+	buf_within_nocache =
+		mem_attr_check_buf((void *)buf, len_bytes, DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)) == 0;
+
+	return buf_within_nocache;
+}
+
+static bool spi_buf_set_in_nocache(const struct spi_buf_set *bufs)
+{
+	for (size_t i = 0; i < bufs->count; i++) {
+		const struct spi_buf *buf = &bufs->buffers[i];
+
+		if (!buf_in_nocache((uintptr_t)buf->buf, buf->len)) {
+			return false;
+		}
+	}
+	return true;
+}
+#endif /* CONFIG_DCACHE */
+
 #endif
 
 static void spi_ambiq_reset(const struct device *dev)
@@ -190,7 +244,7 @@ static int spi_config(const struct device *dev, const struct spi_config *config)
 	ctx->config = config;
 
 #ifdef CONFIG_SPI_AMBIQ_DMA
-	data->iom_cfg.pNBTxnBuf = spi_dma_tcb_buf[data->inst_idx].buf;
+	data->iom_cfg.pNBTxnBuf = spi_dma_tcb_buf[cfg->inst_idx].buf;
 	data->iom_cfg.ui32NBTxnBufLength = CONFIG_SPI_DMA_TCB_BUFFER_SIZE;
 #endif
 
@@ -239,6 +293,13 @@ static int spi_ambiq_xfer_half_duplex(const struct device *dev, am_hal_iom_dir_e
 			is_last = true;
 		}
 #ifdef CONFIG_SPI_AMBIQ_DMA
+#if SPI_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED
+		/* Clean Dcache before DMA write */
+		if ((trans.eDirection == AM_HAL_IOM_TX) && (trans.pui32TxBuffer)) {
+			sys_cache_data_flush_range((void *)trans.pui32TxBuffer,
+							    trans.ui32NumBytes);
+		}
+#endif /* SPI_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED */
 		if (AM_HAL_STATUS_SUCCESS !=
 		    am_hal_iom_nonblocking_transfer(data->iom_handler, &trans,
 						    ((is_last == true) ? spi_ambiq_callback : NULL),
@@ -247,6 +308,13 @@ static int spi_ambiq_xfer_half_duplex(const struct device *dev, am_hal_iom_dir_e
 		}
 		if (is_last) {
 			ret = spi_context_wait_for_completion(ctx);
+#if SPI_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED
+			/* Invalidate Dcache after DMA read */
+			if ((trans.eDirection == AM_HAL_IOM_RX) && (trans.pui32RxBuffer)) {
+				sys_cache_data_invd_range((void *)trans.pui32RxBuffer,
+								    trans.ui32NumBytes);
+			}
+#endif /* SPI_AMBIQ_MANUAL_CACHE_COHERENCY_REQUIRED */
 		}
 #else
 		ret = am_hal_iom_blocking_transfer(data->iom_handler, &trans);
@@ -375,6 +443,13 @@ static int spi_ambiq_transceive(const struct device *dev, const struct spi_confi
 		return 0;
 	}
 
+#if defined(CONFIG_SPI_AMBIQ_DMA) && defined(CONFIG_DCACHE)
+	if ((tx_bufs != NULL && !spi_buf_set_in_nocache(tx_bufs)) ||
+	    (rx_bufs != NULL && !spi_buf_set_in_nocache(rx_bufs))) {
+		return -EFAULT;
+	}
+#endif /* CONFIG_DCACHE */
+
 	/* context setup */
 	spi_context_lock(&data->ctx, false, NULL, NULL, config);
 
@@ -431,13 +506,12 @@ static int spi_ambiq_init(const struct device *dev)
 	const struct spi_ambiq_config *cfg = dev->config;
 	int ret = 0;
 
-	if (AM_HAL_STATUS_SUCCESS !=
-	    am_hal_iom_initialize((cfg->base - IOM0_BASE) / cfg->size, &data->iom_handler)) {
+	if (AM_HAL_STATUS_SUCCESS != am_hal_iom_initialize(cfg->inst_idx, &data->iom_handler)) {
 		LOG_ERR("Fail to initialize SPI\n");
 		return -ENXIO;
 	}
 
-	ret = cfg->pwr_func();
+	ret = am_hal_iom_power_ctrl(data->iom_handler, AM_HAL_SYSCTRL_WAKE, false);
 
 	ret |= pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
 	ret |= spi_context_cs_configure_all(&data->ctx);
@@ -491,31 +565,24 @@ static int spi_ambiq_pm_action(const struct device *dev, enum pm_device_action a
 
 #define AMBIQ_SPI_INIT(n)                                                                          \
 	PINCTRL_DT_INST_DEFINE(n);                                                                 \
-	static int pwr_on_ambiq_spi_##n(void)                                                      \
-	{                                                                                          \
-		uint32_t addr = DT_REG_ADDR(DT_INST_PHANDLE(n, ambiq_pwrcfg)) +                    \
-				DT_INST_PHA(n, ambiq_pwrcfg, offset);                              \
-		sys_write32((sys_read32(addr) | DT_INST_PHA(n, ambiq_pwrcfg, mask)), addr);        \
-		k_busy_wait(PWRCTRL_MAX_WAIT_US);                                                  \
-		return 0;                                                                          \
-	}                                                                                          \
 	static void spi_irq_config_func_##n(void)                                                  \
 	{                                                                                          \
-		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), spi_ambiq_isr,              \
-			    DEVICE_DT_INST_GET(n), 0);                                             \
-		irq_enable(DT_INST_IRQN(n));                                                       \
+		IRQ_CONNECT(DT_IRQN(DT_INST_PARENT(n)), DT_IRQ(DT_INST_PARENT(n), priority),       \
+			    spi_ambiq_isr, DEVICE_DT_INST_GET(n), 0);                              \
+		irq_enable(DT_IRQN(DT_INST_PARENT(n)));                                            \
 	};                                                                                         \
 	static struct spi_ambiq_data spi_ambiq_data##n = {                                         \
 		SPI_CONTEXT_INIT_LOCK(spi_ambiq_data##n, ctx),                                     \
 		SPI_CONTEXT_INIT_SYNC(spi_ambiq_data##n, ctx),                                     \
-		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx).inst_idx = n};                \
+		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx)};                             \
 	static const struct spi_ambiq_config spi_ambiq_config##n = {                               \
-		.base = DT_INST_REG_ADDR(n),                                                       \
-		.size = DT_INST_REG_SIZE(n),                                                       \
+		.base = DT_REG_ADDR(DT_INST_PARENT(n)),                                            \
+		.size = DT_REG_SIZE(DT_INST_PARENT(n)),                                            \
+		.inst_idx =                                                                        \
+			(DT_REG_ADDR(DT_INST_PARENT(n)) - IOM0_BASE) / (IOM1_BASE - IOM0_BASE),    \
 		.clock_freq = DT_INST_PROP(n, clock_frequency),                                    \
 		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                         \
-		.irq_config_func = spi_irq_config_func_##n,                                        \
-		.pwr_func = pwr_on_ambiq_spi_##n};                                                 \
+		.irq_config_func = spi_irq_config_func_##n};                                       \
 	PM_DEVICE_DT_INST_DEFINE(n, spi_ambiq_pm_action);                                          \
 	SPI_DEVICE_DT_INST_DEFINE(n, spi_ambiq_init, PM_DEVICE_DT_INST_GET(n), &spi_ambiq_data##n, \
 				  &spi_ambiq_config##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,     \
diff --git a/drivers/spi/spi_ambiq_spid.c b/drivers/spi/spi_ambiq_spid.c
index 822332ac93a8b..9967cadb4649e 100644
--- a/drivers/spi/spi_ambiq_spid.c
+++ b/drivers/spi/spi_ambiq_spid.c
@@ -20,18 +20,15 @@ LOG_MODULE_REGISTER(spi_ambiq_spid);
 #include <stdlib.h>
 #include <errno.h>
 #include "spi_context.h"
-#include <am_mcu_apollo.h>
-
-#define AMBIQ_SPID_PWRCTRL_MAX_WAIT_US 5
-
-typedef int (*ambiq_spi_pwr_func_t)(void);
+#include <soc.h>
 
+#define SPID_ADDR_INTERVAL 1
 struct spi_ambiq_config {
 	const struct gpio_dt_spec int_gpios;
 	uint32_t base;
 	int size;
+	int inst_idx;
 	const struct pinctrl_dev_config *pcfg;
-	ambiq_spi_pwr_func_t pwr_func;
 	void (*irq_config_func)(void);
 };
 
@@ -39,7 +36,6 @@ struct spi_ambiq_data {
 	struct spi_context ctx;
 	am_hal_ios_config_t ios_cfg;
 	void *ios_handler;
-	int inst_idx;
 	struct k_sem spim_wrcmp_sem;
 };
 
@@ -336,13 +332,12 @@ static int spi_ambiq_init(const struct device *dev)
 	const struct spi_ambiq_config *cfg = dev->config;
 	int ret = 0;
 
-	if (AM_HAL_STATUS_SUCCESS !=
-	    am_hal_ios_initialize((cfg->base - IOSLAVE_BASE) / cfg->size, &data->ios_handler)) {
+	if (AM_HAL_STATUS_SUCCESS != am_hal_ios_initialize(cfg->inst_idx, &data->ios_handler)) {
 		LOG_ERR("Fail to initialize SPID\n");
 		return -ENXIO;
 	}
 
-	ret = cfg->pwr_func();
+	ret = am_hal_ios_power_ctrl(data->ios_handler, AM_HAL_SYSCTRL_WAKE, false);
 
 	ret |= pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
 	if (ret < 0) {
@@ -396,14 +391,6 @@ static int spi_ambiq_pm_action(const struct device *dev, enum pm_device_action a
 
 #define AMBIQ_SPID_INIT(n)                                                                         \
 	PINCTRL_DT_INST_DEFINE(n);                                                                 \
-	static int pwr_on_ambiq_spi_##n(void)                                                      \
-	{                                                                                          \
-		uint32_t addr = DT_REG_ADDR(DT_INST_PHANDLE(n, ambiq_pwrcfg)) +                    \
-				DT_INST_PHA(n, ambiq_pwrcfg, offset);                              \
-		sys_write32((sys_read32(addr) | DT_INST_PHA(n, ambiq_pwrcfg, mask)), addr);        \
-		k_busy_wait(AMBIQ_SPID_PWRCTRL_MAX_WAIT_US);                                       \
-		return 0;                                                                          \
-	}                                                                                          \
 	static void spi_irq_config_func_##n(void)                                                  \
 	{                                                                                          \
 		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), spi_ambiq_isr,              \
@@ -413,15 +400,14 @@ static int spi_ambiq_pm_action(const struct device *dev, enum pm_device_action a
 	static struct spi_ambiq_data spi_ambiq_data##n = {                                         \
 		SPI_CONTEXT_INIT_LOCK(spi_ambiq_data##n, ctx),                                     \
 		SPI_CONTEXT_INIT_SYNC(spi_ambiq_data##n, ctx),                                     \
-		.spim_wrcmp_sem = Z_SEM_INITIALIZER(spi_ambiq_data##n.spim_wrcmp_sem, 0, 1),       \
-		.inst_idx = n};                                                                    \
+		.spim_wrcmp_sem = Z_SEM_INITIALIZER(spi_ambiq_data##n.spim_wrcmp_sem, 0, 1)};      \
 	static const struct spi_ambiq_config spi_ambiq_config##n = {                               \
 		.int_gpios = GPIO_DT_SPEC_INST_GET(n, int_gpios),                                  \
 		.base = DT_INST_REG_ADDR(n),                                                       \
 		.size = DT_INST_REG_SIZE(n),                                                       \
+		.inst_idx = (DT_INST_REG_ADDR(n) - IOSLAVE_BASE) / SPID_ADDR_INTERVAL,             \
 		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                         \
-		.irq_config_func = spi_irq_config_func_##n,                                        \
-		.pwr_func = pwr_on_ambiq_spi_##n};                                                 \
+		.irq_config_func = spi_irq_config_func_##n};                                       \
 	PM_DEVICE_DT_INST_DEFINE(n, spi_ambiq_pm_action);                                          \
 	SPI_DEVICE_DT_INST_DEFINE(n, spi_ambiq_init, PM_DEVICE_DT_INST_GET(n), &spi_ambiq_data##n, \
 				  &spi_ambiq_config##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,     \
diff --git a/drivers/spi/spi_b_renesas_ra8.c b/drivers/spi/spi_b_renesas_ra8.c
index d2fbc3a8f797d..6f015eed0cba6 100644
--- a/drivers/spi/spi_b_renesas_ra8.c
+++ b/drivers/spi/spi_b_renesas_ra8.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -402,10 +402,9 @@ static int ra_spi_b_release(const struct device *dev, const struct spi_config *c
 
 static DEVICE_API(spi, ra_spi_driver_api) = {.transceive = ra_spi_b_transceive,
 #ifdef CONFIG_SPI_ASYNC
-							.transceive_async =
-								ra_spi_b_transceive_async,
+					     .transceive_async = ra_spi_b_transceive_async,
 #endif /* CONFIG_SPI_ASYNC */
-							.release = ra_spi_b_release};
+					     .release = ra_spi_b_release};
 
 static spi_b_clock_source_t ra_spi_b_clock_name(const struct device *clock_dev)
 {
@@ -604,15 +603,10 @@ static void ra_spi_eri_isr(const struct device *dev)
 }
 #endif
 
-#define _ELC_EVENT_SPI_RXI(channel) ELC_EVENT_SPI##channel##_RXI
-#define _ELC_EVENT_SPI_TXI(channel) ELC_EVENT_SPI##channel##_TXI
-#define _ELC_EVENT_SPI_TEI(channel) ELC_EVENT_SPI##channel##_TEI
-#define _ELC_EVENT_SPI_ERI(channel) ELC_EVENT_SPI##channel##_ERI
-
-#define ELC_EVENT_SPI_RXI(channel) _ELC_EVENT_SPI_RXI(channel)
-#define ELC_EVENT_SPI_TXI(channel) _ELC_EVENT_SPI_TXI(channel)
-#define ELC_EVENT_SPI_TEI(channel) _ELC_EVENT_SPI_TEI(channel)
-#define ELC_EVENT_SPI_ERI(channel) _ELC_EVENT_SPI_ERI(channel)
+#define EVENT_SPI_RXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _RXI))
+#define EVENT_SPI_TXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _TXI))
+#define EVENT_SPI_TEI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _TEI))
+#define EVENT_SPI_ERI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _ERI))
 
 #if defined(CONFIG_SPI_B_INTERRUPT)
 
@@ -621,13 +615,13 @@ static void ra_spi_eri_isr(const struct device *dev)
 		ARG_UNUSED(dev);                                                                   \
                                                                                                    \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, rxi, irq)] =                               \
-			ELC_EVENT_SPI_RXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_RXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, txi, irq)] =                               \
-			ELC_EVENT_SPI_TXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_TXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, tei, irq)] =                               \
-			ELC_EVENT_SPI_TEI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_TEI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, eri, irq)] =                               \
-			ELC_EVENT_SPI_ERI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_ERI(DT_INST_PROP(index, channel));                               \
                                                                                                    \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, rxi, irq),                                  \
 			    DT_INST_IRQ_BY_NAME(index, rxi, priority), ra_spi_rxi_isr,             \
diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c
index 26a4ad4007c43..68a28fbadc1fe 100644
--- a/drivers/spi/spi_cc13xx_cc26xx.c
+++ b/drivers/spi/spi_cc13xx_cc26xx.c
@@ -81,8 +81,9 @@ static int spi_cc13xx_cc26xx_configure(const struct device *dev,
 		return -EINVAL;
 	}
 
-	if (config->frequency < 2000000) {
-		LOG_ERR("Frequencies lower than 2 MHz are not supported");
+	if (config->frequency < CPU_FREQ / (254 * (255 + 1))) {
+		LOG_ERR("Frequencies lower than %d Hz are not supported",
+			CPU_FREQ / (254 * (255 + 1)));
 		return -EINVAL;
 	}
 
diff --git a/drivers/spi/spi_cc23x0.c b/drivers/spi/spi_cc23x0.c
new file mode 100644
index 0000000000000..0c6e0009fc11d
--- /dev/null
+++ b/drivers/spi/spi_cc23x0.c
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2024 BayLibre, SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_cc23x0_spi
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(spi_cc23x0, CONFIG_SPI_LOG_LEVEL);
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/util.h>
+
+#include <driverlib/clkctl.h>
+#include <driverlib/spi.h>
+
+#include "spi_context.h"
+
+/*
+ * SPI bit rate = (SPI functional clock frequency) / ((SCR + 1) * 2)
+ * Serial clock divider value (SCR) can be from 0 to 1023.
+ */
+#define SPI_CC23_MIN_FREQ	DIV_ROUND_UP(TI_CC23X0_DT_CPU_CLK_FREQ_HZ, 2048)
+#define SPI_CC23_MAX_FREQ	(TI_CC23X0_DT_CPU_CLK_FREQ_HZ >> 1)
+
+#define SPI_CC23_DATA_WIDTH	8
+#define SPI_CC23_DFS		(SPI_CC23_DATA_WIDTH >> 3)
+
+#define SPI_CC23_INT_MASK	(SPI_TXEMPTY | SPI_IDLE | SPI_RX)
+
+struct spi_cc23x0_config {
+	uint32_t base;
+	const struct pinctrl_dev_config *pincfg;
+	void (*irq_config_func)(void);
+};
+
+struct spi_cc23x0_data {
+	struct spi_context ctx;
+	size_t tx_len_left;
+	uint32_t tx_count;
+	uint32_t rx_count;
+	bool xfer_done;
+};
+
+static void spi_cc23x0_isr(const struct device *dev)
+{
+	const struct spi_cc23x0_config *cfg = dev->config;
+	struct spi_cc23x0_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
+	uint32_t txd = 0, rxd;
+	uint32_t status;
+
+	status = SPIIntStatus(cfg->base, true);
+	LOG_DBG("status = %08x", status);
+
+	/*
+	 * Disabling the interrupts in this ISR when SPI has completed
+	 * the transfer triggers a subsequent spurious interrupt, with
+	 * a null status. Let's ignore this event.
+	 */
+	if (!status) {
+		return;
+	}
+
+	if (status & SPI_RX) {
+		/* Rx FIFO contains 1 byte */
+		LOG_DBG("SPI_RX");
+
+		SPIClearInt(cfg->base, SPI_RX);
+
+		SPIGetDataNonBlocking(cfg->base, &rxd);
+
+		if (spi_context_rx_buf_on(ctx)) {
+			*ctx->rx_buf = rxd;
+			spi_context_update_rx(ctx, SPI_CC23_DFS, 1);
+		}
+
+		data->rx_count++;
+	}
+
+	if (status & SPI_IDLE) {
+		/* The byte has been transferred and SPI has moved to idle mode */
+		LOG_DBG("SPI_IDLE (tx_len_left = %d)", data->tx_len_left);
+
+		SPIClearInt(cfg->base, SPI_IDLE);
+
+		if (!data->tx_len_left) {
+			LOG_DBG("xfer_done");
+			data->xfer_done = true;
+		}
+	}
+
+	/*
+	 * Do not push a new Tx byte in the Tx FIFO while the current Rx byte (if any)
+	 * has not been pulled from the Rx FIFO. In other words, Tx count and Rx count
+	 * must be equal so a new Tx byte can be pushed.
+	 */
+	if (status & SPI_TXEMPTY && !data->xfer_done && data->tx_count == data->rx_count) {
+		/*
+		 * The previous byte in the Tx FIFO (if any) has been moved
+		 * to the shift register
+		 */
+		LOG_DBG("SPI_TXEMPTY");
+
+		SPIClearInt(cfg->base, SPI_TXEMPTY);
+
+		if (spi_context_tx_buf_on(ctx)) {
+			txd = *ctx->tx_buf;
+			spi_context_update_tx(ctx, SPI_CC23_DFS, 1);
+		}
+
+		SPIPutDataNonBlocking(cfg->base, txd);
+
+		data->tx_count++;
+		data->tx_len_left--;
+	}
+
+	if (data->xfer_done) {
+		LOG_DBG("complete");
+		SPIDisableInt(cfg->base, SPI_CC23_INT_MASK);
+		spi_context_complete(ctx, dev, 0);
+	}
+}
+
+static int spi_cc23x0_configure(const struct device *dev,
+				const struct spi_config *config)
+{
+	const struct spi_cc23x0_config *cfg = dev->config;
+	struct spi_cc23x0_data *data = dev->data;
+	uint32_t protocol;
+
+	if (spi_context_configured(&data->ctx, config)) {
+		/* Nothing to do */
+		return 0;
+	}
+
+	if (config->operation & SPI_HALF_DUPLEX) {
+		LOG_ERR("Half-duplex is not supported");
+		return -ENOTSUP;
+	}
+
+	/* Peripheral mode has not been implemented */
+	if (SPI_OP_MODE_GET(config->operation) != SPI_OP_MODE_MASTER) {
+		LOG_ERR("Peripheral mode is not supported");
+		return -ENOTSUP;
+	}
+
+	/* Word sizes other than 8 bits has not been implemented */
+	if (SPI_WORD_SIZE_GET(config->operation) != SPI_CC23_DATA_WIDTH) {
+		LOG_ERR("Word sizes other than %d bits are not supported", SPI_CC23_DATA_WIDTH);
+		return -ENOTSUP;
+	}
+
+	if (config->operation & SPI_TRANSFER_LSB) {
+		LOG_ERR("Transfer LSB first mode is not supported");
+		return -EINVAL;
+	}
+
+	if (IS_ENABLED(CONFIG_SPI_EXTENDED_MODES) &&
+	    (config->operation & SPI_LINES_MASK) != SPI_LINES_SINGLE) {
+		LOG_ERR("Multiple lines are not supported");
+		return -EINVAL;
+	}
+
+	if (config->operation & SPI_CS_ACTIVE_HIGH && !spi_cs_is_gpio(config)) {
+		LOG_ERR("Active high CS requires emulation through a GPIO line");
+		return -EINVAL;
+	}
+
+	if (config->frequency < SPI_CC23_MIN_FREQ) {
+		LOG_ERR("Frequencies lower than %d Hz are not supported", SPI_CC23_MIN_FREQ);
+		return -EINVAL;
+	}
+
+	if (config->frequency > SPI_CC23_MAX_FREQ) {
+		LOG_ERR("Frequency greater than %d Hz are not supported", SPI_CC23_MAX_FREQ);
+		return -EINVAL;
+	}
+
+	if (SPI_MODE_GET(config->operation) & SPI_MODE_CPOL) {
+		if (SPI_MODE_GET(config->operation) & SPI_MODE_CPHA) {
+			protocol = SPI_FRF_MOTO_MODE_7;
+		} else {
+			protocol = SPI_FRF_MOTO_MODE_6;
+		}
+	} else {
+		if (SPI_MODE_GET(config->operation) & SPI_MODE_CPHA) {
+			protocol = SPI_FRF_MOTO_MODE_5;
+		} else {
+			protocol = SPI_FRF_MOTO_MODE_4;
+		}
+	}
+
+	/* Enable clock */
+	CLKCTLEnable(CLKCTL_BASE, CLKCTL_SPI0);
+
+	/* Disable SPI before making configuration changes */
+	SPIDisable(cfg->base);
+
+	/* Configure SPI */
+	SPIConfigSetExpClk(cfg->base, TI_CC23X0_DT_CPU_CLK_FREQ_HZ,
+			   protocol, SPI_MODE_CONTROLLER,
+			   config->frequency, SPI_CC23_DATA_WIDTH);
+
+	data->ctx.config = config;
+
+	/* Configure Rx FIFO level */
+	HWREG(cfg->base + SPI_O_IFLS) = SPI_IFLS_RXSEL_LEVEL_1;
+
+	/* Re-enable SPI after making configuration changes */
+	SPIEnable(cfg->base);
+
+	return 0;
+}
+
+static void spi_cc23x0_initialize_data(struct spi_cc23x0_data *data)
+{
+	data->tx_len_left = MAX(spi_context_total_tx_len(&data->ctx),
+				spi_context_total_rx_len(&data->ctx));
+	data->tx_count = 0;
+	data->rx_count = 0;
+	data->xfer_done = false;
+}
+
+static int spi_cc23x0_transceive(const struct device *dev,
+				 const struct spi_config *config,
+				 const struct spi_buf_set *tx_bufs,
+				 const struct spi_buf_set *rx_bufs)
+{
+	const struct spi_cc23x0_config *cfg = dev->config;
+	struct spi_cc23x0_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
+	int ret;
+
+	spi_context_lock(ctx, false, NULL, NULL, config);
+
+	ret = spi_cc23x0_configure(dev, config);
+	if (ret) {
+		goto ctx_release;
+	}
+
+	spi_context_buffers_setup(ctx, tx_bufs, rx_bufs, SPI_CC23_DFS);
+
+	spi_cc23x0_initialize_data(data);
+
+	spi_context_cs_control(ctx, true);
+
+	SPIEnableInt(cfg->base, SPI_CC23_INT_MASK);
+
+	ret = spi_context_wait_for_completion(ctx);
+	if (ret) {
+		SPIDisableInt(cfg->base, SPI_CC23_INT_MASK);
+		LOG_ERR("SPI transfer failed (%d)", ret);
+	} else {
+		LOG_DBG("SPI transfer completed");
+	}
+
+	spi_context_cs_control(ctx, false);
+
+ctx_release:
+	spi_context_release(ctx, ret);
+	return ret;
+}
+
+static int spi_cc23x0_release(const struct device *dev,
+			      const struct spi_config *config)
+{
+	const struct spi_cc23x0_config *cfg = dev->config;
+	struct spi_cc23x0_data *data = dev->data;
+
+	if (!spi_context_configured(&data->ctx, config)) {
+		return -EINVAL;
+	}
+
+	if (SPIBusy(cfg->base)) {
+		return -EBUSY;
+	}
+
+	spi_context_unlock_unconditionally(&data->ctx);
+
+	return 0;
+}
+
+static const struct spi_driver_api spi_cc23x0_driver_api = {
+	.transceive = spi_cc23x0_transceive,
+	.release = spi_cc23x0_release,
+};
+
+static int spi_cc23x0_init(const struct device *dev)
+{
+	const struct spi_cc23x0_config *cfg = dev->config;
+	struct spi_cc23x0_data *data = dev->data;
+	int ret;
+
+	cfg->irq_config_func();
+
+	ret = pinctrl_apply_state(cfg->pincfg, PINCTRL_STATE_DEFAULT);
+	if (ret) {
+		LOG_ERR("Failed to apply SPI pinctrl state");
+		return ret;
+	}
+
+	ret = spi_context_cs_configure_all(&data->ctx);
+	if (ret) {
+		return ret;
+	}
+
+	spi_context_unlock_unconditionally(&data->ctx);
+
+	return 0;
+}
+
+#define SPI_CC23X0_INIT(n)						\
+	PINCTRL_DT_INST_DEFINE(n);					\
+									\
+	static void spi_irq_config_func_##n(void)			\
+	{								\
+		IRQ_CONNECT(DT_INST_IRQN(n),				\
+			    DT_INST_IRQ(n, priority),			\
+			    spi_cc23x0_isr,				\
+			    DEVICE_DT_INST_GET(n), 0);			\
+		irq_enable(DT_INST_IRQN(n));				\
+	};								\
+									\
+	static const struct spi_cc23x0_config spi_cc23x0_config_##n = {	\
+		.base = DT_INST_REG_ADDR(n),				\
+		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),		\
+		.irq_config_func = spi_irq_config_func_##n		\
+	};								\
+									\
+	static struct spi_cc23x0_data spi_cc23x0_data_##n = {		\
+		SPI_CONTEXT_INIT_LOCK(spi_cc23x0_data_##n, ctx),	\
+		SPI_CONTEXT_INIT_SYNC(spi_cc23x0_data_##n, ctx),	\
+		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx)	\
+	};								\
+									\
+	DEVICE_DT_INST_DEFINE(n,					\
+			      spi_cc23x0_init,				\
+			      NULL,					\
+			      &spi_cc23x0_data_##n,			\
+			      &spi_cc23x0_config_##n,			\
+			      POST_KERNEL,				\
+			      CONFIG_SPI_INIT_PRIORITY,			\
+			      &spi_cc23x0_driver_api)
+
+DT_INST_FOREACH_STATUS_OKAY(SPI_CC23X0_INIT)
diff --git a/drivers/spi/spi_cdns.c b/drivers/spi/spi_cdns.c
new file mode 100644
index 0000000000000..22c70bc57b9f1
--- /dev/null
+++ b/drivers/spi/spi_cdns.c
@@ -0,0 +1,871 @@
+/*
+ * Copyright (c) 2024 Meta Platforms
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/sys/util.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(spi_cadence, CONFIG_SPI_LOG_LEVEL);
+
+#include "spi_context.h"
+
+/*******************************************************************************
+ * Macro Definition
+ ******************************************************************************/
+/* Register offset address */
+#define SPI_CONF             0x00
+#define SPI_INT_STATUS       0x04
+#define SPI_INT_ENABLE       0x08
+#define SPI_INT_DISABLE      0x0c
+#define SPI_INT_MASK         0x10
+#define SPI_SPI_ENABLE       0x14
+#define SPI_DELAY            0x18
+#define SPI_TX_DATA          0x1c
+#define SPI_RX_DATA          0x20
+#define SPI_SLAVE_IDLE_COUNT 0x24
+#define SPI_TX_THRESHOLD     0x28
+#define SPI_RX_THRESHOLD     0x2c
+
+/* Configuration register bit offset */
+#define SPI_CONF_PCSL_OFFSET 10
+#define SPI_CONF_MRCS_OFFSET 8
+#define SPI_CONF_TWS_OFFSET  6
+#define SPI_CONF_MBRD_OFFSET 3
+
+/* Configuration register bit mask */
+#define SPI_CONF_TXCLR     BIT(20)
+#define SPI_CONF_RXCLR     BIT(19)
+#define SPI_CONF_SPSE      BIT(18)
+#define SPI_CONF_MFGE      BIT(17)
+#define SPI_CONF_MSC       BIT(16)
+#define SPI_CONF_MSE       BIT(15)
+#define SPI_CONF_MCSE      BIT(14)
+#define SPI_CONF_PCSL_MASK GENMASK(13, 10)
+#define SPI_CONF_PSD       BIT(9)
+#define SPI_CONF_MRCS      BIT(8)
+#define SPI_CONF_TWS_MASK  GENMASK(7, 6)
+#define SPI_CONF_MBRD_MASK GENMASK(5, 3)
+#define SPI_CONF_CPHA      BIT(2)
+#define SPI_CONF_CPOL      BIT(1)
+#define SPI_CONF_MSEL      BIT(0)
+
+#define SPI_CONF_INITIAL_VAL (SPI_CONF_PCSL_MASK | SPI_CONF_MCSE | SPI_CONF_MRCS | SPI_CONF_MSEL)
+
+/* Interrupt register bit mask */
+#define SPI_INT_TUF BIT(6)
+#define SPI_INT_RF  BIT(5)
+#define SPI_INT_RNE BIT(4)
+#define SPI_INT_TF  BIT(3)
+#define SPI_INT_TNF BIT(2)
+#define SPI_INT_MF  BIT(1)
+#define SPI_INT_ROF BIT(0)
+
+#define SPI_INT_DEFAULT (SPI_INT_RNE | SPI_INT_TNF | SPI_INT_ROF | SPI_INT_TUF)
+
+/* SPI enable register bit offset */
+#define SPI_SPI_ENABLE_SPIE BIT(0)
+
+/* Maximum baud rate divisor */
+#define SPI_MBRD_MIN 0
+#define SPI_MBRD_MAX 7
+
+#define SPI_FREQ_LIST_MAX ((SPI_MBRD_MAX + 1) * 2 + 1)
+
+#define SPI_CFG(dev)         ((struct spi_cdns_cfg *)(dev->config))
+#define SPI_REG(dev, offset) ((mem_addr_t)(SPI_CFG(dev)->base + (offset)))
+/*******************************************************************************
+ * Types Definition
+ ******************************************************************************/
+typedef void (*irq_config_func_t)(void);
+
+/**
+ * @brief SPI Driver config information.
+ *
+ * This parameter isn't updated after initialization.
+ *
+ * @param base                         SPI register base address.
+ * @param clock_frequency              Peripheral bus clock
+ * @param ext_clock                    External clock frequency.
+ * @param cs_setup_us                  Array of durations from CS assert to
+ *                                     SCLK in us for slaves.
+ * @param cs_hold_us                   Array of durations from CS assert to
+ *                                     SCLK in us for slaves.
+ * @param irq_config                   Interrupt configuration function.
+ * @param leave_enabled_during_config  Conditionally enable or
+ *                                     disable the SPI bus during
+ *                                     configuration
+ * @param freq_list                    Selectable clock
+ *                                     frequency list.
+ */
+struct spi_cdns_cfg {
+	uint32_t base;
+	uint32_t clock_frequency;
+	uint32_t ext_clock;
+	irq_config_func_t irq_config;
+#ifdef CONFIG_PINCTRL
+	const struct pinctrl_dev_config *pcfg;
+#endif
+	uint8_t fifo_width;
+	uint16_t rx_fifo_depth;
+	uint16_t tx_fifo_depth;
+};
+
+/**
+ * @brief SPI Driver private data.
+ *
+ * @param ctx             Transceive context information.
+ * @param config          Current SPI controller configuration structure
+ * @param freq            Actual transfer frequency.
+ * @param tx_remain_entry Remain entries to Tx-FIFO.
+ * @param fifo_diff       Difference between Tx-FIFO entry and Rx-FIFO entry.
+ */
+struct spi_cdns_data {
+	struct spi_context ctx;
+	struct spi_config config;
+	uint32_t freq;
+	uint32_t tx_remain_entry;
+	int32_t fifo_diff;
+};
+
+/*******************************************************************************
+ * Private Functions Code
+ ******************************************************************************/
+
+/**
+ * @brief Mask-write 32-bit value to register.
+ *
+ * @param addr register address.
+ * @param mask 32-bit Mask value.
+ * @param value 32-bit value to be written.
+ * @return None.
+ */
+static inline void sys_set_mask32(mem_addr_t addr, uint32_t mask, uint32_t value)
+{
+	uint32_t temp = sys_read32(addr);
+
+	temp &= ~(mask);
+	temp |= value;
+
+	sys_write32(temp, addr);
+}
+
+/**
+ * @brief Check whether to update context configuration.
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @param config SPI controller configuration structure
+ * @retval true Configuration is same.
+ * @retval false Configuration is differ.
+ */
+static inline bool spi_cdns_context_configured(const struct device *dev,
+					       const struct spi_config *config)
+{
+	struct spi_cdns_data *data = dev->data;
+
+	if (spi_context_configured(&data->ctx, config) &&
+	    (data->config.frequency == config->frequency) &&
+	    (data->config.operation == config->operation) &&
+	    (data->config.slave == config->slave)) {
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * @brief Enable/Disable SPI controller
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @param on SPI enable flag (True: Enable, False: Disable)
+ * @return None.
+ */
+static inline void spi_cdns_spi_enable(const struct device *dev, bool on)
+{
+	if (on) {
+		sys_set_bits(SPI_REG(dev, SPI_SPI_ENABLE), SPI_SPI_ENABLE_SPIE);
+	} else {
+		sys_clear_bits(SPI_REG(dev, SPI_SPI_ENABLE), SPI_SPI_ENABLE_SPIE);
+	}
+}
+
+/**
+ * @brief Assert/Deassert chip select line
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @param on Assert chip select (True: Assert, False: Deassert)
+ * @return None.
+ */
+static inline void spi_cdns_cs_control(const struct device *dev, bool on)
+{
+	struct spi_cdns_data *data = dev->data;
+
+	if (IS_ENABLED(CONFIG_SPI_SLAVE) && spi_context_is_slave(&data->ctx)) {
+		/* Skip slave select assert/de-assert in slave mode */
+		return;
+	}
+
+	if (on) {
+		uint32_t val = SPI_CONF_PCSL_MASK &
+			       ~(1 << (SPI_CONF_PCSL_OFFSET + data->ctx.config->slave));
+		sys_set_mask32(SPI_REG(dev, SPI_CONF), SPI_CONF_PCSL_MASK, val);
+		k_busy_wait(data->ctx.config->cs.delay);
+	} else if (!(data->ctx.config->operation & SPI_HOLD_ON_CS)) {
+		k_busy_wait(data->ctx.config->cs.delay);
+		sys_set_mask32(SPI_REG(dev, SPI_CONF), SPI_CONF_PCSL_MASK, SPI_CONF_PCSL_MASK);
+	}
+}
+
+static void spi_cdns_config_clock_freq(const struct device *dev, uint32_t spi_freq)
+{
+	const struct spi_cdns_cfg *cfg = dev->config;
+	uint32_t ctrl_reg, baud_rate_div;
+	uint32_t clock_freq;
+
+	clock_freq = cfg->clock_frequency;
+
+	ctrl_reg = sys_read32(SPI_REG(dev, SPI_CONF));
+
+	/*
+	 * Set the clock frequency
+	 * first valid value is 0 (/2)
+	 */
+	baud_rate_div = SPI_MBRD_MIN;
+	while ((baud_rate_div < SPI_MBRD_MAX) && (clock_freq / (2 << baud_rate_div)) > spi_freq) {
+		baud_rate_div++;
+	}
+
+	ctrl_reg &= ~SPI_CONF_MBRD_MASK;
+	ctrl_reg |= baud_rate_div << SPI_CONF_MBRD_OFFSET;
+
+	LOG_DBG("%s: spi baud rate %uHz", dev->name, clock_freq / (2 << baud_rate_div));
+
+	sys_write32(ctrl_reg, SPI_REG(dev, SPI_CONF));
+}
+
+/**
+ * @brief Send 1-entry to Tx-FIFO
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @return None.
+ */
+static void spi_cdns_send(const struct device *dev)
+{
+	const struct spi_cdns_cfg *config = dev->config;
+	struct spi_cdns_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
+	uint8_t dfs = SPI_WORD_SIZE_GET(ctx->config->operation) / 8;
+	uint32_t val = 0;
+	int i, loop;
+
+	loop = (config->fifo_width / 8) / dfs;
+	for (i = 0; i < loop; i++) {
+		if (spi_context_tx_buf_on(ctx)) {
+			switch (dfs) {
+			case 1:
+				if (config->fifo_width == 8) {
+					val |= UNALIGNED_GET((uint8_t *)ctx->tx_buf);
+				} else if (config->fifo_width == 16) {
+					val |= UNALIGNED_GET((uint8_t *)ctx->tx_buf) << 8 * (1 - i);
+				} else if (config->fifo_width == 32) {
+					val |= UNALIGNED_GET((uint8_t *)ctx->tx_buf) << 8 * (3 - i);
+				}
+				break;
+			case 2:
+				if (config->fifo_width == 16) {
+					val |= UNALIGNED_GET((uint16_t *)ctx->tx_buf);
+				} else if (config->fifo_width == 32) {
+					val |= UNALIGNED_GET((uint16_t *)ctx->tx_buf)
+					       << 16 * (1 - i);
+				}
+				break;
+			case 4:
+				if (config->fifo_width == 32) {
+					val |= UNALIGNED_GET((uint32_t *)ctx->tx_buf);
+				}
+				break;
+			}
+		}
+		if ((spi_context_tx_buf_on(ctx) || spi_context_rx_buf_on(ctx))) {
+			if (data->tx_remain_entry > 0) {
+				data->tx_remain_entry--;
+				data->fifo_diff++;
+			}
+		}
+		spi_context_update_tx(&data->ctx, dfs, 1);
+	}
+
+	sys_write32(val, SPI_REG(dev, SPI_TX_DATA));
+}
+
+/**
+ * @brief Receive 1-entry from Rx-FIFO
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @return None.
+ */
+static void spi_cdns_recv(const struct device *dev)
+{
+	const struct spi_cdns_cfg *config = dev->config;
+	struct spi_cdns_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
+	uint8_t dfs = SPI_WORD_SIZE_GET(ctx->config->operation) / 8;
+	uint32_t val;
+	int i, loop;
+
+	val = sys_read32(SPI_REG(dev, SPI_RX_DATA));
+
+	loop = (config->fifo_width / 8) / dfs;
+	for (i = 0; i < loop; i++) {
+		if (spi_context_rx_buf_on(ctx)) {
+			switch (dfs) {
+			case 1:
+				if (config->fifo_width == 8) {
+					UNALIGNED_PUT(val & 0xFF, (uint8_t *)ctx->rx_buf);
+				} else if (config->fifo_width == 16) {
+					UNALIGNED_PUT((val >> 8 * (1 - i)) & 0xFF,
+						      (uint8_t *)ctx->rx_buf);
+				} else if (config->fifo_width == 32) {
+					UNALIGNED_PUT((val >> 8 * (3 - i)) & 0xFF,
+						      (uint8_t *)ctx->rx_buf);
+				}
+				break;
+			case 2:
+				if (config->fifo_width == 16) {
+					UNALIGNED_PUT(val & 0xFFFF, (uint16_t *)ctx->rx_buf);
+				} else if (config->fifo_width == 32) {
+					UNALIGNED_PUT((val >> 16 * (1 - i)) & 0xFFFF,
+						      (uint16_t *)ctx->rx_buf);
+				}
+				break;
+			case 4:
+				if (config->fifo_width == 32) {
+					UNALIGNED_PUT(val, (uint32_t *)ctx->rx_buf);
+				}
+				break;
+			}
+		}
+		if (data->fifo_diff > 0) {
+			data->fifo_diff--;
+		}
+		spi_context_update_rx(ctx, dfs, 1);
+	}
+}
+
+/**
+ * @brief Push to Tx-FIFO
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @return None.
+ */
+static void spi_cdns_push_data(const struct device *dev)
+{
+	const struct spi_cdns_cfg *config = dev->config;
+	struct spi_cdns_data *data = dev->data;
+	uint32_t tx_entry;
+
+	if (spi_context_is_slave(&data->ctx)) {
+		/*
+		 * while tx fifo is not full and there is data to transmit, as we are a target fill
+		 * it up until we are full
+		 */
+		while ((!(sys_read32(SPI_REG(dev, SPI_INT_STATUS)) & SPI_INT_TF)) &&
+		       (data->tx_remain_entry > 0)) {
+			spi_cdns_send(dev);
+		}
+	} else {
+		/*
+		 * We can't fill until we are full as we could chase our tail with waiting until we
+		 * are full, while at the same time data is being sent out faster than we can check
+		 * if we are full
+		 */
+		tx_entry = MIN(config->tx_fifo_depth - data->fifo_diff, data->tx_remain_entry);
+		while (tx_entry > 0) {
+			spi_cdns_send(dev);
+			tx_entry--;
+		}
+	}
+}
+
+/**
+ * @brief Pull from Rx-FIFO
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @return None.
+ */
+static void spi_cdns_pull_data(const struct device *dev)
+{
+	const struct spi_cdns_cfg *config = dev->config;
+	struct spi_cdns_data *data = dev->data;
+	uint32_t rx_threshold_tmp;
+	uint32_t rx_remain_entry;
+
+	/*
+	 * As there is no rx fifo empty status bit, Write the rx threshold
+	 * to so the rne status bit will report when there is less than 1
+	 * item in the fifo
+	 */
+	rx_threshold_tmp = sys_read32(SPI_REG(dev, SPI_RX_THRESHOLD));
+	sys_write32(1, SPI_REG(dev, SPI_RX_THRESHOLD));
+
+	while (sys_read32(SPI_REG(dev, SPI_INT_STATUS)) & SPI_INT_RNE) {
+		spi_cdns_recv(dev);
+	}
+
+	/*
+	 * The threshold is designed to trigger by FIFO I/O.
+	 * Therefore, it is necessary to set rx threshold before pulling.
+	 */
+	rx_remain_entry = DIV_ROUND_UP(data->fifo_diff, (config->fifo_width / 8));
+	if ((rx_remain_entry != 0) && (rx_remain_entry < rx_threshold_tmp)) {
+		sys_write32(rx_remain_entry, SPI_REG(dev, SPI_RX_THRESHOLD));
+	} else {
+		sys_write32(rx_threshold_tmp, SPI_REG(dev, SPI_RX_THRESHOLD));
+	}
+}
+
+/**
+ * @brief Configure SPI controller
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @param config SPI controller configuration structure
+ * @retval 0 No errors.
+ * @retval -EINVAL Invalid argument error.
+ * @retval -ENOTSUP Unsupported value error.
+ */
+static int spi_cdns_configure(const struct device *dev, const struct spi_config *config)
+{
+	const struct spi_cdns_cfg *dev_config = dev->config;
+	struct spi_cdns_data *data = dev->data;
+	uint32_t word_size, conf_val;
+
+	if (spi_cdns_context_configured(dev, config)) {
+		/* Nothing to do */
+		return 0;
+	}
+
+	if (config->operation & (SPI_MODE_LOOP | SPI_TRANSFER_LSB | SPI_LINES_DUAL |
+				 SPI_LINES_QUAD | SPI_LINES_OCTAL)) {
+		return -ENOTSUP;
+	}
+
+	/* Active High CS is not supported with hardware CS */
+	if (!spi_cs_is_gpio(config) && (config->operation & SPI_CS_ACTIVE_HIGH)) {
+		return -ENOTSUP;
+	}
+
+	if ((config->operation & SPI_OP_MODE_SLAVE) && !IS_ENABLED(CONFIG_SPI_SLAVE)) {
+		LOG_ERR("Kconfig for enable SPI in slave mode is not enabled");
+		return -ENOTSUP;
+	}
+
+	/* Word Sizes are only compatible with certain fifo widths */
+	word_size = SPI_WORD_SIZE_GET(config->operation);
+	if (((word_size != 8) && (word_size != 16) && (word_size != 32)) ||
+	    (word_size > dev_config->fifo_width) ||
+	    ((dev_config->fifo_width == 24) && (word_size == 16)) ||
+	    ((dev_config->fifo_width == 32) && (word_size == 24))) {
+		return -ENOTSUP;
+	}
+
+	data->ctx.config = config;
+	data->config = *config;
+
+	conf_val = SPI_CONF_PCSL_MASK | SPI_CONF_MCSE | SPI_CONF_MRCS;
+
+	/* Configure for Master or Slave */
+	if (config->operation & SPI_OP_MODE_SLAVE) {
+		conf_val &= ~(SPI_CONF_MSEL);
+	} else {
+		conf_val |= SPI_CONF_MSEL;
+	}
+
+	/* Set the polarity */
+	if (config->operation & SPI_MODE_CPHA) {
+		conf_val |= SPI_CONF_CPHA;
+	} else {
+		conf_val &= ~(SPI_CONF_CPHA);
+	}
+
+	/* Set the phase */
+	if (config->operation & SPI_MODE_CPOL) {
+		conf_val |= SPI_CONF_CPOL;
+	} else {
+		conf_val &= ~(SPI_CONF_CPOL);
+	}
+
+	/*
+	 * Set clock frequency.
+	 * SPI clock is generated based on pclk or ext_clk, and the frequency closest
+	 * to the value obtained by dividing the two base clocks is selected.
+	 */
+	spi_cdns_config_clock_freq(dev, config->frequency);
+
+	/* Set transfer word size */
+	conf_val &= ~(SPI_CONF_TWS_MASK);
+	conf_val |= ((word_size / 8) - 1) << SPI_CONF_TWS_OFFSET;
+
+	sys_write32(conf_val, SPI_REG(dev, SPI_CONF));
+
+	return 0;
+}
+
+/**
+ * @brief Interrupt handler
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @return None.
+ */
+static void spi_cdns_isr(const struct device *dev)
+{
+	struct spi_cdns_data *data = dev->data;
+	int32_t int_status;
+	int error = 0;
+
+	int_status = sys_read32(SPI_REG(dev, SPI_INT_STATUS));
+	sys_write32(int_status, SPI_REG(dev, SPI_INT_STATUS));
+
+	if ((int_status & SPI_INT_ROF) && spi_context_rx_buf_on(&data->ctx)) {
+		LOG_ERR("%s: rx fifo overflow", dev->name);
+		error = -EIO;
+		goto complete;
+	}
+
+	if ((int_status & SPI_INT_TUF) && spi_context_tx_buf_on(&data->ctx)) {
+		LOG_ERR("%s: tx fifo underflow", dev->name);
+		error = -EIO;
+		goto complete;
+	}
+
+	if (int_status & SPI_INT_RNE) {
+		spi_cdns_pull_data(dev);
+	}
+
+	if (int_status & SPI_INT_TNF) {
+		spi_cdns_push_data(dev);
+	}
+
+	if (!spi_context_tx_buf_on(&data->ctx)) {
+		/* Disable Tx-FIFO interrupt for no transfer data */
+		sys_write32(SPI_INT_TNF, SPI_REG(dev, SPI_INT_DISABLE));
+	}
+
+	if (spi_context_tx_buf_on(&data->ctx) || spi_context_rx_buf_on(&data->ctx)) {
+		return;
+	}
+
+	if (data->fifo_diff != 0) {
+		return;
+	}
+
+complete:
+	sys_write32(SPI_INT_DEFAULT, SPI_REG(dev, SPI_INT_DISABLE));
+#if CONFIG_SPI_ASYNC
+	if (data->ctx.asynchronous) {
+		if (spi_cs_is_gpio(data->ctx.config)) {
+			spi_context_cs_control(&data->ctx, false);
+		} else {
+			spi_cdns_cs_control(dev, false);
+		}
+		pm_device_busy_clear(dev);
+		pm_device_runtime_put(dev);
+	}
+#endif
+
+	spi_context_complete(&data->ctx, dev, error);
+}
+
+/**
+ * @brief Initialize SPI driver
+ *
+ * @param dev Device structure (In memory) per driver instance
+ * @return None.
+ */
+static int spi_cdns_init(const struct device *dev)
+{
+	const struct spi_cdns_cfg *cfg = dev->config;
+	struct spi_cdns_data *data = dev->data;
+
+	cfg->irq_config();
+
+	sys_write32(SPI_CONF_INITIAL_VAL, SPI_REG(dev, SPI_CONF));
+
+	/* Disable interrupt */
+	sys_write32(SPI_INT_DEFAULT, SPI_REG(dev, SPI_INT_DISABLE));
+	/* Clear Pending Interrupts */
+	(void)sys_read32(SPI_REG(dev, SPI_INT_STATUS));
+
+	/* TxFIFO and RxFIFO clear */
+	sys_set_mask32(SPI_REG(dev, SPI_CONF), SPI_CONF_TXCLR | SPI_CONF_RXCLR,
+		       SPI_CONF_TXCLR | SPI_CONF_RXCLR);
+
+	spi_cdns_spi_enable(dev, true);
+
+	/* Make sure the context is unlocked */
+	spi_context_unlock_unconditionally(&data->ctx);
+
+	return 0;
+}
+
+/*******************************************************************************
+ * Public Functions Code
+ ******************************************************************************/
+/**
+ * @brief Internal read/write the specified amount of data.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param config Pointer to a valid spi_config structure instance.
+ * @param tx_bufs Buffer array where data to be sent originates from, or NULL if none.
+ * @param rx_bufs Buffer array where data to be read will be written to, or NULL if none.
+ * @param asynchronous Asynchronous flag
+ * @param signal A pointer to a valid and ready to be signaled struct k_poll_signal.
+ *
+ * @retval 0 Success.
+ * @retval -EINVAL Invalid argument error.
+ * @retval -ENOTSUP Unsupported value error.
+ * @retval -EBUSY Waiting period timed out.
+ * @retval -EIO Rx FIFO overflow.
+ */
+static int spi_cdns_transceive(const struct device *dev, const struct spi_config *config,
+			       const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs,
+			       bool asynchronous, spi_callback_t cb, void *userdata)
+{
+	const struct spi_cdns_cfg *dev_config = dev->config;
+	struct spi_cdns_data *data = dev->data;
+	uint32_t dfs;
+	int ret;
+
+	spi_context_lock(&data->ctx, asynchronous, cb, userdata, config);
+
+	pm_device_runtime_get(dev);
+	pm_device_busy_set(dev);
+
+	spi_cdns_spi_enable(dev, false);
+
+	ret = spi_cdns_configure(dev, config);
+	if (ret < 0) {
+		spi_cdns_spi_enable(dev, true);
+		goto out;
+	}
+
+	/* Disable interrupt */
+	sys_write32(SPI_INT_DEFAULT, SPI_REG(dev, SPI_INT_DISABLE));
+	/* Clear Pending Interrupts */
+	(void)sys_read32(SPI_REG(dev, SPI_INT_STATUS));
+
+	/* Reset semaphore for waiting for completion */
+	k_sem_reset(&data->ctx.sync);
+
+	/* TxFIFO and RxFIFO clear */
+	sys_set_mask32(SPI_REG(dev, SPI_CONF), SPI_CONF_TXCLR | SPI_CONF_RXCLR,
+		       SPI_CONF_TXCLR | SPI_CONF_RXCLR);
+	spi_cdns_spi_enable(dev, true);
+
+	data->fifo_diff = 0;
+
+	dfs = SPI_WORD_SIZE_GET(data->ctx.config->operation) / 8;
+	spi_context_buffers_setup(&data->ctx, tx_bufs, rx_bufs, dfs);
+
+	data->tx_remain_entry =
+		MAX(spi_context_total_rx_len(&data->ctx), spi_context_total_tx_len(&data->ctx));
+
+	/* 0 byte transfer */
+	if ((spi_context_total_rx_len(&data->ctx) == 0) &&
+	    (spi_context_total_tx_len(&data->ctx) == 0)) {
+		if (asynchronous) {
+			spi_context_complete(&data->ctx, dev, 0);
+		}
+		goto out;
+	}
+
+	/* Set fifo thresholds */
+	if (spi_context_is_slave(&data->ctx)) {
+		sys_write32(1, SPI_REG(dev, SPI_RX_THRESHOLD));
+		sys_write32(dev_config->tx_fifo_depth - 1, SPI_REG(dev, SPI_TX_THRESHOLD));
+	} else {
+		uint32_t fifo_words = MIN(DIV_ROUND_UP(spi_context_total_rx_len(&data->ctx),
+						       (dev_config->fifo_width / 8)),
+					  dev_config->rx_fifo_depth * 5 / 8);
+		sys_write32(fifo_words, SPI_REG(dev, SPI_RX_THRESHOLD));
+		sys_write32(dev_config->tx_fifo_depth / 2, SPI_REG(dev, SPI_TX_THRESHOLD));
+	}
+
+	if (spi_cs_is_gpio(data->ctx.config)) {
+		spi_context_cs_control(&data->ctx, true);
+	} else {
+		spi_cdns_cs_control(dev, true);
+	}
+
+	sys_write32(SPI_INT_DEFAULT, SPI_REG(dev, SPI_INT_ENABLE));
+
+	ret = spi_context_wait_for_completion(&data->ctx);
+
+	if (!asynchronous) {
+		if (spi_cs_is_gpio(data->ctx.config)) {
+			spi_context_cs_control(&data->ctx, false);
+		} else {
+			spi_cdns_cs_control(dev, false);
+		}
+		pm_device_busy_clear(dev);
+		pm_device_runtime_put(dev);
+	}
+
+#ifdef CONFIG_SPI_SLAVE
+	if (spi_context_is_slave(&data->ctx) && !ret) {
+		ret = data->ctx.recv_frames;
+	}
+#endif /* CONFIG_SPI_SLAVE */
+
+out:
+	spi_context_release(&data->ctx, ret);
+
+	return ret;
+}
+
+/**
+ * @brief Read/write the specified amount of data from the SPI driver.
+ *
+ * Note: This function is synchronous.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param config Pointer to a valid spi_config structure instance.
+ * @param tx_bufs Buffer array where data to be sent originates from, or NULL if none.
+ * @param rx_bufs Buffer array where data to be read will be written to, or NULL if none.
+ *
+ * @retval 0 Success.
+ * @retval -EINVAL Invalid argument error.
+ * @retval -ENOTSUP Unsupported value error.
+ * @retval -EBUSY Waiting period timed out.
+ * @retval -EIO Rx FIFO overflow.
+ */
+static int spi_cdns_transceive_sync(const struct device *dev, const struct spi_config *config,
+				    const struct spi_buf_set *tx_bufs,
+				    const struct spi_buf_set *rx_bufs)
+{
+	return spi_cdns_transceive(dev, config, tx_bufs, rx_bufs, false, NULL, NULL);
+}
+
+#ifdef CONFIG_SPI_ASYNC
+/**
+ * @brief Read/write the specified amount of data from the SPI driver.
+ *
+ * Note: This function is asynchronous.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param config Pointer to a valid spi_config structure instance.
+ * @param tx_bufs Buffer array where data to be sent originates from, or NULL if none.
+ * @param rx_bufs Buffer array where data to be read will be written to, or NULL if none.
+ * @param async A pointer to a valid and ready to be signaled struct k_poll_signal.
+ *
+ * @retval 0 Success.
+ * @retval -EINVAL Invalid argument error.
+ * @retval -ENOTSUP Unsupported value error.
+ */
+static int spi_cdns_transceive_async(const struct device *dev, const struct spi_config *config,
+				     const struct spi_buf_set *tx_bufs,
+				     const struct spi_buf_set *rx_bufs, spi_callback_t cb,
+				     void *userdata)
+{
+	return spi_cdns_transceive(dev, config, tx_bufs, rx_bufs, true, cb, userdata);
+}
+#endif /* CONFIG_SPI_ASYNC */
+
+/**
+ * @brief Release the SPI device locked on by the current config
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param config Pointer to a valid spi_config structure instance.
+ */
+static int spi_cdns_release(const struct device *dev, const struct spi_config *config)
+{
+	struct spi_cdns_data *data = dev->data;
+
+	if (spi_cs_is_gpio(data->ctx.config)) {
+		spi_context_cs_control(&data->ctx, false);
+	} else {
+		spi_cdns_cs_control(dev, false);
+	}
+	spi_context_unlock_unconditionally(&data->ctx);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_DEVICE
+static int spi_cdns_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct spi_cdns_cfg *cfg = dev->config;
+	int ret;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		/* TODO: Enable SPI Clock */
+#ifdef CONFIG_PINCTRL
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
+		if (ret < 0) {
+			return ret;
+		}
+#endif
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		/* TODO: Disable SPI Clock */
+#ifdef CONFIG_PINCTRL
+		ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_SLEEP);
+		if (ret < 0) {
+			return ret;
+		}
+#endif
+		break;
+	default:
+		ret = -ENOTSUP;
+	}
+
+	return ret;
+}
+#endif /* CONFIG_PM_DEVICE */
+
+/**
+ * SPI driver API registered in Zephyr spi framework
+ */
+static DEVICE_API(spi, spi_cdns_api) = {
+	.transceive = spi_cdns_transceive_sync,
+#ifdef CONFIG_SPI_ASYNC
+	.transceive_async = spi_cdns_transceive_async,
+#endif /* CONFIG_SPI_ASYNC */
+	.release = spi_cdns_release,
+};
+
+/* Set clock-frequency-ext to pclk / 5 if there is no clock-frequency-ext */
+#define SPI_CLOCK_FREQUENCY_EXT(n)                                                                 \
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(n, clock_frequency_ext), \
+		(DT_INST_PROP(n, clock_frequency_ext)),            \
+		(DT_INST_PROP(n, clock_frequency) / 5))
+
+#define SPI_CDNS_INIT(n)                                                                           \
+	static void spi_cdns_irq_config_##n(void);                                                 \
+	static struct spi_cdns_data spi_cdns_data_##n = {                                          \
+		SPI_CONTEXT_INIT_LOCK(spi_cdns_data_##n, ctx),                                     \
+		SPI_CONTEXT_INIT_SYNC(spi_cdns_data_##n, ctx),                                     \
+	};                                                                                         \
+	static struct spi_cdns_cfg spi_cdns_cfg_##n = {                                            \
+		.base = DT_INST_REG_ADDR(n),                                                       \
+		.irq_config = spi_cdns_irq_config_##n,                                             \
+		.clock_frequency = DT_INST_PROP(n, clock_frequency),                               \
+		.ext_clock = SPI_CLOCK_FREQUENCY_EXT(n),                                           \
+	};                                                                                         \
+	SPI_DEVICE_DT_INST_DEFINE(n, spi_cdns_init, spi_cdns_pm_action, &spi_cdns_data_##n,        \
+				  &spi_cdns_cfg_##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,        \
+				  &spi_cdns_api);                                                  \
+	static void spi_cdns_irq_config_##n(void)                                                  \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), spi_cdns_isr,               \
+			    DEVICE_DT_INST_GET(n), 0);                                             \
+		irq_enable(DT_INST_IRQN(n));                                                       \
+	}
+
+#define DT_DRV_COMPAT cdns_spi
+DT_INST_FOREACH_STATUS_OKAY(SPI_CDNS_INIT)
diff --git a/drivers/spi/spi_context.h b/drivers/spi/spi_context.h
index d91efece24805..e86fb8ba9c912 100644
--- a/drivers/spi/spi_context.h
+++ b/drivers/spi/spi_context.h
@@ -75,17 +75,30 @@ struct spi_context {
 	},										\
 	._ctx_name.num_cs_gpios = DT_PROP_LEN_OR(_node_id, cs_gpios, 0),
 
+/*
+ * Checks if a spi config is the same as the one stored in the spi_context
+ * The intention of this function is to be used to check if a driver can skip
+ * some reconfiguration for a transfer in a fast code path.
+ */
 static inline bool spi_context_configured(struct spi_context *ctx,
 					  const struct spi_config *config)
 {
 	return !!(ctx->config == config);
 }
 
+/* Returns true if the spi configuration stored for this context
+ * specifies a slave mode configuration, returns false otherwise
+ */
 static inline bool spi_context_is_slave(struct spi_context *ctx)
 {
 	return (ctx->config->operation & SPI_OP_MODE_SLAVE);
 }
 
+/*
+ * The purpose of the context lock is to synchronize the usage of the driver/hardware.
+ * The driver should call this function to claim or wait for ownership of the spi resource.
+ * Usually the appropriate time to call this is at the start of the transceive API implementation.
+ */
 static inline void spi_context_lock(struct spi_context *ctx,
 				    bool asynchronous,
 				    spi_callback_t callback,
@@ -108,6 +121,13 @@ static inline void spi_context_lock(struct spi_context *ctx,
 #endif /* CONFIG_SPI_ASYNC */
 }
 
+/*
+ * This function must be called by a driver which has called spi_context_lock in order
+ * to release the ownership of the spi resource.
+ * Usually the appropriate time to call this would be at the end of a transfer that was
+ * initiated by a transceive API call, except in the case that the SPI_LOCK_ON bit was set
+ * in the configuration.
+ */
 static inline void spi_context_release(struct spi_context *ctx, int status)
 {
 #ifdef CONFIG_SPI_SLAVE
@@ -132,6 +152,13 @@ static inline void spi_context_release(struct spi_context *ctx, int status)
 static inline size_t spi_context_total_tx_len(struct spi_context *ctx);
 static inline size_t spi_context_total_rx_len(struct spi_context *ctx);
 
+/* This function essentially is a way for a driver to seamlessly implement both the
+ * synchronous transceive API and the asynchronous transceive_async API in the same way.
+ *
+ * The exact way this function is used may depend on driver implementation, but
+ * essentially this will block waiting for a signal from spi_context_complete,
+ * unless the transfer is asynchronous, in which case it does nothing in master mode.
+ */
 static inline int spi_context_wait_for_completion(struct spi_context *ctx)
 {
 	int status = 0;
@@ -180,6 +207,12 @@ static inline int spi_context_wait_for_completion(struct spi_context *ctx)
 	return status;
 }
 
+/* For synchronous transfers, this will signal to a thread waiting
+ * on spi_context_wait for completion.
+ *
+ * For asynchronous tranfers, this will call the async callback function
+ * with the user data.
+ */
 static inline void spi_context_complete(struct spi_context *ctx,
 					const struct device *dev,
 					int status)
@@ -212,6 +245,14 @@ static inline void spi_context_complete(struct spi_context *ctx,
 #endif /* CONFIG_SPI_ASYNC */
 }
 
+/*
+ * This function initializes all the chip select GPIOs associated with a spi controller.
+ * The context first must be initialized using the SPI_CONTEXT_CS_GPIOS_INITIALIZE macro.
+ * This function should be called during the device init sequence so that
+ * all the CS lines are configured properly before the first transfer begins.
+ * Note: If a controller has native CS control in SPI hardware, they should also be initialized
+ * during device init by the driver with hardware-specific code.
+ */
 static inline int spi_context_cs_configure_all(struct spi_context *ctx)
 {
 	int ret;
@@ -233,6 +274,7 @@ static inline int spi_context_cs_configure_all(struct spi_context *ctx)
 	return 0;
 }
 
+/* Helper function to control the GPIO CS, not meant to be used directly by drivers */
 static inline void _spi_context_cs_control(struct spi_context *ctx,
 					   bool on, bool force_off)
 {
@@ -252,11 +294,22 @@ static inline void _spi_context_cs_control(struct spi_context *ctx,
 	}
 }
 
+/* This function should be called by drivers to control the chip select line in master mode
+ * in the case of the CS being a GPIO. The de facto usage of the zephyr SPI API expects that the
+ * chip select be asserted throughout the entire transfer specified by a transceive call,
+ * ie all buffers in a spi_buf_set should be finished before deasserting CS. And usually
+ * the deassertion is at the end of the transfer, except in the case that the
+ * SPI_HOLD_ON_CS bit was set in the configuration.
+ */
 static inline void spi_context_cs_control(struct spi_context *ctx, bool on)
 {
 	_spi_context_cs_control(ctx, on, false);
 }
 
+/* Forcefully releases the spi context and removes the owner, allowing taking the lock
+ * with spi_context_lock without the previous owner releasing the lock.
+ * This is usually used to aid in implementation of the spi_release driver API.
+ */
 static inline void spi_context_unlock_unconditionally(struct spi_context *ctx)
 {
 	/* Forcing CS to go to inactive status */
@@ -268,6 +321,11 @@ static inline void spi_context_unlock_unconditionally(struct spi_context *ctx)
 	}
 }
 
+/*
+ * Helper function for incrementing buffer pointer.
+ * Generally not needed to be used directly by drivers.
+ * Use spi_context_update_(tx/rx) instead.
+ */
 static inline void *spi_context_get_next_buf(const struct spi_buf **current,
 					     size_t *count,
 					     size_t *buf_len,
@@ -287,6 +345,17 @@ static inline void *spi_context_get_next_buf(const struct spi_buf **current,
 	return NULL;
 }
 
+/*
+ * The spi context private api works with the driver by providing code to
+ * keep track of how much of the transfer has been completed. The driver
+ * calls functions to report when some tx or rx has finished, and the driver
+ * then can use the spi context to keep track of how much is left to do.
+ */
+
+/*
+ * This function must be called at the start of a transfer by the driver
+ * to initialize the spi context fields for tracking the progress.
+ */
 static inline
 void spi_context_buffers_setup(struct spi_context *ctx,
 			       const struct spi_buf_set *tx_bufs,
@@ -322,8 +391,10 @@ void spi_context_buffers_setup(struct spi_context *ctx,
 }
 
 /*
- * Note: dfs is the number of bytes needed to store a data frame,
- * while len is the number of data frames sent.
+ * Should be called to update the tracking of TX being completed.
+ *
+ * Parameter "dfs" is the number of bytes needed to store a data frame.
+ * Parameter "len" is the number of data frames of TX that were sent.
  */
 static ALWAYS_INLINE
 void spi_context_update_tx(struct spi_context *ctx, uint8_t dfs, uint32_t len)
@@ -353,12 +424,18 @@ void spi_context_update_tx(struct spi_context *ctx, uint8_t dfs, uint32_t len)
 	LOG_DBG("tx buf/len %p/%zu", (void *)ctx->tx_buf, ctx->tx_len);
 }
 
+/* Returns true if there is still TX buffers left in the spi_buf_set
+ * even if they are "null" (nop) buffers.
+ */
 static ALWAYS_INLINE
 bool spi_context_tx_on(struct spi_context *ctx)
 {
 	return !!(ctx->tx_len);
 }
 
+/* Similar to spi_context_tx_on, but only returns true if the current buffer is
+ * not a null/NOP placeholder.
+ */
 static ALWAYS_INLINE
 bool spi_context_tx_buf_on(struct spi_context *ctx)
 {
@@ -366,8 +443,10 @@ bool spi_context_tx_buf_on(struct spi_context *ctx)
 }
 
 /*
- * Note: dfs is the number of bytes needed to store a data frame,
- * while len is the number of data frames received.
+ * Should be called to update the tracking of RX being completed.
+ *
+ * @param dfs is the number of bytes needed to store a data frame.
+ * @param len is the number of data frames of RX that were received.
  */
 static ALWAYS_INLINE
 void spi_context_update_rx(struct spi_context *ctx, uint8_t dfs, uint32_t len)
@@ -404,12 +483,18 @@ void spi_context_update_rx(struct spi_context *ctx, uint8_t dfs, uint32_t len)
 	LOG_DBG("rx buf/len %p/%zu", (void *)ctx->rx_buf, ctx->rx_len);
 }
 
+/* Returns true if there is still RX buffers left in the spi_buf_set
+ * even if they are "null" (nop) buffers.
+ */
 static ALWAYS_INLINE
 bool spi_context_rx_on(struct spi_context *ctx)
 {
 	return !!(ctx->rx_len);
 }
 
+/* Similar to spi_context_rx_on, but only returns true if the current buffer is
+ * not a null/NOP placeholder.
+ */
 static ALWAYS_INLINE
 bool spi_context_rx_buf_on(struct spi_context *ctx)
 {
@@ -420,6 +505,10 @@ bool spi_context_rx_buf_on(struct spi_context *ctx)
  * Returns the maximum length of a transfer for which all currently active
  * directions have a continuous buffer, i.e. the maximum SPI transfer that
  * can be done with DMA that handles only non-scattered buffers.
+ *
+ * In other words, returns the length of the smaller of the current RX or current TX buffer.
+ * Except if either RX or TX buf length is 0, returns the length of the other.
+ * And if both are 0 then will return 0 and should indicate transfer completion.
  */
 static inline size_t spi_context_max_continuous_chunk(struct spi_context *ctx)
 {
@@ -432,11 +521,13 @@ static inline size_t spi_context_max_continuous_chunk(struct spi_context *ctx)
 	return MIN(ctx->tx_len, ctx->rx_len);
 }
 
+/* Returns the length of the longer of the current RX or current TX buffer. */
 static inline size_t spi_context_longest_current_buf(struct spi_context *ctx)
 {
 	return ctx->tx_len > ctx->rx_len ? ctx->tx_len : ctx->rx_len;
 }
 
+/* Helper function, not intended to be used by drivers directly */
 static size_t spi_context_count_tx_buf_lens(struct spi_context *ctx, size_t start_index)
 {
 	size_t n;
@@ -449,6 +540,7 @@ static size_t spi_context_count_tx_buf_lens(struct spi_context *ctx, size_t star
 	return total_len;
 }
 
+/* Helper function, not intended to be used by drivers directly */
 static size_t spi_context_count_rx_buf_lens(struct spi_context *ctx, size_t start_index)
 {
 	size_t n;
@@ -462,21 +554,33 @@ static size_t spi_context_count_rx_buf_lens(struct spi_context *ctx, size_t star
 }
 
 
+/* Returns the length of the sum of the remaining TX buffers in the buf set, including
+ * the current buffer in the total.
+ */
 static inline size_t spi_context_total_tx_len(struct spi_context *ctx)
 {
 	return spi_context_count_tx_buf_lens(ctx, 0);
 }
 
+/* Returns the length of the sum of the remaining RX buffers in the buf set, including
+ * the current buffer in the total.
+ */
 static inline size_t spi_context_total_rx_len(struct spi_context *ctx)
 {
 	return spi_context_count_rx_buf_lens(ctx, 0);
 }
 
+/* Similar to spi_context_total_tx_len, except does not count words that have been finished
+ * in the current buffer, ie only including what is remaining in the current buffer in the sum.
+ */
 static inline size_t spi_context_tx_len_left(struct spi_context *ctx)
 {
 	return ctx->tx_len + spi_context_count_tx_buf_lens(ctx, 1);
 }
 
+/* Similar to spi_context_total_rx_len, except does not count words that have been finished
+ * in the current buffer, ie only including what is remaining in the current buffer in the sum.
+ */
 static inline size_t spi_context_rx_len_left(struct spi_context *ctx)
 {
 	return ctx->rx_len + spi_context_count_rx_buf_lens(ctx, 1);
diff --git a/drivers/spi/spi_esp32_spim.c b/drivers/spi/spi_esp32_spim.c
index 8ad679b76ece9..f672d26ff5622 100644
--- a/drivers/spi/spi_esp32_spim.c
+++ b/drivers/spi/spi_esp32_spim.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2020-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,13 +17,7 @@ LOG_MODULE_REGISTER(esp32_spi, CONFIG_SPI_LOG_LEVEL);
 #include <soc.h>
 #include <esp_memory_utils.h>
 #include <zephyr/drivers/spi.h>
-#include <zephyr/drivers/spi/rtio.h>
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || defined(CONFIG_SOC_SERIES_ESP32C3) ||                    \
-	defined(CONFIG_SOC_SERIES_ESP32C6)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 #ifdef SOC_GDMA_SUPPORTED
 #include <hal/gdma_hal.h>
 #include <hal/gdma_ll.h>
@@ -32,13 +26,6 @@ LOG_MODULE_REGISTER(esp32_spi, CONFIG_SPI_LOG_LEVEL);
 #include "spi_context.h"
 #include "spi_esp32_spim.h"
 
-#if defined(CONFIG_SOC_SERIES_ESP32C2) || defined(CONFIG_SOC_SERIES_ESP32C3) ||                    \
-	defined(CONFIG_SOC_SERIES_ESP32C6)
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
-
 #define SPI_DMA_MAX_BUFFER_SIZE 4092
 
 static bool spi_esp32_transfer_ongoing(struct spi_esp32_data *data)
@@ -250,7 +237,7 @@ static int spi_esp32_init(const struct device *dev)
 	err = esp_intr_alloc(cfg->irq_source,
 			ESP_PRIO_TO_FLAGS(cfg->irq_priority) |
 			ESP_INT_FLAGS_CHECK(cfg->irq_flags) | ESP_INTR_FLAG_IRAM,
-			(ISR_HANDLER)spi_esp32_isr,
+			(intr_handler_t)spi_esp32_isr,
 			(void *)dev,
 			NULL);
 
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index e0184c3e52a90..dbca9c77e6ab6 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -30,16 +30,9 @@ LOG_MODULE_REGISTER(spi_ll_stm32);
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/irq.h>
 #include <zephyr/mem_mgmt/mem_attr.h>
-
-#ifdef CONFIG_DCACHE
 #include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
-#endif /* CONFIG_DCACHE */
-
-#ifdef CONFIG_NOCACHE_MEMORY
 #include <zephyr/linker/linker-defs.h>
-#elif defined(CONFIG_CACHE_MANAGEMENT)
 #include <zephyr/arch/cache.h>
-#endif /* CONFIG_NOCACHE_MEMORY */
 
 #include "spi_ll_stm32.h"
 
@@ -1082,7 +1075,7 @@ static int wait_dma_rx_tx_done(const struct device *dev)
 }
 
 #ifdef CONFIG_DCACHE
-static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
+static bool buf_in_nocache(uintptr_t buf __maybe_unused, size_t len_bytes __maybe_unused)
 {
 	bool buf_within_nocache = false;
 
@@ -1095,9 +1088,11 @@ static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
 	}
 #endif /* CONFIG_NOCACHE_MEMORY */
 
+#ifdef CONFIG_MEM_ATTR
 	/* Check if buffer is in nocache memory region defined in DT */
 	buf_within_nocache = mem_attr_check_buf(
 		(void *)buf, len_bytes, DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)) == 0;
+#endif /* CONFIG_MEM_ATTR */
 
 	return buf_within_nocache;
 }
diff --git a/drivers/spi/spi_mcux_flexio.c b/drivers/spi/spi_mcux_flexio.c
index 56a2c19fbf161..f15bd0871b725 100644
--- a/drivers/spi/spi_mcux_flexio.c
+++ b/drivers/spi/spi_mcux_flexio.c
@@ -102,11 +102,11 @@ static int spi_mcux_flexio_isr(void *user_data)
 	const struct spi_mcux_flexio_config *config = dev->config;
 	struct spi_mcux_flexio_data *data = dev->data;
 
-#if defined(CONFIG_SOC_SERIES_KE1XZ)
 	/* Wait until data transfer complete. */
-	WAIT_FOR((0U == (FLEXIO_SPI_GetStatusFlags(config->flexio_spi)
-		& (uint32_t)kFLEXIO_SPI_TxBufferEmptyFlag)), 100, NULL);
-#endif
+	WAIT_FOR((3U == (FLEXIO_SPI_GetStatusFlags(config->flexio_spi)
+		& (uint32_t)(kFLEXIO_SPI_TxBufferEmptyFlag | kFLEXIO_SPI_RxBufferFullFlag))),
+		100, NULL);
+
 	FLEXIO_SPI_MasterTransferHandleIRQ(config->flexio_spi, &data->handle);
 
 	return 0;
diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c
index 2151cd9e2bfa5..e0aeb66802952 100644
--- a/drivers/spi/spi_nrfx_spi.c
+++ b/drivers/spi/spi_nrfx_spi.c
@@ -92,6 +92,7 @@ static int configure(const struct device *dev,
 	struct spi_context *ctx = &dev_data->ctx;
 	nrfx_spi_config_t config;
 	nrfx_err_t result;
+	uint32_t sck_pin;
 
 	if (dev_data->initialized && spi_context_configured(ctx, spi_cfg)) {
 		/* Already configured. No need to do it again. */
@@ -135,8 +136,11 @@ static int configure(const struct device *dev,
 	config.mode      = get_nrf_spi_mode(spi_cfg->operation);
 	config.bit_order = get_nrf_spi_bit_order(spi_cfg->operation);
 
-	nrf_gpio_pin_write(nrf_spi_sck_pin_get(dev_config->spi.p_reg),
-			   spi_cfg->operation & SPI_MODE_CPOL ? 1 : 0);
+	sck_pin = nrf_spi_sck_pin_get(dev_config->spi.p_reg);
+
+	if (sck_pin != NRF_SPI_PIN_NOT_CONNECTED) {
+		nrf_gpio_pin_write(sck_pin, spi_cfg->operation & SPI_MODE_CPOL ? 1 : 0);
+	}
 
 	if (dev_data->initialized) {
 		nrfx_spi_uninit(&dev_config->spi);
diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index 12430be9b3330..20456b2a247c3 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -49,6 +49,11 @@ LOG_MODULE_REGISTER(spi_nrfx_spim, CONFIG_SPI_LOG_LEVEL);
 #define SPIM_REQUESTS_CLOCK(idx) UTIL_OR(IS_EQ(idx, 120), \
 					 IS_EQ(idx, 121))
 #define USE_CLOCK_REQUESTS 1
+/* If fast instances are used then system managed device PM cannot be used because
+ * it may call PM actions from locked context and fast SPIM PM actions can only be
+ * called from a thread context.
+ */
+BUILD_ASSERT(!IS_ENABLED(CONFIG_PM_DEVICE_SYSTEM_MANAGED));
 #else
 #define SPIM_REQUESTS_CLOCK(idx) 0
 #endif
@@ -222,6 +227,7 @@ static int configure(const struct device *dev,
 	uint32_t max_freq = dev_config->max_freq;
 	nrfx_spim_config_t config;
 	nrfx_err_t result;
+	uint32_t sck_pin;
 
 	if (dev_data->initialized && spi_context_configured(ctx, spi_cfg)) {
 		/* Already configured. No need to do it again. */
@@ -278,8 +284,11 @@ static int configure(const struct device *dev,
 	config.mode      = get_nrf_spim_mode(spi_cfg->operation);
 	config.bit_order = get_nrf_spim_bit_order(spi_cfg->operation);
 
-	nrfy_gpio_pin_write(nrfy_spim_sck_pin_get(dev_config->spim.p_reg),
-			    spi_cfg->operation & SPI_MODE_CPOL ? 1 : 0);
+	sck_pin = nrfy_spim_sck_pin_get(dev_config->spim.p_reg);
+
+	if (sck_pin != NRF_SPIM_PIN_NOT_CONNECTED) {
+		nrfy_gpio_pin_write(sck_pin, spi_cfg->operation & SPI_MODE_CPOL ? 1 : 0);
+	}
 
 	if (dev_data->initialized) {
 		nrfx_spim_uninit(&dev_config->spim);
@@ -856,82 +865,7 @@ static int spi_nrfx_init(const struct device *dev)
 			SPIM_MEM_REGION(idx)))))),			       \
 		())
 
-#ifdef CONFIG_HAS_HW_NRF_SPIM0
-SPI_NRFX_SPIM_DEFINE(0);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM1
-SPI_NRFX_SPIM_DEFINE(1);
-#endif
+#define COND_NRF_SPIM_DEVICE(unused, prefix, i, _) \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_SPIM##prefix##i, (SPI_NRFX_SPIM_DEFINE(prefix##i);))
 
-#ifdef CONFIG_HAS_HW_NRF_SPIM2
-SPI_NRFX_SPIM_DEFINE(2);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM3
-SPI_NRFX_SPIM_DEFINE(3);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM4
-SPI_NRFX_SPIM_DEFINE(4);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM00
-SPI_NRFX_SPIM_DEFINE(00);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM20
-SPI_NRFX_SPIM_DEFINE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM21
-SPI_NRFX_SPIM_DEFINE(21);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM22
-SPI_NRFX_SPIM_DEFINE(22);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM30
-SPI_NRFX_SPIM_DEFINE(30);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM120
-SPI_NRFX_SPIM_DEFINE(120);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM121
-SPI_NRFX_SPIM_DEFINE(121);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM130
-SPI_NRFX_SPIM_DEFINE(130);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM131
-SPI_NRFX_SPIM_DEFINE(131);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM132
-SPI_NRFX_SPIM_DEFINE(132);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM133
-SPI_NRFX_SPIM_DEFINE(133);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM134
-SPI_NRFX_SPIM_DEFINE(134);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM135
-SPI_NRFX_SPIM_DEFINE(135);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM136
-SPI_NRFX_SPIM_DEFINE(136);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_SPIM137
-SPI_NRFX_SPIM_DEFINE(137);
-#endif
+NRFX_FOREACH_PRESENT(SPIM, COND_NRF_SPIM_DEVICE, (), (), _)
diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
index 431d011433f59..1526109865cdd 100644
--- a/drivers/spi/spi_nrfx_spis.c
+++ b/drivers/spi/spi_nrfx_spis.c
@@ -8,8 +8,11 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/gpio.h>
+#include <dmm.h>
 #include <soc.h>
 #include <nrfx_spis.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
@@ -17,6 +20,22 @@ LOG_MODULE_REGISTER(spi_nrfx_spis, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"
 
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
+#define SPIS_IS_FAST(idx) IS_EQ(idx, 120)
+
+#define NRFX_SPIS_IS_FAST(unused, prefix, id, _) SPIS_IS_FAST(prefix##id)
+
+#if NRFX_FOREACH_ENABLED(SPIS, NRFX_SPIS_IS_FAST, (+), (0), _)
+/* If fast instances are used then system managed device PM cannot be used because
+ * it may call PM actions from locked context and fast SPIM PM actions can only be
+ * called from a thread context.
+ */
+BUILD_ASSERT(!IS_ENABLED(CONFIG_PM_DEVICE_SYSTEM_MANAGED));
+#endif
+
 struct spi_nrfx_data {
 	struct spi_context ctx;
 	const struct device *dev;
@@ -29,8 +48,12 @@ struct spi_nrfx_config {
 	nrfx_spis_config_t config;
 	void (*irq_connect)(void);
 	uint16_t max_buf_len;
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	bool gpd_ctrl;
+#endif
 	const struct pinctrl_dev_config *pcfg;
 	struct gpio_dt_spec wake_gpio;
+	void *mem_reg;
 };
 
 static inline nrf_spis_mode_t get_nrf_spis_mode(uint16_t operation)
@@ -116,7 +139,11 @@ static int prepare_for_transfer(const struct device *dev,
 				uint8_t *rx_buf, size_t rx_buf_len)
 {
 	const struct spi_nrfx_config *dev_config = dev->config;
+	struct spi_nrfx_data *dev_data = dev->data;
 	nrfx_err_t result;
+	uint8_t *dmm_tx_buf;
+	uint8_t *dmm_rx_buf;
+	int err;
 
 	if (tx_buf_len > dev_config->max_buf_len ||
 	    rx_buf_len > dev_config->max_buf_len) {
@@ -125,14 +152,36 @@ static int prepare_for_transfer(const struct device *dev,
 		return -EINVAL;
 	}
 
+	err = dmm_buffer_out_prepare(dev_config->mem_reg, tx_buf, tx_buf_len, (void **)&dmm_tx_buf);
+	if (err != 0) {
+		LOG_ERR("DMM TX allocation failed err=%d", err);
+		goto out_alloc_failed;
+	}
+
+	/* Keep user RX buffer address to copy data from DMM RX buffer on transfer completion. */
+	dev_data->ctx.rx_buf = rx_buf;
+	err = dmm_buffer_in_prepare(dev_config->mem_reg, rx_buf, rx_buf_len, (void **)&dmm_rx_buf);
+	if (err != 0) {
+		LOG_ERR("DMM RX allocation failed err=%d", err);
+		goto in_alloc_failed;
+	}
+
 	result = nrfx_spis_buffers_set(&dev_config->spis,
-				       tx_buf, tx_buf_len,
-				       rx_buf, rx_buf_len);
+				       dmm_tx_buf, tx_buf_len,
+				       dmm_rx_buf, rx_buf_len);
 	if (result != NRFX_SUCCESS) {
-		return -EIO;
+		err = -EIO;
+		goto buffers_set_failed;
 	}
 
 	return 0;
+
+buffers_set_failed:
+	dmm_buffer_in_release(dev_config->mem_reg, rx_buf, rx_buf_len, rx_buf);
+in_alloc_failed:
+	dmm_buffer_out_release(dev_config->mem_reg, (void *)tx_buf);
+out_alloc_failed:
+	return err;
 }
 
 static void wake_callback(const struct device *dev, struct gpio_callback *cb,
@@ -175,6 +224,8 @@ static int transceive(const struct device *dev,
 	const struct spi_buf *rx_buf = rx_bufs ? rx_bufs->buffers : NULL;
 	int error;
 
+	pm_device_runtime_get(dev);
+
 	spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg);
 
 	error = configure(dev, spi_cfg);
@@ -277,14 +328,81 @@ static DEVICE_API(spi, spi_nrfx_driver_api) = {
 
 static void event_handler(const nrfx_spis_evt_t *p_event, void *p_context)
 {
-	struct spi_nrfx_data *dev_data = p_context;
+	const struct device *dev = p_context;
+	struct spi_nrfx_data *dev_data = dev->data;
+	const struct spi_nrfx_config *dev_config = dev->config;
 
 	if (p_event->evt_type == NRFX_SPIS_XFER_DONE) {
+		int err;
+
+
+		err = dmm_buffer_out_release(dev_config->mem_reg, p_event->p_tx_buf);
+		(void)err;
+		__ASSERT_NO_MSG(err == 0);
+
+		err = dmm_buffer_in_release(dev_config->mem_reg, dev_data->ctx.rx_buf,
+				      p_event->rx_amount, p_event->p_rx_buf);
+		__ASSERT_NO_MSG(err == 0);
+
 		spi_context_complete(&dev_data->ctx, dev_data->dev,
 				     p_event->rx_amount);
+
+		pm_device_runtime_put_async(dev_data->dev, K_NO_WAIT);
 	}
 }
 
+static void spi_nrfx_suspend(const struct device *dev)
+{
+	const struct spi_nrfx_config *dev_config = dev->config;
+
+	if (dev_config->wake_gpio.port == NULL) {
+		nrf_spis_disable(dev_config->spis.p_reg);
+	}
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	if (dev_config->gpd_ctrl) {
+		nrf_gpd_retain_pins_set(dev_config->pcfg, true);
+	}
+#endif
+
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP);
+}
+
+static void spi_nrfx_resume(const struct device *dev)
+{
+	const struct spi_nrfx_config *dev_config = dev->config;
+
+	(void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	if (dev_config->gpd_ctrl) {
+		nrf_gpd_retain_pins_set(dev_config->pcfg, false);
+	}
+#endif
+
+	if (dev_config->wake_gpio.port == NULL) {
+		nrf_spis_enable(dev_config->spis.p_reg);
+	}
+}
+
+static int spi_nrfx_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	switch (action) {
+	case PM_DEVICE_ACTION_SUSPEND:
+		spi_nrfx_suspend(dev);
+		return 0;
+
+	case PM_DEVICE_ACTION_RESUME:
+		spi_nrfx_resume(dev);
+		return 0;
+
+	default:
+		break;
+	}
+
+	return -ENOTSUP;
+}
+
 static int spi_nrfx_init(const struct device *dev)
 {
 	const struct spi_nrfx_config *dev_config = dev->config;
@@ -292,22 +410,27 @@ static int spi_nrfx_init(const struct device *dev)
 	nrfx_err_t result;
 	int err;
 
-	err = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
-	if (err < 0) {
-		return err;
-	}
-
 	/* This sets only default values of mode and bit order. The ones to be
 	 * actually used are set in configure() when a transfer is prepared.
 	 */
 	result = nrfx_spis_init(&dev_config->spis, &dev_config->config,
-				event_handler, dev_data);
+				event_handler, (void *)dev);
 
 	if (result != NRFX_SUCCESS) {
 		LOG_ERR("Failed to initialize device: %s", dev->name);
 		return -EBUSY;
 	}
 
+	/* When the WAKE line is used, the SPIS peripheral is enabled
+	 * only after the master signals that it wants to perform a
+	 * transfer and it is disabled right after the transfer is done.
+	 * Waiting for the WAKE line to go high, what can be done using
+	 * the GPIO PORT event, instead of just waiting for the transfer
+	 * with the SPIS peripheral enabled, significantly reduces idle
+	 * power consumption.
+	 */
+	nrf_spis_disable(dev_config->spis.p_reg);
+
 	if (dev_config->wake_gpio.port) {
 		if (!gpio_is_ready_dt(&dev_config->wake_gpio)) {
 			return -ENODEV;
@@ -332,21 +455,11 @@ static int spi_nrfx_init(const struct device *dev)
 		if (err < 0) {
 			return err;
 		}
-
-		/* When the WAKE line is used, the SPIS peripheral is enabled
-		 * only after the master signals that it wants to perform a
-		 * transfer and it is disabled right after the transfer is done.
-		 * Waiting for the WAKE line to go high, what can be done using
-		 * the GPIO PORT event, instead of just waiting for the transfer
-		 * with the SPIS peripheral enabled, significantly reduces idle
-		 * power consumption.
-		 */
-		nrf_spis_disable(dev_config->spis.p_reg);
 	}
 
 	spi_context_unlock_unconditionally(&dev_data->ctx);
 
-	return 0;
+	return pm_device_driver_init(dev, spi_nrfx_pm_action);
 }
 
 /*
@@ -356,7 +469,10 @@ static int spi_nrfx_init(const struct device *dev)
  * - Name-based HAL IRQ handlers, e.g. nrfx_spis_0_irq_handler
  */
 
-#define SPIS(idx) DT_NODELABEL(spi##idx)
+#define SPIS_NODE(idx) COND_CODE_1(SPIS_IS_FAST(idx), (spis##idx), (spi##idx))
+
+#define SPIS(idx) DT_NODELABEL(SPIS_NODE(idx))
+
 #define SPIS_PROP(idx, prop) DT_PROP(SPIS(idx), prop)
 
 #define SPI_NRFX_SPIS_DEFINE(idx)					       \
@@ -389,14 +505,20 @@ static int spi_nrfx_init(const struct device *dev)
 		.irq_connect = irq_connect##idx,			       \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(SPIS(idx)),		       \
 		.max_buf_len = BIT_MASK(SPIS_PROP(idx, easydma_maxcnt_bits)),  \
+		IF_ENABLED(CONFIG_SOC_NRF54H20_GPD,			       \
+			(.gpd_ctrl = NRF_PERIPH_GET_FREQUENCY(SPIS(idx)) >     \
+				NRFX_MHZ_TO_HZ(16UL),))			       \
 		.wake_gpio = GPIO_DT_SPEC_GET_OR(SPIS(idx), wake_gpios, {0}),  \
+		.mem_reg = DMM_DEV_TO_REG(SPIS(idx)),			       \
 	};								       \
 	BUILD_ASSERT(!DT_NODE_HAS_PROP(SPIS(idx), wake_gpios) ||	       \
 		     !(DT_GPIO_FLAGS(SPIS(idx), wake_gpios) & GPIO_ACTIVE_LOW),\
 		     "WAKE line must be configured as active high");	       \
+	PM_DEVICE_DT_DEFINE(SPIS(idx), spi_nrfx_pm_action,		       \
+		COND_CODE_1(SPIS_IS_FAST(idx), (0), (PM_DEVICE_ISR_SAFE)));    \
 	SPI_DEVICE_DT_DEFINE(SPIS(idx),					       \
 			    spi_nrfx_init,				       \
-			    NULL,					       \
+			    PM_DEVICE_DT_GET(SPIS(idx)),		       \
 			    &spi_##idx##_data,				       \
 			    &spi_##idx##z_config,			       \
 			    POST_KERNEL,				       \
diff --git a/drivers/spi/spi_nxp_lpspi/CMakeLists.txt b/drivers/spi/spi_nxp_lpspi/CMakeLists.txt
index 49d1616421819..a494fd0615364 100644
--- a/drivers/spi/spi_nxp_lpspi/CMakeLists.txt
+++ b/drivers/spi/spi_nxp_lpspi/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2024 NXP
 
 zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI spi_nxp_lpspi_common.c)
-zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI_NORMAL spi_nxp_lpspi.c)
+zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI_CPU spi_nxp_lpspi.c)
 zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI_DMA spi_nxp_lpspi_dma.c)
diff --git a/drivers/spi/spi_nxp_lpspi/Kconfig b/drivers/spi/spi_nxp_lpspi/Kconfig
index 5897daf3655ca..aabb4d51ce7e6 100644
--- a/drivers/spi/spi_nxp_lpspi/Kconfig
+++ b/drivers/spi/spi_nxp_lpspi/Kconfig
@@ -1,4 +1,4 @@
-# Copyright 2018, 2024 NXP
+# Copyright 2018, 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config SPI_MCUX_LPSPI
@@ -8,23 +8,32 @@ config SPI_MCUX_LPSPI
 	depends on CLOCK_CONTROL
 	select PINCTRL
 	help
-	  Enable support for NXP LPSPI.
+	  Enable driver support for NXP LPSPI.
 
 if SPI_MCUX_LPSPI
 
 config SPI_MCUX_LPSPI_DMA
-	bool "MCUX LPSPI SPI DMA Support"
+	bool "NXP LPSPI DMA-based Driver"
+	default y
 	select DMA
 	depends on $(dt_compat_any_has_prop,$(DT_COMPAT_NXP_LPSPI),dmas)
 	help
-	  Enable the SPI DMA mode for SPI instances
-	  that enable dma channels in their device tree node.
+	  Enable DMA-based transfers for LPSPI peripherals
+	  that have a dmas property specified in their DT node.
+	  The DMA based driver prioritizes bandwidth over latency, due to
+	  DMA being more efficient for larger data transfers, to avoid CPU
+	  having to be utilized to do the work. However, setting up a DMA
+	  transfer is more complicated setup than just starting the transfer
+	  immediately with CPU, so there could be more latency between
+	  the point of requesting a transfer and when it actually starts.
 
-config SPI_MCUX_LPSPI_NORMAL
-	bool "NXP MCUX LPSPI driver"
+config SPI_MCUX_LPSPI_CPU
+	bool "NXP LPSPI CPU-based driver"
 	default y
 	depends on $(dt_compat_any_not_has_prop,$(DT_COMPAT_NXP_LPSPI),dmas) || !SPI_MCUX_LPSPI_DMA
 	help
-	  Use the traditional (non-RTIO) SPI driver for NXP LPSPI.
+	  Enable "normal" CPU based SPI driver for LPSPI.
+	  This has lower latency than DMA-based driver but over the
+	  longer transfers will likely have less bandwidth and use more CPU time.
 
 endif # SPI_MCUX_LPSPI
diff --git a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi.c b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi.c
index da6305e3e0bd7..629f2c8574263 100644
--- a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi.c
+++ b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi.c
@@ -7,35 +7,35 @@
 #define DT_DRV_COMPAT nxp_lpspi
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(spi_mcux_lpspi, CONFIG_SPI_LOG_LEVEL);
+LOG_MODULE_REGISTER(spi_lpspi, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_nxp_lpspi_priv.h"
 
 struct lpspi_driver_data {
 	size_t fill_len;
-	size_t tx_total_len;
-	size_t rx_total_len;
 	uint8_t word_size_bytes;
 };
 
-static inline void lpspi_wait_tx_fifo_empty(const struct device *dev)
+static inline uint8_t rx_fifo_cur_len(LPSPI_Type *base)
 {
-	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
+	return (base->FSR & LPSPI_FSR_RXCOUNT_MASK) >> LPSPI_FSR_RXCOUNT_SHIFT;
+}
 
-	while (LPSPI_GetTxFifoCount(base) != 0) {
-	}
+static inline uint8_t tx_fifo_cur_len(LPSPI_Type *base)
+{
+	return (base->FSR & LPSPI_FSR_TXCOUNT_MASK) >> LPSPI_FSR_TXCOUNT_SHIFT;
 }
 
 /* Reads a word from the RX fifo and handles writing it into the RX spi buf */
 static inline void lpspi_rx_word_write_bytes(const struct device *dev, size_t offset)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	struct spi_context *ctx = &data->ctx;
 	uint8_t num_bytes = MIN(lpspi_data->word_size_bytes, ctx->rx_len);
 	uint8_t *buf = ctx->rx_buf + offset;
-	uint32_t word = LPSPI_ReadData(base);
+	uint32_t word = base->RDR;
 
 	if (!spi_context_rx_buf_on(ctx) && spi_context_rx_on(ctx)) {
 		/* receive no actual data if rx buf is NULL */
@@ -50,10 +50,10 @@ static inline void lpspi_rx_word_write_bytes(const struct device *dev, size_t of
 /* Reads a maximum number of words from RX fifo and writes them to the remainder of the RX buf */
 static inline size_t lpspi_rx_buf_write_words(const struct device *dev, uint8_t max_read)
 {
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	struct spi_context *ctx = &data->ctx;
-	size_t buf_len = ctx->rx_len / lpspi_data->word_size_bytes;
+	size_t buf_len = DIV_ROUND_UP(ctx->rx_len, lpspi_data->word_size_bytes);
 	uint8_t words_read = 0;
 	size_t offset = 0;
 
@@ -66,23 +66,18 @@ static inline size_t lpspi_rx_buf_write_words(const struct device *dev, uint8_t
 	return words_read;
 }
 
-static inline uint8_t rx_fifo_cur_len(LPSPI_Type *base)
-{
-	return (base->FSR & LPSPI_FSR_RXCOUNT_MASK) >> LPSPI_FSR_RXCOUNT_SHIFT;
-}
-
 static inline void lpspi_handle_rx_irq(const struct device *dev)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	struct spi_context *ctx = &data->ctx;
+	uint8_t rx_fsr = rx_fifo_cur_len(base);
 	uint8_t total_words_written = 0;
 	uint8_t total_words_read = 0;
 	uint8_t words_read;
-	uint8_t rx_fsr;
 
-	LPSPI_ClearStatusFlags(base, kLPSPI_RxDataReadyFlag);
+	base->SR = LPSPI_SR_RDF_MASK;
 
 	LOG_DBG("RX FIFO: %d, RX BUF: %p", rx_fsr, ctx->rx_buf);
 
@@ -95,15 +90,15 @@ static inline void lpspi_handle_rx_irq(const struct device *dev)
 
 	LOG_DBG("RX done %d words to spi buf", total_words_written);
 
-	if (!spi_context_rx_on(ctx)) {
-		LPSPI_DisableInterrupts(base, (uint32_t)kLPSPI_RxInterruptEnable);
-		LPSPI_FlushFifo(base, false, true);
+	if (spi_context_rx_len_left(ctx) == 0) {
+		base->IER &= ~LPSPI_IER_RDIE_MASK;
+		base->CR |= LPSPI_CR_RRF_MASK; /* flush rx fifo */
 	}
 }
 
 static inline uint32_t lpspi_next_tx_word(const struct device *dev, int offset)
 {
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	struct spi_context *ctx = &data->ctx;
 	const uint8_t *byte = ctx->tx_buf + offset;
@@ -111,7 +106,7 @@ static inline uint32_t lpspi_next_tx_word(const struct device *dev, int offset)
 	uint32_t next_word = 0;
 
 	for (uint8_t i = 0; i < num_bytes; i++) {
-		next_word |= *byte << (BITS_PER_BYTE * i);
+		next_word |= byte[i] << (BITS_PER_BYTE * i);
 	}
 
 	return next_word;
@@ -120,26 +115,26 @@ static inline uint32_t lpspi_next_tx_word(const struct device *dev, int offset)
 static inline void lpspi_fill_tx_fifo(const struct device *dev)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	size_t bytes_in_xfer = lpspi_data->fill_len * lpspi_data->word_size_bytes;
 	size_t offset;
 
 	for (offset = 0; offset < bytes_in_xfer; offset += lpspi_data->word_size_bytes) {
-		LPSPI_WriteData(base, lpspi_next_tx_word(dev, offset));
+		base->TDR = lpspi_next_tx_word(dev, offset);
 	}
 
 	LOG_DBG("Filled TX FIFO to %d words (%d bytes)", lpspi_data->fill_len, offset);
 }
 
-static inline void lpspi_fill_tx_fifo_nop(const struct device *dev)
+static void lpspi_fill_tx_fifo_nop(const struct device *dev)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 
 	for (int i = 0; i < lpspi_data->fill_len; i++) {
-		LPSPI_WriteData(base, 0);
+		base->TDR = 0;
 	}
 
 	LOG_DBG("Filled TX fifo with %d NOPs", lpspi_data->fill_len);
@@ -147,14 +142,14 @@ static inline void lpspi_fill_tx_fifo_nop(const struct device *dev)
 
 static void lpspi_next_tx_fill(const struct device *dev)
 {
-	const struct spi_mcux_config *config = dev->config;
-	struct spi_mcux_data *data = dev->data;
+	const struct lpspi_config *config = dev->config;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	struct spi_context *ctx = &data->ctx;
 	size_t max_chunk;
 
 	/* Convert bytes to words for this xfer */
-	max_chunk = ctx->tx_len / lpspi_data->word_size_bytes;
+	max_chunk = DIV_ROUND_UP(ctx->tx_len, lpspi_data->word_size_bytes);
 	max_chunk = MIN(max_chunk, config->tx_fifo_size);
 	lpspi_data->fill_len = max_chunk;
 
@@ -168,77 +163,64 @@ static void lpspi_next_tx_fill(const struct device *dev)
 static inline void lpspi_handle_tx_irq(const struct device *dev)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	struct spi_context *ctx = &data->ctx;
 
 	spi_context_update_tx(ctx, lpspi_data->word_size_bytes, lpspi_data->fill_len);
 
-	LPSPI_ClearStatusFlags(base, kLPSPI_TxDataRequestFlag);
+	base->SR = LPSPI_SR_TDF_MASK;
 
-	/* Having no buffer length left indicates transfer is done, if there
-	 * was RX to do left, the TX buf would be null but
-	 * ctx still tracks length of dummy data
-	 */
 	if (!spi_context_tx_on(ctx)) {
-		/* Disable chip select and end transfer clocks last word */
-		base->TCR = 0;
-		lpspi_wait_tx_fifo_empty(dev);
-		spi_context_cs_control(ctx, false);
-		LPSPI_DisableInterrupts(base, (uint32_t)kLPSPI_TxInterruptEnable);
+		base->IER &= ~LPSPI_IER_TDIE_MASK;
 		return;
 	}
 
 	lpspi_next_tx_fill(data->dev);
 }
 
-static inline bool lpspi_is_rx_done(const struct device *dev)
+static void lpspi_isr(const struct device *dev)
 {
-	struct spi_mcux_data *data = dev->data;
+	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
+	const struct lpspi_config *config = dev->config;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
 	struct spi_context *ctx = &data->ctx;
-	size_t tx_total = lpspi_data->tx_total_len;
-	size_t rx_total = lpspi_data->rx_total_len;
+	uint32_t status_flags = base->SR;
 
-	if (tx_total >= rx_total) {
-		return (spi_context_total_rx_len(ctx) == 0);
-	} else {
-		return (tx_total <= (rx_total - spi_context_rx_len_left(ctx)));
+	if (status_flags & LPSPI_SR_RDF_MASK) {
+		lpspi_handle_rx_irq(dev);
 	}
-}
 
-static inline void lpspi_clear_remaining_rx(struct spi_context *ctx)
-{
-	size_t remaining_len;
+	if (status_flags & LPSPI_SR_TDF_MASK) {
+		lpspi_handle_tx_irq(dev);
+	}
 
-	while ((remaining_len = spi_context_rx_len_left(ctx)) > 0) {
-		for (int i = 0; i < ctx->rx_len; i++) {
-			ctx->rx_buf[i] = 0;
-		}
-		spi_context_update_rx(ctx, 1, ctx->rx_len);
+	if (spi_context_tx_on(ctx)) {
+		return;
 	}
-}
 
-static void lpspi_isr(const struct device *dev)
-{
-	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	const struct spi_mcux_config *config = dev->config;
-	uint32_t status_flags = LPSPI_GetStatusFlags(base);
-	struct spi_mcux_data *data = dev->data;
-	struct spi_context *ctx = &data->ctx;
+	if (spi_context_rx_on(ctx)) {
+		size_t rx_fifo_len = rx_fifo_cur_len(base);
+		size_t expected_rx_left = rx_fifo_len < ctx->rx_len ? ctx->rx_len - rx_fifo_len : 0;
+		size_t max_fill = MIN(expected_rx_left, config->rx_fifo_size);
+		size_t tx_current_fifo_len = tx_fifo_cur_len(base);
 
-	if (status_flags & kLPSPI_RxDataReadyFlag) {
-		lpspi_handle_rx_irq(dev);
-	}
+		lpspi_data->fill_len = tx_current_fifo_len < ctx->rx_len ?
+					max_fill - tx_current_fifo_len : 0;
 
-	if (status_flags & kLPSPI_TxDataRequestFlag) {
-		lpspi_handle_tx_irq(dev);
+		lpspi_fill_tx_fifo_nop(dev);
 	}
 
-	if (!spi_context_tx_on(ctx) && lpspi_is_rx_done(dev)) {
+	if (spi_context_rx_len_left(ctx) == 1) {
+		base->TCR &= ~LPSPI_TCR_CONT_MASK;
+	} else if (spi_context_rx_len_left(ctx) == 0) {
 		spi_context_complete(ctx, dev, 0);
 		NVIC_ClearPendingIRQ(config->irqn);
-		lpspi_clear_remaining_rx(ctx);
+		base->TCR &= ~LPSPI_TCR_CONT_MASK;
+		lpspi_wait_tx_fifo_empty(dev);
+		spi_context_cs_control(ctx, false);
+		spi_context_release(&data->ctx, 0);
 	}
 }
 
@@ -247,9 +229,10 @@ static int transceive(const struct device *dev, const struct spi_config *spi_cfg
 		      bool asynchronous, spi_callback_t cb, void *userdata)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct lpspi_driver_data *lpspi_data = (struct lpspi_driver_data *)data->driver_data;
-	int ret;
+	struct spi_context *ctx = &data->ctx;
+	int ret = 0;
 
 	spi_context_lock(&data->ctx, asynchronous, cb, userdata, spi_cfg);
 
@@ -257,48 +240,47 @@ static int transceive(const struct device *dev, const struct spi_config *spi_cfg
 	if (lpspi_data->word_size_bytes > 4) {
 		LOG_ERR("Maximum 4 byte word size");
 		ret = -EINVAL;
-		goto out;
+		goto error;
 	}
 
-	spi_context_buffers_setup(&data->ctx, tx_bufs, rx_bufs, lpspi_data->word_size_bytes);
-
-	lpspi_data->tx_total_len = spi_context_total_tx_len(&data->ctx);
-	lpspi_data->rx_total_len = spi_context_total_rx_len(&data->ctx);
+	spi_context_buffers_setup(ctx, tx_bufs, rx_bufs, lpspi_data->word_size_bytes);
 
 	ret = spi_mcux_configure(dev, spi_cfg);
 	if (ret) {
-		goto out;
+		goto error;
 	}
 
-	LPSPI_FlushFifo(base, true, true);
-	LPSPI_ClearStatusFlags(base, (uint32_t)kLPSPI_AllStatusFlag);
-	LPSPI_DisableInterrupts(base, (uint32_t)kLPSPI_AllInterruptEnable);
+	base->CR |= LPSPI_CR_RTF_MASK | LPSPI_CR_RRF_MASK; /* flush fifos */
+	base->IER = 0;                                     /* disable all interrupts */
+	base->FCR = 0;                                     /* set watermarks to 0 */
+	base->SR |= LPSPI_INTERRUPT_BITS;
 
 	LOG_DBG("Starting LPSPI transfer");
-	spi_context_cs_control(&data->ctx, true);
+	spi_context_cs_control(ctx, true);
 
-	LPSPI_SetFifoWatermarks(base, 0, 0);
-	LPSPI_Enable(base, true);
+	base->CR |= LPSPI_CR_MEN_MASK;
 
 	/* keep the chip select asserted until the end of the zephyr xfer */
-	base->TCR |= LPSPI_TCR_CONT_MASK | LPSPI_TCR_CONTC_MASK;
+	base->TCR |= LPSPI_TCR_CONT_MASK;
 	/* tcr is written to tx fifo */
 	lpspi_wait_tx_fifo_empty(dev);
 
 	/* start the transfer sequence which are handled by irqs */
 	lpspi_next_tx_fill(dev);
 
-	LPSPI_EnableInterrupts(base, (uint32_t)kLPSPI_TxInterruptEnable |
-				     (uint32_t)kLPSPI_RxInterruptEnable);
+	base->IER |= LPSPI_IER_TDIE_MASK | LPSPI_IER_RDIE_MASK;
 
-	ret = spi_context_wait_for_completion(&data->ctx);
-out:
-	spi_context_release(&data->ctx, ret);
+	ret = spi_context_wait_for_completion(ctx);
+	if (ret >= 0) {
+		return ret;
+	}
 
+error:
+	spi_context_release(ctx, ret);
 	return ret;
 }
 
-static int spi_mcux_transceive_sync(const struct device *dev, const struct spi_config *spi_cfg,
+static int lpspi_transceive_sync(const struct device *dev, const struct spi_config *spi_cfg,
 				    const struct spi_buf_set *tx_bufs,
 				    const struct spi_buf_set *rx_bufs)
 {
@@ -306,7 +288,7 @@ static int spi_mcux_transceive_sync(const struct device *dev, const struct spi_c
 }
 
 #ifdef CONFIG_SPI_ASYNC
-static int spi_mcux_transceive_async(const struct device *dev, const struct spi_config *spi_cfg,
+static int lpspi_transceive_async(const struct device *dev, const struct spi_config *spi_cfg,
 				     const struct spi_buf_set *tx_bufs,
 				     const struct spi_buf_set *rx_bufs, spi_callback_t cb,
 				     void *userdata)
@@ -315,20 +297,20 @@ static int spi_mcux_transceive_async(const struct device *dev, const struct spi_
 }
 #endif /* CONFIG_SPI_ASYNC */
 
-static DEVICE_API(spi, spi_mcux_driver_api) = {
-	.transceive = spi_mcux_transceive_sync,
+static DEVICE_API(spi, lpspi_driver_api) = {
+	.transceive = lpspi_transceive_sync,
 #ifdef CONFIG_SPI_ASYNC
-	.transceive_async = spi_mcux_transceive_async,
+	.transceive_async = lpspi_transceive_async,
 #endif
 #ifdef CONFIG_SPI_RTIO
 	.iodev_submit = spi_rtio_iodev_default_submit,
 #endif
-	.release = spi_mcux_release,
+	.release = spi_lpspi_release,
 };
 
-static int spi_mcux_init(const struct device *dev)
+static int lpspi_init(const struct device *dev)
 {
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	int err = 0;
 
 	err = spi_nxp_init_common(dev);
@@ -343,23 +325,23 @@ static int spi_mcux_init(const struct device *dev)
 
 #define LPSPI_INIT(n)                                                                              \
 	SPI_NXP_LPSPI_COMMON_INIT(n)                                                               \
-	SPI_MCUX_LPSPI_CONFIG_INIT(n)                                                              \
+	SPI_LPSPI_CONFIG_INIT(n)                                                              \
                                                                                                    \
 	static struct lpspi_driver_data lpspi_##n##_driver_data;                                   \
                                                                                                    \
-	static struct spi_mcux_data spi_mcux_data_##n = {                                          \
+	static struct lpspi_data lpspi_data_##n = {                                             \
 		SPI_NXP_LPSPI_COMMON_DATA_INIT(n)                                                  \
 		.driver_data = &lpspi_##n##_driver_data,                                           \
 	};                                                                                         \
                                                                                                    \
-	SPI_DEVICE_DT_INST_DEFINE(n, spi_mcux_init, NULL, &spi_mcux_data_##n,                      \
-				  &spi_mcux_config_##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,     \
-				  &spi_mcux_driver_api);
+	SPI_DEVICE_DT_INST_DEFINE(n, lpspi_init, NULL, &lpspi_data_##n,                            \
+				  &lpspi_config_##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,     \
+				  &lpspi_driver_api);
 
-#define SPI_MCUX_LPSPI_INIT_IF_DMA(n) IF_DISABLED(SPI_NXP_LPSPI_HAS_DMAS(n), (LPSPI_INIT(n)))
+#define SPI_LPSPI_INIT_IF_DMA(n) IF_DISABLED(SPI_NXP_LPSPI_HAS_DMAS(n), (LPSPI_INIT(n)))
 
-#define SPI_MCUX_LPSPI_INIT(n)                                                                     \
+#define SPI_LPSPI_INIT(n)                                                                     \
 	COND_CODE_1(CONFIG_SPI_MCUX_LPSPI_DMA,				   \
-						(SPI_MCUX_LPSPI_INIT_IF_DMA(n)), (LPSPI_INIT(n)))
+						(SPI_LPSPI_INIT_IF_DMA(n)), (LPSPI_INIT(n)))
 
-DT_INST_FOREACH_STATUS_OKAY(SPI_MCUX_LPSPI_INIT)
+DT_INST_FOREACH_STATUS_OKAY(SPI_LPSPI_INIT)
diff --git a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_common.c b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_common.c
index f1edead9e6c33..7f65b2c9cd0ea 100644
--- a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_common.c
+++ b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_common.c
@@ -1,36 +1,83 @@
 /*
- * Copyright 2018, 2024 NXP
+ * Copyright 2018, 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(spi_mcux_lpspi_common, CONFIG_SPI_LOG_LEVEL);
+LOG_MODULE_REGISTER(spi_lpspi_common, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_nxp_lpspi_priv.h"
+#include <fsl_lpspi.h>
 
-int spi_mcux_release(const struct device *dev, const struct spi_config *spi_cfg)
+#if defined(LPSPI_RSTS) || defined(LPSPI_CLOCKS)
+static LPSPI_Type *const lpspi_bases[] = LPSPI_BASE_PTRS;
+#endif
+
+#ifdef LPSPI_RSTS
+static const reset_ip_name_t lpspi_resets[] = LPSPI_RSTS;
+
+static inline reset_ip_name_t lpspi_get_reset(LPSPI_Type *const base)
+{
+	reset_ip_name_t rst = -1; /* invalid initial value */
+
+	ARRAY_FOR_EACH(lpspi_bases, idx) {
+		if (lpspi_bases[idx] == base) {
+			rst = lpspi_resets[idx];
+			break;
+		}
+	}
+
+	__ASSERT_NO_MSG(rst != -1);
+	return rst;
+
+}
+#endif
+
+#ifdef LPSPI_CLOCKS
+static const clock_ip_name_t lpspi_clocks[] = LPSPI_CLOCKS;
+
+static inline clock_ip_name_t lpspi_get_clock(LPSPI_Type *const base)
 {
-	struct spi_mcux_data *data = dev->data;
+	clock_ip_name_t clk = -1; /* invalid initial value */
+
+	ARRAY_FOR_EACH(lpspi_bases, idx) {
+		if (lpspi_bases[idx] == base) {
+			clk = lpspi_clocks[idx];
+			break;
+		}
+	}
+
+	__ASSERT_NO_MSG(clk != -1);
+	return clk;
+}
+#endif
+
+void lpspi_wait_tx_fifo_empty(const struct device *dev)
+{
+	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
+
+	while (LPSPI_GetTxFifoCount(base) != 0) {
+	}
+}
+
+int spi_lpspi_release(const struct device *dev, const struct spi_config *spi_cfg)
+{
+	struct lpspi_data *data = dev->data;
 
 	spi_context_unlock_unconditionally(&data->ctx);
 
 	return 0;
 }
 
-int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg)
+static inline int lpspi_validate_xfer_args(const struct spi_config *spi_cfg)
 {
-	const struct spi_mcux_config *config = dev->config;
-	struct spi_mcux_data *data = dev->data;
-	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
 	uint32_t word_size = SPI_WORD_SIZE_GET(spi_cfg->operation);
-	lpspi_master_config_t master_config;
-	uint32_t clock_freq;
-	int ret;
+	uint32_t pcs = spi_cfg->slave;
 
 	if (spi_cfg->operation & SPI_HALF_DUPLEX) {
 		/* the IP DOES support half duplex, need to implement driver support */
-		LOG_ERR("Half-duplex not supported");
+		LOG_WRN("Half-duplex not supported");
 		return -ENOTSUP;
 	}
 
@@ -42,22 +89,49 @@ int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cf
 		 * Minimum hardware word size is 2. Since this driver is intended to work
 		 * for 32 bit platforms, and 64 bits is max size, then only 33 and 1 are invalid.
 		 */
-		LOG_ERR("Word size %d not allowed", word_size);
+		LOG_WRN("Word size %d not allowed", word_size);
 		return -EINVAL;
 	}
 
-	if (spi_cfg->slave > LPSPI_CHIP_SELECT_COUNT) {
-		LOG_ERR("Peripheral %d select exceeds max %d", spi_cfg->slave,
-			LPSPI_CHIP_SELECT_COUNT - 1);
+	if (pcs > LPSPI_CHIP_SELECT_COUNT - 1) {
+		LOG_WRN("Peripheral %d select exceeds max %d", pcs, LPSPI_CHIP_SELECT_COUNT - 1);
 		return -EINVAL;
 	}
 
+	return 0;
+}
+
+int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg)
+{
+	const struct lpspi_config *config = dev->config;
+	struct lpspi_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
+	bool already_configured = spi_context_configured(ctx, spi_cfg);
+	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
+	uint32_t word_size = SPI_WORD_SIZE_GET(spi_cfg->operation);
+	lpspi_master_config_t master_config;
+	uint32_t clock_freq;
+	int ret;
+
+	/* fast path to avoid reconfigure */
+	/* TODO: S32K3 errata ERR050456 requiring module reset before every transfer,
+	 * investigate alternative workaround so we don't have this latency for S32.
+	 */
+	if (already_configured && !IS_ENABLED(CONFIG_SOC_FAMILY_NXP_S32)) {
+		return 0;
+	}
+
+	ret = lpspi_validate_xfer_args(spi_cfg);
+	if (ret) {
+		return ret;
+	}
+
 	ret = clock_control_get_rate(config->clock_dev, config->clock_subsys, &clock_freq);
 	if (ret) {
 		return ret;
 	}
 
-	if (data->ctx.config != NULL) {
+	if (already_configured) {
 		/* Setting the baud rate in LPSPI_MasterInit requires module to be disabled. Only
 		 * disable if already configured, otherwise the clock is not enabled and the
 		 * CR register cannot be written.
@@ -69,6 +143,11 @@ int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cf
 			 * completed the current transfer and is idle.
 			 */
 		}
+
+		/* this is workaround for ERR050456 */
+		base->CR |= LPSPI_CR_RST_MASK;
+		base->CR |= LPSPI_CR_RRF_MASK | LPSPI_CR_RTF_MASK;
+		base->CR = 0x00U;
 	}
 
 	data->ctx.config = spi_cfg;
@@ -88,9 +167,12 @@ int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cf
 	master_config.pcsToSckDelayInNanoSec = config->pcs_sck_delay;
 	master_config.lastSckToPcsDelayInNanoSec = config->sck_pcs_delay;
 	master_config.betweenTransferDelayInNanoSec = config->transfer_delay;
+	master_config.whichPcs = spi_cfg->slave + kLPSPI_Pcs0;
+	master_config.pcsActiveHighOrLow = (spi_cfg->operation & SPI_CS_ACTIVE_HIGH)
+				    ? kLPSPI_PcsActiveHigh : kLPSPI_PcsActiveLow;
 	master_config.pinCfg = config->data_pin_config;
-	master_config.dataOutConfig = config->output_config ? kLpspiDataOutTristate :
-							      kLpspiDataOutRetained;
+	master_config.dataOutConfig = config->tristate_output ? kLpspiDataOutTristate :
+								kLpspiDataOutRetained;
 
 	LPSPI_MasterInit(base, &master_config, clock_freq);
 	LPSPI_SetDummyData(base, 0);
@@ -102,10 +184,22 @@ int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cf
 	return 0;
 }
 
+static void lpspi_module_system_init(LPSPI_Type *base)
+{
+#ifdef LPSPI_CLOCKS
+	CLOCK_EnableClock(lpspi_get_clock(base));
+#endif
+
+#ifdef LPSPI_RSTS
+	RESET_ReleasePeripheralReset(lpspi_get_reset(base));
+#endif
+}
+
 int spi_nxp_init_common(const struct device *dev)
 {
-	const struct spi_mcux_config *config = dev->config;
-	struct spi_mcux_data *data = dev->data;
+	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
+	const struct lpspi_config *config = dev->config;
+	struct lpspi_data *data = dev->data;
 	int err = 0;
 
 	DEVICE_MMIO_NAMED_MAP(dev, reg_base, K_MEM_CACHE_NONE | K_MEM_DIRECT_MAP);
@@ -117,6 +211,8 @@ int spi_nxp_init_common(const struct device *dev)
 		return -ENODEV;
 	}
 
+	lpspi_module_system_init(base);
+
 	err = spi_context_cs_configure_all(&data->ctx);
 	if (err < 0) {
 		return err;
@@ -127,6 +223,8 @@ int spi_nxp_init_common(const struct device *dev)
 		return err;
 	}
 
+	LPSPI_Reset(base);
+
 	config->irq_config_func(dev);
 
 	return err;
diff --git a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c
index 7ad3a3206de7f..061d0bd7dc030 100644
--- a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c
+++ b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c
@@ -7,106 +7,39 @@
 #define DT_DRV_COMPAT nxp_lpspi
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(spi_mcux_lpspi_dma, CONFIG_SPI_LOG_LEVEL);
+LOG_MODULE_REGISTER(spi_lpspi_dma, CONFIG_SPI_LOG_LEVEL);
 
 #include <zephyr/drivers/dma.h>
 #include "spi_nxp_lpspi_priv.h"
 
+/* dummy memory used for transferring NOP when tx buf is null */
+static uint32_t tx_nop_val; /* check compliance says no init to 0, but should be 0 in bss */
+/* dummy memory for transferring to when RX buf is null */
+static uint32_t dummy_buffer;
+
 struct spi_dma_stream {
 	const struct device *dma_dev;
-	uint32_t channel; /* stores the channel for dma */
+	uint32_t channel;
 	struct dma_config dma_cfg;
 	struct dma_block_config dma_blk_cfg;
+	bool chunk_done;
 };
 
 struct spi_nxp_dma_data {
-	volatile uint32_t status_flags;
 	struct spi_dma_stream dma_rx;
 	struct spi_dma_stream dma_tx;
-	/* dummy value used for transferring NOP when tx buf is null */
-	uint32_t dummy_buffer;
 };
 
-/* These flags are arbitrary */
-#define LPSPI_DMA_ERROR_FLAG   BIT(0)
-#define LPSPI_DMA_RX_DONE_FLAG BIT(1)
-#define LPSPI_DMA_TX_DONE_FLAG BIT(2)
-#define LPSPI_DMA_DONE_FLAG    (LPSPI_DMA_RX_DONE_FLAG | LPSPI_DMA_TX_DONE_FLAG)
-
-/* This function is executed in the interrupt context */
-static void spi_mcux_dma_callback(const struct device *dev, void *arg, uint32_t channel, int status)
-{
-	/* arg directly holds the spi device */
-	const struct device *spi_dev = arg;
-	struct spi_mcux_data *data = (struct spi_mcux_data *)spi_dev->data;
-	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
-	char debug_char;
-
-	if (status < 0) {
-		goto error;
-	}
-
-	/* identify the origin of this callback */
-	if (channel == dma_data->dma_tx.channel) {
-		/* this part of the transfer ends */
-		dma_data->status_flags |= LPSPI_DMA_TX_DONE_FLAG;
-		debug_char = 'T';
-	} else if (channel == dma_data->dma_rx.channel) {
-		/* this part of the transfer ends */
-		dma_data->status_flags |= LPSPI_DMA_RX_DONE_FLAG;
-		debug_char = 'R';
-	} else {
-		goto error;
-	}
-
-	LOG_DBG("DMA %cX Block Complete", debug_char);
-
-#if CONFIG_SPI_ASYNC
-	if (data->ctx.asynchronous && (dma_data->status_flags & LPSPI_DMA_DONE_FLAG)) {
-		/* Load dma blocks of equal length */
-		size_t dma_size = spi_context_max_continuous_chunk(data->ctx);
-
-		if (dma_size != 0) {
-			return;
-		}
-
-		spi_context_update_tx(&data->ctx, 1, dma_size);
-		spi_context_update_rx(&data->ctx, 1, dma_size);
-	}
-#endif
-
-	goto done;
-error:
-	LOG_ERR("DMA callback error with channel %d.", channel);
-	dma_data->status_flags |= LPSPI_DMA_ERROR_FLAG;
-done:
-	spi_context_complete(&data->ctx, spi_dev, 0);
-}
-
-static struct dma_block_config *spi_mcux_dma_common_load(struct spi_dma_stream *stream,
+static struct dma_block_config *lpspi_dma_common_load(struct spi_dma_stream *stream,
 							 const struct device *dev,
 							 const uint8_t *buf, size_t len)
 {
-	struct spi_mcux_data *data = dev->data;
-	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
 	struct dma_block_config *blk_cfg = &stream->dma_blk_cfg;
 
-	/* prepare the block for this TX DMA channel */
 	memset(blk_cfg, 0, sizeof(struct dma_block_config));
 
 	blk_cfg->block_size = len;
 
-	if (buf == NULL) {
-		blk_cfg->source_address = (uint32_t)&dma_data->dummy_buffer;
-		blk_cfg->dest_address = (uint32_t)&dma_data->dummy_buffer;
-		/* pretend it is peripheral xfer so DMA just xfer to dummy buf */
-		stream->dma_cfg.channel_direction = PERIPHERAL_TO_PERIPHERAL;
-	} else {
-		blk_cfg->source_address = (uint32_t)buf;
-		blk_cfg->dest_address = (uint32_t)buf;
-	}
-
-	/* Transfer 1 byte each DMA loop */
 	stream->dma_cfg.source_burst_length = 1;
 	stream->dma_cfg.user_data = (void *)dev;
 	stream->dma_cfg.head_block = blk_cfg;
@@ -114,218 +47,210 @@ static struct dma_block_config *spi_mcux_dma_common_load(struct spi_dma_stream *
 	return blk_cfg;
 }
 
-static int spi_mcux_dma_tx_load(const struct device *dev, const uint8_t *buf, size_t len)
+static int lpspi_dma_tx_load(const struct device *dev, const uint8_t *buf, size_t len)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
-	/* remember active TX DMA channel (used in callback) */
 	struct spi_dma_stream *stream = &dma_data->dma_tx;
-	struct dma_block_config *blk_cfg = spi_mcux_dma_common_load(stream, dev, buf, len);
+	struct dma_block_config *blk_cfg = lpspi_dma_common_load(stream, dev, buf, len);
 
-	if (buf != NULL) {
-		/* tx direction has memory as source and periph as dest. */
+	if (buf == NULL) {
+		/* pretend that nop value comes from peripheral so dma doesn't move source */
+		blk_cfg->source_address = (uint32_t)&tx_nop_val;
+		stream->dma_cfg.channel_direction = PERIPHERAL_TO_PERIPHERAL;
+	} else {
+		blk_cfg->source_address = (uint32_t)buf;
 		stream->dma_cfg.channel_direction = MEMORY_TO_PERIPHERAL;
 	}
 
-	/* Dest is LPSPI tx fifo */
-	blk_cfg->dest_address = LPSPI_GetTxRegisterAddress(base);
+	blk_cfg->dest_address = (uint32_t) &(base->TDR);
 
-	/* give the client dev as arg, as the callback comes from the dma */
-	/* pass our client origin to the dma: data->dma_tx.dma_channel */
 	return dma_config(stream->dma_dev, stream->channel, &stream->dma_cfg);
 }
 
-static int spi_mcux_dma_rx_load(const struct device *dev, uint8_t *buf, size_t len)
+static int lpspi_dma_rx_load(const struct device *dev, uint8_t *buf, size_t len)
 {
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
-	/* retrieve active RX DMA channel (used in callback) */
 	struct spi_dma_stream *stream = &dma_data->dma_rx;
-	struct dma_block_config *blk_cfg = spi_mcux_dma_common_load(stream, dev, buf, len);
+	struct dma_block_config *blk_cfg = lpspi_dma_common_load(stream, dev, buf, len);
 
-	if (buf != NULL) {
-		/* rx direction has periph as source and mem as dest. */
+	if (buf == NULL) {
+		/* pretend it is peripheral xfer so DMA just xfer to dummy buf */
+		stream->dma_cfg.channel_direction = PERIPHERAL_TO_PERIPHERAL;
+		blk_cfg->dest_address = (uint32_t)&dummy_buffer;
+	} else {
 		stream->dma_cfg.channel_direction = PERIPHERAL_TO_MEMORY;
+		blk_cfg->dest_address = (uint32_t)buf;
 	}
 
-	/* Source is LPSPI rx fifo */
-	blk_cfg->source_address = LPSPI_GetRxRegisterAddress(base);
+	blk_cfg->source_address = (uint32_t) &(base->RDR);
 
-	/* pass our client origin to the dma: data->dma_rx.channel */
 	return dma_config(stream->dma_dev, stream->channel, &stream->dma_cfg);
 }
 
-static int wait_dma_rx_tx_done(const struct device *dev)
+static inline int lpspi_dma_rxtx_load(const struct device *dev)
 {
-	struct spi_mcux_data *data = dev->data;
-	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
-	int ret;
-
-	do {
-		ret = spi_context_wait_for_completion(&data->ctx);
-		if (ret) {
-			LOG_DBG("Timed out waiting for SPI context to complete");
-			return ret;
-		} else if (dma_data->status_flags & LPSPI_DMA_ERROR_FLAG) {
-			return -EIO;
-		}
-	} while (!((dma_data->status_flags & LPSPI_DMA_DONE_FLAG) == LPSPI_DMA_DONE_FLAG));
-
-	LOG_DBG("DMA block completed");
-	return 0;
-}
-
-static inline int spi_mcux_dma_rxtx_load(const struct device *dev, size_t *dma_size)
-{
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
 	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
+	struct spi_dma_stream *rx = &dma_data->dma_rx;
+	struct spi_dma_stream *tx = &dma_data->dma_tx;
 	struct spi_context *ctx = &data->ctx;
+	size_t next_chunk_size = spi_context_max_continuous_chunk(ctx);
 	int ret = 0;
 
-	/* Clear status flags */
-	dma_data->status_flags = 0U;
-
-	/* Load dma blocks of equal length */
-	*dma_size = spi_context_max_continuous_chunk(ctx);
+	if (next_chunk_size == 0) {
+		/* In case both buffers are 0 length, we should not even be here
+		 * and attempting to set up a DMA transfer like this will cause
+		 * errors that lock up the system in some cases with eDMA.
+		 */
+		return -ENODATA;
+	}
 
-	ret = spi_mcux_dma_tx_load(dev, ctx->tx_buf, *dma_size);
+	ret = lpspi_dma_tx_load(dev, ctx->tx_buf, next_chunk_size);
 	if (ret != 0) {
 		return ret;
 	}
 
-	ret = spi_mcux_dma_rx_load(dev, ctx->rx_buf, *dma_size);
+	ret = lpspi_dma_rx_load(dev, ctx->rx_buf, next_chunk_size);
 	if (ret != 0) {
 		return ret;
 	}
 
-	/* Start DMA */
-	ret = dma_start(dma_data->dma_tx.dma_dev, dma_data->dma_tx.channel);
+	ret = dma_start(rx->dma_dev, rx->channel);
 	if (ret != 0) {
 		return ret;
 	}
 
-	ret = dma_start(dma_data->dma_rx.dma_dev, dma_data->dma_rx.channel);
-	return ret;
+	return dma_start(tx->dma_dev, tx->channel);
 }
 
-#ifdef CONFIG_SPI_ASYNC
-static int transceive_dma_async(const struct device *dev, spi_callback_t cb, void *userdata)
+static int lpspi_dma_next_fill(const struct device *dev)
 {
-	struct spi_mcux_data *data = dev->data;
-	struct spi_context *ctx = &data->ctx;
-	size_t dma_size;
-	int ret;
-
-	ctx->asynchronous = true;
-	ctx->callback = cb;
-	ctx->callback_data = userdata;
-
-	ret = spi_mcux_dma_rxtx_load(dev, &dma_size);
-	if (ret) {
-		return ret;
-	}
+	struct lpspi_data *data = (struct lpspi_data *)dev->data;
+	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
+	struct spi_dma_stream *rx = &dma_data->dma_rx;
+	struct spi_dma_stream *tx = &dma_data->dma_tx;
 
-	/* Enable DMA Requests */
-	LPSPI_EnableDMA(base, kLPSPI_TxDmaEnable | kLPSPI_RxDmaEnable);
+	rx->chunk_done = false;
+	tx->chunk_done = false;
 
-	return 0;
+	return lpspi_dma_rxtx_load(dev);
 }
-#else
-#define transceive_dma_async(...) 0
-#endif /* CONFIG_SPI_ASYNC */
 
-static int transceive_dma_sync(const struct device *dev)
+static void spi_mcux_dma_callback(const struct device *dev, void *arg, uint32_t channel, int status)
 {
-	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
-	struct spi_mcux_data *data = dev->data;
+	const struct device *spi_dev = arg;
+	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(spi_dev, reg_base);
+	struct lpspi_data *data = (struct lpspi_data *)spi_dev->data;
+	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
+	struct spi_dma_stream *rx = &dma_data->dma_rx;
+	struct spi_dma_stream *tx = &dma_data->dma_tx;
 	struct spi_context *ctx = &data->ctx;
-	size_t dma_size;
-	int ret;
-
-	spi_context_cs_control(ctx, true);
+	char debug_char;
 
-	/* Send each spi buf via DMA, updating context as DMA completes */
-	while (ctx->rx_len > 0 || ctx->tx_len > 0) {
-		/* Load dma block */
-		ret = spi_mcux_dma_rxtx_load(dev, &dma_size);
-		if (ret) {
-			return ret;
-		}
-
-#ifdef CONFIG_SOC_SERIES_MCXN
-		while (!(LPSPI_GetStatusFlags(base) & kLPSPI_TxDataRequestFlag)) {
-			/* wait until previous tx finished */
-		}
-#endif
+	if (status < 0) {
+		goto error;
+	} else {
+		/* don't care about positive values, normalize to "okay" = 0 */
+		status = 0;
+	}
 
-		/* Enable DMA Requests */
-		LPSPI_EnableDMA(base, kLPSPI_TxDmaEnable | kLPSPI_RxDmaEnable);
+	if (channel == rx->channel) {
+		spi_context_update_rx(ctx, 1, rx->dma_blk_cfg.block_size);
+		debug_char = 'R';
+		rx->chunk_done = true;
+	} else if (channel == tx->channel) {
+		spi_context_update_tx(ctx, 1, tx->dma_blk_cfg.block_size);
+		debug_char = 'T';
+		tx->chunk_done = true;
+	} else {
+		/* invalid channel */
+		status = -EIO;
+		goto error;
+	}
 
-		/* Wait for DMA to finish */
-		ret = wait_dma_rx_tx_done(dev);
-		if (ret) {
-			return ret;
-		}
+	LOG_DBG("DMA %cX Block Complete", debug_char);
 
-#ifndef CONFIG_SOC_SERIES_MCXN
-		while ((LPSPI_GetStatusFlags(base) & kLPSPI_ModuleBusyFlag)) {
-			/* wait until module is idle */
-		}
-#endif
+	/* wait for the other channel to finish if needed */
+	if (!rx->chunk_done || !tx->chunk_done) {
+		return;
+	}
 
-		/* Disable DMA */
-		LPSPI_DisableDMA(base, kLPSPI_TxDmaEnable | kLPSPI_RxDmaEnable);
 
-		/* Update SPI contexts with amount of data we just sent */
-		spi_context_update_tx(ctx, 1, dma_size);
-		spi_context_update_rx(ctx, 1, dma_size);
+	while ((IS_ENABLED(CONFIG_SOC_FAMILY_NXP_IMXRT) ||
+		IS_ENABLED(CONFIG_SOC_FAMILY_KINETIS)) &&
+		(base->SR & LPSPI_SR_MBF_MASK)) {
+		/* wait until module is idle */
 	}
 
-	spi_context_cs_control(ctx, false);
+	if (spi_context_max_continuous_chunk(ctx) == 0) {
+		goto done;
+	}
 
-	base->TCR = 0;
+	status = lpspi_dma_next_fill(spi_dev);
+	if (status) {
+		goto error;
+	}
 
-	return 0;
+	return;
+error:
+	LOG_ERR("DMA callback error with channel %d err %d.", channel, status);
+done:
+	base->DER &= ~(LPSPI_DER_TDDE_MASK | LPSPI_DER_RDDE_MASK);
+	base->TCR &= ~LPSPI_TCR_CONT_MASK;
+	lpspi_wait_tx_fifo_empty(spi_dev);
+	spi_context_cs_control(ctx, false);
+	base->CR |= LPSPI_CR_RTF_MASK | LPSPI_CR_RRF_MASK;
+	spi_context_complete(ctx, spi_dev, status);
+	spi_context_release(ctx, status);
 }
 
 static int transceive_dma(const struct device *dev, const struct spi_config *spi_cfg,
 			  const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs,
 			  bool asynchronous, spi_callback_t cb, void *userdata)
 {
-	struct spi_mcux_data *data = dev->data;
 	LPSPI_Type *base = (LPSPI_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
+	struct lpspi_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
 	int ret;
 
-	if (!asynchronous) {
-		spi_context_lock(&data->ctx, asynchronous, cb, userdata, spi_cfg);
-	}
+	spi_context_lock(ctx, asynchronous, cb, userdata, spi_cfg);
 
 	ret = spi_mcux_configure(dev, spi_cfg);
-	if (ret && !asynchronous) {
+	if (ret) {
+		goto out;
+	}
+
+	spi_context_buffers_setup(ctx, tx_bufs, rx_bufs, 1);
+
+	ret = lpspi_dma_next_fill(dev);
+	if (ret == -ENODATA) {
+		/* No transfer to do? So just exit */
+		ret = 0;
 		goto out;
 	} else if (ret) {
-		return ret;
+		goto out;
 	}
 
-#ifdef CONFIG_SOC_SERIES_MCXN
-	base->TCR |= LPSPI_TCR_CONT_MASK;
-#endif
+	if (!(IS_ENABLED(CONFIG_SOC_FAMILY_NXP_IMXRT) || IS_ENABLED(CONFIG_SOC_FAMILY_KINETIS))) {
+		base->TCR |= LPSPI_TCR_CONT_MASK;
+	}
 
-	/* DMA is fast enough watermarks are not required */
-	LPSPI_SetFifoWatermarks(base, 0U, 0U);
+	spi_context_cs_control(ctx, true);
 
-	spi_context_buffers_setup(&data->ctx, tx_bufs, rx_bufs, 1);
+	base->CR |= LPSPI_CR_RTF_MASK | LPSPI_CR_RRF_MASK;
 
-	if (asynchronous) {
-		ret = transceive_dma_async(dev, cb, userdata);
-	} else {
-		ret = transceive_dma_sync(dev);
-	}
+	base->DER |= LPSPI_DER_TDDE_MASK | LPSPI_DER_RDDE_MASK;
 
+	ret = spi_context_wait_for_completion(ctx);
+	if (ret >= 0) {
+		return ret;
+	}
 out:
-	spi_context_release(&data->ctx, ret);
+	spi_context_release(ctx, ret);
 	return ret;
 }
 
@@ -333,28 +258,21 @@ static int lpspi_dma_dev_ready(const struct device *dma_dev)
 {
 	if (!device_is_ready(dma_dev)) {
 		LOG_ERR("%s device is not ready", dma_dev->name);
-		return -ENODEV;
+		return false;
 	}
 
-	return 0;
-}
-
-static int lpspi_dma_devs_ready(struct spi_mcux_data *data)
-{
-	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
-
-	return lpspi_dma_dev_ready(dma_data->dma_tx.dma_dev) |
-	       lpspi_dma_dev_ready(dma_data->dma_rx.dma_dev);
+	return true;
 }
 
 static int spi_mcux_dma_init(const struct device *dev)
 {
-	struct spi_mcux_data *data = dev->data;
+	struct lpspi_data *data = dev->data;
+	struct spi_nxp_dma_data *dma_data = (struct spi_nxp_dma_data *)data->driver_data;
 	int err = 0;
 
-	err = lpspi_dma_devs_ready(data);
-	if (err < 0) {
-		return err;
+	if (!lpspi_dma_dev_ready(dma_data->dma_tx.dma_dev) ||
+	    !lpspi_dma_dev_ready(dma_data->dma_rx.dma_dev)) {
+		return -ENODEV;
 	}
 
 	err = spi_nxp_init_common(dev);
@@ -384,7 +302,7 @@ static int spi_nxp_dma_transceive_async(const struct device *dev, const struct s
 }
 #endif /* CONFIG_SPI_ASYNC */
 
-static DEVICE_API(spi, spi_mcux_driver_api) = {
+static DEVICE_API(spi, lpspi_dma_driver_api) = {
 	.transceive = spi_nxp_dma_transceive_sync,
 #ifdef CONFIG_SPI_ASYNC
 	.transceive_async = spi_nxp_dma_transceive_async,
@@ -392,7 +310,7 @@ static DEVICE_API(spi, spi_mcux_driver_api) = {
 #ifdef CONFIG_SPI_RTIO
 	.iodev_submit = spi_rtio_iodev_default_submit,
 #endif
-	.release = spi_mcux_release,
+	.release = spi_lpspi_release,
 };
 
 static void lpspi_isr(const struct device *dev)
@@ -400,40 +318,38 @@ static void lpspi_isr(const struct device *dev)
 	/* ISR not used for DMA based LPSPI driver */
 }
 
+#define LPSPI_DMA_COMMON_CFG(n)			\
+	.dma_callback = spi_mcux_dma_callback,	\
+	.source_data_size = 1,			\
+	.dest_data_size = 1,			\
+	.block_count = 1
+
 #define SPI_DMA_CHANNELS(n)                                                                        \
-	IF_ENABLED(                                                                                \
-		DT_INST_DMAS_HAS_NAME(n, tx),                                                      \
+	IF_ENABLED(DT_INST_DMAS_HAS_NAME(n, tx),                                                   \
 		(.dma_tx = {.dma_dev = DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(n, tx)),            \
 			    .channel = DT_INST_DMAS_CELL_BY_NAME(n, tx, mux),                      \
 			    .dma_cfg = {.channel_direction = MEMORY_TO_PERIPHERAL,                 \
-					.dma_callback = spi_mcux_dma_callback,                     \
-					.source_data_size = 1,                                     \
-					.dest_data_size = 1,                                       \
-					.block_count = 1,                                          \
-					.dma_slot = DT_INST_DMAS_CELL_BY_NAME(n, tx, source)}},)) \
-	IF_ENABLED(                                                                                \
-		DT_INST_DMAS_HAS_NAME(n, rx),                                                      \
+			    LPSPI_DMA_COMMON_CFG(n),						   \
+			    .dma_slot = DT_INST_DMAS_CELL_BY_NAME(n, tx, source)}},))		   \
+	IF_ENABLED(DT_INST_DMAS_HAS_NAME(n, rx),                                                   \
 		(.dma_rx = {.dma_dev = DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(n, rx)),            \
 			    .channel = DT_INST_DMAS_CELL_BY_NAME(n, rx, mux),                      \
 			    .dma_cfg = {.channel_direction = PERIPHERAL_TO_MEMORY,                 \
-					.dma_callback = spi_mcux_dma_callback,                     \
-					.source_data_size = 1,                                     \
-					.dest_data_size = 1,                                       \
-					.block_count = 1,                                          \
-					.dma_slot = DT_INST_DMAS_CELL_BY_NAME(n, rx, source)}},))
+			    LPSPI_DMA_COMMON_CFG(n),						   \
+			    .dma_slot = DT_INST_DMAS_CELL_BY_NAME(n, rx, source)}},))
 
 #define LPSPI_DMA_INIT(n)                                                                          \
 	SPI_NXP_LPSPI_COMMON_INIT(n)                                                               \
-	SPI_MCUX_LPSPI_CONFIG_INIT(n)                                                              \
+	SPI_LPSPI_CONFIG_INIT(n)                                                              \
                                                                                                    \
 	static struct spi_nxp_dma_data lpspi_dma_data##n = {SPI_DMA_CHANNELS(n)};                  \
                                                                                                    \
-	static struct spi_mcux_data spi_mcux_data_##n = {.driver_data = &lpspi_dma_data##n,        \
+	static struct lpspi_data lpspi_data_##n = {.driver_data = &lpspi_dma_data##n,        \
 							 SPI_NXP_LPSPI_COMMON_DATA_INIT(n)};       \
                                                                                                    \
-	SPI_DEVICE_DT_INST_DEFINE(n, spi_mcux_dma_init, NULL, &spi_mcux_data_##n,                  \
-				  &spi_mcux_config_##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,     \
-				  &spi_mcux_driver_api);
+	SPI_DEVICE_DT_INST_DEFINE(n, spi_mcux_dma_init, NULL, &lpspi_data_##n,                  \
+				  &lpspi_config_##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,     \
+				  &lpspi_dma_driver_api);
 
 #define SPI_NXP_LPSPI_DMA_INIT(n) IF_ENABLED(SPI_NXP_LPSPI_HAS_DMAS(n), (LPSPI_DMA_INIT(n)))
 
diff --git a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_priv.h b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_priv.h
index 5108f6ebbc9c1..2054000de2e66 100644
--- a/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_priv.h
+++ b/drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, 2024 NXP
+ * Copyright 2018, 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@
 #include <zephyr/drivers/spi/rtio.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/__assert.h>
 #include <zephyr/irq.h>
 
 #include "../spi_context.h"
@@ -16,23 +17,19 @@
 #include <zephyr/drivers/mfd/nxp_lp_flexcomm.h>
 #endif
 
-#include <fsl_lpspi.h>
-
 /* If any hardware revisions change this, make it into a DT property.
  * DONT'T make #ifdefs here by platform.
  */
 #define LPSPI_CHIP_SELECT_COUNT   4
 #define LPSPI_MIN_FRAME_SIZE_BITS 8
 
-/* Required by DEVICE_MMIO_NAMED_* macros */
-#define DEV_CFG(_dev)  ((const struct spi_mcux_config *)(_dev)->config)
-#define DEV_DATA(_dev) ((struct spi_mcux_data *)(_dev)->data)
+#define LPSPI_INTERRUPT_BITS GENMASK(8, 13)
 
-/* flag for SDK API for master transfers */
-#define LPSPI_MASTER_XFER_CFG_FLAGS(slave)                                                         \
-	kLPSPI_MasterPcsContinuous | (slave << LPSPI_MASTER_PCS_SHIFT)
+/* Required by DEVICE_MMIO_NAMED_* macros */
+#define DEV_CFG(_dev)  ((const struct lpspi_config *)(_dev)->config)
+#define DEV_DATA(_dev) ((struct lpspi_data *)(_dev)->data)
 
-struct spi_mcux_config {
+struct lpspi_config {
 	DEVICE_MMIO_NAMED_ROM(reg_base);
 	const struct device *clock_dev;
 	clock_control_subsys_t clock_subsys;
@@ -41,14 +38,14 @@ struct spi_mcux_config {
 	uint32_t sck_pcs_delay;
 	uint32_t transfer_delay;
 	const struct pinctrl_dev_config *pincfg;
-	lpspi_pin_config_t data_pin_config;
-	bool output_config;
+	uint8_t data_pin_config;
+	bool tristate_output;
 	uint8_t tx_fifo_size;
 	uint8_t rx_fifo_size;
 	uint8_t irqn;
 };
 
-struct spi_mcux_data {
+struct lpspi_data {
 	DEVICE_MMIO_NAMED_RAM(reg_base);
 	const struct device *dev;
 	struct spi_context ctx;
@@ -56,7 +53,7 @@ struct spi_mcux_data {
 	size_t transfer_len;
 };
 
-/* common configure function that verifies spi_cfg validity and set up configuration parameters */
+/* verifies spi_cfg validity and set up configuration of hardware for xfer */
 int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg);
 
 /* Does these things:
@@ -69,34 +66,33 @@ int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cf
 int spi_nxp_init_common(const struct device *dev);
 
 /* common api function for now */
-int spi_mcux_release(const struct device *dev, const struct spi_config *spi_cfg);
+int spi_lpspi_release(const struct device *dev, const struct spi_config *spi_cfg);
 
-/* Argument to MCUX SDK IRQ handler */
-#define LPSPI_IRQ_HANDLE_ARG COND_CODE_1(CONFIG_NXP_LP_FLEXCOMM, (LPSPI_GetInstance(base)), (base))
+void lpspi_wait_tx_fifo_empty(const struct device *dev);
 
-#define SPI_MCUX_LPSPI_IRQ_FUNC_LP_FLEXCOMM(n)                                                     \
+#define SPI_LPSPI_IRQ_FUNC_LP_FLEXCOMM(n)                                                     \
 	nxp_lp_flexcomm_setirqhandler(DEVICE_DT_GET(DT_INST_PARENT(n)), DEVICE_DT_INST_GET(n),     \
 				      LP_FLEXCOMM_PERIPH_LPSPI, lpspi_isr);
 
-#define SPI_MCUX_LPSPI_IRQ_FUNC_DISTINCT(n)                                                        \
+#define SPI_LPSPI_IRQ_FUNC_DISTINCT(n)                                                        \
 	IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), lpspi_isr, DEVICE_DT_INST_GET(n),   \
 		    0);                                                                            \
 	irq_enable(DT_INST_IRQN(n));
 
-#define SPI_MCUX_LPSPI_IRQ_FUNC(n) COND_CODE_1(DT_NODE_HAS_COMPAT(DT_INST_PARENT(n),		   \
-								  nxp_lp_flexcomm),		   \
-						(SPI_MCUX_LPSPI_IRQ_FUNC_LP_FLEXCOMM(n)),	   \
-						(SPI_MCUX_LPSPI_IRQ_FUNC_DISTINCT(n)))
+#define SPI_LPSPI_IRQ_FUNC(n) COND_CODE_1(DT_NODE_HAS_COMPAT(DT_INST_PARENT(n),                    \
+								  nxp_lp_flexcomm),                \
+						(SPI_LPSPI_IRQ_FUNC_LP_FLEXCOMM(n)),               \
+						(SPI_LPSPI_IRQ_FUNC_DISTINCT(n)))
 
 #define LPSPI_IRQN(n) COND_CODE_1(DT_NODE_HAS_COMPAT(DT_INST_PARENT(n), nxp_lp_flexcomm),	   \
 					(DT_IRQN(DT_INST_PARENT(n))), (DT_INST_IRQN(n)))
 
-#define SPI_MCUX_LPSPI_CONFIG_INIT(n)                                                              \
-	static const struct spi_mcux_config spi_mcux_config_##n = {                                \
+#define SPI_LPSPI_CONFIG_INIT(n)                                                              \
+	static const struct lpspi_config lpspi_config_##n = {                                \
 		DEVICE_MMIO_NAMED_ROM_INIT(reg_base, DT_DRV_INST(n)),                              \
 		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),                                \
 		.clock_subsys = (clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),              \
-		.irq_config_func = spi_mcux_config_func_##n,                                       \
+		.irq_config_func = lpspi_config_func_##n,                                          \
 		.pcs_sck_delay = UTIL_AND(DT_INST_NODE_HAS_PROP(n, pcs_sck_delay),                 \
 					  DT_INST_PROP(n, pcs_sck_delay)),                         \
 		.sck_pcs_delay = UTIL_AND(DT_INST_NODE_HAS_PROP(n, sck_pcs_delay),                 \
@@ -104,8 +100,8 @@ int spi_mcux_release(const struct device *dev, const struct spi_config *spi_cfg)
 		.transfer_delay = UTIL_AND(DT_INST_NODE_HAS_PROP(n, transfer_delay),               \
 					   DT_INST_PROP(n, transfer_delay)),                       \
 		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),                                       \
-		.data_pin_config = DT_INST_ENUM_IDX(n, data_pin_config),                           \
-		.output_config = DT_INST_PROP(n, tristate_output),                                 \
+		.data_pin_config = (uint8_t)DT_INST_ENUM_IDX(n, data_pin_config),                  \
+		.tristate_output = DT_INST_PROP(n, tristate_output),                               \
 		.rx_fifo_size = (uint8_t)DT_INST_PROP(n, rx_fifo_size),                            \
 		.tx_fifo_size = (uint8_t)DT_INST_PROP(n, tx_fifo_size),                            \
 		.irqn = (uint8_t)LPSPI_IRQN(n),                                                    \
@@ -114,14 +110,14 @@ int spi_mcux_release(const struct device *dev, const struct spi_config *spi_cfg)
 #define SPI_NXP_LPSPI_COMMON_INIT(n)                                                               \
 	PINCTRL_DT_INST_DEFINE(n);                                                                 \
                                                                                                    \
-	static void spi_mcux_config_func_##n(const struct device *dev)                             \
+	static void lpspi_config_func_##n(const struct device *dev)                                \
 	{                                                                                          \
-		SPI_MCUX_LPSPI_IRQ_FUNC(n)                                                         \
+		SPI_LPSPI_IRQ_FUNC(n)                                                         \
 	}
 
 #define SPI_NXP_LPSPI_COMMON_DATA_INIT(n)                                                          \
-	SPI_CONTEXT_INIT_LOCK(spi_mcux_data_##n, ctx),                                             \
-		SPI_CONTEXT_INIT_SYNC(spi_mcux_data_##n, ctx),                                     \
+	SPI_CONTEXT_INIT_LOCK(lpspi_data_##n, ctx),                                             \
+		SPI_CONTEXT_INIT_SYNC(lpspi_data_##n, ctx),                                     \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx)
 
 #define SPI_NXP_LPSPI_HAS_DMAS(n)                                                                  \
diff --git a/drivers/spi/spi_renesas_ra.c b/drivers/spi/spi_renesas_ra.c
index c580cb4d71135..9653b6510d5b5 100644
--- a/drivers/spi/spi_renesas_ra.c
+++ b/drivers/spi/spi_renesas_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -462,9 +462,9 @@ static int ra_spi_release(const struct device *dev, const struct spi_config *con
 
 static DEVICE_API(spi, ra_spi_driver_api) = {.transceive = ra_spi_transceive,
 #ifdef CONFIG_SPI_ASYNC
-							.transceive_async = ra_spi_transceive_async,
+					     .transceive_async = ra_spi_transceive_async,
 #endif /* CONFIG_SPI_ASYNC */
-							.release = ra_spi_release};
+					     .release = ra_spi_release};
 
 static int spi_ra_init(const struct device *dev)
 {
@@ -664,15 +664,10 @@ static void ra_spi_eri_isr(const struct device *dev)
 }
 #endif
 
-#define _ELC_EVENT_SPI_RXI(channel) ELC_EVENT_SPI##channel##_RXI
-#define _ELC_EVENT_SPI_TXI(channel) ELC_EVENT_SPI##channel##_TXI
-#define _ELC_EVENT_SPI_TEI(channel) ELC_EVENT_SPI##channel##_TEI
-#define _ELC_EVENT_SPI_ERI(channel) ELC_EVENT_SPI##channel##_ERI
-
-#define ELC_EVENT_SPI_RXI(channel) _ELC_EVENT_SPI_RXI(channel)
-#define ELC_EVENT_SPI_TXI(channel) _ELC_EVENT_SPI_TXI(channel)
-#define ELC_EVENT_SPI_TEI(channel) _ELC_EVENT_SPI_TEI(channel)
-#define ELC_EVENT_SPI_ERI(channel) _ELC_EVENT_SPI_ERI(channel)
+#define EVENT_SPI_RXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _RXI))
+#define EVENT_SPI_TXI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _TXI))
+#define EVENT_SPI_TEI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _TEI))
+#define EVENT_SPI_ERI(channel) BSP_PRV_IELS_ENUM(CONCAT(EVENT_SPI, channel, _ERI))
 
 #if defined(CONFIG_SPI_INTERRUPT)
 
@@ -681,13 +676,13 @@ static void ra_spi_eri_isr(const struct device *dev)
 		ARG_UNUSED(dev);                                                                   \
                                                                                                    \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, rxi, irq)] =                               \
-			ELC_EVENT_SPI_RXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_RXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, txi, irq)] =                               \
-			ELC_EVENT_SPI_TXI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_TXI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, tei, irq)] =                               \
-			ELC_EVENT_SPI_TEI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_TEI(DT_INST_PROP(index, channel));                               \
 		R_ICU->IELSR[DT_INST_IRQ_BY_NAME(index, eri, irq)] =                               \
-			ELC_EVENT_SPI_ERI(DT_INST_PROP(index, channel));                           \
+			EVENT_SPI_ERI(DT_INST_PROP(index, channel));                               \
                                                                                                    \
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, rxi, irq),                                  \
 			    DT_INST_IRQ_BY_NAME(index, rxi, priority), ra_spi_rxi_isr,             \
diff --git a/drivers/spi/spi_rpi_pico_pio.c b/drivers/spi/spi_rpi_pico_pio.c
index 484707ab2adb4..1da7cc33cfa5e 100644
--- a/drivers/spi/spi_rpi_pico_pio.c
+++ b/drivers/spi/spi_rpi_pico_pio.c
@@ -68,6 +68,22 @@ RPI_PICO_PIO_DEFINE_PROGRAM(spi_mode_0_0, SPI_MODE_0_0_WRAP_TARGET, SPI_MODE_0_0
 				    /*     .wrap */
 );
 
+/* ------------ */
+/* spi_mode_0_1 */
+/* ------------ */
+
+#define SPI_MODE_0_1_WRAP_TARGET 0
+#define SPI_MODE_0_1_WRAP        2
+#define SPI_MODE_0_1_CYCLES      4
+
+RPI_PICO_PIO_DEFINE_PROGRAM(spi_mode_0_1, SPI_MODE_0_1_WRAP_TARGET, SPI_MODE_0_1_WRAP,
+			    /*     .wrap_target */
+			    0x6021,   /* 0: out    x, 1            side 0 */
+			    0xb101,   /* 1: mov    pins, x         side 1 [1] */
+			    0x4001,   /* 2: in     pins, 1         side 0 */
+				      /*     .wrap */
+);
+
 /* ------------ */
 /* spi_mode_1_1 */
 /* ------------ */
@@ -365,8 +381,13 @@ static int spi_pico_pio_configure(const struct spi_pico_pio_config *dev_cfg,
 			wrap_target = RPI_PICO_PIO_GET_WRAP_TARGET(spi_mode_1_1);
 			wrap = RPI_PICO_PIO_GET_WRAP(spi_mode_1_1);
 			cycles = SPI_MODE_1_1_CYCLES;
+		} else if ((cpol == 0) && (cpha == 1)) {
+			program = RPI_PICO_PIO_GET_PROGRAM(spi_mode_0_1);
+			wrap_target = RPI_PICO_PIO_GET_WRAP_TARGET(spi_mode_0_1);
+			wrap = RPI_PICO_PIO_GET_WRAP(spi_mode_0_1);
+			cycles = SPI_MODE_0_1_CYCLES;
 		} else {
-			LOG_ERR("Not supported:  cpol=%d, cpha=%d\n", cpol, cpha);
+			LOG_ERR("Not supported:  cpol=%d, cpha=%d", cpol, cpha);
 			return -ENOTSUP;
 		}
 
diff --git a/drivers/spi/spi_rtio.c b/drivers/spi/spi_rtio.c
index ff12f3ea6b724..1a051ba9d7db3 100644
--- a/drivers/spi/spi_rtio.c
+++ b/drivers/spi/spi_rtio.c
@@ -22,6 +22,7 @@ static void spi_rtio_iodev_default_submit_sync(struct rtio_iodev_sqe *iodev_sqe)
 {
 	struct spi_dt_spec *dt_spec = iodev_sqe->sqe.iodev->data;
 	const struct device *dev = dt_spec->bus;
+	uint8_t num_msgs = 0;
 	int err = 0;
 
 	LOG_DBG("Sync RTIO work item for: %p", (void *)dev);
@@ -33,67 +34,103 @@ static void spi_rtio_iodev_default_submit_sync(struct rtio_iodev_sqe *iodev_sqe)
 	struct rtio_iodev_sqe *txn_head = iodev_sqe;
 	struct rtio_iodev_sqe *txn_curr = iodev_sqe;
 
+	/* We allocate the spi_buf's on the stack, to do so
+	 * the count of messages needs to be determined to
+	 * ensure we don't go over the statically sized array.
+	 */
 	do {
-		struct rtio_sqe *sqe = &txn_curr->sqe;
-		struct spi_buf tx_buf = {0};
-		struct spi_buf_set tx_buf_set = {
-			.buffers = &tx_buf,
-		};
+		switch (txn_curr->sqe.op) {
+		case RTIO_OP_RX:
+		case RTIO_OP_TX:
+		case RTIO_OP_TINY_TX:
+		case RTIO_OP_TXRX:
+			num_msgs++;
+			break;
+		default:
+			LOG_ERR("Invalid op code %d for submission %p", txn_curr->sqe.op,
+				(void *)&txn_curr->sqe);
+			err = -EIO;
+			break;
+		}
+		txn_curr = rtio_txn_next(txn_curr);
+	} while (err == 0 && txn_curr != NULL);
 
-		struct spi_buf rx_buf = {0};
-		struct spi_buf_set rx_buf_set = {
-			.buffers = &rx_buf,
-		};
+	if (err != 0) {
+		rtio_iodev_sqe_err(txn_head, err);
+		return;
+	}
+
+	/* Allocate msgs on the stack, MISRA doesn't like VLAs so we need a statically
+	 * sized array here. It's pretty unlikely we have more than 4 spi messages
+	 * in a transaction as we typically would only have 2, one to write a
+	 * register address, and another to read/write the register into an array
+	 */
+	if (num_msgs > CONFIG_SPI_RTIO_FALLBACK_MSGS) {
+		LOG_ERR("At most CONFIG_SPI_RTIO_FALLBACK_MSGS"
+			" submissions in a transaction are"
+			" allowed in the default handler");
+		rtio_iodev_sqe_err(txn_head, -ENOMEM);
+		return;
+	}
+
+	struct spi_buf tx_bufs[CONFIG_SPI_RTIO_FALLBACK_MSGS];
+	struct spi_buf rx_bufs[CONFIG_SPI_RTIO_FALLBACK_MSGS];
+	struct spi_buf_set tx_buf_set = {
+		.buffers = tx_bufs,
+		.count = num_msgs,
+	};
+	struct spi_buf_set rx_buf_set = {
+		.buffers = rx_bufs,
+		.count = num_msgs,
+	};
 
-		LOG_DBG("Preparing transfer: %p", txn_curr);
+	txn_curr = txn_head;
+
+	for (size_t i = 0 ; i < num_msgs ; i++) {
+		struct rtio_sqe *sqe = &txn_curr->sqe;
 
 		switch (sqe->op) {
 		case RTIO_OP_RX:
-			rx_buf.buf = sqe->rx.buf;
-			rx_buf.len = sqe->rx.buf_len;
-			rx_buf_set.count = 1;
+			rx_bufs[i].buf = sqe->rx.buf;
+			rx_bufs[i].len = sqe->rx.buf_len;
+			tx_bufs[i].buf = NULL;
+			tx_bufs[i].len = sqe->rx.buf_len;
 			break;
 		case RTIO_OP_TX:
-			tx_buf.buf = (uint8_t *)sqe->tx.buf;
-			tx_buf.len = sqe->tx.buf_len;
-			tx_buf_set.count = 1;
+			rx_bufs[i].buf = NULL;
+			rx_bufs[i].len = sqe->tx.buf_len;
+			tx_bufs[i].buf = (uint8_t *)sqe->tx.buf;
+			tx_bufs[i].len = sqe->tx.buf_len;
 			break;
 		case RTIO_OP_TINY_TX:
-			tx_buf.buf = (uint8_t *)sqe->tiny_tx.buf;
-			tx_buf.len = sqe->tiny_tx.buf_len;
-			tx_buf_set.count = 1;
+			rx_bufs[i].buf = NULL;
+			rx_bufs[i].len = sqe->tiny_tx.buf_len;
+			tx_bufs[i].buf = (uint8_t *)sqe->tiny_tx.buf;
+			tx_bufs[i].len = sqe->tiny_tx.buf_len;
 			break;
 		case RTIO_OP_TXRX:
-			rx_buf.buf = sqe->txrx.rx_buf;
-			rx_buf.len = sqe->txrx.buf_len;
-			tx_buf.buf = (uint8_t *)sqe->txrx.tx_buf;
-			tx_buf.len = sqe->txrx.buf_len;
-			rx_buf_set.count = 1;
-			tx_buf_set.count = 1;
+			rx_bufs[i].buf = sqe->txrx.rx_buf;
+			rx_bufs[i].len = sqe->txrx.buf_len;
+			tx_bufs[i].buf = (uint8_t *)sqe->txrx.tx_buf;
+			tx_bufs[i].len = sqe->txrx.buf_len;
 			break;
 		default:
-			LOG_ERR("Invalid op code %d for submission %p\n", sqe->op, (void *)sqe);
 			err = -EIO;
 			break;
 		}
 
-		if (!err) {
-			struct spi_buf_set *tx_buf_ptr = tx_buf_set.count > 0 ? &tx_buf_set : NULL;
-			struct spi_buf_set *rx_buf_ptr = rx_buf_set.count > 0 ? &rx_buf_set : NULL;
-
-			err = spi_transceive_dt(dt_spec, tx_buf_ptr, rx_buf_ptr);
+		txn_curr = rtio_txn_next(txn_curr);
+	}
 
-			/* NULL if this submission is not a transaction */
-			txn_curr = rtio_txn_next(txn_curr);
-		}
-	} while (err >= 0 && txn_curr != NULL);
+	if (err == 0) {
+		__ASSERT_NO_MSG(num_msgs > 0);
+		err = spi_transceive_dt(dt_spec, &tx_buf_set, &rx_buf_set);
+	}
 
-	if (err < 0) {
-		LOG_ERR("Transfer failed: %d", err);
+	if (err != 0) {
 		rtio_iodev_sqe_err(txn_head, err);
 	} else {
-		LOG_DBG("Transfer OK: %d", err);
-		rtio_iodev_sqe_ok(txn_head, err);
+		rtio_iodev_sqe_ok(txn_head, 0);
 	}
 }
 
diff --git a/drivers/spi/spi_silabs_eusart.c b/drivers/spi/spi_silabs_eusart.c
index 947265d101861..71fedef029230 100644
--- a/drivers/spi/spi_silabs_eusart.c
+++ b/drivers/spi/spi_silabs_eusart.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2024 Daikin Comfort Technologies North America, Inc.
+ * Copyright (c) 2025 Silicon Laboratories Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,28 +8,51 @@
 #define DT_DRV_COMPAT silabs_eusart_spi
 
 #include <stdbool.h>
+#include <stddef.h>
 
 #include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/clock_control_silabs.h>
 #include <zephyr/drivers/pinctrl.h>
-#include <zephyr/logging/log.h>
-
+#include <zephyr/drivers/dma/dma_silabs_ldma.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/pm/device_runtime.h>
 #include <em_cmu.h>
 #include <em_eusart.h>
 
 LOG_MODULE_REGISTER(spi_silabs_eusart, CONFIG_SPI_LOG_LEVEL);
 
+/* Required by spi_context.h */
 #include "spi_context.h"
 
-#define SPI_WORD_SIZE 8
+#if defined(CONFIG_SPI_ASYNC) && !defined(CONFIG_SPI_SILABS_EUSART_DMA)
+#warning "Silabs eusart SPI driver ASYNC without DMA is not supported"
+#endif
 
-/* Structure Declarations */
+#define SPI_WORD_SIZE 8
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+#define SPI_DMA_MAX_DESCRIPTOR_TRANSFER_SIZE (0x800U)
+
+struct dma_channel {
+	const struct device *dma_dev;
+	uint8_t dma_slot;
+	int chan_nb;
+	struct dma_block_config dma_descriptors[CONFIG_SPI_SILABS_EUSART_DMA_MAX_BLOCKS];
+};
+#endif
 
 struct spi_silabs_eusart_data {
 	struct spi_context ctx;
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+	struct dma_channel dma_chan_rx;
+	struct dma_channel dma_chan_tx;
+#endif
 };
 
 struct spi_silabs_eusart_config {
@@ -37,14 +61,30 @@ struct spi_silabs_eusart_config {
 	const struct silabs_clock_control_cmu_config clock_cfg;
 	uint32_t clock_frequency;
 	const struct pinctrl_dev_config *pcfg;
+	uint8_t mosi_overrun;
 };
 
-/* Helper Functions */
-static int spi_silabs_eusart_configure(const struct device *dev, const struct spi_config *config,
-			     uint16_t *control)
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+static volatile uint8_t empty_buffer;
+#endif
+
+static bool spi_silabs_eusart_is_dma_enabled_instance(const struct device *dev)
 {
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
 	struct spi_silabs_eusart_data *data = dev->data;
-	const struct spi_silabs_eusart_config *eusart_config = dev->config;
+
+	__ASSERT_NO_MSG(!!data->dma_chan_tx.dma_dev == !!data->dma_chan_rx.dma_dev);
+
+	return data->dma_chan_rx.dma_dev != NULL;
+#else
+	return false;
+#endif
+}
+
+static int spi_silabs_eusart_configure(const struct device *dev, const struct spi_config *config)
+{
+	struct spi_silabs_eusart_data *data = dev->data;
+	const struct spi_silabs_eusart_config *eusart_cfg = dev->config;
 	uint32_t spi_frequency;
 
 	EUSART_SpiAdvancedInit_TypeDef eusartAdvancedSpiInit = EUSART_SPI_ADVANCED_INIT_DEFAULT;
@@ -52,24 +92,24 @@ static int spi_silabs_eusart_configure(const struct device *dev, const struct sp
 
 	int err;
 
-	err = clock_control_get_rate(eusart_config->clock_dev,
-				     (clock_control_subsys_t)&eusart_config->clock_cfg,
-				     &spi_frequency);
-	if (err) {
-		return err;
-	}
-	/* Max supported SPI frequency is half the source clock */
-	spi_frequency /= 2;
-
 	if (spi_context_configured(&data->ctx, config)) {
 		/* Already configured. No need to do it again, but must re-enable in case
-		 * TXEN/RXEN were cleared due to deep sleep.
+		 * TXEN/RXEN were cleared.
 		 */
-		EUSART_Enable(eusart_config->base, eusartEnable);
+		EUSART_Enable(eusart_cfg->base, eusartEnable);
 
 		return 0;
 	}
 
+	err = clock_control_get_rate(eusart_cfg->clock_dev,
+				     (clock_control_subsys_t)&eusart_cfg->clock_cfg,
+				     &spi_frequency);
+	if (err) {
+		return err;
+	}
+	/* Max supported SPI frequency is half the source clock */
+	spi_frequency /= 2;
+
 	if (config->operation & SPI_HALF_DUPLEX) {
 		LOG_ERR("Half-duplex not supported");
 		return -ENOTSUP;
@@ -95,11 +135,11 @@ static int spi_silabs_eusart_configure(const struct device *dev, const struct sp
 	 * user has configured the controller to, and the max frequency for the
 	 * transaction.
 	 */
-	if (eusart_config->clock_frequency > spi_frequency) {
+	if (eusart_cfg->clock_frequency > spi_frequency) {
 		LOG_ERR("SPI clock-frequency too high");
 		return -EINVAL;
 	}
-	spi_frequency = MIN(eusart_config->clock_frequency, spi_frequency);
+	spi_frequency = MIN(eusart_cfg->clock_frequency, spi_frequency);
 	if (config->frequency) {
 		spi_frequency = MIN(config->frequency, spi_frequency);
 	}
@@ -137,21 +177,325 @@ static int spi_silabs_eusart_configure(const struct device *dev, const struct sp
 	eusartInit.databits = eusartDataBits8;
 	eusartInit.advancedSettings = &eusartAdvancedSpiInit;
 
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+	if (spi_silabs_eusart_is_dma_enabled_instance(dev)) {
+		if (!device_is_ready(data->dma_chan_tx.dma_dev)) {
+			return -ENODEV;
+		}
+
+		eusartAdvancedSpiInit.TxFifoWatermark = eusartTxFiFoWatermark1Frame;
+		eusartAdvancedSpiInit.RxFifoWatermark = eusartRxFiFoWatermark1Frame;
+
+		if (data->dma_chan_rx.chan_nb < 0) {
+			data->dma_chan_rx.chan_nb =
+				dma_request_channel(data->dma_chan_rx.dma_dev, NULL);
+		}
+
+		if (data->dma_chan_rx.chan_nb < 0) {
+			LOG_ERR("DMA channel request failed");
+			return -EAGAIN;
+		}
+
+		if (data->dma_chan_tx.chan_nb < 0) {
+			data->dma_chan_tx.chan_nb =
+				dma_request_channel(data->dma_chan_tx.dma_dev, NULL);
+		}
+
+		if (data->dma_chan_tx.chan_nb < 0) {
+			dma_release_channel(data->dma_chan_rx.dma_dev, data->dma_chan_rx.chan_nb);
+			data->dma_chan_rx.chan_nb = -1;
+			LOG_ERR("DMA channel request failed");
+			return -EAGAIN;
+		}
+	}
+#endif
 	/* Enable EUSART clock */
-	err = clock_control_on(eusart_config->clock_dev,
-			       (clock_control_subsys_t)&eusart_config->clock_cfg);
-	if (err < 0) {
-		return err;
+	err = clock_control_on(eusart_cfg->clock_dev,
+			       (clock_control_subsys_t)&eusart_cfg->clock_cfg);
+	if (err < 0 && err != -EALREADY) {
+		goto exit;
 	}
 
 	/* Initialize the EUSART */
-	EUSART_SpiInit(eusart_config->base, &eusartInit);
+	EUSART_SpiInit(eusart_cfg->base, &eusartInit);
 
 	data->ctx.config = config;
 
 	return 0;
+
+exit:
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+	if (spi_silabs_eusart_is_dma_enabled_instance(dev)) {
+		dma_release_channel(data->dma_chan_rx.dma_dev, data->dma_chan_rx.chan_nb);
+		dma_release_channel(data->dma_chan_tx.dma_dev, data->dma_chan_tx.chan_nb);
+		data->dma_chan_rx.chan_nb = -1;
+		data->dma_chan_tx.chan_nb = -1;
+	}
+#endif
+	return err;
+}
+
+static inline void spi_silabs_eusart_pm_policy_get(const struct device *dev)
+{
+	pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+	pm_policy_state_lock_get(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+}
+
+static inline void spi_silabs_eusart_pm_policy_put(const struct device *dev)
+{
+	pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+	pm_policy_state_lock_put(PM_STATE_STANDBY, PM_ALL_SUBSTATES);
+}
+
+static int spi_silabs_eusart_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	const struct spi_silabs_eusart_config *eusart_config = dev->config;
+	int ret;
+
+	switch (action) {
+	case PM_DEVICE_ACTION_RESUME:
+		ret = clock_control_on(eusart_config->clock_dev,
+				       (clock_control_subsys_t)&eusart_config->clock_cfg);
+
+		if (ret == -EALREADY) {
+			ret = 0;
+		} else if (ret < 0) {
+			break;
+		}
+
+		pinctrl_apply_state(eusart_config->pcfg, PINCTRL_STATE_DEFAULT);
+
+		break;
+	case PM_DEVICE_ACTION_SUSPEND:
+		pinctrl_apply_state(eusart_config->pcfg, PINCTRL_STATE_SLEEP);
+
+		EUSART_Enable(eusart_config->base, eusartDisable);
+		ret = clock_control_off(eusart_config->clock_dev,
+					(clock_control_subsys_t)&eusart_config->clock_cfg);
+		if (ret == -EALREADY) {
+			ret = 0;
+		}
+
+		break;
+	default:
+		ret = -ENOTSUP;
+	}
+
+	return ret;
+}
+
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+static void spi_silabs_dma_rx_callback(const struct device *dev, void *user_data, uint32_t channel,
+				       int status)
+{
+	const struct device *spi_dev = (const struct device *)user_data;
+	struct spi_silabs_eusart_data *data = spi_dev->data;
+	struct spi_context *instance_ctx = &data->ctx;
+
+	ARG_UNUSED(dev);
+
+	if (status >= 0 && status != DMA_STATUS_COMPLETE) {
+		return;
+	}
+
+	if (status < 0) {
+		dma_stop(data->dma_chan_tx.dma_dev, data->dma_chan_tx.chan_nb);
+		dma_stop(data->dma_chan_rx.dma_dev, data->dma_chan_rx.chan_nb);
+	}
+
+	spi_context_cs_control(instance_ctx, false);
+	spi_silabs_eusart_pm_policy_put(spi_dev);
+	spi_context_complete(instance_ctx, spi_dev, status);
+}
+
+static void spi_silabs_eusart_clear_txrx_fifos(EUSART_TypeDef *eusart)
+{
+	sys_write32(EUSART_CMD_CLEARTX, (mem_addr_t)&eusart->CMD_SET);
+
+	while (sys_read32((mem_addr_t)&eusart->STATUS) & EUSART_STATUS_RXFL) {
+		(void)sys_read32((mem_addr_t)&eusart->RXDATA);
+	}
+
+	while (sys_read32((mem_addr_t)&eusart->STATUS) & EUSART_STATUS_CLEARTXBUSY) {
+	}
+}
+
+static size_t spi_silabs_longest_transfer_size(struct spi_context *instance_ctx)
+{
+	uint32_t tx_transfer_size = spi_context_total_tx_len(instance_ctx);
+	uint32_t rx_transfer_size = spi_context_total_rx_len(instance_ctx);
+
+	return MAX(tx_transfer_size, rx_transfer_size);
+}
+
+static int spi_silabs_dma_config(const struct device *dev,
+				 struct dma_channel *channel,
+				 uint32_t block_count, bool is_tx)
+{
+	struct dma_config cfg = {
+		.channel_direction = is_tx ? MEMORY_TO_PERIPHERAL : PERIPHERAL_TO_MEMORY,
+		.complete_callback_en = 0,
+		.source_data_size = 1,
+		.dest_data_size = 1,
+		.source_burst_length = 1,
+		.dest_burst_length = 1,
+		.block_count = block_count,
+		.head_block = channel->dma_descriptors,
+		.dma_slot = channel->dma_slot,
+		.dma_callback = !is_tx ? &spi_silabs_dma_rx_callback : NULL,
+		.user_data = (void *)dev,
+	};
+
+	return dma_config(channel->dma_dev, channel->chan_nb, &cfg);
+}
+
+static uint32_t spi_eusart_fill_desc(const struct spi_silabs_eusart_config *cfg,
+				     struct dma_block_config *new_blk_cfg, uint8_t *buffer,
+				     size_t requested_transaction_size, bool is_tx)
+{
+	/* Set-up source and destination address with increment behavior */
+	if (is_tx) {
+		new_blk_cfg->dest_address = (uint32_t)&cfg->base->TXDATA;
+		new_blk_cfg->dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
+		if (buffer) {
+			new_blk_cfg->source_address = (uint32_t)buffer;
+			new_blk_cfg->source_addr_adj = DMA_ADDR_ADJ_INCREMENT;
+		} else {
+			/* Null buffer pointer means sending dummy byte */
+			new_blk_cfg->source_address = (uint32_t)&(cfg->mosi_overrun);
+			new_blk_cfg->source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
+		}
+	} else {
+		new_blk_cfg->source_address = (uint32_t)&cfg->base->RXDATA;
+		new_blk_cfg->source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
+		if (buffer) {
+			new_blk_cfg->dest_address = (uint32_t)buffer;
+			new_blk_cfg->dest_addr_adj = DMA_ADDR_ADJ_INCREMENT;
+		} else {
+			/* Null buffer pointer means rx to null byte */
+			new_blk_cfg->dest_address = (uint32_t)&empty_buffer;
+			new_blk_cfg->dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
+		}
+	}
+	/* Setup max transfer according to requested transaction size.
+	 * Will top if bigger than the maximum transfer size.
+	 */
+	new_blk_cfg->block_size = MIN(requested_transaction_size,
+				      SPI_DMA_MAX_DESCRIPTOR_TRANSFER_SIZE);
+	return new_blk_cfg->block_size;
+}
+
+struct dma_block_config *spi_eusart_fill_data_desc(const struct spi_silabs_eusart_config *cfg,
+						   struct dma_block_config *desc,
+						   const struct spi_buf buffers[],
+						   int buffer_count,
+						   size_t transaction_len,
+						   bool is_tx)
+{
+	__ASSERT(transaction_len > 0, "Not supported");
+
+	size_t offset = 0;
+	int i = 0;
+	uint8_t *buffer = NULL;
+
+	while (i != buffer_count) {
+		if (!buffers[i].len) {
+			i++;
+			continue;
+		}
+		if (!desc) {
+			return NULL;
+		}
+		buffer = buffers[i].buf ? (uint8_t *)buffers[i].buf + offset : NULL;
+		offset += spi_eusart_fill_desc(cfg, desc,
+					       buffer,
+					       buffers[i].len - offset,
+					       is_tx);
+		if (offset == buffers[i].len) {
+			transaction_len -= offset;
+			offset = 0;
+			i++;
+		}
+		if (transaction_len) {
+			desc = desc->next_block;
+		}
+	}
+
+	while (transaction_len) {
+		if (!desc) {
+			return NULL;
+		}
+
+		transaction_len -= spi_eusart_fill_desc(cfg, desc, NULL, transaction_len, is_tx);
+		if (transaction_len) {
+			desc = desc->next_block;
+		}
+	}
+
+	desc->next_block = NULL;
+	return desc;
 }
 
+static void spi_eusart_reset_desc(struct dma_channel *channel)
+{
+	int i;
+
+	memset(channel->dma_descriptors, 0, sizeof(channel->dma_descriptors));
+	for (i = 0; i < ARRAY_SIZE(channel->dma_descriptors) - 1; i++) {
+		channel->dma_descriptors[i].next_block = &channel->dma_descriptors[i + 1];
+	}
+}
+
+static int spi_eusart_prepare_dma_channel(const struct device *spi_dev,
+					  const struct spi_buf *buffer,
+					  size_t buffer_count,
+					  struct dma_channel *channel,
+					  size_t padded_transaction_size,
+					  bool is_tx)
+{
+	const struct spi_silabs_eusart_config *cfg = spi_dev->config;
+	struct dma_block_config *desc;
+	int ret = 0;
+
+	spi_eusart_reset_desc(channel);
+	desc = spi_eusart_fill_data_desc(cfg, channel->dma_descriptors,
+					 buffer, buffer_count, padded_transaction_size, is_tx);
+	if (!desc) {
+		return -ENOMEM;
+	}
+
+	ret = spi_silabs_dma_config(spi_dev, channel,
+				    ARRAY_INDEX(channel->dma_descriptors, desc),
+				    is_tx);
+
+	return ret;
+}
+
+static int spi_eusart_prepare_dma_transaction(const struct device *dev,
+					      size_t padded_transaction_size)
+{
+	int ret;
+	struct spi_silabs_eusart_data *data = dev->data;
+
+	if (padded_transaction_size == 0) {
+		/* Nothing to do */
+		return 0;
+	}
+
+	ret = spi_eusart_prepare_dma_channel(dev, data->ctx.current_tx, data->ctx.tx_count,
+					     &data->dma_chan_tx, padded_transaction_size,
+					     true);
+	if (ret) {
+		return ret;
+	}
+
+	ret = spi_eusart_prepare_dma_channel(dev, data->ctx.current_rx, data->ctx.rx_count,
+					     &data->dma_chan_rx, padded_transaction_size, false);
+	return ret;
+}
+
+#endif
+
 static void spi_silabs_eusart_send(EUSART_TypeDef *eusart, uint8_t frame)
 {
 	/* Write frame to register */
@@ -199,82 +543,171 @@ static int spi_silabs_eusart_shift_frames(EUSART_TypeDef *eusart,
 	if (spi_context_rx_buf_on(&data->ctx)) {
 		UNALIGNED_PUT(rx_frame, (uint8_t *)data->ctx.rx_buf);
 	}
+
 	spi_context_update_rx(&data->ctx, 1, 1);
+
 	return 0;
 }
 
-static void spi_silabs_eusart_xfer(const struct device *dev, const struct spi_config *config)
+static int spi_silabs_eusart_xfer_dma(const struct device *dev, const struct spi_config *config)
 {
-	int ret;
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+	const struct spi_silabs_eusart_config *eusart_config = dev->config;
 	struct spi_silabs_eusart_data *data = dev->data;
 	struct spi_context *ctx = &data->ctx;
+	int ret = 0;
+
+	size_t padded_transaction_size = spi_silabs_longest_transfer_size(ctx);
+
+	if (padded_transaction_size == 0) {
+		return -EINVAL;
+	}
+
+	spi_silabs_eusart_clear_txrx_fifos(eusart_config->base);
+
+	ret = spi_eusart_prepare_dma_transaction(dev, padded_transaction_size);
+	if (ret) {
+		return ret;
+	}
+
+	spi_silabs_eusart_pm_policy_get(dev);
+
+	spi_context_cs_control(ctx, true);
+
+	/* RX channel needs to be ready before TX channel actually starts */
+	ret = dma_start(data->dma_chan_rx.dma_dev, data->dma_chan_rx.chan_nb);
+	if (ret) {
+		goto force_transaction_close;
+	}
+
+	ret = dma_start(data->dma_chan_tx.dma_dev, data->dma_chan_tx.chan_nb);
+	if (ret) {
+
+		goto force_transaction_close;
+	}
+
+	ret = spi_context_wait_for_completion(&data->ctx);
+	if (ret < 0) {
+		goto force_transaction_close;
+	}
+
+	/* Successful transaction. DMA transfer done interrupt ended the transaction. */
+	return 0;
+force_transaction_close:
+	dma_stop(data->dma_chan_rx.dma_dev, data->dma_chan_rx.chan_nb);
+	dma_stop(data->dma_chan_tx.dma_dev, data->dma_chan_tx.chan_nb);
+	spi_context_cs_control(ctx, false);
+	spi_silabs_eusart_pm_policy_put(dev);
+	return ret;
+#else
+	return -ENOTSUP;
+#endif
+}
+
+static int spi_silabs_eusart_xfer_polling(const struct device *dev,
+					  const struct spi_config *config)
+{
 	const struct spi_silabs_eusart_config *eusart_config = dev->config;
+	struct spi_silabs_eusart_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
+	int ret;
 
+	spi_silabs_eusart_pm_policy_get(dev);
 	spi_context_cs_control(ctx, true);
 
-	do {
+	ret = 0;
+	while (!ret && spi_silabs_eusart_transfer_ongoing(data)) {
 		ret = spi_silabs_eusart_shift_frames(eusart_config->base, data);
-	} while (!ret && spi_silabs_eusart_transfer_ongoing(data));
+	}
 
 	spi_context_cs_control(ctx, false);
 	spi_context_complete(ctx, dev, 0);
+
+	spi_silabs_eusart_pm_policy_put(dev);
+	return ret;
 }
 
-/* API Functions */
-static int spi_silabs_eusart_init(const struct device *dev)
+static int spi_silabs_eusart_transceive(const struct device *dev,
+					const struct spi_config *config,
+					const struct spi_buf_set *tx_bufs,
+					const struct spi_buf_set *rx_bufs,
+					bool asynchronous,
+					spi_callback_t cb,
+					void *userdata)
 {
-	int err;
-	const struct spi_silabs_eusart_config *eusart_config = dev->config;
 	struct spi_silabs_eusart_data *data = dev->data;
+	struct spi_context *ctx = &data->ctx;
+	int ret;
 
-	err = pinctrl_apply_state(eusart_config->pcfg, PINCTRL_STATE_DEFAULT);
-	if (err < 0) {
-		return err;
+	spi_context_lock(ctx, asynchronous, cb, userdata, config);
+
+	ret = spi_silabs_eusart_configure(dev, config);
+	if (ret) {
+		goto out;
 	}
 
-	err = spi_context_cs_configure_all(&data->ctx);
-	if (err < 0) {
-		return err;
+	spi_context_buffers_setup(ctx, tx_bufs, rx_bufs, 1);
+
+	if (spi_silabs_eusart_is_dma_enabled_instance(dev)) {
+		/* DMA transfer handle a/synchronous transfers */
+		ret = spi_silabs_eusart_xfer_dma(dev, config);
+	} else if (!asynchronous) {
+		ret = spi_silabs_eusart_xfer_polling(dev, config);
+	} else {
+		/* Asynchronous transfers without DMA is not implemented,
+		 * please configure the device tree
+		 * instance with the proper DMA configuration.
+		 */
+		ret = -ENOTSUP;
 	}
-	spi_context_unlock_unconditionally(&data->ctx);
 
-	return 0;
+out:
+	spi_context_release(ctx, ret);
+
+	return ret;
 }
 
-static int spi_silabs_eusart_transceive(const struct device *dev, const struct spi_config *config,
-				       const struct spi_buf_set *tx_bufs,
-				       const struct spi_buf_set *rx_bufs)
+/* API Functions */
+static int spi_silabs_eusart_init(const struct device *dev)
 {
 	struct spi_silabs_eusart_data *data = dev->data;
-	uint16_t control = 0;
-	int ret;
-
-	spi_context_lock(&data->ctx, false, NULL, NULL, config);
+	int err;
 
-	ret = spi_silabs_eusart_configure(dev, config, &control);
-	if (ret < 0) {
-		spi_context_release(&data->ctx, ret);
-		return ret;
+	err = spi_context_cs_configure_all(&data->ctx);
+	if (err < 0) {
+		return err;
 	}
 
-	spi_context_buffers_setup(&data->ctx, tx_bufs, rx_bufs, 1);
-	spi_silabs_eusart_xfer(dev, config);
+	spi_context_unlock_unconditionally(&data->ctx);
 
-	spi_context_release(&data->ctx, ret);
+	return pm_device_driver_init(dev, spi_silabs_eusart_pm_action);
+}
 
-	return 0;
+static int spi_silabs_eusart_transceive_sync(const struct device *dev,
+					     const struct spi_config *config,
+					     const struct spi_buf_set *tx_bufs,
+					     const struct spi_buf_set *rx_bufs)
+{
+	return spi_silabs_eusart_transceive(dev,
+					    config,
+					    tx_bufs,
+					    rx_bufs,
+					    false,
+					    NULL,
+					    NULL);
 }
 
 #ifdef CONFIG_SPI_ASYNC
 static int spi_silabs_eusart_transceive_async(const struct device *dev,
-					     const struct spi_config *config,
-					     const struct spi_buf_set *tx_bufs,
-					     const struct spi_buf_set *rx_bufs,
-					     struct k_poll_signal *async)
+					      const struct spi_config *config,
+					      const struct spi_buf_set *tx_bufs,
+					      const struct spi_buf_set *rx_bufs,
+					      spi_callback_t cb,
+					      void *userdata)
 {
-	return -ENOTSUP;
+	return spi_silabs_eusart_transceive(dev, config, tx_bufs, rx_bufs, true, cb, userdata);
 }
-#endif /* CONFIG_SPI_ASYNC */
+#endif
 
 static int spi_silabs_eusart_release(const struct device *dev, const struct spi_config *config)
 {
@@ -286,33 +719,54 @@ static int spi_silabs_eusart_release(const struct device *dev, const struct spi_
 	if (!(eusart_config->base->STATUS & EUSART_STATUS_TXIDLE)) {
 		return -EBUSY;
 	}
+
 	return 0;
 }
 
 /* Device Instantiation */
 static DEVICE_API(spi, spi_silabs_eusart_api) = {
-	.transceive = spi_silabs_eusart_transceive,
+	.transceive = spi_silabs_eusart_transceive_sync,
 #ifdef CONFIG_SPI_ASYNC
 	.transceive_async = spi_silabs_eusart_transceive_async,
-#endif /* CONFIG_SPI_ASYNC */
+#endif
 	.release = spi_silabs_eusart_release,
 };
 
-#define SPI_INIT(n)										\
-	PINCTRL_DT_INST_DEFINE(n);								\
-	static struct spi_silabs_eusart_data spi_silabs_eusart_data_##n = {			\
-		SPI_CONTEXT_INIT_LOCK(spi_silabs_eusart_data_##n, ctx),				\
-		SPI_CONTEXT_INIT_SYNC(spi_silabs_eusart_data_##n, ctx),				\
-		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx)};				\
-	static struct spi_silabs_eusart_config spi_silabs_eusart_cfg_##n = {			\
-		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),					\
-		.base = (EUSART_TypeDef *)DT_INST_REG_ADDR(n),					\
-		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),				\
-		.clock_cfg = SILABS_DT_INST_CLOCK_CFG(n),					\
-		.clock_frequency = DT_INST_PROP_OR(n, clock_frequency, 1000000)			\
-	};											\
-	SPI_DEVICE_DT_INST_DEFINE(n, spi_silabs_eusart_init, NULL, &spi_silabs_eusart_data_##n,	\
-			      &spi_silabs_eusart_cfg_##n, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,\
-			      &spi_silabs_eusart_api);
+#ifdef CONFIG_SPI_SILABS_EUSART_DMA
+#define SPI_SILABS_EUSART_DMA_CHANNEL_INIT(index, dir)						\
+	.dma_chan_##dir = {									\
+		.chan_nb = -1,									\
+		.dma_dev = DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(index, dir)),		\
+		.dma_slot =									\
+			SILABS_LDMA_REQSEL_TO_SLOT(DT_INST_DMAS_CELL_BY_NAME(index, dir, slot)),\
+	},
+#define SPI_SILABS_EUSART_DMA_CHANNEL(index, dir) \
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(index, dmas), \
+		    (SPI_SILABS_EUSART_DMA_CHANNEL_INIT(index, dir)), ())
+#else
+#define SPI_SILABS_EUSART_DMA_CHANNEL(index, dir)
+#endif
+
+#define SPI_INIT(n) \
+	PINCTRL_DT_INST_DEFINE(n); \
+	static struct spi_silabs_eusart_data spi_silabs_eusart_data_##n = { \
+		SPI_CONTEXT_INIT_LOCK(spi_silabs_eusart_data_##n, ctx), \
+		SPI_CONTEXT_INIT_SYNC(spi_silabs_eusart_data_##n, ctx), \
+		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(n), ctx) \
+		SPI_SILABS_EUSART_DMA_CHANNEL(n, rx) \
+		SPI_SILABS_EUSART_DMA_CHANNEL(n, tx) \
+	}; \
+	static struct spi_silabs_eusart_config spi_silabs_eusart_cfg_##n = { \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
+		.base = (EUSART_TypeDef *)DT_INST_REG_ADDR(n), \
+		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)), \
+		.clock_cfg = SILABS_DT_INST_CLOCK_CFG(n), \
+		.mosi_overrun = (uint8_t)SPI_MOSI_OVERRUN_DT(n), \
+		.clock_frequency = DT_INST_PROP_OR(n, clock_frequency, 1000000), \
+	}; \
+	PM_DEVICE_DT_INST_DEFINE(n, spi_silabs_eusart_pm_action); \
+	SPI_DEVICE_DT_INST_DEFINE(n, spi_silabs_eusart_init, PM_DEVICE_DT_INST_GET(n), \
+				  &spi_silabs_eusart_data_##n, &spi_silabs_eusart_cfg_##n, \
+				  POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, &spi_silabs_eusart_api);
 
 DT_INST_FOREACH_STATUS_OKAY(SPI_INIT)
diff --git a/drivers/spi/spi_xmc4xxx.c b/drivers/spi/spi_xmc4xxx.c
index 7d48c5cacedb0..0a7a036dc5036 100644
--- a/drivers/spi/spi_xmc4xxx.c
+++ b/drivers/spi/spi_xmc4xxx.c
@@ -23,6 +23,7 @@ LOG_MODULE_REGISTER(spi_xmc4xxx);
 #define USIC_IRQ_MIN  84
 #define USIC_IRQ_MAX  101
 #define IRQS_PER_USIC 6
+#define CLOCK_POLARITY_CHANGE_DELAY 10
 
 #define SPI_XMC4XXX_DMA_ERROR_FLAG   BIT(0)
 #define SPI_XMC4XXX_DMA_RX_DONE_FLAG BIT(1)
@@ -189,6 +190,7 @@ static void spi_xmc4xxx_isr(const struct device *dev)
 static int spi_xmc4xxx_configure(const struct device *dev, const struct spi_config *spi_cfg)
 {
 	int ret;
+	bool clock_polarity_delay = false;
 	struct spi_xmc4xxx_data *data = dev->data;
 	const struct spi_xmc4xxx_config *config = dev->config;
 	struct spi_context *ctx = &data->ctx;
@@ -203,6 +205,11 @@ static int spi_xmc4xxx_configure(const struct device *dev, const struct spi_conf
 		return 0;
 	}
 
+	if (ctx->config == NULL ||
+	    ((SPI_MODE_GET(ctx->config->operation) & SPI_MODE_CPOL) != CPOL)) {
+		clock_polarity_delay = true;
+	}
+
 	ctx->config = spi_cfg;
 
 	if (spi_cfg->operation & SPI_HALF_DUPLEX) {
@@ -253,6 +260,10 @@ static int spi_xmc4xxx_configure(const struct device *dev, const struct spi_conf
 
 	XMC_SPI_CH_SetWordLength(config->spi, 8);
 
+	if (clock_polarity_delay) {
+		k_busy_wait(CLOCK_POLARITY_CHANGE_DELAY);
+	}
+
 	return 0;
 }
 
diff --git a/drivers/stepper/CMakeLists.txt b/drivers/stepper/CMakeLists.txt
index 7f135001497c0..1cda468fac484 100644
--- a/drivers/stepper/CMakeLists.txt
+++ b/drivers/stepper/CMakeLists.txt
@@ -5,6 +5,7 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/stepper.h)
 
 # zephyr-keep-sorted-start
 add_subdirectory_ifdef(CONFIG_STEPPER_ADI_TMC adi_tmc)
+add_subdirectory_ifdef(CONFIG_STEPPER_ALLEGRO allegro)
 add_subdirectory_ifdef(CONFIG_STEPPER_TI ti)
 add_subdirectory_ifdef(CONFIG_STEP_DIR_STEPPER step_dir)
 # zephyr-keep-sorted-stop
diff --git a/drivers/stepper/Kconfig b/drivers/stepper/Kconfig
index f8dd4a43b1b07..075c9130e33f0 100644
--- a/drivers/stepper/Kconfig
+++ b/drivers/stepper/Kconfig
@@ -34,6 +34,7 @@ comment "Stepper Drivers"
 rsource "Kconfig.fake"
 rsource "Kconfig.gpio"
 rsource "adi_tmc/Kconfig"
+rsource "allegro/Kconfig"
 rsource "ti/Kconfig"
 # zephyr-keep-sorted-stop
 
diff --git a/drivers/stepper/Kconfig.gpio b/drivers/stepper/Kconfig.gpio
index 99e3505789598..4b43140cd2814 100644
--- a/drivers/stepper/Kconfig.gpio
+++ b/drivers/stepper/Kconfig.gpio
@@ -2,13 +2,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
 # SPDX-License-Identifier: Apache-2.0
 
-menu "GPIO stepper driver"
-
 config GPIO_STEPPER
 	bool "Activate driver for gpio stepper control"
 	depends on DT_HAS_ZEPHYR_GPIO_STEPPER_ENABLED
 	default y
-	help
-	  GPIO Stepper driver for stepper motor control with darlington arrays or dual H-bridge.
-
-endmenu
diff --git a/drivers/stepper/adi_tmc/Kconfig.tmc_rampgen_template b/drivers/stepper/adi_tmc/Kconfig.tmc_rampgen_template
index 34064f73b227b..4636ac5c76e99 100644
--- a/drivers/stepper/adi_tmc/Kconfig.tmc_rampgen_template
+++ b/drivers/stepper/adi_tmc/Kconfig.tmc_rampgen_template
@@ -19,9 +19,16 @@ config STEPPER_ADI_$(module)_RAMPSTAT_POLL_INTERVAL_IN_MSEC
 	help
 	  The interval in ms to poll the ramp status on TMC.
 
+config STEPPER_ADI_$(module)_RAMPSTAT_POLL_STALLGUARD_LOG
+	bool "log $(module-str) stallguard"
+	depends on STEPPER_ADI_$(module)_RAMPSTAT_POLL
+	default n
+	help
+	  Enable stallguard log while polling rampstat.
+
 config STEPPER_ADI_$(module)_RAMP_GEN
 	bool "Use $(module-str) with Ramp Generator"
 	depends on STEPPER_ADI_$(module)
 	default y
 	help
-	  Enable ramp generator for trinamic stepper controller
+	  Enable ramp generator for trinamic stepper controller.
diff --git a/drivers/stepper/adi_tmc/adi_tmc22xx_stepper_controller.c b/drivers/stepper/adi_tmc/adi_tmc22xx_stepper_controller.c
index df2daa691810d..fb73dc35fc28d 100644
--- a/drivers/stepper/adi_tmc/adi_tmc22xx_stepper_controller.c
+++ b/drivers/stepper/adi_tmc/adi_tmc22xx_stepper_controller.c
@@ -25,16 +25,20 @@ struct tmc22xx_data {
 
 STEP_DIR_STEPPER_STRUCT_CHECK(struct tmc22xx_config, struct tmc22xx_data);
 
-static int tmc22xx_stepper_enable(const struct device *dev, const bool enable)
+static int tmc22xx_stepper_enable(const struct device *dev)
 {
 	const struct tmc22xx_config *config = dev->config;
 
-	LOG_DBG("Stepper motor controller %s %s", dev->name, enable ? "enabled" : "disabled");
-	if (enable) {
-		return gpio_pin_set_dt(&config->enable_pin, 1);
-	} else {
-		return gpio_pin_set_dt(&config->enable_pin, 0);
-	}
+	LOG_DBG("Enabling Stepper motor controller %s", dev->name);
+	return gpio_pin_set_dt(&config->enable_pin, 1);
+}
+
+static int tmc22xx_stepper_disable(const struct device *dev)
+{
+	const struct tmc22xx_config *config = dev->config;
+
+	LOG_DBG("Disabling Stepper motor controller %s", dev->name);
+	return gpio_pin_set_dt(&config->enable_pin, 0);
 }
 
 static int tmc22xx_stepper_set_micro_step_res(const struct device *dev,
@@ -71,7 +75,7 @@ static int tmc22xx_stepper_set_micro_step_res(const struct device *dev,
 	}
 
 	LOG_ERR("Unsupported microstep resolution: %d", micro_step_res);
-	return -EINVAL;
+	return -ENOTSUP;
 }
 
 static int tmc22xx_stepper_get_micro_step_res(const struct device *dev,
@@ -145,6 +149,7 @@ static int tmc22xx_stepper_init(const struct device *dev)
 
 static DEVICE_API(stepper, tmc22xx_stepper_api) = {
 	.enable = tmc22xx_stepper_enable,
+	.disable = tmc22xx_stepper_disable,
 	.move_by = step_dir_stepper_common_move_by,
 	.is_moving = step_dir_stepper_common_is_moving,
 	.set_reference_position = step_dir_stepper_common_set_reference_position,
@@ -152,6 +157,7 @@ static DEVICE_API(stepper, tmc22xx_stepper_api) = {
 	.move_to = step_dir_stepper_common_move_to,
 	.set_microstep_interval = step_dir_stepper_common_set_microstep_interval,
 	.run = step_dir_stepper_common_run,
+	.stop = step_dir_stepper_common_stop,
 	.set_event_callback = step_dir_stepper_common_set_event_callback,
 	.set_micro_step_res = tmc22xx_stepper_set_micro_step_res,
 	.get_micro_step_res = tmc22xx_stepper_get_micro_step_res,
diff --git a/drivers/stepper/adi_tmc/adi_tmc50xx_stepper_controller.c b/drivers/stepper/adi_tmc/adi_tmc50xx_stepper_controller.c
index ccc97b8f12840..e5be15f3c1d0b 100644
--- a/drivers/stepper/adi_tmc/adi_tmc50xx_stepper_controller.c
+++ b/drivers/stepper/adi_tmc/adi_tmc50xx_stepper_controller.c
@@ -54,6 +54,8 @@ struct tmc50xx_stepper_config {
 #endif
 };
 
+static int read_actual_position(const struct tmc50xx_stepper_config *config, int32_t *position);
+
 static int tmc50xx_write(const struct device *dev, const uint8_t reg_addr, const uint32_t reg_val)
 {
 	const struct tmc50xx_config *config = dev->config;
@@ -67,7 +69,7 @@ static int tmc50xx_write(const struct device *dev, const uint8_t reg_addr, const
 
 	k_sem_give(&data->sem);
 
-	if (err) {
+	if (err < 0) {
 		LOG_ERR("Failed to write register 0x%x with value 0x%x", reg_addr, reg_val);
 		return err;
 	}
@@ -87,7 +89,7 @@ static int tmc50xx_read(const struct device *dev, const uint8_t reg_addr, uint32
 
 	k_sem_give(&data->sem);
 
-	if (err) {
+	if (err < 0) {
 		LOG_ERR("Failed to read register 0x%x", reg_addr);
 		return err;
 	}
@@ -143,6 +145,8 @@ static int stallguard_enable(const struct device *dev, const bool enable)
 		LOG_ERR("Failed to write SWMODE register");
 		return -EIO;
 	}
+
+	LOG_DBG("Stallguard %s", enable ? "enabled" : "disabled");
 	return 0;
 }
 
@@ -156,7 +160,6 @@ static void stallguard_work_handler(struct k_work *work)
 
 	err = stallguard_enable(stepper_data->stepper, true);
 	if (err == -EAGAIN) {
-		LOG_ERR("retrying stallguard activation");
 		k_work_reschedule(dwork, K_MSEC(stepper_config->sg_velocity_check_interval_ms));
 	}
 	if (err == -EIO) {
@@ -178,6 +181,29 @@ static void execute_callback(const struct device *dev, const enum stepper_event
 	data->callback(dev, event, data->event_cb_user_data);
 }
 
+#ifdef CONFIG_STEPPER_ADI_TMC50XX_RAMPSTAT_POLL_STALLGUARD_LOG
+
+static void log_stallguard(struct tmc50xx_stepper_data *stepper_data, const uint32_t drv_status)
+{
+	const struct tmc50xx_stepper_config *stepper_config = stepper_data->stepper->config;
+	int32_t position;
+	int err;
+
+	err = read_actual_position(stepper_config, &position);
+	if (err != 0) {
+		LOG_ERR("%s: Failed to read XACTUAL register", stepper_data->stepper->name);
+		return;
+	}
+
+	const uint8_t sg_result = FIELD_GET(TMC5XXX_DRV_STATUS_SG_RESULT_MASK, drv_status);
+	const bool sg_status = FIELD_GET(TMC5XXX_DRV_STATUS_SG_STATUS_MASK, drv_status);
+
+	LOG_DBG("%s position: %d | sg result: %d status: %d",
+		stepper_data->stepper->name, position, sg_result, sg_status);
+}
+
+#endif
+
 static void rampstat_work_handler(struct k_work *work)
 {
 	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
@@ -197,7 +223,9 @@ static void rampstat_work_handler(struct k_work *work)
 		LOG_ERR("%s: Failed to read DRVSTATUS register", stepper_data->stepper->name);
 		return;
 	}
-
+#ifdef CONFIG_STEPPER_ADI_TMC50XX_RAMPSTAT_POLL_STALLGUARD_LOG
+	log_stallguard(stepper_data, drv_status);
+#endif
 	if (FIELD_GET(TMC5XXX_DRV_STATUS_SG_STATUS_MASK, drv_status) == 1U) {
 		LOG_INF("%s: Stall detected", stepper_data->stepper->name);
 		err = tmc50xx_write(stepper_config->controller,
@@ -258,9 +286,9 @@ static void rampstat_work_handler(struct k_work *work)
 
 #endif
 
-static int tmc50xx_stepper_enable(const struct device *dev, const bool enable)
+static int tmc50xx_stepper_enable(const struct device *dev)
 {
-	LOG_DBG("Stepper motor controller %s %s", dev->name, enable ? "enabled" : "disabled");
+	LOG_DBG("Enabling Stepper motor controller %s", dev->name);
 	const struct tmc50xx_stepper_config *config = dev->config;
 	uint32_t reg_value;
 	int err;
@@ -270,81 +298,43 @@ static int tmc50xx_stepper_enable(const struct device *dev, const bool enable)
 		return -EIO;
 	}
 
-	if (enable) {
-		reg_value |= TMC5XXX_CHOPCONF_DRV_ENABLE_MASK;
-	} else {
-		reg_value &= ~TMC5XXX_CHOPCONF_DRV_ENABLE_MASK;
-	}
+	reg_value |= TMC5XXX_CHOPCONF_DRV_ENABLE_MASK;
 
-	err = tmc50xx_write(config->controller, TMC50XX_CHOPCONF(config->index), reg_value);
-	if (err != 0) {
-		return -EIO;
-	}
-	return 0;
+	return tmc50xx_write(config->controller, TMC50XX_CHOPCONF(config->index), reg_value);
 }
 
-static int tmc50xx_stepper_is_moving(const struct device *dev, bool *is_moving)
+static int tmc50xx_stepper_disable(const struct device *dev)
 {
+	LOG_DBG("Disabling Stepper motor controller %s", dev->name);
 	const struct tmc50xx_stepper_config *config = dev->config;
 	uint32_t reg_value;
 	int err;
 
-	err = tmc50xx_read(config->controller, TMC50XX_DRVSTATUS(config->index), &reg_value);
-
+	err = tmc50xx_read(config->controller, TMC50XX_CHOPCONF(config->index), &reg_value);
 	if (err != 0) {
-		LOG_ERR("%s: Failed to read DRVSTATUS register", dev->name);
 		return -EIO;
 	}
 
-	*is_moving = (FIELD_GET(TMC5XXX_DRV_STATUS_STST_BIT, reg_value) != 1U);
-	LOG_DBG("Stepper motor controller %s is moving: %d", dev->name, *is_moving);
-	return 0;
+	reg_value &= ~TMC5XXX_CHOPCONF_DRV_ENABLE_MASK;
+
+	return tmc50xx_write(config->controller, TMC50XX_CHOPCONF(config->index), reg_value);
 }
 
-static int tmc50xx_stepper_move_by(const struct device *dev, const int32_t micro_steps)
+static int tmc50xx_stepper_is_moving(const struct device *dev, bool *is_moving)
 {
 	const struct tmc50xx_stepper_config *config = dev->config;
-	struct tmc50xx_stepper_data *data = dev->data;
+	uint32_t reg_value;
 	int err;
 
-	if (config->is_sg_enabled) {
-		err = stallguard_enable(dev, false);
-		if (err != 0) {
-			return -EIO;
-		}
-	}
-
-	int32_t position;
-
-	err = stepper_get_actual_position(dev, &position);
-	if (err != 0) {
-		return -EIO;
-	}
-	int32_t target_position = position + micro_steps;
+	err = tmc50xx_read(config->controller, TMC50XX_DRVSTATUS(config->index), &reg_value);
 
-	err = tmc50xx_write(config->controller, TMC50XX_RAMPMODE(config->index),
-			    TMC5XXX_RAMPMODE_POSITIONING_MODE);
-	if (err != 0) {
-		return -EIO;
-	}
-	LOG_DBG("Stepper motor controller %s moved to %d by steps: %d", dev->name, target_position,
-		micro_steps);
-	err = tmc50xx_write(config->controller, TMC50XX_XTARGET(config->index), target_position);
 	if (err != 0) {
+		LOG_ERR("%s: Failed to read DRVSTATUS register", dev->name);
 		return -EIO;
 	}
 
-	if (config->is_sg_enabled) {
-		k_work_reschedule(&data->stallguard_dwork,
-				  K_MSEC(config->sg_velocity_check_interval_ms));
-	}
-#ifdef CONFIG_STEPPER_ADI_TMC50XX_RAMPSTAT_POLL
-	if (data->callback) {
-		k_work_reschedule(
-			&data->rampstat_callback_dwork,
-			K_MSEC(CONFIG_STEPPER_ADI_TMC50XX_RAMPSTAT_POLL_INTERVAL_IN_MSEC));
-	}
-#endif
+	*is_moving = (FIELD_GET(TMC5XXX_DRV_STATUS_STST_BIT, reg_value) == 1U);
+	LOG_DBG("Stepper motor controller %s is moving: %d", dev->name, *is_moving);
 	return 0;
 }
 
@@ -369,6 +359,11 @@ int tmc50xx_stepper_set_max_velocity(const struct device *dev, uint32_t velocity
 static int tmc50xx_stepper_set_micro_step_res(const struct device *dev,
 					      enum stepper_micro_step_resolution res)
 {
+	if (!VALID_MICRO_STEP_RES(res)) {
+		LOG_ERR("Invalid micro step resolution %d", res);
+		return -ENOTSUP;
+	}
+
 	const struct tmc50xx_stepper_config *config = dev->config;
 	uint32_t reg_value;
 	int err;
@@ -429,12 +424,23 @@ static int tmc50xx_stepper_set_reference_position(const struct device *dev, cons
 	return 0;
 }
 
+static int read_actual_position(const struct tmc50xx_stepper_config *config, int32_t *position)
+{
+	int err;
+
+	err = tmc50xx_read(config->controller, TMC50XX_XACTUAL(config->index), position);
+	if (err != 0) {
+		return -EIO;
+	}
+	return 0;
+}
+
 static int tmc50xx_stepper_get_actual_position(const struct device *dev, int32_t *position)
 {
 	const struct tmc50xx_stepper_config *config = dev->config;
 	int err;
 
-	err = tmc50xx_read(config->controller, TMC50XX_XACTUAL(config->index), position);
+	err = read_actual_position(config, position);
 	if (err != 0) {
 		return -EIO;
 	}
@@ -444,7 +450,7 @@ static int tmc50xx_stepper_get_actual_position(const struct device *dev, int32_t
 
 static int tmc50xx_stepper_move_to(const struct device *dev, const int32_t micro_steps)
 {
-	LOG_DBG("Stepper motor controller %s set target position to %d", dev->name, micro_steps);
+	LOG_DBG("%s set target position to %d", dev->name, micro_steps);
 	const struct tmc50xx_stepper_config *config = dev->config;
 	struct tmc50xx_stepper_data *data = dev->data;
 	int err;
@@ -477,6 +483,22 @@ static int tmc50xx_stepper_move_to(const struct device *dev, const int32_t micro
 	return 0;
 }
 
+static int tmc50xx_stepper_move_by(const struct device *dev, const int32_t micro_steps)
+{
+	int err;
+	int32_t position;
+
+	err = stepper_get_actual_position(dev, &position);
+	if (err != 0) {
+		return -EIO;
+	}
+	int32_t target_position = position + micro_steps;
+
+	LOG_DBG("%s moved to %d by steps: %d", dev->name, target_position, micro_steps);
+
+	return tmc50xx_stepper_move_to(dev, target_position);
+}
+
 static int tmc50xx_stepper_run(const struct device *dev, const enum stepper_direction direction)
 {
 	LOG_DBG("Stepper motor controller %s run", dev->name);
@@ -654,12 +676,7 @@ static int tmc50xx_stepper_init(const struct device *dev)
 		if (err != 0) {
 			return -EIO;
 		}
-		err = stallguard_enable(dev, true);
-		if (err == -EAGAIN) {
-			LOG_ERR("retrying stallguard activation");
-			k_work_reschedule(&data->stallguard_dwork,
-					  K_MSEC(stepper_config->sg_velocity_check_interval_ms));
-		}
+		k_work_reschedule(&data->stallguard_dwork, K_NO_WAIT);
 	}
 
 #ifdef CONFIG_STEPPER_ADI_TMC50XX_RAMP_GEN
@@ -681,6 +698,20 @@ static int tmc50xx_stepper_init(const struct device *dev)
 	return 0;
 }
 
+static DEVICE_API(stepper, tmc50xx_stepper_api) = {
+	.enable = tmc50xx_stepper_enable,
+	.disable = tmc50xx_stepper_disable,
+	.is_moving = tmc50xx_stepper_is_moving,
+	.move_by = tmc50xx_stepper_move_by,
+	.set_micro_step_res = tmc50xx_stepper_set_micro_step_res,
+	.get_micro_step_res = tmc50xx_stepper_get_micro_step_res,
+	.set_reference_position = tmc50xx_stepper_set_reference_position,
+	.get_actual_position = tmc50xx_stepper_get_actual_position,
+	.move_to = tmc50xx_stepper_move_to,
+	.run = tmc50xx_stepper_run,
+	.set_event_callback = tmc50xx_stepper_set_event_callback,
+};
+
 #define TMC50XX_SHAFT_CONFIG(child)								\
 	(DT_PROP(child, invert_direction) << TMC50XX_GCONF_SHAFT_SHIFT(DT_REG_ADDR(child))) |
 
@@ -705,23 +736,10 @@ static int tmc50xx_stepper_init(const struct device *dev)
 	static struct tmc50xx_stepper_data tmc50xx_stepper_data_##child = {			\
 		.stepper = DEVICE_DT_GET(child),};
 
-#define TMC50XX_STEPPER_API_DEFINE(child)							\
-	static DEVICE_API(stepper, tmc50xx_stepper_api_##child) = {				\
-		.enable = tmc50xx_stepper_enable,						\
-		.is_moving = tmc50xx_stepper_is_moving,						\
-		.move_by = tmc50xx_stepper_move_by,						\
-		.set_micro_step_res = tmc50xx_stepper_set_micro_step_res,			\
-		.get_micro_step_res = tmc50xx_stepper_get_micro_step_res,			\
-		.set_reference_position = tmc50xx_stepper_set_reference_position,		\
-		.get_actual_position = tmc50xx_stepper_get_actual_position,			\
-		.move_to = tmc50xx_stepper_move_to,						\
-		.run = tmc50xx_stepper_run,							\
-		.set_event_callback = tmc50xx_stepper_set_event_callback, };
-
 #define TMC50XX_STEPPER_DEFINE(child)								\
 	DEVICE_DT_DEFINE(child, tmc50xx_stepper_init, NULL, &tmc50xx_stepper_data_##child,	\
 			 &tmc50xx_stepper_config_##child, POST_KERNEL,				\
-			 CONFIG_STEPPER_INIT_PRIORITY, &tmc50xx_stepper_api_##child);
+			 CONFIG_STEPPER_INIT_PRIORITY, &tmc50xx_stepper_api);
 
 #define TMC50XX_DEFINE(inst)									\
 	BUILD_ASSERT(DT_INST_CHILD_NUM(inst) <= 2, "tmc50xx can drive two steppers at max");	\
@@ -739,7 +757,6 @@ static int tmc50xx_stepper_init(const struct device *dev)
 		.clock_frequency = DT_INST_PROP(inst, clock_frequency),};			\
 	DT_INST_FOREACH_CHILD(inst, TMC50XX_STEPPER_CONFIG_DEFINE);				\
 	DT_INST_FOREACH_CHILD(inst, TMC50XX_STEPPER_DATA_DEFINE);				\
-	DT_INST_FOREACH_CHILD(inst, TMC50XX_STEPPER_API_DEFINE);				\
 	DT_INST_FOREACH_CHILD(inst, TMC50XX_STEPPER_DEFINE);					\
 	DEVICE_DT_INST_DEFINE(inst, tmc50xx_init, NULL, &tmc50xx_data_##inst,			\
 			      &tmc50xx_config_##inst, POST_KERNEL, CONFIG_STEPPER_INIT_PRIORITY,\
diff --git a/drivers/stepper/allegro/CMakeLists.txt b/drivers/stepper/allegro/CMakeLists.txt
new file mode 100644
index 0000000000000..63576a655c67f
--- /dev/null
+++ b/drivers/stepper/allegro/CMakeLists.txt
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 Carl Zeiss Meditec AG
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_property(ALLOW_EMPTY TRUE)
+
+zephyr_library_sources_ifdef(CONFIG_A4979_STEPPER a4979.c)
diff --git a/drivers/stepper/allegro/Kconfig b/drivers/stepper/allegro/Kconfig
new file mode 100644
index 0000000000000..39d24bdf1f97d
--- /dev/null
+++ b/drivers/stepper/allegro/Kconfig
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 Carl Zeiss Meditec AG
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig STEPPER_ALLEGRO
+	bool "Allegro Stepper Controller"
+	depends on STEPPER
+	default y
+	help
+	  Enable allegro stepper controller
+
+if STEPPER_ALLEGRO
+
+comment "Allegro Stepper Drivers"
+
+# zephyr-keep-sorted-start
+rsource "Kconfig.a4979"
+# zephyr-keep-sorted-stop
+
+endif # STEPPER_ALLEGRO
diff --git a/drivers/stepper/allegro/Kconfig.a4979 b/drivers/stepper/allegro/Kconfig.a4979
new file mode 100644
index 0000000000000..1abca3f87ef15
--- /dev/null
+++ b/drivers/stepper/allegro/Kconfig.a4979
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 Carl Zeiss Meditec AG
+# SPDX-License-Identifier: Apache-2.0
+
+config A4979_STEPPER
+	bool "Activate allegro A4979 stepper driver"
+	default y
+	depends on DT_HAS_ALLEGRO_A4979_ENABLED
+	select STEP_DIR_STEPPER
+	help
+	  Microstepping motor driver for stepper motors.
diff --git a/drivers/stepper/allegro/a4979.c b/drivers/stepper/allegro/a4979.c
new file mode 100644
index 0000000000000..f08dbd61d37bf
--- /dev/null
+++ b/drivers/stepper/allegro/a4979.c
@@ -0,0 +1,302 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2025 Carl Zeiss Meditec AG
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT allegro_a4979
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/stepper.h>
+#include <zephyr/drivers/gpio.h>
+#include "../step_dir/step_dir_stepper_common.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(a4979, CONFIG_STEPPER_LOG_LEVEL);
+
+struct a4979_config {
+	const struct step_dir_stepper_common_config common;
+	const struct gpio_dt_spec en_pin;
+	const struct gpio_dt_spec reset_pin;
+	const struct gpio_dt_spec m0_pin;
+	const struct gpio_dt_spec m1_pin;
+};
+
+struct a4979_data {
+	const struct step_dir_stepper_common_data common;
+	enum stepper_micro_step_resolution micro_step_res;
+	bool enabled;
+};
+
+STEP_DIR_STEPPER_STRUCT_CHECK(struct a4979_config, struct a4979_data);
+
+static int a4979_set_microstep_pin(const struct device *dev, const struct gpio_dt_spec *pin,
+				   int value)
+{
+	int ret;
+
+	/* Reset microstep pin as it may have been disconnected. */
+	ret = gpio_pin_configure_dt(pin, GPIO_OUTPUT_INACTIVE);
+	if (ret != 0) {
+		LOG_ERR("Failed to configure microstep pin (error: %d)", ret);
+		return ret;
+	}
+
+	ret = gpio_pin_set_dt(pin, value);
+	if (ret != 0) {
+		LOG_ERR("Failed to set microstep pin (error: %d)", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int a4979_stepper_enable(const struct device *dev)
+{
+	int ret;
+	const struct a4979_config *config = dev->config;
+	struct a4979_data *data = dev->data;
+	bool has_enable_pin = config->en_pin.port != NULL;
+
+	/* Check availability of enable pin, as it might be hardwired. */
+	if (!has_enable_pin) {
+		LOG_ERR("%s: Enable pin undefined.", dev->name);
+		return -ENOTSUP;
+	}
+
+	ret = gpio_pin_set_dt(&config->en_pin, 1);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to set en_pin (error: %d)", dev->name, ret);
+		return ret;
+	}
+
+	data->enabled = true;
+
+	return 0;
+}
+
+static int a4979_stepper_disable(const struct device *dev)
+{
+	int ret;
+	const struct a4979_config *config = dev->config;
+	struct a4979_data *data = dev->data;
+	bool has_enable_pin = config->en_pin.port != NULL;
+
+	/* Check availability of enable pin, as it might be hardwired. */
+	if (!has_enable_pin) {
+		LOG_ERR("%s: Enable pin undefined.", dev->name);
+		return -ENOTSUP;
+	}
+
+	ret = gpio_pin_set_dt(&config->en_pin, 0);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to set en_pin (error: %d)", dev->name, ret);
+		return ret;
+	}
+
+	config->common.timing_source->stop(dev);
+	data->enabled = false;
+
+	return 0;
+}
+
+static int a4979_stepper_set_micro_step_res(const struct device *dev,
+					    const enum stepper_micro_step_resolution micro_step_res)
+{
+	const struct a4979_config *config = dev->config;
+	struct a4979_data *data = dev->data;
+	int ret;
+
+	uint8_t m0_value = 0;
+	uint8_t m1_value = 0;
+
+	switch (micro_step_res) {
+	case STEPPER_MICRO_STEP_1:
+		m0_value = 0;
+		m1_value = 0;
+		break;
+	case STEPPER_MICRO_STEP_2:
+		m0_value = 1;
+		m1_value = 0;
+		break;
+	case STEPPER_MICRO_STEP_4:
+		m0_value = 0;
+		m1_value = 1;
+	case STEPPER_MICRO_STEP_16:
+		m0_value = 1;
+		m1_value = 1;
+		break;
+	default:
+		LOG_ERR("Unsupported micro step resolution %d", micro_step_res);
+		return -ENOTSUP;
+	}
+
+	ret = a4979_set_microstep_pin(dev, &config->m0_pin, m0_value);
+	if (ret != 0) {
+		return ret;
+	}
+	ret = a4979_set_microstep_pin(dev, &config->m1_pin, m1_value);
+	if (ret != 0) {
+		return ret;
+	}
+
+	data->micro_step_res = micro_step_res;
+	return 0;
+}
+
+static int a4979_stepper_get_micro_step_res(const struct device *dev,
+					    enum stepper_micro_step_resolution *micro_step_res)
+{
+	struct a4979_data *data = dev->data;
+
+	*micro_step_res = data->micro_step_res;
+	return 0;
+}
+
+static int a4979_move_to(const struct device *dev, int32_t target)
+{
+	struct a4979_data *data = dev->data;
+
+	if (!data->enabled) {
+		LOG_ERR("Failed to move to target position, device is not enabled");
+		return -ECANCELED;
+	}
+
+	return step_dir_stepper_common_move_to(dev, target);
+}
+
+static int a4979_stepper_move_by(const struct device *dev, const int32_t micro_steps)
+{
+	struct a4979_data *data = dev->data;
+
+	if (!data->enabled) {
+		LOG_ERR("Failed to move by delta, device is not enabled");
+		return -ECANCELED;
+	}
+
+	return step_dir_stepper_common_move_by(dev, micro_steps);
+}
+
+static int a4979_run(const struct device *dev, enum stepper_direction direction)
+{
+	struct a4979_data *data = dev->data;
+
+	if (!data->enabled) {
+		LOG_ERR("Failed to run stepper, device is not enabled");
+		return -ECANCELED;
+	}
+
+	return step_dir_stepper_common_run(dev, direction);
+}
+
+static int a4979_init(const struct device *dev)
+{
+	const struct a4979_config *config = dev->config;
+	struct a4979_data *data = dev->data;
+	int ret;
+
+	bool has_enable_pin = config->en_pin.port != NULL;
+	bool has_reset_pin = config->reset_pin.port != NULL;
+
+	LOG_DBG("Initializing %s gpios", dev->name);
+
+	/* Configure reset pin if it is available */
+	if (has_reset_pin) {
+		if (!gpio_is_ready_dt(&config->reset_pin)) {
+			LOG_ERR("Enable Pin is not ready");
+			return -ENODEV;
+		}
+
+		ret = gpio_pin_configure_dt(&config->reset_pin, GPIO_OUTPUT_ACTIVE);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to configure reset_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+	}
+
+	/* Configure enable pin if it is available */
+	if (has_enable_pin) {
+		if (!gpio_is_ready_dt(&config->en_pin)) {
+			LOG_ERR("Enable Pin is not ready");
+			return -ENODEV;
+		}
+
+		ret = gpio_pin_configure_dt(&config->en_pin, GPIO_OUTPUT_INACTIVE);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to configure en_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+	}
+
+	/* Configure microstep pin 0 */
+	if (!gpio_is_ready_dt(&config->m0_pin)) {
+		LOG_ERR("m0 Pin is not ready");
+		return -ENODEV;
+	}
+	ret = gpio_pin_configure_dt(&config->m0_pin, GPIO_OUTPUT_INACTIVE);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to configure m0_pin (error: %d)", dev->name, ret);
+		return ret;
+	}
+
+	/* Configure microstep pin 1 */
+	if (!gpio_is_ready_dt(&config->m1_pin)) {
+		LOG_ERR("m1 Pin is not ready");
+		return -ENODEV;
+	}
+	ret = gpio_pin_configure_dt(&config->m1_pin, GPIO_OUTPUT_INACTIVE);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to configure m1_pin (error: %d)", dev->name, ret);
+		return ret;
+	}
+
+	ret = a4979_stepper_set_micro_step_res(dev, data->micro_step_res);
+	if (ret != 0) {
+		LOG_ERR("Failed to set micro step resolution: %d", ret);
+		return ret;
+	}
+
+	ret = step_dir_stepper_common_init(dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to initialize common stepper data: %d", ret);
+		return ret;
+	}
+	gpio_pin_set_dt(&config->common.step_pin, 0);
+
+	return 0;
+}
+
+static DEVICE_API(stepper, a4979_stepper_api) = {
+	.enable = a4979_stepper_enable,
+	.disable = a4979_stepper_disable,
+	.move_by = a4979_stepper_move_by,
+	.move_to = a4979_move_to,
+	.is_moving = step_dir_stepper_common_is_moving,
+	.set_reference_position = step_dir_stepper_common_set_reference_position,
+	.get_actual_position = step_dir_stepper_common_get_actual_position,
+	.set_microstep_interval = step_dir_stepper_common_set_microstep_interval,
+	.run = a4979_run,
+	.stop = step_dir_stepper_common_stop,
+	.set_micro_step_res = a4979_stepper_set_micro_step_res,
+	.get_micro_step_res = a4979_stepper_get_micro_step_res,
+	.set_event_callback = step_dir_stepper_common_set_event_callback,
+};
+
+#define A4979_DEVICE(inst)                                                                         \
+                                                                                                   \
+	static const struct a4979_config a4979_config_##inst = {                                   \
+		.common = STEP_DIR_STEPPER_DT_INST_COMMON_CONFIG_INIT(inst),                       \
+		.en_pin = GPIO_DT_SPEC_INST_GET_OR(inst, en_gpios, {0}),                           \
+		.reset_pin = GPIO_DT_SPEC_INST_GET_OR(inst, reset_gpios, {0}),                     \
+		.m0_pin = GPIO_DT_SPEC_INST_GET(inst, m0_gpios),                                   \
+		.m1_pin = GPIO_DT_SPEC_INST_GET(inst, m1_gpios),                                   \
+	};                                                                                         \
+                                                                                                   \
+	static struct a4979_data a4979_data_##inst = {                                             \
+		.common = STEP_DIR_STEPPER_DT_INST_COMMON_DATA_INIT(inst),                         \
+		.micro_step_res = DT_INST_PROP(inst, micro_step_res),                              \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(inst, a4979_init, NULL, &a4979_data_##inst, &a4979_config_##inst,    \
+			      POST_KERNEL, CONFIG_STEPPER_INIT_PRIORITY, &a4979_stepper_api);
+
+DT_INST_FOREACH_STATUS_OKAY(A4979_DEVICE)
diff --git a/drivers/stepper/fake_stepper_controller.c b/drivers/stepper/fake_stepper_controller.c
index 1633b4c038009..3abce9726c504 100644
--- a/drivers/stepper/fake_stepper_controller.c
+++ b/drivers/stepper/fake_stepper_controller.c
@@ -19,7 +19,9 @@ struct fake_stepper_data {
 	int32_t actual_position;
 };
 
-DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_enable, const struct device *, bool);
+DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_enable, const struct device *);
+
+DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_disable, const struct device *);
 
 DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_is_moving, const struct device *, bool *);
 
@@ -41,6 +43,8 @@ DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_move_to, const struct device *, int32_t
 
 DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_run, const struct device *, enum stepper_direction);
 
+DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_stop, const struct device *);
+
 DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_set_event_callback, const struct device *,
 		       stepper_event_callback_t, void *);
 
@@ -89,6 +93,7 @@ static void fake_stepper_reset_rule_before(const struct ztest_unit_test *test, v
 	ARG_UNUSED(fixture);
 
 	RESET_FAKE(fake_stepper_enable);
+	RESET_FAKE(fake_stepper_disable);
 	RESET_FAKE(fake_stepper_move_by);
 	RESET_FAKE(fake_stepper_is_moving);
 	RESET_FAKE(fake_stepper_set_microstep_interval);
@@ -98,6 +103,7 @@ static void fake_stepper_reset_rule_before(const struct ztest_unit_test *test, v
 	RESET_FAKE(fake_stepper_get_actual_position);
 	RESET_FAKE(fake_stepper_move_to);
 	RESET_FAKE(fake_stepper_run);
+	RESET_FAKE(fake_stepper_stop);
 
 	/* Install custom fakes for the setter and getter functions */
 	fake_stepper_set_micro_step_res_fake.custom_fake = fake_stepper_set_micro_step_res_delegate;
@@ -125,6 +131,7 @@ static int fake_stepper_init(const struct device *dev)
 
 static DEVICE_API(stepper, fake_stepper_driver_api) = {
 	.enable = fake_stepper_enable,
+	.disable = fake_stepper_disable,
 	.move_by = fake_stepper_move_by,
 	.is_moving = fake_stepper_is_moving,
 	.set_microstep_interval = fake_stepper_set_microstep_interval,
@@ -134,6 +141,7 @@ static DEVICE_API(stepper, fake_stepper_driver_api) = {
 	.get_actual_position = fake_stepper_get_actual_position,
 	.move_to = fake_stepper_move_to,
 	.run = fake_stepper_run,
+	.stop = fake_stepper_stop,
 	.set_event_callback = fake_stepper_set_event_callback,
 };
 
diff --git a/drivers/stepper/gpio_stepper_controller.c b/drivers/stepper/gpio_stepper_controller.c
index 404b685aac7ff..8d129bb57af0d 100644
--- a/drivers/stepper/gpio_stepper_controller.c
+++ b/drivers/stepper/gpio_stepper_controller.c
@@ -78,12 +78,12 @@ static void decrement_coil_charge(const struct device *dev)
 	}
 }
 
-static int power_down_coils(const struct device *dev)
+static int energize_coils(const struct device *dev, const bool energized)
 {
 	const struct gpio_stepper_config *config = dev->config;
 
 	for (int i = 0; i < NUM_CONTROL_PINS; i++) {
-		const int err = gpio_pin_set_dt(&config->control_pins[i], 0u);
+		const int err = gpio_pin_set_dt(&config->control_pins[i], energized);
 
 		if (err != 0) {
 			LOG_ERR("Failed to power down coil %d", i);
@@ -223,23 +223,12 @@ static int gpio_stepper_get_actual_position(const struct device *dev, int32_t *p
 static int gpio_stepper_move_to(const struct device *dev, int32_t micro_steps)
 {
 	struct gpio_stepper_data *data = dev->data;
+	int32_t steps_to_move;
 
-	if (!data->is_enabled) {
-		LOG_ERR("Stepper motor is not enabled");
-		return -ECANCELED;
-	}
-
-	if (data->delay_in_ns == 0) {
-		LOG_ERR("Step interval not set or invalid step interval set");
-		return -EINVAL;
-	}
 	K_SPINLOCK(&data->lock) {
-		data->run_mode = STEPPER_RUN_MODE_POSITION;
-		data->step_count = micro_steps - data->actual_position;
-		update_direction_from_step_count(dev);
-		(void)k_work_reschedule(&data->stepper_dwork, K_NO_WAIT);
+		steps_to_move = micro_steps - data->actual_position;
 	}
-	return 0;
+	return gpio_stepper_move_by(dev, steps_to_move);
 }
 
 static int gpio_stepper_is_moving(const struct device *dev, bool *is_moving)
@@ -289,6 +278,7 @@ static int gpio_stepper_set_micro_step_res(const struct device *dev,
 					   enum stepper_micro_step_resolution micro_step_res)
 {
 	struct gpio_stepper_data *data = dev->data;
+	int err = 0;
 
 	K_SPINLOCK(&data->lock) {
 		switch (micro_step_res) {
@@ -298,10 +288,10 @@ static int gpio_stepper_set_micro_step_res(const struct device *dev,
 			break;
 		default:
 			LOG_ERR("Unsupported micro step resolution %d", micro_step_res);
-			return -ENOTSUP;
+			err = -ENOTSUP;
 		}
 	}
-	return 0;
+	return err;
 }
 
 static int gpio_stepper_get_micro_step_res(const struct device *dev,
@@ -324,26 +314,54 @@ static int gpio_stepper_set_event_callback(const struct device *dev,
 	return 0;
 }
 
-static int gpio_stepper_enable(const struct device *dev, bool enable)
+static int gpio_stepper_enable(const struct device *dev)
 {
 	struct gpio_stepper_data *data = dev->data;
+	int err;
+
+	if (data->is_enabled) {
+		LOG_WRN("Stepper motor is already enabled");
+		return 0;
+	}
 
 	K_SPINLOCK(&data->lock) {
+		err = energize_coils(dev, true);
+		if (err == 0) {
+			data->is_enabled = true;
+		}
+	}
+	return err;
+}
 
-		data->is_enabled = enable;
+static int gpio_stepper_disable(const struct device *dev)
+{
+	struct gpio_stepper_data *data = dev->data;
+	int err;
 
-		if (enable) {
-			(void)k_work_reschedule(&data->stepper_dwork, K_NO_WAIT);
-		} else {
-			(void)k_work_cancel_delayable(&data->stepper_dwork);
-			const int err = power_down_coils(dev);
+	K_SPINLOCK(&data->lock) {
+		(void)k_work_cancel_delayable(&data->stepper_dwork);
+		err = energize_coils(dev, false);
+		if (err == 0) {
+			data->is_enabled = false;
+		}
+	}
+	return err;
+}
+
+static int gpio_stepper_stop(const struct device *dev)
+{
+	struct gpio_stepper_data *data = dev->data;
+	int err;
 
-			if (err != 0) {
-				return -EIO;
-			}
+	K_SPINLOCK(&data->lock) {
+		(void)k_work_cancel_delayable(&data->stepper_dwork);
+		err = energize_coils(dev, true);
+
+		if (data->callback && !err) {
+			data->callback(data->dev, STEPPER_EVENT_STOPPED, data->event_cb_user_data);
 		}
 	}
-	return 0;
+	return err;
 }
 
 static int gpio_stepper_init(const struct device *dev)
@@ -362,16 +380,18 @@ static int gpio_stepper_init(const struct device *dev)
 
 static DEVICE_API(stepper, gpio_stepper_api) = {
 	.enable = gpio_stepper_enable,
-	.move_by = gpio_stepper_move_by,
-	.is_moving = gpio_stepper_is_moving,
+	.disable = gpio_stepper_disable,
+	.set_micro_step_res = gpio_stepper_set_micro_step_res,
+	.get_micro_step_res = gpio_stepper_get_micro_step_res,
 	.set_reference_position = gpio_stepper_set_reference_position,
 	.get_actual_position = gpio_stepper_get_actual_position,
-	.move_to = gpio_stepper_move_to,
+	.set_event_callback = gpio_stepper_set_event_callback,
 	.set_microstep_interval = gpio_stepper_set_microstep_interval,
+	.move_by = gpio_stepper_move_by,
+	.move_to = gpio_stepper_move_to,
 	.run = gpio_stepper_run,
-	.set_micro_step_res = gpio_stepper_set_micro_step_res,
-	.get_micro_step_res = gpio_stepper_get_micro_step_res,
-	.set_event_callback = gpio_stepper_set_event_callback,
+	.stop = gpio_stepper_stop,
+	.is_moving = gpio_stepper_is_moving,
 };
 
 #define GPIO_STEPPER_DEFINE(inst)								\
diff --git a/drivers/stepper/step_dir/step_dir_stepper_common.c b/drivers/stepper/step_dir/step_dir_stepper_common.c
index a7ad2a2d35b76..bd4eac4b99600 100644
--- a/drivers/stepper/step_dir/step_dir_stepper_common.c
+++ b/drivers/stepper/step_dir/step_dir_stepper_common.c
@@ -16,10 +16,10 @@ static inline int step_dir_stepper_perform_step(const struct device *dev)
 
 	switch (data->direction) {
 	case STEPPER_DIRECTION_POSITIVE:
-		ret = gpio_pin_set_dt(&config->dir_pin, 1);
+		ret = gpio_pin_set_dt(&config->dir_pin, 1 ^ config->invert_direction);
 		break;
 	case STEPPER_DIRECTION_NEGATIVE:
-		ret = gpio_pin_set_dt(&config->dir_pin, 0);
+		ret = gpio_pin_set_dt(&config->dir_pin, 0 ^ config->invert_direction);
 		break;
 	default:
 		LOG_ERR("Unsupported direction: %d", data->direction);
@@ -53,7 +53,7 @@ static inline int step_dir_stepper_perform_step(const struct device *dev)
 	return 0;
 }
 
-static void stepper_trigger_callback(const struct device *dev, enum stepper_event event)
+void stepper_trigger_callback(const struct device *dev, enum stepper_event event)
 {
 	struct step_dir_stepper_common_data *data = dev->data;
 
@@ -288,22 +288,14 @@ int step_dir_stepper_common_get_actual_position(const struct device *dev, int32_
 int step_dir_stepper_common_move_to(const struct device *dev, const int32_t value)
 {
 	struct step_dir_stepper_common_data *data = dev->data;
-	const struct step_dir_stepper_common_config *config = dev->config;
-
-	if (data->microstep_interval_ns == 0) {
-		LOG_ERR("Step interval not set or invalid step interval set");
-		return -EINVAL;
-	}
+	int32_t steps_to_move;
 
+	/* Calculate the relative movement required */
 	K_SPINLOCK(&data->lock) {
-		data->run_mode = STEPPER_RUN_MODE_POSITION;
-		data->step_count = value - data->actual_position;
-		config->timing_source->update(dev, data->microstep_interval_ns);
-		update_direction_from_step_count(dev);
-		config->timing_source->start(dev);
+		steps_to_move = value - data->actual_position;
 	}
 
-	return 0;
+	return step_dir_stepper_common_move_by(dev, steps_to_move);
 }
 
 int step_dir_stepper_common_is_moving(const struct device *dev, bool *is_moving)
@@ -329,6 +321,21 @@ int step_dir_stepper_common_run(const struct device *dev, const enum stepper_dir
 	return 0;
 }
 
+int step_dir_stepper_common_stop(const struct device *dev)
+{
+	const struct step_dir_stepper_common_config *config = dev->config;
+	int ret;
+
+	ret = config->timing_source->stop(dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to stop timing source: %d", ret);
+		return ret;
+	}
+
+	stepper_trigger_callback(dev, STEPPER_EVENT_STOPPED);
+	return 0;
+}
+
 int step_dir_stepper_common_set_event_callback(const struct device *dev,
 					       stepper_event_callback_t callback, void *user_data)
 {
diff --git a/drivers/stepper/step_dir/step_dir_stepper_common.h b/drivers/stepper/step_dir/step_dir_stepper_common.h
index d84a9b30e3fc5..b345cf5d68a5d 100644
--- a/drivers/stepper/step_dir/step_dir_stepper_common.h
+++ b/drivers/stepper/step_dir/step_dir_stepper_common.h
@@ -32,6 +32,7 @@ struct step_dir_stepper_common_config {
 	bool dual_edge;
 	const struct stepper_timing_source_api *timing_source;
 	const struct device *counter;
+	bool invert_direction;
 };
 
 /**
@@ -47,6 +48,7 @@ struct step_dir_stepper_common_config {
 		.dir_pin = GPIO_DT_SPEC_GET(node_id, dir_gpios),                                   \
 		.dual_edge = DT_PROP_OR(node_id, dual_edge_step, false),                           \
 		.counter = DEVICE_DT_GET_OR_NULL(DT_PHANDLE(node_id, counter)),                    \
+		.invert_direction = DT_PROP(node_id, invert_direction),                            \
 		.timing_source = COND_CODE_1(DT_NODE_HAS_PROP(node_id, counter),                   \
 						(&step_counter_timing_source_api),                 \
 						(&step_work_timing_source_api)),                   \
@@ -195,6 +197,14 @@ int step_dir_stepper_common_is_moving(const struct device *dev, bool *is_moving)
  */
 int step_dir_stepper_common_run(const struct device *dev, const enum stepper_direction direction);
 
+/**
+ * @brief Stop the stepper motor.
+ *
+ * @param dev Pointer to the device structure.
+ * @return 0 on success, or a negative error code on failure.
+ */
+int step_dir_stepper_common_stop(const struct device *dev);
+
 /**
  * @brief Set a callback function for stepper motor events.
  *
@@ -215,6 +225,13 @@ int step_dir_stepper_common_set_event_callback(const struct device *dev,
  */
 void stepper_handle_timing_signal(const struct device *dev);
 
+/**
+ * @brief Trigger callback function for stepper motor events.
+ * @param dev Pointer to the device structure.
+ * @param event The stepper_event to rigger the callback for.
+ */
+void stepper_trigger_callback(const struct device *dev, enum stepper_event event);
+
 /** @} */
 
 #endif /* ZEPHYR_DRIVER_STEPPER_STEP_DIR_STEPPER_COMMON_H_ */
diff --git a/drivers/stepper/stepper_shell.c b/drivers/stepper/stepper_shell.c
index 6b5d8035f906c..1e96fb20c5f11 100644
--- a/drivers/stepper/stepper_shell.c
+++ b/drivers/stepper/stepper_shell.c
@@ -61,6 +61,12 @@ static void print_callback(const struct device *dev, const enum stepper_event ev
 	case STEPPER_EVENT_RIGHT_END_STOP_DETECTED:
 		shell_info(sh, "%s: Right limit switch pressed.", dev->name);
 		break;
+	case STEPPER_EVENT_STOPPED:
+		shell_info(sh, "%s: Stepper stopped.", dev->name);
+		break;
+	case STEPPER_EVENT_FAULT_DETECTED:
+		shell_info(sh, "%s: Fault detected.", dev->name);
+		break;
 	default:
 		shell_info(sh, "%s: Unknown signal received.", dev->name);
 		break;
@@ -175,21 +181,58 @@ static int parse_device_arg(const struct shell *sh, char **argv, const struct de
 static int cmd_stepper_enable(const struct shell *sh, size_t argc, char **argv)
 {
 	const struct device *dev;
-	int err = 0;
-	bool enable = shell_strtobool(argv[ARG_IDX_PARAM], 10, &err);
+	int err;
 
+	err = parse_device_arg(sh, argv, &dev);
 	if (err < 0) {
 		return err;
 	}
 
+	err = stepper_enable(dev);
+	if (err) {
+		shell_error(sh, "Error: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_stepper_disable(const struct shell *sh, size_t argc, char **argv)
+{
+	const struct device *dev;
+	int err;
+
+	err = parse_device_arg(sh, argv, &dev);
+	if (err < 0) {
+		return err;
+	}
+
+	err = stepper_disable(dev);
+	if (err) {
+		shell_error(sh, "Error: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_stepper_stop(const struct shell *sh, size_t argc, char **argv)
+{
+	const struct device *dev;
+	int err = 0;
+
 	err = parse_device_arg(sh, argv, &dev);
 	if (err < 0) {
 		return err;
 	}
 
-	err = stepper_enable(dev, enable);
+	err = stepper_stop(dev);
 	if (err) {
 		shell_error(sh, "Error: %d", err);
+		return err;
+	}
+
+	err = stepper_set_event_callback(dev, print_callback, (void *)sh);
+	if (err != 0) {
+		shell_error(sh, "Failed to set callback: %d", err);
 	}
 
 	return err;
@@ -450,12 +493,8 @@ static int cmd_stepper_info(const struct shell *sh, size_t argc, char **argv)
 
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	stepper_cmds,
-	SHELL_CMD_ARG(enable, &dsub_pos_stepper_motor_name, "<device> <on/off>", cmd_stepper_enable,
-		      3, 0),
-	SHELL_CMD_ARG(move_by, &dsub_pos_stepper_motor_name, "<device> <microsteps>",
-		      cmd_stepper_move_by, 3, 0),
-	SHELL_CMD_ARG(set_microstep_interval, &dsub_pos_stepper_motor_name,
-		      "<device> <microstep_interval_ns>", cmd_stepper_set_microstep_interval, 3, 0),
+	SHELL_CMD_ARG(enable, &dsub_pos_stepper_motor_name, "<device>", cmd_stepper_enable, 2, 0),
+	SHELL_CMD_ARG(disable, &dsub_pos_stepper_motor_name, "<device>", cmd_stepper_disable, 2, 0),
 	SHELL_CMD_ARG(set_micro_step_res, &dsub_pos_stepper_motor_name_microstep,
 		      "<device> <resolution>", cmd_stepper_set_micro_step_res, 3, 0),
 	SHELL_CMD_ARG(get_micro_step_res, &dsub_pos_stepper_motor_name, "<device>",
@@ -464,10 +503,15 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_stepper_set_reference_position, 3, 0),
 	SHELL_CMD_ARG(get_actual_position, &dsub_pos_stepper_motor_name, "<device>",
 		      cmd_stepper_get_actual_position, 2, 0),
+	SHELL_CMD_ARG(set_microstep_interval, &dsub_pos_stepper_motor_name,
+		      "<device> <microstep_interval_ns>", cmd_stepper_set_microstep_interval, 3, 0),
+	SHELL_CMD_ARG(move_by, &dsub_pos_stepper_motor_name, "<device> <microsteps>",
+		      cmd_stepper_move_by, 3, 0),
 	SHELL_CMD_ARG(move_to, &dsub_pos_stepper_motor_name, "<device> <microsteps>",
 		      cmd_stepper_move_to, 3, 0),
 	SHELL_CMD_ARG(run, &dsub_pos_stepper_motor_name_dir, "<device> <direction>",
 		      cmd_stepper_run, 3, 0),
+	SHELL_CMD_ARG(stop, &dsub_pos_stepper_motor_name, "<device>", cmd_stepper_stop, 2, 0),
 	SHELL_CMD_ARG(info, &dsub_pos_stepper_motor_name, "<device>", cmd_stepper_info, 2, 0),
 	SHELL_SUBCMD_SET_END);
 
diff --git a/drivers/stepper/ti/CMakeLists.txt b/drivers/stepper/ti/CMakeLists.txt
index 8594fb8e1ed9c..4075008cfef0d 100644
--- a/drivers/stepper/ti/CMakeLists.txt
+++ b/drivers/stepper/ti/CMakeLists.txt
@@ -4,4 +4,4 @@
 zephyr_library()
 zephyr_library_property(ALLOW_EMPTY TRUE)
 
-zephyr_library_sources_ifdef(CONFIG_DRV8424 drv8424.c)
+zephyr_library_sources_ifdef(CONFIG_DRV84XX drv84xx.c)
diff --git a/drivers/stepper/ti/Kconfig b/drivers/stepper/ti/Kconfig
index 99c989f6e75fb..18804a89094a9 100644
--- a/drivers/stepper/ti/Kconfig
+++ b/drivers/stepper/ti/Kconfig
@@ -5,4 +5,4 @@ config STEPPER_TI
 	bool
 	depends on STEPPER
 
-rsource "Kconfig.drv8424"
+rsource "Kconfig.drv84xx"
diff --git a/drivers/stepper/ti/Kconfig.drv8424 b/drivers/stepper/ti/Kconfig.drv8424
deleted file mode 100644
index f359cdf7c0598..0000000000000
--- a/drivers/stepper/ti/Kconfig.drv8424
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
-# SPDX-License-Identifier: Apache-2.0
-
-config DRV8424
-	bool "TI DRV8424 stepper motor driver"
-	default y
-	depends on DT_HAS_TI_DRV8424_ENABLED
-	select STEPPER_TI
-	select STEP_DIR_STEPPER
-	select STEPPER_STEP_DIR_GENERATE_ISR_SAFE_EVENTS
-	help
-	  Enable driver for TI DRV8424 stepper motor driver.
diff --git a/drivers/stepper/ti/Kconfig.drv84xx b/drivers/stepper/ti/Kconfig.drv84xx
new file mode 100644
index 0000000000000..e5466890c66da
--- /dev/null
+++ b/drivers/stepper/ti/Kconfig.drv84xx
@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+config DRV84XX
+	bool "TI DRV84XX stepper motor driver"
+	default y
+	depends on DT_HAS_TI_DRV84XX_ENABLED
+	select STEPPER_TI
+	select STEP_DIR_STEPPER
+	select STEPPER_STEP_DIR_GENERATE_ISR_SAFE_EVENTS
+	help
+	  Enable driver for TI DRV84XX stepper motor driver.
diff --git a/drivers/stepper/ti/drv8424.c b/drivers/stepper/ti/drv8424.c
deleted file mode 100644
index 9fd172fc0ecc5..0000000000000
--- a/drivers/stepper/ti/drv8424.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define DT_DRV_COMPAT ti_drv8424
-
-#include <zephyr/kernel.h>
-#include <zephyr/drivers/stepper.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/stepper/stepper_drv8424.h>
-#include "../step_dir/step_dir_stepper_common.h"
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(drv8424, CONFIG_STEPPER_LOG_LEVEL);
-
-/**
- * @brief DRV8424 stepper driver configuration data.
- *
- * This structure contains all of the devicetree specifications for the pins
- * needed by a given DRV8424 stepper driver.
- */
-struct drv8424_config {
-	struct step_dir_stepper_common_config common;
-	struct gpio_dt_spec sleep_pin;
-	struct gpio_dt_spec en_pin;
-	struct gpio_dt_spec m0_pin;
-	struct gpio_dt_spec m1_pin;
-};
-
-/* Struct for storing the states of output pins. */
-struct drv8424_pin_states {
-	uint8_t sleep: 1;
-	uint8_t en: 1;
-	uint8_t m0: 2;
-	uint8_t m1: 2;
-};
-
-/**
- * @brief DRV8424 stepper driver data.
- *
- * This structure contains mutable data used by a DRV8424 stepper driver.
- */
-struct drv8424_data {
-	const struct step_dir_stepper_common_data common;
-	bool enabled;
-	struct drv8424_pin_states pin_states;
-	enum stepper_micro_step_resolution ustep_res;
-};
-
-STEP_DIR_STEPPER_STRUCT_CHECK(struct drv8424_config, struct drv8424_data);
-
-static int drv8424_set_microstep_pin(const struct device *dev, const struct gpio_dt_spec *pin,
-				     int value)
-{
-	int ret;
-
-	/* Reset microstep pin as it may have been disconnected. */
-	ret = gpio_pin_configure_dt(pin, GPIO_OUTPUT_INACTIVE);
-	if (ret != 0) {
-		LOG_ERR("%s: Failed to reset micro-step pin (error: %d)", dev->name, ret);
-		return ret;
-	}
-
-	/* Set microstep pin */
-	switch (value) {
-	case 0:
-		ret = gpio_pin_set_dt(pin, 0);
-		break;
-	case 1:
-		ret = gpio_pin_set_dt(pin, 1);
-		break;
-	case 2:
-		/* Hi-Z is set by configuring pin as disconnected, not
-		 * all gpio controllers support this.
-		 */
-		ret = gpio_pin_configure_dt(pin, GPIO_DISCONNECTED);
-		break;
-	default:
-		break;
-	}
-
-	if (ret != 0) {
-		LOG_ERR("%s: Failed to set micro-step pin (error: %d)", dev->name, ret);
-		return ret;
-	}
-	return 0;
-}
-
-/*
- * If microstep setter fails, attempt to recover into previous state.
- */
-int drv8424_microstep_recovery(const struct device *dev)
-{
-	const struct drv8424_config *config = dev->config;
-	struct drv8424_data *data = dev->data;
-	int ret;
-
-	uint8_t m0_value = data->pin_states.m0;
-	uint8_t m1_value = data->pin_states.m1;
-
-	ret = drv8424_set_microstep_pin(dev, &config->m0_pin, m0_value);
-	if (ret != 0) {
-		LOG_ERR("%s: Failed to restore microstep configuration (error: %d)", dev->name,
-			ret);
-		return ret;
-	}
-
-	ret = drv8424_set_microstep_pin(dev, &config->m1_pin, m1_value);
-	if (ret != 0) {
-		LOG_ERR("%s: Failed to restore microstep configuration (error: %d)", dev->name,
-			ret);
-		return ret;
-	}
-
-	return 0;
-}
-
-static int drv8424_enable(const struct device *dev, bool enable)
-{
-	int ret;
-	const struct drv8424_config *config = dev->config;
-	struct drv8424_data *data = dev->data;
-	bool has_enable_pin = config->en_pin.port != NULL;
-	bool has_sleep_pin = config->sleep_pin.port != NULL;
-
-	/* Check availability of sleep and enable pins, as these might be hardwired. */
-	if (!has_sleep_pin && !has_enable_pin) {
-		LOG_ERR("%s: Failed to enable/disable device, neither sleep pin nor enable pin are "
-			"available. The device is always on.",
-			dev->name);
-		return -ENOTSUP;
-	}
-
-	if (has_sleep_pin) {
-		ret = gpio_pin_set_dt(&config->sleep_pin, !enable);
-		if (ret != 0) {
-			LOG_ERR("%s: Failed to set sleep_pin (error: %d)", dev->name, ret);
-			return ret;
-		}
-		data->pin_states.sleep = enable ? 0U : 1U;
-	}
-
-	if (has_enable_pin) {
-		ret = gpio_pin_set_dt(&config->en_pin, enable);
-		if (ret != 0) {
-			LOG_ERR("%s: Failed to set en_pin (error: %d)", dev->name, ret);
-			return ret;
-		}
-		data->pin_states.en = enable ? 1U : 0U;
-	}
-
-	data->enabled = enable;
-	if (!enable) {
-		config->common.timing_source->stop(dev);
-		gpio_pin_set_dt(&config->common.step_pin, 0);
-	}
-
-	return 0;
-}
-
-static int drv8424_set_micro_step_res(const struct device *dev,
-				      enum stepper_micro_step_resolution micro_step_res)
-{
-	const struct drv8424_config *config = dev->config;
-	struct drv8424_data *data = dev->data;
-	int ret;
-
-	uint8_t m0_value = 0;
-	uint8_t m1_value = 0;
-
-	/* 0: low
-	 * 1: high
-	 * 2: Hi-Z
-	 * 3: 330kΩ
-	 */
-	switch (micro_step_res) {
-	case STEPPER_MICRO_STEP_1:
-		m0_value = 0;
-		m1_value = 0;
-		break;
-	case STEPPER_MICRO_STEP_2:
-		m0_value = 2;
-		m1_value = 0;
-		break;
-	case STEPPER_MICRO_STEP_4:
-		m0_value = 0;
-		m1_value = 1;
-		break;
-	case STEPPER_MICRO_STEP_8:
-		m0_value = 1;
-		m1_value = 1;
-		break;
-	case STEPPER_MICRO_STEP_16:
-		m0_value = 2;
-		m1_value = 1;
-		break;
-	case STEPPER_MICRO_STEP_32:
-		m0_value = 0;
-		m1_value = 2;
-		break;
-	case STEPPER_MICRO_STEP_64:
-		m0_value = 2;
-		m1_value = 3;
-		break;
-	case STEPPER_MICRO_STEP_128:
-		m0_value = 2;
-		m1_value = 2;
-		break;
-	case STEPPER_MICRO_STEP_256:
-		m0_value = 1;
-		m1_value = 2;
-		break;
-	default:
-		return -EINVAL;
-	};
-
-	ret = drv8424_set_microstep_pin(dev, &config->m0_pin, m0_value);
-	if (ret != 0) {
-		return ret;
-	}
-
-	ret = drv8424_set_microstep_pin(dev, &config->m1_pin, m1_value);
-	if (ret != 0) {
-		return ret;
-	}
-
-	data->ustep_res = micro_step_res;
-	data->pin_states.m0 = m0_value;
-	data->pin_states.m1 = m1_value;
-
-	return 0;
-}
-
-static int drv8424_get_micro_step_res(const struct device *dev,
-				      enum stepper_micro_step_resolution *micro_step_res)
-{
-	struct drv8424_data *data = dev->data;
-	*micro_step_res = data->ustep_res;
-	return 0;
-}
-
-static int drv8424_move_to(const struct device *dev, int32_t target)
-{
-	struct drv8424_data *data = dev->data;
-
-	if (!data->enabled) {
-		LOG_ERR("Failed to move to target position, device is not enabled");
-		return -ECANCELED;
-	}
-
-	return step_dir_stepper_common_move_to(dev, target);
-}
-
-static int drv8424_move_by(const struct device *dev, int32_t steps)
-{
-	struct drv8424_data *data = dev->data;
-
-	if (!data->enabled) {
-		LOG_ERR("Failed to move by delta, device is not enabled");
-		return -ECANCELED;
-	}
-
-	return step_dir_stepper_common_move_by(dev, steps);
-}
-
-static int drv8424_run(const struct device *dev, enum stepper_direction direction)
-{
-	struct drv8424_data *data = dev->data;
-
-	if (!data->enabled) {
-		LOG_ERR("Failed to run stepper, device is not enabled");
-		return -ECANCELED;
-	}
-
-	return step_dir_stepper_common_run(dev, direction);
-}
-
-static int drv8424_init(const struct device *dev)
-{
-	const struct drv8424_config *const config = dev->config;
-	struct drv8424_data *const data = dev->data;
-	int ret;
-
-	/* Configure sleep pin if it is available */
-	if (config->sleep_pin.port != NULL) {
-		ret = gpio_pin_configure_dt(&config->sleep_pin, GPIO_OUTPUT_ACTIVE);
-		if (ret != 0) {
-			LOG_ERR("%s: Failed to configure sleep_pin (error: %d)", dev->name, ret);
-			return ret;
-		}
-		data->pin_states.sleep = 1U;
-	}
-
-	/* Configure enable pin if it is available */
-	if (config->en_pin.port != NULL) {
-		ret = gpio_pin_configure_dt(&config->en_pin, GPIO_OUTPUT_INACTIVE);
-		if (ret != 0) {
-			LOG_ERR("%s: Failed to configure en_pin (error: %d)", dev->name, ret);
-			return ret;
-		}
-		data->pin_states.en = 0U;
-	}
-
-	/* Configure microstep pin 0 */
-	ret = gpio_pin_configure_dt(&config->m0_pin, GPIO_OUTPUT_INACTIVE);
-	if (ret != 0) {
-		LOG_ERR("%s: Failed to configure m0_pin (error: %d)", dev->name, ret);
-		return ret;
-	}
-	data->pin_states.m0 = 0U;
-
-	/* Configure microstep pin 1 */
-	ret = gpio_pin_configure_dt(&config->m1_pin, GPIO_OUTPUT_INACTIVE);
-	if (ret != 0) {
-		LOG_ERR("%s: Failed to configure m1_pin (error: %d)", dev->name, ret);
-		return ret;
-	}
-	data->pin_states.m1 = 0U;
-
-	ret = drv8424_set_micro_step_res(dev, data->ustep_res);
-	if (ret != 0) {
-		return ret;
-	}
-
-	ret = step_dir_stepper_common_init(dev);
-	if (ret != 0) {
-		LOG_ERR("Failed to initialize common step direction stepper (error: %d)", ret);
-		return ret;
-	}
-
-	return 0;
-}
-
-static DEVICE_API(stepper, drv8424_stepper_api) = {
-	.enable = drv8424_enable,
-	.move_by = drv8424_move_by,
-	.move_to = drv8424_move_to,
-	.is_moving = step_dir_stepper_common_is_moving,
-	.set_reference_position = step_dir_stepper_common_set_reference_position,
-	.get_actual_position = step_dir_stepper_common_get_actual_position,
-	.set_microstep_interval = step_dir_stepper_common_set_microstep_interval,
-	.run = drv8424_run,
-	.set_micro_step_res = drv8424_set_micro_step_res,
-	.get_micro_step_res = drv8424_get_micro_step_res,
-	.set_event_callback = step_dir_stepper_common_set_event_callback,
-};
-
-#define DRV8424_DEVICE(inst)                                                                       \
-                                                                                                   \
-	static const struct drv8424_config drv8424_config_##inst = {                               \
-		.common = STEP_DIR_STEPPER_DT_INST_COMMON_CONFIG_INIT(inst),                       \
-		.sleep_pin = GPIO_DT_SPEC_INST_GET_OR(inst, sleep_gpios, {0}),                     \
-		.en_pin = GPIO_DT_SPEC_INST_GET_OR(inst, en_gpios, {0}),                           \
-		.m0_pin = GPIO_DT_SPEC_INST_GET(inst, m0_gpios),                                   \
-		.m1_pin = GPIO_DT_SPEC_INST_GET(inst, m1_gpios),                                   \
-	};                                                                                         \
-                                                                                                   \
-	static struct drv8424_data drv8424_data_##inst = {                                         \
-		.common = STEP_DIR_STEPPER_DT_INST_COMMON_DATA_INIT(inst),                         \
-		.ustep_res = DT_INST_PROP(inst, micro_step_res),                                   \
-	};                                                                                         \
-                                                                                                   \
-	DEVICE_DT_INST_DEFINE(inst, &drv8424_init, NULL, &drv8424_data_##inst,                     \
-			      &drv8424_config_##inst, POST_KERNEL, CONFIG_STEPPER_INIT_PRIORITY,   \
-			      &drv8424_stepper_api);
-
-DT_INST_FOREACH_STATUS_OKAY(DRV8424_DEVICE)
diff --git a/drivers/stepper/ti/drv84xx.c b/drivers/stepper/ti/drv84xx.c
new file mode 100644
index 0000000000000..cc4a8651e8aa5
--- /dev/null
+++ b/drivers/stepper/ti/drv84xx.c
@@ -0,0 +1,515 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ti_drv84xx
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/stepper.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/stepper/stepper_drv84xx.h>
+#include "../step_dir/step_dir_stepper_common.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(drv84xx, CONFIG_STEPPER_LOG_LEVEL);
+
+/* Enable and wake up times of the drv84xx stepper controller family. Only after they have elapsed
+ * are controller output signals guaranteed to be valid.
+ */
+#define DRV84XX_ENABLE_TIME  K_USEC(5)
+#define DRV84XX_WAKE_UP_TIME K_USEC(1200)
+
+/**
+ * @brief DRV84XX stepper driver configuration data.
+ *
+ * This structure contains all of the devicetree specifications for the pins
+ * needed by a given DRV84XX stepper driver.
+ */
+struct drv84xx_config {
+	struct step_dir_stepper_common_config common;
+	struct gpio_dt_spec sleep_pin;
+	struct gpio_dt_spec en_pin;
+	struct gpio_dt_spec m0_pin;
+	struct gpio_dt_spec m1_pin;
+	struct gpio_dt_spec fault_pin;
+};
+
+/* Struct for storing the states of output pins. */
+struct drv84xx_pin_states {
+	uint8_t sleep: 1;
+	uint8_t en: 1;
+	uint8_t m0: 2;
+	uint8_t m1: 2;
+};
+
+/**
+ * @brief DRV84XX stepper driver data.
+ */
+struct drv84xx_data {
+	const struct step_dir_stepper_common_data common;
+	const struct device *dev;
+	bool enabled;
+	struct drv84xx_pin_states pin_states;
+	enum stepper_micro_step_resolution ustep_res;
+	struct gpio_callback fault_cb_data;
+};
+
+STEP_DIR_STEPPER_STRUCT_CHECK(struct drv84xx_config, struct drv84xx_data);
+
+static int drv84xx_set_microstep_pin(const struct device *dev, const struct gpio_dt_spec *pin,
+				     int value)
+{
+	int ret;
+
+	/* Reset microstep pin as it may have been disconnected. */
+	ret = gpio_pin_configure_dt(pin, GPIO_OUTPUT_INACTIVE);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to reset micro-step pin (error: %d)", dev->name, ret);
+		return ret;
+	}
+
+	/* Set microstep pin */
+	switch (value) {
+	case 0:
+		ret = gpio_pin_set_dt(pin, 0);
+		break;
+	case 1:
+		ret = gpio_pin_set_dt(pin, 1);
+		break;
+	case 2:
+		/* Hi-Z is set by configuring pin as disconnected, not
+		 * all gpio controllers support this.
+		 */
+		ret = gpio_pin_configure_dt(pin, GPIO_DISCONNECTED);
+		break;
+	default:
+		break;
+	}
+
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to set micro-step pin (error: %d)", dev->name, ret);
+		return ret;
+	}
+	return 0;
+}
+
+/*
+ * If microstep setter fails, attempt to recover into previous state.
+ */
+int drv84xx_microstep_recovery(const struct device *dev)
+{
+	const struct drv84xx_config *config = dev->config;
+	struct drv84xx_data *data = dev->data;
+	int ret;
+
+	uint8_t m0_value = data->pin_states.m0;
+	uint8_t m1_value = data->pin_states.m1;
+
+	ret = drv84xx_set_microstep_pin(dev, &config->m0_pin, m0_value);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to restore microstep configuration (error: %d)", dev->name,
+			ret);
+		return ret;
+	}
+
+	ret = drv84xx_set_microstep_pin(dev, &config->m1_pin, m1_value);
+	if (ret != 0) {
+		LOG_ERR("%s: Failed to restore microstep configuration (error: %d)", dev->name,
+			ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int drv84xx_check_en_sleep_pin(const struct drv84xx_config *config)
+{
+	bool has_sleep_pin = config->sleep_pin.port != NULL;
+	bool has_enable_pin = config->en_pin.port != NULL;
+
+	if (!has_sleep_pin && !has_enable_pin) {
+		LOG_ERR("Failed to enable/disable device, neither sleep pin nor enable pin are "
+			"available. The device is always on.");
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int drv84xx_set_en_pin_state(const struct device *dev, bool enable)
+{
+	const struct drv84xx_config *config = dev->config;
+	struct drv84xx_data *data = dev->data;
+	bool has_enable_pin = config->en_pin.port != NULL;
+	int ret;
+
+	if (has_enable_pin) {
+		ret = gpio_pin_set_dt(&config->en_pin, enable);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to set en_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+		data->pin_states.en = enable ? 1U : 0U;
+	}
+
+	return 0;
+}
+
+static int drv84xx_set_sleep_pin_state(const struct device *dev, bool enable)
+{
+	int ret;
+	const struct drv84xx_config *config = dev->config;
+	struct drv84xx_data *data = dev->data;
+	bool has_sleep_pin = config->sleep_pin.port != NULL;
+
+	if (has_sleep_pin) {
+		ret = gpio_pin_set_dt(&config->sleep_pin, !enable);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to set sleep_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+		data->pin_states.sleep = enable ? 0U : 1U;
+	}
+
+	return 0;
+}
+
+static int drv84xx_enable(const struct device *dev)
+{
+	const struct drv84xx_config *config = dev->config;
+	struct drv84xx_data *data = dev->data;
+	bool has_enable_pin = config->en_pin.port != NULL;
+	bool has_sleep_pin = config->sleep_pin.port != NULL;
+	bool has_fault_pin = config->fault_pin.port != NULL;
+	k_timeout_t enable_timeout;
+	int ret;
+
+	ret = drv84xx_check_en_sleep_pin(config);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = drv84xx_set_sleep_pin_state(dev, true);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = drv84xx_set_en_pin_state(dev, true);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (has_enable_pin) {
+		enable_timeout = DRV84XX_ENABLE_TIME;
+	}
+
+	if (has_sleep_pin) {
+		enable_timeout = DRV84XX_WAKE_UP_TIME;
+	}
+
+	if (has_fault_pin) {
+		/* Wait after enable/wakeup until the fault pin is guaranteed to be in the
+		 * proper state.
+		 */
+		k_sleep(enable_timeout);
+		ret = gpio_add_callback_dt(&config->fault_pin, &data->fault_cb_data);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to add fault callback (error: %d)", dev->name, ret);
+			return ret;
+		}
+	}
+
+	data->enabled = true;
+
+	return ret;
+}
+
+static int drv84xx_disable(const struct device *dev)
+{
+	const struct drv84xx_config *config = dev->config;
+	struct drv84xx_data *data = dev->data;
+	bool has_fault_pin = config->fault_pin.port != NULL;
+	int ret;
+
+	ret = drv84xx_check_en_sleep_pin(config);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = drv84xx_set_sleep_pin_state(dev, false);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = drv84xx_set_en_pin_state(dev, false);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (has_fault_pin) {
+		ret = gpio_remove_callback_dt(&config->fault_pin, &data->fault_cb_data);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to remove fault callback (error: %d)", dev->name, ret);
+			return ret;
+		}
+	}
+
+	config->common.timing_source->stop(dev);
+
+	data->enabled = false;
+
+	return ret;
+}
+
+static int drv84xx_set_micro_step_res(const struct device *dev,
+				      enum stepper_micro_step_resolution micro_step_res)
+{
+	const struct drv84xx_config *config = dev->config;
+	struct drv84xx_data *data = dev->data;
+	int ret;
+
+	uint8_t m0_value = 0;
+	uint8_t m1_value = 0;
+
+	if ((config->m0_pin.port == NULL) || (config->m1_pin.port == NULL)) {
+
+		LOG_ERR("%s: Failed to set microstep resolution: microstep pins are not defined "
+			"(error: %d)",
+			dev->name, -ENOTSUP);
+		return -ENOTSUP;
+	}
+
+	/* 0: low
+	 * 1: high
+	 * 2: Hi-Z
+	 * 3: 330kΩ
+	 */
+	switch (micro_step_res) {
+	case STEPPER_MICRO_STEP_1:
+		m0_value = 0;
+		m1_value = 0;
+		break;
+	case STEPPER_MICRO_STEP_2:
+		m0_value = 2;
+		m1_value = 0;
+		break;
+	case STEPPER_MICRO_STEP_4:
+		m0_value = 0;
+		m1_value = 1;
+		break;
+	case STEPPER_MICRO_STEP_8:
+		m0_value = 1;
+		m1_value = 1;
+		break;
+	case STEPPER_MICRO_STEP_16:
+		m0_value = 2;
+		m1_value = 1;
+		break;
+	case STEPPER_MICRO_STEP_32:
+		m0_value = 0;
+		m1_value = 2;
+		break;
+	case STEPPER_MICRO_STEP_64:
+		m0_value = 2;
+		m1_value = 3;
+		break;
+	case STEPPER_MICRO_STEP_128:
+		m0_value = 2;
+		m1_value = 2;
+		break;
+	case STEPPER_MICRO_STEP_256:
+		m0_value = 1;
+		m1_value = 2;
+		break;
+	default:
+		return -ENOTSUP;
+	};
+
+	ret = drv84xx_set_microstep_pin(dev, &config->m0_pin, m0_value);
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = drv84xx_set_microstep_pin(dev, &config->m1_pin, m1_value);
+	if (ret != 0) {
+		return ret;
+	}
+
+	data->ustep_res = micro_step_res;
+	data->pin_states.m0 = m0_value;
+	data->pin_states.m1 = m1_value;
+
+	return 0;
+}
+
+static int drv84xx_get_micro_step_res(const struct device *dev,
+				      enum stepper_micro_step_resolution *micro_step_res)
+{
+	struct drv84xx_data *data = dev->data;
+	*micro_step_res = data->ustep_res;
+	return 0;
+}
+
+static int drv84xx_move_to(const struct device *dev, int32_t target)
+{
+	struct drv84xx_data *data = dev->data;
+
+	if (!data->enabled) {
+		LOG_ERR("Failed to move to target position, device is not enabled");
+		return -ECANCELED;
+	}
+
+	return step_dir_stepper_common_move_to(dev, target);
+}
+
+static int drv84xx_move_by(const struct device *dev, int32_t steps)
+{
+	struct drv84xx_data *data = dev->data;
+
+	if (!data->enabled) {
+		LOG_ERR("Failed to move by delta, device is not enabled");
+		return -ECANCELED;
+	}
+
+	return step_dir_stepper_common_move_by(dev, steps);
+}
+
+static int drv84xx_run(const struct device *dev, enum stepper_direction direction)
+{
+	struct drv84xx_data *data = dev->data;
+
+	if (!data->enabled) {
+		LOG_ERR("Failed to run stepper, device is not enabled");
+		return -ECANCELED;
+	}
+
+	return step_dir_stepper_common_run(dev, direction);
+}
+
+void fault_event(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
+{
+	struct drv84xx_data *data = CONTAINER_OF(cb, struct drv84xx_data, fault_cb_data);
+
+	stepper_trigger_callback(data->dev, STEPPER_EVENT_FAULT_DETECTED);
+}
+
+static int drv84xx_init(const struct device *dev)
+{
+	const struct drv84xx_config *const config = dev->config;
+	struct drv84xx_data *const data = dev->data;
+	int ret;
+
+	/* Configure sleep pin if it is available */
+	if (config->sleep_pin.port != NULL) {
+		ret = gpio_pin_configure_dt(&config->sleep_pin, GPIO_OUTPUT_ACTIVE);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to configure sleep_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+		data->pin_states.sleep = 1U;
+	}
+
+	/* Configure enable pin if it is available */
+	if (config->en_pin.port != NULL) {
+		ret = gpio_pin_configure_dt(&config->en_pin, GPIO_OUTPUT_INACTIVE);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to configure en_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+		data->pin_states.en = 0U;
+	}
+
+	/* Configure microstep pin 0 if it is available */
+	if (config->m0_pin.port != NULL) {
+		ret = gpio_pin_configure_dt(&config->m0_pin, GPIO_OUTPUT_INACTIVE);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to configure m0_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+		data->pin_states.m0 = 0U;
+	}
+
+	/* Configure microstep pin 1 if it is available */
+	if (config->m1_pin.port != NULL) {
+		ret = gpio_pin_configure_dt(&config->m1_pin, GPIO_OUTPUT_INACTIVE);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to configure m1_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+		data->pin_states.m1 = 0U;
+	}
+
+	if ((config->m0_pin.port != NULL) && (config->m1_pin.port != NULL)) {
+		ret = drv84xx_set_micro_step_res(dev, data->ustep_res);
+		if (ret != 0) {
+			return ret;
+		}
+	}
+
+	ret = step_dir_stepper_common_init(dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to initialize common step direction stepper (error: %d)", ret);
+		return ret;
+	}
+
+	/* Configure fault pin if it is available */
+	if (config->fault_pin.port != NULL) {
+		ret = gpio_pin_configure_dt(&config->fault_pin, GPIO_INPUT);
+		if (ret != 0) {
+			LOG_ERR("%s: Failed to configure fault_pin (error: %d)", dev->name, ret);
+			return ret;
+		}
+
+		ret = gpio_pin_interrupt_configure_dt(&config->fault_pin,
+						      GPIO_INT_EDGE_TO_INACTIVE);
+		if (ret != 0) {
+			LOG_ERR("Error %d: failed to configure interrupt on %s pin %d", ret,
+				config->fault_pin.port->name, config->fault_pin.pin);
+			return ret;
+		}
+
+		gpio_init_callback(&data->fault_cb_data, fault_event, BIT(config->fault_pin.pin));
+	}
+
+	return 0;
+}
+
+static DEVICE_API(stepper, drv84xx_stepper_api) = {
+	.enable = drv84xx_enable,
+	.disable = drv84xx_disable,
+	.move_by = drv84xx_move_by,
+	.move_to = drv84xx_move_to,
+	.is_moving = step_dir_stepper_common_is_moving,
+	.set_reference_position = step_dir_stepper_common_set_reference_position,
+	.get_actual_position = step_dir_stepper_common_get_actual_position,
+	.set_microstep_interval = step_dir_stepper_common_set_microstep_interval,
+	.run = drv84xx_run,
+	.stop = step_dir_stepper_common_stop,
+	.set_micro_step_res = drv84xx_set_micro_step_res,
+	.get_micro_step_res = drv84xx_get_micro_step_res,
+	.set_event_callback = step_dir_stepper_common_set_event_callback,
+};
+
+#define DRV84XX_DEVICE(inst)                                                                       \
+                                                                                                   \
+	static const struct drv84xx_config drv84xx_config_##inst = {                               \
+		.common = STEP_DIR_STEPPER_DT_INST_COMMON_CONFIG_INIT(inst),                       \
+		.sleep_pin = GPIO_DT_SPEC_INST_GET_OR(inst, sleep_gpios, {0}),                     \
+		.en_pin = GPIO_DT_SPEC_INST_GET_OR(inst, en_gpios, {0}),                           \
+		.m0_pin = GPIO_DT_SPEC_INST_GET_OR(inst, m0_gpios, {0}),                           \
+		.m1_pin = GPIO_DT_SPEC_INST_GET_OR(inst, m1_gpios, {0}),                           \
+		.fault_pin = GPIO_DT_SPEC_INST_GET_OR(inst, fault_gpios, {0}),                     \
+	};                                                                                         \
+                                                                                                   \
+	static struct drv84xx_data drv84xx_data_##inst = {                                         \
+		.common = STEP_DIR_STEPPER_DT_INST_COMMON_DATA_INIT(inst),                         \
+		.ustep_res = DT_INST_PROP(inst, micro_step_res),                                   \
+		.dev = DEVICE_DT_INST_GET(inst),                                                   \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(inst, &drv84xx_init, NULL, &drv84xx_data_##inst,                     \
+			      &drv84xx_config_##inst, POST_KERNEL, CONFIG_STEPPER_INIT_PRIORITY,   \
+			      &drv84xx_stepper_api);
+
+DT_INST_FOREACH_STATUS_OKAY(DRV84XX_DEVICE)
diff --git a/drivers/timer/CMakeLists.txt b/drivers/timer/CMakeLists.txt
index 9a6b2697e988c..2f7a4533151e8 100644
--- a/drivers/timer/CMakeLists.txt
+++ b/drivers/timer/CMakeLists.txt
@@ -18,6 +18,7 @@ zephyr_library_sources_ifdef(CONFIG_CORTEX_M_SYSTICK cortex_m_systick.c)
 zephyr_library_sources_ifdef(CONFIG_ESP32_SYS_TIMER esp32_sys_timer.c)
 zephyr_library_sources_ifdef(CONFIG_GECKO_BURTC_TIMER gecko_burtc_timer.c)
 zephyr_library_sources_ifdef(CONFIG_HPET_TIMER hpet.c)
+zephyr_library_sources_ifdef(CONFIG_ITE_IT51XXX_TIMER ite_it51xxx_timer.c)
 zephyr_library_sources_ifdef(CONFIG_ITE_IT8XXX2_TIMER ite_it8xxx2_timer.c)
 zephyr_library_sources_ifdef(CONFIG_LEON_GPTIMER leon_gptimer.c)
 zephyr_library_sources_ifdef(CONFIG_LITEX_TIMER litex_timer.c)
@@ -27,11 +28,12 @@ zephyr_library_sources_ifdef(CONFIG_MCUX_LPTMR_TIMER mcux_lptmr_timer.c)
 zephyr_library_sources_ifdef(CONFIG_MCUX_OS_TIMER mcux_os_timer.c)
 zephyr_library_sources_ifdef(CONFIG_MCUX_GPT_TIMER mcux_gpt_timer.c)
 zephyr_library_sources_ifdef(CONFIG_MIPS_CP0_TIMER mips_cp0_timer.c)
-zephyr_library_sources_ifdef(CONFIG_NATIVE_POSIX_TIMER native_posix_timer.c)
+zephyr_library_sources_ifdef(CONFIG_NATIVE_SIM_TIMER native_sim_timer.c)
 zephyr_library_sources_ifdef(CONFIG_NPCX_ITIM_TIMER npcx_itim_timer.c)
 zephyr_library_sources_ifdef(CONFIG_NRF_GRTC_TIMER nrf_grtc_timer.c)
 zephyr_library_sources_ifdef(CONFIG_NRF_RTC_TIMER nrf_rtc_timer.c)
 zephyr_library_sources_ifdef(CONFIG_RCAR_CMT_TIMER rcar_cmt_timer.c)
+zephyr_library_sources_ifdef(CONFIG_RENESAS_RA_ULPT_TIMER renesas_ra_ulpt_timer.c)
 zephyr_library_sources_ifdef(CONFIG_RISCV_MACHINE_TIMER riscv_machine_timer.c)
 zephyr_library_sources_ifdef(CONFIG_RV32M1_LPTMR_TIMER rv32m1_lptmr_timer.c)
 zephyr_library_sources_ifdef(CONFIG_REALTEK_RTS5912_RTMR realtek_rts5912_rtmr.c)
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index 839dec71fa26b..ebe5f32cdf24b 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -75,6 +75,7 @@ source "drivers/timer/Kconfig.wch_ch32v00x"
 source "drivers/timer/Kconfig.cortex_m_systick"
 source "drivers/timer/Kconfig.esp32"
 source "drivers/timer/Kconfig.gecko"
+source "drivers/timer/Kconfig.it51xxx"
 source "drivers/timer/Kconfig.ite_it8xxx2"
 source "drivers/timer/Kconfig.leon_gptimer"
 source "drivers/timer/Kconfig.litex"
@@ -84,7 +85,7 @@ source "drivers/timer/Kconfig.mcux_lptmr"
 source "drivers/timer/Kconfig.mcux_os"
 source "drivers/timer/Kconfig.mec5"
 source "drivers/timer/Kconfig.mips_cp0"
-source "drivers/timer/Kconfig.native_posix"
+source "drivers/timer/Kconfig.native_sim"
 source "drivers/timer/Kconfig.npcx_itim"
 source "drivers/timer/Kconfig.nrf_rtc"
 source "drivers/timer/Kconfig.nrf_grtc"
@@ -102,6 +103,7 @@ source "drivers/timer/Kconfig.xlnx_psttc"
 source "drivers/timer/Kconfig.xtensa"
 source "drivers/timer/Kconfig.mtk_adsp"
 source "drivers/timer/Kconfig.sy1xx_sys_timer"
+source "drivers/timer/Kconfig.renesas_ra_ulpt"
 
 endmenu
 
diff --git a/drivers/timer/Kconfig.cortex_m_systick b/drivers/timer/Kconfig.cortex_m_systick
index 2a4f48832cf78..c0e8140fcb562 100644
--- a/drivers/timer/Kconfig.cortex_m_systick
+++ b/drivers/timer/Kconfig.cortex_m_systick
@@ -43,20 +43,69 @@ config CORTEX_M_SYSTICK_64BIT_CYCLE_COUNTER
 	  This is set to y by default when the hardware clock is fast enough
 	  to wrap sys_clock_cycle_get_32() in about a minute or less.
 
-config CORTEX_M_SYSTICK_IDLE_TIMER
-	bool "Use an additional timer while entering IDLE"
-	default $(dt_chosen_enabled,$(DT_CHOSEN_IDLE_TIMER))
+choice CORTEX_M_SYSTICK_LPM_TIMER
+	prompt "SysTick companion low-power mode timer"
+	# If all dependencies are enabled, and /chosen/cortex-m-idle-timer
+	# is enabled, default to using the Counter API-based LPM timer.
+	# Otherwise, the first choice (LPM_TIMER_NONE) will be selected
+	# automatically, and no LPM timer will be enabled.
+	default CORTEX_M_SYSTICK_LPM_TIMER_COUNTER
+	help
+	  It is common for SoCs equipped with SysTick to use it as system timer.
+	  However, depending on the SoC implementation, entering low-power mode
+	  may turn off the SysTick clock or place SysTick under reset.
+
+	  On such SoCs, a vendor-specific timer that remains active in low-power
+	  mode will usually be provided - however, it may be unfit for usage as
+	  system timer, for example because its frequency is too low.
+
+	  With this option, such vendor-specific timer can be selected and used by
+	  the SysTick driver to ensure proper system operation in low-power mode.
+
+	  NOTE: since Power Management has to be enabled if the SoC may enter in
+	  low-power mode, no LPM timer can be selected if PM is not enabled.
+	  Tickless kernel must also be enabled, since periodic interrupts would
+	  prevent the system from entering in low-power modes.
+
+config CORTEX_M_SYSTICK_LPM_TIMER_NONE
+	bool "None"
+	help
+	  Use no additional device as low-power mode timer.
+
+	  The SoC must never enter a low-power mode where SysTick is disabled when
+	  this option is selected; otherwise, system behavior becomes unpredictable.
+
+if TICKLESS_KERNEL && PM
+
+config CORTEX_M_SYSTICK_LPM_TIMER_COUNTER
+	bool "Counter API timer"
+	depends on $(dt_chosen_enabled,$(DT_CHOSEN_IDLE_TIMER))
 	depends on COUNTER
-	depends on TICKLESS_KERNEL
-	depends on PM
 	help
-	  There are chips e.g. STMFX family that use SysTick as a system timer,
-	  but SysTick is not clocked in low power mode. These chips usually have
-	  another timer that is not stopped, but it has lower frequency e.g.
-	  RTC, thus it can't be used as a main system timer.
+	  Use a device that implements the counter API as low-power mode timer.
+
+	  The device is selected by property "/chosen/cortex-m-idle-timer".
+
+config CORTEX_M_SYSTICK_LPM_TIMER_HOOKS
+	bool "Hook-based timer"
+	help
+	  Use hooks in the SysTick driver to configure the low-power mode timer.
+	  Refer to `include/drivers/timer/cortex_m_systick.h` for more details.
+
+endif # PM
+endchoice # CORTEX_M_SYSTICK_LPM_TIMER
+
+config CORTEX_M_SYSTICK_RESET_BY_LPM
+	bool
+	depends on !CORTEX_M_SYSTICK_LPM_TIMER_NONE
+	help
+	  Some SoCs provide one or more low-power mode which, as part of their
+	  operation, place SysTick or the entire CPU under reset. This requires
+	  special care from the driver - notably, SysTick needs to be restarted
+	  after waking up from such a low-power mode.
 
-	  Use the IDLE timer for timeout (wakeup) when the system is entering
-	  IDLE state.
+	  Select this symbol if your SoC has a low-power mode that places SysTick
+	  under reset. Note that this requires that the platform provides a timer
+	  active in low-power mode, since SysTick cannot be used for timekeeping.
 
-	  The chosen IDLE timer node has to support setting alarm from the
-	  counter API.
+	  Refer to CONFIG_CORTEX_M_SYSTICK_LPM_TIMER for more details.
diff --git a/drivers/timer/Kconfig.esp32 b/drivers/timer/Kconfig.esp32
index 304ad1271b791..ff10f017866d7 100644
--- a/drivers/timer/Kconfig.esp32
+++ b/drivers/timer/Kconfig.esp32
@@ -5,7 +5,7 @@
 
 config ESP32_SYS_TIMER
 	bool "ESP32 sys-timer support (ESP32Cx series)"
-	depends on SOC_SERIES_ESP32C2 || SOC_SERIES_ESP32C3 || SOC_SERIES_ESP32C6
+	depends on SOC_SERIES_ESP32C2 || SOC_SERIES_ESP32C3 || (SOC_SERIES_ESP32C6 && !SOC_ESP32C6_LPCORE)
 	default y
 	select TICKLESS_CAPABLE
 	select TIMER_HAS_64BIT_CYCLE_COUNTER
diff --git a/drivers/timer/Kconfig.it51xxx b/drivers/timer/Kconfig.it51xxx
new file mode 100644
index 0000000000000..6d260909539a1
--- /dev/null
+++ b/drivers/timer/Kconfig.it51xxx
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config ITE_IT51XXX_TIMER
+	bool "ITE it51xxx timer driver"
+	default y
+	depends on DT_HAS_ITE_IT51XXX_TIMER_ENABLED
+	select TICKLESS_CAPABLE
+	help
+	  This module implements a kernel device driver for the ITE IT51XXX
+	  HW timer model.
diff --git a/drivers/timer/Kconfig.mcux_lptmr b/drivers/timer/Kconfig.mcux_lptmr
index 851c49ebbfb6f..0e68b22b399d5 100644
--- a/drivers/timer/Kconfig.mcux_lptmr
+++ b/drivers/timer/Kconfig.mcux_lptmr
@@ -5,22 +5,11 @@
 
 config MCUX_LPTMR_TIMER
 	bool "MCUX LPTMR timer"
-	default y
-	depends on DT_HAS_NXP_KINETIS_LPTMR_ENABLED || \
-		   MCUX_KINETIS_LPTMR
+	default n
+	depends on DT_HAS_NXP_LPTMR_ENABLED
 	depends on !COUNTER_MCUX_LPTMR
 	select SYSTEM_TIMER_HAS_DISABLE_SUPPORT
 	help
 	  This module implements a kernel device driver for the NXP MCUX Low
 	  Power Timer (LPTMR) and provides the standard "system clock driver"
 	  interfaces.
-
-config MCUX_KINETIS_LPTMR
-	bool
-	default y
-	depends on DT_HAS_NXP_KINETIS_LPTMR_ENABLED
-	select DEPRECATED
-	help
-	  The compatible string "nxp,kinetis-lptmr" should
-	  be swiched to "nxp,lptmr" in DT. The former will
-	  be removed eventually.
diff --git a/drivers/timer/Kconfig.native_posix b/drivers/timer/Kconfig.native_posix
deleted file mode 100644
index ad2c4acad7669..0000000000000
--- a/drivers/timer/Kconfig.native_posix
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2014-2015 Wind River Systems, Inc.
-# Copyright (c) 2016 Cadence Design Systems, Inc.
-# Copyright (c) 2019 Intel Corp.
-# SPDX-License-Identifier: Apache-2.0
-
-config NATIVE_POSIX_TIMER
-	bool "(POSIX) native_sim/posix timer driver"
-	default y
-	depends on BOARD_NATIVE_POSIX || BOARD_NATIVE_SIM
-	select TICKLESS_CAPABLE
-	select TIMER_HAS_64BIT_CYCLE_COUNTER
-	select SYSTEM_TIMER_HAS_DISABLE_SUPPORT
-	help
-	  This module implements a kernel device driver for the native_sim/posix HW timer
-	  model
diff --git a/drivers/timer/Kconfig.native_sim b/drivers/timer/Kconfig.native_sim
new file mode 100644
index 0000000000000..780517b973a37
--- /dev/null
+++ b/drivers/timer/Kconfig.native_sim
@@ -0,0 +1,22 @@
+# Copyright (c) 2014-2015 Wind River Systems, Inc.
+# Copyright (c) 2016 Cadence Design Systems, Inc.
+# Copyright (c) 2019 Intel Corp.
+# SPDX-License-Identifier: Apache-2.0
+
+config NATIVE_SIM_TIMER
+	bool "(POSIX) native_sim timer driver"
+	default y
+	depends on BOARD_NATIVE_SIM
+	select TICKLESS_CAPABLE
+	select TIMER_HAS_64BIT_CYCLE_COUNTER
+	select SYSTEM_TIMER_HAS_DISABLE_SUPPORT
+	help
+	  This module implements a kernel device driver for the native_sim HW timer model
+
+config NATIVE_POSIX_TIMER
+	bool "(POSIX) native_sim/posix timer driver (deprecated)"
+	select NATIVE_SIM_TIMER
+	select DEPRECATED
+	depends on BOARD_NATIVE_SIM
+	help
+	  Deprecated option. Replaced by NATIVE_SIM_TIMER
diff --git a/drivers/timer/Kconfig.renesas_ra_ulpt b/drivers/timer/Kconfig.renesas_ra_ulpt
new file mode 100644
index 0000000000000..baaf86ca93460
--- /dev/null
+++ b/drivers/timer/Kconfig.renesas_ra_ulpt
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config RENESAS_RA_ULPT_TIMER
+	bool "Renesas RA Series ULPT Timer"
+	default y if PM
+	depends on DT_HAS_RENESAS_RA_ULPT_TIMER_ENABLED
+	select TICKLESS_CAPABLE
+	help
+	  This module implements a kernel device driver for the Renesas RA series
+	  ULPT timer and provides the standard "system clock driver" interfaces.
diff --git a/drivers/timer/Kconfig.silabs b/drivers/timer/Kconfig.silabs
index 2e9abba8ef6da..aa7a013e9c005 100644
--- a/drivers/timer/Kconfig.silabs
+++ b/drivers/timer/Kconfig.silabs
@@ -3,7 +3,7 @@
 
 config SILABS_SLEEPTIMER_TIMER
 	bool "Silabs Sleeptimer system clock driver"
-	depends on SOC_FAMILY_SILABS_S2
+	depends on SOC_FAMILY_SILABS_S2 || SOC_FAMILY_SILABS_SIWX91X
 	depends on DT_HAS_SILABS_GECKO_STIMER_ENABLED
 	select SOC_SILABS_SLEEPTIMER
 	select TICKLESS_CAPABLE
diff --git a/drivers/timer/Kconfig.wch_ch32v00x b/drivers/timer/Kconfig.wch_ch32v00x
index 3a180d691ebd1..744d54c2c0d4c 100644
--- a/drivers/timer/Kconfig.wch_ch32v00x
+++ b/drivers/timer/Kconfig.wch_ch32v00x
@@ -3,6 +3,6 @@
 
 config CH32V00X_SYSTICK
 	bool "CH32V00X systick timer"
-	depends on SOC_CH32V003
+	depends on SOC_CH32V003 || SOC_SERIES_QINGKE_V4C
 	default y
 	depends on DT_HAS_WCH_SYSTICK_ENABLED
diff --git a/drivers/timer/ambiq_stimer.c b/drivers/timer/ambiq_stimer.c
index f7748cce25a70..fd09467f8612a 100644
--- a/drivers/timer/ambiq_stimer.c
+++ b/drivers/timer/ambiq_stimer.c
@@ -20,7 +20,7 @@
 #include <zephyr/spinlock.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #define COUNTER_MAX UINT32_MAX
 
diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c
index 7f72a5051c2f1..029738900ef5f 100644
--- a/drivers/timer/cortex_m_systick.c
+++ b/drivers/timer/cortex_m_systick.c
@@ -12,6 +12,8 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/counter.h>
 
+#include "cortex_m_systick.h"
+
 #define COUNTER_MAX 0x00ffffff
 #define TIMER_STOPPED 0xff000000
 
@@ -76,7 +78,7 @@ static cycle_t announced_cycles;
  */
 static volatile uint32_t overflow_cyc;
 
-#ifdef CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER
+#if !defined(CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_NONE)
 /* This local variable indicates that the timeout was set right before
  * entering idle state.
  *
@@ -86,15 +88,76 @@ static volatile uint32_t overflow_cyc;
  */
 static bool timeout_idle;
 
+#if !defined(CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM)
 /* Cycle counter before entering the idle state. */
 static cycle_t cycle_pre_idle;
+#endif /* !CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM */
 
+#if defined(CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_COUNTER)
 /* Idle timer value before entering the idle state. */
 static uint32_t idle_timer_pre_idle;
 
 /* Idle timer used for timer while entering the idle state */
 static const struct device *idle_timer = DEVICE_DT_GET(DT_CHOSEN(zephyr_cortex_m_idle_timer));
-#endif /* CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER */
+#endif /* CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_COUNTER */
+#endif /* !CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_NONE */
+
+#if defined(CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_COUNTER)
+/**
+ * To simplify the driver, implement the callout to Counter API
+ * as hooks that would be provided by platform drivers if
+ * CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_HOOKS was selected instead.
+ */
+void z_cms_lptim_hook_on_lpm_entry(uint64_t max_lpm_time_us)
+{
+	struct counter_alarm_cfg cfg = {
+		.callback = NULL,
+		.ticks = counter_us_to_ticks(idle_timer, max_lpm_time_us),
+		.user_data = NULL,
+		.flags = 0,
+	};
+
+	/**
+	 * Disable the counter alarm in case it was already running.
+	 */
+	counter_cancel_channel_alarm(idle_timer, 0);
+
+	/* Set the alarm using timer that runs the idle.
+	 * Needed rump-up/setting time, lower accurency etc. should be
+	 * included in the exit-latency in the power state definition.
+	 */
+	counter_set_channel_alarm(idle_timer, 0, &cfg);
+
+	/* Store current value of the selected timer to calculate a
+	 * difference in measurements after exiting the idle state.
+	 */
+	counter_get_value(idle_timer, &idle_timer_pre_idle);
+}
+
+uint64_t z_cms_lptim_hook_on_lpm_exit(void)
+{
+	/**
+	 * Calculate how much time elapsed according to counter.
+	 */
+	uint32_t idle_timer_post, idle_timer_diff;
+
+	counter_get_value(idle_timer, &idle_timer_post);
+
+	/**
+	 * Check for counter timer overflow
+	 * (TODO: this doesn't work for downcounting timers!)
+	 */
+	if (idle_timer_pre_idle > idle_timer_post) {
+		idle_timer_diff =
+			(counter_get_top_value(idle_timer) - idle_timer_pre_idle) +
+			idle_timer_post + 1;
+	} else {
+		idle_timer_diff = idle_timer_post - idle_timer_pre_idle;
+	}
+
+	return (uint64_t)counter_ticks_to_us(idle_timer, idle_timer_diff);
+}
+#endif /* CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_COUNTER */
 
 /* This internal function calculates the amount of HW cycles that have
  * elapsed since the last time the absolute HW cycles counter has been
@@ -185,7 +248,7 @@ __attribute__((interrupt("IRQ"))) void sys_clock_isr(void)
 	cycle_count += overflow_cyc;
 	overflow_cyc = 0;
 
-#ifdef CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER
+#if defined(CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_COUNTER)
 	/* Rare case, when the interrupt was triggered, with previously programmed
 	 * LOAD value, just before entering the idle mode (SysTick is clocked) or right
 	 * after exiting the idle mode, before executing the procedure in the
@@ -197,7 +260,7 @@ __attribute__((interrupt("IRQ"))) void sys_clock_isr(void)
 
 		return;
 	}
-#endif /* CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER */
+#endif /* CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_COUNTER */
 
 	if (IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		/* In TICKLESS mode, the SysTick.LOAD is re-programmed
@@ -244,35 +307,40 @@ void sys_clock_set_timeout(int32_t ticks, bool idle)
 		return;
 	}
 
-#ifdef CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER
+#if !defined(CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_NONE)
 	if (idle) {
 		uint64_t timeout_us =
 			((uint64_t)ticks * USEC_PER_SEC) / CONFIG_SYS_CLOCK_TICKS_PER_SEC;
-		struct counter_alarm_cfg cfg = {
-			.callback = NULL,
-			.ticks = counter_us_to_ticks(idle_timer, timeout_us),
-			.user_data = NULL,
-			.flags = 0,
-		};
 
 		timeout_idle = true;
 
-		/* Set the alarm using timer that runs the idle.
-		 * Needed rump-up/setting time, lower accurency etc. should be
-		 * included in the exit-latency in the power state definition.
+		/**
+		 * Invoke platform-specific layer to configure LPTIM
+		 * such that system wakes up after timeout elapses.
 		 */
-		counter_cancel_channel_alarm(idle_timer, 0);
-		counter_set_channel_alarm(idle_timer, 0, &cfg);
+		z_cms_lptim_hook_on_lpm_entry(timeout_us);
 
-		/* Store current values to calculate a difference in
-		 * measurements after exiting the idle state.
+#if !defined(CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM)
+		/* Store current value of SysTick counter to be able to
+		 * calculate a difference in measurements after exiting
+		 * the low-power state.
 		 */
-		counter_get_value(idle_timer, &idle_timer_pre_idle);
 		cycle_pre_idle = cycle_count + elapsed();
+#else /* CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM */
+		/**
+		 * SysTick will be placed under reset once we enter
+		 * low-power mode. Turn it off right now then update
+		 * the cycle counter now, since we won't be able to
+		 * to it after waking up.
+		 */
+		sys_clock_disable();
 
+		cycle_count += elapsed();
+		overflow_cyc = 0;
+#endif /* !CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM */
 		return;
 	}
-#endif /* CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER */
+#endif /* !CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_NONE */
 
 #if defined(CONFIG_TICKLESS_KERNEL)
 	uint32_t delay;
@@ -378,29 +446,29 @@ uint64_t sys_clock_cycle_get_64(void)
 
 void sys_clock_idle_exit(void)
 {
-#ifdef CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER
+#if !defined(CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_NONE)
 	if (timeout_idle) {
 		cycle_t systick_diff, missed_cycles;
-		uint32_t idle_timer_diff, idle_timer_post, dcycles, dticks;
+		uint32_t dcycles, dticks;
 		uint64_t systick_us, idle_timer_us;
 
-		/* Get current values for both timers */
-		counter_get_value(idle_timer, &idle_timer_post);
+#if !defined(CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM)
+		/**
+		 * Get current value for SysTick and calculate how
+		 * much time has passed since last measurement.
+		 */
 		systick_diff = cycle_count + elapsed() - cycle_pre_idle;
-
-		/* Calculate has much time has pasted since last measurement for both timers */
-		/* Check IDLE timer overflow */
-		if (idle_timer_pre_idle > idle_timer_post) {
-			idle_timer_diff =
-				(counter_get_top_value(idle_timer) - idle_timer_pre_idle) +
-				idle_timer_post + 1;
-
-		} else {
-			idle_timer_diff = idle_timer_post - idle_timer_pre_idle;
-		}
-		idle_timer_us = counter_ticks_to_us(idle_timer, idle_timer_diff);
 		systick_us =
 			((uint64_t)systick_diff * USEC_PER_SEC) / sys_clock_hw_cycles_per_sec();
+#else /* CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM */
+		/* SysTick was placed under reset so it didn't tick */
+		systick_diff = systick_us = 0;
+#endif /* !CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM */
+
+		/**
+		 * Query platform-specific code for elapsed time according to LPTIM.
+		 */
+		idle_timer_us = z_cms_lptim_hook_on_lpm_exit();
 
 		/* Calculate difference in measurements to get how much time
 		 * the SysTick missed in idle state.
@@ -432,11 +500,11 @@ void sys_clock_idle_exit(void)
 		/* We've alredy performed all needed operations */
 		timeout_idle = false;
 	}
-#endif /* CONFIG_CORTEX_M_SYSTICK_IDLE_TIMER */
+#endif /* !CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_NONE */
 
-	if (last_load == TIMER_STOPPED) {
-		/* We really don’t know here how much time has passed,
-		 * so let’s restart the timer from scratch.
+	if (last_load == TIMER_STOPPED || IS_ENABLED(CONFIG_CORTEX_M_SYSTICK_RESET_BY_LPM)) {
+		/* SysTick was stopped or placed under reset.
+		 * Restart the timer from scratch.
 		 */
 		K_SPINLOCK(&lock) {
 			last_load = CYC_PER_TICK;
diff --git a/drivers/timer/cortex_m_systick.h b/drivers/timer/cortex_m_systick.h
new file mode 100644
index 0000000000000..e872766646722
--- /dev/null
+++ b/drivers/timer/cortex_m_systick.h
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_TIMER_CORTEX_M_SYSTICK_H_
+#define ZEPHYR_INCLUDE_DRIVERS_TIMER_CORTEX_M_SYSTICK_H_
+
+#include <zephyr/types.h>
+
+/**
+ * Hooks/callbacks definitions for interaction between the Cortex-M
+ * SysTick driver and a platform-specific low-power timer driver.
+ *
+ * These functions are invoked by the Cortex-M SysTick driver to
+ * configure a platform-specific timer that remains active when
+ * the system enters a low-power mode.
+ *
+ * In the rest of this file, the "platform-specific low-power mode timer"
+ * is named "LPTIM", and the platform-specific driver that configures the
+ * LPTIM (and implements these hooks/callbacks) is named "LPTIM driver".
+ *
+ * The following behavior is observed when this option is enabled:
+ *
+ * |------(1)---(2)--------------------(3)-------(4)--------------> Time
+ *
+ * (1) cmsd_hook_on_lpm_entry() is invoked
+ * (2) The system enters in low-power mode
+ * (3) The system exits low-power mode (due to timeout or HW event)
+ * (4) cmsd_hook_lpm_time_elapsed() is called
+ *
+ * The return value of cmsd_hook_lpm_time_elapsed() should be as close
+ * as possible to the real time interval between events (1) and (4).
+ *
+ * These hooks should be implemented by the application if and only if
+ * CONFIG_CORTEX_M_SYSTICK_LPM_TIMER_HOOKS is enabled.
+ *
+ * NOTE: the hooks are not invoked when the system enters in low-power
+ * mode for an indefinite amount of time (requires CONFIG_TICKLESS_KERNEL
+ * and no thread PENDING with timeout).
+ */
+
+/**
+ * @brief Hook invoked when the system is about to enter low-power mode
+ *
+ * @param max_lpm_time_us Maximal time allowed in low-power mode (µs)
+ *
+ * The LPTIM driver should configure the LPTIM to wake up the system
+ * after at most @a{max_lpm_time_us} elapses; depending on hardware
+ * capabilities, the LPTIM may have to be configured to wake up the
+ * system earlier than requested (but no later!).
+ *
+ * Note that this hook is not called if the system enters low-power
+ * mode for an indefinite amount of time (i.e., when no threads are
+ * runnable or waiting with timeout).
+ */
+void z_cms_lptim_hook_on_lpm_entry(uint64_t max_lpm_time_us);
+
+/**
+ * @brief Callback invoked after system exits low-power mode
+ *
+ * This function should return the time elapsed, in microseconds,
+ * since entry in low-power mode occurred (i.e., since the call
+ * to @ref{cmsd_hook_on_lpm_entry}).
+ */
+uint64_t z_cms_lptim_hook_on_lpm_exit(void);
+#endif /* ZEPHYR_INCLUDE_DRIVERS_TIMER_CORTEX_M_SYSTICK_H_ */
diff --git a/drivers/timer/esp32_sys_timer.c b/drivers/timer/esp32_sys_timer.c
index bb36445d1131c..46bc17877e7f1 100644
--- a/drivers/timer/esp32_sys_timer.c
+++ b/drivers/timer/esp32_sys_timer.c
@@ -1,8 +1,9 @@
 /*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2021-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 #include <soc/soc_caps.h>
 #include <soc/soc.h>
 
@@ -12,7 +13,7 @@
 #include <rom/ets_sys.h>
 #include <esp_attr.h>
 
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
 #include <soc.h>
@@ -56,7 +57,7 @@ static uint64_t get_systimer_alarm(void)
 	return systimer_hal_get_counter_value(&systimer_hal, SYSTIMER_COUNTER_OS_TICK);
 }
 
-static void sys_timer_isr(const void *arg)
+static void sys_timer_isr(void *arg)
 {
 	ARG_UNUSED(arg);
 	systimer_ll_clear_alarm_int(systimer_hal.dev, SYSTIMER_ALARM_OS_TICK_CORE0);
@@ -167,5 +168,5 @@ static int sys_clock_driver_init(void)
 	return 0;
 }
 
-SYS_INIT(sys_clock_driver_init, PRE_KERNEL_1,
+SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2,
 	 CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
diff --git a/drivers/timer/gecko_burtc_timer.c b/drivers/timer/gecko_burtc_timer.c
index 3e0805f56acf7..835fc2ded6f4f 100644
--- a/drivers/timer/gecko_burtc_timer.c
+++ b/drivers/timer/gecko_burtc_timer.c
@@ -54,7 +54,7 @@ const int32_t z_sys_timer_irq_for_test = TIMER_IRQ;
 /* With CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME, that's where we
  * should write hw_cycles timer clock frequency upon init
  */
-extern int z_clock_hw_cycles_per_sec;
+extern unsigned int z_clock_hw_cycles_per_sec;
 
 /* Number of hw_cycles clocks per 1 kernel tick */
 static uint32_t g_cyc_per_tick;
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index 8a7134a762efa..c9c58f6e2cec1 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -415,7 +415,7 @@ void sys_clock_idle_exit(void)
 __boot_func
 static int sys_clock_driver_init(void)
 {
-	extern int z_clock_hw_cycles_per_sec;
+	extern unsigned int z_clock_hw_cycles_per_sec;
 	uint32_t hz, reg;
 
 	ARG_UNUSED(hz);
diff --git a/drivers/timer/ite_it51xxx_timer.c b/drivers/timer/ite_it51xxx_timer.c
new file mode 100644
index 0000000000000..7791d57e36813
--- /dev/null
+++ b/drivers/timer/ite_it51xxx_timer.c
@@ -0,0 +1,421 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ite_it51xxx_timer
+
+#include <soc.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/irq.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys_clock.h>
+
+LOG_MODULE_REGISTER(timer, LOG_LEVEL_ERR);
+
+BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC == 32768,
+	     "Hardware timer frequency is fixed at 32768Hz");
+
+/* it51xxx timer registers definition */
+static mm_reg_t timer_base = DT_REG_ADDR(DT_NODELABEL(timer));
+
+/* 0x10, 0x18, 0x20, 0x28, 0x30, 0x38: External Timer 3-8 Control Register (n=0 to 5) */
+#define TIMER_ETNCTRL(n)   (0x10 + ((n) * 8))
+#define TIMER_ETCOMB       BIT(3)
+#define TIMER_ETNRST       BIT(1)
+#define TIMER_ETNEN        BIT(0)
+/* 0x11, 0x19, 0x21, 0x29, 0x31, 0x39: External Timer 3-8 Prescaler Register (n=0 to 5) */
+#define TIMER_ETNPSR(n)    (0x11 + ((n) * 8))
+/* 0x14, 0x1c, 0x24, 0x2c, 0x34, 0x3c: External Timer 3-8 Counter Register (n=0 to 5) */
+#define TIMER_ETNCNTLLR(n) (0x14 + ((n) * 8))
+/* 0x48, 0x4c, 0x50, 0x54, 0x58, 0x5c: External Timer 3-8 Counter Observation Register (n=0 to 5) */
+#define TIMER_ETNCNTOLR(n) (0x48 + ((n) * 4))
+
+/*
+ * 24-bit timers: external timer 3, 5, and 7
+ * 32-bit timers: external timer 4, 6, and 8
+ */
+enum ext_timer_idx {
+	EXT_TIMER_3 = 0, /* Event timer */
+	EXT_TIMER_4,     /* Free run timer */
+	EXT_TIMER_5,     /* Busy wait low timer */
+	EXT_TIMER_6,     /* Busy wait high timer */
+	EXT_TIMER_7,
+	EXT_TIMER_8,
+};
+
+enum ext_clk_src_sel {
+	EXT_PSR_32P768K = 0,
+	EXT_PSR_1P024K,
+	EXT_PSR_32,
+	EXT_PSR_EC_CLK,
+};
+
+enum ext_timer_raw_cnt {
+	EXT_NOT_RAW_CNT = 0,
+	EXT_RAW_CNT,
+};
+
+enum ext_timer_int {
+	EXT_WITHOUT_TIMER_INT = 0,
+	EXT_WITH_TIMER_INT,
+};
+
+enum ext_timer_start {
+	EXT_NOT_START_TIMER = 0,
+	EXT_START_TIMER,
+};
+
+/* Event timer configurations */
+#define EVENT_TIMER               EXT_TIMER_3
+#define EVENT_TIMER_IRQ           DT_IRQ_BY_IDX(DT_NODELABEL(timer), 0, irq)
+#define EVENT_TIMER_FLAG          DT_IRQ_BY_IDX(DT_NODELABEL(timer), 0, flags)
+/* Event timer max count is 512 sec (base on clock source 32768Hz) */
+#define EVENT_TIMER_MAX_CNT       0x00FFFFFFUL
+/* Free run timer configurations */
+#define FREE_RUN_TIMER            EXT_TIMER_4
+#define FREE_RUN_TIMER_IRQ        DT_IRQ_BY_IDX(DT_NODELABEL(timer), 1, irq)
+#define FREE_RUN_TIMER_FLAG       DT_IRQ_BY_IDX(DT_NODELABEL(timer), 1, flags)
+/* Free run timer max count is 36.4 hr (base on clock source 32768Hz) */
+#define FREE_RUN_TIMER_MAX_CNT    0xFFFFFFFFUL
+/* Busy wait low timer configurations */
+#define BUSY_WAIT_L_TIMER         EXT_TIMER_5
+#define BUSY_WAIT_L_TIMER_IRQ     DT_INST_IRQ_BY_IDX(0, 2, irq)
+#define BUSY_WAIT_L_TIMER_FLAG    DT_INST_IRQ_BY_IDX(0, 2, flags)
+/* Busy wait high timer configurations */
+#define BUSY_WAIT_H_TIMER         EXT_TIMER_6
+#define BUSY_WAIT_H_TIMER_IRQ     DT_INST_IRQ_BY_IDX(0, 3, irq)
+#define BUSY_WAIT_H_TIMER_FLAG    DT_INST_IRQ_BY_IDX(0, 3, flags)
+/* Busy wait high timer max count is 7.78min (base on EC clock source 9.2MHz) */
+#define BUSY_WAIT_TIMER_H_MAX_CNT 0xFFFFFFFFUL
+
+#define MS_TO_COUNT(hz, ms) ((hz) * (ms) / 1000)
+#define ETPSR_9200K         KHZ(9200)
+#define ETPSR_32768         32768
+#define ETPSR_1024          1024
+#define ETPSR_32            32
+#define EC_CLOCK            ETPSR_9200K
+#define COUNT_1US           (EC_CLOCK / USEC_PER_SEC)
+
+/*
+ * One system (kernel) tick is as how much HW timer counts
+ *
+ * NOTE: Event and free run timer individually select the same clock source frequency, so they can
+ *       use the same HW_CNT_PER_SYS_TICK to transform unit between HW count and system tick. If
+ *       clock source frequency is different, then we should define another to transform.
+ */
+#define HW_CNT_PER_SYS_TICK (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC)
+
+/* Event timer max count is as how much system (kernel) tick */
+#define EVEN_TIMER_MAX_CNT_SYS_TICK (EVENT_TIMER_MAX_CNT / HW_CNT_PER_SYS_TICK)
+
+static struct k_spinlock lock;
+/* Last HW count that we called sys_clock_announce() */
+static volatile uint32_t last_announced_hw_cnt;
+/* Last system (kernel) elapse and ticks */
+static volatile uint32_t last_elapsed;
+static volatile uint32_t last_ticks;
+
+#if defined(CONFIG_TEST)
+const int32_t z_sys_timer_irq_for_test = DT_IRQ_BY_IDX(DT_NODELABEL(timer), 4, irq);
+#endif
+
+static uint32_t read_timer_obser(enum ext_timer_idx timer_idx)
+{
+	uint32_t obser;
+	__unused uint8_t etnpsr;
+
+	/* Workaround for observation register latch issue */
+	obser = sys_read32(timer_base + TIMER_ETNCNTOLR(timer_idx));
+	etnpsr = sys_read8(timer_base + TIMER_ETNPSR(timer_idx));
+	obser = sys_read32(timer_base + TIMER_ETNCNTOLR(timer_idx));
+
+	return obser;
+}
+
+static void ext_timer_disable(enum ext_timer_idx timer_idx)
+{
+	uint8_t etnctrl;
+
+	/* Disable event timer */
+	etnctrl = sys_read8(timer_base + TIMER_ETNCTRL(timer_idx));
+	sys_write8(etnctrl & ~TIMER_ETNEN, timer_base + TIMER_ETNCTRL(timer_idx));
+}
+
+static void ext_timer_enable(enum ext_timer_idx timer_idx)
+{
+	uint8_t etnctrl;
+
+	/* Enable and re-start event timer */
+	etnctrl = sys_read8(timer_base + TIMER_ETNCTRL(timer_idx));
+	sys_write8(etnctrl | TIMER_ETNRST | TIMER_ETNEN, timer_base + TIMER_ETNCTRL(timer_idx));
+}
+
+static void evt_timer_isr(const void *unused)
+{
+	ARG_UNUSED(unused);
+
+	ext_timer_disable(EVENT_TIMER);
+	/* W/C event timer interrupt status */
+	ite_intc_isr_clear(EVENT_TIMER_IRQ);
+
+	if (IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
+		/*
+		 * Get free run observer count from last time announced and transform unit to
+		 * system tick
+		 */
+		uint32_t dticks = (~(read_timer_obser(FREE_RUN_TIMER))-last_announced_hw_cnt) /
+				  HW_CNT_PER_SYS_TICK;
+		last_announced_hw_cnt += (dticks * HW_CNT_PER_SYS_TICK);
+		last_ticks += dticks;
+		last_elapsed = 0;
+
+		sys_clock_announce(dticks);
+	} else {
+		ext_timer_enable(EVENT_TIMER);
+		/* Informs kernel that one system tick has elapsed */
+		sys_clock_announce(MS_TO_COUNT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, 1));
+	}
+}
+
+static void free_run_timer_overflow_isr(const void *unused)
+{
+	ARG_UNUSED(unused);
+
+	/* Read to clear terminal count flag */
+	__unused uint8_t rc_tc = sys_read8(timer_base + TIMER_ETNCTRL(FREE_RUN_TIMER));
+	/* TODO: to increment 32-bit "top half" here for software 64-bit timer emulation. */
+}
+
+void sys_clock_set_timeout(int32_t ticks, bool idle)
+{
+	ARG_UNUSED(idle);
+
+	uint32_t hw_cnt, next_cycs, now, dcycles;
+
+	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
+		/* Always return for non-tickless kernel system */
+		return;
+	}
+
+	/* Critical section */
+	k_spinlock_key_t key = k_spin_lock(&lock);
+
+	/* Disable event timer */
+	ext_timer_disable(EVENT_TIMER);
+
+	if (ticks == K_TICKS_FOREVER) {
+		/*
+		 * If kernel doesn't have a timeout:
+		 * 1.CONFIG_SYSTEM_CLOCK_SLOPPY_IDLE = y (no future timer interrupts are expected),
+		 *   kernel pass K_TICKS_FOREVER (0xFFFF FFFF FFFF FFFF), we handle this case in
+		 *   here.
+		 * 2.CONFIG_SYSTEM_CLOCK_SLOPPY_IDLE = n (schedule timeout as far into the future
+		 *   as possible), kernel pass INT_MAX (0x7FFF FFFF), we handle it in later else {}.
+		 */
+		k_spin_unlock(&lock, key);
+		return;
+	}
+	/*
+	 * If ticks <= 1 means the kernel wants the tick announced as soon as possible,
+	 * ideally no more than one system tick in the future. So set event timer count
+	 * to 1 HW tick.
+	 */
+	ticks = CLAMP(ticks, 1, (int32_t)EVEN_TIMER_MAX_CNT_SYS_TICK);
+	next_cycs = (last_ticks + last_elapsed + ticks) * HW_CNT_PER_SYS_TICK;
+	now = ~read_timer_obser(FREE_RUN_TIMER);
+	if (unlikely(next_cycs <= now)) {
+		hw_cnt = 1;
+	} else {
+		dcycles = next_cycs - now;
+		hw_cnt = MIN(dcycles, EVENT_TIMER_MAX_CNT);
+	}
+
+	/* Set event timer 24-bit count */
+	sys_write32(hw_cnt, timer_base + TIMER_ETNCNTLLR(EVENT_TIMER));
+
+	/* W/C event timer interrupt status */
+	ite_intc_isr_clear(EVENT_TIMER_IRQ);
+
+	/* Enable event timer */
+	ext_timer_enable(EVENT_TIMER);
+
+	k_spin_unlock(&lock, key);
+}
+
+uint32_t sys_clock_elapsed(void)
+{
+	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
+		/* Always return 0 for non-tickless kernel system */
+		return 0;
+	}
+
+	/* Critical section */
+	k_spinlock_key_t key = k_spin_lock(&lock);
+
+	/* Get free run observer count from last time announced and transform unit to system tick */
+	uint32_t dticks =
+		(~(read_timer_obser(FREE_RUN_TIMER))-last_announced_hw_cnt) / HW_CNT_PER_SYS_TICK;
+
+	last_elapsed = dticks;
+
+	k_spin_unlock(&lock, key);
+
+	return dticks;
+}
+
+uint32_t sys_clock_cycle_get_32(void)
+{
+	uint32_t dticks = ~read_timer_obser(FREE_RUN_TIMER);
+
+	return dticks;
+}
+
+static int timer_init(enum ext_timer_idx ext_timer, enum ext_clk_src_sel clock_source_sel,
+		      enum ext_timer_raw_cnt raw, uint32_t ms, uint32_t irq_num, uint32_t irq_flag,
+		      enum ext_timer_int with_int, enum ext_timer_start start)
+{
+	uint32_t hw_cnt;
+
+	if (raw == EXT_RAW_CNT) {
+		hw_cnt = ms;
+	} else {
+		if (clock_source_sel == EXT_PSR_32P768K) {
+			hw_cnt = MS_TO_COUNT(ETPSR_32768, ms);
+		} else if (clock_source_sel == EXT_PSR_1P024K) {
+			hw_cnt = MS_TO_COUNT(ETPSR_1024, ms);
+		} else if (clock_source_sel == EXT_PSR_32) {
+			hw_cnt = MS_TO_COUNT(ETPSR_32, ms);
+		} else if (clock_source_sel == EXT_PSR_EC_CLK) {
+			hw_cnt = MS_TO_COUNT(ETPSR_9200K, ms);
+		} else {
+			LOG_ERR("Timer %d clock source error !", ext_timer);
+			return -EINVAL;
+		}
+	}
+
+	if (hw_cnt == 0) {
+		LOG_ERR("Timer %d count shouldn't be 0 !", ext_timer);
+		return -EINVAL;
+	}
+
+	/* First time enable */
+	ext_timer_enable(ext_timer);
+	ext_timer_disable(ext_timer);
+
+	/* Set rising edge triggered of external timer x */
+	ite_intc_irq_polarity_set(irq_num, irq_flag);
+
+	/* Clear interrupt status of external timer x */
+	ite_intc_isr_clear(irq_num);
+
+	/* Set clock source of external timer */
+	sys_write8(clock_source_sel, timer_base + TIMER_ETNPSR(ext_timer));
+
+	/* Set count of external timer */
+	sys_write32(hw_cnt, timer_base + TIMER_ETNCNTLLR(ext_timer));
+
+	ext_timer_disable(ext_timer);
+	if (start == EXT_START_TIMER) {
+		ext_timer_enable(ext_timer);
+	}
+
+	if (with_int == EXT_WITH_TIMER_INT) {
+		irq_enable(irq_num);
+	} else {
+		irq_disable(irq_num);
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT
+void arch_busy_wait(uint32_t usec_to_wait)
+{
+	uint32_t start = read_timer_obser(BUSY_WAIT_H_TIMER);
+
+	if (!usec_to_wait) {
+		return;
+	}
+
+	/* Decrease 1us here to calibrate our access registers latency */
+	usec_to_wait--;
+
+	for (;;) {
+		if ((read_timer_obser(BUSY_WAIT_H_TIMER) - start) >= usec_to_wait) {
+			break;
+		}
+	}
+}
+#endif
+
+static int sys_clock_driver_init(void)
+{
+	int ret;
+
+	/* Enable 32-bit free run timer overflow interrupt */
+	IRQ_CONNECT(FREE_RUN_TIMER_IRQ, 0, free_run_timer_overflow_isr, NULL, FREE_RUN_TIMER_FLAG);
+	/* Set 32-bit timer4 for free run*/
+	ret = timer_init(FREE_RUN_TIMER, EXT_PSR_32P768K, EXT_RAW_CNT, FREE_RUN_TIMER_MAX_CNT,
+			 FREE_RUN_TIMER_IRQ, FREE_RUN_TIMER_FLAG, EXT_WITH_TIMER_INT,
+			 EXT_START_TIMER);
+	if (ret < 0) {
+		LOG_ERR("Init free run timer failed");
+		return ret;
+	}
+
+	/* Set 24-bit timer3 for timeout event */
+	IRQ_CONNECT(EVENT_TIMER_IRQ, 0, evt_timer_isr, NULL, EVENT_TIMER_FLAG);
+	if (IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
+		ret = timer_init(EVENT_TIMER, EXT_PSR_32P768K, EXT_RAW_CNT, EVENT_TIMER_MAX_CNT,
+				 EVENT_TIMER_IRQ, EVENT_TIMER_FLAG, EXT_WITH_TIMER_INT,
+				 EXT_NOT_START_TIMER);
+	} else {
+		/* Start a event timer in one system tick */
+		ret = timer_init(EVENT_TIMER, EXT_PSR_32P768K, EXT_NOT_RAW_CNT,
+				 MAX((1 * HW_CNT_PER_SYS_TICK), 1), EVENT_TIMER_IRQ,
+				 EVENT_TIMER_FLAG, EXT_WITH_TIMER_INT, EXT_START_TIMER);
+	}
+	if (ret < 0) {
+		LOG_ERR("Init event timer failed");
+		return ret;
+	}
+
+	if (IS_ENABLED(CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT)) {
+		/* Set timer5 and timer6 combinational mode for busy wait */
+		sys_write8(TIMER_ETCOMB, timer_base + TIMER_ETNCTRL(BUSY_WAIT_L_TIMER));
+
+		/*
+		 * Set 32-bit timer6 to count-- every 1us
+		 * NOTE: When the combinational mode. the counter observation value of timer 6 will
+		 *       in incremental order.
+		 */
+		ret = timer_init(BUSY_WAIT_H_TIMER, EXT_PSR_EC_CLK, EXT_RAW_CNT,
+				 BUSY_WAIT_TIMER_H_MAX_CNT, BUSY_WAIT_H_TIMER_IRQ,
+				 BUSY_WAIT_H_TIMER_FLAG, EXT_WITHOUT_TIMER_INT, EXT_START_TIMER);
+		if (ret < 0) {
+			LOG_ERR("Init busy wait high timer failed");
+			return ret;
+		}
+
+		/*
+		 * Set 24-bit timer5 to overflow every 1us
+		 * NOTE: When the timer5 count down to overflow in combinational mode, timer6
+		 *       counter will automatically decrease one count and timer5 will
+		 *       automatically re-start counting down from COUNT_1US. Timer5 clock
+		 *       source is EC_CLOCK, so the time period from COUNT_1US to overflow is
+		 *       (1 / EC_CLOCK) * (EC_CLOCK / USEC_PER_SEC) = 1us.
+		 */
+		ret = timer_init(BUSY_WAIT_L_TIMER, EXT_PSR_EC_CLK, EXT_RAW_CNT, COUNT_1US,
+				 BUSY_WAIT_L_TIMER_IRQ, BUSY_WAIT_L_TIMER_FLAG,
+				 EXT_WITHOUT_TIMER_INT, EXT_START_TIMER);
+		if (ret < 0) {
+			LOG_ERR("Init busy wait low timer failed");
+			return ret;
+		}
+	}
+
+	return 0;
+}
+SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2, CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
diff --git a/drivers/timer/mcux_lptmr_timer.c b/drivers/timer/mcux_lptmr_timer.c
index 930058f4ea40a..f83e4c39e26a7 100644
--- a/drivers/timer/mcux_lptmr_timer.c
+++ b/drivers/timer/mcux_lptmr_timer.c
@@ -4,15 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/devicetree.h>
-#if DT_HAS_COMPAT_STATUS_OKAY(nxp_kinetis_lptmr)
-#define DT_DRV_COMPAT nxp_kinetis_lptmr
-#else
 #define DT_DRV_COMPAT nxp_lptmr
-#endif
 
 #include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/time_units.h>
 #include <fsl_lptmr.h>
diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c
deleted file mode 100644
index db2706a230675..0000000000000
--- a/drivers/timer/native_posix_timer.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2017-2019 Oticon A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Driver for the timer model of the POSIX native_sim/posix board
- * It provides the interfaces required by the kernel and the sanity testcases
- * It also provides a custom k_busy_wait() which can be used with the
- * POSIX arch and InfClock SOC
- */
-#include <zephyr/types.h>
-#include <zephyr/irq.h>
-#include <zephyr/init.h>
-#include <zephyr/drivers/timer/system_timer.h>
-#include <zephyr/sys_clock.h>
-#include "timer_model.h"
-#include "soc.h"
-#include <zephyr/arch/posix/posix_trace.h>
-
-static uint64_t tick_period; /* System tick period in microseconds */
-/* Time (microseconds since boot) of the last timer tick interrupt */
-static uint64_t last_tick_time;
-
-/**
- * Return the current HW cycle counter
- * (number of microseconds since boot in 32bits)
- */
-uint32_t sys_clock_cycle_get_32(void)
-{
-	return hwm_get_time();
-}
-
-uint64_t sys_clock_cycle_get_64(void)
-{
-	return hwm_get_time();
-}
-
-/**
- * Interrupt handler for the timer interrupt
- * Announce to the kernel that a number of ticks have passed
- */
-static void np_timer_isr(const void *arg)
-{
-	ARG_UNUSED(arg);
-
-	uint64_t now = hwm_get_time();
-	int32_t elapsed_ticks = (now - last_tick_time)/tick_period;
-
-	last_tick_time += elapsed_ticks*tick_period;
-	sys_clock_announce(elapsed_ticks);
-}
-
-/**
- * This function exists only to enable tests to call into the timer ISR
- */
-void np_timer_isr_test_hook(const void *arg)
-{
-	np_timer_isr(NULL);
-}
-
-/**
- * @brief Set system clock timeout
- *
- * Informs the system clock driver that the next needed call to
- * sys_clock_announce() will not be until the specified number of ticks
- * from the current time have elapsed.
- *
- * See system_timer.h for more information
- *
- * @param ticks Timeout in tick units
- * @param idle Hint to the driver that the system is about to enter
- *        the idle state immediately after setting the timeout
- */
-void sys_clock_set_timeout(int32_t ticks, bool idle)
-{
-	ARG_UNUSED(idle);
-
-#if defined(CONFIG_TICKLESS_KERNEL)
-	uint64_t silent_ticks;
-
-	/* Note that we treat INT_MAX literally as anyhow the maximum amount of
-	 * ticks we can report with sys_clock_announce() is INT_MAX
-	 */
-	if (ticks == K_TICKS_FOREVER) {
-		silent_ticks = INT64_MAX;
-	} else if (ticks > 0) {
-		silent_ticks = ticks - 1;
-	} else {
-		silent_ticks = 0;
-	}
-	hwtimer_set_silent_ticks(silent_ticks);
-#endif
-}
-
-/**
- * @brief Ticks elapsed since last sys_clock_announce() call
- *
- * Queries the clock driver for the current time elapsed since the
- * last call to sys_clock_announce() was made.  The kernel will call
- * this with appropriate locking, the driver needs only provide an
- * instantaneous answer.
- */
-uint32_t sys_clock_elapsed(void)
-{
-	return (hwm_get_time() - last_tick_time)/tick_period;
-}
-
-/**
- * @brief Stop announcing sys ticks into the kernel
- *
- * Disable the system ticks generation
- */
-void sys_clock_disable(void)
-{
-	irq_disable(TIMER_TICK_IRQ);
-	hwtimer_set_silent_ticks(INT64_MAX);
-}
-
-/**
- * @brief Initialize system timer driver
- *
- * Enable the hw timer, setting its tick period, and setup its interrupt
- */
-static int sys_clock_driver_init(void)
-{
-
-	tick_period = 1000000ul / CONFIG_SYS_CLOCK_TICKS_PER_SEC;
-
-	last_tick_time = hwm_get_time();
-	hwtimer_enable(tick_period);
-
-	IRQ_CONNECT(TIMER_TICK_IRQ, 1, np_timer_isr, 0, 0);
-	irq_enable(TIMER_TICK_IRQ);
-
-	return 0;
-}
-
-SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2,
-	 CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
diff --git a/drivers/timer/native_sim_timer.c b/drivers/timer/native_sim_timer.c
new file mode 100644
index 0000000000000..458c81f7907b4
--- /dev/null
+++ b/drivers/timer/native_sim_timer.c
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2017-2019 Oticon A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Driver for the native_sim board timer
+ * It provides the same API required by the kernel as any other timer driver
+ */
+#include <zephyr/types.h>
+#include <zephyr/irq.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include "nsi_hw_scheduler.h"
+#include "nsi_timer_model.h"
+#include "soc.h"
+
+static uint64_t tick_period; /* System tick period in microseconds */
+/* Time (microseconds since boot) of the last timer tick interrupt */
+static uint64_t last_tick_time;
+
+/**
+ * Return the current HW cycle counter
+ * (number of microseconds since boot in 32bits)
+ */
+uint32_t sys_clock_cycle_get_32(void)
+{
+	return nsi_hws_get_time();
+}
+
+uint64_t sys_clock_cycle_get_64(void)
+{
+	return nsi_hws_get_time();
+}
+
+/**
+ * Interrupt handler for the timer interrupt
+ * Announce to the kernel that a number of ticks have passed
+ */
+static void np_timer_isr(const void *arg)
+{
+	ARG_UNUSED(arg);
+
+	uint64_t now = nsi_hws_get_time();
+	int32_t elapsed_ticks = (now - last_tick_time)/tick_period;
+
+	last_tick_time += elapsed_ticks*tick_period;
+	sys_clock_announce(elapsed_ticks);
+}
+
+/**
+ * This function exists only to enable tests to call into the timer ISR
+ */
+void np_timer_isr_test_hook(const void *arg)
+{
+	np_timer_isr(NULL);
+}
+
+/**
+ * @brief Set system clock timeout
+ *
+ * Informs the system clock driver that the next needed call to
+ * sys_clock_announce() will not be until the specified number of ticks
+ * from the current time have elapsed.
+ *
+ * See system_timer.h for more information
+ *
+ * @param ticks Timeout in tick units
+ * @param idle Hint to the driver that the system is about to enter
+ *        the idle state immediately after setting the timeout
+ */
+void sys_clock_set_timeout(int32_t ticks, bool idle)
+{
+	ARG_UNUSED(idle);
+
+#if defined(CONFIG_TICKLESS_KERNEL)
+	uint64_t silent_ticks;
+
+	/* Note that we treat INT_MAX literally as anyhow the maximum amount of
+	 * ticks we can report with sys_clock_announce() is INT_MAX
+	 */
+	if (ticks == K_TICKS_FOREVER) {
+		silent_ticks = INT64_MAX;
+	} else if (ticks > 0) {
+		silent_ticks = ticks - 1;
+	} else {
+		silent_ticks = 0;
+	}
+	hwtimer_set_silent_ticks(silent_ticks);
+#endif
+}
+
+/**
+ * @brief Ticks elapsed since last sys_clock_announce() call
+ *
+ * Queries the clock driver for the current time elapsed since the
+ * last call to sys_clock_announce() was made.  The kernel will call
+ * this with appropriate locking, the driver needs only provide an
+ * instantaneous answer.
+ */
+uint32_t sys_clock_elapsed(void)
+{
+	return (nsi_hws_get_time() - last_tick_time)/tick_period;
+}
+
+/**
+ * @brief Stop announcing sys ticks into the kernel
+ *
+ * Disable the system ticks generation
+ */
+void sys_clock_disable(void)
+{
+	irq_disable(TIMER_TICK_IRQ);
+	hwtimer_set_silent_ticks(INT64_MAX);
+}
+
+/**
+ * @brief Initialize system timer driver
+ *
+ * Enable the hw timer, setting its tick period, and setup its interrupt
+ */
+static int sys_clock_driver_init(void)
+{
+
+	tick_period = 1000000ul / CONFIG_SYS_CLOCK_TICKS_PER_SEC;
+
+	last_tick_time = nsi_hws_get_time();
+	hwtimer_enable(tick_period);
+
+	IRQ_CONNECT(TIMER_TICK_IRQ, 1, np_timer_isr, 0, 0);
+	irq_enable(TIMER_TICK_IRQ);
+
+	return 0;
+}
+
+SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2,
+	 CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
index ee3f35e09d0c7..285e48a57fd2f 100644
--- a/drivers/timer/nrf_grtc_timer.c
+++ b/drivers/timer/nrf_grtc_timer.c
@@ -10,12 +10,15 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF)
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #endif
+#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/drivers/timer/nrf_grtc_timer.h>
 #include <nrfx_grtc.h>
 #include <zephyr/sys/math_extras.h>
 
 #define GRTC_NODE DT_NODELABEL(grtc)
+#define HFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, hfclock)
+#define LFCLK_NODE DT_PHANDLE_BY_NAME(GRTC_NODE, clocks, lfclock)
 
 /* Ensure that GRTC properties in devicetree are defined correctly. */
 #if !DT_NODE_HAS_PROP(GRTC_NODE, owned_channels)
@@ -44,12 +47,14 @@
 	((uint64_t)sys_clock_hw_cycles_per_sec() / (uint64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC)
 
 #define COUNTER_SPAN (GRTC_SYSCOUNTERL_VALUE_Msk | ((uint64_t)GRTC_SYSCOUNTERH_VALUE_Msk << 32))
+#define MAX_ABS_TICKS (COUNTER_SPAN / CYC_PER_TICK)
+
 #define MAX_TICKS                                                                                  \
 	(((COUNTER_SPAN / CYC_PER_TICK) > INT_MAX) ? INT_MAX : (COUNTER_SPAN / CYC_PER_TICK))
 
 #define MAX_CYCLES (MAX_TICKS * CYC_PER_TICK)
 
-#define LFCLK_FREQUENCY_HZ 32768
+#define LFCLK_FREQUENCY_HZ DT_PROP(LFCLK_NODE, clock_frequency)
 
 #if defined(CONFIG_TEST)
 const int32_t z_sys_timer_irq_for_test = DT_IRQN(GRTC_NODE);
@@ -286,31 +291,17 @@ void z_nrf_grtc_timer_abort(int32_t chan)
 
 uint64_t z_nrf_grtc_timer_get_ticks(k_timeout_t t)
 {
-	uint64_t curr_time;
-	int64_t curr_tick;
-	int64_t result;
-	int64_t abs_ticks;
-	int64_t grtc_ticks;
-
-	curr_time = counter();
-	curr_tick = sys_clock_tick_get();
-
-	grtc_ticks = t.ticks * CYC_PER_TICK;
-	abs_ticks = Z_TICK_ABS(t.ticks);
-	if (abs_ticks < 0) {
-		/* relative timeout */
-		return (grtc_ticks > (int64_t)COUNTER_SPAN) ?
-			-EINVAL : (curr_time + grtc_ticks);
-	}
+	int64_t abs_ticks = Z_TICK_ABS(t.ticks);
 
-	/* absolute timeout */
-	result = (abs_ticks - curr_tick) * CYC_PER_TICK;
+	if (Z_IS_TIMEOUT_RELATIVE(t)) {
+		int64_t grtc_ticks = t.ticks * CYC_PER_TICK;
 
-	if (result > (int64_t)COUNTER_SPAN) {
-		return -EINVAL;
+		return (grtc_ticks > (int64_t)COUNTER_SPAN) ?
+			-EINVAL : (counter() + grtc_ticks);
 	}
 
-	return curr_time + result;
+	/* absolute timeout */
+	return (abs_ticks > MAX_ABS_TICKS) ? -EINVAL : (abs_ticks * CYC_PER_TICK);
 }
 
 int z_nrf_grtc_timer_capture_prepare(int32_t chan)
@@ -426,13 +417,6 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 		nrfy_grtc_timeout_get(NRF_GRTC) * CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 32768 +
 		MAX_CC_LATCH_WAIT_TIME_US;
 	k_busy_wait(wait_time);
-#if NRF_GRTC_HAS_CLKSEL
-#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
-#endif
-#endif
 	k_spin_unlock(&lock, key);
 	return 0;
 }
@@ -472,6 +456,18 @@ static int sys_clock_driver_init(void)
 	IRQ_CONNECT(DT_IRQN(GRTC_NODE), DT_IRQ(GRTC_NODE, priority), nrfx_isr,
 		    nrfx_grtc_irq_handler, 0);
 
+#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) && NRF_GRTC_HAS_CLKSEL
+#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
+	/* Switch to LFPRC as the low-frequency clock source. */
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
+#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
+	/* Switch to LFXO as the low-frequency clock source. */
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
+#else
+	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFCLK);
+#endif
+#endif
+
 	err_code = nrfx_grtc_init(0);
 	if (err_code != NRFX_SUCCESS) {
 		return -EPERM;
@@ -505,20 +501,38 @@ static int sys_clock_driver_init(void)
 	z_nrf_clock_control_lf_on(mode);
 #endif
 
-#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) && NRF_GRTC_HAS_CLKSEL
-#if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)
-	/* Switch to LFPRC as the low-frequency clock source. */
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFLPRC);
-#elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lfxo))
-	/* Switch to LFXO as the low-frequency clock source. */
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
+#if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
+	nrfx_grtc_active_request_set(true);
 #endif
+
+#if DT_PROP(GRTC_NODE, clkout_32k)
+	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_32K, true);
 #endif
 
-#if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
-	nrfx_grtc_active_request_set(true);
+#if DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency_hz)
+#if !DT_NODE_HAS_PROP(HFCLK_NODE, clock_frequency)
+#error "hfclock reference required when fast clock output is enabled."
 #endif
+
+#if DT_PROP(GRTC_NODE, clkout_fast_frequency_hz) > (DT_PROP(HFCLK_NODE, clock_frequency) / 2)
+#error "Invalid frequency value for fast clock output."
+#endif
+	uint32_t base_frequency = DT_PROP(HFCLK_NODE, clock_frequency);
+	uint32_t requested_frequency = DT_PROP(GRTC_NODE, clkout_fast_frequency_hz);
+	uint32_t grtc_div = base_frequency / (requested_frequency * 2);
+
+	nrfy_grtc_clkout_divider_set(NRF_GRTC, (uint8_t)grtc_div);
+	nrfy_grtc_clkout_set(NRF_GRTC, NRF_GRTC_CLKOUT_FAST, true);
+#endif
+
+#if DT_PROP(GRTC_NODE, clkout_32k) || DT_NODE_HAS_PROP(GRTC_NODE, clkout_fast_frequency_hz)
+	PINCTRL_DT_DEFINE(GRTC_NODE);
+	const struct pinctrl_dev_config *pcfg = PINCTRL_DT_DEV_CONFIG_GET(GRTC_NODE);
+
+	return pinctrl_apply_state(pcfg, PINCTRL_STATE_DEFAULT);
+#else
 	return 0;
+#endif
 }
 
 void sys_clock_set_timeout(int32_t ticks, bool idle)
diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index e0584a3c8b395..0fdf951f925b3 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -208,8 +208,7 @@ uint64_t z_nrf_rtc_timer_get_ticks(k_timeout_t t)
 	} while (curr_time != z_nrf_rtc_timer_read());
 
 	abs_ticks = Z_TICK_ABS(t.ticks);
-	if (abs_ticks < 0) {
-		/* relative timeout */
+	if (Z_IS_TIMEOUT_RELATIVE(t)) {
 		return (t.ticks > COUNTER_SPAN) ?
 			-EINVAL : (curr_time + t.ticks);
 	}
@@ -726,13 +725,6 @@ void sys_clock_disable(void)
 
 static int sys_clock_driver_init(void)
 {
-	static const enum nrf_lfclk_start_mode mode =
-		IS_ENABLED(CONFIG_SYSTEM_CLOCK_NO_WAIT) ?
-			CLOCK_CONTROL_NRF_LF_START_NOWAIT :
-			(IS_ENABLED(CONFIG_SYSTEM_CLOCK_WAIT_FOR_AVAILABILITY) ?
-			CLOCK_CONTROL_NRF_LF_START_AVAILABLE :
-			CLOCK_CONTROL_NRF_LF_START_STABLE);
-
 	int_event_disable_rtc();
 
 	/* TODO: replace with counter driver to access RTC */
@@ -763,7 +755,16 @@ static int sys_clock_driver_init(void)
 
 	compare_set(0, initial_timeout, sys_clock_timeout_handler, NULL, false);
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
+	static const enum nrf_lfclk_start_mode mode =
+		IS_ENABLED(CONFIG_SYSTEM_CLOCK_NO_WAIT) ?
+			CLOCK_CONTROL_NRF_LF_START_NOWAIT :
+			(IS_ENABLED(CONFIG_SYSTEM_CLOCK_WAIT_FOR_AVAILABILITY) ?
+			CLOCK_CONTROL_NRF_LF_START_AVAILABLE :
+			CLOCK_CONTROL_NRF_LF_START_STABLE);
+
 	z_nrf_clock_control_lf_on(mode);
+#endif
 
 	return 0;
 }
diff --git a/drivers/timer/realtek_rts5912_rtmr.c b/drivers/timer/realtek_rts5912_rtmr.c
index 3476e73099941..859275f316337 100644
--- a/drivers/timer/realtek_rts5912_rtmr.c
+++ b/drivers/timer/realtek_rts5912_rtmr.c
@@ -39,8 +39,9 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 
 #define MAX_TICKS ((k_ticks_t)(RTMR_COUNTER_MAX / CYCLES_PER_TICK) - 1)
 
-#define RTMR_ADJUST_LIMIT  2
-#define RTMR_ADJUST_CYCLES 1
+/* Adjust cycle count programmed into timer for HW restart latency */
+#define RTMR_ADJUST_LIMIT  8
+#define RTMR_ADJUST_CYCLES 7
 
 static struct k_spinlock lock;
 static uint32_t accumulated_cycles;
@@ -134,7 +135,7 @@ void sys_clock_set_timeout(int32_t ticks, bool idle)
 
 	partial_cycles = CYCLES_PER_TICK - (accumulated_cycles % CYCLES_PER_TICK);
 	previous_cnt = full_cycles + partial_cycles;
-
+	/* adjust for up to one 32KHz cycle startup time */
 	temp = previous_cnt;
 	if (temp > RTMR_ADJUST_LIMIT) {
 		temp -= RTMR_ADJUST_CYCLES;
diff --git a/drivers/timer/renesas_ra_ulpt_timer.c b/drivers/timer/renesas_ra_ulpt_timer.c
new file mode 100644
index 0000000000000..f491f7d5b4714
--- /dev/null
+++ b/drivers/timer/renesas_ra_ulpt_timer.c
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/irq.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys_clock.h>
+#include <soc.h>
+
+#define DT_DRV_COMPAT renesas_ra_ulpt_timer
+
+/* Ensure there are exactly two ULPT timer instances
+ * enabled in the device tree.
+ */
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 2,
+	     "Requires two instances of the ULPT timer to be enabled.");
+
+/* ULPT instance 0: Used to announce ticks to the kernel. */
+#define RA_ULPT_INST0_NODE    DT_INST_PARENT(0)
+#define RA_ULPT_INST0_REG     ((R_ULPT0_Type *)DT_REG_ADDR(RA_ULPT_INST0_NODE))
+#define RA_ULPT_INST0_IRQN    DT_IRQ_BY_NAME(RA_ULPT_INST0_NODE, ulpti, irq)
+#define RA_ULPT_INST0_IRQP    0U
+#define RA_ULPT_INST0_CHANNEL DT_PROP(RA_ULPT_INST0_NODE, channel)
+
+/* ULPT instance 1: Used for synchronization with hardware cycle clock. */
+#define RA_ULPT_INST1_NODE    DT_INST_PARENT(1)
+#define RA_ULPT_INST1_REG     ((R_ULPT0_Type *)DT_REG_ADDR(RA_ULPT_INST1_NODE))
+#define RA_ULPT_INST1_CHANNEL DT_PROP(RA_ULPT_INST1_NODE, channel)
+
+/* Constants for timer configuration and behavior. */
+#define RA_ULPT_RELOAD_DELAY 4U
+#define RA_ULPT_RELOAD_MIN   4U
+#define RA_ULPT_RELOAD_MAX   UINT32_MAX
+
+#define RA_ULPT_PRV_ULPTCR_STATUS_FLAGS 0xE0U
+#define RA_ULPT_PRV_ULPTCR_START_TIMER  0xE1U
+
+/* Macro to get ELC event for ULPT interrupt based on the channel. */
+#define ELC_EVENT_ULPT_INT(channel) CONCAT(ELC_EVENT_ULPT, channel, _INT)
+
+/* Calculated constants for timer operation. */
+#define CYCLE_PER_TICK ((sys_clock_hw_cycles_per_sec() / CONFIG_SYS_CLOCK_TICKS_PER_SEC))
+#define MAX_TICKS      ((k_ticks_t)(RA_ULPT_RELOAD_MAX / CYCLE_PER_TICK) - 1)
+
+/* Static variables for maintaining timer state. */
+static uint32_t cycle_announced;
+static struct k_spinlock lock;
+
+static void ra_ulpt_timer_isr(void)
+{
+	uint32_t cycles;
+	uint32_t dcycles;
+	uint32_t dticks;
+	IRQn_Type irq = R_FSP_CurrentIrqGet();
+
+	/* Clear pending IRQ to prevent re-triggering. */
+	R_BSP_IrqStatusClear(irq);
+
+	if (RA_ULPT_INST0_REG->ULPTCR_b.TUNDF) {
+		k_spinlock_key_t key = k_spin_lock(&lock);
+
+		if (IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
+			/* Calculate elapsed cycles and ticks. */
+			cycles = ~RA_ULPT_INST1_REG->ULPTCNT;
+			dcycles = cycles - cycle_announced;
+			dticks = dcycles / CYCLE_PER_TICK;
+			cycle_announced += dticks * CYCLE_PER_TICK;
+		} else {
+			/* In tickful mode, announce one tick at a time. */
+			dticks = 1;
+		}
+		/* Clear the underflow flag. */
+		RA_ULPT_INST0_REG->ULPTCR_b.TUNDF = 0;
+		k_spin_unlock(&lock, key);
+
+		/* Announce the elapsed ticks to the kernel. */
+		sys_clock_announce(dticks);
+	}
+}
+
+void sys_clock_set_timeout(int32_t ticks, bool idle)
+{
+	ARG_UNUSED(idle);
+
+	/* Timeout configuration is unsupported in tickful mode. */
+	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
+		return;
+	}
+
+	/* No timeout change for K_TICKS_FOREVER or INT32_MAX. */
+	if (ticks == K_TICKS_FOREVER || ticks == INT32_MAX) {
+		return;
+	}
+
+	/* Clamp the ticks value to a valid range. */
+	ticks = CLAMP(ticks - 1, 0, (int32_t)MAX_TICKS);
+
+	/* Calculate the timer delay in cycles. */
+	uint32_t cycles = ~RA_ULPT_INST1_REG->ULPTCNT;
+	uint32_t unannounced = cycles - cycle_announced;
+	uint32_t delay = ticks * CYCLE_PER_TICK;
+
+	/* Adjust delay to align with tick boundaries. */
+	delay += unannounced;
+	delay = DIV_ROUND_UP(delay, CYCLE_PER_TICK) * CYCLE_PER_TICK;
+	delay -= unannounced;
+	delay = MAX(delay, RA_ULPT_RELOAD_MIN + RA_ULPT_RELOAD_DELAY);
+	delay -= RA_ULPT_RELOAD_DELAY;
+
+	/* Update the timer counter. */
+	RA_ULPT_INST0_REG->ULPTCNT = delay - 1U;
+}
+
+uint32_t sys_clock_elapsed(void)
+{
+	/* Elapsed time calculation is unsupported in tickful mode. */
+	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
+		return 0;
+	}
+
+	/* Calculate and return the number of elapsed cycles. */
+	uint32_t cycles = ~RA_ULPT_INST1_REG->ULPTCNT - cycle_announced;
+
+	return (cycles / CYCLE_PER_TICK);
+}
+
+uint32_t sys_clock_cycle_get_32(void)
+{
+	return ~RA_ULPT_INST1_REG->ULPTCNT;
+}
+
+static int sys_clock_driver_init(void)
+{
+	/* Power on ULPT modules. */
+	R_BSP_MODULE_START(FSP_IP_ULPT, RA_ULPT_INST0_CHANNEL);
+	R_BSP_MODULE_START(FSP_IP_ULPT, RA_ULPT_INST1_CHANNEL);
+
+	/* Stop timers and reset control registers. */
+	RA_ULPT_INST0_REG->ULPTCR = 0U;
+	RA_ULPT_INST1_REG->ULPTCR = 0U;
+
+	/* Wait for timers to stop. */
+	FSP_HARDWARE_REGISTER_WAIT(0U, RA_ULPT_INST0_REG->ULPTCR_b.TCSTF);
+	FSP_HARDWARE_REGISTER_WAIT(0U, RA_ULPT_INST1_REG->ULPTCR_b.TCSTF);
+
+	/* Clear configuration registers before setup. */
+	RA_ULPT_INST0_REG->ULPTMR2 = 0U;
+	RA_ULPT_INST1_REG->ULPTMR2 = 0U;
+
+	/* Configure timer instance 0. */
+	RA_ULPT_INST0_REG->ULPTMR1 = 0U;
+	RA_ULPT_INST0_REG->ULPTMR2 = 0U;
+	RA_ULPT_INST0_REG->ULPTMR3 = 0U;
+	RA_ULPT_INST0_REG->ULPTIOC = 0U;
+	RA_ULPT_INST0_REG->ULPTISR = 0U;
+	RA_ULPT_INST0_REG->ULPTCMSR = 0U;
+
+	/* Configure timer instance 1. */
+	RA_ULPT_INST1_REG->ULPTMR1 = 0U;
+	RA_ULPT_INST1_REG->ULPTMR2 = 0U;
+	RA_ULPT_INST1_REG->ULPTMR3 = 0U;
+	RA_ULPT_INST1_REG->ULPTIOC = 0U;
+	RA_ULPT_INST1_REG->ULPTISR = 0U;
+	RA_ULPT_INST1_REG->ULPTCMSR = 0U;
+
+	/* Initialize timer counters. */
+	RA_ULPT_INST0_REG->ULPTCNT = CYCLE_PER_TICK - 1U;
+	RA_ULPT_INST1_REG->ULPTCNT = RA_ULPT_RELOAD_MAX;
+
+	/* Set up interrupts for timer instance 0. */
+	R_ICU->IELSR[RA_ULPT_INST0_IRQN] = ELC_EVENT_ULPT_INT(RA_ULPT_INST0_CHANNEL);
+	IRQ_CONNECT(RA_ULPT_INST0_IRQN, RA_ULPT_INST0_IRQP, ra_ulpt_timer_isr, NULL, 0);
+	irq_enable(RA_ULPT_INST0_IRQN);
+
+	/* Start both timers. */
+	RA_ULPT_INST0_REG->ULPTCR = RA_ULPT_PRV_ULPTCR_START_TIMER;
+	RA_ULPT_INST1_REG->ULPTCR = RA_ULPT_PRV_ULPTCR_START_TIMER;
+
+	/* Wait for timers to start completely. */
+	FSP_HARDWARE_REGISTER_WAIT(RA_ULPT_INST0_REG->ULPTCR_b.TSTART,
+				   RA_ULPT_INST0_REG->ULPTCR_b.TCSTF);
+	FSP_HARDWARE_REGISTER_WAIT(RA_ULPT_INST1_REG->ULPTCR_b.TSTART,
+				   RA_ULPT_INST1_REG->ULPTCR_b.TCSTF);
+	cycle_announced = 0U;
+
+	return 0;
+}
+
+/* Initialize the system timer driver during pre-kernel stage 2. */
+SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2, CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c
index 1ad978aa2bc73..f4c4c9e4662a4 100644
--- a/drivers/timer/sam0_rtc_timer.c
+++ b/drivers/timer/sam0_rtc_timer.c
@@ -252,7 +252,7 @@ static int sys_clock_driver_init(void)
 	volatile uint32_t *mclk = ATMEL_SAM0_DT_INST_MCLK_PM_REG_ADDR_OFFSET(0);
 	uint32_t mclk_mask = ATMEL_SAM0_DT_INST_MCLK_PM_PERIPH_MASK(0, bit);
 
-	*cfg->mclk |= cfg->mclk_mask;
+	*mclk |= mclk_mask;
 
 #ifdef MCLK
 	OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_ULP32K;
diff --git a/drivers/timer/silabs_sleeptimer_timer.c b/drivers/timer/silabs_sleeptimer_timer.c
index 405fa1496a5a7..d0e643d21bfa2 100644
--- a/drivers/timer/silabs_sleeptimer_timer.c
+++ b/drivers/timer/silabs_sleeptimer_timer.c
@@ -21,7 +21,6 @@ LOG_MODULE_REGISTER(silabs_sleeptimer_timer);
 
 /* Maximum time interval between timer interrupts (in hw_cycles) */
 #define MAX_TIMEOUT_CYC (UINT32_MAX >> 1)
-#define MIN_DELAY_CYC   (4U)
 
 #define DT_RTC DT_COMPAT_GET_ANY_STATUS_OKAY(silabs_gecko_stimer)
 
@@ -31,7 +30,7 @@ LOG_MODULE_REGISTER(silabs_sleeptimer_timer);
 /* With CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME, this global variable holds the clock frequency,
  * and must be written by the driver at init.
  */
-extern int z_clock_hw_cycles_per_sec;
+extern unsigned int z_clock_hw_cycles_per_sec;
 
 /* Global timer state */
 struct sleeptimer_timer_data {
@@ -73,16 +72,15 @@ static void sleeptimer_clock_set_timeout(int32_t ticks, struct sleeptimer_timer_
 	k_spinlock_key_t key = k_spin_lock(&timer->lock);
 
 	uint32_t curr = sl_sleeptimer_get_tick_count();
-	uint32_t prev = atomic_get(&timer->last_count);
-	uint32_t pending = curr - prev;
+	uint32_t pending = curr % timer->cyc_per_tick;
 	uint32_t next = ticks * timer->cyc_per_tick;
 
 	/* Next timeout is N ticks in the future, minus the current progress
-	 * towards the timeout. If we are behind, set the timeout to the first
-	 * possible upcoming tick.
+	 * into the tick if using multiple cycles per tick. The HAL API must
+	 * be called with a timeout of at least one cycle.
 	 */
-	while (next < (pending + MIN_DELAY_CYC)) {
-		next += timer->cyc_per_tick;
+	if (next == 0) {
+		next = timer->cyc_per_tick;
 	}
 	next -= pending;
 
@@ -136,17 +134,11 @@ static int sleeptimer_init(void)
 
 	timer->cyc_per_tick = z_clock_hw_cycles_per_sec / CONFIG_SYS_CLOCK_TICKS_PER_SEC;
 
-	__ASSERT(timer->cyc_per_tick >= MIN_DELAY_CYC,
-		 "A tick of %u cycles is too short to be scheduled "
-		 "(min is %u). Config: SYS_CLOCK_TICKS_PER_SEC is "
-		 "%d and timer frequency is %u",
-		 timer->cyc_per_tick, MIN_DELAY_CYC, CONFIG_SYS_CLOCK_TICKS_PER_SEC,
-		 z_clock_hw_cycles_per_sec);
-
 	timer->max_timeout_ticks = MAX_TIMEOUT_CYC / timer->cyc_per_tick;
 	timer->initialized = true;
 
-	atomic_set(&timer->last_count, sl_sleeptimer_get_tick_count());
+	atomic_set(&timer->last_count,
+		   ROUND_DOWN(sl_sleeptimer_get_tick_count(), timer->cyc_per_tick));
 
 	/* Start the timer and announce 1 kernel tick */
 	if (IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
diff --git a/drivers/usb/device/usb_dc_mcux.c b/drivers/usb/device/usb_dc_mcux.c
index 75b0f8061faa0..d6dd8e0b0c290 100644
--- a/drivers/usb/device/usb_dc_mcux.c
+++ b/drivers/usb/device/usb_dc_mcux.c
@@ -98,11 +98,8 @@ BUILD_ASSERT(NUM_INSTS <= 1, "Only one USB device supported");
 #elif DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2))
 #define CONTROLLER_ID kUSB_ControllerEhci1
 #endif /* IMX RT */
-#elif defined(CONFIG_SOC_SERIES_RW6XX)
-#define CONTROLLER_ID kUSB_ControllerEhci0
 #else
-/* If SOC has EHCI or LPCIP3511 then probably just need to add controller ID to this code */
-#error "USB driver does not yet support this SOC"
+#define CONTROLLER_ID kUSB_ControllerEhci0
 #endif /* CONTROLLER ID */
 
 /* We do not need a buffer for the write side on platforms that have USB RAM.
diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c
index c8442cb8f649d..d7e56167120be 100644
--- a/drivers/usb/device/usb_dc_nrfx.c
+++ b/drivers/usb/device/usb_dc_nrfx.c
@@ -1892,7 +1892,6 @@ static int usb_init(void)
 	IRQ_CONNECT(USBREGULATOR_IRQn,
 		    DT_IRQ(DT_INST(0, nordic_nrf_clock), priority),
 		    nrfx_isr, nrfx_usbreg_irq_handler, 0);
-	irq_enable(USBREGULATOR_IRQn);
 #endif
 
 	static const nrfx_power_config_t power_config = {
diff --git a/drivers/usb/device/usb_dc_rpi_pico.c b/drivers/usb/device/usb_dc_rpi_pico.c
index c0b55a7de5f2b..24485ee7f4c7d 100644
--- a/drivers/usb/device/usb_dc_rpi_pico.c
+++ b/drivers/usb/device/usb_dc_rpi_pico.c
@@ -524,6 +524,9 @@ static int udc_rpi_init(void)
 		hw_set_alias(usb_hw)->sie_ctrl = USB_SIE_CTRL_PULLUP_EN_BITS;
 	}
 
+	IRQ_CONNECT(USB_IRQ, USB_IRQ_PRI, udc_rpi_isr, 0, 0);
+	irq_enable(USB_IRQ);
+
 	return 0;
 }
 
@@ -1072,9 +1075,6 @@ static int usb_rpi_init(void)
 		return ret;
 	}
 
-	IRQ_CONNECT(USB_IRQ, USB_IRQ_PRI, udc_rpi_isr, 0, 0);
-	irq_enable(USB_IRQ);
-
 	return 0;
 }
 
diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c
index 6dee87dddfbc1..16b91470dee9d 100644
--- a/drivers/usb/device/usb_dc_stm32.c
+++ b/drivers/usb/device/usb_dc_stm32.c
@@ -67,15 +67,16 @@ LOG_MODULE_REGISTER(usb_dc_stm32);
 
 static const struct stm32_pclken pclken[] = STM32_DT_INST_CLOCKS(0);
 
-#if DT_INST_NODE_HAS_PROP(0, maximum_speed)
-#define USB_MAXIMUM_SPEED	DT_INST_PROP(0, maximum_speed)
-#endif
-
+#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 PINCTRL_DT_INST_DEFINE(0);
 static const struct pinctrl_dev_config *usb_pcfg =
 					PINCTRL_DT_INST_DEV_CONFIG_GET(0);
+#endif
 
-#define USB_OTG_HS_EMB_PHY (DT_HAS_COMPAT_STATUS_OKAY(st_stm32_usbphyc) && \
+#define USB_OTG_HS_EMB_PHYC (DT_HAS_COMPAT_STATUS_OKAY(st_stm32_usbphyc) && \
+			     DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs))
+
+#define USB_OTG_HS_EMB_PHY (DT_HAS_COMPAT_STATUS_OKAY(st_stm32u5_otghs_phy) && \
 			    DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs))
 
 #define USB_OTG_HS_ULPI_PHY (DT_HAS_COMPAT_STATUS_OKAY(usb_ulpi_phy) && \
@@ -86,6 +87,22 @@ static const struct gpio_dt_spec ulpi_reset =
 	GPIO_DT_SPEC_GET_OR(DT_PHANDLE(DT_INST(0, st_stm32_otghs), phys), reset_gpios, {0});
 #endif
 
+/**
+ * The following defines are used to map the value of the "maxiumum-speed"
+ * DT property to the corresponding definition used by the STM32 HAL.
+ */
+#if defined(CONFIG_SOC_SERIES_STM32H7X) || defined(USB_OTG_HS_EMB_PHYC) || \
+	defined(USB_OTG_HS_EMB_PHY)
+#define USB_DC_STM32_HIGH_SPEED             USB_OTG_SPEED_HIGH_IN_FULL
+#else
+#define USB_DC_STM32_HIGH_SPEED             USB_OTG_SPEED_HIGH
+#endif
+
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_usb)
+#define USB_DC_STM32_FULL_SPEED             PCD_SPEED_FULL
+#else
+#define USB_DC_STM32_FULL_SPEED             USB_OTG_SPEED_FULL
+#endif
 /*
  * USB, USB_OTG_FS and USB_DRD_FS are defined in STM32Cube HAL and allows to
  * distinguish between two kind of USB DC. STM32 F0, F3, L0 and G4 series
@@ -324,6 +341,14 @@ static int usb_dc_stm32_phy_specific_clock_enable(const struct device *const clk
 	 * with LL_PWR_EnableVDDUSB function (higher case)
 	 */
 	LL_PWR_EnableVDDUSB();
+#elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
+	/* Enable Vdd USB voltage monitoring */
+	LL_PWR_EnableVddUSBMonitoring();
+	while (__HAL_PWR_GET_FLAG(PWR_FLAG_USB33RDY)) {
+		/* Wait for VDD33USB ready */
+	}
+	/* Enable VDDUSB */
+	LL_PWR_EnableVddUSB();
 #endif
 
 	if (DT_INST_NUM_CLOCKS(0) > 1) {
@@ -402,13 +427,15 @@ static int usb_dc_stm32_clock_enable(void)
 	/* Both OTG HS and USBPHY sleep clock MUST be disabled here at the same time */
 	LL_AHB2_GRP1_DisableClockStopSleep(LL_AHB2_GRP1_PERIPH_OTG_HS ||
 						LL_AHB2_GRP1_PERIPH_USBPHY);
-#else
+#elif !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 	LL_AHB1_GRP1_DisableClockLowPower(LL_AHB1_GRP1_PERIPH_OTGHSULPI);
 #endif
 
-#if USB_OTG_HS_EMB_PHY
+#if USB_OTG_HS_EMB_PHYC
+#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 	LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_OTGPHYC);
 #endif
+#endif
 #endif /* USB_OTG_HS_ULPI_PHY */
 
 	return 0;
@@ -429,66 +456,28 @@ static int usb_dc_stm32_clock_disable(void)
 	return 0;
 }
 
-#if defined(USB_OTG_FS) || defined(USB_OTG_HS)
-static uint32_t usb_dc_stm32_get_maximum_speed(void)
-{
-	/*
-	 * If max-speed is not passed via DT, set it to USB controller's
-	 * maximum hardware capability.
-	 */
-#if USB_OTG_HS_EMB_PHY || USB_OTG_HS_ULPI_PHY
-	uint32_t speed = USB_OTG_SPEED_HIGH;
-#else
-	uint32_t speed = USB_OTG_SPEED_FULL;
-#endif
-
-#ifdef USB_MAXIMUM_SPEED
-
-	if (!strncmp(USB_MAXIMUM_SPEED, "high-speed", 10)) {
-		speed = USB_OTG_SPEED_HIGH;
-	} else if (!strncmp(USB_MAXIMUM_SPEED, "full-speed", 10)) {
-#if defined(CONFIG_SOC_SERIES_STM32H7X) || defined(USB_OTG_HS_EMB_PHY)
-		speed = USB_OTG_SPEED_HIGH_IN_FULL;
-#else
-		speed = USB_OTG_SPEED_FULL;
-#endif
-	} else {
-		LOG_DBG("Unsupported maximum speed defined in device tree. "
-			"USB controller will default to its maximum HW "
-			"capability");
-	}
-#endif
-
-	return speed;
-}
-#endif /* USB_OTG_FS || USB_OTG_HS */
-
 static int usb_dc_stm32_init(void)
 {
 	HAL_StatusTypeDef status;
-	int ret;
 	unsigned int i;
 
+	usb_dc_stm32_state.pcd.Init.speed =
+			UTIL_CAT(USB_DC_STM32_, DT_INST_STRING_UPPER_TOKEN(0, maximum_speed));
+
 #if defined(USB) || defined(USB_DRD_FS)
 #ifdef USB
 	usb_dc_stm32_state.pcd.Instance = USB;
 #else
 	usb_dc_stm32_state.pcd.Instance = USB_DRD_FS;
 #endif
-	usb_dc_stm32_state.pcd.Init.speed = PCD_SPEED_FULL;
 	usb_dc_stm32_state.pcd.Init.dev_endpoints = USB_NUM_BIDIR_ENDPOINTS;
 	usb_dc_stm32_state.pcd.Init.phy_itface = PCD_PHY_EMBEDDED;
 	usb_dc_stm32_state.pcd.Init.ep0_mps = PCD_EP0MPS_64;
 	usb_dc_stm32_state.pcd.Init.low_power_enable = 0;
 #else /* USB_OTG_FS || USB_OTG_HS */
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs)
-	usb_dc_stm32_state.pcd.Instance = USB_OTG_HS;
-#else
-	usb_dc_stm32_state.pcd.Instance = USB_OTG_FS;
-#endif
+	usb_dc_stm32_state.pcd.Instance = (USB_OTG_GlobalTypeDef *)USB_BASE_ADDRESS;
 	usb_dc_stm32_state.pcd.Init.dev_endpoints = USB_NUM_BIDIR_ENDPOINTS;
-	usb_dc_stm32_state.pcd.Init.speed = usb_dc_stm32_get_maximum_speed();
-#if USB_OTG_HS_EMB_PHY
+#if USB_OTG_HS_EMB_PHYC || USB_OTG_HS_EMB_PHY
 	usb_dc_stm32_state.pcd.Init.phy_itface = USB_OTG_HS_EMBEDDED_PHY;
 #elif USB_OTG_HS_ULPI_PHY
 	usb_dc_stm32_state.pcd.Init.phy_itface = USB_OTG_ULPI_PHY;
@@ -529,12 +518,14 @@ static int usb_dc_stm32_init(void)
 	}
 #endif
 
+#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 	LOG_DBG("Pinctrl signals configuration");
-	ret = pinctrl_apply_state(usb_pcfg, PINCTRL_STATE_DEFAULT);
+	int ret = pinctrl_apply_state(usb_pcfg, PINCTRL_STATE_DEFAULT);
 	if (ret < 0) {
 		LOG_ERR("USB pinctrl setup failed (%d)", ret);
 		return ret;
 	}
+#endif
 
 	LOG_DBG("HAL_PCD_Init");
 	status = HAL_PCD_Init(&usb_dc_stm32_state.pcd);
diff --git a/drivers/usb/udc/CMakeLists.txt b/drivers/usb/udc/CMakeLists.txt
index 0fdc321a3141a..c8fbc9b601185 100644
--- a/drivers/usb/udc/CMakeLists.txt
+++ b/drivers/usb/udc/CMakeLists.txt
@@ -20,3 +20,4 @@ zephyr_library_sources_ifdef(CONFIG_UDC_NUMAKER udc_numaker.c)
 zephyr_library_sources_ifdef(CONFIG_UDC_RPI_PICO udc_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_UDC_AMBIQ udc_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_UDC_RENESAS_RA udc_renesas_ra.c)
+zephyr_library_sources_ifdef(CONFIG_UDC_MAX32 udc_max32.c)
diff --git a/drivers/usb/udc/Kconfig b/drivers/usb/udc/Kconfig
index fd5e25cf11344..997da20d7cb11 100644
--- a/drivers/usb/udc/Kconfig
+++ b/drivers/usb/udc/Kconfig
@@ -11,6 +11,16 @@ menuconfig UDC_DRIVER
 
 if UDC_DRIVER
 
+config UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
+	bool
+
+config UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED
+	bool "Allow High-Speed chirp"
+	default y if UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
+	help
+	  Allow High-Speed capable device to operate at High-Speed. Disable this
+	  option to force Full-Speed only operation.
+
 config UDC_BUF_COUNT
 	int "Number of buffers in the pool"
 	range 16 256
@@ -67,5 +77,6 @@ source "drivers/usb/udc/Kconfig.numaker"
 source "drivers/usb/udc/Kconfig.rpi_pico"
 source "drivers/usb/udc/Kconfig.ambiq"
 source "drivers/usb/udc/Kconfig.renesas_ra"
+source "drivers/usb/udc/Kconfig.max32"
 
 endif # UDC_DRIVER
diff --git a/drivers/usb/udc/Kconfig.ambiq b/drivers/usb/udc/Kconfig.ambiq
index 93566cfbf5df5..5508b6d328838 100644
--- a/drivers/usb/udc/Kconfig.ambiq
+++ b/drivers/usb/udc/Kconfig.ambiq
@@ -11,16 +11,16 @@ config UDC_AMBIQ
 	help
 	  Enable USB Device Controller Driver.
 
+if UDC_AMBIQ
+
 config UDC_AMBIQ_STACK_SIZE
 	int "UDC AMBIQ driver internal thread stack size"
-	depends on UDC_AMBIQ
 	default 2048
 	help
 	  AMBIQ driver internal thread stack size.
 
 config UDC_AMBIQ_THREAD_PRIORITY
 	int "UDC AMBIQ driver thread priority"
-	depends on UDC_AMBIQ
 	default 8
 	help
 	  AMBIQ driver thread priority.
@@ -32,3 +32,5 @@ config UDC_AMBIQ_MAX_QMESSAGES
 	default 8
 	help
 	  AMBIQ maximum number of ISR event messages.
+
+endif # UDC_AMBIQ
diff --git a/drivers/usb/udc/Kconfig.dwc2 b/drivers/usb/udc/Kconfig.dwc2
index 2f40c8f71a283..9486f88c3ba5b 100644
--- a/drivers/usb/udc/Kconfig.dwc2
+++ b/drivers/usb/udc/Kconfig.dwc2
@@ -5,6 +5,7 @@ config UDC_DWC2
 	bool "DWC2 USB device controller driver"
 	default y
 	depends on DT_HAS_SNPS_DWC2_ENABLED
+	select UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
 	select NRFS if NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select NRFS_VBUS_DETECTOR_SERVICE_ENABLED if NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select EVENTS
diff --git a/drivers/usb/udc/Kconfig.max32 b/drivers/usb/udc/Kconfig.max32
new file mode 100644
index 0000000000000..78c5444171b5b
--- /dev/null
+++ b/drivers/usb/udc/Kconfig.max32
@@ -0,0 +1,32 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config UDC_MAX32
+	bool "MAX32 USB device controller driver"
+	default y
+	depends on DT_HAS_ADI_MAX32_USBHS_ENABLED
+	help
+	  MAX32 USB device controller driver.
+
+if UDC_MAX32
+
+config UDC_MAX32_THREAD_PRIORITY
+	int "MAX32 USB device controller driver thread priority"
+	default 8
+	help
+	  MAX32 USB device device controller driver thread priority.
+
+config UDC_MAX32_THREAD_STACK_SIZE
+	int "MAX32 UDC driver internal thread stack size"
+	default 1024
+	help
+	  Size of the stack for the driver internal thread.
+
+config UDC_MAX32_MAX_QMESSAGES
+	int "MAX32 UDC driver maximum number of ISR event messages"
+	range 4 64
+	default 8
+	help
+	  Maximum number of messages for handling of MAX32 USBD ISR events.
+
+endif # UDC_MAX32
diff --git a/drivers/usb/udc/Kconfig.mcux b/drivers/usb/udc/Kconfig.mcux
index be744a1122eb3..7ebace0e7f7c4 100644
--- a/drivers/usb/udc/Kconfig.mcux
+++ b/drivers/usb/udc/Kconfig.mcux
@@ -5,8 +5,9 @@ config UDC_NXP_EHCI
 	bool "NXP MCUX USB EHCI Device controller driver"
 	default y
 	depends on DT_HAS_NXP_EHCI_ENABLED
+	select UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
 	select PINCTRL
-	select NOCACHE_MEMORY if HAS_MCUX_CACHE && CPU_HAS_DCACHE
+	select NOCACHE_MEMORY if CPU_HAS_DCACHE
 	imply UDC_BUF_FORCE_NOCACHE
 	imply UDC_WORKQUEUE
 	help
@@ -16,6 +17,7 @@ config UDC_NXP_IP3511
 	bool "NXP MCUX USB IP3511 Device controller driver"
 	default y
 	depends on DT_HAS_NXP_LPCIP3511_ENABLED
+	select UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
 	select PINCTRL
 	imply UDC_WORKQUEUE
 	help
diff --git a/drivers/usb/udc/Kconfig.nrf b/drivers/usb/udc/Kconfig.nrf
index 93c5090bed2a2..bcb0e1f017b2e 100644
--- a/drivers/usb/udc/Kconfig.nrf
+++ b/drivers/usb/udc/Kconfig.nrf
@@ -7,6 +7,7 @@ config UDC_NRF
 	depends on DT_HAS_NORDIC_NRF_USBD_ENABLED
 	select NRF_USBD_COMMON
 	select NRFX_POWER
+	select EVENTS
 	help
 	  nRF USB device controller driver.
 
@@ -18,11 +19,4 @@ config UDC_NRF_THREAD_STACK_SIZE
 	help
 	  Size of the stack used in the driver for nRF USBD ISR event handling.
 
-config UDC_NRF_MAX_QMESSAGES
-	int "nRF UDC driver maximum number of ISR event messages"
-	range 4 64
-	default 8
-	help
-	  Maximum number of messages for handling of nRF USBD ISR events.
-
 endif # UDC_NRF
diff --git a/drivers/usb/udc/Kconfig.rpi_pico b/drivers/usb/udc/Kconfig.rpi_pico
index 3656a754afc27..fd194520c7281 100644
--- a/drivers/usb/udc/Kconfig.rpi_pico
+++ b/drivers/usb/udc/Kconfig.rpi_pico
@@ -6,6 +6,8 @@ config UDC_RPI_PICO
 	default y
 	depends on DT_HAS_RASPBERRYPI_PICO_USBD_ENABLED
 	select SYS_MEM_BLOCKS
+	select EVENTS
+	imply PINCTRL
 	help
 	  Driver for an Raspberry PI Pico USB device controller.
 
diff --git a/drivers/usb/udc/Kconfig.skeleton b/drivers/usb/udc/Kconfig.skeleton
index bf7eb01323bf1..b6d96e0b89585 100644
--- a/drivers/usb/udc/Kconfig.skeleton
+++ b/drivers/usb/udc/Kconfig.skeleton
@@ -5,6 +5,7 @@ config UDC_SKELETON
 	bool "Skeleton for an USB device controller driver"
 	default y
 	depends on DT_HAS_ZEPHYR_UDC_SKELETON_ENABLED
+	select UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
 	help
 	  Skeleton for an USB device controller driver.
 
diff --git a/drivers/usb/udc/Kconfig.virtual b/drivers/usb/udc/Kconfig.virtual
index b84e14ba971e1..7aff8ca8e20d4 100644
--- a/drivers/usb/udc/Kconfig.virtual
+++ b/drivers/usb/udc/Kconfig.virtual
@@ -6,6 +6,7 @@ config UDC_VIRTUAL
 	select UVB
 	default y
 	depends on DT_HAS_ZEPHYR_UDC_VIRTUAL_ENABLED
+	select UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
 	help
 	  Virtual USB device controller driver.
 
diff --git a/drivers/usb/udc/udc_ambiq.c b/drivers/usb/udc/udc_ambiq.c
index f6f342fc21cdc..6e5f2603edd5c 100644
--- a/drivers/usb/udc/udc_ambiq.c
+++ b/drivers/usb/udc/udc_ambiq.c
@@ -5,7 +5,6 @@
  */
 
 #include <soc.h>
-#include "am_mcu_apollo.h"
 #include <string.h>
 #include <zephyr/drivers/clock_control/clock_control_ambiq.h>
 #include <zephyr/sys/util.h>
@@ -18,7 +17,6 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 #include "udc_common.h"
-#include <usb_dwc2_hw.h>
 
 LOG_MODULE_REGISTER(udc_ambiq, CONFIG_UDC_DRIVER_LOG_LEVEL);
 
@@ -96,13 +94,14 @@ static int usbd_ctrl_feed_dout(const struct device *dev, const size_t length)
 static int udc_ambiq_tx(const struct device *dev, uint8_t ep, struct net_buf *buf)
 {
 	const struct udc_ambiq_data *priv = udc_get_private(dev);
+	struct udc_ep_config *cfg = udc_get_ep_cfg(dev, ep);
 	uint32_t status;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(cfg)) {
 		LOG_WRN("ep 0x%02x is busy!", ep);
 		return 0;
 	}
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(cfg, true);
 
 	/* buf equals NULL is used as indication of ZLP request */
 	if (buf == NULL) {
@@ -112,7 +111,7 @@ static int udc_ambiq_tx(const struct device *dev, uint8_t ep, struct net_buf *bu
 	}
 
 	if (status != AM_HAL_STATUS_SUCCESS) {
-		udc_ep_set_busy(dev, ep, false);
+		udc_ep_set_busy(cfg, false);
 		LOG_ERR("am_hal_usb_ep_xfer write failed(0x%02x), %d", ep, (int)status);
 		return -EIO;
 	}
@@ -123,15 +122,16 @@ static int udc_ambiq_tx(const struct device *dev, uint8_t ep, struct net_buf *bu
 static int udc_ambiq_rx(const struct device *dev, uint8_t ep, struct net_buf *buf)
 {
 	struct udc_ambiq_data *priv = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct udc_ep_config *cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	uint32_t status;
 	uint16_t rx_size = buf->size;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		LOG_WRN("ep 0x%02x is busy!", ep);
 		return 0;
 	}
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(ep_cfg, true);
 
 	/* Make sure that OUT transaction size triggered doesn't exceed EP's MPS */
 	if ((ep != USB_CONTROL_EP_OUT) && (cfg->mps < rx_size)) {
@@ -140,7 +140,7 @@ static int udc_ambiq_rx(const struct device *dev, uint8_t ep, struct net_buf *bu
 
 	status = am_hal_usb_ep_xfer(priv->usb_handle, ep, buf->data, rx_size);
 	if (status != AM_HAL_STATUS_SUCCESS) {
-		udc_ep_set_busy(dev, ep, false);
+		udc_ep_set_busy(ep_cfg, false);
 		LOG_ERR("am_hal_usb_ep_xfer read(rx) failed(0x%02x), %d", ep, (int)status);
 		return -EIO;
 	}
@@ -223,7 +223,9 @@ static void udc_ambiq_ep_xfer_complete_callback(const struct device *dev, uint8_
 	if (USB_EP_DIR_IS_IN(ep_addr)) {
 		evt.type = UDC_AMBIQ_EVT_HAL_IN_CMP;
 	} else {
-		buf = udc_buf_peek(dev, ep_addr);
+		struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep_addr);
+
+		buf = udc_buf_peek(ep_cfg);
 		if (buf == NULL) {
 			LOG_ERR("No buffer for ep 0x%02x", ep_addr);
 			udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -281,12 +283,12 @@ static int udc_ambiq_ep_dequeue(const struct device *dev, struct udc_ep_config *
 
 	lock_key = irq_lock();
 
-	buf = udc_buf_get_all(dev, ep_cfg->addr);
+	buf = udc_buf_get_all(ep_cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, ep_cfg->addr, false);
+	udc_ep_set_busy(ep_cfg, false);
 	am_hal_usb_ep_state_reset(priv->usb_handle, ep_cfg->addr);
 	irq_unlock(lock_key);
 
@@ -320,7 +322,7 @@ static int udc_ambiq_ep_clear_halt(const struct device *dev, struct udc_ep_confi
 	ep_cfg->stat.halted = false;
 
 	/* Resume queued transfer if any */
-	if (udc_buf_peek(dev, ep_cfg->addr)) {
+	if (udc_buf_peek(ep_cfg)) {
 		struct udc_ambiq_event evt = {
 			.ep = ep_cfg->addr,
 			.type = UDC_AMBIQ_EVT_XFER,
@@ -404,16 +406,16 @@ static int udc_ambiq_test_mode(const struct device *dev, const uint8_t mode, con
 	struct udc_ambiq_data *priv = udc_get_private(dev);
 
 	switch (mode) {
-	case USB_DWC2_DCTL_TSTCTL_TESTJ:
+	case USB_SFS_TEST_MODE_J:
 		am_usb_test_mode = AM_HAL_USB_TEST_J;
 		break;
-	case USB_DWC2_DCTL_TSTCTL_TESTK:
+	case USB_SFS_TEST_MODE_K:
 		am_usb_test_mode = AM_HAL_USB_TEST_K;
 		break;
-	case USB_DWC2_DCTL_TSTCTL_TESTSN:
+	case USB_SFS_TEST_MODE_SE0_NAK:
 		am_usb_test_mode = AM_HAL_USB_TEST_SE0_NAK;
 		break;
-	case USB_DWC2_DCTL_TSTCTL_TESTPM:
+	case USB_SFS_TEST_MODE_PACKET:
 		am_usb_test_mode = AM_HAL_USB_TEST_PACKET;
 		break;
 	default:
@@ -647,14 +649,14 @@ static inline void ambiq_handle_evt_dout(const struct device *dev, struct udc_ep
 	struct net_buf *buf;
 
 	/* retrieve endpoint buffer */
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for control ep");
 		return;
 	}
 
 	/* Clear endpoint busy status */
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	/* Handle transfer complete event */
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
@@ -686,9 +688,9 @@ static void ambiq_handle_evt_din(const struct device *dev, struct udc_ep_config
 	bool udc_ambiq_rx_status_in_completed = false;
 
 	/* Clear endpoint busy status */
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 	/* Check and Handle ZLP flag */
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (cfg->addr != USB_CONTROL_EP_IN) {
 		if (udc_ep_buf_has_zlp(buf)) {
 			udc_ep_buf_clear_zlp(buf);
@@ -699,7 +701,7 @@ static void ambiq_handle_evt_din(const struct device *dev, struct udc_ep_config
 	}
 
 	/* retrieve endpoint buffer */
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for control ep");
 		return;
@@ -754,7 +756,7 @@ static void udc_event_xfer(const struct device *dev, struct udc_ep_config *const
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", cfg->addr);
 		return;
diff --git a/drivers/usb/udc/udc_common.c b/drivers/usb/udc/udc_common.c
index 9429c404ad609..3718290ce42e0 100644
--- a/drivers/usb/udc/udc_common.c
+++ b/drivers/usb/udc/udc_common.c
@@ -78,22 +78,13 @@ struct udc_ep_config *udc_get_ep_cfg(const struct device *dev, const uint8_t ep)
 	return data->ep_lut[USB_EP_LUT_IDX(ep)];
 }
 
-bool udc_ep_is_busy(const struct device *dev, const uint8_t ep)
+bool udc_ep_is_busy(const struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	__ASSERT(ep_cfg != NULL, "ep 0x%02x is not available", ep);
-
 	return ep_cfg->stat.busy;
 }
 
-void udc_ep_set_busy(const struct device *dev, const uint8_t ep, const bool busy)
+void udc_ep_set_busy(struct udc_ep_config *const ep_cfg, const bool busy)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	__ASSERT(ep_cfg != NULL, "ep 0x%02x is not available", ep);
 	ep_cfg->stat.busy = busy;
 }
 
@@ -115,34 +106,21 @@ int udc_register_ep(const struct device *dev, struct udc_ep_config *const cfg)
 	return 0;
 }
 
-struct net_buf *udc_buf_get(const struct device *dev, const uint8_t ep)
+struct net_buf *udc_buf_get(struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	if (ep_cfg == NULL) {
-		return NULL;
-	}
-
 	return k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 }
 
-struct net_buf *udc_buf_get_all(const struct device *dev, const uint8_t ep)
+struct net_buf *udc_buf_get_all(struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
 
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	if (ep_cfg == NULL) {
-		return NULL;
-	}
-
 	buf = k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 	if (!buf) {
 		return NULL;
 	}
 
-	LOG_DBG("ep 0x%02x dequeue %p", ep, buf);
+	LOG_DBG("ep 0x%02x dequeue %p", ep_cfg->addr, buf);
 	for (struct net_buf *n = buf; !k_fifo_is_empty(&ep_cfg->fifo); n = n->frags) {
 		n->frags = k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 		LOG_DBG("|-> %p ", n->frags);
@@ -154,15 +132,8 @@ struct net_buf *udc_buf_get_all(const struct device *dev, const uint8_t ep)
 	return buf;
 }
 
-struct net_buf *udc_buf_peek(const struct device *dev, const uint8_t ep)
+struct net_buf *udc_buf_peek(struct udc_ep_config *const ep_cfg)
 {
-	struct udc_ep_config *ep_cfg;
-
-	ep_cfg = udc_get_ep_cfg(dev, ep);
-	if (ep_cfg == NULL) {
-		return NULL;
-	}
-
 	return k_fifo_peek_head(&ep_cfg->fifo);
 }
 
diff --git a/drivers/usb/udc/udc_common.h b/drivers/usb/udc/udc_common.h
index 19cad23bd39e1..8cad6b6dd1c5f 100644
--- a/drivers/usb/udc/udc_common.h
+++ b/drivers/usb/udc/udc_common.h
@@ -61,21 +61,19 @@ struct udc_ep_config *udc_get_ep_cfg(const struct device *dev,
 /**
  * @brief Checks if the endpoint is busy
  *
- * @param[in] dev    Pointer to device struct of the driver instance
- * @param[in] ep     Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return true if endpoint is busy
  */
-bool udc_ep_is_busy(const struct device *dev, const uint8_t ep);
+bool udc_ep_is_busy(const struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Helper function to set endpoint busy state
  *
- * @param[in] dev    Pointer to device struct of the driver instance
- * @param[in] ep     Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  * @param[in] busy   Busy state
  */
-void udc_ep_set_busy(const struct device *dev, const uint8_t ep,
+void udc_ep_set_busy(struct udc_ep_config *const ep_cfg,
 		     const bool busy);
 
 /**
@@ -85,13 +83,11 @@ void udc_ep_set_busy(const struct device *dev, const uint8_t ep,
  * Use it when transfer is finished and request should
  * be passed to the higher level.
  *
- * @param[in] dev     Pointer to device struct of the driver instance
- * @param[in] ep      Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return pointer to UDC request or NULL on error.
  */
-struct net_buf *udc_buf_get(const struct device *dev,
-			    const uint8_t ep);
+struct net_buf *udc_buf_get(struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Get all UDC request from endpoint FIFO.
@@ -100,13 +96,11 @@ struct net_buf *udc_buf_get(const struct device *dev,
  * This function removes all request from endpoint FIFO and
  * is typically used to dequeue endpoint FIFO.
  *
- * @param[in] dev    Pointer to device struct of the driver instance
- * @param[in] ep     Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return pointer to UDC request or NULL on error.
  */
-struct net_buf *udc_buf_get_all(const struct device *dev,
-				const uint8_t ep);
+struct net_buf *udc_buf_get_all(struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Peek request at the head of endpoint FIFO.
@@ -114,13 +108,11 @@ struct net_buf *udc_buf_get_all(const struct device *dev,
  * Return request from the head of endpoint FIFO without removing.
  * Use it when request buffer is required for a transfer.
  *
- * @param[in] dev     Pointer to device struct of the driver instance
- * @param[in] ep      Endpoint address
+ * @param[in] ep_cfg Pointer to endpoint configuration
  *
  * @return pointer to request or NULL on error.
  */
-struct net_buf *udc_buf_peek(const struct device *dev,
-			     const uint8_t ep);
+struct net_buf *udc_buf_peek(struct udc_ep_config *const ep_cfg);
 
 /**
  * @brief Put request at the tail of endpoint FIFO.
diff --git a/drivers/usb/udc/udc_dwc2.c b/drivers/usb/udc/udc_dwc2.c
index 13aa6c1738a11..818bd691d5894 100644
--- a/drivers/usb/udc/udc_dwc2.c
+++ b/drivers/usb/udc/udc_dwc2.c
@@ -105,16 +105,17 @@ struct udc_dwc2_data {
 	/* Main events the driver thread waits for */
 	struct k_event drv_evt;
 	/* Transfer triggers (IN on bits 0-15, OUT on bits 16-31) */
-	struct k_event xfer_new;
+	atomic_t xfer_new;
 	/* Finished transactions (IN on bits 0-15, OUT on bits 16-31) */
-	struct k_event xfer_finished;
+	atomic_t xfer_finished;
 	struct dwc2_reg_backup backup;
 	uint32_t ghwcfg1;
-	uint32_t txf_set;
 	uint32_t max_xfersize;
 	uint32_t max_pktcnt;
 	uint32_t tx_len[16];
 	uint32_t rx_siz[16];
+	uint16_t txf_set;
+	uint16_t pending_tx_flush;
 	uint16_t dfifodepth;
 	uint16_t rxfifo_depth;
 	uint16_t max_txfifo_depth[16];
@@ -403,7 +404,7 @@ static int dwc2_ctrl_feed_dout(const struct device *dev, const size_t length)
 	}
 
 	udc_buf_put(ep_cfg, buf);
-	k_event_post(&priv->xfer_new, BIT(16));
+	atomic_set_bit(&priv->xfer_new, 16);
 	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 
 	return 0;
@@ -416,7 +417,7 @@ static void dwc2_ensure_setup_ready(const struct device *dev)
 		return;
 	}
 
-	if (!udc_buf_peek(dev, USB_CONTROL_EP_OUT)) {
+	if (!udc_buf_peek(udc_get_ep_cfg(dev, USB_CONTROL_EP_IN))) {
 		dwc2_ctrl_feed_dout(dev, 8);
 	}
 }
@@ -668,7 +669,32 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 
 	/* Clear NAK and set endpoint enable */
 	doepctl = sys_read32(doepctl_reg);
-	doepctl |= USB_DWC2_DEPCTL_EPENA | USB_DWC2_DEPCTL_CNAK;
+	doepctl |= USB_DWC2_DEPCTL_EPENA;
+	if (cfg->addr == USB_CONTROL_EP_OUT) {
+		struct udc_data *data = dev->data;
+
+		/* During OUT Data Stage every packet has to have CNAK set.
+		 * In Buffer DMA mode the OUT endpoint is armed during IN Data
+		 * Stage to accept either Status stage or new SETUP token. The
+		 * Status stage (premature or not) can only be received if CNAK
+		 * was set. In Completer mode the OUT endpoint armed during OUT
+		 * Status stage needs CNAK.
+		 *
+		 * Setting CNAK in other cases opens up possibility for Buffer
+		 * DMA controller to lock up completely if the endpoint is
+		 * enabled (to receive SETUP data) when the host is transmitting
+		 * subsequent control transfer OUT Data Stage packet (SETUP DATA
+		 * is unconditionally ACKed regardless of software state).
+		 */
+		if (data->stage == CTRL_PIPE_STAGE_DATA_OUT ||
+		    data->stage == CTRL_PIPE_STAGE_DATA_IN ||
+		    data->stage == CTRL_PIPE_STAGE_STATUS_OUT) {
+			doepctl |= USB_DWC2_DEPCTL_CNAK;
+		}
+	} else {
+		/* Non-control endpoint, set CNAK for all transfers */
+		doepctl |= USB_DWC2_DEPCTL_CNAK;
+	}
 
 	if (dwc2_ep_is_iso(cfg)) {
 		xfersize = USB_MPS_TO_TPL(cfg->mps);
@@ -736,7 +762,7 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		return;
 	}
@@ -770,7 +796,7 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 			LOG_ERR("Failed to start write to TX FIFO, ep 0x%02x (err: %d)",
 				cfg->addr, err);
 
-			buf = udc_buf_get(dev, cfg->addr);
+			buf = udc_buf_get(cfg);
 			if (udc_submit_ep_event(dev, buf, -ECONNREFUSED)) {
 				LOG_ERR("Failed to submit endpoint event");
 			};
@@ -779,12 +805,14 @@ static void dwc2_handle_xfer_next(const struct device *dev,
 		}
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, true);
+	udc_ep_set_busy(cfg, true);
 }
 
 static int dwc2_handle_evt_setup(const struct device *dev)
 {
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
+	struct udc_ep_config *cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct udc_ep_config *cfg_in = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 	int err;
 
@@ -792,20 +820,20 @@ static int dwc2_handle_evt_setup(const struct device *dev)
 	 * transfer beforehand. In Buffer DMA the SETUP can be copied to any EP0
 	 * OUT buffer. If there is any buffer queued, it is obsolete now.
 	 */
-	k_event_clear(&priv->xfer_finished, BIT(0) | BIT(16));
+	atomic_and(&priv->xfer_finished, ~(BIT(0) | BIT(16)));
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get_all(cfg_out);
 	if (buf) {
 		net_buf_unref(buf);
 	}
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get_all(cfg_in);
 	if (buf) {
 		net_buf_unref(buf);
 	}
 
-	udc_ep_set_busy(dev, USB_CONTROL_EP_OUT, false);
-	udc_ep_set_busy(dev, USB_CONTROL_EP_IN, false);
+	udc_ep_set_busy(cfg_out, false);
+	udc_ep_set_busy(cfg_in, false);
 
 	/* Allocate buffer and copy received SETUP for processing */
 	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, 8);
@@ -851,13 +879,13 @@ static inline int dwc2_handle_evt_dout(const struct device *dev,
 	struct net_buf *buf;
 	int err = 0;
 
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for ep 0x%02x", cfg->addr);
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -899,7 +927,7 @@ static int dwc2_handle_evt_din(const struct device *dev,
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -916,8 +944,8 @@ static int dwc2_handle_evt_din(const struct device *dev,
 		return dwc2_tx_fifo_write(dev, cfg, buf);
 	}
 
-	buf = udc_buf_get(dev, cfg->addr);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	buf = udc_buf_get(cfg);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
@@ -1484,6 +1512,7 @@ static int dwc2_unset_dedicated_fifo(const struct device *dev,
 static void udc_dwc2_ep_disable(const struct device *dev,
 				struct udc_ep_config *const cfg, bool stall)
 {
+	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	uint8_t ep_idx = USB_EP_GET_IDX(cfg->addr);
 	mem_addr_t dxepctl_reg;
@@ -1493,6 +1522,41 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 	dxepctl_reg = dwc2_get_dxepctl_reg(dev, cfg->addr);
 	dxepctl = sys_read32(dxepctl_reg);
 
+	if (priv->hibernated) {
+		/* Currently USB stack calls this function while hibernated,
+		 * for example if usbd_disable() is called. We cannot access the
+		 * real registers when hibernated, so just modify backup values
+		 * that will be restored on hibernation exit.
+		 */
+		if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+			dxepctl = priv->backup.doepctl[ep_idx];
+
+			dxepctl &= ~USB_DWC2_DEPCTL_EPENA;
+			if (stall) {
+				dxepctl |= USB_DWC2_DEPCTL_STALL;
+			} else {
+				dxepctl |= USB_DWC2_DEPCTL_SNAK;
+			}
+
+			priv->backup.doepctl[ep_idx] = dxepctl;
+		} else {
+			dxepctl = priv->backup.diepctl[ep_idx];
+
+			dxepctl &= ~USB_DWC2_DEPCTL_EPENA;
+			dxepctl |= USB_DWC2_DEPCTL_SNAK;
+			if (stall) {
+				dxepctl |= USB_DWC2_DEPCTL_STALL;
+			}
+
+			priv->backup.diepctl[ep_idx] = dxepctl;
+
+			priv->pending_tx_flush |= BIT(usb_dwc2_get_depctl_txfnum(dxepctl));
+		}
+
+		udc_ep_set_busy(cfg, false);
+		return;
+	}
+
 	if (!is_iso && (dxepctl & USB_DWC2_DEPCTL_NAKSTS)) {
 		/* Endpoint already sends forced NAKs. STALL if necessary. */
 		if (stall) {
@@ -1588,7 +1652,7 @@ static void udc_dwc2_ep_disable(const struct device *dev,
 		dwc2_flush_tx_fifo(dev, usb_dwc2_get_depctl_txfnum(dxepctl));
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 }
 
 /* Deactivated endpoint means that there will be a bus timeout when the host
@@ -1625,15 +1689,6 @@ static int udc_dwc2_ep_deactivate(const struct device *dev,
 	sys_write32(dxepctl, dxepctl_reg);
 	dwc2_set_epint(dev, cfg, false);
 
-	if (cfg->addr == USB_CONTROL_EP_OUT) {
-		struct net_buf *buf = udc_buf_get_all(dev, cfg->addr);
-
-		/* Release the buffer allocated in dwc2_ctrl_feed_dout() */
-		if (buf) {
-			net_buf_unref(buf);
-		}
-	}
-
 	return 0;
 }
 
@@ -1671,16 +1726,16 @@ static int udc_dwc2_ep_clear_halt(const struct device *dev,
 	cfg->stat.halted = false;
 
 	/* Resume queued transfers if any */
-	if (udc_buf_peek(dev, cfg->addr)) {
-		uint32_t ep_bit;
+	if (udc_buf_peek(cfg)) {
+		int ep_bit;
 
 		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
+			ep_bit = USB_EP_GET_IDX(cfg->addr);
 		} else {
-			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
+			ep_bit = 16 + USB_EP_GET_IDX(cfg->addr);
 		}
 
-		k_event_post(&priv->xfer_new, ep_bit);
+		atomic_set_bit(&priv->xfer_new, ep_bit);
 		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 	}
 
@@ -1697,15 +1752,15 @@ static int udc_dwc2_ep_enqueue(const struct device *dev,
 	udc_buf_put(cfg, buf);
 
 	if (!cfg->stat.halted) {
-		uint32_t ep_bit;
+		int ep_bit;
 
 		if (USB_EP_DIR_IS_IN(cfg->addr)) {
-			ep_bit = BIT(USB_EP_GET_IDX(cfg->addr));
+			ep_bit = USB_EP_GET_IDX(cfg->addr);
 		} else {
-			ep_bit = BIT(16 + USB_EP_GET_IDX(cfg->addr));
+			ep_bit = 16 + USB_EP_GET_IDX(cfg->addr);
 		}
 
-		k_event_post(&priv->xfer_new, ep_bit);
+		atomic_set_bit(&priv->xfer_new, ep_bit);
 		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 	}
 
@@ -1719,12 +1774,12 @@ static int udc_dwc2_ep_dequeue(const struct device *dev,
 
 	udc_dwc2_ep_disable(dev, cfg, false);
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	LOG_DBG("dequeue ep 0x%02x", cfg->addr);
 
@@ -1839,10 +1894,16 @@ static int dwc2_core_soft_reset(const struct device *dev)
 		}
 
 		k_busy_wait(1);
+
+		if (dwc2_quirk_is_phy_clk_off(dev)) {
+			/* Software reset won't finish without PHY clock */
+			return -EIO;
+		}
 	} while (sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRST &&
 		 !(sys_read32(grstctl_reg) & USB_DWC2_GRSTCTL_CSFTRSTDONE));
 
-	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST | USB_DWC2_GRSTCTL_CSFTRSTDONE);
+	/* CSFTRSTDONE is W1C so the write must have the bit set to clear it */
+	sys_clear_bits(grstctl_reg, USB_DWC2_GRSTCTL_CSFTRST);
 
 	return 0;
 }
@@ -1980,15 +2041,21 @@ static int udc_dwc2_init_controller(const struct device *dev)
 	case USB_DWC2_GHWCFG2_HSPHYTYPE_ULPI:
 		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
 			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_ULPI;
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
-			<< USB_DWC2_DCFG_DEVSPD_POS;
+		if (IS_ENABLED(CONFIG_UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED)) {
+			dcfg |= usb_dwc2_set_dcfg_devspd(USB_DWC2_DCFG_DEVSPD_USBHS20);
+		} else {
+			dcfg |= usb_dwc2_set_dcfg_devspd(USB_DWC2_DCFG_DEVSPD_USBFS20);
+		}
 		hs_phy = true;
 		break;
 	case USB_DWC2_GHWCFG2_HSPHYTYPE_UTMIPLUS:
 		gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB20 |
 			   USB_DWC2_GUSBCFG_ULPI_UTMI_SEL_UTMI;
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBHS20
-			<< USB_DWC2_DCFG_DEVSPD_POS;
+		if (IS_ENABLED(CONFIG_UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED)) {
+			dcfg |= usb_dwc2_set_dcfg_devspd(USB_DWC2_DCFG_DEVSPD_USBHS20);
+		} else {
+			dcfg |= usb_dwc2_set_dcfg_devspd(USB_DWC2_DCFG_DEVSPD_USBFS20);
+		}
 		hs_phy = true;
 		break;
 	case USB_DWC2_GHWCFG2_HSPHYTYPE_NO_HS:
@@ -1999,8 +2066,7 @@ static int udc_dwc2_init_controller(const struct device *dev)
 			gusbcfg |= USB_DWC2_GUSBCFG_PHYSEL_USB11;
 		}
 
-		dcfg |= USB_DWC2_DCFG_DEVSPD_USBFS1148
-			<< USB_DWC2_DCFG_DEVSPD_POS;
+		dcfg |= usb_dwc2_set_dcfg_devspd(USB_DWC2_DCFG_DEVSPD_USBFS1148);
 		hs_phy = false;
 	}
 
@@ -2141,10 +2207,9 @@ static int udc_dwc2_disable(const struct device *dev)
 	struct udc_dwc2_data *const priv = udc_get_private(dev);
 	struct usb_dwc2_reg *const base = dwc2_get_base(dev);
 	mem_addr_t dctl_reg = (mem_addr_t)&base->dctl;
+	struct net_buf *buf;
 	int err;
 
-	/* Enable soft disconnect */
-	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
 	LOG_DBG("Disable device %p", dev);
 
 	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
@@ -2162,10 +2227,27 @@ static int udc_dwc2_disable(const struct device *dev)
 	if (priv->hibernated) {
 		dwc2_exit_hibernation(dev, false, true);
 		priv->hibernated = 0;
+		priv->pending_tx_flush = 0;
 	}
 
 	sys_clear_bits((mem_addr_t)&base->gahbcfg, USB_DWC2_GAHBCFG_GLBINTRMASK);
 
+	/* Enable soft disconnect */
+	sys_set_bits(dctl_reg, USB_DWC2_DCTL_SFTDISCON);
+
+	/* OUT endpoint 0 cannot be disabled by software. The buffer allocated
+	 * in dwc2_ctrl_feed_dout() can only be freed after core reset if the
+	 * core was in Buffer DMA mode.
+	 *
+	 * Soft Reset does timeout if PHY clock is not running. However, just
+	 * triggering Soft Reset seems to be enough on shutdown clean up.
+	 */
+	dwc2_core_soft_reset(dev);
+	buf = udc_buf_get_all(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT));
+	if (buf) {
+		net_buf_unref(buf);
+	}
+
 	err = dwc2_quirk_disable(dev);
 	if (err) {
 		LOG_ERR("Quirk disable failed %d", err);
@@ -2214,8 +2296,8 @@ static int dwc2_driver_preinit(const struct device *dev)
 	k_mutex_init(&data->mutex);
 
 	k_event_init(&priv->drv_evt);
-	k_event_init(&priv->xfer_new);
-	k_event_init(&priv->xfer_finished);
+	atomic_clear(&priv->xfer_new);
+	atomic_clear(&priv->xfer_finished);
 
 	data->caps.rwup = true;
 	data->caps.addr_before_status = true;
@@ -2318,12 +2400,14 @@ static int dwc2_driver_preinit(const struct device *dev)
 
 static void udc_dwc2_lock(const struct device *dev)
 {
+	k_sched_lock();
 	udc_lock_internal(dev, K_FOREVER);
 }
 
 static void udc_dwc2_unlock(const struct device *dev)
 {
 	udc_unlock_internal(dev);
+	k_sched_unlock();
 }
 
 static void dwc2_on_bus_reset(const struct device *dev)
@@ -2437,7 +2521,7 @@ static inline void dwc2_handle_rxflvl(const struct device *dev)
 	case USB_DWC2_GRXSTSR_PKTSTS_OUT_DATA:
 		ep_cfg = udc_get_ep_cfg(dev, ep);
 
-		buf = udc_buf_peek(dev, ep_cfg->addr);
+		buf = udc_buf_peek(ep_cfg);
 
 		/* RxFIFO data must be retrieved even when buf is NULL */
 		dwc2_read_fifo(dev, ep, buf, bcnt);
@@ -2463,7 +2547,7 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 	struct net_buf *buf;
 
 	ep_cfg = udc_get_ep_cfg(dev, ep_idx | USB_EP_DIR_IN);
-	buf = udc_buf_peek(dev, ep_cfg->addr);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return;
@@ -2474,7 +2558,7 @@ static inline void dwc2_handle_in_xfercompl(const struct device *dev,
 		return;
 	}
 
-	k_event_post(&priv->xfer_finished, BIT(ep_idx));
+	atomic_set_bit(&priv->xfer_finished, ep_idx);
 	k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 }
 
@@ -2526,7 +2610,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 
 	doeptsiz = sys_read32((mem_addr_t)&base->out_ep[ep_idx].doeptsiz);
 
-	buf = udc_buf_peek(dev, ep_cfg->addr);
+	buf = udc_buf_peek(ep_cfg);
 	if (!buf) {
 		LOG_ERR("No buffer for ep 0x%02x", ep_cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -2580,7 +2664,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 	    net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg);
 	} else {
-		k_event_post(&priv->xfer_finished, BIT(16 + ep_idx));
+		atomic_set_bit(&priv->xfer_finished, 16 + ep_idx);
 		k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 	}
 }
@@ -2695,7 +2779,7 @@ static void dwc2_handle_incompisoin(const struct device *dev)
 
 				udc_dwc2_ep_disable(dev, cfg, false);
 
-				buf = udc_buf_get(dev, cfg->addr);
+				buf = udc_buf_get(cfg);
 				if (buf) {
 					/* Data is no longer relevant */
 					udc_submit_ep_event(dev, buf, 0);
@@ -2750,7 +2834,7 @@ static void dwc2_handle_incompisoout(const struct device *dev)
 
 				udc_dwc2_ep_disable(dev, cfg, false);
 
-				buf = udc_buf_get(dev, cfg->addr);
+				buf = udc_buf_get(cfg);
 				if (buf) {
 					udc_submit_ep_event(dev, buf, 0);
 				}
@@ -2911,19 +2995,26 @@ static void dwc2_handle_hibernation_exit(const struct device *dev,
 
 	if (bus_reset) {
 		/* Clear all pending transfers */
-		k_event_clear(&priv->xfer_new, UINT32_MAX);
-		k_event_clear(&priv->xfer_finished, UINT32_MAX);
+		atomic_clear(&priv->xfer_new);
+		atomic_clear(&priv->xfer_finished);
 		dwc2_on_bus_reset(dev);
 	} else {
 		/* Resume any pending transfer handling */
-		if (k_event_test(&priv->xfer_new, UINT32_MAX)) {
+		if (atomic_get(&priv->xfer_new)) {
 			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_XFER));
 		}
 
-		if (k_event_test(&priv->xfer_finished, UINT32_MAX)) {
+		if (atomic_get(&priv->xfer_finished)) {
 			k_event_post(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 		}
 	}
+
+	while (priv->pending_tx_flush) {
+		unsigned int fifo = find_lsb_set(priv->pending_tx_flush) - 1;
+
+		priv->pending_tx_flush &= ~BIT(fifo);
+		dwc2_flush_tx_fifo(dev, fifo);
+	}
 }
 
 static uint8_t pull_next_ep_from_bitmap(uint32_t *bitmap)
@@ -2968,8 +3059,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 
 		if (!priv->hibernated) {
 			LOG_DBG("New transfer(s) in the queue");
-			eps = k_event_test(&priv->xfer_new, UINT32_MAX);
-			k_event_clear(&priv->xfer_new, eps);
+			eps = atomic_clear(&priv->xfer_new);
 		} else {
 			/* Events will be handled after hibernation exit */
 			eps = 0;
@@ -2979,7 +3069,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 			ep = pull_next_ep_from_bitmap(&eps);
 			ep_cfg = udc_get_ep_cfg(dev, ep);
 
-			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
+			if (!udc_ep_is_busy(ep_cfg)) {
 				dwc2_handle_xfer_next(dev, ep_cfg);
 			} else {
 				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
@@ -2991,8 +3081,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 		k_event_clear(&priv->drv_evt, BIT(DWC2_DRV_EVT_EP_FINISHED));
 
 		if (!priv->hibernated) {
-			eps = k_event_test(&priv->xfer_finished, UINT32_MAX);
-			k_event_clear(&priv->xfer_finished, eps);
+			eps = atomic_clear(&priv->xfer_finished);
 		} else {
 			/* Events will be handled after hibernation exit */
 			eps = 0;
@@ -3010,7 +3099,7 @@ static ALWAYS_INLINE void dwc2_thread_handler(void *const arg)
 				dwc2_handle_evt_dout(dev, ep_cfg);
 			}
 
-			if (!udc_ep_is_busy(dev, ep_cfg->addr)) {
+			if (!udc_ep_is_busy(ep_cfg)) {
 				dwc2_handle_xfer_next(dev, ep_cfg);
 			} else {
 				LOG_DBG("ep 0x%02x busy", ep_cfg->addr);
diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index f45404c2b8477..0a10218813990 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -199,6 +199,11 @@ static inline int usbhs_enable_core(const struct device *dev)
 	}
 
 	wrapper->ENABLE = USBHS_ENABLE_PHY_Msk | USBHS_ENABLE_CORE_Msk;
+
+	/* Wait for PHY clock to start */
+	k_busy_wait(45);
+
+	/* Release DWC2 reset */
 	wrapper->TASKS_START = 1UL;
 
 	/* Wait for clock to start to avoid hang on too early register read */
@@ -218,7 +223,6 @@ static inline int usbhs_disable_core(const struct device *dev)
 	wrapper->INTENCLR = 1UL;
 
 	wrapper->ENABLE = 0UL;
-	wrapper->TASKS_START = 1UL;
 
 	return 0;
 }
diff --git a/drivers/usb/udc/udc_it82xx2.c b/drivers/usb/udc/udc_it82xx2.c
index 0c61b7b17db87..85ec9431c6352 100644
--- a/drivers/usb/udc/udc_it82xx2.c
+++ b/drivers/usb/udc/udc_it82xx2.c
@@ -506,12 +506,12 @@ static int it82xx2_ep_dequeue(const struct device *dev, struct udc_ep_config *co
 	}
 	irq_unlock(lock_key);
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	return 0;
 }
@@ -861,16 +861,17 @@ static int work_handler_xfer_continue(const struct device *dev, uint8_t ep, stru
 	return ret;
 }
 
-static int work_handler_xfer_next(const struct device *dev, uint8_t ep)
+static int work_handler_xfer_next(const struct device *dev,
+				  struct udc_ep_config *ep_cfg)
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	return work_handler_xfer_continue(dev, ep, buf);
+	return work_handler_xfer_continue(dev, ep_cfg->addr, buf);
 }
 
 /*
@@ -984,11 +985,12 @@ static inline int work_handler_in(const struct device *dev, uint8_t ep)
 		k_sem_give(&priv->fifo_sem[fifo_idx - 1]);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
-	ep_cfg = udc_get_ep_cfg(dev, ep);
 
 	net_buf_pull(buf, MIN(buf->len, udc_mps_ep_size(ep_cfg)));
 
@@ -1005,12 +1007,12 @@ static inline int work_handler_in(const struct device *dev, uint8_t ep)
 		return 0;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) || udc_ctrl_stage_is_no_data(dev)) {
@@ -1042,10 +1044,13 @@ static inline int work_handler_setup(const struct device *dev, uint8_t ep)
 	int err = 0;
 
 	if (udc_ctrl_stage_is_status_out(dev)) {
+		struct udc_ep_config *cfg_out;
+
 		/* out -> setup */
-		buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+		cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+		buf = udc_buf_get(cfg_out);
 		if (buf) {
-			udc_ep_set_busy(dev, USB_CONTROL_EP_OUT, false);
+			udc_ep_set_busy(cfg_out, false);
 			net_buf_unref(buf);
 		}
 	}
@@ -1109,7 +1114,8 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
@@ -1121,7 +1127,7 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 	if (ep == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev) && len != 0) {
 			LOG_DBG("Handle early setup token");
-			buf = udc_buf_get(dev, ep);
+			buf = udc_buf_get(ep_cfg);
 			/* Notify upper layer */
 			udc_ctrl_submit_status(dev, buf);
 			/* Update to next stage of control transfer */
@@ -1130,7 +1136,6 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 		}
 	}
 
-	ep_cfg = udc_get_ep_cfg(dev, ep);
 	if (len > udc_mps_ep_size(ep_cfg)) {
 		LOG_ERR("Failed to handle this packet due to the packet size");
 		return -ENOBUFS;
@@ -1148,12 +1153,12 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 		return err;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	if (ep == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -1179,11 +1184,14 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 static void xfer_work_handler(const struct device *dev)
 {
 	while (true) {
+		struct udc_ep_config *ep_cfg;
 		struct it82xx2_ep_event evt;
 		int err = 0;
 
 		k_msgq_get(&evt_msgq, &evt, K_FOREVER);
 
+		ep_cfg = udc_get_ep_cfg(evt.dev, evt.ep);
+
 		switch (evt.event) {
 		case IT82xx2_EVT_SETUP_TOKEN:
 			err = work_handler_setup(evt.dev, evt.ep);
@@ -1206,9 +1214,9 @@ static void xfer_work_handler(const struct device *dev)
 			udc_submit_event(evt.dev, UDC_EVT_ERROR, err);
 		}
 
-		if (evt.ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(evt.dev, evt.ep)) {
-			if (work_handler_xfer_next(evt.dev, evt.ep) == 0) {
-				udc_ep_set_busy(evt.dev, evt.ep, true);
+		if (evt.ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(ep_cfg)) {
+			if (work_handler_xfer_next(dev, ep_cfg) == 0) {
+				udc_ep_set_busy(ep_cfg, true);
 			}
 		}
 	}
diff --git a/drivers/usb/udc/udc_kinetis.c b/drivers/usb/udc/udc_kinetis.c
index 70fae41b48718..19e1f865efa49 100644
--- a/drivers/usb/udc/udc_kinetis.c
+++ b/drivers/usb/udc/udc_kinetis.c
@@ -221,7 +221,7 @@ static int usbfsotg_xfer_next(const struct device *dev,
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
@@ -317,7 +317,7 @@ static inline int work_handler_setup(const struct device *dev)
 	struct net_buf *buf;
 	int err;
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT));
 	if (buf == NULL) {
 		return -ENODATA;
 	}
@@ -365,17 +365,17 @@ static inline int work_handler_setup(const struct device *dev)
 }
 
 static inline int work_handler_out(const struct device *dev,
-				   const uint8_t ep)
+				   struct udc_ep_config *ep_cfg)
 {
 	struct net_buf *buf;
 	int err = 0;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	if (ep == USB_CONTROL_EP_OUT) {
+	if (ep_cfg->addr == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
 			/* s-in-status finished, next bd is already fed */
 			LOG_DBG("dout:%p|no feed", buf);
@@ -404,16 +404,16 @@ static inline int work_handler_out(const struct device *dev,
 }
 
 static inline int work_handler_in(const struct device *dev,
-				  const uint8_t ep)
+				  struct udc_ep_config *ep_cfg)
 {
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 	if (buf == NULL) {
 		return -ENODATA;
 	}
 
-	if (ep == USB_CONTROL_EP_IN) {
+	if (ep_cfg->addr == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
 		    udc_ctrl_stage_is_no_data(dev)) {
 			/* Status stage finished, notify upper layer */
@@ -482,12 +482,12 @@ static void xfer_work_handler(struct k_work *item)
 			err = work_handler_setup(ev->dev);
 			break;
 		case USBFSOTG_EVT_DOUT:
-			err = work_handler_out(ev->dev, ev->ep);
-			udc_ep_set_busy(ev->dev, ev->ep, false);
+			err = work_handler_out(ev->dev, ep_cfg);
+			udc_ep_set_busy(ep_cfg, false);
 			break;
 		case USBFSOTG_EVT_DIN:
-			err = work_handler_in(ev->dev, ev->ep);
-			udc_ep_set_busy(ev->dev, ev->ep, false);
+			err = work_handler_in(ev->dev, ep_cfg);
+			udc_ep_set_busy(ep_cfg, false);
 			break;
 		case USBFSOTG_EVT_CLEAR_HALT:
 			err = usbfsotg_ep_clear_halt(ev->dev, ep_cfg);
@@ -501,9 +501,9 @@ static void xfer_work_handler(struct k_work *item)
 		}
 
 		/* Peek next transfer */
-		if (ev->ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(ev->dev, ev->ep)) {
+		if (ev->ep != USB_CONTROL_EP_OUT && !udc_ep_is_busy(ep_cfg)) {
 			if (usbfsotg_xfer_next(ev->dev, ep_cfg) == 0) {
-				udc_ep_set_busy(ev->dev, ev->ep, true);
+				udc_ep_set_busy(ep_cfg, true);
 			}
 		}
 
@@ -584,7 +584,7 @@ static ALWAYS_INLINE void isr_handle_xfer_done(const struct device *dev,
 			priv->busy[odd] = false;
 			priv->out_buf[odd] = NULL;
 		} else {
-			buf = udc_buf_peek(dev, ep_cfg->addr);
+			buf = udc_buf_peek(ep_cfg);
 		}
 
 		if (buf == NULL) {
@@ -614,7 +614,7 @@ static ALWAYS_INLINE void isr_handle_xfer_done(const struct device *dev,
 		ep_cfg->stat.odd = !odd;
 		ep_cfg->stat.data1 = !data1;
 
-		buf = udc_buf_peek(dev, ep_cfg->addr);
+		buf = udc_buf_peek(ep_cfg);
 		if (buf == NULL) {
 			LOG_ERR("No buffer for ep 0x%02x", ep);
 			udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -740,12 +740,12 @@ static int usbfsotg_ep_dequeue(const struct device *dev,
 	irq_unlock(lock_key);
 
 	cfg->stat.halted = false;
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	return 0;
 }
diff --git a/drivers/usb/udc/udc_max32.c b/drivers/usb/udc/udc_max32.c
new file mode 100644
index 0000000000000..1e09f5ef7c6dd
--- /dev/null
+++ b/drivers/usb/udc/udc_max32.c
@@ -0,0 +1,852 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "udc_common.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/usb/udc.h>
+
+#include <wrap_max32_usb.h>
+#include <zephyr/drivers/clock_control/adi_max32_clock_control.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(udc_max32, CONFIG_UDC_DRIVER_LOG_LEVEL);
+
+#define DT_DRV_COMPAT adi_max32_usbhs
+
+enum udc_max32_event_type {
+	/* Shim driver event to trigger transfer */
+	UDC_MAX32_EVT_XFER,
+	/* Setup event */
+	UDC_MAX32_EVT_SETUP,
+};
+
+struct udc_max32_evt {
+	enum udc_max32_event_type type;
+	struct udc_ep_config *ep_cfg;
+};
+
+K_MSGQ_DEFINE(drv_msgq, sizeof(struct udc_max32_evt), CONFIG_UDC_MAX32_MAX_QMESSAGES,
+	      sizeof(uint32_t));
+
+struct udc_max32_config {
+	mxc_usbhs_regs_t *base;
+	size_t num_of_in_eps;
+	size_t num_of_out_eps;
+	struct udc_ep_config *ep_cfg_in;
+	struct udc_ep_config *ep_cfg_out;
+	void (*make_thread)(const struct device *dev);
+	int speed_idx;
+	const struct device *clock;
+	struct max32_perclk perclk;
+	void (*irq_func)(void);
+};
+
+struct req_cb_data {
+	const struct device *dev;
+	uint8_t ep;
+};
+
+struct udc_max32_data {
+	struct k_thread thread_data;
+	MXC_USB_Req_t *ep_request;
+	struct req_cb_data *req_cb_data;
+};
+
+static void udc_event_xfer_ctrl_status(const struct device *dev, struct net_buf *const buf)
+{
+	if (udc_ctrl_stage_is_status_in(dev) || udc_ctrl_stage_is_no_data(dev)) {
+		MXC_USB_Ackstat(0);
+
+		/* Status stage finished, notify upper layer */
+		udc_ctrl_submit_status(dev, buf);
+	}
+
+	if (udc_ctrl_stage_is_data_in(dev)) {
+		/*
+		 * s-in-[status] finished, release buffer.
+		 * Since the controller supports auto-status we cannot use
+		 * if (udc_ctrl_stage_is_status_out()) after state update.
+		 */
+		net_buf_unref(buf);
+	}
+
+	/* Update to next stage of control transfer */
+	udc_ctrl_update_stage(dev, buf);
+}
+
+static void udc_event_xfer_in_callback(void *cbdata)
+{
+	struct req_cb_data *req_cb_data = (struct req_cb_data *)cbdata;
+	struct udc_max32_data *priv = udc_get_private(req_cb_data->dev);
+	MXC_USB_Req_t *ep_request = &priv->ep_request[USB_EP_GET_IDX(req_cb_data->ep)];
+	struct net_buf *buf;
+
+	buf = udc_buf_get(udc_get_ep_cfg(req_cb_data->dev, req_cb_data->ep));
+
+	udc_ep_set_busy(udc_get_ep_cfg(req_cb_data->dev, req_cb_data->ep), false);
+
+	if (ep_request->error_code) {
+		LOG_ERR("ep 0x%02x error: %x", req_cb_data->ep, ep_request->error_code);
+		udc_submit_ep_event(req_cb_data->dev, buf, ep_request->error_code);
+		return;
+	}
+
+	if (udc_ep_buf_has_zlp(buf)) {
+		udc_ep_buf_clear_zlp(buf);
+	}
+
+	if (req_cb_data->ep == USB_CONTROL_EP_IN) {
+		udc_event_xfer_ctrl_status(req_cb_data->dev, buf);
+	} else {
+		udc_submit_ep_event(req_cb_data->dev, buf, 0);
+	}
+}
+
+static void udc_event_xfer_out_callback(void *cbdata)
+{
+	struct req_cb_data *req_cb_data = (struct req_cb_data *)cbdata;
+	struct udc_max32_data *priv = udc_get_private(req_cb_data->dev);
+	MXC_USB_Req_t *ep_request = &priv->ep_request[USB_EP_GET_IDX(req_cb_data->ep)];
+	struct net_buf *buf;
+
+	buf = udc_buf_get(udc_get_ep_cfg(req_cb_data->dev, req_cb_data->ep));
+	net_buf_add(buf, ep_request->actlen);
+
+	udc_ep_set_busy(udc_get_ep_cfg(req_cb_data->dev, req_cb_data->ep), false);
+
+	if (ep_request->error_code) {
+		LOG_ERR("ep 0x%02x error: %x", req_cb_data->ep, ep_request->error_code);
+		udc_submit_ep_event(req_cb_data->dev, buf, ep_request->error_code);
+		return;
+	}
+
+	if (req_cb_data->ep == USB_CONTROL_EP_OUT) {
+		/* Update to next stage of control transfer */
+		udc_ctrl_update_stage(req_cb_data->dev, buf);
+
+		udc_ctrl_submit_s_out_status(req_cb_data->dev, buf);
+	} else {
+		udc_submit_ep_event(req_cb_data->dev, buf, 0);
+	}
+}
+
+static void udc_event_xfer_in(const struct device *dev, struct udc_ep_config *ep_cfg)
+{
+	struct udc_max32_data *priv = udc_get_private(dev);
+	MXC_USB_Req_t *ep_request = &priv->ep_request[USB_EP_GET_IDX(ep_cfg->addr)];
+	struct req_cb_data *req_cb_data = &priv->req_cb_data[USB_EP_GET_IDX(ep_cfg->addr)];
+	struct net_buf *buf;
+	int ret;
+
+	if (udc_ep_is_busy(ep_cfg)) {
+		return;
+	}
+
+	memset(ep_request, 0, sizeof(MXC_USB_Req_t));
+
+	buf = udc_buf_peek(ep_cfg);
+	if (buf == NULL) {
+		LOG_ERR("Failed to peek net_buf for ep 0x%02x", ep_cfg->addr);
+		return;
+	}
+
+	if (buf->len == 0 && ep_cfg->addr == USB_CONTROL_EP_IN) {
+		buf = udc_buf_get(ep_cfg);
+		udc_event_xfer_ctrl_status(dev, buf);
+		return;
+	}
+
+	req_cb_data->dev = dev;
+	req_cb_data->ep = ep_cfg->addr;
+
+	ep_request->ep = USB_EP_GET_IDX(ep_cfg->addr);
+	ep_request->data = buf->data;
+	ep_request->reqlen = buf->len;
+	ep_request->actlen = 0;
+	ep_request->error_code = 0;
+	ep_request->callback = udc_event_xfer_in_callback;
+	ep_request->cbdata = req_cb_data;
+	if (udc_ep_buf_has_zlp(buf)) {
+		ep_request->has_zlp = true;
+	}
+
+	udc_ep_set_busy(ep_cfg, true);
+	ret = MXC_USB_WriteEndpoint(ep_request);
+	if (ret != 0) {
+		udc_ep_set_busy(ep_cfg, false);
+		LOG_ERR("ep 0x%02x error: %x", ep_cfg->addr, ret);
+		udc_submit_ep_event(dev, buf, -ECONNREFUSED);
+	}
+}
+
+static void udc_event_xfer_out(const struct device *dev, struct udc_ep_config *ep_cfg)
+{
+	struct udc_max32_data *priv = udc_get_private(dev);
+	MXC_USB_Req_t *ep_request = &priv->ep_request[USB_EP_GET_IDX(ep_cfg->addr)];
+	struct req_cb_data *req_cb_data = &priv->req_cb_data[USB_EP_GET_IDX(ep_cfg->addr)];
+	struct net_buf *buf;
+	int ret;
+
+	if (udc_ep_is_busy(ep_cfg)) {
+		return;
+	}
+
+	buf = udc_buf_peek(ep_cfg);
+	if (buf == NULL) {
+		LOG_ERR("Failed to peek net_buf for ep 0x%02x", ep_cfg->addr);
+		return;
+	}
+
+	req_cb_data->dev = dev;
+	req_cb_data->ep = ep_cfg->addr;
+
+	ep_request->ep = USB_EP_GET_IDX(ep_cfg->addr);
+	ep_request->data = buf->data;
+	ep_request->reqlen = buf->size;
+	ep_request->actlen = 0;
+	ep_request->error_code = 0;
+	ep_request->callback = udc_event_xfer_out_callback;
+	ep_request->cbdata = req_cb_data;
+	ep_request->type = MAXUSB_TYPE_PKT;
+
+	udc_ep_set_busy(ep_cfg, true);
+	ret = MXC_USB_ReadEndpoint(ep_request);
+	if (ret != 0) {
+		udc_ep_set_busy(ep_cfg, false);
+		LOG_ERR("ep 0x%02x error: %x", ep_cfg->addr, ret);
+		udc_submit_ep_event(dev, buf, -ECONNREFUSED);
+	}
+}
+
+static int udc_ctrl_feed_dout(const struct device *dev, const size_t length)
+{
+	struct udc_max32_data *priv = udc_get_private(dev);
+	const struct udc_max32_config *config = dev->config;
+	MXC_USB_Req_t *ep_request = &priv->ep_request[USB_EP_GET_IDX(USB_CONTROL_EP_OUT)];
+	struct req_cb_data *req_cb_data = &priv->req_cb_data[USB_EP_GET_IDX(USB_CONTROL_EP_OUT)];
+	struct net_buf *buf;
+	int ret;
+
+	/* Allocate buffer for data stage OUT */
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, length);
+	if (buf == NULL) {
+		return -ENOMEM;
+	}
+	memset(buf->data, 0, length);
+	udc_buf_put(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT), buf);
+
+	req_cb_data->dev = dev;
+	req_cb_data->ep = USB_CONTROL_EP_OUT;
+
+	ep_request->ep = USB_EP_GET_IDX(USB_CONTROL_EP_OUT);
+	ep_request->data = buf->data;
+	ep_request->reqlen = length;
+	ep_request->actlen = 0;
+	ep_request->error_code = 0;
+	ep_request->callback = udc_event_xfer_out_callback;
+	ep_request->cbdata = req_cb_data;
+	ep_request->type = MAXUSB_TYPE_TRANS;
+
+	ret = MXC_USB_ReadEndpoint(ep_request);
+	if (ret != 0) {
+		LOG_ERR("ep 0x%02x error: %x", USB_CONTROL_EP_OUT, ret);
+		udc_submit_ep_event(dev, buf, -ECONNREFUSED);
+	}
+
+	/*
+	 * Set the SERV_OUTPKTRDY bit to trigger the interrupt after creating a read request.
+	 * Otherwise program miss this interrupt because of race condition.
+	 */
+	config->base->csr0 |= MXC_F_USBHS_CSR0_SERV_OUTPKTRDY;
+
+	return ret;
+}
+
+static int udc_event_setup(const struct device *dev)
+{
+	const struct udc_max32_config *config = dev->config;
+	struct net_buf *buf;
+	int ret;
+
+	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, sizeof(struct usb_setup_packet));
+	if (buf == NULL) {
+		LOG_ERR("Failed to allocate for setup");
+		return -ENOMEM;
+	}
+
+	udc_ep_buf_set_setup(buf);
+	memset(buf->data, 0, sizeof(MXC_USB_SetupPkt));
+	if (MXC_USB_GetSetup((MXC_USB_SetupPkt *)buf->data) < 0) {
+		LOG_ERR("Failed to get setup data");
+		return -1;
+	}
+	net_buf_add(buf, sizeof(MXC_USB_SetupPkt));
+
+	/* Update to next stage of control transfer */
+	udc_ctrl_update_stage(dev, buf);
+
+	if (udc_ctrl_stage_is_data_out(dev)) {
+		/*  Allocate and feed buffer for data OUT stage */
+		LOG_DBG("s:%p|feed for -out-", buf);
+		ret = udc_ctrl_feed_dout(dev, udc_data_stage_length(buf));
+		if (ret == -ENOMEM) {
+			ret = udc_submit_ep_event(dev, buf, ret);
+		}
+	} else if (udc_ctrl_stage_is_data_in(dev)) {
+		/*
+		 * Moved following line from MSDK driver to here because of the solution of
+		 * ctrl_data_out stage's problem.
+		 */
+		config->base->csr0 |= MXC_F_USBHS_CSR0_SERV_OUTPKTRDY;
+		LOG_INF("Setup: IN");
+		ret = udc_ctrl_submit_s_in_status(dev);
+	} else {
+		ret = udc_ctrl_submit_s_status(dev);
+	}
+
+	return ret;
+}
+
+static ALWAYS_INLINE void max32_thread_handler(void *const arg)
+{
+	const struct device *dev = (const struct device *)arg;
+
+	LOG_DBG("Driver %p thread started", dev);
+	while (true) {
+		bool start_xfer = false;
+		struct udc_max32_evt evt;
+
+		k_msgq_get(&drv_msgq, &evt, K_FOREVER);
+
+		switch (evt.type) {
+		case UDC_MAX32_EVT_SETUP:
+			udc_event_setup(dev);
+			break;
+		case UDC_MAX32_EVT_XFER:
+			start_xfer = true;
+			break;
+		default:
+			break;
+		}
+
+		if (start_xfer) {
+			if (USB_EP_DIR_IS_IN(evt.ep_cfg->addr)) {
+				udc_event_xfer_in(dev, evt.ep_cfg);
+			} else {
+				udc_event_xfer_out(dev, evt.ep_cfg);
+			}
+		}
+	}
+}
+
+static int udc_max32_ep_enqueue(const struct device *dev, struct udc_ep_config *const cfg,
+				struct net_buf *buf)
+{
+	struct udc_max32_evt evt = {
+		.type = UDC_MAX32_EVT_XFER,
+		.ep_cfg = cfg,
+	};
+
+	LOG_DBG("%p enqueue %p", dev, buf);
+	udc_buf_put(cfg, buf);
+
+	if (cfg->stat.halted) {
+		LOG_DBG("ep 0x%02x halted", cfg->addr);
+		return 0;
+	}
+
+	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+
+	return 0;
+}
+
+static int udc_max32_ep_dequeue(const struct device *dev, struct udc_ep_config *const cfg)
+{
+	unsigned int lock_key;
+	struct net_buf *buf;
+
+	lock_key = irq_lock();
+
+	buf = udc_buf_get_all(cfg);
+	if (buf) {
+		udc_submit_ep_event(dev, buf, -ECONNABORTED);
+	} else {
+		LOG_INF("ep 0x%02x queue is empty", cfg->addr);
+	}
+
+	irq_unlock(lock_key);
+
+	return 0;
+}
+
+static int udc_max32_ep_enable(const struct device *dev, struct udc_ep_config *const cfg)
+{
+	maxusb_ep_type_t ep_type;
+	int ret;
+
+	if (USB_EP_GET_IDX(cfg->addr) == 0) {
+		return 0;
+	}
+
+	if (cfg->caps.in) {
+		ep_type = MAXUSB_EP_TYPE_IN;
+	} else if (cfg->caps.out) {
+		ep_type = MAXUSB_EP_TYPE_OUT;
+	} else {
+		LOG_ERR("ep 0x%02x is not IN or OUT", cfg->addr);
+		return -ENODEV;
+	}
+
+	ret = MXC_USB_ConfigEp(USB_EP_GET_IDX(cfg->addr), ep_type, cfg->mps);
+	if (ret != 0) {
+		LOG_ERR("Failed to configure ep 0x%02x", cfg->addr);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int udc_max32_ep_disable(const struct device *dev, struct udc_ep_config *const cfg)
+{
+	int ret;
+
+	if (USB_EP_GET_IDX(cfg->addr) == 0) {
+		return 0;
+	}
+
+	ret = MXC_USB_ResetEp(USB_EP_GET_IDX(cfg->addr));
+
+	return ret;
+}
+
+static int udc_max32_ep_set_halt(const struct device *dev, struct udc_ep_config *const cfg)
+{
+	int ret;
+
+	if (cfg->stat.halted == true) {
+		LOG_WRN("ep 0x%02x is already as halt", cfg->addr);
+		return 0;
+	}
+
+	LOG_DBG("Set halt ep 0x%02x", cfg->addr);
+
+	ret = MXC_USB_Stall(USB_EP_GET_IDX(cfg->addr));
+	if (ret != 0) {
+		LOG_ERR("Failed to set halt ep 0x%02x", cfg->addr);
+		return ret;
+	}
+
+	cfg->stat.halted = true;
+
+	return 0;
+}
+
+static int udc_max32_ep_clear_halt(const struct device *dev, struct udc_ep_config *const cfg)
+{
+	int ret;
+
+	if (cfg->stat.halted == false) {
+		LOG_WRN("ep 0x%02x is not set as halt, no need to clear halt.", cfg->addr);
+		return 0;
+	}
+
+	LOG_DBG("Clear halt ep 0x%02x", cfg->addr);
+
+	ret = MXC_USB_Unstall(USB_EP_GET_IDX(cfg->addr));
+	if (ret != 0) {
+		LOG_ERR("Failed to clear halt ep 0x%02x", cfg->addr);
+		return ret;
+	}
+
+	cfg->stat.halted = false;
+
+	/* If there is a request for this endpoint, enqueue the request. */
+	if (udc_buf_peek(cfg) != NULL) {
+		struct udc_max32_evt evt = {
+			.type = UDC_MAX32_EVT_XFER,
+			.ep_cfg = cfg,
+		};
+
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	}
+
+	return 0;
+}
+
+static int udc_max32_set_address(const struct device *dev, const uint8_t addr)
+{
+	int ret;
+
+	LOG_DBG("Set new address %u for %p", addr, dev);
+
+	ret = MXC_USB_SetFuncAddr(addr);
+	if (ret != 0) {
+		LOG_ERR("Failed to set device address %u", addr);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int udc_max32_host_wakeup(const struct device *dev)
+{
+	LOG_DBG("Remote wakeup from %p", dev);
+
+	MXC_USB_RemoteWakeup();
+
+	return 0;
+}
+
+static enum udc_bus_speed udc_max32_device_speed(const struct device *dev)
+{
+	struct udc_data *data = dev->data;
+
+	return data->caps.hs ? UDC_BUS_SPEED_HS : UDC_BUS_SPEED_FS;
+}
+
+static int udc_max32_event_callback(maxusb_event_t event, void *cbdata)
+{
+	const struct device *dev = (const struct device *)cbdata;
+
+	switch (event) {
+	case MAXUSB_EVENT_NOVBUS:
+		LOG_DBG("NOVBUS event occurred");
+		udc_submit_event(dev, UDC_EVT_VBUS_REMOVED, 0);
+		break;
+	case MAXUSB_EVENT_VBUS:
+		LOG_DBG("VBUS event occurred");
+		udc_submit_event(dev, UDC_EVT_VBUS_READY, 0);
+		break;
+	case MAXUSB_EVENT_SUSP:
+		LOG_DBG("SUSP event occurred");
+		udc_set_suspended(dev, true);
+		udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
+		break;
+	case MAXUSB_EVENT_DPACT:
+		LOG_DBG("DPACT event occurred");
+		udc_set_suspended(dev, false);
+		udc_submit_event(dev, UDC_EVT_SOF, 0);
+		break;
+	case MAXUSB_EVENT_BRST:
+		LOG_DBG("BRST event occurred");
+		udc_set_suspended(dev, false);
+		udc_submit_event(dev, UDC_EVT_RESET, 0);
+		break;
+	case MAXUSB_EVENT_SUDAV:
+		LOG_DBG("SUDAV event occurred");
+		struct udc_max32_evt evt = {
+			.type = UDC_MAX32_EVT_SETUP,
+			.ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT),
+		};
+
+		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		break;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+static int udc_max32_enable(const struct device *dev)
+{
+	int ret;
+
+	LOG_DBG("Enable device %p", dev);
+
+	MXC_USB_EventClear(MAXUSB_EVENT_SUDAV);
+	ret = MXC_USB_EventEnable(MAXUSB_EVENT_SUDAV, udc_max32_event_callback, (void *)dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable SUDAV event.");
+		return ret;
+	}
+
+	MXC_USB_EventClear(MAXUSB_EVENT_SUSP);
+	ret = MXC_USB_EventEnable(MAXUSB_EVENT_SUSP, udc_max32_event_callback, (void *)dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable SUSP event.");
+		return ret;
+	}
+
+	MXC_USB_EventClear(MAXUSB_EVENT_DPACT);
+	ret = MXC_USB_EventEnable(MAXUSB_EVENT_DPACT, udc_max32_event_callback, (void *)dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable DPACT event.");
+		return ret;
+	}
+
+	MXC_USB_EventClear(MAXUSB_EVENT_BRST);
+	ret = MXC_USB_EventEnable(MAXUSB_EVENT_BRST, udc_max32_event_callback, (void *)dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable BRST event.");
+		return ret;
+	}
+
+	ret = MXC_USB_Connect();
+
+	return ret;
+}
+
+static int udc_max32_disable(const struct device *dev)
+{
+	int ret;
+
+	LOG_DBG("Disable device %p", dev);
+	ret = MXC_USB_Disconnect();
+
+	return ret;
+}
+
+static void udc_max32_delay_us(unsigned int usec)
+{
+	k_usleep(usec);
+}
+
+static int udc_max32_init(const struct device *dev)
+{
+	const struct udc_max32_config *config = dev->config;
+	struct udc_data *data = dev->data;
+	maxusb_cfg_options_t usb_opts;
+	int ret;
+
+	if (data->caps.hs) {
+		usb_opts.enable_hs = 1;
+	}
+	usb_opts.delay_us = udc_max32_delay_us;
+	usb_opts.init_callback = NULL;
+	usb_opts.shutdown_callback = NULL;
+
+	/* Enable clock */
+	ret = clock_control_on(config->clock, (clock_control_subsys_t)&config->perclk);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable USB peripheral clock");
+		return ret;
+	}
+
+	MXC_SYS_Reset_Periph(MXC_SYS_RESET0_USB);
+
+	ret = Wrap_MXC_USB_Init(&usb_opts);
+	if (ret != 0) {
+		LOG_ERR("Failed to initialize USB.");
+		return ret;
+	}
+
+	ret = MXC_USB_EventEnable(MAXUSB_EVENT_NOVBUS, udc_max32_event_callback, (void *)dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable NOVBUS event.");
+		return ret;
+	}
+	ret = MXC_USB_EventEnable(MAXUSB_EVENT_VBUS, udc_max32_event_callback, (void *)dev);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable VBUS event.");
+		return ret;
+	}
+
+	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_OUT, USB_EP_TYPE_CONTROL, 64, 0)) {
+		LOG_ERR("Failed to enable control endpoint");
+		return -EIO;
+	}
+
+	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_IN, USB_EP_TYPE_CONTROL, 64, 0)) {
+		LOG_ERR("Failed to enable control endpoint");
+		return -EIO;
+	}
+
+	config->irq_func(); /* UDC IRQ enable*/
+
+	return 0;
+}
+
+static int udc_max32_shutdown(const struct device *dev)
+{
+	MXC_USB_Shutdown();
+	irq_disable(DT_INST_IRQN(0));
+
+	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
+		LOG_ERR("Failed to disable control endpoint");
+		return -EIO;
+	}
+
+	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_IN)) {
+		LOG_ERR("Failed to disable control endpoint");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int udc_max32_driver_preinit(const struct device *dev)
+{
+	const struct udc_max32_config *config = dev->config;
+	struct udc_data *data = dev->data;
+	uint16_t mps = 64;
+	int ret;
+
+	k_mutex_init(&data->mutex);
+
+	data->caps.rwup = true;
+	data->caps.can_detect_vbus = true;
+	data->caps.out_ack = true;
+	data->caps.mps0 = UDC_MPS0_64;
+	if (config->speed_idx == 2) {
+		data->caps.hs = true;
+		mps = 512;
+	}
+
+	for (int i = 0; i < config->num_of_out_eps; i++) {
+		config->ep_cfg_out[i].caps.out = 1;
+		if (i == 0) {
+			config->ep_cfg_out[i].caps.control = 1;
+			config->ep_cfg_out[i].caps.mps = 64;
+		} else {
+			config->ep_cfg_out[i].caps.bulk = 1;
+			config->ep_cfg_out[i].caps.interrupt = 1;
+			config->ep_cfg_out[i].caps.iso = 1;
+			config->ep_cfg_out[i].caps.mps = mps;
+		}
+
+		config->ep_cfg_out[i].addr = USB_EP_DIR_OUT | i;
+		ret = udc_register_ep(dev, &config->ep_cfg_out[i]);
+		if (ret != 0) {
+			LOG_ERR("Failed to register endpoint");
+			return ret;
+		}
+	}
+
+	for (int i = 0; i < config->num_of_in_eps; i++) {
+		config->ep_cfg_in[i].caps.in = 1;
+		if (i == 0) {
+			config->ep_cfg_in[i].caps.control = 1;
+			config->ep_cfg_in[i].caps.mps = 64;
+			config->ep_cfg_in[i].addr = USB_EP_DIR_IN | i;
+		} else {
+			config->ep_cfg_in[i].caps.bulk = 1;
+			config->ep_cfg_in[i].caps.interrupt = 1;
+			config->ep_cfg_in[i].caps.iso = 1;
+			config->ep_cfg_in[i].caps.mps = mps;
+			/* Set different endpoint indexes from out endpoints */
+			config->ep_cfg_in[i].addr =
+				USB_EP_DIR_IN | (config->num_of_out_eps + i - 1);
+		}
+
+		ret = udc_register_ep(dev, &config->ep_cfg_in[i]);
+		if (ret != 0) {
+			LOG_ERR("Failed to register endpoint");
+			return ret;
+		}
+	}
+
+	config->make_thread(dev);
+	LOG_INF("Device %p (max. speed %d)", dev, config->speed_idx);
+
+	return 0;
+}
+
+static void udc_max32_isr(const struct device *dev)
+{
+	MXC_USB_EventHandler();
+}
+
+static void udc_max32_lock(const struct device *dev)
+{
+	udc_lock_internal(dev, K_FOREVER);
+}
+
+static void udc_max32_unlock(const struct device *dev)
+{
+	udc_unlock_internal(dev);
+}
+
+static const struct udc_api udc_max32_api = {
+	.lock = udc_max32_lock,
+	.unlock = udc_max32_unlock,
+	.device_speed = udc_max32_device_speed,
+	.init = udc_max32_init,
+	.enable = udc_max32_enable,
+	.disable = udc_max32_disable,
+	.shutdown = udc_max32_shutdown,
+	.set_address = udc_max32_set_address,
+	.host_wakeup = udc_max32_host_wakeup,
+	.ep_enable = udc_max32_ep_enable,
+	.ep_disable = udc_max32_ep_disable,
+	.ep_set_halt = udc_max32_ep_set_halt,
+	.ep_clear_halt = udc_max32_ep_clear_halt,
+	.ep_enqueue = udc_max32_ep_enqueue,
+	.ep_dequeue = udc_max32_ep_dequeue,
+};
+
+#define UDC_MAX32_DEVICE_DEFINE(n)                                                                 \
+	static void udc_max32_irq_init_##n(void)                                                   \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), udc_max32_isr,              \
+			    DEVICE_DT_INST_GET(n), 0);                                             \
+		irq_enable(DT_INST_IRQN(n));                                                       \
+	}                                                                                          \
+                                                                                                   \
+	K_THREAD_STACK_DEFINE(udc_max32_stack_##n, CONFIG_UDC_MAX32_THREAD_STACK_SIZE);            \
+                                                                                                   \
+	static void udc_max32_thread_##n(void *dev, void *arg1, void *arg2)                        \
+	{                                                                                          \
+		ARG_UNUSED(arg1);                                                                  \
+		ARG_UNUSED(arg2);                                                                  \
+		max32_thread_handler(dev);                                                         \
+	}                                                                                          \
+                                                                                                   \
+	static void udc_max32_make_thread_##n(const struct device *dev)                            \
+	{                                                                                          \
+		struct udc_max32_data *priv = udc_get_private(dev);                                \
+                                                                                                   \
+		k_thread_create(&priv->thread_data, udc_max32_stack_##n,                           \
+				K_THREAD_STACK_SIZEOF(udc_max32_stack_##n), udc_max32_thread_##n,  \
+				(void *)dev, NULL, NULL,                                           \
+				K_PRIO_COOP(CONFIG_UDC_MAX32_THREAD_PRIORITY), K_ESSENTIAL,        \
+				K_NO_WAIT);                                                        \
+		k_thread_name_set(&priv->thread_data, dev->name);                                  \
+	}                                                                                          \
+                                                                                                   \
+	static struct udc_ep_config ep_cfg_out_##n[DT_INST_PROP(n, num_out_endpoints)];            \
+	static struct udc_ep_config ep_cfg_in_##n[DT_INST_PROP(n, num_in_endpoints)];              \
+                                                                                                   \
+	static const struct udc_max32_config udc_max32_config_##n = {                              \
+		.base = (mxc_usbhs_regs_t *)DT_INST_REG_ADDR(n),                                   \
+		.num_of_in_eps = DT_INST_PROP(n, num_out_endpoints),                               \
+		.num_of_out_eps = DT_INST_PROP(n, num_in_endpoints),                               \
+		.ep_cfg_in = ep_cfg_out_##n,                                                       \
+		.ep_cfg_out = ep_cfg_in_##n,                                                       \
+		.make_thread = udc_max32_make_thread_##n,                                          \
+		.speed_idx = DT_ENUM_IDX(DT_DRV_INST(n), maximum_speed),                           \
+		.clock = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),                                    \
+		.perclk.bus = DT_INST_CLOCKS_CELL(n, offset),                                      \
+		.perclk.bit = DT_INST_CLOCKS_CELL(n, bit),                                         \
+		.irq_func = &udc_max32_irq_init_##n,                                               \
+	};                                                                                         \
+                                                                                                   \
+	static MXC_USB_Req_t ep_request_##n[DT_INST_PROP(n, num_out_endpoints) +                   \
+					    DT_INST_PROP(n, num_in_endpoints) - 1];                \
+                                                                                                   \
+	static struct req_cb_data req_cb_data_##n[DT_INST_PROP(n, num_out_endpoints) +             \
+						  DT_INST_PROP(n, num_in_endpoints) - 1];          \
+                                                                                                   \
+	static struct udc_max32_data udc_priv_##n = {                                              \
+		.ep_request = ep_request_##n,                                                      \
+		.req_cb_data = req_cb_data_##n,                                                    \
+	};                                                                                         \
+                                                                                                   \
+	static struct udc_data udc_data_##n = {                                                    \
+		.mutex = Z_MUTEX_INITIALIZER(udc_data_##n.mutex),                                  \
+		.priv = &udc_priv_##n,                                                             \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(n, udc_max32_driver_preinit, NULL, &udc_data_##n,                    \
+			      &udc_max32_config_##n, POST_KERNEL,                                  \
+			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &udc_max32_api);
+
+DT_INST_FOREACH_STATUS_OKAY(UDC_MAX32_DEVICE_DEFINE)
diff --git a/drivers/usb/udc/udc_mcux_ehci.c b/drivers/usb/udc/udc_mcux_ehci.c
index 9055905634ee3..0feda0bd4144a 100644
--- a/drivers/usb/udc/udc_mcux_ehci.c
+++ b/drivers/usb/udc/udc_mcux_ehci.c
@@ -112,8 +112,8 @@ static int udc_mcux_ep_feed(const struct device *dev,
 	}
 
 	udc_mcux_lock(dev);
-	if (!udc_ep_is_busy(dev, cfg->addr)) {
-		udc_ep_set_busy(dev, cfg->addr, true);
+	if (!udc_ep_is_busy(cfg)) {
+		udc_ep_set_busy(cfg, true);
 		udc_mcux_unlock(dev);
 
 		if (USB_EP_DIR_IS_OUT(cfg->addr)) {
@@ -130,7 +130,7 @@ static int udc_mcux_ep_feed(const struct device *dev,
 
 		udc_mcux_lock(dev);
 		if (status != kStatus_USB_Success) {
-			udc_ep_set_busy(dev, cfg->addr, false);
+			udc_ep_set_busy(cfg, false);
 		}
 		udc_mcux_unlock(dev);
 	} else {
@@ -147,7 +147,7 @@ static int udc_mcux_ep_try_feed(const struct device *dev,
 {
 	struct net_buf *feed_buf;
 
-	feed_buf = udc_buf_peek(dev, cfg->addr);
+	feed_buf = udc_buf_peek(cfg);
 	if (feed_buf) {
 		int ret = udc_mcux_ep_feed(dev, cfg, feed_buf);
 
@@ -322,13 +322,14 @@ static int udc_mcux_handler_non_ctrl_out(const struct device *dev, uint8_t ep,
 static int udc_mcux_handler_out(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -375,10 +376,11 @@ static bool udc_mcux_handler_zlt(const struct device *dev, uint8_t ep, struct ne
 static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENOBUFS;
@@ -388,10 +390,10 @@ static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 		return 0;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -593,13 +595,13 @@ static int udc_mcux_ep_dequeue(const struct device *dev,
 	struct net_buf *buf;
 
 	cfg->stat.halted = false;
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	return 0;
diff --git a/drivers/usb/udc/udc_mcux_ip3511.c b/drivers/usb/udc/udc_mcux_ip3511.c
index f8db1221e0743..312acae17845b 100644
--- a/drivers/usb/udc/udc_mcux_ip3511.c
+++ b/drivers/usb/udc/udc_mcux_ip3511.c
@@ -112,8 +112,8 @@ static int udc_mcux_ep_feed(const struct device *dev,
 	}
 
 	udc_mcux_lock(dev);
-	if (!udc_ep_is_busy(dev, cfg->addr)) {
-		udc_ep_set_busy(dev, cfg->addr, true);
+	if (!udc_ep_is_busy(cfg)) {
+		udc_ep_set_busy(cfg, true);
 		udc_mcux_unlock(dev);
 
 		if (USB_EP_DIR_IS_OUT(cfg->addr)) {
@@ -130,7 +130,7 @@ static int udc_mcux_ep_feed(const struct device *dev,
 
 		udc_mcux_lock(dev);
 		if (status != kStatus_USB_Success) {
-			udc_ep_set_busy(dev, cfg->addr, false);
+			udc_ep_set_busy(cfg, false);
 		}
 		udc_mcux_unlock(dev);
 	} else {
@@ -147,7 +147,7 @@ static int udc_mcux_ep_try_feed(const struct device *dev,
 {
 	struct net_buf *feed_buf;
 
-	feed_buf = udc_buf_peek(dev, cfg->addr);
+	feed_buf = udc_buf_peek(cfg);
 	if (feed_buf) {
 		int ret = udc_mcux_ep_feed(dev, cfg, feed_buf);
 
@@ -322,13 +322,14 @@ static int udc_mcux_handler_non_ctrl_out(const struct device *dev, uint8_t ep,
 static int udc_mcux_handler_out(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -359,7 +360,7 @@ static bool udc_mcux_handler_zlt(const struct device *dev, uint8_t ep, struct ne
 			usb_status_t status;
 
 			udc_ep_buf_clear_zlp(buf);
-			status = mcux_if->deviceRecv(priv->mcux_device.controllerHandle,
+			status = mcux_if->deviceSend(priv->mcux_device.controllerHandle,
 					ep, NULL, 0);
 			if (status != kStatus_USB_Success) {
 				udc_submit_event(dev, UDC_EVT_ERROR, -EIO);
@@ -375,10 +376,11 @@ static bool udc_mcux_handler_zlt(const struct device *dev, uint8_t ep, struct ne
 static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 				uint8_t *mcux_buf, uint16_t mcux_len)
 {
+	struct udc_ep_config *const cfg = udc_get_ep_cfg(dev, ep);
 	int err;
 	struct net_buf *buf;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENOBUFS;
@@ -388,10 +390,10 @@ static int udc_mcux_handler_in(const struct device *dev, uint8_t ep,
 		return 0;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(cfg);
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	if (buf == NULL) {
@@ -593,13 +595,13 @@ static int udc_mcux_ep_dequeue(const struct device *dev,
 	struct net_buf *buf;
 
 	cfg->stat.halted = false;
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
 	udc_mcux_lock(dev);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 	udc_mcux_unlock(dev);
 
 	return 0;
diff --git a/drivers/usb/udc/udc_nrf.c b/drivers/usb/udc/udc_nrf.c
index 9eead90dfbc60..71eebbd70d3e5 100644
--- a/drivers/usb/udc/udc_nrf.c
+++ b/drivers/usb/udc/udc_nrf.c
@@ -4,75 +4,1160 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @file  udc_nrf.c
- * @brief Nordic USB device controller (UDC) driver
+#include <string.h>
+#include <stdio.h>
+#include <soc.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/usb/udc.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/dt-bindings/regulator/nrf5x.h>
+
+#include <nrf_usbd_common.h>
+#include <nrf_usbd_common_errata.h>
+#include <hal/nrf_usbd.h>
+#include <nrfx_power.h>
+#include "udc_common.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(udc_nrf, CONFIG_UDC_DRIVER_LOG_LEVEL);
+
+/*
+ * There is no real advantage to change control endpoint size
+ * but we can use it for testing UDC driver API and higher layers.
+ */
+#define UDC_NRF_MPS0		UDC_MPS0_64
+#define UDC_NRF_EP0_SIZE	64
+
+enum udc_nrf_event_type {
+	/* Trigger next transfer (buffer enqueued) */
+	UDC_NRF_EVT_XFER,
+	/* Transfer finished */
+	UDC_NRF_EVT_EP_FINISHED,
+	/* SETUP data received */
+	UDC_NRF_EVT_SETUP,
+	/* USB bus suspended */
+	UDC_NRF_EVT_SUSPEND,
+	/* USB bus resumed */
+	UDC_NRF_EVT_RESUME,
+	/* Remote Wakeup initiated */
+	UDC_NRF_EVT_WUREQ,
+	/* Let controller perform status stage */
+	UDC_NRF_EVT_STATUS_IN,
+};
+
+/* Main events the driver thread waits for */
+static K_EVENT_DEFINE(drv_evt);
+/* Transfer triggers */
+static atomic_t xfer_new;
+/* Finished transactions */
+static atomic_t xfer_finished;
+
+static K_KERNEL_STACK_DEFINE(drv_stack, CONFIG_UDC_NRF_THREAD_STACK_SIZE);
+static struct k_thread drv_stack_data;
+
+/* USB device controller access from devicetree */
+#define DT_DRV_COMPAT nordic_nrf_usbd
+
+#define CFG_EPIN_CNT		DT_INST_PROP(0, num_in_endpoints)
+#define CFG_EPOUT_CNT		DT_INST_PROP(0, num_out_endpoints)
+#define CFG_EP_ISOIN_CNT	DT_INST_PROP(0, num_isoin_endpoints)
+#define CFG_EP_ISOOUT_CNT	DT_INST_PROP(0, num_isoout_endpoints)
+
+static struct udc_ep_config ep_cfg_out[CFG_EPOUT_CNT + CFG_EP_ISOOUT_CNT + 1];
+static struct udc_ep_config ep_cfg_in[CFG_EPIN_CNT + CFG_EP_ISOIN_CNT + 1];
+static bool udc_nrf_setup_set_addr, udc_nrf_fake_setup;
+static uint8_t udc_nrf_address;
+const static struct device *udc_nrf_dev;
+
+#define NRF_USBD_COMMON_EPIN_CNT      9
+#define NRF_USBD_COMMON_EPOUT_CNT     9
+#define NRF_USBD_COMMON_EP_NUM(ep)    (ep & 0xF)
+#define NRF_USBD_COMMON_EP_IS_IN(ep)  ((ep & 0x80) == 0x80)
+#define NRF_USBD_COMMON_EP_IS_OUT(ep) ((ep & 0x80) == 0)
+#define NRF_USBD_COMMON_EP_IS_ISO(ep) ((ep & 0xF) >= 8)
+
+#ifndef NRF_USBD_COMMON_ISO_DEBUG
+/* Also generate information about ISOCHRONOUS events and transfers.
+ * Turn this off if no ISOCHRONOUS transfers are going to be debugged and this
+ * option generates a lot of useless messages.
+ */
+#define NRF_USBD_COMMON_ISO_DEBUG 1
+#endif
+
+#ifndef NRF_USBD_COMMON_USE_WORKAROUND_FOR_ANOMALY_211
+/* Anomaly 211 - Device remains in SUSPEND too long when host resumes
+ * a bus activity (sending SOF packets) without a RESUME condition.
+ */
+#define NRF_USBD_COMMON_USE_WORKAROUND_FOR_ANOMALY_211 0
+#endif
+
+/* Assert endpoint is valid */
+#define NRF_USBD_COMMON_ASSERT_EP_VALID(ep) __ASSERT_NO_MSG(         \
+	((NRF_USBD_COMMON_EP_IS_IN(ep) &&                            \
+	 (NRF_USBD_COMMON_EP_NUM(ep) < NRF_USBD_COMMON_EPIN_CNT)) || \
+	 (NRF_USBD_COMMON_EP_IS_OUT(ep) &&                           \
+	 (NRF_USBD_COMMON_EP_NUM(ep) < NRF_USBD_COMMON_EPOUT_CNT))));
+
+/* Lowest IN endpoint bit position */
+#define NRF_USBD_COMMON_EPIN_BITPOS_0 0
+
+/* Lowest OUT endpoint bit position */
+#define NRF_USBD_COMMON_EPOUT_BITPOS_0 16
+
+/* Input endpoint bits mask */
+#define NRF_USBD_COMMON_EPIN_BIT_MASK (0xFFFFU << NRF_USBD_COMMON_EPIN_BITPOS_0)
+
+/* Output endpoint bits mask */
+#define NRF_USBD_COMMON_EPOUT_BIT_MASK (0xFFFFU << NRF_USBD_COMMON_EPOUT_BITPOS_0)
+
+/* Isochronous endpoint bit mask */
+#define USBD_EPISO_BIT_MASK                                                    \
+	((1U << NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT8)) |           \
+	 (1U << NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN8)))
+
+/* Convert endpoint number to bit position */
+#define NRF_USBD_COMMON_EP_BITPOS(ep) ((NRF_USBD_COMMON_EP_IS_IN(ep)      \
+	? NRF_USBD_COMMON_EPIN_BITPOS_0 : NRF_USBD_COMMON_EPOUT_BITPOS_0) \
+	+ NRF_USBD_COMMON_EP_NUM(ep))
+
+/* Check it the bit positions values match defined DATAEPSTATUS bit positions */
+BUILD_ASSERT(
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN1) == USBD_EPDATASTATUS_EPIN1_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN2) == USBD_EPDATASTATUS_EPIN2_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN3) == USBD_EPDATASTATUS_EPIN3_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN4) == USBD_EPDATASTATUS_EPIN4_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN5) == USBD_EPDATASTATUS_EPIN5_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN6) == USBD_EPDATASTATUS_EPIN6_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPIN7) == USBD_EPDATASTATUS_EPIN7_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT1) == USBD_EPDATASTATUS_EPOUT1_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT2) == USBD_EPDATASTATUS_EPOUT2_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT3) == USBD_EPDATASTATUS_EPOUT3_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT4) == USBD_EPDATASTATUS_EPOUT4_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT5) == USBD_EPDATASTATUS_EPOUT5_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT6) == USBD_EPDATASTATUS_EPOUT6_Pos) &&
+	(NRF_USBD_COMMON_EP_BITPOS(NRF_USBD_COMMON_EPOUT7) == USBD_EPDATASTATUS_EPOUT7_Pos),
+	"NRF_USBD_COMMON bit positions do not match hardware"
+);
+
+/* True if USB bus is suspended, updated in interrupt handler */
+static volatile bool m_bus_suspend;
+
+/* Data Stage direction used to map EP0DATADONE to actual endpoint */
+static uint8_t m_ep0_data_dir;
+
+/* Set bit indicates that endpoint is ready for DMA transfer.
  *
- * The driver implements the interface between the nRF USBD peripheral
- * driver from nrfx package and UDC API.
+ * OUT endpoint is ready when DATA packet has been ACKed by device.
+ * IN endpoint is ready when IN endpoint buffer has no pending data.
+ *
+ * When endpoint is ready it responds with NAK to any further traffic.
+ */
+static uint32_t m_ep_ready;
+
+/* Set bit indicates that endpoint is waiting for DMA transfer, i.e. there is
+ * USB stack buffer queued for the transfer.
+ */
+static uint32_t m_ep_dma_waiting;
+
+/* Set bit indicates that endpoint is armed.
+ *
+ * OUT endpoint armed means that valid DATA packet from host will be ACKed.
+ * IN endpoint armed means that device will respond with DATA packet.
+ */
+static uint32_t m_ep_armed;
+
+/* Semaphore to guard EasyDMA access.
+ * In USBD there is only one DMA channel working in background, and new transfer
+ * cannot be started when there is ongoing transfer on any other channel.
+ */
+static K_SEM_DEFINE(dma_available, 1, 1);
+
+/* Endpoint on which DMA was started. */
+static nrf_usbd_common_ep_t dma_ep;
+
+/* Tracks whether total bytes transferred by DMA is even or odd. */
+static uint8_t m_dma_odd;
+
+/* First time enabling after reset. Used in nRF52 errata 223. */
+static bool m_first_enable = true;
+
+#define NRF_USBD_COMMON_FEEDER_BUFFER_SIZE NRF_USBD_COMMON_EPSIZE
+
+/* Bounce buffer for sending data from FLASH */
+static uint32_t m_tx_buffer[NRFX_CEIL_DIV(NRF_USBD_COMMON_FEEDER_BUFFER_SIZE, sizeof(uint32_t))];
+
+/* Early declaration. Documentation above definition. */
+static void usbd_dmareq_process(void);
+static inline void usbd_int_rise(void);
+static void nrf_usbd_common_stop(void);
+static void nrf_usbd_legacy_transfer_out_drop(nrf_usbd_common_ep_t ep);
+static size_t nrf_usbd_legacy_epout_size_get(nrf_usbd_common_ep_t ep);
+static bool nrf_usbd_legacy_suspend_check(void);
+
+/* Get EasyDMA end event address for given endpoint */
+static volatile uint32_t *usbd_ep_to_endevent(nrf_usbd_common_ep_t ep)
+{
+	int ep_in = NRF_USBD_COMMON_EP_IS_IN(ep);
+	int ep_num = NRF_USBD_COMMON_EP_NUM(ep);
+
+	NRF_USBD_COMMON_ASSERT_EP_VALID(ep);
+
+	if (!NRF_USBD_COMMON_EP_IS_ISO(ep_num)) {
+		if (ep_in) {
+			return &NRF_USBD->EVENTS_ENDEPIN[ep_num];
+		} else {
+			return &NRF_USBD->EVENTS_ENDEPOUT[ep_num];
+		}
+	}
+
+	return ep_in ? &NRF_USBD->EVENTS_ENDISOIN : &NRF_USBD->EVENTS_ENDISOOUT;
+}
+
+/* Return number of bytes last transferred by EasyDMA on given endpoint */
+static uint32_t usbd_ep_amount_get(nrf_usbd_common_ep_t ep)
+{
+	int ep_in = NRF_USBD_COMMON_EP_IS_IN(ep);
+	int ep_num = NRF_USBD_COMMON_EP_NUM(ep);
+
+	NRF_USBD_COMMON_ASSERT_EP_VALID(ep);
+
+	if (!NRF_USBD_COMMON_EP_IS_ISO(ep_num)) {
+		if (ep_in) {
+			return NRF_USBD->EPIN[ep_num].AMOUNT;
+		} else {
+			return NRF_USBD->EPOUT[ep_num].AMOUNT;
+		}
+	}
+
+	return ep_in ? NRF_USBD->ISOIN.AMOUNT : NRF_USBD->ISOOUT.AMOUNT;
+}
+
+/* Start EasyDMA on given endpoint */
+static void usbd_ep_dma_start(nrf_usbd_common_ep_t ep, uint32_t addr, size_t len)
+{
+	int ep_in = NRF_USBD_COMMON_EP_IS_IN(ep);
+	int ep_num = NRF_USBD_COMMON_EP_NUM(ep);
+
+	NRF_USBD_COMMON_ASSERT_EP_VALID(ep);
+
+	if (!NRF_USBD_COMMON_EP_IS_ISO(ep_num)) {
+		if (ep_in) {
+			NRF_USBD->EPIN[ep_num].PTR = addr;
+			NRF_USBD->EPIN[ep_num].MAXCNT = len;
+			NRF_USBD->TASKS_STARTEPIN[ep_num] = 1;
+		} else {
+			NRF_USBD->EPOUT[ep_num].PTR = addr;
+			NRF_USBD->EPOUT[ep_num].MAXCNT = len;
+			NRF_USBD->TASKS_STARTEPOUT[ep_num] = 1;
+		}
+	} else if (ep_in) {
+		NRF_USBD->ISOIN.PTR = addr;
+		NRF_USBD->ISOIN.MAXCNT = len;
+		NRF_USBD->TASKS_STARTISOIN = 1;
+	} else {
+		NRF_USBD->ISOOUT.PTR = addr;
+		NRF_USBD->ISOOUT.MAXCNT = len;
+		NRF_USBD->TASKS_STARTISOOUT = 1;
+	}
+}
+
+/* Convert endpoint number to bit position matching EPDATASTATUS register.
+ * Control and isochronous endpoints occupy unused EPDATASTATUS bits.
  */
+static inline uint8_t ep2bit(nrf_usbd_common_ep_t ep)
+{
+	NRF_USBD_COMMON_ASSERT_EP_VALID(ep);
+	return NRF_USBD_COMMON_EP_BITPOS(ep);
+}
+
+static inline nrf_usbd_common_ep_t bit2ep(uint8_t bitpos)
+{
+	BUILD_ASSERT(NRF_USBD_COMMON_EPOUT_BITPOS_0 > NRF_USBD_COMMON_EPIN_BITPOS_0,
+		     "OUT endpoint bits should be higher than IN endpoint bits");
+	return (nrf_usbd_common_ep_t)((bitpos >= NRF_USBD_COMMON_EPOUT_BITPOS_0)
+		? NRF_USBD_COMMON_EPOUT(bitpos - NRF_USBD_COMMON_EPOUT_BITPOS_0)
+		: NRF_USBD_COMMON_EPIN(bitpos));
+}
+
+/* Prepare DMA for transfer */
+static inline void usbd_dma_pending_set(void)
+{
+	if (nrf_usbd_common_errata_199()) {
+		*((volatile uint32_t *)0x40027C1C) = 0x00000082;
+	}
+}
+
+/* DMA transfer finished */
+static inline void usbd_dma_pending_clear(void)
+{
+	if (nrf_usbd_common_errata_199()) {
+		*((volatile uint32_t *)0x40027C1C) = 0x00000000;
+	}
+}
+
+static void disarm_endpoint(uint8_t ep)
+{
+	if (ep == USB_CONTROL_EP_OUT || ep == USB_CONTROL_EP_IN) {
+		/* EP0 cannot be disarmed. This is not a problem because SETUP
+		 * token automatically disarms EP0 IN and EP0 OUT.
+		 */
+		return;
+	}
+
+	if (NRF_USBD_COMMON_EP_IS_ISO(ep)) {
+		/* Isochronous endpoints cannot be disarmed */
+		return;
+	}
+
+	if (!(m_ep_armed & BIT(ep2bit(ep)))) {
+		/* Endpoint is not armed, nothing to do */
+		return;
+	}
+
+	m_ep_armed &= ~BIT(ep2bit(ep));
+
+	/* Disarm the endpoint if there is any data buffered. For OUT endpoints
+	 * disarming means that the endpoint won't ACK (will NAK) DATA packet.
+	 */
+	*((volatile uint32_t *)((uint32_t)(NRF_USBD) + 0x800)) = 0x7B6 +
+		2 * (USB_EP_GET_IDX(ep) - 1) + USB_EP_DIR_IS_OUT(ep) * 0x10;
+	*((volatile uint32_t *)((uint32_t)(NRF_USBD) + 0x804)) |= BIT(1);
+}
+
+static inline void usbd_ep_abort(nrf_usbd_common_ep_t ep)
+{
+	unsigned int irq_lock_key = irq_lock();
+
+	disarm_endpoint(ep);
+
+	/* Do not process any data until endpoint is enqueued again */
+	m_ep_dma_waiting &= ~BIT(ep2bit(ep));
+
+	if (!NRF_USBD_COMMON_EP_IS_ISO(ep)) {
+		if (NRF_USBD_COMMON_EP_IS_OUT(ep)) {
+			m_ep_ready &= ~BIT(ep2bit(ep));
+		} else {
+			m_ep_ready |= BIT(ep2bit(ep));
+		}
+	}
+
+	/* Disarming endpoint is inherently a race between the driver and host.
+	 * Clear EPDATASTATUS to prevent interrupt handler from processing the
+	 * data if disarming lost the race (i.e. host finished first).
+	 */
+	NRF_USBD->EPDATASTATUS = BIT(ep2bit(ep));
+
+	irq_unlock(irq_lock_key);
+}
+
+static void nrf_usbd_legacy_ep_abort(nrf_usbd_common_ep_t ep)
+{
+	/* Only abort if there is no active DMA */
+	k_sem_take(&dma_available, K_FOREVER);
+	usbd_ep_abort(ep);
+	k_sem_give(&dma_available);
+
+	/* This function was holding DMA semaphore and could potentially prevent
+	 * next DMA from executing. Fire IRQ handler to check if any DMA needs
+	 * to be started.
+	 */
+	usbd_int_rise();
+}
+
+static void usbd_ep_abort_all(void)
+{
+	uint32_t ep_waiting = m_ep_dma_waiting | (m_ep_ready & NRF_USBD_COMMON_EPOUT_BIT_MASK);
+
+	while (ep_waiting != 0) {
+		uint8_t bitpos = NRF_CTZ(ep_waiting);
+
+		if (!NRF_USBD_COMMON_EP_IS_ISO(bit2ep(bitpos))) {
+			usbd_ep_abort(bit2ep(bitpos));
+		}
+		ep_waiting &= ~(1U << bitpos);
+	}
+
+	m_ep_ready = (((1U << NRF_USBD_COMMON_EPIN_CNT) - 1U) << NRF_USBD_COMMON_EPIN_BITPOS_0);
+}
+
+/* Rise USBD interrupt to trigger interrupt handler */
+static inline void usbd_int_rise(void)
+{
+	NVIC_SetPendingIRQ(USBD_IRQn);
+}
+
+static void ev_usbreset_handler(void)
+{
+	m_bus_suspend = false;
+
+	LOG_INF("Reset");
+	udc_submit_event(udc_nrf_dev, UDC_EVT_RESET, 0);
+}
+
+static void nrf_usbd_dma_finished(nrf_usbd_common_ep_t ep)
+{
+	/* DMA finished, track if total bytes transferred is even or odd */
+	m_dma_odd ^= usbd_ep_amount_get(ep) & 1;
+	usbd_dma_pending_clear();
+
+	if ((m_ep_dma_waiting & BIT(ep2bit(ep))) == 0) {
+		if (NRF_USBD_COMMON_EP_IS_OUT(ep) || (ep == NRF_USBD_COMMON_EPIN8)) {
+			/* Send event to the user - for an ISO IN or any OUT endpoint,
+			 * the whole transfer is finished in this moment
+			 */
+			atomic_set_bit(&xfer_finished, ep2bit(ep));
+			k_event_post(&drv_evt, BIT(UDC_NRF_EVT_EP_FINISHED));
+		}
+	} else if (ep == NRF_USBD_COMMON_EPOUT0) {
+		/* Allow receiving next OUT Data Stage chunk */
+		NRF_USBD->TASKS_EP0RCVOUT = 1;
+	}
+
+	if (NRF_USBD_COMMON_EP_IS_IN(ep) ||
+	    (ep >= NRF_USBD_COMMON_EPOUT1 && ep <= NRF_USBD_COMMON_EPOUT7)) {
+		m_ep_armed |= BIT(ep2bit(ep));
+	}
+
+	k_sem_give(&dma_available);
+}
+
+static void ev_sof_handler(void)
+{
+	/* Process isochronous endpoints */
+	uint32_t iso_ready_mask = (1U << ep2bit(NRF_USBD_COMMON_EPIN8));
+
+	/* SIZE.ISOOUT is 0 only when no packet was received at all */
+	if (NRF_USBD->SIZE.ISOOUT) {
+		iso_ready_mask |= (1U << ep2bit(NRF_USBD_COMMON_EPOUT8));
+	}
+	m_ep_ready |= iso_ready_mask;
+
+	m_ep_armed &= ~USBD_EPISO_BIT_MASK;
+
+	udc_submit_event(udc_nrf_dev, UDC_EVT_SOF, 0);
+}
+
+static void usbd_in_packet_sent(uint8_t ep)
+{
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(udc_nrf_dev, ep);
+	struct net_buf *buf = udc_buf_peek(ep_cfg);
+
+	net_buf_pull(buf, usbd_ep_amount_get(ep));
+
+	if (buf->len) {
+		/* More packets will be sent, nothing to do here */
+	} else if (udc_ep_buf_has_zlp(buf)) {
+		/* Actual payload sent, only ZLP left */
+		udc_ep_buf_clear_zlp(buf);
+	} else {
+		LOG_DBG("USBD event: EndpointData: In finished");
+		/* No more data to be send - transmission finished */
+		atomic_set_bit(&xfer_finished, ep2bit(ep));
+		k_event_post(&drv_evt, BIT(UDC_NRF_EVT_EP_FINISHED));
+	}
+}
+
+static void ev_setup_handler(void)
+{
+	LOG_DBG("USBD event: Setup (rt:%.2x r:%.2x v:%.4x i:%.4x l:%u )",
+		       NRF_USBD->BMREQUESTTYPE, NRF_USBD->BREQUEST,
+		       NRF_USBD->WVALUEL | (NRF_USBD->WVALUEH << 8),
+		       NRF_USBD->WINDEXL | (NRF_USBD->WINDEXH << 8),
+		       NRF_USBD->WLENGTHL | (NRF_USBD->WLENGTHH << 8));
+
+	m_ep_dma_waiting &= ~((1U << ep2bit(NRF_USBD_COMMON_EPOUT0)) |
+			      (1U << ep2bit(NRF_USBD_COMMON_EPIN0)));
+	m_ep_ready &= ~(1U << ep2bit(NRF_USBD_COMMON_EPOUT0));
+	m_ep_ready |= 1U << ep2bit(NRF_USBD_COMMON_EPIN0);
+
+	m_ep_armed &= ~(BIT(ep2bit(USB_CONTROL_EP_OUT)) |
+			BIT(ep2bit(USB_CONTROL_EP_IN)));
+
+	k_event_post(&drv_evt, BIT(UDC_NRF_EVT_SETUP));
+}
+
+static void ev_usbevent_handler(void)
+{
+	uint32_t event = NRF_USBD->EVENTCAUSE;
+
+	/* Clear handled events */
+	NRF_USBD->EVENTCAUSE = event;
+
+	if (event & USBD_EVENTCAUSE_ISOOUTCRC_Msk) {
+		LOG_DBG("USBD event: ISOOUTCRC");
+		/* Currently no support */
+	}
+	if (event & USBD_EVENTCAUSE_SUSPEND_Msk) {
+		LOG_DBG("USBD event: SUSPEND");
+		m_bus_suspend = true;
+
+		k_event_post(&drv_evt, BIT(UDC_NRF_EVT_SUSPEND));
+	}
+	if (event & USBD_EVENTCAUSE_RESUME_Msk) {
+		LOG_DBG("USBD event: RESUME");
+		m_bus_suspend = false;
+
+		k_event_post(&drv_evt, BIT(UDC_NRF_EVT_RESUME));
+	}
+	if (event & USBD_EVENTCAUSE_USBWUALLOWED_Msk) {
+		LOG_DBG("USBD event: WUREQ (%s)", m_bus_suspend ? "In Suspend" : "Active");
+		if (m_bus_suspend) {
+			__ASSERT_NO_MSG(!nrf_usbd_legacy_suspend_check());
+			m_bus_suspend = false;
+
+			NRF_USBD->DPDMVALUE = USBD_DPDMVALUE_STATE_Resume
+				<< USBD_DPDMVALUE_STATE_Pos;
+			NRF_USBD->TASKS_DPDMDRIVE = 1;
+
+			k_event_post(&drv_evt, BIT(UDC_NRF_EVT_WUREQ));
+		}
+	}
+}
+
+static void ev_epdata_handler(uint32_t dataepstatus)
+{
+	if (dataepstatus) {
+		LOG_DBG("USBD event: EndpointEPStatus: %x", dataepstatus);
+
+		/* Mark endpoints ready for next DMA access */
+		m_ep_ready |= dataepstatus & ~USBD_EPISO_BIT_MASK;
+
+		/* IN endpoints are no longer armed after host read the data.
+		 * OUT endpoints are no longer armed before DMA reads the data.
+		 */
+		m_ep_armed &= ~(dataepstatus & ~USBD_EPISO_BIT_MASK);
+
+		/* Peripheral automatically enables endpoint for data reception
+		 * after OUT endpoint DMA transfer. This makes the device ACK
+		 * the OUT DATA even if the stack did not enqueue any buffer.
+		 *
+		 * This behaviour most likely cannot be avoided and therefore
+		 * there's nothing more to do for OUT endpoints.
+		 */
+		dataepstatus &= NRF_USBD_COMMON_EPIN_BIT_MASK;
+	}
+
+	/* Prepare next packet on IN endpoints */
+	while (dataepstatus) {
+		uint8_t bitpos = NRF_CTZ(dataepstatus);
+
+		dataepstatus &= ~BIT(bitpos);
+
+		usbd_in_packet_sent(bit2ep(bitpos));
+	}
+}
+
+/* Select endpoint for next DMA transfer.
+ *
+ * Passed value has at least one bit set. Each bit set indicates which endpoints
+ * can have data transferred between peripheral and USB stack buffer.
+ *
+ * Return bit position indicating which endpoint to transfer.
+ */
+static uint8_t usbd_dma_scheduler_algorithm(uint32_t req)
+{
+	/* Only prioritized scheduling mode is supported. */
+	return NRF_CTZ(req);
+}
+
+/* Process next DMA request, called at the end of interrupt handler */
+static void usbd_dmareq_process(void)
+{
+	uint32_t req = m_ep_dma_waiting & m_ep_ready;
+	struct net_buf *buf;
+	struct udc_ep_config *ep_cfg;
+	uint8_t *payload_buf;
+	size_t payload_len;
+	bool last_packet;
+	uint8_t pos;
+
+	if (req == 0 || nrf_usbd_legacy_suspend_check() ||
+	    k_sem_take(&dma_available, K_NO_WAIT) != 0) {
+		/* DMA cannot be started */
+		return;
+	}
+
+	if (NRFX_USBD_CONFIG_DMASCHEDULER_ISO_BOOST &&
+	    ((req & USBD_EPISO_BIT_MASK) != 0)) {
+		pos = usbd_dma_scheduler_algorithm(req & USBD_EPISO_BIT_MASK);
+	} else {
+		pos = usbd_dma_scheduler_algorithm(req);
+	}
+
+	nrf_usbd_common_ep_t ep = bit2ep(pos);
+
+	ep_cfg = udc_get_ep_cfg(udc_nrf_dev, ep);
+	buf = udc_buf_peek(ep_cfg);
+
+	__ASSERT_NO_MSG(buf);
+
+	if (NRF_USBD_COMMON_EP_IS_IN(ep)) {
+		/* Device -> Host */
+		payload_buf = buf->data;
+
+		if (buf->len > udc_mps_ep_size(ep_cfg)) {
+			payload_len = udc_mps_ep_size(ep_cfg);
+			last_packet = false;
+		} else {
+			payload_len = buf->len;
+			last_packet = !udc_ep_buf_has_zlp(buf);
+		}
+
+		if (!nrfx_is_in_ram(payload_buf)) {
+			__ASSERT_NO_MSG(payload_len <= NRF_USBD_COMMON_FEEDER_BUFFER_SIZE);
+			memcpy(m_tx_buffer, payload_buf, payload_len);
+			payload_buf = (uint8_t *)m_tx_buffer;
+		}
+	} else {
+		/* Host -> Device */
+		const size_t received = nrf_usbd_legacy_epout_size_get(ep);
+
+		payload_buf = net_buf_tail(buf);
+		payload_len = net_buf_tailroom(buf);
+
+		__ASSERT_NO_MSG(nrfx_is_in_ram(payload_buf));
+
+		if (received > payload_len) {
+			LOG_ERR("buffer too small: r: %u, l: %u", received, payload_len);
+		} else {
+			payload_len = received;
+		}
+
+		/* DMA will copy the received data, update the buffer here so received
+		 * does not have to be stored (can be done because there is no cache).
+		 */
+		net_buf_add(buf, payload_len);
+
+		last_packet = (udc_mps_ep_size(ep_cfg) != received) ||
+			      (net_buf_tailroom(buf) == 0);
+	}
+
+	if (last_packet) {
+		m_ep_dma_waiting &= ~BIT(pos);
+	}
+
+	usbd_dma_pending_set();
+	m_ep_ready &= ~BIT(pos);
+	if (NRF_USBD_COMMON_ISO_DEBUG || (!NRF_USBD_COMMON_EP_IS_ISO(ep))) {
+		LOG_DBG("USB DMA process: Starting transfer on EP: %x, size: %u",
+			ep, payload_len);
+	}
+
+	/* Start transfer to the endpoint buffer */
+	dma_ep = ep;
+	usbd_ep_dma_start(ep, (uint32_t)payload_buf, payload_len);
+}
+
+static inline void usbd_errata_171_begin(void)
+{
+	unsigned int irq_lock_key = irq_lock();
+
+	if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000) {
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+		*((volatile uint32_t *)(0x4006EC14)) = 0x000000C0;
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+	} else {
+		*((volatile uint32_t *)(0x4006EC14)) = 0x000000C0;
+	}
+
+	irq_unlock(irq_lock_key);
+}
+
+static inline void usbd_errata_171_end(void)
+{
+	unsigned int irq_lock_key = irq_lock();
+
+	if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000) {
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+		*((volatile uint32_t *)(0x4006EC14)) = 0x00000000;
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+	} else {
+		*((volatile uint32_t *)(0x4006EC14)) = 0x00000000;
+	}
+
+	irq_unlock(irq_lock_key);
+}
+
+static inline void usbd_errata_187_211_begin(void)
+{
+	unsigned int irq_lock_key = irq_lock();
+
+	if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000) {
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+		*((volatile uint32_t *)(0x4006ED14)) = 0x00000003;
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+	} else {
+		*((volatile uint32_t *)(0x4006ED14)) = 0x00000003;
+	}
+
+	irq_unlock(irq_lock_key);
+}
+
+static inline void usbd_errata_187_211_end(void)
+{
+	unsigned int irq_lock_key = irq_lock();
+
+	if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000) {
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+		*((volatile uint32_t *)(0x4006ED14)) = 0x00000000;
+		*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+	} else {
+		*((volatile uint32_t *)(0x4006ED14)) = 0x00000000;
+	}
+
+	irq_unlock(irq_lock_key);
+}
+
+static void nrf_usbd_peripheral_enable(void)
+{
+	if (nrf_usbd_common_errata_187()) {
+		usbd_errata_187_211_begin();
+	}
+
+	if (nrf_usbd_common_errata_171()) {
+		usbd_errata_171_begin();
+	}
+
+	/* Enable the peripheral */
+	NRF_USBD->ENABLE = 1;
+
+	/* Waiting for peripheral to enable, this should take a few us */
+	while ((NRF_USBD->EVENTCAUSE & USBD_EVENTCAUSE_READY_Msk) == 0) {
+	}
+	NRF_USBD->EVENTCAUSE = USBD_EVENTCAUSE_READY_Msk;
+
+	if (nrf_usbd_common_errata_171()) {
+		usbd_errata_171_end();
+	}
+
+	if (nrf_usbd_common_errata_187()) {
+		usbd_errata_187_211_end();
+	}
+}
+
+static void nrf_usbd_irq_handler(void)
+{
+	volatile uint32_t *dma_endevent;
+	uint32_t epdatastatus = 0;
+
+	/* Always check and clear SOF but call handler only if SOF interrupt
+	 * is actually enabled.
+	 */
+	if (NRF_USBD->EVENTS_SOF) {
+		NRF_USBD->EVENTS_SOF = 0;
+		if (NRF_USBD->INTENSET & USBD_INTEN_SOF_Msk) {
+			ev_sof_handler();
+		}
+	}
+
+	/* Clear EPDATA event and only then get and clear EPDATASTATUS to make
+	 * sure we don't miss any event.
+	 */
+	if (NRF_USBD->EVENTS_EPDATA) {
+		NRF_USBD->EVENTS_EPDATA = 0;
+		epdatastatus = NRF_USBD->EPDATASTATUS;
+		NRF_USBD->EPDATASTATUS = epdatastatus;
+	}
+
+	/* Use common variable to store EP0DATADONE processing needed flag */
+	if (NRF_USBD->EVENTS_EP0DATADONE) {
+		NRF_USBD->EVENTS_EP0DATADONE = 0;
+		epdatastatus |= BIT(ep2bit(m_ep0_data_dir));
+	}
+
+	/* Check DMA end event only for last enabled DMA channel. Other channels
+	 * cannot be active and there's no harm in rechecking the event multiple
+	 * times (it is not a problem to check it even if DMA is not active).
+	 *
+	 * It is important to check DMA and handle DMA finished event before
+	 * handling acknowledged data transfer bits (epdatastatus) to avoid
+	 * a race condition between interrupt handler and host IN token.
+	 */
+	dma_endevent = usbd_ep_to_endevent(dma_ep);
+	if (*dma_endevent) {
+		*dma_endevent = 0;
+		nrf_usbd_dma_finished(dma_ep);
+	}
+
+	/* Process acknowledged transfers so we can prepare next DMA (if any) */
+	ev_epdata_handler(epdatastatus);
+
+	if (NRF_USBD->EVENTS_USBRESET) {
+		NRF_USBD->EVENTS_USBRESET = 0;
+		ev_usbreset_handler();
+	}
+
+	if (NRF_USBD->EVENTS_USBEVENT) {
+		NRF_USBD->EVENTS_USBEVENT = 0;
+		ev_usbevent_handler();
+	}
+
+	/* Handle SETUP only if there is no active DMA on EP0 */
+	if (unlikely(NRF_USBD->EVENTS_EP0SETUP) &&
+	    (k_sem_count_get(&dma_available) ||
+	     (dma_ep != NRF_USBD_COMMON_EPIN0 && dma_ep != NRF_USBD_COMMON_EPOUT0))) {
+		NRF_USBD->EVENTS_EP0SETUP = 0;
+		ev_setup_handler();
+	}
+
+	usbd_dmareq_process();
+}
+
+static void nrf_usbd_legacy_enable(void)
+{
+	/* Prepare for READY event receiving */
+	NRF_USBD->EVENTCAUSE = USBD_EVENTCAUSE_READY_Msk;
+
+	nrf_usbd_peripheral_enable();
+
+	if (nrf_usbd_common_errata_223() && m_first_enable) {
+		NRF_USBD->ENABLE = 0;
+
+		nrf_usbd_peripheral_enable();
+
+		m_first_enable = false;
+	}
+
+#if NRF_USBD_COMMON_USE_WORKAROUND_FOR_ANOMALY_211
+	if (nrf_usbd_common_errata_187() || nrf_usbd_common_errata_211()) {
+#else
+	if (nrf_usbd_common_errata_187()) {
+#endif
+		usbd_errata_187_211_begin();
+	}
+
+	if (nrf_usbd_common_errata_166()) {
+		*((volatile uint32_t *)((uint32_t)(NRF_USBD) + 0x800)) = 0x7E3;
+		*((volatile uint32_t *)((uint32_t)(NRF_USBD) + 0x804)) = 0x40;
+		__ISB();
+		__DSB();
+	}
+
+	NRF_USBD->ISOSPLIT = USBD_ISOSPLIT_SPLIT_HalfIN << USBD_ISOSPLIT_SPLIT_Pos;
+
+	if (IS_ENABLED(CONFIG_NRF_USBD_ISO_IN_ZLP)) {
+		NRF_USBD->ISOINCONFIG = USBD_ISOINCONFIG_RESPONSE_ZeroData
+			<< USBD_ISOINCONFIG_RESPONSE_Pos;
+	} else {
+		NRF_USBD->ISOINCONFIG = USBD_ISOINCONFIG_RESPONSE_NoResp
+			<< USBD_ISOINCONFIG_RESPONSE_Pos;
+	}
+
+	m_ep_ready = (((1U << NRF_USBD_COMMON_EPIN_CNT) - 1U) << NRF_USBD_COMMON_EPIN_BITPOS_0);
+	m_ep_dma_waiting = 0;
+	m_ep_armed = 0;
+	m_dma_odd = 0;
+	__ASSERT_NO_MSG(k_sem_count_get(&dma_available) == 1);
+	usbd_dma_pending_clear();
+	m_ep0_data_dir = USB_CONTROL_EP_OUT;
+
+#if NRF_USBD_COMMON_USE_WORKAROUND_FOR_ANOMALY_211
+	if (nrf_usbd_common_errata_187() && !nrf_usbd_common_errata_211()) {
+#else
+	if (nrf_usbd_common_errata_187()) {
+#endif
+		usbd_errata_187_211_end();
+	}
+}
+
+static void nrf_usbd_legacy_disable(void)
+{
+	/* Make sure DMA is not active */
+	k_sem_take(&dma_available, K_FOREVER);
+
+	/* Stop just in case */
+	nrf_usbd_common_stop();
+
+	/* Disable all parts */
+	if (m_dma_odd) {
+		/* Prevent invalid bus request after next USBD enable by ensuring
+		 * that total number of bytes transferred by DMA is even.
+		 */
+		NRF_USBD->EVENTS_ENDEPIN[0] = 0;
+		usbd_ep_dma_start(NRF_USBD_COMMON_EPIN0, (uint32_t)&m_dma_odd, 1);
+		while (!NRF_USBD->EVENTS_ENDEPIN[0]) {
+		}
+		NRF_USBD->EVENTS_ENDEPIN[0] = 0;
+		m_dma_odd = 0;
+	}
+	NRF_USBD->ENABLE = 0;
+	usbd_dma_pending_clear();
+	k_sem_give(&dma_available);
 
-#include <string.h>
-#include <stdio.h>
-#include <soc.h>
+#if NRF_USBD_COMMON_USE_WORKAROUND_FOR_ANOMALY_211
+	if (nrf_usbd_common_errata_211()) {
+		usbd_errata_187_211_end();
+	}
+#endif
+}
 
-#include <zephyr/kernel.h>
-#include <zephyr/drivers/usb/udc.h>
-#include <zephyr/drivers/clock_control.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <zephyr/dt-bindings/regulator/nrf5x.h>
+static void nrf_usbd_legacy_start(bool enable_sof)
+{
+	m_bus_suspend = false;
+
+	uint32_t int_mask = USBD_INTEN_USBRESET_Msk | USBD_INTEN_ENDEPIN0_Msk |
+		USBD_INTEN_ENDEPIN1_Msk | USBD_INTEN_ENDEPIN2_Msk |
+		USBD_INTEN_ENDEPIN3_Msk | USBD_INTEN_ENDEPIN4_Msk |
+		USBD_INTEN_ENDEPIN5_Msk | USBD_INTEN_ENDEPIN6_Msk |
+		USBD_INTEN_ENDEPIN7_Msk | USBD_INTEN_EP0DATADONE_Msk |
+		USBD_INTEN_ENDISOIN_Msk | USBD_INTEN_ENDEPOUT0_Msk |
+		USBD_INTEN_ENDEPOUT1_Msk | USBD_INTEN_ENDEPOUT2_Msk |
+		USBD_INTEN_ENDEPOUT3_Msk | USBD_INTEN_ENDEPOUT4_Msk |
+		USBD_INTEN_ENDEPOUT5_Msk | USBD_INTEN_ENDEPOUT6_Msk |
+		USBD_INTEN_ENDEPOUT7_Msk | USBD_INTEN_ENDISOOUT_Msk |
+		USBD_INTEN_USBEVENT_Msk | USBD_INTEN_EP0SETUP_Msk |
+		USBD_INTEN_EPDATA_Msk;
+
+	if (enable_sof) {
+		int_mask |= USBD_INTEN_SOF_Msk;
+	}
 
-#include <nrf_usbd_common.h>
-#include <hal/nrf_usbd.h>
-#include <nrfx_power.h>
-#include "udc_common.h"
+	/* Enable all required interrupts */
+	NRF_USBD->INTEN = int_mask;
 
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(udc_nrf, CONFIG_UDC_DRIVER_LOG_LEVEL);
+	/* Enable interrupt globally */
+	irq_enable(USBD_IRQn);
 
-/*
- * There is no real advantage to change control endpoint size
- * but we can use it for testing UDC driver API and higher layers.
- */
-#define UDC_NRF_MPS0		UDC_MPS0_64
-#define UDC_NRF_EP0_SIZE	64
+	/* Enable pullups */
+	NRF_USBD->USBPULLUP = 1;
+}
 
-enum udc_nrf_event_type {
-	/* An event generated by the HAL driver */
-	UDC_NRF_EVT_HAL,
-	/* Shim driver event to trigger next transfer */
-	UDC_NRF_EVT_XFER,
-	/* Let controller perform status stage */
-	UDC_NRF_EVT_STATUS_IN,
-};
+static void nrf_usbd_common_stop(void)
+{
+	/* Clear interrupt */
+	NVIC_ClearPendingIRQ(USBD_IRQn);
 
-struct udc_nrf_evt {
-	enum udc_nrf_event_type type;
-	union {
-		nrf_usbd_common_evt_t hal_evt;
-		uint8_t ep;
-	};
-};
+	if (irq_is_enabled(USBD_IRQn)) {
+		/* Abort transfers */
+		usbd_ep_abort_all();
 
-K_MSGQ_DEFINE(drv_msgq, sizeof(struct udc_nrf_evt),
-	      CONFIG_UDC_NRF_MAX_QMESSAGES, sizeof(uint32_t));
+		/* Disable pullups */
+		NRF_USBD->USBPULLUP = 0;
 
-static K_KERNEL_STACK_DEFINE(drv_stack, CONFIG_UDC_NRF_THREAD_STACK_SIZE);
-static struct k_thread drv_stack_data;
+		/* Disable interrupt globally */
+		irq_disable(USBD_IRQn);
 
-/* USB device controller access from devicetree */
-#define DT_DRV_COMPAT nordic_nrf_usbd
+		/* Disable all interrupts */
+		NRF_USBD->INTEN = 0;
+	}
+}
 
-#define CFG_EPIN_CNT		DT_INST_PROP(0, num_in_endpoints)
-#define CFG_EPOUT_CNT		DT_INST_PROP(0, num_out_endpoints)
-#define CFG_EP_ISOIN_CNT	DT_INST_PROP(0, num_isoin_endpoints)
-#define CFG_EP_ISOOUT_CNT	DT_INST_PROP(0, num_isoout_endpoints)
+static bool nrf_usbd_legacy_suspend(void)
+{
+	bool suspended = false;
+	unsigned int irq_lock_key;
+
+	/* DMA doesn't work in Low Power mode, ensure there is no active DMA */
+	k_sem_take(&dma_available, K_FOREVER);
+	irq_lock_key = irq_lock();
+
+	if (m_bus_suspend) {
+		if (!(NRF_USBD->EVENTCAUSE & USBD_EVENTCAUSE_RESUME_Msk)) {
+			NRF_USBD->LOWPOWER = USBD_LOWPOWER_LOWPOWER_LowPower
+				<< USBD_LOWPOWER_LOWPOWER_Pos;
+			(void)NRF_USBD->LOWPOWER;
+			if (NRF_USBD->EVENTCAUSE & USBD_EVENTCAUSE_RESUME_Msk) {
+				NRF_USBD->LOWPOWER = USBD_LOWPOWER_LOWPOWER_ForceNormal
+					<< USBD_LOWPOWER_LOWPOWER_Pos;
+			} else {
+				suspended = true;
+			}
+		}
+	}
 
-static struct udc_ep_config ep_cfg_out[CFG_EPOUT_CNT + CFG_EP_ISOOUT_CNT + 1];
-static struct udc_ep_config ep_cfg_in[CFG_EPIN_CNT + CFG_EP_ISOIN_CNT + 1];
-static bool udc_nrf_setup_rcvd, udc_nrf_setup_set_addr, udc_nrf_fake_setup;
-static uint8_t udc_nrf_address;
-const static struct device *udc_nrf_dev;
+	irq_unlock(irq_lock_key);
+	k_sem_give(&dma_available);
+
+	return suspended;
+}
+
+static bool nrf_usbd_legacy_wakeup_req(void)
+{
+	bool started = false;
+	unsigned int irq_lock_key = irq_lock();
+
+	if (m_bus_suspend && nrf_usbd_legacy_suspend_check()) {
+		NRF_USBD->LOWPOWER = USBD_LOWPOWER_LOWPOWER_ForceNormal
+			<< USBD_LOWPOWER_LOWPOWER_Pos;
+		started = true;
+
+		if (nrf_usbd_common_errata_171()) {
+			if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000) {
+				*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+				*((volatile uint32_t *)(0x4006EC14)) = 0x000000C0;
+				*((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+			} else {
+				*((volatile uint32_t *)(0x4006EC14)) = 0x000000C0;
+			}
+		}
+	}
+
+	irq_unlock(irq_lock_key);
+
+	return started;
+}
+
+static bool nrf_usbd_legacy_suspend_check(void)
+{
+	return NRF_USBD->LOWPOWER !=
+		(USBD_LOWPOWER_LOWPOWER_ForceNormal << USBD_LOWPOWER_LOWPOWER_Pos);
+}
+
+static bool nrf_usbd_legacy_ep_enable_check(nrf_usbd_common_ep_t ep)
+{
+	int ep_in = NRF_USBD_COMMON_EP_IS_IN(ep);
+	int ep_num = NRF_USBD_COMMON_EP_NUM(ep);
+
+	NRF_USBD_COMMON_ASSERT_EP_VALID(ep);
+
+	return (ep_in ? NRF_USBD->EPINEN : NRF_USBD->EPOUTEN) & BIT(ep_num);
+}
+
+static void nrf_usbd_legacy_ep_enable(nrf_usbd_common_ep_t ep)
+{
+	int ep_in = NRF_USBD_COMMON_EP_IS_IN(ep);
+	int ep_num = NRF_USBD_COMMON_EP_NUM(ep);
+
+	if (nrf_usbd_legacy_ep_enable_check(ep)) {
+		return;
+	}
+
+	if (ep_in) {
+		NRF_USBD->EPINEN |= BIT(ep_num);
+	} else {
+		NRF_USBD->EPOUTEN |= BIT(ep_num);
+	}
+}
+
+static void nrf_usbd_legacy_ep_disable(nrf_usbd_common_ep_t ep)
+{
+	int ep_in = NRF_USBD_COMMON_EP_IS_IN(ep);
+	int ep_num = NRF_USBD_COMMON_EP_NUM(ep);
+
+	/* Only disable endpoint if there is no active DMA */
+	k_sem_take(&dma_available, K_FOREVER);
+	usbd_ep_abort(ep);
+	if (ep_in) {
+		NRF_USBD->EPINEN &= ~BIT(ep_num);
+	} else {
+		NRF_USBD->EPOUTEN &= ~BIT(ep_num);
+	}
+	k_sem_give(&dma_available);
+
+	/* This function was holding DMA semaphore and could potentially prevent
+	 * next DMA from executing. Fire IRQ handler to check if any DMA needs
+	 * to be started.
+	 */
+	usbd_int_rise();
+}
+
+static void nrf_usbd_start_transfer(uint8_t ep)
+{
+	const uint8_t ep_bitpos = ep2bit(ep);
+	unsigned int irq_lock_key = irq_lock();
+
+	if (ep >= NRF_USBD_COMMON_EPOUT1 && ep <= NRF_USBD_COMMON_EPOUT7) {
+		if (!(m_ep_armed & BIT(ep_bitpos)) &&
+		    !(m_ep_ready & BIT(ep_bitpos))) {
+			/* Allow receiving DATA packet on OUT endpoint */
+			NRF_USBD->SIZE.EPOUT[NRF_USBD_COMMON_EP_NUM(ep)] = 0;
+			m_ep_armed |= BIT(ep_bitpos);
+		}
+	} else if (ep == NRF_USBD_COMMON_EPIN8) {
+		/* ISO IN endpoint can be already armed if application is double
+		 * buffering ISO IN data. When the endpoint is already armed it
+		 * must not be ready for next DMA transfer (until SOF).
+		 */
+		__ASSERT(!(m_ep_armed & BIT(ep_bitpos)) ||
+			 !(m_ep_ready & BIT(ep_bitpos)),
+			 "ISO IN must not be armed and ready");
+	} else if (NRF_USBD_COMMON_EP_IS_IN(ep)) {
+		/* IN endpoint must not have data armed */
+		__ASSERT(!(m_ep_armed & BIT(ep_bitpos)),
+			 "ep 0x%02x already armed", ep);
+	}
+
+	__ASSERT(!(m_ep_dma_waiting & BIT(ep_bitpos)),
+		 "ep 0x%02x already waiting", ep);
+
+	m_ep_dma_waiting |= BIT(ep_bitpos);
+	usbd_int_rise();
+
+	irq_unlock(irq_lock_key);
+}
+
+static size_t nrf_usbd_legacy_epout_size_get(nrf_usbd_common_ep_t ep)
+{
+	if (NRF_USBD_COMMON_EP_IS_ISO(ep)) {
+		size_t size = NRF_USBD->SIZE.ISOOUT;
+
+		if ((size & USBD_SIZE_ISOOUT_ZERO_Msk) ==
+		    (USBD_SIZE_ISOOUT_ZERO_ZeroData << USBD_SIZE_ISOOUT_ZERO_Pos)) {
+			size = 0;
+		}
+		return size;
+	}
+
+	return NRF_USBD->SIZE.EPOUT[NRF_USBD_COMMON_EP_NUM(ep)];
+}
+
+static void nrf_usbd_legacy_ep_stall(nrf_usbd_common_ep_t ep)
+{
+	__ASSERT_NO_MSG(!NRF_USBD_COMMON_EP_IS_ISO(ep));
+
+	LOG_DBG("USB: EP %x stalled.", ep);
+	NRF_USBD->EPSTALL = (USBD_EPSTALL_STALL_Stall << USBD_EPSTALL_STALL_Pos) | ep;
+}
+
+static bool nrf_usbd_legacy_ep_stall_check(nrf_usbd_common_ep_t ep)
+{
+	int ep_in = NRF_USBD_COMMON_EP_IS_IN(ep);
+	int ep_num = NRF_USBD_COMMON_EP_NUM(ep);
+
+	if (!NRF_USBD_COMMON_EP_IS_ISO(ep_num)) {
+		if (ep_in) {
+			return NRF_USBD->HALTED.EPIN[ep_num];
+		} else {
+			return NRF_USBD->HALTED.EPOUT[ep_num];
+		}
+	}
+
+	return false;
+}
+
+static void nrf_usbd_legacy_ep_stall_clear(nrf_usbd_common_ep_t ep)
+{
+	__ASSERT_NO_MSG(!NRF_USBD_COMMON_EP_IS_ISO(ep));
+
+	if (NRF_USBD_COMMON_EP_IS_OUT(ep) && nrf_usbd_legacy_ep_stall_check(ep)) {
+		nrf_usbd_legacy_transfer_out_drop(ep);
+	}
+	NRF_USBD->EPSTALL = (USBD_EPSTALL_STALL_UnStall << USBD_EPSTALL_STALL_Pos) | ep;
+}
+
+static void nrf_usbd_legacy_ep_dtoggle_clear(nrf_usbd_common_ep_t ep)
+{
+	__ASSERT_NO_MSG(!NRF_USBD_COMMON_EP_IS_ISO(ep));
+
+	NRF_USBD->DTOGGLE = ep | (USBD_DTOGGLE_VALUE_Nop << USBD_DTOGGLE_VALUE_Pos);
+	NRF_USBD->DTOGGLE = ep | (USBD_DTOGGLE_VALUE_Data0 << USBD_DTOGGLE_VALUE_Pos);
+}
+
+static void nrf_usbd_legacy_transfer_out_drop(nrf_usbd_common_ep_t ep)
+{
+	unsigned int irq_lock_key = irq_lock();
+
+	__ASSERT_NO_MSG(NRF_USBD_COMMON_EP_IS_OUT(ep));
+
+	m_ep_ready &= ~(1U << ep2bit(ep));
+	if (!NRF_USBD_COMMON_EP_IS_ISO(ep)) {
+		NRF_USBD->SIZE.EPOUT[NRF_USBD_COMMON_EP_NUM(ep)] = 0;
+	}
+
+	irq_unlock(irq_lock_key);
+}
 
 struct udc_nrf_config {
 	clock_control_subsys_t clock;
@@ -83,42 +1168,19 @@ struct udc_nrf_config {
 static struct onoff_manager *hfxo_mgr;
 static struct onoff_client hfxo_cli;
 
-static void udc_nrf_clear_control_out(const struct device *dev)
-{
-	if (nrf_usbd_common_last_setup_dir_get() == USB_CONTROL_EP_OUT &&
-	    udc_nrf_setup_rcvd) {
-		/* Allow data chunk on EP0 OUT */
-		nrf_usbd_common_setup_data_clear();
-		udc_nrf_setup_rcvd = false;
-		LOG_INF("Allow data OUT");
-	}
-}
-
 static void udc_event_xfer_in_next(const struct device *dev, const uint8_t ep)
 {
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf != NULL) {
-		nrf_usbd_common_transfer_t xfer = {
-			.p_data = {.tx = buf->data},
-			.size = buf->len,
-			.flags = udc_ep_buf_has_zlp(buf) ?
-				 NRF_USBD_COMMON_TRANSFER_ZLP_FLAG : 0,
-		};
-		nrfx_err_t err;
-
-		err = nrf_usbd_common_ep_transfer(ep, &xfer);
-		if (err != NRFX_SUCCESS) {
-			LOG_ERR("ep 0x%02x nrfx error: %x", ep, err);
-			/* REVISE: remove from endpoint queue? ASSERT? */
-		} else {
-			udc_ep_set_busy(dev, ep, true);
-		}
+		nrf_usbd_start_transfer(ep);
+		udc_ep_set_busy(ep_cfg, true);
 	}
 }
 
@@ -144,15 +1206,17 @@ static void udc_event_xfer_ctrl_in(const struct device *dev,
 	udc_ctrl_update_stage(dev, buf);
 
 	if (!udc_nrf_setup_set_addr) {
-		nrf_usbd_common_setup_clear();
+		/* Allow status stage */
+		NRF_USBD->TASKS_EP0STATUS = 1;
 	}
 }
 
 static void udc_event_fake_status_in(const struct device *dev)
 {
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get(ep_cfg);
 	if (unlikely(buf == NULL)) {
 		LOG_DBG("ep 0x%02x queue is empty", USB_CONTROL_EP_IN);
 		return;
@@ -162,48 +1226,25 @@ static void udc_event_fake_status_in(const struct device *dev)
 	udc_event_xfer_ctrl_in(dev, buf);
 }
 
-static void udc_event_xfer_in(const struct device *dev,
-			      nrf_usbd_common_evt_t const *const event)
+static void udc_event_xfer_in(const struct device *dev, const uint8_t ep)
 {
-	uint8_t ep = event->data.eptransfer.ep;
+	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
 
-	switch (event->data.eptransfer.status) {
-	case NRF_USBD_COMMON_EP_OK:
-		buf = udc_buf_get(dev, ep);
-		if (buf == NULL) {
-			LOG_ERR("ep 0x%02x queue is empty", ep);
-			__ASSERT_NO_MSG(false);
-			return;
-		}
+	ep_cfg = udc_get_ep_cfg(dev, ep);
 
-		udc_ep_set_busy(dev, ep, false);
-		if (ep == USB_CONTROL_EP_IN) {
-			udc_event_xfer_ctrl_in(dev, buf);
-			return;
-		}
+	buf = udc_buf_get(ep_cfg);
+	if (buf == NULL) {
+		LOG_ERR("ep 0x%02x queue is empty", ep);
+		__ASSERT_NO_MSG(false);
+		return;
+	}
 
+	udc_ep_set_busy(ep_cfg, false);
+	if (ep == USB_CONTROL_EP_IN) {
+		udc_event_xfer_ctrl_in(dev, buf);
+	} else {
 		udc_submit_ep_event(dev, buf, 0);
-		break;
-
-	case NRF_USBD_COMMON_EP_ABORTED:
-		LOG_WRN("aborted IN ep 0x%02x", ep);
-		buf = udc_buf_get_all(dev, ep);
-
-		if (buf == NULL) {
-			LOG_DBG("ep 0x%02x queue is empty", ep);
-			return;
-		}
-
-		udc_ep_set_busy(dev, ep, false);
-		udc_submit_ep_event(dev, buf, -ECONNABORTED);
-		break;
-
-	default:
-		LOG_ERR("Unexpected event (nrfx_usbd): %d, ep 0x%02x",
-			event->data.eptransfer.status, ep);
-		udc_submit_event(dev, UDC_EVT_ERROR, -EIO);
-		break;
 	}
 }
 
@@ -225,83 +1266,45 @@ static void udc_event_xfer_ctrl_out(const struct device *dev,
 
 static void udc_event_xfer_out_next(const struct device *dev, const uint8_t ep)
 {
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf != NULL) {
-		nrf_usbd_common_transfer_t xfer = {
-			.p_data = {.rx = buf->data},
-			.size = buf->size,
-			.flags = 0,
-		};
-		nrfx_err_t err;
-
-		err = nrf_usbd_common_ep_transfer(ep, &xfer);
-		if (err != NRFX_SUCCESS) {
-			LOG_ERR("ep 0x%02x nrfx error: %x", ep, err);
-			/* REVISE: remove from endpoint queue? ASSERT? */
-		} else {
-			udc_ep_set_busy(dev, ep, true);
-		}
+		nrf_usbd_start_transfer(ep);
+		udc_ep_set_busy(ep_cfg, true);
 	} else {
 		LOG_DBG("ep 0x%02x waiting, queue is empty", ep);
 	}
 }
 
-static void udc_event_xfer_out(const struct device *dev,
-			       nrf_usbd_common_evt_t const *const event)
+static void udc_event_xfer_out(const struct device *dev, const uint8_t ep)
 {
-	uint8_t ep = event->data.eptransfer.ep;
-	nrf_usbd_common_ep_status_t err_code;
+	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
-	size_t len;
 
-	switch (event->data.eptransfer.status) {
-	case NRF_USBD_COMMON_EP_WAITING:
-		/*
-		 * There is nothing to do here, new transfer
-		 * will be tried in both cases later.
-		 */
-		break;
-
-	case NRF_USBD_COMMON_EP_OK:
-		err_code = nrf_usbd_common_ep_status_get(ep, &len);
-		if (err_code != NRF_USBD_COMMON_EP_OK) {
-			LOG_ERR("OUT transfer failed %d", err_code);
-		}
-
-		buf = udc_buf_get(dev, ep);
-		if (buf == NULL) {
-			LOG_ERR("ep 0x%02x ok, queue is empty", ep);
-			return;
-		}
-
-		net_buf_add(buf, len);
-		udc_ep_set_busy(dev, ep, false);
-		if (ep == USB_CONTROL_EP_OUT) {
-			udc_event_xfer_ctrl_out(dev, buf);
-		} else {
-			udc_submit_ep_event(dev, buf, 0);
-		}
-
-		break;
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	buf = udc_buf_get(ep_cfg);
+	if (buf == NULL) {
+		LOG_ERR("ep 0x%02x ok, queue is empty", ep);
+		return;
+	}
 
-	default:
-		LOG_ERR("Unexpected event (nrfx_usbd): %d, ep 0x%02x",
-			event->data.eptransfer.status, ep);
-		udc_submit_event(dev, UDC_EVT_ERROR, -EIO);
-		break;
+	udc_ep_set_busy(ep_cfg, false);
+	if (ep == USB_CONTROL_EP_OUT) {
+		udc_event_xfer_ctrl_out(dev, buf);
+	} else {
+		udc_submit_ep_event(dev, buf, 0);
 	}
 }
 
 static int usbd_ctrl_feed_dout(const struct device *dev,
 			       const size_t length)
 {
-
 	struct udc_ep_config *cfg = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
 	struct net_buf *buf;
 
@@ -310,18 +1313,39 @@ static int usbd_ctrl_feed_dout(const struct device *dev,
 		return -ENOMEM;
 	}
 
-	k_fifo_put(&cfg->fifo, buf);
-	udc_nrf_clear_control_out(dev);
+	udc_buf_put(cfg, buf);
+
+	__ASSERT_NO_MSG(k_current_get() == &drv_stack_data);
+	udc_event_xfer_out_next(dev, USB_CONTROL_EP_OUT);
+
+	/* Allow receiving first OUT Data Stage packet */
+	NRF_USBD->TASKS_EP0RCVOUT = 1;
 
 	return 0;
 }
 
 static int udc_event_xfer_setup(const struct device *dev)
 {
-	nrf_usbd_common_setup_t *setup;
+	struct udc_ep_config *cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct udc_ep_config *cfg_in = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
+	struct usb_setup_packet *setup;
 	struct net_buf *buf;
 	int err;
 
+	/* Make sure there isn't any obsolete data stage buffer queued */
+	buf = udc_buf_get_all(cfg_out);
+	if (buf) {
+		net_buf_unref(buf);
+	}
+
+	buf = udc_buf_get_all(cfg_in);
+	if (buf) {
+		net_buf_unref(buf);
+	}
+
+	udc_ep_set_busy(cfg_out, false);
+	udc_ep_set_busy(cfg_in, false);
+
 	buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT,
 			     sizeof(struct usb_setup_packet));
 	if (buf == NULL) {
@@ -330,8 +1354,12 @@ static int udc_event_xfer_setup(const struct device *dev)
 	}
 
 	udc_ep_buf_set_setup(buf);
-	setup = (nrf_usbd_common_setup_t *)buf->data;
-	nrf_usbd_common_setup_get(setup);
+	setup = (struct usb_setup_packet *)buf->data;
+	setup->bmRequestType = NRF_USBD->BMREQUESTTYPE;
+	setup->bRequest = NRF_USBD->BREQUEST;
+	setup->wValue = NRF_USBD->WVALUEL | (NRF_USBD->WVALUEH << 8);
+	setup->wIndex = NRF_USBD->WINDEXL | (NRF_USBD->WINDEXH << 8);
+	setup->wLength = NRF_USBD->WLENGTHL | (NRF_USBD->WLENGTHH << 8);
 
 	/* USBD peripheral automatically handles Set Address in slightly
 	 * different manner than the USB stack.
@@ -402,7 +1430,6 @@ static int udc_event_xfer_setup(const struct device *dev)
 	}
 
 	net_buf_add(buf, sizeof(nrf_usbd_common_setup_t));
-	udc_nrf_setup_rcvd = true;
 
 	/* Update to next stage of control transfer */
 	udc_ctrl_update_stage(dev, buf);
@@ -410,11 +1437,13 @@ static int udc_event_xfer_setup(const struct device *dev)
 	if (udc_ctrl_stage_is_data_out(dev)) {
 		/*  Allocate and feed buffer for data OUT stage */
 		LOG_DBG("s:%p|feed for -out-", buf);
+		m_ep0_data_dir = USB_CONTROL_EP_OUT;
 		err = usbd_ctrl_feed_dout(dev, udc_data_stage_length(buf));
 		if (err == -ENOMEM) {
 			err = udc_submit_ep_event(dev, buf, err);
 		}
 	} else if (udc_ctrl_stage_is_data_in(dev)) {
+		m_ep0_data_dir = USB_CONTROL_EP_IN;
 		err = udc_ctrl_submit_s_in_status(dev);
 	} else {
 		err = udc_ctrl_submit_s_status(dev);
@@ -423,65 +1452,63 @@ static int udc_event_xfer_setup(const struct device *dev)
 	return err;
 }
 
-static void udc_nrf_thread(void *p1, void *p2, void *p3)
+static void udc_nrf_thread_handler(const struct device *dev)
 {
-	ARG_UNUSED(p2);
-	ARG_UNUSED(p3);
+	uint32_t evt;
 
-	const struct device *dev = p1;
+	/* Wait for at least one event */
+	k_event_wait(&drv_evt, UINT32_MAX, false, K_FOREVER);
 
-	while (true) {
-		bool start_xfer = false;
-		struct udc_nrf_evt evt;
-		uint8_t ep;
-
-		k_msgq_get(&drv_msgq, &evt, K_FOREVER);
-
-		switch (evt.type) {
-		case UDC_NRF_EVT_HAL:
-			ep = evt.hal_evt.data.eptransfer.ep;
-			switch (evt.hal_evt.type) {
-			case NRF_USBD_COMMON_EVT_SUSPEND:
-				LOG_INF("SUSPEND state detected");
-				nrf_usbd_common_suspend();
-				udc_set_suspended(udc_nrf_dev, true);
-				udc_submit_event(udc_nrf_dev, UDC_EVT_SUSPEND, 0);
-				break;
-			case NRF_USBD_COMMON_EVT_RESUME:
-				LOG_INF("RESUMING from suspend");
-				udc_set_suspended(udc_nrf_dev, false);
-				udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
-				break;
-			case NRF_USBD_COMMON_EVT_WUREQ:
-				LOG_INF("Remote wakeup initiated");
-				udc_set_suspended(udc_nrf_dev, false);
-				udc_submit_event(udc_nrf_dev, UDC_EVT_RESUME, 0);
-				break;
-			case NRF_USBD_COMMON_EVT_EPTRANSFER:
-				start_xfer = true;
-				if (USB_EP_DIR_IS_IN(ep)) {
-					udc_event_xfer_in(dev, &evt.hal_evt);
-				} else {
-					udc_event_xfer_out(dev, &evt.hal_evt);
-				}
-				break;
-			case NRF_USBD_COMMON_EVT_SETUP:
-				udc_event_xfer_setup(dev);
-				break;
-			default:
-				break;
+	/* Process all events that are set */
+	evt = k_event_clear(&drv_evt, UINT32_MAX);
+
+	if (evt & BIT(UDC_NRF_EVT_SUSPEND)) {
+		LOG_INF("SUSPEND state detected");
+		nrf_usbd_legacy_suspend();
+		udc_set_suspended(dev, true);
+		udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
+	}
+
+	if (evt & BIT(UDC_NRF_EVT_RESUME)) {
+		LOG_INF("RESUMING from suspend");
+		udc_set_suspended(dev, false);
+		udc_submit_event(dev, UDC_EVT_RESUME, 0);
+	}
+
+	if (evt & BIT(UDC_NRF_EVT_WUREQ)) {
+		LOG_INF("Remote wakeup initiated");
+		udc_set_suspended(dev, false);
+		udc_submit_event(dev, UDC_EVT_RESUME, 0);
+	}
+
+	if (evt & BIT(UDC_NRF_EVT_EP_FINISHED)) {
+		uint32_t eps = atomic_clear(&xfer_finished);
+
+		while (eps) {
+			uint8_t bitpos = NRF_CTZ(eps);
+			nrf_usbd_common_ep_t ep = bit2ep(bitpos);
+
+			eps &= ~BIT(bitpos);
+
+			if (USB_EP_DIR_IS_IN(ep)) {
+				udc_event_xfer_in(dev, ep);
+				udc_event_xfer_in_next(dev, ep);
+			} else {
+				udc_event_xfer_out(dev, ep);
+				udc_event_xfer_out_next(dev, ep);
 			}
-			break;
-		case UDC_NRF_EVT_XFER:
-			start_xfer = true;
-			ep = evt.ep;
-			break;
-		case UDC_NRF_EVT_STATUS_IN:
-			udc_event_fake_status_in(dev);
-			break;
 		}
+	}
+
+	if (evt & BIT(UDC_NRF_EVT_XFER)) {
+		uint32_t eps = atomic_clear(&xfer_new);
+
+		while (eps) {
+			uint8_t bitpos = NRF_CTZ(eps);
+			nrf_usbd_common_ep_t ep = bit2ep(bitpos);
+
+			eps &= ~BIT(bitpos);
 
-		if (start_xfer) {
 			if (USB_EP_DIR_IS_IN(ep)) {
 				udc_event_xfer_in_next(dev, ep);
 			} else {
@@ -489,56 +1516,25 @@ static void udc_nrf_thread(void *p1, void *p2, void *p3)
 			}
 		}
 	}
-}
-
-static void udc_sof_check_iso_out(const struct device *dev)
-{
-	const uint8_t iso_out_addr = 0x08;
-	struct udc_nrf_evt evt = {
-		.type = UDC_NRF_EVT_XFER,
-		.ep = iso_out_addr,
-	};
-	struct udc_ep_config *ep_cfg;
 
-	ep_cfg = udc_get_ep_cfg(dev, iso_out_addr);
-	if (ep_cfg == NULL) {
-		return;
+	if (evt & BIT(UDC_NRF_EVT_STATUS_IN)) {
+		udc_event_fake_status_in(dev);
 	}
 
-	if (ep_cfg->stat.enabled && !k_fifo_is_empty(&ep_cfg->fifo)) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	if (evt & BIT(UDC_NRF_EVT_SETUP)) {
+		udc_event_xfer_setup(dev);
 	}
 }
 
-static void usbd_event_handler(nrf_usbd_common_evt_t const *const hal_evt)
+static void udc_nrf_thread(void *p1, void *p2, void *p3)
 {
-	switch (hal_evt->type) {
-	case NRF_USBD_COMMON_EVT_RESET:
-		LOG_INF("Reset");
-		udc_submit_event(udc_nrf_dev, UDC_EVT_RESET, 0);
-		break;
-	case NRF_USBD_COMMON_EVT_SOF:
-		udc_submit_event(udc_nrf_dev, UDC_EVT_SOF, 0);
-		udc_sof_check_iso_out(udc_nrf_dev);
-		break;
-	case NRF_USBD_COMMON_EVT_SUSPEND:
-	case NRF_USBD_COMMON_EVT_RESUME:
-	case NRF_USBD_COMMON_EVT_WUREQ:
-	case NRF_USBD_COMMON_EVT_EPTRANSFER:
-	case NRF_USBD_COMMON_EVT_SETUP: {
-		struct udc_nrf_evt evt = {
-			.type = UDC_NRF_EVT_HAL,
-			.hal_evt = *hal_evt,
-		};
-
-		/* Forward these two to the thread since mutually exclusive
-		 * access to the controller is necessary.
-		 */
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-		break;
-	}
-	default:
-		break;
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+
+	const struct device *dev = p1;
+
+	while (true) {
+		udc_nrf_thread_handler(dev);
 	}
 }
 
@@ -551,7 +1547,7 @@ static void udc_nrf_power_handler(nrfx_power_usb_evt_t pwr_evt)
 		break;
 	case NRFX_POWER_USB_EVT_READY:
 		LOG_DBG("POWER event ready");
-		nrf_usbd_common_start(true);
+		nrf_usbd_legacy_start(true);
 		break;
 	case NRFX_POWER_USB_EVT_REMOVED:
 		LOG_DBG("POWER event removed");
@@ -562,41 +1558,24 @@ static void udc_nrf_power_handler(nrfx_power_usb_evt_t pwr_evt)
 	}
 }
 
-static bool udc_nrf_fake_status_in(const struct device *dev)
-{
-	struct udc_nrf_evt evt = {
-		.type = UDC_NRF_EVT_STATUS_IN,
-		.ep = USB_CONTROL_EP_IN,
-	};
-
-	if (nrf_usbd_common_last_setup_dir_get() == USB_CONTROL_EP_OUT ||
-	    udc_nrf_fake_setup) {
-		/* Let controller perform status IN stage */
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-		return true;
-	}
-
-	return false;
-}
-
 static int udc_nrf_ep_enqueue(const struct device *dev,
 			      struct udc_ep_config *cfg,
 			      struct net_buf *buf)
 {
-	struct udc_nrf_evt evt = {
-		.type = UDC_NRF_EVT_XFER,
-		.ep = cfg->addr,
-	};
-
 	udc_buf_put(cfg, buf);
 
 	if (cfg->addr == USB_CONTROL_EP_IN && buf->len == 0) {
-		if (udc_nrf_fake_status_in(dev)) {
+		const struct udc_buf_info *bi = udc_get_buf_info(buf);
+
+		if (bi->status) {
+			/* Controller automatically performs status IN stage */
+			k_event_post(&drv_evt, BIT(UDC_NRF_EVT_STATUS_IN));
 			return 0;
 		}
 	}
 
-	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	atomic_set_bit(&xfer_new, ep2bit(cfg->addr));
+	k_event_post(&drv_evt, BIT(UDC_NRF_EVT_XFER));
 
 	return 0;
 }
@@ -604,26 +1583,18 @@ static int udc_nrf_ep_enqueue(const struct device *dev,
 static int udc_nrf_ep_dequeue(const struct device *dev,
 			      struct udc_ep_config *cfg)
 {
-	bool busy = nrf_usbd_common_ep_is_busy(cfg->addr);
-
-	nrf_usbd_common_ep_abort(cfg->addr);
-	if (USB_EP_DIR_IS_OUT(cfg->addr) || !busy) {
-		struct net_buf *buf;
+	struct net_buf *buf;
 
-		/*
-		 * HAL driver does not generate event for an OUT endpoint
-		 * or when IN endpoint is not busy.
-		 */
-		buf = udc_buf_get_all(dev, cfg->addr);
-		if (buf) {
-			udc_submit_ep_event(dev, buf, -ECONNABORTED);
-		} else {
-			LOG_INF("ep 0x%02x queue is empty", cfg->addr);
-		}
+	nrf_usbd_legacy_ep_abort(cfg->addr);
 
+	buf = udc_buf_get_all(cfg);
+	if (buf) {
+		udc_submit_ep_event(dev, buf, -ECONNABORTED);
+	} else {
+		LOG_INF("ep 0x%02x queue is empty", cfg->addr);
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	return 0;
 }
@@ -635,14 +1606,13 @@ static int udc_nrf_ep_enable(const struct device *dev,
 
 	__ASSERT_NO_MSG(cfg);
 	mps = (udc_mps_ep_size(cfg) == 0) ? cfg->caps.mps : udc_mps_ep_size(cfg);
-	nrf_usbd_common_ep_max_packet_size_set(cfg->addr, mps);
-	nrf_usbd_common_ep_enable(cfg->addr);
+	nrf_usbd_legacy_ep_enable(cfg->addr);
 	if (!NRF_USBD_EPISO_CHECK(cfg->addr)) {
 		/* ISO transactions for full-speed device do not support
 		 * toggle sequencing and should only send DATA0 PID.
 		 */
-		nrf_usbd_common_ep_dtoggle_clear(cfg->addr);
-		nrf_usbd_common_ep_stall_clear(cfg->addr);
+		nrf_usbd_legacy_ep_dtoggle_clear(cfg->addr);
+		nrf_usbd_legacy_ep_stall_clear(cfg->addr);
 	}
 
 	LOG_DBG("Enable ep 0x%02x", cfg->addr);
@@ -654,7 +1624,7 @@ static int udc_nrf_ep_disable(const struct device *dev,
 			      struct udc_ep_config *cfg)
 {
 	__ASSERT_NO_MSG(cfg);
-	nrf_usbd_common_ep_disable(cfg->addr);
+	nrf_usbd_legacy_ep_disable(cfg->addr);
 	LOG_DBG("Disable ep 0x%02x", cfg->addr);
 
 	return 0;
@@ -667,9 +1637,9 @@ static int udc_nrf_ep_set_halt(const struct device *dev,
 
 	if (cfg->addr == USB_CONTROL_EP_OUT ||
 	    cfg->addr == USB_CONTROL_EP_IN) {
-		nrf_usbd_common_setup_stall();
+		NRF_USBD->TASKS_EP0STALL = 1;
 	} else {
-		nrf_usbd_common_ep_stall(cfg->addr);
+		nrf_usbd_legacy_ep_stall(cfg->addr);
 	}
 
 	return 0;
@@ -680,8 +1650,8 @@ static int udc_nrf_ep_clear_halt(const struct device *dev,
 {
 	LOG_DBG("Clear halt ep 0x%02x", cfg->addr);
 
-	nrf_usbd_common_ep_dtoggle_clear(cfg->addr);
-	nrf_usbd_common_ep_stall_clear(cfg->addr);
+	nrf_usbd_legacy_ep_dtoggle_clear(cfg->addr);
+	nrf_usbd_legacy_ep_stall_clear(cfg->addr);
 
 	return 0;
 }
@@ -709,17 +1679,10 @@ static int udc_nrf_set_address(const struct device *dev, const uint8_t addr)
 	udc_nrf_address = addr;
 
 	if (udc_nrf_fake_setup) {
-		struct udc_nrf_evt evt = {
-			.type = UDC_NRF_EVT_HAL,
-			.hal_evt = {
-				.type = NRF_USBD_COMMON_EVT_SETUP,
-			},
-		};
-
 		/* Finished handling lost Set Address, now handle the pending
 		 * SETUP transfer.
 		 */
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		k_event_post(&drv_evt, BIT(UDC_NRF_EVT_SETUP));
 	}
 
 	return 0;
@@ -727,7 +1690,7 @@ static int udc_nrf_set_address(const struct device *dev, const uint8_t addr)
 
 static int udc_nrf_host_wakeup(const struct device *dev)
 {
-	bool res = nrf_usbd_common_wakeup_req();
+	bool res = nrf_usbd_legacy_wakeup_req();
 
 	LOG_DBG("Host wakeup request");
 	if (!res) {
@@ -742,12 +1705,6 @@ static int udc_nrf_enable(const struct device *dev)
 	unsigned int key;
 	int ret;
 
-	ret = nrf_usbd_common_init(usbd_event_handler);
-	if (ret != NRFX_SUCCESS) {
-		LOG_ERR("nRF USBD driver initialization failed");
-		return -EIO;
-	}
-
 	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_OUT,
 				   USB_EP_TYPE_CONTROL, UDC_NRF_EP0_SIZE, 0)) {
 		LOG_ERR("Failed to enable control endpoint");
@@ -769,7 +1726,7 @@ static int udc_nrf_enable(const struct device *dev)
 
 	/* Disable interrupts until USBD is enabled */
 	key = irq_lock();
-	nrf_usbd_common_enable();
+	nrf_usbd_legacy_enable();
 	irq_unlock(key);
 
 	return 0;
@@ -779,7 +1736,7 @@ static int udc_nrf_disable(const struct device *dev)
 {
 	int ret;
 
-	nrf_usbd_common_disable();
+	nrf_usbd_legacy_disable();
 
 	if (udc_ep_disable_internal(dev, USB_CONTROL_EP_OUT)) {
 		LOG_ERR("Failed to disable control endpoint");
@@ -791,8 +1748,6 @@ static int udc_nrf_disable(const struct device *dev)
 		return -EIO;
 	}
 
-	nrf_usbd_common_uninit();
-
 	ret = onoff_cancel_or_release(hfxo_mgr, &hfxo_cli);
 	if (ret < 0) {
 		LOG_ERR("Failed to stop HFXO %d", ret);
@@ -815,11 +1770,10 @@ static int udc_nrf_init(const struct device *dev)
 	IRQ_CONNECT(USBREGULATOR_IRQn,
 		    DT_IRQ(DT_INST(0, nordic_nrf_clock), priority),
 		    nrfx_isr, nrfx_usbreg_irq_handler, 0);
-	irq_enable(USBREGULATOR_IRQn);
 #endif
 
 	IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),
-		    nrfx_isr, nrf_usbd_common_irq_handler, 0);
+		    nrfx_isr, nrf_usbd_irq_handler, 0);
 
 	(void)nrfx_power_init(&cfg->pwr);
 	nrfx_power_usbevt_init(&cfg->evt);
@@ -836,9 +1790,6 @@ static int udc_nrf_shutdown(const struct device *dev)
 
 	nrfx_power_usbevt_disable();
 	nrfx_power_usbevt_uninit();
-#ifdef CONFIG_HAS_HW_NRF_USBREG
-	irq_disable(USBREGULATOR_IRQn);
-#endif
 
 	return 0;
 }
diff --git a/drivers/usb/udc/udc_numaker.c b/drivers/usb/udc/udc_numaker.c
index 5545132944d21..983a9210b36b1 100644
--- a/drivers/usb/udc/udc_numaker.c
+++ b/drivers/usb/udc/udc_numaker.c
@@ -505,6 +505,7 @@ static void numaker_usbd_ep_config_dmabuf(struct numaker_usbd_ep *ep_cur, uint32
 
 static void numaker_usbd_ep_abort(struct numaker_usbd_ep *ep_cur)
 {
+	struct udc_ep_config *ep_cfg;
 	const struct device *dev = ep_cur->dev;
 	USBD_EP_T *ep_base = numaker_usbd_ep_base(dev, ep_cur->ep_hw_idx);
 
@@ -512,7 +513,8 @@ static void numaker_usbd_ep_abort(struct numaker_usbd_ep *ep_cur)
 	ep_base->CFGP |= USBD_CFGP_CLRRDY_Msk;
 
 	if (ep_cur->addr_valid) {
-		udc_ep_set_busy(dev, ep_cur->addr, false);
+		ep_cfg = udc_get_ep_cfg(dev, ep_cur->addr);
+		udc_ep_set_busy(ep_cfg, false);
 	}
 }
 
@@ -589,11 +591,13 @@ static void numaker_usbd_ep_disable(struct numaker_usbd_ep *ep_cur)
 /* Start EP data transaction */
 static void udc_numaker_ep_trigger(struct numaker_usbd_ep *ep_cur, uint32_t len)
 {
+	struct udc_ep_config *ep_cfg;
 	const struct device *dev = ep_cur->dev;
 	USBD_EP_T *ep_base = numaker_usbd_ep_base(dev, ep_cur->ep_hw_idx);
 
 	if (ep_cur->addr_valid) {
-		udc_ep_set_busy(dev, ep_cur->addr, true);
+		ep_cfg = udc_get_ep_cfg(dev, ep_cur->addr);
+		udc_ep_set_busy(ep_cfg, true);
 	}
 
 	ep_base->MXPLD = len;
@@ -762,13 +766,15 @@ static int numaker_usbd_xfer_out(const struct device *dev, uint8_t ep, bool stri
 {
 	struct net_buf *buf;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 
 	if (!USB_EP_DIR_IS_OUT(ep)) {
 		LOG_ERR("Invalid EP address 0x%02x for data out", ep);
 		return -EINVAL;
 	}
 
-	if (udc_ep_is_busy(dev, ep)) {
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	if (udc_ep_is_busy(ep_cfg)) {
 		if (strict) {
 			LOG_ERR("EP 0x%02x busy", ep);
 			return -EAGAIN;
@@ -777,7 +783,7 @@ static int numaker_usbd_xfer_out(const struct device *dev, uint8_t ep, bool stri
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		if (strict) {
 			LOG_ERR("No buffer queued for EP 0x%02x", ep);
@@ -803,6 +809,7 @@ static int numaker_usbd_xfer_in(const struct device *dev, uint8_t ep, bool stric
 {
 	struct net_buf *buf;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 	uint32_t data_len;
 
 	if (!USB_EP_DIR_IS_IN(ep)) {
@@ -810,7 +817,8 @@ static int numaker_usbd_xfer_in(const struct device *dev, uint8_t ep, bool stric
 		return -EINVAL;
 	}
 
-	if (udc_ep_is_busy(dev, ep)) {
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	if (udc_ep_is_busy(ep_cfg)) {
 		if (strict) {
 			LOG_ERR("EP 0x%02x busy", ep);
 			return -EAGAIN;
@@ -819,7 +827,7 @@ static int numaker_usbd_xfer_in(const struct device *dev, uint8_t ep, bool stric
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		if (strict) {
 			LOG_ERR("No buffer queued for EP 0x%02x", ep);
@@ -944,6 +952,7 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 	int err;
 	uint8_t ep;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
 	uint8_t *data_ptr;
 	uint32_t data_len;
@@ -952,8 +961,9 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 	__ASSERT_NO_MSG(msg->type == NUMAKER_USBD_MSG_TYPE_OUT);
 
 	ep = msg->out.ep;
+	ep_cfg = udc_get_ep_cfg(dev, ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	/* Bind EP H/W context to EP address */
 	ep_cur = numaker_usbd_ep_mgmt_bind_ep(dev, ep);
@@ -962,7 +972,7 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 		return -ENODEV;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer queued for ep=0x%02x", ep);
 		return -ENODATA;
@@ -993,7 +1003,7 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
 	}
 
 	/* To submit the peeked buffer */
-	udc_buf_get(dev, ep);
+	udc_buf_get(ep_cfg);
 
 	if (ep == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -1037,13 +1047,15 @@ static int numaker_usbd_msg_handle_in(const struct device *dev, struct numaker_u
 	int err;
 	uint8_t ep;
 	struct numaker_usbd_ep *ep_cur;
+	struct udc_ep_config *ep_cfg;
 	struct net_buf *buf;
 
 	__ASSERT_NO_MSG(msg->type == NUMAKER_USBD_MSG_TYPE_IN);
 
 	ep = msg->in.ep;
+	ep_cfg = udc_get_ep_cfg(dev, ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	/* Bind EP H/W context to EP address */
 	ep_cur = numaker_usbd_ep_mgmt_bind_ep(dev, ep);
@@ -1052,7 +1064,7 @@ static int numaker_usbd_msg_handle_in(const struct device *dev, struct numaker_u
 		return -ENODEV;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		/* No DATA IN request */
 		return 0;
@@ -1063,7 +1075,7 @@ static int numaker_usbd_msg_handle_in(const struct device *dev, struct numaker_u
 	}
 
 	/* To submit the peeked buffer */
-	udc_buf_get(dev, ep);
+	udc_buf_get(ep_cfg);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) || udc_ctrl_stage_is_no_data(dev)) {
@@ -1408,7 +1420,7 @@ static int udc_numaker_ep_dequeue(const struct device *dev, struct udc_ep_config
 
 	numaker_usbd_ep_abort(ep_cur);
 
-	buf = udc_buf_get_all(dev, ep_cfg->addr);
+	buf = udc_buf_get_all(ep_cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
@@ -1561,7 +1573,7 @@ static int udc_numaker_enable(const struct device *dev)
 
 static int udc_numaker_disable(const struct device *dev)
 {
-	LOG_DBG("Enable device %p", dev);
+	LOG_DBG("Disable device %p", dev);
 
 	/* S/W disconnect */
 	numaker_usbd_sw_disconnect(dev);
diff --git a/drivers/usb/udc/udc_renesas_ra.c b/drivers/usb/udc/udc_renesas_ra.c
index 66f3ae3084049..4c9a9438db727 100644
--- a/drivers/usb/udc/udc_renesas_ra.c
+++ b/drivers/usb/udc/udc_renesas_ra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,6 +17,8 @@ LOG_MODULE_REGISTER(udc_renesas_ra, CONFIG_UDC_DRIVER_LOG_LEVEL);
 
 struct udc_renesas_ra_config {
 	const struct pinctrl_dev_config *pcfg;
+	const struct device **clocks;
+	size_t num_of_clocks;
 	size_t num_of_eps;
 	struct udc_ep_config *ep_cfg_in;
 	struct udc_ep_config *ep_cfg_out;
@@ -97,13 +99,14 @@ static void udc_renesas_ra_interrupt_handler(void *arg)
 static void udc_event_xfer_next(const struct device *dev, const uint8_t ep)
 {
 	struct udc_renesas_ra_data *data = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf != NULL) {
 		int err;
 
@@ -117,7 +120,7 @@ static void udc_event_xfer_next(const struct device *dev, const uint8_t ep)
 			LOG_ERR("ep 0x%02x error", ep);
 			udc_submit_ep_event(dev, buf, -ECONNREFUSED);
 		} else {
-			udc_ep_set_busy(dev, ep, true);
+			udc_ep_set_busy(ep_cfg, true);
 		}
 	}
 }
@@ -200,7 +203,7 @@ static void udc_event_status_in(const struct device *dev)
 	struct udc_renesas_ra_data *data = udc_get_private(dev);
 	struct net_buf *buf;
 
-	buf = udc_buf_get(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get(udc_get_ep_cfg(dev, USB_CONTROL_EP_IN));
 	if (unlikely(buf == NULL)) {
 		LOG_DBG("ep 0x%02x queue is empty", USB_CONTROL_EP_IN);
 		return;
@@ -234,14 +237,16 @@ static void udc_event_xfer_complete(const struct device *dev, struct udc_renesas
 {
 	struct net_buf *buf;
 	struct udc_renesas_ra_data *data = udc_get_private(dev);
+	struct udc_ep_config *ep_cfg;
 
 	uint8_t ep = evt->hal_evt.xfer_complete.ep_addr;
 	usbd_xfer_result_t result = evt->hal_evt.xfer_complete.result;
 	uint32_t len = evt->hal_evt.xfer_complete.len;
 
-	udc_ep_set_busy(dev, ep, false);
+	ep_cfg = udc_get_ep_cfg(dev, ep);
+	udc_ep_set_busy(ep_cfg, false);
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		return;
 	}
@@ -260,7 +265,7 @@ static void udc_event_xfer_complete(const struct device *dev, struct udc_renesas
 		return;
 	}
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		udc_event_xfer_ctrl_in(dev, buf);
@@ -351,7 +356,7 @@ static int udc_renesas_ra_ep_dequeue(const struct device *dev, struct udc_ep_con
 
 	lock_key = irq_lock();
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf != NULL) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
@@ -360,7 +365,7 @@ static int udc_renesas_ra_ep_dequeue(const struct device *dev, struct udc_ep_con
 		return -EIO;
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	irq_unlock(lock_key);
 
@@ -488,7 +493,7 @@ static int udc_renesas_ra_disable(const struct device *dev)
 		return -EIO;
 	}
 
-	LOG_DBG("Enable device %p", dev);
+	LOG_DBG("Disable device %p", dev);
 
 	return 0;
 }
@@ -497,43 +502,6 @@ static int udc_renesas_ra_init(const struct device *dev)
 {
 	struct udc_renesas_ra_data *data = udc_get_private(dev);
 
-#if !USBHS_PHY_CLOCK_SOURCE_IS_XTAL
-	if (data->udc_cfg.usb_speed == USBD_SPEED_HS) {
-		LOG_ERR("High-speed operation is not supported in case PHY clock source is not "
-			"XTAL");
-		return -ENOTSUP;
-	}
-
-	uint32_t uclk_src = RA_CGC_CLK_SRC(DT_CLOCKS_CTLR(DT_NODELABEL(uclk)));
-	uint32_t uclk_div = DT_PROP_OR(DT_NODELABEL(uclk), div, 1);
-	uint32_t u60clk_src = RA_CGC_CLK_SRC(DT_CLOCKS_CTLR(DT_NODELABEL(u60clk)));
-	uint32_t u60clk_div = DT_PROP_OR(DT_NODELABEL(u60clk), div, 1);
-
-	if (uclk_src == BSP_CLOCKS_CLOCK_DISABLED || u60clk_src == BSP_CLOCKS_CLOCK_DISABLED) {
-		LOG_ERR("PHY clock is not working");
-		return -EINVAL;
-	}
-
-	uint32_t uclk_clock_rate = R_BSP_SourceClockHzGet(uclk_src) / uclk_div;
-	uint32_t u60clk_clock_rate = R_BSP_SourceClockHzGet(u60clk_src) / u60clk_div;
-
-	if (uclk_clock_rate != 48000000) {
-		LOG_ERR("Setting for uclk should be 48Mhz");
-		return -ENOTSUP;
-	}
-
-	if (u60clk_clock_rate != 60000000) {
-		LOG_ERR("Setting for u60clk should be 60Mhz");
-		return -ENOTSUP;
-	}
-#endif
-
-	if (!(data->udc_cfg.usb_speed == USBD_SPEED_HS ||
-	      data->udc_cfg.usb_speed == USBD_SPEED_FS)) {
-		LOG_ERR("USB device mode support full-speed and high-speed only");
-		return -ENOTSUP;
-	}
-
 	if (FSP_SUCCESS != R_USBD_Open(&data->udc, &data->udc_cfg)) {
 		return -EIO;
 	}
@@ -548,7 +516,19 @@ static int udc_renesas_ra_init(const struct device *dev)
 		return -EIO;
 	}
 
-	irq_enable(data->udc_cfg.hs_irq);
+#if DT_HAS_COMPAT_STATUS_OKAY(renesas_ra_usbhs)
+	if (data->udc_cfg.hs_irq != (IRQn_Type)BSP_IRQ_DISABLED) {
+		irq_enable(data->udc_cfg.hs_irq);
+	}
+#endif
+
+	if (data->udc_cfg.irq != (IRQn_Type)BSP_IRQ_DISABLED) {
+		irq_enable(data->udc_cfg.irq);
+	}
+
+	if (data->udc_cfg.irq_r != (IRQn_Type)BSP_IRQ_DISABLED) {
+		irq_enable(data->udc_cfg.irq_r);
+	}
 
 	return 0;
 }
@@ -574,13 +554,86 @@ static int udc_renesas_ra_shutdown(const struct device *dev)
 	return 0;
 }
 
+static int udc_renesas_ra_clock_check(const struct device *dev)
+{
+	const struct udc_renesas_ra_config *config = dev->config;
+
+#if USBHS_PHY_CLOCK_SOURCE_IS_XTAL
+	if (config->speed_idx == UDC_BUS_SPEED_HS) {
+		if (BSP_CFG_XTAL_HZ == 0) {
+			LOG_ERR("XTAL clock should be provided");
+			return -EINVAL;
+		}
+
+		return 0;
+	}
+#endif
+
+	for (size_t i = 0; i < config->num_of_clocks; i++) {
+		const struct device *clock_dev = *(config->clocks + i);
+		const struct clock_control_ra_pclk_cfg *clock_cfg = clock_dev->config;
+		uint32_t clk_src_rate;
+		uint32_t clock_rate;
+
+		if (!device_is_ready(clock_dev)) {
+			LOG_ERR("%s is not ready", clock_dev->name);
+			return -ENODEV;
+		}
+
+		clk_src_rate = R_BSP_SourceClockHzGet(clock_cfg->clk_src);
+		clock_rate = clk_src_rate / clock_cfg->clk_div;
+
+		if (strcmp(clock_dev->name, "uclk") == 0 && clock_rate != MHZ(48)) {
+			LOG_ERR("Setting for uclk should be 48Mhz");
+			return -ENOTSUP;
+		}
+
+#if DT_HAS_COMPAT_STATUS_OKAY(renesas_ra_usbhs)
+		if (strcmp(clock_dev->name, "u60clk") == 0 && clock_rate != MHZ(60)) {
+			LOG_ERR("Setting for u60clk should be 60Mhz");
+			return -ENOTSUP;
+		}
+#endif
+	}
+
+	return 0;
+}
+
 static int udc_renesas_ra_driver_preinit(const struct device *dev)
 {
 	const struct udc_renesas_ra_config *config = dev->config;
+	struct udc_renesas_ra_data *priv = udc_get_private(dev);
 	struct udc_data *data = dev->data;
 	uint16_t mps = 1023;
 	int err;
 
+#if !USBHS_PHY_CLOCK_SOURCE_IS_XTAL
+	if (priv->udc_cfg.usb_speed == USBD_SPEED_HS) {
+		LOG_ERR("High-speed operation is not supported in case PHY clock source is not "
+			"XTAL");
+		return -ENOTSUP;
+	}
+#endif
+
+	if (config->speed_idx == UDC_BUS_SPEED_HS) {
+		if (!(priv->udc_cfg.usb_speed == USBD_SPEED_HS ||
+		      priv->udc_cfg.usb_speed == USBD_SPEED_FS)) {
+			LOG_ERR("USBHS module only support high-speed and full-speed device");
+			return -ENOTSUP;
+		}
+	} else {
+		/* config->speed_idx == UDC_BUS_SPEED_FS */
+		if (priv->udc_cfg.usb_speed != USBD_SPEED_FS) {
+			LOG_ERR("USBFS module only support full-speed device");
+			return -ENOTSUP;
+		}
+	}
+
+	err = udc_renesas_ra_clock_check(dev);
+	if (err < 0) {
+		return err;
+	}
+
 	err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
 	if (err < 0) {
 		return err;
@@ -590,7 +643,7 @@ static int udc_renesas_ra_driver_preinit(const struct device *dev)
 
 	data->caps.rwup = true;
 	data->caps.mps0 = UDC_MPS0_64;
-	if (config->speed_idx == UDC_BUS_SPEED_HS) {
+	if (priv->udc_cfg.usb_speed == USBD_SPEED_HS) {
 		data->caps.hs = true;
 		mps = 1024;
 	}
@@ -635,8 +688,22 @@ static int udc_renesas_ra_driver_preinit(const struct device *dev)
 		}
 	}
 
+#if DT_HAS_COMPAT_STATUS_OKAY(renesas_ra_usbhs)
+	if (priv->udc_cfg.hs_irq != (IRQn_Type)BSP_IRQ_DISABLED) {
+		R_ICU->IELSR[priv->udc_cfg.hs_irq] = BSP_PRV_IELS_ENUM(EVENT_USBHS_USB_INT_RESUME);
+	}
+#endif
+
+	if (priv->udc_cfg.irq != (IRQn_Type)BSP_IRQ_DISABLED) {
+		R_ICU->IELSR[priv->udc_cfg.irq] = BSP_PRV_IELS_ENUM(EVENT_USBFS_INT);
+	}
+
+	if (priv->udc_cfg.irq_r != (IRQn_Type)BSP_IRQ_DISABLED) {
+		R_ICU->IELSR[priv->udc_cfg.irq_r] = BSP_PRV_IELS_ENUM(EVENT_USBFS_RESUME);
+	}
+
 	config->make_thread(dev);
-	LOG_INF("Device %p (max. speed %d)", dev, config->speed_idx);
+	LOG_INF("Device %p (max. speed %d)", dev, priv->udc_cfg.usb_speed);
 
 	return 0;
 }
@@ -671,32 +738,36 @@ static const struct udc_api udc_renesas_ra_api = {
 
 #define DT_DRV_COMPAT renesas_ra_udc
 
-#define USB_MODULE_NUMBER(n) ((DT_REG_ADDR(DT_INST_PARENT(n))) == R_USB_HS0_BASE ? 1 : 0)
+#define USB_RENESAS_RA_MODULE_NUMBER(id) (DT_REG_ADDR(id) == R_USB_FS0_BASE ? 0 : 1)
 
-#define RENESAS_RA_USB_IRQ_CONFIG_FUNC(n)                                                          \
-	static int udc_renesas_ra_irq_config_func_##n(const struct device *dev)                    \
-	{                                                                                          \
-		struct udc_renesas_ra_data *data = udc_get_private(dev);                           \
-                                                                                                   \
-		data->udc_cfg.hs_irq = DT_IRQ_BY_NAME(DT_INST_PARENT(n), usbhs_ir, irq);           \
-		data->udc_cfg.hsirq_d0 = DT_IRQ_BY_NAME(DT_INST_PARENT(n), usbhs_d0, irq);         \
-		data->udc_cfg.hsirq_d1 = DT_IRQ_BY_NAME(DT_INST_PARENT(n), usbhs_d1, irq);         \
-		data->udc_cfg.hsipl = DT_IRQ_BY_NAME(DT_INST_PARENT(n), usbhs_ir, priority);       \
-		data->udc_cfg.hsipl_d0 = DT_IRQ_BY_NAME(DT_INST_PARENT(n), usbhs_d0, priority);    \
-		data->udc_cfg.hsipl_d1 = DT_IRQ_BY_NAME(DT_INST_PARENT(n), usbhs_d1, priority);    \
-                                                                                                   \
-		R_ICU->IELSR[DT_IRQ_BY_NAME(DT_NODELABEL(usbhs), usbhs_ir, irq)] =                 \
-			ELC_EVENT_USBHS_USB_INT_RESUME;                                            \
-		IRQ_CONNECT(DT_IRQ_BY_NAME(DT_NODELABEL(usbhs), usbhs_ir, irq),                    \
-			    DT_IRQ_BY_NAME(DT_NODELABEL(usbhs), usbhs_ir, priority),               \
-			    udc_renesas_ra_interrupt_handler, DEVICE_DT_INST_GET(n), 0);           \
-		return 0;                                                                          \
-	}
+#define USB_RENESAS_RA_IRQ_GET(id, name, cell)                                                     \
+	COND_CODE_1(DT_IRQ_HAS_NAME(id, name), (DT_IRQ_BY_NAME(id, name, cell)),                   \
+		    ((IRQn_Type) BSP_IRQ_DISABLED))
+
+#define USB_RENESAS_RA_MAX_SPEED_IDX(id)                                                           \
+	(DT_NODE_HAS_COMPAT(id, renesas_ra_usbhs) ? UDC_BUS_SPEED_HS : UDC_BUS_SPEED_FS)
+
+#define USB_RENESAS_RA_SPEED_IDX(id)                                                               \
+	(DT_NODE_HAS_COMPAT(id, renesas_ra_usbhs)                                                  \
+		 ? DT_ENUM_IDX_OR(id, maximum_speed, UDC_BUS_SPEED_HS)                             \
+		 : DT_ENUM_IDX_OR(id, maximum_speed, UDC_BUS_SPEED_FS))
+
+#define USB_RENESAS_RA_IRQ_CONNECT(idx, n)                                                         \
+	IRQ_CONNECT(DT_IRQ_BY_IDX(DT_INST_PARENT(n), idx, irq),                                    \
+		    DT_IRQ_BY_IDX(DT_INST_PARENT(n), idx, priority),                               \
+		    udc_renesas_ra_interrupt_handler, DEVICE_DT_INST_GET(n), 0)
+
+#define USB_RENESAS_RA_CLOCKS_GET(idx, id)                                                         \
+	DEVICE_DT_GET_OR_NULL(DT_PHANDLE_BY_IDX(id, phys_clock, idx))
 
 #define UDC_RENESAS_RA_DEVICE_DEFINE(n)                                                            \
 	PINCTRL_DT_DEFINE(DT_INST_PARENT(n));                                                      \
 	K_THREAD_STACK_DEFINE(udc_renesas_ra_stack_##n, CONFIG_UDC_RENESAS_RA_STACK_SIZE);         \
-	RENESAS_RA_USB_IRQ_CONFIG_FUNC(n);                                                         \
+                                                                                                   \
+	static const struct device *udc_renesas_ra_clock_dev_##n[] = {                             \
+		LISTIFY(DT_PROP_LEN_OR(DT_INST_PARENT(n), phys_clock, 0),                          \
+			USB_RENESAS_RA_CLOCKS_GET, (,), DT_INST_PARENT(n))                         \
+	};                                                                                         \
                                                                                                    \
 	static void udc_renesas_ra_thread_##n(void *dev, void *arg1, void *arg2)                   \
 	{                                                                                          \
@@ -721,29 +792,38 @@ static const struct udc_api udc_renesas_ra_api = {
                                                                                                    \
 	static const struct udc_renesas_ra_config udc_renesas_ra_config_##n = {                    \
 		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(DT_INST_PARENT(n)),                              \
+		.clocks = udc_renesas_ra_clock_dev_##n,                                            \
+		.num_of_clocks = DT_PROP_LEN_OR(DT_INST_PARENT(n), phys_clock, 0),                 \
 		.num_of_eps = DT_PROP(DT_INST_PARENT(n), num_bidir_endpoints),                     \
 		.ep_cfg_in = ep_cfg_in##n,                                                         \
 		.ep_cfg_out = ep_cfg_out##n,                                                       \
 		.make_thread = udc_renesas_ra_make_thread_##n,                                     \
-		.speed_idx = DT_ENUM_IDX_OR(DT_INST_PARENT(n), maximum_speed, UDC_BUS_SPEED_HS),   \
+		.speed_idx = USB_RENESAS_RA_MAX_SPEED_IDX(DT_INST_PARENT(n)),                      \
 	};                                                                                         \
                                                                                                    \
 	static struct udc_renesas_ra_data udc_priv_##n = {                                         \
 		.udc_cfg = {                                                                       \
-			.module_number = USB_MODULE_NUMBER(n),                                     \
-			.usb_speed = DT_ENUM_IDX_OR(DT_INST_PARENT(n), maximum_speed,              \
-						    UDC_BUS_SPEED_HS),                             \
+			.module_number = USB_RENESAS_RA_MODULE_NUMBER(DT_INST_PARENT(n)),          \
+			.usb_speed = USB_RENESAS_RA_SPEED_IDX(DT_INST_PARENT(n)),                  \
+			.irq = USB_RENESAS_RA_IRQ_GET(DT_INST_PARENT(n), usbfs_i, irq),            \
+			.irq_r = USB_RENESAS_RA_IRQ_GET(DT_INST_PARENT(n), usbfs_r, irq),          \
+			.hs_irq = USB_RENESAS_RA_IRQ_GET(DT_INST_PARENT(n), usbhs_ir, irq),        \
+			.ipl = USB_RENESAS_RA_IRQ_GET(DT_INST_PARENT(n), usbfs_i, priority),       \
+			.ipl_r = USB_RENESAS_RA_IRQ_GET(DT_INST_PARENT(n), usbfs_r, priority),     \
+			.hsipl = USB_RENESAS_RA_IRQ_GET(DT_INST_PARENT(n), usbhs_ir, priority),    \
 			.p_context = DEVICE_DT_INST_GET(n),                                        \
 			.p_callback = udc_renesas_ra_event_handler,                                \
-		}};                                                                                \
+		},                                                                                 \
+	};                                                                                         \
                                                                                                    \
 	static struct udc_data udc_data_##n = {                                                    \
 		.mutex = Z_MUTEX_INITIALIZER(udc_data_##n.mutex),                                  \
 		.priv = &udc_priv_##n,                                                             \
 	};                                                                                         \
+                                                                                                   \
 	int udc_renesas_ra_driver_preinit##n(const struct device *dev)                             \
 	{                                                                                          \
-		udc_renesas_ra_irq_config_func_##n(dev);                                           \
+		LISTIFY(DT_NUM_IRQS(DT_INST_PARENT(n)), USB_RENESAS_RA_IRQ_CONNECT, (;), n);       \
 		return udc_renesas_ra_driver_preinit(dev);                                         \
 	}                                                                                          \
                                                                                                    \
diff --git a/drivers/usb/udc/udc_rpi_pico.c b/drivers/usb/udc/udc_rpi_pico.c
index 4065f4555b151..31561f6fce6b2 100644
--- a/drivers/usb/udc/udc_rpi_pico.c
+++ b/drivers/usb/udc/udc_rpi_pico.c
@@ -17,6 +17,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/mem_blocks.h>
 #include <zephyr/drivers/usb/udc.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/clock_control.h>
 
 #include <zephyr/logging/log.h>
@@ -33,6 +34,7 @@ struct rpi_pico_config {
 	void (*irq_enable_func)(const struct device *dev);
 	void (*irq_disable_func)(const struct device *dev);
 	const struct device *clk_dev;
+	struct pinctrl_dev_config *const pcfg;
 	clock_control_subsys_t clk_sys;
 };
 
@@ -41,32 +43,57 @@ struct rpi_pico_ep_data {
 	uint8_t next_pid;
 };
 
+enum rpi_pico_event_type {
+	/* Setup packet received */
+	RPI_PICO_EVT_SETUP,
+	/* Trigger new transfer (except control OUT) */
+	RPI_PICO_EVT_XFER_NEW,
+	/* Transfer for specific endpoint is finished */
+	RPI_PICO_EVT_XFER_FINISHED,
+};
+
 struct rpi_pico_data {
 	struct k_thread thread_data;
+	/*
+	 * events are events that the driver thread waits.
+	 * xfer_new and xfer_finished contain information on which endpoints
+	 * events RPI_PICO_EVT_XFER_NEW or RPI_PICO_EVT_XFER_FINISHED are
+	 * triggered. The mapping is bits 31..16 for IN endpoints and bits
+	 * 15..0 for OUT endpoints.
+	 */
+	struct k_event events;
+	atomic_t xfer_new;
+	atomic_t xfer_finished;
 	struct rpi_pico_ep_data out_ep[USB_NUM_ENDPOINTS];
 	struct rpi_pico_ep_data in_ep[USB_NUM_ENDPOINTS];
 	bool rwu_pending;
 	uint8_t setup[8];
 };
 
-enum rpi_pico_event_type {
-	/* Trigger next transfer, must not be used for control OUT */
-	RPI_PICO_EVT_XFER,
-	/* Setup packet received */
-	RPI_PICO_EVT_SETUP,
-	/* OUT transaction for specific endpoint is finished */
-	RPI_PICO_EVT_DOUT,
-	/* IN transaction for specific endpoint is finished */
-	RPI_PICO_EVT_DIN,
-};
+static inline int udc_ep_to_bnum(const uint8_t ep)
+{
+	if (USB_EP_DIR_IS_IN(ep)) {
+		return 16UL + USB_EP_GET_IDX(ep);
+	}
 
-struct rpi_pico_event {
-	const struct device *dev;
-	enum rpi_pico_event_type type;
-	uint8_t ep;
-};
+	return USB_EP_GET_IDX(ep);
+}
 
-K_MSGQ_DEFINE(drv_msgq, sizeof(struct rpi_pico_event), 16, sizeof(void *));
+static inline uint8_t udc_pull_ep_from_bmsk(uint32_t *const bitmap)
+{
+	unsigned int bit;
+
+	__ASSERT_NO_MSG(bitmap && *bitmap);
+
+	bit = find_lsb_set(*bitmap) - 1;
+	*bitmap &= ~BIT(bit);
+
+	if (bit >= 16) {
+		return USB_EP_DIR_IN | (bit - 16);
+	} else {
+		return USB_EP_DIR_OUT | bit;
+	}
+}
 
 /* Use Atomic Register Access to set bits */
 static void ALWAYS_INLINE rpi_pico_bit_set(const mm_reg_t reg, const uint32_t bit)
@@ -80,6 +107,19 @@ static void ALWAYS_INLINE rpi_pico_bit_clr(const mm_reg_t reg, const uint32_t bi
 	sys_write32(bit, REG_ALIAS_CLR_BITS | reg);
 }
 
+
+static void sie_dp_pullup(const struct device *dev, const bool enable)
+{
+	const struct rpi_pico_config *config = dev->config;
+	usb_hw_t *base = config->base;
+
+	if (enable) {
+		rpi_pico_bit_set((mm_reg_t)&base->sie_ctrl, USB_SIE_CTRL_PULLUP_EN_BITS);
+	} else {
+		rpi_pico_bit_clr((mm_reg_t)&base->sie_ctrl, USB_SIE_CTRL_PULLUP_EN_BITS);
+	}
+}
+
 static void ALWAYS_INLINE sie_status_clr(const struct device *dev, const uint32_t bit)
 {
 	const struct rpi_pico_config *config = dev->config;
@@ -163,6 +203,7 @@ static void write_ep_ctrl_reg(const struct device *dev, const uint8_t ep,
 static void rpi_pico_ep_cancel(const struct device *dev, const uint8_t ep)
 {
 	bool abort_handshake_supported = rp2040_chip_version() >= 2;
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	const struct rpi_pico_config *config = dev->config;
 	usb_hw_t *base = config->base;
 	mm_reg_t abort_done_reg = (mm_reg_t)&base->abort_done;
@@ -173,6 +214,7 @@ static void rpi_pico_ep_cancel(const struct device *dev, const uint8_t ep)
 	buf_ctrl = read_buf_ctrl_reg(dev, ep);
 	if (!(buf_ctrl & USB_BUF_CTRL_AVAIL)) {
 		/* The buffer is not used by the controller */
+		udc_ep_set_busy(ep_cfg, false);
 		return;
 	}
 
@@ -189,6 +231,7 @@ static void rpi_pico_ep_cancel(const struct device *dev, const uint8_t ep)
 		rpi_pico_bit_clr(abort_reg, ep_mask);
 	}
 
+	udc_ep_set_busy(ep_cfg, false);
 	LOG_INF("Canceled ep 0x%02x transaction", ep);
 }
 
@@ -196,6 +239,7 @@ static int rpi_pico_prep_rx(const struct device *dev,
 			    struct net_buf *const buf, struct udc_ep_config *const cfg)
 {
 	struct rpi_pico_ep_data *const ep_data = get_ep_data(dev, cfg->addr);
+	unsigned int lock_key;
 	uint32_t buf_ctrl;
 
 	buf_ctrl = read_buf_ctrl_reg(dev, cfg->addr);
@@ -207,6 +251,8 @@ static int rpi_pico_prep_rx(const struct device *dev,
 	LOG_DBG("Prepare RX ep 0x%02x len %u pid: %u",
 		cfg->addr, net_buf_tailroom(buf), ep_data->next_pid);
 
+	lock_key = irq_lock();
+
 	buf_ctrl = cfg->mps;
 	buf_ctrl |= ep_data->next_pid ? USB_BUF_CTRL_DATA1_PID : USB_BUF_CTRL_DATA0_PID;
 	ep_data->next_pid ^= 1U;
@@ -221,6 +267,8 @@ static int rpi_pico_prep_rx(const struct device *dev,
 	arch_nop();
 	write_buf_ctrl_reg(dev, cfg->addr, buf_ctrl | USB_BUF_CTRL_AVAIL);
 
+	irq_unlock(lock_key);
+
 	return 0;
 }
 
@@ -228,6 +276,7 @@ static int rpi_pico_prep_tx(const struct device *dev,
 			    struct net_buf *const buf, struct udc_ep_config *const cfg)
 {
 	struct rpi_pico_ep_data *const ep_data = get_ep_data(dev, cfg->addr);
+	unsigned int lock_key;
 	uint32_t buf_ctrl;
 	size_t len;
 
@@ -237,6 +286,8 @@ static int rpi_pico_prep_tx(const struct device *dev,
 		return -EBUSY;
 	}
 
+	lock_key = irq_lock();
+
 	len = MIN(cfg->mps, buf->len);
 	memcpy(ep_data->buf, buf->data, len);
 
@@ -258,6 +309,8 @@ static int rpi_pico_prep_tx(const struct device *dev,
 	arch_nop();
 	write_buf_ctrl_reg(dev, cfg->addr, buf_ctrl | USB_BUF_CTRL_AVAIL);
 
+	irq_unlock(lock_key);
+
 	return 0;
 }
 
@@ -278,14 +331,16 @@ static int rpi_pico_ctrl_feed_dout(const struct device *dev, const size_t length
 
 static void drop_control_transfers(const struct device *dev)
 {
+	struct udc_ep_config *cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct udc_ep_config *cfg_in = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get_all(cfg_out);
 	if (buf != NULL) {
 		net_buf_unref(buf);
 	}
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get_all(cfg_in);
 	if (buf != NULL) {
 		net_buf_unref(buf);
 	}
@@ -337,14 +392,14 @@ static inline int rpi_pico_handle_evt_dout(const struct device *dev,
 	struct net_buf *buf;
 	int err = 0;
 
-	buf = udc_buf_get(dev, cfg->addr);
+	buf = udc_buf_get(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for OUT ep 0x%02x", cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENODATA;
 	}
 
-	udc_ep_set_busy(dev, cfg->addr, false);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
 		if (udc_ctrl_stage_is_status_out(dev)) {
@@ -373,15 +428,15 @@ static int rpi_pico_handle_evt_din(const struct device *dev,
 	struct net_buf *buf;
 	int err;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", cfg->addr);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
 		return -ENOBUFS;
 	}
 
-	buf = udc_buf_get(dev, cfg->addr);
-	udc_ep_set_busy(dev, cfg->addr, false);
+	buf = udc_buf_get(cfg);
+	udc_ep_set_busy(cfg, false);
 
 	if (cfg->addr == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
@@ -415,12 +470,16 @@ static void rpi_pico_handle_xfer_next(const struct device *dev,
 	struct net_buf *buf;
 	int err;
 
-	buf = udc_buf_peek(dev, cfg->addr);
+	buf = udc_buf_peek(cfg);
 	if (buf == NULL) {
 		return;
 	}
 
 	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+		if (cfg->stat.halted) {
+			return;
+		}
+
 		err = rpi_pico_prep_rx(dev, buf, cfg);
 	} else {
 		err = rpi_pico_prep_tx(dev, buf, cfg);
@@ -429,40 +488,71 @@ static void rpi_pico_handle_xfer_next(const struct device *dev,
 	if (err != 0) {
 		udc_submit_ep_event(dev, buf, -ECONNREFUSED);
 	} else {
-		udc_ep_set_busy(dev, cfg->addr, true);
+		udc_ep_set_busy(cfg, true);
 	}
 }
 
 static ALWAYS_INLINE void rpi_pico_thread_handler(void *const arg)
 {
 	const struct device *dev = (const struct device *)arg;
+	struct rpi_pico_data *priv = udc_get_private(dev);
 	struct udc_ep_config *ep_cfg;
-	struct rpi_pico_event evt;
+	uint32_t evt;
+	uint32_t eps;
+	uint8_t ep;
 
-	k_msgq_get(&drv_msgq, &evt, K_FOREVER);
-	ep_cfg = udc_get_ep_cfg(dev, evt.ep);
+	evt = k_event_wait(&priv->events, UINT32_MAX, false, K_FOREVER);
+	udc_lock_internal(dev, K_FOREVER);
+
+	if (evt & BIT(RPI_PICO_EVT_XFER_FINISHED)) {
+		k_event_clear(&priv->events, BIT(RPI_PICO_EVT_XFER_FINISHED));
+
+		eps = atomic_clear(&priv->xfer_finished);
+
+		while (eps) {
+			ep = udc_pull_ep_from_bmsk(&eps);
+			ep_cfg = udc_get_ep_cfg(dev, ep);
+			LOG_DBG("Finished event ep 0x%02x", ep);
+
+			if (USB_EP_DIR_IS_IN(ep)) {
+				rpi_pico_handle_evt_din(dev, ep_cfg);
+			} else {
+				rpi_pico_handle_evt_dout(dev, ep_cfg);
+			}
+
+			if (!udc_ep_is_busy(ep_cfg)) {
+				rpi_pico_handle_xfer_next(dev, ep_cfg);
+			} else {
+				LOG_ERR("Endpoint 0x%02x busy", ep);
+			}
+		}
+	}
+
+	if (evt & BIT(RPI_PICO_EVT_XFER_NEW)) {
+		k_event_clear(&priv->events, BIT(RPI_PICO_EVT_XFER_NEW));
+
+		eps = atomic_clear(&priv->xfer_new);
+
+		while (eps) {
+			ep = udc_pull_ep_from_bmsk(&eps);
+			ep_cfg = udc_get_ep_cfg(dev, ep);
+			LOG_DBG("New transfer ep 0x%02x in the queue", ep);
+
+			if (!udc_ep_is_busy(ep_cfg)) {
+				rpi_pico_handle_xfer_next(dev, ep_cfg);
+			} else {
+				LOG_ERR("Endpoint 0x%02x busy", ep);
+			}
+		}
+	}
 
-	switch (evt.type) {
-	case RPI_PICO_EVT_XFER:
-		LOG_DBG("New transfer in the queue");
-		break;
-	case RPI_PICO_EVT_SETUP:
+	if (evt & BIT(RPI_PICO_EVT_SETUP)) {
+		k_event_clear(&priv->events, BIT(RPI_PICO_EVT_SETUP));
 		LOG_DBG("SETUP event");
 		rpi_pico_handle_evt_setup(dev);
-		break;
-	case RPI_PICO_EVT_DOUT:
-		LOG_DBG("DOUT event ep 0x%02x", ep_cfg->addr);
-		rpi_pico_handle_evt_dout(dev, ep_cfg);
-		break;
-	case RPI_PICO_EVT_DIN:
-		LOG_DBG("DIN event");
-		rpi_pico_handle_evt_din(dev, ep_cfg);
-		break;
 	}
 
-	if (ep_cfg->addr != USB_CONTROL_EP_OUT && !udc_ep_is_busy(dev, ep_cfg->addr)) {
-		rpi_pico_handle_xfer_next(dev, ep_cfg);
-	}
+	udc_unlock_internal(dev);
 }
 
 static void rpi_pico_handle_setup(const struct device *dev)
@@ -470,11 +560,6 @@ static void rpi_pico_handle_setup(const struct device *dev)
 	const struct rpi_pico_config *config = dev->config;
 	struct rpi_pico_data *priv = udc_get_private(dev);
 	usb_device_dpram_t *dpram = config->dpram;
-	struct rpi_pico_event evt = {
-		.type = RPI_PICO_EVT_SETUP,
-		.ep = USB_CONTROL_EP_OUT,
-	};
-
 	/*
 	 * Host may issue a new setup packet even if the previous control transfer
 	 * did not complete. Cancel any active transaction.
@@ -489,21 +574,18 @@ static void rpi_pico_handle_setup(const struct device *dev)
 	get_ep_data(dev, USB_CONTROL_EP_IN)->next_pid = 1;
 	get_ep_data(dev, USB_CONTROL_EP_OUT)->next_pid = 1;
 
-	k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+	k_event_post(&priv->events, BIT(RPI_PICO_EVT_SETUP));
 }
 
 static void rpi_pico_handle_buff_status_in(const struct device *dev, const uint8_t ep)
 {
 	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
-	struct rpi_pico_event evt = {
-		.ep = ep,
-		.type = RPI_PICO_EVT_DIN,
-	};
+	struct rpi_pico_data *priv = udc_get_private(dev);
 	__maybe_unused int err;
 	struct net_buf *buf;
 	size_t len;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", ep);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -522,7 +604,8 @@ static void rpi_pico_handle_buff_status_in(const struct device *dev, const uint8
 			__ASSERT(err == 0, "Failed to start new IN transaction");
 			udc_ep_buf_clear_zlp(buf);
 		} else {
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+			atomic_set_bit(&priv->xfer_finished, udc_ep_to_bnum(ep));
+			k_event_post(&priv->events, BIT(RPI_PICO_EVT_XFER_FINISHED));
 		}
 	}
 }
@@ -531,14 +614,11 @@ static void rpi_pico_handle_buff_status_out(const struct device *dev, const uint
 {
 	struct rpi_pico_ep_data *ep_data = get_ep_data(dev, ep);
 	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
-	struct rpi_pico_event evt = {
-		.ep = ep,
-		.type = RPI_PICO_EVT_DOUT,
-	};
+	struct rpi_pico_data *priv = udc_get_private(dev);
 	struct net_buf *buf;
 	size_t len;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_ERR("No buffer for ep 0x%02x", ep);
 		udc_submit_event(dev, UDC_EVT_ERROR, -ENOBUFS);
@@ -548,14 +628,14 @@ static void rpi_pico_handle_buff_status_out(const struct device *dev, const uint
 	len = read_buf_ctrl_reg(dev, ep) & USB_BUF_CTRL_LEN_MASK;
 	net_buf_add_mem(buf, ep_data->buf, MIN(len, net_buf_tailroom(buf)));
 
-	if (net_buf_tailroom(buf) >= udc_mps_ep_size(ep_cfg) &&
-	    len == udc_mps_ep_size(ep_cfg)) {
+	if (net_buf_tailroom(buf) && len == udc_mps_ep_size(ep_cfg)) {
 		__unused int err;
 
 		err = rpi_pico_prep_rx(dev, buf, ep_cfg);
 		__ASSERT(err == 0, "Failed to start new OUT transaction");
 	} else {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		atomic_set_bit(&priv->xfer_finished, udc_ep_to_bnum(ep));
+		k_event_post(&priv->events, BIT(RPI_PICO_EVT_XFER_FINISHED));
 	}
 }
 
@@ -573,6 +653,7 @@ static void rpi_pico_handle_buff_status(const struct device *dev)
 			continue;
 		}
 
+		rpi_pico_bit_clr((mm_reg_t)&base->buf_status, BIT(i));
 		/* Odd bits in the register correspond to OUT endpoints */
 		if (i & 1U) {
 			ep = USB_EP_DIR_OUT | (i >> 1U);
@@ -582,7 +663,6 @@ static void rpi_pico_handle_buff_status(const struct device *dev)
 			rpi_pico_handle_buff_status_in(dev, ep);
 		}
 
-		rpi_pico_bit_clr((mm_reg_t)&base->buf_status, BIT(i));
 		buf_status &= ~BIT(i);
 	}
 }
@@ -590,6 +670,7 @@ static void rpi_pico_handle_buff_status(const struct device *dev)
 static void rpi_pico_isr_handler(const struct device *dev)
 {
 	const struct rpi_pico_config *config = dev->config;
+	const struct pinctrl_dev_config *const pcfg = config->pcfg;
 	struct rpi_pico_data *priv = udc_get_private(dev);
 	usb_hw_t *base = config->base;
 	uint32_t status = base->ints;
@@ -603,15 +684,35 @@ static void rpi_pico_isr_handler(const struct device *dev)
 	if (status & USB_INTS_DEV_CONN_DIS_BITS) {
 		uint32_t sie_status;
 
+		sie_status = sys_read32((mm_reg_t)&base->sie_status);
+		LOG_DBG("CONNECTED bit %u, VBUS_DETECTED bit %u",
+			(bool)(sie_status & USB_SIE_STATUS_CONNECTED_BITS),
+			(bool)(sie_status & USB_SIE_STATUS_VBUS_DETECTED_BITS));
+
+		if (pcfg != NULL && !(sie_status & USB_SIE_STATUS_CONNECTED_BITS) &&
+		    !(sie_status & USB_SIE_STATUS_VBUS_DETECTED_BITS)) {
+			sie_dp_pullup(dev, false);
+			udc_submit_event(dev, UDC_EVT_VBUS_REMOVED, 0);
+		}
+
 		handled |= USB_INTS_DEV_CONN_DIS_BITS;
 		sie_status_clr(dev, USB_SIE_STATUS_CONNECTED_BITS);
+	}
+
+	if (status & USB_INTS_VBUS_DETECT_BITS) {
+		uint32_t sie_status;
 
 		sie_status = sys_read32((mm_reg_t)&base->sie_status);
-		if (sie_status & USB_SIE_STATUS_CONNECTED_BITS) {
+		LOG_DBG("VBUS_DETECTED bit %u",
+			(bool)(sie_status & USB_SIE_STATUS_VBUS_DETECTED_BITS));
+
+		if (pcfg != NULL && (sie_status & USB_SIE_STATUS_VBUS_DETECTED_BITS)) {
+			sie_dp_pullup(dev, true);
 			udc_submit_event(dev, UDC_EVT_VBUS_READY, 0);
-		} else {
-			udc_submit_event(dev, UDC_EVT_VBUS_REMOVED, 0);
 		}
+
+		handled |= USB_INTS_VBUS_DETECT_BITS;
+		sie_status_clr(dev, USB_SIE_STATUS_VBUS_DETECTED_BITS);
 	}
 
 	if ((status & (USB_INTS_BUFF_STATUS_BITS | USB_INTS_SETUP_REQ_BITS)) &&
@@ -631,6 +732,7 @@ static void rpi_pico_isr_handler(const struct device *dev)
 		sie_status_clr(dev, USB_SIE_STATUS_RESUME_BITS);
 
 		priv->rwu_pending = false;
+		udc_set_suspended(dev, false);
 		udc_submit_event(dev, UDC_EVT_RESUME, 0);
 	}
 
@@ -638,6 +740,7 @@ static void rpi_pico_isr_handler(const struct device *dev)
 		handled |= USB_INTS_DEV_SUSPEND_BITS;
 		sie_status_clr(dev, USB_SIE_STATUS_SUSPENDED_BITS);
 
+		udc_set_suspended(dev, true);
 		udc_submit_event(dev, UDC_EVT_SUSPEND, 0);
 	}
 
@@ -652,9 +755,13 @@ static void rpi_pico_isr_handler(const struct device *dev)
 	if (status & USB_INTS_ERROR_DATA_SEQ_BITS) {
 		handled |= USB_INTS_ERROR_DATA_SEQ_BITS;
 		sie_status_clr(dev, USB_SIE_STATUS_DATA_SEQ_ERROR_BITS);
-
-		LOG_ERR("Data Sequence Error");
-		udc_submit_event(dev, UDC_EVT_ERROR, -EINVAL);
+		/*
+		 * This can be triggered before the STALL handshake response
+		 * to the OUT DATAx. Handling IRQ_ON_STALL to fix the expected
+		 * DATA PID is too much overhead since the endpoint is halted
+		 * anyway.
+		 */
+		LOG_WRN("Data Sequence Error");
 	}
 
 	if (status & USB_INTS_ERROR_RX_TIMEOUT_BITS) {
@@ -716,15 +823,13 @@ static int udc_rpi_pico_ep_enqueue(const struct device *dev,
 				   struct udc_ep_config *const cfg,
 				   struct net_buf *buf)
 {
-	struct rpi_pico_event evt = {
-		.ep = cfg->addr,
-		.type = RPI_PICO_EVT_XFER,
-	};
+	struct rpi_pico_data *priv = udc_get_private(dev);
 
 	udc_buf_put(cfg, buf);
 
 	if (!cfg->stat.halted) {
-		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
+		atomic_set_bit(&priv->xfer_new, udc_ep_to_bnum(cfg->addr));
+		k_event_post(&priv->events, BIT(RPI_PICO_EVT_XFER_NEW));
 	}
 
 	return 0;
@@ -739,7 +844,7 @@ static int udc_rpi_pico_ep_dequeue(const struct device *dev,
 	lock_key = irq_lock();
 
 	rpi_pico_ep_cancel(dev, cfg->addr);
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
@@ -816,21 +921,39 @@ static int udc_rpi_pico_ep_set_halt(const struct device *dev,
 	const struct rpi_pico_config *config = dev->config;
 	mem_addr_t buf_ctrl_reg = get_buf_ctrl_reg(dev, cfg->addr);
 	usb_hw_t *base = config->base;
+	unsigned int lock_key;
+	uint32_t bits;
 
+	lock_key = irq_lock();
 	if (USB_EP_GET_IDX(cfg->addr) == 0) {
-		uint32_t bit = USB_EP_DIR_IS_OUT(cfg->addr) ?
-			       USB_EP_STALL_ARM_EP0_OUT_BITS : USB_EP_STALL_ARM_EP0_IN_BITS;
+		bits = USB_EP_DIR_IS_OUT(cfg->addr) ?
+		       USB_EP_STALL_ARM_EP0_OUT_BITS : USB_EP_STALL_ARM_EP0_IN_BITS;
+		rpi_pico_bit_set((mm_reg_t)&base->ep_stall_arm, bits);
+	}
 
-		rpi_pico_bit_set((mm_reg_t)&base->ep_stall_arm, bit);
+	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+		/*
+		 * Cancel any transfer in progress.  The available bit must be
+		 * set for the controller to respond to OUT DATAx with a STALL
+		 * handshake.
+		 */
+		rpi_pico_ep_cancel(dev, cfg->addr);
+		bits = USB_BUF_CTRL_STALL | USB_BUF_CTRL_AVAIL;
+	} else {
+		/* Only STALL bit needs to be set here. */
+		bits = USB_BUF_CTRL_STALL;
 	}
 
-	rpi_pico_bit_set(buf_ctrl_reg, USB_BUF_CTRL_STALL);
+	rpi_pico_bit_set(buf_ctrl_reg, bits);
 
-	LOG_INF("Set halt ep 0x%02x", cfg->addr);
 	if (USB_EP_GET_IDX(cfg->addr) != 0) {
 		cfg->stat.halted = true;
 	}
 
+	irq_unlock(lock_key);
+	LOG_DBG("Set halt ep 0x%02x buf_ctrl 0x%08x busy %u",
+		cfg->addr, sys_read32(buf_ctrl_reg), udc_ep_is_busy(cfg));
+
 	return 0;
 }
 
@@ -838,32 +961,35 @@ static int udc_rpi_pico_ep_clear_halt(const struct device *dev,
 				      struct udc_ep_config *const cfg)
 {
 	struct rpi_pico_ep_data *const ep_data = get_ep_data(dev, cfg->addr);
+	struct rpi_pico_data *priv = udc_get_private(dev);
 	mem_addr_t buf_ctrl_reg = get_buf_ctrl_reg(dev, cfg->addr);
-	struct rpi_pico_event evt = {
-		.ep = cfg->addr,
-		.type = RPI_PICO_EVT_XFER,
-	};
+	unsigned int lock_key;
 
-	if (USB_EP_GET_IDX(cfg->addr) != 0) {
-		ep_data->next_pid = 0;
-		rpi_pico_bit_clr(buf_ctrl_reg, USB_BUF_CTRL_DATA1_PID);
-		/*
-		 * By default, clk_sys runs at 125MHz, wait 3 nop instructions
-		 * before clearing the CTRL_STALL bit. See 4.1.2.5.4.
-		 */
-		arch_nop();
-		arch_nop();
-		arch_nop();
-		rpi_pico_bit_clr(buf_ctrl_reg, USB_BUF_CTRL_STALL);
+	if (USB_EP_GET_IDX(cfg->addr) == 0) {
+		return 0;
+	}
 
-		if (udc_buf_peek(dev, cfg->addr)) {
-			k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
-		}
+	lock_key = irq_lock();
+	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
+		/* Cancel responds with a STALL handshake.*/
+		rpi_pico_ep_cancel(dev, cfg->addr);
+	} else {
+		rpi_pico_bit_clr(buf_ctrl_reg, USB_BUF_CTRL_STALL);
 	}
 
+	ep_data->next_pid = 0;
 	cfg->stat.halted = false;
-	LOG_INF("Clear halt ep 0x%02x buf_ctrl 0x%08x",
-		cfg->addr, sys_read32(buf_ctrl_reg));
+	irq_unlock(lock_key);
+
+	if (udc_ep_is_busy(cfg)) {
+		rpi_pico_handle_xfer_next(dev, cfg);
+	} else if (udc_buf_peek(cfg)) {
+		atomic_set_bit(&priv->xfer_new, udc_ep_to_bnum(cfg->addr));
+		k_event_post(&priv->events, BIT(RPI_PICO_EVT_XFER_NEW));
+	}
+
+	LOG_DBG("Clear halt ep 0x%02x buf_ctrl 0x%08x busy %u",
+		cfg->addr, sys_read32(buf_ctrl_reg), udc_ep_is_busy(cfg));
 
 	return 0;
 }
@@ -896,6 +1022,7 @@ static int udc_rpi_pico_host_wakeup(const struct device *dev)
 static int udc_rpi_pico_enable(const struct device *dev)
 {
 	const struct rpi_pico_config *config = dev->config;
+	const struct pinctrl_dev_config *const pcfg = config->pcfg;
 	usb_device_dpram_t *dpram = config->dpram;
 	usb_hw_t *base = config->base;
 
@@ -911,9 +1038,11 @@ static int udc_rpi_pico_enable(const struct device *dev)
 	sys_write32(USB_USB_MUXING_TO_PHY_BITS | USB_USB_MUXING_SOFTCON_BITS,
 		    (mm_reg_t)&base->muxing);
 
-	/* Force VBUS detect so the device thinks it is plugged into a host */
-	sys_write32(USB_USB_PWR_VBUS_DETECT_BITS | USB_USB_PWR_VBUS_DETECT_OVERRIDE_EN_BITS,
-		    (mm_reg_t)&base->pwr);
+	if (pcfg == NULL) {
+		/* Force VBUS detect so the device thinks it is plugged into a host */
+		sys_write32(USB_USB_PWR_VBUS_DETECT_BITS |
+			    USB_USB_PWR_VBUS_DETECT_OVERRIDE_EN_BITS, (mm_reg_t)&base->pwr);
+	}
 
 	/* Enable an interrupt per EP0 transaction */
 	sys_write32(USB_SIE_CTRL_EP0_INT_1BUF_BITS, (mm_reg_t)&base->sie_ctrl);
@@ -934,8 +1063,10 @@ static int udc_rpi_pico_enable(const struct device *dev)
 		    USB_INTE_BUFF_STATUS_BITS,
 		    (mm_reg_t)&base->inte);
 
-	/* Present full speed device by enabling pull up on DP */
-	rpi_pico_bit_set((mm_reg_t)&base->sie_ctrl, USB_SIE_CTRL_PULLUP_EN_BITS);
+	if (sys_read32((mm_reg_t)&base->sie_status) & USB_SIE_STATUS_VBUS_DETECTED_BITS) {
+		/* Present full speed device by enabling pull up on DP */
+		sie_dp_pullup(dev, true);
+	}
 
 	/* Enable the USB controller in device mode. */
 	sys_write32(USB_MAIN_CTRL_CONTROLLER_EN_BITS, (mm_reg_t)&base->main_ctrl);
@@ -952,7 +1083,7 @@ static int udc_rpi_pico_disable(const struct device *dev)
 	const struct rpi_pico_config *config = dev->config;
 
 	config->irq_disable_func(dev);
-	LOG_DBG("Enable device %p", dev);
+	LOG_DBG("Disable device %p", dev);
 
 	return 0;
 }
@@ -960,6 +1091,8 @@ static int udc_rpi_pico_disable(const struct device *dev)
 static int udc_rpi_pico_init(const struct device *dev)
 {
 	const struct rpi_pico_config *config = dev->config;
+	const struct pinctrl_dev_config *const pcfg = config->pcfg;
+	int err;
 
 	if (udc_ep_enable_internal(dev, USB_CONTROL_EP_OUT,
 				   USB_EP_TYPE_CONTROL, 64, 0)) {
@@ -973,6 +1106,14 @@ static int udc_rpi_pico_init(const struct device *dev)
 		return -EIO;
 	}
 
+	if (pcfg != NULL) {
+		err = pinctrl_apply_state(pcfg, PINCTRL_STATE_DEFAULT);
+		if (err) {
+			LOG_ERR("Failed to apply default pinctrl state (%d)", err);
+			return err;
+		}
+	}
+
 	return clock_control_on(config->clk_dev, config->clk_sys);
 }
 
@@ -996,11 +1137,15 @@ static int udc_rpi_pico_shutdown(const struct device *dev)
 static int udc_rpi_pico_driver_preinit(const struct device *dev)
 {
 	const struct rpi_pico_config *config = dev->config;
+	struct rpi_pico_data *priv = udc_get_private(dev);
 	struct udc_data *data = dev->data;
 	uint16_t mps = 1023;
 	int err;
 
 	k_mutex_init(&data->mutex);
+	k_event_init(&priv->events);
+	atomic_clear(&priv->xfer_new);
+	atomic_clear(&priv->xfer_finished);
 
 	data->caps.rwup = true;
 	data->caps.mps0 = UDC_MPS0_64;
@@ -1052,12 +1197,14 @@ static int udc_rpi_pico_driver_preinit(const struct device *dev)
 
 static void udc_rpi_pico_lock(const struct device *dev)
 {
+	k_sched_lock();
 	udc_lock_internal(dev, K_FOREVER);
 }
 
 static void udc_rpi_pico_unlock(const struct device *dev)
 {
 	udc_unlock_internal(dev);
+	k_sched_unlock();
 }
 
 static const struct udc_api udc_rpi_pico_api = {
@@ -1079,7 +1226,16 @@ static const struct udc_api udc_rpi_pico_api = {
 
 #define DT_DRV_COMPAT raspberrypi_pico_usbd
 
+#define UDC_RPI_PICO_PINCTRL_DT_INST_DEFINE(n)						\
+	COND_CODE_1(DT_INST_PINCTRL_HAS_NAME(n, default),				\
+		    (PINCTRL_DT_INST_DEFINE(n)), ())
+
+#define UDC_RPI_PICO_PINCTRL_DT_INST_DEV_CONFIG_GET(n)					\
+	COND_CODE_1(DT_INST_PINCTRL_HAS_NAME(n, default),				\
+		    ((void *)PINCTRL_DT_INST_DEV_CONFIG_GET(n)), (NULL))
+
 #define UDC_RPI_PICO_DEVICE_DEFINE(n)							\
+	UDC_RPI_PICO_PINCTRL_DT_INST_DEFINE(n);						\
 	K_THREAD_STACK_DEFINE(udc_rpi_pico_stack_##n, CONFIG_UDC_RPI_PICO_STACK_SIZE);	\
 											\
 	SYS_MEM_BLOCKS_DEFINE_STATIC_WITH_EXT_BUF(rpi_pico_mb_##n,			\
@@ -1137,6 +1293,7 @@ static const struct udc_api udc_rpi_pico_api = {
 		.make_thread = udc_rpi_pico_make_thread_##n,				\
 		.irq_enable_func = udc_rpi_pico_irq_enable_func_##n,			\
 		.irq_disable_func = udc_rpi_pico_irq_disable_func_##n,			\
+		.pcfg = UDC_RPI_PICO_PINCTRL_DT_INST_DEV_CONFIG_GET(n),			\
 		.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),			\
 		.clk_sys = (void *)DT_INST_PHA_BY_IDX(n, clocks, 0, clk_id),		\
 	};										\
diff --git a/drivers/usb/udc/udc_skeleton.c b/drivers/usb/udc/udc_skeleton.c
index cba2016572cad..c808cc98ad85d 100644
--- a/drivers/usb/udc/udc_skeleton.c
+++ b/drivers/usb/udc/udc_skeleton.c
@@ -119,7 +119,7 @@ static int udc_skeleton_ep_dequeue(const struct device *dev,
 
 	lock_key = irq_lock();
 
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
@@ -209,7 +209,7 @@ static int udc_skeleton_enable(const struct device *dev)
 
 static int udc_skeleton_disable(const struct device *dev)
 {
-	LOG_DBG("Enable device %p", dev);
+	LOG_DBG("Disable device %p", dev);
 
 	return 0;
 }
@@ -363,7 +363,8 @@ static const struct udc_api udc_skeleton_api = {
  * driver, even if your platform does not require it.
  */
 #define UDC_SKELETON_DEVICE_DEFINE(n)						\
-	K_THREAD_STACK_DEFINE(udc_skeleton_stack_##n, CONFIG_UDC_SKELETON);	\
+	K_THREAD_STACK_DEFINE(udc_skeleton_stack_##n,				\
+			      CONFIG_UDC_SKELETON_STACK_SIZE);			\
 										\
 	static void udc_skeleton_thread_##n(void *dev, void *arg1, void *arg2)	\
 	{									\
diff --git a/drivers/usb/udc/udc_smartbond.c b/drivers/usb/udc/udc_smartbond.c
index dd5a2aa782a5c..e413f518d68e9 100644
--- a/drivers/usb/udc/udc_smartbond.c
+++ b/drivers/usb/udc/udc_smartbond.c
@@ -555,14 +555,15 @@ static int udc_smartbond_ep_tx(const struct device *dev, uint8_t ep)
 {
 	struct usb_smartbond_data *data = dev->data;
 	struct smartbond_ep_state *ep_state = usb_dc_get_ep_in_state(data, USB_EP_GET_IDX(ep));
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep) ||
+	if (udc_ep_is_busy(ep_cfg) ||
 	    (ep_state->regs->epc_in & USB_USB_EPC1_REG_USB_STALL_Msk) != 0) {
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	LOG_DBG("TX ep 0x%02x len %u", ep, buf ? buf->len : -1);
 
 	if (buf) {
@@ -571,7 +572,7 @@ static int udc_smartbond_ep_tx(const struct device *dev, uint8_t ep)
 
 		start_tx_packet(data, ep_state);
 
-		udc_ep_set_busy(dev, ep, true);
+		udc_ep_set_busy(ep_cfg, true);
 	}
 
 	return 0;
@@ -581,13 +582,14 @@ static int udc_smartbond_ep_rx(const struct device *dev, uint8_t ep)
 {
 	struct usb_smartbond_data *data = dev->data;
 	struct smartbond_ep_state *ep_state = usb_dc_get_ep_out_state(data, USB_EP_GET_IDX(ep));
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
 	struct net_buf *buf;
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(ep_cfg)) {
 		return 0;
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 
 	if (buf) {
 		LOG_DBG("RX ep 0x%02x len %u", ep, buf->size);
@@ -597,7 +599,7 @@ static int udc_smartbond_ep_rx(const struct device *dev, uint8_t ep)
 
 		start_rx_packet(data, ep_state);
 
-		udc_ep_set_busy(dev, ep, true);
+		udc_ep_set_busy(ep_cfg, true);
 	}
 
 	return 0;
@@ -648,12 +650,12 @@ static int udc_smartbond_ep_dequeue(const struct device *dev, struct udc_ep_conf
 
 	udc_smartbond_ep_abort(dev, ep_cfg);
 
-	buf = udc_buf_get_all(dev, ep);
+	buf = udc_buf_get_all(ep_cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	irq_unlock(lock_key);
 
@@ -729,7 +731,7 @@ static int udc_smartbond_ep_set_halt(const struct device *dev, struct udc_ep_con
 	if (ep_cfg->addr == USB_CONTROL_EP_IN) {
 		/* Stall in DATA IN phase, drop status OUT packet */
 		if (udc_ctrl_stage_is_data_in(dev)) {
-			buf = udc_buf_get(dev, USB_CONTROL_EP_OUT);
+			buf = udc_buf_get(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT));
 			if (buf) {
 				net_buf_unref(buf);
 			}
@@ -992,7 +994,7 @@ static void handle_epx_rx_ev(struct usb_smartbond_data *data, uint8_t ep_idx)
 				if (net_buf_tailroom(buf) == 0 ||
 				    ep_state->last_packet_size < udc_mps_ep_size(ep_cfg) ||
 				    ep_state->iso) {
-					buf = udc_buf_get(data->dev, ep_cfg->addr);
+					buf = udc_buf_get(ep_cfg);
 					if (unlikely(buf == NULL)) {
 						LOG_ERR("ep 0x%02x queue is empty", ep_cfg->addr);
 						break;
@@ -1063,8 +1065,8 @@ static void handle_epx_tx_ev(struct usb_smartbond_data *data, struct smartbond_e
 					regs->txc |= USB_USB_TXC1_REG_USB_TX_EN_Msk |
 						     USB_USB_TXC1_REG_USB_LAST_Msk;
 				} else {
-					udc_ep_set_busy(data->dev, ep, false);
-					buf = udc_buf_get(data->dev, ep);
+					udc_ep_set_busy(ep_cfg, false);
+					buf = udc_buf_get(ep_cfg);
 
 					udc_submit_ep_event(data->dev, buf, 0);
 					udc_smartbond_ep_tx(data->dev, ep);
@@ -1164,13 +1166,15 @@ static void handle_ep0_nak(struct usb_smartbond_data *data)
 
 static void empty_ep0_queues(const struct device *dev)
 {
+	struct udc_ep_config *cfg_out = udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT);
+	struct udc_ep_config *cfg_in = udc_get_ep_cfg(dev, USB_CONTROL_EP_IN);
 	struct net_buf *buf;
 
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_OUT);
+	buf = udc_buf_get_all(cfg_out);
 	if (buf) {
 		net_buf_unref(buf);
 	}
-	buf = udc_buf_get_all(dev, USB_CONTROL_EP_IN);
+	buf = udc_buf_get_all(cfg_in);
 	if (buf) {
 		net_buf_unref(buf);
 	}
@@ -1452,6 +1456,7 @@ static void handle_ep0_rx_work(struct k_work *item)
 	struct usb_smartbond_data *data =
 		CONTAINER_OF(item, struct usb_smartbond_data, ep0_rx_work);
 	const uint8_t ep = USB_CONTROL_EP_OUT;
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(ep);
 	struct net_buf *buf;
 	const struct device *dev = data->dev;
 	unsigned int lock_key;
@@ -1462,8 +1467,8 @@ static void handle_ep0_rx_work(struct k_work *item)
 	 */
 	lock_key = irq_lock();
 
-	udc_ep_set_busy(dev, ep, false);
-	buf = udc_buf_get(dev, ep);
+	udc_ep_set_busy(ep_cfg, false);
+	buf = udc_buf_get(ep_cfg);
 
 	irq_unlock(lock_key);
 	if (unlikely(buf == NULL)) {
@@ -1490,9 +1495,10 @@ static void handle_ep0_tx_work(struct k_work *item)
 	struct net_buf *buf;
 	const struct device *dev = data->dev;
 	const uint8_t ep = USB_CONTROL_EP_IN;
+	struct udc_ep_config *ep_cfg = udc_get_ep_cfg(ep);
 	unsigned int lock_key;
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	__ASSERT(buf == EP0_IN_STATE(data)->buf, "TX work without buffer %p %p", buf,
 		 EP0_IN_STATE(data)->buf);
 
@@ -1502,10 +1508,10 @@ static void handle_ep0_tx_work(struct k_work *item)
 	 */
 	lock_key = irq_lock();
 
-	udc_ep_set_busy(dev, ep, false);
+	udc_ep_set_busy(ep_cfg, false);
 
 	/* Remove buffer from queue */
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(ep_cfg);
 
 	irq_unlock(lock_key);
 
diff --git a/drivers/usb/udc/udc_stm32.c b/drivers/usb/udc/udc_stm32.c
index 8f8bdb10a8e9d..bec4860c375f8 100644
--- a/drivers/usb/udc/udc_stm32.c
+++ b/drivers/usb/udc/udc_stm32.c
@@ -37,9 +37,32 @@ LOG_MODULE_REGISTER(udc_stm32, CONFIG_UDC_DRIVER_LOG_LEVEL);
 #define UDC_STM32_IRQ_NAME     usb
 #endif
 
+#define UDC_STM32_BASE_ADDRESS	DT_INST_REG_ADDR(0)
 #define UDC_STM32_IRQ		DT_INST_IRQ_BY_NAME(0, UDC_STM32_IRQ_NAME, irq)
 #define UDC_STM32_IRQ_PRI	DT_INST_IRQ_BY_NAME(0, UDC_STM32_IRQ_NAME, priority)
 
+#define USB_OTG_HS_EMB_PHY (DT_HAS_COMPAT_STATUS_OKAY(st_stm32_usbphyc) && \
+			    DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs))
+
+#define USB_OTG_HS_ULPI_PHY (DT_HAS_COMPAT_STATUS_OKAY(usb_ulpi_phy) && \
+			    DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs))
+
+/**
+ * The following defines are used to map the value of the "maxiumum-speed"
+ * DT property to the corresponding definition used by the STM32 HAL.
+ */
+#if defined(CONFIG_SOC_SERIES_STM32H7X) || defined(USB_OTG_HS_EMB_PHY)
+#define UDC_STM32_HIGH_SPEED             USB_OTG_SPEED_HIGH_IN_FULL
+#else
+#define UDC_STM32_HIGH_SPEED             USB_OTG_SPEED_HIGH
+#endif
+
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_usb)
+#define UDC_STM32_FULL_SPEED             PCD_SPEED_FULL
+#else
+#define UDC_STM32_FULL_SPEED             USB_OTG_SPEED_FULL
+#endif
+
 struct udc_stm32_data  {
 	PCD_HandleTypeDef pcd;
 	const struct device *dev;
@@ -184,7 +207,7 @@ static void udc_stm32_flush_tx_fifo(const struct device *dev)
 	HAL_PCD_EP_Receive(&priv->pcd, cfg->addr, NULL, 0);
 }
 
-static int udc_stm32_tx(const struct device *dev, uint8_t ep,
+static int udc_stm32_tx(const struct device *dev, struct udc_ep_config *epcfg,
 			struct net_buf *buf)
 {
 	struct udc_stm32_data *priv = udc_get_private(dev);
@@ -192,31 +215,31 @@ static int udc_stm32_tx(const struct device *dev, uint8_t ep,
 	uint8_t *data; uint32_t len;
 	HAL_StatusTypeDef status;
 
-	LOG_DBG("TX ep 0x%02x len %u", ep, buf->len);
+	LOG_DBG("TX ep 0x%02x len %u", epcfg->addr, buf->len);
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(epcfg)) {
 		return 0;
 	}
 
 	data = buf->data;
 	len = buf->len;
 
-	if (ep == USB_CONTROL_EP_IN) {
+	if (epcfg->addr == USB_CONTROL_EP_IN) {
 		len = MIN(cfg->ep0_mps, buf->len);
 	}
 
 	buf->data += len;
 	buf->len -= len;
 
-	status = HAL_PCD_EP_Transmit(&priv->pcd, ep, data, len);
+	status = HAL_PCD_EP_Transmit(&priv->pcd, epcfg->addr, data, len);
 	if (status != HAL_OK) {
-		LOG_ERR("HAL_PCD_EP_Transmit failed(0x%02x), %d", ep, (int)status);
+		LOG_ERR("HAL_PCD_EP_Transmit failed(0x%02x), %d", epcfg->addr, (int)status);
 		return -EIO;
 	}
 
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(epcfg, true);
 
-	if (ep == USB_CONTROL_EP_IN && len > 0) {
+	if (epcfg->addr == USB_CONTROL_EP_IN && len > 0) {
 		/* Wait for an empty package from the host.
 		 * This also flushes the TX FIFO to the host.
 		 */
@@ -230,25 +253,25 @@ static int udc_stm32_tx(const struct device *dev, uint8_t ep,
 	return 0;
 }
 
-static int udc_stm32_rx(const struct device *dev, uint8_t ep,
+static int udc_stm32_rx(const struct device *dev, struct udc_ep_config *epcfg,
 			struct net_buf *buf)
 {
 	struct udc_stm32_data *priv = udc_get_private(dev);
 	HAL_StatusTypeDef status;
 
-	LOG_DBG("RX ep 0x%02x len %u", ep, buf->size);
+	LOG_DBG("RX ep 0x%02x len %u", epcfg->addr, buf->size);
 
-	if (udc_ep_is_busy(dev, ep)) {
+	if (udc_ep_is_busy(epcfg)) {
 		return 0;
 	}
 
-	status = HAL_PCD_EP_Receive(&priv->pcd, ep, buf->data, buf->size);
+	status = HAL_PCD_EP_Receive(&priv->pcd, epcfg->addr, buf->data, buf->size);
 	if (status != HAL_OK) {
-		LOG_ERR("HAL_PCD_EP_Receive failed(0x%02x), %d", ep, (int)status);
+		LOG_ERR("HAL_PCD_EP_Receive failed(0x%02x), %d", epcfg->addr, (int)status);
 		return -EIO;
 	}
 
-	udc_ep_set_busy(dev, ep, true);
+	udc_ep_set_busy(epcfg, true);
 
 	return 0;
 }
@@ -288,14 +311,16 @@ void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 static void handle_msg_data_out(struct udc_stm32_data *priv, uint8_t epnum, uint16_t rx_count)
 {
 	const struct device *dev = priv->dev;
+	struct udc_ep_config *epcfg;
 	uint8_t ep = epnum | USB_EP_DIR_OUT;
 	struct net_buf *buf;
 
 	LOG_DBG("DataOut ep 0x%02x",  ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	epcfg = udc_get_ep_cfg(dev, ep);
+	udc_ep_set_busy(epcfg, false);
 
-	buf = udc_buf_get(dev, ep);
+	buf = udc_buf_get(epcfg);
 	if (unlikely(buf == NULL)) {
 		LOG_ERR("ep 0x%02x queue is empty", ep);
 		return;
@@ -318,23 +343,25 @@ static void handle_msg_data_out(struct udc_stm32_data *priv, uint8_t epnum, uint
 		udc_submit_ep_event(dev, buf, 0);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(epcfg);
 	if (buf) {
-		udc_stm32_rx(dev, ep, buf);
+		udc_stm32_rx(dev, epcfg, buf);
 	}
 }
 
 static void handle_msg_data_in(struct udc_stm32_data *priv, uint8_t epnum)
 {
 	const struct device *dev = priv->dev;
+	struct udc_ep_config *epcfg;
 	uint8_t ep = epnum | USB_EP_DIR_IN;
 	struct net_buf *buf;
 
 	LOG_DBG("DataIn ep 0x%02x",  ep);
 
-	udc_ep_set_busy(dev, ep, false);
+	epcfg = udc_get_ep_cfg(dev, ep);
+	udc_ep_set_busy(epcfg, false);
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(epcfg);
 	if (unlikely(buf == NULL)) {
 		return;
 	}
@@ -351,14 +378,14 @@ static void handle_msg_data_in(struct udc_stm32_data *priv, uint8_t epnum)
 		return;
 	}
 
-	if (udc_ep_buf_has_zlp(buf) && ep != USB_CONTROL_EP_IN) {
+	if (udc_ep_buf_has_zlp(buf)) {
 		udc_ep_buf_clear_zlp(buf);
 		HAL_PCD_EP_Transmit(&priv->pcd, ep, buf->data, 0);
 
 		return;
 	}
 
-	udc_buf_get(dev, ep);
+	udc_buf_get(epcfg);
 
 	if (ep == USB_CONTROL_EP_IN) {
 		if (udc_ctrl_stage_is_status_in(dev) ||
@@ -383,9 +410,9 @@ static void handle_msg_data_in(struct udc_stm32_data *priv, uint8_t epnum)
 
 	udc_submit_ep_event(dev, buf, 0);
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(epcfg);
 	if (buf) {
-		udc_stm32_tx(dev, ep, buf);
+		udc_stm32_tx(dev, epcfg, buf);
 	}
 }
 
@@ -849,9 +876,9 @@ static int udc_stm32_ep_enqueue(const struct device *dev,
 	lock_key = irq_lock();
 
 	if (USB_EP_DIR_IS_IN(epcfg->addr)) {
-		ret = udc_stm32_tx(dev, epcfg->addr, buf);
+		ret = udc_stm32_tx(dev, epcfg, buf);
 	} else {
-		ret = udc_stm32_rx(dev, epcfg->addr, buf);
+		ret = udc_stm32_rx(dev, epcfg, buf);
 	}
 
 	irq_unlock(lock_key);
@@ -866,12 +893,12 @@ static int udc_stm32_ep_dequeue(const struct device *dev,
 
 	udc_stm32_ep_flush(dev, epcfg);
 
-	buf = udc_buf_get_all(dev, epcfg->addr);
+	buf = udc_buf_get_all(epcfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
 
-	udc_ep_set_busy(dev, epcfg->addr, false);
+	udc_ep_set_busy(epcfg, false);
 
 	return 0;
 }
@@ -942,12 +969,6 @@ static const struct udc_api udc_stm32_api = {
 #define USB_BTABLE_SIZE 0
 #endif /* USB */
 
-#define USB_OTG_HS_EMB_PHY (DT_HAS_COMPAT_STATUS_OKAY(st_stm32_usbphyc) && \
-			    DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs))
-
-#define USB_OTG_HS_ULPI_PHY (DT_HAS_COMPAT_STATUS_OKAY(usb_ulpi_phy) && \
-			    DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs))
-
 static struct udc_stm32_data udc0_priv;
 
 static struct udc_data udc0_data = {
@@ -964,48 +985,6 @@ static const struct udc_stm32_config udc0_cfg  = {
 	.speed_idx = DT_ENUM_IDX_OR(DT_DRV_INST(0), maximum_speed, 1),
 };
 
-#if defined(USB_OTG_FS) || defined(USB_OTG_HS)
-static uint32_t usb_dc_stm32_get_maximum_speed(void)
-{
-/*
- * STM32L4 series USB LL API doesn't provide HIGH and HIGH_IN_FULL speed
- * defines.
- */
-#if defined(CONFIG_SOC_SERIES_STM32L4X)
-#define USB_OTG_SPEED_HIGH                     0U
-#define USB_OTG_SPEED_HIGH_IN_FULL             1U
-#endif /* CONFIG_SOC_SERIES_STM32L4X */
-/*
- * If max-speed is not passed via DT, set it to USB controller's
- * maximum hardware capability.
- */
-#if USB_OTG_HS_EMB_PHY || USB_OTG_HS_ULPI_PHY
-	uint32_t speed = USB_OTG_SPEED_HIGH;
-#else
-	uint32_t speed = USB_OTG_SPEED_FULL;
-#endif
-
-#ifdef USB_MAXIMUM_SPEED
-
-	if (!strncmp(USB_MAXIMUM_SPEED, "high-speed", 10)) {
-		speed = USB_OTG_SPEED_HIGH;
-	} else if (!strncmp(USB_MAXIMUM_SPEED, "full-speed", 10)) {
-#if defined(CONFIG_SOC_SERIES_STM32H7X) || defined(USB_OTG_HS_EMB_PHY)
-		speed = USB_OTG_SPEED_HIGH_IN_FULL;
-#else
-		speed = USB_OTG_SPEED_FULL;
-#endif
-	} else {
-		LOG_DBG("Unsupported maximum speed defined in device tree. "
-			"USB controller will default to its maximum HW "
-			"capability");
-	}
-#endif
-
-	return speed;
-}
-#endif /* USB_OTG_FS || USB_OTG_HS */
-
 static void priv_pcd_prepare(const struct device *dev)
 {
 	struct udc_stm32_data *priv = udc_get_private(dev);
@@ -1016,20 +995,15 @@ static void priv_pcd_prepare(const struct device *dev)
 	/* Default values */
 	priv->pcd.Init.dev_endpoints = cfg->num_endpoints;
 	priv->pcd.Init.ep0_mps = cfg->ep0_mps;
-	priv->pcd.Init.speed = PCD_SPEED_FULL;
+	priv->pcd.Init.speed = UTIL_CAT(UDC_STM32_, DT_INST_STRING_UPPER_TOKEN(0, maximum_speed));
 
 	/* Per controller/Phy values */
 #if defined(USB)
 	priv->pcd.Instance = USB;
 #elif defined(USB_DRD_FS)
 	priv->pcd.Instance = USB_DRD_FS;
-#elif defined(USB_OTG_FS) || defined(USB_OTG_HS)
-	priv->pcd.Init.speed = usb_dc_stm32_get_maximum_speed();
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs)
-	priv->pcd.Instance = USB_OTG_HS;
-#else
-	priv->pcd.Instance = USB_OTG_FS;
-#endif
+#elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otgfs) || DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs)
+	priv->pcd.Instance = (USB_OTG_GlobalTypeDef *)UDC_STM32_BASE_ADDRESS;
 #endif /* USB */
 
 #if USB_OTG_HS_EMB_PHY
@@ -1084,6 +1058,15 @@ static int priv_clock_enable(void)
 	HAL_SYSCFG_SetOTGPHYReferenceClockSelection(SYSCFG_OTG_HS_PHY_CLK_SELECT_1);
 	/* Configuring the SYSCFG registers OTG_HS PHY : OTG_HS PHY enable*/
 	HAL_SYSCFG_EnableOTGPHY(SYSCFG_OTG_HS_PHY_ENABLE);
+#elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
+	/* Enable Vdd USB voltage monitoring */
+	LL_PWR_EnableVddUSBMonitoring();
+	while (__HAL_PWR_GET_FLAG(PWR_FLAG_USB33RDY)) {
+		/* Wait FOR VDD33USB ready */
+	}
+
+	/* Enable VDDUSB */
+	LL_PWR_EnableVddUSB();
 #elif defined(PWR_USBSCR_USB33SV) || defined(PWR_SVMCR_USV)
 	/*
 	 * VDDUSB independent USB supply (PWR clock is on)
@@ -1159,13 +1142,15 @@ static int priv_clock_enable(void)
 	/* Both OTG HS and USBPHY sleep clock MUST be disabled here at the same time */
 	LL_AHB2_GRP1_DisableClockStopSleep(LL_AHB2_GRP1_PERIPH_OTG_HS ||
 						LL_AHB2_GRP1_PERIPH_USBPHY);
-#else
+#elif !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 	LL_AHB1_GRP1_DisableClockLowPower(LL_AHB1_GRP1_PERIPH_OTGHSULPI);
 #endif /* defined(CONFIG_SOC_SERIES_STM32H7X) */
 
 #if USB_OTG_HS_EMB_PHY
+#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 	LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_OTGPHYC);
 #endif
+#endif
 #elif defined(CONFIG_SOC_SERIES_STM32H7X) && DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otgfs)
 	/* The USB2 controller only works in FS mode, but the ULPI clock needs
 	 * to be disabled in sleep mode for it to work.
@@ -1194,9 +1179,11 @@ static int priv_clock_disable(void)
 static struct udc_ep_config ep_cfg_in[DT_INST_PROP(0, num_bidir_endpoints)];
 static struct udc_ep_config ep_cfg_out[DT_INST_PROP(0, num_bidir_endpoints)];
 
+#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 PINCTRL_DT_INST_DEFINE(0);
 static const struct pinctrl_dev_config *usb_pcfg =
 					PINCTRL_DT_INST_DEV_CONFIG_GET(0);
+#endif
 
 #if USB_OTG_HS_ULPI_PHY
 static const struct gpio_dt_spec ulpi_reset =
@@ -1279,11 +1266,13 @@ static int udc_stm32_driver_init0(const struct device *dev)
 	IRQ_CONNECT(UDC_STM32_IRQ, UDC_STM32_IRQ_PRI, udc_stm32_irq,
 		    DEVICE_DT_INST_GET(0), 0);
 
+#if !DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_otghs)
 	err = pinctrl_apply_state(usb_pcfg, PINCTRL_STATE_DEFAULT);
 	if (err < 0) {
 		LOG_ERR("USB pinctrl setup failed (%d)", err);
 		return err;
 	}
+#endif
 
 #ifdef SYSCFG_CFGR1_USB_IT_RMP
 	/*
diff --git a/drivers/usb/udc/udc_virtual.c b/drivers/usb/udc/udc_virtual.c
index c729aa08cd753..ae32c9ae2c625 100644
--- a/drivers/usb/udc/udc_virtual.c
+++ b/drivers/usb/udc/udc_virtual.c
@@ -172,7 +172,7 @@ static int vrt_handle_out(const struct device *dev,
 		return vrt_request_reply(dev, pkt, UVB_REPLY_STALL);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_DBG("reply NACK ep 0x%02x", ep);
 		return vrt_request_reply(dev, pkt, UVB_REPLY_NACK);
@@ -184,7 +184,7 @@ static int vrt_handle_out(const struct device *dev,
 	LOG_DBG("Handle data OUT, %zu | %zu", pkt->length, net_buf_tailroom(buf));
 
 	if (net_buf_tailroom(buf) == 0 || pkt->length < udc_mps_ep_size(ep_cfg)) {
-		buf = udc_buf_get(dev, ep);
+		buf = udc_buf_get(ep_cfg);
 
 		if (ep == USB_CONTROL_EP_OUT) {
 			err = vrt_handle_ctrl_out(dev, buf);
@@ -239,7 +239,7 @@ static int vrt_handle_in(const struct device *dev,
 		return vrt_request_reply(dev, pkt, UVB_REPLY_STALL);
 	}
 
-	buf = udc_buf_peek(dev, ep);
+	buf = udc_buf_peek(ep_cfg);
 	if (buf == NULL) {
 		LOG_DBG("reply NACK ep 0x%02x", ep);
 		return vrt_request_reply(dev, pkt, UVB_REPLY_NACK);
@@ -259,7 +259,7 @@ static int vrt_handle_in(const struct device *dev,
 		}
 
 		LOG_DBG("Finish data IN %zu | %u", pkt->length, buf->len);
-		buf = udc_buf_get(dev, ep);
+		buf = udc_buf_get(ep_cfg);
 
 		if (ep == USB_CONTROL_EP_IN) {
 			err = isr_handle_ctrl_in(dev, buf);
@@ -411,7 +411,7 @@ static int udc_vrt_ep_dequeue(const struct device *dev,
 
 	lock_key = irq_lock();
 	/* Draft dequeue implementation */
-	buf = udc_buf_get_all(dev, cfg->addr);
+	buf = udc_buf_get_all(cfg);
 	if (buf) {
 		udc_submit_ep_event(dev, buf, -ECONNABORTED);
 	}
diff --git a/drivers/usb_c/tcpc/ps8xxx.c b/drivers/usb_c/tcpc/ps8xxx.c
index 3373de3a0fdd8..cdc57228d234d 100644
--- a/drivers/usb_c/tcpc/ps8xxx.c
+++ b/drivers/usb_c/tcpc/ps8xxx.c
@@ -535,8 +535,6 @@ void ps8xxx_alert_work_cb(struct k_work *work)
 
 			tcpci_tcpm_get_status_register(&cfg->bus, TCPC_POWER_STATUS,
 						       (uint16_t *)&pwr_status);
-			tcpci_tcpm_clear_status_register(&cfg->bus, TCPC_POWER_STATUS,
-							 (uint16_t)pwr_status);
 
 			LOG_DBG("PS8xxx power status: %02x", pwr_status);
 		} else if (alert_type == TCPC_ALERT_EXTENDED) {
diff --git a/drivers/usb_c/tcpc/rt1715.c b/drivers/usb_c/tcpc/rt1715.c
index 219850d43a485..a1941ebd4b291 100644
--- a/drivers/usb_c/tcpc/rt1715.c
+++ b/drivers/usb_c/tcpc/rt1715.c
@@ -265,8 +265,7 @@ static int rt1715_tcpc_rx_fifo_enqueue(const struct device *dev)
 {
 	const struct rt1715_cfg *const cfg = dev->config;
 	struct rt1715_data *data = dev->data;
-	struct i2c_msg buf[5];
-	uint8_t reg = TCPC_REG_RX_BUFFER;
+	uint8_t buf[4];
 	uint8_t rxbcnt;
 	uint8_t rxftype;
 	uint16_t rxhead;
@@ -274,27 +273,15 @@ static int rt1715_tcpc_rx_fifo_enqueue(const struct device *dev)
 	struct pd_msg *msg = &data->rx_msg;
 	int ret = 0;
 
-	buf[0].buf = &reg;
-	buf[0].len = 1;
-	buf[0].flags = I2C_MSG_WRITE;
-
-	buf[1].buf = &rxbcnt;
-	buf[1].len = 1;
-	buf[1].flags = I2C_MSG_RESTART | I2C_MSG_READ;
-
-	buf[2].buf = &rxftype;
-	buf[2].len = 1;
-	buf[2].flags = I2C_MSG_RESTART | I2C_MSG_READ;
-
-	buf[3].buf = (uint8_t *)&rxhead;
-	buf[3].len = 2;
-	buf[3].flags = I2C_MSG_RESTART | I2C_MSG_READ | I2C_MSG_STOP;
-
-	ret = i2c_transfer(cfg->bus.bus, buf, 5, cfg->bus.addr);
+	ret = i2c_burst_read_dt(&cfg->bus, TCPC_REG_RX_BUFFER, buf, sizeof(buf));
 	if (ret != 0) {
 		return ret;
 	}
 
+	rxbcnt = buf[0];
+	rxftype = buf[1];
+	rxhead = (buf[3] << 8) | buf[2];
+
 	/* rxbcnt = 1 (frame type) + 2 (Message Header) + Rx data byte count */
 	if (rxbcnt < 3) {
 		LOG_ERR("Invalid RXBCNT: %d", rxbcnt);
@@ -556,34 +543,13 @@ void rt1715_alert_work_cb(struct k_work *work)
 							 (uint16_t)fault);
 
 			LOG_DBG("fault: %02x", fault);
-		} else if (alert_type == TCPC_ALERT_EXTENDED_STATUS) {
-			uint8_t ext_status;
-
-			tcpci_tcpm_get_status_register(&cfg->bus, TCPC_EXTENDED_STATUS,
-						       (uint16_t *)&ext_status);
-			tcpci_tcpm_clear_status_register(&cfg->bus, TCPC_EXTENDED_STATUS,
-							 (uint16_t)ext_status);
-
-			data->cc_changed = true;
-			LOG_DBG("ext status: %02x", ext_status);
 		} else if (alert_type == TCPC_ALERT_POWER_STATUS) {
 			uint8_t pwr_status;
 
 			tcpci_tcpm_get_status_register(&cfg->bus, TCPC_POWER_STATUS,
 						       (uint16_t *)&pwr_status);
-			tcpci_tcpm_clear_status_register(&cfg->bus, TCPC_POWER_STATUS,
-							 (uint16_t)pwr_status);
 
 			LOG_DBG("power status: %02x", pwr_status);
-		} else if (alert_type == TCPC_ALERT_EXTENDED) {
-			uint8_t alert_status;
-
-			tcpci_tcpm_get_status_register(&cfg->bus, TCPC_EXTENDED_ALERT_STATUS,
-						       (uint16_t *)&alert_status);
-			tcpci_tcpm_clear_status_register(&cfg->bus, TCPC_EXTENDED_ALERT_STATUS,
-							 (uint16_t)alert_status);
-
-			LOG_DBG("ext alert: %02x", alert_status);
 		} else if (alert_type == TCPC_ALERT_MSG_STATUS) {
 			LOG_DBG("MSG pending");
 
@@ -652,7 +618,14 @@ void rt1715_init_work_cb(struct k_work *work)
 	gpio_pin_configure_dt(&cfg->alert_gpio, GPIO_INPUT);
 
 	gpio_init_callback(&data->alert_cb, rt1715_alert_cb, BIT(cfg->alert_gpio.pin));
-	gpio_add_callback(cfg->alert_gpio.port, &data->alert_cb);
+
+	ret = gpio_add_callback(cfg->alert_gpio.port, &data->alert_cb);
+
+	if (ret != 0) {
+		LOG_ERR("Failed to add alert callback: %d", ret);
+		return;
+	}
+
 	gpio_pin_interrupt_configure_dt(&cfg->alert_gpio, GPIO_INT_EDGE_TO_ACTIVE);
 
 	tcpci_init_alert_mask(data->dev);
diff --git a/drivers/usb_c/tcpc/tcpci.c b/drivers/usb_c/tcpc/tcpci.c
index 8a356159843f9..17a7291d93382 100644
--- a/drivers/usb_c/tcpc/tcpci.c
+++ b/drivers/usb_c/tcpc/tcpci.c
@@ -623,7 +623,7 @@ int tcpci_tcpm_get_status_register(const struct i2c_dt_spec *bus, enum tcpc_stat
 	case TCPC_ALERT_STATUS:
 		return tcpci_read_reg16(bus, TCPC_REG_ALERT, status);
 	case TCPC_CC_STATUS:
-		return tcpci_read_reg16(bus, TCPC_REG_CC_STATUS, status);
+		return tcpci_read_reg8(bus, TCPC_REG_CC_STATUS, (uint8_t *)status);
 	case TCPC_POWER_STATUS:
 		return tcpci_read_reg8(bus, TCPC_REG_POWER_STATUS, (uint8_t *)status);
 	case TCPC_FAULT_STATUS:
@@ -645,9 +645,11 @@ int tcpci_tcpm_clear_status_register(const struct i2c_dt_spec *bus, enum tcpc_st
 	case TCPC_ALERT_STATUS:
 		return tcpci_write_reg16(bus, TCPC_REG_ALERT, mask);
 	case TCPC_CC_STATUS:
-		return tcpci_write_reg16(bus, TCPC_REG_CC_STATUS, mask);
+		LOG_ERR("CC_STATUS is cleared by the TCPC");
+		return -EINVAL;
 	case TCPC_POWER_STATUS:
-		return tcpci_write_reg8(bus, TCPC_REG_POWER_STATUS, (uint8_t)mask);
+		LOG_ERR("POWER_STATUS is cleared by the TCPC");
+		return -EINVAL;
 	case TCPC_FAULT_STATUS:
 		return tcpci_write_reg8(bus, TCPC_REG_FAULT_STATUS, (uint8_t)mask);
 	case TCPC_EXTENDED_STATUS:
diff --git a/drivers/video/Kconfig.emul_imager b/drivers/video/Kconfig.emul_imager
index d2752fdd53b47..fc4956178337b 100644
--- a/drivers/video/Kconfig.emul_imager
+++ b/drivers/video/Kconfig.emul_imager
@@ -6,13 +6,9 @@ config VIDEO_EMUL_IMAGER
 	depends on DT_HAS_ZEPHYR_VIDEO_EMUL_IMAGER_ENABLED
 	default y
 	help
-	  Enable driver for the emulated Imager.
-
-config VIDEO_EMUL_IMAGER_FRAMEBUFFER_SIZE
-	int "Internal framebuffer size used for link emulation purpose"
-	default 4096
-	help
-	  Configure the size of the internal framebuffer the emulated Imager
-	  driver uses to simulate MIPI transfers. This is the first field of
-	  dev->data, and the emulated video MIPI driver will `memcpy()` it
-	  into the video buffer.
+	  Enable driver for the emulated Imager. A line buffer contains
+	  the color pattern within the imager data struct, at the first
+	  field, and the "zephyr,video-emul-rx" driver will memcpy() this
+	  line over a full frame, simulating a MIPI link transmetting
+	  the lines of data from the imager to the memory.  The default
+	  value fits 2 bit-per-pixel, 640 pixel-wide frames.
diff --git a/drivers/video/gc2145.c b/drivers/video/gc2145.c
index cb3efbfb585d2..8ac3cc24033c1 100644
--- a/drivers/video/gc2145.c
+++ b/drivers/video/gc2145.c
@@ -29,8 +29,6 @@ LOG_MODULE_REGISTER(video_gc2145, CONFIG_VIDEO_LOG_LEVEL);
 #define GC2145_REG_SYNC_MODE_ROW_SWITCH 0x20
 #define GC2145_REG_RESET                0xFE
 #define GC2145_REG_SW_RESET             0x80
-#define GC2145_PID_VAL                  0x21
-#define GC2145_REV_VAL                  0x55
 #define GC2145_SET_P0_REGS              0x00
 #define GC2145_REG_CROP_ENABLE          0x90
 #define GC2145_CROP_SET_ENABLE          0x01
@@ -717,6 +715,7 @@ static const struct video_format_cap fmts[] = {
 	GC2145_VIDEO_FORMAT_CAP(RESOLUTION_QVGA_W, RESOLUTION_QVGA_H, VIDEO_PIX_FMT_YUYV),
 	GC2145_VIDEO_FORMAT_CAP(RESOLUTION_VGA_W, RESOLUTION_VGA_H, VIDEO_PIX_FMT_YUYV),
 	GC2145_VIDEO_FORMAT_CAP(RESOLUTION_UXGA_W, RESOLUTION_UXGA_H, VIDEO_PIX_FMT_YUYV),
+	{0},
 };
 
 static int gc2145_write_reg(const struct i2c_dt_spec *spec, uint8_t reg_addr, uint8_t value)
@@ -1009,21 +1008,23 @@ static uint8_t gc2145_check_connection(const struct device *dev)
 {
 	int ret;
 	const struct gc2145_config *cfg = dev->config;
-	uint8_t reg_pid_val;
-	uint8_t reg_ver_val;
+	uint8_t reg_chip_id[2];
+	uint16_t chip_id;
 
-	ret = gc2145_read_reg(&cfg->i2c, 0xf0, &reg_pid_val);
+	ret = gc2145_read_reg(&cfg->i2c, 0xf0, &reg_chip_id[0]);
 	if (ret < 0) {
 		return ret;
 	}
 
-	ret = gc2145_read_reg(&cfg->i2c, 0xf1, &reg_ver_val);
+	ret = gc2145_read_reg(&cfg->i2c, 0xf1, &reg_chip_id[1]);
 	if (ret < 0) {
 		return ret;
 	}
 
-	if ((reg_ver_val != GC2145_REV_VAL) || (reg_pid_val != GC2145_PID_VAL)) {
-		LOG_WRN("Unexpected GC2145 pid: 0x%x or rev: 0x%x", reg_pid_val, reg_ver_val);
+	chip_id = reg_chip_id[0] << 8 | reg_chip_id[1];
+
+	if (chip_id != 0x2145 && chip_id != 0x2155) {
+		LOG_WRN("Unexpected GC2145 chip ID: 0x%04x", chip_id);
 	}
 
 	return 0;
@@ -1042,7 +1043,7 @@ static int gc2145_set_fmt(const struct device *dev, enum video_endpoint_id ep,
 	}
 
 	/* Check if camera is capable of handling given format */
-	for (int i = 0; i < ARRAY_SIZE(fmts); i++) {
+	for (int i = 0; i < ARRAY_SIZE(fmts) - 1; i++) {
 		if (fmts[i].width_min == fmt->width && fmts[i].height_min == fmt->height &&
 		    fmts[i].pixelformat == fmt->pixelformat) {
 			res = i;
diff --git a/drivers/video/ov5640.c b/drivers/video/ov5640.c
index 768d0d9ffa1bd..cb567bd48bc02 100644
--- a/drivers/video/ov5640.c
+++ b/drivers/video/ov5640.c
@@ -466,7 +466,21 @@ static const struct ov5640_reg init_params_dvp[] = {
 	{0x3a15, 0xae},
 };
 
-static const struct ov5640_reg csi2_low_res_params[] = {
+static const struct ov5640_reg csi2_qqvga_res_params[] = {
+	{0x3800, 0x00}, {0x3801, 0x10}, {0x3802, 0x00}, {0x3803, 0x0E}, {0x3804, 0x0a},
+	{0x3805, 0x2f}, {0x3806, 0x07}, {0x3807, 0xa5}, {0x3808, 0x00}, {0x3809, 0xa0},
+	{0x380a, 0x00}, {0x380b, 0x78}, {0x380c, 0x06}, {0x380d, 0x40}, {0x380e, 0x03},
+	{0x380f, 0xe6}, {0x3810, 0x00}, {0x3811, 0x02}, {0x3812, 0x00}, {0x3813, 0x04},
+	{0x3814, 0x31}, {0x3815, 0x31}, {0x3824, 0x02}, {0x460c, 0x22}};
+
+static const struct ov5640_reg csi2_qvga_res_params[] = {
+	{0x3800, 0x00}, {0x3801, 0x10}, {0x3802, 0x00}, {0x3803, 0x0E}, {0x3804, 0x0a},
+	{0x3805, 0x2f}, {0x3806, 0x07}, {0x3807, 0xa5}, {0x3808, 0x01}, {0x3809, 0x40},
+	{0x380a, 0x00}, {0x380b, 0xf0}, {0x380c, 0x06}, {0x380d, 0x40}, {0x380e, 0x03},
+	{0x380f, 0xe8}, {0x3810, 0x00}, {0x3811, 0x02}, {0x3812, 0x00}, {0x3813, 0x04},
+	{0x3814, 0x31}, {0x3815, 0x31}, {0x3824, 0x02}, {0x460c, 0x22}};
+
+static const struct ov5640_reg csi2_vga_res_params[] = {
 	{0x3800, 0x00}, {0x3801, 0x00}, {0x3802, 0x00}, {0x3803, 0x04}, {0x3804, 0x0a},
 	{0x3805, 0x3f}, {0x3806, 0x07}, {0x3807, 0x9b}, {0x3808, 0x02}, {0x3809, 0x80},
 	{0x380a, 0x01}, {0x380b, 0xe0}, {0x380c, 0x07}, {0x380d, 0x68}, {0x380e, 0x03},
@@ -486,12 +500,36 @@ static const struct ov5640_mipi_frmrate_config mipi_hd_frmrate_params[] = {
 static const struct ov5640_mipi_frmrate_config mipi_vga_frmrate_params[] = {
 	{15, 0x22, 0x38, 24000000}, {30, 0x14, 0x38, 24000000}, {60, 0x14, 0x70, 48000000}};
 
+static const struct ov5640_mipi_frmrate_config mipi_qvga_frmrate_params[] = {
+	{15, 0x22, 0x30, 24000000}, {30, 0x14, 0x30, 24000000}, {60, 0x14, 0x60, 48000000}};
+
+static const struct ov5640_mipi_frmrate_config mipi_qqvga_frmrate_params[] = {
+	{15, 0x22, 0x30, 24000000}, {30, 0x14, 0x30, 24000000}, {60, 0x14, 0x60, 48000000}};
+
 static const struct ov5640_mode_config csi2_modes[] = {
+	{
+		.width = 160,
+		.height = 120,
+		.array_size_res_params = ARRAY_SIZE(csi2_qqvga_res_params),
+		.res_params = csi2_qqvga_res_params,
+		.mipi_frmrate_config = mipi_qqvga_frmrate_params,
+		.max_frmrate = OV5640_60_FPS,
+		.def_frmrate = OV5640_30_FPS,
+	},
+	{
+		.width = 320,
+		.height = 240,
+		.array_size_res_params = ARRAY_SIZE(csi2_qvga_res_params),
+		.res_params = csi2_qvga_res_params,
+		.mipi_frmrate_config = mipi_qvga_frmrate_params,
+		.max_frmrate = OV5640_60_FPS,
+		.def_frmrate = OV5640_30_FPS,
+	},
 	{
 		.width = 640,
 		.height = 480,
-		.array_size_res_params = ARRAY_SIZE(csi2_low_res_params),
-		.res_params = csi2_low_res_params,
+		.array_size_res_params = ARRAY_SIZE(csi2_vga_res_params),
+		.res_params = csi2_vga_res_params,
 		.mipi_frmrate_config = mipi_vga_frmrate_params,
 		.max_frmrate = OV5640_60_FPS,
 		.def_frmrate = OV5640_30_FPS,
@@ -575,6 +613,8 @@ static const struct video_format_cap csi2_fmts[] = {
 	OV5640_VIDEO_FORMAT_CAP(1280, 720, VIDEO_PIX_FMT_YUYV),
 	OV5640_VIDEO_FORMAT_CAP(640, 480, VIDEO_PIX_FMT_RGB565),
 	OV5640_VIDEO_FORMAT_CAP(640, 480, VIDEO_PIX_FMT_YUYV),
+	OV5640_VIDEO_FORMAT_CAP(320, 240, VIDEO_PIX_FMT_RGB565),
+	OV5640_VIDEO_FORMAT_CAP(160, 120, VIDEO_PIX_FMT_RGB565),
 	{0}};
 
 static const struct video_format_cap dvp_fmts[] = {
diff --git a/drivers/video/video_emul_imager.c b/drivers/video/video_emul_imager.c
index c85c821472fa6..c7e26a9ff54f6 100644
--- a/drivers/video/video_emul_imager.c
+++ b/drivers/video/video_emul_imager.c
@@ -27,19 +27,21 @@ LOG_MODULE_REGISTER(video_emul_imager, CONFIG_VIDEO_LOG_LEVEL);
 #define EMUL_IMAGER_REG_TIMING1   0x0004
 #define EMUL_IMAGER_REG_TIMING2   0x0005
 #define EMUL_IMAGER_REG_TIMING3   0x0006
-#define EMUL_IMAGER_REG_EXPOSURE  0x0007
-#define EMUL_IMAGER_REG_GAIN      0x0008
-#define EMUL_IMAGER_REG_PATTERN   0x0009
+#define EMUL_IMAGER_REG_CUSTOM    0x0007
+#define EMUL_IMAGER_REG_FORMAT    0x000a
 #define EMUL_IMAGER_PATTERN_OFF   0x00
 #define EMUL_IMAGER_PATTERN_BARS1 0x01
 #define EMUL_IMAGER_PATTERN_BARS2 0x02
 
+/* Custom control that is just an I2C write for example and test purpose */
+#define EMUL_IMAGER_CID_CUSTOM (VIDEO_CID_PRIVATE_BASE + 0x01)
+
 /* Emulated register bank */
 uint8_t emul_imager_fake_regs[10];
 
 enum emul_imager_fmt_id {
-	RGB565_64x20,
-	YUYV_64x20,
+	RGB565_320x240,
+	YUYV_320x240,
 };
 
 struct emul_imager_reg {
@@ -53,7 +55,7 @@ struct emul_imager_mode {
 	 * This permits to deduplicate the list of registers in case some lare sections
 	 * are repeated across modes, such as the resolution for different FPS.
 	 */
-	const struct emul_imager_reg *regs[2];
+	const struct emul_imager_reg *regs[3];
 	/* More fields can be added according to the needs of the sensor driver */
 };
 
@@ -62,101 +64,95 @@ struct emul_imager_config {
 };
 
 struct emul_imager_data {
-	/* First field is a framebuffer for I/O emulation purpose */
-	uint8_t framebuffer[CONFIG_VIDEO_EMUL_IMAGER_FRAMEBUFFER_SIZE];
+	/* First field is a line buffer for I/O emulation purpose */
+	uint8_t framebuffer[320 * sizeof(uint16_t)];
 	/* Other fields are shared with real hardware drivers */
 	const struct emul_imager_mode *mode;
 	enum emul_imager_fmt_id fmt_id;
 	struct video_format fmt;
 };
 
-/* Initial parameters of the sensors common to all modes. */
+/* All the I2C registers sent on various scenario */
 static const struct emul_imager_reg emul_imager_init_regs[] = {
 	{EMUL_IMAGER_REG_CTRL, 0x00},
-	/* Example comment about REG_INIT1 */
 	{EMUL_IMAGER_REG_INIT1, 0x10},
 	{EMUL_IMAGER_REG_INIT2, 0x00},
+	/* Undocumented registers from the vendor */
+	{0x1200, 0x01},
+	{0x1204, 0x01},
+	{0x1205, 0x20},
+	{0x1209, 0x7f},
 	{0},
 };
-
-/* List of registers aggregated together in "modes" that can be applied
- * to set the timing parameters and other mode-dependent configuration.
- */
-
-static const struct emul_imager_reg emul_imager_rgb565_64x20[] = {
-	{EMUL_IMAGER_REG_TIMING1, 0x64},
-	{EMUL_IMAGER_REG_TIMING2, 0x20},
-	{0},
-};
-static const struct emul_imager_reg emul_imager_rgb565_64x20_15fps[] = {
-	{EMUL_IMAGER_REG_TIMING3, 15},
+static const struct emul_imager_reg emul_imager_rgb565[] = {
+	{EMUL_IMAGER_REG_FORMAT, 0x01},
 	{0},
 };
-static const struct emul_imager_reg emul_imager_rgb565_64x20_30fps[] = {
-	{EMUL_IMAGER_REG_TIMING3, 30},
+static const struct emul_imager_reg emul_imager_yuyv[] = {
+	{EMUL_IMAGER_REG_FORMAT, 0x02},
 	{0},
 };
-static const struct emul_imager_reg emul_imager_rgb565_64x20_60fps[] = {
-	{EMUL_IMAGER_REG_TIMING3, 60},
+static const struct emul_imager_reg emul_imager_320x240[] = {
+	{EMUL_IMAGER_REG_TIMING1, 0x32},
+	{EMUL_IMAGER_REG_TIMING2, 0x24},
 	{0},
 };
-struct emul_imager_mode emul_imager_rgb565_64x20_modes[] = {
-	{.fps = 15, .regs = {emul_imager_rgb565_64x20, emul_imager_rgb565_64x20_15fps}},
-	{.fps = 30, .regs = {emul_imager_rgb565_64x20, emul_imager_rgb565_64x20_30fps}},
-	{.fps = 60, .regs = {emul_imager_rgb565_64x20, emul_imager_rgb565_64x20_60fps}},
+static const struct emul_imager_reg emul_imager_15fps[] = {
+	{EMUL_IMAGER_REG_TIMING3, 15},
 	{0},
 };
-
-static const struct emul_imager_reg emul_imager_yuyv_64x20[] = {
-	{EMUL_IMAGER_REG_TIMING1, 0x64},
-	{EMUL_IMAGER_REG_TIMING2, 0x20},
+static const struct emul_imager_reg emul_imager_30fps[] = {
+	{EMUL_IMAGER_REG_TIMING3, 30},
 	{0},
 };
-static const struct emul_imager_reg emul_imager_yuyv_64x20_15fps[] = {
-	{EMUL_IMAGER_REG_TIMING3, 15},
+static const struct emul_imager_reg emul_imager_60fps[] = {
+	{EMUL_IMAGER_REG_TIMING3, 60},
 	{0},
 };
-static const struct emul_imager_reg emul_imager_yuyv_64x20_30fps[] = {
-	{EMUL_IMAGER_REG_TIMING3, 30},
+
+/* Description of "modes", that pick lists of registesr that will be all sentto the imager */
+struct emul_imager_mode emul_imager_rgb565_320x240_modes[] = {
+	{.fps = 15, .regs = {emul_imager_320x240, emul_imager_rgb565, emul_imager_15fps}},
+	{.fps = 30, .regs = {emul_imager_320x240, emul_imager_rgb565, emul_imager_30fps}},
+	{.fps = 60, .regs = {emul_imager_320x240, emul_imager_rgb565, emul_imager_60fps}},
 	{0},
 };
-struct emul_imager_mode emul_imager_yuyv_64x20_modes[] = {
-	{.fps = 15, .regs = {emul_imager_yuyv_64x20, emul_imager_yuyv_64x20_15fps}},
-	{.fps = 30, .regs = {emul_imager_yuyv_64x20, emul_imager_yuyv_64x20_30fps}},
+struct emul_imager_mode emul_imager_yuyv_320x240_modes[] = {
+	{.fps = 15, .regs = {emul_imager_320x240, emul_imager_yuyv, emul_imager_15fps}},
+	{.fps = 30, .regs = {emul_imager_320x240, emul_imager_yuyv, emul_imager_30fps}},
 	{0},
 };
 
-/* Summary of all the modes of all the frame formats, with the format ID as
- * index, matching fmts[].
- */
+/* Summary of all the modes of all the frame formats, with indexes matching those of fmts[]. */
 static const struct emul_imager_mode *emul_imager_modes[] = {
-	[RGB565_64x20] = emul_imager_rgb565_64x20_modes,
-	[YUYV_64x20] = emul_imager_yuyv_64x20_modes,
+	[RGB565_320x240] = emul_imager_rgb565_320x240_modes,
+	[YUYV_320x240] = emul_imager_yuyv_320x240_modes,
 };
 
 /* Video device capabilities where the supported resolutions and pixel formats are listed.
  * The format ID is used as index to fetch the matching mode from the list above.
  */
-#define EMUL_IMAGER_VIDEO_FORMAT_CAP(width, height, format)                                        \
+#define EMUL_IMAGER_VIDEO_FORMAT_CAP(format, width, height)                                        \
 	{                                                                                          \
+		/* For a real imager, the width and height would be macro parameters */            \
 		.pixelformat = (format),                                                           \
 		.width_min = (width),                                                              \
 		.width_max = (width),                                                              \
+		.width_step = 0,                                                                   \
 		.height_min = (height),                                                            \
 		.height_max = (height),                                                            \
-		.width_step = 0,                                                                   \
 		.height_step = 0,                                                                  \
 	}
 static const struct video_format_cap fmts[] = {
-	[RGB565_64x20] = EMUL_IMAGER_VIDEO_FORMAT_CAP(64, 20, VIDEO_PIX_FMT_RGB565),
-	[YUYV_64x20] = EMUL_IMAGER_VIDEO_FORMAT_CAP(64, 20, VIDEO_PIX_FMT_YUYV),
+	[RGB565_320x240] = EMUL_IMAGER_VIDEO_FORMAT_CAP(VIDEO_PIX_FMT_RGB565, 320, 240),
+	[YUYV_320x240] = EMUL_IMAGER_VIDEO_FORMAT_CAP(VIDEO_PIX_FMT_YUYV, 320, 240),
 	{0},
 };
 
 /* Emulated I2C register interface, to replace with actual I2C calls for real hardware */
 static int emul_imager_read_reg(const struct device *const dev, uint8_t reg_addr, uint8_t *value)
 {
-	LOG_DBG("%s placeholder for I2C read from 0x%02x", dev->name, reg_addr);
+	LOG_DBG("Placeholder for I2C read from 0x%02x", reg_addr);
 	switch (reg_addr) {
 	case EMUL_IMAGER_REG_SENSOR_ID:
 		*value = EMUL_IMAGER_SENSOR_ID;
@@ -181,7 +177,7 @@ static int emul_imager_read_int(const struct device *const dev, uint8_t reg_addr
 /* Some sensors will need reg8 or reg16 variants. */
 static int emul_imager_write_reg(const struct device *const dev, uint8_t reg_addr, uint8_t value)
 {
-	LOG_DBG("%s placeholder for I2C write 0x%08x to 0x%02x", dev->name, value, reg_addr);
+	LOG_DBG("Placeholder for I2C write 0x%08x to 0x%02x", value, reg_addr);
 	emul_imager_fake_regs[reg_addr] = value;
 	return 0;
 }
@@ -203,12 +199,8 @@ static int emul_imager_write_multi(const struct device *const dev,
 static int emul_imager_set_ctrl(const struct device *dev, unsigned int cid, void *value)
 {
 	switch (cid) {
-	case VIDEO_CID_EXPOSURE:
-		return emul_imager_write_reg(dev, EMUL_IMAGER_REG_EXPOSURE, (int)value);
-	case VIDEO_CID_GAIN:
-		return emul_imager_write_reg(dev, EMUL_IMAGER_REG_GAIN, (int)value);
-	case VIDEO_CID_TEST_PATTERN:
-		return emul_imager_write_reg(dev, EMUL_IMAGER_REG_PATTERN, (int)value);
+	case EMUL_IMAGER_CID_CUSTOM:
+		return emul_imager_write_reg(dev, EMUL_IMAGER_REG_CUSTOM, (int)value);
 	default:
 		return -ENOTSUP;
 	}
@@ -216,18 +208,9 @@ static int emul_imager_set_ctrl(const struct device *dev, unsigned int cid, void
 
 static int emul_imager_get_ctrl(const struct device *dev, unsigned int cid, void *value)
 {
-	struct emul_imager_data *data = dev->data;
-
 	switch (cid) {
-	case VIDEO_CID_EXPOSURE:
-		return emul_imager_read_int(dev, EMUL_IMAGER_REG_EXPOSURE, value);
-	case VIDEO_CID_GAIN:
-		return emul_imager_read_int(dev, EMUL_IMAGER_REG_GAIN, value);
-	case VIDEO_CID_TEST_PATTERN:
-		return emul_imager_read_int(dev, EMUL_IMAGER_REG_PATTERN, value);
-	case VIDEO_CID_PIXEL_RATE:
-		*(int64_t *)value = (int64_t)data->fmt.width * data->fmt.pitch * data->mode->fps;
-		return 0;
+	case EMUL_IMAGER_CID_CUSTOM:
+		return emul_imager_read_int(dev, EMUL_IMAGER_REG_CUSTOM, value);
 	default:
 		return -ENOTSUP;
 	}
@@ -256,7 +239,7 @@ static int emul_imager_set_mode(const struct device *dev, const struct emul_imag
 	data->mode = mode;
 	return 0;
 err:
-	LOG_ERR("Could not apply %s mode %p (%u FPS)", dev->name, mode, mode->fps);
+	LOG_ERR("Could not apply mode %p (%u FPS)", mode, mode->fps);
 	return ret;
 }
 
@@ -315,48 +298,6 @@ static int emul_imager_enum_frmival(const struct device *dev, enum video_endpoin
 	return mode->fps == 0;
 }
 
-/* White, Yellow, Cyan, Green, Magenta, Red, Blue, Black */
-static const uint16_t pattern_8bars_yuv[8][3] = {
-	{0xFF, 0x7F, 0x7F}, {0xFF, 0x00, 0xFF}, {0xFF, 0xFF, 0x00}, {0x7F, 0x00, 0x00},
-	{0x00, 0xFF, 0xFF}, {0x00, 0x00, 0xFF}, {0x00, 0xFF, 0x00}, {0x00, 0x7F, 0x7F}};
-static const uint16_t pattern_8bars_rgb[8][3] = {
-	{0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0x00}, {0x00, 0xFF, 0xFF}, {0x00, 0xFF, 0x00},
-	{0xFF, 0x00, 0xFF}, {0xFF, 0x00, 0x00}, {0x00, 0x00, 0xFF}, {0x00, 0x00, 0x00}};
-static void emul_imager_fill_framebuffer(const struct device *const dev, struct video_format *fmt)
-{
-	struct emul_imager_data *data = dev->data;
-	uint16_t *fb16 = (uint16_t *)data->framebuffer;
-	uint16_t r, g, b, y, uv;
-
-	/* Fill the first row of the emulated framebuffer */
-	switch (fmt->pixelformat) {
-	case VIDEO_PIX_FMT_YUYV:
-		for (size_t i = 0; i < fmt->width; i++) {
-			y = pattern_8bars_yuv[i * 8 / fmt->width][0];
-			uv = pattern_8bars_yuv[i * 8 / fmt->width][1 + i % 2];
-			fb16[i] = sys_cpu_to_be16(y << 8 | uv << 0);
-		}
-		break;
-	case VIDEO_PIX_FMT_RGB565:
-		for (size_t i = 0; i < fmt->width; i++) {
-			r = pattern_8bars_rgb[i * 8 / fmt->width][0] >> (8 - 5);
-			g = pattern_8bars_rgb[i * 8 / fmt->width][1] >> (8 - 6);
-			b = pattern_8bars_rgb[i * 8 / fmt->width][2] >> (8 - 5);
-			fb16[i] = sys_cpu_to_le16((r << 11) | (g << 6) | (b << 0));
-		}
-		break;
-	default:
-		LOG_WRN("Unsupported pixel format %x, supported: %x, %x", fmt->pixelformat,
-			VIDEO_PIX_FMT_YUYV, VIDEO_PIX_FMT_RGB565);
-		memset(fb16, 0, fmt->pitch);
-	}
-
-	/* Duplicate the first row over the whole frame */
-	for (size_t i = 1; i < fmt->height; i++) {
-		memcpy(data->framebuffer + fmt->pitch * i, data->framebuffer, fmt->pitch);
-	}
-}
-
 static int emul_imager_set_fmt(const struct device *const dev, enum video_endpoint_id ep,
 			       struct video_format *fmt)
 {
@@ -368,21 +309,13 @@ static int emul_imager_set_fmt(const struct device *const dev, enum video_endpoi
 		return -EINVAL;
 	}
 
-	if (fmt->pitch * fmt->height > CONFIG_VIDEO_EMUL_IMAGER_FRAMEBUFFER_SIZE) {
-		LOG_ERR("%s has %u bytes of memory, unable to support %x %ux%u (%u bytes)",
-			dev->name, CONFIG_VIDEO_EMUL_IMAGER_FRAMEBUFFER_SIZE, fmt->pixelformat,
-			fmt->width, fmt->height, fmt->pitch * fmt->height);
-		return -ENOMEM;
-	}
-
 	if (memcmp(&data->fmt, fmt, sizeof(data->fmt)) == 0) {
 		return 0;
 	}
 
 	ret = video_format_caps_index(fmts, fmt, &fmt_id);
 	if (ret < 0) {
-		LOG_ERR("Format %x %ux%u not found for %s", fmt->pixelformat, fmt->width,
-			fmt->height, dev->name);
+		LOG_ERR("Format %x %ux%u not found", fmt->pixelformat, fmt->width, fmt->height);
 		return ret;
 	}
 
@@ -391,8 +324,16 @@ static int emul_imager_set_fmt(const struct device *const dev, enum video_endpoi
 		return ret;
 	}
 
-	/* Change the image pattern on the framebuffer */
-	emul_imager_fill_framebuffer(dev, fmt);
+	/* For the purpose of simulation, fill the image line buffer with 50% gray, this data
+	 * will be collected by the video_emul_rx driver.
+	 */
+	if (fmt->pixelformat == VIDEO_PIX_FMT_RGB565) {
+		for (int i = 0; i < fmt->width; i++) {
+			((uint16_t *)data->framebuffer)[i] = sys_cpu_to_le16(0x7bef);
+		}
+	} else {
+		memset(data->framebuffer, 0x7f, fmt->pitch);
+	}
 
 	data->fmt_id = fmt_id;
 	data->fmt = *fmt;
@@ -453,13 +394,13 @@ int emul_imager_init(const struct device *dev)
 
 	ret = emul_imager_read_reg(dev, EMUL_IMAGER_REG_SENSOR_ID, &sensor_id);
 	if (ret < 0 || sensor_id != EMUL_IMAGER_SENSOR_ID) {
-		LOG_ERR("Failed to get %s correct sensor ID (0x%x", dev->name, sensor_id);
+		LOG_ERR("Failed to get a correct sensor ID 0x%x",  sensor_id);
 		return ret;
 	}
 
 	ret = emul_imager_write_multi(dev, emul_imager_init_regs);
 	if (ret < 0) {
-		LOG_ERR("Could not set %s initial registers", dev->name);
+		LOG_ERR("Could not set initial registers");
 		return ret;
 	}
 
@@ -470,8 +411,8 @@ int emul_imager_init(const struct device *dev)
 
 	ret = emul_imager_set_fmt(dev, VIDEO_EP_OUT, &fmt);
 	if (ret < 0) {
-		LOG_ERR("Failed to set %s to default format %x %ux%u", dev->name, fmt.pixelformat,
-			fmt.width, fmt.height);
+		LOG_ERR("Failed to set to default format %x %ux%u",
+			fmt.pixelformat, fmt.width, fmt.height);
 	}
 
 	return 0;
diff --git a/drivers/video/video_emul_rx.c b/drivers/video/video_emul_rx.c
index 3965416812204..2abb6fef32aa3 100644
--- a/drivers/video/video_emul_rx.c
+++ b/drivers/video/video_emul_rx.c
@@ -156,10 +156,13 @@ static void emul_rx_worker(struct k_work *work)
 
 		LOG_DBG("Inserting %u bytes into buffer %p", vbuf->bytesused, vbuf->buffer);
 
-		/* Simulate the MIPI/DVP hardware transferring image data from the imager to the
-		 * video buffer memory using DMA. The vbuf->size is checked in emul_rx_enqueue().
+		/* Simulate the MIPI/DVP hardware transferring image data line-by-line from the
+		 * imager to the video buffer memory using DMA copying the data line-by-line over
+		 * the whole frame. vbuf->size is already checked in emul_rx_enqueue().
 		 */
-		memcpy(vbuf->buffer, cfg->source_dev->data, vbuf->bytesused);
+		for (size_t i = 0; i + fmt->pitch <= vbuf->bytesused; i += fmt->pitch) {
+			memcpy(vbuf->buffer + i, cfg->source_dev->data, fmt->pitch);
+		}
 
 		/* Once the buffer is completed, submit it to the video buffer */
 		k_fifo_put(&data->fifo_out, vbuf);
diff --git a/drivers/video/video_esp32_dvp.c b/drivers/video/video_esp32_dvp.c
index b13c329f96cba..4c93f24bcd12b 100644
--- a/drivers/video/video_esp32_dvp.c
+++ b/drivers/video/video_esp32_dvp.c
@@ -153,7 +153,7 @@ static int video_esp32_set_stream(const struct device *dev, bool enable)
 		data->is_streaming = false;
 		error = dma_stop(cfg->dma_dev, cfg->rx_dma_channel);
 		if (error) {
-			LOG_ERR("Unable to stop DMA (%d)", ret);
+			LOG_ERR("Unable to stop DMA (%d)", error);
 			return error;
 		}
 
@@ -339,6 +339,36 @@ static int video_esp32_get_ctrl(const struct device *dev, unsigned int cid, void
 	return video_get_ctrl(cfg->source_dev, cid, value);
 }
 
+static int video_esp32_flush(const struct device *dev, enum video_endpoint_id ep, bool cancel)
+{
+	struct video_esp32_data *data = dev->data;
+	struct video_buffer *vbuf = NULL;
+
+	if (cancel) {
+		if (data->is_streaming) {
+			video_esp32_set_stream(dev, false);
+		}
+		if (data->active_vbuf) {
+			k_fifo_put(&data->fifo_out, data->active_vbuf);
+			data->active_vbuf = NULL;
+		}
+		while ((vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT)) != NULL) {
+			k_fifo_put(&data->fifo_out, vbuf);
+#ifdef CONFIG_POLL
+			if (data->signal_out) {
+				k_poll_signal_raise(data->signal_out, VIDEO_BUF_ABORTED);
+			}
+#endif
+		}
+	} else {
+		while (!k_fifo_is_empty(&data->fifo_in)) {
+			k_sleep(K_MSEC(1));
+		}
+	}
+
+	return 0;
+}
+
 #ifdef CONFIG_POLL
 int video_esp32_set_signal(const struct device *dev, enum video_endpoint_id ep,
 			   struct k_poll_signal *sig)
@@ -401,7 +431,7 @@ static DEVICE_API(video, esp32_driver_api) = {
 	/* optional callbacks */
 	.enqueue = video_esp32_enqueue,
 	.dequeue = video_esp32_dequeue,
-	.flush = NULL,
+	.flush = video_esp32_flush,
 	.set_ctrl = video_esp32_set_ctrl,
 	.get_ctrl = video_esp32_get_ctrl,
 #ifdef CONFIG_POLL
diff --git a/drivers/watchdog/CMakeLists.txt b/drivers/watchdog/CMakeLists.txt
index 79c715d4bce5f..2c5140eea9a7b 100644
--- a/drivers/watchdog/CMakeLists.txt
+++ b/drivers/watchdog/CMakeLists.txt
@@ -17,6 +17,7 @@ zephyr_library_sources_ifdef(CONFIG_WDT_CC13XX_CC26XX wdt_cc13xx_cc26xx.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_ESP32 wdt_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_XT_ESP32 xt_wdt_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_GECKO wdt_gecko.c)
+zephyr_library_sources_ifdef(CONFIG_WDT_ITE_IT51XXX wdt_ite_it51xxx.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_ITE_IT8XXX2 wdt_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_LITEX wdt_litex.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_MAX32 wdt_max32.c)
@@ -31,10 +32,12 @@ zephyr_library_sources_ifdef(CONFIG_WDT_NPM2100 wdt_npm2100.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_NPM6001 wdt_npm6001.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_NRFX wdt_nrfx.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_RPI_PICO wdt_rpi_pico.c)
+zephyr_library_sources_ifdef(CONFIG_WDT_RTS5912 wdt_rts5912.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_SAM wdt_sam.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_SAM4L wdt_sam4l.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_SAM0 wdt_sam0.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_SIFIVE wdt_sifive.c)
+zephyr_library_sources_ifdef(CONFIG_WDT_SILABS_SIWX91X wdt_silabs_siwx91x.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_TCO wdt_tco.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_XEC wdt_mchp_xec.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_COUNTER wdt_counter.c)
@@ -54,5 +57,6 @@ zephyr_library_sources_ifdef(CONFIG_WDT_INTEL_ADSP wdt_intel_adsp.c wdt_dw_commo
 zephyr_library_sources_ifdef(CONFIG_WDT_ANDES_ATCWDT200 wdt_andes_atcwdt200.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_NXP_FS26 wdt_nxp_fs26.c)
 zephyr_library_sources_ifdef(CONFIG_WDT_SHELL wdt_shell.c)
+zephyr_library_sources_ifdef(CONFIG_WDT_RENESAS_RA wdt_renesas_ra.c)
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE wdt_handlers.c)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 0bc9652ebc93f..6bb30ff61b449 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -87,6 +87,8 @@ source "drivers/watchdog/Kconfig.xec"
 
 source "drivers/watchdog/Kconfig.gecko"
 
+source "drivers/watchdog/Kconfig.siwx91x"
+
 source "drivers/watchdog/Kconfig.sifive"
 
 source "drivers/watchdog/Kconfig.npcx"
@@ -95,6 +97,8 @@ source "drivers/watchdog/Kconfig.cc32xx"
 
 source "drivers/watchdog/Kconfig.cc13xx_cc26xx"
 
+source "drivers/watchdog/Kconfig.it51xxx"
+
 source "drivers/watchdog/Kconfig.it8xxx2"
 
 source "drivers/watchdog/Kconfig.rpi_pico"
@@ -143,4 +147,8 @@ source "drivers/watchdog/Kconfig.ene"
 
 source "drivers/watchdog/Kconfig.litex"
 
+source "drivers/watchdog/Kconfig.rts5912"
+
+source "drivers/watchdog/Kconfig.renesas_ra"
+
 endif # WATCHDOG
diff --git a/drivers/watchdog/Kconfig.it51xxx b/drivers/watchdog/Kconfig.it51xxx
new file mode 100644
index 0000000000000..2ac7c7307eebb
--- /dev/null
+++ b/drivers/watchdog/Kconfig.it51xxx
@@ -0,0 +1,29 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config WDT_ITE_IT51XXX
+	bool "ITE it51xxx Watchdog Timer (WDT) driver"
+	default y
+	depends on DT_HAS_ITE_IT51XXX_WATCHDOG_ENABLED
+	select HAS_WDT_DISABLE_AT_BOOT
+	help
+	  This option enables the Watchdog Timer driver for ITE it51xxx.
+	  This driver supports only one channel that id is 0 and 16-bits
+	  resolution WDT.
+
+config WDT_ITE_WARNING_LEADING_TIME_MS
+	int "Number of ms before generating watchdog event/signal"
+	depends on WDT_ITE_IT51XXX
+	default 500
+	help
+	  This option defines the window in which a watchdog event must be
+	  handled. After this time window, the watchdog reset triggers
+	  immediately.
+
+config WDT_ITE_REDUCE_WARNING_LEADING_TIME
+	bool "Reduce warning leading time"
+	depends on WDT_ITE_IT51XXX
+	help
+	  Once warning timer triggered, if watchdog timer isn't reloaded,
+	  then we will reduce interval of warning timer to 30ms to print
+	  more warning messages before watchdog reset.
diff --git a/drivers/watchdog/Kconfig.renesas_ra b/drivers/watchdog/Kconfig.renesas_ra
new file mode 100644
index 0000000000000..7c6a49a56daa1
--- /dev/null
+++ b/drivers/watchdog/Kconfig.renesas_ra
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config WDT_RENESAS_RA
+	bool "Watchdog Driver for Renesas RA family"
+	default y
+	depends on DT_HAS_RENESAS_RA_WDT_ENABLED
+	select HAS_WDT_DISABLE_AT_BOOT
+	select SOC_OPTION_SETTING_MEMORY if SOC_SERIES_RA4M1
+	select USE_RA_FSP_WDT
+	help
+	  Enable watchdog driver for Renesas RA MCUs
+
+if WDT_RENESAS_RA
+
+config WDT_RENESAS_RA_NMI
+	bool "NMI interrupt enable"
+	default y
+	select RUNTIME_NMI
+	help
+	  Watchdog timer generates NMI at value 0
+
+config WDT_RENESAS_RA_START_IN_BOOT
+	bool "Start WDT in boot time"
+	default y
+	depends on !HAS_WDT_DISABLE_AT_BOOT
+	help
+	  Start watchdog in boot time
+
+endif # WDT_RENESAS_RA
diff --git a/drivers/watchdog/Kconfig.rts5912 b/drivers/watchdog/Kconfig.rts5912
new file mode 100644
index 0000000000000..223b7c0a693c4
--- /dev/null
+++ b/drivers/watchdog/Kconfig.rts5912
@@ -0,0 +1,11 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+config WDT_RTS5912
+	bool "Realtek RTS5912 Embedded Controller Watchdog Driver"
+	default y
+	depends on DT_HAS_REALTEK_RTS5912_WATCHDOG_ENABLED
+	select HAS_WDT_DISABLE_AT_BOOT
+	help
+	  This option enables the WDT driver for Realtek RTS5912 family of
+	  processors.
diff --git a/drivers/watchdog/Kconfig.siwx91x b/drivers/watchdog/Kconfig.siwx91x
new file mode 100644
index 0000000000000..d2441a3b274d6
--- /dev/null
+++ b/drivers/watchdog/Kconfig.siwx91x
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Silicon Laboratories Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config WDT_SILABS_SIWX91X
+	bool "Silabs SiWx91x Watchdog driver"
+	default y
+	depends on DT_HAS_SILABS_SIWX91X_WDT_ENABLED
+	help
+	  Enable the Watchdog driver for the Silabs SiWx91x SoC series.
diff --git a/drivers/watchdog/wdt_ambiq.c b/drivers/watchdog/wdt_ambiq.c
index e886af3feb33c..8b0e58d892d82 100644
--- a/drivers/watchdog/wdt_ambiq.c
+++ b/drivers/watchdog/wdt_ambiq.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/watchdog.h>
 
 #include <errno.h>
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_ambiq, CONFIG_WDT_LOG_LEVEL);
diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c
index d5f05b0153aae..2e97d429e26f5 100644
--- a/drivers/watchdog/wdt_cmsdk_apb.c
+++ b/drivers/watchdog/wdt_cmsdk_apb.c
@@ -69,6 +69,7 @@ const struct device *wdog_r;
 static unsigned int reload_cycles = CMSDK_APB_WDOG_RELOAD;
 static uint8_t assigned_channels;
 static uint8_t flags;
+static bool enabled;
 
 static void (*user_cb)(const struct device *dev, int channel_id);
 
@@ -88,9 +89,19 @@ static int wdog_cmsdk_apb_setup(const struct device *dev, uint8_t options)
 	ARG_UNUSED(dev);
 	ARG_UNUSED(options);
 
+	/* Check if watchdog is already running */
+	if (enabled) {
+		return -EBUSY;
+	}
+
+	/* Reset pending interrupts before starting */
+	wdog->intclr = CMSDK_APB_WDOG_INTCLR;
+	wdog->load = reload_cycles;
+
 	/* Start the watchdog counter with INTEN bit */
 	wdog->ctrl = (CMSDK_APB_WDOG_CTRL_RESEN | CMSDK_APB_WDOG_CTRL_INTEN);
 
+	enabled = true;
 	return 0;
 }
 
@@ -103,6 +114,7 @@ static int wdog_cmsdk_apb_disable(const struct device *dev)
 	/* Stop the watchdog counter with INTEN bit */
 	wdog->ctrl = ~(CMSDK_APB_WDOG_CTRL_RESEN | CMSDK_APB_WDOG_CTRL_INTEN);
 
+	enabled = false;
 	assigned_channels = 0;
 
 	return 0;
@@ -119,6 +131,9 @@ static int wdog_cmsdk_apb_install_timeout(const struct device *dev,
 	if (config->window.max == 0) {
 		return -EINVAL;
 	}
+	if (enabled == true) {
+		return -EBUSY;
+	}
 	if (assigned_channels == 1) {
 		return -ENOMEM;
 	}
diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c
index 66caa75bdc6e1..acaf7d7ce0c31 100644
--- a/drivers/watchdog/wdt_esp32.c
+++ b/drivers/watchdog/wdt_esp32.c
@@ -1,12 +1,12 @@
 /*
  * Copyright (C) 2017 Intel Corporation
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #define DT_DRV_COMPAT espressif_esp32_watchdog
 
-/* Include esp-idf headers first to avoid redefining BIT() macro */
 #if defined(CONFIG_SOC_SERIES_ESP32C6)
 #include <soc/lp_aon_reg.h>
 #else
@@ -19,22 +19,12 @@
 #include <string.h>
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/drivers/clock_control.h>
-#if defined(CONFIG_SOC_SERIES_ESP32C3) || defined(CONFIG_SOC_SERIES_ESP32C6)
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#else
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#endif
 #include <zephyr/device.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_esp32, CONFIG_WDT_LOG_LEVEL);
 
-#if defined(CONFIG_SOC_SERIES_ESP32C3) || defined(CONFIG_SOC_SERIES_ESP32C6)
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
-
 #define MWDT_TICK_PRESCALER		40000
 #define MWDT_TICKS_PER_US		500
 
@@ -170,7 +160,7 @@ static int wdt_esp32_init(const struct device *dev)
 	wdt_hal_init(&data->hal, config->wdt_inst, MWDT_TICK_PRESCALER, true);
 
 	flags = ESP_PRIO_TO_FLAGS(config->irq_priority) | ESP_INT_FLAGS_CHECK(config->irq_flags);
-	ret = esp_intr_alloc(config->irq_source, flags, (ISR_HANDLER)wdt_esp32_isr, (void *)dev,
+	ret = esp_intr_alloc(config->irq_source, flags, (intr_handler_t)wdt_esp32_isr, (void *)dev,
 			     NULL);
 
 	if (ret != 0) {
diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c
index 581fd7c054a7d..7ec18a9a5747e 100644
--- a/drivers/watchdog/wdt_gecko.c
+++ b/drivers/watchdog/wdt_gecko.c
@@ -98,6 +98,10 @@ static int wdt_gecko_setup(const struct device *dev, uint8_t options)
 		return -EINVAL;
 	}
 
+#if defined(_WDOG_CFG_EM1RUN_MASK)
+	data->wdog_config.em1Run =
+		(options & WDT_OPT_PAUSE_IN_SLEEP) == 0U;
+#endif
 	data->wdog_config.em2Run =
 		(options & WDT_OPT_PAUSE_IN_SLEEP) == 0U;
 	data->wdog_config.em3Run =
diff --git a/drivers/watchdog/wdt_ite_it51xxx.c b/drivers/watchdog/wdt_ite_it51xxx.c
new file mode 100644
index 0000000000000..17ed95a86c162
--- /dev/null
+++ b/drivers/watchdog/wdt_ite_it51xxx.c
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define DT_DRV_COMPAT ite_it51xxx_watchdog
+
+#include <errno.h>
+#include <soc.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/irq.h>
+
+#include <zephyr/logging/log.h>
+#define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
+LOG_MODULE_REGISTER(wdt_ite_it51xxx);
+
+#define IT51XXX_WATCHDOG_MAGIC_BYTE                 0x5c
+#define WARNING_TIMER_PERIOD_MS_TO_1024HZ_COUNT(ms) ((ms) * 1024 / 1000)
+
+/* 0x81: External Timer1/WDT Configuration */
+#define REG_ETWCFG          0x01
+#define WDT_EWDKEYEN        BIT(5)
+#define WDT_EWDSRC          BIT(4)
+#define WDT_LEWDCNTL        BIT(3)
+#define WDT_LET1CNTL        BIT(2)
+#define WDT_LET1PS          BIT(1)
+#define WDT_LETWCFG         BIT(0)
+/* 0x82: External Timer1 Prescaler */
+#define REG_ET1PSR          0x02
+#define WDT_ETPS_32P768_KHZ 0x00
+#define WDT_ETPS_1P024_KHZ  0x01
+#define WDT_ETPS_32_HZ      0x02
+/* 0x83: External Timer1 Counter High Byte */
+#define REG_ET1CNTLHR       0x03
+/* 0x84: External Timer1 Counter Low Byte */
+#define REG_ET1CNTLLR       0x04
+/* 0x85: External Timer1/WDT Control */
+#define REG_ETWCTRL         0x05
+#define WDT_EWDSCEN         BIT(5)
+#define WDT_EWDSCMS         BIT(4)
+#define WDT_ET1TC           BIT(1)
+#define WDT_ET1RST          BIT(0)
+/* 0x86: External WDT Counter Low Byte */
+#define REG_EWDCNTLR        0x06
+/* 0x87: External WDT Key */
+#define REG_EWDKEYR         0x07
+/* 0x89: External WDT Counter High Byte */
+#define REG_EWDCNTHR        0x09
+
+/* device config */
+struct wdt_it51xxx_config {
+	/* wdt register base address */
+	uintptr_t base;
+};
+
+/* driver data */
+struct wdt_it51xxx_data {
+	/* timeout callback used to handle watchdog event */
+	wdt_callback_t callback;
+	/* indicate whether a watchdog timeout is installed */
+	bool timeout_installed;
+	/* watchdog feed timeout in milliseconds */
+	uint32_t timeout;
+	/* pre-warning timer1 fired times */
+	int wdt_warning_fired;
+};
+
+static int wdt_it51xxx_install_timeout(const struct device *dev,
+				       const struct wdt_timeout_cfg *config)
+{
+	const struct wdt_it51xxx_config *const wdt_config = dev->config;
+	struct wdt_it51xxx_data *data = dev->data;
+	const uintptr_t base = wdt_config->base;
+
+	/* if watchdog is already running */
+	if (sys_read8(base + REG_ETWCFG) & WDT_LEWDCNTL) {
+		return -EBUSY;
+	}
+
+	/*
+	 * Not support lower limit window timeouts (min value must be equal to
+	 * 0). Upper limit window timeouts can't be 0 when we install timeout.
+	 */
+	if ((config->window.min != 0) || (config->window.max == 0)) {
+		data->timeout_installed = false;
+		return -EINVAL;
+	}
+
+	/* save watchdog timeout */
+	data->timeout = config->window.max;
+
+	/* install user timeout isr */
+	data->callback = config->callback;
+
+	/* mark installed */
+	data->timeout_installed = true;
+
+	return 0;
+}
+
+static int wdt_it51xxx_setup(const struct device *dev, uint8_t options)
+{
+	const struct wdt_it51xxx_config *const wdt_config = dev->config;
+	struct wdt_it51xxx_data *data = dev->data;
+	const uintptr_t base = wdt_config->base;
+	uint16_t cnt0 = WARNING_TIMER_PERIOD_MS_TO_1024HZ_COUNT(data->timeout);
+	uint16_t cnt1 = WARNING_TIMER_PERIOD_MS_TO_1024HZ_COUNT(
+		(data->timeout + CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS));
+	uint8_t reg_val;
+
+	/* disable pre-warning timer1 interrupt */
+	irq_disable(DT_INST_IRQN(0));
+
+	if (!data->timeout_installed) {
+		LOG_ERR("No valid WDT timeout installed");
+		return -EINVAL;
+	}
+
+	if (sys_read8(base + REG_ETWCFG) & WDT_LEWDCNTL) {
+		LOG_ERR("WDT is already running");
+		return -EBUSY;
+	}
+
+	if ((options & WDT_OPT_PAUSE_IN_SLEEP) != 0) {
+		LOG_ERR("WDT_OPT_PAUSE_IN_SLEEP is not supported");
+		return -ENOTSUP;
+	}
+
+	/* pre-warning timer1 is 16-bit counter down timer */
+	sys_write8((cnt0 >> 8) & 0xff, base + REG_ET1CNTLHR);
+	sys_write8(cnt0 & 0xff, base + REG_ET1CNTLLR);
+
+	/* clear pre-warning timer1 interrupt status */
+	ite_intc_isr_clear(DT_INST_IRQN(0));
+
+	/* enable pre-warning timer1 interrupt */
+	irq_enable(DT_INST_IRQN(0));
+
+	/* don't stop watchdog timer counting */
+	reg_val = sys_read8(base + REG_ETWCTRL);
+	sys_write8(reg_val & ~WDT_EWDSCEN, base + REG_ETWCTRL);
+
+	/* set watchdog timer count */
+	sys_write8((cnt1 >> 8) & 0xff, base + REG_EWDCNTHR);
+	sys_write8(cnt1 & 0xff, base + REG_EWDCNTLR);
+
+	/* allow to write timer1 count register */
+	reg_val = sys_read8(base + REG_ETWCFG);
+	sys_write8(reg_val & ~WDT_LET1CNTL, base + REG_ETWCFG);
+
+	/*
+	 * bit5 = 1: enable key match function to touch watchdog
+	 * bit4 = 1: select watchdog clock source from prescaler
+	 * bit3 = 1: lock watchdog count register (also mark as watchdog running)
+	 * bit1 = 1: lock timer1 prescaler register
+	 */
+	sys_write8((WDT_EWDKEYEN | WDT_EWDSRC | WDT_LEWDCNTL | WDT_LET1PS), base + REG_ETWCFG);
+
+	LOG_DBG("WDT Setup and enabled");
+
+	return 0;
+}
+
+/*
+ * reload the WDT and pre-warning timer1 counter
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param channel_id Index of the fed channel, and we only support
+ *                   channel_id = 0 now.
+ */
+static int wdt_it51xxx_feed(const struct device *dev, int channel_id)
+{
+	const struct wdt_it51xxx_config *const wdt_config = dev->config;
+	struct wdt_it51xxx_data *data = dev->data;
+	const uintptr_t base = wdt_config->base;
+	uint16_t cnt0 = WARNING_TIMER_PERIOD_MS_TO_1024HZ_COUNT(data->timeout);
+	uint8_t reg_val;
+
+	ARG_UNUSED(channel_id);
+
+	/* reset pre-warning timer1 */
+	reg_val = sys_read8(base + REG_ETWCTRL);
+	sys_write8(reg_val | WDT_ET1RST, base + REG_ETWCTRL);
+
+	/* restart watchdog timer */
+	sys_write8(IT51XXX_WATCHDOG_MAGIC_BYTE, base + REG_EWDKEYR);
+
+	/* reset pre-warning timer1 to default if time is touched */
+	if (data->wdt_warning_fired) {
+		data->wdt_warning_fired = 0;
+
+		/* pre-warning timer1 is 16-bit counter down timer */
+		sys_write8((cnt0 >> 8) & 0xff, base + REG_ET1CNTLHR);
+		sys_write8(cnt0 & 0xff, base + REG_ET1CNTLLR);
+
+		/* clear timer1 interrupt status */
+		ite_intc_isr_clear(DT_INST_IRQN(0));
+
+		/* enable timer1 interrupt */
+		irq_enable(DT_INST_IRQN(0));
+	}
+
+	LOG_DBG("WDT Kicking");
+
+	return 0;
+}
+
+static int wdt_it51xxx_disable(const struct device *dev)
+{
+	const struct wdt_it51xxx_config *const wdt_config = dev->config;
+	struct wdt_it51xxx_data *data = dev->data;
+	const uintptr_t base = wdt_config->base;
+	uint8_t reg_val;
+
+	/* stop watchdog timer counting */
+	reg_val = sys_read8(base + REG_ETWCTRL);
+	sys_write8(reg_val | WDT_EWDSCEN, base + REG_ETWCTRL);
+
+	/* unlock watchdog count register (also mark as watchdog not running) */
+	reg_val = sys_read8(base + REG_ETWCFG);
+	sys_write8(reg_val & ~WDT_LEWDCNTL, base + REG_ETWCFG);
+
+	/* disable pre-warning timer1 interrupt */
+	irq_disable(DT_INST_IRQN(0));
+
+	/* mark uninstalled */
+	data->timeout_installed = false;
+
+	LOG_DBG("WDT Disabled");
+
+	return 0;
+}
+
+static void wdt_it51xxx_isr(const struct device *dev)
+{
+	const struct wdt_it51xxx_config *const wdt_config = dev->config;
+	struct wdt_it51xxx_data *data = dev->data;
+	const uintptr_t base = wdt_config->base;
+	uint8_t reg_val;
+
+	/* clear pre-warning timer1 interrupt status */
+	ite_intc_isr_clear(DT_INST_IRQN(0));
+
+	/* reset pre-warning timer1 */
+	reg_val = sys_read8(base + REG_ETWCTRL);
+	sys_write8(reg_val | WDT_ET1RST, base + REG_ETWCTRL);
+
+	/* callback function, ex. print warning message */
+	if (data->callback) {
+		data->callback(dev, 0);
+	}
+
+	if (IS_ENABLED(CONFIG_WDT_ITE_REDUCE_WARNING_LEADING_TIME)) {
+		/*
+		 * Once warning timer triggered: if watchdog timer isn't reloaded,
+		 * then we will reduce interval of warning timer to 30ms to print
+		 * more warning messages before watchdog reset.
+		 */
+		if (!(data->wdt_warning_fired)) {
+			uint16_t cnt0 = WARNING_TIMER_PERIOD_MS_TO_1024HZ_COUNT(30);
+
+			/* pre-warning timer1 is 16-bit counter down timer */
+			sys_write8((cnt0 >> 8) & 0xff, base + REG_ET1CNTLHR);
+			sys_write8(cnt0 & 0xff, base + REG_ET1CNTLLR);
+
+			/* clear pre-warning timer1 interrupt status */
+			ite_intc_isr_clear(DT_INST_IRQN(0));
+		}
+	}
+	data->wdt_warning_fired++;
+
+	LOG_DBG("WDT ISR");
+}
+
+static DEVICE_API(wdt, wdt_it51xxx_api) = {
+	.setup = wdt_it51xxx_setup,
+	.disable = wdt_it51xxx_disable,
+	.install_timeout = wdt_it51xxx_install_timeout,
+	.feed = wdt_it51xxx_feed,
+};
+
+static int wdt_it51xxx_init(const struct device *dev)
+{
+	const struct wdt_it51xxx_config *const wdt_config = dev->config;
+	const uintptr_t base = wdt_config->base;
+	uint8_t reg_val;
+
+	if (IS_ENABLED(CONFIG_WDT_DISABLE_AT_BOOT)) {
+		wdt_it51xxx_disable(dev);
+	}
+
+	/* unlock access to watchdog registers */
+	sys_write8(0x00, base + REG_ETWCFG);
+
+	/* set WDT and timer1 to use 1.024kHz clock */
+	sys_write8(WDT_ETPS_1P024_KHZ, base + REG_ET1PSR);
+
+	/* set WDT key match enabled and WDT clock to use ET1PSR */
+	sys_write8(WDT_EWDKEYEN | WDT_EWDSRC, base + REG_ETWCFG);
+
+	/*
+	 * select the mode that watchdog can be stopped, this is needed for
+	 * wdt_it51xxx_disable() api and WDT_OPT_PAUSE_HALTED_BY_DBG flag
+	 */
+	reg_val = sys_read8(base + REG_ETWCTRL);
+	sys_write8(reg_val | WDT_EWDSCMS, base + REG_ETWCTRL);
+
+	IRQ_CONNECT(DT_INST_IRQN(0), 0, wdt_it51xxx_isr, DEVICE_DT_INST_GET(0), 0);
+	return 0;
+}
+
+static const struct wdt_it51xxx_config wdt_it51xxx_cfg_0 = {
+	.base = DT_INST_REG_ADDR(0),
+};
+
+static struct wdt_it51xxx_data wdt_it51xxx_dev_data;
+
+DEVICE_DT_INST_DEFINE(0, wdt_it51xxx_init, NULL, &wdt_it51xxx_dev_data, &wdt_it51xxx_cfg_0,
+		      PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &wdt_it51xxx_api);
+
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
+	     "only one ite,it51xxx-watchdog compatible node can be supported");
diff --git a/drivers/watchdog/wdt_iwdg_stm32.c b/drivers/watchdog/wdt_iwdg_stm32.c
index f472d03eb481f..682963b10701b 100644
--- a/drivers/watchdog/wdt_iwdg_stm32.c
+++ b/drivers/watchdog/wdt_iwdg_stm32.c
@@ -10,10 +10,12 @@
 #define DT_DRV_COMPAT st_stm32_watchdog
 
 #include <zephyr/drivers/watchdog.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys_clock.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
+#include <stm32_ll_rcc.h>
 #include <stm32_ll_iwdg.h>
 #include <stm32_ll_system.h>
 #include <errno.h>
@@ -90,14 +92,16 @@ static int iwdg_stm32_setup(const struct device *dev, uint8_t options)
 
 	/* Deactivate running when debugger is attached. */
 	if (options & WDT_OPT_PAUSE_HALTED_BY_DBG) {
-#if defined(CONFIG_SOC_SERIES_STM32F0X)
+#if defined(CONFIG_SOC_SERIES_STM32WB0X)
+		/* STM32WB0 watchdog does not support halt by debugger */
+		return -ENOTSUP;
+#elif defined(CONFIG_SOC_SERIES_STM32F0X)
 		LL_APB1_GRP2_EnableClock(LL_APB1_GRP2_PERIPH_DBGMCU);
 #elif defined(CONFIG_SOC_SERIES_STM32C0X) || defined(CONFIG_SOC_SERIES_STM32G0X)
 		LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_DBGMCU);
 #elif defined(CONFIG_SOC_SERIES_STM32L0X)
 		LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_DBGMCU);
-#endif
-#if defined(CONFIG_SOC_SERIES_STM32H7X)
+#elif defined(CONFIG_SOC_SERIES_STM32H7X)
 		LL_DBGMCU_APB4_GRP1_FreezePeriph(LL_DBGMCU_APB4_GRP1_IWDG1_STOP);
 #elif defined(CONFIG_SOC_SERIES_STM32H7RSX)
 		LL_DBGMCU_APB4_GRP1_FreezePeriph(LL_DBGMCU_APB4_GRP1_IWDG_STOP);
@@ -192,6 +196,43 @@ static DEVICE_API(wdt, iwdg_stm32_api) = {
 
 static int iwdg_stm32_init(const struct device *dev)
 {
+/* Enable watchdog clock if needed */
+#if DT_INST_NODE_HAS_PROP(0, clocks)
+	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
+	const struct stm32_pclken clk_cfg = STM32_CLOCK_INFO(0, DT_DRV_INST(0));
+	int err = clock_control_on(clk, (clock_control_subsys_t)&clk_cfg);
+
+	if (err < 0) {
+		return err;
+	}
+#if defined(CONFIG_SOC_SERIES_STM32WB0X)
+	/**
+	 * On STM32WB0, application must wait two slow clock cycles
+	 * before accessing the IWDG IP after turning on the WDGEN
+	 * bit in RCC registers. However, there is no register that
+	 * can be polled for this event.
+	 * To work around this limitation, force the IWDG to go
+	 * through a reset cycle, which also takes two slow clock
+	 * cycles, but can polled on (bit WDGRSTF of RCC_CIFR).
+	 */
+
+	/* Clear bit beforehand to avoid early exit of polling loop */
+	LL_RCC_ClearFlag_WDGRSTREL();
+
+	/* Place IWDG under reset, then release the reset */
+	LL_APB0_GRP1_ForceReset(LL_APB0_GRP1_PERIPH_WDG);
+	LL_APB0_GRP1_ReleaseReset(LL_APB0_GRP1_PERIPH_WDG);
+	while (!LL_RCC_IsActiveFlag_WDGRSTREL()) {
+		/* Wait for IWDG reset release event,
+		 * which takes two slow clock cycles
+		 */
+	}
+
+	/* Clear WDRSTF bit after polling completes */
+	LL_RCC_ClearFlag_WDGRSTREL();
+#endif /* defined(CONFIG_SOC_SERIES_STM32WB0X) */
+#endif /* DT_INST_NODE_HAS_PROP(0, clocks) */
+
 #ifndef CONFIG_WDT_DISABLE_AT_BOOT
 	struct wdt_timeout_cfg config = {
 		.window.max = CONFIG_IWDG_STM32_INITIAL_TIMEOUT
diff --git a/drivers/watchdog/wdt_mcux_wwdt.c b/drivers/watchdog/wdt_mcux_wwdt.c
index 015f331e978ef..81ab8a5b00128 100644
--- a/drivers/watchdog/wdt_mcux_wwdt.c
+++ b/drivers/watchdog/wdt_mcux_wwdt.c
@@ -83,7 +83,8 @@ static int mcux_wwdt_install_timeout(const struct device *dev,
 	}
 
 #if defined(CONFIG_SOC_MIMXRT685S_CM33) || defined(CONFIG_SOC_MIMXRT595S_CM33) \
-	|| defined(CONFIG_SOC_SERIES_MCXN)
+	|| defined(CONFIG_SOC_SERIES_MCXN) || defined(CONFIG_SOC_MIMXRT798S_CM33_CPU0) \
+	|| defined(CONFIG_SOC_MIMXRT798S_CM33_CPU1)
 	clock_freq = CLOCK_GetWdtClkFreq(0);
 #elif defined(CONFIG_SOC_SERIES_RW6XX)
 	clock_freq = CLOCK_GetWdtClkFreq();
diff --git a/drivers/watchdog/wdt_npcx.c b/drivers/watchdog/wdt_npcx.c
index 24979ce88defb..c3245a50b7898 100644
--- a/drivers/watchdog/wdt_npcx.c
+++ b/drivers/watchdog/wdt_npcx.c
@@ -61,7 +61,8 @@ LOG_MODULE_REGISTER(wdt_npcx, CONFIG_WDT_LOG_LEVEL);
 #define NPCX_WDT_MIN_WND_TIME 100UL
 
 /* Timeout for reloading and restarting Timer 0. (Unit:ms) */
-#define NPCX_T0CSR_RST_TIMEOUT 2
+#define NPCX_T0CSR_RST_CLEAR_TIMEOUT 2
+#define NPCX_T0CSR_RST_SET_TIMEOUT   1
 
 /* Timeout for stopping watchdog. (Unit:ms) */
 #define NPCX_WATCHDOG_STOP_TIMEOUT 1
@@ -100,10 +101,22 @@ static inline int wdt_t0out_reload(const struct device *dev)
 	/* Reload and restart T0 timer */
 	inst->T0CSR = (inst->T0CSR & ~BIT(NPCX_T0CSR_WDRST_STS)) |
 		      BIT(NPCX_T0CSR_RST);
+	/*
+	 * Wait for the T0CSR_RST bit to change from 0 to 1. This transition is expected to occur
+	 * over multiple LFCLK cycles. If a timeout occurs, we can assume that the bit has changed
+	 * from 0 -> 1 -> 0, but the polling thread missed it because it was preempted by
+	 * higher-priority threads. In this case, we can simply return.
+	 */
+	st = k_uptime_get();
+	while (!IS_BIT_SET(inst->T0CSR, NPCX_T0CSR_RST)) {
+		if (k_uptime_get() - st > NPCX_T0CSR_RST_SET_TIMEOUT) {
+			return 0;
+		}
+	}
 	/* Wait for timer is loaded and restart */
 	st = k_uptime_get();
 	while (IS_BIT_SET(inst->T0CSR, NPCX_T0CSR_RST)) {
-		if (k_uptime_get() - st > NPCX_T0CSR_RST_TIMEOUT) {
+		if (k_uptime_get() - st > NPCX_T0CSR_RST_CLEAR_TIMEOUT) {
 			/* RST bit is still set? */
 			if (IS_BIT_SET(inst->T0CSR, NPCX_T0CSR_RST)) {
 				LOG_ERR("Timeout: reload T0 timer!");
diff --git a/drivers/watchdog/wdt_renesas_ra.c b/drivers/watchdog/wdt_renesas_ra.c
new file mode 100644
index 0000000000000..78790b9ccc0d7
--- /dev/null
+++ b/drivers/watchdog/wdt_renesas_ra.c
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/clock_control/renesas_ra_cgc.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/watchdog.h>
+#include "r_wdt.h"
+
+LOG_MODULE_REGISTER(wdt_renesas_ra, CONFIG_WDT_LOG_LEVEL);
+
+struct wdt_renesas_ra_config {
+	const struct device *clock_dev;
+	const struct clock_control_ra_subsys_cfg clock_subsys;
+};
+
+struct wdt_renesas_ra_data {
+	struct wdt_timeout_cfg timeout;
+	struct st_wdt_instance_ctrl wdt_ctrl;
+	struct st_wdt_cfg wdt_cfg;
+	struct k_mutex inst_lock;
+	atomic_t device_state;
+};
+
+#define WDT_RENESAS_RA_ATOMIC_ENABLE      (0)
+#define WDT_RENESAS_RA_ATOMIC_TIMEOUT_SET (1)
+
+/* Lookup table for WDT period raw cycle */
+const float timeout_period_lut[] = {
+	[WDT_TIMEOUT_128] = 128,    [WDT_TIMEOUT_512] = 512,   [WDT_TIMEOUT_1024] = 1024,
+	[WDT_TIMEOUT_2048] = 2048,  [WDT_TIMEOUT_4096] = 4096, [WDT_TIMEOUT_8192] = 8192,
+	[WDT_TIMEOUT_16384] = 16384};
+
+/* Lookup table for the division value of the input clock count */
+const float clock_div_lut[] = {[WDT_CLOCK_DIVISION_1] = 1,       [WDT_CLOCK_DIVISION_4] = 4,
+			       [WDT_CLOCK_DIVISION_16] = 16,     [WDT_CLOCK_DIVISION_32] = 32,
+			       [WDT_CLOCK_DIVISION_64] = 64,     [WDT_CLOCK_DIVISION_128] = 128,
+			       [WDT_CLOCK_DIVISION_256] = 256,   [WDT_CLOCK_DIVISION_512] = 512,
+			       [WDT_CLOCK_DIVISION_2048] = 2048, [WDT_CLOCK_DIVISION_8192] = 8192};
+
+#define WDT_WINDOW_INVALID (-1)
+
+/* Lookup table for the window start position setting */
+const int window_start_lut[] = {
+	[0] = WDT_WINDOW_START_100, [1] = WDT_WINDOW_START_75, [2] = WDT_WINDOW_START_50,
+	[3] = WDT_WINDOW_START_25,  [4] = WDT_WINDOW_INVALID,
+};
+
+/* Lookup table for the window end position setting */
+const int window_end_lut[] = {
+	[0] = WDT_WINDOW_INVALID, [1] = WDT_WINDOW_END_75, [2] = WDT_WINDOW_END_50,
+	[3] = WDT_WINDOW_END_25,  [4] = WDT_WINDOW_END_0,
+};
+
+static inline void wdt_renesas_ra_inst_lock(const struct device *dev)
+{
+	struct wdt_renesas_ra_data *data = dev->data;
+
+	k_mutex_lock(&data->inst_lock, K_FOREVER);
+}
+
+static inline void wdt_renesas_ra_inst_unlock(const struct device *dev)
+{
+	struct wdt_renesas_ra_data *data = dev->data;
+
+	k_mutex_unlock(&data->inst_lock);
+}
+
+static int wdt_renesas_ra_timeout_calculate(const struct device *dev,
+					    const struct wdt_timeout_cfg *config)
+{
+	struct wdt_renesas_ra_data *data = dev->data;
+	const struct wdt_renesas_ra_config *cfg = dev->config;
+	struct st_wdt_cfg *p_cfg = &data->wdt_cfg;
+	unsigned int window_start_idx;
+	unsigned int window_end_idx;
+	unsigned int best_divisor = WDT_CLOCK_DIVISION_1;
+	unsigned int best_timeout = WDT_TIMEOUT_128;
+	unsigned int best_period_ms = UINT_MAX;
+	unsigned int min_delta = UINT_MAX;
+	uint32_t clock_rate;
+	int ret;
+
+	if (atomic_test_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_TIMEOUT_SET)) {
+		if (config->window.min != data->timeout.window.min ||
+		    config->window.max != data->timeout.window.max ||
+		    config->flags != data->timeout.flags) {
+			LOG_ERR("wdt support only one timeout setting value");
+			return -EINVAL;
+		}
+
+		data->timeout.callback = config->callback;
+		return 0;
+	}
+
+	ret = clock_control_get_rate(cfg->clock_dev, (clock_control_subsys_t)&cfg->clock_subsys,
+				     &clock_rate);
+	if (unlikely(ret)) {
+		return ret;
+	}
+
+	for (unsigned int divisor = WDT_CLOCK_DIVISION_1; divisor < ARRAY_SIZE(clock_div_lut);
+	     divisor++) {
+		for (unsigned int timeout = WDT_TIMEOUT_128;
+		     timeout < ARRAY_SIZE(timeout_period_lut); timeout++) {
+			unsigned int period_ms =
+				(unsigned int)(1000.0F * clock_div_lut[divisor] *
+					       timeout_period_lut[timeout] / (float)clock_rate);
+			unsigned int delta = period_ms > config->window.max
+						     ? period_ms - config->window.max
+						     : config->window.max - period_ms;
+
+			if (delta < min_delta) {
+				min_delta = delta;
+				best_divisor = divisor;
+				best_timeout = timeout;
+				best_period_ms = period_ms;
+			}
+		}
+	}
+
+	if (min_delta == UINT_MAX) {
+		LOG_ERR("wdt timeout out of range");
+		return -EINVAL;
+	}
+
+	window_start_idx = (config->window.min * 4 + best_period_ms - 1) / best_period_ms;
+	window_end_idx = (config->window.max * 4 + best_period_ms - 1) / best_period_ms;
+
+	if (window_start_lut[window_start_idx] == WDT_WINDOW_INVALID ||
+	    window_end_lut[window_end_idx] == WDT_WINDOW_INVALID) {
+		LOG_ERR("this wdt timeout is not supported");
+		return -ENOTSUP;
+	}
+
+	p_cfg->clock_division = (wdt_clock_division_t)best_divisor;
+	p_cfg->timeout = (wdt_timeout_t)best_timeout;
+	p_cfg->window_start = (wdt_window_start_t)window_start_lut[window_start_idx];
+	p_cfg->window_end = (wdt_window_end_t)window_end_lut[window_end_idx];
+
+	LOG_INF("actual window min = %.2f ms", window_start_idx * best_period_ms * 0.25);
+	LOG_INF("actual window max = %.2f ms", window_end_idx * best_period_ms * 0.25);
+
+	memcpy(&data->timeout, config, sizeof(struct wdt_timeout_cfg));
+
+	return 0;
+}
+
+static int wdt_renesas_ra_setup(const struct device *dev, uint8_t options)
+{
+	struct wdt_renesas_ra_data *data = dev->data;
+	int ret = 0;
+
+	/*
+	 * TODO: WDT must be restarted with wdt_feed call after sleep -> will be added later when PM
+	 * mode is supported
+	 */
+	if ((options & WDT_OPT_PAUSE_IN_SLEEP) != 0) {
+		LOG_ERR("wdt pause in sleep mode not supported");
+		return -ENOTSUP;
+	}
+
+	wdt_renesas_ra_inst_lock(dev);
+
+	if (atomic_test_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_ENABLE)) {
+		LOG_ERR("wdt has been already setup");
+		ret = -EBUSY;
+		goto end;
+	}
+
+	if (!atomic_test_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_TIMEOUT_SET)) {
+		LOG_ERR("wdt timeout should be installed before");
+		ret = -EFAULT;
+		goto end;
+	}
+
+	/* Pause watchdog timer when CPU is halted by the debugger. */
+	R_DEBUG->DBGSTOPCR_b.DBGSTOP_WDT = (options & WDT_OPT_PAUSE_HALTED_BY_DBG) != 0 ? 1 : 0;
+
+	if (R_WDT_Open(&data->wdt_ctrl, &data->wdt_cfg) != FSP_SUCCESS) {
+		LOG_ERR("wdt setup failed");
+		ret = -EIO;
+		goto end;
+	}
+
+	if (R_WDT_Refresh(&data->wdt_ctrl) != FSP_SUCCESS) {
+		LOG_ERR("wdt start failed");
+		ret = -EIO;
+		goto end;
+	}
+
+	atomic_set_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_ENABLE);
+
+end:
+	wdt_renesas_ra_inst_unlock(dev);
+
+	return ret;
+}
+
+static int wdt_renesas_ra_disable(const struct device *dev)
+{
+	struct wdt_renesas_ra_data *data = dev->data;
+
+	if (!atomic_test_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_ENABLE)) {
+		LOG_ERR("wdt has not been enabled yet");
+		return -EFAULT;
+	}
+
+	LOG_ERR("wdt can not be stopped once it has started");
+	return -EPERM;
+}
+
+#ifdef CONFIG_WDT_RENESAS_RA_NMI
+void wdt_renesas_ra_callback_adapter(wdt_callback_args_t *p_args)
+{
+	const struct device *dev = p_args->p_context;
+	struct wdt_renesas_ra_data *data = dev->data;
+	wdt_callback_t callback = data->timeout.callback;
+
+	if (callback != NULL) {
+		callback(dev, 0);
+	}
+}
+#endif /* CONFIG_WDT_RENESAS_RA_NMI */
+
+#define WDT_RENESAS_RA_SUPPORTED_FLAGS (WDT_FLAG_RESET_NONE | WDT_FLAG_RESET_SOC)
+
+static int wdt_renesas_ra_install_timeout(const struct device *dev,
+					  const struct wdt_timeout_cfg *config)
+{
+	struct wdt_renesas_ra_data *data = dev->data;
+	struct st_wdt_cfg *p_config = &data->wdt_cfg;
+	int ret = 0;
+
+	if (config->window.min > config->window.max || config->window.max == 0) {
+		return -EINVAL;
+	}
+
+	if ((config->flags & ~WDT_RENESAS_RA_SUPPORTED_FLAGS) != 0) {
+		return -ENOTSUP;
+	}
+
+	if (config->callback == NULL && (config->flags & WDT_FLAG_RESET_MASK) == 0) {
+		LOG_ERR("no timeout response was chosen");
+		return -EINVAL;
+	}
+
+	if (config->callback != NULL && (config->flags & WDT_FLAG_RESET_MASK) != 0) {
+		LOG_ERR("WDT_FLAG_RESET_NONE should be chosen in case of interrupt response");
+		return -ENOTSUP;
+	}
+
+	wdt_renesas_ra_inst_lock(dev);
+
+	if (atomic_test_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_ENABLE)) {
+		LOG_ERR("cannot change timeout settings after wdt setup");
+		ret = -EBUSY;
+		goto end;
+	}
+
+#ifndef CONFIG_WDT_RENESAS_RA_NMI
+	if (config->callback != NULL) {
+		LOG_ERR("interrupt response only available in case CONFIG_WDT_RENESAS_RA_NMI=y");
+		ret = -ENOTSUP;
+		goto end;
+	}
+#else
+	p_config->reset_control = (config->flags & WDT_FLAG_RESET_MASK) != 0
+					  ? WDT_RESET_CONTROL_RESET
+					  : WDT_RESET_CONTROL_NMI;
+#endif
+
+	ret = wdt_renesas_ra_timeout_calculate(dev, config);
+	if (ret < 0) {
+		goto end;
+	}
+
+	atomic_set_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_TIMEOUT_SET);
+	LOG_INF("wdt timeout was set successfully");
+
+end:
+	wdt_renesas_ra_inst_unlock(dev);
+
+	return ret;
+}
+
+static int wdt_renesas_ra_feed(const struct device *dev, int channel_id)
+{
+	struct wdt_renesas_ra_data *data = dev->data;
+
+	if (!atomic_test_bit(&data->device_state, WDT_RENESAS_RA_ATOMIC_ENABLE) ||
+	    channel_id != 0) {
+		return -EINVAL;
+	}
+
+	if (R_WDT_Refresh(&data->wdt_ctrl) != FSP_SUCCESS) {
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static DEVICE_API(wdt, wdt_renesas_ra_api) = {
+	.setup = wdt_renesas_ra_setup,
+	.disable = wdt_renesas_ra_disable,
+	.install_timeout = wdt_renesas_ra_install_timeout,
+	.feed = wdt_renesas_ra_feed,
+};
+
+#define WDT_RENESAS_RA_DEFINE(id)                                                                  \
+	static struct wdt_renesas_ra_config wdt_renesas_ra_cfg##id = {                             \
+		.clock_dev = DEVICE_DT_GET(DT_CLOCKS_CTLR(id)),                                    \
+		.clock_subsys = {.mstp = DT_CLOCKS_CELL(id, mstp),                                 \
+				 .stop_bit = DT_CLOCKS_CELL(id, stop_bit)},                        \
+	};                                                                                         \
+                                                                                                   \
+	static struct wdt_renesas_ra_data wdt_renesas_ra_data##id = {                              \
+		.device_state = ATOMIC_INIT(0),                                                    \
+		.wdt_cfg = {.stop_control = WDT_STOP_CONTROL_DISABLE,                              \
+			    .reset_control = WDT_RESET_CONTROL_RESET,                              \
+			    .p_callback = wdt_renesas_ra_callback_adapter,                         \
+			    .p_context = DEVICE_DT_GET(id)},                                       \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_DEFINE(id, NULL, NULL, &wdt_renesas_ra_data##id, &wdt_renesas_ra_cfg##id,        \
+			 POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_renesas_ra_api);
+
+DT_FOREACH_STATUS_OKAY(renesas_ra_wdt, WDT_RENESAS_RA_DEFINE)
diff --git a/drivers/watchdog/wdt_rts5912.c b/drivers/watchdog/wdt_rts5912.c
new file mode 100644
index 0000000000000..c030a95b04926
--- /dev/null
+++ b/drivers/watchdog/wdt_rts5912.c
@@ -0,0 +1,247 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Realtek Semiconductor Corporation, SIBG-SD7, Dylan Hsieh
+ */
+
+#define DT_DRV_COMPAT realtek_rts5912_watchdog
+
+#include <soc.h>
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_control_rts5912.h>
+#include <zephyr/irq.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(wdt_rts5912, CONFIG_WDT_LOG_LEVEL);
+
+#include "reg/reg_wdt.h"
+
+#define WDT_MAX_CNT   256
+#define WDT_CLK_CYCLE 32768UL
+
+BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1, "multiple instances not supported");
+
+struct wdt_rts5912_config {
+	uint32_t base;
+	uint32_t div;
+	const struct device *clk_dev;
+	uint32_t clk_grp;
+	uint32_t clk_idx;
+};
+
+struct wdt_rts5912_data {
+	wdt_callback_t callback;
+	bool timeout_installed;
+	uint32_t timeout;
+};
+
+static void wdt_rts5912_isr(const struct device *dev)
+{
+	const struct wdt_rts5912_config *const cfg = dev->config;
+	struct wdt_rts5912_data *data = dev->data;
+	WDT_Type *wdt_reg = (WDT_Type *)cfg->base;
+
+	LOG_DBG("WDT ISR");
+
+	wdt_reg->CTRL |= WDT_CTRL_CLRRSTFLAG;
+
+	if (data->callback) {
+		data->callback(dev, 0);
+	}
+}
+
+static int wdt_rts5912_setup(const struct device *dev, uint8_t options)
+{
+	const struct wdt_rts5912_config *const config = dev->config;
+	struct wdt_rts5912_data *data = dev->data;
+	WDT_Type *wdt_reg = (WDT_Type *)config->base;
+
+	if (!data->timeout_installed) {
+		LOG_ERR("No valid WDT timeout installed");
+		return -EINVAL;
+	}
+
+	if (wdt_reg->CTRL & WDT_CTRL_EN) {
+		LOG_ERR("WDT is already running");
+		return -EBUSY;
+	}
+
+	if (options & WDT_OPT_PAUSE_IN_SLEEP) {
+		LOG_ERR("WDT_OPT_PAUSE_IN_SLEEP is not supported");
+		return -ENOTSUP;
+	}
+
+	if (options & WDT_OPT_PAUSE_HALTED_BY_DBG) {
+		LOG_ERR("Pause when halted by debugger not supported");
+		return -ENOTSUP;
+	}
+
+	irq_enable(DT_INST_IRQN(0));
+
+	wdt_reg->INTEN = WDT_INTEN_WDTINTEN;
+	wdt_reg->CTRL |= (WDT_CTRL_CLRRSTFLAG | WDT_CTRL_RELOAD);
+	wdt_reg->CTRL |= WDT_CTRL_EN;
+
+	LOG_DBG("WDT setup and enabled");
+
+	return 0;
+}
+
+static int wdt_rts5912_disable(const struct device *dev)
+{
+	const struct wdt_rts5912_config *const config = dev->config;
+	struct wdt_rts5912_data *data = dev->data;
+	WDT_Type *wdt_reg = (WDT_Type *)config->base;
+
+	if (!(wdt_reg->CTRL & WDT_CTRL_EN)) {
+		return -EALREADY;
+	}
+
+	wdt_reg->INTEN = 0ul;
+	wdt_reg->CTRL |= WDT_CTRL_CLRRSTFLAG;
+	wdt_reg->CTRL &= ~WDT_CTRL_EN;
+
+	data->timeout_installed = false;
+
+	LOG_DBG("WDT disabled");
+
+	return 0;
+}
+
+static int wdt_rts5912_install_timeout(const struct device *dev,
+				       const struct wdt_timeout_cfg *config)
+{
+	const struct wdt_rts5912_config *const cfg = dev->config;
+	struct wdt_rts5912_data *data = dev->data;
+	WDT_Type *wdt_reg = (WDT_Type *)cfg->base;
+
+	uint32_t timeout;
+	uint32_t max, min;
+
+	LOG_DBG("WDT intstall timeout");
+
+	if (wdt_reg->CTRL & WDT_CTRL_EN) {
+		LOG_ERR("WDT is already running");
+		return -EBUSY;
+	}
+
+	if (config->window.min > 0U) {
+		LOG_ERR("Lower limit of watchdog is not supported, keep it zero");
+		data->timeout_installed = false;
+		return -EINVAL;
+	}
+
+	switch (config->flags) {
+	case WDT_FLAG_RESET_SOC:
+		wdt_reg->CTRL |= WDT_CTRL_RSTEN;
+		break;
+	case WDT_FLAG_RESET_NONE:
+		wdt_reg->CTRL &= ~WDT_CTRL_RSTEN;
+		break;
+	case WDT_FLAG_RESET_CPU_CORE:
+		LOG_ERR("WDT_FLAG_RESET_CPU_CORE is not supported\n");
+		break;
+	default:
+		LOG_ERR("Unsupported watchdog config Flag\n");
+		return -ENOTSUP;
+	}
+
+	timeout = config->window.max * 1000U;
+	min = (cfg->div * USEC_PER_SEC) / WDT_CLK_CYCLE;
+	max = min * WDT_MAX_CNT;
+
+	if ((timeout < min) || (timeout > max)) {
+		LOG_ERR("Invalid timeout value allowed range:"
+			"%d ms to %d ms",
+			min / MSEC_PER_SEC, max / MSEC_PER_SEC);
+		return -EINVAL;
+	}
+
+	wdt_reg->CNT = timeout / min;
+
+	data->callback = config->callback;
+	data->timeout_installed = true;
+
+	LOG_DBG("DIV: 0x%08x, CNT: 0x%08x", wdt_reg->DIV, wdt_reg->CNT);
+
+	return 0;
+}
+
+static int wdt_rts5912_feed(const struct device *dev, int channel_id)
+{
+	const struct wdt_rts5912_config *const cfg = dev->config;
+	WDT_Type *wdt_reg = (WDT_Type *)cfg->base;
+
+	ARG_UNUSED(dev);
+	ARG_UNUSED(channel_id);
+
+	if (!(wdt_reg->CTRL & WDT_CTRL_EN)) {
+		return -EINVAL;
+	}
+
+	wdt_reg->CTRL |= WDT_CTRL_RELOAD;
+
+	LOG_DBG("WDT feed");
+
+	return 0;
+}
+
+static DEVICE_API(wdt, wdt_rts5912_api) = {
+	.setup = wdt_rts5912_setup,
+	.disable = wdt_rts5912_disable,
+	.install_timeout = wdt_rts5912_install_timeout,
+	.feed = wdt_rts5912_feed,
+};
+
+static int wdt_rts5912_init(const struct device *dev)
+{
+	int rc;
+
+	const struct wdt_rts5912_config *const cfg = dev->config;
+	struct rts5912_sccon_subsys sccon;
+	WDT_Type *wdt_reg = (WDT_Type *)cfg->base;
+
+	LOG_DBG("WDT init");
+
+	if (!device_is_ready(cfg->clk_dev)) {
+		return -ENODEV;
+	}
+
+	sccon.clk_grp = cfg->clk_grp;
+	sccon.clk_idx = cfg->clk_idx;
+	rc = clock_control_on(cfg->clk_dev, (clock_control_subsys_t)&sccon);
+	if (rc != 0) {
+		return rc;
+	}
+
+	if (IS_ENABLED(CONFIG_WDT_DISABLE_AT_BOOT)) {
+		wdt_rts5912_disable(dev);
+	}
+
+	wdt_reg->CTRL = 0ul;
+	wdt_reg->DIV = cfg->div;
+
+	wdt_reg->CTRL |= WDT_CTRL_CLRRSTFLAG;
+	NVIC_ClearPendingIRQ(DT_INST_IRQN(0));
+
+	IRQ_CONNECT(DT_INST_IRQN(0), 0, wdt_rts5912_isr, DEVICE_DT_INST_GET(0), 0);
+	irq_enable(DT_INST_IRQN(0));
+
+	return 0;
+}
+
+static const struct wdt_rts5912_config wdt_rts5912_cfg = {
+	.base = DT_INST_REG_ADDR(0),
+	.div = DT_INST_PROP(0, clk_divider),
+	.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(0)),
+	.clk_grp = DT_CLOCKS_CELL_BY_NAME(DT_NODELABEL(wdog), watchdog, clk_grp),
+	.clk_idx = DT_CLOCKS_CELL_BY_NAME(DT_NODELABEL(wdog), watchdog, clk_idx),
+};
+
+static struct wdt_rts5912_data wdt_rts5912_dev_data;
+
+DEVICE_DT_INST_DEFINE(0, wdt_rts5912_init, NULL, &wdt_rts5912_dev_data, &wdt_rts5912_cfg,
+		      PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &wdt_rts5912_api);
diff --git a/drivers/watchdog/wdt_silabs_siwx91x.c b/drivers/watchdog/wdt_silabs_siwx91x.c
new file mode 100644
index 0000000000000..4da0813ed5cb4
--- /dev/null
+++ b/drivers/watchdog/wdt_silabs_siwx91x.c
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <zephyr/irq.h>
+#include <zephyr/types.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/bitarray.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/drivers/clock_control.h>
+#include <math.h>
+#include "rsi_wwdt.h"
+#include "rsi_sysrtc.h"
+
+#define DT_DRV_COMPAT                       silabs_siwx91x_wdt
+#define SIWX91X_WDT_SYSTEM_RESET_TIMER_MASK 0x0000001F
+
+struct siwx91x_wdt_config {
+	/* WDT register base address */
+	MCU_WDT_Type *reg;
+	/* Pointer to the clock device structure */
+	const struct device *clock_dev;
+	/* Clock control subsystem */
+	clock_control_subsys_t clock_subsys;
+	/* Function pointer for the IRQ (Interrupt Request) configuration */
+	void (*irq_config)(void);
+};
+
+struct siwx91x_wdt_data {
+	/* Callback function to be called on watchdog timer events */
+	wdt_callback_t callback;
+	/* WDT operating clock (LF-FSM) frequency */
+	uint32_t clock_frequency;
+	/* Timer system reset duration in ms */
+	uint8_t delay_reset;
+	/* Timer interrupt duration in ms */
+	uint8_t delay_irq;
+	/* Flag indicating the timeout install status */
+	bool timeout_install_status;
+	/* Flag indicating the setup status */
+	bool setup_status;
+};
+
+/* Function to get the delay in milliseconds from the register value */
+static uint32_t siwx91x_wdt_delay_from_hw(uint8_t value, int clock_frequency)
+{
+	uint32_t ticks = BIT(value);
+	float timeout = (float)ticks / clock_frequency;
+
+	timeout *= 1000;
+	/* Return the timeout value as an unsigned 32-bit integer in milliseconds */
+	return (uint32_t)timeout;
+}
+
+/* Function to get the register value from the delay in milliseconds */
+static uint8_t siwx91x_wdt_delay_to_hw(uint32_t delay, int clock_frequency)
+{
+	/* reg_value = log((timeout * clock_frequency)/1000)base2 */
+	float value = ((float)delay * (float)clock_frequency) / 1000;
+	float result = log2f(value);
+
+	/* Round the result to nearest integer */
+	result = roundf(result);
+
+	return (uint8_t)result;
+}
+
+static int siwx91x_wdt_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg)
+{
+	struct siwx91x_wdt_data *data = dev->data;
+
+	/* Check the WDT setup status */
+	if (data->setup_status) {
+		/* WDT setup is already done */
+		return -EBUSY;
+	}
+
+	/* Check the WDT timeout  status */
+	if (data->timeout_install_status) {
+		/* Only single timeout can be installed */
+		return -ENOMEM;
+	}
+
+	if (cfg->window.max > siwx91x_wdt_delay_from_hw(SIWX91X_WDT_SYSTEM_RESET_TIMER_MASK,
+							data->clock_frequency) ||
+	    cfg->window.max == 0) {
+		/* Requested value is out of range */
+		return -EINVAL;
+	}
+
+	if (cfg->window.min > 0) {
+		/* This feature is currently not supported */
+		return -ENOTSUP;
+	}
+
+	switch (cfg->flags) {
+	case WDT_FLAG_RESET_SOC:
+	case WDT_FLAG_RESET_CPU_CORE:
+		if (cfg->callback != NULL) {
+			/* Callback is not supported for reset flags */
+			return -ENOTSUP;
+		}
+		data->delay_reset = siwx91x_wdt_delay_to_hw(cfg->window.max, data->clock_frequency);
+		/* During a system or CPU core reset, interrupts are not needed. Thus, we set
+		 * the interrupt time to 0 to ensure no interrupts occur while resetting.
+		 */
+		data->delay_irq = 0;
+		/* Mask the WWDT interrupt */
+		RSI_WWDT_IntrMask();
+		break;
+
+	case WDT_FLAG_RESET_NONE:
+		/* Set the reset time to maximum value */
+		data->delay_reset = SIWX91X_WDT_SYSTEM_RESET_TIMER_MASK;
+		data->delay_irq = siwx91x_wdt_delay_to_hw(cfg->window.max, data->clock_frequency);
+		if (cfg->callback != NULL) {
+			data->callback = cfg->callback;
+		}
+		break;
+
+	default:
+		/* Unsupported WDT config options */
+		return -ENOTSUP;
+	}
+
+	data->timeout_install_status = true;
+	return 0;
+}
+
+/* Function to setup and start WDT */
+static int siwx91x_wdt_setup(const struct device *dev, uint8_t options)
+{
+	const struct siwx91x_wdt_config *config = dev->config;
+	struct siwx91x_wdt_data *data = dev->data;
+
+	/* Check the WDT setup status */
+	if (data->setup_status) {
+		/* WDT is already running */
+		return -EBUSY;
+	}
+
+	/* Check the WDT timeout  status */
+	if (!data->timeout_install_status) {
+		/* Timeout need to be set before setup */
+		return -ENOTSUP;
+	}
+
+	if (options & (WDT_OPT_PAUSE_IN_SLEEP)) {
+		return -ENOTSUP;
+	}
+
+	RSI_WWDT_ConfigSysRstTimer(config->reg, data->delay_reset);
+	RSI_WWDT_ConfigIntrTimer(config->reg, data->delay_irq);
+
+	RSI_WWDT_Start(config->reg);
+
+	data->setup_status = true;
+
+	return 0;
+}
+
+static int siwx91x_wdt_disable(const struct device *dev)
+{
+	const struct siwx91x_wdt_config *config = dev->config;
+	struct siwx91x_wdt_data *data = dev->data;
+
+	if (!data->timeout_install_status) {
+		/* No timeout installed */
+		return -EFAULT;
+	}
+
+	RSI_WWDT_Disable(config->reg);
+
+	data->timeout_install_status = false;
+	data->setup_status = false;
+
+	return 0;
+}
+
+static int siwx91x_wdt_feed(const struct device *dev, int channel_id)
+{
+	const struct siwx91x_wdt_config *config = dev->config;
+	struct siwx91x_wdt_data *data = dev->data;
+
+	if (!(data->timeout_install_status && data->setup_status)) {
+		/* WDT is not configured */
+		return -EINVAL;
+	}
+
+	if (channel_id != 0) {
+		/* Channel id must be 0 */
+		return -EINVAL;
+	}
+
+	RSI_WWDT_ReStart(config->reg);
+	return 0;
+}
+
+static void siwx91x_wdt_isr(const struct device *dev)
+{
+	const struct siwx91x_wdt_config *config = dev->config;
+	struct siwx91x_wdt_data *data = dev->data;
+
+	/* Clear WDT interrupt */
+	RSI_WWDT_IntrClear();
+
+	if (data->delay_irq) {
+		/* Restart the timer */
+		RSI_WWDT_ReStart(config->reg);
+	}
+
+	if (data->callback != NULL) {
+		data->callback(dev, 0);
+	}
+}
+
+static int siwx91x_wdt_init(const struct device *dev)
+{
+	const struct siwx91x_wdt_config *config = dev->config;
+	struct siwx91x_wdt_data *data = dev->data;
+	int ret;
+
+	ret = clock_control_on(config->clock_dev, config->clock_subsys);
+	if (ret) {
+		return ret;
+	}
+	ret = clock_control_get_rate(config->clock_dev, config->clock_subsys,
+				     &data->clock_frequency);
+	if (ret) {
+		return ret;
+	}
+
+	RSI_WWDT_Init(config->reg);
+
+	config->irq_config();
+	RSI_WWDT_IntrUnMask();
+
+	return 0;
+}
+
+static DEVICE_API(wdt, siwx91x_wdt_driver_api) = {
+	.setup = siwx91x_wdt_setup,
+	.disable = siwx91x_wdt_disable,
+	.install_timeout = siwx91x_wdt_install_timeout,
+	.feed = siwx91x_wdt_feed,
+};
+
+#define siwx91x_WDT_INIT(inst)                                                                     \
+	static struct siwx91x_wdt_data siwx91x_wdt_data_##inst;                                    \
+	static void siwx91x_wdt_irq_configure_##inst(void)                                         \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQ(inst, irq), DT_INST_IRQ(inst, priority), siwx91x_wdt_isr,  \
+			    DEVICE_DT_INST_GET(inst), 0);                                          \
+		irq_enable(DT_INST_IRQ(inst, irq));                                                \
+	}                                                                                          \
+	static const struct siwx91x_wdt_config siwx91x_wdt_config_##inst = {                       \
+		.reg = (MCU_WDT_Type *)DT_INST_REG_ADDR(inst),                                     \
+		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(inst)),                             \
+		.clock_subsys = (clock_control_subsys_t)DT_INST_PHA(inst, clocks, clkid),          \
+		.irq_config = siwx91x_wdt_irq_configure_##inst,                                    \
+	};                                                                                         \
+	DEVICE_DT_INST_DEFINE(inst, &siwx91x_wdt_init, NULL, &siwx91x_wdt_data_##inst,             \
+			      &siwx91x_wdt_config_##inst, PRE_KERNEL_1,                            \
+			      CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &siwx91x_wdt_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(siwx91x_WDT_INIT)
diff --git a/drivers/watchdog/xt_wdt_esp32.c b/drivers/watchdog/xt_wdt_esp32.c
index 3c6fd8ef51086..29b75552187ac 100644
--- a/drivers/watchdog/xt_wdt_esp32.c
+++ b/drivers/watchdog/xt_wdt_esp32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,22 +14,12 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/esp32_clock_control.h>
 
-#ifndef CONFIG_SOC_SERIES_ESP32C3
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#else
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-#endif
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(xt_wdt_esp32, CONFIG_WDT_LOG_LEVEL);
 
-#ifdef CONFIG_SOC_SERIES_ESP32C3
-#define ISR_HANDLER isr_handler_t
-#else
-#define ISR_HANDLER intr_handler_t
-#endif
-
 #define ESP32_XT_WDT_MAX_TIMEOUT 255
 
 struct esp32_xt_wdt_data {
@@ -134,7 +124,7 @@ static int esp32_xt_wdt_init(const struct device *dev)
 
 	flags = ESP_PRIO_TO_FLAGS(cfg->irq_priority) | ESP_INT_FLAGS_CHECK(cfg->irq_flags) |
 		ESP_INTR_FLAG_SHARED;
-	err = esp_intr_alloc(cfg->irq_source, flags, (ISR_HANDLER)esp32_xt_wdt_isr, (void *)dev,
+	err = esp_intr_alloc(cfg->irq_source, flags, (intr_handler_t)esp32_xt_wdt_isr, (void *)dev,
 			     NULL);
 	if (err) {
 		LOG_ERR("Failed to register ISR\n");
diff --git a/drivers/wifi/esp32/Kconfig.esp32 b/drivers/wifi/esp32/Kconfig.esp32
index 9be2a64fb33f3..87a2b4be40503 100644
--- a/drivers/wifi/esp32/Kconfig.esp32
+++ b/drivers/wifi/esp32/Kconfig.esp32
@@ -8,6 +8,7 @@ menuconfig WIFI_ESP32
 	depends on !SMP
 	select THREAD_CUSTOM_DATA
 	select NET_L2_WIFI_MGMT
+	select NET_L2_ETHERNET
 	select WIFI_USE_NATIVE_NETWORKING
 	select MBEDTLS
 	select THREAD_STACK_INFO
diff --git a/drivers/wifi/esp32/src/esp_wifi_drv.c b/drivers/wifi/esp32/src/esp_wifi_drv.c
index 2f377d9bad86b..06cc67813872b 100644
--- a/drivers/wifi/esp32/src/esp_wifi_drv.c
+++ b/drivers/wifi/esp32/src/esp_wifi_drv.c
@@ -95,6 +95,10 @@ static int esp32_wifi_send(const struct device *dev, struct net_pkt *pkt)
 	const int pkt_len = net_pkt_get_len(pkt);
 	esp_interface_t ifx = data->state == ESP32_AP_CONNECTED ? ESP_IF_WIFI_AP : ESP_IF_WIFI_STA;
 
+	if (esp32_data.state != ESP32_STA_CONNECTED && esp32_data.state != ESP32_AP_CONNECTED) {
+		return -EIO;
+	}
+
 	/* Read the packet payload */
 	if (net_pkt_read(pkt, data->frame_buf, pkt_len) < 0) {
 		goto out;
@@ -773,6 +777,13 @@ static int esp32_wifi_status(const struct device *dev, struct wifi_iface_status
 	status->mfp = WIFI_MFP_DISABLE;
 
 	if (esp_wifi_get_mode(&mode) == ESP_OK) {
+#if defined(CONFIG_ESP32_WIFI_AP_STA_MODE)
+		if (mode == ESP32_WIFI_MODE_APSTA && data == &esp32_data) {
+			mode = ESP32_WIFI_MODE_STA;
+		} else if (mode == ESP32_WIFI_MODE_APSTA && data == &esp32_ap_sta_data) {
+			mode = ESP32_WIFI_MODE_AP;
+		}
+#endif
 		if (mode == ESP32_WIFI_MODE_STA) {
 			wifi_phy_mode_t phy_mode;
 			esp_err_t err;
@@ -842,21 +853,14 @@ static void esp32_wifi_init(struct net_if *iface)
 #if defined(CONFIG_ESP32_WIFI_AP_STA_MODE)
 	struct wifi_nm_instance *nm = wifi_nm_get_instance("esp32_wifi_nm");
 
-	if (!esp32_wifi_iface_ap) {
-		esp32_wifi_iface_ap = iface;
-		dev_data->state = ESP32_AP_STOPPED;
+	esp32_wifi_iface = iface;
+	dev_data->state = ESP32_STA_STOPPED;
 
-		esp_read_mac(dev_data->mac_addr, ESP_MAC_WIFI_SOFTAP);
-		wifi_nm_register_mgd_type_iface(nm, WIFI_TYPE_SAP, esp32_wifi_iface_ap);
-	} else {
-		esp32_wifi_iface = iface;
-		dev_data->state = ESP32_STA_STOPPED;
+	/* Start interface when we are actually connected with Wi-Fi network */
+	esp_read_mac(dev_data->mac_addr, ESP_MAC_WIFI_STA);
+	esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_STA, eth_esp32_rx);
+	wifi_nm_register_mgd_type_iface(nm, WIFI_TYPE_STA, esp32_wifi_iface);
 
-		/* Start interface when we are actually connected with Wi-Fi network */
-		esp_read_mac(dev_data->mac_addr, ESP_MAC_WIFI_STA);
-		esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_STA, eth_esp32_rx);
-		wifi_nm_register_mgd_type_iface(nm, WIFI_TYPE_STA, esp32_wifi_iface);
-	}
 #else
 
 	esp32_wifi_iface = iface;
@@ -875,6 +879,31 @@ static void esp32_wifi_init(struct net_if *iface)
 	net_if_carrier_off(iface);
 }
 
+#if defined(CONFIG_ESP32_WIFI_AP_STA_MODE)
+static void esp32_wifi_init_ap(struct net_if *iface)
+{
+	const struct device *dev = net_if_get_device(iface);
+	struct esp32_wifi_runtime *dev_data = dev->data;
+	struct ethernet_context *eth_ctx = net_if_l2_data(iface);
+
+	eth_ctx->eth_if_type = L2_ETH_IF_TYPE_WIFI;
+
+	struct wifi_nm_instance *nm = wifi_nm_get_instance("esp32_wifi_nm");
+
+	esp32_wifi_iface_ap = iface;
+	dev_data->state = ESP32_AP_STOPPED;
+
+	esp_read_mac(dev_data->mac_addr, ESP_MAC_WIFI_SOFTAP);
+	wifi_nm_register_mgd_type_iface(nm, WIFI_TYPE_SAP, esp32_wifi_iface_ap);
+
+	/* Assign link local address. */
+	net_if_set_link_addr(iface, dev_data->mac_addr, 6, NET_LINK_ETHERNET);
+
+	ethernet_init(iface);
+	net_if_carrier_off(iface);
+}
+#endif
+
 #if defined(CONFIG_NET_STATISTICS_WIFI)
 static int esp32_wifi_stats(const struct device *dev, struct net_stats_wifi *stats)
 {
@@ -905,6 +934,7 @@ static int esp32_wifi_dev_init(const struct device *dev)
 
 	wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
 	esp_err_t ret = esp_wifi_init(&config);
+	esp_wifi_set_mode(ESP32_WIFI_MODE_NULL);
 
 	if (ret == ESP_ERR_NO_MEM) {
 		LOG_ERR("Not enough memory to initialize Wi-Fi.");
@@ -939,6 +969,13 @@ static const struct net_wifi_mgmt_offload esp32_api = {
 	.wifi_iface.send = esp32_wifi_send,
 	.wifi_mgmt_api = &esp32_wifi_mgmt,
 };
+#if defined(CONFIG_ESP32_WIFI_AP_STA_MODE)
+static const struct net_wifi_mgmt_offload esp32_api_ap = {
+	.wifi_iface.iface_api.init = esp32_wifi_init_ap,
+	.wifi_iface.send = esp32_wifi_send,
+	.wifi_mgmt_api = &esp32_wifi_mgmt,
+};
+#endif
 
 NET_DEVICE_DT_INST_DEFINE(0,
 		esp32_wifi_dev_init, NULL,
@@ -950,7 +987,7 @@ NET_DEVICE_DT_INST_DEFINE(0,
 NET_DEVICE_DT_INST_DEFINE(1,
 		NULL, NULL,
 		&esp32_ap_sta_data, NULL, CONFIG_WIFI_INIT_PRIORITY,
-		&esp32_api, ETHERNET_L2,
+		&esp32_api_ap, ETHERNET_L2,
 		NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU);
 
 DEFINE_WIFI_NM_INSTANCE(esp32_wifi_nm, &esp32_wifi_mgmt);
diff --git a/drivers/wifi/eswifi/eswifi_socket_offload.c b/drivers/wifi/eswifi/eswifi_socket_offload.c
index 212bef4380ac0..5d37ae7304276 100644
--- a/drivers/wifi/eswifi/eswifi_socket_offload.c
+++ b/drivers/wifi/eswifi/eswifi_socket_offload.c
@@ -191,7 +191,7 @@ static int map_credentials(int sd, const void *optval, socklen_t optlen)
 			case TLS_CREDENTIAL_CA_CERTIFICATE:
 				id = 0;
 				break;
-			case TLS_CREDENTIAL_SERVER_CERTIFICATE:
+			case TLS_CREDENTIAL_PUBLIC_CERTIFICATE:
 				id = 1;
 				break;
 			case TLS_CREDENTIAL_PRIVATE_KEY:
diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index 41a06e912f8ed..d44aa7b98c8ca 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -62,6 +62,14 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
   src/wifi_util.c
 )
 
+if(CONFIG_NRF70_UTIL OR CONFIG_NRF70_DEBUG_SHELL)
+  zephyr_library_sources(src/shell.c)
+endif()
+
+zephyr_library_sources_ifdef(CONFIG_NRF70_DEBUG_SHELL
+  src/debug_shell.c
+)
+
 zephyr_compile_definitions_ifdef(CONFIG_NRF70_ON_QSPI
 # These are XIP related anomalies and aren't applicable for nRF7002 and cause
 # throughput issues.
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index 613709b5e6e1f..b9b195d8a13fd 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -48,30 +48,41 @@ choice NRF70_OPER_MODES
 config NRF70_SCAN_ONLY
 	bool "nRF70 scan only mode"
 	help
-	  Select this option to enable scan only mode of the nRF70 driver
+	  Select this option to enable scan-only mode of the nRF70 driver.
+	  In this mode, the driver can only perform scanning operations
+	  to discover nearby Wi-Fi networks, but cannot establish connections
+	  or transmit/receive data. Mainly used for location accuracy
+	  improvement.
 
 config NRF70_SYSTEM_MODE
 	bool "System mode of the nRF70 driver"
 	help
-	  Select this option to enable system mode of the nRF70 driver
+	  Select this option to enable system mode of the nRF70 driver.
+	  This is the normal operating mode that supports full Wi-Fi
+	  functionality including sub-modes like STA, AP, and P2P.
 
 config NRF70_RADIO_TEST
 	bool "Radio test mode of the nRF70 driver"
+	help
+	  Select this option to enable radio test mode of the nRF70 driver.
+	  This mode is used for testing RF performance and regulatory
+	  compliance. It provides direct control of the radio hardware
+	  for transmitting test patterns and measuring RF parameters.
 
 config NRF70_OFFLOADED_RAW_TX
 	bool "Offloaded raw TX mode of the nRF70 driver"
+	help
+	  Select this option to enable offloaded raw TX mode.
+	  In this mode, raw 802.11 frames can be transmitted directly
+	  without normal Wi-Fi protocol processing. The frame construction
+	  and transmission timing is handled by the Wi-Fi hardware,
+	  reducing CPU load.
 
 endchoice
 
 config NET_L2_ETHERNET
 	default y if (!NRF70_RADIO_TEST && !NRF70_OFFLOADED_RAW_TX)
 
-config HEAP_MEM_POOL_ADD_SIZE_NRF70
-	# Use a maximum that works for typical use cases and boards, each sample/app can override
-	# this value if needed by using CONFIG_HEAP_MEM_POOL_IGNORE_MIN
-	def_int 25000 if NRF70_SCAN_ONLY
-	def_int 150000
-
 if NRF70_SYSTEM_MODE
 config NRF70_STA_MODE
 	bool "nRF70 STA mode"
@@ -92,7 +103,7 @@ config NRF70_P2P_MODE
 	bool "P2P support in driver"
 
 config NRF70_SYSTEM_WITH_RAW_MODES
-	bool
+	bool "nRF70 system mode with raw modes"
 	default y if (NRF70_RAW_DATA_TX || NRF70_RAW_DATA_RX || NRF70_PROMISC_DATA_RX)
 	depends on WIFI_NRF7002 || WIFI_NRF7001
 	help
@@ -156,6 +167,7 @@ config NRF70_REG_DOMAIN
 # stack requirements.
 config NET_MGMT_EVENT_STACK_SIZE
 	default 2048 if !WIFI_NM_WPA_SUPPLICANT
+	default 4600
 
 config NRF70_LOG_VERBOSE
 	bool "Maintains the verbosity of information in logs"
@@ -178,15 +190,28 @@ config NRF70_2_4G_ONLY
 config NRF70_SR_COEX
 	bool "Wi-Fi and SR coexistence support"
 
+if NRF70_SR_COEX
 config NRF70_SR_COEX_RF_SWITCH
 	bool "GPIO configuration to control SR side RF switch position"
-	depends on $(dt_node_has_prop,nrf70, srrf-switch-gpios)
-	depends on NRF70_SR_COEX
+	depends on $(dt_nodelabel_has_prop,nrf70,srrf-switch-gpios)
 	help
 	  Select this option to enable GPIO configuration to control SR side RF switch position.
 	  If this GPIO is asserted (1), the SR side RF switch is connected to the Wi-Fi side (shared antenna).
 	  If this GPIO is de-asserted (0), the SR side RF switch is connected to the SR side (separate antenna).
 
+config NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL
+	bool "Configuration of GPIO control for coexistence"
+	default y
+
+config NRF70_SR_COEX_SWCTRL1_OUTPUT
+	int "Configure SWCTRIL1 as output"
+	default 0
+
+config NRF70_SR_COEX_BT_GRANT_ACTIVE_LOW
+	int "Configure BT grant active low"
+	default 1
+endif # NRF70_SR_COEX
+
 config NRF70_WORKQ_STACK_SIZE
 	int "Stack size for workqueue"
 	default 4096
@@ -203,6 +228,10 @@ config NRF70_UTIL
 	depends on SHELL
 	bool "Utility shell in nRF70 driver"
 
+config NRF70_DEBUG_SHELL
+	depends on SHELL
+	bool "Debug shell in nRF70 driver"
+
 config NRF70_QSPI_LOW_POWER
 	bool "low power mode in QSPI"
 	default y if NRF_WIFI_LOW_POWER
@@ -529,8 +558,20 @@ config NRF70_RSSI_STALE_TIMEOUT_MS
 	  value as the driver does not store it and requires RPU to provide the
 	  information.
 
+config NRF_WIFI_CTRL_HEAP_SIZE
+	int "Dedicated memory pool for control plane"
+	default 20000
+
+config NRF_WIFI_DATA_HEAP_SIZE
+	int "Dedicated memory pool for data plane"
+	default 0 if NRF70_RADIO_TEST || NRF70_OFFLOADED_RAW_TX
+	default 8000 if NRF70_SCAN_ONLY
+	default 110000 if !SOC_FAMILY_NORDIC_NRF
+	default 130000
+
 if NETWORKING
 # Finetune defaults for certain system components used by the driver
+
 config SYSTEM_WORKQUEUE_STACK_SIZE
 	default 4096
 
@@ -545,11 +586,22 @@ config NET_TC_TX_COUNT
 
 endif # NETWORKING
 
+config NRF_WIFI_USE_VARIABLE_NET_BUFS
+	bool "Use variable network buffers"
+	default y
+	help
+	  This option enables the use of variable network buffers in the nRF70 driver.
+	  Variable network buffers optimize RAM usage by allocating buffers of different sizes
+	  based on the data size. This option is enabled by default to optimize RAM usage.
+	  Samples and applications can override this option for higher performance.
+
+if NRF_WIFI_USE_VARIABLE_NET_BUFS
 # nRF70 now uses variable buffers as default to optimize RAM usage. Default pool sizes are used, samples/apps can override
 # for higher performance.
 choice NET_PKT_DATA_ALLOC_TYPE
 	default NET_BUF_VARIABLE_DATA_SIZE
 endchoice
+endif # NRF_WIFI_USE_VARIABLE_NET_BUFS
 
 config MAIN_STACK_SIZE
 	default 4096
@@ -741,6 +793,8 @@ endchoice
 
 config NRF_WIFI_MGMT_BUFF_OFFLOAD
 	bool "Management buffer offload"
+	# Raw scan results need host based refilling
+	depends on !WIFI_MGMT_RAW_SCAN_RESULTS
 	default y
 	help
 	  This option offloads the refilling of management buffers to the UMAC, saving the host
@@ -809,4 +863,38 @@ config NRF_WIFI_COEX_DISABLE_PRIORITY_WINDOW_FOR_SCAN
 	help
 	  Enable this configuration to disable priority window for scan
 	  in the case of coexistence with Short Range radio.
+
+if NETWORKING
+config NRF_WIFI_ZERO_COPY_TX
+	bool "Zero copy Transmit path [EXPERIMENTAL]"
+	select NET_L2_ETHERNET_RESERVE_HEADER
+	select EXPERIMENTAL
+	# 54L has lower RAM
+	default y if SOC_SERIES_NRF54LX
+	help
+	  Enable this configuration to use zero copy Transmit path.
+	  The driver will use the network buffer directly for transmission
+	  without copying the data to the driver's buffer. This reduces the
+	  driver heap memory usage without much impact on the performance.
+
+	  The application should configure the network buffers to ensure that
+	  the whole packet fits in a single buffer, else the driver will fallback
+	  to the normal copy path, but the memory requirements would still match
+	  to the zero copy path and may be sub-optimal for the normal copy path.
+
+endif # NETWORKING
+
+config NRF_WIFI_MAX_PS_POLL_FAIL_CNT
+	int "Maximum number of PS-Poll failures"
+	default 10
+	range 10 4294967295
+	help
+	  Maximum number of PS-Poll failures before entering qos null-based power save.
+
+config NRF_WIFI_RX_STBC_HT
+	bool "Receive packets encoded with STBC in HT (Wi-Fi4) mode"
+	default y
+	help
+	  Receive packets encoded with STBC (Space-Time Block Coding)
+	  in HT (Wi-Fi4) mode.
 endif # WIFI_NRF70
diff --git a/drivers/wifi/nrf_wifi/src/coex.c b/drivers/wifi/nrf_wifi/src/coex.c
index 947bf8511a25d..a9147aad5dc9a 100644
--- a/drivers/wifi/nrf_wifi/src/coex.c
+++ b/drivers/wifi/nrf_wifi/src/coex.c
@@ -17,7 +17,7 @@
 #include "coex.h"
 #include "coex_struct.h"
 #include "fmac_main.h"
-#include "fmac_api.h"
+#include "common/fmac_api_common.h"
 
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
@@ -103,7 +103,7 @@ const uint16_t config_buffer_5G[] = {
 /* Shared antenna */
 const uint32_t ch_config_sha[] = {
 	0x00000028, 0x00000000, 0x001e1023, 0x00000000, 0x00000000,
-	0x00000000, 0x00000021, 0x000002ca, 0x00000050, 0x00000000,
+	0x00000000, 0x00000021, 0x000002ca, 0x0000005A, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000
 };
diff --git a/drivers/wifi/nrf_wifi/src/debug_shell.c b/drivers/wifi/nrf_wifi/src/debug_shell.c
new file mode 100644
index 0000000000000..70fb77d6ed0df
--- /dev/null
+++ b/drivers/wifi/nrf_wifi/src/debug_shell.c
@@ -0,0 +1,364 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* @file
+ * @brief NRF Wi-Fi debug shell module
+ */
+#include <stdlib.h>
+#include <zephyr/shell/shell.h>
+#include "host_rpu_umac_if.h"
+#include "fmac_main.h"
+
+extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
+struct nrf_wifi_ctx_zep *dbg_ctx = &rpu_drv_priv_zep.rpu_ctx_zep;
+
+
+static int nrf_wifi_dbg_read_mem(const struct shell *sh,
+				 size_t argc,
+				 const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long mem_type;
+	unsigned long mem_offset;
+	unsigned long num_words;
+	unsigned int mem_val;
+	unsigned int mem_start_addr;
+	unsigned int mem_end_addr;
+	unsigned int i;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	mem_type = strtoul(argv[1], &ptr, 10);
+	mem_offset = strtoul(argv[2], &ptr, 10);
+	num_words = strtoul(argv[3], &ptr, 10);
+
+	if (mem_type == 0) {
+		mem_start_addr = RPU_ADDR_PKTRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_PKTRAM_END;
+	} else if (mem_type == 1) {
+		mem_start_addr = RPU_ADDR_GRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_GRAM_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory type(%lu).\n",
+			      mem_type);
+		return -ENOEXEC;
+	}
+
+	if ((mem_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory word offset(%lu). Needs to be a multiple of 4\n",
+			      mem_offset);
+		return -ENOEXEC;
+	}
+
+	if (mem_start_addr + (num_words * 4) - 1 > mem_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid number of words(%lu). Exceeds memory region\n",
+			      num_words);
+		return -ENOEXEC;
+	}
+
+	for (i = 0; i < (num_words * 4); i += 4) {
+		status = hal_rpu_mem_read(fmac_dev_ctx->hal_dev_ctx,
+					  &mem_val,
+					  mem_start_addr + i,
+					  sizeof(mem_val));
+
+		if (status != NRF_WIFI_STATUS_SUCCESS) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to read memory at 0x%x.\n",
+				      mem_start_addr + i);
+			return -ENOEXEC;
+		}
+
+		if (i % 16 == 0) {
+			shell_fprintf(sh,
+				      SHELL_INFO,
+				      "\n0x%x: ", mem_start_addr + i);
+		}
+
+		shell_fprintf(sh,
+			      SHELL_INFO,
+			      "0x%08x ",
+			      mem_val);
+	}
+
+	shell_fprintf(sh,
+		      SHELL_INFO,
+		      "\n");
+	return 0;
+}
+
+
+static int nrf_wifi_dbg_write_mem(const struct shell *sh,
+				  size_t argc,
+				  const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long mem_type;
+	unsigned long mem_offset;
+	unsigned int val;
+	unsigned int mem_start_addr;
+	unsigned int mem_end_addr;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	mem_type = strtoul(argv[1], &ptr, 10);
+	mem_offset = strtoul(argv[2], &ptr, 10);
+	val = strtoul(argv[3], &ptr, 10);
+
+	if (mem_type == 0) {
+		mem_start_addr = RPU_ADDR_PKTRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_PKTRAM_END;
+	} else if (mem_type == 1) {
+		mem_start_addr = RPU_ADDR_GRAM_START + (mem_offset * 4);
+		mem_end_addr = RPU_ADDR_GRAM_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory type(%lu).\n",
+			      mem_type);
+		return -ENOEXEC;
+	}
+
+	if ((mem_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory word offset(%lu). Needs to be a multiple of 4\n",
+			      mem_offset);
+		return -ENOEXEC;
+	}
+
+	if (mem_start_addr + 3 > mem_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid memory word offset. Exceeds memory region\n");
+		return -ENOEXEC;
+	}
+
+	status = hal_rpu_mem_write(fmac_dev_ctx->hal_dev_ctx,
+				   mem_start_addr,
+				   &val,
+				   sizeof(val));
+
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Failed to write memory at 0x%x.\n",
+			      mem_start_addr);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+
+static int nrf_wifi_dbg_read_reg(const struct shell *sh,
+				 size_t argc,
+				 const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long reg_type;
+	unsigned long reg_offset;
+	unsigned long num_regs;
+	unsigned int reg_val;
+	unsigned int reg_start_addr;
+	unsigned int reg_end_addr;
+	unsigned int i;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	reg_type = strtoul(argv[1], &ptr, 10);
+	reg_offset = strtoul(argv[2], &ptr, 10);
+	num_regs = strtoul(argv[3], &ptr, 10);
+
+	if (reg_type == 0) {
+		reg_start_addr = RPU_ADDR_SBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_SBUS_END;
+	} else if (reg_type == 1) {
+		reg_start_addr = RPU_ADDR_PBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_PBUS_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register type(%lu).\n",
+			      reg_type);
+		return -ENOEXEC;
+	}
+
+	if ((reg_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register offset(%lu). Needs to be a multiple of 4\n",
+			      reg_offset);
+		return -ENOEXEC;
+	}
+
+	if (reg_start_addr + (num_regs * 4) - 1 > reg_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid number of registers(%lu). Exceeds bus region\n",
+			      num_regs);
+		return -ENOEXEC;
+	}
+
+	for (i = 0; i < num_regs * 4; i += 4) {
+		status = hal_rpu_reg_read(fmac_dev_ctx->hal_dev_ctx,
+					  &reg_val,
+					  reg_start_addr + i);
+
+		if (status != NRF_WIFI_STATUS_SUCCESS) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to read register at 0x%x.\n",
+				      reg_start_addr + i);
+			return -ENOEXEC;
+		}
+
+		shell_fprintf(sh,
+			      SHELL_INFO,
+			      "0x%x: 0x%08x\n",
+			      reg_start_addr + i,
+			      reg_val);
+	}
+
+	shell_fprintf(sh,
+		      SHELL_INFO,
+		      "\n");
+	return 0;
+}
+
+
+static int nrf_wifi_dbg_write_reg(const struct shell *sh,
+				  size_t argc,
+				  const char *argv[])
+{
+	enum nrf_wifi_status status;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	char *ptr;
+	unsigned long reg_type;
+	unsigned long reg_offset;
+	unsigned int val;
+	unsigned int reg_start_addr;
+	unsigned int reg_end_addr;
+
+	fmac_dev_ctx = dbg_ctx->rpu_ctx;
+	reg_type = strtoul(argv[1], &ptr, 10);
+	reg_offset = strtoul(argv[2], &ptr, 10);
+	val = strtoul(argv[3], &ptr, 10);
+
+	if (reg_type == 0) {
+		reg_start_addr = RPU_ADDR_SBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_SBUS_END;
+	} else if (reg_type == 1) {
+		reg_start_addr = RPU_ADDR_PBUS_START + (reg_offset * 4);
+		reg_end_addr = RPU_ADDR_PBUS_END;
+	} else {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register type(%lu).\n",
+			      reg_type);
+		return -ENOEXEC;
+	}
+
+	if ((reg_start_addr % 4) != 0) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register offset(%lu). Needs to be a multiple of 4\n",
+			      reg_offset);
+		return -ENOEXEC;
+	}
+
+	if (reg_start_addr + 3 > reg_end_addr) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Invalid register offset. Exceeds bus region\n");
+		return -ENOEXEC;
+	}
+
+	status = hal_rpu_reg_write(fmac_dev_ctx->hal_dev_ctx,
+				   reg_start_addr,
+				   val);
+
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "Failed to write register at 0x%x.\n",
+			      reg_start_addr);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+
+
+SHELL_STATIC_SUBCMD_SET_CREATE(
+	nrf70_dbg,
+	SHELL_CMD_ARG(read_mem,
+		      NULL,
+		      "<mem_type> <offset> <num_words>\n"
+		      "where:\n"
+		      "<mem_type> : One of the memory regions below\n"
+		      "0 - PKTRAM\n"
+		      "1 - GRAM\n"
+		      "<offset> : Word offset in the memory region\n"
+		      "<num_words> : Number of words to read\n",
+		      nrf_wifi_dbg_read_mem,
+		      4,
+		      0),
+	SHELL_CMD_ARG(write_mem,
+		      NULL,
+		      "<mem_type> <offset> <val>\n"
+		      "where:\n"
+		      "<mem_type> : One of the memory regions below\n"
+		      "0 - PKTRAM\n"
+		      "1 - GRAM\n"
+		      "<offset> : Word offset in the memory region\n"
+		      "<val> : Value to be written\n",
+		      nrf_wifi_dbg_write_mem,
+		      4,
+		      0),
+	SHELL_CMD_ARG(read_reg,
+		      NULL,
+		      "<reg_type> <offset> <num_regs>\n"
+		      "where:\n"
+		      "<reg_type> : One of the bus regions below\n"
+		      "0 - SYSBUS\n"
+		      "1 - PBUS\n"
+		      "<offset> : Register offset\n"
+		      "<num_words> : Number of registers to read\n",
+		      nrf_wifi_dbg_read_reg,
+		      4,
+		      0),
+	SHELL_CMD_ARG(write_reg,
+		      NULL,
+		      "<reg_type> <offset> <val>\n"
+		      "where:\n"
+		      "<reg_type> : One of the bus regions below\n"
+		      "0 - SYSBUS\n"
+		      "1 - PBUS\n"
+		      "<offset> : Register offset\n"
+		      "<val> : Value to be written\n",
+		      nrf_wifi_dbg_write_reg,
+		      4,
+		      0),
+	SHELL_SUBCMD_SET_END
+);
+
+
+SHELL_SUBCMD_ADD((nrf70), dbg, &nrf70_dbg,
+		 "nRF70 advanced debug commands\n",
+		 NULL,
+		 0, 0);
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index fa3e621697521..0559ca48f7c04 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -75,10 +75,15 @@ BUILD_ASSERT(RPU_PKTRAM_SIZE - TOTAL_RX_SIZE >= TOTAL_TX_SIZE,
 BUILD_ASSERT(CONFIG_NRF70_TX_MAX_DATA_SIZE >= MAX_TX_FRAME_SIZE,
 	"TX buffer size must be at least as big as the MTU and headroom");
 
+BUILD_ASSERT(CONFIG_NRF70_TX_MAX_DATA_SIZE % 4 == 0,
+	"TX buffer size must be a multiple of 4");
+BUILD_ASSERT(CONFIG_NRF70_RX_MAX_DATA_SIZE % 4 == 0,
+	"RX buffer size must be a multiple of 4");
+
 static const unsigned char aggregation = 1;
 static const unsigned char max_num_tx_agg_sessions = 4;
 static const unsigned char max_num_rx_agg_sessions = 8;
-static const unsigned char reorder_buf_size = 16;
+static const unsigned char reorder_buf_size = CONFIG_NRF70_RX_NUM_BUFS / 2;
 static const unsigned char max_rxampdu_size = MAX_RX_AMPDU_SIZE_64KB;
 
 static const unsigned char max_tx_aggregation = CONFIG_NRF70_MAX_TX_AGGREGATION;
@@ -357,6 +362,7 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do
 			goto out;
 		}
 
+		ret = 0;
 		goto out;
 	}
 #endif
@@ -465,7 +471,8 @@ void reg_change_callbk_fn(void *vif_ctx,
 		return;
 	}
 
-	fmac_dev_ctx->reg_change = k_malloc(sizeof(struct nrf_wifi_event_regulatory_change));
+	fmac_dev_ctx->reg_change = nrf_wifi_osal_mem_alloc(sizeof(struct
+							   nrf_wifi_event_regulatory_change));
 	if (!fmac_dev_ctx->reg_change) {
 		LOG_ERR("%s: Failed to allocate memory for reg_change", __func__);
 		return;
@@ -580,6 +587,13 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	unsigned int fw_ver = 0;
 
+#if defined(CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL) && \
+	defined(CONFIG_NRF70_SYSTEM_MODE)
+	unsigned int alt_swctrl1_function_bt_coex_status1 =
+			(~CONFIG_NRF70_SR_COEX_SWCTRL1_OUTPUT) & 0x1;
+	unsigned int invert_bt_coex_grant_output = CONFIG_NRF70_SR_COEX_BT_GRANT_ACTIVE_LOW;
+#endif /* CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL && CONFIG_NRF70_SYSTEM_MODE */
+
 	rpu_ctx_zep = &drv_priv_zep->rpu_ctx_zep;
 
 	rpu_ctx_zep->drv_priv_zep = drv_priv_zep;
@@ -623,6 +637,18 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	configure_board_dep_params(&board_params);
 
+#if defined(CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL) && \
+	defined(CONFIG_NRF70_SYSTEM_MODE)
+	LOG_DBG("Configuring SLEEP CTRL GPIO control register\n");
+	status = nrf_wifi_coex_config_sleep_ctrl_gpio_ctrl(rpu_ctx_zep->rpu_ctx,
+			alt_swctrl1_function_bt_coex_status1,
+			invert_bt_coex_grant_output);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: Failed to configure GPIO control register", __func__);
+		goto err;
+	}
+#endif /* CONFIG_NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL  && CONFIG_NRF70_SYSTEM_MODE */
+
 #ifdef CONFIG_NRF70_RADIO_TEST
 	status = nrf_wifi_rt_fmac_dev_init(rpu_ctx_zep->rpu_ctx,
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
@@ -677,9 +703,9 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_rem_zep(struct nrf_wifi_drv_priv_zep *drv
 
 	nrf_wifi_fmac_dev_rem(rpu_ctx_zep->rpu_ctx);
 
-	k_free(rpu_ctx_zep->extended_capa);
+	nrf_wifi_osal_mem_free(rpu_ctx_zep->extended_capa);
 	rpu_ctx_zep->extended_capa = NULL;
-	k_free(rpu_ctx_zep->extended_capa_mask);
+	nrf_wifi_osal_mem_free(rpu_ctx_zep->extended_capa_mask);
 	rpu_ctx_zep->extended_capa_mask = NULL;
 
 	rpu_ctx_zep->rpu_ctx = NULL;
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index 7433ee1353579..8cdb9a472bdac 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -459,7 +459,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 		goto unlock;
 	}
 
-	mcast_info = k_calloc(sizeof(*mcast_info), sizeof(char));
+	mcast_info = nrf_wifi_osal_mem_zalloc(sizeof(*mcast_info));
 
 	if (!mcast_info) {
 		LOG_ERR("%s: Unable to allocate memory of size %d "
@@ -501,7 +501,7 @@ static void ip_maddr_event_handler(struct net_if *iface,
 					       sizeof(mac_string_buf)));
 	}
 unlock:
-	k_free(mcast_info);
+	nrf_wifi_osal_mem_free(mcast_info);
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 }
 #endif /* CONFIG_NRF70_STA_MODE */
@@ -946,7 +946,7 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 			       struct ethernet_config *config)
 {
 	int ret = -1;
-#ifdef CONFIG_NRF70_RAW_DATA_TX
+
 	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
 	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
 	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
@@ -986,11 +986,12 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 	}
 
 	memset(config, 0, sizeof(struct ethernet_config));
-
+#ifdef CONFIG_NRF70_RAW_DATA_TX
 	if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
 		config->txinjection_mode =
 			sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
 	}
+#endif
 #ifdef CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
 	if (type  == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
 	    type == ETHERNET_CONFIG_TYPE_RX_CHECKSUM_SUPPORT) {
@@ -1001,12 +1002,16 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
 					 ETHERNET_CHECKSUM_SUPPORT_TCP |
 					 ETHERNET_CHECKSUM_SUPPORT_UDP;
 	}
+#endif
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	if (type == ETHERNET_CONFIG_TYPE_EXTRA_TX_PKT_HEADROOM) {
+		config->extra_tx_pkt_headroom = NRF_WIFI_EXTRA_TX_HEADROOM;
+	}
 #endif
 	ret = 0;
 unlock:
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 out:
-#endif
 	return ret;
 }
 
diff --git a/drivers/wifi/nrf_wifi/src/shell.c b/drivers/wifi/nrf_wifi/src/shell.c
new file mode 100644
index 0000000000000..36d21d21d50a7
--- /dev/null
+++ b/drivers/wifi/nrf_wifi/src/shell.c
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* @file
+ * @brief NRF Wi-Fi debug shell module
+ */
+#include <stdlib.h>
+#include <zephyr/shell/shell.h>
+
+SHELL_SUBCMD_SET_CREATE(nrf70_commands, (nrf70));
+
+SHELL_CMD_REGISTER(nrf70, &nrf70_commands, "nRF70 specific commands", NULL);
diff --git a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
index ceabdcf7f0191..07560376987b5 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c
@@ -109,10 +109,9 @@ int nrf_wifi_disp_scan_zep(const struct device *dev, struct wifi_scan_params *pa
 
 	vif_ctx_zep->disp_scan_cb = cb;
 
-	scan_info = k_calloc(sizeof(*scan_info) +
+	scan_info = nrf_wifi_osal_mem_zalloc(sizeof(*scan_info) +
 			     (num_scan_channels *
-			      sizeof(scan_info->scan_params.center_frequency[0])),
-			     sizeof(char));
+			      sizeof(scan_info->scan_params.center_frequency[0])));
 
 	if (!scan_info) {
 		LOG_ERR("%s: Unable to allocate memory for scan_info (size: %d bytes)",
@@ -226,7 +225,7 @@ int nrf_wifi_disp_scan_zep(const struct device *dev, struct wifi_scan_params *pa
 	ret = 0;
 out:
 	if (scan_info) {
-		k_free(scan_info);
+		nrf_wifi_osal_mem_free(scan_info);
 	}
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 	return ret;
diff --git a/drivers/wifi/nrf_wifi/src/wifi_util.c b/drivers/wifi/nrf_wifi/src/wifi_util.c
index 70b64da4e2ec8..4a31cae8121ae 100644
--- a/drivers/wifi/nrf_wifi/src/wifi_util.c
+++ b/drivers/wifi/nrf_wifi/src/wifi_util.c
@@ -14,6 +14,9 @@
 #include "fmac_main.h"
 #include "wifi_util.h"
 
+#include "rpu_lmac_phy_stats.h"
+#include "rpu_umac_stats.h"
+
 extern struct nrf_wifi_drv_priv_zep rpu_drv_priv_zep;
 struct nrf_wifi_ctx_zep *ctx = &rpu_drv_priv_zep.rpu_ctx_zep;
 
@@ -963,8 +966,131 @@ static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
 }
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
+static int nrf_wifi_dump_stats(const struct shell *sh,
+				   struct nrf_wifi_hal_dev_ctx *hal_dev_ctx,
+				   const char *name,
+				   struct rpu_stat_global *rpu_stat_g)
+{
+	int i;
+	int j;
+	int ret = 0;
+
+	for (i = 0; rpu_stat_g[i].stats != NULL; i++) {
+		struct rpu_stat_from_mem *rpu_stat = rpu_stat_g[i].stats;
+
+		shell_fprintf(sh, SHELL_INFO, "RPU %s - %s\n", name, rpu_stat_g[i].name);
+		shell_fprintf(sh, SHELL_INFO, "======================\n");
+
+		for (j = 0; rpu_stat[j].name[0] != '\0'; j++) {
+			uint32_t value = 0;
+
+			if (hal_rpu_mem_read(hal_dev_ctx, &value,
+						 rpu_stat[j].addr, sizeof(value)) != 0) {
+				shell_fprintf(sh, SHELL_ERROR,
+						  "Failed to read stat %s\n",
+							  rpu_stat[j].name);
+				continue;
+			}
+
+			shell_fprintf(sh, SHELL_INFO, "%s: %u\n",
+					  rpu_stat[j].name,
+					  value);
+		}
+
+		shell_fprintf(sh, SHELL_INFO, "\n");
+	}
+
+	return ret;
+}
+
+static int nrf_wifi_util_dump_rpu_stats_mem(const struct shell *sh,
+					size_t argc,
+					const char *argv[])
+{
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx;
+	struct nrf_wifi_hal_dev_ctx *hal_dev_ctx;
+	struct rpu_sys_op_stats stats;
+	enum rpu_stats_type stats_type = RPU_STATS_TYPE_ALL;
+	int ret;
+
+	if (argc == 2) {
+		const char *type  = argv[1];
+
+		if (!strcmp(type, "umac")) {
+			stats_type = RPU_STATS_TYPE_UMAC;
+		} else if (!strcmp(type, "lmac")) {
+			stats_type = RPU_STATS_TYPE_LMAC;
+		} else if (!strcmp(type, "all")) {
+			stats_type = RPU_STATS_TYPE_ALL;
+		} else {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Invalid stats type %s\n",
+				      type);
+			return -ENOEXEC;
+		}
+	}
+
+	k_mutex_lock(&ctx->rpu_lock, K_FOREVER);
+	if (!ctx->rpu_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+	fmac_dev_ctx = ctx->rpu_ctx;
+	if (!fmac_dev_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "RPU context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+	hal_dev_ctx = fmac_dev_ctx->hal_dev_ctx;
+	if (!hal_dev_ctx) {
+		shell_fprintf(sh,
+			      SHELL_ERROR,
+			      "HAL context not initialized\n");
+		ret = -ENOEXEC;
+		goto unlock;
+	}
+
+
+	memset(&stats, 0, sizeof(struct rpu_sys_op_stats));
+
+	if (stats_type == RPU_STATS_TYPE_UMAC || stats_type == RPU_STATS_TYPE_ALL) {
+		nrf_wifi_hal_proc_ctx_set(hal_dev_ctx, RPU_PROC_TYPE_MCU_UMAC);
+		ret = nrf_wifi_dump_stats(sh, hal_dev_ctx, "UMAC", rpu_all_umac_stats);
+		if (ret != 0) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to dump UMAC stats\n");
+			goto unlock;
+		}
+	}
+
+	if (stats_type == RPU_STATS_TYPE_LMAC || stats_type == RPU_STATS_TYPE_ALL) {
+		nrf_wifi_hal_proc_ctx_set(hal_dev_ctx, RPU_PROC_TYPE_MCU_LMAC);
+		ret = nrf_wifi_dump_stats(sh, hal_dev_ctx, "LMAC", rpu_all_lmac_stats);
+		if (ret != 0) {
+			shell_fprintf(sh,
+				      SHELL_ERROR,
+				      "Failed to dump LMAC stats\n");
+			goto unlock;
+		}
+	}
+
+	/* Reset the proc context to default */
+	nrf_wifi_hal_proc_ctx_set(hal_dev_ctx, RPU_PROC_TYPE_MCU_LMAC);
+
+unlock:
+	k_mutex_unlock(&ctx->rpu_lock);
+	return ret;
+}
+
 SHELL_STATIC_SUBCMD_SET_CREATE(
-	nrf_wifi_util_subcmds,
+	nrf70_util,
 	SHELL_CMD_ARG(he_ltf,
 		      NULL,
 		      "0 - 1x HE LTF\n"
@@ -1066,13 +1192,17 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      1,
 		      0),
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
+	SHELL_CMD_ARG(rpu_stats_mem,
+		      NULL,
+		      "Display RPU stats by reading from memory "
+		      "Parameters: umac or lmac or or all (default)",
+		      nrf_wifi_util_dump_rpu_stats_mem,
+		      1,
+		      1),
 	SHELL_SUBCMD_SET_END);
 
 
-SHELL_CMD_REGISTER(wifi_util,
-		   &nrf_wifi_util_subcmds,
-		   "nRF Wi-Fi utility shell commands",
-		   NULL);
+SHELL_SUBCMD_ADD((nrf70), util, &nrf70_util, "nRF70 utility commands\n", NULL, 0, 0);
 
 
 static int nrf_wifi_util_init(void)
diff --git a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
index 4b28c7bb24e91..6dc3315a64cdc 100644
--- a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
+++ b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
@@ -174,7 +174,7 @@ void nrf_wifi_wpa_supp_event_proc_scan_res(void *if_priv,
 		beacon_ie_len = scan_res->beacon_ies_len;
 	}
 
-	r = k_calloc(sizeof(*r) + ie_len + beacon_ie_len, sizeof(char));
+	r = nrf_wifi_osal_mem_zalloc(sizeof(*r) + ie_len + beacon_ie_len);
 
 	if (!r) {
 		LOG_ERR("%s: Unable to allocate memory for scan result", __func__);
@@ -254,7 +254,7 @@ void nrf_wifi_wpa_supp_event_proc_scan_res(void *if_priv,
 		vif_ctx_zep->scan_in_progress = false;
 	}
 
-	k_free(r);
+	nrf_wifi_osal_mem_free(r);
 }
 
 void nrf_wifi_wpa_supp_event_proc_auth_resp(void *if_priv,
@@ -519,8 +519,8 @@ int nrf_wifi_wpa_supp_scan2(void *if_priv, struct wpa_driver_scan_params *params
 		}
 	}
 
-	scan_info = k_calloc(sizeof(*scan_info) + (num_freqs * sizeof(unsigned int)),
-			     sizeof(char));
+	scan_info = nrf_wifi_osal_mem_zalloc(sizeof(*scan_info) +
+					    (num_freqs * sizeof(unsigned int)));
 
 	if (!scan_info) {
 		LOG_ERR("%s: Unable to allocate memory for scan info", __func__);
@@ -579,7 +579,7 @@ int nrf_wifi_wpa_supp_scan2(void *if_priv, struct wpa_driver_scan_params *params
 	ret = 0;
 out:
 	if (scan_info) {
-		k_free(scan_info);
+		nrf_wifi_osal_mem_free(scan_info);
 	}
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 	return ret;
@@ -1414,7 +1414,7 @@ int nrf_wifi_nl80211_send_mlme(void *if_priv, const u8 *data,
 
 	k_mutex_lock(&mgmt_tx_lock, K_FOREVER);
 
-	mgmt_tx_info = k_calloc(sizeof(*mgmt_tx_info), sizeof(char));
+	mgmt_tx_info = nrf_wifi_osal_mem_zalloc(sizeof(*mgmt_tx_info));
 
 	if (!mgmt_tx_info) {
 		LOG_ERR("%s: Unable to allocate memory", __func__);
@@ -1491,7 +1491,7 @@ int nrf_wifi_nl80211_send_mlme(void *if_priv, const u8 *data,
 
 out:
 	if (mgmt_tx_info) {
-		k_free(mgmt_tx_info);
+		nrf_wifi_osal_mem_free(mgmt_tx_info);
 	}
 	k_mutex_unlock(&mgmt_tx_lock);
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
@@ -1610,22 +1610,24 @@ void nrf_wifi_wpa_supp_event_get_wiphy(void *if_priv,
 
 	if ((wiphy_info->params_valid & NRF_WIFI_GET_WIPHY_VALID_EXTENDED_CAPABILITIES) &&
 	    rpu_ctx_zep->extended_capa == NULL) {
+		/* To avoid overflowing the 100 column limit */
+		unsigned char ec_len = wiphy_info->extended_capabilities_len;
 
-		rpu_ctx_zep->extended_capa = k_malloc(wiphy_info->extended_capabilities_len);
+		rpu_ctx_zep->extended_capa = nrf_wifi_osal_mem_alloc(ec_len);
 
 		if (rpu_ctx_zep->extended_capa) {
 			memcpy(rpu_ctx_zep->extended_capa, wiphy_info->extended_capabilities,
-			       wiphy_info->extended_capabilities_len);
+			       ec_len);
 		}
 
-		rpu_ctx_zep->extended_capa_mask = k_malloc(wiphy_info->extended_capabilities_len);
+		rpu_ctx_zep->extended_capa_mask = nrf_wifi_osal_mem_alloc(ec_len);
 
 		if (rpu_ctx_zep->extended_capa_mask) {
 			memcpy(rpu_ctx_zep->extended_capa_mask,
 			       wiphy_info->extended_capabilities_mask,
-			       wiphy_info->extended_capabilities_len);
+			       ec_len);
 		} else {
-			free(rpu_ctx_zep->extended_capa);
+			nrf_wifi_osal_mem_free(rpu_ctx_zep->extended_capa);
 			rpu_ctx_zep->extended_capa = NULL;
 			rpu_ctx_zep->extended_capa_len = 0;
 		}
diff --git a/drivers/wifi/nxp/Kconfig.nxp b/drivers/wifi/nxp/Kconfig.nxp
index 01052cf3059fc..424083fb38ae5 100644
--- a/drivers/wifi/nxp/Kconfig.nxp
+++ b/drivers/wifi/nxp/Kconfig.nxp
@@ -3,9 +3,10 @@
 
 menuconfig WIFI_NXP
 	bool "NXP Wi-Fi driver support"
-	select NET_L2_WIFI_MGMT if NETWORKING
-	select WIFI_USE_NATIVE_NETWORKING if NETWORKING
-	select NET_L2_ETHERNET_MGMT if NETWORKING && NET_L2_ETHERNET
+	select NET_L2_WIFI_MGMT
+	select WIFI_USE_NATIVE_NETWORKING
+	select NET_L2_ETHERNET
+	select NET_L2_ETHERNET_MGMT
 	select SDHC if !SOC_SERIES_RW6XX
 	select SDIO_STACK if !SOC_SERIES_RW6XX
 	select WIFI_NM
@@ -305,7 +306,7 @@ endchoice
 
 config NXP_WIFI_SHELL
 	bool "NXP Wi-Fi shell"
-	depends on SHELL
+	default y if SHELL
 	help
 	  NXP Wi-Fi shell commands support.
 
@@ -541,7 +542,6 @@ config NXP_WIFI_SOFTAP_SUPPORT
 	select WIFI_NM_HOSTAPD_AP if WIFI_NM_WPA_SUPPLICANT
 	imply WIFI_NM_HOSTAPD_WPS if WIFI_NM_HOSTAPD_AP && WIFI_NM_WPA_SUPPLICANT_WPS
 	imply WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE if WIFI_NM_HOSTAPD_AP && WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	default y
 	help
 	  Option to enable Wi-Fi SoftAP functions in the Wi-Fi driver.
 
@@ -690,7 +690,7 @@ config NXP_WIFI_5GHz_SUPPORT
 
 config NXP_WIFI_TX_RX_ZERO_COPY
 	bool "Zero memory copy TX/RX data packets"
-	default y if NXP_RW610
+	depends on NXP_RW610
 	imply NET_IPV4_FRAGMENT
 	help
 	  This option enables the Zero memory copy of data packets in Wi-Fi driver data path.
@@ -838,6 +838,11 @@ config NXP_WIFI_WLAN_CALDATA_3ANT_DIVERSITY
 	help
 	  This option is used to enable three antenna diversity.
 
+config NXP_OVERRIDE_CALIBRATION_DATA
+	bool "override default calibriation data"
+	help
+	  This option is used to override default calibration data.
+
 endif # NXP_RW610
 
 config NXP_WIFI_11AX_TWT
@@ -995,9 +1000,9 @@ if NXP_WIFI_SMOKE_TESTS
 config NXP_WIFI_SIGMA_AGENT
 	bool "Wi-Fi Alliance Sigma Agent Support"
 	select POSIX_API
-	select PTHREAD_IPC
+	select POSIX_THREADS
 	select PTHREAD_CREATE_BARRIER
-	select TIMER
+	select POSIX_TIMERS
 	help
 	  This option is to enable Wi-Fi Alliance Sigma Agent support in the Wi-Fi driver.
 
diff --git a/drivers/wifi/nxp/nxp_wifi_drv.c b/drivers/wifi/nxp/nxp_wifi_drv.c
index 806fdcc380cfb..ac952b6ad4b59 100644
--- a/drivers/wifi/nxp/nxp_wifi_drv.c
+++ b/drivers/wifi/nxp/nxp_wifi_drv.c
@@ -284,12 +284,6 @@ int nxp_wifi_wlan_event_callback(enum wlan_event_reason reason, void *data)
 		s_nxp_wifi_UapActivated = true;
 		break;
 	case WLAN_REASON_UAP_CLIENT_ASSOC:
-		LOG_DBG("WLAN: UAP a Client Associated");
-		LOG_DBG("Client => ");
-		print_mac((const char *)data);
-		LOG_DBG("Associated with Soft AP");
-		break;
-	case WLAN_REASON_UAP_CLIENT_CONN:
 		wlan_get_current_uap_network(&nxp_wlan_uap_network);
 #ifdef CONFIG_NXP_WIFI_11AX
 		if (nxp_wlan_uap_network.dot11ax) {
@@ -312,6 +306,12 @@ int nxp_wifi_wlan_event_callback(enum wlan_event_reason reason, void *data)
 		ap_sta_info.twt_capable = status.twt_capable;
 
 		wifi_mgmt_raise_ap_sta_connected_event(g_uap.netif, &ap_sta_info);
+		LOG_DBG("WLAN: UAP a Client Associated");
+		LOG_DBG("Client => ");
+		print_mac((const char *)data);
+		LOG_DBG("Associated with Soft AP");
+		break;
+	case WLAN_REASON_UAP_CLIENT_CONN:
 		LOG_DBG("WLAN: UAP a Client Connected");
 		LOG_DBG("Client => ");
 		print_mac((const char *)data);
@@ -716,7 +716,7 @@ static int nxp_wifi_process_results(unsigned int count)
 		res.security = WIFI_SECURITY_TYPE_NONE;
 
 		if (scan_result.wpa2_entp) {
-			res.security = WIFI_SECURITY_TYPE_EAP_TLS;
+			res.security = WIFI_SECURITY_TYPE_EAP;
 		}
 		if (scan_result.wpa2) {
 			res.security = WIFI_SECURITY_TYPE_PSK;
@@ -730,13 +730,13 @@ static int nxp_wifi_process_results(unsigned int count)
 
 		if (scan_result.wpa3_entp) {
 			res.wpa3_ent_type = WIFI_WPA3_ENTERPRISE_ONLY;
-			res.security = WIFI_SECURITY_TYPE_EAP_TLS;
+			res.security = WIFI_SECURITY_TYPE_EAP;
 		} else if (scan_result.wpa3_1x_sha256) {
 			res.wpa3_ent_type = WIFI_WPA3_ENTERPRISE_SUITEB;
-			res.security = WIFI_SECURITY_TYPE_EAP_TLS;
+			res.security = WIFI_SECURITY_TYPE_EAP;
 		} else if (scan_result.wpa3_1x_sha384) {
 			res.wpa3_ent_type = WIFI_WPA3_ENTERPRISE_SUITEB_192;
-			res.security = WIFI_SECURITY_TYPE_EAP_TLS;
+			res.security = WIFI_SECURITY_TYPE_EAP;
 		}
 
 		if (scan_result.ap_mfpr) {
@@ -1033,6 +1033,25 @@ static int nxp_wifi_disconnect(const struct device *dev)
 	return 0;
 }
 
+#ifdef CONFIG_NXP_WIFI_SOFTAP_SUPPORT
+static int nxp_wifi_uap_disconnect_sta(const struct device *dev, const uint8_t *mac)
+{
+	int ret;
+
+	if (!is_uap_started()) {
+		LOG_ERR("Please start uap first!");
+		return -EAGAIN;
+	}
+
+	ret = wlan_uap_disconnect_sta((uint8_t *)mac);
+	if (ret != WM_SUCCESS) {
+		LOG_ERR("Failed to disconnect STA");
+	}
+
+	return ret;
+}
+#endif
+
 static inline enum wifi_security_type nxp_wifi_key_mgmt_to_zephyr(int key_mgmt, int pwe)
 {
 	switch (key_mgmt) {
@@ -1042,6 +1061,8 @@ static inline enum wifi_security_type nxp_wifi_key_mgmt_to_zephyr(int key_mgmt,
 		return WIFI_SECURITY_TYPE_PSK;
 	case WLAN_KEY_MGMT_PSK_SHA256:
 		return WIFI_SECURITY_TYPE_PSK_SHA256;
+	case WLAN_KEY_MGMT_PSK | WLAN_KEY_MGMT_PSK_SHA256:
+		return WIFI_SECURITY_TYPE_PSK;
 	case WLAN_KEY_MGMT_SAE:
 		if (pwe == 1) {
 			return WIFI_SECURITY_TYPE_SAE_H2E;
@@ -1167,6 +1188,7 @@ static int nxp_wifi_status(const struct device *dev, struct wifi_iface_status *s
 	} else if (connection_state == WLAN_AUTHENTICATED
 			|| connection_state == WLAN_CONNECTED) {
 		status->state = WIFI_STATE_COMPLETED;
+		wlan_ds_rate ds_rate = {0};
 
 		if (!wlan_get_current_network(&nxp_wlan_network)) {
 			strncpy(status->ssid, nxp_wlan_network.ssid, WIFI_SSID_MAX_LEN - 1);
@@ -1216,6 +1238,22 @@ static int nxp_wifi_status(const struct device *dev, struct wifi_iface_status *s
 			status->mfp = nxp_wlan_network.security.mfpr ? WIFI_MFP_REQUIRED :
 				(nxp_wlan_network.security.mfpc ? WIFI_MFP_OPTIONAL : 0);
 		}
+		ds_rate.sub_command = WIFI_DS_GET_DATA_RATE;
+		if (!wlan_get_data_rate(&ds_rate, WLAN_BSS_TYPE_STA)) {
+			wifi_data_rate_t *datarate = (wifi_data_rate_t *)&ds_rate.param.data_rate;
+			int lg_rate[12] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54};
+
+			if (datarate->tx_rate_format == MLAN_RATE_FORMAT_LG &&
+			    datarate->tx_data_rate < 12) {
+				/* Legacy rates (in bps) */
+				/* Need to feed Zephyr L2 Wi-Fi with rate value in unit of Mbps*/
+				status->current_phy_tx_rate = lg_rate[datarate->tx_data_rate];
+			} else if (datarate->tx_rate_format <= 3) {
+				/* HT, VHT, HE rates (in bps) */
+				/* Need to feed Zephyr L2 Wi-Fi with rate value in unit of Mbps*/
+				status->current_phy_tx_rate = (datarate->tx_data_rate >> 1);
+			}
+		}
 	}
 
 	return 0;
@@ -1261,6 +1299,10 @@ static int nxp_wifi_stats(const struct device *dev, struct net_stats_wifi *stats
 	stats->unicast.tx = if_handle->stats.unicast.tx;
 	stats->overrun_count = if_handle->stats.errors.rx + if_handle->stats.errors.tx;
 
+	if (!net_if_is_admin_up(net_if_lookup_by_dev(dev))) {
+		return 0;
+	}
+
 #ifdef CONFIG_NXP_WIFI_GET_LOG
 	wifi_stats = k_malloc(sizeof(wlan_pkt_stats_t));
 	if (!wifi_stats) {
@@ -1309,6 +1351,10 @@ int nxp_wifi_reset_stats(const struct device *dev)
 	/* clear local statistics */
 	memset(&if_handle->stats, 0, sizeof(if_handle->stats));
 
+	if (!net_if_is_admin_up(net_if_lookup_by_dev(dev))) {
+		return 0;
+	}
+
 #ifdef CONFIG_NXP_WIFI_GET_LOG
 	/* store firmware statistics */
 	wifi_stats = k_malloc(sizeof(wlan_pkt_stats_t));
@@ -1409,6 +1455,13 @@ static int nxp_wifi_11k_neighbor_request(const struct device *dev, struct wifi_1
 }
 #endif
 
+#ifdef CONFIG_NXP_WIFI_11V
+static int nxp_wifi_btm_query(const struct device *dev, uint8_t reason)
+{
+	return wlan_host_11v_bss_trans_query(reason);
+}
+#endif
+
 static int nxp_wifi_power_save(const struct device *dev, struct wifi_ps_params *params)
 {
 	int status = NXP_WIFI_RET_SUCCESS;
@@ -2067,6 +2120,9 @@ static const struct wifi_mgmt_ops nxp_wifi_sta_mgmt = {
 #ifdef CONFIG_NXP_WIFI_11K
 	.cfg_11k = nxp_wifi_11k_cfg,
 	.send_11k_neighbor_request = nxp_wifi_11k_neighbor_request,
+#endif
+#ifdef CONFIG_NXP_WIFI_11V
+	.btm_query = nxp_wifi_btm_query,
 #endif
 	.set_power_save = nxp_wifi_power_save,
 	.get_power_save_config = nxp_wifi_get_power_save,
@@ -2153,6 +2209,7 @@ static const struct wifi_mgmt_ops nxp_wifi_uap_mgmt = {
 #ifdef CONFIG_NXP_WIFI_11AX_TWT
 	.set_btwt = nxp_wifi_set_btwt,
 #endif
+	.ap_sta_disconnect = nxp_wifi_uap_disconnect_sta,
 	.set_rts_threshold = nxp_wifi_ap_set_rts_threshold,
 };
 
diff --git a/drivers/wifi/simplelink/simplelink_sockets.c b/drivers/wifi/simplelink/simplelink_sockets.c
index ff96fd91fe3c0..29819ad456486 100644
--- a/drivers/wifi/simplelink/simplelink_sockets.c
+++ b/drivers/wifi/simplelink/simplelink_sockets.c
@@ -674,7 +674,7 @@ static int map_credentials(int sd, const void *optval, socklen_t optlen)
 			case TLS_CREDENTIAL_CA_CERTIFICATE:
 				opt = SL_SO_SECURE_FILES_CA_FILE_NAME;
 				break;
-			case TLS_CREDENTIAL_SERVER_CERTIFICATE:
+			case TLS_CREDENTIAL_PUBLIC_CERTIFICATE:
 				opt = SL_SO_SECURE_FILES_CERTIFICATE_FILE_NAME;
 				break;
 			case TLS_CREDENTIAL_PRIVATE_KEY:
diff --git a/drivers/wifi/siwx91x/Kconfig.siwx91x b/drivers/wifi/siwx91x/Kconfig.siwx91x
index ad059a072a7b3..e1ece13c9b9f5 100644
--- a/drivers/wifi/siwx91x/Kconfig.siwx91x
+++ b/drivers/wifi/siwx91x/Kconfig.siwx91x
@@ -45,4 +45,110 @@ config NET_MGMT_EVENT_STACK_SIZE
 config NET_MGMT_EVENT_QUEUE_SIZE
 	default 10
 
+config WIFI_SILABS_SIWX91X_ENABLE_ROAMING
+	bool "WiFi roaming support"
+	help
+	  Enable this option to configure roaming parameters.
+	  Roaming will be enabled automatically when the
+	  background scan is active, improving connectivity
+	  and performance during transitions between access points.
+
+config WIFI_SILABS_SIWX91X_ROAMING_USE_DEAUTH
+	bool "Use deauth frames for roaming"
+	depends on WIFI_SILABS_SIWX91X_ENABLE_ROAMING
+	help
+	  Enable this option to allow roaming using
+	  deauthentication frames. By default, roaming
+	  is performed using Null data packets.
+
+config WIFI_SILABS_SIWX91X_ROAMING_TRIGGER_LEVEL
+	int "Default value of roam trigger level (in dBm)"
+	default -70
+	range -10 -100
+	depends on WIFI_SILABS_SIWX91X_ENABLE_ROAMING
+	help
+	  Sets the default roam trigger level. Higher values trigger
+	  earlier roaming; lower values delay it. It determines
+	  when to start searching for a new AP.
+
+config WIFI_SILABS_SIWX91X_ROAMING_TRIGGER_LEVEL_CHANGE
+	int "Default value of roam trigger level change (in dBm)"
+	default 5
+	range 0 90
+	depends on WIFI_SILABS_SIWX91X_ENABLE_ROAMING
+	help
+	  Configure the default trigger level change for WiFi roaming.
+	  This value determines the change in signal strength (in dBm)
+	  required to initiate a roaming event. A smaller value may result
+	  in more sensitive roaming behavior, while a larger value can
+	  reduce the frequency of roaming events. It determines
+	  the signal difference needed to switch to a new AP.
+
+config WIFI_SILABS_SIWX91X_ADV_SCAN_THRESHOLD
+	int "Advanced scan threshold (in dBm)"
+	default -40
+	help
+	  Configure the default advanced scan threshold for WiFi scanning.
+	  This value determines the signal strength (in dBm) below which
+	  the advanced scan mechanism will be triggered. Adjust this value
+	  to optimize scanning behavior based on your network environment.
+
+config WIFI_SILABS_SIWX91X_ADV_RSSI_TOLERANCE_THRESHOLD
+	int "Advanced RSSI tolerance threshold (in dBm)"
+	default 5
+	help
+	  Configure the default RSSI tolerance threshold for advanced WiFi scanning.
+	  This value determines the acceptable variation in signal strength (in dBm)
+	  during advanced scanning. Adjust this value to fine-tune the sensitivity
+	  of the scanning mechanism to signal fluctuations.
+
+config WIFI_SILABS_SIWX91X_ADV_ACTIVE_SCAN_DURATION
+	int "Advanced active scan duration (in ms)"
+	default 15
+	help
+	  Configure the default advanced active scan duration for WiFi scanning.
+	  This value determines the time (in milliseconds) spent on each
+	  channel during an advanced active scan. Adjust this value to optimize
+	  scanning speed and accuracy based on your network environment.
+
+config WIFI_SILABS_SIWX91X_ADV_PASSIVE_SCAN_DURATION
+	int "Advanced passive scan duration (in ms)"
+	default 20
+	help
+	  Configure the default advanced passive scan duration for WiFi scanning.
+	  This value determines the time (in milliseconds) spent on each
+	  channel during an advanced passive scan. Adjust this value to optimize
+	  scanning speed and accuracy based on your network environment.
+
+config WIFI_SILABS_SIWX91X_ADV_MULTIPROBE
+	int "Advanced multiprobe setting"
+	default 0
+	help
+	  Configure the advanced multiprobe setting for WiFi scanning.
+	  When set to 1, multiple probe requests will be sent to all access
+	  points in addition to the connected SSID during scanning. Adjust
+	  this value to fine-tune scanning behavior based on your network
+	  requirements.
+
+config WIFI_SILABS_SIWX91X_ADV_SCAN_PERIODICITY
+	int "Advanced scan periodicity (in ms)"
+	default 10
+	help
+	  Configure the default advanced scan periodicity for WiFi scanning.
+	  This value determines the interval (in milliseconds) between consecutive
+	  advanced scans. Adjust this value to balance scanning frequency
+	  and power consumption based on your network environment.
+
+config WIFI_SILABS_SIWX91X_ENABLE_INSTANT_SCAN
+	int "Instant scan support"
+	default 1
+	help
+	  Enable support to start an advanced scan immediately. When enabled, the device
+	  can perform an advanced scan without waiting for the periodic
+	  scan interval, enabling quicker detection of available networks.
+
+# Override the WIFI_MGMT_SCAN_SSID_FILT_MAX parameter for the Wi-Fi subsystem.
+# This device supports filtering scan results for only one SSID.
+config WIFI_MGMT_SCAN_SSID_FILT_MAX
+	default 1
 endif
diff --git a/drivers/wifi/siwx91x/siwx91x_wifi.c b/drivers/wifi/siwx91x/siwx91x_wifi.c
index 6a446e39c5cc6..e86b4f6fd0bb0 100644
--- a/drivers/wifi/siwx91x/siwx91x_wifi.c
+++ b/drivers/wifi/siwx91x/siwx91x_wifi.c
@@ -7,7 +7,9 @@
 
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/version.h>
 
+#include <nwp.h>
 #include "siwx91x_wifi.h"
 #include "siwx91x_wifi_socket.h"
 
@@ -15,13 +17,110 @@
 #include "sl_net_constants.h"
 #include "sl_wifi_types.h"
 #include "sl_wifi_callback_framework.h"
+#include "sl_net_default_values.h"
 #include "sl_wifi.h"
 #include "sl_net.h"
+#include "sl_wifi_constants.h"
+
+#define SIWX91X_DRIVER_VERSION KERNEL_VERSION_STRING
 
 LOG_MODULE_REGISTER(siwx91x_wifi);
 
 NET_BUF_POOL_FIXED_DEFINE(siwx91x_tx_pool, 1, _NET_ETH_MAX_FRAME_SIZE, 0, NULL);
 
+static int siwx91x_sl_to_z_mode(sl_wifi_interface_t interface)
+{
+	switch (interface) {
+	case SL_WIFI_CLIENT_INTERFACE:
+		return WIFI_STA_MODE;
+	case SL_WIFI_AP_INTERFACE:
+		return WIFI_AP_MODE;
+	default:
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int siwx91x_bandwidth(enum wifi_frequency_bandwidths bandwidth)
+{
+	switch (bandwidth) {
+	case WIFI_FREQ_BANDWIDTH_20MHZ:
+		return SL_WIFI_BANDWIDTH_20MHz;
+	case WIFI_FREQ_BANDWIDTH_40MHZ:
+		return SL_WIFI_BANDWIDTH_40MHz;
+	case WIFI_FREQ_BANDWIDTH_80MHZ:
+		return SL_WIFI_BANDWIDTH_80MHz;
+	default:
+		return -EINVAL;
+	}
+}
+
+static int siwx91x_map_ap_security(enum wifi_security_type security)
+{
+	switch (security) {
+	case WIFI_SECURITY_TYPE_NONE:
+		return SL_WIFI_OPEN;
+	case WIFI_SECURITY_TYPE_WPA_PSK:
+		return SL_WIFI_WPA;
+	case WIFI_SECURITY_TYPE_PSK:
+		return SL_WIFI_WPA2;
+	case WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL:
+		return SL_WIFI_WPA_WPA2_MIXED;
+	default:
+		return -EINVAL;
+	}
+}
+
+static enum wifi_mfp_options siwx91x_set_sta_mfp_option(sl_wifi_security_t security,
+							enum wifi_mfp_options mfp_conf)
+{
+	uint8_t join_config;
+
+	switch (security) {
+	case SL_WIFI_OPEN:
+	case SL_WIFI_WPA:
+		return WIFI_MFP_DISABLE;
+	case SL_WIFI_WPA2:
+	case SL_WIFI_WPA_WPA2_MIXED:
+		if (mfp_conf == WIFI_MFP_REQUIRED) {
+			/* Handling the case for WPA2_SHA256 security type */
+			/* Directly enabling the MFP Required bit in the Join Feature
+			 * bitmap. This ensures that MFP is enforced for connections using
+			 * WPA2_SHA256.
+			 *
+			 * Note: This is a workaround to configure MFP as the current SDK
+			 * does not provide a dedicated API to configure MFP settings.
+			 * By manipulating the join feature bitmap directly, we achieve
+			 * the desired MFP configuration for enhanced security.
+			 *
+			 * This case will be updated in the future when the SDK adds
+			 * dedicated support for configuring MFP.
+			 */
+			sl_si91x_get_join_configuration(SL_WIFI_CLIENT_INTERFACE, &join_config);
+			join_config |= SL_SI91X_JOIN_FEAT_MFP_CAPABLE_REQUIRED;
+			sl_si91x_set_join_configuration(SL_WIFI_CLIENT_INTERFACE, join_config);
+			return WIFI_MFP_REQUIRED;
+		}
+		/* Handling the case for WPA2 security type */
+		/* Ensuring the connection happened in WPA2-PSK
+		 * by clearing the MFP Required bit in the Join Feature bitmap.
+		 */
+		sl_si91x_get_join_configuration(SL_WIFI_CLIENT_INTERFACE, &join_config);
+		join_config &= ~(SL_SI91X_JOIN_FEAT_MFP_CAPABLE_REQUIRED);
+		sl_si91x_set_join_configuration(SL_WIFI_CLIENT_INTERFACE, join_config);
+		return WIFI_MFP_OPTIONAL;
+	case SL_WIFI_WPA3:
+		return WIFI_MFP_REQUIRED;
+	case SL_WIFI_WPA3_TRANSITION:
+		return WIFI_MFP_OPTIONAL;
+	default:
+		return WIFI_MFP_DISABLE;
+	}
+
+	return WIFI_MFP_UNKNOWN;
+}
+
 static unsigned int siwx91x_on_join(sl_wifi_event_t event,
 				    char *result, uint32_t result_size, void *arg)
 {
@@ -47,42 +146,187 @@ static unsigned int siwx91x_on_join(sl_wifi_event_t event,
 	return 0;
 }
 
+static int siwx91x_ap_enable(const struct device *dev, struct wifi_connect_req_params *params)
+{
+	struct siwx91x_dev *sidev = dev->data;
+	/* Wiseconnect requires a valid PSK even if WIFI_SECURITY_TYPE_NONE is selected */
+	static const char dummy_psk[] = "dummy_value";
+	sl_status_t ret;
+	int sec;
+
+	sl_wifi_ap_configuration_t siwx91x_ap_cfg = {
+		.credential_id       = SL_NET_DEFAULT_WIFI_AP_CREDENTIAL_ID,
+		.keepalive_type      = SL_SI91X_AP_NULL_BASED_KEEP_ALIVE,
+		.rate_protocol       = SL_WIFI_RATE_PROTOCOL_AUTO,
+		.encryption          = SL_WIFI_DEFAULT_ENCRYPTION,
+		.ssid.length         = params->ssid_length,
+		.tdi_flags           = SL_WIFI_TDI_NONE,
+		.client_idle_timeout = 0xFF,
+		.beacon_interval     = 100,
+		.dtim_beacon_count   = 3,
+		.maximum_clients     = 4,
+		.beacon_stop         = 0,
+		.options             = 0,
+		.is_11n_enabled      = 1,
+	};
+
+	if (params->band != WIFI_FREQ_BAND_UNKNOWN && params->band != WIFI_FREQ_BAND_2_4_GHZ) {
+		return -ENOTSUP;
+	}
+
+	if (params->channel == WIFI_CHANNEL_ANY) {
+		siwx91x_ap_cfg.channel.channel = SL_WIFI_AUTO_CHANNEL;
+	} else {
+		siwx91x_ap_cfg.channel.channel = params->channel;
+	}
+
+	if (siwx91x_bandwidth(params->bandwidth) < 0) {
+		return -EINVAL;
+	}
+
+	siwx91x_ap_cfg.channel.bandwidth = siwx91x_bandwidth(params->bandwidth);
+	strncpy(siwx91x_ap_cfg.ssid.value, params->ssid, params->ssid_length);
+
+	sec = siwx91x_map_ap_security(params->security);
+	if (sec < 0) {
+		LOG_ERR("Invalid security type");
+		return -EINVAL;
+	}
+
+	siwx91x_ap_cfg.security = sec;
+
+	if (params->security == WIFI_SECURITY_TYPE_NONE) {
+		ret = sl_net_set_credential(siwx91x_ap_cfg.credential_id, SL_NET_WIFI_PSK,
+					    dummy_psk, strlen(dummy_psk));
+	} else {
+		ret = sl_net_set_credential(siwx91x_ap_cfg.credential_id, SL_NET_WIFI_PSK,
+					    params->psk, params->psk_length);
+	}
+
+	if (ret != SL_STATUS_OK) {
+		return -EINVAL;
+	}
+
+	if (params->mfp != WIFI_MFP_DISABLE) {
+		LOG_WRN("Needed MFP disable but got MFP %s, hence setting to MFP disable",
+			wifi_mfp_txt(params->mfp));
+	}
+
+	ret = sl_wifi_start_ap(SL_WIFI_AP_INTERFACE | SL_WIFI_2_4GHZ_INTERFACE, &siwx91x_ap_cfg);
+	if (ret != SL_STATUS_OK) {
+		LOG_ERR("Failed to enable AP mode: 0x%x", ret);
+		return -EIO;
+	}
+
+	sidev->state = WIFI_STATE_COMPLETED;
+	return 0;
+}
+
+static int siwx91x_ap_disable(const struct device *dev)
+{
+	struct siwx91x_dev *sidev = dev->data;
+	int ret;
+
+	ret = sl_wifi_stop_ap(SL_WIFI_AP_2_4GHZ_INTERFACE);
+	if (ret) {
+		LOG_ERR("Failed to disable Wi-Fi AP mode: 0x%x", ret);
+		return -EIO;
+	}
+
+	sidev->state = WIFI_STATE_INTERFACE_DISABLED;
+	return ret;
+}
+
+static int siwx91x_ap_sta_disconnect(const struct device *dev, const uint8_t *mac_addr)
+{
+	ARG_UNUSED(dev);
+	sl_mac_address_t mac = { };
+	int ret;
+
+	__ASSERT(mac_addr, "mac_addr cannot be NULL");
+
+	memcpy(mac.octet, mac_addr, ARRAY_SIZE(mac.octet));
+
+	ret = sl_wifi_disconnect_ap_client(SL_WIFI_AP_INTERFACE | SL_WIFI_2_4GHZ_INTERFACE,
+					  &mac, SL_WIFI_DEAUTH);
+	if (ret) {
+		LOG_ERR("Failed	to disconnect: 0x%x", ret);
+		return -EIO;
+	}
+
+	return ret;
+}
+
+static sl_status_t siwx91x_on_ap_sta_connect(sl_wifi_event_t event, void *data,
+					     uint32_t data_length, void *arg)
+{
+	ARG_UNUSED(event);
+	struct siwx91x_dev *sidev = arg;
+	struct wifi_ap_sta_info sta_info = { };
+
+	__ASSERT(data, "data cannot be NULL");
+	__ASSERT(arg, "arg cannot be NULL");
+
+	memcpy(sta_info.mac, data, data_length);
+	sta_info.mac_length = data_length;
+	sta_info.link_mode = WIFI_LINK_MODE_UNKNOWN;
+
+	wifi_mgmt_raise_ap_sta_connected_event(sidev->iface, &sta_info);
+
+	return SL_STATUS_OK;
+}
+
+static sl_status_t siwx91x_on_ap_sta_disconnect(sl_wifi_event_t event, void *data,
+						uint32_t data_length, void *arg)
+{
+	ARG_UNUSED(event);
+	struct siwx91x_dev *sidev = arg;
+	struct wifi_ap_sta_info sta_info = { };
+
+	__ASSERT(data, "data cannot be NULL");
+	__ASSERT(arg, "arg cannot be NULL");
+
+	memcpy(sta_info.mac, data, data_length);
+	sta_info.mac_length = data_length;
+	wifi_mgmt_raise_ap_sta_disconnected_event(sidev->iface, &sta_info);
+
+	return SL_STATUS_OK;
+}
+
 static int siwx91x_connect(const struct device *dev, struct wifi_connect_req_params *params)
 {
 	sl_wifi_client_configuration_t wifi_config = {
 		.bss_type = SL_WIFI_BSS_TYPE_INFRASTRUCTURE,
+		.encryption = SL_WIFI_DEFAULT_ENCRYPTION,
+		.credential_id = SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID,
 	};
-	int ret;
+	enum wifi_mfp_options mfp_conf;
+	int ret = 0;
 
 	switch (params->security) {
 	case WIFI_SECURITY_TYPE_NONE:
 		wifi_config.security = SL_WIFI_OPEN;
-		wifi_config.encryption = SL_WIFI_NO_ENCRYPTION;
 		break;
 	case WIFI_SECURITY_TYPE_WPA_PSK:
 		wifi_config.security = SL_WIFI_WPA;
-		wifi_config.encryption = SL_WIFI_DEFAULT_ENCRYPTION;
-		wifi_config.credential_id = SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID;
 		break;
 	case WIFI_SECURITY_TYPE_PSK:
-		wifi_config.security = SL_WIFI_WPA2;
-		wifi_config.encryption = SL_WIFI_TKIP_ENCRYPTION;
-		wifi_config.credential_id = SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID;
-		break;
+		/* This case is meant to fall through to the next */
 	case WIFI_SECURITY_TYPE_PSK_SHA256:
+		/* Use WPA2 security as the device supports only SHA256
+		 * key derivation for WPA2-PSK
+		 */
 		wifi_config.security = SL_WIFI_WPA2;
-		wifi_config.encryption = SL_WIFI_CCMP_ENCRYPTION;
-		wifi_config.credential_id = SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID;
 		break;
-	case WIFI_SECURITY_TYPE_SAE:
-		/* TODO: Support the case where MFP is not required */
+	case WIFI_SECURITY_TYPE_SAE_AUTO:
+		/* Use WPA3 security as the device supports only HNP and H2E
+		 * methods for SAE
+		 */
 		wifi_config.security = SL_WIFI_WPA3;
-		wifi_config.credential_id = SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID;
 		break;
 	case WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL:
-		wifi_config.security = SL_WIFI_WPA2;
-		wifi_config.encryption = SL_WIFI_DEFAULT_ENCRYPTION;
-		wifi_config.credential_id = SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID;
+		/* Use WPA2/WPA3 security as the device supports both */
+		wifi_config.security = SL_WIFI_WPA3_TRANSITION;
 		break;
 	/* Zephyr WiFi shell doesn't specify how to pass credential for these
 	 * key managements.
@@ -99,13 +343,28 @@ static int siwx91x_connect(const struct device *dev, struct wifi_connect_req_par
 	}
 
 	if (params->psk_length) {
-		sl_net_set_credential(SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID, SL_NET_WIFI_PSK,
-				      params->psk, params->psk_length);
+		ret = sl_net_set_credential(SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID,
+					    SL_NET_WIFI_PSK, params->psk, params->psk_length);
+	} else if (params->sae_password_length) {
+		ret = sl_net_set_credential(SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID,
+					    SL_NET_WIFI_PSK, params->sae_password,
+					    params->sae_password_length);
+	}
+
+	if (ret != SL_STATUS_OK) {
+		LOG_ERR("Failed to set credentials: 0x%x", ret);
+		return -EINVAL;
 	}
 
-	if (params->sae_password_length) {
-		sl_net_set_credential(SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID, SL_NET_WIFI_PSK,
-				      params->sae_password, params->sae_password_length);
+	if (params->security == WIFI_SECURITY_TYPE_PSK_SHA256) {
+		mfp_conf = siwx91x_set_sta_mfp_option(wifi_config.security, WIFI_MFP_REQUIRED);
+	} else {
+		mfp_conf = siwx91x_set_sta_mfp_option(wifi_config.security, params->mfp);
+	}
+
+	if (params->mfp != mfp_conf) {
+		LOG_WRN("Needed MFP %s but got MFP %s, hence setting to MFP %s",
+			wifi_mfp_txt(mfp_conf), wifi_mfp_txt(params->mfp), wifi_mfp_txt(mfp_conf));
 	}
 
 	if (params->channel != WIFI_CHANNEL_ANY) {
@@ -135,7 +394,7 @@ static int siwx91x_disconnect(const struct device *dev)
 	if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X_NET_STACK_NATIVE)) {
 		net_if_dormant_on(sidev->iface);
 	}
-	sidev->state = WIFI_STATE_INACTIVE;
+	sidev->state = WIFI_STATE_DISCONNECTED;
 	return 0;
 }
 
@@ -155,6 +414,7 @@ static void siwx91x_report_scan_res(struct siwx91x_dev *sidev, sl_wifi_scan_resu
 		{ SL_WIFI_WPA_ENTERPRISE,  WIFI_SECURITY_TYPE_EAP     },
 		{ SL_WIFI_WPA2_ENTERPRISE, WIFI_SECURITY_TYPE_EAP     },
 	};
+
 	struct wifi_scan_result tmp = {
 		.channel = result->scan_info[item].rf_channel,
 		.rssi = result->scan_info[item].rssi_val,
@@ -162,16 +422,27 @@ static void siwx91x_report_scan_res(struct siwx91x_dev *sidev, sl_wifi_scan_resu
 		.mac_length = sizeof(result->scan_info[item].bssid),
 		.security = WIFI_SECURITY_TYPE_UNKNOWN,
 		.mfp = WIFI_MFP_UNKNOWN,
-		/* FIXME: fill .mfp, .band and .channel */
+		.band = WIFI_FREQ_BAND_2_4_GHZ,
 	};
 
+	if (result->scan_count == 0) {
+		return;
+	}
+
+	if (result->scan_info[item].rf_channel <= 0 || result->scan_info[item].rf_channel > 14) {
+		LOG_WRN("Unexpected scan result");
+		tmp.band = WIFI_FREQ_BAND_UNKNOWN;
+	}
+
 	memcpy(tmp.ssid, result->scan_info[item].ssid, tmp.ssid_length);
 	memcpy(tmp.mac, result->scan_info[item].bssid, tmp.mac_length);
+
 	ARRAY_FOR_EACH(security_convert, i) {
 		if (security_convert[i].sl_val == result->scan_info[item].security_mode) {
 			tmp.security = security_convert[i].z_val;
 		}
 	}
+
 	sidev->scan_res_cb(sidev->iface, 0, &tmp);
 }
 
@@ -179,43 +450,200 @@ static unsigned int siwx91x_on_scan(sl_wifi_event_t event, sl_wifi_scan_result_t
 				    uint32_t result_size, void *arg)
 {
 	struct siwx91x_dev *sidev = arg;
-	int i;
+	int i, scan_count;
 
 	if (!sidev->scan_res_cb) {
 		return -EFAULT;
 	}
-	for (i = 0; i < result->scan_count; i++) {
+
+	if (event & SL_WIFI_EVENT_FAIL_INDICATION) {
+		memset(result, 0, sizeof(*result));
+	}
+
+	if (sidev->scan_max_bss_cnt) {
+		scan_count = MIN(result->scan_count, sidev->scan_max_bss_cnt);
+	} else {
+		scan_count = result->scan_count;
+	}
+
+	for (i = 0; i < scan_count; i++) {
 		siwx91x_report_scan_res(sidev, result, i);
 	}
+
 	sidev->scan_res_cb(sidev->iface, 0, NULL);
-	sidev->state = WIFI_STATE_INACTIVE;
+	sidev->state = sidev->scan_prev_state;
+
 	return 0;
 }
 
+static int
+siwx91x_configure_scan_dwell_time(sl_wifi_scan_type_t scan_type, uint16_t dwell_time_active,
+				  uint16_t dwell_time_passive,
+				  sl_wifi_advanced_scan_configuration_t *advanced_scan_config)
+{
+	int ret = 0;
+
+	if (dwell_time_active && (dwell_time_active < 5 || dwell_time_active > 1000)) {
+		LOG_ERR("Invalid active scan dwell time");
+		return -EINVAL;
+	}
+
+	if (dwell_time_passive && (dwell_time_passive < 10 || dwell_time_passive > 1000)) {
+		LOG_ERR("Invalid passive scan dwell time");
+		return -EINVAL;
+	}
+
+	switch (scan_type) {
+	case SL_WIFI_SCAN_TYPE_ACTIVE:
+		if (!dwell_time_active) {
+			dwell_time_active = SL_WIFI_DEFAULT_ACTIVE_CHANNEL_SCAN_TIME;
+		}
+		ret = sl_si91x_configure_timeout(SL_SI91X_CHANNEL_ACTIVE_SCAN_TIMEOUT,
+						 dwell_time_active);
+		break;
+	case SL_WIFI_SCAN_TYPE_PASSIVE:
+		if (!dwell_time_passive) {
+			dwell_time_passive = SL_WIFI_DEFAULT_PASSIVE_CHANNEL_SCAN_TIME;
+		}
+		ret = sl_si91x_configure_timeout(SL_SI91X_CHANNEL_PASSIVE_SCAN_TIMEOUT,
+						 dwell_time_passive);
+		break;
+	case SL_WIFI_SCAN_TYPE_ADV_SCAN:
+		__ASSERT(advanced_scan_config, "advanced_scan_config cannot be NULL");
+
+		if (!dwell_time_active) {
+			dwell_time_active = CONFIG_WIFI_SILABS_SIWX91X_ADV_ACTIVE_SCAN_DURATION;
+		}
+		advanced_scan_config->active_channel_time = dwell_time_active;
+
+		if (!dwell_time_passive) {
+			dwell_time_passive = CONFIG_WIFI_SILABS_SIWX91X_ADV_PASSIVE_SCAN_DURATION;
+		}
+		advanced_scan_config->passive_channel_time = dwell_time_passive;
+		break;
+	default:
+		break;
+	}
+
+	return ret;
+}
+
 static int siwx91x_scan(const struct device *dev, struct wifi_scan_params *z_scan_config,
 			scan_result_cb_t cb)
 {
 	sl_wifi_scan_configuration_t sl_scan_config = { };
+	sl_wifi_advanced_scan_configuration_t advanced_scan_config = {
+		.trigger_level = CONFIG_WIFI_SILABS_SIWX91X_ADV_SCAN_THRESHOLD,
+		.trigger_level_change = CONFIG_WIFI_SILABS_SIWX91X_ADV_RSSI_TOLERANCE_THRESHOLD,
+		.enable_multi_probe = CONFIG_WIFI_SILABS_SIWX91X_ADV_MULTIPROBE,
+		.enable_instant_scan = CONFIG_WIFI_SILABS_SIWX91X_ENABLE_INSTANT_SCAN,
+	};
+	sl_wifi_roam_configuration_t roam_configuration = {
+#ifdef CONFIG_WIFI_SILABS_SIWX91X_ENABLE_ROAMING
+		.trigger_level = CONFIG_WIFI_SILABS_SIWX91X_ROAMING_TRIGGER_LEVEL,
+		.trigger_level_change = CONFIG_WIFI_SILABS_SIWX91X_ROAMING_TRIGGER_LEVEL_CHANGE,
+#else
+		.trigger_level = SL_WIFI_NEVER_ROAM,
+		.trigger_level_change = 0,
+#endif
+	};
 	struct siwx91x_dev *sidev = dev->data;
+	sl_wifi_interface_t interface;
+	sl_wifi_ssid_t ssid = { };
 	int ret;
 
 	__ASSERT(z_scan_config, "z_scan_config cannot be NULL");
 
-	if (sidev->state != WIFI_STATE_INACTIVE) {
+	interface = sl_wifi_get_default_interface();
+	if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) != SL_WIFI_CLIENT_INTERFACE) {
+		LOG_ERR("Interface not in STA mode");
+		return -EINVAL;
+	}
+
+	if (sidev->state != WIFI_STATE_DISCONNECTED && sidev->state != WIFI_STATE_INACTIVE &&
+	    sidev->state != WIFI_STATE_COMPLETED) {
+		LOG_ERR("Command given in invalid state");
 		return -EBUSY;
 	}
 
-	/* The enum values are same, no conversion needed */
-	sl_scan_config.type = z_scan_config->scan_type;
+	if (z_scan_config->bands & ~(BIT(WIFI_FREQ_BAND_UNKNOWN) | BIT(WIFI_FREQ_BAND_2_4_GHZ))) {
+		LOG_ERR("Invalid band entered");
+		return -EINVAL;
+	}
 
-	sl_scan_config.channel_bitmap_2g4 = 0xFFFF;
-	memset(sl_scan_config.channel_bitmap_5g, 0xFF, sizeof(sl_scan_config.channel_bitmap_5g));
+	if (sidev->state == WIFI_STATE_COMPLETED) {
+		siwx91x_configure_scan_dwell_time(SL_WIFI_SCAN_TYPE_ADV_SCAN,
+						  z_scan_config->dwell_time_active,
+						  z_scan_config->dwell_time_passive,
+						  &advanced_scan_config);
 
+		ret = sl_wifi_set_advanced_scan_configuration(&advanced_scan_config);
+		if (ret != SL_STATUS_OK) {
+			LOG_ERR("advanced scan configuration failed with status %x", ret);
+			return -EINVAL;
+		}
+
+		ret = sl_wifi_set_roam_configuration(interface, &roam_configuration);
+		if (ret != SL_STATUS_OK) {
+			LOG_ERR("roaming configuration failed with status %x", ret);
+			return -EINVAL;
+		}
+
+		sl_scan_config.type = SL_WIFI_SCAN_TYPE_ADV_SCAN;
+		sl_scan_config.periodic_scan_interval =
+			CONFIG_WIFI_SILABS_SIWX91X_ADV_SCAN_PERIODICITY;
+	} else {
+		if (z_scan_config->scan_type == WIFI_SCAN_TYPE_ACTIVE) {
+			sl_scan_config.type = SL_WIFI_SCAN_TYPE_ACTIVE;
+			ret = siwx91x_configure_scan_dwell_time(SL_WIFI_SCAN_TYPE_ACTIVE,
+								z_scan_config->dwell_time_active,
+								z_scan_config->dwell_time_passive,
+								NULL);
+		} else {
+			sl_scan_config.type = SL_WIFI_SCAN_TYPE_PASSIVE;
+			ret = siwx91x_configure_scan_dwell_time(SL_WIFI_SCAN_TYPE_PASSIVE,
+								z_scan_config->dwell_time_active,
+								z_scan_config->dwell_time_passive,
+								NULL);
+		}
+		if (ret != SL_STATUS_OK) {
+			LOG_ERR("Failed to configure timeout");
+			return -EINVAL;
+		}
+	}
+
+	for (int i = 0; i < ARRAY_SIZE(z_scan_config->band_chan); i++) {
+		/* End of channel list */
+		if (z_scan_config->band_chan[i].channel == 0) {
+			break;
+		}
+
+		if (z_scan_config->band_chan[i].band == WIFI_FREQ_BAND_2_4_GHZ) {
+			sl_scan_config.channel_bitmap_2g4 |=
+				BIT(z_scan_config->band_chan[i].channel - 1);
+		}
+	}
+
+	if (z_scan_config->band_chan[0].channel && !sl_scan_config.channel_bitmap_2g4) {
+		LOG_ERR("No supported channels in the request");
+		return -EINVAL;
+	}
+
+	if (IS_ENABLED(CONFIG_WIFI_MGMT_SCAN_SSID_FILT_MAX)) {
+		if (z_scan_config->ssids[0]) {
+			strncpy(ssid.value, z_scan_config->ssids[0], WIFI_SSID_MAX_LEN);
+			ssid.length = strlen(z_scan_config->ssids[0]);
+		}
+	}
+
+	sidev->scan_max_bss_cnt = z_scan_config->max_bss_cnt;
 	sidev->scan_res_cb = cb;
-	ret = sl_wifi_start_scan(SL_WIFI_CLIENT_INTERFACE, NULL, &sl_scan_config);
+	ret = sl_wifi_start_scan(SL_WIFI_CLIENT_2_4GHZ_INTERFACE, (ssid.length > 0) ? &ssid : NULL,
+				 &sl_scan_config);
 	if (ret != SL_STATUS_IN_PROGRESS) {
 		return -EIO;
 	}
+	sidev->scan_prev_state = sidev->state;
 	sidev->state = WIFI_STATE_SCANNING;
 
 	return 0;
@@ -223,13 +651,148 @@ static int siwx91x_scan(const struct device *dev, struct wifi_scan_params *z_sca
 
 static int siwx91x_status(const struct device *dev, struct wifi_iface_status *status)
 {
+	sl_si91x_rsp_wireless_info_t wlan_info = { };
 	struct siwx91x_dev *sidev = dev->data;
-	int32_t rssi = -1;
+	uint8_t join_config;
+	sl_wifi_interface_t interface;
+	int32_t rssi;
+	int ret;
+
+	__ASSERT(status, "status cannot be NULL");
 
 	memset(status, 0, sizeof(*status));
+
 	status->state = sidev->state;
-	sl_wifi_get_signal_strength(SL_WIFI_CLIENT_INTERFACE, &rssi);
-	status->rssi = rssi;
+	if (sidev->state <= WIFI_STATE_INACTIVE) {
+		return 0;
+	}
+
+	interface = sl_wifi_get_default_interface();
+	ret = sl_wifi_get_wireless_info(&wlan_info);
+	if (ret) {
+		LOG_ERR("Failed to get the wireless info: 0x%x", ret);
+		return -EIO;
+	}
+
+	strncpy(status->ssid, wlan_info.ssid, WIFI_SSID_MAX_LEN);
+	status->ssid_len = strlen(status->ssid);
+	memcpy(status->bssid, wlan_info.mac_address, WIFI_MAC_ADDR_LEN);
+	status->wpa3_ent_type = WIFI_WPA3_ENTERPRISE_NA;
+
+	ret = sl_si91x_get_join_configuration(interface, &join_config);
+	if (ret != SL_STATUS_OK) {
+		LOG_ERR("Failed to get join configuration: 0x%x", ret);
+		return -EINVAL;
+	}
+
+	if (join_config & SL_SI91X_JOIN_FEAT_MFP_CAPABLE_REQUIRED) {
+		status->mfp = WIFI_MFP_REQUIRED;
+	} else if (join_config & SL_SI91X_JOIN_FEAT_MFP_CAPABLE_ONLY) {
+		status->mfp = WIFI_MFP_OPTIONAL;
+	} else {
+		status->mfp = WIFI_MFP_DISABLE;
+	}
+
+	if (interface & SL_WIFI_2_4GHZ_INTERFACE) {
+		status->band = WIFI_FREQ_BAND_2_4_GHZ;
+	}
+
+	if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) == SL_WIFI_CLIENT_INTERFACE) {
+		sl_wifi_operational_statistics_t operational_statistics = { };
+
+		status->link_mode = WIFI_LINK_MODE_UNKNOWN;
+		status->iface_mode = WIFI_MODE_INFRA;
+		status->channel = wlan_info.channel_number;
+		status->twt_capable = true;
+		ret = sl_wifi_get_signal_strength(SL_WIFI_CLIENT_INTERFACE, &rssi);
+		if (ret) {
+			LOG_ERR("Failed to get signal strength: 0x%x", ret);
+			return -EINVAL;
+		}
+		status->rssi = rssi;
+
+		ret = sl_wifi_get_operational_statistics(SL_WIFI_CLIENT_INTERFACE,
+							 &operational_statistics);
+		if (ret) {
+			LOG_ERR("Failed to get operational statistics: 0x%x", ret);
+			return -EINVAL;
+		}
+
+		status->beacon_interval = sys_get_le16(operational_statistics.beacon_interval);
+		status->dtim_period = operational_statistics.dtim_period;
+	} else if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) == SL_WIFI_AP_INTERFACE) {
+		sl_wifi_ap_configuration_t sl_ap_cfg = { };
+
+		ret = sl_wifi_get_ap_configuration(SL_WIFI_AP_INTERFACE, &sl_ap_cfg);
+		if (ret) {
+			LOG_ERR("Failed to get the AP configuration: 0x%x", ret);
+			return -EINVAL;
+		}
+
+		status->twt_capable = false;
+		status->link_mode = WIFI_4;
+		status->iface_mode = WIFI_MODE_AP;
+		status->channel = sl_ap_cfg.channel.channel;
+		status->beacon_interval = sl_ap_cfg.beacon_interval;
+		status->dtim_period = sl_ap_cfg.dtim_beacon_count;
+		wlan_info.sec_type = (uint8_t)sl_ap_cfg.security;
+	} else {
+		status->link_mode = WIFI_LINK_MODE_UNKNOWN;
+		status->iface_mode = WIFI_MODE_UNKNOWN;
+		status->channel = 0;
+
+		return -EINVAL;
+	}
+
+	switch (wlan_info.sec_type) {
+	case SL_WIFI_OPEN:
+		status->security = WIFI_SECURITY_TYPE_NONE;
+		break;
+	case SL_WIFI_WPA:
+		status->security = WIFI_SECURITY_TYPE_WPA_PSK;
+		break;
+	case SL_WIFI_WPA2:
+		status->security = WIFI_SECURITY_TYPE_PSK;
+		break;
+	case SL_WIFI_WPA_WPA2_MIXED:
+		status->security = WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL;
+		break;
+	case SL_WIFI_WPA3:
+		status->security = WIFI_SECURITY_TYPE_SAE;
+		break;
+	default:
+		status->security = WIFI_SECURITY_TYPE_UNKNOWN;
+	}
+
+	return ret;
+}
+
+static int siwx91x_mode(const struct device *dev, struct wifi_mode_info *mode)
+{
+	sl_wifi_interface_t interface = sl_wifi_get_default_interface();
+	struct siwx91x_dev *sidev = dev->data;
+	int cur_mode;
+	int ret = 0;
+
+	__ASSERT(mode, "mode cannot be NULL");
+
+	cur_mode = siwx91x_sl_to_z_mode(FIELD_GET(SIWX91X_INTERFACE_MASK, interface));
+	if (cur_mode < 0) {
+		return -EIO;
+	}
+
+	if (mode->oper == WIFI_MGMT_GET) {
+		mode->mode = cur_mode;
+	} else if (mode->oper == WIFI_MGMT_SET) {
+		if (cur_mode != mode->mode) {
+			ret = siwx91x_nwp_mode_switch(mode->mode);
+			if (ret < 0) {
+				return ret;
+			}
+		}
+		sidev->state = WIFI_STATE_INACTIVE;
+	}
+
 	return 0;
 }
 
@@ -257,6 +820,7 @@ static int siwx91x_send(const struct device *dev, struct net_pkt *pkt)
 
 	ret = sl_wifi_send_raw_data_frame(SL_WIFI_CLIENT_INTERFACE, buf->data, pkt_len);
 	if (ret) {
+		net_buf_unref(buf);
 		return -EIO;
 	}
 
@@ -310,6 +874,65 @@ static void siwx91x_ethernet_init(struct net_if *iface)
 	}
 }
 
+#if defined(CONFIG_NET_STATISTICS_WIFI)
+static int siwx91x_stats(const struct device *dev, struct net_stats_wifi *stats)
+{
+	ARG_UNUSED(dev);
+	sl_wifi_interface_t interface;
+	sl_wifi_statistics_t statistics = { };
+	int ret;
+
+	__ASSERT(stats, "stats cannot be NULL");
+
+	interface = sl_wifi_get_default_interface();
+	ret = sl_wifi_get_statistics(FIELD_GET(SIWX91X_INTERFACE_MASK, interface), &statistics);
+	if (ret) {
+		LOG_ERR("Failed to get stat: 0x%x", ret);
+		return -EINVAL;
+	}
+
+	stats->multicast.rx = statistics.mcast_rx_count;
+	stats->multicast.tx = statistics.mcast_tx_count;
+	stats->unicast.rx = statistics.ucast_rx_count;
+	stats->unicast.tx = statistics.ucast_tx_count;
+	stats->sta_mgmt.beacons_rx = statistics.beacon_rx_count;
+	stats->sta_mgmt.beacons_miss = statistics.beacon_lost_count;
+	stats->overrun_count = statistics.overrun_count;
+
+	return ret;
+}
+#endif
+
+static int siwx91x_get_version(const struct device *dev, struct wifi_version *params)
+{
+	sl_wifi_firmware_version_t fw_version = { };
+	struct siwx91x_dev *sidev = dev->data;
+	static char fw_version_str[32];
+	sl_status_t status;
+
+	__ASSERT(params, "params cannot be NULL");
+
+	if (sidev->state == WIFI_STATE_INTERFACE_DISABLED) {
+		return -EIO;
+	}
+
+	status = sl_wifi_get_firmware_version(&fw_version);
+	if (status != SL_STATUS_OK) {
+		return -EINVAL;
+	}
+
+	snprintf(fw_version_str, sizeof(fw_version_str), "%02x%02x.%d.%d.%d.%d.%d.%d",
+		 fw_version.chip_id,     fw_version.rom_id,
+		 fw_version.major,       fw_version.minor,
+		 fw_version.security_version, fw_version.patch_num,
+		 fw_version.customer_id, fw_version.build_num);
+
+	params->fw_version = fw_version_str;
+	params->drv_version = SIWX91X_DRIVER_VERSION;
+
+	return 0;
+}
+
 static void siwx91x_iface_init(struct net_if *iface)
 {
 	struct siwx91x_dev *sidev = iface->if_dev->dev->data;
@@ -318,8 +941,13 @@ static void siwx91x_iface_init(struct net_if *iface)
 	sidev->state = WIFI_STATE_INTERFACE_DISABLED;
 	sidev->iface = iface;
 
-	sl_wifi_set_scan_callback(siwx91x_on_scan, sidev);
-	sl_wifi_set_join_callback(siwx91x_on_join, sidev);
+	sl_wifi_set_callback(SL_WIFI_SCAN_RESULT_EVENTS,
+			     (sl_wifi_callback_function_t)siwx91x_on_scan, sidev);
+	sl_wifi_set_callback(SL_WIFI_JOIN_EVENTS, (sl_wifi_callback_function_t)siwx91x_on_join,
+			     sidev);
+	sl_wifi_set_callback(SL_WIFI_CLIENT_CONNECTED_EVENTS, siwx91x_on_ap_sta_connect, sidev);
+	sl_wifi_set_callback(SL_WIFI_CLIENT_DISCONNECTED_EVENTS, siwx91x_on_ap_sta_disconnect,
+			     sidev);
 
 	status = sl_wifi_get_mac_address(SL_WIFI_CLIENT_INTERFACE, &sidev->macaddr);
 	if (status) {
@@ -340,10 +968,18 @@ static int siwx91x_dev_init(const struct device *dev)
 }
 
 static const struct wifi_mgmt_ops siwx91x_mgmt = {
-	.scan         = siwx91x_scan,
-	.connect      = siwx91x_connect,
-	.disconnect   = siwx91x_disconnect,
-	.iface_status = siwx91x_status,
+	.scan			= siwx91x_scan,
+	.connect		= siwx91x_connect,
+	.disconnect		= siwx91x_disconnect,
+	.ap_enable		= siwx91x_ap_enable,
+	.ap_disable		= siwx91x_ap_disable,
+	.ap_sta_disconnect	= siwx91x_ap_sta_disconnect,
+	.iface_status		= siwx91x_status,
+	.mode			= siwx91x_mode,
+#if defined(CONFIG_NET_STATISTICS_WIFI)
+	.get_stats		= siwx91x_stats,
+#endif
+	.get_version		= siwx91x_get_version,
 };
 
 static const struct net_wifi_mgmt_offload siwx91x_api = {
diff --git a/drivers/wifi/siwx91x/siwx91x_wifi.h b/drivers/wifi/siwx91x/siwx91x_wifi.h
index e08f4e7f7ebc5..045e798076582 100644
--- a/drivers/wifi/siwx91x/siwx91x_wifi.h
+++ b/drivers/wifi/siwx91x/siwx91x_wifi.h
@@ -18,7 +18,9 @@ struct siwx91x_dev {
 	struct net_if *iface;
 	sl_mac_address_t macaddr;
 	enum wifi_iface_state state;
+	enum wifi_iface_state scan_prev_state;
 	scan_result_cb_t scan_res_cb;
+	uint16_t scan_max_bss_cnt;
 
 #ifdef CONFIG_WIFI_SILABS_SIWX91X_NET_STACK_OFFLOAD
 	struct k_event fds_recv_event;
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 361c71a3538d0..99ad113887b12 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (c) 2022-2023 EPAM Systems
+# Copyright (c) 2022-2024 EPAM Systems
 
 if XEN
 
@@ -20,6 +20,15 @@ config XEN_GRANT_TABLE_INIT_PRIORITY
 	depends on XEN_GRANT_TABLE
 	default 50
 
+config NR_GRANT_FRAMES
+	int "Number of grant frames mapped to Zephyr"
+	depends on XEN_GRANT_TABLE
+	default 1
+	help
+	  This value configures how much grant frames will be supported by Zephyr
+	  grant table driver in runtime. This value should be <= max_grant_frames
+	  configured for domain in Xen hypervisor.
+
 endmenu
 
 endif # XEN
diff --git a/drivers/xen/gnttab.c b/drivers/xen/gnttab.c
index 8ceb97e2db125..ccf1b888e17a6 100644
--- a/drivers/xen/gnttab.c
+++ b/drivers/xen/gnttab.c
@@ -2,7 +2,7 @@
 /*
  ****************************************************************************
  * (C) 2006 - Cambridge University
- * (C) 2021-2022 - EPAM Systems
+ * (C) 2021-2024 - EPAM Systems
  ****************************************************************************
  *
  *        File: gnttab.c
@@ -35,16 +35,13 @@ LOG_MODULE_REGISTER(xen_gnttab);
 /* Timeout for grant table ops retrying */
 #define GOP_RETRY_DELAY 200
 
-#define GNTTAB_SIZE DT_REG_SIZE_BY_IDX(DT_INST(0, xen_xen), 0)
-BUILD_ASSERT(!(GNTTAB_SIZE % XEN_PAGE_SIZE), "Size of gnttab have to be aligned on XEN_PAGE_SIZE");
-
-/* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
-#define NR_GRANT_FRAMES (GNTTAB_SIZE / XEN_PAGE_SIZE)
-#define NR_GRANT_ENTRIES \
-	(NR_GRANT_FRAMES * XEN_PAGE_SIZE / sizeof(grant_entry_v1_t))
+#define GNTTAB_GREF_USED	(UINT32_MAX - 1)
+#define GNTTAB_SIZE		(CONFIG_NR_GRANT_FRAMES * XEN_PAGE_SIZE)
+#define NR_GRANT_ENTRIES	(GNTTAB_SIZE / sizeof(grant_entry_v1_t))
 
+BUILD_ASSERT(GNTTAB_SIZE <= DT_REG_SIZE_BY_IDX(DT_INST(0, xen_xen), 0),
+	     "Number of grant frames is bigger than grant table DT region!");
 BUILD_ASSERT(GNTTAB_SIZE <= CONFIG_KERNEL_VM_SIZE);
-DEVICE_MMIO_TOPLEVEL_STATIC(grant_tables, DT_INST(0, xen_xen));
 
 static struct gnttab {
 	struct k_sem sem;
@@ -64,6 +61,7 @@ static grant_ref_t get_free_entry(void)
 	__ASSERT((gref >= GNTTAB_NR_RESERVED_ENTRIES &&
 		gref < NR_GRANT_ENTRIES), "Invalid gref = %d", gref);
 	gnttab.gref_list[0] = gnttab.gref_list[gref];
+	gnttab.gref_list[gref] = GNTTAB_GREF_USED;
 	irq_unlock(flags);
 
 	return gref;
@@ -74,6 +72,12 @@ static void put_free_entry(grant_ref_t gref)
 	unsigned int flags;
 
 	flags = irq_lock();
+	if (gnttab.gref_list[gref] != GNTTAB_GREF_USED) {
+		LOG_WRN("Trying to put already free gref = %u", gref);
+
+		return;
+	}
+
 	gnttab.gref_list[gref] = gnttab.gref_list[0];
 	gnttab.gref_list[0] = gref;
 
@@ -277,7 +281,7 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, unsigned int count)
 	return 0;
 }
 
-int gnttab_unmap_refs(struct gnttab_map_grant_ref *unmap_ops, unsigned int count)
+int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, unsigned int count)
 {
 	return HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap_ops, count);
 }
@@ -295,44 +299,68 @@ const char *gnttabop_error(int16_t status)
 	}
 }
 
+/* Picked from Linux implementation */
+#define LEGACY_MAX_GNT_FRAMES_SUPPORTED		4
+static unsigned long gnttab_get_max_frames(void)
+{
+	int ret;
+	struct gnttab_query_size q = {
+		.dom = DOMID_SELF,
+	};
+
+	ret = HYPERVISOR_grant_table_op(GNTTABOP_query_size, &q, 1);
+	if ((ret < 0) || (q.status != GNTST_okay)) {
+		return LEGACY_MAX_GNT_FRAMES_SUPPORTED;
+	}
+
+	return q.max_nr_frames;
+}
+
 static int gnttab_init(void)
 {
 	grant_ref_t gref;
 	struct xen_add_to_physmap xatp;
-	struct gnttab_setup_table setup;
-	xen_pfn_t frames[NR_GRANT_FRAMES];
 	int rc = 0, i;
+	unsigned long xen_max_grant_frames;
+	uintptr_t gnttab_base = DT_REG_ADDR_BY_IDX(DT_INST(0, xen_xen), 0);
+	mm_reg_t gnttab_reg;
+
+	xen_max_grant_frames = gnttab_get_max_frames();
+	if (xen_max_grant_frames < CONFIG_NR_GRANT_FRAMES) {
+		LOG_ERR("Xen max_grant_frames is less than CONFIG_NR_GRANT_FRAMES!");
+		k_panic();
+	}
 
 	/* Will be taken/given during gnt_refs allocation/release */
-	k_sem_init(&gnttab.sem, 0, NR_GRANT_ENTRIES - GNTTAB_NR_RESERVED_ENTRIES);
-
-	for (
-		gref = GNTTAB_NR_RESERVED_ENTRIES;
-		gref < NR_GRANT_ENTRIES;
-		gref++
-	    ) {
-		put_free_entry(gref);
+	k_sem_init(&gnttab.sem, NR_GRANT_ENTRIES - GNTTAB_NR_RESERVED_ENTRIES,
+		   NR_GRANT_ENTRIES - GNTTAB_NR_RESERVED_ENTRIES);
+
+	/* Initialize O(1) allocator, gnttab.gref_list[0] always shows first free entry */
+	gnttab.gref_list[0] = GNTTAB_NR_RESERVED_ENTRIES;
+	gnttab.gref_list[NR_GRANT_ENTRIES - 1] = 0;
+	for (gref = GNTTAB_NR_RESERVED_ENTRIES; gref < NR_GRANT_ENTRIES - 1; gref++) {
+		gnttab.gref_list[gref] = gref + 1;
 	}
 
-	for (i = 0; i < NR_GRANT_FRAMES; i++) {
+	for (i = CONFIG_NR_GRANT_FRAMES - 1; i >= 0; i--) {
 		xatp.domid = DOMID_SELF;
 		xatp.size = 0;
 		xatp.space = XENMAPSPACE_grant_table;
 		xatp.idx = i;
-		xatp.gpfn = xen_virt_to_gfn(Z_TOPLEVEL_ROM_NAME(grant_tables).phys_addr) + i;
+		xatp.gpfn = xen_virt_to_gfn(gnttab_base) + i;
 		rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp);
 		__ASSERT(!rc, "add_to_physmap failed; status = %d\n", rc);
 	}
 
-	setup.dom = DOMID_SELF;
-	setup.nr_frames = NR_GRANT_FRAMES;
-	set_xen_guest_handle(setup.frame_list, frames);
-	rc = HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1);
-	__ASSERT((!rc) && (!setup.status), "Table setup failed; status = %s\n",
-		gnttabop_error(setup.status));
-
-	DEVICE_MMIO_TOPLEVEL_MAP(grant_tables, K_MEM_CACHE_WB | K_MEM_PERM_RW);
-	gnttab.table = (grant_entry_v1_t *)DEVICE_MMIO_TOPLEVEL_GET(grant_tables);
+	/*
+	 * Xen DT region reserved for grant table (first reg in hypervisor node)
+	 * may be much bigger than CONFIG_NR_GRANT_FRAMES multiplied by page size.
+	 * Thus, we need to map only part of region, that is limited by config.
+	 * The size of this part is calculated in GNTTAB_SIZE macro and used as
+	 * parameter for device_map()
+	 */
+	device_map(&gnttab_reg, gnttab_base, GNTTAB_SIZE, K_MEM_CACHE_WB | K_MEM_PERM_RW);
+	gnttab.table = (grant_entry_v1_t *)gnttab_reg;
 
 	LOG_DBG("%s: grant table mapped\n", __func__);
 
diff --git a/dts/arm/adi/max32/max32650-pinctrl.dtsi b/dts/arm/adi/max32/max32650-pinctrl.dtsi
new file mode 100644
index 0000000000000..eaf39132953a2
--- /dev/null
+++ b/dts/arm/adi/max32/max32650-pinctrl.dtsi
@@ -0,0 +1,641 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/max32-pinctrl.h>
+
+/ {
+	soc {
+		pinctrl: pin-controller@40008000 {
+			/omit-if-no-ref/ spixr_sdio0_p0_1: spixr_sdio0_p0_1 {
+				pinmux = <MAX32_PINMUX(0, 1, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sdio2_p0_2: spixr_sdio2_p0_2 {
+				pinmux = <MAX32_PINMUX(0, 2, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sck_p0_3: spixr_sck_p0_3 {
+				pinmux = <MAX32_PINMUX(0, 3, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sdio3_p0_4: spixr_sdio3_p0_4 {
+				pinmux = <MAX32_PINMUX(0, 4, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sdio1_p0_5: spixr_sdio1_p0_5 {
+				pinmux = <MAX32_PINMUX(0, 5, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_ss0_p0_6: spixr_ss0_p0_6 {
+				pinmux = <MAX32_PINMUX(0, 6, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_ss0_p0_7: spixf_ss0_p0_7 {
+				pinmux = <MAX32_PINMUX(0, 7, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sck_p0_8: spixf_sck_p0_8 {
+				pinmux = <MAX32_PINMUX(0, 8, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sdio1_p0_9: spixf_sdio1_p0_9 {
+				pinmux = <MAX32_PINMUX(0, 9, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sdio0_p0_10: spixf_sdio0_p0_10 {
+				pinmux = <MAX32_PINMUX(0, 10, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sdio2_p0_11: spixf_sdio2_p0_11 {
+				pinmux = <MAX32_PINMUX(0, 11, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sdio3_p0_12: spixf_sdio3_p0_12 {
+				pinmux = <MAX32_PINMUX(0, 12, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi3_ss1_p0_13: spi3_ss1_p0_13 {
+				pinmux = <MAX32_PINMUX(0, 13, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g0_p0_13: clcd_g0_p0_13 {
+				pinmux = <MAX32_PINMUX(0, 13, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_ss2_p0_14: spi3_ss2_p0_14 {
+				pinmux = <MAX32_PINMUX(0, 14, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g1_p0_14: clcd_g1_p0_14 {
+				pinmux = <MAX32_PINMUX(0, 14, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_sdio3_p0_15: spi3_sdio3_p0_15 {
+				pinmux = <MAX32_PINMUX(0, 15, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g2_p0_15: clcd_g2_p0_15 {
+				pinmux = <MAX32_PINMUX(0, 15, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_sck_p0_16: spi3_sck_p0_16 {
+				pinmux = <MAX32_PINMUX(0, 16, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g3_p0_16: clcd_g3_p0_16 {
+				pinmux = <MAX32_PINMUX(0, 16, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_sdio2_p0_17: spi3_sdio2_p0_17 {
+				pinmux = <MAX32_PINMUX(0, 17, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g4_p0_17: clcd_g4_p0_17 {
+				pinmux = <MAX32_PINMUX(0, 17, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_ss3_p0_18: spi3_ss3_p0_18 {
+				pinmux = <MAX32_PINMUX(0, 18, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g5_p0_18: clcd_g5_p0_18 {
+				pinmux = <MAX32_PINMUX(0, 18, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_ss0_p0_19: spi3_ss0_p0_19 {
+				pinmux = <MAX32_PINMUX(0, 19, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g6_p0_19: clcd_g6_p0_19 {
+				pinmux = <MAX32_PINMUX(0, 19, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_sdio1_p0_20: spi3_sdio1_p0_20 {
+				pinmux = <MAX32_PINMUX(0, 20, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_g7_p0_20: clcd_g7_p0_20 {
+				pinmux = <MAX32_PINMUX(0, 20, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi3_sdio0_p0_21: spi3_sdio0_p0_21 {
+				pinmux = <MAX32_PINMUX(0, 21, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi0_ss0_p0_22: spi0_ss0_p0_22 {
+				pinmux = <MAX32_PINMUX(0, 22, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_vden_p0_22: clcd_vden_p0_22 {
+				pinmux = <MAX32_PINMUX(0, 22, AF2)>;
+			};
+
+			/omit-if-no-ref/ pt15_p0_23: pt15_p0_23 {
+				pinmux = <MAX32_PINMUX(0, 23, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_clk_p0_23: clcd_clk_p0_23 {
+				pinmux = <MAX32_PINMUX(0, 23, AF2)>;
+			};
+
+			/omit-if-no-ref/ rxev_p0_24: rxev_p0_24 {
+				pinmux = <MAX32_PINMUX(0, 24, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_hsync_p0_24: clcd_hsync_p0_24 {
+				pinmux = <MAX32_PINMUX(0, 24, AF2)>;
+			};
+
+			/omit-if-no-ref/ txev_p0_25: txev_p0_25 {
+				pinmux = <MAX32_PINMUX(0, 25, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b0_p0_25: clcd_b0_p0_25 {
+				pinmux = <MAX32_PINMUX(0, 25, AF2)>;
+			};
+
+			/omit-if-no-ref/ tdi_p0_26: tdi_p0_26 {
+				pinmux = <MAX32_PINMUX(0, 26, AF1)>;
+			};
+
+			/omit-if-no-ref/ tdo_p0_27: tdo_p0_27 {
+				pinmux = <MAX32_PINMUX(0, 27, AF1)>;
+			};
+
+			/omit-if-no-ref/ tms_p0_28: tms_p0_28 {
+				pinmux = <MAX32_PINMUX(0, 28, AF1)>;
+			};
+
+			/omit-if-no-ref/ tck_p0_29: tck_p0_29 {
+				pinmux = <MAX32_PINMUX(0, 29, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b0_p0_30: clcd_b0_p0_30 {
+				pinmux = <MAX32_PINMUX(0, 30, AF2)>;
+			};
+
+			/omit-if-no-ref/ kcal32_p0_31: kcal32_p0_31 {
+				pinmux = <MAX32_PINMUX(0, 31, AF1)>;
+			};
+
+			/omit-if-no-ref/ sdhc_cdn_p0_31: sdhc_cdn_p0_31 {
+				pinmux = <MAX32_PINMUX(0, 31, AF2)>;
+			};
+
+			/omit-if-no-ref/ sdhc_cmd_p1_0: sdhc_cmd_p1_0 {
+				pinmux = <MAX32_PINMUX(1, 0, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sdio3_p1_0: spixf_sdio3_p1_0 {
+				pinmux = <MAX32_PINMUX(1, 0, AF2)>;
+			};
+
+			/omit-if-no-ref/ sdhc_dat2_p1_1: sdhc_dat2_p1_1 {
+				pinmux = <MAX32_PINMUX(1, 1, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sdio1_p1_1: spixf_sdio1_p1_1 {
+				pinmux = <MAX32_PINMUX(1, 1, AF2)>;
+			};
+
+			/omit-if-no-ref/ sdhc_wp_p1_2: sdhc_wp_p1_2 {
+				pinmux = <MAX32_PINMUX(1, 2, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_ss0_p1_2: spixf_ss0_p1_2 {
+				pinmux = <MAX32_PINMUX(1, 2, AF2)>;
+			};
+
+			/omit-if-no-ref/ sdhc_dat3_p1_3: sdhc_dat3_p1_3 {
+				pinmux = <MAX32_PINMUX(1, 3, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_clk_p1_3: clcd_clk_p1_3 {
+				pinmux = <MAX32_PINMUX(1, 3, AF2)>;
+			};
+
+			/omit-if-no-ref/ sdhc_dat0_p1_4: sdhc_dat0_p1_4 {
+				pinmux = <MAX32_PINMUX(1, 4, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sdio0_p1_4: spixf_sdio0_p1_4 {
+				pinmux = <MAX32_PINMUX(1, 4, AF2)>;
+			};
+
+			/omit-if-no-ref/ sdhc_clk_p1_5: sdhc_clk_p1_5 {
+				pinmux = <MAX32_PINMUX(1, 5, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixf_sck_p1_5: spixf_sck_p1_5 {
+				pinmux = <MAX32_PINMUX(1, 5, AF2)>;
+			};
+
+			/omit-if-no-ref/ sdhc_dat1_p1_6: sdhc_dat1_p1_6 {
+				pinmux = <MAX32_PINMUX(1, 6, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt0_p1_6: pt0_p1_6 {
+				pinmux = <MAX32_PINMUX(1, 6, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart2_cts_p1_7: uart2_cts_p1_7 {
+				pinmux = <MAX32_PINMUX(1, 7, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt1_p1_7: pt1_p1_7 {
+				pinmux = <MAX32_PINMUX(1, 7, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart2_rts_p1_8: uart2_rts_p1_8 {
+				pinmux = <MAX32_PINMUX(1, 8, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt2_p1_8: pt2_p1_8 {
+				pinmux = <MAX32_PINMUX(1, 8, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart2_rx_p1_9: uart2_rx_p1_9 {
+				pinmux = <MAX32_PINMUX(1, 9, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt3_p1_9: pt3_p1_9 {
+				pinmux = <MAX32_PINMUX(1, 9, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart2_tx_p1_10: uart2_tx_p1_10 {
+				pinmux = <MAX32_PINMUX(1, 10, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt4_p1_10: pt4_p1_10 {
+				pinmux = <MAX32_PINMUX(1, 10, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_cs0_p1_11: hyp_cs0_p1_11 {
+				pinmux = <MAX32_PINMUX(1, 11, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sdio_p1_11: spixr_sdio_p1_11 {
+				pinmux = <MAX32_PINMUX(1, 11, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_d0_p1_12: hyp_d0_p1_12 {
+				pinmux = <MAX32_PINMUX(1, 12, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sdio1_p1_12: spixr_sdio1_p1_12 {
+				pinmux = <MAX32_PINMUX(1, 12, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_d4_p1_13: hyp_d4_p1_13 {
+				pinmux = <MAX32_PINMUX(1, 13, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_ss0_p1_13: spixr_ss0_p1_13 {
+				pinmux = <MAX32_PINMUX(1, 13, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_rwds_p1_14: hyp_rwds_p1_14 {
+				pinmux = <MAX32_PINMUX(1, 14, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt5_p1_14: pt5_p1_14 {
+				pinmux = <MAX32_PINMUX(1, 14, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_d1_p1_15: hyp_d1_p1_15 {
+				pinmux = <MAX32_PINMUX(1, 15, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sdio2_p1_15: spixr_sdio2_p1_15 {
+				pinmux = <MAX32_PINMUX(1, 15, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_d5_p1_16: hyp_d5_p1_16 {
+				pinmux = <MAX32_PINMUX(1, 16, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sck_p1_16: spixr_sck_p1_16 {
+				pinmux = <MAX32_PINMUX(1, 16, AF2)>;
+			};
+
+			/omit-if-no-ref/ pt9_p1_17: pt9_p1_17 {
+				pinmux = <MAX32_PINMUX(1, 17, AF1)>;
+			};
+
+			/omit-if-no-ref/ hyp_d6_p1_18: hyp_d6_p1_18 {
+				pinmux = <MAX32_PINMUX(1, 18, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt6_p1_18: pt6_p1_18 {
+				pinmux = <MAX32_PINMUX(1, 18, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_d2_p1_19: hyp_d2_p1_19 {
+				pinmux = <MAX32_PINMUX(1, 19, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt7_p1_19: pt7_p1_19 {
+				pinmux = <MAX32_PINMUX(1, 19, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_d3_p1_20: hyp_d3_p1_20 {
+				pinmux = <MAX32_PINMUX(1, 20, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_hsync_p1_20: clcd_hsync_p1_20 {
+				pinmux = <MAX32_PINMUX(1, 20, AF2)>;
+			};
+
+			/omit-if-no-ref/ hyp_d7_p1_21: hyp_d7_p1_21 {
+				pinmux = <MAX32_PINMUX(1, 21, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt8_p1_21: pt8_p1_21 {
+				pinmux = <MAX32_PINMUX(1, 21, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_ss0_p1_23: spi1_ss0_p1_23 {
+				pinmux = <MAX32_PINMUX(1, 23, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b1_p1_23: clcd_b1_p1_23 {
+				pinmux = <MAX32_PINMUX(1, 23, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_ss2_p1_24: spi1_ss2_p1_24 {
+				pinmux = <MAX32_PINMUX(1, 24, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b2_p1_24: clcd_b2_p1_24 {
+				pinmux = <MAX32_PINMUX(1, 24, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_ss1_p1_25: spi1_ss1_p1_25 {
+				pinmux = <MAX32_PINMUX(1, 25, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b3_p1_25: clcd_b3_p1_25 {
+				pinmux = <MAX32_PINMUX(1, 25, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_sck_p1_26: spi1_sck_p1_26 {
+				pinmux = <MAX32_PINMUX(1, 26, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b4_p1_26: clcd_b4_p1_26 {
+				pinmux = <MAX32_PINMUX(1, 26, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_ss3_p1_27: spi1_ss3_p1_27 {
+				pinmux = <MAX32_PINMUX(1, 27, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b5_p1_27: clcd_b5_p1_27 {
+				pinmux = <MAX32_PINMUX(1, 27, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_miso_p1_28: spi1_miso_p1_28 {
+				pinmux = <MAX32_PINMUX(1, 28, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b6_p1_28: clcd_b6_p1_28 {
+				pinmux = <MAX32_PINMUX(1, 28, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_mosi_p1_29: spi1_mosi_p1_29 {
+				pinmux = <MAX32_PINMUX(1, 29, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_b7_p1_29: clcd_b7_p1_29 {
+				pinmux = <MAX32_PINMUX(1, 29, AF2)>;
+			};
+
+			/omit-if-no-ref/ owm_pupen_p1_30: owm_pupen_p1_30 {
+				pinmux = <MAX32_PINMUX(1, 30, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r0_p1_30: clcd_r0_p1_30 {
+				pinmux = <MAX32_PINMUX(1, 30, AF2)>;
+			};
+
+			/omit-if-no-ref/ owm_io_p1_31: owm_io_p1_31 {
+				pinmux = <MAX32_PINMUX(1, 31, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r1_p1_31: clcd_r1_p1_31 {
+				pinmux = <MAX32_PINMUX(1, 31, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi2_ss2_p2_0: spi2_ss2_p2_0 {
+				pinmux = <MAX32_PINMUX(2, 0, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt9_p2_0: pt9_p2_0 {
+				pinmux = <MAX32_PINMUX(2, 0, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi2_ss1_p2_1: spi2_ss1_p2_1 {
+				pinmux = <MAX32_PINMUX(2, 1, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt10_p2_1: pt10_p2_1 {
+				pinmux = <MAX32_PINMUX(2, 1, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi2_sck_p2_2: spi2_sck_p2_2 {
+				pinmux = <MAX32_PINMUX(2, 2, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_lend_p2_2: clcd_lend_p2_2 {
+				pinmux = <MAX32_PINMUX(2, 2, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi2_miso_p2_3: spi2_miso_p2_3 {
+				pinmux = <MAX32_PINMUX(2, 3, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_pwren_p2_3: clcd_pwren_p2_3 {
+				pinmux = <MAX32_PINMUX(2, 3, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi2_mosi_p2_4: spi2_mosi_p2_4 {
+				pinmux = <MAX32_PINMUX(2, 4, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi2_ss0_p2_5: spi2_ss0_p2_5 {
+				pinmux = <MAX32_PINMUX(2, 5, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt11_p2_5: pt11_p2_5 {
+				pinmux = <MAX32_PINMUX(2, 5, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi2_ss3_p2_6: spi2_ss3_p2_6 {
+				pinmux = <MAX32_PINMUX(2, 6, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_vsync_p2_6: clcd_vsync_p2_6 {
+				pinmux = <MAX32_PINMUX(2, 6, AF2)>;
+			};
+
+			/omit-if-no-ref/ i2c0_sda_p2_7: i2c0_sda_p2_7 {
+				pinmux = <MAX32_PINMUX(2, 7, AF1)>;
+			};
+
+			/omit-if-no-ref/ i2c0_scl_p2_8: i2c0_scl_p2_8 {
+				pinmux = <MAX32_PINMUX(2, 8, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart0_cts_p2_9: uart0_cts_p2_9 {
+				pinmux = <MAX32_PINMUX(2, 9, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt12_p2_9: pt12_p2_9 {
+				pinmux = <MAX32_PINMUX(2, 9, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart0_rts_p2_10: uart0_rts_p2_10 {
+				pinmux = <MAX32_PINMUX(2, 10, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt14_p2_10: pt14_p2_10 {
+				pinmux = <MAX32_PINMUX(2, 10, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart0_rx_p2_11: uart0_rx_p2_11 {
+				pinmux = <MAX32_PINMUX(2, 11, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt13_p2_11: pt13_p2_11 {
+				pinmux = <MAX32_PINMUX(2, 11, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart0_tx_p2_12: uart0_tx_p2_12 {
+				pinmux = <MAX32_PINMUX(2, 12, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt15_p2_12: pt15_p2_12 {
+				pinmux = <MAX32_PINMUX(2, 12, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_cts_p2_13: uart1_cts_p2_13 {
+				pinmux = <MAX32_PINMUX(2, 13, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r2_p2_13: clcd_r2_p2_13 {
+				pinmux = <MAX32_PINMUX(2, 13, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_rx_p2_14: uart1_rx_p2_14 {
+				pinmux = <MAX32_PINMUX(2, 14, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r3_p2_14: clcd_r3_p2_14 {
+				pinmux = <MAX32_PINMUX(2, 14, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_rts_p2_15: uart1_rts_p2_15 {
+				pinmux = <MAX32_PINMUX(2, 15, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r4_p2_15: clcd_r4_p2_15 {
+				pinmux = <MAX32_PINMUX(2, 15, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_tx_p2_16: uart1_tx_p2_16 {
+				pinmux = <MAX32_PINMUX(2, 16, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r5_p2_16: clcd_r5_p2_16 {
+				pinmux = <MAX32_PINMUX(2, 16, AF2)>;
+			};
+
+			/omit-if-no-ref/ i2c1_sda_p2_17: i2c1_sda_p2_17 {
+				pinmux = <MAX32_PINMUX(2, 17, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r6_p2_17: clcd_r6_p2_17 {
+				pinmux = <MAX32_PINMUX(2, 17, AF2)>;
+			};
+
+			/omit-if-no-ref/ i2c1_scl_p2_18: i2c1_scl_p2_18 {
+				pinmux = <MAX32_PINMUX(2, 18, AF1)>;
+			};
+
+			/omit-if-no-ref/ clcd_r7_p2_18: clcd_r7_p2_18 {
+				pinmux = <MAX32_PINMUX(2, 18, AF2)>;
+			};
+
+			/omit-if-no-ref/ pt6_p2_23: pt6_p2_23 {
+				pinmux = <MAX32_PINMUX(2, 23, AF1)>;
+			};
+
+			/omit-if-no-ref/ spixr_sdio3_p2_23: spixr_sdio3_p2_23 {
+				pinmux = <MAX32_PINMUX(2, 23, AF2)>;
+			};
+
+			/omit-if-no-ref/ pt11_p2_25: pt11_p2_25 {
+				pinmux = <MAX32_PINMUX(2, 25, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt12_p2_26: pt12_p2_26 {
+				pinmux = <MAX32_PINMUX(2, 26, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt14_p2_28: pt14_p2_28 {
+				pinmux = <MAX32_PINMUX(2, 28, AF1)>;
+			};
+
+			/omit-if-no-ref/ pt1_p2_30: pt1_p2_30 {
+				pinmux = <MAX32_PINMUX(2, 30, AF1)>;
+			};
+
+			/omit-if-no-ref/ pdown_p3_0: pdown_p3_0 {
+				pinmux = <MAX32_PINMUX(3, 0, AF1)>;
+			};
+
+			/omit-if-no-ref/ hyp_cs1_p3_0: hyp_cs1_p3_0 {
+				pinmux = <MAX32_PINMUX(3, 0, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi0_miso_p3_1: spi0_miso_p3_1 {
+				pinmux = <MAX32_PINMUX(3, 1, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi0_mosi_p3_2: spi0_mosi_p3_2 {
+				pinmux = <MAX32_PINMUX(3, 2, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi0_sck_p3_3: spi0_sck_p3_3 {
+				pinmux = <MAX32_PINMUX(3, 3, AF1)>;
+			};
+
+			/omit-if-no-ref/ tmr0_p3_4: tmr0_p3_4 {
+				pinmux = <MAX32_PINMUX(3, 4, AF1)>;
+			};
+
+			/omit-if-no-ref/ tmr2_p3_5: tmr2_p3_5 {
+				pinmux = <MAX32_PINMUX(3, 5, AF1)>;
+			};
+
+			/omit-if-no-ref/ tmr4_p3_6: tmr4_p3_6 {
+				pinmux = <MAX32_PINMUX(3, 6, AF1)>;
+			};
+
+			/omit-if-no-ref/ tmr1_p3_7: tmr1_p3_7 {
+				pinmux = <MAX32_PINMUX(3, 7, AF1)>;
+			};
+
+			/omit-if-no-ref/ tmr3_p3_8: tmr3_p3_8 {
+				pinmux = <MAX32_PINMUX(3, 8, AF1)>;
+			};
+
+			/omit-if-no-ref/ tmr5_p3_9: tmr5_p3_9 {
+				pinmux = <MAX32_PINMUX(3, 9, AF1)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/adi/max32/max32650.dtsi b/dts/arm/adi/max32/max32650.dtsi
new file mode 100644
index 0000000000000..e2447636d1517
--- /dev/null
+++ b/dts/arm/adi/max32/max32650.dtsi
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/armv7-m.dtsi>
+#include <adi/max32/max32xxx.dtsi>
+
+&sram0 {
+	reg = <0x20000000 DT_SIZE_M(1)>;
+};
+
+&flash0 {
+	reg = <0x10000000 DT_SIZE_M(3)>;
+	erase-block-size = <16384>;
+};
+
+&clk_ipo {
+	clock-frequency = <DT_FREQ_M(120)>;
+};
+
+&clk_iso {
+	clock-frequency = <DT_FREQ_M(50)>;
+};
+
+/delete-node/ &clk_erfo;
+
+/delete-node/ &i2c2;
+
+/delete-node/ &trng;
+
+&pinctrl {
+	reg = <0x40008000 0x4000>;
+
+	gpio2: gpio@4000a000 {
+		reg = <0x4000a000 0x1000>;
+		compatible = "adi,max32-gpio";
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupts = <26 0>;
+		clocks = <&gcr ADI_MAX32_CLOCK_BUS0 2>;
+		status = "disabled";
+	};
+
+	gpio3: gpio@4000b000 {
+		reg = <0x4000b000 0x1000>;
+		compatible = "adi,max32-gpio";
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupts = <58 0>;
+		clocks = <&gcr ADI_MAX32_CLOCK_BUS1 6>;
+		status = "disabled";
+	};
+};
+
+/* MAX32650 extra peripherals. */
+/ {
+	soc {
+		trng: trng@400b5000 {
+			compatible = "adi,max32-trng";
+			reg = <0x400b5000 0x1000>;
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS1 2>;
+			status = "disabled";
+		};
+
+		timer4: timer@40014000 {
+			compatible = "adi,max32-timer";
+			reg = <0x40014000 0x1000>;
+			interrupts = <9 0>;
+			status = "disabled";
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS0 19>;
+			clock-source = <ADI_MAX32_PRPH_CLK_SRC_PCLK>;
+			prescaler = <1>;
+
+			counter {
+				compatible = "adi,max32-counter";
+				status = "disabled";
+			};
+
+			pwm {
+				compatible = "adi,max32-pwm";
+				status = "disabled";
+				#pwm-cells = <3>;
+			};
+		};
+
+		timer5: timer@40015000 {
+			compatible = "adi,max32-timer";
+			reg = <0x40015000 0x1000>;
+			interrupts = <10 0>;
+			status = "disabled";
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS0 20>;
+			clock-source = <ADI_MAX32_PRPH_CLK_SRC_PCLK>;
+			prescaler = <1>;
+
+			counter {
+				compatible = "adi,max32-counter";
+				status = "disabled";
+			};
+
+			pwm {
+				compatible = "adi,max32-pwm";
+				status = "disabled";
+				#pwm-cells = <3>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/adi/max32/max32660-pinctrl.dtsi b/dts/arm/adi/max32/max32660-pinctrl.dtsi
new file mode 100644
index 0000000000000..cfb872c11d315
--- /dev/null
+++ b/dts/arm/adi/max32/max32660-pinctrl.dtsi
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/max32-pinctrl.h>
+
+/ {
+	soc {
+		pinctrl: pin-controller@40008000 {
+			/omit-if-no-ref/ swdio_p0_0: swdio_p0_0 {
+				pinmux = <MAX32_PINMUX(0, 0, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi1_miso_p0_0: spi1_miso_p0_0 {
+				pinmux = <MAX32_PINMUX(0, 0, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_tx_p0_0: uart1_tx_p0_0 {
+				pinmux = <MAX32_PINMUX(0, 0, AF3)>;
+			};
+
+			/omit-if-no-ref/ swdclk_p0_1: swdclk_p0_1 {
+				pinmux = <MAX32_PINMUX(0, 1, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi1_mosi_p0_1: spi1_mosi_p0_1 {
+				pinmux = <MAX32_PINMUX(0, 1, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_rx_p0_1: uart1_rx_p0_1 {
+				pinmux = <MAX32_PINMUX(0, 1, AF3)>;
+			};
+
+			/omit-if-no-ref/ i2c1_scl_p0_2: i2c1_scl_p0_2 {
+				pinmux = <MAX32_PINMUX(0, 2, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi1_sck_p0_2: spi1_sck_p0_2 {
+				pinmux = <MAX32_PINMUX(0, 2, AF2)>;
+			};
+
+			/omit-if-no-ref/ cal32k_p0_2: cal32k_p0_2 {
+				pinmux = <MAX32_PINMUX(0, 2, AF3)>;
+			};
+
+			/omit-if-no-ref/ i2c1_sda_p0_3: i2c1_sda_p0_3 {
+				pinmux = <MAX32_PINMUX(0, 3, AF1)>;
+			};
+
+			/omit-if-no-ref/ spi1_ss0_p0_3: spi1_ss0_p0_3 {
+				pinmux = <MAX32_PINMUX(0, 3, AF2)>;
+			};
+
+			/omit-if-no-ref/ tmr0_p0_3: tmr0_p0_3 {
+				pinmux = <MAX32_PINMUX(0, 3, AF3)>;
+			};
+
+			/omit-if-no-ref/ spi0_miso_p0_4: spi0_miso_p0_4 {
+				pinmux = <MAX32_PINMUX(0, 4, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart0_tx_p0_4: uart0_tx_p0_4 {
+				pinmux = <MAX32_PINMUX(0, 4, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi0_mosi_p0_5: spi0_mosi_p0_5 {
+				pinmux = <MAX32_PINMUX(0, 5, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart0_rx_p0_5: uart0_rx_p0_5 {
+				pinmux = <MAX32_PINMUX(0, 5, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi0_sck_p0_6: spi0_sck_p0_6 {
+				pinmux = <MAX32_PINMUX(0, 6, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart0_cts_p0_6: uart0_cts_p0_6 {
+				pinmux = <MAX32_PINMUX(0, 6, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_tx_p0_6: uart1_tx_p0_6 {
+				pinmux = <MAX32_PINMUX(0, 6, AF3)>;
+			};
+
+			/omit-if-no-ref/ spi0_ss0_p0_7: spi0_ss0_p0_7 {
+				pinmux = <MAX32_PINMUX(0, 7, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart0_rts_p0_7: uart0_rts_p0_7 {
+				pinmux = <MAX32_PINMUX(0, 7, AF2)>;
+			};
+
+			/omit-if-no-ref/ uart1_rx_p0_7: uart1_rx_p0_7 {
+				pinmux = <MAX32_PINMUX(0, 7, AF3)>;
+			};
+
+			/omit-if-no-ref/ i2c0_scl_p0_8: i2c0_scl_p0_8 {
+				pinmux = <MAX32_PINMUX(0, 8, AF1)>;
+			};
+
+			/omit-if-no-ref/ swdio_p0_8: swdio_p0_8 {
+				pinmux = <MAX32_PINMUX(0, 8, AF2)>;
+			};
+
+			/omit-if-no-ref/ i2c0_sda_p0_9: i2c0_sda_p0_9 {
+				pinmux = <MAX32_PINMUX(0, 9, AF1)>;
+			};
+
+			/omit-if-no-ref/ swdclk_p0_9: swdclk_p0_9 {
+				pinmux = <MAX32_PINMUX(0, 9, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_miso_p0_10: spi1_miso_p0_10 {
+				pinmux = <MAX32_PINMUX(0, 10, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart1_tx_p0_10: uart1_tx_p0_10 {
+				pinmux = <MAX32_PINMUX(0, 10, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_mosi_p0_11: spi1_mosi_p0_11 {
+				pinmux = <MAX32_PINMUX(0, 11, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart1_rx_p0_11: uart1_rx_p0_11 {
+				pinmux = <MAX32_PINMUX(0, 11, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_sck_p0_12: spi1_sck_p0_12 {
+				pinmux = <MAX32_PINMUX(0, 12, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart1_cts_p0_12: uart1_cts_p0_12 {
+				pinmux = <MAX32_PINMUX(0, 12, AF2)>;
+			};
+
+			/omit-if-no-ref/ spi1_ss0_p0_13: spi1_ss0_p0_13 {
+				pinmux = <MAX32_PINMUX(0, 13, AF1)>;
+			};
+
+			/omit-if-no-ref/ uart1_rts_p0_13: uart1_rts_p0_13 {
+				pinmux = <MAX32_PINMUX(0, 13, AF2)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/adi/max32/max32660.dtsi b/dts/arm/adi/max32/max32660.dtsi
new file mode 100644
index 0000000000000..b93b451ffd885
--- /dev/null
+++ b/dts/arm/adi/max32/max32660.dtsi
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/armv7-m.dtsi>
+#include <adi/max32/max32xxx.dtsi>
+#include <zephyr/dt-bindings/dma/max32660_dma.h>
+
+&clk_ipo {
+	clock-frequency = <DT_FREQ_M(96)>;
+};
+
+&sram0 {
+	reg = <0x20000000 DT_SIZE_K(16)>;
+};
+
+/delete-node/ &clk_iso;
+/delete-node/ &clk_ibro;
+/delete-node/ &clk_erfo;
+/delete-node/ &adc;
+/delete-node/ &gpio1;
+/delete-node/ &i2c2;
+/delete-node/ &uart2;
+/delete-node/ &timer3;
+/delete-node/ &trng;
+/delete-node/ &flash0;
+
+&flc0 {
+	flash0: flash@0{
+		compatible = "soc-nv-flash";
+		reg = <0x00000000 DT_SIZE_K(256)>;
+		write-block-size = <16>;
+		erase-block-size = <8192>;
+	};
+};
+
+/* MAX32660 extra peripherals. */
+/ {
+	chosen {
+		/delete-property/ zephyr,entropy;
+	};
+
+	soc {
+		sram1: memory@20004000 {
+			compatible = "mmio-sram";
+			reg = <0x20004000 DT_SIZE_K(16)>;
+		};
+
+		sram2: memory@20008000 {
+			compatible = "mmio-sram";
+			reg = <0x20008000 DT_SIZE_K(32)>;
+		};
+
+		sram3: memory@20010000 {
+			compatible = "mmio-sram";
+			reg = <0x20010000 DT_SIZE_K(32)>;
+		};
+
+		dma0: dma@40028000 {
+			compatible = "adi,max32-dma";
+			reg = <0x40028000 0x1000>;
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS0 5>;
+			interrupts = <28 0>, <29 0>, <30 0>, <31 0>;
+			dma-channels = <4>;
+			status = "disabled";
+			#dma-cells = <2>;
+		};
+
+		spi0: spi@40046000 {
+			compatible = "adi,max32-spi";
+			reg = <0x40046000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS0 6>;
+			interrupts = <16 0>;
+			status = "disabled";
+		};
+
+		spi1: spi@40019000 {
+			compatible = "adi,max32-spi";
+			reg = <0x40019000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS0 7>;
+			interrupts = <17 0>;
+			status = "disabled";
+		};
+	};
+};
diff --git a/dts/arm/adi/max32/max32662.dtsi b/dts/arm/adi/max32/max32662.dtsi
index 4c8c99cf637fb..b2d8c6614ade6 100644
--- a/dts/arm/adi/max32/max32662.dtsi
+++ b/dts/arm/adi/max32/max32662.dtsi
@@ -24,6 +24,8 @@
 
 /delete-node/ &timer3;
 
+/delete-node/ &i2c2;
+
 /delete-node/ &rtc_counter;
 
 &adc {
diff --git a/dts/arm/adi/max32/max32666.dtsi b/dts/arm/adi/max32/max32666.dtsi
index e697a912b411f..d49cb6c49216f 100644
--- a/dts/arm/adi/max32/max32666.dtsi
+++ b/dts/arm/adi/max32/max32666.dtsi
@@ -174,5 +174,19 @@
 			interrupts = <67 0>;
 			status = "disabled";
 		};
+
+		sdhc0: sdhc@400b6000 {
+			compatible = "adi,max32-sdhc";
+			reg = <0x400b6000 0x1000>;
+			interrupts = <66 0>;
+			status = "disabled";
+			mmc {
+				compatible = "zephyr,sdmmc-disk";
+				status = "disabled";
+				disk-name = "SD";
+			};
+			power-delay-ms = <1500>;
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS1 10>;
+		};
 	};
 };
diff --git a/dts/arm/adi/max32/max32670.dtsi b/dts/arm/adi/max32/max32670.dtsi
index 1168bd2187f38..cb4e1aae0bf99 100644
--- a/dts/arm/adi/max32/max32670.dtsi
+++ b/dts/arm/adi/max32/max32670.dtsi
@@ -20,6 +20,10 @@
 	clock-frequency = <DT_FREQ_K(80)>;
 };
 
+&i2c2 {
+	clocks = <&gcr ADI_MAX32_CLOCK_BUS1 21>;
+};
+
 /delete-node/ &rtc_counter;
 
 /* MAX32670 extra peripherals. */
diff --git a/dts/arm/adi/max32/max32675.dtsi b/dts/arm/adi/max32/max32675.dtsi
index 12950c4d98edb..10065112d0f98 100644
--- a/dts/arm/adi/max32/max32675.dtsi
+++ b/dts/arm/adi/max32/max32675.dtsi
@@ -20,6 +20,10 @@
 	clock-frequency = <DT_FREQ_K(80)>;
 };
 
+&i2c2 {
+	clocks = <&gcr ADI_MAX32_CLOCK_BUS1 21>;
+};
+
 /delete-node/ &clk_iso;
 /delete-node/ &uart1;
 /delete-node/ &rtc_counter;
diff --git a/dts/arm/adi/max32/max32690.dtsi b/dts/arm/adi/max32/max32690.dtsi
index 52a93bff4e66d..199ddba78df9d 100644
--- a/dts/arm/adi/max32/max32690.dtsi
+++ b/dts/arm/adi/max32/max32690.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024 Analog Devices, Inc.
+ * Copyright (c) 2023-2025 Analog Devices, Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -232,5 +232,17 @@
 			interrupts = <67 0>;
 			status = "disabled";
 		};
+
+		usbhs: usbhs@400b1000 {
+			compatible = "adi,max32-usbhs";
+			reg = <0x400b1000 0x1000>;
+			clocks = <&gcr ADI_MAX32_CLOCK_BUS0 3>;
+			interrupts = <2 0>;
+			num-bidir-endpoints = <1>;
+			num-in-endpoints = <6>;
+			num-out-endpoints = <7>;
+			maximum-speed = "high-speed";
+			status = "disabled";
+		};
 	};
 };
diff --git a/dts/arm/ambiq/ambiq_apollo3_blue.dtsi b/dts/arm/ambiq/ambiq_apollo3_blue.dtsi
index cf764f1109e21..894fdb6657f0f 100644
--- a/dts/arm/ambiq/ambiq_apollo3_blue.dtsi
+++ b/dts/arm/ambiq/ambiq_apollo3_blue.dtsi
@@ -204,140 +204,133 @@
 			#size-cells = <0>;
 			interrupts = <4 0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0>;
 			zephyr,pm-device-runtime-auto;
 		};
 
-		spi0: spi@50004000 {
-			compatible = "ambiq,spi";
+		iom0: iom@50004000 {
+			compatible = "ambiq,iom";
 			reg = <0x50004000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x2>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi1: spi@50005000 {
-			compatible = "ambiq,spi";
-			reg = <0x50005000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x4>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi2: spi@50006000 {
-			compatible = "ambiq,spi";
-			reg = <0x50006000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x8>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi3: spi@50007000 {
-			compatible = "ambiq,spi";
-			reg = <0x50007000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x10>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi4: spi@50008000 {
-			compatible = "ambiq,spi";
-			reg = <0x50008000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <10 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x20>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi5: spi@50009000 {
-			compatible = "ambiq,spi";
-			reg = <0x50009000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x40>;
-			zephyr,pm-device-runtime-auto;
-		};
 
-		i2c0: i2c@50004000 {
-			compatible = "ambiq,i2c";
-			reg = <0x50004000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x2>;
-			zephyr,pm-device-runtime-auto;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c1: i2c@50005000 {
-			compatible = "ambiq,i2c";
+		iom1: iom@50005000 {
+			compatible = "ambiq,iom";
 			reg = <0x50005000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x4>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c2: i2c@50006000 {
-			compatible = "ambiq,i2c";
+		iom2: iom@50006000 {
+			compatible = "ambiq,iom";
 			reg = <0x50006000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x8>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c3: i2c@50007000 {
-			compatible = "ambiq,i2c";
+		iom3: iom@50007000 {
+			compatible = "ambiq,iom";
 			reg = <0x50007000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x10>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c4: i2c@50008000 {
-			compatible = "ambiq,i2c";
+		iom4: iom@50008000 {
+			compatible = "ambiq,iom";
 			reg = <0x50008000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <10 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x20>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c5: i2c@50009000 {
-			compatible = "ambiq,i2c";
+		iom5: iom@50009000 {
+			compatible = "ambiq,iom";
 			reg = <0x50009000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x40>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
 		adc0: adc@50010000 {
@@ -349,7 +342,6 @@
 			internal-vref-mv = <1500>;
 			status = "disabled";
 			#io-channel-cells = <1>;
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x200>;
 		};
 
 		mspi0: spi@40020000 {
@@ -359,7 +351,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x800>;
 		};
 
 		rtc0: rtc@40004240 {
@@ -377,7 +368,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x8000>;
 
 			bt_hci_apollo: bt-hci@0 {
 				compatible = "ambiq,bt-hci-spi";
diff --git a/dts/arm/ambiq/ambiq_apollo3p_blue.dtsi b/dts/arm/ambiq/ambiq_apollo3p_blue.dtsi
index 10ae31820382c..300f79ddfea37 100644
--- a/dts/arm/ambiq/ambiq_apollo3p_blue.dtsi
+++ b/dts/arm/ambiq/ambiq_apollo3p_blue.dtsi
@@ -222,140 +222,133 @@
 			#size-cells = <0>;
 			interrupts = <4 0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0>;
 			zephyr,pm-device-runtime-auto;
 		};
 
-		spi0: spi@50004000 {
-			compatible = "ambiq,spi";
+		iom0: iom@50004000 {
+			compatible = "ambiq,iom";
 			reg = <0x50004000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x2>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi1: spi@50005000 {
-			compatible = "ambiq,spi";
-			reg = <0x50005000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x4>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi2: spi@50006000 {
-			compatible = "ambiq,spi";
-			reg = <0x50006000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x8>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi3: spi@50007000 {
-			compatible = "ambiq,spi";
-			reg = <0x50007000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x10>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi4: spi@50008000 {
-			compatible = "ambiq,spi";
-			reg = <0x50008000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <10 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x20>;
-			zephyr,pm-device-runtime-auto;
-		};
-
-		spi5: spi@50009000 {
-			compatible = "ambiq,spi";
-			reg = <0x50009000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x40>;
-			zephyr,pm-device-runtime-auto;
-		};
 
-		i2c0: i2c@50004000 {
-			compatible = "ambiq,i2c";
-			reg = <0x50004000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x2>;
-			zephyr,pm-device-runtime-auto;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c1: i2c@50005000 {
-			compatible = "ambiq,i2c";
+		iom1: iom@50005000 {
+			compatible = "ambiq,iom";
 			reg = <0x50005000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x4>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c2: i2c@50006000 {
-			compatible = "ambiq,i2c";
+		iom2: iom@50006000 {
+			compatible = "ambiq,iom";
 			reg = <0x50006000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x8>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c3: i2c@50007000 {
-			compatible = "ambiq,i2c";
+		iom3: iom@50007000 {
+			compatible = "ambiq,iom";
 			reg = <0x50007000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x10>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c4: i2c@50008000 {
-			compatible = "ambiq,i2c";
+		iom4: iom@50008000 {
+			compatible = "ambiq,iom";
 			reg = <0x50008000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <10 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x20>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c5: i2c@50009000 {
-			compatible = "ambiq,i2c";
+		iom5: iom@50009000 {
+			compatible = "ambiq,iom";
 			reg = <0x50009000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x40>;
-			zephyr,pm-device-runtime-auto;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
 		adc0: adc@50010000 {
@@ -367,7 +360,6 @@
 			internal-vref-mv = <1500>;
 			status = "disabled";
 			#io-channel-cells = <1>;
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x200>;
 		};
 
 		mspi0: mspi@50014000 {
@@ -378,7 +370,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x800>;
 		};
 
 		mspi1: mspi@50015000 {
@@ -389,7 +380,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x1000>;
 		};
 
 		mspi2: mspi@50016000 {
@@ -400,7 +390,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x2000>;
 		};
 
 		rtc0: rtc@40004240 {
@@ -418,7 +407,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x8 0x8000>;
 
 			bt_hci_apollo: bt-hci@0 {
 				compatible = "ambiq,bt-hci-spi";
diff --git a/dts/arm/ambiq/ambiq_apollo4p.dtsi b/dts/arm/ambiq/ambiq_apollo4p.dtsi
index b40744a663908..c881f97da0b92 100644
--- a/dts/arm/ambiq/ambiq_apollo4p.dtsi
+++ b/dts/arm/ambiq/ambiq_apollo4p.dtsi
@@ -123,6 +123,7 @@
 			clocks = <&uartclk>;
 			ambiq,pwrcfg = <&pwrcfg 0x4 0x200>;
 		};
+
 		uart1: uart@4001d000 {
 			compatible = "ambiq,uart", "arm,pl011";
 			reg = <0x4001d000 0x1000>;
@@ -153,164 +154,172 @@
 			ambiq,pwrcfg = <&pwrcfg 0x4 0x1000>;
 		};
 
-		iom0_spi: spi@40050000 {
-			compatible = "ambiq,spi";
+		iom0: iom@40050000 {
+			compatible = "ambiq,iom";
 			reg = <0x40050000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x2>;
-		};
 
-		iom0_i2c: i2c@40050000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40050000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x2>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		iom1_spi: spi@40051000 {
-			compatible = "ambiq,spi";
+		iom1: iom@40051000 {
+			compatible = "ambiq,iom";
 			reg = <0x40051000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x4>;
-		};
 
-		iom1_i2c: i2c@40051000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40051000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x4>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		iom2_spi: spi@40052000 {
-			compatible = "ambiq,spi";
+		iom2: iom@40052000 {
+			compatible = "ambiq,iom";
 			reg = <0x40052000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x8>;
-		};
 
-		iom2_i2c: i2c@40052000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40052000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x8>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		iom3_spi: spi@40053000 {
-			compatible = "ambiq,spi";
+		iom3: iom@40053000 {
+			compatible = "ambiq,iom";
 			reg = <0x40053000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x10>;
-		};
 
-		iom3_i2c: i2c@40053000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40053000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x10>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		iom4_spi: spi@40054000 {
-			compatible = "ambiq,spi";
+		iom4: iom@40054000 {
+			compatible = "ambiq,iom";
 			reg = <0x40054000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <10 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x20>;
-		};
 
-		iom4_i2c: i2c@40054000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40054000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <10 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x20>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		iom5_spi: spi@40055000 {
-			compatible = "ambiq,spi";
+		iom5: iom@40055000 {
+			compatible = "ambiq,iom";
 			reg = <0x40055000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x40>;
-		};
 
-		iom5_i2c: i2c@40055000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40055000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x40>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		iom6_spi: spi@40056000 {
-			compatible = "ambiq,spi";
+		iom6: iom@40056000 {
+			compatible = "ambiq,iom";
 			reg = <0x40056000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <12 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x80>;
-		};
 
-		iom6_i2c: i2c@40056000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40056000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <12 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x80>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		iom7_spi: spi@40057000 {
-			compatible = "ambiq,spi";
+		iom7: iom@40057000 {
+			compatible = "ambiq,iom";
 			reg = <0x40057000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <13 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x100>;
-		};
 
-		iom7_i2c: i2c@40057000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40057000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <13 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x100>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
 		adc0: adc@40038000 {
@@ -322,7 +331,6 @@
 			internal-vref-mv = <1190>;
 			status = "disabled";
 			#io-channel-cells = <1>;
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x2000>;
 		};
 
 		mspi0: spi@40060000 {
@@ -332,7 +340,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x4000>;
 		};
 
 		mspi1: spi@40061000 {
@@ -342,7 +349,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x8000>;
 		};
 
 		mspi2: spi@40062000 {
@@ -352,7 +358,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x10000>;
 		};
 
 		rtc0: rtc@40004800 {
@@ -363,6 +368,17 @@
 			status = "disabled";
 		};
 
+		sdio0: sdio@40070000 {
+			compatible = "ambiq,sdio";
+			reg = <0x40070000 0x100>;
+			interrupts = <26 0>;
+			max-bus-freq = <96000000>;
+			min-bus-freq = <375000>;
+			power-delay-ms = <50>;
+			status = "disabled";
+			zephyr,pm-device-runtime-auto;
+		};
+
 		usb: usb@400b0000 {
 			compatible = "ambiq,usb";
 			reg = <0x400B0000 0x4100>;
@@ -370,7 +386,6 @@
 			num-bidir-endpoints = <6>;
 			maximum-speed = "full-speed";
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x400000>;
 		};
 
 		pinctrl: pin-controller@40010000 {
diff --git a/dts/arm/ambiq/ambiq_apollo4p_blue.dtsi b/dts/arm/ambiq/ambiq_apollo4p_blue.dtsi
index cf9c2bf4a7cda..212715f0a9943 100644
--- a/dts/arm/ambiq/ambiq_apollo4p_blue.dtsi
+++ b/dts/arm/ambiq/ambiq_apollo4p_blue.dtsi
@@ -134,176 +134,176 @@
 			ambiq,pwrcfg = <&pwrcfg 0x4 0x1000>;
 		};
 
-		spi0: spi@40050000 {
-			compatible = "ambiq,spi";
+		iom0: iom@40050000 {
+			compatible = "ambiq,iom";
 			reg = <0x40050000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x2>;
-		};
-
-		spi1: spi@40051000 {
-			compatible = "ambiq,spi";
-			reg = <0x40051000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x4>;
-		};
-
-		spi2: spi@40052000 {
-			compatible = "ambiq,spi";
-			reg = <0x40052000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x8>;
-		};
 
-		spi3: spi@40053000 {
-			compatible = "ambiq,spi";
-			reg = <0x40053000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x10>;
-		};
-
-		spi4: spi@40054000 {
-			/* IOM4 works as SPI and is wired internally for BLE HCI. */
-			compatible = "ambiq,spi";
-			reg = <0x40054000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <10 0>;
-			cs-gpios = <&gpio32_63 22 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-			clock-frequency = <DT_FREQ_M(24)>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x20>;
-
-			bt_hci_apollo: bt-hci@0 {
-				compatible = "ambiq,bt-hci-spi";
-				reg = <0>;
-				spi-max-frequency = <DT_FREQ_M(24)>;
-				irq-gpios = <&gpio32_63 21 GPIO_ACTIVE_HIGH>;
-				reset-gpios = <&gpio32_63 23 GPIO_ACTIVE_LOW>;
-				clkreq-gpios = <&gpio32_63 20 GPIO_ACTIVE_HIGH>;
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
 			};
 		};
 
-		spi5: spi@40055000 {
-			compatible = "ambiq,spi";
-			reg = <0x40055000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x40>;
-		};
-
-		spi6: spi@40056000 {
-			compatible = "ambiq,spi";
-			reg = <0x40056000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <12 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x80>;
-		};
-
-		spi7: spi@40057000 {
-			compatible = "ambiq,spi";
-			reg = <0x40057000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <13 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x100>;
-		};
-
-		i2c0: i2c@40050000 {
-			compatible = "ambiq,i2c";
-			reg = <0x40050000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <6 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x2>;
-		};
-
-		i2c1: i2c@40051000 {
-			compatible = "ambiq,i2c";
+		iom1: iom@40051000 {
+			compatible = "ambiq,iom";
 			reg = <0x40051000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <7 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x4>;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c2: i2c@40052000 {
-			compatible = "ambiq,i2c";
+		iom2: iom@40052000 {
+			compatible = "ambiq,iom";
 			reg = <0x40052000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <8 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x8>;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c3: i2c@40053000 {
-			compatible = "ambiq,i2c";
+		iom3: iom@40053000 {
+			compatible = "ambiq,iom";
 			reg = <0x40053000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <9 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x10>;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c4: i2c@40054000 {
-			compatible = "ambiq,i2c";
+		iom4: iom@40054000 {
+			compatible = "ambiq,iom";
 			reg = <0x40054000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <10 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x20>;
+			/* IOM4 works as SPI and is wired internally for BLE HCI. */
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				cs-gpios = <&gpio32_63 22 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+				clock-frequency = <DT_FREQ_M(24)>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+
+				bt_hci_apollo: bt-hci@0 {
+					compatible = "ambiq,bt-hci-spi";
+					reg = <0>;
+					spi-max-frequency = <DT_FREQ_M(24)>;
+					irq-gpios = <&gpio32_63 21 GPIO_ACTIVE_HIGH>;
+					reset-gpios = <&gpio32_63 23 GPIO_ACTIVE_LOW>;
+					clkreq-gpios = <&gpio32_63 20 GPIO_ACTIVE_HIGH>;
+				};
+			};
 		};
 
-		i2c5: i2c@40055000 {
-			compatible = "ambiq,i2c";
+		iom5: iom@40055000 {
+			compatible = "ambiq,iom";
 			reg = <0x40055000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <11 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x40>;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c6: i2c@40056000 {
-			compatible = "ambiq,i2c";
+		iom6: iom@40056000 {
+			compatible = "ambiq,iom";
 			reg = <0x40056000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <12 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x80>;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
-		i2c7: i2c@40057000 {
-			compatible = "ambiq,i2c";
+		iom7: iom@40057000 {
+			compatible = "ambiq,iom";
 			reg = <0x40057000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			interrupts = <13 0>;
-			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x100>;
+
+			spi {
+				compatible = "ambiq,spi";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
+			i2c {
+				compatible = "ambiq,i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+				zephyr,pm-device-runtime-auto;
+			};
 		};
 
 		mspi0: spi@40060000 {
@@ -313,7 +313,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x4000>;
 		};
 
 		mspi1: spi@40061000 {
@@ -323,7 +322,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x8000>;
 		};
 
 		mspi2: spi@40062000 {
@@ -333,7 +331,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x10000>;
 		};
 
 		usb: usb@400b0000 {
@@ -343,7 +340,6 @@
 			num-bidir-endpoints = <6>;
 			maximum-speed = "full-speed";
 			status = "disabled";
-			ambiq,pwrcfg = <&pwrcfg 0x4 0x400000>;
 		};
 
 		rtc0: rtc@40004800 {
diff --git a/dts/arm/antmicro/myra.dtsi b/dts/arm/antmicro/myra.dtsi
index 70f8beabecfd0..b47778ed4b43c 100644
--- a/dts/arm/antmicro/myra.dtsi
+++ b/dts/arm/antmicro/myra.dtsi
@@ -14,4 +14,12 @@
 		     &spi2_miso_pb14 &spi2_mosi_pb15>;
 	pinctrl-names = "default";
 	status = "okay";
+
+	mb85rs1mt: mb85rs1mt@0 {
+		status = "okay";
+		compatible = "fujitsu,mb85rsxx";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(25)>;
+		size = <DT_SIZE_K(128)>;
+	};
 };
diff --git a/dts/arm/atmel/sam3x.dtsi b/dts/arm/atmel/sam3x.dtsi
index 67d99418fd228..981b5548da3f4 100644
--- a/dts/arm/atmel/sam3x.dtsi
+++ b/dts/arm/atmel/sam3x.dtsi
@@ -5,7 +5,9 @@
  */
 
 #include <arm/armv7-m.dtsi>
+#include <zephyr/dt-bindings/adc/adc.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/clock/atmel_sam_pmc.h>
 
 / {
@@ -49,6 +51,26 @@
 			reg = <0x20070000 0x18000>;
 		};
 
+		spi0: spi@40008000 {
+			compatible = "atmel,sam-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40008000 0x4000>;
+			interrupts = <24 0>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 24>;
+			status = "disabled";
+		};
+
+		spi1: spi@4000c000 {
+			compatible = "atmel,sam-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x4000c000 0x4000>;
+			interrupts = <25 0>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 25>;
+			status = "disabled";
+		};
+
 		/* Only used for HWINFO device ID */
 		eefc: flash-controller@400e0a00 {
 			compatible = "atmel,sam-flash-controller";
@@ -237,6 +259,17 @@
 			status = "disabled";
 		};
 
+		adc0: adc@400c0000 {
+			compatible = "atmel,sam-adc";
+			reg = <0x400c0000 0x4000>;
+			interrupts = <37 1>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			#io-channel-cells = <1>;
+			status = "disabled";
+		};
+
 		pwm0: pwm@40094000 {
 			compatible = "atmel,sam-pwm";
 			reg = <0x40094000 0x4000>;
diff --git a/dts/arm/atmel/samx7xx21.dtsi b/dts/arm/atmel/samx7xx21.dtsi
index 9433e3063aaf8..608672b4129da 100644
--- a/dts/arm/atmel/samx7xx21.dtsi
+++ b/dts/arm/atmel/samx7xx21.dtsi
@@ -16,7 +16,7 @@
 		flash-controller@400e0c00 {
 			flash0: flash@400000 {
 				reg = <0x00400000 DT_SIZE_K(2048)>;
-				erase-blocks = <&eefc 8 2048>, <&eefc 252 8192>;
+				erase-blocks = <&eefc 8 2048>, <&eefc 254 8192>;
 			};
 		};
 	};
diff --git a/dts/arm/microchip/mec1501hsz.dtsi b/dts/arm/microchip/mec1501hsz.dtsi
index e4b4d74cb3119..794b07ac4da61 100644
--- a/dts/arm/microchip/mec1501hsz.dtsi
+++ b/dts/arm/microchip/mec1501hsz.dtsi
@@ -20,6 +20,7 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-m4";
 			reg = <0>;
+			clock-frequency = <48000000>;
 			cpu-power-states = <&idle &suspend_to_ram>;
 		};
 
@@ -160,6 +161,7 @@
 			compatible = "microchip,xec-rtos-timer";
 			reg = <0x40007400 0x10>;
 			interrupts = <111 0>;
+			clock-frequency = <32768>;
 			girqs = <23 10>;
 		};
 		bbram: bb-ram@4000a800 {
@@ -471,7 +473,7 @@
 			rxdma = <11>;
 			txdma = <10>;
 			lines = <1>;
-			chip_select = <0>;
+			chip-select = <0>;
 			dcsckon = <6>;
 			dckcsoff = <4>;
 			dldh = <6>;
diff --git a/dts/arm/microchip/mec172x_common.dtsi b/dts/arm/microchip/mec172x_common.dtsi
index 9462c1b47c2db..45f673809ecf2 100644
--- a/dts/arm/microchip/mec172x_common.dtsi
+++ b/dts/arm/microchip/mec172x_common.dtsi
@@ -290,6 +290,7 @@ rtimer: timer@40007400 {
 	compatible = "microchip,xec-rtos-timer";
 	reg = <0x40007400 0x10>;
 	interrupts = <111 0>;
+	clock-frequency = <32768>;
 	girqs = <23 10>;
 };
 timer0: timer@40000c00 {
diff --git a/dts/arm/microchip/mec172xnlj.dtsi b/dts/arm/microchip/mec172xnlj.dtsi
index 00d27b422c09a..a0943723dc43d 100644
--- a/dts/arm/microchip/mec172xnlj.dtsi
+++ b/dts/arm/microchip/mec172xnlj.dtsi
@@ -26,6 +26,7 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-m4";
 			reg = <0>;
+			clock-frequency = <96000000>;
 			cpu-power-states = <&idle &suspend_to_ram>;
 		};
 
diff --git a/dts/arm/microchip/mec172xnsz.dtsi b/dts/arm/microchip/mec172xnsz.dtsi
index 54103e9bcdeee..817e22361b8de 100644
--- a/dts/arm/microchip/mec172xnsz.dtsi
+++ b/dts/arm/microchip/mec172xnsz.dtsi
@@ -26,6 +26,7 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-m4";
 			reg = <0>;
+			clock-frequency = <96000000>;
 			cpu-power-states = <&idle &suspend_to_ram>;
 		};
 
diff --git a/dts/arm/microchip/mec5.dtsi b/dts/arm/microchip/mec5.dtsi
index ad79ca5ecdac6..e37e86343d167 100644
--- a/dts/arm/microchip/mec5.dtsi
+++ b/dts/arm/microchip/mec5.dtsi
@@ -7,6 +7,7 @@
 #include <arm/armv7-m.dtsi>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/gpio/microchip-xec-gpio.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
 #include <freq.h>
 #include <mem.h>
 
@@ -19,6 +20,7 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-m4";
 			reg = <0>;
+			clock-frequency = <96000000>;
 		};
 	};
 
@@ -202,7 +204,7 @@
 			interrupts = <41 1>;
 			status = "disabled";
 		};
-		wdog: watchdog@40000400 {
+		watchdog0: watchdog@40000400 {
 			reg = <0x40000400 0x400>;
 			interrupts = <171 0>;
 			status = "disabled";
@@ -311,7 +313,7 @@
 			status = "disabled";
 		};
 		bbram: bb-ram@4000a800 {
-			reg = <0x4000a800 0x100>;
+			reg = <0x4000a800 0x80>;
 			reg-names = "memory";
 			status = "disabled";
 		};
diff --git a/dts/arm/microchip/mec5/mec5_i3c.dtsi b/dts/arm/microchip/mec5/mec5_i3c.dtsi
new file mode 100644
index 0000000000000..23e55177b6281
--- /dev/null
+++ b/dts/arm/microchip/mec5/mec5_i3c.dtsi
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 Microchip Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Microchip MEC5 SoC's Improved I2C(I3C).
+ * Include this file in the soc {} section in the relevant chip DTSI files.
+ */
+i3c0: i3c@40010800 {
+	compatible = "microchip,mec5-i3c";
+	#address-cells = <3>;
+	#size-cells = <0>;
+	reg = <0x40010800 0x800>;
+	interrupts = <181 2>;
+	input-clock-frequency = <192000000>;
+	i3c-scl-hz = <12500000>;
+	i2c-scl-hz = <400000>;
+	status = "disabled";
+};
+
+i3c1: i3c@40010000 {
+	compatible = "microchip,mec5-i3c";
+	#address-cells = <3>;
+	#size-cells = <0>;
+	reg = <0x40010000 0x800>;
+	interrupts = <182 2>;
+	input-clock-frequency = <192000000>;
+	i3c-scl-hz = <12500000>;
+	i2c-scl-hz = <400000>;
+	status = "disabled";
+};
diff --git a/dts/arm/microchip/mec5_mec1753qsz.dtsi b/dts/arm/microchip/mec5_mec1753qsz.dtsi
index 79b14172a64e9..df30851445728 100644
--- a/dts/arm/microchip/mec5_mec1753qsz.dtsi
+++ b/dts/arm/microchip/mec5_mec1753qsz.dtsi
@@ -7,7 +7,6 @@
 #include <arm/armv7-m.dtsi>
 
 #include "mec5.dtsi"
-#include "mec5/mec5_mec175xsz-espi-host-dev.dtsi"
 
 / {
 	flash0: flash@b0000 {
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index e1c8e6a2efbc8..ef47f4e5273fa 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -165,6 +165,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 40d872dda4463..0da4d7ccf94c4 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -169,6 +169,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 		timer0: timer@40008000 {
 			compatible = "nordic,nrf-timer";
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 735bfee427b26..8e65445cf5f96 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -200,6 +200,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index abb1aed468cb5..7e2dae5faff3d 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -212,6 +212,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index e8a033b40021b..93fac4a04b88d 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -226,6 +226,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index e2265c130b0d1..9624ae12dfbd0 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -214,6 +214,7 @@
 			interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			zephyr,pm-device-runtime-auto;
 		};
 
 		timer0: timer@40008000 {
diff --git a/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi b/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi
index 3e2eb31054262..f5cda20e9613f 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi
@@ -5,14 +5,12 @@
  */
 
 ipc0: ipc0 {
-	compatible = "zephyr,ipc-icbmsg";
-	status = "okay";
+	compatible = "zephyr,ipc-openamp-static-vrings";
+	memory-region = <&sram0_shared>;
 	mboxes = <&mbox 0>, <&mbox 1>;
 	mbox-names = "tx", "rx";
-	tx-region = <&cpuapp_cpunet_ipc_shm>;
-	rx-region = <&cpunet_cpuapp_ipc_shm>;
-	tx-blocks = <32>;
-	rx-blocks = <32>;
+	role = "host";
+	status = "okay";
 
 	bt_hci_ipc0: bt_hci_ipc0 {
 		compatible = "zephyr,bt-hci-ipc";
diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
index 75c2eb9f99f28..244459a0f16a5 100644
--- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
@@ -287,6 +287,7 @@ adc: adc@e000 {
 	interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
 	status = "disabled";
 	#io-channel-cells = <1>;
+	zephyr,pm-device-runtime-auto;
 };
 
 timer0: timer@f000 {
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index 4916703310945..acf95077669d5 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -347,14 +347,12 @@
 	/* Default IPC description */
 	ipc {
 		ipc0: ipc0 {
-			compatible = "zephyr,ipc-icbmsg";
-			status = "okay";
+			compatible = "zephyr,ipc-openamp-static-vrings";
+			memory-region = <&sram0_shared>;
 			mboxes = <&mbox 0>, <&mbox 1>;
 			mbox-names = "rx", "tx";
-			tx-region = <&cpunet_cpuapp_ipc_shm>;
-			rx-region = <&cpuapp_cpunet_ipc_shm>;
-			tx-blocks = <32>;
-			rx-blocks = <32>;
+			role = "remote";
+			status = "okay";
 		};
 	};
 };
diff --git a/dts/arm/nordic/nrf54h20_cpuapp.dtsi b/dts/arm/nordic/nrf54h20_cpuapp.dtsi
index c56df42ddd5b2..15eac9c5d197f 100644
--- a/dts/arm/nordic/nrf54h20_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpuapp.dtsi
@@ -59,3 +59,7 @@ wdt011: &cpuapp_wdt011 {};
 &grtc {
 	interrupts = <109 NRF_DEFAULT_IRQ_PRIORITY>;
 };
+
+&nfct {
+	compatible = "nordic,nrf-nfct-v2";
+};
diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index 469bccca5b022..2df3fc5967670 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -10,6 +10,11 @@ cpu: &cpuapp {};
 systick: &cpuapp_systick {};
 nvic: &cpuapp_nvic {};
 
+/delete-node/ &cpuflpr;
+/delete-node/ &cpuflpr_rram;
+/delete-node/ &cpuflpr_sram;
+/delete-node/ &cpuflpr_clic;
+
 / {
 	soc {
 		compatible = "simple-bus";
@@ -23,6 +28,27 @@ nvic: &cpuapp_nvic {};
 	};
 };
 
+&cpuflpr_vpr {
+	cpuapp_vevif_rx: mailbox@1 {
+		compatible = "nordic,nrf-vevif-event-rx";
+		reg = <0x0 0x1000>;
+		status = "disabled";
+		interrupts = <76 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+	};
+
+	cpuapp_vevif_tx: mailbox@0 {
+		compatible = "nordic,nrf-vevif-task-tx";
+		reg = <0x0 0x1000>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+		status = "disabled";
+	};
+};
+
 &cpuapp_ppb {
 	compatible = "simple-bus";
 	ranges;
diff --git a/dts/arm/nordic/nrf91_peripherals.dtsi b/dts/arm/nordic/nrf91_peripherals.dtsi
index 58cc3142bcf27..476f8415853a4 100644
--- a/dts/arm/nordic/nrf91_peripherals.dtsi
+++ b/dts/arm/nordic/nrf91_peripherals.dtsi
@@ -26,6 +26,7 @@ adc: adc@e000 {
 	interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
 	status = "disabled";
 	#io-channel-cells = <1>;
+	zephyr,pm-device-runtime-auto;
 };
 
 dppic0: dppic: dppic@17000 {
diff --git a/dts/arm/nuvoton/m55m1h2l.dtsi b/dts/arm/nuvoton/m55m1h2l.dtsi
new file mode 100644
index 0000000000000..a7148b25cdfcf
--- /dev/null
+++ b/dts/arm/nuvoton/m55m1h2l.dtsi
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <nuvoton/m55m1x.dtsi>
+
+/ {
+	sram0: memory@20100000 {
+		compatible = "mmio-sram";
+		reg = <0x20100000 DT_SIZE_K(1344)>;
+	};
+
+	dtcm: memory@20000000 {
+		compatible = "zephyr,memory-region", "arm,dtcm";
+		reg = <0x20000000 DT_SIZE_K(128)>;
+		zephyr,memory-region = "DTCM";
+	};
+
+	itcm: memory@0 {
+		compatible = "zephyr,memory-region", "arm,itcm";
+		reg = <0x00000000 DT_SIZE_K(64)>;
+		zephyr,memory-region = "ITCM";
+	};
+
+	soc {
+		fmc: flash-controller@40044000 {
+			flash0: flash@100000 {
+				reg = <0x100000 DT_SIZE_K(2048)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/nuvoton/m55m1x.dtsi b/dts/arm/nuvoton/m55m1x.dtsi
new file mode 100644
index 0000000000000..d0d17060552c9
--- /dev/null
+++ b/dts/arm/nuvoton/m55m1x.dtsi
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/armv8.1-m.dtsi>
+#include <mem.h>
+#include <freq.h>
+#include <zephyr/dt-bindings/clock/numaker_m55m1x_clock.h>
+#include <zephyr/dt-bindings/reset/numaker_m55m1x_reset.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	chosen {
+		zephyr,flash-controller = &fmc;
+	};
+
+	aliases {
+		rtc = &rtc;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-m55";
+			reg = <0>;
+		};
+	};
+
+	sysclk: system-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <DT_FREQ_M(220)>;
+		#clock-cells = <0>;
+	};
+
+	soc {
+		scc: system-clock-controller@40001000 {
+			compatible = "nuvoton,numaker-scc";
+			reg = <0x40001000 0x100>;
+			#clock-cells = <0>;
+			lxt = "enable";
+			clk-pclkdiv = <(NUMAKER_CLK_PCLKDIV_PCLK0DIV(2) |
+					NUMAKER_CLK_PCLKDIV_PCLK1DIV(2) |
+					NUMAKER_CLK_PCLKDIV_PCLK2DIV(2) |
+					NUMAKER_CLK_PCLKDIV_PCLK3DIV(2) |
+					NUMAKER_CLK_PCLKDIV_PCLK4DIV(2))>;
+			core-clock = <DT_FREQ_M(220)>;
+			powerdown-mode = <NUMAKER_PMC_SPD0>;
+
+			pcc: peripheral-clock-controller {
+				compatible = "nuvoton,numaker-pcc";
+				#clock-cells = <3>;
+			};
+		};
+
+		rst: reset-controller@40000000 {
+			compatible = "nuvoton,numaker-rst";
+			reg = <0x40000000 0x2e0>;
+			#reset-cells = <1>;
+		};
+
+		fmc: flash-controller@40044000 {
+			compatible = "nuvoton,numaker-fmc";
+			reg = <0x40044000 0x120>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash0: flash@100000 {
+				compatible = "soc-nv-flash";
+				erase-block-size = <8192>;
+				write-block-size = <4>;
+			};
+		};
+
+		uart0: serial@4024d000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x4024d000 0x1000>;
+			interrupts = <75 0>;
+			resets = <&rst NUMAKER_SYS_UART0RST>;
+			clocks = <&pcc NUMAKER_UART0_MODULE NUMAKER_CLK_UARTSEL0_UART0SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART0DIV(1)>;
+			status = "disabled";
+		};
+
+		uart1: serial@4028d000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x4028d000 0x1000>;
+			interrupts = <76 0>;
+			resets = <&rst NUMAKER_SYS_UART1RST>;
+			clocks = <&pcc NUMAKER_UART1_MODULE NUMAKER_CLK_UARTSEL0_UART1SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART1DIV(1)>;
+			status = "disabled";
+		};
+
+		uart2: serial@4024e000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x4024e000 0x1000>;
+			interrupts = <77 0>;
+			resets = <&rst NUMAKER_SYS_UART2RST>;
+			clocks = <&pcc NUMAKER_UART2_MODULE NUMAKER_CLK_UARTSEL0_UART2SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART2DIV(1)>;
+			status = "disabled";
+		};
+
+		uart3: serial@4028e000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x4028e000 0x1000>;
+			interrupts = <78 0>;
+			resets = <&rst NUMAKER_SYS_UART3RST>;
+			clocks = <&pcc NUMAKER_UART3_MODULE NUMAKER_CLK_UARTSEL0_UART3SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART3DIV(1)>;
+			status = "disabled";
+		};
+
+		uart4: serial@4024f000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x4024f000 0x1000>;
+			interrupts = <79 0>;
+			resets = <&rst NUMAKER_SYS_UART4RST>;
+			clocks = <&pcc NUMAKER_UART4_MODULE NUMAKER_CLK_UARTSEL0_UART4SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART4DIV(1)>;
+			status = "disabled";
+		};
+
+		uart5: serial@4028f000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x4028f000 0x1000>;
+			interrupts = <80 0>;
+			resets = <&rst NUMAKER_SYS_UART5RST>;
+			clocks = <&pcc NUMAKER_UART5_MODULE NUMAKER_CLK_UARTSEL0_UART5SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART5DIV(1)>;
+			status = "disabled";
+		};
+
+		uart6: serial@40250000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x40250000 0x1000>;
+			interrupts = <81 0>;
+			resets = <&rst NUMAKER_SYS_UART6RST>;
+			clocks = <&pcc NUMAKER_UART6_MODULE NUMAKER_CLK_UARTSEL0_UART6SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART6DIV(1)>;
+			status = "disabled";
+		};
+
+		uart7: serial@40290000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x40290000 0x1000>;
+			interrupts = <82 0>;
+			resets = <&rst NUMAKER_SYS_UART7RST>;
+			clocks = <&pcc NUMAKER_UART7_MODULE NUMAKER_CLK_UARTSEL0_UART7SEL_HIRC
+				  NUMAKER_CLK_UARTDIV0_UART7DIV(1)>;
+			status = "disabled";
+		};
+
+		uart8: serial@40251000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x40251000 0x1000>;
+			interrupts = <83 0>;
+			resets = <&rst NUMAKER_SYS_UART8RST>;
+			clocks = <&pcc NUMAKER_UART8_MODULE NUMAKER_CLK_UARTSEL1_UART8SEL_HIRC
+				  NUMAKER_CLK_UARTDIV1_UART8DIV(1)>;
+			status = "disabled";
+		};
+
+		uart9: serial@40291000 {
+			compatible = "nuvoton,numaker-uart";
+			reg = <0x40291000 0x1000>;
+			interrupts = <84 0>;
+			resets = <&rst NUMAKER_SYS_UART9RST>;
+			clocks = <&pcc NUMAKER_UART9_MODULE NUMAKER_CLK_UARTSEL1_UART9SEL_HIRC
+				  NUMAKER_CLK_UARTDIV1_UART9DIV(1)>;
+			status = "disabled";
+		};
+
+		pinctrl: pin-controller@40000080 {
+			compatible = "nuvoton,numaker-pinctrl";
+			reg = <0x40000080 0x30
+			       0x40000300 0x100>;
+			reg-names = "mfos", "mfp";
+		};
+
+		gpioa: gpio@40229000 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229000 0x40>;
+			clocks = <&pcc NUMAKER_GPIOA_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <20 2>;
+		};
+
+		gpiob: gpio@40229040 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229040 0x40>;
+			clocks = <&pcc NUMAKER_GPIOB_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <21 2>;
+		};
+
+		gpioc: gpio@40229080 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229080 0x40>;
+			clocks = <&pcc NUMAKER_GPIOC_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <22 2>;
+		};
+
+		gpiod: gpio@402290c0 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x402290c0 0x40>;
+			clocks = <&pcc NUMAKER_GPIOD_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <23 2>;
+		};
+
+		gpioe: gpio@40229100 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229100 0x40>;
+			clocks = <&pcc NUMAKER_GPIOE_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <24 2>;
+		};
+
+		gpiof: gpio@40229140 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229140 0x40>;
+			clocks = <&pcc NUMAKER_GPIOF_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <25 2>;
+		};
+
+		gpiog: gpio@40229180 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229180 0x40>;
+			clocks = <&pcc NUMAKER_GPIOG_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <26 2>;
+		};
+
+		gpioh: gpio@402291c0 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x402291c0 0x40>;
+			clocks = <&pcc NUMAKER_GPIOH_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <27 2>;
+		};
+
+		gpioi: gpio@40229200 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229200 0x40>;
+			clocks = <&pcc NUMAKER_GPIOI_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <28 2>;
+		};
+
+		gpioj: gpio@40229240 {
+			compatible = "nuvoton,numaker-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x40229240 0x40>;
+			clocks = <&pcc NUMAKER_GPIOJ_MODULE 0 0>;
+			status = "disabled";
+			interrupts = <29 2>;
+		};
+
+		rtc: rtc@40297000 {
+			compatible = "nuvoton,numaker-rtc";
+			reg = <0x40297000 0x1000>;
+			interrupts = <6 0>;
+			oscillator = "lxt";
+			clocks = <&pcc NUMAKER_RTC0_MODULE 0 0>;
+			alarms-count = <1>;
+		};
+
+		spi0: spi@4024b000 {
+			compatible = "nuvoton,numaker-spi";
+			reg = <0x4024b000 0x1000>;
+			interrupts = <66 0>;
+			resets = <&rst NUMAKER_SYS_SPI0RST>;
+			clocks = <&pcc NUMAKER_SPI0_MODULE NUMAKER_CLK_SPISEL_SPI0SEL_HIRC 0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		spi1: spi@4028b000 {
+			compatible = "nuvoton,numaker-spi";
+			reg = <0x4028b000 0x1000>;
+			interrupts = <67 0>;
+			resets = <&rst NUMAKER_SYS_SPI1RST>;
+			clocks = <&pcc NUMAKER_SPI1_MODULE NUMAKER_CLK_SPISEL_SPI1SEL_HIRC 0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		spi2: spi@4024c000 {
+			compatible = "nuvoton,numaker-spi";
+			reg = <0x4024c000 0x1000>;
+			interrupts = <68 0>;
+			resets = <&rst NUMAKER_SYS_SPI2RST>;
+			clocks = <&pcc NUMAKER_SPI2_MODULE NUMAKER_CLK_SPISEL_SPI2SEL_HIRC 0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		spi3: spi@4028c000 {
+			compatible = "nuvoton,numaker-spi";
+			reg = <0x4028c000 0x1000>;
+			interrupts = <69 0>;
+			resets = <&rst NUMAKER_SYS_SPI3RST>;
+			clocks = <&pcc NUMAKER_SPI3_MODULE NUMAKER_CLK_SPISEL_SPI3SEL_HIRC 0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		emac: ethernet@40208000 {
+			compatible = "nuvoton,numaker-ethernet";
+			reg = <0x40208000 0x2000>;
+			interrupts = <63 0>;
+			resets = <&rst NUMAKER_SYS_EMAC0RST>;
+			phy-addr = <0>;
+			clocks = <&pcc NUMAKER_EMAC0_MODULE 0 0>;
+			status = "disabled";
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <3>;
+};
diff --git a/dts/arm/nuvoton/npcx9m7fb.dtsi b/dts/arm/nuvoton/npcx9m7fb.dtsi
index 7c17ff099345a..176bf52b7d147 100644
--- a/dts/arm/nuvoton/npcx9m7fb.dtsi
+++ b/dts/arm/nuvoton/npcx9m7fb.dtsi
@@ -16,13 +16,14 @@
 		reg = <0x64000000 DT_SIZE_K(512)>;
 	};
 
-	sram0: memory@200c0000 {
+	sram0: memory@200b0000 {
 		compatible = "mmio-sram";
 		reg = <0x200B0000 DT_SIZE_K(128)>;
 	};
 
 	soc-id {
 		device-id = <0x62>;
+		revision-reg = <0x00017FFC 4>;
 	};
 };
 
diff --git a/dts/arm/nxp/nxp_imx95_m7.dtsi b/dts/arm/nxp/nxp_imx95_m7.dtsi
index f06d2cfcee464..9437c579d8523 100644
--- a/dts/arm/nxp/nxp_imx95_m7.dtsi
+++ b/dts/arm/nxp/nxp_imx95_m7.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,6 +7,7 @@
 #include <arm/armv7-m.dtsi>
 #include <zephyr/dt-bindings/clock/imx95_clock.h>
 #include <dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include <mem.h>
 
 / {
@@ -49,6 +50,12 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
+			scmi_devpd: protocol@11 {
+				compatible = "arm,scmi-power";
+				reg = <0x11>;
+				#power-domain-cells = <1>;
+			};
+
 			scmi_clk: protocol@14 {
 				compatible = "arm,scmi-clock";
 				reg = <0x14>;
@@ -77,6 +84,51 @@
 			reg = <0x20000000 DT_SIZE_K(256)>;
 		};
 
+		gpio1: gpio@47400000 {
+			compatible = "nxp,imx-rgpio";
+			reg = <0x47400000 DT_SIZE_K(64)>;
+			interrupts = <10 0>, <11 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+		};
+
+		gpio2: gpio@43810000 {
+			compatible = "nxp,imx-rgpio";
+			reg = <0x43810000 DT_SIZE_K(64)>;
+			interrupts = <49 0>, <50 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <32>;
+		};
+
+		gpio3: gpio@43820000 {
+			compatible = "nxp,imx-rgpio";
+			reg = <0x43820000 DT_SIZE_K(64)>;
+			interrupts = <51 0>, <52 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <32>;
+		};
+
+		gpio4: gpio@43840000 {
+			compatible = "nxp,imx-rgpio";
+			reg = <0x43840000 DT_SIZE_K(64)>;
+			interrupts = <53 0>, <54 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <30>;
+		};
+
+		gpio5: gpio@43850000 {
+			compatible = "nxp,imx-rgpio";
+			reg = <0x43850000 DT_SIZE_K(64)>;
+			interrupts = <55 0>, <56 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <18>;
+		};
+
 		edma2: dma@42000000 {
 			compatible = "nxp,edma";
 			reg = <0x42000000 (DT_SIZE_K(64) * 33)>;
@@ -413,9 +465,218 @@
 			interrupts = <205 0>;
 			#mbox-cells = <1>;
 		};
+
+		mu7: mailbox@42440000 {
+			compatible = "nxp,mbox-imx-mu";
+			reg = <0x42440000 DT_SIZE_K(4)>;
+			interrupts = <207 0>;
+			#mbox-cells = <1>;
+			status = "disabled";
+		};
+
+		irqsteer: interrupt-controller@44680000 {
+			compatible = "nxp,irqsteer-intc";
+			reg = <0x44680000 DT_SIZE_K(64)>;
+
+			#size-cells = <0>;
+			#address-cells = <1>;
+
+			irqsteer_master0: interrupt-controller@0 {
+				compatible = "nxp,irqsteer-master";
+				reg = <0>;
+				interrupt-controller;
+				#interrupt-cells = <1>;
+				interrupts-extended = <&nvic 224 0>;
+			};
+		};
+
+		netc: ethernet@4ca00000 {
+			reg = <0x4ca00000 0x1000000>;
+			interrupt-parent = <&irqsteer_master0>;
+			interrupts = <13 0 0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+
+			emdio: mdio@4cce0000 {
+				compatible = "nxp,imx-netc-emdio";
+				reg = <0x4cce0000 0x1c44>;
+				clocks = <&scmi_clk IMX95_CLK_ENET>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+			};
+
+			enetc_psi0: ethernet@4cc00000 {
+				compatible = "nxp,imx-netc-psi";
+				reg = <0x4cc00000 0x10000>;
+				mac-index = <0>;
+				si-index = <0>;
+				status = "disabled";
+			};
+
+			enetc_psi1: ethernet@4cc40000 {
+				compatible = "nxp,imx-netc-psi";
+				reg = <0x4cc40000 0x10000>;
+				mac-index = <1>;
+				si-index = <1>;
+				status = "disabled";
+			};
+
+			enetc_psi2: ethernet@4cc80000 {
+				compatible = "nxp,imx-netc-psi";
+				reg = <0x4cc80000 0x10000>;
+				mac-index = <2>;
+				si-index = <2>;
+				status = "disabled";
+			};
+		};
 	};
 };
 
 &nvic {
 	arm,num-irq-priority-bits = <4>;
 };
+
+&gpio1 {
+	pinmux = <&iomuxc_i2c1_scl_gpio_io_bit_gpio1_io_bit0>,
+		<&iomuxc_i2c1_sda_gpio_io_bit_gpio1_io_bit1>,
+		<&iomuxc_i2c2_scl_gpio_io_bit_gpio1_io_bit2>,
+		<&iomuxc_i2c2_sda_gpio_io_bit_gpio1_io_bit3>,
+		<&iomuxc_uart1_rxd_gpio_io_bit_gpio1_io_bit4>,
+		<&iomuxc_uart1_txd_gpio_io_bit_gpio1_io_bit5>,
+		<&iomuxc_uart2_rxd_gpio_io_bit_gpio1_io_bit6>,
+		<&iomuxc_uart2_txd_gpio_io_bit_gpio1_io_bit7>,
+		<&iomuxc_pdm_clk_gpio_io_bit_gpio1_io_bit8>,
+		<&iomuxc_pdm_bit_stream0_gpio_io_bit_gpio1_io_bit9>,
+		<&iomuxc_pdm_bit_stream1_gpio_io_bit_gpio1_io_bit10>,
+		<&iomuxc_sai1_txfs_gpio_io_bit_gpio1_io_bit11>,
+		<&iomuxc_sai1_txc_gpio_io_bit_gpio1_io_bit12>,
+		<&iomuxc_sai1_txd0_gpio_io_bit_gpio1_io_bit13>,
+		<&iomuxc_sai1_rxd0_gpio_io_bit_gpio1_io_bit14>,
+		<&iomuxc_wdog_any_gpio_io_bit_gpio1_io_bit15>;
+};
+
+&gpio2 {
+	pinmux = <&iomuxc_gpio_io00_gpio_io_bit_gpio2_io_bit0>,
+		<&iomuxc_gpio_io01_gpio_io_bit_gpio2_io_bit1>,
+		<&iomuxc_gpio_io02_gpio_io_bit_gpio2_io_bit2>,
+		<&iomuxc_gpio_io03_gpio_io_bit_gpio2_io_bit3>,
+		<&iomuxc_gpio_io04_gpio_io_bit_gpio2_io_bit4>,
+		<&iomuxc_gpio_io05_gpio_io_bit_gpio2_io_bit5>,
+		<&iomuxc_gpio_io06_gpio_io_bit_gpio2_io_bit6>,
+		<&iomuxc_gpio_io07_gpio_io_bit_gpio2_io_bit7>,
+		<&iomuxc_gpio_io08_gpio_io_bit_gpio2_io_bit8>,
+		<&iomuxc_gpio_io09_gpio_io_bit_gpio2_io_bit9>,
+		<&iomuxc_gpio_io10_gpio_io_bit_gpio2_io_bit10>,
+		<&iomuxc_gpio_io11_gpio_io_bit_gpio2_io_bit11>,
+		<&iomuxc_gpio_io12_gpio_io_bit_gpio2_io_bit12>,
+		<&iomuxc_gpio_io13_gpio_io_bit_gpio2_io_bit13>,
+		<&iomuxc_gpio_io14_gpio_io_bit_gpio2_io_bit14>,
+		<&iomuxc_gpio_io15_gpio_io_bit_gpio2_io_bit15>,
+		<&iomuxc_gpio_io16_gpio_io_bit_gpio2_io_bit16>,
+		<&iomuxc_gpio_io17_gpio_io_bit_gpio2_io_bit17>,
+		<&iomuxc_gpio_io18_gpio_io_bit_gpio2_io_bit18>,
+		<&iomuxc_gpio_io19_gpio_io_bit_gpio2_io_bit19>,
+		<&iomuxc_gpio_io20_gpio_io_bit_gpio2_io_bit20>,
+		<&iomuxc_gpio_io21_gpio_io_bit_gpio2_io_bit21>,
+		<&iomuxc_gpio_io22_gpio_io_bit_gpio2_io_bit22>,
+		<&iomuxc_gpio_io23_gpio_io_bit_gpio2_io_bit23>,
+		<&iomuxc_gpio_io24_gpio_io_bit_gpio2_io_bit24>,
+		<&iomuxc_gpio_io25_gpio_io_bit_gpio2_io_bit25>,
+		<&iomuxc_gpio_io26_gpio_io_bit_gpio2_io_bit26>,
+		<&iomuxc_gpio_io27_gpio_io_bit_gpio2_io_bit27>,
+		<&iomuxc_gpio_io28_gpio_io_bit_gpio2_io_bit28>,
+		<&iomuxc_gpio_io29_gpio_io_bit_gpio2_io_bit29>,
+		<&iomuxc_gpio_io30_gpio_io_bit_gpio2_io_bit30>,
+		<&iomuxc_gpio_io31_gpio_io_bit_gpio2_io_bit31>;
+};
+
+&gpio3 {
+	pinmux = <&iomuxc_sd2_cd_b_gpio_io_bit_gpio3_io_bit0>,
+		<&iomuxc_sd2_clk_gpio_io_bit_gpio3_io_bit1>,
+		<&iomuxc_sd2_cmd_gpio_io_bit_gpio3_io_bit2>,
+		<&iomuxc_sd2_data0_gpio_io_bit_gpio3_io_bit3>,
+		<&iomuxc_sd2_data1_gpio_io_bit_gpio3_io_bit4>,
+		<&iomuxc_sd2_data2_gpio_io_bit_gpio3_io_bit5>,
+		<&iomuxc_sd2_data3_gpio_io_bit_gpio3_io_bit6>,
+		<&iomuxc_sd2_reset_b_gpio_io_bit_gpio3_io_bit7>,
+		<&iomuxc_sd1_clk_gpio_io_bit_gpio3_io_bit8>,
+		<&iomuxc_sd1_cmd_gpio_io_bit_gpio3_io_bit9>,
+		<&iomuxc_sd1_data0_gpio_io_bit_gpio3_io_bit10>,
+		<&iomuxc_sd1_data1_gpio_io_bit_gpio3_io_bit11>,
+		<&iomuxc_sd1_data2_gpio_io_bit_gpio3_io_bit12>,
+		<&iomuxc_sd1_data3_gpio_io_bit_gpio3_io_bit13>,
+		<&iomuxc_sd1_data4_gpio_io_bit_gpio3_io_bit14>,
+		<&iomuxc_sd1_data5_gpio_io_bit_gpio3_io_bit15>,
+		<&iomuxc_sd1_data6_gpio_io_bit_gpio3_io_bit16>,
+		<&iomuxc_sd1_data7_gpio_io_bit_gpio3_io_bit17>,
+		<&iomuxc_sd1_strobe_gpio_io_bit_gpio3_io_bit18>,
+		<&iomuxc_sd2_vselect_gpio_io_bit_gpio3_io_bit19>,
+		<&iomuxc_sd3_clk_gpio_io_bit_gpio3_io_bit20>,
+		<&iomuxc_sd3_cmd_gpio_io_bit_gpio3_io_bit21>,
+		<&iomuxc_sd3_data0_gpio_io_bit_gpio3_io_bit22>,
+		<&iomuxc_sd3_data1_gpio_io_bit_gpio3_io_bit23>,
+		<&iomuxc_sd3_data2_gpio_io_bit_gpio3_io_bit24>,
+		<&iomuxc_sd3_data3_gpio_io_bit_gpio3_io_bit25>,
+		<&iomuxc_ccm_clko1_gpio_io_bit_gpio3_io_bit26>,
+		<&iomuxc_ccm_clko2_gpio_io_bit_gpio3_io_bit27>,
+		<&iomuxc_dap_tdi_gpio_io_bit_gpio3_io_bit28>,
+		<&iomuxc_dap_tms_swdio_gpio_io_bit_gpio3_io_bit29>,
+		<&iomuxc_dap_tclk_swclk_gpio_io_bit_gpio3_io_bit30>,
+		<&iomuxc_dap_tdo_traceswo_gpio_io_bit_gpio3_io_bit31>;
+};
+
+&gpio4 {
+	pinmux = <&iomuxc_enet1_mdc_gpio_io_bit_gpio4_io_bit0>,
+		<&iomuxc_enet1_mdio_gpio_io_bit_gpio4_io_bit1>,
+		<&iomuxc_enet1_td3_gpio_io_bit_gpio4_io_bit2>,
+		<&iomuxc_enet1_td2_gpio_io_bit_gpio4_io_bit3>,
+		<&iomuxc_enet1_td1_gpio_io_bit_gpio4_io_bit4>,
+		<&iomuxc_enet1_td0_gpio_io_bit_gpio4_io_bit5>,
+		<&iomuxc_enet1_tx_ctl_gpio_io_bit_gpio4_io_bit6>,
+		<&iomuxc_enet1_txc_gpio_io_bit_gpio4_io_bit7>,
+		<&iomuxc_enet1_rx_ctl_gpio_io_bit_gpio4_io_bit8>,
+		<&iomuxc_enet1_rxc_gpio_io_bit_gpio4_io_bit9>,
+		<&iomuxc_enet1_rd0_gpio_io_bit_gpio4_io_bit10>,
+		<&iomuxc_enet1_rd1_gpio_io_bit_gpio4_io_bit11>,
+		<&iomuxc_enet1_rd2_gpio_io_bit_gpio4_io_bit12>,
+		<&iomuxc_enet1_rd3_gpio_io_bit_gpio4_io_bit13>,
+		<&iomuxc_enet2_mdc_gpio_io_bit_gpio4_io_bit14>,
+		<&iomuxc_enet2_mdio_gpio_io_bit_gpio4_io_bit15>,
+		<&iomuxc_enet2_td3_gpio_io_bit_gpio4_io_bit16>,
+		<&iomuxc_enet2_td2_gpio_io_bit_gpio4_io_bit17>,
+		<&iomuxc_enet2_td1_gpio_io_bit_gpio4_io_bit18>,
+		<&iomuxc_enet2_td0_gpio_io_bit_gpio4_io_bit19>,
+		<&iomuxc_enet2_tx_ctl_gpio_io_bit_gpio4_io_bit20>,
+		<&iomuxc_enet2_txc_gpio_io_bit_gpio4_io_bit21>,
+		<&iomuxc_enet2_rx_ctl_gpio_io_bit_gpio4_io_bit22>,
+		<&iomuxc_enet2_rxc_gpio_io_bit_gpio4_io_bit23>,
+		<&iomuxc_enet2_rd0_gpio_io_bit_gpio4_io_bit24>,
+		<&iomuxc_enet2_rd1_gpio_io_bit_gpio4_io_bit25>,
+		<&iomuxc_enet2_rd2_gpio_io_bit_gpio4_io_bit26>,
+		<&iomuxc_enet2_rd3_gpio_io_bit_gpio4_io_bit27>,
+		<&iomuxc_ccm_clko3_gpio_io_bit_gpio4_io_bit28>,
+		<&iomuxc_ccm_clko4_gpio_io_bit_gpio4_io_bit29>;
+};
+
+&gpio5 {
+	pinmux = <&iomuxc_xspi1_data0_gpio_io_bit_gpio5_io_bit0>,
+		<&iomuxc_xspi1_data1_gpio_io_bit_gpio5_io_bit1>,
+		<&iomuxc_xspi1_data2_gpio_io_bit_gpio5_io_bit2>,
+		<&iomuxc_xspi1_data3_gpio_io_bit_gpio5_io_bit3>,
+		<&iomuxc_xspi1_data4_gpio_io_bit_gpio5_io_bit4>,
+		<&iomuxc_xspi1_data5_gpio_io_bit_gpio5_io_bit5>,
+		<&iomuxc_xspi1_data6_gpio_io_bit_gpio5_io_bit6>,
+		<&iomuxc_xspi1_data7_gpio_io_bit_gpio5_io_bit7>,
+		<&iomuxc_xspi1_dqs_gpio_io_bit_gpio5_io_bit8>,
+		<&iomuxc_xspi1_sclk_gpio_io_bit_gpio5_io_bit9>,
+		<&iomuxc_xspi1_ss0_b_gpio_io_bit_gpio5_io_bit10>,
+		<&iomuxc_xspi1_ss1_b_gpio_io_bit_gpio5_io_bit11>,
+		<&iomuxc_gpio_io32_gpio_io_bit_gpio5_io_bit12>,
+		<&iomuxc_gpio_io33_gpio_io_bit_gpio5_io_bit13>,
+		<&iomuxc_gpio_io34_gpio_io_bit_gpio5_io_bit14>,
+		<&iomuxc_gpio_io35_gpio_io_bit_gpio5_io_bit15>,
+		<&iomuxc_gpio_io36_gpio_io_bit_gpio5_io_bit16>,
+		<&iomuxc_gpio_io37_gpio_io_bit_gpio5_io_bit17>;
+};
diff --git a/dts/arm/nxp/nxp_lpc55S2x.dtsi b/dts/arm/nxp/nxp_lpc55S2x.dtsi
index 22177cfe8e5db..d7525a4ef2aa8 100644
--- a/dts/arm/nxp/nxp_lpc55S2x.dtsi
+++ b/dts/arm/nxp/nxp_lpc55S2x.dtsi
@@ -34,3 +34,12 @@
 &iap {
 	status = "okay";
 };
+
+/*
+ * lpc55S_2x:
+ * Combine SRAM0, SRAM1, SRAM2 for total of 192K RAM
+ */
+&sram0 {
+	compatible = "mmio-sram";
+	reg = <0x20000000 DT_SIZE_K(192)>;
+};
diff --git a/dts/arm/nxp/nxp_lpc55S2x_common.dtsi b/dts/arm/nxp/nxp_lpc55S2x_common.dtsi
index 184c2feeaddb2..ca2670dbef80e 100644
--- a/dts/arm/nxp/nxp_lpc55S2x_common.dtsi
+++ b/dts/arm/nxp/nxp_lpc55S2x_common.dtsi
@@ -46,8 +46,9 @@
 	#size-cells = <1>;
 
 	sramx: memory@4000000 {
-		compatible = "mmio-sram";
+		compatible = "zephyr,memory-region", "mmio-sram";
 		reg = <0x4000000 DT_SIZE_K(32)>;
+		zephyr,memory-region = "SRAMX";
 	};
 
 	sram0: memory@20000000 {
@@ -56,17 +57,16 @@
 	};
 
 	sram1: memory@20010000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
+		compatible = "mmio-sram";
 		reg = <0x20010000 DT_SIZE_K(64)>;
-		zephyr,memory-region = "SRAM1";
 	};
 
 	sram2: memory@20020000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
+		compatible = "mmio-sram";
 		reg = <0x20020000 DT_SIZE_K(64)>;
-		zephyr,memory-region = "SRAM2";
 	};
 
+	/* SRAM 4 is used by PowerQuad when enabled */
 	sram4: memory@20040000 {
 		compatible = "zephyr,memory-region", "mmio-sram";
 		reg = <0x20040000 DT_SIZE_K(16)>;
diff --git a/dts/arm/nxp/nxp_lpc55S3x_common.dtsi b/dts/arm/nxp/nxp_lpc55S3x_common.dtsi
index 5fc7eeeaed110..ef68f22b390ae 100644
--- a/dts/arm/nxp/nxp_lpc55S3x_common.dtsi
+++ b/dts/arm/nxp/nxp_lpc55S3x_common.dtsi
@@ -41,8 +41,9 @@
 	 * LPC55x36: RAMX: 16K, SRAM0: 16K, SRAM1: 16K, SRAM2: 32K, SRAM3: 32K, SRAM4: 16K
 	 */
 	sramx: memory@4000000 {
-		compatible = "mmio-sram";
+		compatible = "zephyr,memory-region", "mmio-sram";
 		reg = <0x04000000 DT_SIZE_K(16)>;
+		zephyr,memory-region = "SRAMX";
 	};
 	sram0: memory@20000000 {
 		compatible = "mmio-sram";
diff --git a/dts/arm/nxp/nxp_mcxa153.dtsi b/dts/arm/nxp/nxp_mcxa153.dtsi
new file mode 100644
index 0000000000000..6cfeb3d75cf3b
--- /dev/null
+++ b/dts/arm/nxp/nxp_mcxa153.dtsi
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "arm,cortex-m33f";
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+		};
+	};
+
+	/* Dummy pinctrl node, filled with pin mux options at board level */
+	pinctrl: pinctrl {
+		compatible = "nxp,port-pinctrl";
+		status = "okay";
+	};
+
+	soc {
+		edma0: dma-controller@40080000 {
+			#dma-cells = <2>;
+			compatible = "nxp,mcux-edma";
+			nxp,version = <4>;
+			dma-channels = <4>;
+			dma-requests = <66>;
+
+			reg = <0x40080000 0x1000>;
+			interrupts = <2 0>, <3 0>, <4 0>, <5 0>;
+			no-error-irq;
+			status = "disabled";
+		};
+
+		fmu: flash-controller@40095000 {
+			compatible = "nxp,msf1";
+			reg = <0x40095000 0x1000>;
+			interrupts = <12 0>;
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash: flash@0 {
+				compatible = "soc-nv-flash";
+				reg = <0 DT_SIZE_K(128)>;
+				erase-block-size = <8192>;
+				write-block-size = <128>;
+			};
+		};
+
+		gpio0: gpio@40102000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40102000 0x1000>;
+			interrupts = <71 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&porta>;
+		};
+
+		gpio1: gpio@40103000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40103000 0x1000>;
+			interrupts = <72 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portb>;
+		};
+
+		gpio2: gpio@40104000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40104000 0x1000>;
+			interrupts = <73 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portc>;
+		};
+
+		gpio3: gpio@40105000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40105000 0x1000>;
+			interrupts = <74 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portd>;
+		};
+
+		lpuart0: lpuart@4009f000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x4009f000 0x1000>;
+			interrupts = <31 0>;
+			clocks = <&syscon MCUX_LPUART0_CLK>;
+			/* DMA channels 0 and 1, muxed to LPUART0 RX and TX */
+			dmas = <&edma0 0 21>, <&edma0 1 22>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart1: lpuart@400a0000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a0000 0x1000>;
+			interrupts = <32 0>;
+			clocks = <&syscon MCUX_LPUART1_CLK>;
+			/* DMA channels 2 and 3, muxed to LPUART1 RX and TX */
+			dmas = <&edma0 2 23>, <&edma0 3 24>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart2: lpuart@400a1000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a1000 0x1000>;
+			interrupts = <33 0>;
+			clocks = <&syscon MCUX_LPUART2_CLK>;
+			/* DMA channels 2 and 3, muxed to LPUART2 RX and TX */
+			dmas = <&edma0 2 25>, <&edma0 3 26>;
+			dma-names = "rx", "tx";
+		};
+
+		porta: pinmux@400bc000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bc000 0x1000>;
+			clocks = <&syscon MCUX_PORT0_CLK>;
+		};
+
+		portb: pinmux@400bd000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bd000 0x1000>;
+			clocks = <&syscon MCUX_PORT1_CLK>;
+		};
+
+		portc: pinmux@400be000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400be000 0x1000>;
+			clocks = <&syscon MCUX_PORT2_CLK>;
+		};
+
+		portd: pinmux@400bf000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bf000 0x1000>;
+			clocks = <&syscon MCUX_PORT3_CLK>;
+		};
+
+		sramx: memory@4000000 {
+			compatible = "mmio-sram";
+			reg = <0x4000000 DT_SIZE_K(8)>;
+		};
+
+		sram0: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 DT_SIZE_K(24)>;
+		};
+
+		syscon: syscon@40091000 {
+			compatible = "nxp,lpc-syscon";
+			reg = <0x40091000 0x4000>;
+			#clock-cells = <1>;
+
+			reset: reset {
+				compatible = "nxp,lpc-syscon-reset";
+				#reset-cells = <1>;
+			};
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <3>;
+};
diff --git a/dts/arm/nxp/nxp_mcxa156.dtsi b/dts/arm/nxp/nxp_mcxa156.dtsi
index c44cedf0e4595..248adc0379df9 100644
--- a/dts/arm/nxp/nxp_mcxa156.dtsi
+++ b/dts/arm/nxp/nxp_mcxa156.dtsi
@@ -309,9 +309,9 @@
 			};
 		};
 
-		flexpwm1: flexpwm@d0000 {
+		flexpwm1: flexpwm@400aa000 {
 			compatible = "nxp,flexpwm";
-			reg = <0xd0000 0x1000>;
+			reg = <0x400aa000 0x1000>;
 			interrupt-names = "RELOAD-ERROR", "FAULT";
 			interrupts = <79 0>, <80 0>;
 			flexpwm1_pwm0: pwm0 {
@@ -348,6 +348,19 @@
 			};
 		};
 
+		i3c0: i3c@40002000 {
+			compatible = "nxp,mcux-i3c";
+			reg = <0x40002000 0x1000>;
+			interrupts = <24 0>;
+			clocks = <&syscon MCUX_I3C_CLK>;
+			clk-divider = <4>;
+			clk-divider-slow = <1>;
+			clk-divider-tc = <1>;
+			status = "disabled";
+			#address-cells = <3>;
+			#size-cells = <0>;
+		};
+
 		lpadc0: lpadc@400af000 {
 			compatible = "nxp,lpc-lpadc";
 			reg = <0x400af000 0x1000>;
diff --git a/dts/arm/nxp/nxp_mcxa166.dtsi b/dts/arm/nxp/nxp_mcxa166.dtsi
new file mode 100644
index 0000000000000..9029d9f7e55a3
--- /dev/null
+++ b/dts/arm/nxp/nxp_mcxa166.dtsi
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2024-2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "arm,cortex-m33f";
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+		};
+	};
+
+	/* Dummy pinctrl node, filled with pin mux options at board level */
+	pinctrl: pinctrl {
+		compatible = "nxp,port-pinctrl";
+		status = "okay";
+	};
+
+	soc {
+		syscon: syscon@40091000 {
+			compatible = "nxp,lpc-syscon";
+			reg = <0x40091000 0x4000>;
+			#clock-cells = <1>;
+
+			reset: reset {
+				compatible = "nxp,lpc-syscon-reset";
+				#reset-cells = <1>;
+			};
+		};
+
+		sramx: memory@4000000 {
+			compatible = "mmio-sram";
+			reg = <0x4000000 DT_SIZE_K(8)>;
+		};
+
+		sram0: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 DT_SIZE_K(240)>;
+		};
+
+		porta: pinmux@400bc000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bc000 0x1000>;
+			clocks = <&syscon MCUX_PORT0_CLK>;
+		};
+
+		portb: pinmux@400bd000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bd000 0x1000>;
+			clocks = <&syscon MCUX_PORT1_CLK>;
+		};
+
+		portc: pinmux@400be000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400be000 0x1000>;
+			clocks = <&syscon MCUX_PORT2_CLK>;
+		};
+
+		portd: pinmux@400bf000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bf000 0x1000>;
+			clocks = <&syscon MCUX_PORT3_CLK>;
+		};
+
+		porte: pinmux@400c0000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400c0000 0x1000>;
+			clocks = <&syscon MCUX_PORT4_CLK>;
+		};
+
+		gpio0: gpio@40102000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40102000 0x1000>;
+			interrupts = <71 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&porta>;
+		};
+
+		gpio1: gpio@40103000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40103000 0x1000>;
+			interrupts = <72 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portb>;
+		};
+
+		gpio2: gpio@40104000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40104000 0x1000>;
+			interrupts = <73 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portc>;
+		};
+
+		gpio3: gpio@40105000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40105000 0x1000>;
+			interrupts = <74 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portd>;
+		};
+
+		gpio4: gpio@40106000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40106000 0x1000>;
+			interrupts = <75 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&porte>;
+		};
+
+		lpuart0: lpuart@4009f000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x4009f000 0x1000>;
+			interrupts = <31 0>;
+			clocks = <&syscon MCUX_LPUART0_CLK>;
+			/* DMA channels 0 and 1 muxed to LPUART0 RX and TX */
+			dmas = <&edma0 0 21>, <&edma0 1 22>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart1: lpuart@4009a000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x4009a000 0x1000>;
+			interrupts = <32 0>;
+			clocks = <&syscon MCUX_LPUART1_CLK>;
+			/* DMA channels 2 and 3 muxed to LPUART1 RX and TX */
+			dmas = <&edma0 2 23>, <&edma0 3 24>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart2: lpuart@400a1000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a1000 0x1000>;
+			interrupts = <33 0>;
+			clocks = <&syscon MCUX_LPUART2_CLK>;
+			/* DMA channels 4 and 5, muxed to LPUART2 RX and TX */
+			dmas = <&edma0 4 25>, <&edma0 5 26>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart3: lpuart@400a2000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a2000 0x1000>;
+			interrupts = <34 0>;
+			clocks = <&syscon MCUX_LPUART3_CLK>;
+			/* DMA channels 2 and 3, muxed to LPUART3 RX and TX */
+			dmas = <&edma0 6 27>, <&edma0 7 28>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart4: lpuart@400a3000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a3000 0x1000>;
+			interrupts = <34 0>;
+			clocks = <&syscon MCUX_LPUART4_CLK>;
+			/* DMA channels 0 and 1 muxed to LPUART4 RX and TX */
+			dmas = <&edma0 0 29>, <&edma0 1 30>;
+			dma-names = "rx", "tx";
+		};
+
+		fmu: flash-controller@40095000 {
+			compatible = "nxp,msf1";
+			reg = <0x40095000 0x1000>;
+			interrupts = <12 0>;
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash: flash@0 {
+				compatible = "soc-nv-flash";
+				reg = <0 DT_SIZE_M(1)>;
+				erase-block-size = <8192>;
+				write-block-size = <128>;
+			};
+		};
+
+		edma0: dma-controller@40080000 {
+			#dma-cells = <2>;
+			compatible = "nxp,mcux-edma";
+			nxp,version = <4>;
+			dma-channels = <8>;
+			dma-requests = <131>;
+
+			reg = <0x40080000 0x1000>;
+			interrupts = <2 0>, <3 0>, <4 0>, <5 0>,
+				<6 0>, <7 0>, <8 0>, <9 0>;
+			no-error-irq;
+			status = "disabled";
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <3>;
+};
diff --git a/dts/arm/nxp/nxp_mcxa276.dtsi b/dts/arm/nxp/nxp_mcxa276.dtsi
new file mode 100644
index 0000000000000..9029d9f7e55a3
--- /dev/null
+++ b/dts/arm/nxp/nxp_mcxa276.dtsi
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2024-2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "arm,cortex-m33f";
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+		};
+	};
+
+	/* Dummy pinctrl node, filled with pin mux options at board level */
+	pinctrl: pinctrl {
+		compatible = "nxp,port-pinctrl";
+		status = "okay";
+	};
+
+	soc {
+		syscon: syscon@40091000 {
+			compatible = "nxp,lpc-syscon";
+			reg = <0x40091000 0x4000>;
+			#clock-cells = <1>;
+
+			reset: reset {
+				compatible = "nxp,lpc-syscon-reset";
+				#reset-cells = <1>;
+			};
+		};
+
+		sramx: memory@4000000 {
+			compatible = "mmio-sram";
+			reg = <0x4000000 DT_SIZE_K(8)>;
+		};
+
+		sram0: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 DT_SIZE_K(240)>;
+		};
+
+		porta: pinmux@400bc000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bc000 0x1000>;
+			clocks = <&syscon MCUX_PORT0_CLK>;
+		};
+
+		portb: pinmux@400bd000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bd000 0x1000>;
+			clocks = <&syscon MCUX_PORT1_CLK>;
+		};
+
+		portc: pinmux@400be000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400be000 0x1000>;
+			clocks = <&syscon MCUX_PORT2_CLK>;
+		};
+
+		portd: pinmux@400bf000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400bf000 0x1000>;
+			clocks = <&syscon MCUX_PORT3_CLK>;
+		};
+
+		porte: pinmux@400c0000 {
+			compatible = "nxp,port-pinmux";
+			reg = <0x400c0000 0x1000>;
+			clocks = <&syscon MCUX_PORT4_CLK>;
+		};
+
+		gpio0: gpio@40102000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40102000 0x1000>;
+			interrupts = <71 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&porta>;
+		};
+
+		gpio1: gpio@40103000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40103000 0x1000>;
+			interrupts = <72 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portb>;
+		};
+
+		gpio2: gpio@40104000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40104000 0x1000>;
+			interrupts = <73 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portc>;
+		};
+
+		gpio3: gpio@40105000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40105000 0x1000>;
+			interrupts = <74 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&portd>;
+		};
+
+		gpio4: gpio@40106000 {
+			compatible = "nxp,kinetis-gpio";
+			status = "disabled";
+			reg = <0x40106000 0x1000>;
+			interrupts = <75 0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			nxp,kinetis-port = <&porte>;
+		};
+
+		lpuart0: lpuart@4009f000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x4009f000 0x1000>;
+			interrupts = <31 0>;
+			clocks = <&syscon MCUX_LPUART0_CLK>;
+			/* DMA channels 0 and 1 muxed to LPUART0 RX and TX */
+			dmas = <&edma0 0 21>, <&edma0 1 22>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart1: lpuart@4009a000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x4009a000 0x1000>;
+			interrupts = <32 0>;
+			clocks = <&syscon MCUX_LPUART1_CLK>;
+			/* DMA channels 2 and 3 muxed to LPUART1 RX and TX */
+			dmas = <&edma0 2 23>, <&edma0 3 24>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart2: lpuart@400a1000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a1000 0x1000>;
+			interrupts = <33 0>;
+			clocks = <&syscon MCUX_LPUART2_CLK>;
+			/* DMA channels 4 and 5, muxed to LPUART2 RX and TX */
+			dmas = <&edma0 4 25>, <&edma0 5 26>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart3: lpuart@400a2000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a2000 0x1000>;
+			interrupts = <34 0>;
+			clocks = <&syscon MCUX_LPUART3_CLK>;
+			/* DMA channels 2 and 3, muxed to LPUART3 RX and TX */
+			dmas = <&edma0 6 27>, <&edma0 7 28>;
+			dma-names = "rx", "tx";
+		};
+
+		lpuart4: lpuart@400a3000 {
+			compatible = "nxp,lpuart";
+			status = "disabled";
+			reg = <0x400a3000 0x1000>;
+			interrupts = <34 0>;
+			clocks = <&syscon MCUX_LPUART4_CLK>;
+			/* DMA channels 0 and 1 muxed to LPUART4 RX and TX */
+			dmas = <&edma0 0 29>, <&edma0 1 30>;
+			dma-names = "rx", "tx";
+		};
+
+		fmu: flash-controller@40095000 {
+			compatible = "nxp,msf1";
+			reg = <0x40095000 0x1000>;
+			interrupts = <12 0>;
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash: flash@0 {
+				compatible = "soc-nv-flash";
+				reg = <0 DT_SIZE_M(1)>;
+				erase-block-size = <8192>;
+				write-block-size = <128>;
+			};
+		};
+
+		edma0: dma-controller@40080000 {
+			#dma-cells = <2>;
+			compatible = "nxp,mcux-edma";
+			nxp,version = <4>;
+			dma-channels = <8>;
+			dma-requests = <131>;
+
+			reg = <0x40080000 0x1000>;
+			interrupts = <2 0>, <3 0>, <4 0>, <5 0>,
+				<6 0>, <7 0>, <8 0>, <9 0>;
+			no-error-irq;
+			status = "disabled";
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <3>;
+};
diff --git a/dts/arm/nxp/nxp_mcxn23x_common.dtsi b/dts/arm/nxp/nxp_mcxn23x_common.dtsi
index ff64cf09d0e42..69732818ddb3d 100644
--- a/dts/arm/nxp/nxp_mcxn23x_common.dtsi
+++ b/dts/arm/nxp/nxp_mcxn23x_common.dtsi
@@ -192,8 +192,8 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 		};
 		flexcomm0_lpi2c0: lpi2c@92800 {
 			compatible = "nxp,lpi2c";
@@ -233,8 +233,8 @@
 			/* DMA channels 0 and 1, muxed to LPSPI1 RX and TX */
 			dmas = <&edma0 0 71>, <&edma0 1 72>;
 			dma-names = "rx", "tx";
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 			status = "disabled";
 		};
 		flexcomm1_lpi2c1: lpi2c@93800 {
@@ -275,8 +275,8 @@
 			/* DMA channels 4 and 5, muxed to LPSPI2 RX and TX */
 			dmas = <&edma0 4 73>, <&edma0 5 74>;
 			dma-names = "rx", "tx";
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 			status = "disabled";
 		};
 		flexcomm2_lpi2c2: lpi2c@94800 {
@@ -311,8 +311,8 @@
 			clocks = <&syscon MCUX_FLEXCOMM3_CLK>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 			status = "disabled";
 		};
 		flexcomm3_lpi2c3: lpi2c@95800 {
@@ -353,8 +353,8 @@
 			/* DMA channels 2 and 3, muxed to LPSPI4 RX and TX */
 			dmas = <&edma0 2 77>, <&edma0 3 78>;
 			dma-names = "rx", "tx";
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 			status = "disabled";
 		};
 		flexcomm4_lpi2c4: lpi2c@b4800 {
@@ -389,8 +389,8 @@
 			clocks = <&syscon MCUX_FLEXCOMM5_CLK>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 			status = "disabled";
 		};
 		flexcomm5_lpi2c5: lpi2c@b5800 {
@@ -425,8 +425,8 @@
 			clocks = <&syscon MCUX_FLEXCOMM6_CLK>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 			status = "disabled";
 		};
 		flexcomm6_lpi2c6: lpi2c@b6800 {
@@ -461,8 +461,8 @@
 			clocks = <&syscon MCUX_FLEXCOMM7_CLK>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			tx-fifo-size = <16>;
-			rx-fifo-size = <16>;
+			tx-fifo-size = <8>;
+			rx-fifo-size = <8>;
 			status = "disabled";
 		};
 		flexcomm7_lpi2c7: lpi2c@b7800 {
diff --git a/dts/arm/nxp/nxp_mcxn94x_common.dtsi b/dts/arm/nxp/nxp_mcxn94x_common.dtsi
index 195725a53c9d7..c4c1a1ec3be48 100644
--- a/dts/arm/nxp/nxp_mcxn94x_common.dtsi
+++ b/dts/arm/nxp/nxp_mcxn94x_common.dtsi
@@ -47,13 +47,13 @@
 	sramx: memory@4000000 {
 		compatible =  "zephyr,memory-region", "mmio-sram";
 		reg = <0x4000000 DT_SIZE_K(96)>;
-		zephyr,memory-region = "SRAM1";
+		zephyr,memory-region = "SRAMX";
 		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM) )>;
 	};
 
 	/* mcxn94x Memory configurations:
 	 *
-	 * RAM blocks RAMA through SRAM4 are contiguous address ranges
+	 * RAM blocks RAMA through RAMH are contiguous address ranges
 	 *
 	 * MCXN94X: 512KB RAM, RAMX: 96K, RAMA: 32K, RAMB: 32K,
 	 *                     RAMC: 64K, RAMD: 64K, RAME: 64K
diff --git a/dts/arm/nxp/nxp_mcxw7x_common.dtsi b/dts/arm/nxp/nxp_mcxw7x_common.dtsi
index dba26683e83c9..7e0a42c405726 100644
--- a/dts/arm/nxp/nxp_mcxw7x_common.dtsi
+++ b/dts/arm/nxp/nxp_mcxw7x_common.dtsi
@@ -19,6 +19,8 @@
 
 	chosen {
 		zephyr,bt-hci = &hci;
+		zephyr,ieee802154 = &ieee802154;
+		zephyr,entropy = &trng;
 		zephyr,nbu = &nbu;
 	};
 
@@ -286,6 +288,14 @@
 		compatible = "nxp,hci-ble";
 	};
 
+	ieee802154: ieee802154 {
+		compatible = "nxp,mcxw-ieee802154";
+	};
+
+	trng: trng {
+		compatible = "nxp,ele-trng";
+	};
+
 	flexcan0: can@3b000 {
 		compatible = "nxp,flexcan";
 		reg = <0x3b000 0x3080>;
diff --git a/dts/arm/nxp/nxp_rt1010.dtsi b/dts/arm/nxp/nxp_rt1010.dtsi
index d077d331a07da..9698024c2091c 100644
--- a/dts/arm/nxp/nxp_rt1010.dtsi
+++ b/dts/arm/nxp/nxp_rt1010.dtsi
@@ -8,11 +8,6 @@
 
 &flexram {
 	flexram,num-ram-banks = <4>;
-	/* default fuse */
-	flexram,bank-spec = <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_ITCM>;
 };
 
 &sysclk {
diff --git a/dts/arm/nxp/nxp_rt1015.dtsi b/dts/arm/nxp/nxp_rt1015.dtsi
index c6bd1f59689a9..85087e0ea5afe 100644
--- a/dts/arm/nxp/nxp_rt1015.dtsi
+++ b/dts/arm/nxp/nxp_rt1015.dtsi
@@ -12,11 +12,6 @@
 	/* Note: RT1015 has five flexram banks, but only 4 of the 5 can
 	 * be used at the same time, for a total of 128KB of RAM.
 	 */
-	flexram,bank-spec = <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_ITCM>;
 };
 
 &sysclk {
diff --git a/dts/arm/nxp/nxp_rt1020.dtsi b/dts/arm/nxp/nxp_rt1020.dtsi
index b42a17960fa66..08f790cc426f4 100644
--- a/dts/arm/nxp/nxp_rt1020.dtsi
+++ b/dts/arm/nxp/nxp_rt1020.dtsi
@@ -9,15 +9,6 @@
 
 &flexram {
 	flexram,num-ram-banks = <8>;
-	/* default fuse */
-	flexram,bank-spec = <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>;
 };
 
 &sysclk {
diff --git a/dts/arm/nxp/nxp_rt1024.dtsi b/dts/arm/nxp/nxp_rt1024.dtsi
index 62262bb211873..dfb20d9c72e0f 100644
--- a/dts/arm/nxp/nxp_rt1024.dtsi
+++ b/dts/arm/nxp/nxp_rt1024.dtsi
@@ -9,15 +9,6 @@
 
 &flexram {
 	flexram,num-ram-banks = <8>;
-	/* default fuse */
-	flexram,bank-spec = <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>;
 };
 
 &sysclk {
diff --git a/dts/arm/nxp/nxp_rt1050.dtsi b/dts/arm/nxp/nxp_rt1050.dtsi
index 12e1c623bce69..0751617f3733f 100644
--- a/dts/arm/nxp/nxp_rt1050.dtsi
+++ b/dts/arm/nxp/nxp_rt1050.dtsi
@@ -7,23 +7,6 @@
 
 &flexram {
 	flexram,num-ram-banks = <16>;
-	/* default fuse */
-	flexram,bank-spec = <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>;
 };
 
 &ccm {
diff --git a/dts/arm/nxp/nxp_rt1060.dtsi b/dts/arm/nxp/nxp_rt1060.dtsi
index 2bf3395b18b5d..1e66b01614afa 100644
--- a/dts/arm/nxp/nxp_rt1060.dtsi
+++ b/dts/arm/nxp/nxp_rt1060.dtsi
@@ -16,23 +16,6 @@
 	};
 
 	flexram,num-ram-banks = <16>;
-	/* default fuse */
-	flexram,bank-spec = <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>;
 };
 
 &ccm {
diff --git a/dts/arm/nxp/nxp_rt1064.dtsi b/dts/arm/nxp/nxp_rt1064.dtsi
index 02ea70d40f905..fb3fccb01b4b8 100644
--- a/dts/arm/nxp/nxp_rt1064.dtsi
+++ b/dts/arm/nxp/nxp_rt1064.dtsi
@@ -9,23 +9,6 @@
 
 &flexram {
 	flexram,num-ram-banks = <16>;
-	/* default fuse */
-	flexram,bank-spec = <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_ITCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_DTCM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>,
-			     <FLEXRAM_OCRAM>;
 };
 
 &flexspi2 {
diff --git a/dts/arm/nxp/nxp_rt10xx.dtsi b/dts/arm/nxp/nxp_rt10xx.dtsi
index c2f55fba8724b..80e5a1e7863e2 100644
--- a/dts/arm/nxp/nxp_rt10xx.dtsi
+++ b/dts/arm/nxp/nxp_rt10xx.dtsi
@@ -14,9 +14,12 @@
 #include <zephyr/dt-bindings/memory-controller/nxp,flexram.h>
 
 / {
+	aliases {
+		die-temp0 = &tempmon;
+	};
+
 	chosen {
 		zephyr,entropy = &trng;
-		die-temp0 = &tempmon;
 	};
 
 	cpus {
@@ -893,14 +896,13 @@
 			dma-channels = <32>;
 			dma-requests = <128>;
 			nxp,mem2mem;
-			nxp,a_on;
+			nxp,a-on;
 			reg = <0x400E8000 0x4000>,
 				<0x400EC000 0x4000>;
 			interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
 				<4 0>, <5 0>, <6 0>, <7 0>,
 				<8 0>, <9 0>, <10 0>, <11 0>,
-				<12 0>, <13 0>, <14 0>, <15 0>,
-				<16 0>;
+				<12 0>, <13 0>, <14 0>, <15 0>;
 			irq-shared-offset = <16>;
 			clocks = <&ccm IMX_CCM_EDMA_CLK 0x7C 0x000000C0>;
 			status = "disabled";
diff --git a/dts/arm/nxp/nxp_rt118x.dtsi b/dts/arm/nxp/nxp_rt118x.dtsi
index 4a86f8d463422..dc25cfb24ecb4 100644
--- a/dts/arm/nxp/nxp_rt118x.dtsi
+++ b/dts/arm/nxp/nxp_rt118x.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1019,6 +1019,30 @@
 		#size-cells = <0>;
 	};
 
+	usdhc1: usdhc@2850000 {
+		compatible = "nxp,imx-usdhc";
+		reg = <0x2850000 0x4000>;
+		status = "disabled";
+		interrupts = <86 0>;
+		clocks = <&ccm IMX_CCM_USDHC1_CLK 0 0>;
+		max-current-330 = <1020>;
+		max-current-180 = <1020>;
+		max-bus-freq = <208000000>;
+		min-bus-freq = <400000>;
+	};
+
+	usdhc2: usdhc@2860000 {
+		compatible = "nxp,imx-usdhc";
+		reg = <0x2860000 0x4000>;
+		status = "disabled";
+		interrupts = <87 0>;
+		clocks = <&ccm IMX_CCM_USDHC2_CLK 0 0>;
+		max-current-330 = <1020>;
+		max-current-180 = <1020>;
+		max-bus-freq = <208000000>;
+		min-bus-freq = <400000>;
+	};
+
 	edma3: dma-controller@4000000 {
 		#dma-cells = <2>;
 		compatible = "nxp,mcux-edma";
diff --git a/dts/arm/nxp/nxp_rt118x_cm33.dtsi b/dts/arm/nxp/nxp_rt118x_cm33.dtsi
index 83892d1702874..b77431936d915 100644
--- a/dts/arm/nxp/nxp_rt118x_cm33.dtsi
+++ b/dts/arm/nxp/nxp_rt118x_cm33.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -26,6 +26,12 @@
 			ranges = <0x0 0x30484000 0x10000000>;
 		};
 
+		m7_itcm: itcm@303c0000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			zephyr,memory-region = "M7_ITCM";
+			reg = <0x303c0000 DT_SIZE_K(256)>;
+		};
+
 		peripheral: peripheral@50000000 {
 			ranges = <0x0 0x50000000 0x10000000>;
 		};
@@ -48,6 +54,26 @@
 	};
 };
 
+&peripheral {
+	mbox1_a: mbox@4220000 {
+		compatible = "nxp,mbox-imx-mu";
+		reg = <0x4220000 0x4000>;
+		interrupts = <21 0>;
+		rx-channels = <4>;
+		#mbox-cells = <1>;
+		status = "okay";
+	};
+
+	mbox2_a: mbox@2430000 {
+		compatible = "nxp,mbox-imx-mu";
+		reg = <0x2430000 0x4000>;
+		interrupts = <22 0>;
+		rx-channels = <4>;
+		#mbox-cells = <1>;
+		status = "okay";
+	};
+};
+
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
@@ -60,7 +86,7 @@
 
 &gpio1{
 	pinmux = <&iomuxc_aon_gpio_aon_00_gpio1_io00>,
-	    <&iomuxc_aon_gpio_aon_01_gpio1_io01>,
+		<&iomuxc_aon_gpio_aon_01_gpio1_io01>,
 		<&iomuxc_aon_gpio_aon_02_gpio1_io02>,
 		<&iomuxc_aon_gpio_aon_03_gpio1_io03>,
 		<&iomuxc_aon_gpio_aon_04_gpio1_io04>,
@@ -91,7 +117,7 @@
 
 &gpio2{
 	pinmux = <&iomuxc_gpio_emc_b1_00_gpio2_io00>,
-	    <&iomuxc_gpio_emc_b1_01_gpio2_io01>,
+		<&iomuxc_gpio_emc_b1_01_gpio2_io01>,
 		<&iomuxc_gpio_emc_b1_02_gpio2_io02>,
 		<&iomuxc_gpio_emc_b1_03_gpio2_io03>,
 		<&iomuxc_gpio_emc_b1_04_gpio2_io04>,
@@ -126,7 +152,7 @@
 
 &gpio3{
 	pinmux = <&iomuxc_gpio_emc_b1_32_gpio3_io00>,
-	    <&iomuxc_gpio_emc_b1_33_gpio3_io01>,
+		<&iomuxc_gpio_emc_b1_33_gpio3_io01>,
 		<&iomuxc_gpio_emc_b1_34_gpio3_io02>,
 		<&iomuxc_gpio_emc_b1_35_gpio3_io03>,
 		<&iomuxc_gpio_emc_b1_36_gpio3_io04>,
diff --git a/dts/arm/nxp/nxp_rt118x_cm33_ns.dtsi b/dts/arm/nxp/nxp_rt118x_cm33_ns.dtsi
index 1b082a90fe6b7..5bd64f0ea6053 100644
--- a/dts/arm/nxp/nxp_rt118x_cm33_ns.dtsi
+++ b/dts/arm/nxp/nxp_rt118x_cm33_ns.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -26,6 +26,12 @@
 			ranges = <0x0 0x20484000 0x10000000>;
 		};
 
+		m7_itcm: itcm@203c0000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			zephyr,memory-region = "M7_ITCM";
+			reg = <0x203c0000 DT_SIZE_K(256)>;
+		};
+
 		peripheral: peripheral@40000000 {
 			ranges = <0x0 0x40000000 0x10000000>;
 		};
@@ -48,6 +54,26 @@
 	};
 };
 
+&peripheral {
+	mbox1_a: mbox@4220000 {
+		compatible = "nxp,mbox-imx-mu";
+		reg = <0x4220000 0x4000>;
+		interrupts = <21 0>;
+		rx-channels = <4>;
+		#mbox-cells = <1>;
+		status = "okay";
+	};
+
+	mbox2_a: mbox@2430000 {
+		compatible = "nxp,mbox-imx-mu";
+		reg = <0x2430000 0x4000>;
+		interrupts = <22 0>;
+		rx-channels = <4>;
+		#mbox-cells = <1>;
+		status = "okay";
+	};
+};
+
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
@@ -60,7 +86,7 @@
 
 &gpio1{
 	pinmux = <&iomuxc_aon_gpio_aon_00_gpio1_io00>,
-	    <&iomuxc_aon_gpio_aon_01_gpio1_io01>,
+		<&iomuxc_aon_gpio_aon_01_gpio1_io01>,
 		<&iomuxc_aon_gpio_aon_02_gpio1_io02>,
 		<&iomuxc_aon_gpio_aon_03_gpio1_io03>,
 		<&iomuxc_aon_gpio_aon_04_gpio1_io04>,
@@ -91,7 +117,7 @@
 
 &gpio2{
 	pinmux = <&iomuxc_gpio_emc_b1_00_gpio2_io00>,
-	    <&iomuxc_gpio_emc_b1_01_gpio2_io01>,
+		<&iomuxc_gpio_emc_b1_01_gpio2_io01>,
 		<&iomuxc_gpio_emc_b1_02_gpio2_io02>,
 		<&iomuxc_gpio_emc_b1_03_gpio2_io03>,
 		<&iomuxc_gpio_emc_b1_04_gpio2_io04>,
@@ -126,7 +152,7 @@
 
 &gpio3{
 	pinmux = <&iomuxc_gpio_emc_b1_32_gpio3_io00>,
-	    <&iomuxc_gpio_emc_b1_33_gpio3_io01>,
+		<&iomuxc_gpio_emc_b1_33_gpio3_io01>,
 		<&iomuxc_gpio_emc_b1_34_gpio3_io02>,
 		<&iomuxc_gpio_emc_b1_35_gpio3_io03>,
 		<&iomuxc_gpio_emc_b1_36_gpio3_io04>,
diff --git a/dts/arm/nxp/nxp_rt118x_cm7.dtsi b/dts/arm/nxp/nxp_rt118x_cm7.dtsi
index 50aa4aa7c4a3e..1b9cde67f4ced 100644
--- a/dts/arm/nxp/nxp_rt118x_cm7.dtsi
+++ b/dts/arm/nxp/nxp_rt118x_cm7.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,13 +10,15 @@
 / {
 	soc {
 		itcm: itcm@0{
-			compatible = "nxp,imx-itcm";
+			compatible = "zephyr,memory-region", "nxp,imx-itcm";
 			reg = <0x00000000 DT_SIZE_K(256)>;
+			zephyr,memory-region = "ITCM";
 		};
 
 		dtcm: dtcm@20000000 {
-			compatible = "nxp,imx-dtcm";
+			compatible = "zephyr,memory-region", "nxp,imx-dtcm";
 			reg = <0x20000000 DT_SIZE_K(256)>;
+			zephyr,memory-region = "DTCM";
 		};
 
 		memory: memory@20484000 {
@@ -45,6 +47,26 @@
 	};
 };
 
+&peripheral {
+	mbox1_b: mbox@4230000 {
+		compatible = "nxp,mbox-imx-mu";
+		reg = <0x4230000 0x4000>;
+		interrupts = <21 0>;
+		rx-channels = <4>;
+		#mbox-cells = <1>;
+		status = "okay";
+	};
+
+	mbox2_b: mbox@2440000 {
+		compatible = "nxp,mbox-imx-mu";
+		reg = <0x2440000 0x4000>;
+		interrupts = <22 0>;
+		rx-channels = <4>;
+		#mbox-cells = <1>;
+		status = "okay";
+	};
+};
+
 &nvic {
 	arm,num-irq-priority-bits = <4>;
 };
@@ -57,7 +79,7 @@
 
 &gpio1{
 	pinmux = <&iomuxc_aon_gpio_aon_00_gpio1_io00>,
-	    <&iomuxc_aon_gpio_aon_01_gpio1_io01>,
+		<&iomuxc_aon_gpio_aon_01_gpio1_io01>,
 		<&iomuxc_aon_gpio_aon_02_gpio1_io02>,
 		<&iomuxc_aon_gpio_aon_03_gpio1_io03>,
 		<&iomuxc_aon_gpio_aon_04_gpio1_io04>,
@@ -88,7 +110,7 @@
 
 &gpio2{
 	pinmux = <&iomuxc_gpio_emc_b1_00_gpio2_io00>,
-	    <&iomuxc_gpio_emc_b1_01_gpio2_io01>,
+		<&iomuxc_gpio_emc_b1_01_gpio2_io01>,
 		<&iomuxc_gpio_emc_b1_02_gpio2_io02>,
 		<&iomuxc_gpio_emc_b1_03_gpio2_io03>,
 		<&iomuxc_gpio_emc_b1_04_gpio2_io04>,
@@ -123,7 +145,7 @@
 
 &gpio3{
 	pinmux = <&iomuxc_gpio_emc_b1_32_gpio3_io00>,
-	    <&iomuxc_gpio_emc_b1_33_gpio3_io01>,
+		<&iomuxc_gpio_emc_b1_33_gpio3_io01>,
 		<&iomuxc_gpio_emc_b1_34_gpio3_io02>,
 		<&iomuxc_gpio_emc_b1_35_gpio3_io03>,
 		<&iomuxc_gpio_emc_b1_36_gpio3_io04>,
diff --git a/dts/arm/nxp/nxp_rt11xx.dtsi b/dts/arm/nxp/nxp_rt11xx.dtsi
index fba564e434614..6ef0fd76eb359 100644
--- a/dts/arm/nxp/nxp_rt11xx.dtsi
+++ b/dts/arm/nxp/nxp_rt11xx.dtsi
@@ -1060,7 +1060,7 @@
 			dma-channels = <32>;
 			dma-requests = <208>;
 			nxp,mem2mem;
-			nxp,a_on;
+			nxp,a-on;
 			reg = <0x40070000 0x4000>,
 				<0x40074000 0x4000>;
 			clocks = <&ccm IMX_CCM_EDMA_CLK 0x7C 0x000000C0>;
@@ -1068,8 +1068,7 @@
 			interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
 				<4 0>, <5 0>, <6 0>, <7 0>,
 				<8 0>, <9 0>, <10 0>, <11 0>,
-				<12 0>, <13 0>, <14 0>, <15 0>,
-				<16 0>;
+				<12 0>, <13 0>, <14 0>, <15 0>;
 			irq-shared-offset = <16>;
 		};
 
@@ -1080,7 +1079,7 @@
 			dma-channels = <32>;
 			dma-requests = <208>;
 			nxp,mem2mem;
-			nxp,a_on;
+			nxp,a-on;
 			reg = <0x40c14000 0x4000>,
 				<0x40c18000 0x4000>;
 			clocks = <&ccm IMX_CCM_EDMA_LPSR_CLK 0x7C 0x000000C0>;
@@ -1088,8 +1087,7 @@
 			interrupts = <0 0>, <1 0>, <2 0>, <3 0>,
 				<4 0>, <5 0>, <6 0>, <7 0>,
 				<8 0>, <9 0>, <10 0>, <11 0>,
-				<12 0>, <13 0>, <14 0>, <15 0>,
-				<16 0>;
+				<12 0>, <13 0>, <14 0>, <15 0>;
 			irq-shared-offset = <16>;
 		};
 
diff --git a/dts/arm/nxp/nxp_rt11xx_cm7.dtsi b/dts/arm/nxp/nxp_rt11xx_cm7.dtsi
index 88d1035ddc39f..9de83c4cf41c8 100644
--- a/dts/arm/nxp/nxp_rt11xx_cm7.dtsi
+++ b/dts/arm/nxp/nxp_rt11xx_cm7.dtsi
@@ -34,23 +34,6 @@
 			flexram,bank-size = <32>;
 			flexram,num-ram-banks = <16>;
 			flexram,has-magic-addr;
-			/* same as default fuse value */
-			flexram,bank-spec = <FLEXRAM_DTCM>,
-					     <FLEXRAM_DTCM>,
-					     <FLEXRAM_DTCM>,
-					     <FLEXRAM_DTCM>,
-					     <FLEXRAM_ITCM>,
-					     <FLEXRAM_ITCM>,
-					     <FLEXRAM_ITCM>,
-					     <FLEXRAM_ITCM>,
-					     <FLEXRAM_DTCM>,
-					     <FLEXRAM_DTCM>,
-					     <FLEXRAM_DTCM>,
-					     <FLEXRAM_DTCM>,
-					     <FLEXRAM_ITCM>,
-					     <FLEXRAM_ITCM>,
-					     <FLEXRAM_ITCM>,
-					     <FLEXRAM_ITCM>;
 
 			itcm: itcm@0 {
 				compatible = "zephyr,memory-region", "nxp,imx-itcm";
diff --git a/dts/arm/nxp/nxp_rt7xx_cm33_cpu0.dtsi b/dts/arm/nxp/nxp_rt7xx_cm33_cpu0.dtsi
index b65fbf55e1cea..d5b3a94f622f8 100644
--- a/dts/arm/nxp/nxp_rt7xx_cm33_cpu0.dtsi
+++ b/dts/arm/nxp/nxp_rt7xx_cm33_cpu0.dtsi
@@ -6,6 +6,7 @@
 
 #include <mem.h>
 #include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/adc/adc.h>
 #include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
@@ -56,6 +57,13 @@
 	pinctrl: pinctrl {
 		compatible = "nxp,rt-iocon-pinctrl";
 	};
+
+	/* USB PLL */
+	usbclk: usbpll-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <24000000>;
+		#clock-cells = <0>;
+	};
 };
 
 
@@ -107,6 +115,22 @@
 	 * and secure modes (0x50000000).
 	 */
 
+	lpadc0: adc@20c000 {
+		compatible = "nxp,lpc-lpadc";
+		reg = <0x20c000 0x304>;
+		interrupts = <15 0>;
+		status = "disabled";
+		clk-divider = <1>;
+		clk-source = <0>;
+		voltage-ref= <1>;
+		calibration-average = <128>;
+		power-level = <0>;
+		offset-value-a = <10>;
+		offset-value-b = <10>;
+		#io-channel-cells = <1>;
+		clocks = <&clkctl3 MCUX_LPADC1_CLK>;
+	};
+
 	rstctl0: reset@0 {
 		compatible = "nxp,rstctl";
 		reg = <0x0 0x1000>;
@@ -951,6 +975,32 @@
 		status = "disabled";
 	};
 
+	usb0: usbd@418000 {
+		compatible = "nxp,ehci";
+		reg = <0x418000 0x1000>;
+		interrupts = <40 0>;
+		interrupt-names = "usb_otg";
+		clocks = <&usbclk>;
+		num-bidir-endpoints = <8>;
+		status = "disabled";
+	};
+
+	usb1: usbd@419000 {
+		compatible = "nxp,ehci";
+		reg = <0x419000 0x1000>;
+		interrupts = <41 0>;
+		interrupt-names = "usb_otg";
+		clocks = <&usbclk>;
+		num-bidir-endpoints = <8>;
+		status = "disabled";
+	};
+
+	usbphy: usbphy@414000 {
+		compatible = "nxp,usbphy";
+		reg = <0x414000 0x1000>;
+		status = "disabled";
+	};
+
 	mrt0: mrt@2d000 {
 		compatible = "nxp,mrt";
 		reg = <0x2d000 0x100>;
@@ -994,6 +1044,47 @@
 		interrupts = <55 0>;
 		clocks = <&clkctl4 MCUX_FLEXIO0_CLK>;
 	};
+
+	os_timer_cpu0: timers@207000 {
+		compatible = "nxp,os-timer";
+		reg = <0x207000 0x1000>;
+		interrupts = <34 0>;
+		status = "disabled";
+	};
+
+	wwdt0: watchdog@e000 {
+		compatible = "nxp,lpc-wwdt";
+		reg = <0xe000 0x1000>;
+		interrupts = <42 0>;
+		status = "disabled";
+		clk-divider = <1>;
+	};
+
+	wwdt1: watchdog@2e000 {
+		compatible = "nxp,lpc-wwdt";
+		reg = <0x2e000 0x1000>;
+		interrupts = <43 0>;
+		status = "disabled";
+		clk-divider = <1>;
+	};
+
+	sc_timer: pwm@114000 {
+		compatible = "nxp,sctimer-pwm";
+		reg = <0x114000 0x1000>;
+		interrupts = <5 0>;
+		status = "disabled";
+		clocks = <&clkctl0 MCUX_SCTIMER_CLK>;
+		prescaler = <8>;
+		#pwm-cells = <3>;
+	};
+};
+
+&systick {
+	/*
+	 * RT700 cm33_cpu0 relies by default on the OS Timer for system
+	 * clock implementation, so the SysTick node is not to be enabled.
+	 */
+	status = "disabled";
 };
 
 &xspi0 {
diff --git a/dts/arm/nxp/nxp_rt7xx_cm33_cpu1.dtsi b/dts/arm/nxp/nxp_rt7xx_cm33_cpu1.dtsi
index 2142670365494..23baca895d4ec 100644
--- a/dts/arm/nxp/nxp_rt7xx_cm33_cpu1.dtsi
+++ b/dts/arm/nxp/nxp_rt7xx_cm33_cpu1.dtsi
@@ -6,6 +6,7 @@
 
 #include <mem.h>
 #include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/adc/adc.h>
 #include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
@@ -90,6 +91,22 @@
 	 * and secure modes (0x50000000).
 	 */
 
+	lpadc0: adc@20c000 {
+		compatible = "nxp,lpc-lpadc";
+		reg = <0x20c000 0x304>;
+		interrupts = <15 0>;
+		status = "disabled";
+		clk-divider = <1>;
+		clk-source = <0>;
+		voltage-ref= <1>;
+		calibration-average = <128>;
+		power-level = <0>;
+		offset-value-a = <10>;
+		offset-value-b = <10>;
+		#io-channel-cells = <1>;
+		clocks = <&clkctl3 MCUX_LPADC1_CLK>;
+	};
+
 	rstctl1: reset@40000 {
 		compatible = "nxp,rstctl";
 		reg = <0x40000 0x1000>;
@@ -401,8 +418,23 @@
 		clocks = <&clkctl4 MCUX_LPI2C15_CLK>;
 		status = "disabled";
 	};
+
+	os_timer_cpu1: timers@209000 {
+		compatible = "nxp,os-timer";
+		reg = <0x209000 0x1000>;
+		interrupts = <30 0>;
+		status = "disabled";
+	};
 };
 
 &nvic {
 	arm,num-irq-priority-bits = <3>;
 };
+
+&systick {
+	/*
+	 * RT700 cm33_cpu1 relies by default on the OS Timer for system
+	 * clock implementation, so the SysTick node is not to be enabled.
+	 */
+	status = "disabled";
+};
diff --git a/dts/arm/nxp/nxp_rw6xx_common.dtsi b/dts/arm/nxp/nxp_rw6xx_common.dtsi
index 3923a14211438..7777fd81439d6 100644
--- a/dts/arm/nxp/nxp_rw6xx_common.dtsi
+++ b/dts/arm/nxp/nxp_rw6xx_common.dtsi
@@ -30,7 +30,7 @@
 			reg = <0>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			cpu-power-states = <&idle &suspend>;
+			cpu-power-states = <&idle &suspend &standby>;
 
 			mpu: mpu@e000ed90 {
 				compatible = "arm,armv8m-mpu";
@@ -58,6 +58,20 @@
 							<0x100>,
 							<0x0>;
 			};
+			/* This is the setting for Sleep Mode */
+			standby: standby {
+				compatible = "nxp,pdcfg-power", "zephyr,power-state";
+				power-state-name = "standby";
+				/* TODO: Revisit latency numbers */
+				min-residency-us = <5000>;
+				exit-latency-us = <1000>;
+				deep-sleep-config = <0x180000>,
+							<0x0>,
+							<0x4>,
+							<0x100>,
+							<0x0>;
+				status = "disabled";
+			};
 		};
 	};
 
@@ -69,6 +83,11 @@
 		ranges = <0x0 0x443C0000 DT_SIZE_K(140)>;
 	};
 
+	power_mode3_domain: power_mode3_domain {
+		compatible = "power-domain-soc-state-change";
+		onoff-power-states = <&standby>;
+		#power-domain-cells = <0>;
+	};
 };
 
 &sram {
@@ -175,6 +194,7 @@
 		reg = <0x14000 0x1000>;
 		status = "okay";
 		interrupts = <123 0>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	wwdt: watchdog@e000 {
@@ -197,6 +217,7 @@
 			#gpio-cells = <2>;
 			reg = <0>;
 			int-source = "pint";
+			power-domains = <&power_mode3_domain>;
 		};
 
 		hsgpio1: gpio@1 {
@@ -205,6 +226,7 @@
 			#gpio-cells = <2>;
 			reg = <1>;
 			int-source = "pint";
+			power-domains = <&power_mode3_domain>;
 		};
 	};
 
@@ -214,6 +236,7 @@
 		interrupts = <50 1>;
 		interrupt-names = "usb_otg";
 		num-bidir-endpoints = <8>;
+		power-domains = <&power_mode3_domain>;
 		status = "disabled";
 	};
 
@@ -225,6 +248,8 @@
 		resets = <&rstctl1 NXP_SYSCON_RESET(0, 8)>;
 		dmas = <&dma0 0>, <&dma0 1>;
 		dma-names = "rx", "tx";
+		zephyr,disabling-power-states = <&suspend &standby>;
+		power-domains = <&power_mode3_domain>;
 		status = "disabled";
 	};
 
@@ -236,6 +261,8 @@
 		resets = <&rstctl1 NXP_SYSCON_RESET(0, 9)>;
 		dmas = <&dma0 2>, <&dma0 3>;
 		dma-names = "rx", "tx";
+		zephyr,disabling-power-states = <&suspend &standby>;
+		power-domains = <&power_mode3_domain>;
 		status = "disabled";
 	};
 
@@ -247,6 +274,8 @@
 		resets = <&rstctl1 NXP_SYSCON_RESET(0, 10)>;
 		dmas = <&dma0 4>, <&dma0 5>;
 		dma-names = "rx", "tx";
+		zephyr,disabling-power-states = <&suspend &standby>;
+		power-domains = <&power_mode3_domain>;
 		status = "disabled";
 	};
 
@@ -258,6 +287,8 @@
 		resets = <&rstctl1 NXP_SYSCON_RESET(0, 11)>;
 		dmas = <&dma0 6>, <&dma0 7>;
 		dma-names = "rx", "tx";
+		zephyr,disabling-power-states = <&suspend &standby>;
+		power-domains = <&power_mode3_domain>;
 		status = "disabled";
 	};
 
@@ -269,6 +300,8 @@
 		resets = <&rstctl1 NXP_SYSCON_RESET(0, 22)>;
 		dmas = <&dma0 26>, <&dma0 27>;
 		dma-names = "rx", "tx";
+		zephyr,disabling-power-states = <&suspend &standby>;
+		power-domains = <&power_mode3_domain>;
 		status = "disabled";
 	};
 
@@ -300,6 +333,7 @@
 		compatible = "nxp,wifi";
 		/* first index is the imu interrupt, the second is the wakeup done interrupt */
 		interrupts = <72 2>, <64 2>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	dma0: dma-controller@104000 {
@@ -309,6 +343,7 @@
 		status = "disabled";
 		#dma-cells = <1>;
 		dma-channels = <33>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	lcdic: lcdic@128000 {
@@ -320,6 +355,18 @@
 		#size-cells = <0>;
 		clocks = <&clkctl1 MCUX_LCDIC_CLK>;
 		dmas = <&dma0 0>;
+		power-domains = <&power_mode3_domain>;
+	};
+
+	rtc: rtc@30000 {
+		compatible = "nxp,lpc-rtc";
+		reg = <0x30000 0x1000>;
+		interrupts = <32 0>;
+		status = "disabled";
+		rtc_highres: rtc_highres {
+			compatible = "nxp,lpc-rtc-highres";
+			status = "disabled";
+		};
 	};
 
 	ctimer0: ctimer@28000 {
@@ -332,6 +379,7 @@
 		mode = <0>;
 		input = <0>;
 		prescale = <0>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	ctimer1: ctimer@29000 {
@@ -344,6 +392,7 @@
 		mode = <0>;
 		input = <0>;
 		prescale = <0>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	ctimer2: ctimer@2a000 {
@@ -356,6 +405,7 @@
 		mode = <0>;
 		input = <0>;
 		prescale = <0>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	ctimer3: ctimer@2b000 {
@@ -368,6 +418,7 @@
 		mode = <0>;
 		input = <0>;
 		prescale = <0>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	sctimer: pwm@146000 {
@@ -378,6 +429,7 @@
 		status = "disabled";
 		prescaler = <8>;
 		#pwm-cells = <3>;
+		power-domains = <&power_mode3_domain>;
 	};
 
 	mrt0: mrt@2d000 {
@@ -390,6 +442,7 @@
 		resets = <&rstctl1 NXP_SYSCON_RESET(2, 8)>;
 		#address-cells = <1>;
 		#size-cells = <0>;
+		power-domains = <&power_mode3_domain>;
 
 		mrt0_channel0: mrt0_channel@0 {
 			compatible = "nxp,mrt-channel";
@@ -423,6 +476,7 @@
 		resets = <&rstctl0 NXP_SYSCON_RESET(2, 26)>;
 		#address-cells = <1>;
 		#size-cells = <0>;
+		power-domains = <&power_mode3_domain>;
 
 		mrt1_channel0: mrt1_channel@0 {
 			compatible = "nxp,mrt-channel";
@@ -454,6 +508,7 @@
 		interrupts = <25 0>;
 		status = "disabled";
 		clocks = <&clkctl1 MCUX_DMIC_CLK>;
+		power-domains = <&power_mode3_domain>;
 
 		pdmc0: dmic-channel@0 {
 			reg = <0>;
@@ -491,6 +546,7 @@
 			interrupts = <112 0>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			power-domains = <&power_mode3_domain>;
 		};
 
 		adc1: gau_adc1@38100 {
@@ -499,6 +555,7 @@
 			interrupts = <111 0>;
 			status = "disabled";
 			#io-channel-cells = <1>;
+			power-domains = <&power_mode3_domain>;
 		};
 
 		dac0: dac@38200 {
@@ -507,6 +564,7 @@
 			interrupts = <108 0>;
 			status = "disabled";
 			#io-channel-cells = <0>;
+			power-domains = <&power_mode3_domain>;
 		};
 	};
 
@@ -525,12 +583,14 @@
 
 	hci: hci_ble {
 		compatible = "nxp,hci-ble";
+		power-domains = <&power_mode3_domain>;
 	};
 
 	hdlc_rcp_if: hdlc_rcp_if {
 		compatible = "nxp,hdlc-rcp-if";
 		interrupts = <90 2>, <82 2>;
 		interrupt-names = "hdlc_rcp_if_int", "wakeup_int";
+		power-domains = <&power_mode3_domain>;
 	};
 
 	enet: enet@138000 {
@@ -544,18 +604,21 @@
 			nxp,mdio = <&enet_mdio>;
 			nxp,ptp-clock = <&enet_ptp_clock>;
 			status = "disabled";
+			power-domains = <&power_mode3_domain>;
 		};
 		enet_mdio: mdio {
 			compatible = "nxp,enet-mdio";
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
+			power-domains = <&power_mode3_domain>;
 		};
 		enet_ptp_clock: ptp-clock {
 			compatible = "nxp,enet-ptp-clock";
 			interrupts = <116 0>;
 			status = "disabled";
 			clocks = <&clkctl1 MCUX_ENET_PLL>;
+			power-domains = <&power_mode3_domain>;
 		};
 	};
 };
diff --git a/dts/arm/oct/osd32mp15x.dtsi b/dts/arm/oct/osd32mp15x.dtsi
new file mode 100644
index 0000000000000..d69ca3b0aa419
--- /dev/null
+++ b/dts/arm/oct/osd32mp15x.dtsi
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2024 Antmicro <www.antmicro.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <st/mp1/stm32mp157.dtsi>
+#include <st/mp1/stm32mp157facx-pinctrl.dtsi>
+
+&mailbox {
+	status = "okay";
+};
+
+&rcc {
+	clock-frequency = <DT_FREQ_M(209)>;
+};
+
+&spi4 {
+	pinctrl-0 = <&spi4_nss_pe11 &spi4_sck_pe12
+		     &spi4_miso_pe13 &spi4_mosi_pe14>;
+	pinctrl-names = "default";
+	status = "okay";
+};
diff --git a/dts/arm/raspberrypi/rpi_pico/rp2040.dtsi b/dts/arm/raspberrypi/rpi_pico/rp2040.dtsi
index 6398674e0e020..9c20584c710ee 100644
--- a/dts/arm/raspberrypi/rpi_pico/rp2040.dtsi
+++ b/dts/arm/raspberrypi/rpi_pico/rp2040.dtsi
@@ -238,14 +238,27 @@
 				 "gpin0", "gpin1";
 		};
 
-		gpio0: gpio@40014000 {
+		gpio0_map: gpio@40014000 {
 			compatible = "raspberrypi,pico-gpio";
 			reg = <0x40014000 DT_SIZE_K(4)>;
 			interrupts = <13 RPI_PICO_DEFAULT_IRQ_PRIORITY>;
-			gpio-controller;
+
+			gpio-map-mask = <0xffffffe0 0xffffffc0>;
+			gpio-map-pass-thru = <0x1f 0x3f>;
+			gpio-map = <0x0 0x0 &gpio0 0x0 0x0>;
+
 			#gpio-cells = <2>;
-			status = "disabled";
-			ngpios = <30>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			gpio0: gpio-port@0 {
+				compatible = "raspberrypi,pico-gpio-port";
+				reg = <0x0>;
+				status = "disabled";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <30>;
+			};
 		};
 
 		uart0: uart@40034000 {
diff --git a/dts/arm/raspberrypi/rpi_pico/rp2350.dtsi b/dts/arm/raspberrypi/rpi_pico/rp2350.dtsi
index 687cafc19aade..62da179b66796 100644
--- a/dts/arm/raspberrypi/rpi_pico/rp2350.dtsi
+++ b/dts/arm/raspberrypi/rpi_pico/rp2350.dtsi
@@ -235,13 +235,36 @@
 				 "gpin0", "gpin1";
 		};
 
-		gpio0: gpio@40028000 {
+		gpio0_map: gpio@40028000 {
 			compatible = "raspberrypi,pico-gpio";
 			reg = <0x40028000 DT_SIZE_K(4)>;
 			interrupts = <21 RPI_PICO_DEFAULT_IRQ_PRIORITY>;
-			gpio-controller;
+
+			gpio-map-mask = <0xffffffe0 0xffffffc0>;
+			gpio-map-pass-thru = <0x1f 0x3f>;
+			gpio-map = <0x00 0x0 &gpio0 0x0 0x0
+				    0x20 0x0 &gpio0_hi 0x0 0x0>;
 			#gpio-cells = <2>;
-			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			gpio0: gpio-port@0 {
+				compatible = "raspberrypi,pico-gpio-port";
+				reg = <0x0>;
+				status = "disabled";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <32>;
+			};
+
+			gpio0_hi: gpio-port@1 {
+				compatible = "raspberrypi,pico-gpio-port";
+				reg = <0x1>;
+				status = "disabled";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <32>;
+			};
 		};
 
 		uart0: uart@40070000 {
@@ -390,9 +413,9 @@
 			#dma-cells = <3>;
 		};
 
-		usbd: usbd@50100000 {
+		usbd: usbd@50110000 {
 			compatible = "raspberrypi,pico-usbd";
-			reg = <0x50100000 0x10000>;
+			reg = <0x50110000 0x10000>;
 			resets = <&reset RPI_PICO_RESETS_RESET_USBCTRL>;
 			clocks = <&clocks RPI_PICO_CLKID_CLK_USB>;
 			interrupts = <14 RPI_PICO_DEFAULT_IRQ_PRIORITY>;
diff --git a/dts/arm/raspberrypi/rpi_pico/rp2350b.dtsi b/dts/arm/raspberrypi/rpi_pico/rp2350b.dtsi
new file mode 100644
index 0000000000000..55b67427237dd
--- /dev/null
+++ b/dts/arm/raspberrypi/rpi_pico/rp2350b.dtsi
@@ -0,0 +1,13 @@
+#include <arm/raspberrypi/rpi_pico/rp2350.dtsi>
+
+&gpio0 {
+	ngpios = <32>;
+};
+
+&gpio0_hi {
+	ngpios = <16>;
+};
+
+&die_temp {
+	io-channels = <&adc 8>;
+};
diff --git a/dts/arm/realtek/ec/rts5912-pinctrl.dtsi b/dts/arm/realtek/ec/rts5912-pinctrl.dtsi
index 3ac81a3486263..ce08a65be5211 100644
--- a/dts/arm/realtek/ec/rts5912-pinctrl.dtsi
+++ b/dts/arm/realtek/ec/rts5912-pinctrl.dtsi
@@ -266,105 +266,145 @@
 			pinmux = <REALTEK_RTS5912_PINMUX(41, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso1_gpio042: kso1_gpio042 {
 			pinmux = <REALTEK_RTS5912_PINMUX(42, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso2_gpio043: kso2_gpio043 {
 			pinmux = <REALTEK_RTS5912_PINMUX(43, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso3_gpio044: kso3_gpio044 {
 			pinmux = <REALTEK_RTS5912_PINMUX(44, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 
 	/omit-if-no-ref/ kso4_gpio045: kso4_gpio045 {
 			pinmux = <REALTEK_RTS5912_PINMUX(45, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso5_gpio046: kso5_gpio046 {
 			pinmux = <REALTEK_RTS5912_PINMUX(46, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso6_gpio047: kso6_gpio047 {
 			pinmux = <REALTEK_RTS5912_PINMUX(47, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso7_gpio048: kso7_gpio048 {
 			pinmux = <REALTEK_RTS5912_PINMUX(48, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 
 	/omit-if-no-ref/ kso8_gpio049: kso8_gpio049 {
 			pinmux = <REALTEK_RTS5912_PINMUX(49, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso9_gpio050: kso9_gpio050 {
 			pinmux = <REALTEK_RTS5912_PINMUX(50, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso10_gpio051: kso10_gpio051 {
 			pinmux = <REALTEK_RTS5912_PINMUX(51, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso11_gpio055: kso11_gpio055 {
 			pinmux = <REALTEK_RTS5912_PINMUX(55, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 
 	/omit-if-no-ref/ kso12_gpio056: kso12_gpio056 {
 			pinmux = <REALTEK_RTS5912_PINMUX(56, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso13_gpio057: kso13_gpio057 {
 			pinmux = <REALTEK_RTS5912_PINMUX(57, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso14_gpio058: kso14_gpio058 {
 			pinmux = <REALTEK_RTS5912_PINMUX(58, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso15_gpio059: kso15_gpio059 {
 			pinmux = <REALTEK_RTS5912_PINMUX(59, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 
 	/omit-if-no-ref/ kso16_gpio060: kso16_gpio060 {
 			pinmux = <REALTEK_RTS5912_PINMUX(60, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso17_gpio061: kso17_gpio061 {
 			pinmux = <REALTEK_RTS5912_PINMUX(61, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso18_gpio092: kso18_gpio092 {
 			pinmux = <REALTEK_RTS5912_PINMUX(92, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ kso19_gpio093: kso19_gpio093 {
 			pinmux = <REALTEK_RTS5912_PINMUX(93, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/* KSO PINCTRL SETTING END */
 	/* KSI PINCTRL SETTING START */
@@ -372,53 +412,73 @@
 			pinmux = <REALTEK_RTS5912_PINMUX(64, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ ksi1_gpio065: ksi1_gpio065 {
 			pinmux = <REALTEK_RTS5912_PINMUX(65, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ ksi2_gpio066: ksi2_gpio066 {
 			pinmux = <REALTEK_RTS5912_PINMUX(66, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ ksi3_gpio067: ksi3_gpio067 {
 			pinmux = <REALTEK_RTS5912_PINMUX(67, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 
 	/omit-if-no-ref/ ksi4_gpio068: ksi4_gpio068 {
 			pinmux = <REALTEK_RTS5912_PINMUX(68, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ ksi5_gpio069: ksi5_gpio069 {
 			pinmux = <REALTEK_RTS5912_PINMUX(69, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ ksi6_gpio070: ksi6_gpio070 {
 			pinmux = <REALTEK_RTS5912_PINMUX(70, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ ksi7_gpio071: ksi7_gpio071 {
 			pinmux = <REALTEK_RTS5912_PINMUX(71, FUNC1)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 
 	/omit-if-no-ref/ ksi8_gpio054: ksi8_gpio054 {
 			pinmux = <REALTEK_RTS5912_PINMUX(54, FUNC3)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/omit-if-no-ref/ ksi9_gpio098: ksi9_gpio098 {
 			pinmux = <REALTEK_RTS5912_PINMUX(98, FUNC2)>;
 			input-enable;
 			input-schmitt-enable;
+			bias-pull-up;
+			drive-open-drain;
 	};
 	/* KSO PINCTRL SETTING END */
 	/* KSM PINCTRL SETTING END */
diff --git a/dts/arm/realtek/ec/rts5912.dtsi b/dts/arm/realtek/ec/rts5912.dtsi
index aa994898109a6..bb022acbf72ed 100644
--- a/dts/arm/realtek/ec/rts5912.dtsi
+++ b/dts/arm/realtek/ec/rts5912.dtsi
@@ -65,6 +65,12 @@
 		interrupt-parent = <&nvic>;
 		ranges;
 
+		bbram: bb-ram@40005000 {
+			compatible = "realtek,rts5912-bbram";
+			reg = <0x40005000 0x100>;
+			status = "okay";
+		};
+
 		sccon: clock-controller@40020000 {
 			compatible = "realtek,rts5912-sccon";
 			reg = <0x40020000 0xf0>;
@@ -73,6 +79,14 @@
 			clock-names = "rc25m", "pll";
 		};
 
+		rtc: rtc@4000c100 {
+			compatible = "realtek,rts5912-rtc";
+			reg = <0x4000c100 0x20>;
+			clocks = <&sccon RTS5912_SCCON_PERIPH_GRP2 PERIPH_GRP2_RTC_CLKPWR>;
+			clock-names = "rtc";
+			status = "disabled";
+		};
+
 		slwtmr0: slwtmr0@4000c200 {
 			compatible = "realtek,rts5912-slwtimer";
 			reg = <0x4000c200 0x10>;
@@ -233,6 +247,35 @@
 					      140 0 141 0 142 0 143 0>;
 			};
 		};
+
+		wdog: watchdog@4000c000 {
+			compatible = "realtek,rts5912-watchdog";
+			reg = <0x4000c000 0x14>;
+			interrupt-parent = <&nvic>;
+			interrupts = <209 0>;
+			clocks = <&sccon RTS5912_SCCON_PERIPH_GRP2 PERIPH_GRP2_WDT_CLKPWR>;
+			clock-names = "watchdog";
+			clk-divider = <33>;
+			status = "disabled";
+		};
+
+		kbd: kbd@40010000 {
+			compatible = "realtek,rts5912-kbd";
+			reg = <0x40010000 0x10>;
+			clocks = <&sccon RTS5912_SCCON_PERIPH_GRP0 PERIPH_GRP0_KBM_CLKPWR>;
+			interrupts = <210 0>;
+			interrupt-parent = <&nvic>;
+			status = "disabled";
+		};
+
+		tach0: tach@4000fd00 {
+			compatible = "realtek,rts5912-tach";
+			reg = <0x4000fd00 0x40>;
+			clocks = <&sccon RTS5912_SCCON_PERIPH_GRP0 PERIPH_GRP0_TACH0_CLKPWR>;
+			clock-names = "tacho";
+			interrupts = <192 0>;
+			status = "disabled";
+		};
 	};
 
 	swj_port: swj-port {
diff --git a/dts/arm/renesas/ra/r7fa4m1ab3cfm.dtsi b/dts/arm/renesas/ra/r7fa4m1ab3cfm.dtsi
deleted file mode 100644
index 8a1702d785afc..0000000000000
--- a/dts/arm/renesas/ra/r7fa4m1ab3cfm.dtsi
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#define RA_SOC_PINS 64
-#define RA_SOC_HAS_MSTPCRE 1
-#define RA_SOC_MSTPD5_CHANNELS 1
-
-#include <renesas/ra/ra4-cm4-common.dtsi>
diff --git a/dts/arm/renesas/ra/ra-cm4-common.dtsi b/dts/arm/renesas/ra/ra-cm4-common.dtsi
deleted file mode 100644
index 5930631e5ea42..0000000000000
--- a/dts/arm/renesas/ra/ra-cm4-common.dtsi
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <mem.h>
-#include <freq.h>
-#include <arm/armv7-m.dtsi>
-#include <zephyr/dt-bindings/interrupt-controller/renesas-ra-icu.h>
-#include <zephyr/dt-bindings/clock/ra_clock.h>
-
-/ {
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-m4";
-			reg = <0>;
-		};
-	};
-
-	clocks: clocks {
-		xtal: clock-main-osc {
-			compatible = "renesas,ra-cgc-external-clock";
-			clock-frequency = <1200000>;
-			status = "disabled";
-			#clock-cells = <0>;
-		};
-
-		subclk: clock-subclk {
-			compatible = "renesas,ra-cgc-subclk";
-			clock-frequency = <32768>;
-			status = "disabled";
-			#clock-cells = <0>;
-		};
-
-		hoco: clock-hoco {
-			compatible = "fixed-clock";
-			clock-frequency = <24000000>;
-			status = "okay";
-			#clock-cells = <0>;
-		};
-
-		moco: clock-moco {
-			compatible = "fixed-clock";
-			clock-frequency = <8000000>;
-			status = "okay";
-			#clock-cells = <0>;
-		};
-
-		loco: clock-loco {
-			compatible = "fixed-clock";
-			clock-frequency = <32768>;
-			status = "okay";
-			#clock-cells = <0>;
-		};
-
-		pll: pll {
-			compatible = "renesas,ra-cgc-pll";
-			#clock-cells = <0>;
-
-			/* PLL */
-			clocks = <&xtal>;
-			div = <2>;
-			mul = <8 0>;
-			status = "disabled";
-		};
-	};
-
-	sram0: memory0@20000000 {
-		compatible = "mmio-sram";
-		reg = <0x20000000 DT_SIZE_K(32)>;
-	};
-
-	soc {
-		interrupt-parent = <&icu>;
-		icu: interrupt-controller@40006000 {
-			compatible = "renesas,ra-interrupt-controller-unit";
-			reg = <0x40006000 0x40>;
-			reg-names = "icu";
-			interrupt-controller;
-			#interrupt-cells = <3>;
-		};
-
-		pclkblock: pclkblock@4001e01c {
-			compatible = "renesas,ra-cgc-pclk-block";
-			reg = <0x4001e01c 4>, <0x40047000 4>, <0x40047004 4>,
-			      <0x40047008 4>;
-			reg-names = "MSTPA", "MSTPB","MSTPC",
-				    "MSTPD";
-			compatible = "renesas,ra-cgc-pclk-block";
-			#clock-cells = <0>;
-			clocks = <&moco>;
-			status = "okay";
-
-			iclk: iclk {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <16>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclka: pclka {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <16>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclkb: pclkb {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <16>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclkc: pclkc {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <1>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclkd: pclkd {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <16>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			fclk: fclk {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <16>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			clkout: clkout {
-				compatible = "renesas,ra-cgc-pclk";
-				#clock-cells = <2>;
-				status = "disabled";
-			};
-		};
-
-		fcu: flash-controller@4001c000 {
-			compatible = "renesas,ra-flash-controller";
-			reg = <0x4001c000 0x44>;
-			reg-names = "fcache";
-
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			flash0: flash0@0 {
-				compatible = "soc-nv-flash";
-				reg = <0x00000000 DT_SIZE_K(256)>;
-			};
-
-			flash1: flash1@40100000 {
-				compatible = "soc-nv-flash";
-				reg = <0x40100000 DT_SIZE_K(8)>;
-			};
-		};
-
-		ioport0: gpio@40040000 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x40040000 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ2>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ3>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ6>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ7>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ10>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ15>;
-			interrupt-names = "port-irq2", "port-irq3", "port-irq6",
-					  "port-irq7", "port-irq10", "port-irq15";
-			port-irq2-pins = <2>;
-			port-irq3-pins = <4>;
-			port-irq6-pins = <0>;
-			port-irq7-pins = <1 15>;
-			port-irq10-pins = <5>;
-			port-irq15-pins = <11>;
-			status = "disabled";
-		};
-
-		ioport1: gpio@40040020 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x40040020 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ0>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ1>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ2>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ3>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ4>;
-			interrupt-names = "port-irq0", "port-irq1", "port-irq2",
-					  "port-irq3", "port-irq4";
-			port-irq0-pins = <5>;
-			port-irq1-pins = <1>;
-			port-irq2-pins = <0>;
-			port-irq3-pins = <10>;
-			port-irq4-pins = <11>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		ioport2: gpio@40040040 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x40040040 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ0>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ1>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ2>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ3>;
-			interrupt-names = "port-irq0", "port-irq1", "port-irq2",
-					  "port-irq3";
-			port-irq0-pins = <6>;
-			port-irq1-pins = <5>;
-			port-irq2-pins = <13>;
-			port-irq3-pins = <12>;
-			status = "disabled";
-		};
-
-		ioport3: gpio@40040060 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x40040060 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ5>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ6>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ8>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ9>;
-			interrupt-names = "port-irq5", "port-irq6", "port-irq8", "port-irq9";
-			port-irq5-pins = <2>;
-			port-irq6-pins = <1>;
-			port-irq8-pins = <5>;
-			port-irq9-pins = <4>;
-			status = "disabled";
-		};
-
-		ioport4: gpio@40040080 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x40040080 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ0>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ4>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ5>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ6>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ7>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ8>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ9>;
-			interrupt-names = "port-irq0", "port-irq4", "port-irq5", "port-irq6",
-					  "port-irq7", "port-irq8", "port-irq9";
-			port-irq0-pins = <0>;
-			port-irq4-pins = <2 11>;
-			port-irq5-pins = <1 10>;
-			port-irq6-pins = <9>;
-			port-irq7-pins = <8>;
-			port-irq8-pins = <15>;
-			port-irq9-pins = <14>;
-			status = "disabled";
-		};
-
-		ioport5: gpio@400400a0 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x400400a0 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ11>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ12>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ14>;
-			interrupt-names = "port-irq11", "port-irq12", "port-irq14";
-			port-irq11-pins = <1>;
-			port-irq12-pins = <2>;
-			port-irq14-pins = <5>;
-			status = "disabled";
-		};
-
-		pinctrl: pinctrl@40040800 {
-			compatible = "renesas,ra-pinctrl-pfs";
-			reg = <0x40040800 0x500 0x40040d03 0x1>;
-			reg-names = "pfs", "pmisc_pwpr";
-			status = "okay";
-		};
-
-		sci0: sci@40070000 {
-			compatible = "renesas,ra-sci";
-			reg = <0x40070000 0x20>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_RXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_TXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_TEI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_ERI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_AM>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_RXI_OR_ERI>;
-			interrupt-names = "rxi", "txi", "tei", "eri", "am", "rxi-or-eri";
-			clocks = <&pclka MSTPB 31>;
-			#clock-cells = <1>;
-			status = "disabled";
-			uart {
-				compatible = "renesas,ra-uart-sci";
-				status = "disabled";
-			};
-		};
-
-		sci1: sci@40070020 {
-			compatible = "renesas,ra-sci";
-			reg = <0x40070020 0x20>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_RXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_TXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_TEI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_ERI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_AM>;
-			interrupt-names = "rxi", "txi", "tei", "eri", "am";
-			clocks = <&pclka MSTPB 30>;
-			#clock-cells = <1>;
-			status = "disabled";
-			uart {
-				compatible = "renesas,ra-uart-sci";
-				status = "disabled";
-			};
-		};
-
-		sci9: sci@40070120 {
-			compatible = "renesas,ra-sci";
-			reg = <0x40070120 0x20>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_RXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_TXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_TEI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_ERI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_AM>;
-			interrupt-names = "rxi", "txi", "tei", "eri", "am";
-			clocks = <&pclka MSTPB 22>;
-			#clock-cells = <1>;
-			status = "disabled";
-			uart {
-				compatible = "renesas,ra-uart-sci";
-				status = "disabled";
-			};
-		};
-	};
-};
-
-&nvic {
-	arm,num-irq-priority-bits = <4>;
-};
diff --git a/dts/arm/renesas/ra/ra2/r7fa2a1xh.dtsi b/dts/arm/renesas/ra/ra2/r7fa2a1xh.dtsi
index b44495183cce6..d6e38b79bc368 100644
--- a/dts/arm/renesas/ra/ra2/r7fa2a1xh.dtsi
+++ b/dts/arm/renesas/ra/ra2/r7fa2a1xh.dtsi
@@ -91,6 +91,13 @@
 			compatible = "renesas,ra-trng";
 			status = "disabled";
 		};
+
+		wdt: wdt@40044200 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40044200 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
 	};
 
 	clocks: clocks {
@@ -141,6 +148,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <48000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
@@ -173,12 +181,17 @@
 				status = "disabled";
 			};
 
-
 			sdadcclk: sdadcclk {
 				compatible = "renesas,ra-cgc-pclk";
 				#clock-cells = <2>;
 				status = "disabled";
 			};
+
+			uclk: uclk {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
 		};
 	};
 };
diff --git a/dts/arm/renesas/ra/ra2/r7fa2l1x9.dtsi b/dts/arm/renesas/ra/ra2/r7fa2l1x9.dtsi
new file mode 100644
index 0000000000000..e20c050133579
--- /dev/null
+++ b/dts/arm/renesas/ra/ra2/r7fa2l1x9.dtsi
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2024 MUNIC SA
+ *
+ * Renesas R7FA2AL1x9 MCU device tree
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+&flash0 {
+	reg = <0x0 DT_SIZE_K(128)>;
+};
diff --git a/dts/arm/renesas/ra/ra2/r7fa2l1xb.dtsi b/dts/arm/renesas/ra/ra2/r7fa2l1xb.dtsi
new file mode 100644
index 0000000000000..b148a4337eb80
--- /dev/null
+++ b/dts/arm/renesas/ra/ra2/r7fa2l1xb.dtsi
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2024 MUNIC SA
+ *
+ * Renesas R7FA2AL1AB MCU device tree
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&flash0 {
+	reg = <0x0 DT_SIZE_K(256)>;
+};
diff --git a/dts/arm/renesas/ra/ra2/r7fa2l1xxxxfp.dtsi b/dts/arm/renesas/ra/ra2/r7fa2l1xxxxfp.dtsi
new file mode 100644
index 0000000000000..a55ae8fa6f9d4
--- /dev/null
+++ b/dts/arm/renesas/ra/ra2/r7fa2l1xxxxfp.dtsi
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2024 MUNIC SA
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
+ *
+ * Renesas R7FA2AL1AxxxFP MCU device tree for 100 pins socket
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+/ {
+	clocks: clocks {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		xtal: clock-main-osc {
+			compatible = "renesas,ra-cgc-external-clock";
+			clock-frequency = <DT_FREQ_M(20)>;
+			#clock-cells = <0>;
+			status = "disabled";
+		};
+
+		hoco: clock-hoco {
+			compatible = "fixed-clock";
+			clock-frequency = <DT_FREQ_M(48)>;
+			#clock-cells = <0>;
+		};
+
+		moco: clock-moco {
+			compatible = "fixed-clock";
+			clock-frequency = <DT_FREQ_M(8)>;
+			#clock-cells = <0>;
+		};
+
+		loco: clock-loco {
+			compatible = "fixed-clock";
+			clock-frequency = <32768>;
+			#clock-cells = <0>;
+		};
+
+		subclk: clock-subclk {
+			compatible = "renesas,ra-cgc-subclk";
+			clock-frequency = <32768>;
+			#clock-cells = <0>;
+			status = "disabled";
+		};
+
+		pclkblock: pclkblock@4001e01c {
+			compatible = "renesas,ra-cgc-pclk-block";
+			reg = <0x4001e01c 4>, <0x40047000 4>, <0x40047004 4>,
+			      <0x40047008 4>;
+			reg-names = "MSTPA", "MSTPB","MSTPC",
+				    "MSTPD";
+			#clock-cells = <0>;
+			clocks = <&hoco>;
+			status = "okay";
+
+			iclk: iclk {
+				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <48000000>;
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkb: pclkb {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <2>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkd: pclkd {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			clkout: clkout {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+
+		};
+	};
+};
diff --git a/dts/arm/renesas/ra/ra2/ra2l1.dtsi b/dts/arm/renesas/ra/ra2/ra2l1.dtsi
new file mode 100644
index 0000000000000..ea317d559210a
--- /dev/null
+++ b/dts/arm/renesas/ra/ra2/ra2l1.dtsi
@@ -0,0 +1,241 @@
+/**
+ * Copyright (c) 2021-2024 MUNIC SA
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * Renesas RA2L1 MCU series device tree
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <freq.h>
+#include <mem.h>
+#include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
+#include <zephyr/dt-bindings/clock/ra_clock.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-m23";
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			mpu: mpu@e000ed90 {
+				compatible = "arm,armv8m-mpu";
+				reg = <0xe000ed90 0x40>;
+			};
+		};
+	};
+
+	soc {
+		interrupt-parent = <&nvic>;
+
+		sram0: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 0x8000>;
+		};
+
+		system: system@4001e000 {
+			compatible = "renesas,ra-system";
+			reg = <0x4001e000 0x1000>;
+			status = "okay";
+		};
+
+		flcn: flash-controller@407ec000 {
+			reg = <0x407ec000 0x10000>;
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash0: code@0 {
+				compatible = "soc-nv-flash";
+				/* "reg" property should be defined in the
+				 * chip specific .dtsi file
+				 */
+			};
+
+			flash1: data@40100000 {
+				compatible = "soc-nv-flash";
+				reg = <0x40100000 DT_SIZE_K(8)>;
+			};
+		};
+
+		ioport0: gpio@40040000 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x40040000 0x20>;
+			port = <0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport1: gpio@40040020 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x40040020 0x20>;
+			port = <1>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport2: gpio@40040040 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x40040040 0x20>;
+			port = <2>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport3: gpio@40040060 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x40040060 0x20>;
+			port = <3>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport4: gpio@40040080 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x40040080 0x20>;
+			port = <4>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport5: gpio@400400a0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x400400a0 0x20>;
+			port = <5>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport6: gpio@400400c0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x400400c0 0x20>;
+			port = <6>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport7: gpio@400400e0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x400400e0 0x20>;
+			port = <7>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		pinctrl: pin-controller@40040800 {
+			compatible = "renesas,ra-pinctrl-pfs";
+			reg = <0x40040800 0x3c0>;
+			status = "okay";
+		};
+
+		sci0: sci0@40070000 {
+			compatible = "renesas,ra-sci";
+			interrupts = <0 1>, <1 1>, <2 1>, <3 1>;
+			interrupt-names = "rxi", "txi", "tei", "eri";
+			reg = <0x40070000 0x100>;
+			clocks = <&pclkb MSTPB 31>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <0>;
+				status = "disabled";
+			};
+		};
+
+		sci1: sci1@40070020 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40070020 0x100>;
+			clocks = <&pclkb MSTPB 30>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <1>;
+				status = "disabled";
+			};
+		};
+
+		sci2: sci2@40070040 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40070040 0x100>;
+			clocks = <&pclkb MSTPB 29>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <2>;
+				status = "disabled";
+			};
+		};
+
+		sci3: sci3@40070060 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40070060 0x100>;
+			clocks = <&pclkb MSTPB 28>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <3>;
+				status = "disabled";
+			};
+		};
+
+		sci9: sci9@40070120 {
+			compatible = "renesas,ra-sci";
+			interrupts = <4 1>, <5 1>, <6 1>, <7 1>;
+			interrupt-names = "rxi", "txi", "tei", "eri";
+			reg = <0x40070120 0x100>;
+			clocks = <&pclkb MSTPB 22>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <9>;
+				status = "disabled";
+			};
+		};
+
+		id_code: id_code@1010018 {
+			compatible = "zephyr,memory-region";
+			reg = <0x01010018 0x20>;
+			zephyr,memory-region = "ID_CODE";
+			status = "okay";
+		};
+
+		wdt: wdt@40044200 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40044200 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <2>;
+};
diff --git a/dts/arm/renesas/ra/ra4-cm4-common.dtsi b/dts/arm/renesas/ra/ra4-cm4-common.dtsi
deleted file mode 100644
index e49b9bc766e2d..0000000000000
--- a/dts/arm/renesas/ra/ra4-cm4-common.dtsi
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <renesas/ra/ra-cm4-common.dtsi>
-
-/ {
-	soc {
-		ioport6: gpio@400400c0 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x400400c0 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		ioport7: gpio@400400e0 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x400400e0 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		ioport8: gpio@40040100 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x40040100 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		ioport9: gpio@40040120 {
-			compatible = "renesas,ra-gpio";
-			reg = <0x40040120 0x20>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		sci2: sci@40070040 {
-			compatible = "renesas,ra-sci";
-			reg = <0x40070040 0x20>;
-			interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_RXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_TXI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_TEI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_ERI>,
-				     <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_AM>;
-			interrupt-names = "rxi", "txi", "tei", "eri", "am";
-			clocks = <&pclka MSTPB 29>;
-			#clock-cells = <1>;
-			status = "disabled";
-			uart {
-				compatible = "renesas,ra-uart-sci";
-				status = "disabled";
-			};
-		};
-	};
-};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4e10x.dtsi b/dts/arm/renesas/ra/ra4/r7fa4e10x.dtsi
index 8f07b048332d9..33baec96894da 100644
--- a/dts/arm/renesas/ra/ra4/r7fa4e10x.dtsi
+++ b/dts/arm/renesas/ra/ra4/r7fa4e10x.dtsi
@@ -11,6 +11,7 @@
 /delete-node/ &spi1;
 /delete-node/ &agt4;
 /delete-node/ &adc1;
+/delete-node/ &dac1;
 /delete-node/ &iic1;
 /delete-node/ &pwm0;
 
@@ -48,7 +49,6 @@
 		};
 
 		adc@40170000 {
-			channel-count = <9>;
 			channel-available-mask = <0x1381f>;
 		};
 
@@ -260,3 +260,7 @@
 	port-irq6-pins = <9>;
 	port-irq7-pins = <8>;
 };
+
+&dac_global {
+	has-output-amplifier;
+};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4e2b93cfm.dtsi b/dts/arm/renesas/ra/ra4/r7fa4e2b93cfm.dtsi
index 6bdf17e87d39d..3a25a1a2589b8 100644
--- a/dts/arm/renesas/ra/ra4/r7fa4e2b93cfm.dtsi
+++ b/dts/arm/renesas/ra/ra4/r7fa4e2b93cfm.dtsi
@@ -15,6 +15,8 @@
 /delete-node/ &agt5;
 /delete-node/ &iic0;
 /delete-node/ &iic1;
+/delete-node/ &usbfs;
+/delete-node/ &usbfs_phy;
 
 /delete-node/ &adc1;
 /delete-node/ &dac1;
@@ -56,7 +58,6 @@
 		};
 
 		adc@40170000 {
-			channel-count = <12>;
 			channel-available-mask = <0x139f7>;
 		};
 
@@ -73,6 +74,7 @@
 			interrupt-names = "rxf", "glerr";
 			clocks = <&pclkb 0 0>, <&pclka 0 0>;
 			clock-names = "opclk", "ramclk";
+			dll-max-freq = <DT_FREQ_M(40)>;
 			reg = <0x400b0000 0x2000>;
 			status = "disabled";
 
@@ -152,6 +154,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <100000000>;
 				div = <2>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra4/r7fa4l1bd4cfp.dtsi b/dts/arm/renesas/ra/ra4/r7fa4l1bd4cfp.dtsi
new file mode 100644
index 0000000000000..af5aa03a53dac
--- /dev/null
+++ b/dts/arm/renesas/ra/ra4/r7fa4l1bd4cfp.dtsi
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/renesas/ra/ra4/r7fa4l1bx.dtsi>
+
+/ {
+	soc {
+		flash-controller@407e0000 {
+			reg = <0x407e0000 0x10000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash0: flash@0 {
+				compatible = "renesas,ra-nv-flash";
+				reg = <0x0 DT_SIZE_K(512)>;
+				write-block-size = <8>;
+				erase-block-size = <2048>;
+				renesas,programming-enable;
+			};
+
+			flash1: flash@8000000 {
+				compatible = "renesas,ra-nv-flash";
+				reg = <0x8000000 DT_SIZE_K(8)>;
+				write-block-size = <1>;
+				erase-block-size = <256>;
+				renesas,programming-enable;
+			};
+		};
+	};
+};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4l1bx.dtsi b/dts/arm/renesas/ra/ra4/r7fa4l1bx.dtsi
new file mode 100644
index 0000000000000..996df8f7be73e
--- /dev/null
+++ b/dts/arm/renesas/ra/ra4/r7fa4l1bx.dtsi
@@ -0,0 +1,766 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <arm/armv8-m.dtsi>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
+#include <zephyr/dt-bindings/clock/ra_clock.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+#include <freq.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-m33";
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			mpu: mpu@e000ed90 {
+				compatible = "arm,armv8m-mpu";
+				reg = <0xe000ed90 0x40>;
+			};
+		};
+	};
+
+	soc {
+		interrupt-parent = <&nvic>;
+
+		system: system@4001e000 {
+			compatible = "renesas,ra-system";
+			reg = <0x4001e000 0x1000>;
+			status = "okay";
+		};
+
+		sram0: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 DT_SIZE_K(64)>;
+		};
+
+		ioport0: gpio@4001f000 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f000 0x20>;
+			port = <0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport1: gpio@4001f020 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f020 0x20>;
+			port = <1>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport2: gpio@4001f040 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f040 0x20>;
+			port = <2>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport3: gpio@4001f060 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f060 0x20>;
+			port = <3>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport4: gpio@4001f080 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f080 0x20>;
+			port = <4>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport5: gpio@4001f0a0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f0a0 0x20>;
+			port = <5>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport6: gpio@4001f0c0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f0c0 0x20>;
+			port = <6>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport7: gpio@4001f0e0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f0e0 0x20>;
+			port = <7>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport8: gpio@4001f100 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x4001f100 0x20>;
+			port = <8>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		pinctrl: pin-controller@4001F800 {
+			compatible = "renesas,ra-pinctrl-pfs";
+			reg = <0x4001F800 0x3c0>;
+			status = "okay";
+		};
+
+		sci0: sci@40118000 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40118000 0x100>;
+			clocks = <&pclka MSTPB 31>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <0>;
+				status = "disabled";
+			};
+		};
+
+		sci1: sci@40118100 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40118100 0x100>;
+			clocks = <&pclka MSTPB 30>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <1>;
+				status = "disabled";
+			};
+		};
+
+		sci3: sci@40118300 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40118300 0x100>;
+			clocks = <&pclka MSTPB 38>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <3>;
+				status = "disabled";
+			};
+		};
+
+		sci4: sci@40118400 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40118400 0x100>;
+			clocks = <&pclka MSTPB 27>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <4>;
+				status = "disabled";
+			};
+		};
+
+		sci5: sci@40118500 {
+			compatible = "renesas,ra-sci";
+			interrupts = <4 1>, <5 1>, <6 1>, <7 1>;
+			interrupt-names = "rxi", "txi", "tei", "eri";
+			reg = <0x40118500 0x100>;
+			clocks = <&pclka MSTPB 26>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <5>;
+				status = "disabled";
+			};
+		};
+
+		sci9: sci@40118900 {
+			compatible = "renesas,ra-sci";
+			interrupts = <24 1>, <25 1>, <26 1>, <27 1>;
+			interrupt-names = "rxi", "txi", "tei", "eri";
+			reg = <0x40118900 0x100>;
+			clocks = <&pclka MSTPB 22>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <9>;
+				status = "disabled";
+			};
+		};
+
+		spi0: spi@4011a000 {
+			compatible = "renesas,ra-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			channel = <0>;
+			interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
+			interrupt-names = "rxi", "txi", "tei", "eri";
+			reg = <0x4011a000 0x100>;
+			status = "disabled";
+		};
+
+		adc0: adc@40170000 {
+			compatible = "renesas,ra-adc";
+			interrupts = <38 1>;
+			interrupt-names = "scanend";
+			reg = <0x40170000 0x100>;
+			#io-channel-cells = <1>;
+			vref-mv = <3300>;
+			channel-available-mask = <0x3fe007f>;
+			status = "disabled";
+		};
+
+		dac_global: dac_global@40171000 {
+			compatible = "renesas,ra-dac-global";
+			reg = <0x40171000 0x10c4>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			has-davrefcr;
+
+			dac0: dac@0 {
+				compatible = "renesas,ra-dac";
+				#io-channel-cells = <1>;
+				reg = <0>;
+				status = "disabled";
+			};
+		};
+
+		iic0: iic0@4009f000 {
+			compatible = "renesas,ra-iic";
+			channel = <0>;
+			reg = <0x4009f000 0x100>;
+			status = "disabled";
+		};
+
+		pwm0: pwm0@40169000 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_0>;
+			clocks = <&pclkd MSTPE 31>;
+			reg = <0x40169000 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+		pwm1: pwm1@40169100 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_1>;
+			clocks = <&pclkd MSTPE 30>;
+			reg = <0x40169100 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+		pwm2: pwm2@40169200 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_2>;
+			clocks = <&pclkd MSTPE 29>;
+			reg = <0x40169200 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+		pwm3: pwm3@40169300 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_3>;
+			clocks = <&pclkd MSTPE 28>;
+			reg = <0x40169300 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+		pwm4: pwm4@40169400 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_4>;
+			clocks = <&pclkd MSTPE 27>;
+			reg = <0x40169400 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+		pwm5: pwm5@40169500 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_5>;
+			clocks = <&pclkd MSTPE 26>;
+			reg = <0x40169500 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+		canfd_global: canfd_global@400b0000 {
+			compatible = "renesas,ra-canfd-global";
+			interrupts = <40 1>, <41 1>;
+			interrupt-names = "rxf", "glerr";
+			clocks = <&pclkb 0 0>, <&pclka 0 0>;
+			clock-names = "opclk", "ramclk";
+			reg = <0x400b0000 0x2000>;
+			status = "disabled";
+
+			canfd0: canfd0 {
+				compatible = "renesas,ra-canfd";
+				channel = <0>;
+				interrupts = <43 12>, <44 12>, <45 12>;
+				interrupt-names = "err", "tx", "rx";
+				clocks = <&canfdclk MSTPC 27>;
+				clock-names = "dllclk";
+				status = "disabled";
+			};
+		};
+
+		option_setting_ofs: option_setting_ofs@100a100 {
+			compatible = "zephyr,memory-region";
+			reg = <0x0100a100 0x18>;
+			zephyr,memory-region = "OPTION_SETTING_OFS";
+			status = "okay";
+		};
+
+		option_setting_sas: option_setting_sas@100a134 {
+			compatible = "zephyr,memory-region";
+			reg = <0x0100a134 0xcc>;
+			zephyr,memory-region = "OPTION_SETTING_SAS";
+			status = "okay";
+		};
+
+		option_setting_s: option_setting_s@100a200 {
+			compatible = "zephyr,memory-region";
+			reg = <0x0100a200 0x100>;
+			zephyr,memory-region = "OPTION_SETTING_S";
+			status = "okay";
+		};
+
+		port_irq0: external-interrupt@40006000 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006000 0x1>;
+			channel = <0>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq1: external-interrupt@40006001 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006001 0x1>;
+			channel = <1>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq2: external-interrupt@40006002 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006002 0x1>;
+			channel = <2>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq3: external-interrupt@40006003 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006003 0x1>;
+			channel = <3>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq4: external-interrupt@40006004 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006004 0x1>;
+			channel = <4>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq5: external-interrupt@40006005 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006005 0x1>;
+			channel = <5>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq6: external-interrupt@40006006 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006006 0x1>;
+			channel = <6>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq7: external-interrupt@40006007 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006007 0x1>;
+			channel = <7>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq8: external-interrupt@40006008 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006008 0x1>;
+			channel = <8>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq9: external-interrupt@40006009 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006009 0x1>;
+			channel = <9>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq10: external-interrupt@4000600a {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600a 0x1>;
+			channel = <10>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq11: external-interrupt@4000600b {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600b 0x1>;
+			channel = <11>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq12: external-interrupt@4000600c {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600c 0x1>;
+			channel = <12>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq13: external-interrupt@4000600d {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600d 0x1>;
+			channel = <13>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq14: external-interrupt@4000600e {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600e 0x1>;
+			channel = <14>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq15: external-interrupt@4000600f {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600f 0x1>;
+			channel = <15>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		wdt: wdt@40083400 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40083400 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
+	};
+
+	clocks: clocks {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		xtal: clock-main-osc {
+			compatible = "renesas,ra-cgc-external-clock";
+			clock-frequency = <DT_FREQ_M(8)>;
+			#clock-cells = <0>;
+			status = "disabled";
+		};
+
+		hoco: clock-hoco {
+			compatible = "fixed-clock";
+			clock-frequency = <DT_FREQ_M(48)>;
+			#clock-cells = <0>;
+		};
+
+		loco: clock-loco {
+			compatible = "fixed-clock";
+			clock-frequency = <32768>;
+			#clock-cells = <0>;
+		};
+
+		moco: clock-moco {
+			compatible = "fixed-clock";
+			clock-frequency = <DT_FREQ_M(8)>;
+			#clock-cells = <0>;
+		};
+
+		subclk: clock-subclk {
+			compatible = "renesas,ra-cgc-subclk";
+			clock-frequency = <32768>;
+			#clock-cells = <0>;
+			status = "disabled";
+		};
+
+		pll: pll {
+			compatible = "renesas,ra-cgc-pll";
+			#clock-cells = <0>;
+
+			/* PLL */
+			clocks = <&xtal>;
+			div = <1>;
+			mul = <10 0>;
+			status = "disabled";
+		};
+
+		pclkblock: pclkblock@40084000 {
+			compatible = "renesas,ra-cgc-pclk-block";
+			reg = <0x40084000 4>, <0x40084004 4>, <0x40084008 4>,
+			      <0x4008400c 4>, <0x40084010 4>;
+			reg-names = "MSTPA", "MSTPB","MSTPC",
+				    "MSTPD", "MSTPE";
+			#clock-cells = <0>;
+			clocks = <&pll>;
+			status = "okay";
+
+			iclk: iclk {
+				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <80000000>;
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclka: pclka {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkb: pclkb {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <2>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkc: pclkc {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <2>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkd: pclkd {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			fclk: fclk {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <2>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			clkout: clkout {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+
+			uclk: uclk {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+
+			canfdclk: canfdclk {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+
+			i3cclk: i3cclk {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+
+			uarta0: uarta0 {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+
+			uarta1: uarta1 {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <4>;
+};
+
+&ioport0 {
+	port-irqs = <&port_irq6 &port_irq7 &port_irq8
+	&port_irq9 &port_irq10 &port_irq11>;
+	port-irq-names = "port-irq6",
+			 "port-irq7",
+			 "port-irq8",
+			 "port-irq9",
+			 "port-irq10",
+			 "port-irq11";
+	port-irq6-pins = <0>;
+	port-irq7-pins = <1>;
+	port-irq8-pins = <2>;
+	port-irq9-pins = <4>;
+	port-irq10-pins = <10>;
+	port-irq11-pins = <11>;
+};
+
+&ioport1 {
+	port-irqs = <&port_irq0 &port_irq1 &port_irq2
+	&port_irq3 &port_irq4>;
+	port-irq-names = "port-irq0",
+			 "port-irq1",
+			 "port-irq2",
+			 "port-irq3",
+			 "port-irq4";
+	port-irq0-pins = <5>;
+	port-irq1-pins = <1 4>;
+	port-irq2-pins = <0>;
+	port-irq3-pins = <10>;
+	port-irq4-pins = <11>;
+};
+
+&ioport2 {
+	port-irqs = <&port_irq0 &port_irq1 &port_irq2
+	&port_irq3 &port_irq12>;
+	port-irq-names = "port-irq0",
+			 "port-irq1",
+			 "port-irq2",
+			 "port-irq3",
+			 "port-irq12";
+	port-irq0-pins = <6>;
+	port-irq1-pins = <5>;
+	port-irq2-pins = <13>;
+	port-irq3-pins = <12>;
+	port-irq12-pins = <8>;
+};
+
+&ioport3 {
+	port-irqs = <&port_irq5 &port_irq6
+	&port_irq8 &port_irq9>;
+	port-irq-names = "port-irq5",
+			 "port-irq6",
+			 "port-irq8",
+			 "port-irq9";
+	port-irq5-pins = <2>;
+	port-irq6-pins = <1>;
+	port-irq8-pins = <5>;
+	port-irq9-pins = <4>;
+};
+
+&ioport4 {
+	port-irqs = <&port_irq0 &port_irq4 &port_irq5
+	&port_irq6 &port_irq7 &port_irq8
+	&port_irq9 &port_irq14 &port_irq15>;
+	port-irq-names = "port-irq0",
+			 "port-irq4",
+			 "port-irq5",
+			 "port-irq6",
+			 "port-irq7",
+			 "port-irq8",
+			 "port-irq9",
+			 "port-irq14",
+			 "port-irq15";
+	port-irq0-pins = <0>;
+	port-irq4-pins = <2 11>;
+	port-irq5-pins = <1 10>;
+	port-irq6-pins = <9>;
+	port-irq7-pins = <8>;
+	port-irq8-pins = <15>;
+	port-irq9-pins = <14>;
+	port-irq14-pins = <3>;
+	port-irq15-pins = <4>;
+};
+
+&ioport5 {
+	port-irqs = <&port_irq11 &port_irq12 &port_irq13
+	&port_irq14>;
+	port-irq-names = "port-irq11",
+			 "port-irq12",
+			 "port-irq13",
+			 "port-irq14";
+	port-irq11-pins = <1>;
+	port-irq12-pins = <2>;
+	port-irq13-pins = <6>;
+	port-irq14-pins = <5>;
+};
+
+&ioport7 {
+	port-irqs = <&port_irq11>;
+	port-irq-names = "port-irq11";
+	port-irq11-pins = <8>;
+};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4m1ab3cfm.dtsi b/dts/arm/renesas/ra/ra4/r7fa4m1ab3cfm.dtsi
new file mode 100644
index 0000000000000..c00d5a9f699ce
--- /dev/null
+++ b/dts/arm/renesas/ra/ra4/r7fa4m1ab3cfm.dtsi
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/clock/ra_clock.h>
+#include <arm/renesas/ra/ra4/r7fa4m1ax.dtsi>
+
+/delete-node/ &ioport5;
+/delete-node/ &ioport6;
+/delete-node/ &ioport7;
+/delete-node/ &ioport8;
+
+/ {
+	soc {
+		flash-controller@407e0000 {
+			flash0: flash@0 {
+				compatible = "soc-nv-flash";
+				reg = <0x0 DT_SIZE_K(256)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4m1ab3cfp.dtsi b/dts/arm/renesas/ra/ra4/r7fa4m1ab3cfp.dtsi
index bed5149461bec..16bf28fd8b6ec 100644
--- a/dts/arm/renesas/ra/ra4/r7fa4m1ab3cfp.dtsi
+++ b/dts/arm/renesas/ra/ra4/r7fa4m1ab3cfp.dtsi
@@ -1,322 +1,20 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
+ * Copyright (c) 2025 TOKITA Hiroshi
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr/dt-bindings/clock/ra_clock.h>
-#include <arm/renesas/ra/ra4/ra4-cm4-common.dtsi>
+#include <arm/renesas/ra/ra4/r7fa4m1ax.dtsi>
 
 / {
 	soc {
-		sram0: memory@20000000 {
-			compatible = "mmio-sram";
-			reg = <0x20000000 DT_SIZE_K(32)>;
-		};
-
-		flash-controller@407e0000 {
-			reg = <0x407e0000 0x10000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			flash0: flash@0 {
+		 flash-controller@407e0000 {
+			  flash0: flash@0 {
 				compatible = "soc-nv-flash";
 				reg = <0x0 DT_SIZE_K(256)>;
-			};
-		};
-
-		ioport6: gpio@400400c0 {
-			compatible = "renesas,ra-gpio-ioport";
-			reg = <0x400400c0 0x20>;
-			port = <6>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		ioport7: gpio@400400e0 {
-			compatible = "renesas,ra-gpio-ioport";
-			reg = <0x400400e0 0x20>;
-			port = <7>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		ioport8: gpio@40040100 {
-			compatible = "renesas,ra-gpio-ioport";
-			reg = <0x40040100 0x20>;
-			port = <8>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <16>;
-			status = "disabled";
-		};
-
-		sci2: sci2@40070040 {
-			compatible = "renesas,ra-sci";
-			reg = <0x40070040 0x20>;
-			clocks = <&pclka MSTPB 29>;
-			status = "disabled";
-
-			uart {
-				compatible = "renesas,ra-sci-uart";
-				channel = <2>;
-				status = "disabled";
-			};
-		};
-
-		adc@4005c000 {
-			interrupts = <20 1>;
-			channel-count = <25>;
-			channel-available-mask = <0x3ff7fff>;
-		};
-
-		port_irq5: external-interrupt@40006005 {
-			compatible = "renesas,ra-external-interrupt";
-			reg = <0x40006005 0x1>;
-			channel = <5>;
-			renesas,sample-clock-div = <64>;
-			#port-irq-cells = <0>;
-			status = "disabled";
-		};
-
-		port_irq8: external-interrupt@40006008 {
-			compatible = "renesas,ra-external-interrupt";
-			reg = <0x40006008 0x1>;
-			channel = <8>;
-			renesas,sample-clock-div = <64>;
-			#port-irq-cells = <0>;
-			status = "disabled";
-		};
-
-		port_irq10: external-interrupt@4000600a {
-			compatible = "renesas,ra-external-interrupt";
-			reg = <0x4000600a 0x1>;
-			channel = <10>;
-			renesas,sample-clock-div = <64>;
-			#port-irq-cells = <0>;
-			status = "disabled";
-		};
-
-		port_irq12: external-interrupt@4000600c {
-			compatible = "renesas,ra-external-interrupt";
-			reg = <0x4000600c 0x1>;
-			channel = <12>;
-			renesas,sample-clock-div = <64>;
-			#port-irq-cells = <0>;
-			status = "disabled";
-		};
-	};
-
-	clocks: clocks {
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		xtal: clock-main-osc {
-			compatible = "renesas,ra-cgc-external-clock";
-			clock-frequency = <DT_FREQ_M(12)>;
-			#clock-cells = <0>;
-			status = "disabled";
-		};
-
-		hoco: clock-hoco {
-			compatible = "fixed-clock";
-			clock-frequency = <DT_FREQ_M(24)>;
-			#clock-cells = <0>;
-		};
-
-		moco: clock-moco {
-			compatible = "fixed-clock";
-			clock-frequency = <DT_FREQ_M(8)>;
-			#clock-cells = <0>;
-		};
-
-		loco: clock-loco {
-			compatible = "fixed-clock";
-			clock-frequency = <32768>;
-			#clock-cells = <0>;
-		};
-
-		subclk: clock-subclk {
-			compatible = "renesas,ra-cgc-subclk";
-			clock-frequency = <32768>;
-			#clock-cells = <0>;
-			status = "disabled";
-		};
-
-		pll: pll {
-			compatible = "renesas,ra-cgc-pll";
-			#clock-cells = <0>;
-
-			clocks = <&xtal>;
-			div = <2>;
-			mul = <8 0>;
-			status = "disabled";
-		};
-
-		pclkblock: pclkblock@40047000 {
-			compatible = "renesas,ra-cgc-pclk-block";
-			reg = <0x40047000 4>,
-				  <0x40047004 4>,
-				  <0x40047008 4>;
-			reg-names = "MSTPB", "MSTPC", "MSTPD";
-			#clock-cells = <0>;
-			clocks = <&pll>;
-			status = "okay";
-
-			iclk: iclk {
-				compatible = "renesas,ra-cgc-pclk";
-				clock-frequency = <48000000>;
-				div = <1>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclka: pclka {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <1>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclkb: pclkb {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <2>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclkc: pclkc {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <1>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			pclkd: pclkd {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <1>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			fclk: fclk {
-				compatible = "renesas,ra-cgc-pclk";
-				div = <2>;
-				#clock-cells = <2>;
-				status = "okay";
-			};
-
-			clkout: clkout {
-				compatible = "renesas,ra-cgc-pclk";
-				#clock-cells = <2>;
-				status = "disabled";
-			};
-
-			uclk: uclk {
-				compatible = "renesas,ra-cgc-pclk";
-				#clock-cells = <2>;
-				status = "disabled";
-			};
-		};
+			  };
+		 };
 	};
 };
-
-&ioport0 {
-	port-irqs = <&port_irq2 &port_irq3 &port_irq6
-	&port_irq7 &port_irq10 &port_irq15>;
-	port-irq-names = "port-irq2",
-			 "port-irq3",
-			 "port-irq6",
-			 "port-irq7",
-			 "port-irq10",
-			 "port-irq15";
-	port-irq2-pins = <2>;
-	port-irq3-pins = <4>;
-	port-irq6-pins = <0>;
-	port-irq7-pins = <1 15>;
-	port-irq10-pins = <5>;
-	port-irq15-pins = <11>;
-};
-
-&ioport1 {
-	port-irqs = <&port_irq0 &port_irq1 &port_irq2
-	&port_irq3 &port_irq4>;
-	port-irq-names = "port-irq0",
-			 "port-irq1",
-			 "port-irq2",
-			 "port-irq3",
-			 "port-irq4";
-	port-irq0-pins = <5>;
-	port-irq1-pins = <1 4>;
-	port-irq2-pins = <0>;
-	port-irq3-pins = <10>;
-	port-irq4-pins = <11>;
-};
-
-&ioport2 {
-	port-irqs = <&port_irq0 &port_irq1 &port_irq2
-	&port_irq3>;
-	port-irq-names = "port-irq0",
-			 "port-irq1",
-			 "port-irq2",
-			 "port-irq3";
-	port-irq0-pins = <6>;
-	port-irq1-pins = <5>;
-	port-irq2-pins = <13>;
-	port-irq3-pins = <12>;
-};
-
-&ioport3 {
-	port-irqs = <&port_irq5 &port_irq6 &port_irq8
-	&port_irq9>;
-	port-irq-names = "port-irq5",
-			 "port-irq6",
-			 "port-irq8",
-			 "port-irq9";
-	port-irq5-pins = <2>;
-	port-irq6-pins = <1>;
-	port-irq8-pins = <5>;
-	port-irq9-pins = <4>;
-};
-
-&ioport4 {
-	port-irqs = <&port_irq0 &port_irq4 &port_irq5
-	&port_irq6 &port_irq7 &port_irq8
-	&port_irq9>;
-	port-irq-names = "port-irq0",
-			 "port-irq4",
-			 "port-irq5",
-			 "port-irq6",
-			 "port-irq7",
-			 "port-irq8",
-			 "port-irq9";
-	port-irq0-pins = <0>;
-	port-irq4-pins = <2 11>;
-	port-irq5-pins = <1 10>;
-	port-irq6-pins = <9>;
-	port-irq7-pins = <8>;
-	port-irq8-pins = <15>;
-	port-irq9-pins = <14>;
-};
-
-&ioport5 {
-	port-irqs = <&port_irq11 &port_irq12 &port_irq14>;
-	port-irq-names = "port-irq11",
-			 "port-irq12",
-			 "port-irq14";
-	port-irq11-pins = <1>;
-	port-irq12-pins = <2>;
-	port-irq14-pins = <5>;
-};
-
-&pwm2 {
-	clocks = <&pclkd MSTPD 6>;
-};
-
-&pwm3 {
-	clocks = <&pclkd MSTPD 6>;
-};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4m1ab3cne.dtsi b/dts/arm/renesas/ra/ra4/r7fa4m1ab3cne.dtsi
new file mode 100644
index 0000000000000..9f379f43524c4
--- /dev/null
+++ b/dts/arm/renesas/ra/ra4/r7fa4m1ab3cne.dtsi
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Pete Johanson
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/clock/ra_clock.h>
+#include <arm/renesas/ra/ra4/r7fa4m1ax.dtsi>
+
+/delete-node/ &ioport5;
+/delete-node/ &ioport6;
+/delete-node/ &ioport7;
+/delete-node/ &ioport8;
+
+/ {
+	soc {
+		flash-controller@407e0000 {
+			flash0: flash@0 {
+				compatible = "soc-nv-flash";
+				reg = <0x0 DT_SIZE_K(256)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4m1ax.dtsi b/dts/arm/renesas/ra/ra4/r7fa4m1ax.dtsi
new file mode 100644
index 0000000000000..1a0570dc06489
--- /dev/null
+++ b/dts/arm/renesas/ra/ra4/r7fa4m1ax.dtsi
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/clock/ra_clock.h>
+#include <arm/renesas/ra/ra4/ra4-cm4-common.dtsi>
+
+/ {
+	soc {
+		sram0: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 DT_SIZE_K(32)>;
+		};
+
+		ioport6: gpio@400400c0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x400400c0 0x20>;
+			port = <6>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport7: gpio@400400e0 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x400400e0 0x20>;
+			port = <7>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		ioport8: gpio@40040100 {
+			compatible = "renesas,ra-gpio-ioport";
+			reg = <0x40040100 0x20>;
+			port = <8>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <16>;
+			status = "disabled";
+		};
+
+		sci2: sci2@40070040 {
+			compatible = "renesas,ra-sci";
+			reg = <0x40070040 0x20>;
+			interrupts = <8 1>, <9 1>, <10 1>, <11 1>;
+			interrupt-names = "rxi", "txi", "tei", "eri";
+			clocks = <&pclka MSTPB 29>;
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,ra-sci-uart";
+				channel = <2>;
+				status = "disabled";
+			};
+		};
+
+		adc@4005c000 {
+			interrupts = <20 1>;
+			channel-available-mask = <0x3ff7fff>;
+		};
+
+		port_irq5: external-interrupt@40006005 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006005 0x1>;
+			channel = <5>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq8: external-interrupt@40006008 {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x40006008 0x1>;
+			channel = <8>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq10: external-interrupt@4000600a {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600a 0x1>;
+			channel = <10>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		port_irq12: external-interrupt@4000600c {
+			compatible = "renesas,ra-external-interrupt";
+			reg = <0x4000600c 0x1>;
+			channel = <12>;
+			renesas,sample-clock-div = <64>;
+			#port-irq-cells = <0>;
+			status = "disabled";
+		};
+
+		trng: trng {
+			compatible = "renesas,ra-sce5-rng";
+			status = "disabled";
+		};
+
+		pwm6: pwm6@40078600 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_6>;
+			clocks = <&pclkd MSTPD 6>;
+			reg = <0x40078600 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+
+		pwm7: pwm7@40078700 {
+			compatible = "renesas,ra-pwm";
+			divider = <RA_PWM_SOURCE_DIV_1>;
+			channel = <RA_PWM_CHANNEL_7>;
+			clocks = <&pclkd MSTPD 6>;
+			reg = <0x40078700 0x100>;
+			#pwm-cells = <3>;
+			status = "disabled";
+		};
+	};
+
+	clocks: clocks {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		xtal: clock-main-osc {
+			compatible = "renesas,ra-cgc-external-clock";
+			clock-frequency = <DT_FREQ_M(12)>;
+			#clock-cells = <0>;
+			status = "disabled";
+		};
+
+		hoco: clock-hoco {
+			compatible = "fixed-clock";
+			clock-frequency = <DT_FREQ_M(24)>;
+			#clock-cells = <0>;
+		};
+
+		moco: clock-moco {
+			compatible = "fixed-clock";
+			clock-frequency = <DT_FREQ_M(8)>;
+			#clock-cells = <0>;
+		};
+
+		loco: clock-loco {
+			compatible = "fixed-clock";
+			clock-frequency = <32768>;
+			#clock-cells = <0>;
+		};
+
+		subclk: clock-subclk {
+			compatible = "renesas,ra-cgc-subclk";
+			clock-frequency = <32768>;
+			#clock-cells = <0>;
+			status = "disabled";
+		};
+
+		pll: pll {
+			compatible = "renesas,ra-cgc-pll";
+			#clock-cells = <0>;
+
+			clocks = <&xtal>;
+			div = <2>;
+			mul = <8 0>;
+			status = "disabled";
+		};
+
+		pclkblock: pclkblock@40047000 {
+			compatible = "renesas,ra-cgc-pclk-block";
+			reg = <0x40047000 4>,
+				  <0x40047004 4>,
+				  <0x40047008 4>;
+			reg-names = "MSTPB", "MSTPC", "MSTPD";
+			#clock-cells = <0>;
+			clocks = <&pll>;
+			status = "okay";
+
+			iclk: iclk {
+				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <48000000>;
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclka: pclka {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkb: pclkb {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <2>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkc: pclkc {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			pclkd: pclkd {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <1>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			fclk: fclk {
+				compatible = "renesas,ra-cgc-pclk";
+				div = <2>;
+				#clock-cells = <2>;
+				status = "okay";
+			};
+
+			clkout: clkout {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+
+			uclk: uclk {
+				compatible = "renesas,ra-cgc-pclk";
+				#clock-cells = <2>;
+				status = "disabled";
+			};
+		};
+	};
+};
+
+&ioport0 {
+	port-irqs = <&port_irq2 &port_irq3 &port_irq6
+	&port_irq7 &port_irq10 &port_irq15>;
+	port-irq-names = "port-irq2",
+			 "port-irq3",
+			 "port-irq6",
+			 "port-irq7",
+			 "port-irq10",
+			 "port-irq15";
+	port-irq2-pins = <2>;
+	port-irq3-pins = <4>;
+	port-irq6-pins = <0>;
+	port-irq7-pins = <1 15>;
+	port-irq10-pins = <5>;
+	port-irq15-pins = <11>;
+};
+
+&ioport1 {
+	port-irqs = <&port_irq0 &port_irq1 &port_irq2
+	&port_irq3 &port_irq4>;
+	port-irq-names = "port-irq0",
+			 "port-irq1",
+			 "port-irq2",
+			 "port-irq3",
+			 "port-irq4";
+	port-irq0-pins = <5>;
+	port-irq1-pins = <1 4>;
+	port-irq2-pins = <0>;
+	port-irq3-pins = <10>;
+	port-irq4-pins = <11>;
+};
+
+&ioport2 {
+	port-irqs = <&port_irq0 &port_irq1 &port_irq2
+	&port_irq3>;
+	port-irq-names = "port-irq0",
+			 "port-irq1",
+			 "port-irq2",
+			 "port-irq3";
+	port-irq0-pins = <6>;
+	port-irq1-pins = <5>;
+	port-irq2-pins = <13>;
+	port-irq3-pins = <12>;
+};
+
+&ioport3 {
+	port-irqs = <&port_irq5 &port_irq6 &port_irq8
+	&port_irq9>;
+	port-irq-names = "port-irq5",
+			 "port-irq6",
+			 "port-irq8",
+			 "port-irq9";
+	port-irq5-pins = <2>;
+	port-irq6-pins = <1>;
+	port-irq8-pins = <5>;
+	port-irq9-pins = <4>;
+};
+
+&ioport4 {
+	port-irqs = <&port_irq0 &port_irq4 &port_irq5
+	&port_irq6 &port_irq7 &port_irq8
+	&port_irq9>;
+	port-irq-names = "port-irq0",
+			 "port-irq4",
+			 "port-irq5",
+			 "port-irq6",
+			 "port-irq7",
+			 "port-irq8",
+			 "port-irq9";
+	port-irq0-pins = <0>;
+	port-irq4-pins = <2 11>;
+	port-irq5-pins = <1 10>;
+	port-irq6-pins = <9>;
+	port-irq7-pins = <8>;
+	port-irq8-pins = <15>;
+	port-irq9-pins = <14>;
+};
+
+&ioport5 {
+	port-irqs = <&port_irq11 &port_irq12 &port_irq14>;
+	port-irq-names = "port-irq11",
+			 "port-irq12",
+			 "port-irq14";
+	port-irq11-pins = <1>;
+	port-irq12-pins = <2>;
+	port-irq14-pins = <5>;
+};
+
+&pwm2 {
+	clocks = <&pclkd MSTPD 6>;
+};
+
+&pwm3 {
+	clocks = <&pclkd MSTPD 6>;
+};
+
+&dac_global {
+	has-davrefcr;
+};
diff --git a/dts/arm/renesas/ra/ra4/r7fa4m2ax.dtsi b/dts/arm/renesas/ra/ra4/r7fa4m2ax.dtsi
index 5866ffda30525..fcbf52a9b128d 100644
--- a/dts/arm/renesas/ra/ra4/r7fa4m2ax.dtsi
+++ b/dts/arm/renesas/ra/ra4/r7fa4m2ax.dtsi
@@ -96,7 +96,6 @@
 		};
 
 		adc@40170000 {
-			channel-count = <13>;
 			channel-available-mask = <0x139ff>;
 		};
 
@@ -215,6 +214,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <100000000>;
 				div = <2>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra4/r7fa4m3ax.dtsi b/dts/arm/renesas/ra/ra4/r7fa4m3ax.dtsi
index 90f5c6ed8da1f..019a3947d212f 100644
--- a/dts/arm/renesas/ra/ra4/r7fa4m3ax.dtsi
+++ b/dts/arm/renesas/ra/ra4/r7fa4m3ax.dtsi
@@ -104,12 +104,10 @@
 		};
 
 		adc@40170000 {
-			channel-count = <12>;
 			channel-available-mask = <0x33ff>;
 		};
 
 		adc@40170200 {
-			channel-count = <10>;
 			channel-available-mask = <0x7f0007>;
 		};
 
@@ -226,6 +224,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <100000000>;
 				div = <2>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra4/r7fa4w1ad2cng.dtsi b/dts/arm/renesas/ra/ra4/r7fa4w1ad2cng.dtsi
index 5afa2da38cbee..44af76cf559cc 100644
--- a/dts/arm/renesas/ra/ra4/r7fa4w1ad2cng.dtsi
+++ b/dts/arm/renesas/ra/ra4/r7fa4w1ad2cng.dtsi
@@ -43,7 +43,6 @@
 
 		adc@4005c000 {
 			interrupts = <20 1>;
-			channel-count = <8>;
 			channel-available-mask = <0x1a0670>;
 		};
 
@@ -117,6 +116,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <48000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
@@ -237,3 +237,7 @@
 &pwm3 {
 	clocks = <&pclkd MSTPD 5>;
 };
+
+&dac_global {
+	has-davrefcr;
+};
diff --git a/dts/arm/renesas/ra/ra4/ra4-cm33-common.dtsi b/dts/arm/renesas/ra/ra4/ra4-cm33-common.dtsi
index 3afb46ee9f83a..aa88f96a30488 100644
--- a/dts/arm/renesas/ra/ra4/ra4-cm33-common.dtsi
+++ b/dts/arm/renesas/ra/ra4/ra4-cm33-common.dtsi
@@ -306,6 +306,22 @@
 			status = "disabled";
 		};
 
+		usbfs: usbfs@40090000 {
+			compatible = "renesas,ra-usbfs";
+			reg = <0x40090000 0x2000>;
+			interrupts = <32 1>, <33 1>;
+			interrupt-names = "usbfs-i", "usbfs-r";
+			num-bidir-endpoints = <10>;
+			phys = <&usbfs_phy>;
+			phys-clock = <&uclk>;
+			status = "disabled";
+
+			udc {
+				compatible = "renesas,ra-udc";
+				status = "disabled";
+			};
+		};
+
 		option_setting_ofs: option_setting_ofs@100a100 {
 			compatible = "zephyr,memory-region";
 			reg = <0x0100a100 0x18>;
@@ -510,6 +526,18 @@
 			#pwm-cells = <3>;
 			status = "disabled";
 		};
+
+		wdt: wdt@40083400 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40083400 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
+	};
+
+	usbfs_phy: usbfs-phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 };
 
diff --git a/dts/arm/renesas/ra/ra4/ra4-cm4-common.dtsi b/dts/arm/renesas/ra/ra4/ra4-cm4-common.dtsi
index a1cd196a0d326..5234212dd286e 100644
--- a/dts/arm/renesas/ra/ra4/ra4-cm4-common.dtsi
+++ b/dts/arm/renesas/ra/ra4/ra4-cm4-common.dtsi
@@ -218,6 +218,21 @@
 			status = "disabled";
 		};
 
+		dac_global: dac_global@4005e000 {
+			compatible = "renesas,ra-dac-global";
+			reg = <0x4005e000 0x10c4>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
+			dac0: dac@0 {
+				compatible = "renesas,ra-dac";
+				#io-channel-cells = <1>;
+				reg = <0>;
+				status = "disabled";
+			};
+		};
+
 		iic0: iic0@40053000 {
 			compatible = "renesas,ra-iic";
 			channel = <0>;
@@ -232,6 +247,22 @@
 			status = "disabled";
 		};
 
+		usbfs: usbfs@40090000 {
+			compatible = "renesas,ra-usbfs";
+			reg = <0x40090000 0x2000>;
+			num-bidir-endpoints = <10>;
+			interrupts = <12 1>, <13 1>;
+			interrupt-names = "usbfs-i", "usbfs-r";
+			phys = <&usbfs_phy>;
+			phys-clock = <&uclk>;
+			status = "disabled";
+
+			udc {
+				compatible = "renesas,ra-udc";
+				status = "disabled";
+			};
+		};
+
 		id_code: id_code@1010018 {
 			compatible = "zephyr,memory-region";
 			reg = <0x01010018 0x20>;
@@ -395,6 +426,18 @@
 			#pwm-cells = <3>;
 			status = "disabled";
 		};
+
+		wdt: wdt@40044200 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40044200 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
+	};
+
+	usbfs_phy: usbfs-phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 };
 
diff --git a/dts/arm/renesas/ra/ra6/r7fa6e10x.dtsi b/dts/arm/renesas/ra/ra6/r7fa6e10x.dtsi
index 3d368903774bb..7eb8990544823 100644
--- a/dts/arm/renesas/ra/ra6/r7fa6e10x.dtsi
+++ b/dts/arm/renesas/ra/ra6/r7fa6e10x.dtsi
@@ -95,7 +95,6 @@
 		};
 
 		adc@40170000 {
-			channel-count = <11>;
 			channel-available-mask = <0x31ff>;
 		};
 
@@ -194,6 +193,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <200000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra6/r7fa6e2bx.dtsi b/dts/arm/renesas/ra/ra6/r7fa6e2bx.dtsi
index 29a93715dea58..bc4ad08abcd1c 100644
--- a/dts/arm/renesas/ra/ra6/r7fa6e2bx.dtsi
+++ b/dts/arm/renesas/ra/ra6/r7fa6e2bx.dtsi
@@ -6,6 +6,7 @@
 
 #include <arm/renesas/ra/ra6/ra6-cm33-common.dtsi>
 #include <zephyr/dt-bindings/clock/ra_clock.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
 
 /delete-node/ &agt0;
 /delete-node/ &agt1;
@@ -13,9 +14,11 @@
 /delete-node/ &agt3;
 /delete-node/ &agt4;
 /delete-node/ &agt5;
-#include <zephyr/dt-bindings/pwm/ra_pwm.h>
-
 /delete-node/ &adc1;
+/delete-node/ &usbfs;
+/delete-node/ &usbfs_phy;
+/delete-node/ &eth;
+/delete-node/ &mdio;
 
 / {
 	soc {
@@ -35,7 +38,6 @@
 		};
 
 		adc@40170000 {
-			channel-count = <12>;
 			channel-available-mask = <0x139f7>;
 		};
 
@@ -52,6 +54,7 @@
 			interrupt-names = "rxf", "glerr";
 			clocks = <&pclkb 0 0>, <&pclka 0 0>;
 			clock-names = "opclk", "ramclk";
+			dll-max-freq = <DT_FREQ_M(40)>;
 			reg = <0x400b0000 0x2000>;
 			status = "disabled";
 
@@ -151,6 +154,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <200000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra6/r7fa6m1ad3cfp.dtsi b/dts/arm/renesas/ra/ra6/r7fa6m1ad3cfp.dtsi
index 174148b8b47bd..596fcc5b520e8 100644
--- a/dts/arm/renesas/ra/ra6/r7fa6m1ad3cfp.dtsi
+++ b/dts/arm/renesas/ra/ra6/r7fa6m1ad3cfp.dtsi
@@ -7,6 +7,9 @@
 #include <zephyr/dt-bindings/clock/ra_clock.h>
 #include <arm/renesas/ra/ra6/ra6-cm4-common.dtsi>
 
+/delete-node/ &eth;
+/delete-node/ &mdio;
+
 / {
 	soc {
 		sram0: memory@1ffe0000 {
@@ -39,12 +42,10 @@
 		};
 
 		adc@4005c000 {
-			channel-count = <11>;
 			channel-available-mask = <0x1700ef>;
 		};
 
 		adc@4005c200 {
-			channel-count = <8>;
 			channel-available-mask = <0x300e7>;
 		};
 	};
@@ -108,6 +109,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <120000000>;
 				div = <2>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra6/r7fa6m2ax.dtsi b/dts/arm/renesas/ra/ra6/r7fa6m2ax.dtsi
index a407fd1c4590a..5a07efd2800f7 100644
--- a/dts/arm/renesas/ra/ra6/r7fa6m2ax.dtsi
+++ b/dts/arm/renesas/ra/ra6/r7fa6m2ax.dtsi
@@ -8,6 +8,9 @@
 #include <zephyr/dt-bindings/clock/ra_clock.h>
 #include <zephyr/dt-bindings/pwm/ra_pwm.h>
 
+/delete-node/ &eth;
+/delete-node/ &mdio;
+
 / {
 	soc {
 		sram0: memory@1ffe0000 {
@@ -61,12 +64,10 @@
 		};
 
 		adc@4005c000 {
-			channel-count = <13>;
 			channel-available-mask = <0x1f00ff>;
 		};
 
 		adc@4005c200 {
-			channel-count = <9>;
 			channel-available-mask = <0x700e7>;
 		};
 
@@ -140,6 +141,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <120000000>;
 				div = <2>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra6/r7fa6m3ax.dtsi b/dts/arm/renesas/ra/ra6/r7fa6m3ax.dtsi
index a13ed21e3d2df..78e71409cc948 100644
--- a/dts/arm/renesas/ra/ra6/r7fa6m3ax.dtsi
+++ b/dts/arm/renesas/ra/ra6/r7fa6m3ax.dtsi
@@ -105,12 +105,13 @@
 		};
 
 		usbhs: usbhs@40060000 {
-			compatible = "renesas,ra-usb";
+			compatible = "renesas,ra-usbhs";
 			reg = <0x40060000 0x2000>;
-			interrupts = <54 12>, <55 12>, <56 12>;
-			interrupt-names = "usbhs-ir", "usbhs-d0", "usbhs-d1";
+			interrupts = <54 12>;
+			interrupt-names = "usbhs-ir";
 			num-bidir-endpoints = <10>;
 			phys = <&usbhs_phy>;
+			phys-clock = <&uclk>;
 			status = "disabled";
 			udc {
 				compatible = "renesas,ra-udc";
@@ -119,12 +120,10 @@
 		};
 
 		adc@4005c000 {
-			channel-count = <13>;
 			channel-available-mask = <0x1f00ff>;
 		};
 
 		adc@4005c200 {
-			channel-count = <11>;
 			channel-available-mask = <0xf00ef>;
 		};
 
@@ -198,6 +197,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <120000000>;
 				div = <2>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra6/r7fa6m4ax.dtsi b/dts/arm/renesas/ra/ra6/r7fa6m4ax.dtsi
index d864486b1cc68..e629ed5b3fa4f 100644
--- a/dts/arm/renesas/ra/ra6/r7fa6m4ax.dtsi
+++ b/dts/arm/renesas/ra/ra6/r7fa6m4ax.dtsi
@@ -128,12 +128,10 @@
 		};
 
 		adc@40170000 {
-			channel-count = <12>;
 			channel-available-mask = <0x33ff>;
 		};
 
 		adc@40170200 {
-			channel-count = <10>;
 			channel-available-mask = <0x7f0007>;
 		};
 
@@ -302,6 +300,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <200000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra6/r7fa6m5xh.dtsi b/dts/arm/renesas/ra/ra6/r7fa6m5xh.dtsi
index 44337da8d5a81..4675d23d6b242 100644
--- a/dts/arm/renesas/ra/ra6/r7fa6m5xh.dtsi
+++ b/dts/arm/renesas/ra/ra6/r7fa6m5xh.dtsi
@@ -195,12 +195,13 @@
 		};
 
 		usbhs: usbhs@40111000 {
-			compatible = "renesas,ra-usb";
+			compatible = "renesas,ra-usbhs";
 			reg = <0x40111000 0x2000>;
-			interrupts = <54 12>, <55 12>, <56 12>;
-			interrupt-names = "usbhs-ir", "usbhs-d0", "usbhs-d1";
+			interrupts = <54 12>;
+			interrupt-names = "usbhs-ir";
 			num-bidir-endpoints = <10>;
 			phys = <&usbhs_phy>;
+			phys-clock = <&uclk>, <&u60clk>;
 			status = "disabled";
 			udc {
 				compatible = "renesas,ra-udc";
@@ -209,12 +210,10 @@
 		};
 
 		adc@40170000 {
-			channel-count = <13>;
 			channel-available-mask = <0x37ff>;
 		};
 
 		adc@40170200 {
-			channel-count = <16>;
 			channel-available-mask = <0x1fff0007>;
 		};
 
@@ -353,6 +352,7 @@
 
 			iclk: iclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <200000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra6/ra6-cm33-common.dtsi b/dts/arm/renesas/ra/ra6/ra6-cm33-common.dtsi
index 7318ca9037918..daeabd1e3f81f 100644
--- a/dts/arm/renesas/ra/ra6/ra6-cm33-common.dtsi
+++ b/dts/arm/renesas/ra/ra6/ra6-cm33-common.dtsi
@@ -121,7 +121,7 @@
 
 		sci9: sci9@40118900 {
 			compatible = "renesas,ra-sci";
-			interrupts = <24 1>, <25 1>, <26 1>, <27 1>;
+			interrupts = <74 1>, <75 1>, <76 1>, <77 1>;
 			interrupt-names = "rxi", "txi", "tei", "eri";
 			reg = <0x40118900 0x100>;
 			clocks = <&pclka MSTPB 22>;
@@ -152,7 +152,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			channel = <0>;
-			interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
+			interrupts = <78 1>, <79 1>, <80 1>, <81 1>;
 			interrupt-names = "rxi", "txi", "tei", "eri";
 			reg = <0x4011a000 0x100>;
 			status = "disabled";
@@ -163,7 +163,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			channel = <1>;
-			interrupts = <32 1>, <33 1>, <34 1>, <35 1>;
+			interrupts = <82 1>, <83 1>, <84 1>, <85 1>;
 			interrupt-names = "rxi", "txi", "tei", "eri";
 			reg = <0x4011a100 0x100>;
 			status = "disabled";
@@ -300,6 +300,22 @@
 			};
 		};
 
+		usbfs: usbfs@40090000 {
+			compatible = "renesas,ra-usbfs";
+			reg = <0x40090000 0x2000>;
+			interrupts = <55 12>, <56 12>;
+			interrupt-names = "usbfs-i", "usbfs-r";
+			num-bidir-endpoints = <10>;
+			phys = <&usbfs_phy>;
+			phys-clock = <&uclk>;
+			status = "disabled";
+
+			udc {
+				compatible = "renesas,ra-udc";
+				status = "disabled";
+			};
+		};
+
 		option_setting_ofs: option_setting_ofs@100a100 {
 			compatible = "zephyr,memory-region";
 			reg = <0x0100a100 0x18>;
@@ -513,6 +529,34 @@
 			#pwm-cells = <3>;
 			status = "disabled";
 		};
+
+		wdt: wdt@40083400 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40083400 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
+
+		eth: ethernet@40114100 {
+			compatible = "renesas,ra-ethernet";
+			reg = <0x40114100 0xfc>;
+			interrupts = <51 12>;
+			local-mac-address = [00 11 22 33 44 55];
+			phy-connection-type = "rmii";
+			status = "disabled";
+		};
+
+		mdio: mdio {
+			compatible = "renesas,ra-mdio";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+	};
+
+	usbfs_phy: usbfs-phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 };
 
diff --git a/dts/arm/renesas/ra/ra6/ra6-cm4-common.dtsi b/dts/arm/renesas/ra/ra6/ra6-cm4-common.dtsi
index 9f554cda1037f..191e14252fa28 100644
--- a/dts/arm/renesas/ra/ra6/ra6-cm4-common.dtsi
+++ b/dts/arm/renesas/ra/ra6/ra6-cm4-common.dtsi
@@ -319,6 +319,22 @@
 			};
 		};
 
+		usbfs: usbfs@40090000 {
+			compatible = "renesas,ra-usbfs";
+			reg = <0x40090000 0x2000>;
+			interrupts = <55 12>, <56 12>;
+			interrupt-names = "usbfs-i", "usbfs-r";
+			num-bidir-endpoints = <10>;
+			phys = <&usbfs_phy>;
+			phys-clock = <&uclk>;
+			status = "disabled";
+
+			udc {
+				compatible = "renesas,ra-udc";
+				status = "disabled";
+			};
+		};
+
 		id_code: id_code@100a150 {
 			compatible = "zephyr,memory-region";
 			reg = <0x0100a150 0x10>;
@@ -600,6 +616,22 @@
 			status = "disabled";
 		};
 
+		eth: ethernet@40064100 {
+			compatible = "renesas,ra-ethernet";
+			reg = <0x40064100 0xfc>;
+			interrupts = <51 0>;
+			local-mac-address = [00 11 22 33 44 55];
+			phy-connection-type = "rmii";
+			status = "disabled";
+		};
+
+		mdio: mdio {
+			compatible = "renesas,ra-mdio";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		flash: flash-controller@407e0000 {
 			compatible = "renesas,ra-flash-hp-controller";
 			reg = <0x407e0000 0x10000>;
@@ -608,6 +640,18 @@
 			interrupts = <49 1>, <50 1>;
 			interrupt-names = "frdyi", "fiferr";
 		};
+
+		wdt: wdt@40044200 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40044200 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
+	};
+
+	usbfs_phy: usbfs-phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 };
 
diff --git a/dts/arm/renesas/ra/ra8/r7fa8d1xh.dtsi b/dts/arm/renesas/ra/ra8/r7fa8d1xh.dtsi
index 838d705e6d18d..629908e00e48d 100644
--- a/dts/arm/renesas/ra/ra8/r7fa8d1xh.dtsi
+++ b/dts/arm/renesas/ra/ra8/r7fa8d1xh.dtsi
@@ -155,6 +155,7 @@
 
 			cpuclk: cpuclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <480000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
@@ -280,12 +281,13 @@
 
 	soc {
 		usbhs: usbhs@40351000 {
-			compatible = "renesas,ra-usb";
+			compatible = "renesas,ra-usbhs";
 			reg = <0x40351000 0x2000>;
-			interrupts = <54 12>, <55 12>, <56 12>;
-			interrupt-names = "usbhs-ir", "usbhs-d0", "usbhs-d1";
+			interrupts = <54 12>;
+			interrupt-names = "usbhs-ir";
 			num-bidir-endpoints = <10>;
 			phys = <&usbhs_phy>;
+			phys-clock = <&uclk>, <&u60clk>;
 			status = "disabled";
 			udc {
 				compatible = "renesas,ra-udc";
diff --git a/dts/arm/renesas/ra/ra8/r7fa8m1xh.dtsi b/dts/arm/renesas/ra/ra8/r7fa8m1xh.dtsi
index c8ebbd5edc997..88661e3abfe85 100644
--- a/dts/arm/renesas/ra/ra8/r7fa8m1xh.dtsi
+++ b/dts/arm/renesas/ra/ra8/r7fa8m1xh.dtsi
@@ -125,6 +125,7 @@
 
 			cpuclk: cpuclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <480000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
@@ -244,12 +245,13 @@
 
 	soc {
 		usbhs: usbhs@40351000 {
-			compatible = "renesas,ra-usb";
+			compatible = "renesas,ra-usbhs";
 			reg = <0x40351000 0x2000>;
-			interrupts = <54 12>, <55 12>, <56 12>;
-			interrupt-names = "usbhs-ir", "usbhs-d0", "usbhs-d1";
+			interrupts = <54 12>;
+			interrupt-names = "usbhs-ir";
 			num-bidir-endpoints = <10>;
 			phys = <&usbhs_phy>;
+			phys-clock = <&uclk>, <&u60clk>;
 			status = "disabled";
 			udc {
 				compatible = "renesas,ra-udc";
diff --git a/dts/arm/renesas/ra/ra8/r7fa8t1xh.dtsi b/dts/arm/renesas/ra/ra8/r7fa8t1xh.dtsi
index e2f1b7f8af90b..9c45b7709516b 100644
--- a/dts/arm/renesas/ra/ra8/r7fa8t1xh.dtsi
+++ b/dts/arm/renesas/ra/ra8/r7fa8t1xh.dtsi
@@ -122,6 +122,7 @@
 
 			cpuclk: cpuclk {
 				compatible = "renesas,ra-cgc-pclk";
+				clock-frequency = <480000000>;
 				div = <1>;
 				#clock-cells = <2>;
 				status = "okay";
diff --git a/dts/arm/renesas/ra/ra8/ra8x1.dtsi b/dts/arm/renesas/ra/ra8/ra8x1.dtsi
index 70b3c50182489..1155a02793fd2 100644
--- a/dts/arm/renesas/ra/ra8/ra8x1.dtsi
+++ b/dts/arm/renesas/ra/ra8/ra8x1.dtsi
@@ -22,12 +22,28 @@
 			reg = <0>;
 			#address-cells = <1>;
 			#size-cells = <1>;
+			cpu-power-states = <&stop0 &stop1>;
 
 			mpu: mpu@e000ed90 {
 				compatible = "arm,armv8.1m-mpu";
 				reg = <0xe000ed90 0x40>;
 			};
 		};
+
+		power-states {
+			stop0: state0 {
+				compatible = "zephyr,power-state";
+				power-state-name = "runtime-idle";
+				min-residency-us = <450>;
+			};
+
+			stop1: state1 {
+				compatible = "zephyr,power-state";
+				power-state-name = "standby";
+				min-residency-us = <5000>;
+				exit-latency-us = <3000>;
+			};
+		};
 	};
 
 	soc {
@@ -198,6 +214,14 @@
 				channel = <0>;
 				status = "disabled";
 			};
+
+			i2c {
+				compatible = "renesas,ra-i2c-sci-b";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				channel = <0>;
+				status = "disabled";
+			};
 		};
 
 		sci1: sci1@40358100 {
@@ -212,6 +236,14 @@
 				channel = <1>;
 				status = "disabled";
 			};
+
+			i2c {
+				compatible = "renesas,ra-i2c-sci-b";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				channel = <1>;
+				status = "disabled";
+			};
 		};
 
 		sci2: sci2@40358200 {
@@ -226,6 +258,14 @@
 				channel = <2>;
 				status = "disabled";
 			};
+
+			i2c {
+				compatible = "renesas,ra-i2c-sci-b";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				channel = <2>;
+				status = "disabled";
+			};
 		};
 
 		sci3: sci3@40358300 {
@@ -240,6 +280,14 @@
 				channel = <3>;
 				status = "disabled";
 			};
+
+			i2c {
+				compatible = "renesas,ra-i2c-sci-b";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				channel = <3>;
+				status = "disabled";
+			};
 		};
 
 		sci4: sci4@40358400 {
@@ -254,6 +302,14 @@
 				channel = <4>;
 				status = "disabled";
 			};
+
+			i2c {
+				compatible = "renesas,ra-i2c-sci-b";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				channel = <4>;
+				status = "disabled";
+			};
 		};
 
 		sci9: sci9@40358900 {
@@ -268,6 +324,14 @@
 				channel = <9>;
 				status = "disabled";
 			};
+
+			i2c {
+				compatible = "renesas,ra-i2c-sci-b";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				channel = <9>;
+				status = "disabled";
+			};
 		};
 
 		flash: flash-controller@40100000 {
@@ -290,7 +354,6 @@
 			reg = <0x40332000 0x100>;
 			#io-channel-cells = <1>;
 			vref-mv = <3300>;
-			channel-count = <12>;
 			channel-available-mask = <0xf01f7>;
 			status = "disabled";
 		};
@@ -302,7 +365,6 @@
 			reg = <0x40332200 0x100>;
 			#io-channel-cells = <1>;
 			vref-mv = <3300>;
-			channel-count = <13>;
 			channel-available-mask = <0x7f0077>;
 			status = "disabled";
 		};
@@ -498,6 +560,32 @@
 			status = "disabled";
 		};
 
+		ulpt0: ulpt@40220000 {
+			compatible = "renesas,ra-ulpt";
+			reg = <0x40220000 0x100>;
+			channel = <0>;
+			interrupt-names = "ulpti";
+			interrupts = <36 1>;
+			status = "disabled";
+
+			timer {
+				compatible = "renesas,ra-ulpt-timer";
+				status = "disabled";
+			};
+		};
+
+		ulpt1: ulpt@40220100 {
+			compatible = "renesas,ra-ulpt";
+			reg = <0x40220100 0x100>;
+			channel = <1>;
+			status = "disabled";
+
+			timer {
+				compatible = "renesas,ra-ulpt-timer";
+				status = "disabled";
+			};
+		};
+
 		option_setting_ofs: option_setting_ofs@300a100 {
 			compatible = "zephyr,memory-region";
 			reg = <0x0300a100 0x18>;
@@ -559,6 +647,8 @@
 			interrupt-names = "rxf", "glerr";
 			clocks = <&pclka 0 0>, <&pclke 0 0>;
 			clock-names = "opclk", "ramclk";
+			dll-min-freq = <DT_FREQ_M(8)>;
+			dll-max-freq = <DT_FREQ_M(80)>;
 			reg = <0x40380000 0x4000>;
 			status = "disabled";
 
@@ -770,6 +860,52 @@
 			reg = <0x40252400 0x0400>;
 			status = "disabled";
 		};
+
+		wdt: wdt@40083400 {
+			compatible = "renesas,ra-wdt";
+			reg = <0x40083400 0x200>;
+			clocks = <&pclkb 0 0>;
+			status = "disabled";
+		};
+
+		usbfs: usbfs@40250000 {
+			compatible = "renesas,ra-usbfs";
+			reg = <0x40250000 0x2000>;
+			interrupts = <55 12>, <56 12>;
+			interrupt-names = "usbfs-i", "usbfs-r";
+			num-bidir-endpoints = <10>;
+			phys = <&usbfs_phy>;
+			phys-clock = <&uclk>;
+			status = "disabled";
+
+			udc {
+				compatible = "renesas,ra-udc";
+				status = "disabled";
+			};
+		};
+
+		acmphs_global: acmphs_global@40236000 {
+			compatible = "renesas,ra-acmphs-global";
+			reg = <0x40236000 0x200>;
+			status = "disabled";
+
+			acmphs0: acmphs0 {
+				compatible = "renesas,ra-acmphs";
+				channel = <0>;
+				status = "disabled";
+			};
+
+			acmphs1: acmphs1 {
+				compatible = "renesas,ra-acmphs";
+				channel = <1>;
+				status = "disabled";
+			};
+		};
+	};
+
+	usbfs_phy: usbfs-phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 };
 
diff --git a/dts/arm/renesas/rz/rzg/r9a07g044.dtsi b/dts/arm/renesas/rz/rzg/r9a07g044.dtsi
new file mode 100644
index 0000000000000..e34913b34dd1f
--- /dev/null
+++ b/dts/arm/renesas/rz/rzg/r9a07g044.dtsi
@@ -0,0 +1,545 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/armv8-m.dtsi>
+#include <mem.h>
+#include <freq.h>
+
+/ {
+	compatible = "renesas,r9a07g044";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-m33";
+			reg = <0>;
+			clock-frequency = <DT_FREQ_M(200)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			mpu: mpu@e000ed90 {
+				compatible = "arm,armv8m-mpu";
+				reg = <0xe000ed90 0x40>;
+			};
+		};
+	};
+
+	soc {
+		pinctrl: pin-controller@41030000 {
+			compatible = "renesas,rzg-pinctrl";
+			reg = <0x41030000 DT_SIZE_K(64)>;
+			reg-names = "pinctrl";
+
+			gpio: gpio-common {
+				compatible = "renesas,rz-gpio-int";
+				interrupts =
+					<444 10>, <445 10>, <446 10>, <447 10>,
+					<448 10>, <449 10>, <450 10>, <451 10>,
+					<452 10>, <453 10>, <454 10>, <455 10>,
+					<456 10>, <457 10>, <458 10>, <459 10>,
+					<460 10>, <461 10>, <462 10>, <463 10>,
+					<464 10>, <465 10>, <466 10>, <467 10>,
+					<468 10>, <469 10>, <470 10>, <471 10>,
+					<472 10>, <473 10>, <474 10>, <475 10>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+
+				gpio0: gpio@0 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x0>;
+					status = "disabled";
+				};
+
+				gpio1: gpio@100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x100>;
+					status = "disabled";
+				};
+
+				gpio2: gpio@200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x200>;
+					status = "disabled";
+				};
+
+				gpio3: gpio@300 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x300>;
+					status = "disabled";
+				};
+
+				gpio4: gpio@400 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x400>;
+					status = "disabled";
+				};
+
+				gpio5: gpio@500 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <3>;
+					reg = <0x500>;
+					status = "disabled";
+				};
+
+				gpio6: gpio@600 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x600>;
+					status = "disabled";
+				};
+
+				gpio7: gpio@700 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <3>;
+					reg = <0x700>;
+					status = "disabled";
+				};
+
+				gpio8: gpio@800 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x800>;
+					status = "disabled";
+				};
+
+				gpio9: gpio@900 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x900>;
+					status = "disabled";
+				};
+
+				gpio10: gpio@a00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0xa00>;
+					status = "disabled";
+				};
+
+				gpio11: gpio@b00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0xb00>;
+					status = "disabled";
+				};
+
+				gpio12: gpio@c00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0xc00>;
+					status = "disabled";
+				};
+
+				gpio13: gpio@d00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <3>;
+					reg = <0xd00>;
+					status = "disabled";
+				};
+
+				gpio14: gpio@e00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0xe00>;
+					status = "disabled";
+				};
+
+				gpio15: gpio@f00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0xf00>;
+					status = "disabled";
+				};
+
+				gpio16: gpio@1000 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x1000>;
+					status = "disabled";
+				};
+
+				gpio17: gpio@1100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <3>;
+					reg = <0x1100>;
+					status = "disabled";
+				};
+
+				gpio18: gpio@1200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1200>;
+					status = "disabled";
+				};
+
+				gpio19: gpio@1300 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1300>;
+					status = "disabled";
+				};
+
+				gpio20: gpio@1400 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <3>;
+					reg = <0x1400>;
+					status = "disabled";
+				};
+
+				gpio21: gpio@1500 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1500>;
+					status = "disabled";
+				};
+
+				gpio22: gpio@1600 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1600>;
+					status = "disabled";
+				};
+
+				gpio23: gpio@1700 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1700>;
+					status = "disabled";
+				};
+
+				gpio24: gpio@1800 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1800>;
+					status = "disabled";
+				};
+
+				gpio25: gpio@1900 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1900>;
+					status = "disabled";
+				};
+
+				gpio26: gpio@1a00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1a00>;
+					status = "disabled";
+				};
+
+				gpio27: gpio@1b00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1b00>;
+					status = "disabled";
+				};
+
+				gpio28: gpio@1c00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1c00>;
+					status = "disabled";
+				};
+
+				gpio29: gpio@1d00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1d00>;
+					status = "disabled";
+				};
+
+				gpio30: gpio@1e00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1e00>;
+					status = "disabled";
+				};
+
+				gpio31: gpio@1f00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x1f00>;
+					status = "disabled";
+				};
+
+				gpio32: gpio@2000 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2000>;
+					status = "disabled";
+				};
+
+				gpio33: gpio@2100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2100>;
+					status = "disabled";
+				};
+				gpio34: gpio@2200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2200>;
+					status = "disabled";
+				};
+
+				gpio35: gpio@2300 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2300>;
+					status = "disabled";
+				};
+
+				gpio36: gpio@2400 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2400>;
+					status = "disabled";
+				};
+
+				gpio37: gpio@2500 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <3>;
+					reg = <0x2500>;
+					status = "disabled";
+				};
+
+				gpio38: gpio@2600 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <3>;
+					reg = <0x2600>;
+					status = "disabled";
+				};
+
+				gpio39: gpio@2700 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2700>;
+					status = "disabled";
+				};
+
+				gpio40: gpio@2800 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2800>;
+					status = "disabled";
+				};
+
+				gpio41: gpio@2900 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2900>;
+					status = "disabled";
+				};
+
+				gpio42: gpio@2a00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <2>;
+					reg = <0x2a00>;
+					status = "disabled";
+				};
+
+				gpio43: gpio@2b00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <5>;
+					reg = <0x2b00>;
+					status = "disabled";
+				};
+
+				gpio44: gpio@2c00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <3>;
+					reg = <0x2c00>;
+					status = "disabled";
+				};
+				gpio45: gpio@2d00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <4>;
+					reg = <0x2d00>;
+					status = "disabled";
+				};
+
+				gpio46: gpio@2e00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <4>;
+					reg = <0x2e00>;
+					status = "disabled";
+				};
+
+				gpio47: gpio@2f00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <4>;
+					reg = <0x2f00>;
+					status = "disabled";
+				};
+
+				gpio48: gpio@3000 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <4>;
+					reg = <0x3000>;
+					status = "disabled";
+				};
+			};
+		};
+
+		scif0: serial@4004b800 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <0>;
+			reg = <0x4004b800 DT_SIZE_K(1)>;
+			interrupts = <380 1>, <381 1>, <382 1>, <383 1>, <384 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif1: serial@4004bc00 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <1>;
+			reg = <0x4004bc00 DT_SIZE_K(1)>;
+			interrupts = <385 1>, <386 1>, <387 1>, <388 1>, <389 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif2: serial@4004c000 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <2>;
+			reg = <0x4004c000 DT_SIZE_K(1)>;
+			interrupts = <390 1>, <391 1>, <392 1>, <393 1>, <394 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif3: serial@4004c400 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <3>;
+			reg = <0x4004c400 DT_SIZE_K(1)>;
+			interrupts = <395 1>, <396 1>, <397 1>, <398 1>, <399 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif4: serial@4004c800 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <4>;
+			reg = <0x4004c800 DT_SIZE_K(1)>;
+			interrupts = <400 1>, <401 1>, <402 1>, <403 1>, <404 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <7>;
+};
diff --git a/dts/arm/renesas/rz/rzg/r9a07g044c.dtsi b/dts/arm/renesas/rz/rzg/r9a07g044c.dtsi
new file mode 100644
index 0000000000000..930faeea63e54
--- /dev/null
+++ b/dts/arm/renesas/rz/rzg/r9a07g044c.dtsi
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/renesas/rz/rzg/r9a07g044.dtsi>
+
+/delete-node/ &scif4;
diff --git a/dts/arm/renesas/rz/rzg/r9a08g045.dtsi b/dts/arm/renesas/rz/rzg/r9a08g045.dtsi
index 1b04204461918..25a8ad3f041bc 100644
--- a/dts/arm/renesas/rz/rzg/r9a08g045.dtsi
+++ b/dts/arm/renesas/rz/rzg/r9a08g045.dtsi
@@ -5,7 +5,10 @@
  */
 
 #include <arm/armv8-m.dtsi>
+#include <dt-bindings/i2c/i2c.h>
 #include <mem.h>
+#include <freq.h>
+#include <zephyr/dt-bindings/adc/adc.h>
 
 / {
 	compatible = "renesas,r9a08g045";
@@ -31,7 +34,176 @@
 		};
 	};
 
+	osc: osc {
+		compatible = "fixed-clock";
+		clock-frequency = <DT_FREQ_M(24)>;
+		#clock-cells = <0>;
+	};
+
 	soc {
+		cpg: clock-controller@41010000 {
+			compatible = "renesas,rz-cpg";
+			reg = <0x41010000 0x10000>;
+			clocks = <&osc>;
+			#clock-cells = <1>;
+			status = "okay";
+
+			iclk: iclk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(1100)>;
+				#clock-cells = <0>;
+			};
+
+			p0clk: p0clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(100)>;
+				#clock-cells = <0>;
+			};
+
+			p4clk: p4clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(160)>;
+				#clock-cells = <0>;
+			};
+
+			p5clk: p5clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(200)>;
+				#clock-cells = <0>;
+			};
+
+			tsuclk: tsuclk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(100)>;
+				#clock-cells = <0>;
+			};
+
+			sd0clk: sd0clk {
+				compatible = "fixed-clock";
+				clock-frequency = <133333333>;
+				#clock-cells = <0>;
+			};
+
+			sd1clk: sd1clk {
+				compatible = "fixed-clock";
+				clock-frequency = <133333333>;
+				#clock-cells = <0>;
+			};
+
+			sd2clk: sd2clk {
+				compatible = "fixed-clock";
+				clock-frequency = <133333333>;
+				#clock-cells = <0>;
+			};
+
+			m0clk: m0clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(200)>;
+				#clock-cells = <0>;
+			};
+
+			p1clk: p1clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(200)>;
+				#clock-cells = <0>;
+			};
+
+			p2clk: p2clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(100)>;
+				#clock-cells = <0>;
+			};
+
+			p3clk: p3clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(200)>;
+				#clock-cells = <0>;
+			};
+
+			atclk: atclk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(400)>;
+				#clock-cells = <0>;
+			};
+
+			ztclk: ztclk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(100)>;
+				#clock-cells = <0>;
+			};
+
+			oc0clk: oc0clk {
+				compatible = "fixed-clock";
+				clock-frequency = <33333333>;
+				#clock-cells = <0>;
+			};
+
+			oc1clk: oc1clk {
+				compatible = "fixed-clock";
+				clock-frequency = <16666666>;
+				#clock-cells = <0>;
+			};
+
+			spi0clk: spi0clk {
+				compatible = "fixed-clock";
+				clock-frequency = <33333333>;
+				#clock-cells = <0>;
+			};
+
+			spi1clk: spi1clk {
+				compatible = "fixed-clock";
+				clock-frequency = <16666666>;
+				#clock-cells = <0>;
+			};
+
+			s0clk: s0clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(400)>;
+				#clock-cells = <0>;
+			};
+
+			i2clk: i2clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(250)>;
+				#clock-cells = <0>;
+			};
+
+			i3clk: i3clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(250)>;
+				#clock-cells = <0>;
+			};
+
+			hpclk: hpclk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(250)>;
+				#clock-cells = <0>;
+			};
+
+			oscclk: oscclk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(24)>;
+				#clock-cells = <0>;
+			};
+
+			osc2clk: osc2clk {
+				compatible = "fixed-clock";
+				clock-frequency = <DT_FREQ_M(8)>;
+				#clock-cells = <0>;
+			};
+		};
+
+		adc: adc@40058000 {
+			compatible = "renesas,rz-adc";
+			reg = <0x40058000 0x80>;
+			interrupts = <312 3>;
+			interrupt-names = "scanend";
+			#io-channel-cells = <1>;
+			vref-mv = <1800>;
+			channel-available-mask = <0x01FF>;
+			status = "disabled";
+		};
+
 		pinctrl: pin-controller@41030000 {
 			compatible = "renesas,rzg-pinctrl";
 			reg = <0x41030000 DT_SIZE_K(64)>;
@@ -225,6 +397,26 @@
 			};
 		};
 
+		dma0: dma@41800000 { /* Secure DMA */
+			compatible = "renesas,rz-dma";
+			reg = <0x41800000 0x800>, <0x41810000 0x20>;
+			reg-names = "reg_main", "ext";
+			interrupts =  <95 1>,  <96 1>,  <97 1>,  <98 1>,
+				      <99 1>, <100 1>, <101 1>, <102 1>,
+				     <103 1>, <104 1>, <105 1>, <106 1>,
+				     <107 1>, <108 1>, <109 1>, <110 1>,
+				      <94 1>; /* DMAERR1 */
+			interrupt-names = "ch0",   "ch1",  "ch2",  "ch3",
+					  "ch4",   "ch5",  "ch6",  "ch7",
+					  "ch8",   "ch9", "ch10", "ch11",
+					  "ch12", "ch13", "ch14", "ch15",
+					  "err1";
+			dma-channels = <16>;
+			#dma-cells = <2>;
+			dma-buf-addr-alignment = <4>;
+			status = "disabled";
+		};
+
 		scif0: serial@4004b800 {
 			compatible = "renesas,rz-scif-uart";
 			channel = <0>;
@@ -274,6 +466,55 @@
 			status = "disabled";
 		};
 
+		i2c0: i2c@40090000 {
+			compatible = "renesas,rz-riic";
+			channel = <0>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40090000 0x15>;
+			interrupts = <257 1>, <258 1>, <259 1>, <260 1>,
+				     <261 1>, <262 1>, <263 1>, <264 1>;
+			interrupt-names = "tei", "naki", "spi", "sti", "ali", "tmoi", "rxi", "txi";
+			status = "disabled";
+		};
+		i2c1: i2c@40090400 {
+			compatible = "renesas,rz-riic";
+			channel = <1>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40090400 0x15>;
+			interrupts = <265 1>, <266 1>, <267 1>, <268 1>,
+				     <269 1>, <270 1>, <271 1>, <272 1>;
+			interrupt-names = "tei", "naki", "spi", "sti", "ali", "tmoi", "rxi", "txi";
+			status = "disabled";
+		};
+		i2c2: i2c@40090800 {
+			compatible = "renesas,rz-riic";
+			channel = <2>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40090800 0x15>;
+			interrupts = <273 1>, <274 1>, <275 1>, <276 1>,
+				     <277 1>, <278 1>, <279 1>, <280 1>;
+			interrupt-names = "tei", "naki", "spi", "sti", "ali", "tmoi", "rxi", "txi";
+			status = "disabled";
+		};
+		i2c3: i2c@40090c00 {
+			compatible = "renesas,rz-riic";
+			channel = <3>;
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40090c00 0x15>;
+			interrupts = <281 1>, <282 1>, <283 1>, <284 1>,
+				     <285 1>, <286 1>, <287 1>, <288 1>;
+			interrupt-names = "tei", "naki", "spi", "sti", "ali", "tmoi", "rxi", "txi";
+			status = "disabled";
+		};
+
 		gtm0: gtm@42801000 {
 			compatible = "renesas,rz-gtm";
 			reg = <0x42801000 0x30>;
@@ -586,6 +827,62 @@
 				status = "disabled";
 			};
 		};
+
+		/* CM33 <-> CA55 */
+		mbox1: mhu@50400020 {
+			compatible = "renesas,rz-mhu-mbox";
+			channel = <1>;
+			reg = <0x50400020 0x20>;
+			tx-mask = <0x00000002>; /* Channel 1 is for TX */
+			rx-mask = <0x00000001>; /* Channel 0 is for RX */
+			channels-count = <2>;
+			interrupts = <58 2>;
+			interrupt-names = "mhuns";
+			#mbox-cells = <1>;
+			status = "disabled";
+		};
+
+		/* CM33 <-> CM33_FPU */
+		mbox3: mhu@50400060 {
+			compatible = "renesas,rz-mhu-mbox";
+			channel = <3>;
+			reg = <0x50400060 0x20>;
+			tx-mask = <0x00000002>; /* Channel 1 is for TX */
+			rx-mask = <0x00000001>; /* Channel 0 is for RX */
+			channels-count = <2>;
+			interrupts = <59 2>;
+			interrupt-names = "mhuns";
+			#mbox-cells = <1>;
+			status = "disabled";
+		};
+
+		/* CM33 <-> CA55 */
+		mbox4: mhu@50400080 {
+			compatible = "renesas,rz-mhu-mbox";
+			channel = <4>;
+			reg = <0x50400080 0x20>;
+			tx-mask = <0x00000002>; /* Channel 1 is for TX */
+			rx-mask = <0x00000001>; /* Channel 0 is for RX */
+			channels-count = <2>;
+			interrupts = <60 2>;
+			interrupt-names = "mhuns";
+			#mbox-cells = <1>;
+			status = "disabled";
+		};
+
+		/* CM33 <-> CM33_FPU */
+		mbox5: mhu@504000a0 {
+			compatible = "renesas,rz-mhu-mbox";
+			channel = <5>;
+			reg = <0x504000a0 0x20>;
+			tx-mask = <0x00000002>; /* Channel 1 is for TX */
+			rx-mask = <0x00000001>; /* Channel 0 is for RX */
+			channels-count = <2>;
+			interrupts = <61 2>;
+			interrupt-names = "mhuns";
+			#mbox-cells = <1>;
+			status = "disabled";
+		};
 	};
 };
 
diff --git a/dts/arm/renesas/rz/rzn/r9a07g084.dtsi b/dts/arm/renesas/rz/rzn/r9a07g084.dtsi
new file mode 100644
index 0000000000000..91330455337de
--- /dev/null
+++ b/dts/arm/renesas/rz/rzn/r9a07g084.dtsi
@@ -0,0 +1,592 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <arm/armv8-r.dtsi>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	compatible = "renesas,r9a07g084";
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-r52";
+			reg = <0>;
+		};
+	};
+
+	arch_timer: timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 11 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-parent = <&gic>;
+	};
+
+	soc {
+		interrupt-parent = <&gic>;
+
+		gic: interrupt-controller@94000000 {
+			compatible = "arm,gic-v3", "arm,gic";
+			reg = <0x94000000 0x10000>,
+				<0x94100000 0x80000>;
+			interrupt-controller;
+			#interrupt-cells = <4>;
+			status = "okay";
+		};
+
+		atcm: memory@0 {
+			compatible = "mmio-sram";
+			reg = <0x00000000 DT_SIZE_K(128)>;
+		};
+
+		btcm: memory@100000 {
+			compatible = "mmio-sram";
+			reg = <0x00100000 DT_SIZE_K(128)>;
+		};
+
+		sram: memory@10000000 {
+			compatible = "mmio-sram";
+			reg = <0x10000000 (DT_SIZE_M(1) + DT_SIZE_K(512))>;
+		};
+
+		xspi0_cs0: memory@60000000 {
+			compatible = "mmio-sram";
+			reg = <0x60000000 DT_SIZE_M(64)>;
+
+			partitions {
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				loader_param: partition@0 {
+					label = "loader-param";
+					reg = <0x00000000 0x4C>;
+					read-only;
+				};
+
+				loader_program: partition@4C {
+					label = "loader-program";
+					reg = <0x0000004C (DT_SIZE_K(56) - 0x4C)>;
+					read-only;
+				};
+
+				slot0_partition: partition@E000 {
+					label = "image-0";
+					reg = <0x0000E000 (DT_SIZE_M(64) - DT_SIZE_K(56))>;
+					read-only;
+				};
+			};
+		};
+
+		icu: icu@81048000 {
+			reg = <0x81048000 0x1000>;
+			interrupt-parent = <&gic>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			irq0: irq0@0 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x0>;
+				interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq1: irq@1 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x1>;
+				interrupts = <GIC_SPI 7 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq2: irq@2 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x2>;
+				interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq3: irq@3 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x3>;
+				interrupts = <GIC_SPI 9 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq4: irq@4 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x4>;
+				interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq5: irq@5 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x5>;
+				interrupts = <GIC_SPI 11 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq6: irq@6 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x6>;
+				interrupts = <GIC_SPI 12 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq7: irq@7 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x7>;
+				interrupts = <GIC_SPI 13 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq8: irq@8 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x8>;
+				interrupts = <GIC_SPI 14 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq9: irq@9 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x9>;
+				interrupts = <GIC_SPI 15 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq10: irq@a {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xa>;
+				interrupts = <GIC_SPI 16 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq11: irq@b {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xb>;
+				interrupts = <GIC_SPI 17 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq12: irq@c {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xc>;
+				interrupts = <GIC_SPI 18 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq13: irq@d {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xd>;
+				interrupts = <GIC_SPI 19 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq14: irq@e {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xe>;
+				interrupts = <GIC_SPI 394 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq15: irq@f {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xf>;
+				interrupts = <GIC_SPI 395 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+		};
+
+		pinctrl: pinctrl@800a0000 {
+			compatible = "renesas,rzn-pinctrl";
+			reg = <0x800a0000 0x1000 0x81030c00 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			gpio0: gpio@0 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0>;
+				status = "disabled";
+			};
+
+			gpio1: gpio@100 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0100>;
+				status = "disabled";
+			};
+
+			gpio2: gpio@200 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0200>;
+				status = "disabled";
+			};
+
+			gpio3: gpio@300 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <1 4>;
+				reg = <0x0300>;
+				status = "disabled";
+			};
+
+			gpio4: gpio@400 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <2 2>;
+				reg = <0x0400>;
+				status = "disabled";
+			};
+
+			gpio5: gpio@500 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0500>;
+				status = "disabled";
+			};
+
+			gpio6: gpio@600 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0600>;
+				status = "disabled";
+			};
+
+			gpio7: gpio@700 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <5>;
+				reg = <0x0700>;
+				status = "disabled";
+			};
+
+			gpio8: gpio@800 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 4>;
+				reg = <0x0800>;
+				status = "disabled";
+			};
+
+			gpio9: gpio@900 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0900>;
+				status = "disabled";
+			};
+
+			gpio10: gpio@a00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <5>;
+				reg = <0x0a00>;
+				status = "disabled";
+			};
+
+			gpio11: gpio@b00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <0>;
+				reg = <0x0b00>;
+				status = "disabled";
+			};
+
+			gpio12: gpio@c00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <5>;
+				gpio-reserved-ranges = <0 4>;
+				reg = <0x0c00>;
+				status = "disabled";
+			};
+
+			gpio13: gpio@d00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 2>;
+				reg = <0x0d00>;
+				status = "disabled";
+			};
+
+			gpio14: gpio@e00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0e00>;
+				status = "disabled";
+			};
+
+			gpio15: gpio@f00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0f00>;
+				status = "disabled";
+			};
+
+			gpio16: gpio@1000 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <4 1>;
+				reg = <0x1000>;
+				status = "disabled";
+			};
+
+			gpio17: gpio@1100 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <1 2>;
+				reg = <0x1100>;
+				status = "disabled";
+			};
+
+			gpio18: gpio@1200 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <7>;
+				reg = <0x1200>;
+				status = "disabled";
+			};
+
+			gpio19: gpio@1300 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <1>;
+				reg = <0x1300>;
+				status = "disabled";
+			};
+
+			gpio20: gpio@1400 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <5>;
+				gpio-reserved-ranges = <0 1>;
+				reg = <0x1400>;
+				status = "disabled";
+			};
+
+			gpio21: gpio@1500 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 1>;
+				reg = <0x1500>;
+				status = "disabled";
+			};
+
+			gpio22: gpio@1600 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <4>;
+				reg = <0x1600>;
+				status = "disabled";
+			};
+
+			gpio23: gpio@1700 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 7>;
+				reg = <0x1700>;
+				status = "disabled";
+			};
+
+			gpio24: gpio@1800 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <3>;
+				reg = <0x1800>;
+				status = "disabled";
+			};
+		};
+
+		sci0: sci0@80001000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001000 0x400>;
+			channel = <0>;
+			interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 289 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 290 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 291 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci1: sci1@80001400 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001400 0x400>;
+			channel = <1>;
+			interrupts = <GIC_SPI 292 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 293 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 294 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 295 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci2: sci2@80001800 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001800 0x400>;
+			channel = <2>;
+			interrupts = <GIC_SPI 296 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 297 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 298 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 299 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci3: sci3@80001c00 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001c00 0x400>;
+			channel = <3>;
+			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 301 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 302 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 303 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci4: sci4@80002000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80002000 0x400>;
+			channel = <4>;
+			interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 305 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 306 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 307 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci5: sci5@81001000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x81001000 0x400>;
+			channel = <5>;
+			interrupts = <GIC_SPI 435 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 436 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 437 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 438 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+	};
+};
diff --git a/dts/arm/renesas/rz/rzt/r9a07g074.dtsi b/dts/arm/renesas/rz/rzt/r9a07g074.dtsi
new file mode 100644
index 0000000000000..33c52551c5f60
--- /dev/null
+++ b/dts/arm/renesas/rz/rzt/r9a07g074.dtsi
@@ -0,0 +1,592 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <arm/armv8-r.dtsi>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	compatible = "renesas,r9a07g074";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-r52";
+			reg = <0>;
+		};
+	};
+
+	arch_timer: timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-parent = <&gic>;
+	};
+
+	soc {
+		interrupt-parent = <&gic>;
+
+		gic: interrupt-controller@94000000 {
+			compatible = "arm,gic-v3", "arm,gic";
+			reg = <0x94000000 0x10000>,
+			       <0x94100000 0x80000>;
+			interrupt-controller;
+			#interrupt-cells = <4>;
+			status = "okay";
+		};
+
+		atcm: memory@0 {
+			compatible = "mmio-sram";
+			reg = <0x00000000 DT_SIZE_K(512)>;
+		};
+
+		btcm: memory@100000 {
+			compatible = "mmio-sram";
+			reg = <0x00100000 DT_SIZE_K(64)>;
+		};
+
+		sram: memory@10000000 {
+			compatible = "mmio-sram";
+			reg = <0x10000000 DT_SIZE_M(1)>;
+		};
+
+		xspi1_cs0: memory@68000000 {
+			compatible = "mmio-sram";
+			reg = <0x68000000 DT_SIZE_M(16)>;
+
+			partitions {
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				loader_param: partition@0 {
+					label = "loader-param";
+					reg = <0x00000000 0x4C>;
+					read-only;
+				};
+
+				loader_program: partition@4C {
+					label = "loader-program";
+					reg = <0x0000004C (DT_SIZE_K(56) - 0x4C)>;
+					read-only;
+				};
+
+				slot0_partition: partition@E000 {
+					label = "image-0";
+					reg = <0x0000E000 (DT_SIZE_M(16) - DT_SIZE_K(56))>;
+					read-only;
+				};
+			};
+		};
+
+		icu: icu@81048000 {
+			reg = <0x81048000 0x1000>;
+			interrupt-parent = <&gic>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			irq0: irq0@0 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x0>;
+				interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq1: irq@1 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x1>;
+				interrupts = <GIC_SPI 7 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq2: irq@2 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x2>;
+				interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq3: irq@3 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x3>;
+				interrupts = <GIC_SPI 9 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq4: irq@4 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x4>;
+				interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq5: irq@5 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x5>;
+				interrupts = <GIC_SPI 11 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq6: irq@6 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x6>;
+				interrupts = <GIC_SPI 12 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq7: irq@7 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x7>;
+				interrupts = <GIC_SPI 13 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq8: irq@8 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x8>;
+				interrupts = <GIC_SPI 14 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq9: irq@9 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x9>;
+				interrupts = <GIC_SPI 15 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq10: irq@a {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xa>;
+				interrupts = <GIC_SPI 16 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq11: irq@b {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xb>;
+				interrupts = <GIC_SPI 17 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq12: irq@c {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xc>;
+				interrupts = <GIC_SPI 18 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq13: irq@d {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xd>;
+				interrupts = <GIC_SPI 19 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq14: irq@e {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xe>;
+				interrupts = <GIC_SPI 394 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq15: irq@f {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xf>;
+				interrupts = <GIC_SPI 395 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+		};
+
+		pinctrl: pinctrl@800a0000 {
+			compatible = "renesas,rzt-pinctrl";
+			reg = <0x800a0000 0x1000 0x81030c00 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			gpio0: gpio@0 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <7>;
+				gpio-reserved-ranges = <4 2>;
+				reg = <0x0>;
+				status = "disabled";
+			};
+
+			gpio1: gpio@100 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0100>;
+				status = "disabled";
+			};
+
+			gpio2: gpio@200 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0200>;
+				status = "disabled";
+			};
+
+			gpio3: gpio@300 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <0>;
+				reg = <0x0300>;
+				status = "disabled";
+			};
+
+			gpio4: gpio@400 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <2>;
+				gpio-reserved-ranges = <0 1>;
+				reg = <0x0400>;
+				status = "disabled";
+			};
+
+			gpio5: gpio@500 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 5>;
+				reg = <0x0500>;
+				status = "disabled";
+			};
+
+			gpio6: gpio@600 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0600>;
+				status = "disabled";
+			};
+
+			gpio7: gpio@700 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <5>;
+				reg = <0x0700>;
+				status = "disabled";
+			};
+
+			gpio8: gpio@800 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 4>;
+				reg = <0x0800>;
+				status = "disabled";
+			};
+
+			gpio9: gpio@900 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0900>;
+				status = "disabled";
+			};
+
+			gpio10: gpio@a00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <5>;
+				reg = <0x0a00>;
+				status = "disabled";
+			};
+
+			gpio11: gpio@b00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <0>;
+				reg = <0x0b00>;
+				status = "disabled";
+			};
+
+			gpio12: gpio@c00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <0>;
+				reg = <0x0c00>;
+				status = "disabled";
+			};
+
+			gpio13: gpio@d00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 2>;
+				reg = <0x0d00>;
+				status = "disabled";
+			};
+
+			gpio14: gpio@e00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0e00>;
+				status = "disabled";
+			};
+
+			gpio15: gpio@f00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0f00>;
+				status = "disabled";
+			};
+
+			gpio16: gpio@1000 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <4>;
+				reg = <0x1000>;
+				status = "disabled";
+			};
+
+			gpio17: gpio@1100 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <1 2>;
+				reg = <0x1100>;
+				status = "disabled";
+			};
+
+			gpio18: gpio@1200 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <7>;
+				reg = <0x1200>;
+				status = "disabled";
+			};
+
+			gpio19: gpio@1300 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <0>;
+				reg = <0x1300>;
+				status = "disabled";
+			};
+
+			gpio20: gpio@1400 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <5>;
+				gpio-reserved-ranges = <0 3>;
+				reg = <0x1400>;
+				status = "disabled";
+			};
+
+			gpio21: gpio@1500 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 1>;
+				reg = <0x1500>;
+				status = "disabled";
+			};
+
+			gpio22: gpio@1600 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <4>;
+				reg = <0x1600>;
+				status = "disabled";
+			};
+
+			gpio23: gpio@1700 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges = <0 7>;
+				reg = <0x1700>;
+				status = "disabled";
+			};
+
+			gpio24: gpio@1800 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <3>;
+				reg = <0x1800>;
+				status = "disabled";
+			};
+		};
+
+		sci0: sci0@80001000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001000 0x400>;
+			channel = <0>;
+			interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 289 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 290 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 291 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci1: sci1@80001400 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001400 0x400>;
+			channel = <1>;
+			interrupts = <GIC_SPI 292 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 293 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 294 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 295 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci2: sci2@80001800 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001800 0x400>;
+			channel = <2>;
+			interrupts = <GIC_SPI 296 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 297 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 298 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 299 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci3: sci3@80001c00 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001c00 0x400>;
+			channel = <3>;
+			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 301 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 302 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 303 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci4: sci4@80002000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80002000 0x400>;
+			channel = <4>;
+			interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 305 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 306 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 307 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci5: sci5@81001000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x81001000 0x400>;
+			channel = <5>;
+			interrupts = <GIC_SPI 435 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 436 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 437 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 438 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+	};
+};
diff --git a/dts/arm/renesas/rz/rzt/r9a07g075.dtsi b/dts/arm/renesas/rz/rzt/r9a07g075.dtsi
new file mode 100644
index 0000000000000..209238629d0d5
--- /dev/null
+++ b/dts/arm/renesas/rz/rzt/r9a07g075.dtsi
@@ -0,0 +1,590 @@
+/*
+ * Copyright (c) 2023 Antmicro <www.antmicro.com>
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <arm/armv8-r.dtsi>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	compatible = "renesas,r9a07g075";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-r52";
+			reg = <0>;
+		};
+
+		cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-r52";
+			reg = <1>;
+		};
+	};
+
+	arch_timer: timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 11 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-parent = <&gic>;
+	};
+
+	soc {
+		interrupt-parent = <&gic>;
+
+		gic: interrupt-controller@94000000 {
+			compatible = "arm,gic-v3", "arm,gic";
+			reg = <0x94000000 0x10000>,
+				<0x94100000 0x80000>;
+			interrupt-controller;
+			#interrupt-cells = <4>;
+			status = "okay";
+		};
+
+		cpu0_atcm: memory@0 {
+			compatible = "mmio-sram";
+			reg = <0x00000000 DT_SIZE_K(512)>;
+		};
+
+		cpu0_btcm: memory@100000 {
+			compatible = "mmio-sram";
+			reg = <0x00100000 DT_SIZE_K(64)>;
+		};
+
+		sram: memory@10000000 {
+			compatible = "mmio-sram";
+			reg = <0x10000000 DT_SIZE_M(2)>;
+		};
+
+		xspi0_cs0: memory@60000000 {
+			compatible = "mmio-sram";
+			reg = <0x60000000 DT_SIZE_M(64)>;
+
+			partitions {
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;
+				loader_param: partition@0 {
+					label = "loader-param";
+					reg = <0x00000000 0x4C>;
+					read-only;
+				};
+
+				loader_program: partition@4C {
+					label = "loader-program";
+					reg = <0x0000004C (DT_SIZE_K(56) - 0x4C)>;
+					read-only;
+				};
+
+				slot0_partition: partition@E000 {
+					label = "image-0";
+					reg = <0x0000E000 (DT_SIZE_M(64) - DT_SIZE_K(56))>;
+					read-only;
+				};
+			};
+		};
+
+		icu: icu@81048000 {
+			reg = <0x81048000 0x1000>;
+			interrupt-parent = <&gic>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			irq0: irq0@0 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x0>;
+				interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq1: irq@1 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x1>;
+				interrupts = <GIC_SPI 7 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq2: irq@2 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x2>;
+				interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq3: irq@3 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x3>;
+				interrupts = <GIC_SPI 9 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq4: irq@4 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x4>;
+				interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq5: irq@5 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x5>;
+				interrupts = <GIC_SPI 11 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq6: irq@6 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x6>;
+				interrupts = <GIC_SPI 12 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq7: irq@7 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x7>;
+				interrupts = <GIC_SPI 13 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq8: irq@8 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x8>;
+				interrupts = <GIC_SPI 14 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq9: irq@9 {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0x9>;
+				interrupts = <GIC_SPI 15 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq10: irq@a {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xa>;
+				interrupts = <GIC_SPI 16 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq11: irq@b {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xb>;
+				interrupts = <GIC_SPI 17 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq12: irq@c {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xc>;
+				interrupts = <GIC_SPI 18 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq13: irq@d {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xd>;
+				interrupts = <GIC_SPI 19 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq14: irq@e {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xe>;
+				interrupts = <GIC_SPI 394 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+
+			irq15: irq@f {
+				compatible = "renesas,rz-ext-irq";
+				reg = <0xf>;
+				interrupts = <GIC_SPI 395 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				status = "disabled";
+			};
+		};
+
+		pinctrl: pinctrl@800a0000 {
+			compatible = "renesas,rzt-pinctrl";
+			reg = <0x800a0000 0x1000 0x81030c00 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			gpio0: gpio@0 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				reg = <0x0>;
+				status = "disabled";
+			};
+
+			gpio1: gpio@100 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0100>;
+				status = "disabled";
+			};
+
+			gpio2: gpio@200 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0200>;
+				status = "disabled";
+			};
+
+			gpio3: gpio@300 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				gpio-reserved-ranges= <1 1>;
+				reg = <0x0300>;
+				status = "disabled";
+			};
+
+			gpio4: gpio@400 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0400>;
+				status = "disabled";
+			};
+
+			gpio5: gpio@500 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0500>;
+				status = "disabled";
+			};
+
+			gpio6: gpio@600 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0600>;
+				status = "disabled";
+			};
+
+			gpio7: gpio@700 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0700>;
+				status = "disabled";
+			};
+
+			gpio8: gpio@800 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0800>;
+				status = "disabled";
+			};
+
+			gpio9: gpio@900 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0900>;
+				status = "disabled";
+			};
+
+			gpio10: gpio@a00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0a00>;
+				status = "disabled";
+			};
+
+			gpio11: gpio@b00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0b00>;
+				status = "disabled";
+			};
+
+			gpio12: gpio@c00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0c00>;
+				status = "disabled";
+			};
+
+			gpio13: gpio@d00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0d00>;
+				status = "disabled";
+			};
+
+			gpio14: gpio@e00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0e00>;
+				status = "disabled";
+			};
+
+			gpio15: gpio@f00 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x0f00>;
+				status = "disabled";
+			};
+
+			gpio16: gpio@1000 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1000>;
+				status = "disabled";
+			};
+
+			gpio17: gpio@1100 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1100>;
+				status = "disabled";
+			};
+
+			gpio18: gpio@1200 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1200>;
+				status = "disabled";
+			};
+
+			gpio19: gpio@1300 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1300>;
+				status = "disabled";
+			};
+
+			gpio20: gpio@1400 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1400>;
+				status = "disabled";
+			};
+
+			gpio21: gpio@1500 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1500>;
+				status = "disabled";
+			};
+
+			gpio22: gpio@1600 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1600>;
+				status = "disabled";
+			};
+
+			gpio23: gpio@1700 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <8>;
+				reg = <0x1700>;
+				status = "disabled";
+			};
+
+			gpio24: gpio@1800 {
+				compatible = "renesas,rz-gpio";
+				gpio-controller;
+				#gpio-cells= <2>;
+				ngpios = <3>;
+				reg = <0x1800>;
+				status = "disabled";
+			};
+		};
+
+		sci0: sci0@80001000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001000 0x400>;
+			channel = <0>;
+			interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 289 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 290 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 291 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci1: sci1@80001400 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001400 0x400>;
+			channel = <1>;
+			interrupts = <GIC_SPI 292 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 293 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 294 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 295 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci2: sci2@80001800 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001800 0x400>;
+			channel = <2>;
+			interrupts = <GIC_SPI 296 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 297 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 298 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 299 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci3: sci3@80001c00 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80001c00 0x400>;
+			channel = <3>;
+			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 301 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 302 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 303 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci4: sci4@80002000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x80002000 0x400>;
+			channel = <4>;
+			interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 305 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 306 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 307 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+
+		sci5: sci5@81001000 {
+			compatible = "renesas,rz-sci";
+			reg = <0x81001000 0x400>;
+			channel = <5>;
+			interrupts = <GIC_SPI 435 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 436 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 437 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 438 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "rxi", "txi", "tei";
+			status = "disabled";
+
+			uart {
+				compatible = "renesas,rz-sci-uart";
+				current-speed = <115200>;
+				status = "disabled";
+			};
+		};
+	};
+};
diff --git a/dts/arm/renesas/rz/rzt2m.dtsi b/dts/arm/renesas/rz/rzt2m.dtsi
deleted file mode 100644
index a50cdc7e9b3d1..0000000000000
--- a/dts/arm/renesas/rz/rzt2m.dtsi
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 2023 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <mem.h>
-#include <arm/armv8-r.dtsi>
-#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "renesas,rzt2m-dev";
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-r52";
-			reg = <0>;
-		};
-
-		cpu@1 {
-			device_type = "cpu";
-			compatible = "arm,cortex-r52";
-			reg = <1>;
-		};
-	};
-
-	arch_timer: timer {
-		compatible = "arm,armv8-timer";
-		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
-				<GIC_PPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
-				<GIC_PPI 11 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
-				<GIC_PPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
-		interrupt-parent = <&gic>;
-	};
-
-	soc {
-		compatible = "renesas,rzt2m-soc";
-
-		interrupt-parent = <&gic>;
-
-		gic: interrupt-controller@94000000 {
-			compatible = "arm,gic-v3", "arm,gic";
-			reg = <0x94000000 0x10000>,
-				<0x94100000 0x80000>;
-			interrupt-controller;
-			#interrupt-cells = <4>;
-			status = "okay";
-		};
-
-		cpu0_atcm: memory@0 {
-			compatible = "mmio-sram";
-			reg = <0x00000000 DT_SIZE_K(512)>;
-		};
-
-		cpu0_btcm: memory@100000 {
-			compatible = "mmio-sram";
-			reg = <0x00100000 DT_SIZE_K(64)>;
-		};
-
-		sram0: memory@10000000 {
-			compatible = "mmio-sram";
-			reg = <0x10000000 DT_SIZE_M(2)>;
-		};
-
-		gsc: gsc@c0060000 {
-			/* Global System Counter */
-			compatible = "syscon";
-			reg = <0xc0060000 0x30>;
-			reg-io-width = <4>;
-		};
-
-		prcrn: prcrn@80281a10 {
-			/* Non-safety area */
-			compatible = "syscon";
-			reg = <0x80281a10 0x10>;
-			reg-io-width = <4>;
-		};
-
-		prcrs: prcrs@81281a00 {
-			/* Safety area */
-			compatible = "syscon";
-			reg = <0x81281a00 0x10>;
-			reg-io-width = <4>;
-		};
-
-		sckcr: sckcr@80280000 {
-			/* System Clock Control Register*/
-			compatible = "syscon";
-			reg = <0x80280000 0x20>;
-			reg-io-width = <4>;
-		};
-
-		sckcr2: sckcr2@81280004 {
-			/* System Clock Control Register 2 */
-			compatible = "syscon";
-			reg = <0x81280004 0x1a>;
-			reg-io-width = <4>;
-		};
-
-		ns_portnf_md: ns_portnf_md@8009000c {
-			/* Interrupt edge detection setting */
-			compatible = "syscon";
-			reg = <0x8009000c 0x4>;
-			reg-io-width = <4>;
-		};
-
-		uart0: serial@80001000 {
-			compatible = "renesas,rzt2m-uart";
-			reg = <0x80001000 0x1000>;
-			current-speed = <115200>;
-			interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 289 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 290 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 291 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
-			interrupt-names = "rx_err", "rx", "tx", "tx_end";
-			status = "disabled";
-		};
-
-		uart3: serial@80001c00 {
-			compatible = "renesas,rzt2m-uart";
-			reg = <0x80001c00 0x1000>;
-			current-speed = <115200>;
-			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 301 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 302 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 303 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
-			interrupt-names = "rx_err", "rx", "tx", "tx_end";
-			status = "disabled";
-		};
-
-		pinctrl: pinctrl@800a0000 {
-			compatible = "renesas,rzt2m-pinctrl";
-			reg = <0x800a0000 0x1000 0x81030c00 0x1000>;
-			reg-names = "port_nsr", "ptadr";
-
-			gpio_common: gpio_common {
-				compatible = "renesas,rzt2m-gpio-common";
-				interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 7 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 8 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 9 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 10 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 11 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 12 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 13 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 14 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 15 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 16 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 17 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 18 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>,
-					<GIC_SPI 19 IRQ_TYPE_EDGE IRQ_DEFAULT_PRIORITY>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				gpio10: gpio@a {
-					compatible = "renesas,rzt2m-gpio";
-					gpio-controller;
-					#gpio-cells = <2>;
-					ngpios = <8>;
-					reg = <0xa>;
-					irqs = <4 11>, <5 2>;
-				};
-
-				gpio16: gpio@10 {
-					compatible = "renesas,rzt2m-gpio";
-					gpio-controller;
-					#gpio-cells = <2>;
-					ngpios = <8>;
-					reg = <0x10>;
-					irqs = <3 7>, <6 8>;
-				};
-
-				gpio19: gpio@13 {
-					compatible = "renesas,rzt2m-gpio";
-					gpio-controller;
-					#gpio-cells = <2>;
-					ngpios = <8>;
-					reg = <0x13>;
-					irqs = <2 3>;
-				};
-
-				gpio20: gpio@14 {
-					compatible = "renesas,rzt2m-gpio";
-					gpio-controller;
-					#gpio-cells = <2>;
-					ngpios = <8>;
-					reg = <0x14>;
-				};
-
-				gpio23: gpio@17 {
-					compatible = "renesas,rzt2m-gpio";
-					gpio-controller;
-					#gpio-cells = <2>;
-					ngpios = <8>;
-					reg = <0x17>;
-					irqs = <0 5>, <2 8>;
-				};
-
-			};
-		};
-	};
-};
diff --git a/dts/arm/renesas/rz/rzv/r9a07g054.dtsi b/dts/arm/renesas/rz/rzv/r9a07g054.dtsi
new file mode 100644
index 0000000000000..fc98bcf74f8d7
--- /dev/null
+++ b/dts/arm/renesas/rz/rzv/r9a07g054.dtsi
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/armv8-m.dtsi>
+#include <mem.h>
+#include <freq.h>
+
+/ {
+	compatible = "renesas,r9a07g054";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-m33";
+			reg = <0>;
+			clock-frequency = <DT_FREQ_M(200)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			mpu: mpu@e000ed90 {
+				compatible = "arm,armv8m-mpu";
+				reg = <0xe000ed90 0x40>;
+			};
+		};
+	};
+
+	soc {
+		pinctrl: pin-controller@41030000 {
+			compatible = "renesas,rzv-pinctrl";
+			reg = <0x41030000 DT_SIZE_K(64)>;
+			reg-names = "pinctrl";
+
+			gpio: gpio-common {
+				compatible = "renesas,rz-gpio-int";
+				interrupts =
+					<444 10>, <445 10>, <446 10>, <447 10>,
+					<448 10>, <449 10>, <450 10>, <451 10>,
+					<452 10>, <453 10>, <454 10>, <455 10>,
+					<456 10>, <457 10>, <458 10>, <459 10>,
+					<460 10>, <461 10>, <462 10>, <463 10>,
+					<464 10>, <465 10>, <466 10>, <467 10>,
+					<468 10>, <469 10>, <470 10>, <471 10>,
+					<472 10>, <473 10>, <474 10>, <475 10>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+
+				gpio0: gpio@0 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x0>;
+					status = "disabled";
+				};
+
+				gpio1: gpio@100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x100>;
+					status = "disabled";
+				};
+
+				gpio2: gpio@200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x200>;
+					status = "disabled";
+				};
+
+				gpio3: gpio@300 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x300>;
+					status = "disabled";
+				};
+
+				gpio4: gpio@400 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x400>;
+					status = "disabled";
+				};
+
+				gpio5: gpio@500 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x500>;
+					status = "disabled";
+				};
+
+				gpio6: gpio@600 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x600>;
+					status = "disabled";
+				};
+
+				gpio7: gpio@700 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x700>;
+					status = "disabled";
+				};
+
+				gpio8: gpio@800 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x800>;
+					status = "disabled";
+				};
+
+				gpio9: gpio@900 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x900>;
+					status = "disabled";
+				};
+
+				gpio10: gpio@a00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0xa00>;
+					status = "disabled";
+				};
+
+				gpio11: gpio@b00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0xb00>;
+					status = "disabled";
+				};
+
+				gpio12: gpio@c00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0xc00>;
+					status = "disabled";
+				};
+
+				gpio13: gpio@d00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0xd00>;
+					status = "disabled";
+				};
+
+				gpio14: gpio@e00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0xe00>;
+					status = "disabled";
+				};
+
+				gpio15: gpio@f00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0xf00>;
+					status = "disabled";
+				};
+
+				gpio16: gpio@1000 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1000>;
+					status = "disabled";
+				};
+
+				gpio17: gpio@1100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x1100>;
+					status = "disabled";
+				};
+
+				gpio18: gpio@1200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1200>;
+					status = "disabled";
+				};
+
+				gpio19: gpio@1300 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1300>;
+					status = "disabled";
+				};
+
+				gpio20: gpio@1400 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x1400>;
+					status = "disabled";
+				};
+
+				gpio21: gpio@1500 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1500>;
+					status = "disabled";
+				};
+
+				gpio22: gpio@1600 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1600>;
+					status = "disabled";
+				};
+
+				gpio23: gpio@1700 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1700>;
+					status = "disabled";
+				};
+
+				gpio24: gpio@1800 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1800>;
+					status = "disabled";
+				};
+
+				gpio25: gpio@1900 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1900>;
+					status = "disabled";
+				};
+
+				gpio26: gpio@1a00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1a00>;
+					status = "disabled";
+				};
+
+				gpio27: gpio@1b00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1b00>;
+					status = "disabled";
+				};
+
+				gpio28: gpio@1c00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1c00>;
+					status = "disabled";
+				};
+
+				gpio29: gpio@1d00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1d00>;
+					status = "disabled";
+				};
+
+				gpio30: gpio@1e00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1e00>;
+					status = "disabled";
+				};
+
+				gpio31: gpio@1f00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x1f00>;
+					status = "disabled";
+				};
+
+				gpio32: gpio@2000 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x2000>;
+					status = "disabled";
+				};
+
+				gpio33: gpio@2100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x2100>;
+					status = "disabled";
+				};
+
+				gpio34: gpio@2200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x2200>;
+					status = "disabled";
+				};
+
+				gpio35: gpio@2300 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x2300>;
+					status = "disabled";
+				};
+
+				gpio36: gpio@2400 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x2400>;
+					status = "disabled";
+				};
+
+				gpio37: gpio@2500 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x2500>;
+					status = "disabled";
+				};
+
+				gpio38: gpio@2600 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x2600>;
+					status = "disabled";
+				};
+
+				gpio39: gpio@2700 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x2700>;
+					status = "disabled";
+				};
+
+				gpio40: gpio@2800 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <3>;
+					reg = <0x2800>;
+					status = "disabled";
+				};
+
+				gpio41: gpio@2900 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <2>;
+					reg = <0x2900>;
+					status = "disabled";
+				};
+
+				gpio42: gpio@2a00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <5>;
+					reg = <0x2a00>;
+					status = "disabled";
+				};
+
+				gpio43: gpio@2b00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <4>;
+					reg = <0x2b00>;
+					status = "disabled";
+				};
+
+				gpio44: gpio@2c00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <4>;
+					reg = <0x2c00>;
+					status = "disabled";
+				};
+
+				gpio45: gpio@2d00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <4>;
+					reg = <0x2d00>;
+					status = "disabled";
+				};
+
+				gpio46: gpio@2e00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <4>;
+					reg = <0x2e00>;
+					status = "disabled";
+				};
+
+				gpio47: gpio@2f00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <4>;
+					reg = <0x2f00>;
+					status = "disabled";
+				};
+
+				gpio48: gpio@3000 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <5>;
+					reg = <0x3000>;
+					status = "disabled";
+				};
+			};
+		};
+
+		scif0: serial@4004b800 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <0>;
+			reg = <0x4004b800 0x18>;
+			interrupts = <380 1>, <381 1>, <382 1>, <383 1>, <384 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif1: serial@4004bc00 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <1>;
+			reg = <0x4004bc00 0x18>;
+			interrupts = <385 1>, <386 1>, <387 1>, <388 1>, <389 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif2: serial@4004c000 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <2>;
+			reg = <0x4004c000 0x18>;
+			interrupts = <390 1>, <391 1>, <392 1>, <393 1>, <394 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif3: serial@4004c400 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <3>;
+			reg = <0x4004c400 0x18>;
+			interrupts = <395 1>, <396 1>, <397 1>, <398 1>, <399 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif4: serial@4004c800 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <4>;
+			reg = <0x4004c800 0x18>;
+			interrupts = <400 1>, <401 1>, <402 1>, <403 1>, <404 1>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <7>;
+};
diff --git a/dts/arm/renesas/smartbond/da14697.dtsi b/dts/arm/renesas/smartbond/da14697.dtsi
new file mode 100644
index 0000000000000..3b362194ee00c
--- /dev/null
+++ b/dts/arm/renesas/smartbond/da14697.dtsi
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "da1469x.dtsi"
+
+&sram0 {
+	reg = <0x20000000 DT_SIZE_K(512)>;
+};
diff --git a/dts/arm/silabs/efr32bg22.dtsi b/dts/arm/silabs/efr32bg22.dtsi
index 5bf1c7b584a9a..0bbd09491bf23 100644
--- a/dts/arm/silabs/efr32bg22.dtsi
+++ b/dts/arm/silabs/efr32bg22.dtsi
@@ -29,7 +29,7 @@
 };
 
 &cmu {
-	interrupts = <46 0>;
+	interrupts = <46 2>;
 };
 
 &hfxo {
@@ -51,8 +51,41 @@
 };
 
 &gpio {
-	interrupts = <10 2 18 2>;
+	interrupts = <25 2>, <26 2>;
+	interrupt-names = "gpio_odd", "gpio_even";
 	clocks = <&cmu CLOCK_GPIO CLOCK_BRANCH_PCLK>;
+
+	gpioa: gpio@5003c000 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C000 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
+
+	gpiob: gpio@5003c030 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C030 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
+
+	gpioc: gpio@5003c060 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C060 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
+
+	gpiod: gpio@5003c090 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C090 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
 };
 
 &dma0 {
@@ -60,43 +93,53 @@
 };
 
 &i2c0 {
-	interrupts = <27 0>;
+	interrupts = <27 2>;
 	clocks = <&cmu CLOCK_I2C0 CLOCK_BRANCH_LSPCLK>;
 };
 
 &i2c1 {
-	interrupts = <28 0>;
+	interrupts = <28 2>;
 	clocks = <&cmu CLOCK_I2C1 CLOCK_BRANCH_PCLK>;
 };
 
 &usart0 {
-	interrupts = <13 0>, <14 0>;
+	interrupts = <13 2>, <14 2>;
 	clocks = <&cmu CLOCK_USART0 CLOCK_BRANCH_PCLK>;
 };
 
 &usart1 {
-	interrupts = <15 0>, <16 0>;
+	interrupts = <15 2>, <16 2>;
 	clocks = <&cmu CLOCK_USART1 CLOCK_BRANCH_PCLK>;
 };
 
 &burtc0 {
-	interrupts = <18 0>;
+	interrupts = <18 2>;
 	clocks = <&cmu CLOCK_BURTC CLOCK_BRANCH_EM4GRPACLK>;
 };
 
 &rtcc0 {
-	interrupts = <12 0>;
+	interrupts = <12 2>;
 	interrupt-names = "rtcc";
 	clocks = <&cmu CLOCK_RTCC CLOCK_BRANCH_RTCCCLK>;
 };
 
 &dcdc {
-	interrupts = <61 0>;
+	interrupts = <61 2>;
+};
+
+&adc0 {
+	interrupts = <48 2>;
+	clocks = <&cmu CLOCK_IADC0 CLOCK_BRANCH_IADCCLK>;
+};
+
+&wdog0 {
+	interrupts = <43 2>;
+	clocks = <&cmu CLOCK_WDOG0 CLOCK_BRANCH_WDOG0CLK>;
 };
 
 &radio {
-	interrupts = <31 0>, <32 0>, <33 0>, <34 0>, <35 0>, <36 0>,
-		     <37 0>, <38 0>, <39 0>, <40 0>, <41 0>, <42 0>;
+	interrupts = <31 1>, <32 1>, <33 1>, <34 1>, <35 1>, <36 1>,
+		     <37 1>, <38 1>, <39 1>, <40 1>, <41 1>, <42 1>;
 	interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
 		     "rac_rsm", "rac_seq", "rdmailbox", "rfsense", "prortc",
 		     "synth";
diff --git a/dts/arm/silabs/efr32bg27.dtsi b/dts/arm/silabs/efr32bg27.dtsi
index d40bda0223ccd..ec7546459b5ce 100644
--- a/dts/arm/silabs/efr32bg27.dtsi
+++ b/dts/arm/silabs/efr32bg27.dtsi
@@ -38,7 +38,7 @@
 		acmp0: acmp@5a008000 {
 			compatible = "silabs,acmp";
 			reg = <0x5a008000 0x4000>;
-			interrupts = <48 0>;
+			interrupts = <48 2>;
 			clocks = <&cmu CLOCK_ACMP0 CLOCK_BRANCH_EM01GRPACLK>;
 			status = "disabled";
 		};
@@ -46,11 +46,11 @@
 };
 
 &cmu {
-	interrupts = <52 0>;
+	interrupts = <52 2>;
 };
 
 &hfxo {
-	interrupts = <50 0>;
+	interrupts = <50 2>;
 	interrupt-names = "hfxo";
 };
 
@@ -68,57 +68,95 @@
 };
 
 &gpio {
-	interrupts = <30 2 31 2>;
+	interrupts = <30 2>, <31 2>;
+	interrupt-names = "gpio_odd", "gpio_even";
 	clocks = <&cmu CLOCK_GPIO CLOCK_BRANCH_PCLK>;
+
+	gpioa: gpio@5003c030 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C030 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
+
+	gpiob: gpio@5003c060 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C060 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
+
+	gpioc: gpio@5003c090 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C090 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
+
+	gpiod: gpio@5003c0c0 {
+		compatible = "silabs,gecko-gpio-port";
+		reg = <0x5003C0C0 0x30>;
+		gpio-controller;
+		#gpio-cells = <2>;
+		status = "disabled";
+	};
 };
 
 &i2c0 {
-	interrupts = <32 0>;
+	interrupts = <32 2>;
 	clocks = <&cmu CLOCK_I2C0 CLOCK_BRANCH_LSPCLK>;
 };
 
 &i2c1 {
-	interrupts = <33 0>;
+	interrupts = <33 2>;
 	clocks = <&cmu CLOCK_I2C1 CLOCK_BRANCH_PCLK>;
 };
 
 &usart0 {
-	interrupts = <16 0>, <17 0>;
+	interrupts = <16 2>, <17 2>;
 	clocks = <&cmu CLOCK_USART0 CLOCK_BRANCH_PCLK>;
 };
 
 &usart1 {
-	interrupts = <18 0>, <19 0>;
+	interrupts = <18 2>, <19 2>;
 	clocks = <&cmu CLOCK_USART1 CLOCK_BRANCH_PCLK>;
 };
 
 &burtc0 {
-	interrupts = <23 0>;
+	interrupts = <23 2>;
 	clocks = <&cmu CLOCK_BURTC CLOCK_BRANCH_EM4GRPACLK>;
 };
 
 &rtcc0 {
-	interrupts = <15 0>;
+	interrupts = <15 2>;
 	interrupt-names = "rtcc";
 	clocks = <&cmu CLOCK_RTCC CLOCK_BRANCH_RTCCCLK>;
 };
 
 &adc0 {
-	interrupts = <54 0>;
+	interrupts = <54 2>;
 	clocks = <&cmu CLOCK_IADC0 CLOCK_BRANCH_IADCCLK>;
 };
 
 &dcdc {
-	interrupts = <8 0>;
+	interrupts = <8 2>;
 };
 
 &dma0 {
 	interrupts = <26 0>;
 };
 
+&wdog0 {
+	interrupts = <49 2>;
+	clocks = <&cmu CLOCK_WDOG0 CLOCK_BRANCH_WDOG0CLK>;
+};
+
 &radio {
-	interrupts = <36 0>, <37 0>, <38 0>, <39 0>, <40 0>, <41 0>,
-		     <42 0>, <43 0>, <44 0>, <45 0>, <46 0>, <47 0>;
+	interrupts = <36 1>, <37 1>, <38 1>, <39 1>, <40 1>, <41 1>,
+		     <42 1>, <43 1>, <44 1>, <45 1>, <46 1>, <47 1>;
 	interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
 		     "rac_rsm", "rac_seq", "rdmailbox", "rfsense", "synth",
 		     "prortc";
diff --git a/dts/arm/silabs/efr32bg2x.dtsi b/dts/arm/silabs/efr32bg2x.dtsi
index c2a4d642781d1..300adc8fffd2b 100644
--- a/dts/arm/silabs/efr32bg2x.dtsi
+++ b/dts/arm/silabs/efr32bg2x.dtsi
@@ -123,6 +123,13 @@
 			 * managed by sl_power_manager on S2 devices.
 			 */
 			cpu-power-states = <&pstate_em1 &pstate_em2 &pstate_em3>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			itm: itm@e0000000 {
+				compatible = "arm,armv8m-itm";
+				reg = <0xe0000000 0x1000>;
+			};
 		};
 
 		power-states {
@@ -221,9 +228,9 @@
 		};
 
 		msc: flash-controller@50030000 {
-			compatible = "silabs,gecko-flash-controller";
+			compatible = "silabs,series2-flash-controller";
 			reg = <0x50030000 0xC69>;
-			interrupts = <49 0>;
+			interrupts = <49 2>;
 
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -263,7 +270,7 @@
 			compatible = "silabs,gecko-trng";
 			reg = <0x4C021000 0x1000>;
 			status = "disabled";
-			interrupts = <0x1 0x0>;
+			interrupts = <0x1 0x2>;
 		};
 
 		i2c0: i2c@5a010000 {
@@ -287,52 +294,9 @@
 		gpio: gpio@5003c000 {
 			compatible = "silabs,gecko-gpio";
 			reg = <0x5003C000 0x440>;
-			interrupt-names = "GPIO_EVEN", "GPIO_ODD";
-
 			ranges;
 			#address-cells = <1>;
 			#size-cells = <1>;
-
-			gpioa: gpio@5003c000 {
-				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C000 0x30>;
-				gpio-controller;
-				#gpio-cells = <2>;
-				status = "disabled";
-			};
-
-			gpiob: gpio@5003c030 {
-				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C030 0x30>;
-				gpio-controller;
-				#gpio-cells = <2>;
-				status = "disabled";
-			};
-
-			gpioc: gpio@5003c060 {
-				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C060 0x30>;
-				gpio-controller;
-				#gpio-cells = <2>;
-				status = "disabled";
-			};
-
-			gpiod: gpio@5003c090 {
-				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C090 0x30>;
-				gpio-controller;
-				#gpio-cells = <2>;
-				status = "disabled";
-			};
-
-			gpiof: gpio@5003c0c0 {
-				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C0C0 0x30>;
-				gpio-controller;
-				#gpio-cells = <2>;
-				status = "disabled";
-			};
-
 		};
 
 		pinctrl: pin-controller@5003c440 {
@@ -345,7 +309,7 @@
 			compatible = "silabs,ldma";
 			reg = <0x40040000 0x4000>;
 			#dma-cells = <1>;
-			dma_channels = <8>;
+			dma-channels = <8>;
 			status = "disabled";
 		};
 
@@ -353,14 +317,12 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x4A018000 0x3028>;
 			peripheral-id = <0>;
-			interrupts = <43 0>;
 			status = "disabled";
 		};
 
 		adc0: adc@5a004000 {
 			compatible = "silabs,gecko-iadc";
 			reg = <0x5a004000 0x4000>;
-			interrupts = <48 0>;
 			status = "disabled";
 			#io-channel-cells = <1>;
 		};
diff --git a/dts/arm/silabs/efr32mg21.dtsi b/dts/arm/silabs/efr32mg21.dtsi
index 716f83c251047..03d9be4469418 100644
--- a/dts/arm/silabs/efr32mg21.dtsi
+++ b/dts/arm/silabs/efr32mg21.dtsi
@@ -109,6 +109,11 @@
 				compatible = "arm,armv8m-mpu";
 				reg = <0xe000ed90 0x40>;
 			};
+
+			itm: itm@e0000000 {
+				compatible = "arm,armv8m-itm";
+				reg = <0xe0000000 0x1000>;
+			};
 		};
 	};
 
@@ -121,7 +126,7 @@
 		cmu: clock@50008000 {
 			compatible = "silabs,series-clock";
 			reg = <0x50008000 0x4000>;
-			interrupts = <48 0>;
+			interrupts = <48 2>;
 			interrupt-names = "cmu";
 			status = "okay";
 			#clock-cells = <2>;
@@ -192,7 +197,7 @@
 		};
 
 		msc: flash-controller@50030000 {
-			compatible = "silabs,gecko-flash-controller";
+			compatible = "silabs,series2-flash-controller";
 			reg = <0x50030000 0x31a4>;
 			interrupts = <51 0>;
 
@@ -218,7 +223,7 @@
 		usart1: usart@5005c000 { /* USART1 */
 			compatible = "silabs,usart-uart";
 			reg = <0x5005c000 0x400>;
-			interrupts = <13 0>, <14 0>;
+			interrupts = <13 2>, <14 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_AUTO CLOCK_BRANCH_PCLK>;
 			status = "disabled";
@@ -227,7 +232,7 @@
 		usart2: usart@50060000 { /* USART2 */
 			compatible = "silabs,usart-uart";
 			reg = <0x50060000 0x400>;
-			interrupts = <15 0>, <16 0>;
+			interrupts = <15 2>, <16 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_AUTO CLOCK_BRANCH_PCLK>;
 			status = "disabled";
@@ -239,7 +244,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x5a010000 0x400>;
-			interrupts = <27 0>;
+			interrupts = <27 2>;
 			clocks = <&cmu CLOCK_AUTO CLOCK_BRANCH_LSPCLK>;
 			status = "disabled";
 		};
@@ -250,7 +255,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x50068000 0x400>;
-			interrupts = <28 0>;
+			interrupts = <28 2>;
 			clocks = <&cmu CLOCK_AUTO CLOCK_BRANCH_PCLK>;
 			status = "disabled";
 		};
@@ -258,7 +263,7 @@
 		rtcc0: rtcc@58000000 {
 			compatible = "silabs,gecko-stimer";
 			reg = <0x58000000 0x400>;
-			interrupts = <10 0>;
+			interrupts = <10 2>;
 			interrupt-names = "rtcc";
 			clock-frequency = <32768>;
 			prescaler = <1>;
@@ -333,7 +338,7 @@
 			reg = <0x40040000 0x4000>;
 			interrupts = <21 0>;
 			#dma-cells = <1>;
-			dma_channels = <8>;
+			dma-channels = <8>;
 			status = "disabled";
 		};
 
@@ -341,7 +346,7 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x5a018000 0x2C>;
 			peripheral-id = <0>;
-			interrupts = <43 0>;
+			interrupts = <43 2>;
 			clocks = <&cmu CLOCK_AUTO CLOCK_BRANCH_WDOG0CLK>;
 			status = "disabled";
 		};
@@ -350,7 +355,7 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x5a01c000 0x2C>;
 			peripheral-id = <1>;
-			interrupts = <44 0>;
+			interrupts = <44 2>;
 			clocks = <&cmu CLOCK_AUTO CLOCK_BRANCH_WDOG1CLK>;
 			status = "disabled";
 		};
@@ -366,8 +371,8 @@
 		radio: radio@b0000000 {
 			compatible = "silabs,series2-radio";
 			reg = <0xb0000000 0x1000000>;
-			interrupts = <31 0>, <32 0>, <33 0>, <34 0>, <35 0>, <36 0>,
-				     <37 0>, <38 0>, <39 0>, <40 0>;
+			interrupts = <31 1>, <32 1>, <33 1>, <34 1>, <35 1>, <36 1>,
+				     <37 1>, <38 1>, <39 1>, <40 1>;
 			interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
 					  "rac_rsm", "rac_seq", "prortc", "synth";
 			pa-initial-power-dbm = <10>;
diff --git a/dts/arm/silabs/efr32mg24.dtsi b/dts/arm/silabs/efr32mg24.dtsi
index 0531277d0b0ad..0f2334034779a 100644
--- a/dts/arm/silabs/efr32mg24.dtsi
+++ b/dts/arm/silabs/efr32mg24.dtsi
@@ -144,6 +144,13 @@
 			 * The minimum residency and exit latency is
 			 * managed by sl_power_manager on S2 devices.
 			 */
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			itm: itm@e0000000 {
+				compatible = "arm,armv8m-itm";
+				reg = <0xe0000000 0x1000>;
+			};
 		};
 
 		power-states {
@@ -188,7 +195,7 @@
 		cmu: clock@50008000 {
 			compatible = "silabs,series-clock";
 			reg = <0x50008000 0x4000>;
-			interrupts = <47 0>;
+			interrupts = <47 2>;
 			interrupt-names = "cmu";
 			status = "okay";
 			#clock-cells = <2>;
@@ -260,9 +267,9 @@
 		};
 
 		msc: flash-controller@50030000 {
-			compatible = "silabs,gecko-flash-controller";
+			compatible = "silabs,series2-flash-controller";
 			reg = <0x50030000 0x3148>;
-			interrupts = <50 0>;
+			interrupts = <50 2>;
 
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -277,7 +284,7 @@
 		usart0: usart@5005c000 {
 			compatible = "silabs,usart-uart";
 			reg = <0x5005C000 0x306c>;
-			interrupts = <9 0>, <10 0>;
+			interrupts = <9 2>, <10 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_USART0 CLOCK_BRANCH_PCLK>;
 			status = "disabled";
@@ -286,7 +293,7 @@
 		eusart0: eusart@5b010000 {
 			compatible = "silabs,eusart-spi";
 			reg = <0x5B010000 0x4000>;
-			interrupts = <11 0>, <12 0>;
+			interrupts = <11 2>, <12 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_EUSART0 CLOCK_BRANCH_EUSART0CLK>;
 			status = "disabled";
@@ -295,7 +302,7 @@
 		eusart1: eusart@500a0000 {
 			compatible = "silabs,eusart-spi";
 			reg = <0x500A0000 0x4000>;
-			interrupts = <13 0>, <14 0>;
+			interrupts = <13 2>, <14 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_EUSART1 CLOCK_BRANCH_EM01GRPCCLK>;
 			status = "disabled";
@@ -304,7 +311,7 @@
 		burtc0: burtc@50064000 {
 			compatible = "silabs,gecko-burtc";
 			reg = <0x50064000 0x3034>;
-			interrupts = <17 0>;
+			interrupts = <17 2>;
 			clocks = <&cmu CLOCK_BURTC CLOCK_BRANCH_EM4GRPACLK>;
 			status = "disabled";
 		};
@@ -323,7 +330,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x5b000000 0x3044>;
-			interrupts = <27 0>;
+			interrupts = <27 2>;
 			clocks = <&cmu CLOCK_I2C0 CLOCK_BRANCH_LSPCLK>;
 			status = "disabled";
 		};
@@ -331,7 +338,7 @@
 		sysrtc0: stimer0: sysrtc@500a8000 {
 			compatible = "silabs,gecko-stimer";
 			reg = <0x500a8000 0x3054>;
-			interrupts = <67 0>, <68 0>;
+			interrupts = <67 2>, <68 2>;
 			interrupt-names = "sysrtc_app", "sysrtc_seq";
 			clock-frequency = <32768>;
 			prescaler = <1>;
@@ -398,7 +405,7 @@
 			reg = <0x40040000 0x4000>;
 			interrupts = <21 0>;
 			#dma-cells = <1>;
-			dma_channels = <8>;
+			dma-channels = <8>;
 			status = "disabled";
 		};
 
@@ -406,7 +413,7 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x5b004000 0x2C>;
 			peripheral-id = <0>;
-			interrupts = <42 0>;
+			interrupts = <42 2>;
 			clocks = <&cmu CLOCK_WDOG0 CLOCK_BRANCH_WDOG0CLK>;
 			status = "disabled";
 		};
@@ -415,7 +422,7 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x5b008000 0x2C>;
 			peripheral-id = <1>;
-			interrupts = <43 0>;
+			interrupts = <43 2>;
 			clocks = <&cmu CLOCK_WDOG1 CLOCK_BRANCH_WDOG1CLK>;
 			status = "disabled";
 		};
@@ -423,7 +430,7 @@
 		adc0: adc@59004000 {
 			compatible = "silabs,gecko-iadc";
 			reg = <0x59004000 0x4000>;
-			interrupts = <49 0>;
+			interrupts = <49 2>;
 			clocks = <&cmu CLOCK_IADC0 CLOCK_BRANCH_IADCCLK>;
 			status = "disabled";
 			#io-channel-cells = <1>;
@@ -432,14 +439,14 @@
 		dcdc: dcdc@50094000 {
 			compatible = "silabs,series2-dcdc";
 			reg = <0x50094000 0x4000>;
-			interrupts = <53 0>;
+			interrupts = <53 2>;
 			status = "disabled";
 		};
 
 		acmp0: acmp@59008000 {
 			compatible = "silabs,acmp";
 			reg = <0x59008000 0x4000>;
-			interrupts = <40 0>;
+			interrupts = <40 2>;
 			clocks = <&cmu CLOCK_ACMP0 CLOCK_BRANCH_EM01GRPACLK>;
 			status = "disabled";
 		};
@@ -447,8 +454,8 @@
 		radio: radio@b0000000 {
 			compatible = "silabs,series2-radio";
 			reg = <0xb0000000 0x1000000>;
-			interrupts = <30 0>, <31 0>, <32 0>, <33 0>, <34 0>, <35 0>,
-				     <36 0>, <37 0>, <38 0>, <39 0>, <70 0>, <71 0>;
+			interrupts = <30 1>, <31 1>, <32 1>, <33 1>, <34 1>, <35 1>,
+				     <36 1>, <37 1>, <38 1>, <39 1>, <70 1>, <71 1>;
 			interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
 					  "rac_rsm", "rac_seq", "hostmailbox", "synth",
 					  "rfeca0", "rfeca1";
diff --git a/dts/arm/silabs/efr32xg23.dtsi b/dts/arm/silabs/efr32xg23.dtsi
index cdf33f4e5b7d6..81c8005c65f13 100644
--- a/dts/arm/silabs/efr32xg23.dtsi
+++ b/dts/arm/silabs/efr32xg23.dtsi
@@ -154,6 +154,13 @@
 			 * The minimum residency and exit latency is
 			 * managed by sl_power_manager on S2 devices.
 			 */
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			itm: itm@e0000000 {
+				compatible = "arm,armv8m-itm";
+				reg = <0xe0000000 0x1000>;
+			};
 		};
 
 		power-states {
@@ -198,7 +205,7 @@
 		cmu: clock@50008000 {
 			compatible = "silabs,series-clock";
 			reg = <0x50008000 0x4000>;
-			interrupts = <48 0>;
+			interrupts = <48 2>;
 			interrupt-names = "cmu";
 			status = "okay";
 			#clock-cells = <2>;
@@ -270,9 +277,9 @@
 		};
 
 		msc: flash-controller@50030000 {
-			compatible = "silabs,gecko-flash-controller";
+			compatible = "silabs,series2-flash-controller";
 			reg = <0x50030000 0x4000>;
-			interrupts = <51 0>;
+			interrupts = <51 2>;
 
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -287,7 +294,7 @@
 		usart0: usart@5005c000 {
 			compatible = "silabs,usart-uart";
 			reg = <0x5005C000 0x4000>;
-			interrupts = <9 0>, <10 0>;
+			interrupts = <9 2>, <10 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_USART0 CLOCK_BRANCH_PCLK>;
 			status = "disabled";
@@ -296,7 +303,7 @@
 		eusart0: eusart@5b010000 {
 			compatible = "silabs,eusart-spi";
 			reg = <0x5B010000 0x4000>;
-			interrupts = <11 0>, <12 0>;
+			interrupts = <11 2>, <12 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_EUSART0 CLOCK_BRANCH_EUSART0CLK>;
 			status = "disabled";
@@ -305,7 +312,7 @@
 		eusart1: eusart@500a0000 {
 			compatible = "silabs,eusart-spi";
 			reg = <0x500A0000 0x4000>;
-			interrupts = <13 0>, <14 0>;
+			interrupts = <13 2>, <14 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_EUSART1 CLOCK_BRANCH_EM01GRPCCLK>;
 			status = "disabled";
@@ -314,7 +321,7 @@
 		eusart2: eusart@500a4000 {
 			compatible = "silabs,eusart-spi";
 			reg = <0x500A4000 0x4000>;
-			interrupts = <15 0>, <16 0>;
+			interrupts = <15 2>, <16 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_EUSART2 CLOCK_BRANCH_EM01GRPCCLK>;
 			status = "disabled";
@@ -323,7 +330,7 @@
 		burtc0: burtc@50064000 {
 			compatible = "silabs,gecko-burtc";
 			reg = <0x50064000 0x4000>;
-			interrupts = <18 0>;
+			interrupts = <18 2>;
 			clocks = <&cmu CLOCK_BURTC CLOCK_BRANCH_EM4GRPACLK>;
 			status = "disabled";
 		};
@@ -342,7 +349,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x5b000000 0x4000>;
-			interrupts = <28 0>;
+			interrupts = <28 2>;
 			clocks = <&cmu CLOCK_I2C0 CLOCK_BRANCH_LSPCLK>;
 			status = "disabled";
 		};
@@ -353,7 +360,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x50068000 0x4000>;
-			interrupts = <29 0>;
+			interrupts = <29 2>;
 			clocks = <&cmu CLOCK_I2C1 CLOCK_BRANCH_PCLK>;
 			status = "disabled";
 		};
@@ -361,7 +368,7 @@
 		sysrtc0: stimer0: sysrtc@500a8000 {
 			compatible = "silabs,gecko-stimer";
 			reg = <0x500a8000 0x4000>;
-			interrupts = <70 0>, <71 0>;
+			interrupts = <70 2>, <71 2>;
 			interrupt-names = "sysrtc_app", "sysrtc_seq";
 			clock-frequency = <32768>;
 			prescaler = <1>;
@@ -428,7 +435,7 @@
 			reg = <0x50040000 0x4000>;
 			interrupts = <22 0>;
 			#dma-cells = <1>;
-			dma_channels = <8>;
+			dma-channels = <8>;
 			status = "disabled";
 		};
 
@@ -436,7 +443,7 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x5b004000 0x4000>;
 			peripheral-id = <0>;
-			interrupts = <43 0>;
+			interrupts = <43 2>;
 			clocks = <&cmu CLOCK_WDOG0 CLOCK_BRANCH_WDOG0CLK>;
 			status = "disabled";
 		};
@@ -445,7 +452,7 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x5b008000 0x4000>;
 			peripheral-id = <1>;
-			interrupts = <44 0>;
+			interrupts = <44 2>;
 			clocks = <&cmu CLOCK_WDOG1 CLOCK_BRANCH_WDOG1CLK>;
 			status = "disabled";
 		};
@@ -453,7 +460,7 @@
 		adc0: adc@59004000 {
 			compatible = "silabs,gecko-iadc";
 			reg = <0x59004000 0x4000>;
-			interrupts = <50 0>;
+			interrupts = <50 2>;
 			clocks = <&cmu CLOCK_IADC0 CLOCK_BRANCH_IADCCLK>;
 			status = "disabled";
 			#io-channel-cells = <1>;
@@ -462,14 +469,14 @@
 		dcdc: dcdc@50094000 {
 			compatible = "silabs,series2-dcdc";
 			reg = <0x50094000 0x4000>;
-			interrupts = <54 0>;
+			interrupts = <54 2>;
 			status = "disabled";
 		};
 
 		acmp0: acmp@59008000 {
 			compatible = "silabs,acmp";
 			reg = <0x59008000 0x4000>;
-			interrupts = <41 0>;
+			interrupts = <41 2>;
 			clocks = <&cmu CLOCK_ACMP0 CLOCK_BRANCH_EM01GRPACLK>;
 			status = "disabled";
 		};
@@ -477,8 +484,8 @@
 		radio: radio@b0000000 {
 			compatible = "silabs,series2-radio";
 			reg = <0xb0000000 0x1000000>;
-			interrupts = <31 0>, <32 0>, <33 0>, <34 0>, <35 0>, <36 0>,
-				     <37 0>, <38 0>, <39 0>, <40 0>, <74 0>, <75 0>;
+			interrupts = <31 1>, <32 1>, <33 1>, <34 1>, <35 1>, <36 1>,
+				     <37 1>, <38 1>, <39 1>, <40 1>, <74 1>, <75 1>;
 			interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
 					  "rac_rsm", "rac_seq", "hostmailbox", "synth",
 					  "rfeca0", "rfeca1";
diff --git a/dts/arm/silabs/siwg917.dtsi b/dts/arm/silabs/siwg917.dtsi
index dfa80e4cde397..17e69a0472556 100644
--- a/dts/arm/silabs/siwg917.dtsi
+++ b/dts/arm/silabs/siwg917.dtsi
@@ -6,9 +6,12 @@
 
 #include <arm/armv7-m.dtsi>
 #include <zephyr/dt-bindings/clock/silabs/siwx91x-clock.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+#include <freq.h>
 
 / {
 	chosen {
+		zephyr,sram = &sram0;
 		zephyr,entropy = &rng0;
 		zephyr,flash = &flash0;
 		zephyr,flash-controller = &flashctrl0;
@@ -26,7 +29,24 @@
 
 	sram0: memory@0 {
 		compatible = "mmio-sram";
-		reg = <0x00000000 DT_SIZE_K(191)>;
+		/* siwx91x has 672kB of SRAM shared between the Cortex-M4
+		 * (Zephyr) and the NWP (Network Processor). 3 memory
+		 * configurations are
+		 * possible:
+		 *  - 196kB
+		 *  - 256kB
+		 *  - 320kB
+		 * Less memory is allocated to Zephyr, more memory is allocated
+		 * to NWP, better are the WiFi and BLE performances.
+		 */
+		reg = <0x00000000 DT_SIZE_K(256)>;
+	};
+
+	sram_dma1: memory-dma@24061c00 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x24061c00 DT_SIZE_K(1)>;
+		zephyr,memory-region = "dma1";
+		zephyr,memory-attr = <DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)>;
 	};
 
 	bt_hci0: bt_hci {
@@ -78,22 +98,22 @@
 			status = "disabled";
 		};
 
-		uart1: uart@44000000 {
+		uart0: uart@44000000 {
 			compatible = "ns16550";
 			reg = <0x44000000 0x1000>;
 			interrupts = <38 0>;
 			reg-shift = <2>;
-			clocks = <&clock0 SIWX91X_CLK_UART1>;
+			clocks = <&clock0 SIWX91X_CLK_UART0>;
 			current-speed = <115200>;
 			status = "disabled";
 		};
 
-		uart2: uart@45020000 {
+		uart1: uart@45020000 {
 			compatible = "ns16550";
 			reg = <0x45020000 0x1000>;
 			interrupts = <39 0>;
 			reg-shift = <2>;
-			clocks = <&clock0 SIWX91X_CLK_UART2>;
+			clocks = <&clock0 SIWX91X_CLK_UART1>;
 			current-speed = <115200>;
 			status = "disabled";
 		};
@@ -242,7 +262,6 @@
 			interrupts = <33 0>;
 			interrupt-names = "dma0";
 			clocks = <&clock0 SIWX91X_CLK_DMA0>;
-			silabs,sram-desc-addr = <0x2fc00>;
 			#dma-cells = < 1>;
 			dma-channels = <32>;
 			status = "disabled";
@@ -256,11 +275,45 @@
 			interrupts = <10 0>;
 			interrupt-names = "ulpdma";
 			clocks = <&clock0 SIWX91X_CLK_ULP_DMA>;
-			silabs,sram-desc-addr = <0x24061c00>;
+			silabs,sram-region = <&sram_dma1>;
 			#dma-cells = < 1>;
 			dma-channels = <12>;
 			status = "disabled";
 		};
+
+		pwm: pwm@47070000 {
+			compatible = "silabs,siwx91x-pwm";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x47070000 0x14C>;
+			interrupts = <48 0>;
+			interrupt-names = "pwm";
+			clocks = <&clock0 SIWX91X_CLK_PWM>;
+			#pwm-cells = <2>;
+			silabs,ch_prescaler = <64 64 64 64>;
+			status = "disabled";
+		};
+
+		watchdog: wdt@24048300 {
+			compatible = "silabs,siwx91x-wdt";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x24048300 0x1C>;
+			interrupts = <20 0>;
+			interrupt-names = "watchdog";
+			clocks = <&clock0 SIWX91X_CLK_WATCHDOG>;
+			status = "disabled";
+		};
+
+		sysrtc0: sysrtc@24048c00 {
+			compatible = "silabs,gecko-stimer";
+			reg = <0x24048c00 0x78>;
+			interrupts = <22 0>;
+			interrupt-names = "sysrtc";
+			clock-frequency = <DT_FREQ_K(32)>;
+			prescaler = <1>;
+			status = "disabled";
+		};
 	};
 };
 
diff --git a/dts/arm/silabs/xg29/xg29.dtsi b/dts/arm/silabs/xg29/xg29.dtsi
index 1d3a4cd911581..621a6a4fa060c 100644
--- a/dts/arm/silabs/xg29/xg29.dtsi
+++ b/dts/arm/silabs/xg29/xg29.dtsi
@@ -151,6 +151,13 @@
 			 * The minimum residency and exit latency is
 			 * managed by sl_power_manager on S2 devices.
 			 */
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			itm: itm@e0000000 {
+				compatible = "arm,armv8m-itm";
+				reg = <0xe0000000 0x1000>;
+			};
 		};
 
 		power-states {
@@ -184,7 +191,7 @@
 		cmu: clock@50008000 {
 			compatible = "silabs,series-clock";
 			reg = <0x50008000 0x4000>;
-			interrupts = <52 0>;
+			interrupts = <52 2>;
 			interrupt-names = "cmu";
 			status = "okay";
 			#clock-cells = <2>;
@@ -222,7 +229,7 @@
 			#clock-cells = <0>;
 			compatible = "silabs,series2-lfxo";
 			reg = <0x50020000 0x4000>;
-			interrupts = <27 0>;
+			interrupts = <27 2>;
 			interrupt-names = "lfxo";
 			clock-frequency = <32768>;
 			ctune = <63>;
@@ -235,7 +242,7 @@
 			#clock-cells = <0>;
 			compatible = "silabs,series2-lfrco";
 			reg = <0x50024000 0x4000>;
-			interrupts = <28 0>;
+			interrupts = <28 2>;
 			interrupt-names = "lfrco";
 			clock-frequency = <32768>;
 		};
@@ -244,7 +251,7 @@
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			reg = <0x50028000 0x4000>;
-			interrupts = <29 0>;
+			interrupts = <29 2>;
 			interrupt-names = "ulfrco";
 			clock-frequency = <1000>;
 		};
@@ -257,9 +264,9 @@
 		};
 
 		msc: flash-controller@50030000 {
-			compatible = "silabs,gecko-flash-controller";
+			compatible = "silabs,series2-flash-controller";
 			reg = <0x50030000 0x4000>;
-			interrupts = <55 0>;
+			interrupts = <55 2>;
 			interrupt-names = "msc";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -274,40 +281,40 @@
 		gpio: gpio@5003c000 {
 			compatible = "silabs,gecko-gpio";
 			reg = <0x5003C000 0x440>;
-			interrupts = <31 0>, <30 0>;
+			interrupts = <31 2>, <30 2>;
 			interrupt-names = "GPIO_EVEN", "GPIO_ODD";
 			clocks = <&cmu CLOCK_GPIO CLOCK_BRANCH_PCLK>;
 			ranges;
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			gpioa: gpio@5003c000 {
+			gpioa: gpio@5003c030 {
 				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C000 0x30>;
+				reg = <0x5003C030 0x30>;
 				gpio-controller;
 				#gpio-cells = <2>;
 				status = "disabled";
 			};
 
-			gpiob: gpio@5003c030 {
+			gpiob: gpio@5003c060 {
 				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C030 0x30>;
+				reg = <0x5003C060 0x30>;
 				gpio-controller;
 				#gpio-cells = <2>;
 				status = "disabled";
 			};
 
-			gpioc: gpio@5003c060 {
+			gpioc: gpio@5003c090 {
 				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C060 0x30>;
+				reg = <0x5003C090 0x30>;
 				gpio-controller;
 				#gpio-cells = <2>;
 				status = "disabled";
 			};
 
-			gpiod: gpio@5003c090 {
+			gpiod: gpio@5003c0c0 {
 				compatible = "silabs,gecko-gpio-port";
-				reg = <0x5003C090 0x30>;
+				reg = <0x5003C0C0 0x30>;
 				gpio-controller;
 				#gpio-cells = <2>;
 				status = "disabled";
@@ -326,14 +333,14 @@
 			interrupts = <26 0>;
 			interrupt-names = "ldma";
 			#dma-cells = <1>;
-			dma_channels = <8>;
+			dma-channels = <8>;
 			status = "disabled";
 		};
 
 		usart0: usart@5005c000 {
 			compatible = "silabs,usart-uart";
 			reg = <0x5005C000 0x400>;
-			interrupts = <16 0>, <17 0>;
+			interrupts = <16 2>, <17 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_USART0 CLOCK_BRANCH_PCLK>;
 			status = "disabled";
@@ -342,7 +349,7 @@
 		usart1: usart@50060000 {
 			compatible = "silabs,usart-uart";
 			reg = <0x50060000 0x400>;
-			interrupts = <18 0>, <19 0>;
+			interrupts = <18 2>, <19 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_USART1 CLOCK_BRANCH_PCLK>;
 			status = "disabled";
@@ -351,7 +358,7 @@
 		burtc0: burtc@50064000 {
 			compatible = "silabs,gecko-burtc";
 			reg = <0x50064000 0x4000>;
-			interrupts = <23 0>;
+			interrupts = <23 2>;
 			interrupt-names = "burtc";
 			clocks = <&cmu CLOCK_BURTC CLOCK_BRANCH_EM4GRPACLK>;
 			status = "disabled";
@@ -361,7 +368,7 @@
 			compatible = "silabs,gecko-i2c";
 			clock-frequency = <I2C_BITRATE_STANDARD>;
 			reg = <0x5a010000 0x4000>;
-			interrupts = <32 0>;
+			interrupts = <32 2>;
 			interrupt-names = "i2c0";
 			clocks = <&cmu CLOCK_I2C0 CLOCK_BRANCH_LSPCLK>;
 			#address-cells = <1>;
@@ -373,7 +380,7 @@
 			compatible = "silabs,gecko-i2c";
 			clock-frequency = <I2C_BITRATE_STANDARD>;
 			reg = <0x50068000 0x4000>;
-			interrupts = <33 0>;
+			interrupts = <33 2>;
 			interrupt-names = "i2c1";
 			clocks = <&cmu CLOCK_I2C1 CLOCK_BRANCH_PCLK>;
 			#address-cells = <1>;
@@ -384,7 +391,7 @@
 		dcdc: dcdc@50094000 {
 			compatible = "silabs,series2-dcdc";
 			reg = <0x50094000 0x4000>;
-			interrupts = <8 0>;
+			interrupts = <8 2>;
 			interrupt-names = "dcdc";
 			status = "disabled";
 		};
@@ -392,7 +399,7 @@
 		eusart0: eusart@5a040000 {
 			compatible = "silabs,eusart-spi";
 			reg = <0x5A040000 0x4000>;
-			interrupts = <20 0>, <21 0>;
+			interrupts = <20 2>, <21 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_EUSART0 CLOCK_BRANCH_EUSART0CLK>;
 			status = "disabled";
@@ -401,7 +408,7 @@
 		eusart1: eusart@500b4000 {
 			compatible = "silabs,eusart-spi";
 			reg = <0x500B4000 0x4000>;
-			interrupts = <68 0>, <69 0>;
+			interrupts = <68 2>, <69 2>;
 			interrupt-names = "rx", "tx";
 			clocks = <&cmu CLOCK_EUSART1 CLOCK_BRANCH_EM01GRPCCLK>;
 			status = "disabled";
@@ -410,7 +417,7 @@
 		rtcc0: rtcc@58000000 {
 			compatible = "silabs,gecko-stimer";
 			reg = <0x58000000 0x4000>;
-			interrupts = <15 0>;
+			interrupts = <15 2>;
 			interrupt-names = "rtcc";
 			clocks = <&cmu CLOCK_RTCC CLOCK_BRANCH_RTCCCLK>;
 			clock-frequency = <32768>;
@@ -422,7 +429,7 @@
 			compatible = "silabs,gecko-wdog";
 			reg = <0x58018000 0x4000>;
 			peripheral-id = <0>;
-			interrupts = <49 0>;
+			interrupts = <49 2>;
 			interrupt-names = "wdog0";
 			clocks = <&cmu CLOCK_WDOG0 CLOCK_BRANCH_WDOG0CLK>;
 			status = "disabled";
@@ -431,7 +438,7 @@
 		adc0: adc@5a004000 {
 			compatible = "silabs,gecko-iadc";
 			reg = <0x5a004000 0x4000>;
-			interrupts = <54 0>;
+			interrupts = <54 2>;
 			interrupt-names = "iadc0";
 			clocks = <&cmu CLOCK_IADC0 CLOCK_BRANCH_IADCCLK>;
 			status = "disabled";
@@ -441,7 +448,7 @@
 		acmp0: acmp@5a008000 {
 			compatible = "silabs,acmp";
 			reg = <0x5a008000 0x4000>;
-			interrupts = <48 0>;
+			interrupts = <48 2>;
 			clocks = <&cmu CLOCK_ACMP0 CLOCK_BRANCH_EM01GRPACLK>;
 			status = "disabled";
 		};
@@ -457,8 +464,8 @@
 		radio: radio@b0000000 {
 			compatible = "silabs,series2-radio";
 			reg = <0xb0000000 0x1000000>;
-			interrupts = <36 0>, <37 0>, <38 0>, <39 0>, <40 0>, <41 0>,
-				     <42 0>, <43 0>, <44 0>, <45 0>, <46 0>, <47 0>;
+			interrupts = <36 1>, <37 1>, <38 1>, <39 1>, <40 1>, <41 1>,
+				     <42 1>, <43 1>, <44 1>, <45 1>, <46 1>, <47 1>;
 			interrupt-names = "agc", "bufc", "frc_pri", "frc", "modem", "protimer",
 					  "rac_rsm", "rac_seq", "rdmailbox", "rfsense", "synth",
 					  "prortc";
diff --git a/dts/arm/st/c0/stm32c0.dtsi b/dts/arm/st/c0/stm32c0.dtsi
index 3014abd7b5ffe..e5545e8b05f71 100644
--- a/dts/arm/st/c0/stm32c0.dtsi
+++ b/dts/arm/st/c0/stm32c0.dtsi
@@ -3,6 +3,58 @@
  * Copyright (c) 2024 STMicroelectronics
  *
  * SPDX-License-Identifier: Apache-2.0
+ *
+ * The mapping of wake-up line WKUP2, WKUP5 and WKUP6 to GPIO pins depends on
+ * the pin count of the SoC installed on a given board. Board DTS files are
+ * responsible for configuring these lines using the following snippet
+ * (which must be adapted depending on the board's SoC):
+ *
+ *   &pwr {
+ *       wkup-pin@2 {
+ *           wkup-gpios = <&gpioX YY STM32_PWR_WKUP_PIN_NOT_MUXED>;
+ *       };
+ *       wkup-pin@5 {
+ *           wkup-gpios = <&gpioX YY STM32_PWR_WKUP_PIN_NOT_MUXED>;
+ *       };
+ *       wkup-pin@6 {
+ *           wkup-gpios = <&gpioX YY STM32_PWR_WKUP_PIN_NOT_MUXED>;
+ *       };
+ *   };
+ *
+ * Refer to product Datasheet §4 "Pinouts, pin description and alternate functions"
+ * for information about which GPIO pin (if any) is connected to wake-up lines WKUP2,
+ * WKUP5 and WKUP6. The following table provides a summary:
+ *
+ * Part Number |- WKUP2 -|- WKUP5 -|- WKUP6 -|
+ * ------------|---------|---------|---------|
+ * STM32C011Jx |   N/A   |   N/A   |   N/A   |
+ * STM32C011Dx |   PA4   |   N/A   |   N/A   |
+ * STM32C011Fx |   PA4   |   N/A   |   N/A   |
+ * ------------|---------|---------|---------|
+ * STM32C031Fx |   PA4   |   N/A   |   N/A   |
+ * STM32C031Gx |   PA4   |   N/A   |   PB5   |
+ * STM32C031Kx |   PA4   |   N/A   |   PB5   |
+ * STM32C031Cx |   PC13  |   N/A   |   PB5   |
+ * ------------|---------|---------|---------|
+ * STM32C051Dx |   PA4   |   N/A   |   PB5   |
+ * STM32C051Fx |   PA4   |   N/A   |   PB5   |
+ * STM32C051Gx |   PA4   |   N/A   |   PB5   |
+ * STM32C051Kx |   PA4   |   N/A   |   PB5   |
+ * STM32C051Cx |   PC13  |   N/A   |   PB5   |
+ * ------------|---------|---------|---------|
+ * STM32C071Fx |   PA4   |   N/A   |   PB5   |
+ * STM32C071Gx |   PA4   |   N/A   |   PB5   |
+ * STM32C071Kx |   PA4   |   N/A   |   PB5   |
+ * STM32C071Cx |   PC13  |   N/A   |   PB5   |
+ * STM32C071Rx |   PC13  |   PC5   |   PB5   |
+ * ------------|---------|---------|---------|
+ * STM32C09xFx |   PA4   |   N/A   |   PB5   |
+ * STM32C09xEx |   PA4   |   N/A   |   PB5   |
+ * STM32C09xGx |   PA4   |   N/A   |   PB5   |
+ * STM32C09xKx |   PA4   |   N/A   |   PB5   |
+ * STM32C09xCx |   PC13  |   N/A   |   PB5   |
+ * STM32C09xRx |   PC13  |   PC5   |   PB5   |
+ * ------------|---------|---------|---------|
  */
 
 #include <arm/armv6-m.dtsi>
@@ -15,6 +67,7 @@
 #include <zephyr/dt-bindings/pwm/stm32_pwm.h>
 #include <zephyr/dt-bindings/adc/stm32l4_adc.h>
 #include <zephyr/dt-bindings/reset/stm32c0_reset.h>
+#include <zephyr/dt-bindings/power/stm32_pwr.h>
 #include <freq.h>
 
 / {
@@ -162,6 +215,46 @@
 			};
 		};
 
+		pwr: power@40007000 {
+			compatible = "st,stm32-pwr";
+			reg = <0x40007000 0x400>; /* PWR register bank */
+			status = "disabled";
+
+			wkup-pins-nb = <6>; /* 6 system wake-up pins */
+			wkup-pins-pol;
+			wkup-pins-pupd;
+
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			wkup-pin@1 {
+				reg = <0x1>;
+				wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_NOT_MUXED>;
+			};
+
+			wkup-pin@2 {
+				reg = <0x2>;
+			};
+
+			wkup-pin@3 {
+				reg = <0x3>;
+				wkup-gpios = <&gpiob 6 STM32_PWR_WKUP_PIN_NOT_MUXED>;
+			};
+
+			wkup-pin@4 {
+				reg = <0x4>;
+				wkup-gpios = <&gpioa 2 STM32_PWR_WKUP_PIN_NOT_MUXED>;
+			};
+
+			wkup-pin@5 {
+				reg = <0x5>;
+			};
+
+			wkup-pin@6 {
+				reg = <0x6>;
+			};
+		};
+
 		rtc: rtc@40002800 {
 			compatible = "st,stm32-rtc";
 			reg = <0x40002800 0x400>;
diff --git a/dts/arm/st/f0/stm32f042.dtsi b/dts/arm/st/f0/stm32f042.dtsi
index 2dc48d49e7cb0..c855e3b0c2cd7 100644
--- a/dts/arm/st/f0/stm32f042.dtsi
+++ b/dts/arm/st/f0/stm32f042.dtsi
@@ -72,6 +72,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 23U)>,
 				 <&rcc STM32_SRC_PLLCLK USB_SEL(1)>;
diff --git a/dts/arm/st/f0/stm32f070.dtsi b/dts/arm/st/f0/stm32f070.dtsi
index 98f2de5aa33b3..295e5739dfc83 100644
--- a/dts/arm/st/f0/stm32f070.dtsi
+++ b/dts/arm/st/f0/stm32f070.dtsi
@@ -43,6 +43,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 23U)>,
 				 <&rcc STM32_SRC_PLLCLK USB_SEL(1)>;
diff --git a/dts/arm/st/f0/stm32f072.dtsi b/dts/arm/st/f0/stm32f072.dtsi
index 734b44ad34661..3bb264c10b944 100644
--- a/dts/arm/st/f0/stm32f072.dtsi
+++ b/dts/arm/st/f0/stm32f072.dtsi
@@ -25,6 +25,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 23U)>,
 				 <&rcc STM32_SRC_PLLCLK USB_SEL(1)>;
diff --git a/dts/arm/st/f1/stm32f103X8.dtsi b/dts/arm/st/f1/stm32f103X8.dtsi
index 19ea073904e39..67b32d576a4bd 100644
--- a/dts/arm/st/f1/stm32f103X8.dtsi
+++ b/dts/arm/st/f1/stm32f103X8.dtsi
@@ -42,6 +42,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <512>;
+			maximum-speed = "full-speed";
 			status = "disabled";
 			clocks = <&rcc STM32_CLOCK(APB1, 23U)>;
 			phys = <&usb_fs_phy>;
diff --git a/dts/arm/st/f1/stm32f105.dtsi b/dts/arm/st/f1/stm32f105.dtsi
index 053ef6b2db60d..323941552cb57 100644
--- a/dts/arm/st/f1/stm32f105.dtsi
+++ b/dts/arm/st/f1/stm32f105.dtsi
@@ -146,6 +146,7 @@
 			num-bidir-endpoints = <4>;
 			ram-size = <1280>;
 			clocks = <&rcc STM32_CLOCK(AHB1, 12U)>;
+			maximum-speed = "full-speed";
 			phys = <&otgfs_phy>;
 			status = "disabled";
 		};
diff --git a/dts/arm/st/f1/stm32f107.dtsi b/dts/arm/st/f1/stm32f107.dtsi
index 1ba41fff76034..8f4b2d6b99136 100644
--- a/dts/arm/st/f1/stm32f107.dtsi
+++ b/dts/arm/st/f1/stm32f107.dtsi
@@ -19,16 +19,26 @@
 			status = "disabled";
 		};
 
-		mac: ethernet@40028000 {
-			compatible = "st,stm32-ethernet";
+		ethernet@40028000 {
 			reg = <0x40028000 0x2000>;
-			interrupts = <61 0>;
-			clock-names = "stmmaceth", "mac-clk-tx",
-				      "mac-clk-rx";
-			clocks = <&rcc STM32_CLOCK(AHB1, 14U)>,
-				 <&rcc STM32_CLOCK(AHB1, 15U)>,
-				 <&rcc STM32_CLOCK(AHB1, 16U)>;
-			status = "disabled";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB1, 14)>;
+
+			mac: ethernet {
+				compatible = "st,stm32-ethernet";
+				interrupts = <61 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx";
+				clocks = <&rcc STM32_CLOCK(AHB1, 15)>,
+					 <&rcc STM32_CLOCK(AHB1, 16)>;
+				status = "disabled";
+			};
+
+			mdio: mdio {
+				compatible = "st,stm32-mdio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+			};
 		};
 	};
 };
diff --git a/dts/arm/st/f2/stm32f207.dtsi b/dts/arm/st/f2/stm32f207.dtsi
index a3d8ce18bb721..53bd1a77ebea2 100644
--- a/dts/arm/st/f2/stm32f207.dtsi
+++ b/dts/arm/st/f2/stm32f207.dtsi
@@ -10,17 +10,29 @@
 	soc {
 		compatible = "st,stm32f207", "st,stm32f2", "simple-bus";
 
-		mac: ethernet@40028000 {
-			compatible = "st,stm32-ethernet";
+		ethernet@40028000 {
 			reg = <0x40028000 0x8000>;
-			interrupts = <61 0>;
-			clock-names = "stmmaceth", "mac-clk-tx",
-				      "mac-clk-rx", "mac-clk-ptp";
-			clocks = <&rcc STM32_CLOCK(AHB1, 25U)>,
-				 <&rcc STM32_CLOCK(AHB1, 26U)>,
-				 <&rcc STM32_CLOCK(AHB1, 27U)>,
-				 <&rcc STM32_CLOCK(AHB1, 28U)>;
-			status = "disabled";
+			compatible = "st,stm32-ethernet-controller";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB1, 25)>;
+
+			mac: ethernet {
+				compatible = "st,stm32-ethernet";
+				interrupts = <61 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx",
+					      "mac-clk-ptp";
+				clocks = <&rcc STM32_CLOCK(AHB1, 26)>,
+					 <&rcc STM32_CLOCK(AHB1, 27)>,
+					 <&rcc STM32_CLOCK(AHB1, 28)>;
+				status = "disabled";
+			};
+
+			mdio: mdio {
+				compatible = "st,stm32-mdio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+			};
 		};
 	};
 };
diff --git a/dts/arm/st/f3/stm32f3.dtsi b/dts/arm/st/f3/stm32f3.dtsi
index 435877e136e22..2cdfebaf03fc6 100644
--- a/dts/arm/st/f3/stm32f3.dtsi
+++ b/dts/arm/st/f3/stm32f3.dtsi
@@ -258,6 +258,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <512>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 23U)>;
 			status = "disabled";
diff --git a/dts/arm/st/f4/stm32f4.dtsi b/dts/arm/st/f4/stm32f4.dtsi
index e05aaf7b09017..e20a50dcbec6d 100644
--- a/dts/arm/st/f4/stm32f4.dtsi
+++ b/dts/arm/st/f4/stm32f4.dtsi
@@ -18,6 +18,7 @@
 #include <zephyr/dt-bindings/adc/stm32f4_adc.h>
 #include <zephyr/dt-bindings/reset/stm32f2_4_7_reset.h>
 #include <zephyr/dt-bindings/sensor/qdec_stm32.h>
+#include <zephyr/dt-bindings/power/stm32_pwr.h>
 #include <freq.h>
 
 / {
@@ -586,6 +587,22 @@
 		};
 	};
 
+	pwr: power@40007000 {
+		compatible = "st,stm32-pwr";
+		reg = <0x40007000 0x400>; /* PWR register bank */
+		status = "disabled";
+
+		wkup-pins-nb = <1>;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		wkup-pin@1 {
+			reg = <0x1>;
+			wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_NOT_MUXED>;
+		};
+	};
+
 	die_temp: dietemp {
 		compatible = "st,stm32-temp-cal";
 		ts-cal1-addr = <0x1FFF7A2C>;
diff --git a/dts/arm/st/f4/stm32f401.dtsi b/dts/arm/st/f4/stm32f401.dtsi
index eda9b1e4a9824..e113144d2e1ee 100644
--- a/dts/arm/st/f4/stm32f401.dtsi
+++ b/dts/arm/st/f4/stm32f401.dtsi
@@ -55,8 +55,8 @@
 			reg = <0x40003800 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB1, 14U)>;
 			interrupts = <36 5>;
-			dmas = <&dma1 4 0 0x400 0x3
-				&dma1 3 0 0x400 0x3>;
+			dmas = <&dma1 4 0 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma1 3 0 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
@@ -68,8 +68,8 @@
 			reg = <0x40003c00 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB1, 15U)>;
 			interrupts = <51 5>;
-			dmas = <&dma1 5 0 0x400 0x3
-				&dma1 0 0 0x400 0x3>;
+			dmas = <&dma1 5 0 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma1 0 0 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
diff --git a/dts/arm/st/f4/stm32f407.dtsi b/dts/arm/st/f4/stm32f407.dtsi
index 8ced67aaf26b0..f4ec4a6a128cd 100644
--- a/dts/arm/st/f4/stm32f407.dtsi
+++ b/dts/arm/st/f4/stm32f407.dtsi
@@ -10,17 +10,29 @@
 	soc {
 		compatible = "st,stm32f407", "st,stm32f4", "simple-bus";
 
-		mac: ethernet@40028000 {
-			compatible = "st,stm32-ethernet";
+		ethernet@40028000 {
 			reg = <0x40028000 0x8000>;
-			interrupts = <61 0>;
-			clock-names = "stmmaceth", "mac-clk-tx",
-				      "mac-clk-rx", "mac-clk-ptp";
-			clocks = <&rcc STM32_CLOCK(AHB1, 25U)>,
-				 <&rcc STM32_CLOCK(AHB1, 26U)>,
-				 <&rcc STM32_CLOCK(AHB1, 27U)>,
-				 <&rcc STM32_CLOCK(AHB1, 28U)>;
-			status = "disabled";
+			compatible = "st,stm32-ethernet-controller";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB1, 25)>;
+
+			mac: ethernet {
+				compatible = "st,stm32-ethernet";
+				interrupts = <61 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx",
+					      "mac-clk-ptp";
+				clocks = <&rcc STM32_CLOCK(AHB1, 26)>,
+					 <&rcc STM32_CLOCK(AHB1, 27)>,
+					 <&rcc STM32_CLOCK(AHB1, 28)>;
+				status = "disabled";
+			};
+
+			mdio: mdio {
+				compatible = "st,stm32-mdio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+			};
 		};
 	};
 };
diff --git a/dts/arm/st/f4/stm32f410.dtsi b/dts/arm/st/f4/stm32f410.dtsi
index cd98599212af8..0f149a98e8cc0 100644
--- a/dts/arm/st/f4/stm32f410.dtsi
+++ b/dts/arm/st/f4/stm32f410.dtsi
@@ -42,8 +42,8 @@
 			reg = <0x40013000 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB2, 12U)>;
 			interrupts = <35 5>;
-			dmas = <&dma2 3 3 0x400 0x3
-				&dma2 2 3 0x400 0x3>;
+			dmas = <&dma2 3 3 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma2 2 3 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
@@ -55,8 +55,8 @@
 			reg = <0x40003800 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB1, 14U)>;
 			interrupts = <36 5>;
-			dmas = <&dma1 4 0 0x400 0x3
-				&dma1 3 0 0x400 0x3>;
+			dmas = <&dma1 4 0 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma1 3 0 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
@@ -68,8 +68,8 @@
 			reg = <0x40015000 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB2, 20U)>;
 			interrupts = <85 5>;
-			dmas = <&dma2 6 7 0x400 0x3
-				&dma2 5 7 0x400 0x3>;
+			dmas = <&dma2 6 7 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma2 5 7 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
diff --git a/dts/arm/st/f4/stm32f411.dtsi b/dts/arm/st/f4/stm32f411.dtsi
index 8b1cec9089374..b0dfddd40ef67 100644
--- a/dts/arm/st/f4/stm32f411.dtsi
+++ b/dts/arm/st/f4/stm32f411.dtsi
@@ -35,8 +35,8 @@
 			reg = <0x40013000 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB2, 12U)>;
 			interrupts = <35 5>;
-			dmas = <&dma2 3 3 0x400 0x3
-				&dma2 2 3 0x400 0x3>;
+			dmas = <&dma2 3 3 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma2 2 3 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
@@ -48,8 +48,8 @@
 			reg = <0x40013400 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB2, 13U)>;
 			interrupts = <84 5>;
-			dmas = <&dma2 1 4 0x400 0x3
-				&dma2 0 4 0x400 0x3>;
+			dmas = <&dma2 1 4 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma2 0 4 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
@@ -61,8 +61,8 @@
 			reg = <0x40015000 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB2, 20U)>;
 			interrupts = <85 5>;
-			dmas = <&dma2 6 7 0x400 0x3
-				&dma2 5 7 0x400 0x3>;
+			dmas = <&dma2 6 7 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma2 5 7 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
diff --git a/dts/arm/st/f4/stm32f412.dtsi b/dts/arm/st/f4/stm32f412.dtsi
index e7620cba2f4c4..73ba2591d41a5 100644
--- a/dts/arm/st/f4/stm32f412.dtsi
+++ b/dts/arm/st/f4/stm32f412.dtsi
@@ -84,8 +84,8 @@
 			reg = <0x40013400 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB2, 13U)>;
 			interrupts = <84 5>;
-			dmas = <&dma2 1 4 0x400 0x3
-				&dma2 0 4 0x400 0x3>;
+			dmas = <&dma2 1 4 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma2 0 4 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
@@ -215,7 +215,7 @@
 		quadspi: spi@a0001000 {
 			compatible = "st,stm32-qspi";
 			#address-cells = <0x1>;
-			#size-cells = <0x0>;
+			#size-cells = <0x1>;
 			reg = <0xa0001000 0x400>;
 			interrupts = <92 0>;
 			clocks = <&rcc STM32_CLOCK(AHB3, 1U)>;
diff --git a/dts/arm/st/f4/stm32f439.dtsi b/dts/arm/st/f4/stm32f439.dtsi
new file mode 100644
index 0000000000000..2144fb55ec5ae
--- /dev/null
+++ b/dts/arm/st/f4/stm32f439.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025, Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <st/f4/stm32f429.dtsi>
+
+/ {
+	soc {
+		compatible = "st,stm32f439", "st,stm32f4", "simple-bus";
+
+		cryp: cryp@50060000 {
+			compatible = "st,stm32-cryp";
+			reg = <0x50060000 0x400>;
+			clocks = <&rcc STM32_CLOCK(AHB2, 4U)>;
+			resets = <&rctl STM32_RESET(AHB2, 4U)>;
+			interrupts = <79 0>;
+			status = "disabled";
+		};
+	};
+};
diff --git a/dts/arm/st/f4/stm32f439Xi.dtsi b/dts/arm/st/f4/stm32f439Xi.dtsi
new file mode 100644
index 0000000000000..cc1c6a1276ddf
--- /dev/null
+++ b/dts/arm/st/f4/stm32f439Xi.dtsi
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <st/f4/stm32f439.dtsi>
+
+/ {
+	ccm0: memory@10000000 {
+		compatible = "zephyr,memory-region", "st,stm32-ccm";
+		reg = <0x10000000 DT_SIZE_K(64)>;
+		zephyr,memory-region = "CCM";
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(192)>;
+	};
+
+	soc {
+		flash-controller@40023c00 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_K(2048)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/f4/stm32f439vX.dtsi b/dts/arm/st/f4/stm32f439vX.dtsi
new file mode 100644
index 0000000000000..ce43b8a80ff5a
--- /dev/null
+++ b/dts/arm/st/f4/stm32f439vX.dtsi
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <st/f4/stm32f439.dtsi>
+
+/*
+ * spi5 and spi6 are present on all STM32F439XX SoCs except
+ * STM32F439vX SoCs, so they are defined in stm32f439.dtsi and deleted
+ * here.
+ */
+
+/delete-node/ &spi5;
+
+/delete-node/ &spi6;
diff --git a/dts/arm/st/f4/stm32f439vi.dtsi b/dts/arm/st/f4/stm32f439vi.dtsi
new file mode 100644
index 0000000000000..837a6cac9d9ec
--- /dev/null
+++ b/dts/arm/st/f4/stm32f439vi.dtsi
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <st/f4/stm32f439vX.dtsi>
+
+/ {
+	ccm0: memory@10000000 {
+		compatible = "zephyr,memory-region", "st,stm32-ccm";
+		reg = <0x10000000 DT_SIZE_K(64)>;
+		zephyr,memory-region = "CCM";
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(192)>;
+	};
+
+	soc {
+		flash-controller@40023c00 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_K(2048)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/f4/stm32f446.dtsi b/dts/arm/st/f4/stm32f446.dtsi
index 84c6df6432f4f..a015b1d87b4f1 100644
--- a/dts/arm/st/f4/stm32f446.dtsi
+++ b/dts/arm/st/f4/stm32f446.dtsi
@@ -25,8 +25,8 @@
 			reg = <0x40013000 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB2, 12U)>;
 			interrupts = <35 5>;
-			dmas = <&dma2 3 3 0x400 0x3
-				&dma2 2 3 0x400 0x3>;
+			dmas = <&dma2 3 3 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL
+				&dma2 2 3 STM32_DMA_MEM_INC STM32_DMA_FIFO_FULL>;
 			dma-names = "tx", "rx";
 			status = "disabled";
 		};
diff --git a/dts/arm/st/f4/stm32f479.dtsi b/dts/arm/st/f4/stm32f479.dtsi
new file mode 100644
index 0000000000000..ca6b023b085ec
--- /dev/null
+++ b/dts/arm/st/f4/stm32f479.dtsi
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2025 Christopher Cichiwskyj
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <st/f4/stm32f469.dtsi>
+
+/ {
+	soc {
+		compatible = "st,stm32f479", "st,stm32f4", "simple-bus";
+
+		cryp: cryp@50060000 {
+			compatible = "st,stm32-cryp";
+			reg = <0x50060000 0x400>;
+			clocks = <&rcc STM32_CLOCK(AHB2, 4)>;
+			interrupts = <79 0>;
+			status = "disabled";
+		};
+	};
+};
diff --git a/dts/arm/st/f4/stm32f479Xi.dtsi b/dts/arm/st/f4/stm32f479Xi.dtsi
new file mode 100644
index 0000000000000..42eb8c07afe86
--- /dev/null
+++ b/dts/arm/st/f4/stm32f479Xi.dtsi
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Christopher Cichiwskyj
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <st/f4/stm32f479.dtsi>
+
+/ {
+	ccm0: memory@10000000 {
+		compatible = "zephyr,memory-region", "st,stm32-ccm";
+		reg = <0x10000000 DT_SIZE_K(64)>;
+		zephyr,memory-region = "CCM";
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(320)>;
+	};
+
+	soc {
+		flash-controller@40023c00 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_K(2048)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/f7/stm32f7.dtsi b/dts/arm/st/f7/stm32f7.dtsi
index 891afcf10c4da..5a3ec7d46cd73 100644
--- a/dts/arm/st/f7/stm32f7.dtsi
+++ b/dts/arm/st/f7/stm32f7.dtsi
@@ -857,7 +857,7 @@
 		quadspi: spi@a0001000 {
 			compatible = "st,stm32-qspi";
 			#address-cells = <0x1>;
-			#size-cells = <0x0>;
+			#size-cells = <0x1>;
 			reg = <0xa0001000 0x34>;
 			interrupts = <92 0>;
 			clocks = <&rcc STM32_CLOCK(AHB3, 1U)>;
diff --git a/dts/arm/st/f7/stm32f745.dtsi b/dts/arm/st/f7/stm32f745.dtsi
index 40f2b10362980..999da8e962cfe 100644
--- a/dts/arm/st/f7/stm32f745.dtsi
+++ b/dts/arm/st/f7/stm32f745.dtsi
@@ -75,17 +75,29 @@
 			status = "disabled";
 		};
 
-		mac: ethernet@40028000 {
-			compatible = "st,stm32-ethernet";
+		ethernet@40028000 {
 			reg = <0x40028000 0x8000>;
-			interrupts = <61 0>;
-			clock-names = "stmmaceth", "mac-clk-tx",
-				      "mac-clk-rx", "mac-clk-ptp";
-			clocks = <&rcc STM32_CLOCK(AHB1, 25U)>,
-				 <&rcc STM32_CLOCK(AHB1, 26U)>,
-				 <&rcc STM32_CLOCK(AHB1, 27U)>,
-				 <&rcc STM32_CLOCK(AHB1, 28U)>;
-			status = "disabled";
+			compatible = "st,stm32-ethernet-controller";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB1, 25)>;
+
+			mac: ethernet {
+				compatible = "st,stm32-ethernet";
+				interrupts = <61 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx",
+					      "mac-clk-ptp";
+				clocks = <&rcc STM32_CLOCK(AHB1, 26)>,
+					 <&rcc STM32_CLOCK(AHB1, 27)>,
+					 <&rcc STM32_CLOCK(AHB1, 28)>;
+				status = "disabled";
+			};
+
+			mdio: mdio {
+				compatible = "st,stm32-mdio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+			};
 		};
 	};
 
diff --git a/dts/arm/st/f7/stm32f765.dtsi b/dts/arm/st/f7/stm32f765.dtsi
index d8c62d3bf274c..a1148f110ca2f 100644
--- a/dts/arm/st/f7/stm32f765.dtsi
+++ b/dts/arm/st/f7/stm32f765.dtsi
@@ -68,17 +68,29 @@
 			status = "disabled";
 		};
 
-		mac: ethernet@40028000 {
-			compatible = "st,stm32-ethernet";
+		ethernet@40028000 {
 			reg = <0x40028000 0x8000>;
-			interrupts = <61 0>;
-			clock-names = "stmmaceth", "mac-clk-tx",
-				      "mac-clk-rx", "mac-clk-ptp";
-			clocks = <&rcc STM32_CLOCK(AHB1, 25U)>,
-				 <&rcc STM32_CLOCK(AHB1, 26U)>,
-				 <&rcc STM32_CLOCK(AHB1, 27U)>,
-				 <&rcc STM32_CLOCK(AHB1, 28U)>;
-			status = "disabled";
+			compatible = "st,stm32-ethernet-controller";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB1, 25)>;
+
+			mac: ethernet {
+				compatible = "st,stm32-ethernet";
+				interrupts = <61 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx",
+					      "mac-clk-ptp";
+				clocks = <&rcc STM32_CLOCK(AHB1, 26)>,
+					 <&rcc STM32_CLOCK(AHB1, 27)>,
+					 <&rcc STM32_CLOCK(AHB1, 28)>;
+				status = "disabled";
+			};
+
+			mdio: mdio {
+				compatible = "st,stm32-mdio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+			};
 		};
 
 		sdmmc2: sdmmc@40011c00 {
diff --git a/dts/arm/st/g0/stm32g0b0.dtsi b/dts/arm/st/g0/stm32g0b0.dtsi
index b0afe8d1ed949..9e8477c33adf2 100644
--- a/dts/arm/st/g0/stm32g0b0.dtsi
+++ b/dts/arm/st/g0/stm32g0b0.dtsi
@@ -99,6 +99,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <2048>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 13U)>,
 				 <&rcc STM32_SRC_HSI48 USB_SEL(0)>;
diff --git a/dts/arm/st/g0/stm32g0b1.dtsi b/dts/arm/st/g0/stm32g0b1.dtsi
index bc621076b314d..4a1bb1065f4bf 100644
--- a/dts/arm/st/g0/stm32g0b1.dtsi
+++ b/dts/arm/st/g0/stm32g0b1.dtsi
@@ -143,6 +143,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <2048>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 13U)>,
 				 <&rcc STM32_SRC_HSI48 USB_SEL(0)>;
diff --git a/dts/arm/st/g4/stm32g4.dtsi b/dts/arm/st/g4/stm32g4.dtsi
index 20d3d38df39b8..7e94481d9a581 100644
--- a/dts/arm/st/g4/stm32g4.dtsi
+++ b/dts/arm/st/g4/stm32g4.dtsi
@@ -621,6 +621,7 @@
 			interrupt-names = "usb", "usbhp";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 23U)>,
 				 <&rcc STM32_SRC_HSI48 CLK48_SEL(0)>;
diff --git a/dts/arm/st/h5/stm32h5.dtsi b/dts/arm/st/h5/stm32h5.dtsi
index 3dc4237933c1e..3fcd51acff019 100644
--- a/dts/arm/st/h5/stm32h5.dtsi
+++ b/dts/arm/st/h5/stm32h5.dtsi
@@ -538,15 +538,20 @@
 			status = "disabled";
 		};
 
-		mac: ethernet@40028000 {
-			compatible = "st,stm32h7-ethernet", "st,stm32-ethernet";
+		ethernet@40028000 {
 			reg = <0x40028000 0x8000>;
-			interrupts = <106 0>;
-			clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
-			clocks = <&rcc STM32_CLOCK(AHB1, 19U)>,
-				 <&rcc STM32_CLOCK(AHB1, 20U)>,
-				 <&rcc STM32_CLOCK(AHB1, 21U)>;
-			status = "disabled";
+			compatible = "st,stm32-ethernet-controller";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB1, 19)>;
+
+			mac: ethernet {
+				compatible = "st,stm32h7-ethernet", "st,stm32-ethernet";
+				interrupts = <106 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx";
+				clocks = <&rcc STM32_CLOCK(AHB1, 20)>,
+					 <&rcc STM32_CLOCK(AHB1, 21)>;
+				status = "disabled";
+			};
 
 			mdio: mdio {
 				compatible = "st,stm32-mdio";
@@ -635,6 +640,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <2048>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB2, 24U)>,
 				 <&rcc STM32_SRC_HSI48 USB_SEL(3)>;
diff --git a/dts/arm/st/h5/stm32h562.dtsi b/dts/arm/st/h5/stm32h562.dtsi
index 384a8ff76d544..a8fe1bce5e223 100644
--- a/dts/arm/st/h5/stm32h562.dtsi
+++ b/dts/arm/st/h5/stm32h562.dtsi
@@ -266,7 +266,7 @@
 			clocks = <&rcc STM32_CLOCK(AHB4, 20U)>,
 				<&rcc STM32_SRC_PLL1_Q OCTOSPI1_SEL(1)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
diff --git a/dts/arm/st/h5/stm32h562Xg.dtsi b/dts/arm/st/h5/stm32h562Xg.dtsi
new file mode 100644
index 0000000000000..969c61d5d9c7f
--- /dev/null
+++ b/dts/arm/st/h5/stm32h562Xg.dtsi
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Kacper Brzostowski
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <mem.h>
+#include <st/h5/stm32h562.dtsi>
+
+/ {
+	soc {
+		flash-controller@40022000 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_M(1)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/h7/stm32h7.dtsi b/dts/arm/st/h7/stm32h7.dtsi
index d2b9bd1bcb2e7..409d0bb1edf33 100644
--- a/dts/arm/st/h7/stm32h7.dtsi
+++ b/dts/arm/st/h7/stm32h7.dtsi
@@ -1025,15 +1025,20 @@
 			status = "disabled";
 		};
 
-		mac: ethernet@40028000 {
-			compatible = "st,stm32h7-ethernet", "st,stm32-ethernet";
+		ethernet@40028000 {
 			reg = <0x40028000 0x8000>;
-			interrupts = <61 0>;
-			clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
-			clocks = <&rcc STM32_CLOCK(AHB1, 15U)>,
-				 <&rcc STM32_CLOCK(AHB1, 16U)>,
-				 <&rcc STM32_CLOCK(AHB1, 17U)>;
-			status = "disabled";
+			compatible = "st,stm32-ethernet-controller";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB1, 15)>;
+
+			mac: ethernet {
+				compatible = "st,stm32h7-ethernet", "st,stm32-ethernet";
+				interrupts = <61 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx";
+				clocks = <&rcc STM32_CLOCK(AHB1, 16)>,
+					 <&rcc STM32_CLOCK(AHB1, 17)>;
+				status = "disabled";
+			};
 
 			mdio: mdio {
 				compatible = "st,stm32-mdio";
@@ -1068,7 +1073,7 @@
 		quadspi: spi@52005000 {
 			compatible = "st,stm32-qspi";
 			#address-cells = <0x1>;
-			#size-cells = <0x0>;
+			#size-cells = <0x1>;
 			reg = <0x52005000 0x34>;
 			interrupts = <92 0>;
 			clocks = <&rcc STM32_CLOCK(AHB3, 14U)>;
diff --git a/dts/arm/st/h7/stm32h723.dtsi b/dts/arm/st/h7/stm32h723.dtsi
index bf8712608c66e..a7fee95397343 100644
--- a/dts/arm/st/h7/stm32h723.dtsi
+++ b/dts/arm/st/h7/stm32h723.dtsi
@@ -101,7 +101,7 @@
 			clocks = <&rcc STM32_CLOCK(AHB3, 14U)>,
 				<&rcc STM32_SRC_PLL1_Q OSPI_SEL(1)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
@@ -113,7 +113,7 @@
 			clocks = <&rcc STM32_CLOCK(AHB3, 19U)>,
 				<&rcc STM32_SRC_PLL1_Q OSPI_SEL(1)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
diff --git a/dts/arm/st/h7/stm32h7a3.dtsi b/dts/arm/st/h7/stm32h7a3.dtsi
index 67afdbafb3cdb..2ce9681c0b7c3 100644
--- a/dts/arm/st/h7/stm32h7a3.dtsi
+++ b/dts/arm/st/h7/stm32h7a3.dtsi
@@ -64,7 +64,7 @@
 			clocks = <&rcc STM32_CLOCK(AHB3, 14U)>,
 				<&rcc STM32_SRC_PLL1_Q OSPI_SEL(1)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
@@ -76,7 +76,7 @@
 			clocks = <&rcc STM32_CLOCK(AHB3, 19U)>,
 				<&rcc STM32_SRC_PLL1_Q OSPI_SEL(1)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
@@ -87,7 +87,8 @@
 			reg = <0x58001400 0x400>;
 			clocks = <&rcc STM32_CLOCK(APB4, 5U)>,
 				 <&rcc STM32_SRC_PLL1_Q SPI6_SEL(0)>;
-			dmas = <&dmamux2 0 12 0x20440 &dmamux2 1 11 0x20480>;
+			dmas = <&dmamux2 0 12 (STM32_DMA_PERIPH_TX | STM32_DMA_PRIORITY_HIGH)
+				&dmamux2 1 11 (STM32_DMA_PERIPH_RX | STM32_DMA_PRIORITY_HIGH)>;
 			dma-names = "tx", "rx";
 			interrupts = <86 0>;
 			status = "disabled";
diff --git a/dts/arm/st/h7rs/stm32h7rs.dtsi b/dts/arm/st/h7rs/stm32h7rs.dtsi
index 25ba574d5b1f6..e41e465c7ebfa 100644
--- a/dts/arm/st/h7rs/stm32h7rs.dtsi
+++ b/dts/arm/st/h7rs/stm32h7rs.dtsi
@@ -776,6 +776,25 @@
 			interrupts = <37 0>;
 			status = "disabled";
 		};
+
+		usbotg_fs: usb@40080000 {
+			compatible = "st,stm32-otgfs";
+			reg = <0x40080000 0x40000>;
+			interrupts = <112 0>;
+			interrupt-names = "otgfs";
+			num-bidir-endpoints = <6>;
+			ram-size = <1280>;
+			maximum-speed = "full-speed";
+			phys = <&otgfs_phy>;
+			clocks = <&rcc STM32_CLOCK(AHB1, 27U)>,
+				 <&rcc STM32_SRC_HSI48 OTGFS_SEL(0)>;
+			status = "disabled";
+		};
+	};
+
+	otgfs_phy: otgfs_phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
 	};
 
 	die_temp: dietemp {
diff --git a/dts/arm/st/l0/stm32l071X8.dtsi b/dts/arm/st/l0/stm32l071X8.dtsi
new file mode 100644
index 0000000000000..4f0fe482c0fee
--- /dev/null
+++ b/dts/arm/st/l0/stm32l071X8.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Vixay Phimmasane
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <st/l0/stm32l071.dtsi>
+
+/ {
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(20)>;
+	};
+
+	soc {
+		flash-controller@40022000 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_K(64)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/l0/stm32l071Xz.dtsi b/dts/arm/st/l0/stm32l071Xz.dtsi
new file mode 100644
index 0000000000000..78566a5d62b1d
--- /dev/null
+++ b/dts/arm/st/l0/stm32l071Xz.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Vixay Phimmasane
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <st/l0/stm32l071.dtsi>
+
+/ {
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(20)>;
+	};
+
+	soc {
+		flash-controller@40022000 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_K(192)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/l4/stm32l4.dtsi b/dts/arm/st/l4/stm32l4.dtsi
index f8f3fafd4d010..f127a5deb3127 100644
--- a/dts/arm/st/l4/stm32l4.dtsi
+++ b/dts/arm/st/l4/stm32l4.dtsi
@@ -266,7 +266,7 @@
 		quadspi: spi@a0001000 {
 			compatible = "st,stm32-qspi";
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			reg = <0xa0001000 0x400>;
 			interrupts = <71 0>;
 			clocks = <&rcc STM32_CLOCK(AHB3, 8U)>;
diff --git a/dts/arm/st/l4/stm32l4p5.dtsi b/dts/arm/st/l4/stm32l4p5.dtsi
index 64be1f15c92a8..2636de3abd5fb 100644
--- a/dts/arm/st/l4/stm32l4p5.dtsi
+++ b/dts/arm/st/l4/stm32l4p5.dtsi
@@ -373,7 +373,7 @@
 				<&rcc STM32_CLOCK(AHB2, 20U)>;
 
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
@@ -387,7 +387,7 @@
 				<&rcc STM32_CLOCK(AHB2, 20U)>;
 
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 	};
diff --git a/dts/arm/st/l4/stm32l4r5Xi.dtsi b/dts/arm/st/l4/stm32l4r5Xi.dtsi
index 5da6f035e7693..b5318d1e40d85 100644
--- a/dts/arm/st/l4/stm32l4r5Xi.dtsi
+++ b/dts/arm/st/l4/stm32l4r5Xi.dtsi
@@ -20,22 +20,22 @@
 
 &pwr {
 	wkup-pin@1 {
-		wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 
 	wkup-pin@2 {
-		wkup-gpios = <&gpioc 13 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioc 13 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 
 	wkup-pin@3 {
-		wkup-gpios = <&gpioe 6 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioe 6 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 
 	wkup-pin@4 {
-		wkup-gpios = <&gpioa 2 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioa 2 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 
 	wkup-pin@5 {
-		wkup-gpios = <&gpioc 5 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioc 5 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 };
diff --git a/dts/arm/st/l5/stm32l5.dtsi b/dts/arm/st/l5/stm32l5.dtsi
index fc4da297c194f..176a6e23e8ba9 100644
--- a/dts/arm/st/l5/stm32l5.dtsi
+++ b/dts/arm/st/l5/stm32l5.dtsi
@@ -440,7 +440,7 @@
 			clocks = <&rcc STM32_CLOCK(AHB3, 8U)>,
 					<&rcc STM32_SRC_SYSCLK OSPI_SEL(0)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
@@ -693,6 +693,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			status = "disabled";
 			clocks = <&rcc STM32_CLOCK(APB1_2, 21U)>,
 				 <&rcc STM32_SRC_HSI48 CLK48_SEL(0)>;
diff --git a/dts/arm/st/mp13/stm32mp13.dtsi b/dts/arm/st/mp13/stm32mp13.dtsi
new file mode 100644
index 0000000000000..d781890d1b5f6
--- /dev/null
+++ b/dts/arm/st/mp13/stm32mp13.dtsi
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/armv7-a.dtsi>
+
+#include <freq.h>
+#include <mem.h>
+
+#include <zephyr/dt-bindings/clock/stm32mp13_clock.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+#include <zephyr/dt-bindings/reset/stm32mp13_reset.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "arm,cortex-a7";
+			device_type = "cpu";
+			reg = <0>;
+		};
+	};
+
+	soc {
+		interrupt-parent = <&gic>;
+
+		sysram: memory@2ffe0000  {
+			compatible = "mmio-sram";
+			reg = <0x2FFE0000 DT_SIZE_K(128)>;
+		};
+
+		uart4: serial@40010000 {
+			compatible = "st,stm32-uart";
+			reg = <0x40010000 0x400>;
+			clocks = <&rcc STM32_CLOCK(APB1, 16)>;
+			resets = <&rctl STM32_RESET(APB1, 16)>;
+			interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			status = "disabled";
+		};
+
+		rcc: rcc@50000000 {
+			compatible = "st,stm32-rcc";
+			reg = <0x50000000 0x1000>;
+			#clock-cells = <2>;
+
+			rctl: reset-controller {
+				compatible = "st,stm32-rcc-rctl";
+				#reset-cells = <1>;
+				set-bit-to-deassert;
+			};
+		};
+
+		pinctrl: pin-controller@50002000 {
+			compatible = "st,stm32-pinctrl";
+			reg = <0x50002000 0x9000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			gpioa: gpio@50002000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50002000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 0)>;
+			};
+
+			gpiob: gpio@50003000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50003000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 1)>;
+			};
+
+			gpioc: gpio@50004000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50004000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 2)>;
+			};
+
+			gpiod: gpio@50005000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50005000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 3)>;
+			};
+
+			gpioe: gpio@50006000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50006000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 4)>;
+			};
+
+			gpiof: gpio@50007000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50007000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 5)>;
+			};
+
+			gpiog: gpio@50008000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50008000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 6)>;
+			};
+
+			gpioh: gpio@50009000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x50009000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 7)>;
+			};
+
+			gpioi: gpio@5000a000 {
+				compatible = "st,stm32-gpio";
+				reg = <0x5000a000 0x400>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				clocks = <&rcc STM32_CLOCK(AHB4, 8)>;
+			};
+		};
+
+		exti: interrupt-controller@5000d000 {
+			compatible =  "st,stm32g0-exti","st,stm32-exti";
+			interrupt-controller;
+			#interrupt-cells = <1>;
+			#address-cells = <1>;
+			reg = <0x5000D000 0x400>;
+			num-lines = <16>;
+			interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 7 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 8 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 9 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 24 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 65 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 66 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 67 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 68 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 41 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 43 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 77 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 78 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 106 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				     <GIC_SPI 109 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "line0", "line1", "line2", "line3",
+					  "line4", "line5", "line6", "line7",
+					  "line8", "line9", "line10", "line11",
+					  "line12", "line13", "line14", "line15";
+			line-ranges = <0 1>, <1 1>, <2 1>, <3 1>,
+				      <4 1>, <5 1>, <6 1>, <7 1>,
+				      <8 1>, <9 1>, <10 1>, <11 1>,
+				      <12 1>, <13 1>, <14 1>, <15 1>;
+		};
+	};
+
+	gic: gic@A0021000 {
+		compatible = "arm,gic-v2", "arm,gic";
+		reg = <0xA0021000 0x1000>,
+		      <0xA0022000 0x2000>;
+		interrupt-controller;
+		#interrupt-cells = <4>;
+		status = "okay";
+	};
+
+	ddr_code: memory@C0000000 {
+		compatible = "mmio-sram";
+		reg = <0xC0000000 0x10000000>;
+	};
+
+	ddr_data: memory@D0000000 {
+		compatible = "mmio-sram";
+		reg = <0xD0000000 0x10000000>;
+	};
+
+	clocks {
+
+		clk_hse: clk-hse {
+			#clock-cells = <0>;
+			compatible = "fixed-clock";
+			status = "disabled";
+		};
+
+		clk_hsi: clk-hsi {
+			#clock-cells = <0>;
+			compatible = "fixed-clock";
+			status = "disabled";
+		};
+
+		cpusw: cpusw {
+			#clock-cells = <0>;
+			compatible = "st,stm32mp13-cpu-clock-mux";
+			status = "disabled";
+		};
+
+		pll1: pll: pll {
+			#clock-cells = <0>;
+			compatible = "st,stm32mp13-pll-clock";
+			status = "disabled";
+		};
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupt-parent = <&gic>;
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+	};
+};
diff --git a/dts/arm/st/mp13/stm32mp135.dtsi b/dts/arm/st/mp13/stm32mp135.dtsi
new file mode 100644
index 0000000000000..4b754a69d583b
--- /dev/null
+++ b/dts/arm/st/mp13/stm32mp135.dtsi
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <st/mp13/stm32mp13.dtsi>
+
+/ {
+	soc {
+		compatible = "st,stm32mp135", "st,stm32mp13", "simple-bus";
+	};
+};
diff --git a/dts/arm/st/n6/stm32n6.dtsi b/dts/arm/st/n6/stm32n6.dtsi
index 6a269a61a6aa0..71603b8a1268c 100644
--- a/dts/arm/st/n6/stm32n6.dtsi
+++ b/dts/arm/st/n6/stm32n6.dtsi
@@ -5,9 +5,14 @@
  */
 
 #include <arm/armv8.1-m.dtsi>
+#include <zephyr/dt-bindings/adc/adc.h>
+#include <zephyr/dt-bindings/adc/stm32l4_adc.h>
 #include <zephyr/dt-bindings/clock/stm32n6_clock.h>
 #include <zephyr/dt-bindings/dma/stm32_dma.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/reset/stm32n6_reset.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
 #include <zephyr/dt-bindings/memory-controller/stm32-fmc-nor-psram.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <freq.h>
@@ -362,6 +367,71 @@
 			};
 		};
 
+		adc1: adc@50022000 {
+			compatible = "st,stm32n6-adc", "st,stm32-adc";
+			reg = <0x50022000 0x400>;
+			clocks = <&rcc STM32_CLOCK(AHB1, 5)>;
+			interrupts = <46 0>;
+			status = "disabled";
+			#io-channel-cells = <1>;
+			resolutions = <STM32_ADC_RES(12, 0x00)
+				       STM32_ADC_RES(10, 0x01)
+				       STM32_ADC_RES(8, 0x02)
+				       STM32_ADC_RES(6, 0x03)>;
+			sampling-times = <2 3 7 12 14 47 247 1500>;
+			st,adc-sequencer = "FULLY_CONFIGURABLE";
+			st,adc-oversampler = "OVERSAMPLER_EXTENDED";
+		};
+
+		adc2: adc@50022100 {
+			compatible = "st,stm32n6-adc", "st,stm32-adc";
+			reg = <0x50022100 0x300>;
+			clocks = <&rcc STM32_CLOCK(AHB1, 5)>;
+			interrupts = <46 0>;
+			status = "disabled";
+			#io-channel-cells = <1>;
+			resolutions = <STM32_ADC_RES(12, 0x00)
+				       STM32_ADC_RES(10, 0x01)
+				       STM32_ADC_RES(8, 0x02)
+				       STM32_ADC_RES(6, 0x03)>;
+			sampling-times = <2 3 7 12 14 47 247 1500>;
+			st,adc-sequencer = "FULLY_CONFIGURABLE";
+			st,adc-oversampler = "OVERSAMPLER_EXTENDED";
+		};
+
+		fdcan1: can@5000a000 {
+			compatible = "st,stm32h7-fdcan";
+			reg = <0x5000A000 0x400>, <0x5000C000 0xd54>;
+			reg-names = "m_can", "message_ram";
+			clocks = <&rcc STM32_CLOCK(APB1_2, 8)>;
+			interrupts = <180 0>, <181 0>, <186 0>;
+			interrupt-names = "int0", "int1", "calib";
+			bosch,mram-cfg = <0x0 28 8 3 3 0 3 3>;
+			status = "disabled";
+		};
+
+		fdcan2: can@5000a400 {
+			compatible = "st,stm32h7-fdcan";
+			reg = <0x5000A400 0x400>, <0x5000C000 0x1aa8>;
+			reg-names = "m_can", "message_ram";
+			clocks = <&rcc STM32_CLOCK(APB1_2, 8)>;
+			interrupts = <182 0>, <183 0>;
+			interrupt-names = "int0", "int1";
+			bosch,mram-cfg = <0xd54 28 8 3 3 0 3 3>;
+			status = "disabled";
+		};
+
+		fdcan3: can@5000e800 {
+			compatible = "st,stm32h7-fdcan";
+			reg = <0x5000E800 0x400>, <0x5000C000 0x2800>;
+			reg-names = "m_can", "message_ram";
+			clocks = <&rcc STM32_CLOCK(APB1_2, 8)>;
+			interrupts = <184 0>, <185 0>;
+			interrupt-names = "int0", "int1";
+			bosch,mram-cfg = <0x1aa8 28 8 3 3 0 3 3>;
+			status = "disabled";
+		};
+
 		usart1: serial@52001000 {
 			compatible = "st,stm32-usart", "st,stm32-uart";
 			reg = <0x52001000 0x400>;
@@ -452,6 +522,114 @@
 			status = "disabled";
 		};
 
+		i2c1: i2c@50005400 {
+			compatible = "st,stm32-i2c-v2";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x50005400 0x400>;
+			clocks = <&rcc STM32_CLOCK(APB1, 21)>;
+			interrupts = <100 0>, <101 0>;
+			interrupt-names = "event", "error";
+			status = "disabled";
+		};
+
+		i2c2: i2c@50005800 {
+			compatible = "st,stm32-i2c-v2";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x50005800 0x400>;
+			clocks = <&rcc STM32_CLOCK(APB1, 22)>;
+			interrupts = <102 0>, <103 0>;
+			interrupt-names = "event", "error";
+			status = "disabled";
+		};
+
+		i2c3: i2c@50005c00 {
+			compatible = "st,stm32-i2c-v2";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x50005C00 0x400>;
+			clocks = <&rcc STM32_CLOCK(APB1, 23)>;
+			interrupts = <104 0>, <105 0>;
+			interrupt-names = "event", "error";
+			status = "disabled";
+		};
+
+		i2c4: i2c@56001c00 {
+			compatible = "st,stm32-i2c-v2";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x56001C00 0x400>;
+			clocks = <&rcc STM32_CLOCK(APB4, 7)>;
+			interrupts = <106 0>, <107 0>;
+			interrupt-names = "event", "error";
+			status = "disabled";
+		};
+
+		spi1: spi@52003000 {
+			compatible = "st,stm32h7-spi", "st,stm32-spi-fifo", "st,stm32-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x52003000 0x400>;
+			interrupts = <153 0>;
+			clocks = <&rcc STM32_CLOCK(APB2, 12)>;
+			status = "disabled";
+		};
+
+		spi2: spi@50003800 {
+			compatible = "st,stm32h7-spi", "st,stm32-spi-fifo", "st,stm32-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x50003800 0x400>;
+			interrupts = <154 0>;
+			clocks = <&rcc STM32_CLOCK(APB1, 14)>;
+			status = "disabled";
+		};
+
+		spi3: spi@50003c00 {
+			compatible = "st,stm32h7-spi", "st,stm32-spi-fifo", "st,stm32-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x50003C00 0x400>;
+			interrupts = <155 0>;
+			clocks = <&rcc STM32_CLOCK(APB1, 15)>;
+			status = "disabled";
+		};
+
+		spi4: spi@52003400 {
+			compatible = "st,stm32h7-spi", "st,stm32-spi-fifo", "st,stm32-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x52003400 0x400>;
+			interrupts = <156 0>;
+			clocks = <&rcc STM32_CLOCK(APB2, 13)>;
+			status = "disabled";
+		};
+
+		spi5: spi@52005000 {
+			compatible = "st,stm32h7-spi", "st,stm32-spi-fifo", "st,stm32-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x52005000 0x400>;
+			interrupts = <157 0>;
+			clocks = <&rcc STM32_CLOCK(APB2, 20)>;
+			status = "disabled";
+		};
+
+		spi6: spi@56001400 {
+			compatible = "st,stm32h7-spi", "st,stm32-spi-fifo", "st,stm32-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x56001400 0x400>;
+			interrupts = <158 0>;
+			clocks = <&rcc STM32_CLOCK(APB4, 5)>;
+			status = "disabled";
+		};
+
 		gpdma1: dma@50021000 {
 			compatible = "st,stm32u5-dma";
 			#dma-cells = <3>;
@@ -464,6 +642,95 @@
 			dma-offset = <0>;
 			status = "disabled";
 		};
+
+		ethernet@58036000 {
+			reg = <0x58036000 0x8000>;
+			compatible = "st,stm32-ethernet-controller";
+			clock-names = "stm-eth";
+			clocks = <&rcc STM32_CLOCK(AHB5, 22)>;
+
+			mac: ethernet {
+				compatible = "st,stm32n6-ethernet", "st,stm32h7-ethernet",
+					"st,stm32-ethernet";
+				interrupts = <179 0>;
+				clock-names = "mac-clk-tx", "mac-clk-rx";
+				clocks = <&rcc STM32_CLOCK(AHB5, 23)>,
+					 <&rcc STM32_CLOCK(AHB5, 24)>;
+				status = "disabled";
+			};
+
+			mdio: mdio {
+				compatible = "st,stm32-mdio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+			};
+		};
+
+		sdmmc1: sdmmc@58027000 {
+			compatible = "st,stm32-sdmmc";
+			reg = <0x58027000 0x1000>;
+			clocks = <&rcc STM32_CLOCK(AHB5, 8)>;
+			resets = <&rctl STM32_RESET(AHB5, 8)>;
+			interrupts = <174 0>;
+			status = "disabled";
+		};
+
+		sdmmc2: sdmmc@58026800 {
+			compatible = "st,stm32-sdmmc";
+			reg = <0x58026800 0x400>;
+			clocks = <&rcc STM32_CLOCK(AHB5, 7)>;
+			resets = <&rctl STM32_RESET(AHB5, 7)>;
+			interrupts = <175 0>;
+			status = "disabled";
+		};
+
+		xspi1: xspi@58025000 {
+			compatible = "st,stm32-xspi";
+			reg = <0x58025000 0x1000>;
+			interrupts = <170 0>;
+			clock-names = "xspix", "xspi-ker", "xspi-mgr";
+			clocks = <&rcc STM32_CLOCK(AHB5, 5)>,
+				 <&rcc STM32_SRC_CKPER XSPI1_SEL(1)>,
+				 <&rcc STM32_CLOCK(AHB5, 13)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			status = "disabled";
+		};
+
+		xspi2: spi@5802a000 {
+			compatible = "st,stm32-xspi";
+			reg = <0x5802A000 0x1000>;
+			interrupts = <171 0>;
+			clock-names = "xspix", "xspi-ker", "xspi-mgr";
+			clocks = <&rcc STM32_CLOCK(AHB5, 12)>,
+				 <&rcc STM32_SRC_CKPER XSPI2_SEL(1)>,
+				 <&rcc STM32_CLOCK(AHB5, 13)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			status = "disabled";
+		};
+
+		usbotg_hs1: otghs@58040000 {
+			compatible = "st,stm32n6-otghs", "st,stm32-otghs";
+			reg = <0x58040000 0x2000>;
+			interrupts = <177 0>;
+			interrupt-names = "otghs";
+			num-bidir-endpoints = <9>;
+			ram-size = <4096>;
+			maximum-speed = "high-speed";
+			clocks = <&rcc STM32_CLOCK(AHB5, 26)>,
+				 <&rcc STM32_SRC_HSE OTGPHY1CKREF_SEL(1)>;
+			phys = <&usbphyc1>;
+			status = "disabled";
+		};
+
+		usbphyc1: usbphyc@5803fc00 {
+			compatible = "st,stm32-usbphyc";
+			reg = <0x5803FC00 0x400>;
+			clocks = <&rcc STM32_CLOCK(AHB5, 27)>;
+			#phy-cells = <0>;
+		};
 	};
 };
 
diff --git a/dts/arm/st/u0/stm32u0.dtsi b/dts/arm/st/u0/stm32u0.dtsi
index 4d0b1e871280b..612747dfc4cad 100644
--- a/dts/arm/st/u0/stm32u0.dtsi
+++ b/dts/arm/st/u0/stm32u0.dtsi
@@ -550,6 +550,15 @@
 			reg = <0x40009400 0x400>;
 			interrupts = <18 1>;
 			interrupt-names = "combined";
+		};
+
+		tsc: tsc@40024000 {
+			compatible = "st,stm32-tsc";
+			reg = <0x40024000 0x400>;
+			clocks = <&rcc STM32_CLOCK(AHB1, 24U)>;
+			resets = <&rctl STM32_RESET(AHB1, 24U)>;
+			interrupts = <21 0>;
+			interrupt-names = "global";
 			status = "disabled";
 		};
 	};
diff --git a/dts/arm/st/u0/stm32u073.dtsi b/dts/arm/st/u0/stm32u073.dtsi
index 5e6388f8a7d26..52d53239acc56 100644
--- a/dts/arm/st/u0/stm32u073.dtsi
+++ b/dts/arm/st/u0/stm32u073.dtsi
@@ -55,6 +55,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 13U)>;
 			status = "disabled";
diff --git a/dts/arm/st/u5/stm32u5.dtsi b/dts/arm/st/u5/stm32u5.dtsi
index 6c3260e1fb408..da2d4eceb64c8 100644
--- a/dts/arm/st/u5/stm32u5.dtsi
+++ b/dts/arm/st/u5/stm32u5.dtsi
@@ -304,7 +304,7 @@
 			compatible = "zephyr,memory-region", "st,stm32-backup-sram";
 			reg = <0x40036400 DT_SIZE_K(2)>;
 			/* BKPSRAMEN and RAMCFGEN clock enable */
-			clocks = <&rcc STM32_CLOCK(AHB1, 28U)>;
+			clocks = <&rcc STM32_CLOCK_BUS_AHB1 ((1 << 28) | (1 << 17))>;
 			zephyr,memory-region = "BACKUP_SRAM";
 			status = "disabled";
 		};
@@ -705,7 +705,7 @@
 				<&rcc STM32_SRC_SYSCLK OCTOSPI_SEL(0)>,
 				<&rcc STM32_CLOCK(AHB2, 21U)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
@@ -718,7 +718,7 @@
 				<&rcc STM32_SRC_SYSCLK OCTOSPI_SEL(0)>,
 				<&rcc STM32_CLOCK(AHB2, 21U)>;
 			#address-cells = <1>;
-			#size-cells = <0>;
+			#size-cells = <1>;
 			status = "disabled";
 		};
 
@@ -876,58 +876,58 @@
 
 			wkup-pin@1 {
 				reg = <0x1>;
-				wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpiob 2 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpioe 4 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpiob 2 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpioe 4 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 
 			wkup-pin@2 {
 				reg = <0x2>;
-				wkup-gpios = <&gpioa 4 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpioc 13 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpioe 5 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpioa 4 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpioc 13 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpioe 5 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 
 			wkup-pin@3 {
 				reg = <0x3>;
-				wkup-gpios = <&gpioe 6 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpioa 1 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpiob 6 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpioe 6 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpioa 1 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpiob 6 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 
 			wkup-pin@4 {
 				reg = <0x4>;
-				wkup-gpios = <&gpioa 2 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpiob 1 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpiob 7 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpioa 2 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpiob 1 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpiob 7 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 
 			wkup-pin@5 {
 				reg = <0x5>;
-				wkup-gpios = <&gpioc 5 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpioa 3 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpiob 8 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpioc 5 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpioa 3 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpiob 8 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 
 			wkup-pin@6 {
 				reg = <0x6>;
-				wkup-gpios = <&gpiob 5 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpioa 5 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpioe 7 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpiob 5 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpioa 5 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpioe 7 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 
 			wkup-pin@7 {
 				reg = <0x7>;
-				wkup-gpios = <&gpiob 15 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpioa 6 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpioe 8 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpiob 15 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpioa 6 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpioe 8 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 
 			wkup-pin@8 {
 				reg = <0x8>;
-				wkup-gpios = <&gpiof 2 STM32_PWR_WKUP_PIN_SRC_0>,
-					     <&gpioa 7 STM32_PWR_WKUP_PIN_SRC_1>,
-					     <&gpiob 10 STM32_PWR_WKUP_PIN_SRC_2>;
+				wkup-gpios = <&gpiof 2 STM32_PWR_WKUP_EVT_SRC_0>,
+					     <&gpioa 7 STM32_PWR_WKUP_EVT_SRC_1>,
+					     <&gpiob 10 STM32_PWR_WKUP_EVT_SRC_2>;
 			};
 		};
 
diff --git a/dts/arm/st/u5/stm32u545.dtsi b/dts/arm/st/u5/stm32u545.dtsi
index b7c7b6c0c646f..c034e6a2727b8 100644
--- a/dts/arm/st/u5/stm32u545.dtsi
+++ b/dts/arm/st/u5/stm32u545.dtsi
@@ -21,6 +21,7 @@
 			interrupt-names = "usb";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			status = "disabled";
 			clocks = <&rcc STM32_CLOCK(APB2, 24U)>,
 				 <&rcc STM32_SRC_HSI48 ICKLK_SEL(0)>;
diff --git a/dts/arm/st/u5/stm32u595.dtsi b/dts/arm/st/u5/stm32u595.dtsi
index 5ca3f66d7d5be..f3fc998596706 100644
--- a/dts/arm/st/u5/stm32u595.dtsi
+++ b/dts/arm/st/u5/stm32u595.dtsi
@@ -108,7 +108,7 @@
 			num-bidir-endpoints = <9>;
 			ram-size = <4096>;
 			maximum-speed = "high-speed";
-			clocks = <&rcc STM32_CLOCK(AHB2, 14U)>;
+			clocks = <&rcc STM32_CLOCK(AHB2, 14)>;
 			phys = <&otghs_phy>;
 			status = "disabled";
 		};
diff --git a/dts/arm/st/u5/stm32u5g9.dtsi b/dts/arm/st/u5/stm32u5g9.dtsi
new file mode 100644
index 0000000000000..f9eadbb65e0cd
--- /dev/null
+++ b/dts/arm/st/u5/stm32u5g9.dtsi
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Charles Dias
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <st/u5/stm32u595.dtsi>
+
+/ {
+	soc {
+		compatible = "st,stm32u5g9", "st,stm32u5", "simple-bus";
+	};
+};
diff --git a/dts/arm/st/u5/stm32u5g9Xj.dtsi b/dts/arm/st/u5/stm32u5g9Xj.dtsi
new file mode 100644
index 0000000000000..10e4793f9d115
--- /dev/null
+++ b/dts/arm/st/u5/stm32u5g9Xj.dtsi
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 Charles Dias
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <st/u5/stm32u5g9.dtsi>
+
+/ {
+	sram0: memory@20000000 {
+		/* SRAM1 + SRAM2 + SRAM3 + SRAM5 + SRAM6 */
+		/* 768K + 64K + 832K + 832K + 512 */
+		reg = <0x20000000 DT_SIZE_K(3008)>;
+	};
+
+	sram4: memory@28000000 {
+		/* SRAM4, low-power background autonomous mode */
+		reg = <0x28000000 DT_SIZE_K(16)>;
+	};
+
+	soc {
+		flash-controller@40022000 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_M(4)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/wb/stm32wb.dtsi b/dts/arm/st/wb/stm32wb.dtsi
index b0a51d6be4619..a9652addf3f1c 100644
--- a/dts/arm/st/wb/stm32wb.dtsi
+++ b/dts/arm/st/wb/stm32wb.dtsi
@@ -487,6 +487,7 @@
 			interrupt-names = "usb", "usbhp";
 			num-bidir-endpoints = <8>;
 			ram-size = <1024>;
+			maximum-speed = "full-speed";
 			phys = <&usb_fs_phy>;
 			clocks = <&rcc STM32_CLOCK(APB1, 26U)>,
 				 <&rcc STM32_SRC_HSI48 CLK48_SEL(0)>;
@@ -496,7 +497,7 @@
 		quadspi: spi@a0001000 {
 			compatible = "st,stm32-qspi";
 			#address-cells = <0x1>;
-			#size-cells = <0x0>;
+			#size-cells = <0x1>;
 			reg = <0xa0001000 0x400>;
 			interrupts = <0x32 0x0>;
 			clocks = <&rcc STM32_CLOCK(AHB3, 8U)>;
@@ -534,12 +535,12 @@
 
 			wkup-pin@1 {
 				reg = <0x1>;
-				wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_SRC_0>;
+				wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 			};
 
 			wkup-pin@4 {
 				reg = <0x4>;
-				wkup-gpios = <&gpioa 2 STM32_PWR_WKUP_PIN_SRC_0>;
+				wkup-gpios = <&gpioa 2 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 			};
 		};
 	};
diff --git a/dts/arm/st/wb/stm32wb55Xg.dtsi b/dts/arm/st/wb/stm32wb55Xg.dtsi
index c3a7d391e7752..0e4a2220038cf 100644
--- a/dts/arm/st/wb/stm32wb55Xg.dtsi
+++ b/dts/arm/st/wb/stm32wb55Xg.dtsi
@@ -24,16 +24,16 @@
 &pwr {
 	wkup-pin@2 {
 		reg = <0x2>;
-		wkup-gpios = <&gpioc 13 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioc 13 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 
 	wkup-pin@3 {
 		reg = <0x3>;
-		wkup-gpios = <&gpioc 12 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioc 12 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 
 	wkup-pin@5 {
 		reg = <0x5>;
-		wkup-gpios = <&gpioc 5 STM32_PWR_WKUP_PIN_SRC_0>;
+		wkup-gpios = <&gpioc 5 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 	};
 };
diff --git a/dts/arm/st/wb0/stm32wb0.dtsi b/dts/arm/st/wb0/stm32wb0.dtsi
index e9ff28aa22ec5..0900f8f02a0fd 100644
--- a/dts/arm/st/wb0/stm32wb0.dtsi
+++ b/dts/arm/st/wb0/stm32wb0.dtsi
@@ -178,6 +178,14 @@
 			};
 		};
 
+		rtc: rtc@40004000 {
+			compatible = "st,stm32-rtc";
+			reg = <0x40004000 DT_SIZE_K(1)>;
+			interrupts = <11 0>;
+			clocks = <&rcc STM32_CLOCK(APB0, 12)>;
+			status = "disabled";
+		};
+
 		usart1: serial@41004000 {
 			compatible = "st,stm32-usart", "st,stm32-uart";
 			reg = <0x41004000 DT_SIZE_K(1)>;
@@ -275,6 +283,13 @@
 			generation-delay-ns = <1250>; /* 1.25us */
 			status = "disabled";
 		};
+
+		iwdg: watchdog@40003000 {
+			compatible = "st,stm32-watchdog";
+			reg = <0x40003000 DT_SIZE_K(1)>;
+			clocks = <&rcc STM32_CLOCK(APB0, 14)>;
+			status = "disabled";
+		};
 	};
 
 	bt_hci_wb0: bt_hci_wb0 {
diff --git a/dts/arm/st/wba/stm32wba.dtsi b/dts/arm/st/wba/stm32wba.dtsi
index 713c913da5e21..5385e7f7ff579 100644
--- a/dts/arm/st/wba/stm32wba.dtsi
+++ b/dts/arm/st/wba/stm32wba.dtsi
@@ -118,6 +118,13 @@
 		};
 	};
 
+	mcos {
+		mco1: mco1 {
+			compatible = "st,stm32-clock-mco";
+			status = "disabled";
+		};
+	};
+
 	soc {
 		flash: flash-controller@40022000 {
 			compatible = "st,stm32-flash-controller", "st,stm32wba-flash-controller";
@@ -495,7 +502,7 @@
 		compatible = "swj-connector";
 		pinctrl-0 = <&debug_jtms_swdio_pa13 &debug_jtck_swclk_pa14
 			     &debug_jtdi_pa15 &debug_jtdo_swo_pb3
-			     &debug_jtrst_pb4>;
+			     &debug_njtrst_pb4>;
 		pinctrl-1 = <&analog_pa13 &analog_pa14 &analog_pa15
 			     &analog_pb3 &analog_pb4>;
 		pinctrl-names = "default", "sleep";
diff --git a/dts/arm/st/wba/stm32wba65.dtsi b/dts/arm/st/wba/stm32wba65.dtsi
new file mode 100644
index 0000000000000..6f6e0eaa14f4e
--- /dev/null
+++ b/dts/arm/st/wba/stm32wba65.dtsi
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <st/wba/stm32wba55.dtsi>
+
+/ {
+	soc {
+		compatible = "st,stm32wba65", "st,stm32wba", "simple-bus";
+
+		pinctrl: pin-controller@42020000 {
+			gpiod: gpio@42020c00 {
+				compatible = "st,stm32-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x42020c00 0x400>;
+				clocks = <&rcc STM32_CLOCK(AHB2, 3)>;
+			};
+
+			gpioe: gpio@42021000 {
+				compatible = "st,stm32-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				reg = <0x42021000 0x400>;
+				clocks = <&rcc STM32_CLOCK(AHB2, 4)>;
+			};
+
+			gpiog: gpio@42021800 {
+				compatible = "st,stm32-gpio";
+				gpio-controller;
+				#gpio-cells = <2>;
+				/* GPIOG has an independent IO supply VDDIO2 */
+				reg = <0x42021800 0x400>;
+				clocks = <&rcc STM32_CLOCK(AHB2, 6)>;
+			};
+		};
+
+		usart3: serial@40004800 {
+			compatible = "st,stm32-usart", "st,stm32-uart";
+			reg = <0x40004800 0x400>;
+			clocks = <&rcc STM32_CLOCK(APB1, 18)>;
+			resets = <&rctl STM32_RESET(APB1L, 18U)>;
+			interrupts = <79 0>;
+			status = "disabled";
+		};
+
+		spi2: spi@40003800 {
+			compatible = "st,stm32h7-spi", "st,stm32-spi-fifo", "st,stm32-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40003800 0x400>;
+			interrupts = <75 5>;
+			clocks = <&rcc STM32_CLOCK(APB1, 14)>;
+			status = "disabled";
+		};
+
+		timers4: timers@40000800 {
+			compatible = "st,stm32-timers";
+			reg = <0x40000800 0x400>;
+			clocks = <&rcc STM32_CLOCK(APB1, 2)>;
+			resets = <&rctl STM32_RESET(APB1L, 2U)>;
+			interrupts = <72 0>;
+			interrupt-names = "global";
+			st,prescaler = <0>;
+			status = "disabled";
+
+			counter {
+				compatible = "st,stm32-counter";
+				status = "disabled";
+			};
+
+			pwm {
+				compatible = "st,stm32-pwm";
+				status = "disabled";
+				#pwm-cells = <3>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/wba/stm32wba65Xi.dtsi b/dts/arm/st/wba/stm32wba65Xi.dtsi
new file mode 100644
index 0000000000000..422ae59aa3bdd
--- /dev/null
+++ b/dts/arm/st/wba/stm32wba65Xi.dtsi
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <mem.h>
+#include <st/wba/stm32wba65.dtsi>
+
+/ {
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(448)>;
+	};
+
+	sram1: memory@20070000 {
+		compatible = "mmio-sram";
+		reg = <0x20070000 DT_SIZE_K(64)>;
+	};
+
+	soc {
+		flash-controller@40022000 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_M(2)>;
+			};
+		};
+	};
+};
diff --git a/dts/arm/st/wl/stm32wl.dtsi b/dts/arm/st/wl/stm32wl.dtsi
index 6c0e71876f3a4..3c7c477c47254 100644
--- a/dts/arm/st/wl/stm32wl.dtsi
+++ b/dts/arm/st/wl/stm32wl.dtsi
@@ -106,6 +106,13 @@
 		};
 	};
 
+	mcos {
+		mco1: mco1 {
+			compatible = "st,stm32-clock-mco";
+			status = "disabled";
+		};
+	};
+
 	soc {
 		flash: flash-controller@58004000 {
 			compatible = "st,stm32-flash-controller", "st,stm32l4-flash-controller";
@@ -516,17 +523,17 @@
 
 			wkup-pin@1 {
 				reg = <0x1>;
-				wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_SRC_0>;
+				wkup-gpios = <&gpioa 0 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 			};
 
 			wkup-pin@2 {
 				reg = <0x2>;
-				wkup-gpios = <&gpioc 13 STM32_PWR_WKUP_PIN_SRC_0>;
+				wkup-gpios = <&gpioc 13 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 			};
 
 			wkup-pin@3 {
 				reg = <0x3>;
-				wkup-gpios = <&gpiob 3 STM32_PWR_WKUP_PIN_SRC_0>;
+				wkup-gpios = <&gpiob 3 STM32_PWR_WKUP_PIN_NOT_MUXED>;
 			};
 		};
 	};
diff --git a/dts/arm/ti/am62x_m4.dtsi b/dts/arm/ti/am62x_m4.dtsi
index 80fb438acd6e2..1d43602463d5c 100644
--- a/dts/arm/ti/am62x_m4.dtsi
+++ b/dts/arm/ti/am62x_m4.dtsi
@@ -9,6 +9,7 @@
 #include <arm/armv7-m.dtsi>
 #include <zephyr/dt-bindings/pinctrl/ti-k3-pinctrl.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
 
 / {
 
@@ -39,7 +40,7 @@
 		#clock-cells = <0>;
 	};
 
-	mbox0: mailbox0@29000000 {
+	mbox0: mailbox@29000000 {
 		compatible = "ti,omap-mailbox";
 		reg = <0x29000000 0x200>;
 		interrupts = <50 4>;
@@ -65,6 +66,16 @@
 		status = "disabled";
 	};
 
+	i2c0: i2c@4900000 {
+		compatible = "ti,omap-i2c";
+		reg = <0x04900000 0x100>;
+		interrupts = <17 4>;
+		interrupt-parent = <&nvic>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	gpio0: gpio@4201010 {
 		compatible = "ti,davinci-gpio";
 		reg = <0x4201010 0x100>;
diff --git a/dts/arm/ti/am64x_m4.dtsi b/dts/arm/ti/am64x_m4.dtsi
index d95fe49a90e17..b7e040ef76da5 100644
--- a/dts/arm/ti/am64x_m4.dtsi
+++ b/dts/arm/ti/am64x_m4.dtsi
@@ -9,6 +9,7 @@
 #include <arm/armv7-m.dtsi>
 #include <zephyr/dt-bindings/pinctrl/ti-k3-pinctrl.h>
 #include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
 
 / {
 
@@ -39,6 +40,15 @@
 		#clock-cells = <0>;
 	};
 
+	mbox6: mailbox@29060000 {
+		compatible = "ti,omap-mailbox";
+		reg = <0x29060000 0x200>;
+		interrupts = <56 4>;
+		interrupt-parent = <&nvic>;
+		usr-id = <3>;
+		#mbox-cells = <1>;
+	};
+
 	pinctrl: pinctrl@4084000 {
 		compatible = "ti,k3-pinctrl";
 		reg = <0x04084000 0x88>;
@@ -67,6 +77,26 @@
 		status = "disabled";
 	};
 
+	i2c0: i2c@4900000 {
+		compatible = "ti,omap-i2c";
+		reg = <0x04900000 0x100>;
+		interrupts = <17 4>;
+		interrupt-parent = <&nvic>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
+	i2c1: i2c@4910000 {
+		compatible = "ti,omap-i2c";
+		reg = <0x04910000 0x100>;
+		interrupts = <18 4>;
+		interrupt-parent = <&nvic>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	gpio0: gpio@4201010 {
 		compatible = "ti,davinci-gpio";
 		reg = <0x4201010 0x100>;
diff --git a/dts/arm/ti/cc23x0.dtsi b/dts/arm/ti/cc23x0.dtsi
index 6b307980ce3e7..ec2e773ec0d72 100644
--- a/dts/arm/ti/cc23x0.dtsi
+++ b/dts/arm/ti/cc23x0.dtsi
@@ -79,6 +79,30 @@
 			clocks = <&sysclk>;
 			status = "disabled";
 		};
+
+		aes: aes@400c0000 {
+			compatible = "ti,cc23x0-aes";
+			reg = <0x400c0000 0x120>;
+			interrupts = <9 0>;
+			status = "disabled";
+		};
+
+		dma: dma@40026000 {
+			compatible = "ti,cc23x0-dma";
+			reg = <0x40026000 0x524>;
+			interrupts = <8 0>;
+			#dma-cells = <2>;
+			status = "disabled";
+		};
+
+		spi0: spi@40030000 {
+			compatible = "ti,cc23x0-spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40030000 0x164>;
+			interrupts = <10 0>;
+			status = "disabled";
+		};
 	};
 };
 
diff --git a/dts/arm/xilinx/versalnet_r52.dtsi b/dts/arm/xilinx/versalnet_r52.dtsi
new file mode 100644
index 0000000000000..d4a9643478164
--- /dev/null
+++ b/dts/arm/xilinx/versalnet_r52.dtsi
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <mem.h>
+#include <arm/armv8-r.dtsi>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+#include <amd/versalnet.dtsi>
+
+/ {
+	model = "Versal NET RPU";
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-r52";
+			reg = <0>;
+		};
+	};
+
+	arch_timer: timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-parent = <&gic>;
+		status = "okay";
+	};
+};
+
+&soc {
+	interrupt-parent = <&gic>;
+
+	gic: interrupt-controller@e2000000 {
+		compatible = "arm,gic-v3", "arm,gic";
+		reg = <0xe2000000 0x10000>,
+					<0xe2100000 0x80000>;
+		interrupt-controller;
+		#interrupt-cells = <4>;
+		status = "okay";
+	};
+};
diff --git a/dts/arm/xilinx/zynqmp.dtsi b/dts/arm/xilinx/zynqmp.dtsi
index 65abc45054357..ecadbdfda532c 100644
--- a/dts/arm/xilinx/zynqmp.dtsi
+++ b/dts/arm/xilinx/zynqmp.dtsi
@@ -274,6 +274,28 @@
 				status = "okay";
 			};
 		};
+
+		i2c0: i2c@ff020000 {
+			compatible = "cdns,i2c";
+			reg = <0xff020000 0x1000>;
+			status = "disabled";
+			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL
+					IRQ_DEFAULT_PRIORITY>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			fifo-depth = <16>;
+		};
+
+		i2c1: i2c@ff030000 {
+			compatible = "cdns,i2c";
+			reg = <0xff030000 0x1000>;
+			status = "disabled";
+			interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL
+					IRQ_DEFAULT_PRIORITY>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			fifo-depth = <16>;
+		};
 	};
 
 };
diff --git a/dts/arm64/nxp/nxp_mimx95_a55.dtsi b/dts/arm64/nxp/nxp_mimx95_a55.dtsi
index a5edbd0f87e0a..e10622fac8d52 100644
--- a/dts/arm64/nxp/nxp_mimx95_a55.dtsi
+++ b/dts/arm64/nxp/nxp_mimx95_a55.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,6 +7,7 @@
 #include <mem.h>
 #include <freq.h>
 #include <arm64/armv8-a.dtsi>
+#include <dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/clock/imx95_clock.h>
 #include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
 
@@ -115,6 +116,102 @@
 		};
 	};
 
+	lpi2c1: i2c@44340000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x44340000 0x4000>;
+		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C1>;
+		status = "disabled";
+	};
+
+	lpi2c2: i2c@44350000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x44350000 0x4000>;
+		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C2>;
+		status = "disabled";
+	};
+
+	lpi2c3: i2c@42530000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x42530000 0x4000>;
+		interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C3>;
+		status = "disabled";
+	};
+
+	lpi2c4: i2c@42540000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x42540000 0x4000>;
+		interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C4>;
+		status = "disabled";
+	};
+
+	lpi2c5: i2c@426b0000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x426b0000 0x4000>;
+		interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C5>;
+		status = "disabled";
+	};
+
+	lpi2c6: i2c@426c0000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x426c0000 0x4000>;
+		interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C6>;
+		status = "disabled";
+	};
+
+	lpi2c7: i2c@426d0000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x426d0000 0x4000>;
+		interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C7>;
+		status = "disabled";
+	};
+
+	lpi2c8: i2c@426e0000 {
+		compatible = "nxp,lpi2c";
+		clock-frequency = <I2C_BITRATE_STANDARD>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x426e0000 0x4000>;
+		interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-names = "irq_0";
+		clocks = <&scmi_clk IMX95_CLK_LPI2C8>;
+		status = "disabled";
+	};
+
 	lpuart3: serial@42570000 {
 		compatible = "nxp,imx-lpuart", "nxp,lpuart";
 		reg = <0x42570000 DT_SIZE_K(64)>;
diff --git a/dts/arm64/renesas/rz/rza/r9a07g063.dtsi b/dts/arm64/renesas/rz/rza/r9a07g063.dtsi
new file mode 100644
index 0000000000000..fd75543def8e8
--- /dev/null
+++ b/dts/arm64/renesas/rz/rza/r9a07g063.dtsi
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <freq.h>
+#include <arm64/armv8-a.dtsi>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	compatible = "renesas,r9a07g063";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			clock-frequency = <DT_FREQ_M(1000)>;
+			reg = <0>;
+		};
+	};
+
+	arch_timer: timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 14 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 11 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+				<GIC_PPI 10 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		interrupt-parent = <&gic>;
+	};
+
+	soc {
+		interrupt-parent = <&gic>;
+
+		gic: interrupt-controller@11900000 {
+			compatible = "arm,gic-v3", "arm,gic";
+			reg = <0x11900000 0x10000>, /* GICD */
+				<0x11940000 0x20000>; /* GICR */
+			interrupt-controller;
+			#interrupt-cells = <4>;
+			status = "okay";
+		};
+
+		pinctrl: pin-controller@11030000 {
+			compatible = "renesas,rza-pinctrl";
+			reg = <0x11030000 DT_SIZE_K(64)>;
+			reg-names = "pinctrl";
+
+			gpio: gpio-common {
+				compatible = "renesas,rz-gpio-int";
+				interrupts =
+					<GIC_SPI 444 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 445 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 446 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 447 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 448 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 449 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 450 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 451 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 452 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 453 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 454 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 455 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 456 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 457 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 458 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 459 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 460 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 461 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 462 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 463 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 464 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 465 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 466 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 467 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 468 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 469 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 470 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 471 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 472 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 473 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 474 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 475 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+
+				gpio0: gpio@0 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells = <2>;
+					ngpios = <4>;
+					reg = <0x0>;
+					status = "disabled";
+				};
+
+				gpio1: gpio@100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <5>;
+					reg = <0x100>;
+					status = "disabled";
+				};
+
+				gpio2: gpio@200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <4>;
+					reg = <0x200>;
+					status = "disabled";
+				};
+
+				gpio3: gpio@300 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <4>;
+					reg = <0x300>;
+					status = "disabled";
+				};
+
+				gpio4: gpio@400 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <6>;
+					reg = <0x400>;
+					status = "disabled";
+				};
+
+				gpio5: gpio@500 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <5>;
+					reg = <0x500>;
+					status = "disabled";
+				};
+
+				gpio6: gpio@600 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <5>;
+					reg = <0x600>;
+					status = "disabled";
+				};
+
+				gpio7: gpio@700 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <5>;
+					reg = <0x700>;
+					status = "disabled";
+				};
+
+				gpio8: gpio@800 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <5>;
+					reg = <0x800>;
+					status = "disabled";
+				};
+
+				gpio9: gpio@900 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <4>;
+					reg = <0x900>;
+					status = "disabled";
+				};
+
+				gpio10: gpio@a00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <5>;
+					reg = <0xa00>;
+					status = "disabled";
+				};
+
+				gpio11: gpio@b00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <4>;
+					reg = <0xb00>;
+					status = "disabled";
+				};
+
+				gpio12: gpio@c00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0xc00>;
+					status = "disabled";
+				};
+
+				gpio13: gpio@d00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <5>;
+					reg = <0xd00>;
+					status = "disabled";
+				};
+
+				gpio14: gpio@e00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <3>;
+					reg = <0xe00>;
+					status = "disabled";
+				};
+
+				gpio15: gpio@f00 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <4>;
+					reg = <0xf00>;
+					status = "disabled";
+				};
+
+				gpio16: gpio@1000 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <2>;
+					reg = <0x1000>;
+					status = "disabled";
+				};
+
+				gpio17: gpio@1100 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells= <2>;
+					ngpios = <4>;
+					reg = <0x1100>;
+					status = "disabled";
+				};
+
+				gpio18: gpio@1200 {
+					compatible = "renesas,rz-gpio";
+					gpio-controller;
+					#gpio-cells=<2>;
+					ngpios = <6>;
+					reg = <0x1200>;
+					status = "disabled";
+				};
+			};
+		};
+
+		scif0: serial@1004b800 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <0>;
+			reg = <0x1004b800 0x400>;
+			interrupts = <GIC_SPI 380 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 381 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 382 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 383 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 384 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif1: serial@1004bc00 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <1>;
+			reg = <0x1004bc00 0x400>;
+			interrupts = <GIC_SPI 385 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 386 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 387 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 388 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 389 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif2: serial@1004c000 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <2>;
+			reg = <0x1004c000 0x400>;
+			interrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 391 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 392 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 393 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 394 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif3: serial@1004c400 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <3>;
+			reg = <0x1004c400 0x400>;
+			interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 396 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 397 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 399 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 399 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+
+		scif4: serial@1004c800 {
+			compatible = "renesas,rz-scif-uart";
+			channel = <4>;
+			reg = <0x1004c800 0x400>;
+			interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 401 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 402 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 403 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>,
+					<GIC_SPI 404 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+			interrupt-names = "eri", "bri", "rxi", "txi", "tei";
+			status = "disabled";
+		};
+	};
+};
diff --git a/dts/bindings/adc/adi,ad4050-adc.yaml b/dts/bindings/adc/adi,ad4050-adc.yaml
new file mode 100644
index 0000000000000..6954bc50a461b
--- /dev/null
+++ b/dts/bindings/adc/adi,ad4050-adc.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADL4050 ADC Controller
+
+compatible: "adi,ad4050-adc"
+
+include: adi,ad405x-adc-base.yaml
diff --git a/dts/bindings/adc/adi,ad4052-adc.yaml b/dts/bindings/adc/adi,ad4052-adc.yaml
new file mode 100644
index 0000000000000..647298c8af532
--- /dev/null
+++ b/dts/bindings/adc/adi,ad4052-adc.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADL4052 ADC Controller
+
+compatible: "adi,ad4052-adc"
+
+include: adi,ad405x-adc-base.yaml
diff --git a/dts/bindings/adc/adi,ad405x-adc-base.yaml b/dts/bindings/adc/adi,ad405x-adc-base.yaml
new file mode 100644
index 0000000000000..7a6fc10a039b3
--- /dev/null
+++ b/dts/bindings/adc/adi,ad405x-adc-base.yaml
@@ -0,0 +1,39 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADL4050 ADC Controller
+
+compatible: "adi,ad4050-adc"
+
+include: [adc-controller.yaml, spi-device.yaml]
+
+properties:
+  gp1-gpios:
+    type: phandle-array
+    description: |
+      The GP1 signal defaults to DEV_RDY as produced by the
+      adc. The property value should ensure the flags properly
+      describe the signal that is presented to the driver.
+  gp0-gpios:
+    type: phandle-array
+    description: |
+      The GP0 signal defaults to Disabled as produced by the
+      adc. The property value should ensure the flags properly
+      describe the signal that is presented to the driver.
+  conversion-gpios:
+    type: phandle-array
+    description: |
+      The CONV signal.
+    required: true
+  "#io-channel-cells":
+    const: 1
+
+  double-input-range:
+    type: boolean
+    description: |
+      Default ADC input range is 0V to Vref.
+      This option increases the range from 0V to 2 x Vref. Note that this
+      requires VDD >= 2 x Vref.
+
+io-channel-cells:
+  - input
diff --git a/dts/bindings/adc/adi,ad4130-adc.yaml b/dts/bindings/adc/adi,ad4130-adc.yaml
new file mode 100644
index 0000000000000..421aca8f7d915
--- /dev/null
+++ b/dts/bindings/adc/adi,ad4130-adc.yaml
@@ -0,0 +1,100 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Bindings for the ADI AD4130 Analog-to-Digital Converter.
+
+  This device is controlled over SPI and exposes one or more ADC input channels.
+  Each child node corresponds to a channel and supports standard ADC properties
+  such as gain, reference, resolution, and input configuration.
+
+  Sample binding
+
+  &spi0 {
+      status = "okay";
+
+      spi_ad4130: ad4130@0 {
+          compatible = "adi,ad4130-adc";
+          reg = <0x0>;
+          spi-max-frequency = <2700000>;
+          status = "okay";
+
+          #address-cells = <1>;
+          #size-cells = <0>;
+          #io-channel-cells = <1>;
+
+          channel@1 {
+              reg = <1>;
+              zephyr,gain = "ADC_GAIN_1";
+              zephyr,reference = "ADC_REF_INTERNAL";
+              zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+              zephyr,resolution = <24>;
+              zephyr,input-positive = <AD4130_ADC_AIN8>;
+              zephyr,input-negative = <AD4130_ADC_AIN9>;
+          };
+
+          channel@2 {
+              reg = <2>;
+              zephyr,gain = "ADC_GAIN_1";
+              zephyr,reference = "ADC_REF_INTERNAL";
+              zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+              zephyr,resolution = <24>;
+              zephyr,input-positive = <AD4130_ADC_AIN10>;
+              zephyr,input-negative = <AD4130_ADC_AIN11>;
+          };
+      };
+  };
+
+  For input constants such as `AD4130_ADC_AIN8`, refer to the binding header:
+  `include/zephyr/dt-bindings/adc/ad4130-adc.h`
+
+compatible: adi,ad4130-adc
+
+include: [adc-controller.yaml, spi-device.yaml]
+
+properties:
+  bipolar:
+    type: boolean
+    description: |
+      Bipolar configuration for AD4130
+  internal-reference-value:
+    type: int
+    enum: [0, 1]
+    default: 0
+    description: |
+      Internal reference value selection:
+      - AD4130_INTREF_2_5V
+      - AD4130_INTREF_1_25V
+      The default value is set to 0 to provide a higher full-scale range
+      for ADC measurements, which is suitable for a wider variety of
+      general-purpose applications.
+  adc-mode:
+    type: int
+    enum: [0, 1, 2, 3, 4]
+    default: 0
+    description: |
+      ADC operating mode for AD4130
+      - 0 AD4130_CONTINUOUS
+      - 1 AD4130_SINGLE
+      - 2 AD4130_STANDBY
+      - 3 AD4130_POWER_DOWN
+      - 4 AD4130_IDLE
+      The default is set to 0 because the continuous conversion mode
+      is enabled for control setup upon power-up or after reset.
+  clock-type:
+    type: int
+    enum: [0, 1, 2, 3]
+    default: 0
+    description: |
+      Clock selection:
+      - AD4130_INT_76_8_KHZ_OUT_OFF
+      - AD4130_INT_76_8_KHZ_OUT_ON
+      - AD4130_EXT_76_8KHZ
+      - AD4130_EXT_153_6_KHZ_DIV_2
+      The default value is 0, which selects the internal clock without
+      enabling the clock output.
+  "#io-channel-cells":
+    const: 1
+
+io-channel-cells:
+  - input
diff --git a/dts/bindings/adc/ambiq,adc.yaml b/dts/bindings/adc/ambiq,adc.yaml
index 034eadf6c5df0..73f138178e542 100644
--- a/dts/bindings/adc/ambiq,adc.yaml
+++ b/dts/bindings/adc/ambiq,adc.yaml
@@ -5,7 +5,7 @@ description: Ambiq ADC node
 
 compatible: "ambiq,adc"
 
-include: [adc-controller.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
+include: [adc-controller.yaml, pinctrl-device.yaml]
 properties:
   reg:
     required: true
diff --git a/dts/bindings/adc/espressif,esp32-adc.yaml b/dts/bindings/adc/espressif,esp32-adc.yaml
index d3907dba64083..9e49bbad83fbb 100644
--- a/dts/bindings/adc/espressif,esp32-adc.yaml
+++ b/dts/bindings/adc/espressif,esp32-adc.yaml
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Espressif ESP32 ADC
+  ESP32 ADC.
+
   Possible available resolutions depends on the used chip.
     - ESP32     < 9,10,11,12 >
     - ESP32-S2  < 12 >
diff --git a/dts/bindings/adc/raspberrypi,pico-adc.yaml b/dts/bindings/adc/raspberrypi,pico-adc.yaml
index 3fc9236cbb150..741f97e7cc12c 100644
--- a/dts/bindings/adc/raspberrypi,pico-adc.yaml
+++ b/dts/bindings/adc/raspberrypi,pico-adc.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 TOKTIA Hrioshi <tokita.hiroshi@fujitsu.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: RaspberryPi Pico ADC
+description: Raspberry Pi Pico ADC
 
 compatible: "raspberrypi,pico-adc"
 
diff --git a/dts/bindings/adc/renesas,ra-adc.yaml b/dts/bindings/adc/renesas,ra-adc.yaml
index 1e5f4315ab0b6..0ce2649529a8d 100644
--- a/dts/bindings/adc/renesas,ra-adc.yaml
+++ b/dts/bindings/adc/renesas,ra-adc.yaml
@@ -16,11 +16,6 @@ properties:
     required: true
     description: ADC reference voltage (Unit:mV)
 
-  channel-count:
-    type: int
-    required: true
-    description: The number of ADC channels
-
   "#io-channel-cells":
     const: 1
 
diff --git a/dts/bindings/adc/renesas,rz-adc.yaml b/dts/bindings/adc/renesas,rz-adc.yaml
new file mode 100644
index 0000000000000..a76d034716d60
--- /dev/null
+++ b/dts/bindings/adc/renesas,rz-adc.yaml
@@ -0,0 +1,31 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: "Renesas RZ ADC"
+
+compatible: "renesas,rz-adc"
+
+include: [adc-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  vref-mv:
+    type: int
+    required: true
+    description: Indicates the reference voltage of the ADC in mV.
+
+  channel-available-mask:
+    type: int
+    required: true
+    description: Mask for ADC channels existed in each board
+
+  "#io-channel-cells":
+    const: 1
+
+io-channel-cells:
+  - input
diff --git a/dts/bindings/adc/st,stm32-adc.yaml b/dts/bindings/adc/st,stm32-adc.yaml
index 7df14029cc59f..ab4af9663d223 100644
--- a/dts/bindings/adc/st,stm32-adc.yaml
+++ b/dts/bindings/adc/st,stm32-adc.yaml
@@ -2,7 +2,7 @@
 # Copyright (c) 2018, Song Qiang <songqiang1304521@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: ST STM32 family ADC
+description: STM32 ADC
 
 compatible: "st,stm32-adc"
 
diff --git a/dts/bindings/adc/st,stm32f1-adc.yaml b/dts/bindings/adc/st,stm32f1-adc.yaml
index a8c99d677abfb..7541591bff929 100644
--- a/dts/bindings/adc/st,stm32f1-adc.yaml
+++ b/dts/bindings/adc/st,stm32f1-adc.yaml
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-        ST STM32F1 family ADC
+        STM32F1 ADC
+
         This compatible stands for all ADC blocks similar to the one on STM32F1,
         like STM32F37x.
         Remove the st,adc-clock-source and st,adc-prescaler property.
diff --git a/dts/bindings/adc/st,stm32f4-adc.yaml b/dts/bindings/adc/st,stm32f4-adc.yaml
index a24769e12006b..607c8d4fa51f7 100644
--- a/dts/bindings/adc/st,stm32f4-adc.yaml
+++ b/dts/bindings/adc/st,stm32f4-adc.yaml
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-        ST STM32F4 family ADC
+        STM32F4 ADC
+
         This compatible stands for all ADC blocks similar to the one on STM32F4,
         like F2, F7 or L1.
 
diff --git a/dts/bindings/adc/st,stm32n6-adc.yaml b/dts/bindings/adc/st,stm32n6-adc.yaml
new file mode 100644
index 0000000000000..da83fd1b9ba23
--- /dev/null
+++ b/dts/bindings/adc/st,stm32n6-adc.yaml
@@ -0,0 +1,16 @@
+# Copyright (c) 2024 STMicroelectronics
+
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+        STM32N6 ADC
+
+        This compatible stands for STM32N6 ADC.
+
+compatible: "st,stm32n6-adc"
+
+include:
+  - name: st,stm32-adc.yaml
+    property-blocklist:
+      - st,adc-clock-source
+      - st,adc-prescaler
diff --git a/dts/bindings/adc/st,stm32wb0-adc.yaml b/dts/bindings/adc/st,stm32wb0-adc.yaml
index b2b6599c83443..b8b166a49f06c 100644
--- a/dts/bindings/adc/st,stm32wb0-adc.yaml
+++ b/dts/bindings/adc/st,stm32wb0-adc.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32WB0 series Analog-to-Digital Converter
+description: STM32WB0 Analog-to-Digital Converter
 
 compatible: "st,stm32wb0-adc"
 
diff --git a/dts/bindings/audio/cirrus,c43l22.yaml b/dts/bindings/audio/cirrus,c43l22.yaml
new file mode 100644
index 0000000000000..59c5795856567
--- /dev/null
+++ b/dts/bindings/audio/cirrus,c43l22.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Titouan Christophe
+# SPDX-License-Identifier: Apache-2.0
+
+description: Cirrus CS43L22 audio DAC
+
+include: [i2c-device.yaml]
+
+compatible: "cirrus,cs43l22"
+
+properties:
+  reg:
+    required: true
+
+  reset-gpios:
+    required: true
+    type: phandle-array
+    description: |
+      RESET pin
diff --git a/dts/bindings/audio/ti,tlv320aic3110.yaml b/dts/bindings/audio/ti,tlv320aic3110.yaml
new file mode 100644
index 0000000000000..b27a1f2ecaaa4
--- /dev/null
+++ b/dts/bindings/audio/ti,tlv320aic3110.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 PHYTEC America LLC
+# SPDX-License-Identifier: Apache-2.0
+
+description: Texas Instruments TLV320AIC3110 Audio DAC
+
+compatible: "ti,tlv320aic3110"
+
+include: i2c-device.yaml
diff --git a/dts/bindings/binding-types.txt b/dts/bindings/binding-types.txt
new file mode 100644
index 0000000000000..ee2b0c9f5cd32
--- /dev/null
+++ b/dts/bindings/binding-types.txt
@@ -0,0 +1,135 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 The Linux Foundation
+# SPDX-License-Identifier: Apache-2.0
+#
+# Devicetree binding types registry.
+#
+# This file contains the mapping of binding types (folders directly under this
+# file) to their descriptions and provides a definition for each acronym used.
+#
+# The contents of this file are parsed during documentation generation.
+#
+# Anything that starts with a '#' is treated as a comment and ignored.
+# Non-empty lines should be in this format:
+#
+# <binding-type><TAB><Description>
+
+# zephyr-keep-sorted-start
+acpi	ACPI (Advanced Configuration and Power Interface)
+adc	ADC (Analog to Digital Converter)
+alh	ALH (Audio Link Hub)
+arc	ARC architecture
+arm	ARM architecture
+audio	Audio
+auxdisplay	Auxiliary Display
+base	Base
+battery	Battery
+bluetooth	Bluetooth
+cache	Cache
+can	CAN (Controller Area Network)
+charger	Charger
+clock	Clock control
+comparator	Comparator
+coredump	Core dump
+counter	Counter
+cpu	CPU (Central Processing Unit)
+crypto	Cryptographic accelerator
+dac	DAC (Digital to Analog Converter)
+dai	DAI (Digital Audio Interface)
+debug	Debug
+dfpmcch	DFPMCCH
+dfpmccu	DFPMCCU
+disk	Disk
+display	Display
+dma	DMA (Direct Memory Access)
+dsa	DSA (Distributed Switch Architecture)
+edac	EDAC (Error Detection and Correction)
+espi	ESPI (Enhanced Serial Peripheral Interface)
+ethernet	Ethernet
+firmware	Firmware
+flash_controller	Flash controller
+fpga	FPGA (Field Programmable Gate Array)
+fs	File system
+fuel-gauge	Fuel gauge
+gnss	GNSS (Global Navigation Satellite System)
+gpio	GPIO (General Purpose Input/Output) & Headers
+haptics	Haptics
+hda	HDA (High Definition Audio)
+hdlc_rcp_if	IEEE 802.15.4 HDLC RCP interface
+hwinfo	Hardware information
+hwspinlock	Hardware spinlock
+i2c	I2C (Inter-Integrated Circuit)
+i2s	I2S (Inter-Integrated Circuit Sound)
+i3c	I3C (Improved Inter-Integrated Circuit)
+ieee802154	IEEE 802.15.4
+iio	IIO (Industrial I/O)
+input	Input
+interrupt-controller	Interrupt controller
+ipc	IPC (Inter-Processor Communication)
+ipm	IPM (Inter-Processor Mailbox)
+led	LED (Light Emitting Diode)
+led_strip	LED (Light Emitting Diode) strip
+lora	LoRa
+mbox	Mailbox
+mdio	MDIO (Management Data Input/Output)
+memory-controllers	Memory controller
+memory-window	Memory window
+mfd	Multi-Function Device
+mhu	Mailbox Handling Unit
+mipi-dbi	MIPI-DBI (Mobile Industry Processor Interface Display Bus Interface)
+mipi-dsi	MIPI-DSI (Mobile Industry Processor Interface Display Serial Interface)
+misc	Miscellaneous
+mm	Memory management
+mmc	MMC (MultiMedia Card)
+mmu_mpu	MMU (Memory Management Unit) / MPU (Memory Protection Unit)
+modem	Modem
+mspi	Multi-bit SPI (Serial Peripheral Interface)
+mtd	MTD (Memory Technology Device)
+net	Networking
+options	Options
+ospi	OCTOSPI (Octal Serial Peripheral Interface)
+pcie	PCIe (Peripheral Component Interconnect Express)
+peci	PECI (Platform Environment Control Interface)
+phy	PHY
+pinctrl	Pin control
+pm_cpu_ops	Power management CPU operations
+power	Power management
+power-domain	Power domain
+ppc	PPC architecture
+ps2	PS/2 (Personal System/2)
+pwm	PWM (Pulse Width Modulation)
+qspi	QSPI (Quad Serial Peripheral Interface)
+regulator	Regulator
+reserved-memory	Reserved memory
+reset	Reset controller
+retained_mem	Retained memory
+retention	Retention
+riscv	RISC-V architecture
+rng	RNG (Random Number Generator)
+rtc	RTC (Real Time Clock)
+sd	SD (Secure Digital)
+sdhc	SDHC (Secure Digital High Capacity)
+sensor	Sensors
+serial	Serial controller
+shi	SHI (Serial Host Interface)
+sip_svc	Service in Platform
+smbus	SMbus (System Management Bus)
+sound	Sound
+spi	SPI (Serial Peripheral Interface)
+sram	SRAM (Static Random Access Memory)
+stepper	Stepper
+syscon	System controller
+tach	Tachometer
+tcpc	USB Type-C Port Controller
+test	Test
+timer	Timer
+timestamp	Timestamp
+usb	USB (Universal Serial Bus)
+usb-c	USB (Universal Serial Bus) Type-C
+video	Video
+virtualization	Virtualization
+w1	1-Wire
+watchdog	Watchdog
+wifi	Wi-Fi
+xen	Xen
+xspi	xSPI (Expanded Serial Peripheral Interface)
+# zephyr-keep-sorted-stop
diff --git a/dts/bindings/cache/andestech,l2c.yaml b/dts/bindings/cache/andestech,l2c.yaml
index 6d9344ad7cd30..43f990a9658ba 100644
--- a/dts/bindings/cache/andestech,l2c.yaml
+++ b/dts/bindings/cache/andestech,l2c.yaml
@@ -4,8 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description:
-  This is a representation of AndesTech L2 cache node
+description: AndesTech L2 cache
 
 compatible: "andestech,l2c"
 
diff --git a/dts/bindings/can/espressif,esp32-twai.yaml b/dts/bindings/can/espressif,esp32-twai.yaml
index cf0d19c23ae69..cc77536a70163 100644
--- a/dts/bindings/can/espressif,esp32-twai.yaml
+++ b/dts/bindings/can/espressif,esp32-twai.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif ESP32 Two-Wire Automotive Interface (TWAI)
+description: ESP32 Two-Wire Automotive Interface (TWAI)
 
 compatible: "espressif,esp32-twai"
 
diff --git a/dts/bindings/can/microchip,mcp251xfd.yaml b/dts/bindings/can/microchip,mcp251xfd.yaml
index 168314547eff5..ed63da20b4fd7 100644
--- a/dts/bindings/can/microchip,mcp251xfd.yaml
+++ b/dts/bindings/can/microchip,mcp251xfd.yaml
@@ -65,6 +65,10 @@ properties:
       is not set, then an internal clock (typically 40MHz or 20MHz) will be
       output on CLKO pin instead.
 
+  xstby-enable:
+    type: boolean
+    description: Enables standby pin control on GPIO0.
+
   clko-div:
     type: int
     description: The factor to divide the system clock for CLKO pin.
diff --git a/dts/bindings/can/renesas,ra-canfd-global.yaml b/dts/bindings/can/renesas,ra-canfd-global.yaml
index a737b571ee257..c22688eac29d7 100644
--- a/dts/bindings/can/renesas,ra-canfd-global.yaml
+++ b/dts/bindings/can/renesas,ra-canfd-global.yaml
@@ -13,3 +13,13 @@ properties:
 
   clocks:
     required: true
+
+  dll-min-freq:
+    type: int
+    description: |
+      Specifies the Data Link Layer clock limit on this device: DLL clock frequency > dll-min-freq.
+
+  dll-max-freq:
+    type: int
+    description: |
+      Specifies the Data Link Layer clock limit on this device: DLL clock frequency < dll-max-freq.
diff --git a/dts/bindings/can/st,stm32-fdcan.yaml b/dts/bindings/can/st,stm32-fdcan.yaml
index f4cfb310dac60..7df1123ace95d 100644
--- a/dts/bindings/can/st,stm32-fdcan.yaml
+++ b/dts/bindings/can/st,stm32-fdcan.yaml
@@ -1,4 +1,4 @@
-description: ST STM32 FDCAN CAN FD controller
+description: STM32 FDCAN CAN FD controller
 
 compatible: "st,stm32-fdcan"
 
diff --git a/dts/bindings/can/st,stm32h7-fdcan.yaml b/dts/bindings/can/st,stm32h7-fdcan.yaml
index 14f6fad61c568..ca42621d6498e 100644
--- a/dts/bindings/can/st,stm32h7-fdcan.yaml
+++ b/dts/bindings/can/st,stm32h7-fdcan.yaml
@@ -1,4 +1,4 @@
-description: ST STM32H7 series FDCAN CAN FD controller
+description: STM32H7 series FDCAN CAN FD controller
 
 compatible: "st,stm32h7-fdcan"
 
diff --git a/dts/bindings/charger/nxp,pf1550-charger.yaml b/dts/bindings/charger/nxp,pf1550-charger.yaml
new file mode 100644
index 0000000000000..c149221143857
--- /dev/null
+++ b/dts/bindings/charger/nxp,pf1550-charger.yaml
@@ -0,0 +1,58 @@
+# Copyright (c), 2024 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP PF1550 battery charger
+
+include: battery.yaml
+
+compatible: "nxp,pf1550-charger"
+
+properties:
+  constant-charge-voltage-max-microvolt:
+    required: true
+
+  constant-charge-current-max-microamp:
+    required: true
+
+  pf1550,vbus-current-limit-microamp:
+    type: int
+    required: true
+    description: |
+      VBUS current limit in microamperes.
+
+  pf1550,system-voltage-min-threshold-microvolt:
+    type: int
+    required: true
+    enum:
+      - 3500000
+      - 3700000
+      - 4300000
+    description: |
+      System voltage minimum threshold.
+
+  pf1550,thermistor-monitoring-mode:
+    type: string
+    required: true
+    enum:
+      - "disabled"
+      - "thermistor"
+      - "JEITA-1"
+      - "JEITA-2"
+    description: |
+      Thermistor monitoring mode.
+      Refer to ThrmCfg register description and Table 2 for details.
+
+  pf1550,int-gpios:
+    type: phandle-array
+    required: true
+    description: Interrupt pin
+
+  pf1550,led-behaviour:
+    type: string
+    required: true
+    enum:
+      - "on-in-charging-flash-in-fault"
+      - "flash-in-charging-on-in-fault"
+      - "manual-off"
+    description: |
+      Behaviour for charger LED.
diff --git a/dts/bindings/charger/ti,bq24190.yaml b/dts/bindings/charger/ti,bq24190.yaml
index 1b1ad9e97cac7..78aa7654b57c0 100644
--- a/dts/bindings/charger/ti,bq24190.yaml
+++ b/dts/bindings/charger/ti,bq24190.yaml
@@ -1,7 +1,23 @@
 # Copyright 2023 Cirrus Logic, Inc.
+# Copyright 2025 Palta Tech, S.A
 # SPDX-License-Identifier: Apache-2.0
 
-description: Texas Instruments family of BQ24190 of charging ICs
+description: |
+  BQ2419x family of charging ICs.
+
+  BQ2419x I2C controlled, 1-Cell, 4.5-A, USB/Adapter Charger with Narrow VDC Power Path Management
+  and USB OTG
+
+  This charger is represented by device tree child node, e.g:
+
+  charger: bq24190@6b {
+      compatible = "ti,bq24190";
+      reg = <0x6b>;
+      status = "okay";
+
+      constant-charge-current-max-microamp = <1000000>;
+      constant-charge-voltage-max-microvolt = <3800000>;
+  };
 
 include: [battery.yaml, i2c-device.yaml]
 
@@ -10,9 +26,17 @@ compatible: "ti,bq24190"
 properties:
   constant-charge-current-max-microamp:
     required: true
+    description: |
+      The charge current target for the constant current phase of the charge profile.
+      This value will be set at initialization time. Range: 512 mA to 4.544 A.
+      The value specified will be rounded down to the closest implemented value.
 
   constant-charge-voltage-max-microvolt:
     required: true
+    description: |
+      The voltage regulation target for the constant voltage phase of the battery charging profile.
+      This value will be set at initialization time. Range: 3.504 V to 4.400 V.
+      The value specified will be rounded down to the closest implemented value.
 
   ce-gpios:
     type: phandle-array
diff --git a/dts/bindings/charger/ti,bq25713.yaml b/dts/bindings/charger/ti,bq25713.yaml
new file mode 100644
index 0000000000000..1eda1664f3517
--- /dev/null
+++ b/dts/bindings/charger/ti,bq25713.yaml
@@ -0,0 +1,48 @@
+# Copyright 2025 Palta Tech, S.A
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  BQ25713 I2C battery charge controller IC.
+
+  BQ25713 targets 1s to 4s Cell, USB Power Delivery/Adapter Charger with
+  Narrow VDC Power Path Management and Processor Hot Monitor
+
+  This charger is represented by device tree child node, e.g:
+
+  charger: bq25713@6b {
+      compatible = "ti,bq25713";
+      reg = <0x6b>;
+      status = "okay";
+
+      constant-charge-current-max-microamp = <1000000>;
+      constant-charge-voltage-max-microvolt = <3800000>;
+      system-voltage-min-threshold-microvolt = <3328000>;
+  };
+
+include: [battery.yaml, i2c-device.yaml]
+
+compatible: "ti,bq25713"
+
+properties:
+  constant-charge-current-max-microamp:
+    required: true
+    description: |
+      The charge current target for the constant current phase of the charge profile.
+      This value will be set at initialization time. Range: 0 mA to 8.128 A.
+      The value specified will be rounded down to the closest implemented value.
+
+  constant-charge-voltage-max-microvolt:
+    required: true
+    description: |
+      The voltage regulation target for the constant voltage phase of the battery charging profile.
+      This value will be set at initialization time. Range: 4.2 V 1S to 16.8 V 4S.
+      The value specified will be rounded down to the closest implemented value.
+
+  system-voltage-min-threshold-microvolt:
+    type: int
+    required: true
+    description: |
+      Minimum system voltage.
+      Voltage that will be set above when the system voltage drops this level.
+      This value will be set at initialization time. Range: 1.024 V to 16.128 V.
+      The value specified will be rounded down to the closest implemented value.
diff --git a/dts/bindings/charger/x-powers,axp2101-charger.yaml b/dts/bindings/charger/x-powers,axp2101-charger.yaml
new file mode 100644
index 0000000000000..fa70b76b091b9
--- /dev/null
+++ b/dts/bindings/charger/x-powers,axp2101-charger.yaml
@@ -0,0 +1,75 @@
+# Copyright 2025 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Charger part of the AXP2101 PMU MFD device.
+
+  This charger should be instantiated as child of the AXP2101 MFD device, i.e.
+
+  axp2101@34 {
+    compatible = "x-powers,axp2101";
+    reg = <0x34>;
+
+    charger {
+      compatible = "x-powers,axp2101-charger";
+      constant-charge-current-max-microamp = <300000>;
+      constant-charge-voltage-max-microvolt = <4200000>;
+    };
+
+    regulators {
+    ...
+    }
+  }
+
+compatible: "x-powers,axp2101-charger"
+
+include:
+  - base.yaml
+  - battery.yaml
+
+properties:
+  # Extending the definition from battery.yaml
+  constant-charge-current-max-microamp:
+    required: true
+    enum:
+      - 100000
+      - 125000
+      - 150000
+      - 175000
+      - 200000
+      - 300000
+      - 400000
+      - 500000
+      - 600000
+      - 700000
+      - 800000
+      - 900000
+      - 1000000
+
+  # Extending the definition from battery.yaml
+  constant-charge-voltage-max-microvolt:
+    required: true
+    enum:
+      - 4000000
+      - 4100000
+      - 4200000
+      - 4350000
+      - 4400000
+
+  # Extending the definition from battery.yaml
+  charge-term-current-microamp:
+    enum:
+      - 0
+      - 25000
+      - 50000
+      - 75000
+      - 100000
+      - 125000
+      - 150000
+      - 200000
+
+  vbackup-enable:
+    type: boolean
+    description:
+      Enable Vbackup on boot. This is normally used to charge a button battery
+      that is used by some RTC IC.
diff --git a/dts/bindings/clock/ite,it51xxx-ecpm.yaml b/dts/bindings/clock/ite,it51xxx-ecpm.yaml
new file mode 100644
index 0000000000000..460828acdd163
--- /dev/null
+++ b/dts/bindings/clock/ite,it51xxx-ecpm.yaml
@@ -0,0 +1,33 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE it51xxx ECPM (EC Clock and Power Management Controller) node
+
+compatible: "ite,it51xxx-ecpm"
+
+include: [clock-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  pll-frequency:
+    type: int
+    required: true
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+    description: |
+      0 = PLL_18400_KHZ,
+      1 = PLL_32300_KHZ,
+      2 = PLL_64500_KHZ,
+      3 = PLL_48000_KHZ,
+
+  "#clock-cells":
+    const: 2
+
+clock-cells:
+  - ctrl
+  - bits
diff --git a/dts/bindings/clock/nordic,nrfs-audiopll.yaml b/dts/bindings/clock/nordic,nrfs-audiopll.yaml
new file mode 100644
index 0000000000000..a305b1c8088c1
--- /dev/null
+++ b/dts/bindings/clock/nordic,nrfs-audiopll.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic NRFS AudioPLL clock
+
+compatible: "nordic,nrfs-audiopll"
+
+include: base.yaml
+
+properties:
+  frequency:
+    type: int
+    required: true
+    description: |
+      Initial frequency in Hertz.
+
+      See zephyr/include/zephyr/dt-bindings/nrfs_audiopll.h for
+      predefined frequencies.
diff --git a/dts/bindings/clock/renesas,rz-cpg.yml b/dts/bindings/clock/renesas,rz-cpg.yml
new file mode 100644
index 0000000000000..5124cd3cb12db
--- /dev/null
+++ b/dts/bindings/clock/renesas,rz-cpg.yml
@@ -0,0 +1,15 @@
+# Copyright (c) 2024 Renesas Electronics Corporation24
+# SPDX-License-Identifier: Apache-2.0
+
+description: RZ Clock Pulse Generator
+compatible: "renesas,rz-cpg"
+
+include: [base.yaml, clock-controller.yaml]
+
+properties:
+
+  "#clock-cells":
+    const: 1
+
+clock-cells:
+  - clk-id
diff --git a/dts/bindings/clock/st,stm32-clock-mux.yaml b/dts/bindings/clock/st,stm32-clock-mux.yaml
index 1798ee686d2ce..afa7c9e643eb2 100644
--- a/dts/bindings/clock/st,stm32-clock-mux.yaml
+++ b/dts/bindings/clock/st,stm32-clock-mux.yaml
@@ -3,8 +3,9 @@
 
 description: |
         STM32 Clock multiplexer
+
         Describes a clock multiplexer, such as per_ck on STM32H7 or
-        CLK48 on STM32L5.
+        CLK48 on STM32WB.
         The only property of this node is to select a clock input.
         For instance:
                 &perck {
@@ -20,3 +21,8 @@ include:
       - status
       - compatible
       - clocks
+
+properties:
+
+  clocks:
+    required: true
diff --git a/dts/bindings/clock/st,stm32-rcc.yaml b/dts/bindings/clock/st,stm32-rcc.yaml
index 4d7aa666cc34d..6199eae4a9ca3 100644
--- a/dts/bindings/clock/st,stm32-rcc.yaml
+++ b/dts/bindings/clock/st,stm32-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 Reset and Clock controller node.
+  STM32 RCC (Reset and Clock controller).
+
   This node is in charge of system clock ('SYSCLK') source selection and controlling
   clocks for AHB (Advanced High Performance) and APB (Advanced Peripheral) bus domains.
 
diff --git a/dts/bindings/clock/st,stm32c0-hsi-clock.yaml b/dts/bindings/clock/st,stm32c0-hsi-clock.yaml
index a19fd6f605d0a..55c918088182e 100644
--- a/dts/bindings/clock/st,stm32c0-hsi-clock.yaml
+++ b/dts/bindings/clock/st,stm32c0-hsi-clock.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 HSI Clock node description for STM32C0 devices
+  STM32C0 HSI Clock.
+
   On STM32C0, HSI is a 48MHz fixed clock.
 
   It also produces a HSISYS secondary clk which can be used as system clock
diff --git a/dts/bindings/clock/st,stm32f0-pll-clock.yaml b/dts/bindings/clock/st,stm32f0-pll-clock.yaml
index f35804b9a54b7..92e6c54242bb0 100644
--- a/dts/bindings/clock/st,stm32f0-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32f0-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Main PLL node binding for STM32F0 and STM32F3 devices.
+  STM32F0/F3 Main PLL.
 
   Takes one of clk_hse or clk_hsi as input clock.
 
diff --git a/dts/bindings/clock/st,stm32f0-rcc.yaml b/dts/bindings/clock/st,stm32f0-rcc.yaml
index c85205ab8fd1b..3e278b774f03c 100644
--- a/dts/bindings/clock/st,stm32f0-rcc.yaml
+++ b/dts/bindings/clock/st,stm32f0-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F0 and G0 Reset and Clock controller node.
+  STM32F0/G0 RCC (Reset and Clock controller).
+
   For more description confere st,stm32-rcc.yaml
 
 compatible: "st,stm32f0-rcc"
diff --git a/dts/bindings/clock/st,stm32f1-clock-mco.yaml b/dts/bindings/clock/st,stm32f1-clock-mco.yaml
index 5024a8166023f..dc3670c76b75b 100644
--- a/dts/bindings/clock/st,stm32f1-clock-mco.yaml
+++ b/dts/bindings/clock/st,stm32f1-clock-mco.yaml
@@ -7,7 +7,7 @@
 compatible: "st,stm32f1-clock-mco"
 
 description: |
-        STM32 F1 series Microcontroller Clock Output (MCO)
+        STM32F1 Microcontroller Clock Output (MCO)
 
         The STM32F1 MCO is similar to other series but has no configurable
         prescaler before the output. However, note that certain inputs of
diff --git a/dts/bindings/clock/st,stm32f1-pll-clock.yaml b/dts/bindings/clock/st,stm32f1-pll-clock.yaml
index 04c9a8e295436..5102a362e7c8a 100644
--- a/dts/bindings/clock/st,stm32f1-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32f1-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Main PLL node binding for low-, medium-, high- and XL-density STM32F1 devices.
+  STM32F1 Main PLL for low-, medium-, high- and XL-density devices.
 
   Takes one of 'clk_hse', 'clk_hse / 2' (when 'xtpre' is set) or 'clk_hsi / 2'
   as input clock.
diff --git a/dts/bindings/clock/st,stm32f1-rcc.yaml b/dts/bindings/clock/st,stm32f1-rcc.yaml
index 00f54374335cd..f013d8daa093c 100644
--- a/dts/bindings/clock/st,stm32f1-rcc.yaml
+++ b/dts/bindings/clock/st,stm32f1-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F1 and STM32F37x Reset and Clock controller node.
+  STM32F1/F3/7x RCC (Reset and Clock controller).
+
   Adds the ADC prescaler to the standard generic STM32 RCC.
   For more description confere st,stm32-rcc.yaml
 
diff --git a/dts/bindings/clock/st,stm32f100-pll-clock.yaml b/dts/bindings/clock/st,stm32f100-pll-clock.yaml
index a861a445fefa5..e1898b57ef7f5 100644
--- a/dts/bindings/clock/st,stm32f100-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32f100-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Main PLL node binding for STM32F100 devices
+  STM32F100 Main PLL.
 
   Takes one of clk_hse or clk_hsi as input clock.
   When clk_hsi is used a fixed prescaler is applied. When input clock is hse or
diff --git a/dts/bindings/clock/st,stm32f105-pll-clock.yaml b/dts/bindings/clock/st,stm32f105-pll-clock.yaml
index d2f01e8989b52..d294a438a76c6 100644
--- a/dts/bindings/clock/st,stm32f105-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32f105-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Main PLL node binding for Connectivity line devices (STM32F105/STM32F107)
+  STM32F105/F107 Main PLL.
 
   Takes one of clk_hse, pll2 or clk_hsi as input clock.
   When clk_hsi is used a fixed prescaler is applied. When input clock is hse or
diff --git a/dts/bindings/clock/st,stm32f105-pll2-clock.yaml b/dts/bindings/clock/st,stm32f105-pll2-clock.yaml
index b9b881d4f1074..3292ab5babcdb 100644
--- a/dts/bindings/clock/st,stm32f105-pll2-clock.yaml
+++ b/dts/bindings/clock/st,stm32f105-pll2-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL2 node binding for Connectivity line devices (STM32F105/STM32F107)
+  STM32F105/F107 PLL2.
 
   Takes clk_hse as input clock, using prediv as prescaler.
 
diff --git a/dts/bindings/clock/st,stm32f2-pll-clock.yaml b/dts/bindings/clock/st,stm32f2-pll-clock.yaml
index eda981c3e0709..917b64768b80c 100644
--- a/dts/bindings/clock/st,stm32f2-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32f2-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F2 Main PLL node binding:
+  STM32F2 Main PLL.
 
   Takes one of clk_hse or clk_hsi as input clock.
 
diff --git a/dts/bindings/clock/st,stm32f3-rcc.yaml b/dts/bindings/clock/st,stm32f3-rcc.yaml
index 64851cdaf59da..6db97343e9886 100644
--- a/dts/bindings/clock/st,stm32f3-rcc.yaml
+++ b/dts/bindings/clock/st,stm32f3-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F3 Reset and Clock controller node.
+  STM32F3 RCC (Reset and Clock controller).
+
   Adds the STM32F3 ADC prescaler to the standard generic STM32 RCC.
   For more description confere st,stm32-rcc.yaml
 
diff --git a/dts/bindings/clock/st,stm32f4-pll-clock.yaml b/dts/bindings/clock/st,stm32f4-pll-clock.yaml
index 1346ec8a55fd4..81ccb5182da48 100644
--- a/dts/bindings/clock/st,stm32f4-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32f4-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F4 Main PLL node binding:
+  STM32F4 Main PLL.
 
   Takes one of clk_hse or clk_hsi as input clock, with an
   input frequency from 1 to 2 MHz. PLLM factor is used to set the input clock
diff --git a/dts/bindings/clock/st,stm32f4-plli2s-clock.yaml b/dts/bindings/clock/st,stm32f4-plli2s-clock.yaml
index b5e6e9cc4a326..aff08c7578844 100644
--- a/dts/bindings/clock/st,stm32f4-plli2s-clock.yaml
+++ b/dts/bindings/clock/st,stm32f4-plli2s-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F4 PLL I2S node binding:
+  STM32F4 PLL I2S.
 
   Takes same input as Main PLL. PLLM factor and PLL source are common with Main PLL
 
diff --git a/dts/bindings/clock/st,stm32f411-plli2s-clock.yaml b/dts/bindings/clock/st,stm32f411-plli2s-clock.yaml
index 459e990422dd9..ed9b235d3275f 100644
--- a/dts/bindings/clock/st,stm32f411-plli2s-clock.yaml
+++ b/dts/bindings/clock/st,stm32f411-plli2s-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F411 PLL I2S node binding:
+  STM32F411 PLL I2S.
 
   Fully configurable I2S dedicated PLL.
 
diff --git a/dts/bindings/clock/st,stm32f7-pll-clock.yaml b/dts/bindings/clock/st,stm32f7-pll-clock.yaml
index 163426ef7bd3e..fc1a29fca297f 100644
--- a/dts/bindings/clock/st,stm32f7-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32f7-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32F7 Main PLL node binding:
+  STM32F7 Main PLL.
 
   Takes one of clk_hse or clk_hsi as input clock.
 
diff --git a/dts/bindings/clock/st,stm32g0-hsi-clock.yaml b/dts/bindings/clock/st,stm32g0-hsi-clock.yaml
index a2d523fb0eb80..bf2df7d5f02b8 100644
--- a/dts/bindings/clock/st,stm32g0-hsi-clock.yaml
+++ b/dts/bindings/clock/st,stm32g0-hsi-clock.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 HSI Clock node description for STM32G0 devices
+  STM32G0 HSI Clock.
+
   On STM32G0, HSI is a 16MHz fixed clock.
 
   It also produces a HSISYS secondary clk which can be used as system clock
diff --git a/dts/bindings/clock/st,stm32g0-pll-clock.yaml b/dts/bindings/clock/st,stm32g0-pll-clock.yaml
index c397b3c708b43..7468425de9bda 100644
--- a/dts/bindings/clock/st,stm32g0-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32g0-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32G0 devices
+  STM32G0 main PLL.
 
   It can take one of clk_hse or clk_hsi as input clock, with
   an input frequency from 2.66 to 16 MHz. PLLM factor is used to set the input
diff --git a/dts/bindings/clock/st,stm32g4-pll-clock.yaml b/dts/bindings/clock/st,stm32g4-pll-clock.yaml
index 735895258ab2f..fb23b62170196 100644
--- a/dts/bindings/clock/st,stm32g4-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32g4-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32G4 devices
+  STM32G4 main PLL.
 
   It can take one of clk_hse or clk_hsi as input clock, with
   an input frequency from 2.66 to 16 MHz. PLLM factor is used to set the input
diff --git a/dts/bindings/clock/st,stm32h7-pll-clock.yaml b/dts/bindings/clock/st,stm32h7-pll-clock.yaml
index 2e441876116ea..a62cd19aadb22 100644
--- a/dts/bindings/clock/st,stm32h7-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32h7-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32H7 devices
+  STM32H7 main PLL.
 
   It can be used to describe 3 different PLLs: PLL1 (Main PLL), PLL2 and PLL3.
   Only PLL1 and PLL3 are supported for now.
diff --git a/dts/bindings/clock/st,stm32h7-rcc.yaml b/dts/bindings/clock/st,stm32h7-rcc.yaml
index b0e6622e6d305..f2246e7570841 100644
--- a/dts/bindings/clock/st,stm32h7-rcc.yaml
+++ b/dts/bindings/clock/st,stm32h7-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 Reset and Clock controller node for STM32H7 devices
+  STM32H7 RCC (Reset and Clock controller).
+
   This node is in charge of system clock ('SYSCLK') source selection and
   System Clock Generation.
 
diff --git a/dts/bindings/clock/st,stm32h7rs-pll-clock.yaml b/dts/bindings/clock/st,stm32h7rs-pll-clock.yaml
index cb2980dd39c5a..6ff7100f3470c 100644
--- a/dts/bindings/clock/st,stm32h7rs-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32h7rs-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32H7RS devices
+  STM32H7RS main PLL.
 
   It can be used to describe 3 different PLLs: PLL1 (Main PLL), PLL2 and PLL3.
 
diff --git a/dts/bindings/clock/st,stm32h7rs-rcc.yaml b/dts/bindings/clock/st,stm32h7rs-rcc.yaml
index 780c84564f447..5eb4ad2f6bfb4 100644
--- a/dts/bindings/clock/st,stm32h7rs-rcc.yaml
+++ b/dts/bindings/clock/st,stm32h7rs-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 Reset and Clock controller node for STM32H7RS devices
+  STM32H7RS RCC (Reset and Clock controller).
+
   This node is in charge of system clock ('SYSCLK') source selection and
   System Clock Generation.
 
diff --git a/dts/bindings/clock/st,stm32l0-msi-clock.yaml b/dts/bindings/clock/st,stm32l0-msi-clock.yaml
index 29d8d1cdcb9c2..07bf13cd1a350 100644
--- a/dts/bindings/clock/st,stm32l0-msi-clock.yaml
+++ b/dts/bindings/clock/st,stm32l0-msi-clock.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021, Linaro ltd
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32L0 and STM32L1 Multi Speed Internal Clock
+description: STM32L0/L1 Multi Speed Internal Clock
 
 compatible: "st,stm32l0-msi-clock"
 
diff --git a/dts/bindings/clock/st,stm32l0-pll-clock.yaml b/dts/bindings/clock/st,stm32l0-pll-clock.yaml
index a62df8ffeae5f..23a79b50d85be 100644
--- a/dts/bindings/clock/st,stm32l0-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32l0-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32L0 and STM32L1 Main PLL node binding:
+  STM32L0/L1 Main PLL.
 
   Takes one of clk_hse, clk_hsi or clk_msi as input clock, with an
   input frequency from 2 to 24 MHz.
diff --git a/dts/bindings/clock/st,stm32l4-pll-clock.yaml b/dts/bindings/clock/st,stm32l4-pll-clock.yaml
index 32ed2c4ae13a2..b4fc59949c355 100644
--- a/dts/bindings/clock/st,stm32l4-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32l4-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32L4 and STM32L5 devices
+  STM32L4/L5 main PLL.
 
   It can be used to describe 3 different PLLs: PLL, PLLSAI1 and PLLSAI2.
   Only main PLL is supported for now.
diff --git a/dts/bindings/clock/st,stm32mp1-rcc.yaml b/dts/bindings/clock/st,stm32mp1-rcc.yaml
index 8282b46d11247..14af40db531da 100644
--- a/dts/bindings/clock/st,stm32mp1-rcc.yaml
+++ b/dts/bindings/clock/st,stm32mp1-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32MP1 Reset and Clock controller node.
+  STM32MP1 RCC (Reset and Clock controller).
+
   On STM32MP1 platforms, clock control configuration is performed on A9 side.
   As a consequence, the only property to be set in devicetree node is the
   clock-frequency (mlhclk_ck).
diff --git a/dts/bindings/clock/st,stm32mp13-cpu-clock-mux.yaml b/dts/bindings/clock/st,stm32mp13-cpu-clock-mux.yaml
new file mode 100644
index 0000000000000..529d9ef82599a
--- /dev/null
+++ b/dts/bindings/clock/st,stm32mp13-cpu-clock-mux.yaml
@@ -0,0 +1,31 @@
+# Copyright (c) 2025, STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  STM32MP13 CPU Clock
+  Describes the STM32MP13 CPU armv7 timer multiplexer.
+  For the STM32MP13 the CPU armv7 timer input can either be the HSI or the HSE.
+  For instance:
+  cpusw: cpusw {
+    #clock-cells = <0>;
+    clocks = <&clk_hsi>;
+    clock-frequency = <DT_FREQ_M(64)>;
+    compatible = "st,stm32mp13-cpu-clock-mux", "st,stm32-clock-mux";
+    status = "okay";
+  };
+
+compatible: "st,stm32mp13-cpu-clock-mux"
+
+include:
+  - name: base.yaml
+    property-allowlist:
+      - status
+      - compatible
+      - clocks
+
+properties:
+  clock-frequency:
+    required: true
+    type: int
+    description: |
+      default frequency in Hz for the timer
diff --git a/dts/bindings/clock/st,stm32mp13-pll-clock.yaml b/dts/bindings/clock/st,stm32mp13-pll-clock.yaml
new file mode 100644
index 0000000000000..5128ea05f0d8e
--- /dev/null
+++ b/dts/bindings/clock/st,stm32mp13-pll-clock.yaml
@@ -0,0 +1,68 @@
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  PLL node binding for STM32MP13 devices
+
+  It can be used to describe 4 different PLLs: PLL1, PLL2, PLL3 and PLL4.
+
+  These PLLs can take one of hse_ck, hsi_ck or csi_ck as input clock.
+  PLLM factor is used to set the input clock in this acceptable range.
+
+  Each PLL has one output clock whose frequency can be computed with the
+  following formula:
+
+    f(PLL_P) = f(VCO clock) / (DIVP × DIVR × DIVQ)
+
+      with f(VCO clock) = f(PLL clock input) × 2 × (((DIVN + 1) + (FRACV / 8192)) / DIVM1)
+
+  Note: To reduce the power consumption, it is recommended to configure the VCOx
+        clock output to the lowest frequency.
+
+  The PLL1 output frequency must not exceed 2000 MHz.
+  The PLL2 output frequency must not exceed 1600 MHz.
+  The PLL3 output frequency must not exceed 800 MHz.
+  The PLL4 output frequency must not exceed 800 MHz.
+
+  Note: The CPU clock should not exceed 1Ghz so avoid configuring the PLL1 to more
+  than 1000 MHz or program the mpuss_ck mux to use the MPUDIV
+  (refer to the stm32mp13 reference manual for details)
+
+compatible: "st,stm32mp13-pll-clock"
+
+include: [clock-controller.yaml, base.yaml]
+
+properties:
+
+  "#clock-cells":
+    const: 0
+
+  clocks:
+    required: true
+
+  div-m:
+    type: int
+    required: true
+    description: |
+        Prescaler for PLLx
+        input clock
+        Valid range: 1 - 64
+
+  mul-n:
+    type: int
+    required: true
+    description: |
+        PLLx multiplication factor for VCO
+        Valid range: 31 - 125
+
+  div-p:
+    type: int
+    description: |
+        PLLx DIVP division factor
+        Valid range: 1 - 128
+
+  frac-v:
+    type: int
+    description: |
+        PLLx FRACV fractional latch
+        Valid range: 1 - 8192
diff --git a/dts/bindings/clock/st,stm32n6-cpu-clock-mux.yaml b/dts/bindings/clock/st,stm32n6-cpu-clock-mux.yaml
index 653a0b0a15a5b..c37cfa4c082a3 100644
--- a/dts/bindings/clock/st,stm32n6-cpu-clock-mux.yaml
+++ b/dts/bindings/clock/st,stm32n6-cpu-clock-mux.yaml
@@ -2,9 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32N6 CPU Clock
+  STM32N6 CPU Clock.
+
   Describes the STM32N6 CPU clock multiplexer. On STM32N6, this is the CPU
   clock that feeds the SysTick.
+
   For instance:
   &cpusw {
     clocks = <&rcc STM32_SRC_IC1 CPU_SEL(3)>;
diff --git a/dts/bindings/clock/st,stm32n6-ic-clock-mux.yaml b/dts/bindings/clock/st,stm32n6-ic-clock-mux.yaml
index 2462d3166b751..fcfdc8b7a25f0 100644
--- a/dts/bindings/clock/st,stm32n6-ic-clock-mux.yaml
+++ b/dts/bindings/clock/st,stm32n6-ic-clock-mux.yaml
@@ -2,8 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32N6 Divider IC multiplexer
-  This node select a clock input and a divider.
+  STM32N6 Divider IC multiplexer.
+
+  This node selects a clock input and a divider.
+
   For instance:
     &ic6 {
       pll-src = <2>;
diff --git a/dts/bindings/clock/st,stm32n6-pll-clock.yaml b/dts/bindings/clock/st,stm32n6-pll-clock.yaml
index b445304aa7d79..ec14ab02b7f2f 100644
--- a/dts/bindings/clock/st,stm32n6-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32n6-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32N6 devices
+  STM32N6 main PLL.
 
   It can be used to describe 4 different PLLs: PLL1, PLL2, PLL3 and PLL4.
 
diff --git a/dts/bindings/clock/st,stm32n6-rcc.yaml b/dts/bindings/clock/st,stm32n6-rcc.yaml
index b3e1750e42a83..d04c26767c68a 100644
--- a/dts/bindings/clock/st,stm32n6-rcc.yaml
+++ b/dts/bindings/clock/st,stm32n6-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 Reset and Clock controller node for STM32N6 devices
+  STM32N6 RCC (Reset and Clock controller).
+
   This node is in charge of system clock ('SYSCLK') source selection and
   System Clock Generation.
 
@@ -119,6 +120,17 @@ properties:
       - 64
       - 128
 
+  timg-prescaler:
+    type: int
+    default: 1
+    description: |
+        TIMG timer group domain prescaler divider, default reset value is 'not divided'.
+    enum:
+      - 1
+      - 2
+      - 4
+      - 8
+
 
 clock-cells:
   - bus
diff --git a/dts/bindings/clock/st,stm32u0-pll-clock.yaml b/dts/bindings/clock/st,stm32u0-pll-clock.yaml
index 73d9d6f7324d5..5e56fc8ffe447 100644
--- a/dts/bindings/clock/st,stm32u0-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32u0-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32U0 Main PLL node binding:
+  STM32U0 Main PLL.
 
   Takes one of clk_hse, clk_hsi or clk_msi as input clock, with
   an input frequency from 2.66 to 16 MHz. PLLM factor is used to set the input
diff --git a/dts/bindings/clock/st,stm32u5-pll-clock.yaml b/dts/bindings/clock/st,stm32u5-pll-clock.yaml
index 241c8acb84197..a83d6c22dfa22 100644
--- a/dts/bindings/clock/st,stm32u5-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32u5-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32U5 devices
+  STM32U5 PLL.
 
   It can be used to describe 3 different PLLs: PLL1, PLL2 and PLL3.
 
diff --git a/dts/bindings/clock/st,stm32u5-rcc.yaml b/dts/bindings/clock/st,stm32u5-rcc.yaml
index 3cf2aa064a3f9..505acf4bf4a3e 100644
--- a/dts/bindings/clock/st,stm32u5-rcc.yaml
+++ b/dts/bindings/clock/st,stm32u5-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32U5 Reset and Clock controller node.
+  STM32U5 RCC (Reset and Clock controller).
+
   For more description confere st,stm32-rcc.yaml
 
 compatible: "st,stm32u5-rcc"
diff --git a/dts/bindings/clock/st,stm32wb-rcc.yaml b/dts/bindings/clock/st,stm32wb-rcc.yaml
index 6867f97fd00c6..fa0aea63bbc2f 100644
--- a/dts/bindings/clock/st,stm32wb-rcc.yaml
+++ b/dts/bindings/clock/st,stm32wb-rcc.yaml
@@ -3,6 +3,7 @@
 
 description: |
   STM32WB Reset and Clock controller node.
+
   For more description confere st,stm32-rcc.yaml
 
 compatible: "st,stm32wb-rcc"
diff --git a/dts/bindings/clock/st,stm32wb0-rcc.yaml b/dts/bindings/clock/st,stm32wb0-rcc.yaml
index bfebe71de2bd2..272889ada7183 100644
--- a/dts/bindings/clock/st,stm32wb0-rcc.yaml
+++ b/dts/bindings/clock/st,stm32wb0-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32WB0 Reset and Clock controller node for STM32WB0 devices
+  STM32WB0 RCC (Reset and Clock controller).
+
   This node is in charge of the system clock ('SYSCLK') source
   selection and generation.
 
diff --git a/dts/bindings/clock/st,stm32wba-pll-clock.yaml b/dts/bindings/clock/st,stm32wba-pll-clock.yaml
index 03a755f0ee3f7..a47b61183f5a8 100644
--- a/dts/bindings/clock/st,stm32wba-pll-clock.yaml
+++ b/dts/bindings/clock/st,stm32wba-pll-clock.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  PLL node binding for STM32WBA devices
+  STM32WBA PLL.
 
   It can be used to describe PLL1
 
diff --git a/dts/bindings/clock/st,stm32wba-rcc.yaml b/dts/bindings/clock/st,stm32wba-rcc.yaml
index 797c366da11ef..ea6bd32e74179 100644
--- a/dts/bindings/clock/st,stm32wba-rcc.yaml
+++ b/dts/bindings/clock/st,stm32wba-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 Reset and Clock controller node.
+  STM32WBA RCC (Reset and Clock controller).
+
   This node is in charge of system clock ('SYSCLK') source selection and controlling
   clocks for AHB (Advanced High Performance) and APB (Advanced Peripheral) bus domains.
 
diff --git a/dts/bindings/clock/st,stm32wl-rcc.yaml b/dts/bindings/clock/st,stm32wl-rcc.yaml
index 882493ea8ea73..5d0ac82bbf45d 100644
--- a/dts/bindings/clock/st,stm32wl-rcc.yaml
+++ b/dts/bindings/clock/st,stm32wl-rcc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32WL Reset and Clock controller node.
+  STM32WL RCC (Reset and Clock controller).
+
   For more description confere st,stm32-rcc.yaml
 
 compatible: "st,stm32wl-rcc"
diff --git a/dts/bindings/clock/wch,ch32v20x_30x-pll-clock.yaml b/dts/bindings/clock/wch,ch32v20x_30x-pll-clock.yaml
new file mode 100644
index 0000000000000..83d1ac89d492f
--- /dev/null
+++ b/dts/bindings/clock/wch,ch32v20x_30x-pll-clock.yaml
@@ -0,0 +1,39 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+description: WCH CH32V20x/30x PLL
+
+compatible: "wch,ch32v20x_30x-pll-clock"
+
+include: [clock-controller.yaml, base.yaml]
+
+properties:
+  "#clock-cells":
+    const: 0
+
+  clocks:
+    type: phandle-array
+    required: true
+
+  mul:
+    type: int
+    required: true
+    description: |
+        Main PLL multiplication factor
+    enum:
+      - 2   # x2
+      - 3   # x3
+      - 4   # x4
+      - 5   # x5
+      - 6   # x6
+      - 7   # x7
+      - 8   # x8
+      - 9   # x2
+      - 10  # x10
+      - 11  # x11
+      - 12  # x12
+      - 13  # x13
+      - 14  # x14
+      - 15  # x15
+      - 16  # x16
+      - 18  # x18
diff --git a/dts/bindings/comparator/renesas,ra-acmphs-global.yaml b/dts/bindings/comparator/renesas,ra-acmphs-global.yaml
new file mode 100644
index 0000000000000..900d3b5259719
--- /dev/null
+++ b/dts/bindings/comparator/renesas,ra-acmphs-global.yaml
@@ -0,0 +1,49 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Renesas RA ACMPHS (High-Speed Analog COMParator) Global
+
+  The following example displays the minimum node layout:
+
+    acmphs_global: acmphs_global@deadbeef {
+            compatible = "renesas,ra-acmphs-global";
+            reg = <0xdeadbeef 0x200>;
+            status = "disabled";
+
+            acmphs0: acmphs0 {
+                    ...
+            };
+    };
+
+  If the pin-output-enable is selected in the comparator controller node,
+  this global node needs to define the VCOUT pin to enable output on that pin.
+
+  Note: The VCOUT pinctrl for the comparator global node is already defined
+  on each board that supported comparator. Please check the board’s pinctrl
+  before defining it.
+
+    acmphs_vcout: acmphs_vcout {
+            group1 {
+                    /* VCOUT */
+                    psels = <RA_PSEL(RA_PSEL_ACMPHS_VCOUT, ..., ...)>;
+            };
+    };
+
+    &acmphs_global {
+            pinctrl-0 = <&acmphs_vcout>;
+            pinctrl-names = "default";
+            status = "okay";
+
+            acmphs0 {
+                    ...
+            };
+    };
+
+  Note: There is only one VCOUT shared across all comparator controller nodes.
+  Therefore, the VCOUT value is the logical OR of the output signals from all
+  comparator controllers that have pin-output-enable enabled.
+
+compatible: "renesas,ra-acmphs-global"
+
+include: [base.yaml, pinctrl-device.yaml]
diff --git a/dts/bindings/comparator/renesas,ra-acmphs.yaml b/dts/bindings/comparator/renesas,ra-acmphs.yaml
new file mode 100644
index 0000000000000..252d161bdec07
--- /dev/null
+++ b/dts/bindings/comparator/renesas,ra-acmphs.yaml
@@ -0,0 +1,119 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Renesas RA ACMPHS (High-Speed Analog COMParator) Controller
+
+  The following example displays the minimum node layout:
+
+    acmphs_global: acmphs_global@deadbeef {
+            ...
+
+            acmphs0: acmphs0 {
+                    compatible = "renesas,ra-acmphs";
+                    channel = <0>;
+                    status = "disabled";
+            };
+    };
+
+  Enabling the comparator controller node requires setting the minimum
+  default configuration of the comparator. This includes selecting the
+  positive and negative inputs, and routing them using pinctrl:
+
+  Note: A set of pinctrl for the default comparator controller node is
+  already defined on each board that supported comparator. Please check
+  the board’s pinctrl before defining it.
+
+  &pinctrl {
+          acmphs_ivref0: acmphs_ivref0 {
+                  group1 {
+                          /* IVREF0 */
+                          psels = <RA_PSEL(RA_PSEL_ACMPHS, ..., ...)>;
+                          renesas,analog-enable;
+                  };
+          };
+
+          acmphs0_ivcmp0: acmphs0_ivcmp0 {
+                  group1 {
+                          /* CH0 IVCMP0 */
+                          psels = <RA_PSEL(RA_PSEL_ACMPHS, ..., ...)>;
+                          renesas,analog-enable;
+                  };
+          };
+  };
+
+  &acmphs_global {
+          status = "okay";
+
+          acmphs0 {
+                  pinctrl-0 = <&acmphs_ivref0 &acmphs0_ivcmp0>;
+                  pinctrl-names = "default";
+                  interrupts = <90 12>;
+                  interrupt-names = "hs";
+                  reference-input-source = "ivref0";
+                  compare-input-source = "ivcmp0";
+                  status = "okay";
+          };
+  };
+
+compatible: "renesas,ra-acmphs"
+
+include: [base.yaml, pinctrl-device.yaml]
+
+properties:
+  channel:
+    type: int
+    required: true
+
+  interrupts:
+    description: |
+      IRQ number and priority to use for interrupt Comparator:
+      - "hs": generated on valid edge detection from comparison result
+      Note: when this interrupts property is not defined, none of the trigger APIs
+            can be used (set_trigger, set_trigger_callback, trigger_is_pending).
+
+  reference-input-source:
+    type: string
+    required: true
+    enum:
+      - "ivref0"
+      - "ivref1"
+      - "ivref2"
+      - "ivref3"
+    description: |
+      Select the Analog reference voltage source.
+      Note: ivref2 is connected to Vref
+            ivref3 is connected to DA0 (DAC)
+            If either of these is selected, there is no need to configure pinsel for pinctrl.
+
+  compare-input-source:
+    type: string
+    required: true
+    enum:
+      - "ivcmp0"
+      - "ivcmp1"
+      - "ivcmp2"
+      - "ivcmp3"
+    description: |
+      Select the Analog compare voltage source.
+      Note: ivcmp1 is connected to DA0 (DAC)
+            If ivcmp1 is selected, there is no need to configure pinsel for pinctrl.
+
+  noise-filter:
+    type: int
+    enum: [1, 8, 16, 32]
+    default: 32
+    description: |
+      Select the PCLK divisor for the hardware digital debounce filter.
+      Larger divisors provide a longer debounce and take longer for the output to update.
+
+  output-invert-polarity:
+    type: boolean
+    description: |
+      When enabled comparator output is inverted.
+
+  pin-output-enable:
+    type: boolean
+    description: |
+      Turn this on to enable the CMPOUTn signal for this channel.
+      The CMPOUTn signal for each channel is OR'd together and the result is output to VCOUT.
diff --git a/dts/bindings/counter/espressif,esp32-rtc-timer.yaml b/dts/bindings/counter/espressif,esp32-rtc-timer.yaml
index a8bc1c1165f01..9e07c064166ff 100644
--- a/dts/bindings/counter/espressif,esp32-rtc-timer.yaml
+++ b/dts/bindings/counter/espressif,esp32-rtc-timer.yaml
@@ -3,7 +3,7 @@
 
 description: |
 
-        Espressif's Counter Driver based on RTC Main Timer.
+        ESP32 Counter Driver based on RTC Main Timer.
 
         Any reset/sleep mode, except for the power-up reset, will not
         stop or reset the RTC Timer. This behavior may be handy when
diff --git a/dts/bindings/counter/espressif,esp32-timer.yaml b/dts/bindings/counter/espressif,esp32-timer.yaml
index 6b0056e8f3468..af425a3652435 100644
--- a/dts/bindings/counter/espressif,esp32-timer.yaml
+++ b/dts/bindings/counter/espressif,esp32-timer.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-        Espressif's general-purpose Timers.
+        ESP32 general-purpose timers.
+
         Each Timer is part of a Timer Group and the number of available Timers
         is SoC-dependent.
 
diff --git a/dts/bindings/counter/ite,it8xxx2-counter.yaml b/dts/bindings/counter/ite,it8xxx2-counter.yaml
new file mode 100644
index 0000000000000..84c4be931569e
--- /dev/null
+++ b/dts/bindings/counter/ite,it8xxx2-counter.yaml
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2025 ITE Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+description: ITE IT8XXX2 counter
+
+compatible: "ite,it8xxx2-counter"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/counter/nxp,kinetis-lptmr.yaml b/dts/bindings/counter/nxp,kinetis-lptmr.yaml
deleted file mode 100644
index 0188b103b1c20..0000000000000
--- a/dts/bindings/counter/nxp,kinetis-lptmr.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-description: Deprecated compatible for NXP LPTMR
-
-compatible: "nxp,kinetis-lptmr"
-
-include: nxp,lptmr.yaml
diff --git a/dts/bindings/counter/raspberrypi,pico-timer.yaml b/dts/bindings/counter/raspberrypi,pico-timer.yaml
index 98afd1b965956..b7fb707512951 100644
--- a/dts/bindings/counter/raspberrypi,pico-timer.yaml
+++ b/dts/bindings/counter/raspberrypi,pico-timer.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 TOKITA Hiroshi
 # SPDX-License-Identifier: Apache-2.0
 
-description: RaspberryPi Pico timer
+description: Raspberry Pi Pico timer
 
 compatible: "raspberrypi,pico-timer"
 
diff --git a/dts/bindings/timer/realtek,rts5912-slwtimer.yaml b/dts/bindings/counter/realtek,rts5912-slwtimer.yaml
similarity index 84%
rename from dts/bindings/timer/realtek,rts5912-slwtimer.yaml
rename to dts/bindings/counter/realtek,rts5912-slwtimer.yaml
index aa8a3f4051049..b27eb33ba14c2 100644
--- a/dts/bindings/timer/realtek,rts5912-slwtimer.yaml
+++ b/dts/bindings/counter/realtek,rts5912-slwtimer.yaml
@@ -7,7 +7,7 @@ description: Realtek RTS5912 32-bit slow timer
 
 compatible: "realtek,rts5912-slwtimer"
 
-include: rtc.yaml
+include: base.yaml
 
 properties:
   reg:
@@ -22,7 +22,9 @@ properties:
     description: Maximum counter value the instance can handle
 
   clock-frequency:
+    type: int
     required: true
+    description: Clock frequency information for timer operation
 
   prescaler:
     type: int
diff --git a/dts/bindings/counter/zephyr,native-sim-counter.yaml b/dts/bindings/counter/zephyr,native-sim-counter.yaml
new file mode 100644
index 0000000000000..0c6749f37b199
--- /dev/null
+++ b/dts/bindings/counter/zephyr,native-sim-counter.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2022, Kumar Gala <galak@kernel.org>
+# SPDX-License-Identifier: Apache-2.0
+
+description: Native_sim Counter
+
+compatible: "zephyr,native-sim-counter"
+
+include: base.yaml
diff --git a/dts/bindings/cpu/arm,cortex-a53.yaml b/dts/bindings/cpu/arm,cortex-a53.yaml
index ef47d2715500a..977440ab13ed0 100644
--- a/dts/bindings/cpu/arm,cortex-a53.yaml
+++ b/dts/bindings/cpu/arm,cortex-a53.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of ARM Cortex-A53 CPU.
+description: ARM Cortex-A53 CPU
 
 compatible: "arm,cortex-a53"
 
diff --git a/dts/bindings/cpu/arm,cortex-a55.yaml b/dts/bindings/cpu/arm,cortex-a55.yaml
index f56db8367d59e..3d2ff73fcf2ec 100644
--- a/dts/bindings/cpu/arm,cortex-a55.yaml
+++ b/dts/bindings/cpu/arm,cortex-a55.yaml
@@ -1,7 +1,7 @@
 # Copyright 2022 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of ARM Cortex-A55 CPU.
+description: ARM Cortex-A55 CPU
 
 compatible: "arm,cortex-a55"
 
diff --git a/dts/bindings/cpu/arm,cortex-a72.yaml b/dts/bindings/cpu/arm,cortex-a72.yaml
index 7d3bf52fbed67..07b2438172aec 100644
--- a/dts/bindings/cpu/arm,cortex-a72.yaml
+++ b/dts/bindings/cpu/arm,cortex-a72.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of ARM Cortex-A72 CPU.
+description: ARM Cortex-A72 CPU
 
 compatible: "arm,cortex-a72"
 
diff --git a/dts/bindings/cpu/arm,cortex-a76.yaml b/dts/bindings/cpu/arm,cortex-a76.yaml
index bd51fa6e8f8d7..1f2419c603ae3 100644
--- a/dts/bindings/cpu/arm,cortex-a76.yaml
+++ b/dts/bindings/cpu/arm,cortex-a76.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of ARM Cortex-A76 CPU.
+description: ARM Cortex-A76 CPU
 
 compatible: "arm,cortex-a76"
 
diff --git a/dts/bindings/cpu/arm,cortex-r52.yaml b/dts/bindings/cpu/arm,cortex-r52.yaml
index 3c7ca1ef5a395..09aa75deb90ed 100644
--- a/dts/bindings/cpu/arm,cortex-r52.yaml
+++ b/dts/bindings/cpu/arm,cortex-r52.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of ARM Cortex-R52 CPU.
+description: ARM Cortex-R52 CPU
 
 compatible: "arm,cortex-r52"
 
diff --git a/dts/bindings/cpu/arm,cortex-r82.yaml b/dts/bindings/cpu/arm,cortex-r82.yaml
index 2bcf3027bbd56..517fcb53745c4 100644
--- a/dts/bindings/cpu/arm,cortex-r82.yaml
+++ b/dts/bindings/cpu/arm,cortex-r82.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of ARM Cortex-R82 CPU.
+description: ARM Cortex-R82 CPU
 
 compatible: "arm,cortex-r82"
 
diff --git a/dts/bindings/cpu/espressif,xtensa-lx6.yaml b/dts/bindings/cpu/espressif,xtensa-lx6.yaml
index bf6d93f26ef87..898a5e7cb2607 100644
--- a/dts/bindings/cpu/espressif,xtensa-lx6.yaml
+++ b/dts/bindings/cpu/espressif,xtensa-lx6.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif Xtensa CPU
+description: Espressif Xtensa LX6 CPU
 
 compatible: "espressif,xtensa-lx6"
 
diff --git a/dts/bindings/cpu/espressif,xtensa-lx7.yaml b/dts/bindings/cpu/espressif,xtensa-lx7.yaml
index 3a2e33ff393cd..a91cd037ac97c 100644
--- a/dts/bindings/cpu/espressif,xtensa-lx7.yaml
+++ b/dts/bindings/cpu/espressif,xtensa-lx7.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif Xtensa CPU
+description: Espressif Xtensa LX7 CPU
 
 compatible: "espressif,xtensa-lx7"
 
diff --git a/dts/bindings/cpu/gaisler,leon3.yaml b/dts/bindings/cpu/gaisler,leon3.yaml
index 6db8519e16664..8d53fab1c1099 100644
--- a/dts/bindings/cpu/gaisler,leon3.yaml
+++ b/dts/bindings/cpu/gaisler,leon3.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: A representation for Gaisler LEON3 CPU.
+description: Gaisler LEON3 CPU
 
 compatible: "gaisler,leon3"
 
diff --git a/dts/bindings/cpu/intel,bartlett-lake.yaml b/dts/bindings/cpu/intel,bartlett-lake.yaml
new file mode 100644
index 0000000000000..1e1c1880e5b39
--- /dev/null
+++ b/dts/bindings/cpu/intel,bartlett-lake.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Intel Corp.
+# SPDX-License-Identifier: Apache-2.0
+
+description: Intel Bartlett Lake CPU
+
+compatible: "intel,bartlett-lake"
+
+include: cpu.yaml
diff --git a/dts/bindings/cpu/neorv32,cpu.yaml b/dts/bindings/cpu/neorv32,cpu.yaml
new file mode 100644
index 0000000000000..fe37ce7a6ebda
--- /dev/null
+++ b/dts/bindings/cpu/neorv32,cpu.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+# SPDX-License-Identifier: Apache-2.0
+
+description: NEORV32 RISC-V CPU
+
+compatible: "neorv32,cpu"
+
+include: riscv,cpus.yaml
diff --git a/dts/bindings/cpu/neorv32-cpu.yaml b/dts/bindings/cpu/neorv32-cpu.yaml
deleted file mode 100644
index b0983771e92af..0000000000000
--- a/dts/bindings/cpu/neorv32-cpu.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
-# SPDX-License-Identifier: Apache-2.0
-
-description: NEORV32 RISC-V CPU
-
-compatible: "neorv32-cpu"
-
-include: riscv,cpus.yaml
diff --git a/dts/bindings/cpu/openhwgroup,cva6.yaml b/dts/bindings/cpu/openhwgroup,cva6.yaml
new file mode 100644
index 0000000000000..e81428bfde392
--- /dev/null
+++ b/dts/bindings/cpu/openhwgroup,cva6.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+description: OpenHW Group CVA6 CPU
+
+compatible: "openhwgroup,cva6"
+
+include: riscv,cpus.yaml
+
+properties:
+  timebase-frequency:
+    required: true
+    type: int
+    description: Clock speed at which the core-local machine timer operates.
diff --git a/dts/bindings/cpu/qemu,riscv-virt.yaml b/dts/bindings/cpu/qemu,riscv-virt.yaml
index c4c5a8b174eca..9f4f7406a26d9 100644
--- a/dts/bindings/cpu/qemu,riscv-virt.yaml
+++ b/dts/bindings/cpu/qemu,riscv-virt.yaml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: QEMU RISC-V virt machine CPU node
+description: QEMU RISC-V virt machine CPU
 
 compatible: "qemu,riscv-virt"
 
diff --git a/dts/bindings/cpu/wch,qingke-v4c.yaml b/dts/bindings/cpu/wch,qingke-v4c.yaml
new file mode 100644
index 0000000000000..2fd160474c268
--- /dev/null
+++ b/dts/bindings/cpu/wch,qingke-v4c.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+description: WCH QingKe V4C RISC-V MCU
+
+compatible: "wch,qingke-v4c"
+
+include: riscv,cpus.yaml
diff --git a/dts/bindings/cpu/zephyr,native-posix-cpu.yaml b/dts/bindings/cpu/zephyr,native-posix-cpu.yaml
index d5cc2a4ecc40c..50a54ab6eb6cc 100644
--- a/dts/bindings/cpu/zephyr,native-posix-cpu.yaml
+++ b/dts/bindings/cpu/zephyr,native-posix-cpu.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: A representation for native_posix CPU.
+description: native_posix CPU
 
 compatible: "zephyr,native-posix-cpu"
 
diff --git a/dts/bindings/cpu/zephyr,native-sim-cpu.yaml b/dts/bindings/cpu/zephyr,native-sim-cpu.yaml
new file mode 100644
index 0000000000000..804bf61fb23ea
--- /dev/null
+++ b/dts/bindings/cpu/zephyr,native-sim-cpu.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: native_sim CPU
+
+compatible: "zephyr,native-sim-cpu"
+
+include: cpu.yaml
diff --git a/dts/bindings/crypto/ti,cc23x0-aes.yaml b/dts/bindings/crypto/ti,cc23x0-aes.yaml
new file mode 100644
index 0000000000000..6a1348dcea54e
--- /dev/null
+++ b/dts/bindings/crypto/ti,cc23x0-aes.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) Copyright (c) 2024 BayLibre, SAS
+# SPDX-License-Identifier: Apache-2.0
+
+description: TI CC23X0 AES accelerator.
+
+compatible: "ti,cc23x0-aes"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/dac/espressif,esp32-dac.yaml b/dts/bindings/dac/espressif,esp32-dac.yaml
index 39c63d7642e71..18f24c1f2095e 100644
--- a/dts/bindings/dac/espressif,esp32-dac.yaml
+++ b/dts/bindings/dac/espressif,esp32-dac.yaml
@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    Espressif Digital to Analog converter (DAC) control node
-    is part of the RTC low-power domain and belongs to the SENSE
+    ESP32 Digital to Analog converter (DAC)
+
+    Part of the RTC low-power domain and belongs to the SENSE
     peripherals set. RTC peripherals has GPIOs controlled by the
     RTCIO mux, which is separated from the main IO mux.
 
diff --git a/dts/bindings/dac/renesas,ra-dac-global.yaml b/dts/bindings/dac/renesas,ra-dac-global.yaml
index d6d4286ead4d5..c9b8b6e790d0b 100644
--- a/dts/bindings/dac/renesas,ra-dac-global.yaml
+++ b/dts/bindings/dac/renesas,ra-dac-global.yaml
@@ -10,16 +10,24 @@ include: [base.yaml]
 properties:
   has-internal-output:
     type: boolean
-    description: True if the SoC supports the internal output feature in the DAC HWIP
+    description: |
+      True if the SoC supports the "internal output" feature in the DAC HWIP.
+      Note: If the SoC doesn't support this "internal output" features,
+            it cannot support the "internal" feature.
 
   has-output-amplifier:
     type: boolean
-    description: True if the SoC supports the output amplifier feature in the DAC HWIP
+    description: |
+      True if the SoC supports the "output amplifier" feature in the DAC HWIP.
 
   has-chargepump:
     type: boolean
-    description: True if the SoC supports the chargepump feature in the DAC HWIP
+    description: |
+      True if the SoC supports the "chargepump" feature in the DAC HWIP.
+      Note: If the SoC doesn't support the "output amplifier" and "charge pump" features,
+            it cannot support the "buffer" feature.
 
   has-davrefcr:
     type: boolean
-    description: True if the SoC supports the D/A VREF configuration in the DAC HWIP
+    description: |
+      True if the SoC supports the D/A VREF configuration in the DAC HWIP.
diff --git a/dts/bindings/dac/st,stm32-dac.yaml b/dts/bindings/dac/st,stm32-dac.yaml
index 5b142d528bc17..325ac2495a185 100644
--- a/dts/bindings/dac/st,stm32-dac.yaml
+++ b/dts/bindings/dac/st,stm32-dac.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Libre Solar Technologies GmbH
 # SPDX-License-Identifier: Apache-2.0
 
-description: ST STM32 family DAC
+description: STM32 family DAC
 
 compatible: "st,stm32-dac"
 
diff --git a/dts/bindings/dac/ti,dac161s997.yaml b/dts/bindings/dac/ti,dac161s997.yaml
new file mode 100644
index 0000000000000..f932643ff2493
--- /dev/null
+++ b/dts/bindings/dac/ti,dac161s997.yaml
@@ -0,0 +1,14 @@
+# Copyright (C) 2025 Vitrolife A/S
+# SPDX-License-Identifier: Apache-2.0
+
+description: TI DAC161S997 16-bit 1 channel SPI DAC for 4-20 mA loops
+
+compatible: "ti,dac161s997"
+
+include: [dac-controller.yaml, spi-device.yaml]
+
+properties:
+  errb-gpios:
+    type: phandle-array
+    description: |
+      DAC error signal output. If set a callback can be set to read what caused the error.
diff --git a/dts/bindings/dai/intel,adsp-dmic-vss.yaml b/dts/bindings/dai/intel,adsp-dmic-vss.yaml
index 6994e3baf6f29..72ae40f1d6a91 100644
--- a/dts/bindings/dai/intel,adsp-dmic-vss.yaml
+++ b/dts/bindings/dai/intel,adsp-dmic-vss.yaml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: Intel DMIC Vendor SHIM controller
+description: Intel DMIC Vendor SHIM Controller
 
 compatible: "intel,adsp-dmic-vss"
 
diff --git a/dts/bindings/dai/intel,dai-dmic.yaml b/dts/bindings/dai/intel,dai-dmic.yaml
index 44c886b0d6a88..9e0b4ecec8f1e 100644
--- a/dts/bindings/dai/intel,dai-dmic.yaml
+++ b/dts/bindings/dai/intel,dai-dmic.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Intel Digital PDM Microphone (DMIC) node
+description: Intel Digital PDM Microphone (DMIC)
 
 compatible: "intel,dai-dmic"
 
diff --git a/dts/bindings/dai/mediatek,afe.yaml b/dts/bindings/dai/mediatek,afe.yaml
index 53a6d9fe78872..18f5165fba667 100644
--- a/dts/bindings/dai/mediatek,afe.yaml
+++ b/dts/bindings/dai/mediatek,afe.yaml
@@ -5,11 +5,11 @@ compatible: "mediatek,afe"
 include: base.yaml
 
 properties:
-  dai_id:
+  dai-id:
     type: int
     required: true
     description: Host-defined SOF DAI index.  Must match the Linux kernel driver.
-  afe_name:
+  afe-name:
     type: string
     required: true
   downlink:
@@ -34,7 +34,7 @@ properties:
   enable:
     type: array
     description: Channel enable flag
-  agent_disable:
+  agent-disable:
     type: array
     description: Channel disable flag
   fs:
@@ -43,19 +43,19 @@ properties:
   hd:
     type: array
     description: Sample format register
-  ch_num:
+  ch-num:
     type: array
     description: Channel count register
   mono:
     type: array
     description: Mono flag register
-  mono_invert:
+  mono-invert:
     type: boolean
     description: Sense/meaning of mono flag
-  quad_ch:
+  quad-ch:
     type: array
     description: Quad channel flag register
-  int_odd:
+  int-odd:
     type: array
   msb:
     type: array
diff --git a/dts/bindings/dai/nxp,dai-esai.yaml b/dts/bindings/dai/nxp,dai-esai.yaml
index b179a8c6b9ba3..925e527ef705a 100644
--- a/dts/bindings/dai/nxp,dai-esai.yaml
+++ b/dts/bindings/dai/nxp,dai-esai.yaml
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP Enhanced Serial Audio Interface (ESAI) node
+description: NXP Enhanced Serial Audio Interface (ESAI)
 
 compatible: "nxp,dai-esai"
 
diff --git a/dts/bindings/dai/nxp,dai-micfil.yaml b/dts/bindings/dai/nxp,dai-micfil.yaml
index 3c0f5bf7f2178..870484dcfd253 100644
--- a/dts/bindings/dai/nxp,dai-micfil.yaml
+++ b/dts/bindings/dai/nxp,dai-micfil.yaml
@@ -1,7 +1,7 @@
 # Copyright 2023 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP PDM MICFIL node
+description: NXP PDM MICFIL
 
 compatible: "nxp,dai-micfil"
 
diff --git a/dts/bindings/dai/nxp,dai-sai.yaml b/dts/bindings/dai/nxp,dai-sai.yaml
index 082cdb9eef689..3b0f7a5929ef7 100644
--- a/dts/bindings/dai/nxp,dai-sai.yaml
+++ b/dts/bindings/dai/nxp,dai-sai.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP Synchronous Audio Interface (SAI) node
+  NXP Synchronous Audio Interface (SAI)
 
   Below you may find some configuration examples:
 
diff --git a/dts/bindings/display/renesas,ra-glcdc.yaml b/dts/bindings/display/renesas,ra-glcdc.yaml
index c57816709c12d..c4186d1b7610e 100644
--- a/dts/bindings/display/renesas,ra-glcdc.yaml
+++ b/dts/bindings/display/renesas,ra-glcdc.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Renesas Electronics Corporation
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 description: Renesas Graphic LCD controller
@@ -15,10 +15,9 @@ properties:
     required: true
 
   pinctrl-0:
-    required: true
-
-  pinctrl-names:
-    required: true
+    description: |
+      Provide a pin configuration for using parallel pixel output. In combination with DSI HOST
+      the pin configuration is not necessary due to dedicated (MIPI D-PHY) pins.
 
   interrupts:
     required: true
@@ -30,11 +29,74 @@ properties:
 
   backlight-gpios:
     type: phandle-array
-    required: true
     description: |
       The BLn pin is asserted to control the backlight of the panel.
       The sensor receives this as an active-high signal.
 
+  output-pin-hsync:
+    type: string
+    enum:
+      - "TCON_PIN_NONE"
+      - "TCON_PIN_0"
+      - "TCON_PIN_1"
+      - "TCON_PIN_2"
+      - "TCON_PIN_3"
+    description: Select the Parallel LCD HSYNC pin. Please do not select if using DSI Display.
+
+  output-pin-vsync:
+    type: string
+    enum:
+      - "TCON_PIN_NONE"
+      - "TCON_PIN_0"
+      - "TCON_PIN_1"
+      - "TCON_PIN_2"
+      - "TCON_PIN_3"
+    description: Select the Parallel LCD VSYNC pin. Please do not select if using DSI Display.
+
+  output-pin-de:
+    type: string
+    enum:
+      - "TCON_PIN_NONE"
+      - "TCON_PIN_0"
+      - "TCON_PIN_1"
+      - "TCON_PIN_2"
+      - "TCON_PIN_3"
+    description: Select the Parallel LCD DE pin. Please do not select if using DSI Display.
+
+  output-clock-divisor:
+    type: int
+    enum: [1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 16, 24, 32]
+    description: |
+      Select the GLCDC clock frequency division ratio to output for panel.
+
+  output-endian:
+    type: string
+    enum:
+      - "LITTLE"
+      - "BIG"
+    description: Select the output data bit order. Default is little endian.
+
+  output-color-oder:
+    type: string
+    enum:
+      - "RGB"
+      - "GBR"
+    description: Select the output color order in pixel. Default is RGB.
+
+  output-data-signal-polarity:
+    type: string
+    enum:
+      - "LOACTIVE"
+      - "HIACTIVE"
+    description: Select the output data enable signal polarity. Default is high active.
+
+  output-signal-sync-edge:
+    type: string
+    enum:
+      - "FALLING"
+      - "RISING"
+    description: Select the output signal synchronization edge. Default is falling edge.
+
   input-pixel-format:
     type: int
     required: true
@@ -46,3 +108,19 @@ properties:
     required: true
     description: |
       Initial output Pixel format for Graphic LCD controller.
+
+  def-back-color-alpha:
+    type: int
+    description: Default display background color - alpha
+
+  def-back-color-red:
+    type: int
+    description: Default display background color - red
+
+  def-back-color-green:
+    type: int
+    description: Default display background color - green
+
+  def-back-color-blue:
+    type: int
+    description: Default display background color - blue
diff --git a/dts/bindings/display/sitronix,st7567-common.yaml b/dts/bindings/display/sitronix,st7567-common.yaml
new file mode 100644
index 0000000000000..1152a781759b5
--- /dev/null
+++ b/dts/bindings/display/sitronix,st7567-common.yaml
@@ -0,0 +1,44 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+include: display-controller.yaml
+
+properties:
+  column-offset:
+    type: int
+    required: true
+    description: 8-bits start column address
+
+  line-offset:
+    type: int
+    required: true
+    description: 6-bits start line offset
+
+  regulation-ratio:
+    type: int
+    required: true
+    description: Regulation resistor ratio (3-bits RR2 RR1 RR0)
+
+  segment-invdir:
+    type: boolean
+    description: Scan direction is from last SEG output to first SEG output
+
+  com-invdir:
+    type: boolean
+    description: Scan direction is from last COM output to first COM output
+
+  inversion-on:
+    type: boolean
+    description: Invert display
+
+  bias:
+    type: boolean
+    description: Bias setting (0 for 1/9, or 1 for 1/7)
+
+  reset-gpios:
+    type: phandle-array
+    description: RESET pin.
+
+      The RESET pin of ST7567 is active low.
+      If connected directly, the MCU pin should be configured
+      as active low.
diff --git a/dts/bindings/display/sitronix,st7567-i2c.yaml b/dts/bindings/display/sitronix,st7567-i2c.yaml
new file mode 100644
index 0000000000000..a0554d902a643
--- /dev/null
+++ b/dts/bindings/display/sitronix,st7567-i2c.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+description: ST7567 132x65 dot-matrix LCD controller on I2C bus
+
+compatible: "sitronix,st7567"
+
+include: ["sitronix,st7567-common.yaml", "i2c-device.yaml"]
diff --git a/dts/bindings/display/sitronix,st7567-spi.yaml b/dts/bindings/display/sitronix,st7567-spi.yaml
new file mode 100644
index 0000000000000..e90722e38efd5
--- /dev/null
+++ b/dts/bindings/display/sitronix,st7567-spi.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+description: ST7567 132x65 dot-matrix LCD controller on SPI bus
+
+compatible: "sitronix,st7567"
+
+include: ["sitronix,st7567-common.yaml", "spi-device.yaml"]
+
+properties:
+  data-cmd-gpios:
+    type: phandle-array
+    required: true
+    description: D/C# pin.
diff --git a/dts/bindings/display/sitronix,st7701.yaml b/dts/bindings/display/sitronix,st7701.yaml
new file mode 100644
index 0000000000000..d17aff0dcf409
--- /dev/null
+++ b/dts/bindings/display/sitronix,st7701.yaml
@@ -0,0 +1,88 @@
+# Copyright (c) 2025 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Sitronix ST7701 Panel
+
+compatible: "sitronix,st7701"
+
+include: [mipi-dsi-device.yaml, display-controller.yaml]
+
+properties:
+  reset-gpios:
+    type: phandle-array
+    description: |
+      The RESETn pin is asserted to disable the sensor causing a hard
+      reset.  The sensor receives this as an active-low signal.
+
+  bl-gpios:
+    type: phandle-array
+    description: |
+      The BLn pin is asserted to control the backlight of the panel.
+      The sensor receives this as an active-high signal.
+
+  rotation:
+    type: int
+    default: 0
+    enum:
+      - 0
+      - 90
+      - 180
+      - 270
+    description: |
+      Display rotation (CW) in degrees. Defaults to 0, display default.
+
+  gip-e0:
+    type: uint8-array
+    description: GIP setting at address 0xE0.
+
+  gip-e1:
+    type: uint8-array
+    description: GIP setting at address 0xE1.
+
+  gip-e2:
+    type: uint8-array
+    description: GIP setting at address 0xE2.
+
+  gip-e3:
+    type: uint8-array
+    description: GIP setting at address 0xE3.
+
+  gip-e4:
+    type: uint8-array
+    description: GIP setting at address 0xE4.
+
+  gip-e5:
+    type: uint8-array
+    description: GIP setting at address 0xE5.
+
+  gip-e6:
+    type: uint8-array
+    description: GIP setting at address 0xE6.
+
+  gip-e7:
+    type: uint8-array
+    description: GIP setting at address 0xE7.
+
+  gip-e8:
+    type: uint8-array
+    description: GIP setting at address 0xE8.
+
+  gip-eb:
+    type: uint8-array
+    description: GIP setting at address 0xEB.
+
+  gip-ec:
+    type: uint8-array
+    description: GIP setting at address 0xEC.
+
+  gip-ed:
+    type: uint8-array
+    description: GIP setting at address 0xED.
+
+  pvgamctrl:
+    type: uint8-array
+    description: Positive voltage gamma control.
+
+  nvgamctrl:
+    type: uint8-array
+    description: Negative voltage gamma control.
diff --git a/dts/bindings/dma/espressif,esp32-gdma.yaml b/dts/bindings/dma/espressif,esp32-gdma.yaml
index f50745dd842cb..ecbdc58057cd2 100644
--- a/dts/bindings/dma/espressif,esp32-gdma.yaml
+++ b/dts/bindings/dma/espressif,esp32-gdma.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Espressif's GDMA (General Direct Memory Access) Node
+  ESP32 GDMA (General Direct Memory Access)
 
   General Direct Memory Access (GDMA) is a feature that allows
   peripheral-to-memory, memory-to-peripheral, and memory-to-memory
@@ -16,7 +16,7 @@ description: |
   ESP32C3's Peripherals with GDMA:
   * SPI2
   * UHCI0 (UART0/UART1)
-  * I2S (Not Supported yet)
+  * I2S
   * AES (Not Supported yet)
   * SHA (Not Supported yet)
   * ADC
@@ -29,12 +29,12 @@ description: |
   * SPI2
   * SPI3
   * UHCI0
-  * I2S0 (Not Supported yet)
-  * I2S1 (Not Supported yet)
-  * LCD/CAM (Not Supported yet)
+  * I2S0
+  * I2S1
+  * LCD/CAM
   * AES (Not Supported yet)
   * SHA (Not Supported yet)
-  * ADC (Not Supported yet)
+  * ADC
   * RMT (Not Supported yet)
 
 compatible: "espressif,esp32-gdma"
diff --git a/dts/bindings/dma/infineon,cat1-dma.yaml b/dts/bindings/dma/infineon,cat1-dma.yaml
index 12cab4b804184..015c7be5524c5 100644
--- a/dts/bindings/dma/infineon,cat1-dma.yaml
+++ b/dts/bindings/dma/infineon,cat1-dma.yaml
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: Infineon CAT1 DMA node
+description: Infineon CAT1 DMA
 
 compatible: "infineon,cat1-dma"
 
diff --git a/dts/bindings/dma/intel,adsp-gpdma.yaml b/dts/bindings/dma/intel,adsp-gpdma.yaml
index e71f05604ebfb..db929a8b8a8d9 100644
--- a/dts/bindings/dma/intel,adsp-gpdma.yaml
+++ b/dts/bindings/dma/intel,adsp-gpdma.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Intel ADSP Designware based General Purpose DMA Controller node
+description: Intel ADSP Designware based General Purpose DMA Controller
 
 compatible: "intel,adsp-gpdma"
 
diff --git a/dts/bindings/dma/intel,lpss.yaml b/dts/bindings/dma/intel,lpss.yaml
index d9fc4a60f1140..733adf33762a5 100644
--- a/dts/bindings/dma/intel,lpss.yaml
+++ b/dts/bindings/dma/intel,lpss.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: LPSS DMA Controller node
+description: LPSS DMA Controller
 
 compatible: "intel,lpss"
 
diff --git a/dts/bindings/dma/nxp,edma.yaml b/dts/bindings/dma/nxp,edma.yaml
index d5c58f624adc3..0521ffd689b81 100644
--- a/dts/bindings/dma/nxp,edma.yaml
+++ b/dts/bindings/dma/nxp,edma.yaml
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP enhanced Direct Memory Access (eDMA) node
+description: NXP enhanced Direct Memory Access (eDMA)
 
 compatible: "nxp,edma"
 
diff --git a/dts/bindings/dma/nxp,mcux-edma.yaml b/dts/bindings/dma/nxp,mcux-edma.yaml
index 17c8b3c3d22b0..9027390c1a5c0 100644
--- a/dts/bindings/dma/nxp,mcux-edma.yaml
+++ b/dts/bindings/dma/nxp,mcux-edma.yaml
@@ -40,7 +40,7 @@ properties:
     type: boolean
     description: If the DMA controller supports memory to memory transfer
 
-  nxp,a_on:
+  nxp,a-on:
     type: boolean
     description: If the DMA controller supports always on
 
diff --git a/dts/bindings/dma/nxp,sdma.yaml b/dts/bindings/dma/nxp,sdma.yaml
index 817e9528a49f4..02e96914009c1 100644
--- a/dts/bindings/dma/nxp,sdma.yaml
+++ b/dts/bindings/dma/nxp,sdma.yaml
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP SDMA node
+description: NXP SDMA
 
 compatible: "nxp,sdma"
 
diff --git a/dts/bindings/dma/nxp,sof-host-dma.yaml b/dts/bindings/dma/nxp,sof-host-dma.yaml
index ebb03c46d8bf0..fb979a5f32bd3 100644
--- a/dts/bindings/dma/nxp,sof-host-dma.yaml
+++ b/dts/bindings/dma/nxp,sof-host-dma.yaml
@@ -1,7 +1,7 @@
 # Copyright 2023 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP SOF host DMA node
+description: NXP SOF host DMA
 
 compatible: "nxp,sof-host-dma"
 
diff --git a/dts/bindings/dma/renesas,rz-dma.yaml b/dts/bindings/dma/renesas,rz-dma.yaml
new file mode 100644
index 0000000000000..8934f2253d117
--- /dev/null
+++ b/dts/bindings/dma/renesas,rz-dma.yaml
@@ -0,0 +1,39 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  RZ DMA controller
+
+  channel: Select channel for data transmitting
+
+  config: A 32bit mask specifying the DMA channel configuration
+
+   Example of devicetree configuration
+
+   &ssi0 {
+        status = "okay";
+
+        dmas = <&dma0 0 RZ_DMA_PERIPH_TO_MEM>, <&dma0 5 RZ_DMA_MEM_TO_PERIPH>
+        dma-names = "rx", "tx";
+   };
+
+compatible: "renesas,rz-dma"
+
+include: [dma-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  dma-channels:
+    required: true
+
+  "#dma-cells":
+    const: 2
+
+dma-cells:
+  - channel
+  - config
diff --git a/dts/bindings/dma/silabs,ldma.yaml b/dts/bindings/dma/silabs,ldma.yaml
index 88715805d9813..606468e4a211b 100644
--- a/dts/bindings/dma/silabs,ldma.yaml
+++ b/dts/bindings/dma/silabs,ldma.yaml
@@ -21,7 +21,7 @@ properties:
   interrupts:
     required: true
 
-  dma_channels:
+  dma-channels:
     type: int
     required: true
 
diff --git a/dts/bindings/dma/silabs,siwx91x-dma.yaml b/dts/bindings/dma/silabs,siwx91x-dma.yaml
index c8138e56ff755..c6ff3b01da38f 100644
--- a/dts/bindings/dma/silabs,siwx91x-dma.yaml
+++ b/dts/bindings/dma/silabs,siwx91x-dma.yaml
@@ -1,4 +1,4 @@
-description: Silabs SiWx91x DMA node
+description: Silabs SiWx91x DMA
 
 compatible: "silabs,siwx91x-dma"
 
@@ -8,15 +8,13 @@ properties:
   reg:
     required: true
 
-  silabs,sram-desc-addr:
-    type: int
-    required: true
+  silabs,sram-region:
+    type: phandle
     description: |
-        SRAM Address for UDMA Descriptor Storage. This address must correspond to the location
-        of the udma_addr0 section in the linker script for the dma0 node, and the udma_addr1
-        section for the ulpdma node. Ensure that the value specified for the SRAM address matches
-        the respective section defined in the linker file for each UDMA node, as this alignment
-        is critical for proper descriptor management and data transfer.
+        SRAM Address for UDMA Descriptor Storage. Some instance require this
+        buffer to be placed in a specific area. If the instance doesn't have
+        this requirement, this attribute is not required and the memory will
+        will be automatically allocated.
 
   "#dma-cells":
     const: 1
diff --git a/dts/bindings/dma/snps,designware-dma-axi.yaml b/dts/bindings/dma/snps,designware-dma-axi.yaml
index baf27c45787df..57f4c588c1d25 100644
--- a/dts/bindings/dma/snps,designware-dma-axi.yaml
+++ b/dts/bindings/dma/snps,designware-dma-axi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Synopsys Designware axi DMA Controller node
+description: Synopsys Designware axi DMA Controller
 
 compatible: "snps,designware-dma-axi"
 
diff --git a/dts/bindings/dma/snps,designware-dma.yaml b/dts/bindings/dma/snps,designware-dma.yaml
index bcc85ffcc769d..0f24c71327f18 100644
--- a/dts/bindings/dma/snps,designware-dma.yaml
+++ b/dts/bindings/dma/snps,designware-dma.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Synopsys Designware DMA Controller node
+description: Synopsys Designware DMA Controller
 
 compatible: "snps,designware-dma"
 
diff --git a/dts/bindings/dma/st,stm32u5-dma.yaml b/dts/bindings/dma/st,stm32u5-dma.yaml
index 57b0ce0138ea1..b9d6f8a041db8 100644
--- a/dts/bindings/dma/st,stm32u5-dma.yaml
+++ b/dts/bindings/dma/st,stm32u5-dma.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 DMA controller for the stm32U5 soc family
+  STM32U5 DMA controller.
 
   It is present on stm32U5 devices as a GP DMA
   This controller includes several channels with different requests.
diff --git a/dts/bindings/dma/ti,cc23x0-dma.yaml b/dts/bindings/dma/ti,cc23x0-dma.yaml
new file mode 100644
index 0000000000000..5c7ddb206b7f8
--- /dev/null
+++ b/dts/bindings/dma/ti,cc23x0-dma.yaml
@@ -0,0 +1,38 @@
+# Copyright (c) 2024 BayLibre, SAS
+# SPDX-License-Identifier: Apache-2.0
+
+description: TI CC23X0 DMA controller
+
+compatible: "ti,cc23x0-dma"
+
+include: dma-controller.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  "#dma-cells":
+    const: 2
+    description: |
+      The 1st cell specifies the DMA channel to be used for the data transfer.
+      This channel should be unique between all peripherals that are using the
+      DMA instance.
+      The 2nd cell defines the peripheral trigger which is the source of the transfer.
+      See the SoC's reference manual for all the supported request sources.
+
+      Example of devicetree DMA channel configuration for the client part:
+
+      &uart0 {
+          dmas = <&dma 0 7>, <&dma 1 6>;
+          dma-names = "rx", "tx";
+      };
+
+      Above, fragment 0 and 1 represent the different channels used to transfer
+      data between peripheral and RAM. The numbers 7/6 are uart0 rx/tx triggers.
+
+dma-cells:
+  - channel
+  - trigsrc
diff --git a/dts/bindings/dma/wch,wch-dma.yaml b/dts/bindings/dma/wch,wch-dma.yaml
new file mode 100644
index 0000000000000..157edfe01ea81
--- /dev/null
+++ b/dts/bindings/dma/wch,wch-dma.yaml
@@ -0,0 +1,33 @@
+# Copyright (c) 2024 Paul Wedeck <paulwedeck@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  WCH DMA controller
+
+  The WCH DMA controller is a general-purpose direct memory access controller
+  featuring between 7 and 11 independent channels.
+  Every channel is capable of memory-to-memory, memory-to-peripheral, and
+  peripheral-to-memory access.
+
+  Mapping of peripheral requests to DMA channels is limited and SoC specific.
+  Commonly, each peripheral request maps to just a single DMA channel.
+  The controller supports 8, 16, and 32 bit width memory access.
+
+  It is present on WCH CH32V and CH32X series SoCs.
+
+compatible: "wch,wch-dma"
+
+include: dma-controller.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  "#dma-cells":
+    const: 1
+
+dma-cells:
+  - channel
diff --git a/dts/bindings/dsa/microchip,ksz8463.yaml b/dts/bindings/dsa/microchip,ksz8463.yaml
new file mode 100644
index 0000000000000..06df462ad4cb9
--- /dev/null
+++ b/dts/bindings/dsa/microchip,ksz8463.yaml
@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Aleksandr Senin <al@meshium.net>
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    KSZ8463 ethernet switch
+
+compatible: "microchip,ksz8463"
+
+include: [microchip_dsa.yaml]
diff --git a/dts/bindings/espi/microchip,xec-espi-saf.yaml b/dts/bindings/espi/microchip,xec-espi-saf.yaml
index 995052bbf69fd..e74ee0a29ed2d 100644
--- a/dts/bindings/espi/microchip,xec-espi-saf.yaml
+++ b/dts/bindings/espi/microchip,xec-espi-saf.yaml
@@ -13,26 +13,26 @@ properties:
     description: mmio register space
     required: true
 
-  io_girq:
+  io-girq:
     type: int
     description: soc group irq index for eSPI I/O
 
-  poll_timeout:
+  poll-timeout:
     type: int
     description: poll flash busy timeout in 32KHz periods
 
-  poll_interval:
+  poll-interval:
     type: int
     description: interval between flash busy poll in 20 ns units
 
-  consec_rd_timeout:
+  consec-rd-timeout:
     type: int
     description: timeout after last read to resume supended operations in 20 ns units
 
-  sus_chk_delay:
+  sus-chk-delay:
     type: int
     description: hold off poll after suspend in 20 ns units
 
-  sus_rsm_interval:
+  sus-rsm-interval:
     type: int
     description: force suspended erase or program to resume in 32KHz periods
diff --git a/dts/bindings/espi/microchip,xec-espi.yaml b/dts/bindings/espi/microchip,xec-espi.yaml
index b3fb2474a04f0..df03c6f19325d 100644
--- a/dts/bindings/espi/microchip,xec-espi.yaml
+++ b/dts/bindings/espi/microchip,xec-espi.yaml
@@ -12,17 +12,17 @@ properties:
     description: mmio register space
     required: true
 
-  io_girq:
+  io-girq:
     type: int
     description: soc group irq index for eSPI I/O
     required: true
 
-  vw_girqs:
+  vw-girqs:
     type: array
     description: soc group irq indexes for eSPI virtual wires channel
     required: true
 
-  pc_girq:
+  pc-girq:
     type: int
     description: soc group irq index for eSPI peripheral channel
     required: true
diff --git a/dts/bindings/ethernet/davicom,dm8806-phy.yaml b/dts/bindings/ethernet/davicom,dm8806-phy.yaml
index 13fe82c1e9301..c4196bfe33449 100644
--- a/dts/bindings/ethernet/davicom,dm8806-phy.yaml
+++ b/dts/bindings/ethernet/davicom,dm8806-phy.yaml
@@ -29,6 +29,7 @@ properties:
       Absolute address is the address of the concrete register in MAC PHY0
       which is responsible for Ethernet Port0 in Davicom DM8806
   reg-switch:
+    type: int
     required: true
     description: |
       5-bit PHY address for Switch Per-Port Registers group of Davicom DM8806
@@ -48,9 +49,11 @@ properties:
       which is responsible for Ethernet Port0 in Davicom DM8806
   reset-gpios:
     type: phandle-array
+    required: true
     description: GPIO connected to MAC PHY reset signal pin. Reset is active low.
   int-gpios:
     type: phandle-array
+    required: true
     description: GPIO for   upt signal indicating MAC PHY state change.
   davicom,interface-type:
     type: string
diff --git a/dts/bindings/ethernet/st,stm32-ethernet-common.yaml b/dts/bindings/ethernet/st,stm32-ethernet-common.yaml
index 4b3707d061073..2ebaae6a481fe 100644
--- a/dts/bindings/ethernet/st,stm32-ethernet-common.yaml
+++ b/dts/bindings/ethernet/st,stm32-ethernet-common.yaml
@@ -6,8 +6,6 @@
 include: [ethernet-controller.yaml, pinctrl-device.yaml]
 
 properties:
-  reg:
-    required: true
   interrupts:
     required: true
   clocks:
@@ -18,3 +16,7 @@ properties:
     required: true
   pinctrl-names:
     required: true
+  phy-connection-type:
+    required: true
+  phy-handle:
+    required: true
diff --git a/dts/bindings/ethernet/st,stm32-ethernet-controller.yaml b/dts/bindings/ethernet/st,stm32-ethernet-controller.yaml
new file mode 100644
index 0000000000000..eedc3f2ada0a2
--- /dev/null
+++ b/dts/bindings/ethernet/st,stm32-ethernet-controller.yaml
@@ -0,0 +1,18 @@
+# Copyright The Zephyr Project Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  ST STM32 Ethernet controller, contains the Ethernet MAC
+  and the MDIO as a child nodes.
+
+compatible: "st,stm32-ethernet-controller"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+  clocks:
+    required: true
+  clock-names:
+    required: true
diff --git a/dts/bindings/ethernet/st,stm32-ethernet.yaml b/dts/bindings/ethernet/st,stm32-ethernet.yaml
index 67f211194dc6b..154729490ee41 100644
--- a/dts/bindings/ethernet/st,stm32-ethernet.yaml
+++ b/dts/bindings/ethernet/st,stm32-ethernet.yaml
@@ -2,7 +2,8 @@
 # Copyright (c) 2024, STMicroelectronics
 # SPDX-License-Identifier: Apache-2.0
 
-description: ST STM32 Ethernet
+description: |
+  ST STM32 Ethernet MAC, a child node of the Ethernet controller.
 
 compatible: "st,stm32-ethernet"
 
diff --git a/dts/bindings/ethernet/st,stm32h7-ethernet.yaml b/dts/bindings/ethernet/st,stm32h7-ethernet.yaml
index 00f2addd21c20..7878817c4fd64 100644
--- a/dts/bindings/ethernet/st,stm32h7-ethernet.yaml
+++ b/dts/bindings/ethernet/st,stm32h7-ethernet.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  ST STM32H7 Ethernet
+  STM32H7 Ethernet
 
   This binding file describes the device tree properties required to configure
   and use the Ethernet controller on STM32H7 and STM32H5 series microcontrollers.
diff --git a/dts/bindings/ethernet/st,stm32n6-ethernet.yaml b/dts/bindings/ethernet/st,stm32n6-ethernet.yaml
new file mode 100644
index 0000000000000..a423c4f324faf
--- /dev/null
+++ b/dts/bindings/ethernet/st,stm32n6-ethernet.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2025, STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  ST STM32N6 Ethernet
+
+  This binding file describes the device tree properties required to configure
+  and use the Ethernet controller on STM32N6 series microcontrollers.
+
+compatible: "st,stm32n6-ethernet"
+
+include: st,stm32-ethernet-common.yaml
diff --git a/dts/bindings/ethernet/ti,dp83867.yaml b/dts/bindings/ethernet/ti,dp83867.yaml
new file mode 100644
index 0000000000000..b08dfbb605fdd
--- /dev/null
+++ b/dts/bindings/ethernet/ti,dp83867.yaml
@@ -0,0 +1,16 @@
+# Copyright 2024, PHYTEC America, LLC
+# SPDX-License-Identifier: Apache-2.0
+
+description: TI DP83867 Ethernet PHY device
+
+compatible: "ti,dp83867"
+
+include: ethernet-phy.yaml
+
+properties:
+  reset-gpios:
+    type: phandle-array
+    description: GPIO connected to PHY reset signal pin. Reset is active low.
+  int-gpios:
+    type: phandle-array
+    description: GPIO for interrupt signal indicating PHY state change.
diff --git a/dts/bindings/ethernet/xlnx,axi-ethernet-1.00.a.yaml b/dts/bindings/ethernet/xlnx,axi-ethernet-1.00.a.yaml
new file mode 100644
index 0000000000000..6e0670a8d58e9
--- /dev/null
+++ b/dts/bindings/ethernet/xlnx,axi-ethernet-1.00.a.yaml
@@ -0,0 +1,48 @@
+# Copyright (c) 2024 CISPA Helmholtz Center for Information Security
+# SPDX-License-Identifier: Apache-2.0
+
+description: Xilinx AXI 1G/2.5G Ethernet Subsystem base bindings.
+
+include: [ethernet-controller.yaml]
+
+compatible: "xlnx,axi-ethernet-1.00.a"
+
+properties:
+  interrupts:
+    description: Xilinx AXI Ethernet has an optional interrupt for updating statistics.
+
+  reg:
+    description:
+      Control registers of the MDIO device are also used for the Ethernet MAC controller.
+      Thus, both devices should have a parent node with compatible "xlnx,axi-ethernet-subsystem-7.2"
+      which defines the reg property, and MAC and MDIO should NOT have a reg property.
+
+  clock-frequency:
+    type: int
+
+  axistream-connected:
+    type: phandle
+    required: true
+    description: Xilinx AXI DMA that is connected to the data streams.
+
+  axistream-control-connected:
+    type: phandle
+    description:
+      Xilinx AXI DMA that is connected to the control streams.
+      Automatically generated by Xilinx' device tree generator.
+      Included in the schema to prevent spurious warnings for such autogenerated device trees.
+
+  xlnx,rxcsum:
+    type: int
+    default: 0
+    description: RX checksum offloading. 0 = none, 2 = full. 1 = partial is not supported.
+    enum:
+      - 0
+      - 2
+  xlnx,txcsum:
+    type: int
+    default: 0
+    description: TX checksum offloading. 0 = none, 2 = full. 1 = partial is not supported.
+    enum:
+      - 0
+      - 2
diff --git a/dts/bindings/flash_controller/espressif,esp32-flash-controller.yaml b/dts/bindings/flash_controller/espressif,esp32-flash-controller.yaml
index c1bfa3bf696e5..0416405e0f738 100644
--- a/dts/bindings/flash_controller/espressif,esp32-flash-controller.yaml
+++ b/dts/bindings/flash_controller/espressif,esp32-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: ESP32 Family flash controller
+description: ESP32 flash controller
 
 compatible: "espressif,esp32-flash-controller"
 
diff --git a/dts/bindings/flash_controller/silabs,series2-flash-controller.yaml b/dts/bindings/flash_controller/silabs,series2-flash-controller.yaml
new file mode 100644
index 0000000000000..fa22525e481e6
--- /dev/null
+++ b/dts/bindings/flash_controller/silabs,series2-flash-controller.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 Silicon Laboratories Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: Silicon Labs Series 2 flash controller
+
+compatible: "silabs,series2-flash-controller"
+
+include: flash-controller.yaml
+
+properties:
+  low-power-write:
+    type: boolean
+    description: |
+      Reduce current consumption during write, doubling write time
diff --git a/dts/bindings/flash_controller/st,stm32f1-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32f1-flash-controller.yaml
index 1ba1208d90a73..27bf78323cafb 100644
--- a/dts/bindings/flash_controller/st,stm32f1-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32f1-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 F1 flash controller
+description: STM32F1 flash controller
 
 compatible: "st,stm32f1-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32f2-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32f2-flash-controller.yaml
index 65ab19a071444..5e3f9cef4e9e6 100644
--- a/dts/bindings/flash_controller/st,stm32f2-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32f2-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 F2 flash controller
+description: STM32F2 flash controller
 
 compatible: "st,stm32f2-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32f4-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32f4-flash-controller.yaml
index cea824302ab9f..c7ee38f5a6657 100644
--- a/dts/bindings/flash_controller/st,stm32f4-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32f4-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 F4 flash controller
+description: STM32F4 flash controller
 
 compatible: "st,stm32f4-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32f7-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32f7-flash-controller.yaml
index cdeaa308df818..e03bca31c9846 100644
--- a/dts/bindings/flash_controller/st,stm32f7-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32f7-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 F7 flash controller
+description: STM32F7 flash controller
 
 compatible: "st,stm32f7-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32g0-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32g0-flash-controller.yaml
index 226858e3e5b3e..40a32902f0c7b 100644
--- a/dts/bindings/flash_controller/st,stm32g0-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32g0-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 G0 flash controller
+description: STM32G0 flash controller
 
 compatible: "st,stm32g0-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32g4-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32g4-flash-controller.yaml
index 71df716072e55..e3debe1f72081 100644
--- a/dts/bindings/flash_controller/st,stm32g4-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32g4-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 G4 flash controller
+description: STM32G4 flash controller
 
 compatible: "st,stm32g4-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32h7-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32h7-flash-controller.yaml
index 305107cc1ca50..fff76143d1bc2 100644
--- a/dts/bindings/flash_controller/st,stm32h7-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32h7-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 H7 flash controller
+description: STM32H7 flash controller
 
 compatible: "st,stm32h7-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32l4-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32l4-flash-controller.yaml
index 17e3e76fbafdf..cb5f50b1ad88a 100644
--- a/dts/bindings/flash_controller/st,stm32l4-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32l4-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 L4 flash controller
+description: STM32L4 flash controller
 
 compatible: "st,stm32l4-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32l5-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32l5-flash-controller.yaml
index 0f6edba9d9205..bfb7938ab78f0 100644
--- a/dts/bindings/flash_controller/st,stm32l5-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32l5-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 L5 flash controller
+description: STM32L5 flash controller
 
 compatible: "st,stm32l5-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32wb-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32wb-flash-controller.yaml
index 3234a34d86141..d72cd171e92c5 100644
--- a/dts/bindings/flash_controller/st,stm32wb-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32wb-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 WB flash controller
+description: STM32WB flash controller
 
 compatible: "st,stm32wb-flash-controller"
 
diff --git a/dts/bindings/flash_controller/st,stm32wba-flash-controller.yaml b/dts/bindings/flash_controller/st,stm32wba-flash-controller.yaml
index 5ef97c10ece9a..9b34765d65d47 100644
--- a/dts/bindings/flash_controller/st,stm32wba-flash-controller.yaml
+++ b/dts/bindings/flash_controller/st,stm32wba-flash-controller.yaml
@@ -1,4 +1,4 @@
-description: STM32 WBA flash controller
+description: STM32WBA flash controller
 
 compatible: "st,stm32wba-flash-controller"
 
diff --git a/dts/bindings/fs/zephyr,fstab,fatfs.yaml b/dts/bindings/fs/zephyr,fstab,fatfs.yaml
new file mode 100644
index 0000000000000..ba11faef95612
--- /dev/null
+++ b/dts/bindings/fs/zephyr,fstab,fatfs.yaml
@@ -0,0 +1,9 @@
+# Copyright (C) 2025 Endress+Hauser AG
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Description of pre-defined fatfs file systems.
+
+compatible: "zephyr,fstab,fatfs"
+
+include: zephyr,fstab-common.yaml
diff --git a/dts/bindings/fs/zephyr,fstab,littlefs.yaml b/dts/bindings/fs/zephyr,fstab,littlefs.yaml
index 92e667712b15e..8703c512e331a 100644
--- a/dts/bindings/fs/zephyr,fstab,littlefs.yaml
+++ b/dts/bindings/fs/zephyr,fstab,littlefs.yaml
@@ -11,6 +11,12 @@ include: "zephyr,fstab-common.yaml"
 properties:
   # num-files and num-dirs are not filesystem-specific.
 
+  partition:
+    type: phandle
+    required: true
+    description: |
+      A reference to the file system's partition.
+
   read-size:
     type: int
     required: true
diff --git a/dts/bindings/fs/zephyr,fstab-common.yaml b/dts/bindings/fs/zephyr,fstab-common.yaml
index e7e9fa3fe9aa1..054098e7c0073 100644
--- a/dts/bindings/fs/zephyr,fstab-common.yaml
+++ b/dts/bindings/fs/zephyr,fstab-common.yaml
@@ -12,12 +12,6 @@ properties:
     description: |
       The absolute path used as the file system mount point.
 
-  partition:
-    type: phandle
-    required: true
-    description: |
-      A reference to the file system's partition.
-
   automount:
     type: boolean
     description: |
diff --git a/dts/bindings/gpio/adi,max14915-gpio.yaml b/dts/bindings/gpio/adi,max14915-gpio.yaml
new file mode 100644
index 0000000000000..a2d4b421eb37d
--- /dev/null
+++ b/dts/bindings/gpio/adi,max14915-gpio.yaml
@@ -0,0 +1,64 @@
+# Copyright (c) 2025 Analog Devices Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  ADI MAX14915 compact industrial octal high-side switch with
+  diagnostics
+
+  https://www.analog.com/media/en/technical-documentation/data-sheets/MAX14915.pdf
+
+  Example:
+
+  max14915: max14915@0 {
+      compatible = "adi,max14915-gpio";
+      status = "okay";
+      reg = <0x00>;
+      fault-gpios = <&gpiof 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+      sync-gpios = <&gpioc 7 GPIO_ACTIVE_LOW>;
+      en-gpios = <&gpiob 5 GPIO_ACTIVE_LOW>;
+      drdy-gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;
+      spi-max-frequency = <10000000>;
+      gpio-controller;
+      #gpio-cells = <2>;
+      ngpios = <8>;
+      crc-en;
+      spi-addr = <0>;
+      ow-on-en = <0 0 0 0 0 0 0 0>;
+      ow-off-en = <0 0 0 0 0 0 0 0>;
+      sh-vdd-en = <0 0 0 0 0 0 0 0>;
+      /* Config Reg 1 */
+      fled-set;
+      sled-set;
+      fled-stretch = <3>;
+      ffilter-en;
+      filter-long;
+      flatch-en;
+      led-cur-lim;
+      /* Config Reg 2 */
+      vdd-on-thr;
+      synch-wd-en;
+      sht-vdd-thr = <3>;
+      ow-off-cs = <3>;
+      wd-to = <0>;
+    };
+
+compatible: "adi,max14915-gpio"
+
+properties:
+  wd-to:
+    type: int
+    default: 0
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+    description: |
+      Default value according to documentation.
+      Set SPI and SYNCH Watchdog Timeout
+      0: Disable SPI Watchdog and set SYNCH Watchdog Timeout to 600ms (typ)
+      1: Set SPI and SYNCH Watchdog Timeout to 200ms (typ)
+      2: Set SPI and SYNCH Watchdog Timeout to 600ms (typ)
+      3: Set SPI and SYNCH Watchdog Timeout to 1.2s (typ)
+
+include: adi,max14916-gpio.yaml
diff --git a/dts/bindings/gpio/adi,max14917-gpio.yaml b/dts/bindings/gpio/adi,max14917-gpio.yaml
new file mode 100644
index 0000000000000..d94b486e7c702
--- /dev/null
+++ b/dts/bindings/gpio/adi,max14917-gpio.yaml
@@ -0,0 +1,59 @@
+# Copyright (c) 2025 Analog Devices Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADI  MAX14917 is octal industrial output
+
+compatible: "adi,max14917-gpio"
+
+properties:
+  "#gpio-cells":
+    const: 2
+  ngpios:
+    type: int
+    required: true
+    const: 8
+    description: Number of gpios supported
+  vddok-gpios:
+    description: |
+      High-Side Open-Drain Output. VDDOK is passive low when the internal
+      logic supply is higher than the UVLO threshold, indicating that the
+      registers have adequate supply voltage.
+    type: phandle-array
+  ready-gpios:
+    description: |
+      Ready pin indicates when the device is ready to be used.
+    type: phandle-array
+  comerr-gpios:
+    description: |
+      Communication Error pin indicates when there is a communication error
+      on the SPI bus.
+    type: phandle-array
+  fault-gpios:
+    description: |
+      Fault pin indicates cases of overload or undervoltage conditions
+    type: phandle-array
+  en-gpios:
+    description: |
+      Enable Pin. Drive the EN pin high to enable the outputs.
+      Drive EN low to disable/three-state all outputs.
+    type: phandle-array
+  sync-gpios:
+    description: |
+      All eight output switches are updated simultaneously on the rising edge
+      of SYNCH, as determined by the content of the SPI command
+    type: phandle-array
+  crcen-gpios:
+    description: |
+      Drive CRCEN high to enable CRC generation and error detection on the
+      serial data.
+    type: phandle-array
+  crc-en:
+    description: |
+      Notify driver if crc pin is enabled.
+    type: boolean
+
+gpio-cells:
+  - pin
+  - flags
+
+include: [gpio-controller.yaml, spi-device.yaml]
diff --git a/dts/bindings/gpio/adi,max22190-gpio.yaml b/dts/bindings/gpio/adi,max22190-gpio.yaml
index 29e263fbd9269..4739b30e32504 100644
--- a/dts/bindings/gpio/adi,max22190-gpio.yaml
+++ b/dts/bindings/gpio/adi,max22190-gpio.yaml
@@ -41,44 +41,6 @@ description: |
 compatible: "adi,max22190-gpio"
 
 properties:
-  "#gpio-cells":
-    const: 2
-  ngpios:
-    type: int
-    required: true
-    const: 8
-    description: Number of gpios supported
-  drdy-gpios:
-    description: Ready pin which show when chip is ready
-    type: phandle-array
-  fault-gpios:
-    description: |
-      Fault pin indicates when there is Fault state in either FAULT1 or FAULT2
-      bothe of which are cleaned on read once problem is not persistent
-    type: phandle-array
-  latch-gpios:
-    description: |
-      Latch the data so it could be read (partially duplicate CS)
-    type: phandle-array
-  max22190-mode:
-    type: int
-    required: true
-    enum:
-      - 0
-      - 1
-      - 2
-      - 3
-    description: |
-      Default mode set to 1, because in MAX22190PMB devkit this is hardwired
-      mode set by manufacturer.
-      max22190 mode is configured from M0 and M1 pins with
-      pull up or down resistors.
-      MODE| M1| M0| FRAME  | CRC | DAISY CHAIN
-      ----+---+---+--------+-----+------------
-        0 | 0 | 0 | 24-bit | yes | no
-        1 | 0 | 1 | 16-bit | no  | no
-        2 | 1 | 0 | 24-bit | yes | yes
-        3 | 1 | 1 | 16-bit | no  | yes
   filter-wbes:
     type: array
     default: [0, 0, 0, 0, 0, 0, 0, 0]
@@ -92,27 +54,9 @@ properties:
       - 1 wire break enable
       - 0 wire break disable
       channels indentation start from CH0...CH7
-  filter-fbps:
-    type: array
-    default: [1, 1, 1, 1, 1, 1, 1, 1]
-    description: |
-      The default value corresponds to the default value of the hardware.
-      All channels are in bypass.
-      Enable or disable filter
-      - 1 mean bypass
-      - 0 mean filter is used
-      channels indentation start from CH0...CH7
-  filter-delays:
-    type: array
-    default: [50, 50, 50, 50, 50, 50, 50, 50]
-    description: |
-      The default value corresponds to the default value of the hardware.
-      Used to setup filter delay. Values are set in us. Default value is 50 = 50 us.
-      Value : 50, 100, 400, 800, 1600, 3200, 12800, 20000
-      channels indentation start from CH0...CH7
 
 gpio-cells:
   - pin
   - flags
 
-include: [gpio-controller.yaml, spi-device.yaml]
+include: adi,max2219x-base-gpio.yaml
diff --git a/dts/bindings/gpio/adi,max22199-gpio.yaml b/dts/bindings/gpio/adi,max22199-gpio.yaml
new file mode 100644
index 0000000000000..6f6403ac05ee1
--- /dev/null
+++ b/dts/bindings/gpio/adi,max22199-gpio.yaml
@@ -0,0 +1,47 @@
+# Copyright (c) 2024 Analog Devices Inc.
+# Copyright (c) 2024 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  The MAX22199 is an IEC 61131-2 compliant industrial digital input device.
+  The MAX22199 translates eight 24V current-sinking industrial inputs to a
+  serialized SPI-compatible output that interfaces with 3V to 5.5V logic.
+  It can operate as eight Type 1/Type 3 digital inputs or four Type 2 digital
+  inputs. The device provides diagnostic functions, including thermal shutdown,
+  24V under voltage alarm, 24V missing voltage alarm, and SPI and CRC
+  communication error detection.
+
+  Sample binding
+  &sdp_spi {
+    status = "okay";
+    pinctrl-names = "default";
+    max22199_gpio0: max22199_gpio@0 {
+      compatible = "adi,max22199-gpio";
+      reg = <0>;
+
+      spi-max-frequency = <1000000>;
+      status = "okay";
+
+      gpio-controller;
+      #gpio-cells = <2>;
+      ngpios = <8>;
+      status = "okay";
+
+      max22199-mode = <1>; // modes range from 0-4
+
+      drdy-gpios = <&gpioj 12 GPIO_ACTIVE_LOW>; /* SDP-GPIO5 - PMOD-PIN8 */
+      fault-gpios = <&gpioc 11 GPIO_ACTIVE_LOW>; /* SDP-SERIAL_INT - PMOD-PIN7 */
+      latch-gpios = <&gpioj 13 GPIO_ACTIVE_LOW>; /* SDP-GPIO6 - PMOD-PIN9 */
+
+      filter-fbps = <0 0 0 0  0 0 0 0>; // programmable filter INx
+      filter-delays = <50 100 400 800 1600 3200 12800 20000>; // 1000 us == 1ms
+    };
+  };
+
+compatible: "adi,max22199-gpio"
+
+gpio-cells:
+  - pin
+  - flags
+
+include: adi,max2219x-base-gpio.yaml
diff --git a/dts/bindings/gpio/adi,max2219x-base-gpio.yaml b/dts/bindings/gpio/adi,max2219x-base-gpio.yaml
new file mode 100644
index 0000000000000..41354456e2c8d
--- /dev/null
+++ b/dts/bindings/gpio/adi,max2219x-base-gpio.yaml
@@ -0,0 +1,76 @@
+# Copyright (c) 2024 Analog Devices Inc.
+# Copyright (c) 2024 BayLibre SAS
+# SPDX-License-Identifier: Apache-2.0
+
+include: [gpio-controller.yaml, spi-device.yaml]
+
+properties:
+  "#gpio-cells":
+    const: 2
+  ngpios:
+    type: int
+    required: true
+    const: 8
+    description: Number of gpios supported
+  drdy-gpios:
+    description: Ready pin which show when chip is ready
+    type: phandle-array
+  fault-gpios:
+    description: |
+      Fault pin indicates when there is Fault state in either FAULT1 or FAULT2
+      bothe of which are cleaned on read once problem is not persistent
+    type: phandle-array
+  latch-gpios:
+    description: |
+      Latch the data so it could be read (partially duplicate CS)
+    type: phandle-array
+  max22190-mode:
+    type: int
+    required: true
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+    description: |
+      Default mode set to 1, because in MAX22190PMB devkit this is hardwired
+      mode set by manufacturer.
+      max22190 mode is configured from M0 and M1 pins with
+      pull up or down resistors.
+      MODE| M1| M0| FRAME  | CRC | DAISY CHAIN
+      ----+---+---+--------+-----+------------
+        0 | 0 | 0 | 24-bit | yes | no
+        1 | 0 | 1 | 16-bit | no  | no
+        2 | 1 | 0 | 24-bit | yes | yes
+        3 | 1 | 1 | 16-bit | no  | yes
+  filter-wbes:
+    type: array
+    default: [0, 0, 0, 0, 0, 0, 0, 0]
+    description: |
+      The default value corresponds to the default value of the hardware.
+      Wire break is disabled in all channels.
+      WBE bit in all Filter registers stand for wire break enable on each
+      channel, so to enable WB functionality set 1.
+      If WB on specific channel is disabled , FAULT will not be rised in case
+      wire is cut.
+      - 1 wire break enable
+      - 0 wire break disable
+      channels indentation start from CH0...CH7
+  filter-fbps:
+    type: array
+    default: [1, 1, 1, 1, 1, 1, 1, 1]
+    description: |
+      The default value corresponds to the default value of the hardware.
+      All channels are in bypass.
+      Enable or disable filter
+      - 1 mean bypass
+      - 0 mean filter is used
+      channels indentation start from CH0...CH7
+  filter-delays:
+    type: array
+    default: [50, 50, 50, 50, 50, 50, 50, 50]
+    description: |
+      The default value corresponds to the default value of the hardware.
+      Used to setup filter delay. Values are set in us. Default value is 50 = 50 us.
+      Value : 50, 100, 400, 800, 1600, 3200, 12800, 20000
+      channels indentation start from CH0...CH7
diff --git a/dts/bindings/gpio/altr,pio-1.0.yaml b/dts/bindings/gpio/altr,pio-1.0.yaml
index d9711130e7cd1..b272ce80b7c9a 100644
--- a/dts/bindings/gpio/altr,pio-1.0.yaml
+++ b/dts/bindings/gpio/altr,pio-1.0.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Altera PIO node
+description: Altera PIO
 
 compatible: "altr,pio-1.0"
 
diff --git a/dts/bindings/gpio/ambiq,gpio-bank.yaml b/dts/bindings/gpio/ambiq,gpio-bank.yaml
index 8d9114acc5b8e..4cdcb5b855139 100644
--- a/dts/bindings/gpio/ambiq,gpio-bank.yaml
+++ b/dts/bindings/gpio/ambiq,gpio-bank.yaml
@@ -2,7 +2,7 @@
 # Copyright (c) 2023 Ambiq Micro Inc. <www.ambiq.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: Ambiq GPIO bank node
+description: Ambiq GPIO bank
 
 compatible: "ambiq,gpio-bank"
 
diff --git a/dts/bindings/gpio/andestech,atcgpio100.yaml b/dts/bindings/gpio/andestech,atcgpio100.yaml
index 88a7d990a390a..22d289069fda6 100644
--- a/dts/bindings/gpio/andestech,atcgpio100.yaml
+++ b/dts/bindings/gpio/andestech,atcgpio100.yaml
@@ -1,8 +1,7 @@
 # Copyright (c) 2021, Andes Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description:
-  This is a representation of Andes Technology atcgpio100 GPIO node
+description: Andes Technology ATCGPIO100 GPIO Controller.
 
 compatible: "andestech,atcgpio100"
 
diff --git a/dts/bindings/gpio/arduino-mkr-header.yaml b/dts/bindings/gpio/arduino-mkr-header.yaml
index 2b3c15bbe8f10..03fb39d053c7d 100644
--- a/dts/bindings/gpio/arduino-mkr-header.yaml
+++ b/dts/bindings/gpio/arduino-mkr-header.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    GPIO pins exposing on Arduino MKR headers.
+    GPIO pins exposed on Arduino MKR headers.
 
     The Arduino MKR layout provides two headers on both edges of the board.
 
diff --git a/dts/bindings/gpio/arm,mmio32-gpio.yaml b/dts/bindings/gpio/arm,mmio32-gpio.yaml
new file mode 100644
index 0000000000000..0a8692adef4e0
--- /dev/null
+++ b/dts/bindings/gpio/arm,mmio32-gpio.yaml
@@ -0,0 +1,22 @@
+description: ARM MMIO32 GPIO
+
+compatible: "arm,mmio32-gpio"
+
+include: [gpio-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  ngpios:
+    required: true
+
+  "#gpio-cells":
+    const: 1
+
+  direction-input:
+    type: boolean
+    description: Marks this pin set as all input pins.
+
+gpio-cells:
+  - pin
diff --git a/dts/bindings/gpio/arm,mps2-fpgaio-gpio.yaml b/dts/bindings/gpio/arm,mps2-fpgaio-gpio.yaml
deleted file mode 100644
index 1c91ef9ca2a5a..0000000000000
--- a/dts/bindings/gpio/arm,mps2-fpgaio-gpio.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-description: GPIO controller on ARM MPS2 FPGA
-
-compatible: "arm,mps2-fpgaio-gpio"
-
-include: [gpio-controller.yaml, base.yaml]
-
-properties:
-  reg:
-    required: true
-
-  ngpios:
-    required: true
-
-  "#gpio-cells":
-    const: 1
-
-gpio-cells:
-  - pin
diff --git a/dts/bindings/gpio/arm,mps3-fpgaio-gpio.yaml b/dts/bindings/gpio/arm,mps3-fpgaio-gpio.yaml
deleted file mode 100644
index 8d93742f9edc7..0000000000000
--- a/dts/bindings/gpio/arm,mps3-fpgaio-gpio.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-description: GPIO controller on ARM MPS3 FPGA
-
-compatible: "arm,mps3-fpgaio-gpio"
-
-include: [gpio-controller.yaml, base.yaml]
-
-properties:
-  reg:
-    required: true
-
-  ngpios:
-    required: true
-
-  "#gpio-cells":
-    const: 1
-
-gpio-cells:
-  - pin
diff --git a/dts/bindings/gpio/atmel,sam-gpio.yaml b/dts/bindings/gpio/atmel,sam-gpio.yaml
index b212915086e5e..694c4c03cc0e2 100644
--- a/dts/bindings/gpio/atmel,sam-gpio.yaml
+++ b/dts/bindings/gpio/atmel,sam-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2023, Gerson Fernando Budke <nandojve@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: SAM GPIO PORT node
+description: SAM GPIO Port
 
 compatible: "atmel,sam-gpio"
 
diff --git a/dts/bindings/gpio/atmel,sam4l-gpio.yaml b/dts/bindings/gpio/atmel,sam4l-gpio.yaml
index 9b7d03883ff38..2868ea220cfd8 100644
--- a/dts/bindings/gpio/atmel,sam4l-gpio.yaml
+++ b/dts/bindings/gpio/atmel,sam4l-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021-2023, Gerson Fernando Budke <nandojve@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: SAM4L GPIO PORT node
+description: SAM4L GPIO Port
 
 compatible: "atmel,sam4l-gpio"
 
diff --git a/dts/bindings/gpio/cypress,cy8c95xx-gpio-port.yaml b/dts/bindings/gpio/cypress,cy8c95xx-gpio-port.yaml
index 544621f74e466..0ea3a6d7adf1c 100644
--- a/dts/bindings/gpio/cypress,cy8c95xx-gpio-port.yaml
+++ b/dts/bindings/gpio/cypress,cy8c95xx-gpio-port.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Synopsys
 # SPDX-License-Identifier: Apache-2.0
 
-description: Cypress cy8c95xx GPIO port node
+description: Cypress cy8c95xx GPIO Port
 
 compatible: "cypress,cy8c95xx-gpio-port"
 
diff --git a/dts/bindings/gpio/cypress,cy8c95xx-gpio.yaml b/dts/bindings/gpio/cypress,cy8c95xx-gpio.yaml
index 1f97f9a141f33..6634e8666037f 100644
--- a/dts/bindings/gpio/cypress,cy8c95xx-gpio.yaml
+++ b/dts/bindings/gpio/cypress,cy8c95xx-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Synopsys
 # SPDX-License-Identifier: Apache-2.0
 
-description: Cypress cy8c95xx GPIO node
+description: Cypress cy8c95xx GPIO
 
 compatible: "cypress,cy8c95xx-gpio"
 
diff --git a/dts/bindings/gpio/cypress,psoc6-gpio.yaml b/dts/bindings/gpio/cypress,psoc6-gpio.yaml
index ac16d9341a3ad..1c8ff76ce84ed 100644
--- a/dts/bindings/gpio/cypress,psoc6-gpio.yaml
+++ b/dts/bindings/gpio/cypress,psoc6-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020-2021 ATL Electronics
 # SPDX-License-Identifier: Apache-2.0
 
-description: Cypress GPIO PORT node
+description: Cypress GPIO Port
 
 compatible: "cypress,psoc6-gpio"
 
diff --git a/dts/bindings/gpio/ene,kb1200-gpio.yaml b/dts/bindings/gpio/ene,kb1200-gpio.yaml
index a87d33138db84..95f7dd6668115 100644
--- a/dts/bindings/gpio/ene,kb1200-gpio.yaml
+++ b/dts/bindings/gpio/ene,kb1200-gpio.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    ENE KB1200 GPIO(General purpose IO) Port node
+    ENE KB1200 GPIO Port
 
     The GPIO controller provides group control of GPIO functions. Each port
     group contains 32 pins. GPIO_00~GPIO_1F belong to the Port0 group,
diff --git a/dts/bindings/gpio/gd,gd32-gpio.yaml b/dts/bindings/gpio/gd,gd32-gpio.yaml
index c2b8c91820452..9705ee34c4025 100644
--- a/dts/bindings/gpio/gd,gd32-gpio.yaml
+++ b/dts/bindings/gpio/gd,gd32-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Teslabs Engineering S.L.
 # SPDX-License-Identifier: Apache-2.0
 
-description: GD32 GPIO node
+description: GD32 GPIO
 
 compatible: "gd,gd32-gpio"
 
diff --git a/dts/bindings/gpio/grove-header.yaml b/dts/bindings/gpio/grove-header.yaml
index eaaec78baff4d..f4cb051442ce2 100644
--- a/dts/bindings/gpio/grove-header.yaml
+++ b/dts/bindings/gpio/grove-header.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    GPIO pins exposing on Grove 4 pins headers.
+    GPIO pins exposed on Grove 4 pins headers.
 
     This binding provides a nexus mapping for 2 pins as depicted below.
 
diff --git a/dts/bindings/gpio/infineon,cat1-gpio.yaml b/dts/bindings/gpio/infineon,cat1-gpio.yaml
index 3bcfe65473de0..54c4777315c4f 100644
--- a/dts/bindings/gpio/infineon,cat1-gpio.yaml
+++ b/dts/bindings/gpio/infineon,cat1-gpio.yaml
@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: Infineon CAT1 GPIO PORT node
+description: Infineon CAT1 GPIO Port
 
 compatible: "infineon,cat1-gpio"
 
diff --git a/dts/bindings/gpio/infineon,xmc4xxx-gpio.yaml b/dts/bindings/gpio/infineon,xmc4xxx-gpio.yaml
index a6b28c3af8940..2001dffb7ad12 100644
--- a/dts/bindings/gpio/infineon,xmc4xxx-gpio.yaml
+++ b/dts/bindings/gpio/infineon,xmc4xxx-gpio.yaml
@@ -1,4 +1,4 @@
-description: INFINEON XMC4XXX GPIO PORT node
+description: INFINEON XMC4XXX GPIO Port
 
 compatible: "infineon,xmc4xxx-gpio"
 
diff --git a/dts/bindings/gpio/intel,gpio.yaml b/dts/bindings/gpio/intel,gpio.yaml
index f8c434cd0d250..c9c843ef51996 100644
--- a/dts/bindings/gpio/intel,gpio.yaml
+++ b/dts/bindings/gpio/intel,gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018-2019 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Intel GPIO node
+description: Intel GPIO
 
 compatible: "intel,gpio"
 
diff --git a/dts/bindings/gpio/ite,it51xxx-gpio.yaml b/dts/bindings/gpio/ite,it51xxx-gpio.yaml
new file mode 100644
index 0000000000000..c95941cb6bdc4
--- /dev/null
+++ b/dts/bindings/gpio/ite,it51xxx-gpio.yaml
@@ -0,0 +1,28 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: This binding gives a base representation of the it51xxx series gpio
+
+compatible: "ite,it51xxx-gpio"
+
+include: [gpio-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  has-volt-sel:
+    type: array
+    description: |
+      Selection of support input voltage 3.3V or 1.8V.
+
+  wucctrl:
+    type: phandles
+    description: |
+      WUC groups internal and external inputs, and asserts wake-up
+      signals to INTC that allows the CPU to exit a Doze/Deep
+      Doze/Sleep mode.
+
+gpio-cells:
+  - pin
+  - flags
diff --git a/dts/bindings/gpio/ite,it8801-gpio.yaml b/dts/bindings/gpio/ite,it8801-gpio.yaml
index 2e78fa9917a87..56f29eab3a646 100644
--- a/dts/bindings/gpio/ite,it8801-gpio.yaml
+++ b/dts/bindings/gpio/ite,it8801-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 ITE Corporation. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ITE IT8801 I2C-based GPIO device driver
+description: ITE IT8801 I2C-based GPIO
 
 compatible: "ite,it8801-gpio"
 
diff --git a/dts/bindings/gpio/ite,it8xxx2-gpio-v2.yaml b/dts/bindings/gpio/ite,it8xxx2-gpio-v2.yaml
index 744365cc5a396..dbadba5713e31 100644
--- a/dts/bindings/gpio/ite,it8xxx2-gpio-v2.yaml
+++ b/dts/bindings/gpio/ite,it8xxx2-gpio-v2.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 ITE Corporation. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: This binding gives a base representation of the ITE gpio
+description: ITE IT8xxx2 GPIO V2
 
 compatible: "ite,it8xxx2-gpio-v2"
 
diff --git a/dts/bindings/gpio/ite,it8xxx2-gpio.yaml b/dts/bindings/gpio/ite,it8xxx2-gpio.yaml
index 366c72f12f518..e6e6a5e48e6c5 100644
--- a/dts/bindings/gpio/ite,it8xxx2-gpio.yaml
+++ b/dts/bindings/gpio/ite,it8xxx2-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ITE Corporation. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: This binding gives a base representation of the ITE gpio
+description: ITE IT8xxx2 GPIO
 
 compatible: "ite,it8xxx2-gpio"
 
diff --git a/dts/bindings/gpio/ite,it8xxx2-gpiokscan.yaml b/dts/bindings/gpio/ite,it8xxx2-gpiokscan.yaml
index bca75c534aa85..489616c297ad0 100644
--- a/dts/bindings/gpio/ite,it8xxx2-gpiokscan.yaml
+++ b/dts/bindings/gpio/ite,it8xxx2-gpiokscan.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 ITE Corporation. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: This binding gives a base representation of the ITE kscan pins as gpio
+description: ITE IT8xxx2 Kscan Pins as GPIO
 
 compatible: "ite,it8xxx2-gpiokscan"
 
diff --git a/dts/bindings/gpio/linaro,96b-lscon-1v8.yaml b/dts/bindings/gpio/linaro,96b-lscon-1v8.yaml
index 56e43a9587073..61872ba61167e 100644
--- a/dts/bindings/gpio/linaro,96b-lscon-1v8.yaml
+++ b/dts/bindings/gpio/linaro,96b-lscon-1v8.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Linaro Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Represents GPIO pin nodes exposed on the 96Boards 1.8v low-speed header
+description: GPIO Pin exposed on the 96Boards 1.8v low-speed header
 
 compatible: "linaro,96b-lscon-1v8"
 
diff --git a/dts/bindings/gpio/linaro,96b-lscon-3v3.yaml b/dts/bindings/gpio/linaro,96b-lscon-3v3.yaml
index 2fe7a499881cd..0441eecd2d41a 100644
--- a/dts/bindings/gpio/linaro,96b-lscon-3v3.yaml
+++ b/dts/bindings/gpio/linaro,96b-lscon-3v3.yaml
@@ -1,8 +1,7 @@
 # Copyright (c) 2019 Linaro Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: |
-    Represents GPIO pin nodes exposed on the 96Boards 3.3v low-speed header
+description: GPIO Pin exposed on the 96Boards 3.3v low-speed header
 
 compatible: "linaro,96b-lscon-3v3"
 
diff --git a/dts/bindings/gpio/microchip,mcp23008.yaml b/dts/bindings/gpio/microchip,mcp23008.yaml
index 5a5497249fd43..cf5896c6e940d 100644
--- a/dts/bindings/gpio/microchip,mcp23008.yaml
+++ b/dts/bindings/gpio/microchip,mcp23008.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23008 I2C GPIO Expander.
+description: Microchip MCP23008 I2C GPIO Expander.
 
 compatible: "microchip,mcp23008"
 
diff --git a/dts/bindings/gpio/microchip,mcp23009.yaml b/dts/bindings/gpio/microchip,mcp23009.yaml
index 5e8a50f8fd07d..114753d166518 100644
--- a/dts/bindings/gpio/microchip,mcp23009.yaml
+++ b/dts/bindings/gpio/microchip,mcp23009.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23009 I2C GPIO Expander.
+description: Microchip MCP23009 I2C GPIO Expander.
 
 compatible: "microchip,mcp23009"
 
diff --git a/dts/bindings/gpio/microchip,mcp23016.yaml b/dts/bindings/gpio/microchip,mcp23016.yaml
index b2735030218ea..028d4e4771888 100644
--- a/dts/bindings/gpio/microchip,mcp23016.yaml
+++ b/dts/bindings/gpio/microchip,mcp23016.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23016 I2C GPIO Expander.
+description: Microchip MCP23016 I2C GPIO Expander.
 
 compatible: "microchip,mcp23016"
 
diff --git a/dts/bindings/gpio/microchip,mcp23017.yaml b/dts/bindings/gpio/microchip,mcp23017.yaml
index 63bd108d4017a..c7fce77905cac 100644
--- a/dts/bindings/gpio/microchip,mcp23017.yaml
+++ b/dts/bindings/gpio/microchip,mcp23017.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23017 I2C GPIO Expander.
+description: Microchip MCP23017 I2C GPIO Expander.
 
 compatible: "microchip,mcp23017"
 
diff --git a/dts/bindings/gpio/microchip,mcp23018.yaml b/dts/bindings/gpio/microchip,mcp23018.yaml
index 9af5bbe257518..45a28bc11dc07 100644
--- a/dts/bindings/gpio/microchip,mcp23018.yaml
+++ b/dts/bindings/gpio/microchip,mcp23018.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23018 I2C GPIO Expander.
+description: Microchip MCP23018 I2C GPIO Expander.
 
 compatible: "microchip,mcp23018"
 
diff --git a/dts/bindings/gpio/microchip,mcp23s08.yaml b/dts/bindings/gpio/microchip,mcp23s08.yaml
index f9b8a6638306d..1dc9dfa702fa5 100644
--- a/dts/bindings/gpio/microchip,mcp23s08.yaml
+++ b/dts/bindings/gpio/microchip,mcp23s08.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23S08 SPI GPIO Expander.
+description: Microchip MCP23S08 SPI GPIO Expander.
 
 compatible: "microchip,mcp23s08"
 
diff --git a/dts/bindings/gpio/microchip,mcp23s09.yaml b/dts/bindings/gpio/microchip,mcp23s09.yaml
index c81ec0a87e8ab..c0cd223237dca 100644
--- a/dts/bindings/gpio/microchip,mcp23s09.yaml
+++ b/dts/bindings/gpio/microchip,mcp23s09.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23S09 SPI GPIO Expander.
+description: Microchip MCP23S09 SPI GPIO Expander.
 
 compatible: "microchip,mcp23s09"
 
diff --git a/dts/bindings/gpio/microchip,mcp23s17.yaml b/dts/bindings/gpio/microchip,mcp23s17.yaml
index 7a2d7b84d8476..1d109ad8a88a3 100644
--- a/dts/bindings/gpio/microchip,mcp23s17.yaml
+++ b/dts/bindings/gpio/microchip,mcp23s17.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23S17 SPI GPIO Expander.
+description: Microchip MCP23S17 SPI GPIO Expander.
 
 compatible: "microchip,mcp23s17"
 
diff --git a/dts/bindings/gpio/microchip,mcp23s18.yaml b/dts/bindings/gpio/microchip,mcp23s18.yaml
index a308572c23c59..5a2d14560d27f 100644
--- a/dts/bindings/gpio/microchip,mcp23s18.yaml
+++ b/dts/bindings/gpio/microchip,mcp23s18.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: This is a representation of the Microchip MCP23S18 SPI GPIO Expander.
+description: Microchip MCP23S18 SPI GPIO Expander.
 
 compatible: "microchip,mcp23s18"
 
diff --git a/dts/bindings/gpio/microchip,mec5-gpio.yaml b/dts/bindings/gpio/microchip,mec5-gpio.yaml
index c29ecb3466a47..d9ae269a5d708 100644
--- a/dts/bindings/gpio/microchip,mec5-gpio.yaml
+++ b/dts/bindings/gpio/microchip,mec5-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024, Microchip Technology Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Microchip MEC5 GPIO node
+description: Microchip MEC5 GPIO
 
 compatible: "microchip,mec5-gpio"
 
diff --git a/dts/bindings/gpio/microchip,mpfs-gpio.yaml b/dts/bindings/gpio/microchip,mpfs-gpio.yaml
index f5381133dc126..826e23aed898c 100644
--- a/dts/bindings/gpio/microchip,mpfs-gpio.yaml
+++ b/dts/bindings/gpio/microchip,mpfs-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Microchip Technology Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Microchip PolarFire SoC GPIO node
+description: Microchip PolarFire SoC GPIO
 
 compatible: "microchip,mpfs-gpio"
 
diff --git a/dts/bindings/gpio/microchip,xec-gpio-v2.yaml b/dts/bindings/gpio/microchip,xec-gpio-v2.yaml
index 22af68ce120db..501172e30fe41 100644
--- a/dts/bindings/gpio/microchip,xec-gpio-v2.yaml
+++ b/dts/bindings/gpio/microchip,xec-gpio-v2.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019, Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Microchip CEC/MEC GPIO V2 node
+description: Microchip CEC/MEC GPIO V2
 
 compatible: "microchip,xec-gpio-v2"
 
diff --git a/dts/bindings/gpio/microchip,xec-gpio.yaml b/dts/bindings/gpio/microchip,xec-gpio.yaml
index 21bbabf12a585..02e873a43e001 100644
--- a/dts/bindings/gpio/microchip,xec-gpio.yaml
+++ b/dts/bindings/gpio/microchip,xec-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019, Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Microchip CEC/MEC GPIO node
+description: Microchip CEC/MEC GPIO
 
 compatible: "microchip,xec-gpio"
 
diff --git a/dts/bindings/gpio/mikro-bus.yaml b/dts/bindings/gpio/mikro-bus.yaml
index 806961f39ee43..8c123def1c36f 100644
--- a/dts/bindings/gpio/mikro-bus.yaml
+++ b/dts/bindings/gpio/mikro-bus.yaml
@@ -12,7 +12,7 @@ description: |
     https://download.mikroe.com/documents/standards/mikrobus/mikrobus-standard-specification-v200.pdf
 
     This binding provides a nexus mapping for 10 pins, left side pins are
-    numbered 0 - 5 (AN - MOSI), the right side pins are numbered 6 - 10
+    numbered 0 - 5 (AN - MOSI), the right side pins are numbered 6 - 11
     (PWM - SDA). The bottom 2 pins on each side are used for input voltage
     and ground, they are not mapped in the nexus.
 
diff --git a/dts/bindings/gpio/neorv32,gpio.yaml b/dts/bindings/gpio/neorv32,gpio.yaml
new file mode 100644
index 0000000000000..5417b92e50fcf
--- /dev/null
+++ b/dts/bindings/gpio/neorv32,gpio.yaml
@@ -0,0 +1,22 @@
+description: NEORV32 GPIO
+
+compatible: "neorv32,gpio"
+
+include: [gpio-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  syscon:
+    type: phandle
+    required: true
+    description: |
+      phandle to syscon (NEORV32 SYSINFO) node.
+
+  "#gpio-cells":
+    const: 2
+
+gpio-cells:
+  - pin
+  - flags
diff --git a/dts/bindings/gpio/neorv32-gpio.yaml b/dts/bindings/gpio/neorv32-gpio.yaml
deleted file mode 100644
index a357cd5eea9c0..0000000000000
--- a/dts/bindings/gpio/neorv32-gpio.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-description: NEORV32 GPIO
-
-compatible: "neorv32-gpio"
-
-include: [gpio-controller.yaml, base.yaml]
-
-properties:
-  reg:
-    required: true
-
-  reg-names:
-    required: true
-
-  syscon:
-    type: phandle
-    required: true
-    description: |
-      phandle to syscon (NEORV32 SYSINFO) node.
-
-  "#gpio-cells":
-    const: 2
-
-gpio-cells:
-  - pin
-  - flags
diff --git a/dts/bindings/gpio/nordic,nrf-gpio.yaml b/dts/bindings/gpio/nordic,nrf-gpio.yaml
index 097a99d8fa94b..6bde10bad07df 100644
--- a/dts/bindings/gpio/nordic,nrf-gpio.yaml
+++ b/dts/bindings/gpio/nordic,nrf-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, marc-cpdesign
 # SPDX-License-Identifier: Apache-2.0
 
-description: NRF5 GPIO node
+description: NRF5 GPIO
 
 compatible: "nordic,nrf-gpio"
 
diff --git a/dts/bindings/gpio/nordic,nrf-gpiote.yaml b/dts/bindings/gpio/nordic,nrf-gpiote.yaml
index 4bb09574e9b98..b9180857e44f4 100644
--- a/dts/bindings/gpio/nordic,nrf-gpiote.yaml
+++ b/dts/bindings/gpio/nordic,nrf-gpiote.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, marc-cpdesign
 # SPDX-License-Identifier: Apache-2.0
 
-description: NRF5 GPIOTE node
+description: NRF5 GPIOTE
 
 compatible: "nordic,nrf-gpiote"
 
diff --git a/dts/bindings/gpio/nuvoton,npcx-gpio.yaml b/dts/bindings/gpio/nuvoton,npcx-gpio.yaml
index b1e307e237c86..4e60b2c1b9be4 100644
--- a/dts/bindings/gpio/nuvoton,npcx-gpio.yaml
+++ b/dts/bindings/gpio/nuvoton,npcx-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX-GPIO node
+description: Nuvoton, NPCX-GPIO
 
 compatible: "nuvoton,npcx-gpio"
 
diff --git a/dts/bindings/gpio/nuvoton,numaker-gpio.yaml b/dts/bindings/gpio/nuvoton,numaker-gpio.yaml
index 29463aae27101..40c216cbbf2b4 100644
--- a/dts/bindings/gpio/nuvoton,numaker-gpio.yaml
+++ b/dts/bindings/gpio/nuvoton,numaker-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, Numaker-GPIO node
+description: Nuvoton Numaker GPIO
 
 compatible: "nuvoton,numaker-gpio"
 
diff --git a/dts/bindings/gpio/nuvoton,numicro-gpio.yaml b/dts/bindings/gpio/nuvoton,numicro-gpio.yaml
index 173dcb3d7ebc4..106883724798a 100644
--- a/dts/bindings/gpio/nuvoton,numicro-gpio.yaml
+++ b/dts/bindings/gpio/nuvoton,numicro-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 SEAL AG
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton NuMicro GPIO node
+description: Nuvoton NuMicro GPIO
 
 compatible: "nuvoton,numicro-gpio"
 
diff --git a/dts/bindings/gpio/nxp,imx-gpio.yaml b/dts/bindings/gpio/nxp,imx-gpio.yaml
index d13db06b67231..83471175d12f7 100644
--- a/dts/bindings/gpio/nxp,imx-gpio.yaml
+++ b/dts/bindings/gpio/nxp,imx-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright 2017, 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: i.MX GPIO node
+description: i.MX GPIO
 
 compatible: "nxp,imx-gpio"
 
diff --git a/dts/bindings/gpio/nxp,imx-rgpio.yaml b/dts/bindings/gpio/nxp,imx-rgpio.yaml
index 14aef8a9b30c4..9b032c1350cd5 100644
--- a/dts/bindings/gpio/nxp,imx-rgpio.yaml
+++ b/dts/bindings/gpio/nxp,imx-rgpio.yaml
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: i.MX RGPIO node
+description: i.MX RGPIO
 
 compatible: "nxp,imx-rgpio"
 
diff --git a/dts/bindings/gpio/nxp,kinetis-gpio.yaml b/dts/bindings/gpio/nxp,kinetis-gpio.yaml
index 1ee1c8db0ddf3..2f4bed4a55d4d 100644
--- a/dts/bindings/gpio/nxp,kinetis-gpio.yaml
+++ b/dts/bindings/gpio/nxp,kinetis-gpio.yaml
@@ -1,4 +1,4 @@
-description: Kinetis GPIO node
+description: Kinetis GPIO
 
 compatible: "nxp,kinetis-gpio"
 
diff --git a/dts/bindings/gpio/nxp,lcd-pmod.yaml b/dts/bindings/gpio/nxp,lcd-pmod.yaml
new file mode 100644
index 0000000000000..ca1ca16800683
--- /dev/null
+++ b/dts/bindings/gpio/nxp,lcd-pmod.yaml
@@ -0,0 +1,26 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+
+compatible: "nxp,lcd-pmod"
+
+description: |
+    GPIO pins exposed on NXP LCD pmod interface (e.g., used on LCD-PAR-035 panel).
+    These pins are exposed on a 12 pin connector. The pins have the
+    following assignments:
+
+      Pin Number    Usage
+      1             VCC
+      2             VCC
+      3             GND
+      4             GND
+      5             LCD PMOD interface WR pin
+      6             LCD touch controller I2C SCL
+      7             LCD PMOD interface D/C pin
+      8             LCD touch controller I2C SDA
+      9             LCD PMOD interface MOSI pin
+      10            LCD and touch reset
+      11            LCD PMOD interface CS pin
+      12            LCD touch interrupt
+
+include: [gpio-nexus.yaml, base.yaml]
diff --git a/dts/bindings/gpio/nxp,lpc-gpio.yaml b/dts/bindings/gpio/nxp,lpc-gpio.yaml
index 19b31bc284ca4..f0790306eeb06 100644
--- a/dts/bindings/gpio/nxp,lpc-gpio.yaml
+++ b/dts/bindings/gpio/nxp,lpc-gpio.yaml
@@ -6,7 +6,7 @@
 # base address. It is the ports that are
 # functionally gpio devices.
 
-description: LPC GPIO node
+description: LPC GPIO
 
 compatible: "nxp,lpc-gpio"
 
diff --git a/dts/bindings/gpio/nxp,lpc11u6x-gpio.yaml b/dts/bindings/gpio/nxp,lpc11u6x-gpio.yaml
index 612d6f83d19de..d39580668de2c 100644
--- a/dts/bindings/gpio/nxp,lpc11u6x-gpio.yaml
+++ b/dts/bindings/gpio/nxp,lpc11u6x-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Seagate Technology LLC
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP LPC11U6X GPIO node
+description: NXP LPC11U6X GPIO
 
 compatible: "nxp,lpc11u6x-gpio"
 
diff --git a/dts/bindings/gpio/nxp,pca6416.yaml b/dts/bindings/gpio/nxp,pca6416.yaml
index 359bf68837947..b6e1a6e6b82b4 100644
--- a/dts/bindings/gpio/nxp,pca6416.yaml
+++ b/dts/bindings/gpio/nxp,pca6416.yaml
@@ -1,7 +1,7 @@
 # Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: Base binding for PCA6416 I2C-based GPIO expander
+description: PCA6416 I2C-based GPIO expander
 
 compatible: "nxp,pca6416"
 
diff --git a/dts/bindings/gpio/nxp,pca9538.yaml b/dts/bindings/gpio/nxp,pca9538.yaml
index 5933b2841d3d1..07925f6d8635c 100644
--- a/dts/bindings/gpio/nxp,pca9538.yaml
+++ b/dts/bindings/gpio/nxp,pca9538.yaml
@@ -1,7 +1,9 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-description: NXP PCA9538 I2C GPIO expander node
-compatible: nxp,pca9538
+description: NXP PCA9538 I2C GPIO expander
+
+compatible: "nxp,pca9538"
+
 include: nxp,pca_series.yaml
 
 properties:
diff --git a/dts/bindings/gpio/nxp,pca9539.yaml b/dts/bindings/gpio/nxp,pca9539.yaml
index 42101ba30f0af..73468b694d201 100644
--- a/dts/bindings/gpio/nxp,pca9539.yaml
+++ b/dts/bindings/gpio/nxp,pca9539.yaml
@@ -1,7 +1,9 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-description: NXP PCA9539 I2C GPIO expander node
-compatible: nxp,pca9539
+description: NXP PCA9539 I2C GPIO expander
+
+compatible: "nxp,pca9539"
+
 include: nxp,pca_series.yaml
 
 properties:
diff --git a/dts/bindings/gpio/nxp,pca9554.yaml b/dts/bindings/gpio/nxp,pca9554.yaml
index aa4ff0c65dcfb..c0298f621693e 100644
--- a/dts/bindings/gpio/nxp,pca9554.yaml
+++ b/dts/bindings/gpio/nxp,pca9554.yaml
@@ -1,7 +1,9 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-description: NXP PCA9554 I2C GPIO expander node
-compatible: nxp,pca9554
+description: NXP PCA9554 I2C GPIO expander
+
+compatible: "nxp,pca9554"
+
 include: nxp,pca_series.yaml
 
 properties:
diff --git a/dts/bindings/gpio/nxp,pca9555.yaml b/dts/bindings/gpio/nxp,pca9555.yaml
index 5902b2bacf79f..3686ca3bf2bbc 100644
--- a/dts/bindings/gpio/nxp,pca9555.yaml
+++ b/dts/bindings/gpio/nxp,pca9555.yaml
@@ -1,7 +1,9 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-description: NXP PCA9555 I2C GPIO expander node
-compatible: nxp,pca9555
+description: NXP PCA9555 I2C GPIO expander
+
+compatible: "nxp,pca9555"
+
 include: nxp,pca_series.yaml
 
 properties:
diff --git a/dts/bindings/gpio/nxp,pca_series.yaml b/dts/bindings/gpio/nxp,pca_series.yaml
index a37fa281e3b72..84d56a5981b24 100644
--- a/dts/bindings/gpio/nxp,pca_series.yaml
+++ b/dts/bindings/gpio/nxp,pca_series.yaml
@@ -1,7 +1,7 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: Base binding for PCA series I2C-based GPIO expander
+description: PCA series I2C-based GPIO expander
 
 include: [gpio-controller.yaml, i2c-device.yaml]
 
diff --git a/dts/bindings/gpio/nxp,pcal6524.yaml b/dts/bindings/gpio/nxp,pcal6524.yaml
index 8721cb6413f58..96500e6368447 100644
--- a/dts/bindings/gpio/nxp,pcal6524.yaml
+++ b/dts/bindings/gpio/nxp,pcal6524.yaml
@@ -1,7 +1,9 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-description: NXP PCAL6524 I2C GPIO expander node
-compatible: nxp,pcal6524
+description: NXP PCAL6524 I2C GPIO expander
+
+compatible: "nxp,pcal6524"
+
 include: nxp,pca_series.yaml
 
 properties:
diff --git a/dts/bindings/gpio/nxp,pcal6534.yaml b/dts/bindings/gpio/nxp,pcal6534.yaml
index ea1ffd3e57ef2..8037483408ac0 100644
--- a/dts/bindings/gpio/nxp,pcal6534.yaml
+++ b/dts/bindings/gpio/nxp,pcal6534.yaml
@@ -1,7 +1,9 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-description: NXP PCAL6534 I2C GPIO expander node
-compatible: nxp,pcal6534
+description: NXP PCAL6534 I2C GPIO expander
+
+compatible: "nxp,pcal6534"
+
 include: nxp,pca_series.yaml
 
 properties:
diff --git a/dts/bindings/gpio/openisa,rv32m1-gpio.yaml b/dts/bindings/gpio/openisa,rv32m1-gpio.yaml
index 369e25508d318..e5df0acfdb00d 100644
--- a/dts/bindings/gpio/openisa,rv32m1-gpio.yaml
+++ b/dts/bindings/gpio/openisa,rv32m1-gpio.yaml
@@ -1,4 +1,4 @@
-description: OpenISA GPIO node
+description: OpenISA GPIO
 
 compatible: "openisa,rv32m1-gpio"
 
diff --git a/dts/bindings/gpio/quicklogic,eos-s3-gpio.yaml b/dts/bindings/gpio/quicklogic,eos-s3-gpio.yaml
index 182a820db3991..7f32d1b17aba5 100644
--- a/dts/bindings/gpio/quicklogic,eos-s3-gpio.yaml
+++ b/dts/bindings/gpio/quicklogic,eos-s3-gpio.yaml
@@ -1,4 +1,4 @@
-description: EOS S3 GPIO node
+description: EOS S3 GPIO
 
 compatible: "quicklogic,eos-s3-gpio"
 
diff --git a/dts/bindings/gpio/raspberrypi,pico-gpio-port.yaml b/dts/bindings/gpio/raspberrypi,pico-gpio-port.yaml
new file mode 100644
index 0000000000000..fb4c9e4e737f6
--- /dev/null
+++ b/dts/bindings/gpio/raspberrypi,pico-gpio-port.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2021, Yonatan Schachter
+# SPDX-License-Identifier: Apache-2.0
+
+description: Raspberry Pi Pico GPIO Port
+
+compatible: "raspberrypi,pico-gpio-port"
+
+include: [gpio-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  "#gpio-cells":
+    const: 2
+
+gpio-cells:
+  - pin
+  - flags
diff --git a/dts/bindings/gpio/raspberrypi,pico-gpio.yaml b/dts/bindings/gpio/raspberrypi,pico-gpio.yaml
index 89afb5084b574..dc441964a7bce 100644
--- a/dts/bindings/gpio/raspberrypi,pico-gpio.yaml
+++ b/dts/bindings/gpio/raspberrypi,pico-gpio.yaml
@@ -1,19 +1,8 @@
-# Copyright (c) 2021, Yonatan Schachter
+# Copyright (c) 2024 TOKITA Hiroshi
 # SPDX-License-Identifier: Apache-2.0
 
 description: Raspberry Pi Pico GPIO
 
 compatible: "raspberrypi,pico-gpio"
 
-include: [gpio-controller.yaml, base.yaml]
-
-properties:
-  reg:
-    required: true
-
-  "#gpio-cells":
-    const: 2
-
-gpio-cells:
-  - pin
-  - flags
+include: [gpio-nexus.yaml, base.yaml]
diff --git a/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml b/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml
index fa015bac6de4a..1524a42668618 100644
--- a/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml
+++ b/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Renesas RA GPIO IO port
+description: Renesas RA GPIO I/O Port
 
 compatible: "renesas,ra-gpio-ioport"
 
diff --git a/dts/bindings/gpio/renesas,ra-gpio.yaml b/dts/bindings/gpio/renesas,ra-gpio.yaml
deleted file mode 100644
index ad18a0d45dae7..0000000000000
--- a/dts/bindings/gpio/renesas,ra-gpio.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-description: Renesas RA series GPIO
-
-compatible: "renesas,ra-gpio"
-
-include: [gpio-controller.yaml, base.yaml]
-
-properties:
-  reg:
-    required: true
-
-  port-irq0-pins:
-    type: array
-    description: Pins allow to assign port-irq0
-
-  port-irq1-pins:
-    type: array
-    description: Pins allow to assign port-irq1
-
-  port-irq2-pins:
-    type: array
-    description: Pins allow to assign port-irq2
-
-  port-irq3-pins:
-    type: array
-    description: Pins allow to assign port-irq3
-
-  port-irq4-pins:
-    type: array
-    description: Pins allow to assign port-irq4
-
-  port-irq5-pins:
-    type: array
-    description: Pins allow to assign port-irq5
-
-  port-irq6-pins:
-    type: array
-    description: Pins allow to assign port-irq6
-
-  port-irq7-pins:
-    type: array
-    description: Pins allow to assign port-irq7
-
-  port-irq8-pins:
-    type: array
-    description: Pins allow to assign port-irq8
-
-  port-irq9-pins:
-    type: array
-    description: Pins allow to assign port-irq9
-
-  port-irq10-pins:
-    type: array
-    description: Pins allow to assign port-irq10
-
-  port-irq11-pins:
-    type: array
-    description: Pins allow to assign port-irq11
-
-  port-irq12-pins:
-    type: array
-    description: Pins allow to assign port-irq12
-
-  port-irq13-pins:
-    type: array
-    description: Pins allow to assign port-irq13
-
-  port-irq14-pins:
-    type: array
-    description: Pins allow to assign port-irq14
-
-  port-irq15-pins:
-    type: array
-    description: Pins allow to assign port-irq15
-
-  "#gpio-cells":
-    const: 2
-
-gpio-cells:
-  - pin
-  - flags
diff --git a/dts/bindings/gpio/renesas,ra-parallel-graphics-header.yaml b/dts/bindings/gpio/renesas,ra-parallel-graphics-header.yaml
new file mode 100644
index 0000000000000..106d61e05da84
--- /dev/null
+++ b/dts/bindings/gpio/renesas,ra-parallel-graphics-header.yaml
@@ -0,0 +1,35 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  GPIO pins exposed on Renesas Parallel Graphics Expansion Header.
+
+  The Renesas Parallel Graphics Expansion Header consists of 2 rows of 20 pins each (40 pins total),
+
+  Pin mapping:
+
+    ------------------      --------------------
+    1   DISP_BLEN           2   IIC_SDA
+    3   DISP_INT            4   IIC_SCL
+    5   3V3                 6   DISP_RST
+    7   3V3                 8   5V0
+    9   LCDC_TCON0          10  LCDC_CLK
+    11  LCDC_TCON2          12  LCDC_TCON1
+    13  LCDC_EXTCLK         14  LCDC_TCON3
+    15  LCDC_DATA01         16  LCDC_DATA00
+    17  LCDC_DATA03         18  LCDC_DATA02
+    19  LCDC_DATA05         20  LCDC_DATA04
+    21  LCDC_DATA07         22  LCDC_DATA16
+    23  LCDC_DATA09         24  LCDC_DATA08
+    25  LCDC_DATA11         26  LCDC_DATA10
+    27  LCDC_DATA13         28  LCDC_DATA12
+    29  LCDC_DATA15         30  LCDC_DATA14
+    31  LCDC_DATA17         32  LCDC_DATA16
+    33  LCDC_DATA19         34  LCDC_DATA18
+    35  LCDC_DATA21         36  LCDC_DATA20
+    37  LCDC_DATA23         38  LCDC_DATA22
+    39  GND                 40  GND
+
+compatible: "renesas,ra-parallel-graphics-header"
+
+include: [gpio-nexus.yaml, base.yaml]
diff --git a/dts/bindings/gpio/renesas,rz-gpio.yaml b/dts/bindings/gpio/renesas,rz-gpio.yaml
index 9b4a37e6c1748..ecf3808f48712 100644
--- a/dts/bindings/gpio/renesas,rz-gpio.yaml
+++ b/dts/bindings/gpio/renesas,rz-gpio.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Reneses RZ  GPIO controller node.
+  Renesas RZ GPIO controller.
   Sample of usage:
     gpio-consumer{
           out-gpio = <&gpio8 2 (GPIO_PULL_UP);
diff --git a/dts/bindings/gpio/renesas,smartbond-gpio.yaml b/dts/bindings/gpio/renesas,smartbond-gpio.yaml
index 36cb1537cde27..ee79e2cbd14d3 100644
--- a/dts/bindings/gpio/renesas,smartbond-gpio.yaml
+++ b/dts/bindings/gpio/renesas,smartbond-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Renesas SmartBond(tm) GPIO node
+description: Renesas SmartBond(tm) GPIO
 
 compatible: "renesas,smartbond-gpio"
 
diff --git a/dts/bindings/gpio/richtek,rt1718s-gpio-port.yaml b/dts/bindings/gpio/richtek,rt1718s-gpio-port.yaml
index 6a95853ac8106..d73d3bc671e7a 100644
--- a/dts/bindings/gpio/richtek,rt1718s-gpio-port.yaml
+++ b/dts/bindings/gpio/richtek,rt1718s-gpio-port.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    Richtek RT1718S TCPC chip GPIO port
+    Richtek RT1718S TCPC chip GPIO Port
 
     "richtek,rt1718s-gpio-port" node handles GPIO feature of the RT1718S TCPC
     chip.
diff --git a/dts/bindings/gpio/rohm,bd8lb600fs-gpio.yaml b/dts/bindings/gpio/rohm,bd8lb600fs-gpio.yaml
index 96c2d2832e97a..155472ba8fc9b 100644
--- a/dts/bindings/gpio/rohm,bd8lb600fs-gpio.yaml
+++ b/dts/bindings/gpio/rohm,bd8lb600fs-gpio.yaml
@@ -6,7 +6,7 @@
 #
 
 description: |
-    This is a representation of the Rohm BD8LB600FS SPI Gpio Expander.
+    Rohm BD8LB600FS SPI GPIO Expander.
     Multiple instances may be daisy chained, which can be configured
     via the number of supported GPIOs.
 
diff --git a/dts/bindings/gpio/semtech,sx1509b.yaml b/dts/bindings/gpio/semtech,sx1509b.yaml
index b7e04843ef0db..318e02a6c2f17 100644
--- a/dts/bindings/gpio/semtech,sx1509b.yaml
+++ b/dts/bindings/gpio/semtech,sx1509b.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, Aapo Vienamo
 # SPDX-License-Identifier: Apache-2.0
 
-description: SX1509B GPIO node
+description: SX1509B GPIO
 
 compatible: "semtech,sx1509b"
 
diff --git a/dts/bindings/gpio/sensry,sy1xx-gpio.yaml b/dts/bindings/gpio/sensry,sy1xx-gpio.yaml
index a66d8d7d83ae8..f2fbadfc9e704 100644
--- a/dts/bindings/gpio/sensry,sy1xx-gpio.yaml
+++ b/dts/bindings/gpio/sensry,sy1xx-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 sensry.io
 # SPDX-License-Identifier: Apache-2.0
 
-description: Sensry SY1XX GPIO PORT node
+description: Sensry SY1XX GPIO Port
 
 compatible: "sensry,sy1xx-gpio"
 
diff --git a/dts/bindings/gpio/sifive,gpio0.yaml b/dts/bindings/gpio/sifive,gpio0.yaml
index 41e7d2ae8a91e..e80246db07193 100644
--- a/dts/bindings/gpio/sifive,gpio0.yaml
+++ b/dts/bindings/gpio/sifive,gpio0.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, SiFive Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: SiFive GPIO node
+description: SiFive GPIO
 
 compatible: "sifive,gpio0"
 
diff --git a/dts/bindings/gpio/silabs,gecko-gpio-port.yaml b/dts/bindings/gpio/silabs,gecko-gpio-port.yaml
index 3551f4df1ffe3..09b7757f77aac 100644
--- a/dts/bindings/gpio/silabs,gecko-gpio-port.yaml
+++ b/dts/bindings/gpio/silabs,gecko-gpio-port.yaml
@@ -1,4 +1,4 @@
-description: SiLabs Gecko GPIO port node
+description: SiLabs Gecko GPIO Port
 
 compatible: "silabs,gecko-gpio-port"
 
diff --git a/dts/bindings/gpio/silabs,gecko-gpio.yaml b/dts/bindings/gpio/silabs,gecko-gpio.yaml
index 0e923fd72f8bd..a1101849fe8a6 100644
--- a/dts/bindings/gpio/silabs,gecko-gpio.yaml
+++ b/dts/bindings/gpio/silabs,gecko-gpio.yaml
@@ -1,4 +1,4 @@
-description: SiLabs Gecko GPIO node
+description: SiLabs Gecko GPIO
 
 compatible: "silabs,gecko-gpio"
 
diff --git a/dts/bindings/gpio/silabs,si32-gpio.yaml b/dts/bindings/gpio/silabs,si32-gpio.yaml
index e317f916acd85..99817cb50816b 100644
--- a/dts/bindings/gpio/silabs,si32-gpio.yaml
+++ b/dts/bindings/gpio/silabs,si32-gpio.yaml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: Si32 GPIO node
+description: Si32 GPIO
 
 compatible: "silabs,si32-gpio"
 
diff --git a/dts/bindings/gpio/silabs,siwx91x-gpio-port.yaml b/dts/bindings/gpio/silabs,siwx91x-gpio-port.yaml
index 4cc40af3323aa..c797e78ca3f82 100644
--- a/dts/bindings/gpio/silabs,siwx91x-gpio-port.yaml
+++ b/dts/bindings/gpio/silabs,siwx91x-gpio-port.yaml
@@ -1,4 +1,4 @@
-description: Silabs SiWx91x GPIO port node
+description: Silabs SiWx91x GPIO Port
 
 compatible: "silabs,siwx91x-gpio-port"
 
diff --git a/dts/bindings/gpio/silabs,siwx91x-gpio-uulp.yaml b/dts/bindings/gpio/silabs,siwx91x-gpio-uulp.yaml
index 2c6cc44a38170..d527099de3925 100644
--- a/dts/bindings/gpio/silabs,siwx91x-gpio-uulp.yaml
+++ b/dts/bindings/gpio/silabs,siwx91x-gpio-uulp.yaml
@@ -1,4 +1,4 @@
-description: Silabs SiWx91x UULP (ultra ultra low power) GPIO port node
+description: Silabs SiWx91x UULP (ultra ultra low power) GPIO Port
 
 compatible: "silabs,siwx91x-gpio-uulp"
 
diff --git a/dts/bindings/gpio/silabs,siwx91x-gpio.yaml b/dts/bindings/gpio/silabs,siwx91x-gpio.yaml
index a7e1535916b6a..095d25734008d 100644
--- a/dts/bindings/gpio/silabs,siwx91x-gpio.yaml
+++ b/dts/bindings/gpio/silabs,siwx91x-gpio.yaml
@@ -1,4 +1,4 @@
-description: Silabs SiWx91x GPIO node
+description: Silabs SiWx91x GPIO
 
 compatible: "silabs,siwx91x-gpio"
 
diff --git a/dts/bindings/gpio/snps,creg-gpio.yaml b/dts/bindings/gpio/snps,creg-gpio.yaml
index d73b2f54fef8f..5f8897b66ee53 100644
--- a/dts/bindings/gpio/snps,creg-gpio.yaml
+++ b/dts/bindings/gpio/snps,creg-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Synopsys, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Synopsys CREG GPIO node
+description: Synopsys CREG GPIO
 
 compatible: "snps,creg-gpio"
 
diff --git a/dts/bindings/gpio/snps,designware-gpio.yaml b/dts/bindings/gpio/snps,designware-gpio.yaml
index 12b81c0455a61..96629dfe0c194 100644
--- a/dts/bindings/gpio/snps,designware-gpio.yaml
+++ b/dts/bindings/gpio/snps,designware-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Synopsys DesignWare GPIO node
+description: Synopsys DesignWare GPIO
 
 compatible: "snps,designware-gpio"
 
diff --git a/dts/bindings/gpio/st,stm32-gpio.yaml b/dts/bindings/gpio/st,stm32-gpio.yaml
index be1061ac085e9..ca99957f9fb2f 100644
--- a/dts/bindings/gpio/st,stm32-gpio.yaml
+++ b/dts/bindings/gpio/st,stm32-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32 GPIO node
+description: STM32 GPIO Controller
 
 compatible: "st,stm32-gpio"
 
diff --git a/dts/bindings/gpio/telink,b91-gpio.yaml b/dts/bindings/gpio/telink,b91-gpio.yaml
index 511b61208c441..427b6f77a3516 100644
--- a/dts/bindings/gpio/telink,b91-gpio.yaml
+++ b/dts/bindings/gpio/telink,b91-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021, Telink Semiconductor
 # SPDX-License-Identifier: Apache-2.0
 
-description: Telink B91 GPIO node
+description: Telink B91 GPIO
 
 compatible: "telink,b91-gpio"
 
diff --git a/dts/bindings/gpio/ti,ads1x4s0x-gpio.yaml b/dts/bindings/gpio/ti,ads1x4s0x-gpio.yaml
index b7ec4e3daffd6..47423eb0251c7 100644
--- a/dts/bindings/gpio/ti,ads1x4s0x-gpio.yaml
+++ b/dts/bindings/gpio/ti,ads1x4s0x-gpio.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: TI ADS114S0x GPIO controller binding
+description: TI ADS114S0x GPIO Controller
 
 compatible: "ti,ads1x4s0x-gpio"
 
diff --git a/dts/bindings/gpio/ti,cc13xx-cc26xx-gpio.yaml b/dts/bindings/gpio/ti,cc13xx-cc26xx-gpio.yaml
index 284c90d376a2d..c480ea77ae515 100644
--- a/dts/bindings/gpio/ti,cc13xx-cc26xx-gpio.yaml
+++ b/dts/bindings/gpio/ti,cc13xx-cc26xx-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Brett Witherspoon
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI SimpleLink CC13xx / CC26xx GPIO node
+description: TI SimpleLink CC13xx / CC26xx GPIO
 
 compatible: "ti,cc13xx-cc26xx-gpio"
 
diff --git a/dts/bindings/gpio/ti,cc23x0-gpio.yaml b/dts/bindings/gpio/ti,cc23x0-gpio.yaml
index ced5e1352d97a..9f2728b69b6a0 100644
--- a/dts/bindings/gpio/ti,cc23x0-gpio.yaml
+++ b/dts/bindings/gpio/ti,cc23x0-gpio.yaml
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI SimpleLink CC23X0 GPIO node
+description: TI SimpleLink CC23X0 GPIO
 
 compatible: "ti,cc23x0-gpio"
 
diff --git a/dts/bindings/gpio/ti,cc32xx-gpio.yaml b/dts/bindings/gpio/ti,cc32xx-gpio.yaml
index 1673df891537d..55ac87e100691 100644
--- a/dts/bindings/gpio/ti,cc32xx-gpio.yaml
+++ b/dts/bindings/gpio/ti,cc32xx-gpio.yaml
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-description: TI CC32XX GPIO node
+description: TI CC32XX GPIO
 
 compatible: "ti,cc32xx-gpio"
 
diff --git a/dts/bindings/gpio/ti,davinci-gpio-nexus.yaml b/dts/bindings/gpio/ti,davinci-gpio-nexus.yaml
index 1b38fe927ca22..d3ed0f4374ea9 100644
--- a/dts/bindings/gpio/ti,davinci-gpio-nexus.yaml
+++ b/dts/bindings/gpio/ti,davinci-gpio-nexus.yaml
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: GPIO controller for Davinci and Keystone devices
+description: GPIO Controller for Davinci and Keystone devices
 
 compatible: "ti,davinci-gpio-nexus"
 
diff --git a/dts/bindings/gpio/ti,davinci-gpio.yaml b/dts/bindings/gpio/ti,davinci-gpio.yaml
index 64c0bbd5db56e..4b5360f224a00 100644
--- a/dts/bindings/gpio/ti,davinci-gpio.yaml
+++ b/dts/bindings/gpio/ti,davinci-gpio.yaml
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: GPIO controller for Davinci and Keystone devices.
+description: GPIO Controller for Davinci and Keystone devices.
 
 compatible: "ti,davinci-gpio"
 
diff --git a/dts/bindings/gpio/ti,lmp90xxx-gpio.yaml b/dts/bindings/gpio/ti,lmp90xxx-gpio.yaml
index 536b24be5c5f3..6fc960c2a37c9 100644
--- a/dts/bindings/gpio/ti,lmp90xxx-gpio.yaml
+++ b/dts/bindings/gpio/ti,lmp90xxx-gpio.yaml
@@ -1,4 +1,4 @@
-description: TI LMP90xxx GPIO controller binding
+description: TI LMP90xxx GPIO Controller
 
 compatible: "ti,lmp90xxx-gpio"
 
diff --git a/dts/bindings/gpio/ti,stellaris-gpio.yaml b/dts/bindings/gpio/ti,stellaris-gpio.yaml
index ecdfddd4a8dee..a1486cf4d5e82 100644
--- a/dts/bindings/gpio/ti,stellaris-gpio.yaml
+++ b/dts/bindings/gpio/ti,stellaris-gpio.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI Stellaris GPIO node
+description: TI Stellaris GPIO
 
 compatible: "ti,stellaris-gpio"
 
diff --git a/dts/bindings/gpio/ti,tca9538.yaml b/dts/bindings/gpio/ti,tca9538.yaml
index 9200a9a16061a..2b4f0098868d7 100644
--- a/dts/bindings/gpio/ti,tca9538.yaml
+++ b/dts/bindings/gpio/ti,tca9538.yaml
@@ -2,7 +2,7 @@
 # Copyright (c) 2021, Laird Connectivity
 # SPDX-License-Identifier: Apache-2.0
 
-description: TCA9538 GPIO node
+description: TCA9538 GPIO
 
 compatible: "ti,tca9538"
 
diff --git a/dts/bindings/gpio/xlnx,ps-gpio-bank.yaml b/dts/bindings/gpio/xlnx,ps-gpio-bank.yaml
index 43e8f457421a2..786530461893e 100644
--- a/dts/bindings/gpio/xlnx,ps-gpio-bank.yaml
+++ b/dts/bindings/gpio/xlnx,ps-gpio-bank.yaml
@@ -4,7 +4,7 @@
 #
 
 description: |
-  Xilinx Zynq-7000/ZynqMP MIO/EMIO GPIO controller bank node.
+  Xilinx Zynq-7000/ZynqMP MIO/EMIO GPIO Controller bank.
 
   Each node of this type specified in the devicetree represents
   a bank of the MIO/EMIO GPIO controller integrated in the Processor
diff --git a/dts/bindings/gpio/xlnx,ps-gpio.yaml b/dts/bindings/gpio/xlnx,ps-gpio.yaml
index 9271adda4e4e4..c13e2f84b7350 100644
--- a/dts/bindings/gpio/xlnx,ps-gpio.yaml
+++ b/dts/bindings/gpio/xlnx,ps-gpio.yaml
@@ -4,7 +4,7 @@
 #
 
 description: |
-  Xilinx Zynq-7000/ZynqMP MIO/EMIO GPIO controller node.
+  Xilinx Zynq-7000/ZynqMP MIO/EMIO GPIO Controller.
 
   This GPIO controller is contained in both the Xilinx Zynq-7000 and
   ZynqMP (UltraScale) SoCs. It interfaces both I/O pins of the SoC,
diff --git a/dts/bindings/gpio/xlnx,xps-gpio-1.00.a-gpio2.yaml b/dts/bindings/gpio/xlnx,xps-gpio-1.00.a-gpio2.yaml
index b2c44c436594f..9960076b54e4b 100644
--- a/dts/bindings/gpio/xlnx,xps-gpio-1.00.a-gpio2.yaml
+++ b/dts/bindings/gpio/xlnx,xps-gpio-1.00.a-gpio2.yaml
@@ -1,4 +1,4 @@
-description: Xilinx AXI GPIO IP GPIO2 node
+description: Xilinx AXI GPIO IP GPIO2
 
 compatible: "xlnx,xps-gpio-1.00.a-gpio2"
 
diff --git a/dts/bindings/gpio/xlnx,xps-gpio-1.00.a.yaml b/dts/bindings/gpio/xlnx,xps-gpio-1.00.a.yaml
index 673f47291ca4b..ead2829454d21 100644
--- a/dts/bindings/gpio/xlnx,xps-gpio-1.00.a.yaml
+++ b/dts/bindings/gpio/xlnx,xps-gpio-1.00.a.yaml
@@ -1,4 +1,4 @@
-description: Xilinx AXI GPIO IP node
+description: Xilinx AXI GPIO IP
 
 compatible: "xlnx,xps-gpio-1.00.a"
 
diff --git a/dts/bindings/i2c/ambiq,i2c.yaml b/dts/bindings/i2c/ambiq,i2c.yaml
index 7d7a87617dcd6..556dc792c4791 100644
--- a/dts/bindings/i2c/ambiq,i2c.yaml
+++ b/dts/bindings/i2c/ambiq,i2c.yaml
@@ -5,18 +5,9 @@ description: Ambiq I2C
 
 compatible: "ambiq,i2c"
 
-include: [i2c-controller.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
+include: [i2c-controller.yaml, pinctrl-device.yaml]
 
 properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  ambiq,pwrcfg:
-    required: true
-
   scl-gpios:
     type: phandle-array
     description: |
diff --git a/dts/bindings/i2c/andestech,atciic100.yaml b/dts/bindings/i2c/andestech,atciic100.yaml
index 1af3b04c18165..e54303eb4e73b 100644
--- a/dts/bindings/i2c/andestech,atciic100.yaml
+++ b/dts/bindings/i2c/andestech,atciic100.yaml
@@ -4,8 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description:
-  This is a representation of AndesTech atciic100 I2C node
+description: AndesTech ATCIIC100 I2C
 
 compatible: "andestech,atciic100"
 
diff --git a/dts/bindings/i2c/arm,versatile-i2c.yaml b/dts/bindings/i2c/arm,versatile-i2c.yaml
index c88d87002e5dd..b8b0ae52a3bec 100644
--- a/dts/bindings/i2c/arm,versatile-i2c.yaml
+++ b/dts/bindings/i2c/arm,versatile-i2c.yaml
@@ -1,11 +1,12 @@
 # Copyright (c) 2018, Linaro Limited
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 description: ARM SBCon two-wire serial bus interface
 
 compatible: "arm,versatile-i2c"
 
-include: i2c-controller.yaml
+include: [i2c-controller.yaml, pinctrl-device.yaml]
 
 properties:
   reg:
diff --git a/dts/bindings/i2c/atmel,sam-i2c-twi.yaml b/dts/bindings/i2c/atmel,sam-i2c-twi.yaml
index c22646160d5ea..4acaa564155f4 100644
--- a/dts/bindings/i2c/atmel,sam-i2c-twi.yaml
+++ b/dts/bindings/i2c/atmel,sam-i2c-twi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2017 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
 
-description: Atmel SAM Family I2C (TWI) node
+description: Atmel SAM Family I2C (TWI)
 
 compatible: "atmel,sam-i2c-twi"
 
diff --git a/dts/bindings/i2c/atmel,sam-i2c-twihs.yaml b/dts/bindings/i2c/atmel,sam-i2c-twihs.yaml
index abaad2cf27cee..1eeeb4ab2bde7 100644
--- a/dts/bindings/i2c/atmel,sam-i2c-twihs.yaml
+++ b/dts/bindings/i2c/atmel,sam-i2c-twihs.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2017 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
 
-description: Atmel SAM Family I2C (TWIHS) node
+description: Atmel SAM Family I2C (TWIHS)
 
 compatible: "atmel,sam-i2c-twihs"
 
diff --git a/dts/bindings/i2c/atmel,sam-i2c-twim.yaml b/dts/bindings/i2c/atmel,sam-i2c-twim.yaml
index 90c5c6e838812..dc06d32a9be50 100644
--- a/dts/bindings/i2c/atmel,sam-i2c-twim.yaml
+++ b/dts/bindings/i2c/atmel,sam-i2c-twim.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Atmel SAM4L Family I2C (TWIM) node
+  Atmel SAM4L Family I2C (TWIM)
 
   The Atmel Two-wire Master Interface (TWIM) interconnects components on a
   unique two-wire bus, made up of one clock line and one data line with speeds
diff --git a/dts/bindings/i2c/atmel,sam0-i2c.yaml b/dts/bindings/i2c/atmel,sam0-i2c.yaml
index db0610b785fef..134657fa553ee 100644
--- a/dts/bindings/i2c/atmel,sam0-i2c.yaml
+++ b/dts/bindings/i2c/atmel,sam0-i2c.yaml
@@ -2,7 +2,7 @@
 # Copyright (c) 2024 Gerson Fernando Budke <nandojve@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: Atmel SAM0 series SERCOM I2C node
+description: Atmel SAM0 series SERCOM I2C
 
 compatible: "atmel,sam0-i2c"
 
diff --git a/dts/bindings/i2c/cdns,i2c.yaml b/dts/bindings/i2c/cdns,i2c.yaml
new file mode 100644
index 0000000000000..e03925cad2946
--- /dev/null
+++ b/dts/bindings/i2c/cdns,i2c.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Cadence I2C controller.
+
+  Example I2C device tree node:
+    i2c@e0004000 {
+        compatible = "cdns,i2c";
+        clocks = <&clkc 38>;
+        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+        reg = <0xe0004000 0x1000>;
+        clock-frequency = <400000>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        fifo-depth = <8>;
+    };
+
+compatible: "cdns,i2c"
+
+include: [i2c-controller.yaml, reset-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  clocks:
+    required: true
+    description: Reference Input clock for I2C core.
+
+  interrupts:
+    required: true
+
+  clock-frequency:
+    required: true
+    description: Desired I2C bus clock frequency in Hz.
+
+  fifo-depth:
+    type: int
+    required: true
+    description: Size of the data FIFO in bytes.
diff --git a/dts/bindings/i2c/fsl,imx21-i2c.yaml b/dts/bindings/i2c/fsl,imx21-i2c.yaml
index 7a8fcaabc52ab..a9fb34cbb5ee7 100644
--- a/dts/bindings/i2c/fsl,imx21-i2c.yaml
+++ b/dts/bindings/i2c/fsl,imx21-i2c.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-description: i.MX I2C node
+description: i.MX I2C
 
 compatible: "fsl,imx21-i2c"
 
diff --git a/dts/bindings/i2c/litex,litei2c.yaml b/dts/bindings/i2c/litex,litei2c.yaml
new file mode 100644
index 0000000000000..d85bd410f0236
--- /dev/null
+++ b/dts/bindings/i2c/litex,litei2c.yaml
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2024 Vogl Electronic GmbH
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+description: LiteX LiteI2C I2C controller
+
+compatible: "litex,litei2c"
+
+include: i2c-controller.yaml
+
+properties:
+  reg:
+    required: true
+
+  clock-frequency:
+    required: true
diff --git a/dts/bindings/i2c/microchip,mpfs-i2c.yaml b/dts/bindings/i2c/microchip,mpfs-i2c.yaml
index 36d0b00b7d8a8..3da7cc07547ae 100644
--- a/dts/bindings/i2c/microchip,mpfs-i2c.yaml
+++ b/dts/bindings/i2c/microchip,mpfs-i2c.yaml
@@ -4,8 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description:
-  Microchip MPFS I2C Controller Device Tree Bindings
+description: Microchip MPFS I2C Controller
 
 compatible: "microchip,mpfs-i2c"
 
diff --git a/dts/bindings/i2c/nuvoton,npcx-i2c-ctrl.yaml b/dts/bindings/i2c/nuvoton,npcx-i2c-ctrl.yaml
index 4ee9c5f2bcdfe..6e1b8e77bd5ec 100644
--- a/dts/bindings/i2c/nuvoton,npcx-i2c-ctrl.yaml
+++ b/dts/bindings/i2c/nuvoton,npcx-i2c-ctrl.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX-I2C controller node
+description: Nuvoton NPCX-I2C controller
 
 compatible: "nuvoton,npcx-i2c-ctrl"
 
diff --git a/dts/bindings/i2c/nuvoton,npcx-i2c-port.yaml b/dts/bindings/i2c/nuvoton,npcx-i2c-port.yaml
index 76304f57374b7..339c33cf20300 100644
--- a/dts/bindings/i2c/nuvoton,npcx-i2c-port.yaml
+++ b/dts/bindings/i2c/nuvoton,npcx-i2c-port.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX-I2C port pads node
+description: Nuvoton NPCX-I2C port pads
 
 compatible: "nuvoton,npcx-i2c-port"
 
diff --git a/dts/bindings/i2c/nxp,ii2c.yaml b/dts/bindings/i2c/nxp,ii2c.yaml
index 6c493ea2e5385..1c3e0d39f8540 100644
--- a/dts/bindings/i2c/nxp,ii2c.yaml
+++ b/dts/bindings/i2c/nxp,ii2c.yaml
@@ -1,7 +1,7 @@
 # Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP II2C node
+description: NXP II2C
 
 compatible: "nxp,ii2c"
 
diff --git a/dts/bindings/i2c/nxp,kinetis-i2c.yaml b/dts/bindings/i2c/nxp,kinetis-i2c.yaml
index 32c4163214082..b7616f6efe6b5 100644
--- a/dts/bindings/i2c/nxp,kinetis-i2c.yaml
+++ b/dts/bindings/i2c/nxp,kinetis-i2c.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2017 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-description: Kinetis I2C node
+description: Kinetis I2C
 
 compatible: "nxp,kinetis-i2c"
 
diff --git a/dts/bindings/i2c/nxp,lpc-i2c.yaml b/dts/bindings/i2c/nxp,lpc-i2c.yaml
index 54aa4b7fb5805..c4fdd88a428e2 100644
--- a/dts/bindings/i2c/nxp,lpc-i2c.yaml
+++ b/dts/bindings/i2c/nxp,lpc-i2c.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: LPC I2C node
+description: LPC I2C
 
 compatible: "nxp,lpc-i2c"
 
diff --git a/dts/bindings/i2c/raspberrypi,pico-i2c.yaml b/dts/bindings/i2c/raspberrypi,pico-i2c.yaml
index ac055dcfd591d..331c5762b89be 100644
--- a/dts/bindings/i2c/raspberrypi,pico-i2c.yaml
+++ b/dts/bindings/i2c/raspberrypi,pico-i2c.yaml
@@ -2,4 +2,4 @@ description: Raspberry Pi Pico I2C
 
 compatible: "raspberrypi,pico-i2c"
 
-include: ["snps,designware-i2c.yaml", "reset-device.yaml"]
+include: "snps,designware-i2c.yaml"
diff --git a/dts/bindings/i2c/renesas,ra-i2c-sci-b.yaml b/dts/bindings/i2c/renesas,ra-i2c-sci-b.yaml
new file mode 100644
index 0000000000000..75beaa59ef10a
--- /dev/null
+++ b/dts/bindings/i2c/renesas,ra-i2c-sci-b.yaml
@@ -0,0 +1,34 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RA SCI-B I2C controller
+
+compatible: "renesas,ra-i2c-sci-b"
+
+include: [i2c-controller.yaml, pinctrl-device.yaml]
+
+properties:
+
+  channel:
+    required: true
+    type: int
+
+  sda-output-delay:
+    type: int
+    default: 300
+    description: |
+      SDA Output Delay in nano seconds.
+
+  noise-filter-clock-select:
+    type: int
+    default: 1
+    enum: [1, 2, 3, 4]
+    description: |
+      Select the on-chip baud rate generator source clock
+      division setting for the digital noise filter.
+
+  bit-rate-modulation:
+    type: boolean
+    description: |
+      Enabling bitrate modulation reduces the percent error
+      of the actual bitrate with respect to the requested baud rate.
diff --git a/dts/bindings/i2c/renesas,rz-riic.yaml b/dts/bindings/i2c/renesas,rz-riic.yaml
new file mode 100644
index 0000000000000..42b7fdc5d96b9
--- /dev/null
+++ b/dts/bindings/i2c/renesas,rz-riic.yaml
@@ -0,0 +1,44 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RZ/G3S I2C controller
+
+compatible: "renesas,rz-riic"
+
+include: [i2c-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  channel:
+    required: true
+    type: int
+
+  interrupts:
+    required: true
+
+  rise-time-ns:
+    type: int
+    default: 120
+    description: |
+      Number of nanoseconds the SCL signal takes to rise; t(r) in the I2C specification.
+
+  fall-time-ns:
+    type: int
+    default: 120
+    description: |
+      Number of nanoseconds the SCL signal takes to fall; t(f) in the I2C specification.
+
+  duty-cycle-percent:
+    type: int
+    default: 50
+
+  noise-filter-stages:
+    type: int
+    default: 1
+    enum:
+      - 1
+      - 2
+      - 3
+      - 4
diff --git a/dts/bindings/i2c/sensry,sy1xxx-i2c.yaml b/dts/bindings/i2c/sensry,sy1xxx-i2c.yaml
new file mode 100644
index 0000000000000..124b2d98709e8
--- /dev/null
+++ b/dts/bindings/i2c/sensry,sy1xxx-i2c.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+description: Sensry SY1XX I2C Driver node
+
+compatible: "sensry,sy1xx-i2c"
+
+include: [i2c-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  instance:
+    type: int
+    required: true
diff --git a/dts/bindings/i2c/silabs,gecko-i2c.yaml b/dts/bindings/i2c/silabs,gecko-i2c.yaml
index ef694376ac9c8..c3ab3258fc945 100644
--- a/dts/bindings/i2c/silabs,gecko-i2c.yaml
+++ b/dts/bindings/i2c/silabs,gecko-i2c.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Diego Sueiro <diego.sueiro@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: Silabs Gecko I2C node
+description: Silabs Gecko I2C
 
 compatible: "silabs,gecko-i2c"
 
diff --git a/dts/bindings/i2c/snps,designware-i2c.yaml b/dts/bindings/i2c/snps,designware-i2c.yaml
index 770ff98b5fc15..cc02989d9275a 100644
--- a/dts/bindings/i2c/snps,designware-i2c.yaml
+++ b/dts/bindings/i2c/snps,designware-i2c.yaml
@@ -1,11 +1,11 @@
 # Copyright (c) 2018 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Synopsys DesignWare I2C node
+description: Synopsys DesignWare I2C
 
 compatible: "snps,designware-i2c"
 
-include: [i2c-controller.yaml, pinctrl-device.yaml, pcie-device.yaml]
+include: [i2c-controller.yaml, pinctrl-device.yaml, pcie-device.yaml, reset-device.yaml]
 
 properties:
   interrupts:
diff --git a/dts/bindings/i2c/st,stm32-i2c-v2.yaml b/dts/bindings/i2c/st,stm32-i2c-v2.yaml
index bc859873ac05d..80283d518b10e 100644
--- a/dts/bindings/i2c/st,stm32-i2c-v2.yaml
+++ b/dts/bindings/i2c/st,stm32-i2c-v2.yaml
@@ -55,3 +55,15 @@ properties:
     description: |
       GPIO to which the I2C SDA signal is routed. This is only needed for
       I2C bus recovery support.
+
+  dmas:
+    type: phandle-array
+    description: |
+      Optional DMA channels used by the I2C peripheral. If specified, these
+      channels can be used to handle RX and TX transactions over DMA.
+
+  dma-names:
+    type: string-array
+    description: |
+      Names of the optional DMA channels. Expected values are "tx" for
+      the TX channel and "rx" for the RX channel.
diff --git a/dts/bindings/i2c/ti,cc13xx-cc26xx-i2c.yaml b/dts/bindings/i2c/ti,cc13xx-cc26xx-i2c.yaml
index f9e55a09a779f..0e3581760f980 100644
--- a/dts/bindings/i2c/ti,cc13xx-cc26xx-i2c.yaml
+++ b/dts/bindings/i2c/ti,cc13xx-cc26xx-i2c.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Brett Witherspoon
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI CC13xx / CC26xx I2C node
+description: TI CC13xx / CC26xx I2C
 
 compatible: "ti,cc13xx-cc26xx-i2c"
 
diff --git a/dts/bindings/i2c/ti,tca9544a.yaml b/dts/bindings/i2c/ti,tca9544a.yaml
index 16c00b9078462..b110c8084afe9 100644
--- a/dts/bindings/i2c/ti,tca9544a.yaml
+++ b/dts/bindings/i2c/ti,tca9544a.yaml
@@ -1,6 +1,6 @@
 # Binding for TI TCA9544A, compatible with NXP PCA9544A
 
-description: Texas Instruments TCA9544A binding
+description: Texas Instruments TCA9544A
 
 compatible: "ti,tca9544a"
 
diff --git a/dts/bindings/i2c/ti,tca9546a.yaml b/dts/bindings/i2c/ti,tca9546a.yaml
index 95741cd72c398..7687318ac7b2e 100644
--- a/dts/bindings/i2c/ti,tca9546a.yaml
+++ b/dts/bindings/i2c/ti,tca9546a.yaml
@@ -1,6 +1,6 @@
 # Binding for TI TCA9546A, compatible with NXP PCA9546A
 
-description: Texas Instruments TCA9546A binding
+description: Texas Instruments TCA9546A
 
 compatible: "ti,tca9546a"
 
diff --git a/dts/bindings/i2c/ti,tca9548a.yaml b/dts/bindings/i2c/ti,tca9548a.yaml
index bddf59e120a44..8afa76e039b19 100644
--- a/dts/bindings/i2c/ti,tca9548a.yaml
+++ b/dts/bindings/i2c/ti,tca9548a.yaml
@@ -1,6 +1,6 @@
 # Binding for TI TCA9548A, compatible with NXP PCA9548A
 
-description: Texas Instruments TCA9548A binding
+description: Texas Instruments TCA9548A
 
 compatible: "ti,tca9548a"
 
diff --git a/dts/bindings/i2c/ti,tca954x-base.yaml b/dts/bindings/i2c/ti,tca954x-base.yaml
index 2ce07e0fb6a83..3a13f50f79cca 100644
--- a/dts/bindings/i2c/ti,tca954x-base.yaml
+++ b/dts/bindings/i2c/ti,tca954x-base.yaml
@@ -20,25 +20,25 @@ description: |
           reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
 
           mux_i2c@0 {
-              compatible: "ti,tca9546a-channel"
+              compatible = "ti,tca9546a-channel";
               reg = <0>;
               #address-cells = <1>;
               #size-cells = <0>;
 
-              temp_sens_0: tmp116@49 {
-                  compatible = "ti,tmp116";
+              temp_sens_0: tmp11x@49 {
+                  compatible = "ti,tmp11x";
                   reg = <0x49>;
               };
           };
 
           mux_i2c@1 {
-            compatible: "ti,tca9546a-channel"
+              compatible = "ti,tca9546a-channel";
               reg = <1>;
               #address-cells = <1>;
               #size-cells = <0>;
 
-              temp_sens_1: tmp116@49 {
-                  compatible = "ti,tmp116";
+              temp_sens_1: tmp11x@49 {
+                  compatible = "ti,tmp11x";
                   reg = <0x49>;
               };
           };
@@ -52,6 +52,13 @@ properties:
     description: |
       GPIO connected to the controller RESET pin. This pin is active-low.
 
+  i2c-mux-idle-disconnect:
+    type: boolean
+    description: |
+      Forces mux to disconnect all children in idle state. This is
+      necessary for example, if there are several multiplexers on the bus and
+      the devices behind them use same I2C addresses.
+
 child-binding:
   description: TCA954x I2C switch channel node
   include: [i2c-controller.yaml]
diff --git a/dts/bindings/i2c/wch,i2c.yaml b/dts/bindings/i2c/wch,i2c.yaml
new file mode 100644
index 0000000000000..416ab38c4d458
--- /dev/null
+++ b/dts/bindings/i2c/wch,i2c.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Andrei-Edward Popa
+# SPDX-License-Identifier: Apache-2.0
+
+description: WCH I2C controller
+
+compatible: "wch,i2c"
+
+include: [i2c-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  clocks:
+    required: true
+
+  interrupts:
+    required: true
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
diff --git a/dts/bindings/i2s/espressif,esp32-i2s.yaml b/dts/bindings/i2s/espressif,esp32-i2s.yaml
index aded34886366b..16e32b90a4372 100644
--- a/dts/bindings/i2s/espressif,esp32-i2s.yaml
+++ b/dts/bindings/i2s/espressif,esp32-i2s.yaml
@@ -23,12 +23,6 @@ properties:
   interrupt-parent:
     required: true
 
-  dmas:
-    required: true
-
-  dma-names:
-    required: true
-
   unit:
     type: int
     required: true
diff --git a/dts/bindings/i2s/nxp,mcux-i2s.yaml b/dts/bindings/i2s/nxp,mcux-i2s.yaml
index d657edf2df606..7fbd85f53a3d0 100644
--- a/dts/bindings/i2s/nxp,mcux-i2s.yaml
+++ b/dts/bindings/i2s/nxp,mcux-i2s.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021,2023-2024 NXP
+# Copyright 2021,2023-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 description: NXP mcux SAI-I2S controller
@@ -65,6 +65,11 @@ properties:
     type: int
     description: Clock mux source for SAI root clock
 
+  mclk-output:
+    type: boolean
+    description: |
+      Set if MCLK signal is an output.  Hardware default sets MCLK signal as input.
+
 pinmux-cells:
   - offset
   - mask
diff --git a/dts/bindings/i3c/i3c-controller.yaml b/dts/bindings/i3c/i3c-controller.yaml
index 50472604b5ea4..c6ac5eacccddf 100644
--- a/dts/bindings/i3c/i3c-controller.yaml
+++ b/dts/bindings/i3c/i3c-controller.yaml
@@ -30,3 +30,11 @@ properties:
       and there are I2C devices attached to the bus, look at the Legacy
       Virtual Register (LVR) of all connected I2C devices to determine
       the maximum allowed frequency.
+
+  primary-controller-da:
+    type: int
+    description: |
+      This is the self assigned dynamic address of the I3C controller. This
+      is the address is used to communicate with itself after a handoff by
+      a secondary controller. This is only used if the controller is a primary
+      controller.
diff --git a/dts/bindings/i3c/i3c-device.yaml b/dts/bindings/i3c/i3c-device.yaml
index 297e28e632577..76e4dafa630f7 100644
--- a/dts/bindings/i3c/i3c-device.yaml
+++ b/dts/bindings/i3c/i3c-device.yaml
@@ -67,3 +67,8 @@ properties:
     description: |
       Indicates if the device supports the CCC SETAASA. If true, it will
       be used as an optimization for bus initialization.
+
+  v1p0-support:
+    type: boolean
+    description: |
+      Indicates if the device compiles to I3C v1.0.
diff --git a/dts/bindings/i3c/snps,designware-i3c.yaml b/dts/bindings/i3c/snps,designware-i3c.yaml
new file mode 100644
index 0000000000000..b323ebd5e6b9c
--- /dev/null
+++ b/dts/bindings/i3c/snps,designware-i3c.yaml
@@ -0,0 +1,30 @@
+# Copyright (C) 2020 Samsung Electronics Co., Ltd.
+# Copyright (C) 2023 Meta Platforms
+# SPDX-License-Identifier: Apache-2.0
+
+description: >
+    This is a binding for the Synopsys I3C interface
+
+compatible: "snps,designware-i3c"
+
+include: i3c-controller.yaml
+
+properties:
+  clocks:
+    required: true
+
+  od-thigh-max-ns:
+    type: int
+    default: 41
+    description: |
+      Maximum high clock pulse length (ns) in Open-Drain mode.
+      The default is value from Section 6.2 of the I3C
+      Specifiction.
+
+  od-tlow-min-ns:
+    type: int
+    default: 200
+    description: |
+      Minimum low clock pulse length (ns) in Open-Drain mode.
+      The default is value from Section 6.2 of the I3C
+      Specifiction.
diff --git a/dts/bindings/ieee802154/nxp,mcxw-ieee802154.yaml b/dts/bindings/ieee802154/nxp,mcxw-ieee802154.yaml
new file mode 100644
index 0000000000000..cb76bf63ac8ce
--- /dev/null
+++ b/dts/bindings/ieee802154/nxp,mcxw-ieee802154.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, NXP
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP MCXW71 IEEE 802.15.4 node
+
+compatible: "nxp,mcxw-ieee802154"
+
+include: base.yaml
diff --git a/dts/bindings/iio/afe/current-sense-amplifier.yaml b/dts/bindings/iio/afe/current-sense-amplifier.yaml
index 11eda97323c5f..d12a07fabb4f9 100644
--- a/dts/bindings/iio/afe/current-sense-amplifier.yaml
+++ b/dts/bindings/iio/afe/current-sense-amplifier.yaml
@@ -45,3 +45,16 @@ properties:
 
       If present the corresponding GPIO must be set to an active level
       to enable the current amplifier.
+
+  enable-calibration:
+    type: boolean
+    description: |
+      Enable calibration of the current sense amplifier.
+      This is used to calibrate the ADC prior to taking measurements.
+
+  zephyr,noise-threshold:
+    type: int
+    default: 0
+    description: |
+     Raw ADC readings below this threshold are treated as noise and
+     reported as 0 uA. The default value of 0 disables the threshold.
diff --git a/dts/bindings/input/espressif,esp32-touch-sensor.yaml b/dts/bindings/input/espressif,esp32-touch-sensor.yaml
index 5bea6081b9781..f646563b856a8 100644
--- a/dts/bindings/input/espressif,esp32-touch-sensor.yaml
+++ b/dts/bindings/input/espressif,esp32-touch-sensor.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Zephyr input touch sensor parent node
+  ESP32 touch sensor input
 
   This defines a group of touch sensors that can generate input events. Each touch
   sensor is defined in a child node of the touch-sensor node and defines a specific key
diff --git a/dts/bindings/input/gpio-keys.yaml b/dts/bindings/input/gpio-keys.yaml
index a04806086fbca..884e2542d5025 100644
--- a/dts/bindings/input/gpio-keys.yaml
+++ b/dts/bindings/input/gpio-keys.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Zephyr Input GPIO KEYS parent node
+  Group of GPIO-bound input keys.
 
   This defines a group of buttons that can generate input events. Each button
   is defined in a child node of the gpio-keys node and defines a specific key
diff --git a/dts/bindings/input/ite,it51xxx-kbd.yaml b/dts/bindings/input/ite,it51xxx-kbd.yaml
new file mode 100644
index 0000000000000..5a334069de094
--- /dev/null
+++ b/dts/bindings/input/ite,it51xxx-kbd.yaml
@@ -0,0 +1,56 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE it51xxx keyboard matrix controller
+
+compatible: "ite,it51xxx-kbd"
+
+include: [kbd-matrix-common.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  wucctrl:
+    type: phandles
+    description: |
+      Configure wakeup controller, this controller is used to set that
+      when the interrupt is triggered in EC low power mode, it can wakeup
+      EC or not. Via this controller, we set the wakeup trigger edge,
+      enable, disable, and clear wakeup status for the specific pin which
+      may be gpio pins or alternate pins.
+
+  kso16-gpios:
+    type: phandle-array
+    required: true
+    description: |
+      The KSO16 pin for the selected port.
+
+  kso17-gpios:
+    type: phandle-array
+    required: true
+    description: |
+      The KSO17 pin for the selected port.
+
+  kso-ignore-mask:
+    type: int
+    default: 0
+    description: |
+      Bitmask of KSO signals to ignore, this can be used to instruct the driver
+      to skip KSO signals between 0 and (col-size - 1) that are used as GPIOs.
+      Default to 0 (no signals masked).
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  row-size:
+    required: true
+
+  col-size:
+    required: true
diff --git a/dts/bindings/input/realtek,rts5912-kbd.yaml b/dts/bindings/input/realtek,rts5912-kbd.yaml
new file mode 100644
index 0000000000000..8429ddfa851aa
--- /dev/null
+++ b/dts/bindings/input/realtek,rts5912-kbd.yaml
@@ -0,0 +1,31 @@
+# Copyright (c) 2025 Realtek Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+description: Realtek RTS5912 keyboard matrix controller
+
+compatible: "realtek,rts5912-kbd"
+
+include: [kbd-matrix-common.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  row-size:
+    required: true
+
+  col-size:
+    required: true
+
+  kso-ignore-mask:
+    type: int
+    default: 0
diff --git a/dts/bindings/input/st,stm32-tsc.yaml b/dts/bindings/input/st,stm32-tsc.yaml
new file mode 100644
index 0000000000000..5e2c1ccfc32de
--- /dev/null
+++ b/dts/bindings/input/st,stm32-tsc.yaml
@@ -0,0 +1,121 @@
+# Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: STM32 Tocuh Sensing Controller (TSC) driver
+
+compatible: "st,stm32-tsc"
+
+include: [base.yaml, pinctrl-device.yaml, reset-device.yaml]
+
+properties:
+  reg:
+    required: true
+  clocks:
+    required: true
+  resets:
+    required: true
+  interrupts:
+    required: true
+  pinctrl-0:
+    required: true
+  pinctrl-names:
+    required: true
+
+  st,pulse-generator-prescaler:
+    type: int
+    required: true
+    description: |
+      Prescaler for the pulse generator clock (t_pgclk=f_hclk/prescaler).
+      The prescaler is used to generate the charge transfer pulse. The final
+      prescaled value is 2^N where N is the value of this property.
+    enum: [1, 2, 4, 8, 16, 32, 64, 128]
+
+  st,charge-transfer-pulse-high:
+    type: int
+    required: true
+    description: |
+      Number of cycles for the high state of the
+      charge transfer pulse (1 to 16 cycles of t_pgclk).
+    enum: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+
+  st,charge-transfer-pulse-low:
+    type: int
+    required: true
+    description: |
+      Number of cycles for the low state of the
+      charge transfer pulse (1 to 16 cycles of t_pgclk).
+    enum: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+
+  st,spread-spectrum:
+    type: boolean
+    description: Spread spectrum enable
+
+  st,spread-spectrum-prescaler:
+    type: int
+    required: true
+    description: Spread spectrum clock prescaler (t_ssclk)
+    enum:
+      - 1
+      - 2
+
+  st,spread-spectrum-deviation:
+    type: int
+    required: true
+    description: Spread spectrum deviation (1 to 128 cycles of t_ssclk)
+
+  st,max-count-value:
+    type: int
+    required: true
+    description: |
+      Max number of charge transfer pulses before max count error is generated.
+      The value of the counter is calculated as 256 * 2^max_count_value.
+    enum: [255, 511, 1023, 2047, 4095, 8191, 16383, 32767]
+
+  st,synced-acquisition:
+    type: boolean
+    description: |
+      Synchronized acquisition enable.
+      Acquisition starts when START bit and signal on sync pin.
+      You have to provide a pinctrl for the sync pin.
+
+  st,syncpol-rising:
+    type: boolean
+    description: Rising synchronization pin polarity, instead of falling
+
+  st,iodef-float:
+    type: boolean
+    description: |
+      Set default state (not acqusition) of all channel I/Os to floating.
+      push-pull down by default.
+
+child-binding:
+  description: STM32 TSC group configuration
+  properties:
+    group:
+      type: int
+      required: true
+      description: Group number (0 to 7)
+      enum: [0, 1, 2, 3, 4, 5, 6, 7]
+
+    channel-ios:
+      type: int
+      required: true
+      description: Channel I/Os to be enabled
+      enum: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+
+    sampling-io:
+      type: int
+      required: true
+      description: Channel to be selected for sampling
+      enum:
+        - 1
+        - 2
+        - 4
+        - 8
+
+    st,use-as-shield:
+      type: boolean
+      description: |
+        Use channel as shield. This configures group but
+        does not enable it for acqusition. channel-io is used
+        as shield pin and can only have values 1, 2, 4 or 8.
diff --git a/dts/bindings/input/tsc-keys.yaml b/dts/bindings/input/tsc-keys.yaml
new file mode 100644
index 0000000000000..d3b4cb06c189b
--- /dev/null
+++ b/dts/bindings/input/tsc-keys.yaml
@@ -0,0 +1,71 @@
+# Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Input driver for STM32 Tocuh Sensing Controller (TSC).
+
+  This node is a st,stm32-tsc grandchild node and applies filters and
+  calculations to detect an input event on a group which is the child of
+  st,stm32-tsc. For more information see drivers/misc/st,stm32-tsc.yaml
+
+  Example:
+
+  #include <dt-bindings/input/input-event-codes.h>
+
+  &tsc {
+    compatible = "st,stm32-tsc";
+
+    tsc_group6: g6 {
+      ...
+      ts1 {
+        compatible = "tsc-keys";
+        sampling-interval-ms = <10>;
+        oversampling = <10>;
+        noise-threshold = <50>;
+        zephyr,code = <INPUT_KEY_0>;
+      };
+    };
+  };
+
+compatible: "tsc-keys"
+
+include:
+  - name: base.yaml
+    property-allowlist:
+      - compatible
+      - zephyr,deferred-init
+      - label
+      - status
+
+properties:
+  sampling-interval-ms:
+    type: int
+    required: true
+    description: |
+      Sampling interval in milliseconds.
+  oversampling:
+    type: int
+    required: true
+    description: |
+      Over sampling factor. The driver will take the average of the samples
+      taken in the sampling interval and compare it with the previous sample.
+      Larger values will reduce the noise but will increase the latency. The
+      default value is 10 so the slope will be calculated every
+      10 * sampling-interval-ms milliseconds.
+  noise-threshold:
+    type: int
+    required: true
+    description: |
+      This value will be used to reject the noise for both
+      directions of the slope.
+  sticky-key-timeout-ms:
+    type: int
+    required: true
+    description: |
+      Time in milliseconds to wait before releasing a key. By default a release
+      event will be generated after 10 seconds of the last press event if
+      the key is still pressed.
+  zephyr,code:
+    type: int
+    required: true
+    description: Key code to emit.
diff --git a/dts/bindings/input/zephyr,input-sdl-touch.yaml b/dts/bindings/input/zephyr,input-sdl-touch.yaml
index 8248334e4f7a8..cd0a6f50f8168 100644
--- a/dts/bindings/input/zephyr,input-sdl-touch.yaml
+++ b/dts/bindings/input/zephyr,input-sdl-touch.yaml
@@ -4,3 +4,8 @@
 description: SDL based emulated touch panel
 
 compatible: "zephyr,input-sdl-touch"
+
+properties:
+  display:
+    type: phandle
+    description: Handle to the display that the input events are raised for
diff --git a/dts/bindings/interrupt-controller/ite,it51xxx-intc.yaml b/dts/bindings/interrupt-controller/ite,it51xxx-intc.yaml
new file mode 100644
index 0000000000000..3b22729b1b4b1
--- /dev/null
+++ b/dts/bindings/interrupt-controller/ite,it51xxx-intc.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE Interrupt controller
+compatible: "ite,it51xxx-intc"
+
+include: [interrupt-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+interrupt-cells:
+  - irq
+  - flags
diff --git a/dts/bindings/interrupt-controller/ite,it51xxx-wuc-map.yaml b/dts/bindings/interrupt-controller/ite,it51xxx-wuc-map.yaml
new file mode 100644
index 0000000000000..4d32305e60981
--- /dev/null
+++ b/dts/bindings/interrupt-controller/ite,it51xxx-wuc-map.yaml
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE Wake-Up Controller (WUC) mapping child node
+
+compatible: "ite,it51xxx-wuc-map"
+
+child-binding:
+  description: Child node to present the mapping between input of WUC and its source device
+  properties:
+    wucs:
+      type: phandle-array
+      required: true
diff --git a/dts/bindings/interrupt-controller/ite,it51xxx-wuc.yaml b/dts/bindings/interrupt-controller/ite,it51xxx-wuc.yaml
new file mode 100644
index 0000000000000..fa32f96b85bd1
--- /dev/null
+++ b/dts/bindings/interrupt-controller/ite,it51xxx-wuc.yaml
@@ -0,0 +1,31 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE Wake-Up Controller (WUC)
+compatible: "ite,it51xxx-wuc"
+
+include: [base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  wakeup-controller:
+    type: boolean
+    description: |
+      conveys that this node is a wakeup controller
+
+  both-edge-trigger:
+    type: boolean
+    description: |
+      Rising-edge or falling-edge triggered is selected.
+
+  "#wuc-cells":
+    type: int
+    required: true
+    description: |
+      number of items to expect in a wakeup controller specifier
+    const: 1
+
+wuc-cells:
+  - mask
diff --git a/dts/bindings/interrupt-controller/renesas,ra-interrupt-controller-unit.yaml b/dts/bindings/interrupt-controller/renesas,ra-interrupt-controller-unit.yaml
deleted file mode 100644
index dd13f876cdce5..0000000000000
--- a/dts/bindings/interrupt-controller/renesas,ra-interrupt-controller-unit.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2023, TOKITA Hiroshi
-# SPDX-License-Identifier: Apache-2.0
-
-description: Renesas RA series interrupt controller unit
-
-compatible: "renesas,ra-interrupt-controller-unit"
-
-include: [interrupt-controller.yaml, base.yaml]
-
-properties:
-  reg:
-    required: true
-
-  "#interrupt-cells":
-    const: 3
-
-interrupt-cells:
-  - irq
-  - priority
-  - flags
diff --git a/dts/bindings/interrupt-controller/renesas,rz-ext-irq.yaml b/dts/bindings/interrupt-controller/renesas,rz-ext-irq.yaml
index 91c833cbef705..2777e3bc65e0b 100644
--- a/dts/bindings/interrupt-controller/renesas,rz-ext-irq.yaml
+++ b/dts/bindings/interrupt-controller/renesas,rz-ext-irq.yaml
@@ -1,16 +1,13 @@
 # Copyright (c) 2024 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Renesas RZG external interrupt controller
+description: Renesas RZ external interrupt controller
 
 compatible: "renesas,rz-ext-irq"
 
 include: [interrupt-controller.yaml, base.yaml, pinctrl-device.yaml]
 
 properties:
-  "#address-cells":
-    const: 0
-
   "#interrupt-cells":
     const: 2
 
diff --git a/dts/bindings/interrupt-controller/riscv,clic.yaml b/dts/bindings/interrupt-controller/riscv,clic.yaml
new file mode 100644
index 0000000000000..73d95625db056
--- /dev/null
+++ b/dts/bindings/interrupt-controller/riscv,clic.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Andes Technology Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: RISC-V core local interrupt controller
+
+compatible: "riscv,clic"
+
+include: [interrupt-controller.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  "#interrupt-cells":
+    const: 2
+
+interrupt-cells:
+  - irq
+  - priority
diff --git a/dts/bindings/interrupt-controller/st,stm32-exti.yaml b/dts/bindings/interrupt-controller/st,stm32-exti.yaml
index c25e1bf6001f0..3cb8b75868233 100644
--- a/dts/bindings/interrupt-controller/st,stm32-exti.yaml
+++ b/dts/bindings/interrupt-controller/st,stm32-exti.yaml
@@ -1,4 +1,4 @@
-description: STMicroelectronics STM32 family External Interrupt Controller
+description: STM32 External Interrupt Controller
 
 compatible: "st,stm32-exti"
 
diff --git a/dts/bindings/interrupt-controller/st,stm32g0-exti.yaml b/dts/bindings/interrupt-controller/st,stm32g0-exti.yaml
index 6f8704416ddb4..06b778a7371f4 100644
--- a/dts/bindings/interrupt-controller/st,stm32g0-exti.yaml
+++ b/dts/bindings/interrupt-controller/st,stm32g0-exti.yaml
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-        STM32 controller
+        STM32G0 External Interrupt Controller
+
         This compatible stands for all interrupt-controller blocks with two
         dedicated Rising and Falling interrupt pending registers.
 
diff --git a/dts/bindings/interrupt-controller/st,stm32h7rs-exti.yaml b/dts/bindings/interrupt-controller/st,stm32h7rs-exti.yaml
index 1e441fb47b80b..ad981acae46c7 100644
--- a/dts/bindings/interrupt-controller/st,stm32h7rs-exti.yaml
+++ b/dts/bindings/interrupt-controller/st,stm32h7rs-exti.yaml
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-        STM32 controller
+        STM32H7RS External Interrupt Controller
+
         This compatible stands for the stm32H7RS interrupt-controller block
         with two dedicated Rising and Falling interrupt pending registers
 
diff --git a/dts/bindings/ipc/zephyr,ipc-icmsg.yaml b/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
index 13a9e2b84b69c..d1730dddb0f09 100644
--- a/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
+++ b/dts/bindings/ipc/zephyr,ipc-icmsg.yaml
@@ -21,6 +21,21 @@ properties:
     required: true
     type: phandle
 
+  unbound:
+    type: string
+    enum:
+      - disable
+      - enable
+      - detect
+    default: disable
+    description: |
+      Select unbound() callback mode. The callback can be enabled or disabled with the
+      "enable" and "disable" option respectively. This functionality requires session
+      number handshake procedure on both sides, so you cannot set "enable" on one side
+      and "disable" on the other. The "detect" mode detects if the remote side
+      supports handshake procedure and adjusts its behavior accordingly. The
+      "detect" mode is possible only if "dcache-alignment" is at least 8 bytes.
+
   dcache-alignment:
     type: int
     description: |
diff --git a/dts/bindings/kscan/kscan.yaml b/dts/bindings/kscan/kscan.yaml
deleted file mode 100644
index e30042d935e6b..0000000000000
--- a/dts/bindings/kscan/kscan.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2019, Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-# Common properties for keyboard matrix devices
-
-include: base.yaml
-
-bus: kscan
diff --git a/dts/bindings/kscan/zephyr,kscan-input.yaml b/dts/bindings/kscan/zephyr,kscan-input.yaml
deleted file mode 100644
index b8880df6d002c..0000000000000
--- a/dts/bindings/kscan/zephyr,kscan-input.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2023 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-description: |
-  Input to kscan adapter.
-
-  Allows using an input device with the kscan API. Define as a child node of
-  the input device, for example
-
-  chosen {
-    zephyr,keyboard-scan = &kscan_input;
-  };
-
-  ft5336@38 {
-    ...
-    kscan_input: kscan-input {
-      compatible = "zephyr,kscan-input";
-    };
-  };
-
-compatible: "zephyr,kscan-input"
-
-include: kscan.yaml
diff --git a/dts/bindings/led/gpio-leds.yaml b/dts/bindings/led/gpio-leds.yaml
index 6a5d37b929a5a..3589b394c8c98 100644
--- a/dts/bindings/led/gpio-leds.yaml
+++ b/dts/bindings/led/gpio-leds.yaml
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  This allows you to define a group of LEDs. Each LED in the group is
-  controlled by a GPIO. Each LED is defined in a child node of the
-  gpio-leds node.
+  Group of GPIO-controlled LEDs.
+
+  Each LED is defined in a child node of the gpio-leds node.
 
   Here is an example which defines three LEDs in the node /leds:
 
diff --git a/dts/bindings/led/pwm-leds.yaml b/dts/bindings/led/pwm-leds.yaml
index e9e9d131ee62a..c5619e038831f 100644
--- a/dts/bindings/led/pwm-leds.yaml
+++ b/dts/bindings/led/pwm-leds.yaml
@@ -1,7 +1,10 @@
 # Copyright (c) 2018, Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-description: PWM LEDs parent node
+description: |
+  Group of PWM-controlled LEDs.
+
+  Each LED is defined in a child node of the pwm-leds node.
 
 compatible: "pwm-leds"
 
diff --git a/dts/bindings/led_strip/worldsemi,ws2812-rpi_pico-pio.yaml b/dts/bindings/led_strip/worldsemi,ws2812-rpi_pico-pio.yaml
index d0c8d38e63c3c..c87296acf055f 100644
--- a/dts/bindings/led_strip/worldsemi,ws2812-rpi_pico-pio.yaml
+++ b/dts/bindings/led_strip/worldsemi,ws2812-rpi_pico-pio.yaml
@@ -44,7 +44,7 @@ properties:
 
 child-binding:
   description: |
-    Worldsemi WS2812 or compatible LED strip driver based on RaspberryPi Pico's PIO
+    Worldsemi WS2812 or compatible LED strip driver based on Raspberry Pi Pico's PIO
     The LED strip node can put up to 4 instances under a single PIO node.
 
   include: ws2812-gpio.yaml
diff --git a/dts/bindings/lora/st,stm32wl-subghz-radio.yaml b/dts/bindings/lora/st,stm32wl-subghz-radio.yaml
index 4066c1bcb2cf5..1eaa264cf2882 100644
--- a/dts/bindings/lora/st,stm32wl-subghz-radio.yaml
+++ b/dts/bindings/lora/st,stm32wl-subghz-radio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Fabio Baltieri
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32WL SUBGHZ Radio
+description: STM32WL Sub-GHz Radio
 
 compatible: "st,stm32wl-subghz-radio"
 
diff --git a/dts/bindings/mbox/andestech,mbox-plic-sw.yaml b/dts/bindings/mbox/andestech,mbox-plic-sw.yaml
index 3aa45bfd3b643..0352f6a8e935c 100644
--- a/dts/bindings/mbox/andestech,mbox-plic-sw.yaml
+++ b/dts/bindings/mbox/andestech,mbox-plic-sw.yaml
@@ -4,8 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: |
-  This is a representation of AndesTech MBOX PLIC-SW node
+description: AndesTech MBOX PLIC-SW
 
 compatible: "andestech,mbox-plic-sw"
 
diff --git a/dts/bindings/mbox/arm,mhuv3.yaml b/dts/bindings/mbox/arm,mhuv3.yaml
new file mode 100644
index 0000000000000..7b6ceee1736d0
--- /dev/null
+++ b/dts/bindings/mbox/arm,mhuv3.yaml
@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: <text>Copyright 2024 Arm Limited and/or its
+# affiliates <open-source-office@arm.com></text>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+description: ARM MHUv3 (Message Handling Unit v3)
+
+compatible: "arm,mhuv3"
+
+include: [base.yaml, mailbox-controller.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  interrupt-names:
+    required: true
+
+mbox-cells:
+  - channel
diff --git a/dts/bindings/mbox/espressif,mbox-esp32.yaml b/dts/bindings/mbox/espressif,mbox-esp32.yaml
index 7b2065db554b5..31020d23c1d47 100644
--- a/dts/bindings/mbox/espressif,mbox-esp32.yaml
+++ b/dts/bindings/mbox/espressif,mbox-esp32.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Felipe Neves
 # SPDX-License-Identifier: Apache-2.0
 
-description: ESP32 soft mailbox bindings
+description: ESP32 soft mailbox
 
 compatible: "espressif,mbox-esp32"
 
diff --git a/dts/bindings/mbox/linaro,ivshmem-mbox.yaml b/dts/bindings/mbox/linaro,ivshmem-mbox.yaml
index d3b42c597db06..977fd515d857b 100644
--- a/dts/bindings/mbox/linaro,ivshmem-mbox.yaml
+++ b/dts/bindings/mbox/linaro,ivshmem-mbox.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Felipe Neves
 # SPDX-License-Identifier: Apache-2.0
 
-description: Inter VM shared memory based mailbox binding
+description: Inter VM shared memory based mailbox
 
 compatible: "linaro,ivshmem-mbox"
 
diff --git a/dts/bindings/mbox/renesas,rz-mhu-mbox.yaml b/dts/bindings/mbox/renesas,rz-mhu-mbox.yaml
new file mode 100644
index 0000000000000..da4e6cf00a348
--- /dev/null
+++ b/dts/bindings/mbox/renesas,rz-mhu-mbox.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas MHU MBOX
+
+compatible: "renesas,rz-mhu-mbox"
+
+include: [base.yaml, mailbox-controller.yaml]
+
+properties:
+  channel:
+    type: int
+    required: true
+    description: the channel number of the underlying MHU unit used for MBOX.
+
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  tx-mask:
+    type: int
+    required: true
+    description: TX supported channels mask
+
+  rx-mask:
+    type: int
+    required: true
+    description: RX supported channels mask
+
+  channels-count:
+    type: int
+    required: true
+    description: number of channels supported for a MBOX instance.
+
+  shared-memory:
+    type: phandle
+    description: |
+      Reference to the shared memory region that is going
+      to be used for the buffer communication between
+      MHU units. No data will be transmitted if not set.
+
+mbox-cells:
+  - channel
diff --git a/dts/bindings/mdio/espressif,esp32-mdio.yaml b/dts/bindings/mdio/espressif,esp32-mdio.yaml
index d869d656da501..1ffa77e55f05c 100644
--- a/dts/bindings/mdio/espressif,esp32-mdio.yaml
+++ b/dts/bindings/mdio/espressif,esp32-mdio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Grant Ramsay <grant.ramsay@hotmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: ESP32 MDIO Driver node
+description: ESP32 MDIO controller
 
 compatible: "espressif,esp32-mdio"
 
diff --git a/dts/bindings/mdio/st,stm32-mdio.yaml b/dts/bindings/mdio/st,stm32-mdio.yaml
index e536ed1c23a7b..5a302d6b65e67 100644
--- a/dts/bindings/mdio/st,stm32-mdio.yaml
+++ b/dts/bindings/mdio/st,stm32-mdio.yaml
@@ -2,7 +2,7 @@
 # Copyright (c) 2024 Analog Devices Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ST MDIO Features
+description: STM32 MDIO Controller
 
 compatible: "st,stm32-mdio"
 
diff --git a/dts/bindings/mdio/xilinx,axi-ethernet-1.00.a-mdio.yaml b/dts/bindings/mdio/xilinx,axi-ethernet-1.00.a-mdio.yaml
new file mode 100644
index 0000000000000..632cae74af0c0
--- /dev/null
+++ b/dts/bindings/mdio/xilinx,axi-ethernet-1.00.a-mdio.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 CISPA Helmholtz Center for Information Security
+# SPDX-License-Identifier: Apache-2.0
+
+# Common fields for MDIO controllers
+
+include: mdio-controller.yaml
+
+compatible: xlnx,axi-ethernet-1.00.a-mdio
+
+description: MDIO interface of Xilinx AXI 1G/2.5G Ethernet Subsystem.
+
+properties:
+  reg:
+    type: array
+    description: |
+      Control registers of the MDIO device are also used for the Ethernet MAC controller.
+      Thus, both devices should have a parent node with compatible "xlnx,axi-ethernet-subsystem-7.2"
+      which defines the reg property, and MAC and MDIO should NOT have a reg property.
diff --git a/dts/bindings/memory-controllers/espressif,esp32-psram.yaml b/dts/bindings/memory-controllers/espressif,esp32-psram.yaml
new file mode 100644
index 0000000000000..cdfede604dd3a
--- /dev/null
+++ b/dts/bindings/memory-controllers/espressif,esp32-psram.yaml
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ESP32 pseudo-static RAM controller
+
+compatible: "espressif,esp32-psram"
+
+include: base.yaml
+
+properties:
+  size:
+    type: int
+    required: true
diff --git a/dts/bindings/memory-controllers/nxp,flexram.yaml b/dts/bindings/memory-controllers/nxp,flexram.yaml
index 76248c063948d..5482b26d8eae2 100644
--- a/dts/bindings/memory-controllers/nxp,flexram.yaml
+++ b/dts/bindings/memory-controllers/nxp,flexram.yaml
@@ -1,7 +1,44 @@
 # Copyright 2023 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-description: NXP FlexRAM on-chip ram controller
+description: |
+  NXP FlexRAM on-chip ram controller
+  If the flexram,bank-spec property is specified, then the flexram will be
+  dynamically reconfigured to the configuration specified at runtime. An
+  example to configure the flexram dynamically using the
+  flexram,bank-spec property for rt1060 is as follows:
+
+  &itcm {
+          reg = < 0x0 DT_SIZE_K(64) >;
+  };
+  &dtcm {
+          reg = < 0x20000000 DT_SIZE_K(384) >;
+  };
+  &ocram {
+          reg = < 0x20280000 DT_SIZE_K(64) >;
+  };
+  &flexram {
+          flexram,bank-spec = <FLEXRAM_OCRAM>,
+                              <FLEXRAM_OCRAM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_ITCM>,
+                              <FLEXRAM_ITCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>,
+                              <FLEXRAM_DTCM>;
+  };
+
+  This will configure the flexram for 384K of DTCM, 64K of ITCM,
+  and 64K of OCRAM.
+
 
 include: base.yaml
 
diff --git a/dts/bindings/memory-controllers/realtek,rts5912-bbram.yaml b/dts/bindings/memory-controllers/realtek,rts5912-bbram.yaml
new file mode 100644
index 0000000000000..324b56b195eac
--- /dev/null
+++ b/dts/bindings/memory-controllers/realtek,rts5912-bbram.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2025, Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+description: Realtek, RTS5912 Battery Backed RAM node
+
+compatible: "realtek,rts5912-bbram"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/bindings/memory-controllers/st,stm32-xspi-psram.yaml b/dts/bindings/memory-controllers/st,stm32-xspi-psram.yaml
new file mode 100644
index 0000000000000..a4514e536bc58
--- /dev/null
+++ b/dts/bindings/memory-controllers/st,stm32-xspi-psram.yaml
@@ -0,0 +1,138 @@
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  STM32 XSPI PSRAM.
+
+compatible: "st,stm32-xspi-psram"
+
+include: [base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  fixed-latency:
+    type: boolean
+    description: |
+      Read latency type: variable if not set, fixed if set.
+
+  read-latency:
+    type: int
+    default: 2
+    description: |
+      Read latency code
+      - 0: LCx2 3 / Fmax 66 MHz
+      - 1: LCx2 4 / Fmax 109 MHz
+      - 2: LCx2 5 / Fmax 133 MHz
+      - 3: LCx2 6 / Fmax 166 MHz
+      - 4: LCx2 7 / Fmax 200 MHz
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+
+  drive-strength:
+    type: int
+    default: 0
+    description: |
+      Drive strength code:
+      - 0: Full
+      - 1: Half
+      - 2: 1/4
+      - 3: 1/8
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+
+  write-latency:
+    type: int
+    default: 2
+    description: |
+      Write latency code:
+      - 0: WLC 3 / Fmax 66 MHz
+      - 4: WLC 4 / Fmax 109 MHz
+      - 2: WLC 5 / Fmax 133 MHz
+      - 5: WLC 6 / Fmax 166 MHz
+      - 1: WLC 7 / Fmax 200 MHz
+    enum:
+      - 0
+      - 1
+      - 2
+      - 4
+      - 5
+
+  refresh-rate:
+    type: int
+    default: 0
+    description: |
+      - 0: Always 4x refresh
+      - 1: Enables 1x refesh when temperature allows
+      - 3: Enables 0.5x refresh when temperature allows
+    enum:
+      - 0
+      - 1
+      - 3
+
+  pasr:
+    type: int
+    default: 0
+    description: |
+      Refresh coverage:
+      - 0: Full array
+      - 1: Bottom 1/2 array
+      - 2: Bottom 1/4 array
+      - 3: Bottom 1/8 array
+      - 4: None
+      - 5: Top 1/2 array
+      - 6: Top 1/4 array
+      - 7: Top 1/8 array
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+
+  io-x16-mode:
+    type: boolean
+    description: |
+      Mode is x8 if not set, and x16 if set.
+
+  rbx:
+    type: boolean
+    description: |
+      If not enabled, reads stay within page (row) boundary.
+      If enabled, allows reads cross page (row) boundary.
+
+  burst-length:
+    type: int
+    default: 1
+    description: |
+      Burst length:
+      0: 16 Byte/Word Wrap
+      1: 32 Byte/Word Wrap
+      2: 64 Byte/Word Wrap
+      3: 2K Byte/1K Word Wrap
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+
+  burst-type-hybrid-wrap:
+    type: boolean
+    description: |
+      If not enabled, burst-length sets the burst address space in which the
+      device will continually wrap within.
+      If enabled, the device will burst through the initial wrapped burst length
+      once, then continue to burst incrementally up to maximum column address
+      (2K in X8 mode/1K in X16 mode) before wrapping around within the entire
+      column address space
diff --git a/dts/bindings/memory-controllers/st,stm32h7-fmc.yaml b/dts/bindings/memory-controllers/st,stm32h7-fmc.yaml
index 89fa3bf2a4700..a0d27b01bca0c 100644
--- a/dts/bindings/memory-controllers/st,stm32h7-fmc.yaml
+++ b/dts/bindings/memory-controllers/st,stm32h7-fmc.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 Flexible Memory Controller (FMC).
+  STM32H7 Flexible Memory Controller (FMC).
 
   The FMC allows to interface with static-memory mapped external devices such as
   SRAM, NOR Flash, NAND Flash, SDRAM...
diff --git a/dts/bindings/mfd/adi,maxq10xx.yaml b/dts/bindings/mfd/adi,maxq10xx.yaml
new file mode 100644
index 0000000000000..2db03be3daece
--- /dev/null
+++ b/dts/bindings/mfd/adi,maxq10xx.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Vogl Electronic GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADI MAXQ10XX
+
+compatible: "adi,maxq10xx"
+
+include: spi-device.yaml
diff --git a/dts/bindings/mfd/ambiq,iom.yaml b/dts/bindings/mfd/ambiq,iom.yaml
new file mode 100644
index 0000000000000..a0d011bc89f57
--- /dev/null
+++ b/dts/bindings/mfd/ambiq,iom.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Ambiq Micro Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: Ambiq SPI/I2C controller common properties
+
+compatible: "ambiq,iom"
+
+include: [base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/mfd/nxp,pf1550.yaml b/dts/bindings/mfd/nxp,pf1550.yaml
new file mode 100644
index 0000000000000..53f6cdf2e2399
--- /dev/null
+++ b/dts/bindings/mfd/nxp,pf1550.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP PF1550
+
+compatible: "nxp,pf1550"
+
+include: i2c-device.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/bindings/mfd/x-powers,axp2101.yaml b/dts/bindings/mfd/x-powers,axp2101.yaml
new file mode 100644
index 0000000000000..accf4791ae27d
--- /dev/null
+++ b/dts/bindings/mfd/x-powers,axp2101.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+description: X-Powers AXP2101
+
+compatible: "x-powers,axp2101"
+
+include: i2c-device.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/bindings/mipi-dsi/renesas,ra-mipi-dsi.yaml b/dts/bindings/mipi-dsi/renesas,ra-mipi-dsi.yaml
index 6f0f572aced1c..dbcbb47c8e21a 100644
--- a/dts/bindings/mipi-dsi/renesas,ra-mipi-dsi.yaml
+++ b/dts/bindings/mipi-dsi/renesas,ra-mipi-dsi.yaml
@@ -18,3 +18,81 @@ properties:
     type: string-array
     required: true
     description: name of each interrupt
+
+  pll-div:
+    type: int
+    enum: [1, 2, 3, 4]
+    description:
+      PHY PLL divisor.
+
+  pll-mul-int:
+    type: int
+    description:
+      PHY PLL integer multiplier.
+
+  pll-mul-frac:
+    type: string
+    enum: ["0.00", "0.33", "0.66", "0.50"]
+    description:
+      PHY PLL fractional multiplier.
+
+  lp-divisor:
+    type: int
+    description:
+      PHY PLL LP speed divisor.
+
+  ulps-wakeup-period:
+    type: int
+    description: ULPS wakeup period.
+
+  video-mode-delay:
+    type: int
+    description: |
+      Set the delay value inside DSI Host until the transfer begins.
+
+  timing:
+    type: array
+    description: |
+      MIPI DSI timing parameter: <CLKSTPT CLKBFHT CLKKPT GOLPBKT>
+
+child-binding:
+  description: |
+    MIPI PHY timing configuration. The child node must be named "phys-timing".
+    Refer to '57. MIPI PHY - RA8D1 MCU group HWM' for detail parameter description.
+
+  properties:
+    t-init:
+      type: int
+      required: true
+      description: |
+        Minimum duration of the TINIT state (Units: operation clock cycles).
+
+    t-clk-prep:
+      type: int
+      required: true
+      description: |
+        Duration of the clock lane LP-00 state (immediately before entry to the HS-0 state).
+
+    t-hs-prep:
+      type: int
+      required: true
+      description: |
+        Duration of the data lane LP-00 state (immediately before entry to the HS-0 state).
+
+    t-lp-exit:
+      type: int
+      required: true
+      description:
+        Low-power transition time to High-Speed mode.
+
+    dphytim4:
+      type: array
+      required: true
+      description: |
+        Clock lane pre and post data timing parameter: <TCLKZERO TCLKPRE TCLKPOST TCLKTRL>
+
+    dphytim5:
+      type: array
+      required: true
+      description: |
+        High-Speed data lane timing parameter: <THSZERO THSTRL THSEXIT>
diff --git a/dts/bindings/misc/ene,kb1200-gcfg.yaml b/dts/bindings/misc/ene,kb1200-gcfg.yaml
index a8700fe02f187..e08d2332f67e2 100644
--- a/dts/bindings/misc/ene,kb1200-gcfg.yaml
+++ b/dts/bindings/misc/ene,kb1200-gcfg.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 ENE Technology Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ENE, General Configuration node
+description: ENE, General Configuration
 
 compatible: "ene,kb1200-gcfg"
 
diff --git a/dts/bindings/misc/ene,kb1200-pmu.yaml b/dts/bindings/misc/ene,kb1200-pmu.yaml
index d6516a4e42f11..ee0a0d655a566 100644
--- a/dts/bindings/misc/ene,kb1200-pmu.yaml
+++ b/dts/bindings/misc/ene,kb1200-pmu.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 ENE Technology Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ENE, Power Manager node
+description: ENE, Power Manager
 
 compatible: "ene,kb1200-pmu"
 
diff --git a/dts/bindings/misc/intel,timeaware-gpio.yaml b/dts/bindings/misc/intel,timeaware-gpio.yaml
index 149e95bbb6a49..4a05d3d5641f8 100644
--- a/dts/bindings/misc/intel,timeaware-gpio.yaml
+++ b/dts/bindings/misc/intel,timeaware-gpio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Intel TGPIO node
+description: Intel TGPIO
 
 compatible: "intel,timeaware-gpio"
 
diff --git a/dts/bindings/misc/nordic,nrf-mpc.yaml b/dts/bindings/misc/nordic,nrf-mpc.yaml
new file mode 100644
index 0000000000000..860acf60b67e7
--- /dev/null
+++ b/dts/bindings/misc/nordic,nrf-mpc.yaml
@@ -0,0 +1,17 @@
+description: Nordic Memory Privilege Controller (MPC)
+
+compatible: "nordic,nrf-mpc"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  override-num:
+    type: int
+    description: Number of override regions supported by the MPC instance.
+
+  override-granularity:
+    type: int
+    description: Override region addresses must be aligned to this value.
diff --git a/dts/bindings/misc/nuvoton,npcx-soc-id.yaml b/dts/bindings/misc/nuvoton,npcx-soc-id.yaml
index 2f44d46990230..5efeaa43cd5fd 100644
--- a/dts/bindings/misc/nuvoton,npcx-soc-id.yaml
+++ b/dts/bindings/misc/nuvoton,npcx-soc-id.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX soc ID node
+description: Nuvoton, NPCX soc ID
 
 compatible: "nuvoton,npcx-soc-id"
 
diff --git a/dts/bindings/misc/nxp,rdc.yaml b/dts/bindings/misc/nxp,rdc.yaml
index 08431f94bfcc5..9682bcbed47f4 100644
--- a/dts/bindings/misc/nxp,rdc.yaml
+++ b/dts/bindings/misc/nxp,rdc.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP i.MX Resource Domain Controller (RDC) node.
+  NXP i.MX Resource Domain Controller (RDC).
   The RDC provides robust support for the isolation of destination
   memory mapped locations such as peripherals and memory to a single
   core, a bus master, or set of cores and bus masters.
diff --git a/dts/bindings/misc/nxp,s32-emios.yaml b/dts/bindings/misc/nxp,s32-emios.yaml
index f795746f2ead0..9747dd9000f12 100644
--- a/dts/bindings/misc/nxp,s32-emios.yaml
+++ b/dts/bindings/misc/nxp,s32-emios.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP S32 Enhanced Modular IO SubSystem (eMIOS) node for S32 SoCs.
+  Enhanced Modular IO SubSystem (eMIOS) for NXP S32 SoCs.
   eMIOS provides independent unified channels (UCs), some of channels
   have internal counter that either can be used independently or used
   as a reference timebase (master bus) for other channels.
diff --git a/dts/bindings/misc/nxp,s32-lcu.yaml b/dts/bindings/misc/nxp,s32-lcu.yaml
index 51707de20e894..b3bbdb7a6fdc3 100644
--- a/dts/bindings/misc/nxp,s32-lcu.yaml
+++ b/dts/bindings/misc/nxp,s32-lcu.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP S32 Logic control Unit node for S32 SoCs.
+  Logic control Unit for NXP S32 SoCs.
   LCU selects multiple inputs from timers, Pulse Width Modulation
   signals, and Input/Output (I/O) pads, and combines them
   using a programmable logic function to create output waveforms
diff --git a/dts/bindings/misc/nxp,s32-trgmux.yaml b/dts/bindings/misc/nxp,s32-trgmux.yaml
index 55a589d6836c4..58507c4034d31 100644
--- a/dts/bindings/misc/nxp,s32-trgmux.yaml
+++ b/dts/bindings/misc/nxp,s32-trgmux.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP S32 Trigger Multiplexing Control node for S32 SoCs.
+  Trigger Multiplexing Control for NXP S32 SoCs.
   The device supports the triggering scheme between peripherals.
   The supported trigger sources and destination can be found in
   the device Ref Manual
diff --git a/dts/bindings/misc/renesas,ra-ulpt.yaml b/dts/bindings/misc/renesas,ra-ulpt.yaml
new file mode 100644
index 0000000000000..3b38f1f6ec227
--- /dev/null
+++ b/dts/bindings/misc/renesas,ra-ulpt.yaml
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RA ULPT
+
+compatible: "renesas,ra-ulpt"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  channel:
+    type: int
+    required: true
+    description: |
+      ULPT channel number.
+
+  interrupts:
+    description: |
+      IRQ number and priority to use for ULPT.
+
+  interrupt-names:
+    enum:
+      - "ulpti"
+      - "ulptcmai"
+      - "ulptcmbi"
+    description: |
+      Interrupts must be given corresponding names so that the timer driver can recognize them.
diff --git a/dts/bindings/misc/renesas,rz-sci.yaml b/dts/bindings/misc/renesas,rz-sci.yaml
new file mode 100644
index 0000000000000..4f685a3ee6643
--- /dev/null
+++ b/dts/bindings/misc/renesas,rz-sci.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RZ SCI controller
+
+compatible: "renesas,rz-sci"
+
+include: [base.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  channel:
+    type: int
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/misc/zephyr,swdp-gpio.yaml b/dts/bindings/misc/zephyr,swdp-gpio.yaml
index c6d6aa55e7fa8..b4b3585e2fc04 100644
--- a/dts/bindings/misc/zephyr,swdp-gpio.yaml
+++ b/dts/bindings/misc/zephyr,swdp-gpio.yaml
@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  This is a representation of the Serial Wire Debug Port interface
-  implementation by GPIO bit-banging.
+  Serial Wire Debug Port interface implementation by GPIO bit-banging.
 
   Schematic using dual-supply bus transceiver and separate dout and dnoe pins
 
diff --git a/dts/bindings/mmc/st,stm32-sdmmc.yaml b/dts/bindings/mmc/st,stm32-sdmmc.yaml
index 7daf115520d4f..f8c77f992ad85 100644
--- a/dts/bindings/mmc/st,stm32-sdmmc.yaml
+++ b/dts/bindings/mmc/st,stm32-sdmmc.yaml
@@ -1,4 +1,4 @@
-description: stm32 sdmmc disk access
+description: STM32 SDMMC Disk Access
 
 compatible: "st,stm32-sdmmc"
 
diff --git a/dts/bindings/modem/sqn,gm02s.yaml b/dts/bindings/modem/sqn,gm02s.yaml
index 223b8c102a30f..584fc878e18db 100644
--- a/dts/bindings/modem/sqn,gm02s.yaml
+++ b/dts/bindings/modem/sqn,gm02s.yaml
@@ -11,3 +11,6 @@ properties:
   mdm-reset-gpios:
     type: phandle-array
     required: true
+
+  mdm-wake-gpios:
+    type: phandle-array
diff --git a/dts/bindings/mspi/ambiq,mspi-controller.yaml b/dts/bindings/mspi/ambiq,mspi-controller.yaml
index 44b5cad2a2e95..380bcf4fe426a 100644
--- a/dts/bindings/mspi/ambiq,mspi-controller.yaml
+++ b/dts/bindings/mspi/ambiq,mspi-controller.yaml
@@ -5,7 +5,7 @@ description: Ambiq MSPI controller
 
 compatible: "ambiq,mspi-controller"
 
-include: [mspi-controller.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
+include: [mspi-controller.yaml, pinctrl-device.yaml]
 
 properties:
   reg:
@@ -14,9 +14,6 @@ properties:
   interrupts:
     required: true
 
-  ambiq,pwrcfg:
-    required: true
-
   ce-gpios:
     required: true
 
diff --git a/dts/bindings/mspi/nordic,nrf-exmif.yaml b/dts/bindings/mspi/nordic,nrf-exmif.yaml
new file mode 100644
index 0000000000000..294254aa60efb
--- /dev/null
+++ b/dts/bindings/mspi/nordic,nrf-exmif.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic External Memory Interface (EXMIF)
+
+compatible: "nordic,nrf-exmif"
+
+include: snps,designware-ssi.yaml
diff --git a/dts/bindings/mspi/snps,designware-ssi.yaml b/dts/bindings/mspi/snps,designware-ssi.yaml
new file mode 100644
index 0000000000000..fb516cb783588
--- /dev/null
+++ b/dts/bindings/mspi/snps,designware-ssi.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Synopsys DesignWare Synchronous Serial Interface (SSI) node
+
+compatible: "snps,designware-ssi"
+
+include: [mspi-controller.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  aux-reg-enable:
+    type: boolean
+    description: |
+      Activates auxiliary register access that is needed on some platforms.
+
+  fifo-depth:
+    required: true
+    type: int
+    description: |
+      Number of items that can be stored in the TX FIFO. Range: 8-256.
+      If the RX FIFO depth is not specified separately in the rx-fifo-depth
+      property, this value specifies depth of both TX and RX FIFOs.
+
+  rx-fifo-depth:
+    type: int
+    description: |
+      Number of items that can be stored in the RX FIFO. Range: 8-256.
+
+  tx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the TX FIFO above which the TX transfer is started.
+      Maximum value is the TX FIFO depth - 1.
+
+  rx-fifo-threshold:
+    type: int
+    description: |
+      Number of entries in the RX FIFO above which the controller gets an RX
+      interrupt. Maximum value is the RX FIFO depth - 1.
diff --git a/dts/bindings/mtd/fixed-partitions.yaml b/dts/bindings/mtd/fixed-partitions.yaml
index 90989a5669777..365762bf8df3f 100644
--- a/dts/bindings/mtd/fixed-partitions.yaml
+++ b/dts/bindings/mtd/fixed-partitions.yaml
@@ -1,6 +1,5 @@
 description: |
-  This binding is used to describe fixed partitions of a flash (or
-  other nonvolatile storage) memory.
+  Fixed partitions of a flash (or other non-volatile storage) memory.
 
   Here is an example:
 
diff --git a/dts/bindings/mtd/jedec,mspi-nor.yaml b/dts/bindings/mtd/jedec,mspi-nor.yaml
new file mode 100644
index 0000000000000..5bad8f54b5dc6
--- /dev/null
+++ b/dts/bindings/mtd/jedec,mspi-nor.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Generic NOR flash on MSPI bus
+
+compatible: "jedec,mspi-nor"
+
+include: [mspi-device.yaml, "jedec,spi-nor-common.yaml"]
+
+properties:
+  reset-gpios:
+    type: phandle-array
+    description: |
+      RESET line. If specified, the flash chip will be reset at initialization.
+
+  t-reset-pulse:
+    type: int
+    description: |
+      Minimum duration, in nanoseconds, of an active pulse on the RESET line.
+
+  t-reset-recovery:
+    type: int
+    description: |
+      Minimum time, in nanoseconds, the flash chip needs to recover after reset.
diff --git a/dts/bindings/mtd/st,stm32-nv-flash.yaml b/dts/bindings/mtd/st,stm32-nv-flash.yaml
index 518c12ab45039..81a5a94479350 100644
--- a/dts/bindings/mtd/st,stm32-nv-flash.yaml
+++ b/dts/bindings/mtd/st,stm32-nv-flash.yaml
@@ -1,7 +1,8 @@
 description: |
-  STM32 flash memory. This binding is for the flash memory itself, not
-  the flash controller peripheral. For that, see the
-  "st,stm32-flash-controller" binding.
+  STM32 flash memory.
+
+  This binding is for the flash memory itself, not the flash controller peripheral.
+  For that, see the "st,stm32-flash-controller" binding.
 
 include: soc-nv-flash.yaml
 
diff --git a/dts/bindings/mtd/st,stm32f4-nv-flash.yaml b/dts/bindings/mtd/st,stm32f4-nv-flash.yaml
index 258e2c209a7c5..c56dbb9b065cf 100644
--- a/dts/bindings/mtd/st,stm32f4-nv-flash.yaml
+++ b/dts/bindings/mtd/st,stm32f4-nv-flash.yaml
@@ -1,5 +1,5 @@
 description: |
-  ST STM32F4 family flash memory.
+  STM32F4 flash memory.
 
 include: st,stm32-nv-flash.yaml
 
diff --git a/dts/bindings/mtd/st,stm32l0-nv-flash.yaml b/dts/bindings/mtd/st,stm32l0-nv-flash.yaml
index 682ee48a60172..1c5ea5ecebbbb 100644
--- a/dts/bindings/mtd/st,stm32l0-nv-flash.yaml
+++ b/dts/bindings/mtd/st,stm32l0-nv-flash.yaml
@@ -1,5 +1,5 @@
 description: |
-  ST STM32L0 family flash memory.
+  STM32L0 flash memory.
 
 include: st,stm32-nv-flash.yaml
 
diff --git a/dts/bindings/mtd/ti,tmp116-eeprom.yaml b/dts/bindings/mtd/ti,tmp116-eeprom.yaml
deleted file mode 100644
index 4c4188b0c7039..0000000000000
--- a/dts/bindings/mtd/ti,tmp116-eeprom.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2020 Innoseis B.V
-# SPDX-License-Identifier: Apache-2.0
-
-description: TI TMP116 EEPROM controller binding
-
-compatible: "ti,tmp116-eeprom"
-
-include: eeprom-base.yaml
-
-on-bus: tmp116
diff --git a/dts/bindings/mtd/ti,tmp11x-eeprom.yaml b/dts/bindings/mtd/ti,tmp11x-eeprom.yaml
new file mode 100644
index 0000000000000..e4d5a24dd5dbc
--- /dev/null
+++ b/dts/bindings/mtd/ti,tmp11x-eeprom.yaml
@@ -0,0 +1,10 @@
+# Copyright (c) 2020 Innoseis B.V
+# SPDX-License-Identifier: Apache-2.0
+
+description: TI TMP11X EEPROM controller
+
+compatible: "ti,tmp11x-eeprom"
+
+include: eeprom-base.yaml
+
+on-bus: tmp11x
diff --git a/dts/bindings/net/wireless/generic-fem-two-ctrl-pins.yaml b/dts/bindings/net/wireless/generic-fem-two-ctrl-pins.yaml
index a7202f1294d98..edf3a632caf13 100644
--- a/dts/bindings/net/wireless/generic-fem-two-ctrl-pins.yaml
+++ b/dts/bindings/net/wireless/generic-fem-two-ctrl-pins.yaml
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    This is a representation of generic radio Front-End Module (FEM)
-    that has a two-pin control interface (CTX, CRX).
+    Generic radio Front-End Module (FEM) with a two-pin
+    control interface (CTX, CRX).
 
     The CTX control pin is used to enable the Power Amplifier (PA) in
     the transmit path. This is therefore sometimes referred to as
diff --git a/dts/bindings/net/wireless/nordic,nrf-nfct-v2.yaml b/dts/bindings/net/wireless/nordic,nrf-nfct-v2.yaml
new file mode 100644
index 0000000000000..e6b34aff3eccd
--- /dev/null
+++ b/dts/bindings/net/wireless/nordic,nrf-nfct-v2.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic nRF family NFCT (Near Field Communication Tag)
+
+compatible: "nordic,nrf-nfct-v2"
+
+include: nordic,nrf-nfct.yaml
+
+properties:
+  nfct-pins-as-gpios:
+    type: boolean
+    description: |
+      When enabled this property will configure pins dedicated to NFCT
+      peripheral as regular GPIOs. This property must be applied in cpuapp
+      if NFCT pins are intended to be used as regular GPIOs by any core.
+
+      NFC pins in nRF54H series: P2.10 and P2.11
diff --git a/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml b/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml
index 706fe8dd9e66f..aedd22bcf79a8 100644
--- a/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml
+++ b/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml
@@ -3,7 +3,7 @@
 
 
 description: |
-    This is a representation of the nRF21540 Radio Front-End module.
+    nRF21540 Radio Front-End module.
 
     See the "nordic,nrf21540-fem-spi" binding to configure the SPI
     interface. The SPI interface should be configured as a child node
diff --git a/dts/bindings/net/wireless/ti,cc13xx-cc26xx-radio.yaml b/dts/bindings/net/wireless/ti,cc13xx-cc26xx-radio.yaml
index 3c7f8079ff3ec..f5145f8c4d139 100644
--- a/dts/bindings/net/wireless/ti,cc13xx-cc26xx-radio.yaml
+++ b/dts/bindings/net/wireless/ti,cc13xx-cc26xx-radio.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI SimpleLink CC13xx / CC26xx radio node
+description: TI SimpleLink CC13xx / CC26xx radio
 
 compatible: "ti,cc13xx-cc26xx-radio"
 
diff --git a/dts/bindings/ospi/st,stm32-ospi.yaml b/dts/bindings/ospi/st,stm32-ospi.yaml
index b1666d67d91ec..f28abdbb1e144 100644
--- a/dts/bindings/ospi/st,stm32-ospi.yaml
+++ b/dts/bindings/ospi/st,stm32-ospi.yaml
@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    STM32 OSPI device representation. Enabling a stm32 octospi node in a board
-    description would typically requires this:
+    STM32 OSPI Controller.
+
+    Enabling a stm32 octospi node in a board description would typically requires this:
 
         &octospi {
             pinctrl-0 = <&octospi_clk_pe9 &octospi_ncs_pe10 &octospi_dqs_pe11
diff --git a/dts/bindings/phy/st,stm32u5-otghs-phy.yaml b/dts/bindings/phy/st,stm32u5-otghs-phy.yaml
index f844d813a9929..38e9a36f3e710 100644
--- a/dts/bindings/phy/st,stm32u5-otghs-phy.yaml
+++ b/dts/bindings/phy/st,stm32u5-otghs-phy.yaml
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
+    STM32U5 OTG HS PHY.
+
     This binding is to be used by the STM32U5xx transceivers which are built-in
     with USB HS PHY IP and a configurable HSE clock source.
 
diff --git a/dts/bindings/pinctrl/adi,max32-pinctrl.yaml b/dts/bindings/pinctrl/adi,max32-pinctrl.yaml
index d40926ca772b9..414983eb1a918 100644
--- a/dts/bindings/pinctrl/adi,max32-pinctrl.yaml
+++ b/dts/bindings/pinctrl/adi,max32-pinctrl.yaml
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  MAX32 Pin controller Node
-  Based on pincfg-node.yaml binding.
+  MAX32 Pin Controller
 
+  Based on pincfg-node.yaml binding.
   Note: `bias-disable`  are default pin configurations.
 
 compatible: "adi,max32-pinctrl"
diff --git a/dts/bindings/pinctrl/ambiq,apollo3-pinctrl.yaml b/dts/bindings/pinctrl/ambiq,apollo3-pinctrl.yaml
index 6035955af50a0..f1d362b0472d6 100644
--- a/dts/bindings/pinctrl/ambiq,apollo3-pinctrl.yaml
+++ b/dts/bindings/pinctrl/ambiq,apollo3-pinctrl.yaml
@@ -98,7 +98,7 @@ child-binding:
           For Apollo3 these pins are 0-1,5-6,8-9,25,27,39-40,42-43,48-49.
           The default value is 1500 ohms, which is the reset value of
           register PADREGx.PADxRSEL.
-      ambiq,iom-nce-module:
+      ambiq,nce-src:
         type: int
         default: 0
         description: |
@@ -125,3 +125,10 @@ child-binding:
           information and config the pins accordingly, we give a default value
           0 here to make it be consistent with AM_HAL_GPIO_PINCFG_DEFAULT in
           ambiq hal. If the pin is not a CE, this descriptor will be ignored.
+      ambiq,nce-pol:
+        type: int
+        default: 0
+        description: |
+          Polarity select for NCE
+          LOW = 0x0 - Polarity is active low
+          HIGH = 0x1 - Polarity is active high
diff --git a/dts/bindings/pinctrl/ambiq,apollo4-pinctrl.yaml b/dts/bindings/pinctrl/ambiq,apollo4-pinctrl.yaml
index 9e5feecc808bc..2ab4ddb8eb6fa 100644
--- a/dts/bindings/pinctrl/ambiq,apollo4-pinctrl.yaml
+++ b/dts/bindings/pinctrl/ambiq,apollo4-pinctrl.yaml
@@ -104,7 +104,7 @@ child-binding:
         default: 1500
         description: |
           The pullup resistor value. The default value is 1500 ohms.
-      ambiq,iom-nce-module:
+      ambiq,nce-src:
         type: int
         default: 0
         description: |
@@ -154,24 +154,10 @@ child-binding:
             42,    DC_RESX : DC module RESX
           If the pin is not a CE, this descriptor will be ignored.
           Default value 0, which is the reset value.
-      ambiq,iom-mspi:
+      ambiq,nce-pol:
         type: int
         default: 0
         description: |
-          Indicates the module which uses specific CE pin, 1 if CE is IOM, 0 if MSPI.
-          Default value 0, which is the reset value.
-          If the pin is not a CE, this descriptor will be ignored.
-      ambiq,iom-num:
-        type: int
-        default: 0
-        description: |
-          Indicates the instance which uses specific CE pin.
-          IOM number (0-7) or MSPI (0-2).
-          Default value 0, which is the reset value.
-          If the pin is not a CE, this descriptor will be ignored.
-      ambiq,interrupt-direction:
-        type: int
-        default: 0
-        description: |
-          Indicates the pininterrupt direction.
-          Default value 0, which is the reset value.
+          Polarity select for NCE
+          LOW = 0x0 - Polarity is active low
+          HIGH = 0x1 - Polarity is active high
diff --git a/dts/bindings/pinctrl/arm,mps2-pinctrl.yaml b/dts/bindings/pinctrl/arm,mps2-pinctrl.yaml
new file mode 100644
index 0000000000000..314da3b7e5ba1
--- /dev/null
+++ b/dts/bindings/pinctrl/arm,mps2-pinctrl.yaml
@@ -0,0 +1,81 @@
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    The Arm Mps2 pin controller is a node responsible for controlling
+    pin function selection and pin properties, such as routing a UART3 TX
+    to pin 1.
+
+    The node has the 'pinctrl' node label set in your SoC's devicetree,
+    so you can modify it like this:
+
+      &pinctrl {
+              /* your modifications go here */
+      };
+
+    All device pin configurations should be placed in child nodes of the
+    'pinctrl' node, as shown in this example:
+
+      &pinctrl {
+        /* configuration for the usart0 "default" state */
+        uart3_default: uart3_default {
+          /* group 1 */
+          group1 {
+            /* configure P1 as UART3 TX */
+            pinmux = <UART3_TXD_EXP>;
+          };
+          /* group 2 */
+          group2 {
+            /* configure P0 as UART3 RX */
+            pinmux = <UART3_RXD_EXP>;
+            /* enable input on pin 1 */
+            input-enable;
+          };
+        };
+      };
+
+    The 'uart3_default' child node encodes the pin configurations for a
+    particular state of a device; in this case, the default (that is, active)
+    state.
+
+    As shown, pin configurations are organized in groups within each child node.
+    Each group can specify a list of pin function selections in the 'pinmux'
+    property. Here is a list of supported standard pin properties:
+    - input-enable
+
+    A group can also specify shared pin properties common to all the specified
+    pins, such as the 'input-enable' property in group 2.
+
+    To link pin configurations with a device, use a pinctrl-N property for some
+    number N, like this example you could place in your board's DTS file:
+
+       #include "board-pinctrl.dtsi"
+
+       &uart3 {
+             pinctrl-0 = <&uart3_default>;
+             pinctrl-1 = <&uart3_sleep>;
+             pinctrl-names = "default", "sleep";
+       };
+
+compatible: "arm,mps2-pinctrl"
+
+include: base.yaml
+
+child-binding:
+  description: |
+    Definitions for a pinctrl state.
+  child-binding:
+
+    include:
+      - name: pincfg-node.yaml
+        property-allowlist:
+          - input-enable
+
+    properties:
+      pinmux:
+        required: true
+        type: array
+        description: |
+          An array of pins sharing the same group properties. Each
+          element of the array is an integer constructed from the
+          pin number and the alternative function of the pin.
diff --git a/dts/bindings/pinctrl/arm,mps3-pinctrl.yaml b/dts/bindings/pinctrl/arm,mps3-pinctrl.yaml
new file mode 100644
index 0000000000000..68dcde4b17fb4
--- /dev/null
+++ b/dts/bindings/pinctrl/arm,mps3-pinctrl.yaml
@@ -0,0 +1,82 @@
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    The Arm Mps3 pin controller is a node responsible for controlling
+    pin function selection and pin properties, such as routing a UART3 TX
+    to pin 1.
+
+    The node has the 'pinctrl' node label set in your SoC's devicetree,
+    so you can modify it like this:
+
+      &pinctrl {
+              /* your modifications go here */
+      };
+
+    All device pin configurations should be placed in child nodes of the
+    'pinctrl' node, as shown in this example:
+
+      &pinctrl {
+        /* configuration for the usart0 "default" state */
+        uart3_default: uart3_default {
+          /* group 1 */
+          group1 {
+            /* configure P1 as UART3 TX */
+            pinmux = <UART3_TXD_EXP>;
+          };
+          /* group 2 */
+          group2 {
+            /* configure P0 as UART3 RX */
+            pinmux = <UART3_TXD_EXP>;
+            /* enable input on pin 1 */
+            input-enable;
+          };
+        };
+      };
+
+    The 'uart3_default' child node encodes the pin configurations for a
+    particular state of a device; in this case, the default (that is, active)
+    state.
+
+    As shown, pin configurations are organized in groups within each child node.
+    Each group can specify a list of pin function selections in the 'pinmux'
+    property. Here is a list of supported standard pin properties:
+    - input-enable
+
+    A group can also specify shared pin properties common to all the specified
+    pins, such as the 'input-enable' property in group 2.
+
+    To link pin configurations with a device, use a pinctrl-N property for some
+    number N, like this example you could place in your board's DTS file:
+
+       #include "board-pinctrl.dtsi"
+
+       &uart3 {
+             pinctrl-0 = <&uart3_default>;
+             pinctrl-1 = <&uart3_sleep>;
+             pinctrl-names = "default", "sleep";
+       };
+
+
+compatible: "arm,mps3-pinctrl"
+
+include: base.yaml
+
+child-binding:
+  description: |
+    Definitions for a pinctrl state.
+  child-binding:
+
+    include:
+      - name: pincfg-node.yaml
+        property-allowlist:
+          - input-enable
+
+    properties:
+      pinmux:
+        required: true
+        type: array
+        description: |
+          An array of pins sharing the same group properties. Each
+          element of the array is an integer constructed from the
+          pin number and the alternative function of the pin.
diff --git a/dts/bindings/pinctrl/arm,v2m_beetle-pinctrl.yaml b/dts/bindings/pinctrl/arm,v2m_beetle-pinctrl.yaml
new file mode 100644
index 0000000000000..0581c6f969365
--- /dev/null
+++ b/dts/bindings/pinctrl/arm,v2m_beetle-pinctrl.yaml
@@ -0,0 +1,40 @@
+# Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    The node has the 'pinctrl' node label set in your SoC's devicetree,
+    so you can modify it like this:
+
+      &pinctrl {
+              /* your modifications go here */
+      };
+
+    All device pin configurations should be placed in child nodes of the
+    'pinctrl' node, as shown in this example:
+
+      /* You can put this in places like a board-pinctrl.dtsi file in
+       * your board directory, or a devicetree overlay in your application.
+       */
+
+compatible: "arm,v2m_beetle-pinctrl"
+
+include: base.yaml
+
+child-binding:
+  description: |
+    Definitions for a pinctrl state.
+  child-binding:
+
+    include:
+      - name: pincfg-node.yaml
+        property-allowlist:
+          - input-enable
+
+    properties:
+      pinmux:
+        required: true
+        type: array
+        description: |
+          An array of pins sharing the same group properties. Each
+          element of the array is an integer constructed from the
+          pin number and the alternative function of the pin.
diff --git a/dts/bindings/pinctrl/atmel,sam-pinctrl.yaml b/dts/bindings/pinctrl/atmel,sam-pinctrl.yaml
index 63ac10827550e..a2bef2f529e81 100644
--- a/dts/bindings/pinctrl/atmel,sam-pinctrl.yaml
+++ b/dts/bindings/pinctrl/atmel,sam-pinctrl.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Atmel SAM Pinctrl container node
+  Atmel SAM Pinctrl Container
 
   The Atmel SAM pin controller is a singleton node responsible for controlling
   pin function selection and pin properties. For example, you can use this node
diff --git a/dts/bindings/pinctrl/atmel,sam0-pinctrl.yaml b/dts/bindings/pinctrl/atmel,sam0-pinctrl.yaml
index 7557c5e52e91c..2616182b61e40 100644
--- a/dts/bindings/pinctrl/atmel,sam0-pinctrl.yaml
+++ b/dts/bindings/pinctrl/atmel,sam0-pinctrl.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Atmel SAM0 Pinctrl container node
+  Atmel SAM0 Pinctrl Container
 
   The Atmel SAM0 pin controller is a singleton node responsible for controlling
   pin function selection and pin properties. For example, you can use this node
diff --git a/dts/bindings/pinctrl/espressif,esp32-pinctrl.yaml b/dts/bindings/pinctrl/espressif,esp32-pinctrl.yaml
index c55372094aee5..5fe2c5e8f42bf 100644
--- a/dts/bindings/pinctrl/espressif,esp32-pinctrl.yaml
+++ b/dts/bindings/pinctrl/espressif,esp32-pinctrl.yaml
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
+    ESP32 pin controller
+
     Espressif's pin controller is in charge of controlling pin configurations, pin
     functionalities and pin properties as defined by pin states. In its turn, pin
     states are composed by groups of pre-defined pin muxing definitions and user
diff --git a/dts/bindings/pinctrl/infineon,cat1-pinctrl.yaml b/dts/bindings/pinctrl/infineon,cat1-pinctrl.yaml
index 2335a08b09852..d2345bdd677a1 100644
--- a/dts/bindings/pinctrl/infineon,cat1-pinctrl.yaml
+++ b/dts/bindings/pinctrl/infineon,cat1-pinctrl.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Infineon CAT1 Pinctrl container node
+  Infineon CAT1 Pinctrl Container
 
   This is a singleton node responsible for controlling the pin function selection
   and pin properties. For example, you can use this node to route
diff --git a/dts/bindings/pinctrl/ite,it8xxx2-pinctrl-func.yaml b/dts/bindings/pinctrl/ite,it8xxx2-pinctrl-func.yaml
index 4fe47c5ba03b5..ccc59972f28fd 100644
--- a/dts/bindings/pinctrl/ite,it8xxx2-pinctrl-func.yaml
+++ b/dts/bindings/pinctrl/ite,it8xxx2-pinctrl-func.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 ITE Corporation. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ITE IT8XXX2 pin controller function node
+description: ITE IT8XXX2 Pin Controller
 
 compatible: "ite,it8xxx2-pinctrl-func"
 
diff --git a/dts/bindings/pinctrl/microchip,mec5-pinctrl.yaml b/dts/bindings/pinctrl/microchip,mec5-pinctrl.yaml
index b469aa41a037b..c27defda8a7f9 100644
--- a/dts/bindings/pinctrl/microchip,mec5-pinctrl.yaml
+++ b/dts/bindings/pinctrl/microchip,mec5-pinctrl.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    Microchip XEC Pin controller Node
+    Microchip XEC Pin controller
+
     Based on pincfg-node.yaml binding.
     The MCHP XEC pin controller is a singleton node responsible for controlling
     pin function selection and pin properties. For example, you can use this
diff --git a/dts/bindings/pinctrl/microchip,xec-pinctrl.yaml b/dts/bindings/pinctrl/microchip,xec-pinctrl.yaml
index 40bdc1a3e3357..186db1c39f099 100644
--- a/dts/bindings/pinctrl/microchip,xec-pinctrl.yaml
+++ b/dts/bindings/pinctrl/microchip,xec-pinctrl.yaml
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    Microchip XEC Pin controller Node
+    Microchip XEC Pin Controller
+
     Based on pincfg-node.yaml binding.
     The MCHP XEC pin controller is a singleton node responsible for controlling
     pin function selection and pin properties. For example, you can use this
diff --git a/dts/bindings/pinctrl/nuvoton,npcx-scfg.yaml b/dts/bindings/pinctrl/nuvoton,npcx-scfg.yaml
index b8c881fbffa9b..02912e0935d35 100644
--- a/dts/bindings/pinctrl/nuvoton,npcx-scfg.yaml
+++ b/dts/bindings/pinctrl/nuvoton,npcx-scfg.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX System Configuration (Pinmux, 1.8V support and so on) node
+description: Nuvoton NPCX System Configuration (Pinmux, 1.8V support and so on)
 
 compatible: "nuvoton,npcx-scfg"
 
diff --git a/dts/bindings/pinctrl/nxp,imx-gpr.yaml b/dts/bindings/pinctrl/nxp,imx-gpr.yaml
index dbc8cd946147d..7e4b1328d4c23 100644
--- a/dts/bindings/pinctrl/nxp,imx-gpr.yaml
+++ b/dts/bindings/pinctrl/nxp,imx-gpr.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  i.MX IOMUXC node
+  i.MX IOMUXC
 
   The specifier space "pinmux" of this binding should have two cells describing
   the resources needed from the GPR registers.
diff --git a/dts/bindings/pinctrl/nxp,mci-io-mux.yaml b/dts/bindings/pinctrl/nxp,mci-io-mux.yaml
index d717c0374e1ac..94b9e747df3c6 100644
--- a/dts/bindings/pinctrl/nxp,mci-io-mux.yaml
+++ b/dts/bindings/pinctrl/nxp,mci-io-mux.yaml
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  MCI IO MUX pin control node. This node defines pin configurations in pin
+  MCI IO MUX Pin Controller
+
+  This node defines pin configurations in pin
   groups, and has the 'pinctrl' node identifier in the SOC's devicetree. Each
   group within the pin configuration defines a peripheral's pin configuration.
   Each numbered subgroup represents pins with shared configuration for that
diff --git a/dts/bindings/pinctrl/nxp,port-pinctrl.yaml b/dts/bindings/pinctrl/nxp,port-pinctrl.yaml
index ec0968022503c..02bd6f9f573e5 100644
--- a/dts/bindings/pinctrl/nxp,port-pinctrl.yaml
+++ b/dts/bindings/pinctrl/nxp,port-pinctrl.yaml
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP PORT pinctrl node. This node will define pin configurations in pin
+  NXP PORT Pin Controller
+
+  This node will define pin configurations in pin
   groups, and has the 'pinctrl' node identifier in the SOC's devicetree. Each
   group within the pin configuration defines the pin configuration for a
   peripheral, and each numbered subgroup in the pin group defines all the pins
diff --git a/dts/bindings/pinctrl/nxp,port-pinmux.yaml b/dts/bindings/pinctrl/nxp,port-pinmux.yaml
index 7bdb56b2b5ec6..c0dbda759f40e 100644
--- a/dts/bindings/pinctrl/nxp,port-pinmux.yaml
+++ b/dts/bindings/pinctrl/nxp,port-pinmux.yaml
@@ -1,4 +1,4 @@
-description: NXP PORT pinmux node
+description: NXP PORT Pin Controller
 
 compatible: "nxp,port-pinmux"
 
diff --git a/dts/bindings/pinctrl/nxp,rt-iocon-pinctrl.yaml b/dts/bindings/pinctrl/nxp,rt-iocon-pinctrl.yaml
index e98eeaea42070..916f6b4ee48d6 100644
--- a/dts/bindings/pinctrl/nxp,rt-iocon-pinctrl.yaml
+++ b/dts/bindings/pinctrl/nxp,rt-iocon-pinctrl.yaml
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  RT600/RT500 pin control node. This node defines pin configurations in pin
+  RT600/RT500 Pin Controller
+
+  This node defines pin configurations in pin
   groups, and has the 'pinctrl' node identifier in the SOC's devicetree. Each
   group within the pin configuration defines a peripheral's pin configuration.
   Each numbered subgroup represents pins with shared configuration for that
diff --git a/dts/bindings/pinctrl/nxp,s32k3-pinctrl.yaml b/dts/bindings/pinctrl/nxp,s32k3-pinctrl.yaml
index d4e8ddd99f22f..b4cfd4e5784a1 100644
--- a/dts/bindings/pinctrl/nxp,s32k3-pinctrl.yaml
+++ b/dts/bindings/pinctrl/nxp,s32k3-pinctrl.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP S32 pinctrl node for S32K3 SoCs.
+  NXP S32 Pin Controller for S32K3 SoCs
 
   The NXP S32 pin controller is a singleton node responsible for controlling
   the pin function selection and pin properties. This node, labeled 'pinctrl' in
diff --git a/dts/bindings/pinctrl/nxp,s32ze-pinctrl.yaml b/dts/bindings/pinctrl/nxp,s32ze-pinctrl.yaml
index 0826fce73acd8..aa5567a08268e 100644
--- a/dts/bindings/pinctrl/nxp,s32ze-pinctrl.yaml
+++ b/dts/bindings/pinctrl/nxp,s32ze-pinctrl.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  NXP S32 pinctrl node for S32Z/E SoCs.
+  NXP S32 Pin Controller for S32Z/E SoCs
 
   The NXP S32 pin controller is a singleton node responsible for controlling
   the pin function selection and pin properties. This node, labeled 'pinctrl' in
diff --git a/dts/bindings/pinctrl/openisa,rv32m1-pinctrl.yaml b/dts/bindings/pinctrl/openisa,rv32m1-pinctrl.yaml
index d53d1233ebcd0..77df30fc9b086 100644
--- a/dts/bindings/pinctrl/openisa,rv32m1-pinctrl.yaml
+++ b/dts/bindings/pinctrl/openisa,rv32m1-pinctrl.yaml
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  OpenISA RV32M1 pinctrl node. This node will define pin configurations in pin groups,
+  OpenISA RV32M1 Pin Controller
+
+  This node will define pin configurations in pin groups,
   and has the 'pinctrl' node identifier in the SOC's devicetree. Each group
   within the pin configuration defines the pin configuration for a peripheral,
   and each numbered subgroup in the pin group defines all the pins for that
diff --git a/dts/bindings/pinctrl/openisa,rv32m1-pinmux.yaml b/dts/bindings/pinctrl/openisa,rv32m1-pinmux.yaml
index 436531c8db099..1cb37db5a9899 100644
--- a/dts/bindings/pinctrl/openisa,rv32m1-pinmux.yaml
+++ b/dts/bindings/pinctrl/openisa,rv32m1-pinmux.yaml
@@ -1,4 +1,4 @@
-description: RV32M1 pinmux node
+description: RV32M1 pinmux
 
 compatible: "openisa,rv32m1-pinmux"
 
diff --git a/dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml b/dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml
index c5b00ae822a93..17180cf00c55a 100644
--- a/dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml
+++ b/dts/bindings/pinctrl/realtek,rts5912-pinctrl.yaml
@@ -3,8 +3,7 @@
 # Copyright (c) 2024 Realtek Semiconductor Corporation, SIBG-SD7
 #
 
-description: |
-     This binding gives a base representation of the pins configuration
+description: Realtek RTS5912 Pin Controller
 
 compatible: "realtek,rts5912-pinctrl"
 
diff --git a/dts/bindings/pinctrl/renesas,rcar-pfc.yaml b/dts/bindings/pinctrl/renesas,rcar-pfc.yaml
index 1743f213193e1..80c990251e59f 100644
--- a/dts/bindings/pinctrl/renesas,rcar-pfc.yaml
+++ b/dts/bindings/pinctrl/renesas,rcar-pfc.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    Renesas R-Car Pin Function Controller node
+    Renesas R-Car Pin Function Controller
+
     This binding gives a base representation of the R-Car pins configuration.
     The R-Car pin controller is a singleton node responsible for controlling
     pin function selection and pin properties. For example, you can use this
diff --git a/dts/bindings/pinctrl/renesas,rza-pinctrl.yaml b/dts/bindings/pinctrl/renesas,rza-pinctrl.yaml
new file mode 100644
index 0000000000000..7b2da83da1f0b
--- /dev/null
+++ b/dts/bindings/pinctrl/renesas,rza-pinctrl.yaml
@@ -0,0 +1,105 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Below generic example shows of supported pinctrl definitions:
+
+    #include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rza-common.h>
+    example_pins: device_pin {
+        device-pinmux {
+          pinmux = <RZA_PINMUX(PORT_08, 1, 5)>,
+                   <RZA_PINMUX(PORT_08, 2, 5)>;
+          bias_pull_up;
+          renesas,filter = RZA_FILTER_SET(RZA_FILNUM_8_STAGE,RZA_FILCLKSEL_DIV_18000);
+          drive-strength = <1>;
+          slew-rate = "fast";
+        };
+
+        device-spins {
+          pins = <BSP_IO_XSPI_IO0>, <BSP_IO_XSPI_IO4>;
+          input-enable;
+          renesas,filter = RZA_FILTER_SET(RZA_FILNUM_8_STAGE,RZA_FILCLKSEL_DIV_18000);
+          drive-strength = <2>;
+          slew-rate = "fast";
+        };
+      };
+
+
+compatible: renesas,rza-pinctrl
+
+include: base.yaml
+properties:
+  reg:
+    required: true
+
+  reg-names:
+    required: true
+
+child-binding:
+  description: |
+    This RZA pins mux/cfg nodes description.
+
+  child-binding:
+    description: |
+      The RZA pinmux/pincfg configuration nodes description.
+
+    include:
+    - name: pincfg-node.yaml
+      property-allowlist:
+      - bias-disable
+      - bias-high-impedance
+      - bias-pull-down
+      - bias-pull-up
+      - bias-pull-pin-default
+      - drive-strength
+      - input-enable
+      - input-disable
+      - output-enable
+      - power-source
+      - low-power-enable
+      - low-power-disable
+
+    properties:
+      pinmux:
+        type: array
+        description: |
+          Pinmux configuration node.
+          Values are constructed from GPIO port number, pin number, and
+          alternate function configuration number using the RZA_PINMUX()
+          helper macro in pinctrl_rza.h
+
+      pins:
+        type: array
+        description: |
+          Special Purpose pins configuration node.
+          Values are define in pinctrl_rza.h.
+          Ex: BSP_IO_XSPI_IO0,BSP_IO_I3C_SCL,...
+
+      drive-strength:
+        type: int
+        default: 0
+        description: |
+          Maximum sink or source current in mA for pin which shall be selected
+          depending on device and pin group.
+
+      renesas,filter:
+        type: int
+        default: 0
+        description: |
+          Digital Noise Filter configuration for a pin which shall be defined
+          using RZA_FILTER_SET() helper macro in pinctrl_rza.h to specify
+          FILNUM and FILCLKSEL. With 24Mhz external clock:
+          - min debounce time will be 166.666ns for FILNUM=0 and FILCLKSEL=0
+          - max debounce time will be 24ms for FILNUM=3 and FILCLKSEL=3.
+          This property intentionally redefined to avoid unnecessary conversation from usec to
+          FILNUM and FILCLKSEL values depending on external clock value as this configuration
+          is static.
+
+      slew-rate:
+        type: string
+        default: "fast"
+        enum:
+        - "slow"
+        - "fast"
+        description: |
+          Select slew rate for pin.
diff --git a/dts/bindings/pinctrl/renesas,rzg-pinctrl.yaml b/dts/bindings/pinctrl/renesas,rzg-pinctrl.yaml
index 2b17a67857cfa..10aca130db46a 100644
--- a/dts/bindings/pinctrl/renesas,rzg-pinctrl.yaml
+++ b/dts/bindings/pinctrl/renesas,rzg-pinctrl.yaml
@@ -1,11 +1,18 @@
 # Copyright (c) 2024 Epam Systems
-# Copyright (c) 2024 Renesas Electronics Corporation
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Below generic example shows of supported pinctrl definitions:
+    Renesas RZ/G pin controller
 
-    #include <zephyr/dt-bindings/pinctrl/renesas/pinctrl_rzg3s.h>
+    The Renesas RZ/G pin controller is a node responsible for controlling
+    pin function selection and pin properties.
+
+    The pre-defined combinations for the RZ/G variants are defined in the below headers
+    - pinctrl-rzg-common.h for RZ/G3S
+    - pinctrl-rzg2-common.h for RZ/G2L, RZ/G2LC
+
+    #include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg(2)-common.h>
     example_pins: device_pin {
         device-pinmux {
           pinmux = <RZG_PINMUX(PORT_08, 1, 5)>,
@@ -65,13 +72,13 @@ child-binding:
           Pinmux configuration node.
           Values are constructed from GPIO port number, pin number, and
           alternate function configuration number using the RZG_PINMUX()
-          helper macro in pinctrl_rzg.h
+          helper macro in pinctrl-rzg(2)-common.h.
 
       pins:
         type: array
         description: |
           Special Purpose pins configuration node.
-          Values are define in pinctrl_rzg.h.
+          Values are define in pinctrl-rzg(2)-common.h.
           Ex: BSP_IO_XSPI_IO0,BSP_IO_I3C_SCL,...
 
       drive-strength:
diff --git a/dts/bindings/pinctrl/renesas,rzn-pinctrl.yaml b/dts/bindings/pinctrl/renesas,rzn-pinctrl.yaml
new file mode 100644
index 0000000000000..feafa4a650a5e
--- /dev/null
+++ b/dts/bindings/pinctrl/renesas,rzn-pinctrl.yaml
@@ -0,0 +1,95 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+
+description: |
+    The Renesas RZ/N2L pin controller is a node responsible for controlling
+    pin function selection and pin properties, such as routing the TX and RX of UART0
+    to pin 5 and pin 6 of port 16.
+
+    The node has the 'pinctrl' node label set in your SoC's devicetree,
+    so you can modify it like this:
+
+      &pinctrl {
+              /* your modifications go here */
+      };
+
+    All device pin configurations should be placed in child nodes of the
+    'pinctrl' node, as shown in this example:
+
+      /* You can put this in places like a board-pinctrl.dtsi file in
+       * your board directory, or a devicetree overlay in your application.
+       */
+
+      /* include pre-defined combinations for the SoC variant used by the board */
+      #include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzn-common.h>
+
+      &pinctrl {
+        uart0_pins: uart0 {
+          group1 {
+            pinmux = <RZN_PINMUX(PORT_16, 5, 1)>; /* TXD */
+          };
+          group2 {
+            pinmux = <RZN_PINMUX(PORT_16, 6, 2)>; /* RXD */
+            input-enable;
+          };
+        };
+      };
+
+    The 'uart0_pins' child node encodes the pin configurations for a
+    particular state of a device; in this case, the default (that is, active)
+    state.
+
+    As shown, pin configurations are organized in groups within each child node.
+    Each group can specify a list of pin function selections in the 'pinmux'
+    property.
+
+    A group can also specify shared pin properties common to all the specified
+    pins, such as the 'input-enable' property in group 2.
+
+compatible: "renesas,rzn-pinctrl"
+
+include: base.yaml
+
+child-binding:
+  description: |
+    Definitions for a pinctrl state.
+  child-binding:
+
+    include:
+      - name: pincfg-node.yaml
+        property-allowlist:
+          - input-enable
+          - output-enable
+          - output-high
+          - bias-pull-up
+          - bias-pull-down
+          - input-schmitt-enable
+
+    properties:
+      pinmux:
+        required: true
+        type: array
+        description: |
+          An array of pins sharing the same group properties. Each
+          element of the array is an integer constructed from the
+          pin number and the alternative function of the pin.
+      drive-strength:
+        type: string
+        enum:
+          - "low"
+          - "middle"
+          - "high"
+          - "ultrahigh"
+        default: "low"
+        description: |
+          The drive strength of a pin, relative to full-driver strength.
+          The default value is "low", which is the reset value.
+      slew-rate:
+        type: string
+        enum:
+          - "slow"
+          - "fast"
+        default: "slow"
+        description: |
+          Select slew rate for a pin. The default is slow, which is the reset value.
diff --git a/dts/bindings/pinctrl/renesas,rzt-pinctrl.yaml b/dts/bindings/pinctrl/renesas,rzt-pinctrl.yaml
new file mode 100644
index 0000000000000..e8df2996b7fd0
--- /dev/null
+++ b/dts/bindings/pinctrl/renesas,rzt-pinctrl.yaml
@@ -0,0 +1,96 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Renesas RZ/T pin controller
+
+    The Renesas RZ/T pin controller is a node responsible for controlling
+    pin function selection and pin properties, such as routing the TX and RX of UART0
+    to pin 5 and pin 6 of port 16.
+
+    The node has the 'pinctrl' node label set in your SoC's devicetree,
+    so you can modify it like this:
+
+      &pinctrl {
+              /* your modifications go here */
+      };
+
+    All device pin configurations should be placed in child nodes of the
+    'pinctrl' node, as shown in this example:
+
+      /* You can put this in places like a board-pinctrl.dtsi file in
+       * your board directory, or a devicetree overlay in your application.
+       */
+
+      /* include pre-defined combinations for the SoC variant used by the board */
+      #include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzt-common.h>
+
+      &pinctrl {
+        uart0_default: uart0_default {
+          group1 {
+            pinmux = <RZT_PINMUX(PORT_16, 5, 1)>;
+          };
+          group2 {
+            pinmux = <RZT_PINMUX(PORT_16, 6, 2)>;
+            input-enable;
+          };
+        };
+      };
+
+    The 'uart0_default' child node encodes the pin configurations for a
+    particular state of a device; in this case, the default (that is, active)
+    state.
+
+    As shown, pin configurations are organized in groups within each child node.
+    Each group can specify a list of pin function selections in the 'pinmux'
+    property.
+
+    A group can also specify shared pin properties common to all the specified
+    pins, such as the 'input-enable' property in group 2.
+
+compatible: "renesas,rzt-pinctrl"
+
+include: base.yaml
+
+child-binding:
+  description: |
+    Definitions for a pinctrl state.
+  child-binding:
+
+    include:
+      - name: pincfg-node.yaml
+        property-allowlist:
+          - input-enable
+          - output-enable
+          - output-high
+          - bias-pull-up
+          - bias-pull-down
+          - input-schmitt-enable
+
+    properties:
+      pinmux:
+        required: true
+        type: array
+        description: |
+          An array of pins sharing the same group properties. Each
+          element of the array is an integer constructed from the
+          pin number and the alternative function of the pin.
+      drive-strength:
+        type: string
+        enum:
+          - "low"
+          - "middle"
+          - "high"
+          - "ultrahigh"
+        default: "low"
+        description: |
+          The drive strength of a pin, relative to full-driver strength.
+          The default value is "low", which is the reset value.
+      slew-rate:
+        type: string
+        enum:
+          - "slow"
+          - "fast"
+        default: "slow"
+        description: |
+          Select slew rate for a pin. The default is slow, which is the reset value.
diff --git a/dts/bindings/pinctrl/renesas,rzv-pinctrl.yaml b/dts/bindings/pinctrl/renesas,rzv-pinctrl.yaml
new file mode 100644
index 0000000000000..acf28285029b4
--- /dev/null
+++ b/dts/bindings/pinctrl/renesas,rzv-pinctrl.yaml
@@ -0,0 +1,101 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Renesas RZ/V pin controller
+
+    The Renesas RZ/V pin controller is a node responsible for controlling
+    pin function selection and pin properties, such as routing the TX and RX of UART2
+    to pin 0 and pin 1 of port 48.
+
+    #include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzv-common.h>
+    example_pins: device_pin {
+        device-pinmux {
+          pinmux = <RZV_PINMUX(PORT_04, 0, 2)>,
+                   <RZV_PINMUX(PORT_04, 1, 2);
+          bias_pull_up;
+          renesas,filter = RZV_FILTER_SET(RZV_FILNUM_8_STAGE,RZV_FILCLKSEL_DIV_18000);
+          drive-strength = <1>;
+          slew-rate = <fast>;
+        };
+
+        device-spins {
+          pins = <BSP_IO_QSPI0_IO0>, <BSP_IO_QSPI0_IO3>;
+          input-enable;
+          renesas,filter = RZV_FILTER_SET(RZV_FILNUM_8_STAGE,RZV_FILCLKSEL_DIV_18000);
+          drive-strength = <2>;
+          slew-rate = "fast";
+        };
+      };
+
+
+compatible: renesas,rzv-pinctrl
+
+include: base.yaml
+properties:
+  reg:
+    required: true
+
+  reg-names:
+    required: true
+
+child-binding:
+  description: |
+    This RZV pins mux/cfg nodes description.
+
+  child-binding:
+    description: |
+      The RZV pinmux/pincfg configuration nodes description.
+
+    include:
+    - name: pincfg-node.yaml
+      property-allowlist:
+      - bias-pull-down
+      - bias-pull-up
+      - drive-strength
+      - input-enable
+
+    properties:
+      pinmux:
+        type: array
+        description: |
+          Pinmux configuration node.
+          Values are constructed from GPIO port number, pin number, and
+          alternate function configuration number using the RZV_PINMUX()
+          helper macro in pinctrl-rzv-common.h
+
+      pins:
+        type: array
+        description: |
+          Special Purpose pins configuration node.
+          Values are define in pinctrl-rzv-common.h.
+          Ex: BSP_IO_QSPI0_IO0,BSP_IO_RIIC1_SCL,...
+
+      drive-strength:
+        type: int
+        default: 0
+        description: |
+          Maximum sink or source current in mA for pin which shell be selected
+          depending on device and pin group.
+
+      renesas,filter:
+        type: int
+        default: 0
+        description: |
+          Digital Noise Filter configuration for a pin which shell be defined
+          using RZV_FILTER_SET() helper macro in pinctrl-rzv-common.h to specify
+          FILNUM and FILCLKSEL. With 24Mhz external clock:
+          - min debounce time will be 166.666ns for FILNUM=0 and FILCLKSEL=0
+          - max debounce time will be 24ms for FILNUM=3 and FILCLKSEL=3.
+          This property intentionally redefined to avoid unnecessary conversation from usec to
+          FILNUM and FILCLKSEL values depending on external clock value as this configuration
+          is static.
+
+      slew-rate:
+        type: string
+        default: "fast"
+        enum:
+        - "slow"
+        - "fast"
+        description: |
+          Select slew rate for pin.
diff --git a/dts/bindings/pinctrl/silabs,si32-pinctrl.yaml b/dts/bindings/pinctrl/silabs,si32-pinctrl.yaml
index 183146d699027..5e20516348909 100644
--- a/dts/bindings/pinctrl/silabs,si32-pinctrl.yaml
+++ b/dts/bindings/pinctrl/silabs,si32-pinctrl.yaml
@@ -2,8 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-description: |
-  Silabs Si32 pinctrl node
+description: Silabs Si32 Pin Controller
 
 compatible: "silabs,si32-pinctrl"
 
diff --git a/dts/bindings/pinctrl/st,stm32-pinctrl.yaml b/dts/bindings/pinctrl/st,stm32-pinctrl.yaml
index 26278a7370e04..0be9533919eff 100644
--- a/dts/bindings/pinctrl/st,stm32-pinctrl.yaml
+++ b/dts/bindings/pinctrl/st,stm32-pinctrl.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    STM32 Pin controller Node
+    STM32 Pin controller.
+
     Based on pincfg-node.yaml binding.
 
     Note: `bias-disable` and `drive-push-pull` are default pin configurations.
diff --git a/dts/bindings/pinctrl/st,stm32f1-pinctrl.yaml b/dts/bindings/pinctrl/st,stm32f1-pinctrl.yaml
index 9d6cda27307c4..6de98d270587d 100644
--- a/dts/bindings/pinctrl/st,stm32f1-pinctrl.yaml
+++ b/dts/bindings/pinctrl/st,stm32f1-pinctrl.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    STM32F1 Pin controller Node
+    STM32F1 Pin controller.
+
     Based on pincfg-node.yaml binding.
 
     Note: `bias-disable` and `drive-push-pull` are default pin configurations.
diff --git a/dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinctrl.yaml b/dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinctrl.yaml
index 307cb7c0090ba..063c65e568cdc 100644
--- a/dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinctrl.yaml
+++ b/dts/bindings/pinctrl/ti,cc13xx-cc26xx-pinctrl.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    TI SimpleLink CC13xx / CC26xx pinctrl node.
+    TI SimpleLink CC13xx / CC26xx Pin Controller
 
     Device pin configuration should be placed in the child nodes of this node.
     Populate the 'pinmux' field with a pair consisting of a pin number and its IO
diff --git a/dts/bindings/pinctrl/ti,cc23x0-pinctrl.yaml b/dts/bindings/pinctrl/ti,cc23x0-pinctrl.yaml
index 9f3b17221b7ca..ce23e6b90359a 100644
--- a/dts/bindings/pinctrl/ti,cc23x0-pinctrl.yaml
+++ b/dts/bindings/pinctrl/ti,cc23x0-pinctrl.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    TI SimpleLink CC23X0 pinctrl node.
+    TI SimpleLink CC23X0 Pin Controller
 
     Device pin configuration should be placed in the child nodes of this node.
     Populate the 'pinmux' field with a pair consisting of a pin number and its IO
diff --git a/dts/bindings/pinctrl/ti,k3-pinctrl.yaml b/dts/bindings/pinctrl/ti,k3-pinctrl.yaml
index 600baa3292fd2..65abd04f59751 100644
--- a/dts/bindings/pinctrl/ti,k3-pinctrl.yaml
+++ b/dts/bindings/pinctrl/ti,k3-pinctrl.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  TI K3 pinctrl node.
+  TI K3 Pin Controller
 
   Pins can be configured using the following macro "K3_PINMUX(offset, value, mux_mode)".
   offset - the pin attribute register offset from the base address.
diff --git a/dts/bindings/pinctrl/wch,20x_30x-afio.yaml b/dts/bindings/pinctrl/wch,20x_30x-afio.yaml
new file mode 100644
index 0000000000000..7e7ccf6670c7b
--- /dev/null
+++ b/dts/bindings/pinctrl/wch,20x_30x-afio.yaml
@@ -0,0 +1,52 @@
+# Copyright (c) 2024 Michael Hope
+# SPDX-License-Identifier: Apache-2.0
+
+description: WCH CH32V20x/30x AFIO
+
+compatible: "wch,20x_30x-afio"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+  "#address-cells":
+    required: true
+    const: 1
+  "#size-cells":
+    required: true
+    const: 1
+
+child-binding:
+  description: |
+    Each child node defines the configuration for a particular state.
+  child-binding:
+    description: |
+      The grandchild nodes group pins that share the same pin configuration.
+
+    include:
+      - name: pincfg-node.yaml
+        property-allowlist:
+          - bias-high-impedance
+          - bias-pull-up
+          - bias-pull-down
+          - drive-open-drain
+          - drive-push-pull
+          - output-high
+          - output-low
+
+    properties:
+      slew-rate:
+        type: string
+        default: "max-speed-2mhz"
+        enum:
+          - "max-speed-10mhz"
+          - "max-speed-2mhz"
+          - "max-speed-50mhz"
+
+      pinmux:
+        required: true
+        type: array
+        description: |
+          An array of pins sharing the same group properties. The pins should
+          be defined using pre-defined macros.
diff --git a/dts/bindings/pinctrl/xlnx,pinctrl-zynqmp.yaml b/dts/bindings/pinctrl/xlnx,pinctrl-zynqmp.yaml
index 7a5af3a2b7dca..c3b16f0a0ad6c 100644
--- a/dts/bindings/pinctrl/xlnx,pinctrl-zynqmp.yaml
+++ b/dts/bindings/pinctrl/xlnx,pinctrl-zynqmp.yaml
@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  Xilinx ZynqMP SoC pinctrl node. It allows configuration of pin assignments
-  for the supported peripherals.
+  Xilinx ZynqMP SoC Pin Controller
+
+  It allows configuration of pin assignments for the supported peripherals.
 
   See Zynq UltraScale+ Devices Register Reference (UG1087) for details regarding
   valid pin assignments
diff --git a/dts/bindings/power-domain/power-domain-soc-state-change.yaml b/dts/bindings/power-domain/power-domain-soc-state-change.yaml
new file mode 100644
index 0000000000000..6f5955241d1bc
--- /dev/null
+++ b/dts/bindings/power-domain/power-domain-soc-state-change.yaml
@@ -0,0 +1,23 @@
+# Copyright 2024-25 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  This power domain will Turn On and Off devices when transitioning
+  in and out a specified Power State. Power States that trigger this
+  action is specified via the onoff-power-states property.
+
+compatible: "power-domain-soc-state-change"
+
+include: power-domain.yaml
+
+properties:
+  onoff-power-states:
+    type: phandles
+    description: |
+      List of power management states.
+      The registered devices will be turned off before the PM subsystem
+      enters these PM states. The devices will be turned on after the
+      PM subsystem exits these PM states.
+
+  "#power-domain-cells":
+    const: 0
diff --git a/dts/bindings/power/st,stm32-pwr.yaml b/dts/bindings/power/st,stm32-pwr.yaml
index 84b67104dac7d..0eaccb39c1bc8 100644
--- a/dts/bindings/power/st,stm32-pwr.yaml
+++ b/dts/bindings/power/st,stm32-pwr.yaml
@@ -62,6 +62,6 @@ child-binding:
       description: |
         Specifies the GPIOs, if any, that are associated with the wake-up pin.
 
-        For example, for GPIO B2 associated with wakeup source 1 on wake-up
-        pin 1 on STM32U5 SoCs:
-        wkup-gpios = <&gpiob 2 STM32_PWR_WKUP_PIN_SRC_1>, <...>;
+        For example, for GPIO PB2 associated with wakeup source 1 on wake-up
+        event 1 on STM32U5 SoCs:
+        wkup-gpios = <&gpiob 2 STM32_PWR_WKUP_EVT_SRC_1>, <...>;
diff --git a/dts/bindings/pwm/arduino-header-pwm.yaml b/dts/bindings/pwm/arduino-header-pwm.yaml
new file mode 100644
index 0000000000000..28f145e2bb9d3
--- /dev/null
+++ b/dts/bindings/pwm/arduino-header-pwm.yaml
@@ -0,0 +1,14 @@
+# Copyright (C) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  PWM channels exposed on Arduino headers.
+
+  Arduino's PWM pin names shares the same definition as Digital pins one.
+  That is, the mapping of PWM output on pin D3 on Arduino UNO R3 header is
+
+    pwm-map = <9 0 0 &pwm0 1 0 0>;
+
+compatible: "arduino-header-pwm"
+
+include: [base.yaml, pwm-nexus.yaml]
diff --git a/dts/bindings/pwm/espressif,esp32-ledc.yaml b/dts/bindings/pwm/espressif,esp32-ledc.yaml
index e46a7c7876093..c41efc3cfb745 100644
--- a/dts/bindings/pwm/espressif,esp32-ledc.yaml
+++ b/dts/bindings/pwm/espressif,esp32-ledc.yaml
@@ -3,7 +3,7 @@
 
 description: |
 
-  Espressif's LEDC controller Node
+  ESP32 LED Control (LEDC)
 
   The LEDC controller is primarily designed to control the intensity of LEDs, although it can be
   used to generate PWM signals for other purposes as well.
diff --git a/dts/bindings/pwm/espressif,esp32-mcpwm.yaml b/dts/bindings/pwm/espressif,esp32-mcpwm.yaml
index d39e4ff95eadf..fe2697deeed85 100644
--- a/dts/bindings/pwm/espressif,esp32-mcpwm.yaml
+++ b/dts/bindings/pwm/espressif,esp32-mcpwm.yaml
@@ -3,7 +3,7 @@
 
 description: |
 
-  Espressif's Motor Control Pulse Width Modulator (MCPWM) controller Node
+  ESP32 Motor Control Pulse Width Modulator (MCPWM)
 
   The MCPWM peripheral is intended for motor and power control.
   It provides six PWM outputs that can be set up to operate in several topologies
diff --git a/dts/bindings/pwm/pwm-nexus.yaml b/dts/bindings/pwm/pwm-nexus.yaml
new file mode 100644
index 0000000000000..17901d23ced3c
--- /dev/null
+++ b/dts/bindings/pwm/pwm-nexus.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+# Common fields for PWM nexus nodes
+
+properties:
+  pwm-map:
+    type: compound
+    required: true
+
+  pwm-map-mask:
+    type: array
+
+  pwm-map-pass-thru:
+    type: array
+
+  "#pwm-cells":
+    type: int
+    required: true
+    description: Number of items to expect in a PWM specifier
diff --git a/dts/bindings/pwm/silabs,siwx91x-pwm.yaml b/dts/bindings/pwm/silabs,siwx91x-pwm.yaml
new file mode 100644
index 0000000000000..b8a01f2027b8a
--- /dev/null
+++ b/dts/bindings/pwm/silabs,siwx91x-pwm.yaml
@@ -0,0 +1,39 @@
+description: |
+  Silabs siwx91x PWM Controller
+
+  The siwx91x PWM controller is designed to generate PWM signals. The mapping
+  between PWM channels and GPIO pins is configured through pinctrl settings.
+
+compatible: "silabs,siwx91x-pwm"
+
+include: [base.yaml, pinctrl-device.yaml, pwm-controller.yaml]
+
+properties:
+  "#pwm-cells":
+    const: 2
+
+  silabs,ch_prescaler:
+    type: array
+    required: true
+    description: |
+      Contains the prescaler values for all the 4 channels
+    enum:
+      - 1
+      - 2
+      - 4
+      - 8
+      - 16
+      - 32
+      - 64
+
+  silabs,pwm_polarity:
+    type: int
+    required: true
+    description: |
+        Common PWM polarity for all the channels
+        0 - Normal polarity
+        1 - Inverted polarity
+
+pwm-cells:
+  - channel
+  - period
diff --git a/dts/bindings/qspi/st,stm32-qspi.yaml b/dts/bindings/qspi/st,stm32-qspi.yaml
index f656bd90586ef..5cbdd93d9c28f 100644
--- a/dts/bindings/qspi/st,stm32-qspi.yaml
+++ b/dts/bindings/qspi/st,stm32-qspi.yaml
@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    STM32 QSPI device representation. A stm32 quadspi node would typically
-    looks to this:
+    STM32 QSPI Controller.
+
+    An stm32 quadspi node would typically look like this:
 
         &quadspi {
             pinctrl-0 = <&quadspi_clk_pe10 &quadspi_ncs_pe11
diff --git a/dts/bindings/regulator/nordic,npm1300-regulator.yaml b/dts/bindings/regulator/nordic,npm1300-regulator.yaml
index 2f514b686fc50..4db6aa9718dc6 100644
--- a/dts/bindings/regulator/nordic,npm1300-regulator.yaml
+++ b/dts/bindings/regulator/nordic,npm1300-regulator.yaml
@@ -97,11 +97,12 @@ child-binding:
       description: |
         Soft start current limit in microamps.
 
-    nordic,ldo-disable-workaround:
+    nordic,anomaly38-disable-workaround:
       type: boolean
       description: |
-        Disable the SW workaround for LDO bug.
+        Disable the SW workaround for nPM1300 anomaly #38.
         When nPM1300 is in ULP mode, LDO is supplied from VSYS and
         then LDO is enabled, it can take long time until the LDO
         output has reached its target voltage. To avoid this, an i2c
         read is performed shortly after an LDO is enabled.
+        See nPM1300 Errata manual for more details.
diff --git a/dts/bindings/regulator/nxp,pf1550-regulator.yaml b/dts/bindings/regulator/nxp,pf1550-regulator.yaml
new file mode 100644
index 0000000000000..8964b1857ef89
--- /dev/null
+++ b/dts/bindings/regulator/nxp,pf1550-regulator.yaml
@@ -0,0 +1,54 @@
+# Copyright (c), 2024 Arduino SA
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  NXP PF1550 PMIC
+
+  The PMIC has two buck converters and three LDOs. All need to be defined as
+  children nodes, strictly following the BUCK1..3, LDO1..3 node names. For
+  example:
+
+  pmic@8 {
+    reg = <0x8>;
+    ...
+    regulators {
+      compatible = nxp,pf1550-regulator";
+
+      BUCK1 {
+        /* all properties for BUCK1 */
+      };
+      BUCK2 {
+        /* all properties for BUCK2 */
+      };
+      BUCK3 {
+        /* all properties for BUCK3 */
+      };
+      LDO1 {
+        /* all properties for LDO1 */
+      };
+      LDO2 {
+        /* all properties for LDO2 */
+      };
+      LDO3 {
+        /* all properties for LDO3 */
+      };
+    };
+  };
+
+compatible: "nxp,pf1550-regulator"
+
+include: base.yaml
+
+child-binding:
+  include:
+    - name: regulator.yaml
+      property-allowlist:
+        - regulator-init-microvolt
+        - regulator-min-microvolt
+        - regulator-max-microvolt
+        - regulator-init-microamp
+        - regulator-max-microamp
+        - regulator-always-on
+        - regulator-boot-on
+        - regulator-initial-mode
+        - regulator-allowed-modes
diff --git a/dts/bindings/regulator/raspberrypi,core-supply-regulator.yaml b/dts/bindings/regulator/raspberrypi,core-supply-regulator.yaml
index 2dc1c7d0e891e..c0f95e77351f4 100644
--- a/dts/bindings/regulator/raspberrypi,core-supply-regulator.yaml
+++ b/dts/bindings/regulator/raspberrypi,core-supply-regulator.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  RaspberryPi Pico core supply regurator
+  Raspberry Pi Pico core supply regurator
 
 compatible: "raspberrypi,core-supply-regulator"
 
diff --git a/dts/bindings/regulator/x-powers,axp2101-regulator.yaml b/dts/bindings/regulator/x-powers,axp2101-regulator.yaml
new file mode 100644
index 0000000000000..24225cd932643
--- /dev/null
+++ b/dts/bindings/regulator/x-powers,axp2101-regulator.yaml
@@ -0,0 +1,91 @@
+# Copyright (c), 2021 NXP
+# Copyright (c), 2024 Lothar Felten <lothar.felten@gmail.com>
+# SPDX -License-Identifier: Apache-2.0
+
+description: |
+  AXP2101 PMIC
+
+  The PMIC has five DCDC converters and nine LDOs.
+  All need to be defined as children nodes.
+  For example:
+
+  i2c {
+    axp2101@34 {
+      compatible = "x-powers,axp2101";
+      reg = <0x34>;
+      ...
+      regulators {
+        compatible = "x-powers,axp2101-regulator";
+
+        DCDC1 {
+          /* all properties for DCDC1 */
+        };
+        DCDC2 {
+          /* all properties for DCDC2 */
+        };
+        DCDC3 {
+          /* all properties for DCDC3 */
+        };
+        DCDC4 {
+          /* all properties for DCDC4 */
+        };
+        DCDC5 {
+          /* all properties for DCDC5 */
+        };
+        LDOA1 {
+          /* all properties for LDOA1 */
+        };
+        LDOA2 {
+          /* all properties for LDOA2 */
+        };
+        LDOA3 {
+          /* all properties for LDOA3 */
+        };
+        LDOA4 {
+          /* all properties for LDOA4 */
+        };
+        LDOB1 {
+          /* all properties for LDOB1 */
+        };
+        LDOB2 {
+          /* all properties for LDOB2 */
+        };
+        LDOC {
+          /* all properties for LDOC */
+        };
+        LDOD1 {
+          /* all properties for LDOD1 */
+        };
+        LDOD2 {
+          /* all properties for LDOD2 */
+        };
+      };
+    };
+  };
+
+compatible: "x-powers,axp2101-regulator"
+
+include: base.yaml
+
+child-binding:
+  include:
+    - name: regulator.yaml
+      property-allowlist:
+        - regulator-init-microvolt
+        - regulator-min-microvolt
+        - regulator-max-microvolt
+        - regulator-always-on
+        - regulator-boot-on
+        - regulator-boot-off
+        - regulator-initial-mode
+        - regulator-allowed-modes
+
+  properties:
+    regulator-initial-mode:
+      type: int
+      default: 0
+      enum: [0, 1]
+      description: |
+        Initial operating mode. AXP2101 supports 2 different power modes:
+        AXP2101_DCDC_MODE_AUTO: Auto (0, default)
+        AXP2101_DCDC_MODE_PWM:  PWM
diff --git a/dts/bindings/reset/reset-mmio.yaml b/dts/bindings/reset/reset-mmio.yaml
new file mode 100644
index 0000000000000..ab3688394829e
--- /dev/null
+++ b/dts/bindings/reset/reset-mmio.yaml
@@ -0,0 +1,23 @@
+# Copyright (c) 2025 Google, LLC
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Generic MMIO Reset driver for devices with a single memory mapped reset bit
+  required to take them out of reset.
+
+compatible: "reset-mmio"
+
+include: [base.yaml]
+
+properties:
+  reg:
+    required: true
+  num-resets:
+    type: int
+    required: true
+    description: |
+      Number of resets controlled by the register.
+      Can be in the range [1, 31].
+  active-low:
+    description: Reset is active in low state.
+    type: boolean
diff --git a/dts/bindings/reset/st,stm32-rcc-rctl.yaml b/dts/bindings/reset/st,stm32-rcc-rctl.yaml
index 3629db3813a94..69b0746add10c 100644
--- a/dts/bindings/reset/st,stm32-rcc-rctl.yaml
+++ b/dts/bindings/reset/st,stm32-rcc-rctl.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 Reset and Clock Control (RCC) node.
+  STM32 Reset and Clock Control (RCC) Controller.
+
   This node is in charge of reset control for AHB (Advanced High Performance)
   and APB (Advanced Peripheral) bus domains.
 
diff --git a/dts/bindings/riscv/nordic,nrf-vpr-coprocessor.yaml b/dts/bindings/riscv/nordic,nrf-vpr-coprocessor.yaml
index 43deaeb6d3b0e..8760e82888055 100644
--- a/dts/bindings/riscv/nordic,nrf-vpr-coprocessor.yaml
+++ b/dts/bindings/riscv/nordic,nrf-vpr-coprocessor.yaml
@@ -9,14 +9,17 @@ description: |
   VPR is a RISC-V CPU implementation. VPR instances are exposed to other CPUs as
   peripherals.
 
-include: base.yaml
+include: [base.yaml, pinctrl-device.yaml]
 
 properties:
   execution-memory:
     type: phandle
-    required: true
     description: |
-      Memory area from which the VPR core will execute.
+      Memory area from which the VPR code will execute.
+      If not specified, the VPR coprocessor will not be launched automatically
+      by the nordic_vpr_launcher driver when the node is enabled. In such case,
+      the launching is supposed to be done explicitly by the user code, in some
+      custom way presumably.
 
   source-memory:
     type: phandle
diff --git a/dts/bindings/riscv/openisa,rv32m1-pcc.yaml b/dts/bindings/riscv/openisa,rv32m1-pcc.yaml
index 15e9f6fcea0da..39f61d551786b 100644
--- a/dts/bindings/riscv/openisa,rv32m1-pcc.yaml
+++ b/dts/bindings/riscv/openisa,rv32m1-pcc.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Foundries.io
 # SPDX-License-Identifier: Apache-2.0
 
-description: RV32M1 PCC (Peripheral Clock Control) IP node
+description: RV32M1 PCC (Peripheral Clock Control)
 
 compatible: "openisa,rv32m1-pcc"
 
diff --git a/dts/bindings/rng/adi,maxq10xx-trng.yaml b/dts/bindings/rng/adi,maxq10xx-trng.yaml
new file mode 100644
index 0000000000000..5d18d467d7535
--- /dev/null
+++ b/dts/bindings/rng/adi,maxq10xx-trng.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Vogl Electronic GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADI MAXQ10XX RNG
+
+compatible: "adi,maxq10xx-trng"
+
+include: base.yaml
diff --git a/dts/bindings/rng/espressif,esp32-trng.yaml b/dts/bindings/rng/espressif,esp32-trng.yaml
index 78c3fd1e1ec78..45f13d42e8299 100644
--- a/dts/bindings/rng/espressif,esp32-trng.yaml
+++ b/dts/bindings/rng/espressif,esp32-trng.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    Espressif ESP32 TRNG (True Random Number Generator).
+    ESP32 TRNG (True Random Number Generator).
 
     The TRNG uses the noise in the Wi-Fi/BT RF system. When Wi-Fi and BT are
     disabled, the random number generator will give out pseudo-random numbers.
diff --git a/dts/bindings/rng/neorv32,trng.yaml b/dts/bindings/rng/neorv32,trng.yaml
new file mode 100644
index 0000000000000..3d4a1aba3b88f
--- /dev/null
+++ b/dts/bindings/rng/neorv32,trng.yaml
@@ -0,0 +1,15 @@
+description: NEORV32 True Random Number Generator (TRNG)
+
+compatible: "neorv32,trng"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  syscon:
+    type: phandle
+    required: true
+    description: |
+      phandle to syscon (NEORV32 SYSINFO) node.
diff --git a/dts/bindings/rng/neorv32-trng.yaml b/dts/bindings/rng/neorv32-trng.yaml
deleted file mode 100644
index 2514944481bd9..0000000000000
--- a/dts/bindings/rng/neorv32-trng.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-description: NEORV32 True Random Number Generator (TRNG)
-
-compatible: "neorv32-trng"
-
-include: base.yaml
-
-properties:
-  reg:
-    required: true
-
-  syscon:
-    type: phandle
-    required: true
-    description: |
-      phandle to syscon (NEORV32 SYSINFO) node.
diff --git a/dts/bindings/rng/nxp,ele-trng.yaml b/dts/bindings/rng/nxp,ele-trng.yaml
new file mode 100644
index 0000000000000..c501461da760f
--- /dev/null
+++ b/dts/bindings/rng/nxp,ele-trng.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, NXP
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP ELE (EdgeLock secure enclave) TRNG (True Random Number Generator)
+
+compatible: "nxp,ele-trng"
+
+include: base.yaml
diff --git a/dts/bindings/rng/sensry,sy1xx-trng.yaml b/dts/bindings/rng/sensry,sy1xx-trng.yaml
index e25e0781de602..d484b9a27e3ef 100644
--- a/dts/bindings/rng/sensry,sy1xx-trng.yaml
+++ b/dts/bindings/rng/sensry,sy1xx-trng.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2025 sensry.io
 # SPDX-License-Identifier: Apache-2.0
 
-description: Sensry SY1XX TRNG node
+description: Sensry SY1XX TRNG
 
 compatible: "sensry,sy1xx-trng"
 
diff --git a/dts/bindings/rng/zephyr,native-posix-rng.yaml b/dts/bindings/rng/zephyr,native-posix-rng.yaml
index 4b1d82613aaed..9043a3e8901af 100644
--- a/dts/bindings/rng/zephyr,native-posix-rng.yaml
+++ b/dts/bindings/rng/zephyr,native-posix-rng.yaml
@@ -6,3 +6,5 @@ description: Native POSIX RNG/Entropy
 compatible: "zephyr,native-posix-rng"
 
 include: base.yaml
+
+# This binding is deprecated in favor of zephyr,native-sim-rng
diff --git a/dts/bindings/rng/zephyr,native-sim-rng.yaml b/dts/bindings/rng/zephyr,native-sim-rng.yaml
new file mode 100644
index 0000000000000..a5e40a75584c7
--- /dev/null
+++ b/dts/bindings/rng/zephyr,native-sim-rng.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Native simulator RNG/Entropy
+
+compatible: "zephyr,native-sim-rng"
+
+include: base.yaml
diff --git a/dts/bindings/rtc/maxim,ds1337.yaml b/dts/bindings/rtc/maxim,ds1337.yaml
new file mode 100644
index 0000000000000..ac874fed276b7
--- /dev/null
+++ b/dts/bindings/rtc/maxim,ds1337.yaml
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 Marcin Lyda <elektromarcin@gmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: Maxim DS1337 RTC
+
+compatible: "maxim,ds1337"
+
+include:
+  - name: rtc-device.yaml
+  - name: i2c-device.yaml
+
+properties:
+  int-gpios:
+    type: phandle-array
+    description: |
+      INTA interrupt output
+      GPIO pin to handle chip's INTA interrupt output,
+      used to notify about alarm events.
+
+  sqw-frequency:
+    type: int
+    description: |
+      SQW/INTB frequency value [Hz]
+      This field enables to select output frequency at
+      SQW/INTB pin.
+    enum:
+      - 1
+      - 4096
+      - 8192
+      - 32768
diff --git a/dts/bindings/rtc/nxp,pcf2123.yaml b/dts/bindings/rtc/nxp,pcf2123.yaml
new file mode 100644
index 0000000000000..4adad0126beeb
--- /dev/null
+++ b/dts/bindings/rtc/nxp,pcf2123.yaml
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 Lukas Gunnarsson <lukasgunnarsson@protonmail.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: NXP PCF2123 RTC
+
+compatible: "nxp,pcf2123"
+
+include:
+  - name: rtc-device.yaml
+  - name: spi-device.yaml
+
+properties:
+  clkout-frequency:
+    type: int
+    default: 32768
+    enum:
+      - 32768
+      - 16384
+      - 8192
+      - 4096
+      - 2048
+      - 1024
+      - 1
+    description: |
+      Frequency of the CLKOUT signal in Hertz (Hz). Default is 32768 Hz.
+
+  int1-gpios:
+    type: phandle-array
+    description: |
+      GPIO connected to the PCF2123 INT output, interrupts are unused if none is provided.
diff --git a/dts/bindings/rtc/raspberrypi,pico-rtc.yaml b/dts/bindings/rtc/raspberrypi,pico-rtc.yaml
index cba7a708af8b3..a91398bc63518 100644
--- a/dts/bindings/rtc/raspberrypi,pico-rtc.yaml
+++ b/dts/bindings/rtc/raspberrypi,pico-rtc.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Andrew Featherstone <andrew.featherstone@gmail.com>
 # SPDX-License-Identifier: Apache-2.0
 
-description: RaspberryPi Pico RTC
+description: Raspberry Pi Pico RTC
 
 compatible: "raspberrypi,pico-rtc"
 
diff --git a/dts/bindings/rtc/realtek,rts5912-rtc.yaml b/dts/bindings/rtc/realtek,rts5912-rtc.yaml
new file mode 100644
index 0000000000000..39c49f824cb0a
--- /dev/null
+++ b/dts/bindings/rtc/realtek,rts5912-rtc.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+description: RTC on Realtek RTS5912 EC
+
+compatible: "realtek,rts5912-rtc"
+
+include: rtc-device.yaml
+
+properties:
+  reg:
+    required: true
diff --git a/dts/bindings/rtc/renesas,smartbond-rtc.yaml b/dts/bindings/rtc/renesas,smartbond-rtc.yaml
index afe21aef79b9a..c852a9abcb0ba 100644
--- a/dts/bindings/rtc/renesas,smartbond-rtc.yaml
+++ b/dts/bindings/rtc/renesas,smartbond-rtc.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Renesas SmartBond(tm) RTC node
+description: Renesas SmartBond(tm) RTC
 
 compatible: "renesas,smartbond-rtc"
 
diff --git a/dts/bindings/rtc/rtc-device.yaml b/dts/bindings/rtc/rtc-device.yaml
index cb231a8795b5b..d4d81959f6109 100644
--- a/dts/bindings/rtc/rtc-device.yaml
+++ b/dts/bindings/rtc/rtc-device.yaml
@@ -3,7 +3,7 @@
 
 include: base.yaml
 
-description: RTC (real-time clock) device common bindings
+description: RTC (real-time clock) device
 
 properties:
   alarms-count:
diff --git a/dts/bindings/rtc/xlnx,xps-timer-1.00.a.yaml b/dts/bindings/rtc/xlnx,xps-timer-1.00.a.yaml
index b0b5fb3cc07e2..0d429f45ad43e 100644
--- a/dts/bindings/rtc/xlnx,xps-timer-1.00.a.yaml
+++ b/dts/bindings/rtc/xlnx,xps-timer-1.00.a.yaml
@@ -1,4 +1,4 @@
-description: Xilinx AXI Timer IP node
+description: Xilinx AXI Timer IP
 
 compatible: "xlnx,xps-timer-1.00.a"
 
diff --git a/dts/bindings/rtc/zephyr,fake-rtc.yaml b/dts/bindings/rtc/zephyr,fake-rtc.yaml
index 733de7bb07a01..62f6cb993f123 100644
--- a/dts/bindings/rtc/zephyr,fake-rtc.yaml
+++ b/dts/bindings/rtc/zephyr,fake-rtc.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    This binding provides a fake RTC controller for use as either a stub or a mock in Zephyr
+    A Fake RTC controller for use as either a stub or a mock in Zephyr
     testing.
 
 compatible: "zephyr,fake-rtc"
diff --git a/dts/bindings/sd/zephyr,mmc-disk.yaml b/dts/bindings/sd/zephyr,mmc-disk.yaml
index 4246a994e2eee..164af1159a46c 100644
--- a/dts/bindings/sd/zephyr,mmc-disk.yaml
+++ b/dts/bindings/sd/zephyr,mmc-disk.yaml
@@ -1,5 +1,7 @@
 description: |
-  Zephyr MMC disk node. A binding with this compatible present within an SD
+  Zephyr MMC disk.
+
+  A binding with this compatible present within an SD
   host controller device node indicates that an MMC chip is attached to that
   SD bus. This binding will enable that to be used with the disk driver
   API and any subsystems that utilize it.
diff --git a/dts/bindings/sd/zephyr,sdmmc-disk.yaml b/dts/bindings/sd/zephyr,sdmmc-disk.yaml
index 866e99da7c94c..bd55fa8a966e8 100644
--- a/dts/bindings/sd/zephyr,sdmmc-disk.yaml
+++ b/dts/bindings/sd/zephyr,sdmmc-disk.yaml
@@ -1,5 +1,7 @@
 description: |
-  Zephyr SDMMC disk node. A binding with this compatible present within an SD
+  Zephyr SDMMC disk.
+
+  A binding with this compatible present within an SD
   host controller device node indicates that an SDMMC disk is attached to that
   SD bus. This binding will enable that disk to be used with the disk driver
   API and any subsystems that utilize it.
diff --git a/dts/bindings/sdhc/adi,max32-sdhc.yaml b/dts/bindings/sdhc/adi,max32-sdhc.yaml
new file mode 100644
index 0000000000000..86d0e99d5cc73
--- /dev/null
+++ b/dts/bindings/sdhc/adi,max32-sdhc.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADI MAX32 SDHC
+
+compatible: "adi,max32-sdhc"
+
+include: [sdhc.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
diff --git a/dts/bindings/sdhc/ambiq,sdhc.yaml b/dts/bindings/sdhc/ambiq,sdhc.yaml
new file mode 100644
index 0000000000000..32dd3b4147d4f
--- /dev/null
+++ b/dts/bindings/sdhc/ambiq,sdhc.yaml
@@ -0,0 +1,28 @@
+# Copyright 2025, Ambiq Micro Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: Ambiq SDIO host controller
+
+compatible: "ambiq,sdio"
+
+include: [sdhc.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  txdelay:
+    type: int
+    required: true
+    description: SDIO TX delay tap setting. Range 0 - 15.
+
+  rxdelay:
+    type: int
+    required: true
+    description: SDIO RX delay tap setting. Range 0 - 31.
diff --git a/dts/bindings/sdhc/cdns,sdhc.yaml b/dts/bindings/sdhc/cdns,sdhc.yaml
index 5d3af2f4cd119..20dc723b48482 100644
--- a/dts/bindings/sdhc/cdns,sdhc.yaml
+++ b/dts/bindings/sdhc/cdns,sdhc.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Cadence SDHC Controller node
+description: Cadence SDHC Controller
 
 compatible: "cdns,sdhc"
 
diff --git a/dts/bindings/sdhc/espressif,esp32-sdhc-slot.yaml b/dts/bindings/sdhc/espressif,esp32-sdhc-slot.yaml
index ff743a2ad2c95..284ed1f929f31 100644
--- a/dts/bindings/sdhc/espressif,esp32-sdhc-slot.yaml
+++ b/dts/bindings/sdhc/espressif,esp32-sdhc-slot.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif ESP32 SDHC controller slot
+description: ESP32 SDHC controller slot
 
 compatible: "espressif,esp32-sdhc-slot"
 
diff --git a/dts/bindings/sdhc/espressif,esp32-sdhc.yaml b/dts/bindings/sdhc/espressif,esp32-sdhc.yaml
index b7cfabcdbbb38..335ab6bf82b66 100644
--- a/dts/bindings/sdhc/espressif,esp32-sdhc.yaml
+++ b/dts/bindings/sdhc/espressif,esp32-sdhc.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif ESP32 SDHC controller
+description: ESP32 SDHC controller
 
 compatible: "espressif,esp32-sdhc"
 
diff --git a/dts/bindings/sensor/ams,as6212.yaml b/dts/bindings/sensor/ams,as6212.yaml
index 4604e9b50cb1a..163e2fb0e7cd9 100644
--- a/dts/bindings/sensor/ams,as6212.yaml
+++ b/dts/bindings/sensor/ams,as6212.yaml
@@ -7,7 +7,7 @@ description: |
 
 compatible: "ams,as6212"
 
-include: i2c-device.yaml
+include: [sensor-device.yaml, i2c-device.yaml]
 
 properties:
   alert-gpios:
diff --git a/dts/bindings/sensor/bosch,bmi323-i2c.yaml b/dts/bindings/sensor/bosch,bmi323-i2c.yaml
new file mode 100644
index 0000000000000..709f66767d47c
--- /dev/null
+++ b/dts/bindings/sensor/bosch,bmi323-i2c.yaml
@@ -0,0 +1,6 @@
+# Copyright (c) 2023 Trackunit Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+compatible: "bosch,bmi323"
+
+include: [i2c-device.yaml, "bosch,bmi323.yaml"]
diff --git a/dts/bindings/sensor/bosch,bmi323-spi.yaml b/dts/bindings/sensor/bosch,bmi323-spi.yaml
new file mode 100644
index 0000000000000..57d154ab973c7
--- /dev/null
+++ b/dts/bindings/sensor/bosch,bmi323-spi.yaml
@@ -0,0 +1,6 @@
+# Copyright (c) 2023 Trackunit Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+compatible: "bosch,bmi323"
+
+include: ["spi-device.yaml", "bosch,bmi323.yaml"]
diff --git a/dts/bindings/sensor/bosch,bmi323.yaml b/dts/bindings/sensor/bosch,bmi323.yaml
index 2af03023acbf4..1057704f9a926 100644
--- a/dts/bindings/sensor/bosch,bmi323.yaml
+++ b/dts/bindings/sensor/bosch,bmi323.yaml
@@ -3,7 +3,7 @@
 
 compatible: "bosch,bmi323"
 
-include: ["spi-device.yaml", "sensor-device.yaml"]
+include: sensor-device.yaml
 
 properties:
   int-gpios:
diff --git a/dts/bindings/sensor/bosch,bmm350-i2c.yaml b/dts/bindings/sensor/bosch,bmm350-i2c.yaml
new file mode 100644
index 0000000000000..35434f69b54c6
--- /dev/null
+++ b/dts/bindings/sensor/bosch,bmm350-i2c.yaml
@@ -0,0 +1,11 @@
+# Copyright (c) 2024, Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Bosch BMM350 Geomagnetic sensor.  See more info at:
+    https://www.bosch-sensortec.com/products/motion-sensors/magnetometers/bmm350/
+
+compatible: "bosch,bmm350"
+
+include: [i2c-device.yaml, "bosch,bmm350.yaml"]
diff --git a/dts/bindings/sensor/bosch,bmm350.yaml b/dts/bindings/sensor/bosch,bmm350.yaml
new file mode 100644
index 0000000000000..35206be2d2edb
--- /dev/null
+++ b/dts/bindings/sensor/bosch,bmm350.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2024, Bosch Sensortec GmbH
+
+# SPDX-License-Identifier: Apache-2.0
+
+include: sensor-device.yaml
+
+properties:
+  drdy-gpios:
+    type: phandle-array
+    description: |
+      This property specifies the connection for data ready pin.
+      The polarity default is active high when sensor data is ready.
diff --git a/dts/bindings/sensor/espressif,esp32-pcnt.yaml b/dts/bindings/sensor/espressif,esp32-pcnt.yaml
index f022206f0c452..78a7384d1504f 100644
--- a/dts/bindings/sensor/espressif,esp32-pcnt.yaml
+++ b/dts/bindings/sensor/espressif,esp32-pcnt.yaml
@@ -3,7 +3,7 @@
 
 description: |
 
-  Espressif's Pulse Counter Mode (PCNT) controller Node
+  ESP32 Pulse Counter (PCNT)
 
   The pulse counter module is designed to count the number of
   rising and/or falling edges of an input signal.
diff --git a/dts/bindings/sensor/espressif,esp32-temp.yaml b/dts/bindings/sensor/espressif,esp32-temp.yaml
index 31509f40251d1..3d61c4eb929b2 100644
--- a/dts/bindings/sensor/espressif,esp32-temp.yaml
+++ b/dts/bindings/sensor/espressif,esp32-temp.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ESP32 family temperature sensor node
+description: ESP32 temperature sensor
 
 compatible: "espressif,esp32-temp"
 
@@ -11,7 +11,7 @@ properties:
   range:
     type: int
     description: |
-      The temperature sensor is available on the ESP32-S2, ESP32-S3, ESP32-C3.
+      The temperature sensor is available on the ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6.
       Note that it is unavailable on the ESP32 due to missing offset calibration.
       Temperature range is defined by the temperature offset which is used during
       calculation of the output temperature from the measured value.
diff --git a/dts/bindings/sensor/everlight,als-pt19.yaml b/dts/bindings/sensor/everlight,als-pt19.yaml
new file mode 100644
index 0000000000000..f41facba77182
--- /dev/null
+++ b/dts/bindings/sensor/everlight,als-pt19.yaml
@@ -0,0 +1,21 @@
+# Copyright (c) 2025 Dipak Shetty <shetty.dipak@gmx.com>
+# SPDX-License-Identifier: Apache-2.0
+
+description: Everlight ALS-PT19 Ambient Light Sensor
+
+compatible: "everlight,als-pt19"
+
+include: sensor-device.yaml
+
+properties:
+  load-resistor:
+    type: int
+    required: true
+    description: |
+      Load resistor value in ohms
+
+  io-channels:
+    type: phandle-array
+    required: true
+    description: |
+      ADC IO channel to use.
diff --git a/dts/bindings/sensor/invensense,icm42688.yaml b/dts/bindings/sensor/invensense,icm42688.yaml
index 4cf0277aa9fe1..d9e532b64a5d4 100644
--- a/dts/bindings/sensor/invensense,icm42688.yaml
+++ b/dts/bindings/sensor/invensense,icm42688.yaml
@@ -4,7 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    ICM-42688 motion tracking device
+    ICM-42688 motion tracking device.
+
     When setting the accel-pm, accel-range, accel-odr, gyro-pm, gyro-range,
     gyro-odr properties in a .dts or .dtsi file you may include icm42688.h
     and use the macros defined there.
diff --git a/dts/bindings/sensor/invensense,icm45686.yaml b/dts/bindings/sensor/invensense,icm45686.yaml
new file mode 100644
index 0000000000000..96e5ee9adc1a5
--- /dev/null
+++ b/dts/bindings/sensor/invensense,icm45686.yaml
@@ -0,0 +1,170 @@
+# Copyright (c) 2024 Intel Corporation
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    ICM45686 High-precision 6-axis motion tracking device
+    When setting the accel-pm, accel-range, accel-odr, gyro-pm, gyro-range,
+    gyro-odr properties in a .dts or .dtsi file you may include icm45686.h
+    and use the macros defined there.
+
+    Example:
+    #include <zephyr/dt-bindings/sensor/icm45686.h>
+
+    icm42688: icm45686@0 {
+      ...
+
+      accel-pwr-mode = <ICM45686_DT_ACCEL_LN>;
+      accel-fs = <ICM45686_DT_ACCEL_FS_32>;
+      accel-odr = <ICM45686_DT_ACCEL_ODR_800>;
+      gyro-pwr-mode= <ICM45686_DT_GYRO_LN>;
+      gyro-fs = <ICM45686_DT_GYRO_FS_4000>;
+      gyro-odr = <ICM45686_DT_GYRO_ODR_800>;
+    };
+
+compatible: "invensense,icm45686"
+include: [sensor-device.yaml, spi-device.yaml]
+
+properties:
+  int-gpios:
+    type: phandle-array
+    description: |
+      The INT signal default configuration is active-high. The
+      property value should ensure the flags properly describe the
+      signal that is presented to the driver.
+
+  accel-pwr-mode:
+    type: int
+    default: 0
+    description: |
+      Specify the default accelerometer power mode.
+      Default is power-up configuration.
+    enum:
+      - 0 # ICM45686_DT_ACCEL_OFF
+      - 2 # ICM45686_DT_ACCEL_LP
+      - 3 # ICM45686_DT_ACCEL_LN
+
+  accel-odr:
+    type: int
+    default: 6
+    description: |
+      Specify the default accelerometer output data rate expressed in samples per second (Hz).
+      Default is power-up configuration.
+    enum:
+      - 3 # ICM45686_DT_ACCEL_ODR_6400 (LN-mode only)
+      - 4 # ICM45686_DT_ACCEL_ODR_3200 (LN-mode only)
+      - 5 # ICM45686_DT_ACCEL_ODR_1600 (LN-mode only)
+      - 6 # ICM45686_DT_ACCEL_ODR_800 (LN-mode only)
+      - 7 # ICM45686_DT_ACCEL_ODR_400
+      - 8 # ICM45686_DT_ACCEL_ODR_200
+      - 9 # ICM45686_DT_ACCEL_ODR_100
+      - 10 # ICM45686_DT_ACCEL_ODR_50
+      - 11 # ICM45686_DT_ACCEL_ODR_25
+      - 12 # ICM45686_DT_ACCEL_ODR_12_5
+      - 13 # ICM45686_DT_ACCEL_ODR_6_25 (LP-mode only)
+      - 14 # ICM45686_DT_ACCEL_ODR_3_125 (LP-mode only)
+      - 15 # ICM45686_DT_ACCEL_ODR_1_5625 (LP-mode only)
+
+  accel-fs:
+    type: int
+    default: 0
+    description: |
+      Specify the accelerometer range in g.
+      Default is power-up configuration.
+    enum:
+      - 0 # ICM45686_DT_ACCEL_FS_32
+      - 1 # ICM45686_DT_ACCEL_FS_16
+      - 2 # ICM45686_DT_ACCEL_FS_8
+      - 3 # ICM45686_DT_ACCEL_FS_4
+      - 4 # ICM45686_DT_ACCEL_FS_2
+
+  accel-lpf:
+    type: int
+    default: 0
+    description: |
+      Specify the accelerometer low pass filter cut-off frequency
+      as a fraction of the output data rate.
+      Default is power-up configuration.
+    enum:
+      - 0 # ICM45686_DT_ACCEL_LPF_BW_OFF
+      - 1 # ICM45686_DT_ACCEL_LPF_BW_1_4
+      - 2 # ICM45686_DT_ACCEL_LPF_BW_1_8
+      - 3 # ICM45686_DT_ACCEL_LPF_BW_1_16
+      - 4 # ICM45686_DT_ACCEL_LPF_BW_1_32
+      - 5 # ICM45686_DT_ACCEL_LPF_BW_1_64
+      - 6 # ICM45686_DT_ACCEL_LPF_BW_1_128
+
+  gyro-pwr-mode:
+    type: int
+    default: 0
+    description: |
+      Specify the default gyro power mode.
+      Default is power-up configuration.
+    enum:
+      - 0 # ICM42688_DT_GYRO_OFF
+      - 1 # ICM42688_DT_GYRO_STANDBY
+      - 2 # ICM42688_DT_GYRO_LP
+      - 3 # ICM42688_DT_GYRO_LN
+
+  gyro-odr:
+    type: int
+    default: 6
+    description: |
+      Specify the default gyro output data rate expressed in samples per second (Hz).
+      Default is power-up configuration.
+    enum:
+      - 3 # ICM45686_DT_GYRO_ODR_6400 (LN-mode only)
+      - 4 # ICM45686_DT_GYRO_ODR_3200 (LN-mode only)
+      - 5 # ICM45686_DT_GYRO_ODR_1600 (LN-mode only)
+      - 6 # ICM45686_DT_GYRO_ODR_800 (LN-mode only)
+      - 7 # ICM45686_DT_GYRO_ODR_400
+      - 8 # ICM45686_DT_GYRO_ODR_200
+      - 9 # ICM45686_DT_GYRO_ODR_100
+      - 10 # ICM45686_DT_GYRO_ODR_50
+      - 11 # ICM45686_DT_GYRO_ODR_25
+      - 12 # ICM45686_DT_GYRO_ODR_12_5
+      - 13 # ICM45686_DT_GYRO_ODR_6_25 (LP-mode only)
+      - 14 # ICM45686_DT_GYRO_ODR_3_125 (LP-mode only)
+      - 15 # ICM45686_DT_GYRO_ODR_1_5625 (LP-mode only)
+
+  gyro-fs:
+    type: int
+    default: 0
+    description: |
+      Specify the gyro range in degrees per second.
+      Default is power-up configuration.
+    enum:
+      - 0 # ICM45686_DT_GYRO_FS_4000
+      - 1 # ICM45686_DT_GYRO_FS_2000
+      - 2 # ICM45686_DT_GYRO_FS_1000
+      - 3 # ICM45686_DT_GYRO_FS_500
+      - 4 # ICM45686_DT_GYRO_FS_250
+      - 5 # ICM45686_DT_GYRO_FS_125
+      - 6 # ICM45686_DT_GYRO_FS_62_5
+      - 7 # ICM45686_DT_GYRO_FS_31_25
+      - 8 # ICM45686_DT_GYRO_FS_15_625
+
+  gyro-lpf:
+    type: int
+    default: 0
+    description: |
+      Specify the gyro low pass filter cut-off frequency
+      as a fraction of the output data rate.
+      Default is power-up configuration.
+    enum:
+      - 0 # ICM45686_DT_GYRO_LPF_BW_OFF
+      - 1 # ICM45686_DT_GYRO_LPF_BW_1_4
+      - 2 # ICM45686_DT_GYRO_LPF_BW_1_8
+      - 3 # ICM45686_DT_GYRO_LPF_BW_1_16
+      - 4 # ICM45686_DT_GYRO_LPF_BW_1_32
+      - 5 # ICM45686_DT_GYRO_LPF_BW_1_64
+      - 6 # ICM45686_DT_GYRO_LPF_BW_1_128
+
+  fifo-watermark:
+    type: int
+    default: 0
+    description: |
+      Specify the FIFO watermark level in frame count.
+      Default is power-up configuration (disabled).
+      Valid range: 0 - 104
diff --git a/dts/bindings/sensor/invensense,icp201xx-i2c.yaml b/dts/bindings/sensor/invensense,icp201xx-i2c.yaml
new file mode 100644
index 0000000000000..cd973ef537598
--- /dev/null
+++ b/dts/bindings/sensor/invensense,icp201xx-i2c.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 TDK Invensense
+# SPDX-License-Identifier: Apache-2.0
+
+description: ICP201xx High Accuracy, Low Power, Barometric Pressure and Temperature Sensor IC
+
+compatible: "invensense,icp201xx"
+
+include: [i2c-device.yaml, "invensense,icp201xx.yaml"]
diff --git a/dts/bindings/sensor/invensense,icp201xx-spi.yaml b/dts/bindings/sensor/invensense,icp201xx-spi.yaml
new file mode 100644
index 0000000000000..d404c2931b050
--- /dev/null
+++ b/dts/bindings/sensor/invensense,icp201xx-spi.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 TDK Invensense
+# SPDX-License-Identifier: Apache-2.0
+
+description: ICP201xx High Accuracy, Low Power, Barometric Pressure and Temperature Sensor IC
+
+compatible: "invensense,icp201xx"
+
+include: [spi-device.yaml, "invensense,icp201xx.yaml"]
diff --git a/dts/bindings/sensor/invensense,icp201xx.yaml b/dts/bindings/sensor/invensense,icp201xx.yaml
new file mode 100644
index 0000000000000..d618fd9d83c33
--- /dev/null
+++ b/dts/bindings/sensor/invensense,icp201xx.yaml
@@ -0,0 +1,53 @@
+# Copyright (c) 2025 TDK Invensense
+# SPDX-License-Identifier: Apache-2.0
+
+description: ICP201xx High Accuracy, Low Power, Barometric Pressure and Temperature Sensor IC
+
+compatible: "invensense,icp201xx"
+
+include: [sensor-device.yaml]
+
+properties:
+  int-gpios:
+    type: phandle-array
+    description: |
+      The INT signal default configuration is active-high. The
+      property value should ensure the flags properly describe the
+      signal that is presented to the driver.
+
+  op-mode:
+    type: string
+    default: mode0
+    description: |
+      Default mode for sensor.
+      Mode selection is a trade-off between measurement time, consumption and noise.
+      Operation modes are the following:
+      - Mode0: odr=25Hz,  noise=0.5rms, current=211uA
+      - Mode1: odr=120Hz, noise=1rms,   current=222uA
+      - Mode2: odr=40Hz,  noise=2.5rms, current=49uA
+      - Mode3: odr=2Hz,   noise=0.5rms, current=23uA
+      - Mode4: odr=25Hz,  noise=0.3rms, current=250uA
+      Default set to mode0 which is the sensor default value.
+    enum:
+      - mode0
+      - mode1
+      - mode2
+      - mode3
+      - mode4
+
+  drive-strength:
+    type: string
+    default: current_12mA_1_8V
+    description: |
+      IO device strength register value.
+      Define max current when switching IO state.
+      Default set to current_12mA_1_8V which is the sensor default value.
+    enum:
+      - current_2mA_1_8V
+      - current_4mA_1_8V
+      - current_8mA_1_8V
+      - current_12mA_1_8V
+      - current_2mA_1_2V
+      - current_4mA_1_2V
+      - current_6mA_1_2V
+      - current_8mA_1_2V
diff --git a/dts/bindings/sensor/invensense,mpu6050.yaml b/dts/bindings/sensor/invensense,mpu6050.yaml
index 6e56444008ebf..688de84685817 100644
--- a/dts/bindings/sensor/invensense,mpu6050.yaml
+++ b/dts/bindings/sensor/invensense,mpu6050.yaml
@@ -16,3 +16,39 @@ properties:
       The INT signal default configuration is active-high.  The
       property value should ensure the flags properly describe the
       signal that is presented to the driver.
+
+  accel-fs:
+    type: int
+    default: 2
+    description: |
+      Accelerometer full-scale range.
+      An X value represents a range of +/- X g.
+      The power-on reset state of the sensor matches the default value of 2.
+    enum:
+      - 2
+      - 4
+      - 8
+      - 16
+
+  gyro-fs:
+    type: int
+    default: 250
+    description: |
+      Gyroscope full-scale range.
+      An X value represents a range of +/- X deg/s.
+      The power-on reset state of the sensor matches the default value of 250.
+    enum:
+      - 250
+      - 500
+      - 1000
+      - 2000
+
+  smplrt-div:
+    type: int
+    default: 0
+    description: |
+      The base sample rate is 8 kHz for the gyroscope and 1 kHz for
+      the accelerometer.
+      A division factor of X sets the sample rate to: baserate / (1 + X).
+      Valid values for X are 0 through 255.
+      The power-on reset state of the sensor matches the default value of 0.
diff --git a/dts/bindings/sensor/ist,tsic-xx6.yaml b/dts/bindings/sensor/ist,tsic-xx6.yaml
index d6ee88b8079b7..50378a3c3f74a 100644
--- a/dts/bindings/sensor/ist,tsic-xx6.yaml
+++ b/dts/bindings/sensor/ist,tsic-xx6.yaml
@@ -17,6 +17,8 @@ description: |
 
 compatible: "ist,tsic-xx6"
 
+include: sensor-device.yaml
+
 properties:
   pwms:
     required: true
@@ -26,12 +28,12 @@ properties:
   lower-temperature-limit:
     required: true
     type: int
-    description: Lowest temperature supported by the device in celcius degrees.
+    description: Lowest temperature supported by the device in celsius degrees.
 
   higher-temperature-limit:
     required: true
     type: int
-    description: Highest temperature supported by the device in celcius degrees.
+    description: Highest temperature supported by the device in celsius degrees.
 
   data-bits:
     required: true
diff --git a/dts/bindings/sensor/liteon,ltr329.yaml b/dts/bindings/sensor/liteon,ltr329.yaml
new file mode 100644
index 0000000000000..66db8bfe9826d
--- /dev/null
+++ b/dts/bindings/sensor/liteon,ltr329.yaml
@@ -0,0 +1,63 @@
+# Copyright (c) 2025 Konrad Sikora
+# SPDX-License-Identifier: Apache-2.0
+
+description: LiteOn LTR-329 Digital Ambient Light Sensor
+
+compatible: "liteon,ltr329"
+
+include: [sensor-device.yaml, i2c-device.yaml]
+
+properties:
+  gain:
+    type: int
+    default: 0
+    description: |
+      This parameter adjusts the ADC gain factor, impacting the sensor's
+      light sensitivity range. The default setting, corresponding to the
+      register reset value (1X).
+      Possible values are:
+      - 0 # Gain 1X (1 lux to 64k lux)
+      - 1 # Gain 2X (0.5 lux to 32k lux)
+      - 2 # Gain 4X (0.25 lux to 16k lux)
+      - 3 # Gain 8X (0.125 lux to 8k lux)
+      - 6 # Gain 48X (0.02 lux to 1.3k lux)
+      - 7 # Gain 96X (0.01 lux to 600 lux)
+    enum: [0, 1, 2, 3, 6, 7]
+
+  integration-time:
+    type: int
+    default: 0
+    description: |
+      ALS Integration Time is the measurement time for each ALS cycle.
+      Default value is a register reset value (100ms).
+      Possible values are:
+      - 0 # 100ms
+      - 1 # 50ms
+      - 2 # 200ms
+      - 3 # 400ms
+      - 4 # 150ms
+      - 5 # 250ms
+      - 6 # 300ms
+      - 7 # 350ms
+    enum: [0, 1, 2, 3, 4, 5, 6, 7]
+
+  measurement-rate:
+    type: int
+    default: 3
+    description: |
+      ALS Measurement Rate is the rate at which the sensor
+      takes measurements in the active mode. This is the interval
+      between ALS_DATA registers update. ALS Measurement Repeat Rate
+      must be set to be equal or larger than the Integration Time.
+      If ALS Measurement Repeat Rate  is set to be smaller than
+      ALS Integration Time, it will automatically be reset to be
+      equal to ALS Integration Time by the IC internally. Default value
+      is a register reset value (500ms).
+      Possible values are:
+      - 0 # 50ms
+      - 1 # 100ms
+      - 2 # 200ms
+      - 3 # 500ms
+      - 4 # 1000ms
+      - 5 # 2000ms
+    enum: [0, 1, 2, 3, 4, 5]
diff --git a/dts/bindings/sensor/liteon,ltrf216a.yaml b/dts/bindings/sensor/liteon,ltrf216a.yaml
new file mode 100644
index 0000000000000..f509dbfcaff3b
--- /dev/null
+++ b/dts/bindings/sensor/liteon,ltrf216a.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2023, Trridonic
+# SPDX-License-Identifier: Apache-2.0
+
+description: LiteOn F216A ambient light sensor
+
+compatible: "liteon,ltrf216a"
+
+include: [sensor-device.yaml, i2c-device.yaml]
diff --git a/dts/bindings/sensor/ltrf216a.yaml b/dts/bindings/sensor/ltrf216a.yaml
deleted file mode 100644
index fdbd7304be012..0000000000000
--- a/dts/bindings/sensor/ltrf216a.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2023, Trridonic
-# SPDX-License-Identifier: Apache-2.0
-
-description: LiteOn F216A ambient light sensor
-
-compatible: "ltr,f216a"
-
-include: [sensor-device.yaml, i2c-device.yaml]
diff --git a/dts/bindings/sensor/meas,ms5837-02ba.yaml b/dts/bindings/sensor/meas,ms5837-02ba.yaml
new file mode 100644
index 0000000000000..61ac0b1760a56
--- /dev/null
+++ b/dts/bindings/sensor/meas,ms5837-02ba.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, Ivan Wagner <ivan.wagner@tecinvent.ch>
+# SPDX-License-Identifier: Apache-2.0
+
+description: TE Connectivity MS5837-02BA digital pressure sensor
+
+compatible: "meas,ms5837-02ba"
+
+include: [sensor-device.yaml, i2c-device.yaml]
diff --git a/dts/bindings/sensor/meas,ms5837-30ba.yaml b/dts/bindings/sensor/meas,ms5837-30ba.yaml
new file mode 100644
index 0000000000000..329537b33131c
--- /dev/null
+++ b/dts/bindings/sensor/meas,ms5837-30ba.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025, Ivan Wagner <ivan.wagner@tecinvent.ch>
+# SPDX-License-Identifier: Apache-2.0
+
+description: TE Connectivity MS5837-30BA digital pressure sensor
+
+compatible: "meas,ms5837-30ba"
+
+include: [sensor-device.yaml, i2c-device.yaml]
diff --git a/dts/bindings/sensor/meas,ms5837.yaml b/dts/bindings/sensor/meas,ms5837.yaml
deleted file mode 100644
index 7d5472c361397..0000000000000
--- a/dts/bindings/sensor/meas,ms5837.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2018, Jan Van Winkel <jan.van_winkel@dxplore.eu>
-# SPDX-License-Identifier: Apache-2.0
-
-description: TE Connectivity MS5837 digital pressure sensor
-
-compatible: "meas,ms5837"
-
-include: [sensor-device.yaml, i2c-device.yaml]
diff --git a/dts/bindings/sensor/nordic,nrf-temp-nrfs.yaml b/dts/bindings/sensor/nordic,nrf-temp-nrfs.yaml
index 2a77552b3bfef..540f2512d103e 100644
--- a/dts/bindings/sensor/nordic,nrf-temp-nrfs.yaml
+++ b/dts/bindings/sensor/nordic,nrf-temp-nrfs.yaml
@@ -6,4 +6,4 @@ description: |
 
 compatible: "nordic,nrf-temp-nrfs"
 
-include: base.yaml
+include: [base.yaml, sensor-device.yaml]
diff --git a/dts/bindings/sensor/nxp,p3t1755-common.yaml b/dts/bindings/sensor/nxp,p3t1755-common.yaml
index ff090a8349a25..0f0e174fae8cb 100644
--- a/dts/bindings/sensor/nxp,p3t1755-common.yaml
+++ b/dts/bindings/sensor/nxp,p3t1755-common.yaml
@@ -4,6 +4,8 @@
 description: |
     NXP P3T1755 digital temperature sensor.
 
+include: sensor-device.yaml
+
 properties:
   oneshot-mode:
     type: boolean
diff --git a/dts/bindings/sensor/phosense,xbr818.yaml b/dts/bindings/sensor/phosense,xbr818.yaml
new file mode 100644
index 0000000000000..9eeedba058472
--- /dev/null
+++ b/dts/bindings/sensor/phosense,xbr818.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Phosense XBR818 I2C-capable 10 GHz Radar Sensor
+
+compatible: "phosense,xbr818"
+
+include: [sensor-device.yaml, i2c-device.yaml]
+
+properties:
+  int-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO pin connected to IO pin (IO_VAL)
+
+  i2c-en-gpios:
+    type: phandle-array
+    description: GPIO pin connected to I2C enable (I2C_EN)
diff --git a/dts/bindings/sensor/pixart,paa3905.yaml b/dts/bindings/sensor/pixart,paa3905.yaml
new file mode 100644
index 0000000000000..dac6c5271db4c
--- /dev/null
+++ b/dts/bindings/sensor/pixart,paa3905.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+description: PA3905 optical flow sensor
+
+compatible: "pixart,paa3905"
+
+include: [sensor-device.yaml, spi-device.yaml]
+
+properties:
+  resolution:
+    type: int
+    default: 42
+    description: |
+      The resolution of the sensor, which affects the counts per inch detected
+      by the sensor.
+      Default is power-on reset value.
+
+  led-control:
+    type: boolean
+    default:
+    description: |
+      Enable or disable the LED control feature, which allows the optical flow
+      sensor to drive an external LED in order to provide illuminance when needed.
+
+  int-gpios:
+    type: phandle-array
+    description: |
+      The INT signal default configuration is active-low. The
+      property value should ensure the flags properly describe the
+      signal that is presented to the driver.
+
+  backup-timer-ms:
+    type: int
+    default: 80
+    description: |
+      The back-up timer in milliseconds used to ensure sensor interaction
+      even if no motion is present, when Data-Ready streaming trigger is
+      configured. If erratic behavior is detected, a sensor recovery
+      sequence is performed.
+      Default is 10X the fastest frame rate (126 fps).
diff --git a/dts/bindings/sensor/pixart,pat9136.yaml b/dts/bindings/sensor/pixart,pat9136.yaml
new file mode 100644
index 0000000000000..1336bf3b3ffc9
--- /dev/null
+++ b/dts/bindings/sensor/pixart,pat9136.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2025 Croxel Inc.
+# Copyright (c) 2025 CogniPilot Foundation
+# SPDX-License-Identifier: Apache-2.0
+
+description: PAT9136 optical flow sensor
+
+compatible: "pixart,pat9136"
+
+include: [sensor-device.yaml, spi-device.yaml]
+
+properties:
+  resolution:
+    type: int
+    default: 19
+    description: |
+      The resolution of the sensor which indirectly results in counts per inch
+      (CPI), following the formula CPI = (1 + resolution) * 100.
+      Valid range is 0 to 199.
+      Default is value set during Performance Optimization Settings.
+
+  int-gpios:
+    type: phandle-array
+    description: |
+      The INT signal default configuration is active-low. The
+      property value should ensure the flags properly describe the
+      signal that is presented to the driver.
+
+  backup-timer-ms:
+    type: int
+    default: 50
+    description: |
+      The back-up timer in milliseconds used to ensure sensor interaction
+      even if no motion is present, when Data-Ready streaming trigger is
+      configured.
+      Default is 1000X the fastest frame rate (20,000 fps).
+
+  cooldown-timer-ms:
+    type: int
+    default: 10
+    description: |
+      The cooldown timer in milliseconds used to prevent flooding the system
+      with interrupts (potentially at max 20,000 fps) while Data-Ready
+      streaming trigger is configured.
+      Default is 200X the fastest frame rate (20,000 fps).
+      Must be less than backup-timer-ms.
diff --git a/dts/bindings/sensor/raspberrrypi,pico-temp.yaml b/dts/bindings/sensor/raspberrrypi,pico-temp.yaml
index 98b1e119292ad..d56b15c16af9d 100644
--- a/dts/bindings/sensor/raspberrrypi,pico-temp.yaml
+++ b/dts/bindings/sensor/raspberrrypi,pico-temp.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 TOKITA Hiroshi
 # SPDX-License-Identifier: Apache-2.0
 
-description: RaspberryPi Pico family temperature sensor node
+description: Raspberry Pi Pico family temperature sensor node
 
 compatible: "raspberrypi,pico-temp"
 
diff --git a/dts/bindings/sensor/st,lsm6dsv16x-common.yaml b/dts/bindings/sensor/st,lsm6dsv16x-common.yaml
index 9746012e31071..b382aa101a055 100644
--- a/dts/bindings/sensor/st,lsm6dsv16x-common.yaml
+++ b/dts/bindings/sensor/st,lsm6dsv16x-common.yaml
@@ -1,298 +1,18 @@
 # Copyright (c) 2023 STMicroelectronics
 # SPDX-License-Identifier: Apache-2.0
 
-description: |
-    When setting the accel-range, accel-odr, gyro-range, gyro-odr properties in
-    a .dts or .dtsi file you may include lsm6dsv16x.h and use the macros
-    defined there.
-
-    Example:
-    #include <zephyr/dt-bindings/sensor/lsm6dsv16x.h>
-
-    lsm6dsv16x: lsm6dsv16x@0 {
-      ...
-
-      accel-range = <LSM6DSV16X_DT_FS_8G>;
-      accel-odr = <LSM6DSV16X_DT_ODR_AT_60Hz>;
-      gyro-range = <LSM6DSV16X_DT_FS_4000DPS>;
-      gyro-odr = <LSM6DSV16X_DT_ODR_AT_60Hz>;
-    };
-
-include: sensor-device.yaml
+include: st,lsm6dsvxxx-common.yaml
 
 properties:
-  int1-gpios:
-    type: phandle-array
-    description: |
-      INT1 pin
-
-      This pin defaults to active high when produced by the sensor.
-      The property value should ensure the flags properly describe
-      the signal that is presented to the driver.
-
-  int2-gpios:
-    type: phandle-array
-    description: |
-      INT2 pin
-
-      This pin defaults to active high when produced by the sensor.
-      The property value should ensure the flags properly describe
-      the signal that is presented to the driver.
-
-  drdy-pin:
-    type: int
-    default: 1
-    enum:
-      - 1 # drdy is generated from INT1
-      - 2 # drdy is generated from INT2
-    description: |
-      Select DRDY pin number (1 or 2).
-
-      This number represents which of the two interrupt pins
-      (INT1 or INT2) the drdy line is attached to. This property is not
-      mandatory and if not present it defaults to 1 which is the
-      configuration at power-up.
-
   accel-range:
     type: int
-    default: 0
+    default: 2
     description: |
       Range in g. Default is power-up configuration.
 
-      - 0 # LSM6DSV16X_DT_FS_2G  (0.061 mg/LSB)
-      - 1 # LSM6DSV16X_DT_FS_4G  (0.122 mg/LSB)
-      - 2 # LSM6DSV16X_DT_FS_8G  (0.244 mg/LSB)
-      - 3 # LSM6DSV16X_DT_FS_16G (0.488 mg/LSB)
-
-    enum: [0, 1, 2, 3]
-
-  accel-odr:
-    type: int
-    default: 0x0
-    description: |
-      Specify the default accelerometer output data rate expressed in samples per second (Hz).
-      The values are taken in accordance to lsm6dsv16x_data_rate_t enumerative in hal/st
-      module. Please note that this values will not change the operating mode, which will remain
-      High Performance (device default)
-      Default is power-up configuration.
-
-      - 0x00 # LSM6DSV16X_DT_ODR_OFF
-      - 0x01 # LSM6DSV16X_DT_ODR_AT_1Hz875
-      - 0x02 # LSM6DSV16X_DT_ODR_AT_7Hz5
-      - 0x03 # LSM6DSV16X_DT_ODR_AT_15Hz
-      - 0x04 # LSM6DSV16X_DT_ODR_AT_30Hz
-      - 0x05 # LSM6DSV16X_DT_ODR_AT_60Hz
-      - 0x06 # LSM6DSV16X_DT_ODR_AT_120Hz
-      - 0x07 # LSM6DSV16X_DT_ODR_AT_240Hz
-      - 0x08 # LSM6DSV16X_DT_ODR_AT_480Hz
-      - 0x09 # LSM6DSV16X_DT_ODR_AT_960Hz
-      - 0x0a # LSM6DSV16X_DT_ODR_AT_1920Hz
-      - 0x0b # LSM6DSV16X_DT_ODR_AT_3840Hz
-      - 0x0c # LSM6DSV16X_DT_ODR_AT_7680Hz
-      - 0x13 # LSM6DSV16X_DT_ODR_HA01_AT_15Hz625
-      - 0x14 # LSM6DSV16X_DT_ODR_HA01_AT_31Hz25
-      - 0x15 # LSM6DSV16X_DT_ODR_HA01_AT_62Hz5
-      - 0x16 # LSM6DSV16X_DT_ODR_HA01_AT_125Hz
-      - 0x17 # LSM6DSV16X_DT_ODR_HA01_AT_250Hz
-      - 0x18 # LSM6DSV16X_DT_ODR_HA01_AT_500Hz
-      - 0x19 # LSM6DSV16X_DT_ODR_HA01_AT_1000Hz
-      - 0x1a # LSM6DSV16X_DT_ODR_HA01_AT_2000Hz
-      - 0x1b # LSM6DSV16X_DT_ODR_HA01_AT_4000Hz
-      - 0x1c # LSM6DSV16X_DT_ODR_HA01_AT_8000Hz
-      - 0x23 # LSM6DSV16X_DT_ODR_HA02_AT_12Hz5
-      - 0x24 # LSM6DSV16X_DT_ODR_HA02_AT_25Hz
-      - 0x25 # LSM6DSV16X_DT_ODR_HA02_AT_50Hz
-      - 0x26 # LSM6DSV16X_DT_ODR_HA02_AT_100Hz
-      - 0x27 # LSM6DSV16X_DT_ODR_HA02_AT_200Hz
-      - 0x28 # LSM6DSV16X_DT_ODR_HA02_AT_400Hz
-      - 0x29 # LSM6DSV16X_DT_ODR_HA02_AT_800Hz
-      - 0x2a # LSM6DSV16X_DT_ODR_HA02_AT_1600Hz
-      - 0x2b # LSM6DSV16X_DT_ODR_HA02_AT_3200Hz
-      - 0x2c # LSM6DSV16X_DT_ODR_HA02_AT_6400Hz
-
-    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
-           0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c,
-           0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c]
-
-  gyro-range:
-    type: int
-    default: 0
-    description: |
-      Range in dps. Default is power-up configuration.
-
-      - 0x0 # LSM6DSV16X_DT_FS_125DPS  (4.375 mdps/LSB)
-      - 0x1 # LSM6DSV16X_DT_FS_250DPS  (8.75 mdps/LSB)
-      - 0x2 # LSM6DSV16X_DT_FS_500DPS  (17.50 mdps/LSB)
-      - 0x3 # LSM6DSV16X_DT_FS_1000DPS (35 mdps/LSB)
-      - 0x4 # LSM6DSV16X_DT_FS_2000DPS (70 mdps/LSB)
-      - 0xc # LSM6DSV16X_DT_FS_4000DPS (140 mdps/LSB)
-
-    enum: [0x0, 0x1, 0x2, 0x3, 0x4, 0xc]
-
-  gyro-odr:
-    type: int
-    default: 0x0
-    description: |
-      Specify the default gyro output data rate expressed in samples per second (Hz).
-      The values are taken in accordance to lsm6dsv16x_data_rate_t enumerative in hal/st
-      module. Please note that these values will not change the operating mode, which will remain
-      High Performance (device default). Moreover, the values here which will be selected in the
-      DT are the only way to specify the odr accuracy even at runtime with
-      SENSOR_ATTR_SAMPLING_FREQUENCY.
-      Default is power-up configuration.
-
-      - 0x00 # LSM6DSV16X_DT_ODR_OFF
-      - 0x01 # LSM6DSV16X_DT_ODR_AT_1Hz875
-      - 0x02 # LSM6DSV16X_DT_ODR_AT_7Hz5
-      - 0x03 # LSM6DSV16X_DT_ODR_AT_15Hz
-      - 0x04 # LSM6DSV16X_DT_ODR_AT_30Hz
-      - 0x05 # LSM6DSV16X_DT_ODR_AT_60Hz
-      - 0x06 # LSM6DSV16X_DT_ODR_AT_120Hz
-      - 0x07 # LSM6DSV16X_DT_ODR_AT_240Hz
-      - 0x08 # LSM6DSV16X_DT_ODR_AT_480Hz
-      - 0x09 # LSM6DSV16X_DT_ODR_AT_960Hz
-      - 0x0a # LSM6DSV16X_DT_ODR_AT_1920Hz
-      - 0x0b # LSM6DSV16X_DT_ODR_AT_3840Hz
-      - 0x0c # LSM6DSV16X_DT_ODR_AT_7680Hz
-      - 0x13 # LSM6DSV16X_DT_ODR_HA01_AT_15Hz625
-      - 0x14 # LSM6DSV16X_DT_ODR_HA01_AT_31Hz25
-      - 0x15 # LSM6DSV16X_DT_ODR_HA01_AT_62Hz5
-      - 0x16 # LSM6DSV16X_DT_ODR_HA01_AT_125Hz
-      - 0x17 # LSM6DSV16X_DT_ODR_HA01_AT_250Hz
-      - 0x18 # LSM6DSV16X_DT_ODR_HA01_AT_500Hz
-      - 0x19 # LSM6DSV16X_DT_ODR_HA01_AT_1000Hz
-      - 0x1a # LSM6DSV16X_DT_ODR_HA01_AT_2000Hz
-      - 0x1b # LSM6DSV16X_DT_ODR_HA01_AT_4000Hz
-      - 0x1c # LSM6DSV16X_DT_ODR_HA01_AT_8000Hz
-      - 0x23 # LSM6DSV16X_DT_ODR_HA02_AT_12Hz5
-      - 0x24 # LSM6DSV16X_DT_ODR_HA02_AT_25Hz
-      - 0x25 # LSM6DSV16X_DT_ODR_HA02_AT_50Hz
-      - 0x26 # LSM6DSV16X_DT_ODR_HA02_AT_100Hz
-      - 0x27 # LSM6DSV16X_DT_ODR_HA02_AT_200Hz
-      - 0x28 # LSM6DSV16X_DT_ODR_HA02_AT_400Hz
-      - 0x29 # LSM6DSV16X_DT_ODR_HA02_AT_800Hz
-      - 0x2a # LSM6DSV16X_DT_ODR_HA02_AT_1600Hz
-      - 0x2b # LSM6DSV16X_DT_ODR_HA02_AT_3200Hz
-      - 0x2c # LSM6DSV16X_DT_ODR_HA02_AT_6400Hz
-
-    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
-           0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c,
-           0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c]
-
-  drdy-pulsed:
-    type: boolean
-    description: |
-      Selects the pulsed mode for data-ready interrupt when enabled,
-      and the latched mode when disabled.
-
-  fifo-watermark:
-    type: int
-    default: 32
-    description: |
-      Specify the default FIFO watermark threshold. Every unit indicates a FIFO row (1 byte of TAG +
-      6 bytes of data). (min 0; max 255)
-      A typical threshold value is 32 which is then used as default.
-
-  accel-fifo-batch-rate:
-    type: int
-    default: 0x0
-    description: |
-      Specify the default accelerometer FIFO batch data rate expressed in samples per second (Hz).
-      The values are taken in accordance to lsm6dsv16x_fifo_xl_batch_t enumerative in hal/st
-      module.
-      Default is power-up configuration.
-
-      - 0x0 # LSM6DSV16X_DT_XL_NOT_BATCHED
-      - 0x1 # LSM6DSV16X_DT_XL_BATCHED_AT_1Hz875
-      - 0x2 # LSM6DSV16X_DT_XL_BATCHED_AT_7Hz5
-      - 0x3 # LSM6DSV16X_DT_XL_BATCHED_AT_15Hz
-      - 0x4 # LSM6DSV16X_DT_XL_BATCHED_AT_30Hz
-      - 0x5 # LSM6DSV16X_DT_XL_BATCHED_AT_60Hz
-      - 0x6 # LSM6DSV16X_DT_XL_BATCHED_AT_120Hz
-      - 0x7 # LSM6DSV16X_DT_XL_BATCHED_AT_240Hz
-      - 0x8 # LSM6DSV16X_DT_XL_BATCHED_AT_480Hz
-      - 0x9 # LSM6DSV16X_DT_XL_BATCHED_AT_960Hz
-      - 0xa # LSM6DSV16X_DT_XL_BATCHED_AT_1920Hz
-      - 0xb # LSM6DSV16X_DT_XL_BATCHED_AT_3840Hz
-      - 0xc # LSM6DSV16X_DT_XL_BATCHED_AT_7680Hz
-
-    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c]
-
-  gyro-fifo-batch-rate:
-    type: int
-    default: 0x0
-    description: |
-      Specify the default gyroscope FIFO batch data rate expressed in samples per second (Hz).
-      The values are taken in accordance to lsm6dsv16x_fifo_gy_batch_t enumerative in hal/st
-      module.
-      Default is power-up configuration.
-
-      - 0x0 # LSM6DSV16X_DT_GY_NOT_BATCHED
-      - 0x1 # LSM6DSV16X_DT_GY_BATCHED_AT_1Hz875
-      - 0x2 # LSM6DSV16X_DT_GY_BATCHED_AT_7Hz5
-      - 0x3 # LSM6DSV16X_DT_GY_BATCHED_AT_15Hz
-      - 0x4 # LSM6DSV16X_DT_GY_BATCHED_AT_30Hz
-      - 0x5 # LSM6DSV16X_DT_GY_BATCHED_AT_60Hz
-      - 0x6 # LSM6DSV16X_DT_GY_BATCHED_AT_120Hz
-      - 0x7 # LSM6DSV16X_DT_GY_BATCHED_AT_240Hz
-      - 0x8 # LSM6DSV16X_DT_GY_BATCHED_AT_480Hz
-      - 0x9 # LSM6DSV16X_DT_GY_BATCHED_AT_960Hz
-      - 0xa # LSM6DSV16X_DT_GY_BATCHED_AT_1920Hz
-      - 0xb # LSM6DSV16X_DT_GY_BATCHED_AT_3840Hz
-      - 0xc # LSM6DSV16X_DT_GY_BATCHED_AT_7680Hz
-
-    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c]
-
-  temp-fifo-batch-rate:
-    type: int
-    default: 0x0
-    description: |
-      Specify the default temperature FIFO batch data rate expressed in samples per second (Hz).
-      The values are taken in accordance to lsm6dsv16x_fifo_temp_batch_t enumerative in hal/st
-      module.
-      Default is power-up configuration.
-
-      - 0x0 # LSM6DSV16X_DT_TEMP_NOT_BATCHED
-      - 0x1 # LSM6DSV16X_DT_TEMP_BATCHED_AT_1Hz875
-      - 0x2 # LSM6DSV16X_DT_TEMP_BATCHED_AT_15Hz
-      - 0x3 # LSM6DSV16X_DT_TEMP_BATCHED_AT_60Hz
-
-    enum: [0x00, 0x01, 0x02, 0x03]
-
-  sflp-odr:
-    type: int
-    default: 0x3
-    description: |
-      Specify the Sensor Fusion Low Power output data rate expressed in samples per second (Hz).
-      The values are taken in accordance to lsm6dsv16x_sflp_data_rate_t enumerative in hal/st
-      module.
-      Default is power-up configuration.
-
-      - 0x0 # LSM6DSV16X_DT_SFLP_ODR_AT_15Hz
-      - 0x1 # LSM6DSV16X_DT_SFLP_ODR_AT_30Hz
-      - 0x2 # LSM6DSV16X_DT_SFLP_ODR_AT_60Hz
-      - 0x3 # LSM6DSV16X_DT_SFLP_ODR_AT_120Hz
-      - 0x4 # LSM6DSV16X_DT_SFLP_ODR_AT_240Hz
-      - 0x5 # LSM6DSV16X_DT_SFLP_ODR_AT_480Hz
-
-    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05]
-
-  sflp-fifo-enable:
-    type: int
-    default: 0x0
-    description: |
-      Specify what Sensor Fusion Low Power component has to be batched in FIFO.
-      The values are taken in accordance to lsm6dsv16x_fifo_sflp_raw_t enumerative in hal/st
-      module.
-      Default is power-up configuration.
-
-      - 0x0 # LSM6DSV16X_DT_SFLP_FIFO_OFF
-      - 0x1 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION
-      - 0x2 # LSM6DSV16X_DT_SFLP_FIFO_GRAVITY
-      - 0x3 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION_GRAVITY
-      - 0x4 # LSM6DSV16X_DT_SFLP_FIFO_GBIAS
-      - 0x5 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION_GBIAS
-      - 0x6 # LSM6DSV16X_DT_SFLP_FIFO_GRAVITY_GBIAS
-      - 0x7 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION_GRAVITY_GBIAS
+      - 2  # LSM6DSV16X_DT_FS_2G  (0.061 mg/LSB)
+      - 4  # LSM6DSV16X_DT_FS_4G  (0.122 mg/LSB)
+      - 8  # LSM6DSV16X_DT_FS_8G  (0.244 mg/LSB)
+      - 16 # LSM6DSV16X_DT_FS_16G (0.488 mg/LSB)
 
-    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07]
+    enum: [2, 4, 8, 16]
diff --git a/dts/bindings/sensor/st,lsm6dsv32x-common.yaml b/dts/bindings/sensor/st,lsm6dsv32x-common.yaml
new file mode 100644
index 0000000000000..cad3f67e69c56
--- /dev/null
+++ b/dts/bindings/sensor/st,lsm6dsv32x-common.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Meta Platforms
+# SPDX-License-Identifier: Apache-2.0
+
+include: st,lsm6dsvxxx-common.yaml
+
+properties:
+  accel-range:
+    type: int
+    default: 4
+    description: |
+      Range in g. Default is power-up configuration.
+
+      - 4  # LSM6DSV32X_DT_FS_4G  (0.122 mg/LSB)
+      - 8  # LSM6DSV32X_DT_FS_8G  (0.244 mg/LSB)
+      - 16 # LSM6DSV32X_DT_FS_16G (0.488 mg/LSB)
+      - 32 # LSM6DSV32X_DT_FS_32G (0.976 mg/LSB)
+
+    enum: [4, 8, 16, 32]
diff --git a/dts/bindings/sensor/st,lsm6dsv32x-i2c.yaml b/dts/bindings/sensor/st,lsm6dsv32x-i2c.yaml
new file mode 100644
index 0000000000000..2e56b97acd06e
--- /dev/null
+++ b/dts/bindings/sensor/st,lsm6dsv32x-i2c.yaml
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Meta Platforms
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    STMicroelectronics LSM6DSV32X 6-axis IMU (Inertial Measurement Unit) sensor
+    accessed through I2C bus
+
+compatible: "st,lsm6dsv32x"
+
+include: ["i2c-device.yaml", "st,lsm6dsv32x-common.yaml"]
diff --git a/dts/bindings/sensor/st,lsm6dsv32x-i3c.yaml b/dts/bindings/sensor/st,lsm6dsv32x-i3c.yaml
new file mode 100644
index 0000000000000..078153771d661
--- /dev/null
+++ b/dts/bindings/sensor/st,lsm6dsv32x-i3c.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Meta Platforms
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    STMicroelectronics LSM6DSV32X 6-axis IMU (Inertial Measurement Unit) sensor
+    accessed through I3C bus
+
+compatible: "st,lsm6dsv32x"
+
+include: ["i3c-device.yaml", "st,lsm6dsv32x-common.yaml"]
+
+properties:
+  int-en-i3c:
+    type: boolean
+    description: |
+      Enables INT pin when I3C is enabled
+
+  bus-act-sel-us:
+    type: int
+    default: 50
+    description: |
+      Bus available time for I3C IBI in microseconds
+
+    enum: [50, 2, 1000, 25000]
diff --git a/dts/bindings/sensor/st,lsm6dsv32x-spi.yaml b/dts/bindings/sensor/st,lsm6dsv32x-spi.yaml
new file mode 100644
index 0000000000000..3bf58b10924d2
--- /dev/null
+++ b/dts/bindings/sensor/st,lsm6dsv32x-spi.yaml
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Meta Platforms
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    STMicroelectronics LSM6DSV32X 6-axis IMU (Inertial Measurement Unit) sensor
+    accessed through SPI bus
+
+compatible: "st,lsm6dsv32x"
+
+include: ["spi-device.yaml", "st,lsm6dsv32x-common.yaml"]
diff --git a/dts/bindings/sensor/st,lsm6dsvxxx-common.yaml b/dts/bindings/sensor/st,lsm6dsvxxx-common.yaml
new file mode 100644
index 0000000000000..44b897343f741
--- /dev/null
+++ b/dts/bindings/sensor/st,lsm6dsvxxx-common.yaml
@@ -0,0 +1,285 @@
+# Copyright (c) 2023 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    When setting the accel-range, accel-odr, gyro-range, gyro-odr properties in
+    a .dts or .dtsi file you may include lsm6dsv16x.h and use the macros
+    defined there.
+
+    Example:
+    #include <zephyr/dt-bindings/sensor/lsm6dsv16x.h>
+
+    lsm6dsv16x: lsm6dsv16x@0 {
+      ...
+
+      accel-range = <LSM6DSV16X_DT_FS_8G>;
+      accel-odr = <LSM6DSV16X_DT_ODR_AT_60Hz>;
+      gyro-range = <LSM6DSV16X_DT_FS_4000DPS>;
+      gyro-odr = <LSM6DSV16X_DT_ODR_AT_60Hz>;
+    };
+
+include: sensor-device.yaml
+
+properties:
+  int1-gpios:
+    type: phandle-array
+    description: |
+      INT1 pin
+
+      This pin defaults to active high when produced by the sensor.
+      The property value should ensure the flags properly describe
+      the signal that is presented to the driver.
+
+  int2-gpios:
+    type: phandle-array
+    description: |
+      INT2 pin
+
+      This pin defaults to active high when produced by the sensor.
+      The property value should ensure the flags properly describe
+      the signal that is presented to the driver.
+
+  drdy-pin:
+    type: int
+    default: 1
+    enum:
+      - 1 # drdy is generated from INT1
+      - 2 # drdy is generated from INT2
+    description: |
+      Select DRDY pin number (1 or 2).
+
+      This number represents which of the two interrupt pins
+      (INT1 or INT2) the drdy line is attached to. This property is not
+      mandatory and if not present it defaults to 1 which is the
+      configuration at power-up.
+
+  accel-odr:
+    type: int
+    default: 0x0
+    description: |
+      Specify the default accelerometer output data rate expressed in samples per second (Hz).
+      The values are taken in accordance to lsm6dsv16x_data_rate_t enumerative in hal/st
+      module. Please note that this values will not change the operating mode, which will remain
+      High Performance (device default)
+      Default is power-up configuration.
+
+      - 0x00 # LSM6DSV16X_DT_ODR_OFF
+      - 0x01 # LSM6DSV16X_DT_ODR_AT_1Hz875
+      - 0x02 # LSM6DSV16X_DT_ODR_AT_7Hz5
+      - 0x03 # LSM6DSV16X_DT_ODR_AT_15Hz
+      - 0x04 # LSM6DSV16X_DT_ODR_AT_30Hz
+      - 0x05 # LSM6DSV16X_DT_ODR_AT_60Hz
+      - 0x06 # LSM6DSV16X_DT_ODR_AT_120Hz
+      - 0x07 # LSM6DSV16X_DT_ODR_AT_240Hz
+      - 0x08 # LSM6DSV16X_DT_ODR_AT_480Hz
+      - 0x09 # LSM6DSV16X_DT_ODR_AT_960Hz
+      - 0x0a # LSM6DSV16X_DT_ODR_AT_1920Hz
+      - 0x0b # LSM6DSV16X_DT_ODR_AT_3840Hz
+      - 0x0c # LSM6DSV16X_DT_ODR_AT_7680Hz
+      - 0x13 # LSM6DSV16X_DT_ODR_HA01_AT_15Hz625
+      - 0x14 # LSM6DSV16X_DT_ODR_HA01_AT_31Hz25
+      - 0x15 # LSM6DSV16X_DT_ODR_HA01_AT_62Hz5
+      - 0x16 # LSM6DSV16X_DT_ODR_HA01_AT_125Hz
+      - 0x17 # LSM6DSV16X_DT_ODR_HA01_AT_250Hz
+      - 0x18 # LSM6DSV16X_DT_ODR_HA01_AT_500Hz
+      - 0x19 # LSM6DSV16X_DT_ODR_HA01_AT_1000Hz
+      - 0x1a # LSM6DSV16X_DT_ODR_HA01_AT_2000Hz
+      - 0x1b # LSM6DSV16X_DT_ODR_HA01_AT_4000Hz
+      - 0x1c # LSM6DSV16X_DT_ODR_HA01_AT_8000Hz
+      - 0x23 # LSM6DSV16X_DT_ODR_HA02_AT_12Hz5
+      - 0x24 # LSM6DSV16X_DT_ODR_HA02_AT_25Hz
+      - 0x25 # LSM6DSV16X_DT_ODR_HA02_AT_50Hz
+      - 0x26 # LSM6DSV16X_DT_ODR_HA02_AT_100Hz
+      - 0x27 # LSM6DSV16X_DT_ODR_HA02_AT_200Hz
+      - 0x28 # LSM6DSV16X_DT_ODR_HA02_AT_400Hz
+      - 0x29 # LSM6DSV16X_DT_ODR_HA02_AT_800Hz
+      - 0x2a # LSM6DSV16X_DT_ODR_HA02_AT_1600Hz
+      - 0x2b # LSM6DSV16X_DT_ODR_HA02_AT_3200Hz
+      - 0x2c # LSM6DSV16X_DT_ODR_HA02_AT_6400Hz
+
+    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
+           0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c,
+           0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c]
+
+  gyro-range:
+    type: int
+    default: 0
+    description: |
+      Range in dps. Default is power-up configuration.
+
+      - 0x0 # LSM6DSV16X_DT_FS_125DPS  (4.375 mdps/LSB)
+      - 0x1 # LSM6DSV16X_DT_FS_250DPS  (8.75 mdps/LSB)
+      - 0x2 # LSM6DSV16X_DT_FS_500DPS  (17.50 mdps/LSB)
+      - 0x3 # LSM6DSV16X_DT_FS_1000DPS (35 mdps/LSB)
+      - 0x4 # LSM6DSV16X_DT_FS_2000DPS (70 mdps/LSB)
+      - 0xc # LSM6DSV16X_DT_FS_4000DPS (140 mdps/LSB)
+
+    enum: [0x0, 0x1, 0x2, 0x3, 0x4, 0xc]
+
+  gyro-odr:
+    type: int
+    default: 0x0
+    description: |
+      Specify the default gyro output data rate expressed in samples per second (Hz).
+      The values are taken in accordance to lsm6dsv16x_data_rate_t enumerative in hal/st
+      module. Please note that these values will not change the operating mode, which will remain
+      High Performance (device default). Moreover, the values here which will be selected in the
+      DT are the only way to specify the odr accuracy even at runtime with
+      SENSOR_ATTR_SAMPLING_FREQUENCY.
+      Default is power-up configuration.
+
+      - 0x00 # LSM6DSV16X_DT_ODR_OFF
+      - 0x01 # LSM6DSV16X_DT_ODR_AT_1Hz875
+      - 0x02 # LSM6DSV16X_DT_ODR_AT_7Hz5
+      - 0x03 # LSM6DSV16X_DT_ODR_AT_15Hz
+      - 0x04 # LSM6DSV16X_DT_ODR_AT_30Hz
+      - 0x05 # LSM6DSV16X_DT_ODR_AT_60Hz
+      - 0x06 # LSM6DSV16X_DT_ODR_AT_120Hz
+      - 0x07 # LSM6DSV16X_DT_ODR_AT_240Hz
+      - 0x08 # LSM6DSV16X_DT_ODR_AT_480Hz
+      - 0x09 # LSM6DSV16X_DT_ODR_AT_960Hz
+      - 0x0a # LSM6DSV16X_DT_ODR_AT_1920Hz
+      - 0x0b # LSM6DSV16X_DT_ODR_AT_3840Hz
+      - 0x0c # LSM6DSV16X_DT_ODR_AT_7680Hz
+      - 0x13 # LSM6DSV16X_DT_ODR_HA01_AT_15Hz625
+      - 0x14 # LSM6DSV16X_DT_ODR_HA01_AT_31Hz25
+      - 0x15 # LSM6DSV16X_DT_ODR_HA01_AT_62Hz5
+      - 0x16 # LSM6DSV16X_DT_ODR_HA01_AT_125Hz
+      - 0x17 # LSM6DSV16X_DT_ODR_HA01_AT_250Hz
+      - 0x18 # LSM6DSV16X_DT_ODR_HA01_AT_500Hz
+      - 0x19 # LSM6DSV16X_DT_ODR_HA01_AT_1000Hz
+      - 0x1a # LSM6DSV16X_DT_ODR_HA01_AT_2000Hz
+      - 0x1b # LSM6DSV16X_DT_ODR_HA01_AT_4000Hz
+      - 0x1c # LSM6DSV16X_DT_ODR_HA01_AT_8000Hz
+      - 0x23 # LSM6DSV16X_DT_ODR_HA02_AT_12Hz5
+      - 0x24 # LSM6DSV16X_DT_ODR_HA02_AT_25Hz
+      - 0x25 # LSM6DSV16X_DT_ODR_HA02_AT_50Hz
+      - 0x26 # LSM6DSV16X_DT_ODR_HA02_AT_100Hz
+      - 0x27 # LSM6DSV16X_DT_ODR_HA02_AT_200Hz
+      - 0x28 # LSM6DSV16X_DT_ODR_HA02_AT_400Hz
+      - 0x29 # LSM6DSV16X_DT_ODR_HA02_AT_800Hz
+      - 0x2a # LSM6DSV16X_DT_ODR_HA02_AT_1600Hz
+      - 0x2b # LSM6DSV16X_DT_ODR_HA02_AT_3200Hz
+      - 0x2c # LSM6DSV16X_DT_ODR_HA02_AT_6400Hz
+
+    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
+           0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c,
+           0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c]
+
+  drdy-pulsed:
+    type: boolean
+    description: |
+      Selects the pulsed mode for data-ready interrupt when enabled,
+      and the latched mode when disabled.
+
+  fifo-watermark:
+    type: int
+    default: 32
+    description: |
+      Specify the default FIFO watermark threshold. Every unit indicates a FIFO row (1 byte of TAG +
+      6 bytes of data). (min 0; max 255)
+      A typical threshold value is 32 which is then used as default.
+
+  accel-fifo-batch-rate:
+    type: int
+    default: 0x0
+    description: |
+      Specify the default accelerometer FIFO batch data rate expressed in samples per second (Hz).
+      The values are taken in accordance to lsm6dsv16x_fifo_xl_batch_t enumerative in hal/st
+      module.
+      Default is power-up configuration.
+
+      - 0x0 # LSM6DSV16X_DT_XL_NOT_BATCHED
+      - 0x1 # LSM6DSV16X_DT_XL_BATCHED_AT_1Hz875
+      - 0x2 # LSM6DSV16X_DT_XL_BATCHED_AT_7Hz5
+      - 0x3 # LSM6DSV16X_DT_XL_BATCHED_AT_15Hz
+      - 0x4 # LSM6DSV16X_DT_XL_BATCHED_AT_30Hz
+      - 0x5 # LSM6DSV16X_DT_XL_BATCHED_AT_60Hz
+      - 0x6 # LSM6DSV16X_DT_XL_BATCHED_AT_120Hz
+      - 0x7 # LSM6DSV16X_DT_XL_BATCHED_AT_240Hz
+      - 0x8 # LSM6DSV16X_DT_XL_BATCHED_AT_480Hz
+      - 0x9 # LSM6DSV16X_DT_XL_BATCHED_AT_960Hz
+      - 0xa # LSM6DSV16X_DT_XL_BATCHED_AT_1920Hz
+      - 0xb # LSM6DSV16X_DT_XL_BATCHED_AT_3840Hz
+      - 0xc # LSM6DSV16X_DT_XL_BATCHED_AT_7680Hz
+
+    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c]
+
+  gyro-fifo-batch-rate:
+    type: int
+    default: 0x0
+    description: |
+      Specify the default gyroscope FIFO batch data rate expressed in samples per second (Hz).
+      The values are taken in accordance to lsm6dsv16x_fifo_gy_batch_t enumerative in hal/st
+      module.
+      Default is power-up configuration.
+
+      - 0x0 # LSM6DSV16X_DT_GY_NOT_BATCHED
+      - 0x1 # LSM6DSV16X_DT_GY_BATCHED_AT_1Hz875
+      - 0x2 # LSM6DSV16X_DT_GY_BATCHED_AT_7Hz5
+      - 0x3 # LSM6DSV16X_DT_GY_BATCHED_AT_15Hz
+      - 0x4 # LSM6DSV16X_DT_GY_BATCHED_AT_30Hz
+      - 0x5 # LSM6DSV16X_DT_GY_BATCHED_AT_60Hz
+      - 0x6 # LSM6DSV16X_DT_GY_BATCHED_AT_120Hz
+      - 0x7 # LSM6DSV16X_DT_GY_BATCHED_AT_240Hz
+      - 0x8 # LSM6DSV16X_DT_GY_BATCHED_AT_480Hz
+      - 0x9 # LSM6DSV16X_DT_GY_BATCHED_AT_960Hz
+      - 0xa # LSM6DSV16X_DT_GY_BATCHED_AT_1920Hz
+      - 0xb # LSM6DSV16X_DT_GY_BATCHED_AT_3840Hz
+      - 0xc # LSM6DSV16X_DT_GY_BATCHED_AT_7680Hz
+
+    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c]
+
+  temp-fifo-batch-rate:
+    type: int
+    default: 0x0
+    description: |
+      Specify the default temperature FIFO batch data rate expressed in samples per second (Hz).
+      The values are taken in accordance to lsm6dsv16x_fifo_temp_batch_t enumerative in hal/st
+      module.
+      Default is power-up configuration.
+
+      - 0x0 # LSM6DSV16X_DT_TEMP_NOT_BATCHED
+      - 0x1 # LSM6DSV16X_DT_TEMP_BATCHED_AT_1Hz875
+      - 0x2 # LSM6DSV16X_DT_TEMP_BATCHED_AT_15Hz
+      - 0x3 # LSM6DSV16X_DT_TEMP_BATCHED_AT_60Hz
+
+    enum: [0x00, 0x01, 0x02, 0x03]
+
+  sflp-odr:
+    type: int
+    default: 0x3
+    description: |
+      Specify the Sensor Fusion Low Power output data rate expressed in samples per second (Hz).
+      The values are taken in accordance to lsm6dsv16x_sflp_data_rate_t enumerative in hal/st
+      module.
+      Default is power-up configuration.
+
+      - 0x0 # LSM6DSV16X_DT_SFLP_ODR_AT_15Hz
+      - 0x1 # LSM6DSV16X_DT_SFLP_ODR_AT_30Hz
+      - 0x2 # LSM6DSV16X_DT_SFLP_ODR_AT_60Hz
+      - 0x3 # LSM6DSV16X_DT_SFLP_ODR_AT_120Hz
+      - 0x4 # LSM6DSV16X_DT_SFLP_ODR_AT_240Hz
+      - 0x5 # LSM6DSV16X_DT_SFLP_ODR_AT_480Hz
+
+    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05]
+
+  sflp-fifo-enable:
+    type: int
+    default: 0x0
+    description: |
+      Specify what Sensor Fusion Low Power component has to be batched in FIFO.
+      The values are taken in accordance to lsm6dsv16x_fifo_sflp_raw_t enumerative in hal/st
+      module.
+      Default is power-up configuration.
+
+      - 0x0 # LSM6DSV16X_DT_SFLP_FIFO_OFF
+      - 0x1 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION
+      - 0x2 # LSM6DSV16X_DT_SFLP_FIFO_GRAVITY
+      - 0x3 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION_GRAVITY
+      - 0x4 # LSM6DSV16X_DT_SFLP_FIFO_GBIAS
+      - 0x5 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION_GBIAS
+      - 0x6 # LSM6DSV16X_DT_SFLP_FIFO_GRAVITY_GBIAS
+      - 0x7 # LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION_GRAVITY_GBIAS
+
+    enum: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07]
diff --git a/dts/bindings/sensor/st,stm32-digi-temp.yaml b/dts/bindings/sensor/st,stm32-digi-temp.yaml
index 4faba85246dd2..4c97be88fc8ae 100644
--- a/dts/bindings/sensor/st,stm32-digi-temp.yaml
+++ b/dts/bindings/sensor/st,stm32-digi-temp.yaml
@@ -1,11 +1,11 @@
 # Copyright (c) 2024, Aurelien Jarno
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32 family Digital Temperature Sensor node
+description: STM32 Digital Temperature Sensor.
 
 compatible: "st,stm32-digi-temp"
 
-include: base.yaml
+include: [sensor-device.yaml, base.yaml]
 
 properties:
   reg:
diff --git a/dts/bindings/sensor/st,stm32-qdec.yaml b/dts/bindings/sensor/st,stm32-qdec.yaml
index c8deae1bb9129..4429e0416eae9 100644
--- a/dts/bindings/sensor/st,stm32-qdec.yaml
+++ b/dts/bindings/sensor/st,stm32-qdec.yaml
@@ -8,6 +8,7 @@ compatible: "st,stm32-qdec"
 include:
   - name: base.yaml
   - name: pinctrl-device.yaml
+  - name: sensor-device.yaml
 
 properties:
   pinctrl-0:
diff --git a/dts/bindings/sensor/st,stm32-temp.yaml b/dts/bindings/sensor/st,stm32-temp.yaml
index 1a53f33b43ab2..118c19d741254 100644
--- a/dts/bindings/sensor/st,stm32-temp.yaml
+++ b/dts/bindings/sensor/st,stm32-temp.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021, Eug Krashtan
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32 family TEMP node
+description: STM32 Internal Temperature Sensor.
 
 compatible: "st,stm32-temp"
 
diff --git a/dts/bindings/sensor/st,stm32-vbat.yaml b/dts/bindings/sensor/st,stm32-vbat.yaml
index c23b8f84a3547..04616485ecb5c 100644
--- a/dts/bindings/sensor/st,stm32-vbat.yaml
+++ b/dts/bindings/sensor/st,stm32-vbat.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 STMicroelectronics
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32 family VBAT node
+description: STM32 VBAT
 
 include: sensor-device.yaml
 
diff --git a/dts/bindings/sensor/st,stm32-vref.yaml b/dts/bindings/sensor/st,stm32-vref.yaml
index 7a2987871a5b0..1e9a8b0de2a75 100644
--- a/dts/bindings/sensor/st,stm32-vref.yaml
+++ b/dts/bindings/sensor/st,stm32-vref.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Kenneth J. Miller <ken@miller.ec>
 # SPDX-License-Identifier: Apache-2.0
 
-description: STM32 family VREF+ node
+description: STM32 VREF+.
 
 compatible: "st,stm32-vref"
 
diff --git a/dts/bindings/sensor/st,stm32c0-temp-cal.yaml b/dts/bindings/sensor/st,stm32c0-temp-cal.yaml
index d217782cadee9..82dcd09821c6e 100644
--- a/dts/bindings/sensor/st,stm32c0-temp-cal.yaml
+++ b/dts/bindings/sensor/st,stm32c0-temp-cal.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    STM32 family TEMP node for production calibrated sensors with a single calibration temperature.
+  STM32 TEMP for production calibrated sensors with a single calibration temperature.
 
 compatible: "st,stm32c0-temp-cal"
 
diff --git a/dts/bindings/sensor/ti,opt3001.yaml b/dts/bindings/sensor/ti,opt3001.yaml
index 4c5fd7e5c358c..89d102e3ac72b 100644
--- a/dts/bindings/sensor/ti,opt3001.yaml
+++ b/dts/bindings/sensor/ti,opt3001.yaml
@@ -6,3 +6,9 @@ description: Texas Instruments OPT3001 ambient light sensor
 compatible: "ti,opt3001"
 
 include: [sensor-device.yaml, i2c-device.yaml]
+
+properties:
+  int-gpios:
+    type: phandle-array
+    description: |
+      Interrupt pin on the opt3001 where the default polarity is active low.
diff --git a/dts/bindings/sensor/ti,tmp112.yaml b/dts/bindings/sensor/ti,tmp112.yaml
index 8708dbd39eb9c..36346e6c2344c 100644
--- a/dts/bindings/sensor/ti,tmp112.yaml
+++ b/dts/bindings/sensor/ti,tmp112.yaml
@@ -19,6 +19,21 @@ properties:
       - 1000
       - 4000
       - 8000
+
   extended-mode:
-    description: When true use 13-bit data format allowing measuring temperature up to 128°C
+    description: When true use 13-bit data format allowing measuring temperature up to 150°C
     type: boolean
+
+  t-low-micro-c:
+    description: |
+      Sets the default tLow threshold in micro-Celsius. The default value is the chip reset
+      value.
+    type: int
+    default: 75000000
+
+  t-high-micro-c:
+    description: |
+      Sets the default tHigh threshold in micro-Celsius. The default value is the chip reset
+      value.
+    type: int
+    default: 85000000
diff --git a/dts/bindings/sensor/ti,tmp114.yaml b/dts/bindings/sensor/ti,tmp114.yaml
index 494df18109897..e62d2f2e3b809 100644
--- a/dts/bindings/sensor/ti,tmp114.yaml
+++ b/dts/bindings/sensor/ti,tmp114.yaml
@@ -6,3 +6,26 @@ description: Texas Instruments TMP114 temperature sensor
 compatible: "ti,tmp114"
 
 include: [sensor-device.yaml, i2c-device.yaml]
+
+properties:
+  odr:
+    type: int
+    default: 4
+    enum: [0, 1, 2, 3, 4, 5, 6, 7]
+    description: |
+      Specify the default temperature output data rate in milliseconds (ms).
+      Default is power-up configuration (250ms).
+
+      - 0    # TMP114_DT_ODR_6_4_MS
+      - 1    # TMP114_DT_ODR_32_25_MS
+      - 2    # TMP114_DT_ODR_62_5_MS
+      - 3    # TMP114_DT_ODR_125_MS
+      - 4    # TMP114_DT_ODR_250_MS
+      - 5    # TMP114_DT_ODR_500_MS
+      - 6    # TMP114_DT_ODR_1000_MS
+      - 7    # TMP114_DT_ODR_2000_MS
+
+  oversampling:
+    type: boolean
+    description: |
+      Set averaging of samples.
diff --git a/dts/bindings/sensor/ti,tmp116.yaml b/dts/bindings/sensor/ti,tmp116.yaml
deleted file mode 100644
index a688829da41c6..0000000000000
--- a/dts/bindings/sensor/ti,tmp116.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2019 Centaur Analytics, Inc
-# SPDX-License-Identifier: Apache-2.0
-
-description: Texas Instruments TMP116 temperature sensor
-
-compatible: "ti,tmp116"
-
-bus: tmp116
-
-include: [sensor-device.yaml, i2c-device.yaml]
-
-properties:
-  odr:
-    type: int
-    default: 0x200
-    enum: [0, 0x80, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380]
-    description: |
-      Specify the default temperature output data rate in milliseconds (ms).
-      Default is power-up configuration.
-
-      - 0     # TMP116_DT_ODR_15_5_MS
-      - 0x80  # TMP116_DT_ODR_125_MS
-      - 0x100 # TMP116_DT_ODR_250_MS
-      - 0x180 # TMP116_DT_ODR_500_MS
-      - 0x200 # TMP116_DT_ODR_1000_MS
-      - 0x280 # TMP116_DT_ODR_4000_MS
-      - 0x300 # TMP116_DT_ODR_8000_MS
-      - 0x380 # TMP116_DT_ODR_16000_MS
-  oversampling:
-    type: int
-    default: 0x20
-    enum: [0, 0x20, 0x40, 0x60]
-    description: |
-      Set number of sample to averaging in one readout.
-      Default is power-up configuration (8 samples).
-
-      - 0    # TMP116_DT_OVERSAMPLING_1
-      - 0x20 # TMP116_DT_OVERSAMPLING_8
-      - 0x40 # TMP116_DT_OVERSAMPLING_32
-      - 0x60 # TMP116_DT_OVERSAMPLING_64
diff --git a/dts/bindings/sensor/ti,tmp11x.yaml b/dts/bindings/sensor/ti,tmp11x.yaml
new file mode 100644
index 0000000000000..a6207360db76d
--- /dev/null
+++ b/dts/bindings/sensor/ti,tmp11x.yaml
@@ -0,0 +1,40 @@
+# Copyright (c) 2019 Centaur Analytics, Inc
+# SPDX-License-Identifier: Apache-2.0
+
+description: Texas Instruments TMP11X temperature sensor
+
+compatible: "ti,tmp11x"
+
+bus: tmp11x
+
+include: [sensor-device.yaml, i2c-device.yaml]
+
+properties:
+  odr:
+    type: int
+    default: 0x200
+    enum: [0, 0x80, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380]
+    description: |
+      Specify the default temperature output data rate in milliseconds (ms).
+      Default is power-up configuration.
+
+      - 0     # TMP11X_DT_ODR_15_5_MS
+      - 0x80  # TMP11X_DT_ODR_125_MS
+      - 0x100 # TMP11X_DT_ODR_250_MS
+      - 0x180 # TMP11X_DT_ODR_500_MS
+      - 0x200 # TMP11X_DT_ODR_1000_MS
+      - 0x280 # TMP11X_DT_ODR_4000_MS
+      - 0x300 # TMP11X_DT_ODR_8000_MS
+      - 0x380 # TMP11X_DT_ODR_16000_MS
+  oversampling:
+    type: int
+    default: 0x20
+    enum: [0, 0x20, 0x40, 0x60]
+    description: |
+      Set number of sample to averaging in one readout.
+      Default is power-up configuration (8 samples).
+
+      - 0    # TMP11X_DT_OVERSAMPLING_1
+      - 0x20 # TMP11X_DT_OVERSAMPLING_8
+      - 0x40 # TMP11X_DT_OVERSAMPLING_32
+      - 0x60 # TMP11X_DT_OVERSAMPLING_64
diff --git a/dts/bindings/sensor/vishay,veml6031.yaml b/dts/bindings/sensor/vishay,veml6031.yaml
new file mode 100644
index 0000000000000..4ebc5d25bcceb
--- /dev/null
+++ b/dts/bindings/sensor/vishay,veml6031.yaml
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Andreas Klinger
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+    Vishay VEML6031 High Accuracy Ambient Light Sensor With I2C Interface.
+    See: https://www.vishay.com/docs/80007/veml6031x00.pdf
+
+compatible: "vishay,veml6031"
+
+include: [sensor-device.yaml, i2c-device.yaml]
diff --git a/dts/bindings/sensor/we,wsen-pads-2511020213301-common.yaml b/dts/bindings/sensor/we,wsen-pads-2511020213301-common.yaml
index eb54b440c6393..9a6553b595e55 100644
--- a/dts/bindings/sensor/we,wsen-pads-2511020213301-common.yaml
+++ b/dts/bindings/sensor/we,wsen-pads-2511020213301-common.yaml
@@ -41,7 +41,7 @@ properties:
   additional-low-pass-filter:
     type: boolean
     description: |
-      Enable or disable the addtional low pass filter of the sensor.
+      Enable or disable the additional low pass filter of the sensor.
 
   additional-low-pass-filter-configuration:
     type: int
@@ -50,7 +50,7 @@ properties:
     - 0
     - 1
     description: |
-      Configuration of the addtional low pass filter of the sensor.
+      Configuration of the additional low pass filter of the sensor.
       Defaults to 0, which is the configuration at power-up.
 
   threshold:
diff --git a/dts/bindings/serial/arm,cmsdk-uart.yaml b/dts/bindings/serial/arm,cmsdk-uart.yaml
index 88288c15169aa..efb690c65fcc5 100644
--- a/dts/bindings/serial/arm,cmsdk-uart.yaml
+++ b/dts/bindings/serial/arm,cmsdk-uart.yaml
@@ -2,7 +2,7 @@ description: ARM CMSDK UART
 
 compatible: "arm,cmsdk-uart"
 
-include: uart-controller.yaml
+include: [uart-controller.yaml, pinctrl-device.yaml]
 
 properties:
   reg:
diff --git a/dts/bindings/serial/arm,pl011.yaml b/dts/bindings/serial/arm,pl011.yaml
index 6029b28fd4089..add76a7ca0a7d 100644
--- a/dts/bindings/serial/arm,pl011.yaml
+++ b/dts/bindings/serial/arm,pl011.yaml
@@ -10,3 +10,7 @@ properties:
 
   interrupts:
     required: true
+
+  fifo-disable:
+    type: boolean
+    description: Disable the UART FIFO
diff --git a/dts/bindings/serial/espressif,esp32-lpuart.yaml b/dts/bindings/serial/espressif,esp32-lpuart.yaml
new file mode 100644
index 0000000000000..c68023745719c
--- /dev/null
+++ b/dts/bindings/serial/espressif,esp32-lpuart.yaml
@@ -0,0 +1,40 @@
+description: ESP32 Low Power UART
+
+compatible: "espressif,esp32-lpuart"
+
+include: uart-controller.yaml
+
+properties:
+  reg:
+    required: true
+
+  tx-pin:
+    type: int
+    default: 5
+    enum:
+      - 5
+    description: In ESP32-C6, TX pin is fixed to GPIO5
+
+  rx-pin:
+    type: int
+    default: 4
+    enum:
+      - 4
+    description: In ESP32-C6, RX pin is fixed to GPIO4
+
+  rts-pin:
+    type: int
+    default: 2
+    enum:
+      - 2
+    description: In ESP32-C6, RTS pin is fixed to GPIO2
+
+  cts-pin:
+    type: int
+    default: 3
+    enum:
+      - 3
+    description: In ESP32-C6, CTS pin is fixed to GPIO3
+
+  current-speed:
+    type: int
diff --git a/dts/bindings/serial/ite,it51xxx-uart.yaml b/dts/bindings/serial/ite,it51xxx-uart.yaml
new file mode 100644
index 0000000000000..cc6fae88b4b24
--- /dev/null
+++ b/dts/bindings/serial/ite,it51xxx-uart.yaml
@@ -0,0 +1,22 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE, IT51XXX-UART node
+
+compatible: "ite,it51xxx-uart"
+
+include: [uart-controller.yaml]
+
+properties:
+  reg:
+    required: true
+
+  wucctrl:
+    type: phandles
+    description: |
+      WUC groups internal and external inputs, and asserts wake-up
+      signals to INTC that allows the CPU to exit a Doze/Deep
+      Doze/Sleep mode.
+
+  clocks:
+    required: true
diff --git a/dts/bindings/serial/neorv32,uart.yaml b/dts/bindings/serial/neorv32,uart.yaml
new file mode 100644
index 0000000000000..3d9eca3135c42
--- /dev/null
+++ b/dts/bindings/serial/neorv32,uart.yaml
@@ -0,0 +1,24 @@
+description: NEORV32 UART
+
+compatible: "neorv32,uart"
+
+include: uart-controller.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  interrupt-names:
+    required: true
+
+  current-speed:
+    required: true
+
+  syscon:
+    type: phandle
+    required: true
+    description: |
+      phandle to syscon (NEORV32 SYSINFO) node.
diff --git a/dts/bindings/serial/neorv32-uart.yaml b/dts/bindings/serial/neorv32-uart.yaml
deleted file mode 100644
index 8c9b8334c0b24..0000000000000
--- a/dts/bindings/serial/neorv32-uart.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-description: NEORV32 UART
-
-compatible: "neorv32-uart"
-
-include: uart-controller.yaml
-
-properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  interrupt-names:
-    required: true
-
-  current-speed:
-    required: true
-
-  syscon:
-    type: phandle
-    required: true
-    description: |
-      phandle to syscon (NEORV32 SYSINFO) node.
diff --git a/dts/bindings/serial/renesas,ra-uart-sci.yaml b/dts/bindings/serial/renesas,ra-uart-sci.yaml
deleted file mode 100644
index 94229b069247a..0000000000000
--- a/dts/bindings/serial/renesas,ra-uart-sci.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
-# SPDX-License-Identifier: Apache-2.0
-
-description: Renesas RA Series SCI based UART controller
-
-compatible: "renesas,ra-uart-sci"
-
-include: [uart-controller.yaml]
diff --git a/dts/bindings/serial/renesas,rz-sci-uart.yaml b/dts/bindings/serial/renesas,rz-sci-uart.yaml
new file mode 100644
index 0000000000000..cd5807f41321f
--- /dev/null
+++ b/dts/bindings/serial/renesas,rz-sci-uart.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RZ SCI UART controller
+
+compatible: "renesas,rz-sci-uart"
+
+include: [uart-controller.yaml, pinctrl-device.yaml]
diff --git a/dts/bindings/serial/zephyr,native-posix-uart.yaml b/dts/bindings/serial/zephyr,native-posix-uart.yaml
index 7cd8d186e8364..1357a1996061d 100644
--- a/dts/bindings/serial/zephyr,native-posix-uart.yaml
+++ b/dts/bindings/serial/zephyr,native-posix-uart.yaml
@@ -6,3 +6,5 @@ description: Native POSIX UART
 compatible: "zephyr,native-posix-uart"
 
 include: uart-controller.yaml
+
+# This binding is deprecated in favor of zephyr,native-pty-uart
diff --git a/dts/bindings/serial/zephyr,native-pty-uart.yaml b/dts/bindings/serial/zephyr,native-pty-uart.yaml
new file mode 100644
index 0000000000000..56d2312b19d45
--- /dev/null
+++ b/dts/bindings/serial/zephyr,native-pty-uart.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2019, Jan Van Winkel (jan.van_winkel@dxplore.eu)
+# SPDX-License-Identifier: Apache-2.0
+
+description: Native PTY UART
+
+compatible: "zephyr,native-pty-uart"
+
+include: uart-controller.yaml
diff --git a/dts/bindings/shi/ite,it8xxx2-shi.yaml b/dts/bindings/shi/ite,it8xxx2-shi.yaml
index f7cc28c0d2461..1aa9135770678 100644
--- a/dts/bindings/shi/ite,it8xxx2-shi.yaml
+++ b/dts/bindings/shi/ite,it8xxx2-shi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Google LLC
 # SPDX-License-Identifier: Apache-2.0
 
-description: ITE, IT8XXX2 Serial Host Interface (SHI) node
+description: ITE IT8XXX2 Serial Host Interface (SHI)
 
 compatible: "ite,it8xxx2-shi"
 
diff --git a/dts/bindings/shi/nuvoton,npcx-shi-enhanced.yaml b/dts/bindings/shi/nuvoton,npcx-shi-enhanced.yaml
index dc197fb6fd823..8483af14168e5 100644
--- a/dts/bindings/shi/nuvoton,npcx-shi-enhanced.yaml
+++ b/dts/bindings/shi/nuvoton,npcx-shi-enhanced.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Google LLC
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX Serial Host Interface (SHI) node
+description: Nuvoton NPCX Serial Host Interface (SHI)
 
 compatible: "nuvoton,npcx-shi-enhanced"
 
diff --git a/dts/bindings/shi/nuvoton,npcx-shi.yaml b/dts/bindings/shi/nuvoton,npcx-shi.yaml
index b24e3f3100a4b..27a20be3106a5 100644
--- a/dts/bindings/shi/nuvoton,npcx-shi.yaml
+++ b/dts/bindings/shi/nuvoton,npcx-shi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Google LLC
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX Serial Host Interface (SHI) node
+description: Nuvoton NPCX Serial Host Interface (SHI)
 
 compatible: "nuvoton,npcx-shi"
 
diff --git a/dts/bindings/smbus/intel,pch-smbus.yaml b/dts/bindings/smbus/intel,pch-smbus.yaml
index b3475f3ae31fb..d1e51fcc9607f 100644
--- a/dts/bindings/smbus/intel,pch-smbus.yaml
+++ b/dts/bindings/smbus/intel,pch-smbus.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Intel Platform Controller Hub SMBus node
+description: Intel Platform Controller Hub SMBus
 
 compatible: "intel,pch-smbus"
 
diff --git a/dts/bindings/spi/ambiq,mspi.yaml b/dts/bindings/spi/ambiq,mspi.yaml
index 0c48f6605e664..0e8caa7bc738c 100644
--- a/dts/bindings/spi/ambiq,mspi.yaml
+++ b/dts/bindings/spi/ambiq,mspi.yaml
@@ -5,7 +5,7 @@ description: Ambiq MSPI
 
 compatible: "ambiq,mspi"
 
-include: [spi-controller.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
+include: [spi-controller.yaml, pinctrl-device.yaml]
 
 properties:
   reg:
@@ -13,6 +13,3 @@ properties:
 
   interrupts:
     required: true
-
-  ambiq,pwrcfg:
-    required: true
diff --git a/dts/bindings/spi/ambiq,spi-bleif.yaml b/dts/bindings/spi/ambiq,spi-bleif.yaml
index 2be2ee1b9f8a2..3983c87195df1 100644
--- a/dts/bindings/spi/ambiq,spi-bleif.yaml
+++ b/dts/bindings/spi/ambiq,spi-bleif.yaml
@@ -8,11 +8,8 @@ description: |
 
 compatible: "ambiq,spi-bleif"
 
-include: [spi-controller.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
+include: [spi-controller.yaml, pinctrl-device.yaml]
 
 properties:
   reg:
     required: true
-
-  ambiq,pwrcfg:
-    required: true
diff --git a/dts/bindings/spi/ambiq,spi.yaml b/dts/bindings/spi/ambiq,spi.yaml
index 425c7fc44eeb9..aff02ab65a63b 100644
--- a/dts/bindings/spi/ambiq,spi.yaml
+++ b/dts/bindings/spi/ambiq,spi.yaml
@@ -5,17 +5,4 @@ description: Ambiq SPI
 
 compatible: "ambiq,spi"
 
-include: [spi-controller.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
-
-properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
-  clock-frequency:
-    required: true
-
-  ambiq,pwrcfg:
-    required: true
+include: [spi-controller.yaml, pinctrl-device.yaml]
diff --git a/dts/bindings/spi/ambiq,spid.yaml b/dts/bindings/spi/ambiq,spid.yaml
index d6d4be55c8372..c04db4ac09f9b 100644
--- a/dts/bindings/spi/ambiq,spid.yaml
+++ b/dts/bindings/spi/ambiq,spid.yaml
@@ -5,7 +5,7 @@ description: Ambiq SPI Device
 
 compatible: "ambiq,spid"
 
-include: [spi-controller.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
+include: [spi-controller.yaml, pinctrl-device.yaml]
 
 properties:
   int-gpios:
diff --git a/dts/bindings/spi/arm,pl022.yaml b/dts/bindings/spi/arm,pl022.yaml
index 2e5094bf204a5..f83d1d28f5855 100644
--- a/dts/bindings/spi/arm,pl022.yaml
+++ b/dts/bindings/spi/arm,pl022.yaml
@@ -5,7 +5,7 @@ description: ARM PL022 SPI
 
 compatible: "arm,pl022"
 
-include: [spi-controller.yaml, pinctrl-device.yaml]
+include: [spi-controller.yaml, pinctrl-device.yaml, reset-device.yaml]
 
 properties:
   reg:
diff --git a/dts/bindings/spi/cdns,spi.yaml b/dts/bindings/spi/cdns,spi.yaml
new file mode 100644
index 0000000000000..e4964f7fbf9e7
--- /dev/null
+++ b/dts/bindings/spi/cdns,spi.yaml
@@ -0,0 +1,58 @@
+# Copyright (c) 2024, Meta Platforms
+# SPDX-License-Identifier: Apache-2.0
+
+description: Cadence SPI controller
+
+compatible: "cdns,spi"
+
+include: [spi-controller.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  clock-frequency:
+    required: true
+
+  clock-frequency-ext:
+    type: int
+
+  fifo-width:
+    type: int
+    required: true
+    enum:
+      - 8
+      - 16
+      - 24
+      - 32
+    description: |
+      The total fifo width in bits
+
+  rx-fifo-depth:
+    type: int
+    required: true
+    enum:
+      - 8
+      - 16
+      - 32
+      - 64
+      - 128
+      - 256
+    description: |
+      The depth of the rx fifo
+
+  tx-fifo-depth:
+    type: int
+    required: true
+    enum:
+      - 8
+      - 16
+      - 32
+      - 64
+      - 128
+      - 256
+    description: |
+      The depth of the tx fifo
diff --git a/dts/bindings/spi/cypress,psoc6-spi.yaml b/dts/bindings/spi/cypress,psoc6-spi.yaml
index 3a162ec2cd3ac..7d3b5011b7cc6 100644
--- a/dts/bindings/spi/cypress,psoc6-spi.yaml
+++ b/dts/bindings/spi/cypress,psoc6-spi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021, ATL Electronics
 # SPDX-License-Identifier: Apache-2.0
 
-description: Cypress SBC[SPI]
+description: Cypress SBC SPI controller
 
 compatible: "cypress,psoc6-spi"
 
diff --git a/dts/bindings/spi/microchip,mpfs-qspi.yaml b/dts/bindings/spi/microchip,mpfs-qspi.yaml
index ab3c66809b3ed..c38b0e557beb2 100644
--- a/dts/bindings/spi/microchip,mpfs-qspi.yaml
+++ b/dts/bindings/spi/microchip,mpfs-qspi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Microchip Technology Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Microchip Polarfire SOC QSPI IP node
+description: Microchip Polarfire SOC QSPI controller
 
 compatible: "microchip,mpfs-qspi"
 
diff --git a/dts/bindings/spi/microchip,mpfs-spi.yaml b/dts/bindings/spi/microchip,mpfs-spi.yaml
index 7ec6536ca83a3..b76a643e471b1 100644
--- a/dts/bindings/spi/microchip,mpfs-spi.yaml
+++ b/dts/bindings/spi/microchip,mpfs-spi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Microchip Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Microchip Polarfire SOC SPI IP node
+description: Microchip Polarfire SOC SPI controller
 
 compatible: "microchip,mpfs-spi"
 
diff --git a/dts/bindings/spi/microchip,xec-qmspi.yaml b/dts/bindings/spi/microchip,xec-qmspi.yaml
index 11a5577a0c6d4..4be75d6bdd5dc 100644
--- a/dts/bindings/spi/microchip,xec-qmspi.yaml
+++ b/dts/bindings/spi/microchip,xec-qmspi.yaml
@@ -11,7 +11,7 @@ properties:
   reg:
     required: true
 
-  port_sel:
+  port-sel:
     type: int
     required: true
     description: SPI Port 0 or 1.
@@ -37,7 +37,7 @@ properties:
     required: true
     description: QMSPI lines 1, 2, or 4
 
-  chip_select:
+  chip-select:
     type: int
     required: true
     description: Use QMSPI CS0# or CS1#
diff --git a/dts/bindings/spi/nordic,nrf-exmif.yaml b/dts/bindings/spi/nordic,nrf-exmif.yaml
deleted file mode 100644
index d2b8815046b5b..0000000000000
--- a/dts/bindings/spi/nordic,nrf-exmif.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-description: Nordic External Memory Interface (EXMIF)
-
-compatible: "nordic,nrf-exmif"
-
-include: snps,designware-spi.yaml
-
-properties:
-  reg:
-    required: true
diff --git a/dts/bindings/spi/nxp,lpspi.yaml b/dts/bindings/spi/nxp,lpspi.yaml
index 62a11d42ac0de..4064b85c70380 100644
--- a/dts/bindings/spi/nxp,lpspi.yaml
+++ b/dts/bindings/spi/nxp,lpspi.yaml
@@ -31,7 +31,7 @@ properties:
   transfer-delay:
     type: int
     description: |
-      Delay in nanoseconds between last SCK edge of a trasnfer word and the
+      Delay in nanoseconds between last SCK edge of a transfer word and the
       first SCK edge of the next transfer word.
       If not set, the minimum supported delay is used.
 
diff --git a/dts/bindings/spi/raspberrypi,pico-spi.yaml b/dts/bindings/spi/raspberrypi,pico-spi.yaml
index e039bcf7d1f96..ad5a23baaa3d5 100644
--- a/dts/bindings/spi/raspberrypi,pico-spi.yaml
+++ b/dts/bindings/spi/raspberrypi,pico-spi.yaml
@@ -2,4 +2,4 @@ description: Raspberry Pi Pico SPI
 
 compatible: "raspberrypi,pico-spi"
 
-include: ["arm,pl022.yaml", "reset-device.yaml"]
+include: "arm,pl022.yaml"
diff --git a/dts/bindings/spi/snps,designware-spi.yaml b/dts/bindings/spi/snps,designware-spi.yaml
index 01073f8d0039a..16badb5b8ed8c 100644
--- a/dts/bindings/spi/snps,designware-spi.yaml
+++ b/dts/bindings/spi/snps,designware-spi.yaml
@@ -2,7 +2,7 @@
 # Copyright (c) 2023 Meta Platforms All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Synopsys DesignWare SPI node
+description: Synopsys DesignWare SPI controller
 
 compatible: "snps,designware-spi"
 
diff --git a/dts/bindings/spi/st,stm32-spi-host-cmd.yaml b/dts/bindings/spi/st,stm32-spi-host-cmd.yaml
index db5cb55d5f2d3..944048315f65c 100644
--- a/dts/bindings/spi/st,stm32-spi-host-cmd.yaml
+++ b/dts/bindings/spi/st,stm32-spi-host-cmd.yaml
@@ -3,6 +3,7 @@
 
 description: |
         Host Command version of STM32 SPI controller.
+
         All properties are the same, but a different driver is used.
 
 compatible: "st,stm32-spi-host-cmd"
diff --git a/dts/bindings/spi/st,stm32h7-spi.yaml b/dts/bindings/spi/st,stm32h7-spi.yaml
index 69f1a8c52ae70..252d6b09d4a29 100644
--- a/dts/bindings/spi/st,stm32h7-spi.yaml
+++ b/dts/bindings/spi/st,stm32h7-spi.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-        STM32H7 SPI controller
+        STM32H7 SPI controller.
+
         This compatible stands for all SPI hardware blocks matching the
         version available in STM32H7 SoCs.
         This version of STM32 SPI hardware block could be identified by the
diff --git a/dts/bindings/spi/ti,cc13xx-cc26xx-spi.yaml b/dts/bindings/spi/ti,cc13xx-cc26xx-spi.yaml
index b614c7f4336d6..57ebef93010f4 100644
--- a/dts/bindings/spi/ti,cc13xx-cc26xx-spi.yaml
+++ b/dts/bindings/spi/ti,cc13xx-cc26xx-spi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Brett Witherspoon
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI SimpleLink CC13xx / CC26xx SPI node
+description: TI SimpleLink CC13xx / CC26xx SPI controller
 
 compatible: "ti,cc13xx-cc26xx-spi"
 
diff --git a/dts/bindings/spi/ti,cc23x0-spi.yaml b/dts/bindings/spi/ti,cc23x0-spi.yaml
new file mode 100644
index 0000000000000..c58d46901f2c4
--- /dev/null
+++ b/dts/bindings/spi/ti,cc23x0-spi.yaml
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 BayLibre, SAS
+# SPDX-License-Identifier: Apache-2.0
+
+description: TI SimpleLink CC23x0 SPI controller
+
+compatible: "ti,cc23x0-spi"
+
+include: [spi-controller.yaml, pinctrl-device.yaml, base.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
diff --git a/dts/bindings/spi/xlnx,xps-spi-2.00.a.yaml b/dts/bindings/spi/xlnx,xps-spi-2.00.a.yaml
index 092cbcb2e5bb5..4a26db0a0760b 100644
--- a/dts/bindings/spi/xlnx,xps-spi-2.00.a.yaml
+++ b/dts/bindings/spi/xlnx,xps-spi-2.00.a.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
-description: Xilinx AXI Quad SPI IP node
+description: Xilinx AXI Quad SPI controller
 
 compatible: "xlnx,xps-spi-2.00.a"
 
diff --git a/dts/bindings/sram/mmio-sram.yaml b/dts/bindings/sram/mmio-sram.yaml
index e1255e185c4d6..d8a282bb2e191 100644
--- a/dts/bindings/sram/mmio-sram.yaml
+++ b/dts/bindings/sram/mmio-sram.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-description: Generic on-chip SRAM description
+description: Generic on-chip SRAM
 
 compatible: "mmio-sram"
 
diff --git a/dts/bindings/stepper/adi/adi,tmc2209.yaml b/dts/bindings/stepper/adi/adi,tmc2209.yaml
index 96a13bfe94d6f..17e44b273082f 100644
--- a/dts/bindings/stepper/adi/adi,tmc2209.yaml
+++ b/dts/bindings/stepper/adi/adi,tmc2209.yaml
@@ -19,12 +19,6 @@ compatible: "adi,tmc2209"
 
 include:
   - name: stepper-controller.yaml
-    property-allowlist:
-      - micro-step-res
-      - step-gpios
-      - dir-gpios
-      - en-gpios
-      - counter
 
 properties:
   msx-gpios:
diff --git a/dts/bindings/stepper/allegro/allegro,a4979.yml b/dts/bindings/stepper/allegro/allegro,a4979.yml
new file mode 100644
index 0000000000000..c9e53b7a066c4
--- /dev/null
+++ b/dts/bindings/stepper/allegro/allegro,a4979.yml
@@ -0,0 +1,43 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 Carl Zeiss Meditec AG
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  Allegro A4979 microstepping stepper motor driver.
+  A4979 is a flexible microstepping motor driver with built-in translator for easy operation.
+  It is designed to operate bipolar stepper motors in full-, half-, quarter-, and sixteenth-step
+  modes.
+
+  Example:
+  a4979: a4979 {
+      status = "okay";
+      compatible = "allegro,a4979";
+      micro-step-res = <2>;
+      reset-gpios = <&gpiod 10 GPIO_ACTIVE_HIGH>;
+      dir-gpios = <&gpiod 14 GPIO_ACTIVE_HIGH>;
+      step-gpios = <&gpiod 15 GPIO_ACTIVE_HIGH>;
+      en-gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>;
+      m0-gpios = <&gpiod 13 0>;
+      m1-gpios = <&gpiod 12 0>;
+      counter = <&counter5>;
+  };
+
+compatible: "allegro,a4979"
+
+include:
+  - name: stepper-controller.yaml
+
+properties:
+  m0-gpios:
+    required: true
+    type: phandle-array
+    description: Microstep configuration pin 0.
+
+  m1-gpios:
+    required: true
+    type: phandle-array
+    description: Microstep configuration pin 1.
+
+  reset-gpios:
+    type: phandle-array
+    required: true
+    description: Reset pin
diff --git a/dts/bindings/stepper/ti/ti,drv8424.yaml b/dts/bindings/stepper/ti/ti,drv8424.yaml
deleted file mode 100644
index e02d85e5026aa..0000000000000
--- a/dts/bindings/stepper/ti/ti,drv8424.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
-# SPDX-License-Identifier: Apache-2.0
-
-description: |
-  TI DRV8424 stepper motor driver.
-  SAFETY:
-  The counter needs to support both set_top_value functionalities: Setting a new top value and
-  attaching an ISR to the turnaround.
-  SAFETY:
-  The step gpio pin needs to be connected directly to the SOC GPIO controller, connecting the
-  pin to a controller connected via a bus such as i2c or others will lead to undefined behaviour.
-
-  Example:
-  drv8424: drv8424 {
-    status = "okay";
-    compatible = "ti,drv8424";
-
-    dir-gpios = <&arduino_header 18 0>;
-    step-gpios = <&arduino_header 19 0>;
-    sleep-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>;
-    en-gpios  = <&arduino_header 14 0>;
-    m0-gpios = <&mikroe_stepper_gpios 0 0>;
-    m1-gpios = <&mikroe_stepper_gpios 1 0>;
-    counter = <&counter2>;
-  };
-
-
-compatible: "ti,drv8424"
-
-include:
-  - name: stepper-controller.yaml
-    property-allowlist:
-      - micro-step-res
-      - step-gpios
-      - dir-gpios
-      - en-gpios
-      - counter
-
-properties:
-  fault-gpios:
-    type: phandle-array
-    description: Fault pin.
-
-  sleep-gpios:
-    type: phandle-array
-    description: Sleep pin (active low).
-
-  m0-gpios:
-    required: true
-    type: phandle-array
-    description: Microstep configuration pin 0.
-
-  m1-gpios:
-    required: true
-    type: phandle-array
-    description: Microstep configuration pin 1.
diff --git a/dts/bindings/stepper/ti/ti,drv84xx.yaml b/dts/bindings/stepper/ti/ti,drv84xx.yaml
new file mode 100644
index 0000000000000..3b891d1d17c36
--- /dev/null
+++ b/dts/bindings/stepper/ti/ti,drv84xx.yaml
@@ -0,0 +1,50 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  TI DRV84XX stepper motor driver.
+  Compatible with drv8424, drv8425, drv8426, drv8434 and drv8436.
+  SAFETY:
+  The counter needs to support both set_top_value functionalities: Setting a new top value and
+  attaching an ISR to the turnaround.
+  SAFETY:
+  The step gpio pin needs to be connected directly to the SOC GPIO controller, connecting the
+  pin to a controller connected via a bus such as i2c or others will lead to undefined behaviour.
+
+  Example:
+  drv8424: drv8424 {
+    status = "okay";
+    compatible = "ti,drv84xx";
+
+    dir-gpios = <&arduino_header 18 0>;
+    step-gpios = <&arduino_header 19 0>;
+    fault-gpios = <&arduino_header 16 0>;
+    sleep-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>;
+    en-gpios  = <&arduino_header 14 0>;
+    m0-gpios = <&mikroe_stepper_gpios 0 0>;
+    m1-gpios = <&mikroe_stepper_gpios 1 0>;
+    counter = <&counter2>;
+  };
+
+
+compatible: "ti,drv84xx"
+
+include:
+  - name: stepper-controller.yaml
+
+properties:
+  fault-gpios:
+    type: phandle-array
+    description: Fault pin.
+
+  sleep-gpios:
+    type: phandle-array
+    description: Sleep pin (active low).
+
+  m0-gpios:
+    type: phandle-array
+    description: Microstep configuration pin 0.
+
+  m1-gpios:
+    type: phandle-array
+    description: Microstep configuration pin 1.
diff --git a/dts/bindings/tach/ene,kb1200-tach.yaml b/dts/bindings/tach/ene,kb1200-tach.yaml
index 4f89d9a882de2..d263d4659d779 100644
--- a/dts/bindings/tach/ene,kb1200-tach.yaml
+++ b/dts/bindings/tach/ene,kb1200-tach.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 ENE Technology Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ENE, KB1200-Tachometer node
+description: ENE KB1200 Tachometer
 
 compatible: "ene,kb1200-tach"
 
diff --git a/dts/bindings/tach/ite,it8xxx2-tach.yaml b/dts/bindings/tach/ite,it8xxx2-tach.yaml
index d00d4eca3c429..2558a66d1ebec 100644
--- a/dts/bindings/tach/ite,it8xxx2-tach.yaml
+++ b/dts/bindings/tach/ite,it8xxx2-tach.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 ITE Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: ITE, it8xxx2 Tachometer node
+description: ITE IT8xxx2 Tachometer
 
 compatible: "ite,it8xxx2-tach"
 
diff --git a/dts/bindings/tach/nuvoton,npcx-tach.yaml b/dts/bindings/tach/nuvoton,npcx-tach.yaml
index 8a2c35ae00448..48def30def024 100644
--- a/dts/bindings/tach/nuvoton,npcx-tach.yaml
+++ b/dts/bindings/tach/nuvoton,npcx-tach.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX-Tachometer node
+description: Nuvoton NPCX Tachometer
 
 compatible: "nuvoton,npcx-tach"
 
diff --git a/dts/bindings/tach/realtek,rts5912-tach.yaml b/dts/bindings/tach/realtek,rts5912-tach.yaml
new file mode 100644
index 0000000000000..1d72ce8bb0b34
--- /dev/null
+++ b/dts/bindings/tach/realtek,rts5912-tach.yaml
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2025 Realtek Semiconductor Corporation, SIBG-SD7
+#
+
+description: Realtek rts5912 tachometer controller
+
+compatible: "realtek,rts5912-tach"
+
+include: [tach.yaml, pinctrl-device.yaml, sensor-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  pulses-per-round:
+    type: int
+    required: true
+    description: number of pulses per round of tachometer's input
diff --git a/dts/bindings/tcpc/st,stm32-ucpd.yaml b/dts/bindings/tcpc/st,stm32-ucpd.yaml
index 8d49b78a31a42..93b72faf0a9ef 100644
--- a/dts/bindings/tcpc/st,stm32-ucpd.yaml
+++ b/dts/bindings/tcpc/st,stm32-ucpd.yaml
@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    ST STM32 family USB Type-C / Power Delivery. The default values were
-    taken from the LL_UCPD_StructInit function defined in the HAL.
+    STM32 USB Type-C / Power Delivery.
+
+    The default values were taken from the LL_UCPD_StructInit function defined in the HAL.
 
 compatible: "st,stm32-ucpd"
 
diff --git a/dts/bindings/timer/espressif,esp32-systimer.yaml b/dts/bindings/timer/espressif,esp32-systimer.yaml
index bc08df7e39c53..f9289886b4c7f 100644
--- a/dts/bindings/timer/espressif,esp32-systimer.yaml
+++ b/dts/bindings/timer/espressif,esp32-systimer.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif ESP32 Systimer peripheral
+description: ESP32 System Timer
 
 compatible: "espressif,esp32-systimer"
 
diff --git a/dts/bindings/timer/ite,it51xxx-timer.yaml b/dts/bindings/timer/ite,it51xxx-timer.yaml
new file mode 100644
index 0000000000000..825b3332b76bb
--- /dev/null
+++ b/dts/bindings/timer/ite,it51xxx-timer.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE it51xxx external timer
+
+compatible: "ite,it51xxx-timer"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/timer/microchip,xec-rtos-timer.yaml b/dts/bindings/timer/microchip,xec-rtos-timer.yaml
index 7099bca798a9d..509634082ddd0 100644
--- a/dts/bindings/timer/microchip,xec-rtos-timer.yaml
+++ b/dts/bindings/timer/microchip,xec-rtos-timer.yaml
@@ -18,3 +18,9 @@ properties:
     type: array
     required: true
     description: Array of GIRQ numbers [8:26] and bit positions [0:31].
+
+  clock-frequency:
+    type: int
+    required: true
+    const: 32768
+    description: RTOS timer runs at fixed 32 KHz.
diff --git a/dts/bindings/timer/nordic,nrf-grtc.yaml b/dts/bindings/timer/nordic,nrf-grtc.yaml
index e78e57df97e29..edff2423b1190 100644
--- a/dts/bindings/timer/nordic,nrf-grtc.yaml
+++ b/dts/bindings/timer/nordic,nrf-grtc.yaml
@@ -4,18 +4,40 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: Nordic GRTC (Global RTC)
+description: |
+  Nordic GRTC (Global RTC)
+
+      Example of using clock outputs:
+        &grtc {
+          pinctrl-0 = <&grtc_default>;
+          pinctrl-1 = <&grtc_sleep>;
+          pinctrl-names = "default", "sleep";
+          clkout-fast-frequency-hz = <8000000>;
+          clkout-32k;
+          /* In case of nRF54H20 devices: */
+          nordic,clockpin-enable = <NRF_FUN_GRTC_CLKOUT_FAST>;
+        };
 
 compatible: "nordic,nrf-grtc"
 
 include:
   - "base.yaml"
   - "nordic,split-channels.yaml"
+  - "pinctrl-device.yaml"
+  - "nordic-clockpin.yaml"
 
 properties:
   reg:
     required: true
 
+  clkout-fast-frequency-hz:
+    type: int
+    description: Fast output clock frequency.
+
+  clkout-32k:
+    type: boolean
+    description: 32768 Hz output clock frequency enable.
+
   interrupts:
     required: true
 
diff --git a/dts/bindings/timer/nuvoton,npcx-itim-timer.yaml b/dts/bindings/timer/nuvoton,npcx-itim-timer.yaml
index 4e538507727c6..c12301c9bf37e 100644
--- a/dts/bindings/timer/nuvoton,npcx-itim-timer.yaml
+++ b/dts/bindings/timer/nuvoton,npcx-itim-timer.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX Internal Timer (ITIM) node
+description: Nuvoton NPCX Internal Timer (ITIM)
 
 compatible: "nuvoton,npcx-itim-timer"
 
diff --git a/dts/bindings/timer/renesas,ra-ulpt-timer.yaml b/dts/bindings/timer/renesas,ra-ulpt-timer.yaml
new file mode 100644
index 0000000000000..7c01129b87584
--- /dev/null
+++ b/dts/bindings/timer/renesas,ra-ulpt-timer.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RA ULPT TIMER
+
+compatible: "renesas,ra-ulpt-timer"
+
+include: base.yaml
diff --git a/dts/bindings/timer/silabs,gecko-timer.yaml b/dts/bindings/timer/silabs,gecko-timer.yaml
index 7953ae2bf1c4d..1868be606c0d5 100644
--- a/dts/bindings/timer/silabs,gecko-timer.yaml
+++ b/dts/bindings/timer/silabs,gecko-timer.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021, Sun Amar
 # SPDX-License-Identifier: Apache-2.0
 
-description: Silabs gecko timer node
+description: Silabs Gecko timer
 
 compatible: "silabs,gecko-timer"
 
diff --git a/dts/bindings/timer/st,stm32-lptim.yaml b/dts/bindings/timer/st,stm32-lptim.yaml
index 159d8bdff0038..31e4ea0e8efd3 100644
--- a/dts/bindings/timer/st,stm32-lptim.yaml
+++ b/dts/bindings/timer/st,stm32-lptim.yaml
@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  STM32 lptim : low power timer
+  STM32 low-power timer (LPTIM).
+
   The lptim node to be used for counting ticks during lowpower modes
   must be named stm32_lp_tick_source in the DTS, as follows:
   stm32_lp_tick_source: &lptim1 {
diff --git a/dts/bindings/timer/ti,cc13xx-cc26xx-timer.yaml b/dts/bindings/timer/ti,cc13xx-cc26xx-timer.yaml
index 33712c4364ab8..fff487807bb5f 100644
--- a/dts/bindings/timer/ti,cc13xx-cc26xx-timer.yaml
+++ b/dts/bindings/timer/ti,cc13xx-cc26xx-timer.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Zephyr Project
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI SimpleLink CC13xx/CC26xx Timer Node
+description: TI SimpleLink CC13xx/CC26xx Timer
 
 compatible: "ti,cc13xx-cc26xx-timer"
 
diff --git a/dts/bindings/timer/ti,cc23x0-timer.yaml b/dts/bindings/timer/ti,cc23x0-timer.yaml
index 94b70e1a145ec..e43acb09cf516 100644
--- a/dts/bindings/timer/ti,cc23x0-timer.yaml
+++ b/dts/bindings/timer/ti,cc23x0-timer.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Baylibre SAS
 # SPDX-License-Identifier: Apache-2.0
 
-description: TI SimpleLink CC23x0 Timer Node
+description: TI SimpleLink CC23x0 Timer
 
 compatible: "ti,cc23x0-systim-timer"
 
diff --git a/dts/bindings/usb/adi,max32-usbhs.yaml b/dts/bindings/usb/adi,max32-usbhs.yaml
new file mode 100644
index 0000000000000..74de7cd204a6e
--- /dev/null
+++ b/dts/bindings/usb/adi,max32-usbhs.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ADI MAX32 USBHS
+
+compatible: "adi,max32-usbhs"
+
+include: [usb-ep.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  clocks:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/usb/ambiq,usb.yaml b/dts/bindings/usb/ambiq,usb.yaml
index f460e7257cf7d..ecff0bf6fb98b 100644
--- a/dts/bindings/usb/ambiq,usb.yaml
+++ b/dts/bindings/usb/ambiq,usb.yaml
@@ -5,7 +5,7 @@ description: Ambiq USB
 
 compatible: "ambiq,usb"
 
-include: [usb-ep.yaml, pinctrl-device.yaml, ambiq-pwrcfg.yaml]
+include: [usb-ep.yaml, pinctrl-device.yaml]
 
 properties:
   reg:
@@ -14,9 +14,6 @@ properties:
   interrupts:
     required: true
 
-  ambiq,pwrcfg:
-    required: true
-
   vddusb33-gpios:
     type: phandle-array
     description: |
diff --git a/dts/bindings/usb/raspberrypi,pico-usbd.yaml b/dts/bindings/usb/raspberrypi,pico-usbd.yaml
index 26b763e9a7a36..39caa0dddd924 100644
--- a/dts/bindings/usb/raspberrypi,pico-usbd.yaml
+++ b/dts/bindings/usb/raspberrypi,pico-usbd.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  RaspberryPi Pico USB Device Controller.
+  Raspberry Pi Pico USB Device Controller.
 
   Example of enabling the controller with vbus detection:
 
diff --git a/dts/bindings/usb/renesas/renesas,ra-usb.yaml b/dts/bindings/usb/renesas/renesas,ra-usb.yaml
deleted file mode 100644
index ec31e250eb305..0000000000000
--- a/dts/bindings/usb/renesas/renesas,ra-usb.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2024 Renesas Electronics Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-description: Renesas RA USB controller
-
-compatible: "renesas,ra-usb"
-
-include: [pinctrl-device.yaml, usb-ep.yaml]
-
-properties:
-  reg:
-    required: true
-
-  phys:
-    type: phandle
-    description: PHY provider specifier
diff --git a/dts/bindings/usb/renesas/renesas,ra-usbfs.yaml b/dts/bindings/usb/renesas/renesas,ra-usbfs.yaml
new file mode 100644
index 0000000000000..58ec9aa344e83
--- /dev/null
+++ b/dts/bindings/usb/renesas/renesas,ra-usbfs.yaml
@@ -0,0 +1,34 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RA USB full-speed controller
+
+compatible: "renesas,ra-usbfs"
+
+include: [pinctrl-device.yaml, usb-ep.yaml]
+
+properties:
+  phys-clock:
+    type: phandles
+    required: true
+    description: USBFS physical clock.
+
+  interrupts:
+    required: true
+    description: |
+      IRQ number and priority to use for USBFS.
+
+  interrupt-names:
+    required: true
+    enum:
+      - "usbfs-i"
+      - "usbfs-r"
+    description: |
+      Interrupts must be given corresponding names so that the shim driver can recognize them.
+
+  reg:
+    required: true
+
+  phys:
+    type: phandle
+    description: PHY provider specifier
diff --git a/dts/bindings/usb/renesas/renesas,ra-usbhs.yaml b/dts/bindings/usb/renesas/renesas,ra-usbhs.yaml
new file mode 100644
index 0000000000000..9428c2413bc5d
--- /dev/null
+++ b/dts/bindings/usb/renesas/renesas,ra-usbhs.yaml
@@ -0,0 +1,33 @@
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RA USB high-speed controller
+
+compatible: "renesas,ra-usbhs"
+
+include: [pinctrl-device.yaml, usb-ep.yaml]
+
+properties:
+  phys-clock:
+    type: phandles
+    description: |
+      USBHS physical clocks. Should be provided in case internal clock source is set in phys node.
+
+  interrupts:
+    required: true
+    description: |
+      IRQ number and priority to use for USBHS.
+
+  interrupt-names:
+    required: true
+    enum:
+      - "usbhs-ir"
+    description: |
+      Interrupts must be given corresponding names so that the shim driver can recognize them.
+
+  reg:
+    required: true
+
+  phys:
+    type: phandle
+    description: PHY provider specifier
diff --git a/dts/bindings/usb/snps,designware-usb.yaml b/dts/bindings/usb/snps,designware-usb.yaml
index 993e1f738e389..84f4deadd277e 100644
--- a/dts/bindings/usb/snps,designware-usb.yaml
+++ b/dts/bindings/usb/snps,designware-usb.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Synopsys Designware USB Controller node
+description: Synopsys Designware USB controller
 
 compatible: "snps,designware-usb"
 
diff --git a/dts/bindings/usb/st,stm32-otghs-common.yaml b/dts/bindings/usb/st,stm32-otghs-common.yaml
new file mode 100644
index 0000000000000..d1aab33d93ae2
--- /dev/null
+++ b/dts/bindings/usb/st,stm32-otghs-common.yaml
@@ -0,0 +1,27 @@
+# Copyright (c) 2025, STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+# Common fields for STM32 OTGHS controller
+
+include: [usb-ep.yaml, pinctrl-device.yaml]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  ram-size:
+    type: int
+    required: true
+    description: |
+      Size of USB dedicated RAM. STM32 SOC's reference
+      manual defines a shared FIFO size.
+
+  phys:
+    type: phandle
+    description: PHY provider specifier
+
+  clocks:
+    required: true
diff --git a/dts/bindings/usb/st,stm32-otghs.yaml b/dts/bindings/usb/st,stm32-otghs.yaml
index dfd40a9ed3d40..58f4f5b5523ad 100644
--- a/dts/bindings/usb/st,stm32-otghs.yaml
+++ b/dts/bindings/usb/st,stm32-otghs.yaml
@@ -1,35 +1,16 @@
 # Copyright (c) 2017, I-SENSE group of ICCS
+# Copyright (c) 2025, STMicroelectronics
 # SPDX-License-Identifier: Apache-2.0
 
 description: STM32 OTGHS controller
 
 compatible: "st,stm32-otghs"
 
-include: [usb-ep.yaml, pinctrl-device.yaml]
+include: st,stm32-otghs-common.yaml
 
 properties:
-  reg:
-    required: true
-
-  interrupts:
-    required: true
-
   pinctrl-0:
     required: true
 
   pinctrl-names:
     required: true
-
-  ram-size:
-    type: int
-    required: true
-    description: |
-      Size of USB dedicated RAM. STM32 SOC's reference
-      manual defines a shared FIFO size.
-
-  phys:
-    type: phandle
-    description: PHY provider specifier
-
-  clocks:
-    required: true
diff --git a/dts/bindings/usb/st,stm32f4-fsotg.yaml b/dts/bindings/usb/st,stm32f4-fsotg.yaml
index 7b681a362c810..2d657f700998c 100644
--- a/dts/bindings/usb/st,stm32f4-fsotg.yaml
+++ b/dts/bindings/usb/st,stm32f4-fsotg.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 #
-description: STM32F4 SoC series OTG_FS DWC2 compatible controller
+description: STM32F4 OTG_FS DWC2 compatible controller.
 
 compatible: "st,stm32f4-fsotg"
 
diff --git a/dts/bindings/usb/st,stm32n6-otghs.yaml b/dts/bindings/usb/st,stm32n6-otghs.yaml
new file mode 100644
index 0000000000000..b7c73fb728784
--- /dev/null
+++ b/dts/bindings/usb/st,stm32n6-otghs.yaml
@@ -0,0 +1,13 @@
+# Copyright (c) 2025, STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+description: |
+  STM32N6 OTGHS controller
+
+  In the STM32N6 series, the `pinctrl-0` and `pinctrl-names` properties are not required
+  for the USB OTG HS peripheral configuration. This is because the pin multiplexing
+  for the USB OTG HS peripheral are handled automatically by the hardware.
+
+compatible: "st,stm32n6-otghs"
+
+include: st,stm32-otghs-common.yaml
diff --git a/dts/bindings/vendor-prefixes.txt b/dts/bindings/vendor-prefixes.txt
index 70cbb8fbc2a5c..4573335abc7f5 100644
--- a/dts/bindings/vendor-prefixes.txt
+++ b/dts/bindings/vendor-prefixes.txt
@@ -303,6 +303,7 @@ hynitron	Hynitron
 hyundai	Hyundai Technology
 hzgrow	Hangzhou Grow Technology Co., Ltd.
 i2se	I2SE GmbH
+iar	IAR Systems AB
 ibm	International Business Machines (IBM)
 icplus	IC Plus Corp.
 idt	Integrated Device Technologies, Inc.
@@ -358,6 +359,7 @@ kontron	Kontron S&T AG
 kosagi	Sutajio Ko-Usagi PTE Ltd.
 kvaser	Kvaser
 kvg	Kverneland Group
+kws	KWS Computersysteme Gmbh
 kyo	Kyocera Corporation
 lacie	LaCie
 laird	Laird PLC
@@ -380,6 +382,7 @@ linksys	Belkin International, Inc. (Linksys)
 linutronix	Linutronix GmbH
 linux	Linux-specific binding
 linx	Linx Technologies
+liteon	LiteOn OptoElectronics
 litex	LiteX SoC builder
 lltc	Linear Technology Corporation
 logicpd	Logic PD, Inc.
@@ -389,7 +392,6 @@ lontium	Lontium Semiconductor Corporation
 loongson	Loongson Technology Corporation Limited
 lowrisc	lowRISC Community Interest Company
 lsi	LSI Corp. (LSI Logic)
-ltr	LiteOn OptoElectronics
 luatos	LuatOS Team
 lwn	Liebherr-Werk Nenzing GmbH
 lxa	Linux Automation GmbH
@@ -452,6 +454,7 @@ myir	MYIR Tech Limited
 national	National Semiconductor
 nec	NEC LCD Technologies, Ltd.
 neonode	Neonode Inc.
+neorv32	NEORV32 RISC-V Processor
 netgear	NETGEAR
 netlogic	Broadcom Corporation (formerly NetLogic Microsystems)
 netron-dy	Netron DY
@@ -486,6 +489,7 @@ onnn	ON Semiconductor Corp.
 ontat	On Tat Industrial Company
 opalkelly	Opal Kelly Incorporated
 opencores	OpenCores.org
+openhwgroup	OpenHW Group
 openisa	open-isa.org
 openrisc	OpenRISC.io
 openthread	OpenThread.io
@@ -510,8 +514,10 @@ peregrine	Peregrine Consultoria e Servicos
 pericom	Pericom Technology Inc.
 pervasive	Pervasive Displays, Inc.
 phicomm	PHICOMM Co., Ltd.
+phosense	Beijing Phosense Electronic Technology Co., Ltd.
 phytec	PHYTEC
 picochip	Picochip Ltd
+pimoroni	Pimoroni Ltd.
 pine64	Pine64
 pineriver	Shenzhen PineRiver Designs Co., Ltd.
 pixart	PixArt Imaging Inc.
diff --git a/dts/bindings/video/espressif,esp32-cam.yaml b/dts/bindings/video/espressif,esp32-cam.yaml
index 309c1e954f711..2aaef70735495 100644
--- a/dts/bindings/video/espressif,esp32-cam.yaml
+++ b/dts/bindings/video/espressif,esp32-cam.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-description: esp32 LCD CAM Peripheral interface
+description: ESP32 LCD CAM Peripheral interface
 
 compatible: "espressif,esp32-lcd-cam"
 
diff --git a/dts/bindings/video/st,stm32-dcmi.yaml b/dts/bindings/video/st,stm32-dcmi.yaml
index 8381ae0acaf25..567b8d0efa8cb 100644
--- a/dts/bindings/video/st,stm32-dcmi.yaml
+++ b/dts/bindings/video/st,stm32-dcmi.yaml
@@ -5,7 +5,8 @@
 #
 
 description: |
-    STMicroelectronics STM32 Digital Camera Memory Interface (DCMI).
+    STM32 Digital Camera Memory Interface (DCMI).
+
     Example of node configuration at board level:
 
     &dcmi {
diff --git a/dts/bindings/watchdog/espressif,esp32-watchdog.yaml b/dts/bindings/watchdog/espressif,esp32-watchdog.yaml
index 87997e291adfe..9f134359c3a68 100644
--- a/dts/bindings/watchdog/espressif,esp32-watchdog.yaml
+++ b/dts/bindings/watchdog/espressif,esp32-watchdog.yaml
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    ESP32 watchdog. ESP32 contains 3x Watchdog timers, 2x Main System Watchdog
+    ESP32 watchdog.
+
+    ESP32 contains 3x Watchdog timers, 2x Main System Watchdog
     Timer (MWDT), 1x RTC Watchdog Timer (RWDT). RWDT is not supported yet.
 
 compatible: "espressif,esp32-watchdog"
diff --git a/dts/bindings/watchdog/espressif,esp32-xt-wdt.yaml b/dts/bindings/watchdog/espressif,esp32-xt-wdt.yaml
index c20a4234cabc0..4dec4f39f5739 100644
--- a/dts/bindings/watchdog/espressif,esp32-xt-wdt.yaml
+++ b/dts/bindings/watchdog/espressif,esp32-xt-wdt.yaml
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
+    ESP32 XT Watchdog Timer.
+
     This watchdog timer can detect oscillation failure of the RTC_SLOW_CLK_SRC_XTAL32K.
     When such a failure is detected the hardware automatically switch to
     ESP32_RTC_SLOW_CLK_SRC_RC_SLOW.
diff --git a/dts/bindings/watchdog/intel,tco-wdt.yaml b/dts/bindings/watchdog/intel,tco-wdt.yaml
index af1f00902d741..dad010efae5e2 100644
--- a/dts/bindings/watchdog/intel,tco-wdt.yaml
+++ b/dts/bindings/watchdog/intel,tco-wdt.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-description: Intel TCO Watchdog driver binding
+description: Intel TCO Watchdog
 
 compatible: "intel,tco-wdt"
 
diff --git a/dts/bindings/watchdog/ite,it51xxx-watchdog.yaml b/dts/bindings/watchdog/ite,it51xxx-watchdog.yaml
new file mode 100644
index 0000000000000..1c666b9ae70d6
--- /dev/null
+++ b/dts/bindings/watchdog/ite,it51xxx-watchdog.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+description: ITE watchdog timer
+
+include: base.yaml
+
+compatible: "ite,it51xxx-watchdog"
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/watchdog/nuvoton,npcx-watchdog.yaml b/dts/bindings/watchdog/nuvoton,npcx-watchdog.yaml
index 87a2abb2e62ec..b967d669e82b8 100644
--- a/dts/bindings/watchdog/nuvoton,npcx-watchdog.yaml
+++ b/dts/bindings/watchdog/nuvoton,npcx-watchdog.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Nuvoton Technology Corporation.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Nuvoton, NPCX-TWD node
+description: Nuvoton, NPCX-TWD
 
 compatible: "nuvoton,npcx-watchdog"
 
diff --git a/dts/bindings/watchdog/realtek,rts5912-watchdog.yaml b/dts/bindings/watchdog/realtek,rts5912-watchdog.yaml
new file mode 100644
index 0000000000000..7edde70be1ef8
--- /dev/null
+++ b/dts/bindings/watchdog/realtek,rts5912-watchdog.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Realtek, SIBG-SD7
+# SPDX-License-Identifier: Apache-2.0
+
+description: Realtek RTS5912 watchdog timer
+
+include: base.yaml
+
+compatible: "realtek,rts5912-watchdog"
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  clk-divider:
+    type: int
+    description: Watchdog clock divider
+    required: true
diff --git a/dts/bindings/watchdog/renesas,ra-wdt.yaml b/dts/bindings/watchdog/renesas,ra-wdt.yaml
new file mode 100644
index 0000000000000..f50b9e4f4b293
--- /dev/null
+++ b/dts/bindings/watchdog/renesas,ra-wdt.yaml
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+description: Renesas RA Watchdog (wdt)
+
+compatible: "renesas,ra-wdt"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  clocks:
+    required: true
diff --git a/dts/bindings/watchdog/silabs,siwx91x-wdt.yaml b/dts/bindings/watchdog/silabs,siwx91x-wdt.yaml
new file mode 100644
index 0000000000000..fafa84f9e067b
--- /dev/null
+++ b/dts/bindings/watchdog/silabs,siwx91x-wdt.yaml
@@ -0,0 +1,12 @@
+description: Silabs SiWx91x Watchdog
+
+compatible: "silabs,siwx91x-wdt"
+
+include: base.yaml
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
diff --git a/dts/bindings/wifi/espressif,esp-at.yaml b/dts/bindings/wifi/espressif,esp-at.yaml
index 33f9a492bfe4a..b1f0ea23c77c9 100644
--- a/dts/bindings/wifi/espressif,esp-at.yaml
+++ b/dts/bindings/wifi/espressif,esp-at.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2019 Tobias Svehagen
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif ESP8266/ESP32 WiFi modem (AT Commands)
+description: ESP8266/ESP32 WiFi modem (AT Commands)
 
 compatible: "espressif,esp-at"
 
diff --git a/dts/bindings/wifi/espressif,esp32-wifi.yaml b/dts/bindings/wifi/espressif,esp32-wifi.yaml
index af84531812b51..9a1bf691c4210 100644
--- a/dts/bindings/wifi/espressif,esp32-wifi.yaml
+++ b/dts/bindings/wifi/espressif,esp32-wifi.yaml
@@ -1,6 +1,6 @@
 # Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-description: Espressif ESP32 SoC WiFi
+description: ESP32 SoC Wi-Fi
 
 compatible: "espressif,esp32-wifi"
diff --git a/dts/bindings/wifi/nordic,nrf70-coex.yaml b/dts/bindings/wifi/nordic,nrf70-coex.yaml
index 0a9c12f587ec9..0ab29cd63a1ce 100644
--- a/dts/bindings/wifi/nordic,nrf70-coex.yaml
+++ b/dts/bindings/wifi/nordic,nrf70-coex.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  This is a representation of an external radio coexistence setup for coexistence
+  An external radio coexistence setup for coexistence
   with nRF70 WiFi chips.
 
 properties:
diff --git a/dts/bindings/wifi/nordic,nrf70-qspi.yaml b/dts/bindings/wifi/nordic,nrf70-qspi.yaml
index 87a98d5b3583f..e4dd79d1b00e3 100644
--- a/dts/bindings/wifi/nordic,nrf70-qspi.yaml
+++ b/dts/bindings/wifi/nordic,nrf70-qspi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF70 Wi-Fi chip.
+description: nRF70 Wi-Fi chip with QSPI interface.
 
 include: ["nordic,nrf70.yaml", "base.yaml"]
 
diff --git a/dts/bindings/wifi/nordic,nrf70-spi.yaml b/dts/bindings/wifi/nordic,nrf70-spi.yaml
index a0363f1b1a48f..a74458c689232 100644
--- a/dts/bindings/wifi/nordic,nrf70-spi.yaml
+++ b/dts/bindings/wifi/nordic,nrf70-spi.yaml
@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF70 Wi-Fi chip.
+description: nRF70 Wi-Fi chip with SPI interface.
 
 include: ["nordic,nrf70.yaml", "spi-device.yaml"]
diff --git a/dts/bindings/wifi/nordic,nrf70.yaml b/dts/bindings/wifi/nordic,nrf70.yaml
index abdc7ec2cb066..eacec39eefcff 100644
--- a/dts/bindings/wifi/nordic,nrf70.yaml
+++ b/dts/bindings/wifi/nordic,nrf70.yaml
@@ -22,3 +22,10 @@ properties:
     description: |
       GPIO of the RF Switch to control SR RF output to either SR Antenna
       or shared Antenna with Wi-Fi
+
+  iovdd-power-up-delay-ms:
+    type: int
+    default: 1
+    description: |
+      Duration to wait after enabling IOVDD before attempting communications.
+      Default value of 1 comes from the nRF7002 DK/EK switch (TCK106AG): ~600us
diff --git a/dts/bindings/wifi/nordic,nrf7000-coex.yaml b/dts/bindings/wifi/nordic,nrf7000-coex.yaml
index 94dcc2181d33d..227f10bc9c608 100644
--- a/dts/bindings/wifi/nordic,nrf7000-coex.yaml
+++ b/dts/bindings/wifi/nordic,nrf7000-coex.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7000 Wi-Fi chip with COEX interface.
+description: nRF7000 Wi-Fi chip with COEX interface.
 
 compatible: nordic,nrf7000-coex
 
diff --git a/dts/bindings/wifi/nordic,nrf7000-qspi.yaml b/dts/bindings/wifi/nordic,nrf7000-qspi.yaml
index f25663749e8af..f12c336eb1b45 100644
--- a/dts/bindings/wifi/nordic,nrf7000-qspi.yaml
+++ b/dts/bindings/wifi/nordic,nrf7000-qspi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7002 Wi-Fi chip with QSPI interface.
+description: nRF7002 Wi-Fi chip with QSPI interface.
 
 compatible: nordic,nrf7000-qspi
 
diff --git a/dts/bindings/wifi/nordic,nrf7000-spi.yaml b/dts/bindings/wifi/nordic,nrf7000-spi.yaml
index 3c5710a38f249..5268e31769e92 100644
--- a/dts/bindings/wifi/nordic,nrf7000-spi.yaml
+++ b/dts/bindings/wifi/nordic,nrf7000-spi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7002 Wi-Fi chip with SPI interface.
+description: nRF7002 Wi-Fi chip with SPI interface.
 
 compatible: nordic,nrf7000-spi
 
diff --git a/dts/bindings/wifi/nordic,nrf7001-coex.yaml b/dts/bindings/wifi/nordic,nrf7001-coex.yaml
index d58afe7d44cbf..4dee31b890f77 100644
--- a/dts/bindings/wifi/nordic,nrf7001-coex.yaml
+++ b/dts/bindings/wifi/nordic,nrf7001-coex.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7001 Wi-Fi chip with COEX interface.
+description: nRF7001 Wi-Fi chip with COEX interface.
 
 compatible: nordic,nrf7001-coex
 
diff --git a/dts/bindings/wifi/nordic,nrf7001-qspi.yaml b/dts/bindings/wifi/nordic,nrf7001-qspi.yaml
index 1961677fad2d6..c8d2560e22d8f 100644
--- a/dts/bindings/wifi/nordic,nrf7001-qspi.yaml
+++ b/dts/bindings/wifi/nordic,nrf7001-qspi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7002 Wi-Fi chip with QSPI interface.
+description: nRF7002 Wi-Fi chip with QSPI interface.
 
 compatible: nordic,nrf7001-qspi
 
diff --git a/dts/bindings/wifi/nordic,nrf7001-spi.yaml b/dts/bindings/wifi/nordic,nrf7001-spi.yaml
index 5c516945e4429..d586b48f9b2de 100644
--- a/dts/bindings/wifi/nordic,nrf7001-spi.yaml
+++ b/dts/bindings/wifi/nordic,nrf7001-spi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7002 Wi-Fi chip with SPI interface.
+description: nRF7002 Wi-Fi chip with SPI interface.
 
 compatible: nordic,nrf7001-spi
 
diff --git a/dts/bindings/wifi/nordic,nrf7002-coex.yaml b/dts/bindings/wifi/nordic,nrf7002-coex.yaml
index 1df61d0bf9873..b41d403fc2814 100644
--- a/dts/bindings/wifi/nordic,nrf7002-coex.yaml
+++ b/dts/bindings/wifi/nordic,nrf7002-coex.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7002 Wi-Fi chip with COEX interface.
+description: nRF7002 Wi-Fi chip with COEX interface.
 
 compatible: nordic,nrf7002-coex
 
diff --git a/dts/bindings/wifi/nordic,nrf7002-qspi.yaml b/dts/bindings/wifi/nordic,nrf7002-qspi.yaml
index 101bcfce11f0d..9e6b617f22129 100644
--- a/dts/bindings/wifi/nordic,nrf7002-qspi.yaml
+++ b/dts/bindings/wifi/nordic,nrf7002-qspi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7002 Wi-Fi chip with QSPI interface.
+description: nRF7002 Wi-Fi chip with QSPI interface.
 
 compatible: nordic,nrf7002-qspi
 
diff --git a/dts/bindings/wifi/nordic,nrf7002-spi.yaml b/dts/bindings/wifi/nordic,nrf7002-spi.yaml
index af12744161a1f..bdab20a6739b2 100644
--- a/dts/bindings/wifi/nordic,nrf7002-spi.yaml
+++ b/dts/bindings/wifi/nordic,nrf7002-spi.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-description: This is a representation of the nRF7002 Wi-Fi chip with SPI interface.
+description: nRF7002 Wi-Fi chip with SPI interface.
 
 compatible: nordic,nrf7002-spi
 
diff --git a/dts/bindings/wifi/nxp,wifi.yaml b/dts/bindings/wifi/nxp,wifi.yaml
index 32d6adc5a6585..416d334214cd3 100644
--- a/dts/bindings/wifi/nxp,wifi.yaml
+++ b/dts/bindings/wifi/nxp,wifi.yaml
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    NXP Wifi Module
+    NXP Wi-Fi Module
 
 compatible: "nxp,wifi"
 
-include: [sd-device.yaml, pinctrl-device.yaml]
+include: [base.yaml, pinctrl-device.yaml]
diff --git a/dts/bindings/wifi/wifi-tx-power-2g.yaml b/dts/bindings/wifi/wifi-tx-power-2g.yaml
index 967cee439812f..a628af580f845 100644
--- a/dts/bindings/wifi/wifi-tx-power-2g.yaml
+++ b/dts/bindings/wifi/wifi-tx-power-2g.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  This is a representation of the Wi-Fi transmit power ceilings
+  Wi-Fi transmit power ceilings
   i.e., maximum transmit power allowed for 2.4GHz band. Based on the
   RF performance of the device, the transmit power can be limited
   for different data rates and sub-bands to get the best performance.
diff --git a/dts/bindings/wifi/wifi-tx-power-5g.yaml b/dts/bindings/wifi/wifi-tx-power-5g.yaml
index b9af40e0b9f61..1f3452f28c230 100644
--- a/dts/bindings/wifi/wifi-tx-power-5g.yaml
+++ b/dts/bindings/wifi/wifi-tx-power-5g.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-  This is a representation of the Wi-Fi transmit power ceilings
+  Wi-Fi transmit power ceilings
   i.e., maximum transmit power allowed for 5GHz band. Based on the
   RF performance of the device, the transmit power can be limited
   for different data rates and sub-bands to get the best performance.
diff --git a/dts/bindings/xspi/st,stm32-xspi.yaml b/dts/bindings/xspi/st,stm32-xspi.yaml
index 388c3d20bca1c..873c5c8776f68 100644
--- a/dts/bindings/xspi/st,stm32-xspi.yaml
+++ b/dts/bindings/xspi/st,stm32-xspi.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 description: |
-    STM32 XSPI device representation. Enabling a stm32 xspi node in a board
+    STM32 XSPI Controller.
 
 compatible: "st,stm32-xspi"
 
diff --git a/dts/common/amd/versalnet.dtsi b/dts/common/amd/versalnet.dtsi
new file mode 100644
index 0000000000000..e5ab51ad59f8f
--- /dev/null
+++ b/dts/common/amd/versalnet.dtsi
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc: soc {
+		ocm: memory@bbf00000 {
+			compatible = "zephyr,memory-region";
+			reg = <0xbbf00000 DT_SIZE_M(1)>;
+			status = "disabled";
+			zephyr,memory-region = "OCM";
+		};
+
+		uart0: uart@f1920000 {
+			compatible = "arm,sbsa-uart";
+			reg = <0xf1920000 0x4c>;
+			status = "disabled";
+			interrupt-names = "irq_0";
+			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		};
+
+		uart1: uart@f1930000 {
+			compatible = "arm,sbsa-uart";
+			reg = <0xf1930000 0x1000>;
+			status = "disabled";
+			interrupt-names = "irq_1";
+			interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL IRQ_DEFAULT_PRIORITY>;
+		};
+	};
+};
diff --git a/dts/common/nordic/nrf5340_shared_sram_partition.dtsi b/dts/common/nordic/nrf5340_shared_sram_partition.dtsi
index 8dc217ceae9ea..a5dc3489e893e 100644
--- a/dts/common/nordic/nrf5340_shared_sram_partition.dtsi
+++ b/dts/common/nordic/nrf5340_shared_sram_partition.dtsi
@@ -14,9 +14,7 @@
  * the memory range allocated to the non-secure image (sram0_ns).
  *
  * By default the last 64 kB of application core SRAM is allocated as shared
- * memory (sram0_shared) which is divided in:
- * - 32 kB CPUAPP to CPUNET communication (cpuapp_cpunet_ipc_shm)
- * - 32 kB CPUNET to CPUAPP communication (cpunet_cpuapp_ipc_shm)
+ * memory (sram0_shared).
  */
 
 / {
@@ -30,18 +28,8 @@
 		ranges;
 
 		sram0_shared: memory@20070000 {
-			#address-cells = <1>;
-			#size-cells = <1>;
 			/* Last 64 kB of sram0 */
 			reg = <0x20070000 0x10000>;
-
-			cpuapp_cpunet_ipc_shm: memory@20070000 {
-				reg = <0x20070000 DT_SIZE_K(32)>;
-			};
-
-			cpunet_cpuapp_ipc_shm: memory@20078000 {
-				reg = <0x20078000 DT_SIZE_K(32)>;
-			};
 		};
 	};
 };
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index b9ec26af05d8b..8339a67229cf9 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -7,7 +7,8 @@
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
 
-#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-haltium.h>
+#include <zephyr/dt-bindings/clock/nrfs-audiopll.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
@@ -136,13 +137,13 @@
 				power-state-name = "suspend-to-idle";
 				substate-id = <2>;
 				min-residency-us = <1000>;
-				exit-latency-us = <30>;
+				exit-latency-us = <7>;
 			};
 			s2ram: s2ram {
 				compatible = "zephyr,power-state";
 				power-state-name = "suspend-to-ram";
 				min-residency-us = <2000>;
-				exit-latency-us = <260>;
+				exit-latency-us = <33>;
 			};
 		};
 	};
@@ -202,6 +203,12 @@
 			clocks = <&hfxo>, <&lfxo>;
 			clock-names = "hfxo", "lfxo";
 		};
+
+		audiopll: audiopll {
+			compatible = "nordic,nrfs-audiopll";
+			frequency = <NRFS_AUDIOPLL_FREQ_AUDIO_44K1>;
+			status = "disabled";
+		};
 	};
 
 	gpd: global-power-domain {
@@ -510,8 +517,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -520,7 +527,6 @@
 				power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
@@ -650,6 +656,20 @@
 				#pwm-cells = <3>;
 			};
 
+			spis120: spi@8e5000 {
+				compatible = "nordic,nrf-spis";
+				reg = <0x8e5000 0x1000>;
+				status = "disabled";
+				power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
+				easydma-maxcnt-bits = <15>;
+				interrupts = <229 NRF_DEFAULT_IRQ_PRIORITY>;
+				clocks = <&hsfll120>;
+				max-frequency = <DT_FREQ_M(32)>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				nordic,clockpin-enable = <NRF_FUN_SPIS_SCK>;
+			};
+
 			spi120: spi@8e6000 {
 				compatible = "nordic,nrf-spim";
 				reg = <0x8e6000 0x1000>;
@@ -663,8 +683,7 @@
 				#size-cells = <0>;
 				rx-delay-supported;
 				rx-delay = <1>;
-				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
-							 <NRF_FUN_SPIS_SCK>;
+				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
 			};
 
 			uart120: uart@8e6000 {
@@ -691,8 +710,7 @@
 				#size-cells = <0>;
 				rx-delay-supported;
 				rx-delay = <1>;
-				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
-							 <NRF_FUN_SPIS_SCK>;
+				nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
 			};
 
 			cpuppr_vpr: vpr@908000 {
@@ -876,6 +894,7 @@
 				status = "disabled";
 				#io-channel-cells = <1>;
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			comp: comparator@983000 {
@@ -943,11 +962,8 @@
 				reg = <0x99c000 0x1000>;
 				status = "disabled";
 				cc-num = <16>;
-				/* GRTC uses both LFCLK and FLL16M, but its accuracy and
-				 * precision are inherited from LFCLK. that's why this
-				 *  one is linked here.
-				 */
-				clocks = <&lfclk>;
+				clocks = <&lfclk>, <&fll16m>;
+				clock-names = "lfclock", "hfclock";
 				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
 			};
 
diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index 8ffce7ab801cd..56ca96dad5faf 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -49,6 +49,12 @@
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -87,19 +93,19 @@
 		};
 
 		cpuapp_sram: memory@20000000 {
-			reg = <0x20000000 DT_SIZE_K(144)>;
-			ranges = <0x0 0x20000000 DT_SIZE_K(144)>;
+			reg = <0x20000000 DT_SIZE_K(143)>;
+			ranges = <0x0 0x20000000 DT_SIZE_K(143)>;
 			compatible = "mmio-sram";
 			#address-cells = <1>;
 			#size-cells = <1>;
 		};
 
-		cpuflpr_sram: memory@20024000 {
+		cpuflpr_sram: memory@20023c00 {
 			compatible = "mmio-sram";
-			reg = <0x20024000 DT_SIZE_K(48)>;
+			reg = <0x20023c00 DT_SIZE_K(48)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x20024000 DT_SIZE_K(48)>;
+			ranges = <0x0 0x20023c00 DT_SIZE_K(48)>;
 		};
 
  #ifdef USE_NON_SECURE_ADDRESS_MAP
@@ -387,6 +393,7 @@
 				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			temp: temp@d7000 {
@@ -418,6 +425,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 808d32a716eb7..8b0dbb8d25343 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -11,6 +11,10 @@
 
 /delete-node/ &sw_pwm;
 
+/* Domain IDs. Can be used to specify channel links in IPCT nodes. */
+#define NRF_DOMAIN_ID_APPLICATION 0
+#define NRF_DOMAIN_ID_FLPR 1
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -33,9 +37,23 @@
 				swo-ref-frequency = <DT_FREQ_M(128)>;
 			};
 		};
+
+		cpuflpr: cpu@1 {
+			compatible = "nordic,vpr";
+			reg = <1>;
+			device_type = "cpu";
+			riscv,isa = "rv32emc";
+			nordic,bus-width = <64>;
+		};
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -72,10 +90,18 @@
 
 		cpuapp_sram: memory@20000000 {
 			compatible = "mmio-sram";
-			reg = <0x20000000 DT_SIZE_K(511)>;
+			reg = <0x20000000 DT_SIZE_K(447)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x20000000 0x7fc00>;
+			ranges = <0x0 0x20000000 0x6fc00>;
+		};
+
+		cpuflpr_sram: memory@2006fc00 {
+			compatible = "mmio-sram";
+			reg = <0x2006fc00 DT_SIZE_K(64)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2006fc00 0x10000>;
 		};
 
 		global_peripherals: peripheral@50000000 {
@@ -101,6 +127,24 @@
 				status = "disabled";
 			};
 
+			cpuflpr_vpr: vpr@4c000 {
+				compatible = "nordic,nrf-vpr-coprocessor";
+				reg = <0x4c000 0x1000>;
+				ranges = <0x0 0x4c000 0x1000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				status = "disabled";
+
+				cpuflpr_clic: interrupt-controller@f0000000 {
+					compatible = "nordic,nrf-clic";
+					reg = <0xf0000000 0x143c>;
+					interrupt-controller;
+					#interrupt-cells = <2>;
+					#address-cells = <1>;
+					status = "disabled";
+				};
+			};
+
 			spi00: spi@4d000 {
 				/*
 				 * This spi node can be either SPIM or SPIS,
@@ -196,6 +240,7 @@
 				ieee802154-supported;
 				ble-2mbps-supported;
 				ble-coded-phy-supported;
+				cs-supported;
 
 				ieee802154: ieee802154 {
 					compatible = "nordic,nrf-ieee802154";
@@ -453,6 +498,7 @@
 				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			nfct: nfct@d6000 {
@@ -505,6 +551,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 
@@ -637,6 +685,17 @@
 				frame-timeout-supported;
 			};
 
+			comp: comparator@106000 {
+				/*
+				 * Use compatible "nordic,nrf-comp" to configure as COMP
+				 * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
+				 */
+				compatible = "nordic,nrf-comp";
+				reg = <0x106000 0x1000>;
+				status = "disabled";
+				interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
+			};
+
 			wdt30: watchdog@108000 {
 				compatible = "nordic,nrf-wdt";
 				reg = <0x108000 0x620>;
@@ -676,6 +735,32 @@
 				status = "disabled";
 			};
 
+			power: power@10e000 {
+				compatible = "nordic,nrf-power";
+				reg = <0x10e000 0x1000>;
+				ranges = <0x0 0x10e000 0x1000>;
+				interrupts = <270 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				gpregret1: gpregret1@51c {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x51c 0x1>;
+					status = "disabled";
+				};
+
+				gpregret2: gpregret2@520 {
+					#address-cells = <1>;
+					#size-cells = <1>;
+					compatible = "nordic,nrf-gpregret";
+					reg = <0x520 0x1>;
+					status = "disabled";
+				};
+			};
+
 			regulators: regulator@120000 {
 				compatible = "nordic,nrf54l-regulators";
 				reg = <0x120000 0x1000>;
@@ -702,7 +787,14 @@
 
 			cpuapp_rram: rram@0 {
 				compatible = "soc-nv-flash";
-				reg = <0x0 DT_SIZE_K(2028)>;
+				reg = <0x0 DT_SIZE_K(1972)>;
+				erase-block-size = <4096>;
+				write-block-size = <16>;
+			};
+
+			cpuflpr_rram: rram@1ed000 {
+				compatible = "soc-nv-flash";
+				reg = <0x1ed000 DT_SIZE_K(64)>;
 				erase-block-size = <4096>;
 				write-block-size = <16>;
 			};
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index f080a3be61a61..f59f49f326a56 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -49,6 +49,12 @@
 	};
 
 	clocks {
+		pclk: pclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(16)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -493,6 +499,7 @@
 				interrupts = <213 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			nfct: nfct@d6000 {
@@ -554,6 +561,8 @@
 				compatible = "nordic,nrf-grtc";
 				reg = <0xe2000 0x1000>;
 				cc-num = <12>;
+				clocks = <&lfxo>, <&pclk>;
+				clock-names = "lfclock", "hfclock";
 				status = "disabled";
 			};
 
@@ -719,6 +728,15 @@
 			};
 		};
 
+		nrf_mpc: memory@50041000 {
+			compatible = "nordic,nrf-mpc";
+			reg = <0x50041000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			override-num = <5>;
+			override-granularity = <4096>;
+		};
+
 		cpuapp_ppb: cpuapp-ppb-bus {
 			#address-cells = <1>;
 			#size-cells = <1>;
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index e03359a47096b..d7c20e855c16b 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -6,7 +6,7 @@
 
 #include <mem.h>
 #include <nordic/nrf_common.dtsi>
-#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+#include <zephyr/dt-bindings/adc/nrf-saadc-haltium.h>
 #include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf9230-engb.h>
 #include <zephyr/dt-bindings/misc/nordic-domain-id-nrf9230.h>
 #include <zephyr/dt-bindings/misc/nordic-owner-id-nrf9230.h>
@@ -375,8 +375,8 @@
 				status = "disabled";
 			};
 
-			exmif: spi@95000 {
-				compatible = "nordic,nrf-exmif";
+			exmif: exmif@95000 {
+				compatible = "nordic,nrf-exmif", "snps,designware-ssi";
 				#address-cells = <1>;
 				#size-cells = <0>;
 				reg = <0x95000 0x500 0x95500 0xb00>;
@@ -384,7 +384,6 @@
 				interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
 				clock-frequency = <DT_FREQ_M(400)>;
 				fifo-depth = <32>;
-				max-xfer-size = <16>;
 				status = "disabled";
 			};
 
@@ -445,28 +444,6 @@
 				global-domain-id = <12>;
 			};
 
-			can120: can@8d8000 {
-				compatible = "nordic,nrf-can";
-				reg = <0x8d8000 0x400>, <0x2fbef800 0x800>, <0x2fbe8000 0x7800>;
-				reg-names = "wrapper", "m_can", "message_ram";
-				interrupts = <216 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&canpll>, <&hsfll120>;
-				clock-names = "auxpll", "hsfll";
-				bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
-				status = "disabled";
-			};
-
-			can121: can@8db000 {
-				compatible = "nordic,nrf-can";
-				reg = <0x8db000 0x400>, <0x2fbf7800 0x800>, <0x2fbf0000 0x7800>;
-				reg-names = "wrapper", "m_can", "message_ram";
-				interrupts = <219 NRF_DEFAULT_IRQ_PRIORITY>;
-				clocks = <&canpll>, <&hsfll120>;
-				clock-names = "auxpll", "hsfll";
-				bosch,mram-cfg = <0x0 28 8 3 3 0 1 1>;
-				status = "disabled";
-			};
-
 			dppic120: dppic@8e1000 {
 				compatible = "nordic,nrf-dppic-global";
 				reg = <0x8e1000 0x1000>;
@@ -709,6 +686,7 @@
 				interrupts = <386 NRF_DEFAULT_IRQ_PRIORITY>;
 				status = "disabled";
 				#io-channel-cells = <1>;
+				zephyr,pm-device-runtime-auto;
 			};
 
 			comp: comparator@983000 {
diff --git a/dts/riscv/espressif/esp32c6/esp32c6_common.dtsi b/dts/riscv/espressif/esp32c6/esp32c6_common.dtsi
index d61f0762e4368..840ca3ba7b8f8 100644
--- a/dts/riscv/espressif/esp32c6/esp32c6_common.dtsi
+++ b/dts/riscv/espressif/esp32c6/esp32c6_common.dtsi
@@ -16,6 +16,10 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		die-temp0 = &coretemp;
+	};
+
 	chosen {
 		zephyr,entropy = &trng0;
 		zephyr,flash-controller = &flash;
@@ -76,9 +80,15 @@
 		};
 
 		sramlp: memory@50000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			compatible = "zephyr,memory-region", "mmio-sram";
 			reg = <0x50000000 DT_SIZE_K(16)>;
 			zephyr,memory-region = "SRAMLP ";
+
+			shmlp: memory@0 {
+				reg = <0x0 0x10>;
+			};
 		};
 
 		intc: interrupt-controller@60010000 {
@@ -189,6 +199,13 @@
 			};
 		};
 
+		coretemp: coretemp@6000e058 {
+			compatible = "espressif,esp32-temp";
+			friendly-name = "coretemp";
+			reg = <0x6000E058 0x4>;
+			status = "disabled";
+		};
+
 		adc0: adc@6000e000 {
 			compatible = "espressif,esp32-adc";
 			reg = <0x6000E000 4>;
@@ -257,6 +274,13 @@
 			current-speed = <115200>;
 		};
 
+		lp_uart: uart@600b1400 {
+			compatible = "espressif,esp32-lpuart";
+			reg = <0x600b1400 DT_SIZE_K(4)>;
+			status = "disabled";
+			current-speed = <115200>;
+		};
+
 		usb_serial: uart@6000f000 {
 			compatible = "espressif,esp32-usb-serial";
 			reg = <0x6000F000 0x1000>;
diff --git a/dts/riscv/espressif/esp32c6/esp32c6_lpcore.dtsi b/dts/riscv/espressif/esp32c6/esp32c6_lpcore.dtsi
new file mode 100644
index 0000000000000..319bc571805e1
--- /dev/null
+++ b/dts/riscv/espressif/esp32c6/esp32c6_lpcore.dtsi
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <mem.h>
+#include <freq.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/interrupt-controller/esp-esp32c6-intmux.h>
+#include <zephyr/dt-bindings/clock/esp32c6_clock.h>
+#include <dt-bindings/pinctrl/esp32c6-pinctrl.h>
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "espressif,riscv";
+			riscv,isa = "rv32imac_zicsr_zifencei";
+			reg = <0>;
+			clock-source = <ESP32_RTC_FAST_CLK_SRC_XTAL_D2>;
+			clock-frequency = <DT_FREQ_M(20)>;
+			xtal-freq = <DT_FREQ_M(40)>;
+		};
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+
+		sramlp: memory@50000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "mmio-sram";
+			reg = <0x50000000 DT_SIZE_K(16)>;
+
+			shmlp: memory@0 {
+				reg = <0x0 0x10>;
+			};
+		};
+
+		flash: flash-controller@60002000 {
+			compatible = "espressif,esp32-flash-controller";
+			reg = <0x60002000 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash0: flash@0 {
+				compatible = "soc-nv-flash";
+				erase-block-size = <4096>;
+				write-block-size = <4>;
+				/* Flash size is specified in SOC/SIP dtsi */
+			};
+		};
+
+		lp_uart: uart@600b1400 {
+			compatible = "espressif,esp32-lpuart";
+			reg = <0x600b1400 DT_SIZE_K(4)>;
+			status = "disabled";
+		};
+
+	};
+};
diff --git a/dts/riscv/espressif/esp32c6/esp32c6_lpcore_wroom_n4.dtsi b/dts/riscv/espressif/esp32c6/esp32c6_lpcore_wroom_n4.dtsi
new file mode 100644
index 0000000000000..cfb4fc103dcb1
--- /dev/null
+++ b/dts/riscv/espressif/esp32c6/esp32c6_lpcore_wroom_n4.dtsi
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+ #include "esp32c6_lpcore.dtsi"
+
+/* 4MB flash */
+&flash0 {
+	reg = <0x0 DT_SIZE_M(4)>;
+};
diff --git a/dts/riscv/gd/gd32vf103.dtsi b/dts/riscv/gd/gd32vf103.dtsi
index 5f87ba2bfc324..95cdb1a6955ee 100644
--- a/dts/riscv/gd/gd32vf103.dtsi
+++ b/dts/riscv/gd/gd32vf103.dtsi
@@ -52,10 +52,7 @@
 			#address-cells = <0>;
 			#interrupt-cells = <2>;
 			interrupt-controller;
-			reg =  <0xd2000000 0x0001
-				0xd2000004 0x0004
-				0xd200000b 0x0001
-				0xd2001000 0x1000>;
+			reg =  <0xd2000000 0x2000>;
 		};
 
 		rcu: reset-clock-controller@40021000 {
diff --git a/dts/riscv/ite/it51526aw.dtsi b/dts/riscv/ite/it51526aw.dtsi
new file mode 100644
index 0000000000000..b03cfc22e1b17
--- /dev/null
+++ b/dts/riscv/ite/it51526aw.dtsi
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	cpus {
+		cpu0: cpu@0 {
+			compatible = "ite,riscv-ite", "riscv";
+			riscv,isa = "rv32imb_zifencei";
+			device_type = "cpu";
+			reg = <0>;
+			clock-frequency = <32768>;
+			cpu-power-states = <&standby>;
+		};
+	};
+};
diff --git a/dts/riscv/ite/it51xxx-pinctrl-map.dtsi b/dts/riscv/ite/it51xxx-pinctrl-map.dtsi
new file mode 100644
index 0000000000000..f5bcaf53a238b
--- /dev/null
+++ b/dts/riscv/ite/it51xxx-pinctrl-map.dtsi
@@ -0,0 +1,396 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/it8xxx2-pinctrl.h>
+
+&pinctrl {
+	/* ADC alternate function */
+	adc0_ch0_gpi0_default: adc0_ch0_gpi0_default {
+		pinmuxs = <&pinctrli 0 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	adc0_ch1_gpi1_default: adc0_ch1_gpi1_default {
+		pinmuxs = <&pinctrli 1 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	adc0_ch2_gpi2_default: adc0_ch2_gpi2_default {
+		pinmuxs = <&pinctrli 2 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	adc0_ch3_gpi3_default: adc0_ch3_gpi3_default {
+		pinmuxs = <&pinctrli 3 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	adc0_ch4_gpi4_default: adc0_ch4_gpi4_default {
+		pinmuxs = <&pinctrli 4 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	adc0_ch5_gpi5_default: adc0_ch5_gpi5_default {
+		pinmuxs = <&pinctrli 5 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	adc0_ch6_gpi6_default: adc0_ch6_gpi6_default {
+		pinmuxs = <&pinctrli 6 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	adc0_ch7_gpi7_default: adc0_ch7_gpi7_default {
+		pinmuxs = <&pinctrli 7 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	/* I2C alternate function */
+	i2c0_clk_gpf2_default: i2c0_clk_gpf2_default {
+		pinmuxs = <&pinctrlf 2 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i2c0_data_gpf3_default: i2c0_data_gpf3_default {
+		pinmuxs = <&pinctrlf 3 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i2c1_clk_gpc1_default: i2c1_clk_gpc1_default {
+		pinmuxs = <&pinctrlc 1 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i2c1_data_gpc2_default: i2c1_data_gpc2_default {
+		pinmuxs = <&pinctrlc 2 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i2c2_clk_gpf6_default: i2c2_clk_gpf6_default {
+		pinmuxs = <&pinctrlf 6 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i2c2_data_gpf7_default: i2c2_data_gpf7_default {
+		pinmuxs = <&pinctrlf 7 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i2c3_clk_gph1_default: i2c3_clk_gph1_default {
+		pinmuxs = <&pinctrlh 1 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	i2c3_data_gph2_default: i2c3_data_gph2_default {
+		pinmuxs = <&pinctrlh 2 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	i2c4_clk_gpe0_default: i2c4_clk_gpe0_default {
+		pinmuxs = <&pinctrle 0 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	i2c4_data_gpe7_default: i2c4_data_gpe7_default {
+		pinmuxs = <&pinctrle 7 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	i2c5_clk_gpa4_default: i2c5_clk_gpa4_default {
+		pinmuxs = <&pinctrla 4 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	i2c5_data_gpa5_default: i2c5_data_gpa5_default {
+		pinmuxs = <&pinctrla 5 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	i2c6_clk_gpd0_default: i2c6_clk_gpd0_default {
+		pinmuxs = <&pinctrld 0 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	i2c6_data_gpd1_default: i2c6_data_gpd1_default {
+		pinmuxs = <&pinctrld 1 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	i2c7_clk_gpb2_default: i2c7_clk_gpb2_default {
+		pinmuxs = <&pinctrlb 2 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	i2c7_data_gph0_default: i2c7_data_gph0_default {
+		pinmuxs = <&pinctrlh 0 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	i2c8_clk_gpb5_default: i2c8_clk_gpb5_default {
+		pinmuxs = <&pinctrlb 5 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	i2c8_data_gpj6_default: i2c8_data_gpj6_default {
+		pinmuxs = <&pinctrlj 6 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	/* I3C alternate function */
+	i3c0_clk_gpj3_default: i3c0_clk_gpj3_default {
+		pinmuxs = <&pinctrlj 3 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i3c0_data_gpj4_default: i3c0_data_gpj4_default {
+		pinmuxs = <&pinctrlj 4 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i3c1_clk_gpj5_default: i3c1_clk_gpj5_default {
+		pinmuxs = <&pinctrlj 5 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i3c1_data_gpe1_default: i3c1_data_gpe1_default {
+		pinmuxs = <&pinctrle 1 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i3c2_clk_gpe2_default: i3c2_clk_gpe2_default {
+		pinmuxs = <&pinctrle 2 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i3c2_data_gpe3_default: i3c2_data_gpe3_default {
+		pinmuxs = <&pinctrle 3 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i3c3_clk_gpf0_default: i3c3_clk_gpf0_default {
+		pinmuxs = <&pinctrlf 0 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	i3c3_data_gpf1_default: i3c3_data_gpf1_default {
+		pinmuxs = <&pinctrlf 1 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	/* Keyboard alternate function */
+	kso0_default: kso0_gpk0_default: kso0_gpk0_default {
+		pinmuxs = <&pinctrlk 0 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso1_default: kso1_gpk1_default: kso1_gpk1_default {
+		pinmuxs = <&pinctrlk 1 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso2_default: kso2_gpk2_default: kso2_gpk2_default {
+		pinmuxs = <&pinctrlk 2 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso3_default: kso3_gpk3_default: kso3_gpk3_default {
+		pinmuxs = <&pinctrlk 3 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso4_default: kso4_gpk4_default: kso4_gpk4_default {
+		pinmuxs = <&pinctrlk 4 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso5_default: kso5_gpk5_default: kso5_gpk5_default {
+		pinmuxs = <&pinctrlk 5 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso6_default: kso6_gpk6_default: kso6_gpk6_default {
+		pinmuxs = <&pinctrlk 6 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso7_default: kso7_gpk7_default: kso7_gpk7_default {
+		pinmuxs = <&pinctrlk 7 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso8_default: kso8_gpl0_default: kso8_gpl0_default {
+		pinmuxs = <&pinctrll 0 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso9_default: kso9_gpl1_default: kso9_gpl1_default {
+		pinmuxs = <&pinctrll 1 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso10_default: kso10_gpl2_default: kso10_gpl2_default {
+		pinmuxs = <&pinctrll 2 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso11_default: kso11_gpl3_default: kso11_gpl3_default {
+		pinmuxs = <&pinctrll 3 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso12_default: kso12_gpl4_default: kso12_gpl4_default {
+		pinmuxs = <&pinctrll 4 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso13_default: kso13_gpl5_default: kso13_gpl5_default {
+		pinmuxs = <&pinctrll 5 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso14_default: kso14_gpl6_default: kso14_gpl6_default {
+		pinmuxs = <&pinctrll 6 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso15_default: kso15_gpl7_default: kso15_gpl7_default {
+		pinmuxs = <&pinctrll 7 IT8XXX2_ALT_FUNC_1>;
+		drive-open-drain;
+		bias-pull-up;
+	};
+
+	kso16_default: kso16_gpc3_default: kso16_gpc3_default {
+		pinmuxs = <&pinctrlc 3 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	kso17_default: kso17_gpc5_default: kso17_gpc5_default {
+		pinmuxs = <&pinctrlc 5 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi0_default: ksi0_gpn0_default: ksi0_gpn0_default {
+		pinmuxs = <&pinctrln 0 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi1_default: ksi1_gpn1_default: ksi1_gpn1_default {
+		pinmuxs = <&pinctrln 1 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi2_default: ksi2_gpn2_default: ksi2_gpn2_default {
+		pinmuxs = <&pinctrln 2 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi3_default: ksi3_gpn3_default: ksi3_gpn3_default {
+		pinmuxs = <&pinctrln 3 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi4_default: ksi4_gpn4_default: ksi4_gpn4_default {
+		pinmuxs = <&pinctrln 4 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi5_default: ksi5_gpn5_default: ksi5_gpn5_default {
+		pinmuxs = <&pinctrln 5 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi6_default: ksi6_gpn6_default: ksi6_gpn6_default {
+		pinmuxs = <&pinctrln 6 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	ksi7_default: ksi7_gpn7_default: ksi7_gpn7_default {
+		pinmuxs = <&pinctrln 7 IT8XXX2_ALT_FUNC_1>;
+		bias-pull-up;
+	};
+
+	/* PECI alternate function */
+	peci_gpf6_default: peci_gpf6_default {
+		pinmuxs = <&pinctrlf 6 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	/* PWM alternate function */
+	pwm0_gpa0_default: pwm0_gpa0_default {
+		pinmuxs = <&pinctrla 0 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	pwm1_gpa1_default: pwm1_gpa1_default {
+		pinmuxs = <&pinctrla 1 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	pwm2_gpa2_default: pwm2_gpa2_default {
+		pinmuxs = <&pinctrla 2 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	pwm3_gpa3_default: pwm3_gpa3_default {
+		pinmuxs = <&pinctrla 3 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	pwm4_gpa4_default: pwm4_gpa4_default {
+		pinmuxs = <&pinctrla 4 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	pwm5_gpa5_default: pwm5_gpa5_default {
+		pinmuxs = <&pinctrla 5 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	pwm6_gpa6_default: pwm6_gpa6_default {
+		pinmuxs = <&pinctrla 6 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	pwm7_gpa7_default: pwm7_gpa7_default {
+		pinmuxs = <&pinctrla 7 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	/* SSPI alternate function */
+	ssce0_gpj7_default: ssce0_gpj7_default {
+		pinmuxs = <&pinctrlj 7 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	ssce1_gph7_default: ssce1_gph7_default {
+		pinmuxs = <&pinctrlh 7 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	ssck_gpa6_default: ssck_gpa6_default {
+		pinmuxs = <&pinctrla 6 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	smosi_gpc6_default: smosi_gpc6_default {
+		pinmuxs = <&pinctrlc 6 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	smiso_gpc4_default: smiso_gpc4_default {
+		pinmuxs = <&pinctrlc 4 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	/* Tachometer alternate function */
+	tach0a_gpd6_default: tach0a_gpd6_default {
+		pinmuxs = <&pinctrld 6 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	tach1a_gpd7_default: tach1a_gpd7_default {
+		pinmuxs = <&pinctrld 7 IT8XXX2_ALT_FUNC_1>;
+	};
+
+	tach2a_gpj0_default: tach2a_gpj0_default {
+		pinmuxs = <&pinctrlj 0 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	tach0b_gpc6_default: tach0b_gpc6_default {
+		pinmuxs = <&pinctrlc 6 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	tach1b_gpj6_default: tach1b_gpj6_default {
+		pinmuxs = <&pinctrlj 6 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	tach2b_gpj1_default: tach2b_gpj1_default {
+		pinmuxs = <&pinctrlj 1 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	/* UART alternate function */
+	uart1_rx_gpc7_default: uart1_rx_gpc7_default {
+		pinmuxs = <&pinctrlc 7 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	uart1_tx_gpe6_default: uart1_tx_gpe6_default {
+		pinmuxs = <&pinctrle 6 IT8XXX2_ALT_FUNC_4>;
+	};
+
+	uart2_rx_gph1_default: uart2_rx_gph1_default {
+		pinmuxs = <&pinctrlh 1 IT8XXX2_ALT_FUNC_3>;
+	};
+
+	uart2_tx_gph2_default: uart2_tx_gph2_default {
+		pinmuxs = <&pinctrlh 2 IT8XXX2_ALT_FUNC_3>;
+	};
+};
diff --git a/dts/riscv/ite/it51xxx-wuc-map.dtsi b/dts/riscv/ite/it51xxx-wuc-map.dtsi
new file mode 100644
index 0000000000000..248fd20b30205
--- /dev/null
+++ b/dts/riscv/ite/it51xxx-wuc-map.dtsi
@@ -0,0 +1,337 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/dt-util.h>
+
+/ {
+	/* Mapping between wuc bits and source device */
+	it51xxx-wuc-map {
+		compatible = "ite,it51xxx-wuc-map";
+
+		/* WUC group 2 */
+		wuc_wu20: wu20 {
+			wucs = <&wuc2 BIT(0)>; /* GPD0 */
+		};
+		wuc_wu21: wu21 {
+			wucs = <&wuc2 BIT(1)>; /* GPD1 */
+		};
+		wuc_wu22: wu22 {
+			wucs = <&wuc2 BIT(2)>; /* GPC4 */
+		};
+		wuc_wu23: wu23 {
+			wucs = <&wuc2 BIT(3)>; /* GPC6 */
+		};
+		wuc_wu24: wu24{
+			wucs = <&wuc2 BIT(4)>; /* GPD2 */
+		};
+		wuc_wu25: wu25 {
+			wucs = <&wuc2 BIT(5)>; /* GPB3 */
+		};
+
+		/* WUC group 3 */
+		wuc_wu30: wu30 {
+			wucs = <&wuc3 BIT(0)>; /* KSI[0] */
+		};
+		wuc_wu31: wu31 {
+			wucs = <&wuc3 BIT(1)>; /* KSI[1] */
+		};
+		wuc_wu32: wu32 {
+			wucs = <&wuc3 BIT(2)>; /* KSI[2] */
+		};
+		wuc_wu33: wu33 {
+			wucs = <&wuc3 BIT(3)>; /* KSI[3] */
+		};
+		wuc_wu34: wu34{
+			wucs = <&wuc3 BIT(4)>; /* KSI[4] */
+		};
+		wuc_wu35: wu35 {
+			wucs = <&wuc3 BIT(5)>; /* KSI[5] */
+		};
+		wuc_wu36: wu36 {
+			wucs = <&wuc3 BIT(6)>; /* KSI[6] */
+		};
+		wuc_wu37: wu37 {
+			wucs = <&wuc3 BIT(7)>; /* KSI[7] */
+		};
+
+		/* WUC group 4 */
+		wuc_wu40: wu40 {
+			wucs = <&wuc4 BIT(0)>; /* GPE5 */
+		};
+		wuc_wu42: wu42 {
+			wucs = <&wuc4 BIT(2)>; /* eSPI transaction */
+		};
+		wuc_wu45: wu45 {
+			wucs = <&wuc4 BIT(5)>; /* GPE6 */
+		};
+		wuc_wu46: wu46 {
+			wucs = <&wuc4 BIT(6)>; /* GPE7 */
+		};
+
+		/* WUC group 6 */
+		wuc_wu60: wu60 {
+			wucs = <&wuc6 BIT(0)>; /* GPH0 */
+		};
+		wuc_wu61: wu61 {
+			wucs = <&wuc6 BIT(1)>; /* GPH1 */
+		};
+		wuc_wu62: wu62 {
+			wucs = <&wuc6 BIT(2)>; /* GPH2 */
+		};
+		wuc_wu63: wu63 {
+			wucs = <&wuc6 BIT(3)>; /* GPH3 */
+		};
+		wuc_wu64: wu64 {
+			wucs = <&wuc6 BIT(4)>; /* GPF4 */
+		};
+		wuc_wu65: wu65 {
+			wucs = <&wuc6 BIT(5)>; /* GPF5 */
+		};
+		wuc_wu66: wu66 {
+			wucs = <&wuc6 BIT(6)>; /* GPF6 */
+		};
+		wuc_wu67: wu67 {
+			wucs = <&wuc6 BIT(7)>; /* GPF7 */
+		};
+
+		/* WUC group 7 */
+		wuc_wu70: wu70 {
+			wucs = <&wuc7 BIT(0)>; /* GPE0 */
+		};
+		wuc_wu71: wu71 {
+			wucs = <&wuc7 BIT(1)>; /* GPE1 */
+		};
+		wuc_wu72: wu72 {
+			wucs = <&wuc7 BIT(2)>; /* GPE2 */
+		};
+		wuc_wu73: wu73 {
+			wucs = <&wuc7 BIT(3)>; /* GPE3 */
+		};
+		wuc_wu74: wu74 {
+			wucs = <&wuc7 BIT(4)>; /* GPI4 */
+		};
+		wuc_wu75: wu75 {
+			wucs = <&wuc7 BIT(5)>; /* GPI5 */
+		};
+		wuc_wu76: wu76 {
+			wucs = <&wuc7 BIT(6)>; /* GPI6 */
+		};
+		wuc_wu77: wu77 {
+			wucs = <&wuc7 BIT(7)>; /* GPI7 */
+		};
+
+		/* WUC group 8 */
+		wuc_wu80: wu80 {
+			wucs = <&wuc8 BIT(0)>; /* GPA3 */
+		};
+		wuc_wu81: wu81 {
+			wucs = <&wuc8 BIT(1)>; /* GPA4 */
+		};
+		wuc_wu82: wu82 {
+			wucs = <&wuc8 BIT(2)>; /* GPA5 */
+		};
+		wuc_wu83: wu83 {
+			wucs = <&wuc8 BIT(3)>; /* GPA6 */
+		};
+		wuc_wu84: wu84 {
+			wucs = <&wuc8 BIT(4)>; /* GPB2 */
+		};
+		wuc_wu85: wu85 {
+			wucs = <&wuc8 BIT(5)>; /* GPC0 */
+		};
+		wuc_wu86: wu86 {
+			wucs = <&wuc8 BIT(6)>; /* GPC7 */
+		};
+		wuc_wu87: wu87 {
+			wucs = <&wuc8 BIT(7)>; /* GPD7 */
+		};
+
+		/* WUC group 9 */
+		wuc_wu88: wu88 {
+			wucs = <&wuc9 BIT(0)>; /* GPH4 */
+		};
+		wuc_wu89: wu89 {
+			wucs = <&wuc9 BIT(1)>; /* GPH5 */
+		};
+		wuc_wu90: wu90 {
+			wucs = <&wuc9 BIT(2)>; /* GPH6 */
+		};
+		wuc_wu91: wu91 {
+			wucs = <&wuc9 BIT(3)>; /* GPA0 */
+		};
+		wuc_wu92: wu92 {
+			wucs = <&wuc9 BIT(4)>; /* GPA1 */
+		};
+		wuc_wu93: wu93 {
+			wucs = <&wuc9 BIT(5)>; /* GPA2 */
+		};
+		wuc_wu95: wu95 {
+			wucs = <&wuc9 BIT(7)>; /* GPC2 */
+		};
+
+		/* WUC group 10 */
+		wuc_wu96: wu96 {
+			wucs = <&wuc10 BIT(0)>; /* GPF0 */
+		};
+		wuc_wu97: wu97 {
+			wucs = <&wuc10 BIT(1)>; /* GPF1 */
+		};
+		wuc_wu98: wu98 {
+			wucs = <&wuc10 BIT(2)>; /* GPF2 */
+		};
+		wuc_wu99: wu99 {
+			wucs = <&wuc10 BIT(3)>; /* GPF3 */
+		};
+		wuc_wu100: wu100 {
+			wucs = <&wuc10 BIT(4)>; /* GPA7 */
+		};
+		wuc_wu101: wu101 {
+			wucs = <&wuc10 BIT(5)>; /* GPB0 */
+		};
+		wuc_wu102: wu102 {
+			wucs = <&wuc10 BIT(6)>; /* GPB1 */
+		};
+		wuc_wu103: wu103 {
+			wucs = <&wuc10 BIT(7)>; /* GPB3 */
+		};
+
+		/* WUC group 11 */
+		wuc_wu104: wu104 {
+			wucs = <&wuc11 BIT(0)>; /* GPB5 */
+		};
+		wuc_wu105: wu105 {
+			wucs = <&wuc11 BIT(1)>; /* GPB6 */
+		};
+		wuc_wu107: wu107 {
+			wucs = <&wuc11 BIT(3)>; /* GPC1 */
+		};
+		wuc_wu108: wu108 {
+			wucs = <&wuc11 BIT(4)>; /* GPC3 */
+		};
+		wuc_wu109: wu109 {
+			wucs = <&wuc11 BIT(5)>; /* GPC5 */
+		};
+		wuc_wu110: wu110 {
+			wucs = <&wuc11 BIT(6)>; /* GPD3 */
+		};
+		wuc_wu111: wu111 {
+			wucs = <&wuc11 BIT(7)>; /* GPD4 */
+		};
+
+		/* WUC group 12 */
+		wuc_wu112: wu112 {
+			wucs = <&wuc12 BIT(0)>; /* GPD5 */
+		};
+		wuc_wu113: wu113 {
+			wucs = <&wuc12 BIT(1)>; /* GPD6 */
+		};
+		wuc_wu114: wu114 {
+			wucs = <&wuc12 BIT(2)>; /* GPE4 */
+		};
+		wuc_wu115: wu115 {
+			wucs = <&wuc12 BIT(3)>; /* GPG0 */
+		};
+		wuc_wu116: wu116 {
+			wucs = <&wuc12 BIT(4)>; /* GPG1 */
+		};
+		wuc_wu117: wu117 {
+			wucs = <&wuc12 BIT(5)>; /* GPG2 */
+		};
+		wuc_wu118: wu118 {
+			wucs = <&wuc12 BIT(6)>; /* GPG6 */
+		};
+		wuc_wu119: wu119 {
+			wucs = <&wuc12 BIT(7)>; /* GPI0 */
+		};
+
+		/* WUC group 13 */
+		wuc_wu120: wu120 {
+			wucs = <&wuc13 BIT(0)>; /* GPI1 */
+		};
+		wuc_wu121: wu121 {
+			wucs = <&wuc13 BIT(1)>; /* GPI2 */
+		};
+		wuc_wu122: wu122 {
+			wucs = <&wuc13 BIT(2)>; /* GPI3 */
+		};
+		wuc_wu127: wu127 {
+			wucs = <&wuc13 BIT(7)>; /* GPH7 */
+		};
+
+		/* WUC group 14 */
+		wuc_wu128: wu128 {
+			wucs = <&wuc14 BIT(0)>; /* GPJ0 */
+		};
+		wuc_wu129: wu129 {
+			wucs = <&wuc14 BIT(1)>; /* GPJ1 */
+		};
+		wuc_wu131: wu131 {
+			wucs = <&wuc14 BIT(3)>; /* GPJ3 */
+		};
+		wuc_wu132: wu132 {
+			wucs = <&wuc14 BIT(4)>; /* GPJ4 */
+		};
+		wuc_wu133: wu133 {
+			wucs = <&wuc14 BIT(5)>; /* GPJ5 */
+		};
+		wuc_wu134: wu134 {
+			wucs = <&wuc14 BIT(6)>; /* GPJ6 */
+		};
+		wuc_wu135: wu135 {
+			wucs = <&wuc14 BIT(7)>; /* GPJ7 */
+		};
+
+		/* WUC group 15 */
+		wuc_wu136: wu136 {
+			wucs = <&wuc15 BIT(0)>; /* GPL0 */
+		};
+		wuc_wu137: wu137 {
+			wucs = <&wuc15 BIT(1)>; /* GPL1 */
+		};
+		wuc_wu138: wu138 {
+			wucs = <&wuc15 BIT(2)>; /* GPL2 */
+		};
+		wuc_wu139: wu139 {
+			wucs = <&wuc15 BIT(3)>; /* GPL3 */
+		};
+		wuc_wu140: wu140 {
+			wucs = <&wuc15 BIT(4)>; /* GPL4 */
+		};
+		wuc_wu141: wu141 {
+			wucs = <&wuc15 BIT(5)>; /* GPL5 */
+		};
+		wuc_wu142: wu142 {
+			wucs = <&wuc15 BIT(6)>; /* GPL6 */
+		};
+
+		/* WUC group 16 */
+		wuc_wu144: wu144 {
+			wucs = <&wuc16 BIT(0)>; /* GPM0 */
+		};
+		wuc_wu145: wu145 {
+			wucs = <&wuc16 BIT(1)>; /* GPM1 */
+		};
+		wuc_wu146: wu146 {
+			wucs = <&wuc16 BIT(2)>; /* GPM2 */
+		};
+		wuc_wu147: wu147 {
+			wucs = <&wuc16 BIT(3)>; /* GPM3 */
+		};
+		wuc_wu148: wu148 {
+			wucs = <&wuc16 BIT(4)>; /* GPM4 */
+		};
+		wuc_wu149: wu149 {
+			wucs = <&wuc16 BIT(5)>; /* GPM5 */
+		};
+		wuc_wu150: wu150 {
+			wucs = <&wuc16 BIT(6)>; /* GPM6 */
+		};
+
+		wuc_no_func: no_func {
+			wucs = <&wuc_fake 0>;
+		};
+	};
+};
diff --git a/dts/riscv/ite/it51xxx.dtsi b/dts/riscv/ite/it51xxx.dtsi
new file mode 100644
index 0000000000000..660c355227443
--- /dev/null
+++ b/dts/riscv/ite/it51xxx.dtsi
@@ -0,0 +1,1016 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <ite/it51xxx-wuc-map.dtsi>
+#include <mem.h>
+#include <zephyr/dt-bindings/clock/ite-it51xxx-clock.h>
+#include <zephyr/dt-bindings/dt-util.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-it51xxx-intc.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-it51xxx-wuc.h>
+#include <zephyr/dt-bindings/pinctrl/it8xxx2-pinctrl.h>
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "ite,riscv-ite", "riscv";
+			riscv,isa = "rv32imcb_zifencei";
+			device_type = "cpu";
+			reg = <0>;
+			clock-frequency = <32768>;
+			cpu-power-states = <&standby>;
+		};
+
+		power-states {
+			standby: standby {
+				compatible = "zephyr,power-state";
+				power-state-name = "standby";
+				min-residency-us = <500>;
+			};
+		};
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		flashctrl: flash-controller@f01000 {
+			compatible = "ite,it8xxx2-flash-controller";
+			reg = <0x00f01000 0x100>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash0: flash@0 {
+				compatible = "soc-nv-flash";
+				reg = <0 DT_SIZE_M(1)>;
+				erase-block-size = <4096>;
+				write-block-size = <4>;
+			};
+		};
+
+		sram0: memory@800000 {
+			compatible = "mmio-sram";
+			reg = <0x800000 DT_SIZE_K(128)>;
+		};
+
+		ilm: ilm@f01040 {
+			compatible = "ite,it8xxx2-ilm";
+			reg = <0xf01040 3>;	/* SCAR0 */
+		};
+
+		gpiogcr: gpio-gcr@f01600 {
+			compatible = "ite,it51xxx-gpiogcr";
+			reg = <0x00f01600 0x100>;
+		};
+
+		gpioa: gpio@f01601 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01601 1   /* GPDR (set) */
+			       0x00f01661 1   /* GPDMR (get) */
+			       0x00f01671 1   /* GPOTR */
+			       0x00f016d4 1   /* P18SCR */
+			       0x00f01610 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU91 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU92 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU93 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU80 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU81 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU82 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU83 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU100 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu91    /* GPA0 */
+				   &wuc_wu92    /* GPA1 */
+				   &wuc_wu93    /* GPA2 */
+				   &wuc_wu80    /* GPA3 */
+				   &wuc_wu81    /* GPA4 */
+				   &wuc_wu82    /* GPA5 */
+				   &wuc_wu83    /* GPA6 */
+				   &wuc_wu100>; /* GPA7 */
+			has-volt-sel = <1 1 1 1 0 0 1 1>;
+			#gpio-cells = <2>;
+		};
+
+		gpiob: gpio@f01602 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01602 1   /* GPDR (set) */
+			       0x00f01662 1   /* GPDMR (get) */
+			       0x00f01672 1   /* GPOTR */
+			       0x00f016d5 1   /* P18SCR */
+			       0x00f01618 7   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <7>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU101 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU102 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU84 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU103 IRQ_TYPE_LEVEL_HIGH
+				      NO_FUNC 0
+				      IT51XXX_IRQ_WU104 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU105 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu101   /* GPB0 */
+				   &wuc_wu102   /* GPB1 */
+				   &wuc_wu84    /* GPB2 */
+				   &wuc_wu103   /* GPB3 */
+				   &wuc_no_func /* NO_FUNC */
+				   &wuc_wu104   /* GPB5 */
+				   &wuc_wu105>; /* GPB6 */
+			has-volt-sel = <0 0 1 0 0 0 0 0>;
+			#gpio-cells = <2>;
+		};
+
+		gpioc: gpio@f01603 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01603 1   /* GPDR (set) */
+			       0x00f01663 1   /* GPDMR (get) */
+			       0x00f01673 1   /* GPOTR */
+			       0x00f016d6 1   /* P18SCR */
+			       0x00f01620 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU85 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU107 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU95 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU108 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU22 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU109 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU23 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU86 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu85   /* GPC0 */
+				   &wuc_wu107  /* GPC1 */
+				   &wuc_wu95   /* GPC2 */
+				   &wuc_wu108  /* GPC3 */
+				   &wuc_wu22   /* GPC4 */
+				   &wuc_wu109  /* GPC5 */
+				   &wuc_wu23   /* GPC6 */
+				   &wuc_wu86>; /* GPC7 */
+			has-volt-sel = <1 0 0 1 1 1 1 0>;
+			#gpio-cells = <2>;
+		};
+
+		gpiod: gpio@f01604 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01604 1   /* GPDR (set) */
+			       0x00f01664 1   /* GPDMR (get) */
+			       0x00f01674 1   /* GPOTR */
+			       0x00f016d7 1   /* P18SCR */
+			       0x00f01628 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU20 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU21 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU24 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU110 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU111 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU112 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU113 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU87 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu20   /* GPD0 */
+				   &wuc_wu21   /* GPD1 */
+				   &wuc_wu24   /* GPD2 */
+				   &wuc_wu110  /* GPD3 */
+				   &wuc_wu111  /* GPD4 */
+				   &wuc_wu112  /* GPD5 */
+				   &wuc_wu113  /* GPD6 */
+				   &wuc_wu87>; /* GPD7 */
+			has-volt-sel = <0 0 0 0 0 1 1 1>;
+			#gpio-cells = <2>;
+		};
+
+		gpioe: gpio@f01605 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01605 1   /* GPDR (set) */
+			       0x00f01665 1   /* GPDMR (get) */
+			       0x00f01675 1   /* GPOTR */
+			       0x00f016d8 1   /* P18SCR */
+			       0x00f01630 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU70 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU71 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU72 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU73 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU114 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU40 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU45 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU46 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu70   /* GPE0 */
+				   &wuc_wu71   /* GPE1 */
+				   &wuc_wu72   /* GPE2 */
+				   &wuc_wu73   /* GPE3 */
+				   &wuc_wu114  /* GPE4 */
+				   &wuc_wu40   /* GPE5 */
+				   &wuc_wu45   /* GPE6 */
+				   &wuc_wu46>; /* GPE7 */
+			has-volt-sel = <0 1 1 1 0 1 0 0>;
+			#gpio-cells = <2>;
+		};
+
+		gpiof: gpio@f01606 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01606 1   /* GPDR (set) */
+			       0x00f01666 1   /* GPDMR (get) */
+			       0x00f01676 1   /* GPOTR */
+			       0x00f016d9 1   /* P18SCR */
+			       0x00f01638 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU96 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU97 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU98 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU99 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU64 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU65 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU66 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU67 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu96   /* GPF0 */
+				   &wuc_wu97   /* GPF1 */
+				   &wuc_wu98   /* GPF2 */
+				   &wuc_wu99   /* GPF3 */
+				   &wuc_wu64   /* GPF4 */
+				   &wuc_wu65   /* GPF5 */
+				   &wuc_wu66   /* GPF6 */
+				   &wuc_wu67>; /* GPF7 */
+			has-volt-sel = <1 1 0 0 0 0 0 0>;
+			#gpio-cells = <2>;
+		};
+
+		gpiog: gpio@f01607 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01607 1   /* GPDR (set) */
+			       0x00f01667 1   /* GPDMR (get) */
+			       0x00f01677 1   /* GPOTR */
+			       0x00f016da 1   /* P18SCR */
+			       0x00f01640 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU115 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU116 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU117 IRQ_TYPE_LEVEL_HIGH
+				      NO_FUNC 0
+				      NO_FUNC 0
+				      NO_FUNC 0
+				      IT51XXX_IRQ_WU118 IRQ_TYPE_LEVEL_HIGH
+				      NO_FUNC 0>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu115     /* GPG0 */
+				   &wuc_wu116     /* GPG1 */
+				   &wuc_wu117     /* GPG2 */
+				   &wuc_no_func   /* NO_FUNC */
+				   &wuc_no_func   /* NO_FUNC */
+				   &wuc_no_func   /* NO_FUNC */
+				   &wuc_wu118     /* GPG6 */
+				   &wuc_no_func>; /* NO_FUNC */
+			has-volt-sel = <1 0 1 0 0 0 0 0>;
+			#gpio-cells = <2>;
+		};
+
+		gpioh: gpio@f01608 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01608 1   /* GPDR (set) */
+			       0x00f01668 1   /* GPDMR (get) */
+			       0x00f01678 1   /* GPOTR */
+			       0x00f016db 1   /* P18SCR */
+			       0x00f01648 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU60 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU61 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU62 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU63 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU88 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU89 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU90 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU127 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu60    /* GPH0 */
+				   &wuc_wu61    /* GPH1 */
+				   &wuc_wu62    /* GPH2 */
+				   &wuc_wu63    /* GPH3 */
+				   &wuc_wu88    /* GPH4 */
+				   &wuc_wu89    /* GPH5 */
+				   &wuc_wu90    /* GPH6 */
+				   &wuc_wu127>; /* GPH7 */
+			has-volt-sel = <0 0 0 1 1 1 1 1>;
+			#gpio-cells = <2>;
+		};
+
+		gpioi: gpio@f01609 {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f01609 1   /* GPDR (set) */
+			       0x00f01669 1   /* GPDMR (get) */
+			       0x00f01679 1   /* GPOTR */
+			       0x00f016dc 1   /* P18SCR */
+			       0x00f01650 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU119 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU120 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU121 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU122 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU74 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU75 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU76 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU77 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu119  /* GPI0 */
+				   &wuc_wu120  /* GPI1 */
+				   &wuc_wu121  /* GPI2 */
+				   &wuc_wu122  /* GPI3 */
+				   &wuc_wu74   /* GPI4 */
+				   &wuc_wu75   /* GPI5 */
+				   &wuc_wu76   /* GPI6 */
+				   &wuc_wu77>; /* GPI7 */
+			has-volt-sel = <1 1 1 1 1 1 1 1>;
+			#gpio-cells = <2>;
+		};
+
+		gpioj: gpio@f0160a {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f0160a 1   /* GPDR (set) */
+			       0x00f0166a 1   /* GPDMR (get) */
+			       0x00f0167a 1   /* GPOTR */
+			       0x00f016dd 1   /* P18SCR */
+			       0x00f01658 8   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU128 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU129 IRQ_TYPE_LEVEL_HIGH
+				      NO_FUNC 0
+				      IT51XXX_IRQ_WU131 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU132 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU133 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU134 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU135 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu128   /* GPJ0 */
+				   &wuc_wu129   /* GPJ1 */
+				   &wuc_no_func /* NO_FUNC */
+				   &wuc_wu131   /* GPJ3 */
+				   &wuc_wu132   /* GPJ4 */
+				   &wuc_wu133   /* GPJ5 */
+				   &wuc_wu134   /* GPJ6 */
+				   &wuc_wu135>; /* GPJ7 */
+			has-volt-sel = <1 1 0 1 1 1 1 1>;
+			#gpio-cells = <2>;
+		};
+
+		gpiok: gpio@f0160b {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f0160b 1   /* GPDR (set) */
+			       0x00f0166b 1   /* GPDMR (get) */
+			       0x00f0167b 1   /* GPOTR */
+			       NO_FUNC 1      /* P18SCR */
+			       0x00f01690 8   /* GPCR */
+			       0x00f01d2d 1>; /* KSOLFSELR */
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <NO_FUNC 0
+				      NO_FUNC 0
+				      NO_FUNC 0
+				      NO_FUNC 0
+				      NO_FUNC 0
+				      NO_FUNC 0
+				      NO_FUNC 0
+				      NO_FUNC 0>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_no_func /* NO_FUNC */
+				   &wuc_no_func
+				   &wuc_no_func
+				   &wuc_no_func
+				   &wuc_no_func
+				   &wuc_no_func
+				   &wuc_no_func
+				   &wuc_no_func>;
+			#gpio-cells = <2>;
+		};
+
+		gpiol: gpio@f0160c {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f0160c 1   /* GPDR (set) */
+			       0x00f0166c 1   /* GPDMR (get) */
+			       0x00f0167c 1   /* GPOTR */
+			       NO_FUNC 1      /* P18SCR */
+			       0x00f01698 8   /* GPCR */
+			       0x00f01d2e 1>; /* KSOHFSELR */
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU136 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU137 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU138 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU139 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU140 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU141 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU142 IRQ_TYPE_LEVEL_HIGH
+				      NO_FUNC 0>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu136     /* GPL0 */
+				   &wuc_wu137     /* GPL1 */
+				   &wuc_wu138     /* GPL2 */
+				   &wuc_wu139     /* GPL3 */
+				   &wuc_wu140     /* GPL4 */
+				   &wuc_wu141     /* GPL5 */
+				   &wuc_wu142     /* GPL6 */
+				   &wuc_no_func>; /* NO_FUNC */
+			#gpio-cells = <2>;
+		};
+
+		gpiom: gpio@f0160d {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f0160d 1   /* GPDR (set) */
+			       0x00f0166d 1   /* GPDMR (get) */
+			       NO_FUNC 1      /* GPOTR */
+			       NO_FUNC 1      /* P18SCR */
+			       0x00f016a0 7   /* GPCR */
+			       NO_FUNC 1>;
+			ngpios = <7>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WU144 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU145 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU146 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU147 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU148 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU149 IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WU150 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu144   /* GPM0 */
+				   &wuc_wu145   /* GPM1 */
+				   &wuc_wu146   /* GPM2 */
+				   &wuc_wu147   /* GPM3 */
+				   &wuc_wu148   /* GPM4 */
+				   &wuc_wu149   /* GPM5 */
+				   &wuc_wu150>; /* GPM6 */
+			#gpio-cells = <2>;
+		};
+
+		gpion: gpio@f0160e {
+			compatible = "ite,it51xxx-gpio";
+			reg = <0x00f0160e 1   /* GPDR (set) */
+			       0x00f0166e 1   /* GPDMR (get) */
+			       0x00f0167e 1   /* GPOTR */
+			       NO_FUNC 1      /* P18SCR */
+			       0x00f016a8 8   /* GPCR */
+			       0x00f01d2c 1>; /* KSIFSELR */
+			ngpios = <8>;
+			gpio-controller;
+			interrupts = <IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH
+				      IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			wucctrl = <&wuc_wu30   /* GPN0 */
+				   &wuc_wu31   /* GPN1 */
+				   &wuc_wu32   /* GPN2 */
+				   &wuc_wu33   /* GPN3 */
+				   &wuc_wu34   /* GPN4 */
+				   &wuc_wu35   /* GPN5 */
+				   &wuc_wu36   /* GPN6 */
+				   &wuc_wu37>; /* GPN7 */
+			#gpio-cells = <2>;
+		};
+
+		pinctrl: pin-controller {
+			compatible = "ite,it8xxx2-pinctrl";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			status = "okay";
+		};
+
+		pinctrla: pinctrl@f01610 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01610 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 0xf016fe 0xf016fe 0xf016f0 0xf016f0>;
+			func3-en-mask = <0        0        0        0
+					 BIT(5)   BIT(5)   BIT(4)   BIT(3)  >;
+			func4-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC >;
+			func4-en-mask = <0        0        0        0
+					 0        0        0        0       >;
+			volt-sel =      <0xf016d4 0xf016d4 0xf016d4 0xf016d4
+					 NO_FUNC  NO_FUNC  0xf016d4 0xf016d4>;
+			volt-sel-mask = <BIT(0)   BIT(1)   BIT(2)   BIT(3)
+					 0        0        BIT(6)   BIT(7)  >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrlb: pinctrl@f01618 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01618 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <NO_FUNC  NO_FUNC  0xf016f0 NO_FUNC
+					 NO_FUNC  0xf016f7 NO_FUNC  NO_FUNC >;
+			func3-en-mask = <0        0        BIT(1)   0
+					 0        BIT(5)   0        0       >;
+			func4-gcr =     <NO_FUNC  NO_FUNC  0xf016ed NO_FUNC
+					 NO_FUNC  0xf016ed NO_FUNC  NO_FUNC >;
+			func4-en-mask = <0        0        BIT(2)   0
+					 0        BIT(3)   0        0       >;
+			volt-sel =      <NO_FUNC  NO_FUNC  0xf016d5 NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC >;
+			volt-sel-mask = <0        0        BIT(2)   0
+					 0        0        0        0       >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrlc: pinctrl@f01620 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01620 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 0xf016f0 NO_FUNC  0xf016f0 0xf016f6>;
+			func3-en-mask = <0        0        0        0
+					 BIT(4)   0        BIT(4)   BIT(7)  >;
+			func4-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  0xf016f4 0xf016f5>;
+			func4-en-mask = <0        0        0        0
+					 0        0        BIT(0)   BIT(0)  >;
+			volt-sel =      <0xf016d6 NO_FUNC  NO_FUNC  0xf016d6
+					 0xf016d6 0xf016d6 0xf016d6 NO_FUNC >;
+			volt-sel-mask = <BIT(0)   0        0        BIT(3)
+					 BIT(4)   BIT(5)   BIT(6)   0       >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrld: pinctrl@f01628 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01628 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <0xf016ed 0xf016ed NO_FUNC  NO_FUNC
+					 0xf03292 0xf016f0 NO_FUNC  NO_FUNC >;
+			func3-en-mask = <BIT(1)   BIT(1)   0        0
+					 BIT(5)   BIT(1)   0        0       >;
+			func4-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC >;
+			func4-en-mask = <0        0        0        0
+					 0        0        0        0       >;
+			volt-sel =      <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  0xf016d7 0xf016d7 0xf016d7>;
+			volt-sel-mask = <0        0        0        0
+					 0        BIT(5)   BIT(6)   BIT(7)  >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrle: pinctrl@f01630 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01630 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <0xf016f3 NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  0xf016f0 0xf016fe 0xf016fe>;
+			func3-en-mask = <BIT(0)   0        0        0
+					 0        BIT(3)   BIT(7)   BIT(4)  >;
+			func4-gcr =     <0xf016fe NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  0xf016f5 NO_FUNC >;
+			func4-en-mask = <BIT(4)   0        0        0
+					 0        0        BIT(1)   0       >;
+			volt-sel =      <NO_FUNC  0xf016d8 0xf016d8 0xf016d8
+					 NO_FUNC  0xf016d8 NO_FUNC  NO_FUNC >;
+			volt-sel-mask = <0        BIT(1)   BIT(2)   BIT(3)
+					 0        BIT(5)   0        0       >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrlf: pinctrl@f01638 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01638 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  0xf016f1 NO_FUNC>;
+			func3-en-mask = <0        0        0        0
+					 0        0        BIT(4)   0      >;
+			func4-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC>;
+			func4-en-mask = <0        0        0        0
+					 0        0        0        0      >;
+			volt-sel =      <0xf016d9 0xf016d9 NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC>;
+			volt-sel-mask = <BIT(0)   BIT(1)   0        0
+					 0        0        0        0      >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrlg: pinctrl@f01640 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01640 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <NO_FUNC  0xf016f0 NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  0xf016f0 NO_FUNC>;
+			func3-en-mask = <0        BIT(3)   0        0
+					 0        0        BIT(1)   0      >;
+			func4-gcr =     <NO_FUNC  0xf016f0 NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC>;
+			func4-en-mask = <0        BIT(6)   0        0
+					 0        0        0        0      >;
+			volt-sel =      <0xf016da NO_FUNC  0xf016da NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC>;
+			volt-sel-mask = <BIT(0)   0        BIT(2)   0
+					 0        0        0        0      >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrlh: pinctrl@f01648 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01648 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <0xf016f0 0xf016f5 0xf016f5 0xf016f0
+					 0xf016f0 NO_FUNC  NO_FUNC  0xf016f0>;
+			func3-en-mask = <BIT(1)   BIT(2)   BIT(3)   BIT(1)
+					 BIT(1)   0        0        BIT(5)  >;
+			func4-gcr =     <0xf016ed 0xf016f1 0xf016f1 NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  0xf016f5>;
+			func4-en-mask = <BIT(2)   BIT(5)   BIT(5)   0
+					 0        0        0        BIT(7)  >;
+			volt-sel =      <NO_FUNC  NO_FUNC  NO_FUNC  0xf016db
+					 0xf016db 0xf016db 0xf016db 0xf016db>;
+			volt-sel-mask = <0        0        0        BIT(3)
+					 BIT(4)   BIT(5)   BIT(6)   BIT(7)  >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrli: pinctrl@f01650 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01650 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  0xf016f0 0xf016f0 0xf016f0>;
+			func3-en-mask = <0        0        0        0
+					 0        BIT(3)   BIT(3)   BIT(3)  >;
+			func4-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC >;
+			func4-en-mask = <0        0        0        0
+					 0        0        0        0       >;
+			volt-sel =      <0xf016dc 0xf016dc 0xf016dc 0xf016dc
+					 0xf016dc 0xf016dc 0xf016dc 0xf016dc>;
+			volt-sel-mask = <BIT(0)   BIT(1)   BIT(2)   BIT(3)
+					 BIT(4)   BIT(5)   BIT(6)   BIT(7)  >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrlj: pinctrl@f01658 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01658 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <0xf016f1 0xf016fe NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  0xf016f4 0xf016d1>;
+			func3-en-mask = <BIT(7)   BIT(3)   0        0
+					 0        0        BIT(1)   BIT(3)  >;
+			func4-gcr =     <NO_FUNC  NO_FUNC  NO_FUNC  NO_FUNC
+					 NO_FUNC  NO_FUNC  0xf016ed 0xf016f0>;
+			func4-en-mask = <0        0        0        0
+					 0        0        BIT(3)   BIT(4)  >;
+			volt-sel =      <0xf016dd NO_FUNC  0xf016dd 0xf016dd
+					 0xf016dd 0xf016dd 0xf016dd 0xf016dd>;
+			volt-sel-mask = <BIT(0)   0        BIT(2)   BIT(3)
+					 BIT(4)   BIT(5)   BIT(6)   BIT(7)  >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrlk: pinctrl@f01d2d {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01d2d 1   /* KSOLGCTRL */
+			       0x00f01d02 1>; /* KSOCTRL */
+			pp-od-mask = <BIT(0)>;
+			pullup-mask = <BIT(2)>;
+			#pinmux-cells = <2>;
+		};
+
+		pinctrll: pinctrl@f01d2e {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01d2e 1   /* KSOHGCTRL */
+			       0x00f01d02 1>; /* KSOCTRL */
+			pp-od-mask = <BIT(0)>;
+			pullup-mask = <BIT(2)>;
+			#pinmux-cells = <2>;
+		};
+
+		pinctrlm: pinctrl@f016a0 {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f016a0 8     /* GPCR */
+			       NO_FUNC    1>;
+			func3-gcr =     <NO_FUNC NO_FUNC NO_FUNC NO_FUNC
+					 NO_FUNC NO_FUNC NO_FUNC NO_FUNC>;
+			func3-en-mask = <0       0       0       0
+					 0       0       0       0      >;
+			func4-gcr =     <NO_FUNC NO_FUNC NO_FUNC NO_FUNC
+					 NO_FUNC NO_FUNC NO_FUNC NO_FUNC>;
+			func4-en-mask = <0       0       0       0
+					 0       0       0       0      >;
+			volt-sel =      <NO_FUNC NO_FUNC NO_FUNC NO_FUNC
+					 NO_FUNC NO_FUNC NO_FUNC NO_FUNC>;
+			volt-sel-mask = <0       0       0       0
+					 0       0       0       0      >;
+			#pinmux-cells = <2>;
+			gpio-group;
+		};
+
+		pinctrln: pinctrl@f01d2c {
+			compatible = "ite,it8xxx2-pinctrl-func";
+			reg = <0x00f01d2c 1   /* KSIGCTRL */
+			       0x00f01d05 1>; /* KSICTRL */
+			pp-od-mask = <NO_FUNC>;
+			pullup-mask = <BIT(2)>;
+			#pinmux-cells = <2>;
+		};
+
+		wuc1: wakeup-controller@f01b00 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b00 1   /* WUEMR1 */
+			       0x00f01b04 1   /* WUESR1 */
+			       0x00f01b08 1   /* WUENR1 */
+			       0x00f01b3c 1>; /* WUBEMR1 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc2: wakeup-controller@f01b01 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b01             1   /* WUEMR2 */
+			       0x00f01b05             1   /* WUESR2 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR2 */
+			       0x00f01b3d             1>; /* WUBEMR2 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc3: wakeup-controller@f01b02 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b02 1   /* WUEMR3 */
+			       0x00f01b06 1   /* WUESR3 */
+			       0x00f01b0a 1   /* WUENR3 */
+			       0x00f01b3e 1>; /* WUBEMR3 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc4: wakeup-controller@f01b03 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b03 1   /* WUEMR4 */
+			       0x00f01b07 1   /* WUESR4 */
+			       0x00f01b0b 1   /* WUENR4 */
+			       0x00f01b3f 1>; /* WUBEMR4 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc6: wakeup-controller@f01b10 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b10             1   /* WUEMR6 */
+			       0x00f01b11             1   /* WUESR6 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR6 */
+			       0x00f01b13             1>; /* WUBEMR6 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc7: wakeup-controller@f01b14 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b14             1   /* WUEMR7 */
+			       0x00f01b15             1   /* WUESR7 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR7 */
+			       0x00f01b17             1>; /* WUBEMR7 */
+			wakeup-controller;
+			both-edge-trigger;
+			#wuc-cells = <1>;
+		};
+
+		wuc8: wakeup-controller@f01b18 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b18             1   /* WUEMR8 */
+			       0x00f01b19             1   /* WUESR8 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR8 */
+			       0x00f01b1b             1>; /* WUBEMR8 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc9: wakeup-controller@f01b1c {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b1c             1   /* WUEMR9 */
+			       0x00f01b1d             1   /* WUESR9 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR9 */
+			       0x00f01b1f             1>; /* WUBEMR9 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc10: wakeup-controller@f01b20 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b20             1   /* WUEMR10 */
+			       0x00f01b21             1   /* WUESR10 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR10 */
+			       0x00f01b23             1>; /* WUBEMR10 */
+			wakeup-controller;
+			both-edge-trigger;
+			#wuc-cells = <1>;
+		};
+
+		wuc11: wakeup-controller@f01b24 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b24             1   /* WUEMR11 */
+			       0x00f01b25             1   /* WUESR11 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR11 */
+			       0x00f01b27             1>; /* WUBEMR11 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc12: wakeup-controller@f01b28 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b28             1   /* WUEMR12 */
+			       0x00f01b29             1   /* WUESR12 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR12 */
+			       0x00f01b2b             1>; /* WUBEMR12 */
+			wakeup-controller;
+			both-edge-trigger;
+			#wuc-cells = <1>;
+		};
+
+		wuc13: wakeup-controller@f01b2c {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b2c             1   /* WUEMR13 */
+			       0x00f01b2d             1   /* WUESR13 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR13 */
+			       0x00f01b2f             1>; /* WUBEMR13 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc14: wakeup-controller@f01b30 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b30             1   /* WUEMR14 */
+			       0x00f01b31             1   /* WUESR14 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR14 */
+			       0x00f01b33             1>; /* WUBEMR14 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc15: wakeup-controller@f01b34 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b34             1   /* WUEMR15 */
+			       0x00f01b35             1   /* WUESR15 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR15 */
+			       0x00f01b37             1>; /* WUBEMR15 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc16: wakeup-controller@f01b38 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0x00f01b38             1   /* WUEMR16 */
+			       0x00f01b39             1   /* WUESR16 */
+			       IT51XXX_WUC_UNUSED_REG 1   /* WUENR16 */
+			       0x00f01b3b             1>; /* WUBEMR16 */
+			wakeup-controller;
+			#wuc-cells = <1>;
+		};
+
+		wuc_fake: wakeup-controller@0 {
+			compatible = "ite,it51xxx-wuc";
+			reg = <0 1
+			       0 1
+			       0 1
+			       0 1>;
+			#wuc-cells = <1>;
+		};
+
+		ecpm: clock-controller@f01e00 {
+			compatible = "ite,it51xxx-ecpm";
+			reg = <0x00f01e00 0x0a>;
+			pll-frequency = <PLL_48000_KHZ>;
+			#clock-cells = <2>;
+		};
+
+		gctrl: general-control@f02000 {
+			compatible = "ite,it51xxx-gctrl";
+			reg = <0x00f02000 0x100>;
+		};
+
+		uart1: uart@f02700 {
+			compatible = "ns16550";
+			reg = <0x00f02700 0x0020>;
+			status = "disabled";
+			current-speed = <115200>;
+			clock-frequency = <1843200>;
+			interrupts = <38 IRQ_TYPE_EDGE_RISING>;
+			interrupt-parent = <&intc>;
+			reg-shift = <0>;
+		};
+
+		ite_uart1_wrapper: uartwrapper@f02720 {
+			compatible = "ite,it51xxx-uart";
+			reg = <0x00f02720 0x0020>;
+			status = "disabled";
+			wucctrl = <&wuc_wu86>; /* GPC7 */
+			interrupts = <IT51XXX_IRQ_WU86 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			clocks = <&ecpm IT51XXX_ECPM_CGCTRL3R_OFF BIT(2)>;
+		};
+
+		uart2: uart@f02800 {
+			compatible = "ns16550";
+			reg = <0x00f02800 0x0020>;
+			status = "disabled";
+			current-speed = <460800>;
+			clock-frequency = <1843200>;
+			interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+			interrupt-parent = <&intc>;
+			reg-shift = <0>;
+		};
+
+		ite_uart2_wrapper: uartwrapper@f02820 {
+			compatible = "ite,it51xxx-uart";
+			reg = <0x00f02820 0x0020>;
+			status = "disabled";
+			wucctrl = <&wuc_wu61>; /* GPH1 */
+			interrupts = <IT51XXX_IRQ_WU61 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-parent = <&intc>;
+			clocks = <&ecpm IT51XXX_ECPM_CGCTRL3R_OFF BIT(2)>;
+		};
+
+		intc: interrupt-controller@f04300 {
+			compatible = "ite,it51xxx-intc";
+			#address-cells = <0>;
+			#interrupt-cells = <2>;
+			interrupt-controller;
+			reg = <0x00f04300 0x0100>;
+		};
+
+		timer: timer@f04700 {
+			compatible = "ite,it51xxx-timer";
+			reg = <0x00f04700 0xff>;
+			interrupts = <IT51XXX_IRQ_TIMER3_DW IRQ_TYPE_EDGE_RISING   /* Event timer */
+				      IT51XXX_IRQ_TIMER4_DW IRQ_TYPE_EDGE_RISING   /* Free run */
+				      IT51XXX_IRQ_TIMER5_DW IRQ_TYPE_EDGE_RISING   /* Busy wait */
+				      IT51XXX_IRQ_TIMER6_DW IRQ_TYPE_EDGE_RISING   /* Busy wait */
+				      IT51XXX_IRQ_TIMER7_DW IRQ_TYPE_EDGE_RISING>;
+			interrupt-parent = <&intc>;
+		};
+
+		kbd: kbd@f01d00 {
+			compatible = "ite,it51xxx-kbd";
+			reg = <0x00f01d00 0x29>;
+			interrupt-parent = <&intc>;
+			interrupts = <IT51XXX_IRQ_WKINTC IRQ_TYPE_LEVEL_HIGH>;
+			status = "disabled";
+			wucctrl = <&wuc_wu30   /* KSI[0] */
+				   &wuc_wu31   /* KSI[1] */
+				   &wuc_wu32   /* KSI[2] */
+				   &wuc_wu33   /* KSI[3] */
+				   &wuc_wu34   /* KSI[4] */
+				   &wuc_wu35   /* KSI[5] */
+				   &wuc_wu36   /* KSI[6] */
+				   &wuc_wu37>; /* KSI[7] */
+			kso16-gpios = <&gpioc 3 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+			kso17-gpios = <&gpioc 5 (GPIO_OPEN_DRAIN | GPIO_PULL_UP)>;
+		};
+
+		twd0: watchdog@f04780 {
+			compatible = "ite,it51xxx-watchdog";
+			reg = <0x00f04780 0x20>;
+			interrupts = <IT51XXX_IRQ_TIMER1_DW IRQ_TYPE_EDGE_RISING>; /* Warn timer */
+			interrupt-parent = <&intc>;
+		};
+	};
+};
diff --git a/dts/riscv/ite/it8xxx2.dtsi b/dts/riscv/ite/it8xxx2.dtsi
index dfbebc7d61560..05610ce98435c 100644
--- a/dts/riscv/ite/it8xxx2.dtsi
+++ b/dts/riscv/ite/it8xxx2.dtsi
@@ -153,6 +153,15 @@
 			interrupt-parent = <&intc>;
 		};
 
+		counter0: counter@f01f30 {
+			compatible = "ite,it8xxx2-counter";
+			reg = <0xf01f30 0x10>;
+			interrupts = <IT8XXX2_IRQ_TIMER7 IRQ_TYPE_EDGE_RISING   /* Alarm timer */
+				      IT8XXX2_IRQ_TIMER8 IRQ_TYPE_EDGE_RISING>; /* Top timer */
+			interrupt-parent = <&intc>;
+			status = "disabled";
+		};
+
 		gpioa: gpio@f01601 {
 			compatible = "ite,it8xxx2-gpio";
 			reg = <0x00f01601 1   /* GPDR (set) */
diff --git a/dts/riscv/neorv32.dtsi b/dts/riscv/neorv32.dtsi
index 53d4837075d5a..34c9088faeee9 100644
--- a/dts/riscv/neorv32.dtsi
+++ b/dts/riscv/neorv32.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+ * Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -19,8 +19,7 @@
 		#size-cells = <0>;
 
 		cpu0: cpu@0 {
-			compatible = "neorv32-cpu", "riscv";
-			riscv,isa = "rv32imc_zicsr";
+			compatible = "neorv32,cpu", "riscv";
 			reg = <0>;
 			device_type = "cpu";
 
@@ -64,77 +63,76 @@
 		#size-cells = <1>;
 		ranges;
 
-		mtimer: timer@ffffff90 {
+		imem: memory@0 {
+			compatible = "soc-nv-flash", "mmio-sram";
+			status = "disabled";
+		};
+
+		dmem: memory@80000000 {
+			compatible = "mmio-sram";
+			status = "disabled";
+		};
+
+		bootrom: rom@ffe00000 {
+			compatible = "neorv32,bootrom", "mmio-sram";
+			status = "disabled";
+			reg = <0xffe00000 0x10000>;
+		};
+
+		clint: clint@fff40000 {
+			compatible = "neorv32,clint", "sifive,clint0";
+			status = "disabled";
+			reg = <0xfff40000 0x10000>;
+			interrupts-extended = <&intc 3>;
+		};
+
+		mtimer: timer@fff4bff8 {
 			compatible = "riscv,machine-timer";
-			reg = <0xffffff90 0x8 0xffffff98 0x8>;
+			status = "disabled";
+			reg = <0xfff4bff8 0x8 0xfff44000 0x8>;
+			reg-names = "mtime", "mtimecmp";
 			interrupts-extended = <&intc 7>;
 		};
 
-		uart0: serial@ffffffa0 {
-			compatible = "neorv32-uart";
+		uart0: serial@fff50000 {
+			compatible = "neorv32,uart";
 			status = "disabled";
-			reg = <0xffffffa0 8>;
+			reg = <0xfff50000 0x10000>;
 			interrupts = <2>, <3>;
 			interrupt-names = "RX", "TX";
 			syscon = <&sysinfo>;
 		};
 
-		trng: rng@ffffffb8 {
-			compatible = "neorv32-trng";
+		uart1: serial@fff60000 {
+			compatible = "neorv32,uart";
 			status = "disabled";
-			reg = <0xffffffb8 4>;
+			reg = <0xfff60000 0x10000>;
+			interrupts = <4>, <5>;
+			interrupt-names = "RX", "TX";
 			syscon = <&sysinfo>;
 		};
 
-		gpio: gpio {
-			compatible = "simple-bus";
-			gpio-map-mask = <0xffffffe0 0xffffffc0>;
-			gpio-map-pass-thru = <0x1f 0x3f>;
-			gpio-map = <
-				0x00 0x0 &gpio_lo 0x0 0x0
-				0x20 0x0 &gpio_hi 0x0 0x0
-			>;
-			#gpio-cells = <2>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-
-			gpio_lo: gpio@ffffffc0 {
-				compatible = "neorv32-gpio";
-				status = "disabled";
-				reg = <0xffffffc0 4 0xffffffc8 4>;
-				reg-names = "input", "output";
-				gpio-controller;
-				ngpios = <32>;
-				syscon = <&sysinfo>;
-				#gpio-cells = <2>;
-			};
-
-			gpio_hi: gpio@ffffffc4 {
-				compatible = "neorv32-gpio";
-				status = "disabled";
-				reg = <0xffffffc4 4 0xffffffcc 4>;
-				reg-names = "input", "output";
-				gpio-controller;
-				ngpios = <32>;
-				syscon = <&sysinfo>;
-				#gpio-cells = <2>;
-			};
+		trng: rng@fffa0000 {
+			compatible = "neorv32,trng";
+			status = "disabled";
+			reg = <0xfffa0000 0x10000>;
+			syscon = <&sysinfo>;
 		};
 
-		uart1: serial@ffffffd0 {
-			compatible = "neorv32-uart";
+		gpio: gpio@fffc0000 {
+			compatible = "neorv32,gpio";
 			status = "disabled";
-			reg = <0xffffffd0 8>;
-			interrupts = <4>, <5>;
-			interrupt-names = "RX", "TX";
+			reg = <0xfffc0000 0x10000>;
 			syscon = <&sysinfo>;
+			gpio-controller;
+			ngpios = <32>;
+			#gpio-cells = <2>;
 		};
 
-		sysinfo: syscon@ffffffe0 {
+		sysinfo: syscon@fffe0000 {
 			compatible = "neorv-sysinfo", "syscon";
 			status = "okay";
-			reg = <0xffffffe0 32>;
+			reg = <0xfffe0000 0x10000>;
 		};
 	};
 };
diff --git a/dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi
new file mode 100644
index 0000000000000..7ae952e79f6ae
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l09_enga_cpuflpr.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l09.dtsi>
+
+cpu: &cpuflpr {};
+clic: &cpuflpr_clic {};
+
+/delete-node/ &cpuapp;
+/delete-node/ &cpuapp_rram;
+/delete-node/ &cpuapp_ppb;
+/delete-node/ &cpuapp_sram;
+
+/ {
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuflpr_clic>;
+		ranges;
+	};
+};
+
+&cpuflpr {
+	cpuflpr_vevif_rx: mailbox {
+		compatible = "nordic,nrf-vevif-task-rx";
+		status = "disabled";
+		interrupt-parent = <&cpuflpr_clic>;
+		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+	};
+};
+
+&cpuflpr_vpr {
+	cpuflpr_vevif_tx: mailbox {
+		compatible = "nordic,nrf-vevif-event-tx";
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+		status = "disabled";
+	};
+};
+
+&cpuflpr_clic {
+	status = "okay";
+};
+
+&grtc {
+	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote20 {
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote30 {
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+};
diff --git a/dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi b/dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi
new file mode 100644
index 0000000000000..4bd1a179fbc5e
--- /dev/null
+++ b/dts/riscv/nordic/nrf54l20_enga_cpuflpr.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nordic/nrf54l20.dtsi>
+
+cpu: &cpuflpr {};
+clic: &cpuflpr_clic {};
+
+/delete-node/ &cpuapp;
+/delete-node/ &cpuapp_rram;
+/delete-node/ &cpuapp_ppb;
+/delete-node/ &cpuapp_sram;
+
+/ {
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuflpr_clic>;
+		ranges;
+	};
+};
+
+&cpuflpr {
+	cpuflpr_vevif_rx: mailbox {
+		compatible = "nordic,nrf-vevif-task-rx";
+		status = "disabled";
+		interrupt-parent = <&cpuflpr_clic>;
+		interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <17 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <18 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <19 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <20 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <21 NRF_DEFAULT_IRQ_PRIORITY>,
+			     <22 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+	};
+};
+
+&cpuflpr_vpr {
+	cpuflpr_vevif_tx: mailbox {
+		compatible = "nordic,nrf-vevif-event-tx";
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+		status = "disabled";
+	};
+};
+
+&cpuflpr_clic {
+	status = "okay";
+};
+
+&grtc {
+	interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote20 {
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+};
+
+&gpiote30 {
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+};
diff --git a/dts/riscv/openhwgroup/cv32a6.dtsi b/dts/riscv/openhwgroup/cv32a6.dtsi
new file mode 100644
index 0000000000000..83ac4bd70fb2b
--- /dev/null
+++ b/dts/riscv/openhwgroup/cv32a6.dtsi
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2024 CISPA Helmholtz Center for Information Security
+ */
+
+#include <freq.h>
+#include "cva6.dtsi"
+
+/*
+ * Least common denominator of CVA6 32-bit CPUs: no FPU, no compressed instructions,
+ * no MMU, no PMP.
+ * Boards can overwrite the node if additional configurations are available.
+ */
+/ {
+	cpus_0: cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu_0: cpu@0 {
+			clock-frequency = <DT_FREQ_M(50)>;
+			timebase-frequency = <DT_FREQ_M(25)>;
+			device_type = "cpu";
+			compatible = "openhwgroup,cva6";
+			riscv,isa = "rv32ima";
+			/* overwrite in board configuration if sv32 MMU is enabled */
+			mmu-type = "riscv,none";
+			reg = <0>;
+
+			status = "okay";
+
+			hlic: interrupt-controller {
+				#interrupt-cells = <0x01>;
+				interrupt-controller;
+				compatible = "riscv,cpu-intc";
+				status = "okay";
+			};
+		};
+	};
+};
diff --git a/dts/riscv/openhwgroup/cv64a6.dtsi b/dts/riscv/openhwgroup/cv64a6.dtsi
new file mode 100644
index 0000000000000..ff51969c1519e
--- /dev/null
+++ b/dts/riscv/openhwgroup/cv64a6.dtsi
@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2024 CISPA Helmholtz Center for Information Security
+ */
+
+#include <freq.h>
+#include "cva6.dtsi"
+/*
+ * Application-class configuration of CVA6 64-bit CPUs:
+ * FPU for 32-bit and 64-bit floats, SV39 MMU.
+ *
+ */
+/ {
+	cpus_0: cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu_0: cpu@0 {
+			clock-frequency = <DT_FREQ_M(50)>;
+			timebase-frequency = <DT_FREQ_M(25)>;
+			device_type = "cpu";
+			compatible = "openhwgroup,cva6";
+			riscv,isa = "rv64imafdc";
+			mmu-type = "riscv,sv39";
+			reg = <0>;
+
+			status = "okay";
+
+			hlic: interrupt-controller {
+				#interrupt-cells = <0x01>;
+				interrupt-controller;
+				compatible = "riscv,cpu-intc";
+				status = "okay";
+			};
+		};
+	};
+};
diff --git a/dts/riscv/openhwgroup/cva6.dtsi b/dts/riscv/openhwgroup/cva6.dtsi
new file mode 100644
index 0000000000000..22dd17e6d86fc
--- /dev/null
+++ b/dts/riscv/openhwgroup/cva6.dtsi
@@ -0,0 +1,159 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2024 CISPA Helmholtz Center for Information Security
+ */
+
+#include <freq.h>
+
+/*
+ * CVA6 SoC without CPU, which comes in 32 and 64 bit variants
+ */
+/ {
+	#address-cells = <0x01>;
+	#size-cells = <0x01>;
+
+	clocks {
+
+		clk_cpu {
+			#clock-cells = <0x00>;
+			clock-frequency = <DT_FREQ_M(50)>;
+			compatible = "fixed-clock";
+		};
+
+		clk_bus: clk_bus_0 {
+			#clock-cells = <0x00>;
+			clock-frequency = <DT_FREQ_M(50)>;
+			compatible = "fixed-clock";
+		};
+	};
+
+	soc {
+		#address-cells = <0x01>;
+		#size-cells = <0x01>;
+		ranges;
+
+		/* Xilinx MIG memory controller */
+		memory0: memory@80000000 {
+			device_type = "memory";
+			reg = <0x80000000 0x40000000>;
+			status = "okay";
+		};
+
+		/* RISC-V Platform-level interrupt controller */
+		plic: interrupt-controller@c000000 {
+			compatible = "sifive,plic-1.0.0";
+			#address-cells = <0>;
+			#interrupt-cells = <2>;
+			interrupt-controller;
+			interrupts-extended = <&hlic 11 &hlic 9>;
+			reg = <0x0c000000 0x4000000>;
+			riscv,max-priority = <7>;
+			riscv,ndev = <30>;
+			status = "okay";
+		};
+
+		/* USB UART */
+		uart0: serial@10000000 {
+			clock-frequency = <50000000>;
+			clocks = <&clk_bus>;
+			compatible = "ns16550";
+			current-speed = <115200>;
+			device_type = "serial";
+			reg = <0x10000000 0x10000>;
+			reg-shift = <0x02>;
+			parity = "none";
+			stop-bits = "1";
+			data-bits = <8>;
+			interrupt-parent = <&plic>;
+			interrupts = <1 0x04>;
+			status = "disabled";
+		};
+
+		/* SPI controller, connected to SD card */
+		spi0: axi_quad_spi@20000000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "xlnx,xps-spi-2.00.a";
+			reg = <0x20000000 0x10000>;
+			xlnx,num-ss-bits = <0x01>;
+			xlnx,num-transfer-bits = <0x8>;
+			interrupts=<2 0x2>;
+			interrupt-parent=<&plic>;
+			clocks=<&clk_bus>;
+			status = "disabled";
+		};
+
+		/*
+		 * Core-local interrupt controller according to RISC-V spec
+		 */
+		clint: clint@2000000 {
+			compatible = "sifive,clint0";
+			reg = <0x2000000 0x40000>;
+			interrupts-extended = <&hlic 3 &hlic 7>;
+			status = "disabled";
+		};
+
+		mtimer: timer@200bff8 {
+			compatible = "riscv,machine-timer";
+			interrupts-extended = <&hlic 7>;
+			reg = <0x200bff8 0x8 0x2004000 0x8>;
+			reg-names = "mtime", "mtimecmp";
+			status = "disabled";
+		};
+
+		/*
+		 * Xilinx AXI DMA.
+		 * Part of the Xilinx AXI Ethernet Subsystem.
+		 * Only on CISPA board.
+		 */
+		dma0: dma@41e00000 {
+			#dma-cells = <0x01>;
+			clock-frequency = <DT_FREQ_M(50)>;
+			clock-names = "s_axi_lite_aclk";
+			clocks = <&clk_bus>;
+			compatible = "xlnx,eth-dma";
+			reg = <0x41e00000 0x10000>;
+			xlnx,addrwidth = <0x40>;
+			xlnx,include-dre;
+			xlnx,num-queues = <0x1>;
+			interrupt-parent = <&plic>;
+			// TX - RX
+			// active-high level-triggered
+			interrupts = <8 4>, <9 4>;
+			// TX and RX
+			dma-channels = <2>;
+			status = "disabled";
+		};
+
+		/*
+		 * LowRISC ethernet subsystem.
+		 * Only on OpenHW Group board.
+		 */
+		eth: lowrisc-eth@30000000 {
+			compatible = "lowrisc-eth";
+			device_type = "network";
+			interrupt-parent = <&plic>;
+			interrupts = <3 0>;
+			reg = <0x0 0x30000000 0x0 0x8000>;
+			status = "disabled";
+		};
+
+		/* Xilinx GPIO, connected to LEDs */
+		xlnx_gpio: gpio@40000000 {
+			#gpio-cells = <2>;
+			compatible = "xlnx,xps-gpio-1.00.a";
+			gpio-controller ;
+			reg = <0x0 0x40000000 0x0 0x10000 >;
+			xlnx,all-inputs = <0x0>;
+			xlnx,all-inputs-2 = <0x0>;
+			xlnx,dout-default = <0x0>;
+			xlnx,dout-default-2 = <0x0>;
+			xlnx,gpio-width = <0x8>;
+			xlnx,gpio2-width = <0x8>;
+			xlnx,is-dual = <0x1>;
+			xlnx,tri-default = <0xffffffff>;
+			xlnx,tri-default-2 = <0xffffffff>;
+			status = "disabled";
+		};
+	};
+};
diff --git a/dts/riscv/riscv32-litex-vexriscv.dtsi b/dts/riscv/riscv32-litex-vexriscv.dtsi
index 3662c3695b4d5..6d144b69abaf2 100644
--- a/dts/riscv/riscv32-litex-vexriscv.dtsi
+++ b/dts/riscv/riscv32-litex-vexriscv.dtsi
@@ -236,6 +236,25 @@
 			#size-cells = <0>;
 			status = "disabled";
 		};
+		i2c1: i2c@e000d800 {
+			compatible = "litex,litei2c";
+			reg = <0xe000d800 0x4>,
+				<0xe000d804 0x4>,
+				<0xe000d808 0x4>,
+				<0xe000d80c 0x4>,
+				<0xe000d810 0x4>,
+				<0xe000d814 0x4>;
+			reg-names = "phy_speed_mode",
+				"master_active",
+				"master_settings",
+				"master_addr",
+				"master_rxtx",
+				"master_status";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
 		gpio_out: gpio@e0005800 {
 			compatible = "litex,gpio";
 			reg = <0xe0005800 0x4>;
diff --git a/dts/riscv/sensry/ganymed-sy1xx.dtsi b/dts/riscv/sensry/ganymed-sy1xx.dtsi
index 0ff791bfdc3a0..a8dcb76f4f91c 100644
--- a/dts/riscv/sensry/ganymed-sy1xx.dtsi
+++ b/dts/riscv/sensry/ganymed-sy1xx.dtsi
@@ -93,6 +93,50 @@
 			status = "okay";
 		};
 
+		i2c0: i2c@1a102500 {
+			compatible = "sensry,sy1xx-i2c";
+			reg = <0x1a102500 0x80>;
+			instance = <0>;
+
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			status = "disabled";
+		};
+
+		i2c1: i2c@1a102580 {
+			compatible = "sensry,sy1xx-i2c";
+			reg = <0x1a102580 0x80>;
+			instance = <1>;
+
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			status = "disabled";
+		};
+
+		i2c2: i2c@1a102600 {
+			compatible = "sensry,sy1xx-i2c";
+			reg = <0x1a102600 0x80>;
+			instance = <2>;
+
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			status = "disabled";
+		};
+
+		i2c3: i2c@1a102680 {
+			compatible = "sensry,sy1xx-i2c";
+			reg = <0x1a102680 0x80>;
+			instance = <3>;
+
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			status = "disabled";
+		};
+
 		trng: random@1d030100 {
 			compatible = "sensry,sy1xx-trng";
 			reg = <0x1d030100 0x100>;
diff --git a/dts/riscv/wch/ch32v0/ch32v003.dtsi b/dts/riscv/wch/ch32v0/ch32v003.dtsi
index e0a90b855e9ab..e2de8a5ad274c 100644
--- a/dts/riscv/wch/ch32v0/ch32v003.dtsi
+++ b/dts/riscv/wch/ch32v0/ch32v003.dtsi
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2024 Michael Hope
+ * Copyright (c) 2024 Paul Wedeck <paulwedeck@gmail.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,6 +11,7 @@
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/clock/ch32v00x-clocks.h>
+#include <zephyr/dt-bindings/dma/ch32v003-dma.h>
 
 / {
 	clocks {
@@ -100,6 +102,16 @@
 			};
 		};
 
+		i2c1: i2c@40005400 {
+			compatible = "wch,i2c";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x40005400 0x400>;
+			clocks = <&rcc CH32V00X_CLOCK_I2C1>;
+			interrupt-parent = <&pfic>;
+			interrupts = <30>, <31>;
+		};
+
 		usart1: uart@40013800 {
 			compatible = "wch,usart";
 			reg = <0x40013800 0x10>;
@@ -114,6 +126,16 @@
 			#clock-cells = <1>;
 			status = "okay";
 		};
+
+		dma1: dma@40020000 {
+			compatible = "wch,wch-dma";
+			reg = <0x40020000 0x90>;
+			clocks = <&rcc CH32V00X_CLOCK_DMA1>;
+			#dma-cells = <1>;
+			interrupt-parent = <&pfic>;
+			interrupts = <22>, <23>, <24>, <25>, <26>, <27>, <28>;
+			dma-channels = <7>;
+		};
 	};
 };
 
diff --git a/dts/riscv/wch/ch32v208/ch32v208.dtsi b/dts/riscv/wch/ch32v208/ch32v208.dtsi
new file mode 100644
index 0000000000000..c92324dad64c8
--- /dev/null
+++ b/dts/riscv/wch/ch32v208/ch32v208.dtsi
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <freq.h>
+#include <mem.h>
+#include <wch/qingke-v4c.dtsi>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/clock/ch32v20x_30x-clocks.h>
+
+/ {
+	clocks {
+		clk_hse: clk-hse {
+			#clock-cells = <0>;
+			compatible = "wch,ch32v00x-hse-clock";
+			clock-frequency = <DT_FREQ_M(32)>;
+			status = "disabled";
+		};
+
+		clk_hsi: clk-hsi {
+			#clock-cells = <0>;
+			compatible = "wch,ch32v00x-hsi-clock";
+			clock-frequency = <DT_FREQ_M(8)>;
+			status = "disabled";
+		};
+
+		clk_lsi: clk-lsi {
+			#clock-cells = <0>;
+			compatible = "fixed-clock";
+			clock-frequency = <DT_FREQ_K(32)>;
+			status = "disabled";
+		};
+
+		pll: pll {
+			#clock-cells = <0>;
+			compatible = "wch,ch32v20x_30x-pll-clock";
+			mul = <18>;
+			status = "disabled";
+		};
+	};
+
+	soc {
+		sram0: memory@20000000 {
+			compatible = "mmio-sram";
+			reg = <0x20000000 DT_SIZE_K(64)>;
+		};
+
+		flash: flash-controller@40022000 {
+			compatible = "wch,ch32v20x_30x-flash-controller";
+			reg = <0x40022000 0x400>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash0: flash@0 {
+				compatible = "soc-nv-flash";
+				reg = <0 DT_SIZE_K(128)>;
+			};
+		};
+
+		pwr: pwr@40007000 {
+			compatible = "wch,pwr";
+			reg = <0x40007000 16>;
+		};
+
+		pinctrl: pin-controller@40010000 {
+			compatible = "wch,20x_30x-afio";
+			reg = <0x40010000 16>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			gpioa: gpio@40010800 {
+				compatible = "wch,gpio";
+				reg = <0x40010800 0x20>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				clocks = <&rcc CH32V20X_V30X_CLOCK_IOPA>;
+			};
+
+			gpiob: gpio@40010C00 {
+				compatible = "wch,gpio";
+				reg = <0x40010C00 0x20>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				clocks = <&rcc CH32V20X_V30X_CLOCK_IOPB>;
+			};
+
+			gpioc: gpio@40011000 {
+				compatible = "wch,gpio";
+				reg = <0x40011000 0x20>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				clocks = <&rcc CH32V20X_V30X_CLOCK_IOPC>;
+			};
+
+			gpiod: gpio@40011400 {
+				compatible = "wch,gpio";
+				reg = <0x40011400 0x20>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				clocks = <&rcc CH32V20X_V30X_CLOCK_IOPD>;
+			};
+		};
+
+		usart1: uart@40013800 {
+			compatible = "wch,usart";
+			reg = <0x40013800 0x20>;
+			clocks = <&rcc CH32V20X_V30X_CLOCK_USART1>;
+			interrupt-parent = <&pfic>;
+			interrupts = <53>;
+			status = "disabled";
+		};
+
+		usart2: uart@40004400 {
+			compatible = "wch,usart";
+			reg = <0x40004400 0x20>;
+			clocks = <&rcc CH32V20X_V30X_CLOCK_USART2>;
+			interrupt-parent = <&pfic>;
+			interrupts = <54>;
+			status = "disabled";
+		};
+
+		usart3: uart@40004800 {
+			compatible = "wch,usart";
+			reg = <0x40004800 0x20>;
+			clocks = <&rcc CH32V20X_V30X_CLOCK_USART3>;
+			interrupt-parent = <&pfic>;
+			interrupts = <55>;
+			status = "disabled";
+		};
+
+		usart4: uart@40004c00 {
+			compatible = "wch,usart";
+			reg = <0x40004C00 0x20>;
+			clocks = <&rcc CH32V20X_V30X_CLOCK_USART4>;
+			interrupt-parent = <&pfic>;
+			interrupts = <68>;
+			status = "disabled";
+		};
+
+		rcc: rcc@40021000 {
+			compatible = "wch,rcc";
+			reg = <0x40021000 16>;
+			#clock-cells = <1>;
+		};
+	};
+};
+
+&cpu0 {
+	clock-frequency = <DT_FREQ_M(144)>;
+};
diff --git a/dts/riscv/wch/ch32v208/ch32v208cbu.dtsi b/dts/riscv/wch/ch32v208/ch32v208cbu.dtsi
new file mode 100644
index 0000000000000..e4f958ca2c813
--- /dev/null
+++ b/dts/riscv/wch/ch32v208/ch32v208cbu.dtsi
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <wch/ch32v208/ch32v208.dtsi>
+
+&gpioc {
+	gpio-reserved-ranges = <0 13>;
+};
+
+&gpiod {
+	gpio-reserved-ranges = <0 16>;
+};
diff --git a/dts/riscv/wch/ch32v208/ch32v208gbu.dtsi b/dts/riscv/wch/ch32v208/ch32v208gbu.dtsi
new file mode 100644
index 0000000000000..3241b148c9350
--- /dev/null
+++ b/dts/riscv/wch/ch32v208/ch32v208gbu.dtsi
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <wch/ch32v208/ch32v208.dtsi>
+
+&gpioa {
+	gpio-reserved-ranges = <8 3>, <15 1>;
+};
+
+&gpiob {
+	gpio-reserved-ranges = <0 6>, <9 7>;
+};
+
+&gpioc {
+	gpio-reserved-ranges = <0 7>, <10 4>;
+};
+
+&gpiod {
+	gpio-reserved-ranges = <0 16>;
+};
diff --git a/dts/riscv/wch/ch32v208/ch32v208rbt.dtsi b/dts/riscv/wch/ch32v208/ch32v208rbt.dtsi
new file mode 100644
index 0000000000000..7507be1f731cc
--- /dev/null
+++ b/dts/riscv/wch/ch32v208/ch32v208rbt.dtsi
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <wch/ch32v208/ch32v208.dtsi>
+
+&gpiod {
+	gpio-reserved-ranges = <0 2>, <3 12>;
+};
diff --git a/dts/riscv/wch/ch32v208/ch32v208wbu.dtsi b/dts/riscv/wch/ch32v208/ch32v208wbu.dtsi
new file mode 100644
index 0000000000000..d2e72c30a8faf
--- /dev/null
+++ b/dts/riscv/wch/ch32v208/ch32v208wbu.dtsi
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <wch/ch32v208/ch32v208.dtsi>
+
+&gpiod {
+	gpio-reserved-ranges = <0 2>, <7 8>;
+};
diff --git a/dts/riscv/wch/qingke-v4c.dtsi b/dts/riscv/wch/qingke-v4c.dtsi
new file mode 100644
index 0000000000000..c4b00b5fdd7e1
--- /dev/null
+++ b/dts/riscv/wch/qingke-v4c.dtsi
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "wch,qingke-v4c";
+			reg = <0>;
+			riscv,isa = "rv32imac_zicsr_zifencei";
+		};
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+
+		pfic: interrupt-controller@e000e000 {
+			compatible = "wch,pfic";
+			#address-cells = <0>;
+			#interrupt-cells = <1>;
+			interrupt-controller;
+			reg = <0xe000e000 0x10>;
+			status = "okay";
+		};
+
+		systick: systimer@e000f000 {
+			compatible = "wch,systick";
+			reg = <0xe000f000 0x10>;
+			status = "okay";
+			interrupt-parent = <&pfic>;
+			interrupts = <12>;
+		};
+	};
+};
diff --git a/dts/x86/intel/bartlett_lake_s.dtsi b/dts/x86/intel/bartlett_lake_s.dtsi
new file mode 100644
index 0000000000000..70f4df31e28c8
--- /dev/null
+++ b/dts/x86/intel/bartlett_lake_s.dtsi
@@ -0,0 +1,598 @@
+/*
+ * Copyright (c) 2025 Intel Corporation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "skeleton.dtsi"
+#include <zephyr/dt-bindings/interrupt-controller/intel-ioapic.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/dt-bindings/pcie/pcie.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "intel,bartlett-lake";
+			d-cache-line-size = <64>;
+			reg = <0>;
+		};
+	};
+
+	dram0: memory@0 {
+		device_type = "memory";
+		reg = <0x0 DT_DRAM_SIZE>;
+	};
+
+	intc: ioapic@fec00000  {
+		compatible = "intel,ioapic";
+		#address-cells = <1>;
+		#interrupt-cells = <3>;
+		reg = <0xfec00000 0x1000>;
+		interrupt-controller;
+	};
+
+	intc_loapic: loapic@fee00000  {
+		compatible = "intel,loapic";
+		reg = <0xfee00000 0x1000>;
+		interrupt-controller;
+		#interrupt-cells = <3>;
+		#address-cells = <1>;
+	};
+
+	pcie0: pcie0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "pcie-controller";
+		acpi-hid = "PNP0A08";
+		ranges;
+
+		smbus0: smbus0 {
+			compatible = "intel,pch-smbus";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7aa3>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+
+			status = "disabled";
+		};
+
+		i2c0_dma: i2c0_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c0: i2c0 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7acc>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c0_dma 0>;
+
+			status = "disabled";
+		};
+
+		i2c1_dma: i2c1_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c1: i2c1 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7acd>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c1_dma 0>;
+
+			status = "disabled";
+		};
+
+		i2c2_dma: i2c2_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c2: i2c2 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7ace>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c2_dma 0>;
+
+			status = "disabled";
+		};
+
+		i2c3_dma: i2c3_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c3: i2c3 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7acf>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c3_dma 0>;
+
+			status = "disabled";
+		};
+
+		i2c4_dma: i2c4_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c4: i2c4 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7afc>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c4_dma 0>;
+
+			status = "disabled";
+		};
+
+		i2c5_dma: i2c5_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c5: i2c5 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7afd>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c5_dma 0>;
+
+			status = "disabled";
+		};
+
+		i2c6_dma: i2c6_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c6: i2c6 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7ada>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c6_dma 0>;
+
+			status = "disabled";
+		};
+
+		i2c7_dma: i2c7_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		i2c7: i2c7 {
+			compatible = "snps,designware-i2c";
+			clock-frequency = <I2C_BITRATE_STANDARD>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			vendor-id = <0x8086>;
+			device-id = <0x7adb>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			dmas = <&i2c7_dma 0>;
+
+			status = "disabled";
+		};
+
+		spi0: spi0 {
+			compatible = "intel,penwell-spi";
+			vendor-id = <0x8086>;
+			device-id = <0x7aaa>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			pw,cs-mode = <0>;
+			pw,cs-output = <0>;
+			pw,fifo-depth = <64>;
+			cs-gpios = <&gpio_0_i 15 GPIO_ACTIVE_LOW>;
+			clock-frequency = <100000000>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+
+			status = "disabled";
+		};
+
+		spi1: spi1 {
+			compatible = "intel,penwell-spi";
+			vendor-id = <0x8086>;
+			device-id = <0x7aab>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			pw,cs-mode = <0>;
+			pw,cs-output = <0>;
+			pw,fifo-depth = <64>;
+			cs-gpios = <&gpio_0_i 19 GPIO_ACTIVE_LOW>;
+			clock-frequency = <100000000>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+
+			status = "disabled";
+		};
+
+		spi2: spi2 {
+			compatible = "intel,penwell-spi";
+			vendor-id = <0x8086>;
+			device-id = <0x7afb>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			pw,cs-mode = <0>;
+			pw,cs-output = <0>;
+			pw,fifo-depth = <64>;
+			cs-gpios = <&gpio_0_r 12 GPIO_ACTIVE_LOW>;
+			clock-frequency = <100000000>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+
+			status = "disabled";
+		};
+
+		uart0_dma: uart0_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		uart0: uart0 {
+			compatible = "ns16550";
+			vendor-id = <0x8086>;
+			device-id = <0x7aa8>;
+			reg-shift = <2>;
+			clock-frequency = <1843200>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			current-speed = <115200>;
+			dmas = <&uart0_dma 0>, <&uart0_dma 1>;
+			dma-names = "tx", "rx";
+
+			status = "disabled";
+		};
+
+		uart1_dma: uart1_dma {
+			compatible = "intel,lpss";
+			#dma-cells = <1>;
+
+			status = "disabled";
+		};
+
+		uart1: uart1 {
+			compatible = "ns16550";
+			vendor-id = <0x8086>;
+			device-id = <0x7aa9>;
+			reg-shift = <2>;
+			clock-frequency = <1843200>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			current-speed = <115200>;
+			dmas = <&uart1_dma 0>, <&uart1_dma 1>;
+			dma-names = "tx", "rx";
+
+			status = "disabled";
+		};
+
+		uart2: uart2 {
+			compatible = "ns16550";
+			vendor-id = <0x8086>;
+			device-id = <0x7afe>;
+			reg-shift = <2>;
+			clock-frequency = <1843200>;
+			interrupts = <PCIE_IRQ_DETECT IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			current-speed = <115200>;
+
+			status = "disabled";
+		};
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+
+		vtd: vtd@fed91000 {
+			compatible = "intel,vt-d";
+			reg = <0xfed91000 0x1000>;
+
+			status = "okay";
+		};
+
+		uart_ec_0: uart@3f8 {
+			compatible = "ns16550";
+			reg = <0x000003f8 0x100>;
+			io-mapped;
+			clock-frequency = <1843200>;
+			interrupts = <4 IRQ_TYPE_LOWEST_EDGE_RISING 3>;
+			interrupt-parent = <&intc>;
+			reg-shift = <0>;
+			io-mapped;
+
+			status = "disabled";
+		};
+
+		gpio_0_i: gpio@e06e0700 {
+			compatible = "intel,gpio";
+			reg = <0xe06e0700 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <23>;
+			pin-offset = <0>;
+
+			status = "disabled";
+		};
+
+		gpio_0_r: gpio@e06e0890 {
+			compatible = "intel,gpio";
+			reg = <0xe06e0890 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x1>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <22>;
+			pin-offset = <26>;
+
+			status = "disabled";
+		};
+
+		gpio_0_j: gpio@e06e0a00 {
+			compatible = "intel,gpio";
+			reg = <0xe06e0a00 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x2>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <12>;
+			pin-offset = <49>;
+
+			status = "disabled";
+		};
+
+		gpio_1_b: gpio@e06d0700 {
+			compatible = "intel,gpio";
+			reg = <0xe06d0700 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <24>;
+			pin-offset = <0>;
+
+			status = "disabled";
+		};
+
+		gpio_1_g: gpio@e06d0880 {
+			compatible = "intel,gpio";
+			reg = <0xe06d0880 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x1>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <8>;
+			pin-offset = <24>;
+
+			status = "disabled";
+		};
+
+		gpio_1_h: gpio@e06d0900 {
+			compatible = "intel,gpio";
+			reg = <0xe06d0900 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x2>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <24>;
+			pin-offset = <32>;
+
+			status = "disabled";
+		};
+
+		gpio_3_a: gpio@e06b0790 {
+			compatible = "intel,gpio";
+			reg = <0xe06b0790 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x1>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <15>;
+			pin-offset = <9>;
+
+			status = "disabled";
+		};
+
+		gpio_3_c: gpio@e06b0890 {
+			compatible = "intel,gpio";
+			reg = <0xe06b0890 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x2>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <24>;
+			pin-offset = <25>;
+
+			status = "disabled";
+		};
+
+		gpio_4_s: gpio@e06a0700 {
+			compatible = "intel,gpio";
+			reg = <0xe06a0700 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <8>;
+			pin-offset = <0>;
+
+			status = "disabled";
+		};
+
+		gpio_4_e: gpio@e06a0780 {
+			compatible = "intel,gpio";
+			reg = <0xe06a0780 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x1>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <22>;
+			pin-offset = <8>;
+
+			status = "disabled";
+		};
+
+		gpio_4_k: gpio@e06a08f0 {
+			compatible = "intel,gpio";
+			reg = <0xe06a08f0 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x2>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <12>;
+			pin-offset = <25>;
+
+			status = "disabled";
+		};
+
+		gpio_4_f: gpio@e06a09e0 {
+			compatible = "intel,gpio";
+			reg = <0xe06a09e0 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x3>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <24>;
+			pin-offset = <41>;
+
+			status = "disabled";
+		};
+
+		gpio_5_d: gpio@e0690700 {
+			compatible = "intel,gpio";
+			reg = <0xe0690700 0x1000>;
+			interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_LOW 3>;
+			interrupt-parent = <&intc>;
+			group-index = <0x0>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <24>;
+			pin-offset = <0>;
+
+			status = "disabled";
+		};
+
+		pwm0: pwm@e06a0000 {
+			compatible = "intel,blinky-pwm";
+			reg = <0xe06a0000 0x400>;
+			reg-offset = <0x304>;
+			clock-frequency = <32768>;
+			max-pins = <1>;
+			#pwm-cells = <2>;
+
+			status = "disabled";
+		};
+
+		rtc: counter: rtc@70 {
+			compatible = "motorola,mc146818";
+			reg = <0x70 0x0D 0x71 0x0D>;
+			interrupts = <8 IRQ_TYPE_LOWEST_EDGE_RISING 3>;
+			interrupt-parent = <&intc>;
+			alarms-count = <1>;
+
+			status = "disabled";
+		};
+
+		tgpio: tgpio@fe001200 {
+			compatible = "intel,timeaware-gpio";
+			reg = <0xfe001200 0x100>;
+			timer-clock = <19200000>;
+			max-pins = <2>;
+
+			status = "disabled";
+		};
+
+		hpet: hpet@fed00000 {
+			compatible = "intel,hpet";
+			reg = <0xfed00000 0x400>;
+			interrupts = <2 IRQ_TYPE_FIXED_EDGE_RISING 4>;
+			interrupt-parent = <&intc>;
+
+			status = "disabled";
+		};
+
+		tco_wdt: tco_wdt@400 {
+			compatible = "intel,tco-wdt";
+			reg = <0x0400 0x20>;
+
+			status = "disabled";
+		};
+	};
+};
diff --git a/dts/xtensa/espressif/esp32/esp32_common.dtsi b/dts/xtensa/espressif/esp32/esp32_common.dtsi
index b0eb83690494c..0842e7e117098 100644
--- a/dts/xtensa/espressif/esp32/esp32_common.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_common.dtsi
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Intel Corporation.
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -112,6 +113,29 @@
 			zephyr,memory-region = "SRAM2";
 		};
 
+		dcache0: dcache0@3f400000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			reg = <0x3f400000 DT_SIZE_M(4)>;
+			zephyr,memory-region = "DCACHE0";
+		};
+
+		dcache1: dcache1@3f800000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			reg = <0x3f800000 DT_SIZE_M(4)>;
+			zephyr,memory-region = "DCACHE1";
+
+			psram0: psram0 {
+				compatible = "espressif,esp32-psram";
+				size = <0x0>;
+			};
+		};
+
+		icache0: icache0@400d0000 {
+			compatible = "zephyr,memory-region", "mmio-sram";
+			reg = <0x400d0000 DT_SIZE_K(11456)>;
+			zephyr,memory-region = "ICACHE0";
+		};
+
 		ipmmem0: memory@3ffe5230 {
 			compatible = "mmio-sram";
 			reg = <0x3ffe5230 0x400>;
@@ -189,14 +213,6 @@
 			};
 		};
 
-		psram0: psram@3f800000 {
-			device_type = "memory";
-			compatible = "mmio-sram";
-			/* PSRAM size is specified in SOC/SIP dtsi */
-			reg = <0x3f800000 DT_SIZE_M(2)>;
-			status = "disabled";
-		};
-
 		ipi0: ipi@3f4c0058 {
 			compatible = "espressif,crosscore-interrupt";
 			reg = <0x3f4c0058 0x4>;
@@ -344,6 +360,34 @@
 			status = "disabled";
 		};
 
+		i2s0: i2s@3ff4f000 {
+			compatible = "espressif,esp32-i2s";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x3ff4f000 0x1000>;
+			interrupts = <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>,
+				     <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>;
+			interrupt-names = "rx", "tx";
+			interrupt-parent = <&intc>;
+			clocks = <&rtc ESP32_I2S0_MODULE>;
+			unit = <0>;
+			status = "disabled";
+		};
+
+		i2s1: i2s@3ff6d000 {
+			compatible = "espressif,esp32-i2s";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x3ff6d000 0x1000>;
+			interrupts = <I2S1_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>,
+				     <I2S1_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>;
+			interrupt-names = "rx", "tx";
+			interrupt-parent = <&intc>;
+			clocks = <&rtc ESP32_I2S1_MODULE>;
+			unit = <1>;
+			status = "disabled";
+		};
+
 		trng0: trng@3ff75144 {
 			compatible = "espressif,esp32-trng";
 			reg = <0x3FF75144 0x4>;
diff --git a/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi b/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi
index 2703231b821d7..c7180dd467db1 100644
--- a/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_d0wdr2_v3.dtsi
@@ -15,6 +15,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi b/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi
index 9d108bd4e5726..03acd73f59e10 100644
--- a/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_pico_v3_02.dtsi
@@ -19,6 +19,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi
index 4aa681336ac52..2476afcacbdb1 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r2.dtsi
@@ -23,6 +23,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi
index 37e2b62a0041f..1018cb453b0e2 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r4.dtsi
@@ -23,6 +23,5 @@
 
 /* 4MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(4)>;
-	status = "okay";
+	size = <DT_SIZE_M(4)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi
index 73ec91dca44ba..d6484cadb509e 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n16r8.dtsi
@@ -23,6 +23,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi
index b0ab013feb3b2..9057bae18d3c6 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r2.dtsi
@@ -23,6 +23,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi
index 87a2f8930ecd9..1171dc698829a 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n4r8.dtsi
@@ -23,6 +23,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi
index 6b74a725ed401..281ebd835a569 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r2.dtsi
@@ -23,6 +23,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi
index e5a12caae0c5f..19cf746989f05 100644
--- a/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi
+++ b/dts/xtensa/espressif/esp32/esp32_wrover_e_n8r8.dtsi
@@ -24,6 +24,5 @@
 
 /* 8MB flash */
 &psram0 {
-	reg = <0x3f800000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi
index 32c2b92b763a1..4c3fcbc3c38f6 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_common.dtsi
@@ -91,6 +91,29 @@
 			zephyr,memory-region = "SRAM1";
 		};
 
+		dcache0: dcache0@3f000000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x3f000000 DT_SIZE_M(4)>;
+			zephyr,memory-region = "DCACHE0";
+		};
+
+		dcache1: dcache1@3f500000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x3f500000 DT_SIZE_K(10752)>;
+			zephyr,memory-region = "DCACHE1";
+
+			psram0: psram0 {
+				compatible = "espressif,esp32-psram";
+				size = <0x0>;
+			};
+		};
+
+		icache0: icache0@40080000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x40080000 DT_SIZE_K(7680)>;
+			zephyr,memory-region = "ICACHE0";
+		};
+
 		intc: interrupt-controller@3f4c2000 {
 			#interrupt-cells = <3>;
 			#address-cells = <0>;
@@ -142,14 +165,6 @@
 			};
 		};
 
-		psram0: psram@3f500000 {
-			device_type = "memory";
-			compatible = "mmio-sram";
-			/* PSRAM size is specified in SOC/SIP dtsi */
-			reg = <0x3f500000 DT_SIZE_M(2)>;
-			status = "disabled";
-		};
-
 		uart0: uart@3f400000 {
 			compatible = "espressif,esp32-uart";
 			reg = <0x3f400000 0x400>;
@@ -242,6 +257,20 @@
 			status = "disabled";
 		};
 
+		i2s0: i2s@3f40f000 {
+			compatible = "espressif,esp32-i2s";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0x3f40f000 0x1000>;
+			interrupts = <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>,
+				     <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>;
+			interrupt-names = "rx", "tx";
+			interrupt-parent = <&intc>;
+			clocks = <&rtc ESP32_I2S0_MODULE>;
+			unit = <0>;
+			status = "disabled";
+		};
+
 		timer0: counter@3f41f000 {
 			compatible = "espressif,esp32-timer";
 			reg = <0x3f41f000 DT_SIZE_K(4)>;
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_fn4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_fn4r2.dtsi
index f3175a99233f4..fd8686b2334f6 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_fn4r2.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_fn4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3f500000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_mini_n4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_mini_n4r2.dtsi
index 84e3b16cc39be..fd8686b2334f6 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_mini_n4r2.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_mini_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_r2.dtsi
index db004992e703b..66d624e4e5c4c 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_r2.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_r2.dtsi
@@ -8,6 +8,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_solo_n4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_solo_n4r2.dtsi
index 84e3b16cc39be..fd8686b2334f6 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_solo_n4r2.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_solo_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n16r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n16r2.dtsi
index 77645a3c2e076..053b0d6ee4a91 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n16r2.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n16r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n4r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n4r2.dtsi
index 84e3b16cc39be..fd8686b2334f6 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n4r2.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n8r2.dtsi b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n8r2.dtsi
index 92d8775368ef6..5f3e9ecd713dc 100644
--- a/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n8r2.dtsi
+++ b/dts/xtensa/espressif/esp32s2/esp32s2_wrover_n8r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	status = "okay";
-	reg = <0x3f500000 DT_SIZE_M(2)>;
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi
index 95c935a1de6df..1f4f046df4dc6 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_common.dtsi
@@ -89,13 +89,18 @@
 		icache0: memory@42000000 {
 			compatible = "zephyr,memory-region";
 			reg = <0x42000000 DT_SIZE_M(32)>;
-			zephyr,memory-region = "ICACHE";
+			zephyr,memory-region = "ICACHE0";
 		};
 
 		dcache0: memory@3c000000 {
 			compatible = "zephyr,memory-region";
 			reg = <0x3c000000 DT_SIZE_M(32)>;
-			zephyr,memory-region = "DCACHE";
+			zephyr,memory-region = "DCACHE0";
+
+			psram0: psram0 {
+				compatible = "espressif,esp32-psram";
+				size = <0x0>;
+			};
 		};
 
 		sram0: memory@40370000 {
@@ -201,14 +206,6 @@
 			};
 		};
 
-		psram0: psram@3c000000 {
-			device_type = "memory";
-			compatible = "mmio-sram";
-			/* PSRAM size is specified in SOC/SIP dtsi */
-			reg = <0x3c000000 DT_SIZE_M(2)>;
-			status = "disabled";
-		};
-
 		uart0: uart@60000000 {
 			compatible = "espressif,esp32-uart";
 			reg = <0x60000000 0x1000>;
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_mini_n4r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_mini_n4r2.dtsi
index b8f733a3c5479..843c999f52506 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_mini_n4r2.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_mini_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_mini_n8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_mini_n8.dtsi
index 4b2e7404282ad..5639f2bd9218f 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_mini_n8.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_mini_n8.dtsi
@@ -10,3 +10,7 @@
 &flash0 {
 	reg = <0x0 DT_SIZE_M(8)>;
 };
+
+&psram0 {
+	size = <DT_SIZE_M(8)>;
+};
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r2.dtsi
index b77169f172bee..31c631bbde0fa 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r2.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r8.dtsi
index 34ec0ec5ac1aa..a3de8d6faa6b9 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r8.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_pico_n8r8.dtsi
@@ -13,6 +13,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_r2.dtsi
index 187a214078fd1..df68b4852cbf8 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_r2.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_r2.dtsi
@@ -8,6 +8,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_r8.dtsi
index 29a21140630c9..3b192040f04fe 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_r8.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_r8.dtsi
@@ -8,6 +8,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_r8v.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_r8v.dtsi
index 29a21140630c9..3b192040f04fe 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_r8v.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_r8v.dtsi
@@ -8,6 +8,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi
index c4c0929063d59..e3a4bf89b903b 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r8.dtsi
index 102fd94ec1267..45cbd4cf0b1f8 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r8.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n16r8.dtsi
@@ -13,6 +13,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi
index b8f733a3c5479..843c999f52506 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r8.dtsi
index b17d9f9223b34..429044da2b12e 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r8.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n4r8.dtsi
@@ -13,6 +13,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi
index b77169f172bee..31c631bbde0fa 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r2.dtsi
@@ -13,6 +13,5 @@
 
 /* 2MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(2)>;
-	status = "okay";
+	size = <DT_SIZE_M(2)>;
 };
diff --git a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi
index 34ec0ec5ac1aa..a3de8d6faa6b9 100644
--- a/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi
+++ b/dts/xtensa/espressif/esp32s3/esp32s3_wroom_n8r8.dtsi
@@ -13,6 +13,5 @@
 
 /* 8MB psram */
 &psram0 {
-	reg = <0x3c000000 DT_SIZE_M(8)>;
-	status = "okay";
+	size = <DT_SIZE_M(8)>;
 };
diff --git a/dts/xtensa/nxp/nxp_imx8ulp.dtsi b/dts/xtensa/nxp/nxp_imx8ulp.dtsi
index 816a72f9cc181..f10d6a87c58ab 100644
--- a/dts/xtensa/nxp/nxp_imx8ulp.dtsi
+++ b/dts/xtensa/nxp/nxp_imx8ulp.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 NXP
+ * Copyright 2023-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,16 +17,16 @@
 			device_type = "cpu";
 			compatible = "cdns,tensilica-xtensa-lx7";
 			reg = <0>;
-		};
 
-		#address-cells = <1>;
-		#size-cells = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
 
-		clic: interrupt-controller@0 {
-			compatible = "cdns,xtensa-core-intc";
-			reg = <0>;
-			interrupt-controller;
-			#interrupt-cells = <3>;
+			clic: interrupt-controller@0 {
+				compatible = "cdns,xtensa-core-intc";
+				reg = <0>;
+				interrupt-controller;
+				#interrupt-cells = <3>;
+			};
 		};
 	};
 
@@ -98,4 +98,14 @@
 		dai-index = <6>;
 		status = "disabled";
 	};
+
+	mu3: mbox@2da20000 {
+		compatible = "nxp,mbox-imx-mu";
+		reg = <0x2da20000 DT_SIZE_K(64)>;
+		interrupt-parent = <&clic>;
+		interrupts = <15 0 0>;
+		rx-channels = <4>;
+		#mbox-cells = <1>;
+		status = "disabled";
+	};
 };
diff --git a/dts/xtensa/nxp/nxp_imxrt700_hifi1.dtsi b/dts/xtensa/nxp/nxp_imxrt700_hifi1.dtsi
new file mode 100644
index 0000000000000..808857164c379
--- /dev/null
+++ b/dts/xtensa/nxp/nxp_imxrt700_hifi1.dtsi
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <xtensa/xtensa.dtsi>
+#include <freq.h>
+#include <mem.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "cdns,tensilica-xtensa-lx7";
+			clock-frequency = <DT_FREQ_M(250)>;
+			reg = <0>;
+		};
+	};
+
+	itcm0: memory@580000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0x580000 DT_SIZE_K(32)>;
+	};
+
+	itcm1: memory@680000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0x680000 DT_SIZE_K(512)>;
+	};
+
+	dtcm: memory@20700000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0x20700000 DT_SIZE_K(512)>;
+	};
+};
diff --git a/dts/xtensa/nxp/nxp_imxrt700_hifi4.dtsi b/dts/xtensa/nxp/nxp_imxrt700_hifi4.dtsi
new file mode 100644
index 0000000000000..2a37cd5f2dc7b
--- /dev/null
+++ b/dts/xtensa/nxp/nxp_imxrt700_hifi4.dtsi
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024-2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <xtensa/xtensa.dtsi>
+#include <freq.h>
+#include <mem.h>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "cdns,tensilica-xtensa-lx7";
+			clock-frequency = <DT_FREQ_M(325)>;
+			reg = <0>;
+		};
+	};
+
+	itcm: memory@24020000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0x24020000 DT_SIZE_K(64)>;
+	};
+
+	dtcm: memory@24000000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0x24000000 DT_SIZE_K(64)>;
+	};
+};
diff --git a/include/zephyr/app_memory/mem_domain.h b/include/zephyr/app_memory/mem_domain.h
index b950235fc0d8c..1b97ab4d333ff 100644
--- a/include/zephyr/app_memory/mem_domain.h
+++ b/include/zephyr/app_memory/mem_domain.h
@@ -89,6 +89,8 @@ struct k_mem_domain {
 	uint8_t num_partitions;
 };
 
+typedef struct k_mem_domain k_mem_domain_t;
+
 /**
  * Default memory domain
  *
diff --git a/include/zephyr/arch/arc/v2/linker.ld b/include/zephyr/arch/arc/v2/linker.ld
index 3a9ae9803e6fe..22926769ac681 100644
--- a/include/zephyr/arch/arc/v2/linker.ld
+++ b/include/zephyr/arch/arc/v2/linker.ld
@@ -142,13 +142,6 @@ SECTIONS {
 #include <snippets-rodata.ld>
 #include <zephyr/linker/kobject-rom.ld>
 
-#if defined(CONFIG_CPP) && !defined(CONFIG_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__)
-		. = ALIGN(4);
-		_fctors = .;
-		KEEP(*(.ctors*))
-		_ectors = .;
-#endif /* CONFIG_CPP && !CONFIG_STATIC_INIT_GNU && __MWDT_LINKER_CMD__ */
-
 /* This extra MPU alignment of RAMABLE_REGION is only required if we put ROMABLE_REGION and
  * RAMABLE_REGION into the same (continuous) memory - otherwise we can get beginning of the
  * RAMABLE_REGION in the end of ROMABLE_REGION MPU aperture.
@@ -317,11 +310,9 @@ SECTIONS {
 #endif
 
 	/DISCARD/ : {
-#if defined(CONFIG_CPP) && !defined(CONFIG_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__)
+		/* Discard all destructors */
 		*(.dtors*)
 		*(.fini*)
-		*(.eh_frame*)
-#endif /* CONFIG_CPP && !CONFIG_STATIC_INIT_GNU && __MWDT_LINKER_CMD__ */
 		*(.note.GNU-stack)
 		*(.got.plt)
 		*(.igot.plt)
diff --git a/include/zephyr/arch/arch_interface.h b/include/zephyr/arch/arch_interface.h
index 03bc27c8f16b5..395a36fb5f2a3 100644
--- a/include/zephyr/arch/arch_interface.h
+++ b/include/zephyr/arch/arch_interface.h
@@ -1259,6 +1259,7 @@ void arch_spin_relax(void);
 /**
  * @defgroup arch-stackwalk Architecture-specific Stack Walk APIs
  * @ingroup arch-interface
+ * @brief Architecture-specific Stack Walk APIs
  *
  * To add API support to an architecture, `arch_stack_walk()` should be implemented and a non-user
  * configurable Kconfig `ARCH_HAS_STACKWALK` that is default to `y` should be created in the
diff --git a/include/zephyr/arch/arm/arch.h b/include/zephyr/arch/arm/arch.h
index 9bbcc2375f1cd..1a33196b15e4f 100644
--- a/include/zephyr/arch/arm/arch.h
+++ b/include/zephyr/arch/arm/arch.h
@@ -40,9 +40,9 @@
 #elif defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
 #include <zephyr/arch/arm/cortex_a_r/cpu.h>
 #include <zephyr/arch/arm/cortex_a_r/sys_io.h>
-#if defined(CONFIG_AARCH32_ARMV8_R)
+#if defined(CONFIG_AARCH32_ARMV8_R) || defined(CONFIG_CPU_CORTEX_A7)
 #include <zephyr/arch/arm/cortex_a_r/lib_helpers.h>
-#include <zephyr/arch/arm/cortex_a_r/armv8_timer.h>
+#include <zephyr/arch/arm/cortex_a_r/armv7_v8_timer.h>
 #else
 #include <zephyr/arch/arm/cortex_a_r/timer.h>
 #endif
@@ -99,13 +99,25 @@ enum k_fatal_error_reason_arch {
 	K_ERR_ARM_ALIGNMENT_FAULT,
 	K_ERR_ARM_BACKGROUND_FAULT,
 	K_ERR_ARM_PERMISSION_FAULT,
+	K_ERR_ARM_PERMISSION_FAULT_2ND_LEVEL,
 	K_ERR_ARM_SYNC_EXTERNAL_ABORT,
 	K_ERR_ARM_ASYNC_EXTERNAL_ABORT,
 	K_ERR_ARM_SYNC_PARITY_ERROR,
 	K_ERR_ARM_ASYNC_PARITY_ERROR,
 	K_ERR_ARM_DEBUG_EVENT,
 	K_ERR_ARM_TRANSLATION_FAULT,
-	K_ERR_ARM_UNSUPPORTED_EXCLUSIVE_ACCESS_FAULT
+	K_ERR_ARM_TRANSLATION_FAULT_2ND_LEVEL,
+	K_ERR_ARM_UNSUPPORTED_EXCLUSIVE_ACCESS_FAULT,
+	K_ERR_ARM_ACCESS_FLAG_FAULT_1ST_LEVEL,
+	K_ERR_ARM_ACCESS_FLAG_FAULT_2ND_LEVEL,
+	K_ERR_ARM_CACHE_MAINTENANCE_INSTRUCTION_FAULT,
+	K_ERR_ARM_DOMAIN_FAULT_1ST_LEVEL,
+	K_ERR_ARM_DOMAIN_FAULT_2ND_LEVEL,
+	K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_1ST_LEVEL,
+	K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL,
+	K_ERR_ARM_TLB_CONFLICT_FAULT,
+	K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL,
+	K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_2ND_LEVEL,
 };
 
 #endif /* _ASMLANGUAGE */
diff --git a/include/zephyr/arch/arm/asm_inline.h b/include/zephyr/arch/arm/asm_inline.h
index fe36fb2d0e196..54bf2a6f4594e 100644
--- a/include/zephyr/arch/arm/asm_inline.h
+++ b/include/zephyr/arch/arm/asm_inline.h
@@ -14,10 +14,10 @@
  * Include kernel.h instead
  */
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__ICCARM__)
 #include <zephyr/arch/arm/asm_inline_gcc.h>
 #else
-#include <arch/arm/asm_inline_other.h>
+#error Unknown toolchain in asm_inline.h
 #endif
 
 #endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ */
diff --git a/include/zephyr/arch/arm/cortex_a_r/armv7_v8_timer.h b/include/zephyr/arch/arm/cortex_a_r/armv7_v8_timer.h
new file mode 100644
index 0000000000000..911bed910f0db
--- /dev/null
+++ b/include/zephyr/arch/arm/cortex_a_r/armv7_v8_timer.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
+ * Copyright (c) 2022 IoT.bzh
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_ARMV7_V8_TIMER_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_ARMV7_V8_TIMER_H_
+
+#ifndef _ASMLANGUAGE
+
+#include <zephyr/drivers/timer/arm_arch_timer.h>
+#include <zephyr/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ARM_ARCH_TIMER_IRQ	ARM_TIMER_VIRTUAL_IRQ
+#define ARM_ARCH_TIMER_PRIO	ARM_TIMER_VIRTUAL_PRIO
+#define ARM_ARCH_TIMER_FLAGS	ARM_TIMER_VIRTUAL_FLAGS
+
+static ALWAYS_INLINE void arm_arch_timer_init(void)
+{
+}
+
+static ALWAYS_INLINE void arm_arch_timer_set_compare(uint64_t val)
+{
+	write_cntv_cval(val);
+}
+
+static ALWAYS_INLINE void arm_arch_timer_enable(unsigned char enable)
+{
+	uint64_t cntv_ctl;
+
+	cntv_ctl = read_cntv_ctl();
+
+	if (enable) {
+		cntv_ctl |= CNTV_CTL_ENABLE_BIT;
+	} else {
+		cntv_ctl &= ~CNTV_CTL_ENABLE_BIT;
+	}
+
+	write_cntv_ctl(cntv_ctl);
+}
+
+static ALWAYS_INLINE void arm_arch_timer_set_irq_mask(bool mask)
+{
+	uint64_t cntv_ctl;
+
+	cntv_ctl = read_cntv_ctl();
+
+	if (mask) {
+		cntv_ctl |= CNTV_CTL_IMASK_BIT;
+	} else {
+		cntv_ctl &= ~CNTV_CTL_IMASK_BIT;
+	}
+
+	write_cntv_ctl(cntv_ctl);
+}
+
+static ALWAYS_INLINE uint64_t arm_arch_timer_count(void)
+{
+	return read_cntvct();
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ASMLANGUAGE */
+
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_ARMV7_V8_TIMER_H_ */
diff --git a/include/zephyr/arch/arm/cortex_a_r/armv8_timer.h b/include/zephyr/arch/arm/cortex_a_r/armv8_timer.h
deleted file mode 100644
index 3950397f71a62..0000000000000
--- a/include/zephyr/arch/arm/cortex_a_r/armv8_timer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
- * Copyright (c) 2022 IoT.bzh
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_ARMV8_TIMER_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_ARMV8_TIMER_H_
-
-#ifndef _ASMLANGUAGE
-
-#include <zephyr/drivers/timer/arm_arch_timer.h>
-#include <zephyr/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ARM_ARCH_TIMER_IRQ	ARM_TIMER_VIRTUAL_IRQ
-#define ARM_ARCH_TIMER_PRIO	ARM_TIMER_VIRTUAL_PRIO
-#define ARM_ARCH_TIMER_FLAGS	ARM_TIMER_VIRTUAL_FLAGS
-
-static ALWAYS_INLINE void arm_arch_timer_init(void)
-{
-}
-
-static ALWAYS_INLINE void arm_arch_timer_set_compare(uint64_t val)
-{
-	write_cntv_cval(val);
-}
-
-static ALWAYS_INLINE void arm_arch_timer_enable(unsigned char enable)
-{
-	uint64_t cntv_ctl;
-
-	cntv_ctl = read_cntv_ctl();
-
-	if (enable) {
-		cntv_ctl |= CNTV_CTL_ENABLE_BIT;
-	} else {
-		cntv_ctl &= ~CNTV_CTL_ENABLE_BIT;
-	}
-
-	write_cntv_ctl(cntv_ctl);
-}
-
-static ALWAYS_INLINE void arm_arch_timer_set_irq_mask(bool mask)
-{
-	uint64_t cntv_ctl;
-
-	cntv_ctl = read_cntv_ctl();
-
-	if (mask) {
-		cntv_ctl |= CNTV_CTL_IMASK_BIT;
-	} else {
-		cntv_ctl &= ~CNTV_CTL_IMASK_BIT;
-	}
-
-	write_cntv_ctl(cntv_ctl);
-}
-
-static ALWAYS_INLINE uint64_t arm_arch_timer_count(void)
-{
-	return read_cntvct();
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ASMLANGUAGE */
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_ARMV8_TIMER_H_ */
diff --git a/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld b/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld
index 1d2744e253b86..dbc2ff1e94e57 100644
--- a/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld
+++ b/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld
@@ -257,7 +257,10 @@ SECTIONS
 
     GROUP_START(RAMABLE_REGION)
 
+#if ROM_ADDR != RAM_ADDR
     . = RAM_ADDR;
+#endif
+
     /* Align the start of image RAM with the
      * minimum granularity required by MPU.
      */
diff --git a/include/zephyr/arch/arm/cortex_m/cpu.h b/include/zephyr/arch/arm/cortex_m/cpu.h
index 064d8f92d56e2..096f5aabba830 100644
--- a/include/zephyr/arch/arm/cortex_m/cpu.h
+++ b/include/zephyr/arch/arm/cortex_m/cpu.h
@@ -12,9 +12,9 @@
 #define _SCS_BASE_ADDR _PPB_INT_SCS
 
 /* ICSR defines */
-#define _SCS_ICSR (_SCS_BASE_ADDR + 0xd04)
-#define _SCS_ICSR_PENDSV (1 << 28)
-#define _SCS_ICSR_UNPENDSV (1 << 27)
+#define _SCS_ICSR           (_SCS_BASE_ADDR + 0xd04)
+#define _SCS_ICSR_PENDSV    (1 << 28)
+#define _SCS_ICSR_UNPENDSV  (1 << 27)
 #define _SCS_ICSR_RETTOBASE (1 << 11)
 
 #define _SCS_MPU_CTRL (_SCS_BASE_ADDR + 0xd94)
@@ -34,20 +34,20 @@ extern "C" {
 #endif
 
 /* CP10 Access Bits */
-#define CPACR_CP10_Pos          20U
-#define CPACR_CP10_Msk          (3UL << CPACR_CP10_Pos)
-#define CPACR_CP10_NO_ACCESS    (0UL << CPACR_CP10_Pos)
-#define CPACR_CP10_PRIV_ACCESS  (1UL << CPACR_CP10_Pos)
-#define CPACR_CP10_RESERVED     (2UL << CPACR_CP10_Pos)
-#define CPACR_CP10_FULL_ACCESS  (3UL << CPACR_CP10_Pos)
+#define CPACR_CP10_Pos         20U
+#define CPACR_CP10_Msk         (3UL << CPACR_CP10_Pos)
+#define CPACR_CP10_NO_ACCESS   (0UL << CPACR_CP10_Pos)
+#define CPACR_CP10_PRIV_ACCESS (1UL << CPACR_CP10_Pos)
+#define CPACR_CP10_RESERVED    (2UL << CPACR_CP10_Pos)
+#define CPACR_CP10_FULL_ACCESS (3UL << CPACR_CP10_Pos)
 
 /* CP11 Access Bits */
-#define CPACR_CP11_Pos          22U
-#define CPACR_CP11_Msk          (3UL << CPACR_CP11_Pos)
-#define CPACR_CP11_NO_ACCESS    (0UL << CPACR_CP11_Pos)
-#define CPACR_CP11_PRIV_ACCESS  (1UL << CPACR_CP11_Pos)
-#define CPACR_CP11_RESERVED     (2UL << CPACR_CP11_Pos)
-#define CPACR_CP11_FULL_ACCESS  (3UL << CPACR_CP11_Pos)
+#define CPACR_CP11_Pos         22U
+#define CPACR_CP11_Msk         (3UL << CPACR_CP11_Pos)
+#define CPACR_CP11_NO_ACCESS   (0UL << CPACR_CP11_Pos)
+#define CPACR_CP11_PRIV_ACCESS (1UL << CPACR_CP11_Pos)
+#define CPACR_CP11_RESERVED    (2UL << CPACR_CP11_Pos)
+#define CPACR_CP11_FULL_ACCESS (3UL << CPACR_CP11_Pos)
 
 #ifdef CONFIG_PM_S2RAM
 
diff --git a/include/zephyr/arch/arm/cortex_m/exception.h b/include/zephyr/arch/arm/cortex_m/exception.h
index 6f60317891d9a..d675efa1549d0 100644
--- a/include/zephyr/arch/arm/cortex_m/exception.h
+++ b/include/zephyr/arch/arm/cortex_m/exception.h
@@ -43,17 +43,17 @@
 #define _EXCEPTION_RESERVED_PRIO 0
 #endif
 
-#define _EXC_FAULT_PRIO 0
+#define _EXC_FAULT_PRIO             0
 #define _EXC_ZERO_LATENCY_IRQS_PRIO 0
-#define _EXC_SVC_PRIO COND_CODE_1(CONFIG_ZERO_LATENCY_IRQS,		\
+#define _EXC_SVC_PRIO               COND_CODE_1(CONFIG_ZERO_LATENCY_IRQS,		\
 				  (CONFIG_ZERO_LATENCY_LEVELS), (0))
-#define _IRQ_PRIO_OFFSET (_EXCEPTION_RESERVED_PRIO + _EXC_SVC_PRIO)
-#define IRQ_PRIO_LOWEST (BIT(NUM_IRQ_PRIO_BITS) - (_IRQ_PRIO_OFFSET) - 1)
+#define _IRQ_PRIO_OFFSET            (_EXCEPTION_RESERVED_PRIO + _EXC_SVC_PRIO)
+#define IRQ_PRIO_LOWEST             (BIT(NUM_IRQ_PRIO_BITS) - (_IRQ_PRIO_OFFSET) - 1)
 
 #define _EXC_IRQ_DEFAULT_PRIO Z_EXC_PRIO(_IRQ_PRIO_OFFSET)
 
 /* Use lowest possible priority level for PendSV */
-#define _EXC_PENDSV_PRIO 0xff
+#define _EXC_PENDSV_PRIO      0xff
 #define _EXC_PENDSV_PRIO_MASK Z_EXC_PRIO(_EXC_PENDSV_PRIO)
 
 #ifdef _ASMLANGUAGE
@@ -99,7 +99,10 @@ struct __extra_esf_info {
 #endif /* CONFIG_EXTRA_EXCEPTION_INFO */
 
 /* ARM GPRs are often designated by two different names */
-#define sys_define_gpr_with_alias(name1, name2) union { uint32_t name1, name2; }
+#define sys_define_gpr_with_alias(name1, name2)                                                    \
+	union {                                                                                    \
+		uint32_t name1, name2;                                                             \
+	}
 
 struct arch_esf {
 	struct __basic_sf {
diff --git a/include/zephyr/arch/arm/cortex_m/memory_map.h b/include/zephyr/arch/arm/cortex_m/memory_map.h
index 1fbec9d19d7b8..30e800daf374d 100644
--- a/include/zephyr/arch/arm/cortex_m/memory_map.h
+++ b/include/zephyr/arch/arm/cortex_m/memory_map.h
@@ -18,8 +18,8 @@
 #include <zephyr/sys/util.h>
 
 /* 0x00000000 -> 0x1fffffff: Code in ROM [0.5 GB] */
-#define _CODE_BASE_ADDR           0x00000000
-#define _CODE_END_ADDR            0x1FFFFFFF
+#define _CODE_BASE_ADDR 0x00000000
+#define _CODE_END_ADDR  0x1FFFFFFF
 
 /* 0x20000000 -> 0x3fffffff: SRAM [0.5GB] */
 #define _SRAM_BASE_ADDR           0x20000000
@@ -38,78 +38,77 @@
 #define _PERI_END_ADDR            0x5FFFFFFF
 
 /* 0x60000000 -> 0x9fffffff: external RAM [1GB] */
-#define _ERAM_BASE_ADDR           0x60000000
-#define _ERAM_END_ADDR            0x9FFFFFFF
+#define _ERAM_BASE_ADDR 0x60000000
+#define _ERAM_END_ADDR  0x9FFFFFFF
 
 /* 0xa0000000 -> 0xdfffffff: external devices [1GB] */
-#define _EDEV_BASE_ADDR           0xA0000000
-#define _EDEV_END_ADDR            0xDFFFFFFF
+#define _EDEV_BASE_ADDR 0xA0000000
+#define _EDEV_END_ADDR  0xDFFFFFFF
 
 /* 0xe0000000 -> 0xffffffff: varies by processor (see below) */
 
 /* 0xe0000000 -> 0xe00fffff: private peripheral bus */
 /* 0xe0000000 -> 0xe003ffff: internal [256KB] */
-#define _PPB_INT_BASE_ADDR        0xE0000000
-#if defined(CONFIG_CPU_CORTEX_M0) || defined(CONFIG_CPU_CORTEX_M0PLUS) || \
+#define _PPB_INT_BASE_ADDR 0xE0000000
+#if defined(CONFIG_CPU_CORTEX_M0) || defined(CONFIG_CPU_CORTEX_M0PLUS) ||                          \
 	defined(CONFIG_CPU_CORTEX_M1)
-#define _PPB_INT_RSVD_0           0xE0000000
-#define _PPB_INT_DWT              0xE0001000
-#define _PPB_INT_BPU              0xE0002000
-#define _PPB_INT_RSVD_1           0xE0003000
-#define _PPB_INT_SCS              0xE000E000
-#define _PPB_INT_RSVD_2           0xE000F000
-#elif defined(CONFIG_CPU_CORTEX_M3) || defined(CONFIG_CPU_CORTEX_M4) || defined(CONFIG_CPU_CORTEX_M7)
-#define _PPB_INT_ITM              0xE0000000
-#define _PPB_INT_DWT              0xE0001000
-#define _PPB_INT_FPB              0xE0002000
-#define _PPB_INT_RSVD_1           0xE0003000
-#define _PPB_INT_SCS              0xE000E000
-#define _PPB_INT_RSVD_2           0xE000F000
-#elif defined(CONFIG_CPU_CORTEX_M23) || \
-	defined(CONFIG_CPU_CORTEX_M33) || \
-	defined(CONFIG_CPU_CORTEX_M55) || \
-	defined(CONFIG_CPU_CORTEX_M85)
-#define _PPB_INT_RSVD_0           0xE0000000
-#define _PPB_INT_SCS              0xE000E000
-#define _PPB_INT_SCB              0xE000ED00
-#define _PPB_INT_RSVD_1           0xE002E000
+#define _PPB_INT_RSVD_0 0xE0000000
+#define _PPB_INT_DWT    0xE0001000
+#define _PPB_INT_BPU    0xE0002000
+#define _PPB_INT_RSVD_1 0xE0003000
+#define _PPB_INT_SCS    0xE000E000
+#define _PPB_INT_RSVD_2 0xE000F000
+#elif defined(CONFIG_CPU_CORTEX_M3) || defined(CONFIG_CPU_CORTEX_M4) ||                            \
+	defined(CONFIG_CPU_CORTEX_M7)
+#define _PPB_INT_ITM    0xE0000000
+#define _PPB_INT_DWT    0xE0001000
+#define _PPB_INT_FPB    0xE0002000
+#define _PPB_INT_RSVD_1 0xE0003000
+#define _PPB_INT_SCS    0xE000E000
+#define _PPB_INT_RSVD_2 0xE000F000
+#elif defined(CONFIG_CPU_CORTEX_M23) || defined(CONFIG_CPU_CORTEX_M33) ||                          \
+	defined(CONFIG_CPU_CORTEX_M55) || defined(CONFIG_CPU_CORTEX_M85)
+#define _PPB_INT_RSVD_0 0xE0000000
+#define _PPB_INT_SCS    0xE000E000
+#define _PPB_INT_SCB    0xE000ED00
+#define _PPB_INT_RSVD_1 0xE002E000
 #else
 #error Unknown CPU
 #endif
-#define _PPB_INT_END_ADDR         0xE003FFFF
+#define _PPB_INT_END_ADDR 0xE003FFFF
 
 /* 0xe0000000 -> 0xe00fffff: private peripheral bus */
 /* 0xe0040000 -> 0xe00fffff: external [768K] */
-#define _PPB_EXT_BASE_ADDR        0xE0040000
-#if defined(CONFIG_CPU_CORTEX_M0) || defined(CONFIG_CPU_CORTEX_M0PLUS) \
-	|| defined(CONFIG_CPU_CORTEX_M1) || defined(CONFIG_CPU_CORTEX_M23)
+#define _PPB_EXT_BASE_ADDR 0xE0040000
+#if defined(CONFIG_CPU_CORTEX_M0) || defined(CONFIG_CPU_CORTEX_M0PLUS) ||                          \
+	defined(CONFIG_CPU_CORTEX_M1) || defined(CONFIG_CPU_CORTEX_M23)
 #elif defined(CONFIG_CPU_CORTEX_M3) || defined(CONFIG_CPU_CORTEX_M4)
-#define _PPB_EXT_TPIU             0xE0040000
-#define _PPB_EXT_ETM              0xE0041000
-#define _PPB_EXT_PPB              0xE0042000
-#define _PPB_EXT_ROM_TABLE        0xE00FF000
-#define _PPB_EXT_END_ADDR         0xE00FFFFF
-#elif defined(CONFIG_CPU_CORTEX_M33) || defined(CONFIG_CPU_CORTEX_M55) \
-	|| defined(CONFIG_CPU_CORTEX_M85)
-#undef  _PPB_EXT_BASE_ADDR
-#define _PPB_EXT_BASE_ADDR        0xE0044000
-#define _PPB_EXT_ROM_TABLE        0xE00FF000
-#define _PPB_EXT_END_ADDR         0xE00FFFFF
+#define _PPB_EXT_TPIU      0xE0040000
+#define _PPB_EXT_ETM       0xE0041000
+#define _PPB_EXT_PPB       0xE0042000
+#define _PPB_EXT_ROM_TABLE 0xE00FF000
+#define _PPB_EXT_END_ADDR  0xE00FFFFF
+#elif defined(CONFIG_CPU_CORTEX_M33) || defined(CONFIG_CPU_CORTEX_M55) ||                          \
+	defined(CONFIG_CPU_CORTEX_M85)
+#undef _PPB_EXT_BASE_ADDR
+#define _PPB_EXT_BASE_ADDR 0xE0044000
+#define _PPB_EXT_ROM_TABLE 0xE00FF000
+#define _PPB_EXT_END_ADDR  0xE00FFFFF
 #elif defined(CONFIG_CPU_CORTEX_M7)
-#define _PPB_EXT_BASE_ADDR        0xE0040000
-#define _PPB_EXT_RSVD_TPIU        0xE0040000
-#define _PPB_EXT_ETM              0xE0041000
-#define _PPB_EXT_CTI              0xE0042000
-#define _PPB_EXT_PPB              0xE0043000
-#define _PPB_EXT_PROC_ROM_TABLE   0xE00FE000
-#define _PPB_EXT_PPB_ROM_TABLE    0xE00FF000
+#define _PPB_EXT_BASE_ADDR      0xE0040000
+#define _PPB_EXT_RSVD_TPIU      0xE0040000
+#define _PPB_EXT_ETM            0xE0041000
+#define _PPB_EXT_CTI            0xE0042000
+#define _PPB_EXT_PPB            0xE0043000
+#define _PPB_EXT_PROC_ROM_TABLE 0xE00FE000
+#define _PPB_EXT_PPB_ROM_TABLE  0xE00FF000
 #else
 #error Unknown CPU
 #endif
-#define _PPB_EXT_END_ADDR         0xE00FFFFF
+#define _PPB_EXT_END_ADDR 0xE00FFFFF
 
 /* 0xe0100000 -> 0xffffffff: vendor-specific [0.5GB-1MB or 511MB]  */
-#define _VENDOR_BASE_ADDR         0xE0100000
-#define _VENDOR_END_ADDR          0xFFFFFFFF
+#define _VENDOR_BASE_ADDR 0xE0100000
+#define _VENDOR_END_ADDR  0xFFFFFFFF
 
 #endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ */
diff --git a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
index f9efbb5c9eddb..ff11d499bd0fc 100644
--- a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
@@ -257,7 +257,10 @@ SECTIONS
 
     GROUP_START(RAMABLE_REGION)
 
+#if ROM_ADDR != RAM_ADDR
 	. = RAM_ADDR;
+#endif
+
 	/* Align the start of image RAM with the
 	 * minimum granularity required by MPU.
 	 */
diff --git a/include/zephyr/arch/arm/irq.h b/include/zephyr/arch/arm/irq.h
index efb6abf90f1c5..1fbc2ab3045bf 100644
--- a/include/zephyr/arch/arm/irq.h
+++ b/include/zephyr/arch/arm/irq.h
@@ -35,20 +35,23 @@ GTEXT(z_soc_irq_eoi)
 #else
 
 #if !defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
+extern void arm_irq_enable(unsigned int irq);
+extern void arm_irq_disable(unsigned int irq);
+extern int arm_irq_is_enabled(unsigned int irq);
+extern void arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags);
+#if !defined(CONFIG_MULTI_LEVEL_INTERRUPTS)
+#define arch_irq_enable(irq)                     arm_irq_enable(irq)
+#define arch_irq_disable(irq)                    arm_irq_disable(irq)
+#define arch_irq_is_enabled(irq)                 arm_irq_is_enabled(irq)
+#define z_arm_irq_priority_set(irq, prio, flags) arm_irq_priority_set(irq, prio, flags)
+#endif
+#endif
 
-extern void arch_irq_enable(unsigned int irq);
-extern void arch_irq_disable(unsigned int irq);
-extern int arch_irq_is_enabled(unsigned int irq);
-
-/* internal routine documented in C file, needed by IRQ_CONNECT() macro */
-extern void z_arm_irq_priority_set(unsigned int irq, unsigned int prio,
-				   uint32_t flags);
-
-#else
-
+#if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER) || defined(CONFIG_MULTI_LEVEL_INTERRUPTS)
 /*
- * When a custom interrupt controller is specified, map the architecture
- * interrupt control functions to the SoC layer interrupt control functions.
+ * When a custom interrupt controller or multi-level interrupts is specified,
+ * map the architecture interrupt control functions to the SoC layer interrupt
+ * control functions.
  */
 
 void z_soc_irq_init(void);
@@ -69,7 +72,7 @@ void z_soc_irq_eoi(unsigned int irq);
 #define z_arm_irq_priority_set(irq, prio, flags)	\
 	z_soc_irq_priority_set(irq, prio, flags)
 
-#endif /* !CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
+#endif
 
 extern void z_arm_int_exit(void);
 
@@ -166,20 +169,12 @@ static inline void arch_isr_direct_footer(int maybe_swap)
 	}
 }
 
-#if defined(__clang__)
-#define ARCH_ISR_DIAG_OFF \
-	_Pragma("clang diagnostic push") \
-	_Pragma("clang diagnostic ignored \"-Wextra\"")
-#define ARCH_ISR_DIAG_ON _Pragma("clang diagnostic pop")
-#elif defined(__GNUC__)
 #define ARCH_ISR_DIAG_OFF \
-	_Pragma("GCC diagnostic push") \
-	_Pragma("GCC diagnostic ignored \"-Wattributes\"")
-#define ARCH_ISR_DIAG_ON _Pragma("GCC diagnostic pop")
-#else
-#define ARCH_ISR_DIAG_OFF
-#define ARCH_ISR_DIAG_ON
-#endif
+	TOOLCHAIN_DISABLE_CLANG_WARNING(TOOLCHAIN_WARNING_EXTRA) \
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_ATTRIBUTES)
+#define ARCH_ISR_DIAG_ON \
+	TOOLCHAIN_ENABLE_CLANG_WARNING(TOOLCHAIN_WARNING_EXTRA) \
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_ATTRIBUTES)
 
 #define ARCH_ISR_DIRECT_DECLARE(name) \
 	static inline int name##_body(void); \
diff --git a/include/zephyr/arch/arm/mmu/arm_mmu.h b/include/zephyr/arch/arm/mmu/arm_mmu.h
index 4179436615d34..76b8ec9b97dd6 100644
--- a/include/zephyr/arch/arm/mmu/arm_mmu.h
+++ b/include/zephyr/arch/arm/mmu/arm_mmu.h
@@ -10,6 +10,9 @@
 
 #ifndef _ASMLANGUAGE
 
+#include <stdint.h>
+#include <stdlib.h>
+
 /*
  * Comp.:
  * ARM Architecture Reference Manual, ARMv7-A and ARMv7-R edition,
diff --git a/include/zephyr/arch/arm/mpu/arm_mpu.h b/include/zephyr/arch/arm/mpu/arm_mpu.h
index e47883f1849a1..2aee4dd7efee5 100644
--- a/include/zephyr/arch/arm/mpu/arm_mpu.h
+++ b/include/zephyr/arch/arm/mpu/arm_mpu.h
@@ -6,16 +6,11 @@
 #ifndef ZEPHYR_INCLUDE_ARCH_ARM_MPU_ARM_MPU_H_
 #define ZEPHYR_INCLUDE_ARCH_ARM_MPU_ARM_MPU_H_
 
-#if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
-	defined(CONFIG_CPU_CORTEX_M3) || \
-	defined(CONFIG_CPU_CORTEX_M4) || \
-	defined(CONFIG_CPU_CORTEX_M7) || \
-	defined(CONFIG_ARMV7_R)
+#if defined(CONFIG_CPU_CORTEX_M0PLUS) || defined(CONFIG_CPU_CORTEX_M3) ||                          \
+	defined(CONFIG_CPU_CORTEX_M4) || defined(CONFIG_CPU_CORTEX_M7) || defined(CONFIG_ARMV7_R)
 #include <zephyr/arch/arm/mpu/arm_mpu_v7m.h>
-#elif defined(CONFIG_CPU_CORTEX_M23) || \
-	defined(CONFIG_CPU_CORTEX_M33) || \
-	defined(CONFIG_CPU_CORTEX_M55) || \
-	defined(CONFIG_CPU_CORTEX_M85) || \
+#elif defined(CONFIG_CPU_CORTEX_M23) || defined(CONFIG_CPU_CORTEX_M33) ||                          \
+	defined(CONFIG_CPU_CORTEX_M55) || defined(CONFIG_CPU_CORTEX_M85) ||                        \
 	defined(CONFIG_AARCH32_ARMV8_R)
 #include <zephyr/arch/arm/mpu/arm_mpu_v8.h>
 #else
@@ -47,19 +42,19 @@ struct arm_mpu_config {
 };
 
 #if defined(CONFIG_ARMV7_R)
-#define MPU_REGION_ENTRY(_name, _base, _size, _attr) \
-	{\
-		.name = _name, \
-		.base = _base, \
-		.size = _size, \
-		.attr = _attr, \
+#define MPU_REGION_ENTRY(_name, _base, _size, _attr)                                               \
+	{                                                                                          \
+		.name = _name,                                                                     \
+		.base = _base,                                                                     \
+		.size = _size,                                                                     \
+		.attr = _attr,                                                                     \
 	}
 #else
-#define MPU_REGION_ENTRY(_name, _base, _attr) \
-	{\
-		.name = _name, \
-		.base = _base, \
-		.attr = _attr, \
+#define MPU_REGION_ENTRY(_name, _base, _attr)                                                      \
+	{                                                                                          \
+		.name = _name,                                                                     \
+		.base = _base,                                                                     \
+		.attr = _attr,                                                                     \
 	}
 #endif
 
diff --git a/include/zephyr/arch/arm/mpu/arm_mpu_v7m.h b/include/zephyr/arch/arm/mpu/arm_mpu_v7m.h
index 1ed8636ec50bd..02c7d13be58e5 100644
--- a/include/zephyr/arch/arm/mpu/arm_mpu_v7m.h
+++ b/include/zephyr/arch/arm/mpu/arm_mpu_v7m.h
@@ -46,73 +46,69 @@
 #define NOT_EXEC MPU_RASR_XN_Msk
 
 /* The following definitions are for internal use in arm_mpu.h. */
-#define STRONGLY_ORDERED_SHAREABLE      MPU_RASR_S_Msk
-#define DEVICE_SHAREABLE                (MPU_RASR_B_Msk | MPU_RASR_S_Msk)
-#define NORMAL_OUTER_INNER_WRITE_THROUGH_SHAREABLE \
-		(MPU_RASR_C_Msk | MPU_RASR_S_Msk)
-#define NORMAL_OUTER_INNER_WRITE_THROUGH_NON_SHAREABLE	MPU_RASR_C_Msk
-#define NORMAL_OUTER_INNER_WRITE_BACK_SHAREABLE	\
-		(MPU_RASR_C_Msk | MPU_RASR_B_Msk | MPU_RASR_S_Msk)
-#define NORMAL_OUTER_INNER_WRITE_BACK_NON_SHAREABLE \
-		(MPU_RASR_C_Msk | MPU_RASR_B_Msk)
-#define NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE \
-		((1 << MPU_RASR_TEX_Pos) | MPU_RASR_S_Msk)
-#define NORMAL_OUTER_INNER_NON_CACHEABLE_NON_SHAREABLE \
-		(1 << MPU_RASR_TEX_Pos)
-#define NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_SHAREABLE \
-	((1 << MPU_RASR_TEX_Pos) |\
-	 MPU_RASR_C_Msk | MPU_RASR_B_Msk | MPU_RASR_S_Msk)
-#define NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE \
+#define STRONGLY_ORDERED_SHAREABLE                     MPU_RASR_S_Msk
+#define DEVICE_SHAREABLE                               (MPU_RASR_B_Msk | MPU_RASR_S_Msk)
+#define NORMAL_OUTER_INNER_WRITE_THROUGH_SHAREABLE     (MPU_RASR_C_Msk | MPU_RASR_S_Msk)
+#define NORMAL_OUTER_INNER_WRITE_THROUGH_NON_SHAREABLE MPU_RASR_C_Msk
+/* clang-format off */
+#define NORMAL_OUTER_INNER_WRITE_BACK_SHAREABLE                                                    \
+	(MPU_RASR_C_Msk | MPU_RASR_B_Msk | MPU_RASR_S_Msk)
+/* clang-format on */
+#define NORMAL_OUTER_INNER_WRITE_BACK_NON_SHAREABLE    (MPU_RASR_C_Msk | MPU_RASR_B_Msk)
+#define NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE     ((1 << MPU_RASR_TEX_Pos) | MPU_RASR_S_Msk)
+#define NORMAL_OUTER_INNER_NON_CACHEABLE_NON_SHAREABLE (1 << MPU_RASR_TEX_Pos)
+#define NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_SHAREABLE                                \
+	((1 << MPU_RASR_TEX_Pos) | MPU_RASR_C_Msk | MPU_RASR_B_Msk | MPU_RASR_S_Msk)
+#define NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE                            \
 	((1 << MPU_RASR_TEX_Pos) | MPU_RASR_C_Msk | MPU_RASR_B_Msk)
-#define DEVICE_NON_SHAREABLE            (2 << MPU_RASR_TEX_Pos)
+#define DEVICE_NON_SHAREABLE (2 << MPU_RASR_TEX_Pos)
 
 /* Bit-masks to disable sub-regions. */
-#define SUB_REGION_0_DISABLED	((0x01 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
-#define SUB_REGION_1_DISABLED	((0x02 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
-#define SUB_REGION_2_DISABLED	((0x04 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
-#define SUB_REGION_3_DISABLED	((0x08 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
-#define SUB_REGION_4_DISABLED	((0x10 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
-#define SUB_REGION_5_DISABLED	((0x20 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
-#define SUB_REGION_6_DISABLED	((0x40 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
-#define SUB_REGION_7_DISABLED	((0x80 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_0_DISABLED ((0x01 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_1_DISABLED ((0x02 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_2_DISABLED ((0x04 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_3_DISABLED ((0x08 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_4_DISABLED ((0x10 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_5_DISABLED ((0x20 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_6_DISABLED ((0x40 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
+#define SUB_REGION_7_DISABLED ((0x80 << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk)
 
+#define REGION_SIZE(size) ((ARM_MPU_REGION_SIZE_##size << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk)
 
-#define REGION_SIZE(size) ((ARM_MPU_REGION_SIZE_ ## size \
-	<< MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk)
+#define REGION_32B  REGION_SIZE(32B)
+#define REGION_64B  REGION_SIZE(64B)
+#define REGION_128B REGION_SIZE(128B)
+#define REGION_256B REGION_SIZE(256B)
+#define REGION_512B REGION_SIZE(512B)
+#define REGION_1K   REGION_SIZE(1KB)
+#define REGION_2K   REGION_SIZE(2KB)
+#define REGION_4K   REGION_SIZE(4KB)
+#define REGION_8K   REGION_SIZE(8KB)
+#define REGION_16K  REGION_SIZE(16KB)
+#define REGION_32K  REGION_SIZE(32KB)
+#define REGION_64K  REGION_SIZE(64KB)
+#define REGION_128K REGION_SIZE(128KB)
+#define REGION_256K REGION_SIZE(256KB)
+#define REGION_512K REGION_SIZE(512KB)
+#define REGION_1M   REGION_SIZE(1MB)
+#define REGION_2M   REGION_SIZE(2MB)
+#define REGION_4M   REGION_SIZE(4MB)
+#define REGION_8M   REGION_SIZE(8MB)
+#define REGION_16M  REGION_SIZE(16MB)
+#define REGION_32M  REGION_SIZE(32MB)
+#define REGION_64M  REGION_SIZE(64MB)
+#define REGION_128M REGION_SIZE(128MB)
+#define REGION_256M REGION_SIZE(256MB)
+#define REGION_512M REGION_SIZE(512MB)
+#define REGION_1G   REGION_SIZE(1GB)
+#define REGION_2G   REGION_SIZE(2GB)
+#define REGION_4G   REGION_SIZE(4GB)
 
-#define REGION_32B      REGION_SIZE(32B)
-#define REGION_64B      REGION_SIZE(64B)
-#define REGION_128B     REGION_SIZE(128B)
-#define REGION_256B     REGION_SIZE(256B)
-#define REGION_512B     REGION_SIZE(512B)
-#define REGION_1K       REGION_SIZE(1KB)
-#define REGION_2K       REGION_SIZE(2KB)
-#define REGION_4K       REGION_SIZE(4KB)
-#define REGION_8K       REGION_SIZE(8KB)
-#define REGION_16K      REGION_SIZE(16KB)
-#define REGION_32K      REGION_SIZE(32KB)
-#define REGION_64K      REGION_SIZE(64KB)
-#define REGION_128K     REGION_SIZE(128KB)
-#define REGION_256K     REGION_SIZE(256KB)
-#define REGION_512K     REGION_SIZE(512KB)
-#define REGION_1M       REGION_SIZE(1MB)
-#define REGION_2M       REGION_SIZE(2MB)
-#define REGION_4M       REGION_SIZE(4MB)
-#define REGION_8M       REGION_SIZE(8MB)
-#define REGION_16M      REGION_SIZE(16MB)
-#define REGION_32M      REGION_SIZE(32MB)
-#define REGION_64M      REGION_SIZE(64MB)
-#define REGION_128M     REGION_SIZE(128MB)
-#define REGION_256M     REGION_SIZE(256MB)
-#define REGION_512M     REGION_SIZE(512MB)
-#define REGION_1G       REGION_SIZE(1GB)
-#define REGION_2G       REGION_SIZE(2GB)
-#define REGION_4G       REGION_SIZE(4GB)
-
-#define ARM_MPU_REGION_INIT(p_name, p_base, p_size, p_attr)	\
-	{ .name = p_name,					\
-	  .base = p_base,					\
-	  .attr = p_attr(size_to_mpu_rasr_size(p_size)),	\
+#define ARM_MPU_REGION_INIT(p_name, p_base, p_size, p_attr)                                        \
+	{                                                                                          \
+		.name = p_name,                                                                    \
+		.base = p_base,                                                                    \
+		.attr = p_attr(size_to_mpu_rasr_size(p_size)),                                     \
 	}
 
 /* Some helper defines for common regions */
@@ -121,33 +117,20 @@
  * CONFIG_XIP=n, the entire image will be linked to SRAM, so we need to keep
  * the SRAM region XN bit clear or the application code will not be executable.
  */
-#define REGION_RAM_ATTR(size) \
-{ \
-	(NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE | \
-	 IF_ENABLED(CONFIG_XIP, (MPU_RASR_XN_Msk |)) size | P_RW_U_NA_Msk) \
-}
-#define REGION_RAM_NOCACHE_ATTR(size) \
-{ \
-	(NORMAL_OUTER_INNER_NON_CACHEABLE_NON_SHAREABLE | \
-	 MPU_RASR_XN_Msk | size | P_RW_U_NA_Msk) \
-}
+#define REGION_RAM_ATTR(size)                                                                      \
+	{(NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE |                        \
+	  IF_ENABLED(CONFIG_XIP, (MPU_RASR_XN_Msk |)) size | P_RW_U_NA_Msk)}
+#define REGION_RAM_NOCACHE_ATTR(size)                                                              \
+	{(NORMAL_OUTER_INNER_NON_CACHEABLE_NON_SHAREABLE | MPU_RASR_XN_Msk | size | P_RW_U_NA_Msk)}
 #if defined(CONFIG_MPU_ALLOW_FLASH_WRITE)
-#define REGION_FLASH_ATTR(size) \
-{ \
-	(NORMAL_OUTER_INNER_WRITE_THROUGH_NON_SHAREABLE | size | \
-		P_RW_U_RO_Msk) \
-}
+#define REGION_FLASH_ATTR(size)                                                                    \
+	{(NORMAL_OUTER_INNER_WRITE_THROUGH_NON_SHAREABLE | size | P_RW_U_RO_Msk)}
 #else
-#define REGION_FLASH_ATTR(size) \
-{ \
-	(NORMAL_OUTER_INNER_WRITE_THROUGH_NON_SHAREABLE | size | RO_Msk) \
-}
+#define REGION_FLASH_ATTR(size) {(NORMAL_OUTER_INNER_WRITE_THROUGH_NON_SHAREABLE | size | RO_Msk)}
 #endif
-#define REGION_PPB_ATTR(size) { (STRONGLY_ORDERED_SHAREABLE | size | \
-		P_RW_U_NA_Msk) }
-#define REGION_IO_ATTR(size) { (DEVICE_NON_SHAREABLE | size | P_RW_U_NA_Msk) }
-#define REGION_EXTMEM_ATTR(size) { (STRONGLY_ORDERED_SHAREABLE | size | \
-		NO_ACCESS_Msk) }
+#define REGION_PPB_ATTR(size)    {(STRONGLY_ORDERED_SHAREABLE | size | P_RW_U_NA_Msk)}
+#define REGION_IO_ATTR(size)     {(DEVICE_NON_SHAREABLE | size | P_RW_U_NA_Msk)}
+#define REGION_EXTMEM_ATTR(size) {(STRONGLY_ORDERED_SHAREABLE | size | NO_ACCESS_Msk)}
 
 struct arm_mpu_region_attr {
 	/* Attributes belonging to RASR (including the encoded region size) */
@@ -162,12 +145,12 @@ typedef struct {
 } k_mem_partition_attr_t;
 
 /* Read-Write access permission attributes */
-#define _K_MEM_PARTITION_P_NA_U_NA	(NO_ACCESS_Msk | NOT_EXEC)
-#define _K_MEM_PARTITION_P_RW_U_RW	(P_RW_U_RW_Msk | NOT_EXEC)
-#define _K_MEM_PARTITION_P_RW_U_RO	(P_RW_U_RO_Msk | NOT_EXEC)
-#define _K_MEM_PARTITION_P_RW_U_NA	(P_RW_U_NA_Msk | NOT_EXEC)
-#define _K_MEM_PARTITION_P_RO_U_RO	(P_RO_U_RO_Msk | NOT_EXEC)
-#define _K_MEM_PARTITION_P_RO_U_NA	(P_RO_U_NA_Msk | NOT_EXEC)
+#define _K_MEM_PARTITION_P_NA_U_NA (NO_ACCESS_Msk | NOT_EXEC)
+#define _K_MEM_PARTITION_P_RW_U_RW (P_RW_U_RW_Msk | NOT_EXEC)
+#define _K_MEM_PARTITION_P_RW_U_RO (P_RW_U_RO_Msk | NOT_EXEC)
+#define _K_MEM_PARTITION_P_RW_U_NA (P_RW_U_NA_Msk | NOT_EXEC)
+#define _K_MEM_PARTITION_P_RO_U_RO (P_RO_U_RO_Msk | NOT_EXEC)
+#define _K_MEM_PARTITION_P_RO_U_NA (P_RO_U_NA_Msk | NOT_EXEC)
 
 /* Execution-allowed attributes */
 #define _K_MEM_PARTITION_P_RWX_U_RWX (P_RW_U_RW_Msk)
@@ -184,35 +167,44 @@ typedef struct {
  */
 
 /* Read-Write access permission attributes (default cache-ability) */
-#define K_MEM_PARTITION_P_NA_U_NA	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_NA_U_NA | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
-#define K_MEM_PARTITION_P_RW_U_RW	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RW_U_RW | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
-#define K_MEM_PARTITION_P_RW_U_RO	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RW_U_RO | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
-#define K_MEM_PARTITION_P_RW_U_NA	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RW_U_NA | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
-#define K_MEM_PARTITION_P_RO_U_RO	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RO_U_RO | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
-#define K_MEM_PARTITION_P_RO_U_NA	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RO_U_NA | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_NA_U_NA                                                                  \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_NA_U_NA |                                                       \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RW_U_RW                                                                  \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RW_U_RW |                                                       \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RW_U_RO                                                                  \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RW_U_RO |                                                       \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RW_U_NA                                                                  \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RW_U_NA |                                                       \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RO_U_RO                                                                  \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RO_U_RO |                                                       \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RO_U_NA                                                                  \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RO_U_NA |                                                       \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
 
 /* Execution-allowed attributes (default-cacheability) */
-#define K_MEM_PARTITION_P_RWX_U_RWX	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RWX_U_RWX | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
-#define K_MEM_PARTITION_P_RWX_U_RX	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RWX_U_RX | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
-#define K_MEM_PARTITION_P_RX_U_RX	((k_mem_partition_attr_t) \
-	{ _K_MEM_PARTITION_P_RX_U_RX | \
-	  NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RWX_U_RWX                                                                \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RWX_U_RWX |                                                     \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RWX_U_RX                                                                 \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RWX_U_RX |                                                      \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
+#define K_MEM_PARTITION_P_RX_U_RX                                                                  \
+	((k_mem_partition_attr_t){                                                                 \
+		_K_MEM_PARTITION_P_RX_U_RX |                                                       \
+		NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_SHAREABLE})
 
 /*
  * @brief Evaluate Write-ability
@@ -222,19 +214,19 @@ typedef struct {
  * @param attr The k_mem_partition_attr_t object holding the
  *             MPU attributes to be checked against write-ability.
  */
-#define K_MEM_PARTITION_IS_WRITABLE(attr) \
-	({ \
-		int __is_writable__; \
-		switch (attr.rasr_attr & MPU_RASR_AP_Msk) { \
-		case P_RW_U_RW_Msk: \
-		case P_RW_U_RO_Msk: \
-		case P_RW_U_NA_Msk: \
-			__is_writable__ = 1; \
-			break; \
-		default: \
-			__is_writable__ = 0; \
-		} \
-		__is_writable__; \
+#define K_MEM_PARTITION_IS_WRITABLE(attr)                                                          \
+	({                                                                                         \
+		int __is_writable__;                                                               \
+		switch (attr.rasr_attr & MPU_RASR_AP_Msk) {                                        \
+		case P_RW_U_RW_Msk:                                                                \
+		case P_RW_U_RO_Msk:                                                                \
+		case P_RW_U_NA_Msk:                                                                \
+			__is_writable__ = 1;                                                       \
+			break;                                                                     \
+		default:                                                                           \
+			__is_writable__ = 0;                                                       \
+		}                                                                                  \
+		__is_writable__;                                                                   \
 	})
 
 /*
@@ -246,46 +238,56 @@ typedef struct {
  *             MPU attributes to be checked against execution
  *             allowance.
  */
-#define K_MEM_PARTITION_IS_EXECUTABLE(attr) \
-	(!((attr.rasr_attr) & (NOT_EXEC)))
+#define K_MEM_PARTITION_IS_EXECUTABLE(attr) (!((attr.rasr_attr) & (NOT_EXEC)))
 
 /* Attributes for no-cache enabling (share-ability is selected by default) */
 
-#define K_MEM_PARTITION_P_NA_U_NA_NOCACHE ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_NA_U_NA \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
-#define K_MEM_PARTITION_P_RW_U_RW_NOCACHE ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RW_U_RW \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
-#define K_MEM_PARTITION_P_RW_U_RO_NOCACHE ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RW_U_RO \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
-#define K_MEM_PARTITION_P_RW_U_NA_NOCACHE ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RW_U_NA \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
-#define K_MEM_PARTITION_P_RO_U_RO_NOCACHE ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RO_U_RO \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
-#define K_MEM_PARTITION_P_RO_U_NA_NOCACHE ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RO_U_NA \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_NA_U_NA_NOCACHE                                                          \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_NA_U_NA | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RW_U_RW_NOCACHE                                                          \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RW_U_RW | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RW_U_RO_NOCACHE                                                          \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RW_U_RO | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RW_U_NA_NOCACHE                                                          \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RW_U_NA | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RO_U_RO_NOCACHE                                                          \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RO_U_RO | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RO_U_NA_NOCACHE                                                          \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RO_U_NA | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
 
-#define K_MEM_PARTITION_P_RWX_U_RWX_NOCACHE ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RWX_U_RWX \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
-#define K_MEM_PARTITION_P_RWX_U_RX_NOCACHE  ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RWX_U_RX  \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
-#define K_MEM_PARTITION_P_RX_U_RX_NOCACHE   ((k_mem_partition_attr_t) \
-	{(_K_MEM_PARTITION_P_RX_U_RX   \
-	| NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RWX_U_RWX_NOCACHE                                                        \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RWX_U_RWX | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RWX_U_RX_NOCACHE                                                         \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RWX_U_RX | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
+#define K_MEM_PARTITION_P_RX_U_RX_NOCACHE                                                          \
+	((k_mem_partition_attr_t){                                                                 \
+		(_K_MEM_PARTITION_P_RX_U_RX | NORMAL_OUTER_INNER_NON_CACHEABLE_SHAREABLE)})
 
 #endif /* _ASMLANGUAGE */
 
-#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
-	BUILD_ASSERT(!(((size) & ((size) - 1))) && \
-		(size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE && \
-		!((uint32_t)(start) & ((size) - 1)), \
-		"the size of the partition must be power of 2" \
-		" and greater than or equal to the minimum MPU region size." \
-		"start address of the partition must align with size.")
+#define _ARCH_MEM_PARTITION_ALIGN_CHECK_SIZE(size)                                                 \
+	BUILD_ASSERT(!(((size) & ((size) - 1))) &&                                                 \
+		     (size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE,                           \
+		     "The size of the partition must be power of 2 and greater than or equal to "  \
+		     "the minimum MPU region size.\n")
+
+/* Some compilers do not handle BUILD_ASSERT on the values of pointers.*/
+#if defined(__IAR_SYSTEMS_ICC__)
+#define _ARCH_MEM_PARTITION_ALIGN_CHECK_START(start, size)
+#else
+#define _ARCH_MEM_PARTITION_ALIGN_CHECK_START(start, size)                                         \
+	BUILD_ASSERT(!((uint32_t)(start) & ((size) - 1)),                                          \
+		     "The start address of the partition must align with size.")
+#endif
+
+#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size)                                               \
+	_ARCH_MEM_PARTITION_ALIGN_CHECK_SIZE(size);                                                \
+	_ARCH_MEM_PARTITION_ALIGN_CHECK_START(start, size)
diff --git a/include/zephyr/arch/arm/mpu/arm_mpu_v8.h b/include/zephyr/arch/arm/mpu/arm_mpu_v8.h
index 77deb64beed66..25ec225fc6b66 100644
--- a/include/zephyr/arch/arm/mpu/arm_mpu_v8.h
+++ b/include/zephyr/arch/arm/mpu/arm_mpu_v8.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2018 Linaro Limited.
  * Copyright (c) 2018 Nordic Semiconductor ASA.
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,25 +13,25 @@
  * cache-ability attribution.
  */
 #if defined(CONFIG_AARCH32_ARMV8_R)
-#define MPU_IR_REGION_Msk       (0xFFU)
-#define MPU_IR_REGION_Pos       8U
+#define MPU_IR_REGION_Msk (0xFFU)
+#define MPU_IR_REGION_Pos 8U
 /* MPU RBAR Register attribute msk Definitions */
-#define MPU_RBAR_BASE_Pos       6U
-#define MPU_RBAR_BASE_Msk       (0x3FFFFFFFFFFFFFFUL << MPU_RBAR_BASE_Pos)
-#define MPU_RBAR_SH_Pos         3U
-#define MPU_RBAR_SH_Msk         (0x3UL << MPU_RBAR_SH_Pos)
-#define MPU_RBAR_AP_Pos         1U
-#define MPU_RBAR_AP_Msk         (0x3UL << MPU_RBAR_AP_Pos)
+#define MPU_RBAR_BASE_Pos 6U
+#define MPU_RBAR_BASE_Msk (0x3FFFFFFFFFFFFFFUL << MPU_RBAR_BASE_Pos)
+#define MPU_RBAR_SH_Pos   3U
+#define MPU_RBAR_SH_Msk   (0x3UL << MPU_RBAR_SH_Pos)
+#define MPU_RBAR_AP_Pos   1U
+#define MPU_RBAR_AP_Msk   (0x3UL << MPU_RBAR_AP_Pos)
 /* RBAR XN */
-#define MPU_RBAR_XN_Pos         0U
-#define MPU_RBAR_XN_Msk         (0x1UL << MPU_RBAR_XN_Pos)
+#define MPU_RBAR_XN_Pos   0U
+#define MPU_RBAR_XN_Msk   (0x1UL << MPU_RBAR_XN_Pos)
 
 /* MPU PLBAR Register Definitions */
-#define MPU_RLAR_LIMIT_Pos      6U
-#define MPU_RLAR_LIMIT_Msk      (0x3FFFFFFFFFFFFFFUL << MPU_RLAR_LIMIT_Pos)
-#define MPU_RLAR_AttrIndx_Pos   1U
-#define MPU_RLAR_AttrIndx_Msk   (0x7UL << MPU_RLAR_AttrIndx_Pos)
-#define MPU_RLAR_EN_Msk         (0x1UL)
+#define MPU_RLAR_LIMIT_Pos    6U
+#define MPU_RLAR_LIMIT_Msk    (0x3FFFFFFFFFFFFFFUL << MPU_RLAR_LIMIT_Pos)
+#define MPU_RLAR_AttrIndx_Pos 1U
+#define MPU_RLAR_AttrIndx_Msk (0x7UL << MPU_RLAR_AttrIndx_Pos)
+#define MPU_RLAR_EN_Msk       (0x1UL)
 #else
 #include <cmsis_core.h>
 #endif
@@ -66,20 +67,19 @@
 /* Attribute flag for not-allowing execution (eXecute Never) */
 #define NOT_EXEC MPU_RBAR_XN_Msk
 
+/* To prevent execution of MPU region in privileged mode */
+#define PRIV_EXEC_NEVER (1)
+
 /* Attribute flags for share-ability */
 #define NON_SHAREABLE       0x0
-#define NON_SHAREABLE_Msk \
-	((NON_SHAREABLE << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk)
-#define OUTER_SHAREABLE 0x2
-#define OUTER_SHAREABLE_Msk \
-	((OUTER_SHAREABLE << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk)
-#define INNER_SHAREABLE 0x3
-#define INNER_SHAREABLE_Msk \
-	((INNER_SHAREABLE << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk)
+#define NON_SHAREABLE_Msk   ((NON_SHAREABLE << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk)
+#define OUTER_SHAREABLE     0x2
+#define OUTER_SHAREABLE_Msk ((OUTER_SHAREABLE << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk)
+#define INNER_SHAREABLE     0x3
+#define INNER_SHAREABLE_Msk ((INNER_SHAREABLE << MPU_RBAR_SH_Pos) & MPU_RBAR_SH_Msk)
 
 /* Helper define to calculate the region limit address. */
-#define REGION_LIMIT_ADDR(base, size) \
-	(((base & MPU_RBAR_BASE_Msk) + size - 1) & MPU_RLAR_LIMIT_Msk)
+#define REGION_LIMIT_ADDR(base, size) (((base & MPU_RBAR_BASE_Msk) + size - 1) & MPU_RLAR_LIMIT_Msk)
 
 /* Attribute flags for cache-ability */
 
@@ -101,10 +101,10 @@
  *   nE: The response should come from the end slave, not buffering in
  *   the interconnect.
  */
-#define DEVICE_nGnRnE	0x0U
-#define DEVICE_nGnRE	0x4U
-#define DEVICE_nGRE	0x8U
-#define DEVICE_GRE	0xCU
+#define DEVICE_nGnRnE 0x0U
+#define DEVICE_nGnRE  0x4U
+#define DEVICE_nGRE   0x8U
+#define DEVICE_GRE    0xCU
 
 /* Read/Write Allocation Configurations for Cacheable Memory */
 #define R_NON_W_NON     0x0 /* Do not allocate Read/Write */
@@ -113,36 +113,30 @@
 #define R_ALLOC_W_ALLOC 0x3 /* Allocate Read/Write */
 
 /* Memory Attributes for Normal Memory */
-#define NORMAL_O_WT_NT  0x80 /* Normal, Outer Write-through non-transient */
-#define NORMAL_O_WB_NT  0xC0 /* Normal, Outer Write-back non-transient */
-#define NORMAL_O_NON_C  0x40 /* Normal, Outer Non-Cacheable  */
+#define NORMAL_O_WT_NT 0x80 /* Normal, Outer Write-through non-transient */
+#define NORMAL_O_WB_NT 0xC0 /* Normal, Outer Write-back non-transient */
+#define NORMAL_O_NON_C 0x40 /* Normal, Outer Non-Cacheable  */
 
-#define NORMAL_I_WT_NT  0x08 /* Normal, Inner Write-through non-transient */
-#define NORMAL_I_WB_NT  0x0C /* Normal, Inner Write-back non-transient */
-#define NORMAL_I_NON_C  0x04 /* Normal, Inner Non-Cacheable  */
+#define NORMAL_I_WT_NT 0x08 /* Normal, Inner Write-through non-transient */
+#define NORMAL_I_WB_NT 0x0C /* Normal, Inner Write-back non-transient */
+#define NORMAL_I_NON_C 0x04 /* Normal, Inner Non-Cacheable  */
 
-#define NORMAL_OUTER_INNER_WRITE_THROUGH_READ_ALLOCATE_NON_TRANS \
-	((NORMAL_O_WT_NT | (R_ALLOC_W_NON << 4)) \
-	 | \
-	 (NORMAL_I_WT_NT | R_ALLOC_W_NON)) \
+#define NORMAL_OUTER_INNER_WRITE_THROUGH_READ_ALLOCATE_NON_TRANS                                   \
+	((NORMAL_O_WT_NT | (R_ALLOC_W_NON << 4)) | (NORMAL_I_WT_NT | R_ALLOC_W_NON))
 
-#define NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_TRANS \
-	((NORMAL_O_WB_NT | (R_ALLOC_W_ALLOC << 4)) \
-	 | \
-	 (NORMAL_I_WB_NT | R_ALLOC_W_ALLOC))
+#define NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_TRANS                                \
+	((NORMAL_O_WB_NT | (R_ALLOC_W_ALLOC << 4)) | (NORMAL_I_WB_NT | R_ALLOC_W_ALLOC))
 
-#define NORMAL_OUTER_INNER_NON_CACHEABLE \
-	((NORMAL_O_NON_C | (R_NON_W_NON << 4)) \
-	 | \
-	 (NORMAL_I_NON_C | R_NON_W_NON))
+#define NORMAL_OUTER_INNER_NON_CACHEABLE                                                           \
+	((NORMAL_O_NON_C | (R_NON_W_NON << 4)) | (NORMAL_I_NON_C | R_NON_W_NON))
 
 /* Common cache-ability configuration for Flash, SRAM regions */
-#define MPU_CACHE_ATTRIBUTES_FLASH \
-	NORMAL_OUTER_INNER_WRITE_THROUGH_READ_ALLOCATE_NON_TRANS
-#define MPU_CACHE_ATTRIBUTES_SRAM \
+#define MPU_CACHE_ATTRIBUTES_FLASH        NORMAL_OUTER_INNER_WRITE_THROUGH_READ_ALLOCATE_NON_TRANS
+/* clang-format off */
+#define MPU_CACHE_ATTRIBUTES_SRAM                                                                  \
 	NORMAL_OUTER_INNER_WRITE_BACK_WRITE_READ_ALLOCATE_NON_TRANS
-#define MPU_CACHE_ATTRIBUTES_SRAM_NOCACHE \
-	NORMAL_OUTER_INNER_NON_CACHEABLE
+/* clang-format on */
+#define MPU_CACHE_ATTRIBUTES_SRAM_NOCACHE NORMAL_OUTER_INNER_NON_CACHEABLE
 
 /* Global MAIR configurations */
 #define MPU_MAIR_ATTR_FLASH         MPU_CACHE_ATTRIBUTES_FLASH
@@ -158,10 +152,10 @@
  * SRAM no cache-able regions(s): Attribute-2
  * DEVICE no cache-able regions(s): Attribute-3
  */
-#define MPU_MAIR_ATTRS							     \
-	((MPU_MAIR_ATTR_FLASH << (MPU_MAIR_INDEX_FLASH * 8)) |		     \
-	 (MPU_MAIR_ATTR_SRAM << (MPU_MAIR_INDEX_SRAM * 8)) |		     \
-	 (MPU_MAIR_ATTR_SRAM_NOCACHE << (MPU_MAIR_INDEX_SRAM_NOCACHE * 8)) | \
+#define MPU_MAIR_ATTRS                                                                             \
+	((MPU_MAIR_ATTR_FLASH << (MPU_MAIR_INDEX_FLASH * 8)) |                                     \
+	 (MPU_MAIR_ATTR_SRAM << (MPU_MAIR_INDEX_SRAM * 8)) |                                       \
+	 (MPU_MAIR_ATTR_SRAM_NOCACHE << (MPU_MAIR_INDEX_SRAM_NOCACHE * 8)) |                       \
 	 (MPU_MAIR_ATTR_DEVICE << (MPU_MAIR_INDEX_DEVICE * 8)))
 
 /* Some helper defines for common regions.
@@ -175,133 +169,140 @@
  */
 #if defined(CONFIG_AARCH32_ARMV8_R)
 
-#define ARM_MPU_REGION_INIT(p_name, p_base, p_size, p_attr)	\
-	{ .name = p_name,					\
-	  .base = p_base,					\
-	  .attr = p_attr(p_base + p_size),			\
+#define ARM_MPU_REGION_INIT(p_name, p_base, p_size, p_attr)                                        \
+	{                                                                                          \
+		.name = p_name,                                                                    \
+		.base = p_base,                                                                    \
+		.attr = p_attr(p_base + p_size),                                                   \
 	}
 
-#define REGION_RAM_ATTR(limit)						    \
-	{								    \
-		.rbar = NOT_EXEC |					    \
-			P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */					    \
-		.mair_idx = MPU_MAIR_INDEX_SRAM,			    \
-		.r_limit = limit - 1,  /* Region Limit */		    \
+#define REGION_RAM_ATTR(limit)                                                                     \
+	{                                                                                          \
+		.rbar = NOT_EXEC | P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */             \
+		.mair_idx = MPU_MAIR_INDEX_SRAM,                      /* Cache-ability */          \
+		.r_limit = limit - 1,                                 /* Region Limit */           \
 	}
 
-#define REGION_RAM_TEXT_ATTR(limit)					    \
-	{								    \
-		.rbar = P_RO_U_RO_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */					    \
-		.mair_idx = MPU_MAIR_INDEX_SRAM,			    \
-		.r_limit = limit - 1,  /* Region Limit */		    \
+#define REGION_RAM_TEXT_ATTR(limit)                                                                \
+	{                                                                                          \
+		.rbar = P_RO_U_RO_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */                        \
+		.mair_idx = MPU_MAIR_INDEX_SRAM,           /* Cache-ability */                     \
+		.r_limit = limit - 1,                      /* Region Limit */                      \
 	}
 
-#define REGION_RAM_RO_ATTR(limit)					    \
-	{								    \
-		.rbar = NOT_EXEC |					    \
-			P_RO_U_RO_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */					    \
-		.mair_idx = MPU_MAIR_INDEX_SRAM,			    \
-		.r_limit = limit - 1,  /* Region Limit */		    \
+#define REGION_RAM_RO_ATTR(limit)                                                                  \
+	{                                                                                          \
+		.rbar = NOT_EXEC | P_RO_U_RO_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */             \
+		.mair_idx = MPU_MAIR_INDEX_SRAM,                      /* Cache-ability */          \
+		.r_limit = limit - 1,                                 /* Region Limit */           \
 	}
-#define REGION_RAM_NOCACHE_ATTR(limit)					    \
-	{								    \
-		.rbar = NOT_EXEC |					    \
-			P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */					    \
-		.mair_idx = MPU_MAIR_INDEX_SRAM_NOCACHE,		    \
-		.r_limit = limit - 1,  /* Region Limit */		    \
+#define REGION_RAM_NOCACHE_ATTR(limit)                                                             \
+	{                                                                                          \
+		.rbar = NOT_EXEC | P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */             \
+		.mair_idx = MPU_MAIR_INDEX_SRAM_NOCACHE,              /* Cache-ability */          \
+		.r_limit = limit - 1,                                 /* Region Limit */           \
 	}
 #if defined(CONFIG_MPU_ALLOW_FLASH_WRITE)
 /* Note that the access permissions allow for un-privileged writes, contrary
  * to ARMv7-M where un-privileged code has Read-Only permissions.
  */
-#define REGION_FLASH_ATTR(limit)					    \
-	{								    \
-		.rbar = P_RW_U_RW_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */					    \
-		.mair_idx = MPU_MAIR_INDEX_FLASH,			    \
-		.r_limit = limit - 1,  /* Region Limit */		    \
+#define REGION_FLASH_ATTR(limit)                                                                   \
+	{                                                                                          \
+		.rbar = P_RW_U_RW_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */                        \
+		.mair_idx = MPU_MAIR_INDEX_FLASH,          /* Cache-ability */                     \
+		.r_limit = limit - 1,                      /* Region Limit */                      \
 	}
 #else /* CONFIG_MPU_ALLOW_FLASH_WRITE */
-#define REGION_FLASH_ATTR(limit)				     \
-	{							     \
-		.rbar = RO_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */				     \
-		.mair_idx = MPU_MAIR_INDEX_FLASH,		     \
-		.r_limit = limit - 1,  /* Region Limit */	     \
+#define REGION_FLASH_ATTR(limit)                                                                   \
+	{                                                                                          \
+		.rbar = RO_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */                               \
+		.mair_idx = MPU_MAIR_INDEX_FLASH,   /* Cache-ability */                            \
+		.r_limit = limit - 1,               /* Region Limit */                             \
 	}
 #endif /* CONFIG_MPU_ALLOW_FLASH_WRITE */
 
-#define REGION_DEVICE_ATTR(limit)				      \
-	{							      \
-		/* AP, XN, SH */				      \
-		.rbar = NOT_EXEC | P_RW_U_NA_Msk | NON_SHAREABLE_Msk, \
-		/* Cache-ability */				      \
-		.mair_idx = MPU_MAIR_INDEX_DEVICE,		      \
-		/* Region Limit */				      \
-		.r_limit = limit - 1,				      \
+#define REGION_DEVICE_ATTR(limit)                                                                  \
+	{                                                                                          \
+		.rbar = NOT_EXEC | P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */             \
+		.mair_idx = MPU_MAIR_INDEX_DEVICE,                    /* Cache-ability */          \
+		.r_limit = limit - 1,                                 /* Region Limit */           \
 	}
 #else
 
-#define ARM_MPU_REGION_INIT(p_name, p_base, p_size, p_attr)	\
-	{ .name = p_name,					\
-	  .base = p_base,					\
-	  .attr = p_attr(p_base, p_size),			\
+#define ARM_MPU_REGION_INIT(p_name, p_base, p_size, p_attr)                                        \
+	{                                                                                          \
+		.name = p_name,                                                                    \
+		.base = p_base,                                                                    \
+		.attr = p_attr(p_base, p_size),                                                    \
 	}
 
 /* On Cortex-M, we can only set the XN bit when CONFIG_XIP=y. When
  * CONFIG_XIP=n, the entire image will be linked to SRAM, so we need to keep
  * the SRAM region XN bit clear or the application code will not be executable.
  */
-#define REGION_RAM_ATTR(base, size) \
-	{\
-		.rbar = IF_ENABLED(CONFIG_XIP, (NOT_EXEC |)) \
-			P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */ \
-		.mair_idx = MPU_MAIR_INDEX_SRAM, \
-		.r_limit = REGION_LIMIT_ADDR(base, size),  /* Region Limit */ \
+/* clang-format off */
+#define REGION_RAM_ATTR(base, size)                                                                \
+	{                                                                                          \
+		.rbar = IF_ENABLED(CONFIG_XIP, (NOT_EXEC |)) P_RW_U_NA_Msk |                       \
+			NON_SHAREABLE_Msk,                /* AP, XN, SH */                         \
+		.mair_idx = MPU_MAIR_INDEX_SRAM,          /* Cache-ability */                      \
+		.r_limit = REGION_LIMIT_ADDR(base, size), /* Region Limit */                       \
+		IF_ENABLED(CONFIG_ARM_MPU_PXN, (.pxn = !PRIV_EXEC_NEVER,))			   \
+	}
+
+#if defined(CONFIG_ARM_MPU_PXN)
+/* Use this attr to define an MPU region in RAM that has code intended to be executed in
+ * un-privileged mode but not in privileged mode.
+ */
+#define REGION_RAM_ATTR_PXN(base, size)                                                            \
+	{                                                                                          \
+		.rbar = P_RO_U_RO_Msk | NON_SHAREABLE_Msk,/* AP, XN, SH */			   \
+		.mair_idx = MPU_MAIR_INDEX_SRAM,          /* Cache-ability */                      \
+		.r_limit = REGION_LIMIT_ADDR(base, size), /* Region Limit */                       \
+		.pxn = PRIV_EXEC_NEVER,								   \
 	}
+#endif
 
-#define REGION_RAM_NOCACHE_ATTR(base, size) \
-	{\
-		.rbar = NOT_EXEC | \
-			P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */ \
-		.mair_idx = MPU_MAIR_INDEX_SRAM_NOCACHE, \
-		.r_limit = REGION_LIMIT_ADDR(base, size),  /* Region Limit */ \
+#define REGION_RAM_NOCACHE_ATTR(base, size)                                                        \
+	{                                                                                          \
+		.rbar = NOT_EXEC | P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */             \
+		.mair_idx = MPU_MAIR_INDEX_SRAM_NOCACHE,              /* Cache-ability */          \
+		.r_limit = REGION_LIMIT_ADDR(base, size),             /* Region Limit */           \
+		IF_ENABLED(CONFIG_ARM_MPU_PXN, (.pxn = PRIV_EXEC_NEVER,))			   \
 	}
 
 #if defined(CONFIG_MPU_ALLOW_FLASH_WRITE)
 /* Note that the access permissions allow for un-privileged writes, contrary
  * to ARMv7-M where un-privileged code has Read-Only permissions.
  */
-#define REGION_FLASH_ATTR(base, size) \
-	{\
-		.rbar = P_RW_U_RW_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */ \
-		.mair_idx = MPU_MAIR_INDEX_FLASH, \
-		.r_limit = REGION_LIMIT_ADDR(base, size),  /* Region Limit */ \
+#define REGION_FLASH_ATTR(base, size)                                                              \
+	{                                                                                          \
+		.rbar = P_RW_U_RW_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */                        \
+		.mair_idx = MPU_MAIR_INDEX_FLASH,          /* Cache-ability */                     \
+		.r_limit = REGION_LIMIT_ADDR(base, size),  /* Region Limit */                      \
+		IF_ENABLED(CONFIG_ARM_MPU_PXN, (.pxn = !PRIV_EXEC_NEVER,))			   \
 	}
+
 #else /* CONFIG_MPU_ALLOW_FLASH_WRITE */
-#define REGION_FLASH_ATTR(base, size) \
-	{\
-		.rbar = RO_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */ \
-		/* Cache-ability */ \
-		.mair_idx = MPU_MAIR_INDEX_FLASH, \
-		.r_limit = REGION_LIMIT_ADDR(base, size),  /* Region Limit */ \
+#define REGION_FLASH_ATTR(base, size)                                                              \
+	{                                                                                          \
+		.rbar = RO_Msk | NON_SHAREABLE_Msk,       /* AP, XN, SH */                         \
+		.mair_idx = MPU_MAIR_INDEX_FLASH,         /* Cache-ability */                      \
+		.r_limit = REGION_LIMIT_ADDR(base, size), /* Region Limit */                       \
+		IF_ENABLED(CONFIG_ARM_MPU_PXN, (.pxn = !PRIV_EXEC_NEVER,))			   \
 	}
+
 #endif /* CONFIG_MPU_ALLOW_FLASH_WRITE */
 
 #define REGION_DEVICE_ATTR(base, size)                                                             \
 	{                                                                                          \
-		/* AP, XN, SH */                                                                   \
-		.rbar = NOT_EXEC | P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* Cache-ability */          \
-		.mair_idx = MPU_MAIR_INDEX_DEVICE,                                                 \
-		.r_limit = REGION_LIMIT_ADDR(base, size), /* Region Limit */                       \
+		.rbar = NOT_EXEC | P_RW_U_NA_Msk | NON_SHAREABLE_Msk, /* AP, XN, SH */             \
+		.mair_idx = MPU_MAIR_INDEX_DEVICE,                    /* Cache-ability */          \
+		.r_limit = REGION_LIMIT_ADDR(base, size),             /* Region Limit */           \
+		IF_ENABLED(CONFIG_ARM_MPU_PXN, (.pxn = PRIV_EXEC_NEVER,))			   \
 	}
+
+/* clang-format on */
 #endif
 
 struct arm_mpu_region_attr {
@@ -311,6 +312,10 @@ struct arm_mpu_region_attr {
 	uint8_t mair_idx: 3;
 	/* Region Limit Address value to be written to the RLAR register. */
 	uint32_t r_limit;
+#ifdef CONFIG_ARM_MPU_PXN
+	/* To prevent execution of MPU region in privileged mode (Privileged Execute Never) */
+	uint8_t pxn;
+#endif
 };
 
 typedef struct arm_mpu_region_attr arm_mpu_region_attr_t;
@@ -319,6 +324,10 @@ typedef struct arm_mpu_region_attr arm_mpu_region_attr_t;
 typedef struct {
 	uint16_t rbar;
 	uint16_t mair_idx;
+#ifdef CONFIG_ARM_MPU_PXN
+	/* To prevent execution of MPU region in privileged mode (Privileged Execute Never) */
+	uint8_t pxn;
+#endif
 } k_mem_partition_attr_t;
 
 /* Kernel macros for memory attribution
@@ -333,20 +342,23 @@ typedef struct {
  */
 
 /* Read-Write access permission attributes */
-#define K_MEM_PARTITION_P_RW_U_RW ((k_mem_partition_attr_t) \
-	{(P_RW_U_RW_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
-#define K_MEM_PARTITION_P_RW_U_NA ((k_mem_partition_attr_t) \
-	{(P_RW_U_NA_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
-#define K_MEM_PARTITION_P_RO_U_RO ((k_mem_partition_attr_t) \
-	{(P_RO_U_RO_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
-#define K_MEM_PARTITION_P_RO_U_NA ((k_mem_partition_attr_t) \
-	{(P_RO_U_NA_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
+#define K_MEM_PARTITION_P_RW_U_RW                                                                  \
+	((k_mem_partition_attr_t){(P_RW_U_RW_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
+#define K_MEM_PARTITION_P_RW_U_NA                                                                  \
+	((k_mem_partition_attr_t){(P_RW_U_NA_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
+#define K_MEM_PARTITION_P_RO_U_RO                                                                  \
+	((k_mem_partition_attr_t){(P_RO_U_RO_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
+#define K_MEM_PARTITION_P_RO_U_NA                                                                  \
+	((k_mem_partition_attr_t){(P_RO_U_NA_Msk | NOT_EXEC), MPU_MAIR_INDEX_SRAM})
 
 /* Execution-allowed attributes */
-#define K_MEM_PARTITION_P_RWX_U_RWX ((k_mem_partition_attr_t) \
-	{(P_RW_U_RW_Msk), MPU_MAIR_INDEX_SRAM})
-#define K_MEM_PARTITION_P_RX_U_RX ((k_mem_partition_attr_t) \
-	{(P_RO_U_RO_Msk), MPU_MAIR_INDEX_SRAM})
+#define K_MEM_PARTITION_P_RWX_U_RWX ((k_mem_partition_attr_t){(P_RW_U_RW_Msk), MPU_MAIR_INDEX_SRAM})
+#define K_MEM_PARTITION_P_RX_U_RX   ((k_mem_partition_attr_t){(P_RO_U_RO_Msk), MPU_MAIR_INDEX_SRAM})
+
+#ifdef CONFIG_ARM_MPU_PXN
+#define K_MEM_PARTITION_P_R_U_RX                                                                   \
+	((k_mem_partition_attr_t){(P_RO_U_RO_Msk), MPU_MAIR_INDEX_SRAM, PRIV_EXEC_NEVER})
+#endif
 
 /*
  * @brief Evaluate Write-ability
@@ -356,18 +368,18 @@ typedef struct {
  * @param attr The k_mem_partition_attr_t object holding the
  *             MPU attributes to be checked against write-ability.
  */
-#define K_MEM_PARTITION_IS_WRITABLE(attr) \
-	({ \
-		int __is_writable__; \
-		switch (attr.rbar & MPU_RBAR_AP_Msk) { \
-		case P_RW_U_RW_Msk: \
-		case P_RW_U_NA_Msk: \
-			__is_writable__ = 1; \
-			break; \
-		default: \
-			__is_writable__ = 0; \
-		} \
-		__is_writable__; \
+#define K_MEM_PARTITION_IS_WRITABLE(attr)                                                          \
+	({                                                                                         \
+		int __is_writable__;                                                               \
+		switch (attr.rbar & MPU_RBAR_AP_Msk) {                                             \
+		case P_RW_U_RW_Msk:                                                                \
+		case P_RW_U_NA_Msk:                                                                \
+			__is_writable__ = 1;                                                       \
+			break;                                                                     \
+		default:                                                                           \
+			__is_writable__ = 0;                                                       \
+		}                                                                                  \
+		__is_writable__;                                                                   \
 	})
 
 /*
@@ -379,36 +391,37 @@ typedef struct {
  *             MPU attributes to be checked against execution
  *             allowance.
  */
-#define K_MEM_PARTITION_IS_EXECUTABLE(attr) \
-	(!((attr.rbar) & (NOT_EXEC)))
+#define K_MEM_PARTITION_IS_EXECUTABLE(attr) (!((attr.rbar) & (NOT_EXEC)))
 
 /* Attributes for no-cache enabling (share-ability is selected by default) */
 
 /* Read-Write access permission attributes */
-#define K_MEM_PARTITION_P_RW_U_RW_NOCACHE ((k_mem_partition_attr_t) \
-	{(P_RW_U_RW_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk), \
-		MPU_MAIR_INDEX_SRAM_NOCACHE})
-#define K_MEM_PARTITION_P_RW_U_NA_NOCACHE ((k_mem_partition_attr_t) \
-	{(P_RW_U_NA_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk), \
-		MPU_MAIR_INDEX_SRAM_NOCACHE})
-#define K_MEM_PARTITION_P_RO_U_RO_NOCACHE ((k_mem_partition_attr_t) \
-	{(P_RO_U_RO_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk), \
-		MPU_MAIR_INDEX_SRAM_NOCACHE})
-#define K_MEM_PARTITION_P_RO_U_NA_NOCACHE ((k_mem_partition_attr_t) \
-	{(P_RO_U_NA_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk), \
-		MPU_MAIR_INDEX_SRAM_NOCACHE})
+#define K_MEM_PARTITION_P_RW_U_RW_NOCACHE                                                          \
+	((k_mem_partition_attr_t){(P_RW_U_RW_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk),                \
+				  MPU_MAIR_INDEX_SRAM_NOCACHE})
+#define K_MEM_PARTITION_P_RW_U_NA_NOCACHE                                                          \
+	((k_mem_partition_attr_t){(P_RW_U_NA_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk),                \
+				  MPU_MAIR_INDEX_SRAM_NOCACHE})
+#define K_MEM_PARTITION_P_RO_U_RO_NOCACHE                                                          \
+	((k_mem_partition_attr_t){(P_RO_U_RO_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk),                \
+				  MPU_MAIR_INDEX_SRAM_NOCACHE})
+#define K_MEM_PARTITION_P_RO_U_NA_NOCACHE                                                          \
+	((k_mem_partition_attr_t){(P_RO_U_NA_Msk | NOT_EXEC | OUTER_SHAREABLE_Msk),                \
+				  MPU_MAIR_INDEX_SRAM_NOCACHE})
 
 /* Execution-allowed attributes */
-#define K_MEM_PARTITION_P_RWX_U_RWX_NOCACHE ((k_mem_partition_attr_t) \
-	{(P_RW_U_RW_Msk | OUTER_SHAREABLE_Msk), MPU_MAIR_INDEX_SRAM_NOCACHE})
-#define K_MEM_PARTITION_P_RX_U_RX_NOCACHE ((k_mem_partition_attr_t) \
-	{(P_RO_U_RO_Msk | OUTER_SHAREABLE_Msk), MPU_MAIR_INDEX_SRAM_NOCACHE})
+#define K_MEM_PARTITION_P_RWX_U_RWX_NOCACHE                                                        \
+	((k_mem_partition_attr_t){(P_RW_U_RW_Msk | OUTER_SHAREABLE_Msk),                           \
+				  MPU_MAIR_INDEX_SRAM_NOCACHE})
+#define K_MEM_PARTITION_P_RX_U_RX_NOCACHE                                                          \
+	((k_mem_partition_attr_t){(P_RO_U_RO_Msk | OUTER_SHAREABLE_Msk),                           \
+				  MPU_MAIR_INDEX_SRAM_NOCACHE})
 
 #endif /* _ASMLANGUAGE */
 
-#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
-	BUILD_ASSERT((size > 0) && ((uint32_t)start % \
-			CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0U) && \
-		((size) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0), \
-		" the start and size of the partition must align " \
-		"with the minimum MPU region size.")
+#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size)                                               \
+	BUILD_ASSERT((size > 0) &&                                                                 \
+			     ((uint32_t)start % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0U) && \
+			     ((size) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0),             \
+		     "The start and size of the partition must align with the minimum MPU "        \
+		     "region size.")
diff --git a/include/zephyr/arch/arm/mpu/nxp_mpu.h b/include/zephyr/arch/arm/mpu/nxp_mpu.h
index b95565658027c..b1bc9c2e4510b 100644
--- a/include/zephyr/arch/arm/mpu/nxp_mpu.h
+++ b/include/zephyr/arch/arm/mpu/nxp_mpu.h
@@ -11,119 +11,102 @@
 #define NXP_MPU_REGION_NUMBER 12
 
 /* Bus Master User Mode Access */
-#define UM_READ		4
-#define UM_WRITE	2
-#define UM_EXEC		1
+#define UM_READ  4
+#define UM_WRITE 2
+#define UM_EXEC  1
 
-#define BM0_UM_SHIFT	0
-#define BM1_UM_SHIFT	6
-#define BM2_UM_SHIFT	12
-#define BM3_UM_SHIFT	18
+#define BM0_UM_SHIFT 0
+#define BM1_UM_SHIFT 6
+#define BM2_UM_SHIFT 12
+#define BM3_UM_SHIFT 18
 
 /* Bus Master Supervisor Mode Access */
-#define SM_RWX_ALLOW	0
-#define SM_RX_ALLOW	1
-#define SM_RW_ALLOW	2
-#define SM_SAME_AS_UM	3
+#define SM_RWX_ALLOW  0
+#define SM_RX_ALLOW   1
+#define SM_RW_ALLOW   2
+#define SM_SAME_AS_UM 3
 
-#define BM0_SM_SHIFT	3
-#define BM1_SM_SHIFT	9
-#define BM2_SM_SHIFT	15
-#define BM3_SM_SHIFT	21
+#define BM0_SM_SHIFT 3
+#define BM1_SM_SHIFT 9
+#define BM2_SM_SHIFT 15
+#define BM3_SM_SHIFT 21
 
-#define BM4_WE_SHIFT	24
-#define BM4_RE_SHIFT	25
+#define BM4_WE_SHIFT 24
+#define BM4_RE_SHIFT 25
 
 #if CONFIG_USB_KINETIS || CONFIG_UDC_KINETIS
-#define BM4_PERMISSIONS	((1 << BM4_RE_SHIFT) | (1 << BM4_WE_SHIFT))
+#define BM4_PERMISSIONS ((1 << BM4_RE_SHIFT) | (1 << BM4_WE_SHIFT))
 #else
-#define BM4_PERMISSIONS	0
+#define BM4_PERMISSIONS 0
 #endif
 
 /* Read Attribute */
-#define MPU_REGION_READ  ((UM_READ << BM0_UM_SHIFT) | \
-			  (UM_READ << BM1_UM_SHIFT) | \
-			  (UM_READ << BM2_UM_SHIFT) | \
-			  (UM_READ << BM3_UM_SHIFT))
+#define MPU_REGION_READ                                                                            \
+	((UM_READ << BM0_UM_SHIFT) | (UM_READ << BM1_UM_SHIFT) | (UM_READ << BM2_UM_SHIFT) |       \
+	 (UM_READ << BM3_UM_SHIFT))
 
 /* Write Attribute */
-#define MPU_REGION_WRITE ((UM_WRITE << BM0_UM_SHIFT) | \
-			  (UM_WRITE << BM1_UM_SHIFT) | \
-			  (UM_WRITE << BM2_UM_SHIFT) | \
-			  (UM_WRITE << BM3_UM_SHIFT))
+#define MPU_REGION_WRITE                                                                           \
+	((UM_WRITE << BM0_UM_SHIFT) | (UM_WRITE << BM1_UM_SHIFT) | (UM_WRITE << BM2_UM_SHIFT) |    \
+	 (UM_WRITE << BM3_UM_SHIFT))
 
 /* Execute Attribute */
-#define MPU_REGION_EXEC  ((UM_EXEC << BM0_UM_SHIFT) | \
-			  (UM_EXEC << BM1_UM_SHIFT) | \
-			  (UM_EXEC << BM2_UM_SHIFT) | \
-			  (UM_EXEC << BM3_UM_SHIFT))
+#define MPU_REGION_EXEC                                                                            \
+	((UM_EXEC << BM0_UM_SHIFT) | (UM_EXEC << BM1_UM_SHIFT) | (UM_EXEC << BM2_UM_SHIFT) |       \
+	 (UM_EXEC << BM3_UM_SHIFT))
 
 /* Super User Attributes */
-#define MPU_REGION_SU	 ((SM_SAME_AS_UM << BM0_SM_SHIFT) | \
-			  (SM_SAME_AS_UM << BM1_SM_SHIFT) | \
-			  (SM_SAME_AS_UM << BM2_SM_SHIFT) | \
-			  (SM_SAME_AS_UM << BM3_SM_SHIFT))
-
-#define MPU_REGION_SU_RX ((SM_RX_ALLOW << BM0_SM_SHIFT) | \
-			  (SM_RX_ALLOW << BM1_SM_SHIFT) | \
-			  (SM_RX_ALLOW << BM2_SM_SHIFT) | \
-			  (SM_RX_ALLOW << BM3_SM_SHIFT))
-
-#define MPU_REGION_SU_RW ((SM_RW_ALLOW << BM0_SM_SHIFT) | \
-			  (SM_RW_ALLOW << BM1_SM_SHIFT) | \
-			  (SM_RW_ALLOW << BM2_SM_SHIFT) | \
-			  (SM_RW_ALLOW << BM3_SM_SHIFT))
-
-#define MPU_REGION_SU_RWX ((SM_RWX_ALLOW << BM0_SM_SHIFT) | \
-			   (SM_RWX_ALLOW << BM1_SM_SHIFT) | \
-			   (SM_RWX_ALLOW << BM2_SM_SHIFT) | \
-			   (SM_RWX_ALLOW << BM3_SM_SHIFT))
+#define MPU_REGION_SU                                                                              \
+	((SM_SAME_AS_UM << BM0_SM_SHIFT) | (SM_SAME_AS_UM << BM1_SM_SHIFT) |                       \
+	 (SM_SAME_AS_UM << BM2_SM_SHIFT) | (SM_SAME_AS_UM << BM3_SM_SHIFT))
+
+#define MPU_REGION_SU_RX                                                                           \
+	((SM_RX_ALLOW << BM0_SM_SHIFT) | (SM_RX_ALLOW << BM1_SM_SHIFT) |                           \
+	 (SM_RX_ALLOW << BM2_SM_SHIFT) | (SM_RX_ALLOW << BM3_SM_SHIFT))
+
+#define MPU_REGION_SU_RW                                                                           \
+	((SM_RW_ALLOW << BM0_SM_SHIFT) | (SM_RW_ALLOW << BM1_SM_SHIFT) |                           \
+	 (SM_RW_ALLOW << BM2_SM_SHIFT) | (SM_RW_ALLOW << BM3_SM_SHIFT))
+
+#define MPU_REGION_SU_RWX                                                                          \
+	((SM_RWX_ALLOW << BM0_SM_SHIFT) | (SM_RWX_ALLOW << BM1_SM_SHIFT) |                         \
+	 (SM_RWX_ALLOW << BM2_SM_SHIFT) | (SM_RWX_ALLOW << BM3_SM_SHIFT))
 
 /* The ENDADDR field has the last 5 bit reserved and set to 1 */
 #define ENDADDR_ROUND(x) (x - 0x1F)
 
-#define REGION_USER_MODE_ATTR {(MPU_REGION_READ | \
-				MPU_REGION_WRITE | \
-				MPU_REGION_SU)}
+#define REGION_USER_MODE_ATTR {(MPU_REGION_READ | MPU_REGION_WRITE | MPU_REGION_SU)}
 
 /* Some helper defines for common regions */
 #if defined(CONFIG_MPU_ALLOW_FLASH_WRITE)
-#define REGION_RAM_ATTR	  {((MPU_REGION_SU_RWX) | \
-			   ((UM_READ | UM_WRITE | UM_EXEC) << BM3_UM_SHIFT) | \
-			   (BM4_PERMISSIONS))}
+#define REGION_RAM_ATTR                                                                            \
+	{((MPU_REGION_SU_RWX) | ((UM_READ | UM_WRITE | UM_EXEC) << BM3_UM_SHIFT) |                 \
+	  (BM4_PERMISSIONS))}
 
 #define REGION_FLASH_ATTR {(MPU_REGION_SU_RWX)}
 
 #else
-#define REGION_RAM_ATTR	  {((MPU_REGION_SU_RW) | \
-			   ((UM_READ | UM_WRITE) << BM3_UM_SHIFT) | \
-			   (BM4_PERMISSIONS))}
+#define REGION_RAM_ATTR                                                                            \
+	{((MPU_REGION_SU_RW) | ((UM_READ | UM_WRITE) << BM3_UM_SHIFT) | (BM4_PERMISSIONS))}
 
-#define REGION_FLASH_ATTR {(MPU_REGION_READ | \
-			   MPU_REGION_EXEC | \
-			   MPU_REGION_SU)}
+#define REGION_FLASH_ATTR {(MPU_REGION_READ | MPU_REGION_EXEC | MPU_REGION_SU)}
 #endif
 
-#define REGION_IO_ATTR	  {(MPU_REGION_READ | \
-			   MPU_REGION_WRITE | \
-			   MPU_REGION_EXEC | \
-			   MPU_REGION_SU)}
+#define REGION_IO_ATTR {(MPU_REGION_READ | MPU_REGION_WRITE | MPU_REGION_EXEC | MPU_REGION_SU)}
 
-#define REGION_RO_ATTR	  {(MPU_REGION_READ | MPU_REGION_SU)}
+#define REGION_RO_ATTR {(MPU_REGION_READ | MPU_REGION_SU)}
 
-#define REGION_USER_RO_ATTR {(MPU_REGION_READ | \
-			     MPU_REGION_SU)}
+#define REGION_USER_RO_ATTR {(MPU_REGION_READ | MPU_REGION_SU)}
 
 /* ENET (Master 3) and USB (Master 4) devices will not be able
 to access RAM when the region is dynamically disabled in NXP MPU.
 DEBUGGER (Master 1) can't be disabled in Region 0. */
-#define REGION_DEBUGGER_AND_DEVICE_ATTR  {((MPU_REGION_SU) | \
-				((UM_READ | UM_WRITE) << BM3_UM_SHIFT) | \
-				(BM4_PERMISSIONS))}
+#define REGION_DEBUGGER_AND_DEVICE_ATTR                                                            \
+	{((MPU_REGION_SU) | ((UM_READ | UM_WRITE) << BM3_UM_SHIFT) | (BM4_PERMISSIONS))}
 
-#define REGION_DEBUG_ATTR  {MPU_REGION_SU}
+#define REGION_DEBUG_ATTR {MPU_REGION_SU}
 
-#define REGION_BACKGROUND_ATTR	{MPU_REGION_SU_RW}
+#define REGION_BACKGROUND_ATTR {MPU_REGION_SU_RW}
 
 struct nxp_mpu_region_attr {
 	/* NXP MPU region access permission attributes */
@@ -145,27 +128,22 @@ typedef struct {
  */
 
 /* Read-Write access permission attributes */
-#define K_MEM_PARTITION_P_NA_U_NA	((k_mem_partition_attr_t) \
-	{(MPU_REGION_SU)})
-#define K_MEM_PARTITION_P_RW_U_RW	((k_mem_partition_attr_t) \
-	{(MPU_REGION_READ | MPU_REGION_WRITE | MPU_REGION_SU)})
-#define K_MEM_PARTITION_P_RW_U_RO	((k_mem_partition_attr_t) \
-	{(MPU_REGION_READ | MPU_REGION_SU_RW)})
-#define K_MEM_PARTITION_P_RW_U_NA	((k_mem_partition_attr_t) \
-	{(MPU_REGION_SU_RW)})
-#define K_MEM_PARTITION_P_RO_U_RO	((k_mem_partition_attr_t) \
-	{(MPU_REGION_READ | MPU_REGION_SU)})
-#define K_MEM_PARTITION_P_RO_U_NA	((k_mem_partition_attr_t) \
-	{(MPU_REGION_SU_RX)})
+#define K_MEM_PARTITION_P_NA_U_NA ((k_mem_partition_attr_t){(MPU_REGION_SU)})
+#define K_MEM_PARTITION_P_RW_U_RW                                                                  \
+	((k_mem_partition_attr_t){(MPU_REGION_READ | MPU_REGION_WRITE | MPU_REGION_SU)})
+#define K_MEM_PARTITION_P_RW_U_RO ((k_mem_partition_attr_t){(MPU_REGION_READ | MPU_REGION_SU_RW)})
+#define K_MEM_PARTITION_P_RW_U_NA ((k_mem_partition_attr_t){(MPU_REGION_SU_RW)})
+#define K_MEM_PARTITION_P_RO_U_RO ((k_mem_partition_attr_t){(MPU_REGION_READ | MPU_REGION_SU)})
+#define K_MEM_PARTITION_P_RO_U_NA ((k_mem_partition_attr_t){(MPU_REGION_SU_RX)})
 
 /* Execution-allowed attributes */
-#define K_MEM_PARTITION_P_RWX_U_RWX	((k_mem_partition_attr_t) \
-	{(MPU_REGION_READ | MPU_REGION_WRITE | \
-	  MPU_REGION_EXEC | MPU_REGION_SU)})
-#define K_MEM_PARTITION_P_RWX_U_RX	((k_mem_partition_attr_t) \
-	{(MPU_REGION_READ | MPU_REGION_EXEC | MPU_REGION_SU_RWX)})
-#define K_MEM_PARTITION_P_RX_U_RX	((k_mem_partition_attr_t) \
-	{(MPU_REGION_READ | MPU_REGION_EXEC | MPU_REGION_SU)})
+#define K_MEM_PARTITION_P_RWX_U_RWX                                                                \
+	((k_mem_partition_attr_t){                                                                 \
+		(MPU_REGION_READ | MPU_REGION_WRITE | MPU_REGION_EXEC | MPU_REGION_SU)})
+#define K_MEM_PARTITION_P_RWX_U_RX                                                                 \
+	((k_mem_partition_attr_t){(MPU_REGION_READ | MPU_REGION_EXEC | MPU_REGION_SU_RWX)})
+#define K_MEM_PARTITION_P_RX_U_RX                                                                  \
+	((k_mem_partition_attr_t){(MPU_REGION_READ | MPU_REGION_EXEC | MPU_REGION_SU)})
 
 /*
  * @brief Evaluate Write-ability
@@ -175,18 +153,18 @@ typedef struct {
  * @param attr The k_mem_partition_attr_t object holding the
  *             MPU attributes to be checked against write-ability.
  */
-#define K_MEM_PARTITION_IS_WRITABLE(attr) \
-	({ \
-		int __is_writable__; \
-		switch (attr.ap_attr) { \
-		case MPU_REGION_WRITE: \
-		case MPU_REGION_SU_RW: \
-			__is_writable__ = 1; \
-			break; \
-		default: \
-			__is_writable__ = 0; \
-		} \
-		__is_writable__; \
+#define K_MEM_PARTITION_IS_WRITABLE(attr)                                                          \
+	({                                                                                         \
+		int __is_writable__;                                                               \
+		switch (attr.ap_attr) {                                                            \
+		case MPU_REGION_WRITE:                                                             \
+		case MPU_REGION_SU_RW:                                                             \
+			__is_writable__ = 1;                                                       \
+			break;                                                                     \
+		default:                                                                           \
+			__is_writable__ = 0;                                                       \
+		}                                                                                  \
+		__is_writable__;                                                                   \
 	})
 
 /*
@@ -198,21 +176,20 @@ typedef struct {
  *             MPU attributes to be checked against execution
  *             allowance.
  */
-#define K_MEM_PARTITION_IS_EXECUTABLE(attr) \
-	({ \
-		int __is_executable__; \
-		switch (attr.ap_attr) { \
-		case MPU_REGION_SU_RX: \
-		case MPU_REGION_EXEC: \
-			__is_executable__ = 1; \
-			break; \
-		default: \
-			__is_executable__ = 0; \
-		} \
-		__is_executable__; \
+#define K_MEM_PARTITION_IS_EXECUTABLE(attr)                                                        \
+	({                                                                                         \
+		int __is_executable__;                                                             \
+		switch (attr.ap_attr) {                                                            \
+		case MPU_REGION_SU_RX:                                                             \
+		case MPU_REGION_EXEC:                                                              \
+			__is_executable__ = 1;                                                     \
+			break;                                                                     \
+		default:                                                                           \
+			__is_executable__ = 0;                                                     \
+		}                                                                                  \
+		__is_executable__;                                                                 \
 	})
 
-
 /* Region definition data structure */
 struct nxp_mpu_region {
 	/* Region Base Address */
@@ -225,12 +202,12 @@ struct nxp_mpu_region {
 	nxp_mpu_region_attr_t attr;
 };
 
-#define MPU_REGION_ENTRY(_name, _base, _end, _attr) \
-	{\
-		.name = _name, \
-		.base = _base, \
-		.end = _end, \
-		.attr = _attr, \
+#define MPU_REGION_ENTRY(_name, _base, _end, _attr)                                                \
+	{                                                                                          \
+		.name = _name,                                                                     \
+		.base = _base,                                                                     \
+		.end = _end,                                                                       \
+		.attr = _attr,                                                                     \
 	}
 
 /* MPU configuration data structure */
@@ -255,15 +232,13 @@ extern const struct nxp_mpu_config mpu_config;
 
 #endif /* _ASMLANGUAGE */
 
-#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
-	BUILD_ASSERT((size) % \
-		CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0 && \
-		(size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE && \
-		(uint32_t)(start) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0, \
-		"the size of the partition must align with minimum MPU \
-		 region size" \
-		" and greater than or equal to minimum MPU region size." \
-		"start address of the partition must align with minimum MPU \
-		 region size.")
+#define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size)                                               \
+	BUILD_ASSERT(                                                                              \
+		(size) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0 &&                          \
+			(size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE &&                      \
+			(uint32_t)(start) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0,         \
+		"The size of the partition must align with minimum MPU region size"                \
+		" and greater than or equal to minimum MPU region size.\n"                         \
+		"The start address of the partition must align with minimum MPU region size.")
 
 #endif /* ZEPHYR_INCLUDE_ARCH_ARM_MPU_NXP_MPU_H_ */
diff --git a/include/zephyr/arch/arm64/timer.h b/include/zephyr/arch/arm64/timer.h
index d8abba1c0e4ef..0973e327dfc70 100644
--- a/include/zephyr/arch/arm64/timer.h
+++ b/include/zephyr/arch/arm64/timer.h
@@ -26,11 +26,11 @@ extern "C" {
 static ALWAYS_INLINE void arm_arch_timer_init(void)
 {
 #ifdef CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME
-	extern int z_clock_hw_cycles_per_sec;
+	extern unsigned int z_clock_hw_cycles_per_sec;
 	uint64_t cntfrq_el0 = read_cntfrq_el0();
 
-	__ASSERT(cntfrq_el0 < INT_MAX, "cntfrq_el0 cannot fit in system 'int'");
-	z_clock_hw_cycles_per_sec = (int) cntfrq_el0;
+	__ASSERT(cntfrq_el0 < UINT_MAX, "cntfrq_el0 cannot fit in system 'unsigned int'");
+	z_clock_hw_cycles_per_sec = (unsigned int) cntfrq_el0;
 #endif
 }
 
diff --git a/include/zephyr/arch/common/ffs.h b/include/zephyr/arch/common/ffs.h
index 2660faa2e3fbe..2fd912cd5e04e 100644
--- a/include/zephyr/arch/common/ffs.h
+++ b/include/zephyr/arch/common/ffs.h
@@ -11,6 +11,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <zephyr/types.h>
+#include <zephyr/toolchain/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/arch/common/pm_s2ram.h b/include/zephyr/arch/common/pm_s2ram.h
index ad9ab8ad7a401..34c544c769b9b 100644
--- a/include/zephyr/arch/common/pm_s2ram.h
+++ b/include/zephyr/arch/common/pm_s2ram.h
@@ -65,11 +65,6 @@ int arch_pm_s2ram_suspend(pm_s2ram_system_off_fn_t system_off);
  *
  * Default implementation is setting a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
- * The following requirements must be fulfilled:
- * - the function cannot use stack (asm function or function with 'naked' attribute)
- * - the content of the R1 and R4 registers must remain unchanged
- * - returning from the function should be performed with the `bx lr` instruction
- *
  */
 void pm_s2ram_mark_set(void);
 
@@ -81,11 +76,6 @@ void pm_s2ram_mark_set(void);
  *
  * Default implementation is checking a magic word in RAM. CONFIG_PM_S2RAM_CUSTOM_MARKING
  * allows custom implementation.
- * The following requirements must be fulfilled:
- * - the function cannot use stack (most likely asm function)
- * - the content of the R1 and R4 registers must remain unchanged
- * - the function's return value is passed by R0 register
- * - returning from the function should be performed with the `bx lr` instruction
  *
  * @retval true if marking is found which indicates resuming after suspend-to-RAM.
  * @retval false if marking is not found which indicates standard boot.
diff --git a/include/zephyr/arch/structs.h b/include/zephyr/arch/structs.h
index 703ec81f889c4..dcd4406c1d83d 100644
--- a/include/zephyr/arch/structs.h
+++ b/include/zephyr/arch/structs.h
@@ -29,6 +29,8 @@
 #include <zephyr/arch/riscv/structs.h>
 #elif defined(CONFIG_ARM)
 #include <zephyr/arch/arm/structs.h>
+#elif defined(CONFIG_X86) && !defined(CONFIG_X86_64)
+#include <zephyr/arch/x86/ia32/structs.h>
 #else
 
 /* Default definitions when no architecture specific definitions exist. */
diff --git a/include/zephyr/arch/x86/ia32/structs.h b/include/zephyr/arch/x86/ia32/structs.h
new file mode 100644
index 0000000000000..91112a8578c54
--- /dev/null
+++ b/include/zephyr/arch/x86/ia32/structs.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Intel
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_X86_STRUCTS_H_
+#define ZEPHYR_INCLUDE_X86_STRUCTS_H_
+
+#include <stdint.h>
+
+struct k_thread;
+
+/* Per CPU architecture specifics (empty) */
+struct _cpu_arch {
+
+#if defined(CONFIG_FPU_SHARING)
+	/*
+	 * A 'sse_owner' field does not exist in addition to the 'fpu_owner'
+	 * field since it's not possible to divide the IA-32 non-integer
+	 * registers into 2 distinct blocks owned by differing threads.  In
+	 * other words, given that the 'fxnsave/fxrstor' instructions
+	 * save/restore both the X87 FPU and XMM registers, it's not possible
+	 * for a thread to only "own" the XMM registers.
+	 */
+
+	struct k_thread *fpu_owner;
+#elif defined(__cplusplus)
+	/* Ensure this struct does not have a size of 0 which is not allowed in C++. */
+	uint8_t dummy;
+#endif
+};
+
+#endif /* ZEPHYR_INCLUDE_X86_STRUCTS_H_ */
diff --git a/include/zephyr/arch/xtensa/arch.h b/include/zephyr/arch/xtensa/arch.h
index 794bd1b5d7066..6255249f8e7dc 100644
--- a/include/zephyr/arch/xtensa/arch.h
+++ b/include/zephyr/arch/xtensa/arch.h
@@ -66,6 +66,14 @@ struct arch_mem_domain {
 	uint32_t *ptables;
 	uint8_t asid;
 	bool dirty;
+
+	/* Following are used to program registers when changing page tables. */
+	uint32_t reg_asid;
+	uint32_t reg_ptevaddr;
+	uint32_t reg_ptepin_as;
+	uint32_t reg_ptepin_at;
+	uint32_t reg_vecpin_as;
+	uint32_t reg_vecpin_at;
 #endif
 #ifdef CONFIG_XTENSA_MPU
 	struct xtensa_mpu_map mpu_map;
@@ -73,6 +81,8 @@ struct arch_mem_domain {
 	sys_snode_t node;
 };
 
+typedef struct arch_mem_domain arch_mem_domain_t;
+
 /**
  * @brief Generate hardware exception.
  *
diff --git a/include/zephyr/arch/xtensa/syscall.h b/include/zephyr/arch/xtensa/syscall.h
index 9fdbe2b097793..34f49437e2ab4 100644
--- a/include/zephyr/arch/xtensa/syscall.h
+++ b/include/zephyr/arch/xtensa/syscall.h
@@ -30,6 +30,26 @@
 extern "C" {
 #endif
 
+/* When syscall assembly is executed, the EPC points to the syscall
+ * instruction, and we have to manually advance it so we will
+ * return to the instruction after syscall to continue execution.
+ * However, with zero-overhead loops and the syscall instruction is
+ * the last instruction, this simple addition does not work as it
+ * would point past the loop and would have skipped the loop.
+ * Because of this, syscall entrance would need to look at the loop
+ * registers and set the PC back to the beginning of loop if we are
+ * still looping. Assuming most of the syscalls are not inside
+ * loops, the extra handling code consumes quite a few cycles.
+ * To workaround this, simply adds a nop after syscall so we no
+ * longer have to deal with loops at syscall entrance, and that
+ * a nop is faster than all the code to manipulate loop registers.
+ */
+#ifdef XCHAL_HAVE_LOOPS
+#define XTENSA_SYSCALL_ASM		"syscall; nop;"
+#else
+#define XTENSA_SYSCALL_ASM		"syscall"
+#endif
+
 #ifdef CONFIG_XTENSA_SYSCALL_USE_HELPER
 uintptr_t xtensa_syscall_helper_args_6(uintptr_t arg1, uintptr_t arg2,
 				       uintptr_t arg3, uintptr_t arg4,
@@ -75,7 +95,7 @@ static SYSINL uintptr_t arch_syscall_invoke6(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a8 __asm__("%a8") = arg5;
 	register uintptr_t a9 __asm__("%a9") = arg6;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4),
 			   "r" (a5), "r" (a8), "r" (a9)
@@ -99,7 +119,7 @@ static SYSINL uintptr_t arch_syscall_invoke5(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a5 __asm__("%a5") = arg4;
 	register uintptr_t a8 __asm__("%a8") = arg5;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4),
 			   "r" (a5), "r" (a8)
@@ -122,7 +142,7 @@ static SYSINL uintptr_t arch_syscall_invoke4(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a4 __asm__("%a4") = arg3;
 	register uintptr_t a5 __asm__("%a5") = arg4;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4),
 			   "r" (a5)
@@ -140,7 +160,7 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a3 __asm__("%a3") = arg2;
 	register uintptr_t a4 __asm__("%a4") = arg3;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3), "r" (a4)
 			 : "memory");
@@ -155,7 +175,7 @@ static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
 	register uintptr_t a6 __asm__("%a6") = arg1;
 	register uintptr_t a3 __asm__("%a3") = arg2;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6), "r" (a3)
 			 : "memory");
@@ -168,7 +188,7 @@ static inline uintptr_t arch_syscall_invoke1(uintptr_t arg1, uintptr_t call_id)
 	register uintptr_t a2 __asm__("%a2") = call_id;
 	register uintptr_t a6 __asm__("%a6") = arg1;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2), "r" (a6)
 			 : "memory");
@@ -180,7 +200,7 @@ static inline uintptr_t arch_syscall_invoke0(uintptr_t call_id)
 {
 	register uintptr_t a2 __asm__("%a2") = call_id;
 
-	__asm__ volatile("syscall\n\t"
+	__asm__ volatile(XTENSA_SYSCALL_ASM
 			 : "=r" (a2)
 			 : "r" (a2)
 			 : "memory");
diff --git a/include/zephyr/arch/xtensa/thread.h b/include/zephyr/arch/xtensa/thread.h
index 73f8a95e595ee..0b5112fb6d945 100644
--- a/include/zephyr/arch/xtensa/thread.h
+++ b/include/zephyr/arch/xtensa/thread.h
@@ -42,6 +42,11 @@ struct _thread_arch {
 	 * Un-set for surpervisor threads.
 	 */
 	uint8_t *psp;
+
+	/* Stashed PS value used to restore PS when restoring from
+	 * context switching or returning from non-nested interrupts.
+	 */
+	uint32_t return_ps;
 #endif
 };
 
diff --git a/include/zephyr/arch/xtensa/xtensa_mmu.h b/include/zephyr/arch/xtensa/xtensa_mmu.h
index 91da6a4f65688..13dc2385331a4 100644
--- a/include/zephyr/arch/xtensa/xtensa_mmu.h
+++ b/include/zephyr/arch/xtensa/xtensa_mmu.h
@@ -63,8 +63,10 @@ typedef uint32_t k_mem_partition_attr_t;
 	((k_mem_partition_attr_t) {0})
 
 /* Execution-allowed attributes */
-#define K_MEM_PARTITION_P_RX_U_RX \
+#define K_MEM_PARTITION_P_RX_U_NA \
 	((k_mem_partition_attr_t) {XTENSA_MMU_PERM_X})
+#define K_MEM_PARTITION_P_RX_U_RX \
+	((k_mem_partition_attr_t) {XTENSA_MMU_PERM_X | XTENSA_MMU_MAP_USER})
 
 /**
  * @}
diff --git a/include/zephyr/bluetooth/att.h b/include/zephyr/bluetooth/att.h
index 9550848cb7d19..21a971a96eca1 100644
--- a/include/zephyr/bluetooth/att.h
+++ b/include/zephyr/bluetooth/att.h
@@ -17,8 +17,12 @@
  * @{
  */
 
-#include <zephyr/sys/slist.h>
+#include <stdint.h>
+#include <stddef.h>
+
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -118,6 +122,8 @@ extern "C" {
 #if defined(CONFIG_BT_ATT_ERR_TO_STR)
 const char *bt_att_err_to_str(uint8_t att_err);
 #else
+#include <zephyr/toolchain.h>
+
 static inline const char *bt_att_err_to_str(uint8_t att_err)
 {
 	ARG_UNUSED(att_err);
@@ -143,7 +149,7 @@ int bt_eatt_reconfigure(struct bt_conn *conn, uint16_t mtu);
  * may be created.
  *
  * @param conn The connection to send the request on
- * @param num_channels The number of Enhanced ATT beares to request.
+ * @param num_channels The number of Enhanced ATT bearers to request.
  * Must be in the range 1 - @kconfig{CONFIG_BT_EATT_MAX}, inclusive.
  *
  * @return 0 in case of success or negative value in case of error.
diff --git a/include/zephyr/bluetooth/audio/bap.h b/include/zephyr/bluetooth/audio/bap.h
index 9a97321bafa4c..ad452bf91882c 100644
--- a/include/zephyr/bluetooth/audio/bap.h
+++ b/include/zephyr/bluetooth/audio/bap.h
@@ -32,6 +32,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/net_buf.h>
 #include <zephyr/sys/slist.h>
@@ -41,11 +42,9 @@
 extern "C" {
 #endif
 
-#if defined(CONFIG_BT_BAP_BASS_MAX_SUBGROUPS)
-#define BT_BAP_BASS_MAX_SUBGROUPS CONFIG_BT_BAP_BASS_MAX_SUBGROUPS
-#else
-#define BT_BAP_BASS_MAX_SUBGROUPS 0
-#endif /* CONFIG_BT_BAP_BASS_MAX_SUBGROUPS*/
+/** Maximum number of subgroups supported in the BAP Scan Delegator API */
+#define BT_BAP_BASS_MAX_SUBGROUPS                                                                  \
+	COND_CODE_1(CONFIG_BT_AUDIO, (CONFIG_BT_BAP_BASS_MAX_SUBGROUPS), (0))
 
 /** Maximum size of BASE excluding service data header */
 #define BT_BASE_MAX_SIZE (UINT8_MAX - 1 /* type */ - BT_UUID_SIZE_16)
@@ -53,6 +52,100 @@ extern "C" {
 /** An invalid Broadcast ID */
 #define BT_BAP_INVALID_BROADCAST_ID 0xFFFFFFFFU
 
+/**
+ * @brief Recommended connectable advertising parameters
+ *
+ * If connection has not been established after 30 seconds, the device should switch to
+ * @ref BT_BAP_ADV_PARAM_CONN_REDUCED
+ *
+ * Defined by Table 8.1 in BAP 1.0.2
+ */
+#define BT_BAP_ADV_PARAM_CONN_QUICK                                                                \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONN | BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(20), \
+			BT_GAP_MS_TO_ADV_INTERVAL(30), NULL)
+
+/**
+ * @brief Reduced connectable advertising parameters
+ *
+ * Defined by Table 8.1 in BAP 1.0.2
+ */
+#define BT_BAP_ADV_PARAM_CONN_REDUCED                                                              \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONN | BT_LE_ADV_OPT_EXT_ADV,                                \
+			BT_GAP_MS_TO_ADV_INTERVAL(150), BT_GAP_MS_TO_ADV_INTERVAL(150), NULL)
+
+/**
+ * @brief Recommended connection parameters for initial connection request for 7.5 ms SDU interval
+ *
+ * Once service discovery has completed and a stream is setup, it is recommended to switch to
+ * @ref BT_BAP_CONN_PARAM_RELAXED
+ *
+ * Defined by Table 8.3 in BAP 1.0.2
+ */
+#define BT_BAP_CONN_PARAM_SHORT_7_5                                                                \
+	BT_LE_CONN_PARAM(BT_GAP_US_TO_CONN_INTERVAL(7500), BT_GAP_MS_TO_CONN_INTERVAL(30), 0,      \
+			 BT_GAP_MS_TO_CONN_TIMEOUT(4000))
+
+/**
+ * @brief Recommended connection parameters for initial connection request for 10 ms SDU interval
+ *
+ * Once service discovery has completed and a stream is setup, it is recommended to switch to
+ * @ref BT_BAP_CONN_PARAM_RELAXED
+ *
+ * Defined by Table 8.3 in BAP 1.0.2
+ */
+#define BT_BAP_CONN_PARAM_SHORT_10                                                                 \
+	BT_LE_CONN_PARAM(BT_GAP_MS_TO_CONN_INTERVAL(10), BT_GAP_MS_TO_CONN_INTERVAL(30), 0,        \
+			 BT_GAP_MS_TO_CONN_TIMEOUT(4000))
+
+/**
+ * @brief Recommended connection parameters for coexistence of ACL and ISO
+ *
+ * Defined by Table 8.3 in BAP 1.0.2
+ */
+#define BT_BAP_CONN_PARAM_RELAXED                                                                  \
+	BT_LE_CONN_PARAM(BT_GAP_MS_TO_CONN_INTERVAL(50), BT_GAP_MS_TO_CONN_INTERVAL(70), 0,        \
+			 BT_GAP_MS_TO_CONN_TIMEOUT(4000))
+
+/**
+ * @brief Fast advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes lower time to
+ * synchronize over coexistence with ISO and power consumption.
+ */
+#define BT_BAP_ADV_PARAM_BROADCAST_FAST                                                            \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(60),                      \
+			BT_GAP_MS_TO_ADV_INTERVAL(60), NULL)
+
+/**
+ * @brief Slow advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes coexistence with ISO
+ * and power consumption over lower time to synchronize.
+ */
+#define BT_BAP_ADV_PARAM_BROADCAST_SLOW                                                            \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(150),                     \
+			BT_GAP_MS_TO_ADV_INTERVAL(150), NULL)
+
+/**
+ * @brief Fast advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes lower time to
+ * synchronize over coexistence with ISO and power consumption.
+ */
+#define BT_BAP_PER_ADV_PARAM_BROADCAST_FAST                                                        \
+	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(60), BT_GAP_MS_TO_PER_ADV_INTERVAL(60),  \
+			    BT_LE_PER_ADV_OPT_NONE)
+
+/**
+ * @brief Slow advertising parameters for broadcast audio
+ *
+ * This is suitable for both 7.5 ms and 10 ms SDU intervals, but prioritizes coexistence with ISO
+ * and power consumption over lower time to synchronize.
+ */
+#define BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW                                                        \
+	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(150),                                    \
+			    BT_GAP_MS_TO_PER_ADV_INTERVAL(150), BT_LE_PER_ADV_OPT_NONE)
+
 /**
  * @brief Check if a BAP BASS BIS_Sync bitfield is valid
  *
@@ -762,28 +855,30 @@ struct bt_bap_stream {
 	/** Audio stream operations */
 	struct bt_bap_stream_ops *ops;
 
+	/** Stream user data */
+	void *user_data;
+
 #if defined(CONFIG_BT_BAP_UNICAST_CLIENT) || defined(__DOXYGEN__)
+	/** @cond INTERNAL_HIDDEN */
 	/**
-	 * @internal Audio ISO reference
+	 * @brief Audio ISO reference
 	 *
 	 * This is only used for Unicast Client streams, and is handled internally.
 	 */
 	struct bt_bap_iso *bap_iso;
 #endif /* CONFIG_BT_BAP_UNICAST_CLIENT */
 
-	/** @internal Unicast or Broadcast group - Used internally */
+	/** Unicast or Broadcast group - Used internally */
 	void *group;
 
-	/** Stream user data */
-	void *user_data;
-
 #if defined(CONFIG_BT_BAP_DEBUG_STREAM_SEQ_NUM) || defined(__DOXYGEN__)
-	/** @internal Previously sent sequence number */
+	/** Previously sent sequence number */
 	uint16_t _prev_seq_num;
 #endif /* CONFIG_BT_BAP_DEBUG_STREAM_SEQ_NUM */
 
-	/** @internal Internally used list node */
+	/** Internally used list node */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /** @brief Stream operation. */
@@ -2025,8 +2120,10 @@ struct bt_bap_broadcast_source_cb {
 	 */
 	void (*stopped)(struct bt_bap_broadcast_source *source, uint8_t reason);
 
-	/** @internal Internally used field for list handling */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used field for list handling */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /**
@@ -2311,8 +2408,10 @@ struct bt_bap_broadcast_sink_cb {
 	 */
 	void (*stopped)(struct bt_bap_broadcast_sink *sink, uint8_t reason);
 
-	/** @internal Internally used list node */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used list node */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /**
@@ -2684,8 +2783,10 @@ struct bt_bap_broadcast_assistant_cb {
 	 */
 	void (*rem_src)(struct bt_conn *conn, int err);
 
-	/** @internal Internally used list node */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used list node */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /**
diff --git a/include/zephyr/bluetooth/audio/cap.h b/include/zephyr/bluetooth/audio/cap.h
index b539a463c2689..cfa841afb85d5 100644
--- a/include/zephyr/bluetooth/audio/cap.h
+++ b/include/zephyr/bluetooth/audio/cap.h
@@ -974,7 +974,7 @@ struct bt_cap_commander_broadcast_reception_start_param {
 int bt_cap_commander_broadcast_reception_start(
 	const struct bt_cap_commander_broadcast_reception_start_param *param);
 
-/** Parameters for stopping broadcast reception  */
+/** Member parameters for stopping broadcast reception  */
 struct bt_cap_commander_broadcast_reception_stop_member_param {
 	/** Coordinated or ad-hoc set member. */
 	union bt_cap_set_member member;
@@ -986,6 +986,7 @@ struct bt_cap_commander_broadcast_reception_stop_member_param {
 	size_t num_subgroups;
 };
 
+/** Parameters for stopping broadcast reception */
 struct bt_cap_commander_broadcast_reception_stop_param {
 	/** The type of the set. */
 	enum bt_cap_set_type type;
@@ -1008,7 +1009,7 @@ struct bt_cap_commander_broadcast_reception_stop_param {
 int bt_cap_commander_broadcast_reception_stop(
 	const struct bt_cap_commander_broadcast_reception_stop_param *param);
 
-/** Parameters for distributing broadcast code */
+/** Member parameters for distributing broadcast code */
 struct bt_cap_commander_distribute_broadcast_code_member_param {
 	/** Coordinated or ad-hoc set member. */
 	union bt_cap_set_member member;
@@ -1017,6 +1018,7 @@ struct bt_cap_commander_distribute_broadcast_code_member_param {
 	uint8_t src_id;
 };
 
+/** Parameters for distributing broadcast code */
 struct bt_cap_commander_distribute_broadcast_code_param {
 	/** The type of the set. */
 	enum bt_cap_set_type type;
diff --git a/include/zephyr/bluetooth/audio/ccp.h b/include/zephyr/bluetooth/audio/ccp.h
index 190d58313f272..0b74ad467670c 100644
--- a/include/zephyr/bluetooth/audio/ccp.h
+++ b/include/zephyr/bluetooth/audio/ccp.h
@@ -141,10 +141,30 @@ struct bt_ccp_call_control_client_cb {
 	void (*discover)(struct bt_ccp_call_control_client *client, int err,
 			 struct bt_ccp_call_control_client_bearers *bearers);
 
-	/** @internal Internally used field for list handling */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used field for list handling */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
+/**
+ * @brief Discovers the Telephone Bearer Service (TBS) support on a remote device.
+ *
+ * This will discover the Telephone Bearer Service (TBS) and Generic Telephone Bearer Service (GTBS)
+ * on the remote device.
+ *
+ * @kconfig_dep{CONFIG_BT_CCP_CALL_CONTROL_CLIENT}.
+ *
+ * @param conn Connection to a remote server.
+ * @param out_client Pointer to client instance on success
+ *
+ * @retval 0 Success
+ * @retval -EINVAL @p conn or @p out_client is NULL
+ * @retval -ENOTCONN @p conn is not connected
+ * @retval -ENOMEM Could not allocated memory for the request
+ * @retval -EBUSY Already doing discovery for @p conn
+ * @retval -ENOEXEC Rejected by the GATT layer
+ */
 int bt_ccp_call_control_client_discover(struct bt_conn *conn,
 					struct bt_ccp_call_control_client **out_client);
 
@@ -153,7 +173,7 @@ int bt_ccp_call_control_client_discover(struct bt_conn *conn,
  *
  * @param cb The callback struct
  *
- * @retval 0 Succsss
+ * @retval 0 Success
  * @retval -EINVAL @p cb is NULL
  * @retval -EEXISTS @p cb is already registered
  */
@@ -164,11 +184,24 @@ int bt_ccp_call_control_client_register_cb(struct bt_ccp_call_control_client_cb
  *
  * @param cb The callback struct
  *
- * @retval 0 Succsss
+ * @retval 0 Success
  * @retval -EINVAL @p cb is NULL
  * @retval -EALREADY @p cb is not registered
  */
 int bt_ccp_call_control_client_unregister_cb(struct bt_ccp_call_control_client_cb *cb);
+
+/**
+ * @brief Get the bearers of a client instance
+ *
+ * @param[in]  client  The client to get the bearers of.
+ * @param[out] bearers The bearers struct that will be populated with the bearers of @p client.
+
+ * @retval 0 Success
+ * @retval -EINVAL @p client or @p bearers is NULL
+ */
+int bt_ccp_call_control_client_get_bearers(struct bt_ccp_call_control_client *client,
+					   struct bt_ccp_call_control_client_bearers *bearers);
+
 /** @} */ /* End of group bt_ccp_call_control_client */
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/bluetooth/audio/csip.h b/include/zephyr/bluetooth/audio/csip.h
index e5e059d3e688b..312eaaee14f8c 100644
--- a/include/zephyr/bluetooth/audio/csip.h
+++ b/include/zephyr/bluetooth/audio/csip.h
@@ -32,6 +32,7 @@
 #include <stdint.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gap.h>
@@ -237,6 +238,70 @@ int bt_csip_set_member_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 int bt_csip_set_member_get_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 				uint8_t sirk[BT_CSIP_SIRK_SIZE]);
 
+/**
+ * @brief Set a new size and rank for a service instance
+ *
+ * This function can be used to dynamically change the size and rank of a service instance.
+ * It is important to note that a set cannot have multiple devices with the same rank in a set,
+ * and it is up to the caller of this function to ensure that.
+ * Similarly, it is important that the size is updated on all devices in the set at the same time.
+ *
+ * If @kconfig{CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE} is enabled, this will also send a
+ * notification to all connected or bonded clients.
+ *
+ * @param svc_inst The service instance.
+ * @param size The new set size.
+ * @param rank The new rank. Ignored if the @p svc_inst is not lockable.
+ *
+ * @retval -EINVAL @p svc_inst is NULL, @p size is less than 1, @p rank is less than 1 or higher
+ *                 than @p size for a lockable @p svc_inst.
+ * @retval -EALREADY @p size and @p rank are already the provided values.
+ * @retval 0 Success.
+ */
+int bt_csip_set_member_set_size_and_rank(struct bt_csip_set_member_svc_inst *svc_inst, uint8_t size,
+					 uint8_t rank);
+
+/** Struct to hold information about a service instance */
+struct bt_csip_set_member_set_info {
+	/** The 16-octet SIRK */
+	uint8_t sirk[BT_CSIP_SIRK_SIZE];
+
+	/** The set size */
+	uint8_t set_size;
+
+	/**
+	 * @brief The rank
+	 *
+	 * May be 0 if the set is not lockable
+	 */
+	uint8_t rank;
+
+	/** Whether the set is lockable  */
+	bool lockable: 1;
+
+	/** Whether the set is currently locked */
+	bool locked: 1;
+
+	/**
+	 * @brief The address of the client that currently holds the lock
+	 *
+	 * Will be @ref BT_ADDR_LE_NONE if the server holds the lock
+	 */
+	bt_addr_le_t lock_client_addr;
+};
+
+/**
+ * @brief Get information about a service instances
+ *
+ * @param svc_inst The service instance.
+ * @param info Pointer to a struct to store the information in.
+ *
+ * @retval -EINVAL @p svc_inst or @p info is NULL.
+ * @retval 0 Success.
+ */
+int bt_csip_set_member_get_info(const struct bt_csip_set_member_svc_inst *svc_inst,
+				struct bt_csip_set_member_set_info *info);
+
 /**
  * @brief Generate the Resolvable Set Identifier (RSI) value.
  *
@@ -382,6 +447,24 @@ typedef void (*bt_csip_set_coordinator_lock_changed_cb)(
 typedef void (*bt_csip_set_coordinator_sirk_changed_cb)(
 	struct bt_csip_set_coordinator_csis_inst *inst);
 
+/**
+ * @typedef bt_csip_set_coordinator_size_changed_cb
+ * @brief Callback when the size of a set of a connected device changes.
+ *
+ * Since all devices in a set shall have the same set size value.
+ * Each connected device may send the same new size set in a notification,
+ * assuming that the remote device supports notifications of the set size.
+ *
+ * The rank of each device in the set may also change as part of this, so it is advisable to call
+ * bt_csip_set_coordinator_discover() to rediscover and read the characteristic values of the sets
+ * on each device.
+ *
+ * @param inst    The Coordinated Set Identification Service instance that was changed.
+ *                The new size is stored in the @p inst->info.size.
+ */
+typedef void (*bt_csip_set_coordinator_size_changed_cb)(
+	struct bt_conn *conn, const struct bt_csip_set_coordinator_csis_inst *inst);
+
 /**
  * @typedef bt_csip_set_coordinator_ordered_access_cb_t
  * @brief Callback for bt_csip_set_coordinator_ordered_access()
@@ -417,11 +500,15 @@ struct bt_csip_set_coordinator_cb {
 	bt_csip_set_coordinator_lock_changed_cb lock_changed;
 	/** Callback when a set's SIRK has changed */
 	bt_csip_set_coordinator_sirk_changed_cb sirk_changed;
+	/** Callback when a set's size has changed */
+	bt_csip_set_coordinator_size_changed_cb size_changed;
 	/** Callback for the ordered access procedure */
 	bt_csip_set_coordinator_ordered_access_cb_t ordered_access;
 
-	/** @internal Internally used field for list handling */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used field for list handling */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /**
diff --git a/include/zephyr/bluetooth/audio/micp.h b/include/zephyr/bluetooth/audio/micp.h
index 45d75c515d826..7bc33f86fd9a0 100644
--- a/include/zephyr/bluetooth/audio/micp.h
+++ b/include/zephyr/bluetooth/audio/micp.h
@@ -219,8 +219,10 @@ struct bt_micp_mic_ctlr_cb {
 	struct bt_aics_cb               aics_cb;
 #endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 
-	/** @internal Internally used field for list handling */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used field for list handling */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /**
diff --git a/include/zephyr/bluetooth/audio/pacs.h b/include/zephyr/bluetooth/audio/pacs.h
index 1c896081ac7a0..d9b6ced9c0abc 100644
--- a/include/zephyr/bluetooth/audio/pacs.h
+++ b/include/zephyr/bluetooth/audio/pacs.h
@@ -41,8 +41,10 @@ struct bt_pacs_cap {
 	/** Codec capability reference */
 	const struct bt_audio_codec_cap *codec_cap;
 
-	/** @internal Internally used list node */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used field for list handling */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /** Structure for registering PACS */
diff --git a/include/zephyr/bluetooth/audio/tbs.h b/include/zephyr/bluetooth/audio/tbs.h
index 6f408ff817468..895949cbfc217 100644
--- a/include/zephyr/bluetooth/audio/tbs.h
+++ b/include/zephyr/bluetooth/audio/tbs.h
@@ -462,6 +462,7 @@ int bt_tbs_set_uri_scheme_list(uint8_t bearer_index, const char **uri_list,
  */
 void bt_tbs_register_cb(struct bt_tbs_cb *cbs);
 
+/** Parameters for registering a Telephone Bearer Service */
 struct bt_tbs_register_param {
 	/** The name of the provider, for example a cellular service provider */
 	char *provider_name;
@@ -774,8 +775,10 @@ struct bt_tbs_client_cb {
 	bt_tbs_client_read_string_cb         friendly_name;
 #endif /* defined(CONFIG_BT_TBS_CLIENT_CALL_FRIENDLY_NAME) */
 
-	/** @internal Internally used field for list handling */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used field for list handling */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /**
diff --git a/include/zephyr/bluetooth/audio/vcp.h b/include/zephyr/bluetooth/audio/vcp.h
index 29662ffec4438..a7de11733de25 100644
--- a/include/zephyr/bluetooth/audio/vcp.h
+++ b/include/zephyr/bluetooth/audio/vcp.h
@@ -405,8 +405,10 @@ struct bt_vcp_vol_ctlr_cb {
 	/** Audio Input Control Service callbacks */
 	struct bt_aics_cb             aics_cb;
 
-	/** @internal Internally used field for list handling */
+	/** @cond INTERNAL_HIDDEN */
+	/** Internally used field for list handling */
 	sys_snode_t _node;
+	/** @endcond */
 };
 
 /**
diff --git a/include/zephyr/bluetooth/bluetooth.h b/include/zephyr/bluetooth/bluetooth.h
index d1618f98a3a2c..425d9a7a1b99c 100644
--- a/include/zephyr/bluetooth/bluetooth.h
+++ b/include/zephyr/bluetooth/bluetooth.h
@@ -1,5 +1,6 @@
-/** @file
- *  @brief Bluetooth subsystem core APIs.
+/**
+ * @file
+ * @brief Bluetooth subsystem core APIs.
  */
 
 /*
@@ -13,20 +14,32 @@
 
 /**
  * @brief Bluetooth APIs
+ *
+ * @details The Bluetooth Subsystem Core APIs provide essential functionalities
+ *          to use and manage Bluetooth based communication. These APIs include
+ *          APIs for Bluetooth stack initialization, device discovery,
+ *          connection management, data transmission, profiles and services.
+ *          These APIs support both classic Bluetooth and Bluetooth Low Energy
+ *          (LE) operations.
+ *
  * @defgroup bluetooth Bluetooth APIs
  * @ingroup connectivity
  * @{
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 
-#include <zephyr/sys/util.h>
-#include <zephyr/net_buf.h>
 #include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/crypto.h>
 #include <zephyr/bluetooth/classic/classic.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,6 +47,15 @@ extern "C" {
 
 /**
  * @brief Generic Access Profile (GAP)
+ *
+ * @details The Generic Access Profile (GAP) defines fundamental Bluetooth
+ *          operations, including device discovery, pairing, and connection
+ *          management. Zephyr's GAP implementation supports both classic
+ *          Bluetooth and Bluetooth Low Energy (LE) functionalities, enabling
+ *          roles such as Broadcaster, Observer, Peripheral, and Central. These
+ *          roles define the device's behavior in advertising, scanning, and
+ *          establishing connections within Bluetooth networks.
+ *
  * @defgroup bt_gap Generic Access Profile (GAP)
  * @since 1.0
  * @version 1.0.0
@@ -42,12 +64,19 @@ extern "C" {
  */
 
 /**
- * Convenience macro for specifying the default identity. This helps
- * make the code more readable, especially when only one identity is
- * supported.
+ * Identity handle referring to the first identity address. This is a convenience macro for
+ * specifying the default identity address. This helps make the code more readable, especially when
+ * only one identity address is supported.
  */
 #define BT_ID_DEFAULT 0
 
+/**
+ * @brief Number of octets for local supported
+ *
+ * The value of 8 correspond to page 0 in the LE Controller supported features
+ */
+#define BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE 8
+
 /** Opaque type representing an advertiser. */
 struct bt_le_ext_adv;
 
@@ -63,21 +92,50 @@ struct bt_iso_biginfo;
 /* Don't require everyone to include direction.h */
 struct bt_df_per_adv_sync_iq_samples_report;
 
+/**
+ * @brief Info of the advertising sent event.
+ *
+ * @note Used in @ref bt_le_ext_adv_cb.
+ */
 struct bt_le_ext_adv_sent_info {
-	/** The number of advertising events completed. */
+	/**
+	 * If the advertising set was started with a non-zero
+	 * @ref bt_le_ext_adv_start_param.num_events, this field
+	 * contains the number of times this advertising set has
+	 * been sent since it was enabled.
+	 */
 	uint8_t num_sent;
 };
 
+/**
+ * @brief Info of the advertising connected event.
+ *
+ * @note Used in @ref bt_le_ext_adv_cb.
+ */
 struct bt_le_ext_adv_connected_info {
 	/** Connection object of the new connection */
 	struct bt_conn *conn;
 };
 
+/**
+ * @brief Info of the advertising scanned event.
+ *
+ * @note Used in @ref bt_le_ext_adv_cb.
+ */
 struct bt_le_ext_adv_scanned_info {
 	/** Active scanner LE address and type */
 	bt_addr_le_t *addr;
 };
 
+/**
+ * @brief Info of the PAwR subevents.
+ *
+ * @details When the Controller indicates it is ready to transmit one or more PAwR subevents,
+ * @ref bt_le_per_adv_data_request holds the information about the first subevent data and the
+ * number of subevents data can be set for.
+ *
+ * @note Used in @ref bt_le_ext_adv_cb.
+ */
 struct bt_le_per_adv_data_request {
 	/** The first subevent data can be set for */
 	uint8_t start;
@@ -86,6 +144,16 @@ struct bt_le_per_adv_data_request {
 	uint8_t count;
 };
 
+/**
+ * @brief Info about the PAwR responses received.
+ *
+ * @details When the Controller indicates that one or more synced devices have responded to a
+ * periodic advertising subevent indication, @ref bt_le_per_adv_response_info holds the information
+ * about the subevent in question, its status, TX power, RSSI of the response, the Constant Tone
+ * Extension of the advertisement, and the slot the response was received in.
+ *
+ * @note Used in @ref bt_le_ext_adv_cb.
+ */
 struct bt_le_per_adv_response_info {
 	/** The subevent the response was received in */
 	uint8_t subevent;
@@ -111,14 +179,33 @@ struct bt_le_per_adv_response_info {
 	uint8_t response_slot;
 };
 
+/**
+ * @brief Callback struct to notify about advertiser activity.
+ *
+ * @details The @ref bt_le_ext_adv_cb struct contains callback functions that are invoked in
+ * response to various events related to the advertising set. These events include:
+ *     - Completion of advertising data transmission
+ *     - Acceptance of a new connection
+ *     - Transmission of scan response data
+ *     - If privacy is enabled:
+ *         - Expiration of the advertising set's validity
+ *     - If PAwR (Periodic Advertising with Response) is enabled:
+ *         - Readiness to send one or more PAwR subevents, namely the LE Periodic Advertising
+ *           Subevent Data Request event
+ *         - Response of synced devices to a periodic advertising subevent indication has been
+ *           received, namely the LE Periodic Advertising Response Report event
+ *
+ * @note Must point to valid memory during the lifetime of the advertising set.
+ *
+ * @note Used in @ref bt_le_ext_adv_create.
+ */
 struct bt_le_ext_adv_cb {
 	/**
-	 * @brief The advertising set has finished sending adv data.
+	 * @brief The advertising set was disabled after reaching limit
 	 *
-	 * This callback notifies the application that the advertising set has
-	 * finished sending advertising data.
-	 * The advertising set can either have been stopped by a timeout or
-	 * because the specified number of advertising events has been reached.
+	 * This callback is invoked when the limit set in
+	 * @ref bt_le_ext_adv_start_param.timeout or
+	 * @ref bt_le_ext_adv_start_param.num_events is reached.
 	 *
 	 * @param adv  The advertising set object.
 	 * @param info Information about the sent event.
@@ -146,7 +233,7 @@ struct bt_le_ext_adv_cb {
 	 * packet.
 	 *
 	 * @param adv  The advertising set object.
-	 * @param addr Information about the scanned event.
+	 * @param info Information about the scanned event, namely the address.
 	 */
 	void (*scanned)(struct bt_le_ext_adv *adv,
 			struct bt_le_ext_adv_scanned_info *info);
@@ -155,13 +242,13 @@ struct bt_le_ext_adv_cb {
 	/**
 	 * @brief The RPA validity of the advertising set has expired.
 	 *
-	 * This callback notifies the application that the RPA validity of
-	 * the advertising set has expired. The user can use this callback
-	 * to synchronize the advertising payload update with the RPA rotation.
+	 * This callback notifies the application that the RPA validity of the advertising set has
+	 * expired. The user can use this callback to synchronize the advertising payload update
+	 * with the RPA rotation by for example invoking @ref bt_le_ext_adv_set_data upon callback.
 	 *
-	 * If rpa sharing is enabled and rpa expired cb of any adv-sets belonging
-	 * to same adv id returns false, then adv-sets will continue with old rpa
-	 * through out the rpa rotations.
+	 * If RPA sharing is enabled (see @kconfig{CONFIG_BT_RPA_SHARING}) and this RPA expired
+	 * callback of any adv-sets belonging to same adv id returns false, then adv-sets will
+	 * continue with the old RPA throughout the RPA rotations.
 	 *
 	 * @param adv  The advertising set object.
 	 *
@@ -173,7 +260,7 @@ struct bt_le_ext_adv_cb {
 
 #if defined(CONFIG_BT_PER_ADV_RSP)
 	/**
-	 * @brief The Controller indicates it is ready to transmit one or more subevent.
+	 * @brief The Controller indicates it is ready to transmit one or more PAwR subevents.
 	 *
 	 * This callback notifies the application that the controller has requested
 	 * data for upcoming subevents.
@@ -232,7 +319,7 @@ int bt_enable(bt_ready_cb_t cb);
  *
  * Disable Bluetooth. Can't be called before bt_enable has completed.
  *
- * This API will clear all configured identities and keys that are not persistently
+ * This API will clear all configured identity addresses and keys that are not persistently
  * stored with @kconfig{CONFIG_BT_SETTINGS}. These can be restored
  * with settings_load() before reenabling the stack.
  *
@@ -312,36 +399,35 @@ uint16_t bt_get_appearance(void);
 int bt_set_appearance(uint16_t new_appearance);
 
 /**
- * @brief Get the currently configured identities.
+ * @brief Get the currently configured identity addresses.
  *
  * Returns an array of the currently configured identity addresses. To
- * make sure all available identities can be retrieved, the number of
+ * make sure all available identity addresses can be retrieved, the number of
  * elements in the @a addrs array should be CONFIG_BT_ID_MAX. The identity
- * identifier that some APIs expect (such as advertising parameters) is
- * simply the index of the identity in the @a addrs array.
+ * handle that some APIs expect (such as @ref bt_le_adv_param) is
+ * simply the index of the identity address in the @a addrs array.
  *
- * If @a addrs is passed as NULL, then returned @a count contains the
- * count of all available identities that can be retrieved with a
+ * If @a addrs is passed as NULL, then the returned @a count contains the
+ * count of all available identity addresses that can be retrieved with a
  * subsequent call to this function with non-NULL @a addrs parameter.
  *
- * @note Deleted identities may show up as @ref BT_ADDR_LE_ANY in the returned
- * array.
+ * @note Deleted identity addresses may show up as @ref BT_ADDR_LE_ANY in the returned array.
  *
- * @param addrs Array where to store the configured identities.
- * @param count Should be initialized to the array size. Once the function
- *              returns it will contain the number of returned identities.
+ * @param addrs Array where to store the configured identity addresses.
+ * @param count Should be initialized to the array size. Once the function returns
+ *              it will contain the number of returned identity addresses.
  */
 void bt_id_get(bt_addr_le_t *addrs, size_t *count);
 
 /**
- * @brief Create a new identity.
+ * @brief Create a new identity address.
  *
- * Create a new identity using the given address and IRK. This function can be
- * called before calling bt_enable(). However, the new identity will only be
+ * Create a new identity address using the given address and IRK. This function can be
+ * called before calling bt_enable(). However, the new identity address will only be
  * stored persistently in flash when this API is used after bt_enable(). The
  * reason is that the persistent settings are loaded after bt_enable() and would
  * therefore cause potential conflicts with the stack blindly overwriting what's
- * stored in flash. The identity will also not be written to flash in case a
+ * stored in flash. The identity address will also not be written to flash in case a
  * pre-defined address is provided, since in such a situation the app clearly
  * has some place it got the address from and will be able to repeat the
  * procedure on every power cycle, i.e. it would be redundant to also store the
@@ -350,11 +436,11 @@ void bt_id_get(bt_addr_le_t *addrs, size_t *count);
  * Generating random static address or random IRK is not supported when calling
  * this function before bt_enable().
  *
- * If the application wants to have the stack randomly generate identities
+ * If the application wants to have the stack randomly generate identity addresses
  * and store them in flash for later recovery, the way to do it would be
  * to first initialize the stack (using bt_enable), then call settings_load(),
- * and after that check with bt_id_get() how many identities were recovered.
- * If an insufficient amount of identities were recovered the app may then
+ * and after that check with bt_id_get() how many identity addresses were recovered.
+ * If an insufficient amount of identity addresses were recovered the app may then
  * call bt_id_create() to create new ones.
  *
  * If supported by the HCI driver (indicated by setting
@@ -363,71 +449,66 @@ void bt_id_get(bt_addr_le_t *addrs, size_t *count);
  * before calling bt_enable(). Subsequent calls always add/generate random
  * static addresses.
  *
- * @param addr Address to use for the new identity. If NULL or initialized
- *             to BT_ADDR_LE_ANY the stack will generate a new random
- *             static address for the identity and copy it to the given
- *             parameter upon return from this function (in case the
- *             parameter was non-NULL).
+ * @param addr Address to use for the new identity address. If NULL or initialized
+ *             to BT_ADDR_LE_ANY the stack will generate a new random static address
+ *             for the identity address and copy it to the given parameter upon return
+ *             from this function (in case the parameter was non-NULL).
  * @param irk  Identity Resolving Key (16 bytes) to be used with this
- *             identity. If set to all zeroes or NULL, the stack will
- *             generate a random IRK for the identity and copy it back
+ *             identity address. If set to all zeroes or NULL, the stack will
+ *             generate a random IRK for the identity address and copy it back
  *             to the parameter upon return from this function (in case
  *             the parameter was non-NULL). If privacy
  *             @kconfig{CONFIG_BT_PRIVACY} is not enabled this parameter must
  *             be NULL.
  *
- * @return Identity identifier (>= 0) in case of success, or a negative
- *         error code on failure.
+ * @return Identity handle (>= 0) in case of success, or a negative error code on failure.
  */
 int bt_id_create(bt_addr_le_t *addr, uint8_t *irk);
 
 /**
- * @brief Reset/reclaim an identity for reuse.
+ * @brief Reset/reclaim an identity address for reuse.
  *
  * The semantics of the @a addr and @a irk parameters of this function
  * are the same as with bt_id_create(). The difference is the first
- * @a id parameter that needs to be an existing identity (if it doesn't
- * exist this function will return an error). When given an existing
- * identity this function will disconnect any connections created using it,
- * remove any pairing keys or other data associated with it, and then create
- * a new identity in the same slot, based on the @a addr and @a irk
- * parameters.
- *
- * @note the default identity (BT_ID_DEFAULT) cannot be reset, i.e. this
+ * @a id parameter that needs to be an existing identity handle (if it doesn't
+ * exist this function will return an error). When given an existing identity handle
+ * this function will disconnect any connections (to the corresponding identity address)
+ * created using it, remove any pairing keys or other data associated with it, and then
+ * create a new identity address in the same slot, based on the @a addr and @a irk parameters.
+ *
+ * @note The default identity address (corresponding to BT_ID_DEFAULT) cannot be reset, and this
  * API will return an error if asked to do that.
  *
- * @param id   Existing identity identifier.
- * @param addr Address to use for the new identity. If NULL or initialized
- *             to BT_ADDR_LE_ANY the stack will generate a new static
- *             random address for the identity and copy it to the given
- *             parameter upon return from this function (in case the
- *             parameter was non-NULL).
+ * @param id   Existing identity handle.
+ * @param addr Address to use for the new identity address. If NULL or initialized
+ *             to BT_ADDR_LE_ANY the stack will generate a new static random
+ *             address for the identity address and copy it to the given
+ *             parameter upon return from this function.
  * @param irk  Identity Resolving Key (16 bytes) to be used with this
- *             identity. If set to all zeroes or NULL, the stack will
- *             generate a random IRK for the identity and copy it back
+ *             identity address. If set to all zeroes or NULL, the stack will
+ *             generate a random IRK for the identity address and copy it back
  *             to the parameter upon return from this function (in case
  *             the parameter was non-NULL). If privacy
  *             @kconfig{CONFIG_BT_PRIVACY} is not enabled this parameter must
  *             be NULL.
  *
- * @return Identity identifier (>= 0) in case of success, or a negative
- *         error code on failure.
+ * @return Identity handle (>= 0) in case of success, or a negative error code on failure.
  */
 int bt_id_reset(uint8_t id, bt_addr_le_t *addr, uint8_t *irk);
 
 /**
- * @brief Delete an identity.
+ * @brief Delete an identity address.
  *
- * When given a valid identity this function will disconnect any connections
- * created using it, remove any pairing keys or other data associated with
- * it, and then flag is as deleted, so that it can not be used for any
- * operations. To take back into use the slot the identity was occupying the
- * bt_id_reset() API needs to be used.
+ * When given a valid identity handle this function will disconnect any connections
+ * (to the corresponding identity address) created using it, remove any pairing keys
+ * or other data associated with it, and then flag is as deleted, so that it can not
+ * be used for any operations. To take back into use the slot the identity address was
+ * occupying, the bt_id_reset() API needs to be used.
  *
- * @note the default identity (BT_ID_DEFAULT) cannot be deleted, i.e. this
+ * @note The default identity address (corresponding to BT_ID_DEFAULT) cannot be deleted, and this
  * API will return an error if asked to do that.
  *
- * @param id   Existing identity identifier.
+ * @param id   Existing identity handle.
  *
  * @return 0 in case of success, or a negative error code on failure.
  */
@@ -449,13 +530,16 @@ int bt_id_delete(uint8_t id);
 /**
  * @brief Bluetooth data.
  *
- * Description of different data types that can be encoded into
- * advertising data. Used to form arrays that are passed to the
- * bt_le_adv_start() function.
+ * @details Description of different AD Types that can be encoded into advertising data. Used to
+ * form arrays that are passed to the @ref bt_le_adv_start function. The @ref BT_DATA define can
+ * be used as a helpter to declare the elements of an @ref bt_data array.
  */
 struct bt_data {
+	/** Type of scan response data or advertisement data. */
 	uint8_t type;
+	/** Length of scan response data or advertisement data. */
 	uint8_t data_len;
+	/** Pointer to Scan response or advertisement data. */
 	const uint8_t *data;
 };
 
@@ -463,7 +547,7 @@ struct bt_data {
  * @brief Helper to declare elements of bt_data arrays
  *
  * This macro is mainly for creating an array of struct bt_data
- * elements which is then passed to e.g. @ref bt_le_adv_start().
+ * elements which is then passed to e.g. @ref bt_le_adv_start function.
  *
  * @param _type Type of advertising data field
  * @param _data Pointer to the data field payload
@@ -480,7 +564,7 @@ struct bt_data {
  * @brief Helper to declare elements of bt_data arrays
  *
  * This macro is mainly for creating an array of struct bt_data
- * elements which is then passed to e.g. @ref bt_le_adv_start().
+ * elements which is then passed to e.g. @ref bt_le_adv_start function.
  *
  * @param _type Type of advertising data field
  * @param _bytes Variable number of single-byte parameters
@@ -517,8 +601,91 @@ size_t bt_data_get_len(const struct bt_data data[], size_t data_count);
  */
 size_t bt_data_serialize(const struct bt_data *input, uint8_t *output);
 
+/**
+ * @brief Local Bluetooth LE controller features and capabilities.
+ *
+ * @details This struct provides details about the Bluetooth LE controller's supported features,
+ * states, and various other capabilities. It includes information on ACL and ISO data packet
+ * lengths, the controller's resolving list size, and the maximum advertising data length. This
+ * information can be obtained after enabling the Bluetooth stack with @ref bt_enable function.
+ *
+ * Refer to the Bluetooth Core Specification, Volume 6, Part B and Volume 4, Part E for detailed
+ * sections about each field's significance and values.
+ */
+struct bt_le_local_features {
+	/**
+	 * @brief Local LE controller supported features.
+	 *
+	 * Refer to BT_LE_FEAT_BIT_* for values.
+	 * Refer to the BT_FEAT_LE_* macros for value comparionson.
+	 * See Bluetooth Core Specification, Vol 6, Part B, Section 4.6.
+	 */
+	uint8_t features[BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE];
+
+	/**
+	 * @brief Local LE controller supported states
+	 *
+	 * Refer to BT_LE_STATES_* for values.
+	 * See Bluetooth Core Specification 6.0, Vol 4, Part E, Section 7.8.27
+	 */
+	uint64_t states;
+
+	/**
+	 * @brief ACL data packet length
+	 *
+	 * This represents the maximum ACL HCI Data packet which can be sent from the Host to the
+	 * Controller.
+	 * The Host may support L2CAP and ATT MTUs larger than this value.
+	 * See Bluetooth Core Specification, Vol 6, Part E, Section 7.8.2.
+	 */
+	uint16_t acl_mtu;
+	/** Total number of ACL data packets */
+	uint8_t acl_pkts;
+
+	/**
+	 * @brief ISO data packet length
+	 *
+	 * This represents the maximum ISO HCI Data packet which can be sent from the Host to the
+	 * Controller.
+	 * ISO SDUs above this size can be fragmented assuming that the number of
+	 * @ref bt_le_local_features.iso_pkts support the maximum size.
+	 */
+	uint16_t iso_mtu;
+	/** Total number of ISO data packets */
+	uint8_t iso_pkts;
+
+	/**
+	 * @brief Maximum size of the controller resolving list.
+	 *
+	 * See Bluetooth Core Specification, Vol 6, Part E, Section 7.8.41.
+	 */
+	uint8_t rl_size;
+
+	/**
+	 * @brief Maximum advertising data length
+	 *
+	 * @note The maximum advertising data length also depends on advertising type.
+	 *
+	 * See Bluetooth Core Specification, Vol 6, Part E, Section 7.8.57.
+	 */
+	uint16_t max_adv_data_len;
+};
+
+/**
+ * @brief Get local Bluetooth LE controller features
+ *
+ * Can only be called after bt_enable()
+ *
+ * @param local_features Local features struct to be populated with information.
+ *
+ * @retval 0 Success
+ * @retval -EAGAIN The information is not yet available.
+ * @retval -EINVAL @p local_features is NULL.
+ */
+int bt_le_get_local_features(struct bt_le_local_features *local_features);
+
 /** Advertising options */
-enum {
+enum bt_le_adv_opt {
 	/** Convenience value when no options are specified. */
 	BT_LE_ADV_OPT_NONE = 0,
 
@@ -719,7 +886,8 @@ enum {
 	 *
 	 * @note Cannot be set if BT_LE_ADV_OPT_CODED is set.
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV.
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 * set as @ref bt_le_adv_param.options.
 	 */
 	BT_LE_ADV_OPT_NO_2M = BIT(11),
 
@@ -731,21 +899,24 @@ enum {
 	 * the trade-off of lower data rate and higher power consumption.
 	 * Connections will be established on LE Coded PHY.
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 * set as @ref bt_le_adv_param.options.
 	 */
 	BT_LE_ADV_OPT_CODED = BIT(12),
 
 	/**
-	 * @brief Advertise without a device address (identity or RPA).
+	 * @brief Advertise without a device address (identity address or RPA).
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 * set as @ref bt_le_adv_param.options.
 	 */
 	BT_LE_ADV_OPT_ANONYMOUS = BIT(13),
 
 	/**
 	 * @brief Advertise with transmit power.
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 * set as @ref bt_le_adv_param.options.
 	 */
 	BT_LE_ADV_OPT_USE_TX_POWER = BIT(14),
 
@@ -823,7 +994,9 @@ enum {
 /** LE Advertising Parameters. */
 struct bt_le_adv_param {
 	/**
-	 * @brief Local identity.
+	 * @brief Local identity handle.
+	 *
+	 * The index of the identity address in the local Bluetooth controller.
 	 *
 	 * @note When extended advertising @kconfig{CONFIG_BT_EXT_ADV} is not
 	 *       enabled or not supported by the controller it is not possible
@@ -835,7 +1008,8 @@ struct bt_le_adv_param {
 	/**
 	 * @brief Advertising Set Identifier, valid range 0x00 - 0x0f.
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 *set as @ref bt_le_adv_param.options.
 	 **/
 	uint8_t  sid;
 
@@ -845,27 +1019,34 @@ struct bt_le_adv_param {
 	 * Maximum advertising events the advertiser can skip before it must
 	 * send advertising data on the secondary advertising channel.
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 * set as @ref bt_le_adv_param.options.
 	 */
 	uint8_t  secondary_max_skip;
 
-	/** Bit-field of advertising options */
+	/** @brief Bit-field of advertising options, see the @ref bt_le_adv_opt field. */
 	uint32_t options;
 
-	/** Minimum Advertising Interval (N * 0.625 milliseconds)
-	 * Minimum Advertising Interval shall be less than or equal to the
-	 * Maximum Advertising Interval. The Minimum Advertising Interval and
-	 * Maximum Advertising Interval should not be the same value (as stated
-	 * in Bluetooth Core Spec 5.2, section 7.8.5)
+	/**
+	 * @brief Minimum Advertising Interval (N * 0.625 milliseconds)
+	 *
+	 * @details The Minimum Advertising Interval shall be less than or equal to the Maximum
+	 * Advertising Interval. The Minimum Advertising Interval and Maximum Advertising Interval
+	 * aren't recommended to be the same value to enable the Controller to determine the best
+	 * advertising interval given other activities.
+	 * (See Bluetooth Core Spec 6.0, Vol 4, Part E, section 7.8.5)
 	 * Range: 0x0020 to 0x4000
 	 */
 	uint32_t interval_min;
 
-	/** Maximum Advertising Interval (N * 0.625 milliseconds)
-	 * Minimum Advertising Interval shall be less than or equal to the
-	 * Maximum Advertising Interval. The Minimum Advertising Interval and
-	 * Maximum Advertising Interval should not be the same value (as stated
-	 * in Bluetooth Core Spec 5.2, section 7.8.5)
+	/**
+	 * @brief Maximum Advertising Interval (N * 0.625 milliseconds)
+	 *
+	 * @details The Maximum Advertising Interval shall be more than or equal to the Minimum
+	 * Advertising Interval. The Minimum Advertising Interval and Maximum Advertising Interval
+	 * aren't recommended to be the same value to enable the Controller to determine the best
+	 * advertising interval given other activities.
+	 * (See Bluetooth Core Spec 6.0, Vol 4, Part E, section 7.8.5)
 	 * Range: 0x0020 to 0x4000
 	 */
 	uint32_t interval_max;
@@ -890,25 +1071,40 @@ struct bt_le_adv_param {
 
 
 /** Periodic Advertising options */
-enum {
+enum bt_le_per_adv_opt {
 	/** Convenience value when no options are specified. */
 	BT_LE_PER_ADV_OPT_NONE = 0,
 
 	/**
 	 * @brief Advertise with transmit power.
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 * set as @ref bt_le_adv_param.options.
 	 */
 	BT_LE_PER_ADV_OPT_USE_TX_POWER = BIT(1),
 
 	/**
 	 * @brief Advertise with included AdvDataInfo (ADI).
 	 *
-	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
+	 * @note Requires @ref BT_LE_ADV_OPT_EXT_ADV bit (see @ref bt_le_adv_opt field)  to be
+	 * set as @ref bt_le_adv_param.options.
 	 */
 	BT_LE_PER_ADV_OPT_INCLUDE_ADI = BIT(2),
 };
 
+/**
+ * @brief Parameters for configuring periodic advertising.
+ *
+ * @details This struct is used to configure the parameters for periodic advertising, including the
+ * minimum and maximum advertising intervals, options, and settings for subevents if periodic
+ * advertising responses are supported. The intervals are specified in units of 1.25 ms, and the
+ * options field can be used to modify other advertising behaviors. For extended advertisers, the
+ * periodic advertising parameters can be set or updated using this structure. Some parameters are
+ * conditional based on whether the device supports periodic advertising responses (configured via
+ * @kconfig{CONFIG_BT_PER_ADV_RSP}).
+ *
+ * @note Used in @ref bt_le_per_adv_set_param function.
+ */
 struct bt_le_per_adv_param {
 	/**
 	 * @brief Minimum Periodic Advertising Interval (N * 1.25 ms)
@@ -926,7 +1122,7 @@ struct bt_le_per_adv_param {
 	 */
 	uint16_t interval_max;
 
-	/** Bit-field of periodic advertising options */
+	/** Bit-field of periodic advertising options, see the @ref bt_le_adv_opt field. */
 	uint32_t options;
 
 #if defined(CONFIG_BT_PER_ADV_RSP)
@@ -1014,42 +1210,57 @@ struct bt_le_per_adv_param {
 			BT_GAP_ADV_FAST_INT_MAX_2, NULL)                                           \
 	__DEPRECATED_MACRO
 
-/** @brief GAP recommended connectable advertising
+/**
+ * @brief GAP recommended connectable advertising parameters user-initiated
  *
- * This is the recommended default for when a person is likely
- * to be waiting the device to connect or be discovered.
+ * @details This define sets the recommended default for when an application is likely waiting for
+ * the device to be connected or discovered.
  *
- * Use a longer interval to conserve battery at the cost of
- * responsiveness. Consider entering a lower power state with
- * longer intervals after a timeout.
+ * GAP recommends advertisers use the advertising parameters set by @ref BT_LE_ADV_CONN_FAST_1 for
+ * user-initiated advertisements. This might mean any time a user interacts with a device, a press
+ * on a dedicated Bluetooth wakeup button, or anything in-between. Interpretation is left to the
+ * application developer.
  *
- * GAP recommends advertisers use this "when user-initiated".
- * The application developer decides what this means. It can by
- * any time the user interacts with the device, a press on a
- * dedicated Bluetooth wakeup button, or anything in-between.
+ * Following modes are considered in these parameter settings:
+ * - Undirected Connectable Mode
+ * - Limited Discoverable Mode and sending connectable undirected advertising events
+ * - General Discoverable Mode and sending connectable undirected advertising events
+ * - Directed Connectable Mode and sending low duty cycle directed advertising events
  *
- * This is the recommended setting for limited discoverable
- * mode.
+ * @note These parameters are merely a recommendation. For example the application might use a
+ * longer interval to conserve battery, which would be at the cost of responsiveness and it should
+ * be considered to enter a lower power state with longer intervals only after a timeout.
+ *
+ * @note This is the recommended setting for limited discoverable mode.
  *
  * See Bluetooth Core Specification:
- * - 3.C.A "Timers and Constants", T_GAP(adv_fast_interval1)
- * - 3.C.9.3.11 "Connection Establishment Timing parameters"
+ * - 6.0 Vol 3, Part C, Appendix A "Timers and Constants", T_GAP(adv_fast_interval1)
+ * - 6.0 Vol 3, Part C, Section 9.3.11 "Connection Establishment Timing parameters"
  */
+
 #define BT_LE_ADV_CONN_FAST_1                                                                      \
 	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONN, BT_GAP_ADV_FAST_INT_MIN_1, BT_GAP_ADV_FAST_INT_MAX_1,  \
 			NULL)
 
-/** @brief Connectable advertising with
- * T_GAP(adv_fast_interval2)
+/**
+ * @brief GAP recommended connectable advertising parameters non-connectable advertising events
+ *
+ * @details This define sets the recommended default for user-initiated advertisements or sending
+ * non-connectable advertising events.
+ *
+ * Following modes are considered in these parameter settings:
+ * - Non-Discoverable Mode
+ * - Non-Connectable Mode
+ * - Limited Discoverable Mode
+ * - General Discoverable Mode
  *
- * The advertising interval corresponds to what was offered as
- * `BT_LE_ADV_CONN` in Zephyr 3.6 and earlier, but unlike
- * `BT_LE_ADV_CONN`, the host does not automatically resume the
- * advertiser after it results in a connection.
+ * The advertising interval corresponds to what was offered as @ref BT_LE_ADV_CONN in Zephyr 3.6 and
+ * earlier, but unlike @ref BT_LE_ADV_CONN, the host does not automatically resume the advertiser
+ * after it results in a connection.
  *
  * See Bluetooth Core Specification:
- * - 3.C.A "Timers and Constants", T_GAP(adv_fast_interval1)
- * - 3.C.9.3.11 "Connection Establishment Timing parameters"
+ * - 6.0 Vol 3, Part C, Appendix A "Timers and Constants", T_GAP(adv_fast_interval2)
+ * - 6.0 Vol 3, Part C, Section 9.3.11 "Connection Establishment Timing parameters"
  */
 #define BT_LE_ADV_CONN_FAST_2                                                                      \
 	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONN, BT_GAP_ADV_FAST_INT_MIN_2, BT_GAP_ADV_FAST_INT_MAX_2,  \
@@ -1226,9 +1437,10 @@ struct bt_le_per_adv_param {
 /**
  * Helper to declare periodic advertising parameters inline
  *
- * @param _int_min     Minimum periodic advertising interval
- * @param _int_max     Maximum periodic advertising interval
- * @param _options     Periodic advertising properties bitfield.
+ * @param _int_min     Minimum periodic advertising interval, N * 0.625 milliseconds
+ * @param _int_max     Maximum periodic advertising interval, N * 0.625 milliseconds
+ * @param _options     Periodic advertising properties bitfield, see @ref bt_le_adv_opt
+ *                     field.
  */
 #define BT_LE_PER_ADV_PARAM_INIT(_int_min, _int_max, _options) \
 { \
@@ -1240,9 +1452,10 @@ struct bt_le_per_adv_param {
 /**
  * Helper to declare periodic advertising parameters inline
  *
- * @param _int_min     Minimum periodic advertising interval
- * @param _int_max     Maximum periodic advertising interval
- * @param _options     Periodic advertising properties bitfield.
+ * @param _int_min     Minimum periodic advertising interval, N * 0.625 milliseconds
+ * @param _int_max     Maximum periodic advertising interval, N * 0.625 milliseconds
+ * @param _options     Periodic advertising properties bitfield, see @ref bt_le_adv_opt
+ *                     field.
  */
 #define BT_LE_PER_ADV_PARAM(_int_min, _int_max, _options) \
 	((struct bt_le_per_adv_param[]) { \
@@ -1329,26 +1542,63 @@ int bt_le_ext_adv_create(const struct bt_le_adv_param *param,
 			 const struct bt_le_ext_adv_cb *cb,
 			 struct bt_le_ext_adv **adv);
 
+/**
+ * @brief Parameters for starting an extended advertising session.
+ *
+ * @details This struct provides the parameters to control the behavior of an extended advertising
+ * session, including the timeout and the number of advertising events to send. The timeout is
+ * specified in units of 10 ms, and the number of events determines how many times the advertising
+ * will be sent before stopping. If either the timeout or number of events is reached, the
+ * advertising session will be stopped, and the application will be notified via the advertiser sent
+ * callback. If both parameters are provided, the advertising session will stop when either limit is
+ * reached.
+ *
+ * @note Used in @ref bt_le_ext_adv_start function.
+ */
 struct bt_le_ext_adv_start_param {
 	/**
-	 * @brief Advertiser timeout (N * 10 ms).
+	 * @brief Maximum advertising set duration (N * 10 ms)
+	 *
+	 * The advertising set can be automatically disabled after a
+	 * certain amount of time has passed since it first appeared on
+	 * air.
+	 *
+	 * Set to zero for no limit. Set in units of 10 ms.
 	 *
-	 * Application will be notified by the advertiser sent callback.
-	 * Set to zero for no timeout.
+	 * When the advertising set is automatically disabled because of
+	 * this limit, @ref bt_le_ext_adv_cb.sent will be called.
 	 *
-	 * When using high duty cycle directed connectable advertising then
-	 * this parameters must be set to a non-zero value less than or equal
-	 * to the maximum of @ref BT_GAP_ADV_HIGH_DUTY_CYCLE_MAX_TIMEOUT.
+	 * When using high duty cycle directed connectable advertising
+	 * then this parameters must be set to a non-zero value less
+	 * than or equal to the maximum of
+	 * @ref BT_GAP_ADV_HIGH_DUTY_CYCLE_MAX_TIMEOUT.
 	 *
-	 * If privacy @kconfig{CONFIG_BT_PRIVACY} is enabled then the timeout
-	 * must be less than @kconfig{CONFIG_BT_RPA_TIMEOUT}.
+	 * If privacy @kconfig{CONFIG_BT_PRIVACY} is enabled then the
+	 * timeout must be less than @kconfig{CONFIG_BT_RPA_TIMEOUT}.
+	 *
+	 * For background information, see parameter "Duration" in
+	 * Bluetooth Core Specification Version 6.0 Vol. 4 Part E,
+	 * Section 7.8.56.
 	 */
 	uint16_t timeout;
+
 	/**
-	 * @brief Number of advertising events.
+	 * @brief Maximum number of extended advertising events to be
+	 * sent
+	 *
+	 * The advertiser can be automatically disabled once the whole
+	 * advertisement (i.e. extended advertising event) has been sent
+	 * a certain number of times. The number of advertising PDUs
+	 * sent may be higher and is not relevant.
 	 *
-	 * Application will be notified by the advertiser sent callback.
 	 * Set to zero for no limit.
+	 *
+	 * When the advertising set is automatically disabled because of
+	 * this limit, @ref bt_le_ext_adv_cb.sent will be called.
+	 *
+	 * For background information, see parameter
+	 * "Max_Extended_Advertising_Events" in Bluetooth Core
+	 * Specification Version 6.0 Vol. 4 Part E, Section 7.8.56.
 	 */
 	uint8_t  num_events;
 };
@@ -1463,7 +1713,7 @@ uint8_t bt_le_ext_adv_get_index(struct bt_le_ext_adv *adv);
 
 /** @brief Advertising set info structure. */
 struct bt_le_ext_adv_info {
-	/* Local identity */
+	/** Local identity handle. */
 	uint8_t                    id;
 
 	/** Currently selected Transmit Power (dBM). */
@@ -1494,7 +1744,7 @@ int bt_le_ext_adv_get_info(const struct bt_le_ext_adv *adv,
  * @param addr Advertiser LE address and type.
  * @param rssi Strength of advertiser signal.
  * @param adv_type Type of advertising response from advertiser.
- *                 Uses the BT_GAP_ADV_TYPE_* values.
+ *                 Uses the @ref bt_gap_adv_type values.
  * @param buf Buffer containing advertiser data.
  */
 typedef void bt_le_scan_cb_t(const bt_addr_le_t *addr, int8_t rssi,
@@ -1531,6 +1781,16 @@ int bt_le_per_adv_set_param(struct bt_le_ext_adv *adv,
 int bt_le_per_adv_set_data(const struct bt_le_ext_adv *adv,
 			   const struct bt_data *ad, size_t ad_len);
 
+/**
+ * @brief Parameters for setting data for a specific periodic advertising with response subevent.
+ *
+ * @details This struct provides the necessary information to set the data for a specific subevent
+ * in a Periodic Advertising with Response (PAwR) scenario. It specifies the subevent number, the
+ * range of response slots to listen to, and the actual data to send. This is used to respond to
+ * data request from an advertiser by sending back the data in the specified subevent.
+ *
+ * @note Used in @ref bt_le_per_adv_set_subevent_data function.
+ */
 struct bt_le_per_adv_subevent_data_params {
 	/** The subevent to set data for */
 	uint8_t subevent;
@@ -1572,8 +1832,8 @@ int bt_le_per_adv_set_subevent_data(const struct bt_le_ext_adv *adv, uint8_t num
  * periodic advertising and extended advertising can be enabled in any order.
  *
  * Once periodic advertising has been enabled, it will continue advertising
- * until @ref bt_le_per_adv_stop() has been called, or if the advertising set
- * is deleted by @ref bt_le_ext_adv_delete(). Calling @ref bt_le_ext_adv_stop()
+ * until @ref bt_le_per_adv_stop function has been called, or if the advertising set
+ * is deleted by @ref bt_le_ext_adv_delete function. Calling @ref bt_le_ext_adv_stop function
  * will not stop the periodic advertising.
  *
  * @param adv      Advertising set object.
@@ -1595,6 +1855,18 @@ int bt_le_per_adv_start(struct bt_le_ext_adv *adv);
  */
 int bt_le_per_adv_stop(struct bt_le_ext_adv *adv);
 
+/**
+ * @brief Information about the successful synchronization with periodic advertising.
+ *
+ * @details This struct provides information about the periodic advertising sync once it has been
+ * successfully established. It includes the advertiser's address, SID, the advertising interval,
+ * PHY, and the synchronization state. It also contains details about the sync, such as service data
+ * and the peer device that transferred the sync.
+ * When using periodic advertising response (configured via @kconfig{CONFIG_BT_PER_ADV_SYNC_RSP}),
+ * additional details such as subevent information and response timings are provided.
+ *
+ * @note Used in @ref bt_le_per_adv_sync_cb structure.
+ */
 struct bt_le_per_adv_sync_synced_info {
 	/** Advertiser LE address and type. */
 	const bt_addr_le_t *addr;
@@ -1641,6 +1913,16 @@ struct bt_le_per_adv_sync_synced_info {
 #endif /* CONFIG_BT_PER_ADV_SYNC_RSP */
 };
 
+/**
+ * @brief Information about the termination of a periodic advertising sync.
+ *
+ * @details This struct provides information about the termination of a periodic advertising sync.
+ * It includes the advertiser’s address and SID, along with the reason for the sync termination.
+ * This information is provided in the callback when the sync is terminated, either due to a
+ * local or remote request, or due to missing data (e.g., out of range or lost sync).
+ *
+ * @note Used in @ref bt_le_per_adv_sync_cb structure.
+ */
 struct bt_le_per_adv_sync_term_info {
 	/** Advertiser LE address and type. */
 	const bt_addr_le_t *addr;
@@ -1652,6 +1934,17 @@ struct bt_le_per_adv_sync_term_info {
 	uint8_t reason;
 };
 
+/**
+ * @brief Information about a received periodic advertising report.
+ *
+ * @details This struct holds information about a periodic advertising event that has been received.
+ * It contains details such as the advertiser’s address, SID, transmit power, RSSI, CTE type, and
+ * additional information depending on the configuration (e.g., event counter and subevent in case
+ * of a subevent indication). This information is provided in the callback when periodic advertising
+ * data is received.
+ *
+ * @note Used in @ref bt_le_per_adv_sync_cb structure.
+ */
 struct bt_le_per_adv_sync_recv_info {
 	/** Advertiser LE address and type. */
 	const bt_addr_le_t *addr;
@@ -1676,12 +1969,29 @@ struct bt_le_per_adv_sync_recv_info {
 #endif /* CONFIG_BT_PER_ADV_SYNC_RSP */
 };
 
-
+/**
+ * @brief Information about the state of periodic advertising sync.
+ *
+ * @details This struct provides information about the current state of a periodic advertising sync.
+ * It indicates whether periodic advertising reception is enabled or not. It is typically used to
+ * report the state change via callbacks in the @ref bt_le_per_adv_sync_cb structure.
+ */
 struct bt_le_per_adv_sync_state_info {
 	/** True if receiving periodic advertisements, false otherwise. */
 	bool recv_enabled;
 };
 
+/**
+ * @brief Callback struct for periodic advertising sync events.
+ *
+ * @details This struct defines the callback functions that are invoked for various periodic
+ * advertising sync events. These include when the sync is successfully established, terminated,
+ * when data is received, state changes, BIG info reports, and IQ samples from the periodic
+ * advertising.
+ *
+ * @note Used in @ref bt_le_per_adv_sync_cb_register function.
+ */
+
 struct bt_le_per_adv_sync_cb {
 	/**
 	 * @brief The periodic advertising has been successfully synced.
@@ -1764,7 +2074,7 @@ struct bt_le_per_adv_sync_cb {
 };
 
 /** Periodic advertising sync options */
-enum {
+enum bt_le_per_adv_sync_opt {
 	/** Convenience value when no options are specified. */
 	BT_LE_PER_ADV_SYNC_OPT_NONE = 0,
 
@@ -1799,6 +2109,17 @@ enum {
 	BT_LE_PER_ADV_SYNC_OPT_SYNC_ONLY_CONST_TONE_EXT = BIT(6),
 };
 
+/**
+ * @brief Parameters for creating a periodic advertising sync object.
+ *
+ * @details This struct contains the parameters required to create a periodic advertising sync
+ * object, which allows the system to synchronize with periodic advertising reports from an
+ * advertiser. It includes the advertiser's address, SID, sync options, event skip, and
+ * synchronization timeout.
+ *
+ * @note bt_le_per_adv_sync_param is used as a parameter in the @ref bt_le_per_adv_sync_create
+ * function to configure synchronization behavior.
+ */
 struct bt_le_per_adv_sync_param {
 	/**
 	 * @brief Periodic Advertiser Address
@@ -1977,7 +2298,7 @@ int bt_le_per_adv_sync_recv_enable(struct bt_le_per_adv_sync *per_adv_sync);
 int bt_le_per_adv_sync_recv_disable(struct bt_le_per_adv_sync *per_adv_sync);
 
 /** Periodic Advertising Sync Transfer options */
-enum {
+enum bt_le_per_adv_sync_transfer_opt {
 	/** Convenience value when no options are specified. */
 	BT_LE_PER_ADV_SYNC_TRANSFER_OPT_NONE = 0,
 
@@ -2024,6 +2345,16 @@ enum {
 	BT_LE_PER_ADV_SYNC_TRANSFER_OPT_FILTER_DUPLICATES = BIT(5),
 };
 
+/**
+ * @brief Parameters for periodic advertising sync transfer.
+ *
+ * @details This struct defines the parameters for configuring periodic advertising sync transfers
+ * (PASTs). It includes settings for the maximum event skip, synchronization timeout, and options
+ * for sync transfer.
+ *
+ * @note Used in the @ref bt_le_per_adv_sync_transfer_subscribe function to configure sync transfer
+ * settings.
+ */
 struct bt_le_per_adv_sync_transfer_param {
 	/**
 	 * @brief Maximum event skip
@@ -2148,7 +2479,7 @@ int bt_le_per_adv_list_remove(const bt_addr_le_t *addr, uint8_t sid);
 int bt_le_per_adv_list_clear(void);
 
 
-enum {
+enum bt_le_scan_opt {
 	/** Convenience value when no options are specified. */
 	BT_LE_SCAN_OPT_NONE = 0,
 
@@ -2169,9 +2500,7 @@ enum {
 	BT_LE_SCAN_OPT_NO_1M = BIT(3),
 };
 
-#define BT_LE_SCAN_OPT_FILTER_WHITELIST __DEPRECATED_MACRO BT_LE_SCAN_OPT_FILTER_ACCEPT_LIST
-
-enum {
+enum bt_le_scan_type {
 	/** Scan without requesting additional information from advertisers. */
 	BT_LE_SCAN_TYPE_PASSIVE = 0x00,
 
@@ -2187,7 +2516,7 @@ enum {
 
 /** LE scan parameters */
 struct bt_le_scan_param {
-	/** Scan type (BT_LE_SCAN_TYPE_ACTIVE or BT_LE_SCAN_TYPE_PASSIVE) */
+	/** Scan type. @ref BT_LE_SCAN_TYPE_ACTIVE or @ref BT_LE_SCAN_TYPE_PASSIVE. */
 	uint8_t  type;
 
 	/** Bit-field of scanning options. */
@@ -2258,7 +2587,7 @@ struct bt_le_scan_recv_info {
 	/**
 	 * @brief Advertising packet type.
 	 *
-	 * Uses the BT_GAP_ADV_TYPE_* value.
+	 * Uses the @ref bt_gap_adv_type value.
 	 *
 	 * May indicate that this is a scan response if the type is
 	 * @ref BT_GAP_ADV_TYPE_SCAN_RSP.
@@ -2268,7 +2597,7 @@ struct bt_le_scan_recv_info {
 	/**
 	 * @brief Advertising packet properties bitfield.
 	 *
-	 * Uses the BT_GAP_ADV_PROP_* values.
+	 * Uses the @ref bt_gap_adv_prop values.
 	 * May indicate that this is a scan response if the value contains the
 	 * @ref BT_GAP_ADV_PROP_SCAN_RESPONSE bit.
 	 *
@@ -2310,8 +2639,7 @@ struct bt_le_scan_cb {
 /**
  * @brief Initialize scan parameters
  *
- * @param _type     Scan Type, BT_LE_SCAN_TYPE_ACTIVE or
- *                  BT_LE_SCAN_TYPE_PASSIVE.
+ * @param _type     Scan Type, @ref BT_LE_SCAN_TYPE_ACTIVE or @ref BT_LE_SCAN_TYPE_PASSIVE.
  * @param _options  Scan options
  * @param _interval Scan Interval (N * 0.625 ms)
  * @param _window   Scan Window (N * 0.625 ms)
@@ -2330,8 +2658,7 @@ struct bt_le_scan_cb {
 /**
  * @brief Helper to declare scan parameters inline
  *
- * @param _type     Scan Type, BT_LE_SCAN_TYPE_ACTIVE or
- *                  BT_LE_SCAN_TYPE_PASSIVE.
+ * @param _type     Scan Type, @ref BT_LE_SCAN_TYPE_ACTIVE or @ref BT_LE_SCAN_TYPE_PASSIVE.
  * @param _options  Scan options
  * @param _interval Scan Interval (N * 0.625 ms)
  * @param _window   Scan Window (N * 0.625 ms)
@@ -2418,7 +2745,7 @@ BUILD_ASSERT(BT_GAP_SCAN_FAST_WINDOW == BT_GAP_SCAN_FAST_INTERVAL_MIN,
  *
  * @note The LE scanner by default does not use the Identity Address of the
  *       local device when @kconfig{CONFIG_BT_PRIVACY} is disabled. This is to
- *       prevent the active scanner from disclosing the identity information
+ *       prevent the active scanner from disclosing the identity address information
  *       when requesting additional information from advertisers.
  *       In order to enable directed advertiser reports then
  *       @kconfig{CONFIG_BT_SCAN_WITH_IDENTITY} must be enabled.
@@ -2552,7 +2879,7 @@ int bt_le_set_rpa_timeout(uint16_t new_rpa_timeout);
 /**
  * @brief Helper for parsing advertising (or EIR or OOB) data.
  *
- * A helper for parsing the basic data types used for Extended Inquiry
+ * A helper for parsing the basic AD Types used for Extended Inquiry
  * Response (EIR), Advertising Data (AD), and OOB data blocks. The most
  * common scenario is to call this helper on the advertising data
  * received in the callback that was given to bt_le_scan_start().
@@ -2607,12 +2934,12 @@ struct bt_le_oob {
  *       - Creating a connection in progress, wait for the connected callback.
  *      In addition when extended advertising @kconfig{CONFIG_BT_EXT_ADV} is
  *      not enabled or not supported by the controller:
- *       - Advertiser is enabled using a Random Static Identity Address for a
- *         different local identity.
- *       - The local identity conflicts with the local identity used by other
+ *       - Advertiser is enabled using a Random Static Identity Address as a
+ *         different local identity address.
+ *       - The local identity address conflicts with the local identity address used by other
  *         roles.
  *
- * @param[in]  id  Local identity, in most cases BT_ID_DEFAULT.
+ * @param[in]  id  Local identity handle, in most cases BT_ID_DEFAULT.
  * @param[out] oob LE OOB information
  *
  * @return Zero on success or error code otherwise, positive in case of
@@ -2650,7 +2977,7 @@ int bt_le_ext_adv_oob_get_local(struct bt_le_ext_adv *adv,
 /**
  * @brief Clear pairing information.
  *
- * @param id    Local identity (mostly just BT_ID_DEFAULT).
+ * @param id    Local identity handle (mostly just BT_ID_DEFAULT).
  * @param addr  Remote address, NULL or BT_ADDR_LE_ANY to clear all remote
  *              devices.
  *
@@ -2667,7 +2994,7 @@ struct bt_bond_info {
 /**
  * @brief Iterate through all existing bonds.
  *
- * @param id         Local identity (mostly just BT_ID_DEFAULT).
+ * @param id         Local identity handle (mostly just BT_ID_DEFAULT).
  * @param func       Function to call for each bond.
  * @param user_data  Data to pass to the callback function.
  */
@@ -2675,23 +3002,33 @@ void bt_foreach_bond(uint8_t id, void (*func)(const struct bt_bond_info *info,
 					   void *user_data),
 		     void *user_data);
 
-/** @brief Configure vendor data path
+/**
+ * @brief Configure vendor data path
  *
- *  Request the Controller to configure the data transport path in a given direction between
- *  the Controller and the Host.
+ * @details Request the Controller to configure the data transport path in a given direction between
+ * the Controller and the Host.
  *
- *  @param dir            Direction to be configured, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR or
+ * @param dir            Direction to be configured, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR or
  *                        BT_HCI_DATAPATH_DIR_CTLR_TO_HOST
- *  @param id             Vendor specific logical transport channel ID, range
+ * @param id             Vendor specific logical transport channel ID, range
  *                        [BT_HCI_DATAPATH_ID_VS..BT_HCI_DATAPATH_ID_VS_END]
- *  @param vs_config_len  Length of additional vendor specific configuration data
- *  @param vs_config      Pointer to additional vendor specific configuration data
+ * @param vs_config_len  Length of additional vendor specific configuration data
+ * @param vs_config      Pointer to additional vendor specific configuration data
  *
- *  @return 0 in case of success or negative value in case of error.
+ * @return 0 in case of success or negative value in case of error.
  */
 int bt_configure_data_path(uint8_t dir, uint8_t id, uint8_t vs_config_len,
 			   const uint8_t *vs_config);
 
+/**
+ * @brief Parameters for synchronizing with specific periodic advertising subevents.
+ *
+ * @details This struct contains the parameters used to synchronize with a subset of subevents in
+ * periodic advertising. It includes the periodic advertising properties, the number of subevents
+ * to sync to, and the list of subevents that the controller should synchronize with.
+ *
+ * @note Used in @ref bt_le_per_adv_sync_subevent function to control synchronization.
+ */
 struct bt_le_per_adv_sync_subevent_params {
 	/** @brief Periodic Advertising Properties.
 	 *
@@ -2724,8 +3061,17 @@ struct bt_le_per_adv_sync_subevent_params {
 int bt_le_per_adv_sync_subevent(struct bt_le_per_adv_sync *per_adv_sync,
 				struct bt_le_per_adv_sync_subevent_params *params);
 
+/**
+ * @brief Parameters for sending a periodic advertising response.
+ *
+ * @details This struct contains the parameters used when sending a response to a periodic
+ * advertising request (see @ref bt_le_per_adv_set_response_data function). The response is sent
+ * in the specified subevent and response slot, and includes event and subevent counters
+ * to track the request the response corresponds to.
+ */
 struct bt_le_per_adv_response_params {
-	/** @brief The periodic event counter of the request the response is sent to.
+	/**
+	 * @brief The periodic event counter of the request the response is sent to.
 	 *
 	 * @ref bt_le_per_adv_sync_recv_info
 	 *
@@ -2735,7 +3081,8 @@ struct bt_le_per_adv_response_params {
 	 */
 	uint16_t request_event;
 
-	/** @brief The subevent counter of the request the response is sent to.
+	/**
+	 * @brief The subevent counter of the request the response is sent to.
 	 *
 	 * @ref bt_le_per_adv_sync_recv_info
 	 *
@@ -2765,6 +3112,19 @@ int bt_le_per_adv_set_response_data(struct bt_le_per_adv_sync *per_adv_sync,
 				    const struct bt_le_per_adv_response_params *params,
 				    const struct net_buf_simple *data);
 
+/**
+ * @brief Check if a device identified by a Bluetooth LE address is bonded.
+ *
+ * @details Valid Bluetooth LE identity addresses are either public address or random static
+ * address.
+ *
+ * @param id   Local identity handle (typically @ref BT_ID_DEFAULT).
+ * @param addr Bluetooth LE device address.
+ *
+ * @return true if @p addr is bonded with local @p id
+ */
+bool bt_le_bond_exists(uint8_t id, const bt_addr_le_t *addr);
+
 /**
  * @}
  */
diff --git a/include/zephyr/bluetooth/buf.h b/include/zephyr/bluetooth/buf.h
index dd452342ef724..a5d0ec4fe8e87 100644
--- a/include/zephyr/bluetooth/buf.h
+++ b/include/zephyr/bluetooth/buf.h
@@ -18,11 +18,17 @@
  * @{
  */
 
+#include <stddef.h>
 #include <stdint.h>
 
-#include <zephyr/net_buf.h>
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -97,13 +103,13 @@ struct bt_buf_data {
   * available for the HCI driver to allocate from.
   *
   * TODO: When CONFIG_BT_BUF_ACL_RX_COUNT is removed,
-  *       remove the MAX and only keep (CONFIG_BT_MAX_CONN + 1)
+  *       remove the MAX and only keep the 1.
   */
-#define BT_BUF_ACL_RX_COUNT                                                                        \
-	(MAX(CONFIG_BT_BUF_ACL_RX_COUNT, (CONFIG_BT_MAX_CONN + 1)) +                               \
-	 CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA)
+#define BT_BUF_ACL_RX_COUNT_EXTRA CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA
+#define BT_BUF_ACL_RX_COUNT       (MAX(CONFIG_BT_BUF_ACL_RX_COUNT, 1) + BT_BUF_ACL_RX_COUNT_EXTRA)
 #else
-#define BT_BUF_ACL_RX_COUNT 0
+#define BT_BUF_ACL_RX_COUNT_EXTRA 0
+#define BT_BUF_ACL_RX_COUNT       0
 #endif /* CONFIG_BT_CONN && CONFIG_BT_HCI_HOST */
 
 #if defined(CONFIG_BT_BUF_ACL_RX_COUNT) && CONFIG_BT_BUF_ACL_RX_COUNT > 0
@@ -117,10 +123,15 @@ BUILD_ASSERT(BT_BUF_ACL_RX_COUNT <= BT_BUF_ACL_RX_COUNT_MAX,
 #define BT_BUF_RX_SIZE (MAX(MAX(BT_BUF_ACL_RX_SIZE, BT_BUF_EVT_RX_SIZE), \
 			    BT_BUF_ISO_RX_SIZE))
 
-/** Buffer count needed for HCI ACL, HCI ISO or Event RX buffers */
-#define BT_BUF_RX_COUNT (MAX(MAX(CONFIG_BT_BUF_EVT_RX_COUNT, \
-				 BT_BUF_ACL_RX_COUNT), \
-			     BT_BUF_ISO_RX_COUNT))
+/* Controller can generate up to CONFIG_BT_BUF_ACL_TX_COUNT number of unique HCI Number of Completed
+ * Packets events.
+ */
+BUILD_ASSERT(CONFIG_BT_BUF_EVT_RX_COUNT > CONFIG_BT_BUF_ACL_TX_COUNT,
+	     "Increase Event RX buffer count to be greater than ACL TX buffer count");
+
+/** Buffer count needed for HCI ACL or HCI ISO plus Event RX buffers */
+#define BT_BUF_RX_COUNT (CONFIG_BT_BUF_EVT_RX_COUNT + \
+			 MAX(BT_BUF_ACL_RX_COUNT, BT_BUF_ISO_RX_COUNT))
 
 /** Data size needed for HCI Command buffers. */
 #define BT_BUF_CMD_TX_SIZE BT_BUF_CMD_SIZE(CONFIG_BT_BUF_CMD_TX_SIZE)
diff --git a/include/zephyr/bluetooth/classic/a2dp.h b/include/zephyr/bluetooth/classic/a2dp.h
index 95b1899cebc92..32329b6145386 100644
--- a/include/zephyr/bluetooth/classic/a2dp.h
+++ b/include/zephyr/bluetooth/classic/a2dp.h
@@ -341,7 +341,7 @@ struct bt_a2dp_ep_info {
 	/** Codec capabilities, if SBC, use function of a2dp_codec_sbc.h to parse it */
 	struct bt_a2dp_codec_ie codec_cap;
 	/** Stream End Point Information */
-	struct bt_avdtp_sep_info sep_info;
+	struct bt_avdtp_sep_info *sep_info;
 };
 
 /** @brief Helper enum to be used as return value of bt_a2dp_discover_ep_cb.
diff --git a/include/zephyr/bluetooth/classic/avrcp.h b/include/zephyr/bluetooth/classic/avrcp.h
index 4c422570fb637..dff804970c54f 100644
--- a/include/zephyr/bluetooth/classic/avrcp.h
+++ b/include/zephyr/bluetooth/classic/avrcp.h
@@ -16,6 +16,125 @@
 extern "C" {
 #endif
 
+#define BT_AVRCP_COMPANY_ID_SIZE          (3)
+#define BT_AVRCP_COMPANY_ID_BLUETOOTH_SIG (0x001958)
+
+/** @brief AVRCP Capability ID */
+typedef enum __packed {
+	BT_AVRCP_CAP_COMPANY_ID = 0x2,
+	BT_AVRCP_CAP_EVENTS_SUPPORTED = 0x3,
+} bt_avrcp_cap_t;
+
+/** @brief AVRCP Notification Events */
+typedef enum __packed {
+	BT_AVRCP_EVT_PLAYBACK_STATUS_CHANGED = 0x01,
+	BT_AVRCP_EVT_TRACK_CHANGED = 0x02,
+	BT_AVRCP_EVT_TRACK_REACHED_END = 0x03,
+	BT_AVRCP_EVT_TRACK_REACHED_START = 0x04,
+	BT_AVRCP_EVT_PLAYBACK_POS_CHANGED = 0x05,
+	BT_AVRCP_EVT_BATT_STATUS_CHANGED = 0x06,
+	BT_AVRCP_EVT_SYSTEM_STATUS_CHANGED = 0x07,
+	BT_AVRCP_EVT_PLAYER_APP_SETTING_CHANGED = 0x08,
+	BT_AVRCP_EVT_NOW_PLAYING_CONTENT_CHANGED = 0x09,
+	BT_AVRCP_EVT_AVAILABLE_PLAYERS_CHANGED = 0x0a,
+	BT_AVRCP_EVT_ADDRESSED_PLAYER_CHANGED = 0x0b,
+	BT_AVRCP_EVT_UIDS_CHANGED = 0x0c,
+	BT_AVRCP_EVT_VOLUME_CHANGED = 0x0d,
+} bt_avrcp_evt_t;
+
+/** @brief AV/C command types */
+typedef enum __packed {
+	BT_AVRCP_CTYPE_CONTROL = 0x0,
+	BT_AVRCP_CTYPE_STATUS = 0x1,
+	BT_AVRCP_CTYPE_SPECIFIC_INQUIRY = 0x2,
+	BT_AVRCP_CTYPE_NOTIFY = 0x3,
+	BT_AVRCP_CTYPE_GENERAL_INQUIRY = 0x4,
+} bt_avrcp_ctype_t;
+
+/** @brief AV/C response codes */
+typedef enum __packed {
+	BT_AVRCP_RSP_NOT_IMPLEMENTED = 0x8,
+	BT_AVRCP_RSP_ACCEPTED = 0x9,
+	BT_AVRCP_RSP_REJECTED = 0xa,
+	BT_AVRCP_RSP_IN_TRANSITION = 0xb,
+	BT_AVRCP_RSP_IMPLEMENTED = 0xc, /**< For SPECIFIC_INQUIRY and GENERAL_INQUIRY commands */
+	BT_AVRCP_RSP_STABLE = 0xc,      /**< For STATUS commands */
+	BT_AVRCP_RSP_CHANGED = 0xd,
+	BT_AVRCP_RSP_INTERIM = 0xf,
+} bt_avrcp_rsp_t;
+
+/** @brief AV/C operation ids used in AVRCP passthrough commands */
+typedef enum __packed {
+	BT_AVRCP_OPID_SELECT = 0x00,
+	BT_AVRCP_OPID_UP = 0x01,
+	BT_AVRCP_OPID_DOWN = 0x02,
+	BT_AVRCP_OPID_LEFT = 0x03,
+	BT_AVRCP_OPID_RIGHT = 0x04,
+	BT_AVRCP_OPID_RIGHT_UP = 0x05,
+	BT_AVRCP_OPID_RIGHT_DOWN = 0x06,
+	BT_AVRCP_OPID_LEFT_UP = 0x07,
+	BT_AVRCP_OPID_LEFT_DOWN = 0x08,
+	BT_AVRCP_OPID_ROOT_MENU = 0x09,
+	BT_AVRCP_OPID_SETUP_MENU = 0x0a,
+	BT_AVRCP_OPID_CONTENTS_MENU = 0x0b,
+	BT_AVRCP_OPID_FAVORITE_MENU = 0x0c,
+	BT_AVRCP_OPID_EXIT = 0x0d,
+
+	BT_AVRCP_OPID_0 = 0x20,
+	BT_AVRCP_OPID_1 = 0x21,
+	BT_AVRCP_OPID_2 = 0x22,
+	BT_AVRCP_OPID_3 = 0x23,
+	BT_AVRCP_OPID_4 = 0x24,
+	BT_AVRCP_OPID_5 = 0x25,
+	BT_AVRCP_OPID_6 = 0x26,
+	BT_AVRCP_OPID_7 = 0x27,
+	BT_AVRCP_OPID_8 = 0x28,
+	BT_AVRCP_OPID_9 = 0x29,
+	BT_AVRCP_OPID_DOT = 0x2a,
+	BT_AVRCP_OPID_ENTER = 0x2b,
+	BT_AVRCP_OPID_CLEAR = 0x2c,
+
+	BT_AVRCP_OPID_CHANNEL_UP = 0x30,
+	BT_AVRCP_OPID_CHANNEL_DOWN = 0x31,
+	BT_AVRCP_OPID_PREVIOUS_CHANNEL = 0x32,
+	BT_AVRCP_OPID_SOUND_SELECT = 0x33,
+	BT_AVRCP_OPID_INPUT_SELECT = 0x34,
+	BT_AVRCP_OPID_DISPLAY_INFORMATION = 0x35,
+	BT_AVRCP_OPID_HELP = 0x36,
+	BT_AVRCP_OPID_PAGE_UP = 0x37,
+	BT_AVRCP_OPID_PAGE_DOWN = 0x38,
+
+	BT_AVRCP_OPID_POWER = 0x40,
+	BT_AVRCP_OPID_VOLUME_UP = 0x41,
+	BT_AVRCP_OPID_VOLUME_DOWN = 0x42,
+	BT_AVRCP_OPID_MUTE = 0x43,
+	BT_AVRCP_OPID_PLAY = 0x44,
+	BT_AVRCP_OPID_STOP = 0x45,
+	BT_AVRCP_OPID_PAUSE = 0x46,
+	BT_AVRCP_OPID_RECORD = 0x47,
+	BT_AVRCP_OPID_REWIND = 0x48,
+	BT_AVRCP_OPID_FAST_FORWARD = 0x49,
+	BT_AVRCP_OPID_EJECT = 0x4a,
+	BT_AVRCP_OPID_FORWARD = 0x4b,
+	BT_AVRCP_OPID_BACKWARD = 0x4c,
+
+	BT_AVRCP_OPID_ANGLE = 0x50,
+	BT_AVRCP_OPID_SUBPICTURE = 0x51,
+
+	BT_AVRCP_OPID_F1 = 0x71,
+	BT_AVRCP_OPID_F2 = 0x72,
+	BT_AVRCP_OPID_F3 = 0x73,
+	BT_AVRCP_OPID_F4 = 0x74,
+	BT_AVRCP_OPID_F5 = 0x75,
+	BT_AVRCP_OPID_VENDOR_UNIQUE = 0x7e,
+} bt_avrcp_opid_t;
+
+/** @brief AVRCP button state flag */
+typedef enum __packed {
+	BT_AVRCP_BUTTON_PRESSED = 0,
+	BT_AVRCP_BUTTON_RELEASED = 1,
+} bt_avrcp_button_state_t;
+
 /** @brief AVRCP structure */
 struct bt_avrcp;
 
@@ -28,7 +147,24 @@ struct bt_avrcp_subunit_info_rsp {
 	uint8_t subunit_type;
 	uint8_t max_subunit_id;
 	const uint8_t *extended_subunit_type; /**< contains max_subunit_id items */
-	const uint8_t *extended_subunit_id; /**< contains max_subunit_id items */
+	const uint8_t *extended_subunit_id;   /**< contains max_subunit_id items */
+};
+
+#define BT_AVRCP_PASSTHROUGH_GET_STATE(payload)                                                    \
+	((bt_avrcp_button_state_t)(FIELD_GET(BIT(7), ((payload)->byte0))))
+#define BT_AVRCP_PASSTHROUGH_GET_OPID(payload)                                                     \
+	((bt_avrcp_opid_t)(FIELD_GET(GENMASK(6, 0), ((payload)->byte0))))
+
+struct bt_avrcp_passthrough_rsp {
+	uint8_t byte0; /**< [7]: state_flag, [6:0]: opid */
+	uint8_t data_len;
+	uint8_t data[];
+};
+
+struct bt_avrcp_get_cap_rsp {
+	uint8_t cap_id;  /**< bt_avrcp_cap_t */
+	uint8_t cap_cnt; /**< number of items contained in *cap */
+	uint8_t cap[];   /**< 1 or 3 octets each depends on cap_id */
 };
 
 struct bt_avrcp_cb {
@@ -40,6 +176,7 @@ struct bt_avrcp_cb {
 	 *  @param avrcp AVRCP connection object.
 	 */
 	void (*connected)(struct bt_avrcp *avrcp);
+
 	/** @brief An AVRCP connection has been disconnected.
 	 *
 	 *  This callback notifies the application that an avrcp connection
@@ -48,22 +185,51 @@ struct bt_avrcp_cb {
 	 *  @param avrcp AVRCP connection object.
 	 */
 	void (*disconnected)(struct bt_avrcp *avrcp);
+
+	/** @brief Callback function for bt_avrcp_get_cap().
+	 *
+	 *  Called when the get capabilities process is completed.
+	 *
+	 *  @param avrcp AVRCP connection object.
+	 *  @param tid The transaction label of the response.
+	 *  @param rsp The response for Get Capabilities command.
+	 */
+	void (*get_cap_rsp)(struct bt_avrcp *avrcp, uint8_t tid,
+			    const struct bt_avrcp_get_cap_rsp *rsp);
+
 	/** @brief Callback function for bt_avrcp_get_unit_info().
 	 *
 	 *  Called when the get unit info process is completed.
 	 *
 	 *  @param avrcp AVRCP connection object.
+	 *  @param tid The transaction label of the response.
 	 *  @param rsp The response for UNIT INFO command.
 	 */
-	void (*unit_info_rsp)(struct bt_avrcp *avrcp, struct bt_avrcp_unit_info_rsp *rsp);
+	void (*unit_info_rsp)(struct bt_avrcp *avrcp, uint8_t tid,
+			      struct bt_avrcp_unit_info_rsp *rsp);
+
 	/** @brief Callback function for bt_avrcp_get_subunit_info().
 	 *
 	 *  Called when the get subunit info process is completed.
 	 *
 	 *  @param avrcp AVRCP connection object.
+	 *  @param tid The transaction label of the response.
 	 *  @param rsp The response for SUBUNIT INFO command.
 	 */
-	void (*subunit_info_rsp)(struct bt_avrcp *avrcp, struct bt_avrcp_subunit_info_rsp *rsp);
+	void (*subunit_info_rsp)(struct bt_avrcp *avrcp, uint8_t tid,
+				 struct bt_avrcp_subunit_info_rsp *rsp);
+
+	/** @brief Callback function for bt_avrcp_passthrough().
+	 *
+	 *  Called when a passthrough response is received.
+	 *
+	 *  @param avrcp AVRCP connection object.
+	 *  @param tid The transaction label of the response.
+	 *  @param result The result of the operation.
+	 *  @param rsp The response for PASS THROUGH command.
+	 */
+	void (*passthrough_rsp)(struct bt_avrcp *avrcp, uint8_t tid, bt_avrcp_rsp_t result,
+				const struct bt_avrcp_passthrough_rsp *rsp);
 };
 
 /** @brief Connect AVRCP.
@@ -99,15 +265,28 @@ int bt_avrcp_disconnect(struct bt_avrcp *avrcp);
  */
 int bt_avrcp_register_cb(const struct bt_avrcp_cb *cb);
 
+/** @brief Get AVRCP Capabilities.
+ *
+ *  This function gets the capabilities supported by remote device.
+ *
+ *  @param avrcp The AVRCP instance.
+ *  @param tid The transaction label of the response, valid from 0 to 15.
+ *  @param cap_id Specific capability requested, see @ref bt_avrcp_cap_t.
+ *
+ *  @return 0 in case of success or error code in case of error.
+ */
+int bt_avrcp_get_cap(struct bt_avrcp *avrcp, uint8_t tid, uint8_t cap_id);
+
 /** @brief Get AVRCP Unit Info.
  *
  *  This function obtains information that pertains to the AV/C unit as a whole.
  *
  *  @param avrcp The AVRCP instance.
+ *  @param tid The transaction label of the response, valid from 0 to 15.
  *
  *  @return 0 in case of success or error code in case of error.
  */
-int bt_avrcp_get_unit_info(struct bt_avrcp *avrcp);
+int bt_avrcp_get_unit_info(struct bt_avrcp *avrcp, uint8_t tid);
 
 /** @brief Get AVRCP Subunit Info.
  *
@@ -115,10 +294,28 @@ int bt_avrcp_get_unit_info(struct bt_avrcp *avrcp);
  *  may support other subunits than the panel subunit if other profiles co-exist in the device.
  *
  *  @param avrcp The AVRCP instance.
+ *  @param tid The transaction label of the response, valid from 0 to 15.
+ *
+ *  @return 0 in case of success or error code in case of error.
+ */
+int bt_avrcp_get_subunit_info(struct bt_avrcp *avrcp, uint8_t tid);
+
+/** @brief Send AVRCP Pass Through command.
+ *
+ *  This function send a pass through command to the remote device. Passsthhrough command is used
+ *  to transfer user operation information from a CT to Panel subunit of TG.
+ *
+ *  @param avrcp The AVRCP instance.
+ *  @param tid The transaction label of the response, valid from 0 to 15.
+ *  @param opid The user operation id, see @ref bt_avrcp_opid_t.
+ *  @param state The button state, see @ref bt_avrcp_button_state_t.
+ *  @param payload The payload of the pass through command. Should not be NULL if len is not zero.
+ *  @param len The length of the payload.
  *
  *  @return 0 in case of success or error code in case of error.
  */
-int bt_avrcp_get_subunit_info(struct bt_avrcp *avrcp);
+int bt_avrcp_passthrough(struct bt_avrcp *avrcp, uint8_t tid, uint8_t opid, uint8_t state,
+			 const uint8_t *payload, uint8_t len);
 
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/bluetooth/classic/classic.h b/include/zephyr/bluetooth/classic/classic.h
index be7cf8dc404e8..d7120b5453a7b 100644
--- a/include/zephyr/bluetooth/classic/classic.h
+++ b/include/zephyr/bluetooth/classic/classic.h
@@ -48,7 +48,7 @@ struct bt_br_discovery_priv {
 	/** Page scan repetition mode */
 	uint8_t pscan_rep_mode;
 	/** Resolving remote name*/
-	bool resolving;
+	uint8_t resolve_state;
 };
 
 /** @brief BR/EDR discovery result structure */
@@ -175,12 +175,17 @@ int bt_br_oob_get_local(struct bt_br_oob *oob);
  * to devices making general inquiry. To enable this state it's mandatory
  * to first be in connectable state.
  *
+ * If the device enters limited discoverable mode, the controller will leave from discoverable
+ * mode after the duration of @kconfig{BT_LIMITED_DISCOVERABLE_DURATION} seconds in the limited
+ * discoverable mode.
+ *
  * @param enable Value allowing/disallowing controller to become discoverable.
+ * @param limited Value allowing/disallowing controller to enter limited discoverable mode.
  *
  * @return Negative if fail set to requested state or requested state has been
  *         already set. Zero if done successfully.
  */
-int bt_br_set_discoverable(bool enable);
+int bt_br_set_discoverable(bool enable, bool limited);
 
 /**
  * @brief Enable/disable set controller in connectable state.
@@ -196,6 +201,38 @@ int bt_br_set_discoverable(bool enable);
  */
 int bt_br_set_connectable(bool enable);
 
+/** @brief Check if a Bluetooth classic device address is bonded.
+ *
+ *  @param addr Bluetooth classic device address.
+ *
+ *  @return true if @p addr is bonded
+ */
+bool bt_br_bond_exists(const bt_addr_t *addr);
+
+/**
+ * @brief Clear classic pairing information .
+ *
+ * @param addr  Remote address, NULL or BT_ADDR_ANY to clear all remote devices.
+ *
+ * @return 0 on success or negative error value on failure.
+ */
+int bt_br_unpair(const bt_addr_t *addr);
+
+/** Information about a bond with a remote device. */
+struct bt_br_bond_info {
+	/** Address of the remote device. */
+	bt_addr_t addr;
+};
+
+/**
+ * @brief Iterate through all existing bonds of Classic.
+ *
+ * @param func       Function to call for each bond.
+ * @param user_data  Data to pass to the callback function.
+ */
+void bt_br_foreach_bond(void (*func)(const struct bt_br_bond_info *info, void *user_data),
+			void *user_data);
+
 /**
  * @}
  */
diff --git a/include/zephyr/bluetooth/classic/hfp_ag.h b/include/zephyr/bluetooth/classic/hfp_ag.h
index 6e5173d9fa4c1..9f936bef9236e 100644
--- a/include/zephyr/bluetooth/classic/hfp_ag.h
+++ b/include/zephyr/bluetooth/classic/hfp_ag.h
@@ -42,6 +42,40 @@ enum bt_hfp_ag_indicator {
 #define BT_HFP_AG_CODEC_LC3_SWB 0x03
 
 struct bt_hfp_ag;
+struct bt_hfp_ag_call;
+
+/** @typedef bt_hfp_ag_query_subscriber_func_t
+ *  @brief Query subscriber number callback function
+ *
+ *  When AG wants to send subscriber number information, all information
+ *  will be passed through the callback. And the subscriber number
+ *  information will be sent out in this function.
+ *
+ *  @param ag HFP AG object.
+ *  @param number Subscriber number.
+ *  @param type Type of subscriber number specifies the format of the phone number provided,
+ *              and can be one of the following values:
+ *              - values 128-143: The phone number format may be a national or international
+ *                format, and may contain prefix and/or escape digits. No changes on the number
+ *                presentation are required.
+ *              - values 144-159: The phone number format is an international number, including
+ *                the country code prefix. If the plus sign ("+") is not included as part of the
+ *                number and shall be added by the AG as needed.
+ *              - values 160-175: National number. No prefix nor escape digits included.
+ *  @param service Service of subscriber number indicates which service this phone number relates
+ *                 to. Shall be either 4 (voice) or 5 (fax).
+ *
+ *  @return 0 if should continue to the next subscriber number information.
+ *  @return negative value to stop.
+ */
+typedef int (*bt_hfp_ag_query_subscriber_func_t)(struct bt_hfp_ag *ag, char *number, uint8_t type,
+						 uint8_t service);
+
+/* HF indicators */
+enum hfp_ag_hf_indicators {
+	HFP_AG_ENHANCED_SAFETY_IND = 1, /* Enhanced Safety */
+	HFP_AG_BATTERY_LEVEL_IND = 2,   /* Remaining level of Battery */
+};
 
 /** @brief HFP profile AG application callback */
 struct bt_hfp_ag_cb {
@@ -50,9 +84,10 @@ struct bt_hfp_ag_cb {
 	 *  If this callback is provided it will be called whenever the
 	 *  AG connection completes.
 	 *
+	 *  @param conn Connection object.
 	 *  @param ag HFP AG object.
 	 */
-	void (*connected)(struct bt_hfp_ag *ag);
+	void (*connected)(struct bt_conn *conn, struct bt_hfp_ag *ag);
 	/** HF disconnected callback to application
 	 *
 	 *  If this callback is provided it will be called whenever the
@@ -76,34 +111,51 @@ struct bt_hfp_ag_cb {
 	 *  If this callback is provided it will be called whenever the
 	 *  SCO/eSCO connection gets disconnected.
 	 *
-	 *  @param ag HFP AG object.
-	 *  @param sco_conn SCO/eSCO Connection object.
+	 *  @param conn SCO/eSCO Connection object.
+	 *  @param reason BT_HCI_ERR_* reason for the disconnection.
 	 */
-	void (*sco_disconnected)(struct bt_hfp_ag *ag);
+	void (*sco_disconnected)(struct bt_conn *sco_conn, uint8_t reason);
 
 	/** HF memory dialing request Callback
 	 *
 	 *  If this callback is provided it will be called whenever a
-	 *  new call is requested with memory dialing from HFP unit.
+	 *  new call is requested with memory dialing from HF.
 	 *  Get the phone number according to the given AG memory location.
 	 *
 	 *  @param ag HFP AG object.
 	 *  @param location AG memory location
-	 *  @param number Dailing number
+	 *  @param number Dialing number
 	 *
 	 *  @return 0 in case of success or negative value in case of error.
 	 */
 	int (*memory_dial)(struct bt_hfp_ag *ag, const char *location, char **number);
 
+	/** HF phone number calling request Callback
+	 *
+	 *  If this callback is provided it will be called whenever a
+	 *  new call is requested with specific phone number from HF.
+	 *  When the callback is triggered, the application needs to start
+	 *  dialing the number with the passed phone number.
+	 *  If the callback is invalid, the phone number dialing from HF
+	 *  cannot be supported.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param number Dialing number
+	 *
+	 *  @return 0 in case of success or negative value in case of error.
+	 */
+	int (*number_call)(struct bt_hfp_ag *ag, const char *number);
+
 	/** HF outgoing Callback
 	 *
 	 *  If this callback is provided it will be called whenever a
 	 *  new call is outgoing.
 	 *
 	 *  @param ag HFP AG object.
-	 *  @param number Dailing number
+	 *  @param call HFP AG call object.
+	 *  @param number Dialing number
 	 */
-	void (*outgoing)(struct bt_hfp_ag *ag, const char *number);
+	void (*outgoing)(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number);
 
 	/** HF incoming Callback
 	 *
@@ -111,46 +163,74 @@ struct bt_hfp_ag_cb {
 	 *  new call is incoming.
 	 *
 	 *  @param ag HFP AG object.
+	 *  @param call HFP AG call object.
 	 *  @param number Incoming number
 	 */
-	void (*incoming)(struct bt_hfp_ag *ag, const char *number);
+	void (*incoming)(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number);
+
+	/** HF incoming call is held Callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  incoming call is held but not accepted.
+	 *
+	 *  @param call HFP AG call object.
+	 */
+	void (*incoming_held)(struct bt_hfp_ag_call *call);
 
 	/** HF ringing Callback
 	 *
 	 *  If this callback is provided it will be called whenever the
 	 *  call is in the ringing
 	 *
-	 *  @param ag HFP AG object.
+	 *  @param call HFP AG call object.
 	 *  @param in_bond true - in-bond ringing, false - No in-bond ringing
 	 */
-	void (*ringing)(struct bt_hfp_ag *ag, bool in_band);
+	void (*ringing)(struct bt_hfp_ag_call *call, bool in_band);
 
 	/** HF call accept Callback
 	 *
 	 *  If this callback is provided it will be called whenever the
 	 *  call is accepted.
 	 *
-	 *  @param ag HFP AG object.
+	 *  @param call HFP AG call object.
+	 */
+	void (*accept)(struct bt_hfp_ag_call *call);
+
+	/** HF call held Callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  call is held.
+	 *
+	 *  @param call HFP AG call object.
 	 */
-	void (*accept)(struct bt_hfp_ag *ag);
+	void (*held)(struct bt_hfp_ag_call *call);
+
+	/** HF call retrieve Callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  call is retrieved.
+	 *
+	 *  @param call HFP AG call object.
+	 */
+	void (*retrieve)(struct bt_hfp_ag_call *call);
 
 	/** HF call reject Callback
 	 *
 	 *  If this callback is provided it will be called whenever the
 	 *  call is rejected.
 	 *
-	 *  @param ag HFP AG object.
+	 *  @param call HFP AG call object.
 	 */
-	void (*reject)(struct bt_hfp_ag *ag);
+	void (*reject)(struct bt_hfp_ag_call *call);
 
 	/** HF call terminate Callback
 	 *
 	 *  If this callback is provided it will be called whenever the
 	 *  call is terminated.
 	 *
-	 *  @param ag HFP AG object.
+	 *  @param call HFP AG call object.
 	 */
-	void (*terminate)(struct bt_hfp_ag *ag);
+	void (*terminate)(struct bt_hfp_ag_call *call);
 
 	/** Supported codec Ids callback
 	 *
@@ -160,6 +240,175 @@ struct bt_hfp_ag_cb {
 	 *  @param ag HFP AG object.
 	 */
 	void (*codec)(struct bt_hfp_ag *ag, uint32_t ids);
+
+	/** Codec negotiate callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  codec negotiation succeeded or failed.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param err Result of codec negotiation.
+	 */
+	void (*codec_negotiate)(struct bt_hfp_ag *ag, int err);
+
+	/** Audio connection request callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  audio conenction request is triggered by HF.
+	 *  When AT+BCC AT command received, it means the procedure of
+	 *  establishment of audio connection is triggered by HF.
+	 *  If the callback is provided by application, AG needs to
+	 *  start the codec connection procedure by calling
+	 *  function `bt_hfp_ag_audio_connect` in application layer.
+	 *  Or, the codec conenction procedure will be started with
+	 *  default codec id `BT_HFP_AG_CODEC_CVSD`.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param err Result of codec negotiation.
+	 */
+	void (*audio_connect_req)(struct bt_hfp_ag *ag);
+
+	/** HF VGM setting callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  VGM gain setting is informed from HF.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param gain HF microphone gain value.
+	 */
+	void (*vgm)(struct bt_hfp_ag *ag, uint8_t gain);
+
+	/** HF VGS setting callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  VGS gain setting is informed from HF.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param gain HF speaker gain value.
+	 */
+	void (*vgs)(struct bt_hfp_ag *ag, uint8_t gain);
+
+	/** HF ECNR turns off callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  ECNR turning off request is received from HF.
+	 *  If the callback is NULL or @kconfig{CONFIG_BT_HFP_AG_ECNR}
+	 *  is not enabled, the response result code of AT command
+	 *  will be an AT ERROR.
+	 *
+	 *  @param ag HFP AG object.
+	 */
+	void (*ecnr_turn_off)(struct bt_hfp_ag *ag);
+
+	/** HF explicit call transfer callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  AT+CHLD=4 is sent from HF.
+	 *  When the callback is notified, the application should connect
+	 *  the two calls and disconnects the subscriber from both calls
+	 *  (Explicit Call Transfer).
+	 *  After the callback returned, the call objects will be invalid.
+	 *  If the callback is NULL, the response result code of AT command
+	 *  will be an AT ERROR.
+	 *  If @kconfig{CONFIG_BT_HFP_AG_3WAY_CALL} is not enabled, the
+	 *  callback will not be notified.
+	 *
+	 *  @param ag HFP AG object.
+	 */
+	void (*explicit_call_transfer)(struct bt_hfp_ag *ag);
+
+	/** Voice recognition activation/deactivation callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  voice recognition activation is changed.
+	 *  If voice recognition is activated, the upper layer should
+	 *  call `bt_hfp_ag_audio_connect` with appropriate codec ID to
+	 *  setup audio connection.
+	 *  If the callback is not provided by upper layer, the function
+	 *  `bt_hfp_ag_audio_connect` will be called with default codec
+	 *  ID `BT_HFP_AG_CODEC_CVSD`.
+	 *  If @kconfig{CONFIG_BT_HFP_AG_VOICE_RECG} is not enabled,
+	 *  the callback will not be notified.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param activate Voice recognition activation/deactivation.
+	 */
+	void (*voice_recognition)(struct bt_hfp_ag *ag, bool activate);
+
+	/** Ready to accept audio callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  HF is ready to accept audio.
+	 *  If the feature `Enhanced Voice Recognition Status` is supported
+	 *  by HF, the callback will be notified if the AT command `AT+BVRA=2`
+	 *  is received. The HF may send this value during an ongoing VR
+	 *  (Voice Recognition) session to terminate audio output from the
+	 *  AG (if there is any) and prepare the AG for new audio input.
+	 *  Or, the callback will be notified after the voice recognition
+	 *  is activated.
+	 *  If @kconfig{CONFIG_BT_HFP_AG_ENH_VOICE_RECG} is not enabled,
+	 *  the callback will not be notified.
+	 *
+	 *  @param ag HFP AG object.
+	 */
+	void (*ready_to_accept_audio)(struct bt_hfp_ag *ag);
+
+	/** Request phone number callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  AT command `AT+BINP=1` is received.
+	 *  If the upper layer accepts the request, it shall obtain a
+	 *  phone number.
+	 *  If the upper layer rejects the request, it shall return a
+	 *  an error.
+	 *  If @kconfig{CONFIG_BT_HFP_AG_VOICE_TAG} is not enabled,
+	 *  the callback will not be notified.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param number Phone number of voice tag.
+	 *
+	 *  @return 0 in case of success or negative value in case of error.
+	 */
+	int (*request_phone_number)(struct bt_hfp_ag *ag, char **number);
+
+	/** Transmit a DTMF Code callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  AT command `AT+VTS=<code>` is received.
+	 *  During an ongoing call, the HF transmits the AT+VTS command
+	 *  to instruct the AG to transmit a specific DTMF code to its
+	 *  network connection.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param code A specific DTMF code.
+	 */
+	void (*transmit_dtmf_code)(struct bt_hfp_ag *ag, char code);
+
+	/** Get subscriber number callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  AT command `AT+CNUM` is received.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param func Query subscriber number callback.
+	 *
+	 *  @return 0 in case of success or negative value in case of error.
+	 */
+	int (*subscriber_number)(struct bt_hfp_ag *ag, bt_hfp_ag_query_subscriber_func_t func);
+
+	/** HF indicator value callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  AT command `AT+BIEV` is received.
+	 *  If @kconfig{CONFIG_BT_HFP_AG_HF_INDICATORS} is not enabled,
+	 *  the callback will not be notified.
+	 *
+	 *  @param ag HFP AG object.
+	 *  @param indicator HF indicator
+	 *  @param value The value of specific indicator
+	 */
+	void (*hf_indicator_value)(struct bt_hfp_ag *ag, enum hfp_ag_hf_indicators indicator,
+				   uint32_t value);
 };
 
 /** @brief Register HFP AG profile
@@ -200,48 +449,78 @@ int bt_hfp_ag_disconnect(struct bt_hfp_ag *ag);
  *  Notify HFP Unit of an incoming call.
  *
  *  @param ag HFP AG object.
- *  @param number Dailing number.
+ *  @param number Dialing number.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
 int bt_hfp_ag_remote_incoming(struct bt_hfp_ag *ag, const char *number);
 
+/** @brief Put the incoming call on hold
+ *
+ *  Put the incoming call on hold.
+ *
+ *  @param call HFP AG call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_hold_incoming(struct bt_hfp_ag_call *call);
+
 /** @brief Reject the incoming call
  *
  *  Reject the incoming call.
  *
- *  @param ag HFP AG object.
+ *  @param call HFP AG call object.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_ag_reject(struct bt_hfp_ag *ag);
+int bt_hfp_ag_reject(struct bt_hfp_ag_call *call);
 
 /** @brief Accept the incoming call
  *
  *  Accept the incoming call.
  *
- *  @param ag HFP AG object.
+ *  @param call HFP AG call object.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_ag_accept(struct bt_hfp_ag *ag);
+int bt_hfp_ag_accept(struct bt_hfp_ag_call *call);
 
 /** @brief Terminate the active/hold call
  *
  *  Terminate the active/hold call.
  *
- *  @param ag HFP AG object.
+ *  @param call HFP AG call object.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_ag_terminate(struct bt_hfp_ag *ag);
+int bt_hfp_ag_terminate(struct bt_hfp_ag_call *call);
+
+/** @brief Retrieve the held call
+ *
+ *  Retrieve the held call.
+ *
+ *  @param call HFP AG call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_retrieve(struct bt_hfp_ag_call *call);
+
+/** @brief Hold the active call
+ *
+ *  Hold the active call.
+ *
+ *  @param call HFP AG call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_hold(struct bt_hfp_ag_call *call);
 
 /** @brief Dial a call
  *
  *  Dial a call.
  *
  *  @param ag HFP AG object.
- *  @param number Dailing number.
+ *  @param number Dialing number.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
@@ -251,41 +530,266 @@ int bt_hfp_ag_outgoing(struct bt_hfp_ag *ag, const char *number);
  *
  *  Notify HFP Unit that the remote starts ringing.
  *
- *  @param ag HFP AG object.
+ *  @param call HFP AG call object.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_ag_remote_ringing(struct bt_hfp_ag *ag);
+int bt_hfp_ag_remote_ringing(struct bt_hfp_ag_call *call);
 
 /** @brief Notify HFP Unit that the remote rejects the call
  *
  *  Notify HFP Unit that the remote rejects the call.
  *
- *  @param ag HFP AG object.
+ *  @param call HFP AG call object.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_ag_remote_reject(struct bt_hfp_ag *ag);
+int bt_hfp_ag_remote_reject(struct bt_hfp_ag_call *call);
 
 /** @brief Notify HFP Unit that the remote accepts the call
  *
  *  Notify HFP Unit that the remote accepts the call.
  *
- *  @param ag HFP AG object.
+ *  @param call HFP AG call object.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_ag_remote_accept(struct bt_hfp_ag *ag);
+int bt_hfp_ag_remote_accept(struct bt_hfp_ag_call *call);
 
 /** @brief Notify HFP Unit that the remote terminates the active/hold call
  *
  *  Notify HFP Unit that the remote terminates the active/hold call.
  *
+ *  @param call HFP AG call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_remote_terminate(struct bt_hfp_ag_call *call);
+
+/** @brief explicit call transfer
+ *
+ *  Connects the two calls and disconnects the subscriber from
+ *  both calls (Explicit Call Transfer).
+ *  If @kconfig{CONFIG_BT_HFP_AG_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param ag HFP AG object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_explicit_call_transfer(struct bt_hfp_ag *ag);
+
+/** @brief Set the HF microphone gain
+ *
+ *  Set the HF microphone gain
+ *
+ *  @param ag HFP AG object.
+ *  @param vgm Microphone gain value.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_vgm(struct bt_hfp_ag *ag, uint8_t vgm);
+
+/** @brief Set the HF speaker gain
+ *
+ *  Set the HF speaker gain
+ *
+ *  @param ag HFP AG object.
+ *  @param vgs Speaker gain value.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_vgs(struct bt_hfp_ag *ag, uint8_t vgs);
+
+/** @brief Set currently network operator
+ *
+ *  Set currently network operator.
+ *
+ *  @param ag HFP AG object.
+ *  @param mode Current mode and provides no information with regard
+ *              to the name of the operator.
+ *  @param name A string in alphanumeric format representing the
+ *                  name of the network operator. This string shall
+ *                  not exceed 16 characters.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_set_operator(struct bt_hfp_ag *ag, uint8_t mode, char *name);
+
+/** @brief Create audio connection
+ *
+ *  Create audio conenction by HFP AG. There are two setups included,
+ *  Codec connection and audio connection.
+ *  The codec connection will be established firstly if the codec
+ *  negotiation are supported by both side. If the passed codec id
+ *  is not same as the last codec connection, the codec connection
+ *  procedure will be triggered.
+ *  After the codec conenction is established, the audio conenction
+ *  will be started.
+ *  The passed codec id could be one of BT_HFP_AG_CODEC_XXX. If the
+ *  codec negotiation feature is supported by both side, the codec id
+ *  could be one of the bitmaps of `ids` notified by callback `codec`.
+ *  Or, the `id` should be BT_HFP_AG_CODEC_CVSD.
+ *
+ *  @param ag HFP AG object.
+ *  @param id Codec Id.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_audio_connect(struct bt_hfp_ag *ag, uint8_t id);
+
+/** @brief Set In-Band Ring Tone
+ *
+ *  Set In-Band Ring Tone.
+ *
+ *  @param ag HFP AG object.
+ *  @param inband In-band or no in-band.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_inband_ringtone(struct bt_hfp_ag *ag, bool inband);
+
+/** @brief Enable/disable the voice recognition function
+ *
+ *  Enables/disables the voice recognition function.
+ *  If @kconfig{CONFIG_BT_HFP_AG_VOICE_RECG} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param ag HFP AG object.
+ *  @param activate Activate/deactivate the voice recognition function.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_voice_recognition(struct bt_hfp_ag *ag, bool activate);
+
+/** @brief set voice recognition engine state
+ *
+ *  It is used to set the voice recognition engine state.
+ *  The unsolicited result code `+BVRA: 1,<vrecstate>` will be sent.
+ *  `<vrecstate>`: Bitmask that reflects the current state of the voice
+ *  recognition engine on the AG.
+ *  Bit 0 - If it is 1, the AG is ready to accept audio input
+ *  Bit 1 - If it is 1, the AG is sending audio to the HF
+ *  Bit 2 - If it is 1, the AG is processing the audio input
+ *  If @kconfig{CONFIG_BT_HFP_AG_ENH_VOICE_RECG} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param ag HFP AG object.
+ *  @param state The value of `<vrecstate>`.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_vre_state(struct bt_hfp_ag *ag, uint8_t state);
+
+/** @brief set voice recognition engine state and textual representation
+ *
+ *  It is used to set the voice recognition engine state with
+ *  textual representation.
+ *  unsolicited result code `+BVRA: 1,<vrecstate>,
+ *  <textualRepresentation>` will be sent.
+ *  `<vrecstate>` is same as parameter `state` of function
+ *  `bt_hfp_ag_vre_state`.
+ *  `<textualRepresentation>: <textID>,<textType>,<textOperation>,
+ *  <string>`.
+ *  `<textID>`: Unique ID of the current text as a hexadecimal string
+ *  (a maximum of 4 characters in length, but less than 4 characters
+ *  in length is valid).
+ *  `<textType>`: ID of the textType from the following list:
+ *  0 - Text recognized by the AG from the audio input provided by the HF
+ *  1 - Text of the audio output from the AG
+ *  2 - Text of the audio output from the AG that contains a question
+ *  3 - Text of the audio output from the AG that contains an error
+ *      description
+ *  `<textOperation>`: ID of the operation of the text
+ *  1 - NewText: Indicates that a new text started. Shall be used when the
+ *               `<textID>` changes
+ *  2 - Replace: Replace any existing text with the same `<textID>` and
+ *               same `<textType>`
+ *  3 - Append: Attach new text to existing text and keep the same
+ *              `<textID>` and same `<textType>`
+ *  `<string>`: The `<string>` parameter shall be a UTF-8 text string and
+ *  shall always be contained within double quotes.
+ *  If @kconfig{CONFIG_BT_HFP_AG_VOICE_RECG_TEXT} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param ag HFP AG object.
+ *  @param state The value of `<vrecstate>`.
+ *  @param id Value of `<textID>`.
+ *  @param type Value of `<textType>`.
+ *  @param operation Value of `<textOperation>`.
+ *  @param text Value of `<string>`.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_vre_textual_representation(struct bt_hfp_ag *ag, uint8_t state, const char *id,
+					 uint8_t type, uint8_t operation, const char *text);
+
+/** @brief Set signal strength
+ *
+ *  Set signal strength.
+ *
+ *  @param ag HFP AG object.
+ *  @param strength Signal strength.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_signal_strength(struct bt_hfp_ag *ag, uint8_t strength);
+
+/** @brief Set roaming status
+ *
+ *  Set roaming status.
+ *
+ *  @param ag HFP AG object.
+ *  @param status Roaming status.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_roaming_status(struct bt_hfp_ag *ag, uint8_t status);
+
+/** @brief Set battery level
+ *
+ *  Set battery level.
+ *
+ *  @param ag HFP AG object.
+ *  @param level battery level.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_battery_level(struct bt_hfp_ag *ag, uint8_t level);
+
+/** @brief Set service availability
+ *
+ *  Set service availability.
+ *
+ *  @param ag HFP AG object.
+ *  @param available service availability
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_ag_service_availability(struct bt_hfp_ag *ag, bool available);
+
+/** @brief Activate/deactivate HF indicator
+ *
+ *  It allows HF to issue the +BIND unsolicited result code to
+ *  activate/deactivate of the AG’s supported HF Indicators.
+ *  The indicator of supported indicators can be activated/deactivated
+ *  are defined in `enum hfp_ag_hf_indicators`.
+ *  `BT_HFP_AG_HF_INDICATOR_ENH_SAFETY` is used to support
+ *  `Enhanced Safety`. Only the configuration has been enabled, the
+ *  `indicator` can be HFP_AG_ENHANCED_SAFETY_IND.
+ *  `BT_HFP_AG_HF_INDICATOR_BATTERY` is used to support
+ *  `Remaining level of Battery`. Only the configuration has been
+ *  enabled, the `indicator` can be HFP_AG_BATTERY_LEVEL_IND.
+ *  If @kconfig{CONFIG_BT_HFP_HF_HF_INDICATORS} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
  *  @param ag HFP AG object.
+ *  @param indicator The indicator of the AG’s supported HF Indicators.
+ *  @param enable enable/disable specific HF Indicator.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_ag_remote_terminate(struct bt_hfp_ag *ag);
+int bt_hfp_ag_hf_indicator(struct bt_hfp_ag *ag, enum hfp_ag_hf_indicators indicator, bool enable);
 
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/bluetooth/classic/hfp_hf.h b/include/zephyr/bluetooth/classic/hfp_hf.h
index ded881351ca29..3a6dd4fc8f59f 100644
--- a/include/zephyr/bluetooth/classic/hfp_hf.h
+++ b/include/zephyr/bluetooth/classic/hfp_hf.h
@@ -23,27 +23,14 @@
 extern "C" {
 #endif
 
-/* AT Commands */
-enum bt_hfp_hf_at_cmd {
-	BT_HFP_HF_ATA,
-	BT_HFP_HF_AT_CHUP,
-};
+/* HFP CODEC IDs */
+#define BT_HFP_HF_CODEC_CVSD    0x01
+#define BT_HFP_HF_CODEC_MSBC    0x02
+#define BT_HFP_HF_CODEC_LC3_SWB 0x03
 
-/*
- * Command complete types for the application
- */
-#define HFP_HF_CMD_OK             0
-#define HFP_HF_CMD_ERROR          1
-#define HFP_HF_CMD_CME_ERROR      2
-#define HFP_HF_CMD_UNKNOWN_ERROR  4
-
-/** @brief HFP HF Command completion field */
-struct bt_hfp_hf_cmd_complete {
-	/* Command complete status */
-	uint8_t type;
-	/* CME error number to be added */
-	uint8_t cme;
-};
+struct bt_hfp_hf;
+
+struct bt_hfp_hf_call;
 
 /** @brief HFP profile application callback */
 struct bt_hfp_hf_cb {
@@ -53,32 +40,35 @@ struct bt_hfp_hf_cb {
 	 *  connection completes.
 	 *
 	 *  @param conn Connection object.
+	 *  @param hf HFP HF object.
 	 */
-	void (*connected)(struct bt_conn *conn);
+	void (*connected)(struct bt_conn *conn, struct bt_hfp_hf *hf);
 	/** HF disconnected callback to application
 	 *
 	 *  If this callback is provided it will be called whenever the
 	 *  connection gets disconnected, including when a connection gets
 	 *  rejected or cancelled or any error in SLC establishment.
+	 *  And the HFP HF object will be freed after the registered
+	 *  callback `disconnected` returned.
 	 *
-	 *  @param conn Connection object.
+	 *  @param hf HFP HF object.
 	 */
-	void (*disconnected)(struct bt_conn *conn);
+	void (*disconnected)(struct bt_hfp_hf *hf);
 	/** HF SCO/eSCO connected Callback
 	 *
 	 *  If this callback is provided it will be called whenever the
 	 *  SCO/eSCO connection completes.
 	 *
-	 *  @param conn Connection object.
+	 *  @param hf HFP HF object.
 	 *  @param sco_conn SCO/eSCO Connection object.
 	 */
-	void (*sco_connected)(struct bt_conn *conn, struct bt_conn *sco_conn);
+	void (*sco_connected)(struct bt_hfp_hf *hf, struct bt_conn *sco_conn);
 	/** HF SCO/eSCO disconnected Callback
 	 *
 	 *  If this callback is provided it will be called whenever the
 	 *  SCO/eSCO connection gets disconnected.
 	 *
-	 *  @param conn Connection object.
+	 *  @param conn SCO/eSCO Connection object.
 	 *  @param reason BT_HCI_ERR_* reason for the disconnection.
 	 */
 	void (*sco_disconnected)(struct bt_conn *sco_conn, uint8_t reason);
@@ -86,75 +76,346 @@ struct bt_hfp_hf_cb {
 	 *
 	 *  This callback provides service indicator value to the application
 	 *
-	 *  @param conn Connection object.
+	 *  @param hf HFP HF object.
 	 *  @param value service indicator value received from the AG.
 	 */
-	void (*service)(struct bt_conn *conn, uint32_t value);
-	/** HF indicator Callback
+	void (*service)(struct bt_hfp_hf *hf, uint32_t value);
+	/** HF call outgoing Callback
 	 *
-	 *  This callback provides call indicator value to the application
+	 *  This callback provides the outgoing call status to
+	 *  the application.
 	 *
-	 *  @param conn Connection object.
-	 *  @param value call indicator value received from the AG.
+	 *  @param hf HFP HF object.
+	 *  @param call HFP HF call object.
 	 */
-	void (*call)(struct bt_conn *conn, uint32_t value);
-	/** HF indicator Callback
+	void (*outgoing)(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call);
+	/** HF call outgoing call is ringing Callback
 	 *
-	 *  This callback provides call setup indicator value to the application
+	 *  This callback provides the outgoing call is ringing
+	 *  status to the application.
 	 *
-	 *  @param conn Connection object.
-	 *  @param value call setup indicator value received from the AG.
+	 *  @param call HFP HF call object.
 	 */
-	void (*call_setup)(struct bt_conn *conn, uint32_t value);
-	/** HF indicator Callback
+	void (*remote_ringing)(struct bt_hfp_hf_call *call);
+	/** HF call incoming Callback
 	 *
-	 *  This callback provides call held indicator value to the application
+	 *  This callback provides the incoming call status to
+	 *  the application.
 	 *
-	 *  @param conn Connection object.
-	 *  @param value call held indicator value received from the AG.
+	 *  @param hf HFP HF object.
+	 *  @param call HFP HF call object.
+	 */
+	void (*incoming)(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call);
+	/** HF incoming call on hold Callback
+	 *
+	 *  This callback provides the incoming call on hold status to
+	 *  the application.
+	 *
+	 *  @param call HFP HF call object.
+	 */
+	void (*incoming_held)(struct bt_hfp_hf_call *call);
+	/** HF call accept Callback
+	 *
+	 *  This callback provides the incoming/outgoing call active
+	 *  status to the application.
+	 *
+	 *  @param call HFP HF call object.
 	 */
-	void (*call_held)(struct bt_conn *conn, uint32_t value);
+	void (*accept)(struct bt_hfp_hf_call *call);
+	/** HF call reject Callback
+	 *
+	 *  This callback provides the incoming/outgoing call reject
+	 *  status to the application.
+	 *
+	 *  @param call HFP HF call object.
+	 */
+	void (*reject)(struct bt_hfp_hf_call *call);
+	/** HF call terminate Callback
+	 *
+	 *  This callback provides the incoming/outgoing call terminate
+	 *  status to the application.
+	 *
+	 *  @param call HFP HF call object.
+	 */
+	void (*terminate)(struct bt_hfp_hf_call *call);
+	/** HF call held Callback
+	 *
+	 *  This callback provides call held to the application
+	 *
+	 *  @param call HFP HF call object.
+	 */
+	void (*held)(struct bt_hfp_hf_call *call);
+	/** HF call retrieve Callback
+	 *
+	 *  This callback provides call retrieved to the application
+	 *
+	 *  @param call HFP HF call object.
+	 */
+	void (*retrieve)(struct bt_hfp_hf_call *call);
 	/** HF indicator Callback
 	 *
 	 *  This callback provides signal indicator value to the application
 	 *
-	 *  @param conn Connection object.
+	 *  @param hf HFP HF object.
 	 *  @param value signal indicator value received from the AG.
 	 */
-	void (*signal)(struct bt_conn *conn, uint32_t value);
+	void (*signal)(struct bt_hfp_hf *hf, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback provides roaming indicator value to the application
 	 *
-	 *  @param conn Connection object.
+	 *  @param hf HFP HF object.
 	 *  @param value roaming indicator value received from the AG.
 	 */
-	void (*roam)(struct bt_conn *conn, uint32_t value);
+	void (*roam)(struct bt_hfp_hf *hf, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback battery service indicator value to the application
 	 *
-	 *  @param conn Connection object.
+	 *  @param hf HFP HF object.
 	 *  @param value battery indicator value received from the AG.
 	 */
-	void (*battery)(struct bt_conn *conn, uint32_t value);
+	void (*battery)(struct bt_hfp_hf *hf, uint32_t value);
 	/** HF incoming call Ring indication callback to application
 	 *
 	 *  If this callback is provided it will be called whenever there
 	 *  is an incoming call.
 	 *
-	 *  @param conn Connection object.
+	 *  @param call HFP HF call object.
 	 */
-	void (*ring_indication)(struct bt_conn *conn);
-	/** HF notify command completed callback to application
+	void (*ring_indication)(struct bt_hfp_hf_call *call);
+	/** HF call dialing Callback
 	 *
-	 *  The command sent from the application is notified about its status
+	 *  This callback provides call dialing result to the application.
 	 *
-	 *  @param conn Connection object.
-	 *  @param cmd structure contains status of the command including cme.
+	 *  @param hf HFP HF object.
+	 *  @param err Result of calling dialing.
+	 */
+	void (*dialing)(struct bt_hfp_hf *hf, int err);
+	/** HF calling line identification notification callback to application
+	 *
+	 *  If this callback is provided it will be called whenever there
+	 *  is a unsolicited result code +CLIP.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_CLI} is not enabled, the unsolicited
+	 *  result code +CLIP will be ignored. And the callback will not be
+	 *  notified.
+	 *
+	 *  @param call HFP HF call object.
+	 *  @param number Notified phone number.
+	 *  @param type Specify the format of the phone number.
+	 */
+	void (*clip)(struct bt_hfp_hf_call *call, char *number, uint8_t type);
+	/** HF microphone gain notification callback to application
+	 *
+	 *  If this callback is provided it will be called whenever there
+	 *  is a unsolicited result code +VGM.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_VOLUME} is not enabled, the unsolicited
+	 *  result code +VGM will be ignored. And the callback will not be
+	 *  notified.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param gain Microphone gain.
+	 */
+	void (*vgm)(struct bt_hfp_hf *hf, uint8_t gain);
+	/** HF speaker gain notification callback to application
+	 *
+	 *  If this callback is provided it will be called whenever there
+	 *  is a unsolicited result code +VGS.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_VOLUME} is not enabled, the unsolicited
+	 *  result code +VGS will be ignored. And the callback will not be
+	 *  notified.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param gain Speaker gain.
+	 */
+	void (*vgs)(struct bt_hfp_hf *hf, uint8_t gain);
+	/** HF in-band ring tone notification callback to application
+	 *
+	 *  If this callback is provided it will be called whenever there
+	 *  is a unsolicited result code +BSIR issued by the AG to
+	 *  indicate to the HF that the in-band ring tone setting
+	 *  has been locally changed.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param inband In-band ring tone status from the AG.
+	 */
+	void (*inband_ring)(struct bt_hfp_hf *hf, bool inband);
+	/** HF network operator notification callback to application
+	 *
+	 *  If this callback is provided it will be called whenever there
+	 *  is a response code +COPS issued by the AG to
+	 *  response the AT+COPS? command issued by the HF by calling
+	 *  function `bt_hfp_hf_get_operator`.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param mode Current mode.
+	 *  @param format Format of the `operator` parameter string.
+	 *                It should be zero.
+	 *  @param operator A string in alphanumeric format
+	 *                  representing the name of the network
+	 *                  operator.
+	 */
+	void (*operator)(struct bt_hfp_hf *hf, uint8_t mode, uint8_t format, char *operator);
+	/** Codec negotiate callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  unsolicited codec negotiation response received.
+	 *  There are two cases when the callback triggered,
+	 *  Case 1, the codec id can be accepted, the function
+	 *  `bt_hfp_hf_select_codec` should be called to accept the codec
+	 *  id.
+	 *  Case 2, the codec id can not be accepted, the function
+	 *  `bt_hfp_hf_set_codecs` should be called to trigger codec ID
+	 *  to be re-selected.
+	 *  If the callback is not provided by application, the function
+	 *  `bt_hfp_hf_select_codec` will be called to accept the codec
+	 *  id.
+	 *  Refers to BT_HFP_HF_CODEC_XXX for codec id value.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_CODEC_NEG} is not enabled, the
+	 *  unsolicited result code +BCS will be ignored. And the callback
+	 *  will not be notified.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param id Negotiated Codec ID.
+	 */
+	void (*codec_negotiate)(struct bt_hfp_hf *hf, uint8_t id);
+	/** HF ECNR turns off callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  response of ECNR turning off is received from AG.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_ECNR} is not enabled, the
+	 *  callback will not be notified.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param err The result of request.
+	 */
+	void (*ecnr_turn_off)(struct bt_hfp_hf *hf, int err);
+	/** HF call waiting notification callback to application
+	 *
+	 *  If this callback is provided it will be called whenever there
+	 *  is a unsolicited result code +CCWA.
+	 *  This notification can be enabled/disabled by calling function
+	 *  `bt_hfp_hf_call_waiting_notify`.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the
+	 *  unsolicited result code +CCWA will be ignored. And the callback
+	 *  will not be notified.
+	 *
+	 *  @param call HFP HF call object.
+	 *  @param number Notified phone number.
+	 *  @param type Specify the format of the phone number.
+	 */
+	void (*call_waiting)(struct bt_hfp_hf_call *call, char *number, uint8_t type);
+	/** Voice recognition activation/deactivation callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  unsolicited result code +BVRA is notified the HF when the
+	 *  voice recognition function in the AG is activated/deactivated
+	 *  autonomously from the AG.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_VOICE_RECG} is not enabled, the
+	 *  unsolicited result code +BVRA will be ignored. And the callback
+	 *  will not be notified.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param activate Voice recognition activation/deactivation.
+	 */
+	void (*voice_recognition)(struct bt_hfp_hf *hf, bool activate);
+	/** Voice recognition engine state callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  unsolicited result code `+BVRA: 1,<vrecstate>` is received from AG.
+	 *  `<vrecstate>`: Bitmask that reflects the current state of the voice
+	 *  recognition engine on the AG.
+	 *  Bit 0 - If it is 1, the AG is ready to accept audio input
+	 *  Bit 1 - If it is 1, the AG is sending audio to the HF
+	 *  Bit 2 - If it is 1, the AG is processing the audio input
+	 *  If @kconfig{CONFIG_BT_HFP_HF_ENH_VOICE_RECG} is not enabled, the
+	 *  unsolicited result code +BVRA will be ignored. And the callback
+	 *  will not be notified.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param state Value of `<vrecstate>`.
 	 */
-	void (*cmd_complete_cb)(struct bt_conn *conn,
-			      struct bt_hfp_hf_cmd_complete *cmd);
+	void (*vre_state)(struct bt_hfp_hf *hf, uint8_t state);
+	/** Textual representation callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  unsolicited result code `+BVRA: 1,<vrecstate>,
+	 *  <textualRepresentation>` is received from AG.
+	 *  `<textualRepresentation>: <textID>,<textType>,<textOperation>,
+	 *  <string>`.
+	 *  `<textID>`: Unique ID of the current text as a hexadecimal string
+	 *  (a maximum of 4 characters in length, but less than 4 characters
+	 *  in length is valid).
+	 *  `<textType>`: ID of the textType from the following list:
+	 *  0 - Text recognized by the AG from the audio input provided by the HF
+	 *  1 - Text of the audio output from the AG
+	 *  2 - Text of the audio output from the AG that contains a question
+	 *  3 - Text of the audio output from the AG that contains an error
+	 *      description
+	 *  `<textOperation>`: ID of the operation of the text
+	 *  1 - NewText: Indicates that a new text started. Shall be used when the
+	 *               `<textID>` changes
+	 *  2 - Replace: Replace any existing text with the same `<textID>` and
+	 *               same `<textType>`
+	 *  3 - Append: Attach new text to existing text and keep the same
+	 *              `<textID>` and same `<textType>`
+	 *  `<string>`: The `<string>` parameter shall be a UTF-8 text string and
+	 *  shall always be contained within double quotes.
+	 *  If @kconfig{CONFIG_BT_HFP_HF_VOICE_RECG_TEXT} is not enabled, the
+	 *  unsolicited result code +BVRA will be ignored. And the callback
+	 *  will not be notified.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param id Value of `<textID>`.
+	 *  @param type Value of `<textType>`.
+	 *  @param operation Value of `<textOperation>`.
+	 *  @param text Value of `<string>`.
+	 */
+	void (*textual_representation)(struct bt_hfp_hf *hf, char *id, uint8_t type,
+				       uint8_t operation, char *text);
+	/** Request phone number callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  result code `+BINP: <Phone number>` is received from AG.
+	 *  If the request is failed, the `number` will be NULL.
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param number Value of `<Phone number>`.
+	 */
+	void (*request_phone_number)(struct bt_hfp_hf *hf, const char *number);
+
+	/** Query subscriber number callback
+	 *
+	 *  If this callback is provided it will be called whenever the
+	 *  result code `+CUNM: [<alpha>],<number>, <type>,[<speed> ,<service>]`
+	 *  is received from AG.
+	 *  `<alpha>`: This optional field is not supported, and shall be left
+	 *  blank.
+	 *  `<number>`: Quoted string containing the phone number in the format
+	 *  specified by `<type>`.
+	 *  `<type>` field specifies the format of the phone number provided,
+	 *  and can be one of the following values:
+	 *  - values 128-143: The phone number format may be a national or
+	 *  international format, and may contain prefix and/or escape digits.
+	 *  No changes on the number presentation are required.
+	 *  - values 144-159: The phone number format is an international
+	 *  number, including the country code prefix. If the plus sign ("+")
+	 *  is not included as part of the number and shall be added by the AG
+	 *  as needed.
+	 *  - values 160-175: National number. No prefix nor escape digits
+	 *  included.
+	 *  `<speed>`: This optional field is not supported, and shall be left
+	 *  blank.
+	 *  `<service>`: Indicates which service this phone number relates to.
+	 *  Shall be either 4 (voice) or 5 (fax).
+	 *
+	 *  @param hf HFP HF object.
+	 *  @param number Value of `<number>` without quotes.
+	 *  @param type Value of `<type>`.
+	 *  @param service Value of `<service>`.
+	 */
+	void (*subscriber_number)(struct bt_hfp_hf *hf, const char *number, uint8_t type,
+				  uint8_t service);
 };
 
 /** @brief Register HFP HF profile
@@ -168,16 +429,528 @@ struct bt_hfp_hf_cb {
  */
 int bt_hfp_hf_register(struct bt_hfp_hf_cb *cb);
 
-/** @brief Handsfree client Send AT
+/** @brief Initiate the service level connection establishment procedure
+ *
+ *  Initiate the service level connection establishment procedure on the
+ *  ACL connection specified by the parameter `conn` using the specific
+ *  RFCOMM channel discovered by the function `bt_br_discovery_start`.
+ *
+ *  The parameter `hf` is a output parameter. When the service level
+ *  connection establishment procedure is initiated without any error,
+ *  the HFP HF object is allocated and it will be returned via the parameter
+ *  `hf` if the parameter `hf` is not a NULL pointer.
+ *
+ *  When service level conenction is established, the registered callback
+ *  `connected` will be triggered to notify the application that the service
+ *  level connection establishment procedure is done. And the HFP HF object
+ *  is valid at this time. It means after the function is called without
+ *  any error, all interfaces provided by HFP HF can only be called after
+ *  the registered callback `connected` is triggered.
+ *
+ *  @param conn ACL connection object.
+ *  @param hf Created HFP HF object.
+ *  @param channel Peer RFCOMM channel to be connected.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_connect(struct bt_conn *conn, struct bt_hfp_hf **hf, uint8_t channel);
+
+/** @brief Release the service level connection
+ *
+ *  Release the service level connection from the peer device.
+ *
+ *  The function can only be called after the registered callback `connected`
+ *  is triggered.
+ *
+ *  If the function is called without any error, the HFP HF object is
+ *  invalid at this time. All interfaces provided by HFP HF should not
+ *  be called anymore.
+ *
+ *  If the service level connection is released, the registered callback
+ *  `disconnected` will be triggered to notify the application that the
+ *  service level connection release procedure is done. And the HFP HF
+ *  object will be freed after the registered callback `disconnected`
+ *  returned.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_disconnect(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF enable/disable Calling Line Identification (CLI) Notification
+ *
+ *  Enable/disable Calling Line Identification (CLI) Notification.
+ *  The AT command `AT+CLIP` will be sent to the AG to enable/disable the CLI
+ *  unsolicited result code +CLIP when calling the function.
+ *  If @kconfig{CONFIG_BT_HFP_HF_CLI} is not enabled, the error `-ENOTSUP` will
+ *  be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *  @param enable Enable/disable CLI.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_cli(struct bt_hfp_hf *hf, bool enable);
+
+/** @brief Handsfree HF report Gain of Microphone (VGM)
+ *
+ *  Report Gain of Microphone (VGM).
+ *  The AT command `AT+VGM=<gain>` will be sent to the AG to report its
+ *  current microphone gain level setting to the AG.
+ *  `<gain>` is a decimal numeric constant, relating to a particular
+ *  (implementation dependent) volume level controlled by the HF.
+ *  This command does not change the microphone gain of the AG; it simply
+ *  indicates the current value of the microphone gain in the HF.
+ *  If @kconfig{CONFIG_BT_HFP_HF_VOLUME} is not enabled, the error `-ENOTSUP`
+ *  will be returned if the function called.
+ *  For "Volume Level Synchronization", the HF application could call
+ *  the function to set VGM gain value in HF connection callback
+ *  function. Then after the HF connection callback returned, VGM gain
+ *  will be sent to HFP AG.
+ *
+ *  @param hf HFP HF object.
+ *  @param gain Gain of microphone.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_vgm(struct bt_hfp_hf *hf, uint8_t gain);
+
+/** @brief Handsfree HF report Gain of Speaker (VGS)
+ *
+ *  Report Gain of Speaker (VGS).
+ *  The AT command `AT+VGS=<gain>` will be sent to the AG to report its
+ *  current speaker gain level setting to the AG.
+ *  `<gain>` is a decimal numeric constant, relating to a particular
+ *  (implementation dependent) volume level controlled by the HF.
+ *  This command does not change the speaker gain of the AG; it simply
+ *  indicates the current value of the speaker gain in the HF.
+ *  If @kconfig{CONFIG_BT_HFP_HF_VOLUME} is not enabled, the error `-ENOTSUP`
+ *  will be returned if the function called.
+ *  For "Volume Level Synchronization", the HF application could call
+ *  the function to set VGS gain value in HF connection callback
+ *  function. Then after the HF connection callback returned, VGS gain
+ *  will be sent to HFP AG.
+ *
+ *  @param hf HFP HF object.
+ *  @param gain Gain of speaker.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_vgs(struct bt_hfp_hf *hf, uint8_t gain);
+
+/** @brief Handsfree HF requests currently selected operator
+ *
+ *  Send the AT+COPS? (Read) command to find the currently
+ *  selected operator.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_get_operator(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF accept the incoming call
+ *
+ *  Send the ATA command to accept the incoming call.
+ *  OR, send the AT+BTRH=1 command to accept a held incoming
+ *  call.
+ *
+ *  @note It cannot be used when multiple calls are ongoing.
+ *
+ *  @param call HFP HF call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_accept(struct bt_hfp_hf_call *call);
+
+/** @brief Handsfree HF reject the incoming call
+ *
+ *  Send the AT+CHUP command to reject the incoming call.
+ *  OR, send the AT+BTRH=2 command to reject a held incoming
+ *  call.
+ *
+ *  @note It cannot be used when multiple calls are ongoing.
+ *
+ *  @param call HFP HF call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_reject(struct bt_hfp_hf_call *call);
+
+/** @brief Handsfree HF terminate the incoming call
+ *
+ *  Send the AT+CHUP command to terminate the incoming call.
+ *
+ *  @note It cannot be used when multiple calls are ongoing.
+ *
+ *  @param call HFP HF call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_terminate(struct bt_hfp_hf_call *call);
+
+/** @brief Handsfree HF put the incoming call on hold
+ *
+ *  Send the AT+BTRH=0 command to put the incoming call on hold.
+ *  If the incoming call has been held, the callback `on_hold` will
+ *  be triggered.
+ *
+ *  @note It cannot be used when multiple calls are ongoing.
+ *
+ *  @param call HFP HF call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_hold_incoming(struct bt_hfp_hf_call *call);
+
+/** @brief Handsfree HF query respond and hold status of AG
+ *
+ *  Send the AT+BTRH? command to query respond and hold status of AG.
+ *  The status respond and hold will be notified through callback
+ *  `on_hold`.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_query_respond_hold_status(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF phone number call
+ *
+ *  Initiate outgoing voice calls by providing the destination phone
+ *  number to the AG.
+ *  Send the ATDdd…dd command to start phone number call.
+ *  The result of the command will be notified through the callback
+ *  `dialing`.
+ *
+ *  @param hf HFP HF object.
+ *  @param number Phone number.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_number_call(struct bt_hfp_hf *hf, const char *number);
+
+/** @brief Handsfree HF memory dialing call
+ *
+ *  Initiate outgoing voice calls using the memory dialing feature
+ *  of the AG.
+ *  Send the ATD>Nan... command to start memory dialing.
+ *  The result of the command will be notified through the callback
+ *  `dialing`.
+ *
+ *  @param hf HFP HF object.
+ *  @param location Memory location.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_memory_dial(struct bt_hfp_hf *hf, const char *location);
+
+/** @brief Handsfree HF redial last number
+ *
+ *  Initiate outgoing voice calls by recalling the last number
+ *  dialed by the AG.
+ *  Send the AT+BLDN command to recall the last number.
+ *  The result of the command will be notified through the callback
+ *  `dialing`.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_redial(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF setup audio connection
+ *
+ *  Setup audio conenction by sending AT+BCC.
+ *  If @kconfig{CONFIG_BT_HFP_HF_CODEC_NEG} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_audio_connect(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF set selected codec id
+ *
+ *  Set selected codec id by sending AT+BCS. The function is used to
+ *  response the codec negotiation request notified by callback
+ *  `codec_negotiate`. The parameter `codec_id` should be same as
+ *  `id` of callback `codec_negotiate` if the id could be supported.
+ *  Or, call `bt_hfp_hf_set_codecs` to notify the AG Codec IDs supported
+ *  by HFP HF.
+ *  If @kconfig{CONFIG_BT_HFP_HF_CODEC_NEG} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *  @param codec_id Selected codec id.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_select_codec(struct bt_hfp_hf *hf, uint8_t codec_id);
+
+/** @brief Handsfree HF set supported codec ids
+ *
+ *  Set supported codec ids by sending AT+BAC. This function is used
+ *  to notify AG the supported Codec IDs of HF.
+ *  If @kconfig{CONFIG_BT_HFP_HF_CODEC_NEG} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *  @param codec_ids Supported codec IDs.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_set_codecs(struct bt_hfp_hf *hf, uint8_t codec_ids);
+
+/** @brief Handsfree HF turns off AG's EC and NR
+ *
+ *  Turn off the AG's EC and NR by sending `AT+NREC=0`.
+ *  The result of the command is notified through the callback
+ *  `ecnr_turn_off`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_ECNR} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_turn_off_ecnr(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF enable/disable call waiting notification
+ *
+ *  Enable call waiting notification by sending `AT+CCWA=1`.
+ *  Disable call waiting notification by sending `AT+CCWA=0`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *  @param enable Enable/disable.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_call_waiting_notify(struct bt_hfp_hf *hf, bool enable);
+
+/** @brief Handsfree HF release all held calls
+ *
+ *  Release all held calls by sending `AT+CHLD=0`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_release_all_held(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF set User Determined User Busy (UDUB) for a waiting call
+ *
+ *  Set User Determined User Busy (UDUB) for a waiting call
+ *  by sending `AT+CHLD=0`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_set_udub(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF release all active calls and accept other call
+ *
+ *  Release all active calls (if any exist) and accepts the other
+ *  (held or waiting) call by sending `AT+CHLD=1`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_release_active_accept_other(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF hold all active calls and accept other call
+ *
+ *  Hold all active calls (if any exist) and accepts the other
+ *  (held or waiting) call by sending `AT+CHLD=2`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_hold_active_accept_other(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF add a held call to the conversation
+ *
+ *  Add a held call to the conversation by sending `AT+CHLD=3`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_join_conversation(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF explicit call transfer
+ *
+ *  Connects the two calls and disconnects the subscriber from
+ *  both calls (Explicit Call Transfer) by sending `AT+CHLD=4`.
+ *  If @kconfig{CONFIG_BT_HFP_HF_3WAY_CALL} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_explicit_call_transfer(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF release call with specified index
+ *
+ *  Release call with specified index by sending `AT+CHLD=1<idx>`.
+ *  `<idx>` is index of specified call.
+ *  If @kconfig{CONFIG_BT_HFP_HF_ECC} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param call HFP HF call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_release_specified_call(struct bt_hfp_hf_call *call);
+
+/** @brief Handsfree HF request private consultation mode with specified call
+ *
+ *  Request private consultation mode with specified call (Place all calls
+ *  on hold EXCEPT the call indicated by `<idx>`.) by sending
+ *  `AT+CHLD=2<idx>`.
+ *  `<idx>` is index of specified call.
+ *  If @kconfig{CONFIG_BT_HFP_HF_ECC} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param call HFP HF call object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_private_consultation_mode(struct bt_hfp_hf_call *call);
+
+/** @brief Handsfree HF enable/disable the voice recognition function
+ *
+ *  Enables/disables the voice recognition function in the AG.
+ *  If @kconfig{CONFIG_BT_HFP_HF_VOICE_RECG} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *  @param activate Activate/deactivate the voice recognition function.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_voice_recognition(struct bt_hfp_hf *hf, bool activate);
+
+/** @brief Handsfree HF indicate that the HF is ready to accept audio
+ *
+ *  This value indicates that the HF is ready to accept audio when
+ *  the Audio Connection is first established. The HF shall only send
+ *  this value if the eSCO link has been established.
+ *  If @kconfig{CONFIG_BT_HFP_HF_ENH_VOICE_RECG} is not enabled, the error
+ *  `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_ready_to_accept_audio(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF attach a phone number for a voice tag
+ *
+ *  Send AT command "AT+BINP=1" to request phone number to the AG.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_request_phone_number(struct bt_hfp_hf *hf);
+
+/** @brief Handsfree HF Transmit A specific DTMF Code
+ *
+ *  During an ongoing call, the HF transmits the AT+VTS command to
+ *  instruct the AG to transmit a specific DTMF code to its network
+ *  connection.
+ *  The set of the code is "0-9,#,*,A-D".
+ *
+ *  @param call HFP HF call object.
+ *  @param code A specific DTMF code.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_transmit_dtmf_code(struct bt_hfp_hf_call *call, char code);
+
+/** @brief Handsfree HF Query Subscriber Number Information
+ *
+ *  It allows HF to query the AG subscriber number by sending `AT+CNUM`.
+ *
+ *  @param hf HFP HF object.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_query_subscriber(struct bt_hfp_hf *hf);
+
+/* HFP HF Indicators */
+enum hfp_hf_ag_indicators {
+	HF_SERVICE_IND = 0, /* AG service indicator */
+	HF_CALL_IND,        /* AG call indicator */
+	HF_CALL_SETUP_IND,  /* AG call setup indicator */
+	HF_CALL_HELD_IND,   /* AG call held indicator */
+	HF_SIGNAL_IND,      /* AG signal indicator */
+	HF_ROAM_IND,        /* AG roaming indicator */
+	HF_BATTERY_IND      /* AG battery indicator */
+};
+
+/** @brief Handsfree HF set AG indicator activated/deactivated status
+ *
+ *  It allows HF to issue the AT+BIA command if it needs to change the
+ *  activated/deactivated status of indicators in the AG.
+ *  The index of all indicators can be activated/deactivated are
+ *  defined in `enum hfp_hf_ag_indicators`.
+ *  The each bit of parameter `status` represents the indicator status
+ *  corresponding to the index. Such as, value 0b111110 of `status`
+ *  means the AG indicator `service` is required to be deactivated.
+ *  Others are required to be activated.
+ *
+ *  @param hf HFP HF object.
+ *  @param status The activated/deactivated bitmap status of AG indicators.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_indicator_status(struct bt_hfp_hf *hf, uint8_t status);
+
+/** @brief Handsfree HF enable/disable enhanced safety
+ *
+ *  It allows HF to transfer of HF indicator enhanced safety value.
+ *  If @kconfig{CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY} is not enabled,
+ *  the error `-ENOTSUP` will be returned if the function called.
+ *
+ *  @param hf HFP HF object.
+ *  @param enable The enhanced safety is enabled/disabled.
+ *
+ *  @return 0 in case of success or negative value in case of error.
+ */
+int bt_hfp_hf_enhanced_safety(struct bt_hfp_hf *hf, bool enable);
+
+/** @brief Handsfree HF remaining battery level
  *
- *  Send specific AT commands to handsfree client profile.
+ *  It allows HF to transfer of HF indicator remaining battery level value.
+ *  If @kconfig{CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY} is not enabled,
+ *  the error `-ENOTSUP` will be returned if the function called.
  *
- *  @param conn Connection object.
- *  @param cmd AT command to be sent.
+ *  @param hf HFP HF object.
+ *  @param level The remaining battery level.
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_hfp_hf_send_cmd(struct bt_conn *conn, enum bt_hfp_hf_at_cmd cmd);
+int bt_hfp_hf_battery(struct bt_hfp_hf *hf, uint8_t level);
 
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/bluetooth/conn.h b/include/zephyr/bluetooth/conn.h
index 070fd1ef25be9..82f6a8d277049 100644
--- a/include/zephyr/bluetooth/conn.h
+++ b/include/zephyr/bluetooth/conn.h
@@ -21,12 +21,16 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/addr.h>
-#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/direction.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/iterable_sections.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -1069,8 +1073,7 @@ bool bt_conn_is_type(const struct bt_conn *conn, enum bt_conn_type type);
  *  @return -EBUSY The remote information is not yet available.
  *  @return -EINVAL @p conn is not a valid @ref BT_CONN_TYPE_LE or @ref BT_CONN_TYPE_BR connection.
  */
-int bt_conn_get_remote_info(struct bt_conn *conn,
-			    struct bt_conn_remote_info *remote_info);
+int bt_conn_get_remote_info(const struct bt_conn *conn, struct bt_conn_remote_info *remote_info);
 
 /** @brief Get connection transmit power level.
  *
@@ -1560,7 +1563,7 @@ enum bt_conn_le_cs_procedure_enable_state {
 	BT_CONN_LE_CS_PROCEDURES_ENABLED = BT_HCI_OP_LE_CS_PROCEDURES_ENABLED,
 };
 
-/** CS Test Tone Antennna Config Selection.
+/** CS Test Tone Antenna Config Selection.
  *
  *  These enum values are indices in the following table, where N_AP is the maximum
  *  number of antenna paths (in the range [1, 4]).
@@ -1588,14 +1591,14 @@ enum bt_conn_le_cs_procedure_enable_state {
  *  - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
  */
 enum bt_conn_le_cs_tone_antenna_config_selection {
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_ACI_0,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_ACI_1,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_ACI_2,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_ACI_3,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_ACI_4,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_ACI_5,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_ACI_6,
-	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_ACI_7,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1 = BT_HCI_OP_LE_CS_ACI_0,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B1 = BT_HCI_OP_LE_CS_ACI_1,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A3_B1 = BT_HCI_OP_LE_CS_ACI_2,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A4_B1 = BT_HCI_OP_LE_CS_ACI_3,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B2 = BT_HCI_OP_LE_CS_ACI_4,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B3 = BT_HCI_OP_LE_CS_ACI_5,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B4 = BT_HCI_OP_LE_CS_ACI_6,
+	BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B2 = BT_HCI_OP_LE_CS_ACI_7,
 };
 
 struct bt_conn_le_cs_procedure_enable_complete {
@@ -1877,35 +1880,50 @@ struct bt_conn_cb {
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
 	/** @brief LE CS Read Remote Supported Capabilities Complete event.
 	 *
-	 *  This callback notifies the application that the remote channel
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Capabilities Exchange procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, the remote channel
 	 *  sounding capabilities have been received from the peer.
 	 *
 	 *  @param conn Connection object.
-	 *  @param remote_cs_capabilities Remote Channel Sounding Capabilities.
+	 *  @param status HCI status of complete event.
+	 *  @param remote_cs_capabilities Pointer to CS Capabilities on success or NULL otherwise.
 	 */
-	void (*le_cs_remote_capabilities_available)(struct bt_conn *conn,
-						    struct bt_conn_le_cs_capabilities *params);
+	void (*le_cs_read_remote_capabilities_complete)(struct bt_conn *conn,
+							uint8_t status,
+							struct bt_conn_le_cs_capabilities *params);
 
 	/** @brief LE CS Read Remote FAE Table Complete event.
 	 *
-	 *  This callback notifies the application that the remote mode-0
+	 *  This callback notifies the application that a Channel Sounding
+	 *  Mode-0 FAE Table Request procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, the remote mode-0
 	 *  FAE Table has been received from the peer.
 	 *
 	 *  @param conn Connection object.
-	 *  @param params FAE Table.
+	 *  @param status HCI status of complete event.
+	 *  @param params Pointer to FAE Table on success or NULL otherwise.
 	 */
-	void (*le_cs_remote_fae_table_available)(struct bt_conn *conn,
-						 struct bt_conn_le_cs_fae_table *params);
+	void (*le_cs_read_remote_fae_table_complete)(struct bt_conn *conn,
+						     uint8_t status,
+						     struct bt_conn_le_cs_fae_table *params);
 
 	/** @brief LE CS Config created.
 	 *
 	 *  This callback notifies the application that a Channel Sounding
-	 *  Configuration procedure has completed and a new CS config is created
+	 *  Configuration procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, a new CS config is created.
 	 *
 	 *  @param conn Connection object.
-	 *  @param config CS configuration.
+	 *  @param status HCI status of complete event.
+	 *  @param config Pointer to CS configuration on success or NULL otherwise.
 	 */
-	void (*le_cs_config_created)(struct bt_conn *conn, struct bt_conn_le_cs_config *config);
+	void (*le_cs_config_complete)(struct bt_conn *conn,
+				      uint8_t status,
+				      struct bt_conn_le_cs_config *config);
 
 	/** @brief LE CS Config removed.
 	 *
@@ -1931,22 +1949,29 @@ struct bt_conn_cb {
 	/** @brief LE CS Security Enabled.
 	 *
 	 *  This callback notifies the application that a Channel Sounding
-	 *  Security Enable procedure has completed
+	 *  Security Enable procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, CS Security is enabled.
 	 *
 	 *  @param conn Connection object.
+	 *  @param status HCI status of complete event.
 	 */
-	void (*le_cs_security_enabled)(struct bt_conn *conn);
+	void (*le_cs_security_enable_complete)(struct bt_conn *conn, uint8_t status);
 
 	/** @brief LE CS Procedure Enabled.
 	 *
 	 *  This callback notifies the application that a Channel Sounding
-	 *  Procedure Enable procedure has completed
+	 *  Procedure Enable procedure has completed.
+	 *
+	 *  If status is BT_HCI_ERR_SUCCESS, CS procedure is enabled.
 	 *
 	 *  @param conn Connection object.
-	 *  @param params CS Procedure Enable parameters
+	 *  @param status HCI status.
+	 *  @param params Pointer to CS Procedure Enable parameters on success or NULL otherwise.
 	 */
-	void (*le_cs_procedure_enabled)(
-		struct bt_conn *conn, struct bt_conn_le_cs_procedure_enable_complete *params);
+	void (*le_cs_procedure_enable_complete)(
+		struct bt_conn *conn, uint8_t status,
+		struct bt_conn_le_cs_procedure_enable_complete *params);
 
 #endif
 
@@ -2443,6 +2468,17 @@ struct bt_conn_auth_info_cb {
 	 */
 	void (*bond_deleted)(uint8_t id, const bt_addr_le_t *peer);
 
+#if defined(CONFIG_BT_CLASSIC)
+	/** @brief Notify that bond of classic has been deleted.
+	 *
+	 *  This callback notifies the application that the bond information of classic
+	 *  for the remote peer has been deleted
+	 *
+	 *  @param peer Remote address.
+	 */
+	void (*br_bond_deleted)(const bt_addr_t *peer);
+#endif /* CONFIG_BT_CLASSIC */
+
 	/** Internally used field for list handling */
 	sys_snode_t node;
 };
@@ -2619,6 +2655,27 @@ struct bt_br_conn_param {
 struct bt_conn *bt_conn_create_br(const bt_addr_t *peer,
 				  const struct bt_br_conn_param *param);
 
+/** @brief Look up an existing BR connection by address.
+ *
+ *  Look up an existing BR connection based on the remote address.
+ *
+ *  The caller gets a new reference to the connection object which must be
+ *  released with bt_conn_unref() once done using the object.
+ *
+ *  @param peer Remote address.
+ *
+ *  @return Connection object or NULL if not found.
+ */
+struct bt_conn *bt_conn_lookup_addr_br(const bt_addr_t *peer);
+
+/** @brief Get destination (peer) address of a connection.
+ *
+ *  @param conn Connection object.
+ *
+ *  @return Destination address if @p conn is a valid @ref BT_CONN_TYPE_BR connection
+ */
+const bt_addr_t *bt_conn_get_dst_br(const struct bt_conn *conn);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/crypto.h b/include/zephyr/bluetooth/crypto.h
index c5cbfd8a0e555..804e496e0e420 100644
--- a/include/zephyr/bluetooth/crypto.h
+++ b/include/zephyr/bluetooth/crypto.h
@@ -19,6 +19,7 @@
  */
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 6e712627a0648..be7918da8ba74 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -22,6 +22,8 @@
 
 #include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/util_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -878,6 +880,27 @@ int bt_le_cs_write_cached_remote_supported_capabilities(
  */
 int bt_le_cs_write_cached_remote_fae_table(struct bt_conn *conn, int8_t remote_fae_table[72]);
 
+/** @brief Get antenna path used for the CS tone exchange
+ *	   when using multiple antenna paths for mode-2 or mode-3
+ *	   CS procedure.
+ *
+ *	   The function implements antenna path permutation defined in
+ *	   Bluetooth Core Specification 6.0, Vol. 6, Part H, Section 4.7.5.
+ *
+ * @note To use this API @kconfig{CONFIG_BT_CHANNEL_SOUNDING} must be set.
+ *
+ * @param n_ap				 The number of antenna paths, range: [1, 4].
+ * @param antenna_path_permutation_index Antenna Path Permutation Index.
+ * @param tone_index			 Index of the tone in the CS step, range [0, n_ap].
+ *					 tone_index = n_ap corresponds to extension slot.
+ *
+ * @return Antenna path used to exchange CS tones, range: [0, 3].
+ * @return -EINVAL if arguments are invalid.
+ */
+int bt_le_cs_get_antenna_path(uint8_t n_ap,
+			      uint8_t antenna_path_permutation_index,
+			      uint8_t tone_index);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/bluetooth/direction.h b/include/zephyr/bluetooth/direction.h
index 59407bc25d8a1..dc77a2933c14e 100644
--- a/include/zephyr/bluetooth/direction.h
+++ b/include/zephyr/bluetooth/direction.h
@@ -9,6 +9,9 @@
 
 #include <stdint.h>
 
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/sys/util_macro.h>
+
 /** Constant Tone Extension (CTE) types. */
 enum bt_df_cte_type {
 	/** Convenience value for purposes where non of CTE types is allowed. */
diff --git a/include/zephyr/bluetooth/ead.h b/include/zephyr/bluetooth/ead.h
index 8aaee2e4136f4..5a9ae1e1ecfb6 100644
--- a/include/zephyr/bluetooth/ead.h
+++ b/include/zephyr/bluetooth/ead.h
@@ -8,8 +8,8 @@
 #ifndef ZEPHYR_INCLUDE_BLUETOOTH_EAD_H_
 #define ZEPHYR_INCLUDE_BLUETOOTH_EAD_H_
 
-#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/bluetooth/gap.h b/include/zephyr/bluetooth/gap.h
index 1b1569e300318..225f0ecc3ccdf 100644
--- a/include/zephyr/bluetooth/gap.h
+++ b/include/zephyr/bluetooth/gap.h
@@ -11,8 +11,8 @@
 #ifndef ZEPHYR_INCLUDE_BLUETOOTH_GAP_H_
 #define ZEPHYR_INCLUDE_BLUETOOTH_GAP_H_
 
-#include <zephyr/sys/util_macro.h>
 #include <zephyr/bluetooth/byteorder.h>
+#include <zephyr/sys/util_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -740,19 +740,27 @@ extern "C" {
  */
 
 /** LE PHY types */
-enum {
+enum bt_gap_le_phy {
 	/** Convenience macro for when no PHY is set. */
 	BT_GAP_LE_PHY_NONE                    = 0,
 	/** LE 1M PHY */
 	BT_GAP_LE_PHY_1M                      = BIT(0),
 	 /** LE 2M PHY */
 	BT_GAP_LE_PHY_2M                      = BIT(1),
-	/** LE Coded PHY */
+	/** LE Coded PHY, coding scheme not specified */
 	BT_GAP_LE_PHY_CODED                   = BIT(2),
+	/** LE Coded S=8 PHY. Only used for advertising reports
+	 * when Kconfig BT_EXT_ADV_CODING_SELECTION is enabled.
+	 */
+	BT_GAP_LE_PHY_CODED_S8                = BIT(3),
+	/** LE Coded S=2 PHY. Only used for advertising reports
+	 * when Kconfig BT_EXT_ADV_CODING_SELECTION is enabled.
+	 */
+	BT_GAP_LE_PHY_CODED_S2                = BIT(4),
 };
 
 /** Advertising PDU types */
-enum {
+enum bt_gap_adv_type {
 	/** Scannable and connectable advertising. */
 	BT_GAP_ADV_TYPE_ADV_IND               = 0x00,
 	/** Directed connectable advertising. */
@@ -768,7 +776,7 @@ enum {
 };
 
 /** Advertising PDU properties */
-enum {
+enum bt_gap_adv_prop {
 	/** Connectable advertising. */
 	BT_GAP_ADV_PROP_CONNECTABLE           = BIT(0),
 	/** Scannable advertising. */
@@ -1046,7 +1054,7 @@ enum {
 	(BT_GAP_US_TO_CONN_EVENT_LEN((_event_len) * USEC_PER_MSEC))
 
 /** Constant Tone Extension (CTE) types */
-enum {
+enum bt_gap_cte {
 	/** Angle of Arrival */
 	BT_GAP_CTE_AOA = 0x00,
 	/** Angle of Departure with 1 us slots */
@@ -1058,7 +1066,7 @@ enum {
 };
 
 /** @brief Peripheral sleep clock accuracy (SCA) in ppm (parts per million) */
-enum {
+enum bt_gap_sca {
 	BT_GAP_SCA_UNKNOWN = 0,   /**< Unknown */
 	BT_GAP_SCA_251_500 = 0,   /**< 251 ppm to 500 ppm */
 	BT_GAP_SCA_151_250 = 1,   /**< 151 ppm to 250 ppm */
diff --git a/include/zephyr/bluetooth/gatt.h b/include/zephyr/bluetooth/gatt.h
index d736c95ae5fe3..214bbb311017e 100644
--- a/include/zephyr/bluetooth/gatt.h
+++ b/include/zephyr/bluetooth/gatt.h
@@ -12,6 +12,9 @@
 
 /**
  * @brief Generic Attribute Profile (GATT)
+ * @details The GATT layer manages the service database by providing APIs for
+ *          service registration and attribute declaration. For more
+ *          information, see @ref bt_gatt_client and @ref bt_gatt_server.
  * @defgroup bt_gatt Generic Attribute Profile (GATT)
  * @ingroup bluetooth
  * @{
@@ -19,15 +22,21 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <string.h>
 
 #include <sys/types.h>
 
-#include <zephyr/sys/slist.h>
-#include <zephyr/sys/util.h>
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/att.h>
+#include <zephyr/sys/atomic.h>
 #include <zephyr/sys/iterable_sections.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,7 +109,7 @@ enum bt_gatt_perm {
 #define BT_GATT_ERR(_att_err) (-(_att_err))
 
 /** GATT attribute write flags */
-enum {
+enum bt_gatt_attr_write_flag {
 	/** @brief Attribute prepare write flag
 	 *
 	 * If set, write callback should only check if the device is
@@ -195,7 +204,7 @@ typedef ssize_t (*bt_gatt_attr_read_func_t)(struct bt_conn *conn,
  *  @param buf    Buffer with the data to write
  *  @param len    Number of bytes in the buffer
  *  @param offset Offset to start writing from
- *  @param flags  Flags (``BT_GATT_WRITE_FLAG_*``)
+ *  @param flags  Flags of type @ref bt_gatt_attr_write_flag
  *
  *  @return Number of bytes written, or in case of an error
  *          ``BT_GATT_ERR()`` with a specific ``BT_ATT_ERR_*`` error code.
@@ -214,17 +223,11 @@ typedef ssize_t (*bt_gatt_attr_write_func_t)(struct bt_conn *conn,
  *  While the formed GATT service is registered with the local
  *  GATT server, pointers to this type can typically be given to
  *  GATT server APIs, like bt_gatt_notify().
- *
- *  @note This type is given as an argument to the
- *  bt_gatt_discover() application callback, but it's not a
- *  proper object of this type. The field @ref perm, and methods
- *  read() and write() are not available, and it's unsound to
- *  pass the pointer to GATT server APIs.
  */
 struct bt_gatt_attr {
-	/** @brief Attribute Type, aka. "UUID"
+	/** @brief Attribute Type
 	 *
-	 *  The Attribute Type determines the interface that can
+	 *  The Attribute Type is a UUID which determines the interface that can
 	 *  be expected from the read() and write() methods and
 	 *  the possible permission configurations.
 	 *
@@ -232,7 +235,8 @@ struct bt_gatt_attr {
 	 *  GATT Characteristic Presentation Format descriptor as
 	 *  specified in Core Specification 3.G.3.3.3.5.
 	 *
-	 *  You can define a new Attribute Type.
+	 *  You can define a new Attribute Type for your application specific
+	 *  use by generating a new UUID for it.
 	 */
 	const struct bt_uuid *uuid;
 
@@ -275,16 +279,13 @@ struct bt_gatt_attr {
 	 */
 	void *user_data;
 
-	/** @brief Attribute Handle or zero, maybe?
+	/** @brief Attribute Handle
 	 *
-	 *  The meaning of this field varies and is not specified here.
-	 *  Some APIs use this field as input/output. It does not always
-	 *  contain the Attribute Handle.
+	 *  The Attribute Handle is an index corresponding to a specific
+	 *  Attribute in the ATT database.
 	 *
 	 *  @note Use bt_gatt_attr_get_handle() for attributes in the
 	 *  local ATT database.
-	 *
-	 *  @sa bt_gatt_discover_func_t about this field.
 	 */
 	uint16_t handle;
 
@@ -294,8 +295,6 @@ struct bt_gatt_attr {
 	 *
 	 *  The permissions are security requirements that must be
 	 *  satisfied before calling read() or write().
-	 *
-	 *  @sa bt_gatt_discover_func_t about this field.
 	 */
 	uint16_t perm: 15;
 
@@ -311,7 +310,12 @@ struct bt_gatt_attr {
 	/** @endcond */
 };
 
-/** @brief GATT Service structure */
+/** @brief Static GATT Service structure
+ *
+ *  Allows the user the declare static GATT Services with the aim of reducing the
+ *  used RAM. The @ref BT_GATT_SERVICE_DEFINE macro can be used to statically
+ *  define and register a service.
+ */
 struct bt_gatt_service_static {
 	/** Service Attributes */
 	const struct bt_gatt_attr *attrs;
@@ -319,31 +323,48 @@ struct bt_gatt_service_static {
 	size_t attr_count;
 };
 
-/** @brief GATT Service structure */
+/** @brief GATT Service structure
+ *
+ *  This structure is used to define GATT services which can be registered and
+ *  unregistered at runtime. See @ref bt_gatt_service_register for when services
+ *  should be registered.
+ */
 struct bt_gatt_service {
 	/** Service Attributes */
 	struct bt_gatt_attr *attrs;
 	/** Service Attribute count */
 	size_t attr_count;
-
+	/** @cond INTERNAL_HIDDEN
+	 *  Field used for list handling.
+	 */
 	sys_snode_t node;
+	/** @endcond */
 };
 
-/** @brief Service Attribute Value. */
+/** @brief Service Attribute Value.
+ *
+ *  This is the data described by the Attribute Type and indexed by the
+ *  Attribute Handle in the database.
+ */
 struct bt_gatt_service_val {
 	/** Service UUID. */
 	const struct bt_uuid *uuid;
-	/** Service end handle. */
+	/** Handle of the last Attribute within the Service. */
 	uint16_t end_handle;
 };
 
-/** @brief Include Attribute Value. */
+/** @brief Include Attribute Value.
+ *
+ *  This structure represents an included service attribute in the GATT
+ *  server. An included service is a service that is referenced within another
+ *  service, allowing for the reuse of common service definitions.
+ */
 struct bt_gatt_include {
 	/** Service UUID. */
 	const struct bt_uuid *uuid;
-	/** Service start handle. */
+	/** Handle of the first attribute within the included service. */
 	uint16_t start_handle;
-	/** Service end handle. */
+	/** Handle of the last attribute within the included service. */
 	uint16_t end_handle;
 };
 
@@ -360,7 +381,11 @@ struct bt_gatt_cb {
 	 */
 	void (*att_mtu_updated)(struct bt_conn *conn, uint16_t tx, uint16_t rx);
 
+	/** @cond INTERNAL_HIDDEN
+	 *  Field used for list handling.
+	 */
 	sys_snode_t node;
+	/** @endcond */
 };
 
 /** @brief GATT authorization callback structure. */
@@ -448,13 +473,17 @@ struct bt_gatt_authorization_cb {
  */
 #define BT_GATT_CHRC_EXT_PROP			0x80
 
-/** @brief Characteristic Attribute Value. */
+/** @brief Attribute Value of a Characteristic Declaration.
+ *
+ *  This is the data associated with the characteristic, and can be read from or
+ *  written to by a GATT client depending on the characteristic properties.
+ */
 struct bt_gatt_chrc {
 	/** Characteristic UUID. */
 	const struct bt_uuid *uuid;
 	/** Characteristic Value handle. */
 	uint16_t value_handle;
-	/** Characteristic properties. */
+	/** Characteristic properties, a bitmap of ``BT_GATT_CHRC_*`` macros. */
 	uint8_t	properties;
 };
 
@@ -462,9 +491,15 @@ struct bt_gatt_chrc {
 #define BT_GATT_CEP_RELIABLE_WRITE		0x0001
 #define BT_GATT_CEP_WRITABLE_AUX		0x0002
 
-/** @brief Characteristic Extended Properties Attribute Value. */
+/** @brief Characteristic Extended Properties Attribute Value.
+ *
+ *  Used in the discovery of standard characteristic descriptor values. Shall
+ *  exist if the @ref BT_GATT_CHRC_EXT_PROP bit is set in the characteristic
+ *  properties. Can be used with the @ref BT_GATT_CEP macro to declare the CEP
+ *  descriptor.
+ */
 struct bt_gatt_cep {
-	/** Characteristic Extended properties */
+	/** Characteristic Extended properties, a bitmap of ``BT_GATT_CEP_*`` macros. */
 	uint16_t properties;
 };
 
@@ -483,9 +518,12 @@ struct bt_gatt_cep {
  */
 #define BT_GATT_CCC_INDICATE			0x0002
 
-/** Client Characteristic Configuration Attribute Value */
+/** @brief Client Characteristic Configuration Attribute Value
+ *
+ *  Used in the discovery of standard characteristic descriptor values.
+ */
 struct bt_gatt_ccc {
-	/** Client Characteristic Configuration flags */
+	/** Client Characteristic Configuration flags, a bitmap of ``BT_GATT_CCC_*`` macros. */
 	uint16_t flags;
 };
 
@@ -499,25 +537,52 @@ struct bt_gatt_ccc {
  */
 #define BT_GATT_SCC_BROADCAST                   0x0001
 
-/** Server Characteristic Configuration Attribute Value */
+/** @brief Server Characteristic Configuration Attribute Value
+ *
+ *  Used in the discovery of standard characteristic descriptor values.
+ */
 struct bt_gatt_scc {
-	/** Server Characteristic Configuration flags */
+	/** Server Characteristic Configuration flags, a bitmap of ``BT_GATT_SCC_*`` macros. */
 	uint16_t flags;
 };
 
-/** @brief GATT Characteristic Presentation Format Attribute Value. */
+/** @brief GATT Characteristic Presentation Format Attribute Value.
+ *
+ *  Used in the discovery of standard characteristic descriptor values. Can be
+ *  used with the @ref BT_GATT_CPF macro to declare the CPF descriptor.
+ */
 struct bt_gatt_cpf {
-	/** Format of the value of the characteristic */
+	/** @brief Format of the value of the characteristic.
+	 *
+	 *  The format types can be found in section 2.4.1 of the Bluetooth SIG
+	 *  Assigned Numbers document.
+	 */
 	uint8_t format;
-	/** Exponent field to determine how the value of this characteristic is
-	 * further formatted
+	/** @brief Exponent field for value formatting.
+	 *
+	 *  Only used on integer format types.
+	 *  actual value = Characteristic Value x 10^Exponent
 	 */
 	int8_t exponent;
-	/** Unit of the characteristic */
+	/** @brief UUID of the unit of the characteristic.
+	 *
+	 *  The units can be found in section 3.5 of the Bluetooth SIG Assigned
+	 *  Numbers document.
+	 */
 	uint16_t unit;
-	/** Name space of the description */
+	/** @brief Name space of the description.
+	 *
+	 *  Used to identify the organization that is responsible for defining
+	 *  the enumerations for the description field. See section 2.4.2 of the
+	 *  Bluetooth SIG Assigned Numbers document.
+	 */
 	uint8_t name_space;
-	/** Description of the characteristic as defined in a higher layer profile */
+	/** @brief Description of the characteristic as defined in a higher layer profile.
+	 *
+	 *  An enumerated value defined by the organization identified by the
+	 *  name_space field. See section 2.4.2.1 of the Bluetooth SIG Assigned
+	 *  Numbers document.
+	 */
 	uint16_t description;
 };
 
@@ -573,14 +638,14 @@ void bt_gatt_cb_register(struct bt_gatt_cb *cb);
  *
  *  @param cb Callback struct.
  *
- *  @return Zero on success or negative error code otherwise
+ *  @return Zero on success or negative error code otherwise.
  */
 int bt_gatt_authorization_cb_register(const struct bt_gatt_authorization_cb *cb);
 
 /** @brief Register GATT service.
  *
- *  Register GATT service. Applications can make use of
- *  macros such as ``BT_GATT_PRIMARY_SERVICE``, ``BT_GATT_CHARACTERISTIC``,
+ *  To register a GATT service, applications can make use of macros such as
+ *  ``BT_GATT_PRIMARY_SERVICE``, ``BT_GATT_CHARACTERISTIC``,
  *  ``BT_GATT_DESCRIPTOR``, etc.
  *
  *  When using @kconfig{CONFIG_BT_SETTINGS} then all services that should have
@@ -621,7 +686,10 @@ int bt_gatt_service_unregister(struct bt_gatt_service *svc);
  */
 bool bt_gatt_service_is_registered(const struct bt_gatt_service *svc);
 
-enum {
+/** @brief to be used as return values for @ref bt_gatt_attr_func_t and @ref bt_gatt_read_func_t
+ *  type callbacks.
+ */
+enum bt_gatt_iter {
 	BT_GATT_ITER_STOP = 0,
 	BT_GATT_ITER_CONTINUE,
 };
@@ -645,7 +713,8 @@ typedef uint8_t (*bt_gatt_attr_func_t)(const struct bt_gatt_attr *attr,
  *  Iterate attributes in the given range matching given UUID and/or data.
  *
  *  @param start_handle Start handle.
- *  @param end_handle End handle.
+ *  @param end_handle End handle. Often set to start_handle + attr_count or
+ *  BT_ATT_LAST_ATTRIBUTE_HANDLE.
  *  @param uuid UUID to match, passing NULL skips UUID matching.
  *  @param attr_data Attribute data to match, passing NULL skips data matching.
  *  @param num_matches Number matches, passing 0 makes it unlimited.
@@ -717,8 +786,8 @@ uint16_t bt_gatt_attr_get_handle(const struct bt_gatt_attr *attr);
  *
  * @param attr A Characteristic Attribute.
  *
- * @note The ``user_data`` of the attribute must of type @ref bt_gatt_chrc and the ``uuid`` shall be
- * BT_UUID_GATT_CHRC
+ * @note The ``user_data`` of the attribute must be of type @ref bt_gatt_chrc and the ``uuid`` shall
+ * be BT_UUID_GATT_CHRC.
  *
  * @return the handle of the corresponding Characteristic Value. The value will
  *         be zero (the invalid handle) if @p attr was not a characteristic
@@ -893,6 +962,16 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
 			       uint16_t len, uint16_t offset);
 
+/** @brief Gatt Characteristic Initialization Macro.
+ *
+ *  Helper macro used within the @ref BT_GATT_CHARACTERISTIC macro in the GATT attribute declaration
+ *  to set the attribute user data.
+ *
+ *  @param _uuid Characteristic attribute uuid.
+ *  @param _handle Characcteristic attribute handle at init.
+ *  @param _props Characteristic attribute properties,
+ *                a bitmap of ``BT_GATT_CHRC_*`` macros.
+ */
 #define BT_GATT_CHRC_INIT(_uuid, _handle, _props) \
 {                                                 \
 	.uuid = _uuid,                            \
@@ -925,6 +1004,17 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 						   })),                         \
 	BT_GATT_ATTRIBUTE(_uuid, _perm, _read, _write, _user_data)
 
+/**
+ *  @brief BT_GATT_CCC_MAX is defined depending on whether
+ *  @kconfig{CONFIG_BT_SETTINGS_CCC_LAZY_LOADING} or @kconfig{CONFIG_BT_CONN} is set.
+ *
+ *  @kconfig{CONFIG_BT_SETTINGS_CCC_LAZY_LOADING} will set BT_GATT_CCC_MAX to
+ *  @kconfig{CONFIG_BT_MAX_CONN}
+ *  @kconfig{CONFIG_BT_CONN} will set BT_GATT_CCC_MAX to @kconfig{CONFIG_BT_MAX_PAIRED} +
+ *  @kconfig{CONFIG_BT_MAX_CONN}
+ *  If neither are set, BT_GATT_CCC_MAX is 0.
+ *
+ */
 #if defined(CONFIG_BT_SETTINGS_CCC_LAZY_LOADING)
 	#define BT_GATT_CCC_MAX (CONFIG_BT_MAX_CONN)
 #elif defined(CONFIG_BT_CONN)
@@ -933,18 +1023,32 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 	#define BT_GATT_CCC_MAX 0
 #endif
 
-/** @brief GATT CCC configuration entry. */
+/** @brief GATT CCC configuration entry.
+ *
+ *  bt_gatt_ccc_cfg is used within @ref bt_gatt_attr_read_ccc and @ref bt_gatt_attr_write_ccc to
+ *  read and write the ccc configurations respectively.
+ *
+ */
 struct bt_gatt_ccc_cfg {
 	/** Local identity, BT_ID_DEFAULT in most cases. */
 	uint8_t id;
 	/** Remote peer address. */
 	bt_addr_le_t peer;
-	/** Configuration value. */
+	/** @brief Configuration value
+	 * Value used to enable or disable notifications or indications for a specific
+	 * characteristic.
+	 */
 	uint16_t value;
 };
 
-/** Internal representation of CCC value */
-struct _bt_gatt_ccc {
+/** Macro to keep old name for deprecation period. */
+#define _bt_gatt_ccc bt_gatt_ccc_managed_user_data __DEPRECATED_MACRO
+
+/** @brief Internal representation of CCC value.
+ *
+ * @note Only use this as an argument for @ref BT_GATT_CCC_MANAGED
+ */
+struct bt_gatt_ccc_managed_user_data {
 	/** Configuration for each connection */
 	struct bt_gatt_ccc_cfg cfg[BT_GATT_CCC_MAX];
 
@@ -990,8 +1094,6 @@ struct _bt_gatt_ccc {
  *  Read CCC attribute value from local database storing the result into buffer
  *  after encoding it.
  *
- *  @note Only use this with attributes which user_data is a _bt_gatt_ccc.
- *
  *  @param conn Connection object.
  *  @param attr Attribute to read.
  *  @param buf Buffer to store the value read.
@@ -1001,6 +1103,11 @@ struct _bt_gatt_ccc {
  *  @return number of bytes read in case of success or negative values in
  *          case of error.
  */
+/** @cond INTERNAL_HIDDEN
+ *  @note Only use this with attributes which user_data is a bt_gatt_ccc_managed_user_data.
+ *        @ref bt_gatt_ccc_managed_user_data being the internal representation of CCC value.
+ */
+ /** @endcond */
 ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
 			      uint16_t len, uint16_t offset);
@@ -1009,22 +1116,27 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
  *
  *  Write value in the buffer into CCC attribute.
  *
- *  @note Only use this with attributes which user_data is a _bt_gatt_ccc.
- *
  *  @param conn Connection object.
  *  @param attr Attribute to read.
  *  @param buf Buffer to store the value read.
  *  @param len Buffer length.
  *  @param offset Start offset.
- *  @param flags Write flags.
+ *  @param flags Write flags, see @ref bt_gatt_attr_write_flag.
  *
  *  @return number of bytes written in case of success or negative values in
  *          case of error.
  */
+/** @cond INTERNAL_HIDDEN
+ *  @note Only use this with attributes which user_data is a bt_gatt_ccc_managed_user_data.
+ *        @ref bt_gatt_ccc_managed_user_data being the internal representation of CCC value.
+ */
+/** @endcond */
 ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, const void *buf,
 			       uint16_t len, uint16_t offset, uint8_t flags);
 
+/** Macro to keep old name for deprecation period. */
+#define BT_GATT_CCC_INITIALIZER BT_GATT_CCC_MANAGED_USER_DATA_INIT __DEPRECATED_MACRO
 
 /**
  *  @brief Initialize Client Characteristic Configuration Declaration Macro.
@@ -1035,12 +1147,12 @@ ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
  *  @param _write Configuration write callback.
  *  @param _match Configuration match callback.
  */
-#define BT_GATT_CCC_INITIALIZER(_changed, _write, _match) \
-	{                                            \
-		.cfg = {},                           \
-		.cfg_changed = _changed,             \
-		.cfg_write = _write,                 \
-		.cfg_match = _match,                 \
+#define BT_GATT_CCC_MANAGED_USER_DATA_INIT(_changed, _write, _match)                               \
+	{                                                                                          \
+		.cfg = {},                                                                         \
+		.cfg_changed = _changed,                                                           \
+		.cfg_write = _write,                                                               \
+		.cfg_match = _match,                                                               \
 	}
 
 /**
@@ -1048,7 +1160,10 @@ ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
  *
  *  Helper macro to declare a Managed CCC attribute.
  *
- *  @param _ccc CCC attribute user data, shall point to a _bt_gatt_ccc.
+ *  @param _ccc A new @ref bt_gatt_ccc_managed_user_data object with the same lifetime
+ *              as the results of the call to BT_GATT_CCC_MANAGED.
+ *              See the documentation of @ref bt_gatt_ccc_managed_user_data on how
+ *              to initialize it.
  *  @param _perm CCC access permissions,
  *               a bitmap of @ref bt_gatt_perm values.
  */
@@ -1066,9 +1181,25 @@ ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
  *  @param _perm CCC access permissions,
  *               a bitmap of @ref bt_gatt_perm values.
  */
-#define BT_GATT_CCC(_changed, _perm)				\
-	BT_GATT_CCC_MANAGED(((struct _bt_gatt_ccc[])			\
-		{BT_GATT_CCC_INITIALIZER(_changed, NULL, NULL)}), _perm)
+#define BT_GATT_CCC(_changed, _perm)                                                               \
+	BT_GATT_CCC_MANAGED(((struct bt_gatt_ccc_managed_user_data[]){                             \
+				    BT_GATT_CCC_MANAGED_USER_DATA_INIT(_changed, NULL, NULL)}),    \
+			    _perm)
+
+/**
+ *  @brief Client Characteristic Configuration Declaration Macro with write callback.
+ *
+ *  Helper macro to declare a CCC attribute with a write callback.
+ *
+ *  @param _changed Configuration changed callback.
+ *  @param _write Configuration write callback.
+ *  @param _perm CCC access permissions,
+ *               a bitmap of @ref bt_gatt_perm values.
+ */
+#define BT_GATT_CCC_WITH_WRITE_CB(_changed, _write, _perm)                                         \
+	BT_GATT_CCC_MANAGED(((struct bt_gatt_ccc_managed_user_data[]){                             \
+				    BT_GATT_CCC_MANAGED_USER_DATA_INIT(_changed, _write, NULL)}),  \
+			    _perm)
 
 /** @brief Read Characteristic Extended Properties Attribute helper
  *
@@ -1140,7 +1271,7 @@ ssize_t bt_gatt_attr_read_cud(struct bt_conn *conn,
  *  Read CPF attribute value from local database storing the result into buffer
  *  after encoding it.
  *
- *  @note Only use this with attributes which user_data is a bt_gatt_pf.
+ *  @note Only use this with attributes which user_data is a @ref bt_gatt_cpf.
  *
  *  @param conn Connection object
  *  @param attr Attribute to read
@@ -1212,6 +1343,10 @@ ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
  */
 typedef void (*bt_gatt_complete_func_t) (struct bt_conn *conn, void *user_data);
 
+/** @brief GATT notification parameters
+ *
+ *  See also @ref bt_gatt_notify_cb and @ref bt_gatt_notify_multiple, using this parameter.
+ */
 struct bt_gatt_notify_params {
 	/** @brief Notification Attribute UUID type
 	 *
@@ -1233,7 +1368,8 @@ struct bt_gatt_notify_params {
 	bt_gatt_complete_func_t func;
 	/** Notification Value callback user data */
 	void *user_data;
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -1407,10 +1543,22 @@ typedef void (*bt_gatt_indicate_func_t)(struct bt_conn *conn,
 					struct bt_gatt_indicate_params *params,
 					uint8_t err);
 
+/** @typedef bt_gatt_indicate_params_destroy_t
+ *  @brief Callback to destroy or clean up the GATT Indicate Value parameters.
+ *
+ *  This callback function is invoked to clean up any resources associated with the
+ *  `bt_gatt_indicate_params` structure once the GATT indication operation is completed.
+ *
+ *  @param params Pointer to the GATT Indicate parameters structure to be cleaned up.
+ */
 typedef void (*bt_gatt_indicate_params_destroy_t)(
 		struct bt_gatt_indicate_params *params);
 
-/** @brief GATT Indicate Value parameters */
+/** @brief GATT Indicate Value parameters
+ *
+ *  See also @ref bt_gatt_indicate, using this parameter.
+ *
+ */
 struct bt_gatt_indicate_params {
 	/** @brief Indicate Attribute UUID type
 	 *
@@ -1434,7 +1582,8 @@ struct bt_gatt_indicate_params {
 	uint16_t len;
 	/** Private reference counter */
 	uint8_t _ref;
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -1467,10 +1616,9 @@ struct bt_gatt_indicate_params {
 int bt_gatt_indicate(struct bt_conn *conn,
 		     struct bt_gatt_indicate_params *params);
 
-
 /** @brief Check if connection have subscribed to attribute
  *
- *  Check if connection has subscribed to attribute value change.
+ *  Check if the connection has subscribed to an attribute value change.
  *
  *  The attribute object can be the so called Characteristic Declaration,
  *  which is usually declared with BT_GATT_CHARACTERISTIC followed
@@ -1525,26 +1673,30 @@ uint16_t bt_gatt_get_uatt_mtu(struct bt_conn *conn);
  * @{
  */
 
-/** @brief GATT Exchange MTU parameters */
+/** @brief GATT Exchange MTU parameters
+ *
+ *  Used with @ref bt_gatt_exchange_mtu function to initiate an MTU exchange. The
+ *  response is handled in the callback @p func, which is called upon
+ *  completion from the 'config BT_RECV_CONTEXT' context.
+ *
+ *  @p params must remain valid until the callback executes.
+ */
 struct bt_gatt_exchange_params {
-	/** Response callback */
+	/** Callback for MTU exchange response */
 	void (*func)(struct bt_conn *conn, uint8_t err,
 		     struct bt_gatt_exchange_params *params);
 };
 
 /** @brief Exchange MTU
  *
- *  This client procedure can be used to set the MTU to the maximum possible
- *  size the buffers can hold.
+ *  Once per connection, this client procedure can be used to set the MTU to
+ *  the maximum possible size the buffers can hold.
  *
- *  @note Shall only be used once per connection.
- *
- *  The Response comes in callback @p params->func. The callback is run from
- *  the context specified by 'config BT_RECV_CONTEXT'.
- *  @p params must remain valid until start of callback.
- *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
+ *  As the response comes in callback @p params->func, for example
+ *  @ref bt_gatt_get_mtu can be invoked in the mtu_exchange-callback to read
+ *  out the new negotiated ATT connection MTU. The callback is run from the
+ *  context specified by 'config BT_RECV_CONTEXT' and @p params must remain
+ *  valid until start of callback.
  *
  *  @param conn Connection object.
  *  @param params Exchange MTU parameters.
@@ -1554,7 +1706,7 @@ struct bt_gatt_exchange_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  *
  *  @retval -EALREADY The MTU exchange procedure has been already performed.
@@ -1577,6 +1729,11 @@ struct bt_gatt_discover_params;
  *
  *  The attribute object as well as its UUID and value objects are temporary and
  *  must be copied to in order to cache its information.
+ *
+ *  @note @ref bt_gatt_attr is given as an argument to @ref bt_gatt_discover function, but
+ *  it's not a proper object of this type. @ref bt_gatt_attr.perm, and methods
+ *  bt_gatt_attr.read() and bt_gatt_attr.write() are not available, and it's
+ *  unsound to pass the pointer to GATT server APIs.
  *  Only the following fields of the attribute contains valid information:
  *   - uuid      UUID representing the type of attribute.
  *   - handle    Handle in the remote database.
@@ -1613,7 +1770,7 @@ typedef uint8_t (*bt_gatt_discover_func_t)(struct bt_conn *conn,
 					struct bt_gatt_discover_params *params);
 
 /** GATT Discover types */
-enum {
+enum bt_gatt_discover_type {
 	/** Discover Primary Services. */
 	BT_GATT_DISCOVER_PRIMARY,
 	/** Discover Secondary Services. */
@@ -1666,6 +1823,7 @@ struct bt_gatt_discover_params {
 	/** Discover attribute callback */
 	bt_gatt_discover_func_t func;
 	union {
+		/** See @ref bt_gatt_include for more on included services. */
 		struct {
 			/** Include service attribute declaration handle */
 			uint16_t attr_handle;
@@ -1685,7 +1843,8 @@ struct bt_gatt_discover_params {
 	/** Only for stack-internal use, used for automatic discovery. */
 	struct bt_gatt_subscribe_params *sub_params;
 #endif /* defined(CONFIG_BT_GATT_AUTO_DISCOVER_CCC) || defined(__DOXYGEN__) */
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -1712,9 +1871,6 @@ struct bt_gatt_discover_params {
  *  the BT RX thread. @p params must remain valid until start of callback where
  *  iter `attr` is `NULL` or callback will return `BT_GATT_ITER_STOP`.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Discover parameters.
  *
@@ -1723,7 +1879,7 @@ struct bt_gatt_discover_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_discover(struct bt_conn *conn,
@@ -1784,15 +1940,16 @@ struct bt_gatt_read_params {
 			bool variable;
 		} multiple;
 		struct {
-			/** First requested handle number. */
+			/** Attribute handle to start reading from. */
 			uint16_t start_handle;
-			/** Last requested handle number. */
+			/** Attribute handle to stop reading at. */
 			uint16_t end_handle;
 			/** 2 or 16 octet UUID. */
 			const struct bt_uuid *uuid;
 		} by_uuid;
 	};
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 	/** Internal */
@@ -1801,11 +1958,11 @@ struct bt_gatt_read_params {
 
 /** @brief Read Attribute Value by handle
  *
- *  This procedure read the attribute value and return it to the callback.
+ *  This procedure reads the attribute value and returns it to the callback.
  *
  *  When reading attributes by UUID the callback can be called multiple times
- *  depending on how many instances of given the UUID exists with the
- *  start_handle being updated for each instance.
+ *  depending on how many instances of a given UUID exists with the start_handle
+ *  being updated for each instance.
  *
  *  To perform a GATT Long Read procedure, start with a Characteristic Value
  *  Read (by setting @c offset @c 0 and @c handle_count @c 1) and then return
@@ -1827,9 +1984,6 @@ struct bt_gatt_read_params {
  *  the context specified by 'config BT_RECV_CONTEXT'.
  *  @p params must remain valid until start of callback.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Read parameters.
  *
@@ -1838,7 +1992,7 @@ struct bt_gatt_read_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_read(struct bt_conn *conn, struct bt_gatt_read_params *params);
@@ -1867,7 +2021,8 @@ struct bt_gatt_write_params {
 	const void *data;
 	/** Length of the data */
 	uint16_t length;
-#if defined(CONFIG_BT_EATT)
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -1878,11 +2033,6 @@ struct bt_gatt_write_params {
  *  the context specified by 'config BT_RECV_CONTEXT'.
  *  @p params must remain valid until start of callback.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from Bluetooth event context. When called from Bluetooth context,
- *  this function will instead instead return `-ENOMEM` if it would block to
- *  avoid a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Write parameters.
  *
@@ -1891,8 +2041,8 @@ struct bt_gatt_write_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside Bluetooth event context to get blocking behavior. Queue size is
- *  controlled by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
+ *  from a separate thread to get blocking behavior. Queue size is controlled
+ *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params);
 
@@ -1908,14 +2058,11 @@ int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params);
  *  The number of pending callbacks can be increased with the
  *  @kconfig{CONFIG_BT_CONN_TX_MAX} option.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param handle Attribute handle.
  *  @param data Data to be written.
  *  @param length Data length.
- *  @param sign Whether to sign data
+ *  @param sign Whether to sign data.
  *  @param func Transmission complete callback.
  *  @param user_data User data to be passed back to callback.
  *
@@ -1923,7 +2070,7 @@ int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params);
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_write_without_response_cb(struct bt_conn *conn, uint16_t handle,
@@ -1936,20 +2083,17 @@ int bt_gatt_write_without_response_cb(struct bt_conn *conn, uint16_t handle,
  *  This procedure write the attribute value without requiring an
  *  acknowledgment that the write was successfully performed
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param handle Attribute handle.
  *  @param data Data to be written.
  *  @param length Data length.
- *  @param sign Whether to sign data
+ *  @param sign Whether to sign data.
  *
  *  @retval 0 Successfully queued request.
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 static inline int bt_gatt_write_without_response(struct bt_conn *conn,
@@ -1993,7 +2137,7 @@ typedef void (*bt_gatt_subscribe_func_t)(struct bt_conn *conn, uint8_t err,
 					 struct bt_gatt_subscribe_params *params);
 
 /** Subscription flags */
-enum {
+enum bt_gatt_sub_flag {
 	/** @brief Persistence flag
 	 *
 	 *  If set, indicates that the subscription is not saved
@@ -2071,11 +2215,16 @@ struct bt_gatt_subscribe_params {
 	 */
 	bt_security_t min_security;
 #endif
-	/** Subscription flags */
+	/** Subscription flags, see @ref bt_gatt_sub_flag */
 	ATOMIC_DEFINE(flags, BT_GATT_SUBSCRIBE_NUM_FLAGS);
 
+	/** @cond INTERNAL_HIDDEN
+	 *  Field used for list handling.
+	 */
 	sys_snode_t node;
-#if defined(CONFIG_BT_EATT)
+	/** @endcond */
+#if defined(CONFIG_BT_EATT) || defined(__DOXYGEN__)
+	/** Att channel options. */
 	enum bt_att_chan_opt chan_opt;
 #endif /* CONFIG_BT_EATT */
 };
@@ -2098,9 +2247,6 @@ struct bt_gatt_subscribe_params {
  *        valid while subscribed and cannot be reused for additional subscriptions
  *        whilst active.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Subscribe parameters.
  *
@@ -2109,7 +2255,7 @@ struct bt_gatt_subscribe_params {
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  *
  *  @retval -EALREADY if there already exist a subscription using the @p params.
@@ -2149,9 +2295,6 @@ int bt_gatt_resubscribe(uint8_t id, const bt_addr_le_t *peer,
  *  The Response comes in callback @p params->func. The callback is run from
  *  the BT RX thread.
  *
- *  This function will block while the ATT request queue is full, except when
- *  called from the BT RX thread, as this would cause a deadlock.
- *
  *  @param conn Connection object.
  *  @param params Subscribe parameters. The parameters shall be a @ref bt_gatt_subscribe_params from
  *                a previous call to bt_gatt_subscribe().
@@ -2161,7 +2304,7 @@ int bt_gatt_resubscribe(uint8_t id, const bt_addr_le_t *peer,
  *
  *  @retval -ENOMEM ATT request queue is full and blocking would cause deadlock.
  *  Allow a pending request to resolve before retrying, or call this function
- *  outside the BT RX thread to get blocking behavior. Queue size is controlled
+ *  from a separate thread to get blocking behavior. Queue size is controlled
  *  by @kconfig{CONFIG_BT_ATT_TX_COUNT}.
  */
 int bt_gatt_unsubscribe(struct bt_conn *conn,
diff --git a/include/zephyr/bluetooth/hci.h b/include/zephyr/bluetooth/hci.h
index 7687abdb631ed..590ea55a84ac2 100644
--- a/include/zephyr/bluetooth/hci.h
+++ b/include/zephyr/bluetooth/hci.h
@@ -9,8 +9,10 @@
 #define ZEPHYR_INCLUDE_BLUETOOTH_HCI_H_
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/net_buf.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/conn.h>
@@ -37,6 +39,8 @@ extern "C" {
 #if defined(CONFIG_BT_HCI_ERR_TO_STR)
 const char *bt_hci_err_to_str(uint8_t hci_err);
 #else
+#include <zephyr/toolchain.h>
+
 static inline const char *bt_hci_err_to_str(uint8_t hci_err)
 {
 	ARG_UNUSED(hci_err);
diff --git a/include/zephyr/bluetooth/hci_raw.h b/include/zephyr/bluetooth/hci_raw.h
index 8a0b4a3768006..3671d1bcb548d 100644
--- a/include/zephyr/bluetooth/hci_raw.h
+++ b/include/zephyr/bluetooth/hci_raw.h
@@ -18,6 +18,10 @@
  */
 
 #include <stdint.h>
+#include <stddef.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 3efdf6b5ac579..94693b947573f 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -11,12 +11,12 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 #include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/bluetooth/addr.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -200,12 +200,14 @@ struct bt_hci_cmd_hdr {
 #define BT_LE_FEAT_BIT_CHANNEL_CLASSIFICATION   39
 #define BT_LE_FEAT_BIT_ADV_CODING_SEL           40
 #define BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST      41
-
+#define BT_LE_FEAT_BIT_DECISION_ADV_FILTER      42
 #define BT_LE_FEAT_BIT_PAWR_ADVERTISER          43
 #define BT_LE_FEAT_BIT_PAWR_SCANNER             44
-
+#define BT_LE_FEAT_BIT_UNSEG_FRAMED_MODE        45
 #define BT_LE_FEAT_BIT_CHANNEL_SOUNDING         46
 #define BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST    47
+#define BT_LE_FEAT_BIT_CHANNEL_SOUNDING_TONE_QUAL_IND    48
+#define BT_LE_FEAT_BIT_LL_EXTENDED_FEAT_SET     63
 
 #define BT_LE_FEAT_TEST(feat, n)                (feat[(n) >> 3] & \
 						 BIT((n) & 7))
@@ -590,6 +592,12 @@ struct bt_hci_rp_write_conn_accept_timeout {
 #define BT_BREDR_SCAN_INQUIRY                   0x01
 #define BT_BREDR_SCAN_PAGE                      0x02
 
+#define BT_HCI_OP_READ_CLASS_OF_DEVICE          BT_OP(BT_OGF_BASEBAND, 0x0023) /* 0x0c23 */
+struct bt_hci_rp_read_class_of_device {
+	uint8_t  status;
+	uint8_t  class_of_device[3];
+} __packed;
+
 #define BT_COD(major_service, major_device, minor_device)                         \
 	(((uint32_t)major_service << 13) | ((uint32_t)major_device << 8) |            \
 	 ((uint32_t)minor_device << 2))
@@ -764,6 +772,16 @@ struct bt_hci_cp_host_num_completed_packets {
 	struct bt_hci_handle_count h[0];
 } __packed;
 
+#define BT_HCI_OP_WRITE_CURRENT_IAC_LAP         BT_OP(BT_OGF_BASEBAND, 0x003a) /* 0x0c3a */
+struct bt_hci_iac_lap {
+	uint8_t iac[3];
+} __packed;
+
+struct bt_hci_cp_write_current_iac_lap {
+	uint8_t  num_current_iac;
+	struct bt_hci_iac_lap lap[0];
+} __packed;
+
 #define BT_HCI_OP_WRITE_INQUIRY_MODE            BT_OP(BT_OGF_BASEBAND, 0x0045) /* 0x0c45 */
 struct bt_hci_cp_write_inquiry_mode {
 	uint8_t  mode;
@@ -2786,6 +2804,12 @@ struct bt_hci_evt_remote_name_req_complete {
 	uint8_t   name[248];
 } __packed;
 
+/* Encryption Value */
+#define BT_HCI_ENCRYPTION_OFF           0x00
+#define BT_HCI_ENCRYPTION_ON_LE_AES_CCM 0x01
+#define BT_HCI_ENCRYPTION_ON_BR_E0      0x01
+#define BT_HCI_ENCRYPTION_ON_BR_AES_CCM 0x02
+
 #define BT_HCI_EVT_ENCRYPT_CHANGE               0x08
 struct bt_hci_evt_encrypt_change {
 	uint8_t  status;
@@ -3203,6 +3227,14 @@ struct bt_hci_evt_le_phy_update_complete {
 #define BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS_INCOMPLETE 2
 #define BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS_RX_FAILED  0xFF
 
+/* Advertising Coding Selection extended advertising report PHY values.
+ * Only used when Kconfig BT_EXT_ADV_CODING_SELECTION is enabled.
+ */
+#define BT_HCI_LE_ADV_EVT_PHY_1M                0x01
+#define BT_HCI_LE_ADV_EVT_PHY_2M                0x02
+#define BT_HCI_LE_ADV_EVT_PHY_CODED_S8          0x03
+#define BT_HCI_LE_ADV_EVT_PHY_CODED_S2          0x04
+
 struct bt_hci_evt_le_ext_advertising_info {
 	uint16_t     evt_type;
 	bt_addr_le_t addr;
diff --git a/include/zephyr/bluetooth/hci_vs.h b/include/zephyr/bluetooth/hci_vs.h
index dabbe2902eaf9..1170c41474a2c 100644
--- a/include/zephyr/bluetooth/hci_vs.h
+++ b/include/zephyr/bluetooth/hci_vs.h
@@ -11,7 +11,10 @@
 
 #include <stdint.h>
 
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/net_buf.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/bluetooth/iso.h b/include/zephyr/bluetooth/iso.h
index ff62661b9e8f0..3237a3b9bc3c0 100644
--- a/include/zephyr/bluetooth/iso.h
+++ b/include/zephyr/bluetooth/iso.h
@@ -5,7 +5,7 @@
 
 /*
  * Copyright (c) 2020 Intel Corporation
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -24,6 +24,7 @@
  */
 
 #include <stdint.h>
+#include <stddef.h>
 
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -70,6 +71,14 @@ extern "C" {
 
 /** Unknown SDU interval */
 #define BT_ISO_SDU_INTERVAL_UNKNOWN 0x000000U
+/** The minimum value for vendor specific data path ID */
+#define BT_ISO_DATA_PATH_VS_ID_MIN  0x01
+/** The maximum value for vendor specific data path ID */
+#define BT_ISO_DATA_PATH_VS_ID_MAX  0xFE
+/** Minimum controller delay in microseconds (0 s) */
+#define BT_ISO_CONTROLLER_DELAY_MIN 0x000000
+/** Maximum controller delay in microseconds (4 s) */
+#define BT_ISO_CONTROLLER_DELAY_MAX 0x3D0900
 /** Minimum interval value in microseconds */
 #define BT_ISO_SDU_INTERVAL_MIN     0x0000FFU
 /** Maximum interval value in microseconds */
@@ -178,7 +187,8 @@ enum bt_iso_state {
  */
 enum bt_iso_chan_type {
 	BT_ISO_CHAN_TYPE_NONE,		/**< No channel type */
-	BT_ISO_CHAN_TYPE_CONNECTED,	/**< Connected */
+	BT_ISO_CHAN_TYPE_CENTRAL,       /**< Connected as central */
+	BT_ISO_CHAN_TYPE_PERIPHERAL,    /**< Connected as peripheral */
 	BT_ISO_CHAN_TYPE_BROADCASTER,	/**< Isochronous broadcaster */
 	BT_ISO_CHAN_TYPE_SYNC_RECEIVER	/**< Synchronized receiver */
 };
@@ -219,7 +229,7 @@ struct bt_iso_chan_io_qos {
 	 */
 	uint16_t			sdu;
 	/**
-	 * @brief Channel PHY - See the BT_GAP_LE_PHY_* values.
+	 * @brief Channel PHY - See the @ref bt_gap_le_phy values.
 	 *
 	 * Setting @ref BT_GAP_LE_PHY_NONE is invalid.
 	 */
@@ -230,13 +240,6 @@ struct bt_iso_chan_io_qos {
 	 * This value is ignored if any advanced ISO parameters are set.
 	 */
 	uint8_t				rtn;
-	/**
-	 * @brief Channel data path reference
-	 *
-	 * Setting to NULL default to HCI data path (same as setting path.pid
-	 * to @ref BT_ISO_DATA_PATH_HCI).
-	 */
-	struct bt_iso_chan_path		*path;
 
 #if defined(CONFIG_BT_ISO_TEST_PARAMS) || defined(__DOXYGEN__)
 	/**
@@ -293,20 +296,37 @@ struct bt_iso_chan_qos {
 
 /** @brief ISO Channel Data Path structure. */
 struct bt_iso_chan_path {
-	/** Default path ID */
-	uint8_t				pid;
-	/** Coding Format */
-	uint8_t				format;
+	/**
+	 * @brief Default path ID
+	 *
+	 * @ref BT_ISO_DATA_PATH_HCI to use ISO over  HCI or between @ref BT_ISO_DATA_PATH_VS_ID_MIN
+	 * and @ref BT_ISO_DATA_PATH_VS_ID_MAX for vendor specific data paths.
+	 */
+	uint8_t pid;
+	/**
+	 * @brief Coding Format
+	 *
+	 * See the BT_HCI_CODING_FORMAT_* values for valid values.
+	 */
+	uint8_t format;
 	/** Company ID */
-	uint16_t			cid;
+	uint16_t cid;
 	/** Vendor-defined Codec ID */
-	uint16_t			vid;
-	/** Controller Delay */
-	uint32_t			delay;
-	/** Codec Configuration length*/
-	uint8_t				cc_len;
-	/** Pointer to an array containing the Codec Configuration */
-	uint8_t				*cc;
+	uint16_t vid;
+	/**
+	 * @brief Controller Delay in microseconds
+	 *
+	 * Value range from @ref BT_ISO_CONTROLLER_DELAY_MIN to @ref BT_ISO_CONTROLLER_DELAY_MAX.
+	 */
+	uint32_t delay;
+	/** Codec Configuration length */
+	uint8_t cc_len;
+	/**
+	 * @brief Pointer to an array containing the Codec Configuration
+	 *
+	 * Shall not be NULL if bt_iso_chan_path.cc_len is non-zero.
+	 */
+	uint8_t *cc;
 };
 
 /** ISO packet status flag bits */
@@ -413,7 +433,7 @@ struct bt_iso_cig_param {
 	 * @brief Channel peripherals sleep clock accuracy Only for CIS
 	 *
 	 * Shall be worst case sleep clock accuracy of all the peripherals.
-	 * For possible values see the BT_GAP_SCA_* values.
+	 * For possible values, see @ref bt_gap_sca.
 	 * If unknown for the peripherals, this should be set to @ref BT_GAP_SCA_UNKNOWN.
 	 */
 	uint8_t sca;
@@ -691,6 +711,14 @@ struct bt_iso_chan_ops {
 	 * channel is disconnected, including when a connection gets
 	 * rejected or when setting security fails.
 	 *
+	 * If the channel was established (i.e. @ref bt_iso_chan_ops.connected has been called
+	 * for this channel), then the channel object is still valid and the memory of the channel
+	 * shall not be memset to 0 or otherwise free'd.
+	 * To avoid any issues it is recommended to use a @ref k_work_submit or similar to not
+	 * overwrite any data while in the callback.
+	 *
+	 * For the above reason it is still possible to use bt_iso_chan_get_info() on the @p chan.
+	 *
 	 * @param chan   The channel that has been Disconnected
 	 * @param reason BT_HCI_ERR_* reason for the disconnection.
 	 */
@@ -957,6 +985,70 @@ int bt_iso_chan_send(struct bt_iso_chan *chan, struct net_buf *buf, uint16_t seq
 int bt_iso_chan_send_ts(struct bt_iso_chan *chan, struct net_buf *buf, uint16_t seq_num,
 			uint32_t ts);
 
+/**
+ * @brief Sets up the ISO data path for a ISO channel
+ *
+ * The channel must be associated with a BIS or CIS handle first which it is when the
+ * bt_iso_chan_ops.connected() callback is called.
+ *
+ * @param chan The channel to setup the ISO data path for
+ * @param dir The direction to setup, either @ref BT_HCI_DATAPATH_DIR_CTLR_TO_HOST or
+ *            @ref BT_HCI_DATAPATH_DIR_HOST_TO_CTLR. For ISO broadcast channels this can only be
+ *            @ref BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, and for ISO sync receiver channels this can
+ *            only be @ref BT_HCI_DATAPATH_DIR_CTLR_TO_HOST.
+ * @param path The data path
+ *
+ * @retval 0 Success
+ * @retval -EINVAL Invalid parameters
+ * @retval -ENOBUFS No HCI command buffer could be allocated
+ * @retval -EIO The controller rejected the request or response contains invalid data
+ * @retval -ENODEV @p chan is not associated with a CIS or BIS handle
+ * @retval -EACCES The controller rejected the request as disallowed
+ * @retval -ENOEXEC Unexpected error occurred
+ */
+int bt_iso_setup_data_path(const struct bt_iso_chan *chan, uint8_t dir,
+			   const struct bt_iso_chan_path *path);
+
+/**
+ * @brief Removes the ISO data path for a ISO channel
+ *
+ * Removes the ISO data path configured by bt_iso_setup_data_path() for the provided @p dir.
+ *
+ * The data paths of CIS for Peripherals are deleted by the controller,
+ * and thus it is not necessary (or possible) to remove
+ * data paths of CIS after they have disconnected for a Peripheral,
+ * as per Bluetooth Core specification 6.0, Vol 4, Part E, Section 7.7.5.
+ * The data paths for CIS for a Central remain valid, even after a disconnection, and thus a Central
+ * device should call bt_iso_remove_data_path() on disconnect if it no longer wants to use that CIS.
+ * All data paths created by a Central are removed when the CIG is removed with
+ * bt_iso_cig_terminate().
+ *
+ * Any data paths associated with an ISO Sync Receiver BIG are removed by the controller
+ * when the BIG sync is lost or terminated, and thus it is not necessary (or possible) to remove
+ * data paths of ISO channels associated with a BIG for a Sync Receiver,
+ * as per Bluetooth Core specification 6.0, Vol 4, Part E, Section 7.7.65.30
+ *
+ * All data paths associated with an ISO Broadcaster BIG are removed when the BIG is terminated by
+ * bt_iso_big_terminate(), and thus it is not necessary (or possible) to remove data paths of ISO
+ * channels associated with a BIG for a Broadcaster,
+ * as per Bluetooth Core specification 6.0, Vol 4, Part E, Section 7.8.105
+ *
+ * @param chan The channel to setup the ISO data path for
+ * @param dir The direction to setup, either @ref BT_HCI_DATAPATH_DIR_CTLR_TO_HOST or
+ *            @ref BT_HCI_DATAPATH_DIR_HOST_TO_CTLR. For ISO broadcast channels this can only be
+ *            @ref BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, and for ISO sync receiver channels this can
+ *            only be @ref BT_HCI_DATAPATH_DIR_CTLR_TO_HOST.
+
+ * @retval 0 Success
+ * @retval -EINVAL Invalid parameters
+ * @retval -ENOBUFS No HCI command buffer could be allocated
+ * @retval -EIO The controller rejected the request or response contains invalid data
+ * @retval -ENODEV @p chan is not associated with a CIS or BIS handle
+ * @retval -EACCES The controller rejected the request as disallowed
+ * @retval -ENOEXEC Unexpected error occurred
+ */
+int bt_iso_remove_data_path(const struct bt_iso_chan *chan, uint8_t dir);
+
 /** @brief ISO Unicast TX Info Structure */
 struct bt_iso_unicast_tx_info {
 	/** The transport latency in us */
@@ -1082,20 +1174,30 @@ struct bt_iso_info {
 	/** Connection Type specific Info.*/
 	union {
 #if defined(CONFIG_BT_ISO_UNICAST) || defined(__DOXYGEN__)
-		/** Unicast specific Info.
+		/**
+		 * @brief Unicast specific Info.
+		 *
 		 * Only available when @kconfig{CONFIG_BT_ISO_UNICAST} is enabled.
+		 * Use this when the @ref bt_iso_info.type is @ref BT_ISO_CHAN_TYPE_CENTRAL or
+		 * @ref BT_ISO_CHAN_TYPE_PERIPHERAL.
 		 */
 		struct bt_iso_unicast_info unicast;
 #endif /* CONFIG_BT_ISO_UNICAST */
 #if defined(CONFIG_BT_ISO_BROADCASTER) || defined(__DOXYGEN__)
-		/** Broadcaster specific Info.
+		/**
+		 * @brief Broadcaster specific Info.
+		 *
 		 * Only available when @kconfig{CONFIG_BT_ISO_BROADCASTER} is enabled.
+		 * Use this when the @ref bt_iso_info.type is @ref BT_ISO_CHAN_TYPE_BROADCASTER.
 		 */
 		struct bt_iso_broadcaster_info broadcaster;
 #endif /* CONFIG_BT_ISO_BROADCASTER */
 #if defined(CONFIG_BT_ISO_SYNC_RECEIVER) || defined(__DOXYGEN__)
-		/** Sync receiver specific Info.
+		/**
+		 * @brief Sync receiver specific Info.
+		 *
 		 * Only available when @kconfig{CONFIG_BT_ISO_SYNC_RECEIVER} is enabled.
+		 * Use this when the @ref bt_iso_info.type is @ref BT_ISO_CHAN_TYPE_SYNC_RECEIVER.
 		 */
 		struct bt_iso_sync_receiver_info sync_receiver;
 #endif /* CONFIG_BT_ISO_SYNC_RECEIVER */
diff --git a/include/zephyr/bluetooth/l2cap.h b/include/zephyr/bluetooth/l2cap.h
index c510ac26eebe4..f8781d791f01d 100644
--- a/include/zephyr/bluetooth/l2cap.h
+++ b/include/zephyr/bluetooth/l2cap.h
@@ -18,13 +18,18 @@
  * @{
  */
 
+#include <stddef.h>
 #include <stdint.h>
-#include <sys/types.h>
 
-#include <zephyr/sys/atomic.h>
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
+#include <sys/types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -271,42 +276,219 @@ struct bt_l2cap_le_chan {
  */
 #define BT_L2CAP_LE_CHAN(_ch) CONTAINER_OF(_ch, struct bt_l2cap_le_chan, chan)
 
+/** L2CAP Endpoint Link Mode. Basic mode. */
+#define BT_L2CAP_BR_LINK_MODE_BASIC  0x00
+/** L2CAP Endpoint Link Mode. Retransmission mode. */
+#define BT_L2CAP_BR_LINK_MODE_RET    0x01
+/** L2CAP Endpoint Link Mode. Flow control mode. */
+#define BT_L2CAP_BR_LINK_MODE_FC     0x02
+/** L2CAP Endpoint Link Mode. Enhance retransmission mode. */
+#define BT_L2CAP_BR_LINK_MODE_ERET   0x03
+/** L2CAP Endpoint Link Mode. Streaming mode. */
+#define BT_L2CAP_BR_LINK_MODE_STREAM 0x04
+
+/** Frame Check Sequence type. No FCS. */
+#define BT_L2CAP_BR_FCS_NO    0x00
+/** Frame Check Sequence type. 16-bit FCS. */
+#define BT_L2CAP_BR_FCS_16BIT 0x01
+
 /** @brief BREDR L2CAP Endpoint structure. */
 struct bt_l2cap_br_endpoint {
 	/** Endpoint Channel Identifier (CID) */
-	uint16_t				cid;
+	uint16_t                                cid;
 	/** Endpoint Maximum Transmission Unit */
-	uint16_t				mtu;
+	uint16_t                                mtu;
+#if defined(CONFIG_BT_L2CAP_RET_FC) || defined(__DOXYGEN__)
+	/** Endpoint Link Mode.
+	 *  The value is defined as BT_L2CAP_BR_LINK_MODE_*
+	 */
+	uint8_t                                 mode;
+	/** Whether Endpoint Link Mode is optional
+	 * If the `optional` is true, the `mode` could be
+	 * changed according to the extended feature and
+	 * peer configuration from L2CAP configuration
+	 * response and request.
+	 * Otherwise, if the channel configuration process
+	 * does not meet the set mode, the L2CAP channel
+	 * will be disconnected.
+	 */
+	bool                                    optional;
+	/** Endpoint Maximum Transmit
+	 * The field is used to set the max retransmission
+	 * count.
+	 * For `RET`, `FC`, and `ERET`, it should be not
+	 * less 1.
+	 * For `STREAM`, it should be 0.
+	 */
+	uint8_t                                 max_transmit;
+	/** Endpoint Retransmission Timeout
+	 * The field is configured by
+	 * `@kconfig{BT_L2CAP_BR_RET_TIMEOUT}`
+	 * The field should be no more than the field
+	 * `monitor_timeout`.
+	 */
+	uint16_t                                ret_timeout;
+	/** Endpoint Monitor Timeout
+	 * The field is configured by
+	 * `@kconfig{BT_L2CAP_BR_MONITOR_TIMEOUT}`
+	 */
+	uint16_t                                monitor_timeout;
+	/** Endpoint Maximum PDU payload Size */
+	uint16_t                                mps;
+	/** Endpoint Maximum Window Size
+	 * MAX supported window size is configured by
+	 * `@kconfig{BT_L2CAP_MAX_WINDOW_SIZE}`. The field
+	 * should be no more then `CONFIG_BT_L2CAP_MAX_WINDOW_SIZE`.
+	 */
+	uint16_t                                max_window;
+	/** Endpoint FCS Type
+	 * The value is defined as BT_L2CAP_BR_FCS_*
+	 * The default setting should be BT_L2CAP_BR_FCS_16BIT.
+	 * For FC and RET, the FCS type should be
+	 * BT_L2CAP_BR_FCS_16BIT.
+	 * For ERET and STREAM, the FCS type is optional. If
+	 * the field is not default value, the local will include
+	 * FCS option in configuration request packet if both side
+	 * support `FCS Option`.
+	 */
+	uint8_t                                 fcs;
+	/** Endpoint Extended Control.
+	 * If this field is true, and both side support
+	 * `Extended Window size feature`, the local will
+	 * include `extended window size` option in configuration
+	 * request packet.
+	 */
+	bool                                    extended_control;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+};
+
+/** I-Frame transmission window for none `BASIC` mode L2cap connected channel. */
+struct bt_l2cap_br_window {
+	sys_snode_t node;
+
+	/** tx seq */
+	uint16_t tx_seq;
+	/** data len */
+	uint16_t len;
+	/** data address */
+	uint8_t *data;
+	/** Transmit Counter */
+	uint8_t transmit_counter;
+	/** SAR flag */
+	uint8_t sar;
+	/** srej flag */
+	bool srej;
+	/* Save PDU state */
+	struct net_buf_simple_state sdu_state;
+	/** @internal Holds the sending buffer. */
+	struct net_buf *sdu;
+	/** @internal Total length of TX SDU */
+	uint16_t sdu_total_len;
 };
 
 /** @brief BREDR L2CAP Channel structure. */
 struct bt_l2cap_br_chan {
 	/** Common L2CAP channel reference object */
-	struct bt_l2cap_chan		chan;
+	struct bt_l2cap_chan            chan;
 	/** Channel Receiving Endpoint */
-	struct bt_l2cap_br_endpoint	rx;
+	struct bt_l2cap_br_endpoint     rx;
 	/** Channel Transmission Endpoint */
-	struct bt_l2cap_br_endpoint	tx;
+	struct bt_l2cap_br_endpoint     tx;
 	/* For internal use only */
-	atomic_t			flags[1];
+	atomic_t                        flags[1];
 
-	bt_l2cap_chan_state_t		state;
+	bt_l2cap_chan_state_t           state;
 	/** Remote PSM to be connected */
-	uint16_t			psm;
+	uint16_t                        psm;
 	/** Helps match request context during CoC */
-	uint8_t				ident;
-	bt_security_t			required_sec_level;
+	uint8_t                         ident;
+	bt_security_t                   required_sec_level;
 
 	/* Response Timeout eXpired (RTX) timer */
-	struct k_work_delayable		rtx_work;
-	struct k_work_sync		rtx_sync;
+	struct k_work_delayable	        rtx_work;
+	struct k_work_sync              rtx_sync;
 
 	/** @internal To be used with @ref bt_conn.upper_data_ready */
-	sys_snode_t			_pdu_ready;
+	sys_snode_t                     _pdu_ready;
 	/** @internal To be used with @ref bt_conn.upper_data_ready */
-	atomic_t			_pdu_ready_lock;
-	/** @internal Queue of net bufs not yet sent to lower layer */
-	struct k_fifo			_pdu_tx_queue;
+	atomic_t                        _pdu_ready_lock;
+	/** @internal List of net bufs not yet sent to lower layer */
+	sys_slist_t                     _pdu_tx_queue;
+
+#if defined(CONFIG_BT_L2CAP_RET_FC) || defined(__DOXYGEN__)
+	/** @internal Total length of TX SDU */
+	uint16_t                        _sdu_total_len;
+
+	/** @internal Holds the remaining length of current sending buffer */
+	size_t                          _pdu_remaining;
+
+	/** @internal Holds the sending buffer. */
+	struct net_buf                  *_pdu_buf;
+
+	/** @internal TX windows for outstanding frame */
+	sys_slist_t                     _pdu_outstanding;
+
+	/** @internal PDU restore state */
+	struct net_buf_simple_state     _pdu_state;
+
+	/** @internal Free TX windows */
+	struct k_fifo                   _free_tx_win;
+
+	/** @internal TX windows */
+	struct bt_l2cap_br_window       tx_win[CONFIG_BT_L2CAP_MAX_WINDOW_SIZE];
+
+	/** Segment SDU packet from upper layer */
+	struct net_buf                  *_sdu;
+	/** @internal RX SDU */
+	uint16_t                        _sdu_len;
+#if defined(CONFIG_BT_L2CAP_SEG_RECV) || defined(__DOXYGEN__)
+	uint16_t                        _sdu_len_done;
+#endif /* CONFIG_BT_L2CAP_SEG_RECV */
+	/** @internal variables and sequence numbers */
+	/** @internal The sending peer uses the following variables and sequence
+	 * numbers.
+	 */
+	/** @internal The send sequence number used to sequentially number each
+	 * new I-frame transmitted.
+	 */
+	uint16_t                        tx_seq;
+	/** @internal The sequence number to be used in the next new I-frame
+	 * transmitted.
+	 */
+	uint16_t                        next_tx_seq;
+	/** @internal The sequence number of the next I-frame expected to be
+	 * acknowledged by the receiving peer.
+	 */
+	uint16_t                        expected_ack_seq;
+	/** @internal The receiving peer uses the following variables and sequence
+	 * numbers.
+	 */
+	/** @internal The sequence number sent in an acknowledgment frame to
+	 * request transmission of I-frame with TxSeq = ReqSeq and acknowledge
+	 * receipt of I-frames up to and including (ReqSeq-1).
+	 */
+	uint16_t                        req_seq;
+	/** @internal The value of TxSeq expected in the next I-frame.
+	 */
+	uint16_t                        expected_tx_seq;
+	/** @internal When segmented I-frames are buffered this is used to delay
+	 * acknowledgment of received I-frame so that new I-frame transmissions do
+	 * not cause buffer overflow.
+	 */
+	uint16_t                        buffer_seq;
+
+	/** @internal States of Enhanced Retransmission Mode */
+	/** @internal Holds the number of times an S-frame operation is retried
+	 */
+	uint16_t                        retry_count;
+	/** @internal save the ReqSeq of a SREJ frame */
+	uint16_t                        srej_save_req_seq;
+
+	/** @internal Retransmission Timer */
+	struct k_work_delayable         ret_work;
+	/** @internal Monitor Timer */
+	struct k_work_delayable         monitor_work;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 };
 
 /** @brief L2CAP Channel operations structure.
diff --git a/include/zephyr/bluetooth/uuid.h b/include/zephyr/bluetooth/uuid.h
index aa0413dc13a3f..37b061c2ed666 100644
--- a/include/zephyr/bluetooth/uuid.h
+++ b/include/zephyr/bluetooth/uuid.h
@@ -17,6 +17,7 @@
  * @{
  */
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <zephyr/sys/util.h>
diff --git a/include/zephyr/data/cobs.h b/include/zephyr/data/cobs.h
new file mode 100644
index 0000000000000..e22f1d2aaaf49
--- /dev/null
+++ b/include/zephyr/data/cobs.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2024 Kelly Helmut Lord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DATA_COBS_H_
+#define ZEPHYR_INCLUDE_DATA_COBS_H_
+
+#include <stddef.h>
+#include <sys/types.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net_buf.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define COBS_DEFAULT_DELIMITER 0x00
+
+/**
+ * Flag indicating that encode and decode should include an implicit end delimiter
+ */
+#define COBS_FLAG_TRAILING_DELIMITER BIT(8)
+
+/**
+ * Macro for extracting delimiter from flags. 8 LSB of "flags" is used for the delimiter
+ * Example usage:
+ * cobs_encode(src_buf, dst_buf, COBS_FLAG_TRAILING_DELIMITER | COBS_FLAG_CUSTOM_DELIMITER(0x7F));
+ */
+#define COBS_FLAG_CUSTOM_DELIMITER(x) ((x) & 0xff)
+
+/**
+ * @defgroup cobs COBS (Consistent Overhead Byte Stuffing)
+ * @ingroup utilities
+ * @{
+ *
+ * @brief COBS encoding and decoding functions with custom delimiter support
+ *
+ * Provides functions for COBS encoding/decoding with configurable delimiters.
+ * The implementation handles both standard zero-delimited COBS and custom
+ * delimiter variants.
+ */
+
+/**
+ * @brief Calculate maximum encoded buffer size
+ *
+ * @param decoded_size  Size of input data to be encoded
+ * @param flags         COBS_FLAG_TRAILING_DELIMITER to include termination byte in calculation
+ *
+ * @return Required buffer size for worst-case encoding scenario
+ */
+static inline size_t cobs_max_encoded_len(size_t decoded_size, uint32_t flags)
+{
+	if (flags & COBS_FLAG_TRAILING_DELIMITER) {
+		return decoded_size + decoded_size / 254 + 1 + 1;
+	} else {
+		return decoded_size + decoded_size / 254 + 1;
+	}
+}
+
+/**
+ * @brief Standard COBS encoding
+ *
+ * @param src        Source buffer to decode
+ * @param dst        Destination buffer for decoded data
+ * @param flags      Decoding flags (reserved)
+ *
+ * @retval 0        Success
+ * @retval -ENOMEM  Insufficient destination space
+ * @retval -EINVAL  Invalid COBS structure or parameters
+ */
+
+int cobs_encode(struct net_buf *src, struct net_buf *dst, uint32_t flags);
+
+/**
+ * @brief Standard COBS decoding
+ *
+ * @param src        Source buffer to decode
+ * @param dst        Destination buffer for decoded data
+ * @param flags      Decoding flags (reserved)
+ *
+ * @retval 0        Success
+ * @retval -ENOMEM  Insufficient destination space
+ * @retval -EINVAL  Invalid COBS structure or parameters
+ */
+int cobs_decode(struct net_buf *src, struct net_buf *dst, uint32_t flags);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DATA_COBS_H_ */
diff --git a/include/zephyr/data/json.h b/include/zephyr/data/json.h
index 2e8182fd0884e..699cd13900779 100644
--- a/include/zephyr/data/json.h
+++ b/include/zephyr/data/json.h
@@ -35,6 +35,7 @@ enum json_tokens {
 	JSON_TOK_ARRAY_START = '[',
 	JSON_TOK_ARRAY_END = ']',
 	JSON_TOK_STRING = '"',
+	JSON_TOK_STRING_BUF = 's',
 	JSON_TOK_COLON = ':',
 	JSON_TOK_COMMA = ',',
 	JSON_TOK_NUMBER = '0',
@@ -44,6 +45,10 @@ enum json_tokens {
 	JSON_TOK_ENCODED_OBJ = '4',
 	JSON_TOK_INT64 = '5',
 	JSON_TOK_UINT64 = '6',
+	JSON_TOK_FLOAT_FP = '7',
+	JSON_TOK_DOUBLE_FP = '8',
+	JSON_TOK_INT = 'i',
+	JSON_TOK_UINT = 'u',
 	JSON_TOK_TRUE = 't',
 	JSON_TOK_FALSE = 'f',
 	JSON_TOK_NULL = 'n',
@@ -108,6 +113,9 @@ struct json_obj_descr {
 			const struct json_obj_descr *element_descr;
 			size_t n_elements;
 		} array;
+		struct {
+			size_t size;
+		} field;
 	};
 };
 
@@ -157,6 +165,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
 		.field_name_len = sizeof(#field_name_) - 1, \
 		.type = type_, \
 		.offset = offsetof(struct_, field_name_), \
+		.field = { \
+			.size = SIZEOF_FIELD(struct_, field_name_) \
+		}, \
 	}
 
 /**
@@ -237,11 +248,22 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
  * @param elem_descr_len_ Number of elements in elem_descr_
  */
 #define Z_JSON_DESCR_OBJ(elem_descr_, elem_descr_len_) \
-	{ \
 		.object = { \
 			.sub_descr = elem_descr_, \
 			.sub_descr_len = elem_descr_len_, \
 		}, \
+
+/**
+ * @internal @brief Helper macro to declare a field descriptor
+ *
+ * @param struct_ Struct packing the values
+ * @param field_name_ Field name in the struct
+ */
+#define Z_JSON_DESCR_FIELD(struct_, field_name_) \
+	{ \
+		.field = { \
+			.size = SIZEOF_FIELD(struct_, field_name_), \
+		}, \
 	}
 
 /**
@@ -276,7 +298,8 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
 		.offset = offsetof(struct_, field_name_), \
 		.array = { \
 			.element_descr = Z_JSON_ELEMENT_DESCR(struct_, len_field_, \
-				elem_type_,), \
+				elem_type_, \
+				Z_JSON_DESCR_FIELD(struct_, field_name_[0])), \
 			.n_elements = (max_len_), \
 		}, \
 	}
@@ -449,6 +472,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
 		.field_name_len = sizeof(json_field_name_) - 1, \
 		.type = type_, \
 		.offset = offsetof(struct_, struct_field_name_), \
+		.field = { \
+			.size = SIZEOF_FIELD(struct_, struct_field_name_) \
+		}, \
 	}
 
 /**
@@ -504,8 +530,9 @@ typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
 		.type = JSON_TOK_ARRAY_START, \
 		.offset = offsetof(struct_, struct_field_name_), \
 		.array = { \
-			.element_descr = \
-				Z_JSON_ELEMENT_DESCR(struct_, len_field_, elem_type_,), \
+			.element_descr = Z_JSON_ELEMENT_DESCR(struct_, len_field_, \
+				elem_type_, \
+				Z_JSON_DESCR_FIELD(struct_, struct_field_name_[0])), \
 			.n_elements = (max_len_), \
 		}, \
 	}
diff --git a/include/zephyr/debug/coredump.h b/include/zephyr/debug/coredump.h
index 5ebdca5fc1e24..bf045763c4585 100644
--- a/include/zephyr/debug/coredump.h
+++ b/include/zephyr/debug/coredump.h
@@ -29,7 +29,7 @@
  * @file
  *
  * @defgroup coredump_apis Coredump APIs
- * @ingroup os_services
+ * @ingroup debug
  * @brief Coredump APIs
  * @{
  */
@@ -235,7 +235,7 @@ struct coredump_backend_api {
 	coredump_backend_start_t		start;
 
 	/* Signal to backend of the end of coredump. */
-	coredump_backend_end_t		end;
+	coredump_backend_end_t			end;
 
 	/* Raw buffer output */
 	coredump_backend_buffer_output_t	buffer_output;
diff --git a/include/zephyr/debug/coresight/cs_trace_defmt.h b/include/zephyr/debug/coresight/cs_trace_defmt.h
index b992067268102..b106586ca2b4b 100644
--- a/include/zephyr/debug/coresight/cs_trace_defmt.h
+++ b/include/zephyr/debug/coresight/cs_trace_defmt.h
@@ -14,6 +14,7 @@ extern "C" {
 
 /**
  * @defgroup coresight_apis Coresight APIs
+ * @ingroup debug
  * @{
  * @}
  * @defgroup cs_trace_defmt Coresight Trace Deformatter
diff --git a/include/zephyr/debug/cpu_load.h b/include/zephyr/debug/cpu_load.h
new file mode 100644
index 0000000000000..dbc816fd227b5
--- /dev/null
+++ b/include/zephyr/debug/cpu_load.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DEBUG_CPU_LOAD_H_
+#define ZEPHYR_INCLUDE_DEBUG_CPU_LOAD_H_
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup cpu_load CPU load monitor
+ *  @ingroup debug
+ *  @brief Module for monitoring CPU Load
+ *
+ *  This module allow monitoring of the CPU load.
+ *  @{
+ */
+
+/** @brief Hook called by the application specific hook on entering CPU idle. */
+void cpu_load_on_enter_idle(void);
+
+/** @brief Hook called by the application specific hook on exiting CPU idle. */
+void cpu_load_on_exit_idle(void);
+
+/** @brief Get CPU load.
+ *
+ * CPU load is measured using a timer which tracks amount of time spent in the
+ * CPU idle. Since it is a software tracking there is some small overhead.
+ * Precision depends on the frequency of the timer in relation to the CPU frequency.
+ *
+ * @param reset Reset the measurement after reading.
+ *
+ * @retval Positive number - CPU load in per mille.
+ * @retval Negative number - error code.
+ */
+int cpu_load_get(bool reset);
+
+/** @brief Control periodic CPU statistics report.
+ *
+ * Report logging is by default enabled.
+ *
+ * @param enable true to enable report logging and false to disable.
+ */
+void cpu_load_log_control(bool enable);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* ZEPHYR_INCLUDE_DEBUG_CPU_LOAD_H_ */
diff --git a/include/zephyr/debug/mipi_stp_decoder.h b/include/zephyr/debug/mipi_stp_decoder.h
index c3a87e7a2ff23..a28ecff83dbd9 100644
--- a/include/zephyr/debug/mipi_stp_decoder.h
+++ b/include/zephyr/debug/mipi_stp_decoder.h
@@ -15,7 +15,7 @@ extern "C" {
 
 /**
  * @defgroup mipi_stp_decoder_apis STP Decoder API
- * @ingroup os_services
+ * @ingroup debug
  * @{
  */
 
diff --git a/include/zephyr/debug/stack.h b/include/zephyr/debug/stack.h
index 365560a06245b..64dd547f0592d 100644
--- a/include/zephyr/debug/stack.h
+++ b/include/zephyr/debug/stack.h
@@ -21,9 +21,9 @@ static inline void log_stack_usage(const struct k_thread *thread)
 #if defined(CONFIG_INIT_STACKS) && defined(CONFIG_THREAD_STACK_INFO)
 	size_t unused, size = thread->stack_info.size;
 
-	TOOLCHAIN_IGNORE_WSHADOW_BEGIN;
+	TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_SHADOW);
 	LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
-	TOOLCHAIN_IGNORE_WSHADOW_END;
+	TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_SHADOW);
 
 	if (k_thread_stack_space_get(thread, &unused) == 0) {
 		unsigned int pcnt = ((size - unused) * 100U) / size;
diff --git a/include/zephyr/debug/symtab.h b/include/zephyr/debug/symtab.h
index 19afb5947b892..c83d2ba194870 100644
--- a/include/zephyr/debug/symtab.h
+++ b/include/zephyr/debug/symtab.h
@@ -15,7 +15,7 @@ extern "C" {
 
 /**
  * @defgroup symtab_apis Symbol Table API
- * @ingroup os_services
+ * @ingroup debug
  * @{
  */
 
diff --git a/include/zephyr/debug/thread_analyzer.h b/include/zephyr/debug/thread_analyzer.h
index d3d419bd8b636..c89607ab6a282 100644
--- a/include/zephyr/debug/thread_analyzer.h
+++ b/include/zephyr/debug/thread_analyzer.h
@@ -15,7 +15,7 @@ extern "C" {
 #endif
 
 /** @defgroup thread_analyzer Thread analyzer
- *  @ingroup os_services
+ *  @ingroup debug
  *  @brief Module for analyzing threads
  *
  *  This module implements functions and the configuration that simplifies
diff --git a/include/zephyr/device.h b/include/zephyr/device.h
index 57c628b94e94e..df2d47250c71c 100644
--- a/include/zephyr/device.h
+++ b/include/zephyr/device.h
@@ -135,13 +135,14 @@ typedef int16_t device_handle_t;
 #endif
 
 /**
- * @brief Create a device object and set it up for boot time initialization.
+ * @brief Create a device object and set it up for boot time initialization,
+ * with de-init capabilities.
  *
  * This macro defines a @ref device that is automatically configured by the
  * kernel during system initialization. This macro should only be used when the
  * device is not being allocated from a devicetree node. If you are allocating a
- * device from a devicetree node, use DEVICE_DT_DEFINE() or
- * DEVICE_DT_INST_DEFINE() instead.
+ * device from a devicetree node, use DEVICE_DT_DEINIT_DEFINE() or
+ * DEVICE_DT_INST_DEINIT_DEFINE() instead.
  *
  * @param dev_id A unique token which is used in the name of the global device
  * structure as a C identifier.
@@ -151,6 +152,9 @@ typedef int16_t device_handle_t;
  * (including terminating `NULL`) in order to be looked up from user mode.
  * @param init_fn Pointer to the device's initialization function, which will be
  * run by the kernel during system initialization. Can be `NULL`.
+ * @param deinit_fn Pointer to the device's de-initialization function. Can be
+ * `NULL`. It must release any acquired resources (e.g. pins, bus, clock...) and
+ * leave the device in its reset state.
  * @param pm Pointer to the device's power management resources, a
  * @ref pm_device, which will be stored in @ref device.pm field. Use `NULL` if
  * the device does not use PM.
@@ -164,13 +168,23 @@ typedef int16_t device_handle_t;
  * SYS_INIT() for details.
  * @param api Pointer to the device's API structure. Can be `NULL`.
  */
-#define DEVICE_DEFINE(dev_id, name, init_fn, pm, data, config, level, prio,    \
-		      api)                                                     \
+#define DEVICE_DEINIT_DEFINE(dev_id, name, init_fn, deinit_fn, pm, data,       \
+			     config, level, prio, api)                         \
 	Z_DEVICE_STATE_DEFINE(dev_id);                                         \
-	Z_DEVICE_DEFINE(DT_INVALID_NODE, dev_id, name, init_fn, pm, data,      \
-			config, level, prio, api,                              \
+	Z_DEVICE_DEFINE(DT_INVALID_NODE, dev_id, name, init_fn, deinit_fn, 0U, \
+			pm, data, config, level, prio, api,                    \
 			&Z_DEVICE_STATE_NAME(dev_id))
 
+/**
+ * @brief Create a device object and set it up for boot time initialization.
+ *
+ * @see DEVICE_DEINIT_DEFINE()
+ */
+#define DEVICE_DEFINE(dev_id, name, init_fn, pm, data, config, level, prio,    \
+		      api)                                                     \
+	DEVICE_DEINIT_DEFINE(dev_id, name, init_fn, NULL, pm, data, config,    \
+			     level, prio, api)
+
 /**
  * @brief Return a string name for a devicetree node.
  *
@@ -185,16 +199,6 @@ typedef int16_t device_handle_t;
 #define DEVICE_DT_NAME(node_id)                                                \
 	DT_PROP_OR(node_id, label, DT_NODE_FULL_NAME(node_id))
 
-/**
- * @brief Determine if a devicetree node initialization should be deferred.
- *
- * @param node_id The devicetree node identifier.
- *
- * @return Boolean stating if node initialization should be deferred.
- */
-#define DEVICE_DT_DEFER(node_id)                                               \
-	DT_PROP(node_id, zephyr_deferred_init)
-
 /**
  * @brief Create a device object from a devicetree node identifier and set it up
  * for boot time initialization.
@@ -213,6 +217,9 @@ typedef int16_t device_handle_t;
  * @param node_id The devicetree node identifier.
  * @param init_fn Pointer to the device's initialization function, which will be
  * run by the kernel during system initialization. Can be `NULL`.
+ * @param deinit_fn Pointer to the device's de-initialization function. Can be
+ * `NULL`. It must release any acquired resources (e.g. pins, bus, clock...) and
+ * leave the device in its reset state.
  * @param pm Pointer to the device's power management resources, a
  * @ref pm_device, which will be stored in @ref device.pm. Use `NULL` if the
  * device does not use PM.
@@ -226,15 +233,38 @@ typedef int16_t device_handle_t;
  * SYS_INIT() for details.
  * @param api Pointer to the device's API structure. Can be `NULL`.
  */
-#define DEVICE_DT_DEFINE(node_id, init_fn, pm, data, config, level, prio, api, \
-			 ...)                                                  \
+#define DEVICE_DT_DEINIT_DEFINE(node_id, init_fn, deinit_fn, pm, data, config, \
+				level, prio, api, ...)                         \
 	Z_DEVICE_STATE_DEFINE(Z_DEVICE_DT_DEV_ID(node_id));                    \
 	Z_DEVICE_DEFINE(node_id, Z_DEVICE_DT_DEV_ID(node_id),                  \
-			DEVICE_DT_NAME(node_id), init_fn, pm, data, config,    \
-			level, prio, api,                                      \
+			DEVICE_DT_NAME(node_id), init_fn, deinit_fn,           \
+			Z_DEVICE_DT_FLAGS(node_id), pm, data, config, level,   \
+			prio, api,                                             \
 			&Z_DEVICE_STATE_NAME(Z_DEVICE_DT_DEV_ID(node_id)),     \
 			__VA_ARGS__)
 
+/**
+ * @brief Create a device object from a devicetree node identifier and set it up
+ * for boot time initialization.
+ *
+ * @see DEVICE_DT_DEINIT_DEFINE()
+ */
+#define DEVICE_DT_DEFINE(node_id, init_fn, pm, data, config, level, prio, api, \
+			 ...)                                                  \
+	DEVICE_DT_DEINIT_DEFINE(node_id, init_fn, NULL, pm, data, config,      \
+				level, prio, api, __VA_ARGS__)
+
+/**
+ * @brief Like DEVICE_DT_DEINIT_DEFINE(), but uses an instance of a
+ * `DT_DRV_COMPAT` compatible instead of a node identifier.
+ *
+ * @param inst Instance number. The `node_id` argument to DEVICE_DT_DEFINE() is
+ * set to `DT_DRV_INST(inst)`.
+ * @param ... Other parameters as expected by DEVICE_DT_DEFINE().
+ */
+#define DEVICE_DT_INST_DEINIT_DEFINE(inst, ...)                                \
+	DEVICE_DT_DEINIT_DEFINE(DT_DRV_INST(inst), __VA_ARGS__)
+
 /**
  * @brief Like DEVICE_DT_DEFINE(), but uses an instance of a `DT_DRV_COMPAT`
  * compatible instead of a node identifier.
@@ -447,6 +477,27 @@ struct device_dt_metadata;
 #define Z_DEVICE_DEPS_CONST const
 #endif
 
+/** Device flags */
+typedef uint8_t device_flags_t;
+
+/**
+ * @name Device flags
+ * @{
+ */
+
+/** Device initialization is deferred */
+#define DEVICE_FLAG_INIT_DEFERRED BIT(0)
+
+/** @} */
+
+/** Device operations */
+struct device_ops {
+	/** Initialization function */
+	int (*init)(const struct device *dev);
+	/** De-initialization function */
+	int (*deinit)(const struct device *dev);
+};
+
 /**
  * @brief Runtime device structure (in ROM) per driver instance
  */
@@ -461,6 +512,10 @@ struct device {
 	struct device_state *state;
 	/** Address of the device instance private data */
 	void *data;
+	/** Device operations */
+	struct device_ops ops;
+	/** Device flags */
+	device_flags_t flags;
 #if defined(CONFIG_DEVICE_DEPS) || defined(__DOXYGEN__)
 	/**
 	 * Optional pointer to dependencies associated with the device.
@@ -809,17 +864,35 @@ __syscall bool device_is_ready(const struct device *dev);
  *
  * A device whose initialization was deferred (by marking it as
  * ``zephyr,deferred-init`` on devicetree) needs to be initialized manually via
- * this call. Note that only devices whose initialization was deferred can be
- * initialized via this call - one can not try to initialize a non
- * initialization deferred device that failed initialization with this call.
+ * this call. De-initialized devices can also be initialized again via this
+ * call.
  *
  * @param dev device to be initialized.
  *
- * @retval -ENOENT If device was not found - or isn't a deferred one.
+ * @retval -EALREADY Device is already initialized.
  * @retval -errno For other errors.
  */
 __syscall int device_init(const struct device *dev);
 
+/**
+ * @brief De-initialize a device.
+ *
+ * When a device is de-initialized, it will release any resources it has
+ * acquired (e.g. pins, memory, clocks, DMA channels, etc.) and its status will
+ * be left as in its reset state.
+ *
+ * @warning It is the responsibility of the caller to ensure that the device is
+ * ready to be de-initialized.
+ *
+ * @param dev device to be de-initialized.
+ *
+ * @retval 0 If successful
+ * @retval -EPERM If device has not been initialized.
+ * @retval -ENOTSUP If device does not support de-initialization.
+ * @retval -errno For any other errors.
+ */
+__syscall int device_deinit(const struct device *dev);
+
 /**
  * @}
  */
@@ -841,6 +914,14 @@ __syscall int device_init(const struct device *dev);
 	static Z_DECL_ALIGN(struct device_state) Z_DEVICE_STATE_NAME(dev_id)   \
 		__attribute__((__section__(".z_devstate")))
 
+/**
+ * @brief Device flags obtained from DT.
+ *
+ * @param node_id Devicetree node identifier.
+ */
+#define Z_DEVICE_DT_FLAGS(node_id)                                             \
+	(DT_PROP_OR(node_id, zephyr_deferred_init, 0U) * DEVICE_FLAG_INIT_DEFERRED)
+
 #if defined(CONFIG_DEVICE_DEPS) || defined(__DOXYGEN__)
 
 /**
@@ -1055,6 +1136,9 @@ device_get_dt_nodelabels(const struct device *dev)
  * @brief Initializer for @ref device.
  *
  * @param name_ Name of the device.
+ * @param init_fn_ Init function (optional).
+ * @param deinit_fn_ De-init function (optional).
+ * @param flags_ Device flags.
  * @param pm_ Reference to @ref pm_device_base (optional).
  * @param data_ Reference to device data.
  * @param config_ Reference to device config.
@@ -1064,14 +1148,16 @@ device_get_dt_nodelabels(const struct device *dev)
  * @param node_id_ Devicetree node identifier
  * @param dev_id_ Device identifier token, as passed to Z_DEVICE_BASE_DEFINE
  */
-#define Z_DEVICE_INIT(name_, pm_, data_, config_, api_, state_, deps_, node_id_,	\
-		      dev_id_)								\
+#define Z_DEVICE_INIT(name_, init_fn_, deinit_fn_, flags_, pm_, data_, config_, api_,   \
+		      state_, deps_, node_id_, dev_id_)					\
 	{										\
 		.name = name_,								\
 		.config = (config_),							\
 		.api = (api_),								\
 		.state = (state_),							\
 		.data = (data_),							\
+		.ops = { .init = (init_fn_), .deinit = (deinit_fn_) },			\
+		.flags = (flags_),							\
 		IF_ENABLED(CONFIG_DEVICE_DEPS, (.deps = (deps_),)) /**/			\
 		IF_ENABLED(CONFIG_PM_DEVICE, Z_DEVICE_INIT_PM_BASE(pm_)) /**/		\
 		IF_ENABLED(CONFIG_DEVICE_DT_METADATA,					\
@@ -1107,6 +1193,9 @@ device_get_dt_nodelabels(const struct device *dev)
  * software device).
  * @param dev_id Device identifier (used to name the defined @ref device).
  * @param name Name of the device.
+ * @param init_fn Init function.
+ * @param deinit_fn De-init function.
+ * @param flags Device flags.
  * @param pm Reference to @ref pm_device_base associated with the device.
  * (optional).
  * @param data Reference to device data.
@@ -1116,14 +1205,15 @@ device_get_dt_nodelabels(const struct device *dev)
  * @param api Reference to device API.
  * @param ... Optional dependencies, manually specified.
  */
-#define Z_DEVICE_BASE_DEFINE(node_id, dev_id, name, pm, data, config, level, prio, api, state,     \
-			     deps)                                                    \
+#define Z_DEVICE_BASE_DEFINE(node_id, dev_id, name, init_fn, deinit_fn, flags, pm, data, config,   \
+			     level, prio, api, state, deps)                                        \
 	COND_CODE_1(DT_NODE_EXISTS(node_id), (), (static))                                         \
 	COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id), (), (const))                                     \
 	STRUCT_SECTION_ITERABLE_NAMED_ALTERNATE(                                                   \
 		device, COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id), (device_mutable), (device)),     \
 		Z_DEVICE_SECTION_NAME(level, prio), DEVICE_NAME_GET(dev_id)) =                     \
-		Z_DEVICE_INIT(name, pm, data, config, api, state, deps, node_id, dev_id)
+		Z_DEVICE_INIT(name, init_fn, deinit_fn, flags, pm, data, config, api, state, deps, \
+			      node_id, dev_id)
 
 /**
  * @brief Issue an error if the given init level is not supported.
@@ -1142,43 +1232,18 @@ device_get_dt_nodelabels(const struct device *dev)
  * @param node_id Devicetree node id for the device (DT_INVALID_NODE if a
  * software device).
  * @param dev_id Device identifier.
- * @param init_fn_ Device init function.
  * @param level Initialization level.
  * @param prio Initialization priority.
  */
-#define Z_DEVICE_INIT_ENTRY_DEFINE(node_id, dev_id, init_fn_, level, prio)                         \
+#define Z_DEVICE_INIT_ENTRY_DEFINE(node_id, dev_id, level, prio)                                   \
 	Z_DEVICE_CHECK_INIT_LEVEL(level)                                                           \
                                                                                                    \
 	static const Z_DECL_ALIGN(struct init_entry) __used __noasan Z_INIT_ENTRY_SECTION(         \
 		level, prio, Z_DEVICE_INIT_SUB_PRIO(node_id))                                      \
 		Z_INIT_ENTRY_NAME(DEVICE_NAME_GET(dev_id)) = {                                     \
-			.init_fn = {COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id), (.dev_rw), (.dev)) = \
-					    (init_fn_)},                                           \
-			Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id),                                  \
-	}
-
-#define Z_DEFER_DEVICE_INIT_ENTRY_DEFINE(node_id, dev_id, init_fn_)                                \
-	static const Z_DECL_ALIGN(struct init_entry) __used __noasan                               \
-		__attribute__((__section__(".z_deferred_init")))                                   \
-		Z_INIT_ENTRY_NAME(DEVICE_NAME_GET(dev_id)) = {                                     \
-			.init_fn = {COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id), (.dev_rw), (.dev)) = \
-					    (init_fn_)},                                           \
-			Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id),                                  \
-	}
-
-/*
- * Anonymous unions require C11. Some pre-C11 gcc versions have early support for anonymous
- * unions but they require these braces when combined with C99 designated initializers. For
- * more details see https://docs.zephyrproject.org/latest/develop/languages/cpp/
- */
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__) < 201100
-#  define Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id) { Z_DEV_ENTRY_DEV(node_id, dev_id) }
-#else
-#  define Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id)   Z_DEV_ENTRY_DEV(node_id, dev_id)
-#endif
-
-#define Z_DEV_ENTRY_DEV(node_id, dev_id)                                                           \
-	COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id), (.dev_rw), (.dev)) =  &DEVICE_NAME_GET(dev_id)
+			.init_fn = NULL,                                                           \
+			.dev = (const struct device *)&DEVICE_NAME_GET(dev_id),                    \
+		}
 
 /**
  * @brief Define a @ref device and all other required objects.
@@ -1191,6 +1256,7 @@ device_get_dt_nodelabels(const struct device *dev)
  * @param dev_id Device identifier (used to name the defined @ref device).
  * @param name Name of the device.
  * @param init_fn Device init function.
+ * @param flags Device flags.
  * @param pm Reference to @ref pm_device_base associated with the device.
  * (optional).
  * @param data Reference to device data.
@@ -1201,8 +1267,8 @@ device_get_dt_nodelabels(const struct device *dev)
  * @param state Reference to device state.
  * @param ... Optional dependencies, manually specified.
  */
-#define Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, pm, data, config,       \
-			level, prio, api, state, ...)                           \
+#define Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, deinit_fn, flags, pm,   \
+			data, config, level, prio, api, state, ...)             \
 	Z_DEVICE_NAME_CHECK(name);                                              \
                                                                                 \
 	IF_ENABLED(CONFIG_DEVICE_DEPS,                                          \
@@ -1212,13 +1278,12 @@ device_get_dt_nodelabels(const struct device *dev)
 		   (IF_ENABLED(DT_NODE_EXISTS(node_id),                         \
 			      (Z_DEVICE_DT_METADATA_DEFINE(node_id, dev_id);))))\
                                                                                 \
-	Z_DEVICE_BASE_DEFINE(node_id, dev_id, name, pm, data, config, level,    \
-		prio, api, state, Z_DEVICE_DEPS_NAME(dev_id));                  \
-	COND_CODE_1(DEVICE_DT_DEFER(node_id),                                   \
-		    (Z_DEFER_DEVICE_INIT_ENTRY_DEFINE(node_id, dev_id,          \
-						      init_fn)),                \
-		    (Z_DEVICE_INIT_ENTRY_DEFINE(node_id, dev_id, init_fn,       \
-						level, prio)));                 \
+	Z_DEVICE_BASE_DEFINE(node_id, dev_id, name, init_fn, deinit_fn, flags,  \
+			     pm, data, config, level, prio, api, state,         \
+			     Z_DEVICE_DEPS_NAME(dev_id));                       \
+                                                                                \
+	Z_DEVICE_INIT_ENTRY_DEFINE(node_id, dev_id, level, prio);               \
+                                                                                \
 	IF_ENABLED(CONFIG_LLEXT_EXPORT_DEVICES,                                 \
 		(IF_ENABLED(DT_NODE_EXISTS(node_id),                            \
 				(Z_DEVICE_EXPORT(node_id);))))
diff --git a/include/zephyr/display/cfb.h b/include/zephyr/display/cfb.h
index 9cdf81e259af4..ea00b8aa2fd3c 100644
--- a/include/zephyr/display/cfb.h
+++ b/include/zephyr/display/cfb.h
@@ -28,7 +28,7 @@ extern "C" {
  */
 
 enum cfb_display_param {
-	CFB_DISPLAY_HEIGH		= 0,
+	CFB_DISPLAY_HEIGHT		= 0,
 	CFB_DISPLAY_WIDTH,
 	CFB_DISPLAY_PPT,
 	CFB_DISPLAY_ROWS,
diff --git a/include/zephyr/drivers/adc/current_sense_amplifier.h b/include/zephyr/drivers/adc/current_sense_amplifier.h
index 05c9a98d15843..59d091706d4f5 100644
--- a/include/zephyr/drivers/adc/current_sense_amplifier.h
+++ b/include/zephyr/drivers/adc/current_sense_amplifier.h
@@ -11,11 +11,13 @@
 #include <zephyr/drivers/gpio.h>
 
 struct current_sense_amplifier_dt_spec {
-	const struct adc_dt_spec port;
+	struct adc_dt_spec port;
+	struct gpio_dt_spec power_gpio;
 	uint32_t sense_milli_ohms;
 	uint16_t sense_gain_mult;
 	uint16_t sense_gain_div;
-	struct gpio_dt_spec power_gpio;
+	uint16_t noise_threshold;
+	bool enable_calibration;
 };
 
 /**
@@ -31,10 +33,12 @@ struct current_sense_amplifier_dt_spec {
 #define CURRENT_SENSE_AMPLIFIER_DT_SPEC_GET(node_id)                                               \
 	{                                                                                          \
 		.port = ADC_DT_SPEC_GET(node_id),                                                  \
+		.power_gpio = GPIO_DT_SPEC_GET_OR(node_id, power_gpios, {0}),                      \
 		.sense_milli_ohms = DT_PROP(node_id, sense_resistor_milli_ohms),                   \
 		.sense_gain_mult = DT_PROP(node_id, sense_gain_mult),                              \
 		.sense_gain_div = DT_PROP(node_id, sense_gain_div),                                \
-		.power_gpio = GPIO_DT_SPEC_GET_OR(node_id, power_gpios, {0}),                      \
+		.noise_threshold = DT_PROP(node_id, zephyr_noise_threshold),                       \
+		.enable_calibration = DT_PROP_OR(node_id, enable_calibration, false),              \
 	}
 
 /**
diff --git a/include/zephyr/drivers/can.h b/include/zephyr/drivers/can.h
index 5f32b8c3b4867..edebeed3fff41 100644
--- a/include/zephyr/drivers/can.h
+++ b/include/zephyr/drivers/can.h
@@ -761,7 +761,8 @@ struct can_device_state {
 	Z_DEVICE_DEFINE(node_id, Z_DEVICE_DT_DEV_ID(node_id),		\
 			DEVICE_DT_NAME(node_id),			\
 			&UTIL_CAT(Z_DEVICE_DT_DEV_ID(node_id), _init),	\
-			pm, data, config, level, prio, api,		\
+			NULL, Z_DEVICE_DT_FLAGS(node_id), pm, data,	\
+			config,	level, prio, api,			\
 			&(Z_DEVICE_STATE_NAME(Z_DEVICE_DT_DEV_ID(node_id)).devstate), \
 			__VA_ARGS__)
 
diff --git a/include/zephyr/drivers/clock_control.h b/include/zephyr/drivers/clock_control.h
index 27d65fe307925..6e322a8b07a34 100644
--- a/include/zephyr/drivers/clock_control.h
+++ b/include/zephyr/drivers/clock_control.h
@@ -128,6 +128,10 @@ static inline int clock_control_on(const struct device *dev,
 	const struct clock_control_driver_api *api =
 		(const struct clock_control_driver_api *)dev->api;
 
+	if (api->on == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->on(dev, sys);
 }
 
@@ -147,6 +151,10 @@ static inline int clock_control_off(const struct device *dev,
 	const struct clock_control_driver_api *api =
 		(const struct clock_control_driver_api *)dev->api;
 
+	if (api->off == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->off(dev, sys);
 }
 
diff --git a/include/zephyr/drivers/clock_control/adi_max32_clock_control.h b/include/zephyr/drivers/clock_control/adi_max32_clock_control.h
index cd889d370b252..0f1e7b128823e 100644
--- a/include/zephyr/drivers/clock_control/adi_max32_clock_control.h
+++ b/include/zephyr/drivers/clock_control/adi_max32_clock_control.h
@@ -41,7 +41,7 @@ struct max32_perclk {
 
 #define ADI_MAX32_CLK_IPO_FREQ    DT_PROP(DT_NODELABEL(clk_ipo), clock_frequency)
 #define ADI_MAX32_CLK_ERFO_FREQ   DT_PROP_OR(DT_NODELABEL(clk_erfo), clock_frequency, 0)
-#define ADI_MAX32_CLK_IBRO_FREQ   DT_PROP(DT_NODELABEL(clk_ibro), clock_frequency)
+#define ADI_MAX32_CLK_IBRO_FREQ   DT_PROP_OR(DT_NODELABEL(clk_ibro), clock_frequency, 0)
 #define ADI_MAX32_CLK_ISO_FREQ    DT_PROP_OR(DT_NODELABEL(clk_iso), clock_frequency, 0)
 #define ADI_MAX32_CLK_INRO_FREQ   DT_PROP(DT_NODELABEL(clk_inro), clock_frequency)
 #define ADI_MAX32_CLK_ERTCO_FREQ  DT_PROP(DT_NODELABEL(clk_ertco), clock_frequency)
diff --git a/include/zephyr/drivers/clock_control/nrf_clock_control.h b/include/zephyr/drivers/clock_control/nrf_clock_control.h
index 866b4fe2ee1bb..f94667700d29b 100644
--- a/include/zephyr/drivers/clock_control/nrf_clock_control.h
+++ b/include/zephyr/drivers/clock_control/nrf_clock_control.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CONTROL_H_
 
 #include <zephyr/device.h>
-#if defined(NRF_CLOCK) && !defined(NRF_LFRC)
+#ifdef NRF_CLOCK
 #include <hal/nrf_clock.h>
 #endif
 #include <zephyr/sys/onoff.h>
@@ -343,25 +343,6 @@ void nrf_clock_control_hfxo_release(void);
 
 #endif /* defined(CONFIG_CLOCK_CONTROL_NRF2) */
 
-/** @brief Get clock frequency that is used for the given node.
- *
- * Macro checks if node has clock property and if yes then if clock has clock_frequency property
- * then it is returned. If it has supported_clock_frequency property with the list of supported
- * frequencies then the last one is returned with assumption that they are ordered and the last
- * one is the highest. If node does not have clock then 16 MHz is returned which is the default
- * frequency.
- *
- * @param node Devicetree node.
- *
- * @return Frequency of the clock that is used for the node.
- */
-#define NRF_PERIPH_GET_FREQUENCY(node) \
-	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
-		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
-			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
-			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
-		(NRFX_MHZ_TO_HZ(16)))
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/drivers/clock_control/stm32_clock_control.h b/include/zephyr/drivers/clock_control/stm32_clock_control.h
index 4165d20c06f47..49c74d1922bf1 100644
--- a/include/zephyr/drivers/clock_control/stm32_clock_control.h
+++ b/include/zephyr/drivers/clock_control/stm32_clock_control.h
@@ -53,6 +53,8 @@
 #include <zephyr/dt-bindings/clock/stm32h7_clock.h>
 #elif defined(CONFIG_SOC_SERIES_STM32H7RSX)
 #include <zephyr/dt-bindings/clock/stm32h7rs_clock.h>
+#elif defined(CONFIG_SOC_SERIES_STM32MP13X)
+#include <zephyr/dt-bindings/clock/stm32mp13_clock.h>
 #elif defined(CONFIG_SOC_SERIES_STM32N6X)
 #include <zephyr/dt-bindings/clock/stm32n6_clock.h>
 #elif defined(CONFIG_SOC_SERIES_STM32U0X)
@@ -148,6 +150,21 @@
 #define STM32_SYSCLK_SRC_IC2	1
 #endif
 
+#if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(rcc), st_stm32n6_rcc, okay)
+#if (DT_SAME_NODE(DT_CLOCKS_CTLR_BY_IDX(DT_NODELABEL(cpusw), 0), DT_NODELABEL(rcc)))
+#if (DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(cpusw), 0, bus) == STM32_SRC_HSI)
+#define STM32_CPUCLK_SRC_HSI	1
+#elif (DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(cpusw), 0, bus) == STM32_SRC_MSI)
+#define STM32_CPUCLK_SRC_MSI	1
+#elif (DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(cpusw), 0, bus) == STM32_SRC_HSE)
+#define STM32_CPUCLK_SRC_HSE	1
+#elif (DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(cpusw), 0, bus) == STM32_SRC_IC1)
+#define STM32_CPUCLK_SRC_IC1	1
+#endif
+#endif /* cpusw clk source is rcc */
+
+#define STM32_TIMG_PRESCALER	DT_PROP(DT_NODELABEL(rcc), timg_prescaler)
+#endif /* rcc node compatible st_stm32n6_rcc and okay */
 
 /** PLL node related symbols */
 
@@ -446,7 +463,8 @@
 #define STM32_HSI_FREQ		DT_PROP(DT_NODELABEL(clk_hsi), clock_frequency)
 #elif DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(clk_hsi), st_stm32h7_hsi_clock, okay) \
 	|| DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(clk_hsi), st_stm32g0_hsi_clock, okay) \
-	|| DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(clk_hsi), st_stm32c0_hsi_clock, okay)
+	|| DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(clk_hsi), st_stm32c0_hsi_clock, okay) \
+	|| DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(clk_hsi), st_stm32n6_hsi_clock, okay)
 #define STM32_HSI_DIV_ENABLED	1
 #define STM32_HSI_ENABLED	1
 #define STM32_HSI_DIVISOR	DT_PROP(DT_NODELABEL(clk_hsi), hsi_div)
@@ -658,68 +676,36 @@ struct stm32_pclken {
 /** Clock source binding accessors */
 
 /**
- * @brief Obtain register field from clock configuration.
+ * @brief Obtain register field from clock source selection configuration.
  *
  * @param clock clock bit field value.
  */
-#define STM32_CLOCK_REG_GET(clock) \
-	(((clock) >> STM32_CLOCK_REG_SHIFT) & STM32_CLOCK_REG_MASK)
+#define STM32_DT_CLKSEL_REG_GET(clock) \
+	(((clock) >> STM32_DT_CLKSEL_REG_SHIFT) & STM32_DT_CLKSEL_REG_MASK)
 
 /**
- * @brief Obtain position field from clock configuration.
+ * @brief Obtain position field from clock source selection configuration.
  *
  * @param clock Clock bit field value.
  */
-#define STM32_CLOCK_SHIFT_GET(clock) \
-	(((clock) >> STM32_CLOCK_SHIFT_SHIFT) & STM32_CLOCK_SHIFT_MASK)
+#define STM32_DT_CLKSEL_SHIFT_GET(clock) \
+	(((clock) >> STM32_DT_CLKSEL_SHIFT_SHIFT) & STM32_DT_CLKSEL_SHIFT_MASK)
 
 /**
- * @brief Obtain mask field from clock configuration.
+ * @brief Obtain mask field from clock source selection configuration.
  *
  * @param clock Clock bit field value.
  */
-#define STM32_CLOCK_MASK_GET(clock) \
-	(((clock) >> STM32_CLOCK_MASK_SHIFT) & STM32_CLOCK_MASK_MASK)
+#define STM32_DT_CLKSEL_MASK_GET(clock) \
+	(((clock) >> STM32_DT_CLKSEL_MASK_SHIFT) & STM32_DT_CLKSEL_MASK_MASK)
 
 /**
- * @brief Obtain value field from clock configuration.
+ * @brief Obtain value field from clock source selection configuration.
  *
  * @param clock Clock bit field value.
  */
-#define STM32_CLOCK_VAL_GET(clock) \
-	(((clock) >> STM32_CLOCK_VAL_SHIFT) & STM32_CLOCK_VAL_MASK)
-
-/**
- * @brief Obtain register field from MCO configuration.
- *
- * @param mco_cfgr MCO configuration bit field value.
- */
-#define STM32_MCO_CFGR_REG_GET(mco_cfgr) \
-	(((mco_cfgr) >> STM32_MCO_CFGR_REG_SHIFT) & STM32_MCO_CFGR_REG_MASK)
-
-/**
- * @brief Obtain position field from MCO configuration.
- *
- * @param mco_cfgr MCO configuration bit field value.
- */
-#define STM32_MCO_CFGR_SHIFT_GET(mco_cfgr) \
-	(((mco_cfgr) >> STM32_MCO_CFGR_SHIFT_SHIFT) & STM32_MCO_CFGR_SHIFT_MASK)
-
-/**
- * @brief Obtain mask field from MCO configuration.
- *
- * @param mco_cfgr MCO configuration bit field value.
- */
-#define STM32_MCO_CFGR_MASK_GET(mco_cfgr) \
-	(((mco_cfgr) >> STM32_MCO_CFGR_MASK_SHIFT) & STM32_MCO_CFGR_MASK_MASK)
-
-/**
- * @brief Obtain value field from MCO configuration.
- *
- * @param mco_cfgr MCO configuration bit field value.
- */
-#define STM32_MCO_CFGR_VAL_GET(mco_cfgr) \
-	(((mco_cfgr) >> STM32_MCO_CFGR_VAL_SHIFT) & STM32_MCO_CFGR_VAL_MASK)
+#define STM32_DT_CLKSEL_VAL_GET(clock) \
+	(((clock) >> STM32_DT_CLKSEL_VAL_SHIFT) & STM32_DT_CLKSEL_VAL_MASK)
 
 #if defined(STM32_HSE_CSS)
 /**
diff --git a/include/zephyr/drivers/console/native_posix_console.h b/include/zephyr/drivers/console/native_posix_console.h
index 6a4429ab8303b..c68f1328742d7 100644
--- a/include/zephyr/drivers/console/native_posix_console.h
+++ b/include/zephyr/drivers/console/native_posix_console.h
@@ -7,6 +7,9 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_NATIVE_POSIX_CONSOLE_H_
 #define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_NATIVE_POSIX_CONSOLE_H_
 
+#warning "This header is now deprecated and will be removed by v4.4. "\
+	 "Use posix_arch_console.h instead."
+
 /*
  * This header is left for compatibility with old applications
  * The console for native_posix is now provided by the posix_arch_console driver
diff --git a/include/zephyr/drivers/counter.h b/include/zephyr/drivers/counter.h
index 0e14ade3b5172..d929c0d8332a0 100644
--- a/include/zephyr/drivers/counter.h
+++ b/include/zephyr/drivers/counter.h
@@ -215,6 +215,7 @@ typedef int (*counter_api_get_value)(const struct device *dev,
 				     uint32_t *ticks);
 typedef int (*counter_api_get_value_64)(const struct device *dev,
 			uint64_t *ticks);
+typedef int (*counter_api_reset)(const struct device *dev);
 typedef int (*counter_api_set_alarm)(const struct device *dev,
 				     uint8_t chan_id,
 				     const struct counter_alarm_cfg *alarm_cfg);
@@ -236,6 +237,7 @@ __subsystem struct counter_driver_api {
 	counter_api_stop stop;
 	counter_api_get_value get_value;
 	counter_api_get_value_64 get_value_64;
+	counter_api_reset reset;
 	counter_api_set_alarm set_alarm;
 	counter_api_cancel_alarm cancel_alarm;
 	counter_api_set_top_value set_top_value;
@@ -425,12 +427,33 @@ static inline int z_impl_counter_get_value_64(const struct device *dev,
 				(struct counter_driver_api *)dev->api;
 
 	if (!api->get_value_64) {
-		return -ENOTSUP;
+		return -ENOSYS;
 	}
 
 	return api->get_value_64(dev, ticks);
 }
 
+/**
+ * @brief Reset the counter to the initial value.
+ * @param dev Pointer to the device structure for the driver instance.
+ *
+ * @retval 0 If successful.
+ * @retval -errno Negative error code on failure resetting the counter value.
+ */
+__syscall int counter_reset(const struct device *dev);
+
+static inline int z_impl_counter_reset(const struct device *dev)
+{
+	const struct counter_driver_api *api =
+				(struct counter_driver_api *)dev->api;
+
+	if (!api->reset) {
+		return -ENOSYS;
+	}
+
+	return api->reset(dev);
+}
+
 /**
  * @brief Set a single shot alarm on a channel.
  *
@@ -627,7 +650,7 @@ static inline uint32_t z_impl_counter_get_top_value(const struct device *dev)
  * @param flags		See @ref COUNTER_GUARD_PERIOD_FLAGS.
  *
  * @retval 0 if successful.
- * @retval -ENOTSUP if function or flags are not supported.
+ * @retval -ENOSYS if function or flags are not supported.
  * @retval -EINVAL if ticks value is invalid.
  */
 __syscall int counter_set_guard_period(const struct device *dev,
@@ -641,7 +664,7 @@ static inline int z_impl_counter_set_guard_period(const struct device *dev,
 				(struct counter_driver_api *)dev->api;
 
 	if (!api->set_guard_period) {
-		return -ENOTSUP;
+		return -ENOSYS;
 	}
 
 	return api->set_guard_period(dev, ticks, flags);
diff --git a/include/zephyr/drivers/dac/dac161s997.h b/include/zephyr/drivers/dac/dac161s997.h
new file mode 100644
index 0000000000000..2ffe5d44e577b
--- /dev/null
+++ b/include/zephyr/drivers/dac/dac161s997.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2025 Vitrolife A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_DAC_DAC161S997_H_
+#define ZEPHYR_INCLUDE_DRIVERS_DAC_DAC161S997_H_
+
+#include <stdint.h>
+#include <zephyr/device.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+union dac161s997_status {
+	uint8_t raw;
+	struct {
+		/**
+		 * True if the DAC161S997 is unable to maintain the output current.
+		 */
+		bool current_loop_status: 1;
+		/**
+		 * Identical to current_loop_status except this bit is sticky.
+		 */
+		bool loop_status: 1;
+		/**
+		 * True if a SPI command has not been received within SPI timeout period (default
+		 * 100 ms). If this error occurs, it is cleared with a properly formatted write
+		 * command to a valid address.
+		 */
+		bool spi_timeout_error: 1;
+		/**
+		 * A frame error is caused by an incorrect number of clocks during a register write.
+		 * A register write without an integer multiple of 24 clock cycles will cause a
+		 * Frame error.
+		 */
+		bool frame_status: 1;
+		/**
+		 * Returns the state of the ERR_LVL pin.
+		 */
+		bool error_level_pin_state: 1;
+		/**
+		 * DAC resolution register. Always returns 0x7.
+		 */
+		uint8_t dac_resolution: 3;
+	} __packed;
+};
+
+/**
+ * @typedef dac161s997_error_callback_t
+ * @brief Callback to invoke when an error is triggered
+ *
+ * @param dev Pointer to the device
+ * @param status NULL if read was not possible otherwise pointer to status.
+ */
+typedef void (*dac161s997_error_callback_t)(const struct device *dev,
+					    const union dac161s997_status *status);
+
+/**
+ * @brief Set callback to invoke when an error is triggered
+ *
+ * The callback runs in a work queue context and the device is locked while it runs.
+ *
+ * @param dev Pointer to the device
+ * @param cb Callback to invoke when an error is triggered
+ *
+ * @returns 0 on success and -errno otherwise.
+ */
+int dac161s997_set_error_callback(const struct device *dev, dac161s997_error_callback_t cb);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_DAC_DAC161S997_H_ */
diff --git a/include/zephyr/drivers/display.h b/include/zephyr/drivers/display.h
index 8fd26978beab4..c458050b27d3f 100644
--- a/include/zephyr/drivers/display.h
+++ b/include/zephyr/drivers/display.h
@@ -46,6 +46,8 @@ enum display_pixel_format {
 	PIXEL_FORMAT_ARGB_8888		= BIT(3), /**< 32-bit ARGB */
 	PIXEL_FORMAT_RGB_565		= BIT(4), /**< 16-bit RGB */
 	PIXEL_FORMAT_BGR_565		= BIT(5), /**< 16-bit BGR */
+	PIXEL_FORMAT_L_8		= BIT(6), /**< 8-bit Grayscale/Luminance, equivalent to */
+						  /**< GRAY, GREY, GRAY8, Y8, R8, etc...        */
 };
 
 /**
@@ -61,7 +63,8 @@ enum display_pixel_format {
 	(((fmt & PIXEL_FORMAT_MONO10) >> 2) * 1U) +				\
 	(((fmt & PIXEL_FORMAT_ARGB_8888) >> 3) * 32U) +				\
 	(((fmt & PIXEL_FORMAT_RGB_565) >> 4) * 16U) +				\
-	(((fmt & PIXEL_FORMAT_BGR_565) >> 5) * 16U))
+	(((fmt & PIXEL_FORMAT_BGR_565) >> 5) * 16U) +				\
+	(((fmt & PIXEL_FORMAT_L_8) >> 6) * 8U))
 
 /**
  * @brief Display screen information
@@ -165,6 +168,13 @@ typedef int (*display_read_api)(const struct device *dev, const uint16_t x,
 				const struct display_buffer_descriptor *desc,
 				void *buf);
 
+/**
+ * @typedef display_clear
+ * @brief Callback API for clearing the screen of the display
+ * See display_clear() for argument description
+ */
+typedef int (*display_clear_api)(const struct device *dev);
+
 /**
  * @typedef display_get_framebuffer_api
  * @brief Callback API to get framebuffer pointer
@@ -224,6 +234,7 @@ __subsystem struct display_driver_api {
 	display_blanking_off_api blanking_off;
 	display_write_api write;
 	display_read_api read;
+	display_clear_api clear;
 	display_get_framebuffer_api get_framebuffer;
 	display_set_brightness_api set_brightness;
 	display_set_contrast_api set_contrast;
@@ -281,6 +292,26 @@ static inline int display_read(const struct device *dev, const uint16_t x,
 	return api->read(dev, x, y, desc, buf);
 }
 
+/**
+ * @brief Clear the screen of the display device
+ *
+ * @param dev Pointer to device structure
+ *
+ * @retval 0 on success else negative errno code.
+ * @retval -ENOSYS if not implemented.
+ */
+static inline int display_clear(const struct device *dev)
+{
+	struct display_driver_api *api =
+		(struct display_driver_api *)dev->api;
+
+	if (api->clear == NULL) {
+		return -ENOSYS;
+	}
+
+	return api->clear(dev);
+}
+
 /**
  * @brief Get pointer to framebuffer for direct access
  *
diff --git a/include/zephyr/drivers/espi.h b/include/zephyr/drivers/espi.h
index 62e4ce5e28bf0..d3c39d1e0d927 100644
--- a/include/zephyr/drivers/espi.h
+++ b/include/zephyr/drivers/espi.h
@@ -728,6 +728,8 @@ static inline int z_impl_espi_write_lpc_request(const struct device *dev,
  *
  * @retval 0 If successful.
  * @retval -EIO General input / output error, failed to send over the bus.
+ * @retval -EINVAL invalid signal.
+ * @retval -ETIMEDOUT timeout waiting for eSPI controller to process the VW.
  */
 __syscall int espi_send_vwire(const struct device *dev,
 			      enum espi_vwire_signal signal,
diff --git a/include/zephyr/drivers/firmware/scmi/shmem.h b/include/zephyr/drivers/firmware/scmi/shmem.h
index a655a361e695d..662bf79337356 100644
--- a/include/zephyr/drivers/firmware/scmi/shmem.h
+++ b/include/zephyr/drivers/firmware/scmi/shmem.h
@@ -19,6 +19,15 @@
 #define SCMI_SHMEM_CHAN_STATUS_BUSY_BIT BIT(0)
 #define SCMI_SHMEM_CHAN_FLAG_IRQ_BIT BIT(0)
 
+struct scmi_shmem_layout {
+	volatile uint32_t res0;
+	volatile uint32_t chan_status;
+	volatile uint32_t res1[2];
+	volatile uint32_t chan_flags;
+	volatile uint32_t len;
+	volatile uint32_t msg_hdr;
+};
+
 struct scmi_message;
 
 /**
@@ -64,4 +73,24 @@ void scmi_shmem_update_flags(const struct device *shmem,
  */
 uint32_t scmi_shmem_channel_status(const struct device *shmem);
 
+/**
+ * @brief Process vendor specific features when writing message
+ *
+ * @param layout layout of the message
+ *
+ * @retval 0 if successful
+ * @retval negative errno if failure
+ */
+int scmi_shmem_vendor_write_message(struct scmi_shmem_layout *layout);
+
+/**
+ * @brief Process vendor specific features when reading message
+ *
+ * @param layout layout of the message
+ *
+ * @retval 0 if successful
+ * @retval negative errno if failure
+ */
+int scmi_shmem_vendor_read_message(const struct scmi_shmem_layout *layout);
+
 #endif /* _INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_SCMI_SHMEM_H_ */
diff --git a/include/zephyr/drivers/gpio.h b/include/zephyr/drivers/gpio.h
index c1c0c261c4f99..3eed819472657 100644
--- a/include/zephyr/drivers/gpio.h
+++ b/include/zephyr/drivers/gpio.h
@@ -810,7 +810,8 @@ __subsystem struct gpio_driver_api {
 				gpio_port_pins_t pins);
 	int (*pin_interrupt_configure)(const struct device *port,
 				       gpio_pin_t pin,
-				       enum gpio_int_mode, enum gpio_int_trig);
+				       enum gpio_int_mode mode,
+				       enum gpio_int_trig trig);
 	int (*manage_callback)(const struct device *port,
 			       struct gpio_callback *cb,
 			       bool set);
diff --git a/include/zephyr/drivers/gpio/gpio_cmsdk_ahb.h b/include/zephyr/drivers/gpio/gpio_cmsdk_ahb.h
index 46ba451c0e729..de65f7a4c6a99 100644
--- a/include/zephyr/drivers/gpio/gpio_cmsdk_ahb.h
+++ b/include/zephyr/drivers/gpio/gpio_cmsdk_ahb.h
@@ -52,6 +52,8 @@ struct gpio_cmsdk_ahb {
 	volatile uint32_t ub_masked[256];
 };
 
+int cmsdk_ahb_gpio_config(const struct device *dev, uint32_t mask, gpio_flags_t flags);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/drivers/gpio/gpio_mcux_lpc.h b/include/zephyr/drivers/gpio/gpio_mcux_lpc.h
new file mode 100644
index 0000000000000..74101a0ab9e5b
--- /dev/null
+++ b/include/zephyr/drivers/gpio/gpio_mcux_lpc.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_GPIO_MCUX_LPC_H_
+#define ZEPHYR_INCLUDE_DRIVERS_GPIO_MCUX_LPC_H_
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+
+/**
+ * @brief Trigger a callback for a given pin.
+ *
+ * This allows other drivers to fire callbacks for the pin.
+ *
+ * @param dev  Pointer to the device structure for the driver instance.
+ * @param pins The actual pin mask that triggered the interrupt.
+ *
+ */
+void gpio_mcux_lpc_trigger_cb(const struct device *dev, uint32_t pins);
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_GPIO_MCUX_LPC_H_ */
diff --git a/include/zephyr/drivers/gpio/gpio_mmio32.h b/include/zephyr/drivers/gpio/gpio_mmio32.h
deleted file mode 100644
index 005f72052936d..0000000000000
--- a/include/zephyr/drivers/gpio/gpio_mmio32.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2016 Linaro Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_MMIO32_H_
-#define ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_MMIO32_H_
-
-#include <zephyr/device.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern const struct gpio_driver_api gpio_mmio32_api;
-
-struct gpio_mmio32_config {
-	/* gpio_driver_config needs to be first */
-	struct gpio_driver_config common;
-	volatile uint32_t *reg;
-	uint32_t mask;
-};
-
-struct gpio_mmio32_context {
-	/* gpio_driver_data needs to be first */
-	struct gpio_driver_data common;
-	const struct gpio_mmio32_config *config;
-};
-
-int gpio_mmio32_init(const struct device *dev);
-
-#ifdef CONFIG_GPIO_MMIO32
-
-/**
- * Create a device object for accessing a simple 32-bit i/o register using the
- * same APIs as GPIO drivers.
- *
- * @param node_id   The devicetree node identifier.
- * @param _address  The address of the 32-bit i/o register the device will
- *		    provide access to.
- * @param _mask     Mask of bits in the register that it is valid to access.
- *		    E.g. 0xffffffffu to allow access to all of them.
- *
- */
-#define GPIO_MMIO32_INIT(node_id, _address, _mask)					\
-static struct gpio_mmio32_context _CONCAT(Z_DEVICE_DT_DEV_ID(node_id), _ctx);		\
-											\
-static const struct gpio_mmio32_config _CONCAT(Z_DEVICE_DT_DEV_ID(node_id), _cfg) = {	\
-	.common = {									\
-		 .port_pin_mask = _mask,						\
-	},										\
-	.reg	= (volatile uint32_t *)_address,					\
-	.mask	= _mask,								\
-};											\
-											\
-DEVICE_DT_DEFINE(node_id,								\
-		    &gpio_mmio32_init,							\
-		    NULL,								\
-		    &_CONCAT(Z_DEVICE_DT_DEV_ID(node_id), _ctx),			\
-		    &_CONCAT(Z_DEVICE_DT_DEV_ID(node_id), _cfg),			\
-		    PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,			\
-		    &gpio_mmio32_api)
-
-
-#else /* CONFIG_GPIO_MMIO32 */
-
-/* Null definition for when support not configured into kernel */
-#define GPIO_MMIO32_INIT(node_id, _address, _mask)
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_MMIO32_H_ */
diff --git a/include/zephyr/drivers/haptics/drv2605.h b/include/zephyr/drivers/haptics/drv2605.h
index ada27d096dfd7..0d4a8c671a7a3 100644
--- a/include/zephyr/drivers/haptics/drv2605.h
+++ b/include/zephyr/drivers/haptics/drv2605.h
@@ -9,6 +9,10 @@
 #include <zephyr/drivers/haptics.h>
 #include <zephyr/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DRV2605_WAVEFORM_SEQUENCER_MAX 8
 
 enum drv2605_library {
@@ -83,4 +87,8 @@ union drv2605_config_data {
 int drv2605_haptic_config(const struct device *dev, enum drv2605_haptics_source source,
 			  const union drv2605_config_data *config_data);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif
diff --git a/include/zephyr/drivers/i2c.h b/include/zephyr/drivers/i2c.h
index 5f1c3fbe8ae4d..09640e3275d3b 100644
--- a/include/zephyr/drivers/i2c.h
+++ b/include/zephyr/drivers/i2c.h
@@ -668,7 +668,8 @@ static inline void i2c_xfer_stats(const struct device *dev, struct i2c_msg *msgs
 	Z_DEVICE_DEFINE(node_id, Z_DEVICE_DT_DEV_ID(node_id),		\
 			DEVICE_DT_NAME(node_id),			\
 			&UTIL_CAT(Z_DEVICE_DT_DEV_ID(node_id), _init),	\
-			pm, data, config, level, prio, api,	\
+			NULL, Z_DEVICE_DT_FLAGS(node_id), pm, data,	\
+			config,	level, prio, api,			\
 			&(Z_DEVICE_STATE_NAME(Z_DEVICE_DT_DEV_ID(node_id)).devstate), \
 			__VA_ARGS__)
 
@@ -722,6 +723,25 @@ static inline int z_impl_i2c_configure(const struct device *dev,
 	return api->configure(dev, dev_config);
 }
 
+/**
+ * @brief Configure operation of a host controller.
+ *
+ * This is equivalent to:
+ *
+ *     i2c_configure(spec->bus, dev_config);
+ *
+ * @param spec I2C specification from devicetree.
+ * @param dev_config Bit-packed 32-bit value to the device runtime configuration
+ * for the I2C controller.
+ *
+ * @return a value from i2c_configure()
+ */
+static inline int i2c_configure_dt(const struct i2c_dt_spec *spec,
+						uint32_t dev_config)
+{
+	return i2c_configure(spec->bus, dev_config);
+}
+
 /**
  * @brief Get configuration of a host controller.
  *
@@ -1076,6 +1096,21 @@ extern const struct rtio_iodev_api i2c_iodev_api;
 	};                                                                      \
 	RTIO_IODEV_DEFINE(name, &i2c_iodev_api, (void *)&_i2c_dt_spec_##name)
 
+/**
+ * @brief Validate that I2C bus is ready.
+ *
+ * @param i2c_iodev I2C iodev defined with I2C_DT_IODEV_DEFINE
+ *
+ * @retval true if the I2C bus is ready for use.
+ * @retval false if the I2C bus is not ready for use.
+ */
+static inline bool i2c_is_ready_iodev(const struct rtio_iodev *i2c_iodev)
+{
+	struct i2c_dt_spec *spec = (struct i2c_dt_spec *)i2c_iodev->data;
+
+	return i2c_is_ready_dt(spec);
+}
+
 /**
  * @brief Copy the i2c_msgs into a set of RTIO requests
  *
@@ -1092,6 +1127,35 @@ struct rtio_sqe *i2c_rtio_copy(struct rtio *r,
 			       const struct i2c_msg *msgs,
 			       uint8_t num_msgs);
 
+/**
+ * @brief Copy the register address and data to a SQE
+ *
+ * @param r RTIO context
+ * @param iodev RTIO IODev to target for the submissions
+ * @param reg_addr target register address
+ * @param data data to be written
+ *
+ * @retval sqe Last submission in the queue added
+ * @retval NULL Not enough memory in the context to copy the requests
+ */
+struct rtio_sqe *i2c_rtio_copy_reg_write_byte(struct rtio *r, struct rtio_iodev *iodev,
+					      uint8_t reg_addr, uint8_t data);
+
+/**
+ * @brief acquire and configure a i2c burst read transmission
+ *
+ * @param r RTIO context
+ * @param iodev RTIO IODev to target for the submissions
+ * @param start_addr target register address
+ * @param buf Memory pool that stores the retrieved data.
+ * @param num_bytes Number of bytes to read.
+ *
+ * @retval sqe Last submission in the queue added
+ * @retval NULL Not enough memory in the context to copy the requests
+ */
+struct rtio_sqe *i2c_rtio_copy_reg_burst_read(struct rtio *r, struct rtio_iodev *iodev,
+					      uint8_t start_addr, void *buf, size_t num_bytes);
+
 #endif /* CONFIG_I2C_RTIO */
 
 /**
diff --git a/include/zephyr/drivers/i2c/i2c_nrfx_twim.h b/include/zephyr/drivers/i2c/i2c_nrfx_twim.h
new file mode 100644
index 0000000000000..37b4a65a84b9a
--- /dev/null
+++ b/include/zephyr/drivers/i2c/i2c_nrfx_twim.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_I2C_NRFX_TWIM_H
+#define ZEPHYR_INCLUDE_DRIVERS_I2C_NRFX_TWIM_H
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+
+/** @brief Acquires exclusive access to the i2c bus controller.
+ *
+ * @param dev      Pointer to the device structure for an I2C controller
+ *                 driver configured in controller mode.
+ * @param timeout  Timeout for waiting to acquire exclusive access.
+ *
+ * @retval 0       If successful.
+ * @retval -EBUSY  Returned without waiting.
+ * @retval -EAGAIN Waiting period timed out,
+ *                 or the underlying semaphore was reset during the waiting period.
+ */
+int i2c_nrfx_twim_exclusive_access_acquire(const struct device *dev, k_timeout_t timeout);
+
+/** @brief Releases exclusive access to the i2c bus controller.
+ *
+ * @param dev      Pointer to the device structure for an I2C controller
+ *                 driver on which @ref i2c_nrfx_twim_exclusive_access_acquire
+ *                 has been successfully called.
+ */
+void i2c_nrfx_twim_exclusive_access_release(const struct device *dev);
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_I2C_NRFX_TWIM_H */
diff --git a/include/zephyr/drivers/i3c.h b/include/zephyr/drivers/i3c.h
index 34b43f5a719cd..5d48a36099969 100644
--- a/include/zephyr/drivers/i3c.h
+++ b/include/zephyr/drivers/i3c.h
@@ -503,6 +503,7 @@ struct i3c_device_desc;
 struct i3c_device_id;
 struct i3c_i2c_device_desc;
 struct i3c_target_config;
+struct i3c_config_target;
 
 __subsystem struct i3c_driver_api {
 	/**
@@ -545,7 +546,7 @@ __subsystem struct i3c_driver_api {
 	 */
 	int (*config_get)(const struct device *dev,
 			  enum i3c_config_type type, void *config);
-
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 	/**
 	 * Perform bus recovery
 	 *
@@ -572,7 +573,7 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_attach_i3c_device()
 	 */
 	int (*attach_i3c_device)(const struct device *dev,
-			struct i3c_device_desc *target);
+				 struct i3c_device_desc *target);
 
 	/**
 	 * I3C Address Update
@@ -588,8 +589,8 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_reattach_i3c_device()
 	 */
 	int (*reattach_i3c_device)(const struct device *dev,
-			struct i3c_device_desc *target,
-			uint8_t old_dyn_addr);
+				   struct i3c_device_desc *target,
+				   uint8_t old_dyn_addr);
 
 	/**
 	 * I3C Device Detach
@@ -604,7 +605,7 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_detach_i3c_device()
 	 */
 	int (*detach_i3c_device)(const struct device *dev,
-			struct i3c_device_desc *target);
+				 struct i3c_device_desc *target);
 
 	/**
 	 * I2C Device Attach
@@ -619,7 +620,7 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_attach_i2c_device()
 	 */
 	int (*attach_i2c_device)(const struct device *dev,
-			struct i3c_i2c_device_desc *target);
+				 struct i3c_i2c_device_desc *target);
 
 	/**
 	 * I2C Device Detach
@@ -634,7 +635,7 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_detach_i2c_device()
 	 */
 	int (*detach_i2c_device)(const struct device *dev,
-			struct i3c_i2c_device_desc *target);
+				 struct i3c_i2c_device_desc *target);
 
 	/**
 	 * Perform Dynamic Address Assignment via ENTDAA.
@@ -696,20 +697,9 @@ __subsystem struct i3c_driver_api {
 	 */
 	struct i3c_device_desc *(*i3c_device_find)(const struct device *dev,
 						   const struct i3c_device_id *id);
-
-	/**
-	 * ACK or NACK IBI HJ Requests
-	 *
-	 * @see ibi_hj_response()
-	 *
-	 * @param dev Pointer to controller device driver instance.
-	 * @param ack True to ack, False to nack
-	 *
-	 * @return See ibi_hj_response()
-	 */
-	int (*ibi_hj_response)(const struct device *dev,
-			       bool ack);
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#ifdef CONFIG_I3C_USE_IBI
+#if defined(CONFIG_I3C_TARGET) || defined(__DOXYGEN__)
 	/**
 	 * Raise In-Band Interrupt (IBI).
 	 *
@@ -724,6 +714,20 @@ __subsystem struct i3c_driver_api {
 	 */
 	int (*ibi_raise)(const struct device *dev,
 			 struct i3c_ibi *request);
+#endif /* CONFIG_I3C_TARGET */
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
+	/**
+	 * ACK or NACK IBI HJ Requests
+	 *
+	 * @see ibi_hj_response()
+	 *
+	 * @param dev Pointer to controller device driver instance.
+	 * @param ack True to ack, False to nack
+	 *
+	 * @return See ibi_hj_response()
+	 */
+	int (*ibi_hj_response)(const struct device *dev,
+			       bool ack);
 
 	/**
 	 * Enable receiving IBI from a target.
@@ -754,7 +758,9 @@ __subsystem struct i3c_driver_api {
 	 */
 	int (*ibi_disable)(const struct device *dev,
 			   struct i3c_device_desc *target);
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_USE_IBI */
+#if defined(CONFIG_I3C_TARGET) || defined(__DOXYGEN__)
 	/**
 	 * Register config as target device of a controller.
 	 *
@@ -808,7 +814,7 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_target_tx_write()
 	 */
 	int (*target_tx_write)(const struct device *dev,
-				 uint8_t *buf, uint16_t len, uint8_t hdr_mode);
+			       uint8_t *buf, uint16_t len, uint8_t hdr_mode);
 
 	/**
 	 * ACK or NACK controller handoffs
@@ -826,9 +832,9 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_target_controller_handoff()
 	 */
 	int (*target_controller_handoff)(const struct device *dev,
-				      bool accept);
-
-#ifdef CONFIG_I3C_RTIO
+					 bool accept);
+#endif /* CONFIG_I3C_TARGET */
+#if defined(CONFIG_I3C_RTIO) || defined(__DOXYGEN__)
 	/**
 	 * RTIO
 	 *
@@ -840,8 +846,8 @@ __subsystem struct i3c_driver_api {
 	 * @return See i3c_iodev_submit()
 	 */
 	void (*iodev_submit)(const struct device *dev,
-				 struct rtio_iodev_sqe *iodev_sqe);
-#endif
+			     struct rtio_iodev_sqe *iodev_sqe);
+#endif /* CONFIG_I3C_RTIO */
 };
 
 /**
@@ -853,7 +859,7 @@ __subsystem struct i3c_driver_api {
  */
 struct i3c_device_id {
 	/** Device Provisioned ID */
-	const uint64_t pid:48;
+	uint64_t pid:48;
 };
 
 /**
@@ -889,14 +895,13 @@ struct i3c_device_desc {
 	sys_snode_t node;
 
 	/** I3C bus to which this target device is attached */
-	const struct device * const bus;
+	const struct device *bus;
 
 	/** Device driver instance of the I3C device */
-	const struct device * const dev;
+	const struct device *dev;
 
 	/** Device Provisioned ID */
-	/* TODO: bring back the bitfield */
-	const uint64_t pid;
+	uint64_t pid;
 
 	/**
 	 * Static address for this target device.
@@ -910,7 +915,7 @@ struct i3c_device_desc {
 	 * device (as both are to tell target device to use static
 	 * address as dynamic address).
 	 */
-	const uint8_t static_addr;
+	uint8_t static_addr;
 
 	/**
 	 * Initial dynamic address.
@@ -924,12 +929,13 @@ struct i3c_device_desc {
 	const uint8_t init_dynamic_addr;
 
 	/**
-	 * Device support for SETAASA
+	 * Device Flags
 	 *
-	 * This will be used as an optimization for bus initializtion if the
+	 * BIT[0]: This shall be used as an optimization for bus initializtion if the
 	 * device supports SETAASA.
+	 * BIT[1]: This shall be used to indicate if the device is a I3C v1.0 device
 	 */
-	const bool supports_setaasa;
+	const uint8_t flags;
 
 	/**
 	 * Dynamic Address for this target device used for communication.
@@ -946,18 +952,6 @@ struct i3c_device_desc {
 	 */
 	uint8_t dynamic_addr;
 
-#if defined(CONFIG_I3C_USE_GROUP_ADDR) || defined(__DOXYGEN__)
-	/**
-	 * Group address for this target device. Set during:
-	 * - Reset Group Address(es) (RSTGRPA)
-	 * - Set Group Address (SETGRPA)
-	 *
-	 * 0 if group address has not been assigned.
-	 * Only available if @kconfig{CONFIG_I3C_USE_GROUP_ADDR} is set.
-	 */
-	uint8_t group_addr;
-#endif /* CONFIG_I3C_USE_GROUP_ADDR */
-
 	/**
 	 * Bus Characteristic Register (BCR)
 	 * @see @ref I3C_BCR
@@ -1107,13 +1101,13 @@ struct i3c_i2c_device_desc {
 	const struct device *bus;
 
 	/** Static address for this I2C device. */
-	const uint16_t addr;
+	uint16_t addr;
 
 	/**
 	 * Legacy Virtual Register (LVR)
 	 * @see @ref I3C_LVR
 	 */
-	const uint8_t lvr;
+	uint8_t lvr;
 
 	/** @cond INTERNAL_HIDDEN */
 	/**
@@ -1189,10 +1183,22 @@ struct i3c_dev_list {
  * in the device structure.
  */
 struct i3c_driver_config {
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 	/** I3C/I2C device list struct. */
 	struct i3c_dev_list dev_list;
+
+	/** I3C Primary Controller Dynamic Address */
+	uint8_t primary_controller_da;
+#elif defined(CONFIG_CPP)
+       /* Empty struct has size 0 in C, size 1 in C++. Force them to be the same. */
+	uint8_t unused_cpp_size_compatibility;
+#endif
 };
 
+#if defined(CONFIG_CPP)
+BUILD_ASSERT(sizeof(struct i3c_driver_config) >= 1);
+#endif
+
 /**
  * This structure is common to all I3C drivers and is expected to be the first
  * element in the driver's struct driver_data declaration.
@@ -1200,17 +1206,19 @@ struct i3c_driver_config {
 struct i3c_driver_data {
 	/** Controller Configuration */
 	struct i3c_config_controller ctrl_config;
-
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 	/** Attached I3C/I2C devices and addresses */
 	struct i3c_dev_attached_list attached_dev;
-
+#if defined(CONFIG_I3C_TARGET) || defined(__DOXYGEN__)
 	/** Received DEFTGTS Pointer */
 	struct i3c_ccc_deftgts *deftgts;
 
 	/** DEFTGTS refreshed */
 	bool deftgts_refreshed;
+#endif /* CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_CONTROLLER */
 };
-
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 /**
  * @brief iterate over all I3C devices present on the bus
  *
@@ -1263,6 +1271,21 @@ struct i3c_device_desc *i3c_dev_list_find(const struct i3c_dev_list *dev_list,
 struct i3c_device_desc *i3c_dev_list_i3c_addr_find(const struct device *dev,
 						   uint8_t addr);
 
+/**
+ * @brief Find a I3C target device descriptor by static address.
+ *
+ * This finds the I3C target device descriptor in the attached
+ * device list matching the static address (@p addr)
+ *
+ * @param dev Pointer to controller device driver instance.
+ * @param addr static address to be matched.
+ *
+ * @return Pointer to the I3C target device descriptor, or
+ *         `NULL` if none is found.
+ */
+struct i3c_device_desc *i3c_dev_list_i3c_static_addr_find(const struct device *dev,
+							  uint8_t addr);
+
 /**
  * @brief Find a I2C target device descriptor by address.
  *
@@ -1276,7 +1299,7 @@ struct i3c_device_desc *i3c_dev_list_i3c_addr_find(const struct device *dev,
  *         `NULL` if none is found.
  */
 struct i3c_i2c_device_desc *i3c_dev_list_i2c_addr_find(const struct device *dev,
-							   uint16_t addr);
+						       uint16_t addr);
 
 /**
  * @brief Helper function to find a usable address during ENTDAA.
@@ -1335,7 +1358,7 @@ int i3c_dev_list_daa_addr_helper(struct i3c_addr_slots *addr_slots,
 				 bool assigned_okay,
 				 struct i3c_device_desc **target,
 				 uint8_t *addr);
-
+#endif /* CONFIG_I3C_CONTROLLER */
 /**
  * @brief Configure the I3C hardware.
  *
@@ -1361,7 +1384,50 @@ static inline int i3c_configure(const struct device *dev,
 
 	return api->configure(dev, type, config);
 }
-
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
+/**
+ * @brief Get the controller device configuration for an I3C device.
+ *
+ * This function retrieves the configuration parameters specific to an
+ * I3C controller device. It is a type-safe wrapper around @ref i3c_config_get
+ * that ensures the correct structure type is passed.
+ *
+ * @param dev Pointer to the I3C controller device instance.
+ * @param config Pointer to a @ref i3c_config_controller structure
+ *               where the configuration will be stored.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General Input/Output errors.
+ * @retval -ENOSYS If not implemented.
+ */
+static inline int i3c_configure_controller(const struct device *dev,
+					   struct i3c_config_controller *config)
+{
+	return i3c_configure(dev, I3C_CONFIG_CONTROLLER, config);
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+#if defined(CONFIG_I3C_TARGET) || defined(__DOXYGEN__)
+/**
+ * @brief Get the target device configuration for an I3C device.
+ *
+ * This function retrieves the configuration parameters specific to an
+ * I3C target device. It is a type-safe wrapper around @ref i3c_config_get
+ * that ensures the correct structure type is passed.
+ *
+ * @param dev Pointer to the I3C controller device instance.
+ * @param config Pointer to a @ref i3c_config_target structure
+ *                    where the configuration will be stored.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General Input/Output errors.
+ * @retval -ENOSYS If not implemented.
+ */
+static inline int i3c_configure_target(const struct device *dev,
+				       struct i3c_config_target *config)
+{
+	return i3c_configure(dev, I3C_CONFIG_TARGET, config);
+}
+#endif /* CONFIG_I3C_TARGET */
 /**
  * @brief Get configuration of the I3C hardware.
  *
@@ -1394,7 +1460,51 @@ static inline int i3c_config_get(const struct device *dev,
 
 	return api->config_get(dev, type, config);
 }
-
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
+/**
+ * @brief Get the controller device configuration for an I3C device.
+ *
+ * This function sets the configuration parameters specific to an
+ * I3C controller device. It is a type-safe wrapper around @ref i3c_config_get
+ * that ensures the correct structure type is passed.
+ *
+ * @param[in] dev Pointer to the I3C controller device instance.
+ * @param[out] config Pointer to a @ref i3c_config_controller structure
+ *                    where the configuration will be used.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General Input/Output errors.
+ * @retval -ENOSYS If not implemented.
+ */
+static inline int i3c_config_get_controller(const struct device *dev,
+					    struct i3c_config_controller *config)
+{
+	return i3c_config_get(dev, I3C_CONFIG_CONTROLLER, config);
+}
+#endif /* CONFIG_I3C_CONTROLLER */
+#if defined(CONFIG_I3C_TARGET) || defined(__DOXYGEN__)
+/**
+ * @brief Get the target device configuration for an I3C device.
+ *
+ * This function sets the configuration parameters specific to an
+ * I3C target device. It is a type-safe wrapper around @ref i3c_config_get
+ * that ensures the correct structure type is passed.
+ *
+ * @param[in] dev Pointer to the I3C controller device instance.
+ * @param[out] config Pointer to a @ref i3c_config_target structure
+ *                    where the configuration will be used.
+ *
+ * @retval 0 If successful.
+ * @retval -EIO General Input/Output errors.
+ * @retval -ENOSYS If not implemented.
+ */
+static inline int i3c_config_get_target(const struct device *dev,
+					struct i3c_config_target *config)
+{
+	return i3c_config_get(dev, I3C_CONFIG_TARGET, config);
+}
+#endif /* CONFIG_I3C_TARGET */
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 /**
  * @brief Attempt bus recovery on the I3C bus.
  *
@@ -1660,12 +1770,14 @@ struct i3c_device_desc *i3c_device_find(const struct device *dev,
 
 	return api->i3c_device_find(dev, id);
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#if defined(CONFIG_I3C_USE_IBI) || defined(__DOXYGEN__)
 /**
  * @addtogroup i3c_ibi
  * @{
  */
 
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 /**
  * @brief ACK or NACK IBI HJ Requests
  *
@@ -1690,7 +1802,8 @@ static inline int i3c_ibi_hj_response(const struct device *dev,
 
 	return api->ibi_hj_response(dev, ack);
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#if defined(CONFIG_I3C_TARGET) || defined(__DOXYGEN__)
 /**
  * @brief Raise an In-Band Interrupt (IBI).
  *
@@ -1714,7 +1827,8 @@ static inline int i3c_ibi_raise(const struct device *dev,
 
 	return api->ibi_raise(dev, request);
 }
-
+#endif /* CONFIG_I3C_TARGET */
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 /**
  * @brief Enable IBI of a target device.
  *
@@ -1764,7 +1878,8 @@ static inline int i3c_ibi_disable(struct i3c_device_desc *target)
 
 	return api->ibi_disable(target->bus, target);
 }
-
+#endif /* CONFIG_I3C_CONTROLLER */
+#endif /* CONFIG_I3C_USE_IBI */
 /**
  * @brief Check if target's IBI has payload.
  *
@@ -1817,7 +1932,7 @@ static inline int i3c_device_is_controller_capable(struct i3c_device_desc *targe
 }
 
 /** @} */
-
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 /**
  * @addtogroup i3c_transfer_api
  * @{
@@ -2243,8 +2358,10 @@ uint8_t i3c_odd_parity(uint8_t p);
  * @retval -EBUSY Target cannot accept Controller Handoff
  */
 int i3c_device_controller_handoff(const struct i3c_device_desc *target, bool requested);
+#endif /* CONFIG_I3C_CONTROLLER */
 
-#ifdef CONFIG_I3C_USE_IBI
+#if defined(CONFIG_I3C_USE_IBI) || defined(__DOXYGEN__)
+#if (defined(CONFIG_I3C_CONTROLLER) && defined(CONFIG_I3C_TARGET)) || defined(__DOXYGEN__)
 /**
  * @brief Call back for when Controllership is Handoffed to itself
  *
@@ -2257,9 +2374,11 @@ int i3c_device_controller_handoff(const struct i3c_device_desc *target, bool req
  * @param work pointer to the work item.
  */
 void i3c_sec_handoffed(struct k_work *work);
-#endif
+#endif /* CONFIG_I3C_CONTROLLER && CONFIG_I3C_TARGET */
+#endif /* CONFIG_I3C_USE_IBI */
 
-#if CONFIG_I3C_NUM_OF_DESC_MEM_SLABS > 0
+#if (defined(CONFIG_I3C_NUM_OF_DESC_MEM_SLABS) && CONFIG_I3C_NUM_OF_DESC_MEM_SLABS > 0) ||         \
+	defined(__DOXYGEN__)
 
 /**
  * @brief Allocate memory for a i3c device descriptor
@@ -2311,7 +2430,8 @@ static inline bool i3c_device_desc_in_pool(struct i3c_device_desc *desc)
 
 #endif /* CONFIG_I3C_NUM_OF_DESC_MEM_SLABS > 0 */
 
-#if CONFIG_I3C_I2C_NUM_OF_DESC_MEM_SLABS > 0
+#if (defined(CONFIG_I3C_I2C_NUM_OF_DESC_MEM_SLABS) && CONFIG_I3C_I2C_NUM_OF_DESC_MEM_SLABS > 0) || \
+	defined(__DOXYGEN__)
 
 /**
  * @brief Allocate memory for a i3c i2c device descriptor
@@ -2437,17 +2557,21 @@ struct rtio_sqe *i3c_rtio_copy(struct rtio *r,
 
 #endif /* CONFIG_I3C_RTIO */
 
+#if defined(CONFIG_I3C_TARGET) || defined(__DOXYGEN__)
 /*
  * This needs to be after declaration of struct i3c_driver_api,
  * or else compiler complains about undefined type inside
  * the static inline API wrappers.
  */
 #include <zephyr/drivers/i3c/target_device.h>
+#endif /* CONFIG_I3C_TARGET */
 
+#if defined(CONFIG_I3C_CONTROLLER) || defined(__DOXYGEN__)
 /*
  * Include High-Data-Rate (HDR) inline helper functions
  */
 #include <zephyr/drivers/i3c/hdr_ddr.h>
+#endif /* CONFIG_I3C_CONTROLLER */
 
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/drivers/i3c/ccc.h b/include/zephyr/drivers/i3c/ccc.h
index 98a4e0f020974..651930e74422b 100644
--- a/include/zephyr/drivers/i3c/ccc.h
+++ b/include/zephyr/drivers/i3c/ccc.h
@@ -179,6 +179,14 @@ extern "C" {
  */
 #define I3C_CCC_VENDOR(broadcast, id)		((id) + ((broadcast) ? 0x61U : 0xE0U))
 
+/**
+ * Reset Dynamic Address (Direct)
+ *
+ * @note This should not be used by devices that support I3C v1.0 and this
+ * shall not be used for devices that support I3C v1.1 or later.
+ */
+#define I3C_CCC_RSTDAA_DC			0x86U
+
 /** Set Dynamic Address from Static Address (Direct) */
 #define I3C_CCC_SETDASA				0x87U
 
@@ -1502,6 +1510,21 @@ static inline int i3c_ccc_do_rstact_fmt3(const struct i3c_device_desc *target,
 	return i3c_ccc_do_rstact(target, action, true, data);
 }
 
+/**
+ * @brief Reset dynamic addresses for a targets.
+ *
+ * Helper function to reset a dynamic addresses of a targets.
+ *
+ * @note This should not be used by devices that support I3C v1.0 and this
+ * shall not be used for devices that support I3C v1.1 or later.
+ *
+ * @param[in] target Pointer to the target device descriptor where
+ *                   the device is configured with a dynamic address.
+ *
+ * @return @see i3c_do_ccc
+ */
+int i3c_ccc_do_rstdaa(struct i3c_device_desc *target);
+
 /**
  * @brief Broadcast RSTDAA to reset dynamic addresses for all targets.
  *
@@ -1538,7 +1561,7 @@ int i3c_ccc_do_setdasa(const struct i3c_device_desc *target,
  * Note this does not update @p target with the new dynamic address.
  *
  * @param[in] target Pointer to the target device descriptor where
- *                   the device is configured with a static address.
+ *                   the device is configured with a dynamic address.
  * @param[in] new_da Struct of the Dynamic address
  *
  * @return @see i3c_do_ccc
diff --git a/include/zephyr/drivers/i3c/devicetree.h b/include/zephyr/drivers/i3c/devicetree.h
index 803f17d55179b..2ab0749b01ea4 100644
--- a/include/zephyr/drivers/i3c/devicetree.h
+++ b/include/zephyr/drivers/i3c/devicetree.h
@@ -52,6 +52,19 @@ extern "C" {
 #define I3C_DEVICE_ID_DT_INST(inst)					\
 	I3C_DEVICE_ID_DT(DT_DRV_INST(inst))
 
+/**
+ * @name I3C device flags.
+ * @anchor I3C_DEVICE_FLAGS
+ * @{
+ */
+
+/** Device supports SETAASA CCC */
+#define I3C_SUPPORTS_SETAASA		BIT(0)
+/** Device supports I3C v1.0 */
+#define I3C_V1P0_SUPPORT		BIT(1)
+
+/** @} */
+
 /**
  * @brief Structure initializer for i3c_device_desc from devicetree
  *
@@ -62,16 +75,16 @@ extern "C" {
  * @param node_id Devicetree node identifier for the I3C device whose
  *                struct i3c_device_desc to create an initializer for
  */
-#define I3C_DEVICE_DESC_DT(node_id)					\
-	{								\
-		.bus = DEVICE_DT_GET(DT_BUS(node_id)),			\
-		.dev = DEVICE_DT_GET(node_id),				\
-		.static_addr = DT_PROP_BY_IDX(node_id, reg, 0),		\
-		.pid = ((uint64_t)DT_PROP_BY_IDX(node_id, reg, 1) << 32)\
-		       | DT_PROP_BY_IDX(node_id, reg, 2),		\
-		.init_dynamic_addr =					\
-			DT_PROP_OR(node_id, assigned_address, 0),	\
-		.supports_setaasa = DT_PROP(node_id, supports_setaasa), \
+#define I3C_DEVICE_DESC_DT(node_id)                                                                \
+	{                                                                                          \
+		.bus = DEVICE_DT_GET(DT_BUS(node_id)),                                             \
+		.dev = DEVICE_DT_GET(node_id),                                                     \
+		.static_addr = DT_PROP_BY_IDX(node_id, reg, 0),                                    \
+		.pid = ((uint64_t)DT_PROP_BY_IDX(node_id, reg, 1) << 32) |                         \
+		       DT_PROP_BY_IDX(node_id, reg, 2),                                            \
+		.init_dynamic_addr = DT_PROP_OR(node_id, assigned_address, 0),                     \
+		.flags = FIELD_PREP(I3C_SUPPORTS_SETAASA, DT_PROP(node_id, supports_setaasa)) |    \
+			 FIELD_PREP(I3C_V1P0_SUPPORT, DT_PROP(node_id, v1p0_support)),             \
 	},
 
 /**
diff --git a/include/zephyr/drivers/i3c/hdr_ddr.h b/include/zephyr/drivers/i3c/hdr_ddr.h
index 6aaff61053250..ad7f6d38f9f90 100644
--- a/include/zephyr/drivers/i3c/hdr_ddr.h
+++ b/include/zephyr/drivers/i3c/hdr_ddr.h
@@ -38,8 +38,8 @@ extern "C" {
  * @retval -EBUSY Bus is busy.
  * @retval -EIO General input / output error.
  */
-static inline int i3c_hdr_ddr_write(struct i3c_device_desc *target, uint8_t cmd,
-				uint8_t *buf, uint32_t num_bytes)
+static inline int i3c_hdr_ddr_write(struct i3c_device_desc *target, uint8_t cmd, uint8_t *buf,
+				    uint32_t num_bytes)
 {
 	struct i3c_msg msg;
 
@@ -66,14 +66,14 @@ static inline int i3c_hdr_ddr_write(struct i3c_device_desc *target, uint8_t cmd,
  * @retval -EBUSY Bus is busy.
  * @retval -EIO General input / output error.
  */
-static inline int i3c_hdr_ddr_read(struct i3c_device_desc *target, uint8_t cmd,
-				uint8_t *buf, uint32_t num_bytes)
+static inline int i3c_hdr_ddr_read(struct i3c_device_desc *target, uint8_t cmd, uint8_t *buf,
+				   uint32_t num_bytes)
 {
 	struct i3c_msg msg;
 
 	msg.buf = buf;
 	msg.len = num_bytes;
-	msg.flags = I3C_MSG_STOP | I3C_MSG_HDR;
+	msg.flags = I3C_MSG_READ | I3C_MSG_STOP | I3C_MSG_HDR;
 	msg.hdr_mode = I3C_MSG_HDR_DDR;
 	msg.hdr_cmd_code = cmd;
 
@@ -90,18 +90,18 @@ static inline int i3c_hdr_ddr_read(struct i3c_device_desc *target, uint8_t cmd,
  * @param target I3C target device descriptor.
  * @param write_buf Pointer to the data to be written
  * @param num_write Number of bytes to write
- * @param write_cmd 7-bit command code for write
+ * @param read_cmd 7-bit command code for read
  * @param read_buf Pointer to storage for read data
  * @param num_read Number of bytes to read
- * @param read_cmd 7-bit command code for read
+ * @param write_cmd 7-bit command code for write
  *
  * @retval 0 if successful
  * @retval -EBUSY Bus is busy.
  * @retval -EIO General input / output error.
  */
-static inline int i3c_hdr_ddr_write_read(struct i3c_device_desc *target,
-				 const void *write_buf, size_t num_write, uint8_t read_cmd,
-				 void *read_buf, size_t num_read, uint8_t write_cmd)
+static inline int i3c_hdr_ddr_write_read(struct i3c_device_desc *target, const void *write_buf,
+					 size_t num_write, uint8_t read_cmd, void *read_buf,
+					 size_t num_read, uint8_t write_cmd)
 {
 	struct i3c_msg msg[2];
 
diff --git a/include/zephyr/drivers/i3c/target_device.h b/include/zephyr/drivers/i3c/target_device.h
index 699958090bdc2..621fc3f6e9885 100644
--- a/include/zephyr/drivers/i3c/target_device.h
+++ b/include/zephyr/drivers/i3c/target_device.h
@@ -31,27 +31,30 @@ struct i3c_driver_api;
  * @brief Configuration parameters for I3C hardware to act as target device.
  *
  * This can also be used to configure the controller if it is to act as
- * a secondary controller on the bus.
+ * a target on the bus.
  */
 struct i3c_config_target {
 	/**
-	 * If the hardware is to act as a target device
+	 * If the hardware is currently acting as a target device
 	 * on the bus.
 	 */
-	bool enable;
+	bool enabled;
 
 	/**
 	 * I3C target dynamic address.
 	 *
-	 * Used when operates as secondary controller
-	 * or as a target device.
+	 * Currently assigned dynamic address. 0 if no address
+	 * assigned.
+	 *
+	 * @note Only writeable if the hardware acts as a primary
+	 *       controller
 	 */
 	uint8_t dynamic_addr;
 
 	/**
 	 * I3C target static address.
 	 *
-	 * Used used when operates as secondary controller
+	 * Used used when operating as a secondary controller
 	 * or as a target device.
 	 */
 	uint8_t static_addr;
@@ -81,9 +84,6 @@ struct i3c_config_target {
 
 	/**
 	 * Bit mask of supported HDR modes (0 - 7).
-	 *
-	 * This can be used to enable or disable HDR mode
-	 * supported by the hardware at runtime.
 	 */
 	uint8_t supported_hdr;
 };
diff --git a/include/zephyr/drivers/interrupt_controller/gic.h b/include/zephyr/drivers/interrupt_controller/gic.h
index ab6aeffe3d2d2..463aa7203ccce 100644
--- a/include/zephyr/drivers/interrupt_controller/gic.h
+++ b/include/zephyr/drivers/interrupt_controller/gic.h
@@ -20,8 +20,8 @@
  * GIC Register Interface Base Addresses
  */
 
-#define GIC_DIST_BASE	DT_REG_ADDR_BY_IDX(DT_INST(0, arm_gic), 0)
-#define GIC_CPU_BASE	DT_REG_ADDR_BY_IDX(DT_INST(0, arm_gic), 1)
+#define GIC_DIST_BASE DT_REG_ADDR_BY_IDX(DT_INST(0, arm_gic), 0)
+#define GIC_CPU_BASE  DT_REG_ADDR_BY_IDX(DT_INST(0, arm_gic), 1)
 
 /*
  * GIC Distributor Interface
@@ -32,70 +32,112 @@
  * v1		ICDDCR
  * v2/v3	GICD_CTLR
  */
-#define	GICD_CTLR		(GIC_DIST_BASE +   0x0)
+#define GICD_CTLR (GIC_DIST_BASE + 0x0)
 
 /*
  * 0x004  Interrupt Controller Type Register
  * v1		ICDICTR
  * v2/v3	GICD_TYPER
  */
-#define	GICD_TYPER		(GIC_DIST_BASE +   0x4)
+#define GICD_TYPER (GIC_DIST_BASE + 0x4)
 
 /*
  * 0x008  Distributor Implementer Identification Register
  * v1		ICDIIDR
  * v2/v3	GICD_IIDR
  */
-#define	GICD_IIDR		(GIC_DIST_BASE +   0x8)
+#define GICD_IIDR (GIC_DIST_BASE + 0x8)
 
 /*
  * 0x080  Interrupt Group Registers
  * v1		ICDISRn
  * v2/v3	GICD_IGROUPRn
  */
-#define	GICD_IGROUPRn		(GIC_DIST_BASE +  0x80)
+#define GICD_IGROUPRn (GIC_DIST_BASE + 0x80)
+
+/*
+ * 0x1000  Interrupt Group Registers for Extended SPI Range
+ * v3.1		GICD_IGROUPRnE
+ */
+#define GICD_IGROUPRnE (GIC_DIST_BASE + 0x1000)
 
 /*
  * 0x100  Interrupt Set-Enable Registers
  * v1		ICDISERn
  * v2/v3	GICD_ISENABLERn
  */
-#define	GICD_ISENABLERn		(GIC_DIST_BASE + 0x100)
+#define GICD_ISENABLERn (GIC_DIST_BASE + 0x100)
+
+/*
+ * 0x1200  Interrupt Set-Enable Registers for Extended SPI Range
+ * v3.1		GICD_ISENABLERnE
+ */
+#define GICD_ISENABLERnE (GIC_DIST_BASE + 0x1200)
 
 /*
  * 0x180  Interrupt Clear-Enable Registers
  * v1		ICDICERn
  * v2/v3	GICD_ICENABLERn
  */
-#define	GICD_ICENABLERn		(GIC_DIST_BASE + 0x180)
+#define GICD_ICENABLERn (GIC_DIST_BASE + 0x180)
+
+/*
+ * 0x1400  Interrupt Clear-Enable Registers for Extended SPI Range
+ * v3.1		GICD_ICENABLERnE
+ */
+#define GICD_ICENABLERnE (GIC_DIST_BASE + 0x1400)
 
 /*
  * 0x200  Interrupt Set-Pending Registers
  * v1		ICDISPRn
  * v2/v3	GICD_ISPENDRn
  */
-#define	GICD_ISPENDRn		(GIC_DIST_BASE + 0x200)
+#define GICD_ISPENDRn (GIC_DIST_BASE + 0x200)
+
+/*
+ * 1600  Interrupt Set-Pending Registers for Extended SPI Range
+ * v3.1		GICD_ISPENDRnE
+ */
+#define GICD_ISPENDRnE (GIC_DIST_BASE + 0x1600)
 
 /*
  * 0x280  Interrupt Clear-Pending Registers
  * v1		ICDICPRn
  * v2/v3	GICD_ICPENDRn
  */
-#define	GICD_ICPENDRn		(GIC_DIST_BASE + 0x280)
+#define GICD_ICPENDRn (GIC_DIST_BASE + 0x280)
+
+/*
+ * 0x1800  Interrupt Clear-Pending Registers for Extended SPI Range
+ * v3.1		GICD_ICPENDRnE
+ */
+#define GICD_ICPENDRnE (GIC_DIST_BASE + 0x1800)
 
 /*
  * 0x300  Interrupt Set-Active Registers
  * v1		ICDABRn
  * v2/v3	GICD_ISACTIVERn
  */
-#define	GICD_ISACTIVERn		(GIC_DIST_BASE + 0x300)
+#define GICD_ISACTIVERn (GIC_DIST_BASE + 0x300)
+
+/*
+ * 0x1A00  Interrupt Set-Active Registers for Extended SPI Range
+ * v3.1		GICD_ISACTIVERnE
+ */
+#define GICD_ISACTIVERnE (GIC_DIST_BASE + 0x1A00)
 
 #if CONFIG_GIC_VER >= 2
 /*
  * 0x380  Interrupt Clear-Active Registers
  * v2/v3	GICD_ICACTIVERn
  */
-#define	GICD_ICACTIVERn		(GIC_DIST_BASE + 0x380)
+#define GICD_ICACTIVERn (GIC_DIST_BASE + 0x380)
+
+/*
+ * 0x1C00  Interrupt Clear-Active Registers for Extended SPI Range
+ * v3.1		GICD_ICACTIVERnE
+ */
+#define GICD_ICACTIVERnE (GIC_DIST_BASE + 0x1C00)
 #endif
 
 /*
@@ -103,28 +145,40 @@
  * v1		ICDIPRn
  * v2/v3	GICD_IPRIORITYRn
  */
-#define	GICD_IPRIORITYRn	(GIC_DIST_BASE + 0x400)
+#define GICD_IPRIORITYRn (GIC_DIST_BASE + 0x400)
+
+/*
+ * 0x2000  Interrupt Priority Registers for Extended SPI Range
+ * v3.1		GICD_IPRIORITYRnE
+ */
+#define GICD_IPRIORITYRnE (GIC_DIST_BASE + 0x2000)
 
 /*
  * 0x800  Interrupt Processor Targets Registers
  * v1		ICDIPTRn
  * v2/v3	GICD_ITARGETSRn
  */
-#define	GICD_ITARGETSRn		(GIC_DIST_BASE + 0x800)
+#define GICD_ITARGETSRn (GIC_DIST_BASE + 0x800)
 
 /*
  * 0xC00  Interrupt Configuration Registers
  * v1		ICDICRn
  * v2/v3	GICD_ICFGRn
  */
-#define	GICD_ICFGRn		(GIC_DIST_BASE + 0xc00)
+#define GICD_ICFGRn (GIC_DIST_BASE + 0xc00)
+
+/*
+ * 0x3000  Interrupt Configuration Registers for Extended SPI Range
+ * v3.1		GICD_ICFGRnE
+ */
+#define GICD_ICFGRnE (GIC_DIST_BASE + 0x3000)
 
 /*
  * 0xF00  Software Generated Interrupt Register
  * v1		ICDSGIR
  * v2/v3	GICD_SGIR
  */
-#define	GICD_SGIR		(GIC_DIST_BASE + 0xf00)
+#define GICD_SGIR (GIC_DIST_BASE + 0xf00)
 
 /*
  * GIC CPU Interface
@@ -137,116 +191,113 @@
  * v1		ICCICR
  * v2/v3	GICC_CTLR
  */
-#define GICC_CTLR		(GIC_CPU_BASE +    0x0)
+#define GICC_CTLR (GIC_CPU_BASE + 0x0)
 
 /*
  * 0x0004  Interrupt Priority Mask Register
  * v1		ICCPMR
  * v2/v3	GICC_PMR
  */
-#define GICC_PMR		(GIC_CPU_BASE +    0x4)
+#define GICC_PMR (GIC_CPU_BASE + 0x4)
 
 /*
  * 0x0008  Binary Point Register
  * v1		ICCBPR
  * v2/v3	GICC_BPR
  */
-#define GICC_BPR		(GIC_CPU_BASE +    0x8)
+#define GICC_BPR (GIC_CPU_BASE + 0x8)
 
 /*
  * 0x000C  Interrupt Acknowledge Register
  * v1		ICCIAR
  * v2/v3	GICC_IAR
  */
-#define GICC_IAR		(GIC_CPU_BASE +    0xc)
+#define GICC_IAR (GIC_CPU_BASE + 0xc)
 
 /*
  * 0x0010  End of Interrupt Register
  * v1		ICCEOIR
  * v2/v3	GICC_EOIR
  */
-#define GICC_EOIR		(GIC_CPU_BASE +   0x10)
-
+#define GICC_EOIR (GIC_CPU_BASE + 0x10)
 
 /*
  * Helper Constants
  */
 
 /* GICC_CTLR */
-#define GICC_CTLR_ENABLEGRP0	BIT(0)
-#define GICC_CTLR_ENABLEGRP1	BIT(1)
+#define GICC_CTLR_ENABLEGRP0 BIT(0)
+#define GICC_CTLR_ENABLEGRP1 BIT(1)
 
-#define GICC_CTLR_ENABLE_MASK	(GICC_CTLR_ENABLEGRP0 | GICC_CTLR_ENABLEGRP1)
+#define GICC_CTLR_ENABLE_MASK (GICC_CTLR_ENABLEGRP0 | GICC_CTLR_ENABLEGRP1)
 
 #if defined(CONFIG_GIC_V2)
 
-#define GICC_CTLR_FIQBYPDISGRP0	BIT(5)
-#define GICC_CTLR_IRQBYPDISGRP0	BIT(6)
-#define GICC_CTLR_FIQBYPDISGRP1	BIT(7)
-#define GICC_CTLR_IRQBYPDISGRP1	BIT(8)
+#define GICC_CTLR_FIQBYPDISGRP0 BIT(5)
+#define GICC_CTLR_IRQBYPDISGRP0 BIT(6)
+#define GICC_CTLR_FIQBYPDISGRP1 BIT(7)
+#define GICC_CTLR_IRQBYPDISGRP1 BIT(8)
 
-#define GICC_CTLR_BYPASS_MASK	(GICC_CTLR_FIQBYPDISGRP0 | \
-				 GICC_CTLR_IRQBYPDISGRP1 | \
-				 GICC_CTLR_FIQBYPDISGRP1 | \
-				 GICC_CTLR_IRQBYPDISGRP1)
+#define GICC_CTLR_BYPASS_MASK                                                                      \
+	(GICC_CTLR_FIQBYPDISGRP0 | GICC_CTLR_IRQBYPDISGRP1 | GICC_CTLR_FIQBYPDISGRP1 |             \
+	 GICC_CTLR_IRQBYPDISGRP1)
 
 #endif /* CONFIG_GIC_V2 */
 
 /* GICD_SGIR */
-#define GICD_SGIR_TGTFILT(x)		((x) << 24)
-#define GICD_SGIR_TGTFILT_CPULIST	GICD_SGIR_TGTFILT(0b00)
-#define GICD_SGIR_TGTFILT_ALLBUTREQ	GICD_SGIR_TGTFILT(0b01)
-#define GICD_SGIR_TGTFILT_REQONLY	GICD_SGIR_TGTFILT(0b10)
+#define GICD_SGIR_TGTFILT(x)        ((x) << 24)
+#define GICD_SGIR_TGTFILT_CPULIST   GICD_SGIR_TGTFILT(0b00)
+#define GICD_SGIR_TGTFILT_ALLBUTREQ GICD_SGIR_TGTFILT(0b01)
+#define GICD_SGIR_TGTFILT_REQONLY   GICD_SGIR_TGTFILT(0b10)
 
-#define GICD_SGIR_CPULIST(x)		((x) << 16)
-#define GICD_SGIR_CPULIST_CPU(n)	GICD_SGIR_CPULIST(BIT(n))
-#define GICD_SGIR_CPULIST_MASK		0xff
+#define GICD_SGIR_CPULIST(x)     ((x) << 16)
+#define GICD_SGIR_CPULIST_CPU(n) GICD_SGIR_CPULIST(BIT(n))
+#define GICD_SGIR_CPULIST_MASK   0xff
 
-#define GICD_SGIR_NSATT			BIT(15)
+#define GICD_SGIR_NSATT BIT(15)
 
-#define GICD_SGIR_SGIINTID(x)		(x)
+#define GICD_SGIR_SGIINTID(x) (x)
 
 #endif /* CONFIG_GIC_VER <= 2 */
 
-
 /* GICD_ICFGR */
-#define GICD_ICFGR_MASK			BIT_MASK(2)
-#define GICD_ICFGR_TYPE			BIT(1)
+#define GICD_ICFGR_MASK BIT_MASK(2)
+#define GICD_ICFGR_TYPE BIT(1)
 
 /* GICD_TYPER.ITLinesNumber 0:4 */
-#define GICD_TYPER_ITLINESNUM_MASK	0x1f
+#define GICD_TYPER_ITLINESNUM_MASK 0x1f
+
+/* GICD_TYPER.ESPI [8] */
+#define GICD_TYPER_ESPI_MASK BIT(8)
 
 /* GICD_TYPER.IDbits */
-#define GICD_TYPER_IDBITS(typer)	((((typer) >> 19) & 0x1f) + 1)
+#define GICD_TYPER_IDBITS(typer) ((((typer) >> 19) & 0x1f) + 1)
 
 /*
  * Common Helper Constants
  */
-#define GIC_SGI_INT_BASE		0
-#define GIC_PPI_INT_BASE		16
-
-#define GIC_IS_SGI(intid)		(((intid) >= GIC_SGI_INT_BASE) && \
-					 ((intid) < GIC_PPI_INT_BASE))
+#define GIC_SGI_INT_BASE 0
+#define GIC_PPI_INT_BASE 16
 
+#define GIC_IS_SGI(intid) (((intid) >= GIC_SGI_INT_BASE) && ((intid) < GIC_PPI_INT_BASE))
 
-#define GIC_SPI_INT_BASE		32
+#define GIC_SPI_INT_BASE 32
 
-#define GIC_SPI_MAX_INTID		1019
+#define GIC_SPI_MAX_INTID 1019
 
-#define GIC_IS_SPI(intid)		(((intid) >= GIC_SPI_INT_BASE) && \
-					((intid) <= GIC_SPI_MAX_INTID))
+#define GIC_IS_SPI(intid) (((intid) >= GIC_SPI_INT_BASE) && ((intid) <= GIC_SPI_MAX_INTID))
 
-#define GIC_NUM_INTR_PER_REG		32
+#define GIC_NUM_INTR_PER_REG 32
 
-#define GIC_NUM_CFG_PER_REG		16
+#define GIC_NUM_CFG_PER_REG 16
 
-#define GIC_NUM_PRI_PER_REG		4
+#define GIC_NUM_PRI_PER_REG 4
 
 /* GIC idle priority : value '0xff' will allow all interrupts */
-#define GIC_IDLE_PRIO			0xff
+#define GIC_IDLE_PRIO 0xff
 
 /* Priority levels 0:255 */
-#define GIC_PRI_MASK			0xff
+#define GIC_PRI_MASK 0xff
 
 /*
  * '0xa0'is used to initialize each interrupt default priority.
@@ -255,13 +306,13 @@
  * The values of individual interrupt and default has to be chosen
  * carefully if PMR and BPR based nesting and preemption has to be done.
  */
-#define GIC_INT_DEF_PRI_X4		0xa0a0a0a0
+#define GIC_INT_DEF_PRI_X4 0xa0a0a0a0
 
 /* GIC special interrupt id */
-#define GIC_INTID_SPURIOUS		1023
+#define GIC_INTID_SPURIOUS 1023
 
 /* Fixme: update from platform specific define or dt */
-#define GIC_NUM_CPU_IF			CONFIG_MP_MAX_NUM_CPUS
+#define GIC_NUM_CPU_IF CONFIG_MP_MAX_NUM_CPUS
 
 #ifndef _ASMLANGUAGE
 
@@ -323,8 +374,7 @@ void arm_gic_irq_clear_pending(unsigned int irq);
  * @param prio interrupt priority
  * @param flags interrupt flags
  */
-void arm_gic_irq_set_priority(
-	unsigned int irq, unsigned int prio, unsigned int flags);
+void arm_gic_irq_set_priority(unsigned int irq, unsigned int prio, unsigned int flags);
 
 /**
  * @brief Get active interrupt ID
@@ -355,8 +405,7 @@ void arm_gic_secondary_init(void);
  *                    Aff level 1 2 3 will be extracted by api.
  * @param target_list bitmask of target cores
  */
-void gic_raise_sgi(unsigned int sgi_id, uint64_t target_aff,
-		   uint16_t target_list);
+void gic_raise_sgi(unsigned int sgi_id, uint64_t target_aff, uint16_t target_list);
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/include/zephyr/drivers/interrupt_controller/intc_esp32.h b/include/zephyr/drivers/interrupt_controller/intc_esp32.h
index 5b5ce8d94bbb8..91083528e37b0 100644
--- a/include/zephyr/drivers/interrupt_controller/intc_esp32.h
+++ b/include/zephyr/drivers/interrupt_controller/intc_esp32.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2021-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,9 +10,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-/* number of possible interrupts per core */
-#define ESP_INTC_INTS_NUM		(32)
-
 /*
  * Interrupt allocation flags - These flags can be used to specify
  * which interrupt qualities the code calling esp_intr_alloc* needs.
@@ -71,6 +68,12 @@
 /* Function prototype for interrupt handler function */
 typedef void (*intr_handler_t)(void *arg);
 
+/* Interrupt handler associated data structure */
+typedef struct intr_handle_data_t intr_handle_data_t;
+
+/* Handle to an interrupt handler */
+typedef intr_handle_data_t *intr_handle_t;
+
 struct shared_vector_desc_t {
 	int disabled : 1;
 	int source : 8;
@@ -97,11 +100,6 @@ struct intr_handle_data_t {
 	struct shared_vector_desc_t *shared_vector_desc;
 };
 
-/**
- * @brief Initializes interrupt table to its defaults
- */
-void esp_intr_initialize(void);
-
 /**
  * @brief Mark an interrupt as a shared interrupt
  *
@@ -158,7 +156,7 @@ int esp_intr_reserve(int intno, int cpu);
  * @param handler The interrupt handler. Must be NULL when an interrupt of level >3
  *               is requested, because these types of interrupts aren't C-callable.
  * @param arg    Optional argument for passed to the interrupt handler
- * @param ret_handle Pointer to a struct intr_handle_data_t pointer to store a handle that can
+ * @param ret_handle Pointer to an intr_handle_t pointer to store a handle that can
  *               later be used to request details or free the interrupt. Can be NULL if no handle
  *               is required.
  *
@@ -170,7 +168,7 @@ int esp_intr_alloc(int source,
 		int flags,
 		intr_handler_t handler,
 		void *arg,
-		struct intr_handle_data_t **ret_handle);
+		intr_handle_t *ret_handle);
 
 
 /**
@@ -200,7 +198,7 @@ int esp_intr_alloc(int source,
  * @param handler The interrupt handler. Must be NULL when an interrupt of level >3
  *               is requested, because these types of interrupts aren't C-callable.
  * @param arg    Optional argument for passed to the interrupt handler
- * @param ret_handle Pointer to a struct intr_handle_data_t pointer to store a handle that can
+ * @param ret_handle Pointer to an intr_handle_t pointer to store a handle that can
  *               later be used to request details or free the interrupt. Can be NULL if no handle
  *               is required.
  *
@@ -214,7 +212,7 @@ int esp_intr_alloc_intrstatus(int source,
 		uint32_t intrstatusmask,
 		intr_handler_t handler,
 		void *arg,
-		struct intr_handle_data_t **ret_handle);
+		intr_handle_t *ret_handle);
 
 
 /**
@@ -235,7 +233,7 @@ int esp_intr_alloc_intrstatus(int source,
  * @return -EINVAL the handle is NULL
  *         0 otherwise
  */
-int esp_intr_free(struct intr_handle_data_t *handle);
+int esp_intr_free(intr_handle_t handle);
 
 
 /**
@@ -245,7 +243,7 @@ int esp_intr_free(struct intr_handle_data_t *handle);
  *
  * @return The core number where the interrupt is allocated
  */
-int esp_intr_get_cpu(struct intr_handle_data_t *handle);
+int esp_intr_get_cpu(intr_handle_t handle);
 
 /**
  * @brief Get the allocated interrupt for a certain handle
@@ -254,7 +252,7 @@ int esp_intr_get_cpu(struct intr_handle_data_t *handle);
  *
  * @return The interrupt number
  */
-int esp_intr_get_intno(struct intr_handle_data_t *handle);
+int esp_intr_get_intno(intr_handle_t handle);
 
 /**
  * @brief Disable the interrupt associated with the handle
@@ -272,7 +270,7 @@ int esp_intr_get_intno(struct intr_handle_data_t *handle);
  * @return -EINVAL if the combination of arguments is invalid.
  *         0 otherwise
  */
-int esp_intr_disable(struct intr_handle_data_t *handle);
+int esp_intr_disable(intr_handle_t handle);
 
 /**
  * @brief Enable the interrupt associated with the handle
@@ -285,7 +283,7 @@ int esp_intr_disable(struct intr_handle_data_t *handle);
  * @return -EINVAL if the combination of arguments is invalid.
  *         0 otherwise
  */
-int esp_intr_enable(struct intr_handle_data_t *handle);
+int esp_intr_enable(intr_handle_t handle);
 
 /**
  * @brief Set the "in IRAM" status of the handler.
@@ -299,7 +297,7 @@ int esp_intr_enable(struct intr_handle_data_t *handle);
  * @return -EINVAL if the combination of arguments is invalid.
  *         0 otherwise
  */
-int esp_intr_set_in_iram(struct intr_handle_data_t *handle, bool is_in_iram);
+int esp_intr_set_in_iram(intr_handle_t handle, bool is_in_iram);
 
 /**
  * @brief Disable interrupts that aren't specifically marked as running from IRAM
diff --git a/include/zephyr/drivers/interrupt_controller/intc_esp32c3.h b/include/zephyr/drivers/interrupt_controller/intc_esp32c3.h
deleted file mode 100644
index a30dc16ed0fd0..0000000000000
--- a/include/zephyr/drivers/interrupt_controller/intc_esp32c3.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_INTERRUPT_CONTROLLER_INTC_ESP32C3_H_
-#define ZEPHYR_INCLUDE_DRIVERS_INTERRUPT_CONTROLLER_INTC_ESP32C3_H_
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <soc.h>
-/*
- * Interrupt allocation flags - These flags can be used to specify
- * which interrupt qualities the code calling esp_intr_alloc* needs.
- */
-
-/* Keep the LEVELx values as they are here; they match up with (1<<level) */
-#define ESP_INTR_FLAG_LEVEL1		(1<<1)	/* Accept a Level 1 int vector, lowest priority */
-#define ESP_INTR_FLAG_LEVEL2		(1<<2)	/* Accept a Level 2 int vector */
-#define ESP_INTR_FLAG_LEVEL3		(1<<3)	/* Accept a Level 3 int vector */
-#define ESP_INTR_FLAG_LEVEL4		(1<<4)	/* Accept a Level 4 int vector */
-#define ESP_INTR_FLAG_LEVEL5		(1<<5)	/* Accept a Level 5 int vector */
-#define ESP_INTR_FLAG_LEVEL6		(1<<6)	/* Accept a Level 6 int vector */
-#define ESP_INTR_FLAG_NMI		(1<<7)	/* Accept a Level 7 int vector, highest priority */
-#define ESP_INTR_FLAG_SHARED		(1<<8)	/* Interrupt can be shared between ISRs */
-#define ESP_INTR_FLAG_EDGE		(1<<9)	/* Edge-triggered interrupt */
-#define ESP_INTR_FLAG_IRAM		(1<<10)	/* ISR can be called if cache is disabled */
-#define ESP_INTR_FLAG_INTRDISABLED	(1<<11)	/* Return with this interrupt disabled */
-
-/* Low and medium prio interrupts. These can be handled in C. */
-#define ESP_INTR_FLAG_LOWMED	(ESP_INTR_FLAG_LEVEL1|ESP_INTR_FLAG_LEVEL2|ESP_INTR_FLAG_LEVEL3)
-
-/* High level interrupts. Need to be handled in assembly. */
-#define ESP_INTR_FLAG_HIGH	(ESP_INTR_FLAG_LEVEL4|ESP_INTR_FLAG_LEVEL5|ESP_INTR_FLAG_LEVEL6| \
-				 ESP_INTR_FLAG_NMI)
-
-/* Mask for all level flags */
-#define ESP_INTR_FLAG_LEVELMASK	(ESP_INTR_FLAG_LEVEL1|ESP_INTR_FLAG_LEVEL2|ESP_INTR_FLAG_LEVEL3| \
-				 ESP_INTR_FLAG_LEVEL4|ESP_INTR_FLAG_LEVEL5|ESP_INTR_FLAG_LEVEL6| \
-				 ESP_INTR_FLAG_NMI)
-
-/*
- * Get the interrupt flags from the supplied priority.
- */
-#define ESP_PRIO_TO_FLAGS(priority) \
-	((priority) > 0 ? ((1 << (priority)) & ESP_INTR_FLAG_LEVELMASK) : 0)
-
-/*
- * Check interrupt flags from input and filter unallowed values.
- */
-#define ESP_INT_FLAGS_CHECK(int_flags) ((int_flags) & ESP_INTR_FLAG_SHARED)
-
-
-/* Function prototype for interrupt handler function */
-typedef void (*isr_handler_t)(const void *arg);
-
-/**
- * @brief Initializes interrupt table to its defaults
- */
-void esp_intr_initialize(void);
-
-/**
- * @brief Allocate an interrupt with the given parameters.
- *
- * This finds an interrupt that matches the restrictions as given in the flags
- * parameter, maps the given interrupt source to it and hooks up the given
- * interrupt handler (with optional argument) as well. If needed, it can return
- * a handle for the interrupt as well.
- *
- * @param source The interrupt source.
- * @param flags An ORred mask of the ESP_INTR_FLAG_* defines. These restrict the
- *               choice of interrupts that this routine can choose from. If this value
- *               is 0, it will default to allocating a non-shared interrupt of level
- *               1, 2 or 3. If this is ESP_INTR_FLAG_SHARED, it will allocate a shared
- *               interrupt of level 1. Setting ESP_INTR_FLAG_INTRDISABLED will return
- *               from this function with the interrupt disabled.
- * @param handler The interrupt handler.
- * @param arg    Optional argument for passed to the interrupt handler
- * @param ret_handle Pointer to a struct intr_handle_data_t pointer to store a handle that can
- *               later be used to request details or free the interrupt. Can be NULL if no handle
- *               is required.
- *
- * @return -EINVAL if the combination of arguments is invalid.
- *         -ENODEV No free interrupt found with the specified flags
- *         0 otherwise
- */
-int esp_intr_alloc(int source,
-		int flags,
-		isr_handler_t handler,
-		void *arg,
-		void **ret_handle);
-
-/**
- * @brief Disable the interrupt associated with the source
- *
- * @param source The interrupt source
- *
- * @return -EINVAL if the combination of arguments is invalid.
- *         0 otherwise
- */
-int esp_intr_disable(int source);
-
-/**
- * @brief Enable the interrupt associated with the source
- *
- * @param source The interrupt source
- * @return -EINVAL if the combination of arguments is invalid.
- *         0 otherwise
- */
-int esp_intr_enable(int source);
-
-/**
- * @brief Gets the current enabled interrupts
- *
- * @param status_mask_number the status mask can be 0 or 1
- * @return bitmask of enabled interrupt sources
- */
-uint32_t esp_intr_get_enabled_intmask(int status_mask_number);
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_INTERRUPT_CONTROLLER_INTC_ESP32C3_H_ */
diff --git a/include/zephyr/drivers/interrupt_controller/intc_ra_icu.h b/include/zephyr/drivers/interrupt_controller/intc_ra_icu.h
deleted file mode 100644
index d347d81cad85a..0000000000000
--- a/include/zephyr/drivers/interrupt_controller/intc_ra_icu.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/interrupt-controller/renesas-ra-icu.h>
-
-#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_RA_ICU_H_
-#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_RA_ICU_H_
-
-#define RA_ICU_FLAG_EVENT_OFFSET  8
-#define RA_ICU_FLAG_EVENT_MASK    (BIT_MASK(8) << RA_ICU_FLAG_EVENT_OFFSET)
-#define RA_ICU_FLAG_INTCFG_OFFSET 16
-#define RA_ICU_FLAG_INTCFG_MASK   (BIT_MASK(8) << RA_ICU_FLAG_INTCFG_OFFSET)
-
-enum icu_irq_mode {
-	ICU_FALLING,
-	ICU_RISING,
-	ICU_BOTH_EDGE,
-	ICU_LOW_LEVEL,
-};
-
-typedef void (*ra_isr_handler)(const void *);
-
-extern void ra_icu_clear_int_flag(unsigned int irqn);
-
-extern int ra_icu_query_available_irq(uint32_t event);
-extern int ra_icu_query_exists_irq(uint32_t event);
-
-extern void ra_icu_query_irq_config(unsigned int irq, uint32_t *intcfg, ra_isr_handler *pisr,
-				    const void **cbarg);
-
-extern int ra_icu_irq_connect_dynamic(unsigned int irq, unsigned int priority,
-				      void (*routine)(const void *parameter), const void *parameter,
-				      uint32_t flags);
-
-extern int ra_icu_irq_disconnect_dynamic(unsigned int irq, unsigned int priority,
-					 void (*routine)(const void *parameter),
-					 const void *parameter, uint32_t flags);
-
-#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_RA_ICU_H_ */
diff --git a/include/zephyr/drivers/interrupt_controller/intc_rz_ext_irq.h b/include/zephyr/drivers/interrupt_controller/intc_rz_ext_irq.h
index 4244a039dd546..b9865c91c870d 100644
--- a/include/zephyr/drivers/interrupt_controller/intc_rz_ext_irq.h
+++ b/include/zephyr/drivers/interrupt_controller/intc_rz_ext_irq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,11 +7,16 @@
 #ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_RZ_EXT_IRQ_H_
 #define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_RZ_EXT_IRQ_H_
 
+#define RZ_EXT_IRQ_TRIG_FALLING   0
+#define RZ_EXT_IRQ_TRIG_RISING    1
+#define RZ_EXT_IRQ_TRIG_BOTH_EDGE 2
+#define RZ_EXT_IRQ_TRIG_LEVEL_LOW 3
+
 /** RZ external interrupt callback */
 typedef void (*intc_rz_ext_irq_callback_t)(void *arg);
 
 /**
- * @brief Enable external interrupt for specified channel at NVIC.
+ * @brief Enable external interrupt for specified channel.
  *
  * @param dev: pointer to interrupt controller instance
  * @return 0 on success, or negative value on error
@@ -19,7 +24,7 @@ typedef void (*intc_rz_ext_irq_callback_t)(void *arg);
 int intc_rz_ext_irq_enable(const struct device *dev);
 
 /**
- * @brief Disable external interrupt for specified channel at NVIC.
+ * @brief Disable external interrupt for specified channel.
  *
  * @param dev: pointer to interrupt controller instance
  * @return 0 on success, or negative value on error
@@ -37,4 +42,13 @@ int intc_rz_ext_irq_disable(const struct device *dev);
 int intc_rz_ext_irq_set_callback(const struct device *dev, intc_rz_ext_irq_callback_t cb,
 				 void *arg);
 
+/**
+ * @brief Change trigger external interrupt type for specified channel.
+ *
+ * @param dev: pointer to interrupt controller instance
+ * @param trig: trigger type to be changed
+ * @return 0 on success, or negative value on error
+ */
+int intc_rz_ext_irq_set_type(const struct device *dev, uint8_t trig);
+
 #endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_RZ_EXT_IRQ_H_ */
diff --git a/include/zephyr/drivers/interrupt_controller/loapic.h b/include/zephyr/drivers/interrupt_controller/loapic.h
index 75a47955bc632..f0e58ff95e052 100644
--- a/include/zephyr/drivers/interrupt_controller/loapic.h
+++ b/include/zephyr/drivers/interrupt_controller/loapic.h
@@ -43,6 +43,7 @@
 
 #define LOAPIC_ICR_BUSY		0x00001000	/* delivery status: 1 = busy */
 
+#define LOAPIC_ICR_IPI_SPECIFIC 0x00004000U     /* target IPI to specific CPU */
 #define LOAPIC_ICR_IPI_OTHERS	0x000C4000U	/* normal IPI to other CPUs */
 #define LOAPIC_ICR_IPI_INIT	0x00004500U
 #define LOAPIC_ICR_IPI_STARTUP	0x00004600U
diff --git a/include/zephyr/drivers/interrupt_controller/wuc_ite_it51xxx.h b/include/zephyr/drivers/interrupt_controller/wuc_ite_it51xxx.h
new file mode 100644
index 0000000000000..f039381af75cc
--- /dev/null
+++ b/include/zephyr/drivers/interrupt_controller/wuc_ite_it51xxx.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_IT51XXX_WUC_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_IT51XXX_WUC_H_
+
+#include <zephyr/device.h>
+
+/**
+ * @name wakeup controller flags
+ * @{
+ */
+/** WUC rising edge trigger mode */
+#define WUC_TYPE_EDGE_RISING  BIT(0)
+/** WUC falling edge trigger mode */
+#define WUC_TYPE_EDGE_FALLING BIT(1)
+/** WUC both edge trigger mode */
+#define WUC_TYPE_EDGE_BOTH    (WUC_TYPE_EDGE_RISING | WUC_TYPE_EDGE_FALLING)
+
+#define WUC_TYPE_LEVEL_TRIG BIT(2)
+/** WUC level high trigger mode */
+#define WUC_TYPE_LEVEL_HIGH BIT(3)
+/** WUC level low trigger mode */
+#define WUC_TYPE_LEVEL_LOW  BIT(4)
+
+/** @} */
+
+/**
+ * @brief A trigger condition on the corresponding input generates
+ *        a wake-up signal to the power management control of EC
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param mask Pin mask of WUC group
+ */
+void it51xxx_wuc_enable(const struct device *dev, uint8_t mask);
+
+/**
+ * @brief A trigger condition on the corresponding input doesn't
+ *        assert the wake-up signal (canceled not pending)
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param mask Pin mask of WUC group
+ */
+void it51xxx_wuc_disable(const struct device *dev, uint8_t mask);
+
+/**
+ * @brief Write-1-clear a trigger condition that occurs on the
+ *        corresponding input
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param mask Pin mask of WUC group
+ */
+void it51xxx_wuc_clear_status(const struct device *dev, uint8_t mask);
+
+/**
+ * @brief Select the trigger edge mode on the corresponding input
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param mask Pin mask of WUC group
+ * @param flags Select the trigger edge mode
+ */
+void it51xxx_wuc_set_polarity(const struct device *dev, uint8_t mask, uint32_t flags);
+
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_IT51XXX_WUC_H_ */
diff --git a/include/zephyr/drivers/kscan.h b/include/zephyr/drivers/kscan.h
deleted file mode 100644
index f12e280906235..0000000000000
--- a/include/zephyr/drivers/kscan.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2019 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief Public API for Keyboard scan matrix devices.
- * The scope of this API is simply to report which key event was triggered
- * and users can later decode keys using their desired scan code tables in
- * their application. In addition, typematic rate and delay can easily be
- * implemented using a timer if desired.
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_KB_SCAN_H_
-#define ZEPHYR_INCLUDE_DRIVERS_KB_SCAN_H_
-
-#include <errno.h>
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <zephyr/device.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief KSCAN APIs
- * @defgroup kscan_interface Keyboard Scan Driver APIs
- * @since 2.1
- * @version 1.0.0
- * @deprecated
- * @ingroup io_interfaces
- * @{
- */
-
-/**
- * @deprecated
- * @brief Keyboard scan callback called when user press/release
- * a key on a matrix keyboard.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param row Describes row change.
- * @param column Describes column change.
- * @param pressed Describes the kind of key event.
- */
-typedef void (*kscan_callback_t)(const struct device *dev, uint32_t row,
-				 uint32_t column,
-				 bool pressed);
-
-/**
- * @deprecated
- * @cond INTERNAL_HIDDEN
- *
- * Keyboard scan driver API definition and system call entry points.
- *
- * (Internal use only.)
- */
-typedef int (*kscan_config_t)(const struct device *dev,
-			      kscan_callback_t callback);
-typedef int (*kscan_disable_callback_t)(const struct device *dev);
-typedef int (*kscan_enable_callback_t)(const struct device *dev);
-
-__subsystem struct kscan_driver_api {
-	kscan_config_t config;
-	kscan_disable_callback_t disable_callback;
-	kscan_enable_callback_t enable_callback;
-};
-/**
- * @endcond
- */
-
-/**
- * @deprecated
- * @brief Configure a Keyboard scan instance.
- *
- * @param dev Pointer to the device structure for the driver instance.
- * @param callback called when keyboard devices reply to a keyboard
- * event such as key pressed/released.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__syscall int kscan_config(const struct device *dev,
-			     kscan_callback_t callback);
-
-static inline int z_impl_kscan_config(const struct device *dev,
-					kscan_callback_t callback)
-{
-	const struct kscan_driver_api *api =
-				(struct kscan_driver_api *)dev->api;
-
-	return api->config(dev, callback);
-}
-/**
- * @deprecated
- * @brief Enables callback.
- * @param dev Pointer to the device structure for the driver instance.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__syscall int kscan_enable_callback(const struct device *dev);
-
-static inline int z_impl_kscan_enable_callback(const struct device *dev)
-{
-	const struct kscan_driver_api *api =
-			(const struct kscan_driver_api *)dev->api;
-
-	if (api->enable_callback == NULL) {
-		return -ENOSYS;
-	}
-
-	return api->enable_callback(dev);
-}
-
-/**
- * @deprecated
- * @brief Disables callback.
- * @param dev Pointer to the device structure for the driver instance.
- *
- * @retval 0 If successful.
- * @retval Negative errno code if failure.
- */
-__syscall int kscan_disable_callback(const struct device *dev);
-
-static inline int z_impl_kscan_disable_callback(const struct device *dev)
-{
-	const struct kscan_driver_api *api =
-			(const struct kscan_driver_api *)dev->api;
-
-	if (api->disable_callback == NULL) {
-		return -ENOSYS;
-	}
-
-	return api->disable_callback(dev);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-/**
- * @}
- */
-
-#include <zephyr/syscalls/kscan.h>
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_KB_SCAN_H_ */
diff --git a/include/zephyr/drivers/mfd/mfd_maxq10xx.h b/include/zephyr/drivers/mfd/mfd_maxq10xx.h
new file mode 100644
index 0000000000000..35baa9bb79e09
--- /dev/null
+++ b/include/zephyr/drivers/mfd/mfd_maxq10xx.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Vogl Electronic GmbH
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_MFD_MAXQ10XX_H_
+#define ZEPHYR_INCLUDE_DRIVERS_MFD_MAXQ10XX_H_
+
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Get the semaphore reference for a MAXQ1xx instance. Callers
+ * should pass the return value to k_sem_take/k_sem_give
+ *
+ * @param[in] dev     Pointer to device struct of the driver instance
+ *
+ * @return Address of the semaphore
+ */
+struct k_sem *mfd_maxq10xx_get_lock(const struct device *dev);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_MFD_MAXQ10XX_H_ */
diff --git a/include/zephyr/drivers/misc/ft8xx/ft8xx_copro.h b/include/zephyr/drivers/misc/ft8xx/ft8xx_copro.h
index c6c899a0fca63..1985f1c23d4a6 100644
--- a/include/zephyr/drivers/misc/ft8xx/ft8xx_copro.h
+++ b/include/zephyr/drivers/misc/ft8xx/ft8xx_copro.h
@@ -99,14 +99,14 @@ void ft8xx_copro_cmd_swap(const struct device *dev);
  * @param y y-coordinate of text base, in pixels
  * @param font Font to use for text, 0-31. 16-31 are ROM fonts
  * @param options Options to apply
- * @param s Character string to display, terminated with a null character
+ * @param string Character string to display, terminated with a null character
  */
 void ft8xx_copro_cmd_text(const struct device *dev,
 			  int16_t x,
 			  int16_t y,
 			  int16_t font,
 			  uint16_t options,
-			  const char *s);
+			  const char *string);
 
 /**
  * @brief Draw a decimal number
@@ -126,14 +126,14 @@ void ft8xx_copro_cmd_text(const struct device *dev,
  * @param y y-coordinate of text base, in pixels
  * @param font Font to use for text, 0-31. 16-31 are ROM fonts
  * @param options Options to apply
- * @param n The number to display.
+ * @param number The number to display.
  */
 void ft8xx_copro_cmd_number(const struct device *dev,
 			    int16_t x,
 			    int16_t y,
 			    int16_t font,
 			    uint16_t options,
-			    int32_t n);
+			    int32_t number);
 
 /**
  * @brief Execute the touch screen calibration routine
diff --git a/include/zephyr/drivers/mm/rat.h b/include/zephyr/drivers/mm/rat.h
index 216142a2680b7..a3e82292109b0 100644
--- a/include/zephyr/drivers/mm/rat.h
+++ b/include/zephyr/drivers/mm/rat.h
@@ -14,13 +14,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#define ADDR_TRANSLATE_MAX_REGIONS (16u)
-#define RAT_CTRL(base_addr, i)     (base_addr + 0x20 + 0x10 * (i))
-#define RAT_BASE(base_addr, i)     (base_addr + 0x24 + 0x10 * (i))
-#define RAT_TRANS_L(base_addr, i)  (base_addr + 0x28 + 0x10 * (i))
-#define RAT_TRANS_H(base_addr, i)  (base_addr + 0x2C + 0x10 * (i))
-#define RAT_CTRL_W(enable, size)   (((enable & 0x1) << 31u) | (size & 0x3F))
-
 /**
  * @brief Enum's to represent different possible region size for the address translate module
  */
@@ -69,16 +62,8 @@ struct address_trans_region_config {
 	uint32_t size;
 };
 
-/**
- * @brief Parameters for address_trans_init
- */
-struct address_trans_params {
-	uint32_t num_regions;
-	uint32_t rat_base_addr;
-	struct address_trans_region_config *region_config;
-};
-
-void sys_mm_drv_ti_rat_init(void *region_config, uint64_t rat_base_addr, uint8_t translate_regions);
+void sys_mm_drv_ti_rat_init(struct address_trans_region_config *region_config,
+			    uint64_t rat_base_addr, uint8_t translate_regions);
 
 #ifdef __cplusplus
 }
diff --git a/include/zephyr/drivers/regulator/fake.h b/include/zephyr/drivers/regulator/fake.h
index d91161dbc7a88..c52d35a56e768 100644
--- a/include/zephyr/drivers/regulator/fake.h
+++ b/include/zephyr/drivers/regulator/fake.h
@@ -23,6 +23,9 @@ DECLARE_FAKE_VALUE_FUNC(int, regulator_fake_set_voltage, const struct device *,
 			int32_t, int32_t);
 DECLARE_FAKE_VALUE_FUNC(int, regulator_fake_get_voltage, const struct device *,
 			int32_t *);
+DECLARE_FAKE_VALUE_FUNC(unsigned int, regulator_fake_count_current_limits, const struct device *);
+DECLARE_FAKE_VALUE_FUNC(int, regulator_fake_list_current_limit, const struct device *, unsigned int,
+			int32_t *);
 DECLARE_FAKE_VALUE_FUNC(int, regulator_fake_set_current_limit,
 			const struct device *, int32_t, int32_t);
 DECLARE_FAKE_VALUE_FUNC(int, regulator_fake_get_current_limit,
diff --git a/include/zephyr/drivers/sensor/battery.h b/include/zephyr/drivers/sensor/battery.h
index 6158141922cb0..e221651895cbd 100644
--- a/include/zephyr/drivers/sensor/battery.h
+++ b/include/zephyr/drivers/sensor/battery.h
@@ -19,8 +19,9 @@ extern "C" {
 #endif
 
 /**
- * @brief battery API
- * @defgroup battery_apis battery APIs
+ * @brief Battery API
+ * @defgroup battery_apis Battery APIs
+ * @ingroup sensor_interface
  * @{
  */
 
diff --git a/include/zephyr/drivers/sensor/pat9136.h b/include/zephyr/drivers/sensor/pat9136.h
new file mode 100644
index 0000000000000..a88de369d76de
--- /dev/null
+++ b/include/zephyr/drivers/sensor/pat9136.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_PAT9136_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_PAT9136_H_
+
+#include <zephyr/drivers/sensor.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** This sensor does have the ability to provide DXY in meaningful units, and
+ * since the standard channels' unit is in points (SENSOR_CHAN_POS_DX,
+ * SENSOR_CHAN_POS_DY, SENSOR_CHAN_POS_DXYZ), we've captured the following
+ * channels to provide an alternative for this sensor.
+ */
+enum sensor_channel_pat9136 {
+	/** Position change on the X axis, in millimeters. */
+	SENSOR_CHAN_POS_DX_MM = SENSOR_CHAN_PRIV_START + 1,
+	/** Position change on the Y axis, in millimeters. */
+	SENSOR_CHAN_POS_DY_MM,
+	/** Position change on the X, Y and Z axis, in millimeters.
+	 * Added additional offset so the channels X and Y can be accessed
+	 * relative to XYZ in spite of not supporting DZ.
+	 */
+	SENSOR_CHAN_POS_DXYZ_MM = SENSOR_CHAN_POS_DY_MM + 2,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_PAT9136_H_ */
diff --git a/include/zephyr/drivers/sensor/tmp116.h b/include/zephyr/drivers/sensor/tmp116.h
deleted file mode 100644
index 5efb4ad252adc..0000000000000
--- a/include/zephyr/drivers/sensor/tmp116.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2021 Innoseis B.V
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_TMP116_H_
-#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_TMP116_H_
-
-#include <zephyr/device.h>
-#include <zephyr/drivers/sensor.h>
-#include <sys/types.h>
-
-enum sensor_attribute_tmp_116 {
-	/** Turn on power saving/one shot mode */
-	SENSOR_ATTR_TMP116_ONE_SHOT_MODE = SENSOR_ATTR_PRIV_START,
-	/** Shutdown the sensor */
-	SENSOR_ATTR_TMP116_SHUTDOWN_MODE,
-	/** Turn on continuous conversion */
-	SENSOR_ATTR_TMP116_CONTINUOUS_CONVERSION_MODE,
-};
-
-#define EEPROM_TMP116_SIZE (4 * sizeof(uint16_t))
-
-int tmp116_eeprom_read(const struct device *dev, off_t offset, void *data,
-		       size_t len);
-
-int tmp116_eeprom_write(const struct device *dev, off_t offset,
-			const void *data, size_t len);
-
-#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_TMP116_H_ */
diff --git a/include/zephyr/drivers/sensor/tmp11x.h b/include/zephyr/drivers/sensor/tmp11x.h
new file mode 100644
index 0000000000000..10d0b24865db4
--- /dev/null
+++ b/include/zephyr/drivers/sensor/tmp11x.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 Innoseis B.V
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_TMP11X_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_TMP11X_H_
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <sys/types.h>
+
+enum sensor_attribute_tmp_11x {
+	/** Turn on power saving/one shot mode */
+	SENSOR_ATTR_TMP11X_ONE_SHOT_MODE = SENSOR_ATTR_PRIV_START,
+	/** Shutdown the sensor */
+	SENSOR_ATTR_TMP11X_SHUTDOWN_MODE,
+	/** Turn on continuous conversion */
+	SENSOR_ATTR_TMP11X_CONTINUOUS_CONVERSION_MODE,
+};
+
+#define EEPROM_TMP11X_SIZE (4 * sizeof(uint16_t))
+
+int tmp11x_eeprom_read(const struct device *dev, off_t offset, void *data,
+		       size_t len);
+
+int tmp11x_eeprom_write(const struct device *dev, off_t offset,
+			const void *data, size_t len);
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_TMP11X_H_ */
diff --git a/include/zephyr/drivers/sensor/veml6031.h b/include/zephyr/drivers/sensor/veml6031.h
new file mode 100644
index 0000000000000..fe867a72a52fd
--- /dev/null
+++ b/include/zephyr/drivers/sensor/veml6031.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2025 Andreas Klinger
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_VEML6031_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_VEML6031_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief ALS integration time settings in veml6031_it
+ */
+#define VEML6031_IT_COUNT 8
+
+/**
+ * @brief Effective photodiode size in enum veml6031_size.
+ */
+#define VEML6031_DIV4_COUNT 2
+
+/**
+ * @brief Gain selections in enum veml6031_gain.
+ */
+#define VEML6031_GAIN_COUNT 4
+
+/**
+ * @brief VEML6031 integration time options for ambient light measurements.
+ */
+enum veml6031_it {
+	VEML6031_IT_3_125,
+	VEML6031_IT_6_25,
+	VEML6031_IT_12_5,
+	VEML6031_IT_25,
+	VEML6031_IT_50,
+	VEML6031_IT_100,
+	VEML6031_IT_200,
+	VEML6031_IT_400,
+};
+
+/**
+ * @brief VEML6031 size options for ambient light measurements.
+ */
+enum veml6031_div4 {
+	VEML6031_SIZE_4_4 = 0x00, /* 0b0 */
+	VEML6031_SIZE_1_4 = 0x01, /* 0b1 */
+};
+
+/**
+ * @brief VEML6031 gain options for ambient light measurements.
+ */
+enum veml6031_gain {
+	VEML6031_GAIN_1 = 0x00,    /* 0b00 */
+	VEML6031_GAIN_2 = 0x01,    /* 0b01 */
+	VEML6031_GAIN_0_66 = 0x02, /* 0b10 */
+	VEML6031_GAIN_0_5 = 0x03,  /* 0b11 */
+};
+
+/**
+ * @brief VEML6031 ALS interrupt persistence protect number options.
+ */
+enum veml6031_pers {
+	VEML6031_PERS_1 = 0x00, /* 0b00 */
+	VEML6031_PERS_2 = 0x01, /* 0b01 */
+	VEML6031_PERS_4 = 0x02, /* 0b10 */
+	VEML6031_PERS_8 = 0x03, /* 0b11 */
+};
+
+/**
+ * @brief VEML6031 specific sensor attributes.
+ *
+ * For high and low threshold window settings (ALS_WH_L, ALS_WH_H, ALS_WL_L and
+ * ALS_WL_H) use the generic attributes <tt>SENSOR_ATTR_UPPER_THRESH</tt> and
+ * <tt>SENSOR_ATTR_LOWER_THRESH</tt> with 16-bit unsigned integer values. Both
+ * threshold settings are in lux and converted by the driver to a value
+ * compatible with the sensor. This conversion depends on the current gain,
+ * integration time and effective photodiode size settings. So a change in
+ * gain, integration time or effective photodiode size usually requires an
+ * update of threshold window settings. To get the correct threshold values
+ * into the sensor update the thresholds -after- a change of gain or
+ * integration time.
+ *
+ * All attributes must be set for the <tt>SENSOR_CHAN_LIGHT</tt> channel.
+ *
+ * When the sensor goes into saturation <tt>-E2BIG</tt> is returned. This
+ * happens when the maximum value <tt>0xFFFF</tt> is returned as raw ALS value.
+ * In this case it's up to the user to reduce one or more of the following
+ * attributes to come back into the optimal measurement range of the sensor:
+ *  <tt>SENSOR_ATTR_VEML6031_GAIN</tt> (gain)
+ *  <tt>SENSOR_ATTR_VEML6031_IT</tt> (integration time)
+ *  <tt>SENSOR_ATTR_VEML6031_DIV4</tt> (effective photodiode size)
+ */
+enum sensor_attribute_veml6031 {
+	/**
+	 * @brief Integration time setting for ALS measurements (IT).
+	 *
+	 * Use enum veml6031_it for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_IT = SENSOR_ATTR_PRIV_START,
+	/**
+	 * @brief Effective photodiode size (DIV4)
+	 *
+	 * Use enum veml6031_div4 for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_DIV4,
+	/**
+	 * @brief Gain setting for ALS measurements (GAIN).
+	 *
+	 * Use enum veml6031_gain for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_GAIN,
+	/**
+	 * @brief ALS persistence protect number setting (PERS).
+	 *
+	 * Use enum veml6031_pers for attribute values.
+	 */
+	SENSOR_ATTR_VEML6031_PERS,
+};
+
+/**
+ * @brief VEML6031 specific sensor channels.
+ */
+enum sensor_channel_veml6031 {
+	/**
+	 * @brief Channel for raw ALS sensor values.
+	 *
+	 * This channel represents the raw measurement counts provided by the
+	 * sensor ALS register. It is useful for estimating good values for
+	 * integration time, effective photodiode size and gain attributes in
+	 * fetch and get mode.
+	 *
+	 * For future implementations with triggers it can also be used to
+	 * estimate the threshold window attributes for the sensor interrupt
+	 * handling.
+	 *
+	 * It cannot be fetched directly. Instead, this channel's value is
+	 * fetched implicitly using <tt>SENSOR_CHAN_LIGHT</tt>. Trying to call
+	 * <tt>sensor_channel_fetch_chan()</tt> with this enumerator as an
+	 * argument will result in a <tt>-ENOTSUP</tt>.
+	 */
+	SENSOR_CHAN_VEML6031_ALS_RAW_COUNTS = SENSOR_CHAN_PRIV_START,
+
+	/**
+	 * @brief Channel for IR sensor values.
+	 *
+	 * This channel is the raw IR Channel count output of the sensor. About
+	 * fetching the same as for
+	 * <tt>SENSOR_CHAN_VEML6031_ALS_RAW_COUNTS</tt> applies.
+	 */
+	SENSOR_CHAN_VEML6031_IR_RAW_COUNTS,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_VEML6031_H_ */
diff --git a/include/zephyr/drivers/sensor/xbr818.h b/include/zephyr/drivers/sensor/xbr818.h
new file mode 100644
index 0000000000000..06cac96cbde5d
--- /dev/null
+++ b/include/zephyr/drivers/sensor/xbr818.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024, MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Extended public API for Phosense XBR818 10 GHz Radar
+ *
+ * This exposes 4 additional attributes used to configure the IC
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SENSOR_XBR818_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SENSOR_XBR818_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum sensor_attribute_xbr818 {
+	/*!
+	 * Time of received activity before output is triggered, in seconds
+	 */
+	SENSOR_ATTR_XBR818_DELAY_TIME = SENSOR_ATTR_PRIV_START,
+	/*!
+	 * How long output stays triggered after no more activity is detected, in seconds
+	 */
+	SENSOR_ATTR_XBR818_LOCK_TIME,
+	/*!
+	 * Noise floor Threshold for Radar, 16 first LSBs of the integer part.
+	 */
+	SENSOR_ATTR_XBR818_NOISE_FLOOR,
+	/*!
+	 * RF Power for Radar, 0 to 7, LSB of the integer part.
+	 */
+	SENSOR_ATTR_XBR818_RF_POWER
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_XBR818_H_ */
diff --git a/include/zephyr/drivers/smbus.h b/include/zephyr/drivers/smbus.h
index f0642d6d837e4..de197becbc2a5 100644
--- a/include/zephyr/drivers/smbus.h
+++ b/include/zephyr/drivers/smbus.h
@@ -510,7 +510,7 @@ static inline void smbus_xfer_stats(const struct device *dev, uint8_t sent,
 	Z_DEVICE_DEFINE(node_id, Z_DEVICE_DT_DEV_NAME(node_id),		\
 			DEVICE_DT_NAME(node_id),			\
 			&UTIL_CAT(Z_DEVICE_DT_DEV_NAME(node_id), _init),\
-			pm_device,					\
+			NULL, Z_DEVICE_DT_FLAGS(node_id), pm_device,	\
 			data_ptr, cfg_ptr, level, prio,			\
 			api_ptr,					\
 			&(Z_DEVICE_STATE_NAME(Z_DEVICE_DT_DEV_NAME	\
diff --git a/include/zephyr/drivers/spi.h b/include/zephyr/drivers/spi.h
index c9aaf38c72065..8e8cdb5a99414 100644
--- a/include/zephyr/drivers/spi.h
+++ b/include/zephyr/drivers/spi.h
@@ -39,98 +39,176 @@ extern "C" {
  * @name SPI operational mode
  * @{
  */
-#define SPI_OP_MODE_MASTER	0U      /**< Master mode. */
+
+/**
+ * @brief Master (controller) mode.
+ *
+ * In this case the device used with the API will function as a controller,
+ * meaning it will control the CLK line on the SPI bus and the chip select,
+ * and therefore have full control over the timing of the transaction.
+ */
+#define SPI_OP_MODE_MASTER	0U
+
+/**
+ * @brief Slave (peripheral) mode.
+ *
+ * With this mode, the device will function as a peripheral,
+ * meaning it will need to wait for it's select line to be asserted,
+ * and will be need to be subject to pacing by a controller's clock in order to
+ * send and receive data during a transaction.
+ */
 #define SPI_OP_MODE_SLAVE	BIT(0)  /**< Slave mode. */
+
 /** @cond INTERNAL_HIDDEN */
 #define SPI_OP_MODE_MASK	0x1U
 /** @endcond */
-/** Get SPI operational mode. */
+
+/**
+ * @brief Get SPI Operational mode bitmask from a @ref spi_operation_t
+ */
 #define SPI_OP_MODE_GET(_operation_) ((_operation_) & SPI_OP_MODE_MASK)
 /** @} */
 
+
 /**
- * @name SPI Polarity & Phase Modes
+ * @name SPI Clock Modes
  * @{
  */
 
 /**
- * Clock Polarity: if set, clock idle state will be 1
- * and active state will be 0. If untouched, the inverse will be true
- * which is the default.
+ * @brief Clock Polarity (Clock Idle State)
+ *
+ * @details
+ * Used in @ref spi_operation_t definition.
+ * If set, clock idle state will be 1 and active state will be 0.
+ * If unset, clock idle state will be 0 and active state will be 1.
+ * Unset is the default.
  */
 #define SPI_MODE_CPOL		BIT(1)
 
 /**
- * Clock Phase: this dictates when is the data captured, and depends
- * clock's polarity. When SPI_MODE_CPOL is set and this bit as well,
- * capture will occur on low to high transition and high to low if
- * this bit is not set (default). This is fully reversed if CPOL is
- * not set.
+ * @brief Clock Phase (Clock data capture edge)
+ *
+ * @details
+ * Used in @ref spi_operation_t definition.
+ * If set, data is captured on transition from active to idle CLK state.
+ * If unset, data is captured on transition from idle to active state.
+ * Unset is the default.
  */
 #define SPI_MODE_CPHA		BIT(2)
 
 /**
- * Whatever data is transmitted is looped-back to the receiving buffer of
- * the controller. This is fully controller dependent as some may not
- * support this, and can be used for testing purposes only.
+ * @brief Controller loopback mode
+ *
+ * @details
+ * For testing purposes, enable hardware loopback,
+ * which means that transmit data is fed back to the receiver of the same controller.
+ *
+ * Not all controllers support this feature.
  */
 #define SPI_MODE_LOOP		BIT(3)
+
 /** @cond INTERNAL_HIDDEN */
 #define SPI_MODE_MASK		(0xEU)
 /** @endcond */
-/** Get SPI polarity and phase mode bits. */
+
+/**
+ * @brief Get SPI clock polarity and phase mode bitmask from a @ref spi_operation_t
+ */
 #define SPI_MODE_GET(_mode_)			\
 	((_mode_) & SPI_MODE_MASK)
 
 /** @} */
 
-/**
- * @name SPI Transfer modes (host controller dependent)
- * @{
- */
-#define SPI_TRANSFER_MSB	(0U)    /**< Most significant bit first. */
-#define SPI_TRANSFER_LSB	BIT(4)  /**< Least significant bit first. */
-/** @} */
 
 /**
- * @name SPI word size
+ * @name SPI Data Word Configurations
+ *
+ * A SPI Data word is a value that is shifted in/out of the controller's hardware FIFO
+ * and is the atomic unit of communication on the spi bus.
+ * A word is also called a "data frame" in this API.
+ * A transfer is made up of an arbitrary number of words.
+ * The following options specify configurations of the SPI word for the operation.
+ *
  * @{
  */
+
+/** Words are most significant bit first, used for @ref spi_operation_t */
+#define SPI_TRANSFER_MSB	(0U)
+/** Words are least significant bit first, used for @ref spi_operation_t */
+#define SPI_TRANSFER_LSB	BIT(4)
+
 /** @cond INTERNAL_HIDDEN */
 #define SPI_WORD_SIZE_SHIFT	(5U)
 #define SPI_WORD_SIZE_MASK	(0x3FU << SPI_WORD_SIZE_SHIFT)
 /** @endcond */
-/** Get SPI word size (data frame size) in bits. */
-#define SPI_WORD_SIZE_GET(_operation_)					\
-	(((_operation_) & SPI_WORD_SIZE_MASK) >> SPI_WORD_SIZE_SHIFT)
-/** Set SPI word size (data frame size) in bits. */
-#define SPI_WORD_SET(_word_size_)		\
-	((_word_size_) << SPI_WORD_SIZE_SHIFT)
+
+/**
+ * @brief Get SPI word size in bits from a @ref spi_operation_t
+ *
+ * @param operation A @ref spi_operation_t from which to get the configured word size.
+ * @retval The size (in bits) of a spi word for the operation.
+ */
+#define SPI_WORD_SIZE_GET(operation)					\
+	(((operation) & SPI_WORD_SIZE_MASK) >> SPI_WORD_SIZE_SHIFT)
+
+/**
+ * @brief Get a bitmask to set the word size in a @ref spi_operation_t
+ *
+ * @param word_size The size of a SPI data frame in bits.
+ * @retval A bitmask to apply to a @ref spi_operation_t
+ */
+#define SPI_WORD_SET(word_size)			\
+	((word_size) << SPI_WORD_SIZE_SHIFT)
+
 /** @} */
 
+
 /**
- * @name Specific SPI devices control bits
+ * @name SPI Transfer control flags
  * @{
  */
-/** Requests - if possible - to keep CS asserted after the transaction */
+
+/**
+ * @brief Keep chip select active after transaction
+ *
+ * After one of the spi transceive calls described in this API,
+ * if this flag is set in the spi config operation, then
+ * attempt to keep the CS active after the call, if supported and possible.
+ */
 #define SPI_HOLD_ON_CS		BIT(12)
-/** Keep the device locked after the transaction for the current config.
- * Use this with extreme caution (see spi_release() below) as it will
- * prevent other callers to access the SPI device until spi_release() is
- * properly called.
+
+/**
+ * @brief Retain ownership of the spi device
+ *
+ * This is a software control parameter that will prevent the spi device
+ * from being accessed by other API callers after the transaction,
+ * and therefore should be used with caution.
+ *
+ * The identifying piece of information for who "locks" the device
+ * is the spi_config pointer given to the transaction API, so this same
+ * config should be re-used to do another transaction or release the lock.
+ *
+ * See @ref spi_release for how to release the  lock.
  */
 #define SPI_LOCK_ON		BIT(13)
 
-/** Active high logic on CS. Usually, and by default, CS logic is active
- * low. However, some devices may require the reverse logic: active high.
- * This bit will request the controller to use that logic. Note that not
- * all controllers are able to handle that natively. In this case deferring
- * the CS control to a gpio line through struct spi_cs_control would be
- * the solution.
+/**
+ * @brief Chip select active state configuration
+ *
+ * If this flag is set, the CS will be active high.
+ * If this flag is unset, the CS will be active low.
+ *
+ * Default is active low (unset) as that is most common for spi peripherals.
+ *
+ * Not all controllers are able to handle this natively, in which case a
+ * gpio can still be used to control the CS through software with a @ref spi_cs_control
  */
 #define SPI_CS_ACTIVE_HIGH	BIT(14)
+
 /** @} */
 
+
 /**
  * @name SPI MISO lines
  * @{
@@ -149,11 +227,16 @@ extern "C" {
 
 /** @} */
 
+/**
+ * @name SPI GPIO Chip Select control
+ * @{
+ */
+
 /**
  * @brief SPI Chip Select control structure
  *
  * This can be used to control a CS line via a GPIO line, instead of
- * using the controller inner CS logic.
+ * using the controller internal CS logic.
  *
  */
 struct spi_cs_control {
@@ -285,6 +368,8 @@ struct spi_cs_control {
 #define SPI_CS_CONTROL_INIT_INST(inst, delay_)		\
 	SPI_CS_CONTROL_INIT(DT_DRV_INST(inst), delay_)
 
+/** @} */
+
 /**
  * @typedef spi_operation_t
  * Opaque type to hold the SPI operation flags.
@@ -297,6 +382,10 @@ typedef uint16_t spi_operation_t;
 
 /**
  * @brief SPI controller configuration structure
+ *
+ * @warning Most drivers use pointer comparison to determine whether a passed
+ * configuration is different from one used in a previous transaction.
+ * Changes to fields in the structure may not be detected.
  */
 struct spi_config {
 	/** @brief Bus frequency in Hertz. */
@@ -307,7 +396,7 @@ struct spi_config {
 	 * It is a bit field with the following parts:
 	 *
 	 * - 0:      Master or slave.
-	 * - 1..3:   Polarity, phase and loop mode.
+	 * - 1..3:   Clock polarity, phase and loop mode.
 	 * - 4:      LSB or MSB first.
 	 * - 5..10:  Size of a data frame (word) in bits.
 	 * - 11:     Full/half duplex.
@@ -454,27 +543,41 @@ struct spi_dt_spec {
 
 /**
  * @brief SPI buffer structure
+ *
+ * A SPI buffer describes either a real data buffer or an indication of NOP
+ * For a NOP indicator:
+ *   If buffer is used for TX, only 0's will be sent for the length on the bus
+ *   If buffer is used for RX, that length of data received by bus will be ignored/skipped
  */
 struct spi_buf {
-	/** Valid pointer to a data buffer, or NULL otherwise */
+	/** Valid pointer to a data buffer, or NULL for NOP indication */
 	void *buf;
-	/** Length of the buffer @a buf in bytes.
-	 * If @a buf is NULL, length which as to be sent as dummy bytes (as TX
-	 * buffer) or the length of bytes that should be skipped (as RX buffer).
-	 */
+	/** Length of the buffer @a buf in bytes, or length of NOP */
 	size_t len;
 };
 
 /**
- * @brief SPI buffer array structure
+ * @brief SPI scatter-gather buffer array structure
+ *
+ * A spi_buf_set is a flexible description of a whole single SPI bus transfer.
+ *
+ * Since the set is an array of pointers to buffers, it means that pieces of a spi transfer
+ * definition can be re-used across different transfers, without having to redefine or allocate
+ * new memory for them each time.
+ * This accomplishes what is called "scatter-gather" buffer management at the driver level with
+ * user-provided buffers.
  */
 struct spi_buf_set {
 	/** Pointer to an array of spi_buf, or NULL */
 	const struct spi_buf *buffers;
-	/** Length of the array (number of buffers) pointed by @a buffers */
+	/** Number of buffers in the array pointed to: by @a buffers */
 	size_t count;
 };
 
+/**
+ * @name SPI Stats
+ * @{
+ */
 #if defined(CONFIG_SPI_STATS)
 STATS_SECT_START(spi)
 STATS_SECT_ENTRY32(rx_bytes)
@@ -528,6 +631,7 @@ struct spi_device_state {
 #define SPI_STATS_TRANSFER_ERROR_INC(dev_)			\
 	STATS_INC(Z_SPI_GET_STATS(dev_), transfer_error)
 
+/** @cond INTERNAL_HIDDEN */
 /**
  * @brief Define a statically allocated and section assigned SPI device state
  */
@@ -551,26 +655,8 @@ struct spi_device_state {
 		stats_register(dev->name, &(state->stats.s_hdr));	\
 		return init_fn(dev);					\
 	}
+/** @endcond */
 
-/**
- * @brief Like DEVICE_DT_DEFINE() with SPI specifics.
- *
- * @details Defines a device which implements the SPI API. May
- * generate a custom device_state container struct and init_fn
- * wrapper when needed depending on SPI @kconfig{CONFIG_SPI_STATS}.
- *
- * @param node_id The devicetree node identifier.
- * @param init_fn Name of the init function of the driver.
- * @param pm_device PM device resources reference (NULL if device does not use PM).
- * @param data_ptr Pointer to the device's private data.
- * @param cfg_ptr The address to the structure containing the configuration
- *                information for this instance of the driver.
- * @param level The initialization level. See SYS_INIT() for details.
- * @param prio Priority within the selected initialization level. See SYS_INIT()
- *             for details.
- * @param api_ptr Provides an initial pointer to the API function struct used by
- *                the driver. Can be NULL.
- */
 #define SPI_DEVICE_DT_DEFINE(node_id, init_fn, pm_device,		\
 			     data_ptr, cfg_ptr, level, prio,		\
 			     api_ptr, ...)				\
@@ -579,7 +665,7 @@ struct spi_device_state {
 	Z_DEVICE_DEFINE(node_id, Z_DEVICE_DT_DEV_ID(node_id),		\
 			DEVICE_DT_NAME(node_id),			\
 			&UTIL_CAT(Z_DEVICE_DT_DEV_ID(node_id), _init),	\
-			pm_device,					\
+			NULL, Z_DEVICE_DT_FLAGS(node_id), pm_device,	\
 			data_ptr, cfg_ptr, level, prio,			\
 			api_ptr,					\
 			&(Z_DEVICE_STATE_NAME(Z_DEVICE_DT_DEV_ID(node_id)).devstate), \
@@ -606,18 +692,44 @@ static inline void spi_transceive_stats(const struct device *dev, int error,
 		SPI_STATS_RX_BYTES_INCN(dev, rx_bytes);
 	}
 }
+/** @} */
 
 #else /*CONFIG_SPI_STATS*/
 
+/**
+ * @name SPI DT Device Macros
+ * @{
+ */
+/**
+ * @brief Like DEVICE_DT_DEFINE() with SPI specifics.
+ *
+ * @details Defines a device which implements the SPI API. May
+ * generate a custom device_state container struct and init_fn
+ * wrapper when needed depending on SPI @kconfig{CONFIG_SPI_STATS}.
+ *
+ * @param node_id The devicetree node identifier.
+ * @param init_fn Name of the init function of the driver.
+ * @param pm PM device resources reference (NULL if device does not use PM).
+ * @param data Pointer to the device's private data.
+ * @param config The address to the structure containing the configuration
+ *                information for this instance of the driver.
+ * @param level The initialization level. See SYS_INIT() for details.
+ * @param prio Priority within the selected initialization level. See SYS_INIT()
+ *             for details.
+ * @param api Provides an initial pointer to the API function struct used by
+ *                the driver. Can be NULL.
+ */
 #define SPI_DEVICE_DT_DEFINE(node_id, init_fn, pm,		\
 				data, config, level, prio,	\
 				api, ...)			\
 	Z_DEVICE_STATE_DEFINE(Z_DEVICE_DT_DEV_ID(node_id));			\
 	Z_DEVICE_DEFINE(node_id, Z_DEVICE_DT_DEV_ID(node_id),			\
-			DEVICE_DT_NAME(node_id), init_fn, pm, data, config,	\
+			DEVICE_DT_NAME(node_id), init_fn, NULL,			\
+			Z_DEVICE_DT_FLAGS(node_id), pm, data, config,		\
 			level, prio, api,					\
 			&Z_DEVICE_STATE_NAME(Z_DEVICE_DT_DEV_ID(node_id)),	\
 			__VA_ARGS__)
+/** @} */
 
 #define SPI_STATS_RX_BYTES_INC(dev_)
 #define SPI_STATS_TX_BYTES_INC(dev_)
@@ -627,6 +739,7 @@ static inline void spi_transceive_stats(const struct device *dev, int error,
 
 #endif /*CONFIG_SPI_STATS*/
 
+
 /**
  * @brief Like SPI_DEVICE_DT_DEFINE(), but uses an instance of a `DT_DRV_COMPAT`
  * compatible instead of a node identifier.
@@ -749,11 +862,28 @@ static inline bool spi_is_ready_dt(const struct spi_dt_spec *spec)
 	return true;
 }
 
+/**
+ * @name SPI Synchronous Transfer Functions
+ *
+ * These functions will not return until transfer is complete
+ *
+ * @{
+ */
+
 /**
  * @brief Read/write the specified amount of data from the SPI driver.
  *
  * @note This function is synchronous.
  *
+ * @note In master mode, the chip select line will remain asserted (active) for
+ *       the entire duration of the transfer of all buffers in the provided buf sets.
+ *       Only after all buffers have been transferred will CS be deasserted.
+ *
+ * @note In peripheral mode, data transfer happens when the master asserts CS and
+ *       provides the clock. The function will wait for the master to complete
+ *       the transfer before returning. The CS is controlled by master
+ *       and therefore may not be continuously asserted for the whole transfer.
+ *
  * @param dev Pointer to the device structure for the driver instance
  * @param config Pointer to a valid spi_config structure instance.
  *        Pointer-comparison may be used to detect changes from
@@ -765,6 +895,9 @@ static inline bool spi_is_ready_dt(const struct spi_dt_spec *spec)
  *
  * @retval frames Positive number of frames received in slave mode.
  * @retval 0 If successful in master mode.
+ * @retval -ENOTSUP means some part of the spi config is not supported either by the
+ *	   device hardware or the driver software.
+ * @retval -EINVAL means that some parameter of the spi_config is invalid.
  * @retval -errno Negative errno code on failure.
  */
 __syscall int spi_transceive(const struct device *dev,
@@ -824,6 +957,9 @@ static inline int spi_transceive_dt(const struct spi_dt_spec *spec,
  *
  * @retval frames Positive number of frames received in slave mode.
  * @retval 0 If successful.
+ * @retval -ENOTSUP means some part of the spi config is not supported either by the
+ *	   device hardware or the driver software.
+ * @retval -EINVAL means that some parameter of the spi_config is invalid.
  * @retval -errno Negative errno code on failure.
  */
 static inline int spi_read(const struct device *dev,
@@ -865,6 +1001,9 @@ static inline int spi_read_dt(const struct spi_dt_spec *spec,
  * @param tx_bufs Buffer array where data to be sent originates from.
  *
  * @retval 0 If successful.
+ * @retval -ENOTSUP means some part of the spi config is not supported either by the
+ *	   device hardware or the driver software.
+ * @retval -EINVAL means that some parameter of the spi_config is invalid.
  * @retval -errno Negative errno code on failure.
  */
 static inline int spi_write(const struct device *dev,
@@ -891,8 +1030,20 @@ static inline int spi_write_dt(const struct spi_dt_spec *spec,
 {
 	return spi_write(spec->bus, &spec->config, tx_bufs);
 }
+/** @} */
 
 #if defined(CONFIG_SPI_ASYNC) || defined(__DOXYGEN__)
+/**
+ * @name SPI Asynchronous Transfer Functions
+ *
+ * With this API the transfer function will return after the transfer is started and
+ * report completion through a notification mechanism: callback or signal.
+ *
+ * @note Note that asynchronous API calls can still be blocking if the bus is already busy.
+ *       The functions will block until the bus is available to start the requested transfer.
+ *
+ * @{
+ */
 
 /**
  * @brief Read/write the specified amount of data from the SPI driver.
@@ -902,6 +1053,9 @@ static inline int spi_write_dt(const struct spi_dt_spec *spec,
  * @note This function is available only if @kconfig{CONFIG_SPI_ASYNC}
  * is selected.
  *
+ * @note The chip select behavior as described by @ref spi_transceive and
+ *       the function of controller/peripheral modes is the same.
+ *
  * @param dev Pointer to the device structure for the driver instance
  * @param config Pointer to a valid spi_config structure instance.
  *        Pointer-comparison may be used to detect changes from
@@ -918,6 +1072,9 @@ static inline int spi_write_dt(const struct spi_dt_spec *spec,
  *
  * @retval frames Positive number of frames received in slave mode.
  * @retval 0 If successful in master mode.
+ * @retval -ENOTSUP means some part of the spi config is not supported either by the
+ *	   device hardware or the driver software.
+ * @retval -EINVAL means that some parameter of the spi_config is invalid.
  * @retval -errno Negative errno code on failure.
  */
 static inline int spi_transceive_cb(const struct device *dev,
@@ -944,6 +1101,9 @@ void z_spi_transfer_signal_cb(const struct device *dev, int result, void *userda
  *
  * @note This function is asynchronous.
  *
+ * @note The chip select behavior as described by @ref spi_transceive and
+ *       the function of controller/peripheral modes is the same.
+ *
  * @note This function is available only if @kconfig{CONFIG_SPI_ASYNC}
  * and @kconfig{CONFIG_POLL} are selected.
  *
@@ -962,6 +1122,9 @@ void z_spi_transfer_signal_cb(const struct device *dev, int result, void *userda
  *
  * @retval frames Positive number of frames received in slave mode.
  * @retval 0 If successful in master mode.
+ * @retval -ENOTSUP means some part of the spi config is not supported either by the
+ *	   device hardware or the driver software.
+ * @retval -EINVAL means that some parameter of the spi_config is invalid.
  * @retval -errno Negative errno code on failure.
  */
 static inline int spi_transceive_signal(const struct device *dev,
@@ -999,6 +1162,9 @@ static inline int spi_transceive_signal(const struct device *dev,
  *
  * @retval frames Positive number of frames received in slave mode.
  * @retval 0 If successful
+ * @retval -ENOTSUP means some part of the spi config is not supported either by the
+ *	   device hardware or the driver software.
+ * @retval -EINVAL means that some parameter of the spi_config is invalid.
  * @retval -errno Negative errno code on failure.
  */
 static inline int spi_read_signal(const struct device *dev,
@@ -1030,6 +1196,9 @@ static inline int spi_read_signal(const struct device *dev,
  *        successfully or not).
  *
  * @retval 0 If successful.
+ * @retval -ENOTSUP means some part of the spi config is not supported either by the
+ *	   device hardware or the driver software.
+ * @retval -EINVAL means that some parameter of the spi_config is invalid.
  * @retval -errno Negative errno code on failure.
  */
 static inline int spi_write_signal(const struct device *dev,
@@ -1042,11 +1211,19 @@ static inline int spi_write_signal(const struct device *dev,
 
 #endif /* CONFIG_POLL */
 
+/** @} */
 #endif /* CONFIG_SPI_ASYNC */
 
 
 #if defined(CONFIG_SPI_RTIO) || defined(__DOXYGEN__)
 
+/**
+ * @name SPI RTIO API
+ *
+ * Theses functions are for using the SPI driver class through an RTIO-based API
+ *
+ * @{
+ */
 /**
  * @brief Submit a SPI device with a request
  *
@@ -1063,7 +1240,9 @@ static inline void spi_iodev_submit(struct rtio_iodev_sqe *iodev_sqe)
 	api->iodev_submit(dt_spec->bus, iodev_sqe);
 }
 
+/** @cond INTERNAL_HIDDEN */
 extern const struct rtio_iodev_api spi_iodev_api;
+/** @endcond */
 
 /**
  * @brief Define an iodev for a given dt node on the bus
@@ -1095,6 +1274,7 @@ static inline bool spi_is_ready_iodev(const struct rtio_iodev *spi_iodev)
 
 	return spi_is_ready_dt(spec);
 }
+/** @} */
 
 #endif /* CONFIG_SPI_RTIO */
 
@@ -1156,4 +1336,7 @@ static inline int spi_release_dt(const struct spi_dt_spec *spec)
 
 #include <zephyr/syscalls/spi.h>
 
+/**
+ * @}
+ */
 #endif /* ZEPHYR_INCLUDE_DRIVERS_SPI_H_ */
diff --git a/include/zephyr/drivers/stepper.h b/include/zephyr/drivers/stepper.h
index 00c67f08df58a..16632e2579ffc 100644
--- a/include/zephyr/drivers/stepper.h
+++ b/include/zephyr/drivers/stepper.h
@@ -1,22 +1,22 @@
-/**
- * @file drivers/stepper.h
- *
- * @brief Public API for Stepper Driver
- *
- */
-
 /*
  * SPDX-FileCopyrightText: Copyright (c) 2024 Carl Zeiss Meditec AG
  * SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/**
+ * @file drivers/stepper.h
+ * @brief Public API for Stepper Driver
+ */
+
 #ifndef ZEPHYR_INCLUDE_DRIVERS_STEPPER_H_
 #define ZEPHYR_INCLUDE_DRIVERS_STEPPER_H_
 
 /**
- * @brief Stepper Controller Interface
- * @defgroup stepper_interface Stepper Controller Interface
+ * @brief Stepper Driver Interface
+ * @defgroup stepper_interface Stepper Driver Interface
+ * @since 4.0
+ * @version 0.1.0
  * @ingroup io_interfaces
  * @{
  */
@@ -30,35 +30,42 @@ extern "C" {
 #endif
 
 /**
- * @brief Macro to calculate the index of the microstep resolution
- * @param res Microstep resolution
- */
-#define MICRO_STEP_RES_INDEX(res) LOG2(res)
-
-/**
- * @brief Stepper Motor microstep resolution options
+ * @brief Stepper Motor micro-step resolution options
  */
 enum stepper_micro_step_resolution {
 	/** Full step resolution */
 	STEPPER_MICRO_STEP_1 = 1,
-	/** 2 microsteps per full step */
+	/** 2 micro-steps per full step */
 	STEPPER_MICRO_STEP_2 = 2,
-	/** 4 microsteps per full step */
+	/** 4 micro-steps per full step */
 	STEPPER_MICRO_STEP_4 = 4,
-	/** 8 microsteps per full step */
+	/** 8 micro-steps per full step */
 	STEPPER_MICRO_STEP_8 = 8,
-	/** 16 microsteps per full step */
+	/** 16 micro-steps per full step */
 	STEPPER_MICRO_STEP_16 = 16,
-	/** 32 microsteps per full step */
+	/** 32 micro-steps per full step */
 	STEPPER_MICRO_STEP_32 = 32,
-	/** 64 microsteps per full step */
+	/** 64 micro-steps per full step */
 	STEPPER_MICRO_STEP_64 = 64,
-	/** 128 microsteps per full step */
+	/** 128 micro-steps per full step */
 	STEPPER_MICRO_STEP_128 = 128,
-	/** 256 microsteps per full step */
+	/** 256 micro-steps per full step */
 	STEPPER_MICRO_STEP_256 = 256,
 };
 
+/**
+ * @brief Macro to calculate the index of the microstep resolution
+ * @param res Microstep resolution
+ */
+#define MICRO_STEP_RES_INDEX(res) LOG2(res)
+
+#define VALID_MICRO_STEP_RES(res)                                                                  \
+	((res) == STEPPER_MICRO_STEP_1 || (res) == STEPPER_MICRO_STEP_2 ||                         \
+	 (res) == STEPPER_MICRO_STEP_4 || (res) == STEPPER_MICRO_STEP_8 ||                         \
+	 (res) == STEPPER_MICRO_STEP_16 || (res) == STEPPER_MICRO_STEP_32 ||                       \
+	 (res) == STEPPER_MICRO_STEP_64 || (res) == STEPPER_MICRO_STEP_128 ||                      \
+	 (res) == STEPPER_MICRO_STEP_256)
+
 /**
  * @brief Stepper Motor direction options
  */
@@ -93,36 +100,32 @@ enum stepper_event {
 	STEPPER_EVENT_LEFT_END_STOP_DETECTED = 2,
 	/** Right end switch status changes to pressed */
 	STEPPER_EVENT_RIGHT_END_STOP_DETECTED = 3,
+	/** Stepper has stopped */
+	STEPPER_EVENT_STOPPED = 4,
+	/** Fault with the stepper controller detected */
+	STEPPER_EVENT_FAULT_DETECTED = 5,
 };
 
 /**
  * @cond INTERNAL_HIDDEN
  *
- * Stepper motor controller driver API definition and system call entry points.
+ * Stepper driver API definition and system call entry points.
  *
  */
 
 /**
- * @brief enable or disable the stepper motor controller.
+ * @brief Enable the stepper driver.
  *
  * @see stepper_enable() for details.
  */
-typedef int (*stepper_enable_t)(const struct device *dev, const bool enable);
+typedef int (*stepper_enable_t)(const struct device *dev);
 
 /**
- * @brief Move the stepper motor relatively by a given number of microsteps.
+ * @brief Disable the stepper driver.
  *
- * @see stepper_move_by() for details.
+ * @see stepper_disable() for details.
  */
-typedef int (*stepper_move_by_t)(const struct device *dev, const int32_t micro_steps);
-
-/**
- * @brief Set the time interval between steps in nanoseconds.
- *
- * @see stepper_set_microstep_interval() for details.
- */
-typedef int (*stepper_set_microstep_interval_t)(const struct device *dev,
-						const uint64_t microstep_interval_ns);
+typedef int (*stepper_disable_t)(const struct device *dev);
 
 /**
  * @brief Set the micro-step resolution
@@ -154,18 +157,38 @@ typedef int (*stepper_set_reference_position_t)(const struct device *dev, const
 typedef int (*stepper_get_actual_position_t)(const struct device *dev, int32_t *value);
 
 /**
- * @brief Move the stepper motor to an absolute position in microsteps.
+ * @brief Callback function for stepper events
+ */
+typedef void (*stepper_event_callback_t)(const struct device *dev, const enum stepper_event event,
+					 void *user_data);
+
+/**
+ * @brief Set the callback function to be called when a stepper event occurs
  *
- * @see stepper_move_to() for details.
+ * @see stepper_set_event_callback() for details.
  */
-typedef int (*stepper_move_to_t)(const struct device *dev, const int32_t micro_steps);
+typedef int (*stepper_set_event_callback_t)(const struct device *dev,
+					    stepper_event_callback_t callback, void *user_data);
+/**
+ * @brief Set the time interval between steps in nanoseconds.
+ *
+ * @see stepper_set_microstep_interval() for details.
+ */
+typedef int (*stepper_set_microstep_interval_t)(const struct device *dev,
+						const uint64_t microstep_interval_ns);
+/**
+ * @brief Move the stepper relatively by a given number of micro-steps.
+ *
+ * @see stepper_move_by() for details.
+ */
+typedef int (*stepper_move_by_t)(const struct device *dev, const int32_t micro_steps);
 
 /**
- * @brief Is the target position fo the stepper reached
+ * @brief Move the stepper to an absolute position in micro-steps.
  *
- * @see stepper_is_moving() for details.
+ * @see stepper_move_to() for details.
  */
-typedef int (*stepper_is_moving_t)(const struct device *dev, bool *is_moving);
+typedef int (*stepper_move_to_t)(const struct device *dev, const int32_t micro_steps);
 
 /**
  * @brief Run the stepper with a given step interval in a given direction
@@ -175,34 +198,36 @@ typedef int (*stepper_is_moving_t)(const struct device *dev, bool *is_moving);
 typedef int (*stepper_run_t)(const struct device *dev, const enum stepper_direction direction);
 
 /**
- * @brief Callback function for stepper events
+ * @brief Stop the stepper
+ *
+ * @see stepper_stop() for details.
  */
-typedef void (*stepper_event_callback_t)(const struct device *dev, const enum stepper_event event,
-					 void *user_data);
+typedef int (*stepper_stop_t)(const struct device *dev);
 
 /**
- * @brief Set the callback function to be called when a stepper event occurs
+ * @brief Is the target position fo the stepper reached
  *
- * @see stepper_set_event_callback() for details.
+ * @see stepper_is_moving() for details.
  */
-typedef int (*stepper_set_event_callback_t)(const struct device *dev,
-					    stepper_event_callback_t callback, void *user_data);
+typedef int (*stepper_is_moving_t)(const struct device *dev, bool *is_moving);
 
 /**
- * @brief Stepper Motor Controller API
+ * @brief Stepper Driver API
  */
 __subsystem struct stepper_driver_api {
 	stepper_enable_t enable;
-	stepper_move_by_t move_by;
-	stepper_set_microstep_interval_t set_microstep_interval;
+	stepper_disable_t disable;
 	stepper_set_micro_step_res_t set_micro_step_res;
 	stepper_get_micro_step_res_t get_micro_step_res;
 	stepper_set_reference_position_t set_reference_position;
 	stepper_get_actual_position_t get_actual_position;
+	stepper_set_event_callback_t set_event_callback;
+	stepper_set_microstep_interval_t set_microstep_interval;
+	stepper_move_by_t move_by;
 	stepper_move_to_t move_to;
-	stepper_is_moving_t is_moving;
 	stepper_run_t run;
-	stepper_set_event_callback_t set_event_callback;
+	stepper_stop_t stop;
+	stepper_is_moving_t is_moving;
 };
 
 /**
@@ -210,80 +235,48 @@ __subsystem struct stepper_driver_api {
  */
 
 /**
- * @brief Enable or disable motor controller
+ * @brief Enable stepper driver
+ *
+ * @details Enabling the driver will energize the coils, however not set the stepper in motion.
  *
- * @param dev pointer to the stepper motor controller instance
- * @param enable Input enable or disable motor controller
+ * @param dev pointer to the stepper driver instance
  *
  * @retval -EIO Error during Enabling
  * @retval 0 Success
  */
-__syscall int stepper_enable(const struct device *dev, const bool enable);
-
-static inline int z_impl_stepper_enable(const struct device *dev, const bool enable)
-{
-	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
-
-	return api->enable(dev, enable);
-}
-
-/**
- * @brief Set the microsteps to be moved from the current position i.e. relative movement
- *
- * @details The motor will move by the given number of microsteps from the current position.
- * This function is non-blocking.
- *
- * @param dev pointer to the stepper motor controller instance
- * @param micro_steps target microsteps to be moved from the current position
- *
- * @retval -ECANCELED If the stepper is disabled
- * @retval -EIO General input / output error
- * @retval	0 Success
- */
-__syscall int stepper_move_by(const struct device *dev, int32_t micro_steps);
+__syscall int stepper_enable(const struct device *dev);
 
-static inline int z_impl_stepper_move_by(const struct device *dev, const int32_t micro_steps)
+static inline int z_impl_stepper_enable(const struct device *dev)
 {
 	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
 
-	return api->move_by(dev, micro_steps);
+	return api->enable(dev);
 }
 
 /**
- * @brief Set the time interval between steps in microseconds
+ * @brief Disable stepper driver
  *
- * @details For controllers such as DRV8825 where you
- * toggle the STEP Pin, the pulse_length would have to be calculated based on this parameter in the
- * driver.
- * @note Setting step interval does not set the motor into motion, a combination of
- * set_microstep_interval and move is required to set the motor into motion.
+ * @details Disabling the driver shall cancel all active movements and de-energize the coils.
  *
- * @param dev pointer to the stepper motor controller instance
- * @param microstep_interval_ns time interval between steps in microseconds
+ * @param dev pointer to the stepper driver instance
  *
- * @retval -EIO General input / output error
- * @retval -EINVAL If the requested step interval is not supported
+ * @retval -EIO Error during Disabling
  * @retval 0 Success
  */
-__syscall int stepper_set_microstep_interval(const struct device *dev,
-					     uint64_t microstep_interval_ns);
+__syscall int stepper_disable(const struct device *dev);
 
-static inline int z_impl_stepper_set_microstep_interval(const struct device *dev,
-							const uint64_t microstep_interval_ns)
+static inline int z_impl_stepper_disable(const struct device *dev)
 {
 	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
 
-	if (api->set_microstep_interval == NULL) {
-		return -ENOSYS;
-	}
-	return api->set_microstep_interval(dev, microstep_interval_ns);
+	return api->disable(dev);
 }
 
 /**
- * @brief Set the microstep resolution in stepper motor controller
+ * @brief Set the micro-step resolution in stepper driver
  *
- * @param dev pointer to the stepper motor controller instance
- * @param resolution microstep resolution
+ * @param dev pointer to the stepper driver instance
+ * @param resolution micro-step resolution
  *
  * @retval -EIO General input / output error
  * @retval -ENOSYS If not implemented by device driver
@@ -305,10 +298,10 @@ static inline int z_impl_stepper_set_micro_step_res(const struct device *dev,
 }
 
 /**
- * @brief Get the microstep resolution in stepper motor controller
+ * @brief Get the micro-step resolution in stepper driver
  *
- * @param dev pointer to the stepper motor controller instance
- * @param resolution microstep resolution
+ * @param dev pointer to the stepper driver instance
+ * @param resolution micro-step resolution
  *
  * @retval -EIO General input / output error
  * @retval -ENOSYS If not implemented by device driver
@@ -331,7 +324,7 @@ static inline int z_impl_stepper_get_micro_step_res(const struct device *dev,
 /**
  * @brief Set the reference position of the stepper
  *
- * @param dev Pointer to the stepper motor controller instance.
+ * @param dev Pointer to the stepper driver instance.
  * @param value The reference position to set in micro-steps.
  *
  * @retval -EIO General input / output error
@@ -354,8 +347,8 @@ static inline int z_impl_stepper_set_reference_position(const struct device *dev
 /**
  * @brief Get the actual a.k.a reference position of the stepper
  *
- * @param dev pointer to the stepper motor controller instance
- * @param value The actual position to get in microsteps
+ * @param dev pointer to the stepper driver instance
+ * @param value The actual position to get in micro-steps
  *
  * @retval -EIO General input / output error
  * @retval -ENOSYS If not implemented by device driver
@@ -374,61 +367,115 @@ static inline int z_impl_stepper_get_actual_position(const struct device *dev, i
 }
 
 /**
- * @brief Set the absolute target position of the stepper
+ * @brief Set the callback function to be called when a stepper event occurs
  *
- * @details The motor will move to the given microsteps position from the reference position.
- * This function is non-blocking.
+ * @param dev pointer to the stepper driver instance
+ * @param callback Callback function to be called when a stepper event occurs
+ * passing NULL will disable the callback
+ * @param user_data User data to be passed to the callback function
  *
- * @param dev pointer to the stepper motor controller instance
- * @param micro_steps target position to set in microsteps
+ * @retval -ENOSYS If not implemented by device driver
+ * @retval 0 Success
+ */
+__syscall int stepper_set_event_callback(const struct device *dev,
+					 stepper_event_callback_t callback, void *user_data);
+
+static inline int z_impl_stepper_set_event_callback(const struct device *dev,
+						    stepper_event_callback_t callback,
+						    void *user_data)
+{
+	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
+
+	if (api->set_event_callback == NULL) {
+		return -ENOSYS;
+	}
+	return api->set_event_callback(dev, callback, user_data);
+}
+
+/**
+ * @brief Set the time interval between steps in nanoseconds with immediate effect.
+ *
+ * @note Setting step interval does not set the stepper into motion, a combination of
+ * set_microstep_interval and move is required to set the stepper into motion.
+ *
+ * @param dev pointer to the stepper driver instance
+ * @param microstep_interval_ns time interval between steps in nanoseconds
  *
- * @retval -ECANCELED If the stepper is disabled
  * @retval -EIO General input / output error
+ * @retval -EINVAL If the requested step interval is not supported
  * @retval -ENOSYS If not implemented by device driver
  * @retval 0 Success
  */
-__syscall int stepper_move_to(const struct device *dev, int32_t micro_steps);
+__syscall int stepper_set_microstep_interval(const struct device *dev,
+					     uint64_t microstep_interval_ns);
 
-static inline int z_impl_stepper_move_to(const struct device *dev, const int32_t micro_steps)
+static inline int z_impl_stepper_set_microstep_interval(const struct device *dev,
+							const uint64_t microstep_interval_ns)
 {
 	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
 
-	if (api->move_to == NULL) {
+	if (api->set_microstep_interval == NULL) {
 		return -ENOSYS;
 	}
-	return api->move_to(dev, micro_steps);
+	return api->set_microstep_interval(dev, microstep_interval_ns);
 }
 
 /**
- * @brief Check if the stepper motor is currently moving
+ * @brief Set the micro-steps to be moved from the current position i.e. relative movement
  *
- * @param dev pointer to the stepper motor controller instance
- * @param is_moving Pointer to a boolean to store the moving status of the stepper motor
+ * @details The stepper will move by the given number of micro-steps from the current position.
+ * This function is non-blocking.
+ *
+ * @param dev pointer to the stepper driver instance
+ * @param micro_steps target micro-steps to be moved from the current position
  *
+ * @retval -ECANCELED If the stepper is disabled
+ * @retval -EIO General input / output error
+ * @retval 0 Success
+ */
+__syscall int stepper_move_by(const struct device *dev, int32_t micro_steps);
+
+static inline int z_impl_stepper_move_by(const struct device *dev, const int32_t micro_steps)
+{
+	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
+
+	return api->move_by(dev, micro_steps);
+}
+
+/**
+ * @brief Set the absolute target position of the stepper
+ *
+ * @details The stepper will move to the given micro-steps position from the reference position.
+ * This function is non-blocking.
+ *
+ * @param dev pointer to the stepper driver instance
+ * @param micro_steps target position to set in micro-steps
+ *
+ * @retval -ECANCELED If the stepper is disabled
  * @retval -EIO General input / output error
  * @retval -ENOSYS If not implemented by device driver
  * @retval 0 Success
  */
-__syscall int stepper_is_moving(const struct device *dev, bool *is_moving);
+__syscall int stepper_move_to(const struct device *dev, int32_t micro_steps);
 
-static inline int z_impl_stepper_is_moving(const struct device *dev, bool *is_moving)
+static inline int z_impl_stepper_move_to(const struct device *dev, const int32_t micro_steps)
 {
 	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
 
-	if (api->is_moving == NULL) {
+	if (api->move_to == NULL) {
 		return -ENOSYS;
 	}
-	return api->is_moving(dev, is_moving);
+	return api->move_to(dev, micro_steps);
 }
 
 /**
  * @brief Run the stepper with a given step interval in a given direction
  *
- * @details The motor shall be set into motion and run continuously until
- * stalled or stopped using some other command, for instance, motor_enable(false). This
+ * @details The stepper shall be set into motion and run continuously until
+ * stalled or stopped using some other command, for instance, stepper_enable(false). This
  * function is non-blocking.
  *
- * @param dev pointer to the stepper motor controller instance
+ * @param dev pointer to the stepper driver instance
  * @param direction The direction to set
  *
  * @retval -ECANCELED If the stepper is disabled
@@ -450,29 +497,47 @@ static inline int z_impl_stepper_run(const struct device *dev,
 }
 
 /**
- * @brief Set the callback function to be called when a stepper event occurs
+ * @brief Stop the stepper
+ * @details Cancel all active movements, however keep the coils energized.
  *
- * @param dev pointer to the stepper motor controller instance
- * @param callback Callback function to be called when a stepper event occurs
- * passing NULL will disable the callback
- * @param user_data User data to be passed to the callback function
+ * @param dev pointer to the stepper driver instance
+ *
+ * @retval -EIO General input / output error
+ * @retval -ENOSYS If not implemented by device driver
+ * @retval 0 Success
+ */
+__syscall int stepper_stop(const struct device *dev);
+
+static inline int z_impl_stepper_stop(const struct device *dev)
+{
+	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
+
+	if (api->stop == NULL) {
+		return -ENOSYS;
+	}
+	return api->stop(dev);
+}
+
+/**
+ * @brief Check if the stepper is currently moving
  *
+ * @param dev pointer to the stepper driver instance
+ * @param is_moving Pointer to a boolean to store the moving status of the stepper
+ *
+ * @retval -EIO General input / output error
  * @retval -ENOSYS If not implemented by device driver
  * @retval 0 Success
  */
-__syscall int stepper_set_event_callback(const struct device *dev,
-					 stepper_event_callback_t callback, void *user_data);
+__syscall int stepper_is_moving(const struct device *dev, bool *is_moving);
 
-static inline int z_impl_stepper_set_event_callback(const struct device *dev,
-						    stepper_event_callback_t callback,
-						    void *user_data)
+static inline int z_impl_stepper_is_moving(const struct device *dev, bool *is_moving)
 {
 	const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
 
-	if (api->set_event_callback == NULL) {
+	if (api->is_moving == NULL) {
 		return -ENOSYS;
 	}
-	return api->set_event_callback(dev, callback, user_data);
+	return api->is_moving(dev, is_moving);
 }
 
 /**
diff --git a/include/zephyr/drivers/stepper/stepper_drv8424.h b/include/zephyr/drivers/stepper/stepper_drv8424.h
deleted file mode 100644
index 6f20774d8564d..0000000000000
--- a/include/zephyr/drivers/stepper/stepper_drv8424.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file drivers/stepper/stepper_drv8424.h
- *
- * @brief Public API for DRV8424 Stepper Controller Specific Functions
- *
- */
-
-/*
- * SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdint.h>
-#include <zephyr/drivers/stepper.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief After microstep setter fails, attempt to recover into previous state.
- *
- * @param dev Pointer to the stepper motor controller instance
- *
- * @retval 0 Success
- * @retval <0 Error code dependent on the gpio controller of the microstep pins
- */
-int drv8424_microstep_recovery(const struct device *dev);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/include/zephyr/drivers/stepper/stepper_drv84xx.h b/include/zephyr/drivers/stepper/stepper_drv84xx.h
new file mode 100644
index 0000000000000..6454fa5206908
--- /dev/null
+++ b/include/zephyr/drivers/stepper/stepper_drv84xx.h
@@ -0,0 +1,33 @@
+/**
+ * @file drivers/stepper/stepper_drv84xx.h
+ *
+ * @brief Public API for DRV84XX Stepper Controller Specific Functions
+ *
+ */
+
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Navimatix GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+#include <zephyr/drivers/stepper.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief After microstep setter fails, attempt to recover into previous state.
+ *
+ * @param dev Pointer to the stepper motor controller instance
+ *
+ * @retval 0 Success
+ * @retval <0 Error code dependent on the gpio controller of the microstep pins
+ */
+int drv84xx_microstep_recovery(const struct device *dev);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/zephyr/drivers/stepper/stepper_fake.h b/include/zephyr/drivers/stepper/stepper_fake.h
index 080698d6899fc..0dad709dc61ac 100644
--- a/include/zephyr/drivers/stepper/stepper_fake.h
+++ b/include/zephyr/drivers/stepper/stepper_fake.h
@@ -14,7 +14,9 @@
 extern "C" {
 #endif
 
-DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_enable, const struct device *, bool);
+DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_enable, const struct device *);
+
+DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_disable, const struct device *);
 
 DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_move_by, const struct device *, int32_t);
 
@@ -36,6 +38,8 @@ DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_is_moving, const struct device *, bool
 
 DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_run, const struct device *, enum stepper_direction);
 
+DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_stop, const struct device *);
+
 DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_set_event_callback, const struct device *,
 			stepper_event_callback_t, void *);
 
diff --git a/include/zephyr/drivers/video.h b/include/zephyr/drivers/video.h
index a7deb019e774d..f0632959e36e5 100644
--- a/include/zephyr/drivers/video.h
+++ b/include/zephyr/drivers/video.h
@@ -810,7 +810,7 @@ void video_closest_frmival(const struct device *dev, enum video_endpoint_id ep,
 
 /**
  * @defgroup video_pixel_formats Video pixel formats
- * The @c | characters separate the pixels, and spaces separate the bytes.
+ * The '|' characters separate the pixels or logical blocks, and spaces separate the bytes.
  * The uppercase letter represents the most significant bit.
  * The lowercase letters represent the rest of the bits.
  * @{
@@ -833,46 +833,235 @@ void video_closest_frmival(const struct device *dev, enum video_endpoint_id ep,
  */
 #define VIDEO_FOURCC_FROM_STR(str) VIDEO_FOURCC((str)[0], (str)[1], (str)[2], (str)[3])
 
+/**
+ * @brief Convert a four-character-code to a four-character-string
+ *
+ * Convert a four-character code as defined by @ref VIDEO_FOURCC into a string that can be used
+ * anywhere, such as in debug logs with the %s print formatter.
+ *
+ * @param fourcc The 32-bit four-character-code integer to be converted, in CPU-native endinaness.
+ * @return Four-character-string built out of it.
+ */
+#define VIDEO_FOURCC_TO_STR(fourcc)                                                                \
+	((char[]){                                                                                 \
+		(char)((fourcc) & 0xFF),                                                           \
+		(char)(((fourcc) >> 8) & 0xFF),                                                    \
+		(char)(((fourcc) >> 16) & 0xFF),                                                   \
+		(char)(((fourcc) >> 24) & 0xFF),                                                   \
+		'\0'                                                                               \
+	})
+
 /**
  * @name Bayer formats (R, G, B channels).
  *
  * The full color information is spread over multiple pixels.
  *
+ * When the format includes more than 8-bit per pixel, a strategy becomes needed to pack
+ * the bits over multiple bytes, as illustrated for each format.
+ *
+ * The number above the 'R', 'r', 'G', 'g', 'B', 'b' are hints about which pixel number the
+ * following bits belong to.
+ *
  * @{
  */
 
 /**
- * @verbatim
- * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ...
- * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | ...
- * @endverbatim
+ * @code{.unparsed}
+ *   0          1          2          3
+ * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ...
+ * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | ...
+ * @endcode
  */
 #define VIDEO_PIX_FMT_BGGR8 VIDEO_FOURCC('B', 'A', '8', '1')
 
 /**
- * @verbatim
- * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | ...
- * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ...
- * @endverbatim
+ * @code{.unparsed}
+ *   0          1          2          3
+ * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | ...
+ * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ...
+ * @endcode
  */
 #define VIDEO_PIX_FMT_GBRG8 VIDEO_FOURCC('G', 'B', 'R', 'G')
 
 /**
- * @verbatim
- * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | ...
- * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ...
- * @endverbatim
+ * @code{.unparsed}
+ *   0          1          2          3
+ * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | ...
+ * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ...
+ * @endcode
  */
 #define VIDEO_PIX_FMT_GRBG8 VIDEO_FOURCC('G', 'R', 'B', 'G')
 
 /**
- * @verbatim
- * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ...
- * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | ...
- * @endverbatim
+ * @code{.unparsed}
+ *   0          1          2          3
+ * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ...
+ * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | ...
+ * @endcode
  */
 #define VIDEO_PIX_FMT_RGGB8 VIDEO_FOURCC('R', 'G', 'G', 'B')
 
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          3 2 1 0
+ * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ggbbggbb | ...
+ * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | rrggrrgg | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SBGGR10P VIDEO_FOURCC('p', 'B', 'A', 'A')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          3 2 1 0
+ * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | bbggbbgg | ...
+ * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ggrrggrr | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SGBRG10P VIDEO_FOURCC('p', 'G', 'A', 'A')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          3 2 1 0
+ * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | rrggrrgg | ...
+ * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ggbbggbb | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SGRBG10P VIDEO_FOURCC('p', 'g', 'A', 'A')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          3 2 1 0
+ * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ggrrggrr | ...
+ * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | bbggbbgg | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SRGGB10P VIDEO_FOURCC('p', 'R', 'A', 'A')
+
+/**
+ * @code{.unparsed}
+ *   0          1          1   0      2          3          3   2
+ * | Bbbbbbbb | Gggggggg | ggggbbbb | Bbbbbbbb | Gggggggg | ggggbbbb | ...
+ * | Gggggggg | Rrrrrrrr | rrrrgggg | Gggggggg | Rrrrrrrr | rrrrgggg | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SBGGR12P VIDEO_FOURCC('p', 'B', 'C', 'C')
+
+/**
+ * @code{.unparsed}
+ *   0          1          1   0      2          3          3   2
+ * | Gggggggg | Bbbbbbbb | bbbbgggg | Gggggggg | Bbbbbbbb | bbbbgggg | ...
+ * | Rrrrrrrr | Gggggggg | ggggrrrr | Rrrrrrrr | Gggggggg | ggggrrrr | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SGBRG12P VIDEO_FOURCC('p', 'G', 'C', 'C')
+
+/**
+ * @code{.unparsed}
+ *   0          1          1   0      2          3          3   2
+ * | Gggggggg | Rrrrrrrr | rrrrgggg | Gggggggg | Rrrrrrrr | rrrrgggg | ...
+ * | Bbbbbbbb | Gggggggg | ggggbbbb | Bbbbbbbb | Gggggggg | ggggbbbb | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SGRBG12P VIDEO_FOURCC('p', 'g', 'C', 'C')
+
+/**
+ * @code{.unparsed}
+ *   0          1          1   0      2          3          3   2
+ * | Rrrrrrrr | Gggggggg | ggggrrrr | Rrrrrrrr | Gggggggg | ggggrrrr | ...
+ * | Gggggggg | Bbbbbbbb | bbbbgggg | Gggggggg | Bbbbbbbb | bbbbgggg | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SRGGB12P VIDEO_FOURCC('p', 'R', 'C', 'C')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          1 0      2   1    3     2
+ * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ggbbbbbb bbbbgggg ggggggbb | ...
+ * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | rrgggggg ggggrrrr rrrrrrgg | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SBGGR14P VIDEO_FOURCC('p', 'B', 'E', 'E')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          1 0      2   1    3     2
+ * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | bbgggggg ggggbbbb bbbbbbgg | ...
+ * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ggrrrrrr rrrrgggg ggggggrr | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SGBRG14P VIDEO_FOURCC('p', 'G', 'E', 'E')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          1 0      2   1    3     2
+ * | Gggggggg | Rrrrrrrr | Gggggggg | Rrrrrrrr | rrgggggg ggggrrrr rrrrrrgg | ...
+ * | Bbbbbbbb | Gggggggg | Bbbbbbbb | Gggggggg | ggbbbbbb bbbbgggg ggggggbb | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SGRBG14P VIDEO_FOURCC('p', 'g', 'E', 'E')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          1 0      2   1    3     2
+ * | Rrrrrrrr | Gggggggg | Rrrrrrrr | Gggggggg | ggrrrrrr rrrrgggg ggggggrr | ...
+ * | Gggggggg | Bbbbbbbb | Gggggggg | Bbbbbbbb | bbgggggg ggggbbbb bbbbbbgg | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_SRGGB14P VIDEO_FOURCC('p', 'R', 'E', 'E')
+
+/**
+ * @}
+ */
+
+/**
+ * @name Grayscale formats
+ * Luminance (Y) channel only, in various bit depth and packing.
+ *
+ * When the format includes more than 8-bit per pixel, a strategy becomes needed to pack
+ * the bits over multiple bytes, as illustrated for each format.
+ *
+ * The number above the 'Y', 'y' are hints about which pixel number the following bits belong to.
+ *
+ * @{
+ */
+
+/**
+ * Same as Y8 (8-bit luma-only) following the standard FOURCC naming,
+ * or L8 in some graphics libraries.
+ *
+ * @code{.unparsed}
+ *   0          1          2          3
+ * | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_GREY VIDEO_FOURCC('G', 'R', 'E', 'Y')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          3 2 1 0
+ * | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | yyyyyyyy | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_Y10P VIDEO_FOURCC('Y', '1', '0', 'P')
+
+/**
+ * @code{.unparsed}
+ *   0          1          1   0      2          3          3   2
+ * | Yyyyyyyy | Yyyyyyyy | yyyyyyyy | Yyyyyyyy | Yyyyyyyy | yyyyyyyy | ...
+ * | Yyyyyyyy | Yyyyyyyy | yyyyyyyy | Yyyyyyyy | Yyyyyyyy | yyyyyyyy | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_Y12P VIDEO_FOURCC('Y', '1', '2', 'P')
+
+/**
+ * @code{.unparsed}
+ *   0          1          2          3          1 0      2   1    3     2
+ * | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | yyyyyyyy yyyyyyyy yyyyyyyy | ...
+ * | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | Yyyyyyyy | yyyyyyyy yyyyyyyy yyyyyyyy | ...
+ * @endcode
+ */
+#define VIDEO_PIX_FMT_Y14P VIDEO_FOURCC('Y', '1', '4', 'P')
+
 /**
  * @}
  */
@@ -887,10 +1076,10 @@ void video_closest_frmival(const struct device *dev, enum video_endpoint_id ep,
  * 5 red bits [15:11], 6 green bits [10:5], 5 blue bits [4:0].
  * This 16-bit integer is then packed in big endian format over two bytes:
  *
- * @verbatim
+ * @code{.unparsed}
  *   15.....8 7......0
  * | RrrrrGgg gggBbbbb | ...
- * @endverbatim
+ * @endcode
  */
 #define VIDEO_PIX_FMT_RGB565X VIDEO_FOURCC('R', 'G', 'B', 'R')
 
@@ -898,19 +1087,19 @@ void video_closest_frmival(const struct device *dev, enum video_endpoint_id ep,
  * 5 red bits [15:11], 6 green bits [10:5], 5 blue bits [4:0].
  * This 16-bit integer is then packed in little endian format over two bytes:
  *
- * @verbatim
+ * @code{.unparsed}
  *   7......0 15.....8
  * | gggBbbbb RrrrrGgg | ...
- * @endverbatim
+ * @endcode
  */
 #define VIDEO_PIX_FMT_RGB565 VIDEO_FOURCC('R', 'G', 'B', 'P')
 
 /**
  * The first byte is empty (X) for each pixel.
  *
- * @verbatim
+ * @code{.unparsed}
  * | Xxxxxxxx Rrrrrrrr Gggggggg Bbbbbbbb | ...
- * @endverbatim
+ * @endcode
  */
 #define VIDEO_PIX_FMT_XRGB32 VIDEO_FOURCC('B', 'X', '2', '4')
 
@@ -928,18 +1117,18 @@ void video_closest_frmival(const struct device *dev, enum video_endpoint_id ep,
  * There is either a missing channel per pixel, U or V.
  * The value is to be averaged over 2 pixels to get the value of individual pixel.
  *
- * @verbatim
+ * @code{.unparsed}
  * | Yyyyyyyy Uuuuuuuu | Yyyyyyyy Vvvvvvvv | ...
- * @endverbatim
+ * @endcode
  */
 #define VIDEO_PIX_FMT_YUYV VIDEO_FOURCC('Y', 'U', 'Y', 'V')
 
 /**
  * The first byte is empty (X) for each pixel.
  *
- * @verbatim
+ * @code{.unparsed}
  * | Xxxxxxxx Yyyyyyyy Uuuuuuuu Vvvvvvvv | ...
- * @endverbatim
+ * @endcode
  */
 #define VIDEO_PIX_FMT_XYUV32 VIDEO_FOURCC('X', 'Y', 'U', 'V')
 
@@ -976,7 +1165,26 @@ static inline unsigned int video_bits_per_pixel(uint32_t pixfmt)
 	case VIDEO_PIX_FMT_GBRG8:
 	case VIDEO_PIX_FMT_GRBG8:
 	case VIDEO_PIX_FMT_RGGB8:
+	case VIDEO_PIX_FMT_GREY:
 		return 8;
+	case VIDEO_PIX_FMT_SBGGR10P:
+	case VIDEO_PIX_FMT_SGBRG10P:
+	case VIDEO_PIX_FMT_SGRBG10P:
+	case VIDEO_PIX_FMT_SRGGB10P:
+	case VIDEO_PIX_FMT_Y10P:
+		return 10;
+	case VIDEO_PIX_FMT_SBGGR12P:
+	case VIDEO_PIX_FMT_SGBRG12P:
+	case VIDEO_PIX_FMT_SGRBG12P:
+	case VIDEO_PIX_FMT_SRGGB12P:
+	case VIDEO_PIX_FMT_Y12P:
+		return 12;
+	case VIDEO_PIX_FMT_SBGGR14P:
+	case VIDEO_PIX_FMT_SGBRG14P:
+	case VIDEO_PIX_FMT_SGRBG14P:
+	case VIDEO_PIX_FMT_SRGGB14P:
+	case VIDEO_PIX_FMT_Y14P:
+		return 14;
 	case VIDEO_PIX_FMT_RGB565:
 	case VIDEO_PIX_FMT_YUYV:
 		return 16;
diff --git a/include/zephyr/dt-bindings/adc/ad4130-adc.h b/include/zephyr/dt-bindings/adc/ad4130-adc.h
new file mode 100644
index 0000000000000..6bc744dc65b74
--- /dev/null
+++ b/include/zephyr/dt-bindings/adc/ad4130-adc.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_AD4130_ADC_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_AD4130_ADC_H_
+
+#include <zephyr/dt-bindings/dt-util.h>
+
+#define AD4130_ADC_AIN0                  0
+#define AD4130_ADC_AIN1                  1
+#define AD4130_ADC_AIN2                  2
+#define AD4130_ADC_AIN3                  3
+#define AD4130_ADC_AIN4                  4
+#define AD4130_ADC_AIN5                  5
+#define AD4130_ADC_AIN6                  6
+#define AD4130_ADC_AIN7                  7
+#define AD4130_ADC_AIN8                  8
+#define AD4130_ADC_AIN9                  9
+#define AD4130_ADC_AIN10                 10
+#define AD4130_ADC_AIN11                 11
+#define AD4130_ADC_AIN12                 12
+#define AD4130_ADC_AIN13                 13
+#define AD4130_ADC_AIN14                 14
+#define AD4130_ADC_AIN15                 15
+#define AD4130_ADC_TEMP_SENSOR           16
+#define AD4130_ADC_AVSS                  17
+#define AD4130_ADC_INTERNAL_REF          18
+#define AD4130_ADC_DGND                  19
+#define AD4130_ADC_AVDD_AVSS_DIV6_PLUS   20
+#define AD4130_ADC_AVDD_AVSS_DIV6_MINUS  21
+#define AD4130_ADC_IOVDD_DGND_DIV6_PLUS  22
+#define AD4130_ADC_IOVDD_DGND_DIV6_MINUS 23
+#define AD4130_ADC_ALDO_AVSS_DIV6_PLUS   24
+#define AD4130_ADC_ALDO_AVSS_DIV6_MINUS  25
+#define AD4130_ADC_DLDO_DGND_DIV6_PLUS   26
+#define AD4130_ADC_DLDO_DGND_DIV6_MINUS  27
+#define AD4130_ADC_V_MV_P                28
+#define AD4130_ADC_V_MV_M                29
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_AD4130_ADC_H_ */
diff --git a/include/zephyr/dt-bindings/adc/nrf-saadc-haltium.h b/include/zephyr/dt-bindings/adc/nrf-saadc-haltium.h
new file mode 100644
index 0000000000000..e05522975224c
--- /dev/null
+++ b/include/zephyr/dt-bindings/adc/nrf-saadc-haltium.h
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_HALTIUM_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_HALTIUM_H_
+
+#include <zephyr/dt-bindings/adc/nrf-saadc.h>
+
+#define NRF_SAADC_AIN8 9
+#define NRF_SAADC_AIN9 10
+#define NRF_SAADC_AIN10 11
+#define NRF_SAADC_AIN11 12
+#define NRF_SAADC_AIN12 13
+#define NRF_SAADC_AIN13 14
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_ADC_NRF_SAADC_HALTIUM_H_ */
diff --git a/include/zephyr/dt-bindings/clock/ch32v20x_30x-clocks.h b/include/zephyr/dt-bindings/clock/ch32v20x_30x-clocks.h
new file mode 100644
index 0000000000000..e600f9c996686
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/ch32v20x_30x-clocks.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __CH32V20X_V30X_CLOCKS_H__
+#define __CH32V20X_V30X_CLOCKS_H__
+
+#define CH32V20X_V30X_AHB_PCENR_OFFSET  0
+#define CH32V20X_V30X_APB2_PCENR_OFFSET 1
+#define CH32V20X_V30X_APB1_PCENR_OFFSET 2
+
+#define CH32V20X_V30X_CLOCK_CONFIG(bus, bit) (((CH32V20X_V30X_##bus##_PCENR_OFFSET) << 5) | (bit))
+
+#define CH32V20X_V30X_CLOCK_DMA1     CH32V20X_V30X_CLOCK_CONFIG(AHB, 0)
+#define CH32V20X_V30X_CLOCK_DMA2     CH32V20X_V30X_CLOCK_CONFIG(AHB, 1)
+#define CH32V20X_V30X_CLOCK_SRAM     CH32V20X_V30X_CLOCK_CONFIG(AHB, 2)
+#define CH32V20X_V30X_CLOCK_FLITF    CH32V20X_V30X_CLOCK_CONFIG(AHB, 4)
+#define CH32V20X_V30X_CLOCK_CRC      CH32V20X_V30X_CLOCK_CONFIG(AHB, 6)
+#define CH32V20X_V30X_CLOCK_FSMC     CH32V20X_V30X_CLOCK_CONFIG(AHB, 8)
+#define CH32V20X_V30X_CLOCK_RNG      CH32V20X_V30X_CLOCK_CONFIG(AHB, 9)
+#define CH32V20X_V30X_CLOCK_SDIO     CH32V20X_V30X_CLOCK_CONFIG(AHB, 10)
+#define CH32V20X_V30X_CLOCK_USBHS    CH32V20X_V30X_CLOCK_CONFIG(AHB, 11)
+#define CH32V20X_V30X_CLOCK_OTG_FS   CH32V20X_V30X_CLOCK_CONFIG(AHB, 12)
+#define CH32V20X_V30X_CLOCK_DVP      CH32V20X_V30X_CLOCK_CONFIG(AHB, 13)
+#define CH32V20X_V30X_CLOCK_ETHMAC   CH32V20X_V30X_CLOCK_CONFIG(AHB, 14)
+#define CH32V20X_V30X_CLOCK_ETHMACTX CH32V20X_V30X_CLOCK_CONFIG(AHB, 15)
+#define CH32V20X_V30X_CLOCK_ETHMACRX CH32V20X_V30X_CLOCK_CONFIG(AHB, 16)
+#define CH32V20X_V30X_CLOCK_BLEC     CH32V20X_V30X_CLOCK_CONFIG(AHB, 16)
+#define CH32V20X_V30X_CLOCK_BLES     CH32V20X_V30X_CLOCK_CONFIG(AHB, 17)
+
+#define CH32V20X_V30X_CLOCK_AFIO   CH32V20X_V30X_CLOCK_CONFIG(APB2, 0)
+#define CH32V20X_V30X_CLOCK_IOPA   CH32V20X_V30X_CLOCK_CONFIG(APB2, 2)
+#define CH32V20X_V30X_CLOCK_IOPB   CH32V20X_V30X_CLOCK_CONFIG(APB2, 3)
+#define CH32V20X_V30X_CLOCK_IOPC   CH32V20X_V30X_CLOCK_CONFIG(APB2, 4)
+#define CH32V20X_V30X_CLOCK_IOPD   CH32V20X_V30X_CLOCK_CONFIG(APB2, 5)
+#define CH32V20X_V30X_CLOCK_IOPE   CH32V20X_V30X_CLOCK_CONFIG(APB2, 6)
+#define CH32V20X_V30X_CLOCK_ADC1   CH32V20X_V30X_CLOCK_CONFIG(APB2, 9)
+#define CH32V20X_V30X_CLOCK_ADC2   CH32V20X_V30X_CLOCK_CONFIG(APB2, 10)
+#define CH32V20X_V30X_CLOCK_TIM1   CH32V20X_V30X_CLOCK_CONFIG(APB2, 11)
+#define CH32V20X_V30X_CLOCK_SPI1   CH32V20X_V30X_CLOCK_CONFIG(APB2, 12)
+#define CH32V20X_V30X_CLOCK_TIM8   CH32V20X_V30X_CLOCK_CONFIG(APB2, 13)
+#define CH32V20X_V30X_CLOCK_USART1 CH32V20X_V30X_CLOCK_CONFIG(APB2, 14)
+#define CH32V20X_V30X_CLOCK_TIM9   CH32V20X_V30X_CLOCK_CONFIG(APB2, 19)
+#define CH32V20X_V30X_CLOCK_TIM10  CH32V20X_V30X_CLOCK_CONFIG(APB2, 20)
+
+#define CH32V20X_V30X_CLOCK_TIM2   CH32V20X_V30X_CLOCK_CONFIG(APB1, 0)
+#define CH32V20X_V30X_CLOCK_TIM3   CH32V20X_V30X_CLOCK_CONFIG(APB1, 1)
+#define CH32V20X_V30X_CLOCK_TIM4   CH32V20X_V30X_CLOCK_CONFIG(APB1, 2)
+#define CH32V20X_V30X_CLOCK_TIM5   CH32V20X_V30X_CLOCK_CONFIG(APB1, 3)
+#define CH32V20X_V30X_CLOCK_TIM6   CH32V20X_V30X_CLOCK_CONFIG(APB1, 4)
+#define CH32V20X_V30X_CLOCK_TIM7   CH32V20X_V30X_CLOCK_CONFIG(APB1, 5)
+#define CH32V20X_V30X_CLOCK_USART6 CH32V20X_V30X_CLOCK_CONFIG(APB1, 6)
+#define CH32V20X_V30X_CLOCK_USART7 CH32V20X_V30X_CLOCK_CONFIG(APB1, 7)
+#define CH32V20X_V30X_CLOCK_USART8 CH32V20X_V30X_CLOCK_CONFIG(APB1, 8)
+#define CH32V20X_V30X_CLOCK_WWDG   CH32V20X_V30X_CLOCK_CONFIG(APB1, 11)
+#define CH32V20X_V30X_CLOCK_SPI2   CH32V20X_V30X_CLOCK_CONFIG(APB1, 14)
+#define CH32V20X_V30X_CLOCK_SPI3   CH32V20X_V30X_CLOCK_CONFIG(APB1, 15)
+#define CH32V20X_V30X_CLOCK_USART2 CH32V20X_V30X_CLOCK_CONFIG(APB1, 17)
+#define CH32V20X_V30X_CLOCK_USART3 CH32V20X_V30X_CLOCK_CONFIG(APB1, 18)
+#define CH32V20X_V30X_CLOCK_USART4 CH32V20X_V30X_CLOCK_CONFIG(APB1, 19)
+#define CH32V20X_V30X_CLOCK_USART5 CH32V20X_V30X_CLOCK_CONFIG(APB1, 20)
+#define CH32V20X_V30X_CLOCK_I2C1   CH32V20X_V30X_CLOCK_CONFIG(APB1, 21)
+#define CH32V20X_V30X_CLOCK_I2C2   CH32V20X_V30X_CLOCK_CONFIG(APB1, 22)
+#define CH32V20X_V30X_CLOCK_USBD   CH32V20X_V30X_CLOCK_CONFIG(APB1, 23)
+#define CH32V20X_V30X_CLOCK_CAN1   CH32V20X_V30X_CLOCK_CONFIG(APB1, 25)
+#define CH32V20X_V30X_CLOCK_CAN2   CH32V20X_V30X_CLOCK_CONFIG(APB1, 26)
+#define CH32V20X_V30X_CLOCK_BKP    CH32V20X_V30X_CLOCK_CONFIG(APB1, 27)
+#define CH32V20X_V30X_CLOCK_PWR    CH32V20X_V30X_CLOCK_CONFIG(APB1, 28)
+#define CH32V20X_V30X_CLOCK_DAC    CH32V20X_V30X_CLOCK_CONFIG(APB1, 29)
+
+#endif
diff --git a/include/zephyr/dt-bindings/clock/esp32c6_clock.h b/include/zephyr/dt-bindings/clock/esp32c6_clock.h
index 9aa39b2c51edb..b3264125790c3 100644
--- a/include/zephyr/dt-bindings/clock/esp32c6_clock.h
+++ b/include/zephyr/dt-bindings/clock/esp32c6_clock.h
@@ -13,28 +13,28 @@
 #define ESP32_CLK_SRC_RC_FAST  2U
 
 /* Supported CPU frequencies */
-#define ESP32_CLK_CPU_PLL_80M     80000000
-#define ESP32_CLK_CPU_PLL_160M    160000000
+#define ESP32_CLK_CPU_PLL_80M      80000000
+#define ESP32_CLK_CPU_PLL_160M     160000000
 #define ESP32_CLK_CPU_RC_FAST_FREQ 17500000
 
 /* Supported XTAL Frequencies */
-#define ESP32_CLK_XTAL_32M             32000000
-#define ESP32_CLK_XTAL_40M             40000000
+#define ESP32_CLK_XTAL_32M 32000000
+#define ESP32_CLK_XTAL_40M 40000000
 
 /* Supported RTC fast clock sources */
 #define ESP32_RTC_FAST_CLK_SRC_RC_FAST 0
 #define ESP32_RTC_FAST_CLK_SRC_XTAL_D2 1
 
 /* Supported RTC slow clock frequencies */
-#define ESP32_RTC_SLOW_CLK_SRC_RC_SLOW      0
-#define ESP32_RTC_SLOW_CLK_SRC_XTAL32K      1
-#define ESP32_RTC_SLOW_CLK_SRC_RC32K        2
-#define ESP32_RTC_SLOW_CLK_32K_EXT_OSC      9
+#define ESP32_RTC_SLOW_CLK_SRC_RC_SLOW 0
+#define ESP32_RTC_SLOW_CLK_SRC_XTAL32K 1
+#define ESP32_RTC_SLOW_CLK_SRC_RC32K   2
+#define ESP32_RTC_SLOW_CLK_32K_EXT_OSC 9
 
 /* RTC slow clock frequencies */
-#define ESP32_RTC_SLOW_CLK_SRC_RC_SLOW_FREQ      136000
-#define ESP32_RTC_SLOW_CLK_SRC_XTAL32K_FREQ      32768
-#define ESP32_RTC_SLOW_CLK_SRC_RC32K_FREQ        32768
+#define ESP32_RTC_SLOW_CLK_SRC_RC_SLOW_FREQ 136000
+#define ESP32_RTC_SLOW_CLK_SRC_XTAL32K_FREQ 32768
+#define ESP32_RTC_SLOW_CLK_SRC_RC32K_FREQ   32768
 
 /* Modules IDs
  * These IDs are actually offsets in CLK and RST Control registers.
@@ -44,44 +44,49 @@
  * Basic Modules
  * Registers: DPORT_PERIP_CLK_EN_REG, DPORT_PERIP_RST_EN_REG
  */
-#define ESP32_LEDC_MODULE              0
-#define ESP32_UART0_MODULE             1
-#define ESP32_UART1_MODULE             2
-#define ESP32_USB_MODULE               3
-#define ESP32_I2C0_MODULE              4
-#define ESP32_I2S1_MODULE              5
-#define ESP32_TIMG0_MODULE             6
-#define ESP32_TIMG1_MODULE             7
-#define ESP32_UHCI0_MODULE             8
-#define ESP32_RMT_MODULE               9
-#define ESP32_PCNT_MODULE             10
-#define ESP32_SPI_MODULE              11
-#define ESP32_SPI2_MODULE             12
-#define ESP32_TWAI0_MODULE            13
-#define ESP32_TWAI1_MODULE            14
-#define ESP32_RNG_MODULE              15
-#define ESP32_RSA_MODULE              16
-#define ESP32_AES_MODULE              17
-#define ESP32_SHA_MODULE              18
-#define ESP32_ECC_MODULE              19
-#define ESP32_HMAC_MODULE             20
-#define ESP32_DS_MODULE               21
-#define ESP32_SDIO_SLAVE_MODULE       22
-#define ESP32_GDMA_MODULE             23
-#define ESP32_MCPWM0_MODULE           24
-#define ESP32_ETM_MODULE              25
-#define ESP32_PARLIO_MODULE           26
-#define ESP32_SYSTIMER_MODULE         27
-#define ESP32_SARADC_MODULE           28
-#define ESP32_TEMPSENSOR_MODULE       29
-#define ESP32_REGDMA_MODULE           30
-#define ESP32_LP_I2C0_MODULE          31
+#define ESP32_LEDC_MODULE                0
+#define ESP32_UART0_MODULE               1
+#define ESP32_UART1_MODULE               2
+#define ESP32_USB_MODULE                 3
+#define ESP32_I2C0_MODULE                4
+#define ESP32_I2S1_MODULE                5
+#define ESP32_TIMG0_MODULE               6
+#define ESP32_TIMG1_MODULE               7
+#define ESP32_UHCI0_MODULE               8
+#define ESP32_RMT_MODULE                 9
+#define ESP32_PCNT_MODULE                10
+#define ESP32_SPI_MODULE                 11
+#define ESP32_SPI2_MODULE                12
+#define ESP32_TWAI0_MODULE               13
+#define ESP32_TWAI1_MODULE               14
+#define ESP32_RNG_MODULE                 15
+#define ESP32_RSA_MODULE                 16
+#define ESP32_AES_MODULE                 17
+#define ESP32_SHA_MODULE                 18
+#define ESP32_ECC_MODULE                 19
+#define ESP32_HMAC_MODULE                20
+#define ESP32_DS_MODULE                  21
+#define ESP32_SDIO_SLAVE_MODULE          22
+#define ESP32_GDMA_MODULE                23
+#define ESP32_MCPWM0_MODULE              24
+#define ESP32_ETM_MODULE                 25
+#define ESP32_PARLIO_MODULE              26
+#define ESP32_SYSTIMER_MODULE            27
+#define ESP32_SARADC_MODULE              28
+#define ESP32_TEMPSENSOR_MODULE          29
+#define ESP32_ASSIST_DEBUG_MODULE        30
+/* LP peripherals */
+#define ESP32_LP_I2C0_MODULE             31
+#define ESP32_LP_UART0_MODULE            32
 /* Peripherals clock managed by the modem_clock driver must be listed last */
-#define ESP32_WIFI_MODULE             32
-#define ESP32_BT_MODULE               33
-#define ESP32_IEEE802154_MODULE       34
-#define ESP32_COEX_MODULE             35
-#define ESP32_PHY_MODULE              36
-#define ESP32_MODULE_MAX              37
+#define ESP32_WIFI_MODULE                33
+#define ESP32_BT_MODULE                  34
+#define ESP32_IEEE802154_MODULE          35
+#define ESP32_COEX_MODULE                36
+#define ESP32_PHY_MODULE                 37
+#define ESP32_ANA_I2C_MASTER_MODULE      38
+#define ESP32_MODEM_ETM_MODULE           39
+#define ESP32_MODEM_ADC_COMMON_FE_MODULE 40
+#define ESP32_MODULE_MAX                 41
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_ESP32C6_H_ */
diff --git a/include/zephyr/dt-bindings/clock/ite-it51xxx-clock.h b/include/zephyr/dt-bindings/clock/ite-it51xxx-clock.h
new file mode 100644
index 0000000000000..d2e2a7dd58da2
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/ite-it51xxx-clock.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_IT51XXX_CLOCK_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_IT51XXX_CLOCK_H_
+
+/* Clock control */
+#define IT51XXX_ECPM_CGCTRL2R_OFF 0x02
+#define IT51XXX_ECPM_CGCTRL3R_OFF 0x05
+#define IT51XXX_ECPM_CGCTRL4R_OFF 0x09
+
+/* Clock PLL frequency */
+#define PLL_18400_KHZ 0
+#define PLL_32300_KHZ 1
+#define PLL_64500_KHZ 2
+#define PLL_48000_KHZ 3
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_IT51XXX_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/nrfs-audiopll.h b/include/zephyr/dt-bindings/clock/nrfs-audiopll.h
new file mode 100644
index 0000000000000..b4c3975b5e155
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/nrfs-audiopll.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NRFS_AUDIOPLL_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NRFS_AUDIOPLL_H_
+
+#define NRFS_AUDIOPLL_FREQ_MIN        10666707
+#define NRFS_AUDIOPLL_FREQ_AUDIO_44K1 11289591
+#define NRFS_AUDIOPLL_FREQ_AUDIO_48K  12287963
+#define NRFS_AUDIOPLL_FREQ_MAX        13333292
+
+#endif /* #define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NRFS_AUDIOPLL_H_ */
diff --git a/include/zephyr/dt-bindings/clock/numaker_m55m1x_clock.h b/include/zephyr/dt-bindings/clock/numaker_m55m1x_clock.h
new file mode 100644
index 0000000000000..6cc231a7fe408
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/numaker_m55m1x_clock.h
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NUMAKER_M55M1X_CLOCK_H
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_NUMAKER_M55M1X_CLOCK_H
+
+#define NUMAKER_CLK_SCLKSEL_SCLKSEL_HIRC 0x00000000
+#define NUMAKER_CLK_SCLKSEL_SCLKSEL_MIRC 0x00000001
+#define NUMAKER_CLK_SCLKSEL_SCLKSEL_HIRC48M 0x00000002
+#define NUMAKER_CLK_SCLKSEL_SCLKSEL_HXT 0x00000003
+#define NUMAKER_CLK_SCLKSEL_SCLKSEL_APLL0 0x00000004
+#define NUMAKER_CLK_BPWMSEL_BPWM0SEL_PCLK0 0x00000000
+#define NUMAKER_CLK_BPWMSEL_BPWM0SEL_HCLK0 0x00000001
+#define NUMAKER_CLK_BPWMSEL_BPWM1SEL_PCLK2 0x00000000
+#define NUMAKER_CLK_BPWMSEL_BPWM1SEL_HCLK0 0x00000010
+#define NUMAKER_CLK_CANFDSEL_CANFD0SEL_HXT 0x00000000
+#define NUMAKER_CLK_CANFDSEL_CANFD0SEL_APLL0_DIV2 0x00000001
+#define NUMAKER_CLK_CANFDSEL_CANFD0SEL_HCLK0 0x00000002
+#define NUMAKER_CLK_CANFDSEL_CANFD0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_CANFDSEL_CANFD0SEL_HIRC48M_DIV4 0x00000004
+#define NUMAKER_CLK_CANFDSEL_CANFD1SEL_HXT 0x00000000
+#define NUMAKER_CLK_CANFDSEL_CANFD1SEL_APLL0_DIV2 0x00000010
+#define NUMAKER_CLK_CANFDSEL_CANFD1SEL_HCLK0 0x00000020
+#define NUMAKER_CLK_CANFDSEL_CANFD1SEL_HIRC 0x00000030
+#define NUMAKER_CLK_CANFDSEL_CANFD1SEL_HIRC48M_DIV4 0x00000040
+#define NUMAKER_CLK_CCAPSEL_CCAP0SEL_MIRC 0x00000000
+#define NUMAKER_CLK_CCAPSEL_CCAP0SEL_HCLK2 0x00000001
+#define NUMAKER_CLK_CCAPSEL_CCAP0SEL_HIRC 0x00000002
+#define NUMAKER_CLK_CCAPSEL_CCAP0SEL_APLL0_DIV2 0x00000003
+#define NUMAKER_CLK_CCAPSEL_CCAP0SEL_HXT 0x00000004
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_SYSCLK 0x00000000
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_ACLK 0x00000001
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_HCLK0 0x00000002
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_HCLK1 0x00000003
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_HCLK2 0x00000004
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_APLL0_DIV2 0x00000005
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_APLL1_DIV2 0x00000006
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_HIRC48M 0x00000007
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_HXT 0x00000008
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_HIRC 0x00000009
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_MIRC 0x0000000A
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_LXT 0x0000000B
+#define NUMAKER_CLK_CLKOSEL_CLKOSEL_LIRC 0x0000000C
+#define NUMAKER_CLK_DMICSEL_DMIC0SEL_HXT 0x00000000
+#define NUMAKER_CLK_DMICSEL_DMIC0SEL_APLL1_DIV2 0x00000001
+#define NUMAKER_CLK_DMICSEL_DMIC0SEL_MIRC 0x00000002
+#define NUMAKER_CLK_DMICSEL_DMIC0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_DMICSEL_DMIC0SEL_HIRC48M 0x00000004
+#define NUMAKER_CLK_DMICSEL_DMIC0SEL_PCLK4 0x00000005
+#define NUMAKER_CLK_DMICSEL_VAD0SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_DMICSEL_VAD0SEL_MIRC 0x00000010
+#define NUMAKER_CLK_DMICSEL_VAD0SEL_HIRC 0x00000020
+#define NUMAKER_CLK_EADCSEL_EADC0SEL_APLL1_DIV2 0x00000000
+#define NUMAKER_CLK_EADCSEL_EADC0SEL_APLL0_DIV2 0x00000001
+#define NUMAKER_CLK_EADCSEL_EADC0SEL_PCLK0 0x00000002
+#define NUMAKER_CLK_EPWMSEL_EPWM0SEL_PCLK0 0x00000000
+#define NUMAKER_CLK_EPWMSEL_EPWM0SEL_HCLK0 0x00000001
+#define NUMAKER_CLK_EPWMSEL_EPWM1SEL_PCLK2 0x00000000
+#define NUMAKER_CLK_EPWMSEL_EPWM1SEL_HCLK0 0x00000010
+#define NUMAKER_CLK_FMCSEL_FMC0SEL_HIRC 0x00000000
+#define NUMAKER_CLK_FMCSEL_FMC0SEL_HIRC48M_DIV4 0x00000001
+#define NUMAKER_CLK_I2SSEL_I2S0SEL_HXT 0x00000000
+#define NUMAKER_CLK_I2SSEL_I2S0SEL_APLL1_DIV2 0x00000001
+#define NUMAKER_CLK_I2SSEL_I2S0SEL_APLL0_DIV2 0x00000002
+#define NUMAKER_CLK_I2SSEL_I2S0SEL_PCLK1 0x00000003
+#define NUMAKER_CLK_I2SSEL_I2S0SEL_HIRC 0x00000004
+#define NUMAKER_CLK_I2SSEL_I2S0SEL_HIRC48M 0x00000005
+#define NUMAKER_CLK_I2SSEL_I2S1SEL_HXT 0x00000000
+#define NUMAKER_CLK_I2SSEL_I2S1SEL_APLL1_DIV2 0x00000010
+#define NUMAKER_CLK_I2SSEL_I2S1SEL_APLL0_DIV2 0x00000020
+#define NUMAKER_CLK_I2SSEL_I2S1SEL_PCLK3 0x00000030
+#define NUMAKER_CLK_I2SSEL_I2S1SEL_HIRC 0x00000040
+#define NUMAKER_CLK_I2SSEL_I2S1SEL_HIRC48M 0x00000050
+#define NUMAKER_CLK_I3CSEL_I3C0SEL_HCLK0 0x00000000
+#define NUMAKER_CLK_I3CSEL_I3C0SEL_APLL1 0x00000001
+#define NUMAKER_CLK_KPISEL_KPI0SEL_HIRC48M_DIV4 0x00000000
+#define NUMAKER_CLK_KPISEL_KPI0SEL_HIRC 0x00000001
+#define NUMAKER_CLK_KPISEL_KPI0SEL_LIRC 0x00000002
+#define NUMAKER_CLK_KPISEL_KPI0SEL_HXT 0x00000003
+#define NUMAKER_CLK_LPADCSEL_LPADC0SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_LPADCSEL_LPADC0SEL_LXT 0x00000001
+#define NUMAKER_CLK_LPADCSEL_LPADC0SEL_MIRC 0x00000002
+#define NUMAKER_CLK_LPADCSEL_LPADC0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_LPSPISEL_LPSPI0SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_LPSPISEL_LPSPI0SEL_MIRC 0x00000001
+#define NUMAKER_CLK_LPSPISEL_LPSPI0SEL_HIRC 0x00000002
+#define NUMAKER_CLK_LPTMRSEL_LPTMR0SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_LPTMRSEL_LPTMR0SEL_LXT 0x00000001
+#define NUMAKER_CLK_LPTMRSEL_LPTMR0SEL_LIRC 0x00000002
+#define NUMAKER_CLK_LPTMRSEL_LPTMR0SEL_MIRC 0x00000003
+#define NUMAKER_CLK_LPTMRSEL_LPTMR0SEL_HIRC 0x00000004
+#define NUMAKER_CLK_LPTMRSEL_LPTMR0SEL_EXT 0x00000005
+#define NUMAKER_CLK_LPTMRSEL_LPTMR1SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_LPTMRSEL_LPTMR1SEL_LXT 0x00000010
+#define NUMAKER_CLK_LPTMRSEL_LPTMR1SEL_LIRC 0x00000020
+#define NUMAKER_CLK_LPTMRSEL_LPTMR1SEL_MIRC 0x00000030
+#define NUMAKER_CLK_LPTMRSEL_LPTMR1SEL_HIRC 0x00000040
+#define NUMAKER_CLK_LPTMRSEL_LPTMR1SEL_EXT 0x00000050
+#define NUMAKER_CLK_LPUARTSEL_LPUART0SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_LPUARTSEL_LPUART0SEL_LXT 0x00000001
+#define NUMAKER_CLK_LPUARTSEL_LPUART0SEL_MIRC 0x00000002
+#define NUMAKER_CLK_LPUARTSEL_LPUART0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_PSIOSEL_PSIO0SEL_LXT 0x00000000
+#define NUMAKER_CLK_PSIOSEL_PSIO0SEL_HXT 0x00000001
+#define NUMAKER_CLK_PSIOSEL_PSIO0SEL_LIRC 0x00000002
+#define NUMAKER_CLK_PSIOSEL_PSIO0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_PSIOSEL_PSIO0SEL_HIRC48M_DIV4 0x00000004
+#define NUMAKER_CLK_PSIOSEL_PSIO0SEL_PCLK1 0x00000005
+#define NUMAKER_CLK_PSIOSEL_PSIO0SEL_APLL0_DIV2 0x00000006
+#define NUMAKER_CLK_QSPISEL_QSPI0SEL_HXT 0x00000000
+#define NUMAKER_CLK_QSPISEL_QSPI0SEL_APLL0_DIV2 0x00000001
+#define NUMAKER_CLK_QSPISEL_QSPI0SEL_PCLK0 0x00000002
+#define NUMAKER_CLK_QSPISEL_QSPI0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_QSPISEL_QSPI0SEL_HIRC48M_DIV4 0x00000004
+#define NUMAKER_CLK_QSPISEL_QSPI1SEL_HXT 0x00000000
+#define NUMAKER_CLK_QSPISEL_QSPI1SEL_APLL0_DIV2 0x00000010
+#define NUMAKER_CLK_QSPISEL_QSPI1SEL_PCLK2 0x00000020
+#define NUMAKER_CLK_QSPISEL_QSPI1SEL_HIRC 0x00000030
+#define NUMAKER_CLK_QSPISEL_QSPI1SEL_HIRC48M_DIV4 0x00000040
+#define NUMAKER_CLK_SCSEL_SC0SEL_HXT 0x00000000
+#define NUMAKER_CLK_SCSEL_SC0SEL_APLL0_DIV2 0x00000001
+#define NUMAKER_CLK_SCSEL_SC0SEL_PCLK1 0x00000002
+#define NUMAKER_CLK_SCSEL_SC0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_SCSEL_SC0SEL_HIRC48M_DIV4 0x00000004
+#define NUMAKER_CLK_SCSEL_SC1SEL_HXT 0x00000000
+#define NUMAKER_CLK_SCSEL_SC1SEL_APLL0_DIV2 0x00000010
+#define NUMAKER_CLK_SCSEL_SC1SEL_PCLK3 0x00000020
+#define NUMAKER_CLK_SCSEL_SC1SEL_HIRC 0x00000030
+#define NUMAKER_CLK_SCSEL_SC1SEL_HIRC48M_DIV4 0x00000040
+#define NUMAKER_CLK_SCSEL_SC2SEL_HXT 0x00000000
+#define NUMAKER_CLK_SCSEL_SC2SEL_APLL0_DIV2 0x00000100
+#define NUMAKER_CLK_SCSEL_SC2SEL_PCLK1 0x00000200
+#define NUMAKER_CLK_SCSEL_SC2SEL_HIRC 0x00000300
+#define NUMAKER_CLK_SCSEL_SC2SEL_HIRC48M_DIV4 0x00000400
+#define NUMAKER_CLK_SDHSEL_SDH0SEL_HXT 0x00000000
+#define NUMAKER_CLK_SDHSEL_SDH0SEL_APLL1_DIV2 0x00000001
+#define NUMAKER_CLK_SDHSEL_SDH0SEL_HCLK0 0x00000002
+#define NUMAKER_CLK_SDHSEL_SDH0SEL_HIRC 0x00000003
+#define NUMAKER_CLK_SDHSEL_SDH0SEL_HIRC48M_DIV4 0x00000004
+#define NUMAKER_CLK_SDHSEL_SDH1SEL_HXT 0x00000000
+#define NUMAKER_CLK_SDHSEL_SDH1SEL_APLL1_DIV2 0x00000010
+#define NUMAKER_CLK_SDHSEL_SDH1SEL_HCLK0 0x00000020
+#define NUMAKER_CLK_SDHSEL_SDH1SEL_HIRC 0x00000030
+#define NUMAKER_CLK_SDHSEL_SDH1SEL_HIRC48M_DIV4 0x00000040
+#define NUMAKER_CLK_SPISEL_SPI0SEL_HXT 0x00000000
+#define NUMAKER_CLK_SPISEL_SPI0SEL_APLL1_DIV2 0x00000001
+#define NUMAKER_CLK_SPISEL_SPI0SEL_APLL0_DIV2 0x00000002
+#define NUMAKER_CLK_SPISEL_SPI0SEL_PCLK0 0x00000003
+#define NUMAKER_CLK_SPISEL_SPI0SEL_HIRC 0x00000004
+#define NUMAKER_CLK_SPISEL_SPI0SEL_HIRC48M 0x00000005
+#define NUMAKER_CLK_SPISEL_SPI1SEL_HXT 0x00000000
+#define NUMAKER_CLK_SPISEL_SPI1SEL_APLL1_DIV2 0x00000010
+#define NUMAKER_CLK_SPISEL_SPI1SEL_APLL0_DIV2 0x00000020
+#define NUMAKER_CLK_SPISEL_SPI1SEL_PCLK2 0x00000030
+#define NUMAKER_CLK_SPISEL_SPI1SEL_HIRC 0x00000040
+#define NUMAKER_CLK_SPISEL_SPI1SEL_HIRC48M 0x00000050
+#define NUMAKER_CLK_SPISEL_SPI2SEL_HXT 0x00000000
+#define NUMAKER_CLK_SPISEL_SPI2SEL_APLL1_DIV2 0x00000100
+#define NUMAKER_CLK_SPISEL_SPI2SEL_APLL0_DIV2 0x00000200
+#define NUMAKER_CLK_SPISEL_SPI2SEL_PCLK0 0x00000300
+#define NUMAKER_CLK_SPISEL_SPI2SEL_HIRC 0x00000400
+#define NUMAKER_CLK_SPISEL_SPI2SEL_HIRC48M 0x00000500
+#define NUMAKER_CLK_SPISEL_SPI3SEL_HXT 0x00000000
+#define NUMAKER_CLK_SPISEL_SPI3SEL_APLL1_DIV2 0x00001000
+#define NUMAKER_CLK_SPISEL_SPI3SEL_APLL0_DIV2 0x00002000
+#define NUMAKER_CLK_SPISEL_SPI3SEL_PCLK2 0x00003000
+#define NUMAKER_CLK_SPISEL_SPI3SEL_HIRC 0x00004000
+#define NUMAKER_CLK_SPISEL_SPI3SEL_HIRC48M 0x00005000
+#define NUMAKER_CLK_STSEL_ST0SEL_HXT 0x00000000
+#define NUMAKER_CLK_STSEL_ST0SEL_HXT_DIV2 0x00000001
+#define NUMAKER_CLK_STSEL_ST0SEL_ACLK_DIV2 0x00000002
+#define NUMAKER_CLK_STSEL_ST0SEL_HIRC_DIV2 0x00000003
+#define NUMAKER_CLK_STSEL_ACLK 0x00000008
+#define NUMAKER_CLK_TMRSEL_TMR0SEL_HXT 0x00000000
+#define NUMAKER_CLK_TMRSEL_TMR0SEL_LXT 0x00000001
+#define NUMAKER_CLK_TMRSEL_TMR0SEL_PCLK1 0x00000002
+#define NUMAKER_CLK_TMRSEL_TMR0SEL_EXT 0x00000003
+#define NUMAKER_CLK_TMRSEL_TMR0SEL_LIRC 0x00000004
+#define NUMAKER_CLK_TMRSEL_TMR0SEL_HIRC 0x00000005
+#define NUMAKER_CLK_TMRSEL_TMR0SEL_HIRC48M_DIV4 0x00000006
+#define NUMAKER_CLK_TMRSEL_TMR1SEL_HXT 0x00000000
+#define NUMAKER_CLK_TMRSEL_TMR1SEL_LXT 0x00000010
+#define NUMAKER_CLK_TMRSEL_TMR1SEL_PCLK1 0x00000020
+#define NUMAKER_CLK_TMRSEL_TMR1SEL_EXT 0x00000030
+#define NUMAKER_CLK_TMRSEL_TMR1SEL_LIRC 0x00000040
+#define NUMAKER_CLK_TMRSEL_TMR1SEL_HIRC 0x00000050
+#define NUMAKER_CLK_TMRSEL_TMR1SEL_HIRC48M_DIV4 0x00000060
+#define NUMAKER_CLK_TMRSEL_TMR2SEL_HXT 0x00000000
+#define NUMAKER_CLK_TMRSEL_TMR2SEL_LXT 0x00000100
+#define NUMAKER_CLK_TMRSEL_TMR2SEL_PCLK3 0x00000200
+#define NUMAKER_CLK_TMRSEL_TMR2SEL_EXT 0x00000300
+#define NUMAKER_CLK_TMRSEL_TMR2SEL_LIRC 0x00000400
+#define NUMAKER_CLK_TMRSEL_TMR2SEL_HIRC 0x00000500
+#define NUMAKER_CLK_TMRSEL_TMR2SEL_HIRC48M_DIV4 0x00000600
+#define NUMAKER_CLK_TMRSEL_TMR3SEL_HXT 0x00000000
+#define NUMAKER_CLK_TMRSEL_TMR3SEL_LXT 0x00001000
+#define NUMAKER_CLK_TMRSEL_TMR3SEL_PCLK3 0x00002000
+#define NUMAKER_CLK_TMRSEL_TMR3SEL_EXT 0x00003000
+#define NUMAKER_CLK_TMRSEL_TMR3SEL_LIRC 0x00004000
+#define NUMAKER_CLK_TMRSEL_TMR3SEL_HIRC 0x00005000
+#define NUMAKER_CLK_TMRSEL_TMR3SEL_HIRC48M_DIV4 0x00006000
+#define NUMAKER_CLK_TTMRSEL_TTMR0SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_TTMRSEL_TTMR0SEL_LXT 0x00000001
+#define NUMAKER_CLK_TTMRSEL_TTMR0SEL_LIRC 0x00000002
+#define NUMAKER_CLK_TTMRSEL_TTMR0SEL_MIRC 0x00000003
+#define NUMAKER_CLK_TTMRSEL_TTMR0SEL_HIRC 0x00000004
+#define NUMAKER_CLK_TTMRSEL_TTMR1SEL_PCLK4 0x00000000
+#define NUMAKER_CLK_TTMRSEL_TTMR1SEL_LXT 0x00000010
+#define NUMAKER_CLK_TTMRSEL_TTMR1SEL_LIRC 0x00000020
+#define NUMAKER_CLK_TTMRSEL_TTMR1SEL_MIRC 0x00000030
+#define NUMAKER_CLK_TTMRSEL_TTMR1SEL_HIRC 0x00000040
+#define NUMAKER_CLK_UARTSEL0_UART0SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART0SEL_HIRC 0x00000001
+#define NUMAKER_CLK_UARTSEL0_UART0SEL_LXT 0x00000002
+#define NUMAKER_CLK_UARTSEL0_UART0SEL_APLL0_DIV2 0x00000003
+#define NUMAKER_CLK_UARTSEL0_UART0SEL_HIRC48M 0x00000004
+#define NUMAKER_CLK_UARTSEL0_UART1SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART1SEL_HIRC 0x00000010
+#define NUMAKER_CLK_UARTSEL0_UART1SEL_LXT 0x00000020
+#define NUMAKER_CLK_UARTSEL0_UART1SEL_APLL0_DIV2 0x00000030
+#define NUMAKER_CLK_UARTSEL0_UART1SEL_HIRC48M 0x00000040
+#define NUMAKER_CLK_UARTSEL0_UART2SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART2SEL_HIRC 0x00000100
+#define NUMAKER_CLK_UARTSEL0_UART2SEL_LXT 0x00000200
+#define NUMAKER_CLK_UARTSEL0_UART2SEL_APLL0_DIV2 0x00000300
+#define NUMAKER_CLK_UARTSEL0_UART2SEL_HIRC48M 0x00000400
+#define NUMAKER_CLK_UARTSEL0_UART3SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART3SEL_HIRC 0x00001000
+#define NUMAKER_CLK_UARTSEL0_UART3SEL_LXT 0x00002000
+#define NUMAKER_CLK_UARTSEL0_UART3SEL_APLL0_DIV2 0x00003000
+#define NUMAKER_CLK_UARTSEL0_UART3SEL_HIRC48M 0x00004000
+#define NUMAKER_CLK_UARTSEL0_UART4SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART4SEL_HIRC 0x00010000
+#define NUMAKER_CLK_UARTSEL0_UART4SEL_LXT 0x00020000
+#define NUMAKER_CLK_UARTSEL0_UART4SEL_APLL0_DIV2 0x00030000
+#define NUMAKER_CLK_UARTSEL0_UART4SEL_HIRC48M 0x00040000
+#define NUMAKER_CLK_UARTSEL0_UART5SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART5SEL_HIRC 0x00100000
+#define NUMAKER_CLK_UARTSEL0_UART5SEL_LXT 0x00200000
+#define NUMAKER_CLK_UARTSEL0_UART5SEL_APLL0_DIV2 0x00300000
+#define NUMAKER_CLK_UARTSEL0_UART5SEL_HIRC48M 0x00400000
+#define NUMAKER_CLK_UARTSEL0_UART6SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART6SEL_HIRC 0x01000000
+#define NUMAKER_CLK_UARTSEL0_UART6SEL_LXT 0x02000000
+#define NUMAKER_CLK_UARTSEL0_UART6SEL_APLL0_DIV2 0x03000000
+#define NUMAKER_CLK_UARTSEL0_UART6SEL_HIRC48M 0x04000000
+#define NUMAKER_CLK_UARTSEL0_UART7SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL0_UART7SEL_HIRC 0x10000000
+#define NUMAKER_CLK_UARTSEL0_UART7SEL_LXT 0x20000000
+#define NUMAKER_CLK_UARTSEL0_UART7SEL_APLL0_DIV2 0x30000000
+#define NUMAKER_CLK_UARTSEL0_UART7SEL_HIRC48M 0x40000000
+#define NUMAKER_CLK_UARTSEL1_UART8SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL1_UART8SEL_HIRC 0x00000001
+#define NUMAKER_CLK_UARTSEL1_UART8SEL_LXT 0x00000002
+#define NUMAKER_CLK_UARTSEL1_UART8SEL_APLL0_DIV2 0x00000003
+#define NUMAKER_CLK_UARTSEL1_UART8SEL_HIRC48M 0x00000004
+#define NUMAKER_CLK_UARTSEL1_UART9SEL_HXT 0x00000000
+#define NUMAKER_CLK_UARTSEL1_UART9SEL_HIRC 0x00000010
+#define NUMAKER_CLK_UARTSEL1_UART9SEL_LXT 0x00000020
+#define NUMAKER_CLK_UARTSEL1_UART9SEL_APLL0_DIV2 0x00000030
+#define NUMAKER_CLK_UARTSEL1_UART9SEL_HIRC48M 0x00000040
+#define NUMAKER_CLK_USBSEL_USBSEL_HIRC48M 0x00000000
+#define NUMAKER_CLK_USBSEL_USBSEL_APLL1_DIV2 0x00000001
+#define NUMAKER_CLK_WDTSEL_WDT0SEL_LXT 0x00000000
+#define NUMAKER_CLK_WDTSEL_WDT0SEL_LIRC 0x00000001
+#define NUMAKER_CLK_WDTSEL_WDT1SEL_LXT 0x00000000
+#define NUMAKER_CLK_WDTSEL_WDT1SEL_LIRC 0x00000010
+#define NUMAKER_CLK_WWDTSEL_WWDT0SEL_LIRC 0x00000000
+#define NUMAKER_CLK_WWDTSEL_WWDT0SEL_LXT 0x00000001
+#define NUMAKER_CLK_WWDTSEL_WWDT1SEL_LIRC 0x00000000
+#define NUMAKER_CLK_WWDTSEL_WWDT1SEL_LXT 0x00000010
+#define NUMAKER_CLK_SCLKDIV_SCLKDIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_HCLKDIV_HCLK2DIV(x) (((x) - 1UL) << (8))
+#define NUMAKER_CLK_PCLKDIV_PCLK0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_PCLKDIV_PCLK1DIV(x) (((x) - 1UL) << (4))
+#define NUMAKER_CLK_PCLKDIV_PCLK2DIV(x) (((x) - 1UL) << (8))
+#define NUMAKER_CLK_PCLKDIV_PCLK3DIV(x) (((x) - 1UL) << (12))
+#define NUMAKER_CLK_PCLKDIV_PCLK4DIV(x) (((x) - 1UL) << (16))
+#define NUMAKER_CLK_STDIV_ST0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_CANFDDIV_CANFD0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_CANFDDIV_CANFD1DIV(x) (((x) - 1UL) << (8))
+#define NUMAKER_CLK_DMICDIV_DMIC0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_EADCDIV_EADC0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_I2SDIV_I2S0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_I2SDIV_I2S1DIV(x) (((x) - 1UL) << (8))
+#define NUMAKER_CLK_KPIDIV_KPI0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_LPADCDIV_LPADC0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_LPUARTDIV_LPUART0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_PSIODIV_PSIO0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_SCDIV_SC0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_SCDIV_SC1DIV(x) (((x) - 1UL) << (8))
+#define NUMAKER_CLK_SCDIV_SC2DIV(x) (((x) - 1UL) << (16))
+#define NUMAKER_CLK_SDHDIV_SDH0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_SDHDIV_SDH1DIV(x) (((x) - 1UL) << (8))
+#define NUMAKER_CLK_UARTDIV0_UART0DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_UARTDIV0_UART1DIV(x) (((x) - 1UL) << (4))
+#define NUMAKER_CLK_UARTDIV0_UART2DIV(x) (((x) - 1UL) << (8))
+#define NUMAKER_CLK_UARTDIV0_UART3DIV(x) (((x) - 1UL) << (12))
+#define NUMAKER_CLK_UARTDIV0_UART4DIV(x) (((x) - 1UL) << (16))
+#define NUMAKER_CLK_UARTDIV0_UART5DIV(x) (((x) - 1UL) << (20))
+#define NUMAKER_CLK_UARTDIV0_UART6DIV(x) (((x) - 1UL) << (24))
+#define NUMAKER_CLK_UARTDIV0_UART7DIV(x) (((x) - 1UL) << (28))
+#define NUMAKER_CLK_UARTDIV1_UART8DIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_UARTDIV1_UART9DIV(x) (((x) - 1UL) << (4))
+#define NUMAKER_CLK_USBDIV_USBDIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_VSENSEDIV_VSENSEDIV(x) (((x) - 1UL) << (0))
+#define NUMAKER_CLK_APLL0_SELECT 0x00000000
+#define NUMAKER_CLK_APLL1_SELECT 0x00000001
+#define NUMAKER_CLK_APLLCTL_APLLSRC_HXT 0x00000000
+#define NUMAKER_CLK_APLLCTL_APLLSRC_HXT_DIV2 0x00000001
+#define NUMAKER_CLK_APLLCTL_APLLSRC_HIRC 0x00000002
+#define NUMAKER_CLK_APLLCTL_APLLSRC_HIRC48_DIV4 0x00000003
+#define NUMAKER_ACMP01_MODULE 0
+#define NUMAKER_ACMP23_MODULE 1
+#define NUMAKER_AWF0_MODULE 2
+#define NUMAKER_BPWM0_MODULE 3
+#define NUMAKER_BPWM1_MODULE 4
+#define NUMAKER_CANFD0_MODULE 5
+#define NUMAKER_CANFD1_MODULE 6
+#define NUMAKER_CCAP0_MODULE 7
+#define NUMAKER_CRC0_MODULE 8
+#define NUMAKER_CRYPTO0_MODULE 9
+#define NUMAKER_DAC01_MODULE 10
+#define NUMAKER_DMIC0_MODULE 11
+#define NUMAKER_VAD0SEL_MODULE 12
+#define NUMAKER_EADC0_MODULE 13
+#define NUMAKER_EBI0_MODULE 14
+#define NUMAKER_ECAP0_MODULE 15
+#define NUMAKER_ECAP1_MODULE 16
+#define NUMAKER_ECAP2_MODULE 17
+#define NUMAKER_ECAP3_MODULE 18
+#define NUMAKER_EMAC0_MODULE 19
+#define NUMAKER_EPWM0_MODULE 20
+#define NUMAKER_EPWM1_MODULE 21
+#define NUMAKER_EQEI0_MODULE 22
+#define NUMAKER_EQEI1_MODULE 23
+#define NUMAKER_EQEI2_MODULE 24
+#define NUMAKER_EQEI3_MODULE 25
+#define NUMAKER_FMC0_MODULE 26
+#define NUMAKER_ISP0_MODULE 27
+#define NUMAKER_GDMA0_MODULE 28
+#define NUMAKER_GPIOA_MODULE 29
+#define NUMAKER_GPIOB_MODULE 30
+#define NUMAKER_GPIOC_MODULE 31
+#define NUMAKER_GPIOD_MODULE 32
+#define NUMAKER_GPIOE_MODULE 33
+#define NUMAKER_GPIOF_MODULE 34
+#define NUMAKER_GPIOG_MODULE 35
+#define NUMAKER_GPIOH_MODULE 36
+#define NUMAKER_GPIOI_MODULE 37
+#define NUMAKER_GPIOJ_MODULE 38
+#define NUMAKER_HSOTG0_MODULE 39
+#define NUMAKER_HSUSBD0_MODULE 40
+#define NUMAKER_HSUSBH0_MODULE 41
+#define NUMAKER_I2C0_MODULE 42
+#define NUMAKER_I2C1_MODULE 43
+#define NUMAKER_I2C2_MODULE 44
+#define NUMAKER_I2C3_MODULE 45
+#define NUMAKER_I2S0_MODULE 46
+#define NUMAKER_I2S1_MODULE 47
+#define NUMAKER_I3C0_MODULE 48
+#define NUMAKER_KDF0_MODULE 49
+#define NUMAKER_KPI0_MODULE 50
+#define NUMAKER_KS0_MODULE 51
+#define NUMAKER_LPADC0_MODULE 52
+#define NUMAKER_LPPDMA0_MODULE 53
+#define NUMAKER_LPGPIO0_MODULE 54
+#define NUMAKER_LPI2C0_MODULE 55
+#define NUMAKER_LPSPI0_MODULE 56
+#define NUMAKER_LPSRAM0_MODULE 57
+#define NUMAKER_LPTMR0_MODULE 58
+#define NUMAKER_LPTMR1_MODULE 59
+#define NUMAKER_LPUART0_MODULE 60
+#define NUMAKER_NPU0_MODULE 61
+#define NUMAKER_OTFC0_MODULE 62
+#define NUMAKER_OTG0_MODULE 63
+#define NUMAKER_PDMA0_MODULE 64
+#define NUMAKER_PDMA1_MODULE 65
+#define NUMAKER_PSIO0_MODULE 66
+#define NUMAKER_QSPI0_MODULE 67
+#define NUMAKER_QSPI1_MODULE 68
+#define NUMAKER_RTC0_MODULE 69
+#define NUMAKER_SC0_MODULE 70
+#define NUMAKER_SC1_MODULE 71
+#define NUMAKER_SC2_MODULE 72
+#define NUMAKER_SCU0_MODULE 73
+#define NUMAKER_SDH0_MODULE 74
+#define NUMAKER_SDH1_MODULE 75
+#define NUMAKER_SPI0_MODULE 76
+#define NUMAKER_SPI1_MODULE 77
+#define NUMAKER_SPI2_MODULE 78
+#define NUMAKER_SPI3_MODULE 79
+#define NUMAKER_SPIM0_MODULE 80
+#define NUMAKER_SRAM0_MODULE 81
+#define NUMAKER_SRAM1_MODULE 82
+#define NUMAKER_SRAM2_MODULE 83
+#define NUMAKER_SRAM3_MODULE 84
+#define NUMAKER_ST0_MODULE 85
+#define NUMAKER_TMR0_MODULE 86
+#define NUMAKER_TMR1_MODULE 87
+#define NUMAKER_TMR2_MODULE 88
+#define NUMAKER_TMR3_MODULE 89
+#define NUMAKER_TRNG0_MODULE 90
+#define NUMAKER_TTMR0_MODULE 91
+#define NUMAKER_TTMR1_MODULE 92
+#define NUMAKER_UART0_MODULE 93
+#define NUMAKER_UART1_MODULE 94
+#define NUMAKER_UART2_MODULE 95
+#define NUMAKER_UART3_MODULE 96
+#define NUMAKER_UART4_MODULE 97
+#define NUMAKER_UART5_MODULE 98
+#define NUMAKER_UART6_MODULE 99
+#define NUMAKER_UART7_MODULE 100
+#define NUMAKER_UART8_MODULE 101
+#define NUMAKER_UART9_MODULE 102
+#define NUMAKER_USBD0_MODULE 103
+#define NUMAKER_USBH0_MODULE 104
+#define NUMAKER_USCI0_MODULE 105
+#define NUMAKER_UTCPD0_MODULE 106
+#define NUMAKER_WDT0_MODULE 107
+#define NUMAKER_WDT1_MODULE 108
+#define NUMAKER_WWDT0_MODULE 109
+#define NUMAKER_WWDT1_MODULE 110
+#define NUMAKER_PMC_NPD0 0x00000000
+#define NUMAKER_PMC_NPD1 0x00000001
+#define NUMAKER_PMC_NPD2 0x00000002
+#define NUMAKER_PMC_NPD3 0x00000003
+#define NUMAKER_PMC_NPD4 0x00000004
+#define NUMAKER_PMC_SPD0 0x00000005
+#define NUMAKER_PMC_SPD1 0x00000006
+#define NUMAKER_PMC_DPD 0x00000007
+
+#endif
diff --git a/include/zephyr/dt-bindings/clock/r7fa4m1xxxxxx-clock.h b/include/zephyr/dt-bindings/clock/r7fa4m1xxxxxx-clock.h
deleted file mode 100644
index 355c4982a3d3c..0000000000000
--- a/include/zephyr/dt-bindings/clock/r7fa4m1xxxxxx-clock.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_DT_BINDINGS_CLOCK_R7FA4M1XXXXXX_CLOCK_H_
-#define ZEPHYR_DT_BINDINGS_CLOCK_R7FA4M1XXXXXX_CLOCK_H_
-
-#include <zephyr/dt-bindings/clock/renesas-ra-cgc.h>
-
-#endif /* ZEPHYR_DT_BINDINGS_CLOCK_R7FA4M1XXXXXX_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/renesas_rzg_clock.h b/include/zephyr/dt-bindings/clock/renesas_rzg_clock.h
new file mode 100644
index 0000000000000..af94425e5334f
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/renesas_rzg_clock.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_RENESAS_RZG_CLOCK_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_RENESAS_RZG_CLOCK_H_
+
+/** RZ clock configuration values */
+#define RZ_IP_MASK         0xFF000000UL
+#define RZ_IP_SHIFT        24UL
+#define RZ_IP_CH_MASK      0xFF0000UL
+#define RZ_IP_CH_SHIFT     16UL
+#define RZ_CLOCK_MASK      0xFF00UL
+#define RZ_CLOCK_SHIFT     8UL
+#define RZ_CLOCK_DIV_MASK  0xFFUL
+#define RZ_CLOCK_DIV_SHIFT 0UL
+
+#define RZ_IP_GTM   0UL /* General Timer */
+#define RZ_IP_GPT   1UL /* General PWM Timer */
+#define RZ_IP_SCIF  2UL /* Serial Communications Interface with FIFO */
+#define RZ_IP_RIIC  3UL /* I2C Bus Interface */
+#define RZ_IP_RSPI  4UL /* Renesas Serial Peripheral Interface */
+#define RZ_IP_MHU   5UL /* Message Handling Unit */
+#define RZ_IP_DMAC  6UL /* Direct Memory Access Controller */
+#define RZ_IP_CANFD 7UL /* CANFD Interface (RS-CANFD) */
+#define RZ_IP_ADC   8UL /* A/D Converter */
+
+#define RZ_CLOCK_ICLK    0UL  /* Cortex-A55 Clock */
+#define RZ_CLOCK_I2CLK   1UL  /* Cortex-M33 Clock */
+#define RZ_CLOCK_I3CLK   2UL  /* Cortex-M33 FPU Clock */
+#define RZ_CLOCK_S0CLK   3UL  /* DDR-PHY Clock */
+#define RZ_CLOCK_OC0CLK  4UL  /* OCTA0 Clock */
+#define RZ_CLOCK_OC1CLK  5UL  /* OCTA1 Clock */
+#define RZ_CLOCK_SPI0CLK 6UL  /* SPI0 Clock */
+#define RZ_CLOCK_SPI1CLK 7UL  /* SPI1 Clock */
+#define RZ_CLOCK_SD0CLK  8UL  /* SDH0 Clock */
+#define RZ_CLOCK_SD1CLK  9UL  /* SDH1 Clock */
+#define RZ_CLOCK_SD2CLK  10UL /* SDH2 Clock */
+#define RZ_CLOCK_M0CLK   11UL /* VCP LCDC Clock */
+#define RZ_CLOCK_HPCLK   12UL /* Ethernet Clock */
+#define RZ_CLOCK_TSUCLK  13UL /* TSU Clock */
+#define RZ_CLOCK_ZTCLK   14UL /* JAUTH Clock */
+#define RZ_CLOCK_P0CLK   15UL /* APB-BUS Clock */
+#define RZ_CLOCK_P1CLK   16UL /* AXI-BUS Clock */
+#define RZ_CLOCK_P2CLK   17UL /* P2CLK */
+#define RZ_CLOCK_P3CLK   18UL /* P3CLK */
+#define RZ_CLOCK_P4CLK   19UL /* P4CLK */
+#define RZ_CLOCK_P5CLK   20UL /* P5CLK */
+#define RZ_CLOCK_ATCLK   21UL /* ATCLK */
+#define RZ_CLOCK_OSCCLK  22UL /* OSC Clock */
+#define RZ_CLOCK_OSCCLK2 23UL /* OSC2 Clock */
+
+#define RZ_CLOCK(IP, ch, clk, div)                                                                 \
+	((RZ_IP_##IP << RZ_IP_SHIFT) | ((ch) << RZ_IP_CH_SHIFT) | ((clk) << RZ_CLOCK_SHIFT) |      \
+	 ((div) << RZ_CLOCK_DIV_SHIFT))
+
+/**
+ * Pack clock configurations in a 32-bit value
+ * as expected for the Device Tree `clocks` property on Renesas RZ/G.
+ *
+ * @param ch Peripheral channel/unit
+ */
+
+/* SCIF */
+#define RZ_CLOCK_SCIF(ch) RZ_CLOCK(SCIF, ch, RZ_CLOCK_P0CLK, 1)
+
+/* GPT */
+#define RZ_CLOCK_GPT(ch) RZ_CLOCK(GPT, ch, RZ_CLOCK_P0CLK, 1)
+
+/* MHU */
+#define RZ_CLOCK_MHU(ch) RZ_CLOCK(MHU, ch, RZ_CLOCK_P1CLK, 2)
+
+/* ADC */
+#define RZ_CLOCK_ADC(ch) RZ_CLOCK(ADC, ch, RZ_CLOCK_TSUCLK, 1)
+
+/* RIIC */
+#define RZ_CLOCK_RIIC(ch) RZ_CLOCK(RIIC, ch, RZ_CLOCK_P0CLK, 1)
+
+/* GTM */
+#define RZ_CLOCK_GTM(ch) RZ_CLOCK(GTM, ch, RZ_CLOCK_P0CLK, 1)
+
+/* CAN */
+#define RZ_CLOCK_CANFD(ch) RZ_CLOCK(CANFD, ch, RZ_CLOCK_P4CLK, 2)
+
+/* RSPI */
+#define RZ_CLOCK_RSPI(ch) RZ_CLOCK(RSPI, ch, RZ_CLOCK_P0CLK, 1)
+
+/* DMAC */
+#define RZ_CLOCK_DMAC(ch) RZ_CLOCK(DMAC, ch, RZ_CLOCK_P3CLK, 1)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_RENESAS_RZG_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/silabs/siwx91x-clock.h b/include/zephyr/dt-bindings/clock/silabs/siwx91x-clock.h
index 06a007e82eb2d..b133d2775abf8 100644
--- a/include/zephyr/dt-bindings/clock/silabs/siwx91x-clock.h
+++ b/include/zephyr/dt-bindings/clock/silabs/siwx91x-clock.h
@@ -7,10 +7,12 @@
 #define SIWX91X_CLK_ULP_UART      0
 #define SIWX91X_CLK_ULP_I2C       1
 #define SIWX91X_CLK_ULP_DMA       2
-#define SIWX91X_CLK_UART1         3
-#define SIWX91X_CLK_UART2         4
+#define SIWX91X_CLK_UART0         3
+#define SIWX91X_CLK_UART1         4
 #define SIWX91X_CLK_I2C0          5
 #define SIWX91X_CLK_I2C1          6
 #define SIWX91X_CLK_DMA0          7
+#define SIWX91X_CLK_WATCHDOG      8
+#define SIWX91X_CLK_PWM           9
 
 #endif
diff --git a/include/zephyr/dt-bindings/clock/stm32_common_clocks.h b/include/zephyr/dt-bindings/clock/stm32_common_clocks.h
index 5c1015471dd1b..5992fee999b80 100644
--- a/include/zephyr/dt-bindings/clock/stm32_common_clocks.h
+++ b/include/zephyr/dt-bindings/clock/stm32_common_clocks.h
@@ -20,35 +20,34 @@
 /** Clock divider */
 #define STM32_CLOCK_DIV(div)	(((div) - 1) << STM32_CLOCK_DIV_SHIFT)
 
-/** STM32 MCO configuration values */
-#define STM32_MCO_CFGR_REG_MASK     0xFFFFU
-#define STM32_MCO_CFGR_REG_SHIFT    0U
-#define STM32_MCO_CFGR_SHIFT_MASK   0x3FU
-#define STM32_MCO_CFGR_SHIFT_SHIFT  16U
-#define STM32_MCO_CFGR_MASK_MASK    0x1FU
-#define STM32_MCO_CFGR_MASK_SHIFT   22U
-#define STM32_MCO_CFGR_VAL_MASK     0x1FU
-#define STM32_MCO_CFGR_VAL_SHIFT    27U
+/** Helper macros to pack RCC clock source selection register info in the DT */
+#define STM32_DT_CLKSEL_REG_MASK	0xFFFFU
+#define STM32_DT_CLKSEL_REG_SHIFT	0U
+#define STM32_DT_CLKSEL_SHIFT_MASK	0x3FU
+#define STM32_DT_CLKSEL_SHIFT_SHIFT	16U
+#define STM32_DT_CLKSEL_MASK_MASK	0x1FU
+#define STM32_DT_CLKSEL_MASK_SHIFT	22U
+#define STM32_DT_CLKSEL_VAL_MASK	0x1FU
+#define STM32_DT_CLKSEL_VAL_SHIFT	27U
 
 /**
- * @brief STM32 MCO configuration register bit field
+ * @brief Pack STM32 source clock selection RCC register bit fields for the DT
  *
- * @param reg    Offset to RCC register holding MCO configuration
- * @param shift    Position of field within RCC register (= field LSB's index)
- * @param mask    Mask of register field in RCC register
- * @param val    Clock configuration field value (0~0x1F)
+ * @param val    Clock configuration field value
+ * @param mask   Mask of register field in RCC register
+ * @param shift  Position of field within RCC register (= field LSB's index)
+ * @param reg    Offset to target clock configuration register in RCC
  *
- * @note 'reg' range:    0x0~0xFFFF    [ 00 : 15 ]
- * @note 'shift' range:    0~63        [ 16 : 21 ]
- * @note 'mask' range:    0x00~0x1F    [ 22 : 26 ]
+ * @note 'reg' range:    0x0~0xFFFF   [ 00 : 15 ]
+ * @note 'shift' range:  0~63         [ 16 : 21 ]
+ * @note 'mask' range:   0x00~0x1F    [ 22 : 26 ]
  * @note 'val' range:    0x00~0x1F    [ 27 : 31 ]
- *
  */
-#define STM32_MCO_CFGR(val, mask, shift, reg)                        \
-	((((reg) & STM32_MCO_CFGR_REG_MASK) << STM32_MCO_CFGR_REG_SHIFT) |        \
-	 (((shift) & STM32_MCO_CFGR_SHIFT_MASK) << STM32_MCO_CFGR_SHIFT_SHIFT) |    \
-	 (((mask) & STM32_MCO_CFGR_MASK_MASK) << STM32_MCO_CFGR_MASK_SHIFT) |        \
-	 (((val) & STM32_MCO_CFGR_VAL_MASK) << STM32_MCO_CFGR_VAL_SHIFT))
+#define STM32_DT_CLOCK_SELECT(val, mask, shift, reg)					\
+	((((reg) & STM32_DT_CLKSEL_REG_MASK) << STM32_DT_CLKSEL_REG_SHIFT) |		\
+	 (((shift) & STM32_DT_CLKSEL_SHIFT_MASK) << STM32_DT_CLKSEL_SHIFT_SHIFT) |	\
+	 (((mask) & STM32_DT_CLKSEL_MASK_MASK) << STM32_DT_CLKSEL_MASK_SHIFT) |		\
+	 (((val) & STM32_DT_CLKSEL_VAL_MASK) << STM32_DT_CLKSEL_VAL_SHIFT))
 
 /**
  * Pack RCC clock register offset and bit in two 32-bit values
diff --git a/include/zephyr/dt-bindings/clock/stm32c0_clock.h b/include/zephyr/dt-bindings/clock/stm32c0_clock.h
index 517e2cc9696b5..00b5078ac163d 100644
--- a/include/zephyr/dt-bindings/clock/stm32c0_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32c0_clock.h
@@ -29,34 +29,6 @@
 /** Peripheral bus clock */
 #define STM32_SRC_PCLK		(STM32_SRC_HSE + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x54
 
@@ -68,18 +40,18 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C2_I2S1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 14, CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C2_I2S1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 14, CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, CCIPR_REG)
 /** CSR1 devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, CSR1_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CSR1_REG)
 
 /** CFGR1 devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0x7, 24, CFGR1_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0x7, 28, CFGR1_REG)
-#define MCO2_SEL(val)           STM32_MCO_CFGR(val, 0x7, 16, CFGR1_REG)
-#define MCO2_PRE(val)           STM32_MCO_CFGR(val, 0x7, 20, CFGR1_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 24, CFGR1_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 28, CFGR1_REG)
+#define MCO2_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 16, CFGR1_REG)
+#define MCO2_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 20, CFGR1_REG)
 
 /* MCO prescaler : division factor */
 #define MCO_PRE_DIV_1   0
diff --git a/include/zephyr/dt-bindings/clock/stm32f0_clock.h b/include/zephyr/dt-bindings/clock/stm32f0_clock.h
index 7572c1c422f1c..56b87128e7128 100644
--- a/include/zephyr/dt-bindings/clock/stm32f0_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f0_clock.h
@@ -30,34 +30,6 @@
 /** PLL clock */
 #define STM32_SRC_PLLCLK	(STM32_SRC_PCLK + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CFGRx register offset
- * @param shift Position within RCC_CFGRx.
- * @param mask Mask for the RCC_CFGRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CFGRx register offset */
 #define CFGR1_REG               0x04
 #define CFGR3_REG		0x30
@@ -67,17 +39,17 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CFGR3 devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CFGR3_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 4, CFGR3_REG)
-#define CEC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 6, CFGR3_REG)
-#define USB_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 7, CFGR3_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CFGR3_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CFGR3_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CFGR3_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 4, CFGR3_REG)
+#define CEC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 6, CFGR3_REG)
+#define USB_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 7, CFGR3_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CFGR3_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CFGR3_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 /** CFGR1 devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0xF, 24, CFGR1_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0x7, 28, CFGR1_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 24, CFGR1_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 28, CFGR1_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F0_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32f10x_clock.h b/include/zephyr/dt-bindings/clock/stm32f10x_clock.h
index 05f2b598a0552..7fe9948521961 100644
--- a/include/zephyr/dt-bindings/clock/stm32f10x_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f10x_clock.h
@@ -19,7 +19,7 @@
 
 /** CFGR1 devices */
 #undef MCO1_SEL /* Need to redefine generic F1 MCO_SEL for connectivity line devices. */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0xF, 24, CFGR1_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 24, CFGR1_REG)
 /* No MCO prescaler support on STM32F1 series. */
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F10X_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32f1_clock.h b/include/zephyr/dt-bindings/clock/stm32f1_clock.h
index f6777932c77b1..83f1a0f748ed3 100644
--- a/include/zephyr/dt-bindings/clock/stm32f1_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f1_clock.h
@@ -28,34 +28,6 @@
 #define STM32_SRC_EXT_HSE       (STM32_SRC_HSE + 1)
 #define STM32_SRC_PLLCLK        (STM32_SRC_EXT_HSE + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CFGRx register offset
- * @param shift Position within RCC_CFGRx.
- * @param mask Mask for the RCC_CFGRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CFGRx register offset */
 #define CFGR1_REG               0x04
 #define CFGR2_REG		0x2C
@@ -65,13 +37,13 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CFGR2 devices */
-#define I2S2_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 17, CFGR2_REG)
-#define I2S3_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 18, CFGR2_REG)
+#define I2S2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 17, CFGR2_REG)
+#define I2S3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 18, CFGR2_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 /** CFGR1 devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0x7, 24, CFGR1_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 24, CFGR1_REG)
 /* No MCO prescaler support on STM32F1 series. */
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F1_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32f3_clock.h b/include/zephyr/dt-bindings/clock/stm32f3_clock.h
index c00d1dd59c38a..4617d6727c24f 100644
--- a/include/zephyr/dt-bindings/clock/stm32f3_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f3_clock.h
@@ -31,34 +31,6 @@
 /** PLL clock */
 #define STM32_SRC_PLLCLK	(STM32_SRC_PCLK + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CFGRx register offset
- * @param shift Position within RCC_CFGRx.
- * @param mask Mask for the RCC_CFGRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CFGRx register offset */
 #define CFGR_REG		0x04
 #define CFGR3_REG		0x30
@@ -68,27 +40,27 @@
 
 /** @brief Device domain clocks selection helpers) */
 /** CFGR devices */
-#define I2S_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 23, CFGR_REG)
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0x7, 24, CFGR_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0x7, 28, CFGR_REG)
+#define I2S_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 23, CFGR_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 24, CFGR_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 28, CFGR_REG)
 /** CFGR3 devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CFGR3_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 4, CFGR3_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 5, CFGR3_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 6, CFGR3_REG)
-#define TIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 8, CFGR3_REG)
-#define TIM8_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 9, CFGR3_REG)
-#define TIM15_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 10, CFGR3_REG)
-#define TIM16_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 11, CFGR3_REG)
-#define TIM17_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 13, CFGR3_REG)
-#define TIM20_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 15, CFGR3_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CFGR3_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CFGR3_REG)
-#define USART4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CFGR3_REG)
-#define USART5_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CFGR3_REG)
-#define TIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 24, CFGR3_REG)
-#define TIM3_4_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 25, CFGR3_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CFGR3_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 4, CFGR3_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 5, CFGR3_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 6, CFGR3_REG)
+#define TIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 8, CFGR3_REG)
+#define TIM8_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 9, CFGR3_REG)
+#define TIM15_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 10, CFGR3_REG)
+#define TIM16_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 11, CFGR3_REG)
+#define TIM17_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 13, CFGR3_REG)
+#define TIM20_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 15, CFGR3_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CFGR3_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CFGR3_REG)
+#define USART4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CFGR3_REG)
+#define USART5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CFGR3_REG)
+#define TIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 24, CFGR3_REG)
+#define TIM3_4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 25, CFGR3_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F3_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32f410_clock.h b/include/zephyr/dt-bindings/clock/stm32f410_clock.h
index fffd47321f6e8..eb7a39c3fb7c3 100644
--- a/include/zephyr/dt-bindings/clock/stm32f410_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f410_clock.h
@@ -6,25 +6,27 @@
 #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F410_CLOCK_H_
 #define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F410_CLOCK_H_
 
+#include "stm32f4_clock.h"
+
 /** @brief RCC_DCKCFGR register offset */
 #define DCKCFGR_REG		0x8C
 #define DCKCFGR2_REG		0x94
 
 /** @brief Device domain clocks selection helpers */
 /** DCKCFGR devices */
-#define CKDFSDM2A_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 14, DCKCFGR_REG)
-#define CKDFSDM1A_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 15, DCKCFGR_REG)
-#define SAI1A_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, DCKCFGR_REG)
-#define SAI1B_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, DCKCFGR_REG)
-#define I2S1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 25, DCKCFGR_REG)
-#define I2S2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 27, DCKCFGR_REG)
-#define CKDFSDM_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 31, DCKCFGR_REG)
+#define CKDFSDM2A_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 14, DCKCFGR_REG)
+#define CKDFSDM1A_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 15, DCKCFGR_REG)
+#define SAI1A_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, DCKCFGR_REG)
+#define SAI1B_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, DCKCFGR_REG)
+#define I2S1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 25, DCKCFGR_REG)
+#define I2S2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 27, DCKCFGR_REG)
+#define CKDFSDM_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 31, DCKCFGR_REG)
 
 /** DCKCFGR2 devices */
-#define I2CFMP1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 22, DCKCFGR2_REG)
-#define CK48M_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 27, DCKCFGR2_REG)
-#define SDIO_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 28, DCKCFGR2_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, DCKCFGR2_REG)
+#define I2CFMP1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 22, DCKCFGR2_REG)
+#define CK48M_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 27, DCKCFGR2_REG)
+#define SDIO_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 28, DCKCFGR2_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, DCKCFGR2_REG)
 
 /* F4 generic I2S_SEL is not compatible with F410 devices */
 #ifdef I2S_SEL
diff --git a/include/zephyr/dt-bindings/clock/stm32f427_clock.h b/include/zephyr/dt-bindings/clock/stm32f427_clock.h
index 97d22836be512..4fb2f72325f6f 100644
--- a/include/zephyr/dt-bindings/clock/stm32f427_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f427_clock.h
@@ -6,17 +6,19 @@
 #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F427_CLOCK_H_
 #define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F427_CLOCK_H_
 
+#include "stm32f4_clock.h"
+
 /** @brief RCC_DCKCFGR register offset */
 #define DCKCFGR_REG		0x8C
 
 /** @brief Device domain clocks selection helpers */
 /** DCKCFGR devices */
-#define CKDFSDM2A_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 14, DCKCFGR_REG)
-#define CKDFSDM1A_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 15, DCKCFGR_REG)
-#define SAI1A_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, DCKCFGR_REG)
-#define SAI1B_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, DCKCFGR_REG)
-#define CLK48M_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 27, DCKCFGR_REG)
-#define SDMMC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 28, DCKCFGR_REG)
-#define DSI_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 29, DCKCFGR_REG)
+#define CKDFSDM2A_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 14, DCKCFGR_REG)
+#define CKDFSDM1A_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 15, DCKCFGR_REG)
+#define SAI1A_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, DCKCFGR_REG)
+#define SAI1B_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, DCKCFGR_REG)
+#define CLK48M_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 27, DCKCFGR_REG)
+#define SDMMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 28, DCKCFGR_REG)
+#define DSI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 29, DCKCFGR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F427_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32f4_clock.h b/include/zephyr/dt-bindings/clock/stm32f4_clock.h
index 02290fc105104..98e635c4a2bc6 100644
--- a/include/zephyr/dt-bindings/clock/stm32f4_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f4_clock.h
@@ -43,34 +43,6 @@
 /* I2S_CKIN not supported yet */
 /* #define STM32_SRC_I2S_CKIN	TBD */
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CFGRx register offset
- * @param shift Position within RCC_CFGRx.
- * @param mask Mask for the RCC_CFGRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)                                                  \
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |                               \
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |                         \
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |                            \
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CFGRx register offset */
 #define CFGR_REG 0x08
 /** @brief RCC_BDCR register offset */
@@ -78,13 +50,13 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CFGR devices */
-#define I2S_SEL(val)  STM32_DOMAIN_CLOCK(val, 1, 23, CFGR_REG)
-#define MCO1_SEL(val) STM32_MCO_CFGR(val, 0x3, 21, CFGR_REG)
-#define MCO1_PRE(val) STM32_MCO_CFGR(val, 0x7, 24, CFGR_REG)
-#define MCO2_SEL(val) STM32_MCO_CFGR(val, 0x3, 30, CFGR_REG)
-#define MCO2_PRE(val) STM32_MCO_CFGR(val, 0x7, 27, CFGR_REG)
+#define I2S_SEL(val)  STM32_DT_CLOCK_SELECT((val), 1, 23, CFGR_REG)
+#define MCO1_SEL(val) STM32_DT_CLOCK_SELECT((val), 0x3, 21, CFGR_REG)
+#define MCO1_PRE(val) STM32_DT_CLOCK_SELECT((val), 0x7, 24, CFGR_REG)
+#define MCO2_SEL(val) STM32_DT_CLOCK_SELECT((val), 0x3, 30, CFGR_REG)
+#define MCO2_PRE(val) STM32_DT_CLOCK_SELECT((val), 0x7, 27, CFGR_REG)
 /** BDCR devices */
-#define RTC_SEL(val)  STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)  STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 /* MCO prescaler : division factor */
 #define MCO_PRE_DIV_1 0
diff --git a/include/zephyr/dt-bindings/clock/stm32f7_clock.h b/include/zephyr/dt-bindings/clock/stm32f7_clock.h
index a729aea88f11a..4bfcfdf738647 100644
--- a/include/zephyr/dt-bindings/clock/stm32f7_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32f7_clock.h
@@ -40,35 +40,6 @@
 
 #define STM32_SRC_PLLI2S_R      (STM32_SRC_PCLK + 1)
 
-
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CFGRx register offset
- * @param shift Position within RCC_CFGRx.
- * @param mask Mask for the RCC_CFGRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CFGRx register offset */
 #define CFGR_REG		0x08
 
@@ -77,11 +48,11 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CFGR devices */
-#define I2S_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 23, CFGR_REG)
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0x3, 21, CFGR_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0x7, 24, CFGR_REG)
-#define MCO2_SEL(val)           STM32_MCO_CFGR(val, 0x3, 30, CFGR_REG)
-#define MCO2_PRE(val)           STM32_MCO_CFGR(val, 0x7, 27, CFGR_REG)
+#define I2S_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 23, CFGR_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x3, 21, CFGR_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 24, CFGR_REG)
+#define MCO2_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x3, 30, CFGR_REG)
+#define MCO2_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 27, CFGR_REG)
 
 /* MCO prescaler : division factor */
 #define MCO_PRE_DIV_1 0
@@ -91,7 +62,7 @@
 #define MCO_PRE_DIV_5 7
 
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 /** @brief RCC_DKCFGR register offset */
 #define DCKCFGR1_REG		0x8C
@@ -99,23 +70,23 @@
 
 /** @brief Dedicated clocks configuration register selection helpers */
 /** DKCFGR2 devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, DCKCFGR2_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, DCKCFGR2_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, DCKCFGR2_REG)
-#define USART4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, DCKCFGR2_REG)
-#define USART5_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, DCKCFGR2_REG)
-#define USART6_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 10, DCKCFGR2_REG)
-#define USART7_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, DCKCFGR2_REG)
-#define USART8_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 14, DCKCFGR2_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, DCKCFGR2_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, DCKCFGR2_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, DCKCFGR2_REG)
-#define I2C4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, DCKCFGR2_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 24, DCKCFGR2_REG)
-#define CEC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 26, DCKCFGR2_REG)
-#define CK48M_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 27, DCKCFGR2_REG)
-#define SDMMC1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 28, DCKCFGR2_REG)
-#define SDMMC2_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 29, DCKCFGR2_REG)
-#define DSI_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 30, DCKCFGR2_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, DCKCFGR2_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, DCKCFGR2_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, DCKCFGR2_REG)
+#define USART4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, DCKCFGR2_REG)
+#define USART5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, DCKCFGR2_REG)
+#define USART6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 10, DCKCFGR2_REG)
+#define USART7_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, DCKCFGR2_REG)
+#define USART8_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, DCKCFGR2_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, DCKCFGR2_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, DCKCFGR2_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, DCKCFGR2_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, DCKCFGR2_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, DCKCFGR2_REG)
+#define CEC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 26, DCKCFGR2_REG)
+#define CK48M_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 27, DCKCFGR2_REG)
+#define SDMMC1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 28, DCKCFGR2_REG)
+#define SDMMC2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 29, DCKCFGR2_REG)
+#define DSI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 30, DCKCFGR2_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32F7_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32g0_clock.h b/include/zephyr/dt-bindings/clock/stm32g0_clock.h
index b7d7714b1b15b..944f3c022efb1 100644
--- a/include/zephyr/dt-bindings/clock/stm32g0_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32g0_clock.h
@@ -35,34 +35,6 @@
 #define STM32_SRC_PLL_Q		(STM32_SRC_PLL_P + 1)
 #define STM32_SRC_PLL_R		(STM32_SRC_PLL_Q + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x54
 #define CCIPR2_REG		0x58
@@ -72,26 +44,26 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, CCIPR_REG)
-#define CEC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 6, CCIPR_REG)
-#define LPUART2_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C2_I2S1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 14, CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR_REG)
-#define TIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 22, CCIPR_REG)
-#define TIM15_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 24, CCIPR_REG)
-#define RNG_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 26, CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR_REG)
+#define CEC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 6, CCIPR_REG)
+#define LPUART2_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C2_I2S1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 14, CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR_REG)
+#define TIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 22, CCIPR_REG)
+#define TIM15_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 24, CCIPR_REG)
+#define RNG_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 26, CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, CCIPR_REG)
 /** CCIPR2 devices */
-#define I2S1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR2_REG)
-#define I2S2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR2_REG)
-#define FDCAN_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR2_REG)
-#define USB_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR2_REG)
+#define I2S1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR2_REG)
+#define I2S2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR2_REG)
+#define FDCAN_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR2_REG)
+#define USB_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR2_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32G0_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32g4_clock.h b/include/zephyr/dt-bindings/clock/stm32g4_clock.h
index a7d928c801f49..f66d0313a33ca 100644
--- a/include/zephyr/dt-bindings/clock/stm32g4_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32g4_clock.h
@@ -39,34 +39,6 @@
 #define STM32_SRC_PLL_R		(STM32_SRC_PLL_Q + 1)
 /* TODO: PLLSAI clocks */
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x88
 #define CCIPR2_REG		0x9C
@@ -76,26 +48,26 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, CCIPR_REG)
-#define USART4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, CCIPR_REG)
-#define USART5_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 14, CCIPR_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR_REG)
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR_REG)
-#define I2S23_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR_REG)
-#define FDCAN_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 24, CCIPR_REG)
-#define CLK48_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 26, CCIPR_REG)
-#define ADC12_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, CCIPR_REG)
-#define ADC34_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR_REG)
+#define USART4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, CCIPR_REG)
+#define USART5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, CCIPR_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR_REG)
+#define I2S23_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR_REG)
+#define FDCAN_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, CCIPR_REG)
+#define CLK48_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 26, CCIPR_REG)
+#define ADC12_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, CCIPR_REG)
+#define ADC34_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, CCIPR_REG)
 /** CCIPR2 devices */
-#define I2C4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR2_REG)
-#define QSPI_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR2_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR2_REG)
+#define QSPI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR2_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32G4_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32h5_clock.h b/include/zephyr/dt-bindings/clock/stm32h5_clock.h
index cbac2d667436a..f3ed8289ea73c 100644
--- a/include/zephyr/dt-bindings/clock/stm32h5_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32h5_clock.h
@@ -51,34 +51,6 @@
 #define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_AHB1
 #define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_APB3
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32H5 clock configuration bit field.
- *
- * - reg   (1/2/3/4/5)     [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |	\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |	\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPRx register offset (RM0456.pdf) */
 #define CCIPR1_REG		0xD8
 #define CCIPR2_REG		0xDC
@@ -94,67 +66,67 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR1 devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 0, CCIPR1_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 3, CCIPR1_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 6, CCIPR1_REG)
-#define USART4_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 9, CCIPR1_REG)
-#define USART5_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 12, CCIPR1_REG)
-#define USART6_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 15, CCIPR1_REG)
-#define USART7_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 18, CCIPR1_REG)
-#define USART8_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 21, CCIPR1_REG)
-#define USART9_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 24, CCIPR1_REG)
-#define USART10_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 27, CCIPR1_REG)
-#define TIMIC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 31, CCIPR1_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR1_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 3, CCIPR1_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 6, CCIPR1_REG)
+#define USART4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 9, CCIPR1_REG)
+#define USART5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR1_REG)
+#define USART6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 15, CCIPR1_REG)
+#define USART7_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 18, CCIPR1_REG)
+#define USART8_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 21, CCIPR1_REG)
+#define USART9_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 24, CCIPR1_REG)
+#define USART10_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 27, CCIPR1_REG)
+#define TIMIC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 31, CCIPR1_REG)
 
 /** CCIPR2 devices */
-#define USART11_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 0, CCIPR2_REG)
-#define USART12_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 4, CCIPR2_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 8, CCIPR2_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 12, CCIPR2_REG)
-#define LPTIM3_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 16, CCIPR2_REG)
-#define LPTIM4_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 20, CCIPR2_REG)
-#define LPTIM5_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 24, CCIPR2_REG)
-#define LPTIM6_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 28, CCIPR2_REG)
+#define USART11_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR2_REG)
+#define USART12_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 4, CCIPR2_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR2_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR2_REG)
+#define LPTIM3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR2_REG)
+#define LPTIM4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 20, CCIPR2_REG)
+#define LPTIM5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 24, CCIPR2_REG)
+#define LPTIM6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 28, CCIPR2_REG)
 
 /** CCIPR3 devices */
-#define SPI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 0, CCIPR3_REG)
-#define SPI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 3, CCIPR3_REG)
-#define SPI3_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 6, CCIPR3_REG)
-#define SPI4_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 9, CCIPR3_REG)
-#define SPI5_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 12, CCIPR3_REG)
-#define SPI6_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 15, CCIPR2_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 24, CCIPR3_REG)
+#define SPI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR3_REG)
+#define SPI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 3, CCIPR3_REG)
+#define SPI3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 6, CCIPR3_REG)
+#define SPI4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 9, CCIPR3_REG)
+#define SPI5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR3_REG)
+#define SPI6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 15, CCIPR2_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 24, CCIPR3_REG)
 
 /** CCIPR4 devices */
-#define OCTOSPI1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR4_REG)
-#define SYSTICK_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR4_REG)
-#define USB_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, CCIPR4_REG)
-#define SDMMC1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 6, CCIPR4_REG)
-#define SDMMC2_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 7, CCIPR4_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR4_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR4_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR4_REG)
-#define I2C4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR4_REG)
-#define I3C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 24, CCIPR4_REG)
+#define OCTOSPI1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR4_REG)
+#define SYSTICK_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR4_REG)
+#define USB_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR4_REG)
+#define SDMMC1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 6, CCIPR4_REG)
+#define SDMMC2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 7, CCIPR4_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR4_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR4_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR4_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR4_REG)
+#define I3C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, CCIPR4_REG)
 
 /** CCIPR5 devices */
-#define ADCDAC_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 0, CCIPR5_REG)
-#define DAC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 3, CCIPR5_REG)
-#define RNG_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, CCIPR5_REG)
-#define CEC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, CCIPR5_REG)
-#define FDCAN_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR5_REG)
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 16, CCIPR5_REG)
-#define SAI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 19, CCIPR5_REG)
-#define CKPER_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, CCIPR5_REG)
+#define ADCDAC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR5_REG)
+#define DAC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 3, CCIPR5_REG)
+#define RNG_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR5_REG)
+#define CEC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, CCIPR5_REG)
+#define FDCAN_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR5_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR5_REG)
+#define SAI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 19, CCIPR5_REG)
+#define CKPER_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, CCIPR5_REG)
 
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 /** CFGR1 devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0x7, 22, CFGR1_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0xF, 18, CFGR1_REG)
-#define MCO2_SEL(val)           STM32_MCO_CFGR(val, 0x7, 25, CFGR1_REG)
-#define MCO2_PRE(val)           STM32_MCO_CFGR(val, 0xF, 29, CFGR1_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 22, CFGR1_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 18, CFGR1_REG)
+#define MCO2_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 25, CFGR1_REG)
+#define MCO2_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 29, CFGR1_REG)
 
 /* MCO prescaler : division factor */
 #define MCO_PRE_DIV_1 1
diff --git a/include/zephyr/dt-bindings/clock/stm32h7_clock.h b/include/zephyr/dt-bindings/clock/stm32h7_clock.h
index 92c954cdc86b6..aec5ffc33b91e 100644
--- a/include/zephyr/dt-bindings/clock/stm32h7_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32h7_clock.h
@@ -58,34 +58,6 @@
 #define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_AHB3
 #define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_APB4
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32H7 clock configuration bit field.
- *
- * - reg   (0/1)           [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..3)          [ 16 : 18 ]
- *
- * @param reg RCC_DxCCIP register offset
- * @param shift Position within RCC_DxCCIP.
- * @param mask Mask for the RCC_DxCCIP field.
- * @param val Clock value (0, 1, 2 or 3).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |	\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |	\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_DxCCIP register offset (RM0399.pdf) */
 #define D1CCIPR_REG		0x4C
 #define D2CCIP1R_REG		0x50
@@ -100,46 +72,46 @@
 
 /** @brief Device domain clocks selection helpers (RM0399.pdf) */
 /** D1CCIPR devices */
-#define FMC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, D1CCIPR_REG)
-#define QSPI_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, D1CCIPR_REG)
-#define DSI_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 8, D1CCIPR_REG)
-#define SDMMC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 16, D1CCIPR_REG)
-#define CKPER_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, D1CCIPR_REG)
+#define FMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, D1CCIPR_REG)
+#define QSPI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, D1CCIPR_REG)
+#define DSI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 8, D1CCIPR_REG)
+#define SDMMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 16, D1CCIPR_REG)
+#define CKPER_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, D1CCIPR_REG)
 /* Device domain clocks selection helpers (RM0468.pdf) */
-#define OSPI_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, D1CCIPR_REG)
+#define OSPI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, D1CCIPR_REG)
 /** D2CCIP1R devices */
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 0, D2CCIP1R_REG)
-#define SAI23_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 6, D2CCIP1R_REG)
-#define SPI123_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 12, D2CCIP1R_REG)
-#define SPI45_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 16, D2CCIP1R_REG)
-#define SPDIF_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, D2CCIP1R_REG)
-#define DFSDM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 24, D2CCIP1R_REG)
-#define FDCAN_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, D2CCIP1R_REG)
-#define SWP_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 31, D2CCIP1R_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, D2CCIP1R_REG)
+#define SAI23_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 6, D2CCIP1R_REG)
+#define SPI123_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, D2CCIP1R_REG)
+#define SPI45_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, D2CCIP1R_REG)
+#define SPDIF_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, D2CCIP1R_REG)
+#define DFSDM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 24, D2CCIP1R_REG)
+#define FDCAN_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, D2CCIP1R_REG)
+#define SWP_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 31, D2CCIP1R_REG)
 /** D2CCIP2R devices */
-#define USART2345678_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 0, D2CCIP2R_REG)
-#define USART16_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 3, D2CCIP2R_REG)
-#define RNG_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, D2CCIP2R_REG)
-#define I2C123_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, D2CCIP2R_REG)
-#define USB_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, D2CCIP2R_REG)
-#define CEC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, D2CCIP2R_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 28, D2CCIP2R_REG)
+#define USART2345678_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 0, D2CCIP2R_REG)
+#define USART16_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 3, D2CCIP2R_REG)
+#define RNG_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, D2CCIP2R_REG)
+#define I2C123_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, D2CCIP2R_REG)
+#define USB_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, D2CCIP2R_REG)
+#define CEC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, D2CCIP2R_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 28, D2CCIP2R_REG)
 /** D3CCIPR devices */
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 0, D3CCIPR_REG)
-#define I2C4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, D3CCIPR_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 10, D3CCIPR_REG)
-#define LPTIM345_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 13, D3CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, D3CCIPR_REG)
-#define SAI4A_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 21, D3CCIPR_REG)
-#define SAI4B_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 24, D3CCIPR_REG)
-#define SPI6_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 28, D3CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 0, D3CCIPR_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, D3CCIPR_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 10, D3CCIPR_REG)
+#define LPTIM345_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 13, D3CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, D3CCIPR_REG)
+#define SAI4A_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 21, D3CCIPR_REG)
+#define SAI4B_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 24, D3CCIPR_REG)
+#define SPI6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 28, D3CCIPR_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 /** CFGR devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0xF, 22, CFGR_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0x7, 18, CFGR_REG)
-#define MCO2_SEL(val)           STM32_MCO_CFGR(val, 0xF, 29, CFGR_REG)
-#define MCO2_PRE(val)           STM32_MCO_CFGR(val, 0x7, 25, CFGR_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 22, CFGR_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 18, CFGR_REG)
+#define MCO2_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 29, CFGR_REG)
+#define MCO2_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 25, CFGR_REG)
 
 /* MCO prescaler : division factor */
 #define MCO_PRE_DIV_1 1
diff --git a/include/zephyr/dt-bindings/clock/stm32h7rs_clock.h b/include/zephyr/dt-bindings/clock/stm32h7rs_clock.h
index e2c1ed81289e5..d7943dbe73bca 100644
--- a/include/zephyr/dt-bindings/clock/stm32h7rs_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32h7rs_clock.h
@@ -54,34 +54,6 @@
 #define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_AHB5
 #define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_AHB3
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32H7RS clock configuration bit field.
- *
- * - reg   (0/1)           [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..3)          [ 16 : 18 ]
- *
- * @param reg RCC_DxCCIP register offset
- * @param shift Position within RCC_DxCCIP.
- * @param mask Mask for the RCC_DxCCIP field.
- * @param val Clock value (0, 1, 2 or 3).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |	\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |	\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_DxCCIP register offset (RM0477.pdf) */
 #define D1CCIPR_REG		0x4C
 #define D2CCIPR_REG		0x50
@@ -99,43 +71,44 @@
 /* TODO to be completed */
 
 /** D1CCIPR devices */
-#define FMC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, D1CCIPR_REG)
-#define SDMMC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 2, D1CCIPR_REG)
-#define XSPI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, D1CCIPR_REG)
-#define XSPI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, D1CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 24, D1CCIPR_REG)
-#define CKPER_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, D1CCIPR_REG)
+#define FMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, D1CCIPR_REG)
+#define SDMMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 2, D1CCIPR_REG)
+#define XSPI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, D1CCIPR_REG)
+#define XSPI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, D1CCIPR_REG)
+#define OTGFS_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, D1CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, D1CCIPR_REG)
+#define CKPER_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, D1CCIPR_REG)
 
 /** D2CCIPR devices */
-#define USART234578_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 0, D2CCIPR_REG)
-#define SPI23_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 4, D2CCIPR_REG)
-#define I2C23_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, D2CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, D2CCIPR_REG)
-#define I3C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, D2CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 16, D2CCIPR_REG)
-#define FDCAN_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, D2CCIPR_REG)
+#define USART234578_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 0, D2CCIPR_REG)
+#define SPI23_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 4, D2CCIPR_REG)
+#define I2C23_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, D2CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, D2CCIPR_REG)
+#define I3C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, D2CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, D2CCIPR_REG)
+#define FDCAN_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, D2CCIPR_REG)
 
 /** D3CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 0, D3CCIPR_REG)
-#define SPI45_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 4, D3CCIPR_REG)
-#define SPI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 8, D3CCIPR_REG)
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 16, D3CCIPR_REG)
-#define SAI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 20, D3CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, D3CCIPR_REG)
+#define SPI45_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 4, D3CCIPR_REG)
+#define SPI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, D3CCIPR_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, D3CCIPR_REG)
+#define SAI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 20, D3CCIPR_REG)
 
 /** D4CCIPR devices */
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 0, D4CCIPR_REG)
-#define SPI6_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 4, D4CCIPR_REG)
-#define LPTIM23_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 8, D4CCIPR_REG)
-#define LPTIM45_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 12, D4CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 0, D4CCIPR_REG)
+#define SPI6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 4, D4CCIPR_REG)
+#define LPTIM23_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 8, D4CCIPR_REG)
+#define LPTIM45_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 12, D4CCIPR_REG)
 
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 /** CFGR devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0x7, 22, CFGR_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0xF, 18, CFGR_REG)
-#define MCO2_SEL(val)           STM32_MCO_CFGR(val, 0x7, 29, CFGR_REG)
-#define MCO2_PRE(val)           STM32_MCO_CFGR(val, 0xF, 25, CFGR_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 22, CFGR_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 18, CFGR_REG)
+#define MCO2_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 29, CFGR_REG)
+#define MCO2_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 25, CFGR_REG)
 
 /* MCO prescaler : division factor */
 #define MCO_PRE_DIV_1 1
diff --git a/include/zephyr/dt-bindings/clock/stm32l0_clock.h b/include/zephyr/dt-bindings/clock/stm32l0_clock.h
index c16e367a94e32..44709e7996247 100644
--- a/include/zephyr/dt-bindings/clock/stm32l0_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32l0_clock.h
@@ -31,34 +31,6 @@
 /** Bus clock */
 #define STM32_SRC_PCLK		(STM32_SRC_HSI48 + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x4C
 
@@ -67,14 +39,14 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR_REG)
-#define HSI48_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 26, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR_REG)
+#define HSI48_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 26, CCIPR_REG)
 /** CSR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CSR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CSR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32L0_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32l1_clock.h b/include/zephyr/dt-bindings/clock/stm32l1_clock.h
index f958f7b6bb8fa..9f94a18b8ff4a 100644
--- a/include/zephyr/dt-bindings/clock/stm32l1_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32l1_clock.h
@@ -26,37 +26,9 @@
 #define STM32_SRC_HSE		(STM32_SRC_LSI + 1)
 #define STM32_SRC_HSI		(STM32_SRC_HSE + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CSR register offset */
 #define CSR_REG		0x34
 
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CSR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CSR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32L1_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32l4_clock.h b/include/zephyr/dt-bindings/clock/stm32l4_clock.h
index 3e865f9a880e2..eabfffc9ed208 100644
--- a/include/zephyr/dt-bindings/clock/stm32l4_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32l4_clock.h
@@ -37,34 +37,6 @@
 #define STM32_SRC_PLL_R		(STM32_SRC_PLL_Q + 1)
 /* TODO: PLLSAI clocks */
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x88
 #define CCIPR2_REG		0x9C
@@ -77,36 +49,36 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, CCIPR_REG)
-#define UART4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, CCIPR_REG)
-#define UART5_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 14, CCIPR_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR_REG)
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR_REG)
-#define SAI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 24, CCIPR_REG)
-#define CLK48_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 26, CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, CCIPR_REG)
-#define SWPMI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 30, CCIPR_REG)
-#define DFSDM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 31, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR_REG)
+#define UART4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, CCIPR_REG)
+#define UART5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, CCIPR_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR_REG)
+#define SAI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, CCIPR_REG)
+#define CLK48_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 26, CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, CCIPR_REG)
+#define SWPMI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 30, CCIPR_REG)
+#define DFSDM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 31, CCIPR_REG)
 /** CCIPR2 devices */
-#define I2C4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR2_REG)
-#define DFSDM_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 2, CCIPR2_REG)
-#define ADFSDM_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 3, CCIPR2_REG)
-/* #define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 5, CCIPR2_REG) */
-/* #define SAI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 8, CCIPR2_REG) */
-#define DSI_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 12, CCIPR2_REG)
-#define SDMMC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 14, CCIPR2_REG)
-#define OSPI_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR2_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR2_REG)
+#define DFSDM_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 2, CCIPR2_REG)
+#define ADFSDM_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 3, CCIPR2_REG)
+/* #define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 5, CCIPR2_REG) */
+/* #define SAI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR2_REG) */
+#define DSI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 12, CCIPR2_REG)
+#define SDMMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 14, CCIPR2_REG)
+#define OSPI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR2_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 /** CFGR devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0xF, 24, CFGR_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0x7, 28, CFGR_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 24, CFGR_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 28, CFGR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32L4_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32mp13_clock.h b/include/zephyr/dt-bindings/clock/stm32mp13_clock.h
new file mode 100644
index 0000000000000..daf2d8ca2cd57
--- /dev/null
+++ b/include/zephyr/dt-bindings/clock/stm32mp13_clock.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32MP13_CLOCK_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32MP13_CLOCK_H_
+
+#include "stm32_common_clocks.h"
+
+/** Bus clocks */
+#define STM32_CLOCK_BUS_APB1    0x700
+#define STM32_CLOCK_BUS_APB2    0x708
+#define STM32_CLOCK_BUS_APB3    0x710
+#define STM32_CLOCK_BUS_APB4    0x728
+#define STM32_CLOCK_BUS_APB5    0x740
+#define STM32_CLOCK_BUS_APB6    0x748
+#define STM32_CLOCK_BUS_AHB2    0x750
+#define STM32_CLOCK_BUS_AHB4    0x768
+#define STM32_CLOCK_BUS_AHB5    0x778
+#define STM32_CLOCK_BUS_AHB6    0x780
+
+#define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_APB1
+#define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_AHB6
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32MP13_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32n6_clock.h b/include/zephyr/dt-bindings/clock/stm32n6_clock.h
index 156ca1f27abe5..85a8c3ec0b0c8 100644
--- a/include/zephyr/dt-bindings/clock/stm32n6_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32n6_clock.h
@@ -10,7 +10,7 @@
 
 /** Domain clocks */
 
-/* RM0468, Table 56 Kernel clock distribution summary */
+/* RM0486, Figures 37 and 45 on clock distribution description */
 
 /** System clock */
 /* defined in stm32_common_clocks.h */
@@ -45,6 +45,20 @@
 #define STM32_SRC_IC18		(STM32_SRC_IC17 + 1)
 #define STM32_SRC_IC19		(STM32_SRC_IC18 + 1)
 #define STM32_SRC_IC20		(STM32_SRC_IC19 + 1)
+#define STM32_SRC_HSI_DIV	(STM32_SRC_IC20 + 1)
+#define STM32_SRC_TIMG		(STM32_SRC_HSI_DIV + 1)
+#define STM32_SRC_HCLK1		(STM32_SRC_TIMG + 1)
+#define STM32_SRC_HCLK2		(STM32_SRC_HCLK1 + 1)
+#define STM32_SRC_HCLK3		(STM32_SRC_HCLK2 + 1)
+#define STM32_SRC_HCLK4		(STM32_SRC_HCLK3 + 1)
+#define STM32_SRC_HCLK5		(STM32_SRC_HCLK4 + 1)
+#define STM32_SRC_PCLK1		(STM32_SRC_HCLK5 + 1)
+#define STM32_SRC_PCLK2		(STM32_SRC_PCLK1 + 1)
+#define STM32_SRC_PCLK4		(STM32_SRC_PCLK2 + 1)
+#define STM32_SRC_PCLK5		(STM32_SRC_PCLK4 + 1)
+
+/** Others: Not yet supported */
+/* #define STM32_SRC_I2SCKIN	TBD */
 
 /** Bus clocks */
 #define STM32_CLOCK_BUS_AHB1	0x250
@@ -65,35 +79,7 @@
 #define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_AHB1
 #define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_APB5
 
-#define STM32_CLOCK_REG_MASK	0xFFFU
-#define STM32_CLOCK_REG_SHIFT	0U
-#define STM32_CLOCK_SHIFT_MASK	0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT	12U
-#define STM32_CLOCK_MASK_MASK	0x7U
-#define STM32_CLOCK_MASK_SHIFT	17U
-#define STM32_CLOCK_VAL_MASK	0x7U
-#define STM32_CLOCK_VAL_SHIFT	20U
-
-/**
- * @brief STM32U5 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 11 ]
- * - shift (0..31)         [ 12 : 16 ]
- * - mask  (0x1, 0x3, 0x7) [ 17 : 19 ]
- * - val   (0..7)          [ 20 : 22 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
-/** @brief RCC_CCIPRx register offset (RM0468.pdf) */
+/** @brief RCC_CCIPRx register offset (RM0486.pdf) */
 #define CCIPR1_REG		0x144
 #define CCIPR2_REG		0x148
 #define CCIPR3_REG		0x14C
@@ -109,85 +95,85 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR1 devices */
-#define ADF1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 0, CCIPR1_REG)
-#define ADC12_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 4, CCIPR1_REG)
-#define DCMIPP_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 20, CCIPR1_REG)
+#define ADF1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR1_REG)
+#define ADC12_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 4, CCIPR1_REG)
+#define DCMIPP_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR1_REG)
 /** CCIPR2 devices */
-#define ETH1PTP_SEL(val)	STM32_DOMAIN_CLOCK((val), 3, 0, CCIPR2_REG)
-#define ETH1CLK_SEL(val)	STM32_DOMAIN_CLOCK((val), 3, 12, CCIPR2_REG)
-#define ETH1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 16, CCIPR2_REG)
-#define ETH1REFCLK_SEL(val)	STM32_DOMAIN_CLOCK((val), 1, 20, CCIPR2_REG)
-#define ETH1GTXCLK_SEL(val)	STM32_DOMAIN_CLOCK((val), 1, 24, CCIPR2_REG)
+#define ETH1PTP_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR2_REG)
+#define ETH1CLK_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR2_REG)
+#define ETH1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR2_REG)
+#define ETH1REFCLK_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 20, CCIPR2_REG)
+#define ETH1GTXCLK_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 24, CCIPR2_REG)
 /** CCIPR3 devices */
-#define FDCAN_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 0, CCIPR3_REG)
-#define FMC_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 4, CCIPR3_REG)
+#define FDCAN_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR3_REG)
+#define FMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR3_REG)
 /** CCIPR4 devices */
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 0, CCIPR4_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 4, CCIPR4_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 8, CCIPR4_REG)
-#define I2C4_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 12, CCIPR4_REG)
-#define I3C1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 16, CCIPR4_REG)
-#define I3C2_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 20, CCIPR4_REG)
-#define LTDC_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 24, CCIPR4_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR4_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 4, CCIPR4_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR4_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR4_REG)
+#define I3C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR4_REG)
+#define I3C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 20, CCIPR4_REG)
+#define LTDC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, CCIPR4_REG)
 /** CCIPR5 devices */
-#define MCO1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 0, CCIPR5_REG)
-#define MCO2_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 8, CCIPR5_REG)
-#define MDF1SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 16, CCIPR5_REG)
+#define MCO1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR5_REG)
+#define MCO2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR5_REG)
+#define MDF1SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR5_REG)
 /** CCIPR6 devices */
-#define XSPI1_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 0, CCIPR6_REG)
-#define XSPI2_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 4, CCIPR6_REG)
-#define XSPI3_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 8, CCIPR6_REG)
-#define OTGPHY1_SEL(val)	STM32_DOMAIN_CLOCK((val), 3, 12, CCIPR6_REG)
-#define OTGPHY1CKREF_SEL(val)	STM32_DOMAIN_CLOCK((val), 1, 16, CCIPR6_REG)
-#define OTGPHY2_SEL(val)	STM32_DOMAIN_CLOCK((val), 3, 20, CCIPR6_REG)
-#define OTGPHY2CKREF_SEL(val)	STM32_DOMAIN_CLOCK((val), 1, 24, CCIPR6_REG)
+#define XSPI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR6_REG)
+#define XSPI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR6_REG)
+#define XSPI3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR6_REG)
+#define OTGPHY1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR6_REG)
+#define OTGPHY1CKREF_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 16, CCIPR6_REG)
+#define OTGPHY2_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR6_REG)
+#define OTGPHY2CKREF_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 24, CCIPR6_REG)
 /** CCIPR7 devices */
-#define PER_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 0, CCIPR7_REG)
-#define PSSI_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 4, CCIPR7_REG)
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 8, CCIPR7_REG)
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 20, CCIPR7_REG)
-#define SAI2_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 24, CCIPR7_REG)
+#define PER_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR7_REG)
+#define PSSI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR7_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR7_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 20, CCIPR7_REG)
+#define SAI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 24, CCIPR7_REG)
 /** CCIPR8 devices */
-#define SDMMC1_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 0, CCIPR8_REG)
-#define SDMMC2_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 4, CCIPR8_REG)
+#define SDMMC1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR8_REG)
+#define SDMMC2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR8_REG)
 /** CCIPR9 devices */
-#define SPDIFRX1_SEL(val)	STM32_DOMAIN_CLOCK((val), 7, 0, CCIPR9_REG)
-#define SPI1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 4, CCIPR9_REG)
-#define SPI2_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 8, CCIPR9_REG)
-#define SPI3_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 12, CCIPR9_REG)
-#define SPI4_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 16, CCIPR9_REG)
-#define SPI5_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 20, CCIPR9_REG)
-#define SPI6_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 24, CCIPR9_REG)
+#define SPDIFRX1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR9_REG)
+#define SPI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 4, CCIPR9_REG)
+#define SPI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR9_REG)
+#define SPI3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR9_REG)
+#define SPI4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR9_REG)
+#define SPI5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 20, CCIPR9_REG)
+#define SPI6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 24, CCIPR9_REG)
 /** CCIPR12 devices */
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 8, CCIPR12_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 12, CCIPR12_REG)
-#define LPTIM3_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 16, CCIPR12_REG)
-#define LPTIM4_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 20, CCIPR12_REG)
-#define LPTIM5_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 24, CCIPR12_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR12_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR12_REG)
+#define LPTIM3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR12_REG)
+#define LPTIM4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 20, CCIPR12_REG)
+#define LPTIM5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 24, CCIPR12_REG)
 /** CCIPR13 devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 0, CCIPR13_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 4, CCIPR13_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 8, CCIPR13_REG)
-#define UART4_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 12, CCIPR13_REG)
-#define UART5_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 16, CCIPR13_REG)
-#define USART6_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 20, CCIPR13_REG)
-#define UART7_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 24, CCIPR13_REG)
-#define UART8_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 28, CCIPR13_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR13_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 4, CCIPR13_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR13_REG)
+#define UART4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR13_REG)
+#define UART5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR13_REG)
+#define USART6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 20, CCIPR13_REG)
+#define UART7_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 24, CCIPR13_REG)
+#define UART8_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 28, CCIPR13_REG)
 /** CCIPR14 devices */
-#define UART9_SEL(val)		STM32_DOMAIN_CLOCK((val), 7, 0, CCIPR14_REG)
-#define USART10_SEL(val)	STM32_DOMAIN_CLOCK((val), 7, 4, CCIPR14_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK((val), 7, 8, CCIPR14_REG)
+#define UART9_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR14_REG)
+#define USART10_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 4, CCIPR14_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR14_REG)
 
-/** @brief RCC_ICxCFGR register offset (RM0468.pdf) */
+/** @brief RCC_ICxCFGR register offset (RM0486.pdf) */
 #define ICxCFGR_REG(ic)		(0xC4 + ((ic) - 1) * 4)
 
 /** @brief Divider ICx source selection */
-#define ICx_PLLy_SEL(ic, pll)	STM32_DOMAIN_CLOCK((pll) - 1, 3, 28, ICxCFGR_REG(ic))
+#define ICx_PLLy_SEL(ic, pll)	STM32_DT_CLOCK_SELECT((pll) - 1, 3, 28, ICxCFGR_REG(ic))
 
-/** @brief RCC_CFGR1 register offset (RM0468.pdf) */
+/** @brief RCC_CFGR1 register offset (RM0486.pdf) */
 #define CFGR1_REG		0x20
 
 /** @brief CPU clock switch selection */
-#define CPU_SEL(val)		STM32_DOMAIN_CLOCK((val), 3, 16, CFGR1_REG)
+#define CPU_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CFGR1_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32N6_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32u0_clock.h b/include/zephyr/dt-bindings/clock/stm32u0_clock.h
index 476c423608256..50e76c573d781 100644
--- a/include/zephyr/dt-bindings/clock/stm32u0_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32u0_clock.h
@@ -36,34 +36,6 @@
 #define STM32_SRC_PLL_Q		(STM32_SRC_PLL_P + 1)
 #define STM32_SRC_PLL_R		(STM32_SRC_PLL_Q + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x88
 
@@ -72,21 +44,21 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR_REG)
-#define LPUART3_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 6, CCIPR_REG)
-#define LPUART2_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR_REG)
-#define LPTIM3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR_REG)
-#define TIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 24, CCIPR_REG)
-#define TIM15_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 25, CCIPR_REG)
-#define CLK48_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 26, CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR_REG)
+#define LPUART3_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 6, CCIPR_REG)
+#define LPUART2_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR_REG)
+#define LPTIM3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR_REG)
+#define TIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 24, CCIPR_REG)
+#define TIM15_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 25, CCIPR_REG)
+#define CLK48_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 26, CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, CCIPR_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32U0_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32u5_clock.h b/include/zephyr/dt-bindings/clock/stm32u5_clock.h
index 4bb1f349cdde4..e1d131b70cb23 100644
--- a/include/zephyr/dt-bindings/clock/stm32u5_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32u5_clock.h
@@ -11,7 +11,7 @@
 
 /** Domain clocks */
 
-/* RM0468, Table 56 Kernel clock distribution summary */
+/* RM0456, Figure 36 Clock tree for STM32U5 Series */
 
 /** System clock */
 /* defined in stm32_common_clocks.h */
@@ -52,34 +52,6 @@
 #define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_AHB1
 #define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_APB3
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32U5 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |	\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |	\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPRx register offset (RM0456.pdf) */
 #define CCIPR1_REG		0xE0
 #define CCIPR2_REG		0xE4
@@ -93,51 +65,51 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR1 devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR1_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR1_REG)
-#define USART3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 4, CCIPR1_REG)
-#define UART4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, CCIPR1_REG)
-#define UART5_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR1_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR1_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR1_REG)
-#define I2C4_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 14, CCIPR1_REG)
-#define SPI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR1_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR1_REG)
-#define SPI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR1_REG)
-#define SYSTICK_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR1_REG)
-#define FDCAN1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 24, CCIPR1_REG)
-#define ICKLK_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 26, CCIPR1_REG)
-#define TIMIC_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 29, CCIPR1_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR1_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR1_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR1_REG)
+#define UART4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, CCIPR1_REG)
+#define UART5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR1_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR1_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR1_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, CCIPR1_REG)
+#define SPI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR1_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR1_REG)
+#define SPI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR1_REG)
+#define SYSTICK_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR1_REG)
+#define FDCAN1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, CCIPR1_REG)
+#define ICKLK_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 26, CCIPR1_REG)
+#define TIMIC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 29, CCIPR1_REG)
 /** CCIPR2 devices */
-#define MDF1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 0, CCIPR2_REG)
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 5, CCIPR2_REG)
-#define SAI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 8, CCIPR2_REG)
-#define SAE_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 11, CCIPR2_REG)
-#define RNG_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR2_REG)
-#define SDMMC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 14, CCIPR2_REG)
-#define DSIHOST_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 15, CCIPR2_REG)
-#define USART6_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 16, CCIPR2_REG)
-#define LTDC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 18, CCIPR2_REG)
-#define OCTOSPI_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR2_REG)
-#define HSPI_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR2_REG)
-#define I2C5_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 24, CCIPR2_REG)
-#define I2C6_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 26, CCIPR2_REG)
-#define OTGHS_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, CCIPR2_REG)
+#define MDF1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR2_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 5, CCIPR2_REG)
+#define SAI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 8, CCIPR2_REG)
+#define SAE_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 11, CCIPR2_REG)
+#define RNG_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR2_REG)
+#define SDMMC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 14, CCIPR2_REG)
+#define DSIHOST_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 15, CCIPR2_REG)
+#define USART6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 16, CCIPR2_REG)
+#define LTDC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 18, CCIPR2_REG)
+#define OCTOSPI_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR2_REG)
+#define HSPI_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR2_REG)
+#define I2C5_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 24, CCIPR2_REG)
+#define I2C6_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 26, CCIPR2_REG)
+#define OTGHS_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, CCIPR2_REG)
 /** CCIPR3 devices */
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 7, 0, CCIPR3_REG)
-#define SPI3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 3, CCIPR3_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, CCIPR3_REG)
-#define LPTIM34_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR3_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR3_REG)
-#define ADCDAC_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 12, CCIPR3_REG)
-#define DAC1_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 15, CCIPR3_REG)
-#define ADF1_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 16, CCIPR3_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 7, 0, CCIPR3_REG)
+#define SPI3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 3, CCIPR3_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, CCIPR3_REG)
+#define LPTIM34_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR3_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR3_REG)
+#define ADCDAC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR3_REG)
+#define DAC1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 15, CCIPR3_REG)
+#define ADF1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 16, CCIPR3_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 
 /** CFGR1 devices */
-#define MCO1_SEL(val)           STM32_MCO_CFGR(val, 0xF, 24, CFGR1_REG)
-#define MCO1_PRE(val)           STM32_MCO_CFGR(val, 0x7, 28, CFGR1_REG)
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 24, CFGR1_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 28, CFGR1_REG)
 
 /* MCO prescaler : division factor */
 #define MCO_PRE_DIV_1  0
diff --git a/include/zephyr/dt-bindings/clock/stm32wb0_clock.h b/include/zephyr/dt-bindings/clock/stm32wb0_clock.h
index 23ba8e996086e..d3b96b49ca4f5 100644
--- a/include/zephyr/dt-bindings/clock/stm32wb0_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32wb0_clock.h
@@ -27,34 +27,6 @@
 #define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_AHB0
 #define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_APB2
 
-#define STM32_CLOCK_REG_MASK	(0xFFFFU)
-#define STM32_CLOCK_REG_SHIFT	(0U)
-#define STM32_CLOCK_SHIFT_MASK  (0x3FU)
-#define STM32_CLOCK_SHIFT_SHIFT (16U)
-#define STM32_CLOCK_MASK_MASK   (0x1FU)
-#define STM32_CLOCK_MASK_SHIFT  (22U)
-#define STM32_CLOCK_VAL_MASK    STM32_CLOCK_MASK_MASK
-#define STM32_CLOCK_VAL_SHIFT   (27U)
-
-/**
- * @brief STM32 clock configuration bit field
- *
- * @param reg	Offset to target configuration register in RCC
- * @param shift	Position of field within RCC register (= field LSB's index)
- * @param mask	Mask of field in RCC register
- * @param val	Field value
- *
- * @note 'reg' range:	0x0~0xFFFF	[ 00 : 15 ]
- * @note 'shift' range:	0~63		[ 16 : 21 ]
- * @note 'mask' range:	0x00~0x1F	[ 22 : 26 ]
- * @note 'val' range:	0x00~0x1F	[ 27 : 31 ]
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)				\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CFGR register offset */
 #define CFGR_REG	0x08
 
@@ -62,9 +34,12 @@
 #define APB2ENR_REG	0x60
 
 /** @brief Device clk sources selection helpers */
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 13, CFGR_REG)	/* WB05/WB09 only */
-#define SPI2_I2S2_SEL(val)	STM32_DOMAIN_CLOCK(val, 1, 22, CFGR_REG)	/* WB06/WB07 only */
+
+/* WB05/WB09 only */
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 13, CFGR_REG)
+/* WB06/WB07 only */
+#define SPI2_I2S2_SEL(val)	STM32_DT_CLOCK_SELECT((val), 1, 22, CFGR_REG)
 /* `mask` is only 0x1 for WB06/WB07, but a single definition with mask=0x3 is acceptable */
-#define SPI3_I2S3_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 22, CFGR_REG)
+#define SPI3_I2S3_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 22, CFGR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32WB0_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32wb_clock.h b/include/zephyr/dt-bindings/clock/stm32wb_clock.h
index 31786c8675dd3..f56e70e54b9fb 100644
--- a/include/zephyr/dt-bindings/clock/stm32wb_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32wb_clock.h
@@ -38,34 +38,6 @@
 #define STM32_SRC_PLL_R		(STM32_SRC_PLL_Q + 1)
 /* TODO: PLLSAI clocks */
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x88
 
@@ -77,19 +49,19 @@
 
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR_REG)
-#define SAI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR_REG)
-#define CLK48_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 26, CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, CCIPR_REG)
-#define RNG_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR_REG)
+#define SAI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR_REG)
+#define CLK48_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 26, CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, CCIPR_REG)
+#define RNG_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, CCIPR_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
 /** CSR devices */
-#define RFWKP_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 14, CSR_REG)
+#define RFWKP_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, CSR_REG)
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32WB_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32wba_clock.h b/include/zephyr/dt-bindings/clock/stm32wba_clock.h
index b8baaada6be88..d77dfba5cbeec 100644
--- a/include/zephyr/dt-bindings/clock/stm32wba_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32wba_clock.h
@@ -10,7 +10,8 @@
 
 /** Peripheral clock sources */
 
-/* RM0493, Figure 30, clock tree */
+/* RM0493, Figure 34, clock tree */
+/* RM0515, Figure 36, clock tree */
 
 /** System clock */
 /* defined in stm32_common_clocks.h */
@@ -45,35 +46,6 @@
 #define STM32_PERIPH_BUS_MIN	STM32_CLOCK_BUS_AHB1
 #define STM32_PERIPH_BUS_MAX	STM32_CLOCK_BUS_APB7
 
-/**
- * @brief STM32WBA clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |	\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |	\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPRx register offset (RM0493.pdf) */
 #define CCIPR1_REG		0xE0
 #define CCIPR2_REG		0xE4
@@ -83,22 +55,50 @@
 
 /** @brief Device clk sources selection helpers */
 /** CCIPR1 devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR1_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR1_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR1_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR1_REG)
-#define SPI1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR1_REG)
-#define SYSTICK_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR1_REG)
-#define TIMIC_SEL(val)		STM32_DOMAIN_CLOCK(val, 1, 31, CCIPR1_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR1_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR1_REG)
+#define USART3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 4, CCIPR1_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR1_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR1_REG)
+#define I2C4_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, CCIPR1_REG)
+#define SPI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR1_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR1_REG)
+#define SPI1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR1_REG)
+#define SYSTICK_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR1_REG)
+#define TIMIC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 1, 31, CCIPR1_REG)
 /** CCIPR2 devices */
-#define RNG_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR2_REG)
+#define RNG_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR2_REG)
 /** CCIPR3 devices */
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR3_REG)
-#define SPI3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 3, CCIPR3_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 6, CCIPR3_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR3_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 7, 12, CCIPR3_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR3_REG)
+#define SPI3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 3, CCIPR3_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 6, CCIPR3_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR3_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 7, 12, CCIPR3_REG)
 /** BCDR1 devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BCDR1_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BCDR1_REG)
+/** @brief RCC_CFGRx register offset */
+#define CFGR1_REG               0x1C
+/** CFGR1 devices */
+#define MCO1_SEL(val)           STM32_DT_CLOCK_SELECT((val), 0xF, 24, CFGR1_REG)
+#define MCO1_PRE(val)           STM32_DT_CLOCK_SELECT((val), 0x7, 28, CFGR1_REG)
+
+/* MCO prescaler : division factor */
+#define MCO_PRE_DIV_1 0
+#define MCO_PRE_DIV_2 1
+#define MCO_PRE_DIV_4 2
+#define MCO_PRE_DIV_8 3
+#define MCO_PRE_DIV_16 4
+
+/* MCO clock output */
+#define MCO_SEL_SYSCLKPRE 1
+#define MCO_SEL_HSI16 3
+#define MCO_SEL_HSE32 4
+#define MCO_SEL_PLL1RCLK 5
+#define MCO_SEL_LSI 6
+#define MCO_SEL_LSE 7
+#define MCO_SEL_PLL1PCLK 8
+#define MCO_SEL_PLL1QCLK 9
+#define MCO_SEL_HCLK5 10
+
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32WBA_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/clock/stm32wl_clock.h b/include/zephyr/dt-bindings/clock/stm32wl_clock.h
index 7384703267e43..adcfd16477797 100644
--- a/include/zephyr/dt-bindings/clock/stm32wl_clock.h
+++ b/include/zephyr/dt-bindings/clock/stm32wl_clock.h
@@ -38,55 +38,52 @@
 #define STM32_SRC_PLL_Q		(STM32_SRC_PLL_P + 1)
 #define STM32_SRC_PLL_R		(STM32_SRC_PLL_Q + 1)
 
-#define STM32_CLOCK_REG_MASK    0xFFU
-#define STM32_CLOCK_REG_SHIFT   0U
-#define STM32_CLOCK_SHIFT_MASK  0x1FU
-#define STM32_CLOCK_SHIFT_SHIFT 8U
-#define STM32_CLOCK_MASK_MASK   0x7U
-#define STM32_CLOCK_MASK_SHIFT  13U
-#define STM32_CLOCK_VAL_MASK    0x7U
-#define STM32_CLOCK_VAL_SHIFT   16U
-
-/**
- * @brief STM32 clock configuration bit field.
- *
- * - reg   (1/2/3)         [ 0 : 7 ]
- * - shift (0..31)         [ 8 : 12 ]
- * - mask  (0x1, 0x3, 0x7) [ 13 : 15 ]
- * - val   (0..7)          [ 16 : 18 ]
- *
- * @param reg RCC_CCIPRx register offset
- * @param shift Position within RCC_CCIPRx.
- * @param mask Mask for the RCC_CCIPRx field.
- * @param val Clock value (0, 1, ... 7).
- */
-#define STM32_DOMAIN_CLOCK(val, mask, shift, reg)					\
-	((((reg) & STM32_CLOCK_REG_MASK) << STM32_CLOCK_REG_SHIFT) |		\
-	 (((shift) & STM32_CLOCK_SHIFT_MASK) << STM32_CLOCK_SHIFT_SHIFT) |	\
-	 (((mask) & STM32_CLOCK_MASK_MASK) << STM32_CLOCK_MASK_SHIFT) |		\
-	 (((val) & STM32_CLOCK_VAL_MASK) << STM32_CLOCK_VAL_SHIFT))
-
 /** @brief RCC_CCIPR register offset */
 #define CCIPR_REG		0x88
 
 /** @brief RCC_BDCR register offset */
 #define BDCR_REG		0x90
 
+/** @brief RCC_CFGRx register offset */
+#define CFGR1_REG        0x08
+
 /** @brief Device domain clocks selection helpers */
 /** CCIPR devices */
-#define USART1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 0, CCIPR_REG)
-#define USART2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 2, CCIPR_REG)
-#define SPI2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, CCIPR_REG)
-#define LPUART1_SEL(val)	STM32_DOMAIN_CLOCK(val, 3, 10, CCIPR_REG)
-#define I2C1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 12, CCIPR_REG)
-#define I2C2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 14, CCIPR_REG)
-#define I2C3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 16, CCIPR_REG)
-#define LPTIM1_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 18, CCIPR_REG)
-#define LPTIM2_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 20, CCIPR_REG)
-#define LPTIM3_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 22, CCIPR_REG)
-#define ADC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 28, CCIPR_REG)
-#define RNG_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 30, CCIPR_REG)
+#define USART1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 0, CCIPR_REG)
+#define USART2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 2, CCIPR_REG)
+#define SPI2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, CCIPR_REG)
+#define LPUART1_SEL(val)	STM32_DT_CLOCK_SELECT((val), 3, 10, CCIPR_REG)
+#define I2C1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 12, CCIPR_REG)
+#define I2C2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 14, CCIPR_REG)
+#define I2C3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 16, CCIPR_REG)
+#define LPTIM1_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 18, CCIPR_REG)
+#define LPTIM2_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 20, CCIPR_REG)
+#define LPTIM3_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 22, CCIPR_REG)
+#define ADC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 28, CCIPR_REG)
+#define RNG_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 30, CCIPR_REG)
 /** BDCR devices */
-#define RTC_SEL(val)		STM32_DOMAIN_CLOCK(val, 3, 8, BDCR_REG)
+#define RTC_SEL(val)		STM32_DT_CLOCK_SELECT((val), 3, 8, BDCR_REG)
+/** CFGR1 devices */
+#define MCO1_SEL(val)       STM32_DT_CLOCK_SELECT(val, 0xF, 24, CFGR1_REG)
+#define MCO1_PRE(val)       STM32_DT_CLOCK_SELECT(val, 0x7, 28, CFGR1_REG)
+
+/* MCO prescaler : division factor */
+#define MCO_PRE_DIV_1  0
+#define MCO_PRE_DIV_2  1
+#define MCO_PRE_DIV_4  2
+#define MCO_PRE_DIV_8  3
+#define MCO_PRE_DIV_16 4
+
+/* MCO clock output */
+#define MCO_SEL_NOCLK     0
+#define MCO_SEL_SYSCLKPRE 1
+#define MCO_SEL_MSI       2
+#define MCO_SEL_HSI16     3
+#define MCO_SEL_HSE32     4
+#define MCO_SEL_PLL1RCLK  5
+#define MCO_SEL_LSI       6
+#define MCO_SEL_LSE       8
+#define MCO_SEL_PLL1PCLK  13
+#define MCO_SEL_PLL1QCLK  14
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32WL_CLOCK_H_ */
diff --git a/include/zephyr/dt-bindings/display/panel.h b/include/zephyr/dt-bindings/display/panel.h
index e1957e9a66bb5..c2e26e508be83 100644
--- a/include/zephyr/dt-bindings/display/panel.h
+++ b/include/zephyr/dt-bindings/display/panel.h
@@ -23,12 +23,13 @@
  * since enum definitions are not supported by devicetree tooling.
  */
 
-#define PANEL_PIXEL_FORMAT_RGB_888		(0x1 << 0)
-#define PANEL_PIXEL_FORMAT_MONO01		(0x1 << 1) /* 0=Black 1=White */
-#define PANEL_PIXEL_FORMAT_MONO10		(0x1 << 2) /* 1=Black 0=White */
-#define PANEL_PIXEL_FORMAT_ARGB_8888		(0x1 << 3)
-#define PANEL_PIXEL_FORMAT_RGB_565		(0x1 << 4)
-#define PANEL_PIXEL_FORMAT_BGR_565		(0x1 << 5)
+#define PANEL_PIXEL_FORMAT_RGB_888   (0x1 << 0)
+#define PANEL_PIXEL_FORMAT_MONO01    (0x1 << 1) /* 0=Black 1=White */
+#define PANEL_PIXEL_FORMAT_MONO10    (0x1 << 2) /* 1=Black 0=White */
+#define PANEL_PIXEL_FORMAT_ARGB_8888 (0x1 << 3)
+#define PANEL_PIXEL_FORMAT_RGB_565   (0x1 << 4)
+#define PANEL_PIXEL_FORMAT_BGR_565   (0x1 << 5)
+#define PANEL_PIXEL_FORMAT_L_8       (0x1 << 6)
 
 /**
  * @}
diff --git a/include/zephyr/dt-bindings/dma/ch32v003-dma.h b/include/zephyr/dt-bindings/dma/ch32v003-dma.h
new file mode 100644
index 0000000000000..0860afcb65a9c
--- /dev/null
+++ b/include/zephyr/dt-bindings/dma/ch32v003-dma.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Paul Wedeck
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CH32V003_DMA_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CH32V003_DMA_H_
+
+#define CH32V003_ADC1_DMA 0
+
+#define CH32V003_SPI1_RX_DMA 1
+#define CH32V003_SPI1_TX_DMA 2
+
+#define CH32V003_USART1_RX_DMA 4
+#define CH32V003_USART1_TX_DMA 3
+
+#define CH32V003_I2C1_RX_DMA 6
+#define CH32V003_I2C1_TX_DMA 5
+
+#define CH32V003_TIM1_CH1_DMA 1
+#define CH32V003_TIM1_CH2_DMA 2
+#define CH32V003_TIM1_CH3_DMA 5
+#define CH32V003_TIM1_CH4_DMA 3
+#define CH32V003_TIM1_TRIG 3
+#define CH32V003_TIM1_COM 3
+#define CH32V003_TIM1_UP 4
+
+#define CH32V003_TIM2_CH1_DMA 4
+#define CH32V003_TIM2_CH2_DMA 6
+#define CH32V003_TIM2_CH3_DMA 0
+#define CH32V003_TIM2_CH4_DMA 6
+#define CH32V003_TIM2_UP 1
+
+#endif /*ZEPHYR_INCLUDE_DT_BINDINGS_CH32V003_DMA_H_*/
diff --git a/include/zephyr/dt-bindings/dma/max32660_dma.h b/include/zephyr/dt-bindings/dma/max32660_dma.h
new file mode 100644
index 0000000000000..e52805e1ab64c
--- /dev/null
+++ b/include/zephyr/dt-bindings/dma/max32660_dma.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_DMA_MAX32660_DMA_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_DMA_MAX32660_DMA_H_
+
+#define MAX32_DMA_SLOT_MEMTOMEM  0x00U
+#define MAX32_DMA_SLOT_SPI0_RX   0x01U
+#define MAX32_DMA_SLOT_SPI1_RX   0x02U
+#define MAX32_DMA_SLOT_UART0_RX  0x04U
+#define MAX32_DMA_SLOT_UART1_RX  0x05U
+#define MAX32_DMA_SLOT_I2C0_RX   0x07U
+#define MAX32_DMA_SLOT_I2C1_RX   0x08U
+#define MAX32_DMA_SLOT_SPI0_TX   0x21U
+#define MAX32_DMA_SLOT_SPI1_TX   0x22U
+#define MAX32_DMA_SLOT_UART0_TX  0x24U
+#define MAX32_DMA_SLOT_UART1_TX  0x25U
+#define MAX32_DMA_SLOT_I2C0_TX   0x27U
+#define MAX32_DMA_SLOT_I2C1_TX   0x28U
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_DMA_MAX32660_DMA_H_ */
diff --git a/include/zephyr/dt-bindings/dma/renesas_rz_dma.h b/include/zephyr/dt-bindings/dma/renesas_rz_dma.h
new file mode 100644
index 0000000000000..a21506f9bb5fe
--- /dev/null
+++ b/include/zephyr/dt-bindings/dma/renesas_rz_dma.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_DMA_RENESAS_RZ_DMA_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_DMA_RENESAS_RZ_DMA_H_
+
+/* mode:                bit 0 (0: Normal, 1: Block) */
+/* source data size:    bit 1, 2, 3 (0b000 -> 0b111) */
+/* dest data size:      bit 4, 5, 6 (0b000 -> 0b111) */
+/* source addr mode:    bit 7 (0: incremented, 1: fixed) */
+/* dest addr mode:      bit 8 (0: incremented, 1: fixed) */
+
+#define RZ_DMA_MODE_NORMAL (0U)
+#define RZ_DMA_MODE_BLOCK  (1U)
+
+/* DMA source data size config on bits 1, 2, 3 */
+#define RZ_DMA_CFG_SRC_DATA_SIZE(val) ((val & 0x7) << 1)
+#define RZ_DMA_SRC_1_BYTE             RZ_DMA_CFG_SRC_DATA_SIZE(0)
+#define RZ_DMA_SRC_2_BYTE             RZ_DMA_CFG_SRC_DATA_SIZE(1)
+#define RZ_DMA_SRC_4_BYTE             RZ_DMA_CFG_SRC_DATA_SIZE(2)
+#define RZ_DMA_SRC_8_BYTE             RZ_DMA_CFG_SRC_DATA_SIZE(3)
+#define RZ_DMA_SRC_16_BYTE            RZ_DMA_CFG_SRC_DATA_SIZE(4)
+#define RZ_DMA_SRC_32_BYTE            RZ_DMA_CFG_SRC_DATA_SIZE(5)
+#define RZ_DMA_SRC_64_BYTE            RZ_DMA_CFG_SRC_DATA_SIZE(6)
+#define RZ_DMA_SRC_128_BYTE           RZ_DMA_CFG_SRC_DATA_SIZE(7)
+
+/* DMA destination data size config on bits 4, 5, 6 */
+#define RZ_DMA_CFG_DEST_DATA_SIZE(val) ((val & 0x7) << 4)
+#define RZ_DMA_DEST_1_BYTE             RZ_DMA_CFG_DEST_DATA_SIZE(0)
+#define RZ_DMA_DEST_2_BYTE             RZ_DMA_CFG_DEST_DATA_SIZE(1)
+#define RZ_DMA_DEST_4_BYTE             RZ_DMA_CFG_DEST_DATA_SIZE(2)
+#define RZ_DMA_DEST_8_BYTE             RZ_DMA_CFG_DEST_DATA_SIZE(3)
+#define RZ_DMA_DEST_16_BYTE            RZ_DMA_CFG_DEST_DATA_SIZE(4)
+#define RZ_DMA_DEST_32_BYTE            RZ_DMA_CFG_DEST_DATA_SIZE(5)
+#define RZ_DMA_DEST_64_BYTE            RZ_DMA_CFG_DEST_DATA_SIZE(6)
+#define RZ_DMA_DEST_128_BYTE           RZ_DMA_CFG_DEST_DATA_SIZE(7)
+
+/* DMA source address mode config on bit 7 */
+#define RZ_DMA_CFG_SRC_ADDR_MODE(val) ((val & 0x1) << 7)
+#define RZ_DMA_SRC_INCREMENTED        RZ_DMA_CFG_SRC_ADDR_MODE(0)
+#define RZ_DMA_SRC_FIXED              RZ_DMA_CFG_SRC_ADDR_MODE(1)
+
+/* DMA source address mode config on bit 8 */
+#define RZ_DMA_CFG_DEST_ADDR_MODE(val) ((val & 0x1) << 8)
+#define RZ_DMA_DEST_INCREMENTED        RZ_DMA_CFG_DEST_ADDR_MODE(0)
+#define RZ_DMA_DEST_FIXED              RZ_DMA_CFG_DEST_ADDR_MODE(1)
+
+/* DMA usual combination for peripheral transfer */
+#define RZ_DMA_MEM_TO_PERIPH                                                                       \
+	(RZ_DMA_MODE_NORMAL | RZ_DMA_SRC_INCREMENTED | RZ_DMA_DEST_FIXED | RZ_DMA_SRC_1_BYTE |     \
+	 RZ_DMA_DEST_1_BYTE)
+#define RZ_DMA_PERIPH_TO_MEM                                                                       \
+	(RZ_DMA_MODE_NORMAL | RZ_DMA_SRC_FIXED | RZ_DMA_DEST_INCREMENTED | RZ_DMA_SRC_1_BYTE |     \
+	 RZ_DMA_DEST_1_BYTE)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_DMA_RENESAS_RZ_DMA_H_ */
diff --git a/include/zephyr/dt-bindings/gpio/arduino-header-r3.h b/include/zephyr/dt-bindings/gpio/arduino-header-r3.h
new file mode 100644
index 0000000000000..d54913ba9aff4
--- /dev/null
+++ b/include/zephyr/dt-bindings/gpio/arduino-header-r3.h
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_ARDUINO_HEADER_R3_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_ARDUINO_HEADER_R3_H_
+
+#define ARDUINO_HEADER_R3_A0  0
+#define ARDUINO_HEADER_R3_A1  1
+#define ARDUINO_HEADER_R3_A2  2
+#define ARDUINO_HEADER_R3_A3  3
+#define ARDUINO_HEADER_R3_A4  4
+#define ARDUINO_HEADER_R3_A5  5
+#define ARDUINO_HEADER_R3_D0  6
+#define ARDUINO_HEADER_R3_D1  7
+#define ARDUINO_HEADER_R3_D2  8
+#define ARDUINO_HEADER_R3_D3  9
+#define ARDUINO_HEADER_R3_D4  10
+#define ARDUINO_HEADER_R3_D5  11
+#define ARDUINO_HEADER_R3_D6  12
+#define ARDUINO_HEADER_R3_D7  13
+#define ARDUINO_HEADER_R3_D8  14
+#define ARDUINO_HEADER_R3_D9  15
+#define ARDUINO_HEADER_R3_D10 16
+#define ARDUINO_HEADER_R3_D11 17
+#define ARDUINO_HEADER_R3_D12 18
+#define ARDUINO_HEADER_R3_D13 19
+#define ARDUINO_HEADER_R3_D14 20
+#define ARDUINO_HEADER_R3_D15 21
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_ARDUINO_HEADER_R3_H_ */
diff --git a/include/zephyr/dt-bindings/gpio/ene-kb1200-gpio.h b/include/zephyr/dt-bindings/gpio/ene-kb1200-gpio.h
new file mode 100644
index 0000000000000..f6ca127081fa5
--- /dev/null
+++ b/include/zephyr/dt-bindings/gpio/ene-kb1200-gpio.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 ENE Technology Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_ENE_KB1200_GPIO_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_ENE_KB1200_GPIO_H_
+
+/**
+ * @name GPIO pin voltage flags
+ *
+ * The voltage and driving flags are a Zephyr specific extension of the standard GPIO flags
+ * specified by the Linux GPIO binding for use with the ENE KB1200 SoC.
+ *
+ * @{
+ *  Note: Bits 15 down to 8 are reserved for SoC specific flags.
+ */
+
+/** @cond INTERNAL_HIDDEN */
+#define KB1200_GPIO_VOLTAGE_POS         8
+#define KB1200_GPIO_VOLTAGE_MASK        (1U << KB1200_GPIO_VOLTAGE_POS)
+
+#define KB1200_GPIO_DRIVING_POS         9
+#define KB1200_GPIO_DRIVING_MASK        (1U << KB1200_GPIO_DRIVING_POS)
+/** @endcond */
+
+/** Set pin at the default voltage level (3.3V) */
+#define KB1200_GPIO_VOLTAGE_DEFAULT     (0U << KB1200_GPIO_VOLTAGE_POS)
+/** Set pin voltage level at 1.8 V */
+#define KB1200_GPIO_VOLTAGE_1P8	        (1U << KB1200_GPIO_VOLTAGE_POS)
+
+/** Set pin at the default driving current (4mA) */
+#define KB1200_GPIO_DRIVING_DEFAULT     (0U << KB1200_GPIO_DRIVING_POS)
+/** Set pin driving current at 16mA */
+#define KB1200_GPIO_DRIVING_16MA        (1U << KB1200_GPIO_DRIVING_POS)
+
+
+/** @} */
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_ENE_KB1200_GPIO_H_ */
diff --git a/include/zephyr/dt-bindings/gpio/nxp-imx-igpio.h b/include/zephyr/dt-bindings/gpio/nxp-imx-igpio.h
new file mode 100644
index 0000000000000..29eebc1451b17
--- /dev/null
+++ b/include/zephyr/dt-bindings/gpio/nxp-imx-igpio.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Feniex Industries Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NXP_IMX_IGPIO_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NXP_IMX_IGPIO_H_
+
+/**
+ * @name GPIO pull strength flags
+ *
+ * The pull strength flags are a Zephyr specific extension of the standard GPIO
+ * flags specified by the Linux GPIO binding. Only applicable for NXP IMX
+ * SoCs.
+ *
+ * The interface supports two different pull strengths:
+ * `WEAK` - The lowest pull strength supported by the HW
+ * `STRONG` - The highest pull strength supported by the HW
+ *
+ * @{
+ */
+/** @cond INTERNAL_HIDDEN */
+#define NXP_IGPIO_PULL_STRENGTH_POS 8
+#define NXP_IGPIO_PULL_STRENGTH_MASK (0x1U << NXP_IGPIO_PULL_STRENGTH_POS)
+/** @endcond */
+
+/** pull up/down strengths (only applies to CONFIG_SOC_SERIES_IMXRT10XX) */
+#define NXP_IGPIO_PULL_WEAK (0x0U << NXP_IGPIO_PULL_STRENGTH_POS)
+#define NXP_IGPIO_PULL_STRONG (0x1U << NXP_IGPIO_PULL_STRENGTH_POS)
+
+/** @} */
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_NXP_IMX_IGPIO_H_ */
diff --git a/include/zephyr/dt-bindings/gpio/renesas-rz-gpio.h b/include/zephyr/dt-bindings/gpio/renesas-rz-gpio.h
index 30729af98bd3b..d78aa1c8225c5 100644
--- a/include/zephyr/dt-bindings/gpio/renesas-rz-gpio.h
+++ b/include/zephyr/dt-bindings/gpio/renesas-rz-gpio.h
@@ -1,42 +1,42 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_RENESAS_RZ_GPIO_H_
 #define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_RENESAS_RZ_GPIO_H_
 
-/*********************************RZG3S*****************************************/
+/*********************************RZ/A,G,V**************************************/
 
 /**
- * @brief RZ G3S specific GPIO Flags
+ * @brief RZ/A,G,V-specific GPIO Flags
  * The pin driving ability flags are encoded in the 8 upper bits of @ref gpio_dt_flags_t as
  * follows:
- * - Bit 9..8: Pin driving ability value
- * - Bit 11..10: Digital Noise Filter Clock Selection value
- * - Bit 13..12: Digital Noise Filter Number value
- * - Bit 14: Digital Noise Filter ON/OFF
+ * - Bit 8..9: Pin driving ability value
+ * - Bit 10: Digital Noise Filter ON/OFF
+ * - Bit 11..12: Digital Noise Filter Number value
+ * - Bit 13..14: Digital Noise Filter Clock Selection value
  * example:
  * gpio-consumer {
- *	out-gpios = <&port8 2 (GPIO_PULL_UP | RZG3S_GPIO_FILTER_SET(1, 3, 3))>;
+ *	out-gpios = <&port8 2 (GPIO_PULL_UP | RZ_GPIO_FILTER_SET(1, 3, 3))>;
  * };
  * gpio-consumer {
- *	out-gpios = <&port8 2 (GPIO_PULL_UP | RZG3S_GPIO_IOLH_SET(2))>;
+ *	out-gpios = <&port8 2 (GPIO_PULL_UP | RZ_GPIO_IOLH_SET(2))>;
  * };
  */
 
 /* GPIO drive IOLH */
-#define RZG3S_GPIO_IOLH_SHIFT         7U
-#define RZG3S_GPIO_IOLH_SET(iolh_val) (iolh_val << RZG3S_GPIO_IOLH_SHIFT)
+#define RZ_GPIO_IOLH_SHIFT         8U
+#define RZ_GPIO_IOLH_SET(iolh_val) (iolh_val << RZ_GPIO_IOLH_SHIFT)
 
 /* GPIO filter */
-#define RZG3S_GPIO_FILTER_SHIFT    9U
-#define RZG3S_GPIO_FILNUM_SHIFT    1U
-#define RZG3S_GPIO_FILCLKSEL_SHIFT 3U
-#define RZG3S_GPIO_FILTER_SET(fillonoff, filnum, filclksel)                                        \
-	(((fillonoff) | ((filnum) << RZG3S_GPIO_FILNUM_SHIFT) |                                    \
-	  ((filclksel) << RZG3S_GPIO_FILCLKSEL_SHIFT))                                             \
-	 << RZG3S_GPIO_FILTER_SHIFT)
+#define RZ_GPIO_FILTER_SHIFT    10U
+#define RZ_GPIO_FILNUM_SHIFT    1U
+#define RZ_GPIO_FILCLKSEL_SHIFT 3U
+#define RZ_GPIO_FILTER_SET(fillonoff, filnum, filclksel)                                           \
+	(((fillonoff) | ((filnum) << RZ_GPIO_FILNUM_SHIFT) |                                       \
+	  ((filclksel) << RZ_GPIO_FILCLKSEL_SHIFT))                                                \
+	 << RZ_GPIO_FILTER_SHIFT)
 
 /*******************************************************************************/
 
diff --git a/include/zephyr/dt-bindings/gpio/renesas-rztn-gpio.h b/include/zephyr/dt-bindings/gpio/renesas-rztn-gpio.h
new file mode 100644
index 0000000000000..22d4d3ea30199
--- /dev/null
+++ b/include/zephyr/dt-bindings/gpio/renesas-rztn-gpio.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_RENESAS_RZTN_GPIO_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_RENESAS_RZTN_GPIO_H_
+
+/*********************************RZTN*****************************************/
+
+/**
+ * @brief RZTN specific GPIO Flags
+ * The pin driving ability flags are encoded in the 8 upper bits of @ref gpio_dt_flags_t as
+ * follows:
+ * - Bit 9..8: Driving ability control
+ * - Bit 12: Schmitt trigger control
+ * - Bit 13: Slew rate control
+ * Example:
+ * Driving ability control: Middle
+ * Schmitt trigger control: Enabled
+ * Slew rate control: Slow
+ * gpio-consumer {
+ *	out-gpios = <&port8 2 (GPIO_PULL_UP | RZTN_GPIO_CFG_SET(1, 1, 0))>;
+ * };
+ */
+
+/* GPIO DRCTL register */
+#define RZTN_GPIO_DRCTL_SHIFT        8U
+#define RZTN_GPIO_SCHMITT_TRIG_SHIFT 4U
+#define RZTN_GPIO_SLEW_RATE_SHIFT    5U
+#define RZTN_GPIO_DRCTL_SET(drive_ability, schmitt_trig, slew_rate)                                \
+	(((drive_ability) | ((schmitt_trig) << RZTN_GPIO_SCHMITT_TRIG_SHIFT) |                     \
+	  ((slew_rate) << RZTN_GPIO_SLEW_RATE_SHIFT))                                              \
+	 << RZTN_GPIO_DRCTL_SHIFT)
+
+/*******************************************************************************/
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_RENESAS_RZTN_GPIO_H_ */
diff --git a/include/zephyr/dt-bindings/input/stm32-tsc-defines.h b/include/zephyr/dt-bindings/input/stm32-tsc-defines.h
new file mode 100644
index 0000000000000..5153e985c9570
--- /dev/null
+++ b/include/zephyr/dt-bindings/input/stm32-tsc-defines.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_STM32_TSC_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_STM32_TSC_H_
+
+#define TSC_IO1 0x1UL
+#define TSC_IO2 0x2UL
+#define TSC_IO3 0x4UL
+#define TSC_IO4 0x8UL
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_STM32_TSC_H_ */
diff --git a/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c2-intmux.h b/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c2-intmux.h
index 5f4cd793f181a..cf0e9c5eee510 100644
--- a/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c2-intmux.h
+++ b/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c2-intmux.h
@@ -51,11 +51,8 @@
 #define CORE0_PIF_PMS_SIZE_INTR_SOURCE         41
 #define CACHE_CORE0_ACS_INTR_SOURCE            42
 
-/* RISC-V supports priority values from 1 (lowest) to 15.
- * As interrupt controller for Xtensa and RISC-V is shared, this is
- * set to an intermediate and compatible value.
- */
-#define IRQ_DEFAULT_PRIORITY	3
+/* Zero will allocate low/medium levels of priority (ESP_INTR_FLAG_LOWMED) */
+#define IRQ_DEFAULT_PRIORITY	0
 
 #define ESP_INTR_FLAG_SHARED	(1<<8)	/* Interrupt can be shared between ISRs */
 
diff --git a/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c3-intmux.h b/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c3-intmux.h
index f6059000505ce..4f4df11455d4c 100644
--- a/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c3-intmux.h
+++ b/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c3-intmux.h
@@ -70,11 +70,8 @@
 #define BAK_PMS_VIOLATE_INTR_SOURCE         60
 #define CACHE_CORE0_ACS_INTR_SOURCE         61
 
-/* RISC-V supports priority values from 1 (lowest) to 15.
- * As interrupt controller for Xtensa and RISC-V is shared, this is
- * set to an intermediate and compatible value.
- */
-#define IRQ_DEFAULT_PRIORITY	3
+/* Zero will allocate low/medium levels of priority (ESP_INTR_FLAG_LOWMED) */
+#define IRQ_DEFAULT_PRIORITY	0
 
 #define ESP_INTR_FLAG_SHARED	(1<<8)	/* Interrupt can be shared between ISRs */
 
diff --git a/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c6-intmux.h b/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c6-intmux.h
index 24b555040165a..fc89526d7bd85 100644
--- a/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c6-intmux.h
+++ b/include/zephyr/dt-bindings/interrupt-controller/esp-esp32c6-intmux.h
@@ -86,11 +86,8 @@
 #define ECC_INTR_SOURCE                    76  /* interrupt of ECC accelerator, level*/
 #define MAX_INTR_SOURCE                    77
 
-/* RISC-V supports priority values from 1 (lowest) to 15.
- * As interrupt controller for Xtensa and RISC-V is shared, this is
- * set to an intermediate and compatible value.
- */
-#define IRQ_DEFAULT_PRIORITY	3
+/* Zero will allocate low/medium levels of priority (ESP_INTR_FLAG_LOWMED) */
+#define IRQ_DEFAULT_PRIORITY	0
 
 #define ESP_INTR_FLAG_SHARED	(1<<8)	/* Interrupt can be shared between ISRs */
 
diff --git a/include/zephyr/dt-bindings/interrupt-controller/esp-xtensa-intmux.h b/include/zephyr/dt-bindings/interrupt-controller/esp-xtensa-intmux.h
index 32194e69a4832..4d644af20bbca 100644
--- a/include/zephyr/dt-bindings/interrupt-controller/esp-xtensa-intmux.h
+++ b/include/zephyr/dt-bindings/interrupt-controller/esp-xtensa-intmux.h
@@ -79,9 +79,7 @@
 #define CACHE_IA_INTR_SOURCE                68  /* Cache Invalid Access, LEVEL */
 #define MAX_INTR_SOURCE                     69  /* total number of interrupt sources */
 
-/* For Xtensa architecture, zero will allocate low/medium
- * levels of priority (ESP_INTR_FLAG_LOWMED)
- */
+/* Zero will allocate low/medium levels of priority (ESP_INTR_FLAG_LOWMED) */
 #define IRQ_DEFAULT_PRIORITY	0
 
 #define ESP_INTR_FLAG_SHARED	(1<<8)	/* Interrupt can be shared between ISRs */
diff --git a/include/zephyr/dt-bindings/interrupt-controller/esp32s2-xtensa-intmux.h b/include/zephyr/dt-bindings/interrupt-controller/esp32s2-xtensa-intmux.h
index 383f9a62306ed..34bb3429cbb97 100644
--- a/include/zephyr/dt-bindings/interrupt-controller/esp32s2-xtensa-intmux.h
+++ b/include/zephyr/dt-bindings/interrupt-controller/esp32s2-xtensa-intmux.h
@@ -106,9 +106,7 @@
 #define ICACHE_SYNC_INTR_SOURCE             94  /* instruction cache sync done, level */
 #define MAX_INTR_SOURCE                     95  /* total number of interrupt sources */
 
-/* For Xtensa architecture, zero will allocate low/medium
- * levels of priority (ESP_INTR_FLAG_LOWMED)
- */
+/* Zero will allocate low/medium levels of priority (ESP_INTR_FLAG_LOWMED) */
 #define IRQ_DEFAULT_PRIORITY	0
 
 #define ESP_INTR_FLAG_SHARED	(1<<8)	/* Interrupt can be shared between ISRs */
diff --git a/include/zephyr/dt-bindings/interrupt-controller/esp32s3-xtensa-intmux.h b/include/zephyr/dt-bindings/interrupt-controller/esp32s3-xtensa-intmux.h
index 87c690606f609..ae6f7760e58bf 100644
--- a/include/zephyr/dt-bindings/interrupt-controller/esp32s3-xtensa-intmux.h
+++ b/include/zephyr/dt-bindings/interrupt-controller/esp32s3-xtensa-intmux.h
@@ -104,9 +104,7 @@
 #define DMA_EXTMEM_REJECT_SOURCE              98
 #define MAX_INTR_SOURCE                       99 /* number of interrupt sources */
 
-/* For Xtensa architecture, zero will allocate low/medium
- * levels of priority (ESP_INTR_FLAG_LOWMED)
- */
+/* Zero will allocate low/medium levels of priority (ESP_INTR_FLAG_LOWMED) */
 #define IRQ_DEFAULT_PRIORITY	0
 
 #define ESP_INTR_FLAG_SHARED	(1<<8)	/* Interrupt can be shared between ISRs */
diff --git a/include/zephyr/dt-bindings/interrupt-controller/ite-it51xxx-intc.h b/include/zephyr/dt-bindings/interrupt-controller/ite-it51xxx-intc.h
new file mode 100644
index 0000000000000..c6e2c7c8f7868
--- /dev/null
+++ b/include/zephyr/dt-bindings/interrupt-controller/ite-it51xxx-intc.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_ITE_INTC_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_ITE_INTC_H_
+
+#define IRQ_TYPE_NONE         0
+#define IRQ_TYPE_EDGE_RISING  1
+#define IRQ_TYPE_EDGE_FALLING 2
+#define IRQ_TYPE_EDGE_BOTH    (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING)
+#define IRQ_TYPE_LEVEL_HIGH   4
+#define IRQ_TYPE_LEVEL_LOW    8
+
+/* IRQ numbers of WUC */
+/* Group 0 of INTC */
+#define IT51XXX_IRQ_WU20       1
+#define IT51XXX_IRQ_KBC_OBE    2
+#define IT51XXX_IRQ_SMB_D      4
+#define IT51XXX_IRQ_WKINTD     5
+#define IT51XXX_IRQ_WU23       6
+/* Group 1 */
+#define IT51XXX_IRQ_SMB_A      9
+#define IT51XXX_IRQ_SMB_B      10
+#define IT51XXX_IRQ_WU26       12
+#define IT51XXX_IRQ_WKINTC     13
+#define IT51XXX_IRQ_WU25       14
+/* Group 2 */
+#define IT51XXX_IRQ_SMB_C      16
+#define IT51XXX_IRQ_WU24       17
+#define IT51XXX_IRQ_WU22       21
+/* Group 3 */
+#define IT51XXX_IRQ_KBC_IBF    24
+#define IT51XXX_IRQ_PMC1_IBF   25
+#define IT51XXX_IRQ_PMC2_IBF   27
+#define IT51XXX_IRQ_TIMER1     30
+#define IT51XXX_IRQ_WU21       31
+/* Group 5 */
+#define IT51XXX_IRQ_WU50       40
+#define IT51XXX_IRQ_WU51       41
+#define IT51XXX_IRQ_WU52       42
+#define IT51XXX_IRQ_WU53       43
+#define IT51XXX_IRQ_WU54       44
+#define IT51XXX_IRQ_WU55       45
+#define IT51XXX_IRQ_WU56       46
+#define IT51XXX_IRQ_WU57       47
+/* Group 6 */
+#define IT51XXX_IRQ_WU60       48
+#define IT51XXX_IRQ_WU61       49
+#define IT51XXX_IRQ_WU62       50
+#define IT51XXX_IRQ_WU63       51
+#define IT51XXX_IRQ_WU64       52
+#define IT51XXX_IRQ_WU65       53
+#define IT51XXX_IRQ_WU66       54
+#define IT51XXX_IRQ_WU67       55
+/* Group 7 */
+#define IT51XXX_IRQ_TIMER2     58
+/* Group 9 */
+#define IT51XXX_IRQ_WU70       72
+#define IT51XXX_IRQ_WU71       73
+#define IT51XXX_IRQ_WU72       74
+#define IT51XXX_IRQ_WU73       75
+#define IT51XXX_IRQ_WU74       76
+#define IT51XXX_IRQ_WU75       77
+#define IT51XXX_IRQ_WU76       78
+#define IT51XXX_IRQ_WU77       79
+/* Group 10 */
+#define IT51XXX_IRQ_WU88       85
+#define IT51XXX_IRQ_WU89       86
+#define IT51XXX_IRQ_WU90       87
+/* Group 11 */
+#define IT51XXX_IRQ_WU80       88
+#define IT51XXX_IRQ_WU81       89
+#define IT51XXX_IRQ_WU82       90
+#define IT51XXX_IRQ_WU83       91
+#define IT51XXX_IRQ_WU84       92
+#define IT51XXX_IRQ_WU85       93
+#define IT51XXX_IRQ_WU86       94
+#define IT51XXX_IRQ_WU87       95
+/* Group 12 */
+#define IT51XXX_IRQ_WU91       96
+#define IT51XXX_IRQ_WU92       97
+#define IT51XXX_IRQ_WU93       98
+#define IT51XXX_IRQ_WU95       100
+#define IT51XXX_IRQ_WU96       101
+#define IT51XXX_IRQ_WU97       102
+#define IT51XXX_IRQ_WU98       103
+/* Group 13 */
+#define IT51XXX_IRQ_WU99       104
+#define IT51XXX_IRQ_WU100      105
+#define IT51XXX_IRQ_WU101      106
+#define IT51XXX_IRQ_WU102      107
+#define IT51XXX_IRQ_WU103      108
+#define IT51XXX_IRQ_WU104      109
+#define IT51XXX_IRQ_WU105      110
+#define IT51XXX_IRQ_WU106      111
+/* Group 14 */
+#define IT51XXX_IRQ_WU107      112
+#define IT51XXX_IRQ_WU108      113
+#define IT51XXX_IRQ_WU109      114
+#define IT51XXX_IRQ_WU110      115
+#define IT51XXX_IRQ_WU111      116
+#define IT51XXX_IRQ_WU112      117
+#define IT51XXX_IRQ_WU113      118
+#define IT51XXX_IRQ_WU114      119
+/* Group 15 */
+#define IT51XXX_IRQ_WU115      120
+#define IT51XXX_IRQ_WU116      121
+#define IT51XXX_IRQ_WU117      122
+#define IT51XXX_IRQ_WU118      123
+#define IT51XXX_IRQ_WU119      124
+#define IT51XXX_IRQ_WU120      125
+#define IT51XXX_IRQ_WU121      126
+#define IT51XXX_IRQ_WU122      127
+/* Group 16 */
+#define IT51XXX_IRQ_WU128      128
+#define IT51XXX_IRQ_WU129      129
+#define IT51XXX_IRQ_WU131      131
+#define IT51XXX_IRQ_WU132      132
+#define IT51XXX_IRQ_WU133      133
+#define IT51XXX_IRQ_WU134      134
+#define IT51XXX_IRQ_WU135      135
+/* Group 17 */
+#define IT51XXX_IRQ_WU136      136
+#define IT51XXX_IRQ_WU137      137
+#define IT51XXX_IRQ_WU138      138
+#define IT51XXX_IRQ_WU139      139
+#define IT51XXX_IRQ_WU140      140
+#define IT51XXX_IRQ_WU141      141
+#define IT51XXX_IRQ_WU142      142
+/* Group 18 */
+#define IT51XXX_IRQ_WU127      148
+#define IT51XXX_IRQ_V_CMP      151
+/* Group 19 */
+#define IT51XXX_IRQ_PECI       152
+#define IT51XXX_IRQ_ESPI       153
+#define IT51XXX_IRQ_ESPI_VW    154
+#define IT51XXX_IRQ_PCH_P80    155
+#define IT51XXX_IRQ_TIMER3     157
+#define IT51XXX_IRQ_PLL_CHANGE 159
+/* Group 20 */
+#define IT51XXX_IRQ_SMB_E      160
+#define IT51XXX_IRQ_SMB_F      161
+#define IT51XXX_IRQ_WU40       163
+#define IT51XXX_IRQ_WU45       166
+/* Group 21 */
+#define IT51XXX_IRQ_WU46       168
+#define IT51XXX_IRQ_WU144      170
+#define IT51XXX_IRQ_WU145      171
+#define IT51XXX_IRQ_WU146      172
+#define IT51XXX_IRQ_WU147      173
+#define IT51XXX_IRQ_TIMER4     175
+/* Group 22 */
+#define IT51XXX_IRQ_WU148      176
+#define IT51XXX_IRQ_WU149      177
+#define IT51XXX_IRQ_WU150      178
+#define IT51XXX_IRQ_WU151      179
+#define IT51XXX_IRQ_I3C_M0     180
+#define IT51XXX_IRQ_I3C_M1     181
+#define IT51XXX_IRQ_I3C_S0     182
+#define IT51XXX_IRQ_I3C_S1     183
+/* Group 25 */
+#define IT51XXX_IRQ_SMB_SC     203
+#define IT51XXX_IRQ_SMB_SB     204
+#define IT51XXX_IRQ_SMB_SA     205
+#define IT51XXX_IRQ_TIMER1_DW  207
+/* Group 26 */
+#define IT51XXX_IRQ_TIMER2_DW  208
+#define IT51XXX_IRQ_TIMER3_DW  209
+#define IT51XXX_IRQ_TIMER4_DW  210
+#define IT51XXX_IRQ_TIMER5_DW  211
+#define IT51XXX_IRQ_TIMER6_DW  212
+#define IT51XXX_IRQ_TIMER7_DW  213
+#define IT51XXX_IRQ_TIMER8_DW  214
+/* Group 27 */
+#define IT51XXX_IRQ_PWM_TACH0  219
+#define IT51XXX_IRQ_PWM_TACH1  220
+#define IT51XXX_IRQ_PWM_TACH2  221
+#define IT51XXX_IRQ_SMB_G      222
+#define IT51XXX_IRQ_SMB_H      223
+/* Group 28 */
+#define IT51XXX_IRQ_SMB_I      224
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_ITE_INTC_H_ */
diff --git a/include/zephyr/dt-bindings/interrupt-controller/ite-it51xxx-wuc.h b/include/zephyr/dt-bindings/interrupt-controller/ite-it51xxx-wuc.h
new file mode 100644
index 0000000000000..99e2b9708c361
--- /dev/null
+++ b/include/zephyr/dt-bindings/interrupt-controller/ite-it51xxx-wuc.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_IT51XXX_WUC_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_IT51XXX_WUC_H_
+
+/** WUC reserved register of reg property */
+#define IT51XXX_WUC_UNUSED_REG 0
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_IT51XXX_WUC_H_ */
diff --git a/include/zephyr/dt-bindings/interrupt-controller/renesas-ra-icu.h b/include/zephyr/dt-bindings/interrupt-controller/renesas-ra-icu.h
deleted file mode 100644
index 4df6bfeae52ef..0000000000000
--- a/include/zephyr/dt-bindings/interrupt-controller/renesas-ra-icu.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_DT_BINDINGS_INTERRUPT_CONTROLLER_RENESAS_RA_ICU_H_
-#define ZEPHYR_DT_BINDINGS_INTERRUPT_CONTROLLER_RENESAS_RA_ICU_H_
-
-#define RA_ICU_IRQ_UNSPECIFIED (-1)
-
-#define RA_ICU_PORT_IRQ0       (1 << 8)
-#define RA_ICU_PORT_IRQ1       (2 << 8)
-#define RA_ICU_PORT_IRQ2       (3 << 8)
-#define RA_ICU_PORT_IRQ3       (4 << 8)
-#define RA_ICU_PORT_IRQ4       (5 << 8)
-#define RA_ICU_PORT_IRQ5       (6 << 8)
-#define RA_ICU_PORT_IRQ6       (7 << 8)
-#define RA_ICU_PORT_IRQ7       (8 << 8)
-#define RA_ICU_PORT_IRQ8       (9 << 8)
-#define RA_ICU_PORT_IRQ9       (10 << 8)
-#define RA_ICU_PORT_IRQ10      (11 << 8)
-#define RA_ICU_PORT_IRQ11      (12 << 8)
-#define RA_ICU_PORT_IRQ12      (13 << 8)
-#define RA_ICU_PORT_IRQ14      (15 << 8)
-#define RA_ICU_PORT_IRQ15      (16 << 8)
-#define RA_ICU_DMAC0_INT       (17 << 8)
-#define RA_ICU_DMAC1_INT       (18 << 8)
-#define RA_ICU_DMAC2_INT       (19 << 8)
-#define RA_ICU_DMAC3_INT       (20 << 8)
-#define RA_ICU_DTC_COMPLETE    (21 << 8)
-#define RA_ICU_ICU_SNZCANCEL   (23 << 8)
-#define RA_ICU_FCU_FRDYI       (24 << 8)
-#define RA_ICU_LVD_LVD1        (25 << 8)
-#define RA_ICU_LVD_LVD2        (26 << 8)
-#define RA_ICU_VBATT_LVD       (27 << 8)
-#define RA_ICU_MOSC_STOP       (28 << 8)
-#define RA_ICU_SYSTEM_SNZREQ   (29 << 8)
-#define RA_ICU_AGT0_AGTI       (30 << 8)
-#define RA_ICU_AGT0_AGTCMAI    (31 << 8)
-#define RA_ICU_AGT0_AGTCMBI    (32 << 8)
-#define RA_ICU_AGT1_AGTI       (33 << 8)
-#define RA_ICU_AGT1_AGTCMAI    (34 << 8)
-#define RA_ICU_AGT1_AGTCMBI    (35 << 8)
-#define RA_ICU_IWDT_NMIUNDF    (36 << 8)
-#define RA_ICU_WDT_NMIUNDF     (37 << 8)
-#define RA_ICU_RTC_ALM         (38 << 8)
-#define RA_ICU_RTC_PRD         (39 << 8)
-#define RA_ICU_RTC_CUP         (40 << 8)
-#define RA_ICU_ADC140_ADI      (41 << 8)
-#define RA_ICU_ADC140_GBADI    (42 << 8)
-#define RA_ICU_ADC140_CMPAI    (43 << 8)
-#define RA_ICU_ADC140_CMPBI    (44 << 8)
-#define RA_ICU_ADC140_WCMPM    (45 << 8)
-#define RA_ICU_ADC140_WCMPUM   (46 << 8)
-#define RA_ICU_ACMP_LP0        (47 << 8)
-#define RA_ICU_ACMP_LP1        (48 << 8)
-#define RA_ICU_USBFS_D0FIFO    (49 << 8)
-#define RA_ICU_USBFS_D1FIFO    (50 << 8)
-#define RA_ICU_USBFS_USBI      (51 << 8)
-#define RA_ICU_USBFS_USBR      (52 << 8)
-#define RA_ICU_IIC0_RXI        (53 << 8)
-#define RA_ICU_IIC0_TXI        (54 << 8)
-#define RA_ICU_IIC0_TEI        (55 << 8)
-#define RA_ICU_IIC0_EEI        (56 << 8)
-#define RA_ICU_IIC0_WUI        (57 << 8)
-#define RA_ICU_IIC1_RXI        (58 << 8)
-#define RA_ICU_IIC1_TXI        (59 << 8)
-#define RA_ICU_IIC1_TEI        (60 << 8)
-#define RA_ICU_IIC1_EEI        (61 << 8)
-#define RA_ICU_SSIE0_SSITXI    (62 << 8)
-#define RA_ICU_SSIE0_SSIRXI    (63 << 8)
-
-#define RA_ICU_SSIE0_SSIF      (65 << 8)
-#define RA_ICU_CTSU_CTSUWR     (66 << 8)
-#define RA_ICU_CTSU_CTSURD     (67 << 8)
-#define RA_ICU_CTSU_CTSUFN     (68 << 8)
-#define RA_ICU_KEY_INTKR       (69 << 8)
-#define RA_ICU_DOC_DOPCI       (70 << 8)
-#define RA_ICU_CAC_FERRI       (71 << 8)
-#define RA_ICU_CAC_MENDI       (72 << 8)
-#define RA_ICU_CAC_OVFI        (73 << 8)
-#define RA_ICU_CAN0_ERS        (74 << 8)
-#define RA_ICU_CAN0_RXF        (75 << 8)
-#define RA_ICU_CAN0_TXF        (76 << 8)
-#define RA_ICU_CAN0_RXM        (77 << 8)
-#define RA_ICU_CAN0_TXM        (78 << 8)
-#define RA_ICU_IOPORT_GROUP1   (70 << 8)
-#define RA_ICU_IOPORT_GROUP2   (80 << 8)
-#define RA_ICU_IOPORT_GROUP3   (81 << 8)
-#define RA_ICU_IOPORT_GROUP4   (82 << 8)
-#define RA_ICU_ELC_SWEVT0      (83 << 8)
-#define RA_ICU_ELC_SWEVT1      (84 << 8)
-#define RA_ICU_POEG_GROUP0     (85 << 8)
-#define RA_ICU_POEG_GROUP1     (86 << 8)
-#define RA_ICU_GPT0_CCMPA      (87 << 8)
-#define RA_ICU_GPT0_CCMPB      (88 << 8)
-#define RA_ICU_GPT0_CMPC       (89 << 8)
-#define RA_ICU_GPT0_CMPD       (90 << 8)
-#define RA_ICU_GPT0_CMPE       (91 << 8)
-#define RA_ICU_GPT0_CMPF       (92 << 8)
-#define RA_ICU_GPT0_OVF        (93 << 8)
-#define RA_ICU_GPT0_UDF        (94 << 8)
-#define RA_ICU_GPT1_CCMPA      (95 << 8)
-#define RA_ICU_GPT1_CCMPB      (96 << 8)
-#define RA_ICU_GPT1_CMPC       (97 << 8)
-#define RA_ICU_GPT1_CMPD       (98 << 8)
-#define RA_ICU_GPT1_CMPE       (99 << 8)
-#define RA_ICU_GPT1_CMPF       (100 << 8)
-#define RA_ICU_GPT1_OVF        (101 << 8)
-#define RA_ICU_GPT1_UDF        (102 << 8)
-#define RA_ICU_GPT2_CCMPA      (103 << 8)
-#define RA_ICU_GPT2_CCMPB      (104 << 8)
-#define RA_ICU_GPT2_CMPC       (105 << 8)
-#define RA_ICU_GPT2_CMPD       (106 << 8)
-#define RA_ICU_GPT2_CMPE       (107 << 8)
-#define RA_ICU_GPT2_CMPF       (108 << 8)
-#define RA_ICU_GPT2_OVF        (109 << 8)
-#define RA_ICU_GPT2_UDF        (110 << 8)
-#define RA_ICU_GPT3_CCMPA      (111 << 8)
-#define RA_ICU_GPT3_CCMPB      (112 << 8)
-#define RA_ICU_GPT3_CMPC       (113 << 8)
-#define RA_ICU_GPT3_CMPD       (114 << 8)
-#define RA_ICU_GPT3_CMPE       (115 << 8)
-#define RA_ICU_GPT3_CMPF       (116 << 8)
-#define RA_ICU_GPT3_OVF        (117 << 8)
-#define RA_ICU_GPT3_UDF        (118 << 8)
-#define RA_ICU_GPT4_CCMPA      (119 << 8)
-#define RA_ICU_GPT4_CCMPB      (120 << 8)
-#define RA_ICU_GPT4_CMPC       (121 << 8)
-#define RA_ICU_GPT4_CMPD       (122 << 8)
-#define RA_ICU_GPT4_CMPE       (123 << 8)
-#define RA_ICU_GPT4_CMPF       (124 << 8)
-#define RA_ICU_GPT4_OVF        (125 << 8)
-#define RA_ICU_GPT4_UDF        (126 << 8)
-#define RA_ICU_GPT5_CCMPA      (127 << 8)
-#define RA_ICU_GPT5_CCMPB      (128 << 8)
-#define RA_ICU_GPT5_CMPC       (129 << 8)
-#define RA_ICU_GPT5_CMPD       (130 << 8)
-#define RA_ICU_GPT5_CMPE       (131 << 8)
-#define RA_ICU_GPT5_CMPF       (132 << 8)
-#define RA_ICU_GPT5_OVF        (133 << 8)
-#define RA_ICU_GPT5_UDF        (134 << 8)
-#define RA_ICU_GPT6_CCMPA      (135 << 8)
-#define RA_ICU_GPT6_CCMPB      (136 << 8)
-#define RA_ICU_GPT6_CMPC       (137 << 8)
-#define RA_ICU_GPT6_CMPD       (138 << 8)
-#define RA_ICU_GPT6_CMPE       (139 << 8)
-#define RA_ICU_GPT6_CMPF       (140 << 8)
-#define RA_ICU_GPT6_OVF        (141 << 8)
-#define RA_ICU_GPT6_UDF        (142 << 8)
-#define RA_ICU_GPT7_CCMPA      (143 << 8)
-#define RA_ICU_GPT7_CCMPB      (144 << 8)
-#define RA_ICU_GPT7_CMPC       (145 << 8)
-#define RA_ICU_GPT7_CMPD       (146 << 8)
-#define RA_ICU_GPT7_CMPE       (147 << 8)
-#define RA_ICU_GPT7_CMPF       (148 << 8)
-#define RA_ICU_GPT7_OVF        (149 << 8)
-#define RA_ICU_GPT7_UDF        (150 << 8)
-#define RA_ICU_GPT_UVWEDGE     (151 << 8)
-#define RA_ICU_SCI0_RXI        (152 << 8)
-#define RA_ICU_SCI0_TXI        (153 << 8)
-#define RA_ICU_SCI0_TEI        (154 << 8)
-#define RA_ICU_SCI0_ERI        (155 << 8)
-#define RA_ICU_SCI0_AM         (156 << 8)
-#define RA_ICU_SCI0_RXI_OR_ERI (157 << 8)
-#define RA_ICU_SCI1_RXI        (158 << 8)
-#define RA_ICU_SCI1_TXI        (159 << 8)
-#define RA_ICU_SCI1_TEI        (160 << 8)
-#define RA_ICU_SCI1_ERI        (161 << 8)
-#define RA_ICU_SCI1_AM         (162 << 8)
-#define RA_ICU_SCI2_RXI        (163 << 8)
-#define RA_ICU_SCI2_TXI        (164 << 8)
-#define RA_ICU_SCI2_TEI        (165 << 8)
-#define RA_ICU_SCI2_ERI        (166 << 8)
-#define RA_ICU_SCI2_AM         (167 << 8)
-#define RA_ICU_SCI9_RXI        (168 << 8)
-#define RA_ICU_SCI9_TXI        (169 << 8)
-#define RA_ICU_SCI9_TEI        (170 << 8)
-#define RA_ICU_SCI9_ERI        (171 << 8)
-#define RA_ICU_SCI9_AM         (172 << 8)
-#define RA_ICU_SPI0_SPRI       (173 << 8)
-#define RA_ICU_SPI0_SPTI       (174 << 8)
-#define RA_ICU_SPI0_SPII       (175 << 8)
-#define RA_ICU_SPI0_SPEI       (176 << 8)
-#define RA_ICU_SPI0_SPTEND     (177 << 8)
-#define RA_ICU_SPI1_SPRI       (178 << 8)
-#define RA_ICU_SPI1_SPTI       (179 << 8)
-#define RA_ICU_SPI1_SPII       (180 << 8)
-#define RA_ICU_SPI1_SPEI       (181 << 8)
-#define RA_ICU_SPI1_SPTEND     (182 << 8)
-
-#endif /* ZEPHYR_DT_BINDINGS_INTERRUPT_CONTROLLER_RENESAS_RA_ICU_H_ */
diff --git a/include/zephyr/dt-bindings/memory-attr/memory-attr-arm.h b/include/zephyr/dt-bindings/memory-attr/memory-attr-arm.h
index 473c43fc78196..607907d6d5def 100644
--- a/include/zephyr/dt-bindings/memory-attr/memory-attr-arm.h
+++ b/include/zephyr/dt-bindings/memory-attr/memory-attr-arm.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2023 Carlo Caione <ccaione@baylibre.com>
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -18,23 +19,25 @@
  * This is legacy and it should NOT be extended further. If new MPU region
  * types must be added, these must rely on the generic memory attributes.
  */
-#define DT_MEM_ARM_MASK			DT_MEM_ARCH_ATTR_MASK
-#define DT_MEM_ARM_GET(x)		((x) & DT_MEM_ARM_MASK)
-#define DT_MEM_ARM(x)			((x) << DT_MEM_ARCH_ATTR_SHIFT)
+#define DT_MEM_ARM_MASK   DT_MEM_ARCH_ATTR_MASK
+#define DT_MEM_ARM_GET(x) ((x) & DT_MEM_ARM_MASK)
+#define DT_MEM_ARM(x)     ((x) << DT_MEM_ARCH_ATTR_SHIFT)
 
-#define  ATTR_MPU_RAM			BIT(0)
-#define  ATTR_MPU_RAM_NOCACHE		BIT(1)
-#define  ATTR_MPU_FLASH			BIT(2)
-#define  ATTR_MPU_PPB			BIT(3)
-#define  ATTR_MPU_IO			BIT(4)
-#define  ATTR_MPU_EXTMEM		BIT(5)
+#define ATTR_MPU_RAM         BIT(0)
+#define ATTR_MPU_RAM_NOCACHE BIT(1)
+#define ATTR_MPU_FLASH       BIT(2)
+#define ATTR_MPU_PPB         BIT(3)
+#define ATTR_MPU_IO          BIT(4)
+#define ATTR_MPU_EXTMEM      BIT(5)
+#define ATTR_MPU_RAM_PXN     BIT(6)
 
-#define DT_MEM_ARM_MPU_RAM		DT_MEM_ARM(ATTR_MPU_RAM)
-#define DT_MEM_ARM_MPU_RAM_NOCACHE	DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)
-#define DT_MEM_ARM_MPU_FLASH		DT_MEM_ARM(ATTR_MPU_FLASH)
-#define DT_MEM_ARM_MPU_PPB		DT_MEM_ARM(ATTR_MPU_PPB)
-#define DT_MEM_ARM_MPU_IO		DT_MEM_ARM(ATTR_MPU_IO)
-#define DT_MEM_ARM_MPU_EXTMEM		DT_MEM_ARM(ATTR_MPU_EXTMEM)
-#define DT_MEM_ARM_MPU_UNKNOWN		DT_MEM_ARCH_ATTR_UNKNOWN
+#define DT_MEM_ARM_MPU_RAM         DT_MEM_ARM(ATTR_MPU_RAM)
+#define DT_MEM_ARM_MPU_RAM_NOCACHE DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)
+#define DT_MEM_ARM_MPU_FLASH       DT_MEM_ARM(ATTR_MPU_FLASH)
+#define DT_MEM_ARM_MPU_PPB         DT_MEM_ARM(ATTR_MPU_PPB)
+#define DT_MEM_ARM_MPU_IO          DT_MEM_ARM(ATTR_MPU_IO)
+#define DT_MEM_ARM_MPU_EXTMEM      DT_MEM_ARM(ATTR_MPU_EXTMEM)
+#define DT_MEM_ARM_MPU_RAM_PXN     DT_MEM_ARM(ATTR_MPU_RAM_PXN)
+#define DT_MEM_ARM_MPU_UNKNOWN     DT_MEM_ARCH_ATTR_UNKNOWN
 
 #endif /* ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_ARM_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/arm-mps2-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/arm-mps2-pinctrl.h
new file mode 100644
index 0000000000000..dfb1dc9dfec48
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/arm-mps2-pinctrl.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define MPS2_ALT_FUNC_POS 0
+#define MPS2_ALT_FUNC_MASK 0x3
+
+#define MPS2_EXP_NUM_POS 2
+#define MPS2_EXP_NUM_MASK 0x3F
+
+#define MPS2_PINCTRL_FUNC_UART 0
+#define MPS2_PINCTRL_FUNC_GPIO 1
+#define MPS2_PINCTRL_FUNC_I2C 2
+#define MPS2_PINCTRL_FUNC_SPI 3
+
+
+#define MPS2_PINMUX(alt_func, exp_num) (exp_num << MPS2_EXP_NUM_POS | \
+	alt_func << MPS2_ALT_FUNC_POS)
+
+
+
+/*
+ * This is the mapping from the ARM MPS2 Board pins to GPIO
+ * controllers.
+ *
+ * D0 : EXT_0
+ * D1 : EXT_4
+ * D2 : EXT_2
+ * D3 : EXT_3
+ * D4 : EXT_1
+ * D5 : EXT_6
+ * D6 : EXT_7
+ * D7 : EXT_8
+ * D8 : EXT_9
+ * D9 : EXT_10
+ * D10 : EXT_12
+ * D11 : EXT_13
+ * D12 : EXT_14
+ * D13 : EXT_11
+ * D14 : EXT_15
+ * D15 : EXT_5
+ * D16 : EXT_16
+ * D17 : EXT_17
+ * D18 : EXT_18
+ * D19 : EXT_19
+ * D20 : EXT_20
+ * D21 : EXT_21
+ * D22 : EXT_22
+ * D23 : EXT_23
+ * D24 : EXT_24
+ * D25 : EXT_25
+ * D26 : EXT_26
+ * D27 : EXT_30
+ * D28 : EXT_28
+ * D29 : EXT_29
+ * D30 : EXT_27
+ * D31 : EXT_32
+ * D32 : EXT_33
+ * D33 : EXT_34
+ * D34 : EXT_35
+ * D35 : EXT_36
+ * D36 : EXT_38
+ * D37 : EXT_39
+ * D38 : EXT_40
+ * D39 : EXT_44
+ * D40 : EXT_41
+ * D41 : EXT_31
+ * D42 : EXT_37
+ * D43 : EXT_42
+ * D44 : EXT_43
+ * D45 : EXT_45
+ * D46 : EXT_46
+ * D47 : EXT_47
+ * D48 : EXT_48
+ * D49 : EXT_49
+ * D50 : EXT_50
+ * D51 : EXT_51
+ *
+ * UART_3_RX : D0
+ * UART_3_TX : D1
+ * SPI_3_CS : D10
+ * SPI_3_MOSI : D11
+ * SPI_3_MISO : D12
+ * SPI_3_SCLK : D13
+ * I2C_3_SDA : D14
+ * I2C_3_SCL : D15
+ * UART_4_RX : D26
+ * UART_4_TX : D30
+ * SPI_4_CS : D36
+ * SPI_4_MOSI : D37
+ * SPI_4_MISO : D38
+ * SPI_4_SCK : D39
+ * I2C_4_SDA : D40
+ * I2C_4_SCL : D41
+ *
+ */
+
+/* GPIO 0 */
+#define UART3_RXD_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_UART, 0)
+#define UART3_TXD_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_UART, 4)
+#define SBCON2_SCL_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_I2C, 5)
+#define SBCON2_SDA_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_I2C, 15)
+#define SPI3_SCK_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 11)
+#define SPI3_SS_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 12)
+#define SPI3_MOSI_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 13)
+#define SPI3_MISO_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 14)
+
+/* GPIO 1 */
+#define SPI2_SS_EXP  MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 16)
+#define SPI2_MISO_EXP  MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 17)
+#define SPI2_MOSI_EXP  MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 18)
+#define SPI2_SCK_EXP  MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 19)
+#define UART4_RXD_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_UART, 26)
+#define UART4_TXD_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_UART, 30)
+#define SBCON3_SCL_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_I2C, 31)
+
+/* GPIO 2 */
+#define SBCON3_SDA_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_I2C, 41)
+#define SPI4_SS_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 38)
+#define SPI4_MOSI_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 39)
+#define SPI4_MISO_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 40)
+#define SPI4_SCK_EXP MPS2_PINMUX(MPS2_PINCTRL_FUNC_SPI, 44)
diff --git a/include/zephyr/dt-bindings/pinctrl/arm-mps3-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/arm-mps3-pinctrl.h
new file mode 100644
index 0000000000000..3c873dd155f84
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/arm-mps3-pinctrl.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define MPS3_ALT_FUNC_POS 0
+#define MPS3_ALT_FUNC_MASK 0x7
+
+#define MPS3_EXP_NUM_POS 3
+#define MPS3_EXP_NUM_MASK 0x1F8
+
+#define MPS3_PINCTRL_FUNC_UART 0
+#define MPS3_PINCTRL_FUNC_GPIO 1
+#define MPS3_PINCTRL_FUNC_I2C 2
+#define MPS3_PINCTRL_FUNC_SPI 3
+#define MPS3_PINCTRL_FUNC_PMOD 4
+
+#define MPS3_PINMUX(alt_func, exp_num) (exp_num << MPS3_EXP_NUM_POS | \
+	alt_func << MPS3_ALT_FUNC_POS)
+
+/* GPIO 0 */
+#define PMOD1_IO1_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 0)
+#define PMOD1_IO0_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 1)
+#define PMOD1_SS_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 3)
+#define PMOD0_IO2_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 7)
+#define PMOD0_IO3_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 8)
+#define PMOD1_SCK_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 9)
+#define PMOD0_SS_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 10)
+#define PMOD0_IO0_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 11)
+#define PMOD0_IO1_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 12)
+#define PMOD0_SCK_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 13)
+#define PMOD1_IO3_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 14)
+#define PMOD1_IO2_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_PMOD, 15)
+
+#define UART3_RXD_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_UART, 0)
+#define UART3_TXD_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_UART, 1)
+#define SPI3_SS_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 10)
+#define SPI3_MOSI_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 11)
+#define SPI3_MISO_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 12)
+#define SPI3_SCK_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 13)
+#define SBCON2_SDA_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_I2C, 14)
+#define SBCON2_SCL_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_I2C, 15)
+
+
+/* GPIO 1 */
+#define UART4_RXD_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_UART, 16)
+#define UART4_TXD_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_UART, 17)
+#define SPI4_SS_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 26)
+#define SPI4_MOSI_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 27)
+#define SPI4_MISO_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 28)
+#define SPI4_SCK_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_SPI, 29)
+#define SBCON3_SDA_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_I2C, 30)
+#define SBCON3_SCL_EXP MPS3_PINMUX(MPS3_PINCTRL_FUNC_I2C, 31)
diff --git a/include/zephyr/dt-bindings/pinctrl/arm-v2m_beetle-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/arm-v2m_beetle-pinctrl.h
new file mode 100644
index 0000000000000..0dcf30b9f2069
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/arm-v2m_beetle-pinctrl.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define V2M_BEETLE_ALT_FUNC_POS 0
+#define V2M_BEETLE_ALT_FUNC_MASK 0x7
+
+#define V2M_BEETLE_EXP_NUM_POS 3
+#define V2M_BEETLE_EXP_NUM_MASK 0x1F8
+
+#define V2M_BEETLE_PINCTRL_FUNC_UART 0
+#define V2M_BEETLE_PINCTRL_FUNC_GPIO 1
+#define V2M_BEETLE_PINCTRL_FUNC_I2C 2
+#define V2M_BEETLE_PINCTRL_FUNC_SPI 3
+#define V2M_BEETLE_PINCTRL_FUNC_QSPI 4
+
+#define V2M_BEETLE_PINMUX(alt_func, exp_num) (exp_num << V2M_BEETLE_EXP_NUM_POS | \
+	alt_func << V2M_BEETLE_ALT_FUNC_POS)
+
+
+
+/* GPIO 0 */
+#define UART0_RXD_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_UART, 0)
+#define UART0_TXD_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_UART, 1)
+#define SPI0_SS_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 10)
+#define SPI0_MOSI_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 11)
+#define SPI0_MISO_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 12)
+#define SPI0_SCK_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 13)
+#define SBCON0_SDA_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_I2C, 14)
+#define SBCON0_SCL_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_I2C, 15)
+
+/* GPIO 1 */
+#define UART1_RXD_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_UART, 16)
+#define UART1_TXD_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_UART, 17)
+#define SPI1_SS_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 18)
+#define SPI1_MOSI_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 19)
+#define SPI1_MISO_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 20)
+#define SPI1_SCK_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_SPI, 21)
+#define SBCON1_SDA_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_I2C, 22)
+#define SBCON1_SCL_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_I2C, 23)
+#define QSPI_CS2_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_QSPI, 24)
+#define QSPI_CS1_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_QSPI, 25)
+#define QSPI_IOF0_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_QSPI, 26)
+#define QSPI_IOF1_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_QSPI, 27)
+#define QSPI_IOF2_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_QSPI, 28)
+#define QSPI_IOF3_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_QSPI, 29)
+#define QSPI_SCK_EXP V2M_BEETLE_PINMUX(V2M_BEETLE_PINCTRL_FUNC_QSPI, 30)
diff --git a/include/zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h
new file mode 100644
index 0000000000000..209381c616f3e
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2024 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __CH32V20X_V30X_PINCTRL_H__
+#define __CH32V20X_V30X_PINCTRL_H__
+
+#define CH32V20X_V30X_PINMUX_PORT_PA 0
+#define CH32V20X_V30X_PINMUX_PORT_PB 1
+#define CH32V20X_V30X_PINMUX_PORT_PC 2
+#define CH32V20X_V30X_PINMUX_PORT_PD 3
+#define CH32V20X_V30X_PINMUX_PORT_PE 4
+
+/*
+ * Defines the starting bit for the remap field.
+ */
+#define CH32V20X_V30X_PINMUX_SPI1_RM    0
+#define CH32V20X_V30X_PINMUX_I2C1_RM    1
+#define CH32V20X_V30X_PINMUX_USART1_RM  2
+#define CH32V20X_V30X_PINMUX_USART2_RM  3
+#define CH32V20X_V30X_PINMUX_USART3_RM  4
+#define CH32V20X_V30X_PINMUX_TIM1_RM    6
+#define CH32V20X_V30X_PINMUX_TIM2_RM    8
+#define CH32V20X_V30X_PINMUX_TIM3_RM    10
+#define CH32V20X_V30X_PINMUX_TIM4_RM    12
+#define CH32V20X_V30X_PINMUX_CAN1_RM    13
+#define CH32V20X_V30X_PINMUX_PD01_RM    15
+#define CH32V20X_V30X_PINMUX_TIM5CH4_RM 16
+#define CH32V20X_V30X_PINMUX_ETH_RM     21
+#define CH32V20X_V30X_PINMUX_CAN2_RM    22
+#define CH32V20X_V30X_PINMUX_RMII_RM    23
+#define CH32V20X_V30X_PINMUX_SDI_RM     24
+#define CH32V20X_V30X_PINMUX_SPI3_RM    28
+
+#define CH32V20X_V30X_PINMUX_TIM8_RM    (32 + 2)
+#define CH32V20X_V30X_PINMUX_TIM9_RM    (32 + 3)
+#define CH32V20X_V30X_PINMUX_TIM10_RM   (32 + 5)
+#define CH32V20X_V30X_PINMUX_USART4_RM  (32 + 16)
+#define CH32V20X_V30X_PINMUX_USART5_RM  (32 + 18)
+#define CH32V20X_V30X_PINMUX_USART6_RM  (32 + 20)
+#define CH32V20X_V30X_PINMUX_USART7_RM  (32 + 22)
+#define CH32V20X_V30X_PINMUX_USART8_RM  (32 + 24)
+#define CH32V20X_V30X_PINMUX_USART1_RM1 (32 + 26)
+
+/* Port number with 0-4 */
+#define CH32V20X_V30X_PINCTRL_PORT_SHIFT    0
+#define CH32V20X_V30X_PINCTRL_PORT_MASK     GENMASK(2, 0)
+/* Pin number 0-15 */
+#define CH32V20X_V30X_PINCTRL_PIN_SHIFT     3
+#define CH32V20X_V30X_PINCTRL_PIN_MASK      GENMASK(6, 3)
+/* Base remap bit 0-31 */
+#define CH32V20X_V30X_PINCTRL_RM_BASE_SHIFT 7
+#define CH32V20X_V30X_PINCTRL_RM_BASE_MASK  GENMASK(11, 7)
+/* Remap Register ID */
+#define CH32V20X_V30X_PINCTRL_PCFR_ID_SHIFT 12
+#define CH32V20X_V30X_PINCTRL_PCFR_ID_MASK  GENMASK(12, 12)
+/* Function remapping ID 0-3 */
+#define CH32V20X_V30X_PINCTRL_RM_SHIFT      13
+#define CH32V20X_V30X_PINCTRL_RM_MASK       GENMASK(14, 13)
+
+#define CH32V20X_V30X_PINMUX_DEFINE(port, pin, rm, remapping)                                      \
+	((CH32V20X_V30X_PINMUX_PORT_##port << CH32V20X_V30X_PINCTRL_PORT_SHIFT) |                  \
+	 (pin << CH32V20X_V30X_PINCTRL_PIN_SHIFT) |                                                \
+	 (CH32V20X_V30X_PINMUX_##rm##_RM << CH32V20X_V30X_PINCTRL_RM_BASE_SHIFT) |                 \
+	 (remapping << CH32V20X_V30X_PINCTRL_RM_SHIFT))
+
+/* Pin swaps.
+ * Warning: Some of those do not apply to all packages.
+ * Verify using reference manual and use CH32V20X_V30X_PINMUX_DEFINE directly if needed.
+ */
+
+#define USART1_CK_PA8_0   CH32V20X_V30X_PINMUX_DEFINE(PA, 8, USART1, 0)
+#define USART1_CK_PA8_1   CH32V20X_V30X_PINMUX_DEFINE(PA, 8, USART1, 1)
+#define USART1_CK_PA10_2  CH32V20X_V30X_PINMUX_DEFINE(PA, 10, USART1, 2)
+#define USART1_CK_PA5_3   CH32V20X_V30X_PINMUX_DEFINE(PA, 5, USART1, 3)
+#define USART1_TX_PA9_0   CH32V20X_V30X_PINMUX_DEFINE(PA, 9, USART1, 0)
+#define USART1_TX_PB6_1   CH32V20X_V30X_PINMUX_DEFINE(PB, 6, USART1, 1)
+#define USART1_TX_PB15_2  CH32V20X_V30X_PINMUX_DEFINE(PB, 15, USART1, 2)
+#define USART1_TX_PA6_3   CH32V20X_V30X_PINMUX_DEFINE(PA, 6, USART1, 3)
+#define USART1_RX_PA10_0  CH32V20X_V30X_PINMUX_DEFINE(PA, 10, USART1, 0)
+#define USART1_RX_PB7_1   CH32V20X_V30X_PINMUX_DEFINE(PB, 7, USART1, 1)
+#define USART1_RX_PA8_2   CH32V20X_V30X_PINMUX_DEFINE(PA, 8, USART1, 2)
+#define USART1_RX_PA7_3   CH32V20X_V30X_PINMUX_DEFINE(PA, 7, USART1, 3)
+#define USART1_CTS_PA11_0 CH32V20X_V30X_PINMUX_DEFINE(PA, 11, USART1, 0)
+#define USART1_CTS_PA11_1 CH32V20X_V30X_PINMUX_DEFINE(PA, 11, USART1, 1)
+#define USART1_CTS_PA5_2  CH32V20X_V30X_PINMUX_DEFINE(PA, 5, USART1, 2)
+#define USART1_CTS_PC4_3  CH32V20X_V30X_PINMUX_DEFINE(PC, 4, USART1, 3)
+#define USART1_RTS_PA12_0 CH32V20X_V30X_PINMUX_DEFINE(PA, 12, USART1, 0)
+#define USART1_RTS_PA12_1 CH32V20X_V30X_PINMUX_DEFINE(PA, 12, USART1, 1)
+#define USART1_RTS_PA9_2  CH32V20X_V30X_PINMUX_DEFINE(PA, 9, USART1, 2)
+#define USART1_RTS_PC5_3  CH32V20X_V30X_PINMUX_DEFINE(PC, 5, USART1, 3)
+
+#define USART2_CK_PA4_0  CH32V20X_V30X_PINMUX_DEFINE(PA, 4, USART2, 0)
+#define USART2_CK_PD7_1  CH32V20X_V30X_PINMUX_DEFINE(PD, 7, USART2, 1)
+#define USART2_TX_PA2_0  CH32V20X_V30X_PINMUX_DEFINE(PA, 2, USART2, 0)
+#define USART2_TX_PD5_1  CH32V20X_V30X_PINMUX_DEFINE(PD, 5, USART2, 1)
+#define USART2_RX_PA3_0  CH32V20X_V30X_PINMUX_DEFINE(PA, 3, USART2, 0)
+#define USART2_RX_PD6_1  CH32V20X_V30X_PINMUX_DEFINE(PD, 6, USART2, 1)
+#define USART2_CTS_PA0_0 CH32V20X_V30X_PINMUX_DEFINE(PA, 0, USART2, 0)
+#define USART2_CTS_PD3_1 CH32V20X_V30X_PINMUX_DEFINE(PD, 3, USART2, 1)
+#define USART2_RTS_PA1_0 CH32V20X_V30X_PINMUX_DEFINE(PA, 1, USART2, 0)
+#define USART2_RTS_PD4_1 CH32V20X_V30X_PINMUX_DEFINE(PD, 4, USART2, 1)
+
+#define USART3_CK_PB12_0  CH32V20X_V30X_PINMUX_DEFINE(PB, 12, USART3, 0)
+#define USART3_CK_PC12_1  CH32V20X_V30X_PINMUX_DEFINE(PC, 12, USART3, 1)
+#define USART3_CK_PD10_2  CH32V20X_V30X_PINMUX_DEFINE(PD, 10, USART3, 2)
+#define USART3_CK_PD10_3  CH32V20X_V30X_PINMUX_DEFINE(PD, 10, USART3, 3)
+#define USART3_TX_PB10_0  CH32V20X_V30X_PINMUX_DEFINE(PB, 10, USART3, 0)
+#define USART3_TX_PC10_1  CH32V20X_V30X_PINMUX_DEFINE(PC, 10, USART3, 1)
+#define USART3_TX_PA13_2  CH32V20X_V30X_PINMUX_DEFINE(PA, 13, USART3, 2)
+#define USART3_TX_PD8_3   CH32V20X_V30X_PINMUX_DEFINE(PD, 8, USART3, 3)
+#define USART3_RX_PB11_0  CH32V20X_V30X_PINMUX_DEFINE(PB, 11, USART3, 0)
+#define USART3_RX_PC11_1  CH32V20X_V30X_PINMUX_DEFINE(PC, 11, USART3, 1)
+#define USART3_RX_PA14_2  CH32V20X_V30X_PINMUX_DEFINE(PA, 14, USART3, 2)
+#define USART3_RX_PD9_3   CH32V20X_V30X_PINMUX_DEFINE(PD, 9, USART3, 3)
+#define USART3_CTS_PB13_0 CH32V20X_V30X_PINMUX_DEFINE(PB, 13, USART3, 0)
+#define USART3_CTS_PB13_1 CH32V20X_V30X_PINMUX_DEFINE(PB, 13, USART3, 1)
+#define USART3_CTS_PD11_2 CH32V20X_V30X_PINMUX_DEFINE(PD, 11, USART3, 2)
+#define USART3_CTS_PD11_3 CH32V20X_V30X_PINMUX_DEFINE(PD, 11, USART3, 3)
+#define USART3_RTS_PB14_0 CH32V20X_V30X_PINMUX_DEFINE(PB, 14, USART3, 0)
+#define USART3_RTS_PB14_1 CH32V20X_V30X_PINMUX_DEFINE(PB, 14, USART3, 1)
+#define USART3_RTS_PD12_2 CH32V20X_V30X_PINMUX_DEFINE(PD, 12, USART3, 2)
+#define USART3_RTS_PD12_3 CH32V20X_V30X_PINMUX_DEFINE(PD, 12, USART3, 3)
+
+#define USART4_CK_PB2_0   CH32V20X_V30X_PINMUX_DEFINE(PB, 2, USART4, 0)
+#define USART4_CK_PA6_1   CH32V20X_V30X_PINMUX_DEFINE(PA, 6, USART4, 1)
+#define USART4_TX_PB0_0   CH32V20X_V30X_PINMUX_DEFINE(PB, 0, USART4, 0)
+#define USART4_TX_PA5_1   CH32V20X_V30X_PINMUX_DEFINE(PA, 5, USART4, 1)
+#define USART4_RX_PB1_0   CH32V20X_V30X_PINMUX_DEFINE(PB, 1, USART4, 0)
+#define USART4_RX_PB5_1   CH32V20X_V30X_PINMUX_DEFINE(PB, 5, USART4, 1)
+#define USART4_CTS_PB3_0  CH32V20X_V30X_PINMUX_DEFINE(PB, 3, USART4, 0)
+#define USART4_CTS_PA7_1  CH32V20X_V30X_PINMUX_DEFINE(PA, 7, USART4, 1)
+#define USART4_RTS_PB4_0  CH32V20X_V30X_PINMUX_DEFINE(PB, 4, USART4, 0)
+#define USART4_RTS_PA15_1 CH32V20X_V30X_PINMUX_DEFINE(PA, 15, USART4, 1)
+
+#define USART5_TX_PC12_0 CH32V20X_V30X_PINMUX_DEFINE(PC, 12, USART5, 0)
+#define USART5_TX_PB4_1  CH32V20X_V30X_PINMUX_DEFINE(PB, 4, USART5, 1)
+#define USART5_TX_PE8_2  CH32V20X_V30X_PINMUX_DEFINE(PE, 8, USART5, 2)
+#define USART5_RX_PD2_0  CH32V20X_V30X_PINMUX_DEFINE(PD, 2, USART5, 0)
+#define USART5_RX_PB5_1  CH32V20X_V30X_PINMUX_DEFINE(PB, 5, USART5, 1)
+#define USART5_RX_PE9_2  CH32V20X_V30X_PINMUX_DEFINE(PE, 9, USART5, 2)
+
+#define USART6_TX_PC0_0  CH32V20X_V30X_PINMUX_DEFINE(PC, 0, USART6, 0)
+#define USART6_TX_PB8_1  CH32V20X_V30X_PINMUX_DEFINE(PB, 8, USART6, 1)
+#define USART6_TX_PE10_2 CH32V20X_V30X_PINMUX_DEFINE(PE, 10, USART6, 2)
+#define USART6_RX_PC1_0  CH32V20X_V30X_PINMUX_DEFINE(PC, 1, USART6, 0)
+#define USART6_RX_PB9_1  CH32V20X_V30X_PINMUX_DEFINE(PB, 9, USART6, 1)
+#define USART6_RX_PE11_2 CH32V20X_V30X_PINMUX_DEFINE(PE, 11, USART6, 2)
+
+#define USART7_TX_PC2_0  CH32V20X_V30X_PINMUX_DEFINE(PC, 2, USART7, 0)
+#define USART7_TX_PA6_1  CH32V20X_V30X_PINMUX_DEFINE(PA, 6, USART7, 1)
+#define USART7_TX_PE12_2 CH32V20X_V30X_PINMUX_DEFINE(PE, 12, USART7, 2)
+#define USART7_RX_PC3_0  CH32V20X_V30X_PINMUX_DEFINE(PC, 3, USART7, 0)
+#define USART7_RX_PA7_1  CH32V20X_V30X_PINMUX_DEFINE(PA, 7, USART7, 1)
+#define USART7_RX_PE13_2 CH32V20X_V30X_PINMUX_DEFINE(PE, 13, USART7, 2)
+
+#define USART8_TX_PC4_0  CH32V20X_V30X_PINMUX_DEFINE(PC, 4, USART8, 0)
+#define USART8_TX_PA14_1 CH32V20X_V30X_PINMUX_DEFINE(PA, 14, USART8, 1)
+#define USART8_TX_PE14_2 CH32V20X_V30X_PINMUX_DEFINE(PE, 14, USART8, 2)
+#define USART8_RX_PC5_0  CH32V20X_V30X_PINMUX_DEFINE(PC, 5, USART8, 0)
+#define USART8_RX_PA15_1 CH32V20X_V30X_PINMUX_DEFINE(PA, 15, USART8, 1)
+#define USART8_RX_PE15_2 CH32V20X_V30X_PINMUX_DEFINE(PE, 15, USART8, 2)
+
+#define SPI1_NSS_PA4_0  CH32V20X_V30X_PINMUX_DEFINE(PA, 4, SPI1, 0)
+#define SPI1_NSS_PA15_1 CH32V20X_V30X_PINMUX_DEFINE(PA, 15, SPI1, 1)
+#define SPI1_SCK_PA5_0  CH32V20X_V30X_PINMUX_DEFINE(PA, 5, SPI1, 0)
+#define SPI1_SCK_PB3_1  CH32V20X_V30X_PINMUX_DEFINE(PB, 3, SPI1, 1)
+#define SPI1_MISO_PA6_0 CH32V20X_V30X_PINMUX_DEFINE(PA, 6, SPI1, 0)
+#define SPI1_MISO_PB4_1 CH32V20X_V30X_PINMUX_DEFINE(PB, 4, SPI1, 1)
+#define SPI1_MOSI_PA7_0 CH32V20X_V30X_PINMUX_DEFINE(PA, 7, SPI1, 0)
+#define SPI1_MOSI_PB5_1 CH32V20X_V30X_PINMUX_DEFINE(PB, 5, SPI1, 1)
+
+#define I2C1_SCL_PB6_0 CH32V20X_V30X_PINMUX_DEFINE(PB, 6, I2C1, 0)
+#define I2C1_SCL_PB8_1 CH32V20X_V30X_PINMUX_DEFINE(PB, 8, I2C1, 1)
+#define I2C1_SDA_PB7_0 CH32V20X_V30X_PINMUX_DEFINE(PB, 7, I2C1, 0)
+#define I2C1_SDA_PB9_1 CH32V20X_V30X_PINMUX_DEFINE(PB, 9, I2C1, 1)
+
+#endif /* __CH32V20X_V30X_PINCTRL_H__ */
diff --git a/include/zephyr/dt-bindings/pinctrl/esp32-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/esp32-pinctrl.h
index 2728fbd06f4b6..88ae3c10e9cf7 100644
--- a/include/zephyr/dt-bindings/pinctrl/esp32-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/esp32-pinctrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -10,11512 +10,8544 @@
 #define INC_DT_BINDS_PINCTRL_ESP32_PINCTRL_HAL_H_
 
 /* DAC_CH1 */
-#define DAC_CH1_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_DAC1_OUT)
+#define DAC_CH1_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_DAC1_OUT)
 
 /* DAC_CH2 */
-#define DAC_CH2_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_DAC2_OUT)
+#define DAC_CH2_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_DAC2_OUT)
 
 /* I2C0_SCL */
-#define I2C0_SCL_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO22 \
-	ESP32_PINMUX(22, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO22 ESP32_PINMUX(22, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO23 \
-	ESP32_PINMUX(23, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO23 ESP32_PINMUX(23, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO25 \
-	ESP32_PINMUX(25, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO25 ESP32_PINMUX(25, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
 /* I2C0_SDA */
-#define I2C0_SDA_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO22 \
-	ESP32_PINMUX(22, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO22 ESP32_PINMUX(22, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO23 \
-	ESP32_PINMUX(23, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO23 ESP32_PINMUX(23, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO25 \
-	ESP32_PINMUX(25, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO25 ESP32_PINMUX(25, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
 /* I2C1_SCL */
-#define I2C1_SCL_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO22 \
-	ESP32_PINMUX(22, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO22 ESP32_PINMUX(22, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO23 \
-	ESP32_PINMUX(23, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO23 ESP32_PINMUX(23, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO25 \
-	ESP32_PINMUX(25, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO25 ESP32_PINMUX(25, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
 /* I2C1_SDA */
-#define I2C1_SDA_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO22 \
-	ESP32_PINMUX(22, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO22 ESP32_PINMUX(22, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO23 \
-	ESP32_PINMUX(23, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO23 ESP32_PINMUX(23, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO25 \
-	ESP32_PINMUX(25, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO25 ESP32_PINMUX(25, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+
+/* I2S0_I_BCK */
+#define I2S0_I_BCK_GPIO0 ESP32_PINMUX(0, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO1 ESP32_PINMUX(1, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO2 ESP32_PINMUX(2, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO3 ESP32_PINMUX(3, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO4 ESP32_PINMUX(4, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO5 ESP32_PINMUX(5, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO6 ESP32_PINMUX(6, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO7 ESP32_PINMUX(7, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO8 ESP32_PINMUX(8, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO9 ESP32_PINMUX(9, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO10 ESP32_PINMUX(10, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO11 ESP32_PINMUX(11, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO12 ESP32_PINMUX(12, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO13 ESP32_PINMUX(13, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO14 ESP32_PINMUX(14, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO15 ESP32_PINMUX(15, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO16 ESP32_PINMUX(16, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO17 ESP32_PINMUX(17, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO18 ESP32_PINMUX(18, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO19 ESP32_PINMUX(19, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO20 ESP32_PINMUX(20, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO21 ESP32_PINMUX(21, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO22 ESP32_PINMUX(22, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO23 ESP32_PINMUX(23, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO25 ESP32_PINMUX(25, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO26 ESP32_PINMUX(26, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO27 ESP32_PINMUX(27, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO32 ESP32_PINMUX(32, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO33 ESP32_PINMUX(33, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO34 ESP32_PINMUX(34, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO35 ESP32_PINMUX(35, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO36 ESP32_PINMUX(36, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO37 ESP32_PINMUX(37, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO38 ESP32_PINMUX(38, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO39 ESP32_PINMUX(39, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+/* I2S0_I_SD */
+#define I2S0_I_SD_GPIO0 ESP32_PINMUX(0, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO1 ESP32_PINMUX(1, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO2 ESP32_PINMUX(2, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO3 ESP32_PINMUX(3, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO4 ESP32_PINMUX(4, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO5 ESP32_PINMUX(5, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO6 ESP32_PINMUX(6, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO7 ESP32_PINMUX(7, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO8 ESP32_PINMUX(8, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO9 ESP32_PINMUX(9, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO10 ESP32_PINMUX(10, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO11 ESP32_PINMUX(11, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO12 ESP32_PINMUX(12, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO13 ESP32_PINMUX(13, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO14 ESP32_PINMUX(14, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO15 ESP32_PINMUX(15, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO16 ESP32_PINMUX(16, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO17 ESP32_PINMUX(17, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO18 ESP32_PINMUX(18, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO19 ESP32_PINMUX(19, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO20 ESP32_PINMUX(20, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO21 ESP32_PINMUX(21, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO22 ESP32_PINMUX(22, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO23 ESP32_PINMUX(23, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO25 ESP32_PINMUX(25, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO26 ESP32_PINMUX(26, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO27 ESP32_PINMUX(27, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO32 ESP32_PINMUX(32, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO33 ESP32_PINMUX(33, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO34 ESP32_PINMUX(34, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO35 ESP32_PINMUX(35, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO36 ESP32_PINMUX(36, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO37 ESP32_PINMUX(37, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO38 ESP32_PINMUX(38, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO39 ESP32_PINMUX(39, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+/* I2S0_I_WS */
+#define I2S0_I_WS_GPIO0 ESP32_PINMUX(0, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO1 ESP32_PINMUX(1, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO2 ESP32_PINMUX(2, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO3 ESP32_PINMUX(3, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO4 ESP32_PINMUX(4, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO5 ESP32_PINMUX(5, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO6 ESP32_PINMUX(6, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO7 ESP32_PINMUX(7, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO8 ESP32_PINMUX(8, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO9 ESP32_PINMUX(9, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO10 ESP32_PINMUX(10, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO11 ESP32_PINMUX(11, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO12 ESP32_PINMUX(12, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO13 ESP32_PINMUX(13, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO14 ESP32_PINMUX(14, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO15 ESP32_PINMUX(15, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO16 ESP32_PINMUX(16, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO17 ESP32_PINMUX(17, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO18 ESP32_PINMUX(18, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO19 ESP32_PINMUX(19, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO20 ESP32_PINMUX(20, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO21 ESP32_PINMUX(21, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO22 ESP32_PINMUX(22, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO23 ESP32_PINMUX(23, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO25 ESP32_PINMUX(25, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO26 ESP32_PINMUX(26, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO27 ESP32_PINMUX(27, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO32 ESP32_PINMUX(32, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO33 ESP32_PINMUX(33, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO34 ESP32_PINMUX(34, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO35 ESP32_PINMUX(35, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO36 ESP32_PINMUX(36, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO37 ESP32_PINMUX(37, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO38 ESP32_PINMUX(38, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO39 ESP32_PINMUX(39, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+/* I2S0_O_BCK */
+#define I2S0_O_BCK_GPIO0 ESP32_PINMUX(0, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO1 ESP32_PINMUX(1, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO2 ESP32_PINMUX(2, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO3 ESP32_PINMUX(3, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO4 ESP32_PINMUX(4, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO5 ESP32_PINMUX(5, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO6 ESP32_PINMUX(6, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO7 ESP32_PINMUX(7, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO8 ESP32_PINMUX(8, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO9 ESP32_PINMUX(9, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO10 ESP32_PINMUX(10, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO11 ESP32_PINMUX(11, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO12 ESP32_PINMUX(12, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO13 ESP32_PINMUX(13, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO14 ESP32_PINMUX(14, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO15 ESP32_PINMUX(15, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO16 ESP32_PINMUX(16, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO17 ESP32_PINMUX(17, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO18 ESP32_PINMUX(18, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO19 ESP32_PINMUX(19, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO20 ESP32_PINMUX(20, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO21 ESP32_PINMUX(21, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO22 ESP32_PINMUX(22, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO23 ESP32_PINMUX(23, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO25 ESP32_PINMUX(25, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO26 ESP32_PINMUX(26, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO27 ESP32_PINMUX(27, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO32 ESP32_PINMUX(32, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO33 ESP32_PINMUX(33, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO34 ESP32_PINMUX(34, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO35 ESP32_PINMUX(35, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO36 ESP32_PINMUX(36, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO37 ESP32_PINMUX(37, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO38 ESP32_PINMUX(38, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO39 ESP32_PINMUX(39, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+/* I2S0_O_SD */
+#define I2S0_O_SD_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+/* I2S0_O_WS */
+#define I2S0_O_WS_GPIO0 ESP32_PINMUX(0, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO1 ESP32_PINMUX(1, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO2 ESP32_PINMUX(2, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO3 ESP32_PINMUX(3, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO4 ESP32_PINMUX(4, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO5 ESP32_PINMUX(5, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO6 ESP32_PINMUX(6, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO7 ESP32_PINMUX(7, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO8 ESP32_PINMUX(8, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO9 ESP32_PINMUX(9, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO10 ESP32_PINMUX(10, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO11 ESP32_PINMUX(11, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO12 ESP32_PINMUX(12, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO13 ESP32_PINMUX(13, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO14 ESP32_PINMUX(14, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO15 ESP32_PINMUX(15, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO16 ESP32_PINMUX(16, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO17 ESP32_PINMUX(17, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO18 ESP32_PINMUX(18, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO19 ESP32_PINMUX(19, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO20 ESP32_PINMUX(20, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO21 ESP32_PINMUX(21, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO22 ESP32_PINMUX(22, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO23 ESP32_PINMUX(23, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO25 ESP32_PINMUX(25, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO26 ESP32_PINMUX(26, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO27 ESP32_PINMUX(27, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO32 ESP32_PINMUX(32, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO33 ESP32_PINMUX(33, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO34 ESP32_PINMUX(34, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO35 ESP32_PINMUX(35, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO36 ESP32_PINMUX(36, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO37 ESP32_PINMUX(37, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO38 ESP32_PINMUX(38, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO39 ESP32_PINMUX(39, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+/* I2S1_I_BCK */
+#define I2S1_I_BCK_GPIO0 ESP32_PINMUX(0, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO1 ESP32_PINMUX(1, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO2 ESP32_PINMUX(2, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO3 ESP32_PINMUX(3, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO4 ESP32_PINMUX(4, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO5 ESP32_PINMUX(5, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO6 ESP32_PINMUX(6, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO7 ESP32_PINMUX(7, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO8 ESP32_PINMUX(8, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO9 ESP32_PINMUX(9, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO10 ESP32_PINMUX(10, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO11 ESP32_PINMUX(11, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO12 ESP32_PINMUX(12, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO13 ESP32_PINMUX(13, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO14 ESP32_PINMUX(14, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO15 ESP32_PINMUX(15, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO16 ESP32_PINMUX(16, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO17 ESP32_PINMUX(17, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO18 ESP32_PINMUX(18, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO19 ESP32_PINMUX(19, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO20 ESP32_PINMUX(20, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO21 ESP32_PINMUX(21, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO22 ESP32_PINMUX(22, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO23 ESP32_PINMUX(23, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO25 ESP32_PINMUX(25, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO26 ESP32_PINMUX(26, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO27 ESP32_PINMUX(27, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO32 ESP32_PINMUX(32, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO33 ESP32_PINMUX(33, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO34 ESP32_PINMUX(34, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO35 ESP32_PINMUX(35, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO36 ESP32_PINMUX(36, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO37 ESP32_PINMUX(37, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO38 ESP32_PINMUX(38, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+#define I2S1_I_BCK_GPIO39 ESP32_PINMUX(39, ESP_I2S1I_BCK_IN, ESP_I2S1I_BCK_OUT)
+
+/* I2S1_I_SD */
+#define I2S1_I_SD_GPIO0 ESP32_PINMUX(0, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO1 ESP32_PINMUX(1, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO2 ESP32_PINMUX(2, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO3 ESP32_PINMUX(3, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO4 ESP32_PINMUX(4, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO5 ESP32_PINMUX(5, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO6 ESP32_PINMUX(6, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO7 ESP32_PINMUX(7, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO8 ESP32_PINMUX(8, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO9 ESP32_PINMUX(9, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO10 ESP32_PINMUX(10, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO11 ESP32_PINMUX(11, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO12 ESP32_PINMUX(12, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO13 ESP32_PINMUX(13, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO14 ESP32_PINMUX(14, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO15 ESP32_PINMUX(15, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO16 ESP32_PINMUX(16, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO17 ESP32_PINMUX(17, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO18 ESP32_PINMUX(18, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO19 ESP32_PINMUX(19, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO20 ESP32_PINMUX(20, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO21 ESP32_PINMUX(21, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO22 ESP32_PINMUX(22, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO23 ESP32_PINMUX(23, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO25 ESP32_PINMUX(25, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO26 ESP32_PINMUX(26, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO27 ESP32_PINMUX(27, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO32 ESP32_PINMUX(32, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO33 ESP32_PINMUX(33, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO34 ESP32_PINMUX(34, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO35 ESP32_PINMUX(35, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO36 ESP32_PINMUX(36, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO37 ESP32_PINMUX(37, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO38 ESP32_PINMUX(38, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+#define I2S1_I_SD_GPIO39 ESP32_PINMUX(39, ESP_I2S1I_DATA_IN15, ESP_NOSIG)
+
+/* I2S1_I_WS */
+#define I2S1_I_WS_GPIO0 ESP32_PINMUX(0, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO1 ESP32_PINMUX(1, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO2 ESP32_PINMUX(2, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO3 ESP32_PINMUX(3, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO4 ESP32_PINMUX(4, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO5 ESP32_PINMUX(5, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO6 ESP32_PINMUX(6, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO7 ESP32_PINMUX(7, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO8 ESP32_PINMUX(8, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO9 ESP32_PINMUX(9, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO10 ESP32_PINMUX(10, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO11 ESP32_PINMUX(11, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO12 ESP32_PINMUX(12, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO13 ESP32_PINMUX(13, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO14 ESP32_PINMUX(14, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO15 ESP32_PINMUX(15, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO16 ESP32_PINMUX(16, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO17 ESP32_PINMUX(17, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO18 ESP32_PINMUX(18, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO19 ESP32_PINMUX(19, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO20 ESP32_PINMUX(20, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO21 ESP32_PINMUX(21, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO22 ESP32_PINMUX(22, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO23 ESP32_PINMUX(23, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO25 ESP32_PINMUX(25, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO26 ESP32_PINMUX(26, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO27 ESP32_PINMUX(27, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO32 ESP32_PINMUX(32, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO33 ESP32_PINMUX(33, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO34 ESP32_PINMUX(34, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO35 ESP32_PINMUX(35, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO36 ESP32_PINMUX(36, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO37 ESP32_PINMUX(37, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO38 ESP32_PINMUX(38, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+#define I2S1_I_WS_GPIO39 ESP32_PINMUX(39, ESP_I2S1I_WS_IN, ESP_I2S1I_WS_OUT)
+
+/* I2S1_O_BCK */
+#define I2S1_O_BCK_GPIO0 ESP32_PINMUX(0, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO1 ESP32_PINMUX(1, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO2 ESP32_PINMUX(2, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO3 ESP32_PINMUX(3, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO4 ESP32_PINMUX(4, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO5 ESP32_PINMUX(5, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO6 ESP32_PINMUX(6, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO7 ESP32_PINMUX(7, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO8 ESP32_PINMUX(8, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO9 ESP32_PINMUX(9, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO10 ESP32_PINMUX(10, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO11 ESP32_PINMUX(11, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO12 ESP32_PINMUX(12, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO13 ESP32_PINMUX(13, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO14 ESP32_PINMUX(14, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO15 ESP32_PINMUX(15, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO16 ESP32_PINMUX(16, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO17 ESP32_PINMUX(17, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO18 ESP32_PINMUX(18, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO19 ESP32_PINMUX(19, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO20 ESP32_PINMUX(20, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO21 ESP32_PINMUX(21, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO22 ESP32_PINMUX(22, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO23 ESP32_PINMUX(23, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO25 ESP32_PINMUX(25, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO26 ESP32_PINMUX(26, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO27 ESP32_PINMUX(27, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO32 ESP32_PINMUX(32, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO33 ESP32_PINMUX(33, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO34 ESP32_PINMUX(34, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO35 ESP32_PINMUX(35, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO36 ESP32_PINMUX(36, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO37 ESP32_PINMUX(37, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO38 ESP32_PINMUX(38, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+#define I2S1_O_BCK_GPIO39 ESP32_PINMUX(39, ESP_I2S1O_BCK_IN, ESP_I2S1O_BCK_OUT)
+
+/* I2S1_O_SD */
+#define I2S1_O_SD_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+#define I2S1_O_SD_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_I2S1O_DATA_OUT23)
+
+/* I2S1_O_WS */
+#define I2S1_O_WS_GPIO0 ESP32_PINMUX(0, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO1 ESP32_PINMUX(1, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO2 ESP32_PINMUX(2, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO3 ESP32_PINMUX(3, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO4 ESP32_PINMUX(4, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO5 ESP32_PINMUX(5, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO6 ESP32_PINMUX(6, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO7 ESP32_PINMUX(7, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO8 ESP32_PINMUX(8, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO9 ESP32_PINMUX(9, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO10 ESP32_PINMUX(10, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO11 ESP32_PINMUX(11, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO12 ESP32_PINMUX(12, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO13 ESP32_PINMUX(13, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO14 ESP32_PINMUX(14, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO15 ESP32_PINMUX(15, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO16 ESP32_PINMUX(16, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO17 ESP32_PINMUX(17, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO18 ESP32_PINMUX(18, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO19 ESP32_PINMUX(19, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO20 ESP32_PINMUX(20, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO21 ESP32_PINMUX(21, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO22 ESP32_PINMUX(22, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO23 ESP32_PINMUX(23, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO25 ESP32_PINMUX(25, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO26 ESP32_PINMUX(26, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO27 ESP32_PINMUX(27, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO32 ESP32_PINMUX(32, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO33 ESP32_PINMUX(33, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO34 ESP32_PINMUX(34, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO35 ESP32_PINMUX(35, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO36 ESP32_PINMUX(36, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO37 ESP32_PINMUX(37, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO38 ESP32_PINMUX(38, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
+
+#define I2S1_O_WS_GPIO39 ESP32_PINMUX(39, ESP_I2S1O_WS_IN, ESP_I2S1O_WS_OUT)
 
 /* LEDC_CH0 */
-#define LEDC_CH0_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
 /* LEDC_CH1 */
-#define LEDC_CH1_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
 /* LEDC_CH10 */
-#define LEDC_CH10_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
-#define LEDC_CH10_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
+#define LEDC_CH10_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT2)
 
 /* LEDC_CH11 */
-#define LEDC_CH11_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
-#define LEDC_CH11_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
+#define LEDC_CH11_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT3)
 
 /* LEDC_CH12 */
-#define LEDC_CH12_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
-#define LEDC_CH12_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
+#define LEDC_CH12_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT4)
 
 /* LEDC_CH13 */
-#define LEDC_CH13_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
-#define LEDC_CH13_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
+#define LEDC_CH13_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT5)
 
 /* LEDC_CH14 */
-#define LEDC_CH14_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
-#define LEDC_CH14_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
+#define LEDC_CH14_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT6)
 
 /* LEDC_CH15 */
-#define LEDC_CH15_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
-#define LEDC_CH15_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
+#define LEDC_CH15_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT7)
 
 /* LEDC_CH2 */
-#define LEDC_CH2_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
 /* LEDC_CH3 */
-#define LEDC_CH3_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
 /* LEDC_CH4 */
-#define LEDC_CH4_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
 /* LEDC_CH5 */
-#define LEDC_CH5_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
 /* LEDC_CH6 */
-#define LEDC_CH6_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
 /* LEDC_CH7 */
-#define LEDC_CH7_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
 /* LEDC_CH8 */
-#define LEDC_CH8_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
-#define LEDC_CH8_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
+#define LEDC_CH8_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT0)
 
 /* LEDC_CH9 */
-#define LEDC_CH9_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
-#define LEDC_CH9_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
+#define LEDC_CH9_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_HS_SIG_OUT1)
 
 /* MCPWM0_CAP0 */
-#define MCPWM0_CAP0_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO0 ESP32_PINMUX(0, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO1 ESP32_PINMUX(1, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO2 ESP32_PINMUX(2, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO3 ESP32_PINMUX(3, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO4 ESP32_PINMUX(4, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO5 ESP32_PINMUX(5, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO6 ESP32_PINMUX(6, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO7 ESP32_PINMUX(7, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO8 ESP32_PINMUX(8, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO9 ESP32_PINMUX(9, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO10 ESP32_PINMUX(10, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO11 ESP32_PINMUX(11, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO12 ESP32_PINMUX(12, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO13 ESP32_PINMUX(13, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO14 ESP32_PINMUX(14, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO15 ESP32_PINMUX(15, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO16 ESP32_PINMUX(16, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO17 ESP32_PINMUX(17, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO18 ESP32_PINMUX(18, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO19 ESP32_PINMUX(19, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO20 ESP32_PINMUX(20, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO21 ESP32_PINMUX(21, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO22 ESP32_PINMUX(22, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO23 ESP32_PINMUX(23, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO25 ESP32_PINMUX(25, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO26 ESP32_PINMUX(26, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO27 ESP32_PINMUX(27, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO32 ESP32_PINMUX(32, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO33 ESP32_PINMUX(33, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO34 ESP32_PINMUX(34, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO35 ESP32_PINMUX(35, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO36 ESP32_PINMUX(36, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO37 ESP32_PINMUX(37, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO38 ESP32_PINMUX(38, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP0_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_CAP0_IN, ESP_NOSIG)
+#define MCPWM0_CAP0_GPIO39 ESP32_PINMUX(39, ESP_PWM0_CAP0_IN, ESP_NOSIG)
 
 /* MCPWM0_CAP1 */
-#define MCPWM0_CAP1_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO0 ESP32_PINMUX(0, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO1 ESP32_PINMUX(1, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO2 ESP32_PINMUX(2, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO3 ESP32_PINMUX(3, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO4 ESP32_PINMUX(4, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO5 ESP32_PINMUX(5, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO6 ESP32_PINMUX(6, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO7 ESP32_PINMUX(7, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO8 ESP32_PINMUX(8, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO9 ESP32_PINMUX(9, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO10 ESP32_PINMUX(10, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO11 ESP32_PINMUX(11, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO12 ESP32_PINMUX(12, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO13 ESP32_PINMUX(13, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO14 ESP32_PINMUX(14, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO15 ESP32_PINMUX(15, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO16 ESP32_PINMUX(16, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO17 ESP32_PINMUX(17, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO18 ESP32_PINMUX(18, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO19 ESP32_PINMUX(19, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO20 ESP32_PINMUX(20, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO21 ESP32_PINMUX(21, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO22 ESP32_PINMUX(22, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO23 ESP32_PINMUX(23, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO25 ESP32_PINMUX(25, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO26 ESP32_PINMUX(26, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO27 ESP32_PINMUX(27, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO32 ESP32_PINMUX(32, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO33 ESP32_PINMUX(33, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO34 ESP32_PINMUX(34, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO35 ESP32_PINMUX(35, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO36 ESP32_PINMUX(36, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO37 ESP32_PINMUX(37, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO38 ESP32_PINMUX(38, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP1_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_CAP1_IN, ESP_NOSIG)
+#define MCPWM0_CAP1_GPIO39 ESP32_PINMUX(39, ESP_PWM0_CAP1_IN, ESP_NOSIG)
 
 /* MCPWM0_CAP2 */
-#define MCPWM0_CAP2_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO0 ESP32_PINMUX(0, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO1 ESP32_PINMUX(1, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO2 ESP32_PINMUX(2, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO3 ESP32_PINMUX(3, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO4 ESP32_PINMUX(4, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO5 ESP32_PINMUX(5, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO6 ESP32_PINMUX(6, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO7 ESP32_PINMUX(7, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO8 ESP32_PINMUX(8, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO9 ESP32_PINMUX(9, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO10 ESP32_PINMUX(10, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO11 ESP32_PINMUX(11, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO12 ESP32_PINMUX(12, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO13 ESP32_PINMUX(13, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO14 ESP32_PINMUX(14, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO15 ESP32_PINMUX(15, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO16 ESP32_PINMUX(16, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO17 ESP32_PINMUX(17, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO18 ESP32_PINMUX(18, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO19 ESP32_PINMUX(19, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO20 ESP32_PINMUX(20, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO21 ESP32_PINMUX(21, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO22 ESP32_PINMUX(22, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO23 ESP32_PINMUX(23, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO25 ESP32_PINMUX(25, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO26 ESP32_PINMUX(26, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO27 ESP32_PINMUX(27, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO32 ESP32_PINMUX(32, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO33 ESP32_PINMUX(33, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO34 ESP32_PINMUX(34, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO35 ESP32_PINMUX(35, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO36 ESP32_PINMUX(36, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO37 ESP32_PINMUX(37, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO38 ESP32_PINMUX(38, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM0_CAP2_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_CAP2_IN, ESP_NOSIG)
+#define MCPWM0_CAP2_GPIO39 ESP32_PINMUX(39, ESP_PWM0_CAP2_IN, ESP_NOSIG)
 
 /* MCPWM0_FAULT0 */
-#define MCPWM0_FAULT0_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO0 ESP32_PINMUX(0, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO1 ESP32_PINMUX(1, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO2 ESP32_PINMUX(2, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO3 ESP32_PINMUX(3, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO4 ESP32_PINMUX(4, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO5 ESP32_PINMUX(5, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO6 ESP32_PINMUX(6, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO7 ESP32_PINMUX(7, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO8 ESP32_PINMUX(8, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO9 ESP32_PINMUX(9, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO10 ESP32_PINMUX(10, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO11 ESP32_PINMUX(11, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO12 ESP32_PINMUX(12, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO13 ESP32_PINMUX(13, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO14 ESP32_PINMUX(14, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO15 ESP32_PINMUX(15, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO16 ESP32_PINMUX(16, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO17 ESP32_PINMUX(17, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO18 ESP32_PINMUX(18, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO19 ESP32_PINMUX(19, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO20 ESP32_PINMUX(20, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO21 ESP32_PINMUX(21, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO22 ESP32_PINMUX(22, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO23 ESP32_PINMUX(23, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO25 ESP32_PINMUX(25, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO26 ESP32_PINMUX(26, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO27 ESP32_PINMUX(27, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO32 ESP32_PINMUX(32, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO33 ESP32_PINMUX(33, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO34 ESP32_PINMUX(34, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO35 ESP32_PINMUX(35, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO36 ESP32_PINMUX(36, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO37 ESP32_PINMUX(37, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO38 ESP32_PINMUX(38, ESP_PWM0_F0_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT0_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_F0_IN, ESP_NOSIG)
+#define MCPWM0_FAULT0_GPIO39 ESP32_PINMUX(39, ESP_PWM0_F0_IN, ESP_NOSIG)
 
 /* MCPWM0_FAULT1 */
-#define MCPWM0_FAULT1_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO0 ESP32_PINMUX(0, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO1 ESP32_PINMUX(1, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO2 ESP32_PINMUX(2, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO3 ESP32_PINMUX(3, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO4 ESP32_PINMUX(4, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO5 ESP32_PINMUX(5, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO6 ESP32_PINMUX(6, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO7 ESP32_PINMUX(7, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO8 ESP32_PINMUX(8, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO9 ESP32_PINMUX(9, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO10 ESP32_PINMUX(10, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO11 ESP32_PINMUX(11, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO12 ESP32_PINMUX(12, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO13 ESP32_PINMUX(13, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO14 ESP32_PINMUX(14, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO15 ESP32_PINMUX(15, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO16 ESP32_PINMUX(16, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO17 ESP32_PINMUX(17, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO18 ESP32_PINMUX(18, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO19 ESP32_PINMUX(19, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO20 ESP32_PINMUX(20, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO21 ESP32_PINMUX(21, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO22 ESP32_PINMUX(22, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO23 ESP32_PINMUX(23, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO25 ESP32_PINMUX(25, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO26 ESP32_PINMUX(26, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO27 ESP32_PINMUX(27, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO32 ESP32_PINMUX(32, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO33 ESP32_PINMUX(33, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO34 ESP32_PINMUX(34, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO35 ESP32_PINMUX(35, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO36 ESP32_PINMUX(36, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO37 ESP32_PINMUX(37, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO38 ESP32_PINMUX(38, ESP_PWM0_F1_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT1_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_F1_IN, ESP_NOSIG)
+#define MCPWM0_FAULT1_GPIO39 ESP32_PINMUX(39, ESP_PWM0_F1_IN, ESP_NOSIG)
 
 /* MCPWM0_FAULT2 */
-#define MCPWM0_FAULT2_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO0 ESP32_PINMUX(0, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO1 ESP32_PINMUX(1, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO2 ESP32_PINMUX(2, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO3 ESP32_PINMUX(3, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO4 ESP32_PINMUX(4, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO5 ESP32_PINMUX(5, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO6 ESP32_PINMUX(6, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO7 ESP32_PINMUX(7, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO8 ESP32_PINMUX(8, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO9 ESP32_PINMUX(9, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO10 ESP32_PINMUX(10, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO11 ESP32_PINMUX(11, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO12 ESP32_PINMUX(12, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO13 ESP32_PINMUX(13, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO14 ESP32_PINMUX(14, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO15 ESP32_PINMUX(15, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO16 ESP32_PINMUX(16, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO17 ESP32_PINMUX(17, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO18 ESP32_PINMUX(18, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO19 ESP32_PINMUX(19, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO20 ESP32_PINMUX(20, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO21 ESP32_PINMUX(21, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO22 ESP32_PINMUX(22, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO23 ESP32_PINMUX(23, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO25 ESP32_PINMUX(25, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO26 ESP32_PINMUX(26, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO27 ESP32_PINMUX(27, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO32 ESP32_PINMUX(32, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO33 ESP32_PINMUX(33, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO34 ESP32_PINMUX(34, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO35 ESP32_PINMUX(35, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO36 ESP32_PINMUX(36, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO37 ESP32_PINMUX(37, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO38 ESP32_PINMUX(38, ESP_PWM0_F2_IN, ESP_NOSIG)
 
-#define MCPWM0_FAULT2_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_F2_IN, ESP_NOSIG)
+#define MCPWM0_FAULT2_GPIO39 ESP32_PINMUX(39, ESP_PWM0_F2_IN, ESP_NOSIG)
 
 /* MCPWM0_OUT0A */
-#define MCPWM0_OUT0A_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT0A)
 
-#define MCPWM0_OUT0A_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT0A)
+#define MCPWM0_OUT0A_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT0A)
 
 /* MCPWM0_OUT0B */
-#define MCPWM0_OUT0B_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT0B)
 
-#define MCPWM0_OUT0B_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT0B)
+#define MCPWM0_OUT0B_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT0B)
 
 /* MCPWM0_OUT1A */
-#define MCPWM0_OUT1A_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT1A)
 
-#define MCPWM0_OUT1A_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT1A)
+#define MCPWM0_OUT1A_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT1A)
 
 /* MCPWM0_OUT1B */
-#define MCPWM0_OUT1B_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT1B)
 
-#define MCPWM0_OUT1B_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT1B)
+#define MCPWM0_OUT1B_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT1B)
 
 /* MCPWM0_OUT2A */
-#define MCPWM0_OUT2A_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT2A)
 
-#define MCPWM0_OUT2A_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT2A)
+#define MCPWM0_OUT2A_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT2A)
 
 /* MCPWM0_OUT2B */
-#define MCPWM0_OUT2B_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM0_OUT2B)
 
-#define MCPWM0_OUT2B_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT2B)
+#define MCPWM0_OUT2B_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM0_OUT2B)
 
 /* MCPWM0_SYNC0 */
-#define MCPWM0_SYNC0_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO0 ESP32_PINMUX(0, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO1 ESP32_PINMUX(1, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO2 ESP32_PINMUX(2, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO3 ESP32_PINMUX(3, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO4 ESP32_PINMUX(4, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO5 ESP32_PINMUX(5, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO6 ESP32_PINMUX(6, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO7 ESP32_PINMUX(7, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO8 ESP32_PINMUX(8, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO9 ESP32_PINMUX(9, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO10 ESP32_PINMUX(10, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO11 ESP32_PINMUX(11, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO12 ESP32_PINMUX(12, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO13 ESP32_PINMUX(13, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO14 ESP32_PINMUX(14, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO15 ESP32_PINMUX(15, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO16 ESP32_PINMUX(16, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO17 ESP32_PINMUX(17, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO18 ESP32_PINMUX(18, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO19 ESP32_PINMUX(19, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO20 ESP32_PINMUX(20, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO21 ESP32_PINMUX(21, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO22 ESP32_PINMUX(22, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO23 ESP32_PINMUX(23, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO25 ESP32_PINMUX(25, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO26 ESP32_PINMUX(26, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO27 ESP32_PINMUX(27, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO32 ESP32_PINMUX(32, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO33 ESP32_PINMUX(33, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO34 ESP32_PINMUX(34, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO35 ESP32_PINMUX(35, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO36 ESP32_PINMUX(36, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO37 ESP32_PINMUX(37, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO38 ESP32_PINMUX(38, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC0_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
+#define MCPWM0_SYNC0_GPIO39 ESP32_PINMUX(39, ESP_PWM0_SYNC0_IN, ESP_NOSIG)
 
 /* MCPWM0_SYNC1 */
-#define MCPWM0_SYNC1_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO0 ESP32_PINMUX(0, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO1 ESP32_PINMUX(1, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO2 ESP32_PINMUX(2, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO3 ESP32_PINMUX(3, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO4 ESP32_PINMUX(4, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO5 ESP32_PINMUX(5, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO6 ESP32_PINMUX(6, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO7 ESP32_PINMUX(7, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO8 ESP32_PINMUX(8, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO9 ESP32_PINMUX(9, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO10 ESP32_PINMUX(10, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO11 ESP32_PINMUX(11, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO12 ESP32_PINMUX(12, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO13 ESP32_PINMUX(13, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO14 ESP32_PINMUX(14, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO15 ESP32_PINMUX(15, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO16 ESP32_PINMUX(16, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO17 ESP32_PINMUX(17, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO18 ESP32_PINMUX(18, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO19 ESP32_PINMUX(19, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO20 ESP32_PINMUX(20, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO21 ESP32_PINMUX(21, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO22 ESP32_PINMUX(22, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO23 ESP32_PINMUX(23, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO25 ESP32_PINMUX(25, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO26 ESP32_PINMUX(26, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO27 ESP32_PINMUX(27, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO32 ESP32_PINMUX(32, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO33 ESP32_PINMUX(33, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO34 ESP32_PINMUX(34, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO35 ESP32_PINMUX(35, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO36 ESP32_PINMUX(36, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO37 ESP32_PINMUX(37, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO38 ESP32_PINMUX(38, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC1_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
+#define MCPWM0_SYNC1_GPIO39 ESP32_PINMUX(39, ESP_PWM0_SYNC1_IN, ESP_NOSIG)
 
 /* MCPWM0_SYNC2 */
-#define MCPWM0_SYNC2_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO0 ESP32_PINMUX(0, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO1 ESP32_PINMUX(1, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO2 ESP32_PINMUX(2, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO3 ESP32_PINMUX(3, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO4 ESP32_PINMUX(4, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO5 ESP32_PINMUX(5, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO6 ESP32_PINMUX(6, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO7 ESP32_PINMUX(7, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO8 ESP32_PINMUX(8, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO9 ESP32_PINMUX(9, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO10 ESP32_PINMUX(10, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO11 ESP32_PINMUX(11, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO12 ESP32_PINMUX(12, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO13 ESP32_PINMUX(13, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO14 ESP32_PINMUX(14, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO15 ESP32_PINMUX(15, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO16 ESP32_PINMUX(16, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO17 ESP32_PINMUX(17, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO18 ESP32_PINMUX(18, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO19 ESP32_PINMUX(19, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO20 ESP32_PINMUX(20, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO21 ESP32_PINMUX(21, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO22 ESP32_PINMUX(22, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO23 ESP32_PINMUX(23, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO25 ESP32_PINMUX(25, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO26 ESP32_PINMUX(26, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO27 ESP32_PINMUX(27, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO32 ESP32_PINMUX(32, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO33 ESP32_PINMUX(33, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO34 ESP32_PINMUX(34, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO35 ESP32_PINMUX(35, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO36 ESP32_PINMUX(36, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO37 ESP32_PINMUX(37, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO38 ESP32_PINMUX(38, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM0_SYNC2_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
+#define MCPWM0_SYNC2_GPIO39 ESP32_PINMUX(39, ESP_PWM0_SYNC2_IN, ESP_NOSIG)
 
 /* MCPWM1_CAP0 */
-#define MCPWM1_CAP0_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO0 ESP32_PINMUX(0, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO1 ESP32_PINMUX(1, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO2 ESP32_PINMUX(2, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO3 ESP32_PINMUX(3, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO4 ESP32_PINMUX(4, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO5 ESP32_PINMUX(5, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO6 ESP32_PINMUX(6, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO7 ESP32_PINMUX(7, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO8 ESP32_PINMUX(8, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO9 ESP32_PINMUX(9, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO10 ESP32_PINMUX(10, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO11 ESP32_PINMUX(11, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO12 ESP32_PINMUX(12, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO13 ESP32_PINMUX(13, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO14 ESP32_PINMUX(14, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO15 ESP32_PINMUX(15, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO16 ESP32_PINMUX(16, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO17 ESP32_PINMUX(17, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO18 ESP32_PINMUX(18, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO19 ESP32_PINMUX(19, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO20 ESP32_PINMUX(20, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO21 ESP32_PINMUX(21, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO22 ESP32_PINMUX(22, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO23 ESP32_PINMUX(23, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO25 ESP32_PINMUX(25, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO26 ESP32_PINMUX(26, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO27 ESP32_PINMUX(27, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO32 ESP32_PINMUX(32, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO33 ESP32_PINMUX(33, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO34 ESP32_PINMUX(34, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO35 ESP32_PINMUX(35, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO36 ESP32_PINMUX(36, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO37 ESP32_PINMUX(37, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO38 ESP32_PINMUX(38, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP0_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_CAP0_IN, ESP_NOSIG)
+#define MCPWM1_CAP0_GPIO39 ESP32_PINMUX(39, ESP_PWM1_CAP0_IN, ESP_NOSIG)
 
 /* MCPWM1_CAP1 */
-#define MCPWM1_CAP1_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO0 ESP32_PINMUX(0, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO1 ESP32_PINMUX(1, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO2 ESP32_PINMUX(2, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO3 ESP32_PINMUX(3, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO4 ESP32_PINMUX(4, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO5 ESP32_PINMUX(5, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO6 ESP32_PINMUX(6, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO7 ESP32_PINMUX(7, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO8 ESP32_PINMUX(8, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO9 ESP32_PINMUX(9, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO10 ESP32_PINMUX(10, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO11 ESP32_PINMUX(11, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO12 ESP32_PINMUX(12, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO13 ESP32_PINMUX(13, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO14 ESP32_PINMUX(14, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO15 ESP32_PINMUX(15, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO16 ESP32_PINMUX(16, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO17 ESP32_PINMUX(17, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO18 ESP32_PINMUX(18, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO19 ESP32_PINMUX(19, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO20 ESP32_PINMUX(20, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO21 ESP32_PINMUX(21, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO22 ESP32_PINMUX(22, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO23 ESP32_PINMUX(23, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO25 ESP32_PINMUX(25, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO26 ESP32_PINMUX(26, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO27 ESP32_PINMUX(27, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO32 ESP32_PINMUX(32, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO33 ESP32_PINMUX(33, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO34 ESP32_PINMUX(34, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO35 ESP32_PINMUX(35, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO36 ESP32_PINMUX(36, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO37 ESP32_PINMUX(37, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO38 ESP32_PINMUX(38, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP1_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_CAP1_IN, ESP_NOSIG)
+#define MCPWM1_CAP1_GPIO39 ESP32_PINMUX(39, ESP_PWM1_CAP1_IN, ESP_NOSIG)
 
 /* MCPWM1_CAP2 */
-#define MCPWM1_CAP2_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO0 ESP32_PINMUX(0, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO1 ESP32_PINMUX(1, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO2 ESP32_PINMUX(2, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO3 ESP32_PINMUX(3, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO4 ESP32_PINMUX(4, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO5 ESP32_PINMUX(5, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO6 ESP32_PINMUX(6, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO7 ESP32_PINMUX(7, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO8 ESP32_PINMUX(8, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO9 ESP32_PINMUX(9, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO10 ESP32_PINMUX(10, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO11 ESP32_PINMUX(11, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO12 ESP32_PINMUX(12, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO13 ESP32_PINMUX(13, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO14 ESP32_PINMUX(14, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO15 ESP32_PINMUX(15, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO16 ESP32_PINMUX(16, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO17 ESP32_PINMUX(17, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO18 ESP32_PINMUX(18, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO19 ESP32_PINMUX(19, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO20 ESP32_PINMUX(20, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO21 ESP32_PINMUX(21, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO22 ESP32_PINMUX(22, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO23 ESP32_PINMUX(23, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO25 ESP32_PINMUX(25, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO26 ESP32_PINMUX(26, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO27 ESP32_PINMUX(27, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO32 ESP32_PINMUX(32, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO33 ESP32_PINMUX(33, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO34 ESP32_PINMUX(34, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO35 ESP32_PINMUX(35, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO36 ESP32_PINMUX(36, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO37 ESP32_PINMUX(37, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO38 ESP32_PINMUX(38, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
-#define MCPWM1_CAP2_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_CAP2_IN, ESP_NOSIG)
+#define MCPWM1_CAP2_GPIO39 ESP32_PINMUX(39, ESP_PWM1_CAP2_IN, ESP_NOSIG)
 
 /* MCPWM1_FAULT0 */
-#define MCPWM1_FAULT0_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO0 ESP32_PINMUX(0, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO1 ESP32_PINMUX(1, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO2 ESP32_PINMUX(2, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO3 ESP32_PINMUX(3, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO4 ESP32_PINMUX(4, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO5 ESP32_PINMUX(5, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO6 ESP32_PINMUX(6, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO7 ESP32_PINMUX(7, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO8 ESP32_PINMUX(8, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO9 ESP32_PINMUX(9, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO10 ESP32_PINMUX(10, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO11 ESP32_PINMUX(11, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO12 ESP32_PINMUX(12, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO13 ESP32_PINMUX(13, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO14 ESP32_PINMUX(14, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO15 ESP32_PINMUX(15, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO16 ESP32_PINMUX(16, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO17 ESP32_PINMUX(17, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO18 ESP32_PINMUX(18, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO19 ESP32_PINMUX(19, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO20 ESP32_PINMUX(20, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO21 ESP32_PINMUX(21, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO22 ESP32_PINMUX(22, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO23 ESP32_PINMUX(23, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO25 ESP32_PINMUX(25, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO26 ESP32_PINMUX(26, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO27 ESP32_PINMUX(27, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO32 ESP32_PINMUX(32, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO33 ESP32_PINMUX(33, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO34 ESP32_PINMUX(34, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO35 ESP32_PINMUX(35, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO36 ESP32_PINMUX(36, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO37 ESP32_PINMUX(37, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO38 ESP32_PINMUX(38, ESP_PWM1_F0_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT0_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_F0_IN, ESP_NOSIG)
+#define MCPWM1_FAULT0_GPIO39 ESP32_PINMUX(39, ESP_PWM1_F0_IN, ESP_NOSIG)
 
 /* MCPWM1_FAULT1 */
-#define MCPWM1_FAULT1_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO0 ESP32_PINMUX(0, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO1 ESP32_PINMUX(1, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO2 ESP32_PINMUX(2, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO3 ESP32_PINMUX(3, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO4 ESP32_PINMUX(4, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO5 ESP32_PINMUX(5, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO6 ESP32_PINMUX(6, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO7 ESP32_PINMUX(7, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO8 ESP32_PINMUX(8, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO9 ESP32_PINMUX(9, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO10 ESP32_PINMUX(10, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO11 ESP32_PINMUX(11, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO12 ESP32_PINMUX(12, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO13 ESP32_PINMUX(13, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO14 ESP32_PINMUX(14, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO15 ESP32_PINMUX(15, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO16 ESP32_PINMUX(16, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO17 ESP32_PINMUX(17, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO18 ESP32_PINMUX(18, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO19 ESP32_PINMUX(19, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO20 ESP32_PINMUX(20, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO21 ESP32_PINMUX(21, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO22 ESP32_PINMUX(22, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO23 ESP32_PINMUX(23, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO25 ESP32_PINMUX(25, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO26 ESP32_PINMUX(26, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO27 ESP32_PINMUX(27, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO32 ESP32_PINMUX(32, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO33 ESP32_PINMUX(33, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO34 ESP32_PINMUX(34, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO35 ESP32_PINMUX(35, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO36 ESP32_PINMUX(36, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO37 ESP32_PINMUX(37, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO38 ESP32_PINMUX(38, ESP_PWM1_F1_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT1_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_F1_IN, ESP_NOSIG)
+#define MCPWM1_FAULT1_GPIO39 ESP32_PINMUX(39, ESP_PWM1_F1_IN, ESP_NOSIG)
 
 /* MCPWM1_FAULT2 */
-#define MCPWM1_FAULT2_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO0 ESP32_PINMUX(0, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO1 ESP32_PINMUX(1, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO2 ESP32_PINMUX(2, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO3 ESP32_PINMUX(3, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO4 ESP32_PINMUX(4, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO5 ESP32_PINMUX(5, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO6 ESP32_PINMUX(6, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO7 ESP32_PINMUX(7, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO8 ESP32_PINMUX(8, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO9 ESP32_PINMUX(9, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO10 ESP32_PINMUX(10, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO11 ESP32_PINMUX(11, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO12 ESP32_PINMUX(12, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO13 ESP32_PINMUX(13, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO14 ESP32_PINMUX(14, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO15 ESP32_PINMUX(15, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO16 ESP32_PINMUX(16, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO17 ESP32_PINMUX(17, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO18 ESP32_PINMUX(18, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO19 ESP32_PINMUX(19, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO20 ESP32_PINMUX(20, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO21 ESP32_PINMUX(21, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO22 ESP32_PINMUX(22, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO23 ESP32_PINMUX(23, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO25 ESP32_PINMUX(25, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO26 ESP32_PINMUX(26, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO27 ESP32_PINMUX(27, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO32 ESP32_PINMUX(32, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO33 ESP32_PINMUX(33, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO34 ESP32_PINMUX(34, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO35 ESP32_PINMUX(35, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO36 ESP32_PINMUX(36, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO37 ESP32_PINMUX(37, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO38 ESP32_PINMUX(38, ESP_PWM1_F2_IN, ESP_NOSIG)
 
-#define MCPWM1_FAULT2_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_F2_IN, ESP_NOSIG)
+#define MCPWM1_FAULT2_GPIO39 ESP32_PINMUX(39, ESP_PWM1_F2_IN, ESP_NOSIG)
 
 /* MCPWM1_OUT0A */
-#define MCPWM1_OUT0A_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT0A)
 
-#define MCPWM1_OUT0A_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT0A)
+#define MCPWM1_OUT0A_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT0A)
 
 /* MCPWM1_OUT0B */
-#define MCPWM1_OUT0B_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT0B)
 
-#define MCPWM1_OUT0B_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT0B)
+#define MCPWM1_OUT0B_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT0B)
 
 /* MCPWM1_OUT1A */
-#define MCPWM1_OUT1A_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT1A)
 
-#define MCPWM1_OUT1A_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT1A)
+#define MCPWM1_OUT1A_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT1A)
 
 /* MCPWM1_OUT1B */
-#define MCPWM1_OUT1B_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT1B)
 
-#define MCPWM1_OUT1B_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT1B)
+#define MCPWM1_OUT1B_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT1B)
 
 /* MCPWM1_OUT2A */
-#define MCPWM1_OUT2A_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT2A)
 
-#define MCPWM1_OUT2A_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT2A)
+#define MCPWM1_OUT2A_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT2A)
 
 /* MCPWM1_OUT2B */
-#define MCPWM1_OUT2B_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_PWM1_OUT2B)
 
-#define MCPWM1_OUT2B_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT2B)
+#define MCPWM1_OUT2B_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_PWM1_OUT2B)
 
 /* MCPWM1_SYNC0 */
-#define MCPWM1_SYNC0_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO0 ESP32_PINMUX(0, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO1 ESP32_PINMUX(1, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO2 ESP32_PINMUX(2, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO3 ESP32_PINMUX(3, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO4 ESP32_PINMUX(4, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO5 ESP32_PINMUX(5, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO6 ESP32_PINMUX(6, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO7 ESP32_PINMUX(7, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO8 ESP32_PINMUX(8, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO9 ESP32_PINMUX(9, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO10 ESP32_PINMUX(10, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO11 ESP32_PINMUX(11, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO12 ESP32_PINMUX(12, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO13 ESP32_PINMUX(13, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO14 ESP32_PINMUX(14, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO15 ESP32_PINMUX(15, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO16 ESP32_PINMUX(16, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO17 ESP32_PINMUX(17, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO18 ESP32_PINMUX(18, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO19 ESP32_PINMUX(19, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO20 ESP32_PINMUX(20, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO21 ESP32_PINMUX(21, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO22 ESP32_PINMUX(22, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO23 ESP32_PINMUX(23, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO25 ESP32_PINMUX(25, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO26 ESP32_PINMUX(26, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO27 ESP32_PINMUX(27, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO32 ESP32_PINMUX(32, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO33 ESP32_PINMUX(33, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO34 ESP32_PINMUX(34, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO35 ESP32_PINMUX(35, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO36 ESP32_PINMUX(36, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO37 ESP32_PINMUX(37, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO38 ESP32_PINMUX(38, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC0_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
+#define MCPWM1_SYNC0_GPIO39 ESP32_PINMUX(39, ESP_PWM1_SYNC0_IN, ESP_NOSIG)
 
 /* MCPWM1_SYNC1 */
-#define MCPWM1_SYNC1_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO0 ESP32_PINMUX(0, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO1 ESP32_PINMUX(1, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO2 ESP32_PINMUX(2, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO3 ESP32_PINMUX(3, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO4 ESP32_PINMUX(4, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO5 ESP32_PINMUX(5, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO6 ESP32_PINMUX(6, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO7 ESP32_PINMUX(7, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO8 ESP32_PINMUX(8, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO9 ESP32_PINMUX(9, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO10 ESP32_PINMUX(10, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO11 ESP32_PINMUX(11, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO12 ESP32_PINMUX(12, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO13 ESP32_PINMUX(13, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO14 ESP32_PINMUX(14, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO15 ESP32_PINMUX(15, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO16 ESP32_PINMUX(16, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO17 ESP32_PINMUX(17, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO18 ESP32_PINMUX(18, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO19 ESP32_PINMUX(19, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO20 ESP32_PINMUX(20, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO21 ESP32_PINMUX(21, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO22 ESP32_PINMUX(22, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO23 ESP32_PINMUX(23, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO25 ESP32_PINMUX(25, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO26 ESP32_PINMUX(26, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO27 ESP32_PINMUX(27, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO32 ESP32_PINMUX(32, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO33 ESP32_PINMUX(33, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO34 ESP32_PINMUX(34, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO35 ESP32_PINMUX(35, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO36 ESP32_PINMUX(36, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO37 ESP32_PINMUX(37, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO38 ESP32_PINMUX(38, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC1_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
+#define MCPWM1_SYNC1_GPIO39 ESP32_PINMUX(39, ESP_PWM1_SYNC1_IN, ESP_NOSIG)
 
 /* MCPWM1_SYNC2 */
-#define MCPWM1_SYNC2_GPIO0 \
-	ESP32_PINMUX(0, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO0 ESP32_PINMUX(0, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO1 \
-	ESP32_PINMUX(1, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO1 ESP32_PINMUX(1, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO2 \
-	ESP32_PINMUX(2, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO2 ESP32_PINMUX(2, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO3 \
-	ESP32_PINMUX(3, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO3 ESP32_PINMUX(3, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO4 \
-	ESP32_PINMUX(4, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO4 ESP32_PINMUX(4, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO5 \
-	ESP32_PINMUX(5, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO5 ESP32_PINMUX(5, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO6 \
-	ESP32_PINMUX(6, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO6 ESP32_PINMUX(6, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO7 \
-	ESP32_PINMUX(7, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO7 ESP32_PINMUX(7, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO8 \
-	ESP32_PINMUX(8, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO8 ESP32_PINMUX(8, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO9 \
-	ESP32_PINMUX(9, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO9 ESP32_PINMUX(9, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO10 \
-	ESP32_PINMUX(10, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO10 ESP32_PINMUX(10, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO11 \
-	ESP32_PINMUX(11, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO11 ESP32_PINMUX(11, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO12 \
-	ESP32_PINMUX(12, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO12 ESP32_PINMUX(12, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO13 \
-	ESP32_PINMUX(13, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO13 ESP32_PINMUX(13, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO14 \
-	ESP32_PINMUX(14, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO14 ESP32_PINMUX(14, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO15 \
-	ESP32_PINMUX(15, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO15 ESP32_PINMUX(15, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO16 \
-	ESP32_PINMUX(16, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO16 ESP32_PINMUX(16, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO17 \
-	ESP32_PINMUX(17, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO17 ESP32_PINMUX(17, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO18 \
-	ESP32_PINMUX(18, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO18 ESP32_PINMUX(18, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO19 \
-	ESP32_PINMUX(19, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO19 ESP32_PINMUX(19, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO20 \
-	ESP32_PINMUX(20, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO20 ESP32_PINMUX(20, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO21 \
-	ESP32_PINMUX(21, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO21 ESP32_PINMUX(21, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO22 \
-	ESP32_PINMUX(22, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO22 ESP32_PINMUX(22, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO23 \
-	ESP32_PINMUX(23, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO23 ESP32_PINMUX(23, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO25 \
-	ESP32_PINMUX(25, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO25 ESP32_PINMUX(25, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO26 \
-	ESP32_PINMUX(26, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO26 ESP32_PINMUX(26, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO27 \
-	ESP32_PINMUX(27, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO27 ESP32_PINMUX(27, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO32 \
-	ESP32_PINMUX(32, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO32 ESP32_PINMUX(32, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO33 \
-	ESP32_PINMUX(33, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO33 ESP32_PINMUX(33, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO34 \
-	ESP32_PINMUX(34, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO34 ESP32_PINMUX(34, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO35 \
-	ESP32_PINMUX(35, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO35 ESP32_PINMUX(35, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO36 \
-	ESP32_PINMUX(36, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO36 ESP32_PINMUX(36, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO37 \
-	ESP32_PINMUX(37, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO37 ESP32_PINMUX(37, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO38 \
-	ESP32_PINMUX(38, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO38 ESP32_PINMUX(38, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
-#define MCPWM1_SYNC2_GPIO39 \
-	ESP32_PINMUX(39, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
+#define MCPWM1_SYNC2_GPIO39 ESP32_PINMUX(39, ESP_PWM1_SYNC2_IN, ESP_NOSIG)
 
 /* PCNT0_CH0CTRL */
-#define PCNT0_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
 /* PCNT0_CH0SIG */
-#define PCNT0_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
 /* PCNT0_CH1CTRL */
-#define PCNT0_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
 /* PCNT0_CH1SIG */
-#define PCNT0_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
 /* PCNT1_CH0CTRL */
-#define PCNT1_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
 /* PCNT1_CH0SIG */
-#define PCNT1_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
 /* PCNT1_CH1CTRL */
-#define PCNT1_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
 /* PCNT1_CH1SIG */
-#define PCNT1_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
 /* PCNT2_CH0CTRL */
-#define PCNT2_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
 /* PCNT2_CH0SIG */
-#define PCNT2_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
 /* PCNT2_CH1CTRL */
-#define PCNT2_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
 /* PCNT2_CH1SIG */
-#define PCNT2_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
 /* PCNT3_CH0CTRL */
-#define PCNT3_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
 /* PCNT3_CH0SIG */
-#define PCNT3_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
 /* PCNT3_CH1CTRL */
-#define PCNT3_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
 /* PCNT3_CH1SIG */
-#define PCNT3_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
 /* PCNT4_CH0CTRL */
-#define PCNT4_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN4, ESP_NOSIG)
 
 /* PCNT4_CH0SIG */
-#define PCNT4_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
-#define PCNT4_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
+#define PCNT4_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN4, ESP_NOSIG)
 
 /* PCNT4_CH1CTRL */
-#define PCNT4_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN4, ESP_NOSIG)
 
 /* PCNT4_CH1SIG */
-#define PCNT4_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
-#define PCNT4_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
+#define PCNT4_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN4, ESP_NOSIG)
 
 /* PCNT5_CH0CTRL */
-#define PCNT5_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN5, ESP_NOSIG)
 
 /* PCNT5_CH0SIG */
-#define PCNT5_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
-#define PCNT5_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
+#define PCNT5_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN5, ESP_NOSIG)
 
 /* PCNT5_CH1CTRL */
-#define PCNT5_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN5, ESP_NOSIG)
 
 /* PCNT5_CH1SIG */
-#define PCNT5_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
-#define PCNT5_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
+#define PCNT5_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN5, ESP_NOSIG)
 
 /* PCNT6_CH0CTRL */
-#define PCNT6_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN6, ESP_NOSIG)
 
 /* PCNT6_CH0SIG */
-#define PCNT6_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
-#define PCNT6_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
+#define PCNT6_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN6, ESP_NOSIG)
 
 /* PCNT6_CH1CTRL */
-#define PCNT6_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN6, ESP_NOSIG)
 
 /* PCNT6_CH1SIG */
-#define PCNT6_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
-#define PCNT6_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
+#define PCNT6_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN6, ESP_NOSIG)
 
 /* PCNT7_CH0CTRL */
-#define PCNT7_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN7, ESP_NOSIG)
 
 /* PCNT7_CH0SIG */
-#define PCNT7_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
-#define PCNT7_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
+#define PCNT7_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN7, ESP_NOSIG)
 
 /* PCNT7_CH1CTRL */
-#define PCNT7_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO22 ESP32_PINMUX(22, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO23 ESP32_PINMUX(23, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO25 ESP32_PINMUX(25, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN7, ESP_NOSIG)
 
 /* PCNT7_CH1SIG */
-#define PCNT7_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO22 \
-	ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO22 ESP32_PINMUX(22, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO23 \
-	ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO23 ESP32_PINMUX(23, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO25 \
-	ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO25 ESP32_PINMUX(25, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
-#define PCNT7_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
+#define PCNT7_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN7, ESP_NOSIG)
 
 /* SDHC0_CD */
-#define SDHC0_CD_GPIO5 \
-	ESP32_PINMUX(5, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO5 ESP32_PINMUX(5, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO6 \
-	ESP32_PINMUX(6, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO6 ESP32_PINMUX(6, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO7 \
-	ESP32_PINMUX(7, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO7 ESP32_PINMUX(7, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO8 \
-	ESP32_PINMUX(8, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO8 ESP32_PINMUX(8, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO9 \
-	ESP32_PINMUX(9, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO9 ESP32_PINMUX(9, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO10 \
-	ESP32_PINMUX(10, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO10 ESP32_PINMUX(10, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO11 \
-	ESP32_PINMUX(11, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO11 ESP32_PINMUX(11, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO16 \
-	ESP32_PINMUX(16, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO16 ESP32_PINMUX(16, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO17 \
-	ESP32_PINMUX(17, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO17 ESP32_PINMUX(17, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO18 \
-	ESP32_PINMUX(18, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO18 ESP32_PINMUX(18, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO19 \
-	ESP32_PINMUX(19, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO19 ESP32_PINMUX(19, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO20 \
-	ESP32_PINMUX(20, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO20 ESP32_PINMUX(20, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO21 \
-	ESP32_PINMUX(21, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO21 ESP32_PINMUX(21, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO22 \
-	ESP32_PINMUX(22, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO22 ESP32_PINMUX(22, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO23 \
-	ESP32_PINMUX(23, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO23 ESP32_PINMUX(23, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO25 \
-	ESP32_PINMUX(25, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO25 ESP32_PINMUX(25, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO26 \
-	ESP32_PINMUX(26, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO26 ESP32_PINMUX(26, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO27 \
-	ESP32_PINMUX(27, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO27 ESP32_PINMUX(27, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO32 \
-	ESP32_PINMUX(32, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO32 ESP32_PINMUX(32, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO33 \
-	ESP32_PINMUX(33, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO33 ESP32_PINMUX(33, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO34 \
-	ESP32_PINMUX(34, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO34 ESP32_PINMUX(34, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO35 \
-	ESP32_PINMUX(35, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO35 ESP32_PINMUX(35, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO36 \
-	ESP32_PINMUX(36, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO36 ESP32_PINMUX(36, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO37 \
-	ESP32_PINMUX(37, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO37 ESP32_PINMUX(37, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO38 \
-	ESP32_PINMUX(38, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO38 ESP32_PINMUX(38, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
-#define SDHC0_CD_GPIO39 \
-	ESP32_PINMUX(39, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
+#define SDHC0_CD_GPIO39 ESP32_PINMUX(39, ESP_HOST_CARD_DETECT_N_2, ESP_NOSIG)
 
 /* SDHC0_WP */
-#define SDHC0_WP_GPIO5 \
-	ESP32_PINMUX(5, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO5 ESP32_PINMUX(5, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO6 \
-	ESP32_PINMUX(6, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO6 ESP32_PINMUX(6, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO7 \
-	ESP32_PINMUX(7, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO7 ESP32_PINMUX(7, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO8 \
-	ESP32_PINMUX(8, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO8 ESP32_PINMUX(8, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO9 \
-	ESP32_PINMUX(9, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO9 ESP32_PINMUX(9, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO10 \
-	ESP32_PINMUX(10, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO10 ESP32_PINMUX(10, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO11 \
-	ESP32_PINMUX(11, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO11 ESP32_PINMUX(11, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO16 \
-	ESP32_PINMUX(16, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO16 ESP32_PINMUX(16, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO17 \
-	ESP32_PINMUX(17, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO17 ESP32_PINMUX(17, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO18 \
-	ESP32_PINMUX(18, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO18 ESP32_PINMUX(18, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO19 \
-	ESP32_PINMUX(19, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO19 ESP32_PINMUX(19, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO20 \
-	ESP32_PINMUX(20, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO20 ESP32_PINMUX(20, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO21 \
-	ESP32_PINMUX(21, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO21 ESP32_PINMUX(21, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO22 \
-	ESP32_PINMUX(22, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO22 ESP32_PINMUX(22, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO23 \
-	ESP32_PINMUX(23, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO23 ESP32_PINMUX(23, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO25 \
-	ESP32_PINMUX(25, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO25 ESP32_PINMUX(25, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO26 \
-	ESP32_PINMUX(26, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO26 ESP32_PINMUX(26, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO27 \
-	ESP32_PINMUX(27, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO27 ESP32_PINMUX(27, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO32 \
-	ESP32_PINMUX(32, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO32 ESP32_PINMUX(32, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO33 \
-	ESP32_PINMUX(33, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO33 ESP32_PINMUX(33, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO34 \
-	ESP32_PINMUX(34, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO34 ESP32_PINMUX(34, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO35 \
-	ESP32_PINMUX(35, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO35 ESP32_PINMUX(35, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO36 \
-	ESP32_PINMUX(36, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO36 ESP32_PINMUX(36, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO37 \
-	ESP32_PINMUX(37, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO37 ESP32_PINMUX(37, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO38 \
-	ESP32_PINMUX(38, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO38 ESP32_PINMUX(38, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
-#define SDHC0_WP_GPIO39 \
-	ESP32_PINMUX(39, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
+#define SDHC0_WP_GPIO39 ESP32_PINMUX(39, ESP_HOST_CARD_WRITE_PRT_2, ESP_NOSIG)
 
 /* SMI_MDC */
-#define SMI_MDC_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_EMAC_MDC_O)
 
-#define SMI_MDC_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_EMAC_MDC_O)
+#define SMI_MDC_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_EMAC_MDC_O)
 
 /* SMI_MDIO */
-#define SMI_MDIO_GPIO0 \
-	ESP32_PINMUX(0, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO0 ESP32_PINMUX(0, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO1 \
-	ESP32_PINMUX(1, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO1 ESP32_PINMUX(1, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO2 \
-	ESP32_PINMUX(2, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO2 ESP32_PINMUX(2, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO3 \
-	ESP32_PINMUX(3, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO3 ESP32_PINMUX(3, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO4 \
-	ESP32_PINMUX(4, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO4 ESP32_PINMUX(4, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO5 \
-	ESP32_PINMUX(5, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO5 ESP32_PINMUX(5, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO6 \
-	ESP32_PINMUX(6, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO6 ESP32_PINMUX(6, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO7 \
-	ESP32_PINMUX(7, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO7 ESP32_PINMUX(7, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO8 \
-	ESP32_PINMUX(8, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO8 ESP32_PINMUX(8, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO9 \
-	ESP32_PINMUX(9, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO9 ESP32_PINMUX(9, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO10 \
-	ESP32_PINMUX(10, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO10 ESP32_PINMUX(10, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO11 \
-	ESP32_PINMUX(11, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO11 ESP32_PINMUX(11, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO12 \
-	ESP32_PINMUX(12, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO12 ESP32_PINMUX(12, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO13 \
-	ESP32_PINMUX(13, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO13 ESP32_PINMUX(13, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO14 \
-	ESP32_PINMUX(14, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO14 ESP32_PINMUX(14, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO15 \
-	ESP32_PINMUX(15, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO15 ESP32_PINMUX(15, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO16 \
-	ESP32_PINMUX(16, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO16 ESP32_PINMUX(16, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO17 \
-	ESP32_PINMUX(17, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO17 ESP32_PINMUX(17, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO18 \
-	ESP32_PINMUX(18, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO18 ESP32_PINMUX(18, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO19 \
-	ESP32_PINMUX(19, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO19 ESP32_PINMUX(19, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO20 \
-	ESP32_PINMUX(20, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO20 ESP32_PINMUX(20, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO21 \
-	ESP32_PINMUX(21, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO21 ESP32_PINMUX(21, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO22 \
-	ESP32_PINMUX(22, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO22 ESP32_PINMUX(22, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO23 \
-	ESP32_PINMUX(23, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO23 ESP32_PINMUX(23, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO25 \
-	ESP32_PINMUX(25, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO25 ESP32_PINMUX(25, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO26 \
-	ESP32_PINMUX(26, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO26 ESP32_PINMUX(26, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO27 \
-	ESP32_PINMUX(27, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO27 ESP32_PINMUX(27, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO32 \
-	ESP32_PINMUX(32, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO32 ESP32_PINMUX(32, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
-#define SMI_MDIO_GPIO33 \
-	ESP32_PINMUX(33, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
+#define SMI_MDIO_GPIO33 ESP32_PINMUX(33, ESP_EMAC_MDI_I, ESP_EMAC_MDO_O)
 
 /* SPIM2_CSEL */
-#define SPIM2_CSEL_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICS0_OUT)
+#define SPIM2_CSEL_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICS0_OUT)
 
 /* SPIM2_CSEL1 */
-#define SPIM2_CSEL1_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICS1_OUT)
 
 /* SPIM2_CSEL2 */
-#define SPIM2_CSEL2_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICS2_OUT)
 
 /* SPIM2_MISO */
-#define SPIM2_MISO_GPIO0 \
-	ESP32_PINMUX(0, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO0 ESP32_PINMUX(0, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO1 \
-	ESP32_PINMUX(1, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO1 ESP32_PINMUX(1, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO2 \
-	ESP32_PINMUX(2, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO2 ESP32_PINMUX(2, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO3 \
-	ESP32_PINMUX(3, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO3 ESP32_PINMUX(3, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO4 \
-	ESP32_PINMUX(4, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO4 ESP32_PINMUX(4, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO5 \
-	ESP32_PINMUX(5, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO5 ESP32_PINMUX(5, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO6 \
-	ESP32_PINMUX(6, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO6 ESP32_PINMUX(6, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO7 \
-	ESP32_PINMUX(7, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO7 ESP32_PINMUX(7, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO8 \
-	ESP32_PINMUX(8, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO8 ESP32_PINMUX(8, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO9 \
-	ESP32_PINMUX(9, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO9 ESP32_PINMUX(9, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO10 \
-	ESP32_PINMUX(10, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO10 ESP32_PINMUX(10, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO11 \
-	ESP32_PINMUX(11, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO11 ESP32_PINMUX(11, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO12 \
-	ESP32_PINMUX(12, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO12 ESP32_PINMUX(12, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO13 \
-	ESP32_PINMUX(13, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO13 ESP32_PINMUX(13, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO14 \
-	ESP32_PINMUX(14, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO14 ESP32_PINMUX(14, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO15 \
-	ESP32_PINMUX(15, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO15 ESP32_PINMUX(15, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO16 \
-	ESP32_PINMUX(16, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO16 ESP32_PINMUX(16, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO17 \
-	ESP32_PINMUX(17, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO17 ESP32_PINMUX(17, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO18 \
-	ESP32_PINMUX(18, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO18 ESP32_PINMUX(18, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO19 \
-	ESP32_PINMUX(19, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO19 ESP32_PINMUX(19, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO20 \
-	ESP32_PINMUX(20, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO20 ESP32_PINMUX(20, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO21 \
-	ESP32_PINMUX(21, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO21 ESP32_PINMUX(21, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO22 \
-	ESP32_PINMUX(22, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO22 ESP32_PINMUX(22, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO23 \
-	ESP32_PINMUX(23, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO23 ESP32_PINMUX(23, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO25 \
-	ESP32_PINMUX(25, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO25 ESP32_PINMUX(25, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO26 \
-	ESP32_PINMUX(26, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO26 ESP32_PINMUX(26, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO27 \
-	ESP32_PINMUX(27, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO27 ESP32_PINMUX(27, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO32 \
-	ESP32_PINMUX(32, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO32 ESP32_PINMUX(32, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO33 \
-	ESP32_PINMUX(33, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO33 ESP32_PINMUX(33, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO34 \
-	ESP32_PINMUX(34, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO34 ESP32_PINMUX(34, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO35 \
-	ESP32_PINMUX(35, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO35 ESP32_PINMUX(35, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO36 \
-	ESP32_PINMUX(36, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO36 ESP32_PINMUX(36, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO37 \
-	ESP32_PINMUX(37, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO37 ESP32_PINMUX(37, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO38 \
-	ESP32_PINMUX(38, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO38 ESP32_PINMUX(38, ESP_HSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO39 \
-	ESP32_PINMUX(39, ESP_HSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO39 ESP32_PINMUX(39, ESP_HSPIQ_IN, ESP_NOSIG)
 
 /* SPIM2_MOSI */
-#define SPIM2_MOSI_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPID_OUT)
 
-#define SPIM2_MOSI_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPID_OUT)
+#define SPIM2_MOSI_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPID_OUT)
 
 /* SPIM2_SCLK */
-#define SPIM2_SCLK_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_HSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICLK_OUT)
+#define SPIM2_SCLK_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_HSPICLK_OUT)
 
 /* SPIM3_CSEL */
-#define SPIM3_CSEL_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICS0_OUT)
 
-#define SPIM3_CSEL_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICS0_OUT)
+#define SPIM3_CSEL_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICS0_OUT)
 
 /* SPIM3_CSEL1 */
-#define SPIM3_CSEL1_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICS1_OUT)
 
-#define SPIM3_CSEL1_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICS1_OUT)
+#define SPIM3_CSEL1_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICS1_OUT)
 
 /* SPIM3_CSEL2 */
-#define SPIM3_CSEL2_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICS2_OUT)
 
-#define SPIM3_CSEL2_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICS2_OUT)
+#define SPIM3_CSEL2_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICS2_OUT)
 
 /* SPIM3_MISO */
-#define SPIM3_MISO_GPIO0 \
-	ESP32_PINMUX(0, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO0 ESP32_PINMUX(0, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO1 \
-	ESP32_PINMUX(1, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO1 ESP32_PINMUX(1, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO2 \
-	ESP32_PINMUX(2, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO2 ESP32_PINMUX(2, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO3 \
-	ESP32_PINMUX(3, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO3 ESP32_PINMUX(3, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO4 \
-	ESP32_PINMUX(4, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO4 ESP32_PINMUX(4, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO5 \
-	ESP32_PINMUX(5, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO5 ESP32_PINMUX(5, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO6 \
-	ESP32_PINMUX(6, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO6 ESP32_PINMUX(6, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO7 \
-	ESP32_PINMUX(7, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO7 ESP32_PINMUX(7, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO8 \
-	ESP32_PINMUX(8, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO8 ESP32_PINMUX(8, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO9 \
-	ESP32_PINMUX(9, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO9 ESP32_PINMUX(9, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO10 \
-	ESP32_PINMUX(10, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO10 ESP32_PINMUX(10, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO11 \
-	ESP32_PINMUX(11, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO11 ESP32_PINMUX(11, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO12 \
-	ESP32_PINMUX(12, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO12 ESP32_PINMUX(12, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO13 \
-	ESP32_PINMUX(13, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO13 ESP32_PINMUX(13, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO14 \
-	ESP32_PINMUX(14, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO14 ESP32_PINMUX(14, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO15 \
-	ESP32_PINMUX(15, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO15 ESP32_PINMUX(15, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO16 \
-	ESP32_PINMUX(16, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO16 ESP32_PINMUX(16, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO17 \
-	ESP32_PINMUX(17, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO17 ESP32_PINMUX(17, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO18 \
-	ESP32_PINMUX(18, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO18 ESP32_PINMUX(18, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO19 \
-	ESP32_PINMUX(19, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO19 ESP32_PINMUX(19, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO20 \
-	ESP32_PINMUX(20, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO20 ESP32_PINMUX(20, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO21 \
-	ESP32_PINMUX(21, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO21 ESP32_PINMUX(21, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO22 \
-	ESP32_PINMUX(22, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO22 ESP32_PINMUX(22, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO23 \
-	ESP32_PINMUX(23, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO23 ESP32_PINMUX(23, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO25 \
-	ESP32_PINMUX(25, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO25 ESP32_PINMUX(25, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO26 \
-	ESP32_PINMUX(26, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO26 ESP32_PINMUX(26, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO27 \
-	ESP32_PINMUX(27, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO27 ESP32_PINMUX(27, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO32 \
-	ESP32_PINMUX(32, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO32 ESP32_PINMUX(32, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO33 \
-	ESP32_PINMUX(33, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO33 ESP32_PINMUX(33, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO34 \
-	ESP32_PINMUX(34, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO34 ESP32_PINMUX(34, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO35 \
-	ESP32_PINMUX(35, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO35 ESP32_PINMUX(35, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO36 \
-	ESP32_PINMUX(36, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO36 ESP32_PINMUX(36, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO37 \
-	ESP32_PINMUX(37, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO37 ESP32_PINMUX(37, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO38 \
-	ESP32_PINMUX(38, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO38 ESP32_PINMUX(38, ESP_VSPIQ_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO39 \
-	ESP32_PINMUX(39, ESP_VSPIQ_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO39 ESP32_PINMUX(39, ESP_VSPIQ_IN, ESP_NOSIG)
 
 /* SPIM3_MOSI */
-#define SPIM3_MOSI_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPID_OUT)
 
-#define SPIM3_MOSI_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPID_OUT)
+#define SPIM3_MOSI_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPID_OUT)
 
 /* SPIM3_SCLK */
-#define SPIM3_SCLK_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_VSPICLK_OUT)
 
-#define SPIM3_SCLK_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICLK_OUT)
+#define SPIM3_SCLK_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_VSPICLK_OUT)
 
 /* TWAI_BUS_OFF */
-#define TWAI_BUS_OFF_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
 /* TWAI_CLKOUT */
-#define TWAI_CLKOUT_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
 /* TWAI_RX */
-#define TWAI_RX_GPIO0 \
-	ESP32_PINMUX(0, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO0 ESP32_PINMUX(0, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO1 \
-	ESP32_PINMUX(1, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO1 ESP32_PINMUX(1, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO2 \
-	ESP32_PINMUX(2, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO2 ESP32_PINMUX(2, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO3 \
-	ESP32_PINMUX(3, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO3 ESP32_PINMUX(3, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO4 \
-	ESP32_PINMUX(4, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO4 ESP32_PINMUX(4, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO5 \
-	ESP32_PINMUX(5, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO5 ESP32_PINMUX(5, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO6 \
-	ESP32_PINMUX(6, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO6 ESP32_PINMUX(6, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO7 \
-	ESP32_PINMUX(7, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO7 ESP32_PINMUX(7, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO8 \
-	ESP32_PINMUX(8, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO8 ESP32_PINMUX(8, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO9 \
-	ESP32_PINMUX(9, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO9 ESP32_PINMUX(9, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO10 \
-	ESP32_PINMUX(10, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO10 ESP32_PINMUX(10, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO11 \
-	ESP32_PINMUX(11, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO11 ESP32_PINMUX(11, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO12 \
-	ESP32_PINMUX(12, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO12 ESP32_PINMUX(12, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO13 \
-	ESP32_PINMUX(13, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO13 ESP32_PINMUX(13, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO14 \
-	ESP32_PINMUX(14, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO14 ESP32_PINMUX(14, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO15 \
-	ESP32_PINMUX(15, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO15 ESP32_PINMUX(15, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO16 \
-	ESP32_PINMUX(16, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO16 ESP32_PINMUX(16, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO17 \
-	ESP32_PINMUX(17, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO17 ESP32_PINMUX(17, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO18 \
-	ESP32_PINMUX(18, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO18 ESP32_PINMUX(18, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO19 \
-	ESP32_PINMUX(19, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO19 ESP32_PINMUX(19, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO20 \
-	ESP32_PINMUX(20, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO20 ESP32_PINMUX(20, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO21 \
-	ESP32_PINMUX(21, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO21 ESP32_PINMUX(21, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO22 \
-	ESP32_PINMUX(22, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO22 ESP32_PINMUX(22, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO23 \
-	ESP32_PINMUX(23, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO23 ESP32_PINMUX(23, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO25 \
-	ESP32_PINMUX(25, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO25 ESP32_PINMUX(25, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO26 \
-	ESP32_PINMUX(26, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO26 ESP32_PINMUX(26, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO27 \
-	ESP32_PINMUX(27, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO27 ESP32_PINMUX(27, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO32 \
-	ESP32_PINMUX(32, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO32 ESP32_PINMUX(32, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO33 \
-	ESP32_PINMUX(33, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO33 ESP32_PINMUX(33, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO34 \
-	ESP32_PINMUX(34, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO34 ESP32_PINMUX(34, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO35 \
-	ESP32_PINMUX(35, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO35 ESP32_PINMUX(35, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO36 \
-	ESP32_PINMUX(36, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO36 ESP32_PINMUX(36, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO37 \
-	ESP32_PINMUX(37, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO37 ESP32_PINMUX(37, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO38 \
-	ESP32_PINMUX(38, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO38 ESP32_PINMUX(38, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO39 \
-	ESP32_PINMUX(39, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO39 ESP32_PINMUX(39, ESP_TWAI_RX, ESP_NOSIG)
 
 /* TWAI_TX */
-#define TWAI_TX_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_TX)
 
 /* UART0_CTS */
-#define UART0_CTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO0 ESP32_PINMUX(0, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO1 ESP32_PINMUX(1, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO2 ESP32_PINMUX(2, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO3 ESP32_PINMUX(3, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO4 ESP32_PINMUX(4, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO5 ESP32_PINMUX(5, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO6 ESP32_PINMUX(6, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO7 ESP32_PINMUX(7, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO8 ESP32_PINMUX(8, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO9 ESP32_PINMUX(9, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO10 ESP32_PINMUX(10, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO11 ESP32_PINMUX(11, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO12 ESP32_PINMUX(12, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO13 ESP32_PINMUX(13, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO14 ESP32_PINMUX(14, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO15 ESP32_PINMUX(15, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO16 ESP32_PINMUX(16, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO17 ESP32_PINMUX(17, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO18 ESP32_PINMUX(18, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO19 ESP32_PINMUX(19, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO20 ESP32_PINMUX(20, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO21 ESP32_PINMUX(21, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO22 \
-	ESP32_PINMUX(22, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO22 ESP32_PINMUX(22, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO23 \
-	ESP32_PINMUX(23, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO23 ESP32_PINMUX(23, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO25 \
-	ESP32_PINMUX(25, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO25 ESP32_PINMUX(25, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO26 ESP32_PINMUX(26, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO27 ESP32_PINMUX(27, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO32 ESP32_PINMUX(32, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO33 ESP32_PINMUX(33, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO34 \
-	ESP32_PINMUX(34, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO34 ESP32_PINMUX(34, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO35 \
-	ESP32_PINMUX(35, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO35 ESP32_PINMUX(35, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO36 \
-	ESP32_PINMUX(36, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO36 ESP32_PINMUX(36, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO37 \
-	ESP32_PINMUX(37, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO37 ESP32_PINMUX(37, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO38 \
-	ESP32_PINMUX(38, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO38 ESP32_PINMUX(38, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO39 \
-	ESP32_PINMUX(39, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO39 ESP32_PINMUX(39, ESP_U0CTS_IN, ESP_NOSIG)
 
 /* UART0_DSR */
-#define UART0_DSR_GPIO0 \
-	ESP32_PINMUX(0, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO0 ESP32_PINMUX(0, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO1 \
-	ESP32_PINMUX(1, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO1 ESP32_PINMUX(1, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO2 \
-	ESP32_PINMUX(2, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO2 ESP32_PINMUX(2, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO3 \
-	ESP32_PINMUX(3, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO3 ESP32_PINMUX(3, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO4 \
-	ESP32_PINMUX(4, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO4 ESP32_PINMUX(4, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO5 \
-	ESP32_PINMUX(5, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO5 ESP32_PINMUX(5, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO6 \
-	ESP32_PINMUX(6, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO6 ESP32_PINMUX(6, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO7 \
-	ESP32_PINMUX(7, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO7 ESP32_PINMUX(7, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO8 \
-	ESP32_PINMUX(8, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO8 ESP32_PINMUX(8, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO9 \
-	ESP32_PINMUX(9, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO9 ESP32_PINMUX(9, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO10 \
-	ESP32_PINMUX(10, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO10 ESP32_PINMUX(10, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO11 \
-	ESP32_PINMUX(11, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO11 ESP32_PINMUX(11, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO12 \
-	ESP32_PINMUX(12, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO12 ESP32_PINMUX(12, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO13 \
-	ESP32_PINMUX(13, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO13 ESP32_PINMUX(13, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO14 \
-	ESP32_PINMUX(14, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO14 ESP32_PINMUX(14, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO15 \
-	ESP32_PINMUX(15, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO15 ESP32_PINMUX(15, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO16 \
-	ESP32_PINMUX(16, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO16 ESP32_PINMUX(16, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO17 \
-	ESP32_PINMUX(17, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO17 ESP32_PINMUX(17, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO18 \
-	ESP32_PINMUX(18, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO18 ESP32_PINMUX(18, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO19 \
-	ESP32_PINMUX(19, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO19 ESP32_PINMUX(19, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO20 \
-	ESP32_PINMUX(20, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO20 ESP32_PINMUX(20, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO21 \
-	ESP32_PINMUX(21, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO21 ESP32_PINMUX(21, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO22 \
-	ESP32_PINMUX(22, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO22 ESP32_PINMUX(22, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO23 \
-	ESP32_PINMUX(23, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO23 ESP32_PINMUX(23, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO25 \
-	ESP32_PINMUX(25, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO25 ESP32_PINMUX(25, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO26 \
-	ESP32_PINMUX(26, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO26 ESP32_PINMUX(26, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO27 \
-	ESP32_PINMUX(27, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO27 ESP32_PINMUX(27, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO32 \
-	ESP32_PINMUX(32, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO32 ESP32_PINMUX(32, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO33 \
-	ESP32_PINMUX(33, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO33 ESP32_PINMUX(33, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO34 \
-	ESP32_PINMUX(34, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO34 ESP32_PINMUX(34, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO35 \
-	ESP32_PINMUX(35, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO35 ESP32_PINMUX(35, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO36 \
-	ESP32_PINMUX(36, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO36 ESP32_PINMUX(36, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO37 \
-	ESP32_PINMUX(37, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO37 ESP32_PINMUX(37, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO38 \
-	ESP32_PINMUX(38, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO38 ESP32_PINMUX(38, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO39 \
-	ESP32_PINMUX(39, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO39 ESP32_PINMUX(39, ESP_U0DSR_IN, ESP_NOSIG)
 
 /* UART0_DTR */
-#define UART0_DTR_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U0DTR_OUT)
 
 /* UART0_RTS */
-#define UART0_RTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U0RTS_OUT)
 
 /* UART0_RX */
-#define UART0_RX_GPIO0 \
-	ESP32_PINMUX(0, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO0 ESP32_PINMUX(0, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO1 \
-	ESP32_PINMUX(1, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO1 ESP32_PINMUX(1, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO2 \
-	ESP32_PINMUX(2, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO2 ESP32_PINMUX(2, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO3 \
-	ESP32_PINMUX(3, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO3 ESP32_PINMUX(3, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO4 \
-	ESP32_PINMUX(4, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO4 ESP32_PINMUX(4, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO5 \
-	ESP32_PINMUX(5, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO5 ESP32_PINMUX(5, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO6 \
-	ESP32_PINMUX(6, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO6 ESP32_PINMUX(6, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO7 \
-	ESP32_PINMUX(7, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO7 ESP32_PINMUX(7, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO8 \
-	ESP32_PINMUX(8, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO8 ESP32_PINMUX(8, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO9 \
-	ESP32_PINMUX(9, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO9 ESP32_PINMUX(9, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO10 \
-	ESP32_PINMUX(10, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO10 ESP32_PINMUX(10, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO11 \
-	ESP32_PINMUX(11, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO11 ESP32_PINMUX(11, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO12 \
-	ESP32_PINMUX(12, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO12 ESP32_PINMUX(12, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO13 \
-	ESP32_PINMUX(13, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO13 ESP32_PINMUX(13, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO14 \
-	ESP32_PINMUX(14, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO14 ESP32_PINMUX(14, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO15 \
-	ESP32_PINMUX(15, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO15 ESP32_PINMUX(15, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO16 \
-	ESP32_PINMUX(16, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO16 ESP32_PINMUX(16, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO17 \
-	ESP32_PINMUX(17, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO17 ESP32_PINMUX(17, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO18 \
-	ESP32_PINMUX(18, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO18 ESP32_PINMUX(18, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO19 \
-	ESP32_PINMUX(19, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO19 ESP32_PINMUX(19, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO20 \
-	ESP32_PINMUX(20, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO20 ESP32_PINMUX(20, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO21 \
-	ESP32_PINMUX(21, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO21 ESP32_PINMUX(21, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO22 \
-	ESP32_PINMUX(22, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO22 ESP32_PINMUX(22, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO23 \
-	ESP32_PINMUX(23, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO23 ESP32_PINMUX(23, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO25 \
-	ESP32_PINMUX(25, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO25 ESP32_PINMUX(25, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO26 \
-	ESP32_PINMUX(26, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO26 ESP32_PINMUX(26, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO27 \
-	ESP32_PINMUX(27, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO27 ESP32_PINMUX(27, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO32 \
-	ESP32_PINMUX(32, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO32 ESP32_PINMUX(32, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO33 \
-	ESP32_PINMUX(33, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO33 ESP32_PINMUX(33, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO34 \
-	ESP32_PINMUX(34, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO34 ESP32_PINMUX(34, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO35 \
-	ESP32_PINMUX(35, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO35 ESP32_PINMUX(35, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO36 \
-	ESP32_PINMUX(36, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO36 ESP32_PINMUX(36, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO37 \
-	ESP32_PINMUX(37, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO37 ESP32_PINMUX(37, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO38 \
-	ESP32_PINMUX(38, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO38 ESP32_PINMUX(38, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO39 \
-	ESP32_PINMUX(39, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO39 ESP32_PINMUX(39, ESP_U0RXD_IN, ESP_NOSIG)
 
 /* UART0_TX */
-#define UART0_TX_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U0TXD_OUT)
 
 /* UART1_CTS */
-#define UART1_CTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO0 ESP32_PINMUX(0, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO1 ESP32_PINMUX(1, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO2 ESP32_PINMUX(2, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO3 ESP32_PINMUX(3, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO4 ESP32_PINMUX(4, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO5 ESP32_PINMUX(5, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO6 ESP32_PINMUX(6, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO7 ESP32_PINMUX(7, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO8 ESP32_PINMUX(8, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO9 ESP32_PINMUX(9, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO10 ESP32_PINMUX(10, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO11 ESP32_PINMUX(11, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO12 ESP32_PINMUX(12, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO13 ESP32_PINMUX(13, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO14 ESP32_PINMUX(14, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO15 ESP32_PINMUX(15, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO16 ESP32_PINMUX(16, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO17 ESP32_PINMUX(17, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO18 ESP32_PINMUX(18, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO19 ESP32_PINMUX(19, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO20 ESP32_PINMUX(20, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO21 ESP32_PINMUX(21, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO22 \
-	ESP32_PINMUX(22, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO22 ESP32_PINMUX(22, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO23 \
-	ESP32_PINMUX(23, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO23 ESP32_PINMUX(23, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO25 \
-	ESP32_PINMUX(25, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO25 ESP32_PINMUX(25, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO26 ESP32_PINMUX(26, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO27 ESP32_PINMUX(27, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO32 ESP32_PINMUX(32, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO33 ESP32_PINMUX(33, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO34 \
-	ESP32_PINMUX(34, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO34 ESP32_PINMUX(34, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO35 \
-	ESP32_PINMUX(35, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO35 ESP32_PINMUX(35, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO36 \
-	ESP32_PINMUX(36, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO36 ESP32_PINMUX(36, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO37 \
-	ESP32_PINMUX(37, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO37 ESP32_PINMUX(37, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO38 \
-	ESP32_PINMUX(38, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO38 ESP32_PINMUX(38, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO39 \
-	ESP32_PINMUX(39, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO39 ESP32_PINMUX(39, ESP_U1CTS_IN, ESP_NOSIG)
 
 /* UART1_DSR */
-#define UART1_DSR_GPIO0 \
-	ESP32_PINMUX(0, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO0 ESP32_PINMUX(0, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO1 \
-	ESP32_PINMUX(1, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO1 ESP32_PINMUX(1, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO2 \
-	ESP32_PINMUX(2, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO2 ESP32_PINMUX(2, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO3 \
-	ESP32_PINMUX(3, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO3 ESP32_PINMUX(3, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO4 \
-	ESP32_PINMUX(4, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO4 ESP32_PINMUX(4, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO5 \
-	ESP32_PINMUX(5, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO5 ESP32_PINMUX(5, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO6 \
-	ESP32_PINMUX(6, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO6 ESP32_PINMUX(6, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO7 \
-	ESP32_PINMUX(7, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO7 ESP32_PINMUX(7, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO8 \
-	ESP32_PINMUX(8, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO8 ESP32_PINMUX(8, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO9 \
-	ESP32_PINMUX(9, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO9 ESP32_PINMUX(9, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO10 \
-	ESP32_PINMUX(10, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO10 ESP32_PINMUX(10, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO11 \
-	ESP32_PINMUX(11, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO11 ESP32_PINMUX(11, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO12 \
-	ESP32_PINMUX(12, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO12 ESP32_PINMUX(12, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO13 \
-	ESP32_PINMUX(13, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO13 ESP32_PINMUX(13, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO14 \
-	ESP32_PINMUX(14, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO14 ESP32_PINMUX(14, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO15 \
-	ESP32_PINMUX(15, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO15 ESP32_PINMUX(15, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO16 \
-	ESP32_PINMUX(16, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO16 ESP32_PINMUX(16, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO17 \
-	ESP32_PINMUX(17, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO17 ESP32_PINMUX(17, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO18 \
-	ESP32_PINMUX(18, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO18 ESP32_PINMUX(18, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO19 \
-	ESP32_PINMUX(19, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO19 ESP32_PINMUX(19, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO20 \
-	ESP32_PINMUX(20, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO20 ESP32_PINMUX(20, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO21 \
-	ESP32_PINMUX(21, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO21 ESP32_PINMUX(21, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO22 \
-	ESP32_PINMUX(22, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO22 ESP32_PINMUX(22, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO23 \
-	ESP32_PINMUX(23, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO23 ESP32_PINMUX(23, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO25 \
-	ESP32_PINMUX(25, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO25 ESP32_PINMUX(25, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO26 \
-	ESP32_PINMUX(26, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO26 ESP32_PINMUX(26, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO27 \
-	ESP32_PINMUX(27, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO27 ESP32_PINMUX(27, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO32 \
-	ESP32_PINMUX(32, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO32 ESP32_PINMUX(32, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO33 \
-	ESP32_PINMUX(33, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO33 ESP32_PINMUX(33, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO34 \
-	ESP32_PINMUX(34, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO34 ESP32_PINMUX(34, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO35 \
-	ESP32_PINMUX(35, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO35 ESP32_PINMUX(35, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO36 \
-	ESP32_PINMUX(36, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO36 ESP32_PINMUX(36, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO37 \
-	ESP32_PINMUX(37, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO37 ESP32_PINMUX(37, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO38 \
-	ESP32_PINMUX(38, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO38 ESP32_PINMUX(38, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO39 \
-	ESP32_PINMUX(39, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO39 ESP32_PINMUX(39, ESP_U1DSR_IN, ESP_NOSIG)
 
 /* UART1_DTR */
-#define UART1_DTR_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U1DTR_OUT)
 
 /* UART1_RTS */
-#define UART1_RTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U1RTS_OUT)
 
 /* UART1_RX */
-#define UART1_RX_GPIO0 \
-	ESP32_PINMUX(0, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO0 ESP32_PINMUX(0, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO1 \
-	ESP32_PINMUX(1, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO1 ESP32_PINMUX(1, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO2 \
-	ESP32_PINMUX(2, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO2 ESP32_PINMUX(2, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO3 \
-	ESP32_PINMUX(3, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO3 ESP32_PINMUX(3, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO4 \
-	ESP32_PINMUX(4, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO4 ESP32_PINMUX(4, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO5 \
-	ESP32_PINMUX(5, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO5 ESP32_PINMUX(5, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO6 \
-	ESP32_PINMUX(6, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO6 ESP32_PINMUX(6, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO7 \
-	ESP32_PINMUX(7, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO7 ESP32_PINMUX(7, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO8 \
-	ESP32_PINMUX(8, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO8 ESP32_PINMUX(8, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO9 \
-	ESP32_PINMUX(9, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO9 ESP32_PINMUX(9, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO10 \
-	ESP32_PINMUX(10, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO10 ESP32_PINMUX(10, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO11 \
-	ESP32_PINMUX(11, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO11 ESP32_PINMUX(11, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO12 \
-	ESP32_PINMUX(12, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO12 ESP32_PINMUX(12, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO13 \
-	ESP32_PINMUX(13, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO13 ESP32_PINMUX(13, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO14 \
-	ESP32_PINMUX(14, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO14 ESP32_PINMUX(14, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO15 \
-	ESP32_PINMUX(15, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO15 ESP32_PINMUX(15, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO16 \
-	ESP32_PINMUX(16, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO16 ESP32_PINMUX(16, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO17 \
-	ESP32_PINMUX(17, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO17 ESP32_PINMUX(17, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO18 \
-	ESP32_PINMUX(18, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO18 ESP32_PINMUX(18, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO19 \
-	ESP32_PINMUX(19, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO19 ESP32_PINMUX(19, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO20 \
-	ESP32_PINMUX(20, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO20 ESP32_PINMUX(20, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO21 \
-	ESP32_PINMUX(21, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO21 ESP32_PINMUX(21, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO22 \
-	ESP32_PINMUX(22, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO22 ESP32_PINMUX(22, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO23 \
-	ESP32_PINMUX(23, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO23 ESP32_PINMUX(23, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO25 \
-	ESP32_PINMUX(25, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO25 ESP32_PINMUX(25, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO26 \
-	ESP32_PINMUX(26, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO26 ESP32_PINMUX(26, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO27 \
-	ESP32_PINMUX(27, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO27 ESP32_PINMUX(27, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO32 \
-	ESP32_PINMUX(32, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO32 ESP32_PINMUX(32, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO33 \
-	ESP32_PINMUX(33, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO33 ESP32_PINMUX(33, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO34 \
-	ESP32_PINMUX(34, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO34 ESP32_PINMUX(34, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO35 \
-	ESP32_PINMUX(35, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO35 ESP32_PINMUX(35, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO36 \
-	ESP32_PINMUX(36, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO36 ESP32_PINMUX(36, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO37 \
-	ESP32_PINMUX(37, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO37 ESP32_PINMUX(37, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO38 \
-	ESP32_PINMUX(38, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO38 ESP32_PINMUX(38, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO39 \
-	ESP32_PINMUX(39, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO39 ESP32_PINMUX(39, ESP_U1RXD_IN, ESP_NOSIG)
 
 /* UART1_TX */
-#define UART1_TX_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U1TXD_OUT)
 
 /* UART2_CTS */
-#define UART2_CTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO0 ESP32_PINMUX(0, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO1 ESP32_PINMUX(1, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO2 ESP32_PINMUX(2, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO3 ESP32_PINMUX(3, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO4 ESP32_PINMUX(4, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO5 ESP32_PINMUX(5, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO6 ESP32_PINMUX(6, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO7 ESP32_PINMUX(7, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO8 ESP32_PINMUX(8, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO9 ESP32_PINMUX(9, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO10 ESP32_PINMUX(10, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO11 ESP32_PINMUX(11, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO12 ESP32_PINMUX(12, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO13 ESP32_PINMUX(13, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO14 ESP32_PINMUX(14, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO15 ESP32_PINMUX(15, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO16 ESP32_PINMUX(16, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO17 ESP32_PINMUX(17, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO18 ESP32_PINMUX(18, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO19 ESP32_PINMUX(19, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO20 ESP32_PINMUX(20, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO21 ESP32_PINMUX(21, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO22 \
-	ESP32_PINMUX(22, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO22 ESP32_PINMUX(22, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO23 \
-	ESP32_PINMUX(23, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO23 ESP32_PINMUX(23, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO25 \
-	ESP32_PINMUX(25, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO25 ESP32_PINMUX(25, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO26 ESP32_PINMUX(26, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO27 ESP32_PINMUX(27, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO32 ESP32_PINMUX(32, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO33 ESP32_PINMUX(33, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO34 \
-	ESP32_PINMUX(34, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO34 ESP32_PINMUX(34, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO35 \
-	ESP32_PINMUX(35, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO35 ESP32_PINMUX(35, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO36 \
-	ESP32_PINMUX(36, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO36 ESP32_PINMUX(36, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO37 \
-	ESP32_PINMUX(37, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO37 ESP32_PINMUX(37, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO38 \
-	ESP32_PINMUX(38, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO38 ESP32_PINMUX(38, ESP_U2CTS_IN, ESP_NOSIG)
 
-#define UART2_CTS_GPIO39 \
-	ESP32_PINMUX(39, ESP_U2CTS_IN, ESP_NOSIG)
+#define UART2_CTS_GPIO39 ESP32_PINMUX(39, ESP_U2CTS_IN, ESP_NOSIG)
 
 /* UART2_RTS */
-#define UART2_RTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U2RTS_OUT)
 
-#define UART2_RTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U2RTS_OUT)
+#define UART2_RTS_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U2RTS_OUT)
 
 /* UART2_RX */
-#define UART2_RX_GPIO0 \
-	ESP32_PINMUX(0, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO0 ESP32_PINMUX(0, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO1 \
-	ESP32_PINMUX(1, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO1 ESP32_PINMUX(1, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO2 \
-	ESP32_PINMUX(2, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO2 ESP32_PINMUX(2, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO3 \
-	ESP32_PINMUX(3, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO3 ESP32_PINMUX(3, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO4 \
-	ESP32_PINMUX(4, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO4 ESP32_PINMUX(4, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO5 \
-	ESP32_PINMUX(5, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO5 ESP32_PINMUX(5, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO6 \
-	ESP32_PINMUX(6, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO6 ESP32_PINMUX(6, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO7 \
-	ESP32_PINMUX(7, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO7 ESP32_PINMUX(7, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO8 \
-	ESP32_PINMUX(8, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO8 ESP32_PINMUX(8, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO9 \
-	ESP32_PINMUX(9, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO9 ESP32_PINMUX(9, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO10 \
-	ESP32_PINMUX(10, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO10 ESP32_PINMUX(10, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO11 \
-	ESP32_PINMUX(11, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO11 ESP32_PINMUX(11, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO12 \
-	ESP32_PINMUX(12, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO12 ESP32_PINMUX(12, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO13 \
-	ESP32_PINMUX(13, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO13 ESP32_PINMUX(13, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO14 \
-	ESP32_PINMUX(14, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO14 ESP32_PINMUX(14, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO15 \
-	ESP32_PINMUX(15, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO15 ESP32_PINMUX(15, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO16 \
-	ESP32_PINMUX(16, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO16 ESP32_PINMUX(16, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO17 \
-	ESP32_PINMUX(17, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO17 ESP32_PINMUX(17, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO18 \
-	ESP32_PINMUX(18, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO18 ESP32_PINMUX(18, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO19 \
-	ESP32_PINMUX(19, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO19 ESP32_PINMUX(19, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO20 \
-	ESP32_PINMUX(20, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO20 ESP32_PINMUX(20, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO21 \
-	ESP32_PINMUX(21, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO21 ESP32_PINMUX(21, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO22 \
-	ESP32_PINMUX(22, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO22 ESP32_PINMUX(22, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO23 \
-	ESP32_PINMUX(23, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO23 ESP32_PINMUX(23, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO25 \
-	ESP32_PINMUX(25, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO25 ESP32_PINMUX(25, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO26 \
-	ESP32_PINMUX(26, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO26 ESP32_PINMUX(26, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO27 \
-	ESP32_PINMUX(27, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO27 ESP32_PINMUX(27, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO32 \
-	ESP32_PINMUX(32, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO32 ESP32_PINMUX(32, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO33 \
-	ESP32_PINMUX(33, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO33 ESP32_PINMUX(33, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO34 \
-	ESP32_PINMUX(34, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO34 ESP32_PINMUX(34, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO35 \
-	ESP32_PINMUX(35, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO35 ESP32_PINMUX(35, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO36 \
-	ESP32_PINMUX(36, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO36 ESP32_PINMUX(36, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO37 \
-	ESP32_PINMUX(37, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO37 ESP32_PINMUX(37, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO38 \
-	ESP32_PINMUX(38, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO38 ESP32_PINMUX(38, ESP_U2RXD_IN, ESP_NOSIG)
 
-#define UART2_RX_GPIO39 \
-	ESP32_PINMUX(39, ESP_U2RXD_IN, ESP_NOSIG)
+#define UART2_RX_GPIO39 ESP32_PINMUX(39, ESP_U2RXD_IN, ESP_NOSIG)
 
 /* UART2_TX */
-#define UART2_TX_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO22 \
-	ESP32_PINMUX(22, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO22 ESP32_PINMUX(22, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO23 \
-	ESP32_PINMUX(23, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO23 ESP32_PINMUX(23, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO25 \
-	ESP32_PINMUX(25, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO25 ESP32_PINMUX(25, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U2TXD_OUT)
 
-#define UART2_TX_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U2TXD_OUT)
+#define UART2_TX_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U2TXD_OUT)
 
 
 #endif /* INC_DT_BINDS_PINCTRL_ESP32_PINCTRL_HAL_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/esp32s2-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/esp32s2-pinctrl.h
index 5d97a79b176f3..34ec1ada0b9b2 100644
--- a/include/zephyr/dt-bindings/pinctrl/esp32s2-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/esp32s2-pinctrl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -10,7578 +10,5680 @@
 #define INC_DT_BINDS_PINCTRL_ESP32S2_PINCTRL_HAL_H_
 
 /* I2C0_SCL */
-#define I2C0_SCL_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO28 \
-	ESP32_PINMUX(28, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO28 ESP32_PINMUX(28, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO29 \
-	ESP32_PINMUX(29, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO29 ESP32_PINMUX(29, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO30 \
-	ESP32_PINMUX(30, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO30 ESP32_PINMUX(30, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO31 \
-	ESP32_PINMUX(31, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO31 ESP32_PINMUX(31, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO34 \
-	ESP32_PINMUX(34, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO34 ESP32_PINMUX(34, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO35 \
-	ESP32_PINMUX(35, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO35 ESP32_PINMUX(35, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO36 \
-	ESP32_PINMUX(36, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO36 ESP32_PINMUX(36, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO37 \
-	ESP32_PINMUX(37, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO37 ESP32_PINMUX(37, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO38 \
-	ESP32_PINMUX(38, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO38 ESP32_PINMUX(38, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO39 \
-	ESP32_PINMUX(39, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO39 ESP32_PINMUX(39, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO40 \
-	ESP32_PINMUX(40, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO40 ESP32_PINMUX(40, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO41 \
-	ESP32_PINMUX(41, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO41 ESP32_PINMUX(41, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO42 \
-	ESP32_PINMUX(42, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO42 ESP32_PINMUX(42, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO43 \
-	ESP32_PINMUX(43, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO43 ESP32_PINMUX(43, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO44 \
-	ESP32_PINMUX(44, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO44 ESP32_PINMUX(44, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
-#define I2C0_SCL_GPIO45 \
-	ESP32_PINMUX(45, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
+#define I2C0_SCL_GPIO45 ESP32_PINMUX(45, ESP_I2CEXT0_SCL_IN, ESP_I2CEXT0_SCL_OUT)
 
 /* I2C0_SDA */
-#define I2C0_SDA_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO28 \
-	ESP32_PINMUX(28, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO28 ESP32_PINMUX(28, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO29 \
-	ESP32_PINMUX(29, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO29 ESP32_PINMUX(29, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO30 \
-	ESP32_PINMUX(30, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO30 ESP32_PINMUX(30, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO31 \
-	ESP32_PINMUX(31, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO31 ESP32_PINMUX(31, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO34 \
-	ESP32_PINMUX(34, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO34 ESP32_PINMUX(34, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO35 \
-	ESP32_PINMUX(35, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO35 ESP32_PINMUX(35, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO36 \
-	ESP32_PINMUX(36, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO36 ESP32_PINMUX(36, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO37 \
-	ESP32_PINMUX(37, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO37 ESP32_PINMUX(37, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO38 \
-	ESP32_PINMUX(38, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO38 ESP32_PINMUX(38, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO39 \
-	ESP32_PINMUX(39, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO39 ESP32_PINMUX(39, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO40 \
-	ESP32_PINMUX(40, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO40 ESP32_PINMUX(40, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO41 \
-	ESP32_PINMUX(41, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO41 ESP32_PINMUX(41, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO42 \
-	ESP32_PINMUX(42, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO42 ESP32_PINMUX(42, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO43 \
-	ESP32_PINMUX(43, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO43 ESP32_PINMUX(43, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO44 \
-	ESP32_PINMUX(44, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO44 ESP32_PINMUX(44, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
-#define I2C0_SDA_GPIO45 \
-	ESP32_PINMUX(45, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
+#define I2C0_SDA_GPIO45 ESP32_PINMUX(45, ESP_I2CEXT0_SDA_IN, ESP_I2CEXT0_SDA_OUT)
 
 /* I2C1_SCL */
-#define I2C1_SCL_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO28 \
-	ESP32_PINMUX(28, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO28 ESP32_PINMUX(28, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO29 \
-	ESP32_PINMUX(29, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO29 ESP32_PINMUX(29, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO30 \
-	ESP32_PINMUX(30, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO30 ESP32_PINMUX(30, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO31 \
-	ESP32_PINMUX(31, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO31 ESP32_PINMUX(31, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO34 \
-	ESP32_PINMUX(34, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO34 ESP32_PINMUX(34, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO35 \
-	ESP32_PINMUX(35, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO35 ESP32_PINMUX(35, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO36 \
-	ESP32_PINMUX(36, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO36 ESP32_PINMUX(36, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO37 \
-	ESP32_PINMUX(37, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO37 ESP32_PINMUX(37, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO38 \
-	ESP32_PINMUX(38, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO38 ESP32_PINMUX(38, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO39 \
-	ESP32_PINMUX(39, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO39 ESP32_PINMUX(39, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO40 \
-	ESP32_PINMUX(40, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO40 ESP32_PINMUX(40, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO41 \
-	ESP32_PINMUX(41, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO41 ESP32_PINMUX(41, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO42 \
-	ESP32_PINMUX(42, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO42 ESP32_PINMUX(42, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO43 \
-	ESP32_PINMUX(43, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO43 ESP32_PINMUX(43, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO44 \
-	ESP32_PINMUX(44, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO44 ESP32_PINMUX(44, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
-#define I2C1_SCL_GPIO45 \
-	ESP32_PINMUX(45, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
+#define I2C1_SCL_GPIO45 ESP32_PINMUX(45, ESP_I2CEXT1_SCL_IN, ESP_I2CEXT1_SCL_OUT)
 
 /* I2C1_SDA */
-#define I2C1_SDA_GPIO0 \
-	ESP32_PINMUX(0, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO0 ESP32_PINMUX(0, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO1 \
-	ESP32_PINMUX(1, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO1 ESP32_PINMUX(1, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO2 \
-	ESP32_PINMUX(2, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO2 ESP32_PINMUX(2, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO3 \
-	ESP32_PINMUX(3, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO3 ESP32_PINMUX(3, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO4 \
-	ESP32_PINMUX(4, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO4 ESP32_PINMUX(4, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO5 \
-	ESP32_PINMUX(5, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO5 ESP32_PINMUX(5, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO6 \
-	ESP32_PINMUX(6, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO6 ESP32_PINMUX(6, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO7 \
-	ESP32_PINMUX(7, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO7 ESP32_PINMUX(7, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO8 \
-	ESP32_PINMUX(8, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO8 ESP32_PINMUX(8, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO9 \
-	ESP32_PINMUX(9, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO9 ESP32_PINMUX(9, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO10 \
-	ESP32_PINMUX(10, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO10 ESP32_PINMUX(10, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO11 \
-	ESP32_PINMUX(11, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO11 ESP32_PINMUX(11, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO12 \
-	ESP32_PINMUX(12, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO12 ESP32_PINMUX(12, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO13 \
-	ESP32_PINMUX(13, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO13 ESP32_PINMUX(13, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO14 \
-	ESP32_PINMUX(14, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO14 ESP32_PINMUX(14, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO15 \
-	ESP32_PINMUX(15, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO15 ESP32_PINMUX(15, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO16 \
-	ESP32_PINMUX(16, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO16 ESP32_PINMUX(16, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO17 \
-	ESP32_PINMUX(17, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO17 ESP32_PINMUX(17, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO18 \
-	ESP32_PINMUX(18, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO18 ESP32_PINMUX(18, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO19 \
-	ESP32_PINMUX(19, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO19 ESP32_PINMUX(19, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO20 \
-	ESP32_PINMUX(20, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO20 ESP32_PINMUX(20, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO21 \
-	ESP32_PINMUX(21, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO21 ESP32_PINMUX(21, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO26 \
-	ESP32_PINMUX(26, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO26 ESP32_PINMUX(26, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO27 \
-	ESP32_PINMUX(27, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO27 ESP32_PINMUX(27, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO28 \
-	ESP32_PINMUX(28, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO28 ESP32_PINMUX(28, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO29 \
-	ESP32_PINMUX(29, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO29 ESP32_PINMUX(29, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO30 \
-	ESP32_PINMUX(30, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO30 ESP32_PINMUX(30, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO31 \
-	ESP32_PINMUX(31, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO31 ESP32_PINMUX(31, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO32 \
-	ESP32_PINMUX(32, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO32 ESP32_PINMUX(32, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO33 \
-	ESP32_PINMUX(33, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO33 ESP32_PINMUX(33, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO34 \
-	ESP32_PINMUX(34, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO34 ESP32_PINMUX(34, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO35 \
-	ESP32_PINMUX(35, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO35 ESP32_PINMUX(35, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO36 \
-	ESP32_PINMUX(36, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO36 ESP32_PINMUX(36, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO37 \
-	ESP32_PINMUX(37, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO37 ESP32_PINMUX(37, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO38 \
-	ESP32_PINMUX(38, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO38 ESP32_PINMUX(38, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO39 \
-	ESP32_PINMUX(39, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO39 ESP32_PINMUX(39, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO40 \
-	ESP32_PINMUX(40, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO40 ESP32_PINMUX(40, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO41 \
-	ESP32_PINMUX(41, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO41 ESP32_PINMUX(41, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO42 \
-	ESP32_PINMUX(42, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO42 ESP32_PINMUX(42, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO43 \
-	ESP32_PINMUX(43, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO43 ESP32_PINMUX(43, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO44 \
-	ESP32_PINMUX(44, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO44 ESP32_PINMUX(44, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
 
-#define I2C1_SDA_GPIO45 \
-	ESP32_PINMUX(45, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+#define I2C1_SDA_GPIO45 ESP32_PINMUX(45, ESP_I2CEXT1_SDA_IN, ESP_I2CEXT1_SDA_OUT)
+
+/* I2S0_I_BCK */
+#define I2S0_I_BCK_GPIO0 ESP32_PINMUX(0, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO1 ESP32_PINMUX(1, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO2 ESP32_PINMUX(2, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO3 ESP32_PINMUX(3, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO4 ESP32_PINMUX(4, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO5 ESP32_PINMUX(5, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO6 ESP32_PINMUX(6, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO7 ESP32_PINMUX(7, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO8 ESP32_PINMUX(8, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO9 ESP32_PINMUX(9, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO10 ESP32_PINMUX(10, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO11 ESP32_PINMUX(11, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO12 ESP32_PINMUX(12, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO13 ESP32_PINMUX(13, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO14 ESP32_PINMUX(14, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO15 ESP32_PINMUX(15, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO16 ESP32_PINMUX(16, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO17 ESP32_PINMUX(17, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO18 ESP32_PINMUX(18, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO19 ESP32_PINMUX(19, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO20 ESP32_PINMUX(20, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO21 ESP32_PINMUX(21, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO26 ESP32_PINMUX(26, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO27 ESP32_PINMUX(27, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO28 ESP32_PINMUX(28, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO29 ESP32_PINMUX(29, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO30 ESP32_PINMUX(30, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO31 ESP32_PINMUX(31, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO32 ESP32_PINMUX(32, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO33 ESP32_PINMUX(33, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO34 ESP32_PINMUX(34, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO35 ESP32_PINMUX(35, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO36 ESP32_PINMUX(36, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO37 ESP32_PINMUX(37, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO38 ESP32_PINMUX(38, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO39 ESP32_PINMUX(39, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO40 ESP32_PINMUX(40, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO41 ESP32_PINMUX(41, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO42 ESP32_PINMUX(42, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO43 ESP32_PINMUX(43, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO44 ESP32_PINMUX(44, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO45 ESP32_PINMUX(45, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+#define I2S0_I_BCK_GPIO46 ESP32_PINMUX(46, ESP_I2S0I_BCK_IN, ESP_I2S0I_BCK_OUT)
+
+/* I2S0_I_SD */
+#define I2S0_I_SD_GPIO0 ESP32_PINMUX(0, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO1 ESP32_PINMUX(1, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO2 ESP32_PINMUX(2, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO3 ESP32_PINMUX(3, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO4 ESP32_PINMUX(4, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO5 ESP32_PINMUX(5, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO6 ESP32_PINMUX(6, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO7 ESP32_PINMUX(7, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO8 ESP32_PINMUX(8, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO9 ESP32_PINMUX(9, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO10 ESP32_PINMUX(10, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO11 ESP32_PINMUX(11, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO12 ESP32_PINMUX(12, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO13 ESP32_PINMUX(13, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO14 ESP32_PINMUX(14, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO15 ESP32_PINMUX(15, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO16 ESP32_PINMUX(16, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO17 ESP32_PINMUX(17, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO18 ESP32_PINMUX(18, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO19 ESP32_PINMUX(19, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO20 ESP32_PINMUX(20, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO21 ESP32_PINMUX(21, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO26 ESP32_PINMUX(26, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO27 ESP32_PINMUX(27, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO28 ESP32_PINMUX(28, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO29 ESP32_PINMUX(29, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO30 ESP32_PINMUX(30, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO31 ESP32_PINMUX(31, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO32 ESP32_PINMUX(32, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO33 ESP32_PINMUX(33, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO34 ESP32_PINMUX(34, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO35 ESP32_PINMUX(35, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO36 ESP32_PINMUX(36, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO37 ESP32_PINMUX(37, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO38 ESP32_PINMUX(38, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO39 ESP32_PINMUX(39, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO40 ESP32_PINMUX(40, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO41 ESP32_PINMUX(41, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO42 ESP32_PINMUX(42, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO43 ESP32_PINMUX(43, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO44 ESP32_PINMUX(44, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO45 ESP32_PINMUX(45, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+#define I2S0_I_SD_GPIO46 ESP32_PINMUX(46, ESP_I2S0I_DATA_IN15, ESP_NOSIG)
+
+/* I2S0_I_WS */
+#define I2S0_I_WS_GPIO0 ESP32_PINMUX(0, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO1 ESP32_PINMUX(1, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO2 ESP32_PINMUX(2, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO3 ESP32_PINMUX(3, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO4 ESP32_PINMUX(4, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO5 ESP32_PINMUX(5, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO6 ESP32_PINMUX(6, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO7 ESP32_PINMUX(7, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO8 ESP32_PINMUX(8, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO9 ESP32_PINMUX(9, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO10 ESP32_PINMUX(10, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO11 ESP32_PINMUX(11, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO12 ESP32_PINMUX(12, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO13 ESP32_PINMUX(13, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO14 ESP32_PINMUX(14, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO15 ESP32_PINMUX(15, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO16 ESP32_PINMUX(16, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO17 ESP32_PINMUX(17, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO18 ESP32_PINMUX(18, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO19 ESP32_PINMUX(19, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO20 ESP32_PINMUX(20, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO21 ESP32_PINMUX(21, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO26 ESP32_PINMUX(26, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO27 ESP32_PINMUX(27, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO28 ESP32_PINMUX(28, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO29 ESP32_PINMUX(29, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO30 ESP32_PINMUX(30, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO31 ESP32_PINMUX(31, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO32 ESP32_PINMUX(32, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO33 ESP32_PINMUX(33, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO34 ESP32_PINMUX(34, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO35 ESP32_PINMUX(35, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO36 ESP32_PINMUX(36, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO37 ESP32_PINMUX(37, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO38 ESP32_PINMUX(38, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO39 ESP32_PINMUX(39, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO40 ESP32_PINMUX(40, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO41 ESP32_PINMUX(41, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO42 ESP32_PINMUX(42, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO43 ESP32_PINMUX(43, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO44 ESP32_PINMUX(44, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO45 ESP32_PINMUX(45, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+#define I2S0_I_WS_GPIO46 ESP32_PINMUX(46, ESP_I2S0I_WS_IN, ESP_I2S0I_WS_OUT)
+
+/* I2S0_MCLK */
+#define I2S0_MCLK_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_CLK_I2S)
+
+#define I2S0_MCLK_GPIO46 ESP32_PINMUX(46, ESP_NOSIG, ESP_CLK_I2S)
+
+/* I2S0_O_BCK */
+#define I2S0_O_BCK_GPIO0 ESP32_PINMUX(0, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO1 ESP32_PINMUX(1, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO2 ESP32_PINMUX(2, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO3 ESP32_PINMUX(3, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO4 ESP32_PINMUX(4, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO5 ESP32_PINMUX(5, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO6 ESP32_PINMUX(6, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO7 ESP32_PINMUX(7, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO8 ESP32_PINMUX(8, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO9 ESP32_PINMUX(9, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO10 ESP32_PINMUX(10, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO11 ESP32_PINMUX(11, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO12 ESP32_PINMUX(12, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO13 ESP32_PINMUX(13, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO14 ESP32_PINMUX(14, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO15 ESP32_PINMUX(15, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO16 ESP32_PINMUX(16, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO17 ESP32_PINMUX(17, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO18 ESP32_PINMUX(18, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO19 ESP32_PINMUX(19, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO20 ESP32_PINMUX(20, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO21 ESP32_PINMUX(21, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO26 ESP32_PINMUX(26, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO27 ESP32_PINMUX(27, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO28 ESP32_PINMUX(28, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO29 ESP32_PINMUX(29, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO30 ESP32_PINMUX(30, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO31 ESP32_PINMUX(31, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO32 ESP32_PINMUX(32, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO33 ESP32_PINMUX(33, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO34 ESP32_PINMUX(34, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO35 ESP32_PINMUX(35, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO36 ESP32_PINMUX(36, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO37 ESP32_PINMUX(37, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO38 ESP32_PINMUX(38, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO39 ESP32_PINMUX(39, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO40 ESP32_PINMUX(40, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO41 ESP32_PINMUX(41, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO42 ESP32_PINMUX(42, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO43 ESP32_PINMUX(43, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO44 ESP32_PINMUX(44, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO45 ESP32_PINMUX(45, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+#define I2S0_O_BCK_GPIO46 ESP32_PINMUX(46, ESP_I2S0O_BCK_IN, ESP_I2S0O_BCK_OUT)
+
+/* I2S0_O_SD */
+#define I2S0_O_SD_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+#define I2S0_O_SD_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_I2S0O_DATA_OUT23)
+
+/* I2S0_O_WS */
+#define I2S0_O_WS_GPIO0 ESP32_PINMUX(0, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO1 ESP32_PINMUX(1, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO2 ESP32_PINMUX(2, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO3 ESP32_PINMUX(3, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO4 ESP32_PINMUX(4, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO5 ESP32_PINMUX(5, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO6 ESP32_PINMUX(6, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO7 ESP32_PINMUX(7, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO8 ESP32_PINMUX(8, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO9 ESP32_PINMUX(9, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO10 ESP32_PINMUX(10, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO11 ESP32_PINMUX(11, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO12 ESP32_PINMUX(12, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO13 ESP32_PINMUX(13, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO14 ESP32_PINMUX(14, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO15 ESP32_PINMUX(15, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO16 ESP32_PINMUX(16, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO17 ESP32_PINMUX(17, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO18 ESP32_PINMUX(18, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO19 ESP32_PINMUX(19, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO20 ESP32_PINMUX(20, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO21 ESP32_PINMUX(21, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO26 ESP32_PINMUX(26, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO27 ESP32_PINMUX(27, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO28 ESP32_PINMUX(28, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO29 ESP32_PINMUX(29, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO30 ESP32_PINMUX(30, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO31 ESP32_PINMUX(31, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO32 ESP32_PINMUX(32, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO33 ESP32_PINMUX(33, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO34 ESP32_PINMUX(34, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO35 ESP32_PINMUX(35, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO36 ESP32_PINMUX(36, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO37 ESP32_PINMUX(37, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO38 ESP32_PINMUX(38, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO39 ESP32_PINMUX(39, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO40 ESP32_PINMUX(40, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO41 ESP32_PINMUX(41, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO42 ESP32_PINMUX(42, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO43 ESP32_PINMUX(43, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO44 ESP32_PINMUX(44, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO45 ESP32_PINMUX(45, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
+
+#define I2S0_O_WS_GPIO46 ESP32_PINMUX(46, ESP_I2S0O_WS_IN, ESP_I2S0O_WS_OUT)
 
 /* LEDC_CH0 */
-#define LEDC_CH0_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
-#define LEDC_CH0_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
+#define LEDC_CH0_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT0)
 
 /* LEDC_CH1 */
-#define LEDC_CH1_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
-#define LEDC_CH1_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
+#define LEDC_CH1_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT1)
 
 /* LEDC_CH2 */
-#define LEDC_CH2_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
-#define LEDC_CH2_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
+#define LEDC_CH2_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT2)
 
 /* LEDC_CH3 */
-#define LEDC_CH3_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
-#define LEDC_CH3_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
+#define LEDC_CH3_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT3)
 
 /* LEDC_CH4 */
-#define LEDC_CH4_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
-#define LEDC_CH4_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
+#define LEDC_CH4_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT4)
 
 /* LEDC_CH5 */
-#define LEDC_CH5_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
-#define LEDC_CH5_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
+#define LEDC_CH5_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT5)
 
 /* LEDC_CH6 */
-#define LEDC_CH6_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
-#define LEDC_CH6_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
+#define LEDC_CH6_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT6)
 
 /* LEDC_CH7 */
-#define LEDC_CH7_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
-#define LEDC_CH7_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
+#define LEDC_CH7_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_LEDC_LS_SIG_OUT7)
 
 /* PCNT0_CH0CTRL */
-#define PCNT0_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN0, ESP_NOSIG)
 
 /* PCNT0_CH0SIG */
-#define PCNT0_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
-#define PCNT0_CH0SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
+#define PCNT0_CH0SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN0, ESP_NOSIG)
 
 /* PCNT0_CH1CTRL */
-#define PCNT0_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN0, ESP_NOSIG)
 
 /* PCNT0_CH1SIG */
-#define PCNT0_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
-#define PCNT0_CH1SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
+#define PCNT0_CH1SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN0, ESP_NOSIG)
 
 /* PCNT1_CH0CTRL */
-#define PCNT1_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN1, ESP_NOSIG)
 
 /* PCNT1_CH0SIG */
-#define PCNT1_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
-#define PCNT1_CH0SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
+#define PCNT1_CH0SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN1, ESP_NOSIG)
 
 /* PCNT1_CH1CTRL */
-#define PCNT1_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN1, ESP_NOSIG)
 
 /* PCNT1_CH1SIG */
-#define PCNT1_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
-#define PCNT1_CH1SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
+#define PCNT1_CH1SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN1, ESP_NOSIG)
 
 /* PCNT2_CH0CTRL */
-#define PCNT2_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
-#define PCNT2_CH0CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
+#define PCNT2_CH0CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN2, ESP_NOSIG)
 
 /* PCNT2_CH0SIG */
-#define PCNT2_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT2_CH0SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT2_CH0SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
 /* PCNT2_CH1CTRL */
-#define PCNT2_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN2, ESP_NOSIG)
 
 /* PCNT2_CH1SIG */
-#define PCNT2_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
-#define PCNT2_CH1SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
+#define PCNT2_CH1SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN2, ESP_NOSIG)
 
 /* PCNT3_CH0CTRL */
-#define PCNT3_CH0CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH0_IN3, ESP_NOSIG)
 
 /* PCNT3_CH0SIG */
-#define PCNT3_CH0SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
-#define PCNT3_CH0SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
+#define PCNT3_CH0SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH0_IN3, ESP_NOSIG)
 
 /* PCNT3_CH1CTRL */
-#define PCNT3_CH1CTRL_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO0 ESP32_PINMUX(0, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO1 ESP32_PINMUX(1, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO2 ESP32_PINMUX(2, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO3 ESP32_PINMUX(3, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO4 ESP32_PINMUX(4, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO5 ESP32_PINMUX(5, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO6 ESP32_PINMUX(6, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO7 ESP32_PINMUX(7, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO8 ESP32_PINMUX(8, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO9 ESP32_PINMUX(9, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO10 ESP32_PINMUX(10, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO11 ESP32_PINMUX(11, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO12 ESP32_PINMUX(12, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO13 ESP32_PINMUX(13, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO14 ESP32_PINMUX(14, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO15 ESP32_PINMUX(15, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO16 ESP32_PINMUX(16, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO17 ESP32_PINMUX(17, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO18 ESP32_PINMUX(18, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO19 ESP32_PINMUX(19, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO20 ESP32_PINMUX(20, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO21 ESP32_PINMUX(21, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO26 ESP32_PINMUX(26, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO27 ESP32_PINMUX(27, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO28 ESP32_PINMUX(28, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO29 ESP32_PINMUX(29, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO30 ESP32_PINMUX(30, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO31 ESP32_PINMUX(31, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO32 ESP32_PINMUX(32, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO33 ESP32_PINMUX(33, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO34 ESP32_PINMUX(34, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO35 ESP32_PINMUX(35, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO36 ESP32_PINMUX(36, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO37 ESP32_PINMUX(37, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO38 ESP32_PINMUX(38, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO39 ESP32_PINMUX(39, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO40 ESP32_PINMUX(40, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO41 ESP32_PINMUX(41, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO42 ESP32_PINMUX(42, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO43 ESP32_PINMUX(43, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO44 ESP32_PINMUX(44, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO45 ESP32_PINMUX(45, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1CTRL_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1CTRL_GPIO46 ESP32_PINMUX(46, ESP_PCNT_CTRL_CH1_IN3, ESP_NOSIG)
 
 /* PCNT3_CH1SIG */
-#define PCNT3_CH1SIG_GPIO0 \
-	ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO0 ESP32_PINMUX(0, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO1 \
-	ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO1 ESP32_PINMUX(1, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO2 \
-	ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO2 ESP32_PINMUX(2, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO3 \
-	ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO3 ESP32_PINMUX(3, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO4 \
-	ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO4 ESP32_PINMUX(4, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO5 \
-	ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO5 ESP32_PINMUX(5, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO6 \
-	ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO6 ESP32_PINMUX(6, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO7 \
-	ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO7 ESP32_PINMUX(7, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO8 \
-	ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO8 ESP32_PINMUX(8, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO9 \
-	ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO9 ESP32_PINMUX(9, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO10 \
-	ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO10 ESP32_PINMUX(10, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO11 \
-	ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO11 ESP32_PINMUX(11, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO12 \
-	ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO12 ESP32_PINMUX(12, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO13 \
-	ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO13 ESP32_PINMUX(13, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO14 \
-	ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO14 ESP32_PINMUX(14, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO15 \
-	ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO15 ESP32_PINMUX(15, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO16 \
-	ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO16 ESP32_PINMUX(16, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO17 \
-	ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO17 ESP32_PINMUX(17, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO18 \
-	ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO18 ESP32_PINMUX(18, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO19 \
-	ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO19 ESP32_PINMUX(19, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO20 \
-	ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO20 ESP32_PINMUX(20, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO21 \
-	ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO21 ESP32_PINMUX(21, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO26 \
-	ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO26 ESP32_PINMUX(26, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO27 \
-	ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO27 ESP32_PINMUX(27, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO28 \
-	ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO28 ESP32_PINMUX(28, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO29 \
-	ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO29 ESP32_PINMUX(29, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO30 \
-	ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO30 ESP32_PINMUX(30, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO31 \
-	ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO31 ESP32_PINMUX(31, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO32 \
-	ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO32 ESP32_PINMUX(32, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO33 \
-	ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO33 ESP32_PINMUX(33, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO34 \
-	ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO34 ESP32_PINMUX(34, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO35 \
-	ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO35 ESP32_PINMUX(35, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO36 \
-	ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO36 ESP32_PINMUX(36, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO37 \
-	ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO37 ESP32_PINMUX(37, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO38 \
-	ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO38 ESP32_PINMUX(38, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO39 \
-	ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO39 ESP32_PINMUX(39, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO40 \
-	ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO40 ESP32_PINMUX(40, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO41 \
-	ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO41 ESP32_PINMUX(41, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO42 \
-	ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO42 ESP32_PINMUX(42, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO43 \
-	ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO43 ESP32_PINMUX(43, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO44 \
-	ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO44 ESP32_PINMUX(44, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO45 \
-	ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO45 ESP32_PINMUX(45, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
-#define PCNT3_CH1SIG_GPIO46 \
-	ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
+#define PCNT3_CH1SIG_GPIO46 ESP32_PINMUX(46, ESP_PCNT_SIG_CH1_IN3, ESP_NOSIG)
 
 /* SPIM2_CSEL */
-#define SPIM2_CSEL_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS0_OUT)
 
-#define SPIM2_CSEL_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS0_OUT)
+#define SPIM2_CSEL_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS0_OUT)
 
 /* SPIM2_CSEL1 */
-#define SPIM2_CSEL1_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS1_OUT)
 
-#define SPIM2_CSEL1_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS1_OUT)
+#define SPIM2_CSEL1_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS1_OUT)
 
 /* SPIM2_CSEL2 */
-#define SPIM2_CSEL2_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS2_OUT)
 
-#define SPIM2_CSEL2_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS2_OUT)
+#define SPIM2_CSEL2_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS2_OUT)
 
 /* SPIM2_CSEL3 */
-#define SPIM2_CSEL3_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS3_OUT)
 
-#define SPIM2_CSEL3_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS3_OUT)
+#define SPIM2_CSEL3_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS3_OUT)
 
 /* SPIM2_CSEL4 */
-#define SPIM2_CSEL4_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS4_OUT)
 
-#define SPIM2_CSEL4_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS4_OUT)
+#define SPIM2_CSEL4_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS4_OUT)
 
 /* SPIM2_CSEL5 */
-#define SPIM2_CSEL5_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICS5_OUT)
 
-#define SPIM2_CSEL5_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS5_OUT)
+#define SPIM2_CSEL5_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICS5_OUT)
 
 /* SPIM2_MISO */
-#define SPIM2_MISO_GPIO0 \
-	ESP32_PINMUX(0, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO0 ESP32_PINMUX(0, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO1 \
-	ESP32_PINMUX(1, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO1 ESP32_PINMUX(1, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO2 \
-	ESP32_PINMUX(2, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO2 ESP32_PINMUX(2, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO3 \
-	ESP32_PINMUX(3, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO3 ESP32_PINMUX(3, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO4 \
-	ESP32_PINMUX(4, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO4 ESP32_PINMUX(4, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO5 \
-	ESP32_PINMUX(5, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO5 ESP32_PINMUX(5, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO6 \
-	ESP32_PINMUX(6, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO6 ESP32_PINMUX(6, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO7 \
-	ESP32_PINMUX(7, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO7 ESP32_PINMUX(7, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO8 \
-	ESP32_PINMUX(8, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO8 ESP32_PINMUX(8, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO9 \
-	ESP32_PINMUX(9, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO9 ESP32_PINMUX(9, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO10 \
-	ESP32_PINMUX(10, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO10 ESP32_PINMUX(10, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO11 \
-	ESP32_PINMUX(11, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO11 ESP32_PINMUX(11, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO12 \
-	ESP32_PINMUX(12, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO12 ESP32_PINMUX(12, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO13 \
-	ESP32_PINMUX(13, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO13 ESP32_PINMUX(13, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO14 \
-	ESP32_PINMUX(14, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO14 ESP32_PINMUX(14, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO15 \
-	ESP32_PINMUX(15, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO15 ESP32_PINMUX(15, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO16 \
-	ESP32_PINMUX(16, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO16 ESP32_PINMUX(16, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO17 \
-	ESP32_PINMUX(17, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO17 ESP32_PINMUX(17, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO18 \
-	ESP32_PINMUX(18, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO18 ESP32_PINMUX(18, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO19 \
-	ESP32_PINMUX(19, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO19 ESP32_PINMUX(19, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO20 \
-	ESP32_PINMUX(20, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO20 ESP32_PINMUX(20, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO21 \
-	ESP32_PINMUX(21, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO21 ESP32_PINMUX(21, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO26 \
-	ESP32_PINMUX(26, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO26 ESP32_PINMUX(26, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO27 \
-	ESP32_PINMUX(27, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO27 ESP32_PINMUX(27, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO28 \
-	ESP32_PINMUX(28, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO28 ESP32_PINMUX(28, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO29 \
-	ESP32_PINMUX(29, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO29 ESP32_PINMUX(29, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO30 \
-	ESP32_PINMUX(30, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO30 ESP32_PINMUX(30, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO31 \
-	ESP32_PINMUX(31, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO31 ESP32_PINMUX(31, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO32 \
-	ESP32_PINMUX(32, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO32 ESP32_PINMUX(32, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO33 \
-	ESP32_PINMUX(33, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO33 ESP32_PINMUX(33, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO34 \
-	ESP32_PINMUX(34, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO34 ESP32_PINMUX(34, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO35 \
-	ESP32_PINMUX(35, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO35 ESP32_PINMUX(35, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO36 \
-	ESP32_PINMUX(36, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO36 ESP32_PINMUX(36, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO37 \
-	ESP32_PINMUX(37, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO37 ESP32_PINMUX(37, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO38 \
-	ESP32_PINMUX(38, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO38 ESP32_PINMUX(38, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO39 \
-	ESP32_PINMUX(39, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO39 ESP32_PINMUX(39, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO40 \
-	ESP32_PINMUX(40, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO40 ESP32_PINMUX(40, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO41 \
-	ESP32_PINMUX(41, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO41 ESP32_PINMUX(41, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO42 \
-	ESP32_PINMUX(42, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO42 ESP32_PINMUX(42, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO43 \
-	ESP32_PINMUX(43, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO43 ESP32_PINMUX(43, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO44 \
-	ESP32_PINMUX(44, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO44 ESP32_PINMUX(44, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO45 \
-	ESP32_PINMUX(45, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO45 ESP32_PINMUX(45, ESP_FSPIQ_IN, ESP_NOSIG)
 
-#define SPIM2_MISO_GPIO46 \
-	ESP32_PINMUX(46, ESP_FSPIQ_IN, ESP_NOSIG)
+#define SPIM2_MISO_GPIO46 ESP32_PINMUX(46, ESP_FSPIQ_IN, ESP_NOSIG)
 
 /* SPIM2_MOSI */
-#define SPIM2_MOSI_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPID_OUT)
 
-#define SPIM2_MOSI_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPID_OUT)
+#define SPIM2_MOSI_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPID_OUT)
 
 /* SPIM2_SCLK */
-#define SPIM2_SCLK_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_FSPICLK_OUT)
 
-#define SPIM2_SCLK_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICLK_OUT)
+#define SPIM2_SCLK_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_FSPICLK_OUT)
 
 /* SPIM3_CSEL */
-#define SPIM3_CSEL_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
-#define SPIM3_CSEL_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CS0_OUT)
+#define SPIM3_CSEL_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CS0_OUT)
 
 /* SPIM3_CSEL1 */
-#define SPIM3_CSEL1_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
-#define SPIM3_CSEL1_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CS1_OUT)
+#define SPIM3_CSEL1_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CS1_OUT)
 
 /* SPIM3_CSEL2 */
-#define SPIM3_CSEL2_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
-#define SPIM3_CSEL2_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CS2_OUT)
+#define SPIM3_CSEL2_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CS2_OUT)
 
 /* SPIM3_MISO */
-#define SPIM3_MISO_GPIO0 \
-	ESP32_PINMUX(0, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO0 ESP32_PINMUX(0, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO1 \
-	ESP32_PINMUX(1, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO1 ESP32_PINMUX(1, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO2 \
-	ESP32_PINMUX(2, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO2 ESP32_PINMUX(2, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO3 \
-	ESP32_PINMUX(3, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO3 ESP32_PINMUX(3, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO4 \
-	ESP32_PINMUX(4, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO4 ESP32_PINMUX(4, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO5 \
-	ESP32_PINMUX(5, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO5 ESP32_PINMUX(5, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO6 \
-	ESP32_PINMUX(6, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO6 ESP32_PINMUX(6, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO7 \
-	ESP32_PINMUX(7, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO7 ESP32_PINMUX(7, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO8 \
-	ESP32_PINMUX(8, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO8 ESP32_PINMUX(8, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO9 \
-	ESP32_PINMUX(9, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO9 ESP32_PINMUX(9, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO10 \
-	ESP32_PINMUX(10, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO10 ESP32_PINMUX(10, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO11 \
-	ESP32_PINMUX(11, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO11 ESP32_PINMUX(11, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO12 \
-	ESP32_PINMUX(12, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO12 ESP32_PINMUX(12, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO13 \
-	ESP32_PINMUX(13, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO13 ESP32_PINMUX(13, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO14 \
-	ESP32_PINMUX(14, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO14 ESP32_PINMUX(14, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO15 \
-	ESP32_PINMUX(15, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO15 ESP32_PINMUX(15, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO16 \
-	ESP32_PINMUX(16, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO16 ESP32_PINMUX(16, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO17 \
-	ESP32_PINMUX(17, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO17 ESP32_PINMUX(17, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO18 \
-	ESP32_PINMUX(18, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO18 ESP32_PINMUX(18, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO19 \
-	ESP32_PINMUX(19, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO19 ESP32_PINMUX(19, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO20 \
-	ESP32_PINMUX(20, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO20 ESP32_PINMUX(20, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO21 \
-	ESP32_PINMUX(21, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO21 ESP32_PINMUX(21, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO26 \
-	ESP32_PINMUX(26, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO26 ESP32_PINMUX(26, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO27 \
-	ESP32_PINMUX(27, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO27 ESP32_PINMUX(27, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO28 \
-	ESP32_PINMUX(28, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO28 ESP32_PINMUX(28, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO29 \
-	ESP32_PINMUX(29, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO29 ESP32_PINMUX(29, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO30 \
-	ESP32_PINMUX(30, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO30 ESP32_PINMUX(30, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO31 \
-	ESP32_PINMUX(31, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO31 ESP32_PINMUX(31, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO32 \
-	ESP32_PINMUX(32, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO32 ESP32_PINMUX(32, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO33 \
-	ESP32_PINMUX(33, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO33 ESP32_PINMUX(33, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO34 \
-	ESP32_PINMUX(34, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO34 ESP32_PINMUX(34, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO35 \
-	ESP32_PINMUX(35, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO35 ESP32_PINMUX(35, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO36 \
-	ESP32_PINMUX(36, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO36 ESP32_PINMUX(36, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO37 \
-	ESP32_PINMUX(37, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO37 ESP32_PINMUX(37, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO38 \
-	ESP32_PINMUX(38, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO38 ESP32_PINMUX(38, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO39 \
-	ESP32_PINMUX(39, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO39 ESP32_PINMUX(39, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO40 \
-	ESP32_PINMUX(40, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO40 ESP32_PINMUX(40, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO41 \
-	ESP32_PINMUX(41, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO41 ESP32_PINMUX(41, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO42 \
-	ESP32_PINMUX(42, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO42 ESP32_PINMUX(42, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO43 \
-	ESP32_PINMUX(43, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO43 ESP32_PINMUX(43, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO44 \
-	ESP32_PINMUX(44, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO44 ESP32_PINMUX(44, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO45 \
-	ESP32_PINMUX(45, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO45 ESP32_PINMUX(45, ESP_SPI3_Q_IN, ESP_NOSIG)
 
-#define SPIM3_MISO_GPIO46 \
-	ESP32_PINMUX(46, ESP_SPI3_Q_IN, ESP_NOSIG)
+#define SPIM3_MISO_GPIO46 ESP32_PINMUX(46, ESP_SPI3_Q_IN, ESP_NOSIG)
 
 /* SPIM3_MOSI */
-#define SPIM3_MOSI_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_D_OUT)
 
-#define SPIM3_MOSI_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_D_OUT)
+#define SPIM3_MOSI_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_D_OUT)
 
 /* SPIM3_SCLK */
-#define SPIM3_SCLK_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
-#define SPIM3_SCLK_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
+#define SPIM3_SCLK_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_SPI3_CLK_OUT_MUX)
 
 /* TWAI_BUS_OFF */
-#define TWAI_BUS_OFF_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
-#define TWAI_BUS_OFF_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
+#define TWAI_BUS_OFF_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_TWAI_BUS_OFF_ON)
 
 /* TWAI_CLKOUT */
-#define TWAI_CLKOUT_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
-#define TWAI_CLKOUT_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_TWAI_CLKOUT)
+#define TWAI_CLKOUT_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_TWAI_CLKOUT)
 
 /* TWAI_RX */
-#define TWAI_RX_GPIO0 \
-	ESP32_PINMUX(0, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO0 ESP32_PINMUX(0, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO1 \
-	ESP32_PINMUX(1, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO1 ESP32_PINMUX(1, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO2 \
-	ESP32_PINMUX(2, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO2 ESP32_PINMUX(2, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO3 \
-	ESP32_PINMUX(3, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO3 ESP32_PINMUX(3, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO4 \
-	ESP32_PINMUX(4, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO4 ESP32_PINMUX(4, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO5 \
-	ESP32_PINMUX(5, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO5 ESP32_PINMUX(5, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO6 \
-	ESP32_PINMUX(6, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO6 ESP32_PINMUX(6, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO7 \
-	ESP32_PINMUX(7, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO7 ESP32_PINMUX(7, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO8 \
-	ESP32_PINMUX(8, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO8 ESP32_PINMUX(8, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO9 \
-	ESP32_PINMUX(9, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO9 ESP32_PINMUX(9, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO10 \
-	ESP32_PINMUX(10, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO10 ESP32_PINMUX(10, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO11 \
-	ESP32_PINMUX(11, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO11 ESP32_PINMUX(11, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO12 \
-	ESP32_PINMUX(12, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO12 ESP32_PINMUX(12, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO13 \
-	ESP32_PINMUX(13, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO13 ESP32_PINMUX(13, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO14 \
-	ESP32_PINMUX(14, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO14 ESP32_PINMUX(14, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO15 \
-	ESP32_PINMUX(15, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO15 ESP32_PINMUX(15, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO16 \
-	ESP32_PINMUX(16, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO16 ESP32_PINMUX(16, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO17 \
-	ESP32_PINMUX(17, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO17 ESP32_PINMUX(17, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO18 \
-	ESP32_PINMUX(18, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO18 ESP32_PINMUX(18, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO19 \
-	ESP32_PINMUX(19, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO19 ESP32_PINMUX(19, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO20 \
-	ESP32_PINMUX(20, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO20 ESP32_PINMUX(20, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO21 \
-	ESP32_PINMUX(21, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO21 ESP32_PINMUX(21, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO26 \
-	ESP32_PINMUX(26, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO26 ESP32_PINMUX(26, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO27 \
-	ESP32_PINMUX(27, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO27 ESP32_PINMUX(27, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO28 \
-	ESP32_PINMUX(28, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO28 ESP32_PINMUX(28, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO29 \
-	ESP32_PINMUX(29, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO29 ESP32_PINMUX(29, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO30 \
-	ESP32_PINMUX(30, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO30 ESP32_PINMUX(30, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO31 \
-	ESP32_PINMUX(31, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO31 ESP32_PINMUX(31, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO32 \
-	ESP32_PINMUX(32, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO32 ESP32_PINMUX(32, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO33 \
-	ESP32_PINMUX(33, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO33 ESP32_PINMUX(33, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO34 \
-	ESP32_PINMUX(34, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO34 ESP32_PINMUX(34, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO35 \
-	ESP32_PINMUX(35, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO35 ESP32_PINMUX(35, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO36 \
-	ESP32_PINMUX(36, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO36 ESP32_PINMUX(36, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO37 \
-	ESP32_PINMUX(37, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO37 ESP32_PINMUX(37, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO38 \
-	ESP32_PINMUX(38, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO38 ESP32_PINMUX(38, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO39 \
-	ESP32_PINMUX(39, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO39 ESP32_PINMUX(39, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO40 \
-	ESP32_PINMUX(40, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO40 ESP32_PINMUX(40, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO41 \
-	ESP32_PINMUX(41, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO41 ESP32_PINMUX(41, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO42 \
-	ESP32_PINMUX(42, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO42 ESP32_PINMUX(42, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO43 \
-	ESP32_PINMUX(43, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO43 ESP32_PINMUX(43, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO44 \
-	ESP32_PINMUX(44, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO44 ESP32_PINMUX(44, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO45 \
-	ESP32_PINMUX(45, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO45 ESP32_PINMUX(45, ESP_TWAI_RX, ESP_NOSIG)
 
-#define TWAI_RX_GPIO46 \
-	ESP32_PINMUX(46, ESP_TWAI_RX, ESP_NOSIG)
+#define TWAI_RX_GPIO46 ESP32_PINMUX(46, ESP_TWAI_RX, ESP_NOSIG)
 
 /* TWAI_TX */
-#define TWAI_TX_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_TWAI_TX)
 
-#define TWAI_TX_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_TWAI_TX)
+#define TWAI_TX_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_TWAI_TX)
 
 /* UART0_CTS */
-#define UART0_CTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO0 ESP32_PINMUX(0, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO1 ESP32_PINMUX(1, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO2 ESP32_PINMUX(2, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO3 ESP32_PINMUX(3, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO4 ESP32_PINMUX(4, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO5 ESP32_PINMUX(5, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO6 ESP32_PINMUX(6, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO7 ESP32_PINMUX(7, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO8 ESP32_PINMUX(8, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO9 ESP32_PINMUX(9, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO10 ESP32_PINMUX(10, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO11 ESP32_PINMUX(11, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO12 ESP32_PINMUX(12, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO13 ESP32_PINMUX(13, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO14 ESP32_PINMUX(14, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO15 ESP32_PINMUX(15, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO16 ESP32_PINMUX(16, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO17 ESP32_PINMUX(17, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO18 ESP32_PINMUX(18, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO19 ESP32_PINMUX(19, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO20 ESP32_PINMUX(20, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO21 ESP32_PINMUX(21, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO26 ESP32_PINMUX(26, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO27 ESP32_PINMUX(27, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO28 \
-	ESP32_PINMUX(28, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO28 ESP32_PINMUX(28, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO29 \
-	ESP32_PINMUX(29, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO29 ESP32_PINMUX(29, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO30 \
-	ESP32_PINMUX(30, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO30 ESP32_PINMUX(30, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO31 \
-	ESP32_PINMUX(31, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO31 ESP32_PINMUX(31, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO32 ESP32_PINMUX(32, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO33 ESP32_PINMUX(33, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO34 \
-	ESP32_PINMUX(34, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO34 ESP32_PINMUX(34, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO35 \
-	ESP32_PINMUX(35, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO35 ESP32_PINMUX(35, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO36 \
-	ESP32_PINMUX(36, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO36 ESP32_PINMUX(36, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO37 \
-	ESP32_PINMUX(37, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO37 ESP32_PINMUX(37, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO38 \
-	ESP32_PINMUX(38, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO38 ESP32_PINMUX(38, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO39 \
-	ESP32_PINMUX(39, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO39 ESP32_PINMUX(39, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO40 \
-	ESP32_PINMUX(40, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO40 ESP32_PINMUX(40, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO41 \
-	ESP32_PINMUX(41, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO41 ESP32_PINMUX(41, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO42 \
-	ESP32_PINMUX(42, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO42 ESP32_PINMUX(42, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO43 \
-	ESP32_PINMUX(43, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO43 ESP32_PINMUX(43, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO44 \
-	ESP32_PINMUX(44, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO44 ESP32_PINMUX(44, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO45 \
-	ESP32_PINMUX(45, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO45 ESP32_PINMUX(45, ESP_U0CTS_IN, ESP_NOSIG)
 
-#define UART0_CTS_GPIO46 \
-	ESP32_PINMUX(46, ESP_U0CTS_IN, ESP_NOSIG)
+#define UART0_CTS_GPIO46 ESP32_PINMUX(46, ESP_U0CTS_IN, ESP_NOSIG)
 
 /* UART0_DSR */
-#define UART0_DSR_GPIO0 \
-	ESP32_PINMUX(0, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO0 ESP32_PINMUX(0, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO1 \
-	ESP32_PINMUX(1, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO1 ESP32_PINMUX(1, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO2 \
-	ESP32_PINMUX(2, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO2 ESP32_PINMUX(2, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO3 \
-	ESP32_PINMUX(3, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO3 ESP32_PINMUX(3, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO4 \
-	ESP32_PINMUX(4, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO4 ESP32_PINMUX(4, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO5 \
-	ESP32_PINMUX(5, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO5 ESP32_PINMUX(5, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO6 \
-	ESP32_PINMUX(6, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO6 ESP32_PINMUX(6, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO7 \
-	ESP32_PINMUX(7, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO7 ESP32_PINMUX(7, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO8 \
-	ESP32_PINMUX(8, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO8 ESP32_PINMUX(8, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO9 \
-	ESP32_PINMUX(9, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO9 ESP32_PINMUX(9, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO10 \
-	ESP32_PINMUX(10, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO10 ESP32_PINMUX(10, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO11 \
-	ESP32_PINMUX(11, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO11 ESP32_PINMUX(11, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO12 \
-	ESP32_PINMUX(12, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO12 ESP32_PINMUX(12, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO13 \
-	ESP32_PINMUX(13, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO13 ESP32_PINMUX(13, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO14 \
-	ESP32_PINMUX(14, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO14 ESP32_PINMUX(14, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO15 \
-	ESP32_PINMUX(15, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO15 ESP32_PINMUX(15, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO16 \
-	ESP32_PINMUX(16, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO16 ESP32_PINMUX(16, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO17 \
-	ESP32_PINMUX(17, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO17 ESP32_PINMUX(17, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO18 \
-	ESP32_PINMUX(18, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO18 ESP32_PINMUX(18, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO19 \
-	ESP32_PINMUX(19, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO19 ESP32_PINMUX(19, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO20 \
-	ESP32_PINMUX(20, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO20 ESP32_PINMUX(20, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO21 \
-	ESP32_PINMUX(21, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO21 ESP32_PINMUX(21, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO26 \
-	ESP32_PINMUX(26, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO26 ESP32_PINMUX(26, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO27 \
-	ESP32_PINMUX(27, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO27 ESP32_PINMUX(27, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO28 \
-	ESP32_PINMUX(28, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO28 ESP32_PINMUX(28, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO29 \
-	ESP32_PINMUX(29, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO29 ESP32_PINMUX(29, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO30 \
-	ESP32_PINMUX(30, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO30 ESP32_PINMUX(30, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO31 \
-	ESP32_PINMUX(31, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO31 ESP32_PINMUX(31, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO32 \
-	ESP32_PINMUX(32, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO32 ESP32_PINMUX(32, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO33 \
-	ESP32_PINMUX(33, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO33 ESP32_PINMUX(33, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO34 \
-	ESP32_PINMUX(34, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO34 ESP32_PINMUX(34, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO35 \
-	ESP32_PINMUX(35, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO35 ESP32_PINMUX(35, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO36 \
-	ESP32_PINMUX(36, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO36 ESP32_PINMUX(36, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO37 \
-	ESP32_PINMUX(37, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO37 ESP32_PINMUX(37, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO38 \
-	ESP32_PINMUX(38, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO38 ESP32_PINMUX(38, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO39 \
-	ESP32_PINMUX(39, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO39 ESP32_PINMUX(39, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO40 \
-	ESP32_PINMUX(40, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO40 ESP32_PINMUX(40, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO41 \
-	ESP32_PINMUX(41, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO41 ESP32_PINMUX(41, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO42 \
-	ESP32_PINMUX(42, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO42 ESP32_PINMUX(42, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO43 \
-	ESP32_PINMUX(43, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO43 ESP32_PINMUX(43, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO44 \
-	ESP32_PINMUX(44, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO44 ESP32_PINMUX(44, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO45 \
-	ESP32_PINMUX(45, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO45 ESP32_PINMUX(45, ESP_U0DSR_IN, ESP_NOSIG)
 
-#define UART0_DSR_GPIO46 \
-	ESP32_PINMUX(46, ESP_U0DSR_IN, ESP_NOSIG)
+#define UART0_DSR_GPIO46 ESP32_PINMUX(46, ESP_U0DSR_IN, ESP_NOSIG)
 
 /* UART0_DTR */
-#define UART0_DTR_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_U0DTR_OUT)
 
-#define UART0_DTR_GPIO46 \
-	ESP32_PINMUX(46, ESP_NOSIG, ESP_U0DTR_OUT)
+#define UART0_DTR_GPIO46 ESP32_PINMUX(46, ESP_NOSIG, ESP_U0DTR_OUT)
 
 /* UART0_RTS */
-#define UART0_RTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_U0RTS_OUT)
 
-#define UART0_RTS_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_U0RTS_OUT)
+#define UART0_RTS_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_U0RTS_OUT)
 
 /* UART0_RX */
-#define UART0_RX_GPIO0 \
-	ESP32_PINMUX(0, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO0 ESP32_PINMUX(0, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO1 \
-	ESP32_PINMUX(1, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO1 ESP32_PINMUX(1, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO2 \
-	ESP32_PINMUX(2, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO2 ESP32_PINMUX(2, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO3 \
-	ESP32_PINMUX(3, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO3 ESP32_PINMUX(3, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO4 \
-	ESP32_PINMUX(4, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO4 ESP32_PINMUX(4, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO5 \
-	ESP32_PINMUX(5, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO5 ESP32_PINMUX(5, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO6 \
-	ESP32_PINMUX(6, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO6 ESP32_PINMUX(6, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO7 \
-	ESP32_PINMUX(7, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO7 ESP32_PINMUX(7, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO8 \
-	ESP32_PINMUX(8, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO8 ESP32_PINMUX(8, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO9 \
-	ESP32_PINMUX(9, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO9 ESP32_PINMUX(9, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO10 \
-	ESP32_PINMUX(10, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO10 ESP32_PINMUX(10, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO11 \
-	ESP32_PINMUX(11, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO11 ESP32_PINMUX(11, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO12 \
-	ESP32_PINMUX(12, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO12 ESP32_PINMUX(12, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO13 \
-	ESP32_PINMUX(13, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO13 ESP32_PINMUX(13, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO14 \
-	ESP32_PINMUX(14, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO14 ESP32_PINMUX(14, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO15 \
-	ESP32_PINMUX(15, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO15 ESP32_PINMUX(15, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO16 \
-	ESP32_PINMUX(16, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO16 ESP32_PINMUX(16, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO17 \
-	ESP32_PINMUX(17, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO17 ESP32_PINMUX(17, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO18 \
-	ESP32_PINMUX(18, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO18 ESP32_PINMUX(18, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO19 \
-	ESP32_PINMUX(19, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO19 ESP32_PINMUX(19, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO20 \
-	ESP32_PINMUX(20, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO20 ESP32_PINMUX(20, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO21 \
-	ESP32_PINMUX(21, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO21 ESP32_PINMUX(21, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO26 \
-	ESP32_PINMUX(26, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO26 ESP32_PINMUX(26, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO27 \
-	ESP32_PINMUX(27, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO27 ESP32_PINMUX(27, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO28 \
-	ESP32_PINMUX(28, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO28 ESP32_PINMUX(28, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO29 \
-	ESP32_PINMUX(29, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO29 ESP32_PINMUX(29, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO30 \
-	ESP32_PINMUX(30, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO30 ESP32_PINMUX(30, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO31 \
-	ESP32_PINMUX(31, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO31 ESP32_PINMUX(31, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO32 \
-	ESP32_PINMUX(32, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO32 ESP32_PINMUX(32, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO33 \
-	ESP32_PINMUX(33, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO33 ESP32_PINMUX(33, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO34 \
-	ESP32_PINMUX(34, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO34 ESP32_PINMUX(34, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO35 \
-	ESP32_PINMUX(35, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO35 ESP32_PINMUX(35, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO36 \
-	ESP32_PINMUX(36, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO36 ESP32_PINMUX(36, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO37 \
-	ESP32_PINMUX(37, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO37 ESP32_PINMUX(37, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO38 \
-	ESP32_PINMUX(38, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO38 ESP32_PINMUX(38, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO39 \
-	ESP32_PINMUX(39, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO39 ESP32_PINMUX(39, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO40 \
-	ESP32_PINMUX(40, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO40 ESP32_PINMUX(40, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO41 \
-	ESP32_PINMUX(41, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO41 ESP32_PINMUX(41, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO42 \
-	ESP32_PINMUX(42, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO42 ESP32_PINMUX(42, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO43 \
-	ESP32_PINMUX(43, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO43 ESP32_PINMUX(43, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO44 \
-	ESP32_PINMUX(44, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO44 ESP32_PINMUX(44, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO45 \
-	ESP32_PINMUX(45, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO45 ESP32_PINMUX(45, ESP_U0RXD_IN, ESP_NOSIG)
 
-#define UART0_RX_GPIO46 \
-	ESP32_PINMUX(46, ESP_U0RXD_IN, ESP_NOSIG)
+#define UART0_RX_GPIO46 ESP32_PINMUX(46, ESP_U0RXD_IN, ESP_NOSIG)
 
 /* UART0_TX */
-#define UART0_TX_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_U0TXD_OUT)
 
-#define UART0_TX_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_U0TXD_OUT)
+#define UART0_TX_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_U0TXD_OUT)
 
 /* UART1_CTS */
-#define UART1_CTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO0 ESP32_PINMUX(0, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO1 ESP32_PINMUX(1, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO2 ESP32_PINMUX(2, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO3 ESP32_PINMUX(3, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO4 ESP32_PINMUX(4, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO5 ESP32_PINMUX(5, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO6 ESP32_PINMUX(6, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO7 ESP32_PINMUX(7, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO8 ESP32_PINMUX(8, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO9 ESP32_PINMUX(9, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO10 ESP32_PINMUX(10, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO11 ESP32_PINMUX(11, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO12 ESP32_PINMUX(12, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO13 ESP32_PINMUX(13, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO14 ESP32_PINMUX(14, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO15 ESP32_PINMUX(15, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO16 ESP32_PINMUX(16, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO17 ESP32_PINMUX(17, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO18 ESP32_PINMUX(18, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO19 ESP32_PINMUX(19, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO20 ESP32_PINMUX(20, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO21 ESP32_PINMUX(21, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO26 ESP32_PINMUX(26, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO27 ESP32_PINMUX(27, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO28 \
-	ESP32_PINMUX(28, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO28 ESP32_PINMUX(28, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO29 \
-	ESP32_PINMUX(29, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO29 ESP32_PINMUX(29, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO30 \
-	ESP32_PINMUX(30, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO30 ESP32_PINMUX(30, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO31 \
-	ESP32_PINMUX(31, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO31 ESP32_PINMUX(31, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO32 ESP32_PINMUX(32, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO33 ESP32_PINMUX(33, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO34 \
-	ESP32_PINMUX(34, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO34 ESP32_PINMUX(34, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO35 \
-	ESP32_PINMUX(35, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO35 ESP32_PINMUX(35, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO36 \
-	ESP32_PINMUX(36, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO36 ESP32_PINMUX(36, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO37 \
-	ESP32_PINMUX(37, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO37 ESP32_PINMUX(37, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO38 \
-	ESP32_PINMUX(38, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO38 ESP32_PINMUX(38, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO39 \
-	ESP32_PINMUX(39, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO39 ESP32_PINMUX(39, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO40 \
-	ESP32_PINMUX(40, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO40 ESP32_PINMUX(40, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO41 \
-	ESP32_PINMUX(41, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO41 ESP32_PINMUX(41, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO42 \
-	ESP32_PINMUX(42, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO42 ESP32_PINMUX(42, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO43 \
-	ESP32_PINMUX(43, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO43 ESP32_PINMUX(43, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO44 \
-	ESP32_PINMUX(44, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO44 ESP32_PINMUX(44, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO45 \
-	ESP32_PINMUX(45, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO45 ESP32_PINMUX(45, ESP_U1CTS_IN, ESP_NOSIG)
 
-#define UART1_CTS_GPIO46 \
-	ESP32_PINMUX(46, ESP_U1CTS_IN, ESP_NOSIG)
+#define UART1_CTS_GPIO46 ESP32_PINMUX(46, ESP_U1CTS_IN, ESP_NOSIG)
 
 /* UART1_DSR */
-#define UART1_DSR_GPIO0 \
-	ESP32_PINMUX(0, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO0 ESP32_PINMUX(0, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO1 \
-	ESP32_PINMUX(1, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO1 ESP32_PINMUX(1, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO2 \
-	ESP32_PINMUX(2, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO2 ESP32_PINMUX(2, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO3 \
-	ESP32_PINMUX(3, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO3 ESP32_PINMUX(3, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO4 \
-	ESP32_PINMUX(4, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO4 ESP32_PINMUX(4, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO5 \
-	ESP32_PINMUX(5, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO5 ESP32_PINMUX(5, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO6 \
-	ESP32_PINMUX(6, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO6 ESP32_PINMUX(6, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO7 \
-	ESP32_PINMUX(7, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO7 ESP32_PINMUX(7, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO8 \
-	ESP32_PINMUX(8, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO8 ESP32_PINMUX(8, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO9 \
-	ESP32_PINMUX(9, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO9 ESP32_PINMUX(9, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO10 \
-	ESP32_PINMUX(10, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO10 ESP32_PINMUX(10, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO11 \
-	ESP32_PINMUX(11, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO11 ESP32_PINMUX(11, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO12 \
-	ESP32_PINMUX(12, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO12 ESP32_PINMUX(12, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO13 \
-	ESP32_PINMUX(13, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO13 ESP32_PINMUX(13, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO14 \
-	ESP32_PINMUX(14, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO14 ESP32_PINMUX(14, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO15 \
-	ESP32_PINMUX(15, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO15 ESP32_PINMUX(15, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO16 \
-	ESP32_PINMUX(16, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO16 ESP32_PINMUX(16, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO17 \
-	ESP32_PINMUX(17, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO17 ESP32_PINMUX(17, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO18 \
-	ESP32_PINMUX(18, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO18 ESP32_PINMUX(18, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO19 \
-	ESP32_PINMUX(19, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO19 ESP32_PINMUX(19, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO20 \
-	ESP32_PINMUX(20, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO20 ESP32_PINMUX(20, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO21 \
-	ESP32_PINMUX(21, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO21 ESP32_PINMUX(21, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO26 \
-	ESP32_PINMUX(26, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO26 ESP32_PINMUX(26, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO27 \
-	ESP32_PINMUX(27, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO27 ESP32_PINMUX(27, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO28 \
-	ESP32_PINMUX(28, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO28 ESP32_PINMUX(28, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO29 \
-	ESP32_PINMUX(29, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO29 ESP32_PINMUX(29, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO30 \
-	ESP32_PINMUX(30, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO30 ESP32_PINMUX(30, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO31 \
-	ESP32_PINMUX(31, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO31 ESP32_PINMUX(31, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO32 \
-	ESP32_PINMUX(32, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO32 ESP32_PINMUX(32, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO33 \
-	ESP32_PINMUX(33, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO33 ESP32_PINMUX(33, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO34 \
-	ESP32_PINMUX(34, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO34 ESP32_PINMUX(34, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO35 \
-	ESP32_PINMUX(35, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO35 ESP32_PINMUX(35, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO36 \
-	ESP32_PINMUX(36, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO36 ESP32_PINMUX(36, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO37 \
-	ESP32_PINMUX(37, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO37 ESP32_PINMUX(37, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO38 \
-	ESP32_PINMUX(38, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO38 ESP32_PINMUX(38, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO39 \
-	ESP32_PINMUX(39, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO39 ESP32_PINMUX(39, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO40 \
-	ESP32_PINMUX(40, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO40 ESP32_PINMUX(40, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO41 \
-	ESP32_PINMUX(41, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO41 ESP32_PINMUX(41, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO42 \
-	ESP32_PINMUX(42, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO42 ESP32_PINMUX(42, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO43 \
-	ESP32_PINMUX(43, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO43 ESP32_PINMUX(43, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO44 \
-	ESP32_PINMUX(44, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO44 ESP32_PINMUX(44, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO45 \
-	ESP32_PINMUX(45, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO45 ESP32_PINMUX(45, ESP_U1DSR_IN, ESP_NOSIG)
 
-#define UART1_DSR_GPIO46 \
-	ESP32_PINMUX(46, ESP_U1DSR_IN, ESP_NOSIG)
+#define UART1_DSR_GPIO46 ESP32_PINMUX(46, ESP_U1DSR_IN, ESP_NOSIG)
 
 /* UART1_DTR */
-#define UART1_DTR_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_U1DTR_OUT)
 
-#define UART1_DTR_GPIO46 \
-	ESP32_PINMUX(46, ESP_NOSIG, ESP_U1DTR_OUT)
+#define UART1_DTR_GPIO46 ESP32_PINMUX(46, ESP_NOSIG, ESP_U1DTR_OUT)
 
 /* UART1_RTS */
-#define UART1_RTS_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_U1RTS_OUT)
 
-#define UART1_RTS_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_U1RTS_OUT)
+#define UART1_RTS_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_U1RTS_OUT)
 
 /* UART1_RX */
-#define UART1_RX_GPIO0 \
-	ESP32_PINMUX(0, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO0 ESP32_PINMUX(0, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO1 \
-	ESP32_PINMUX(1, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO1 ESP32_PINMUX(1, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO2 \
-	ESP32_PINMUX(2, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO2 ESP32_PINMUX(2, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO3 \
-	ESP32_PINMUX(3, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO3 ESP32_PINMUX(3, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO4 \
-	ESP32_PINMUX(4, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO4 ESP32_PINMUX(4, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO5 \
-	ESP32_PINMUX(5, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO5 ESP32_PINMUX(5, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO6 \
-	ESP32_PINMUX(6, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO6 ESP32_PINMUX(6, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO7 \
-	ESP32_PINMUX(7, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO7 ESP32_PINMUX(7, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO8 \
-	ESP32_PINMUX(8, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO8 ESP32_PINMUX(8, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO9 \
-	ESP32_PINMUX(9, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO9 ESP32_PINMUX(9, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO10 \
-	ESP32_PINMUX(10, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO10 ESP32_PINMUX(10, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO11 \
-	ESP32_PINMUX(11, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO11 ESP32_PINMUX(11, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO12 \
-	ESP32_PINMUX(12, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO12 ESP32_PINMUX(12, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO13 \
-	ESP32_PINMUX(13, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO13 ESP32_PINMUX(13, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO14 \
-	ESP32_PINMUX(14, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO14 ESP32_PINMUX(14, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO15 \
-	ESP32_PINMUX(15, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO15 ESP32_PINMUX(15, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO16 \
-	ESP32_PINMUX(16, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO16 ESP32_PINMUX(16, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO17 \
-	ESP32_PINMUX(17, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO17 ESP32_PINMUX(17, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO18 \
-	ESP32_PINMUX(18, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO18 ESP32_PINMUX(18, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO19 \
-	ESP32_PINMUX(19, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO19 ESP32_PINMUX(19, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO20 \
-	ESP32_PINMUX(20, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO20 ESP32_PINMUX(20, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO21 \
-	ESP32_PINMUX(21, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO21 ESP32_PINMUX(21, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO26 \
-	ESP32_PINMUX(26, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO26 ESP32_PINMUX(26, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO27 \
-	ESP32_PINMUX(27, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO27 ESP32_PINMUX(27, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO28 \
-	ESP32_PINMUX(28, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO28 ESP32_PINMUX(28, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO29 \
-	ESP32_PINMUX(29, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO29 ESP32_PINMUX(29, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO30 \
-	ESP32_PINMUX(30, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO30 ESP32_PINMUX(30, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO31 \
-	ESP32_PINMUX(31, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO31 ESP32_PINMUX(31, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO32 \
-	ESP32_PINMUX(32, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO32 ESP32_PINMUX(32, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO33 \
-	ESP32_PINMUX(33, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO33 ESP32_PINMUX(33, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO34 \
-	ESP32_PINMUX(34, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO34 ESP32_PINMUX(34, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO35 \
-	ESP32_PINMUX(35, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO35 ESP32_PINMUX(35, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO36 \
-	ESP32_PINMUX(36, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO36 ESP32_PINMUX(36, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO37 \
-	ESP32_PINMUX(37, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO37 ESP32_PINMUX(37, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO38 \
-	ESP32_PINMUX(38, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO38 ESP32_PINMUX(38, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO39 \
-	ESP32_PINMUX(39, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO39 ESP32_PINMUX(39, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO40 \
-	ESP32_PINMUX(40, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO40 ESP32_PINMUX(40, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO41 \
-	ESP32_PINMUX(41, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO41 ESP32_PINMUX(41, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO42 \
-	ESP32_PINMUX(42, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO42 ESP32_PINMUX(42, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO43 \
-	ESP32_PINMUX(43, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO43 ESP32_PINMUX(43, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO44 \
-	ESP32_PINMUX(44, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO44 ESP32_PINMUX(44, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO45 \
-	ESP32_PINMUX(45, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO45 ESP32_PINMUX(45, ESP_U1RXD_IN, ESP_NOSIG)
 
-#define UART1_RX_GPIO46 \
-	ESP32_PINMUX(46, ESP_U1RXD_IN, ESP_NOSIG)
+#define UART1_RX_GPIO46 ESP32_PINMUX(46, ESP_U1RXD_IN, ESP_NOSIG)
 
 /* UART1_TX */
-#define UART1_TX_GPIO0 \
-	ESP32_PINMUX(0, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO0 ESP32_PINMUX(0, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO1 \
-	ESP32_PINMUX(1, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO1 ESP32_PINMUX(1, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO2 \
-	ESP32_PINMUX(2, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO2 ESP32_PINMUX(2, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO3 \
-	ESP32_PINMUX(3, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO3 ESP32_PINMUX(3, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO4 \
-	ESP32_PINMUX(4, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO4 ESP32_PINMUX(4, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO5 \
-	ESP32_PINMUX(5, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO5 ESP32_PINMUX(5, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO6 \
-	ESP32_PINMUX(6, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO6 ESP32_PINMUX(6, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO7 \
-	ESP32_PINMUX(7, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO7 ESP32_PINMUX(7, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO8 \
-	ESP32_PINMUX(8, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO8 ESP32_PINMUX(8, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO9 \
-	ESP32_PINMUX(9, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO9 ESP32_PINMUX(9, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO10 \
-	ESP32_PINMUX(10, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO10 ESP32_PINMUX(10, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO11 \
-	ESP32_PINMUX(11, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO11 ESP32_PINMUX(11, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO12 \
-	ESP32_PINMUX(12, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO12 ESP32_PINMUX(12, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO13 \
-	ESP32_PINMUX(13, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO13 ESP32_PINMUX(13, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO14 \
-	ESP32_PINMUX(14, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO14 ESP32_PINMUX(14, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO15 \
-	ESP32_PINMUX(15, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO15 ESP32_PINMUX(15, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO16 \
-	ESP32_PINMUX(16, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO16 ESP32_PINMUX(16, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO17 \
-	ESP32_PINMUX(17, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO17 ESP32_PINMUX(17, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO18 \
-	ESP32_PINMUX(18, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO18 ESP32_PINMUX(18, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO19 \
-	ESP32_PINMUX(19, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO19 ESP32_PINMUX(19, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO20 \
-	ESP32_PINMUX(20, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO20 ESP32_PINMUX(20, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO21 \
-	ESP32_PINMUX(21, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO21 ESP32_PINMUX(21, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO26 \
-	ESP32_PINMUX(26, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO26 ESP32_PINMUX(26, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO27 \
-	ESP32_PINMUX(27, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO27 ESP32_PINMUX(27, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO28 \
-	ESP32_PINMUX(28, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO28 ESP32_PINMUX(28, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO29 \
-	ESP32_PINMUX(29, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO29 ESP32_PINMUX(29, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO30 \
-	ESP32_PINMUX(30, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO30 ESP32_PINMUX(30, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO31 \
-	ESP32_PINMUX(31, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO31 ESP32_PINMUX(31, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO32 \
-	ESP32_PINMUX(32, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO32 ESP32_PINMUX(32, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO33 \
-	ESP32_PINMUX(33, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO33 ESP32_PINMUX(33, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO34 \
-	ESP32_PINMUX(34, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO34 ESP32_PINMUX(34, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO35 \
-	ESP32_PINMUX(35, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO35 ESP32_PINMUX(35, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO36 \
-	ESP32_PINMUX(36, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO36 ESP32_PINMUX(36, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO37 \
-	ESP32_PINMUX(37, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO37 ESP32_PINMUX(37, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO38 \
-	ESP32_PINMUX(38, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO38 ESP32_PINMUX(38, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO39 \
-	ESP32_PINMUX(39, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO39 ESP32_PINMUX(39, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO40 \
-	ESP32_PINMUX(40, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO40 ESP32_PINMUX(40, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO41 \
-	ESP32_PINMUX(41, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO41 ESP32_PINMUX(41, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO42 \
-	ESP32_PINMUX(42, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO42 ESP32_PINMUX(42, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO43 \
-	ESP32_PINMUX(43, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO43 ESP32_PINMUX(43, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO44 \
-	ESP32_PINMUX(44, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO44 ESP32_PINMUX(44, ESP_NOSIG, ESP_U1TXD_OUT)
 
-#define UART1_TX_GPIO45 \
-	ESP32_PINMUX(45, ESP_NOSIG, ESP_U1TXD_OUT)
+#define UART1_TX_GPIO45 ESP32_PINMUX(45, ESP_NOSIG, ESP_U1TXD_OUT)
 
 
 #endif /* INC_DT_BINDS_PINCTRL_ESP32S2_PINCTRL_HAL_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 533d0f1ff7e50..7d75f0d710946 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -166,6 +166,12 @@
 #define NRF_FUN_TWIS_SCL 48U
 /** TWIS SDA */
 #define NRF_FUN_TWIS_SDA 49U
+/** EXMIF RWDS */
+#define NRF_FUN_EXMIF_RWDS 50U
+/** GRTC fast clock output */
+#define NRF_FUN_GRTC_CLKOUT_FAST 55U
+/** GRTC slow clock output */
+#define NRF_FUN_GRTC_CLKOUT_32K  56U
 
 /** @} */
 
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra-common.h
deleted file mode 100644
index a7969523a93fd..0000000000000
--- a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra-common.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2023 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RA_COMMON_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RA_COMMON_H_
-
-#define PORT4_POS  29
-#define PORT4_MASK 0x1
-#define PSEL_POS   24
-#define PSEL_MASK  0x5
-#define PORT_POS   21
-#define PORT_MASK  0x7
-#define PIN_POS    17
-#define PIN_MASK   0xF
-#define OPT_POS    0
-#define OPT_MASK   0x1B000
-
-#define RA_PINCFG_GPIO   0x00000
-#define RA_PINCFG_FUNC   0x10000
-#define RA_PINCFG_ANALOG 0x08000
-
-#define RA_PINCFG(port, pin, psel, opt)                                                            \
-	((((psel)&PSEL_MASK) << PSEL_POS) | (((pin)&PIN_MASK) << PIN_POS) |                        \
-	 (((port)&PORT_MASK) << PORT_POS) | ((((port) >> 3) & PORT4_MASK) << PORT4_POS) |          \
-	 (((opt)&OPT_MASK) << OPT_POS))
-
-#if RA_SOC_PINS >= 40
-#define RA_PINCFG__40(port, pin, psel, opt) RA_PINCFG(port, pin, psel, opt)
-#endif
-
-#if RA_SOC_PINS >= 48
-#define RA_PINCFG__48(port, pin, psel, opt) RA_PINCFG(port, pin, psel, opt)
-#endif
-
-#if RA_SOC_PINS >= 64
-#define RA_PINCFG__64(port, pin, psel, opt) RA_PINCFG(port, pin, psel, opt)
-#endif
-
-#if RA_SOC_PINS >= 100
-#define RA_PINCFG_100(port, pin, psel, opt) RA_PINCFG(port, pin, psel, opt)
-#endif
-
-#endif
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h
index 42b095a3d077e..cbb3dac6ffdc4 100644
--- a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h
@@ -16,6 +16,7 @@
 #define RA_PSEL_HIZ_JTAG_SWD 0x0
 #define RA_PSEL_ADC          0x0
 #define RA_PSEL_DAC          0x0
+#define RA_PSEL_ACMPHS       0x0
 #define RA_PSEL_AGT          0x1
 #define RA_PSEL_GPT0         0x2
 #define RA_PSEL_GPT1         0x3
@@ -32,6 +33,7 @@
 #define RA_PSEL_SPI          0x6
 #define RA_PSEL_I2C          0x7
 #define RA_PSEL_CLKOUT_RTC   0x9
+#define RA_PSEL_ACMPHS_VCOUT 0x9
 #define RA_PSEL_CAC_ADC      0xa
 #define RA_PSEL_CAC_DAC      0xa
 #define RA_PSEL_BUS          0xb
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rza-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rza-common.h
new file mode 100644
index 0000000000000..38bf44752f9c3
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rza-common.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZA_COMMON_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZA_COMMON_H_
+
+/* Superset list of all possible IO ports. */
+#define PORT_00 0x0000 /* IO port 0 */
+#define PORT_01 0x0100 /* IO port 1 */
+#define PORT_02 0x0200 /* IO port 2 */
+#define PORT_03 0x0300 /* IO port 3 */
+#define PORT_04 0x0400 /* IO port 4 */
+#define PORT_05 0x0500 /* IO port 5 */
+#define PORT_06 0x0600 /* IO port 6 */
+#define PORT_07 0x0700 /* IO port 7 */
+#define PORT_08 0x0800 /* IO port 8 */
+#define PORT_09 0x0900 /* IO port 9 */
+#define PORT_10 0x0A00 /* IO port 10 */
+#define PORT_11 0x0B00 /* IO port 11 */
+#define PORT_12 0x0C00 /* IO port 12 */
+#define PORT_13 0x0D00 /* IO port 13 */
+#define PORT_14 0x0E00 /* IO port 14 */
+#define PORT_15 0x0F00 /* IO port 15 */
+#define PORT_16 0x1000 /* IO port 16 */
+#define PORT_17 0x1100 /* IO port 17 */
+#define PORT_18 0x1200 /* IO port 18 */
+
+/*
+ * Create the value contain port/pin/function information
+ *
+ * port: port number BSP_IO_PORT_00..BSP_IO_PORT_18
+ * pin: pin number
+ * func: pin function
+ */
+#define RZA_PINMUX(port, pin, func) (port | pin | (func << 4))
+
+/* Special purpose port */
+#define BSP_IO_NMI 0xFFFF0100 /* NMI */
+
+#define BSP_IO_TMS_SWDIO 0xFFFF0200 /* TMS_SWDIO */
+
+#define BSP_IO_TDO 0xFFFF0300 /* TDO */
+
+#define BSP_IO_AUDIO_CLK1 0xFFFF0400 /* AUDIO_CLK1 */
+#define BSP_IO_AUDIO_CLK2 0xFFFF0401 /* AUDIO_CLK2 */
+
+#define BSP_IO_SD0_CLK   0xFFFF0600 /* CD0_CLK */
+#define BSP_IO_SD0_CMD   0xFFFF0601 /* CD0_CMD */
+#define BSP_IO_SD0_RST_N 0xFFFF0602 /* CD0_RST_N */
+
+#define BSP_IO_SD0_DATA0 0xFFFF0700 /* SD0_DATA0 */
+#define BSP_IO_SD0_DATA1 0xFFFF0701 /* SD0_DATA1 */
+#define BSP_IO_SD0_DATA2 0xFFFF0702 /* SD0_DATA2 */
+#define BSP_IO_SD0_DATA3 0xFFFF0703 /* SD0_DATA3 */
+#define BSP_IO_SD0_DATA4 0xFFFF0704 /* SD0_DATA4 */
+#define BSP_IO_SD0_DATA5 0xFFFF0705 /* SD0_DATA5 */
+#define BSP_IO_SD0_DATA6 0xFFFF0706 /* SD0_DATA6 */
+#define BSP_IO_SD0_DATA7 0xFFFF0707 /* SD0_DATA7 */
+
+#define BSP_IO_SD1_CLK 0xFFFF0800 /* SD1_CLK */
+#define BSP_IO_SD1_CMD 0xFFFF0801 /* SD1_CMD */
+
+#define BSP_IO_SD1_DATA0 0xFFFF0900 /* SD1_DATA0 */
+#define BSP_IO_SD1_DATA1 0xFFFF0901 /* SD1_DATA1 */
+#define BSP_IO_SD1_DATA2 0xFFFF0902 /* SD1_DATA2 */
+#define BSP_IO_SD1_DATA3 0xFFFF0903 /* SD1_DATA3 */
+
+#define BSP_IO_QSPI0_SPCLK 0xFFFF0A00 /* QSPI0_SPCLK */
+#define BSP_IO_QSPI0_IO0   0xFFFF0A01 /* QSPI0_IO0 */
+#define BSP_IO_QSPI0_IO1   0xFFFF0A02 /* QSPI0_IO1 */
+#define BSP_IO_QSPI0_IO2   0xFFFF0A03 /* QSPI0_IO2 */
+#define BSP_IO_QSPI0_IO3   0xFFFF0A04 /* QSPI0_IO3 */
+#define BSP_IO_QSPI0_SSL   0xFFFF0A05 /* QSPI0_SSL */
+
+#define BSP_IO_OM_CS1_N 0xFFFF0B00 /* OM_CS1_N */
+#define BSP_IO_OM_DQS   0xFFFF0B01 /* OM_DQS */
+#define BSP_IO_OM_SIO4  0xFFFF0B02 /* OM_SIO4 */
+#define BSP_IO_OM_SIO5  0xFFFF0B03 /* OM_SIO5 */
+#define BSP_IO_OM_SIO6  0xFFFF0B04 /* OM_SIO6 */
+#define BSP_IO_OM_SIO7  0xFFFF0B05 /* OM_SIO7 */
+
+#define BSP_IO_QSPI_RESET_N 0xFFFF0C00 /* QSPI_RESET_N */
+#define BSP_IO_QSPI_WP_N    0xFFFF0C01 /* QSPI_WP_N */
+
+#define BSP_IO_WDTOVF_PERROUT_N 0xFFFF0D00 /* WDTOVF_PERROUT_N */
+
+#define BSP_IO_RIIC0_SDA 0xFFFF0E00 /* RIIC0_SDA */
+#define BSP_IO_RIIC0_SCL 0xFFFF0E01 /* RIIC0_SCL */
+#define BSP_IO_RIIC1_SDA 0xFFFF0E02 /* RIIC1_SDA */
+#define BSP_IO_RIIC1_SCL 0xFFFF0E03 /* RIIC1_SCL */
+
+/* FILNUM */
+#define RZA_FILNUM_4_STAGE  0
+#define RZA_FILNUM_8_STAGE  1
+#define RZA_FILNUM_12_STAGE 2
+#define RZA_FILNUM_16_STAGE 3
+
+/* FILCLKSEL */
+#define RZA_FILCLKSEL_NOT_DIV   0
+#define RZA_FILCLKSEL_DIV_9000  1
+#define RZA_FILCLKSEL_DIV_18000 2
+#define RZA_FILCLKSEL_DIV_36000 3
+
+#define RZA_FILTER_SET(filnum, filclksel) (((filnum) & 0x3) << 0x2) | (filclksel & 0x3)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZA_COMMON_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg-common.h
index da9266ac780e7..2f03d21fec7e0 100644
--- a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg-common.h
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg-common.h
@@ -101,4 +101,4 @@
 
 #define RZG_FILTER_SET(filnum, filclksel) (((filnum) & 0x3) << 0x2) | (filclksel & 0x3)
 
-#endif /*ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZG_COMMON_H_*/
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZG_COMMON_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg2-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg2-common.h
new file mode 100644
index 0000000000000..e73df800bad79
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzg2-common.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZG2_COMMON_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZG2_COMMON_H_
+
+/* Superset list of all possible IO ports. */
+#define PORT_00 0x0000 /* IO port 0 */
+#define PORT_01 0x0100 /* IO port 1 */
+#define PORT_02 0x0200 /* IO port 2 */
+#define PORT_03 0x0300 /* IO port 3 */
+#define PORT_04 0x0400 /* IO port 4 */
+#define PORT_05 0x0500 /* IO port 5 */
+#define PORT_06 0x0600 /* IO port 6 */
+#define PORT_07 0x0700 /* IO port 7 */
+#define PORT_08 0x0800 /* IO port 8 */
+#define PORT_09 0x0900 /* IO port 9 */
+#define PORT_10 0x0A00 /* IO port 10 */
+#define PORT_11 0x0B00 /* IO port 11 */
+#define PORT_12 0x0C00 /* IO port 12 */
+#define PORT_13 0x0D00 /* IO port 13 */
+#define PORT_14 0x0E00 /* IO port 14 */
+#define PORT_15 0x0F00 /* IO port 15 */
+#define PORT_16 0x1000 /* IO port 16 */
+#define PORT_17 0x1100 /* IO port 17 */
+#define PORT_18 0x1200 /* IO port 18 */
+#define PORT_19 0x1300 /* IO port 19 */
+#define PORT_20 0x1400 /* IO port 20 */
+#define PORT_21 0x1500 /* IO port 21 */
+#define PORT_22 0x1600 /* IO port 22 */
+#define PORT_23 0x1700 /* IO port 23 */
+#define PORT_24 0x1800 /* IO port 24 */
+#define PORT_25 0x1900 /* IO port 25 */
+#define PORT_26 0x1A00 /* IO port 26 */
+#define PORT_27 0x1B00 /* IO port 27 */
+#define PORT_28 0x1C00 /* IO port 28 */
+#define PORT_29 0x1D00 /* IO port 29 */
+#define PORT_30 0x1E00 /* IO port 30 */
+#define PORT_31 0x1F00 /* IO port 31 */
+#define PORT_32 0x2000 /* IO port 32 */
+#define PORT_33 0x2100 /* IO port 33 */
+#define PORT_34 0x2200 /* IO port 34 */
+#define PORT_35 0x2300 /* IO port 35 */
+#define PORT_36 0x2400 /* IO port 36 */
+#define PORT_37 0x2500 /* IO port 37 */
+#define PORT_38 0x2600 /* IO port 38 */
+#define PORT_39 0x2700 /* IO port 39 */
+#define PORT_40 0x2800 /* IO port 40 */
+#define PORT_41 0x2900 /* IO port 41 */
+#define PORT_42 0x2A00 /* IO port 42 */
+#define PORT_43 0x2B00 /* IO port 43 */
+#define PORT_44 0x2C00 /* IO port 44 */
+#define PORT_45 0x2D00 /* IO port 45 */
+#define PORT_46 0x2E00 /* IO port 46 */
+#define PORT_47 0x2F00 /* IO port 47 */
+#define PORT_48 0x3000 /* IO port 48 */
+
+/*
+ * Create the value contain port/pin/function information
+ *
+ * port: port number BSP_IO_PORT_00..BSP_IO_PORT_48
+ * pin: pin number
+ * func: pin function
+ */
+#define RZG_PINMUX(port, pin, func) (port | pin | (func << 4))
+
+/* Special purpose port */
+#define BSP_IO_NMI 0xFFFF0100 /* NMI */
+
+#define BSP_IO_TMS_SWDIO 0xFFFF0200 /* TMS_SWDIO */
+#define BSP_IO_TDO       0xFFFF0300 /* TDO */
+
+#define BSP_IO_AUDIO_CLK1 0xFFFF0400 /* AUDIO_CLK1 */
+#define BSP_IO_AUDIO_CLK2 0xFFFF0401 /* AUDIO_CLK2 */
+
+#define BSP_IO_SD0_CLK   0xFFFF0600 /* SD0_CLK */
+#define BSP_IO_SD0_CMD   0xFFFF0601 /* SD0_CMD */
+#define BSP_IO_SD0_RST_N 0xFFFF0602 /* SD0_RST_N */
+
+#define BSP_IO_SD0_DATA0 0xFFFF0700 /* SD0_DATA0 */
+#define BSP_IO_SD0_DATA1 0xFFFF0701 /* SD0_DATA1 */
+#define BSP_IO_SD0_DATA2 0xFFFF0702 /* SD0_DATA2 */
+#define BSP_IO_SD0_DATA3 0xFFFF0703 /* SD0_DATA3 */
+#define BSP_IO_SD0_DATA4 0xFFFF0704 /* SD0_DATA4 */
+#define BSP_IO_SD0_DATA5 0xFFFF0705 /* SD0_DATA5 */
+#define BSP_IO_SD0_DATA6 0xFFFF0706 /* SD0_DATA6 */
+#define BSP_IO_SD0_DATA7 0xFFFF0707 /* SD0_DATA7 */
+
+#define BSP_IO_SD1_CLK 0xFFFF0800 /* SD1_CLK */
+#define BSP_IO_SD1_CMD 0xFFFF0801 /* SD1_CMD */
+
+#define BSP_IO_SD1_DATA0 0xFFFF0900 /* SD1_DATA0 */
+#define BSP_IO_SD1_DATA1 0xFFFF0901 /* SD1_DATA1 */
+#define BSP_IO_SD1_DATA2 0xFFFF0902 /* SD1_DATA2 */
+#define BSP_IO_SD1_DATA3 0xFFFF0903 /* SD1_DATA3 */
+
+#define BSP_IO_QSPI0_SPCLK 0xFFFF0A00 /* QSPI0_SPCLK */
+#define BSP_IO_QSPI0_IO0   0xFFFF0A01 /* QSPI0_IO0 */
+#define BSP_IO_QSPI0_IO1   0xFFFF0A02 /* QSPI0_IO1 */
+#define BSP_IO_QSPI0_IO2   0xFFFF0A03 /* QSPI0_IO2 */
+#define BSP_IO_QSPI0_IO3   0xFFFF0A04 /* QSPI0_IO3 */
+#define BSP_IO_QSPI0_SSL   0xFFFF0A05 /* QSPI0_SSL */
+
+#define BSP_IO_QSPI1_SPCLK 0xFFFF0B00 /* QSPI1_SPCLK */
+#define BSP_IO_QSPI1_IO0   0xFFFF0B01 /* QSPI1_IO0 */
+#define BSP_IO_QSPI1_IO1   0xFFFF0B02 /* QSPI1_IO1 */
+#define BSP_IO_QSPI1_IO2   0xFFFF0B03 /* QSPI1_IO2 */
+#define BSP_IO_QSPI1_IO3   0xFFFF0B04 /* QSPI1_IO3 */
+#define BSP_IO_QSPI1_SSL   0xFFFF0B05 /* QSPI1_SSL */
+
+#define BSP_IO_QSPI_RESET_N 0xFFFF0C00 /* QSPI_RESET_N */
+#define BSP_IO_QSPI_WP_N    0xFFFF0C01 /* QSPI_WP_N */
+#define BSP_IO_QSPI_INT_N   0xFFFF0C02 /* QSPI_INT_N */
+
+#define BSP_IO_WDTOVF_PERROUT_N 0xFFFF0D00 /* WDTOVF_PERROUT_N */
+
+#define BSP_IO_RIIC0_SDA 0xFFFF0E00 /* RIIC0_SDA */
+#define BSP_IO_RIIC0_SCL 0xFFFF0E01 /* RIIC0_SCL */
+#define BSP_IO_RIIC1_SDA 0xFFFF0E02 /* RIIC1_SDA */
+#define BSP_IO_RIIC1_SCL 0xFFFF0E03 /* RIIC1_SCL */
+
+/* FILNUM */
+#define RZG_FILNUM_4_STAGE  0
+#define RZG_FILNUM_8_STAGE  1
+#define RZG_FILNUM_12_STAGE 2
+#define RZG_FILNUM_16_STAGE 3
+
+/* FILCLKSEL */
+#define RZG_FILCLKSEL_NOT_DIV   0
+#define RZG_FILCLKSEL_DIV_9000  1
+#define RZG_FILCLKSEL_DIV_18000 2
+#define RZG_FILCLKSEL_DIV_36000 3
+
+#define RZG_FILTER_SET(filnum, filclksel) (((filnum) & 0x3) << 0x2) | (filclksel & 0x3)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZG2_COMMON_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzn-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzn-common.h
new file mode 100644
index 0000000000000..36d1da14989a8
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzn-common.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZN_COMMON_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZN_COMMON_H_
+
+/* Superset list of all possible IO ports. */
+#define PORT_00 0x0000 /* IO port 0 */
+#define PORT_01 0x0100 /* IO port 1 */
+#define PORT_02 0x0200 /* IO port 2 */
+#define PORT_03 0x0300 /* IO port 3 */
+#define PORT_04 0x0400 /* IO port 4 */
+#define PORT_05 0x0500 /* IO port 5 */
+#define PORT_06 0x0600 /* IO port 6 */
+#define PORT_07 0x0700 /* IO port 7 */
+#define PORT_08 0x0800 /* IO port 8 */
+#define PORT_09 0x0900 /* IO port 9 */
+#define PORT_10 0x0A00 /* IO port 10 */
+#define PORT_11 0x0B00 /* IO port 11 */
+#define PORT_12 0x0C00 /* IO port 12 */
+#define PORT_13 0x0D00 /* IO port 13 */
+#define PORT_14 0x0E00 /* IO port 14 */
+#define PORT_15 0x0F00 /* IO port 15 */
+#define PORT_16 0x1000 /* IO port 16 */
+#define PORT_17 0x1100 /* IO port 17 */
+#define PORT_18 0x1200 /* IO port 18 */
+#define PORT_19 0x1300 /* IO port 19 */
+#define PORT_20 0x1400 /* IO port 20 */
+#define PORT_21 0x1500 /* IO port 21 */
+#define PORT_22 0x1600 /* IO port 22 */
+#define PORT_23 0x1700 /* IO port 23 */
+#define PORT_24 0x1800 /* IO port 24 */
+
+/*
+ * Create the value contain port/pin/function information
+ *
+ * port: port number BSP_IO_PORT_00..BSP_IO_PORT_34
+ * pin: pin number
+ * func: pin function
+ */
+#define RZN_PINMUX(port, pin, func) (port | pin | (func << 4))
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZN_COMMON_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzt-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzt-common.h
new file mode 100644
index 0000000000000..52b78c38dc5d2
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzt-common.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZT_COMMON_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZT_COMMON_H_
+
+/* Superset list of all possible IO ports. */
+#define PORT_00 0x0000 /* IO port 0 */
+#define PORT_01 0x0100 /* IO port 1 */
+#define PORT_02 0x0200 /* IO port 2 */
+#define PORT_03 0x0300 /* IO port 3 */
+#define PORT_04 0x0400 /* IO port 4 */
+#define PORT_05 0x0500 /* IO port 5 */
+#define PORT_06 0x0600 /* IO port 6 */
+#define PORT_07 0x0700 /* IO port 7 */
+#define PORT_08 0x0800 /* IO port 8 */
+#define PORT_09 0x0900 /* IO port 9 */
+#define PORT_10 0x0A00 /* IO port 10 */
+#define PORT_11 0x0B00 /* IO port 11 */
+#define PORT_12 0x0C00 /* IO port 12 */
+#define PORT_13 0x0D00 /* IO port 13 */
+#define PORT_14 0x0E00 /* IO port 14 */
+#define PORT_15 0x0F00 /* IO port 15 */
+#define PORT_16 0x1000 /* IO port 16 */
+#define PORT_17 0x1100 /* IO port 17 */
+#define PORT_18 0x1200 /* IO port 18 */
+#define PORT_19 0x1300 /* IO port 19 */
+#define PORT_20 0x1400 /* IO port 20 */
+#define PORT_21 0x1500 /* IO port 21 */
+#define PORT_22 0x1600 /* IO port 22 */
+#define PORT_23 0x1700 /* IO port 23 */
+#define PORT_24 0x1800 /* IO port 24 */
+
+/*
+ * Create the value contain port/pin/function information
+ *
+ * port: port number BSP_IO_PORT_00..BSP_IO_PORT_24
+ * pin: pin number
+ * func: pin function
+ */
+#define RZT_PINMUX(port, pin, func) (port | pin | (func << 4))
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZT_COMMON_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzv-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzv-common.h
new file mode 100644
index 0000000000000..2d2ae8f32b98d
--- /dev/null
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-rzv-common.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZV_COMMON_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZV_COMMON_H_
+
+/* Superset list of all possible IO ports. */
+#define PORT_00 0x0000 /* IO port 0 */
+#define PORT_01 0x0100 /* IO port 1 */
+#define PORT_02 0x0200 /* IO port 2 */
+#define PORT_03 0x0300 /* IO port 3 */
+#define PORT_04 0x0400 /* IO port 4 */
+#define PORT_05 0x0500 /* IO port 5 */
+#define PORT_06 0x0600 /* IO port 6 */
+#define PORT_07 0x0700 /* IO port 7 */
+#define PORT_08 0x0800 /* IO port 8 */
+#define PORT_09 0x0900 /* IO port 9 */
+#define PORT_10 0x0A00 /* IO port 10 */
+#define PORT_11 0x0B00 /* IO port 11 */
+#define PORT_12 0x0C00 /* IO port 12 */
+#define PORT_13 0x0D00 /* IO port 13 */
+#define PORT_14 0x0E00 /* IO port 14 */
+#define PORT_15 0x0F00 /* IO port 15 */
+#define PORT_16 0x1000 /* IO port 16 */
+#define PORT_17 0x1100 /* IO port 17 */
+#define PORT_18 0x1200 /* IO port 18 */
+#define PORT_19 0x1300 /* IO port 19 */
+#define PORT_20 0x1400 /* IO port 20 */
+#define PORT_21 0x1500 /* IO port 21 */
+#define PORT_22 0x1600 /* IO port 22 */
+#define PORT_23 0x1700 /* IO port 23 */
+#define PORT_24 0x1800 /* IO port 24 */
+#define PORT_25 0x1900 /* IO port 25 */
+#define PORT_26 0x1A00 /* IO port 26 */
+#define PORT_27 0x1B00 /* IO port 27 */
+#define PORT_28 0x1C00 /* IO port 28 */
+#define PORT_29 0x1D00 /* IO port 29 */
+#define PORT_30 0x1E00 /* IO port 30 */
+#define PORT_31 0x1F00 /* IO port 31 */
+#define PORT_32 0x2000 /* IO port 32 */
+#define PORT_33 0x2100 /* IO port 33 */
+#define PORT_34 0x2200 /* IO port 34 */
+#define PORT_35 0x2300 /* IO port 35 */
+#define PORT_36 0x2400 /* IO port 36 */
+#define PORT_37 0x2500 /* IO port 37 */
+#define PORT_38 0x2600 /* IO port 38 */
+#define PORT_39 0x2700 /* IO port 39 */
+#define PORT_40 0x2800 /* IO port 40 */
+#define PORT_41 0x2900 /* IO port 41 */
+#define PORT_42 0x2A00 /* IO port 42 */
+#define PORT_43 0x2B00 /* IO port 43 */
+#define PORT_44 0x2C00 /* IO port 44 */
+#define PORT_45 0x2D00 /* IO port 45 */
+#define PORT_46 0x2E00 /* IO port 46 */
+#define PORT_47 0x2F00 /* IO port 47 */
+#define PORT_48 0x3000 /* IO port 48 */
+
+/*
+ * Create the value contain port/pin/function information
+ *
+ * port: port number BSP_IO_PORT_00..BSP_IO_PORT_48
+ * pin: pin number
+ * func: pin function
+ */
+#define RZV_PINMUX(port, pin, func) (port | pin | (func << 4))
+
+/* Special purpose port */
+#define BSP_IO_NMI 0xFFFF0100 /* NMI */
+
+#define BSP_IO_TMS_SWDIO 0xFFFF0200 /* TMS_SWDIO */
+
+#define BSP_IO_TDO 0xFFFF0300 /* TDO */
+
+#define BSP_IO_AUDIO_CLK1 0xFFFF0400 /* AUDIO_CLK1 */
+#define BSP_IO_AUDIO_CLK2 0xFFFF0401 /* AUDIO_CLK2 */
+
+#define BSP_IO_SD0_CLK   0xFFFF0600 /* SD0_CLK */
+#define BSP_IO_SD0_CMD   0xFFFF0601 /* SD0_CMD */
+#define BSP_IO_SD0_RST_N 0xFFFF0602 /* SD0_RST_N */
+
+#define BSP_IO_SD0_DATA0 0xFFFF0700 /* SD0_DATA0 */
+#define BSP_IO_SD0_DATA1 0xFFFF0701 /* SD0_DATA1 */
+#define BSP_IO_SD0_DATA2 0xFFFF0702 /* SD0_DATA2 */
+#define BSP_IO_SD0_DATA3 0xFFFF0703 /* SD0_DATA3 */
+#define BSP_IO_SD0_DATA4 0xFFFF0704 /* SD0_DATA4 */
+#define BSP_IO_SD0_DATA5 0xFFFF0705 /* SD0_DATA5 */
+#define BSP_IO_SD0_DATA6 0xFFFF0706 /* SD0_DATA6 */
+#define BSP_IO_SD0_DATA7 0xFFFF0707 /* SD0_DATA7 */
+
+#define BSP_IO_SD1_CLK 0xFFFF0800 /* SD1_CLK */
+#define BSP_IO_SD1_CMD 0xFFFF0801 /* SD1_CMD */
+
+#define BSP_IO_SD1_DATA0 0xFFFF0900 /* SD1_DATA0 */
+#define BSP_IO_SD1_DATA1 0xFFFF0901 /* SD1_DATA1 */
+#define BSP_IO_SD1_DATA2 0xFFFF0902 /* SD1_DATA2 */
+#define BSP_IO_SD1_DATA3 0xFFFF0903 /* SD1_DATA3 */
+
+#define BSP_IO_QSPI0_SPCLK 0xFFFF0A00 /* QSPI0_SPCLK */
+#define BSP_IO_QSPI0_IO0   0xFFFF0A01 /* QSPI0_IO0 */
+#define BSP_IO_QSPI0_IO1   0xFFFF0A02 /* QSPI0_IO1 */
+#define BSP_IO_QSPI0_IO2   0xFFFF0A03 /* QSPI0_IO2 */
+#define BSP_IO_QSPI0_IO3   0xFFFF0A04 /* QSPI0_IO3 */
+#define BSP_IO_QSPI0_SSL   0xFFFF0A05 /* QSPI0_SSL */
+
+#define BSP_IO_QSPI1_SPCLK 0xFFFF0B00 /* QSPI1_SPCLK */
+#define BSP_IO_QSPI1_IO0   0xFFFF0B01 /* QSPI1_IO0 */
+#define BSP_IO_QSPI1_IO1   0xFFFF0B02 /* QSPI1_IO1 */
+#define BSP_IO_QSPI1_IO2   0xFFFF0B03 /* QSPI1_IO2 */
+#define BSP_IO_QSPI1_IO3   0xFFFF0B04 /* QSPI1_IO3 */
+#define BSP_IO_QSPI1_SSL   0xFFFF0B05 /* QSPI1_SSL */
+
+#define BSP_IO_QSPI_RESET_N 0xFFFF0C00 /* QSPI_RESET_N */
+#define BSP_IO_QSPI_WP_N    0xFFFF0C01 /* QSPI_WP_N */
+#define BSP_IO_QSPI_INT_N   0xFFFF0C02 /* QSPI_INT_N */
+
+#define BSP_IO_WDTOVF_PERROUT_N 0xFFFF0D00 /* WDTOVF_PERROUT_N */
+
+#define BSP_IO_RIIC0_SDA 0xFFFF0E00 /* RIIC0_SDA */
+#define BSP_IO_RIIC0_SCL 0xFFFF0E01 /* RIIC0_SCL */
+#define BSP_IO_RIIC1_SDA 0xFFFF0E02 /* RIIC1_SDA */
+#define BSP_IO_RIIC1_SCL 0xFFFF0E03 /* RIIC1_SCL */
+
+/* FILNUM */
+#define RZV_FILNUM_4_STAGE  0
+#define RZV_FILNUM_8_STAGE  1
+#define RZV_FILNUM_12_STAGE 2
+#define RZV_FILNUM_16_STAGE 3
+
+/* FILCLKSEL */
+#define RZV_FILCLKSEL_NOT_DIV   0
+#define RZV_FILCLKSEL_DIV_9000  1
+#define RZV_FILCLKSEL_DIV_18000 2
+#define RZV_FILCLKSEL_DIV_36000 3
+
+#define RZV_FILTER_SET(filnum, filclksel) (((filnum) & 0x3) << 0x2) | (filclksel & 0x3)
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_RENESAS_PINCTRL_RZV_COMMON_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs-pinctrl-dbus.h b/include/zephyr/dt-bindings/pinctrl/silabs-pinctrl-dbus.h
index e42879a91c372..c28d87432af95 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs-pinctrl-dbus.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs-pinctrl-dbus.h
@@ -13,7 +13,8 @@
  *
  * 31    : Whether the configuration represents an analog pin
  * If digital (bit 31 == 0):
- * 30..29: Reserved
+ * 30    : Reserved
+ * 29    : Route register presence (fixed routes have no route register)
  * 28..24: Route register offset in words from peripheral config (offset of <fun>ROUTE
  *         register in GPIO_<periph>ROUTE_TypeDef)
  * 23..19: Enable bit (offset into ROUTEEN register for given function)
@@ -35,6 +36,7 @@
 #define SILABS_PINCTRL_HAVE_EN_MASK     0x00040000UL
 #define SILABS_PINCTRL_EN_BIT_MASK      0x00F80000UL
 #define SILABS_PINCTRL_ROUTE_MASK       0x1F000000UL
+#define SILABS_PINCTRL_HAVE_ROUTE_MASK  0x20000000UL
 
 #define SILABS_PINCTRL_ANALOG_MASK      0x80000000UL
 #define SILABS_PINCTRL_ABUS_BUS_MASK    0x0000C000UL
@@ -50,7 +52,16 @@
 	 FIELD_PREP(SILABS_PINCTRL_PERIPH_BASE_MASK, periph_base) |                                \
 	 FIELD_PREP(SILABS_PINCTRL_HAVE_EN_MASK, en_present) |                                     \
 	 FIELD_PREP(SILABS_PINCTRL_EN_BIT_MASK, en_bit) |                                          \
-	 FIELD_PREP(SILABS_PINCTRL_ROUTE_MASK, route))
+	 FIELD_PREP(SILABS_PINCTRL_ROUTE_MASK, route) |                                            \
+	 FIELD_PREP(SILABS_PINCTRL_HAVE_ROUTE_MASK, 1))
+
+#define SILABS_FIXED_ROUTE(port, pin, periph_base, en_bit)                                         \
+	(FIELD_PREP(SILABS_PINCTRL_GPIO_PORT_MASK, port) |                                         \
+	 FIELD_PREP(SILABS_PINCTRL_GPIO_PIN_MASK, pin) |                                           \
+	 FIELD_PREP(SILABS_PINCTRL_PERIPH_BASE_MASK, periph_base) |                                \
+	 FIELD_PREP(SILABS_PINCTRL_HAVE_EN_MASK, 1) |                                              \
+	 FIELD_PREP(SILABS_PINCTRL_EN_BIT_MASK, en_bit) |                                          \
+	 FIELD_PREP(SILABS_PINCTRL_HAVE_ROUTE_MASK, 0))
 
 #define SILABS_ABUS(bus, parity, peripheral)                                                       \
 	(FIELD_PREP(SILABS_PINCTRL_ANALOG_MASK, 1) |                                               \
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs/siwx91x-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/silabs/siwx91x-pinctrl.h
index c0ccda7484dc7..69dfa32f7556d 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs/siwx91x-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs/siwx91x-pinctrl.h
@@ -177,37 +177,37 @@
 #define PSRAM_D6_PD8         SIWX91X_GPIO(11, 0xFF, 20, 3,  8, 0)
 #define PSRAM_D7_PD9         SIWX91X_GPIO(11, 0xFF, 21, 3,  9, 0)
 
-#define PWM_1H_PA7           SIWX91X_GPIO(10, 0xFF,  2, 0,  7,  0)
-#define PWM_1H_ULP1          SIWX91X_GPIO(12,    6, 23, 4,  1,  1)
-#define PWM_1L_PA6           SIWX91X_GPIO(10, 0xFF,  1, 0,  6,  0)
-#define PWM_1L_ULP0          SIWX91X_GPIO(12,    6, 22, 4,  0,  0)
-#define PWM_2H_PA9           SIWX91X_GPIO(10, 0xFF,  4, 0,  9,  0)
-#define PWM_2H_ULP3          SIWX91X_GPIO(8,     6, 25, 4,  3,  3)
-#define PWM_2H_ULP5          SIWX91X_GPIO(12,    6, 27, 4,  5,  5)
-#define PWM_2L_PA8           SIWX91X_GPIO(10, 0xFF,  3, 0,  8,  0)
-#define PWM_2L_ULP2          SIWX91X_GPIO(8,     6, 24, 4,  2,  2)
-#define PWM_2L_ULP4          SIWX91X_GPIO(12,    6, 26, 4,  4,  4)
-#define PWM_3H_PA11          SIWX91X_GPIO(10, 0xFF,  6, 0, 11,  0)
-#define PWM_3H_ULP5          SIWX91X_GPIO(8,     6, 27, 4,  5,  5)
-#define PWM_3L_PA10          SIWX91X_GPIO(10, 0xFF,  5, 0, 10,  0)
-#define PWM_3L_ULP4          SIWX91X_GPIO(8,     6, 26, 4,  4,  4)
-#define PWM_4H_PA15          SIWX91X_GPIO(10, 0xFF,  8, 0, 15,  0)
-#define PWM_4H_ULP7          SIWX91X_GPIO(8,     6, 29, 4,  7,  7)
-#define PWM_4L_PA12          SIWX91X_GPIO(10, 0xFF,  7, 0, 12,  0)
-#define PWM_4L_ULP6          SIWX91X_GPIO(8,     6, 28, 4,  6,  6)
-#define PWM_EXTTRIG1_PB11    SIWX91X_GPIO(10, 0xFF,  0, 1, 11,  0)
-#define PWM_EXTTRIG1_PD3     SIWX91X_GPIO(8,  0xFF, 15, 3,  3,  0)
-#define PWM_EXTTRIG1_ULP6    SIWX91X_GPIO(10,    6, 28, 4,  6,  6)
-#define PWM_EXTTRIG1_ULP11   SIWX91X_GPIO(8,     6, 33, 4, 11, 11)
-#define PWM_EXTTRIG2_PB12    SIWX91X_GPIO(10, 0xFF,  0, 1, 12,  0)
-#define PWM_EXTTRIG2_PD6     SIWX91X_GPIO(8,  0xFF, 18, 3,  6,  0)
-#define PWM_EXTTRIG2_ULP7    SIWX91X_GPIO(10,    6, 29, 4,  7,  7)
-#define PWM_EXTTRIG3_PB13    SIWX91X_GPIO(10, 0xFF,  0, 1, 13,  0)
-#define PWM_EXTTRIG3_PD7     SIWX91X_GPIO(8,  0xFF, 19, 3,  7,  0)
-#define PWM_EXTTRIG3_ULP8    SIWX91X_GPIO(10,    6, 30, 4,  8,  8)
-#define PWM_EXTTRIG4_PB14    SIWX91X_GPIO(10, 0xFF,  0, 1, 14,  0)
-#define PWM_EXTTRIG4_PD2     SIWX91X_GPIO(8,  0xFF, 14, 3,  2,  0)
-#define PWM_EXTTRIG4_ULP9    SIWX91X_GPIO(10,    6, 31, 4,  9,  9)
+#define PWM_0H_PA7           SIWX91X_GPIO(10, 0xFF,  2, 0,  7,  0)
+#define PWM_0H_ULP1          SIWX91X_GPIO(12,    6, 23, 4,  1,  1)
+#define PWM_0L_PA6           SIWX91X_GPIO(10, 0xFF,  1, 0,  6,  0)
+#define PWM_0L_ULP0          SIWX91X_GPIO(12,    6, 22, 4,  0,  0)
+#define PWM_1H_PA9           SIWX91X_GPIO(10, 0xFF,  4, 0,  9,  0)
+#define PWM_1H_ULP3          SIWX91X_GPIO(8,     6, 25, 4,  3,  3)
+#define PWM_1H_ULP5          SIWX91X_GPIO(12,    6, 27, 4,  5,  5)
+#define PWM_1L_PA8           SIWX91X_GPIO(10, 0xFF,  3, 0,  8,  0)
+#define PWM_1L_ULP2          SIWX91X_GPIO(8,     6, 24, 4,  2,  2)
+#define PWM_1L_ULP4          SIWX91X_GPIO(12,    6, 26, 4,  4,  4)
+#define PWM_2H_PA11          SIWX91X_GPIO(10, 0xFF,  6, 0, 11,  0)
+#define PWM_2H_ULP5          SIWX91X_GPIO(8,     6, 27, 4,  5,  5)
+#define PWM_2L_PA10          SIWX91X_GPIO(10, 0xFF,  5, 0, 10,  0)
+#define PWM_2L_ULP4          SIWX91X_GPIO(8,     6, 26, 4,  4,  4)
+#define PWM_3H_PA15          SIWX91X_GPIO(10, 0xFF,  8, 0, 15,  0)
+#define PWM_3H_ULP7          SIWX91X_GPIO(8,     6, 29, 4,  7,  7)
+#define PWM_3L_PA12          SIWX91X_GPIO(10, 0xFF,  7, 0, 12,  0)
+#define PWM_3L_ULP6          SIWX91X_GPIO(8,     6, 28, 4,  6,  6)
+#define PWM_EXTTRIG0_PB11    SIWX91X_GPIO(10, 0xFF,  0, 1, 11,  0)
+#define PWM_EXTTRIG0_PD3     SIWX91X_GPIO(8,  0xFF, 15, 3,  3,  0)
+#define PWM_EXTTRIG0_ULP6    SIWX91X_GPIO(10,    6, 28, 4,  6,  6)
+#define PWM_EXTTRIG0_ULP11   SIWX91X_GPIO(8,     6, 33, 4, 11, 11)
+#define PWM_EXTTRIG1_PB12    SIWX91X_GPIO(10, 0xFF,  0, 1, 12,  0)
+#define PWM_EXTTRIG1_PD6     SIWX91X_GPIO(8,  0xFF, 18, 3,  6,  0)
+#define PWM_EXTTRIG1_ULP7    SIWX91X_GPIO(10,    6, 29, 4,  7,  7)
+#define PWM_EXTTRIG2_PB13    SIWX91X_GPIO(10, 0xFF,  0, 1, 13,  0)
+#define PWM_EXTTRIG2_PD7     SIWX91X_GPIO(8,  0xFF, 19, 3,  7,  0)
+#define PWM_EXTTRIG2_ULP8    SIWX91X_GPIO(10,    6, 30, 4,  8,  8)
+#define PWM_EXTTRIG3_PB14    SIWX91X_GPIO(10, 0xFF,  0, 1, 14,  0)
+#define PWM_EXTTRIG3_PD2     SIWX91X_GPIO(8,  0xFF, 14, 3,  2,  0)
+#define PWM_EXTTRIG3_ULP9    SIWX91X_GPIO(10,    6, 31, 4,  9,  9)
 #define PWM_FAULTA_PB9       SIWX91X_GPIO(10, 0xFF,  0, 1,  9,  0)
 #define PWM_FAULTA_ULP4      SIWX91X_GPIO(10,    6, 26, 4,  4,  4)
 #define PWM_FAULTA_ULP9      SIWX91X_GPIO(8,     6, 31, 4,  9,  9)
@@ -404,94 +404,94 @@
 #define TRACE_D3_PD3         SIWX91X_GPIO(6,  0xFF, 15, 3,  3, 0)
 #define TRACE_D3_PD9         SIWX91X_GPIO(6,  0xFF, 21, 3,  9, 0)
 
-#define UART1_CLK_PA8        SIWX91X_GPIO(2,  0xFF,  3, 0,  8,  0)
-#define UART1_CLK_PB9        SIWX91X_GPIO(2,  0xFF,  0, 1,  9,  0)
-#define UART1_CLK_PD4        SIWX91X_GPIO(2,  0xFF, 16, 3,  4,  0)
-#define UART1_CLK_ULP0       SIWX91X_GPIO(2,     6, 22, 4,  0,  0)
-#define UART1_CTS_PA6        SIWX91X_GPIO(2,  0xFF,  1, 0,  6,  0)
-#define UART1_CTS_PB10       SIWX91X_GPIO(2,  0xFF,  0, 1, 10,  0)
-#define UART1_CTS_PD8        SIWX91X_GPIO(2,  0xFF, 20, 3,  8,  0)
-#define UART1_CTS_ULP6       SIWX91X_GPIO(2,     6, 28, 4,  6,  6)
-#define UART1_DCD_PA12       SIWX91X_GPIO(2,  0xFF,  7, 0, 12,  0)
-#define UART1_DCD_PB13       SIWX91X_GPIO(12, 0xFF,  0, 1, 13,  0)
-#define UART1_DSR_PA11       SIWX91X_GPIO(2,  0xFF,  6, 0, 11,  0)
-#define UART1_DSR_PD9        SIWX91X_GPIO(2,  0xFF, 21, 3,  9,  0)
-#define UART1_DTR_PA7        SIWX91X_GPIO(2,  0xFF,  2, 0,  7,  0)
-#define UART1_IRRX_PB9       SIWX91X_GPIO(13, 0xFF,  0, 1,  9,  0)
-#define UART1_IRRX_PC15      SIWX91X_GPIO(2,  0xFF, 11, 2, 15,  0)
-#define UART1_IRRX_ULP0      SIWX91X_GPIO(11,    6, 22, 4,  0,  0)
-#define UART1_IRRX_ULP7      SIWX91X_GPIO(2,     6, 29, 4,  7,  7)
-#define UART1_IRTX_PB10      SIWX91X_GPIO(13, 0xFF,  0, 1, 10,  0)
-#define UART1_IRTX_PD0       SIWX91X_GPIO(2,  0xFF, 12, 3,  0,  0)
-#define UART1_IRTX_ULP1      SIWX91X_GPIO(11,    6, 23, 4,  1,  1)
-#define UART1_IRTX_ULP8      SIWX91X_GPIO(2,     6, 30, 4,  8,  8)
-#define UART1_RI_PB11        SIWX91X_GPIO(2,  0xFF,  0, 1, 11,  0)
-#define UART1_RI_PC14        SIWX91X_GPIO(2,  0xFF, 10, 2, 14,  0)
-#define UART1_RI_ULP4        SIWX91X_GPIO(11,    6, 26, 4,  4,  4)
-#define UART1_RS485DE_PB13   SIWX91X_GPIO(13, 0xFF,  0, 1, 13,  0)
-#define UART1_RS485DE_PD3    SIWX91X_GPIO(2,  0xFF, 15, 3,  3,  0)
-#define UART1_RS485DE_ULP7   SIWX91X_GPIO(11,    6, 29, 4,  7,  7)
-#define UART1_RS485DE_ULP11  SIWX91X_GPIO(2,     6, 33, 4, 11, 11)
-#define UART1_RS485EN_PB11   SIWX91X_GPIO(13, 0xFF,  0, 1, 11,  0)
-#define UART1_RS485EN_PD1    SIWX91X_GPIO(2,  0xFF, 13, 3,  1,  0)
-#define UART1_RS485EN_ULP5   SIWX91X_GPIO(11,    6, 27, 4,  5,  5)
-#define UART1_RS485EN_ULP9   SIWX91X_GPIO(2,     6, 31, 4,  9,  9)
-#define UART1_RS485RE_PB12   SIWX91X_GPIO(13, 0xFF,  0, 1, 12,  0)
-#define UART1_RS485RE_PD2    SIWX91X_GPIO(2,  0xFF, 14, 3,  2,  0)
-#define UART1_RS485RE_ULP6   SIWX91X_GPIO(11,    6, 28, 4,  6,  6)
-#define UART1_RS485RE_ULP10  SIWX91X_GPIO(2,     6, 32, 4, 10, 10)
-#define UART1_RTS_PA9        SIWX91X_GPIO(2,  0xFF,  4, 0,  9,  0)
-#define UART1_RTS_PB12       SIWX91X_GPIO(2,  0xFF,  0, 1, 12,  0)
-#define UART1_RTS_PD5        SIWX91X_GPIO(2,  0xFF, 17, 3,  5,  0)
-#define UART1_RTS_ULP5       SIWX91X_GPIO(2,     6, 27, 4,  5,  5)
-#define UART1_RX_PA10        SIWX91X_GPIO(2,  0xFF,  5, 0, 10,  0)
-#define UART1_RX_PB13        SIWX91X_GPIO(2,  0xFF,  0, 1, 13,  0)
-#define UART1_RX_PD7         SIWX91X_GPIO(2,  0xFF, 19, 3,  7,  0)
-#define UART1_RX_ULP1        SIWX91X_GPIO(2,     6, 23, 4,  1,  1)
-#define UART1_RX_ULP6        SIWX91X_GPIO(4,     6, 28, 4,  6,  6)
-#define UART1_TX_PB14        SIWX91X_GPIO(2,  0xFF,  0, 1, 14,  0)
-#define UART1_TX_PD6         SIWX91X_GPIO(2,  0xFF, 18, 3,  6,  0)
-#define UART1_TX_ULP4        SIWX91X_GPIO(2,     6, 26, 4,  4,  4)
-#define UART1_TX_ULP7        SIWX91X_GPIO(4,     6, 29, 4,  7,  7)
-
-#define UART2_CTS_PA11       SIWX91X_GPIO(6,  0xFF,  6, 0, 11,  0)
-#define UART2_CTS_PC0        SIWX91X_GPIO(12, 0xFF,  9, 2,  0,  0)
-#define UART2_CTS_PD3        SIWX91X_GPIO(9,  0xFF, 15, 3,  3,  0)
-#define UART2_CTS_ULP1       SIWX91X_GPIO(9,     6, 23, 4,  1,  1)
-#define UART2_CTS_ULP7       SIWX91X_GPIO(6,     6, 29, 4,  7,  7)
-#define UART2_CTS_ULP9       SIWX91X_GPIO(9,     6, 31, 4,  9,  9)
-#define UART2_RS485DE_PA9    SIWX91X_GPIO(6,  0xFF,  4, 0,  9,  0)
-#define UART2_RS485DE_ULP2   SIWX91X_GPIO(6,     6, 24, 4,  2,  2)
-#define UART2_RS485DE_ULP11  SIWX91X_GPIO(6,     6, 33, 4, 11, 11)
-#define UART2_RS485EN_PA12   SIWX91X_GPIO(6,  0xFF,  7, 0, 12,  0)
-#define UART2_RS485EN_PB10   SIWX91X_GPIO(6,  0xFF,  0, 1, 10,  0)
-#define UART2_RS485EN_ULP0   SIWX91X_GPIO(6,     6, 22, 4,  0,  0)
-#define UART2_RS485RE_PA8    SIWX91X_GPIO(6,  0xFF,  3, 0,  8,  0)
-#define UART2_RS485RE_ULP1   SIWX91X_GPIO(6,     6, 23, 4,  1,  1)
-#define UART2_RS485RE_ULP10  SIWX91X_GPIO(6,     6, 32, 4, 10, 10)
-#define UART2_RTS_PA10       SIWX91X_GPIO(6,  0xFF,  5, 0, 10,  0)
-#define UART2_RTS_PB11       SIWX91X_GPIO(6,  0xFF,  0, 1, 11,  0)
-#define UART2_RTS_PB12       SIWX91X_GPIO(6,  0xFF,  0, 1, 12,  0)
-#define UART2_RTS_PB15       SIWX91X_GPIO(12, 0xFF,  9, 1, 15,  0)
-#define UART2_RTS_PD2        SIWX91X_GPIO(9,  0xFF, 14, 3,  2,  0)
-#define UART2_RTS_ULP0       SIWX91X_GPIO(9,     6, 22, 4,  0,  0)
-#define UART2_RTS_ULP6       SIWX91X_GPIO(6,     6, 28, 4,  6,  6)
-#define UART2_RTS_ULP8       SIWX91X_GPIO(9,     6, 30, 4,  8,  8)
-#define UART2_RX_PA6         SIWX91X_GPIO(6,  0xFF,  1, 0,  6,  0)
-#define UART2_RX_PB13        SIWX91X_GPIO(6,  0xFF,  0, 1, 13,  0)
-#define UART2_RX_PC1         SIWX91X_GPIO(12, 0xFF,  9, 2,  1,  0)
-#define UART2_RX_ULP2        SIWX91X_GPIO(9,     6, 24, 4,  1,  1)
-#define UART2_RX_ULP4        SIWX91X_GPIO(6,     6, 26, 4,  4,  4)
-#define UART2_RX_ULP8        SIWX91X_GPIO(6,     6, 30, 4,  8,  8)
-#define UART2_RX_ULP10       SIWX91X_GPIO(9,     6, 32, 4, 10, 10)
-#define UART2_TX_PA15        SIWX91X_GPIO(2,  0xFF,  8, 0, 15,  0)
-#define UART2_TX_PA7         SIWX91X_GPIO(6,  0xFF,  2, 0,  7,  0)
-#define UART2_TX_PB14        SIWX91X_GPIO(6,  0xFF,  0, 1, 14,  0)
-#define UART2_TX_PC2         SIWX91X_GPIO(12, 0xFF,  9, 2,  2,  0)
-#define UART2_TX_ULP3        SIWX91X_GPIO(9,     6, 25, 4,  1,  1)
-#define UART2_TX_ULP5        SIWX91X_GPIO(6,     6, 27, 4,  5,  5)
-#define UART2_TX_ULP9        SIWX91X_GPIO(6,     6, 31, 4,  9,  9)
-#define UART2_TX_ULP11       SIWX91X_GPIO(9,     6, 33, 4, 11, 11)
+#define UART0_CLK_PA8        SIWX91X_GPIO(2,  0xFF,  3, 0,  8,  0)
+#define UART0_CLK_PB9        SIWX91X_GPIO(2,  0xFF,  0, 1,  9,  0)
+#define UART0_CLK_PD4        SIWX91X_GPIO(2,  0xFF, 16, 3,  4,  0)
+#define UART0_CLK_ULP0       SIWX91X_GPIO(2,     6, 22, 4,  0,  0)
+#define UART0_CTS_PA6        SIWX91X_GPIO(2,  0xFF,  1, 0,  6,  0)
+#define UART0_CTS_PB10       SIWX91X_GPIO(2,  0xFF,  0, 1, 10,  0)
+#define UART0_CTS_PD8        SIWX91X_GPIO(2,  0xFF, 20, 3,  8,  0)
+#define UART0_CTS_ULP6       SIWX91X_GPIO(2,     6, 28, 4,  6,  6)
+#define UART0_DCD_PA12       SIWX91X_GPIO(2,  0xFF,  7, 0, 12,  0)
+#define UART0_DCD_PB13       SIWX91X_GPIO(12, 0xFF,  0, 1, 13,  0)
+#define UART0_DSR_PA11       SIWX91X_GPIO(2,  0xFF,  6, 0, 11,  0)
+#define UART0_DSR_PD9        SIWX91X_GPIO(2,  0xFF, 21, 3,  9,  0)
+#define UART0_DTR_PA7        SIWX91X_GPIO(2,  0xFF,  2, 0,  7,  0)
+#define UART0_IRRX_PB9       SIWX91X_GPIO(13, 0xFF,  0, 1,  9,  0)
+#define UART0_IRRX_PC15      SIWX91X_GPIO(2,  0xFF, 11, 2, 15,  0)
+#define UART0_IRRX_ULP0      SIWX91X_GPIO(11,    6, 22, 4,  0,  0)
+#define UART0_IRRX_ULP7      SIWX91X_GPIO(2,     6, 29, 4,  7,  7)
+#define UART0_IRTX_PB10      SIWX91X_GPIO(13, 0xFF,  0, 1, 10,  0)
+#define UART0_IRTX_PD0       SIWX91X_GPIO(2,  0xFF, 12, 3,  0,  0)
+#define UART0_IRTX_ULP1      SIWX91X_GPIO(11,    6, 23, 4,  1,  1)
+#define UART0_IRTX_ULP8      SIWX91X_GPIO(2,     6, 30, 4,  8,  8)
+#define UART0_RI_PB11        SIWX91X_GPIO(2,  0xFF,  0, 1, 11,  0)
+#define UART0_RI_PC14        SIWX91X_GPIO(2,  0xFF, 10, 2, 14,  0)
+#define UART0_RI_ULP4        SIWX91X_GPIO(11,    6, 26, 4,  4,  4)
+#define UART0_RS485DE_PB13   SIWX91X_GPIO(13, 0xFF,  0, 1, 13,  0)
+#define UART0_RS485DE_PD3    SIWX91X_GPIO(2,  0xFF, 15, 3,  3,  0)
+#define UART0_RS485DE_ULP7   SIWX91X_GPIO(11,    6, 29, 4,  7,  7)
+#define UART0_RS485DE_ULP11  SIWX91X_GPIO(2,     6, 33, 4, 11, 11)
+#define UART0_RS485EN_PB11   SIWX91X_GPIO(13, 0xFF,  0, 1, 11,  0)
+#define UART0_RS485EN_PD1    SIWX91X_GPIO(2,  0xFF, 13, 3,  1,  0)
+#define UART0_RS485EN_ULP5   SIWX91X_GPIO(11,    6, 27, 4,  5,  5)
+#define UART0_RS485EN_ULP9   SIWX91X_GPIO(2,     6, 31, 4,  9,  9)
+#define UART0_RS485RE_PB12   SIWX91X_GPIO(13, 0xFF,  0, 1, 12,  0)
+#define UART0_RS485RE_PD2    SIWX91X_GPIO(2,  0xFF, 14, 3,  2,  0)
+#define UART0_RS485RE_ULP6   SIWX91X_GPIO(11,    6, 28, 4,  6,  6)
+#define UART0_RS485RE_ULP10  SIWX91X_GPIO(2,     6, 32, 4, 10, 10)
+#define UART0_RTS_PA9        SIWX91X_GPIO(2,  0xFF,  4, 0,  9,  0)
+#define UART0_RTS_PB12       SIWX91X_GPIO(2,  0xFF,  0, 1, 12,  0)
+#define UART0_RTS_PD5        SIWX91X_GPIO(2,  0xFF, 17, 3,  5,  0)
+#define UART0_RTS_ULP5       SIWX91X_GPIO(2,     6, 27, 4,  5,  5)
+#define UART0_RX_PA10        SIWX91X_GPIO(2,  0xFF,  5, 0, 10,  0)
+#define UART0_RX_PB13        SIWX91X_GPIO(2,  0xFF,  0, 1, 13,  0)
+#define UART0_RX_PD7         SIWX91X_GPIO(2,  0xFF, 19, 3,  7,  0)
+#define UART0_RX_ULP1        SIWX91X_GPIO(2,     6, 23, 4,  1,  1)
+#define UART0_RX_ULP6        SIWX91X_GPIO(4,     6, 28, 4,  6,  6)
+#define UART0_TX_PB14        SIWX91X_GPIO(2,  0xFF,  0, 1, 14,  0)
+#define UART0_TX_PD6         SIWX91X_GPIO(2,  0xFF, 18, 3,  6,  0)
+#define UART0_TX_ULP4        SIWX91X_GPIO(2,     6, 26, 4,  4,  4)
+#define UART0_TX_ULP7        SIWX91X_GPIO(4,     6, 29, 4,  7,  7)
+
+#define UART1_CTS_PA11       SIWX91X_GPIO(6,  0xFF,  6, 0, 11,  0)
+#define UART1_CTS_PC0        SIWX91X_GPIO(12, 0xFF,  9, 2,  0,  0)
+#define UART1_CTS_PD3        SIWX91X_GPIO(9,  0xFF, 15, 3,  3,  0)
+#define UART1_CTS_ULP1       SIWX91X_GPIO(9,     6, 23, 4,  1,  1)
+#define UART1_CTS_ULP7       SIWX91X_GPIO(6,     6, 29, 4,  7,  7)
+#define UART1_CTS_ULP9       SIWX91X_GPIO(9,     6, 31, 4,  9,  9)
+#define UART1_RS485DE_PA9    SIWX91X_GPIO(6,  0xFF,  4, 0,  9,  0)
+#define UART1_RS485DE_ULP2   SIWX91X_GPIO(6,     6, 24, 4,  2,  2)
+#define UART1_RS485DE_ULP11  SIWX91X_GPIO(6,     6, 33, 4, 11, 11)
+#define UART1_RS485EN_PA12   SIWX91X_GPIO(6,  0xFF,  7, 0, 12,  0)
+#define UART1_RS485EN_PB10   SIWX91X_GPIO(6,  0xFF,  0, 1, 10,  0)
+#define UART1_RS485EN_ULP0   SIWX91X_GPIO(6,     6, 22, 4,  0,  0)
+#define UART1_RS485RE_PA8    SIWX91X_GPIO(6,  0xFF,  3, 0,  8,  0)
+#define UART1_RS485RE_ULP1   SIWX91X_GPIO(6,     6, 23, 4,  1,  1)
+#define UART1_RS485RE_ULP10  SIWX91X_GPIO(6,     6, 32, 4, 10, 10)
+#define UART1_RTS_PA10       SIWX91X_GPIO(6,  0xFF,  5, 0, 10,  0)
+#define UART1_RTS_PB11       SIWX91X_GPIO(6,  0xFF,  0, 1, 11,  0)
+#define UART1_RTS_PB12       SIWX91X_GPIO(6,  0xFF,  0, 1, 12,  0)
+#define UART1_RTS_PB15       SIWX91X_GPIO(12, 0xFF,  9, 1, 15,  0)
+#define UART1_RTS_PD2        SIWX91X_GPIO(9,  0xFF, 14, 3,  2,  0)
+#define UART1_RTS_ULP0       SIWX91X_GPIO(9,     6, 22, 4,  0,  0)
+#define UART1_RTS_ULP6       SIWX91X_GPIO(6,     6, 28, 4,  6,  6)
+#define UART1_RTS_ULP8       SIWX91X_GPIO(9,     6, 30, 4,  8,  8)
+#define UART1_RX_PA6         SIWX91X_GPIO(6,  0xFF,  1, 0,  6,  0)
+#define UART1_RX_PB13        SIWX91X_GPIO(6,  0xFF,  0, 1, 13,  0)
+#define UART1_RX_PC1         SIWX91X_GPIO(12, 0xFF,  9, 2,  1,  0)
+#define UART1_RX_ULP2        SIWX91X_GPIO(9,     6, 24, 4,  1,  1)
+#define UART1_RX_ULP4        SIWX91X_GPIO(6,     6, 26, 4,  4,  4)
+#define UART1_RX_ULP8        SIWX91X_GPIO(6,     6, 30, 4,  8,  8)
+#define UART1_RX_ULP10       SIWX91X_GPIO(9,     6, 32, 4, 10, 10)
+#define UART1_TX_PA15        SIWX91X_GPIO(2,  0xFF,  8, 0, 15,  0)
+#define UART1_TX_PA7         SIWX91X_GPIO(6,  0xFF,  2, 0,  7,  0)
+#define UART1_TX_PB14        SIWX91X_GPIO(6,  0xFF,  0, 1, 14,  0)
+#define UART1_TX_PC2         SIWX91X_GPIO(12, 0xFF,  9, 2,  2,  0)
+#define UART1_TX_ULP3        SIWX91X_GPIO(9,     6, 25, 4,  1,  1)
+#define UART1_TX_ULP5        SIWX91X_GPIO(6,     6, 27, 4,  5,  5)
+#define UART1_TX_ULP9        SIWX91X_GPIO(6,     6, 31, 4,  9,  9)
+#define UART1_TX_ULP11       SIWX91X_GPIO(9,     6, 33, 4, 11, 11)
 
 #define ULPI2C_SCL_PA11      SIWX91X_GPIO(9,    4,    6, 0, 11,  5)
 #define ULPI2C_SCL_PA15      SIWX91X_GPIO(9,    4,    8, 0, 15,  7)
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs/xg21-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/silabs/xg21-pinctrl.h
index cc29205712daf..6dbaafd2576d3 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs/xg21-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs/xg21-pinctrl.h
@@ -107,6 +107,14 @@
 #define SILABS_DBUS_USART2_TX(port, pin)  SILABS_DBUS(port, pin, 107, 1, 4, 6)
 #define SILABS_DBUS_USART2_CTS(port, pin) SILABS_DBUS(port, pin, 107, 0, 0, 2)
 
+#define GPIO_SWCLKTCK_PA1   SILABS_FIXED_ROUTE(0x0, 0x1, 0, 0)
+#define GPIO_SWDIOTMS_PA2   SILABS_FIXED_ROUTE(0x0, 0x2, 0, 1)
+#define GPIO_TDO_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 0, 2)
+#define GPIO_TDI_PA4        SILABS_FIXED_ROUTE(0x0, 0x4, 0, 3)
+#define GPIO_SWV_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 1, 0)
+#define GPIO_TRACECLK_PA4   SILABS_FIXED_ROUTE(0x0, 0x4, 1, 1)
+#define GPIO_TRACEDATA0_PA3 SILABS_FIXED_ROUTE(0x0, 0x3, 1, 2)
+
 #define ACMP0_ACMPOUT_PA0 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x0)
 #define ACMP0_ACMPOUT_PA1 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x1)
 #define ACMP0_ACMPOUT_PA2 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x2)
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs/xg22-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/silabs/xg22-pinctrl.h
index 900b1ea2e42b2..e4629b1c6b254 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs/xg22-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs/xg22-pinctrl.h
@@ -123,6 +123,14 @@
 #define SILABS_DBUS_USART1_TX(port, pin)  SILABS_DBUS(port, pin, 127, 1, 4, 6)
 #define SILABS_DBUS_USART1_CTS(port, pin) SILABS_DBUS(port, pin, 127, 0, 0, 2)
 
+#define GPIO_SWCLKTCK_PA1   SILABS_FIXED_ROUTE(0x0, 0x1, 0, 0)
+#define GPIO_SWDIOTMS_PA2   SILABS_FIXED_ROUTE(0x0, 0x2, 0, 1)
+#define GPIO_TDO_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 0, 2)
+#define GPIO_TDI_PA4        SILABS_FIXED_ROUTE(0x0, 0x4, 0, 3)
+#define GPIO_SWV_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 1, 0)
+#define GPIO_TRACECLK_PA4   SILABS_FIXED_ROUTE(0x0, 0x4, 1, 1)
+#define GPIO_TRACEDATA0_PA3 SILABS_FIXED_ROUTE(0x0, 0x3, 1, 2)
+
 #define CMU_CLKOUT0_PC0 SILABS_DBUS_CMU_CLKOUT0(0x2, 0x0)
 #define CMU_CLKOUT0_PC1 SILABS_DBUS_CMU_CLKOUT0(0x2, 0x1)
 #define CMU_CLKOUT0_PC2 SILABS_DBUS_CMU_CLKOUT0(0x2, 0x2)
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs/xg23-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/silabs/xg23-pinctrl.h
index b8ca05d3dd3af..d1ec5a99b59b4 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs/xg23-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs/xg23-pinctrl.h
@@ -169,6 +169,17 @@
 #define SILABS_DBUS_USART0_TX(port, pin)  SILABS_DBUS(port, pin, 214, 1, 4, 6)
 #define SILABS_DBUS_USART0_CTS(port, pin) SILABS_DBUS(port, pin, 214, 0, 0, 2)
 
+#define GPIO_SWCLKTCK_PA1   SILABS_FIXED_ROUTE(0x0, 0x1, 0, 0)
+#define GPIO_SWDIOTMS_PA2   SILABS_FIXED_ROUTE(0x0, 0x2, 0, 1)
+#define GPIO_TDO_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 0, 2)
+#define GPIO_TDI_PA4        SILABS_FIXED_ROUTE(0x0, 0x4, 0, 3)
+#define GPIO_SWV_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 1, 0)
+#define GPIO_TRACECLK_PA4   SILABS_FIXED_ROUTE(0x0, 0x4, 1, 1)
+#define GPIO_TRACEDATA0_PA3 SILABS_FIXED_ROUTE(0x0, 0x3, 1, 2)
+#define GPIO_TRACEDATA1_PA5 SILABS_FIXED_ROUTE(0x0, 0x5, 1, 3)
+#define GPIO_TRACEDATA2_PA6 SILABS_FIXED_ROUTE(0x0, 0x6, 1, 4)
+#define GPIO_TRACEDATA3_PA7 SILABS_FIXED_ROUTE(0x0, 0x7, 1, 5)
+
 #define ACMP0_ACMPOUT_PA0 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x0)
 #define ACMP0_ACMPOUT_PA1 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x1)
 #define ACMP0_ACMPOUT_PA2 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x2)
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs/xg24-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/silabs/xg24-pinctrl.h
index ff67fc06fc766..85eb32c8a91f1 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs/xg24-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs/xg24-pinctrl.h
@@ -152,6 +152,17 @@
 #define SILABS_DBUS_USART0_TX(port, pin)  SILABS_DBUS(port, pin, 184, 1, 4, 6)
 #define SILABS_DBUS_USART0_CTS(port, pin) SILABS_DBUS(port, pin, 184, 0, 0, 2)
 
+#define GPIO_SWCLKTCK_PA1   SILABS_FIXED_ROUTE(0x0, 0x1, 0, 0)
+#define GPIO_SWDIOTMS_PA2   SILABS_FIXED_ROUTE(0x0, 0x2, 0, 1)
+#define GPIO_TDO_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 0, 2)
+#define GPIO_TDI_PA4        SILABS_FIXED_ROUTE(0x0, 0x4, 0, 3)
+#define GPIO_SWV_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 1, 0)
+#define GPIO_TRACECLK_PA4   SILABS_FIXED_ROUTE(0x0, 0x4, 1, 1)
+#define GPIO_TRACEDATA0_PA3 SILABS_FIXED_ROUTE(0x0, 0x3, 1, 2)
+#define GPIO_TRACEDATA1_PA5 SILABS_FIXED_ROUTE(0x0, 0x5, 1, 3)
+#define GPIO_TRACEDATA2_PA6 SILABS_FIXED_ROUTE(0x0, 0x6, 1, 4)
+#define GPIO_TRACEDATA3_PA7 SILABS_FIXED_ROUTE(0x0, 0x7, 1, 5)
+
 #define ACMP0_ACMPOUT_PA0 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x0)
 #define ACMP0_ACMPOUT_PA1 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x1)
 #define ACMP0_ACMPOUT_PA2 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x2)
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs/xg27-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/silabs/xg27-pinctrl.h
index 90932d52e7444..098313cadcf2b 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs/xg27-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs/xg27-pinctrl.h
@@ -127,6 +127,17 @@
 #define SILABS_DBUS_USART1_TX(port, pin)  SILABS_DBUS(port, pin, 133, 1, 4, 6)
 #define SILABS_DBUS_USART1_CTS(port, pin) SILABS_DBUS(port, pin, 133, 0, 0, 2)
 
+#define GPIO_SWCLKTCK_PA1   SILABS_FIXED_ROUTE(0x0, 0x1, 0, 0)
+#define GPIO_SWDIOTMS_PA2   SILABS_FIXED_ROUTE(0x0, 0x2, 0, 1)
+#define GPIO_TDO_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 0, 2)
+#define GPIO_TDI_PA4        SILABS_FIXED_ROUTE(0x0, 0x4, 0, 3)
+#define GPIO_SWV_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 1, 0)
+#define GPIO_TRACECLK_PA4   SILABS_FIXED_ROUTE(0x0, 0x4, 1, 1)
+#define GPIO_TRACEDATA0_PA3 SILABS_FIXED_ROUTE(0x0, 0x3, 1, 2)
+#define GPIO_TRACEDATA1_PA5 SILABS_FIXED_ROUTE(0x0, 0x5, 1, 3)
+#define GPIO_TRACEDATA2_PA6 SILABS_FIXED_ROUTE(0x0, 0x6, 1, 4)
+#define GPIO_TRACEDATA3_PA7 SILABS_FIXED_ROUTE(0x0, 0x7, 1, 5)
+
 #define ACMP0_ACMPOUT_PA0 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x0)
 #define ACMP0_ACMPOUT_PA1 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x1)
 #define ACMP0_ACMPOUT_PA2 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x2)
diff --git a/include/zephyr/dt-bindings/pinctrl/silabs/xg29-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/silabs/xg29-pinctrl.h
index 2bb51bb9a90f4..d8a478a7b6779 100644
--- a/include/zephyr/dt-bindings/pinctrl/silabs/xg29-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/silabs/xg29-pinctrl.h
@@ -134,6 +134,17 @@
 #define SILABS_DBUS_USART1_TX(port, pin)  SILABS_DBUS(port, pin, 141, 1, 4, 6)
 #define SILABS_DBUS_USART1_CTS(port, pin) SILABS_DBUS(port, pin, 141, 0, 0, 2)
 
+#define GPIO_SWCLKTCK_PA1   SILABS_FIXED_ROUTE(0x0, 0x1, 0, 0)
+#define GPIO_SWDIOTMS_PA2   SILABS_FIXED_ROUTE(0x0, 0x2, 0, 1)
+#define GPIO_TDO_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 0, 2)
+#define GPIO_TDI_PA4        SILABS_FIXED_ROUTE(0x0, 0x4, 0, 3)
+#define GPIO_SWV_PA3        SILABS_FIXED_ROUTE(0x0, 0x3, 1, 0)
+#define GPIO_TRACECLK_PA4   SILABS_FIXED_ROUTE(0x0, 0x4, 1, 1)
+#define GPIO_TRACEDATA0_PA3 SILABS_FIXED_ROUTE(0x0, 0x3, 1, 2)
+#define GPIO_TRACEDATA1_PA5 SILABS_FIXED_ROUTE(0x0, 0x5, 1, 3)
+#define GPIO_TRACEDATA2_PA6 SILABS_FIXED_ROUTE(0x0, 0x6, 1, 4)
+#define GPIO_TRACEDATA3_PA7 SILABS_FIXED_ROUTE(0x0, 0x7, 1, 5)
+
 #define ACMP0_ACMPOUT_PA0 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x0)
 #define ACMP0_ACMPOUT_PA1 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x1)
 #define ACMP0_ACMPOUT_PA2 SILABS_DBUS_ACMP0_ACMPOUT(0x0, 0x2)
diff --git a/include/zephyr/dt-bindings/power/imx95_power.h b/include/zephyr/dt-bindings/power/imx95_power.h
new file mode 100644
index 0000000000000..164080d2d5d7d
--- /dev/null
+++ b/include/zephyr/dt-bindings/power/imx95_power.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_POWER_IMX95_POWER_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_POWER_IMX95_POWER_H_
+
+#define IMX95_PD_ANA       0
+#define IMX95_PD_AON       1
+#define IMX95_PD_BBSM      2
+#define IMX95_PD_CAMERA    3
+#define IMX95_PD_CCMSRCGPC 4
+#define IMX95_PD_A55C0     5
+#define IMX95_PD_A55C1     6
+#define IMX95_PD_A55C2     7
+#define IMX95_PD_A55C3     8
+#define IMX95_PD_A55C4     9
+#define IMX95_PD_A55C5     10
+#define IMX95_PD_A55P      11
+#define IMX95_PD_DDR       12
+#define IMX95_PD_DISPLAY   13
+#define IMX95_PD_GPU       14
+#define IMX95_PD_HSIO_TOP  15
+#define IMX95_PD_HSIO_WAON 16
+#define IMX95_PD_M7        17
+#define IMX95_PD_NETC      18
+#define IMX95_PD_NOC       19
+#define IMX95_PD_NPU       20
+#define IMX95_PD_VPU       21
+#define IMX95_PD_WAKEUP    22
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_POWER_IMX95_POWER_H_ */
diff --git a/include/zephyr/dt-bindings/power/stm32_pwr.h b/include/zephyr/dt-bindings/power/stm32_pwr.h
index 8c7962f14ada8..b7eee0005591c 100644
--- a/include/zephyr/dt-bindings/power/stm32_pwr.h
+++ b/include/zephyr/dt-bindings/power/stm32_pwr.h
@@ -7,6 +7,8 @@
 #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_POWER_STM32_PWR_H_
 #define ZEPHYR_INCLUDE_DT_BINDINGS_POWER_STM32_PWR_H_
 
+#include <zephyr/dt-bindings/dt-util.h>
+
 /**
  * @brief STM32 power controller
  * @{
@@ -17,9 +19,11 @@
  * @{
  */
 
-#define STM32_PWR_WKUP_PIN_SRC_0	0
-#define STM32_PWR_WKUP_PIN_SRC_1	1
-#define STM32_PWR_WKUP_PIN_SRC_2	(1 << 2)
+/* Use this flag on series where wake-up event source is fixed/not configurable */
+#define STM32_PWR_WKUP_PIN_NOT_MUXED	STM32_PWR_WKUP_EVT_SRC_0
+#define STM32_PWR_WKUP_EVT_SRC_0	BIT(0)
+#define STM32_PWR_WKUP_EVT_SRC_1	BIT(1)
+#define STM32_PWR_WKUP_EVT_SRC_2	BIT(2)
 
 /** @} */
 
diff --git a/include/zephyr/dt-bindings/reset/numaker_m55m1x_reset.h b/include/zephyr/dt-bindings/reset/numaker_m55m1x_reset.h
new file mode 100644
index 0000000000000..4410b22c2df83
--- /dev/null
+++ b/include/zephyr/dt-bindings/reset/numaker_m55m1x_reset.h
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_RESET_NUMAKER_M55M1X_RESET_H
+#define ZEPHYR_INCLUDE_DT_BINDINGS_RESET_NUMAKER_M55M1X_RESET_H
+
+/* Beginning of M55M1 BSP sys_reg.h reset module copy */
+
+#define SYS_RSTCTL_CHIPRST_Pos           0
+#define SYS_RSTCTL_NPURST_Pos            6
+#define SYS_ACMPRST_ACMP01RST_Pos        0
+#define SYS_ACMPRST_ACMP23RST_Pos        1
+#define SYS_AWFRST_AWF0RST_Pos           0
+#define SYS_BPWMRST_BPWM0RST_Pos         0
+#define SYS_BPWMRST_BPWM1RST_Pos         1
+#define SYS_CANFDRST_CANFD0RST_Pos       0
+#define SYS_CANFDRST_CANFD1RST_Pos       1
+#define SYS_CCAPRST_CCAP0RST_Pos         0
+#define SYS_CRCRST_CRC0RST_Pos           0
+#define SYS_CRYPTORST_CRYPTO0RST_Pos     0
+#define SYS_DACRST_DAC01RST_Pos          0
+#define SYS_DMICRST_DMIC0RST_Pos         0
+#define SYS_EADCRST_EADC0RST_Pos         0
+#define SYS_EBIRST_EBI0RST_Pos           0
+#define SYS_ECAPRST_ECAP0RST_Pos         0
+#define SYS_ECAPRST_ECAP1RST_Pos         1
+#define SYS_ECAPRST_ECAP2RST_Pos         2
+#define SYS_ECAPRST_ECAP3RST_Pos         3
+#define SYS_EMACRST_EMAC0RST_Pos         0
+#define SYS_EPWMRST_EPWM0RST_Pos         0
+#define SYS_EPWMRST_EPWM1RST_Pos         1
+#define SYS_EQEIRST_EQEI0RST_Pos         0
+#define SYS_EQEIRST_EQEI1RST_Pos         1
+#define SYS_EQEIRST_EQEI2RST_Pos         2
+#define SYS_EQEIRST_EQEI3RST_Pos         3
+#define SYS_FMCRST_FMC0RST_Pos           0
+#define SYS_GDMARST_GDMA0RST_Pos         0
+#define SYS_GPIORST_GPIO0RST_Pos         0
+#define SYS_HSOTGRST_HSOTG0RST_Pos       0
+#define SYS_HSUSBDRST_HSUSBD0RST_Pos     0
+#define SYS_HSUSBHRST_HSUSBH0RST_Pos     0
+#define SYS_I2CRST_I2C0RST_Pos           0
+#define SYS_I2CRST_I2C1RST_Pos           1
+#define SYS_I2CRST_I2C2RST_Pos           2
+#define SYS_I2CRST_I2C3RST_Pos           3
+#define SYS_I2SRST_I2S0RST_Pos           0
+#define SYS_I2SRST_I2S1RST_Pos           1
+#define SYS_I3CRST_I3C0RST_Pos           0
+#define SYS_KDFRST_KDF0RST_Pos           0
+#define SYS_KPIRST_KPI0RST_Pos           0
+#define SYS_KSRST_KS0RST_Pos             0
+#define SYS_LPADCRST_LPADC0RST_Pos       0
+#define SYS_LPPDMARST_LPPDMA0RST_Pos     0
+#define SYS_LPGPIORST_LPGPIO0RST_Pos     0
+#define SYS_LPI2CRST_LPI2C0RST_Pos       0
+#define SYS_LPSPIRST_LPSPI0RST_Pos       0
+#define SYS_LPTMRRST_LPTMR0RST_Pos       0
+#define SYS_LPTMRRST_LPTMR1RST_Pos       1
+#define SYS_LPUARTRST_LPUART0RST_Pos     0
+#define SYS_OTFCRST_OTFC0RST_Pos         0
+#define SYS_OTGRST_OTG0RST_Pos           0
+#define SYS_PDMARST_PDMA0RST_Pos         0
+#define SYS_PDMARST_PDMA1RST_Pos         1
+#define SYS_PSIORST_PSIO0RST_Pos         0
+#define SYS_QSPIRST_QSPI0RST_Pos         0
+#define SYS_QSPIRST_QSPI1RST_Pos         1
+#define SYS_RTCRST_RTC0RST_Pos           0
+#define SYS_SCRST_SC0RST_Pos             0
+#define SYS_SCRST_SC1RST_Pos             1
+#define SYS_SCRST_SC2RST_Pos             2
+#define SYS_SCURST_SCU0RST_Pos           0
+#define SYS_SDHRST_SDH0RST_Pos           0
+#define SYS_SDHRST_SDH1RST_Pos           1
+#define SYS_SPIRST_SPI0RST_Pos           0
+#define SYS_SPIRST_SPI1RST_Pos           1
+#define SYS_SPIRST_SPI2RST_Pos           2
+#define SYS_SPIRST_SPI3RST_Pos           3
+#define SYS_SPIMRST_SPIM0RST_Pos         0
+#define SYS_TMRRST_TMR0RST_Pos           0
+#define SYS_TMRRST_TMR1RST_Pos           1
+#define SYS_TMRRST_TMR2RST_Pos           2
+#define SYS_TMRRST_TMR3RST_Pos           3
+#define SYS_TRNGRST_TRNG0RST_Pos         0
+#define SYS_TTMRRST_TTMR0RST_Pos         0
+#define SYS_TTMRRST_TTMR1RST_Pos         1
+#define SYS_UARTRST_UART0RST_Pos         0
+#define SYS_UARTRST_UART1RST_Pos         1
+#define SYS_UARTRST_UART2RST_Pos         2
+#define SYS_UARTRST_UART3RST_Pos         3
+#define SYS_UARTRST_UART4RST_Pos         4
+#define SYS_UARTRST_UART5RST_Pos         5
+#define SYS_UARTRST_UART6RST_Pos         6
+#define SYS_UARTRST_UART7RST_Pos         7
+#define SYS_UARTRST_UART8RST_Pos         8
+#define SYS_UARTRST_UART9RST_Pos         9
+#define SYS_USBDRST_USBD0RST_Pos         0
+#define SYS_USBHRST_USBH0RST_Pos         0
+#define SYS_USCIRST_USCI0RST_Pos         0
+#define SYS_UTCPDRST_UTCPD0RST_Pos       0
+#define SYS_WWDTRST_WWDT0RST_Pos         0
+#define SYS_WWDTRST_WWDT1RST_Pos         1
+
+/* End of M55M1 BSP sys_reg.h reset module copy */
+
+/* Beginning of M55M1 BSP sys.h reset module copy */
+
+/*---------------------------------------------------------------------
+ *  Module Reset Control Resister constant definitions.
+ *---------------------------------------------------------------------
+ */
+
+#define NUMAKER_SYS_ACMP01RST       ((0x200UL<<20) | SYS_ACMPRST_ACMP01RST_Pos)
+#define NUMAKER_SYS_ACMP23RST       ((0x200UL<<20) | SYS_ACMPRST_ACMP23RST_Pos)
+#define NUMAKER_SYS_AWF0RST         ((0x204UL<<20) | SYS_AWFRST_AWF0RST_Pos)
+#define NUMAKER_SYS_BPWM0RST        ((0x208UL<<20) | SYS_BPWMRST_BPWM0RST_Pos)
+#define NUMAKER_SYS_BPWM1RST        ((0x208UL<<20) | SYS_BPWMRST_BPWM1RST_Pos)
+#define NUMAKER_SYS_CANFD0RST       ((0x20CUL<<20) | SYS_CANFDRST_CANFD0RST_Pos)
+#define NUMAKER_SYS_CANFD1RST       ((0x20CUL<<20) | SYS_CANFDRST_CANFD1RST_Pos)
+#define NUMAKER_SYS_CCAP0RST        ((0x210UL<<20) | SYS_CCAPRST_CCAP0RST_Pos)
+#define NUMAKER_SYS_CRC0RST         ((0x214UL<<20) | SYS_CRCRST_CRC0RST_Pos)
+#define NUMAKER_SYS_CRYPTO0RST      ((0x218UL<<20) | SYS_CRYPTORST_CRYPTO0RST_Pos)
+#define NUMAKER_SYS_DAC01RST        ((0x21CUL<<20) | SYS_DACRST_DAC01RST_Pos)
+#define NUMAKER_SYS_DMIC0RST        ((0x220UL<<20) | SYS_DMICRST_DMIC0RST_Pos)
+#define NUMAKER_SYS_EADC0RST        ((0x224UL<<20) | SYS_EADCRST_EADC0RST_Pos)
+#define NUMAKER_SYS_EBI0RST         ((0x228UL<<20) | SYS_EBIRST_EBI0RST_Pos)
+#define NUMAKER_SYS_ECAP0RST        ((0x22CUL<<20) | SYS_ECAPRST_ECAP0RST_Pos)
+#define NUMAKER_SYS_ECAP1RST        ((0x22CUL<<20) | SYS_ECAPRST_ECAP1RST_Pos)
+#define NUMAKER_SYS_ECAP2RST        ((0x22CUL<<20) | SYS_ECAPRST_ECAP2RST_Pos)
+#define NUMAKER_SYS_ECAP3RST        ((0x22CUL<<20) | SYS_ECAPRST_ECAP3RST_Pos)
+#define NUMAKER_SYS_EMAC0RST        ((0x230UL<<20) | SYS_EMACRST_EMAC0RST_Pos)
+#define NUMAKER_SYS_EPWM0RST        ((0x234UL<<20) | SYS_EPWMRST_EPWM0RST_Pos)
+#define NUMAKER_SYS_EPWM1RST        ((0x234UL<<20) | SYS_EPWMRST_EPWM1RST_Pos)
+#define NUMAKER_SYS_EQEI0RST        ((0x238UL<<20) | SYS_EQEIRST_EQEI0RST_Pos)
+#define NUMAKER_SYS_EQEI1RST        ((0x238UL<<20) | SYS_EQEIRST_EQEI1RST_Pos)
+#define NUMAKER_SYS_EQEI2RST        ((0x238UL<<20) | SYS_EQEIRST_EQEI2RST_Pos)
+#define NUMAKER_SYS_EQEI3RST        ((0x238UL<<20) | SYS_EQEIRST_EQEI3RST_Pos)
+#define NUMAKER_SYS_FMC0RST         ((0x23CUL<<20) | SYS_FMCRST_FMC0RST_Pos)
+#define NUMAKER_SYS_GDMA0RST        ((0x240UL<<20) | SYS_GDMARST_GDMA0RST_Pos)
+#define NUMAKER_SYS_GPIO0RST        ((0x244UL<<20) | SYS_GPIORST_GPIO0RST_Pos)
+#define NUMAKER_SYS_HSOTG0RST       ((0x248UL<<20) | SYS_HSOTGRST_HSOTG0RST_Pos)
+#define NUMAKER_SYS_HSUSBD0RST      ((0x24CUL<<20) | SYS_HSUSBDRST_HSUSBD0RST_Pos)
+#define NUMAKER_SYS_HSUSBH0RST      ((0x250UL<<20) | SYS_HSUSBHRST_HSUSBH0RST_Pos)
+#define NUMAKER_SYS_I2C0RST         ((0x254UL<<20) | SYS_I2CRST_I2C0RST_Pos)
+#define NUMAKER_SYS_I2C1RST         ((0x254UL<<20) | SYS_I2CRST_I2C1RST_Pos)
+#define NUMAKER_SYS_I2C2RST         ((0x254UL<<20) | SYS_I2CRST_I2C2RST_Pos)
+#define NUMAKER_SYS_I2C3RST         ((0x254UL<<20) | SYS_I2CRST_I2C3RST_Pos)
+#define NUMAKER_SYS_I2S0RST         ((0x258UL<<20) | SYS_I2SRST_I2S0RST_Pos)
+#define NUMAKER_SYS_I2S1RST         ((0x258UL<<20) | SYS_I2SRST_I2S1RST_Pos)
+#define NUMAKER_SYS_I3C0RST         ((0x25CUL<<20) | SYS_I3CRST_I3C0RST_Pos)
+#define NUMAKER_SYS_KDF0RST         ((0x260UL<<20) | SYS_KDFRST_KDF0RST_Pos)
+#define NUMAKER_SYS_KPI0RST         ((0x264UL<<20) | SYS_KPIRST_KPI0RST_Pos)
+#define NUMAKER_SYS_KS0RST          ((0x268UL<<20) | SYS_KSRST_KS0RST_Pos)
+#define NUMAKER_SYS_LPADC0RST       ((0x26CUL<<20) | SYS_LPADCRST_LPADC0RST_Pos)
+#define NUMAKER_SYS_LPPDMA0RST      ((0x270UL<<20) | SYS_LPPDMARST_LPPDMA0RST_Pos)
+#define NUMAKER_SYS_LPGPIO0RST      ((0x274UL<<20) | SYS_LPGPIORST_LPGPIO0RST_Pos)
+#define NUMAKER_SYS_LPI2C0RST       ((0x278UL<<20) | SYS_LPI2CRST_LPI2C0RST_Pos)
+#define NUMAKER_SYS_LPSPI0RST       ((0x27CUL<<20) | SYS_LPSPIRST_LPSPI0RST_Pos)
+#define NUMAKER_SYS_LPTMR0RST       ((0x280UL<<20) | SYS_LPTMRRST_LPTMR0RST_Pos)
+#define NUMAKER_SYS_LPTMR1RST       ((0x280UL<<20) | SYS_LPTMRRST_LPTMR1RST_Pos)
+#define NUMAKER_SYS_LPUART0RST      ((0x284UL<<20) | SYS_LPUARTRST_LPUART0RST_Pos)
+#define NUMAKER_SYS_NPURST          ((0x004UL<<20) | SYS_RSTCTL_NPURST_Pos)
+#define NUMAKER_SYS_OTFC0RST        ((0x288UL<<20) | SYS_OTFCRST_OTFC0RST_Pos)
+#define NUMAKER_SYS_OTG0RST         ((0x28CUL<<20) | SYS_OTGRST_OTG0RST_Pos)
+#define NUMAKER_SYS_PDMA0RST        ((0x290UL<<20) | SYS_PDMARST_PDMA0RST_Pos)
+#define NUMAKER_SYS_PDMA1RST        ((0x290UL<<20) | SYS_PDMARST_PDMA1RST_Pos)
+#define NUMAKER_SYS_PSIO0RST        ((0x294UL<<20) | SYS_PSIORST_PSIO0RST_Pos)
+#define NUMAKER_SYS_QSPI0RST        ((0x298UL<<20) | SYS_QSPIRST_QSPI0RST_Pos)
+#define NUMAKER_SYS_QSPI1RST        ((0x298UL<<20) | SYS_QSPIRST_QSPI1RST_Pos)
+#define NUMAKER_SYS_RTC0RST         ((0x29CUL<<20) | SYS_RTCRST_RTC0RST_Pos)
+#define NUMAKER_SYS_SC0RST          ((0x2A0UL<<20) | SYS_SCRST_SC0RST_Pos)
+#define NUMAKER_SYS_SC1RST          ((0x2A0UL<<20) | SYS_SCRST_SC1RST_Pos)
+#define NUMAKER_SYS_SC2RST          ((0x2A0UL<<20) | SYS_SCRST_SC2RST_Pos)
+#define NUMAKER_SYS_SCU0RST         ((0x2A4UL<<20) | SYS_SCURST_SCU0RST_Pos)
+#define NUMAKER_SYS_SDH0RST         ((0x2A8UL<<20) | SYS_SDHRST_SDH0RST_Pos)
+#define NUMAKER_SYS_SDH1RST         ((0x2A8UL<<20) | SYS_SDHRST_SDH1RST_Pos)
+#define NUMAKER_SYS_SPI0RST         ((0x2ACUL<<20) | SYS_SPIRST_SPI0RST_Pos)
+#define NUMAKER_SYS_SPI1RST         ((0x2ACUL<<20) | SYS_SPIRST_SPI1RST_Pos)
+#define NUMAKER_SYS_SPI2RST         ((0x2ACUL<<20) | SYS_SPIRST_SPI2RST_Pos)
+#define NUMAKER_SYS_SPI3RST         ((0x2ACUL<<20) | SYS_SPIRST_SPI3RST_Pos)
+#define NUMAKER_SYS_SPIM0RST        ((0x2B0UL<<20) | SYS_SPIMRST_SPIM0RST_Pos)
+#define NUMAKER_SYS_TMR0RST         ((0x2C0UL<<20) | SYS_TMRRST_TMR0RST_Pos)
+#define NUMAKER_SYS_TMR1RST         ((0x2C0UL<<20) | SYS_TMRRST_TMR1RST_Pos)
+#define NUMAKER_SYS_TMR2RST         ((0x2C0UL<<20) | SYS_TMRRST_TMR2RST_Pos)
+#define NUMAKER_SYS_TMR3RST         ((0x2C0UL<<20) | SYS_TMRRST_TMR3RST_Pos)
+#define NUMAKER_SYS_TRNG0RST        ((0x2C4UL<<20) | SYS_TRNGRST_TRNG0RST_Pos)
+#define NUMAKER_SYS_TTMR0RST        ((0x2C8UL<<20) | SYS_TTMRRST_TTMR0RST_Pos)
+#define NUMAKER_SYS_TTMR1RST        ((0x2C8UL<<20) | SYS_TTMRRST_TTMR1RST_Pos)
+#define NUMAKER_SYS_UART0RST        ((0x2CCUL<<20) | SYS_UARTRST_UART0RST_Pos)
+#define NUMAKER_SYS_UART1RST        ((0x2CCUL<<20) | SYS_UARTRST_UART1RST_Pos)
+#define NUMAKER_SYS_UART2RST        ((0x2CCUL<<20) | SYS_UARTRST_UART2RST_Pos)
+#define NUMAKER_SYS_UART3RST        ((0x2CCUL<<20) | SYS_UARTRST_UART3RST_Pos)
+#define NUMAKER_SYS_UART4RST        ((0x2CCUL<<20) | SYS_UARTRST_UART4RST_Pos)
+#define NUMAKER_SYS_UART5RST        ((0x2CCUL<<20) | SYS_UARTRST_UART5RST_Pos)
+#define NUMAKER_SYS_UART6RST        ((0x2CCUL<<20) | SYS_UARTRST_UART6RST_Pos)
+#define NUMAKER_SYS_UART7RST        ((0x2CCUL<<20) | SYS_UARTRST_UART7RST_Pos)
+#define NUMAKER_SYS_UART8RST        ((0x2CCUL<<20) | SYS_UARTRST_UART8RST_Pos)
+#define NUMAKER_SYS_UART9RST        ((0x2CCUL<<20) | SYS_UARTRST_UART9RST_Pos)
+#define NUMAKER_SYS_USBD0RST        ((0x2D0UL<<20) | SYS_USBDRST_USBD0RST_Pos)
+#define NUMAKER_SYS_USBH0RST        ((0x2D4UL<<20) | SYS_USBHRST_USBH0RST_Pos)
+#define NUMAKER_SYS_USCI0RST        ((0x2D8UL<<20) | SYS_USCIRST_USCI0RST_Pos)
+#define NUMAKER_SYS_UTCPD0RST       ((0x2DCUL<<20) | SYS_UTCPDRST_UTCPD0RST_Pos)
+#define NUMAKER_SYS_WWDT0RST        ((0x2E0UL<<20) | SYS_WWDTRST_WWDT0RST_Pos)
+#define NUMAKER_SYS_WWDT1RST        ((0x2E0UL<<20) | SYS_WWDTRST_WWDT1RST_Pos)
+
+/* End of M55M1 BSP sys.h reset module copy */
+
+#endif
diff --git a/include/zephyr/dt-bindings/reset/stm32mp13_reset.h b/include/zephyr/dt-bindings/reset/stm32mp13_reset.h
new file mode 100644
index 0000000000000..f393fdb269015
--- /dev/null
+++ b/include/zephyr/dt-bindings/reset/stm32mp13_reset.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_RESET_STM32MP13_RESET_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_RESET_STM32MP13_RESET_H_
+
+/**
+ * Pack RCC register offset and bit in one 32-bit value.
+ *
+ * bits[4..0] stores the reset controller bit in 32bit RCC register
+ * bits[16..5] stores the reset controller set register offset from RCC base
+ * bits[28..17] stores the reset controller clear register offset from RCC base
+ *
+ * @param bus STM32 bus name
+ * @param bit Reset bit
+ */
+#define STM32_RESET(bus, bit)                                                                      \
+	(((STM32_RESET_BUS_##bus##_CLR) << 17U) | ((STM32_RESET_BUS_##bus##_SET) << 5U) | (bit))
+
+/* RCC bus reset register offset */
+#define STM32_RESET_BUS_AHB2_SET   0x6D0
+#define STM32_RESET_BUS_AHB2_CLR   0x6D4
+#define STM32_RESET_BUS_AHB4_SET   0x6E0
+#define STM32_RESET_BUS_AHB4_CLR   0x6E4
+#define STM32_RESET_BUS_AHB5_SET   0x6E8
+#define STM32_RESET_BUS_AHB5_CLR   0x6EC
+#define STM32_RESET_BUS_AHB6_SET   0x6F0
+#define STM32_RESET_BUS_AHB6_CLR   0x6F4
+#define STM32_RESET_BUS_APB1_SET   0x6A0
+#define STM32_RESET_BUS_APB1_CLR   0x6A4
+#define STM32_RESET_BUS_APB2_SET   0x6A8
+#define STM32_RESET_BUS_APB2_CLR   0x6AC
+#define STM32_RESET_BUS_APB3_SET   0x6B0
+#define STM32_RESET_BUS_APB3_CLR   0x6B4
+#define STM32_RESET_BUS_APB4_SET   0x6B8
+#define STM32_RESET_BUS_APB4_CLR   0x6BC
+#define STM32_RESET_BUS_APB5_SET   0x6C0
+#define STM32_RESET_BUS_APB5_CLR   0x6C4
+#define STM32_RESET_BUS_APB6_SET   0x6C8
+#define STM32_RESET_BUS_APB6_CLR   0x6CC
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_RESET_STM32MP13_RESET_H_ */
diff --git a/include/zephyr/dt-bindings/sensor/icm45686.h b/include/zephyr/dt-bindings/sensor/icm45686.h
new file mode 100644
index 0000000000000..11bf790c822f3
--- /dev/null
+++ b/include/zephyr/dt-bindings/sensor/icm45686.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2024 Intel Corporation
+ * Copyright (c) 2025 Croxel Inc.
+ * Copyright (c) 2025 CogniPilot Foundation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_TDK_ICM45686_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_TDK_ICM45686_H_
+
+/**
+ * @defgroup ICM45686 Invensense (TDK) ICM45686 DT Options
+ * @ingroup sensor_interface
+ * @{
+ */
+
+/**
+ * @defgroup ICM45686_ACCEL_POWER_MODES Accelerometer power modes
+ * @{
+ */
+#define ICM45686_DT_ACCEL_OFF		0
+#define ICM45686_DT_ACCEL_LP		2
+#define ICM45686_DT_ACCEL_LN		3
+/** @} */
+
+/**
+ * @defgroup ICM45686_GYRO_POWER_MODES Gyroscope power modes
+ * @{
+ */
+#define ICM45686_DT_GYRO_OFF		0
+#define ICM45686_DT_GYRO_STANDBY	1
+#define ICM45686_DT_GYRO_LP		2
+#define ICM45686_DT_GYRO_LN		3
+/** @} */
+
+/**
+ * @defgroup ICM45686_ACCEL_SCALE Accelerometer scale options
+ * @{
+ */
+#define ICM45686_DT_ACCEL_FS_32		0
+#define ICM45686_DT_ACCEL_FS_16		1
+#define ICM45686_DT_ACCEL_FS_8		2
+#define ICM45686_DT_ACCEL_FS_4		3
+#define ICM45686_DT_ACCEL_FS_2		4
+/** @} */
+
+/**
+ * @defgroup ICM45686_GYRO_SCALE Gyroscope scale options
+ * @{
+ */
+#define ICM45686_DT_GYRO_FS_4000	0
+#define ICM45686_DT_GYRO_FS_2000	1
+#define ICM45686_DT_GYRO_FS_1000	2
+#define ICM45686_DT_GYRO_FS_500		3
+#define ICM45686_DT_GYRO_FS_250		4
+#define ICM45686_DT_GYRO_FS_125		5
+#define ICM45686_DT_GYRO_FS_62_5	6
+#define ICM45686_DT_GYRO_FS_31_25	7
+#define ICM45686_DT_GYRO_FS_15_625	8
+/** @} */
+
+/**
+ * @defgroup ICM45686_ACCEL_DATA_RATE Accelerometer data rate options
+ * @{
+ */
+#define ICM45686_DT_ACCEL_ODR_6400	3 /* LN-mode only */
+#define ICM45686_DT_ACCEL_ODR_3200	4 /* LN-mode only */
+#define ICM45686_DT_ACCEL_ODR_1600	5 /* LN-mode only */
+#define ICM45686_DT_ACCEL_ODR_800	6 /* LN-mode only */
+#define ICM45686_DT_ACCEL_ODR_400	7 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_ACCEL_ODR_200	8 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_ACCEL_ODR_100	9 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_ACCEL_ODR_50	10 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_ACCEL_ODR_25	11 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_ACCEL_ODR_12_5	12 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_ACCEL_ODR_6_25	13 /* LP-mode only */
+#define ICM45686_DT_ACCEL_ODR_3_125	14 /* LP-mode only */
+#define ICM45686_DT_ACCEL_ODR_1_5625	15 /* LP-mode only */
+/** @} */
+
+/**
+ * @defgroup ICM45686_GYRO_DATA_RATE Gyroscope data rate options
+ * @{
+ */
+#define ICM45686_DT_GYRO_ODR_6400	3 /* LN-mode only */
+#define ICM45686_DT_GYRO_ODR_3200	4 /* LN-mode only */
+#define ICM45686_DT_GYRO_ODR_1600	5 /* LN-mode only */
+#define ICM45686_DT_GYRO_ODR_800	6 /* LN-mode only */
+#define ICM45686_DT_GYRO_ODR_400	7 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_GYRO_ODR_200	8 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_GYRO_ODR_100	9 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_GYRO_ODR_50		10 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_GYRO_ODR_25		11 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_GYRO_ODR_12_5	12 /* Both LN-mode and LP-mode */
+#define ICM45686_DT_GYRO_ODR_6_25	13 /* LP-mode only */
+#define ICM45686_DT_GYRO_ODR_3_125	14 /* LP-mode only */
+#define ICM45686_DT_GYRO_ODR_1_5625	15 /* LP-mode only */
+/** @} */
+
+/**
+ * @defgroup ICM45686_GYRO_LPF Gyroscope Low-pass Filtering options
+ * @{
+ */
+#define ICM45686_DT_GYRO_LPF_BW_OFF	0
+#define ICM45686_DT_GYRO_LPF_BW_1_4	1
+#define ICM45686_DT_GYRO_LPF_BW_1_8	2
+#define ICM45686_DT_GYRO_LPF_BW_1_16	3
+#define ICM45686_DT_GYRO_LPF_BW_1_32	4
+#define ICM45686_DT_GYRO_LPF_BW_1_64	5
+#define ICM45686_DT_GYRO_LPF_BW_1_128	6
+/** @} */
+
+/**
+ * @defgroup ICM45686_ACCEL_LPF Accelerometer Low-pass Filtering options
+ * @{
+ */
+#define ICM45686_DT_ACCEL_LPF_BW_OFF	0
+#define ICM45686_DT_ACCEL_LPF_BW_1_4	1
+#define ICM45686_DT_ACCEL_LPF_BW_1_8	2
+#define ICM45686_DT_ACCEL_LPF_BW_1_16	3
+#define ICM45686_DT_ACCEL_LPF_BW_1_32	4
+#define ICM45686_DT_ACCEL_LPF_BW_1_64	5
+#define ICM45686_DT_ACCEL_LPF_BW_1_128	6
+/** @} */
+
+
+/** @} */
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_TDK_ICM45686_H_ */
diff --git a/include/zephyr/dt-bindings/sensor/lsm6dsv16x.h b/include/zephyr/dt-bindings/sensor/lsm6dsv16x.h
index 9cb142b2ed68b..9f3b5afda2dc3 100644
--- a/include/zephyr/dt-bindings/sensor/lsm6dsv16x.h
+++ b/include/zephyr/dt-bindings/sensor/lsm6dsv16x.h
@@ -7,10 +7,14 @@
 #define ZEPHYR_INCLUDE_DT_BINDINGS_ST_LSM6DSV16X_H_
 
 /* Accel range */
-#define	LSM6DSV16X_DT_FS_2G			0
-#define	LSM6DSV16X_DT_FS_4G			1
-#define	LSM6DSV16X_DT_FS_8G			2
-#define	LSM6DSV16X_DT_FS_16G			3
+#define	LSM6DSV16X_DT_FS_2G			2
+#define	LSM6DSV16X_DT_FS_4G			4
+#define	LSM6DSV16X_DT_FS_8G			8
+#define	LSM6DSV16X_DT_FS_16G			16
+#define LSM6DSV32X_DT_FS_4G                     4
+#define LSM6DSV32X_DT_FS_8G                     8
+#define LSM6DSV32X_DT_FS_16G                    16
+#define LSM6DSV32X_DT_FS_32G                    32
 
 /* Gyro range */
 #define	LSM6DSV16X_DT_FS_125DPS			0x0
diff --git a/include/zephyr/dt-bindings/sensor/tmp114.h b/include/zephyr/dt-bindings/sensor/tmp114.h
new file mode 100644
index 0000000000000..8bd96572122ce
--- /dev/null
+++ b/include/zephyr/dt-bindings/sensor/tmp114.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 Fredrik Gihl
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP114_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP114_H_
+
+/**
+ * @defgroup TMP114 Texas Instruments (TI) TMP114 DT Options
+ * @ingroup sensor_interface
+ * @{
+ */
+
+/**
+ * @defgroup TMP114_ODR Temperature output data rate
+ * @{
+ */
+#define TMP114_DT_ODR_6_4_MS   0
+#define TMP114_DT_ODR_31_25_MS 1
+#define TMP114_DT_ODR_62_5_MS  2
+#define TMP114_DT_ODR_125_MS   3
+#define TMP114_DT_ODR_250_MS   4
+#define TMP114_DT_ODR_500_MS   5
+#define TMP114_DT_ODR_1000_MS  6
+#define TMP114_DT_ODR_2000_MS  7
+/** @} */
+
+/** @} */
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP114_H_ */
diff --git a/include/zephyr/dt-bindings/sensor/tmp116.h b/include/zephyr/dt-bindings/sensor/tmp116.h
deleted file mode 100644
index 0ec8a4db7587b..0000000000000
--- a/include/zephyr/dt-bindings/sensor/tmp116.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Vitrolife A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP116_H_
-#define ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP116_H_
-
-/**
- * @defgroup TMP116 Texas Instruments (TI) TMP116 DT Options
- * @ingroup sensor_interface
- * @{
- */
-
-/**
- * @defgroup TMP116_ODR Temperature output data rate
- * @{
- */
-#define TMP116_DT_ODR_15_5_MS  0
-#define TMP116_DT_ODR_125_MS   0x80
-#define TMP116_DT_ODR_250_MS   0x100
-#define TMP116_DT_ODR_500_MS   0x180
-#define TMP116_DT_ODR_1000_MS  0x200
-#define TMP116_DT_ODR_4000_MS  0x280
-#define TMP116_DT_ODR_8000_MS  0x300
-#define TMP116_DT_ODR_16000_MS 0x380
-/** @} */
-
-/**
- * @defgroup TMP116_OS Temperature average sample count
- * @{
- */
-#define TMP116_DT_OVERSAMPLING_1   0
-#define TMP116_DT_OVERSAMPLING_8   0x20
-#define TMP116_DT_OVERSAMPLING_32  0x40
-#define TMP116_DT_OVERSAMPLING_64  0x60
-/** @} */
-
-/** @} */
-
-#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP116_H_ */
diff --git a/include/zephyr/dt-bindings/sensor/tmp11x.h b/include/zephyr/dt-bindings/sensor/tmp11x.h
new file mode 100644
index 0000000000000..b95774fd54dc4
--- /dev/null
+++ b/include/zephyr/dt-bindings/sensor/tmp11x.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Vitrolife A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP11X_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP11X_H_
+
+/**
+ * @defgroup TMP11X Texas Instruments (TI) TMP11X DT Options
+ * @ingroup sensor_interface
+ * @{
+ */
+
+/**
+ * @defgroup TMP11X_ODR Temperature output data rate
+ * @{
+ */
+#define TMP11X_DT_ODR_15_5_MS  0
+#define TMP11X_DT_ODR_125_MS   0x80
+#define TMP11X_DT_ODR_250_MS   0x100
+#define TMP11X_DT_ODR_500_MS   0x180
+#define TMP11X_DT_ODR_1000_MS  0x200
+#define TMP11X_DT_ODR_4000_MS  0x280
+#define TMP11X_DT_ODR_8000_MS  0x300
+#define TMP11X_DT_ODR_16000_MS 0x380
+/** @} */
+
+/**
+ * @defgroup TMP11X_OS Temperature average sample count
+ * @{
+ */
+#define TMP11X_DT_OVERSAMPLING_1  0
+#define TMP11X_DT_OVERSAMPLING_8  0x20
+#define TMP11X_DT_OVERSAMPLING_32 0x40
+#define TMP11X_DT_OVERSAMPLING_64 0x60
+/** @} */
+
+/** @} */
+
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_TI_TMP11X_H_ */
diff --git a/include/zephyr/fs/fs.h b/include/zephyr/fs/fs.h
index 57b7c84d6835b..e2cf7dff73b40 100644
--- a/include/zephyr/fs/fs.h
+++ b/include/zephyr/fs/fs.h
@@ -78,7 +78,7 @@ enum {
 /** Flag requests file system driver to use Disk Access API. When the flag is
  * set to the fs_mount_t.flags prior to fs_mount call, a file system
  * needs to use the Disk Access API, otherwise mount callback for the driver
- * should return -ENOSUP; when the flag is not set the file system driver
+ * should return -ENOTSUP; when the flag is not set the file system driver
  * should use Flash API by default, unless it only supports Disc Access API.
  * When file system will use Disk Access API and the flag is not set, the mount
  * callback for the file system should set the flag on success.
diff --git a/include/zephyr/fs/zms.h b/include/zephyr/fs/zms.h
index 0f0fbb82cc94c..8b776b426f9c2 100644
--- a/include/zephyr/fs/zms.h
+++ b/include/zephyr/fs/zms.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2024 BayLibre SAS
+/* Copyright (c) 2018 Laczen
+ * Copyright (c) 2024 BayLibre SAS
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -80,17 +81,26 @@ struct zms_fs {
  * @brief Mount a ZMS file system onto the device specified in `fs`.
  *
  * @param fs Pointer to the file system.
- * @retval 0 Success
- * @retval -ERRNO Negative errno code on error
+ *
+ * @retval 0 on success.
+ * @retval -ENOTSUP if the detected file system is not ZMS.
+ * @retval -EPROTONOSUPPORT if the ZMS version is not supported.
+ * @retval -EINVAL if any of the flash parameters or the sector layout is invalid.
+ * @retval -ENXIO if there is a device error.
+ * @retval -EIO if there is a memory read/write error.
  */
 int zms_mount(struct zms_fs *fs);
 
 /**
- * @brief Clear the ZMS file system from device.
+ * @brief Clear the ZMS file system from device. The ZMS file system must be re-mounted after this
+ * operation.
  *
  * @param fs Pointer to the file system.
- * @retval 0 Success
- * @retval -ERRNO Negative errno code on error
+ *
+ * @retval 0 on success.
+ * @retval -EACCES if `fs` is not mounted.
+ * @retval -ENXIO if there is a device error.
+ * @retval -EIO if there is a memory read/write error.
  */
 int zms_clear(struct zms_fs *fs);
 
@@ -102,14 +112,20 @@ int zms_clear(struct zms_fs *fs);
  * entry and an entry with data of length 0.
  *
  * @param fs Pointer to the file system.
- * @param id ID of the entry to be written
- * @param data Pointer to the data to be written
- * @param len Number of bytes to be written (maximum 64 KiB)
+ * @param id ID of the entry to be written.
+ * @param data Pointer to the data to be written.
+ * @param len Number of bytes to be written (maximum 64 KiB).
  *
  * @return Number of bytes written. On success, it will be equal to the number of bytes requested
  * to be written or 0.
  * When a rewrite of the same data already stored is attempted, nothing is written to flash,
  * thus 0 is returned. On error, returns negative value of error codes defined in `errno.h`.
+ * @retval Number of bytes written (`len` or 0) on success.
+ * @retval -EACCES if ZMS is still not initialized.
+ * @retval -ENXIO if there is a device error.
+ * @retval -EIO if there is a memory read/write error.
+ * @retval -EINVAL if `len` is invalid.
+ * @retval -ENOSPC if no space is left on the device.
  */
 ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len);
 
@@ -117,9 +133,12 @@ ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len);
  * @brief Delete an entry from the file system
  *
  * @param fs Pointer to the file system.
- * @param id ID of the entry to be deleted
- * @retval 0 Success
- * @retval -ERRNO Negative errno code on error
+ * @param id ID of the entry to be deleted.
+ *
+ * @retval 0 on success.
+ * @retval -EACCES if ZMS is still not initialized.
+ * @retval -ENXIO if there is a device error.
+ * @retval -EIO if there is a memory read/write error.
  */
 int zms_delete(struct zms_fs *fs, uint32_t id);
 
@@ -127,13 +146,17 @@ int zms_delete(struct zms_fs *fs, uint32_t id);
  * @brief Read an entry from the file system.
  *
  * @param fs Pointer to the file system.
- * @param id ID of the entry to be read
- * @param data Pointer to data buffer
- * @param len Number of bytes to read at most
+ * @param id ID of the entry to be read.
+ * @param data Pointer to data buffer.
+ * @param len Number of bytes to read at most.
  *
  * @return Number of bytes read. On success, it will be equal to the number of bytes requested
  * to be read or less than that if the stored data has a smaller size than the requested one.
  * On error, returns negative value of error codes defined in `errno.h`.
+ * @retval Number of bytes read (> 0) on success.
+ * @retval -EACCES if ZMS is still not initialized.
+ * @retval -EIO if there is a memory read/write error.
+ * @retval -ENOENT if there is no entry with the given `id`.
  */
 ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
 
@@ -141,26 +164,34 @@ ssize_t zms_read(struct zms_fs *fs, uint32_t id, void *data, size_t len);
  * @brief Read a history entry from the file system.
  *
  * @param fs Pointer to the file system.
- * @param id ID of the entry to be read
- * @param data Pointer to data buffer
- * @param len Number of bytes to be read
+ * @param id ID of the entry to be read.
+ * @param data Pointer to data buffer.
+ * @param len Number of bytes to be read.
  * @param cnt History counter: 0: latest entry, 1: one before latest ...
  *
  * @return Number of bytes read. On success, it will be equal to the number of bytes requested
  * to be read. When the return value is larger than the number of bytes requested to read this
  * indicates not all bytes were read, and more data is available. On error, returns negative
  * value of error codes defined in `errno.h`.
+ * @retval Number of bytes read (> 0) on success.
+ * @retval -EACCES if ZMS is still not initialized.
+ * @retval -EIO if there is a memory read/write error.
+ * @retval -ENOENT if there is no entry with the given `id` and history counter.
  */
 ssize_t zms_read_hist(struct zms_fs *fs, uint32_t id, void *data, size_t len, uint32_t cnt);
 
 /**
- * @brief Gets the length of the data that is stored in an entry with a given ID
+ * @brief Gets the length of the data that is stored in an entry with a given `id`
  *
  * @param fs Pointer to the file system.
  * @param id ID of the entry whose data length to retrieve.
  *
  * @return Data length contained in the ATE. On success, it will be equal to the number of bytes
  * in the ATE. On error, returns negative value of error codes defined in `errno.h`.
+ * @retval Length of the entry with the given `id` (> 0) on success.
+ * @retval -EACCES if ZMS is still not initialized.
+ * @retval -EIO if there is a memory read/write error.
+ * @retval -ENOENT if there is no entry with the given id and history counter.
  */
 ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id);
 
@@ -173,6 +204,9 @@ ssize_t zms_get_data_length(struct zms_fs *fs, uint32_t id);
  * still be written to the file system.
  * Calculating the free space is a time-consuming operation, especially on SPI flash.
  * On error, returns negative value of error codes defined in `errno.h`.
+ * @retval Number of free bytes (>= 0) on success.
+ * @retval -EACCES if ZMS is still not initialized.
+ * @retval -EIO if there is a memory read/write error.
  */
 ssize_t zms_calc_free_space(struct zms_fs *fs);
 
@@ -181,7 +215,8 @@ ssize_t zms_calc_free_space(struct zms_fs *fs);
  *
  * @param fs Pointer to the file system.
  *
- * @return Number of free bytes.
+ * @retval >=0 Number of free bytes in the currently active sector
+ * @retval -EACCES if ZMS is still not initialized.
  */
 size_t zms_active_sector_free_space(struct zms_fs *fs);
 
@@ -196,7 +231,9 @@ size_t zms_active_sector_free_space(struct zms_fs *fs);
  *
  * @param fs Pointer to the file system.
  *
- * @return 0 on success. On error, returns negative value of error codes defined in `errno.h`.
+ * @retval 0 on success.
+ * @retval -EACCES if ZMS is still not initialized.
+ * @retval -EIO if there is a memory read/write error.
  */
 int zms_sector_use_next(struct zms_fs *fs);
 
diff --git a/include/zephyr/init.h b/include/zephyr/init.h
index 512ea9f67bea6..d7f254c3c51b1 100644
--- a/include/zephyr/init.h
+++ b/include/zephyr/init.h
@@ -41,7 +41,7 @@ extern "C" {
  * - `SMP`: Only available if @kconfig{CONFIG_SMP} is enabled, specific for
  *   SMP.
  *
- * Initialization priority can take a value in the range of 0 to 99.
+ * Initialization priority can take a value in the range of 0 to 999.
  *
  * @note The same infrastructure is used by devices.
  * @{
@@ -49,43 +49,6 @@ extern "C" {
 
 struct device;
 
-/**
- * @brief Initialization function for init entries.
- *
- * Init entries support both the system initialization and the device
- * APIs. Each API has its own init function signature; hence, we have a
- * union to cover both.
- */
-union init_function {
-	/**
-	 * System initialization function.
-	 *
-	 * @retval 0 On success
-	 * @retval -errno If init fails.
-	 */
-	int (*sys)(void);
-	/**
-	 * Device initialization function.
-	 *
-	 * @param dev Device instance.
-	 *
-	 * @retval 0 On success
-	 * @retval -errno If device initialization fails.
-	 */
-	int (*dev)(const struct device *dev);
-#ifdef CONFIG_DEVICE_MUTABLE
-	/**
-	 * Device initialization function (rw).
-	 *
-	 * @param dev Device instance.
-	 *
-	 * @retval 0 On success
-	 * @retval -errno If device initialization fails.
-	 */
-	int (*dev_rw)(struct device *dev);
-#endif
-};
-
 /**
  * @brief Structure to store initialization entry information.
  *
@@ -101,18 +64,16 @@ union init_function {
  * @endinternal
  */
 struct init_entry {
-	/** Initialization function. */
-	union init_function init_fn;
+	/**
+	 * If the init function belongs to a SYS_INIT, this field stored the
+	 * initialization function, otherwise it is set to NULL.
+	 */
+	int (*init_fn)(void);
 	/**
 	 * If the init entry belongs to a device, this fields stores a
 	 * reference to it, otherwise it is set to NULL.
 	 */
-	union {
-		const struct device *dev;
-#ifdef CONFIG_DEVICE_MUTABLE
-		struct device *dev_rw;
-#endif
-	};
+	const struct device *dev;
 };
 
 /** @cond INTERNAL_HIDDEN */
@@ -147,42 +108,9 @@ struct init_entry {
  * linker scripts to sort them according to the specified
  * level/priority/sub-priority.
  */
-#define Z_INIT_ENTRY_SECTION(level, prio, sub_prio)                           \
-	__attribute__((__section__(                                           \
-		".z_init_" #level STRINGIFY(prio)"_" STRINGIFY(sub_prio)"_")))
-
-
-/* Designated initializers where added to C in C99. There were added to
- * C++ 20 years later in a much more restricted form. C99 allows many
- * variations: out of order, mix of designated and not, overlap,
- * override,... but C++ allows none of these. See differences detailed
- * in the P0329R0.pdf C++ proposal.
- * Note __STDC_VERSION__ is undefined when compiling C++.
- */
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__) < 201100
-
-/* Anonymous unions require C11. Some pre-C11 gcc versions have early
- * support for anonymous unions but they require these braces when
- * combined with C99 designated initializers, see longer discussion in
- * #69411.
- * These braces are compatible with any C version but not with C++20.
- */
-#  define Z_INIT_SYS_INIT_DEV_NULL  { .dev = NULL }
-
-#else
-
-/* When using -std=c++20 or higher, g++ (v12.2.0) reject braces for
- * initializing anonymous unions because it is technically a mix of
- * designated and not designated initializers which is not allowed in
- * C++. Interestingly, the _same_ g++ version does accept the braces above
- * when using -std=c++17 or lower!
- * The tests/lib/cpp/cxx/ added by commit 3d9c428d57bf invoke the C++
- * compiler with a range of different `-std=...` parameters without needing
- * any manual configuration.
- */
-#  define Z_INIT_SYS_INIT_DEV_NULL    .dev = NULL
-
-#endif
+#define Z_INIT_ENTRY_SECTION(level, prio, sub_prio)                                                \
+	__attribute__((__section__(                                                                \
+		".z_init_" #level "_P_" STRINGIFY(prio) "_SUB_" STRINGIFY(sub_prio)"_")))
 
 /** @endcond */
 
@@ -238,8 +166,7 @@ struct init_entry {
 #define SYS_INIT_NAMED(name, init_fn_, level, prio)                                       \
 	static const Z_DECL_ALIGN(struct init_entry)                                      \
 		Z_INIT_ENTRY_SECTION(level, prio, 0) __used __noasan                      \
-		Z_INIT_ENTRY_NAME(name) = {.init_fn = {.sys = (init_fn_)},                \
-			Z_INIT_SYS_INIT_DEV_NULL}
+		Z_INIT_ENTRY_NAME(name) = {.init_fn = (init_fn_), .dev = NULL}            \
 
 /** @} */
 
diff --git a/include/zephyr/internal/syscall_handler.h b/include/zephyr/internal/syscall_handler.h
index b48070fad6b46..877bb5b4df43c 100644
--- a/include/zephyr/internal/syscall_handler.h
+++ b/include/zephyr/internal/syscall_handler.h
@@ -372,9 +372,9 @@ int k_usermode_string_copy(char *dst, const char *src, size_t maxlen);
 #define K_SYSCALL_VERIFY_MSG(expr, fmt, ...) ({ \
 	bool expr_copy = !(expr); \
 	if (expr_copy) { \
-		TOOLCHAIN_IGNORE_WSHADOW_BEGIN \
+		TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_SHADOW) \
 		LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL); \
-		TOOLCHAIN_IGNORE_WSHADOW_END \
+		TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_SHADOW) \
 		LOG_ERR("syscall %s failed check: " fmt, \
 			__func__, ##__VA_ARGS__); \
 	} \
diff --git a/include/zephyr/ipc/icmsg.h b/include/zephyr/ipc/icmsg.h
index 6e4cbaeaa86c4..41967d7515360 100644
--- a/include/zephyr/ipc/icmsg.h
+++ b/include/zephyr/ipc/icmsg.h
@@ -27,14 +27,58 @@ extern "C" {
  */
 
 enum icmsg_state {
+	/** Instance is not initialized yet. In this state: sending will fail, opening allowed.
+	 */
 	ICMSG_STATE_OFF,
-	ICMSG_STATE_BUSY,
-	ICMSG_STATE_READY,
+
+	/** Instance is initializing without session handshake. In this state: sending will fail,
+	 * opening will fail.
+	 */
+	ICMSG_STATE_INITIALIZING_SID_DISABLED,
+
+	/** Instance is initializing with session handshake. It is waiting for remote to acknowledge
+	 * local session id. In this state: sending will fail, opening is allowed (local session id
+	 * will change, so the remote may get unbound() callback).
+	 */
+	ICMSG_STATE_INITIALIZING_SID_ENABLED,
+
+	/** Instance is initializing with detection of session handshake support on remote side.
+	 * It is waiting for remote to acknowledge local session id or to send magic bytes.
+	 * In this state: sending will fail, opening is allowed (local session id
+	 * will change, so the remote may get unbound() callback if it supports it).
+	 */
+	ICMSG_STATE_INITIALIZING_SID_DETECT,
+
+	/** Instance was closed on remote side. The unbound() callback was send on local side.
+	 * In this state: sending will be silently discarded (there may be outdated sends),
+	 * opening is allowed.
+	 */
+	ICMSG_STATE_DISCONNECTED,
+
+	/* Connected states must be at the end. */
+
+	/** Instance is connected without session handshake support. In this state: sending will be
+	 * successful, opening will fail.
+	 */
+	ICMSG_STATE_CONNECTED_SID_DISABLED,
+
+	/** Instance is connected with session handshake support. In this state: sending will be
+	 * successful, opening is allowed (session will change and remote will get unbound()
+	 * callback).
+	 */
+	ICMSG_STATE_CONNECTED_SID_ENABLED,
+};
+
+enum icmsg_unbound_mode {
+	ICMSG_UNBOUND_MODE_DISABLE = ICMSG_STATE_INITIALIZING_SID_DISABLED,
+	ICMSG_UNBOUND_MODE_ENABLE = ICMSG_STATE_INITIALIZING_SID_ENABLED,
+	ICMSG_UNBOUND_MODE_DETECT = ICMSG_STATE_INITIALIZING_SID_DETECT,
 };
 
 struct icmsg_config_t {
 	struct mbox_dt_spec mbox_tx;
 	struct mbox_dt_spec mbox_rx;
+	enum icmsg_unbound_mode unbound_mode;
 };
 
 struct icmsg_data_t {
@@ -52,9 +96,10 @@ struct icmsg_data_t {
 	/* General */
 	const struct icmsg_config_t *cfg;
 #ifdef CONFIG_MULTITHREADING
-	struct k_work_delayable notify_work;
 	struct k_work mbox_work;
 #endif
+	uint16_t remote_sid;
+	uint16_t local_sid;
 	atomic_t state;
 };
 
diff --git a/include/zephyr/ipc/ipc_service.h b/include/zephyr/ipc/ipc_service.h
index 65411a6be1ca8..dbc0b8b7ee48a 100644
--- a/include/zephyr/ipc/ipc_service.h
+++ b/include/zephyr/ipc/ipc_service.h
@@ -151,6 +151,21 @@ struct ipc_service_cb {
 	 */
 	void (*bound)(void *priv);
 
+	/** @brief The endpoint unbound by the remote.
+	 *
+	 *  This callback is called when the endpoint binding is removed. It may happen on
+	 *  different reasons, e.g. when the remote deregistered the endpoint, connection was
+	 *  lost, or remote CPU got reset.
+	 *
+	 *  You may want to do some cleanup, resetting, e.t.c. and after that if you want to bound
+	 *  again, you can register the endpoint. When the remote becomes available again and it
+	 *  also registers the endpoint, the binding will be reestablished and the `bound()`
+	 *  callback will be called.
+	 *
+	 *  @param[in] priv Private user data.
+	 */
+	void (*unbound)(void *priv);
+
 	/** @brief New packet arrived.
 	 *
 	 *  This callback is called when new data is received.
diff --git a/include/zephyr/ipc/pbuf.h b/include/zephyr/ipc/pbuf.h
index 8783cdbbf1465..4bc42bfdf4509 100644
--- a/include/zephyr/ipc/pbuf.h
+++ b/include/zephyr/ipc/pbuf.h
@@ -47,20 +47,23 @@ extern "C" {
  * The structure contains configuration data.
  */
 struct pbuf_cfg {
-	volatile uint32_t *rd_idx_loc;	/* Address of the variable holding
-					 * index value of the first valid byte
-					 * in data[].
-					 */
-	volatile uint32_t *wr_idx_loc;	/* Address of the variable holding
-					 * index value of the first free byte
-					 * in data[].
-					 */
-	uint32_t dcache_alignment;	/* CPU data cache line size in bytes.
-					 * Used for validation - TODO: To be
-					 * replaced by flags.
-					 */
-	uint32_t len;			/* Length of data[] in bytes. */
-	uint8_t *data_loc;		/* Location of the data[]. */
+	volatile uint32_t *rd_idx_loc;	 /* Address of the variable holding
+					  * index value of the first valid byte
+					  * in data[].
+					  */
+	volatile uint32_t *handshake_loc;/* Address of the variable holding
+					  * handshake information.
+					  */
+	volatile uint32_t *wr_idx_loc;	 /* Address of the variable holding
+					  * index value of the first free byte
+					  * in data[].
+					  */
+	uint32_t dcache_alignment;	 /* CPU data cache line size in bytes.
+					  * Used for validation - TODO: To be
+					  * replaced by flags.
+					  */
+	uint32_t len;			 /* Length of data[] in bytes. */
+	uint8_t *data_loc;		 /* Location of the data[]. */
 };
 
 /**
@@ -111,16 +114,21 @@ struct pbuf {
  * @param mem_addr	Memory address for pbuf.
  * @param size		Size of the memory.
  * @param dcache_align	Data cache alignment.
+ * @param use_handshake	Add handshake word inside shared memory that can be access with
+ *			@ref pbuf_handshake_read and @ref pbuf_handshake_write.
  */
-#define PBUF_CFG_INIT(mem_addr, size, dcache_align)					\
+#define PBUF_CFG_INIT(mem_addr, size, dcache_align, use_handshake)			\
 {											\
 	.rd_idx_loc = (uint32_t *)(mem_addr),						\
-	.wr_idx_loc = (uint32_t *)((uint8_t *)(mem_addr) +				\
-				MAX(dcache_align, _PBUF_IDX_SIZE)),			\
+	.handshake_loc = use_handshake ? (uint32_t *)((uint8_t *)(mem_addr) +		\
+				_PBUF_IDX_SIZE) : NULL,					\
+	.wr_idx_loc = (uint32_t *)((uint8_t *)(mem_addr) + MAX(dcache_align,		\
+				(use_handshake ? 2 : 1) * _PBUF_IDX_SIZE)),		\
 	.data_loc = (uint8_t *)((uint8_t *)(mem_addr) +					\
-				MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE),	\
-	.len = (uint32_t)((uint32_t)(size) - MAX(dcache_align, _PBUF_IDX_SIZE) -	\
-				_PBUF_IDX_SIZE),					\
+				MAX(dcache_align, (use_handshake ? 2 : 1) *		\
+						  _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE),	\
+	.len = (uint32_t)((uint32_t)(size) - MAX(dcache_align,				\
+			(use_handshake ? 2 : 1) * _PBUF_IDX_SIZE) - _PBUF_IDX_SIZE),	\
 	.dcache_alignment = (dcache_align),						\
 }
 
@@ -140,9 +148,11 @@ struct pbuf {
  * @param name			Name of the pbuf.
  * @param mem_addr		Memory address for pbuf.
  * @param size			Size of the memory.
- * @param dcache_align	Data cache line size.
+ * @param dcache_align		Data cache line size.
+ * @param use_handshake		Add handshake word inside shared memory that can be access with
+ *				@ref pbuf_handshake_read and @ref pbuf_handshake_write.
  */
-#define PBUF_DEFINE(name, mem_addr, size, dcache_align)					\
+#define PBUF_DEFINE(name, mem_addr, size, dcache_align, use_handshake, compatibility)	\
 	BUILD_ASSERT(dcache_align >= 0,							\
 			"Cache line size must be non negative.");			\
 	BUILD_ASSERT((size) > 0 && IS_PTR_ALIGNED_BYTES(size, _PBUF_IDX_SIZE),		\
@@ -151,8 +161,10 @@ struct pbuf {
 			"Misaligned memory.");						\
 	BUILD_ASSERT(size >= (MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE +	\
 			_PBUF_MIN_DATA_LEN), "Insufficient size.");			\
+	BUILD_ASSERT(!(compatibility) || (dcache_align) >= 8,				\
+		"Data cache alignment must be at least 8 if compatibility is enabled.");\
 	static PBUF_MAYBE_CONST struct pbuf_cfg cfg_##name =				\
-			PBUF_CFG_INIT(mem_addr, size, dcache_align);			\
+			PBUF_CFG_INIT(mem_addr, size, dcache_align, use_handshake);	\
 	static struct pbuf name = {							\
 		.cfg = &cfg_##name,							\
 	}
@@ -223,6 +235,40 @@ int pbuf_write(struct pbuf *pb, const char *buf, uint16_t len);
  */
 int pbuf_read(struct pbuf *pb, char *buf, uint16_t len);
 
+/**
+ * @brief Read handshake word from pbuf.
+ *
+ * The pb must be defined with "PBUF_DEFINE" with "use_handshake" set.
+ *
+ * @param pb		A buffer from which data will be read.
+ * @retval uint32_t	The handshake word value.
+ */
+uint32_t pbuf_handshake_read(struct pbuf *pb);
+
+/**
+ * @brief Write handshake word to pbuf.
+ *
+ * The pb must be defined with "PBUF_DEFINE" with "use_handshake" set.
+ *
+ * @param pb		A buffer to which data will be written.
+ * @param value		A handshake value.
+ */
+void pbuf_handshake_write(struct pbuf *pb, uint32_t value);
+
+/**
+ * @brief Get first buffer from pbuf.
+ *
+ * This function retrieves buffer located at the beginning of queue.
+ * It will be continuous block since it is the first buffer.
+ *
+ * @param pb		A buffer from which data will be read.
+ * @param[out] buf	A pointer to output pointer to the date of the first buffer.
+ * @param[out] len	A pointer to output length the first buffer.
+ * @retval		0 on success.
+ *			-EINVAL when there is no buffer at the beginning of queue.
+ */
+int pbuf_get_initial_buf(struct pbuf *pb, volatile char **buf, uint16_t *len);
+
 /**
  * @}
  */
diff --git a/include/zephyr/irq_multilevel.h b/include/zephyr/irq_multilevel.h
index dc18c3049b6b4..27d11f672e7e9 100644
--- a/include/zephyr/irq_multilevel.h
+++ b/include/zephyr/irq_multilevel.h
@@ -32,15 +32,19 @@ typedef union _z_irq {
 		uint32_t l1: CONFIG_1ST_LEVEL_INTERRUPT_BITS;
 		/* Second level interrupt bits */
 		uint32_t l2: CONFIG_2ND_LEVEL_INTERRUPT_BITS;
+#if defined(CONFIG_3RD_LEVEL_INTERRUPTS) || defined(__DOXYGEN__)
 		/* Third level interrupt bits */
 		uint32_t l3: CONFIG_3RD_LEVEL_INTERRUPT_BITS;
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 	} bits;
 
+#if defined(CONFIG_3RD_LEVEL_INTERRUPTS) || defined(__DOXYGEN__)
 	/* Third level IRQ's interrupt controller */
 	struct {
 		/* IRQ of the third level interrupt aggregator */
 		uint32_t irq: CONFIG_1ST_LEVEL_INTERRUPT_BITS + CONFIG_2ND_LEVEL_INTERRUPT_BITS;
 	} l3_intc;
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
 	/* Second level IRQ's interrupt controller */
 	struct {
@@ -61,16 +65,20 @@ static inline uint32_t _z_l2_irq(_z_irq_t irq)
 	return irq.bits.l2 - 1;
 }
 
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
 static inline uint32_t _z_l3_irq(_z_irq_t irq)
 {
 	return irq.bits.l3 - 1;
 }
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
 static inline unsigned int _z_irq_get_level(_z_irq_t z_irq)
 {
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
 	if (z_irq.bits.l3 != 0) {
 		return 3;
 	}
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
 	if (z_irq.bits.l2 != 0) {
 		return 2;
@@ -142,7 +150,9 @@ static inline unsigned int irq_to_level_2(unsigned int irq)
 		.bits = {
 			.l1 = 0,
 			.l2 = irq + 1,
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
 			.l3 = 0,
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 		},
 	};
 
@@ -168,6 +178,7 @@ static inline unsigned int irq_parent_level_2(unsigned int irq)
 	return _z_l1_irq(z_irq);
 }
 
+#if defined(CONFIG_3RD_LEVEL_INTERRUPTS) || defined(__DOXYGEN__)
 /**
  * @brief Return the 3rd level interrupt number
  *
@@ -241,6 +252,7 @@ static inline unsigned int irq_parent_level_3(unsigned int irq)
 
 	return _z_l2_irq(z_irq);
 }
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
 /**
  * @brief Return the interrupt number for a given level
@@ -256,11 +268,14 @@ static inline unsigned int irq_from_level(unsigned int irq, unsigned int level)
 		return irq;
 	} else if (level == 2) {
 		return irq_from_level_2(irq);
-	} else if (level == 3) {
+	}
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+	else if (level == 3) {
 		return irq_from_level_3(irq);
 	}
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
-	/* level is higher than 3 */
+	/* level is higher than what's supported */
 	__ASSERT_NO_MSG(false);
 	return irq;
 }
@@ -279,11 +294,14 @@ static inline unsigned int irq_to_level(unsigned int irq, unsigned int level)
 		return irq;
 	} else if (level == 2) {
 		return irq_to_level_2(irq);
-	} else if (level == 3) {
+	}
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+	else if (level == 3) {
 		return irq_to_level_3(irq);
 	}
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
-	/* level is higher than 3 */
+	/* level is higher than what's supported */
 	__ASSERT_NO_MSG(false);
 	return irq;
 }
@@ -303,11 +321,14 @@ static inline unsigned int irq_parent_level(unsigned int irq, unsigned int level
 		return irq;
 	} else if (level == 2) {
 		return irq_parent_level_2(irq);
-	} else if (level == 3) {
+	}
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+	else if (level == 3) {
 		return irq_parent_level_3(irq);
 	}
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
-	/* level is higher than 3 */
+	/* level is higher than what's supported */
 	__ASSERT_NO_MSG(false);
 	return irq;
 }
@@ -322,19 +343,24 @@ static inline unsigned int irq_parent_level(unsigned int irq, unsigned int level
 static inline unsigned int irq_get_intc_irq(unsigned int irq)
 {
 	const unsigned int level = irq_get_level(irq);
-
-	__ASSERT_NO_MSG(level <= 3);
 	_z_irq_t z_irq = {
 		.irq = irq,
 	};
 
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+	__ASSERT_NO_MSG(level <= 3);
 	if (level == 3) {
 		return z_irq.l3_intc.irq;
-	} else if (level == 2) {
+	}
+#else
+	__ASSERT_NO_MSG(level <= 2);
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
+
+	if (level == 2) {
 		return z_irq.l2_intc.irq;
-	} else {
-		return irq;
 	}
+
+	return irq;
 }
 
 /**
@@ -351,8 +377,12 @@ static inline unsigned int irq_increment(unsigned int irq, unsigned int val)
 		.irq = irq,
 	};
 
-	if (z_irq.bits.l3 != 0) {
+	if (false) {
+		/* so that it evaluates the next condition */
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+	} else if (z_irq.bits.l3 != 0) {
 		z_irq.bits.l3 += val;
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 	} else if (z_irq.bits.l2 != 0) {
 		z_irq.bits.l2 += val;
 	} else {
diff --git a/include/zephyr/kernel.h b/include/zephyr/kernel.h
index 65a896efedf55..fd64e9d43b770 100644
--- a/include/zephyr/kernel.h
+++ b/include/zephyr/kernel.h
@@ -332,8 +332,15 @@ void k_thread_foreach_unlocked_filter_by_cpu(unsigned int cpu,
 /**
  * @brief Dynamically allocate a thread stack.
  *
- * Relevant stack creation flags include:
- * - @ref K_USER allocate a userspace thread (requires `CONFIG_USERSPACE=y`)
+ * Dynamically allocate a thread stack either from a pool of thread stacks of
+ * size @kconfig{CONFIG_DYNAMIC_THREAD_POOL_SIZE}, or from the system heap.
+ * Order is determined by the @kconfig{CONFIG_DYNAMIC_THREAD_PREFER_ALLOC} and
+ * @kconfig{CONFIG_DYNAMIC_THREAD_PREFER_POOL} options. Thread stacks from the
+ * pool are of maximum size @kconfig{CONFIG_DYNAMIC_THREAD_STACK_SIZE}.
+ *
+ * @note When no longer required, thread stacks allocated with
+ * `k_thread_stack_alloc()` must be freed with @ref k_thread_stack_free to
+ * avoid leaking memory.
  *
  * @param size Stack size in bytes.
  * @param flags Stack creation flags, or 0.
@@ -341,7 +348,10 @@ void k_thread_foreach_unlocked_filter_by_cpu(unsigned int cpu,
  * @retval the allocated thread stack on success.
  * @retval NULL on failure.
  *
- * @see CONFIG_DYNAMIC_THREAD
+ * Relevant stack creation flags include:
+ * - @ref K_USER allocate a userspace thread (requires @kconfig{CONFIG_USERSPACE})
+ *
+ * @see @kconfig{CONFIG_DYNAMIC_THREAD}
  */
 __syscall k_thread_stack_t *k_thread_stack_alloc(size_t size, int flags);
 
@@ -355,7 +365,7 @@ __syscall k_thread_stack_t *k_thread_stack_alloc(size_t size, int flags);
  * @retval -EINVAL if @p stack is invalid.
  * @retval -ENOSYS if dynamic thread stack allocation is disabled
  *
- * @see CONFIG_DYNAMIC_THREAD
+ * @see @kconfig{CONFIG_DYNAMIC_THREAD}
  */
 __syscall int k_thread_stack_free(k_thread_stack_t *stack);
 
@@ -373,7 +383,7 @@ __syscall int k_thread_stack_free(k_thread_stack_t *stack);
  * K_FP_REGS, and K_SSE_REGS. Multiple options may be specified by separating
  * them using "|" (the logical OR operator).
  *
- * Stack objects passed to this function must be originally defined with
+ * Stack objects passed to this function may be statically allocated with
  * either of these macros in order to be portable:
  *
  * - K_THREAD_STACK_DEFINE() - For stacks that may support either user or
@@ -382,6 +392,9 @@ __syscall int k_thread_stack_free(k_thread_stack_t *stack);
  *   threads only. These stacks use less memory if CONFIG_USERSPACE is
  *   enabled.
  *
+ * Alternatively, the stack may be dynamically allocated using
+ * @ref k_thread_stack_alloc.
+ *
  * The stack_size parameter has constraints. It must either be:
  *
  * - The original size value passed to K_THREAD_STACK_DEFINE() or
@@ -545,9 +558,10 @@ __syscall int k_thread_join(struct k_thread *thread, k_timeout_t timeout);
  *
  * @param timeout Desired duration of sleep.
  *
- * @return Zero if the requested time has elapsed or if the thread was woken up
- * by the \ref k_wakeup call, the time left to sleep rounded up to the nearest
- * millisecond.
+ * @return Zero if the requested time has elapsed or the time left to
+ * sleep rounded up to the nearest millisecond (e.g. if the thread was
+ * awoken by the \ref k_wakeup call).  Will be clamped to INT_MAX in
+ * the case where the remaining time is unrepresentable in an int32_t.
  */
 __syscall int32_t k_sleep(k_timeout_t timeout);
 
@@ -1482,6 +1496,19 @@ const char *k_thread_state_str(k_tid_t thread_id, char *buf, size_t buf_size);
 #define K_TIMEOUT_ABS_TICKS(t) \
 	Z_TIMEOUT_TICKS(Z_TICK_ABS((k_ticks_t)MAX(t, 0)))
 
+/**
+ * @brief Generates an absolute/uptime timeout value from seconds
+ *
+ * This macro generates a timeout delay that represents an expiration
+ * at the absolute uptime value specified, in seconds.  That is, the
+ * timeout will expire immediately after the system uptime reaches the
+ * specified tick count.
+ *
+ * @param t Second uptime value
+ * @return Timeout delay value
+ */
+#define K_TIMEOUT_ABS_SEC(t) K_TIMEOUT_ABS_TICKS(k_sec_to_ticks_ceil64(t))
+
 /**
  * @brief Generates an absolute/uptime timeout value from milliseconds
  *
@@ -1590,6 +1617,7 @@ struct k_timer {
 	.wait_q = Z_WAIT_Q_INIT(&obj.wait_q), \
 	.expiry_fn = expiry, \
 	.stop_fn = stop, \
+	.period = {}, \
 	.status = 0, \
 	.user_data = 0, \
 	}
@@ -2341,7 +2369,8 @@ struct k_event {
 #define Z_EVENT_INITIALIZER(obj) \
 	{ \
 	.wait_q = Z_WAIT_Q_INIT(&obj.wait_q), \
-	.events = 0 \
+	.events = 0, \
+	.lock = {}, \
 	}
 
 /**
@@ -4588,6 +4617,7 @@ struct k_msgq {
 #define Z_MSGQ_INITIALIZER(obj, q_buffer, q_msg_size, q_max_msgs) \
 	{ \
 	.wait_q = Z_WAIT_Q_INIT(&obj.wait_q), \
+	.lock = {}, \
 	.msg_size = q_msg_size, \
 	.max_msgs = q_max_msgs, \
 	.buffer_start = q_buffer, \
@@ -4596,6 +4626,7 @@ struct k_msgq {
 	.write_ptr = q_buffer, \
 	.used_msgs = 0, \
 	Z_POLL_EVENT_OBJ_INIT(obj) \
+	.flags = 0, \
 	}
 
 /**
@@ -5770,6 +5801,7 @@ void k_heap_free(struct k_heap *h, void *mem) __attribute_nonnull(1);
 
 /**
  * @defgroup heap_apis Heap APIs
+ * @brief Memory allocation from the Heap
  * @ingroup kernel_apis
  * @{
  */
@@ -5927,6 +5959,8 @@ enum _poll_states_bits {
 
 /**
  * @defgroup poll_apis Async polling APIs
+ * @brief An API to wait concurrently for any one of multiple conditions to be
+ *        fulfilled
  * @ingroup kernel_apis
  * @{
  */
diff --git a/include/zephyr/kernel/thread.h b/include/zephyr/kernel/thread.h
index fd8e4c02f235e..ae43d71115d7b 100644
--- a/include/zephyr/kernel/thread.h
+++ b/include/zephyr/kernel/thread.h
@@ -105,7 +105,9 @@ struct _thread_base {
 	int prio_deadline;
 #endif /* CONFIG_SCHED_DEADLINE */
 
+#if defined(CONFIG_SCHED_SCALABLE) || defined(CONFIG_WAITQ_SCALABLE)
 	uint32_t order_key;
+#endif
 
 #ifdef CONFIG_SMP
 	/* True for the per-CPU idle threads */
@@ -194,6 +196,7 @@ struct _mem_domain_info {
 	struct k_mem_domain *mem_domain;
 };
 
+typedef struct _mem_domain_info _mem_domain_info_t;
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_THREAD_USERSPACE_LOCAL_DATA
diff --git a/include/zephyr/kernel_structs.h b/include/zephyr/kernel_structs.h
index 56df49dcb23db..5bf9ae6df1c50 100644
--- a/include/zephyr/kernel_structs.h
+++ b/include/zephyr/kernel_structs.h
@@ -133,7 +133,7 @@ struct _ready_q {
 	struct k_thread *cache;
 #endif
 
-#if defined(CONFIG_SCHED_DUMB)
+#if defined(CONFIG_SCHED_SIMPLE)
 	sys_dlist_t runq;
 #elif defined(CONFIG_SCHED_SCALABLE)
 	struct _priq_rb runq;
@@ -217,20 +217,6 @@ struct z_kernel {
 	struct _ready_q ready_q;
 #endif
 
-#ifdef CONFIG_FPU_SHARING
-	/*
-	 * A 'current_sse' field does not exist in addition to the 'current_fp'
-	 * field since it's not possible to divide the IA-32 non-integer
-	 * registers into 2 distinct blocks owned by differing threads.  In
-	 * other words, given that the 'fxnsave/fxrstor' instructions
-	 * save/restore both the X87 FPU and XMM registers, it's not possible
-	 * for a thread to only "own" the XMM registers.
-	 */
-
-	/* thread that owns the FP regs */
-	struct k_thread *current_fp;
-#endif
-
 #if defined(CONFIG_THREAD_MONITOR)
 	struct k_thread *threads; /* singly linked list of ALL threads */
 #endif
@@ -271,6 +257,8 @@ __attribute_const__ struct k_thread *z_smp_current_get(void);
 #define _current _kernel.cpus[0].current
 #endif
 
+#define CPU_ID ((CONFIG_MP_MAX_NUM_CPUS == 1) ? 0 : _current_cpu->id)
+
 /* This is always invoked from a context where preemption is disabled */
 #define z_current_thread_set(thread) ({ _current_cpu->current = (thread); })
 
diff --git a/include/zephyr/kernel_version.h b/include/zephyr/kernel_version.h
index 7a21b43776848..909800feeba49 100644
--- a/include/zephyr/kernel_version.h
+++ b/include/zephyr/kernel_version.h
@@ -18,6 +18,8 @@ extern "C" {
  * @ingroup kernel_apis
  * @{
  *
+ * @brief Kernel Version APIs
+ *
  * The kernel version has been converted from a string to a four-byte
  * quantity that is divided into two parts.
  *
diff --git a/include/zephyr/linker/common-noinit.ld b/include/zephyr/linker/common-noinit.ld
index fba2221162b3e..8152629af6ab1 100644
--- a/include/zephyr/linker/common-noinit.ld
+++ b/include/zephyr/linker/common-noinit.ld
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+/* Please keep in sync with cmake/linker_script/common/common-noinit.cmake */
 
 SECTION_PROLOGUE(_NOINIT_SECTION_NAME,(NOLOAD),)
 {
diff --git a/include/zephyr/linker/common-ram.ld b/include/zephyr/linker/common-ram.ld
index 1eef183d4ae66..977633805264e 100644
--- a/include/zephyr/linker/common-ram.ld
+++ b/include/zephyr/linker/common-ram.ld
@@ -1,4 +1,5 @@
 /* SPDX-License-Identifier: Apache-2.0 */
+/* Please keep in sync with cmake/linker_script/common/common-ram.cmake */
 
 #include <zephyr/linker/iterable_sections.h>
 
diff --git a/include/zephyr/linker/common-rom/common-rom-init.ld b/include/zephyr/linker/common-rom/common-rom-init.ld
index 04c504ce44a09..2aa1873f9f765 100644
--- a/include/zephyr/linker/common-rom/common-rom-init.ld
+++ b/include/zephyr/linker/common-rom/common-rom-init.ld
@@ -1,76 +1,65 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
-#ifdef CONFIG_STATIC_INIT_GNU
-	SECTION_PROLOGUE(_CTOR_SECTION_NAME,,)
+#if defined(CONFIG_TOOLCHAIN_SUPPORTS_STATIC_INIT_GNU) || defined(CONFIG_NATIVE_APPLICATION)
+	SECTION_PROLOGUE(init_array,,)
 	{
 		/*
-		 * The compiler fills the constructor pointers table below,
-		 * hence symbol __CTOR_LIST__ must be aligned on word
-		 * boundary.  To align with the C++ standard, the first element
-		 * of the array contains the number of actual constructors. The
-		 * last element is NULL.
-		 *
-		 * The __CTOR_LIST__ and __CTOR_END__ symbols are always defined
-		 * to result in an empty list. This is necessary to fix an issue
-		 * where the glibc process initialization code on native_posix
-		 * platforms calls constructors before Zephyr loads (issue #39347).
-		 *
-		 * Zephyr's start-up code uses the __ZEPHYR_CTOR_LIST__ and
-		 * __ZEHPYR_CTOR_END__ symbols, so these need to be correctly set.
+		 * Add all of the GNU-style constructors in priority order. Note
+		 * that this doesn't build the ctors in the "usual" fashion with
+		 * a length value first and NULL terminator, but we're creating
+		 * an init_array style list and leaving the ctors list empty
+		 */
+#ifdef CONFIG_NATIVE_APPLICATION
+		/* Use the native LIBC constructor code so that any native
+		 * constructors get run before main is invoked
+		 */
+		__init_array_start = .;
+#else
+		__zephyr_init_array_start = .;
+#endif
+		KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*)
+			SORT_BY_INIT_PRIORITY(.ctors.*)))
+		KEEP (*(.init_array .ctors))
+#ifdef CONFIG_NATIVE_APPLICATION
+		__init_array_end = .;
+#else
+		__zephyr_init_array_end = .;
+#endif
+
+#ifdef CONFIG_NATIVE_LIBC
+		/*
+                 * The __CTOR_LIST__ and __CTOR_END__ symbols are always defined
+                 * to result in an empty list.
+		 * Instead, Zephyr's start-up code uses the __zephyr_init_array_start__ and
+		 * __zephyr_init_array_end__ symbols.
+		 * In this way, in native_simulator based targets, the host glibc process
+		 * initialization code will not call the constructors before Zephyr loads.
 		 */
-#ifdef CONFIG_64BIT
-		. = ALIGN(8);
-		__ZEPHYR_CTOR_LIST__ = .;
-		QUAD((__ZEPHYR_CTOR_END__ - __ZEPHYR_CTOR_LIST__) / 8 - 2)
-		KEEP(*(SORT_BY_NAME(".ctors*")))
 		__CTOR_LIST__ = .;
+#ifdef CONFIG_64BIT
 		QUAD(0)
-		__ZEPHYR_CTOR_END__ = .;
 		QUAD(0)
-		__CTOR_END__ = .;
 #else
-		. = ALIGN(4);
-		__ZEPHYR_CTOR_LIST__ = .;
-		LONG((__ZEPHYR_CTOR_END__ - __ZEPHYR_CTOR_LIST__) / 4 - 2)
-		KEEP(*(SORT_BY_NAME(".ctors*")))
-		__CTOR_LIST__ = .;
 		LONG(0)
-		__ZEPHYR_CTOR_END__ = .;
 		LONG(0)
-		__CTOR_END__ = .;
 #endif
-	} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
-
-	SECTION_PROLOGUE(init_array,,)
-	{
+		__CTOR_END__ = .;
+#ifndef CONFIG_NATIVE_APPLICATION
 		/*
-		* Similar to the schenanigans required for the __CTOR_LIST__ and
-		* __CTOR_END__ symbols we define __init_array_start and __init_array_end
-		* to the same address to define an empty list. This prevents the glibc
-		* startup code from calling any global constructors before Zephyr loads.
-		*
-		* Zephyr's start-up code uses the __zephyr_init_array_start and
-		* __zephyr_init_array_end sybmols, so these need to be set correctly.
-		*/
-		. = ALIGN(4);
+		 * Similar to the schenanigans required for the __CTOR_LIST__ and
+		 * __CTOR_END__ symbols we define __init_array_start and __init_array_end
+		 * to the same address to define an empty list. This prevents the glibc
+		 * startup code from calling any global constructors before Zephyr loads.
+		 */
 		__init_array_start = .;
 		__init_array_end = .;
-		__zephyr_init_array_start = .;
-		KEEP(*(SORT_BY_NAME(".init_array*")))
-		__zephyr_init_array_end = .;
+#endif
+#endif
 	} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
 
-#elif defined(CONFIG_TOOLCHAIN_SUPPORTS_STATIC_INIT_GNU) && !defined(CONFIG_NATIVE_APPLICATION)
-	/*
-	 * If the code to invoke constructors is not enabled,
-	 * make sure there aren't any in the application
-	 */
-	SECTION_PROLOGUE(init_array,,)
-	{
-		KEEP(*(SORT_BY_NAME(".ctors*")))
-		KEEP(*(SORT_BY_NAME(".init_array*")))
-	} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+#if !defined(CONFIG_STATIC_INIT_GNU) && !defined(CONFIG_NATIVE_APPLICATION)
+	ASSERT(__zephyr_init_array_start == __zephyr_init_array_end,
+	       "GNU-style constructors required but STATIC_INIT_GNU not enabled")
+#endif
 
-	ASSERT (SIZEOF(init_array) == 0,
-		"GNU-style constructors required but STATIC_INIT_GNU not enabled")
 #endif
diff --git a/include/zephyr/linker/common-rom/common-rom-kernel-devices.ld b/include/zephyr/linker/common-rom/common-rom-kernel-devices.ld
index c6920b5bec0fa..1dde21d7adc6e 100644
--- a/include/zephyr/linker/common-rom/common-rom-kernel-devices.ld
+++ b/include/zephyr/linker/common-rom/common-rom-kernel-devices.ld
@@ -18,9 +18,6 @@
 		CREATE_OBJ_LEVEL(init, APPLICATION)
 		CREATE_OBJ_LEVEL(init, SMP)
 		__init_end = .;
-		__deferred_init_list_start = .;
-		KEEP(*(.z_deferred_init*))
-		__deferred_init_list_end = .;
 	} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
 
 	ITERABLE_SECTION_ROM_NUMERIC(device, Z_LINK_ITERABLE_SUBALIGN)
@@ -70,7 +67,7 @@
 	/* verify we don't have rogue .z_init_<something> initlevel sections */
 	SECTION_PROLOGUE(initlevel_error,,)
 	{
-		KEEP(*(SORT(.z_init_[_A-Z0-9]*)))
+		KEEP(*(SORT(.z_init_*)))
 	}
 	ASSERT(SIZEOF(initlevel_error) == 0, "Undefined initialization levels used.")
 
diff --git a/include/zephyr/linker/cplusplus-rom.ld b/include/zephyr/linker/cplusplus-rom.ld
index 5981e2f7b981c..0d815d4e69bd3 100644
--- a/include/zephyr/linker/cplusplus-rom.ld
+++ b/include/zephyr/linker/cplusplus-rom.ld
@@ -13,13 +13,17 @@
 #if defined (CONFIG_CPP_EXCEPTIONS)
 	SECTION_PROLOGUE(.eh_frame_hdr,,)
 	{
+	PROVIDE(__eh_frame_hdr_start = SIZEOF(.eh_frame_hdr) > 0 ? ADDR(.eh_frame_hdr) : 0);
 	*(.eh_frame_hdr)
+	PROVIDE(__eh_frame_hdr_end = SIZEOF(.eh_frame_hdr) > 0 ? . : 0);
 	} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
 
 	SECTION_PROLOGUE(.eh_frame,,)
 	{
+        PROVIDE (__eh_frame_start = .);
 	KEEP (*(SORT_NONE(EXCLUDE_FILE (*crtend.o) .eh_frame)))
 	KEEP (*(SORT_NONE(.eh_frame)))
+        PROVIDE (__eh_frame_end = .);
 	} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
 #endif /* CONFIG_CPP_EXCEPTIONS */
 
diff --git a/include/zephyr/linker/debug-sections.ld b/include/zephyr/linker/debug-sections.ld
index 2a70cccb79e24..f9a4e840feffd 100644
--- a/include/zephyr/linker/debug-sections.ld
+++ b/include/zephyr/linker/debug-sections.ld
@@ -1,4 +1,5 @@
 /* SPDX-License-Identifier: Apache-2.0 */
+/* Please keep in sync with cmake/linker_script/common/debug-sections.cmake */
 
 	/* following sections are obtained via 'ld --verbose' */
 
diff --git a/include/zephyr/linker/devicetree_regions.h b/include/zephyr/linker/devicetree_regions.h
index 9a0139dfc8ef1..1735a9b439c36 100644
--- a/include/zephyr/linker/devicetree_regions.h
+++ b/include/zephyr/linker/devicetree_regions.h
@@ -211,6 +211,7 @@
  *
  * @param node_id devicetree node identifier
  */
+/* clang-format off */
 #define _SECTION_DECLARE(node_id)								\
 	LINKER_DT_NODE_REGION_NAME_TOKEN(node_id) (NOLOAD) :					\
 	{											\
@@ -221,6 +222,7 @@
 	} > LINKER_DT_NODE_REGION_NAME_TOKEN(node_id)						\
 	_DT_SECTION_SIZE(node_id) = _DT_SECTION_END(node_id) - _DT_SECTION_START(node_id);	\
 	_DT_SECTION_LOAD(node_id) = LOADADDR(LINKER_DT_NODE_REGION_NAME_TOKEN(node_id));
+/* clang-format on */
 
 /** @endcond */
 
diff --git a/include/zephyr/linker/iterable_sections.h b/include/zephyr/linker/iterable_sections.h
index d61d73c89d04f..c8030c53a1ceb 100644
--- a/include/zephyr/linker/iterable_sections.h
+++ b/include/zephyr/linker/iterable_sections.h
@@ -12,6 +12,7 @@
  * @{
  */
 
+/* clang-format off */
 #define Z_LINK_ITERABLE(struct_type) \
 	_CONCAT(_##struct_type, _list_start) = .; \
 	KEEP(*(SORT_BY_NAME(._##struct_type.static.*))); \
@@ -34,6 +35,7 @@
 	_CONCAT(_##struct_type, _list_start) = .; \
 	*(SORT_BY_NAME(._##struct_type.static.*)); \
 	_CONCAT(_##struct_type, _list_end) = .
+/* clang-format on */
 
 #define Z_LINK_ITERABLE_SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN
 
diff --git a/include/zephyr/linker/kobject-data.ld b/include/zephyr/linker/kobject-data.ld
index 573680b235e7e..f3bd54ca7c6ba 100644
--- a/include/zephyr/linker/kobject-data.ld
+++ b/include/zephyr/linker/kobject-data.ld
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/* Please keep in sync with cmake/linker_script/common/kobject-data.cmake */
+
 #ifdef CONFIG_USERSPACE
 
 	z_kobject_data_begin = .;
diff --git a/include/zephyr/linker/kobject-priv-stacks.ld b/include/zephyr/linker/kobject-priv-stacks.ld
index 53bd508927e68..5cc2ee713a031 100644
--- a/include/zephyr/linker/kobject-priv-stacks.ld
+++ b/include/zephyr/linker/kobject-priv-stacks.ld
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+/* Please keep in sync with cmake/linker_script/common/kobject-priv-stacks.cmake */
 
 #ifdef CONFIG_USERSPACE
 #ifdef CONFIG_GEN_PRIV_STACKS
diff --git a/include/zephyr/linker/kobject-rom.ld b/include/zephyr/linker/kobject-rom.ld
index 1bb6ee10c15d2..cbe664aa30c86 100644
--- a/include/zephyr/linker/kobject-rom.ld
+++ b/include/zephyr/linker/kobject-rom.ld
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+/* Please keep in sync with cmake/linker_script/common/kobject-rom.cmake */
 
 #ifdef CONFIG_USERSPACE
 
diff --git a/include/zephyr/linker/kobject-text.ld b/include/zephyr/linker/kobject-text.ld
index b1c2b69e6df9b..0c9805c86f51e 100644
--- a/include/zephyr/linker/kobject-text.ld
+++ b/include/zephyr/linker/kobject-text.ld
@@ -1,4 +1,5 @@
 /* SPDX-License-Identifier: Apache-2.0 */
+/* Plase keep in sync with cmake/linker_script/common/kobject-text.cmake */
 
 #ifdef CONFIG_USERSPACE
 	/* We need to reserve room for the gperf generated hash functions.
diff --git a/include/zephyr/linker/linker-defs.h b/include/zephyr/linker/linker-defs.h
index 14bbc250f4c7f..0f28985233a60 100644
--- a/include/zephyr/linker/linker-defs.h
+++ b/include/zephyr/linker/linker-defs.h
@@ -44,10 +44,13 @@
  * (sorted by priority). Ensure the objects aren't discarded if there is
  * no direct reference to them
  */
+/* clang-format off */
 #define CREATE_OBJ_LEVEL(object, level)				\
 		__##object##_##level##_start = .;		\
-		KEEP(*(SORT(.z_##object##_##level?_*)));	\
-		KEEP(*(SORT(.z_##object##_##level??_*)));
+		KEEP(*(SORT(.z_##object##_##level##_P_?_*)));	\
+		KEEP(*(SORT(.z_##object##_##level##_P_??_*)));	\
+		KEEP(*(SORT(.z_##object##_##level##_P_???_*)));
+/* clang-format on */
 
 /*
  * link in shell initialization objects for all modules that use shell and
@@ -161,7 +164,7 @@ extern char __gcov_bss_size[];
 extern char _end[];
 
 #if (DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm)))
-extern char __ccm_data_rom_start[];
+extern char __ccm_data_load_start[];
 extern char __ccm_start[];
 extern char __ccm_data_start[];
 extern char __ccm_data_end[];
diff --git a/include/zephyr/linker/ram-end.ld b/include/zephyr/linker/ram-end.ld
index 71d4571e0fb0a..77be2a5708394 100644
--- a/include/zephyr/linker/ram-end.ld
+++ b/include/zephyr/linker/ram-end.ld
@@ -1,5 +1,6 @@
-/*
- * Added after the very last allocation that might land in RAM to define the various
+/* Please keep in sync with cmake/linker_script/common/ram-end.cmake */
+
+/* Added after the very last allocation that might land in RAM to define the various
  * end-of-used-memory symbols
  */
 
diff --git a/include/zephyr/linker/thread-local-storage.ld b/include/zephyr/linker/thread-local-storage.ld
index 5a1313e1c8cad..d2bc2b2b334fe 100644
--- a/include/zephyr/linker/thread-local-storage.ld
+++ b/include/zephyr/linker/thread-local-storage.ld
@@ -1,4 +1,5 @@
 /* SPDX-License-Identifier: Apache-2.0 */
+/* Please keep in sync with cmake/linker_script/common/thread-local-storage.cmake */
 
 #ifdef CONFIG_THREAD_LOCAL_STORAGE
 
diff --git a/include/zephyr/llext/buf_loader.h b/include/zephyr/llext/buf_loader.h
index 9d5dd1c984882..603685c28c261 100644
--- a/include/zephyr/llext/buf_loader.h
+++ b/include/zephyr/llext/buf_loader.h
@@ -39,15 +39,8 @@ struct llext_buf_loader {
 int llext_buf_read(struct llext_loader *ldr, void *buf, size_t len);
 int llext_buf_seek(struct llext_loader *ldr, size_t pos);
 void *llext_buf_peek(struct llext_loader *ldr, size_t pos);
-/** @endcond */
 
-/**
- * @brief Initializer for an llext_buf_loader structure
- *
- * @param _buf Buffer containing the ELF binary
- * @param _buf_len Buffer length in bytes
- */
-#define LLEXT_BUF_LOADER(_buf, _buf_len)                                                           \
+#define Z_LLEXT_BUF_LOADER(_buf, _buf_len, _storage)                                               \
 	{                                                                                          \
 		.loader =                                                                          \
 			{                                                                          \
@@ -56,11 +49,72 @@ void *llext_buf_peek(struct llext_loader *ldr, size_t pos);
 				.seek = llext_buf_seek,                                            \
 				.peek = llext_buf_peek,                                            \
 				.finalize = NULL,                                                  \
+				.storage = _storage,                                               \
 			},                                                                         \
 		.buf = (_buf),                                                                     \
 		.len = (_buf_len),                                                                 \
 		.pos = 0,                                                                          \
 	}
+/** @endcond */
+
+/**
+ * @brief Initializer for an llext_buf_loader structure
+ *
+ * The storage type for the provided buffer depends on the value of the
+ * @kconfig{CONFIG_LLEXT_STORAGE_WRITABLE} option: if it is defined, the
+ * buffer is assumed to be writable; otherwise it is assumed to be persistent.
+ *
+ * Consider using one of the alternative macros instead.
+ *
+ * @see LLEXT_TEMPORARY_BUF_LOADER
+ * @see LLEXT_PERSISTENT_BUF_LOADER
+ * @see LLEXT_WRITABLE_BUF_LOADER
+ *
+ * @param _buf Buffer containing the ELF binary
+ * @param _buf_len Buffer length in bytes
+ */
+#define LLEXT_BUF_LOADER(_buf, _buf_len) \
+	Z_LLEXT_BUF_LOADER(_buf, _buf_len,                                                         \
+			   IS_ENABLED(CONFIG_LLEXT_STORAGE_WRITABLE) ?                             \
+				LLEXT_STORAGE_WRITABLE : LLEXT_STORAGE_PERSISTENT)
+
+/* @brief Initialize an llext_buf_loader structure for a temporary buffer
+ *
+ * ELF data from the specified buffer can only be used during llext_load().
+ * The LLEXT subsystem will copy all necessary data to internal buffers at load
+ * time.
+ *
+ * @param _buf Buffer containing the ELF binary
+ * @param _buf_len Buffer length in bytes
+ */
+#define LLEXT_TEMPORARY_BUF_LOADER(_buf, _buf_len) \
+	Z_LLEXT_BUF_LOADER(_buf, _buf_len, LLEXT_STORAGE_TEMPORARY)
+
+/**
+ * @brief Initialize an llext_buf_loader structure for a persistent, read-only buffer
+ *
+ * ELF data from the specified buffer is guaranteed to be accessible for as
+ * long as the extension is loaded. The LLEXT subsystem may directly access the
+ * ELF data, as long as no modification is required during loading.
+ *
+ * @param _buf Buffer containing the ELF binary
+ * @param _buf_len Buffer length in bytes
+ */
+#define LLEXT_PERSISTENT_BUF_LOADER(_buf, _buf_len) \
+	Z_LLEXT_BUF_LOADER(_buf, _buf_len, LLEXT_STORAGE_PERSISTENT)
+
+/**
+ * @brief Initialize an llext_buf_loader structure for a persistent, writable buffer
+ *
+ * ELF data from the specified buffer is guaranteed to be accessible for as
+ * long as the extension is loaded. The LLEXT subsystem may directly access and
+ * modify the ELF data.
+ *
+ * @param _buf Buffer containing the ELF binary
+ * @param _buf_len Buffer length in bytes
+ */
+#define LLEXT_WRITABLE_BUF_LOADER(_buf, _buf_len) \
+	Z_LLEXT_BUF_LOADER(_buf, _buf_len, LLEXT_STORAGE_WRITABLE)
 
 /**
  * @}
diff --git a/include/zephyr/llext/elf.h b/include/zephyr/llext/elf.h
index 48a611a3f5977..80176daa26bca 100644
--- a/include/zephyr/llext/elf.h
+++ b/include/zephyr/llext/elf.h
@@ -211,9 +211,11 @@ struct elf64_shdr {
 #define SHT_PREINIT_ARRAY 0x10  /**< Array of pointers to early init functions */
 
 /** ELF section flags */
-#define SHF_WRITE 0x1           /**< Section is writable */
-#define SHF_ALLOC 0x2           /**< Section is present in memory */
-#define SHF_EXECINSTR 0x4       /**< Section contains executable instructions */
+#define SHF_WRITE 0x1                   /**< Section is writable */
+#define SHF_ALLOC 0x2                   /**< Section is present in memory */
+#define SHF_EXECINSTR 0x4               /**< Section contains executable instructions */
+#define SHF_MASKOS 0x0ff00000           /**< OS specific flags */
+#define SHF_LLEXT_HAS_RELOCS 0x00100000 /**< Section is a target for relocations */
 
 #define SHF_BASIC_TYPE_MASK	(SHF_WRITE | SHF_ALLOC | SHF_EXECINSTR)
 
diff --git a/include/zephyr/llext/fs_loader.h b/include/zephyr/llext/fs_loader.h
index 9cb41851cb0f3..3d27b69ebac59 100644
--- a/include/zephyr/llext/fs_loader.h
+++ b/include/zephyr/llext/fs_loader.h
@@ -57,6 +57,7 @@ void llext_fs_finalize(struct llext_loader *ldr);
 				.seek = llext_fs_seek,                                             \
 				.peek = NULL,                                                      \
 				.finalize = llext_fs_finalize,                                     \
+				.storage = LLEXT_STORAGE_TEMPORARY,                                \
 			},                                                                         \
 		.is_open = false,                                                                  \
 		.name = (_filename),                                                               \
diff --git a/include/zephyr/llext/inspect.h b/include/zephyr/llext/inspect.h
new file mode 100644
index 0000000000000..7e2d66fa577c9
--- /dev/null
+++ b/include/zephyr/llext/inspect.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_LLEXT_INSPECT_H
+#define ZEPHYR_LLEXT_INSPECT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+#include <zephyr/llext/llext.h>
+#include <zephyr/llext/loader.h>
+#include <zephyr/llext/llext_internal.h>
+
+/**
+ * @file
+ * @brief LLEXT ELF inspection routines.
+ *
+ * This file contains routines to inspect the contents of an ELF file. It is
+ * intended to be used by applications that need advanced access to the ELF
+ * file structures of a loaded extension.
+ *
+ * @defgroup llext_inspect_apis ELF inspection APIs
+ * @ingroup llext_apis
+ * @{
+ */
+
+/**
+ * @brief Get information about a memory region for the specified extension.
+ *
+ * Retrieve information about a region (merged group of similar sections) in
+ * the extension. Any output parameter can be NULL if that information is not
+ * needed.
+ *
+ * @param[in] ldr Loader
+ * @param[in] ext Extension
+ * @param[in] region Region to get information about
+ * @param[out] hdr Variable storing the pointer to the region header
+ * @param[out] addr Variable storing the region load address
+ * @param[out] size Variable storing the region size
+ *
+ * @return 0 on success, -EINVAL if the region is invalid
+ */
+static inline int llext_get_region_info(const struct llext_loader *ldr,
+					const struct llext *ext,
+					enum llext_mem region,
+					const elf_shdr_t **hdr,
+					const void **addr, size_t *size)
+{
+	if ((unsigned int)region >= LLEXT_MEM_COUNT) {
+		return -EINVAL;
+	}
+
+	if (hdr) {
+		*hdr = &ldr->sects[region];
+	}
+
+	/* address and size compensated for alignment prepad */
+	if (addr) {
+		*addr = (void *)((uintptr_t)ext->mem[region] + ldr->sects[region].sh_info);
+	}
+	if (size) {
+		*size = ext->mem_size[region] - ldr->sects[region].sh_info;
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Get the index of a section with the specified name.
+ *
+ * Requires the @ref llext_load_param.keep_section_info flag to be set at
+ * extension load time.
+ *
+ * @param[in] ldr Loader
+ * @param[in] ext Extension
+ * @param[in] section_name Name of the section to look for
+ *
+ * @return Section index on success, -ENOENT if the section was not found,
+ *         -ENOTSUP if section data is not available.
+ */
+int llext_section_shndx(const struct llext_loader *ldr, const struct llext *ext,
+			    const char *section_name);
+
+/**
+ * @brief Get information about a section for the specified extension.
+ *
+ * Retrieve information about an ELF sections in the extension. Any output
+ * parameter can be @c NULL if that information is not needed.
+ *
+ * Requires the @ref llext_load_param.keep_section_info flag to be set at
+ * extension load time.
+ *
+ * @param[in] ldr Loader
+ * @param[in] ext Extension
+ * @param[in] shndx Section index
+ * @param[out] hdr Variable storing the pointer to the section header
+ * @param[out] region Variable storing the region the section belongs to
+ * @param[out] offset Variable storing the offset of the section in the region
+ *
+ * @return 0 on success, -EINVAL if the section index is invalid,
+ *         -ENOTSUP if section data is not available.
+ */
+static inline int llext_get_section_info(const struct llext_loader *ldr,
+					 const struct llext *ext,
+					 unsigned int shndx,
+					 const elf_shdr_t **hdr,
+					 enum llext_mem *region,
+					 size_t *offset)
+{
+	if (shndx < 0 || shndx >= ext->sect_cnt) {
+		return -EINVAL;
+	}
+	if (!ldr->sect_map) {
+		return -ENOTSUP;
+	}
+
+	enum llext_mem mem_idx = ldr->sect_map[shndx].mem_idx;
+
+	if (hdr) {
+		*hdr = &ext->sect_hdrs[shndx];
+	}
+	if (region) {
+		*region = mem_idx;
+	}
+
+	/* offset compensated for alignment prepad */
+	if (offset) {
+		*offset = ldr->sect_map[shndx].offset - ldr->sects[mem_idx].sh_info;
+	}
+
+	return 0;
+}
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_LLEXT_INSPECT_H */
diff --git a/include/zephyr/llext/llext.h b/include/zephyr/llext/llext.h
index fc9654c408ac5..76028e5dcebe9 100644
--- a/include/zephyr/llext/llext.h
+++ b/include/zephyr/llext/llext.h
@@ -65,7 +65,10 @@ enum llext_mem {
 struct llext_loader;
 /** @endcond */
 
-/* Maximim number of dependency LLEXTs */
+/** Maximum length of an extension name */
+#define LLEXT_MAX_NAME_LEN 15
+
+/** Maximum number of dependency LLEXTs */
 #define LLEXT_MAX_DEPENDENCIES 8
 
 /**
@@ -86,7 +89,7 @@ struct llext {
 	/** @endcond */
 
 	/** Name of the llext */
-	char name[16];
+	char name[LLEXT_MAX_NAME_LEN + 1];
 
 	/** Lookup table of memory regions */
 	void *mem[LLEXT_MEM_COUNT];
@@ -125,6 +128,7 @@ struct llext {
 	unsigned int sect_cnt;
 	elf_shdr_t *sect_hdrs;
 	bool sect_hdrs_on_heap;
+	bool mmu_permissions_set;
 	/** @endcond */
 };
 
@@ -146,20 +150,32 @@ static inline unsigned int llext_section_count(const struct llext *ext)
 struct llext_load_param {
 	/** Perform local relocation */
 	bool relocate_local;
+
 	/**
 	 * Use the virtual symbol addresses from the ELF, not addresses within
 	 * the memory buffer, when calculating relocation targets. It also
 	 * means, that the application will take care to place the extension at
 	 * those pre-defined addresses, so the LLEXT core doesn't have to do any
-	 * allocation and copying internally.
+	 * allocation and copying internally. Any MMU permission adjustment will
+	 * be done by the application too.
 	 */
 	bool pre_located;
+
 	/**
 	 * Extensions can implement custom ELF sections to be loaded in specific
 	 * memory regions, detached from other sections of compatible types.
 	 * This optional callback checks whether a section should be detached.
 	 */
 	bool (*section_detached)(const elf_shdr_t *shdr);
+
+	/**
+	 * Keep the ELF section data in memory after loading the extension. This
+	 * is needed to use some of the functions in @ref llext_inspect_apis.
+	 *
+	 * @note Related memory must be freed by @ref llext_free_inspection_data
+	 *       before the extension can be unloaded via @ref llext_unload.
+	 */
+	bool keep_section_info;
 };
 
 /** Default initializer for @ref llext_load_param */
@@ -211,6 +227,19 @@ int llext_load(struct llext_loader *loader, const char *name, struct llext **ext
  */
 int llext_unload(struct llext **ext);
 
+/**
+ * @brief Free any inspection-related memory for the specified loader and extension.
+ *
+ * This is only required if inspection data was requested at load time by
+ * setting @ref llext_load_param.keep_section_info; otherwise, this call will
+ * be a no-op.
+ *
+ * @param[in] ldr Extension loader
+ * @param[in] ext Extension
+ * @returns 0 on success, or a negative error code.
+ */
+int llext_free_inspection_data(struct llext_loader *ldr, struct llext *ext);
+
 /** @brief Entry point function signature for an extension. */
 typedef void (*llext_entry_fn_t)(void *user_data);
 
@@ -330,18 +359,19 @@ int llext_add_domain(struct llext *ext, struct k_mem_domain *domain);
  * symbolic data such as a section, function, or object. These relocations
  * are architecture specific and each architecture supporting LLEXT must
  * implement this.
+ * Arguments sym_base_addr, sym_name can be computed from the sym parameter,
+ * but these parameters are provided redundantly to increase efficiency.
  *
+ * @param[in] ldr Extension loader
+ * @param[in] ext Extension being relocated refers to
  * @param[in] rel Relocation data provided by ELF
- * @param[in] loc Address of opcode to rewrite
- * @param[in] sym_base_addr Address of symbol referenced by relocation
- * @param[in] sym_name Name of symbol referenced by relocation
- * @param[in] load_bias `.text` load address
+ * @param[in] shdr Header of the ELF section currently being located
  * @retval 0 Success
  * @retval -ENOTSUP Unsupported relocation
  * @retval -ENOEXEC Invalid relocation
  */
-int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc,
-			     uintptr_t sym_base_addr, const char *sym_name, uintptr_t load_bias);
+int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *rel,
+		      const elf_shdr_t *shdr);
 
 /**
  * @brief Locates an ELF section in the file.
diff --git a/include/zephyr/llext/llext_internal.h b/include/zephyr/llext/llext_internal.h
index f07dd5efd8655..c920c261ea6cd 100644
--- a/include/zephyr/llext/llext_internal.h
+++ b/include/zephyr/llext/llext_internal.h
@@ -11,6 +11,8 @@
 extern "C" {
 #endif
 
+#include <zephyr/llext/llext.h>
+
 /**
  * @file
  * @brief Private header for linkable loadable extensions
@@ -18,11 +20,60 @@ extern "C" {
 
 /** @cond ignore */
 
-struct llext_loader;
-struct llext;
+
+struct llext_elf_sect_map {
+	enum llext_mem mem_idx;
+	size_t offset;
+};
 
 const void *llext_loaded_sect_ptr(struct llext_loader *ldr, struct llext *ext, unsigned int sh_ndx);
 
+
+static inline const char *llext_string(const struct llext_loader *ldr, const struct llext *ext,
+	enum llext_mem mem_idx, unsigned int idx)
+{
+	return (const char *)ext->mem[mem_idx] + idx;
+}
+
+static inline uintptr_t llext_get_reloc_instruction_location(struct llext_loader *ldr,
+							     struct llext *ext,
+							     int shndx,
+							     const elf_rela_t *rela)
+{
+	return (uintptr_t) llext_loaded_sect_ptr(ldr, ext, shndx) + rela->r_offset;
+}
+
+static inline const char *llext_section_name(const struct llext_loader *ldr,
+					     const struct llext *ext,
+					     const elf_shdr_t *shdr)
+{
+	return llext_string(ldr, ext, LLEXT_MEM_SHSTRTAB, shdr->sh_name);
+}
+
+static inline const char *llext_symbol_name(const struct llext_loader *ldr,
+					    const struct llext *ext,
+					    const elf_sym_t *sym)
+{
+	if (ELF_ST_TYPE(sym->st_info) == STT_SECTION) {
+		return llext_section_name(ldr, ext, ext->sect_hdrs + sym->st_shndx);
+	} else {
+		return llext_string(ldr, ext, LLEXT_MEM_STRTAB, sym->st_name);
+	}
+}
+
+/*
+ * Determine address of a symbol.
+ */
+int llext_lookup_symbol(struct llext_loader *ldr, struct llext *ext, uintptr_t *link_addr,
+			const elf_rela_t *rel, const elf_sym_t *sym, const char *name,
+			const elf_shdr_t *shdr);
+
+/*
+ * Read the symbol entry corresponding to a relocation from the binary.
+ */
+int llext_read_symbol(struct llext_loader *ldr, struct llext *ext, const elf_rela_t *rel,
+		      elf_sym_t *sym);
+
 /** @endcond */
 
 #ifdef __cplusplus
diff --git a/include/zephyr/llext/loader.h b/include/zephyr/llext/loader.h
index 3d043806ef737..ab6ea289a0ec4 100644
--- a/include/zephyr/llext/loader.h
+++ b/include/zephyr/llext/loader.h
@@ -32,6 +32,44 @@ extern "C" {
 struct llext_elf_sect_map; /* defined in llext_priv.h */
 /** @endcond */
 
+/**
+ * @brief Storage type for the ELF data to be loaded.
+ *
+ * This enum defines the storage type of the ELF data that will be loaded. The
+ * storage type determines which memory optimizations can be tried by the LLEXT
+ * subsystem during the load process.
+ *
+ * @note Even with the most permissive option, LLEXT might still have to copy
+ * ELF data into a separate memory region to comply with other restrictions,
+ * such as hardware memory protection and/or alignment rules.
+ * Sections such as BSS that have no space in the file will also be allocated
+ * in the LLEXT heap.
+ */
+enum llext_storage_type {
+	/**
+	 * ELF data is only available during llext_load(); even if the loader
+	 * supports directly accessing the memory via llext_peek(), the buffer
+	 * contents will be discarded afterwards.
+	 * LLEXT will allocate copies of all required data into its heap.
+	 */
+	LLEXT_STORAGE_TEMPORARY,
+	/**
+	 * ELF data is stored in a *read-only* buffer that is guaranteed to be
+	 * always accessible for as long as the extension is loaded. LLEXT may
+	 * directly reuse constant data from the buffer, but may still allocate
+	 * copies if relocations need to be applied.
+	 */
+	LLEXT_STORAGE_PERSISTENT,
+	/**
+	 * ELF data is stored in a *writable* memory buffer that is guaranteed
+	 * to be always accessible for as long as the extension is loaded.
+	 * LLEXT may freely modify and reuse data in the buffer; so, after the
+	 * extension is unloaded, the contents should be re-initialized before
+	 * a subsequent llext_load() call.
+	 */
+	LLEXT_STORAGE_WRITABLE,
+};
+
 /**
  * @brief Linkable loadable extension loader context
  *
@@ -95,6 +133,11 @@ struct llext_loader {
 	 */
 	void (*finalize)(struct llext_loader *ldr);
 
+	/**
+	 * @brief Storage type of the underlying data accessed by this loader.
+	 */
+	enum llext_storage_type storage;
+
 	/** @cond ignore */
 	elf_ehdr_t hdr;
 	elf_shdr_t sects[LLEXT_MEM_COUNT];
diff --git a/include/zephyr/logging/log_core.h b/include/zephyr/logging/log_core.h
index 821a6ae98e45c..730e5a7a053ee 100644
--- a/include/zephyr/logging/log_core.h
+++ b/include/zephyr/logging/log_core.h
@@ -262,10 +262,9 @@ static inline char z_log_minimal_level_to_char(int level)
 			     GET_ARG_N(1, __VA_ARGS__))
 
 #define LOG_POINTERS_VALIDATE(string_ok, ...) \
-	_Pragma("GCC diagnostic push") \
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"") \
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH); \
 	string_ok = Z_CBPRINTF_POINTERS_VALIDATE(__VA_ARGS__); \
-	_Pragma("GCC diagnostic pop")
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 #else
 #define LOG_POINTERS_VALIDATE(string_ok, ...) string_ok = true
 #define LOG_STRING_WARNING(_mode, _src, ...)
@@ -401,12 +400,12 @@ static inline char z_log_minimal_level_to_char(int level)
 #define LOG_FILTER_SLOT_GET(_filters, _id) \
 	((*(_filters) >> LOG_FILTER_SLOT_SHIFT(_id)) & LOG_FILTER_SLOT_MASK)
 
-#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)		     \
-	do {							     \
-		*(_filters) &= ~(LOG_FILTER_SLOT_MASK <<	     \
-				 LOG_FILTER_SLOT_SHIFT(_id));	     \
-		*(_filters) |= ((_filter) & LOG_FILTER_SLOT_MASK) << \
-			       LOG_FILTER_SLOT_SHIFT(_id);	     \
+#define LOG_FILTER_SLOT_SET(_filters, _id, _filter)			      \
+	do {								      \
+		uint32_t others = *(_filters) & ~(LOG_FILTER_SLOT_MASK <<     \
+				 LOG_FILTER_SLOT_SHIFT(_id));		      \
+		*(_filters) = others | (((_filter) & LOG_FILTER_SLOT_MASK) << \
+			       LOG_FILTER_SLOT_SHIFT(_id));		      \
 	} while (false)
 
 #define LOG_FILTER_AGGR_SLOT_IDX 0
diff --git a/include/zephyr/logging/log_frontend_stmesp.h b/include/zephyr/logging/log_frontend_stmesp.h
index e2b7a2159a53b..38f33bf62f102 100644
--- a/include/zephyr/logging/log_frontend_stmesp.h
+++ b/include/zephyr/logging/log_frontend_stmesp.h
@@ -106,16 +106,17 @@ TYPE_SECTION_START_EXTERN(const char *, log_stmesp_ptr);
  * @param _source Pointer to the source structure.
  * @param ... String.
  */
+
 #define LOG_FRONTEND_STMESP_LOG0(_source, ...)                                                     \
 	do {                                                                                       \
 		static const char _str[] __in_section(_log_stmesp_str, static, _)                  \
 			__used __noasan __aligned(sizeof(uint32_t)) = GET_ARG_N(1, __VA_ARGS__);   \
 		static const char *_str_ptr __in_section(_log_stmesp_ptr, static, _)               \
 			__used __noasan = _str;                                                    \
-		uint32_t idx =                                                                     \
+		uint32_t _idx =                                                                    \
 			((uintptr_t)&_str_ptr - (uintptr_t)TYPE_SECTION_START(log_stmesp_ptr)) /   \
 			sizeof(void *);                                                            \
-		log_frontend_stmesp_log0(_source, idx);                                            \
+		log_frontend_stmesp_log0(_source, _idx);                                           \
 	} while (0)
 
 /** @brief Macro for handling a turbo log message with one argument.
@@ -129,10 +130,10 @@ TYPE_SECTION_START_EXTERN(const char *, log_stmesp_ptr);
 			__used __noasan __aligned(sizeof(uint32_t)) = GET_ARG_N(1, __VA_ARGS__);   \
 		static const char *_str_ptr __in_section(_log_stmesp_ptr, static, _)               \
 			__used __noasan = _str;                                                    \
-		uint32_t idx =                                                                     \
+		uint32_t _idx =                                                                    \
 			((uintptr_t)&_str_ptr - (uintptr_t)TYPE_SECTION_START(log_stmesp_ptr)) /   \
 			sizeof(void *);                                                            \
-		log_frontend_stmesp_log1(_source, idx, (uintptr_t)(GET_ARG_N(2, __VA_ARGS__)));    \
+		log_frontend_stmesp_log1(_source, _idx, (uintptr_t)(GET_ARG_N(2, __VA_ARGS__)));   \
 	} while (0)
 
 #ifdef __cplusplus
diff --git a/include/zephyr/logging/log_frontend_stmesp_demux.h b/include/zephyr/logging/log_frontend_stmesp_demux.h
index 728ce4011ff33..1b74f9832a70e 100644
--- a/include/zephyr/logging/log_frontend_stmesp_demux.h
+++ b/include/zephyr/logging/log_frontend_stmesp_demux.h
@@ -16,6 +16,7 @@ extern "C" {
 
 /**
  * @defgroup log_frontend_stmesp_apis Trace and Debug Domain APIs
+ * @ingroup logging
  * @{
  * @}
  * @defgroup log_frontend_stpesp_demux_apis Logging frontend STMESP Demultiplexer API
@@ -290,6 +291,7 @@ void log_frontend_stmesp_demux_free(union log_frontend_stmesp_demux_packet packe
  *         cannot be retrieved.
  */
 const char *log_frontend_stmesp_demux_sname_get(uint32_t m_id, uint16_t s_id);
+const char *log_frontend_stmesp_demux_str_get(uint32_t m_id, uint16_t s_id);
 
 /** @brief Check if there are any started but not completed log messages.
  *
diff --git a/include/zephyr/logging/log_msg.h b/include/zephyr/logging/log_msg.h
index e75f7b7c2beec..7337a5015450b 100644
--- a/include/zephyr/logging/log_msg.h
+++ b/include/zephyr/logging/log_msg.h
@@ -336,9 +336,9 @@ do { \
 		CBPRINTF_STATIC_PACKAGE(NULL, 0, _plen, Z_LOG_MSG_ALIGN_OFFSET, _options, \
 					__VA_ARGS__); \
 	} \
-	TOOLCHAIN_IGNORE_WSHADOW_BEGIN \
+	TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_SHADOW) \
 	struct log_msg *_msg; \
-	TOOLCHAIN_IGNORE_WSHADOW_END \
+	TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_SHADOW) \
 	Z_LOG_MSG_ON_STACK_ALLOC(_msg, Z_LOG_MSG_LEN(_plen, 0)); \
 	Z_LOG_ARM64_VLA_PROTECT(); \
 	if (_plen != 0) { \
@@ -560,7 +560,7 @@ do { \
 
 /* Create local variable from input variable (expect for the first (fmt) argument). */
 #define Z_LOG_LOCAL_ARG_CREATE(idx, arg) \
-	COND_CODE_0(idx, (), (Z_AUTO_TYPE Z_LOG_LOCAL_ARG_NAME(idx, arg) = (arg) + 0))
+	COND_CODE_0(idx, (), (Z_AUTO_TYPE Z_LOG_LOCAL_ARG_NAME(idx, arg) = Z_ARGIFY(arg)))
 
 /* First level of processing creates stack variables to be passed for further processing.
  * This is done to prevent multiple evaluations of input arguments (in case argument
@@ -569,10 +569,7 @@ do { \
 #define Z_LOG_MSG_CREATE2(_try_0cpy, _mode, _cstr_cnt,  _domain_id, _source, \
 			   _level, _data, _dlen, ...) \
 do { \
-	_Pragma("GCC diagnostic push") \
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"") \
 	FOR_EACH_IDX(Z_LOG_LOCAL_ARG_CREATE, (;), __VA_ARGS__); \
-	_Pragma("GCC diagnostic pop") \
 	Z_LOG_MSG_CREATE3(_try_0cpy, _mode,  _cstr_cnt, _domain_id, _source,\
 			   _level, _data, _dlen, \
 			   FOR_EACH_IDX(Z_LOG_LOCAL_ARG_NAME, (,), __VA_ARGS__)); \
diff --git a/include/zephyr/lorawan/lorawan.h b/include/zephyr/lorawan/lorawan.h
index 914997243e180..9f8688189cbe8 100644
--- a/include/zephyr/lorawan/lorawan.h
+++ b/include/zephyr/lorawan/lorawan.h
@@ -217,6 +217,35 @@ typedef uint8_t (*lorawan_battery_level_cb_t)(void);
  */
 typedef void (*lorawan_dr_changed_cb_t)(enum lorawan_datarate dr);
 
+/**
+ * @brief Defines the link check answer handler function signature.
+ *
+ * @param demod_margin The demodulation margin in db.
+ * @param nb_gateways The number of gateways the device is connected to.
+ */
+typedef void (*lorawan_link_check_ans_cb_t)(uint8_t demod_margin, uint8_t nb_gateways);
+
+/**
+ * @brief Defines the user's descriptor callback handler function signature.
+ *
+ * The use of this callback is optional. When Fragmented Data Block Transport
+ * is enabled, the application will be notified with the descriptor field present on
+ * the FragSessionSetupReq command.
+ *
+ * @param descriptor Descriptor value given on the FragSessionSetupReq command.
+ *
+ * The meaning of Descriptor is application dependent. When doing a FUOTA
+ * with a binary image, it may represent the version of the firmware
+ * transported.
+ *
+ * @return 0 if successful. This represents, in the case that the descriptor is the firmware
+ * version, that the end-device is able to receive binary firmware. Otherwise, a negative error code
+ * (errno.h) indicating the reason for failure. Any negative error code will result in setting
+ * the Wrong Descriptor status bit mask when sending FragSessionSetupAns to the Network Server.
+ *
+ */
+typedef int (*transport_descriptor_cb)(uint32_t descriptor);
+
 /**
  * @brief Register a battery level callback function.
  *
@@ -246,6 +275,14 @@ void lorawan_register_downlink_callback(struct lorawan_downlink_cb *cb);
  */
 void lorawan_register_dr_changed_callback(lorawan_dr_changed_cb_t cb);
 
+/**
+ * @brief Register a callback to be called when getting answer
+ * a to check link request.
+ *
+ * @param cb Pointer to link check ans callback
+ */
+void lorawan_register_link_check_ans_callback(lorawan_link_check_ans_cb_t cb);
+
 /**
  * @brief Join the LoRaWAN network
  *
@@ -405,6 +442,18 @@ int lorawan_request_device_time(bool force_request);
  */
 int lorawan_device_time_get(uint32_t *gps_time);
 
+/**
+ * @brief Request for link check according to LinkCheckReq MAC cmd
+ *
+ * Append MAC LinkCheckReq command. It will be processed on next send
+ * message or force sending empty message to request time immediately.
+ *
+ * @param force_request Immediately send an empty message to execute the request
+ *
+ * @return 0 if successful, negative errno otherwise
+ */
+int lorawan_request_link_check(bool force_request);
+
 #ifdef CONFIG_LORAWAN_APP_CLOCK_SYNC
 
 /**
@@ -439,6 +488,17 @@ int lorawan_clock_sync_get(uint32_t *gps_time);
 
 #ifdef CONFIG_LORAWAN_FRAG_TRANSPORT
 
+/**
+ * @brief Register a handle descriptor callback function.
+ *
+ * Provide to the fragmentation transport service a function to be called
+ * whenever a FragSessionSetupReq is received and Descriptor field should be
+ * handled.
+ *
+ * @param transport_descriptor_cb Callback for notification.
+ */
+void lorawan_frag_transport_register_descriptor_callback(transport_descriptor_cb cb);
+
 /**
  * @brief Run Fragmented Data Block Transport service
  *
diff --git a/include/zephyr/mgmt/mcumgr/mgmt/callbacks.h b/include/zephyr/mgmt/mcumgr/mgmt/callbacks.h
index c5ee05dca39ac..a86f3b22bf7a0 100644
--- a/include/zephyr/mgmt/mcumgr/mgmt/callbacks.h
+++ b/include/zephyr/mgmt/mcumgr/mgmt/callbacks.h
@@ -76,9 +76,6 @@ enum mgmt_cb_return {
 	MGMT_CB_ERROR_ERR,
 };
 
-/* Deprecated after Zephyr 3.4, use MGMT_CB_ERROR_ERR instead */
-#define MGMT_CB_ERROR_RET __DEPRECATED_MACRO MGMT_CB_ERROR_ERR
-
 /**
  * @typedef mgmt_cb
  * @brief Function to be called on MGMT notification/event.
diff --git a/include/zephyr/net/buf.h b/include/zephyr/net/buf.h
deleted file mode 100644
index c537c03057f4a..0000000000000
--- a/include/zephyr/net/buf.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2015 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_NET_BUF_DEPRECATED_H_
-#define ZEPHYR_INCLUDE_NET_BUF_DEPRECATED_H_
-
-#include <zephyr/net_buf.h>
-
-#warning This header is deprecated, include <zephyr/net_buf.h> instead
-
-#endif /*  ZEPHYR_INCLUDE_NET_BUF_DEPRECATED_H_ */
diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h
index ff35eb174a455..2266821a69178 100644
--- a/include/zephyr/net/coap_client.h
+++ b/include/zephyr/net/coap_client.h
@@ -157,6 +157,8 @@ int coap_client_req(struct coap_client *client, int sock, const struct sockaddr
  *
  * This is intended for canceling long-running requests (e.g. GETs with the OBSERVE option set)
  * which has gone stale for some reason.
+ * The function should also be called before the corresponding client socket is closed,
+ * to prevent the socket from being monitored by the internal polling thread.
  *
  * @param client Client instance.
  */
@@ -190,6 +192,23 @@ void coap_client_cancel_request(struct coap_client *client, struct coap_client_r
  */
 struct coap_client_option coap_client_option_initial_block2(void);
 
+/**
+ * @brief Check if client has ongoing exchange.
+ *
+ * @note Function not only considers ongoing requests, but also lifetime of completed requests
+ * (which provides graceful duplicates handling).
+ *
+ * @note For socket handling.
+ * Function does no consider a socket POLL that has started before this call,
+ * therefore it is recommended to wait out POLL timeout before closing socket
+ * (e.g. call coap_client_cancel_requests() which applies delay for timeout).
+ *
+ * @param client Pointer to the CoAP client instance.
+ *
+ * @return true if there is an ongoing exchange, false otherwise.
+ */
+bool coap_client_has_ongoing_exchange(struct coap_client *client);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/net/ethernet.h b/include/zephyr/net/ethernet.h
index 85856eafa701f..7bd343ba2914b 100644
--- a/include/zephyr/net/ethernet.h
+++ b/include/zephyr/net/ethernet.h
@@ -1171,7 +1171,8 @@ static inline bool net_eth_is_vlan_interface(struct net_if *iface)
 				       init_fn, pm, data, config, prio,	\
 				       api, mtu)			\
 	Z_DEVICE_STATE_DEFINE(dev_id);					\
-	Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, pm, data,	\
+	Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, NULL,		\
+			Z_DEVICE_DT_FLAGS(node_id), pm, data,		\
 			config, POST_KERNEL, prio, api,			\
 			&Z_DEVICE_STATE_NAME(dev_id));
 
diff --git a/include/zephyr/net/hostname.h b/include/zephyr/net/hostname.h
index f187427a9abf7..4865843fd97e1 100644
--- a/include/zephyr/net/hostname.h
+++ b/include/zephyr/net/hostname.h
@@ -75,6 +75,8 @@ int net_hostname_set(char *host, size_t len);
 #else
 static inline int net_hostname_set(char *host, size_t len)
 {
+	ARG_UNUSED(host);
+	ARG_UNUSED(len);
 	return -ENOTSUP;
 }
 #endif
diff --git a/include/zephyr/net/http/server.h b/include/zephyr/net/http/server.h
index ef2fb92e5bda5..461ac22187e65 100644
--- a/include/zephyr/net/http/server.h
+++ b/include/zephyr/net/http/server.h
@@ -138,6 +138,16 @@ struct http_resource_detail_static_fs {
 	const char *fs_path;
 };
 
+/** @brief HTTP compressions */
+enum http_compression {
+	HTTP_NONE = 0,     /**< NONE */
+	HTTP_GZIP = 1,     /**< GZIP */
+	HTTP_COMPRESS = 2, /**< COMPRESS */
+	HTTP_DEFLATE = 3,  /**< DEFLATE */
+	HTTP_BR = 4,       /**< BR */
+	HTTP_ZSTD = 5      /**< ZSTD */
+};
+
 /** @cond INTERNAL_HIDDEN */
 /* Make sure that the common is the first in the struct. */
 BUILD_ASSERT(offsetof(struct http_resource_detail_static_fs, common) == 0);
@@ -475,6 +485,11 @@ struct http_client_ctx {
 	IF_ENABLED(CONFIG_WEBSOCKET, (uint8_t ws_sec_key[HTTP_SERVER_WS_MAX_SEC_KEY_LEN]));
 /** @endcond */
 
+/** @cond INTERNAL_HIDDEN */
+	/** Client supported compression. */
+	IF_ENABLED(CONFIG_HTTP_SERVER_COMPRESSION, (uint8_t supported_compression));
+/** @endcond */
+
 	/** Flag indicating that HTTP2 preface was sent. */
 	bool preface_sent : 1;
 
@@ -493,6 +508,9 @@ struct http_client_ctx {
 	/** Flag indicating Websocket key is being processed. */
 	bool websocket_sec_key_next : 1;
 
+	/** Flag indicating accept encoding is being processed. */
+	IF_ENABLED(CONFIG_HTTP_SERVER_COMPRESSION, (bool accept_encoding_next: 1));
+
 	/** The next frame on the stream is expectd to be a continuation frame. */
 	bool expect_continuation : 1;
 };
diff --git a/include/zephyr/net/http/service.h b/include/zephyr/net/http/service.h
index 574ab0a0ce845..20e4d30a995c7 100644
--- a/include/zephyr/net/http/service.h
+++ b/include/zephyr/net/http/service.h
@@ -65,6 +65,10 @@ struct http_resource_desc {
 
 /** @cond INTERNAL_HIDDEN */
 
+struct http_service_runtime_data {
+	int num_clients;
+};
+
 struct http_service_desc {
 	const char *host;
 	uint16_t *port;
@@ -72,6 +76,7 @@ struct http_service_desc {
 	void *detail;
 	size_t concurrent;
 	size_t backlog;
+	struct http_service_runtime_data *data;
 	struct http_resource_desc *res_begin;
 	struct http_resource_desc *res_end;
 	struct http_resource_detail *res_fallback;
@@ -82,15 +87,19 @@ struct http_service_desc {
 };
 
 #define __z_http_service_define(_name, _host, _port, _concurrent, _backlog, _detail,               \
-				_res_fallback, _res_begin,                                         \
-				_res_end, ...)                                                     \
+				_res_fallback, _res_begin, _res_end, ...)                          \
+	BUILD_ASSERT(_concurrent <= CONFIG_HTTP_SERVER_MAX_CLIENTS,                                \
+		     "can't accept more then MAX_CLIENTS");                                        \
+	BUILD_ASSERT(_backlog > 0, "backlog can't be 0");                                          \
 	static int _name##_fd = -1;                                                                \
+	static struct http_service_runtime_data _name##_data = {0};                                \
 	const STRUCT_SECTION_ITERABLE(http_service_desc, _name) = {                                \
 		.host = _host,                                                                     \
 		.port = (uint16_t *)(_port),                                                       \
 		.fd = &_name##_fd,                                                                 \
 		.detail = (void *)(_detail),                                                       \
 		.concurrent = (_concurrent),                                                       \
+		.data = &_name##_data,                                                             \
 		.backlog = (_backlog),                                                             \
 		.res_begin = (_res_begin),                                                         \
 		.res_end = (_res_end),                                                             \
@@ -120,8 +129,8 @@ struct http_service_desc {
  * @param _name Name of the service.
  * @param _host IP address or hostname associated with the service.
  * @param[inout] _port Pointer to port associated with the service.
- * @param _concurrent Maximum number of concurrent clients.
- * @param _backlog Maximum number queued connections.
+ * @param _concurrent Maximum number of concurrent clients. (max. CONFIG_HTTP_SERVER_MAX_CLIENTS)
+ * @param _backlog Maximum number of queued connections. (min. 1)
  * @param _detail User-defined detail associated with the service.
  * @param _res_fallback Fallback resource to be served if no other resource matches path
  */
@@ -145,8 +154,8 @@ struct http_service_desc {
  * @param _name Name of the service.
  * @param _host IP address or hostname associated with the service.
  * @param[inout] _port Pointer to port associated with the service.
- * @param _concurrent Maximum number of concurrent clients.
- * @param _backlog Maximum number queued connections.
+ * @param _concurrent Maximum number of concurrent clients. (max. CONFIG_HTTP_SERVER_MAX_CLIENTS)
+ * @param _backlog Maximum number of queued connections. (min. 1)
  * @param _detail User-defined detail associated with the service.
  * @param _res_fallback Fallback resource to be served if no other resource matches path
  * @param _sec_tag_list TLS security tag list used to setup a HTTPS socket.
@@ -175,8 +184,8 @@ struct http_service_desc {
  * @param _name Name of the service.
  * @param _host IP address or hostname associated with the service.
  * @param[inout] _port Pointer to port associated with the service.
- * @param _concurrent Maximum number of concurrent clients.
- * @param _backlog Maximum number queued connections.
+ * @param _concurrent Maximum number of concurrent clients. (max. CONFIG_HTTP_SERVER_MAX_CLIENTS)
+ * @param _backlog Maximum number of queued connections. (min. 1)
  * @param _detail User-defined detail associated with the service.
  * @param _res_fallback Fallback resource to be served if no other resource matches path
  */
@@ -186,7 +195,7 @@ struct http_service_desc {
 	__z_http_service_define(_name, _host, _port, _concurrent, _backlog, _detail,               \
 				_res_fallback,                                                     \
 				&_CONCAT(_http_resource_desc_##_name, _list_start)[0],             \
-				&_CONCAT(_http_resource_desc_##_name, _list_end)[0])
+				&_CONCAT(_http_resource_desc_##_name, _list_end)[0]);
 
 /**
  * @brief Define an HTTPS service with static resources.
@@ -203,8 +212,8 @@ struct http_service_desc {
  * @param _name Name of the service.
  * @param _host IP address or hostname associated with the service.
  * @param[inout] _port Pointer to port associated with the service.
- * @param _concurrent Maximum number of concurrent clients.
- * @param _backlog Maximum number queued connections.
+ * @param _concurrent Maximum number of concurrent clients. (max. CONFIG_HTTP_SERVER_MAX_CLIENTS)
+ * @param _backlog Maximum number of queued connections. (min. 1)
  * @param _detail User-defined detail associated with the service.
  * @param _res_fallback Fallback resource to be served if no other resource matches path
  * @param _sec_tag_list TLS security tag list used to setup a HTTPS socket.
diff --git a/include/zephyr/net/ieee802154.h b/include/zephyr/net/ieee802154.h
index b60aa7071f390..762d8e8841f54 100644
--- a/include/zephyr/net/ieee802154.h
+++ b/include/zephyr/net/ieee802154.h
@@ -296,7 +296,7 @@ struct ieee802154_context {
 	uint8_t ext_addr[IEEE802154_MAX_ADDR_LENGTH];
 
 	/** Link layer address (in big endian) */
-	struct net_linkaddr_storage linkaddr;
+	struct net_linkaddr linkaddr;
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 	/** Security context */
diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 2514fc709c2c6..d5dce240230ac 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -79,12 +79,18 @@ enum mqtt_evt_type {
 
 	/** Ping Response from server. */
 	MQTT_EVT_PINGRESP,
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** Authentication packet received from server. MQTT 5.0 only. */
+	MQTT_EVT_AUTH,
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief MQTT version protocol level. */
 enum mqtt_version {
 	MQTT_VERSION_3_1_0 = 3, /**< Protocol level for 3.1.0. */
-	MQTT_VERSION_3_1_1 = 4  /**< Protocol level for 3.1.1. */
+	MQTT_VERSION_3_1_1 = 4, /**< Protocol level for 3.1.1. */
+	MQTT_VERSION_5_0 = 5,   /**< Protocol level for 5.0. */
 };
 
 /** @brief MQTT Quality of Service types. */
@@ -106,7 +112,7 @@ enum mqtt_qos {
 	MQTT_QOS_2_EXACTLY_ONCE  = 0x02
 };
 
-/** @brief MQTT CONNACK return codes. */
+/** @brief MQTT 3.1 CONNACK return codes. */
 enum mqtt_conn_return_code {
 	/** Connection accepted. */
 	MQTT_CONNECTION_ACCEPTED                = 0x00,
@@ -133,6 +139,32 @@ enum mqtt_conn_return_code {
 	MQTT_NOT_AUTHORIZED                     = 0x05
 };
 
+/** @brief MQTT 5.0 CONNACK reason codes (MQTT 5.0, chapter 3.2.2.2). */
+enum mqtt_connack_reason_code {
+	MQTT_CONNACK_SUCCESS = 0,
+	MQTT_CONNACK_UNSPECIFIED_ERROR = 128,
+	MQTT_CONNACK_MALFORMED_PACKET = 129,
+	MQTT_CONNACK_PROTOCOL_ERROR = 130,
+	MQTT_CONNACK_IMPL_SPECIFIC_ERROR = 131,
+	MQTT_CONNACK_UNSUPPORTED_PROTO_ERROR = 132,
+	MQTT_CONNACK_CLIENT_ID_NOT_VALID = 133,
+	MQTT_CONNACK_BAD_USERNAME_OR_PASS = 134,
+	MQTT_CONNACK_NOT_AUTHORIZED = 135,
+	MQTT_CONNACK_SERVER_UNAVAILABLE = 136,
+	MQTT_CONNACK_SERVER_BUSY = 137,
+	MQTT_CONNACK_BANNED = 138,
+	MQTT_CONNACK_BAD_AUTH_METHOD = 140,
+	MQTT_CONNACK_TOPIC_NAME_INVALID = 144,
+	MQTT_CONNACK_PACKET_TOO_LARGE = 149,
+	MQTT_CONNACK_QUOTA_EXCEEDED = 151,
+	MQTT_CONNACK_PAYLOAD_FORMAT_INVALID = 153,
+	MQTT_CONNACK_RETAIN_NOT_SUPPORTED = 154,
+	MQTT_CONNACK_QOS_NOT_SUPPORTED = 155,
+	MQTT_CONNACK_USE_ANOTHER_SERVER = 156,
+	MQTT_CONNACK_SERVER_MOVED = 157,
+	MQTT_CONNACK_CONNECTION_RATE_EXCEEDED = 159,
+};
+
 /** @brief MQTT SUBACK return codes. */
 enum mqtt_suback_return_code {
 	/** Subscription with QoS 0 succeeded. */
@@ -148,6 +180,46 @@ enum mqtt_suback_return_code {
 	MQTT_SUBACK_FAILURE = 0x80
 };
 
+/** @brief MQTT Disconnect reason codes (MQTT 5.0, chapter 3.14.2.1). */
+enum mqtt_disconnect_reason_code {
+	MQTT_DISCONNECT_NORMAL = 0,
+	MQTT_DISCONNECT_WITH_WILL_MSG = 4,
+	MQTT_DISCONNECT_UNSPECIFIED_ERROR = 128,
+	MQTT_DISCONNECT_MALFORMED_PACKET = 129,
+	MQTT_DISCONNECT_PROTOCOL_ERROR = 130,
+	MQTT_DISCONNECT_IMPL_SPECIFIC_ERROR = 131,
+	MQTT_DISCONNECT_NOT_AUTHORIZED = 135,
+	MQTT_DISCONNECT_SERVER_BUSY = 137,
+	MQTT_DISCONNECT_SERVER_SHUTTING_DOWN = 139,
+	MQTT_DISCONNECT_KEEP_ALIVE_TIMEOUT = 141,
+	MQTT_DISCONNECT_SESSION_TAKE_OVER = 142,
+	MQTT_DISCONNECT_TOPIC_FILTER_INVALID = 143,
+	MQTT_DISCONNECT_TOPIC_NAME_INVALID = 144,
+	MQTT_DISCONNECT_RECV_MAX_EXCEEDED = 147,
+	MQTT_DISCONNECT_TOPIC_ALIAS_INVALID = 148,
+	MQTT_DISCONNECT_PACKET_TOO_LARGE = 149,
+	MQTT_DISCONNECT_MESSAGE_RATE_TOO_HIGH = 150,
+	MQTT_DISCONNECT_QUOTA_EXCEEDED = 151,
+	MQTT_DISCONNECT_ADMIN_ACTION = 152,
+	MQTT_DISCONNECT_PAYLOAD_FORMAT_INVALID = 153,
+	MQTT_DISCONNECT_RETAIN_NOT_SUPPORTED = 154,
+	MQTT_DISCONNECT_QOS_NOT_SUPPORTED = 155,
+	MQTT_DISCONNECT_USE_ANOTHER_SERVER = 156,
+	MQTT_DISCONNECT_SERVER_MOVED = 157,
+	MQTT_DISCONNECT_SHARED_SUB_NOT_SUPPORTED = 158,
+	MQTT_DISCONNECT_CONNECTION_RATE_EXCEEDED = 159,
+	MQTT_DISCONNECT_MAX_CONNECT_TIME = 160,
+	MQTT_DISCONNECT_SUB_ID_NOT_SUPPORTED = 161,
+	MQTT_DISCONNECT_WILDCARD_SUB_NOT_SUPPORTED = 162,
+};
+
+/** @brief MQTT Authenticate reason codes (MQTT 5.0, chapter 3.15.2.1). */
+enum mqtt_auth_reason_code {
+	MQTT_AUTH_SUCCESS = 0,
+	MQTT_AUTH_CONTINUE_AUTHENTICATION = 24,
+	MQTT_AUTH_RE_AUTHENTICATE = 25,
+};
+
 /** @brief Abstracts UTF-8 encoded strings. */
 struct mqtt_utf8 {
 	const uint8_t *utf8;       /**< Pointer to UTF-8 string. */
@@ -172,6 +244,17 @@ struct mqtt_binstr {
 	uint32_t len;              /**< Length of binary stream. */
 };
 
+/** @brief Abstracts aliased topic. */
+struct mqtt_topic_alias {
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** UTF-8 encoded topic name. */
+	uint8_t topic_buf[CONFIG_MQTT_TOPIC_ALIAS_STRING_MAX];
+
+	/** Topic name size. */
+	uint16_t topic_size;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+};
+
 /** @brief Abstracts MQTT UTF-8 encoded topic that can be subscribed
  *         to or published.
  */
@@ -185,6 +268,13 @@ struct mqtt_topic {
 	uint8_t qos;
 };
 
+/** @brief Abstracts MQTT UTF-8 encoded string pair.
+ */
+struct mqtt_utf8_pair {
+	struct mqtt_utf8 name;
+	struct mqtt_utf8 value;
+};
+
 /** @brief Parameters for a publish message. */
 struct mqtt_publish_message {
 	struct mqtt_topic topic;     /**< Topic on which data was published. */
@@ -201,48 +291,210 @@ struct mqtt_connack_param {
 
 	/** The appropriate non-zero Connect return code indicates if the Server
 	 *  is unable to process a connection request for some reason.
+	 *  MQTT 3.1 - Return codes specified in @ref mqtt_conn_return_code
+	 *  MQTT 5.0 - Reason codes specified in @ref mqtt_connack_reason_code
 	 */
-	enum mqtt_conn_return_code return_code;
+	uint8_t return_code;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	struct {
+		/** MQTT 5.0, chapter 3.2.2.3.10 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.2.2.3.7 Assigned Client Identifier. */
+		struct mqtt_utf8 assigned_client_id;
+
+		/** MQTT 5.0, chapter 3.2.2.3.9 Reason String. */
+		struct mqtt_utf8 reason_string;
+
+		/** MQTT 5.0, chapter 3.2.2.3.15 Response Information. */
+		struct mqtt_utf8 response_information;
+
+		/** MQTT 5.0, chapter 3.2.2.3.16 Server Reference. */
+		struct mqtt_utf8 server_reference;
+
+		/** MQTT 5.0, chapter 3.2.2.3.17 Authentication Method. */
+		struct mqtt_utf8 auth_method;
+
+		/** MQTT 5.0, chapter 3.2.2.3.18 Authentication Data. */
+		struct mqtt_binstr auth_data;
+
+		/** MQTT 5.0, chapter 3.2.2.3.2 Session Expiry Interval. */
+		uint32_t session_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.2.2.3.6 Maximum Packet Size. */
+		uint32_t maximum_packet_size;
+
+		/** MQTT 5.0, chapter 3.3.2.3.3 Receive Maximum. */
+		uint16_t receive_maximum;
+
+		/** MQTT 5.0, chapter 3.2.2.3.8 Topic Alias Maximum. */
+		uint16_t topic_alias_maximum;
+
+		/** MQTT 5.0, chapter 3.2.2.3.14 Server Keep Alive. */
+		uint16_t server_keep_alive;
+
+		/** MQTT 5.0, chapter 3.2.2.3.4 Maximum QoS. */
+		uint8_t maximum_qos;
+
+		/** MQTT 5.0, chapter 3.2.2.3.5 Retain Available. */
+		uint8_t retain_available;
+
+		/** MQTT 5.0, chapter 3.2.2.3.11 Wildcard Subscription Available. */
+		uint8_t wildcard_sub_available;
+
+		/** MQTT 5.0, chapter 3.2.2.3.12 Subscription Identifiers Available. */
+		uint8_t subscription_ids_available;
+
+		/** MQTT 5.0, chapter 3.2.2.3.13 Shared Subscription Available. */
+		uint8_t shared_sub_available;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Session Expiry Interval property was present. */
+			bool has_session_expiry_interval;
+			/** Receive Maximum property was present. */
+			bool has_receive_maximum;
+			/** Maximum QoS property was present. */
+			bool has_maximum_qos;
+			/** Retain Available property was present. */
+			bool has_retain_available;
+			/** Maximum Packet Size property was present. */
+			bool has_maximum_packet_size;
+			/** Assigned Client Identifier property was present. */
+			bool has_assigned_client_id;
+			/** Topic Alias Maximum property was present. */
+			bool has_topic_alias_maximum;
+			/** Reason String property was present. */
+			bool has_reason_string;
+			/** User Property property was present. */
+			bool has_user_prop;
+			/** Wildcard Subscription Available property was present. */
+			bool has_wildcard_sub_available;
+			/** Subscription Identifiers Available property was present. */
+			bool has_subscription_ids_available;
+			/** Shared Subscription Available property was present. */
+			bool has_shared_sub_available;
+			/** Server Keep Alive property was present. */
+			bool has_server_keep_alive;
+			/** Response Information property was present. */
+			bool has_response_information;
+			/** Server Reference property was present. */
+			bool has_server_reference;
+			/** Authentication Method property was present. */
+			bool has_auth_method;
+			/** Authentication Data property was present. */
+			bool has_auth_data;
+		} rx;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+};
+
+/** @brief Common MQTT 5.0 properties shared across all ack-type messages. */
+struct mqtt_common_ack_properties {
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0, chapter 3.4.2.2.3 User Property. */
+	struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+	/** MQTT 5.0, chapter 3.4.2.2.2 Reason String. */
+	struct mqtt_utf8 reason_string;
+
+	/** Flags indicating whether given property was present in received packet. */
+	struct {
+		/** Reason String property was present. */
+		bool has_reason_string;
+		/** User Property property was present. */
+		bool has_user_prop;
+	} rx;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish acknowledgment (PUBACK). */
 struct mqtt_puback_param {
 	/** Message id of the PUBLISH message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish receive (PUBREC). */
 struct mqtt_pubrec_param {
 	/** Message id of the PUBLISH message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish release (PUBREL). */
 struct mqtt_pubrel_param {
 	/** Message id of the PUBREC message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT publish complete (PUBCOMP). */
 struct mqtt_pubcomp_param {
 	/** Message id of the PUBREL message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 reason code. */
+	uint8_t reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT subscription acknowledgment (SUBACK). */
 struct mqtt_suback_param {
 	/** Message id of the SUBSCRIBE message being acknowledged */
 	uint16_t message_id;
-	/** Return codes indicating maximum QoS level granted for each topic
-	 *  in the subscription list.
+
+	/** MQTT 3.1 - Return codes indicating maximum QoS level granted for
+	 *  each topic in the subscription list.
+	 *  MQTT 5.0 - Reason codes corresponding to each topic in the
+	 *  subscription list.
 	 */
 	struct mqtt_binstr return_codes;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for MQTT unsubscribe acknowledgment (UNSUBACK). */
 struct mqtt_unsuback_param {
 	/** Message id of the UNSUBSCRIBE message being acknowledged */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** Reason codes corresponding to each topic in the unsubscription list. */
+	struct mqtt_binstr reason_codes;
+
+	/** MQTT 5.0 properties. */
+	struct mqtt_common_ack_properties prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Parameters for a publish message (PUBLISH). */
@@ -264,9 +516,58 @@ struct mqtt_publish_param {
 	 *  by the broker.
 	 */
 	uint8_t retain_flag : 1;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.3.2.3.7 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.3.2.3.5 Response Topic. */
+		struct mqtt_utf8 response_topic;
+
+		/** MQTT 5.0, chapter 3.3.2.3.6 Correlation Data. */
+		struct mqtt_binstr correlation_data;
+
+		/** MQTT 5.0, chapter 3.3.2.3.9 Content Type. */
+		struct mqtt_utf8 content_type;
+
+		/** MQTT 5.0, chapter 3.3.2.3.8 Subscription Identifier. */
+		uint32_t subscription_identifier[CONFIG_MQTT_SUBSCRIPTION_ID_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.3.2.3.3 Message Expiry Interval. */
+		uint32_t message_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.3.2.3.4 Topic Alias. */
+		uint16_t topic_alias;
+
+		/** MQTT 5.0, chapter 3.3.2.3.2 Payload Format Indicator. */
+		uint8_t payload_format_indicator;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Payload Format Indicator property was present. */
+			bool has_payload_format_indicator;
+			/** Message Expiry Interval property was present. */
+			bool has_message_expiry_interval;
+			/** Topic Alias property was present. */
+			bool has_topic_alias;
+			/** Response Topic property was present. */
+			bool has_response_topic;
+			/** Correlation Data property was present. */
+			bool has_correlation_data;
+			/** User Property property was present. */
+			bool has_user_prop;
+			/** Subscription Identifier property was present. */
+			bool has_subscription_identifier;
+			/** Content Type property was present. */
+			bool has_content_type;
+		} rx;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
-/** @brief List of topics in a subscription request. */
+/** @brief Parameters for subscribe/unsubscribe message. */
 struct mqtt_subscription_list {
 	/** Array containing topics along with QoS for each. */
 	struct mqtt_topic *list;
@@ -276,6 +577,88 @@ struct mqtt_subscription_list {
 
 	/** Message id used to identify subscription request. */
 	uint16_t message_id;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.8.2.1.3 / 3.10.2.1.2 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.8.2.1.2 Subscription Identifier.
+		 *  Ignored for UNSUBSCRIBE requests.
+		 */
+		uint32_t subscription_identifier;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+};
+
+/** @brief Parameters for disconnect message. */
+struct mqtt_disconnect_param {
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/* MQTT 5.0 Disconnect reason code. */
+	enum mqtt_disconnect_reason_code reason_code;
+
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.14.2.2.4 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.14.2.2.3 Reason String. */
+		struct mqtt_utf8 reason_string;
+
+		/** MQTT 5.0, chapter 3.14.2.2.5 Server Reference. */
+		struct mqtt_utf8 server_reference;
+
+		/** MQTT 5.0, chapter 3.14.2.2.2 Session Expiry Interval. */
+		uint32_t session_expiry_interval;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Session Expiry Interval property was present. */
+			bool has_session_expiry_interval;
+			/** Reason String property was present. */
+			bool has_reason_string;
+			/** User Property property was present. */
+			bool has_user_prop;
+			/** Server Reference property was present. */
+			bool has_server_reference;
+		} rx;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+};
+
+/** @brief Parameters for auth message. */
+struct mqtt_auth_param {
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/* MQTT 5.0, chapter 3.15.2.1 Authenticate Reason Code */
+	enum mqtt_auth_reason_code reason_code;
+
+	struct {
+		/** MQTT 5.0, chapter 3.15.2.2.5 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.15.2.2.2 Authentication Method. */
+		struct mqtt_utf8 auth_method;
+
+		/** MQTT 5.0, chapter 3.15.2.2.3 Authentication Data. */
+		struct mqtt_binstr auth_data;
+
+		/** MQTT 5.0, chapter 3.15.2.2.4 Reason String. */
+		struct mqtt_utf8 reason_string;
+
+		/** Flags indicating whether given property was present in received packet. */
+		struct {
+			/** Authentication Method property was present. */
+			bool has_auth_method;
+			/** Authentication Data property was present. */
+			bool has_auth_data;
+			/** Reason String property was present. */
+			bool has_reason_string;
+			/** User Property property was present. */
+			bool has_user_prop;
+		} rx;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /**
@@ -311,6 +694,14 @@ union mqtt_evt_param {
 
 	/** Parameters accompanying MQTT_EVT_UNSUBACK event. */
 	struct mqtt_unsuback_param unsuback;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** Parameters accompanying MQTT_EVT_DISCONNECT event. */
+	struct mqtt_disconnect_param disconnect;
+
+	/** Parameters accompanying MQTT_EVT_AUTH event. */
+	struct mqtt_auth_param auth;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /** @brief Defines MQTT asynchronous event notified to the application. */
@@ -485,6 +876,14 @@ struct mqtt_internal {
 
 	/** Internal. Remaining payload length to read. */
 	uint32_t remaining_payload;
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** Internal. MQTT 5.0 topic alias mapping. */
+	struct mqtt_topic_alias topic_aliases[CONFIG_MQTT_TOPIC_ALIAS_MAX];
+
+	/** Internal. MQTT 5.0 disconnect reason set in case of processing errors. */
+	enum mqtt_disconnect_reason_code disconnect_reason;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 };
 
 /**
@@ -517,6 +916,32 @@ struct mqtt_client {
 	 */
 	struct mqtt_utf8 *password;
 
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 Will properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.1.3.2.8 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.1.3.2.5 Content Type. */
+		struct mqtt_utf8 content_type;
+
+		/** MQTT 5.0, chapter 3.1.3.2.6 Response Topic. */
+		struct mqtt_utf8 response_topic;
+
+		/** MQTT 5.0, chapter 3.1.3.2.7 Correlation Data. */
+		struct mqtt_binstr correlation_data;
+
+		/** MQTT 5.0, chapter 3.1.3.2.2 Will Delay Interval. */
+		uint32_t will_delay_interval;
+
+		/** MQTT 5.0, chapter 3.1.3.2.4 Message Expiry Interval. */
+		uint32_t message_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.1.3.2.3 Payload Format Indicator. */
+		uint8_t payload_format_indicator;
+	} will_prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 	/** Will topic and QoS. Can be NULL. */
 	struct mqtt_topic *will_topic;
 
@@ -552,6 +977,35 @@ struct mqtt_client {
 	/** Unanswered PINGREQ count on this connection. */
 	int8_t unacked_ping;
 
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+	/** MQTT 5.0 properties. */
+	struct {
+		/** MQTT 5.0, chapter 3.1.2.11.8 User Property. */
+		struct mqtt_utf8_pair user_prop[CONFIG_MQTT_USER_PROPERTIES_MAX];
+
+		/** MQTT 5.0, chapter 3.1.2.11.9 Authentication Method. */
+		struct mqtt_utf8 auth_method;
+
+		/** MQTT 5.0, chapter 3.1.2.11.10 Authentication Data. */
+		struct mqtt_binstr auth_data;
+
+		/** MQTT 5.0, chapter 3.1.2.11.2 Session Expiry Interval. */
+		uint32_t session_expiry_interval;
+
+		/** MQTT 5.0, chapter 3.1.2.11.4 Maximum Packet Size. */
+		uint32_t maximum_packet_size;
+
+		/** MQTT 5.0, chapter 3.1.2.11.3 Receive Maximum. */
+		uint16_t receive_maximum;
+
+		/** MQTT 5.0, chapter 3.1.2.11.6 Request Response Information. */
+		bool request_response_info;
+
+		/** MQTT 5.0, chapter 3.1.2.11.7 Request Response Information. */
+		bool request_problem_info;
+	} prop;
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 	/** Will retain flag, 1 if will message shall be retained persistently.
 	 */
 	uint8_t will_retain : 1;
@@ -725,10 +1179,27 @@ int mqtt_ping(struct mqtt_client *client);
  *
  * @param[in] client Identifies client instance for which procedure is
  *                   requested.
+ * @param[in] param Optional Disconnect parameters. May be NULL.
+ *                  Ignored if MQTT 3.1.1 is used.
+ *
+ * @return 0 or a negative error code (errno.h) indicating reason of failure.
+ */
+int mqtt_disconnect(struct mqtt_client *client,
+		    const struct mqtt_disconnect_param *param);
+
+#if defined(CONFIG_MQTT_VERSION_5_0) || defined(__DOXYGEN__)
+/**
+ * @brief API to send an authentication packet to the server.
+ *
+ * @param[in] client Client instance for which the procedure is requested.
+ *                   Shall not be NULL.
+ * @param[in] param Parameters to be used for the auth message.
+ *                  Shall not be NULL.
  *
  * @return 0 or a negative error code (errno.h) indicating reason of failure.
  */
-int mqtt_disconnect(struct mqtt_client *client);
+int mqtt_auth(struct mqtt_client *client, const struct mqtt_auth_param *param);
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 
 /**
  * @brief API to abort MQTT connection. This will close the corresponding
diff --git a/include/zephyr/net/net_context.h b/include/zephyr/net/net_context.h
index 80d84426789ec..e43113a3ab395 100644
--- a/include/zephyr/net/net_context.h
+++ b/include/zephyr/net/net_context.h
@@ -7,6 +7,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  * Copyright (c) 2021 Nordic Semiconductor
+ * Copyright (c) 2025 Aerlync Labs Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -390,6 +391,11 @@ __net_socket struct net_context {
 			 */
 			uint8_t ipv4_mcast_ifindex;
 		};
+		/** Flag to enable/disable multicast loop */
+		union {
+			bool ipv6_mcast_loop;  /**< IPv6 multicast loop */
+			bool ipv4_mcast_loop;  /**< IPv4 multicast loop */
+		};
 #endif /* CONFIG_NET_IPV6 || CONFIG_NET_IPV4 */
 
 #if defined(CONFIG_NET_CONTEXT_TIMESTAMPING)
@@ -838,6 +844,38 @@ static inline void net_context_set_ipv4_mcast_ttl(struct net_context *context,
 	context->ipv4_mcast_ttl = ttl;
 }
 
+#if defined(CONFIG_NET_IPV4)
+/**
+ * @brief Get IPv4 multicast loop value for this context.
+ *
+ * @details This function returns the IPv4 multicast loop value
+ *	    that is set to this context.
+ *
+ * @param context Network context.
+ *
+ * @return IPv4 multicast loop value
+ */
+static inline bool net_context_get_ipv4_mcast_loop(struct net_context *context)
+{
+	return context->options.ipv4_mcast_loop;
+}
+
+/**
+ * @brief Set IPv4 multicast loop value for this context.
+ *
+ * @details This function sets the IPv4 multicast loop value for
+ *	    this context.
+ *
+ * @param context Network context.
+ * @param ipv4_mcast_loop IPv4 multicast loop value.
+ */
+static inline void net_context_set_ipv4_mcast_loop(struct net_context *context,
+						   bool ipv4_mcast_loop)
+{
+	context->options.ipv4_mcast_loop = ipv4_mcast_loop;
+}
+#endif
+
 /**
  * @brief Get IPv6 hop limit value for this context.
  *
@@ -897,6 +935,40 @@ static inline void net_context_set_ipv6_mcast_hop_limit(struct net_context *cont
 	context->ipv6_mcast_hop_limit = hop_limit;
 }
 
+#if defined(CONFIG_NET_IPV6)
+
+/**
+ * @brief Get IPv6 multicast loop value for this context.
+ *
+ * @details This function returns the IPv6 multicast loop value
+ *          that is set to this context.
+ *
+ * @param context Network context.
+ *
+ * @return IPv6 multicast loop value
+ */
+static inline bool net_context_get_ipv6_mcast_loop(struct net_context *context)
+{
+	return context->options.ipv6_mcast_loop;
+}
+
+/**
+ * @brief Set IPv6 multicast loop value for this context.
+ *
+ * @details This function sets the IPv6 multicast loop value for
+ *          this context.
+ *
+ * @param context Network context.
+ * @param ipv6_mcast_loop IPv6 multicast loop value.
+ */
+static inline void net_context_set_ipv6_mcast_loop(struct net_context *context,
+						   bool ipv6_mcast_loop)
+{
+	context->options.ipv6_mcast_loop = ipv6_mcast_loop;
+}
+
+#endif
+
 /**
  * @brief Enable or disable socks proxy support for this context.
  *
@@ -1199,7 +1271,7 @@ int net_context_send(struct net_context *context,
  * @param dst_addr Destination address.
  * @param addrlen Length of the address.
  * @param cb Caller-supplied callback function.
- * @param timeout Currently this value is not used.
+ * @param timeout Timeout for the send attempt.
  * @param user_data Caller-supplied user data.
  *
  * @return numbers of bytes sent on success, a negative errno otherwise
@@ -1325,6 +1397,8 @@ enum net_context_option {
 	NET_OPT_MCAST_IFINDEX     = 19, /**< IPv6 multicast output network interface index */
 	NET_OPT_MTU               = 20, /**< IPv4 socket path MTU */
 	NET_OPT_LOCAL_PORT_RANGE  = 21, /**< Clamp local port range */
+	NET_OPT_IPV6_MCAST_LOOP	  = 22, /**< IPV6 multicast loop */
+	NET_OPT_IPV4_MCAST_LOOP	  = 23, /**< IPV4 multicast loop */
 };
 
 /**
diff --git a/include/zephyr/net/net_core.h b/include/zephyr/net/net_core.h
index 7cd9a1cb15f0f..e4b18418b3a57 100644
--- a/include/zephyr/net/net_core.h
+++ b/include/zephyr/net/net_core.h
@@ -124,18 +124,38 @@ enum net_verdict {
 int net_recv_data(struct net_if *iface, struct net_pkt *pkt);
 
 /**
- * @brief Send data to network.
+ * @brief Try sending data to network.
  *
  * @details Send data to network. This should not be used normally by
  * applications as it requires that the network packet is properly
  * constructed.
  *
  * @param pkt Network packet.
+ * @param timeout Timeout for send.
  *
  * @return 0 if ok, <0 if error. If <0 is returned, then the caller needs
  * to unref the pkt in order to avoid memory leak.
  */
-int net_send_data(struct net_pkt *pkt);
+int net_try_send_data(struct net_pkt *pkt, k_timeout_t timeout);
+
+/**
+ * @brief Send data to network.
+ *
+ * @details Send data to network. This should not be used normally by
+ * applications as it requires that the network packet is properly
+ * constructed. Equivalent to net_try_send_data with infinite timeout.
+ *
+ * @param pkt Network packet.
+ *
+ * @return 0 if ok, <0 if error. If <0 is returned, then the caller needs
+ * to unref the pkt in order to avoid memory leak.
+ */
+static inline int net_send_data(struct net_pkt *pkt)
+{
+	k_timeout_t timeout = k_is_in_isr() ? K_NO_WAIT : K_FOREVER;
+
+	return net_try_send_data(pkt, timeout);
+}
 
 /** @cond INTERNAL_HIDDEN */
 
diff --git a/include/zephyr/net/net_event.h b/include/zephyr/net/net_event.h
index f0f8545a713a7..8c403b057c6c2 100644
--- a/include/zephyr/net/net_event.h
+++ b/include/zephyr/net/net_event.h
@@ -123,6 +123,10 @@ enum net_event_l4_cmd {
 	NET_EVENT_L4_CMD_HOSTNAME_CHANGED,
 	NET_EVENT_L4_CMD_CAPTURE_STARTED,
 	NET_EVENT_L4_CMD_CAPTURE_STOPPED,
+	NET_EVENT_L4_CMD_VPN_CONNECTED,
+	NET_EVENT_L4_CMD_VPN_DISCONNECTED,
+	NET_EVENT_L4_CMD_VPN_PEER_ADD,
+	NET_EVENT_L4_CMD_VPN_PEER_DEL,
 };
 
 /** @endcond */
@@ -358,6 +362,22 @@ enum net_event_l4_cmd {
 #define NET_EVENT_CAPTURE_STOPPED			\
 	(_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_CAPTURE_STOPPED)
 
+/** Event emitted when VPN network connectivity is available. */
+#define NET_EVENT_VPN_CONNECTED				\
+	(_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_CONNECTED)
+
+/** Event emitted when VPN network connectivity is lost. */
+#define NET_EVENT_VPN_DISCONNECTED			\
+	(_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_DISCONNECTED)
+
+/** Event emitted when a VPN peer is added to the system. */
+#define NET_EVENT_VPN_PEER_ADD				\
+	(_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_PEER_ADD)
+
+/** Event emitted when a VPN peer is removed from the system. */
+#define NET_EVENT_VPN_PEER_DEL				\
+	(_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_PEER_DEL)
+
 /**
  * @brief Network Management event information structure
  * Used to pass information on network events like
diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index c8cbd4496aeda..ad6f721ac21bc 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -96,6 +96,11 @@ struct net_if_addr {
 		struct {
 			/** Duplicate address detection (DAD) timer */
 			sys_snode_t dad_node;
+
+			/** DAD needed list node */
+			sys_snode_t dad_need_node;
+
+			/** DAD start time */
 			uint32_t dad_start;
 
 			/** How many times we have done DAD */
@@ -106,6 +111,11 @@ struct net_if_addr {
 		struct {
 			/** Address conflict detection (ACD) timer. */
 			sys_snode_t acd_node;
+
+			/** ACD needed list node */
+			sys_snode_t acd_need_node;
+
+			/** ACD timeout value. */
 			k_timepoint_t acd_timeout;
 
 			/** ACD probe/announcement counter. */
@@ -151,6 +161,9 @@ struct net_if_mcast_addr {
 	/** IP address */
 	struct net_addr address;
 
+	/** Rejoining multicast groups list node */
+	sys_snode_t rejoin_node;
+
 #if defined(CONFIG_NET_IPV4_IGMPV3)
 	/** Sources to filter on */
 	struct net_addr sources[CONFIG_NET_IF_MCAST_IPV4_SOURCE_COUNT];
@@ -911,15 +924,34 @@ static inline enum net_if_oper_state net_if_oper_state(struct net_if *iface)
 	return iface->if_dev->oper_state;
 }
 
+/**
+ * @brief Try sending a packet through a net iface
+ *
+ * @param iface Pointer to a network interface structure
+ * @param pkt Pointer to a net packet to send
+ * @param timeout timeout for attempting to send
+ *
+ * @return verdict about the packet
+ */
+enum net_verdict net_if_try_send_data(struct net_if *iface,
+				      struct net_pkt *pkt, k_timeout_t timeout);
+
 /**
  * @brief Send a packet through a net iface
  *
+ * This is equivalent to net_if_try_queue_tx with an infinite timeout
  * @param iface Pointer to a network interface structure
  * @param pkt Pointer to a net packet to send
  *
- * return verdict about the packet
+ * @return verdict about the packet
  */
-enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt);
+static inline enum net_verdict net_if_send_data(struct net_if *iface,
+						struct net_pkt *pkt)
+{
+	k_timeout_t timeout = k_is_in_isr() ? K_NO_WAIT : K_FOREVER;
+
+	return net_if_try_send_data(iface, pkt, timeout);
+}
 
 /**
  * @brief Get a pointer to the interface L2
@@ -979,13 +1011,28 @@ static inline const struct device *net_if_get_device(struct net_if *iface)
 	return iface->if_dev->dev;
 }
 
+/**
+ * @brief Try enqueuing a packet to the net interface TX queue
+ *
+ * @param iface Pointer to a network interface structure
+ * @param pkt Pointer to a net packet to queue
+ * @param timeout Timeout for the enqueuing attempt
+ */
+void net_if_try_queue_tx(struct net_if *iface, struct net_pkt *pkt, k_timeout_t timeout);
+
 /**
  * @brief Queue a packet to the net interface TX queue
  *
+ * This is equivalent to net_if_try_queue_tx with an infinite timeout
  * @param iface Pointer to a network interface structure
  * @param pkt Pointer to a net packet to queue
  */
-void net_if_queue_tx(struct net_if *iface, struct net_pkt *pkt);
+static inline void net_if_queue_tx(struct net_if *iface, struct net_pkt *pkt)
+{
+	k_timeout_t timeout = k_is_in_isr() ? K_NO_WAIT : K_FOREVER;
+
+	net_if_try_queue_tx(iface, pkt, timeout);
+}
 
 /**
  * @brief Return the IP offload status
@@ -1199,13 +1246,20 @@ static inline int net_if_set_link_addr_unlocked(struct net_if *iface,
 						uint8_t *addr, uint8_t len,
 						enum net_link_type type)
 {
+	int ret;
+
 	if (net_if_flag_is_set(iface, NET_IF_RUNNING)) {
 		return -EPERM;
 	}
 
-	net_if_get_link_addr(iface)->addr = addr;
-	net_if_get_link_addr(iface)->len = len;
-	net_if_get_link_addr(iface)->type = type;
+	if (len > sizeof(net_if_get_link_addr(iface)->addr)) {
+		return -EINVAL;
+	}
+
+	ret = net_linkaddr_create(net_if_get_link_addr(iface), addr, len, type);
+	if (ret < 0) {
+		return ret;
+	}
 
 	net_hostname_set_postfix(addr, len);
 
@@ -2153,6 +2207,32 @@ static inline struct net_if *net_if_ipv6_select_src_iface(
 }
 #endif
 
+/**
+ * @brief Get a network interface that should be used when sending
+ * IPv6 network data to destination. Also return the source IPv6 address from
+ * that network interface.
+ *
+ * @param dst IPv6 destination address
+ * @param src_addr IPv6 source address. This can be set to NULL if the source
+ *                 address is not needed.
+ *
+ * @return Pointer to network interface to use, NULL if no suitable interface
+ * could be found.
+ */
+#if defined(CONFIG_NET_IPV6)
+struct net_if *net_if_ipv6_select_src_iface_addr(const struct in6_addr *dst,
+						 const struct in6_addr **src_addr);
+#else
+static inline struct net_if *net_if_ipv6_select_src_iface_addr(
+	const struct in6_addr *dst, const struct in6_addr **src_addr)
+{
+	ARG_UNUSED(dst);
+	ARG_UNUSED(src_addr);
+
+	return NULL;
+}
+#endif /* CONFIG_NET_IPV6 */
+
 /**
  * @brief Get a IPv6 link local address in a given state.
  *
@@ -2534,6 +2614,32 @@ static inline struct net_if *net_if_ipv4_select_src_iface(
 }
 #endif
 
+/**
+ * @brief Get a network interface that should be used when sending
+ * IPv4 network data to destination. Also return the source IPv4 address from
+ * that network interface.
+ *
+ * @param dst IPv4 destination address
+ * @param src_addr IPv4 source address. This can be set to NULL if the source
+ *                 address is not needed.
+ *
+ * @return Pointer to network interface to use, NULL if no suitable interface
+ * could be found.
+ */
+#if defined(CONFIG_NET_IPV4)
+struct net_if *net_if_ipv4_select_src_iface_addr(const struct in_addr *dst,
+						 const struct in_addr **src_addr);
+#else
+static inline struct net_if *net_if_ipv4_select_src_iface_addr(
+	const struct in_addr *dst, const struct in_addr **src_addr)
+{
+	ARG_UNUSED(dst);
+	ARG_UNUSED(src_addr);
+
+	return NULL;
+}
+#endif /* CONFIG_NET_IPV4 */
+
 /**
  * @brief Get a IPv4 source address that should be used when sending
  * network data to destination.
@@ -3331,7 +3437,8 @@ extern int net_stats_prometheus_scrape(struct prometheus_collector *collector,
 				   init_fn, pm, data, config, prio,	\
 				   api, l2, l2_ctx_type, mtu)		\
 	Z_DEVICE_STATE_DEFINE(dev_id);					\
-	Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, pm, data,	\
+	Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, NULL,		\
+			Z_DEVICE_DT_FLAGS(node_id), pm, data,		\
 			config, POST_KERNEL, prio, api,			\
 			&Z_DEVICE_STATE_NAME(dev_id));			\
 	NET_L2_DATA_INIT(dev_id, instance, l2_ctx_type);		\
@@ -3478,7 +3585,8 @@ extern int net_stats_prometheus_scrape(struct prometheus_collector *collector,
 #define Z_NET_DEVICE_OFFLOAD_INIT(node_id, dev_id, name, init_fn, pm,	\
 				  data, config, prio, api, mtu)		\
 	Z_DEVICE_STATE_DEFINE(dev_id);					\
-	Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn, pm, data,	\
+	Z_DEVICE_DEFINE(node_id, dev_id, name, init_fn,	NULL,		\
+			Z_DEVICE_DT_FLAGS(node_id), pm, data,		\
 			config, POST_KERNEL, prio, api,			\
 			&Z_DEVICE_STATE_NAME(dev_id));			\
 	NET_IF_OFFLOAD_INIT(dev_id, 0, mtu)
diff --git a/include/zephyr/net/net_ip.h b/include/zephyr/net/net_ip.h
index 214b90cd3055a..e34e1e113ab2d 100644
--- a/include/zephyr/net/net_ip.h
+++ b/include/zephyr/net/net_ip.h
@@ -496,7 +496,11 @@ enum net_ip_mtu {
 	/** IPv4 MTU length. We must be able to receive this size IPv4 packet
 	 * without fragmentation.
 	 */
+#if defined(CONFIG_NET_NATIVE_IPV4)
+	NET_IPV4_MTU = CONFIG_NET_IPV4_MTU,
+#else
 	NET_IPV4_MTU = 576,
+#endif
 };
 
 /** @brief Network packet priority settings described in IEEE 802.1Q Annex I.1 */
@@ -1539,11 +1543,26 @@ static inline bool net_ipv6_addr_based_on_ll(const struct in6_addr *addr,
 		}
 
 		break;
+	default:
+		return false;
 	}
 
 	return false;
 }
 
+/**
+ * @brief Get sockaddr from sockaddr_storage. This is a helper so that
+ * the code calling this function can be made shorter.
+ *
+ * @param addr Socket storage address
+ *
+ * @return Pointer to socket address (struct sockaddr)
+ */
+static inline struct sockaddr *net_sad(const struct sockaddr_storage *addr)
+{
+	return (struct sockaddr *)addr;
+}
+
 /**
  * @brief Get sockaddr_in6 from sockaddr. This is a helper so that
  * the code calling this function can be made shorter.
@@ -1655,6 +1674,32 @@ __syscall int net_addr_pton(sa_family_t family, const char *src, void *dst);
 __syscall char *net_addr_ntop(sa_family_t family, const void *src,
 			      char *dst, size_t size);
 
+/**
+ * @brief Create netmask from mask length.
+ *
+ * @param family IP address family (AF_INET or AF_INET6)
+ * @param mask_len Netmask length (in IPv4) or prefix length (in IPv6)
+ * @param mask Pointer to struct sockaddr_in if family is AF_INET or
+ * pointer to struct sockaddr_in6 if family is AF_INET6
+ *
+ * @return 0 if ok, < 0 if error
+ */
+int net_mask_len_to_netmask(sa_family_t family, uint8_t mask_len,
+			    struct sockaddr *mask);
+
+/**
+ * @brief Create mask length from netmask.
+ *
+ * @param family IP address family (AF_INET or AF_INET6)
+ * @param mask Pointer to struct sockaddr_in if family is AF_INET or
+ * pointer to struct sockaddr_in6 if family is AF_INET6
+ * @param mask_len Netmask length (in IPv4) or prefix length (in IPv6)
+ *
+ * @return 0 if ok, < 0 if error
+ */
+int net_netmask_to_mask_len(sa_family_t family, struct sockaddr *mask,
+			    uint8_t *mask_len);
+
 /**
  * @brief Parse a string that contains either IPv4 or IPv6 address
  * and optional port, and store the information in user supplied
@@ -1679,6 +1724,36 @@ __syscall char *net_addr_ntop(sa_family_t family, const void *src,
 bool net_ipaddr_parse(const char *str, size_t str_len,
 		      struct sockaddr *addr);
 
+/**
+ * @brief Parse a string that contains either IPv4 or IPv6 address
+ * and optional mask len, and store the information in user supplied
+ * sockaddr struct. There can be multiple IP addresses separated by
+ * comma or space. The function returns the pointer to the next IP address
+ * in the string.
+ *
+ * @details Syntax of the IP address string:
+ *   192.0.2.1/24
+ *   192.0.2.42
+ *   2001:db8::1/64
+ *   2001:db8::2
+ *   2001:db::42/128
+ *   2001:db8::1/64,192.0.2.1,2001:db8::2,192.0.2.2/24
+ *   2001:db8::1/64 192.0.2.1 2001:db8::2 192.0.2.2/24
+ * Note that the str_len parameter is used to restrict the amount of
+ * characters that are checked.
+ *
+ * @param str String that contains the IP address.
+ * @param str_len Length of the string to be parsed.
+ * @param addr Pointer to user supplied struct sockaddr.
+ * @param mask_len Pointer to mask_len which is returned to the caller.
+ *
+ * @return NULL if there was an error while parsing.
+ *         "" if we could parse the IP address and there is nothing more to parse.
+ *         All other values point to next character after the "," or " " in the string.
+ */
+const char *net_ipaddr_parse_mask(const char *str, size_t str_len,
+				  struct sockaddr *addr, uint8_t *mask_len);
+
 /**
  * @brief Set the default port in the sockaddr structure.
  * If the port is already set, then do nothing.
diff --git a/include/zephyr/net/net_linkaddr.h b/include/zephyr/net/net_linkaddr.h
index e5f0d5f2fc08d..1f5825e045f36 100644
--- a/include/zephyr/net/net_linkaddr.h
+++ b/include/zephyr/net/net_linkaddr.h
@@ -61,22 +61,6 @@ enum net_link_type {
 	NET_LINK_CANBUS_RAW,
 } __packed;
 
-/**
- *  @brief Hardware link address structure
- *
- *  Used to hold the link address information
- */
-struct net_linkaddr {
-	/** The array of byte representing the address */
-	uint8_t *addr; /* in big endian */
-
-	/** Length of that address array */
-	uint8_t len;
-
-	/** What kind of address is this for */
-	uint8_t type;
-};
-
 /**
  *  @brief Hardware link address structure
  *
@@ -87,7 +71,7 @@ struct net_linkaddr {
  *  handled differently than uint8_t addr[] and the fields are purposely
  *  in different order.
  */
-struct net_linkaddr_storage {
+struct net_linkaddr {
 	/** What kind of address is this for */
 	uint8_t type;
 
@@ -124,15 +108,17 @@ static inline bool net_linkaddr_cmp(struct net_linkaddr *lladdr1,
  *
  * @brief Set the member data of a link layer address storage structure.
  *
- * @param lladdr_store The link address storage structure to change.
+ * @param lladdr The link address storage structure to change.
  * @param new_addr Array of bytes containing the link address.
  * @param new_len Length of the link address array.
  * This value should always be <= NET_LINK_ADDR_MAX_LENGTH.
+ * @return 0 if ok, <0 if error
  */
-static inline int net_linkaddr_set(struct net_linkaddr_storage *lladdr_store,
-				   uint8_t *new_addr, uint8_t new_len)
+static inline int net_linkaddr_set(struct net_linkaddr *lladdr,
+				   const uint8_t *new_addr,
+				   uint8_t new_len)
 {
-	if (!lladdr_store || !new_addr) {
+	if (lladdr == NULL || new_addr == NULL) {
 		return -EINVAL;
 	}
 
@@ -140,12 +126,82 @@ static inline int net_linkaddr_set(struct net_linkaddr_storage *lladdr_store,
 		return -EMSGSIZE;
 	}
 
-	lladdr_store->len = new_len;
-	memcpy(lladdr_store->addr, new_addr, new_len);
+	lladdr->len = new_len;
+	memcpy(lladdr->addr, new_addr, new_len);
 
 	return 0;
 }
 
+/**
+ * @brief Copy link address from one variable to another.
+ *
+ * @param dst The link address structure destination.
+ * @param src The link address structure to source.
+ * @return 0 if ok, <0 if error
+ */
+static inline int net_linkaddr_copy(struct net_linkaddr *dst,
+				    const struct net_linkaddr *src)
+{
+	if (dst == NULL || src == NULL) {
+		return -EINVAL;
+	}
+
+	if (src->len > NET_LINK_ADDR_MAX_LENGTH) {
+		return -EMSGSIZE;
+	}
+
+	dst->type = src->type;
+	dst->len = src->len;
+	memcpy(dst->addr, src->addr, src->len);
+
+	return 0;
+}
+
+/**
+ * @brief Create a link address structure.
+ *
+ * @param lladdr The link address structure to change.
+ * @param addr Array of bytes containing the link address. If set to NULL,
+ * the address will be cleared.
+ * @param len Length of the link address array.
+ * @param type Type of the link address.
+ * @return 0 if ok, <0 if error
+ */
+static inline int net_linkaddr_create(struct net_linkaddr *lladdr,
+				      const uint8_t *addr, uint8_t len,
+				      enum net_link_type type)
+{
+	if (lladdr == NULL) {
+		return -EINVAL;
+	}
+
+	if (len > NET_LINK_ADDR_MAX_LENGTH) {
+		return -EMSGSIZE;
+	}
+
+	if (addr == NULL) {
+		memset(lladdr->addr, 0, NET_LINK_ADDR_MAX_LENGTH);
+	} else {
+		memcpy(lladdr->addr, addr, len);
+	}
+
+	lladdr->type = type;
+	lladdr->len = len;
+
+	return 0;
+}
+
+/**
+ * @brief Clear link address.
+ *
+ * @param lladdr The link address structure.
+ * @return 0 if ok, <0 if error
+ */
+static inline int net_linkaddr_clear(struct net_linkaddr *lladdr)
+{
+	return net_linkaddr_create(lladdr, NULL, 0, NET_LINK_UNKNOWN);
+}
+
 /**
  * @}
  */
diff --git a/include/zephyr/net/net_mgmt.h b/include/zephyr/net/net_mgmt.h
index fe3ee7f946d62..876e4b66565cd 100644
--- a/include/zephyr/net/net_mgmt.h
+++ b/include/zephyr/net/net_mgmt.h
@@ -345,6 +345,12 @@ static inline int net_mgmt_event_wait(uint32_t mgmt_event_mask,
 				      size_t *info_length,
 				      k_timeout_t timeout)
 {
+	ARG_UNUSED(mgmt_event_mask);
+	ARG_UNUSED(raised_event);
+	ARG_UNUSED(iface);
+	ARG_UNUSED(info);
+	ARG_UNUSED(info_length);
+	ARG_UNUSED(timeout);
 	return 0;
 }
 #endif
@@ -383,6 +389,12 @@ static inline int net_mgmt_event_wait_on_iface(struct net_if *iface,
 					       size_t *info_length,
 					       k_timeout_t timeout)
 {
+	ARG_UNUSED(iface);
+	ARG_UNUSED(mgmt_event_mask);
+	ARG_UNUSED(raised_event);
+	ARG_UNUSED(info);
+	ARG_UNUSED(info_length);
+	ARG_UNUSED(timeout);
 	return 0;
 }
 #endif
diff --git a/include/zephyr/net/net_pkt.h b/include/zephyr/net/net_pkt.h
index 1fc59ffc0c043..a05c3f1629d61 100644
--- a/include/zephyr/net/net_pkt.h
+++ b/include/zephyr/net/net_pkt.h
@@ -123,6 +123,19 @@ struct net_pkt {
 	struct net_if *orig_iface; /* Original network interface */
 #endif
 
+#if defined(CONFIG_NET_VPN)
+	struct {
+		/** Original network interface */
+		struct net_if *iface;
+		/** Pointer to IP header of the encrypted pkt */
+		union net_ip_header ip_hdr;
+		/** Pointer to UDP header of the encrypted pkt */
+		union net_proto_header proto_hdr;
+		/** Peer id */
+		int peer_id;
+	} vpn;
+#endif
+
 #if defined(CONFIG_NET_PKT_TIMESTAMP) || defined(CONFIG_NET_PKT_TXTIME)
 	/**
 	 * TX or RX timestamp if available
@@ -410,6 +423,52 @@ static inline void net_pkt_set_orig_iface(struct net_pkt *pkt,
 #endif
 }
 
+#if defined(CONFIG_NET_VPN)
+static inline struct net_if *net_pkt_vpn_iface(struct net_pkt *pkt)
+{
+	return pkt->vpn.iface;
+}
+
+static inline void net_pkt_set_vpn_iface(struct net_pkt *pkt,
+					 struct net_if *iface)
+{
+	pkt->vpn.iface = iface;
+}
+
+static inline union net_ip_header *net_pkt_vpn_ip_hdr(struct net_pkt *pkt)
+{
+	return &pkt->vpn.ip_hdr;
+}
+
+static inline void net_pkt_set_vpn_ip_hdr(struct net_pkt *pkt,
+					  union net_ip_header *ip_hdr)
+{
+	pkt->vpn.ip_hdr = *ip_hdr;
+}
+
+static inline union net_proto_header *net_pkt_vpn_udp_hdr(struct net_pkt *pkt)
+{
+	return &pkt->vpn.proto_hdr;
+}
+
+static inline void net_pkt_set_vpn_udp_hdr(struct net_pkt *pkt,
+					   union net_proto_header *proto_hdr)
+{
+	pkt->vpn.proto_hdr = *proto_hdr;
+}
+
+static inline int net_pkt_vpn_peer_id(struct net_pkt *pkt)
+{
+	return pkt->vpn.peer_id;
+}
+
+static inline void net_pkt_set_vpn_peer_id(struct net_pkt *pkt,
+					   int peer_id)
+{
+	pkt->vpn.peer_id = peer_id;
+}
+#endif /* CONFIG_NET_VPN */
+
 static inline uint8_t net_pkt_family(struct net_pkt *pkt)
 {
 	return pkt->family;
@@ -1284,16 +1343,23 @@ static inline struct net_linkaddr *net_pkt_lladdr_dst(struct net_pkt *pkt)
 
 static inline void net_pkt_lladdr_swap(struct net_pkt *pkt)
 {
-	uint8_t *addr = net_pkt_lladdr_src(pkt)->addr;
+	struct net_linkaddr tmp;
 
-	net_pkt_lladdr_src(pkt)->addr = net_pkt_lladdr_dst(pkt)->addr;
-	net_pkt_lladdr_dst(pkt)->addr = addr;
+	memcpy(tmp.addr,
+	       net_pkt_lladdr_src(pkt)->addr,
+	       net_pkt_lladdr_src(pkt)->len);
+	memcpy(net_pkt_lladdr_src(pkt)->addr,
+	       net_pkt_lladdr_dst(pkt)->addr,
+	       net_pkt_lladdr_dst(pkt)->len);
+	memcpy(net_pkt_lladdr_dst(pkt)->addr,
+	       tmp.addr,
+	       net_pkt_lladdr_src(pkt)->len);
 }
 
 static inline void net_pkt_lladdr_clear(struct net_pkt *pkt)
 {
-	net_pkt_lladdr_src(pkt)->addr = NULL;
-	net_pkt_lladdr_src(pkt)->len = 0U;
+	(void)net_linkaddr_clear(net_pkt_lladdr_src(pkt));
+	(void)net_linkaddr_clear(net_pkt_lladdr_dst(pkt));
 }
 
 static inline uint16_t net_pkt_ll_proto_type(struct net_pkt *pkt)
diff --git a/include/zephyr/net/net_pkt_filter.h b/include/zephyr/net/net_pkt_filter.h
index 15406b6e6a7ce..1ee42e51b70ef 100644
--- a/include/zephyr/net/net_pkt_filter.h
+++ b/include/zephyr/net/net_pkt_filter.h
@@ -39,11 +39,48 @@ struct npf_test;
 
 typedef bool (npf_test_fn_t)(struct npf_test *test, struct net_pkt *pkt);
 
+enum npf_test_type {
+	NPF_TEST_TYPE_UNKNOWN = 0,
+	NPF_TEST_TYPE_IFACE_MATCH,
+	NPF_TEST_TYPE_IFACE_UNMATCH,
+	NPF_TEST_TYPE_ORIG_IFACE_MATCH,
+	NPF_TEST_TYPE_ORIG_IFACE_UNMATCH,
+	NPF_TEST_TYPE_SIZE_MIN,
+	NPF_TEST_TYPE_SIZE_MAX,
+	NPF_TEST_TYPE_SIZE_BOUNDS,
+	NPF_TEST_TYPE_IP_SRC_ADDR_ALLOWLIST,
+	NPF_TEST_TYPE_IP_SRC_ADDR_BLOCKLIST,
+	NPF_TEST_TYPE_ETH_SRC_ADDR_MATCH,
+	NPF_TEST_TYPE_ETH_SRC_ADDR_UNMATCH,
+	NPF_TEST_TYPE_ETH_DST_ADDR_MATCH,
+	NPF_TEST_TYPE_ETH_DST_ADDR_UNMATCH,
+	NPF_TEST_TYPE_ETH_SRC_ADDR_MASK_MATCH,
+	NPF_TEST_TYPE_ETH_DST_ADDR_MASK_MATCH,
+	NPF_TEST_TYPE_ETH_TYPE_MATCH,
+	NPF_TEST_TYPE_ETH_TYPE_UNMATCH,
+	NPF_TEST_TYPE_ETH_VLAN_TYPE_MATCH,
+	NPF_TEST_TYPE_ETH_VLAN_TYPE_UNMATCH,
+};
+
+#if defined(CONFIG_NET_PKT_FILTER_LOG_LEVEL_DBG) || \
+	defined(CONFIG_NET_SHELL_PKT_FILTER_SUPPORTED)
+#define NPF_TEST_ENABLE_NAME 1
+#elif defined(NPF_TEST_ENABLE_NAME)
+#undef NPF_TEST_ENABLE_NAME
+#endif
+
 /** @endcond */
 
 /** @brief common filter test structure to be embedded into larger structures */
 struct npf_test {
 	npf_test_fn_t *fn;	/**< packet condition test function */
+
+/** @cond INTERNAL_HIDDEN */
+	IF_ENABLED(NPF_TEST_ENABLE_NAME,
+		   (const char *name;))        /**< Name of the test */
+	IF_ENABLED(NPF_TEST_ENABLE_NAME,
+		   (enum npf_test_type type;)) /**< Type of the test */
+/** @endcond */
 };
 
 /** @brief filter rule structure */
@@ -237,10 +274,13 @@ extern npf_test_fn_t npf_orig_iface_unmatch;
  * @param _name Name of the condition
  * @param _iface Interface to match
  */
-#define NPF_IFACE_MATCH(_name, _iface) \
-	struct npf_test_iface _name = { \
-		.iface = (_iface), \
-		.test.fn = npf_iface_match, \
+#define NPF_IFACE_MATCH(_name, _iface)					\
+	struct npf_test_iface _name = {					\
+		.iface = (_iface),					\
+		.test.fn = npf_iface_match,				\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "iface",			\
+			    .test.type = NPF_TEST_TYPE_IFACE_MATCH,))	\
 	}
 
 /**
@@ -249,10 +289,13 @@ extern npf_test_fn_t npf_orig_iface_unmatch;
  * @param _name Name of the condition
  * @param _iface Interface to exclude
  */
-#define NPF_IFACE_UNMATCH(_name, _iface) \
-	struct npf_test_iface _name = { \
-		.iface = (_iface), \
-		.test.fn = npf_iface_unmatch, \
+#define NPF_IFACE_UNMATCH(_name, _iface)				\
+	struct npf_test_iface _name = {					\
+		.iface = (_iface),					\
+		.test.fn = npf_iface_unmatch,				\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "!iface",			\
+			    .test.type = NPF_TEST_TYPE_IFACE_UNMATCH,))	\
 	}
 
 /**
@@ -261,10 +304,13 @@ extern npf_test_fn_t npf_orig_iface_unmatch;
  * @param _name Name of the condition
  * @param _iface Interface to match
  */
-#define NPF_ORIG_IFACE_MATCH(_name, _iface) \
-	struct npf_test_iface _name = { \
-		.iface = (_iface), \
-		.test.fn = npf_orig_iface_match, \
+#define NPF_ORIG_IFACE_MATCH(_name, _iface)				\
+	struct npf_test_iface _name = {					\
+		.iface = (_iface),					\
+		.test.fn = npf_orig_iface_match,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "orig iface",			\
+			    .test.type = NPF_TEST_TYPE_ORIG_IFACE_MATCH,)) \
 	}
 
 /**
@@ -273,10 +319,13 @@ extern npf_test_fn_t npf_orig_iface_unmatch;
  * @param _name Name of the condition
  * @param _iface Interface to exclude
  */
-#define NPF_ORIG_IFACE_UNMATCH(_name, _iface) \
-	struct npf_test_iface _name = { \
-		.iface = (_iface), \
-		.test.fn = npf_orig_iface_unmatch, \
+#define NPF_ORIG_IFACE_UNMATCH(_name, _iface)				\
+	struct npf_test_iface _name = {					\
+		.iface = (_iface),					\
+		.test.fn = npf_orig_iface_unmatch,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "!orig iface",			\
+			    .test.type = NPF_TEST_TYPE_ORIG_IFACE_UNMATCH,)) \
 	}
 
 /** @cond INTERNAL_HIDDEN */
@@ -297,11 +346,14 @@ extern npf_test_fn_t npf_size_inbounds;
  * @param _name Name of the condition
  * @param _size Lower bound of the packet's data size
  */
-#define NPF_SIZE_MIN(_name, _size) \
-	struct npf_test_size_bounds _name = { \
-		.min = (_size), \
-		.max = SIZE_MAX, \
-		.test.fn = npf_size_inbounds, \
+#define NPF_SIZE_MIN(_name, _size)				   \
+	struct npf_test_size_bounds _name = {			   \
+		.min = (_size),					   \
+		.max = SIZE_MAX,				   \
+		.test.fn = npf_size_inbounds,			   \
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,		   \
+			   (.test.name = "size min",		   \
+			    .test.type = NPF_TEST_TYPE_SIZE_MIN,)) \
 	}
 
 /**
@@ -310,11 +362,14 @@ extern npf_test_fn_t npf_size_inbounds;
  * @param _name Name of the condition
  * @param _size Higher bound of the packet's data size
  */
-#define NPF_SIZE_MAX(_name, _size) \
-	struct npf_test_size_bounds _name = { \
-		.min = 0, \
-		.max = (_size), \
-		.test.fn = npf_size_inbounds, \
+#define NPF_SIZE_MAX(_name, _size)				   \
+	struct npf_test_size_bounds _name = {			   \
+		.min = 0,					   \
+		.max = (_size),					   \
+		.test.fn = npf_size_inbounds,			   \
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,		   \
+			   (.test.name = "size max",		   \
+			    .test.type = NPF_TEST_TYPE_SIZE_MAX,)) \
 	}
 
 /**
@@ -324,11 +379,14 @@ extern npf_test_fn_t npf_size_inbounds;
  * @param _min_size Lower bound of the packet's data size
  * @param _max_size Higher bound of the packet's data size
  */
-#define NPF_SIZE_BOUNDS(_name, _min_size, _max_size) \
-	struct npf_test_size_bounds _name = { \
-		.min = (_min_size), \
-		.max = (_max_size), \
-		.test.fn = npf_size_inbounds, \
+#define NPF_SIZE_BOUNDS(_name, _min_size, _max_size)		      \
+	struct npf_test_size_bounds _name = {			      \
+		.min = (_min_size),				      \
+		.max = (_max_size),				      \
+		.test.fn = npf_size_inbounds,			      \
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,		      \
+			   (.test.name = "size bounds",		      \
+			    .test.type = NPF_TEST_TYPE_SIZE_BOUNDS,)) \
 	}
 
 /** @cond INTERNAL_HIDDEN */
@@ -358,11 +416,14 @@ extern npf_test_fn_t npf_ip_src_addr_unmatch;
  * @param _af Addresses family type (AF_INET / AF_INET6) in the array
  */
 #define NPF_IP_SRC_ADDR_ALLOWLIST(_name, _ip_addr_array, _ip_addr_num, _af) \
-	struct npf_test_ip _name = { \
-		.addr_family = _af, \
-		.ipaddr = (_ip_addr_array), \
-		.ipaddr_num = _ip_addr_num, \
-		.test.fn = npf_ip_src_addr_match, \
+	struct npf_test_ip _name = {					\
+		.addr_family = _af,					\
+		.ipaddr = (_ip_addr_array),				\
+		.ipaddr_num = _ip_addr_num,				\
+		.test.fn = npf_ip_src_addr_match,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "ip src allow",		\
+			    .test.type = NPF_TEST_TYPE_IP_SRC_ADDR_ALLOWLIST,)) \
 	}
 
 /**
@@ -378,11 +439,14 @@ extern npf_test_fn_t npf_ip_src_addr_unmatch;
  * @param _af Addresses family type (AF_INET / AF_INET6) in the array
  */
 #define NPF_IP_SRC_ADDR_BLOCKLIST(_name, _ip_addr_array, _ip_addr_num, _af) \
-	struct npf_test_ip _name = { \
-		.addr_family = _af, \
-		.ipaddr = (_ip_addr_array), \
-		.ipaddr_num = _ip_addr_num, \
-		.test.fn = npf_ip_src_addr_unmatch, \
+	struct npf_test_ip _name = {					\
+		.addr_family = _af,					\
+		.ipaddr = (_ip_addr_array),				\
+		.ipaddr_num = _ip_addr_num,				\
+		.test.fn = npf_ip_src_addr_unmatch,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "ip src block",		\
+			    .test.type = NPF_TEST_TYPE_IP_SRC_ADDR_BLOCKLIST,)) \
 	}
 
 /** @} */
@@ -420,12 +484,15 @@ extern npf_test_fn_t npf_eth_dst_addr_unmatch;
  * @param _name Name of the condition
  * @param _addr_array Array of <tt>struct net_eth_addr</tt> items to test against
  */
-#define NPF_ETH_SRC_ADDR_MATCH(_name, _addr_array) \
-	struct npf_test_eth_addr _name = { \
-		.addresses = (_addr_array), \
-		.nb_addresses = ARRAY_SIZE(_addr_array), \
-		.test.fn = npf_eth_src_addr_match, \
-		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, \
+#define NPF_ETH_SRC_ADDR_MATCH(_name, _addr_array)			\
+	struct npf_test_eth_addr _name = {				\
+		.addresses = (_addr_array),				\
+		.nb_addresses = ARRAY_SIZE(_addr_array),		\
+		.test.fn = npf_eth_src_addr_match,			\
+		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },	\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "eth src",			\
+			    .test.type = NPF_TEST_TYPE_ETH_SRC_ADDR_MATCH,)) \
 	}
 
 /**
@@ -437,12 +504,15 @@ extern npf_test_fn_t npf_eth_dst_addr_unmatch;
  * @param _name Name of the condition
  * @param _addr_array Array of <tt>struct net_eth_addr</tt> items to test against
  */
-#define NPF_ETH_SRC_ADDR_UNMATCH(_name, _addr_array) \
-	struct npf_test_eth_addr _name = { \
-		.addresses = (_addr_array), \
-		.nb_addresses = ARRAY_SIZE(_addr_array), \
-		.test.fn = npf_eth_src_addr_unmatch, \
-		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, \
+#define NPF_ETH_SRC_ADDR_UNMATCH(_name, _addr_array)			\
+	struct npf_test_eth_addr _name = {				\
+		.addresses = (_addr_array),				\
+		.nb_addresses = ARRAY_SIZE(_addr_array),		\
+		.test.fn = npf_eth_src_addr_unmatch,			\
+		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },	\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "!eth src",			\
+			    .test.type = NPF_TEST_TYPE_ETH_SRC_ADDR_UNMATCH,)) \
 	}
 
 /**
@@ -454,12 +524,15 @@ extern npf_test_fn_t npf_eth_dst_addr_unmatch;
  * @param _name Name of the condition
  * @param _addr_array Array of <tt>struct net_eth_addr</tt> items to test against
  */
-#define NPF_ETH_DST_ADDR_MATCH(_name, _addr_array) \
-	struct npf_test_eth_addr _name = { \
-		.addresses = (_addr_array), \
-		.nb_addresses = ARRAY_SIZE(_addr_array), \
-		.test.fn = npf_eth_dst_addr_match, \
-		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, \
+#define NPF_ETH_DST_ADDR_MATCH(_name, _addr_array)			\
+	struct npf_test_eth_addr _name = {				\
+		.addresses = (_addr_array),				\
+		.nb_addresses = ARRAY_SIZE(_addr_array),		\
+		.test.fn = npf_eth_dst_addr_match,			\
+		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },	\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "eth dst",			\
+			    .test.type = NPF_TEST_TYPE_ETH_DST_ADDR_MATCH,)) \
 	}
 
 /**
@@ -471,12 +544,15 @@ extern npf_test_fn_t npf_eth_dst_addr_unmatch;
  * @param _name Name of the condition
  * @param _addr_array Array of <tt>struct net_eth_addr</tt> items to test against
  */
-#define NPF_ETH_DST_ADDR_UNMATCH(_name, _addr_array) \
-	struct npf_test_eth_addr _name = { \
-		.addresses = (_addr_array), \
-		.nb_addresses = ARRAY_SIZE(_addr_array), \
-		.test.fn = npf_eth_dst_addr_unmatch, \
-		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, \
+#define NPF_ETH_DST_ADDR_UNMATCH(_name, _addr_array)			\
+	struct npf_test_eth_addr _name = {				\
+		.addresses = (_addr_array),				\
+		.nb_addresses = ARRAY_SIZE(_addr_array),		\
+		.test.fn = npf_eth_dst_addr_unmatch,			\
+		.mask.addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },	\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "!eth dst",			\
+			    .test.type = NPF_TEST_TYPE_ETH_DST_ADDR_UNMATCH,)) \
 	}
 
 /**
@@ -489,12 +565,15 @@ extern npf_test_fn_t npf_eth_dst_addr_unmatch;
  * @param _addr_array Array of <tt>struct net_eth_addr</tt> items to test against
  * @param ... up to 6 mask bytes
  */
-#define NPF_ETH_SRC_ADDR_MASK_MATCH(_name, _addr_array, ...) \
-	struct npf_test_eth_addr _name = { \
-		.addresses = (_addr_array), \
-		.nb_addresses = ARRAY_SIZE(_addr_array), \
-		.mask.addr = { __VA_ARGS__ }, \
-		.test.fn = npf_eth_src_addr_match, \
+#define NPF_ETH_SRC_ADDR_MASK_MATCH(_name, _addr_array, ...)		\
+	struct npf_test_eth_addr _name = {				\
+		.addresses = (_addr_array),				\
+		.nb_addresses = ARRAY_SIZE(_addr_array),		\
+		.mask.addr = { __VA_ARGS__ },				\
+		.test.fn = npf_eth_src_addr_match,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "eth src mask",		\
+			    .test.type = NPF_TEST_TYPE_ETH_SRC_ADDR_MASK_MATCH,)) \
 	}
 
 /**
@@ -507,12 +586,15 @@ extern npf_test_fn_t npf_eth_dst_addr_unmatch;
  * @param _addr_array Array of <tt>struct net_eth_addr</tt> items to test against
  * @param ... up to 6 mask bytes
  */
-#define NPF_ETH_DST_ADDR_MASK_MATCH(_name, _addr_array, ...) \
-	struct npf_test_eth_addr _name = { \
-		.addresses = (_addr_array), \
-		.nb_addresses = ARRAY_SIZE(_addr_array), \
-		.mask.addr = { __VA_ARGS__ }, \
-		.test.fn = npf_eth_dst_addr_match, \
+#define NPF_ETH_DST_ADDR_MASK_MATCH(_name, _addr_array, ...)		\
+	struct npf_test_eth_addr _name = {				\
+		.addresses = (_addr_array),				\
+		.nb_addresses = ARRAY_SIZE(_addr_array),		\
+		.mask.addr = { __VA_ARGS__ },				\
+		.test.fn = npf_eth_dst_addr_match,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "eth dst mask",		\
+			    .test.type = NPF_TEST_TYPE_ETH_DST_ADDR_MASK_MATCH,)) \
 	}
 
 /** @cond INTERNAL_HIDDEN */
@@ -524,6 +606,8 @@ struct npf_test_eth_type {
 
 extern npf_test_fn_t npf_eth_type_match;
 extern npf_test_fn_t npf_eth_type_unmatch;
+extern npf_test_fn_t npf_eth_vlan_type_match;
+extern npf_test_fn_t npf_eth_vlan_type_unmatch;
 
 /** @endcond */
 
@@ -533,10 +617,13 @@ extern npf_test_fn_t npf_eth_type_unmatch;
  * @param _name Name of the condition
  * @param _type Ethernet type to match
  */
-#define NPF_ETH_TYPE_MATCH(_name, _type) \
-	struct npf_test_eth_type _name = { \
-		.type = htons(_type), \
-		.test.fn = npf_eth_type_match, \
+#define NPF_ETH_TYPE_MATCH(_name, _type)				\
+	struct npf_test_eth_type _name = {				\
+		.type = htons(_type),					\
+		.test.fn = npf_eth_type_match,				\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "eth type",			\
+			    .test.type = NPF_TEST_TYPE_ETH_TYPE_MATCH,)) \
 	}
 
 /**
@@ -545,12 +632,83 @@ extern npf_test_fn_t npf_eth_type_unmatch;
  * @param _name Name of the condition
  * @param _type Ethernet type to exclude
  */
-#define NPF_ETH_TYPE_UNMATCH(_name, _type) \
-	struct npf_test_eth_type _name = { \
-		.type = htons(_type), \
-		.test.fn = npf_eth_type_unmatch, \
+#define NPF_ETH_TYPE_UNMATCH(_name, _type)				\
+	struct npf_test_eth_type _name = {				\
+		.type = htons(_type),					\
+		.test.fn = npf_eth_type_unmatch,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "!eth type",			\
+			    .test.type = NPF_TEST_TYPE_ETH_TYPE_UNMATCH,)) \
+	}
+
+/**
+ * @brief Statically define an "Ethernet VLAN header type match" packet
+ *        filter condition.
+ *
+ * @param _name Name of the condition
+ * @param _type Ethernet VLAN header type to match
+ */
+#define NPF_ETH_VLAN_TYPE_MATCH(_name, _type)				\
+	struct npf_test_eth_type _name = {				\
+		.type = htons(_type),					\
+		.test.fn = npf_eth_vlan_type_match,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "eth vlan type",		\
+			    .test.type = NPF_TEST_TYPE_ETH_VLAN_TYPE_MATCH,)) \
+	}
+
+/**
+ * @brief Statically define an "Ethernet VLAN header type unmatch" packet
+ *        filter condition.
+ *
+ * @param _name Name of the condition
+ * @param _type Ethernet VLAN header type to exclude
+ */
+#define NPF_ETH_VLAN_TYPE_UNMATCH(_name, _type)				\
+	struct npf_test_eth_type _name = {				\
+		.type = htons(_type),					\
+		.test.fn = npf_eth_vlan_type_unmatch,			\
+		IF_ENABLED(NPF_TEST_ENABLE_NAME,			\
+			   (.test.name = "!eth vlan type",		\
+			    .test.type = NPF_TEST_TYPE_ETH_VLAN_TYPE_UNMATCH,)) \
 	}
 
+/** Type of the packet filter rule. */
+enum npf_rule_type {
+	NPF_RULE_TYPE_UNKNOWN = 0,   /**< Unknown rule type */
+	NPF_RULE_TYPE_SEND,          /**< Rule for outgoing packets */
+	NPF_RULE_TYPE_RECV,          /**< Rule for incoming packets */
+	NPF_RULE_TYPE_LOCAL_IN_RECV, /**< Rule for local incoming packets */
+	NPF_RULE_TYPE_IPV4_RECV,     /**< Rule for IPv4 incoming packets */
+	NPF_RULE_TYPE_IPV6_RECV,     /**< Rule for IPv6 incoming packets */
+};
+
+/**
+ * @typedef npf_rule_cb_t
+ * @brief Callback used while iterating over network packet filter rules.
+ *
+ * @param rule Pointer to current network packet filter rule
+ * @param type Type of the rule (rx, tx, local_in, IPv4 or IPv6)
+ * @param user_data A valid pointer to user data or NULL
+ */
+typedef void (*npf_rule_cb_t)(struct npf_rule *rule,
+			      enum npf_rule_type type,
+			      void *user_data);
+
+/**
+ * @brief Go through all the network packet filter rules and call callback
+ * for each of them.
+ *
+ * @param cb User-supplied callback function to call
+ * @param user_data User specified data
+ */
+void npf_rules_foreach(npf_rule_cb_t cb, void *user_data);
+
+/** @cond INTERNAL_HIDDEN */
+const char *npf_test_get_str(struct npf_test *test, char *buf,
+			     size_t len);
+/** @endcond */
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/include/zephyr/net/net_stats.h b/include/zephyr/net/net_stats.h
index 740fe33895dff..588121f5be184 100644
--- a/include/zephyr/net/net_stats.h
+++ b/include/zephyr/net/net_stats.h
@@ -371,6 +371,34 @@ struct net_stats_pm {
 	uint32_t start_time;
 };
 
+/**
+ * @brief Network packet filter statistics
+ */
+struct net_stats_pkt_filter {
+	/** Network packet filter RX statistics */
+	struct {
+		/** Network packets dropped at network interface level */
+		net_stats_t drop;
+#if defined(CONFIG_NET_PKT_FILTER_IPV4_HOOK)
+		/** IPv4 packets dropped at network interface level */
+		net_stats_t ipv4_drop;
+#endif
+#if defined(CONFIG_NET_PKT_FILTER_IPV6_HOOK)
+		/** IPv6 packets dropped at network interface level */
+		net_stats_t ipv6_drop;
+#endif
+#if defined(CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK)
+		/** Packets dropped at connection input */
+		net_stats_t local_drop;
+#endif
+	} rx;
+
+	/** Network packet filter TX statistics */
+	struct {
+		/** Network packets dropped at network interface level */
+		net_stats_t drop;
+	} tx;
+};
 
 /**
  * @brief All network statistics in one struct.
@@ -388,6 +416,10 @@ struct net_stats {
 	/** IP layer errors */
 	struct net_stats_ip_errors ip_errors;
 
+#if defined(CONFIG_NET_STATISTICS_PKT_FILTER)
+	struct net_stats_pkt_filter pkt_filter;
+#endif
+
 #if defined(CONFIG_NET_STATISTICS_IPV6)
 	/** IPv6 statistics */
 	struct net_stats_ip ipv6;
@@ -709,6 +741,7 @@ struct net_stats_wifi {
 enum net_request_stats_cmd {
 	NET_REQUEST_STATS_CMD_GET_ALL = 1,
 	NET_REQUEST_STATS_CMD_GET_PROCESSING_ERROR,
+	NET_REQUEST_STATS_CMD_GET_PKT_FILTER_DROP,
 	NET_REQUEST_STATS_CMD_GET_BYTES,
 	NET_REQUEST_STATS_CMD_GET_IP_ERRORS,
 	NET_REQUEST_STATS_CMD_GET_IPV4,
@@ -724,6 +757,7 @@ enum net_request_stats_cmd {
 	NET_REQUEST_STATS_CMD_GET_PM,
 	NET_REQUEST_STATS_CMD_GET_WIFI,
 	NET_REQUEST_STATS_CMD_RESET_WIFI,
+	NET_REQUEST_STATS_CMD_GET_VPN,
 };
 
 /** @endcond */
@@ -736,6 +770,10 @@ enum net_request_stats_cmd {
 #define NET_REQUEST_STATS_GET_PROCESSING_ERROR				\
 	(_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PROCESSING_ERROR)
 
+/** Request all pkt_filter drop statistics */
+#define NET_REQUEST_STATS_GET_PKT_FILTER_DROP			\
+	(_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PKT_FILTER_DROP)
+
 /** Request number of received and sent bytes */
 #define NET_REQUEST_STATS_GET_BYTES				\
 	(_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_BYTES)
@@ -751,6 +789,10 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PROCESSING_ERROR);
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_BYTES);
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IP_ERRORS);
 
+#if defined(CONFIG_NET_STATISTICS_PKT_FILTER)
+NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PKT_FILTER_DROP);
+#endif /* CONFIG_NET_STATISTICS_PKT_FILTER */
+
 /** @endcond */
 
 #if defined(CONFIG_NET_STATISTICS_IPV4)
@@ -853,6 +895,16 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PPP);
 /** @endcond */
 #endif /* CONFIG_NET_STATISTICS_PPP */
 
+#if defined(CONFIG_NET_STATISTICS_VPN)
+/** Request VPN statistics */
+#define NET_REQUEST_STATS_GET_VPN				\
+	(_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_VPN)
+
+/** @cond INTERNAL_HIDDEN */
+NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_VPN);
+/** @endcond */
+#endif /* CONFIG_NET_STATISTICS_VPN */
+
 #endif /* CONFIG_NET_STATISTICS_USER_API */
 
 #if defined(CONFIG_NET_STATISTICS_POWER_MANAGEMENT)
@@ -1362,6 +1414,55 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_RESET_WIFI);
 #define NET_STATS_PROMETHEUS_RX_TIME(iface, dev_id, sfx)
 #endif
 
+#define NET_STATS_PROMETHEUS_PKT_FILTER_IPV4(iface, dev_id, sfx)	\
+	NET_STATS_PROMETHEUS_COUNTER_DEFINE(				\
+		"Packet filter RX IPv4 drop",				\
+		NET_STATS_GET_INSTANCE(dev_id, sfx, pkt_filter_rx_ipv4_drop), \
+		"packet_count",						\
+		NET_STATS_GET_COLLECTOR_NAME(dev_id, sfx),		\
+		NET_STATS_GET_VAR(dev_id, sfx, pkt_filter_rx_ipv4_drop),\
+		&(iface)->stats.pkt_filter.rx.ipv4_drop);
+
+#define NET_STATS_PROMETHEUS_PKT_FILTER_IPV6(iface, dev_id, sfx)	\
+	NET_STATS_PROMETHEUS_COUNTER_DEFINE(				\
+		"Packet filter RX IPv6 drop",				\
+		NET_STATS_GET_INSTANCE(dev_id, sfx, pkt_filter_rx_ipv6_drop), \
+		"packet_count",						\
+		NET_STATS_GET_COLLECTOR_NAME(dev_id, sfx),		\
+		NET_STATS_GET_VAR(dev_id, sfx, pkt_filter_rx_ipv6_drop),\
+		&(iface)->stats.pkt_filter.rx.ipv6_drop);
+
+#define NET_STATS_PROMETHEUS_PKT_FILTER_LOCAL(iface, dev_id, sfx)	\
+	NET_STATS_PROMETHEUS_COUNTER_DEFINE(				\
+		"Packet filter RX local drop",				\
+		NET_STATS_GET_INSTANCE(dev_id, sfx, pkt_filter_rx_local_drop), \
+		"packet_count",						\
+		NET_STATS_GET_COLLECTOR_NAME(dev_id, sfx),		\
+		NET_STATS_GET_VAR(dev_id, sfx, pkt_filter_rx_local_drop),\
+		&(iface)->stats.pkt_filter.rx.local_drop);
+
+#define NET_STATS_PROMETHEUS_PKT_FILTER(iface, dev_id, sfx)		\
+	NET_STATS_PROMETHEUS_COUNTER_DEFINE(				\
+		"Packet filter RX drop",				\
+		NET_STATS_GET_INSTANCE(dev_id, sfx, pkt_filter_rx_drop),\
+		"packet_count",						\
+		NET_STATS_GET_COLLECTOR_NAME(dev_id, sfx),		\
+		NET_STATS_GET_VAR(dev_id, sfx, pkt_filter_rx_drop),	\
+		&(iface)->stats.pkt_filter.rx.drop);			\
+	NET_STATS_PROMETHEUS_COUNTER_DEFINE(				\
+		"Packet filter TX drop",				\
+		NET_STATS_GET_INSTANCE(dev_id, sfx, pkt_filter_tx_drop),\
+		"packet_count",						\
+		NET_STATS_GET_COLLECTOR_NAME(dev_id, sfx),		\
+		NET_STATS_GET_VAR(dev_id, sfx, pkt_filter_tx_drop),	\
+		&(iface)->stats.pkt_filter.tx.drop);			\
+	IF_ENABLED(CONFIG_NET_PKT_FILTER_IPV4_HOOK,			\
+		   (NET_STATS_PROMETHEUS_PKT_FILTER_IPV4(iface, dev_id, sfx))) \
+	IF_ENABLED(CONFIG_NET_PKT_FILTER_IPV6_HOOK,			\
+		   (NET_STATS_PROMETHEUS_PKT_FILTER_IPV6(iface, dev_id, sfx))) \
+	IF_ENABLED(CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK,			\
+		   (NET_STATS_PROMETHEUS_PKT_FILTER_LOCAL(iface, dev_id, sfx)))
+
 /* Per network interface statistics via Prometheus */
 #define NET_STATS_PROMETHEUS(iface, dev_id, sfx)			\
 	NET_STATS_PROMETHEUS_COUNTER_DEFINE(				\
@@ -1371,6 +1472,8 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_RESET_WIFI);
 		NET_STATS_GET_COLLECTOR_NAME(dev_id, sfx),		\
 		NET_STATS_GET_VAR(dev_id, sfx, processing_error),	\
 		&(iface)->stats.processing_error);			\
+	IF_ENABLED(CONFIG_NET_STATISTICS_PKT_FILTER,			\
+		   (NET_STATS_PROMETHEUS_PKT_FILTER(iface, dev_id, sfx))) \
 	/* IP layer error statistics */					\
 	NET_STATS_PROMETHEUS_COUNTER_DEFINE(				\
 		"IP proto error",					\
diff --git a/include/zephyr/net/phy.h b/include/zephyr/net/phy.h
index 697436e4c0272..9175014d0c567 100644
--- a/include/zephyr/net/phy.h
+++ b/include/zephyr/net/phy.h
@@ -7,6 +7,7 @@
 /*
  * Copyright (c) 2021 IP-Logix Inc.
  * Copyright 2022 NXP
+ * Copyright (c) 2025 Aerlync Labs Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -23,6 +24,7 @@
  */
 #include <zephyr/types.h>
 #include <zephyr/device.h>
+#include <errno.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -209,6 +211,10 @@ static inline int phy_configure_link(const struct device *dev, enum phy_link_spe
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->cfg_link == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->cfg_link(dev, speeds);
 }
 
@@ -229,6 +235,10 @@ static inline int phy_get_link_state(const struct device *dev, struct phy_link_s
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->get_link == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->get_link(dev, state);
 }
 
@@ -251,6 +261,10 @@ static inline int phy_link_callback_set(const struct device *dev, phy_callback_t
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->link_cb_set == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->link_cb_set(dev, callback, user_data);
 }
 
@@ -270,6 +284,10 @@ static inline int phy_read(const struct device *dev, uint16_t reg_addr, uint32_t
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->read == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->read(dev, reg_addr, value);
 }
 
@@ -289,6 +307,10 @@ static inline int phy_write(const struct device *dev, uint16_t reg_addr, uint32_
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->write == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->write(dev, reg_addr, value);
 }
 
@@ -310,6 +332,10 @@ static inline int phy_read_c45(const struct device *dev, uint8_t devad, uint16_t
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->read_c45 == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->read_c45(dev, devad, regad, data);
 }
 
@@ -331,6 +357,10 @@ static inline int phy_write_c45(const struct device *dev, uint8_t devad, uint16_
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->write_c45 == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->write_c45(dev, devad, regad, data);
 }
 
@@ -349,6 +379,10 @@ static inline int phy_set_plca_cfg(const struct device *dev, struct phy_plca_cfg
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->set_plca_cfg == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->set_plca_cfg(dev, plca_cfg);
 }
 
@@ -367,6 +401,10 @@ static inline int phy_get_plca_cfg(const struct device *dev, struct phy_plca_cfg
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->get_plca_cfg == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->get_plca_cfg(dev, plca_cfg);
 }
 
@@ -385,6 +423,10 @@ static inline int phy_get_plca_sts(const struct device *dev, bool *plca_status)
 {
 	const struct ethphy_driver_api *api = (const struct ethphy_driver_api *)dev->api;
 
+	if (api->get_plca_sts == NULL) {
+		return -ENOSYS;
+	}
+
 	return api->get_plca_sts(dev, plca_status);
 }
 
diff --git a/include/zephyr/net/sntp.h b/include/zephyr/net/sntp.h
index 66128f76b467b..6b4f1456db3b9 100644
--- a/include/zephyr/net/sntp.h
+++ b/include/zephyr/net/sntp.h
@@ -14,6 +14,7 @@
 #define ZEPHYR_INCLUDE_NET_SNTP_H_
 
 #include <zephyr/net/socket.h>
+#include <zephyr/net/socket_service.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -99,6 +100,51 @@ int sntp_recv_response(struct sntp_ctx *ctx, uint32_t timeout, struct sntp_time
  */
 void sntp_close(struct sntp_ctx *ctx);
 
+/**
+ * @brief Initialise SNTP context for async operation
+ *
+ * Asynchronous operation is powered by @kconfig{CONFIG_NET_SOCKETS_SERVICE}.
+ *
+ * @param ctx Address of sntp context.
+ * @param addr IP address of NTP/SNTP server.
+ * @param addr_len IP address length of NTP/SNTP server.
+ * @param service Socket service defined by @ref NET_SOCKET_SERVICE_SYNC_DEFINE
+ *
+ * @return 0 if ok, <0 if error.
+ */
+int sntp_init_async(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len,
+		    const struct net_socket_service_desc *service);
+
+/**
+ * @brief Send the SNTP query
+ *
+ * @param ctx Address of sntp context.
+ *
+ * @return 0 if ok, <0 if error.
+ */
+int sntp_send_async(struct sntp_ctx *ctx);
+
+/**
+ * @brief Read the result of the SNTP query
+ *
+ * Must be called from the callback attached to the @ref net_socket_service_desc
+ * context.
+ *
+ * @param event Event pointer extracted from the service work callback
+ * @param ts Timestamp including integer and fractional seconds since
+ * 1 Jan 1970 (output).
+ *
+ * @return 0 if ok, <0 if error
+ */
+int sntp_read_async(struct net_socket_service_event *event, struct sntp_time *ts);
+
+/**
+ * @brief Release SNTP context
+ *
+ * @param service Socket service defined by @ref NET_SOCKET_SERVICE_SYNC_DEFINE
+ */
+void sntp_close_async(const struct net_socket_service_desc *service);
+
 /**
  * @brief Convenience function to query SNTP in one-shot fashion
  *
diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index 58c3fb0332db4..52ef479580dd0 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -8,6 +8,7 @@
 /*
  * Copyright (c) 2017-2018 Linaro Limited
  * Copyright (c) 2021 Nordic Semiconductor
+ * Copyright (c) 2025 Aerlync Labs Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -964,6 +965,8 @@ struct in_pktinfo {
 #define IP_MULTICAST_IF 32
 /** Set IPv4 multicast TTL value. */
 #define IP_MULTICAST_TTL 33
+/** Set IPv4 multicast loop value. */
+#define IP_MULTICAST_LOOP 34
 /** Join IPv4 multicast group. */
 #define IP_ADD_MEMBERSHIP 35
 /** Leave IPv4 multicast group. */
@@ -1005,6 +1008,9 @@ struct ip_mreq  {
 /** Set the multicast hop limit for the socket. */
 #define IPV6_MULTICAST_HOPS 18
 
+/** Set the multicast loop bit for the socket. */
+#define IPV6_MULTICAST_LOOP 19
+
 /** Join IPv6 multicast group. */
 #define IPV6_ADD_MEMBERSHIP 20
 
diff --git a/include/zephyr/net/tls_credentials.h b/include/zephyr/net/tls_credentials.h
index 2804df061018e..1002eee7e64bf 100644
--- a/include/zephyr/net/tls_credentials.h
+++ b/include/zephyr/net/tls_credentials.h
@@ -36,11 +36,15 @@ enum tls_credential_type {
 	 */
 	TLS_CREDENTIAL_CA_CERTIFICATE,
 
-	/** A public server certificate. Use this to register your own server
+	/** A public client or server certificate. Use this to register your own
 	 *  certificate. Should be registered together with a corresponding
 	 *  private key. Used with certificate-based ciphersuites.
 	 */
-	TLS_CREDENTIAL_SERVER_CERTIFICATE,
+	TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+
+	/** @deprecated Use TLS_CREDENTIAL_PUBLIC_CERTIFICATE instead.
+	 */
+	TLS_CREDENTIAL_SERVER_CERTIFICATE = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 
 	/** Private key. Should be registered together with a corresponding
 	 *  public certificate. Used with certificate-based ciphersuites.
@@ -64,7 +68,7 @@ enum tls_credential_type {
  * in the system.
  *
  * @note Some TLS credentials come in pairs:
- *    - TLS_CREDENTIAL_SERVER_CERTIFICATE with TLS_CREDENTIAL_PRIVATE_KEY,
+ *    - TLS_CREDENTIAL_PUBLIC_CERTIFICATE with TLS_CREDENTIAL_PRIVATE_KEY,
  *    - TLS_CREDENTIAL_PSK with TLS_CREDENTIAL_PSK_ID.
  *    Such pairs of credentials must be assigned the same secure tag to be
  *    correctly handled in the system.
diff --git a/include/zephyr/net/virtual.h b/include/zephyr/net/virtual.h
index d229a214d236d..d956ff1a4b95d 100644
--- a/include/zephyr/net/virtual.h
+++ b/include/zephyr/net/virtual.h
@@ -46,6 +46,9 @@ enum virtual_interface_caps {
 	/** Virtual Ethernet bridge interface. */
 	VIRTUAL_INTERFACE_BRIDGE = BIT(3),
 
+	/** VPN interface */
+	VIRTUAL_INTERFACE_VPN = BIT(4),
+
 /** @cond INTERNAL_HIDDEN */
 	/* Marker for capabilities - must be at the end of the enum.
 	 * It is here because the capability list cannot be empty.
@@ -60,6 +63,8 @@ enum virtual_interface_config_type {
 	VIRTUAL_INTERFACE_CONFIG_TYPE_PEER_ADDRESS,
 	VIRTUAL_INTERFACE_CONFIG_TYPE_MTU,
 	VIRTUAL_INTERFACE_CONFIG_TYPE_LINK_TYPE,
+	VIRTUAL_INTERFACE_CONFIG_TYPE_PRIVATE_KEY,
+	VIRTUAL_INTERFACE_CONFIG_TYPE_PUBLIC_KEY,
 };
 
 struct virtual_interface_link_types {
@@ -69,6 +74,10 @@ struct virtual_interface_link_types {
 				  (1))];
 };
 
+#if !defined(NET_VIRTUAL_MAX_PUBLIC_KEY_LEN)
+#define NET_VIRTUAL_MAX_PUBLIC_KEY_LEN 32U
+#endif
+
 struct virtual_interface_config {
 	sa_family_t family;
 	union {
@@ -76,6 +85,14 @@ struct virtual_interface_config {
 		struct in6_addr peer6addr;
 		int mtu;
 		struct virtual_interface_link_types link_types;
+		struct {
+			size_t len;
+			uint8_t *data;
+		} private_key;
+		struct {
+			size_t len;
+			uint8_t data[NET_VIRTUAL_MAX_PUBLIC_KEY_LEN];
+		} public_key;
 	};
 };
 
@@ -160,7 +177,7 @@ struct virtual_interface_context {
 	bool is_init;
 
 	/** Link address for this network interface */
-	struct net_linkaddr_storage lladdr;
+	struct net_linkaddr lladdr;
 
 	/** User friendly name of this L2 layer. */
 	char name[VIRTUAL_MAX_NAME_LEN];
diff --git a/include/zephyr/net/virtual_mgmt.h b/include/zephyr/net/virtual_mgmt.h
index 04ca6ae9fd70a..4b5e3163e5920 100644
--- a/include/zephyr/net/virtual_mgmt.h
+++ b/include/zephyr/net/virtual_mgmt.h
@@ -46,6 +46,14 @@ struct virtual_interface_req_params {
 		struct in6_addr peer6addr;
 		int mtu;
 		struct virtual_interface_link_types link_types;
+		struct {
+			size_t len;
+			uint8_t *data;
+		} private_key;
+		struct {
+			size_t len;
+			uint8_t data[NET_VIRTUAL_MAX_PUBLIC_KEY_LEN];
+		} public_key;
 	};
 };
 
@@ -56,6 +64,8 @@ enum net_request_virtual_interface_cmd {
 	NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_MTU,
 	NET_REQUEST_VIRTUAL_INTERFACE_CMD_SET_LINK_TYPE,
 	NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_LINK_TYPE,
+	NET_REQUEST_VIRTUAL_INTERFACE_CMD_SET_PRIVATE_KEY,
+	NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_PUBLIC_KEY,
 };
 
 #define NET_REQUEST_VIRTUAL_INTERFACE_SET_PEER_ADDRESS		\
@@ -94,6 +104,18 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_MTU);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_LINK_TYPE);
 
+#define NET_REQUEST_VIRTUAL_INTERFACE_SET_PRIVATE_KEY		\
+	(_NET_VIRTUAL_INTERFACE_BASE |				\
+	 NET_REQUEST_VIRTUAL_INTERFACE_CMD_SET_PRIVATE_KEY)
+
+NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_PRIVATE_KEY);
+
+#define NET_REQUEST_VIRTUAL_INTERFACE_GET_PUBLIC_KEY		\
+	(_NET_VIRTUAL_INTERFACE_BASE |				\
+	 NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_PUBLIC_KEY)
+
+NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_PUBLIC_KEY);
+
 struct net_if;
 
 /** @endcond */
diff --git a/include/zephyr/net/wifi.h b/include/zephyr/net/wifi.h
index 9129f1cc03372..8b89ff57803ea 100644
--- a/include/zephyr/net/wifi.h
+++ b/include/zephyr/net/wifi.h
@@ -38,6 +38,33 @@
 extern "C" {
 #endif
 
+/** @brief Wi-Fi connect result codes. To be overlaid on top of \ref wifi_status
+ * in the connect result event for detailed status.
+ */
+enum wifi_conn_status {
+	/** Connection successful */
+	WIFI_STATUS_CONN_SUCCESS = 0,
+	/** Connection failed - generic failure */
+	WIFI_STATUS_CONN_FAIL,
+	/** Connection failed - wrong password
+	 * Few possible reasons for 4-way handshake failure that we can guess are as follows:
+	 * 1) Incorrect key
+	 * 2) EAPoL frames lost causing timeout
+	 *
+	 * #1 is the likely cause, so, we convey to the user that it is due to
+	 * Wrong passphrase/password.
+	 */
+	WIFI_STATUS_CONN_WRONG_PASSWORD,
+	/** Connection timed out */
+	WIFI_STATUS_CONN_TIMEOUT,
+	/** Connection failed - AP not found */
+	WIFI_STATUS_CONN_AP_NOT_FOUND,
+	/** Last connection status */
+	WIFI_STATUS_CONN_LAST_STATUS,
+	/** Connection disconnected status */
+	WIFI_STATUS_DISCONN_FIRST_STATUS = WIFI_STATUS_CONN_LAST_STATUS,
+};
+
 /** @brief IEEE 802.11 security types. */
 enum wifi_security_type {
 	/** No security. */
@@ -672,7 +699,6 @@ static const char * const wifi_ps_param_config_err_code_tbl[] = {
 };
 /** @endcond */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 /** IEEE 802.11v BTM (BSS transition management) Query reasons.
  * Refer to IEEE Std 802.11v-2011 - Table 7-43x-Transition and Transition Query reasons table.
  */
@@ -684,7 +710,6 @@ enum wifi_btm_query_reason {
 	/** Leaving ESS. */
 	WIFI_BTM_QUERY_REASON_LEAVING_ESS = 20,
 };
-#endif
 
 /** Helper function to get user-friendly power save error code name. */
 static inline const char *wifi_ps_get_config_err_code_str(int16_t err_no)
@@ -710,6 +735,9 @@ enum wifi_ap_config_param {
 	WIFI_AP_CONFIG_PARAM_VHT_CAPAB = BIT(4),
 };
 
+/** Helper function to get user-friendly status name for the status code. */
+const char *wifi_conn_status_txt(enum wifi_conn_status status);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/net/wifi_credentials.h b/include/zephyr/net/wifi_credentials.h
index 0241930e97d39..8b00d67b199e4 100644
--- a/include/zephyr/net/wifi_credentials.h
+++ b/include/zephyr/net/wifi_credentials.h
@@ -11,18 +11,19 @@
 #include <zephyr/net/wifi.h>
 #include <zephyr/kernel.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
+ * @brief Library that provides a way to store and load Wi-Fi credentials.
  * @defgroup wifi_credentials Wi-Fi credentials library
  * @ingroup networking
  * @since 4.0
  * @version 0.1.0
  * @{
- * @brief Library that provides a way to store and load Wi-Fi credentials.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* this entry contains a BSSID */
 #define WIFI_CREDENTIALS_FLAG_BSSID        BIT(0)
@@ -32,11 +33,18 @@ extern "C" {
 #define WIFI_CREDENTIALS_FLAG_2_4GHz       BIT(2)
 /* this entry can use the 5 GHz band */
 #define WIFI_CREDENTIALS_FLAG_5GHz         BIT(3)
+/* this entry can use the 6 GHz band */
+#define WIFI_CREDENTIALS_FLAG_6GHz         BIT(4)
 /* this entry requires management frame protection */
-#define WIFI_CREDENTIALS_FLAG_MFP_REQUIRED BIT(4)
+#define WIFI_CREDENTIALS_FLAG_MFP_REQUIRED BIT(5)
 /* this entry disables management frame protection */
-#define WIFI_CREDENTIALS_FLAG_MFP_DISABLED BIT(5)
+#define WIFI_CREDENTIALS_FLAG_MFP_DISABLED BIT(6)
+/* this entry has anonymous identity configured */
+#define WIFI_CREDENTIALS_FLAG_ANONYMOUS_IDENTITY  BIT(7)
+/* this entry has key password configured */
+#define WIFI_CREDENTIALS_FLAG_KEY_PASSWORD  BIT(8)
 
+/* Maximum length of the password */
 #define WIFI_CREDENTIALS_MAX_PASSWORD_LEN                                                          \
 	MAX(WIFI_PSK_MAX_LEN, CONFIG_WIFI_CREDENTIALS_SAE_PASSWORD_LENGTH)
 
@@ -49,13 +57,38 @@ extern "C" {
  *
  */
 struct wifi_credentials_header {
-	enum wifi_security_type type;     /**< Wi-Fi security type */
-	char ssid[WIFI_SSID_MAX_LEN];     /**< SSID (Service Set Identifier) */
-	size_t ssid_len;                  /**< Length of the SSID */
-	uint32_t flags;                   /**< Flags for controlling detail settings */
-	uint32_t timeout;                 /**< Timeout for connecting to the network */
-	uint8_t bssid[WIFI_MAC_ADDR_LEN]; /**< BSSID (Basic Service Set Identifier) */
-	uint8_t channel;                  /**< Channel on which the network operates */
+	/** Wi-Fi security type */
+	enum wifi_security_type type;
+
+	/** SSID (Service Set Identifier) */
+	char ssid[WIFI_SSID_MAX_LEN];
+
+	/** Length of the SSID */
+	size_t ssid_len;
+
+	/** Flags for controlling detail settings */
+	uint32_t flags;
+
+	/** Timeout for connecting to the network */
+	uint32_t timeout;
+
+	/** BSSID (Basic Service Set Identifier) */
+	uint8_t bssid[WIFI_MAC_ADDR_LEN];
+
+	/** Channel on which the network operates */
+	uint8_t channel;
+
+	/** Anonymous identifier (Limited to 16 bytes due to settings subsystem overflow) */
+	char anon_id[16];
+
+	/** Length of the Anonymous identifier */
+	uint8_t aid_length;
+
+	/** Password/PSK (Limited to 16 bytes due to settings subsystem overflow) */
+	char key_passwd[16];
+
+	/** Length of the Password */
+	uint8_t key_passwd_length;
 };
 
 /**
@@ -67,9 +100,14 @@ struct wifi_credentials_header {
  *
  */
 struct wifi_credentials_personal {
-	struct wifi_credentials_header header;            /**< Header */
-	char password[WIFI_CREDENTIALS_MAX_PASSWORD_LEN]; /**< Password/PSK */
-	size_t password_len;                              /**< Length of the password */
+	/** Header */
+	struct wifi_credentials_header header;
+
+	/** Password/PSK */
+	char password[WIFI_CREDENTIALS_MAX_PASSWORD_LEN];
+
+	/** Length of the password */
+	size_t password_len;
 };
 
 /**
@@ -77,14 +115,29 @@ struct wifi_credentials_personal {
  * @note This functionality is not yet implemented.
  */
 struct wifi_credentials_enterprise {
-	struct wifi_credentials_header header; /**< Header */
-	size_t identity_len;                   /**< Length of the identity */
-	size_t anonymous_identity_len;         /**< Length of the anonymous identity */
-	size_t password_len;                   /**< Length of the password */
-	size_t ca_cert_len;                    /**< Length of the CA certificate */
-	size_t client_cert_len;                /**< Length of the client certificate */
-	size_t private_key_len;                /**< Length of the private key */
-	size_t private_key_pw_len;             /**< Length of the private key password */
+	/** Header */
+	struct wifi_credentials_header header;
+
+	/** Length of the identity */
+	size_t identity_len;
+
+	/** Length of the anonymous identity */
+	size_t anonymous_identity_len;
+
+	/** Length of the password */
+	size_t password_len;
+
+	/** Length of the CA certificate */
+	size_t ca_cert_len;
+
+	/** Length of the client certificate */
+	size_t client_cert_len;
+
+	/** Length of the private key */
+	size_t private_key_len;
+
+	/** Length of the private key password */
+	size_t private_key_pw_len;
 };
 
 /**
@@ -194,6 +247,7 @@ int wifi_credentials_delete_all(void);
 
 /**
  * @brief Callback type for wifi_credentials_for_each_ssid.
+ *
  * @param[in] cb_arg      arguments for the callback function. Appropriate cb_arg is
  *                        transferred by wifi_credentials_for_each_ssid.
  * @param[in] ssid        SSID
diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h
index fe686f3016110..969a6c65ab022 100644
--- a/include/zephyr/net/wifi_mgmt.h
+++ b/include/zephyr/net/wifi_mgmt.h
@@ -111,10 +111,8 @@ enum net_request_wifi_cmd {
 	NET_REQUEST_WIFI_CMD_AP_CONFIG_PARAM,
 	/** DPP actions */
 	NET_REQUEST_WIFI_CMD_DPP,
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 	/** BSS transition management query */
 	NET_REQUEST_WIFI_CMD_BTM_QUERY,
-#endif
 	/** Flush PMKSA cache entries */
 	NET_REQUEST_WIFI_CMD_PMKSA_FLUSH,
 	/** Set enterprise mode credential */
@@ -277,12 +275,10 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_CONFIG_PARAM);
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP);
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 /** Request a Wi-Fi BTM query */
 #define NET_REQUEST_WIFI_BTM_QUERY (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_BTM_QUERY)
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_BTM_QUERY);
-#endif
 
 /** Request a Wi-Fi PMKSA cache entries flush */
 #define NET_REQUEST_WIFI_PMKSA_FLUSH                           \
@@ -591,33 +587,6 @@ struct wifi_connect_req_params {
 	enum wifi_frequency_bandwidths bandwidth;
 };
 
-/** @brief Wi-Fi connect result codes. To be overlaid on top of \ref wifi_status
- * in the connect result event for detailed status.
- */
-enum wifi_conn_status {
-	/** Connection successful */
-	WIFI_STATUS_CONN_SUCCESS = 0,
-	/** Connection failed - generic failure */
-	WIFI_STATUS_CONN_FAIL,
-	/** Connection failed - wrong password
-	 * Few possible reasons for 4-way handshake failure that we can guess are as follows:
-	 * 1) Incorrect key
-	 * 2) EAPoL frames lost causing timeout
-	 *
-	 * #1 is the likely cause, so, we convey to the user that it is due to
-	 * Wrong passphrase/password.
-	 */
-	WIFI_STATUS_CONN_WRONG_PASSWORD,
-	/** Connection timed out */
-	WIFI_STATUS_CONN_TIMEOUT,
-	/** Connection failed - AP not found */
-	WIFI_STATUS_CONN_AP_NOT_FOUND,
-	/** Last connection status */
-	WIFI_STATUS_CONN_LAST_STATUS,
-	/** Connection disconnected status */
-	WIFI_STATUS_DISCONN_FIRST_STATUS = WIFI_STATUS_CONN_LAST_STATUS,
-};
-
 /** @brief Wi-Fi disconnect reason codes. To be overlaid on top of \ref wifi_status
  * in the disconnect result event for detailed reason.
  */
@@ -1467,7 +1436,7 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*channel)(const struct device *dev, struct wifi_channel_info *channel);
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
+
 	/** Send BTM query
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.
@@ -1476,7 +1445,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*btm_query)(const struct device *dev, uint8_t reason);
-#endif
 	/** Judge ap whether support the capability
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.
diff --git a/include/zephyr/net_buf.h b/include/zephyr/net_buf.h
index c349147afd77c..c4cc6a71e6880 100644
--- a/include/zephyr/net_buf.h
+++ b/include/zephyr/net_buf.h
@@ -1423,29 +1423,6 @@ struct net_buf * __must_check net_buf_alloc_with_data(struct net_buf_pool *pool,
 						      k_timeout_t timeout);
 #endif
 
-/**
- * @brief Get a buffer from a FIFO.
- *
- * @deprecated Use @a k_fifo_get() instead.
- *
- * @param fifo Which FIFO to take the buffer from.
- * @param timeout Affects the action taken should the FIFO be empty.
- *        If K_NO_WAIT, then return immediately. If K_FOREVER, then wait as
- *        long as necessary. Otherwise, wait until the specified timeout.
- *
- * @return New buffer or NULL if the FIFO is empty.
- */
-#if defined(CONFIG_NET_BUF_LOG)
-__deprecated struct net_buf * __must_check net_buf_get_debug(struct k_fifo *fifo,
-							     k_timeout_t timeout,
-							     const char *func, int line);
-#define	net_buf_get(_fifo, _timeout) \
-	net_buf_get_debug(_fifo, _timeout, __func__, __LINE__)
-#else
-__deprecated struct net_buf * __must_check net_buf_get(struct k_fifo *fifo,
-						       k_timeout_t timeout);
-#endif
-
 /**
  * @brief Destroy buffer from custom destroy callback
  *
@@ -1505,16 +1482,6 @@ void net_buf_slist_put(sys_slist_t *list, struct net_buf *buf);
  */
 struct net_buf * __must_check net_buf_slist_get(sys_slist_t *list);
 
-/**
- * @brief Put a buffer to the end of a FIFO.
- *
- * @deprecated Use @a k_fifo_put() instead.
- *
- * @param fifo Which FIFO to put the buffer to.
- * @param buf Buffer.
- */
-__deprecated void net_buf_put(struct k_fifo *fifo, struct net_buf *buf);
-
 /**
  * @brief Decrements the reference count of a buffer.
  *
diff --git a/include/zephyr/pm/state.h b/include/zephyr/pm/state.h
index 6590b90c385e7..a060799713774 100644
--- a/include/zephyr/pm/state.h
+++ b/include/zephyr/pm/state.h
@@ -370,6 +370,16 @@ struct pm_state_constraint {
  */
 uint8_t pm_state_cpu_get_all(uint8_t cpu, const struct pm_state_info **states);
 
+/**
+ * Get power state structure.
+ *
+ * @param cpu CPU index.
+ * @param state Power state.
+ * @param substate_id Substate.
+ *
+ * @return Pointer to the power state structure or NULL if state is not found.
+ */
+const struct pm_state_info *pm_state_get(uint8_t cpu, enum pm_state state, uint8_t substate_id);
 /**
  * @}
  */
@@ -384,6 +394,17 @@ static inline uint8_t pm_state_cpu_get_all(uint8_t cpu, const struct pm_state_in
 	return 0;
 }
 
+static inline const struct pm_state_info *pm_state_get(uint8_t cpu,
+						       enum pm_state state,
+						       uint8_t substate_id)
+{
+	ARG_UNUSED(cpu);
+	ARG_UNUSED(state);
+	ARG_UNUSED(substate_id);
+
+	return NULL;
+}
+
 #endif /* CONFIG_PM */
 
 #ifdef __cplusplus
diff --git a/include/zephyr/portability/cmsis_types.h b/include/zephyr/portability/cmsis_types.h
new file mode 100644
index 0000000000000..0bbe178522aaa
--- /dev/null
+++ b/include/zephyr/portability/cmsis_types.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_CMSIS_TYPES_H_
+#define ZEPHYR_INCLUDE_CMSIS_TYPES_H_
+
+#include <stdbool.h>
+#include <zephyr/kernel.h>
+#include <zephyr/portability/cmsis_os2.h>
+
+/**
+ * @brief Control block for a CMSIS-RTOSv2 thread.
+ *
+ * Application can use manual user-defined allocation for RTOS objects by supplying a pointer to
+ * thread control block. Control block is initiazed within `osThreadNew()`.
+ */
+struct cmsis_rtos_thread_cb {
+	sys_dnode_t node;
+	struct k_thread z_thread;
+	struct k_poll_signal poll_signal;
+	struct k_poll_event poll_event;
+	uint32_t signal_results;
+	uint32_t attr_bits;
+};
+
+/**
+ * @brief Control block for a CMSIS-RTOSv2 timer.
+ *
+ * Application can use manual user-defined allocation for RTOS objects by supplying a pointer to
+ * timer control block. Control block is initiazed within `osTimerNew()`.
+ */
+struct cmsis_rtos_timer_cb {
+	struct k_timer z_timer;
+	osTimerType_t type;
+	uint32_t status;
+	bool is_cb_dynamic_allocation;
+	const char *name;
+	void (*callback_function)(void *argument);
+	void *arg;
+};
+
+/**
+ * @brief Control block for a CMSIS-RTOSv2 mutex.
+ *
+ * Application can use manual user-defined allocation for RTOS objects by supplying a pointer to
+ * mutex control block. Control block is initiazed within `osMutexNew()`.
+ */
+struct cmsis_rtos_mutex_cb {
+	struct k_mutex z_mutex;
+	bool is_cb_dynamic_allocation;
+	const char *name;
+	uint32_t state;
+};
+
+/**
+ * @brief Control block for a CMSIS-RTOSv2 semaphore.
+ *
+ * Application can use manual user-defined allocation for RTOS objects by supplying a pointer to
+ * semaphore control block. Control block is initiazed within `osSemaphoreNew()`.
+ */
+struct cmsis_rtos_semaphore_cb {
+	struct k_sem z_semaphore;
+	bool is_cb_dynamic_allocation;
+	const char *name;
+};
+
+/**
+ * @brief Control block for a CMSIS-RTOSv2 memory pool.
+ *
+ * Application can use manual user-defined allocation for RTOS objects by supplying a pointer to
+ * memory pool control block. Control block is initiazed within `osMemoryPoolNew()`.
+ */
+struct cmsis_rtos_mempool_cb {
+	struct k_mem_slab z_mslab;
+	void *pool;
+	char is_dynamic_allocation;
+	bool is_cb_dynamic_allocation;
+	const char *name;
+};
+
+/**
+ * @brief Control block for a CMSIS-RTOSv2 message queue.
+ *
+ * Application can use manual user-defined allocation for RTOS objects by supplying a pointer to
+ * message queue control block. Control block is initiazed within `osMessageQueueNew()`.
+ */
+struct cmsis_rtos_msgq_cb {
+	struct k_msgq z_msgq;
+	void *pool;
+	char is_dynamic_allocation;
+	bool is_cb_dynamic_allocation;
+	const char *name;
+};
+
+/**
+ * @brief Control block for a CMSIS-RTOSv2 event flag.
+ *
+ * Application can use manual user-defined allocation for RTOS objects by supplying a pointer to
+ * event flag control block. Control block is initiazed within `osEventFlagsNew()`.
+ */
+struct cmsis_rtos_event_cb {
+	struct k_poll_signal poll_signal;
+	struct k_poll_event poll_event;
+	uint32_t signal_results;
+	bool is_cb_dynamic_allocation;
+	const char *name;
+};
+
+#endif
diff --git a/include/zephyr/posix/signal.h b/include/zephyr/posix/signal.h
index 38c3be378ca90..827f1edff7ecd 100644
--- a/include/zephyr/posix/signal.h
+++ b/include/zephyr/posix/signal.h
@@ -122,9 +122,9 @@ unsigned int alarm(unsigned int seconds);
 int kill(pid_t pid, int sig);
 int pause(void);
 int raise(int signo);
-TOOLCHAIN_IGNORE_WSHADOW_BEGIN;
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_SHADOW);
 int sigaction(int sig, const struct sigaction *ZRESTRICT act, struct sigaction *ZRESTRICT oact);
-TOOLCHAIN_IGNORE_WSHADOW_END;
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_SHADOW);
 int sigpending(sigset_t *set);
 int sigsuspend(const sigset_t *sigmask);
 int sigwait(const sigset_t *ZRESTRICT set, int *ZRESTRICT signo);
diff --git a/include/zephyr/psa/key_ids.h b/include/zephyr/psa/key_ids.h
new file mode 100644
index 0000000000000..851d1349812d5
--- /dev/null
+++ b/include/zephyr/psa/key_ids.h
@@ -0,0 +1,51 @@
+/* Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_PSA_KEY_IDS_H_
+#define ZEPHYR_PSA_KEY_IDS_H_
+
+/**
+ * @file zephyr/psa/key_ids.h
+ *
+ * @brief This file defines the key ID ranges of the existing users of the PSA Crypto API.
+ *
+ * In addition to the application, different subsystems store and use persistent keys through the
+ * PSA Crypto API. Because they are not aware of each other, collisions are avoided by having them
+ * use different ID ranges.
+ * This file acts as the registry of all the allocated PSA key ID ranges within Zephyr.
+ *
+ * The end-user application also has a dedicated range, `ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN`.
+ *
+ * Some of the IDs below are based on previously existing and used values, while others
+ * are chosen to be somewhere in the PSA user key ID range to try to avoid collisions
+ * (avoiding, for example, the very beginning of the range).
+ */
+
+#include <stdint.h>
+typedef uint32_t psa_key_id_t;
+
+/** PSA key ID range to be used by OpenThread. The base ID is equal to the default value upstream:
+ *  https://github.com/openthread/openthread/blob/thread-reference-20230706/src/core/config/platform.h#L138
+ */
+#define ZEPHYR_PSA_OPENTHREAD_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x20000
+#define ZEPHYR_PSA_OPENTHREAD_KEY_ID_RANGE_SIZE  0x10000 /* 64 Ki */
+
+/** PSA key ID range to be used by Matter. The base ID is equal to the default value upstream:
+ * https://github.com/project-chip/connectedhomeip/blob/v1.4.0.0/src/crypto/CHIPCryptoPALPSA.h#L55
+ */
+#define ZEPHYR_PSA_MATTER_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x30000
+#define ZEPHYR_PSA_MATTER_KEY_ID_RANGE_SIZE  0x10000 /* 64 Ki */
+
+/** PSA key ID range to be used by Bluetooth Mesh. */
+#define ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x20000000
+#define ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_SIZE  0xC000 /* 48 Ki */
+
+/** PSA key ID range to be used by Wi-Fi credentials management. */
+#define ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x20010000
+#define ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_SIZE  0x100 /* 256 */
+
+/** PSA key ID range to be used by the end-user application. */
+#define ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN (psa_key_id_t)0x30000000
+#define ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_SIZE  0x100000 /* 1 Mi */
+
+#endif /* ZEPHYR_PSA_KEY_IDS_H_ */
diff --git a/include/zephyr/storage/flash_map.h b/include/zephyr/storage/flash_map.h
index a0d528acfb78d..d8ba414abd3d9 100644
--- a/include/zephyr/storage/flash_map.h
+++ b/include/zephyr/storage/flash_map.h
@@ -188,6 +188,28 @@ int flash_area_read(const struct flash_area *fa, off_t off, void *dst,
 int flash_area_write(const struct flash_area *fa, off_t off, const void *src,
 		     size_t len);
 
+/**
+ * @brief Copy flash memory from one flash area to another.
+ *
+ * Copy data to flash area. Area boundaries are asserted before copy
+ * request.
+ *
+ * For more information, see flash_copy().
+ *
+ * @param[in]  src_fa  Source Flash area
+ * @param[in]  src_off Offset relative from beginning of source flash area.
+ * @param[in]  dst_fa  Destination Flash area
+ * @param[in]  dst_off Offset relative from beginning of destination flash area.
+ * @param[in]  len Number of bytes to copy, in bytes.
+ * @param[out] buf Pointer to a buffer of size @a buf_size.
+ * @param[in]  buf_size Size of the buffer pointed to by @a buf.
+ *
+ * @return  0 on success, negative errno code on fail.
+ */
+int flash_area_copy(const struct flash_area *src_fa, off_t src_off,
+		    const struct flash_area *dst_fa, off_t dst_off,
+		    off_t len, uint8_t *buf, size_t buf_size);
+
 /**
  * @brief Erase flash area
  *
diff --git a/include/zephyr/sys/cbprintf_cxx.h b/include/zephyr/sys/cbprintf_cxx.h
index 75a2ba16ff40b..f58ca63697422 100644
--- a/include/zephyr/sys/cbprintf_cxx.h
+++ b/include/zephyr/sys/cbprintf_cxx.h
@@ -81,11 +81,10 @@ template < typename T >
 static inline int z_cbprintf_cxx_is_pchar(T arg, bool const_as_fixed)
 {
 	ARG_UNUSED(arg);
-	_Pragma("GCC diagnostic push")
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"")
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 	ARG_UNUSED(const_as_fixed);
 	return 0;
-	_Pragma("GCC diagnostic pop")
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 }
 
 /* C++ version for determining if variable type is numeric and fits in 32 bit word. */
@@ -133,10 +132,9 @@ template < typename T >
 static inline int z_cbprintf_cxx_is_word_num(T arg)
 {
 	ARG_UNUSED(arg);
-	_Pragma("GCC diagnostic push")
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"")
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 	return 0;
-	_Pragma("GCC diagnostic pop")
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 }
 
 /* C++ version for determining if argument is a none character pointer. */
diff --git a/include/zephyr/sys/cbprintf_internal.h b/include/zephyr/sys/cbprintf_internal.h
index b580eea87040d..0ae27ac34a109 100644
--- a/include/zephyr/sys/cbprintf_internal.h
+++ b/include/zephyr/sys/cbprintf_internal.h
@@ -82,6 +82,12 @@ extern "C" {
 #define Z_CBPRINTF_VA_STACK_LL_DBL_MEMCPY	0
 #endif
 
+/** Trick compiler to allow working with all types of arguments, including bitfields,
+ * opaque struct pointers. Alternative is to add + 0 but that requires suppressing
+ * compiler warning about pointer arithmetic and does not cover opaque structs.
+ */
+#define Z_ARGIFY(arg) ((0) ? (arg) : (arg))
+
 /** @brief Return 1 if argument is a pointer to char or wchar_t
  *
  * @param x argument.
@@ -94,7 +100,7 @@ extern "C" {
 #else
 /* NOLINTBEGIN(misc-redundant-expression) */
 #define Z_CBPRINTF_IS_PCHAR(x, flags) \
-	_Generic((x) + 0, \
+	_Generic(Z_ARGIFY(x), \
 		/* char * */ \
 		char * : 1, \
 		const char * : ((flags) & CBPRINTF_PACKAGE_CONST_CHAR_RO) ? 0 : 1, \
@@ -154,7 +160,7 @@ extern "C" {
 #define Z_CBPRINTF_IS_NONE_CHAR_PTR(x) z_cbprintf_cxx_is_none_char_ptr(x)
 #else
 #define Z_CBPRINTF_IS_NONE_CHAR_PTR(x) \
-	_Generic((x) + 0, \
+	_Generic(Z_ARGIFY(x), \
 		char * : 0, \
 		volatile char * : 0, \
 		const char * : 0, \
@@ -530,15 +536,12 @@ extern "C" {
  */
 #if Z_C_GENERIC
 #define Z_CBPRINTF_MUST_RUNTIME_PACKAGE(flags, ...) ({\
-	_Pragma("GCC diagnostic push") \
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"") \
 	int _rv; \
 	if ((flags) & CBPRINTF_PACKAGE_ADD_RW_STR_POS) { \
 		_rv = 0; \
 	} else { \
 		_rv = Z_CBPRINTF_PCHAR_COUNT(flags, __VA_ARGS__) > 0 ? 1 : 0; \
 	} \
-	_Pragma("GCC diagnostic pop")\
 	_rv; \
 })
 #else
@@ -559,7 +562,7 @@ extern "C" {
 #else
 #define Z_CONSTIFY(v) (_Generic((v), char * : (const char *)(uintptr_t)(v), default : (v)))
 #define Z_CBPRINTF_ARG_SIZE(v) ({\
-	__auto_type __v = (Z_CONSTIFY(v)) + 0; \
+	__auto_type __v = Z_ARGIFY(Z_CONSTIFY(v)); \
 	/* Static code analysis may complain about unused variable. */ \
 	(void)__v; \
 	size_t __arg_size = _Generic((v), \
@@ -583,9 +586,9 @@ extern "C" {
 #define Z_CBPRINTF_STORE_ARG(buf, arg) do { \
 	if (Z_CBPRINTF_VA_STACK_LL_DBL_MEMCPY) { \
 		/* If required, copy arguments by word to avoid unaligned access.*/ \
-		__auto_type _v = (Z_CONSTIFY(arg)) + 0; \
-		double _d = _Generic((arg) + 0, \
-				float : (arg) + 0, \
+		__auto_type _v = Z_ARGIFY(Z_CONSTIFY(arg)); \
+		double _d = _Generic(Z_ARGIFY(arg), \
+				float : Z_ARGIFY(arg), \
 				default : \
 					0.0); \
 		/* Static code analysis may complain about unused variable. */ \
@@ -594,10 +597,10 @@ extern "C" {
 		size_t arg_size = Z_CBPRINTF_ARG_SIZE(arg); \
 		size_t _wsize = arg_size / sizeof(int); \
 		z_cbprintf_wcpy((int *)(buf), \
-			      (int *) _Generic((arg) + 0, float : &_d, default : &_v), \
+			      (int *) _Generic(Z_ARGIFY(arg), float : &_d, default : &_v), \
 			      _wsize); \
 	} else { \
-		*_Generic((arg) + 0, \
+		*_Generic(Z_ARGIFY(arg), \
 			char : (int *)(buf), \
 			unsigned char: (int *)(buf), \
 			short : (int *)(buf), \
@@ -627,14 +630,14 @@ extern "C" {
 #define Z_CBPRINTF_ALIGNMENT(_arg) z_cbprintf_cxx_alignment(_arg)
 #else
 #define Z_CBPRINTF_ALIGNMENT(_arg) \
-	MAX(_Generic((_arg) + 0, \
+	MAX(_Generic(Z_ARGIFY(_arg), \
 		float : VA_STACK_ALIGN(double), \
 		double : VA_STACK_ALIGN(double), \
 		long double : VA_STACK_ALIGN(long double), \
 		long long : VA_STACK_ALIGN(long long), \
 		unsigned long long : VA_STACK_ALIGN(long long), \
 		default : \
-			__alignof__((_arg) + 0)), VA_STACK_MIN_ALIGN)
+			__alignof__(Z_ARGIFY(_arg))), VA_STACK_MIN_ALIGN)
 #endif
 
 /** @brief Detect long double variable as a constant expression.
@@ -655,7 +658,7 @@ extern "C" {
 #endif
 #else
 #define Z_CBPRINTF_IS_LONGDOUBLE(x) \
-	_Generic((x) + 0, long double : 1, default : 0)
+	_Generic(Z_ARGIFY(x), long double : 1, default : 0)
 #endif
 
 /** @brief Safely package arguments to a buffer.
@@ -722,18 +725,6 @@ do { \
 #define Z_CBPRINTF_PACK_ARG(arg_idx, arg) \
 	Z_CBPRINTF_PACK_ARG2(arg_idx, _pbuf, _pkg_len, _pkg_offset, _pmax, arg)
 
-/* When using clang additional warning needs to be suppressed since each
- * argument of fmt string is used for sizeof() which results in the warning
- * if argument is a string literal. Suppression is added here instead of
- * the macro which generates the warning to not slow down the compiler.
- */
-#ifdef __clang__
-#define Z_CBPRINTF_SUPPRESS_SIZEOF_ARRAY_DECAY \
-	_Pragma("GCC diagnostic ignored \"-Wsizeof-array-decay\"")
-#else
-#define Z_CBPRINTF_SUPPRESS_SIZEOF_ARRAY_DECAY
-#endif
-
 /* Allocation to avoid using VLA and alloca. Alloc frees space when leaving
  * a function which can lead to increased stack usage if logging is used
  * multiple times. VLA is not always available.
@@ -760,6 +751,17 @@ do { \
 		 _name##_buf32)))
 #endif
 
+/* On Xtensa the cbprintf_package_desc requires
+ * an additional alignment array. This creates an
+ * initial value to hush the compiler when compiling
+ * with C++.
+ */
+#if defined(CONFIG_XTENSA) && defined(__cplusplus)
+#define Z_CBPRINTF_XTENSA_PKG_DESC_PADDING_INITIALIZER .xtensa_padding = { },
+#else
+#define Z_CBPRINTF_XTENSA_PKG_DESC_PADDING_INITIALIZER
+#endif
+
 /** @brief Statically package a formatted string with arguments.
  *
  * @param buf buffer. If null then only length is calculated.
@@ -778,9 +780,6 @@ do { \
 #define Z_CBPRINTF_STATIC_PACKAGE_GENERIC(buf, _inlen, _outlen, _align_offset, \
 					  flags, ... /* fmt, ... */) \
 do { \
-	_Pragma("GCC diagnostic push") \
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"") \
-	Z_CBPRINTF_SUPPRESS_SIZEOF_ARRAY_DECAY \
 	BUILD_ASSERT(!IS_ENABLED(CONFIG_XTENSA) || \
 		     (IS_ENABLED(CONFIG_XTENSA) && \
 		      !((_align_offset) % CBPRINTF_PACKAGE_ALIGNMENT)), \
@@ -852,13 +851,13 @@ do { \
 				.str_cnt = 0, \
 				.ro_str_cnt = _ros_cnt, \
 				.rw_str_cnt = _rws_cnt, \
+				Z_CBPRINTF_XTENSA_PKG_DESC_PADDING_INITIALIZER \
 			} \
 		}; \
 		IF_ENABLED(CONFIG_CBPRINTF_PACKAGE_HEADER_STORE_CREATION_FLAGS, \
 			   (pkg_hdr.desc.pkg_flags = flags)); \
 		*_len_loc = pkg_hdr; \
 	} \
-	_Pragma("GCC diagnostic pop") \
 } while (false)
 
 #if Z_C_GENERIC
diff --git a/include/zephyr/sys/crc.h b/include/zephyr/sys/crc.h
index 7a0c33cf9b5c5..647d72929b209 100644
--- a/include/zephyr/sys/crc.h
+++ b/include/zephyr/sys/crc.h
@@ -5,6 +5,7 @@
  * Copyright (c) 2015 Runtime Inc
  * Copyright (c) 2018 Google LLC.
  * Copyright (c) 2022 Meta
+ * Copyright (c) 2024 Intercreate, Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -69,6 +70,7 @@ enum crc_type {
 	CRC24_PGP,   /**< Use @ref crc24_pgp */
 	CRC32_C,     /**< Use @ref crc32_c */
 	CRC32_IEEE,  /**< Use @ref crc32_ieee */
+	CRC32_K_4_2, /**< Use @ref crc32_k_4_2_update */
 };
 
 /**
@@ -263,6 +265,32 @@ uint32_t crc32_ieee_update(uint32_t crc, const uint8_t *data, size_t len);
 uint32_t crc32_c(uint32_t crc, const uint8_t *data,
 		 size_t len, bool first_pkt, bool last_pkt);
 
+/**
+ * @brief Update a CRC-32K/4.2 (*op) (Koopman) checksum. This is a good HD=4
+ * checksum up to 2,147,483,615 bits and HD=5/6 up to 6,167 bits.
+ *
+ * Hamming Distance and properties:
+ *
+ * - Polynomial: 0x93a409eb
+ * - reflect-in: false
+ * - initial value (xor-in): provided by caller as crc argument (0xFFFFFFFF is OK)
+ * - reflect-out: false
+ * - xor-out: 0
+ * - HD=4 @ 2,147,483,615 bits
+ * - HD=5 @ 6,167 bits
+ * - HD=6 @ 6,167 bits
+ * - HD=7 @ 148 bits
+ *
+ * Reference: https://users.ece.cmu.edu/~koopman/crc/crc32.html
+ *
+ * @param crc       CRC32 checksum that needs to be updated.
+ * @param data      Pointer to data on which the CRC should be calculated.
+ * @param len       Data length.
+ *
+ * @return CRC32 value.
+ */
+uint32_t crc32_k_4_2_update(uint32_t crc, const uint8_t *data, size_t len);
+
 /**
  * @brief Compute CCITT variant of CRC 8
  *
@@ -378,7 +406,7 @@ uint32_t crc24_pgp_update(uint32_t crc, const uint8_t *data, size_t len);
  * @param type CRC algorithm to use.
  * @param src Input bytes for the computation
  * @param len Length of the input in bytes
- * @param seed Value to seed the CRC with
+ * @param seed Seed or existing CRC value to update
  * @param poly The polynomial to use omitting the leading coefficient
  * @param reflect Should we use reflected/reversed values or not
  * @param first Whether this is the first packet in the stream.
@@ -425,6 +453,8 @@ static inline uint32_t crc_by_type(enum crc_type type, const uint8_t *src, size_
 		return crc32_c(seed, src, len, first, last);
 	case CRC32_IEEE:
 		return crc32_ieee_update(seed, src, len);
+	case CRC32_K_4_2:
+		return crc32_k_4_2_update(seed, src, len);
 	default:
 		break;
 	}
diff --git a/include/zephyr/sys/mutex.h b/include/zephyr/sys/mutex.h
index e34cc90d8d908..533374eb73b5e 100644
--- a/include/zephyr/sys/mutex.h
+++ b/include/zephyr/sys/mutex.h
@@ -35,7 +35,7 @@ struct sys_mutex {
 
 /**
  * @defgroup user_mutex_apis User mode mutex APIs
- * @ingroup kernel_apis
+ * @ingroup usermode_apis
  * @{
  */
 
diff --git a/include/zephyr/sys/notify.h b/include/zephyr/sys/notify.h
index 3eaeb9b9fc385..6086d2f5be21a 100644
--- a/include/zephyr/sys/notify.h
+++ b/include/zephyr/sys/notify.h
@@ -73,7 +73,7 @@ struct sys_notify;
 
 /**
  * @defgroup sys_notify_apis Asynchronous Notification APIs
- * @ingroup kernel_apis
+ * @ingroup os_services
  * @{
  */
 
diff --git a/include/zephyr/sys/onoff.h b/include/zephyr/sys/onoff.h
index 9a3d19aea251e..8330bb06fad32 100644
--- a/include/zephyr/sys/onoff.h
+++ b/include/zephyr/sys/onoff.h
@@ -18,7 +18,7 @@ extern "C" {
 
 /**
  * @defgroup resource_mgmt_onoff_apis On-Off Service APIs
- * @ingroup kernel_apis
+ * @ingroup os_services
  * @{
  */
 
diff --git a/include/zephyr/sys/ring_buffer.h b/include/zephyr/sys/ring_buffer.h
index e104fd5443e25..2c75cf1eb84d1 100644
--- a/include/zephyr/sys/ring_buffer.h
+++ b/include/zephyr/sys/ring_buffer.h
@@ -29,11 +29,17 @@ extern "C" {
 /* The limit is used by algorithm for distinguishing between empty and full
  * state.
  */
-#define RING_BUFFER_MAX_SIZE 0x80000000U
-#define RING_BUFFER_SIZE_ASSERT_MSG \
-	"Size too big"
+#ifdef CONFIG_RING_BUFFER_LARGE
+typedef uint32_t ring_buf_idx_t;
+#define RING_BUFFER_MAX_SIZE (UINT32_MAX / 2)
+#else
+typedef uint16_t ring_buf_idx_t;
+#define RING_BUFFER_MAX_SIZE (UINT16_MAX / 2)
+#endif
+
+#define RING_BUFFER_SIZE_ASSERT_MSG "Size too big"
 
-struct ring_buf_index { int32_t head, tail, base; };
+struct ring_buf_index { ring_buf_idx_t head, tail, base; };
 
 /** @endcond */
 
@@ -61,7 +67,7 @@ int ring_buf_area_finish(struct ring_buf *buf, struct ring_buf_index *ring,
  *
  * Any value other than 0 makes sense only in validation testing context.
  */
-static inline void ring_buf_internal_reset(struct ring_buf *buf, int32_t value)
+static inline void ring_buf_internal_reset(struct ring_buf *buf, ring_buf_idx_t value)
 {
 	buf->put.head = buf->put.tail = buf->put.base = value;
 	buf->get.head = buf->get.tail = buf->get.base = value;
@@ -90,7 +96,7 @@ static inline void ring_buf_internal_reset(struct ring_buf *buf, int32_t value)
  * @param size8 Size of ring buffer (in bytes).
  */
 #define RING_BUF_DECLARE(name, size8) \
-	BUILD_ASSERT(size8 < RING_BUFFER_MAX_SIZE,\
+	BUILD_ASSERT(size8 <= RING_BUFFER_MAX_SIZE,\
 		RING_BUFFER_SIZE_ASSERT_MSG); \
 	static uint8_t __noinit _ring_buffer_data_##name[size8]; \
 	struct ring_buf name = RING_BUF_INIT(_ring_buffer_data_##name, size8)
@@ -111,7 +117,7 @@ static inline void ring_buf_internal_reset(struct ring_buf *buf, int32_t value)
  * @param size32 Size of ring buffer (in 32-bit words).
  */
 #define RING_BUF_ITEM_DECLARE(name, size32) \
-	BUILD_ASSERT((size32) < RING_BUFFER_MAX_SIZE / 4,\
+	BUILD_ASSERT((size32) <= RING_BUFFER_MAX_SIZE / 4, \
 		RING_BUFFER_SIZE_ASSERT_MSG); \
 	static uint32_t __noinit _ring_buffer_data_##name[size32]; \
 	struct ring_buf name = { \
@@ -168,7 +174,7 @@ static inline void ring_buf_init(struct ring_buf *buf,
 				 uint32_t size,
 				 uint8_t *data)
 {
-	__ASSERT(size < RING_BUFFER_MAX_SIZE, RING_BUFFER_SIZE_ASSERT_MSG);
+	__ASSERT(size <= RING_BUFFER_MAX_SIZE, RING_BUFFER_SIZE_ASSERT_MSG);
 
 	buf->size = size;
 	buf->buffer = data;
@@ -192,7 +198,7 @@ static inline void ring_buf_item_init(struct ring_buf *buf,
 				      uint32_t size,
 				      uint32_t *data)
 {
-	__ASSERT(size < RING_BUFFER_MAX_SIZE / 4, RING_BUFFER_SIZE_ASSERT_MSG);
+	__ASSERT(size <= RING_BUFFER_MAX_SIZE / 4, RING_BUFFER_SIZE_ASSERT_MSG);
 	ring_buf_init(buf, 4 * size, (uint8_t *)data);
 }
 
@@ -203,7 +209,7 @@ static inline void ring_buf_item_init(struct ring_buf *buf,
  *
  * @return true if the ring buffer is empty, or false if not.
  */
-static inline bool ring_buf_is_empty(struct ring_buf *buf)
+static inline bool ring_buf_is_empty(const struct ring_buf *buf)
 {
 	return buf->get.head == buf->put.tail;
 }
@@ -225,9 +231,11 @@ static inline void ring_buf_reset(struct ring_buf *buf)
  *
  * @return Ring buffer free space (in bytes).
  */
-static inline uint32_t ring_buf_space_get(struct ring_buf *buf)
+static inline uint32_t ring_buf_space_get(const struct ring_buf *buf)
 {
-	return buf->size - (buf->put.head - buf->get.tail);
+	ring_buf_idx_t allocated = buf->put.head - buf->get.tail;
+
+	return buf->size - allocated;
 }
 
 /**
@@ -237,7 +245,7 @@ static inline uint32_t ring_buf_space_get(struct ring_buf *buf)
  *
  * @return Ring buffer free space (in 32-bit words).
  */
-static inline uint32_t ring_buf_item_space_get(struct ring_buf *buf)
+static inline uint32_t ring_buf_item_space_get(const struct ring_buf *buf)
 {
 	return ring_buf_space_get(buf) / 4;
 }
@@ -249,21 +257,23 @@ static inline uint32_t ring_buf_item_space_get(struct ring_buf *buf)
  *
  * @return Ring buffer capacity (in bytes).
  */
-static inline uint32_t ring_buf_capacity_get(struct ring_buf *buf)
+static inline uint32_t ring_buf_capacity_get(const struct ring_buf *buf)
 {
 	return buf->size;
 }
 
 /**
- * @brief Determine used space in a ring buffer.
+ * @brief Determine size of available data in a ring buffer.
  *
  * @param buf Address of ring buffer.
  *
- * @return Ring buffer space used (in bytes).
+ * @return Ring buffer data size (in bytes).
  */
-static inline uint32_t ring_buf_size_get(struct ring_buf *buf)
+static inline uint32_t ring_buf_size_get(const struct ring_buf *buf)
 {
-	return buf->put.tail - buf->get.head;
+	ring_buf_idx_t available = buf->put.tail - buf->get.head;
+
+	return available;
 }
 
 /**
diff --git a/include/zephyr/sys/sem.h b/include/zephyr/sys/sem.h
index 73e4d8737250c..16c6b33ba46cd 100644
--- a/include/zephyr/sys/sem.h
+++ b/include/zephyr/sys/sem.h
@@ -43,7 +43,7 @@ struct sys_sem {
 
 /**
  * @defgroup user_semaphore_apis User mode semaphore APIs
- * @ingroup kernel_apis
+ * @ingroup usermode_apis
  * @{
  */
 
diff --git a/include/zephyr/sys/sys_heap.h b/include/zephyr/sys/sys_heap.h
index 33d989576a5f2..86afd6df60fec 100644
--- a/include/zephyr/sys/sys_heap.h
+++ b/include/zephyr/sys/sys_heap.h
@@ -73,13 +73,11 @@ struct z_heap_stress_result {
  * @{
  */
 
-#ifdef CONFIG_SYS_HEAP_RUNTIME_STATS
-
 /**
  * @brief Get the runtime statistics of a sys_heap
  *
  * @param heap Pointer to specified sys_heap
- * @param stats_t Pointer to struct to copy statistics into
+ * @param stats Pointer to struct to copy statistics into
  * @return -EINVAL if null pointers, otherwise 0
  */
 int sys_heap_runtime_stats_get(struct sys_heap *heap,
@@ -96,8 +94,6 @@ int sys_heap_runtime_stats_get(struct sys_heap *heap,
  */
 int sys_heap_runtime_stats_reset_max(struct sys_heap *heap);
 
-#endif
-
 /** @brief Initialize sys_heap
  *
  * Initializes a sys_heap struct to manage the specified memory.
@@ -142,6 +138,18 @@ void *sys_heap_alloc(struct sys_heap *heap, size_t bytes);
  */
 void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes);
 
+/** @brief Allocate memory from a sys_heap
+ *
+ * This is a wrapper for sys_heap_alloc() whose purpose is to provide the same
+ * function signature as sys_heap_aligned_alloc().
+ *
+ * @param heap Heap from which to allocate
+ * @param align Ignored placeholder
+ * @param bytes Number of bytes requested
+ * @return Pointer to memory the caller can now use
+ */
+void *sys_heap_noalign_alloc(struct sys_heap *heap, size_t align, size_t bytes);
+
 /** @brief Free memory into a sys_heap
  *
  * De-allocates a pointer to memory previously returned from
@@ -171,6 +179,22 @@ void sys_heap_free(struct sys_heap *heap, void *mem);
  *
  * @param heap Heap from which to allocate
  * @param ptr Original pointer returned from a previous allocation
+ * @param bytes Number of bytes requested for the new block
+ * @return Pointer to memory the caller can now use, or NULL
+ */
+void *sys_heap_realloc(struct sys_heap *heap, void *ptr, size_t bytes);
+
+/** @brief Expand the size of an existing allocation
+ *
+ * Behaves in all ways like sys_heap_realloc(), except that the returned
+ * memory (if available) will have a starting address in memory which
+ * is a multiple of the specified power-of-two alignment value in
+ * bytes. In-place expansion will be attempted only if the provided memory
+ * pointer conforms to the specified alignment value otherwise the data will be
+ * moved to a new memory block.
+ *
+ * @param heap Heap from which to allocate
+ * @param ptr Original pointer returned from a previous allocation
  * @param align Alignment in bytes, must be a power of two
  * @param bytes Number of bytes requested for the new block
  * @return Pointer to memory the caller can now use, or NULL
@@ -178,9 +202,6 @@ void sys_heap_free(struct sys_heap *heap, void *mem);
 void *sys_heap_aligned_realloc(struct sys_heap *heap, void *ptr,
 			       size_t align, size_t bytes);
 
-#define sys_heap_realloc(heap, ptr, bytes) \
-	sys_heap_aligned_realloc(heap, ptr, 0, bytes)
-
 /** @brief Return allocated memory size
  *
  * Returns the size, in bytes, of a block returned from a successful
diff --git a/include/zephyr/sys/time_units.h b/include/zephyr/sys/time_units.h
index 46679fc33acf7..8f311d6f89960 100644
--- a/include/zephyr/sys/time_units.h
+++ b/include/zephyr/sys/time_units.h
@@ -52,11 +52,11 @@ extern "C" {
 /* Exhaustively enumerated, highly optimized time unit conversion API */
 
 #if defined(CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME)
-__syscall int sys_clock_hw_cycles_per_sec_runtime_get(void);
+__syscall unsigned int sys_clock_hw_cycles_per_sec_runtime_get(void);
 
-static inline int z_impl_sys_clock_hw_cycles_per_sec_runtime_get(void)
+static inline unsigned int z_impl_sys_clock_hw_cycles_per_sec_runtime_get(void)
 {
-	extern int z_clock_hw_cycles_per_sec;
+	extern unsigned int z_clock_hw_cycles_per_sec;
 
 	return z_clock_hw_cycles_per_sec;
 }
@@ -79,7 +79,7 @@ static inline int z_impl_sys_clock_hw_cycles_per_sec_runtime_get(void)
 #if defined(CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME)
 #define sys_clock_hw_cycles_per_sec() sys_clock_hw_cycles_per_sec_runtime_get()
 #else
-#define sys_clock_hw_cycles_per_sec() CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
+#define sys_clock_hw_cycles_per_sec() (uint32_t)CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
 #endif
 
 /** @internal
@@ -175,10 +175,10 @@ static inline int z_impl_sys_clock_hw_cycles_per_sec_runtime_get(void)
 #define z_tmcvt_int_div_32(__t, __from_hz, __to_hz, __round_up, __round_off) \
 	((uint64_t) (__t) <= 0xffffffffU -				\
 	 z_tmcvt_off_div(__from_hz, __to_hz, __round_up, __round_off) ?	\
-	 ((uint32_t)((__t) +						\
+	 ((uint32_t)(((__t) +						\
 		     z_tmcvt_off_div(__from_hz, __to_hz,		\
 				     __round_up, __round_off)) /	\
-	  z_tmcvt_divisor(__from_hz, __to_hz))				\
+	  z_tmcvt_divisor(__from_hz, __to_hz)))				\
 	 :								\
 	 (uint32_t) (((uint64_t) (__t) +				\
 		      z_tmcvt_off_div(__from_hz, __to_hz,		\
@@ -188,7 +188,7 @@ static inline int z_impl_sys_clock_hw_cycles_per_sec_runtime_get(void)
 
 /* Integer multiplication 32-bit conversion */
 #define z_tmcvt_int_mul_32(__t, __from_hz, __to_hz)	\
-	(uint32_t) (__t)*((__to_hz) / (__from_hz))
+	(uint32_t) ((__t)*((__to_hz) / (__from_hz)))
 
 /* General 32-bit conversion */
 #define z_tmcvt_gen_32(__t, __from_hz, __to_hz, __round_up, __round_off) \
diff --git a/include/zephyr/sys/util.h b/include/zephyr/sys/util.h
index 0e38acb4aae8e..150bad8737e29 100644
--- a/include/zephyr/sys/util.h
+++ b/include/zephyr/sys/util.h
@@ -28,6 +28,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
 /** @brief Number of bits that make up a type */
 #define NUM_BITS(t) (sizeof(t) * BITS_PER_BYTE)
@@ -783,6 +784,40 @@ static inline void mem_xor_128(uint8_t dst[16], const uint8_t src1[16], const ui
 	mem_xor_n(dst, src1, src2, 16);
 }
 
+/**
+ * @brief Compare memory areas. The same way as `memcmp` it assume areas to be
+ * the same length
+ *
+ * @param m1 First memory area to compare, cannot be NULL even if length is 0
+ * @param m2 Second memory area to compare, cannot be NULL even if length is 0
+ * @param n First n bytes of @p m1 and @p m2 to compares
+ *
+ * @returns true if the @p n first bytes of @p m1 and @p m2 are the same, else
+ * false
+ */
+static inline bool util_memeq(const void *m1, const void *m2, size_t n)
+{
+	return memcmp(m1, m2, n) == 0;
+}
+
+/**
+ * @brief Compare memory areas and their length
+ *
+ * If the length are 0, return true.
+ *
+ * @param m1 First memory area to compare, cannot be NULL even if length is 0
+ * @param len1 Length of the first memory area to compare
+ * @param m2 Second memory area to compare, cannot be NULL even if length is 0
+ * @param len2 Length of the second memory area to compare
+ *
+ * @returns true if both the length of the memory areas and their content are
+ * equal else false
+ */
+static inline bool util_eq(const void *m1, size_t len1, const void *m2, size_t len2)
+{
+	return len1 == len2 && (m1 == m2 || util_memeq(m1, m2, len1));
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/sys/uuid.h b/include/zephyr/sys/uuid.h
new file mode 100644
index 0000000000000..4283e7e60807c
--- /dev/null
+++ b/include/zephyr/sys/uuid.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2025, SECO Mind Srl
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_SYS_UUID_H_
+#define ZEPHYR_INCLUDE_SYS_UUID_H_
+
+/**
+ * @file
+ *
+ * @brief Utility functions for the generation and parsing of Universal Unique Identifier.
+ * @details This driver is compliant with RFC9562: https://datatracker.ietf.org/doc/rfc9562/
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup uuid UUID
+ * @since 4.0
+ * @version 0.1.0
+ * @ingroup utilities
+ * @{
+ */
+
+/** @brief Number of bytes in the binary representation of a UUID. */
+#define UUID_SIZE 16U
+
+/** @brief Length of the UUID canonical string representation, including the NULL terminator. */
+#define UUID_STR_LEN 37U
+
+/** @brief Length of the UUID base64 string representation, including the NULL terminator. */
+#define UUID_BASE64_LEN 25U
+
+/**
+ * @brief Length of the UUID base64 URL and filename safe string representation, including the
+ * NULL terminator.
+ */
+#define UUID_BASE64URL_LEN 23U
+
+/** @brief Binary representation of a UUID. */
+struct uuid {
+	/** @cond INTERNAL_HIDDEN */
+	uint8_t val[UUID_SIZE];
+	/** @endcond */
+};
+
+/**
+ * @brief Generate a UUIDv4.
+ *
+ * @param out The UUID where the result will be written.
+ *
+ * @retval 0 The UUID has been correctly generated and stored in @p out
+ * @retval -EINVAL @p out is not acceptable
+ */
+int uuid_generate_v4(struct uuid *out);
+
+/**
+ * @brief Generate a UUIDv5.
+ *
+ * @details This function computes a deterministic UUID starting from a namespace UUID and binary
+ * data.
+ *
+ * @param namespace A pointer to an UUID to be used as namespace.
+ * @param data A pointer to the data that will be hashed to produce the UUID.
+ * @param data_size The size of the data buffer.
+ * @param out The UUID where the result will be written.
+ *
+ * @retval 0 The UUID has been correctly generated and stored in @p out
+ * @retval -EINVAL @p out is not acceptable
+ * @retval -ENOMEM Memory allocation failed
+ * @retval -ENOTSUP mbedTLS returned an unrecognized error
+ */
+int uuid_generate_v5(const struct uuid *namespace, const void *data, size_t data_size,
+		     struct uuid *out);
+
+/**
+ * @brief Copy an UUID into another UUID.
+ *
+ * @param data Input data to copy.
+ * @param out Destination for the copy.
+ *
+ * @retval 0 The UUID has been correctly copied in @p dst
+ * @retval -EINVAL @p dst is not acceptable
+ */
+int uuid_copy(const struct uuid *data, struct uuid *out);
+
+/**
+ * @brief Create a uuid_t from a binary (big-endian) formatted UUID.
+ *
+ * @param data The buffer where the binary UUID is stored in a big-endian order.
+ * @param out The UUID where the result will be written.
+ *
+ * @retval 0 The UUID has been correctly parsed and stored in @p out
+ * @retval -EINVAL @p data or @p out are not acceptable
+ */
+int uuid_from_buffer(const uint8_t data[UUID_SIZE], struct uuid *out);
+
+/**
+ * @brief Parse a UUID from its canonical (RFC9562) string representation.
+ *
+ * @param data A pointer to the string to be parsed.
+ * @param out The UUID where the result will be written.
+ *
+ * @retval 0 The UUID has been correctly parsed and stored in @p out
+ * @retval -EINVAL @p input or @p out are not acceptable
+ */
+int uuid_from_string(const char data[UUID_STR_LEN], struct uuid *out);
+
+/**
+ * @brief Create a uuid_t from a binary (big-endian) formatted UUID.
+ *
+ * @param data The input UUID to store in the buffer.
+ * @param out The buffer where the binary UUID is stored in a big-endian order.
+ *
+ * @retval 0 The UUID has been correctly parsed and stored in @p buff
+ * @retval -EINVAL @p buff is not acceptable
+ */
+int uuid_to_buffer(const struct uuid *data, uint8_t out[UUID_SIZE]);
+
+/**
+ * @brief Convert a UUID to its canonical (RFC9562) string representation.
+ *
+ * @param data The UUID to convert to string.
+ * @param out A pointer to a previously allocated buffer where the result will be written.
+ *
+ * @retval 0 The UUID has been converted and written in @p out
+ * @retval -EINVAL @p out is not acceptable
+ */
+int uuid_to_string(const struct uuid *data, char out[UUID_STR_LEN]);
+
+/**
+ * @brief Convert a UUID to its base 64 (RFC 3548, RFC 4648) string representation.
+ *
+ * @param data The UUID to convert to string.
+ * @param out A pointer to a previously allocated buffer where the result will be written.
+ *
+ * @retval 0 The UUID has been converted and written in @p out
+ * @retval -EINVAL @p out is not acceptable
+ */
+int uuid_to_base64(const struct uuid *data, char out[UUID_BASE64_LEN]);
+
+/**
+ * @brief Convert a UUID to its base 64 (RFC 4648 sec. 5) URL and filename safe string
+ * representation.
+ *
+ * @param data The UUID to convert to string.
+ * @param out A pointer to a previously allocated buffer where the result will be written.
+ *
+ * @retval 0 The UUID has been converted and written in @p out
+ * @retval -EINVAL @p out is not acceptable
+ */
+int uuid_to_base64url(const struct uuid *data, char out[UUID_BASE64URL_LEN]);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_SYS_UUID_H_ */
diff --git a/include/zephyr/sys_clock.h b/include/zephyr/sys_clock.h
index 105d91a1545af..6c3589a510283 100644
--- a/include/zephyr/sys_clock.h
+++ b/include/zephyr/sys_clock.h
@@ -79,7 +79,7 @@ typedef struct {
  */
 #define K_TIMEOUT_EQ(a, b) ((a).ticks == (b).ticks)
 
-/** number of nanoseconds per micorsecond */
+/** number of nanoseconds per microsecond */
 #define NSEC_PER_USEC 1000U
 
 /** number of nanoseconds per millisecond */
@@ -149,16 +149,24 @@ typedef struct {
  */
 #define Z_TICK_ABS(t) (K_TICKS_FOREVER - 1 - (t))
 
+/* Test for relative timeout */
+#if CONFIG_TIMEOUT_64BIT
+#define Z_IS_TIMEOUT_RELATIVE(timeout)  (Z_TICK_ABS((timeout).ticks) < 0)
+#else
+#define Z_IS_TIMEOUT_RELATIVE(timeout)  true
+#endif
+
 /* added tick needed to account for tick in progress */
 #define _TICK_ALIGN 1
 
 /** @endcond */
 
+#ifndef CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME
 #if defined(CONFIG_SYS_CLOCK_EXISTS) && \
 	(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC == 0)
 #error "SYS_CLOCK_HW_CYCLES_PER_SEC must be non-zero!"
 #endif
-
+#endif /* CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME */
 
 /* kernel clocks */
 
diff --git a/include/zephyr/task_wdt/task_wdt.h b/include/zephyr/task_wdt/task_wdt.h
index 91cc979850571..dfeede4963a8b 100644
--- a/include/zephyr/task_wdt/task_wdt.h
+++ b/include/zephyr/task_wdt/task_wdt.h
@@ -102,6 +102,28 @@ int task_wdt_delete(int channel_id);
  */
 int task_wdt_feed(int channel_id);
 
+/**
+ * @brief Pause all channels before changing system power mode.
+ *
+ * Stop the internal timer and feed the hardware watchdog a last time
+ * (if enabled). It is expected that the system enters a low-power
+ * mode quite fast after this call.
+ *
+ * @note To pause the hardware watchdog (if this is supported),
+ * enable @kconfig{CONFIG_TASK_WDT_HW_FALLBACK_PAUSE_IN_SLEEP} in your
+ * configuration.
+ */
+void task_wdt_suspend(void);
+
+/**
+ * @brief Resume all channels execution.
+ *
+ * Resume the internal timer and feed all channels. Also feed the hardware
+ * watchdog (if enabled) to let enough time to the application to resume
+ * feeding the channels by itself.
+ */
+void task_wdt_resume(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/zephyr/toolchain.h b/include/zephyr/toolchain.h
index f8df4915736c6..6fca58a7b2ff9 100644
--- a/include/zephyr/toolchain.h
+++ b/include/zephyr/toolchain.h
@@ -44,6 +44,8 @@
 #include <zephyr/toolchain/mwdt.h>
 #elif defined(__ARMCOMPILER_VERSION)
 #include <zephyr/toolchain/armclang.h>
+#elif defined(__IAR_SYSTEMS_ICC__)
+#include <zephyr/toolchain/iar.h>
 #elif defined(__llvm__) || (defined(_LINKER) && defined(__LLD_LINKER_CMD__))
 #include <zephyr/toolchain/llvm.h>
 #elif defined(__GNUC__) || (defined(_LINKER) && defined(__GCC_LINKER_CMD__))
@@ -124,25 +126,196 @@
 #endif
 
 /**
- * @def TOOLCHAIN_IGNORE_WSHADOW_BEGIN
- * @brief Begin of block to ignore -Wshadow.
+ * @def TOOLCHAIN_PRAGMA
+ * @brief Helper for using pragma in macros.
+ */
+#ifdef TOOLCHAIN_HAS_PRAGMA_DIAG
+#define TOOLCHAIN_PRAGMA(x) _Pragma(#x)
+#else
+#define TOOLCHAIN_PRAGMA(x)
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER
+ * @brief Toolchain-specific warning for taking the address of a packed member.
  *
- * To be used inside another macro.
- * Only for toolchain supporting _Pragma("GCC diagnostic ...").
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER
+#define TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_ARRAY_BOUNDS
+ * @brief Toolchain-specific warning for array bounds violations.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_ARRAY_BOUNDS
+#define TOOLCHAIN_WARNING_ARRAY_BOUNDS
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_ATTRIBUTES
+ * @brief Toolchain-specific warning for unknown attributes.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_ATTRIBUTES
+#define TOOLCHAIN_WARNING_ATTRIBUTES
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR
+ * @brief Toolchain-specific warning for deleting a pointer to an object
+ * with a non-virtual destructor.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR
+#define TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_EXTRA
+ * @brief Toolchain-specific warning for extra warnings.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_EXTRA
+#define TOOLCHAIN_WARNING_EXTRA
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_NONNULL
+ * @brief Toolchain-specific warning for null pointer arguments to functions marked with "nonnull".
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_NONNULL
+#define TOOLCHAIN_WARNING_NONNULL
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_POINTER_ARITH
+ * @brief Toolchain-specific warning for pointer arithmetic.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_POINTER_ARITH
+#define TOOLCHAIN_WARNING_POINTER_ARITH
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_SHADOW
+ * @brief Toolchain-specific warning for shadow variables.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_SHADOW
+#define TOOLCHAIN_WARNING_SHADOW
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_UNUSED_LABEL
+ * @brief Toolchain-specific warning for unused labels.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_UNUSED_LABEL
+#define TOOLCHAIN_WARNING_UNUSED_LABEL
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_UNUSED_VARIABLE
+ * @brief Toolchain-specific warning for unused variables.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_UNUSED_VARIABLE
+#define TOOLCHAIN_WARNING_UNUSED_VARIABLE
+#endif
+
+/**
+ * @def TOOLCHAIN_DISABLE_WARNING
+ * @brief Disable the specified compiler warning for all compilers.
+ */
+#ifndef TOOLCHAIN_DISABLE_WARNING
+#define TOOLCHAIN_DISABLE_WARNING(warning)
+#endif
+
+/**
+ * @def TOOLCHAIN_ENABLE_WARNING
+ * @brief Re-enable the specified compiler warning for all compilers.
+ *
+ * Can only be used after a call to @ref TOOLCHAIN_DISABLE_WARNING.
+ */
+#ifndef TOOLCHAIN_ENABLE_WARNING
+#define TOOLCHAIN_ENABLE_WARNING(warning)
+#endif
+
+/**
+ * @def TOOLCHAIN_DISABLE_CLANG_WARNING
+ * @brief Disable the specified compiler warning for clang.
+ */
+#ifndef TOOLCHAIN_DISABLE_CLANG_WARNING
+#define TOOLCHAIN_DISABLE_CLANG_WARNING(warning)
+#endif
+
+/**
+ * @def TOOLCHAIN_ENABLE_CLANG_WARNING
+ * @brief Re-enable the specified compiler warning for clang.
+ *
+ * Can only be used after a call to @ref TOOLCHAIN_DISABLE_CLANG_WARNING.
+ */
+#ifndef TOOLCHAIN_ENABLE_CLANG_WARNING
+#define TOOLCHAIN_ENABLE_CLANG_WARNING(warning)
+#endif
+
+/**
+ * @def TOOLCHAIN_DISABLE_GCC_WARNING
+ * @brief Disable the specified compiler warning for gcc.
+ */
+#ifndef TOOLCHAIN_DISABLE_GCC_WARNING
+#define TOOLCHAIN_DISABLE_GCC_WARNING(warning)
+#endif
+
+/**
+ * @def TOOLCHAIN_ENABLE_GCC_WARNING
+ * @brief Re-enable the specified compiler warning for gcc.
+ *
+ * Can only be used after a call to @ref TOOLCHAIN_DISABLE_GCC_WARNING.
+ */
+#ifndef TOOLCHAIN_ENABLE_GCC_WARNING
+#define TOOLCHAIN_ENABLE_GCC_WARNING(warning)
+#endif
+
+/**
+ * @def TOOLCHAIN_DISABLE_IAR_WARNING
+ * @brief Disable the specified compiler warning for IAR compilers.
  */
-#ifndef TOOLCHAIN_IGNORE_WSHADOW_BEGIN
-#define TOOLCHAIN_IGNORE_WSHADOW_BEGIN
+#ifndef TOOLCHAIN_DISABLE_IAR_WARNING
+#define TOOLCHAIN_DISABLE_IAR_WARNING(warning)
 #endif
 
 /**
- * @def TOOLCHAIN_IGNORE_WSHADOW_END
- * @brief End of block to ignore -Wshadow.
+ * @def TOOLCHAIN_ENABLE_IAR_WARNING
+ * @brief Re-enable the specified compiler warning for IAR compilers.
  *
- * To be used inside another macro.
- * Only for toolchain supporting _Pragma("GCC diagnostic ...").
+ * Can only be used after a call to @ref TOOLCHAIN_DISABLE_IAR_WARNING.
  */
-#ifndef TOOLCHAIN_IGNORE_WSHADOW_END
-#define TOOLCHAIN_IGNORE_WSHADOW_END
+#ifndef TOOLCHAIN_ENABLE_IAR_WARNING
+#define TOOLCHAIN_ENABLE_IAR_WARNING(warning)
 #endif
 
 /*
diff --git a/include/zephyr/toolchain/common.h b/include/zephyr/toolchain/common.h
index c84328365fd3b..ff9291d88d797 100644
--- a/include/zephyr/toolchain/common.h
+++ b/include/zephyr/toolchain/common.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010-2014 Wind River Systems, Inc.
+ * Copyright (c) 2025 Siemens AG
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -60,6 +61,37 @@
   #define SECTION .section
 #endif
 
+/*
+ * General directive for assembly code, to align the following symbol, in bytes.
+ *
+ * Example:
+ *
+ *    ALIGN(4)
+ *    test_symbol:
+ *
+ * 'test_symbol' will get aligned to 4 bytes.
+ */
+
+#if defined(_ASMLANGUAGE) && !defined(_LINKER)
+
+  #if defined(CONFIG_X86) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || \
+	defined(CONFIG_NIOS2) || defined(CONFIG_RISCV) || \
+	defined(CONFIG_XTENSA) || defined(CONFIG_MIPS) || \
+	defined(CONFIG_ARCH_POSIX)
+    #define   ALIGN(x)    .balign   x
+  #elif defined(CONFIG_ARC)
+    /* .align assembler directive is supported by all ARC toolchains and it is
+     * implemented in the same way across ARC toolchains.
+     */
+    #define   ALIGN(x)    .align    x
+  #elif defined(CONFIG_SPARC)
+    #define   ALIGN(x)    .align    x
+  #else
+    #error Architecture unsupported
+  #endif
+
+#endif /* defined(_ASMLANGUAGE) && !defined(_LINKER) */
+
 /*
  * If the project is being built for speed (i.e. not for minimum size) then
  * align functions and branches in executable sections to improve performance.
diff --git a/include/zephyr/toolchain/gcc.h b/include/zephyr/toolchain/gcc.h
index dbff83e8bbdae..3d63cda20c05b 100644
--- a/include/zephyr/toolchain/gcc.h
+++ b/include/zephyr/toolchain/gcc.h
@@ -679,12 +679,36 @@ do {                                                                    \
 #define FUNC_NO_STACK_PROTECTOR
 #endif
 
-#define TOOLCHAIN_IGNORE_WSHADOW_BEGIN \
-	_Pragma("GCC diagnostic push") \
-	_Pragma("GCC diagnostic ignored \"-Wshadow\"")
+#endif /* !_LINKER */
 
-#define TOOLCHAIN_IGNORE_WSHADOW_END \
-	_Pragma("GCC diagnostic pop")
+#define TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER "-Waddress-of-packed-member"
+#define TOOLCHAIN_WARNING_ARRAY_BOUNDS             "-Warray-bounds"
+#define TOOLCHAIN_WARNING_ATTRIBUTES               "-Wattributes"
+#define TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR  "-Wdelete-non-virtual-dtor"
+#define TOOLCHAIN_WARNING_EXTRA                    "-Wextra"
+#define TOOLCHAIN_WARNING_NONNULL                  "-Wnonnull"
+#define TOOLCHAIN_WARNING_SHADOW                   "-Wshadow"
+#define TOOLCHAIN_WARNING_UNUSED_LABEL             "-Wunused-label"
+#define TOOLCHAIN_WARNING_UNUSED_VARIABLE          "-Wunused-variable"
+
+/* GCC-specific warnings that aren't in clang. */
+#if defined(__GNUC__) && !defined(__clang__)
+#define TOOLCHAIN_WARNING_POINTER_ARITH     "-Wpointer-arith"
+#define TOOLCHAIN_WARNING_STRINGOP_OVERREAD "-Wstringop-overread"
+#endif
+
+#define _TOOLCHAIN_DISABLE_WARNING(compiler, warning)                                              \
+	TOOLCHAIN_PRAGMA(compiler diagnostic push)                                                 \
+	TOOLCHAIN_PRAGMA(compiler diagnostic ignored warning)
+
+#define _TOOLCHAIN_ENABLE_WARNING(compiler, warning) TOOLCHAIN_PRAGMA(compiler diagnostic pop)
+
+#define TOOLCHAIN_DISABLE_WARNING(warning) _TOOLCHAIN_DISABLE_WARNING(GCC, warning)
+#define TOOLCHAIN_ENABLE_WARNING(warning) _TOOLCHAIN_ENABLE_WARNING(GCC, warning)
+
+#if defined(__GNUC__) && !defined(__clang__)
+#define TOOLCHAIN_DISABLE_GCC_WARNING(warning) _TOOLCHAIN_DISABLE_WARNING(GCC, warning)
+#define TOOLCHAIN_ENABLE_GCC_WARNING(warning)  _TOOLCHAIN_ENABLE_WARNING(GCC, warning)
+#endif
 
-#endif /* !_LINKER */
 #endif /* ZEPHYR_INCLUDE_TOOLCHAIN_GCC_H_ */
diff --git a/include/zephyr/toolchain/iar.h b/include/zephyr/toolchain/iar.h
new file mode 100644
index 0000000000000..916a6ed772489
--- /dev/null
+++ b/include/zephyr/toolchain/iar.h
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_TOOLCHAIN_IAR_H_
+#define ZEPHYR_INCLUDE_TOOLCHAIN_IAR_H_
+
+#define TOOLCHAIN_HAS_PRAGMA_DIAG
+
+#define _TOOLCHAIN_DISABLE_WARNING(warning) TOOLCHAIN_PRAGMA(diag_suppress = warning)
+#define _TOOLCHAIN_ENABLE_WARNING(warning)  TOOLCHAIN_PRAGMA(diag_default = warning)
+
+#define TOOLCHAIN_DISABLE_WARNING(warning) _TOOLCHAIN_DISABLE_WARNING(warning)
+#define TOOLCHAIN_ENABLE_WARNING(warning)  _TOOLCHAIN_ENABLE_WARNING(warning)
+
+#define TOOLCHAIN_DISABLE_IAR_WARNING(warning) _TOOLCHAIN_DISABLE_WARNING(warning)
+#define TOOLCHAIN_ENABLE_IAR_WARNING(warning)  _TOOLCHAIN_ENABLE_WARNING(warning)
+
+/* Generic warnings */
+
+
+/**
+ * @def TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER
+ * @brief Toolchain-specific warning for taking the address of a packed member.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER
+#define TOOLCHAIN_WARNING_ADDRESS_OF_PACKED_MEMBER Pe001
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_ARRAY_BOUNDS
+ * @brief Toolchain-specific warning for array bounds violations.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_ARRAY_BOUNDS
+#define TOOLCHAIN_WARNING_ARRAY_BOUNDS Pe001
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_ATTRIBUTES
+ * @brief Toolchain-specific warning for unknown attributes.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_ATTRIBUTES
+#define TOOLCHAIN_WARNING_ATTRIBUTES Pe1097
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR
+ * @brief Toolchain-specific warning for deleting a pointer to an object
+ * with a non-virtual destructor.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR
+#define TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR Pe001
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_EXTRA
+ * @brief Toolchain-specific warning for extra warnings.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_EXTRA
+#define TOOLCHAIN_WARNING_EXTRA Pe001
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_NONNULL
+ * @brief Toolchain-specific warning for null pointer arguments to functions marked with "nonnull".
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_NONNULL
+#define TOOLCHAIN_WARNING_NONNULL Pe001
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_POINTER_ARITH
+ * @brief Toolchain-specific warning for pointer arithmetic.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_POINTER_ARITH
+#define TOOLCHAIN_WARNING_POINTER_ARITH Pe1143
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_SHADOW
+ * @brief Toolchain-specific warning for shadow variables.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_SHADOW
+#define TOOLCHAIN_WARNING_SHADOW Pe001
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_UNUSED_LABEL
+ * @brief Toolchain-specific warning for unused labels.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_UNUSED_LABEL
+#define TOOLCHAIN_WARNING_UNUSED_LABEL Pe001
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_UNUSED_VARIABLE
+ * @brief Toolchain-specific warning for unused variables.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#define TOOLCHAIN_WARNING_UNUSED_VARIABLE Pe001
+
+#define TOOLCHAIN_WARNING_UNUSED_FUNCTION Pe001
+
+#ifdef __ICCARM__
+#include "iar/iccarm.h"
+#endif
+#ifdef __ICCRISCV__
+#include "iar/iccriscv.h"
+#endif
+
+#endif /* ZEPHYR_INCLUDE_TOOLCHAIN_ICCARM_H_ */
diff --git a/include/zephyr/toolchain/iar/iar_missing_defs.h b/include/zephyr/toolchain/iar/iar_missing_defs.h
new file mode 100644
index 0000000000000..44541adaccd53
--- /dev/null
+++ b/include/zephyr/toolchain/iar/iar_missing_defs.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Basic macro definitions that gcc and clang provide on their own
+ * but that iccarm lacks. Only those that Zephyr requires are provided here.
+ */
+
+#ifndef ZEPHYR_INCLUDE_TOOLCHAIN_ICCARM_MISSING_DEFS_H_
+#define ZEPHYR_INCLUDE_TOOLCHAIN_ICCARM_MISSING_DEFS_H_
+
+ /* We need to define NULL with a parenthesis around _NULL
+  * otherwise the DEBRACE macros won't work correctly
+  */
+
+#undef NULL
+#define NULL   (_NULL)
+
+#if defined(__IAR_SYSTEMS_ICC__)
+#ifndef __CHAR_BIT__
+#define __CHAR_BIT__ __CHAR_BITS__
+#endif
+#define __SCHAR_MAX__ __SIGNED_CHAR_MAX__
+
+#define __INT_MAX__    __SIGNED_INT_MAX__
+#define __INT_WIDTH__ (__INT_SIZE__*8)
+#define __SIZEOF_INT__ __INT_SIZE__
+
+#define __SHRT_MAX__     __SIGNED_SHORT_MAX__
+#define __SHRT_WIDTH__  (__SHORT_SIZE__*8)
+#define __SIZEOF_SHORT__ __SHORT_SIZE__
+
+#define __LONG_MAX__    __SIGNED_LONG_MAX__
+#define __LONG_WIDTH__ (__LONG_SIZE__*8)
+#define __SIZEOF_LONG__ __LONG_SIZE__
+
+#define __LONG_LONG_MAX__    __SIGNED_LONG_LONG_MAX__
+#define __LONG_LONG_WIDTH__ (__LONG_LONG_SIZE__*8)
+#define __SIZEOF_LONG_LONG__ __LONG_LONG_SIZE__
+
+#define __INTMAX_MAX__     __INTMAX_T_MAX__
+#define __SIZEOF_INTMAX__  sizeof(__INTMAX_T_TYPE__)
+#define __INTMAX_WIDTH__   (__SIZEOF_INTMAX__*8)
+#define __UINTMAX_MAX__    __UINTMAX_T_MAX__
+#define __SIZEOF_UINTMAX__ sizeof(__UINTMAX_T_TYPE__)
+#define __UINTMAX_WIDTH__  (__SIZEOF_UINTMAX__*8)
+
+#define __INTPTR_MAX__     __INTPTR_T_MAX__
+#define __INTPTR_TYPE__    __INTPTR_T_TYPE__
+#define __INTPTR_WIDTH__  (__INTPTR_T_SIZE__*8)
+#define __SIZEOF_POINTER__ __INTPTR_T_SIZE__
+
+#define __PTRDIFF_MAX__      __PTRDIFF_T_MAX__
+#define __PTRDIFF_WIDTH__   (__PTRDIFF_T_SIZE__*8)
+#define __SIZEOF_PTRDIFF_T__ __PTRDIFF_T_SIZE__
+
+#define __UINTPTR_MAX__  __UINTPTR_T_MAX__
+#define __UINTPTR_TYPE__ __UINTPTR_T_TYPE__
+
+/*
+ * ICCARM already defines __SIZE_T_MAX__ as "unsigned int" but there is no way
+ * to safeguard that here with preprocessor equality.
+ */
+
+#define __SIZE_TYPE__   __SIZE_T_TYPE__
+#define __SIZE_MAX__    __SIZE_T_MAX__
+#define __SIZE_WIDTH__ ((__SIZEOF_SIZE_T__)*8)
+/* #define __SIZEOF_SIZE_T__ 4 */
+
+/*
+ * The following defines are inferred from the ICCARM provided defines
+ * already tested above.
+ */
+
+
+#define __INT8_MAX__  __INT8_T_MAX__
+#define __INT8_TYPE__ __INT8_T_TYPE__
+
+#define __UINT8_MAX__  __UINT8_T_MAX__
+#define __UINT8_TYPE__ __UINT8_T_TYPE__
+
+#define __INT16_MAX__  __INT16_T_MAX__
+#define __INT16_TYPE__ __INT16_T_TYPE__
+
+#define __UINT16_MAX__  __UINT16_T_MAX__
+#define __UINT16_TYPE__ __UINT16_T_TYPE__
+
+#define __INT32_MAX__  __INT32_T_MAX__
+#define __INT32_TYPE__ __INT32_T_TYPE__
+
+#define __UINT32_MAX__  __UINT32_T_MAX__
+#define __UINT32_TYPE__ __UINT32_T_TYPE__
+
+#define __INT64_MAX__  __INT64_T_MAX__
+#define __INT64_TYPE__ __INT64_T_TYPE__
+
+#define __UINT64_MAX__  __UINT64_T_MAX__
+#define __UINT64_TYPE__ __UINT64_T_TYPE__
+
+#define __INT_FAST8_MAX__    __INT_FAST8_T_MAX__
+#define __INT_FAST8_TYPE__   __INT_FAST8_T_TYPE__
+#define __INT_FAST8_WIDTH__ (__INT_FAST8_T_SIZE__*8)
+
+#define __INT_FAST16_MAX__    __INT_FAST16_T_MAX__
+#define __INT_FAST16_TYPE__   __INT_FAST16_T_TYPE__
+#define __INT_FAST16_WIDTH__ (__INT_FAST16_T_SIZE__*8)
+
+#define __INT_FAST32_MAX__    __INT_FAST32_T_MAX__
+#define __INT_FAST32_TYPE__   __INT_FAST32_T_TYPE__
+#define __INT_FAST32_WIDTH__ (__INT_FAST32_T_SIZE__*8)
+
+#define __INT_FAST64_MAX__    __INT_FAST64_T_MAX__
+#define __INT_FAST64_TYPE__   __INT_FAST64_T_TYPE__
+#define __INT_FAST64_WIDTH__ (__INT_FAST64_T_SIZE__*8)
+
+#define __INT_LEAST8_MAX__    __INT_LEAST8_T_MAX__
+#define __INT_LEAST8_TYPE__   __INT_LEAST8_T_TYPE__
+#define __INT_LEAST8_WIDTH__ (__INT_LEAST8_T_SIZE__*8)
+
+#define __INT_LEAST16_MAX__    __INT_LEAST16_T_MAX__
+#define __INT_LEAST16_TYPE__   __INT_LEAST16_T_TYPE__
+#define __INT_LEAST16_WIDTH__ (__INT_LEAST16_T_SIZE__*8)
+
+#define __INT_LEAST32_MAX__    __INT_LEAST32_T_MAX__
+#define __INT_LEAST32_TYPE__   __INT_LEAST32_T_TYPE__
+#define __INT_LEAST32_WIDTH__ (__INT_LEAST32_T_SIZE__*8)
+
+#define __INT_LEAST64_MAX__    __INT_LEAST64_T_MAX__
+#define __INT_LEAST64_TYPE__   __INT_LEAST64_T_TYPE__
+#define __INT_LEAST64_WIDTH__ (__INT_LEAST64_T_SIZE__*8)
+
+#define __UINT_FAST8_MAX__  __UINT_FAST8_T_MAX__
+#define __UINT_FAST8_TYPE__ __UINT_FAST8_T_TYPE__
+
+#define __UINT_FAST16_MAX__  __UINT_FAST16_T_MAX__
+#define __UINT_FAST16_TYPE__ __UINT_FAST16_T_TYPE__
+
+#define __UINT_FAST32_MAX__  __UINT_FAST32_T_MAX__
+#define __UINT_FAST32_TYPE__ __UINT_FAST32_T_TYPE__
+
+#define __UINT_FAST64_MAX__  __UINT_FAST64_T_MAX__
+#define __UINT_FAST64_TYPE__ __UINT_FAST64_T_TYPE__
+
+#define __UINT_LEAST8_MAX__  __UINT_LEAST8_T_MAX__
+#define __UINT_LEAST8_TYPE__ __UINT_LEAST8_T_TYPE__
+
+#define __UINT_LEAST16_MAX__  __UINT_LEAST16_T_MAX__
+#define __UINT_LEAST16_TYPE__ __UINT_LEAST16_T_TYPE__
+
+#define __UINT_LEAST32_MAX__  __UINT_LEAST32_T_MAX__
+#define __UINT_LEAST32_TYPE__ __UINT_LEAST32_T_TYPE__
+
+#define __UINT_LEAST64_MAX__  __UINT_LEAST64_T_MAX__
+#define __UINT_LEAST64_TYPE__ __UINT_LEAST64_T_TYPE__
+
+#endif /* __IAR_SYSTEMS_ICC__ */
+
+#endif
diff --git a/include/zephyr/toolchain/iar/iccarm.h b/include/zephyr/toolchain/iar/iccarm.h
new file mode 100644
index 0000000000000..cc79102332979
--- /dev/null
+++ b/include/zephyr/toolchain/iar/iccarm.h
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_TOOLCHAIN_ICCARM_H_
+#define ZEPHYR_INCLUDE_TOOLCHAIN_ICCARM_H_
+
+/**
+ * @file
+ * @brief ICCARM toolchain abstraction
+ *
+ * Macros to abstract compiler capabilities for ICCARM toolchain.
+ */
+
+/* ICCARM supports its own #pragma diag_{warning,default,error,warning}. */
+/* #define TOOLCHAIN_HAS_PRAGMA_DIAG 0 */
+
+#define TOOLCHAIN_HAS_C_GENERIC 1
+
+#define TOOLCHAIN_HAS_C_AUTO_TYPE 1
+
+/* #define TOOLCHAIN_HAS_ZLA 1 */
+
+/*
+ * IAR do not define __BYTE_ORDER__, so it must be manually
+ * detected and defined using arch-specific definitions.
+ */
+
+#ifndef _LINKER
+
+#ifndef __ORDER_BIG_ENDIAN__
+#define __ORDER_BIG_ENDIAN__            (1)
+#endif /* __ORDER_BIG_ENDIAN__ */
+
+#ifndef __ORDER_LITTLE_ENDIAN__
+#define __ORDER_LITTLE_ENDIAN__         (2)
+#endif /* __ORDER_LITTLE_ENDIAN__ */
+
+#ifndef __ORDER_PDP_ENDIAN__
+#define __ORDER_PDP_ENDIAN__            (3)
+#endif /* __ORDER_PDP_ENDIAN__ */
+
+#ifndef __BYTE_ORDER__
+
+#if __LITTLE_ENDIAN__ == 1
+#define __BYTE_ORDER__                  __ORDER_LITTLE_ENDIAN__
+#else
+#define __BYTE_ORDER__                  __ORDER_BIG_ENDIAN__
+#endif /* __LITTLE_ENDIAN__ == 1 */
+
+#endif /* __BYTE_ORDER__ */
+
+
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
+#define BUILD_ASSERT(EXPR, MSG...)  static_assert(EXPR, "" MSG)
+#elif defined(__ICCARM__)
+#define BUILD_ASSERT(EXPR, MSG...) _Static_assert(EXPR, "" MSG)
+#endif
+
+/* Zephyr makes use of __ATOMIC_SEQ_CST */
+#ifdef __STDC_NO_ATOMICS__
+#ifndef __ATOMIC_SEQ_CST
+#define __MEMORY_ORDER_SEQ_CST__ 5
+#endif
+#endif
+#ifndef __ATOMIC_SEQ_CST
+#define __ATOMIC_SEQ_CST __MEMORY_ORDER_SEQ_CST__
+#endif
+
+/* By default, restrict is recognized in Standard C
+ * __restrict is always recognized
+ */
+#define ZRESTRICT __restrict
+
+#include <zephyr/toolchain/common.h>
+#include <stdbool.h>
+
+#define ALIAS_OF(of) __attribute__((alias(#of)))
+
+#define FUNC_ALIAS(real_func, new_alias, return_type) \
+	return_type new_alias() ALIAS_OF(real_func)
+
+#define CODE_UNREACHABLE __builtin_unreachable()
+#define FUNC_NORETURN    __attribute__((__noreturn__))
+
+#define _NODATA_SECTION(segment)  __attribute__((section(#segment)))
+
+/* Unaligned access */
+#define UNALIGNED_GET(p)						\
+__extension__ ({							\
+	struct  __attribute__((__packed__)) {				\
+		__typeof__(*(p)) __v;					\
+	} *__p = (__typeof__(__p)) (p);					\
+	__p->__v;							\
+})
+
+#define UNALIGNED_PUT(v, p)                                             \
+do {                                                                    \
+	struct __attribute__((__packed__)) {                            \
+		__typeof__(*p) __v;                                     \
+	} *__p = (__typeof__(__p)) (p);                                 \
+	__p->__v = (v);                                               \
+} while (false)
+
+
+/* Double indirection to ensure section names are expanded before
+ * stringification
+ */
+#define __GENERIC_SECTION(segment) __attribute__((section(STRINGIFY(segment))))
+#define Z_GENERIC_SECTION(segment) __GENERIC_SECTION(segment)
+
+#define __GENERIC_DOT_SECTION(segment) \
+	__attribute__((section("." STRINGIFY(segment))))
+#define Z_GENERIC_DOT_SECTION(segment) __GENERIC_DOT_SECTION(segment)
+
+#define ___in_section(a, b, c) \
+	__attribute__((section("." Z_STRINGIFY(a)			\
+				"." Z_STRINGIFY(b)			\
+				"." Z_STRINGIFY(c))))
+#define __in_section(a, b, c) ___in_section(a, b, c)
+
+#define __in_section_unique(seg) ___in_section(seg, __FILE__, __COUNTER__)
+
+#define __in_section_unique_named(seg, name) \
+	___in_section(seg, __FILE__, name)
+
+/* When using XIP, using '__ramfunc' places a function into RAM instead
+ * of FLASH. Make sure '__ramfunc' is defined only when
+ * CONFIG_ARCH_HAS_RAMFUNC_SUPPORT is defined, so that the compiler can
+ * report an error if '__ramfunc' is used but the architecture does not
+ * support it.
+ */
+#if !defined(CONFIG_XIP)
+#define __ramfunc
+#elif defined(CONFIG_ARCH_HAS_RAMFUNC_SUPPORT)
+/* Use this instead of the IAR keyword __ramfunc to make sure it
+ * ends up in the correct section.
+ */
+#define __ramfunc __attribute__((noinline, section(".ramfunc")))
+#endif /* !CONFIG_XIP */
+
+/* TG-WG: ICCARM does not support __fallthrough */
+#define __fallthrough  [[fallthrough]]
+
+#ifndef __packed
+#define __packed        __attribute__((__packed__))
+#endif
+
+#ifndef __aligned
+#define __aligned(x)	__attribute__((__aligned__(x)))
+#endif
+
+#ifndef __noinline
+#define __noinline        __attribute__((noinline))
+#endif
+
+#if defined(__cplusplus)
+#define __alignof(x) alignof(x)
+#else
+#define __alignof(x) _Alignof(x)
+#endif
+
+#define __may_alias     __attribute__((__may_alias__))
+
+#ifndef __printf_like
+/*
+ * The Zephyr stdint convention enforces int32_t = int, int64_t = long long,
+ * and intptr_t = long so that short string format length modifiers can be
+ * used universally across ILP32 and LP64 architectures. Without that it
+ * is possible for ILP32 toolchains to have int32_t = long and intptr_t = int
+ * clashing with the Zephyr convention and generating pointless warnings
+ * as they're still the same size. Inhibit the format argument type
+ * validation in that case and let the other configs do it.
+ */
+#define __printf_like(f, a)
+#endif
+
+#define __used		__attribute__((__used__))
+#define __unused	__attribute__((__unused__))
+#define __maybe_unused  __attribute__((__unused__))
+
+#ifndef __deprecated
+#define __deprecated	__attribute__((deprecated))
+#endif
+
+#define FUNC_NO_STACK_PROTECTOR _Pragma("no_stack_protect")
+
+#ifndef __attribute_const__
+#if __VER__ > 0x09000000
+#define __attribute_const__ __attribute__((const))
+#else
+#define __attribute_const__
+#endif
+#endif
+
+#ifndef __must_check
+/* #warning "The attribute __warn_unused_result is not supported in ICCARM". */
+#define __must_check
+/* #define __must_check __attribute__((warn_unused_result)) */
+#endif
+
+#define __PRAGMA(...) _Pragma(#__VA_ARGS__)
+#define ARG_UNUSED(x) (void)(x)
+
+#define likely(x)   (__builtin_expect((bool)!!(x), true) != 0L)
+#define unlikely(x) (__builtin_expect((bool)!!(x), false) != 0L)
+#define POPCOUNT(x) __builtin_popcount(x)
+
+#ifndef __no_optimization
+#define __no_optimization __PRAGMA(optimize = none)
+#endif
+
+#ifndef __attribute_nonnull
+ #define __attribute_nonnull(...) __attribute__((nonnull(__VA_ARGS__)))
+#endif
+
+/* __weak is an ICCARM built-in, but it doesn't work in all positions */
+/* the Zephyr uses it so we replace it with an attribute((weak))      */
+#define __weak __attribute__((__weak__))
+
+/* Builtins */
+
+#include <intrinsics.h>
+
+/*
+ * Be *very* careful with these. You cannot filter out __DEPRECATED_MACRO with
+ * -wno-deprecated, which has implications for -Werror.
+ */
+
+
+/*
+ * Expands to nothing and generates a warning. Used like
+ *
+ *   #define FOO __WARN("Please use BAR instead") ...
+ *
+ * The warning points to the location where the macro is expanded.
+ */
+#define __WARN(s) __PRAGMA(message = #s)
+#define __WARN1(s) __PRAGMA(message = #s)
+
+/* Generic message */
+#ifndef __DEPRECATED_MACRO
+#define __DEPRECATED_MACRO __WARN("Macro is deprecated")
+#endif
+
+/* These macros allow having ARM asm functions callable from thumb */
+
+#if defined(_ASMLANGUAGE)
+
+#if defined(CONFIG_ASSEMBLER_ISA_THUMB2)
+#define FUNC_CODE() .code 32
+#define FUNC_INSTR(a)
+/* '.syntax unified' is a gcc-ism used in thumb-2 asm files */
+#define _ASM_FILE_PROLOGUE .text; .syntax unified; .thumb
+#else
+#define FUNC_CODE()
+#define FUNC_INSTR(a)
+#define _ASM_FILE_PROLOGUE .text; .code 32
+#endif /* CONFIG_ASSEMBLER_ISA_THUMB2 */
+
+/*
+ * These macros are used to declare assembly language symbols that need
+ * to be typed properly(func or data) to be visible to the OMF tool.
+ * So that the build tool could mark them as an entry point to be linked
+ * correctly.  This is an elfism. Use #if 0 for a.out.
+ */
+
+/* This is not implemented yet for IAR */
+#define GTEXT(sym)
+#define GDATA(sym)
+#define WTEXT(sym)
+#define WDATA(sym)
+
+#define SECTION_VAR(sect, sym)
+#define SECTION_FUNC(sect, sym)
+#define SECTION_SUBSEC_FUNC(sect, subsec, sym)
+
+#endif /* _ASMLANGUAGE */
+
+
+/*
+ * These macros generate absolute symbols for IAR
+ */
+
+/* create an extern reference to the absolute symbol */
+
+#define GEN_OFFSET_EXTERN(name) extern const char name[]
+
+#define GEN_ABS_SYM_BEGIN(name) \
+	EXTERN_C void name(void); \
+	void name(void)         \
+	{
+
+#define GEN_ABS_SYM_END }
+
+/*
+ * Note that GEN_ABSOLUTE_SYM(), depending on the architecture
+ * and toolchain, may restrict the range of values permitted
+ * for assignment to the named symbol.
+ */
+#define GEN_ABSOLUTE_SYM(name, value) \
+	__PRAGMA(public_equ = #name, (unsigned int)value)
+
+/*
+ * GEN_ABSOLUTE_SYM_KCONFIG() is outputted by the build system
+ * to generate named symbol/value pairs for kconfigs.
+ */
+#define GEN_ABSOLUTE_SYM_KCONFIG(name, value) \
+	__PRAGMA(public_equ = #name, (unsigned int)value)
+
+#define compiler_barrier() do { \
+	__asm volatile("" ::: "memory"); \
+} while (false)
+
+/** @brief Return larger value of two provided expressions.
+ *
+ * Macro ensures that expressions are evaluated only once.
+ *
+ * @note Macro has limited usage compared to the standard macro as it cannot be
+ *	 used:
+ *	 - to generate constant integer, e.g. __aligned(Z_MAX(4,5))
+ *	 - static variable, e.g. array like static uint8_t array[Z_MAX(...)];
+ */
+#define Z_MAX(a, b) ({ \
+		/* random suffix to avoid naming conflict */ \
+		__typeof__(a) _value_a_ = (a); \
+		__typeof__(b) _value_b_ = (b); \
+		_value_a_ > _value_b_ ? _value_a_ : _value_b_; \
+	})
+
+/** @brief Return smaller value of two provided expressions.
+ *
+ * Macro ensures that expressions are evaluated only once. See @ref Z_MAX for
+ * macro limitations.
+ */
+#define Z_MIN(a, b) ({ \
+		/* random suffix to avoid naming conflict */ \
+		__typeof__(a) _value_a_ = (a); \
+		__typeof__(b) _value_b_ = (b); \
+		_value_a_ < _value_b_ ? _value_a_ : _value_b_; \
+	})
+
+/** @brief Return a value clamped to a given range.
+ *
+ * Macro ensures that expressions are evaluated only once. See @ref Z_MAX for
+ * macro limitations.
+ */
+#define Z_CLAMP(val, low, high) ({                                             \
+		/* random suffix to avoid naming conflict */                   \
+		__typeof__(val) _value_val_ = (val);                           \
+		__typeof__(low) _value_low_ = (low);                           \
+		__typeof__(high) _value_high_ = (high);                        \
+		(_value_val_ < _value_low_)  ? _value_low_ :                   \
+		(_value_val_ > _value_high_) ? _value_high_ :                  \
+					       _value_val_;                    \
+	})
+
+/**
+ * @brief Calculate power of two ceiling for some nonzero value
+ *
+ * @param x Nonzero unsigned long value
+ * @return X rounded up to the next power of two
+ */
+#define Z_POW2_CEIL(x) \
+	((x) <= 2UL ? (x) : (1UL << (8 * sizeof(long) - __builtin_clzl((x) - 1))))
+
+/**
+ * @brief Check whether or not a value is a power of 2
+ *
+ * @param x The value to check
+ * @return true if x is a power of 2, false otherwise
+ */
+#define Z_IS_POW2(x) (((x) != 0) && (((x) & ((x)-1)) == 0))
+
+#ifndef __INT8_C
+#define __INT8_C(x)	x
+#endif
+
+#ifndef INT8_C
+#define INT8_C(x)	__INT8_C(x)
+#endif
+
+#ifndef __UINT8_C
+#define __UINT8_C(x)	x ## U
+#endif
+
+#ifndef UINT8_C
+#define UINT8_C(x)	__UINT8_C(x)
+#endif
+
+#ifndef __INT16_C
+#define __INT16_C(x)	x
+#endif
+
+#ifndef INT16_C
+#define INT16_C(x)	__INT16_C(x)
+#endif
+
+#ifndef __UINT16_C
+#define __UINT16_C(x)	x ## U
+#endif
+
+#ifndef UINT16_C
+#define UINT16_C(x)	__UINT16_C(x)
+#endif
+
+#ifndef __INT32_C
+#define __INT32_C(x)	x
+#endif
+
+#ifndef INT32_C
+#define INT32_C(x)	__INT32_C(x)
+#endif
+
+#ifndef __UINT32_C
+#define __UINT32_C(x)	x ## U
+#endif
+
+#ifndef UINT32_C
+#define UINT32_C(x)	__UINT32_C(x)
+#endif
+
+#ifndef __INT64_C
+#define __INT64_C(x)	x ## LL
+#endif
+
+#ifndef INT64_C
+#define INT64_C(x)	__INT64_C(x)
+#endif
+
+#ifndef __UINT64_C
+#define __UINT64_C(x)	x ## ULL
+#endif
+
+#ifndef UINT64_C
+#define UINT64_C(x)	__UINT64_C(x)
+#endif
+
+/* Convenience macros */
+#undef _GLUE_B
+#undef _GLUE
+#define _GLUE_B(x, y) x##y
+#define _GLUE(x, y)   _GLUE_B(x, y)
+
+#ifndef INTMAX_C
+#define INTMAX_C(x)  _GLUE(x, __INTMAX_C_SUFFIX__)
+#endif
+
+#ifndef UINTMAX_C
+#define UINTMAX_C(x) _GLUE(x, __UINTMAX_C_SUFFIX__)
+#endif
+
+#endif /* !_LINKER */
+#endif /* ZEPHYR_INCLUDE_TOOLCHAIN_ICCARM_H_ */
diff --git a/include/zephyr/toolchain/llvm.h b/include/zephyr/toolchain/llvm.h
index a895680730517..158ff083a385b 100644
--- a/include/zephyr/toolchain/llvm.h
+++ b/include/zephyr/toolchain/llvm.h
@@ -30,12 +30,24 @@
 
 #include <zephyr/toolchain/gcc.h>
 
+#define TOOLCHAIN_WARNING_SIZEOF_ARRAY_DECAY            "-Wsizeof-array-decay"
+#define TOOLCHAIN_WARNING_UNNEEDED_INTERNAL_DECLARATION "-Wunneeded-internal-declaration"
+
+#define TOOLCHAIN_DISABLE_CLANG_WARNING(warning) _TOOLCHAIN_DISABLE_WARNING(clang, warning)
+#define TOOLCHAIN_ENABLE_CLANG_WARNING(warning)  _TOOLCHAIN_ENABLE_WARNING(clang, warning)
+
 /*
  * Provide these definitions only when minimal libc is used.
  * Avoid collision with defines from include/zephyr/toolchain/zephyr_stdint.h
  */
 #ifdef CONFIG_MINIMAL_LIBC
 
+/*
+ * Predefined __INTN_C/__UINTN_C macros are provided by clang starting in version 20.1.
+ * Avoid redefining these macros if a sufficiently modern clang is being used.
+ */
+#if TOOLCHAIN_CLANG_VERSION < 200100
+
 #define __int_c(v, suffix) v ## suffix
 #define int_c(v, suffix) __int_c(v, suffix)
 #define uint_c(v, suffix) __int_c(v ## U, suffix)
@@ -127,6 +139,8 @@
 #define __INTMAX_C(x)	int_c(x, __INTMAX_C_SUFFIX__)
 #define __UINTMAX_C(x)	int_c(x, __UINTMAX_C_SUFFIX__)
 
+#endif /* TOOLCHAIN_CLANG_VERSION < 200100 */
+
 #endif /* CONFIG_MINIMAL_LIBC */
 
 #endif /* ZEPHYR_INCLUDE_TOOLCHAIN_LLVM_H_ */
diff --git a/include/zephyr/tracing/tracing.h b/include/zephyr/tracing/tracing.h
index eecdcddc61f86..13b27cdbddc99 100644
--- a/include/zephyr/tracing/tracing.h
+++ b/include/zephyr/tracing/tracing.h
@@ -1753,7 +1753,7 @@
  * @param h Heap object
  * @param timeout Timeout period
  */
-#define sys_port_trace_k_heap_aligned_alloc_blocking(h, timeout)
+#define sys_port_trace_k_heap_alloc_helper_blocking(h, timeout)
 
 /**
  * @brief Trace Heap align alloc attempt outcome
@@ -2718,6 +2718,12 @@
 
 #if defined(CONFIG_PERCEPIO_TRACERECORDER)
 #include "tracing_tracerecorder.h"
+
+/**
+ * @brief Called when the cpu exits the idle state
+ */
+void sys_trace_idle_exit(void);
+
 #else
 /**
  * @brief Called when entering an ISR
@@ -2738,6 +2744,12 @@ void sys_trace_isr_exit_to_scheduler(void);
  * @brief Called when the cpu enters the idle state
  */
 void sys_trace_idle(void);
+
+/**
+ * @brief Called when the cpu exits the idle state
+ */
+void sys_trace_idle_exit(void);
+
 #endif /* CONFIG_PERCEPIO_TRACERECORDER */
 
 /**
diff --git a/include/zephyr/types.h b/include/zephyr/types.h
index 145957da05929..b1a9a182fb3c1 100644
--- a/include/zephyr/types.h
+++ b/include/zephyr/types.h
@@ -48,11 +48,26 @@ typedef union {
 #endif /* Z_THREAD_LOCAL */
 
 #ifdef __cplusplus
-/* Zephyr requires an int main(void) signature with C linkage for the application main if present */
+
+#if (!__STDC_HOSTED__)
+/*
+ * Zephyr requires an int main(void) signature with C linkage for the
+ * application main if present. gcc, and clang when building in 'hosted' mode
+ * will correctly assume this. But, when building freestanding, clang does not
+ * treat main() specially, and by default name mangles its symbol, which
+ * results in the linker not linking from the kernel init code into this
+ * name mangled app main().
+ *
+ * At the same time, according to the C++ standard Section 6.9.3.1 of
+ * ISO/IEC 14882:2024, main cannot be explicitly declared to have "C" linkage.
+ * This restriction is relaxed for freestanding code, as main is not treated
+ * specially in these circumstances.
+ * Therefore, let's include the prototype when we are not building the code as
+ * freestanding/not-hosted.
+ */
 extern int main(void);
 #endif
 
-#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/zephyr/usb/usb_ch9.h b/include/zephyr/usb/usb_ch9.h
index 3f1ad5b8093ea..b78be4397fa39 100644
--- a/include/zephyr/usb/usb_ch9.h
+++ b/include/zephyr/usb/usb_ch9.h
@@ -136,6 +136,13 @@ static inline bool usb_reqtype_is_to_device(const struct usb_setup_packet *setup
 #define USB_SFS_REMOTE_WAKEUP		0x01
 #define USB_SFS_TEST_MODE		0x02
 
+/** USB Test Mode Selectors defined in spec. Table 9-7 */
+#define USB_SFS_TEST_MODE_J		0x01
+#define USB_SFS_TEST_MODE_K		0x02
+#define USB_SFS_TEST_MODE_SE0_NAK	0x03
+#define USB_SFS_TEST_MODE_PACKET	0x04
+#define USB_SFS_TEST_MODE_FORCE_ENABLE	0x05
+
 /** Bits used for GetStatus response defined in spec. Figure 9-4 */
 #define USB_GET_STATUS_SELF_POWERED	BIT(0)
 #define USB_GET_STATUS_REMOTE_WAKEUP	BIT(1)
diff --git a/include/zephyr/usb/usb_device.h b/include/zephyr/usb/usb_device.h
index e596555ed502f..39d66383693ce 100644
--- a/include/zephyr/usb/usb_device.h
+++ b/include/zephyr/usb/usb_device.h
@@ -73,9 +73,6 @@ extern "C" {
 #define USBD_DEFINE_CFG_DATA(name) \
 	static STRUCT_SECTION_ITERABLE(usb_cfg_data, name)
 
-#define USBD_CFG_DATA_DEFINE(p, name) __DEPRECATED_MACRO \
-	static __in_section(_usb_cfg_data, static, p##_name) __used __aligned(4)
-
 /*************************************************************************
  *  USB configuration
  **************************************************************************/
diff --git a/include/zephyr/usb/usbd.h b/include/zephyr/usb/usbd.h
index 619d926b14e17..5850643b31f7b 100644
--- a/include/zephyr/usb/usbd.h
+++ b/include/zephyr/usb/usbd.h
@@ -37,6 +37,12 @@ extern "C" {
  * @{
  */
 
+/* 1 if USB device stack is compiled with High-Speed support */
+#define USBD_SUPPORTS_HIGH_SPEED IS_EQ(CONFIG_USBD_MAX_SPEED, 1)
+
+/* Maximum bulk max packet size the stack supports */
+#define USBD_MAX_BULK_MPS COND_CODE_1(USBD_SUPPORTS_HIGH_SPEED, (512), (64))
+
 /*
  * The USB Unicode bString is encoded in UTF16LE, which means it takes up
  * twice the amount of bytes than the same string encoded in ASCII7.
@@ -254,6 +260,8 @@ struct usbd_status {
 	unsigned int suspended : 1;
 	/** USB remote wake-up feature is enabled */
 	unsigned int rwup : 1;
+	/** USB device is self-powered */
+	unsigned int self_powered : 1;
 	/** USB device speed */
 	enum usbd_speed speed : 2;
 };
@@ -631,6 +639,7 @@ static inline void *usbd_class_get_private(const struct usbd_class_data *const c
  * @param d_name   String descriptor node identifier.
  */
 #define USBD_DESC_SERIAL_NUMBER_DEFINE(d_name)					\
+	BUILD_ASSERT(IS_ENABLED(CONFIG_HWINFO), "HWINFO not enabled");		\
 	static struct usbd_desc_node d_name = {					\
 		.str = {							\
 			.utype = USBD_DUT_STRING_SERIAL_NUMBER,			\
@@ -1066,6 +1075,17 @@ bool usbd_is_suspended(struct usbd_context *uds_ctx);
  */
 int usbd_wakeup_request(struct usbd_context *uds_ctx);
 
+/**
+ * @brief Set the self-powered status of the USB device
+ *
+ * The status is used in the Self Powered field of the Get Status request
+ * response to indicate whether the device is currently self-powered.
+ *
+ * @param[in] uds_ctx Pointer to a device context
+ * @param[in] status Sets self-powered status if true, clears it otherwise
+ */
+void usbd_self_powered(struct usbd_context *uds_ctx, const bool status);
+
 /**
  * @brief Get actual device speed
  *
diff --git a/include/zephyr/xen/gnttab.h b/include/zephyr/xen/gnttab.h
index be6a0d5c906e9..4cfc65e580e92 100644
--- a/include/zephyr/xen/gnttab.h
+++ b/include/zephyr/xen/gnttab.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 EPAM Systems
+ * Copyright (c) 2021-2024 EPAM Systems
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -76,12 +76,12 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, unsigned int count);
  * Unmap foreign grant refs. The gnttab_put_page() should be used after this for
  * each page, that was successfully unmapped.
  *
- * @param unmap_ops - array of prepared gnttab_map_grant_ref's for unmapping
+ * @param unmap_ops - array of prepared gnttab_unmap_grant_ref's for unmapping
  * @param count - number of grefs in unmap_ops array
  * @return - @count on success or negative errno on failure
  *           also per-page status will be set in unmap_ops[i].status (GNTST_*)
  */
-int gnttab_unmap_refs(struct gnttab_map_grant_ref *unmap_ops, unsigned int count);
+int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, unsigned int count);
 
 /*
  * Convert grant ref status codes (GNTST_*) to text messages.
diff --git a/include/zephyr/xen/public/grant_table.h b/include/zephyr/xen/public/grant_table.h
index 0124046d042f4..81803a1daa3f6 100644
--- a/include/zephyr/xen/public/grant_table.h
+++ b/include/zephyr/xen/public/grant_table.h
@@ -324,7 +324,23 @@ struct gnttab_setup_table {
 typedef struct gnttab_setup_table gnttab_setup_table_t;
 DEFINE_XEN_GUEST_HANDLE(gnttab_setup_table_t);
 
-
+/*
+ * GNTTABOP_query_size: Query the current and maximum sizes of the shared
+ * grant table.
+ * NOTES:
+ *  1. <dom> may be specified as DOMID_SELF.
+ *  2. Only a sufficiently-privileged domain may specify <dom> != DOMID_SELF.
+ */
+struct gnttab_query_size {
+	/* IN parameters. */
+	domid_t  dom;
+	/* OUT parameters. */
+	uint32_t nr_frames;
+	uint32_t max_nr_frames;
+	int16_t  status;	/* => enum grant_status */
+};
+typedef struct gnttab_query_size gnttab_query_size_t;
+DEFINE_XEN_GUEST_HANDLE(gnttab_query_size_t);
 
 /*
  * Bitfield values for gnttab_map_grant_ref.flags.
diff --git a/include/zephyr/zbus/zbus.h b/include/zephyr/zbus/zbus.h
index 478268d85b4ce..c13e77082e734 100644
--- a/include/zephyr/zbus/zbus.h
+++ b/include/zephyr/zbus/zbus.h
@@ -861,6 +861,14 @@ static inline void zbus_chan_pub_stats_update(const struct zbus_channel *chan)
 
 #if defined(CONFIG_ZBUS_RUNTIME_OBSERVERS) || defined(__DOXYGEN__)
 
+/**
+ * @brief Structure for linking observers to chanels
+ */
+struct zbus_observer_node {
+	sys_snode_t node;
+	const struct zbus_observer *obs;
+};
+
 /**
  * @brief Add an observer to a channel.
  *
@@ -868,17 +876,17 @@ static inline void zbus_chan_pub_stats_update(const struct zbus_channel *chan)
  *
  * @param chan The channel's reference.
  * @param obs The observer's reference to be added.
+ * @param node Persistent structure to link the channel to the observer
  * @param timeout Waiting period to add an observer,
  *                or one of the special values K_NO_WAIT and K_FOREVER.
  *
  * @retval 0 Observer added to the channel.
  * @retval -EALREADY The observer is already present in the channel's runtime observers list.
- * @retval -ENOMEM Returned without waiting.
  * @retval -EAGAIN Waiting period timed out.
  * @retval -EINVAL Some parameter is invalid.
  */
 int zbus_chan_add_obs(const struct zbus_channel *chan, const struct zbus_observer *obs,
-		      k_timeout_t timeout);
+		      struct zbus_observer_node *node, k_timeout_t timeout);
 
 /**
  * @brief Remove an observer from a channel.
@@ -900,15 +908,6 @@ int zbus_chan_add_obs(const struct zbus_channel *chan, const struct zbus_observe
 int zbus_chan_rm_obs(const struct zbus_channel *chan, const struct zbus_observer *obs,
 		     k_timeout_t timeout);
 
-/** @cond INTERNAL_HIDDEN */
-
-struct zbus_observer_node {
-	sys_snode_t node;
-	const struct zbus_observer *obs;
-};
-
-/** @endcond */
-
 #endif /* CONFIG_ZBUS_RUNTIME_OBSERVERS */
 
 /**
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 8ba95f6c5708c..075e091cbb62d 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -55,7 +55,6 @@ list(APPEND kernel_files
   errno.c
   fatal.c
   init.c
-  init_static.c
   kheap.c
   mem_slab.c
   float.c
@@ -80,10 +79,14 @@ list(APPEND kernel_files
   system_work_q.c
   work.c
   condvar.c
-  priority_queues.c
   thread.c
   sched.c
   )
+
+if (CONFIG_SCHED_SCALABLE OR CONFIG_WAITQ_SCALABLE)
+list(APPEND kernel_files priority_queues.c)
+endif()
+
 # FIXME: Once the prior pipe implementation is removed, this should be included in the above list
 if(NOT CONFIG_PIPES)
 list(APPEND kernel_files pipe.c)
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 28177a1d76a6f..08ada92f8666e 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -53,7 +53,7 @@ config NUM_PREEMPT_PRIORITIES
 	int "Number of preemptible priorities" if MULTITHREADING
 	default 0 if !MULTITHREADING
 	default 15
-	range 0 128
+	range 0 127
 	help
 	  Number of preemptible priorities available in the system. Gives access
 	  to priorities 0 to CONFIG_NUM_PREEMPT_PRIORITIES - 1.
@@ -121,14 +121,14 @@ config SCHED_DEADLINE
 
 config SCHED_CPU_MASK
 	bool "CPU mask affinity/pinning API"
-	depends on SCHED_DUMB
+	depends on SCHED_SIMPLE
 	help
 	  When true, the application will have access to the
 	  k_thread_cpu_mask_*() APIs which control per-CPU affinity masks in
 	  SMP mode, allowing applications to pin threads to specific CPUs or
 	  disallow threads from running on given CPUs.  Note that as currently
 	  implemented, this involves an inherent O(N) scaling in the number of
-	  idle-but-runnable threads, and thus works only with the DUMB
+	  idle-but-runnable threads, and thus works only with the simple
 	  scheduler (as SCALABLE and MULTIQ would see no benefit).
 
 	  Note that this setting does not technically depend on SMP and is
@@ -297,16 +297,23 @@ endchoice # DYNAMIC_THREAD_PREFER
 
 endif # DYNAMIC_THREADS
 
+config SCHED_DUMB
+	bool "Simple linked-list ready queue"
+	select DEPRECATED
+	help
+	  Deprecated in favour of SCHED_SIMPLE.
+
 choice SCHED_ALGORITHM
 	prompt "Scheduler priority queue algorithm"
-	default SCHED_DUMB
+	default SCHED_SIMPLE if SCHED_DUMB
+	default SCHED_SIMPLE
 	help
 	  The kernel can be built with several choices for the
 	  ready queue implementation, offering different choices between
 	  code size, constant factor runtime overhead and performance
 	  scaling when many threads are added.
 
-config SCHED_DUMB
+config SCHED_SIMPLE
 	bool "Simple linked-list ready queue"
 	help
 	  When selected, the scheduler ready queue will be implemented
@@ -339,20 +346,27 @@ config SCHED_MULTIQ
 	  as the classic/textbook array of lists, one per priority.
 	  This corresponds to the scheduler algorithm used in Zephyr
 	  versions prior to 1.12.  It incurs only a tiny code size
-	  overhead vs. the "dumb" scheduler and runs in O(1) time
+	  overhead vs. the "simple" scheduler and runs in O(1) time
 	  in almost all circumstances with very low constant factor.
 	  But it requires a fairly large RAM budget to store those list
 	  heads, and the limited features make it incompatible with
 	  features like deadline scheduling that need to sort threads
 	  more finely, and SMP affinity which need to traverse the list
 	  of threads.  Typical applications with small numbers of runnable
-	  threads probably want the DUMB scheduler.
+	  threads probably want the simple scheduler.
 
 endchoice # SCHED_ALGORITHM
 
+config WAITQ_DUMB
+	bool "Simple linked-list wait_q"
+	select DEPRECATED
+	help
+	  Deprecated in favour of WAITQ_SIMPLE.
+
 choice WAITQ_ALGORITHM
 	prompt "Wait queue priority algorithm"
-	default WAITQ_DUMB
+	default WAITQ_SIMPLE if WAITQ_DUMB
+	default WAITQ_SIMPLE
 	help
 	  The wait_q abstraction used in IPC primitives to pend
 	  threads for later wakeup shares the same backend data
@@ -365,13 +379,13 @@ config WAITQ_SCALABLE
 	  When selected, the wait_q will be implemented with a
 	  balanced tree.  Choose this if you expect to have many
 	  threads waiting on individual primitives.  There is a ~2kb
-	  code size increase over WAITQ_DUMB (which may be shared with
+	  code size increase over WAITQ_SIMPLE (which may be shared with
 	  SCHED_SCALABLE) if the rbtree is not used elsewhere in the
 	  application, and pend/unpend operations on "small" queues
 	  will be somewhat slower (though this is not generally a
 	  performance path).
 
-config WAITQ_DUMB
+config WAITQ_SIMPLE
 	bool "Simple linked-list wait_q"
 	help
 	  When selected, the wait_q will be implemented with a
@@ -768,9 +782,9 @@ endmenu
 config SWAP_NONATOMIC
 	bool
 	help
-	  On some architectures, the _Swap() primitive cannot be made
+	  On some architectures, the z_swap() primitive cannot be made
 	  atomic with respect to the irq_lock being released.  That
-	  is, interrupts may be received between the entry to _Swap
+	  is, interrupts may be received between the entry to z_swap
 	  and the completion of the context switch.  There are a
 	  handful of workaround cases in the kernel that need to be
 	  enabled when this is true.  Currently, this only happens on
@@ -813,6 +827,7 @@ config SYS_CLOCK_TICKS_PER_SEC
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	int "System clock's h/w timer frequency"
+	default 0 if TIMER_READS_ITS_FREQUENCY_AT_RUNTIME
 	help
 	  This option specifies the frequency of the hardware timer used for the
 	  system clock (in Hz). This option is set by the SOC's or board's Kconfig file
@@ -1031,10 +1046,10 @@ config KERNEL_WHOLE_ARCHIVE
 	  to be included, rather than searching the archive for required object files.
 
 config TOOLCHAIN_SUPPORTS_STATIC_INIT_GNU
-	# As of today only ARC MWDT toolchain doesn't support GNU-compatible
-	# initialization of static objects, new toolchains can be added
-	# here if required.
-	def_bool "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "arcmwdt"
+	# As of today, we don't know of any toolchains that don't create
+	# either .ctors or .init_array sections containing initializer
+	# addresses in a fashion compatible with how Zephyr uses them.
+	def_bool y
 
 config STATIC_INIT_GNU
 	bool "Support GNU-compatible initializers and constructors"
@@ -1044,14 +1059,11 @@ config STATIC_INIT_GNU
 	help
 	  GNU-compatible initialization of static objects. This is required for
 	  C++ constructor support as well as for initializer functions as
-	  defined by GNU-compatible toolchains. This increases the size
-	  of Zephyr binaries by around 100 bytes. If you know your
-	  application doesn't need any initializers, you can disable this
-	  option.
-	  The ARC MWDT toolchain, does not support or use this setting,
-	  and has instead separate C++ constructor initialization code.
-	  Note the option CMAKE_LINKER_GENERATOR does not yet support this feature
-	  or CPP.
+	  defined by GNU-compatible toolchains. This increases the size of
+	  Zephyr binaries by around 24 bytes. If you know your application
+	  doesn't need any initializers, you can disable this option. The linker
+	  will emit an error if constructors are needed and this option has been
+	  disabled.
 
 config BOOTARGS
 	bool "Support bootargs"
@@ -1060,7 +1072,7 @@ config BOOTARGS
 
 config DYNAMIC_BOOTARGS
 	bool "Support dynamic bootargs"
-	depends on BOOTARGS && (MULTIBOOT_INFO || BUILD_OUTPUT_EFI)
+	depends on BOOTARGS
 	help
 	  Enables dynamic bootargs support.
 
diff --git a/kernel/Kconfig.vm b/kernel/Kconfig.vm
index 923d511d9dbde..a8105d03da033 100644
--- a/kernel/Kconfig.vm
+++ b/kernel/Kconfig.vm
@@ -98,8 +98,10 @@ config KERNEL_DIRECT_MAP
 
 endif # KERNEL_VM_SUPPORT
 
-menuconfig MMU
-	bool "MMU features"
+menu "MMU Features"
+
+config MMU
+	bool
 	depends on CPU_HAS_MMU
 	select KERNEL_VM_SUPPORT
 	help
@@ -206,6 +208,7 @@ config DEMAND_PAGING_TIMING_HISTOGRAM_NUM_BINS
 
 endif # DEMAND_PAGING
 endif # MMU
+endmenu
 
 config KERNEL_VM_USE_CUSTOM_MEM_RANGE_CHECK
 	bool
diff --git a/kernel/device.c b/kernel/device.c
index 7e8822695802a..ad97b0b040998 100644
--- a/kernel/device.c
+++ b/kernel/device.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
 #include <stddef.h>
 #include <string.h>
 #include <zephyr/device.h>
@@ -142,6 +143,38 @@ bool z_impl_device_is_ready(const struct device *dev)
 	return dev->state->initialized && (dev->state->init_res == 0U);
 }
 
+int z_impl_device_deinit(const struct device *dev)
+{
+	int ret;
+
+	if (!dev->state->initialized) {
+		return -EPERM;
+	}
+
+	if (dev->ops.deinit == NULL) {
+		return -ENOTSUP;
+	}
+
+	ret = dev->ops.deinit(dev);
+	if (ret < 0) {
+		return ret;
+	}
+
+	dev->state->initialized = false;
+
+	return 0;
+}
+
+#ifdef CONFIG_USERSPACE
+static inline int z_vrfy_device_deinit(const struct device *dev)
+{
+	K_OOPS(K_SYSCALL_OBJ_INIT(dev, K_OBJ_ANY));
+
+	return z_impl_device_deinit(dev);
+}
+#include <zephyr/syscalls/device_deinit_mrsh.c>
+#endif
+
 #ifdef CONFIG_DEVICE_DEPS
 
 static int device_visitor(const device_handle_t *handles,
diff --git a/kernel/include/kernel_internal.h b/kernel/include/kernel_internal.h
index afc5409d20765..eadacf936c964 100644
--- a/kernel/include/kernel_internal.h
+++ b/kernel/include/kernel_internal.h
@@ -105,10 +105,7 @@ void *z_thread_aligned_alloc(size_t align, size_t size);
  * @return A pointer to the allocated memory, or NULL if there is insufficient
  * RAM in the pool or there is no pool to draw memory from
  */
-static inline void *z_thread_malloc(size_t size)
-{
-	return z_thread_aligned_alloc(0, size);
-}
+void *z_thread_malloc(size_t size);
 
 
 #ifdef CONFIG_USE_SWITCH
diff --git a/kernel/include/kernel_offsets.h b/kernel/include/kernel_offsets.h
index 3cadf7e12a0bc..1d560cb602f0b 100644
--- a/kernel/include/kernel_offsets.h
+++ b/kernel/include/kernel_offsets.h
@@ -48,10 +48,6 @@ GEN_OFFSET_SYM(_kernel_t, ready_q);
 GEN_OFFSET_SYM(_ready_q_t, cache);
 #endif /* CONFIG_SMP */
 
-#ifdef CONFIG_FPU_SHARING
-GEN_OFFSET_SYM(_kernel_t, current_fp);
-#endif /* CONFIG_FPU_SHARING */
-
 GEN_OFFSET_SYM(_thread_base_t, user_options);
 
 GEN_OFFSET_SYM(_thread_t, base);
diff --git a/kernel/include/offsets_short.h b/kernel/include/offsets_short.h
index 373d7e02ec981..c97ba15e56203 100644
--- a/kernel/include/offsets_short.h
+++ b/kernel/include/offsets_short.h
@@ -34,9 +34,6 @@
 #define _kernel_offset_to_idle \
 	(___kernel_t_idle_OFFSET)
 
-#define _kernel_offset_to_current_fp \
-	(___kernel_t_current_fp_OFFSET)
-
 #define _kernel_offset_to_ready_q_cache \
 	(___kernel_t_ready_q_OFFSET + ___ready_q_t_cache_OFFSET)
 
diff --git a/kernel/include/priority_q.h b/kernel/include/priority_q.h
index 259d689dda75b..09f86caa819f9 100644
--- a/kernel/include/priority_q.h
+++ b/kernel/include/priority_q.h
@@ -10,18 +10,16 @@
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/sys/dlist.h>
 
-bool z_priq_rb_lessthan(struct rbnode *a, struct rbnode *b);
-
 /* Dumb Scheduling */
-#if defined(CONFIG_SCHED_DUMB)
-#define _priq_run_init		z_priq_dumb_init
-#define _priq_run_add		z_priq_dumb_add
-#define _priq_run_remove	z_priq_dumb_remove
-#define _priq_run_yield         z_priq_dumb_yield
+#if defined(CONFIG_SCHED_SIMPLE)
+#define _priq_run_init		z_priq_simple_init
+#define _priq_run_add		z_priq_simple_add
+#define _priq_run_remove	z_priq_simple_remove
+#define _priq_run_yield         z_priq_simple_yield
 # if defined(CONFIG_SCHED_CPU_MASK)
-#  define _priq_run_best	z_priq_dumb_mask_best
+#  define _priq_run_best	z_priq_simple_mask_best
 # else
-#  define _priq_run_best	z_priq_dumb_best
+#  define _priq_run_best	z_priq_simple_best
 # endif /* CONFIG_SCHED_CPU_MASK */
 /* Scalable Scheduling */
 #elif defined(CONFIG_SCHED_SCALABLE)
@@ -45,10 +43,10 @@ bool z_priq_rb_lessthan(struct rbnode *a, struct rbnode *b);
 #define _priq_wait_remove	z_priq_rb_remove
 #define _priq_wait_best		z_priq_rb_best
 /* Dumb Wait Queue */
-#elif defined(CONFIG_WAITQ_DUMB)
-#define _priq_wait_add		z_priq_dumb_add
-#define _priq_wait_remove	z_priq_dumb_remove
-#define _priq_wait_best		z_priq_dumb_best
+#elif defined(CONFIG_WAITQ_SIMPLE)
+#define _priq_wait_add		z_priq_simple_add
+#define _priq_wait_remove	z_priq_simple_remove
+#define _priq_wait_best		z_priq_simple_best
 #endif
 
 #if defined(CONFIG_64BIT)
@@ -59,7 +57,7 @@ bool z_priq_rb_lessthan(struct rbnode *a, struct rbnode *b);
 #define TRAILING_ZEROS u32_count_trailing_zeros
 #endif /* CONFIG_64BIT */
 
-static ALWAYS_INLINE void z_priq_dumb_init(sys_dlist_t *pq)
+static ALWAYS_INLINE void z_priq_simple_init(sys_dlist_t *pq)
 {
 	sys_dlist_init(pq);
 }
@@ -105,7 +103,7 @@ static ALWAYS_INLINE int32_t z_sched_prio_cmp(struct k_thread *thread_1, struct
 	return 0;
 }
 
-static ALWAYS_INLINE void z_priq_dumb_add(sys_dlist_t *pq, struct k_thread *thread)
+static ALWAYS_INLINE void z_priq_simple_add(sys_dlist_t *pq, struct k_thread *thread)
 {
 	struct k_thread *t;
 
@@ -119,14 +117,14 @@ static ALWAYS_INLINE void z_priq_dumb_add(sys_dlist_t *pq, struct k_thread *thre
 	sys_dlist_append(pq, &thread->base.qnode_dlist);
 }
 
-static ALWAYS_INLINE void z_priq_dumb_remove(sys_dlist_t *pq, struct k_thread *thread)
+static ALWAYS_INLINE void z_priq_simple_remove(sys_dlist_t *pq, struct k_thread *thread)
 {
 	ARG_UNUSED(pq);
 
 	sys_dlist_remove(&thread->base.qnode_dlist);
 }
 
-static ALWAYS_INLINE void z_priq_dumb_yield(sys_dlist_t *pq)
+static ALWAYS_INLINE void z_priq_simple_yield(sys_dlist_t *pq)
 {
 #ifndef CONFIG_SMP
 	sys_dnode_t *n;
@@ -157,7 +155,7 @@ static ALWAYS_INLINE void z_priq_dumb_yield(sys_dlist_t *pq)
 #endif
 }
 
-static ALWAYS_INLINE struct k_thread *z_priq_dumb_best(sys_dlist_t *pq)
+static ALWAYS_INLINE struct k_thread *z_priq_simple_best(sys_dlist_t *pq)
 {
 	struct k_thread *thread = NULL;
 	sys_dnode_t *n = sys_dlist_peek_head(pq);
@@ -169,7 +167,7 @@ static ALWAYS_INLINE struct k_thread *z_priq_dumb_best(sys_dlist_t *pq)
 }
 
 #ifdef CONFIG_SCHED_CPU_MASK
-static ALWAYS_INLINE struct k_thread *z_priq_dumb_mask_best(sys_dlist_t *pq)
+static ALWAYS_INLINE struct k_thread *z_priq_simple_mask_best(sys_dlist_t *pq)
 {
 	/* With masks enabled we need to be prepared to walk the list
 	 * looking for one we can run
@@ -185,8 +183,11 @@ static ALWAYS_INLINE struct k_thread *z_priq_dumb_mask_best(sys_dlist_t *pq)
 }
 #endif /* CONFIG_SCHED_CPU_MASK */
 
+#if defined(CONFIG_SCHED_SCALABLE) || defined(CONFIG_WAITQ_SCALABLE)
 static ALWAYS_INLINE void z_priq_rb_init(struct _priq_rb *pq)
 {
+	bool z_priq_rb_lessthan(struct rbnode *a, struct rbnode *b);
+
 	*pq = (struct _priq_rb) {
 		.tree = {
 			.lessthan_fn = z_priq_rb_lessthan,
@@ -244,6 +245,7 @@ static ALWAYS_INLINE struct k_thread *z_priq_rb_best(struct _priq_rb *pq)
 	}
 	return thread;
 }
+#endif
 
 struct prio_info {
 	uint8_t offset_prio;
diff --git a/kernel/include/timeout_q.h b/kernel/include/timeout_q.h
index b3c3e61cd9fc8..6ae627aadbdd4 100644
--- a/kernel/include/timeout_q.h
+++ b/kernel/include/timeout_q.h
@@ -22,13 +22,19 @@ extern "C" {
 
 #ifdef CONFIG_SYS_CLOCK_EXISTS
 
+/* Value written to dticks when timeout is aborted. */
+#define TIMEOUT_DTICKS_ABORTED (IS_ENABLED(CONFIG_TIMEOUT_64BIT) ? INT64_MIN : INT32_MIN)
+
 static inline void z_init_timeout(struct _timeout *to)
 {
 	sys_dnode_init(&to->node);
 }
 
-void z_add_timeout(struct _timeout *to, _timeout_func_t fn,
-		   k_timeout_t timeout);
+/* Adds the timeout to the queue.
+ *
+ * @return Absolute tick value when timeout will expire.
+ */
+k_ticks_t z_add_timeout(struct _timeout *to, _timeout_func_t fn, k_timeout_t timeout);
 
 int z_abort_timeout(struct _timeout *to);
 
@@ -37,6 +43,12 @@ static inline bool z_is_inactive_timeout(const struct _timeout *to)
 	return !sys_dnode_is_linked(&to->node);
 }
 
+static inline bool z_is_aborted_timeout(const struct _timeout *to)
+{
+	/* When timeout is aborted then dticks is set to special value. */
+	return to->dticks == TIMEOUT_DTICKS_ABORTED;
+}
+
 static inline void z_init_thread_timeout(struct _thread_base *thread_base)
 {
 	z_init_timeout(&thread_base->timeout);
@@ -44,9 +56,9 @@ static inline void z_init_thread_timeout(struct _thread_base *thread_base)
 
 extern void z_thread_timeout(struct _timeout *timeout);
 
-static inline void z_add_thread_timeout(struct k_thread *thread, k_timeout_t ticks)
+static inline k_ticks_t z_add_thread_timeout(struct k_thread *thread, k_timeout_t ticks)
 {
-	z_add_timeout(&thread->base.timeout, z_thread_timeout, ticks);
+	return z_add_timeout(&thread->base.timeout, z_thread_timeout, ticks);
 }
 
 static inline void z_abort_thread_timeout(struct k_thread *thread)
@@ -54,6 +66,12 @@ static inline void z_abort_thread_timeout(struct k_thread *thread)
 	z_abort_timeout(&thread->base.timeout);
 }
 
+static inline bool z_is_aborted_thread_timeout(struct k_thread *thread)
+{
+
+	return z_is_aborted_timeout(&thread->base.timeout);
+}
+
 int32_t z_get_next_timeout_expiry(void);
 
 k_ticks_t z_timeout_remaining(const struct _timeout *timeout);
@@ -63,14 +81,17 @@ k_ticks_t z_timeout_remaining(const struct _timeout *timeout);
 /* Stubs when !CONFIG_SYS_CLOCK_EXISTS */
 #define z_init_thread_timeout(thread_base) do {} while (false)
 #define z_abort_thread_timeout(to) do {} while (false)
+#define z_is_aborted_thread_timeout(to) false
 #define z_is_inactive_timeout(to) 1
+#define z_is_aborted_timeout(to) false
 #define z_get_next_timeout_expiry() ((int32_t) K_TICKS_FOREVER)
 #define z_set_timeout_expiry(ticks, is_idle) do {} while (false)
 
-static inline void z_add_thread_timeout(struct k_thread *thread, k_timeout_t ticks)
+static inline k_ticks_t z_add_thread_timeout(struct k_thread *thread, k_timeout_t ticks)
 {
 	ARG_UNUSED(thread);
 	ARG_UNUSED(ticks);
+	return 0;
 }
 
 #endif /* CONFIG_SYS_CLOCK_EXISTS */
diff --git a/kernel/init.c b/kernel/init.c
index d6c4fb3c70cca..c29ea8ff93178 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -247,6 +247,11 @@ void z_bss_zero(void)
 	z_early_memset(&__gcov_bss_start, 0,
 		       ((uintptr_t) &__gcov_bss_end - (uintptr_t) &__gcov_bss_start));
 #endif /* CONFIG_COVERAGE_GCOV */
+#ifdef CONFIG_NOCACHE_MEMORY
+z_early_memset(&_nocache_ram_start, 0,
+		   (uintptr_t) &_nocache_ram_end
+		   - (uintptr_t) &_nocache_ram_start);
+#endif
 }
 
 #ifdef CONFIG_LINKER_USE_BOOT_SECTION
@@ -302,13 +307,12 @@ extern volatile uintptr_t __stack_chk_guard;
 __pinned_bss
 bool z_sys_post_kernel;
 
-static int do_device_init(const struct init_entry *entry)
+static int do_device_init(const struct device *dev)
 {
-	const struct device *dev = entry->dev;
 	int rc = 0;
 
-	if (entry->init_fn.dev != NULL) {
-		rc = entry->init_fn.dev(dev);
+	if (dev->ops.init != NULL) {
+		rc = dev->ops.init(dev);
 		/* Mark device initialized. If initialization
 		 * failed, record the error condition.
 		 */
@@ -362,13 +366,15 @@ static void z_sys_init_run_level(enum init_level level)
 
 	for (entry = levels[level]; entry < levels[level+1]; entry++) {
 		const struct device *dev = entry->dev;
-		int result;
+		int result = 0;
 
 		sys_trace_sys_init_enter(entry, level);
 		if (dev != NULL) {
-			result = do_device_init(entry);
+			if ((dev->flags & DEVICE_FLAG_INIT_DEFERRED) == 0U) {
+				result = do_device_init(dev);
+			}
 		} else {
-			result = entry->init_fn.sys();
+			result = entry->init_fn();
 		}
 		sys_trace_sys_init_exit(entry, level, result);
 	}
@@ -377,17 +383,11 @@ static void z_sys_init_run_level(enum init_level level)
 
 int z_impl_device_init(const struct device *dev)
 {
-	if (dev == NULL) {
-		return -ENOENT;
-	}
-
-	STRUCT_SECTION_FOREACH_ALTERNATE(_deferred_init, init_entry, entry) {
-		if (entry->dev == dev) {
-			return do_device_init(entry);
-		}
+	if (dev->state->initialized) {
+		return -EALREADY;
 	}
 
-	return -ENOENT;
+	return do_device_init(dev);
 }
 
 #ifdef CONFIG_USERSPACE
@@ -488,6 +488,27 @@ static char **prepare_main_args(int *argc)
 		(*argc)++;
 	}
 }
+
+#endif
+
+#ifdef CONFIG_STATIC_INIT_GNU
+
+extern void (*__zephyr_init_array_start[])();
+extern void (*__zephyr_init_array_end[])();
+
+static void z_static_init_gnu(void)
+{
+	void	(**fn)();
+
+	for (fn = __zephyr_init_array_start; fn != __zephyr_init_array_end; fn++) {
+		/* MWDT toolchain sticks a NULL at the end of the array */
+		if (*fn == NULL) {
+			break;
+		}
+		(**fn)();
+	}
+}
+
 #endif
 
 /**
@@ -529,8 +550,9 @@ static void bg_thread_main(void *unused1, void *unused2, void *unused3)
 #endif /* CONFIG_STACK_POINTER_RANDOM */
 	boot_banner();
 
-	void z_init_static(void);
-	z_init_static();
+#ifdef CONFIG_STATIC_INIT_GNU
+	z_static_init_gnu();
+#endif /* CONFIG_STATIC_INIT_GNU */
 
 	/* Final init level before app starts */
 	z_sys_init_run_level(INIT_LEVEL_APPLICATION);
diff --git a/kernel/init_static.c b/kernel/init_static.c
deleted file mode 100644
index 442757a73a631..0000000000000
--- a/kernel/init_static.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2012-2015 Wind River Systems, Inc.
- * Copyright (c) 2021 Synopsys, Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-void __do_global_ctors_aux(void);
-void __do_init_array_aux(void);
-
-void z_init_static(void)
-{
-#if defined(CONFIG_STATIC_INIT_GNU)
-	__do_global_ctors_aux();
-	__do_init_array_aux();
-#elif defined(__CCAC__) /* ARC MWDT */
-	__do_global_ctors_aux();
-#endif
-}
-
-/**
- * @section - Constructor module
- * @brief
- * The ctors section contains a list of function pointers that execute both the C++ constructors of
- * static global objects, as well as either C or C++ initializer functions (declared with the
- * attribute constructor). These must be executed before the application's main() routine.
- *
- * NOTE: Not all compilers put those function pointers into the ctors section;
- * some put them into the init_array section instead.
- */
-
-#ifdef CONFIG_STATIC_INIT_GNU
-
-/* What a constructor function pointer looks like */
-
-typedef void (*CtorFuncPtr)(void);
-
-/* Constructor function pointer list is generated by the linker script. */
-
-extern CtorFuncPtr __ZEPHYR_CTOR_LIST__[];
-extern CtorFuncPtr __ZEPHYR_CTOR_END__[];
-
-/**
- *
- * @brief Invoke all C++ style global object constructors
- *
- * This routine is invoked by the kernel prior to the execution of the
- * application's main().
- */
-void __do_global_ctors_aux(void)
-{
-	unsigned int nCtors;
-
-	nCtors = (unsigned long)__ZEPHYR_CTOR_LIST__[0];
-
-	while (nCtors >= 1U) {
-		__ZEPHYR_CTOR_LIST__[nCtors--]();
-	}
-}
-
-#endif
-
-/*
- * @section
- * @brief Execute initialization routines referenced in .init_array section
- */
-
-#ifdef CONFIG_STATIC_INIT_GNU
-
-typedef void (*func_ptr)(void);
-
-extern func_ptr __zephyr_init_array_start[];
-extern func_ptr __zephyr_init_array_end[];
-
-/**
- * @brief Execute initialization routines referenced in .init_array section
- */
-void __do_init_array_aux(void)
-{
-	for (func_ptr *func = __zephyr_init_array_start;
-		func < __zephyr_init_array_end;
-		func++) {
-		(*func)();
-	}
-}
-
-#endif
diff --git a/kernel/kheap.c b/kernel/kheap.c
index 245558c85fefd..90aa3b0ee1fa3 100644
--- a/kernel/kheap.c
+++ b/kernel/kheap.c
@@ -63,22 +63,23 @@ SYS_INIT_NAMED(statics_init_pre, statics_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_
 SYS_INIT_NAMED(statics_init_post, statics_init, POST_KERNEL, 0);
 #endif /* CONFIG_DEMAND_PAGING && !CONFIG_LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT */
 
-void *k_heap_aligned_alloc(struct k_heap *heap, size_t align, size_t bytes,
-			k_timeout_t timeout)
+typedef void * (sys_heap_allocator_t)(struct sys_heap *heap, size_t align, size_t bytes);
+
+static void *z_heap_alloc_helper(struct k_heap *heap, size_t align, size_t bytes,
+				 k_timeout_t timeout,
+				 sys_heap_allocator_t *sys_heap_allocator)
 {
 	k_timepoint_t end = sys_timepoint_calc(timeout);
 	void *ret = NULL;
 
 	k_spinlock_key_t key = k_spin_lock(&heap->lock);
 
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap, aligned_alloc, heap, timeout);
-
 	__ASSERT(!arch_is_in_isr() || K_TIMEOUT_EQ(timeout, K_NO_WAIT), "");
 
 	bool blocked_alloc = false;
 
 	while (ret == NULL) {
-		ret = sys_heap_aligned_alloc(&heap->heap, align, bytes);
+		ret = sys_heap_allocator(&heap->heap, align, bytes);
 
 		if (!IS_ENABLED(CONFIG_MULTITHREADING) ||
 		    (ret != NULL) || K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
@@ -88,7 +89,7 @@ void *k_heap_aligned_alloc(struct k_heap *heap, size_t align, size_t bytes,
 		if (!blocked_alloc) {
 			blocked_alloc = true;
 
-			SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_heap, aligned_alloc, heap, timeout);
+			SYS_PORT_TRACING_OBJ_FUNC_BLOCKING(k_heap, alloc_helper, heap, timeout);
 		} else {
 			/**
 			 * @todo	Trace attempt to avoid empty trace segments
@@ -100,8 +101,6 @@ void *k_heap_aligned_alloc(struct k_heap *heap, size_t align, size_t bytes,
 		key = k_spin_lock(&heap->lock);
 	}
 
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_heap, aligned_alloc, heap, timeout, ret);
-
 	k_spin_unlock(&heap->lock, key);
 	return ret;
 }
@@ -110,13 +109,36 @@ void *k_heap_alloc(struct k_heap *heap, size_t bytes, k_timeout_t timeout)
 {
 	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap, alloc, heap, timeout);
 
-	void *ret = k_heap_aligned_alloc(heap, sizeof(void *), bytes, timeout);
+	void *ret = z_heap_alloc_helper(heap, 0, bytes, timeout,
+					sys_heap_noalign_alloc);
 
 	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_heap, alloc, heap, timeout, ret);
 
 	return ret;
 }
 
+void *k_heap_aligned_alloc(struct k_heap *heap, size_t align, size_t bytes,
+			k_timeout_t timeout)
+{
+	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap, aligned_alloc, heap, timeout);
+
+	void *ret = z_heap_alloc_helper(heap, align, bytes, timeout,
+					sys_heap_aligned_alloc);
+
+	/*
+	 * modules/debug/percepio/TraceRecorder/kernelports/Zephyr/include/tracing_tracerecorder.h
+	 * contains a concealed non-parameterized direct reference to a local
+	 * variable through the SYS_PORT_TRACING_OBJ_FUNC_EXIT macro below
+	 * that is no longer in scope. Provide a dummy stub for compilation
+	 * to still succeed until that module's layering violation is fixed.
+	 */
+	bool blocked_alloc = false; ARG_UNUSED(blocked_alloc);
+
+	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_heap, aligned_alloc, heap, timeout, ret);
+
+	return ret;
+}
+
 void *k_heap_calloc(struct k_heap *heap, size_t num, size_t size, k_timeout_t timeout)
 {
 	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap, calloc, heap, timeout);
@@ -148,7 +170,7 @@ void *k_heap_realloc(struct k_heap *heap, void *ptr, size_t bytes, k_timeout_t t
 	__ASSERT(!arch_is_in_isr() || K_TIMEOUT_EQ(timeout, K_NO_WAIT), "");
 
 	while (ret == NULL) {
-		ret = sys_heap_aligned_realloc(&heap->heap, ptr, sizeof(void *), bytes);
+		ret = sys_heap_realloc(&heap->heap, ptr, bytes);
 
 		if (!IS_ENABLED(CONFIG_MULTITHREADING) ||
 		    (ret != NULL) || K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
diff --git a/kernel/mempool.c b/kernel/mempool.c
index d8926c63ed940..62748f7ea8175 100644
--- a/kernel/mempool.c
+++ b/kernel/mempool.c
@@ -9,11 +9,19 @@
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/sys/util.h>
 
-static void *z_heap_aligned_alloc(struct k_heap *heap, size_t align, size_t size)
+typedef void * (sys_heap_allocator_t)(struct sys_heap *heap, size_t align, size_t bytes);
+
+static void *z_alloc_helper(struct k_heap *heap, size_t align, size_t size,
+			    sys_heap_allocator_t sys_heap_allocator)
 {
 	void *mem;
 	struct k_heap **heap_ref;
 	size_t __align;
+	k_spinlock_key_t key;
+
+	/* A power of 2 as well as 0 is OK */
+	__ASSERT((align & (align - 1)) == 0,
+		"align must be a power of 2");
 
 	/*
 	 * Adjust the size to make room for our heap reference.
@@ -26,7 +34,14 @@ static void *z_heap_aligned_alloc(struct k_heap *heap, size_t align, size_t size
 	}
 	__align = align | sizeof(heap_ref);
 
-	mem = k_heap_aligned_alloc(heap, __align, size, K_NO_WAIT);
+	/*
+	 * No point calling k_heap_malloc/k_heap_aligned_alloc with K_NO_WAIT.
+	 * Better bypass them and go directly to sys_heap_*() instead.
+	 */
+	key = k_spin_lock(&heap->lock);
+	mem = sys_heap_allocator(&heap->heap, __align, size);
+	k_spin_unlock(&heap->lock, key);
+
 	if (mem == NULL) {
 		return NULL;
 	}
@@ -64,16 +79,9 @@ K_HEAP_DEFINE(_system_heap, K_HEAP_MEM_POOL_SIZE);
 
 void *k_aligned_alloc(size_t align, size_t size)
 {
-	__ASSERT(align / sizeof(void *) >= 1
-		&& (align % sizeof(void *)) == 0,
-		"align must be a multiple of sizeof(void *)");
-
-	__ASSERT((align & (align - 1)) == 0,
-		"align must be a power of 2");
-
 	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap_sys, k_aligned_alloc, _SYSTEM_HEAP);
 
-	void *ret = z_heap_aligned_alloc(_SYSTEM_HEAP, align, size);
+	void *ret = z_alloc_helper(_SYSTEM_HEAP, align, size, sys_heap_aligned_alloc);
 
 	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_heap_sys, k_aligned_alloc, _SYSTEM_HEAP, ret);
 
@@ -84,7 +92,7 @@ void *k_malloc(size_t size)
 {
 	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap_sys, k_malloc, _SYSTEM_HEAP);
 
-	void *ret = k_aligned_alloc(sizeof(void *), size);
+	void *ret = z_alloc_helper(_SYSTEM_HEAP, 0, size, sys_heap_noalign_alloc);
 
 	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_heap_sys, k_malloc, _SYSTEM_HEAP, ret);
 
@@ -117,6 +125,7 @@ void *k_calloc(size_t nmemb, size_t size)
 void *k_realloc(void *ptr, size_t size)
 {
 	struct k_heap *heap, **heap_ref;
+	k_spinlock_key_t key;
 	void *ret;
 
 	if (size == 0) {
@@ -137,7 +146,13 @@ void *k_realloc(void *ptr, size_t size)
 		return NULL;
 	}
 
-	ret = k_heap_realloc(heap, ptr, size, K_NO_WAIT);
+	/*
+	 * No point calling k_heap_realloc() with K_NO_WAIT here.
+	 * Better bypass it and go directly to sys_heap_realloc() instead.
+	 */
+	key = k_spin_lock(&heap->lock);
+	ret = sys_heap_realloc(&heap->heap, ptr, size);
+	k_spin_unlock(&heap->lock, key);
 
 	if (ret != NULL) {
 		heap_ref = ret;
@@ -157,7 +172,8 @@ void k_thread_system_pool_assign(struct k_thread *thread)
 #define _SYSTEM_HEAP	NULL
 #endif /* K_HEAP_MEM_POOL_SIZE */
 
-void *z_thread_aligned_alloc(size_t align, size_t size)
+static void *z_thread_alloc_helper(size_t align, size_t size,
+				   sys_heap_allocator_t sys_heap_allocator)
 {
 	void *ret;
 	struct k_heap *heap;
@@ -169,10 +185,20 @@ void *z_thread_aligned_alloc(size_t align, size_t size)
 	}
 
 	if (heap != NULL) {
-		ret = z_heap_aligned_alloc(heap, align, size);
+		ret = z_alloc_helper(heap, align, size, sys_heap_allocator);
 	} else {
 		ret = NULL;
 	}
 
 	return ret;
 }
+
+void *z_thread_aligned_alloc(size_t align, size_t size)
+{
+	return z_thread_alloc_helper(align, size, sys_heap_aligned_alloc);
+}
+
+void *z_thread_malloc(size_t size)
+{
+	return z_thread_alloc_helper(0, size, sys_heap_noalign_alloc);
+}
diff --git a/kernel/nothread.c b/kernel/nothread.c
index 3e590e714b246..09bf454596117 100644
--- a/kernel/nothread.c
+++ b/kernel/nothread.c
@@ -36,7 +36,7 @@ int32_t z_impl_k_sleep(k_timeout_t timeout)
 	}
 
 	ticks = timeout.ticks;
-	if (Z_TICK_ABS(ticks) <= 0) {
+	if (Z_IS_TIMEOUT_RELATIVE(timeout)) {
 		/* ticks is delta timeout */
 		ticks_to_wait = ticks;
 	} else {
diff --git a/kernel/sched.c b/kernel/sched.c
index 6a7e89e8b8da5..995ded3d322d4 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -434,7 +434,9 @@ static ALWAYS_INLINE void z_thread_halt(struct k_thread *thread, k_spinlock_key_
 		halt_thread(thread, terminate ? _THREAD_DEAD : _THREAD_SUSPENDED);
 		if ((thread == _current) && !arch_is_in_isr()) {
 			if (z_is_thread_essential(thread)) {
+				k_spin_unlock(&_sched_spinlock, key);
 				k_panic();
+				key = k_spin_lock(&_sched_spinlock);
 			}
 			z_swap(&_sched_spinlock, key);
 			__ASSERT(!terminate, "aborted _current back from dead");
@@ -697,6 +699,16 @@ bool z_thread_prio_set(struct k_thread *thread, int prio)
 			}
 
 			update_cache(1);
+		} else if (z_is_thread_pending(thread)) {
+			/* Thread is pending, remove it from the waitq
+			 * and reinsert it with the new priority to avoid
+			 * violating waitq ordering and rb assumptions.
+			 */
+			_wait_q_t *wait_q = pended_on_thread(thread);
+
+			_priq_wait_remove(&wait_q->waitq, thread);
+			thread->base.prio = prio;
+			_priq_wait_add(&wait_q->waitq, thread);
 		} else {
 			thread->base.prio = prio;
 		}
@@ -1065,43 +1077,41 @@ static inline void z_vrfy_k_yield(void)
 #include <zephyr/syscalls/k_yield_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-static int32_t z_tick_sleep(k_ticks_t ticks)
+static int32_t z_tick_sleep(k_timeout_t timeout)
 {
 	uint32_t expected_wakeup_ticks;
 
 	__ASSERT(!arch_is_in_isr(), "");
 
-	LOG_DBG("thread %p for %lu ticks", _current, (unsigned long)ticks);
+	LOG_DBG("thread %p for %lu ticks", _current, (unsigned long)timeout.ticks);
 
-	/* wait of 0 ms is treated as a 'yield' */
-	if (ticks == 0) {
+	/* K_NO_WAIT is treated as a 'yield' */
+	if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
 		k_yield();
 		return 0;
 	}
 
-	if (Z_TICK_ABS(ticks) <= 0) {
-		expected_wakeup_ticks = ticks + sys_clock_tick_get_32();
-	} else {
-		expected_wakeup_ticks = Z_TICK_ABS(ticks);
-	}
-
-	k_timeout_t timeout = Z_TIMEOUT_TICKS(ticks);
 	k_spinlock_key_t key = k_spin_lock(&_sched_spinlock);
 
 #if defined(CONFIG_TIMESLICING) && defined(CONFIG_SWAP_NONATOMIC)
 	pending_current = _current;
 #endif /* CONFIG_TIMESLICING && CONFIG_SWAP_NONATOMIC */
 	unready_thread(_current);
-	z_add_thread_timeout(_current, timeout);
+	expected_wakeup_ticks = (uint32_t)z_add_thread_timeout(_current, timeout);
 	z_mark_thread_as_sleeping(_current);
 
 	(void)z_swap(&_sched_spinlock, key);
 
+	if (!z_is_aborted_thread_timeout(_current)) {
+		return 0;
+	}
+
 	/* We require a 32 bit unsigned subtraction to care a wraparound */
 	uint32_t left_ticks = expected_wakeup_ticks - sys_clock_tick_get_32();
 
 	/* To handle a negative value correctly, once type-cast it to signed 32 bit */
-	ticks = (k_ticks_t)(int32_t)left_ticks;
+	k_ticks_t ticks = (k_ticks_t)(int32_t)left_ticks;
+
 	if (ticks > 0) {
 		return ticks;
 	}
@@ -1117,16 +1127,14 @@ int32_t z_impl_k_sleep(k_timeout_t timeout)
 
 	SYS_PORT_TRACING_FUNC_ENTER(k_thread, sleep, timeout);
 
-	ticks = timeout.ticks;
+	ticks = z_tick_sleep(timeout);
 
-	ticks = z_tick_sleep(ticks);
+	/* k_sleep() still returns 32 bit milliseconds for compatibility */
+	int64_t ms = K_TIMEOUT_EQ(timeout, K_FOREVER) ? K_TICKS_FOREVER :
+		CLAMP(k_ticks_to_ms_ceil64(ticks), 0, INT_MAX);
 
-	int32_t ret = K_TIMEOUT_EQ(timeout, K_FOREVER) ? K_TICKS_FOREVER :
-		      k_ticks_to_ms_ceil64(ticks);
-
-	SYS_PORT_TRACING_FUNC_EXIT(k_thread, sleep, timeout, ret);
-
-	return ret;
+	SYS_PORT_TRACING_FUNC_EXIT(k_thread, sleep, timeout, ms);
+	return (int32_t) ms;
 }
 
 #ifdef CONFIG_USERSPACE
@@ -1144,7 +1152,7 @@ int32_t z_impl_k_usleep(int32_t us)
 	SYS_PORT_TRACING_FUNC_ENTER(k_thread, usleep, us);
 
 	ticks = k_us_to_ticks_ceil64(us);
-	ticks = z_tick_sleep(ticks);
+	ticks = z_tick_sleep(Z_TIMEOUT_TICKS(ticks));
 
 	int32_t ret = k_ticks_to_us_ceil64(ticks);
 
diff --git a/kernel/system_work_q.c b/kernel/system_work_q.c
index 5cc26fd82e14a..aa8c3de03ab8f 100644
--- a/kernel/system_work_q.c
+++ b/kernel/system_work_q.c
@@ -21,7 +21,7 @@ struct k_work_q k_sys_work_q;
 
 static int k_sys_work_q_init(void)
 {
-	struct k_work_queue_config cfg = {
+	static const struct k_work_queue_config cfg = {
 		.name = "sysworkq",
 		.no_yield = IS_ENABLED(CONFIG_SYSTEM_WORKQUEUE_NO_YIELD),
 		.essential = true,
diff --git a/kernel/thread_monitor.c b/kernel/thread_monitor.c
index cba7d19e828e7..f6f7217b6f08c 100644
--- a/kernel/thread_monitor.c
+++ b/kernel/thread_monitor.c
@@ -34,110 +34,77 @@ void z_thread_monitor_exit(struct k_thread *thread)
 	k_spin_unlock(&z_thread_monitor_lock, key);
 }
 
-
-void k_thread_foreach(k_thread_user_cb_t user_cb, void *user_data)
+/*
+ * Helper function to iterate over threads with optional filtering and locking behavior.
+ */
+static void thread_foreach_helper(k_thread_user_cb_t user_cb, void *user_data,
+		bool unlocked, bool filter_by_cpu, unsigned int cpu)
 {
 	struct k_thread *thread;
 	k_spinlock_key_t key;
 
 	__ASSERT(user_cb != NULL, "user_cb can not be NULL");
 
-	/*
-	 * Lock is needed to make sure that the _kernel.threads is not being
-	 * modified by the user_cb either directly or indirectly.
-	 * The indirect ways are through calling k_thread_create and
-	 * k_thread_abort from user_cb.
-	 */
-	key = k_spin_lock(&z_thread_monitor_lock);
+	if (filter_by_cpu) {
+		__ASSERT(cpu < CONFIG_MP_MAX_NUM_CPUS, "cpu filter out of bounds");
+	}
 
-	SYS_PORT_TRACING_FUNC_ENTER(k_thread, foreach);
+	key = k_spin_lock(&z_thread_monitor_lock);
 
 	for (thread = _kernel.threads; thread; thread = thread->next_thread) {
-		user_cb(thread, user_data);
-	}
+		/* cpu is only defined when SMP=y*/
+#ifdef CONFIG_SMP
+		bool on_cpu = (thread->base.cpu == cpu);
+#else
+		bool on_cpu = false;
+#endif
+		if (filter_by_cpu && !on_cpu) {
+			continue;
+		}
 
-	SYS_PORT_TRACING_FUNC_EXIT(k_thread, foreach);
+		if (unlocked) {
+			k_spin_unlock(&z_thread_monitor_lock, key);
+			user_cb(thread, user_data);
+			key = k_spin_lock(&z_thread_monitor_lock);
+		} else {
+			user_cb(thread, user_data);
+		}
+	}
 
 	k_spin_unlock(&z_thread_monitor_lock, key);
 }
 
-void k_thread_foreach_unlocked(k_thread_user_cb_t user_cb, void *user_data)
+/*
+ * Public API functions using the helper.
+ */
+void k_thread_foreach(k_thread_user_cb_t user_cb, void *user_data)
 {
-	struct k_thread *thread;
-	k_spinlock_key_t key;
-
-	__ASSERT(user_cb != NULL, "user_cb can not be NULL");
-
-	key = k_spin_lock(&z_thread_monitor_lock);
+	SYS_PORT_TRACING_FUNC_ENTER(k_thread, foreach);
+	thread_foreach_helper(user_cb, user_data, false, false, 0);
+	SYS_PORT_TRACING_FUNC_EXIT(k_thread, foreach);
+}
 
+void k_thread_foreach_unlocked(k_thread_user_cb_t user_cb, void *user_data)
+{
 	SYS_PORT_TRACING_FUNC_ENTER(k_thread, foreach_unlocked);
-
-	for (thread = _kernel.threads; thread; thread = thread->next_thread) {
-		k_spin_unlock(&z_thread_monitor_lock, key);
-		user_cb(thread, user_data);
-		key = k_spin_lock(&z_thread_monitor_lock);
-	}
-
+	thread_foreach_helper(user_cb, user_data, true, false, 0);
 	SYS_PORT_TRACING_FUNC_EXIT(k_thread, foreach_unlocked);
-
-	k_spin_unlock(&z_thread_monitor_lock, key);
-
 }
 
 #ifdef CONFIG_SMP
 void k_thread_foreach_filter_by_cpu(unsigned int cpu, k_thread_user_cb_t user_cb,
-				  void *user_data)
+		void *user_data)
 {
-	struct k_thread *thread;
-	k_spinlock_key_t key;
-
-	__ASSERT(user_cb != NULL, "user_cb can not be NULL");
-	__ASSERT(cpu < CONFIG_MP_MAX_NUM_CPUS, "cpu filter out of bounds");
-
-	/*
-	 * Lock is needed to make sure that the _kernel.threads is not being
-	 * modified by the user_cb either directly or indirectly.
-	 * The indirect ways are through calling k_thread_create and
-	 * k_thread_abort from user_cb.
-	 */
-	key = k_spin_lock(&z_thread_monitor_lock);
-
 	SYS_PORT_TRACING_FUNC_ENTER(k_thread, foreach);
-
-	for (thread = _kernel.threads; thread; thread = thread->next_thread) {
-		if (thread->base.cpu == cpu) {
-			user_cb(thread, user_data);
-		}
-	}
-
+	thread_foreach_helper(user_cb, user_data, false, true, cpu);
 	SYS_PORT_TRACING_FUNC_EXIT(k_thread, foreach);
-
-	k_spin_unlock(&z_thread_monitor_lock, key);
 }
 
 void k_thread_foreach_unlocked_filter_by_cpu(unsigned int cpu, k_thread_user_cb_t user_cb,
-					     void *user_data)
+		void *user_data)
 {
-	struct k_thread *thread;
-	k_spinlock_key_t key;
-
-	__ASSERT(user_cb != NULL, "user_cb can not be NULL");
-	__ASSERT(cpu < CONFIG_MP_MAX_NUM_CPUS, "cpu filter out of bounds");
-
-	key = k_spin_lock(&z_thread_monitor_lock);
-
 	SYS_PORT_TRACING_FUNC_ENTER(k_thread, foreach_unlocked);
-
-	for (thread = _kernel.threads; thread; thread = thread->next_thread) {
-		if (thread->base.cpu == cpu) {
-			k_spin_unlock(&z_thread_monitor_lock, key);
-			user_cb(thread, user_data);
-			key = k_spin_lock(&z_thread_monitor_lock);
-		}
-	}
-
+	thread_foreach_helper(user_cb, user_data, true, true, cpu);
 	SYS_PORT_TRACING_FUNC_EXIT(k_thread, foreach_unlocked);
-
-	k_spin_unlock(&z_thread_monitor_lock, key);
 }
 #endif /* CONFIG_SMP */
diff --git a/kernel/timeout.c b/kernel/timeout.c
index 17f08c9d2e22f..f698a0779e5a7 100644
--- a/kernel/timeout.c
+++ b/kernel/timeout.c
@@ -29,10 +29,10 @@ static struct k_spinlock timeout_lock;
 static int announce_remaining;
 
 #if defined(CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME)
-int z_clock_hw_cycles_per_sec = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC;
+unsigned int z_clock_hw_cycles_per_sec = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC;
 
 #ifdef CONFIG_USERSPACE
-static inline int z_vrfy_sys_clock_hw_cycles_per_sec_runtime_get(void)
+static inline unsigned int z_vrfy_sys_clock_hw_cycles_per_sec_runtime_get(void)
 {
 	return z_impl_sys_clock_hw_cycles_per_sec_runtime_get();
 }
@@ -84,10 +84,9 @@ static int32_t elapsed(void)
 	return announce_remaining == 0 ? sys_clock_elapsed() : 0U;
 }
 
-static int32_t next_timeout(void)
+static int32_t next_timeout(int32_t ticks_elapsed)
 {
 	struct _timeout *to = first();
-	int32_t ticks_elapsed = elapsed();
 	int32_t ret;
 
 	if ((to == NULL) ||
@@ -100,11 +99,12 @@ static int32_t next_timeout(void)
 	return ret;
 }
 
-void z_add_timeout(struct _timeout *to, _timeout_func_t fn,
-		   k_timeout_t timeout)
+k_ticks_t z_add_timeout(struct _timeout *to, _timeout_func_t fn, k_timeout_t timeout)
 {
+	k_ticks_t ticks = 0;
+
 	if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-		return;
+		return 0;
 	}
 
 #ifdef CONFIG_KERNEL_COHERENCE
@@ -116,14 +116,19 @@ void z_add_timeout(struct _timeout *to, _timeout_func_t fn,
 
 	K_SPINLOCK(&timeout_lock) {
 		struct _timeout *t;
-
-		if (IS_ENABLED(CONFIG_TIMEOUT_64BIT) &&
-		    (Z_TICK_ABS(timeout.ticks) >= 0)) {
-			k_ticks_t ticks = Z_TICK_ABS(timeout.ticks) - curr_tick;
-
-			to->dticks = MAX(1, ticks);
+		int32_t ticks_elapsed;
+		bool has_elapsed = false;
+
+		if (Z_IS_TIMEOUT_RELATIVE(timeout)) {
+			ticks_elapsed = elapsed();
+			has_elapsed = true;
+			to->dticks = timeout.ticks + 1 + ticks_elapsed;
+			ticks = curr_tick + to->dticks;
 		} else {
-			to->dticks = timeout.ticks + 1 + elapsed();
+			k_ticks_t dticks = Z_TICK_ABS(timeout.ticks) - curr_tick;
+
+			to->dticks = MAX(1, dticks);
+			ticks = timeout.ticks;
 		}
 
 		for (t = first(); t != NULL; t = next(t)) {
@@ -140,9 +145,17 @@ void z_add_timeout(struct _timeout *to, _timeout_func_t fn,
 		}
 
 		if (to == first() && announce_remaining == 0) {
-			sys_clock_set_timeout(next_timeout(), false);
+			if (!has_elapsed) {
+				/* In case of absolute timeout that is first to expire
+				 * elapsed need to be read from the system clock.
+				 */
+				ticks_elapsed = elapsed();
+			}
+			sys_clock_set_timeout(next_timeout(ticks_elapsed), false);
 		}
 	}
+
+	return ticks;
 }
 
 int z_abort_timeout(struct _timeout *to)
@@ -154,9 +167,10 @@ int z_abort_timeout(struct _timeout *to)
 			bool is_first = (to == first());
 
 			remove_timeout(to);
+			to->dticks = TIMEOUT_DTICKS_ABORTED;
 			ret = 0;
 			if (is_first) {
-				sys_clock_set_timeout(next_timeout(), false);
+				sys_clock_set_timeout(next_timeout(elapsed()), false);
 			}
 		}
 	}
@@ -211,7 +225,7 @@ int32_t z_get_next_timeout_expiry(void)
 	int32_t ret = (int32_t) K_TICKS_FOREVER;
 
 	K_SPINLOCK(&timeout_lock) {
-		ret = next_timeout();
+		ret = next_timeout(elapsed());
 	}
 	return ret;
 }
@@ -258,7 +272,7 @@ void sys_clock_announce(int32_t ticks)
 	curr_tick += announce_remaining;
 	announce_remaining = 0;
 
-	sys_clock_set_timeout(next_timeout(), false);
+	sys_clock_set_timeout(next_timeout(0), false);
 
 	k_spin_unlock(&timeout_lock, key);
 
@@ -310,10 +324,10 @@ k_timepoint_t sys_timepoint_calc(k_timeout_t timeout)
 	} else {
 		k_ticks_t dt = timeout.ticks;
 
-		if (IS_ENABLED(CONFIG_TIMEOUT_64BIT) && Z_TICK_ABS(dt) >= 0) {
-			timepoint.tick = Z_TICK_ABS(dt);
-		} else {
+		if (Z_IS_TIMEOUT_RELATIVE(timeout)) {
 			timepoint.tick = sys_clock_tick_get() + MAX(1, dt);
+		} else {
+			timepoint.tick = Z_TICK_ABS(dt);
 		}
 	}
 
diff --git a/kernel/timer.c b/kernel/timer.c
index 466cab6c4842f..513d676bf0d2b 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -166,8 +166,13 @@ void z_impl_k_timer_start(struct k_timer *timer, k_timeout_t duration,
 	 * argument the same way k_sleep() does), but historical.  The
 	 * timer_api test relies on this behavior.
 	 */
-	if (Z_TICK_ABS(duration.ticks) < 0) {
-		duration.ticks = MAX(duration.ticks - 1, 0);
+	if (Z_IS_TIMEOUT_RELATIVE(duration)) {
+		/* For the duration == K_NO_WAIT case, ensure that behaviour
+		 * is consistent for both 32-bit k_ticks_t which are unsigned
+		 * and 64-bit k_ticks_t which are signed.
+		 */
+		duration.ticks = MAX(1, duration.ticks);
+		duration.ticks = duration.ticks - 1;
 	}
 
 	(void)z_abort_timeout(&timer->timeout);
diff --git a/kernel/xip.c b/kernel/xip.c
index 66ce7907dde52..550df11d7aa7f 100644
--- a/kernel/xip.c
+++ b/kernel/xip.c
@@ -32,7 +32,7 @@ void z_data_copy(void)
 		       __ramfunc_end - __ramfunc_region_start);
 #endif /* CONFIG_ARCH_HAS_RAMFUNC_SUPPORT */
 #if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
-	z_early_memcpy(&__ccm_data_start, &__ccm_data_rom_start,
+	z_early_memcpy(&__ccm_data_start, &__ccm_data_load_start,
 		       __ccm_data_end - __ccm_data_start);
 #endif
 #if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_itcm))
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 52aeac58300d9..b945968c8fbe7 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -20,3 +20,4 @@ add_subdirectory(utils)
 add_subdirectory_ifdef(CONFIG_SMF smf)
 add_subdirectory_ifdef(CONFIG_OPENAMP              open-amp)
 add_subdirectory_ifdef(CONFIG_ACPI acpi)
+add_subdirectory(uuid)
diff --git a/lib/Kconfig b/lib/Kconfig
index bcf8f53235e52..ae97399b19953 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -30,4 +30,6 @@ source "lib/acpi/Kconfig"
 source "lib/runtime/Kconfig"
 
 source "lib/utils/Kconfig"
+
+source "lib/uuid/Kconfig"
 endmenu
diff --git a/lib/crc/CMakeLists.txt b/lib/crc/CMakeLists.txt
index 7285af4f3c205..6a6b35ea18ad1 100644
--- a/lib/crc/CMakeLists.txt
+++ b/lib/crc/CMakeLists.txt
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources_ifdef(CONFIG_CRC
+  crc32k_4_2_sw.c
   crc32c_sw.c
   crc32_sw.c
   crc24_sw.c
diff --git a/lib/crc/Kconfig b/lib/crc/Kconfig
index 0402df59d01fb..eb2ced63db26e 100644
--- a/lib/crc/Kconfig
+++ b/lib/crc/Kconfig
@@ -1,4 +1,5 @@
 # Copyright (c) 2016,2023 Intel Corporation
+# Copyright (c) 2024 Intercreate, Inc.
 # SPDX-License-Identifier: Apache-2.0
 #
 config CRC
@@ -13,4 +14,10 @@ config CRC_SHELL
 	select POSIX_C_LIB_EXT
 	help
 	  Enable CRC checking for memory regions from the shell.
+
+config CRC32_K_4_2_TABLE_256
+	bool "Use 256-length table for CRC32-K/4.2"
+	help
+	  Enable the 256-length instead of 16-length table for CRC32-K/4.2.
+
 endif # CRC
diff --git a/lib/crc/crc32k_4_2_sw.c b/lib/crc/crc32k_4_2_sw.c
new file mode 100644
index 0000000000000..9208d780de92d
--- /dev/null
+++ b/lib/crc/crc32k_4_2_sw.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2024 Intercreate, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/sys/crc.h>
+
+uint32_t crc32_k_4_2_update(uint32_t crc, const uint8_t *const data, const size_t len)
+{
+
+#if defined(CONFIG_CRC32_K_4_2_TABLE_256)
+
+	/**
+	 * CRC table generated from polynomial 0x93a409eb CRC-32K/4.2 (*op) (Koopman)
+	 *
+	 * pycrc --width 32 --poly 0x93a409eb --reflect-in False --xor-in 0 --reflect-out False
+	 * --xor-out 0 --generate table --table-idx-width 8
+	 */
+	static const uint32_t table[256] = {
+		0x00000000, 0x93a409eb, 0xb4ec1a3d, 0x274813d6, 0xfa7c3d91, 0x69d8347a, 0x4e9027ac,
+		0xdd342e47, 0x675c72c9, 0xf4f87b22, 0xd3b068f4, 0x4014611f, 0x9d204f58, 0x0e8446b3,
+		0x29cc5565, 0xba685c8e, 0xceb8e592, 0x5d1cec79, 0x7a54ffaf, 0xe9f0f644, 0x34c4d803,
+		0xa760d1e8, 0x8028c23e, 0x138ccbd5, 0xa9e4975b, 0x3a409eb0, 0x1d088d66, 0x8eac848d,
+		0x5398aaca, 0xc03ca321, 0xe774b0f7, 0x74d0b91c, 0x0ed5c2cf, 0x9d71cb24, 0xba39d8f2,
+		0x299dd119, 0xf4a9ff5e, 0x670df6b5, 0x4045e563, 0xd3e1ec88, 0x6989b006, 0xfa2db9ed,
+		0xdd65aa3b, 0x4ec1a3d0, 0x93f58d97, 0x0051847c, 0x271997aa, 0xb4bd9e41, 0xc06d275d,
+		0x53c92eb6, 0x74813d60, 0xe725348b, 0x3a111acc, 0xa9b51327, 0x8efd00f1, 0x1d59091a,
+		0xa7315594, 0x34955c7f, 0x13dd4fa9, 0x80794642, 0x5d4d6805, 0xcee961ee, 0xe9a17238,
+		0x7a057bd3, 0x1dab859e, 0x8e0f8c75, 0xa9479fa3, 0x3ae39648, 0xe7d7b80f, 0x7473b1e4,
+		0x533ba232, 0xc09fabd9, 0x7af7f757, 0xe953febc, 0xce1bed6a, 0x5dbfe481, 0x808bcac6,
+		0x132fc32d, 0x3467d0fb, 0xa7c3d910, 0xd313600c, 0x40b769e7, 0x67ff7a31, 0xf45b73da,
+		0x296f5d9d, 0xbacb5476, 0x9d8347a0, 0x0e274e4b, 0xb44f12c5, 0x27eb1b2e, 0x00a308f8,
+		0x93070113, 0x4e332f54, 0xdd9726bf, 0xfadf3569, 0x697b3c82, 0x137e4751, 0x80da4eba,
+		0xa7925d6c, 0x34365487, 0xe9027ac0, 0x7aa6732b, 0x5dee60fd, 0xce4a6916, 0x74223598,
+		0xe7863c73, 0xc0ce2fa5, 0x536a264e, 0x8e5e0809, 0x1dfa01e2, 0x3ab21234, 0xa9161bdf,
+		0xddc6a2c3, 0x4e62ab28, 0x692ab8fe, 0xfa8eb115, 0x27ba9f52, 0xb41e96b9, 0x9356856f,
+		0x00f28c84, 0xba9ad00a, 0x293ed9e1, 0x0e76ca37, 0x9dd2c3dc, 0x40e6ed9b, 0xd342e470,
+		0xf40af7a6, 0x67aefe4d, 0x3b570b3c, 0xa8f302d7, 0x8fbb1101, 0x1c1f18ea, 0xc12b36ad,
+		0x528f3f46, 0x75c72c90, 0xe663257b, 0x5c0b79f5, 0xcfaf701e, 0xe8e763c8, 0x7b436a23,
+		0xa6774464, 0x35d34d8f, 0x129b5e59, 0x813f57b2, 0xf5efeeae, 0x664be745, 0x4103f493,
+		0xd2a7fd78, 0x0f93d33f, 0x9c37dad4, 0xbb7fc902, 0x28dbc0e9, 0x92b39c67, 0x0117958c,
+		0x265f865a, 0xb5fb8fb1, 0x68cfa1f6, 0xfb6ba81d, 0xdc23bbcb, 0x4f87b220, 0x3582c9f3,
+		0xa626c018, 0x816ed3ce, 0x12cada25, 0xcffef462, 0x5c5afd89, 0x7b12ee5f, 0xe8b6e7b4,
+		0x52debb3a, 0xc17ab2d1, 0xe632a107, 0x7596a8ec, 0xa8a286ab, 0x3b068f40, 0x1c4e9c96,
+		0x8fea957d, 0xfb3a2c61, 0x689e258a, 0x4fd6365c, 0xdc723fb7, 0x014611f0, 0x92e2181b,
+		0xb5aa0bcd, 0x260e0226, 0x9c665ea8, 0x0fc25743, 0x288a4495, 0xbb2e4d7e, 0x661a6339,
+		0xf5be6ad2, 0xd2f67904, 0x415270ef, 0x26fc8ea2, 0xb5588749, 0x9210949f, 0x01b49d74,
+		0xdc80b333, 0x4f24bad8, 0x686ca90e, 0xfbc8a0e5, 0x41a0fc6b, 0xd204f580, 0xf54ce656,
+		0x66e8efbd, 0xbbdcc1fa, 0x2878c811, 0x0f30dbc7, 0x9c94d22c, 0xe8446b30, 0x7be062db,
+		0x5ca8710d, 0xcf0c78e6, 0x123856a1, 0x819c5f4a, 0xa6d44c9c, 0x35704577, 0x8f1819f9,
+		0x1cbc1012, 0x3bf403c4, 0xa8500a2f, 0x75642468, 0xe6c02d83, 0xc1883e55, 0x522c37be,
+		0x28294c6d, 0xbb8d4586, 0x9cc55650, 0x0f615fbb, 0xd25571fc, 0x41f17817, 0x66b96bc1,
+		0xf51d622a, 0x4f753ea4, 0xdcd1374f, 0xfb992499, 0x683d2d72, 0xb5090335, 0x26ad0ade,
+		0x01e51908, 0x924110e3, 0xe691a9ff, 0x7535a014, 0x527db3c2, 0xc1d9ba29, 0x1ced946e,
+		0x8f499d85, 0xa8018e53, 0x3ba587b8, 0x81cddb36, 0x1269d2dd, 0x3521c10b, 0xa685c8e0,
+		0x7bb1e6a7, 0xe815ef4c, 0xcf5dfc9a, 0x5cf9f571};
+
+	for (size_t i = 0; i < len; i++) {
+		crc = (crc << 8) ^ table[((crc >> 24) ^ data[i]) & 0xff];
+	}
+
+#else
+
+	/**
+	 * CRC table generated from polynomial 0x93a409eb CRC-32K/4.2 (*op) (Koopman)
+	 *
+	 * pycrc --width 32 --poly 0x93a409eb --reflect-in False --xor-in 0 --reflect-out False
+	 * --xor-out 0 --generate table --table-idx-width 4
+	 */
+	static const uint32_t table[16] = {0x00000000, 0x93a409eb, 0xb4ec1a3d, 0x274813d6,
+					   0xfa7c3d91, 0x69d8347a, 0x4e9027ac, 0xdd342e47,
+					   0x675c72c9, 0xf4f87b22, 0xd3b068f4, 0x4014611f,
+					   0x9d204f58, 0x0e8446b3, 0x29cc5565, 0xba685c8e};
+
+	for (size_t i = 0; i < len; i++) {
+		crc = (crc << 4) ^ table[((crc >> 28) ^ (data[i] >> 4)) & 0x0f];
+		crc = (crc << 4) ^ table[((crc >> 28) ^ data[i]) & 0x0f];
+	}
+
+#endif
+
+	return crc;
+}
diff --git a/lib/crc/crc_shell.c b/lib/crc/crc_shell.c
index 3d08a59aa17bf..189ec764806e6 100644
--- a/lib/crc/crc_shell.c
+++ b/lib/crc/crc_shell.c
@@ -32,6 +32,7 @@ static const char *const crc_types[] = {
 	[CRC24_PGP] = "24_pgp",
 	[CRC32_C] = "32_c",
 	[CRC32_IEEE] = "32_ieee",
+	[CRC32_K_4_2] = "32_k_4_2",
 };
 
 static int string_to_crc_type(const char *s)
diff --git a/lib/heap/heap.c b/lib/heap/heap.c
index 517c43f5085e7..4f990f906a5d1 100644
--- a/lib/heap/heap.c
+++ b/lib/heap/heap.c
@@ -298,6 +298,13 @@ void *sys_heap_alloc(struct sys_heap *heap, size_t bytes)
 	return mem;
 }
 
+void *sys_heap_noalign_alloc(struct sys_heap *heap, size_t align, size_t bytes)
+{
+	ARG_UNUSED(align);
+
+	return sys_heap_alloc(heap, bytes);
+}
+
 void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes)
 {
 	struct z_heap *h = heap->heap;
@@ -306,7 +313,7 @@ void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes)
 	/*
 	 * Split align and rewind values (if any).
 	 * We allow for one bit of rewind in addition to the alignment
-	 * value to efficiently accommodate z_heap_aligned_alloc().
+	 * value to efficiently accommodate z_alloc_helper().
 	 * So if e.g. align = 0x28 (32 | 8) this means we align to a 32-byte
 	 * boundary and then rewind 8 bytes.
 	 */
@@ -376,37 +383,24 @@ void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes)
 	return mem;
 }
 
-void *sys_heap_aligned_realloc(struct sys_heap *heap, void *ptr,
-			       size_t align, size_t bytes)
+static bool inplace_realloc(struct sys_heap *heap, void *ptr, size_t bytes)
 {
 	struct z_heap *h = heap->heap;
 
-	/* special realloc semantics */
-	if (ptr == NULL) {
-		return sys_heap_aligned_alloc(heap, align, bytes);
-	}
-	if (bytes == 0) {
-		sys_heap_free(heap, ptr);
-		return NULL;
-	}
-
-	__ASSERT((align & (align - 1)) == 0, "align must be a power of 2");
-
 	if (size_too_big(h, bytes)) {
-		return NULL;
+		return false;
 	}
 
 	chunkid_t c = mem_to_chunkid(h, ptr);
-	chunkid_t rc = right_chunk(h, c);
 	size_t align_gap = (uint8_t *)ptr - (uint8_t *)chunk_mem(h, c);
 	chunksz_t chunks_need = bytes_to_chunksz(h, bytes + align_gap);
 
-	if (align && ((uintptr_t)ptr & (align - 1))) {
-		/* ptr is not sufficiently aligned */
-	} else if (chunk_size(h, c) == chunks_need) {
+	if (chunk_size(h, c) == chunks_need) {
 		/* We're good already */
-		return ptr;
-	} else if (chunk_size(h, c) > chunks_need) {
+		return true;
+	}
+
+	if (chunk_size(h, c) > chunks_need) {
 		/* Shrink in place, split off and free unused suffix */
 #ifdef CONFIG_SYS_HEAP_LISTENER
 		size_t bytes_freed = chunksz_to_bytes(h, chunk_size(h, c));
@@ -428,9 +422,13 @@ void *sys_heap_aligned_realloc(struct sys_heap *heap, void *ptr,
 					  bytes_freed);
 #endif
 
-		return ptr;
-	} else if (!chunk_used(h, rc) &&
-		   (chunk_size(h, c) + chunk_size(h, rc) >= chunks_need)) {
+		return true;
+	}
+
+	chunkid_t rc = right_chunk(h, c);
+
+	if (!chunk_used(h, rc) &&
+	    (chunk_size(h, c) + chunk_size(h, rc) >= chunks_need)) {
 		/* Expand: split the right chunk and append */
 		chunksz_t split_size = chunks_need - chunk_size(h, c);
 
@@ -459,22 +457,66 @@ void *sys_heap_aligned_realloc(struct sys_heap *heap, void *ptr,
 					  bytes_freed);
 #endif
 
+		return true;
+	}
+
+	return false;
+}
+
+void *sys_heap_realloc(struct sys_heap *heap, void *ptr, size_t bytes)
+{
+	/* special realloc semantics */
+	if (ptr == NULL) {
+		return sys_heap_alloc(heap, bytes);
+	}
+	if (bytes == 0) {
+		sys_heap_free(heap, ptr);
+		return NULL;
+	}
+
+	if (inplace_realloc(heap, ptr, bytes)) {
+		return ptr;
+	}
+
+	/* In-place realloc was not possible: fallback to allocate and copy. */
+	void *ptr2 = sys_heap_alloc(heap, bytes);
+
+	if (ptr2 != NULL) {
+		size_t prev_size = sys_heap_usable_size(heap, ptr);
+
+		memcpy(ptr2, ptr, MIN(prev_size, bytes));
+		sys_heap_free(heap, ptr);
+	}
+	return ptr2;
+}
+
+void *sys_heap_aligned_realloc(struct sys_heap *heap, void *ptr,
+			       size_t align, size_t bytes)
+{
+	/* special realloc semantics */
+	if (ptr == NULL) {
+		return sys_heap_aligned_alloc(heap, align, bytes);
+	}
+	if (bytes == 0) {
+		sys_heap_free(heap, ptr);
+		return NULL;
+	}
+
+	__ASSERT((align & (align - 1)) == 0, "align must be a power of 2");
+
+	if ((align == 0 || ((uintptr_t)ptr & (align - 1)) == 0) &&
+	    inplace_realloc(heap, ptr, bytes)) {
 		return ptr;
-	} else {
-		;
 	}
 
 	/*
-	 * Fallback: allocate and copy
-	 *
-	 * Note for heap listener notification:
-	 * The calls to allocation and free functions generate
-	 * notification already, so there is no need to those here.
+	 * Either ptr is not sufficiently aligned for in-place realloc or
+	 * in-place realloc was not possible: fallback to allocate and copy.
 	 */
 	void *ptr2 = sys_heap_aligned_alloc(heap, align, bytes);
 
 	if (ptr2 != NULL) {
-		size_t prev_size = chunksz_to_bytes(h, chunk_size(h, c)) - align_gap;
+		size_t prev_size = sys_heap_usable_size(heap, ptr);
 
 		memcpy(ptr2, ptr, MIN(prev_size, bytes));
 		sys_heap_free(heap, ptr);
diff --git a/lib/libc/CMakeLists.txt b/lib/libc/CMakeLists.txt
index a6fecf09d66c4..075e066d59b4b 100644
--- a/lib/libc/CMakeLists.txt
+++ b/lib/libc/CMakeLists.txt
@@ -6,6 +6,7 @@ zephyr_syscall_header(
 
 add_subdirectory_ifdef(CONFIG_ARCMWDT_LIBC      arcmwdt)
 add_subdirectory_ifdef(CONFIG_ARMCLANG_STD_LIBC armstdc)
+add_subdirectory_ifdef(CONFIG_IAR_LIBC          iar)
 add_subdirectory_ifdef(CONFIG_MINIMAL_LIBC      minimal)
 add_subdirectory_ifdef(CONFIG_NEWLIB_LIBC       newlib)
 add_subdirectory_ifdef(CONFIG_PICOLIBC          picolibc)
diff --git a/lib/libc/Kconfig b/lib/libc/Kconfig
index 150ab256c6fff..5d981e4719b0b 100644
--- a/lib/libc/Kconfig
+++ b/lib/libc/Kconfig
@@ -51,6 +51,13 @@ config PICOLIBC_SUPPORTED
 	help
 	  Selected when the target has support for picolibc.
 
+config IAR_LIBC_SUPPORTED
+	bool
+	default n
+	select FULL_LIBC_SUPPORTED
+	help
+	  Selected if the target is an IAR Systems compiler
+
 config NATIVE_LIBC_INCOMPATIBLE
 	bool
 	help
@@ -65,6 +72,7 @@ choice LIBC_IMPLEMENTATION
 	default PICOLIBC
 	default NEWLIB_LIBC if REQUIRES_FULL_LIBC
 	default MINIMAL_LIBC
+	default IAR_LIBC
 
 config MINIMAL_LIBC
 	bool "Minimal C library"
@@ -87,6 +95,7 @@ config PICOLIBC
 	select NEED_LIBC_MEM_PARTITION
 	select TC_PROVIDES_POSIX_C_LANG_SUPPORT_R
 	imply COMMON_LIBC_MALLOC
+	imply COMMON_LIBC_ABORT
 	depends on PICOLIBC_SUPPORTED
 	help
 	  Build with picolibc library. The picolibc library is built as
@@ -123,6 +132,17 @@ config EXTERNAL_LIBC
 	help
 	  Build with external/user provided C library.
 
+config IAR_LIBC
+	bool "IAR C Runtime Library"
+	depends on IAR_LIBC_SUPPORTED
+	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "iar"
+	select COMMON_LIBC_STRNLEN
+	select COMMON_LIBC_TIME if POSIX_TIMERS
+	help
+	  Use the full IAR Compiler runtime libraries.
+	  A reduced Zephyr minimal libc will be used for library functionality
+	  not provided by the IAR C Runtime Library.
+
 endchoice # LIBC_IMPLEMENTATION
 
 config HAS_NEWLIB_LIBC_NANO
diff --git a/lib/libc/iar/CMakeLists.txt b/lib/libc/iar/CMakeLists.txt
new file mode 100644
index 0000000000000..f57ab75d2d303
--- /dev/null
+++ b/lib/libc/iar/CMakeLists.txt
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources(src/libc-hooks.c)
+zephyr_system_include_directories(include)
diff --git a/lib/libc/iar/include/errno.h b/lib/libc/iar/include/errno.h
new file mode 100644
index 0000000000000..6310531a75c03
--- /dev/null
+++ b/lib/libc/iar/include/errno.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Defines additional error numbers based on POSIX
+ */
+
+#ifndef ZEPHYR_LIB_LIBC_IAR_INCLUDE_ERRNO_H_
+#define ZEPHYR_LIB_LIBC_IAR_INCLUDE_ERRNO_H_
+
+#include_next <errno.h>
+
+#ifndef __cplusplus
+#define EPERM            1  /**< Not owner */
+#define ENOENT           2  /**< No such file or directory */
+#define ESRCH            3  /**< No such context */
+#define EINTR            4  /**< Interrupted system call */
+#define EIO              5  /**< I/O error */
+#define ENXIO            6  /**< No such device or address */
+#define E2BIG            7  /**< Arg list too long */
+#define ENOEXEC          8  /**< Exec format error */
+#define EBADF            9  /**< Bad file number */
+#define ECHILD          10  /**< No children */
+#define EAGAIN          11  /**< No more contexts */
+#define ENOMEM          12  /**< Not enough core */
+#define EACCES          13  /**< Permission denied */
+#define EFAULT          14  /**< Bad address */
+#define ENOTBLK         15  /**< Block device required */
+#define EBUSY           16  /**< Mount device busy */
+#define EEXIST          17  /**< File exists */
+#define EXDEV           18  /**< Cross-device link */
+#define ENODEV          19  /**< No such device */
+#define ENOTDIR         20  /**< Not a directory */
+#define EISDIR          21  /**< Is a directory */
+#define EINVAL          22  /**< Invalid argument */
+#define ENFILE          23  /**< File table overflow */
+#define EMFILE          24  /**< Too many open files */
+#define ENOTTY          25  /**< Not a typewriter */
+#define ETXTBSY         26  /**< Text file busy */
+#define EFBIG           27  /**< File too large */
+#define ENOSPC          28  /**< No space left on device */
+#define ESPIPE          29  /**< Illegal seek */
+#define EROFS           30  /**< Read-only file system */
+#define EMLINK          31  /**< Too many links */
+#define EPIPE           32  /**< Broken pipe */
+#define ENOMSG          35  /**< Unexpected message type */
+#define EDEADLK         45  /**< Resource deadlock avoided */
+#define ENOLCK          46  /**< No locks available */
+#define ENOSTR          60  /**< STREAMS device required */
+#define ENODATA         61  /**< Missing expected message data */
+#define ETIME           62  /**< STREAMS timeout occurred */
+#define ENOSR           63  /**< Insufficient memory */
+#define EPROTO          71  /**< Generic STREAMS error */
+#define EBADMSG         77  /**< Invalid STREAMS message */
+#define ENOSYS          88  /**< Function not implemented */
+#define ENOTEMPTY       90  /**< Directory not empty */
+#define ENAMETOOLONG    91  /**< File name too long */
+#define ELOOP           92  /**< Too many levels of symbolic links */
+#define EOPNOTSUPP      95  /**< Operation not supported on socket */
+#define EPFNOSUPPORT    96  /**< Protocol family not supported */
+#define ECONNRESET      104 /**< Connection reset by peer */
+#define ENOBUFS         105 /**< No buffer space available */
+#define EAFNOSUPPORT    106 /**< Addr family not supported */
+#define EPROTOTYPE      107 /**< Protocol wrong type for socket */
+#define ENOTSOCK        108 /**< Socket operation on non-socket */
+#define ENOPROTOOPT     109 /**< Protocol not available */
+#define ESHUTDOWN       110 /**< Can't send after socket shutdown */
+#define ECONNREFUSED    111 /**< Connection refused */
+#define EADDRINUSE      112 /**< Address already in use */
+#define ECONNABORTED    113 /**< Software caused connection abort */
+#define ENETUNREACH     114 /**< Network is unreachable */
+#define ENETDOWN        115 /**< Network is down */
+#define ETIMEDOUT       116 /**< Connection timed out */
+#define EHOSTDOWN       117 /**< Host is down */
+#define EHOSTUNREACH    118 /**< No route to host */
+#define EINPROGRESS     119 /**< Operation now in progress */
+#define EALREADY        120 /**< Operation already in progress */
+#define EDESTADDRREQ    121 /**< Destination address required */
+#define EMSGSIZE        122 /**< Message size */
+#define EPROTONOSUPPORT 123 /**< Protocol not supported */
+#define ESOCKTNOSUPPORT 124 /**< Socket type not supported */
+#define EADDRNOTAVAIL   125 /**< Can't assign requested address */
+#define ENETRESET       126 /**< Network dropped connection on reset */
+#define EISCONN         127 /**< Socket is already connected */
+#define ENOTCONN        128 /**< Socket is not connected */
+#define ETOOMANYREFS    129 /**< Too many references: can't splice */
+#define ENOTSUP         134 /**< Unsupported value */
+#define EOVERFLOW       139 /**< Value overflow */
+#define ECANCELED       140 /**< Operation canceled */
+#define EWOULDBLOCK  EAGAIN /**< Operation would block */
+#endif /* __cplusplus */
+#endif /* ZEPHYR_LIB_LIBC_IAR_INCLUDE_ERRNO_H_ */
diff --git a/lib/libc/iar/include/limits.h b/lib/libc/iar/include/limits.h
new file mode 100644
index 0000000000000..50decad13ad18
--- /dev/null
+++ b/lib/libc/iar/include/limits.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_LIB_LIBC_IAR_INCLUDE_LIMITS_H_
+#define ZEPHYR_LIB_LIBC_IAR_INCLUDE_LIMITS_H_
+
+#include_next <limits.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PATH_MAX 256
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_LIB_LIBC_IAR_INCLUDE_LIMITS_H_ */
diff --git a/lib/libc/iar/include/sys/_timespec.h b/lib/libc/iar/include/sys/_timespec.h
new file mode 100644
index 0000000000000..1ea3b4da5bff8
--- /dev/null
+++ b/lib/libc/iar/include/sys/_timespec.h
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* file is intentionally empty */
diff --git a/lib/libc/iar/include/sys/_timeval.h b/lib/libc/iar/include/sys/_timeval.h
new file mode 100644
index 0000000000000..43f8f7f8c8973
--- /dev/null
+++ b/lib/libc/iar/include/sys/_timeval.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS__TIMEVAL_H_
+#define ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS__TIMEVAL_H_
+
+#include <stdint.h>
+
+#if !defined(__time_t_defined)
+#define __time_t_defined
+typedef long long time_t;
+#endif
+
+#if !defined(__suseconds_t_defined)
+#define __suseconds_t_defined
+typedef int32_t suseconds_t;
+#endif
+
+struct timeval {
+	time_t tv_sec;
+	suseconds_t tv_usec;
+};
+
+#endif /* ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS__TIMEVAL_H_ */
diff --git a/lib/libc/iar/include/sys/cdefs.h b/lib/libc/iar/include/sys/cdefs.h
new file mode 100644
index 0000000000000..1ea3b4da5bff8
--- /dev/null
+++ b/lib/libc/iar/include/sys/cdefs.h
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* file is intentionally empty */
diff --git a/lib/libc/iar/include/sys/timespec.h b/lib/libc/iar/include/sys/timespec.h
new file mode 100644
index 0000000000000..d5c0549dbc9da
--- /dev/null
+++ b/lib/libc/iar/include/sys/timespec.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS_TIMESPEC_H_
+#define ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS_TIMESPEC_H_
+
+#include <sys/types.h>
+#include <sys/_timespec.h>
+
+struct itimerspec {
+	struct timespec it_interval;  /* Timer interval */
+	struct timespec it_value;     /* Timer expiration */
+};
+
+#endif /* ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS_TIMESPEC_H_ */
diff --git a/lib/libc/iar/include/sys/types.h b/lib/libc/iar/include/sys/types.h
new file mode 100644
index 0000000000000..9654efc25ee25
--- /dev/null
+++ b/lib/libc/iar/include/sys/types.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS_TYPES_H_
+#define ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS_TYPES_H_
+
+typedef unsigned int mode_t;
+typedef signed long ssize_t;
+typedef int off_t;
+typedef __INT64_TYPE__ time_t;
+
+#if !defined(_CLOCK_T_DECLARED) && !defined(__clock_t_defined)
+typedef unsigned int clock_t;
+#define _CLOCK_T_DECLARED
+#define __clock_t_defined
+#endif
+
+#endif /* ZEPHYR_LIB_LIBC_IAR_INCLUDE_SYS_TYPES_H_ */
diff --git a/lib/libc/iar/include/time.h b/lib/libc/iar/include/time.h
new file mode 100644
index 0000000000000..b095987857418
--- /dev/null
+++ b/lib/libc/iar/include/time.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Declares additional time related functions based on POSIX
+ */
+
+#ifndef ZEPHYR_LIB_LIBC_IAR_INCLUDE_TIME_H_
+#define ZEPHYR_LIB_LIBC_IAR_INCLUDE_TIME_H_
+
+#include <zephyr/toolchain.h>
+#include_next <time.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char      *asctime_r(const struct tm *ZRESTRICT tp, char *ZRESTRICT buf);
+char      *ctime_r(const time_t *clock, char *buf);
+struct tm *gmtime_r(const time_t *ZRESTRICT timep, struct tm *ZRESTRICT result);
+struct tm *localtime_r(const time_t *ZRESTRICT timer, struct tm *ZRESTRICT result);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_LIB_LIBC_IAR_INCLUDE_TIME_H_ */
diff --git a/lib/libc/iar/src/libc-hooks.c b/lib/libc/iar/src/libc-hooks.c
new file mode 100644
index 0000000000000..d3deea9658a48
--- /dev/null
+++ b/lib/libc/iar/src/libc-hooks.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025 IAR Systems AB
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <stdio.h>
+
+static int _stdout_hook_default(int c)
+{
+	(void)(c); /* Prevent warning about unused argument */
+
+	return EOF;
+}
+
+static int (*_stdout_hook)(int) = _stdout_hook_default;
+
+void __stdout_hook_install(int (*hook)(int))
+{
+	_stdout_hook = hook;
+}
+
+int fputc(int c, FILE *f)
+{
+	return (_stdout_hook)(c);
+}
+
+#pragma weak __write
+size_t __write(int handle, const unsigned char *buf, size_t bufSize)
+{
+	size_t nChars = 0;
+	/* Check for the command to flush all handles */
+	if (handle == -1) {
+		return 0;
+	}
+	/* Check for stdout and stderr
+	 * (only necessary if FILE descriptors are enabled.)
+	 */
+	if (handle != 1 && handle != 2) {
+		return -1;
+	}
+	for (/* Empty */; bufSize > 0; --bufSize) {
+		int ret = (_stdout_hook)(*buf);
+
+		if (ret == EOF) {
+			break;
+		}
+		++buf;
+		++nChars;
+	}
+	return nChars;
+}
diff --git a/lib/libc/minimal/include/sys/cdefs.h b/lib/libc/minimal/include/sys/cdefs.h
index e69de29bb2d1d..036185a88ad61 100644
--- a/lib/libc/minimal/include/sys/cdefs.h
+++ b/lib/libc/minimal/include/sys/cdefs.h
@@ -0,0 +1,4 @@
+/**
+ * This file is intentionally empty.
+ * It allows code including it to compile with the minimal libc.
+ */
diff --git a/lib/libc/picolibc/assert.c b/lib/libc/picolibc/assert.c
index 806d996a230a1..7eede1e49d92b 100644
--- a/lib/libc/picolibc/assert.c
+++ b/lib/libc/picolibc/assert.c
@@ -11,18 +11,22 @@
 FUNC_NORETURN void __assert_func(const char *file, int line,
 				 const char *function, const char *expression)
 {
+#if __ASSERT_ON
 	__ASSERT(0, "assertion \"%s\" failed: file \"%s\", line %d%s%s\n",
 		 expression, file, line,
 		 function ? ", function: " : "", function ? function : "");
-	CODE_UNREACHABLE;
+#endif
+	abort();
 }
 
 #else
 
 FUNC_NORETURN void __assert_no_args(void)
 {
+#if __ASSERT_ON
 	__ASSERT_NO_MSG(0);
-	CODE_UNREACHABLE;
+#endif
+	abort();
 }
 
 #endif
diff --git a/lib/net_buf/buf.c b/lib/net_buf/buf.c
index 7b89e89fd7b73..fc861012ebcdd 100644
--- a/lib/net_buf/buf.c
+++ b/lib/net_buf/buf.c
@@ -388,27 +388,6 @@ struct net_buf *net_buf_alloc_with_data(struct net_buf_pool *pool,
 	return buf;
 }
 
-#if defined(CONFIG_NET_BUF_LOG)
-struct net_buf *net_buf_get_debug(struct k_fifo *fifo, k_timeout_t timeout,
-				  const char *func, int line)
-#else
-struct net_buf *net_buf_get(struct k_fifo *fifo, k_timeout_t timeout)
-#endif
-{
-	struct net_buf *buf;
-
-	NET_BUF_DBG("%s():%d: fifo %p", func, line, fifo);
-
-	buf = k_fifo_get(fifo, timeout);
-	if (!buf) {
-		return NULL;
-	}
-
-	NET_BUF_DBG("%s():%d: buf %p fifo %p", func, line, buf, fifo);
-
-	return buf;
-}
-
 static struct k_spinlock net_buf_slist_lock;
 
 void net_buf_slist_put(sys_slist_t *list, struct net_buf *buf)
@@ -439,14 +418,6 @@ struct net_buf *net_buf_slist_get(sys_slist_t *list)
 	return buf;
 }
 
-void net_buf_put(struct k_fifo *fifo, struct net_buf *buf)
-{
-	__ASSERT_NO_MSG(fifo);
-	__ASSERT_NO_MSG(buf);
-
-	k_fifo_put(fifo, buf);
-}
-
 #if defined(CONFIG_NET_BUF_LOG)
 void net_buf_unref_debug(struct net_buf *buf, const char *func, int line)
 #else
diff --git a/lib/open-amp/Kconfig b/lib/open-amp/Kconfig
index 1ad554cd90b80..b27c8c216444f 100644
--- a/lib/open-amp/Kconfig
+++ b/lib/open-amp/Kconfig
@@ -34,3 +34,15 @@ config OPENAMP_RSC_TABLE_IPM_TX_ID
 	help
 	   This option specifies the IPM TX channel ID used in a VRING
 	   for interprocessor communication
+
+config OPENAMP_COPY_RSC_TABLE
+	bool "Copy resource table section"
+	help
+	  The .resource_table section must be placed in a specific location
+	  known by both this core and the remote core. If this is not taken
+	  care of by the remote then this firmware has the ability to copy
+	  the table to a specific location. This memory region can be declared
+	  in the device tree by the "zephyr,ipc_rsc_table" node.
+
+	  This is not needed if the remote loads this firmware and has control
+	  over the placement of the .resource_table section such as remoteproc.
diff --git a/lib/open-amp/resource_table.c b/lib/open-amp/resource_table.c
index 1bc8d5cb6ebc0..49e836d9afc8f 100644
--- a/lib/open-amp/resource_table.c
+++ b/lib/open-amp/resource_table.c
@@ -29,6 +29,12 @@
 #include <zephyr/kernel.h>
 #include <resource_table.h>
 
+#ifdef CONFIG_OPENAMP_COPY_RSC_TABLE
+#define RSC_TABLE_ADDR	DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_rsc_table))
+#define RSC_TABLE_SIZE	DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_rsc_table))
+BUILD_ASSERT(sizeof(struct fw_resource_table) <= RSC_TABLE_SIZE);
+#endif
+
 extern char ram_console_buf[];
 
 #define __resource Z_GENERIC_SECTION(.resource_table)
@@ -76,6 +82,11 @@ static struct fw_resource_table __resource resource_table = {
 
 void rsc_table_get(struct fw_resource_table **table_ptr, int *length)
 {
-	*table_ptr = &resource_table;
 	*length = sizeof(resource_table);
+#ifdef CONFIG_OPENAMP_COPY_RSC_TABLE
+	*table_ptr = (struct fw_resource_table *)RSC_TABLE_ADDR;
+	memcpy(*table_ptr, &resource_table, *length);
+#else
+	*table_ptr = &resource_table;
+#endif
 }
diff --git a/lib/os/Kconfig b/lib/os/Kconfig
index 9ce3be2a66ebf..004df87ccf390 100644
--- a/lib/os/Kconfig
+++ b/lib/os/Kconfig
@@ -106,6 +106,16 @@ config MPSC_CLEAR_ALLOCATED
 	  When enabled packet space is zeroed before returning from allocation.
 endif
 
+if SCHED_DEADLINE
+
+config P4WQ_INIT_STAGE_EARLY
+	bool "Early initialization of P4WQ threads"
+	help
+	  Initialize P4WQ threads early so that the P4WQ can be used on devices
+	  initialization sequence.
+
+endif
+
 config REBOOT
 	bool "Reboot functionality"
 	help
diff --git a/lib/os/fdtable.c b/lib/os/fdtable.c
index 0299e89812a34..be53627efca7b 100644
--- a/lib/os/fdtable.c
+++ b/lib/os/fdtable.c
@@ -550,9 +550,7 @@ static ssize_t stdinout_read_vmeth(void *obj, void *buffer, size_t count)
 
 static ssize_t stdinout_write_vmeth(void *obj, const void *buffer, size_t count)
 {
-#if defined(CONFIG_BOARD_NATIVE_POSIX)
-	return zvfs_write(1, buffer, count, NULL);
-#elif defined(CONFIG_NEWLIB_LIBC) || defined(CONFIG_ARCMWDT_LIBC)
+#if defined(CONFIG_NEWLIB_LIBC) || defined(CONFIG_ARCMWDT_LIBC)
 	return z_impl_zephyr_write_stdout(buffer, count);
 #else
 	return 0;
diff --git a/lib/os/mpsc_pbuf.c b/lib/os/mpsc_pbuf.c
index 79f991d1f82f9..56c8def5bc4fe 100644
--- a/lib/os/mpsc_pbuf.c
+++ b/lib/os/mpsc_pbuf.c
@@ -627,18 +627,28 @@ bool mpsc_pbuf_is_pending(struct mpsc_pbuf_buffer *buffer)
 void mpsc_pbuf_get_utilization(struct mpsc_pbuf_buffer *buffer,
 			       uint32_t *size, uint32_t *now)
 {
+	k_spinlock_key_t key = k_spin_lock(&buffer->lock);
+
 	/* One byte is left for full/empty distinction. */
 	*size = (buffer->size - 1) * sizeof(int);
 	*now = get_usage(buffer) * sizeof(int);
+
+	k_spin_unlock(&buffer->lock, key);
 }
 
 int mpsc_pbuf_get_max_utilization(struct mpsc_pbuf_buffer *buffer, uint32_t *max)
 {
+	int rc;
+	k_spinlock_key_t key = k_spin_lock(&buffer->lock);
 
-	if (!(buffer->flags & MPSC_PBUF_MAX_UTILIZATION)) {
-		return -ENOTSUP;
+	if (buffer->flags & MPSC_PBUF_MAX_UTILIZATION) {
+		*max = buffer->max_usage * sizeof(int);
+		rc = 0;
+	} else {
+		rc = -ENOTSUP;
 	}
 
-	*max = buffer->max_usage * sizeof(int);
-	return 0;
+	k_spin_unlock(&buffer->lock, key);
+
+	return rc;
 }
diff --git a/lib/os/p4wq.c b/lib/os/p4wq.c
index d05cdc4bdd982..6d519230c3748 100644
--- a/lib/os/p4wq.c
+++ b/lib/os/p4wq.c
@@ -218,7 +218,11 @@ void k_p4wq_enable_static_thread(struct k_p4wq *queue, struct k_thread *thread,
  * so they can initialize in parallel instead of serially on the main
  * CPU.
  */
+#if defined(CONFIG_P4WQ_INIT_STAGE_EARLY)
+SYS_INIT(static_init, POST_KERNEL, 1);
+#else
 SYS_INIT(static_init, APPLICATION, 99);
+#endif
 
 void k_p4wq_submit(struct k_p4wq *queue, struct k_p4wq_work *item)
 {
diff --git a/lib/posix/options/Kconfig b/lib/posix/options/Kconfig
index 15d7f2233e630..6c2b129170e30 100644
--- a/lib/posix/options/Kconfig
+++ b/lib/posix/options/Kconfig
@@ -42,8 +42,6 @@ endmenu # "X/Open system interfaces"
 
 rsource "Kconfig.compat"
 
-rsource "Kconfig.deprecated"
-
 rsource "Kconfig.toolchain"
 
 endmenu # "POSIX Options"
diff --git a/lib/posix/options/Kconfig.deprecated b/lib/posix/options/Kconfig.deprecated
deleted file mode 100644
index 95e1d04431e9d..0000000000000
--- a/lib/posix/options/Kconfig.deprecated
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright (c) 2024 Tenstorrent AI ULC
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# This file should be removed after Zephyr 4.0 is released
-
-menu "Deprecated POSIX options"
-
-config EVENTFD_MAX
-	int "Maximum number of eventfd's [DEPRECATED]"
-	default ZVFS_EVENTFD_MAX if ZVFS_EVENTFD
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_ZVFS_EVENTFD_MAX instead.
-
-config FNMATCH
-	bool "Support for fnmatch [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_C_LIB_EXT
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_C_LIB_EXT instead.
-
-config GETOPT
-	bool "Getopt library support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_C_LIB_EXT
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_C_LIB_EXT instead.
-
-config MAX_PTHREAD_COUNT
-	int "Maximum number of pthread_t [DEPRECATED]"
-	default POSIX_THREAD_THREADS_MAX if POSIX_THREADS
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_THREAD_THREADS_MAX instead.
-
-config MAX_PTHREAD_KEY_COUNT
-	int "Maximum number of pthread_key_t [DEPRECATED]"
-	default POSIX_THREAD_KEYS_MAX if POSIX_THREADS
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_THREAD_KEYS_MAX instead.
-
-config MAX_TIMER_COUNT
-	int "Maximum number of timer_t [DEPRECATED]"
-	default POSIX_TIMER_MAX if POSIX_TIMERS
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_TIMER_MAX instead.
-
-config MSG_COUNT_MAX
-	int "Maximum number of messages in a POSIX message queue [DEPRECATED]"
-	default POSIX_MQ_OPEN_MAX if POSIX_MESSAGE_PASSING
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_MQ_OPEN_MAX instead.
-
-config POSIX_CLOCK
-	bool "clock and sleep APIs [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_CLOCK_SELECTION
-	select POSIX_CPUTIME
-	select POSIX_MONOTONIC_CLOCK
-	select POSIX_TIMERS
-	select POSIX_TIMEOUTS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_TIMERS instead.
-
-config POSIX_FS
-	bool "Support for environ, getenv(), getenv_r(), setenv(), and unsetenv() [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_FILE_SYSTEM
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_FILE_SYSTEM instead.
-
-config POSIX_LIMITS_RTSIG_MAX
-	int "_POSIX_RTSIG_MAX value in limits.h [DEPRECATED]"
-	default POSIX_RTSIG_MAX if POSIX_REALTIME_SIGNALS
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_RTSIG_MAX instead.
-
-config POSIX_MAX_FDS
-	int "Maximum number of open file descriptors [DEPRECATED]"
-	default POSIX_OPEN_MAX
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_OPEN_MAX instead.
-
-	  See also CONFIG_ZVFS_OPEN_MAX.
-
-config POSIX_MAX_OPEN_FILES
-	int "Maximum number of open file descriptors [DEPRECATED]"
-	default POSIX_OPEN_MAX
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_OPEN_MAX instead.
-
-	  See also CONFIG_ZVFS_OPEN_MAX.
-
-config POSIX_MQUEUE
-	bool "Message queue support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_MESSAGE_PASSING
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_MESSAGE_PASSING instead.
-
-config POSIX_PUTMSG
-	bool "Support for putmsg function [DEPRECATED]"
-	select DEPRECATED
-	select XOPEN_STREAMS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_XOPEN_STREAMS instead.
-
-config POSIX_SIGNAL
-	bool "Support for POSIX signal APIs [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_SIGNALS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_SIGNALS instead.
-
-config POSIX_SYSCONF
-	bool "Support for sysconf() [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_SINGLE_PROCESS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_SINGLE_PROCESS instead.
-
-config POSIX_UNAME
-	bool "Support for uname [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_SINGLE_PROCESS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_SINGLE_PROCESS instead.
-
-config PTHREAD
-	bool "pthread_t support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_THREADS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_THREADS instead.
-
-config PTHREAD_BARRIER
-	bool "pthread_barrier_t support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_BARRIERS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_BARRIERS instead.
-
-config PTHREAD_COND
-	bool "pthread_cond_t support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_THREADS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_THREADS instead.
-
-
-config PTHREAD_IPC
-	bool "POSIX pthread IPC API [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_THREADS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_THREADS instead.
-
-config PTHREAD_KEY
-	bool "pthread_key_t support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_THREADS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_THREADS instead.
-
-config PTHREAD_MUTEX
-	bool "pthread_mutex_t support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_THREADS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_THREADS instead.
-
-config PTHREAD_RWLOCK
-	bool "pthread_spinlock_t support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_READER_WRITER_LOCKS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_READER_WRITER_LOCKS instead.
-
-config PTHREAD_SPINLOCK
-	bool "pthread_spinlock_t support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_SPIN_LOCKS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_SPIN_LOCKS instead.
-
-config TIMER
-	bool "Timer support [DEPRECATED]"
-	select DEPRECATED
-	select POSIX_TIMERS
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_TIMERS instead.
-
-config TIMER_DELAYTIMER_MAX
-	int "Maximum count returned my timer_getoverrun() in POSIX application [DEPRECATED]"
-	default POSIX_DELAYTIMER_MAX if POSIX_TIMERS
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_DELAYTIMER_MAX instead.
-
-config SEM_NAMELEN_MAX
-	int "Maximum name length [DEPRECATED]"
-	default POSIX_SEM_NAMELEN_MAX if POSIX_SEMAPHORES
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_SEM_NAMELEN_MAX instead.
-
-config SEM_VALUE_MAX
-	int "Maximum semaphore limit [DEPRECATED]"
-	default POSIX_SEM_VALUE_MAX if POSIX_SEMAPHORES
-	default 0
-	help
-	  This option is deprecated.
-
-	  Please use CONFIG_POSIX_SEM_VALUE_MAX instead.
-
-endmenu
diff --git a/lib/posix/options/Kconfig.mem b/lib/posix/options/Kconfig.mem
index b910ee88619de..346b5d363aac8 100644
--- a/lib/posix/options/Kconfig.mem
+++ b/lib/posix/options/Kconfig.mem
@@ -27,11 +27,12 @@ config POSIX_SHARED_MEMORY_OBJECTS
 
 config POSIX_MAPPED_FILES
 	bool "POSIX memory-mapped files"
-	# disable Xtensa for now until linker issues are resolved
-	imply MMU if (CPU_HAS_MMU && !XTENSA)
 	help
 	  Select 'y' here and Zephyr will provide support for mmap(), msync(), and munmap().
 
+	  Note: This feature depends on hardware MMU support. If the underlying platform does not
+	  support an MMU, then affected POSIX API functions may return -1 and set errno to ENOTSUP.
+
 	  For more information, please see
 	  https://pubs.opengroup.org/onlinepubs/9699919799.orig/functions/V2_chap02.html
 	  https://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_port.html#tag_24_03_04
@@ -43,17 +44,23 @@ config POSIX_MEMLOCK
 	help
 	  Select 'y' here and Zephyr will provide support for mlockall() and munlockall().
 
+	  Note: This feature depends on hardware MMU support as well as DEMAND_PAGING. If the
+	  underlying platform does not support an MMU or DEMAND_PAGING, then affected POSIX API
+	  functions will return -1 and set errno to ENOTSUP.
+
 	  For more information, please see
 	  https://pubs.opengroup.org/onlinepubs/9699919799.orig/functions/V2_chap02.html
 	  https://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_port.html#tag_24_03_04
 
 config POSIX_MEMLOCK_RANGE
 	bool "POSIX range memory locking"
-	imply MMU if (CPU_HAS_MMU && ARCH_HAS_DEMAND_PAGING)
 	imply DEMAND_PAGING
 	help
 	  Select 'y' here and Zephyr will provide support for mlock() and munlock().
 
+	  Note: This feature depends on hardware MMU support. If the underlying platform does not
+	  support an MMU, then affected POSIX API functions will return -1 and set errno to ENOTSUP.
+
 	  For more information, please see
 	  https://pubs.opengroup.org/onlinepubs/9699919799.orig/functions/V2_chap02.html
 	  https://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_port.html#tag_24_03_04
diff --git a/lib/posix/options/Kconfig.profile b/lib/posix/options/Kconfig.profile
index 4f97786b0d577..2eb0c9a11ce05 100644
--- a/lib/posix/options/Kconfig.profile
+++ b/lib/posix/options/Kconfig.profile
@@ -11,7 +11,6 @@ config POSIX_API
 	select POSIX_NETWORKING if NETWORKING # inet_ntoa(), socket(), etc
 	imply EVENTFD # eventfd(), eventfd_read(), eventfd_write()
 	imply POSIX_FD_MGMT # open(), close(), read(), write()
-	imply POSIX_MESSAGE_PASSING # mq_open(), etc
 	imply POSIX_MULTI_PROCESS # sleep(), getpid(), etc
 	help
 	  This option enables the required POSIX System Interfaces (base definitions), all of PSE51,
diff --git a/lib/posix/options/Kconfig.pthread b/lib/posix/options/Kconfig.pthread
index 4eef794039a31..438506fe2182f 100644
--- a/lib/posix/options/Kconfig.pthread
+++ b/lib/posix/options/Kconfig.pthread
@@ -15,6 +15,9 @@ menuconfig POSIX_THREADS
 
 if POSIX_THREADS
 
+config HEAP_MEM_POOL_ADD_SIZE_POSIX_THREADS
+	def_int 256
+
 config POSIX_THREAD_THREADS_MAX
 	int "Maximum number of POSIX threads"
 	default 5
diff --git a/lib/posix/options/key.c b/lib/posix/options/key.c
index aba457e944eda..db70394914287 100644
--- a/lib/posix/options/key.c
+++ b/lib/posix/options/key.c
@@ -26,7 +26,7 @@ SYS_SEM_DEFINE(pthread_key_lock, 1, 1);
  * the theoretical pthread_key_t range is [0,2147483647].
  */
 BUILD_ASSERT(CONFIG_POSIX_THREAD_KEYS_MAX < PTHREAD_OBJ_MASK_INIT,
-	     "CONFIG_MAX_PTHREAD_KEY_COUNT is too high");
+	     "CONFIG_POSIX_THREAD_KEYS_MAX is too high");
 
 static pthread_key_obj posix_key_pool[CONFIG_POSIX_THREAD_KEYS_MAX];
 SYS_BITARRAY_DEFINE_STATIC(posix_key_bitarray, CONFIG_POSIX_THREAD_KEYS_MAX);
diff --git a/lib/posix/options/mqueue.c b/lib/posix/options/mqueue.c
index ce77283e63782..12bbf30d0ab5e 100644
--- a/lib/posix/options/mqueue.c
+++ b/lib/posix/options/mqueue.c
@@ -424,7 +424,7 @@ static mqueue_object *find_in_list(const char *name)
 
 	while (mq != NULL) {
 		msg_queue = (mqueue_object *)mq;
-		if (strcmp(msg_queue->name, name) == 0) {
+		if ((msg_queue->name != NULL) && (strcmp(msg_queue->name, name) == 0)) {
 			return msg_queue;
 		}
 
diff --git a/lib/posix/options/net.c b/lib/posix/options/net.c
index 84e4001a9b40d..883bb9145ac9c 100644
--- a/lib/posix/options/net.c
+++ b/lib/posix/options/net.c
@@ -19,7 +19,7 @@
 
 in_addr_t inet_addr(const char *cp)
 {
-	int val = 0;
+	unsigned int val = 0;
 	int len = 0;
 	int dots = 0;
 	int digits = 0;
diff --git a/lib/posix/options/pthread.c b/lib/posix/options/pthread.c
index 33ee36668e66d..398951307aa7e 100644
--- a/lib/posix/options/pthread.c
+++ b/lib/posix/options/pthread.c
@@ -91,8 +91,7 @@ static sys_dlist_t posix_thread_q[] = {
 	SYS_DLIST_STATIC_INIT(&posix_thread_q[POSIX_THREAD_DONE_Q]),
 };
 
-__pinned_bss
-static struct posix_thread posix_thread_pool[CONFIG_MAX_PTHREAD_COUNT];
+static __pinned_bss struct posix_thread posix_thread_pool[CONFIG_POSIX_THREAD_THREADS_MAX];
 
 static SYS_SEM_DEFINE(pthread_pool_lock, 1, 1);
 static int pthread_concurrency;
diff --git a/lib/posix/options/timer.c b/lib/posix/options/timer.c
index 3c14a01a3add3..e810b4576f7c9 100644
--- a/lib/posix/options/timer.c
+++ b/lib/posix/options/timer.c
@@ -190,7 +190,7 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
 	goto out;
 
 free_timer:
-	k_mem_slab_free(&posix_timer_slab, (void *)&timer);
+	k_mem_slab_free(&posix_timer_slab, (void *)timer);
 
 out:
 	return ret;
diff --git a/lib/utils/CMakeLists.txt b/lib/utils/CMakeLists.txt
index e0e1673f44503..7062d69303db8 100644
--- a/lib/utils/CMakeLists.txt
+++ b/lib/utils/CMakeLists.txt
@@ -11,6 +11,7 @@ zephyr_sources(
   )
 
 zephyr_sources_ifdef(CONFIG_ONOFF onoff.c)
+
 zephyr_sources_ifdef(CONFIG_NOTIFY notify.c)
 
 zephyr_sources_ifdef(CONFIG_JSON_LIBRARY json.c)
@@ -21,6 +22,8 @@ zephyr_sources_ifdef(CONFIG_UTF8 utf8.c)
 
 zephyr_sources_ifdef(CONFIG_WINSTREAM winstream.c)
 
+zephyr_sources_ifdef(CONFIG_COBS cobs.c)
+
 zephyr_library_include_directories(
   ${ZEPHYR_BASE}/kernel/include
   ${ZEPHYR_BASE}/arch/${ARCH}/include
diff --git a/lib/utils/Kconfig b/lib/utils/Kconfig
index 340c0ac42c24c..4db79272bbafe 100644
--- a/lib/utils/Kconfig
+++ b/lib/utils/Kconfig
@@ -9,12 +9,30 @@ config JSON_LIBRARY
 	  Build a minimal JSON parsing/encoding library. Used by sample
 	  applications such as the NATS client.
 
+config JSON_LIBRARY_FP_SUPPORT
+	bool "Floating point support in JSON library"
+	depends on JSON_LIBRARY
+	select CBPRINTF_FP_SUPPORT
+	select REQUIRES_FULL_LIBC
+	help
+	  Build the JSON library with support for floating point types.
+
+	  Requires a libc implementation with support for floating point
+	  functions: strtof(), strtod(), isnan() and isinf().
+
 config RING_BUFFER
 	bool "Ring buffers"
 	help
-	  Enable usage of ring buffers. This is similar to kernel FIFOs but ring
-	  buffers manage their own buffer memory and can store arbitrary data.
-	  For optimal performance, use buffer sizes that are a power of 2.
+	  Provide highly efficient ring buffer management for arbitrary data.
+	  Some facilities such as kernel pipes are built on top of this.
+	  May be used directly e.g. when the pipe overhead is unnecessary.
+
+config RING_BUFFER_LARGE
+	bool "Allow large ring buffer sizes"
+	depends on RING_BUFFER
+	help
+	  Increase maximum buffer size from 32KB to 2GB. When this is enabled,
+	  all struct ring_buf instances become 12 bytes bigger.
 
 config NOTIFY
 	bool "Asynchronous Notifications"
@@ -57,4 +75,10 @@ config UTF8
 	  Enable the utf8 API. The API implements functions to specifically
 	  handle UTF-8 encoded strings.
 
+config COBS
+	bool "Consistent overhead byte stuffing"
+	select NET_BUF
+	help
+	  Enable consistent overhead byte stuffing
+
 endmenu
diff --git a/lib/utils/cobs.c b/lib/utils/cobs.c
new file mode 100644
index 0000000000000..d500eb2b86f5f
--- /dev/null
+++ b/lib/utils/cobs.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2024 Kelly Helmut Lord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <stdint.h>
+#include <zephyr/data/cobs.h>
+
+int cobs_encode(struct net_buf *src, struct net_buf *dst, uint32_t flags)
+{
+	uint8_t delimiter = COBS_FLAG_CUSTOM_DELIMITER(flags);
+
+	/* Calculate required space for worst case */
+	size_t max_encoded_size = cobs_max_encoded_len(src->len, flags);
+
+	/* Check if destination has enough space */
+	if (net_buf_tailroom(dst) < max_encoded_size) {
+		return -ENOMEM;
+	}
+
+	uint8_t *code_ptr = net_buf_add(dst, 1);
+	uint8_t code = 1;
+
+	/* Process all input bytes */
+	uint8_t data = 0;
+
+	while (src->len > 0) {
+		data = net_buf_pull_u8(src);
+		if (data == delimiter) {
+			/* Delimiter found - write current code and start new block */
+			*code_ptr = code;
+			code_ptr = net_buf_add(dst, 1);
+			code = 1;
+		} else {
+			/* Add non-zero byte to output */
+			net_buf_add_u8(dst, data);
+			code++;
+
+			/* If we've reached maximum block size, start a new block */
+			if (code == 0xFF && (src->len - 1 >= 0)) {
+				*code_ptr = code;
+				code_ptr = net_buf_add(dst, 1);
+				code = 1;
+			}
+		}
+	}
+
+	*code_ptr = code;
+
+	if (flags & COBS_FLAG_TRAILING_DELIMITER) {
+		/* Add final delimiter */
+		net_buf_add_u8(dst, delimiter);
+	}
+
+	return 0;
+}
+
+int cobs_decode(struct net_buf *src, struct net_buf *dst, uint32_t flags)
+{
+	uint8_t delimiter = COBS_FLAG_CUSTOM_DELIMITER(flags);
+
+	if (flags & COBS_FLAG_TRAILING_DELIMITER) {
+		uint8_t end_delim = net_buf_remove_u8(src);
+
+		if (end_delim != delimiter) {
+			return -EINVAL;
+		}
+	}
+
+	while (src->len > 0) {
+		/* Pull the COBS offset byte */
+		uint8_t offset = net_buf_pull_u8(src);
+
+		if (offset == delimiter && !(flags & COBS_FLAG_TRAILING_DELIMITER)) {
+			return -EINVAL;
+		}
+
+		/* Verify we have enough data */
+		if (src->len < (offset - 1)) {
+			return -EINVAL;
+		}
+
+		/* Copy offset-1 bytes */
+		for (uint8_t i = 0; i < offset - 1; i++) {
+			uint8_t byte = net_buf_pull_u8(src);
+
+			if (byte == delimiter) {
+				return -EINVAL;
+			}
+			net_buf_add_u8(dst, byte);
+		}
+
+		/* If this wasn't a maximum offset and we have more data,
+		 * there was a delimiter here in the original data
+		 */
+		if (offset != 0xFF && src->len > 0) {
+			net_buf_add_u8(dst, delimiter);
+		}
+	}
+
+	return 0;
+}
diff --git a/lib/utils/json.c b/lib/utils/json.c
index de1f8017e1e4c..43a3128ce7e70 100644
--- a/lib/utils/json.c
+++ b/lib/utils/json.c
@@ -8,6 +8,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
+#include <math.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 #include <stdbool.h>
@@ -201,7 +202,7 @@ static void *lexer_number(struct json_lexer *lex)
 	while (true) {
 		int chr = next(lex);
 
-		if (isdigit(chr) != 0 || chr == '.') {
+		if (isdigit(chr) != 0 || chr == '.' || chr == 'e' || chr == '+' || chr == '-') {
 			continue;
 		}
 
@@ -212,6 +213,37 @@ static void *lexer_number(struct json_lexer *lex)
 	}
 }
 
+static void *lexer_number_nan(struct json_lexer *lex)
+{
+#ifdef CONFIG_JSON_LIBRARY_FP_SUPPORT
+	backup(lex);
+
+	switch (peek(lex)) {
+	case 'N':
+		if (!accept_run(lex, "NaN")) {
+			emit(lex, JSON_TOK_NUMBER);
+			return lexer_json;
+		}
+		break;
+	case 'I':
+		if (!accept_run(lex, "Infinity")) {
+			emit(lex, JSON_TOK_NUMBER);
+			return lexer_json;
+		}
+		break;
+	case '-':
+		if (!accept_run(lex, "-Infinity")) {
+			emit(lex, JSON_TOK_NUMBER);
+			return lexer_json;
+		}
+		break;
+	}
+
+#endif
+	emit(lex, JSON_TOK_ERROR);
+	return NULL;
+}
+
 static void *lexer_json(struct json_lexer *lex)
 {
 	while (true) {
@@ -236,10 +268,16 @@ static void *lexer_json(struct json_lexer *lex)
 		case 't':
 		case 'f':
 			return lexer_boolean;
+		case 'N':
+		case 'I':
+			return lexer_number_nan;
 		case '-':
 			if (isdigit(peek(lex)) != 0) {
 				return lexer_number;
 			}
+			if (peek(lex) == 'I') {
+				return lexer_number_nan;
+			}
 
 			__fallthrough;
 		default:
@@ -307,10 +345,15 @@ static int element_token(enum json_tokens token)
 	case JSON_TOK_OBJECT_START:
 	case JSON_TOK_ARRAY_START:
 	case JSON_TOK_STRING:
+	case JSON_TOK_STRING_BUF:
 	case JSON_TOK_NUMBER:
+	case JSON_TOK_INT:
+	case JSON_TOK_UINT:
 	case JSON_TOK_INT64:
 	case JSON_TOK_UINT64:
 	case JSON_TOK_FLOAT:
+	case JSON_TOK_FLOAT_FP:
+	case JSON_TOK_DOUBLE_FP:
 	case JSON_TOK_OPAQUE:
 	case JSON_TOK_OBJ_ARRAY:
 	case JSON_TOK_TRUE:
@@ -419,7 +462,22 @@ static int skip_field(struct json_obj *obj, struct json_obj_key_value *kv)
 	return 0;
 }
 
-static int decode_num(const struct json_token *token, int32_t *num)
+static int decode_string_buf(const struct json_token *token, char *str, size_t size)
+{
+	size_t len = token->end - token->start;
+
+	/* buffer 'str' must be large enough to fit string and null-terminator */
+	if (size <= len) {
+		return -EINVAL;
+	}
+
+	memcpy(str, token->start, len);
+	str[len] = '\0';
+
+	return 0;
+}
+
+static int decode_int32(const struct json_token *token, int32_t *num)
 {
 	/* FIXME: strtod() is not available in newlib/minimal libc,
 	 * so using strtol() here.
@@ -446,6 +504,30 @@ static int decode_num(const struct json_token *token, int32_t *num)
 	return 0;
 }
 
+static int decode_uint32(const struct json_token *token, uint32_t *num)
+{
+	char *endptr;
+	char prev_end;
+
+	prev_end = *token->end;
+	*token->end = '\0';
+
+	errno = 0;
+	*num = strtoul(token->start, &endptr, 10);
+
+	*token->end = prev_end;
+
+	if (errno != 0) {
+		return -errno;
+	}
+
+	if (endptr != token->end) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 static int decode_int64(const struct json_token *token, int64_t *num)
 {
 	char *endptr;
@@ -494,6 +576,204 @@ static int decode_uint64(const struct json_token *token, uint64_t *num)
 	return 0;
 }
 
+static int decode_float(const struct json_token *token, float *num)
+{
+#ifdef CONFIG_JSON_LIBRARY_FP_SUPPORT
+	char *endptr;
+	char prev_end;
+
+	prev_end = *token->end;
+	*token->end = '\0';
+
+	errno = 0;
+	*num = strtof(token->start, &endptr);
+
+	*token->end = prev_end;
+
+	if (errno != 0) {
+		return -errno;
+	}
+
+	if (endptr != token->end) {
+		return -EINVAL;
+	}
+
+	return 0;
+
+#else
+	ARG_UNUSED(token);
+	ARG_UNUSED(num);
+	return -EINVAL;
+#endif
+}
+
+static int decode_double(const struct json_token *token, double *num)
+{
+#ifdef CONFIG_JSON_LIBRARY_FP_SUPPORT
+	char *endptr;
+	char prev_end;
+
+	prev_end = *token->end;
+	*token->end = '\0';
+
+	errno = 0;
+	*num = strtod(token->start, &endptr);
+
+	*token->end = prev_end;
+
+	if (errno != 0) {
+		return -errno;
+	}
+
+	if (endptr != token->end) {
+		return -EINVAL;
+	}
+
+	return 0;
+
+#else
+	ARG_UNUSED(token);
+	ARG_UNUSED(num);
+	return -EINVAL;
+#endif
+}
+
+static int decode_int8(const struct json_token *token, int8_t *num)
+{
+	int32_t num_i32;
+	int res;
+
+	res = decode_int32(token, &num_i32);
+
+	if (res != 0) {
+		return res;
+	}
+
+	if (num_i32 < INT8_MIN || num_i32 > INT8_MAX) {
+		return -EINVAL;
+	}
+
+	*num = num_i32;
+
+	return 0;
+}
+
+static int decode_uint8(const struct json_token *token, uint8_t *num)
+{
+	uint32_t num_u32;
+	int res;
+
+	res = decode_uint32(token, &num_u32);
+
+	if (res != 0) {
+		return res;
+	}
+
+	if (num_u32 > UINT8_MAX) {
+		return -EINVAL;
+	}
+
+	*num = num_u32;
+
+	return 0;
+}
+
+static int decode_int16(const struct json_token *token, int16_t *num)
+{
+	int32_t num_i32;
+	int res;
+
+	res = decode_int32(token, &num_i32);
+
+	if (res != 0) {
+		return res;
+	}
+
+	if (num_i32 < INT16_MIN || num_i32 > INT16_MAX) {
+		return -EINVAL;
+	}
+
+	*num = num_i32;
+
+	return 0;
+}
+
+static int decode_uint16(const struct json_token *token, uint16_t *num)
+{
+	uint32_t num_u32;
+	int res;
+
+	res = decode_uint32(token, &num_u32);
+
+	if (res != 0) {
+		return res;
+	}
+
+	if (num_u32 > UINT16_MAX) {
+		return -EINVAL;
+	}
+
+	*num = num_u32;
+
+	return 0;
+}
+
+static int decode_int(const struct json_token *token, void *field, size_t size)
+{
+	switch (size) {
+	case 1: {
+		int8_t *num = field;
+
+		return decode_int8(token, num);
+	}
+	case 2: {
+		int16_t *num = field;
+
+		return decode_int16(token, num);
+	}
+	case 4: {
+		int32_t *num = field;
+
+		return decode_int32(token, num);
+	}
+	case 8: {
+		int64_t *num = field;
+
+		return decode_int64(token, num);
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
+static int decode_uint(const struct json_token *token, void *field, size_t size)
+{
+	switch (size) {
+	case 1: {
+		uint8_t *num = field;
+
+		return decode_uint8(token, num);
+	}
+	case 2: {
+		uint16_t *num = field;
+
+		return decode_uint16(token, num);
+	}
+	case 4: {
+		uint32_t *num = field;
+
+		return decode_uint32(token, num);
+	}
+	case 8: {
+		uint64_t *num = field;
+
+		return decode_uint64(token, num);
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
 static bool equivalent_types(enum json_tokens type1, enum json_tokens type2)
 {
 	if (type1 == JSON_TOK_TRUE || type1 == JSON_TOK_FALSE) {
@@ -504,6 +784,22 @@ static bool equivalent_types(enum json_tokens type1, enum json_tokens type2)
 		return true;
 	}
 
+	if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_FLOAT_FP) {
+		return true;
+	}
+
+	if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_DOUBLE_FP) {
+		return true;
+	}
+
+	if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_INT) {
+		return true;
+	}
+
+	if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_UINT) {
+		return true;
+	}
+
 	if (type1 == JSON_TOK_NUMBER && type2 == JSON_TOK_INT64) {
 		return true;
 	}
@@ -516,6 +812,10 @@ static bool equivalent_types(enum json_tokens type1, enum json_tokens type2)
 		return true;
 	}
 
+	if (type1 == JSON_TOK_STRING && type2 == JSON_TOK_STRING_BUF) {
+		return true;
+	}
+
 	if (type1 == JSON_TOK_ARRAY_START && type2 == JSON_TOK_OBJ_ARRAY) {
 		return true;
 	}
@@ -567,7 +867,13 @@ static int64_t decode_value(struct json_obj *obj,
 	case JSON_TOK_NUMBER: {
 		int32_t *num = field;
 
-		return decode_num(value, num);
+		return decode_int32(value, num);
+	}
+	case JSON_TOK_INT: {
+		return decode_int(value, field, descr->field.size);
+	}
+	case JSON_TOK_UINT: {
+		return decode_uint(value, field, descr->field.size);
 	}
 	case JSON_TOK_INT64: {
 		int64_t *num = field;
@@ -579,6 +885,16 @@ static int64_t decode_value(struct json_obj *obj,
 
 		return decode_uint64(value, num);
 	}
+	case JSON_TOK_FLOAT_FP: {
+		float *num = field;
+
+		return decode_float(value, num);
+	}
+	case JSON_TOK_DOUBLE_FP: {
+		double *num = field;
+
+		return decode_double(value, num);
+	}
 	case JSON_TOK_OPAQUE:
 	case JSON_TOK_FLOAT: {
 		struct json_obj_token *obj_token = field;
@@ -595,6 +911,11 @@ static int64_t decode_value(struct json_obj *obj,
 
 		return 0;
 	}
+	case JSON_TOK_STRING_BUF: {
+		char *str = field;
+
+		return decode_string_buf(value, str, descr->field.size);
+	}
 	default:
 		return -EINVAL;
 	}
@@ -609,12 +930,20 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr)
 		return sizeof(int64_t);
 	case JSON_TOK_UINT64:
 		return sizeof(uint64_t);
+	case JSON_TOK_FLOAT_FP:
+		return sizeof(float);
+	case JSON_TOK_DOUBLE_FP:
+		return sizeof(double);
 	case JSON_TOK_OPAQUE:
 	case JSON_TOK_FLOAT:
 	case JSON_TOK_OBJ_ARRAY:
 		return sizeof(struct json_obj_token);
 	case JSON_TOK_STRING:
 		return sizeof(char *);
+	case JSON_TOK_INT:
+	case JSON_TOK_UINT:
+	case JSON_TOK_STRING_BUF:
+		return descr->field.size;
 	case JSON_TOK_TRUE:
 	case JSON_TOK_FALSE:
 		return sizeof(bool);
@@ -635,13 +964,17 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr)
 		size_t i;
 
 		for (i = 0; i < descr->object.sub_descr_len; i++) {
-			total += get_elem_size(&descr->object.sub_descr[i]);
-
 			if (descr->object.sub_descr[i].align_shift > align_shift) {
 				align_shift = descr->object.sub_descr[i].align_shift;
 			}
 		}
 
+		i = descr->object.sub_descr_len;
+		if (i > 0) {
+			total = descr->object.sub_descr[i - 1].offset +
+				get_elem_size(&descr->object.sub_descr[i - 1]);
+		}
+
 		return ROUND_UP(total, 1 << align_shift);
 	}
 	default:
@@ -1019,7 +1352,7 @@ static int arr_encode(const struct json_obj_descr *elem_descr,
 	return append_bytes("]", 1, data);
 }
 
-static int str_encode(const char **str, json_append_bytes_t append_bytes,
+static int str_encode(const char *str, json_append_bytes_t append_bytes,
 		      void *data)
 {
 	int ret;
@@ -1029,7 +1362,7 @@ static int str_encode(const char **str, json_append_bytes_t append_bytes,
 		return ret;
 	}
 
-	ret = json_escape_internal(*str, append_bytes, data);
+	ret = json_escape_internal(str, append_bytes, data);
 	if (!ret) {
 		return append_bytes("\"", 1, data);
 	}
@@ -1037,8 +1370,8 @@ static int str_encode(const char **str, json_append_bytes_t append_bytes,
 	return ret;
 }
 
-static int num_encode(const int32_t *num, json_append_bytes_t append_bytes,
-		      void *data)
+static int int32_encode(const int32_t *num, json_append_bytes_t append_bytes,
+			void *data)
 {
 	char buf[3 * sizeof(int32_t)];
 	int ret;
@@ -1054,6 +1387,23 @@ static int num_encode(const int32_t *num, json_append_bytes_t append_bytes,
 	return append_bytes(buf, (size_t)ret, data);
 }
 
+static int uint32_encode(const uint32_t *num, json_append_bytes_t append_bytes,
+			 void *data)
+{
+	char buf[3 * sizeof(uint32_t)];
+	int ret;
+
+	ret = snprintk(buf, sizeof(buf), "%u", *num);
+	if (ret < 0) {
+		return ret;
+	}
+	if (ret >= (int)sizeof(buf)) {
+		return -ENOMEM;
+	}
+
+	return append_bytes(buf, (size_t)ret, data);
+}
+
 static int int64_encode(const int64_t *num, json_append_bytes_t append_bytes,
 			void *data)
 {
@@ -1088,6 +1438,131 @@ static int uint64_encode(const uint64_t *num, json_append_bytes_t append_bytes,
 	return append_bytes(buf, (size_t)ret, data);
 }
 
+static int print_double(char *str, size_t size, const char *fmt, double num)
+{
+#ifdef CONFIG_JSON_LIBRARY_FP_SUPPORT
+	if (isnan(num)) {
+		return snprintk(str, size, "NaN");
+	}
+
+	if (isinf(num)) {
+		if (num < 0) {
+			return snprintk(str, size, "-Infinity");
+		}
+		return snprintk(str, size, "Infinity");
+	}
+
+	return snprintk(str, size, fmt, num);
+
+#else
+	str[0] = '\0';
+	ARG_UNUSED(size);
+	ARG_UNUSED(fmt);
+	ARG_UNUSED(num);
+	return -EINVAL;
+#endif
+}
+
+static int float_encode(const float *num, json_append_bytes_t append_bytes, void *data)
+{
+	char buf[sizeof("-3.40282347e+38")];
+	int ret;
+
+	ret = print_double(buf, sizeof(buf), "%.9g", (double)*num);
+
+	if (ret < 0) {
+		return ret;
+	}
+	if (ret >= (int)sizeof(buf)) {
+		return -ENOMEM;
+	}
+
+	return append_bytes(buf, (size_t)ret, data);
+}
+
+static int double_encode(const double *num, json_append_bytes_t append_bytes, void *data)
+{
+	char buf[sizeof("-1.797693134862316e+308")];
+	int ret;
+
+	ret = print_double(buf, sizeof(buf), "%.16g", *num);
+
+	if (ret < 0) {
+		return ret;
+	}
+	if (ret >= (int)sizeof(buf)) {
+		return -ENOMEM;
+	}
+
+	return append_bytes(buf, (size_t)ret, data);
+}
+
+static int int_encode(const void *ptr, size_t size, json_append_bytes_t append_bytes,
+		      void *data)
+{
+	switch (size) {
+	case 1: {
+		const int8_t *num_8 = ptr;
+		int32_t num = *num_8;
+
+		return int32_encode(&num, append_bytes, data);
+	}
+	case 2: {
+		const int16_t *num_16 = ptr;
+		int32_t num = *num_16;
+
+		return int32_encode(&num, append_bytes, data);
+	}
+	case 4: {
+		const int32_t *num_32 = ptr;
+		int32_t num = *num_32;
+
+		return int32_encode(&num, append_bytes, data);
+	}
+	case 8: {
+		const int64_t *num_64 = ptr;
+		int64_t num = *num_64;
+
+		return int64_encode(&num, append_bytes, data);
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
+static int uint_encode(const void *ptr, size_t size, json_append_bytes_t append_bytes,
+		       void *data)
+{
+	switch (size) {
+	case 1: {
+		const uint8_t *num_8 = ptr;
+		uint32_t num = *num_8;
+
+		return uint32_encode(&num, append_bytes, data);
+	}
+	case 2: {
+		const uint16_t *num_16 = ptr;
+		uint32_t num = *num_16;
+
+		return uint32_encode(&num, append_bytes, data);
+	}
+	case 4: {
+		const uint32_t *num_32 = ptr;
+		uint32_t num = *num_32;
+
+		return uint32_encode(&num, append_bytes, data);
+	}
+	case 8: {
+		const uint64_t *num_64 = ptr;
+		uint64_t num = *num_64;
+
+		return uint64_encode(&num, append_bytes, data);
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
 static int float_ascii_encode(struct json_obj_token *num, json_append_bytes_t append_bytes,
 		      void *data)
 {
@@ -1139,7 +1614,12 @@ static int encode(const struct json_obj_descr *descr, const void *val,
 	case JSON_TOK_FALSE:
 	case JSON_TOK_TRUE:
 		return bool_encode(ptr, append_bytes, data);
-	case JSON_TOK_STRING:
+	case JSON_TOK_STRING: {
+		const char **str = ptr;
+
+		return str_encode(*str, append_bytes, data);
+	}
+	case JSON_TOK_STRING_BUF:
 		return str_encode(ptr, append_bytes, data);
 	case JSON_TOK_ARRAY_START:
 		return arr_encode(descr->array.element_descr, ptr,
@@ -1149,11 +1629,19 @@ static int encode(const struct json_obj_descr *descr, const void *val,
 				       descr->object.sub_descr_len,
 				       ptr, append_bytes, data);
 	case JSON_TOK_NUMBER:
-		return num_encode(ptr, append_bytes, data);
+		return int32_encode(ptr, append_bytes, data);
+	case JSON_TOK_INT:
+		return int_encode(ptr, descr->field.size, append_bytes, data);
+	case JSON_TOK_UINT:
+		return uint_encode(ptr, descr->field.size, append_bytes, data);
 	case JSON_TOK_INT64:
 		return int64_encode(ptr, append_bytes, data);
 	case JSON_TOK_UINT64:
 		return uint64_encode(ptr, append_bytes, data);
+	case JSON_TOK_FLOAT_FP:
+		return float_encode(ptr, append_bytes, data);
+	case JSON_TOK_DOUBLE_FP:
+		return double_encode(ptr, append_bytes, data);
 	case JSON_TOK_FLOAT:
 		return float_ascii_encode(ptr, append_bytes, data);
 	case JSON_TOK_OPAQUE:
@@ -1178,8 +1666,7 @@ int json_obj_encode(const struct json_obj_descr *descr, size_t descr_len,
 	}
 
 	for (i = 0; i < descr_len; i++) {
-		ret = str_encode((const char **)&descr[i].field_name,
-				 append_bytes, data);
+		ret = str_encode(descr[i].field_name, append_bytes, data);
 		if (ret < 0) {
 			return ret;
 		}
diff --git a/lib/utils/ring_buffer.c b/lib/utils/ring_buffer.c
index 32d997205a27c..652b53b758f8b 100644
--- a/lib/utils/ring_buffer.c
+++ b/lib/utils/ring_buffer.c
@@ -12,20 +12,17 @@
 uint32_t ring_buf_area_claim(struct ring_buf *buf, struct ring_buf_index *ring,
 			     uint8_t **data, uint32_t size)
 {
-	uint32_t wrap_size;
-	int32_t base;
+	ring_buf_idx_t head_offset, wrap_size;
 
-	base = ring->base;
-	wrap_size = ring->head - base;
-	if (unlikely(wrap_size >= buf->size)) {
+	head_offset = ring->head - ring->base;
+	if (unlikely(head_offset >= buf->size)) {
 		/* ring->base is not yet adjusted */
-		wrap_size -= buf->size;
-		base += buf->size;
+		head_offset -= buf->size;
 	}
-	wrap_size = buf->size - wrap_size;
+	wrap_size = buf->size - head_offset;
 	size = MIN(size, wrap_size);
 
-	*data = &buf->buffer[ring->head - base];
+	*data = &buf->buffer[head_offset];
 	ring->head += size;
 
 	return size;
@@ -34,7 +31,7 @@ uint32_t ring_buf_area_claim(struct ring_buf *buf, struct ring_buf_index *ring,
 int ring_buf_area_finish(struct ring_buf *buf, struct ring_buf_index *ring,
 			 uint32_t size)
 {
-	uint32_t claimed_size, wrap_size;
+	ring_buf_idx_t claimed_size, tail_offset;
 
 	claimed_size = ring->head - ring->tail;
 	if (unlikely(size > claimed_size)) {
@@ -44,8 +41,8 @@ int ring_buf_area_finish(struct ring_buf *buf, struct ring_buf_index *ring,
 	ring->tail += size;
 	ring->head = ring->tail;
 
-	wrap_size = ring->tail - ring->base;
-	if (unlikely(wrap_size >= buf->size)) {
+	tail_offset = ring->tail - ring->base;
+	if (unlikely(tail_offset >= buf->size)) {
 		/* we wrapped: adjust ring->base */
 		ring->base += buf->size;
 	}
diff --git a/lib/uuid/CMakeLists.txt b/lib/uuid/CMakeLists.txt
new file mode 100644
index 0000000000000..fa0b91ac5c5ad
--- /dev/null
+++ b/lib/uuid/CMakeLists.txt
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources_ifdef(CONFIG_UUID uuid.c)
+
+zephyr_library_link_libraries_ifdef(CONFIG_UUID_V5 mbedTLS)
diff --git a/lib/uuid/Kconfig b/lib/uuid/Kconfig
new file mode 100644
index 0000000000000..8ee2a9a9cc334
--- /dev/null
+++ b/lib/uuid/Kconfig
@@ -0,0 +1,40 @@
+# Copyright (c) 2025, SECO Mind Srl
+#
+# SPDX-License-Identifier: Apache-2.0
+
+menu "Universally Unique Identifier (UUID)"
+
+config UUID
+	bool "UUID support [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  Enable use of the UUID library.
+
+config UUID_V4
+	bool "UUID version 4 generation support [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	depends on UUID
+	depends on ENTROPY_GENERATOR
+	help
+	  Enable generation of UUID v4.
+
+config UUID_V5
+	bool "UUID version 5 generation support [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	depends on UUID
+	depends on MBEDTLS
+	depends on MBEDTLS_MD
+	depends on MBEDTLS_SHA1
+	help
+	  Enable generation of UUID v5.
+
+config UUID_BASE64
+	bool "UUID Base64 support [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	depends on UUID
+	depends on BASE64
+	help
+	  Enable conversion functions to write UUIDs in base 64
+	  formats.
+
+endmenu
diff --git a/lib/uuid/uuid.c b/lib/uuid/uuid.c
new file mode 100644
index 0000000000000..58bb790fbc637
--- /dev/null
+++ b/lib/uuid/uuid.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2025, SECO Mind Srl
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/sys/uuid.h>
+
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+
+#if defined(CONFIG_UUID_V4)
+#include <zephyr/random/random.h>
+#endif
+
+#if defined(CONFIG_UUID_V5)
+#include <mbedtls/md.h>
+#endif
+
+#if defined(CONFIG_UUID_BASE64)
+#include <zephyr/sys/base64.h>
+#endif
+
+#define UUID_STR_POSITION_FIRST_HYPHEN  (8U)
+#define UUID_STR_POSITION_SECOND_HYPHEN (13U)
+#define UUID_STR_POSITION_THIRD_HYPHEN  (18U)
+#define UUID_STR_POSITION_FOURTH_HYPHEN (23U)
+
+#define UUID_POSITION_VERSION (6U)
+#define UUID_OFFSET_VERSION   (4U)
+#define UUID_MASK_VERSION     (0xF0U)
+#define UUID_POSITION_VARIANT (8U)
+#define UUID_OFFSET_VARIANT   (6U)
+#define UUID_MASK_VARIANT     (0xC0)
+
+#define UUID_V4_VERSION (4U)
+#define UUID_V4_VARIANT (2U)
+#define UUID_V5_VERSION (5U)
+#define UUID_V5_VARIANT (2U)
+
+#if defined(CONFIG_UUID_V4) || defined(CONFIG_UUID_V5)
+static void overwrite_uuid_version_and_variant(uint8_t version, uint8_t variant, struct uuid *out)
+{
+	/* Clear the 'ver' and 'var' fields */
+	out->val[UUID_POSITION_VERSION] &= ~UUID_MASK_VERSION;
+	out->val[UUID_POSITION_VARIANT] &= ~UUID_MASK_VARIANT;
+	/* Update the 'ver' and 'var' fields */
+	out->val[UUID_POSITION_VERSION] |= (uint8_t)(version << UUID_OFFSET_VERSION);
+	out->val[UUID_POSITION_VARIANT] |= (uint8_t)(variant << UUID_OFFSET_VARIANT);
+}
+#endif
+
+static bool should_be_hyphen(unsigned int position)
+{
+	switch (position) {
+	case UUID_STR_POSITION_FIRST_HYPHEN:
+	case UUID_STR_POSITION_SECOND_HYPHEN:
+	case UUID_STR_POSITION_THIRD_HYPHEN:
+	case UUID_STR_POSITION_FOURTH_HYPHEN:
+		return true;
+	default:
+		return false;
+	}
+}
+
+#if defined(CONFIG_UUID_V4)
+int uuid_generate_v4(struct uuid *out)
+{
+	if (out == NULL) {
+		return -EINVAL;
+	}
+	/* Fill the whole UUID struct with a random number */
+	sys_rand_get(out->val, UUID_SIZE);
+	/* Update version and variant */
+	overwrite_uuid_version_and_variant(UUID_V4_VERSION, UUID_V4_VARIANT, out);
+	return 0;
+}
+#endif
+
+#if defined(CONFIG_UUID_V5)
+int uuid_generate_v5(const struct uuid *namespace, const void *data, size_t data_size,
+		     struct uuid *out)
+{
+	if (out == NULL) {
+		return -EINVAL;
+	}
+	int ret = 0;
+	int mbedtls_err = 0;
+	mbedtls_md_context_t ctx = {0};
+	const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
+	const size_t sha_1_bytes = 20;
+	uint8_t sha_result[sha_1_bytes];
+
+	mbedtls_md_init(&ctx);
+	mbedtls_err = mbedtls_md_setup(&ctx, md_info, 0);
+	/* Might return: MBEDTLS_ERR_MD_BAD_INPUT_DATA or MBEDTLS_ERR_MD_ALLOC_FAILED */
+	switch (mbedtls_err) {
+	case 0:
+		break;
+	case MBEDTLS_ERR_MD_BAD_INPUT_DATA:
+		ret = -EINVAL;
+		goto exit;
+	case MBEDTLS_ERR_MD_ALLOC_FAILED:
+		ret = -ENOMEM;
+		goto exit;
+	default:
+		ret = -ENOTSUP;
+		goto exit;
+	}
+	mbedtls_err = mbedtls_md_starts(&ctx);
+	if (mbedtls_err != 0) {
+		/* Might return MBEDTLS_ERR_MD_BAD_INPUT_DATA */
+		ret = -EINVAL;
+		goto exit;
+	}
+	mbedtls_err = mbedtls_md_update(&ctx, namespace->val, UUID_SIZE);
+	if (mbedtls_err != 0) {
+		/* Might return MBEDTLS_ERR_MD_BAD_INPUT_DATA */
+		ret = -EINVAL;
+		goto exit;
+	}
+	mbedtls_err = mbedtls_md_update(&ctx, data, data_size);
+	if (mbedtls_err != 0) {
+		/* Might return MBEDTLS_ERR_MD_BAD_INPUT_DATA */
+		ret = -EINVAL;
+		goto exit;
+	}
+	mbedtls_err = mbedtls_md_finish(&ctx, sha_result);
+	if (mbedtls_err != 0) {
+		/* Might return MBEDTLS_ERR_MD_BAD_INPUT_DATA */
+		ret = -EINVAL;
+		goto exit;
+	}
+
+	/* Store the computed SHA1 in the out struct */
+	for (unsigned int i = 0; i < UUID_SIZE; i++) {
+		out->val[i] = sha_result[i];
+	}
+	/* Update version and variant */
+	overwrite_uuid_version_and_variant(UUID_V5_VERSION, UUID_V5_VARIANT, out);
+
+exit:
+	mbedtls_md_free(&ctx);
+	return ret;
+}
+#endif
+
+int uuid_copy(const struct uuid *data, struct uuid *out)
+{
+	if (out == NULL) {
+		return -EINVAL;
+	}
+	memcpy(out->val, data->val, UUID_SIZE);
+	return 0;
+}
+
+int uuid_from_buffer(const uint8_t data[UUID_SIZE], struct uuid *out)
+{
+	if ((data == NULL) || (out == NULL)) {
+		return -EINVAL;
+	}
+	memcpy(out->val, data, UUID_SIZE);
+	return 0;
+}
+
+int uuid_from_string(const char data[UUID_STR_LEN], struct uuid *out)
+{
+	if ((data == NULL) || (strlen(data) + 1 != UUID_STR_LEN) || (out == NULL)) {
+		return -EINVAL;
+	}
+	for (unsigned int i = 0; i < UUID_STR_LEN - 1; i++) {
+		char char_i = data[i];
+		/* Check that hyphens are in the right place */
+		if (should_be_hyphen(i)) {
+			if (char_i != '-') {
+				return -EINVAL;
+			}
+			continue;
+		}
+		/* Check if the given input is hexadecimal */
+		if (!isxdigit(char_i)) {
+			return -EINVAL;
+		}
+	}
+
+	/* Content parsing */
+	unsigned int data_idx = 0U;
+	unsigned int out_idx = 0U;
+
+	while (data_idx < UUID_STR_LEN - 1) {
+		if (should_be_hyphen(data_idx)) {
+			data_idx += 1;
+			continue;
+		}
+
+		size_t hex2bin_rc =
+			hex2bin(&data[data_idx], 2, &out->val[out_idx], UUID_SIZE - out_idx);
+		if (hex2bin_rc != 1) {
+			return -EINVAL;
+		}
+		out_idx++;
+		data_idx += 2;
+	}
+	return 0;
+}
+
+int uuid_to_buffer(const struct uuid *data, uint8_t out[UUID_SIZE])
+{
+	if (out == NULL) {
+		return -EINVAL;
+	}
+	memcpy(out, data->val, UUID_SIZE);
+	return 0;
+}
+
+int uuid_to_string(const struct uuid *data, char out[UUID_STR_LEN])
+{
+	if (out == NULL) {
+		return -EINVAL;
+	}
+	snprintf(out, UUID_STR_LEN,
+		 "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+		 data->val[0], data->val[1], data->val[2], data->val[3], data->val[4], data->val[5],
+		 data->val[6], data->val[7], data->val[8], data->val[9], data->val[10],
+		 data->val[11], data->val[12], data->val[13], data->val[14], data->val[15]);
+	return 0;
+}
+
+#if defined(CONFIG_UUID_BASE64)
+int uuid_to_base64(const struct uuid *data, char out[UUID_BASE64_LEN])
+{
+	if (out == NULL) {
+		return -EINVAL;
+	}
+
+	size_t olen = 0;
+
+	base64_encode(out, UUID_BASE64_LEN, &olen, data->val, UUID_SIZE);
+	return 0;
+}
+
+int uuid_to_base64url(const struct uuid *data, char out[UUID_BASE64URL_LEN])
+{
+	if (out == NULL) {
+		return -EINVAL;
+	}
+
+	/* Convert UUID to RFC 3548/4648 base 64 notation */
+	size_t olen = 0;
+	char uuid_base64[UUID_BASE64_LEN] = {0};
+
+	base64_encode(uuid_base64, UUID_BASE64_LEN, &olen, data->val, UUID_SIZE);
+	/* Convert UUID to RFC 4648 sec. 5 URL and filename safe base 64 notation */
+	for (unsigned int i = 0; i < UUID_BASE64URL_LEN - 1; i++) {
+		if (uuid_base64[i] == '+') {
+			uuid_base64[i] = '-';
+		}
+		if (uuid_base64[i] == '/') {
+			uuid_base64[i] = '_';
+		}
+	}
+	memcpy(out, uuid_base64, UUID_BASE64URL_LEN - 1);
+	out[UUID_BASE64URL_LEN - 1] = 0;
+	return 0;
+}
+#endif
diff --git a/misc/generated/configs.c.in b/misc/generated/configs.c.in
index 886636f2ad0af..9de41052d39a9 100644
--- a/misc/generated/configs.c.in
+++ b/misc/generated/configs.c.in
@@ -1,7 +1,3 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- */
-
 /* file is auto-generated, do not modify ! */
 
 #include <zephyr/toolchain.h>
diff --git a/modules/Kconfig b/modules/Kconfig
index a8cf861a68096..f1d0f928838ce 100644
--- a/modules/Kconfig
+++ b/modules/Kconfig
@@ -26,16 +26,13 @@ source "modules/Kconfig.chre"
 source "modules/Kconfig.cypress"
 source "modules/Kconfig.eos_s3"
 source "modules/Kconfig.esp32"
-source "modules/Kconfig.imx"
 source "modules/Kconfig.infineon"
 source "modules/Kconfig.libmetal"
 source "modules/lvgl/Kconfig"
-source "modules/Kconfig.mcux"
 source "modules/Kconfig.microchip"
 source "modules/Kconfig.nuvoton"
 source "modules/Kconfig.open-amp"
 source "modules/Kconfig.picolibc"
-source "modules/Kconfig.nxp_s32"
 source "modules/Kconfig.renesas_fsp"
 source "modules/Kconfig.rust"
 source "modules/Kconfig.simplelink"
@@ -72,6 +69,9 @@ comment "hal_gigadevice module not available."
 comment "hal_nordic module not available."
 	depends on !ZEPHYR_HAL_NORDIC_MODULE
 
+comment "hal_nxp module not available."
+	depends on !ZEPHYR_HAL_NXP_MODULE
+
 comment "liblc3 module not available."
 	depends on !ZEPHYR_LIBLC3_MODULE
 
diff --git a/modules/Kconfig.mcuboot b/modules/Kconfig.mcuboot
index 73a6346f89b83..2c4dbfa930de1 100644
--- a/modules/Kconfig.mcuboot
+++ b/modules/Kconfig.mcuboot
@@ -254,6 +254,21 @@ config MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER
 	  a dedicated firmware updater application used to update the slot0_partition
 	  application.
 
+config MCUBOOT_BOOTLOADER_MODE_SINGLE_APP_RAM_LOAD
+	bool "MCUboot has been configured in single app RAM load mode"
+	select MCUBOOT_BOOTLOADER_MODE_HAS_NO_DOWNGRADE
+	select MCUBOOT_BOOTLOADER_NO_DOWNGRADE
+	help
+	  MCUboot can load the image to RAM from an arbitrary location. In this mode,
+	  MCUboot will copy the image to RAM and begin execution from there. The image
+	  must be linked to execute from RAM, the address that it is copied to is
+	  specified using the load-addr argument when running imgtool.
+	  Note that while not used directly, a slot0_partition must be defined in the
+	  DT, as it is used to get information about size of the image to be loaded.
+	  This option automatically selects MCUBOOT_BOOTLOADER_NO_DOWNGRADE as it is
+	  not possible to swap back to older version of the application. In fact, none
+	  of the swap operations are supported in this mode.
+
 endchoice # MCUBOOT_BOOTLOADER_MODE
 
 config MCUBOOT_BOOTLOADER_MODE_HAS_NO_DOWNGRADE
diff --git a/modules/Kconfig.renesas_fsp b/modules/Kconfig.renesas_fsp
index 05fc24c9ebf06..01fd54cb0812b 100644
--- a/modules/Kconfig.renesas_fsp
+++ b/modules/Kconfig.renesas_fsp
@@ -35,6 +35,11 @@ config USE_RA_FSP_I2C_IIC
 	help
 	  Enable Renesas RA I2C IIC Master driver
 
+config USE_RA_FSP_SCI_B_I2C
+	bool
+	help
+	  Enable RA FSP SCI-B I2C driver
+
 config USE_RA_FSP_SCI_UART
 	bool
 	help
@@ -154,10 +159,37 @@ config USE_RA_FSP_DAC
 	help
 	  Enable RA FSP DAC driver
 
+config USE_RA_FSP_ACMPHS
+	bool
+	help
+	  Enable RA FSP ACMPHS driver
+
+config USE_RA_FSP_WDT
+	bool
+	help
+	  Enable RA FSP WDT driver
+
+config USE_RA_FSP_ULPT
+	bool
+	help
+	  Enable RA FSP ULPT driver
+
+config USE_RA_FSP_LPM
+	bool
+	default y
+	depends on PM
+	help
+	  Enable RA FSP LPM driver
+
 endif # HAS_RENESAS_RA_FSP
 
 if HAS_RENESAS_RZ_FSP
 
+config USE_RZ_FSP_ADC
+	bool
+	help
+	  Enable RZ FSP ADC driver
+
 config USE_RZ_FSP_IOPORT
 	bool
 	help
@@ -168,6 +200,11 @@ config USE_RZ_FSP_SCIF_UART
 	help
 	  Enable RZ FSP SCIF UART driver
 
+config USE_RZ_FSP_RIIC_MASTER
+	bool
+	help
+	  Enable RZ FSP RIIC MASTER driver
+
 config USE_RZ_FSP_GTM
 	bool
 	help
@@ -183,4 +220,24 @@ config USE_RZ_FSP_EXT_IRQ
 	help
 	  Enable RZ FSP External IRQ driver
 
+config USE_RZ_FSP_DMA
+	bool
+	help
+	  Enable RZ FSP DMA driver
+
+config USE_RZ_FSP_MHU
+	bool
+	help
+	  Enable RZ FSP MHU driver
+
+config USE_RZ_FSP_CPG
+	bool
+	help
+	  Enable RZ FSP CLOCK CONTROL driver
+
+config USE_RZ_FSP_SCI_UART
+	bool
+	help
+	  Enable RZ FSP SCI UART driver
+
 endif
diff --git a/modules/cmsis-dsp/CMakeLists.txt b/modules/cmsis-dsp/CMakeLists.txt
index e5ebbfcf172da..2a0924cc25cc4 100644
--- a/modules/cmsis-dsp/CMakeLists.txt
+++ b/modules/cmsis-dsp/CMakeLists.txt
@@ -8,7 +8,7 @@ if(CONFIG_CMSIS_DSP)
 
   zephyr_library()
 
-  zephyr_library_compile_options(-Ofast)
+  zephyr_library_compile_options($<TARGET_PROPERTY:compiler,optimization_fast>)
 
   zephyr_include_directories(
     ${CMSIS_DSP_DIR}/Include
@@ -47,8 +47,6 @@ if(CONFIG_CMSIS_DSP)
     endif()
   endif()
 
-  zephyr_library_compile_options(-Ofast)
-
   zephyr_compile_definitions_ifndef(CONFIG_ARM __GNUC_PYTHON__)
 
   # BasicMathFunctions
diff --git a/modules/cmsis-nn/CMakeLists.txt b/modules/cmsis-nn/CMakeLists.txt
index ec55bafbcfa7a..7c05e8a585abf 100644
--- a/modules/cmsis-nn/CMakeLists.txt
+++ b/modules/cmsis-nn/CMakeLists.txt
@@ -8,7 +8,7 @@ if(CONFIG_CMSIS_NN)
 
   zephyr_library()
 
-  zephyr_library_compile_options(-Ofast)
+  zephyr_library_compile_options($<TARGET_PROPERTY:compiler,optimization_fast>)
 
   zephyr_include_directories(${CMSIS_NN_DIR}/Include)
 
@@ -85,4 +85,14 @@ if(CONFIG_CMSIS_NN)
     zephyr_library_sources(${SRC})
   endif()
 
+  if(CONFIG_CMSIS_NN_TRANSPOSE)
+    file(GLOB SRC "${CMSIS_NN_DIR}/Source/TransposeFunctions/*_s8.c")
+    zephyr_library_sources(${SRC})
+  endif()
+
+  if(CONFIG_CMSIS_NN_PAD)
+    file(GLOB SRC "${CMSIS_NN_DIR}/Source/PadFunctions/*_s8.c")
+    zephyr_library_sources(${SRC})
+  endif()
+
 endif()
diff --git a/modules/cmsis-nn/Kconfig b/modules/cmsis-nn/Kconfig
index 53c3aa4987d7d..dd5395f92efaa 100644
--- a/modules/cmsis-nn/Kconfig
+++ b/modules/cmsis-nn/Kconfig
@@ -78,4 +78,14 @@ config CMSIS_NN_LSTM
 	help
 	  This option enables the NN libraries for Long Short-Term Memory.
 
+config CMSIS_NN_PAD
+	bool "Pad"
+	help
+	  This option enables the NN libraries for the pad layers.
+
+config CMSIS_NN_TRANSPOSE
+	bool "Transpose"
+	help
+	  This option enables the NN libraries for the transpose layers.
+
 endif #CMSIS_NN
diff --git a/modules/cmsis/cmsis_core_a_r_ext.h b/modules/cmsis/cmsis_core_a_r_ext.h
index 0752b1474fa2b..e1ddce4c0664c 100644
--- a/modules/cmsis/cmsis_core_a_r_ext.h
+++ b/modules/cmsis/cmsis_core_a_r_ext.h
@@ -29,6 +29,33 @@
 #define FSR_FS_ALIGNMENT_FAULT				(33)
 #define FSR_FS_DEBUG_EVENT				(34)
 #define FSR_FS_UNSUPPORTED_EXCLUSIVE_ACCESS_FAULT	(53)
+#elif defined(CONFIG_ARMV7_A)
+
+/**
+ * N.B.: these FSR encodings are only valid when the
+ * Short-descriptor translation table format is used
+ */
+
+#define FSR_FS_ALIGNMENT_FAULT					(1)
+#define FSR_FS_DEBUG_EVENT					(2)
+#define FSR_FS_ACCESS_FLAG_FAULT_1ST_LEVEL			(3)
+#define FSR_FS_CACHE_MAINTENANCE_INSTRUCTION_FAULT		(4)
+#define FSR_FS_TRANSLATION_FAULT				(5)
+#define FSR_FS_ACCESS_FLAG_FAULT_2ND_LEVEL			(6)
+#define FSR_FS_TRANSLATION_FAULT_2ND_LEVEL			(7)
+#define FSR_FS_SYNC_EXTERNAL_ABORT				(8)
+#define FSR_FS_DOMAIN_FAULT_1ST_LEVEL				(9)
+#define FSR_FS_DOMAIN_FAULT_2ND_LEVEL				(11)
+#define FSR_FS_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_1ST_LEVEL	(12)
+#define FSR_FS_PERMISSION_FAULT					(13)
+#define FSR_FS_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL	(14)
+#define FSR_FS_PERMISSION_FAULT_2ND_LEVEL			(15)
+#define FSR_FS_TLB_CONFLICT_FAULT				(16)
+#define FSR_FS_ASYNC_EXTERNAL_ABORT				(22)
+#define FSR_FS_ASYNC_PARITY_ERROR				(24)
+#define FSR_FS_SYNC_PARITY_ERROR				(25)
+#define FSR_FS_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL	(28)
+#define FSR_FS_SYNC_PARITY_ERROR_TRANSLATION_TABLE_2ND_LEVEL	(30)
 #else
 #define FSR_FS_BACKGROUND_FAULT		(0)
 #define FSR_FS_ALIGNMENT_FAULT		(1)
diff --git a/modules/fatfs/zephyr_fatfs_config.h b/modules/fatfs/zephyr_fatfs_config.h
index 396f303ac0f7f..e55cdc3330271 100644
--- a/modules/fatfs/zephyr_fatfs_config.h
+++ b/modules/fatfs/zephyr_fatfs_config.h
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#if FFCONF_DEF != 80286
+#if FFCONF_DEF != 5380
 #error "Configuration version mismatch"
 #endif
 
@@ -117,6 +117,21 @@
 #define FF_USE_FIND 1
 #endif /* defined(CONFIG_FS_FATFS_EXTRA_NATIVE_API) */
 
+/*
+ * When custom mount points are activated FF_VOLUME_STRS needs
+ * to be undefined in order to be able to provide a custom
+ * VolumeStr array containing the contents of
+ * CONFIG_FS_FATFS_CUSTOM_MOUNT_POINTS. Additionally the
+ * FF_VOLUMES define needs to be set to the correct mount
+ * point count contained in
+ * CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT.
+ */
+#if CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT
+#undef FF_VOLUMES
+#define FF_VOLUMES CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT
+#undef FF_VOLUME_STRS
+#endif /* CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT */
+
 /*
  * Options provided below have been added to ELM FAT source code to
  * support Zephyr specific features, and are not part of ffconf.h.
diff --git a/modules/fatfs/zfs_diskio.c b/modules/fatfs/zfs_diskio.c
index 2b0fa742e711e..ef9fe8acd453f 100644
--- a/modules/fatfs/zfs_diskio.c
+++ b/modules/fatfs/zfs_diskio.c
@@ -8,7 +8,7 @@
 /* The file is based on template file by (C)ChaN, 2019, as
  * available from FAT FS module source:
  * https://github.com/zephyrproject-rtos/fatfs/blob/master/diskio.c
- * and has been previously avaialble from directory for that module
+ * and has been previously available from directory for that module
  * under name zfs_diskio.c.
  */
 #include <ff.h>
@@ -16,14 +16,19 @@
 #include <zfs_diskio.h> /* Zephyr specific FatFS API */
 #include <zephyr/storage/disk_access.h>
 
-static const char * const pdrv_str[] = {FF_VOLUME_STRS};
+#if CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT
+#define PDRV_STR_ARRAY VolumeStr
+#else
+static const char *const pdrv_str[] = {FF_VOLUME_STRS};
+#define PDRV_STR_ARRAY pdrv_str
+#endif /* CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT */
 
 /* Get Drive Status */
 DSTATUS disk_status(BYTE pdrv)
 {
-	__ASSERT(pdrv < ARRAY_SIZE(pdrv_str), "pdrv out-of-range\n");
+	__ASSERT(pdrv < ARRAY_SIZE(PDRV_STR_ARRAY), "pdrv out-of-range\n");
 
-	if (disk_access_status(pdrv_str[pdrv]) != 0) {
+	if (disk_access_status(PDRV_STR_ARRAY[pdrv]) != 0) {
 		return STA_NOINIT;
 	} else {
 		return RES_OK;
@@ -41,22 +46,21 @@ DSTATUS disk_initialize(BYTE pdrv)
 /* Read Sector(s) */
 DRESULT disk_read(BYTE pdrv, BYTE *buff, LBA_t sector, UINT count)
 {
-	__ASSERT(pdrv < ARRAY_SIZE(pdrv_str), "pdrv out-of-range\n");
+	__ASSERT(pdrv < ARRAY_SIZE(PDRV_STR_ARRAY), "pdrv out-of-range\n");
 
-	if (disk_access_read(pdrv_str[pdrv], buff, sector, count) != 0) {
+	if (disk_access_read(PDRV_STR_ARRAY[pdrv], buff, sector, count) != 0) {
 		return RES_ERROR;
 	} else {
 		return RES_OK;
 	}
-
 }
 
 /* Write Sector(s) */
 DRESULT disk_write(BYTE pdrv, const BYTE *buff, LBA_t sector, UINT count)
 {
-	__ASSERT(pdrv < ARRAY_SIZE(pdrv_str), "pdrv out-of-range\n");
+	__ASSERT(pdrv < ARRAY_SIZE(PDRV_STR_ARRAY), "pdrv out-of-range\n");
 
-	if (disk_access_write(pdrv_str[pdrv], buff, sector, count) != 0) {
+	if (disk_access_write(PDRV_STR_ARRAY[pdrv], buff, sector, count) != 0) {
 		return RES_ERROR;
 	} else {
 		return RES_OK;
@@ -69,19 +73,18 @@ DRESULT disk_ioctl(BYTE pdrv, BYTE cmd, void *buff)
 	int ret = RES_OK;
 	uint32_t sector_size = 0;
 
-	__ASSERT(pdrv < ARRAY_SIZE(pdrv_str), "pdrv out-of-range\n");
+	__ASSERT(pdrv < ARRAY_SIZE(PDRV_STR_ARRAY), "pdrv out-of-range\n");
 
 	switch (cmd) {
 	case CTRL_SYNC:
-		if (disk_access_ioctl(pdrv_str[pdrv],
-				DISK_IOCTL_CTRL_SYNC, buff) != 0) {
+		if (disk_access_ioctl(PDRV_STR_ARRAY[pdrv], DISK_IOCTL_CTRL_SYNC, buff) != 0) {
 			ret = RES_ERROR;
 		}
 		break;
 
 	case GET_SECTOR_COUNT:
-		if (disk_access_ioctl(pdrv_str[pdrv],
-				DISK_IOCTL_GET_SECTOR_COUNT, buff) != 0) {
+		if (disk_access_ioctl(PDRV_STR_ARRAY[pdrv], DISK_IOCTL_GET_SECTOR_COUNT, buff) !=
+		    0) {
 			ret = RES_ERROR;
 		}
 		break;
@@ -91,9 +94,9 @@ DRESULT disk_ioctl(BYTE pdrv, BYTE cmd, void *buff)
 		 * 32-bit number while FatFS's GET_SECTOR_SIZE is supposed to
 		 * return a 16-bit number.
 		 */
-		if ((disk_access_ioctl(pdrv_str[pdrv],
-				DISK_IOCTL_GET_SECTOR_SIZE, &sector_size) == 0) &&
-			(sector_size == (uint16_t)sector_size)) {
+		if ((disk_access_ioctl(PDRV_STR_ARRAY[pdrv], DISK_IOCTL_GET_SECTOR_SIZE,
+				       &sector_size) == 0) &&
+		    (sector_size == (uint16_t)sector_size)) {
 			*(uint16_t *)buff = (uint16_t)sector_size;
 		} else {
 			ret = RES_ERROR;
@@ -101,8 +104,8 @@ DRESULT disk_ioctl(BYTE pdrv, BYTE cmd, void *buff)
 		break;
 
 	case GET_BLOCK_SIZE:
-		if (disk_access_ioctl(pdrv_str[pdrv],
-				DISK_IOCTL_GET_ERASE_BLOCK_SZ, buff) != 0) {
+		if (disk_access_ioctl(PDRV_STR_ARRAY[pdrv], DISK_IOCTL_GET_ERASE_BLOCK_SZ, buff) !=
+		    0) {
 			ret = RES_ERROR;
 		}
 		break;
@@ -113,16 +116,14 @@ DRESULT disk_ioctl(BYTE pdrv, BYTE cmd, void *buff)
 	case CTRL_POWER:
 		if (((*(uint8_t *)buff)) == DISK_IOCTL_POWER_OFF) {
 			/* Power disk off */
-			if (disk_access_ioctl(pdrv_str[pdrv],
-					      DISK_IOCTL_CTRL_DEINIT,
-					      NULL) != 0) {
+			if (disk_access_ioctl(PDRV_STR_ARRAY[pdrv], DISK_IOCTL_CTRL_DEINIT, NULL) !=
+			    0) {
 				ret = RES_ERROR;
 			}
 		} else {
 			/* Power disk on */
-			if (disk_access_ioctl(pdrv_str[pdrv],
-					      DISK_IOCTL_CTRL_INIT,
-					      NULL) != 0) {
+			if (disk_access_ioctl(PDRV_STR_ARRAY[pdrv], DISK_IOCTL_CTRL_INIT, NULL) !=
+			    0) {
 				ret = STA_NOINIT;
 			}
 		}
diff --git a/modules/hal_ambiq/Kconfig b/modules/hal_ambiq/Kconfig
index 1f48cbb4f7644..855ccfe528e9a 100644
--- a/modules/hal_ambiq/Kconfig
+++ b/modules/hal_ambiq/Kconfig
@@ -1,78 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025, Ambiq Micro Inc. <www.ambiq.com>
 
-config AMBIQ_HAL
-	bool "Ambiq HAL drivers support"
-	depends on SOC_SERIES_APOLLO4X || SOC_SERIES_APOLLO3X
-	help
-	  Use the Ambiq HAL
-
-if AMBIQ_HAL
-
-config AMBIQ_HAL_USE_ADC
-	bool
-	help
-	  Use the ADC driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_GPIO
-	bool
-	help
-	  Use the GPIO driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_STIMER
-	bool
-	help
-	  Use the STIMER driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_TIMER
-	bool
-	help
-	  Use the TIMER driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_WDT
-	bool
-	help
-	  Use the WDT driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_I2C
-	bool
-	help
-	  Use the I2C driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_SPIC
-	bool
-	help
-	  Use the SPI Controller driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_SPID
-	bool
-	help
-	  Use the SPI Device driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_MSPI
-	bool
-	help
-	  Use the MSPI driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_HWINFO
-	bool
-	help
-	  Use the HWINFO driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_BLEIF
-	bool
-	help
-	  Use the BLEIF driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_ADC
-	bool
-	help
-	  Use the ADC driver from Ambiq HAL
-
-config AMBIQ_HAL_USE_USB
-	bool
-	help
-	  Use the USB driver from Ambiq HAL
-
-endif # AMBIQ_HAL
+rsource "Kconfig.hal"
+rsource "Kconfig.components"
diff --git a/modules/hal_ambiq/Kconfig.components b/modules/hal_ambiq/Kconfig.components
new file mode 100644
index 0000000000000..f9f98e9a5abd1
--- /dev/null
+++ b/modules/hal_ambiq/Kconfig.components
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025, Ambiq Micro Inc. <www.ambiq.com>
+
+config AMBIQ_COMPONENT_USE_BT
+	bool
+	depends on SOC_AMBIQ_BT_SUPPORTED
+	help
+	  Use Bluetooth component from Ambiq
diff --git a/modules/hal_ambiq/Kconfig.hal b/modules/hal_ambiq/Kconfig.hal
new file mode 100644
index 0000000000000..67ad186c56bec
--- /dev/null
+++ b/modules/hal_ambiq/Kconfig.hal
@@ -0,0 +1,114 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025, Ambiq Micro Inc. <www.ambiq.com>
+
+config AMBIQ_HAL
+	bool "Ambiq HAL drivers support"
+	depends on SOC_SERIES_APOLLO3X || SOC_SERIES_APOLLO4X
+	help
+	  Use the Ambiq HAL
+
+if AMBIQ_HAL
+
+config AMBIQ_HAL_USE_ADC
+	bool
+	help
+	  Use the ADC driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_ITM
+	bool
+	help
+	  Use the ITM HAL from Ambiq
+
+config AMBIQ_HAL_USE_TPIU
+	bool
+	help
+	  Use the TPIU HAL from Ambiq
+
+config AMBIQ_HAL_USE_DCU
+	bool
+	help
+	  Use the DCU HAL from Ambiq
+
+config AMBIQ_HAL_USE_GPIO
+	bool
+	help
+	  Use the GPIO driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_STIMER
+	bool
+	help
+	  Use the STIMER driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_TIMER
+	bool
+	help
+	  Use the TIMER driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_WDT
+	bool
+	help
+	  Use the WDT driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_I2C
+	bool
+	help
+	  Use the I2C driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_SPIC
+	bool
+	help
+	  Use the SPI Controller driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_SPID
+	bool
+	help
+	  Use the SPI Device driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_MSPI
+	bool
+	help
+	  Use the MSPI driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_HWINFO
+	bool
+	help
+	  Use the HWINFO driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_BLEIF
+	bool
+	help
+	  Use the BLEIF driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_ADC
+	bool
+	help
+	  Use the ADC driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_USB
+	bool
+	help
+	  Use the USB driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_SDIO
+	bool
+	help
+	  Use the SDIO driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_ADC
+	bool
+	help
+	  Use the ADC driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_DSI
+	bool
+	help
+	  Use the DSI driver from Ambiq HAL
+
+config AMBIQ_HAL_USE_USB
+	bool
+	help
+	  Use the USB driver from Ambiq HAL
+
+endif # AMBIQ_HAL
diff --git a/modules/hal_infineon/CMakeLists.txt b/modules/hal_infineon/CMakeLists.txt
index 0715737250fdc..09cb72b0d8a3c 100644
--- a/modules/hal_infineon/CMakeLists.txt
+++ b/modules/hal_infineon/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 if(CONFIG_HAS_XMCLIB OR CONFIG_SOC_FAMILY_PSOC6_LEGACY OR CONFIG_SOC_FAMILY_INFINEON_CAT1)
   zephyr_library_named(modules_hal_infineon)
-  zephyr_library_compile_options(-Wno-array-bounds)
+  zephyr_library_compile_options($<TARGET_PROPERTY:compiler,warning_no_array_bounds>)
 endif()
 
 ## Add PDL sources for XMC devices
diff --git a/modules/hal_infineon/mtb-pdl-cat1/CMakeLists.txt b/modules/hal_infineon/mtb-pdl-cat1/CMakeLists.txt
index 4eca9d8f882f7..b46395bfbb83d 100644
--- a/modules/hal_infineon/mtb-pdl-cat1/CMakeLists.txt
+++ b/modules/hal_infineon/mtb-pdl-cat1/CMakeLists.txt
@@ -33,7 +33,6 @@ zephyr_library_sources(${pdl_drv_dir}/source/TOOLCHAIN_GCC_ARM/cy_syslib_ext.S)
 
 # Peripheral drivers
 zephyr_library_sources_ifdef(CONFIG_SOC_FAMILY_PSOC6_LEGACY      ${pdl_drv_dir}/source/cy_sysint.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_ADC      ${pdl_drv_dir}/source/cy_sar.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_I2C      ${pdl_drv_dir}/source/cy_scb_i2c.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_LPTIMER  ${pdl_drv_dir}/source/cy_mcwdt.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_PWM      ${pdl_drv_dir}/source/cy_tcpwm_pwm.c)
diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 02d724377349d..cce0688a91210 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
   list(APPEND nrf_regtool_components GENERATE:UICR)
 endif()
 if(DEFINED nrf_regtool_components)
-  find_package(nrf-regtool 8.1.2
+  find_package(nrf-regtool 9.0.1
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH
diff --git a/modules/hal_nordic/Kconfig b/modules/hal_nordic/Kconfig
index 32ff1a6c74c0e..8053017170e61 100644
--- a/modules/hal_nordic/Kconfig
+++ b/modules/hal_nordic/Kconfig
@@ -36,6 +36,13 @@ menuconfig NRF_802154_RADIO_DRIVER
 
 if NRF_802154_RADIO_DRIVER
 
+config NRF_802154_CONSTLAT_CONTROL
+	def_bool y
+	depends on SOC_SERIES_NRF54LX && NRF_802154_SL_OPENSOURCE
+	select NRF_SYS_EVENT
+	help
+	  Allows the nRF 802.15.4 radio driver to manage the constant latency state.
+
 config NRF_802154_MULTIPROTOCOL_SUPPORT
 	bool
 	help
diff --git a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
index a55e63bc589df..87aa85261e980 100644
--- a/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
+++ b/modules/hal_nordic/nrf_802154/sl_opensource/platform/nrf_802154_clock_zephyr.c
@@ -12,6 +12,7 @@
 #include <compiler_abstraction.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <nrf_sys_event.h>
 
 static bool hfclk_is_running;
 
@@ -52,6 +53,14 @@ void nrf_802154_clock_hfclk_start(void)
 
 	sys_notify_init_callback(&hfclk_cli.notify, hfclk_on_callback);
 
+	/*
+	 * todo: replace constlat request with PM policy API when
+	 * controlling the event latency becomes possible.
+	 */
+	if (IS_ENABLED(CONFIG_NRF_802154_CONSTLAT_CONTROL)) {
+		nrf_sys_event_request_global_constlat();
+	}
+
 	int ret = onoff_request(mgr, &hfclk_cli);
 	__ASSERT_NO_MSG(ret >= 0);
 	(void)ret;
@@ -67,6 +76,11 @@ void nrf_802154_clock_hfclk_stop(void)
 	int ret = onoff_cancel_or_release(mgr, &hfclk_cli);
 	__ASSERT_NO_MSG(ret >= 0);
 	(void)ret;
+
+	if (IS_ENABLED(CONFIG_NRF_802154_CONSTLAT_CONTROL)) {
+		nrf_sys_event_release_global_constlat();
+	}
+
 	hfclk_is_running = false;
 }
 
diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt
index 41dfb61f86465..d94c2da32a823 100644
--- a/modules/hal_nordic/nrfs/CMakeLists.txt
+++ b/modules/hal_nordic/nrfs/CMakeLists.txt
@@ -22,16 +22,18 @@ if(CONFIG_NRFS)
     zephyr_library_sources(${HELPERS_DIR}/dvfs_oppoint.c)
 
     if(CONFIG_NRFS_LOCAL_DOMAIN)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_audiopll.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_CLOCK_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_clock.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_DIAG_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_diag.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_DVFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_dvfs.c)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_GDFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdfs.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_GDPWR_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdpwr.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_MRAM_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_mram.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_PMIC_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_pmic.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_RESET_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_reset.c)
+        zephyr_library_sources_ifdef(CONFIG_NRFS_SWEXT_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_swext.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_TEMP_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_temp.c)
         zephyr_library_sources_ifdef(CONFIG_NRFS_VBUS_DETECTOR_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_usb.c)
-        zephyr_library_sources_ifdef(CONFIG_NRFS_GDFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_gdfs.c)
         zephyr_library_sources(${SRC_DIR}/internal/nrfs_dispatcher.c)
         add_subdirectory_ifdef(CONFIG_NRFS_DVFS_LOCAL_DOMAIN dvfs)
 
diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
index cf40a64f592b3..f5d4e92f94de3 100644
--- a/modules/hal_nordic/nrfs/Kconfig
+++ b/modules/hal_nordic/nrfs/Kconfig
@@ -7,6 +7,9 @@ config HAS_NRFS
 menu "nRF Services"
 	depends on HAS_NRFS
 
+config NRFS_HAS_AUDIOPLL_SERVICE
+	bool
+
 config NRFS_HAS_CLOCK_SERVICE
 	bool
 
@@ -34,6 +37,9 @@ config NRFS_HAS_PMIC_SERVICE
 config NRFS_HAS_RESET_SERVICE
 	bool
 
+config NRFS_HAS_SWEXT_SERVICE
+	bool
+
 config NRFS_HAS_TEMP_SERVICE
 	bool
 
@@ -125,6 +131,16 @@ config NRFS_GDFS_SERVICE_ENABLED
 	depends on NRFS_HAS_GDFS_SERVICE
 	default y
 
+config NRFS_SWEXT_SERVICE_ENABLED
+	bool "SWEXT peripheral control service"
+	depends on NRFS_HAS_SWEXT_SERVICE
+	default y
+
+config NRFS_AUDIOPLL_SERVICE_ENABLED
+	bool "Audio PLL service"
+	depends on NRFS_HAS_AUDIOPLL_SERVICE
+	default y if SOC_NRF54H20_CPUAPP
+
 endmenu
 
 rsource "backends/Kconfig"
diff --git a/modules/hal_nordic/nrfs/backends/Kconfig b/modules/hal_nordic/nrfs/backends/Kconfig
index 2dc97ea63ceb9..34cd5c847c50f 100644
--- a/modules/hal_nordic/nrfs/backends/Kconfig
+++ b/modules/hal_nordic/nrfs/backends/Kconfig
@@ -25,4 +25,19 @@ config NRFS_BACKEND_TX_MSG_QUEUE_SIZE
 	range 1 16
 	default 8
 
+config NRFS_SEND_RETRY_DELAY
+	int "Delay in us"
+	range 1 100
+	default 1
+	help
+	  Delay when waiting for next message send retry in case of send error.
+
+config NRFS_SEND_RETRY_MAX_COUNT
+	int "Max number of send retries"
+	range 0 100
+	default 5
+	help
+	  How many times nrfs will try to send message over ipc service until
+	  error will be reported. For example when shared ipc memory is full.
+
 endmenu
diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
index 8cc49c992344a..c41beec2bb3e2 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c
@@ -82,6 +82,10 @@ __weak void nrfs_backend_error_handler(enum nrfs_backend_error error_id, int err
 		LOG_ERR("IPC register endpoint failure with error: %d", error);
 		break;
 
+	case NRFS_ERROR_SEND_DATA_FROM_QUEUE:
+		LOG_ERR("IPC backend sent data failed.");
+		break;
+
 	default:
 		LOG_ERR("Undefined error id: %d, error cause: %d", error_id, error);
 		break;
@@ -128,14 +132,45 @@ static void ipc_sysctrl_ept_recv(const void *data, size_t size, void *priv)
 	}
 }
 
+/**
+ * @brief This function will try to send data directly using ipc service
+ *        In case of errors it will retry if configured.
+ *
+ * @param message Pointer to the buffer to send.
+ * @param size Number of bytes to send.
+ * @retval NRFS_SUCCESS Message sent successfully.
+ * @retval NRFS_ERR_IPC Backend returned error during message sending.
+ */
+static nrfs_err_t nrfs_backend_try_send_directly_over_ipc_service(void *message, size_t size)
+{
+	size_t retry_count = CONFIG_NRFS_SEND_RETRY_MAX_COUNT + 1;
+	int ret = 0;
+
+	do {
+		ret = ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, message, size);
+		if (ret < (int)size) {
+			k_usleep(CONFIG_NRFS_SEND_RETRY_DELAY);
+		} else {
+			return NRFS_SUCCESS;
+		}
+	} while (--retry_count);
+
+	return NRFS_ERR_IPC;
+}
+
 static void nrfs_backend_send_work(struct k_work *item)
 {
 	struct ipc_data_packet data_to_send;
 
 	LOG_DBG("Sending data from workqueue");
 	while (k_msgq_get(&ipc_transmit_msgq, &data_to_send, K_NO_WAIT) == 0) {
-		ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, &data_to_send.data,
-				 data_to_send.size);
+
+		nrfs_err_t ret = nrfs_backend_try_send_directly_over_ipc_service(&data_to_send.data,
+										 data_to_send.size);
+
+		if (ret != NRFS_SUCCESS) {
+			nrfs_backend_error_handler(NRFS_ERROR_SEND_DATA_FROM_QUEUE, 0, true);
+		}
 	}
 }
 
@@ -185,8 +220,8 @@ nrfs_err_t nrfs_backend_send(void *message, size_t size)
 nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout, bool high_prio)
 {
 	if (!k_is_in_isr() && nrfs_backend_connected()) {
-		return ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, message, size) ?
-			NRFS_SUCCESS : NRFS_ERR_IPC;
+		return nrfs_backend_try_send_directly_over_ipc_service(message, size);
+
 	} else if (size <= MAX_PACKET_DATA_SIZE) {
 		int err;
 		struct ipc_data_packet tx_data;
diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h
index beb07e9e8d0f5..0e3a899ec48dd 100644
--- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h
+++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.h
@@ -36,6 +36,7 @@ enum nrfs_backend_error {
 	NRFS_ERROR_IPC_OPEN_INSTANCE,
 	NRFS_ERROR_IPC_REGISTER_ENDPOINT,
 	NRFS_ERROR_BACKEND_NOT_CONNECTED,
+	NRFS_ERROR_SEND_DATA_FROM_QUEUE,
 	NRFS_ERROR_COUNT
 };
 
diff --git a/modules/hal_nordic/nrfs/dvfs/Kconfig b/modules/hal_nordic/nrfs/dvfs/Kconfig
index 45a99f8a7ad6d..a1958adea9940 100644
--- a/modules/hal_nordic/nrfs/dvfs/Kconfig
+++ b/modules/hal_nordic/nrfs/dvfs/Kconfig
@@ -17,6 +17,7 @@ config NRFS_LOCAL_DOMAIN_DVFS_TEST
 
 config NRFS_LOCAL_DOMAIN_DVFS_SCALE_DOWN_AFTER_INIT
 	bool "Local domain scale down after init"
+	select DEPRECATED
 	help
 	  Request lowest oppoint after DVFS initialization.
 
diff --git a/modules/hal_nordic/nrfs/nrfs_config.h b/modules/hal_nordic/nrfs/nrfs_config.h
index 392c2019dfe06..9d1a9b7b6b35b 100644
--- a/modules/hal_nordic/nrfs/nrfs_config.h
+++ b/modules/hal_nordic/nrfs/nrfs_config.h
@@ -52,6 +52,14 @@
 #define NRFS_GDFS_SERVICE_ENABLED
 #endif
 
+#ifdef CONFIG_NRFS_SWEXT_SERVICE_ENABLED
+#define NRFS_SWEXT_SERVICE_ENABLED
+#endif
+
+#ifdef CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED
+#define NRFS_AUDIOPLL_SERVICE_ENABLED
+#endif
+
 #ifdef CONFIG_SOC_POSIX
 #define NRFS_UNIT_TESTS_ENABLED
 #endif
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index 02849d9376150..d1972356fccf5 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -48,8 +48,9 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05            NRF54L05_XXAA
                                                                 DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR    NRF_FLPR)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54L09_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA       NRF54LV10A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10            NRF54L10_XXAA
                                                                 DEVELOP_IN_NRF54L15)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP     NRF_APPLICATION)
@@ -59,8 +60,9 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUAPP     NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR    NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54L20_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA       NRF54LM20A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120             NRF9120_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160             NRF9160_XXAA)
 
@@ -236,12 +238,14 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUAPP      nrf54l05_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR     nrf54l05_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54l09_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUAPP nrf54lv10a_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L09_ENGA_CPUFLPR nrf54lv10a_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUAPP      nrf54l10_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR     nrf54l10_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR     nrf54l15_flpr.svd)
-mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54l20_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUAPP nrf54lm20a_enga_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54L20_ENGA_CPUFLPR nrf54lm20a_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9120              nrf9120.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9160              nrf9160.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP  nrf9230_engb_application.svd)
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 14e5c47e858f8..1d9fa103de296 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -11,11 +11,11 @@ rsource "Kconfig.logging"
 
 config NRFX_ADC
 	bool "ADC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_ADC))
+	depends on $(dt_nodelabel_exists,adc) && SOC_SERIES_NRF51X
 
 config NRFX_CLOCK
 	bool "CLOCK driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_CLOCK))
+	depends on $(dt_nodelabel_exists,clock)
 
 config NRFX_CLOCK_LFXO_TWO_STAGE_ENABLED
 	bool "Two stage start sequence of the low frequency clock"
@@ -23,7 +23,7 @@ config NRFX_CLOCK_LFXO_TWO_STAGE_ENABLED
 
 config NRFX_COMP
 	bool "COMP driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_COMP))
+	depends on $(dt_nodelabel_exists,comp)
 
 config NRFX_CRACEN
 	bool "CRACEN drivers"
@@ -35,85 +35,85 @@ config NRFX_DPPI
 config NRFX_DPPI0
 	bool "DPPI0 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic0)
 	select NRFX_DPPI
 
 config NRFX_DPPI00
 	bool "DPPI00 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic00,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic00)
 	select NRFX_DPPI
 
 config NRFX_DPPI10
 	bool "DPPI10 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic10,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic10)
 	select NRFX_DPPI
 
 config NRFX_DPPI20
 	bool "DPPI20 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic20,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic20)
 	select NRFX_DPPI
 
 config NRFX_DPPI30
 	bool "DPPI30 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic30,$(DT_COMPAT_NORDIC_NRF_DPPIC))
+	depends on $(dt_nodelabel_exists,dppic30)
 	select NRFX_DPPI
 
 config NRFX_DPPI020
 	bool "DPPI020 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic020,$(DT_COMPAT_NORDIC_NRF_DPPIC_LOCAL))
+	depends on $(dt_nodelabel_exists,dppic020)
 	select NRFX_DPPI
 
 config NRFX_DPPI120
 	bool "DPPI120 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic120,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic120)
 	select NRFX_DPPI
 
 config NRFX_DPPI130
 	bool "DPPI130 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic130,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic130)
 	select NRFX_DPPI
 
 config NRFX_DPPI131
 	bool "DPPI131 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic131,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic131)
 	select NRFX_DPPI
 
 config NRFX_DPPI132
 	bool "DPPI132 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic132,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic132)
 	select NRFX_DPPI
 
 config NRFX_DPPI133
 	bool "DPPI133 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic133,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic133)
 	select NRFX_DPPI
 
 config NRFX_DPPI134
 	bool "DPPI134 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic134,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic134)
 	select NRFX_DPPI
 
 config NRFX_DPPI135
 	bool "DPPI135 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic135,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic135)
 	select NRFX_DPPI
 
 config NRFX_DPPI136
 	bool "DPPI136 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,dppic136,$(DT_COMPAT_NORDIC_NRF_DPPIC_GLOBAL))
+	depends on $(dt_nodelabel_exists,dppic136)
 	select NRFX_DPPI
 
 config NRFX_EGU
@@ -121,52 +121,52 @@ config NRFX_EGU
 
 config NRFX_EGU0
 	bool "EGU0 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu0,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu0)
 	select NRFX_EGU
 
 config NRFX_EGU1
 	bool "EGU1 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu1,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu1)
 	select NRFX_EGU
 
 config NRFX_EGU2
 	bool "EGU2 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu2,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu2)
 	select NRFX_EGU
 
 config NRFX_EGU3
 	bool "EGU3 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu3,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu3)
 	select NRFX_EGU
 
 config NRFX_EGU4
 	bool "EGU4 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu4,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu4)
 	select NRFX_EGU
 
 config NRFX_EGU5
 	bool "EGU5 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu5,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu5)
 	select NRFX_EGU
 
 config NRFX_EGU10
 	bool "EGU10 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu10,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu10)
 	select NRFX_EGU
 
 config NRFX_EGU20
 	bool "EGU20 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu20,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu20)
 	select NRFX_EGU
 
 config NRFX_EGU020
 	bool "EGU020 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu020,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu020)
 	select NRFX_EGU
 
 config NRFX_EGU130
 	bool "EGU130 driver instance"
-	depends on $(dt_nodelabel_has_compat,egu130,$(DT_COMPAT_NORDIC_NRF_EGU))
+	depends on $(dt_nodelabel_exists,egu130)
 	select NRFX_EGU
 
 config NRFX_GPIOTE
@@ -174,32 +174,32 @@ config NRFX_GPIOTE
 
 config NRFX_GPIOTE0
 	bool "GPIOTE0 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote0,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote0)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE1
 	bool "GPIOTE1 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote1,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote1)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE20
 	bool "NRFX_GPIOTE20 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote20,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote20)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE30
 	bool "NRFX_GPIOTE30 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote30,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote30)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE130
 	bool "NRFX_GPIOTE130 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote130,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote130)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE131
 	bool "NRFX_GPIOTE131 driver instance"
-	depends on $(dt_nodelabel_has_compat,gpiote131,$(DT_COMPAT_NORDIC_NRF_GPIOTE))
+	depends on $(dt_nodelabel_exists,gpiote131)
 	select NRFX_GPIOTE
 
 config NRFX_GPIOTE_NUM_OF_EVT_HANDLERS
@@ -218,71 +218,68 @@ config NRFX_GPPI
 
 config NRFX_GRTC
 	bool "GRTC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_GRTC))
+	depends on $(dt_nodelabel_exists,grtc)
 
 config NRFX_I2S
 	bool
 
 config NRFX_I2S0
 	bool "I2S0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2s0,$(DT_COMPAT_NORDIC_NRF_I2S))
+	depends on $(dt_nodelabel_exists,i2s0)
 	select NRFX_I2S
 
 config NRFX_I2S20
 	bool "I2S20 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2s20,$(DT_COMPAT_NORDIC_NRF_I2S))
+	depends on $(dt_nodelabel_exists,i2s20)
 	select NRFX_I2S
 
 config NRFX_IPC
 	bool "IPC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_IPC))
+	depends on $(dt_nodelabel_exists,ipc)
 
 config NRFX_LPCOMP
 	bool "LPCOMP driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_LPCOMP))
+	depends on $(dt_nodelabel_exists,comp) && !SOC_NRF52810 && !SOC_NRF52811 && !SOC_NRF52820
 
 config NRFX_NFCT
 	bool "NFCT driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_NFCT))
+	depends on $(dt_nodelabel_exists,nfct)
 	select NRFX_TIMER4 if SOC_SERIES_NRF52X
 	select NRFX_TIMER2 if SOC_SERIES_NRF53X
 
 config NRFX_NVMC
 	bool "NVMC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF51_FLASH_CONTROLLER)) \
-		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF52_FLASH_CONTROLLER)) \
-		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF53_FLASH_CONTROLLER)) \
-		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF91_FLASH_CONTROLLER))
+	depends on $(dt_nodelabel_exists,flash_controller)
 
 config NRFX_PDM
 	bool
 
 config NRFX_PDM0
 	bool "PDM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
+	depends on $(dt_nodelabel_exists,pdm0)
 	select NRFX_PDM
 
 config NRFX_PDM20
 	bool "PDM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm20,$(DT_COMPAT_NORDIC_NRF_PDM))
+	depends on $(dt_nodelabel_exists,pdm20)
 	select NRFX_PDM
 
 config NRFX_PDM21
 	bool "PDM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,pdm21,$(DT_COMPAT_NORDIC_NRF_PDM))
+	depends on $(dt_nodelabel_exists,pdm21)
 	select NRFX_PDM
 
 config NRFX_POWER
 	bool "POWER driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_POWER))
+	depends on $(dt_nodelabel_exists,power)
 	# On SoCs featuring the USBREG peripheral, the POWER driver uses
 	# internally the USBREG driver.
-	select NRFX_USBREG if $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_USBREG))
+	select NRFX_USBREG if $(dt_nodelabel_exists,usbreg)
 
 config NRFX_PPI
 	bool "PPI allocator"
 	default y if NRFX_GPPI
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PPI))
+	depends on $(dt_nodelabel_exists,ppi)
 
 config NRFX_PPIB
 	bool
@@ -290,49 +287,49 @@ config NRFX_PPIB
 config NRFX_PPIB00
 	bool "PPIB00 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib00,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib00)
 	select NRFX_PPIB
 
 config NRFX_PPIB01
 	bool "PPIB01 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib01,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib01)
 	select NRFX_PPIB
 
 config NRFX_PPIB10
 	bool "PPIB10 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib10,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib10)
 	select NRFX_PPIB
 
 config NRFX_PPIB11
 	bool "PPIB11 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib11,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib11)
 	select NRFX_PPIB
 
 config NRFX_PPIB20
 	bool "PPIB20 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib20,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib20)
 	select NRFX_PPIB
 
 config NRFX_PPIB21
 	bool "PPIB21 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib21,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib21)
 	select NRFX_PPIB
 
 config NRFX_PPIB22
 	bool "PPIB22 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib22,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib22)
 	select NRFX_PPIB
 
 config NRFX_PPIB30
 	bool "PPIB30 driver instance"
 	default y if NRFX_GPPI
-	depends on $(dt_nodelabel_has_compat,ppib30,$(DT_COMPAT_NORDIC_NRF_PPIB))
+	depends on $(dt_nodelabel_exists,ppib30)
 	select NRFX_PPIB
 
 config NRFX_PWM
@@ -340,62 +337,62 @@ config NRFX_PWM
 
 config NRFX_PWM0
 	bool "PWM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm0,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm0)
 	select NRFX_PWM
 
 config NRFX_PWM1
 	bool "PWM1 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm1,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm1)
 	select NRFX_PWM
 
 config NRFX_PWM2
 	bool "PWM2 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm2,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm2)
 	select NRFX_PWM
 
 config NRFX_PWM3
 	bool "PWM3 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm3,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm3)
 	select NRFX_PWM
 
 config NRFX_PWM20
 	bool "PWM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm20,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm20)
 	select NRFX_PWM
 
 config NRFX_PWM21
 	bool "PWM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm21,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm21)
 	select NRFX_PWM
 
 config NRFX_PWM22
 	bool "PWM22 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm22,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm22)
 	select NRFX_PWM
 
 config NRFX_PWM120
 	bool "PWM120 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm120,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm120)
 	select NRFX_PWM
 
 config NRFX_PWM130
 	bool "PWM130 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm130,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm130)
 	select NRFX_PWM
 
 config NRFX_PWM131
 	bool "PWM131 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm131,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm131)
 	select NRFX_PWM
 
 config NRFX_PWM132
 	bool "PWM132 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm132,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm132)
 	select NRFX_PWM
 
 config NRFX_PWM133
 	bool "PWM133 driver instance"
-	depends on $(dt_nodelabel_has_compat,pwm133,$(DT_COMPAT_NORDIC_NRF_PWM))
+	depends on $(dt_nodelabel_exists,pwm133)
 	select NRFX_PWM
 
 config NRFX_QDEC
@@ -403,94 +400,94 @@ config NRFX_QDEC
 
 config NRFX_QDEC0
 	bool "QDEC0 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec0,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec0)
 	select NRFX_QDEC
 
 config NRFX_QDEC1
 	bool "QDEC1 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec1,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec1)
 	select NRFX_QDEC
 
 config NRFX_QDEC20
 	bool "QDEC20 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec20,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec20)
 	select NRFX_QDEC
 
 config NRFX_QDEC21
 	bool "QDEC21 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec21,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec21)
 	select NRFX_QDEC
 
 config NRFX_QDEC130
 	bool "QDEC130 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec130,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec130)
 	select NRFX_QDEC
 
 config NRFX_QDEC131
 	bool "QDEC131 driver instance"
-	depends on $(dt_nodelabel_has_compat,qdec131,$(DT_COMPAT_NORDIC_NRF_QDEC))
+	depends on $(dt_nodelabel_exists,qdec131)
 	select NRFX_QDEC
 
 config NRFX_QSPI
 	bool "QSPI driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_QSPI))
+	depends on $(dt_nodelabel_exists,qspi)
 
 config NRFX_RNG
 	bool "RNG driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_RNG))
+	depends on $(dt_nodelabel_exists,rng)
 
 config NRFX_RRAMC
 	bool "RRAMC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_RRAM_CONTROLLER))
+	depends on $(dt_nodelabel_exists,rram_controller)
 
 config NRFX_RTC
 	bool
 
 config NRFX_RTC0
 	bool "RTC0 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc0,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc0)
 	select NRFX_RTC
 
 config NRFX_RTC1
 	bool "RTC1 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc1,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc1)
 	select NRFX_RTC
 
 config NRFX_RTC2
 	bool "RTC2 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc2,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc2)
 	select NRFX_RTC
 
 config NRFX_RTC130
 	bool "RTC130 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc130,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc130)
 	select NRFX_RTC
 
 config NRFX_RTC131
 	bool "RTC131 driver instance"
-	depends on $(dt_nodelabel_has_compat,rtc131,$(DT_COMPAT_NORDIC_NRF_RTC))
+	depends on $(dt_nodelabel_exists,rtc131)
 	select NRFX_RTC
 
 config NRFX_SAADC
 	bool "SAADC driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_SAADC))
+	depends on $(dt_nodelabel_exists,adc) && !SOC_SERIES_NRF51X
 
 config NRFX_SPI
 	bool
 
 config NRFX_SPI0
 	bool "SPI0 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPI))
+	depends on $(dt_nodelabel_exists,spi0) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_SPI
 
 config NRFX_SPI1
 	bool "SPI1 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPI))
+	depends on $(dt_nodelabel_exists,spi1) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_SPI
 
 config NRFX_SPI2
 	bool "SPI2 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPI))
+	depends on $(dt_nodelabel_exists,spi2) && SOC_SERIES_NRF52X
 	select NRFX_SPI
 
 config NRFX_SPIM
@@ -498,102 +495,102 @@ config NRFX_SPIM
 
 config NRFX_SPIM0
 	bool "SPIM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi0) && !SOC_SERIES_NRF51X
 	select NRFX_SPIM
 
 config NRFX_SPIM1
 	bool "SPIM1 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi1) && !SOC_SERIES_NRF51X
 	select NRFX_SPIM
 
 config NRFX_SPIM2
 	bool "SPIM2 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi2)
 	select NRFX_SPIM
 
 config NRFX_SPIM3
 	bool "SPIM3 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi3)
 	select NRFX_SPIM
 
 config NRFX_SPIM4
 	bool "SPIM4 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi4,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi4)
 	select NRFX_SPIM
 
 config NRFX_SPIM00
 	bool "SPIM00 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi00,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi00)
 	select NRFX_SPIM
 
 config NRFX_SPIM20
 	bool "SPIM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi20,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi20)
 	select NRFX_SPIM
 
 config NRFX_SPIM21
 	bool "SPIM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi21,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi21)
 	select NRFX_SPIM
 
 config NRFX_SPIM22
 	bool "SPIM22 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi22)
 	select NRFX_SPIM
 
 config NRFX_SPIM30
 	bool "SPIM30 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi30)
 	select NRFX_SPIM
 
 config NRFX_SPIM120
 	bool "SPIM120 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi120)
 	select NRFX_SPIM
 
 config NRFX_SPIM121
 	bool "SPIM121 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi121,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi121)
 	select NRFX_SPIM
 
 config NRFX_SPIM130
 	bool "SPIM130 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi130)
 	select NRFX_SPIM
 
 config NRFX_SPIM131
 	bool "SPIM131 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi131,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi131)
 	select NRFX_SPIM
 
 config NRFX_SPIM132
 	bool "SPIM132 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi132,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi132)
 	select NRFX_SPIM
 
 config NRFX_SPIM133
 	bool "SPIM133 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi133,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi133)
 	select NRFX_SPIM
 
 config NRFX_SPIM134
 	bool "SPIM134 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi134,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi134)
 	select NRFX_SPIM
 
 config NRFX_SPIM135
 	bool "SPIM135 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi135,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi135)
 	select NRFX_SPIM
 
 config NRFX_SPIM136
 	bool "SPIM136 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi136,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi136)
 	select NRFX_SPIM
 
 config NRFX_SPIM137
 	bool "SPIM137 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi137,$(DT_COMPAT_NORDIC_NRF_SPIM))
+	depends on $(dt_nodelabel_exists,spi137)
 	select NRFX_SPIM
 
 config NRFX_SPIS
@@ -601,92 +598,92 @@ config NRFX_SPIS
 
 config NRFX_SPIS0
 	bool "SPIS0 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi0) && !SOC_SERIES_NRF51X
 	select NRFX_SPIS
 
 config NRFX_SPIS1
 	bool "SPIS1 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi1)
 	select NRFX_SPIS
 
 config NRFX_SPIS2
 	bool "SPIS2 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi2)
 	select NRFX_SPIS
 
 config NRFX_SPIS3
 	bool "SPIS3 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi3)
 	select NRFX_SPIS
 
 config NRFX_SPIS00
 	bool "SPIS00 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi00,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi00)
 	select NRFX_SPIS
 
 config NRFX_SPIS20
 	bool "SPIS20 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi20,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi20)
 	select NRFX_SPIS
 
 config NRFX_SPIS21
 	bool "SPIS21 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi21,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi21)
 	select NRFX_SPIS
 
 config NRFX_SPIS22
 	bool "SPIS22 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi22)
 	select NRFX_SPIS
 
 config NRFX_SPIS30
 	bool "SPIS30 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi30)
 	select NRFX_SPIS
 
 config NRFX_SPIS120
 	bool "SPIS120 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spis120)
 	select NRFX_SPIS
 
 config NRFX_SPIS130
 	bool "SPIS130 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi130)
 	select NRFX_SPIS
 
 config NRFX_SPIS131
 	bool "SPIS131 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi131,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi131)
 	select NRFX_SPIS
 
 config NRFX_SPIS132
 	bool "SPIS132 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi132,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi132)
 	select NRFX_SPIS
 
 config NRFX_SPIS133
 	bool "SPIS133 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi133,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi133)
 	select NRFX_SPIS
 
 config NRFX_SPIS134
 	bool "SPIS134 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi134,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi134)
 	select NRFX_SPIS
 
 config NRFX_SPIS135
 	bool "SPIS135 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi135,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi135)
 	select NRFX_SPIS
 
 config NRFX_SPIS136
 	bool "SPIS136 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi136,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi136)
 	select NRFX_SPIS
 
 config NRFX_SPIS137
 	bool "SPIS137 driver instance"
-	depends on $(dt_nodelabel_has_compat,spi137,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	depends on $(dt_nodelabel_exists,spi137)
 	select NRFX_SPIS
 
 config NRFX_SYSTICK
@@ -695,138 +692,138 @@ config NRFX_SYSTICK
 
 config NRFX_TBM
 	bool "TBM driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_TBM))
+	depends on $(dt_nodelabel_exists,tbm)
 
 config NRFX_TEMP
 	bool "TEMP driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_TEMP))
+	depends on $(dt_nodelabel_exists,temp)
 
 config NRFX_TIMER
 	bool
 
 config NRFX_TIMER0
 	bool "TIMER0 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer0,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer0)
 	select NRFX_TIMER
 
 config NRFX_TIMER1
 	bool "TIMER1 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer1,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer1)
 	select NRFX_TIMER
 
 config NRFX_TIMER2
 	bool "TIMER2 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer2,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer2)
 	select NRFX_TIMER
 
 config NRFX_TIMER3
 	bool "TIMER3 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer3,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer3)
 	select NRFX_TIMER
 
 config NRFX_TIMER4
 	bool "TIMER4 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer4,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer4)
 	select NRFX_TIMER
 
 config NRFX_TIMER00
 	bool "TIMER00 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer00,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer00)
 	select NRFX_TIMER
 
 config NRFX_TIMER10
 	bool "TIMER10 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer10,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer10)
 	select NRFX_TIMER
 
 config NRFX_TIMER20
 	bool "TIMER20 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer20,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer20)
 	select NRFX_TIMER
 
 config NRFX_TIMER21
 	bool "TIMER21 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer21,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer21)
 	select NRFX_TIMER
 
 config NRFX_TIMER22
 	bool "TIMER22 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer22,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer22)
 	select NRFX_TIMER
 
 config NRFX_TIMER23
 	bool "TIMER23 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer23,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer23)
 	select NRFX_TIMER
 
 config NRFX_TIMER24
 	bool "TIMER24 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer24,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer24)
 	select NRFX_TIMER
 
 config NRFX_TIMER020
 	bool "TIMER020 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer020,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer020)
 	select NRFX_TIMER
 
 config NRFX_TIMER021
 	bool "TIMER021 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer021,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer021)
 	select NRFX_TIMER
 
 config NRFX_TIMER022
 	bool "TIMER022 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer022,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer022)
 	select NRFX_TIMER
 
 config NRFX_TIMER120
 	bool "TIMER120 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer120,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer120)
 	select NRFX_TIMER
 
 config NRFX_TIMER121
 	bool "TIMER121 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer121,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer121)
 	select NRFX_TIMER
 
 config NRFX_TIMER130
 	bool "TIMER130 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer130,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer130)
 	select NRFX_TIMER
 
 config NRFX_TIMER131
 	bool "TIMER131 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer131,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer131)
 	select NRFX_TIMER
 
 config NRFX_TIMER132
 	bool "TIMER132 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer132,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer132)
 	select NRFX_TIMER
 
 config NRFX_TIMER133
 	bool "TIMER133 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer133,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer133)
 	select NRFX_TIMER
 
 config NRFX_TIMER134
 	bool "TIMER134 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer134,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer134)
 	select NRFX_TIMER
 
 config NRFX_TIMER135
 	bool "TIMER135 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer135,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer135)
 	select NRFX_TIMER
 
 config NRFX_TIMER136
 	bool "TIMER136 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer136,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer136)
 	select NRFX_TIMER
 
 config NRFX_TIMER137
 	bool "TIMER137 driver instance"
-	depends on $(dt_nodelabel_has_compat,timer137,$(DT_COMPAT_NORDIC_NRF_TIMER))
+	depends on $(dt_nodelabel_exists,timer137)
 	select NRFX_TIMER
 
 config NRFX_TWI
@@ -834,12 +831,12 @@ config NRFX_TWI
 
 config NRFX_TWI0
 	bool "TWI0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWI))
+	depends on $(dt_nodelabel_exists,i2c0) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_TWI
 
 config NRFX_TWI1
 	bool "TWI1 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWI))
+	depends on $(dt_nodelabel_exists,i2c1) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_TWI
 
 config NRFX_TWIM
@@ -847,87 +844,87 @@ config NRFX_TWIM
 
 config NRFX_TWIM0
 	bool "TWIM0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
 	select NRFX_TWIM
 
 config NRFX_TWIM1
 	bool "TWIM1 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
 	select NRFX_TWIM
 
 config NRFX_TWIM2
 	bool "TWIM2 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c2)
 	select NRFX_TWIM
 
 config NRFX_TWIM3
 	bool "TWIM3 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c3)
 	select NRFX_TWIM
 
 config NRFX_TWIM20
 	bool "TWIM20 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c20)
 	select NRFX_TWIM
 
 config NRFX_TWIM21
 	bool "TWIM21 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c21)
 	select NRFX_TWIM
 
 config NRFX_TWIM22
 	bool "TWIM22 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c22)
 	select NRFX_TWIM
 
 config NRFX_TWIM30
 	bool "TWIM30 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c30)
 	select NRFX_TWIM
 
 config NRFX_TWIM120
 	bool "TWIM120 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c120,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c120)
 	select NRFX_TWIM
 
 config NRFX_TWIM130
 	bool "TWIM130 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c130)
 	select NRFX_TWIM
 
 config NRFX_TWIM131
 	bool "TWIM131 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c131)
 	select NRFX_TWIM
 
 config NRFX_TWIM132
 	bool "TWIM132 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c132)
 	select NRFX_TWIM
 
 config NRFX_TWIM133
 	bool "TWIM133 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c133)
 	select NRFX_TWIM
 
 config NRFX_TWIM134
 	bool "TWIM134 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c134)
 	select NRFX_TWIM
 
 config NRFX_TWIM135
 	bool "TWIM135 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c135)
 	select NRFX_TWIM
 
 config NRFX_TWIM136
 	bool "TWIM136 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c136)
 	select NRFX_TWIM
 
 config NRFX_TWIM137
 	bool "TWIM137 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIM))
+	depends on $(dt_nodelabel_exists,i2c137)
 	select NRFX_TWIM
 
 config NRFX_TWIS
@@ -935,82 +932,82 @@ config NRFX_TWIS
 
 config NRFX_TWIS0
 	bool "TWIS0 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
 	select NRFX_TWIS
 
 config NRFX_TWIS1
 	bool "TWIS1 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
 	select NRFX_TWIS
 
 config NRFX_TWIS2
 	bool "TWIS2 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c2)
 	select NRFX_TWIS
 
 config NRFX_TWIS3
 	bool "TWIS3 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c3)
 	select NRFX_TWIS
 
 config NRFX_TWIS20
 	bool "TWIS20 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c20)
 	select NRFX_TWIS
 
 config NRFX_TWIS21
 	bool "TWIS21 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c21)
 	select NRFX_TWIS
 
 config NRFX_TWIS22
 	bool "TWIS22 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c22)
 	select NRFX_TWIS
 
 config NRFX_TWIS30
 	bool "TWIS30 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c30)
 	select NRFX_TWIS
 
 config NRFX_TWIS130
 	bool "TWIS130 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c130)
 	select NRFX_TWIS
 
 config NRFX_TWIS131
 	bool "TWIS131 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c131)
 	select NRFX_TWIS
 
 config NRFX_TWIS132
 	bool "TWIS132 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c132)
 	select NRFX_TWIS
 
 config NRFX_TWIS133
 	bool "TWIS133 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c133)
 	select NRFX_TWIS
 
 config NRFX_TWIS134
 	bool "TWIS134 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c134)
 	select NRFX_TWIS
 
 config NRFX_TWIS135
 	bool "TWIS135 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c135)
 	select NRFX_TWIS
 
 config NRFX_TWIS136
 	bool "TWIS136 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c136)
 	select NRFX_TWIS
 
 config NRFX_TWIS137
 	bool "TWIS137 driver instance"
-	depends on $(dt_nodelabel_has_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIS))
+	depends on $(dt_nodelabel_exists,i2c137)
 	select NRFX_TWIS
 
 config NRFX_UART
@@ -1018,7 +1015,7 @@ config NRFX_UART
 
 config NRFX_UART0
 	bool "UART0 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UART))
+	depends on $(dt_nodelabel_exists,uart0) && (SOC_SERIES_NRF51X || SOC_SERIES_NRF52X)
 	select NRFX_UART
 
 config NRFX_UARTE
@@ -1026,92 +1023,92 @@ config NRFX_UARTE
 
 config NRFX_UARTE0
 	bool "UARTE0 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart0)
 	select NRFX_UARTE
 
 config NRFX_UARTE1
 	bool "UARTE1 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart1,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart1)
 	select NRFX_UARTE
 
 config NRFX_UARTE2
 	bool "UARTE2 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart2,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart2)
 	select NRFX_UARTE
 
 config NRFX_UARTE3
 	bool "UARTE3 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart3,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart3)
 	select NRFX_UARTE
 
 config NRFX_UARTE00
 	bool "UARTE00 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart00,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart00)
 	select NRFX_UARTE
 
 config NRFX_UARTE20
 	bool "UARTE20 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart20,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart20)
 	select NRFX_UARTE
 
 config NRFX_UARTE21
 	bool "UARTE21 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart21,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart21)
 	select NRFX_UARTE
 
 config NRFX_UARTE22
 	bool "UARTE22 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart22,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart22)
 	select NRFX_UARTE
 
 config NRFX_UARTE30
 	bool "UARTE30 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart30,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart30)
 	select NRFX_UARTE
 
 config NRFX_UARTE120
 	bool "UARTE120 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart120,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart120)
 	select NRFX_UARTE
 
 config NRFX_UARTE130
 	bool "UARTE130 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart130,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart130)
 	select NRFX_UARTE
 
 config NRFX_UARTE131
 	bool "UARTE131 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart131,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart131)
 	select NRFX_UARTE
 
 config NRFX_UARTE132
 	bool "UARTE132 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart132,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart132)
 	select NRFX_UARTE
 
 config NRFX_UARTE133
 	bool "UARTE133 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart133,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart133)
 	select NRFX_UARTE
 
 config NRFX_UARTE134
 	bool "UARTE134 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart134,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart134)
 	select NRFX_UARTE
 
 config NRFX_UARTE135
 	bool "UARTE135 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart135,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart135)
 	select NRFX_UARTE
 
 config NRFX_UARTE136
 	bool "UARTE136 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart136,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart136)
 	select NRFX_UARTE
 
 config NRFX_UARTE137
 	bool "UARTE137 driver instance"
-	depends on $(dt_nodelabel_has_compat,uart137,$(DT_COMPAT_NORDIC_NRF_UARTE))
+	depends on $(dt_nodelabel_exists,uart137)
 	select NRFX_UARTE
 
 config NRFX_UARTE_CONFIG_SKIP_GPIO_CONFIG
@@ -1136,54 +1133,54 @@ config NRFX_UARTE_CONFIG_RX_CACHE_ENABLED
 
 config NRFX_USBREG
 	bool "USBREG driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_USBREG))
+	depends on $(dt_nodelabel_exists,usbreg)
 
 config NRFX_WDT
 	bool
 
 config NRFX_WDT0
 	bool "WDT0 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt0,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt0)
 	select NRFX_WDT
 
 config NRFX_WDT1
 	bool "WDT1 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt1,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt1)
 	select NRFX_WDT
 
 config NRFX_WDT30
 	bool "WDT30 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt30,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt30)
 	select NRFX_WDT
 
 config NRFX_WDT31
 	bool "WDT31 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt31,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt31)
 	select NRFX_WDT
 
 config NRFX_WDT010
 	bool "WDT010 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt010,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt010)
 	select NRFX_WDT
 
 config NRFX_WDT011
 	bool "WDT011 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt011,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt011)
 	select NRFX_WDT
 
 config NRFX_WDT130
 	bool "WDT130 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt130,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt130)
 	select NRFX_WDT
 
 config NRFX_WDT131
 	bool "WDT131 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt131,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt131)
 	select NRFX_WDT
 
 config NRFX_WDT132
 	bool "WDT132 driver instance"
-	depends on $(dt_nodelabel_has_compat,wdt132,$(DT_COMPAT_NORDIC_NRF_WDT))
+	depends on $(dt_nodelabel_exists,wdt132)
 	select NRFX_WDT
 
 menu "Peripheral Resource Sharing module"
diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
index 6a337cd2588e0..4a2d5af18b648 100644
--- a/modules/hal_nordic/nrfx/nrfx_config.h
+++ b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -78,10 +78,6 @@
     #include <templates/nrfx_config_nrf54l05_application.h>
 #elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
     #include <templates/nrfx_config_nrf54l05_flpr.h>
-#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l09_enga_application.h>
-#elif defined(NRF54L09_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l09_enga_flpr.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
     #include <templates/nrfx_config_nrf54l10_application.h>
 #elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
@@ -90,14 +86,14 @@
     #include <templates/nrfx_config_nrf54l15_application.h>
 #elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
     #include <templates/nrfx_config_nrf54l15_flpr.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l15_enga_application.h>
-#elif defined(NRF54L15_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l15_enga_flpr.h>
-#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_APPLICATION)
-    #include <templates/nrfx_config_nrf54l20_enga_application.h>
-#elif defined(NRF54L20_ENGA_XXAA) && defined(NRF_FLPR)
-    #include <templates/nrfx_config_nrf54l20_enga_flpr.h>
+#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54lm20a_enga_application.h>
+#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54lm20a_enga_flpr.h>
+#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_APPLICATION)
+    #include <templates/nrfx_config_nrf54lv10a_enga_application.h>
+#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_FLPR)
+    #include <templates/nrfx_config_nrf54lv10a_enga_flpr.h>
 #elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
     #include <templates/nrfx_config_nrf91.h>
 #elif defined(NRF9230_ENGB_XXAA) && defined(NRF_APPLICATION)
diff --git a/modules/hal_nordic/nrfx/nrfx_kconfig.h b/modules/hal_nordic/nrfx/nrfx_kconfig.h
index d36b3617b077e..ef870a568b2b3 100644
--- a/modules/hal_nordic/nrfx/nrfx_kconfig.h
+++ b/modules/hal_nordic/nrfx/nrfx_kconfig.h
@@ -174,6 +174,7 @@
 
 #ifdef CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 #define NRF_GRTC_HAS_EXTENDED 1
+#define NRFX_GRTC_CONFIG_LFCLK_SELECT_AT_INIT 0
 #endif
 #ifdef CONFIG_NRF_GRTC_TIMER_AUTO_KEEP_ALIVE
 #define NRFX_GRTC_CONFIG_AUTOEN 1
@@ -776,6 +777,12 @@
 #ifdef CONFIG_NRFX_TWIM137
 #define NRFX_TWIM137_ENABLED 1
 #endif
+#ifdef CONFIG_NRF52_ANOMALY_219_WORKAROUND
+#define NRFX_TWIM_NRF52_ANOMALY_219_WORKAROUND_ENABLED 1
+#endif
+#ifdef CONFIG_SOC_NRF53_ANOMALY_47_WORKAROUND
+#define NRFX_TWIM_NRF53_ANOMALY_47_WORKAROUND_ENABLED 1
+#endif
 
 #ifdef CONFIG_NRFX_TWIS
 #define NRFX_TWIS_ENABLED 1
diff --git a/modules/hal_nxp/CMakeLists.txt b/modules/hal_nxp/CMakeLists.txt
index c338728c19a89..81ea3f1a9d249 100644
--- a/modules/hal_nxp/CMakeLists.txt
+++ b/modules/hal_nxp/CMakeLists.txt
@@ -1,20 +1,12 @@
 #
 # Copyright (c) 2021 Linaro, Limited
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
 if(CONFIG_HAS_MCUX OR CONFIG_HAS_IMX_HAL OR CONFIG_HAS_NXP_S32_HAL)
-  add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} hal_nxp)
-  add_subdirectory_ifdef(CONFIG_USB_DEVICE_DRIVER usb)
-  add_subdirectory_ifdef(CONFIG_UDC_DRIVER usb)
-
-  zephyr_sources_ifdef(CONFIG_PWM_MCUX_CTIMER ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/ctimer/fsl_ctimer.c)
-  zephyr_include_directories_ifdef(CONFIG_PWM_MCUX_CTIMER
-    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/ctimer/)
-  zephyr_include_directories(.)
-
+  zephyr_library()
   zephyr_compile_definitions_ifdef(CONFIG_CAN_MCUX_FLEXCAN
     FLEXCAN_WAIT_TIMEOUT=${CONFIG_CAN_MCUX_FLEXCAN_WAIT_TIMEOUT})
 
@@ -29,9 +21,16 @@ if(CONFIG_HAS_MCUX OR CONFIG_HAS_IMX_HAL OR CONFIG_HAS_NXP_S32_HAL)
 
   zephyr_compile_definitions_ifdef(CONFIG_ETH_NXP_IMX_NETC FSL_ETH_ENABLE_CACHE_CONTROL=1)
 
-  add_subdirectory_ifdef(CONFIG_BT_H4_NXP_CTLR bt_controller)
-
   if(CONFIG_I2S_MCUX_SAI)
     zephyr_compile_definitions(MCUX_SDK_SAI_ALLOW_NULL_FIFO_WATERMARK=1)
   endif()
 endif()
+
+if(CONFIG_HAS_NXP_S32_HAL)
+  add_subdirectory(s32)
+else()
+  add_subdirectory_ifdef(CONFIG_HAS_IMX_HAL imx)
+  add_subdirectory_ifdef(CONFIG_HAS_MCUX mcux)
+endif()
+
+add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/zephyr/src hal_nxp)
diff --git a/modules/hal_nxp/Kconfig b/modules/hal_nxp/Kconfig
index 4f055faa07d6e..2aa8aa38aa6b6 100644
--- a/modules/hal_nxp/Kconfig
+++ b/modules/hal_nxp/Kconfig
@@ -1,8 +1,13 @@
 #
 # Copyright (c) 2021 Linaro, Limited
+# Copyright 2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
-#
 
-config MCUX_ACMP
-	bool "Include ACMP driver from MCUX SDK"
+
+config ZEPHYR_HAL_NXP_MODULE
+	bool
+
+rsource "imx/Kconfig.imx"
+rsource "s32/Kconfig.nxp_s32"
+rsource "mcux/Kconfig.mcux"
diff --git a/modules/hal_nxp/bt_controller/CMakeLists.txt b/modules/hal_nxp/bt_controller/CMakeLists.txt
deleted file mode 100644
index af3678364d30a..0000000000000
--- a/modules/hal_nxp/bt_controller/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set(hal_nxp_dir           ${ZEPHYR_HAL_NXP_MODULE_DIR})
-set(hal_nxp_blobs_dir     ${hal_nxp_dir}/zephyr/blobs)
-set(blob_gen_file         ${ZEPHYR_BINARY_DIR}/include/generated/bt_nxp_ctlr_fw.h)
-
-if(CONFIG_BT_NXP_NW612)
-    set(blob_file ${hal_nxp_blobs_dir}/iw612/uart_nw61x_se.h)
-endif()
-
-if (NOT DEFINED blob_file)
-    message(FATAL_ERROR "Unsupported controller. Please select a BT conntroller, refer to ./driver/bluetooth/hci/Kconfig.nxp")
-endif()
-
-zephyr_blobs_verify(FILES ${blob_file} REQUIRED)
-
-configure_file(${blob_file} ${blob_gen_file} COPYONLY)
diff --git a/modules/hal_nxp/imx/CMakeLists.txt b/modules/hal_nxp/imx/CMakeLists.txt
new file mode 100644
index 0000000000000..e41777c906b69
--- /dev/null
+++ b/modules/hal_nxp/imx/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Translate the SoC name and part number into the imx device and cpu
+# name respectively.
+string(TOUPPER ${CONFIG_SOC} IMX_DEVICE)
+
+# Build imx drivers and utilities that can be used for multiple SoC's.
+add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/imx/drivers hal_nxp/imx/drivers)
+add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/imx/devices hal_nxp/imx/devices)
+add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/imx/devices/${IMX_DEVICE} hal_nxp/imx/devices/soc)
diff --git a/modules/Kconfig.imx b/modules/hal_nxp/imx/Kconfig.imx
similarity index 100%
rename from modules/Kconfig.imx
rename to modules/hal_nxp/imx/Kconfig.imx
diff --git a/modules/hal_nxp/mcux/CMakeLists.txt b/modules/hal_nxp/mcux/CMakeLists.txt
new file mode 100644
index 0000000000000..07ba1fccd112c
--- /dev/null
+++ b/modules/hal_nxp/mcux/CMakeLists.txt
@@ -0,0 +1,187 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set(MCUX_SDK_PROJECT_NAME ${ZEPHYR_CURRENT_LIBRARY})
+
+if(CONFIG_SOC_LPC11U66
+    OR CONFIG_SOC_LPC11U68
+    OR CONFIG_SOC_LPC54114
+    OR CONFIG_SOC_MIMX8ML8_A53
+    OR CONFIG_SOC_MIMX8ML8_ADSP
+    OR CONFIG_SOC_MIMX8MM6_A53
+    OR CONFIG_SOC_MIMX8MN6_A53
+    OR CONFIG_SOC_MIMX8QM6
+    OR CONFIG_SOC_MIMX8QX6
+    OR CONFIG_SOC_MIMX8UD7_ADSP
+    OR CONFIG_SOC_MIMX9352_A55
+    OR CONFIG_SOC_MIMX9596_A55
+    OR CONFIG_SOC_MIMX9596_M7
+    OR CONFIG_SOC_MK22F12
+    OR CONFIG_SOC_MK64F12
+    OR CONFIG_SOC_MK66F18
+    OR CONFIG_SOC_MK80F25615
+    OR CONFIG_SOC_MK82F25615
+    OR CONFIG_SOC_MKE14F16
+    OR CONFIG_SOC_MKE16F16
+    OR CONFIG_SOC_MKE18F16
+    OR CONFIG_SOC_MKL25Z4
+    OR CONFIG_SOC_MKV56F24
+    OR CONFIG_SOC_MKV58F24
+    OR CONFIG_SOC_MKW22D5
+    OR CONFIG_SOC_MKW24D5
+    OR CONFIG_SOC_MKW40Z4
+    OR CONFIG_SOC_MKW41Z4
+    OR CONFIG_SOC_MIMX9131
+    )
+
+    set (CONFIG_SOC_SDKNG_UNSUPPORTED ON)
+
+endif()
+
+# Translate the SoC name and part number into the mcux device and cpu
+# name respectively.
+# When this code completes, the following variables will be defined:
+# MCUX_DEVICE: SOC name, suffixed by core name when using a dual core part.
+#              Example: MIMXRT595S_cm33, or LPC55S36
+# MCUX_CPU: "CPU"+ SOC part number, followed by core name when using a dual core part.
+#              Example: CPU_MIMXRT595SFAWC_cm33, or  CPU_LPC55S36JBD100
+# MCU_DEVICE_PATH: SOC name without core suffix. Must match the name of the
+#              folder in MCUX HAL. IE MIMXRT595S, or LPC55S36
+
+if(NOT HWMv2)
+  # Include HWMv1 logic for MCUX variables
+  include(${CMAKE_CURRENT_LIST_DIR}/hwmv1.cmake)
+else()
+  string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE_PATH)
+  string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE)
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER})
+
+  if(DEFINED CONFIG_MCUX_CORE_SUFFIX)
+    string(APPEND MCUX_DEVICE ${CONFIG_MCUX_CORE_SUFFIX})
+    string(APPEND MCUX_CPU ${CONFIG_MCUX_CORE_SUFFIX})
+  endif()
+endif()
+
+if(DEFINED CONFIG_SOC_SDKNG_UNSUPPORTED)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH})
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers)
+
+  # include CMSIS of mcux-sdk for Cortex-A
+  if(CONFIG_CPU_CORTEX_A)
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/CMSIS/Core_AArch64/Include)
+  endif()
+
+  # The mcux uses the cpu name to expose SoC-specific features
+  # of a given peripheral. For example, the UART peripheral may be
+  # instantiated with/without a hardware FIFO, and the size of that
+  # FIFO may be different for each instance in a given SoC. See
+  # fsl_device_registers.h and ${MCUX_DEVICE}_features.h
+  zephyr_compile_definitions(${MCUX_CPU})
+
+  # Build mcux device-specific objects. Although it is not normal
+  # practice, drilling down like this avoids the need for repetitive
+  # build scripts for every mcux device.
+  zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_clock.c)
+
+  if(${MCUX_DEVICE} MATCHES "LPC")
+    zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_power.c)
+    zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_reset.c)
+  endif()
+
+  zephyr_library_sources_ifdef(CONFIG_SOC_LPC54114_M4
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/gcc/startup_LPC54114_cm4.S
+    )
+
+  # Include middleware/usb
+  if(CONFIG_UDC_DRIVER OR CONFIG_USB_DEVICE_DRIVER)
+    if(CONFIG_DT_HAS_NXP_USBPHY_ENABLED)
+      zephyr_include_directories(${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/phy)
+    endif()
+    # Include usb required header file.
+    zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/mcux_sdk_ng/middleware)
+  endif()
+
+  # Include middleware/bt_controller.cmake
+  if(CONFIG_BT_H4_NXP_CTLR)
+    include(${CMAKE_CURRENT_LIST_DIR}/mcux_sdk_ng/middleware/bt_controller.cmake)
+  endif()
+
+  add_subdirectory(${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/components ${CMAKE_CURRENT_BINARY_DIR}/components)
+
+  # Include Entry cmake component
+  add_subdirectory(mcux-sdk)
+
+else() # CONFIG_SOC_SDKNG_UNSUPPORTED
+
+ add_subdirectory(mcux-sdk-ng)
+
+endif() # CONFIG_SOC_SDKNG_UNSUPPORTED
+
+enable_language(C ASM)
+
+zephyr_linker_sources(RWDATA
+  ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/quick_access_data.ld
+  )
+
+zephyr_linker_sources_ifdef(CONFIG_ARCH_HAS_RAMFUNC_SUPPORT
+  RAMFUNC_SECTION
+  ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/quick_access_code.ld
+  )
+
+zephyr_linker_sources_ifdef(CONFIG_NOCACHE_MEMORY
+  NOCACHE_SECTION
+  ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/nocache.ld
+  )
+
+if(NOT CONFIG_ASSERT OR CONFIG_FORCE_NO_ASSERT)
+  zephyr_compile_definitions(NDEBUG) # squelch fsl_flexcan.c warning
+endif()
+
+zephyr_compile_definitions_ifdef(
+  CONFIG_PTP_CLOCK_NXP_ENET
+  ENET_ENHANCEDBUFFERDESCRIPTOR_MODE
+  )
+
+zephyr_compile_definitions_ifdef(
+  CONFIG_SOC_MIMX9596
+  FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL=1
+  )
+
+# note: if FSL_IRQSTEER_ENABLE_MASTER_INT is not
+# defined then it will automatically be defined
+# and set to 1 via fsl_irqsteer.h
+zephyr_library_compile_definitions_ifdef(CONFIG_NXP_IRQSTEER
+  FSL_IRQSTEER_ENABLE_MASTER_INT=0
+  )
+
+zephyr_library_compile_definitions_ifdef(CONFIG_DAI_NXP_SAI
+  MCUX_SDK_SAI_ALLOW_NULL_FIFO_WATERMARK=1
+  )
+
+zephyr_library_compile_definitions_ifdef(CONFIG_DAI_NXP_SAI
+  MCUX_SDK_SAI_DISABLE_IMPLICIT_CHAN_CONFIG=1
+  )
+
+zephyr_library_compile_definitions_ifdef(CONFIG_NOCACHE_MEMORY
+  __STARTUP_INITIALIZE_NONCACHEDATA
+  )
+
+zephyr_library_compile_definitions_ifdef(CONFIG_HAS_MCUX_CACHE
+  FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL
+  )
+
+# MCUX_SDK and MCUX_SDK_NG share wireless/framework_5.3.3, wifi_nxp
+add_subdirectory_ifdef(CONFIG_IEEE802154_KW41Z
+  ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/wireless/framework_5.3.3
+  ${CMAKE_CURRENT_BINARY_DIR}/middleware/wireless/framework
+  )
+
+add_subdirectory_ifdef(CONFIG_WIFI_NXP
+  ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/wifi_nxp
+  ${CMAKE_CURRENT_BINARY_DIR}/middleware/wifi_nxp
+  )
+
+add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware
+  ${CMAKE_CURRENT_BINARY_DIR}/middleware
+  )
diff --git a/modules/Kconfig.mcux b/modules/hal_nxp/mcux/Kconfig.mcux
similarity index 97%
rename from modules/Kconfig.mcux
rename to modules/hal_nxp/mcux/Kconfig.mcux
index f6d7df3ab4f49..885a50d6d6462 100644
--- a/modules/Kconfig.mcux
+++ b/modules/hal_nxp/mcux/Kconfig.mcux
@@ -4,13 +4,23 @@
 # Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
+config SOC_SDKNG_UNSUPPORTED
+	bool
+	help
+	  Indicates whether the SDKNG supports the current SoC
+
+config MCUX_HW_DEVICE_CORE
+	string
+	help
+	  Indicates the current device core id
+
 config HAS_MCUX
 	bool
 	depends on SOC_FAMILY_KINETIS || SOC_FAMILY_NXP_IMX || SOC_FAMILY_LPC || \
 		SOC_FAMILY_NXP_S32 || SOC_FAMILY_NXP_IMXRT || SOC_FAMILY_NXP_RW || \
 		SOC_FAMILY_NXP_MCX
 
-if HAS_MCUX
+if	HAS_MCUX
 
 config MCUX_CORE_SUFFIX
 	string
@@ -18,11 +28,6 @@ config MCUX_CORE_SUFFIX
 	  String describing the core identifer used by MCUX SDK when using
 	  dual core parts
 
-config HAS_MCUX_12B1MSPS_SAR
-	bool
-	help
-	  Set if the 12B1MSPS SAR ADC module is present in the SoC.
-
 config HAS_MCUX_ADC12
 	bool
 	help
diff --git a/modules/hal_nxp/mcux/hwmv1.cmake b/modules/hal_nxp/mcux/hwmv1.cmake
new file mode 100644
index 0000000000000..d95a18ed9ddd4
--- /dev/null
+++ b/modules/hal_nxp/mcux/hwmv1.cmake
@@ -0,0 +1,50 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Get MCUX_DEVICE and MCUX_DEVICE_PATH from CONFIG_SOC
+# For example, if CONFIG_SOC=mimx8ml8_ca53, then MCUX_DEVICE=MIMX8ML8_ca53
+# and MCUX_DEVICE_PATH=MIMX8ML8
+string(FIND ${CONFIG_SOC} "_" pos)
+if(pos GREATER -1)
+  string(REPLACE "_" ";" MCUX_DEVICE_TMP ${CONFIG_SOC})
+  list(GET MCUX_DEVICE_TMP 0 MCUX_DEVICE_SOC)
+  list(GET MCUX_DEVICE_TMP 1 MCUX_DEVICE_CORE)
+  string(TOUPPER ${MCUX_DEVICE_SOC} MCUX_DEVICE_PATH)
+  set(MCUX_DEVICE ${MCUX_DEVICE_PATH}_${MCUX_DEVICE_CORE})
+else()
+  string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE)
+  string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE_PATH)
+endif()
+
+if("${MCUX_DEVICE}" STREQUAL "LPC51U68")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER})
+elseif("${MCUX_DEVICE}" STREQUAL "LPC54114")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm4)
+elseif("${MCUX_DEVICE}" STREQUAL "LPC54114_m0")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm0plus)
+elseif("${MCUX_DEVICE}" STREQUAL "LPC55S16")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER})
+elseif("${MCUX_DEVICE}" STREQUAL "LPC55S28")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER})
+elseif("${MCUX_DEVICE}" STREQUAL "LPC55S69_cpu0")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm33_core0)
+elseif("${MCUX_DEVICE}" STREQUAL "LPC55S69_cpu1")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm33_core1)
+elseif("${MCUX_DEVICE}" STREQUAL "MIMXRT1052")
+  string(REGEX REPLACE "(.*)[AB]$" "CPU_\\1B" MCUX_CPU ${CONFIG_SOC_PART_NUMBER})
+elseif("${MCUX_DEVICE}" STREQUAL "MIMXRT595S_cm33")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm33)
+elseif("${MCUX_DEVICE}" STREQUAL "MIMXRT685S_cm33")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm33)
+elseif("${MCUX_DEVICE}" STREQUAL "MIMXRT1176_cm4")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm4)
+elseif("${MCUX_DEVICE}" STREQUAL "MIMXRT1176_cm7")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm7)
+elseif("${MCUX_DEVICE}" STREQUAL "MIMXRT1166_cm4")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm4)
+elseif("${MCUX_DEVICE}" STREQUAL "MIMXRT1166_cm7")
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER}_cm7)
+else()
+  set(MCUX_CPU CPU_${CONFIG_SOC_PART_NUMBER})
+endif()
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/CMakeLists.txt b/modules/hal_nxp/mcux/mcux-sdk-ng/CMakeLists.txt
new file mode 100644
index 0000000000000..56493f4b52bfd
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set(MCUX_SDK_NG_DIR ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk-ng)
+# SdkRootDirPath is used by MCUX SDK NG CMake files.
+set(SdkRootDirPath ${MCUX_SDK_NG_DIR})
+
+# Functions for MCUX SDK cmake files
+include(${MCUX_SDK_NG_DIR}/cmake/extension/logging.cmake)
+include(${MCUX_SDK_NG_DIR}/cmake/extension/function.cmake)
+include(${MCUX_SDK_NG_DIR}/cmake/extension/basic_settings_lite.cmake)
+
+function(set_variable_ifdef feature_toggle variable)
+  if(${${feature_toggle}})
+    set(${variable} ON PARENT_SCOPE)
+  endif()
+endfunction()
+
+#specific operation to shared drivers
+if((DEFINED CONFIG_FLASH_MCUX_FLEXSPI_XIP) AND (DEFINED CONFIG_FLASH))
+  zephyr_code_relocate(FILES ${MCUX_SDK_NG_DIR}/drivers/flexspi/fsl_flexspi.c
+    LOCATION ${CONFIG_FLASH_MCUX_FLEXSPI_XIP_MEM}_TEXT)
+endif()
+
+if(CONFIG_NXP_RF_IMU AND CONFIG_SOC_SERIES_MCXW)
+  zephyr_compile_definitions(HAL_RPMSG_SELECT_ROLE=0U)
+endif()
+
+if((${MCUX_DEVICE} MATCHES "RW61") AND (NOT DEFINED CONFIG_MINIMAL_LIBC))
+  # Whenever building for RW61x without minimal LIBC, use optimized memcpy.
+  # This will avoid issues with unaligned access to peripheral RAM regions
+  # caused by the memcpy implementation in newlib
+  zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk-ng/components/misc_utilities/fsl_memcpy.S)
+endif()
+
+include(middleware/middleware.cmake)
+include(components/components.cmake)
+include(drivers/drivers.cmake)
+include(device/device.cmake)
+
+# Expose the driver header include path, so that the shim driver can use them.
+get_target_property(MCUXSDK_INCLUDE_DIRS ${MCUX_SDK_PROJECT_NAME} INTERFACE_INCLUDE_DIRECTORIES)
+if(NOT MCUXSDK_INCLUDE_DIRS STREQUAL MCUXSDK_INCLUDE_DIRS-NOTFOUND)
+  zephyr_include_directories(${MCUXSDK_INCLUDE_DIRS})
+endif()
+
+get_target_property(MCUXSDK_COMPILE_DEFS ${MCUX_SDK_PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
+if(NOT MCUXSDK_COMPILE_DEFS STREQUAL MCUXSDK_COMPILE_DEFS-NOTFOUND)
+  zephyr_compile_definitions(${MCUXSDK_COMPILE_DEFS})
+endif()
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake b/modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake
new file mode 100644
index 0000000000000..8e2b4c105ec54
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake
@@ -0,0 +1,82 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_WIFI_NXP)
+  set(CONFIG_MCUX_COMPONENT_component.wifi_bt_module.tx_pwr_limits ON)
+endif()
+
+if(CONFIG_NXP_FW_LOADER)
+  set(CONFIG_MCUX_COMPONENT_driver.conn_fwloader ON)
+  set(CONFIG_USE_component_osa_zephyr ON)
+endif()
+
+if(${MCUX_DEVICE} MATCHES "RW61")
+  set(CONFIG_USE_component_osa_zephyr ON)
+  if(CONFIG_NXP_FW_LOADER)
+    set(CONFIG_MCUX_COMPONENT_component.mflash_offchip ON)
+    set(CONFIG_MCUX_COMPONENT_driver.cache_cache64 ON)
+    set(CONFIG_MCUX_COMPONENT_driver.flexspi ON)
+  endif()
+endif()
+
+if(CONFIG_USB_DEVICE_DRIVER OR CONFIG_UDC_DRIVER OR CONFIG_BT)
+  set(CONFIG_USE_component_osa_zephyr ON)
+endif()
+
+if(CONFIG_NXP_RF_IMU)
+  if(CONFIG_SOC_SERIES_RW6XX)
+    set(CONFIG_MCUX_COMPONENT_driver.imu ON)
+    set(CONFIG_MCUX_COMPONENT_driver.gdma ON)
+    set(CONFIG_MCUX_COMPONENT_component.wireless_imu_adapter ON)
+    set(CONFIG_MCUX_PRJSEG_component.osa_interface.osa_macro_used ON)
+  elseif(CONFIG_SOC_SERIES_MCXW)
+    set(CONFIG_MCUX_COMPONENT_component.lists ON)
+    set(CONFIG_MCUX_COMPONENT_component.rpmsg_adapter ON)
+    zephyr_compile_definitions(HAL_RPMSG_SELECT_ROLE=0U)
+  endif()
+endif()
+
+if(CONFIG_SOC_SERIES_MCXW)
+  if(CONFIG_NET_L2_IEEE802154 OR CONFIG_NET_L2_OPENTHREAD)
+    set(CONFIG_MCUX_COMPONENT_component.lists ON)
+    set(CONFIG_USE_component_osa_zephyr ON)
+    zephyr_compile_definitions(OSA_USED=1U)
+  endif()
+endif()
+
+if(CONFIG_USE_component_osa_zephyr)
+  set(CONFIG_MCUX_COMPONENT_component.osa_template_config ON)
+  set(CONFIG_MCUX_COMPONENT_component.osa_zephyr ON)
+  set(CONFIG_MCUX_COMPONENT_component.osa_interface ON)
+endif()
+
+add_subdirectory(${MCUX_SDK_NG_DIR}/components/osa
+  ${CMAKE_CURRENT_BINARY_DIR}/osa
+  )
+
+add_subdirectory(${MCUX_SDK_NG_DIR}/components/wifi_bt_module
+  ${CMAKE_CURRENT_BINARY_DIR}/wifi_bt_module
+  )
+
+add_subdirectory(${MCUX_SDK_NG_DIR}/components/conn_fwloader
+  ${CMAKE_CURRENT_BINARY_DIR}/conn_fwloader
+  )
+
+add_subdirectory(${MCUX_SDK_NG_DIR}/components/lists
+  ${CMAKE_CURRENT_BINARY_DIR}/lists
+  )
+
+add_subdirectory(${MCUX_SDK_NG_DIR}/components/rpmsg
+  ${CMAKE_CURRENT_BINARY_DIR}/rpmsg
+  )
+
+add_subdirectory(${MCUX_SDK_NG_DIR}/components/imu_adapter
+  ${CMAKE_CURRENT_BINARY_DIR}/imu_adapter
+  )
+
+if(${MCUX_DEVICE} MATCHES "RW61")
+  add_subdirectory(${MCUX_SDK_NG_DIR}/components/flash/mflash/rdrw612bga
+    ${CMAKE_CURRENT_BINARY_DIR}/flash/mflash
+    )
+endif()
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/device/device.cmake b/modules/hal_nxp/mcux/mcux-sdk-ng/device/device.cmake
new file mode 100644
index 0000000000000..96ab7a5cb9527
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/device/device.cmake
@@ -0,0 +1,66 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+string(TOUPPER ${CONFIG_SOC} MCUX_DEVICE)
+
+# Find the folder in mcux-sdk/devices that matches the device name
+message(STATUS "Looking for device ${MCUX_DEVICE} in ${SdkRootDirPath}/devices/")
+
+file(GLOB_RECURSE device_cmake_files ${SdkRootDirPath}/devices/*/CMakeLists.txt)
+foreach(file ${device_cmake_files})
+  get_filename_component(folder ${file} DIRECTORY)
+  get_filename_component(folder_name ${folder} NAME)
+  if(folder_name STREQUAL ${MCUX_DEVICE})
+    message(STATUS "Found device folder: ${folder}")
+    set(mcux_device_folder ${folder})
+    break()
+  endif()
+endforeach()
+
+if(NOT mcux_device_folder)
+  message(FATAL_ERROR "Device ${MCUX_DEVICE} not found in ${SdkRootDirPath}/devices/")
+endif()
+
+if(DEFINED CONFIG_MCUX_CORE_SUFFIX)
+  string (REGEX REPLACE "^_" "" core_id "${CONFIG_MCUX_CORE_SUFFIX}")
+endif()
+
+# Definitions to load device drivers
+set(CONFIG_MCUX_HW_DEVICE_CORE "${MCUX_DEVICE}${CONFIG_MCUX_CORE_SUFFIX}")
+
+# Define CPU macro
+zephyr_compile_definitions("CPU_${CONFIG_SOC_PART_NUMBER}${CONFIG_MCUX_CORE_SUFFIX}")
+
+if(CONFIG_SOC_SERIES_IMXRT10XX OR CONFIG_SOC_SERIES_IMXRT11XX)
+  set(CONFIG_MCUX_COMPONENT_device.boot_header ON)
+endif()
+
+set(CONFIG_MCUX_COMPONENT_device.system ON)
+set(CONFIG_MCUX_COMPONENT_device.CMSIS ON)
+set(CONFIG_MCUX_COMPONENT_driver.clock ON)
+set(CONFIG_MCUX_COMPONENT_driver.power ON)
+set(CONFIG_MCUX_COMPONENT_driver.reset ON)
+set(CONFIG_MCUX_COMPONENT_driver.memory ON)
+
+# load device variables
+include(${mcux_device_folder}/variable.cmake)
+
+# Load device files
+mcux_add_cmakelists(${mcux_device_folder})
+
+# Workaround for fsl_flexspi_nor_boot link error, remove the one in SDK, use the Zephyr file.
+if(CONFIG_MCUX_COMPONENT_device.boot_header)
+
+  get_target_property(MCUXSDK_SOURCES ${MCUX_SDK_PROJECT_NAME} SOURCES)
+  list(FILTER MCUXSDK_SOURCES INCLUDE REGEX ".*fsl_flexspi_nor_boot\.c$")
+
+  if(NOT MCUXSDK_SOURCES STREQUAL "")
+    file(RELATIVE_PATH MCUXSDK_SOURCES ${SdkRootDirPath} ${MCUXSDK_SOURCES})
+    mcux_project_remove_source(
+      BASE_PATH ${SdkRootDirPath}
+      SOURCES ${MCUXSDK_SOURCES}
+    )
+  endif()
+
+endif()
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake b/modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake
new file mode 100644
index 0000000000000..6e285f2e6c354
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/drivers/drivers.cmake
@@ -0,0 +1,262 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# fsl_common driver
+zephyr_library_sources(${MCUX_SDK_NG_DIR}/drivers/common/fsl_common.c
+                       ${MCUX_SDK_NG_DIR}/drivers/common/fsl_common_arm.c)
+zephyr_include_directories(${MCUX_SDK_NG_DIR}/drivers/common)
+
+set_variable_ifdef(CONFIG_HWINFO_MCUX_SRC_V2    CONFIG_MCUX_COMPONENT_driver.src_2)
+set_variable_ifdef(CONFIG_GPIO_MCUX_IGPIO       CONFIG_MCUX_COMPONENT_driver.igpio)
+set_variable_ifdef(CONFIG_ADC_MCUX_LPADC        CONFIG_MCUX_COMPONENT_driver.lpadc)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_CTIMER   CONFIG_MCUX_COMPONENT_driver.ctimer)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_LPC_RTC  CONFIG_MCUX_COMPONENT_driver.lpc_rtc)
+set_variable_ifdef(CONFIG_GLIKEY_MCUX_GLIKEY    CONFIG_MCUX_COMPONENT_driver.glikey)
+
+if(CONFIG_NXP_LP_FLEXCOMM)
+  set_variable_ifdef(CONFIG_I2C_MCUX_LPI2C      CONFIG_MCUX_COMPONENT_driver.lpflexcomm)
+  set_variable_ifdef(CONFIG_I2C_MCUX_LPI2C      CONFIG_MCUX_COMPONENT_driver.lpflexcomm_lpi2c)
+  set_variable_ifdef(CONFIG_UART_MCUX_LPUART    CONFIG_MCUX_COMPONENT_driver.lpflexcomm)
+  set_variable_ifdef(CONFIG_UART_MCUX_LPUART    CONFIG_MCUX_COMPONENT_driver.lpflexcomm_lpuart)
+  set_variable_ifdef(CONFIG_SPI_MCUX_LPSPI      CONFIG_MCUX_COMPONENT_driver.lpflexcomm)
+  set_variable_ifdef(CONFIG_SPI_MCUX_LPSPI      CONFIG_MCUX_COMPONENT_driver.lpflexcomm_lpspi)
+else()
+  set_variable_ifdef(CONFIG_I2C_MCUX_LPI2C      CONFIG_MCUX_COMPONENT_driver.lpi2c)
+  set_variable_ifdef(CONFIG_UART_MCUX_LPUART    CONFIG_MCUX_COMPONENT_driver.lpuart)
+  set_variable_ifdef(CONFIG_SPI_MCUX_LPSPI      CONFIG_MCUX_COMPONENT_driver.lpspi)
+endif()
+
+set_variable_ifdef(CONFIG_DMA_MCUX_LPC          CONFIG_MCUX_COMPONENT_driver.lpc_dma)
+set_variable_ifdef(CONFIG_GPIO_MCUX_LPC         CONFIG_MCUX_COMPONENT_driver.lpc_gpio)
+set_variable_ifdef(CONFIG_NXP_PINT              CONFIG_MCUX_COMPONENT_driver.pint)
+set_variable_ifdef(CONFIG_NXP_PINT              CONFIG_MCUX_COMPONENT_driver.inputmux)
+set_variable_ifdef(CONFIG_DMA_MCUX_SMARTDMA     CONFIG_MCUX_COMPONENT_driver.inputmux)
+set_variable_ifdef(CONFIG_I2C_MCUX_FLEXCOMM     CONFIG_MCUX_COMPONENT_driver.flexcomm)
+set_variable_ifdef(CONFIG_I2C_MCUX_FLEXCOMM     CONFIG_MCUX_COMPONENT_driver.flexcomm_i2c)
+set_variable_ifdef(CONFIG_I2S_MCUX_FLEXCOMM     CONFIG_MCUX_COMPONENT_driver.flexcomm)
+set_variable_ifdef(CONFIG_I2S_MCUX_FLEXCOMM     CONFIG_MCUX_COMPONENT_driver.flexcomm_i2s)
+set_variable_ifdef(CONFIG_SPI_MCUX_FLEXCOMM     CONFIG_MCUX_COMPONENT_driver.flexcomm)
+set_variable_ifdef(CONFIG_SPI_MCUX_FLEXCOMM     CONFIG_MCUX_COMPONENT_driver.flexcomm_spi)
+set_variable_ifdef(CONFIG_UART_MCUX_FLEXCOMM    CONFIG_MCUX_COMPONENT_driver.flexcomm)
+set_variable_ifdef(CONFIG_UART_MCUX_FLEXCOMM    CONFIG_MCUX_COMPONENT_driver.flexcomm_usart)
+set_variable_ifdef(CONFIG_MCUX_OS_TIMER         CONFIG_MCUX_COMPONENT_driver.ostimer)
+set_variable_ifdef(CONFIG_PWM_MCUX_SCTIMER      CONFIG_MCUX_COMPONENT_driver.sctimer)
+set_variable_ifdef(CONFIG_PWM_MCUX_CTIMER       CONFIG_MCUX_COMPONENT_driver.ctimer)
+set_variable_ifdef(CONFIG_SOC_FLASH_LPC         CONFIG_MCUX_COMPONENT_driver.flashiap)
+set_variable_ifdef(CONFIG_WDT_MCUX_WWDT         CONFIG_MCUX_COMPONENT_driver.wwdt)
+set_variable_ifdef(CONFIG_ADC_MCUX_ADC12        CONFIG_MCUX_COMPONENT_driver.adc12)
+set_variable_ifdef(CONFIG_ADC_MCUX_ADC16        CONFIG_MCUX_COMPONENT_driver.adc16)
+set_variable_ifdef(CONFIG_CAN_MCUX_FLEXCAN      CONFIG_MCUX_COMPONENT_driver.flexcan)
+set_variable_ifdef(CONFIG_CAN_MCUX_FLEXCAN_FD   CONFIG_MCUX_COMPONENT_driver.flexcan)
+set_variable_ifdef(CONFIG_COUNTER_NXP_PIT       CONFIG_MCUX_COMPONENT_driver.pit)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_RTC      CONFIG_MCUX_COMPONENT_driver.rtc)
+set_variable_ifdef(CONFIG_DAC_MCUX_DAC          CONFIG_MCUX_COMPONENT_driver.dac)
+set_variable_ifdef(CONFIG_DAC_MCUX_DAC32        CONFIG_MCUX_COMPONENT_driver.dac32)
+set_variable_ifdef(CONFIG_DMA_MCUX_EDMA         CONFIG_MCUX_COMPONENT_driver.dmamux)
+set_variable_ifdef(CONFIG_DMA_MCUX_EDMA_V3      CONFIG_MCUX_COMPONENT_driver.dmamux)
+set_variable_ifdef(CONFIG_DMA_MCUX_EDMA         CONFIG_MCUX_COMPONENT_driver.edma)
+set_variable_ifdef(CONFIG_DMA_MCUX_EDMA_V3      CONFIG_MCUX_COMPONENT_driver.dma3)
+set_variable_ifdef(CONFIG_DMA_MCUX_EDMA_V4      CONFIG_MCUX_COMPONENT_driver.edma4)
+set_variable_ifdef(CONFIG_ENTROPY_MCUX_RNGA     CONFIG_MCUX_COMPONENT_driver.rnga)
+set_variable_ifdef(CONFIG_ENTROPY_MCUX_TRNG     CONFIG_MCUX_COMPONENT_driver.trng)
+set_variable_ifdef(CONFIG_ENTROPY_MCUX_CAAM     CONFIG_MCUX_COMPONENT_driver.caam)
+set_variable_ifdef(CONFIG_ETH_NXP_ENET          CONFIG_MCUX_COMPONENT_driver.enet)
+set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC      CONFIG_MCUX_COMPONENT_driver.netc)
+set_variable_ifdef(CONFIG_HAS_MCUX_SMC          CONFIG_MCUX_COMPONENT_driver.smc)
+set_variable_ifdef(CONFIG_I2C_MCUX              CONFIG_MCUX_COMPONENT_driver.i2c)
+set_variable_ifdef(CONFIG_I2C_NXP_II2C          CONFIG_MCUX_COMPONENT_driver.ii2c)
+set_variable_ifdef(CONFIG_I3C_MCUX              CONFIG_MCUX_COMPONENT_driver.i3c)
+set_variable_ifdef(CONFIG_SENSOR_MCUX_ACMP      CONFIG_MCUX_COMPONENT_driver.acmp)
+set_variable_ifdef(CONFIG_COMPARATOR_MCUX_ACMP  CONFIG_MCUX_COMPONENT_driver.acmp)
+set_variable_ifdef(CONFIG_PWM_MCUX_FTM          CONFIG_MCUX_COMPONENT_driver.ftm)
+set_variable_ifdef(CONFIG_PWM_MCUX_TPM          CONFIG_MCUX_COMPONENT_driver.tpm)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_TPM      CONFIG_MCUX_COMPONENT_driver.tpm)
+set_variable_ifdef(CONFIG_PWM_MCUX_PWT          CONFIG_MCUX_COMPONENT_driver.pwt)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_QTMR     CONFIG_MCUX_COMPONENT_driver.qtmr_1)
+set_variable_ifdef(CONFIG_PWM_MCUX_QTMR         CONFIG_MCUX_COMPONENT_driver.qtmr_1)
+set_variable_ifdef(CONFIG_SPI_MCUX_DSPI         CONFIG_MCUX_COMPONENT_driver.dspi)
+set_variable_ifdef(CONFIG_SPI_MCUX_ECSPI        CONFIG_MCUX_COMPONENT_driver.ecspi)
+set_variable_ifdef(CONFIG_MCUX_FLEXIO           CONFIG_MCUX_COMPONENT_driver.flexio)
+set_variable_ifdef(CONFIG_SPI_MCUX_FLEXIO       CONFIG_MCUX_COMPONENT_driver.flexio_spi)
+set_variable_ifdef(CONFIG_UART_MCUX             CONFIG_MCUX_COMPONENT_driver.uart)
+set_variable_ifdef(CONFIG_UART_MCUX_LPSCI       CONFIG_MCUX_COMPONENT_driver.lpsci)
+set_variable_ifdef(CONFIG_WDT_MCUX_WDOG         CONFIG_MCUX_COMPONENT_driver.wdog)
+set_variable_ifdef(CONFIG_WDT_MCUX_WDOG32       CONFIG_MCUX_COMPONENT_driver.wdog32)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_GPT      CONFIG_MCUX_COMPONENT_driver.gpt)
+set_variable_ifdef(CONFIG_MCUX_GPT_TIMER        CONFIG_MCUX_COMPONENT_driver.gpt)
+set_variable_ifdef(CONFIG_DISPLAY_MCUX_ELCDIF   CONFIG_MCUX_COMPONENT_driver.elcdif)
+set_variable_ifdef(CONFIG_MCUX_PXP              CONFIG_MCUX_COMPONENT_driver.pxp)
+set_variable_ifdef(CONFIG_LV_USE_GPU_NXP_PXP    CONFIG_MCUX_COMPONENT_driver.pxp)
+set_variable_ifdef(CONFIG_GPIO_MCUX_RGPIO       CONFIG_MCUX_COMPONENT_driver.rgpio)
+set_variable_ifdef(CONFIG_I2S_MCUX_SAI          CONFIG_MCUX_COMPONENT_driver.sai)
+set_variable_ifdef(CONFIG_DAI_NXP_SAI           CONFIG_MCUX_COMPONENT_driver.sai)
+set_variable_ifdef(CONFIG_MEMC_MCUX_FLEXSPI     CONFIG_MCUX_COMPONENT_driver.flexspi)
+set_variable_ifdef(CONFIG_PWM_MCUX              CONFIG_MCUX_COMPONENT_driver.pwm)
+set_variable_ifdef(CONFIG_VIDEO_MCUX_CSI        CONFIG_MCUX_COMPONENT_driver.csi)
+set_variable_ifdef(CONFIG_WDT_MCUX_IMX_WDOG     CONFIG_MCUX_COMPONENT_driver.wdog01)
+set_variable_ifdef(CONFIG_WDT_MCUX_RTWDOG       CONFIG_MCUX_COMPONENT_driver.rtwdog)
+set_variable_ifdef(CONFIG_HAS_MCUX_RDC          CONFIG_MCUX_COMPONENT_driver.rdc)
+set_variable_ifdef(CONFIG_UART_MCUX_IUART       CONFIG_MCUX_COMPONENT_driver.iuart)
+set_variable_ifdef(CONFIG_ADC_MCUX_12B1MSPS_SAR CONFIG_MCUX_COMPONENT_driver.adc_12b1msps_sar)
+set_variable_ifdef(CONFIG_HWINFO_MCUX_SRC       CONFIG_MCUX_COMPONENT_driver.src)
+set_variable_ifdef(CONFIG_HWINFO_MCUX_SIM       CONFIG_MCUX_COMPONENT_driver.sim)
+set_variable_ifdef(CONFIG_HWINFO_MCUX_RCM       CONFIG_MCUX_COMPONENT_driver.rcm)
+set_variable_ifdef(CONFIG_IPM_MCUX              CONFIG_MCUX_COMPONENT_driver.mailbox)
+set_variable_ifdef(CONFIG_MBOX_NXP_MAILBOX      CONFIG_MCUX_COMPONENT_driver.mailbox)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_SNVS     CONFIG_MCUX_COMPONENT_driver.snvs_hp)
+set_variable_ifdef(CONFIG_MCUX_LPTMR_TIMER      CONFIG_MCUX_COMPONENT_driver.lptmr)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_LPTMR    CONFIG_MCUX_COMPONENT_driver.lptmr)
+set_variable_ifdef(CONFIG_IMX_USDHC	            CONFIG_MCUX_COMPONENT_driver.usdhc)
+set_variable_ifdef(CONFIG_MIPI_DSI_MCUX         CONFIG_MCUX_COMPONENT_driver.mipi_dsi_split)
+set_variable_ifdef(CONFIG_MIPI_DSI_MCUX_2L      CONFIG_MCUX_COMPONENT_driver.mipi_dsi)
+set_variable_ifdef(CONFIG_MCUX_SDIF             CONFIG_MCUX_COMPONENT_driver.sdif)
+set_variable_ifdef(CONFIG_ADC_MCUX_ETC          CONFIG_MCUX_COMPONENT_driver.adc_etc)
+set_variable_ifdef(CONFIG_MCUX_XBARA            CONFIG_MCUX_COMPONENT_driver.xbara)
+set_variable_ifdef(CONFIG_QDEC_MCUX             CONFIG_MCUX_COMPONENT_driver.enc)
+set_variable_ifdef(CONFIG_CRYPTO_MCUX_DCP       CONFIG_MCUX_COMPONENT_driver.dcp)
+set_variable_ifdef(CONFIG_DMA_MCUX_SMARTDMA     CONFIG_MCUX_COMPONENT_driver.smartdma)
+set_variable_ifdef(CONFIG_DAC_MCUX_LPDAC        CONFIG_MCUX_COMPONENT_driver.dac_1)
+set_variable_ifdef(CONFIG_NXP_IRQSTEER          CONFIG_MCUX_COMPONENT_driver.irqsteer)
+set_variable_ifdef(CONFIG_AUDIO_DMIC_MCUX       CONFIG_MCUX_COMPONENT_driver.dmic)
+set_variable_ifdef(CONFIG_DMA_NXP_SDMA          CONFIG_MCUX_COMPONENT_driver.sdma)
+set_variable_ifdef(CONFIG_ADC_MCUX_GAU          CONFIG_MCUX_COMPONENT_driver.cns_adc)
+set_variable_ifdef(CONFIG_DAC_MCUX_GAU          CONFIG_MCUX_COMPONENT_driver.cns_dac)
+set_variable_ifdef(CONFIG_DAI_NXP_ESAI          CONFIG_MCUX_COMPONENT_driver.esai)
+set_variable_ifdef(CONFIG_MCUX_LPCMP            CONFIG_MCUX_COMPONENT_driver.lpcmp)
+set_variable_ifdef(CONFIG_NXP_RF_IMU            CONFIG_MCUX_COMPONENT_driver.imu)
+set_variable_ifdef(CONFIG_TRDC_MCUX_TRDC        CONFIG_MCUX_COMPONENT_driver.trdc)
+set_variable_ifdef(CONFIG_S3MU_MCUX_S3MU        CONFIG_MCUX_COMPONENT_driver.s3mu)
+set_variable_ifdef(CONFIG_PINCTRL_NXP_PORT      CONFIG_MCUX_COMPONENT_driver.port)
+set_variable_ifdef(CONFIG_DMA_NXP_EDMA          CONFIG_MCUX_COMPONENT_driver.edma_soc_rev2)
+set_variable_ifdef(CONFIG_COUNTER_MCUX_SNVS_SRTC    CONFIG_MCUX_COMPONENT_driver.snvs_lp)
+set_variable_ifdef(CONFIG_DISPLAY_MCUX_DCNANO_LCDIF CONFIG_MCUX_COMPONENT_driver.lcdif)
+set_variable_ifdef(CONFIG_MIPI_DBI_NXP_FLEXIO_LCDIF CONFIG_MCUX_COMPONENT_driver.flexio_mculcd)
+set_variable_ifdef(CONFIG_VIDEO_MCUX_MIPI_CSI2RX    CONFIG_MCUX_COMPONENT_driver.mipi_csi2rx)
+set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC          CONFIG_MCUX_COMPONENT_driver.netc)
+set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC          CONFIG_MCUX_COMPONENT_driver.netc_switch)
+
+set_variable_ifdef(CONFIG_SOC_SERIES_IMXRT10XX    CONFIG_MCUX_COMPONENT_driver.ocotp)
+set_variable_ifdef(CONFIG_SOC_SERIES_IMXRT11XX    CONFIG_MCUX_COMPONENT_driver.ocotp)
+set_variable_ifdef(CONFIG_SOC_FAMILY_KINETIS      CONFIG_MCUX_COMPONENT_driver.port)
+set_variable_ifdef(CONFIG_SOC_SERIES_MCXW         CONFIG_MCUX_COMPONENT_driver.ccm32k)
+set_variable_ifdef(CONFIG_SOC_SERIES_IMXRT5XX     CONFIG_MCUX_COMPONENT_driver.iap3)
+
+if(CONFIG_SOC_MIMXRT1189)
+  set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC CONFIG_MCUX_COMPONENT_driver.netc_rt1180)
+  set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC CONFIG_MCUX_COMPONENT_driver.msgintr)
+elseif(CONFIG_SOC_MIMX9596)
+  set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC CONFIG_MCUX_COMPONENT_driver.netc_imx95)
+  set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC CONFIG_MCUX_COMPONENT_driver.msgintr)
+  set_variable_ifdef(CONFIG_ETH_NXP_IMX_NETC CONFIG_MCUX_COMPONENT_driver.irqsteer)
+endif()
+
+if(CONFIG_SOC_SERIES_MCXN OR CONFIG_SOC_SERIES_MCXA)
+  set(CONFIG_MCUX_COMPONENT_driver.mcx_spc ON)
+endif()
+
+if(CONFIG_BT_NXP AND CONFIG_SOC_SERIES_MCXW OR CONFIG_IEEE802154_MCXW)
+  set(CONFIG_MCUX_COMPONENT_driver.spc ON)
+endif()
+
+if(((${MCUX_DEVICE} MATCHES "MIMXRT1[0-9][0-9][0-9]") AND (NOT (CONFIG_SOC_MIMXRT1166_CM4 OR CONFIG_SOC_MIMXRT1176_CM4 OR CONFIG_SOC_MIMXRT1189_CM33))) OR
+    ((${MCUX_DEVICE} MATCHES "MIMX9596") AND CONFIG_SOC_MIMX9596_M7))
+  set_variable_ifdef(CONFIG_HAS_MCUX_CACHE		CONFIG_MCUX_COMPONENT_driver.cache_armv7_m7)
+elseif((${MCUX_DEVICE} MATCHES "MIMXRT(5|6)") OR (${MCUX_DEVICE} MATCHES "RW61") OR (${MCUX_DEVICE} MATCHES "MCXN.4."))
+  set_variable_ifdef(CONFIG_HAS_MCUX_CACHE		CONFIG_MCUX_COMPONENT_driver.cache_cache64)
+elseif((${MCUX_DEVICE} MATCHES "MK(28|66)") OR (${MCUX_DEVICE} MATCHES "MKE(14|16|18)") OR (CONFIG_SOC_MIMXRT1166_CM4) OR (CONFIG_SOC_MIMXRT1176_CM4))
+  set_variable_ifdef(CONFIG_HAS_MCUX_CACHE		CONFIG_MCUX_COMPONENT_driver.cache_lmem)
+endif()
+  set_variable_ifdef(CONFIG_HAS_MCUX_XCACHE		CONFIG_MCUX_COMPONENT_driver.cache_xcache)
+
+if((${MCUX_DEVICE} MATCHES "MIMX9596") OR (${MCUX_DEVICE} MATCHES "MIMX8UD7") OR (${MCUX_DEVICE} MATCHES "MIMXRT118"))
+  set_variable_ifdef(CONFIG_IPM_IMX	CONFIG_MCUX_COMPONENT_driver.mu1)
+  set_variable_ifdef(CONFIG_MBOX_NXP_IMX_MU	CONFIG_MCUX_COMPONENT_driver.mu1)
+else()
+  set_variable_ifdef(CONFIG_IPM_IMX	CONFIG_MCUX_COMPONENT_driver.mu)
+  set_variable_ifdef(CONFIG_MBOX_NXP_IMX_MU	CONFIG_MCUX_COMPONENT_driver.mu)
+endif()
+
+if(CONFIG_SOC_FAMILY_KINETIS OR CONFIG_SOC_SERIES_MCXC)
+  set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.flash)
+endif()
+
+if(CONFIG_SOC_MK82F25615 OR CONFIG_SOC_MK64F12 OR CONFIG_SOC_MK66F18 OR
+    CONFIG_SOC_MKE14F16 OR CONFIG_SOC_MKE16F16 OR CONFIG_SOC_MKE18F16 OR
+    CONFIG_SOC_MK22F12)
+  set(CONFIG_MCUX_COMPONENT_driver.sysmpu ON)
+endif()
+
+if(CONFIG_SOC_SERIES_MCXW)
+  set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.flash_k4)
+endif()
+
+if(CONFIG_SOC_SERIES_LPC51U68 OR CONFIG_SOC_SERIES_LPC54XXX)
+  set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.iap)
+endif()
+
+if(CONFIG_SOC_SERIES_LPC51U68 OR CONFIG_SOC_SERIES_LPC54XXX)
+  set_variable_ifdef(CONFIG_ENTROPY_MCUX_RNG CONFIG_MCUX_COMPONENT_driver.rng)
+endif()
+
+if(CONFIG_SOC_SERIES_LPC55XXX)
+  set_variable_ifdef(CONFIG_ENTROPY_MCUX_RNG CONFIG_MCUX_COMPONENT_driver.rng_1)
+  if(CONFIG_SOC_LPC55S36)
+    set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.romapi_flash)
+  else()
+    set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.iap1)
+  endif()
+endif()
+
+if(CONFIG_SOC_SERIES_LPC51U68 OR CONFIG_SOC_SERIES_LPC54XXX OR CONFIG_SOC_SERIES_LPC55XXX)
+  set(CONFIG_MCUX_COMPONENT_driver.lpc_iocon ON)
+endif()
+
+if(CONFIG_SOC_LPC55S36)
+  set_variable_ifdef(CONFIG_ADC_MCUX_LPADC CONFIG_MCUX_COMPONENT_driver.vref_1)
+  set_variable_ifdef(CONFIG_DAC_MCUX_LPDAC CONFIG_MCUX_COMPONENT_driver.vref_1)
+endif()
+
+if(CONFIG_SOC_SERIES_IMXRT5XX OR CONFIG_SOC_SERIES_IMXRT6XX)
+  set(CONFIG_MCUX_COMPONENT_driver.lpc_iopctl ON)
+endif()
+
+if(CONFIG_SOC_SERIES_RW6XX)
+  set(CONFIG_MCUX_COMPONENT_driver.ocotp_rw61x ON)
+endif()
+
+if(CONFIG_SOC_SERIES_IMXRT10XX)
+  set_variable_ifdef(CONFIG_PM_MCUX_GPC CONFIG_MCUX_COMPONENT_driver.gpc_1)
+  set_variable_ifdef(CONFIG_PM_MCUX_DCDC CONFIG_MCUX_COMPONENT_driver.dcdc_1)
+  set_variable_ifdef(CONFIG_PM_MCUX_PMU CONFIG_MCUX_COMPONENT_driver.pmu)
+endif()
+
+if(CONFIG_SOC_SERIES_IMXRT11XX)
+  set(CONFIG_MCUX_COMPONENT_driver.romapi ON)
+  set(CONFIG_MCUX_COMPONENT_driver.anadig_pmu ON)
+  set(CONFIG_MCUX_COMPONENT_driver.pgmc ON)
+  set(CONFIG_MCUX_COMPONENT_driver.dcdc_2 ON)
+  set(CONFIG_MCUX_COMPONENT_driver.anatop_ai ON)
+  set(CONFIG_MCUX_COMPONENT_driver.gpc_xxx_ctrl ON)
+  set_variable_ifdef(CONFIG_VIDEO_MCUX_MIPI_CSI2RX CONFIG_MCUX_COMPONENT_driver.mipi_csi2rx_soc)
+endif()
+
+if(CONFIG_SOC_SERIES_IMXRT118X)
+  set(CONFIG_MCUX_COMPONENT_driver.ele_base_api ON)
+  set(CONFIG_MCUX_COMPONENT_driver.anadig_pmu_1 ON)
+  set_variable_ifdef(CONFIG_HWINFO_MCUX_SRC_V2 CONFIG_MCUX_COMPONENT_driver.src_3)
+  set_variable_ifdef(CONFIG_WDT_MCUX_RTWDOG	CONFIG_MCUX_COMPONENT_driver.src_3)
+endif()
+
+if(CONFIG_SOC_SERIES_MCXA)
+  set(CONFIG_MCUX_COMPONENT_driver.romapi ON)
+endif()
+
+if(CONFIG_SOC_SERIES_MCXN)
+  set_variable_ifdef(CONFIG_SOC_FLASH_MCUX CONFIG_MCUX_COMPONENT_driver.romapi_flashiap)
+endif()
+
+set_variable_ifdef(CONFIG_SOC_SERIES_MCXW CONFIG_MCUX_COMPONENT_driver.elemu)
+
+# Load all drivers
+mcux_load_all_cmakelists_in_directory(${SdkRootDirPath}/drivers)
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/bt_controller/CMakeLists.txt b/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/bt_controller/CMakeLists.txt
new file mode 100644
index 0000000000000..9d17f2d353dfc
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/bt_controller/CMakeLists.txt
@@ -0,0 +1,25 @@
+#
+# Copyright 2024-2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(hal_nxp_dir           ${ZEPHYR_HAL_NXP_MODULE_DIR})
+set(hal_nxp_blobs_dir     ${hal_nxp_dir}/zephyr/blobs)
+set(blob_gen_file         ${ZEPHYR_BINARY_DIR}/include/generated/bt_nxp_ctlr_fw.h)
+
+if(CONFIG_BUILD_ONLY_NO_BLOBS)
+    set(blob_file src/no_blobs.h)
+elseif(CONFIG_BT_NXP_NW612)
+    set(blob_file ${hal_nxp_blobs_dir}/iw612/uart_nw61x_se.h)
+endif()
+
+if (NOT DEFINED blob_file)
+    message(FATAL_ERROR "Unsupported controller. Please select a BT conntroller, refer to ./driver/bluetooth/hci/Kconfig.nxp")
+endif()
+
+if(NOT CONFIG_BUILD_ONLY_NO_BLOBS)
+   zephyr_blobs_verify(FILES ${blob_file} REQUIRED)
+endif()
+
+configure_file(${blob_file} ${blob_gen_file} COPYONLY)
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/bt_controller/src/no_blobs.h b/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/bt_controller/src/no_blobs.h
new file mode 100644
index 0000000000000..361d7420b8715
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/bt_controller/src/no_blobs.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __UART_BT_FW_H__
+#define __UART_BT_FW_H__
+
+
+const unsigned char *bt_fw_bin;
+unsigned int bt_fw_bin_len;
+
+#endif /* __UART_BT_FW_H__ */
diff --git a/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/middleware.cmake b/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/middleware.cmake
new file mode 100644
index 0000000000000..37b0b479abdea
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/middleware.cmake
@@ -0,0 +1,43 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_USB_DEVICE_DRIVER)
+  zephyr_include_directories(middleware)
+
+  set(CONFIG_MCUX_COMPONENT_middleware.usb.common_header ON)
+  set(CONFIG_MCUX_COMPONENT_middleware.usb.device.common_header ON)
+  set(CONFIG_MCUX_COMPONENT_middleware.usb.phy ON)
+
+  set_variable_ifdef(CONFIG_USB_DC_NXP_EHCI CONFIG_MCUX_COMPONENT_middleware.usb.device.ehci)
+  set_variable_ifdef(CONFIG_USB_DC_NXP_LPCIP3511 CONFIG_MCUX_COMPONENT_middleware.usb.device.ip3511fs)
+
+  # For soc.c build pass
+  zephyr_include_directories(.)
+  zephyr_include_directories(${MCUX_SDK_NG_DIR}/middleware/usb/device)
+  zephyr_include_directories(${MCUX_SDK_NG_DIR}/middleware/usb/phy)
+  zephyr_include_directories(${MCUX_SDK_NG_DIR}/middleware/usb/include)
+endif()
+
+if(CONFIG_UDC_DRIVER)
+  zephyr_include_directories(middleware)
+
+  set(CONFIG_MCUX_COMPONENT_middleware.usb.common_header ON)
+  set(CONFIG_MCUX_COMPONENT_middleware.usb.device.common_header ON)
+
+  set_variable_ifdef(CONFIG_DT_HAS_NXP_USBPHY_ENABLED CONFIG_MCUX_COMPONENT_middleware.usb.phy)
+  set_variable_ifdef(CONFIG_UDC_NXP_EHCI CONFIG_MCUX_COMPONENT_middleware.usb.device.ehci)
+  set_variable_ifdef(CONFIG_UDC_NXP_IP3511 CONFIG_MCUX_COMPONENT_middleware.usb.device.ip3511fs)
+
+  # For soc.c build pass
+  zephyr_include_directories(.)
+  zephyr_include_directories(${MCUX_SDK_NG_DIR}/middleware/usb/device)
+  zephyr_include_directories(${MCUX_SDK_NG_DIR}/middleware/usb/phy)
+  zephyr_include_directories(${MCUX_SDK_NG_DIR}/middleware/usb/include)
+endif()
+
+add_subdirectory(${MCUX_SDK_NG_DIR}/middleware/usb
+  ${CMAKE_CURRENT_BINARY_DIR}/usb
+)
+
+add_subdirectory_ifdef(CONFIG_BT_H4_NXP_CTLR ${CMAKE_CURRENT_LIST_DIR}/bt_controller)
diff --git a/modules/hal_nxp/usb/usb_device_config.h b/modules/hal_nxp/mcux/mcux-sdk-ng/middleware/usb_device_config.h
similarity index 100%
rename from modules/hal_nxp/usb/usb_device_config.h
rename to modules/hal_nxp/mcux/mcux-sdk-ng/middleware/usb_device_config.h
diff --git a/modules/hal_nxp/mcux/mcux-sdk/CMakeLists.txt b/modules/hal_nxp/mcux/mcux-sdk/CMakeLists.txt
new file mode 100644
index 0000000000000..02f38951802a7
--- /dev/null
+++ b/modules/hal_nxp/mcux/mcux-sdk/CMakeLists.txt
@@ -0,0 +1,455 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+list(APPEND CMAKE_MODULE_PATH
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/common
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/flexcomm
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/lpflexcomm
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/flexio
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/dmamux
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/components/osa
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/components/lists
+)
+
+if(CONFIG_CPU_CORTEX_A)
+    list(APPEND CMAKE_MODULE_PATH
+        ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/CMSIS/Core_AArch64/Include
+    )
+else()
+    list(APPEND CMAKE_MODULE_PATH
+        ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/cache/armv7-m7
+        ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/CMSIS/Core/Include
+    )
+endif()
+
+function(include_ifdef feature_toggle module)
+  if(${${feature_toggle}})
+    include(${module})
+  endif()
+endfunction()
+
+function(include_driver_ifdef feature_toggle directory module)
+  if(${${feature_toggle}})
+    list(APPEND CMAKE_MODULE_PATH
+        ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/${directory}
+    )
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/${directory})
+    include(${module})
+  endif()
+endfunction()
+
+message("Load components for ${MCUX_DEVICE}:")
+
+#specific operation to shared drivers
+if((DEFINED CONFIG_FLASH_MCUX_FLEXSPI_XIP) AND (DEFINED CONFIG_FLASH))
+  zephyr_code_relocate(FILES ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/flexspi/fsl_flexspi.c
+    LOCATION ${CONFIG_FLASH_MCUX_FLEXSPI_XIP_MEM}_TEXT)
+endif()
+
+# Required by all SCFW-based SoCs
+if (CONFIG_SOC_MIMX8QM6_ADSP OR CONFIG_SOC_MIMX8QX6_ADSP)
+    list(APPEND CMAKE_MODULE_PATH
+        ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/scfw_api
+    )
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/${MCUX_DEVICE_PATH}/scfw_api)
+    include(driver_scfw_api)
+endif()
+
+include(driver_common)
+
+#Include system_xxx file
+#This can be extended to other SoC series if needed
+if (DEFINED CONFIG_SOC_RESET_HOOK OR DEFINED CONFIG_SOC_SERIES_IMXRT6XX
+    OR DEFINED CONFIG_SOC_SERIES_LPC55XXX OR DEFINED CONFIG_SOC_SERIES_MCXN
+    OR DEFINED CONFIG_SOC_MCXW727C)
+  if (CONFIG_SOC_MIMXRT1166_CM4)
+    include(device_system_MIMXRT1166_cm4)
+  elseif (CONFIG_SOC_MIMXRT1166_CM7)
+    include(device_system_MIMXRT1166_cm7)
+  elseif (CONFIG_SOC_MIMXRT1176_CM4)
+    include(device_system_MIMXRT1176_cm4)
+  elseif (CONFIG_SOC_MIMXRT1176_CM7)
+    include(device_system_MIMXRT1176_cm7)
+  elseif (CONFIG_SOC_MIMXRT1189_CM33)
+    include(device_system_MIMXRT1189_cm33)
+  elseif (CONFIG_SOC_MIMXRT1189_CM7)
+    include(device_system_MIMXRT1189_cm7)
+  elseif (CONFIG_SOC_LPC55S69_CPU0)
+    include(device_system_LPC55S69_cm33_core0)
+  elseif (CONFIG_SOC_LPC55S69_CPU1)
+    include(device_system_LPC55S69_cm33_core1)
+  elseif (CONFIG_SOC_LPC54114_M4)
+    include(device_system_LPC54114_cm4)
+  elseif (CONFIG_SOC_LPC54114_M0)
+    include(device_system_LPC54114_cm0plus)
+  elseif (CONFIG_SOC_MCXN947_CPU0)
+    include(device_system_MCXN947_cm33_core0)
+  elseif (CONFIG_SOC_MCXN947_CPU1)
+    include(device_system_MCXN947_cm33_core1)
+  elseif (CONFIG_SOC_MCXN236)
+    include(device_system_MCXN236)
+  elseif (CONFIG_SOC_MIMXRT798S_CM33_CPU0)
+    include(device_system_MIMXRT798S_cm33_core0)
+  elseif (CONFIG_SOC_MIMXRT798S_CM33_CPU1)
+    include(device_system_MIMXRT798S_cm33_core1)
+  elseif (CONFIG_SOC_MCXW727C_CPU0)
+    include(device_system_MCXW727C_cm33_core0)
+  else()
+    include(device_system)
+  endif()
+endif()
+
+zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/common)
+
+#include shared drivers
+include_driver_ifdef(CONFIG_ADC_MCUX_LPADC		lpadc		driver_lpadc)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_CTIMER		ctimer		driver_ctimer)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_LPC_RTC	lpc_rtc		driver_lpc_rtc)
+include_driver_ifdef(CONFIG_DMA_MCUX_LPC		lpc_dma		driver_lpc_dma)
+include_driver_ifdef(CONFIG_GPIO_MCUX_LPC		lpc_gpio        driver_lpc_gpio)
+include_driver_ifdef(CONFIG_NXP_PINT			pint    	driver_pint)
+include_driver_ifdef(CONFIG_NXP_PINT			inputmux	driver_inputmux)
+include_driver_ifdef(CONFIG_I2C_MCUX_FLEXCOMM		flexcomm	driver_flexcomm)
+include_driver_ifdef(CONFIG_I2C_MCUX_FLEXCOMM		flexcomm/i2c	driver_flexcomm_i2c)
+include_driver_ifdef(CONFIG_I2S_MCUX_FLEXCOMM		flexcomm	driver_flexcomm)
+include_driver_ifdef(CONFIG_I2S_MCUX_FLEXCOMM		flexcomm/i2s	driver_flexcomm_i2s)
+include_driver_ifdef(CONFIG_MCUX_OS_TIMER		ostimer		driver_ostimer)
+include_driver_ifdef(CONFIG_PWM_MCUX_SCTIMER		sctimer		driver_sctimer)
+include_driver_ifdef(CONFIG_PWM_MCUX_CTIMER		ctimer		driver_ctimer)
+include_driver_ifdef(CONFIG_SOC_FLASH_LPC		flashiap	driver_flashiap)
+include_driver_ifdef(CONFIG_SPI_MCUX_FLEXCOMM		flexcomm	driver_flexcomm)
+include_driver_ifdef(CONFIG_SPI_MCUX_FLEXCOMM		flexcomm/spi	driver_flexcomm_spi)
+include_driver_ifdef(CONFIG_UART_MCUX_FLEXCOMM		flexcomm	driver_flexcomm)
+include_driver_ifdef(CONFIG_UART_MCUX_FLEXCOMM		flexcomm/usart	driver_flexcomm_usart)
+include_driver_ifdef(CONFIG_WDT_MCUX_WWDT		wwdt		driver_wwdt)
+include_driver_ifdef(CONFIG_ADC_MCUX_ADC12		adc12		driver_adc12)
+include_driver_ifdef(CONFIG_ADC_MCUX_ADC16		adc16		driver_adc16)
+include_driver_ifdef(CONFIG_CAN_MCUX_FLEXCAN		flexcan		driver_flexcan)
+include_driver_ifdef(CONFIG_CAN_MCUX_FLEXCAN_FD		flexcan		driver_flexcan)
+include_driver_ifdef(CONFIG_COUNTER_NXP_PIT		pit		driver_pit)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_RTC		rtc		driver_rtc)
+include_driver_ifdef(CONFIG_DAC_MCUX_DAC		dac		driver_dac)
+include_driver_ifdef(CONFIG_DAC_MCUX_DAC32		dac32		driver_dac32)
+include_driver_ifdef(CONFIG_DMA_MCUX_EDMA		dmamux		driver_dmamux)
+include_driver_ifdef(CONFIG_DMA_MCUX_EDMA_V3		dmamux		driver_dmamux)
+include_driver_ifdef(CONFIG_DMA_MCUX_EDMA		edma		driver_edma)
+include_driver_ifdef(CONFIG_DMA_MCUX_EDMA_V3		dma3		driver_dma3)
+include_driver_ifdef(CONFIG_DMA_MCUX_EDMA_V4		edma4		driver_edma4)
+include_driver_ifdef(CONFIG_ENTROPY_MCUX_RNGA		rnga		driver_rnga)
+include_driver_ifdef(CONFIG_ENTROPY_MCUX_TRNG		trng		driver_trng)
+include_driver_ifdef(CONFIG_ENTROPY_MCUX_CAAM		caam		driver_caam)
+include_driver_ifdef(CONFIG_ETH_NXP_ENET		enet		driver_enet)
+include_driver_ifdef(CONFIG_ETH_NXP_IMX_NETC		netc		driver_netc)
+include_driver_ifdef(CONFIG_HAS_MCUX_SMC		smc		driver_smc)
+include_driver_ifdef(CONFIG_I2C_MCUX			i2c		driver_i2c)
+include_driver_ifdef(CONFIG_I2C_NXP_II2C		ii2c		driver_ii2c)
+if (CONFIG_NXP_LP_FLEXCOMM)
+include_driver_ifdef(CONFIG_I2C_MCUX_LPI2C		lpflexcomm	driver_lpflexcomm)
+include_driver_ifdef(CONFIG_I2C_MCUX_LPI2C		lpflexcomm/lpi2c	driver_lpi2c)
+else()
+include_driver_ifdef(CONFIG_I2C_MCUX_LPI2C		lpi2c		driver_lpi2c)
+endif()
+include_driver_ifdef(CONFIG_I3C_MCUX			i3c		driver_i3c)
+include_driver_ifdef(CONFIG_COMPARATOR_MCUX_ACMP	acmp		driver_acmp)
+include_driver_ifdef(CONFIG_SENSOR_MCUX_ACMP		acmp		driver_acmp)
+include_driver_ifdef(CONFIG_PWM_MCUX_FTM		ftm     	driver_ftm)
+include_driver_ifdef(CONFIG_PWM_MCUX_TPM		tpm		driver_tpm)
+include_driver_ifdef(CONFIG_PWM_MCUX_PWT		pwt		driver_pwt)
+include_driver_ifdef(CONFIG_PWM_MCUX_QTMR		qtmr_1		driver_qtmr_1)
+include_driver_ifdef(CONFIG_SPI_MCUX_DSPI		dspi		driver_dspi)
+include_driver_ifdef(CONFIG_SPI_MCUX_ECSPI		ecspi		driver_ecspi)
+if (CONFIG_NXP_LP_FLEXCOMM)
+include_driver_ifdef(CONFIG_SPI_MCUX_LPSPI		lpflexcomm	driver_lpflexcomm)
+include_driver_ifdef(CONFIG_SPI_MCUX_LPSPI		lpflexcomm/lpspi	driver_lpspi)
+else()
+include_driver_ifdef(CONFIG_SPI_MCUX_LPSPI		lpspi		driver_lpspi)
+endif()
+include_driver_ifdef(CONFIG_MCUX_FLEXIO			flexio		driver_flexio)
+include_driver_ifdef(CONFIG_SPI_MCUX_FLEXIO		flexio/spi	driver_flexio_spi)
+include_driver_ifdef(CONFIG_MIPI_DBI_NXP_FLEXIO_LCDIF	flexio/mculcd	driver_flexio_mculcd)
+include_driver_ifdef(CONFIG_UART_MCUX			uart		driver_uart)
+include_driver_ifdef(CONFIG_UART_MCUX_LPSCI		lpsci		driver_lpsci)
+if (CONFIG_NXP_LP_FLEXCOMM)
+include_driver_ifdef(CONFIG_UART_MCUX_LPUART		lpflexcomm	driver_lpflexcomm)
+include_driver_ifdef(CONFIG_UART_MCUX_LPUART		lpflexcomm/lpuart	driver_lpuart)
+else()
+include_driver_ifdef(CONFIG_UART_MCUX_LPUART		lpuart		driver_lpuart)
+endif()
+include_driver_ifdef(CONFIG_WDT_MCUX_WDOG		wdog		driver_wdog)
+include_driver_ifdef(CONFIG_WDT_MCUX_WDOG32		wdog32		driver_wdog32)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_GPT		gpt		driver_gpt)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_TPM		tpm		driver_tpm)
+include_driver_ifdef(CONFIG_MCUX_GPT_TIMER		gpt		driver_gpt)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_QTMR		qtmr_1		driver_qtmr_1)
+include_driver_ifdef(CONFIG_DISPLAY_MCUX_ELCDIF		elcdif		driver_elcdif)
+include_driver_ifdef(CONFIG_DISPLAY_MCUX_DCNANO_LCDIF	lcdif		driver_lcdif)
+include_driver_ifdef(CONFIG_MCUX_PXP			pxp		driver_pxp)
+include_driver_ifdef(CONFIG_LV_USE_GPU_NXP_PXP		pxp		driver_pxp)
+include_driver_ifdef(CONFIG_GPIO_MCUX_IGPIO		igpio		driver_igpio)
+include_driver_ifdef(CONFIG_GPIO_MCUX_RGPIO		rgpio		driver_rgpio)
+include_driver_ifdef(CONFIG_I2S_MCUX_SAI		sai		driver_sai)
+include_driver_ifdef(CONFIG_DAI_NXP_SAI			sai		driver_sai)
+include_driver_ifdef(CONFIG_MEMC_MCUX_FLEXSPI		flexspi		driver_flexspi)
+include_driver_ifdef(CONFIG_PWM_MCUX			pwm		driver_pwm)
+include_driver_ifdef(CONFIG_VIDEO_MCUX_CSI		csi		driver_csi)
+include_driver_ifdef(CONFIG_VIDEO_MCUX_MIPI_CSI2RX	mipi_csi2rx     driver_mipi_csi2rx)
+include_driver_ifdef(CONFIG_WDT_MCUX_IMX_WDOG		wdog01		driver_wdog01)
+include_driver_ifdef(CONFIG_WDT_MCUX_RTWDOG		rtwdog		driver_rtwdog)
+include_driver_ifdef(CONFIG_DMA_MCUX_LPC		lpc_dma		driver_lpc_dma)
+include_driver_ifdef(CONFIG_MEMC_MCUX_FLEXSPI		flexspi		driver_flexspi)
+include_driver_ifdef(CONFIG_HAS_MCUX_RDC		rdc		driver_rdc)
+include_driver_ifdef(CONFIG_UART_MCUX_IUART		iuart		driver_iuart)
+include_driver_ifdef(CONFIG_ADC_MCUX_12B1MSPS_SAR	adc_12b1msps_sar	driver_adc_12b1msps_sar)
+include_driver_ifdef(CONFIG_HWINFO_MCUX_SRC		src		driver_src)
+include_driver_ifdef(CONFIG_HWINFO_MCUX_SIM		sim		driver_sim)
+include_driver_ifdef(CONFIG_HWINFO_MCUX_RCM		rcm		driver_rcm)
+include_driver_ifdef(CONFIG_IPM_MCUX			mailbox		driver_mailbox)
+include_driver_ifdef(CONFIG_MBOX_NXP_MAILBOX		mailbox		driver_mailbox)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_SNVS		snvs_hp		driver_snvs_hp)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_SNVS_SRTC	snvs_lp		driver_snvs_lp)
+include_driver_ifdef(CONFIG_COUNTER_MCUX_LPTMR		lptmr		driver_lptmr)
+include_driver_ifdef(CONFIG_MCUX_LPTMR_TIMER		lptmr		driver_lptmr)
+include_driver_ifdef(CONFIG_IMX_USDHC			usdhc		driver_usdhc)
+include_driver_ifdef(CONFIG_MIPI_DSI_MCUX		mipi_dsi_split	driver_mipi_dsi_split)
+include_driver_ifdef(CONFIG_MIPI_DSI_MCUX_2L		mipi_dsi	driver_mipi_dsi)
+include_driver_ifdef(CONFIG_MCUX_SDIF			sdif		driver_sdif)
+include_driver_ifdef(CONFIG_ADC_MCUX_ETC		adc_etc		driver_adc_etc)
+include_driver_ifdef(CONFIG_MCUX_XBARA			xbara		driver_xbara)
+include_driver_ifdef(CONFIG_MCUX_XBARB			xbarb		driver_xbarb)
+include_driver_ifdef(CONFIG_QDEC_MCUX			enc		driver_enc)
+include_driver_ifdef(CONFIG_CRYPTO_MCUX_DCP		dcp		driver_dcp)
+include_driver_ifdef(CONFIG_DMA_MCUX_SMARTDMA		smartdma	driver_lpc_smartdma)
+include_driver_ifdef(CONFIG_DMA_MCUX_SMARTDMA		inputmux	driver_inputmux)
+include_driver_ifdef(CONFIG_DAC_MCUX_LPDAC		dac_1		driver_dac_1)
+include_driver_ifdef(CONFIG_NXP_IRQSTEER		irqsteer	driver_irqsteer)
+include_driver_ifdef(CONFIG_AUDIO_DMIC_MCUX		dmic		driver_dmic)
+include_driver_ifdef(CONFIG_DMA_NXP_EDMA		edma_rev2	driver_edma_rev2)
+include_driver_ifdef(CONFIG_DMA_NXP_SDMA		sdma		driver_sdma)
+include_driver_ifdef(CONFIG_SOC_SERIES_MCXN		mcx_spc		driver_mcx_spc)
+include_driver_ifdef(CONFIG_SOC_SERIES_MCXA		mcx_spc		driver_mcx_spc)
+include_driver_ifdef(CONFIG_ADC_MCUX_GAU		cns_adc		driver_cns_adc)
+include_driver_ifdef(CONFIG_DAC_MCUX_GAU		cns_dac		driver_cns_dac)
+include_driver_ifdef(CONFIG_DAI_NXP_ESAI		esai		driver_esai)
+include_driver_ifdef(CONFIG_MCUX_LPCMP		        lpcmp		driver_lpcmp)
+include_driver_ifdef(CONFIG_NXP_RF_IMU			imu		driver_imu)
+include_driver_ifdef(CONFIG_TRDC_MCUX_TRDC              trdc            driver_trdc)
+include_driver_ifdef(CONFIG_S3MU_MCUX_S3MU              s3mu            driver_s3mu)
+include_driver_ifdef(CONFIG_DAI_NXP_MICFIL		pdm		driver_pdm)
+include_driver_ifdef(CONFIG_PINCTRL_NXP_PORT            port            driver_port)
+include_driver_ifdef(CONFIG_GLIKEY_MCUX_GLIKEY		glikey		driver_glikey)
+if(CONFIG_BT_NXP)
+include_driver_ifdef(CONFIG_SOC_SERIES_MCXW		spc		driver_spc)
+endif()
+
+if (${MCUX_DEVICE} MATCHES "MIMXRT1189")
+  include_driver_ifdef(CONFIG_ETH_NXP_IMX_NETC	netc/socs/imxrt1180	driver_netc_soc_imxrt1180)
+  include_driver_ifdef(CONFIG_ETH_NXP_IMX_NETC	msgintr			driver_msgintr)
+elseif (${MCUX_DEVICE} MATCHES "MIMX9596")
+  include_driver_ifdef(CONFIG_ETH_NXP_IMX_NETC	netc/socs/imx95		driver_netc_soc_imx95)
+  include_driver_ifdef(CONFIG_ETH_NXP_IMX_NETC	msgintr			driver_msgintr)
+  include_driver_ifdef(CONFIG_ETH_NXP_IMX_NETC	irqsteer		driver_irqsteer)
+endif()
+
+if (((${MCUX_DEVICE} MATCHES "MIMXRT1[0-9][0-9][0-9]") AND (NOT (CONFIG_SOC_MIMXRT1166_CM4 OR CONFIG_SOC_MIMXRT1176_CM4 OR CONFIG_SOC_MIMXRT1189_CM33))) OR
+    ((${MCUX_DEVICE} MATCHES "MIMX9596") AND CONFIG_SOC_MIMX9596_M7))
+  include_driver_ifdef(CONFIG_HAS_MCUX_CACHE		cache/armv7-m7	driver_cache_armv7_m7)
+elseif((${MCUX_DEVICE} MATCHES "MIMXRT(5|6|7)") OR (${MCUX_DEVICE} MATCHES "RW61") OR (${MCUX_DEVICE} MATCHES "MCXN.4."))
+  include_driver_ifdef(CONFIG_HAS_MCUX_CACHE		cache/cache64	driver_cache_cache64)
+elseif((${MCUX_DEVICE} MATCHES "MK(28|66)") OR (${MCUX_DEVICE} MATCHES "MKE(14|16|18)") OR (CONFIG_SOC_MIMXRT1166_CM4) OR (CONFIG_SOC_MIMXRT1176_CM4))
+  include_driver_ifdef(CONFIG_HAS_MCUX_CACHE		cache/lmem	driver_cache_lmem)
+endif()
+  include_driver_ifdef(CONFIG_HAS_MCUX_XCACHE		cache/xcache	driver_cache_xcache)
+
+if ((${MCUX_DEVICE} MATCHES "MIMX9596") OR (${MCUX_DEVICE} MATCHES "MIMX8UD7") OR (${MCUX_DEVICE} MATCHES "MIMXRT118"))
+  include_driver_ifdef(CONFIG_IPM_IMX			mu1		driver_mu1)
+  include_driver_ifdef(CONFIG_MBOX_NXP_IMX_MU		mu1		driver_mu1)
+else()
+  include_driver_ifdef(CONFIG_IPM_IMX			mu		driver_mu)
+  include_driver_ifdef(CONFIG_MBOX_NXP_IMX_MU		mu		driver_mu)
+endif()
+
+if(CONFIG_CPU_CORTEX_A)
+  include_driver_ifdef(CONFIG_HAS_MCUX_CACHE		cache/armv8-a	driver_cache_armv8a)
+endif()
+
+if (${MCUX_DEVICE} MATCHES "MIMXRT11[0-9][0-9]")
+   include_driver_ifdef(CONFIG_PM_MCUX_GPC		gpc_3		driver_gpc_3)
+   include_ifdef(CONFIG_HWINFO_MCUX_SRC_V2		driver_soc_src)
+   include_driver_ifdef(CONFIG_WDT_MCUX_RTWDOG		soc_src		driver_soc_src)
+elseif (${MCUX_DEVICE} MATCHES "MIMXRT10[0-9][0-9]")
+   include_driver_ifdef(CONFIG_PM_MCUX_GPC		gpc_1		driver_gpc_1)
+   include_driver_ifdef(CONFIG_PM_MCUX_DCDC		dcdc_1		driver_dcdc_1)
+   include_driver_ifdef(CONFIG_PM_MCUX_PMU		pmu		driver_pmu)
+endif()
+
+if((${MCUX_DEVICE} MATCHES "RW61") AND (NOT DEFINED CONFIG_MINIMAL_LIBC))
+	# Whenever building for RW61x without minimal LIBC, use optimized memcpy.
+	# This will avoid issues with unaligned access to peripheral RAM regions
+	# caused by the memcpy implementation in newlib
+	zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/utilities/misc_utilities/fsl_memcpy.S)
+endif()
+
+
+if("${CONFIG_SOC_FAMILY}" STREQUAL "nxp_kinetis")
+
+  include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		flash		driver_flash)
+
+  include(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/port/driver_port.cmake)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/port)
+
+  if(${MCUX_DEVICE} MATCHES "MK(80|82|64|66|M34|M35|E14F|E16F|E18F|22F12)")
+    include(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/sysmpu/driver_sysmpu.cmake)
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/sysmpu)
+  endif()
+
+endif()
+
+if(CONFIG_SOC_SERIES_MCXC)
+    include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		flash		driver_flash)
+elseif(CONFIG_SOC_SERIES_MCXA)
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/mcxa_romapi)
+elseif(CONFIG_SOC_SERIES_MCXN)
+    include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		mcx_romapi	driver_flashiap)
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/mcx_romapi/flash)
+elseif(CONFIG_SOC_SERIES_MCXW)
+    include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		flash_k4	driver_flash_k4)
+endif()
+
+# Temporary change to handle LPC SOC family name change between HWMv1 and HWMv2
+if(("${CONFIG_SOC_FAMILY}" STREQUAL "lpc") OR ("${CONFIG_SOC_FAMILY}" STREQUAL "nxp_lpc"))
+
+if ((${MCUX_DEVICE} MATCHES "LPC8[0-9][0-9]") OR (${MCUX_DEVICE} MATCHES "LPC5(1|4)"))
+  include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		iap		driver_iap)
+  include_driver_ifdef(CONFIG_ENTROPY_MCUX_RNG		iap		driver_rng)
+elseif (${MCUX_DEVICE} MATCHES "LPC55")
+  if (${MCUX_DEVICE} MATCHES "LPC55S*3")
+   if(${CONFIG_SOC_FLASH_MCUX})
+      list(APPEND CMAKE_MODULE_PATH
+        ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/LPC55S36/drivers
+      )
+      zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/devices/LPC55S36/drivers/flash)
+      include(driver_flashiap)
+    endif()
+  else()
+    include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		iap1		driver_iap1)
+  endif()
+  include_driver_ifdef(CONFIG_ENTROPY_MCUX_RNG		rng_1		driver_rng_1)
+endif()
+
+if (${MCUX_DEVICE} MATCHES "LPC5")
+  include(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/lpc_iocon/driver_lpc_iocon.cmake)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/lpc_iocon)
+  if (${MCUX_DEVICE} MATCHES "LPC55S*3" AND (DEFINED CONFIG_ADC_MCUX_LPADC OR DEFINED CONFIG_DAC_MCUX_LPDAC))
+    include(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/vref_1/driver_vref_1.cmake)
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/vref_1)
+  endif()
+elseif (${MCUX_DEVICE} MATCHES "LPC8")
+  include(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/lpc_iocon_lite/driver_lpc_iocon_lite.cmake)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/lpc_iocon_lite)
+endif()
+
+endif()
+
+if(${MCUX_DEVICE} MATCHES "MIMXRT(5|6)")
+  include(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/lpc_iopctl/driver_lpc_iopctl.cmake)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/lpc_iopctl)
+endif()
+
+if(CONFIG_SOC_FAMILY_NXP_IMXRT)
+  include_driver_ifdef(CONFIG_ETH_NXP_ENET ocotp driver_ocotp)
+endif()
+
+if (CONFIG_USB_DEVICE_DRIVER)
+  set(CONFIG_USE_component_osa_zephyr true)
+
+  list(APPEND CMAKE_MODULE_PATH
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux-sdk/components/osa
+  )
+
+  list(APPEND CMAKE_MODULE_PATH
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb
+  )
+  include(middleware_usb_phy)
+  include_ifdef(CONFIG_USB_DC_NXP_EHCI         middleware_usb_device_ehci)
+  include_ifdef(CONFIG_USB_DC_NXP_LPCIP3511    middleware_usb_device_ip3511fs)
+  include(set_component_osa)
+
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/device)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/phy)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/include)
+endif()
+
+if (CONFIG_UDC_DRIVER)
+  set(CONFIG_USE_component_osa_zephyr true)
+
+  list(APPEND CMAKE_MODULE_PATH
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux-sdk/components/osa
+  )
+
+  list(APPEND CMAKE_MODULE_PATH
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb
+  )
+  include_ifdef(CONFIG_DT_HAS_NXP_USBPHY_ENABLED  middleware_usb_phy)
+  include_ifdef(CONFIG_UDC_NXP_EHCI               middleware_usb_device_ehci)
+  include_ifdef(CONFIG_UDC_NXP_IP3511             middleware_usb_device_ip3511fs)
+  include(set_component_osa)
+
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/device)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/phy)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/include)
+endif()
+
+if(${MCUX_DEVICE} MATCHES "RW61")
+  set(CONFIG_USE_component_osa_zephyr true)
+  if(CONFIG_NXP_FW_LOADER)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/components/flash/mflash)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/components/flash/mflash/rdrw612bga)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/drivers/cache/cache64)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/drivers/flexspi)
+    include(component_mflash_rdrw610)
+  endif()
+endif()
+
+if(${CONFIG_USE_component_osa_zephyr})
+  zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/components/osa)
+endif()
+
+include_ifdef(CONFIG_USE_component_osa_zephyr set_component_osa)
+
+if(CONFIG_WIFI_NXP)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/components/wifi_bt_module)
+    include(component_wifi_bt_module_tx_pwr_limits)
+endif()
+
+if(CONFIG_NXP_FW_LOADER)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/components/conn_fwloader)
+    include(driver_conn_fwloader)
+endif()
+
+if(CONFIG_NXP_RF_IMU)
+  if(CONFIG_SOC_SERIES_RW6XX)
+      list(APPEND CMAKE_MODULE_PATH
+          ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/components/rpmsg
+          ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/imu
+          ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/gdma
+      )
+    include(component_wireless_imu_adapter)
+  elseif(CONFIG_SOC_SERIES_MCXW)
+      zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/components/rpmsg)
+      zephyr_library_sources(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/components/rpmsg/fsl_adapter_rpmsg.c)
+      include(component_lists)
+      zephyr_compile_definitions(HAL_RPMSG_SELECT_ROLE=0U)
+  endif()
+endif()
+
+if(${MCUX_DEVICE} MATCHES "MCXW")
+  list(APPEND CMAKE_MODULE_PATH
+      ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/ccm32k
+  )
+
+  include(driver_ccm32k)
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/ccm32k)
+endif()
diff --git a/modules/hal_nxp/s32/CMakeLists.txt b/modules/hal_nxp/s32/CMakeLists.txt
new file mode 100644
index 0000000000000..f61365b42a18b
--- /dev/null
+++ b/modules/hal_nxp/s32/CMakeLists.txt
@@ -0,0 +1,104 @@
+# Copyright 2022-2025 NXP
+
+# Set the SoC specific drivers and configuration to build
+if(HWMv2)
+  set(SOC_BASE ${CONFIG_SOC})
+else()
+  if(${CONFIG_SOC} STREQUAL "s32z27")
+    set(SOC_BASE "s32z270")
+  else()
+    set(SOC_BASE ${CONFIG_SOC})
+  endif()
+endif()
+
+add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/s32/drivers/${SOC_SERIES} hal_nxp/s32/drivers)
+add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR}/s32/soc/${SOC_BASE} hal_nxp/s32/soc)
+
+if(CONFIG_HAS_MCUX)
+
+  # This is an adaptation from hal_nxp/mcux/CMakeLists.txt entry CMake in order
+  # to build MCUX drivers together with RTD drivers for NXP S32 devices.
+  # MCUX don't have official support for NXP S32 devices but we are leveraging
+  # the existing shim drivers in Zephyr for those hardware blocks which are
+  # present in both NXP S32 and non NXP S32 devices.
+  #
+  # Glue code must be added for each device supported to build with MCUX. This
+  # can be found in hal_nxp/s32/mcux/devices:
+  # - s32/mcux/devices/${MCUX_DEVICE}/${MCUX_DEVICE}_device.h
+  #   redefine RTD module's peripheral access layers and its register masks to be
+  #   compatible with MCUX drivers for incompatible peripherals
+  # - s32/mcux/devices/${MCUX_DEVICE}/${MCUX_DEVICE}_features.h
+  #   define SoC module's features
+  # - s32/mcux/devices/${MCUX_DEVICE}/${MCUX_DEVICE}_glue_mcux.h
+  #   redefine RTD module's base addresses/pointers/interrupts to be compatible
+  #   with MCUX drivers
+  # - s32/mcux/devices/${MCUX_DEVICE}/fsl_device_registers.h
+  #   expose device features to the MCUX drivers
+  # - s32/mcux/devices/${MCUX_DEVICE}/drivers/fsl_clock.h
+  #   required by mcux/mcux-sdk/drivers/common/fsl_common_arm.h (at least)
+  # - s32/mcux/devices/${MCUX_DEVICE}/drivers/driver_reset.cmake
+  #   required by mcux/mcux-sdk/drivers/common/drivers_common.cmake
+  # - s32/mcux/devices/${MCUX_DEVICE}/device_system.cmake
+  #   required by mcux/hal_nxp.cmake
+  # - s32/mcux/devices/${MCUX_DEVICE}/device_CMSIS.cmake
+  #   required by mcux/mcux-sdk/drivers/common/drivers_common.cmake for non DSP
+  #   architectures
+
+  function(include_mcux_driver_ifdef feature_toggle directory module)
+    if(${${feature_toggle}})
+      list(APPEND CMAKE_MODULE_PATH
+          ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/${directory}
+      )
+      zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/${directory})
+      include(${module})
+      message(STATUS "directory ${directory} included")
+    endif()
+  endfunction()
+
+  set(MCUX_SDK_PROJECT_NAME ${ZEPHYR_CURRENT_LIBRARY})
+
+  # Translate the SoC name into the MCUX device
+  string(TOUPPER ${SOC_BASE} MCUX_DEVICE)
+
+  # This is normally done in mcux/hal_nxp.cmake, but we need to point to the
+  # path on this directory instead
+  list(APPEND CMAKE_MODULE_PATH
+    ${ZEPHYR_CURRENT_MODULE_DIR}/s32/mcux/devices/${MCUX_DEVICE}
+    ${ZEPHYR_CURRENT_MODULE_DIR}/s32/mcux/devices/${MCUX_DEVICE}/drivers
+  )
+
+  # MCUX uses the CPU name to expose SoC-specific features of a given peripheral
+  zephyr_compile_definitions(CPU_${MCUX_DEVICE})
+
+  # Clock control is supported through RTD, so disable it in the MCUX drivers
+  zephyr_compile_definitions(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL=1)
+
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/s32/mcux/devices/${MCUX_DEVICE})
+  zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/s32/mcux/devices/${MCUX_DEVICE}/drivers)
+
+  zephyr_linker_sources(RWDATA
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/quick_access_data.ld
+  )
+  zephyr_linker_sources_ifdef(CONFIG_ARCH_HAS_RAMFUNC_SUPPORT
+    RAMFUNC_SECTION
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/quick_access_code.ld
+  )
+  zephyr_linker_sources_ifdef(CONFIG_NOCACHE_MEMORY
+    NOCACHE_SECTION
+    ${ZEPHYR_CURRENT_MODULE_DIR}/mcux/nocache.ld
+  )
+
+  # Entry CMake component for MCUX
+  include(${CMAKE_CURRENT_LIST_DIR}/../mcux/mcux-sdk/CMakeLists.txt)
+
+  if(${MCUX_DEVICE} MATCHES "S32K1")
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/port)
+    include_mcux_driver_ifdef(CONFIG_PINCTRL port driver_port)
+
+    zephyr_include_directories(${ZEPHYR_CURRENT_MODULE_DIR}/mcux/mcux-sdk/drivers/sysmpu)
+    include_mcux_driver_ifdef(CONFIG_ARM_MPU sysmpu driver_sysmpu)
+
+    include_mcux_driver_ifdef(CONFIG_HAS_MCUX_CACHE cache/lmem driver_cache_lmem)
+  endif()
+
+endif()
diff --git a/modules/Kconfig.nxp_s32 b/modules/hal_nxp/s32/Kconfig.nxp_s32
similarity index 100%
rename from modules/Kconfig.nxp_s32
rename to modules/hal_nxp/s32/Kconfig.nxp_s32
diff --git a/modules/hal_nxp/usb/CMakeLists.txt b/modules/hal_nxp/usb/CMakeLists.txt
deleted file mode 100644
index da427e3601b8c..0000000000000
--- a/modules/hal_nxp/usb/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2021,2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-zephyr_include_directories(.)
-if(CONFIG_DT_HAS_NXP_USBPHY_ENABLED)
-zephyr_include_directories(${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/middleware/mcux-sdk-middleware-usb/phy)
-endif()
diff --git a/modules/hal_rpi_pico/CMakeLists.txt b/modules/hal_rpi_pico/CMakeLists.txt
index 0a02aeae89299..046660a929a3d 100644
--- a/modules/hal_rpi_pico/CMakeLists.txt
+++ b/modules/hal_rpi_pico/CMakeLists.txt
@@ -61,7 +61,6 @@ if(CONFIG_HAS_RPI_PICO)
     ${rp2_common_dir}/hardware_clocks/clocks.c
     ${rp2_common_dir}/hardware_pll/pll.c
     ${rp2_common_dir}/hardware_xosc/xosc.c
-    ${rp2_common_dir}/hardware_watchdog/watchdog.c
     ${rp2_common_dir}/hardware_sync_spin_lock/sync_spin_lock.c
     ${rp2_common_dir}/hardware_ticks/ticks.c
     ${rp2_common_dir}/pico_bootrom/bootrom.c
diff --git a/modules/hal_silabs/simplicity_sdk/src/blob_stubs.c b/modules/hal_silabs/simplicity_sdk/src/blob_stubs.c
index 8a2ff15438606..ad06b11d61ea5 100644
--- a/modules/hal_silabs/simplicity_sdk/src/blob_stubs.c
+++ b/modules/hal_silabs/simplicity_sdk/src/blob_stubs.c
@@ -31,6 +31,11 @@ void BTLE_LL_Process(uint32_t events)
 {
 }
 
+int16_t BTLE_LL_SetMaxPower(int16_t power)
+{
+	return 0;
+}
+
 void sl_btctrl_disable_2m_phy(void)
 {
 }
diff --git a/modules/hal_silabs/wiseconnect/CMakeLists.txt b/modules/hal_silabs/wiseconnect/CMakeLists.txt
index a7f83f6d7c76b..7ca5909189b58 100644
--- a/modules/hal_silabs/wiseconnect/CMakeLists.txt
+++ b/modules/hal_silabs/wiseconnect/CMakeLists.txt
@@ -22,8 +22,10 @@ zephyr_compile_definitions(
 zephyr_include_directories(
   ${SISDK_DIR}/platform/common/inc
   ${SISDK_DIR}/platform/common/config
+  ${WISECONNECT_DIR}/components/board/silabs/inc
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/core/config
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/core/chip/inc
+  ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/core/chip/config
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/rom_driver/inc
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/peripheral_drivers/inc
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/service/clock_manager/inc
@@ -40,11 +42,15 @@ zephyr_library_sources(
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/core/chip/src/rsi_deepsleep_soc.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/core/chip/src/system_si91x.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/peripheral_drivers/src/clock_update.c
+  ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/peripheral_drivers/src/rsi_pwm.c
+  ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/peripheral_drivers/src/rsi_sysrtc.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/systemlevel/src/rsi_ipmu.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/systemlevel/src/rsi_pll.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/systemlevel/src/rsi_ulpss_clk.c
+  ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/systemlevel/src/rsi_wwdt.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/service/clock_manager/src/sl_si91x_clock_manager.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/unified_api/src/sl_si91x_driver_gpio.c
+  ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/unified_api/src/sl_si91x_pwm.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/unified_peripheral_drivers/src/sl_si91x_peripheral_gpio.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/core/chip/src/iPMU_prog/iPMU_dotc/ipmu_apis.c
   ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/core/chip/src/iPMU_prog/iPMU_dotc/rsi_system_config_917.c
@@ -145,5 +151,23 @@ if(CONFIG_WISECONNECT_NETWORK_STACK)
   )
 endif() # CONFIG_WISECONNECT_NETWORK_STACK
 
+if(CONFIG_SOC_SILABS_SLEEPTIMER)
+  zephyr_include_directories(
+    ${SISDK_DIR}/platform/service/sleeptimer/inc
+    ${SISDK_DIR}/platform/service/sleeptimer/src
+    ${SISDK_DIR}/platform/service/sleeptimer/config
+  )
+
+  zephyr_library_sources(
+    ${SISDK_DIR}/platform/service/sleeptimer/src/sl_sleeptimer.c
+    ${WISECONNECT_DIR}/components/device/silabs/si91x/mcu/drivers/service/sleeptimer/src/sl_sleeptimer_hal_si91x_sysrtc.c
+  )
+  zephyr_compile_definitions(
+    SL_CATALOG_SLEEPTIMER_PRESENT
+    SL_CODE_COMPONENT_SLEEPTIMER=sleeptimer
+    SL_CODE_COMPONENT_HAL_SYSRTC=hal_sysrtc
+  )
+endif() # CONFIG_SOC_SILABS_SLEEPTIMER
+
 zephyr_linker_sources(ROM_SECTIONS linker/code_classification_text.ld)
 zephyr_linker_sources(RAMFUNC_SECTION linker/code_classification_ramfunc.ld)
diff --git a/modules/hal_tdk/Kconfig b/modules/hal_tdk/Kconfig
index 0e876177010b5..964c051345869 100644
--- a/modules/hal_tdk/Kconfig
+++ b/modules/hal_tdk/Kconfig
@@ -30,4 +30,9 @@ config USE_EMD_ICP101XX
 	depends on ZEPHYR_HAL_TDK_MODULE
 	depends on DT_HAS_INVENSENSE_ICP101XX_ENABLED
 
+config USE_EMD_ICP201XX
+	bool "ICP201XX Barometric Pressure and Temperature Sensor"
+	imply TDK_HAL
+	depends on ZEPHYR_HAL_TDK_MODULE
+	depends on DT_HAS_INVENSENSE_ICP201XX_ENABLED
 endmenu
diff --git a/modules/hal_wch/CMakeLists.txt b/modules/hal_wch/CMakeLists.txt
index 822f83b867b29..ad16ad6c62b84 100644
--- a/modules/hal_wch/CMakeLists.txt
+++ b/modules/hal_wch/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(CONFIG_SOC_CH32V003)
+if(CONFIG_SOC_CH32V003 OR CONFIG_SOC_SERIES_QINGKE_V4C)
   zephyr_include_directories(${ZEPHYR_HAL_WCH_MODULE_DIR}/ch32v003fun .)
 endif()
diff --git a/modules/hal_wch/ch32fun.h b/modules/hal_wch/ch32fun.h
index b239ed5f61bc8..555bcd3e75b71 100644
--- a/modules/hal_wch/ch32fun.h
+++ b/modules/hal_wch/ch32fun.h
@@ -12,4 +12,9 @@
 #include <ch32v003fun.h>
 #endif
 
+#if defined(CONFIG_SOC_SERIES_QINGKE_V4C)
+#define CH32V20x 1
+#include <ch32v003fun.h>
+#endif
+
 #endif
diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 3e0bc2ddc4c8a..c30faaf9e5d34 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -249,6 +249,11 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
   ${WIFI_NM_HOSTAPD_BASE}/eap_register.c
   ${WIFI_NM_HOSTAPD_BASE}/hostapd_cli_cmds.c
   ${WIFI_NM_HOSTAPD_BASE}/hostapd_cli_zephyr.c
+
+  # Zephyr specific files (glue code)
+  src/hapd_main.c
+  src/hapd_api.c
+  src/hapd_events.c
 )
 
 zephyr_library_compile_definitions_ifdef(CONFIG_WIFI_NM_HOSTAPD_AP
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index eef7d9391abc3..a835ebad9c0ee 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -10,7 +10,6 @@ config WIFI_NM_WPA_SUPPLICANT
 	select POSIX_TIMERS
 	select POSIX_SIGNALS
 	select POSIX_API
-	select FILE_SYSTEM
 	select NET_SOCKETS
 	select NET_SOCKETS_PACKET
 	select NET_SOCKETPAIR
@@ -25,12 +24,16 @@ if WIFI_NM_WPA_SUPPLICANT
 
 config HEAP_MEM_POOL_ADD_SIZE_HOSTAP
 	def_int 66560 if WIFI_NM_HOSTAPD_AP
-	def_int 41808 if WIFI_NM_WPA_SUPPLICANT_AP || WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	def_int 48000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	def_int 41808 if WIFI_NM_WPA_SUPPLICANT_AP
 	# 30K is mandatory, but might need more for long duration use cases
 	def_int 30000
 
 config WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE
 	int "Stack size for wpa_supplicant thread"
+	# TODO: Providing higher stack size for Enterprise mode to fix stack
+	# overflow issues. Need to identify the cause for higher stack usage.
+	default 8192 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	default 5600
 
 config WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE
@@ -131,6 +134,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT
 	select MBEDTLS_CIPHER_DES_ENABLED
 	select MBEDTLS_MD5
 	select MBEDTLS_SHA1
+	select MBEDTLS_SHA384
 	select MBEDTLS_ENTROPY_C
 	select MBEDTLS_CIPHER
 	select MBEDTLS_ECP_C
@@ -174,6 +178,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 	select PSA_WANT_ALG_SHA_384
 	select PSA_WANT_ALG_SHA_512
 	select PSA_WANT_ALG_PBKDF2_HMAC
+	select PSA_WANT_ALG_CMAC
 	select PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
@@ -183,8 +188,8 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA
 
 config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	bool "Enterprise Crypto support for WiFi"
-	select MBEDTLS_PEM_CERTIFICATE_FORMAT
-	select MBEDTLS_SERVER_NAME_INDICATION
+	select MBEDTLS_PEM_CERTIFICATE_FORMAT if MBEDTLS_BUILTIN
+	select MBEDTLS_SERVER_NAME_INDICATION if MBEDTLS_BUILTIN
 	select MBEDTLS_X509_CRL_PARSE_C
 	select MBEDTLS_TLS_VERSION_1_2
 	depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE
@@ -289,6 +294,7 @@ config WIFI_NM_HOSTAPD_AP
 
 config WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
 	bool "Hostapd crypto enterprise support"
+	depends on WIFI_NM_HOSTAPD_AP
 
 config EAP_SERVER_TLS
 	bool "EAP-TLS server support"
@@ -341,6 +347,7 @@ config WIFI_NM_WPA_SUPPLICANT_DPP
 	bool "WFA Easy Connect DPP"
 	select DPP
 	select DPP2
+	select DPP3
 	select GAS
 	select GAS_SERVER
 	select OFFCHANNEL
diff --git a/modules/hostap/src/hapd_api.c b/modules/hostap/src/hapd_api.c
new file mode 100644
index 0000000000000..97367d35c531c
--- /dev/null
+++ b/modules/hostap/src/hapd_api.c
@@ -0,0 +1,1032 @@
+/**
+ * Copyright 2023-2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/net/wifi_mgmt.h>
+#include "includes.h"
+#include "common.h"
+#include "common/defs.h"
+#include "wpa_supplicant_i.h"
+#include "hostapd.h"
+#include "hostapd_cli_zephyr.h"
+#include "ap_drv_ops.h"
+#include "hapd_main.h"
+#include "hapd_api.h"
+#include "supp_events.h"
+#include "supp_api.h"
+
+K_MUTEX_DEFINE(hostapd_mutex);
+
+#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+static struct wifi_eap_config hapd_eap_config[] = {
+	{WIFI_SECURITY_TYPE_EAP_TLS, WIFI_EAP_TYPE_TLS, WIFI_EAP_TYPE_NONE, "TLS", NULL},
+	{WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_MSCHAPV2, "PEAP",
+	 "auth=MSCHAPV2"},
+	{WIFI_SECURITY_TYPE_EAP_PEAP_GTC, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_GTC, "PEAP",
+	 "auth=GTC"},
+	{WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2, WIFI_EAP_TYPE_TTLS, WIFI_EAP_TYPE_NONE, "TTLS",
+	 "auth=MSCHAPV2"},
+	{WIFI_SECURITY_TYPE_EAP_PEAP_TLS, WIFI_EAP_TYPE_PEAP, WIFI_EAP_TYPE_TLS, "PEAP",
+	 "auth=TLS"},
+};
+
+static struct wifi_enterprise_creds_params hapd_enterprise_creds;
+#endif
+
+#define hostapd_cli_cmd_v(cmd, ...) ({					\
+	bool status;							\
+									\
+	if (zephyr_hostapd_cli_cmd_v(cmd, ##__VA_ARGS__) < 0) {		\
+		wpa_printf(MSG_ERROR,					\
+			   "Failed to execute wpa_cli command: %s",	\
+			   cmd);					\
+		status = false;						\
+	} else {							\
+		status = true;						\
+	}								\
+									\
+	status;								\
+})
+
+static inline struct hostapd_iface *get_hostapd_handle(const struct device *dev)
+{
+	struct net_if *iface = net_if_lookup_by_dev(dev);
+	char if_name[CONFIG_NET_INTERFACE_NAME_LEN + 1];
+	struct hostapd_iface *hapd;
+	int ret;
+
+	if (!iface) {
+		wpa_printf(MSG_ERROR, "Interface for device %s not found", dev->name);
+		return NULL;
+	}
+
+	ret = net_if_get_name(iface, if_name, sizeof(if_name));
+	if (!ret) {
+		wpa_printf(MSG_ERROR, "Cannot get interface name (%d)", ret);
+		return NULL;
+	}
+
+	hapd = zephyr_get_hapd_handle_by_ifname(if_name);
+	if (!hapd) {
+		wpa_printf(MSG_ERROR, "Interface %s not found", if_name);
+		return NULL;
+	}
+
+	return hapd;
+}
+
+#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+static int hapd_process_cert_data(struct hostapd_bss_config *conf,
+				  char *type, uint8_t *data, uint32_t data_len)
+{
+	if (os_strcmp(type, "ca_cert_blob") == 0) {
+		conf->ca_cert_blob = data;
+		conf->ca_cert_blob_len = data_len;
+	} else if (os_strcmp(type, "server_cert_blob") == 0) {
+		conf->server_cert_blob = data;
+		conf->server_cert_blob_len = data_len;
+	} else if (os_strcmp(type, "private_key_blob") == 0) {
+		conf->private_key_blob = data;
+		conf->private_key_blob_len = data_len;
+	} else if (os_strcmp(type, "dh_blob") == 0) {
+		conf->dh_blob = data;
+		conf->dh_blob_len = data_len;
+	} else {
+		wpa_printf(MSG_ERROR, "input type error");
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static int hapd_get_eap_config(struct wifi_connect_req_params *params,
+			       struct wifi_eap_config *eap_cfg)
+{
+	unsigned int index = 0;
+
+	for (index = 0; index < ARRAY_SIZE(hapd_eap_config); index++) {
+		if (params->security == hapd_eap_config[index].type) {
+			memcpy(eap_cfg, &hapd_eap_config[index], sizeof(struct wifi_eap_config));
+			break;
+		}
+	}
+
+	if (index == ARRAY_SIZE(hapd_eap_config)) {
+		wpa_printf(MSG_ERROR, "Get eap method type with security type: %d",
+		params->security);
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static struct hostapd_eap_user *hapd_process_eap_user_phase1(
+	struct wifi_connect_req_params *params, struct hostapd_eap_user **pnew_user)
+{
+	struct hostapd_eap_user *user = NULL, *tail = NULL, *new_user = NULL;
+	struct wifi_eap_config eap_cfg;
+
+	user = os_zalloc(sizeof(*user));
+	if (user == NULL) {
+		wpa_printf(MSG_ERROR, "EAP user allocation failed");
+		goto failed;
+	}
+
+	user->force_version = -1;
+	if (params->eap_ver >= 0) {
+		user->force_version = params->eap_ver;
+	}
+
+	if (hapd_get_eap_config(params, &eap_cfg)) {
+		goto failed;
+	}
+
+	user->methods[0].method = eap_cfg.eap_type_phase1;
+	user->methods[0].vendor = 0;
+
+	if (tail == NULL) {
+		tail = new_user = user;
+	} else {
+		tail->next = user;
+		tail       = user;
+	}
+
+	*pnew_user = new_user;
+
+	return tail;
+
+failed:
+	if (user) {
+		hostapd_config_free_eap_user(user);
+	}
+
+	return NULL;
+}
+
+static int hapd_process_eap_user(struct wifi_connect_req_params *params,
+				 struct hostapd_bss_config *conf)
+{
+	struct hostapd_eap_user *user = NULL, *tail = NULL, *user_list = NULL;
+	int i, nusers = params->nusers;
+	const char *identity, *password;
+	struct wifi_eap_config eap_cfg;
+	int ret = 0;
+
+	if (hapd_get_eap_config(params, &eap_cfg)) {
+		goto failed;
+	}
+
+	if (eap_cfg.phase2 != NULL) {
+		tail = hapd_process_eap_user_phase1(params, &user_list);
+	}
+
+	if (eap_cfg.phase2 != NULL && !nusers) {
+		wpa_printf(MSG_ERROR, "EAP users not found.");
+		goto failed;
+	}
+
+	for (i = 0; i < nusers; i++) {
+		user = os_zalloc(sizeof(*user));
+		if (user == NULL) {
+			wpa_printf(MSG_ERROR, "EAP user allocation failed");
+			goto failed;
+		}
+
+		user->force_version = -1;
+		if (params->eap_ver >= 0) {
+			user->force_version = params->eap_ver;
+		}
+
+		identity = params->identities[i];
+		password = params->passwords[i];
+
+		user->identity = os_memdup(identity, os_strlen(identity));
+		if (user->identity == NULL) {
+			wpa_printf(MSG_ERROR,
+				   "Failed to allocate "
+				   "memory for EAP identity");
+			goto failed;
+		}
+		user->identity_len = os_strlen(identity);
+
+		user->methods[0].method = eap_cfg.eap_type_phase1;
+		user->methods[0].vendor = 0;
+
+		if (eap_cfg.phase2 != NULL) {
+			user->methods[0].method = eap_cfg.eap_type_phase2;
+			user->password = os_memdup(password, os_strlen(password));
+			if (user->password == NULL) {
+				wpa_printf(MSG_ERROR,
+					   "Failed to allocate "
+					   "memory for EAP password");
+				goto failed;
+			}
+			user->password_len = os_strlen(password);
+
+			user->phase2 = 1;
+		}
+
+		if (params->security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2) {
+			user->ttls_auth |= 0x1E;
+		}
+
+		if (tail == NULL) {
+			tail = user_list = user;
+		} else {
+			tail->next = user;
+			tail       = user;
+		}
+
+		continue;
+
+failed:
+		if (user) {
+			hostapd_config_free_eap_user(user);
+		}
+
+		ret = -1;
+		break;
+	}
+
+	if (ret == 0) {
+		hostapd_config_free_eap_users(conf->eap_user);
+		conf->eap_user = user_list;
+	} else {
+		hostapd_config_free_eap_users(user_list);
+	}
+
+	return ret;
+}
+
+int hapd_process_enterprise_config(struct hostapd_iface *iface,
+				   struct wifi_connect_req_params *params)
+{
+	struct wifi_eap_cipher_config cipher_config = {
+		NULL, "DEFAULT:!EXP:!LOW", "CCMP", "CCMP", "AES-128-CMAC", NULL};
+	int ret = 0;
+
+	if (process_cipher_config(params, &cipher_config)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set wpa %d", WPA_PROTO_RSN)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set wpa_key_mgmt %s", cipher_config.key_mgmt)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set rsn_pairwise %s", cipher_config.pairwise_cipher)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set wpa_pairwise %s", cipher_config.pairwise_cipher)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set group_cipher %s", cipher_config.group_cipher)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set group_mgmt_cipher %s", cipher_config.group_mgmt_cipher)) {
+		goto out;
+	}
+
+	if (cipher_config.tls_flags != NULL) {
+		if (!hostapd_cli_cmd_v("set tls_flags %s", cipher_config.tls_flags)) {
+			goto out;
+		}
+	}
+
+	if (!hostapd_cli_cmd_v("set ieee8021x %d", 1)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set eapol_version %d", 2)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set eap_server %d", 1)) {
+		goto out;
+	}
+
+	if (hapd_process_cert_data(iface->bss[0]->conf, "ca_cert_blob",
+		hapd_enterprise_creds.ca_cert, hapd_enterprise_creds.ca_cert_len)) {
+		goto out;
+	}
+
+	if (hapd_process_cert_data(iface->bss[0]->conf, "server_cert_blob",
+		hapd_enterprise_creds.server_cert, hapd_enterprise_creds.server_cert_len)) {
+		goto out;
+	}
+
+	if (hapd_process_cert_data(iface->bss[0]->conf, "private_key_blob",
+		hapd_enterprise_creds.server_key, hapd_enterprise_creds.server_key_len)) {
+		goto out;
+	}
+
+	if (hapd_process_cert_data(iface->bss[0]->conf, "dh_blob",
+		hapd_enterprise_creds.dh_param, hapd_enterprise_creds.dh_param_len)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set private_key_passwd %s", params->key_passwd)) {
+		goto out;
+	}
+
+	if (hapd_process_eap_user(params, iface->bss[0]->conf)) {
+		goto out;
+	}
+
+	return ret;
+out:
+	return -1;
+}
+
+int hostapd_add_enterprise_creds(const struct device *dev,
+				 struct wifi_enterprise_creds_params *creds)
+{
+	int ret = 0;
+
+	if (!creds) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "enterprise creds is NULL");
+		goto out;
+	}
+
+	memcpy((void *)&hapd_enterprise_creds, (void *)creds,
+	       sizeof(struct wifi_enterprise_creds_params));
+
+out:
+	return ret;
+}
+#endif
+
+bool hostapd_ap_reg_domain(struct wifi_reg_domain *reg_domain)
+{
+	return hostapd_cli_cmd_v("set country_code %s", reg_domain->country_code);
+}
+
+static int hapd_config_chan_center_seg0(struct wifi_connect_req_params *params)
+{
+	int ret = 0;
+	uint8_t center_freq_seg0_idx = 0;
+	uint8_t oper_chwidth = CHANWIDTH_USE_HT;
+	const uint8_t *center_freq = NULL;
+	static const uint8_t center_freq_40MHz[] = {38,  46,  54,  62,  102, 110,
+						    118, 126, 134, 142, 151, 159};
+	static const uint8_t center_freq_80MHz[] = {42, 58, 106, 122, 138, 155};
+	uint8_t index, index_max, chan_idx, ch_offset = 0;
+
+	/* Unless ACS is being used, both "channel" and "vht_oper_centr_freq_seg0_idx"
+	 * parameters must be set.
+	 */
+	switch (params->bandwidth) {
+	case WIFI_FREQ_BANDWIDTH_20MHZ:
+		oper_chwidth = CHANWIDTH_USE_HT;
+		center_freq_seg0_idx = params->channel;
+		break;
+	case WIFI_FREQ_BANDWIDTH_40MHZ:
+		oper_chwidth = CHANWIDTH_USE_HT;
+		center_freq = center_freq_40MHz;
+		index_max = ARRAY_SIZE(center_freq_40MHz);
+		ch_offset = 2;
+		break;
+	case WIFI_FREQ_BANDWIDTH_80MHZ:
+		oper_chwidth = CHANWIDTH_80MHZ;
+		center_freq = center_freq_80MHz;
+		index_max = ARRAY_SIZE(center_freq_80MHz);
+		ch_offset = 6;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	if (params->bandwidth != WIFI_FREQ_BANDWIDTH_20MHZ) {
+		chan_idx = params->channel;
+		for (index = 0; index < index_max; index++) {
+			if ((chan_idx >= (center_freq[index] - ch_offset)) &&
+			    (chan_idx <= (center_freq[index] + ch_offset))) {
+				center_freq_seg0_idx = center_freq[index];
+				break;
+			}
+		}
+	}
+
+	if (!hostapd_cli_cmd_v("set vht_oper_chwidth %d", oper_chwidth)) {
+		goto out;
+	}
+	if (!hostapd_cli_cmd_v("set vht_oper_centr_freq_seg0_idx %d", center_freq_seg0_idx)) {
+		goto out;
+	}
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
+	if (!hostapd_cli_cmd_v("set he_oper_chwidth %d", oper_chwidth)) {
+		goto out;
+	}
+	if (!hostapd_cli_cmd_v("set he_oper_centr_freq_seg0_idx %d", center_freq_seg0_idx)) {
+		goto out;
+	}
+#endif
+
+	return ret;
+out:
+	return -EINVAL;
+}
+
+int hapd_config_network(struct hostapd_iface *iface,
+			struct wifi_connect_req_params *params)
+{
+	int ret = 0;
+
+	if (!hostapd_cli_cmd_v("set ssid %s", params->ssid)) {
+		goto out;
+	}
+
+	if (params->channel == 0) {
+		if (params->band == 0) {
+			if (!hostapd_cli_cmd_v("set hw_mode g")) {
+				goto out;
+			}
+		} else if (params->band == 1) {
+			if (!hostapd_cli_cmd_v("set hw_mode a")) {
+				goto out;
+			}
+		} else {
+			wpa_printf(MSG_ERROR, "Invalid band %d", params->band);
+			goto out;
+		}
+	} else if (params->channel > 14) {
+		if (!hostapd_cli_cmd_v("set hw_mode a")) {
+			goto out;
+		}
+	} else {
+		if (!hostapd_cli_cmd_v("set hw_mode g")) {
+			goto out;
+		}
+	}
+
+	if (!hostapd_cli_cmd_v("set channel %d", params->channel)) {
+		goto out;
+	}
+
+	ret = hapd_config_chan_center_seg0(params);
+	if (ret) {
+		goto out;
+	}
+
+	if (params->security != WIFI_SECURITY_TYPE_NONE) {
+		if (params->security == WIFI_SECURITY_TYPE_WPA_PSK) {
+			if (!hostapd_cli_cmd_v("set wpa 1")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_pairwise CCMP")) {
+				goto out;
+			}
+		} else if (params->security == WIFI_SECURITY_TYPE_PSK) {
+			if (!hostapd_cli_cmd_v("set wpa 2")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
+				goto out;
+			}
+		} else if (params->security == WIFI_SECURITY_TYPE_PSK_SHA256) {
+			if (!hostapd_cli_cmd_v("set wpa 2")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK-SHA256")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
+				goto out;
+			}
+		} else if (params->security == WIFI_SECURITY_TYPE_SAE_HNP ||
+			   params->security == WIFI_SECURITY_TYPE_SAE_H2E ||
+			   params->security == WIFI_SECURITY_TYPE_SAE_AUTO) {
+			if (!hostapd_cli_cmd_v("set wpa 2")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_key_mgmt SAE")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set sae_password %s",
+					       params->sae_password ? params->sae_password :
+					       params->psk)) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
+				goto out;
+			}
+			if (params->security == WIFI_SECURITY_TYPE_SAE_H2E ||
+			    params->security == WIFI_SECURITY_TYPE_SAE_AUTO) {
+				if (!hostapd_cli_cmd_v("set sae_pwe %d",
+				    (params->security == WIFI_SECURITY_TYPE_SAE_H2E)
+						? 1
+						: 2)) {
+					goto out;
+				}
+			}
+		} else if (params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) {
+			if (!hostapd_cli_cmd_v("set wpa 2")) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK SAE")) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set sae_password %s",
+					       params->sae_password ? params->sae_password
+								    : params->psk)) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
+				goto out;
+			}
+
+			if (!hostapd_cli_cmd_v("set sae_pwe 2")) {
+				goto out;
+			}
+		} else if (params->security == WIFI_SECURITY_TYPE_DPP) {
+			if (!hostapd_cli_cmd_v("set wpa 2")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK DPP")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set wpa_pairwise CCMP")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
+				goto out;
+			}
+			if (!hostapd_cli_cmd_v("set dpp_configurator_connectivity 1")) {
+				goto out;
+			}
+#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+		} else if (is_eap_valid_security(params->security)) {
+			if (hapd_process_enterprise_config(iface, params)) {
+				goto out;
+			}
+#endif
+		} else {
+			wpa_printf(MSG_ERROR, "Security type %d is not supported",
+				   params->security);
+			goto out;
+		}
+	} else {
+		if (!hostapd_cli_cmd_v("set wpa 0")) {
+			goto out;
+		}
+		iface->bss[0]->conf->wpa_key_mgmt = WPA_KEY_MGMT_NONE;
+	}
+
+	if (!hostapd_cli_cmd_v("set ieee80211w %d", params->mfp)) {
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("set ignore_broadcast_ssid %d", params->ignore_broadcast_ssid)) {
+		goto out;
+	}
+
+	return ret;
+out:
+	return -1;
+}
+
+static int set_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params)
+{
+	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
+
+	if (wifi_mgmt_api == NULL || wifi_mgmt_api->ap_config_params == NULL) {
+		return -ENOTSUP;
+	}
+
+	return wifi_mgmt_api->ap_config_params(dev, params);
+}
+
+int hostapd_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params)
+{
+	struct hostapd_iface *iface;
+	int ret = 0;
+
+	ret = set_ap_config_params(dev, params);
+	if (ret && (ret != -ENOTSUP)) {
+		wpa_printf(MSG_ERROR, "Failed to set ap config params");
+		return -EINVAL;
+	}
+
+	k_mutex_lock(&hostapd_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (iface == NULL) {
+		ret = -ENOENT;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	if (iface->state > HAPD_IFACE_DISABLED) {
+		ret = -EBUSY;
+		wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);
+		goto out;
+	}
+
+	if (params->type & WIFI_AP_CONFIG_PARAM_MAX_NUM_STA) {
+		if (!hostapd_cli_cmd_v("set max_num_sta %d", params->max_num_sta)) {
+			ret = -EINVAL;
+			wpa_printf(MSG_ERROR, "Failed to set maximum number of stations");
+			goto out;
+		}
+		wpa_printf(MSG_INFO, "Set maximum number of stations: %d", params->max_num_sta);
+	}
+
+	if (params->type & WIFI_AP_CONFIG_PARAM_HT_CAPAB) {
+		if (!hostapd_cli_cmd_v("set ht_capab %s", params->ht_capab)) {
+			ret = -EINVAL;
+			wpa_printf(MSG_ERROR, "Failed to set HT capabilities");
+			goto out;
+		}
+		wpa_printf(MSG_INFO, "Set HT capabilities: %s", params->ht_capab);
+	}
+
+	if (params->type & WIFI_AP_CONFIG_PARAM_VHT_CAPAB) {
+		if (!hostapd_cli_cmd_v("set vht_capab %s", params->vht_capab)) {
+			ret = -EINVAL;
+			wpa_printf(MSG_ERROR, "Failed to set VHT capabilities");
+			goto out;
+		}
+		wpa_printf(MSG_INFO, "Set VHT capabilities: %s", params->vht_capab);
+	}
+
+out:
+	k_mutex_unlock(&hostapd_mutex);
+	return ret;
+}
+
+int hostapd_ap_status(const struct device *dev, struct wifi_iface_status *status)
+{
+	int ret = 0;
+	struct hostapd_iface *iface;
+	struct hostapd_config *conf;
+	struct hostapd_data *hapd;
+	struct hostapd_bss_config *bss;
+	struct hostapd_ssid *ssid;
+	struct hostapd_hw_modes *hw_mode;
+	int proto;    /* Wi-Fi secure protocol */
+	int key_mgmt; /*  Wi-Fi key management */
+	int sae_pwe;
+
+	k_mutex_lock(&hostapd_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (!iface) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	conf = iface->conf;
+	if (!conf) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Conf %s not found", dev->name);
+		goto out;
+	}
+
+	bss = conf->bss[0];
+	if (!bss) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Bss_conf %s not found", dev->name);
+		goto out;
+	}
+
+	hapd = iface->bss[0];
+	if (!hapd) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Bss %s not found", dev->name);
+		goto out;
+	}
+
+	status->state = iface->state;
+	ssid = &bss->ssid;
+
+	os_memcpy(status->bssid, hapd->own_addr, WIFI_MAC_ADDR_LEN);
+	status->iface_mode = WIFI_MODE_AP;
+	status->band = wpas_band_to_zephyr(wpas_freq_to_band(iface->freq));
+	key_mgmt = bss->wpa_key_mgmt;
+	proto = bss->wpa;
+	sae_pwe = bss->sae_pwe;
+	status->wpa3_ent_type = wpas_key_mgmt_to_zephyr_wpa3_ent(key_mgmt);
+	status->security = wpas_key_mgmt_to_zephyr(1, hapd->conf, key_mgmt, proto, sae_pwe);
+	status->mfp = get_mfp(bss->ieee80211w);
+	status->channel = conf->channel;
+	os_memcpy(status->ssid, ssid->ssid, ssid->ssid_len);
+
+	status->dtim_period = bss->dtim_period;
+	status->beacon_interval = conf->beacon_int;
+
+	hw_mode = iface->current_mode;
+
+	status->link_mode = conf->ieee80211ax                          ? WIFI_6
+			    : conf->ieee80211ac                        ? WIFI_5
+			    : conf->ieee80211n                         ? WIFI_4
+			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211G ? WIFI_3
+			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211A ? WIFI_2
+			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211B ? WIFI_1
+								       : WIFI_0;
+	status->twt_capable = (hw_mode->he_capab[IEEE80211_MODE_AP].mac_cap[0] & 0x04);
+
+out:
+	k_mutex_unlock(&hostapd_mutex);
+	return ret;
+}
+
+#ifdef CONFIG_WIFI_NM_HOSTAPD_WPS
+static int hapd_ap_wps_pbc(const struct device *dev)
+{
+	struct hostapd_iface *iface;
+	int ret = -1;
+
+	k_mutex_lock(&hostapd_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (!iface) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	if (iface->state != HAPD_IFACE_ENABLED) {
+		ret = -EBUSY;
+		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("wps_pbc")) {
+		goto out;
+	}
+
+	ret = 0;
+
+out:
+	k_mutex_unlock(&hostapd_mutex);
+	return ret;
+}
+
+static int hapd_ap_wps_pin(const struct device *dev, struct wifi_wps_config_params *params)
+{
+#define WPS_PIN_EXPIRE_TIME 120
+	struct hostapd_iface *iface;
+	char *get_pin_cmd = "WPS_AP_PIN random";
+	int ret  = 0;
+
+	k_mutex_lock(&hostapd_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (!iface) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	if (iface->state != HAPD_IFACE_ENABLED) {
+		ret = -EBUSY;
+		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
+		goto out;
+	}
+
+	if (params->oper == WIFI_WPS_PIN_GET) {
+		if (zephyr_hostapd_cli_cmd_resp(get_pin_cmd, params->pin)) {
+			goto out;
+		}
+	} else if (params->oper == WIFI_WPS_PIN_SET) {
+		if (!hostapd_cli_cmd_v("wps_check_pin %s", params->pin)) {
+			goto out;
+		}
+
+		if (!hostapd_cli_cmd_v("wps_pin any %s %d", params->pin, WPS_PIN_EXPIRE_TIME)) {
+			goto out;
+		}
+	} else {
+		wpa_printf(MSG_ERROR, "Error wps pin operation : %d", params->oper);
+		goto out;
+	}
+
+	ret = 0;
+
+out:
+	k_mutex_unlock(&hostapd_mutex);
+	return ret;
+}
+
+int hostapd_ap_wps_config(const struct device *dev, struct wifi_wps_config_params *params)
+{
+	int ret = 0;
+
+	if (params->oper == WIFI_WPS_PBC) {
+		ret = hapd_ap_wps_pbc(dev);
+	} else if (params->oper == WIFI_WPS_PIN_GET || params->oper == WIFI_WPS_PIN_SET) {
+		ret = hapd_ap_wps_pin(dev, params);
+	}
+
+	return ret;
+}
+#endif
+
+int hostapd_ap_enable(const struct device *dev,
+		      struct wifi_connect_req_params *params)
+{
+	struct hostapd_iface *iface;
+	struct hostapd_data *hapd;
+	struct wpa_driver_capa capa;
+	int ret;
+
+	if (!net_if_is_admin_up(net_if_lookup_by_dev(dev))) {
+		wpa_printf(MSG_ERROR,
+			   "Interface %s is down, dropping connect",
+			   dev->name);
+		return -1;
+	}
+
+	ret = set_ap_bandwidth(dev, params->bandwidth);
+	if (ret && (ret != -ENOTSUP)) {
+		wpa_printf(MSG_ERROR, "Failed to set ap bandwidth");
+		return -EINVAL;
+	}
+
+	k_mutex_lock(&hostapd_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (!iface) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	iface->owner = iface;
+
+	if (iface->state == HAPD_IFACE_ENABLED) {
+		ret = -EBUSY;
+		wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);
+		goto out;
+	}
+
+	ret = hapd_config_network(iface, params);
+	if (ret) {
+		wpa_printf(MSG_ERROR, "Failed to configure network for AP: %d", ret);
+		goto out;
+	}
+
+	hapd = iface->bss[0];
+	if (!iface->extended_capa || !iface->extended_capa_mask) {
+		if (hapd->driver->get_capa && hapd->driver->get_capa(hapd->drv_priv, &capa) == 0) {
+			iface->extended_capa         = capa.extended_capa;
+			iface->extended_capa_mask    = capa.extended_capa_mask;
+			iface->extended_capa_len     = capa.extended_capa_len;
+			iface->drv_max_acl_mac_addrs = capa.max_acl_mac_addrs;
+
+			/*
+			 * Override extended capa with per-interface type (AP), if
+			 * available from the driver.
+			 */
+			hostapd_get_ext_capa(iface);
+		} else {
+			ret = -1;
+			wpa_printf(MSG_ERROR, "Failed to get capability for AP: %d", ret);
+			goto out;
+		}
+	}
+
+	if (!hostapd_cli_cmd_v("enable")) {
+		goto out;
+	}
+out:
+	k_mutex_unlock(&hostapd_mutex);
+	return ret;
+}
+
+int hostapd_ap_disable(const struct device *dev)
+{
+	struct hostapd_iface *iface;
+	int ret = 0;
+
+	k_mutex_lock(&hostapd_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (!iface) {
+		ret = -ENOENT;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	if (iface->state != HAPD_IFACE_ENABLED) {
+		ret = -EBUSY;
+		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("disable")) {
+		goto out;
+	}
+
+	iface->freq = 0;
+
+out:
+	k_mutex_unlock(&hostapd_mutex);
+	return ret;
+}
+
+int hostapd_ap_sta_disconnect(const struct device *dev,
+			      const uint8_t *mac_addr)
+{
+	struct hostapd_iface *iface;
+	int ret  = 0;
+
+	k_mutex_lock(&hostapd_mutex, K_FOREVER);
+
+	iface = get_hostapd_handle(dev);
+	if (!iface) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
+		goto out;
+	}
+
+	if (iface->state != HAPD_IFACE_ENABLED) {
+		ret = -EBUSY;
+		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
+		goto out;
+	}
+
+	if (!mac_addr) {
+		ret = -EINVAL;
+		wpa_printf(MSG_ERROR, "Invalid MAC address");
+		goto out;
+	}
+
+	if (!hostapd_cli_cmd_v("deauthenticate %02x:%02x:%02x:%02x:%02x:%02x",
+				mac_addr[0], mac_addr[1], mac_addr[2],
+				mac_addr[3], mac_addr[4], mac_addr[5])) {
+		goto out;
+	}
+
+out:
+	k_mutex_unlock(&hostapd_mutex);
+	return ret;
+}
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
+int hostapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
+{
+	int ret;
+	char *cmd = NULL;
+
+	if (params == NULL) {
+		return -EINVAL;
+	}
+
+	cmd = os_zalloc(SUPPLICANT_DPP_CMD_BUF_SIZE);
+	if (cmd == NULL) {
+		return -ENOMEM;
+	}
+
+	/* leave one byte always be 0 */
+	ret = dpp_params_to_cmd(params, cmd, SUPPLICANT_DPP_CMD_BUF_SIZE - 2);
+	if (ret) {
+		os_free(cmd);
+		return ret;
+	}
+
+	wpa_printf(MSG_DEBUG, "hostapd_cli %s", cmd);
+	if (zephyr_hostapd_cli_cmd_resp(cmd, params->resp)) {
+		os_free(cmd);
+		return -ENOEXEC;
+	}
+
+	os_free(cmd);
+	return 0;
+}
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/modules/hostap/src/hapd_api.h b/modules/hostap/src/hapd_api.h
new file mode 100644
index 0000000000000..cc6f1fe740105
--- /dev/null
+++ b/modules/hostap/src/hapd_api.h
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2023-2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __HAPD_API_H_
+#define __HAPD_API_H_
+
+#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+int hostapd_add_enterprise_creds(const struct device *dev,
+			struct wifi_enterprise_creds_params *creds);
+#endif
+
+/**
+ * @brief Wi-Fi AP configuration parameter.
+ *
+ * @param dev Wi-Fi device
+ * @param params AP parameters
+ * @return 0 for OK; -1 for ERROR
+ */
+int hostapd_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params);
+
+/**
+ * @brief Set Wi-Fi AP region domain
+ *
+ * @param reg_domain region domain parameters
+ * @return true for OK; false for ERROR
+ */
+bool hostapd_ap_reg_domain(struct wifi_reg_domain *reg_domain);
+
+#ifdef CONFIG_WIFI_NM_HOSTAPD_WPS
+/** Start AP WPS PBC/PIN
+ *
+ * @param dev Pointer to the device structure for the driver instance
+ * @param params wps operarion parameters
+ *
+ * @return 0 if ok, < 0 if error
+ */
+int hostapd_ap_wps_config(const struct device *dev, struct wifi_wps_config_params *params);
+#endif
+
+/**
+ * @brief Get Wi-Fi SAP status
+ *
+ * @param dev Wi-Fi device
+ * @param status SAP status
+ * @return 0 for OK; -1 for ERROR
+ */
+int hostapd_ap_status(const struct device *dev, struct wifi_iface_status *status);
+
+/**
+ * @brief Set Wi-Fi AP configuration
+ *
+ * @param dev Wi-Fi interface name to use
+ * @param params AP configuration parameters to set
+ * @return 0 for OK; -1 for ERROR
+ */
+int hostapd_ap_enable(const struct device *dev,
+		      struct wifi_connect_req_params *params);
+
+/**
+ * @brief Disable Wi-Fi AP
+ * @param dev Wi-Fi interface name to use
+ * @return 0 for OK; -1 for ERROR
+ */
+int hostapd_ap_disable(const struct device *dev);
+
+/**
+ * @brief Set Wi-Fi AP STA disconnect
+ * @param dev Wi-Fi interface name to use
+ * @param mac_addr MAC address of the station to disconnect
+ * @return 0 for OK; -1 for ERROR
+ */
+int hostapd_ap_sta_disconnect(const struct device *dev,
+			      const uint8_t *mac_addr);
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
+#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
+/**
+ * @brief Dispatch DPP operations for AP
+ *
+ * @param dev Wi-Fi interface name to use
+ * @param dpp_params DPP action enum and params in string
+ * @return 0 for OK; -1 for ERROR
+ */
+int hostapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
+#endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
+
+#endif /* __HAPD_API_H_ */
diff --git a/modules/hostap/src/hapd_events.c b/modules/hostap/src/hapd_events.c
new file mode 100644
index 0000000000000..c71015f7f9209
--- /dev/null
+++ b/modules/hostap/src/hapd_events.c
@@ -0,0 +1,122 @@
+/**
+ * Copyright 2023-2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "includes.h"
+#include "common.h"
+#include "ap/sta_info.h"
+#include "ap/ieee802_11.h"
+#include "ap/hostapd.h"
+#include "wpa_supplicant_i.h"
+#include <zephyr/net/wifi_mgmt.h>
+#include "hapd_events.h"
+#include "supp_events.h"
+
+static enum wifi_link_mode hapd_get_sta_link_mode(struct hostapd_iface *iface,
+						  struct sta_info *sta)
+{
+	if (sta->flags & WLAN_STA_HE) {
+		return WIFI_6;
+	} else if (sta->flags & WLAN_STA_VHT) {
+		return WIFI_5;
+	} else if (sta->flags & WLAN_STA_HT) {
+		return WIFI_4;
+	} else if ((sta->flags & WLAN_STA_NONERP) ||
+		   (iface->current_mode->mode == HOSTAPD_MODE_IEEE80211B)) {
+		return WIFI_1;
+	} else if (iface->freq > 4000) {
+		return WIFI_2;
+	} else if (iface->freq > 2000) {
+		return WIFI_3;
+	} else {
+		return WIFI_LINK_MODE_UNKNOWN;
+	}
+}
+
+static bool hapd_is_twt_capable(struct hostapd_iface *iface, struct sta_info *sta)
+{
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
+	return hostapd_get_he_twt_responder(iface->bss[0], IEEE80211_MODE_AP);
+#else
+	return false;
+#endif
+}
+
+int hostapd_send_wifi_mgmt_ap_status(struct hostapd_iface *iface,
+				     enum net_event_wifi_cmd event,
+				     enum wifi_ap_status ap_status)
+{
+	char *ifname = iface->conf->bss[0]->iface;
+	int status = ap_status;
+
+	return supplicant_send_wifi_mgmt_event(ifname,
+					       event,
+					       (void *)&status,
+					       sizeof(int));
+}
+
+int hostapd_send_wifi_mgmt_ap_sta_event(struct hostapd_iface *ap_ctx,
+					enum net_event_wifi_cmd event,
+					void *data)
+{
+	struct sta_info *sta = data;
+	char *ifname = ap_ctx->bss[0]->conf->iface;
+	struct wifi_ap_sta_info sta_info = { 0 };
+
+	if (!ap_ctx || !sta) {
+		return -EINVAL;
+	}
+
+	memcpy(sta_info.mac, sta->addr, sizeof(sta_info.mac));
+
+	if (event == NET_EVENT_WIFI_CMD_AP_STA_CONNECTED) {
+		sta_info.link_mode = hapd_get_sta_link_mode(ap_ctx, sta);
+		sta_info.twt_capable = hapd_is_twt_capable(ap_ctx, sta);
+	}
+
+	return supplicant_send_wifi_mgmt_event(ifname,
+					       event,
+					       (void *)&sta_info,
+					       sizeof(sta_info));
+}
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
+void hostapd_handle_dpp_event(void *ctx, char *buf, size_t len)
+{
+	struct hostapd_data *hapd = (struct hostapd_data *)ctx;
+
+	if (hapd == NULL) {
+		return;
+	}
+
+	struct hostapd_bss_config *conf = hapd->conf;
+
+	if (conf == NULL || !(conf->wpa_key_mgmt & WPA_KEY_MGMT_DPP)) {
+		return;
+	}
+
+	/* check hostapd */
+	if (!strncmp(buf, DPP_EVENT_CONNECTOR, sizeof(DPP_EVENT_CONNECTOR) - 1)) {
+		if (conf->dpp_connector) {
+			os_free(conf->dpp_connector);
+		}
+
+		conf->dpp_connector = os_strdup(buf + sizeof(DPP_EVENT_CONNECTOR) - 1);
+	} else if (!strncmp(buf, DPP_EVENT_C_SIGN_KEY, sizeof(DPP_EVENT_C_SIGN_KEY) - 1)) {
+		if (conf->dpp_csign) {
+			wpabuf_free(conf->dpp_csign);
+		}
+
+		conf->dpp_csign = wpabuf_parse_bin(buf + sizeof(DPP_EVENT_C_SIGN_KEY) - 1);
+	} else if (!strncmp(buf, DPP_EVENT_NET_ACCESS_KEY, sizeof(DPP_EVENT_NET_ACCESS_KEY) - 1)) {
+		if (conf->dpp_netaccesskey) {
+			wpabuf_free(conf->dpp_netaccesskey);
+		}
+
+		conf->dpp_netaccesskey =
+			wpabuf_parse_bin(buf + sizeof(DPP_EVENT_NET_ACCESS_KEY) - 1);
+	}
+}
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/modules/hostap/src/hapd_events.h b/modules/hostap/src/hapd_events.h
new file mode 100644
index 0000000000000..66ea7f6e1cc12
--- /dev/null
+++ b/modules/hostap/src/hapd_events.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __HAPD_EVENTS_H__
+#define __HAPD_EVENTS_H__
+
+#include <zephyr/net/wifi_mgmt.h>
+
+int hostapd_send_wifi_mgmt_ap_status(struct hostapd_iface *iface,
+				     enum net_event_wifi_cmd event,
+				     enum wifi_ap_status ap_status);
+
+int hostapd_send_wifi_mgmt_ap_sta_event(struct hostapd_iface *ap_ctx,
+					enum net_event_wifi_cmd event,
+					void *data);
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
+void hostapd_handle_dpp_event(void *ctx, char *buf, size_t len);
+#endif
+
+#endif /* __HAPD_EVENTS_H_ */
diff --git a/modules/hostap/src/hapd_main.c b/modules/hostap/src/hapd_main.c
new file mode 100644
index 0000000000000..c11f0d806d7d0
--- /dev/null
+++ b/modules/hostap/src/hapd_main.c
@@ -0,0 +1,572 @@
+/**
+ * Copyright 2023-2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/net/wifi_mgmt.h>
+#include <zephyr/net/wifi_nm.h>
+#include "includes.h"
+#include "common.h"
+#include "eloop.h"
+#include "wpa_supplicant_i.h"
+#include "hostapd.h"
+#include "hostapd_cli_zephyr.h"
+#include "eap_register.h"
+#include "ap_drv_ops.h"
+#include "l2_packet/l2_packet.h"
+#include "supp_main.h"
+#include "hapd_main.h"
+#include "supp_api.h"
+#include "hapd_api.h"
+#include "hapd_events.h"
+
+static const struct wifi_mgmt_ops mgmt_ap_ops = {
+	.ap_enable = hostapd_ap_enable,
+	.ap_disable = hostapd_ap_disable,
+	.ap_sta_disconnect = hostapd_ap_sta_disconnect,
+	.iface_status = hostapd_ap_status,
+#ifdef CONFIG_WIFI_NM_HOSTAPD_WPS
+	.wps_config = hostapd_ap_wps_config,
+#endif
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
+	.dpp_dispatch = hostapd_dpp_dispatch,
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
+	.ap_config_params = hostapd_ap_config_params,
+	.set_rts_threshold = supplicant_set_rts_threshold,
+#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+	.enterprise_creds = hostapd_add_enterprise_creds,
+#endif
+	.set_btwt = supplicant_set_btwt,
+};
+
+DEFINE_WIFI_NM_INSTANCE(hostapd, &mgmt_ap_ops);
+
+struct hapd_global {
+	void **drv_priv;
+	size_t drv_count;
+};
+
+static struct hapd_global hglobal;
+
+#ifndef HOSTAPD_CLEANUP_INTERVAL
+#define HOSTAPD_CLEANUP_INTERVAL 10
+#endif /* HOSTAPD_CLEANUP_INTERVAL */
+
+static int hostapd_periodic_call(struct hostapd_iface *iface, void *ctx)
+{
+	hostapd_periodic_iface(iface);
+	return 0;
+}
+
+/* Periodic cleanup tasks */
+static void hostapd_periodic(void *eloop_ctx, void *timeout_ctx)
+{
+	struct hapd_interfaces *interfaces = eloop_ctx;
+
+	eloop_register_timeout(HOSTAPD_CLEANUP_INTERVAL, 0,
+			       hostapd_periodic, interfaces, NULL);
+	hostapd_for_each_interface(interfaces, hostapd_periodic_call, NULL);
+}
+
+struct hostapd_iface *zephyr_get_hapd_handle_by_ifname(const char *ifname)
+{
+	struct hapd_interfaces *interfaces = zephyr_get_default_hapd_context();
+	struct hostapd_data *hapd = NULL;
+
+	hapd = hostapd_get_iface(interfaces, ifname);
+	if (!hapd) {
+		wpa_printf(MSG_ERROR, "%s: Unable to get hapd handle for %s\n", __func__, ifname);
+		return NULL;
+	}
+
+	return hapd->iface;
+}
+
+static void hostapd_event_eapol_rx_cb(void *ctx, const u8 *src_addr,
+				      const u8 *buf, size_t len)
+{
+	hostapd_event_eapol_rx(ctx, src_addr, buf, len, FRAME_ENCRYPTION_UNKNOWN, -1);
+}
+
+struct hostapd_iface *hostapd_get_interface(const char *ifname)
+{
+	struct hapd_interfaces *interfaces = zephyr_get_default_hapd_context();
+
+	return interfaces->iface[0];
+}
+
+static int hostapd_enable_iface_cb(struct hostapd_iface *hapd_iface)
+{
+	struct hostapd_data *bss;
+
+	wpa_printf(MSG_DEBUG, "Enable interface %s", hapd_iface->conf->bss[0]->iface);
+
+	bss = hapd_iface->bss[0];
+
+	bss->conf->start_disabled = 0;
+
+	if (hostapd_config_check(hapd_iface->conf, 1) < 0) {
+		wpa_printf(MSG_INFO, "Invalid configuration - cannot enable");
+		return -1;
+	}
+
+	l2_packet_deinit(bss->l2);
+	bss->l2 = l2_packet_init(bss->conf->iface, bss->conf->bssid, ETH_P_EAPOL,
+				 &hostapd_event_eapol_rx_cb, bss, 0);
+	if (bss->l2 == NULL) {
+		wpa_printf(MSG_ERROR, "Failed to initialize l2 for hostapd interface");
+		return -1;
+	}
+
+	if (hostapd_setup_interface(hapd_iface)) {
+		wpa_printf(MSG_ERROR, "Failed to initialize hostapd interface");
+		return -1;
+	}
+
+	return 0;
+}
+
+static int hostapd_disable_iface_cb(struct hostapd_iface *hapd_iface)
+{
+	size_t j;
+	struct hostapd_data *hapd = NULL;
+
+	wpa_msg(hapd_iface->bss[0]->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
+
+	hapd_iface->driver_ap_teardown = !!(hapd_iface->drv_flags
+					    & WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
+
+#ifdef NEED_AP_MLME
+	for (j = 0; j < hapd_iface->num_bss; j++) {
+		hostapd_cleanup_cs_params(hapd_iface->bss[j]);
+	}
+#endif /* NEED_AP_MLME */
+
+	/* Same as hostapd_interface_deinit() without deinitializing control
+	 * interface
+	 */
+	for (j = 0; j < hapd_iface->num_bss; j++) {
+		hapd = hapd_iface->bss[j];
+		hostapd_bss_deinit_no_free(hapd);
+		hostapd_free_hapd_data(hapd);
+	}
+
+	hostapd_drv_stop_ap(hapd);
+
+	hostapd_cleanup_iface_partial(hapd_iface);
+
+	wpa_printf(MSG_DEBUG, "Interface %s disabled", hapd_iface->bss[0]->conf->iface);
+	hostapd_set_state(hapd_iface, HAPD_IFACE_DISABLED);
+	hostapd_send_wifi_mgmt_ap_status(hapd_iface,
+					 NET_EVENT_WIFI_CMD_AP_DISABLE_RESULT,
+					 WIFI_STATUS_AP_SUCCESS);
+	hostapd_config_free(hapd_iface->conf);
+	hapd_iface->conf = hapd_iface->interfaces->config_read_cb(hapd_iface->config_fname);
+	for (j = 0; j < hapd_iface->num_bss; j++) {
+		hapd = hapd_iface->bss[j];
+		hapd->iconf = hapd_iface->conf;
+		hapd->conf = hapd_iface->conf->bss[j];
+		hapd->driver = hapd_iface->conf->driver;
+	}
+
+	return 0;
+}
+
+static int hostapd_global_init(struct hapd_interfaces *interfaces, const char *entropy_file)
+{
+	int i;
+
+	os_memset(&hglobal, 0, sizeof(struct hapd_global));
+
+	if (eap_server_register_methods()) {
+		wpa_printf(MSG_ERROR, "Failed to register EAP methods");
+		return -1;
+	}
+
+	interfaces->eloop_initialized = 1;
+
+	for (i = 0; wpa_drivers[i]; i++) {
+		hglobal.drv_count++;
+	}
+
+	if (hglobal.drv_count == 0) {
+		wpa_printf(MSG_ERROR, "No drivers enabled");
+		return -1;
+	}
+	hglobal.drv_priv = os_calloc(hglobal.drv_count, sizeof(void *));
+	if (hglobal.drv_priv == NULL) {
+		return -1;
+	}
+
+	return 0;
+}
+
+const char *zephyr_hostap_msg_ifname_cb(void *ctx)
+{
+	if (ctx == NULL) {
+		return NULL;
+	}
+
+	if ((*((int *)ctx)) == 0) {
+		struct wpa_supplicant *wpa_s = ctx;
+
+		return wpa_s->ifname;
+	}
+
+	struct hostapd_data *hapd = ctx;
+
+	if (hapd && hapd->conf) {
+		return hapd->conf->iface;
+	}
+
+	return NULL;
+}
+
+void zephyr_hostap_ctrl_iface_msg_cb(void *ctx, int level, enum wpa_msg_type type,
+				     const char *txt, size_t len)
+{
+	if (ctx == NULL) {
+		return;
+	}
+
+	if ((*((int *)ctx)) == 0) {
+		wpa_supplicant_msg_send(ctx, level, type, txt, len);
+	} else {
+		hostapd_msg_send(ctx, level, type, txt, len);
+	}
+}
+
+static int hostapd_driver_init(struct hostapd_iface *iface)
+{
+	struct wpa_init_params params;
+	size_t i;
+	struct hostapd_data *hapd       = iface->bss[0];
+	struct hostapd_bss_config *conf = hapd->conf;
+	u8 *b                           = conf->bssid;
+	struct wpa_driver_capa capa;
+
+	if (hapd->driver == NULL || hapd->driver->hapd_init == NULL) {
+		wpa_printf(MSG_ERROR, "No hostapd driver wrapper available");
+		return -1;
+	}
+
+	/* Initialize the driver interface */
+	if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5])) {
+		b = NULL;
+	}
+
+	os_memset(&params, 0, sizeof(params));
+	for (i = 0; wpa_drivers[i]; i++) {
+		if (wpa_drivers[i] != hapd->driver) {
+			continue;
+		}
+
+		if (hglobal.drv_priv[i] == NULL && wpa_drivers[i]->global_init) {
+			hglobal.drv_priv[i] = wpa_drivers[i]->global_init(iface->interfaces);
+			if (hglobal.drv_priv[i] == NULL) {
+				wpa_printf(MSG_ERROR, "Failed to initialize driver '%s'",
+					   wpa_drivers[i]->name);
+				return -1;
+			}
+			hglobal.drv_count++;
+		}
+
+		params.global_priv = hglobal.drv_priv[i];
+		break;
+	}
+	params.bssid              = b;
+	params.ifname             = hapd->conf->iface;
+	params.driver_params      = hapd->iconf->driver_params;
+	params.use_pae_group_addr = hapd->conf->use_pae_group_addr;
+	params.num_bridge         = hapd->iface->num_bss;
+	params.bridge             = os_calloc(hapd->iface->num_bss, sizeof(char *));
+	if (params.bridge == NULL) {
+		return -1;
+	}
+	for (i = 0; i < hapd->iface->num_bss; i++) {
+		struct hostapd_data *bss = hapd->iface->bss[i];
+
+		if (bss->conf->bridge[0]) {
+			params.bridge[i] = bss->conf->bridge;
+		}
+	}
+
+	params.own_addr = hapd->own_addr;
+
+	hapd->drv_priv = hapd->driver->hapd_init(hapd, &params);
+	os_free(params.bridge);
+	if (hapd->drv_priv == NULL) {
+		wpa_printf(MSG_ERROR, "%s driver initialization failed.",
+			   hapd->driver->name);
+		hapd->driver = NULL;
+		return -1;
+	}
+
+	if (hapd->driver->get_capa && hapd->driver->get_capa(hapd->drv_priv, &capa) == 0) {
+		struct wowlan_triggers *triggs;
+
+		iface->drv_flags           = capa.flags;
+		iface->drv_flags2          = capa.flags2;
+		iface->probe_resp_offloads = capa.probe_resp_offloads;
+		/*
+		 * Use default extended capa values from per-radio information
+		 */
+		iface->extended_capa         = capa.extended_capa;
+		iface->extended_capa_mask    = capa.extended_capa_mask;
+		iface->extended_capa_len     = capa.extended_capa_len;
+		iface->drv_max_acl_mac_addrs = capa.max_acl_mac_addrs;
+
+		/*
+		 * Override extended capa with per-interface type (AP), if
+		 * available from the driver.
+		 */
+		hostapd_get_ext_capa(iface);
+
+		triggs = wpa_get_wowlan_triggers(conf->wowlan_triggers, &capa);
+		if (triggs && hapd->driver->set_wowlan) {
+			if (hapd->driver->set_wowlan(hapd->drv_priv, triggs)) {
+				wpa_printf(MSG_ERROR, "set_wowlan failed");
+			}
+		}
+		os_free(triggs);
+	}
+
+	return 0;
+}
+
+struct hostapd_config *hostapd_config_read2(const char *fname)
+{
+	struct hostapd_config *conf;
+	const struct device *dev;
+	char ifname[IFNAMSIZ + 1] = {0};
+	int errors = 0;
+	size_t i;
+	int aCWmin = 4, aCWmax = 10;
+	/* background traffic */
+	struct hostapd_wmm_ac_params ac_bk = {aCWmin, aCWmax, 9, 0, 0};
+	/* best effort traffic */
+	struct hostapd_wmm_ac_params ac_be = {aCWmin, aCWmax - 4, 5, 0, 0};
+	/* video traffic */
+	struct hostapd_wmm_ac_params ac_vi = {aCWmin - 1, aCWmin, 3,
+					      3008 / 32, 0};
+	/* voice traffic */
+	struct hostapd_wmm_ac_params ac_vo = {aCWmin - 2, aCWmin - 1, 3,
+					      1504 / 32, 0};
+
+	dev = net_if_get_device(net_if_get_wifi_sap());
+	strncpy(ifname, dev->name, IFNAMSIZ);
+	ifname[IFNAMSIZ] = '\0';
+
+	conf = hostapd_config_defaults();
+	if (conf == NULL) {
+		return NULL;
+	}
+
+	conf->wmm_ac_params[0] = ac_be;
+	conf->wmm_ac_params[1] = ac_bk;
+	conf->wmm_ac_params[2] = ac_vi;
+	conf->wmm_ac_params[3] = ac_vo;
+
+	/* set default driver based on configuration */
+	conf->driver = wpa_drivers[0];
+	if (conf->driver == NULL) {
+		wpa_printf(MSG_ERROR, "No driver wrappers registered!");
+		hostapd_config_free(conf);
+		return NULL;
+	}
+	conf->last_bss = conf->bss[0];
+	struct hostapd_bss_config *bss;
+
+	bss                 = conf->last_bss;
+	bss->start_disabled = 1;
+	bss->max_num_sta    = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
+	bss->dtim_period    = 1;
+	os_strlcpy(conf->bss[0]->iface, ifname, sizeof(conf->bss[0]->iface));
+	bss->logger_stdout_level = HOSTAPD_LEVEL_INFO;
+	bss->logger_stdout       = 0xffff;
+	bss->nas_identifier      = os_strdup("ap.example.com");
+	os_memcpy(conf->country, "US ", 3);
+	conf->hw_mode        = HOSTAPD_MODE_IEEE80211G;
+	bss->wps_state       = WPS_STATE_CONFIGURED;
+	bss->eap_server      = 1;
+#ifdef CONFIG_WPS
+	bss->ap_setup_locked = 1;
+#endif
+	conf->channel        = 1;
+	conf->acs            = conf->channel == 0;
+#ifdef CONFIG_ACS
+	conf->acs_num_scans  = 1;
+#endif
+	conf->ieee80211n     = 1;
+	conf->ieee80211h     = 0;
+	conf->ieee80211d     = 1;
+	conf->acs_exclude_dfs = 1;
+	conf->ht_capab |= HT_CAP_INFO_SHORT_GI20MHZ;
+	bss->auth_algs = 1;
+	bss->okc = 1;
+	conf->no_pri_sec_switch = 1;
+	conf->ht_op_mode_fixed  = 1;
+	conf->ieee80211ac       = 1;
+	conf->vht_oper_chwidth  = CHANWIDTH_USE_HT;
+	conf->vht_capab |= VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX;
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
+	conf->ieee80211ax       = 1;
+	conf->he_oper_chwidth   = CHANWIDTH_USE_HT;
+	conf->he_phy_capab.he_su_beamformer = 0;
+	conf->he_phy_capab.he_su_beamformee = 1;
+	conf->he_phy_capab.he_mu_beamformer = 0;
+	conf->he_op.he_bss_color = 1;
+	conf->he_op.he_default_pe_duration  = 0;
+	/* Set default basic MCS/NSS set to single stream MCS 0-7 */
+	conf->he_op.he_basic_mcs_nss_set    = 0xfffc;
+#endif
+
+	for (i = 0; i < conf->num_bss; i++) {
+		hostapd_set_security_params(conf->bss[i], 1);
+	}
+
+	if (hostapd_config_check(conf, 1)) {
+		errors++;
+	}
+
+#ifndef WPA_IGNORE_CONFIG_ERRORS
+	if (errors) {
+		wpa_printf(MSG_ERROR, "%d errors found in configuration file '%s'",
+			   errors, fname);
+		hostapd_config_free(conf);
+		conf = NULL;
+	}
+#endif /* WPA_IGNORE_CONFIG_ERRORS */
+	return conf;
+}
+
+static struct hostapd_iface *hostapd_interface_init(struct hapd_interfaces *interfaces,
+						    const char *if_name,
+						    const char *config_fname,
+						    int debug)
+{
+	struct hostapd_iface *iface;
+	int k;
+
+	wpa_printf(MSG_DEBUG, "Configuration file: %s", config_fname);
+	iface = hostapd_init(interfaces, config_fname);
+	if (!iface) {
+		return NULL;
+	}
+
+	if (if_name) {
+		os_strlcpy(iface->conf->bss[0]->iface, if_name,
+			   sizeof(iface->conf->bss[0]->iface));
+	}
+
+	iface->interfaces = interfaces;
+
+	for (k = 0; k < debug; k++) {
+		if (iface->bss[0]->conf->logger_stdout_level > 0) {
+			iface->bss[0]->conf->logger_stdout_level--;
+		}
+	}
+
+	if (iface->conf->bss[0]->iface[0] == '\0' &&
+	    !hostapd_drv_none(iface->bss[0])) {
+		wpa_printf(MSG_ERROR,
+			   "Interface name not specified in %s, nor by '-i' parameter",
+			   config_fname);
+		hostapd_interface_deinit_free(iface);
+		return NULL;
+	}
+
+	iface->bss[0]->is_hostapd = 1;
+
+	return iface;
+}
+
+void zephyr_hostapd_init(struct hapd_interfaces *interfaces)
+{
+	size_t i;
+	int ret, debug = 0;
+	struct net_if *iface;
+	char ifname[IFNAMSIZ + 1] = { 0 };
+	const char *entropy_file = NULL;
+	size_t num_bss_configs = 0;
+	int start_ifaces_in_sync = 0;
+#ifdef CONFIG_DPP
+	struct dpp_global_config dpp_conf;
+#endif /* CONFIG_DPP */
+
+	os_memset(interfaces, 0, sizeof(struct hapd_interfaces));
+	interfaces->reload_config      = hostapd_reload_config;
+	interfaces->config_read_cb     = hostapd_config_read2;
+	interfaces->for_each_interface = hostapd_for_each_interface;
+	interfaces->driver_init        = hostapd_driver_init;
+	interfaces->global_ctrl_sock   = -1;
+	dl_list_init(&interfaces->global_ctrl_dst);
+#ifdef CONFIG_DPP
+	os_memset(&dpp_conf, 0, sizeof(dpp_conf));
+	dpp_conf.cb_ctx = interfaces;
+	interfaces->dpp = dpp_global_init(&dpp_conf);
+	if (!interfaces->dpp) {
+		return;
+	}
+#endif /* CONFIG_DPP */
+
+	interfaces->count = 1;
+	if (interfaces->count || num_bss_configs) {
+		interfaces->iface = os_calloc(interfaces->count + num_bss_configs,
+					      sizeof(struct hostapd_iface *));
+		if (interfaces->iface == NULL) {
+			wpa_printf(MSG_ERROR, "malloc failed");
+			return;
+		}
+	}
+
+	if (hostapd_global_init(interfaces, entropy_file)) {
+		wpa_printf(MSG_ERROR, "Failed to initialize global context");
+		return;
+	}
+
+	eloop_register_timeout(HOSTAPD_CLEANUP_INTERVAL, 0,
+			       hostapd_periodic, interfaces, NULL);
+
+	iface = net_if_get_wifi_sap();
+	ret = net_if_get_name(iface, ifname, sizeof(ifname) - 1);
+	if (ret < 0) {
+		wpa_printf(MSG_ERROR, "Cannot get interface %d (%p) name",
+			   net_if_get_by_iface(iface), iface);
+		goto out;
+	}
+
+	for (i = 0; i < interfaces->count; i++) {
+		interfaces->iface[i] = hostapd_interface_init(interfaces, ifname,
+							      "hostapd.conf", debug);
+		if (!interfaces->iface[i]) {
+			wpa_printf(MSG_ERROR, "Failed to initialize interface");
+			goto out;
+		}
+		if (start_ifaces_in_sync) {
+			interfaces->iface[i]->need_to_start_in_sync = 0;
+		}
+	}
+
+	/*
+	 * Enable configured interfaces. Depending on channel configuration,
+	 * this may complete full initialization before returning or use a
+	 * callback mechanism to complete setup in case of operations like HT
+	 * co-ex scans, ACS, or DFS are needed to determine channel parameters.
+	 * In such case, the interface will be enabled from eloop context within
+	 * hostapd_global_run().
+	 */
+	interfaces->terminate_on_error = 0;
+	for (i = 0; i < interfaces->count; i++) {
+		if (hostapd_driver_init(interfaces->iface[i])) {
+			goto out;
+		}
+		interfaces->iface[i]->enable_iface_cb  = hostapd_enable_iface_cb;
+		interfaces->iface[i]->disable_iface_cb = hostapd_disable_iface_cb;
+		zephyr_hostapd_ctrl_init((void *)interfaces->iface[i]->bss[0]);
+	}
+
+out:
+	return;
+}
diff --git a/modules/hostap/src/hapd_main.h b/modules/hostap/src/hapd_main.h
new file mode 100644
index 0000000000000..6e1d3185abf8d
--- /dev/null
+++ b/modules/hostap/src/hapd_main.h
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2023-2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __HAPD_MAIN_H_
+#define __HAPD_MAIN_H_
+
+#include "common.h"
+#include "wpa_debug_zephyr.h"
+
+struct hostapd_iface *zephyr_get_hapd_handle_by_ifname(const char *ifname);
+void wpa_supplicant_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *txt,
+			     size_t len);
+void hostapd_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *buf, size_t len);
+const char *zephyr_hostap_msg_ifname_cb(void *ctx);
+void zephyr_hostap_ctrl_iface_msg_cb(void *ctx, int level, enum wpa_msg_type type,
+				     const char *txt, size_t len);
+void zephyr_hostapd_init(struct hapd_interfaces *interfaces);
+#endif /* __HAPD_MAIN_H_ */
diff --git a/modules/hostap/src/supp_api.c b/modules/hostap/src/supp_api.c
index ce28c0a1d5748..4b0c156ca46bf 100644
--- a/modules/hostap/src/supp_api.c
+++ b/modules/hostap/src/supp_api.c
@@ -22,15 +22,12 @@
 #include "supp_main.h"
 #include "supp_api.h"
 #include "wpa_cli_zephyr.h"
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-#include "hostapd.h"
-#include "hostapd_cli_zephyr.h"
-#include "ap_drv_ops.h"
-#endif
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 #include "eap_peer/eap.h"
 #endif
 #include "supp_events.h"
+#include "hostapd.h"
+#include "hapd_api.h"
 #include "wpa_supplicant/bss.h"
 
 extern struct k_sem wpa_supplicant_ready_sem;
@@ -125,50 +122,6 @@ static struct wpa_supplicant *get_wpa_s_handle(const struct device *dev)
 	return wpa_s;
 }
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-#define hostapd_cli_cmd_v(cmd, ...) ({					\
-	bool status;							\
-									\
-	if (zephyr_hostapd_cli_cmd_v(cmd, ##__VA_ARGS__) < 0) {		\
-		wpa_printf(MSG_ERROR,					\
-			   "Failed to execute wpa_cli command: %s",	\
-			   cmd);					\
-		status = false;						\
-	} else {							\
-		status = true;						\
-	}								\
-									\
-	status;								\
-})
-
-static inline struct hostapd_iface *get_hostapd_handle(const struct device *dev)
-{
-	struct net_if *iface = net_if_lookup_by_dev(dev);
-	char if_name[CONFIG_NET_INTERFACE_NAME_LEN + 1];
-	struct hostapd_iface *hapd;
-	int ret;
-
-	if (!iface) {
-		wpa_printf(MSG_ERROR, "Interface for device %s not found", dev->name);
-		return NULL;
-	}
-
-	ret = net_if_get_name(iface, if_name, sizeof(if_name));
-	if (!ret) {
-		wpa_printf(MSG_ERROR, "Cannot get interface name (%d)", ret);
-		return NULL;
-	}
-
-	hapd = zephyr_get_hapd_handle_by_ifname(if_name);
-	if (!hapd) {
-		wpa_printf(MSG_ERROR, "Interface %s not found", if_name);
-		return NULL;
-	}
-
-	return hapd;
-}
-#endif
-
 #define WPA_SUPP_STATE_POLLING_MS 10
 static int wait_for_disconnect_complete(const struct device *dev)
 {
@@ -353,7 +306,7 @@ static inline int chan_to_freq(int chan)
 	return freq;
 }
 
-static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band)
+enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band)
 {
 	switch (band) {
 	case BAND_2_4_GHZ:
@@ -365,7 +318,7 @@ static inline enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_
 	}
 }
 
-static inline enum wifi_wpa3_enterprise_type wpas_key_mgmt_to_zephyr_wpa3_ent(int key_mgmt)
+enum wifi_wpa3_enterprise_type wpas_key_mgmt_to_zephyr_wpa3_ent(int key_mgmt)
 {
 	switch (key_mgmt) {
 	case WPA_KEY_MGMT_IEEE8021X_SUITE_B:
@@ -379,8 +332,8 @@ static inline enum wifi_wpa3_enterprise_type wpas_key_mgmt_to_zephyr_wpa3_ent(in
 	}
 }
 
-static inline enum wifi_security_type wpas_key_mgmt_to_zephyr(bool is_hapd,
-				void *config, int key_mgmt, int proto, int pwe)
+enum wifi_security_type wpas_key_mgmt_to_zephyr(bool is_hapd, void *config, int key_mgmt,
+						int proto, int pwe)
 {
 	switch (key_mgmt) {
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
@@ -619,7 +572,7 @@ int process_cipher_config(struct wifi_connect_req_params *params,
 	return -EINVAL;
 }
 
-static int is_eap_valid_security(int security)
+int is_eap_valid_security(int security)
 {
 	return (security == WIFI_SECURITY_TYPE_EAP_TLS ||
 		    security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
@@ -629,276 +582,6 @@ static int is_eap_valid_security(int security)
 }
 #endif
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
-static int hapd_process_cert_data(struct hostapd_bss_config *conf,
-	char *type, uint8_t *data, uint32_t data_len)
-{
-	if (os_strcmp(type, "ca_cert_blob") == 0) {
-		conf->ca_cert_blob = data;
-		conf->ca_cert_blob_len = data_len;
-	} else if (os_strcmp(type, "server_cert_blob") == 0) {
-		conf->server_cert_blob = data;
-		conf->server_cert_blob_len = data_len;
-	} else if (os_strcmp(type, "private_key_blob") == 0) {
-		conf->private_key_blob = data;
-		conf->private_key_blob_len = data_len;
-	} else if (os_strcmp(type, "dh_blob") == 0) {
-		conf->dh_blob = data;
-		conf->dh_blob_len = data_len;
-	} else {
-		wpa_printf(MSG_ERROR, "input type error");
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-static int hapd_get_eap_config(struct wifi_connect_req_params *params,
-	struct wifi_eap_config *eap_cfg)
-{
-	unsigned int index = 0;
-
-	for (index = 0; index < ARRAY_SIZE(eap_config); index++) {
-		if (params->security == eap_config[index].type) {
-			memcpy(eap_cfg, &eap_config[index], sizeof(struct wifi_eap_config));
-			break;
-		}
-	}
-
-	if (index == ARRAY_SIZE(eap_config)) {
-		wpa_printf(MSG_ERROR, "Get eap method type with security type: %d",
-		params->security);
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-static struct hostapd_eap_user *hostapd_process_eap_user_phase1(
-	struct wifi_connect_req_params *params, struct hostapd_eap_user **pnew_user)
-{
-	struct hostapd_eap_user *user = NULL, *tail = NULL, *new_user = NULL;
-	struct wifi_eap_config eap_cfg;
-
-	user = os_zalloc(sizeof(*user));
-	if (user == NULL) {
-		wpa_printf(MSG_ERROR, "EAP user allocation failed");
-		goto failed;
-	}
-
-	user->force_version = -1;
-	if (params->eap_ver >= 0) {
-		user->force_version = params->eap_ver;
-	}
-
-	if (hapd_get_eap_config(params, &eap_cfg)) {
-		goto failed;
-	}
-
-	user->methods[0].method = eap_cfg.eap_type_phase1;
-	user->methods[0].vendor = 0;
-
-	if (tail == NULL) {
-		tail = new_user = user;
-	} else {
-		tail->next = user;
-		tail       = user;
-	}
-
-	*pnew_user = new_user;
-
-	return tail;
-
-failed:
-	if (user) {
-		hostapd_config_free_eap_user(user);
-	}
-
-	return NULL;
-}
-
-static int hostapd_process_eap_user(struct wifi_connect_req_params *params,
-	struct hostapd_bss_config *conf)
-{
-	struct hostapd_eap_user *user = NULL, *tail = NULL, *user_list = NULL;
-	int i, nusers = params->nusers;
-	const char *identity, *password;
-	struct wifi_eap_config eap_cfg;
-	int ret = 0;
-
-	if (hapd_get_eap_config(params, &eap_cfg)) {
-		goto failed;
-	}
-
-	if (eap_cfg.phase2 != NULL) {
-		tail = hostapd_process_eap_user_phase1(params, &user_list);
-	}
-
-	if (eap_cfg.phase2 != NULL && !nusers) {
-		wpa_printf(MSG_ERROR, "EAP users not found.");
-		goto failed;
-	}
-
-	for (i = 0; i < nusers; i++) {
-		user = os_zalloc(sizeof(*user));
-		if (user == NULL) {
-			wpa_printf(MSG_ERROR, "EAP user allocation failed");
-			goto failed;
-		}
-
-		user->force_version = -1;
-		if (params->eap_ver >= 0) {
-			user->force_version = params->eap_ver;
-		}
-
-		identity = params->identities[i];
-		password = params->passwords[i];
-
-		user->identity = os_memdup(identity, os_strlen(identity));
-		if (user->identity == NULL) {
-			wpa_printf(MSG_ERROR,
-				"Failed to allocate "
-				"memory for EAP identity");
-			goto failed;
-		}
-		user->identity_len = os_strlen(identity);
-
-		user->methods[0].method = eap_cfg.eap_type_phase1;
-		user->methods[0].vendor = 0;
-
-		if (eap_cfg.phase2 != NULL) {
-			user->methods[0].method = eap_cfg.eap_type_phase2;
-			user->password = os_memdup(password, os_strlen(password));
-			if (user->password == NULL) {
-				wpa_printf(MSG_ERROR,
-					"Failed to allocate "
-					"memory for EAP password");
-				goto failed;
-			}
-			user->password_len = os_strlen(password);
-
-			user->phase2 = 1;
-		}
-
-		if (params->security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2) {
-			user->ttls_auth |= 0x1E;
-		}
-
-		if (tail == NULL) {
-			tail = user_list = user;
-		} else {
-			tail->next = user;
-			tail       = user;
-		}
-
-		continue;
-
-failed:
-		if (user) {
-			hostapd_config_free_eap_user(user);
-		}
-
-		ret = -1;
-		break;
-	}
-
-	if (ret == 0) {
-		hostapd_config_free_eap_users(conf->eap_user);
-		conf->eap_user = user_list;
-	} else {
-		hostapd_config_free_eap_users(user_list);
-	}
-
-	return ret;
-}
-
-int hapd_process_enterprise_config(struct hostapd_iface *iface,
-	struct wifi_connect_req_params *params)
-{
-	struct wifi_eap_cipher_config cipher_config = {
-		NULL, "DEFAULT:!EXP:!LOW", "CCMP", "CCMP", "AES-128-CMAC", NULL};
-	int ret = 0;
-
-	if (process_cipher_config(params, &cipher_config)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set wpa %d", WPA_PROTO_RSN)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set wpa_key_mgmt %s", cipher_config.key_mgmt)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set rsn_pairwise %s", cipher_config.pairwise_cipher)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set wpa_pairwise %s", cipher_config.pairwise_cipher)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set group_cipher %s", cipher_config.group_cipher)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set group_mgmt_cipher %s", cipher_config.group_mgmt_cipher)) {
-		goto out;
-	}
-
-	if (cipher_config.tls_flags != NULL) {
-		if (!hostapd_cli_cmd_v("set tls_flags %s", cipher_config.tls_flags)) {
-			goto out;
-		}
-	}
-
-	if (!hostapd_cli_cmd_v("set ieee8021x %d", 1)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set eapol_version %d", 2)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set eap_server %d", 1)) {
-		goto out;
-	}
-
-	if (hapd_process_cert_data(iface->bss[0]->conf, "ca_cert_blob",
-		enterprise_creds.ca_cert, enterprise_creds.ca_cert_len)) {
-		goto out;
-	}
-
-	if (hapd_process_cert_data(iface->bss[0]->conf, "server_cert_blob",
-		enterprise_creds.server_cert, enterprise_creds.server_cert_len)) {
-		goto out;
-	}
-
-	if (hapd_process_cert_data(iface->bss[0]->conf, "private_key_blob",
-		enterprise_creds.server_key, enterprise_creds.server_key_len)) {
-		goto out;
-	}
-
-	if (hapd_process_cert_data(iface->bss[0]->conf, "dh_blob",
-		enterprise_creds.dh_param, enterprise_creds.dh_param_len)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set private_key_passwd %s", params->key_passwd)) {
-		goto out;
-	}
-
-	if (hostapd_process_eap_user(params, iface->bss[0]->conf)) {
-		goto out;
-	}
-
-	return ret;
-out:
-	return -1;
-}
-#endif
-
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 static void wpas_remove_certs(struct wpa_supplicant *wpa_s)
 {
@@ -1529,7 +1212,7 @@ int supplicant_disconnect(const struct device *dev)
 	return wpas_disconnect_network(dev, WPAS_MODE_INFRA);
 }
 
-static enum wifi_mfp_options get_mfp(enum mfp_options supp_mfp_option)
+enum wifi_mfp_options get_mfp(enum mfp_options supp_mfp_option)
 {
 	switch (supp_mfp_option) {
 	case NO_MGMT_FRAME_PROTECTION:
@@ -1707,7 +1390,7 @@ int supplicant_status(const struct device *dev, struct wifi_iface_status *status
  * supplicant.
  */
 
-static const struct wifi_mgmt_ops *const get_wifi_mgmt_api(const struct device *dev)
+const struct wifi_mgmt_ops *const get_wifi_mgmt_api(const struct device *dev)
 {
 	struct net_wifi_mgmt_offload *api = (struct net_wifi_mgmt_offload *)dev->api;
 
@@ -1975,11 +1658,11 @@ int supplicant_reg_domain(const struct device *dev,
 			goto out;
 		}
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-		if (!hostapd_cli_cmd_v("set country_code %s", reg_domain->country_code)) {
-			goto out;
+		if (IS_ENABLED(CONFIG_WIFI_NM_HOSTAPD_AP)) {
+			if (!hostapd_ap_reg_domain(reg_domain)) {
+				goto out;
+			}
 		}
-#endif
 
 		ret = 0;
 
@@ -2220,673 +1903,78 @@ int supplicant_wps_config(const struct device *dev, struct wifi_wps_config_param
 }
 
 #ifdef CONFIG_AP
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-int hapd_state(const struct device *dev, int *state)
+int set_ap_bandwidth(const struct device *dev, enum wifi_frequency_bandwidths bandwidth)
 {
-	struct hostapd_iface *iface;
-	int ret = 0;
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
+	struct wifi_ap_config_params params = {0};
 
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		wpa_printf(MSG_ERROR, "Device %s not found", dev->name);
-		ret = -ENOENT;
-		goto out;
+	if (wifi_mgmt_api == NULL || wifi_mgmt_api->ap_config_params == NULL) {
+		return -ENOTSUP;
 	}
 
-	*state = iface->state;
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-	return ret;
+	params.bandwidth = bandwidth;
+	params.type = WIFI_AP_CONFIG_PARAM_BANDWIDTH;
+	return wifi_mgmt_api->ap_config_params(dev, &params);
 }
 
-static int hapd_config_chan_center_seg0(struct wifi_connect_req_params *params)
+int supplicant_ap_enable(const struct device *dev,
+			 struct wifi_connect_req_params *params)
 {
-	int ret = 0;
-	uint8_t center_freq_seg0_idx = 0;
-	uint8_t oper_chwidth = CHANWIDTH_USE_HT;
-	const uint8_t *center_freq = NULL;
-	static const uint8_t center_freq_40MHz[] = {38,  46,  54,  62,  102, 110,
-						    118, 126, 134, 142, 151, 159};
-	static const uint8_t center_freq_80MHz[] = {42, 58, 106, 122, 138, 155};
-	uint8_t index, index_max, chan_idx, ch_offset = 0;
-
-	/* Unless ACS is being used, both "channel" and "vht_oper_centr_freq_seg0_idx"
-	 * parameters must be set.
-	 */
-	switch (params->bandwidth) {
-	case WIFI_FREQ_BANDWIDTH_20MHZ:
-		oper_chwidth = CHANWIDTH_USE_HT;
-		center_freq_seg0_idx = params->channel;
-		break;
-	case WIFI_FREQ_BANDWIDTH_40MHZ:
-		oper_chwidth = CHANWIDTH_USE_HT;
-		center_freq = center_freq_40MHz;
-		index_max = ARRAY_SIZE(center_freq_40MHz);
-		ch_offset = 2;
-		break;
-	case WIFI_FREQ_BANDWIDTH_80MHZ:
-		oper_chwidth = CHANWIDTH_80MHZ;
-		center_freq = center_freq_80MHz;
-		index_max = ARRAY_SIZE(center_freq_80MHz);
-		ch_offset = 6;
-		break;
-	default:
-		return -EINVAL;
-	}
+	struct wpa_supplicant *wpa_s;
+	int ret;
 
-	if (params->bandwidth != WIFI_FREQ_BANDWIDTH_20MHZ) {
-		chan_idx = params->channel;
-		for (index = 0; index < index_max; index++) {
-			if ((chan_idx >= (center_freq[index] - ch_offset)) &&
-			    (chan_idx <= (center_freq[index] + ch_offset))) {
-				center_freq_seg0_idx = center_freq[index];
-				break;
-			}
-		}
+	if (!net_if_is_admin_up(net_if_lookup_by_dev(dev))) {
+		wpa_printf(MSG_ERROR,
+			   "Interface %s is down, dropping connect",
+			   dev->name);
+		return -1;
 	}
 
-	if (!hostapd_cli_cmd_v("set vht_oper_chwidth %d", oper_chwidth)) {
-		goto out;
+	ret = set_ap_bandwidth(dev, params->bandwidth);
+	if (ret && (ret != -ENOTSUP)) {
+		wpa_printf(MSG_ERROR, "Failed to set ap bandwidth");
+		return -EINVAL;
 	}
-	if (!hostapd_cli_cmd_v("set vht_oper_centr_freq_seg0_idx %d", center_freq_seg0_idx)) {
+
+	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
+
+	wpa_s = get_wpa_s_handle(dev);
+	if (!wpa_s) {
+		ret = -1;
+		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
 		goto out;
 	}
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
-	if (!hostapd_cli_cmd_v("set he_oper_chwidth %d", oper_chwidth)) {
+
+	if (wpa_s->wpa_state != WPA_DISCONNECTED) {
+		ret = -EBUSY;
+		wpa_printf(MSG_ERROR, "Interface %s is not in disconnected state", dev->name);
 		goto out;
 	}
-	if (!hostapd_cli_cmd_v("set he_oper_centr_freq_seg0_idx %d", center_freq_seg0_idx)) {
+
+	/* No need to check for existing network to join for SoftAP */
+	wpa_s->conf->ap_scan = 2;
+	/* Set BSS parameter max_num_sta to default configured value */
+	wpa_s->conf->max_num_sta = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
+
+	ret = wpas_add_and_config_network(wpa_s, params, true);
+	if (ret) {
+		wpa_printf(MSG_ERROR, "Failed to add and configure network for AP mode: %d", ret);
 		goto out;
 	}
-#endif
 
-	return ret;
 out:
-	return -EINVAL;
+	k_mutex_unlock(&wpa_supplicant_mutex);
+
+	return ret;
 }
 
-int hapd_config_network(struct hostapd_iface *iface,
-			struct wifi_connect_req_params *params)
+int supplicant_ap_disable(const struct device *dev)
 {
-	int ret = 0;
-
-	if (!hostapd_cli_cmd_v("set ssid %s", params->ssid)) {
-		goto out;
-	}
-
-	if (params->channel == 0) {
-		if (params->band == 0) {
-			if (!hostapd_cli_cmd_v("set hw_mode g")) {
-				goto out;
-			}
-		} else if (params->band == 1) {
-			if (!hostapd_cli_cmd_v("set hw_mode a")) {
-				goto out;
-			}
-		} else {
-			wpa_printf(MSG_ERROR, "Invalid band %d", params->band);
-			goto out;
-		}
-	} else if (params->channel > 14) {
-		if (!hostapd_cli_cmd_v("set hw_mode a")) {
-			goto out;
-		}
-	} else {
-		if (!hostapd_cli_cmd_v("set hw_mode g")) {
-			goto out;
-		}
-	}
-
-	if (!hostapd_cli_cmd_v("set channel %d", params->channel)) {
-		goto out;
-	}
-
-	ret = hapd_config_chan_center_seg0(params);
-	if (ret) {
-		goto out;
-	}
-
-	if (params->security != WIFI_SECURITY_TYPE_NONE) {
-		if (params->security == WIFI_SECURITY_TYPE_WPA_PSK) {
-			if (!hostapd_cli_cmd_v("set wpa 1")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_pairwise CCMP")) {
-				goto out;
-			}
-		} else if (params->security == WIFI_SECURITY_TYPE_PSK) {
-			if (!hostapd_cli_cmd_v("set wpa 2")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
-				goto out;
-			}
-		} else if (params->security == WIFI_SECURITY_TYPE_PSK_SHA256) {
-			if (!hostapd_cli_cmd_v("set wpa 2")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK-SHA256")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
-				goto out;
-			}
-		} else if (params->security == WIFI_SECURITY_TYPE_SAE_HNP ||
-			   params->security == WIFI_SECURITY_TYPE_SAE_H2E ||
-			   params->security == WIFI_SECURITY_TYPE_SAE_AUTO) {
-			if (!hostapd_cli_cmd_v("set wpa 2")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_key_mgmt SAE")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set sae_password %s",
-					       params->sae_password ? params->sae_password :
-					       params->psk)) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
-				goto out;
-			}
-			if (params->security == WIFI_SECURITY_TYPE_SAE_H2E ||
-			    params->security == WIFI_SECURITY_TYPE_SAE_AUTO) {
-				if (!hostapd_cli_cmd_v("set sae_pwe %d",
-					(params->security == WIFI_SECURITY_TYPE_SAE_H2E)
-						? 1
-						: 2)) {
-					goto out;
-				}
-			}
-		} else if (params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) {
-			if (!hostapd_cli_cmd_v("set wpa 2")) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK SAE")) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set sae_password %s",
-					       params->sae_password ? params->sae_password
-								    : params->psk)) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
-				goto out;
-			}
-
-			if (!hostapd_cli_cmd_v("set sae_pwe 2")) {
-				goto out;
-			}
-		} else if (params->security == WIFI_SECURITY_TYPE_DPP) {
-			if (!hostapd_cli_cmd_v("set wpa 2")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_key_mgmt WPA-PSK DPP")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_passphrase %s", params->psk)) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set wpa_pairwise CCMP")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set rsn_pairwise CCMP")) {
-				goto out;
-			}
-			if (!hostapd_cli_cmd_v("set dpp_configurator_connectivity 1")) {
-				goto out;
-			}
-#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
-		} else if (is_eap_valid_security(params->security)) {
-			if (hapd_process_enterprise_config(iface, params)) {
-				goto out;
-			}
-#endif
-		}
-	} else {
-		if (!hostapd_cli_cmd_v("set wpa 0")) {
-			goto out;
-		}
-		iface->bss[0]->conf->wpa_key_mgmt = WPA_KEY_MGMT_NONE;
-	}
-
-	if (!hostapd_cli_cmd_v("set ieee80211w %d", params->mfp)) {
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("set ignore_broadcast_ssid %d", params->ignore_broadcast_ssid)) {
-		goto out;
-	}
-
-	return ret;
-out:
-	return -1;
-}
-
-static int set_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params)
-{
-	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
-
-	if (wifi_mgmt_api == NULL || wifi_mgmt_api->ap_config_params == NULL) {
-		return -ENOTSUP;
-	}
-
-	return wifi_mgmt_api->ap_config_params(dev, params);
-}
-
-int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params)
-{
-	struct hostapd_iface *iface;
-	int ret = 0;
-
-	ret = set_ap_config_params(dev, params);
-	if (ret && (ret != -ENOTSUP)) {
-		wpa_printf(MSG_ERROR, "Failed to set ap config params");
-		return -EINVAL;
-	}
+	struct wpa_supplicant *wpa_s;
+	int ret = -1;
 
 	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
 
-	iface = get_hostapd_handle(dev);
-	if (iface == NULL) {
-		ret = -ENOENT;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (iface->state > HAPD_IFACE_DISABLED) {
-		ret = -EBUSY;
-		wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);
-		goto out;
-	}
-
-	if (params->type & WIFI_AP_CONFIG_PARAM_MAX_NUM_STA) {
-		if (!hostapd_cli_cmd_v("set max_num_sta %d", params->max_num_sta)) {
-			ret = -EINVAL;
-			wpa_printf(MSG_ERROR, "Failed to set maximum number of stations");
-			goto out;
-		}
-		wpa_printf(MSG_INFO, "Set maximum number of stations: %d", params->max_num_sta);
-	}
-
-	if (params->type & WIFI_AP_CONFIG_PARAM_HT_CAPAB) {
-		if (!hostapd_cli_cmd_v("set ht_capab %s", params->ht_capab)) {
-			ret = -EINVAL;
-			wpa_printf(MSG_ERROR, "Failed to set HT capabilities");
-			goto out;
-		}
-		wpa_printf(MSG_INFO, "Set HT capabilities: %s", params->ht_capab);
-	}
-
-	if (params->type & WIFI_AP_CONFIG_PARAM_VHT_CAPAB) {
-		if (!hostapd_cli_cmd_v("set vht_capab %s", params->vht_capab)) {
-			ret = -EINVAL;
-			wpa_printf(MSG_ERROR, "Failed to set VHT capabilities");
-			goto out;
-		}
-		wpa_printf(MSG_INFO, "Set VHT capabilities: %s", params->vht_capab);
-	}
-
-out:
-		k_mutex_unlock(&wpa_supplicant_mutex);
-
-	return ret;
-}
-
-int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status)
-{
-	int ret = 0;
-	struct hostapd_iface *iface;
-	struct hostapd_config *conf;
-	struct hostapd_data *hapd;
-	struct hostapd_bss_config *bss;
-	struct hostapd_ssid *ssid;
-	struct hostapd_hw_modes *hw_mode;
-	int proto;    /* Wi-Fi secure protocol */
-	int key_mgmt; /*  Wi-Fi key management */
-	int sae_pwe;
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	conf = iface->conf;
-	if (!conf) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Conf %s not found", dev->name);
-		goto out;
-	}
-
-	bss = conf->bss[0];
-	if (!bss) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Bss_conf %s not found", dev->name);
-		goto out;
-	}
-
-	hapd = iface->bss[0];
-	if (!hapd) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Bss %s not found", dev->name);
-		goto out;
-	}
-
-	status->state = iface->state;
-	ssid = &bss->ssid;
-
-	os_memcpy(status->bssid, hapd->own_addr, WIFI_MAC_ADDR_LEN);
-	status->iface_mode = WIFI_MODE_AP;
-	status->band = wpas_band_to_zephyr(wpas_freq_to_band(iface->freq));
-	key_mgmt = bss->wpa_key_mgmt;
-	proto = bss->wpa;
-	sae_pwe = bss->sae_pwe;
-	status->wpa3_ent_type = wpas_key_mgmt_to_zephyr_wpa3_ent(key_mgmt);
-	status->security = wpas_key_mgmt_to_zephyr(1, hapd->conf, key_mgmt, proto, sae_pwe);
-	status->mfp = get_mfp(bss->ieee80211w);
-	status->channel = conf->channel;
-	os_memcpy(status->ssid, ssid->ssid, ssid->ssid_len);
-
-	status->dtim_period = bss->dtim_period;
-	status->beacon_interval = conf->beacon_int;
-
-	hw_mode = iface->current_mode;
-
-	status->link_mode = conf->ieee80211ax                          ? WIFI_6
-			    : conf->ieee80211ac                        ? WIFI_5
-			    : conf->ieee80211n                         ? WIFI_4
-			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211G ? WIFI_3
-			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211A ? WIFI_2
-			    : hw_mode->mode == HOSTAPD_MODE_IEEE80211B ? WIFI_1
-								       : WIFI_0;
-	status->twt_capable = (hw_mode->he_capab[IEEE80211_MODE_AP].mac_cap[0] & 0x04);
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-	return ret;
-}
-#endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
-
-#ifdef CONFIG_WIFI_NM_HOSTAPD_WPS
-int supplicant_ap_wps_pbc(const struct device *dev)
-{
-	struct hostapd_iface *iface;
-	int ret = -1;
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (iface->state != HAPD_IFACE_ENABLED) {
-		ret = -EBUSY;
-		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("wps_pbc")) {
-		goto out;
-	}
-
-	wpas_api_ctrl.dev = dev;
-	wpas_api_ctrl.requested_op = WPS_PBC;
-
-	ret = 0;
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-
-	return ret;
-}
-
-int supplicant_ap_wps_pin(const struct device *dev, struct wifi_wps_config_params *params)
-{
-#define WPS_PIN_EXPIRE_TIME 120
-	struct hostapd_iface *iface;
-	char *get_pin_cmd = "WPS_AP_PIN random";
-	int ret  = 0;
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (iface->state != HAPD_IFACE_ENABLED) {
-		ret = -EBUSY;
-		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
-		goto out;
-	}
-
-	if (params->oper == WIFI_WPS_PIN_GET) {
-		if (zephyr_hostapd_cli_cmd_resp(get_pin_cmd, params->pin)) {
-			goto out;
-		}
-	} else if (params->oper == WIFI_WPS_PIN_SET) {
-		if (!hostapd_cli_cmd_v("wps_check_pin %s", params->pin)) {
-			goto out;
-		}
-
-		if (!hostapd_cli_cmd_v("wps_pin any %s %d", params->pin, WPS_PIN_EXPIRE_TIME)) {
-			goto out;
-		}
-
-		wpas_api_ctrl.dev = dev;
-		wpas_api_ctrl.requested_op = WPS_PIN;
-	} else {
-		wpa_printf(MSG_ERROR, "Error wps pin operation : %d", params->oper);
-		goto out;
-	}
-
-	ret = 0;
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-
-	return ret;
-}
-
-
-int supplicant_ap_wps_config(const struct device *dev, struct wifi_wps_config_params *params)
-{
-	int ret = 0;
-
-	if (params->oper == WIFI_WPS_PBC) {
-		ret = supplicant_ap_wps_pbc(dev);
-	} else if (params->oper == WIFI_WPS_PIN_GET || params->oper == WIFI_WPS_PIN_SET) {
-		ret = supplicant_ap_wps_pin(dev, params);
-	}
-
-	return ret;
-}
-#endif
-
-static int set_ap_bandwidth(const struct device *dev, enum wifi_frequency_bandwidths bandwidth)
-{
-	const struct wifi_mgmt_ops *const wifi_mgmt_api = get_wifi_mgmt_api(dev);
-	struct wifi_ap_config_params params = {0};
-
-	if (wifi_mgmt_api == NULL || wifi_mgmt_api->ap_config_params == NULL) {
-		return -ENOTSUP;
-	}
-
-	params.bandwidth = bandwidth;
-	params.type = WIFI_AP_CONFIG_PARAM_BANDWIDTH;
-	return wifi_mgmt_api->ap_config_params(dev, &params);
-}
-
-int supplicant_ap_enable(const struct device *dev,
-			 struct wifi_connect_req_params *params)
-{
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	struct hostapd_iface *iface;
-	struct hostapd_data *hapd;
-	struct wpa_driver_capa capa;
-#else
-	struct wpa_supplicant *wpa_s;
-#endif
-	int ret;
-
-	if (!net_if_is_admin_up(net_if_lookup_by_dev(dev))) {
-		wpa_printf(MSG_ERROR,
-			   "Interface %s is down, dropping connect",
-			   dev->name);
-		return -1;
-	}
-
-	ret = set_ap_bandwidth(dev, params->bandwidth);
-	if (ret && (ret != -ENOTSUP)) {
-		wpa_printf(MSG_ERROR, "Failed to set ap bandwidth");
-		return -EINVAL;
-	}
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	iface->owner = iface;
-
-	if (iface->state == HAPD_IFACE_ENABLED) {
-		ret = -EBUSY;
-		wpa_printf(MSG_ERROR, "Interface %s is not in disable state", dev->name);
-		goto out;
-	}
-
-	ret = hapd_config_network(iface, params);
-	if (ret) {
-		wpa_printf(MSG_ERROR, "Failed to configure network for AP: %d", ret);
-		goto out;
-	}
-
-	hapd = iface->bss[0];
-	if (!iface->extended_capa || !iface->extended_capa_mask) {
-		if (hapd->driver->get_capa && hapd->driver->get_capa(hapd->drv_priv, &capa) == 0) {
-			iface->extended_capa         = capa.extended_capa;
-			iface->extended_capa_mask    = capa.extended_capa_mask;
-			iface->extended_capa_len     = capa.extended_capa_len;
-			iface->drv_max_acl_mac_addrs = capa.max_acl_mac_addrs;
-
-			/*
-			 * Override extended capa with per-interface type (AP), if
-			 * available from the driver.
-			 */
-			hostapd_get_ext_capa(iface);
-		} else {
-			ret = -1;
-			wpa_printf(MSG_ERROR, "Failed to get capability for AP: %d", ret);
-			goto out;
-		}
-	}
-
-	if (!hostapd_cli_cmd_v("enable")) {
-		goto out;
-	}
-
-#else
-	wpa_s = get_wpa_s_handle(dev);
-	if (!wpa_s) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (wpa_s->wpa_state != WPA_DISCONNECTED) {
-		ret = -EBUSY;
-		wpa_printf(MSG_ERROR, "Interface %s is not in disconnected state", dev->name);
-		goto out;
-	}
-
-	/* No need to check for existing network to join for SoftAP */
-	wpa_s->conf->ap_scan = 2;
-	/* Set BSS parameter max_num_sta to default configured value */
-	wpa_s->conf->max_num_sta = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
-
-	ret = wpas_add_and_config_network(wpa_s, params, true);
-	if (ret) {
-		wpa_printf(MSG_ERROR, "Failed to add and configure network for AP mode: %d", ret);
-		goto out;
-	}
-#endif
-
-out:
-	k_mutex_unlock(&wpa_supplicant_mutex);
-
-	return ret;
-}
-
-int supplicant_ap_disable(const struct device *dev)
-{
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	struct hostapd_iface *iface;
-	int ret = 0;
-#else
-	struct wpa_supplicant *wpa_s;
-	int ret = -1;
-#endif
-
-	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
-
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		ret = -ENOENT;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (iface->state != HAPD_IFACE_ENABLED) {
-		ret = -EBUSY;
-		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("disable")) {
-		goto out;
-	}
-
-	iface->freq = 0;
-#else
 	wpa_s = get_wpa_s_handle(dev);
 	if (!wpa_s) {
 		ret = -1;
@@ -2902,7 +1990,6 @@ int supplicant_ap_disable(const struct device *dev)
 
 	/* Restore ap_scan to default value */
 	wpa_s->conf->ap_scan = 1;
-#endif
 
 out:
 	k_mutex_unlock(&wpa_supplicant_mutex);
@@ -2912,43 +1999,11 @@ int supplicant_ap_disable(const struct device *dev)
 int supplicant_ap_sta_disconnect(const struct device *dev,
 				 const uint8_t *mac_addr)
 {
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	struct hostapd_iface *iface;
-	int ret  = 0;
-#else
 	struct wpa_supplicant *wpa_s;
 	int ret = -1;
-#endif
 
 	k_mutex_lock(&wpa_supplicant_mutex, K_FOREVER);
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	iface = get_hostapd_handle(dev);
-	if (!iface) {
-		ret = -1;
-		wpa_printf(MSG_ERROR, "Interface %s not found", dev->name);
-		goto out;
-	}
-
-	if (iface->state != HAPD_IFACE_ENABLED) {
-		ret = -EBUSY;
-		wpa_printf(MSG_ERROR, "Interface %s is not in enable state", dev->name);
-		goto out;
-	}
-
-	if (!mac_addr) {
-		ret = -EINVAL;
-		wpa_printf(MSG_ERROR, "Invalid MAC address");
-		goto out;
-	}
-
-	if (!hostapd_cli_cmd_v("deauthenticate %02x:%02x:%02x:%02x:%02x:%02x",
-				mac_addr[0], mac_addr[1], mac_addr[2],
-				mac_addr[3], mac_addr[4], mac_addr[5])) {
-		goto out;
-	}
-
-#else
 	wpa_s = get_wpa_s_handle(dev);
 	if (!wpa_s) {
 		ret = -1;
@@ -2969,7 +2024,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 	}
 
 	ret = 0;
-#endif
 
 out:
 	k_mutex_unlock(&wpa_supplicant_mutex);
@@ -3045,10 +2099,9 @@ static void dpp_ssid_bin2str(char *dst, uint8_t *src, int max_len)
 	}
 }
 
-#define SUPPLICANT_DPP_CMD_BUF_SIZE 384
 #define STR_CUR_TO_END(cur) (cur) = (&(cur)[0] + strlen((cur)))
 
-static int dpp_params_to_cmd(struct wifi_dpp_params *params, char *cmd, size_t max_len)
+int dpp_params_to_cmd(struct wifi_dpp_params *params, char *cmd, size_t max_len)
 {
 	char *pos = cmd;
 	char *end = cmd + max_len;
@@ -3268,37 +2321,4 @@ int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *pa
 	os_free(cmd);
 	return 0;
 }
-
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params)
-{
-	int ret;
-	char *cmd = NULL;
-
-	if (params == NULL) {
-		return -EINVAL;
-	}
-
-	cmd = os_zalloc(SUPPLICANT_DPP_CMD_BUF_SIZE);
-	if (cmd == NULL) {
-		return -ENOMEM;
-	}
-
-	/* leave one byte always be 0 */
-	ret = dpp_params_to_cmd(params, cmd, SUPPLICANT_DPP_CMD_BUF_SIZE - 2);
-	if (ret) {
-		os_free(cmd);
-		return ret;
-	}
-
-	wpa_printf(MSG_DEBUG, "hostapd_cli %s", cmd);
-	if (zephyr_hostapd_cli_cmd_resp(cmd, params->resp)) {
-		os_free(cmd);
-		return -ENOEXEC;
-	}
-
-	os_free(cmd);
-	return 0;
-}
-#endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/modules/hostap/src/supp_api.h b/modules/hostap/src/supp_api.h
index cb4e7836f1ca6..ddd3c3d66988b 100644
--- a/modules/hostap/src/supp_api.h
+++ b/modules/hostap/src/supp_api.h
@@ -8,6 +8,7 @@
 #ifndef ZEPHYR_SUPP_MGMT_H
 #define ZEPHYR_SUPP_MGMT_H
 
+#include <defs.h>
 #include <zephyr/net/wifi_mgmt.h>
 
 #ifndef MAX_SSID_LEN
@@ -20,6 +21,17 @@
 #define MAC_STR_LEN 18 /* for ':' or '-' separated MAC address string */
 #define CHAN_NUM_LEN 6 /* for space-separated channel numbers string */
 
+enum wifi_frequency_bands wpas_band_to_zephyr(enum wpa_radio_work_band band);
+
+enum wifi_wpa3_enterprise_type wpas_key_mgmt_to_zephyr_wpa3_ent(int key_mgmt);
+
+enum wifi_security_type wpas_key_mgmt_to_zephyr(bool is_hapd, void *config,
+						int key_mgmt, int proto, int pwe);
+
+const struct wifi_mgmt_ops *const get_wifi_mgmt_api(const struct device *dev);
+
+enum wifi_mfp_options get_mfp(enum mfp_options supp_mfp_option);
+
 /**
  * @brief Get version
  *
@@ -194,6 +206,11 @@ int supplicant_mode(const struct device *dev, struct wifi_mode_info *mode);
 
 #if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
 	defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+int is_eap_valid_security(int security);
+
+int process_cipher_config(struct wifi_connect_req_params *params,
+			  struct wifi_eap_cipher_config *cipher_config);
+
 /** Set Wi-Fi enterprise mode CA/client Cert and key
  *
  * @param dev Pointer to the device structure for the driver instance
@@ -289,50 +306,7 @@ int supplicant_get_wifi_conn_params(const struct device *dev,
 int supplicant_wps_config(const struct device *dev, struct wifi_wps_config_params *params);
 
 #ifdef CONFIG_AP
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-/**
- * @brief Get Wi-Fi AP Status
- *
- * @param dev Wi-Fi device
- * @param params AP status
- * @return 0 for OK; -1 for ERROR
- */
-int hapd_state(const struct device *dev, int *state);
-
-/**
- * @brief Wi-Fi AP configuration parameter.
- *
- * @param dev Wi-Fi device
- * @param params AP parameters
- * @return 0 for OK; -1 for ERROR
- */
-int supplicant_ap_config_params(const struct device *dev, struct wifi_ap_config_params *params);
-#else
-static inline int hapd_state(const struct device *dev, int *state)
-{
-	return -EINVAL;
-}
-#endif
-
-#ifdef CONFIG_WIFI_NM_HOSTAPD_WPS
-/** Start AP WPS PBC/PIN
- *
- * @param dev Pointer to the device structure for the driver instance
- * @param params wps operarion parameters
- *
- * @return 0 if ok, < 0 if error
- */
-int supplicant_ap_wps_config(const struct device *dev, struct wifi_wps_config_params *params);
-#endif
-
-/**
- * @brief Get Wi-Fi SAP status
- *
- * @param dev Wi-Fi device
- * @param status SAP status
- * @return 0 for OK; -1 for ERROR
- */
-int supplicant_ap_status(const struct device *dev, struct wifi_iface_status *status);
+int set_ap_bandwidth(const struct device *dev, enum wifi_frequency_bandwidths bandwidth);
 
 /**
  * @brief Set Wi-Fi AP configuration
@@ -363,6 +337,10 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 #endif /* CONFIG_AP */
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
+#define SUPPLICANT_DPP_CMD_BUF_SIZE 384
+
+int dpp_params_to_cmd(struct wifi_dpp_params *params, char *cmd, size_t max_len);
+
 /**
  * @brief Dispatch DPP operations for STA
  *
@@ -371,16 +349,5 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
  * @return 0 for OK; -1 for ERROR
  */
 int supplicant_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
-
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-/**
- * @brief Dispatch DPP operations for AP
- *
- * @param dev Wi-Fi interface name to use
- * @param dpp_params DPP action enum and params in string
- * @return 0 for OK; -1 for ERROR
- */
-int hapd_dpp_dispatch(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_HOSTAPD_AP */
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 #endif /* ZEPHYR_SUPP_MGMT_H */
diff --git a/modules/hostap/src/supp_events.c b/modules/hostap/src/supp_events.c
index 22b406e2fdc05..596ffa6ff560a 100644
--- a/modules/hostap/src/supp_events.c
+++ b/modules/hostap/src/supp_events.c
@@ -252,11 +252,7 @@ int supplicant_send_wifi_mgmt_disc_event(void *ctx, int reason_code)
 }
 
 #ifdef CONFIG_AP
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-static enum wifi_link_mode get_sta_link_mode(struct hostapd_iface *iface, struct sta_info *sta)
-#else
 static enum wifi_link_mode get_sta_link_mode(struct wpa_supplicant *wpa_s, struct sta_info *sta)
-#endif
 {
 	if (sta->flags & WLAN_STA_HE) {
 		return WIFI_6;
@@ -264,37 +260,17 @@ static enum wifi_link_mode get_sta_link_mode(struct wpa_supplicant *wpa_s, struc
 		return WIFI_5;
 	} else if (sta->flags & WLAN_STA_HT) {
 		return WIFI_4;
-#ifndef CONFIG_WIFI_NM_HOSTAPD_AP
 	} else if (sta->flags & WLAN_STA_NONERP) {
 		return WIFI_1;
 	} else if (wpa_s->assoc_freq > 4000) {
 		return WIFI_2;
 	} else if (wpa_s->assoc_freq > 2000) {
 		return WIFI_3;
-#else
-	} else if ((sta->flags & WLAN_STA_NONERP) ||
-		   (iface->current_mode->mode == HOSTAPD_MODE_IEEE80211B)) {
-		return WIFI_1;
-	} else if (iface->freq > 4000) {
-		return WIFI_2;
-	} else if (iface->freq > 2000) {
-		return WIFI_3;
-#endif
 	} else {
 		return WIFI_LINK_MODE_UNKNOWN;
 	}
 }
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-static bool is_twt_capable(struct hostapd_iface *iface, struct sta_info *sta)
-{
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
-	return hostapd_get_he_twt_responder(iface->bss[0], IEEE80211_MODE_AP);
-#else
-	return false;
-#endif
-}
-#else
 static bool is_twt_capable(struct wpa_supplicant *wpa_s, struct sta_info *sta)
 {
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
@@ -303,19 +279,13 @@ static bool is_twt_capable(struct wpa_supplicant *wpa_s, struct sta_info *sta)
 	return false;
 #endif
 }
-#endif
 
 int supplicant_send_wifi_mgmt_ap_status(void *ctx,
 					enum net_event_wifi_cmd event,
 					enum wifi_ap_status ap_status)
 {
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	struct hostapd_iface *iface = ctx;
-	char *ifname = iface->conf->bss[0]->iface;
-#else
 	struct wpa_supplicant *wpa_s = ctx;
 	char *ifname = wpa_s->ifname;
-#endif
 	int status = ap_status;
 
 	return supplicant_send_wifi_mgmt_event(ifname,
@@ -329,13 +299,8 @@ int supplicant_send_wifi_mgmt_ap_sta_event(void *ctx,
 					   void *data)
 {
 	struct sta_info *sta = data;
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	struct hostapd_iface *ap_ctx = ctx;
-	char *ifname = ap_ctx->bss[0]->conf->iface;
-#else
 	struct wpa_supplicant *ap_ctx = ctx;
 	char *ifname = ap_ctx->ifname;
-#endif
 	struct wifi_ap_sta_info sta_info = { 0 };
 
 	if (!ap_ctx || !sta) {
@@ -463,42 +428,3 @@ int supplicant_generate_state_event(const char *ifname,
 
 	return 0;
 }
-
-#if defined(CONFIG_WIFI_NM_HOSTAPD_AP) && defined(CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP)
-void hostapd_handle_dpp_event(void *ctx, char *buf, size_t len)
-{
-	struct hostapd_data *hapd = (struct hostapd_data *)ctx;
-
-	if (hapd == NULL) {
-		return;
-	}
-
-	struct hostapd_bss_config *conf = hapd->conf;
-
-	if (conf == NULL || !(conf->wpa_key_mgmt & WPA_KEY_MGMT_DPP)) {
-		return;
-	}
-
-	/* check hostapd */
-	if (!strncmp(buf, DPP_EVENT_CONNECTOR, sizeof(DPP_EVENT_CONNECTOR) - 1)) {
-		if (conf->dpp_connector) {
-			os_free(conf->dpp_connector);
-		}
-
-		conf->dpp_connector = os_strdup(buf + sizeof(DPP_EVENT_CONNECTOR) - 1);
-	} else if (!strncmp(buf, DPP_EVENT_C_SIGN_KEY, sizeof(DPP_EVENT_C_SIGN_KEY) - 1)) {
-		if (conf->dpp_csign) {
-			wpabuf_free(conf->dpp_csign);
-		}
-
-		conf->dpp_csign = wpabuf_parse_bin(buf + sizeof(DPP_EVENT_C_SIGN_KEY) - 1);
-	} else if (!strncmp(buf, DPP_EVENT_NET_ACCESS_KEY, sizeof(DPP_EVENT_NET_ACCESS_KEY) - 1)) {
-		if (conf->dpp_netaccesskey) {
-			wpabuf_free(conf->dpp_netaccesskey);
-		}
-
-		conf->dpp_netaccesskey =
-			wpabuf_parse_bin(buf + sizeof(DPP_EVENT_NET_ACCESS_KEY) - 1);
-	}
-}
-#endif /* CONFIG_WIFI_NM_HOSTAPD_AP && CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
diff --git a/modules/hostap/src/supp_events.h b/modules/hostap/src/supp_events.h
index 308a9e49734d5..dc922940d7882 100644
--- a/modules/hostap/src/supp_events.h
+++ b/modules/hostap/src/supp_events.h
@@ -63,9 +63,6 @@ int supplicant_send_wifi_mgmt_ap_sta_event(void *ctx,
 					   enum net_event_wifi_cmd event,
 					   void *data);
 #endif /* CONFIG_AP */
-#if defined(CONFIG_WIFI_NM_HOSTAPD_AP) && defined(CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP)
-void hostapd_handle_dpp_event(void *ctx, char *buf, size_t len);
-#endif
 
 #define REASON_CODE_LEN 18
 #define NM_WIFI_EVENT_STR_LEN 64
diff --git a/modules/hostap/src/supp_main.c b/modules/hostap/src/supp_main.c
index 4fdc144d435e8..120050a75c7aa 100644
--- a/modules/hostap/src/supp_main.c
+++ b/modules/hostap/src/supp_main.c
@@ -46,10 +46,7 @@ static K_THREAD_STACK_DEFINE(iface_wq_stack, CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_ST
 #include "wpa_cli_zephyr.h"
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 #include "hostapd.h"
-#include "hostapd_cli_zephyr.h"
-#include "eap_register.h"
-#include "ap_drv_ops.h"
-#include "l2_packet/l2_packet.h"
+#include "hapd_main.h"
 #endif
 
 static const struct wifi_mgmt_ops mgmt_ops = {
@@ -100,29 +97,6 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 
 DEFINE_WIFI_NM_INSTANCE(wifi_supplicant, &mgmt_ops);
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-static const struct wifi_mgmt_ops mgmt_ap_ops = {
-	.ap_enable = supplicant_ap_enable,
-	.ap_disable = supplicant_ap_disable,
-	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
-	.iface_status = supplicant_ap_status,
-#ifdef CONFIG_WIFI_NM_HOSTAPD_WPS
-	.wps_config = supplicant_ap_wps_config,
-#endif
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
-	.dpp_dispatch = hapd_dpp_dispatch,
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-	.ap_config_params = supplicant_ap_config_params,
-	.set_rts_threshold = supplicant_set_rts_threshold,
-#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
-	.enterprise_creds = supplicant_add_enterprise_creds,
-#endif
-	.set_btwt = supplicant_set_btwt,
-};
-
-DEFINE_WIFI_NM_INSTANCE(hostapd, &mgmt_ap_ops);
-#endif
-
 #define WRITE_TIMEOUT 100 /* ms */
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON
 #define INTERFACE_EVENT_MASK (NET_EVENT_IF_ADMIN_UP | NET_EVENT_IF_ADMIN_DOWN)
@@ -141,38 +115,6 @@ struct supplicant_context {
 	int (*iface_handler)(struct supplicant_context *ctx, struct net_if *iface);
 };
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-struct hapd_global {
-	void **drv_priv;
-	size_t drv_count;
-};
-
-static struct hapd_global hglobal;
-
-#ifndef HOSTAPD_CLEANUP_INTERVAL
-#define HOSTAPD_CLEANUP_INTERVAL 10
-#endif /* HOSTAPD_CLEANUP_INTERVAL */
-
-static void zephyr_hostap_ctrl_iface_msg_cb(void *ctx, int level, enum wpa_msg_type type,
-					    const char *txt, size_t len);
-
-static int hostapd_periodic_call(struct hostapd_iface *iface, void *ctx)
-{
-	hostapd_periodic_iface(iface);
-	return 0;
-}
-
-/* Periodic cleanup tasks */
-static void hostapd_periodic(void *eloop_ctx, void *timeout_ctx)
-{
-	struct hapd_interfaces *interfaces = eloop_ctx;
-
-	eloop_register_timeout(HOSTAPD_CLEANUP_INTERVAL, 0,
-			       hostapd_periodic, interfaces, NULL);
-	hostapd_for_each_interface(interfaces, hostapd_periodic_call, NULL);
-}
-#endif
-
 static struct supplicant_context *get_default_context(void)
 {
 	static struct supplicant_context ctx;
@@ -185,6 +127,13 @@ struct wpa_global *zephyr_get_default_supplicant_context(void)
 	return get_default_context()->supplicant;
 }
 
+#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
+struct hapd_interfaces *zephyr_get_default_hapd_context(void)
+{
+	return &get_default_context()->hostapd;
+}
+#endif
+
 struct k_work_q *get_workq(void)
 {
 	return &get_default_context()->iface_wq;
@@ -265,22 +214,6 @@ struct wpa_supplicant *zephyr_get_handle_by_ifname(const char *ifname)
 	return wpa_s;
 }
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-struct hostapd_iface *zephyr_get_hapd_handle_by_ifname(const char *ifname)
-{
-	struct hostapd_data *hapd = NULL;
-	struct supplicant_context *ctx = get_default_context();
-
-	hapd = hostapd_get_iface(&ctx->hostapd, ifname);
-	if (!hapd) {
-		wpa_printf(MSG_ERROR, "%s: Unable to get hapd handle for %s\n", __func__, ifname);
-		return NULL;
-	}
-
-	return hapd->iface;
-}
-#endif
-
 static int get_iface_count(struct supplicant_context *ctx)
 {
 	/* FIXME, should not access ifaces as it is supplicant internal data */
@@ -639,502 +572,13 @@ static int register_supplicant_event_socket(struct supplicant_context *ctx)
 	return 0;
 }
 
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-struct hostapd_iface *hostapd_get_interface(const char *ifname)
-{
-	struct supplicant_context *ctx;
-
-	ctx = get_default_context();
-	(void)ifname;
-	return ctx->hostapd.iface[0];
-}
-
-static void hostapd_event_eapol_rx_cb(void *ctx, const u8 *src_addr,
-				       const u8 *buf, size_t len)
-{
-	hostapd_event_eapol_rx(ctx, src_addr, buf, len, FRAME_ENCRYPTION_UNKNOWN, -1);
-}
-
-static int hostapd_enable_iface_cb(struct hostapd_iface *hapd_iface)
-{
-	struct hostapd_data *bss;
-
-	wpa_printf(MSG_DEBUG, "Enable interface %s", hapd_iface->conf->bss[0]->iface);
-
-	bss = hapd_iface->bss[0];
-
-	bss->conf->start_disabled = 0;
-
-	if (hostapd_config_check(hapd_iface->conf, 1) < 0) {
-		wpa_printf(MSG_INFO, "Invalid configuration - cannot enable");
-		return -1;
-	}
-
-	l2_packet_deinit(bss->l2);
-	bss->l2 = l2_packet_init(bss->conf->iface, bss->conf->bssid, ETH_P_EAPOL,
-				 &hostapd_event_eapol_rx_cb, bss, 0);
-	if (bss->l2 == NULL) {
-		wpa_printf(MSG_ERROR, "Failed to initialize l2 for hostapd interface");
-		return -1;
-	}
-
-	if (hostapd_setup_interface(hapd_iface)) {
-		wpa_printf(MSG_ERROR, "Failed to initialize hostapd interface");
-		return -1;
-	}
-
-	return 0;
-}
-
-static int hostapd_disable_iface_cb(struct hostapd_iface *hapd_iface)
-{
-	size_t j;
-	struct hostapd_data *hapd = NULL;
-
-	wpa_msg(hapd_iface->bss[0]->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
-
-	hapd_iface->driver_ap_teardown = !!(hapd_iface->drv_flags
-					    & WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
-
-#ifdef NEED_AP_MLME
-	for (j = 0; j < hapd_iface->num_bss; j++) {
-		hostapd_cleanup_cs_params(hapd_iface->bss[j]);
-	}
-#endif /* NEED_AP_MLME */
-
-	/* Same as hostapd_interface_deinit() without deinitializing control
-	 * interface
-	 */
-	for (j = 0; j < hapd_iface->num_bss; j++) {
-		hapd = hapd_iface->bss[j];
-		hostapd_bss_deinit_no_free(hapd);
-		hostapd_free_hapd_data(hapd);
-	}
-
-	hostapd_drv_stop_ap(hapd);
-
-	hostapd_cleanup_iface_partial(hapd_iface);
-
-	wpa_printf(MSG_DEBUG, "Interface %s disabled", hapd_iface->bss[0]->conf->iface);
-	hostapd_set_state(hapd_iface, HAPD_IFACE_DISABLED);
-	supplicant_send_wifi_mgmt_ap_status(hapd_iface,
-					    NET_EVENT_WIFI_CMD_AP_DISABLE_RESULT,
-					    WIFI_STATUS_AP_SUCCESS);
-	hostapd_config_free(hapd_iface->conf);
-	hapd_iface->conf = hapd_iface->interfaces->config_read_cb(hapd_iface->config_fname);
-	for (j = 0; j < hapd_iface->num_bss; j++) {
-		hapd = hapd_iface->bss[j];
-		hapd->iconf = hapd_iface->conf;
-		hapd->conf = hapd_iface->conf->bss[j];
-		hapd->driver = hapd_iface->conf->driver;
-	}
-
-	return 0;
-}
-
-static int hostapd_global_init(struct hapd_interfaces *interfaces, const char *entropy_file)
-{
-	int i;
-
-	os_memset(&hglobal, 0, sizeof(struct hapd_global));
-
-	if (eap_server_register_methods()) {
-		wpa_printf(MSG_ERROR, "Failed to register EAP methods");
-		return -1;
-	}
-
-	interfaces->eloop_initialized = 1;
-
-	for (i = 0; wpa_drivers[i]; i++) {
-		hglobal.drv_count++;
-	}
-
-	if (hglobal.drv_count == 0) {
-		wpa_printf(MSG_ERROR, "No drivers enabled");
-		return -1;
-	}
-	hglobal.drv_priv = os_calloc(hglobal.drv_count, sizeof(void *));
-	if (hglobal.drv_priv == NULL) {
-		return -1;
-	}
-
-	return 0;
-}
-
-static int hostapd_driver_init(struct hostapd_iface *iface)
-{
-	struct wpa_init_params params;
-	size_t i;
-	struct hostapd_data *hapd       = iface->bss[0];
-	struct hostapd_bss_config *conf = hapd->conf;
-	u8 *b                           = conf->bssid;
-	struct wpa_driver_capa capa;
-
-	if (hapd->driver == NULL || hapd->driver->hapd_init == NULL) {
-		wpa_printf(MSG_ERROR, "No hostapd driver wrapper available");
-		return -1;
-	}
-
-	/* Initialize the driver interface */
-	if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5])) {
-		b = NULL;
-	}
-
-	os_memset(&params, 0, sizeof(params));
-	for (i = 0; wpa_drivers[i]; i++) {
-		if (wpa_drivers[i] != hapd->driver)
-			continue;
-
-		if (hglobal.drv_priv[i] == NULL && wpa_drivers[i]->global_init) {
-			hglobal.drv_priv[i] = wpa_drivers[i]->global_init(iface->interfaces);
-			if (hglobal.drv_priv[i] == NULL) {
-				wpa_printf(MSG_ERROR, "Failed to initialize driver '%s'",
-					   wpa_drivers[i]->name);
-				return -1;
-			}
-			hglobal.drv_count++;
-		}
-
-		params.global_priv = hglobal.drv_priv[i];
-		break;
-	}
-	params.bssid              = b;
-	params.ifname             = hapd->conf->iface;
-	params.driver_params      = hapd->iconf->driver_params;
-	params.use_pae_group_addr = hapd->conf->use_pae_group_addr;
-	params.num_bridge         = hapd->iface->num_bss;
-	params.bridge             = os_calloc(hapd->iface->num_bss, sizeof(char *));
-	if (params.bridge == NULL) {
-		return -1;
-	}
-	for (i = 0; i < hapd->iface->num_bss; i++) {
-		struct hostapd_data *bss = hapd->iface->bss[i];
-
-		if (bss->conf->bridge[0]) {
-			params.bridge[i] = bss->conf->bridge;
-		}
-	}
-
-	params.own_addr = hapd->own_addr;
-
-	hapd->drv_priv = hapd->driver->hapd_init(hapd, &params);
-	os_free(params.bridge);
-	if (hapd->drv_priv == NULL) {
-		wpa_printf(MSG_ERROR, "%s driver initialization failed.",
-			   hapd->driver->name);
-		hapd->driver = NULL;
-		return -1;
-	}
-
-	if (hapd->driver->get_capa && hapd->driver->get_capa(hapd->drv_priv, &capa) == 0) {
-		struct wowlan_triggers *triggs;
-
-		iface->drv_flags           = capa.flags;
-		iface->drv_flags2          = capa.flags2;
-		iface->probe_resp_offloads = capa.probe_resp_offloads;
-		/*
-		 * Use default extended capa values from per-radio information
-		 */
-		iface->extended_capa         = capa.extended_capa;
-		iface->extended_capa_mask    = capa.extended_capa_mask;
-		iface->extended_capa_len     = capa.extended_capa_len;
-		iface->drv_max_acl_mac_addrs = capa.max_acl_mac_addrs;
-
-		/*
-		 * Override extended capa with per-interface type (AP), if
-		 * available from the driver.
-		 */
-		hostapd_get_ext_capa(iface);
-
-		triggs = wpa_get_wowlan_triggers(conf->wowlan_triggers, &capa);
-		if (triggs && hapd->driver->set_wowlan) {
-			if (hapd->driver->set_wowlan(hapd->drv_priv, triggs)) {
-				wpa_printf(MSG_ERROR, "set_wowlan failed");
-			}
-		}
-		os_free(triggs);
-	}
-
-	return 0;
-}
-
-struct hostapd_config *hostapd_config_read2(const char *fname)
-{
-	struct hostapd_config *conf;
-	const struct device *dev;
-	char ifname[IFNAMSIZ + 1] = {0};
-	int errors = 0;
-	size_t i;
-	int aCWmin = 4, aCWmax = 10;
-	/* background traffic */
-	struct hostapd_wmm_ac_params ac_bk = {aCWmin, aCWmax, 9, 0, 0};
-	/* best effort traffic */
-	struct hostapd_wmm_ac_params ac_be = {aCWmin, aCWmax - 4, 5, 0, 0};
-	/* video traffic */
-	struct hostapd_wmm_ac_params ac_vi = {aCWmin - 1, aCWmin, 3,
-					      3008 / 32, 0};
-	/* voice traffic */
-	struct hostapd_wmm_ac_params ac_vo = {aCWmin - 2, aCWmin - 1, 3,
-					      1504 / 32, 0};
-
-	dev = net_if_get_device(net_if_get_wifi_sap());
-	strncpy(ifname, dev->name, IFNAMSIZ);
-	ifname[IFNAMSIZ] = '\0';
-
-	conf = hostapd_config_defaults();
-	if (conf == NULL) {
-		return NULL;
-	}
-
-	conf->wmm_ac_params[0] = ac_be;
-	conf->wmm_ac_params[1] = ac_bk;
-	conf->wmm_ac_params[2] = ac_vi;
-	conf->wmm_ac_params[3] = ac_vo;
-
-	/* set default driver based on configuration */
-	conf->driver = wpa_drivers[0];
-	if (conf->driver == NULL) {
-		wpa_printf(MSG_ERROR, "No driver wrappers registered!");
-		hostapd_config_free(conf);
-		return NULL;
-	}
-	conf->last_bss = conf->bss[0];
-	struct hostapd_bss_config *bss;
-
-	bss                 = conf->last_bss;
-	bss->start_disabled = 1;
-	bss->max_num_sta    = CONFIG_WIFI_MGMT_AP_MAX_NUM_STA;
-	bss->dtim_period    = 1;
-	os_strlcpy(conf->bss[0]->iface, ifname, sizeof(conf->bss[0]->iface));
-	bss->logger_stdout_level = HOSTAPD_LEVEL_INFO;
-	bss->logger_stdout       = 0xffff;
-	bss->nas_identifier      = os_strdup("ap.example.com");
-	os_memcpy(conf->country, "US ", 3);
-	conf->hw_mode        = HOSTAPD_MODE_IEEE80211G;
-	bss->wps_state       = WPS_STATE_CONFIGURED;
-	bss->eap_server      = 1;
-#ifdef CONFIG_WPS
-	bss->ap_setup_locked = 1;
-#endif
-	conf->channel        = 1;
-	conf->acs            = conf->channel == 0;
-#ifdef CONFIG_ACS
-	conf->acs_num_scans  = 1;
-#endif
-	conf->ieee80211n     = 1;
-	conf->ieee80211h     = 0;
-	conf->ieee80211d     = 1;
-	conf->acs_exclude_dfs = 1;
-	conf->ht_capab |= HT_CAP_INFO_SHORT_GI20MHZ;
-	bss->auth_algs = 1;
-	bss->okc = 1;
-	conf->no_pri_sec_switch = 1;
-	conf->ht_op_mode_fixed  = 1;
-	conf->ieee80211ac       = 1;
-	conf->vht_oper_chwidth  = CHANWIDTH_USE_HT;
-	conf->vht_capab |= VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX;
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_11AX
-	conf->ieee80211ax       = 1;
-	conf->he_oper_chwidth   = CHANWIDTH_USE_HT;
-	conf->he_phy_capab.he_su_beamformer = 0;
-	conf->he_phy_capab.he_su_beamformee = 1;
-	conf->he_phy_capab.he_mu_beamformer = 0;
-	conf->he_op.he_bss_color = 1;
-	conf->he_op.he_default_pe_duration  = 0;
-	/* Set default basic MCS/NSS set to single stream MCS 0-7 */
-	conf->he_op.he_basic_mcs_nss_set    = 0xfffc;
-#endif
-
-	for (i = 0; i < conf->num_bss; i++) {
-		hostapd_set_security_params(conf->bss[i], 1);
-	}
-
-	if (hostapd_config_check(conf, 1)) {
-		errors++;
-	}
-
-#ifndef WPA_IGNORE_CONFIG_ERRORS
-	if (errors) {
-		wpa_printf(MSG_ERROR, "%d errors found in configuration file '%s'",
-			   errors, fname);
-		hostapd_config_free(conf);
-		conf = NULL;
-	}
-#endif /* WPA_IGNORE_CONFIG_ERRORS */
-	return conf;
-}
-
-static struct hostapd_iface *hostapd_interface_init(struct hapd_interfaces *interfaces,
-						    const char *if_name,
-						    const char *config_fname,
-						    int debug)
-{
-	struct hostapd_iface *iface;
-	int k;
-
-	wpa_printf(MSG_DEBUG, "Configuration file: %s", config_fname);
-	iface = hostapd_init(interfaces, config_fname);
-	if (!iface) {
-		return NULL;
-	}
-
-	if (if_name) {
-		os_strlcpy(iface->conf->bss[0]->iface, if_name,
-			   sizeof(iface->conf->bss[0]->iface));
-	}
-
-	iface->interfaces = interfaces;
-
-	for (k = 0; k < debug; k++) {
-		if (iface->bss[0]->conf->logger_stdout_level > 0) {
-			iface->bss[0]->conf->logger_stdout_level--;
-		}
-	}
-
-	if (iface->conf->bss[0]->iface[0] == '\0' &&
-	    !hostapd_drv_none(iface->bss[0])) {
-		wpa_printf(MSG_ERROR,
-			   "Interface name not specified in %s, nor by '-i' parameter",
-			   config_fname);
-		hostapd_interface_deinit_free(iface);
-		return NULL;
-	}
-
-	iface->bss[0]->is_hostapd = 1;
-
-	return iface;
-}
-
-static void zephyr_hostapd_init(struct supplicant_context *ctx)
-{
-	struct hapd_interfaces *interfaces = &ctx->hostapd;
-	size_t i;
-	int ret, debug = 0;
-	struct net_if *iface;
-	char ifname[IFNAMSIZ + 1] = { 0 };
-	const char *entropy_file = NULL;
-	size_t num_bss_configs = 0;
-	int start_ifaces_in_sync = 0;
-#ifdef CONFIG_DPP
-	struct dpp_global_config dpp_conf;
-#endif /* CONFIG_DPP */
-
-	os_memset(interfaces, 0, sizeof(struct hapd_interfaces));
-	interfaces->reload_config      = hostapd_reload_config;
-	interfaces->config_read_cb     = hostapd_config_read2;
-	interfaces->for_each_interface = hostapd_for_each_interface;
-	interfaces->driver_init        = hostapd_driver_init;
-	interfaces->global_ctrl_sock   = -1;
-	dl_list_init(&interfaces->global_ctrl_dst);
-#ifdef CONFIG_DPP
-	os_memset(&dpp_conf, 0, sizeof(dpp_conf));
-	dpp_conf.cb_ctx = interfaces;
-	interfaces->dpp = dpp_global_init(&dpp_conf);
-	if (!interfaces->dpp) {
-		return;
-	}
-#endif /* CONFIG_DPP */
-
-	interfaces->count = 1;
-	if (interfaces->count || num_bss_configs) {
-		interfaces->iface = os_calloc(interfaces->count + num_bss_configs,
-					      sizeof(struct hostapd_iface *));
-		if (interfaces->iface == NULL) {
-			wpa_printf(MSG_ERROR, "malloc failed");
-			return;
-		}
-	}
-
-	if (hostapd_global_init(interfaces, entropy_file)) {
-		wpa_printf(MSG_ERROR, "Failed to initialize global context");
-		return;
-	}
-
-	eloop_register_timeout(HOSTAPD_CLEANUP_INTERVAL, 0,
-			       hostapd_periodic, interfaces, NULL);
-
-	iface = net_if_get_wifi_sap();
-	ret = net_if_get_name(iface, ifname, sizeof(ifname) - 1);
-	if (ret < 0) {
-		LOG_ERR("Cannot get interface %d (%p) name", net_if_get_by_iface(iface), iface);
-		goto out;
-	}
-
-	for (i = 0; i < interfaces->count; i++) {
-		interfaces->iface[i] = hostapd_interface_init(interfaces, ifname,
-							      "hostapd.conf", debug);
-		if (!interfaces->iface[i]) {
-			wpa_printf(MSG_ERROR, "Failed to initialize interface");
-			goto out;
-		}
-		if (start_ifaces_in_sync) {
-			interfaces->iface[i]->need_to_start_in_sync = 0;
-		}
-	}
-
-	/*
-	 * Enable configured interfaces. Depending on channel configuration,
-	 * this may complete full initialization before returning or use a
-	 * callback mechanism to complete setup in case of operations like HT
-	 * co-ex scans, ACS, or DFS are needed to determine channel parameters.
-	 * In such case, the interface will be enabled from eloop context within
-	 * hostapd_global_run().
-	 */
-	interfaces->terminate_on_error = 0;
-	for (i = 0; i < interfaces->count; i++) {
-		if (hostapd_driver_init(interfaces->iface[i])) {
-			goto out;
-		}
-
-		interfaces->iface[i]->enable_iface_cb  = hostapd_enable_iface_cb;
-		interfaces->iface[i]->disable_iface_cb = hostapd_disable_iface_cb;
-		zephyr_hostapd_ctrl_init((void *)interfaces->iface[i]->bss[0]);
-	}
-
-out:
-	return;
-}
-
-static const char *zephyr_hostap_msg_ifname_cb(void *ctx)
-{
-	if (ctx == NULL) {
-		return NULL;
-	}
-
-	if ((*((int *)ctx)) == 0) {
-		struct wpa_supplicant *wpa_s = ctx;
-
-		return wpa_s->ifname;
-	}
-
-	struct hostapd_data *hapd = ctx;
-
-	if (hapd && hapd->conf) {
-		return hapd->conf->iface;
-	}
-
-	return NULL;
-}
-
-static void zephyr_hostap_ctrl_iface_msg_cb(void *ctx, int level, enum wpa_msg_type type,
-					    const char *txt, size_t len)
-{
-	if (ctx == NULL) {
-		return;
-	}
-
-	if ((*((int *)ctx)) == 0) {
-		wpa_supplicant_msg_send(ctx, level, type, txt, len);
-	} else {
-		hostapd_msg_send(ctx, level, type, txt, len);
-	}
-}
-#endif
-
 static void handler(void)
 {
 	struct supplicant_context *ctx;
 	struct wpa_params params;
+	struct k_work_queue_config iface_wq_cfg = {
+		.name = "hostap_iface_wq",
+	};
 
 #if !defined(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE) && !defined(CONFIG_MBEDTLS_ENABLE_HEAP)
 	/* Needed for crypto operation as default is no-op and fails */
@@ -1151,7 +595,7 @@ static void handler(void)
 	k_work_queue_start(&ctx->iface_wq, iface_wq_stack,
 			   K_THREAD_STACK_SIZEOF(iface_wq_stack),
 			   CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO,
-			   NULL);
+			   &iface_wq_cfg);
 
 	k_work_init(&ctx->iface_work, iface_work_handler);
 
@@ -1183,7 +627,7 @@ static void handler(void)
 	submit_iface_work(ctx, NULL, setup_interface_monitoring);
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-	zephyr_hostapd_init(ctx);
+	zephyr_hostapd_init(&ctx->hostapd);
 	wpa_msg_register_ifname_cb(zephyr_hostap_msg_ifname_cb);
 #endif
 
@@ -1209,11 +653,15 @@ static void handler(void)
 
 static int init(void)
 {
+	k_tid_t id;
+
 	/* We create a thread that handles all supplicant connections */
-	k_thread_create(&tid, supplicant_thread_stack,
-			K_THREAD_STACK_SIZEOF(supplicant_thread_stack),
-			(k_thread_entry_t)handler, NULL, NULL, NULL,
-			CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO, 0, K_NO_WAIT);
+	id = k_thread_create(&tid, supplicant_thread_stack,
+			     K_THREAD_STACK_SIZEOF(supplicant_thread_stack),
+			     (k_thread_entry_t)handler, NULL, NULL, NULL,
+			     CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO, 0, K_NO_WAIT);
+
+	k_thread_name_set(id, "hostap_handler");
 
 	return 0;
 }
diff --git a/modules/hostap/src/supp_main.h b/modules/hostap/src/supp_main.h
index 22e6d79035c9e..60ac642f9c797 100644
--- a/modules/hostap/src/supp_main.h
+++ b/modules/hostap/src/supp_main.h
@@ -55,15 +55,11 @@ struct wpa_global *zephyr_get_default_supplicant_context(void);
 struct wpa_supplicant *zephyr_get_handle_by_ifname(const char *ifname);
 
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-#include "common.h"
-#include "wpa_debug_zephyr.h"
-
-struct hostapd_iface *zephyr_get_hapd_handle_by_ifname(const char *ifname);
-void wpa_supplicant_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *txt,
-			     size_t len);
-void hostapd_msg_send(void *ctx, int level, enum wpa_msg_type type, const char *buf, size_t len);
+struct hapd_interfaces *zephyr_get_default_hapd_context(void);
 #endif
 
+struct wpa_supplicant *zephyr_get_handle_by_ifname(const char *ifname);
+
 struct wpa_supplicant_event_msg {
 #ifdef CONFIG_WIFI_NM_HOSTAPD_AP
 	int hostapd;
diff --git a/modules/lvgl/CMakeLists.txt b/modules/lvgl/CMakeLists.txt
index 5ef568e6b89b6..e388c4159e78d 100644
--- a/modules/lvgl/CMakeLists.txt
+++ b/modules/lvgl/CMakeLists.txt
@@ -313,6 +313,7 @@ zephyr_library_sources(
     lvgl.c
     lvgl_display.c
     lvgl_display_mono.c
+    lvgl_display_8bit.c
     lvgl_display_16bit.c
     lvgl_display_24bit.c
     lvgl_display_32bit.c
diff --git a/modules/lvgl/include/lvgl_display.h b/modules/lvgl/include/lvgl_display.h
index bbe4a3193b2cb..68aeceb005c34 100644
--- a/modules/lvgl/include/lvgl_display.h
+++ b/modules/lvgl/include/lvgl_display.h
@@ -30,6 +30,7 @@ struct lvgl_display_flush {
 };
 
 void lvgl_flush_cb_mono(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
+void lvgl_flush_cb_8bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
 void lvgl_flush_cb_16bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
 void lvgl_flush_cb_24bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
 void lvgl_flush_cb_32bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
diff --git a/modules/lvgl/lvgl.c b/modules/lvgl/lvgl.c
index 664f6fdb03a38..cce276c66353c 100644
--- a/modules/lvgl/lvgl.c
+++ b/modules/lvgl/lvgl.c
@@ -146,6 +146,9 @@ static int lvgl_allocate_rendering_buffers(lv_display_t *display)
 	case PIXEL_FORMAT_RGB_565:
 		buf_size = 2 * buf_nbr_pixels;
 		break;
+	case PIXEL_FORMAT_L_8:
+		buf_size = buf_nbr_pixels;
+		break;
 	case PIXEL_FORMAT_MONO01:
 	case PIXEL_FORMAT_MONO10:
 		buf_size = buf_nbr_pixels / 8 + 8;
diff --git a/modules/lvgl/lvgl_display.c b/modules/lvgl/lvgl_display.c
index 72c371cfc84a2..cc79c1994becf 100644
--- a/modules/lvgl/lvgl_display.c
+++ b/modules/lvgl/lvgl_display.c
@@ -96,6 +96,12 @@ int set_lvgl_rendering_cb(lv_display_t *display)
 		lv_display_add_event_cb(display, lvgl_rounder_cb, LV_EVENT_INVALIDATE_AREA,
 					display);
 		break;
+	case PIXEL_FORMAT_L_8:
+		lv_display_set_color_format(display, LV_COLOR_FORMAT_L8);
+		lv_display_set_flush_cb(display, lvgl_flush_cb_8bit);
+		lv_display_add_event_cb(display, lvgl_rounder_cb, LV_EVENT_INVALIDATE_AREA,
+					display);
+		break;
 	case PIXEL_FORMAT_MONO01:
 	case PIXEL_FORMAT_MONO10:
 		lv_display_set_color_format(display, LV_COLOR_FORMAT_I1);
diff --git a/modules/lvgl/lvgl_display_8bit.c b/modules/lvgl/lvgl_display_8bit.c
new file mode 100644
index 0000000000000..a843ece19a4cd
--- /dev/null
+++ b/modules/lvgl/lvgl_display_8bit.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <lvgl.h>
+#include "lvgl_display.h"
+
+void lvgl_flush_cb_8bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map)
+{
+	uint16_t w = area->x2 - area->x1 + 1;
+	uint16_t h = area->y2 - area->y1 + 1;
+	struct lvgl_display_flush flush;
+
+	flush.display = display;
+	flush.x = area->x1;
+	flush.y = area->y1;
+	flush.desc.buf_size = w * h;
+	flush.desc.width = w;
+	flush.desc.pitch = w;
+	flush.desc.height = h;
+	flush.buf = (void *)px_map;
+
+	lvgl_flush_display(&flush);
+}
diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index cb178fb3c273e..bf165473f17f2 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -52,7 +52,7 @@ config CUSTOM_MBEDTLS_CFG_FILE
 config MBEDTLS_CFG_FILE
 	string "mbed TLS configuration file" if CUSTOM_MBEDTLS_CFG_FILE
 	depends on MBEDTLS_BUILTIN
-	default "config-tls-generic.h"
+	default "config-mbedtls.h"
 	help
 	  Use a specific mbedTLS configuration file. The default config file
 	  file can be tweaked with Kconfig. The default configuration is
@@ -61,7 +61,7 @@ config MBEDTLS_CFG_FILE
 	  special TLS usage, use available Kconfig options, or select an
 	  alternative config.
 
-rsource "Kconfig.tls-generic"
+rsource "Kconfig.mbedtls"
 
 config MBEDTLS_SSL_MAX_CONTENT_LEN
 	int "Max payload size for TLS protocol message"
diff --git a/modules/mbedtls/Kconfig.mbedtls b/modules/mbedtls/Kconfig.mbedtls
new file mode 100644
index 0000000000000..f81f91b62ccc4
--- /dev/null
+++ b/modules/mbedtls/Kconfig.mbedtls
@@ -0,0 +1,705 @@
+# TLS/DTLS related options
+
+# Copyright (c) 2018 Intel Corporation
+# Copyright (c) 2018 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+menu "Mbed TLS configuration"
+	depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-mbedtls.h"
+
+menu "TLS"
+
+config MBEDTLS_TLS_VERSION_1_2
+	bool "Support for TLS 1.2 (DTLS 1.2)"
+	select MBEDTLS_CIPHER
+	select MBEDTLS_MD
+
+if MBEDTLS_TLS_VERSION_1_2
+
+config MBEDTLS_DTLS
+	bool "Support for DTLS"
+
+endif # MBEDTLS_TLS_VERSION_1_2
+
+config MBEDTLS_TLS_VERSION_1_3
+	bool "Support for TLS 1.3"
+
+if MBEDTLS_TLS_VERSION_1_3
+
+config MBEDTLS_TLS_SESSION_TICKETS
+	bool "Support for RFC 5077 session tickets in TLS 1.3"
+
+endif # MBEDTLS_TLS_VERSION_1_3
+
+if MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
+
+config MBEDTLS_SSL_ALPN
+	bool "Support for setting the supported Application Layer Protocols"
+
+endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
+
+endmenu # TLS
+
+menu "Ciphersuite configuration"
+
+comment "Supported key exchange modes"
+
+config MBEDTLS_RSA_C
+	bool "RSA base support"
+
+if MBEDTLS_RSA_C
+
+config MBEDTLS_PKCS1_V15
+	bool "RSA PKCS1 v1.5"
+
+config MBEDTLS_PKCS1_V21
+	bool "RSA PKCS1 v2.1"
+
+config MBEDTLS_GENPRIME_ENABLED
+	bool "Prime number generation code"
+
+endif # MBEDTLS_RSA_C
+
+config MBEDTLS_RSA_FULL
+	bool
+	select MBEDTLS_RSA_C
+	select MBEDTLS_PKCS1_V15
+	select MBEDTLS_PKCS1_V21
+
+config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
+	bool "All available ciphersuite modes"
+	select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
+	select MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+
+config MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+	bool "PSK based ciphersuite modes"
+
+config MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+	bool "DHE-PSK based ciphersuite modes"
+
+config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+	bool "ECDHE-PSK based ciphersuite modes"
+	depends on MBEDTLS_ECDH_C
+
+config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+	bool "RSA-PSK based ciphersuite modes"
+	select MBEDTLS_RSA_FULL
+
+config MBEDTLS_PSK_MAX_LEN
+	int "Max size of TLS pre-shared keys"
+	default 32
+	help
+	  Max size of TLS pre-shared keys, in bytes. It has no effect if no
+	  PSK key exchange is used.
+
+config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+	bool "RSA-only based ciphersuite modes"
+	default y if UOSCORE || UEDHOC
+	select MBEDTLS_MD
+	select MBEDTLS_RSA_FULL
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY if PSA_CRYPTO_CLIENT
+	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT if PSA_CRYPTO_CLIENT
+	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT if PSA_CRYPTO_CLIENT
+	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE if PSA_CRYPTO_CLIENT
+
+config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+	bool "DHE-RSA based ciphersuite modes"
+	select MBEDTLS_RSA_FULL
+
+config MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+	bool "ECDHE-RSA based ciphersuite modes"
+	select MBEDTLS_RSA_FULL
+	depends on MBEDTLS_ECDH_C
+
+config MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+	bool "ECDHE-ECDSA based ciphersuite modes"
+	depends on MBEDTLS_ECDH_C && MBEDTLS_ECDSA_C || (PSA_WANT_ALG_ECDH && PSA_WANT_ALG_ECDSA)
+
+config MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+	bool "ECDH-ECDSA based ciphersuite modes"
+	depends on (MBEDTLS_ECDH_C && MBEDTLS_ECDSA_C) || (PSA_WANT_ALG_ECDH && PSA_WANT_ALG_ECDSA)
+
+config MBEDTLS_ECDSA_DETERMINISTIC
+	bool "Deterministic ECDSA (RFC 6979)"
+
+config MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
+	bool "ECDH-RSA based ciphersuite modes"
+	depends on MBEDTLS_ECDH_C
+
+config MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+	bool "ECJPAKE based ciphersuite modes"
+	depends on MBEDTLS_ECJPAKE_C
+
+if MBEDTLS_TLS_VERSION_1_3
+
+config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
+	bool "TLS 1.3 PSK key exchange mode"
+
+config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
+	bool "TLS 1.3 ephemeral key exchange mode"
+
+config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
+	bool "TLS 1.3 PSK ephemeral key exchange mode"
+
+endif # MBEDTLS_TLS_VERSION_1_3
+
+config MBEDTLS_HKDF_C
+	bool "HMAC-based Extract-and-Expand Key Derivation Function"
+
+comment "Elliptic curve libraries"
+
+config MBEDTLS_ECDH_C
+	bool "Elliptic curve Diffie-Hellman library"
+	depends on MBEDTLS_ECP_C
+
+config MBEDTLS_ECDSA_C
+	bool "Elliptic curve DSA library"
+	depends on MBEDTLS_ECP_C
+	select MBEDTLS_ASN1_PARSE_C
+
+config MBEDTLS_ECJPAKE_C
+	bool "Elliptic curve J-PAKE library"
+	depends on MBEDTLS_ECP_C
+
+config MBEDTLS_ECP_C
+	bool "Elliptic curve over GF(p) library"
+	default y if UOSCORE || UEDHOC
+
+if MBEDTLS_ECP_C
+
+comment "Supported elliptic curves"
+
+config MBEDTLS_ECP_ALL_ENABLED
+	bool "All available elliptic curves"
+	select MBEDTLS_ECP_DP_SECP192R1_ENABLED
+	select MBEDTLS_ECP_DP_SECP192R1_ENABLED
+	select MBEDTLS_ECP_DP_SECP224R1_ENABLED
+	select MBEDTLS_ECP_DP_SECP256R1_ENABLED
+	select MBEDTLS_ECP_DP_SECP384R1_ENABLED
+	select MBEDTLS_ECP_DP_SECP521R1_ENABLED
+	select MBEDTLS_ECP_DP_SECP192K1_ENABLED
+	select MBEDTLS_ECP_DP_SECP224K1_ENABLED
+	select MBEDTLS_ECP_DP_SECP256K1_ENABLED
+	select MBEDTLS_ECP_DP_BP256R1_ENABLED
+	select MBEDTLS_ECP_DP_BP384R1_ENABLED
+	select MBEDTLS_ECP_DP_BP512R1_ENABLED
+	select MBEDTLS_ECP_DP_CURVE25519_ENABLED
+	select MBEDTLS_ECP_DP_CURVE448_ENABLED
+	select MBEDTLS_ECP_NIST_OPTIM
+
+config MBEDTLS_ECP_DP_SECP192R1_ENABLED
+	bool "SECP192R1 elliptic curve"
+
+config MBEDTLS_ECP_DP_SECP224R1_ENABLED
+	bool "SECP224R1 elliptic curve"
+
+config MBEDTLS_ECP_DP_SECP256R1_ENABLED
+	bool "SECP256R1 elliptic curve"
+	default y if UOSCORE || UEDHOC
+
+config MBEDTLS_ECP_DP_SECP384R1_ENABLED
+	bool "SECP384R1 elliptic curve"
+
+config MBEDTLS_ECP_DP_SECP521R1_ENABLED
+	bool "SECP521R1 elliptic curve"
+
+config MBEDTLS_ECP_DP_SECP192K1_ENABLED
+	bool "SECP192K1 elliptic curve"
+
+config MBEDTLS_ECP_DP_SECP224K1_ENABLED
+	bool "SECP224K1 elliptic curve"
+
+config MBEDTLS_ECP_DP_SECP256K1_ENABLED
+	bool "SECP256K1 elliptic curve"
+
+config MBEDTLS_ECP_DP_BP256R1_ENABLED
+	bool "BP256R1 elliptic curve"
+
+config MBEDTLS_ECP_DP_BP384R1_ENABLED
+	bool "BP384R1 elliptic curve"
+
+config MBEDTLS_ECP_DP_BP512R1_ENABLED
+	bool "BP512R1 elliptic curve"
+
+config MBEDTLS_ECP_DP_CURVE25519_ENABLED
+	bool "CURVE25519 elliptic curve"
+
+config MBEDTLS_ECP_DP_CURVE448_ENABLED
+	bool "CURVE448 elliptic curve"
+
+config MBEDTLS_ECP_NIST_OPTIM
+	bool "NSIT curves optimization"
+
+endif
+
+comment "Supported ciphers and cipher modes"
+
+config MBEDTLS_CIPHER_ALL_ENABLED
+	bool "All available ciphers and modes"
+	select MBEDTLS_CIPHER_AES_ENABLED
+	select MBEDTLS_CIPHER_CAMELLIA_ENABLED
+	select MBEDTLS_CIPHER_DES_ENABLED
+	select MBEDTLS_CIPHER_CHACHA20_ENABLED
+	select MBEDTLS_CIPHER_CCM_ENABLED
+	select MBEDTLS_CIPHER_GCM_ENABLED
+	select MBEDTLS_CIPHER_MODE_XTS_ENABLED
+	select MBEDTLS_CIPHER_MODE_CBC_ENABLED
+	select MBEDTLS_CIPHER_MODE_CTR_ENABLED
+	select MBEDTLS_CHACHAPOLY_AEAD_ENABLED
+
+config MBEDTLS_SOME_AEAD_CIPHER_ENABLED
+	bool
+	default y
+	depends on \
+		MBEDTLS_CIPHER_AES_ENABLED || \
+		MBEDTLS_CIPHER_CAMELLIA_ENABLED
+
+config MBEDTLS_SOME_CIPHER_ENABLED
+	bool
+	default y
+	depends on \
+		MBEDTLS_SOME_AEAD_CIPHER_ENABLED || \
+		MBEDTLS_CIPHER_DES_ENABLED || \
+		MBEDTLS_CIPHER_CHACHA20_ENABLED
+
+config MBEDTLS_CIPHER_AES_ENABLED
+	bool "AES block cipher"
+	default y if PSA_WANT_KEY_TYPE_AES && MBEDTLS_PSA_CRYPTO_C
+
+if MBEDTLS_CIPHER_AES_ENABLED
+
+config MBEDTLS_AES_ROM_TABLES
+	bool "Use precomputed AES tables stored in ROM."
+
+config MBEDTLS_AES_FEWER_TABLES
+	bool "Reduce the size of precomputed AES tables by ~6kB"
+	default y
+	depends on MBEDTLS_AES_ROM_TABLES
+	help
+	  Reduce the size of the AES tables at a tradeoff of more
+	  arithmetic operations at runtime. Specifically 4 table
+	  lookups are converted to 1 table lookup, 3 additions
+	  and 6 bit shifts.
+
+config MBEDTLS_CIPHER_MODE_XTS_ENABLED
+	bool "Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES"
+
+endif # MBEDTLS_CIPHER_AES_ENABLED
+
+config MBEDTLS_CIPHER_CAMELLIA_ENABLED
+	bool "Camellia block cipher"
+
+config MBEDTLS_CIPHER_DES_ENABLED
+	bool "DES block cipher"
+
+config MBEDTLS_CIPHER_CHACHA20_ENABLED
+	bool "ChaCha20 stream cipher"
+
+if MBEDTLS_SOME_AEAD_CIPHER_ENABLED
+
+config MBEDTLS_CIPHER_CCM_ENABLED
+	bool "Counter with CBC-MAC (CCM) mode for 128-bit block cipher"
+	default y if UOSCORE || UEDHOC
+
+config MBEDTLS_CIPHER_GCM_ENABLED
+	bool "Galois/Counter Mode (GCM) for symmetric ciphers"
+
+endif # MBEDTLS_SOME_AEAD_CIPHER_ENABLED
+
+if MBEDTLS_SOME_CIPHER_ENABLED
+
+config MBEDTLS_CIPHER_MODE_CBC_ENABLED
+	bool "Cipher Block Chaining mode (CBC) for symmetric ciphers"
+	default y if !NET_L2_OPENTHREAD
+
+config MBEDTLS_CIPHER_MODE_CTR_ENABLED
+	bool "Counter Block Cipher mode (CTR) for symmetric ciphers"
+
+endif # MBEDTLS_SOME_CIPHER_ENABLED
+
+config MBEDTLS_CHACHAPOLY_AEAD_ENABLED
+	bool "ChaCha20-Poly1305 AEAD algorithm"
+	depends on MBEDTLS_CIPHER_CHACHA20_ENABLED && MBEDTLS_POLY1305
+
+config MBEDTLS_CMAC
+	bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
+	depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED
+
+comment "Supported hash algorithms"
+
+config MBEDTLS_HASH_ALL_ENABLED
+	bool "All available MAC methods"
+	select MBEDTLS_MD5
+	select MBEDTLS_SHA1
+	select MBEDTLS_SHA224
+	select MBEDTLS_SHA256
+	select MBEDTLS_SHA384
+	select MBEDTLS_SHA512
+	select MBEDTLS_POLY1305
+
+config MBEDTLS_MD5
+	bool "MD5 hash algorithm"
+
+config MBEDTLS_SHA1
+	bool "SHA-1 hash algorithm"
+
+config MBEDTLS_SHA224
+	bool "SHA-224 hash algorithm"
+
+config MBEDTLS_SHA256
+	bool "SHA-256 hash algorithm"
+	default y
+
+config MBEDTLS_SHA256_SMALLER
+	bool "Smaller SHA-256 implementation"
+	depends on MBEDTLS_SHA256
+	default y
+	help
+	  Enable an implementation of SHA-256 that has a
+	  smaller ROM footprint but also lower performance.
+
+config MBEDTLS_SHA384
+	bool "SHA-384 hash algorithm"
+
+config MBEDTLS_SHA512
+	bool "SHA-512 hash algorithm"
+
+config MBEDTLS_POLY1305
+	bool "Poly1305 hash family"
+
+endmenu
+
+comment "Random number generators"
+
+config MBEDTLS_CTR_DRBG_ENABLED
+	bool "CTR_DRBG AES-256-based random generator"
+	depends on MBEDTLS_CIPHER_AES_ENABLED
+	default y
+
+config MBEDTLS_HMAC_DRBG_ENABLED
+	bool "HMAC_DRBG random generator"
+	select MBEDTLS_MD
+
+comment "Other configurations"
+
+config MBEDTLS_CIPHER
+	bool "generic cipher layer."
+	default y if PSA_WANT_ALG_CMAC
+
+config MBEDTLS_MD
+	bool "generic message digest layer."
+
+config MBEDTLS_ASN1_PARSE_C
+	bool "Support for ASN1 parser functions"
+
+config MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+	bool "Remove usage of standard libc functions"
+	help
+	  This prevents Mbed TLS from linking against the following standard functions
+	  from libc: `snprintf`, `vsnprintf`, `printf`, `fprintf`, `calloc`, `free`, `setbuf`, `exit`
+	  and `time`. By default Mbed TLS will use stub functions for all these functions.
+	  These stubs are just meant to return successfully, but they don't implement
+	  the required functionality.
+	  Users can individually override each of these stubs by calling
+	  `mbedtls_platform_set_xxx()` to set the their implementation of `xxx()` function
+	  at runtime.
+
+if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+config MBEDTLS_PLATFORM_SNPRINTF_ALT
+	bool "Allow setting custom snprintf at run-time"
+	help
+	  Allow setting a custom `snprintf()` function with `mbedtls_platform_set_snprintf()`.
+	  Include `mbedtls/platform.h` for the prototype of this function.
+
+endif # MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+config MBEDTLS_PEM_CERTIFICATE_FORMAT
+	bool "Support for PEM certificate format"
+	help
+	  By default only DER (binary) format of certificates is supported. Enable
+	  this option to enable support for PEM format.
+
+config MBEDTLS_HAVE_ASM
+	bool "Use of assembly code"
+	default y if !ARM
+	help
+	  Enable use of assembly code in mbedTLS. This improves the performances
+	  of asymmetric cryptography, however this might have an impact on the
+	  code size.
+
+config MBEDTLS_ENTROPY_C
+	bool "Mbed TLS entropy accumulator"
+	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
+	help
+	  This module gathers entropy data from enabled entropy sources. It's
+	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
+	  a deterministic random number generator.
+
+config MBEDTLS_ENTROPY_POLL_ZEPHYR
+	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
+	default y
+	depends on MBEDTLS_ENTROPY_C
+	help
+	  Provide entropy data to the Mbed TLS's entropy module through either
+	  an entropy driver (if available in the system) or a generic random
+	  number generator.
+	  Warning: the latter choice is potentially non secure because it might
+	  end up using weaker/test-only sources (ex: random number generator
+	  built on system timer).
+
+config MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED
+	bool "MbedTLS optimizations for OpenThread"
+	depends on NET_L2_OPENTHREAD
+	default y if !NET_SOCKETS_SOCKOPT_TLS
+	help
+	  Enable some OpenThread specific mbedTLS optimizations that allows to
+	  save some RAM/ROM when OpenThread is used. Note, that when application
+	  aims to use other mbedTLS services on top of OpenThread (e.g. secure
+	  sockets), it's advised to disable this option.
+
+config MBEDTLS_USER_CONFIG_ENABLE
+	bool "User mbedTLS config file"
+	help
+	  Enable user mbedTLS config file that will be included at the end of
+	  the generic config file.
+
+config MBEDTLS_USER_CONFIG_FILE
+	string "User configuration file for mbed TLS" if MBEDTLS_USER_CONFIG_ENABLE
+	help
+	  User config file that can contain mbedTLS configs that were not
+	  covered by the generic config file.
+
+config MBEDTLS_SERVER_NAME_INDICATION
+	bool "Support for RFC 6066 server name indication (SNI) in SSL"
+	help
+	  Enable this to support RFC 6066 server name indication (SNI) in SSL.
+	  This requires that MBEDTLS_X509_CRT_PARSE_C is also set.
+
+config MBEDTLS_PK_WRITE_C
+	bool "The generic public (asymmetric) key writer"
+	help
+	  Enable generic public key write functions.
+
+config MBEDTLS_HAVE_TIME_DATE
+	bool "Date/time validation in mbed TLS"
+	help
+	  System has time.h, time(), and an implementation for gmtime_r().
+	  There also need to be a valid time source in the system, as mbedTLS
+	  expects a valid date/time for certificate validation."
+
+config MBEDTLS_PKCS5_C
+	bool "Password-based encryption functions"
+	select MBEDTLS_MD
+	help
+	  Enable PKCS5 functions
+
+config MBEDTLS_SSL_CACHE_C
+	bool "SSL session cache support"
+	help
+	  "This option enables simple SSL cache implementation (server side)."
+
+if MBEDTLS_SSL_CACHE_C
+
+config MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT
+	int "Default timeout for SSL cache entires"
+	default 86400
+
+config MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES
+	int "Maximum number of SSL cache entires"
+	default 5
+
+endif # MBEDTLS_SSL_CACHE_C
+
+config MBEDTLS_SSL_EXTENDED_MASTER_SECRET
+	bool "(D)TLS Extended Master Secret extension"
+	depends on MBEDTLS_TLS_VERSION_1_2
+	help
+	  Enable support for the (D)TLS Extended Master Secret extension
+	  which ensures that master secrets are different for every
+	  connection and every session.
+
+choice MBEDTLS_PSA_CRYPTO_RNG_SOURCE
+	prompt "Select random source for built-in PSA crypto"
+	depends on MBEDTLS_PSA_CRYPTO_C
+	# The only way to check if there is any entropy driver available on the
+	# platform is to check if the "zephyr,entropy" chosen property exists.
+	# CONFIG_CSPRNG_ENABLED cannot be used for this because it gets enabled by
+	# entropy drivers but these are gated by CONFIG_ENTROPY_GENERATOR which
+	# is disabled by default.
+	default MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG if CSPRNG_AVAILABLE
+	default MBEDTLS_PSA_CRYPTO_LEGACY_RNG
+
+config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
+	bool "Use a cryptographically secure driver as random source"
+	select ENTROPY_GENERATOR
+	help
+	  Use a cryptographically secure random generator to provide random data
+	  instead of legacy Mbed TLS modules. This has a smaller footprint
+	  than its legacy counterpart MBEDTLS_PSA_CRYPTO_LEGACY_RNG, but it
+	  requires a cryptographically secure random number generator (CSPRNG)
+	  to be available in the system. If no CSPRNG is available:
+	  - there is no fallback to weak entropy random generators.
+	  - the initialization of PSA crypto will fail and none of its API
+	    will be available.
+
+config MBEDTLS_PSA_CRYPTO_LEGACY_RNG
+	bool "Use legacy modules to generate random data"
+	select MBEDTLS_ENTROPY_C
+	select MBEDTLS_HMAC_DRBG_ENABLED if !MBEDTLS_CTR_DRBG_ENABLED
+	# If there is any entropy driver in the system, then the choice would be
+	# CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG. If we fall here, then the only
+	# way to get some random data is to enable CONFIG_TEST_RANDOM_GENERATOR.
+	select TEST_RANDOM_GENERATOR
+	help
+	  Use legacy Mbed TLS modules to generate random data. In this
+	  configuration the entropy module is used to gather some data and then
+	  either ctr_drbg or hmac_drbg are applied on top of it to improve
+	  the randomness.
+	  Security level in this case really depends on the type of entropy
+	  sources which are enabled in the system: if weak entropy sources are
+	  used, then the generated data will only be pseudo random. Strong
+	  entropy sources are strongly recommended (if possible) to have real
+	  random data.
+	  Another difference betwen this implementation and the
+	  MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG counterpart is the memory footprint:
+	  this implementation brings in legacy modules which are not required
+	  in the "external" version, so the footprint is larger.
+
+endchoice
+
+config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG
+	bool "Allow non cryptographically secure random sources (for test only!)"
+	depends on MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
+	help
+	  MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG is by default limited to rely only
+	  on cryptographically secure random number generators. However, only
+	  for test purposes, it might be useful to enable external random
+	  number generation, but have it using weak random sources (non
+	  cryptographically secure).
+	  Warning: this is meant to be enabled only for tests, not in production
+	  as the generated values are not cryptographically secure!
+
+config MBEDTLS_PSA_CRYPTO_C
+	bool "Platform Security Architecture cryptography API"
+	depends on !BUILD_WITH_TFM
+	default y if UOSCORE || UEDHOC
+
+config MBEDTLS_USE_PSA_CRYPTO
+	bool "Use PSA APIs instead of legacy MbedTLS when possible"
+	default y if MBEDTLS_PSA_CRYPTO_CLIENT
+	help
+	  Use PSA APIs instead of legacy MbedTLS functions in TLS/DTLS and other
+	  "intermediate" modules such as PK, MD and Cipher.
+
+config MBEDTLS_PSA_CRYPTO_CLIENT
+	bool
+	default y
+	depends on BUILD_WITH_TFM || MBEDTLS_PSA_CRYPTO_C
+	select PSA_CRYPTO_CLIENT
+
+config MBEDTLS_LMS
+	bool "Support LMS signature schemes"
+	depends on MBEDTLS_PSA_CRYPTO_CLIENT
+	depends on MBEDTLS_SHA256
+	select PSA_WANT_ALG_SHA_256
+
+if MBEDTLS_PSA_CRYPTO_C
+
+config MBEDTLS_PSA_P256M_DRIVER_ENABLED
+	bool "P256-M driver"
+	imply PSA_WANT_ALG_SHA_256
+	help
+	  Enable support for the optimized sofware implementation of the secp256r1
+	  curve through the standard PSA API.
+
+config MBEDTLS_PSA_P256M_DRIVER_RAW
+	bool "Access p256-m driver directly (without PSA interface)"
+	depends on MBEDTLS_PSA_P256M_DRIVER_ENABLED
+	help
+	  Allow direct access to the p256-m driver interface.
+	  Warning: Usage of this Kconfig option is prohibited in Zephyr's codebase.
+	           Users can enable it in case of very memory-constrained devices, but be aware that the p256-m interface is absolutely not guaranted to remain stable over time.
+
+config MBEDTLS_PSA_CRYPTO_STORAGE_C
+	bool
+
+config MBEDTLS_PSA_STATIC_KEY_SLOTS
+	bool "Use statically allocated key buffers to store key material"
+	default y if !MBEDTLS_ENABLE_HEAP
+	help
+	  By default Mbed TLS's PSA Crypto core uses heap memory to store the
+	  key material for each key slot. This might impose an undesired
+	  requirement to support heap memory and its management code, affecting
+	  RAM and ROM footprints at the same time.
+	  Enabling this symbol causes Mbed TLS to pre-allocate all the key slot
+	  buffers that are used to store the key material at build time, thus
+	  removing the need for heap memory. Each buffer will be sized to
+	  contain the largest asymmetric/symmetric key type enabled in the build
+	  through PSA_WANT symbols.
+
+config MBEDTLS_PSA_KEY_SLOT_COUNT
+	int "Number of key slots in PSA Crypto core"
+	default 16
+	help
+	  Set the number of key slots that are available in the PSA Crypto core.
+	  Be aware that each slot, even if unused, increases RAM consumption
+	  by ~40 bytes plus:
+	  * the length of the largest asymmetric/symmetric key type enabled in
+	    the build through PSA_WANT symbols, if MBEDTLS_PSA_STATIC_KEY_SLOTS
+	    is set. (This is all defined statically at build time).
+	  * the heap-allocated memory to store the key material of a given slot,
+	    if it is used and MBEDTLS_PSA_STATIC_KEY_SLOTS is not set.
+
+endif # MBEDTLS_PSA_CRYPTO_C
+
+config MBEDTLS_SSL_DTLS_CONNECTION_ID
+	bool "DTLS Connection ID extension"
+	depends on MBEDTLS_DTLS
+	help
+	  Enable support for the DTLS Connection ID extension
+	  which allows to identify DTLS connections across changes
+	  in the underlying transport.
+
+
+config MBEDTLS_NIST_KW_C
+	bool "NIST key wrap"
+	depends on MBEDTLS_CIPHER_AES_ENABLED
+	help
+	  Key Wrapping mode for 128-bit block ciphers,
+	  as defined in NIST SP 800-38F.
+
+config MBEDTLS_DHM_C
+	bool "Diffie-Hellman-Merkle mode"
+	help
+	  Used by the following key exchanges,
+	  DHE-RSA, DHE-PSK
+
+config MBEDTLS_X509_CRL_PARSE_C
+	bool "X.509 CRL parsing"
+	help
+	  Used by X.509 CRL parsing
+
+config MBEDTLS_X509_CSR_WRITE_C
+	bool "X.509 Certificate Signing Requests writing"
+	help
+	  For X.509 certificate request writing.
+
+config MBEDTLS_X509_CSR_PARSE_C
+	bool "X.509 Certificate Signing Request parsing"
+	help
+	  For reading X.509 certificate request.
+
+config MBEDTLS_X509_CRT_WRITE_C
+	bool "X.509 certificate creation"
+
+endmenu
diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic
deleted file mode 100644
index 369bdc9dfeb41..0000000000000
--- a/modules/mbedtls/Kconfig.tls-generic
+++ /dev/null
@@ -1,657 +0,0 @@
-# TLS/DTLS related options
-
-# Copyright (c) 2018 Intel Corporation
-# Copyright (c) 2018 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-menu "Mbed TLS configuration"
-	depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-tls-generic.h"
-
-menu "TLS"
-
-config MBEDTLS_TLS_VERSION_1_2
-	bool "Support for TLS 1.2 (DTLS 1.2)"
-	select MBEDTLS_CIPHER
-	select MBEDTLS_MD
-
-if MBEDTLS_TLS_VERSION_1_2
-
-config MBEDTLS_DTLS
-	bool "Support for DTLS"
-
-endif # MBEDTLS_TLS_VERSION_1_2
-
-config MBEDTLS_TLS_VERSION_1_3
-	bool "Support for TLS 1.3"
-
-if MBEDTLS_TLS_VERSION_1_3
-
-config MBEDTLS_TLS_SESSION_TICKETS
-	bool "Support for RFC 5077 session tickets in TLS 1.3"
-
-endif # MBEDTLS_TLS_VERSION_1_3
-
-if MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
-
-config MBEDTLS_SSL_ALPN
-	bool "Support for setting the supported Application Layer Protocols"
-
-endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
-
-endmenu # TLS
-
-menu "Ciphersuite configuration"
-
-comment "Supported key exchange modes"
-
-config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
-	bool "All available ciphersuite modes"
-	select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-	select MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-
-config MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-	bool "PSK based ciphersuite modes"
-
-config MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
-	bool "DHE-PSK based ciphersuite modes"
-
-config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-	bool "ECDHE-PSK based ciphersuite modes"
-	depends on MBEDTLS_ECDH_C
-
-config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
-	bool "RSA-PSK based ciphersuite modes"
-
-config MBEDTLS_PSK_MAX_LEN
-	int "Max size of TLS pre-shared keys"
-	default 32
-	help
-	  Max size of TLS pre-shared keys, in bytes. It has no effect if no
-	  PSK key exchange is used.
-
-config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-	bool "RSA-only based ciphersuite modes"
-	default y if UOSCORE || UEDHOC
-	select MBEDTLS_MD
-	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY if PSA_CRYPTO_CLIENT
-	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT if PSA_CRYPTO_CLIENT
-	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT if PSA_CRYPTO_CLIENT
-	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE if PSA_CRYPTO_CLIENT
-
-config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
-	bool "DHE-RSA based ciphersuite modes"
-
-config MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-	bool "ECDHE-RSA based ciphersuite modes"
-	depends on MBEDTLS_ECDH_C
-
-config MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-	bool "ECDHE-ECDSA based ciphersuite modes"
-	depends on MBEDTLS_ECDH_C && MBEDTLS_ECDSA_C || (PSA_WANT_ALG_ECDH && PSA_WANT_ALG_ECDSA)
-
-config MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
-	bool "ECDH-ECDSA based ciphersuite modes"
-	depends on (MBEDTLS_ECDH_C && MBEDTLS_ECDSA_C) || (PSA_WANT_ALG_ECDH && PSA_WANT_ALG_ECDSA)
-
-config MBEDTLS_ECDSA_DETERMINISTIC
-	bool "Deterministic ECDSA (RFC 6979)"
-
-config MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-	bool "ECDH-RSA based ciphersuite modes"
-	depends on MBEDTLS_ECDH_C
-
-config MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-	bool "ECJPAKE based ciphersuite modes"
-	depends on MBEDTLS_ECJPAKE_C
-
-if MBEDTLS_TLS_VERSION_1_3
-
-config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
-	bool "TLS 1.3 PSK key exchange mode"
-
-config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
-	bool "TLS 1.3 ephemeral key exchange mode"
-
-config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
-	bool "TLS 1.3 PSK ephemeral key exchange mode"
-
-endif # MBEDTLS_TLS_VERSION_1_3
-
-config MBEDTLS_HKDF_C
-	bool "HMAC-based Extract-and-Expand Key Derivation Function"
-
-comment "Elliptic curve libraries"
-
-config MBEDTLS_ECDH_C
-	bool "Elliptic curve Diffie-Hellman library"
-	depends on MBEDTLS_ECP_C
-
-config MBEDTLS_ECDSA_C
-	bool "Elliptic curve DSA library"
-	depends on MBEDTLS_ECP_C
-	select MBEDTLS_ASN1_PARSE_C
-
-config MBEDTLS_ECJPAKE_C
-	bool "Elliptic curve J-PAKE library"
-	depends on MBEDTLS_ECP_C
-
-config MBEDTLS_ECP_C
-	bool "Elliptic curve over GF(p) library"
-	default y if UOSCORE || UEDHOC
-
-if MBEDTLS_ECP_C
-
-comment "Supported elliptic curves"
-
-config MBEDTLS_ECP_ALL_ENABLED
-	bool "All available elliptic curves"
-	select MBEDTLS_ECP_DP_SECP192R1_ENABLED
-	select MBEDTLS_ECP_DP_SECP192R1_ENABLED
-	select MBEDTLS_ECP_DP_SECP224R1_ENABLED
-	select MBEDTLS_ECP_DP_SECP256R1_ENABLED
-	select MBEDTLS_ECP_DP_SECP384R1_ENABLED
-	select MBEDTLS_ECP_DP_SECP521R1_ENABLED
-	select MBEDTLS_ECP_DP_SECP192K1_ENABLED
-	select MBEDTLS_ECP_DP_SECP224K1_ENABLED
-	select MBEDTLS_ECP_DP_SECP256K1_ENABLED
-	select MBEDTLS_ECP_DP_BP256R1_ENABLED
-	select MBEDTLS_ECP_DP_BP384R1_ENABLED
-	select MBEDTLS_ECP_DP_BP512R1_ENABLED
-	select MBEDTLS_ECP_DP_CURVE25519_ENABLED
-	select MBEDTLS_ECP_DP_CURVE448_ENABLED
-	select MBEDTLS_ECP_NIST_OPTIM
-
-config MBEDTLS_ECP_DP_SECP192R1_ENABLED
-	bool "SECP192R1 elliptic curve"
-
-config MBEDTLS_ECP_DP_SECP224R1_ENABLED
-	bool "SECP224R1 elliptic curve"
-
-config MBEDTLS_ECP_DP_SECP256R1_ENABLED
-	bool "SECP256R1 elliptic curve"
-	default y if UOSCORE || UEDHOC
-
-config MBEDTLS_ECP_DP_SECP384R1_ENABLED
-	bool "SECP384R1 elliptic curve"
-
-config MBEDTLS_ECP_DP_SECP521R1_ENABLED
-	bool "SECP521R1 elliptic curve"
-
-config MBEDTLS_ECP_DP_SECP192K1_ENABLED
-	bool "SECP192K1 elliptic curve"
-
-config MBEDTLS_ECP_DP_SECP224K1_ENABLED
-	bool "SECP224K1 elliptic curve"
-
-config MBEDTLS_ECP_DP_SECP256K1_ENABLED
-	bool "SECP256K1 elliptic curve"
-
-config MBEDTLS_ECP_DP_BP256R1_ENABLED
-	bool "BP256R1 elliptic curve"
-
-config MBEDTLS_ECP_DP_BP384R1_ENABLED
-	bool "BP384R1 elliptic curve"
-
-config MBEDTLS_ECP_DP_BP512R1_ENABLED
-	bool "BP512R1 elliptic curve"
-
-config MBEDTLS_ECP_DP_CURVE25519_ENABLED
-	bool "CURVE25519 elliptic curve"
-
-config MBEDTLS_ECP_DP_CURVE448_ENABLED
-	bool "CURVE448 elliptic curve"
-
-config MBEDTLS_ECP_NIST_OPTIM
-	bool "NSIT curves optimization"
-
-endif
-
-comment "Supported ciphers and cipher modes"
-
-config MBEDTLS_CIPHER_ALL_ENABLED
-	bool "All available ciphers and modes"
-	select MBEDTLS_CIPHER_AES_ENABLED
-	select MBEDTLS_CIPHER_CAMELLIA_ENABLED
-	select MBEDTLS_CIPHER_DES_ENABLED
-	select MBEDTLS_CIPHER_CHACHA20_ENABLED
-	select MBEDTLS_CIPHER_CCM_ENABLED
-	select MBEDTLS_CIPHER_GCM_ENABLED
-	select MBEDTLS_CIPHER_MODE_XTS_ENABLED
-	select MBEDTLS_CIPHER_MODE_CBC_ENABLED
-	select MBEDTLS_CIPHER_MODE_CTR_ENABLED
-	select MBEDTLS_CHACHAPOLY_AEAD_ENABLED
-
-config MBEDTLS_SOME_AEAD_CIPHER_ENABLED
-	bool
-	default y
-	depends on \
-		MBEDTLS_CIPHER_AES_ENABLED || \
-		MBEDTLS_CIPHER_CAMELLIA_ENABLED
-
-config MBEDTLS_SOME_CIPHER_ENABLED
-	bool
-	default y
-	depends on \
-		MBEDTLS_SOME_AEAD_CIPHER_ENABLED || \
-		MBEDTLS_CIPHER_DES_ENABLED || \
-		MBEDTLS_CIPHER_CHACHA20_ENABLED
-
-config MBEDTLS_CIPHER_AES_ENABLED
-	bool "AES block cipher"
-	default y if PSA_WANT_KEY_TYPE_AES && MBEDTLS_PSA_CRYPTO_C
-
-if MBEDTLS_CIPHER_AES_ENABLED
-
-config MBEDTLS_AES_ROM_TABLES
-	bool "Use precomputed AES tables stored in ROM."
-
-config MBEDTLS_AES_FEWER_TABLES
-	bool "Reduce the size of precomputed AES tables by ~6kB"
-	default y
-	depends on MBEDTLS_AES_ROM_TABLES
-	help
-	  Reduce the size of the AES tables at a tradeoff of more
-	  arithmetic operations at runtime. Specifically 4 table
-	  lookups are converted to 1 table lookup, 3 additions
-	  and 6 bit shifts.
-
-config MBEDTLS_CIPHER_MODE_XTS_ENABLED
-	bool "Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES"
-
-endif # MBEDTLS_CIPHER_AES_ENABLED
-
-config MBEDTLS_CIPHER_CAMELLIA_ENABLED
-	bool "Camellia block cipher"
-
-config MBEDTLS_CIPHER_DES_ENABLED
-	bool "DES block cipher"
-
-config MBEDTLS_CIPHER_CHACHA20_ENABLED
-	bool "ChaCha20 stream cipher"
-
-if MBEDTLS_SOME_AEAD_CIPHER_ENABLED
-
-config MBEDTLS_CIPHER_CCM_ENABLED
-	bool "Counter with CBC-MAC (CCM) mode for 128-bit block cipher"
-	default y if UOSCORE || UEDHOC
-
-config MBEDTLS_CIPHER_GCM_ENABLED
-	bool "Galois/Counter Mode (GCM) for symmetric ciphers"
-
-endif # MBEDTLS_SOME_AEAD_CIPHER_ENABLED
-
-if MBEDTLS_SOME_CIPHER_ENABLED
-
-config MBEDTLS_CIPHER_MODE_CBC_ENABLED
-	bool "Cipher Block Chaining mode (CBC) for symmetric ciphers"
-	default y if !NET_L2_OPENTHREAD
-
-config MBEDTLS_CIPHER_MODE_CTR_ENABLED
-	bool "Counter Block Cipher mode (CTR) for symmetric ciphers"
-
-endif # MBEDTLS_SOME_CIPHER_ENABLED
-
-config MBEDTLS_CHACHAPOLY_AEAD_ENABLED
-	bool "ChaCha20-Poly1305 AEAD algorithm"
-	depends on MBEDTLS_CIPHER_CHACHA20_ENABLED && MBEDTLS_POLY1305
-
-config MBEDTLS_CMAC
-	bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
-	depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED
-
-comment "Supported hash algorithms"
-
-config MBEDTLS_HASH_ALL_ENABLED
-	bool "All available MAC methods"
-	select MBEDTLS_MD5
-	select MBEDTLS_SHA1
-	select MBEDTLS_SHA224
-	select MBEDTLS_SHA256
-	select MBEDTLS_SHA384
-	select MBEDTLS_SHA512
-	select MBEDTLS_POLY1305
-
-config MBEDTLS_MD5
-	bool "MD5 hash algorithm"
-
-config MBEDTLS_SHA1
-	bool "SHA-1 hash algorithm"
-
-config MBEDTLS_SHA224
-	bool "SHA-224 hash algorithm"
-
-config MBEDTLS_SHA256
-	bool "SHA-256 hash algorithm"
-	default y
-
-config MBEDTLS_SHA256_SMALLER
-	bool "Smaller SHA-256 implementation"
-	depends on MBEDTLS_SHA256
-	default y
-	help
-	  Enable an implementation of SHA-256 that has a
-	  smaller ROM footprint but also lower performance.
-
-config MBEDTLS_SHA384
-	bool "SHA-384 hash algorithm"
-
-config MBEDTLS_SHA512
-	bool "SHA-512 hash algorithm"
-
-config MBEDTLS_POLY1305
-	bool "Poly1305 hash family"
-
-endmenu
-
-comment "Random number generators"
-
-config MBEDTLS_CTR_DRBG_ENABLED
-	bool "CTR_DRBG AES-256-based random generator"
-	depends on MBEDTLS_CIPHER_AES_ENABLED
-	default y
-
-config MBEDTLS_HMAC_DRBG_ENABLED
-	bool "HMAC_DRBG random generator"
-	select MBEDTLS_MD
-
-comment "Other configurations"
-
-config MBEDTLS_CIPHER
-	bool "generic cipher layer."
-	default y if PSA_WANT_ALG_CMAC
-
-config MBEDTLS_MD
-	bool "generic message digest layer."
-
-config MBEDTLS_GENPRIME_ENABLED
-	bool "prime-number generation code."
-
-config MBEDTLS_ASN1_PARSE_C
-	bool "Support for ASN1 parser functions"
-
-config MBEDTLS_PEM_CERTIFICATE_FORMAT
-	bool "Support for PEM certificate format"
-	help
-	  By default only DER (binary) format of certificates is supported. Enable
-	  this option to enable support for PEM format.
-
-config MBEDTLS_HAVE_ASM
-	bool "Use of assembly code"
-	default y if !ARM
-	help
-	  Enable use of assembly code in mbedTLS. This improves the performances
-	  of asymmetric cryptography, however this might have an impact on the
-	  code size.
-
-config MBEDTLS_ENTROPY_C
-	bool "Mbed TLS entropy accumulator"
-	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
-	help
-	  This module gathers entropy data from enabled entropy sources. It's
-	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
-	  a deterministic random number generator.
-
-config MBEDTLS_ENTROPY_POLL_ZEPHYR
-	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
-	default y
-	depends on MBEDTLS_ENTROPY_C
-	help
-	  Provide entropy data to the Mbed TLS's entropy module through either
-	  an entropy driver (if available in the system) or a generic random
-	  number generator.
-	  Warning: the latter choice is potentially non secure because it might
-	  end up using weaker/test-only sources (ex: random number generator
-	  built on system timer).
-
-config MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED
-	bool "MbedTLS optimizations for OpenThread"
-	depends on NET_L2_OPENTHREAD
-	default y if !NET_SOCKETS_SOCKOPT_TLS
-	help
-	  Enable some OpenThread specific mbedTLS optimizations that allows to
-	  save some RAM/ROM when OpenThread is used. Note, that when application
-	  aims to use other mbedTLS services on top of OpenThread (e.g. secure
-	  sockets), it's advised to disable this option.
-
-config MBEDTLS_USER_CONFIG_ENABLE
-	bool "User mbedTLS config file"
-	help
-	  Enable user mbedTLS config file that will be included at the end of
-	  the generic config file.
-
-config MBEDTLS_USER_CONFIG_FILE
-	string "User configuration file for mbed TLS" if MBEDTLS_USER_CONFIG_ENABLE
-	help
-	  User config file that can contain mbedTLS configs that were not
-	  covered by the generic config file.
-
-config MBEDTLS_SERVER_NAME_INDICATION
-	bool "Support for RFC 6066 server name indication (SNI) in SSL"
-	help
-	  Enable this to support RFC 6066 server name indication (SNI) in SSL.
-	  This requires that MBEDTLS_X509_CRT_PARSE_C is also set.
-
-config MBEDTLS_PK_WRITE_C
-	bool "The generic public (asymmetric) key writer"
-	help
-	  Enable generic public key write functions.
-
-config MBEDTLS_HAVE_TIME_DATE
-	bool "Date/time validation in mbed TLS"
-	help
-	  System has time.h, time(), and an implementation for gmtime_r().
-	  There also need to be a valid time source in the system, as mbedTLS
-	  expects a valid date/time for certificate validation."
-
-config MBEDTLS_PKCS5_C
-	bool "Password-based encryption functions"
-	select MBEDTLS_MD
-	help
-	  Enable PKCS5 functions
-
-config MBEDTLS_SSL_CACHE_C
-	bool "SSL session cache support"
-	help
-	  "This option enables simple SSL cache implementation (server side)."
-
-if MBEDTLS_SSL_CACHE_C
-
-config MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT
-	int "Default timeout for SSL cache entires"
-	default 86400
-
-config MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES
-	int "Maximum number of SSL cache entires"
-	default 5
-
-endif # MBEDTLS_SSL_CACHE_C
-
-config MBEDTLS_SSL_EXTENDED_MASTER_SECRET
-	bool "(D)TLS Extended Master Secret extension"
-	depends on MBEDTLS_TLS_VERSION_1_2
-	help
-	  Enable support for the (D)TLS Extended Master Secret extension
-	  which ensures that master secrets are different for every
-	  connection and every session.
-
-choice MBEDTLS_PSA_CRYPTO_RNG_SOURCE
-	prompt "Select random source for built-in PSA crypto"
-	depends on MBEDTLS_PSA_CRYPTO_C
-	# The only way to check if there is any entropy driver available on the
-	# platform is to check if the "zephyr,entropy" chosen property exists.
-	# CONFIG_CSPRNG_ENABLED cannot be used for this because it gets enabled by
-	# entropy drivers but these are gated by CONFIG_ENTROPY_GENERATOR which
-	# is disabled by default.
-	default MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG if CSPRNG_AVAILABLE
-	default MBEDTLS_PSA_CRYPTO_LEGACY_RNG
-
-config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
-	bool "Use a cryptographically secure driver as random source"
-	select ENTROPY_GENERATOR
-	help
-	  Use a cryptographically secure random generator to provide random data
-	  instead of legacy Mbed TLS modules. This has a smaller footprint
-	  than its legacy counterpart MBEDTLS_PSA_CRYPTO_LEGACY_RNG, but it
-	  requires a cryptographically secure random number generator (CSPRNG)
-	  to be available in the system. If no CSPRNG is available:
-	  - there is no fallback to weak entropy random generators.
-	  - the initialization of PSA crypto will fail and none of its API
-	    will be available.
-
-config MBEDTLS_PSA_CRYPTO_LEGACY_RNG
-	bool "Use legacy modules to generate random data"
-	select MBEDTLS_ENTROPY_C
-	select MBEDTLS_HMAC_DRBG_ENABLED if !MBEDTLS_CTR_DRBG_ENABLED
-	# If there is any entropy driver in the system, then the choice would be
-	# CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG. If we fall here, then the only
-	# way to get some random data is to enable CONFIG_TEST_RANDOM_GENERATOR.
-	select TEST_RANDOM_GENERATOR
-	help
-	  Use legacy Mbed TLS modules to generate random data. In this
-	  configuration the entropy module is used to gather some data and then
-	  either ctr_drbg or hmac_drbg are applied on top of it to improve
-	  the randomness.
-	  Security level in this case really depends on the type of entropy
-	  sources which are enabled in the system: if weak entropy sources are
-	  used, then the generated data will only be pseudo random. Strong
-	  entropy sources are strongly recommended (if possible) to have real
-	  random data.
-	  Another difference betwen this implementation and the
-	  MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG counterpart is the memory footprint:
-	  this implementation brings in legacy modules which are not required
-	  in the "external" version, so the footprint is larger.
-
-endchoice
-
-config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG
-	bool "Allow non cryptographically secure random sources (for test only!)"
-	depends on MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
-	help
-	  MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG is by default limited to rely only
-	  on cryptographically secure random number generators. However, only
-	  for test purposes, it might be useful to enable external random
-	  number generation, but have it using weak random sources (non
-	  cryptographically secure).
-	  Warning: this is meant to be enabled only for tests, not in production
-	  as the generated values are not cryptographically secure!
-
-config MBEDTLS_PSA_CRYPTO_C
-	bool "Platform Security Architecture cryptography API"
-	depends on !BUILD_WITH_TFM
-	default y if UOSCORE || UEDHOC
-
-config MBEDTLS_USE_PSA_CRYPTO
-	bool "Use PSA APIs instead of legacy MbedTLS when possible"
-	default y if MBEDTLS_PSA_CRYPTO_CLIENT
-	help
-	  Use PSA APIs instead of legacy MbedTLS functions in TLS/DTLS and other
-	  "intermediate" modules such as PK, MD and Cipher.
-
-config MBEDTLS_PSA_CRYPTO_CLIENT
-	bool
-	default y
-	depends on BUILD_WITH_TFM || MBEDTLS_PSA_CRYPTO_C
-	select PSA_CRYPTO_CLIENT
-
-config MBEDTLS_LMS
-	bool "Support LMS signature schemes"
-	depends on MBEDTLS_PSA_CRYPTO_CLIENT
-	depends on MBEDTLS_SHA256
-	select PSA_WANT_ALG_SHA_256
-
-if MBEDTLS_PSA_CRYPTO_C
-
-config MBEDTLS_PSA_P256M_DRIVER_ENABLED
-	bool "P256-M driver"
-	imply PSA_WANT_ALG_SHA_256
-	help
-	  Enable support for the optimized sofware implementation of the secp256r1
-	  curve through the standard PSA API.
-
-config MBEDTLS_PSA_P256M_DRIVER_RAW
-	bool "Access p256-m driver directly (without PSA interface)"
-	depends on MBEDTLS_PSA_P256M_DRIVER_ENABLED
-	help
-	  Allow direct access to the p256-m driver interface.
-	  Warning: Usage of this Kconfig option is prohibited in Zephyr's codebase.
-	           Users can enable it in case of very memory-constrained devices, but be aware that the p256-m interface is absolutely not guaranted to remain stable over time.
-
-config MBEDTLS_PSA_STATIC_KEY_SLOTS
-	bool "Use statically allocated key buffers to store key material"
-	default y if !MBEDTLS_ENABLE_HEAP
-	help
-	  By default Mbed TLS's PSA Crypto core uses heap memory to store the
-	  key material for each key slot. This might impose an undesired
-	  requirement to support heap memory and its management code, affecting
-	  RAM and ROM footprints at the same time.
-	  Enabling this symbol causes Mbed TLS to pre-allocate all the key slot
-	  buffers that are used to store the key material at build time, thus
-	  removing the need for heap memory. Each buffer will be sized to
-	  contain the largest asymmetric/symmetric key type enabled in the build
-	  through PSA_WANT symbols.
-
-config MBEDTLS_PSA_KEY_SLOT_COUNT
-	int "Number of key slots in PSA Crypto core"
-	default 16
-	help
-	  Set the number of key slots that are available in the PSA Crypto core.
-	  Be aware that each slot, even if unused, increases RAM consumption
-	  by ~40 bytes plus:
-	  * the length of the largest asymmetric/symmetric key type enabled in
-	    the build through PSA_WANT symbols, if MBEDTLS_PSA_STATIC_KEY_SLOTS
-	    is set. (This is all defined statically at build time).
-	  * the heap-allocated memory to store the key material of a given slot,
-	    if it is used and MBEDTLS_PSA_STATIC_KEY_SLOTS is not set.
-
-endif # MBEDTLS_PSA_CRYPTO_C
-
-config MBEDTLS_SSL_DTLS_CONNECTION_ID
-	bool "DTLS Connection ID extension"
-	depends on MBEDTLS_DTLS
-	help
-	  Enable support for the DTLS Connection ID extension
-	  which allows to identify DTLS connections across changes
-	  in the underlying transport.
-
-
-config MBEDTLS_NIST_KW_C
-	bool "NIST key wrap"
-	depends on MBEDTLS_CIPHER_AES_ENABLED
-	help
-	  Key Wrapping mode for 128-bit block ciphers,
-	  as defined in NIST SP 800-38F.
-
-config MBEDTLS_DHM_C
-	bool "Diffie-Hellman-Merkle mode"
-	help
-	  Used by the following key exchanges,
-	  DHE-RSA, DHE-PSK
-
-config MBEDTLS_X509_CRL_PARSE_C
-	bool "X.509 CRL parsing"
-	help
-	  Used by X.509 CRL parsing
-
-config MBEDTLS_X509_CSR_WRITE_C
-	bool "X.509 Certificate Signing Requests writing"
-	help
-	  For X.509 certificate request writing.
-
-config MBEDTLS_X509_CSR_PARSE_C
-	bool "X.509 Certificate Signing Request parsing"
-	help
-	  For reading X.509 certificate request.
-
-config MBEDTLS_X509_CRT_WRITE_C
-	bool "X.509 certificate creation"
-
-endmenu
diff --git a/modules/mbedtls/configs/config-ccm-psk-tls1_2.h b/modules/mbedtls/configs/config-ccm-psk-tls1_2.h
deleted file mode 100644
index 06d71f14545f7..0000000000000
--- a/modules/mbedtls/configs/config-ccm-psk-tls1_2.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * \file config-ccm-psk-tls1_2.h
- *
- * \brief Minimal configuration for TLS 1.2 with PSK and AES-CCM ciphersuites
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- *
- *  This file is provided under the Apache License 2.0, or the
- *  GNU General Public License v2.0 or later.
- *
- *  **********
- *  Apache License 2.0:
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  **********
- *
- *  **********
- *  GNU General Public License v2.0 or later:
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  **********
- */
-/*
- * Minimal configuration for TLS 1.2 with PSK and AES-CCM ciphersuites
- * Distinguishing features:
- * - no bignum, no PK, no X509
- * - fully modern and secure (provided the pre-shared keys have high entropy)
- * - very low record overhead with CCM-8
- * - optimized for low RAM usage
- *
- * See README.txt for usage instructions.
- */
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-//#define MBEDTLS_HAVE_TIME /* Optionally used in Hello messages */
-/* Other MBEDTLS_HAVE_XXX flags irrelevant for this configuration */
-
-/* mbed TLS feature support */
-#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-#define MBEDTLS_SSL_PROTO_TLS1_2
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_NET_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-
-/* Save RAM at the expense of ROM */
-#define MBEDTLS_AES_ROM_TABLES
-
-/* Save some RAM by adjusting to your exact needs */
-#define MBEDTLS_PSK_MAX_LEN    16 /* 128-bits keys are generally enough */
-
-/*
- * You should adjust this to the exact number of sources you're using: default
- * is the "platform_entropy_poll" source, but you may want to add other ones
- * Minimum is 2 for the entropy test suite.
- */
-#define MBEDTLS_ENTROPY_MAX_SOURCES 2
-
-/*
- * Use only CCM_8 ciphersuites, and
- * save ROM and a few bytes of RAM by specifying our own ciphersuite list
- */
-#define MBEDTLS_SSL_CIPHERSUITES                        \
-        MBEDTLS_TLS_PSK_WITH_AES_256_CCM_8,             \
-        MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8
-
-/*
- * Save RAM at the expense of interoperability: do this only if you control
- * both ends of the connection!  (See comments in "mbedtls/ssl.h".)
- * The optimal size here depends on the typical size of records.
- */
-#define MBEDTLS_SSL_MAX_CONTENT_LEN             1024
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-coap.h b/modules/mbedtls/configs/config-coap.h
deleted file mode 100644
index f610eb20bc676..0000000000000
--- a/modules/mbedtls/configs/config-coap.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Minimal configuration for DTLS 1.2 with PSK and AES-CCM ciphersuites
- *
- *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- */
-/*
- * Minimal configuration for TLS 1.2 with PSK and AES-CCM ciphersuites
- * Distinguishing features:
- * - no bignum, no PK, no X509
- * - fully modern and secure (provided the pre-shared keys have high entropy)
- * - very low record overhead with CCM-8
- * - optimized for low RAM usage
- *
- * See README.txt for usage instructions.
- */
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-#define MBEDTLS_MEMORY_ALIGN_MULTIPLE (sizeof(void *))
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_PLATFORM_EXIT_ALT
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-#define MBEDTLS_PLATFORM_PRINTF_ALT
-
-#if defined(CONFIG_MBEDTLS_TEST)
-#define MBEDTLS_SELF_TEST
-#define MBEDTLS_DEBUG_C
-#else
-#define MBEDTLS_ENTROPY_C
-#endif
-
-
-/* mbed TLS feature support */
-#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SSL_COOKIE_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-
-/* Save RAM at the expense of ROM */
-#define MBEDTLS_AES_ROM_TABLES
-
-/* Save some RAM by adjusting to your exact needs */
-#define MBEDTLS_PSK_MAX_LEN    16 /* 128-bits keys are generally enough */
-
-/*
- * You should adjust this to the exact number of sources you're using: default
- * is the "platform_entropy_poll" source, but you may want to add other ones
- * Minimum is 2 for the entropy test suite.
- */
-#define MBEDTLS_ENTROPY_MAX_SOURCES 2
-
-/*
- * Use only CCM_8 ciphersuites, and
- * save ROM and a few bytes of RAM by specifying our own ciphersuite list
- */
-#define MBEDTLS_SSL_CIPHERSUITES  MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8
-
-/*
- * Allow to save RAM at the expense of interoperability: do this only if you
- * control both ends of the connection!  (See comments in "mbedtls/ssl.h".)
- * The optimal size here depends on the typical size of records.
- */
-#define MBEDTLS_SSL_MAX_CONTENT_LEN  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-mbedtls.h b/modules/mbedtls/configs/config-mbedtls.h
new file mode 100644
index 0000000000000..38bf4fc63b93c
--- /dev/null
+++ b/modules/mbedtls/configs/config-mbedtls.h
@@ -0,0 +1,556 @@
+/*
+ * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ * Copyright (c) 2017 Intel Corporation.
+ * Copyright (c) 2018 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Generic configuration for TLS, manageable by Kconfig.
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+/* System support */
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+#define MBEDTLS_MEMORY_ALIGN_MULTIPLE (sizeof(void *))
+#define MBEDTLS_PLATFORM_EXIT_ALT
+#define MBEDTLS_NO_PLATFORM_ENTROPY
+
+#if defined(CONFIG_MBEDTLS_ZEROIZE_ALT)
+#define MBEDTLS_PLATFORM_ZEROIZE_ALT
+#endif
+
+#if defined(CONFIG_MBEDTLS_PLATFORM_NO_STD_FUNCTIONS)
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#endif /* defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS) */
+
+#if defined(CONFIG_MBEDTLS_PLATFORM_SNPRINTF_ALT)
+#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+#endif /* defined(MBEDTLS_PLATFORM_SNPRINTF_ALT) */
+
+#if defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
+#else
+#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+#endif
+
+#if defined(CONFIG_MBEDTLS_HAVE_ASM)
+#define MBEDTLS_HAVE_ASM
+#endif
+
+#if defined(CONFIG_MBEDTLS_LMS)
+#define MBEDTLS_LMS_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_HAVE_TIME_DATE)
+#define MBEDTLS_HAVE_TIME
+#define MBEDTLS_HAVE_TIME_DATE
+#define MBEDTLS_PLATFORM_MS_TIME_ALT
+#endif
+
+#if defined(CONFIG_MBEDTLS_TEST)
+#define MBEDTLS_SELF_TEST
+#define MBEDTLS_DEBUG_C
+#endif
+
+/* mbedTLS feature support */
+
+/* Supported TLS versions */
+
+
+#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2)
+#define MBEDTLS_SSL_PROTO_TLS1_2
+#endif
+
+#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_3)
+#define MBEDTLS_SSL_PROTO_TLS1_3
+#define MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
+#define MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
+#endif
+
+#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2) || \
+	defined(CONFIG_MBEDTLS_TLS_VERSION_1_3)
+
+/* Common modules required for TLS 1.2 and 1.3 */
+#define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_CLI_C
+
+/* This is not supported by Mbed TLS in TLS 1.3 mode
+ * (see modules/crypto/mbedtls/docs/architecture/tls13-support.md).
+ */
+#if !defined(CONFIG_MBEDTLS_TLS_VERSION_1_3)
+#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
+#endif
+
+#endif /* CONFIG_MBEDTLS_TLS_VERSION_1_2 || CONFIG_MBEDTLS_TLS_VERSION_1_3 */
+
+#if defined(CONFIG_MBEDTLS_TLS_SESSION_TICKETS)
+#define MBEDTLS_SSL_SESSION_TICKETS
+#define MBEDTLS_SSL_TICKET_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_DTLS)
+#define MBEDTLS_SSL_PROTO_DTLS
+#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
+#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
+#define MBEDTLS_SSL_COOKIE_C
+#endif
+
+/* Supported key exchange methods */
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSK_MAX_LEN)
+#define MBEDTLS_PSK_MAX_LEN	CONFIG_MBEDTLS_PSK_MAX_LEN
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECDSA_DETERMINISTIC)
+#define MBEDTLS_ECDSA_DETERMINISTIC
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
+#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED)
+#define MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
+#define MBEDTLS_SSL_EARLY_DATA
+#endif
+
+#if defined(CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED)
+#define MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED)
+#define MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
+#define MBEDTLS_SSL_EARLY_DATA
+#endif
+
+#if defined(CONFIG_MBEDTLS_HKDF_C)
+#define MBEDTLS_HKDF_C
+#endif
+
+/* Supported cipher modes */
+
+#if defined(CONFIG_MBEDTLS_CIPHER_AES_ENABLED)
+#define MBEDTLS_AES_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_AES_ROM_TABLES)
+#define MBEDTLS_AES_ROM_TABLES
+#endif
+
+#if defined(CONFIG_MBEDTLS_AES_FEWER_TABLES)
+#define MBEDTLS_AES_FEWER_TABLES
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_CAMELLIA_ENABLED)
+#define MBEDTLS_CAMELLIA_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_DES_ENABLED)
+#define MBEDTLS_DES_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_CHACHA20_ENABLED)
+#define MBEDTLS_CHACHA20_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_CCM_ENABLED)
+#define MBEDTLS_CCM_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_GCM_ENABLED)
+#define MBEDTLS_GCM_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_MODE_XTS_ENABLED)
+#define MBEDTLS_CIPHER_MODE_XTS
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_MODE_CBC_ENABLED)
+#define MBEDTLS_CIPHER_MODE_CBC
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER_MODE_CTR_ENABLED)
+#define MBEDTLS_CIPHER_MODE_CTR
+#endif
+
+/* Supported elliptic curve libraries */
+
+#if defined(CONFIG_MBEDTLS_ECDH_C)
+#define MBEDTLS_ECDH_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECDSA_C)
+#define MBEDTLS_ECDSA_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECJPAKE_C)
+#define MBEDTLS_ECJPAKE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_C)
+#define MBEDTLS_ECP_C
+#endif
+
+/* Supported elliptic curves */
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED)
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED)
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED)
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED)
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED)
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_DP_CURVE448_ENABLED)
+#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_ECP_NIST_OPTIM)
+#define MBEDTLS_ECP_NIST_OPTIM
+#endif
+
+/* Supported hash algorithms */
+
+#if defined(CONFIG_MBEDTLS_MD5)
+#define MBEDTLS_MD5_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_SHA1)
+#define MBEDTLS_SHA1_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_SHA224)
+#define MBEDTLS_SHA224_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_SHA256)
+#define MBEDTLS_SHA256_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_SHA256_SMALLER)
+#define MBEDTLS_SHA256_SMALLER
+#endif
+
+#if defined(CONFIG_MBEDTLS_SHA384)
+#define MBEDTLS_SHA384_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_SHA512)
+#define MBEDTLS_SHA512_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_POLY1305)
+#define MBEDTLS_POLY1305_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_CMAC)
+#define MBEDTLS_CMAC_C
+#endif
+
+/* mbedTLS modules */
+#if defined(CONFIG_MBEDTLS_CTR_DRBG_ENABLED)
+#define MBEDTLS_CTR_DRBG_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_HMAC_DRBG_ENABLED)
+#define MBEDTLS_HMAC_DRBG_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_DEBUG)
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_DEBUG_C
+#define MBEDTLS_SSL_DEBUG_ALL
+#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
+#endif
+
+#if defined(CONFIG_MBEDTLS_MEMORY_DEBUG)
+#define MBEDTLS_MEMORY_DEBUG
+#endif
+
+#if defined(CONFIG_MBEDTLS_CHACHAPOLY_AEAD_ENABLED)
+#define MBEDTLS_CHACHAPOLY_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_GENPRIME_ENABLED)
+#define MBEDTLS_GENPRIME
+#endif
+
+#if defined(CONFIG_MBEDTLS_ENTROPY_C)
+#define MBEDTLS_ENTROPY_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_SSL_ALPN)
+#define MBEDTLS_SSL_ALPN
+#endif
+
+#if defined(CONFIG_MBEDTLS_CIPHER)
+#define MBEDTLS_CIPHER_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_MD)
+#define MBEDTLS_MD_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_RSA_C)
+#define MBEDTLS_RSA_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_PKCS1_V15)
+#define MBEDTLS_PKCS1_V15
+#endif
+
+#if defined(CONFIG_MBEDTLS_PKCS1_V15)
+#define MBEDTLS_PKCS1_V21
+#endif
+
+/* Automatic dependencies */
+
+#if defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED) || \
+    defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED)
+#define MBEDTLS_DHM_C
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) || \
+	defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) || \
+	defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) || \
+	defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) || \
+	defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) || \
+	defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) || \
+	defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
+	defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED)
+#define MBEDTLS_X509_CRT_PARSE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT) && \
+    defined(MBEDTLS_X509_CRT_PARSE_C)
+#define MBEDTLS_PEM_PARSE_C
+#define MBEDTLS_PEM_WRITE_C
+#define MBEDTLS_BASE64_C
+#endif
+
+#if defined(MBEDTLS_X509_CRT_PARSE_C)
+#define MBEDTLS_X509_USE_C
+#endif
+
+#if defined(MBEDTLS_DHM_C) || \
+    defined(MBEDTLS_ECP_C) || \
+    defined(MBEDTLS_RSA_C) || \
+    defined(MBEDTLS_X509_USE_C) || \
+    defined(MBEDTLS_GENPRIME)
+#define MBEDTLS_BIGNUM_C
+#endif
+
+#if defined(MBEDTLS_RSA_C) || \
+    defined(MBEDTLS_X509_USE_C)
+#define MBEDTLS_OID_C
+#endif
+
+#if defined(MBEDTLS_X509_USE_C)
+#define MBEDTLS_PK_PARSE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_PK_WRITE_C)
+#define MBEDTLS_PK_WRITE_C
+#endif
+
+#if defined(MBEDTLS_PK_PARSE_C) || defined(MBEDTLS_PK_WRITE_C)
+#define MBEDTLS_PK_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_ASN1_PARSE_C) || defined(MBEDTLS_X509_USE_C)
+#define MBEDTLS_ASN1_PARSE_C
+#endif
+
+#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_RSA_C) || defined(MBEDTLS_PK_WRITE_C)
+#define MBEDTLS_ASN1_WRITE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_PKCS5_C)
+#define MBEDTLS_PKCS5_C
+#endif
+
+#define MBEDTLS_SSL_IN_CONTENT_LEN  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
+#define MBEDTLS_SSL_OUT_CONTENT_LEN  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
+
+/* Enable OpenThread optimizations. */
+#if defined(CONFIG_MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED)
+#define MBEDTLS_MPI_WINDOW_SIZE            1 /**< Maximum windows size used. */
+#define MBEDTLS_MPI_MAX_SIZE              32 /**< Maximum number of bytes for usable MPIs. */
+#define MBEDTLS_ECP_WINDOW_SIZE            2 /**< Maximum window size used */
+#define MBEDTLS_ECP_FIXED_POINT_OPTIM      0 /**< Enable fixed-point speed-up */
+#define MBEDTLS_ENTROPY_MAX_SOURCES        1 /**< Maximum number of sources supported */
+#endif
+
+#if defined(CONFIG_MBEDTLS_SERVER_NAME_INDICATION) && \
+	defined(MBEDTLS_X509_CRT_PARSE_C)
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+#endif
+
+#if defined(CONFIG_MBEDTLS_SSL_CACHE_C)
+#define MBEDTLS_SSL_CACHE_C
+#define MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT CONFIG_MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT
+#define MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES CONFIG_MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES
+#endif
+
+#if defined(CONFIG_MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
+#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
+#define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
+#define MBEDTLS_PSA_CRYPTO_C
+#define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED)
+#define MBEDTLS_PSA_P256M_DRIVER_ENABLED
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C)
+#define MBEDTLS_PSA_CRYPTO_STORAGE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOTS)
+#define MBEDTLS_PSA_STATIC_KEY_SLOTS
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT)
+#define MBEDTLS_PSA_KEY_SLOT_COUNT CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT
+#endif
+
+#if defined(CONFIG_MBEDTLS_USE_PSA_CRYPTO)
+#define MBEDTLS_USE_PSA_CRYPTO
+#endif
+
+#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_CLIENT)
+#define MBEDTLS_PSA_CRYPTO_CLIENT
+#define MBEDTLS_PSA_CRYPTO_CONFIG
+#define MBEDTLS_PSA_CRYPTO_CONFIG_FILE   "config-psa.h"
+#endif
+
+#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2) && defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
+#define MBEDTLS_SSL_ENCRYPT_THEN_MAC
+#endif
+
+#if defined(CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID)
+#define MBEDTLS_SSL_DTLS_CONNECTION_ID
+#endif
+
+#if defined(CONFIG_MBEDTLS_NIST_KW_C)
+#define MBEDTLS_NIST_KW_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_DHM_C)
+#define MBEDTLS_DHM_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_X509_CRL_PARSE_C)
+#define MBEDTLS_X509_CRL_PARSE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_X509_CSR_WRITE_C)
+#define MBEDTLS_X509_CSR_WRITE_C
+#define MBEDTLS_X509_CREATE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_X509_CSR_PARSE_C)
+#define MBEDTLS_X509_CSR_PARSE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_X509_CRT_WRITE_C)
+#define MBEDTLS_X509_CRT_WRITE_C
+#endif
+
+#if defined(CONFIG_MBEDTLS_USER_CONFIG_FILE)
+#include CONFIG_MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-mini-dtls1_2.h b/modules/mbedtls/configs/config-mini-dtls1_2.h
deleted file mode 100644
index ee0d70b591530..0000000000000
--- a/modules/mbedtls/configs/config-mini-dtls1_2.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- * Copyright (c) 2017 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Minimal configuration for DTLS 1.2 for Zephyr with PSK and AES-CCM
- * ciphersuites.
- *
- * See README.txt for usage instructions.
- */
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-#define MBEDTLS_MEMORY_ALIGN_MULTIPLE (sizeof(void *))
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_PLATFORM_EXIT_ALT
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-#define MBEDTLS_PLATFORM_PRINTF_ALT
-
-#if defined(CONFIG_MBEDTLS_TEST)
-#define MBEDTLS_SELF_TEST
-#define MBEDTLS_DEBUG_C
-#else
-#define MBEDTLS_ENTROPY_C
-#endif
-
-/* mbed TLS feature support */
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_DES_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_SSL_COOKIE_C
-
-/* For test certificates */
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_CERTS_C
-
-#if defined(CONFIG_MBEDTLS_DEBUG)
-#define MBEDTLS_ERROR_C
-#define MBEDTLS_DEBUG_C
-#define MBEDTLS_SSL_DEBUG_ALL
-#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
-#endif
-
-#define MBEDTLS_SSL_MAX_CONTENT_LEN             1500
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-mini-tls1_1.h b/modules/mbedtls/configs/config-mini-tls1_1.h
deleted file mode 100644
index da8bf795c1d82..0000000000000
--- a/modules/mbedtls/configs/config-mini-tls1_1.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * \file config-mini-tls1_1.h
- *
- * \brief Minimal configuration for TLS 1.1 (RFC 4346)
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- *
- *  This file is provided under the Apache License 2.0, or the
- *  GNU General Public License v2.0 or later.
- *
- *  **********
- *  Apache License 2.0:
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  **********
- *
- *  **********
- *  GNU General Public License v2.0 or later:
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  **********
- */
-/*
- * Minimal configuration for TLS 1.1 (RFC 4346), implementing only the
- * required ciphersuite: MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA
- *
- * See README.txt for usage instructions.
- */
-
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_HAVE_ASM
-#define MBEDTLS_HAVE_TIME
-#define MBEDTLS_PLATFORM_MS_TIME_ALT
-
-/* mbed TLS feature support */
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_SSL_PROTO_TLS1_1
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_DES_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_NET_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
-
-/* For test certificates */
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_CERTS_C
-#define MBEDTLS_PEM_PARSE_C
-
-/* For testing with compat.sh */
-#define MBEDTLS_FS_IO
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-mini-tls1_2.h b/modules/mbedtls/configs/config-mini-tls1_2.h
deleted file mode 100644
index 4045fe70478e8..0000000000000
--- a/modules/mbedtls/configs/config-mini-tls1_2.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- * Copyright (c) 2017 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Minimal configuration for TLS 1.2 (RFC 5246) for Zephyr, implementing only
- * a few of the most popular ciphersuites.
- */
-
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-#define MBEDTLS_MEMORY_ALIGN_MULTIPLE (sizeof(void *))
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_PLATFORM_EXIT_ALT
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-#define MBEDTLS_PLATFORM_PRINTF_ALT
-#define MBEDTLS_PLATFORM_SNPRINTF_ALT
-
-#if !defined(CONFIG_ARM)
-#define MBEDTLS_HAVE_ASM
-#endif
-
-#if defined(CONFIG_MBEDTLS_TEST)
-#define MBEDTLS_SELF_TEST
-#define MBEDTLS_DEBUG_C
-#else
-#define MBEDTLS_ENTROPY_C
-#endif
-
-/* mbed TLS feature support */
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_SSL_PROTO_TLS1_2
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_DES_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
-
-/* For test certificates */
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_CERTS_C
-
-#if defined(CONFIG_MBEDTLS_DEBUG)
-#define MBEDTLS_ERROR_C
-#define MBEDTLS_DEBUG_C
-#define MBEDTLS_SSL_DEBUG_ALL
-#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
-#endif
-
-#define MBEDTLS_SSL_MAX_CONTENT_LEN  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-no-entropy.h b/modules/mbedtls/configs/config-no-entropy.h
deleted file mode 100644
index b3406a394b428..0000000000000
--- a/modules/mbedtls/configs/config-no-entropy.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * \file config-no-entropy.h
- *
- * \brief Minimal configuration of features that do not require an entropy source
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- *
- *  This file is provided under the Apache License 2.0, or the
- *  GNU General Public License v2.0 or later.
- *
- *  **********
- *  Apache License 2.0:
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  **********
- *
- *  **********
- *  GNU General Public License v2.0 or later:
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  **********
- */
-/*
- * Minimal configuration of features that do not require an entropy source
- * Distinguishing features:
- * - no entropy module
- * - no TLS protocol implementation available due to absence of an entropy
- *   source
- *
- * See README.txt for usage instructions.
- */
-
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_HAVE_ASM
-#define MBEDTLS_HAVE_TIME
-#define MBEDTLS_PLATFORM_MS_TIME_ALT
-
-/* mbed TLS feature support */
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_CIPHER_PADDING_PKCS7
-#define MBEDTLS_REMOVE_ARC4_CIPHERSUITES
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
-#define MBEDTLS_ECP_NIST_OPTIM
-#define MBEDTLS_ECDSA_DETERMINISTIC
-#define MBEDTLS_PK_RSA_ALT_SUPPORT
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_PKCS1_V21
-#define MBEDTLS_SELF_TEST
-#define MBEDTLS_VERSION_FEATURES
-#define MBEDTLS_X509_CHECK_KEY_USAGE
-#define MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_ECDSA_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_ERROR_C
-#define MBEDTLS_GCM_C
-#define MBEDTLS_HMAC_DRBG_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PEM_PARSE_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PK_WRITE_C
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA384_C
-#define MBEDTLS_SHA512_C
-#define MBEDTLS_VERSION_C
-#define MBEDTLS_X509_USE_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_CRL_PARSE_C
-//#define MBEDTLS_CMAC_C
-
-/* Miscellaneous options */
-#define MBEDTLS_AES_ROM_TABLES
-
-#include "check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-suite-b.h b/modules/mbedtls/configs/config-suite-b.h
deleted file mode 100644
index 7468f7633580b..0000000000000
--- a/modules/mbedtls/configs/config-suite-b.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * \file config-suite-b.h
- *
- * \brief Minimal configuration for TLS NSA Suite B Profile (RFC 6460)
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- *
- *  This file is provided under the Apache License 2.0, or the
- *  GNU General Public License v2.0 or later.
- *
- *  **********
- *  Apache License 2.0:
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  **********
- *
- *  **********
- *  GNU General Public License v2.0 or later:
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  **********
- */
-/*
- * Minimal configuration for TLS NSA Suite B Profile (RFC 6460)
- *
- * Distinguishing features:
- * - no RSA or classic DH, fully based on ECC
- * - optimized for low RAM usage
- *
- * Possible improvements:
- * - if 128-bit security is enough, disable secp384r1 and SHA-512
- * - use embedded certs in DER format and disable PEM_PARSE_C and BASE64_C
- *
- * See README.txt for usage instructions.
- */
-
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_HAVE_ASM
-#define MBEDTLS_HAVE_TIME
-#define MBEDTLS_PLATFORM_MS_TIME_ALT
-
-/* mbed TLS feature support */
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-#define MBEDTLS_SSL_PROTO_TLS1_2
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_ECDH_C
-#define MBEDTLS_ECDSA_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_GCM_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_NET_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA384_C
-#define MBEDTLS_SHA512_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
-
-/* For test certificates */
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_CERTS_C
-#define MBEDTLS_PEM_PARSE_C
-
-/* Save RAM at the expense of ROM */
-#define MBEDTLS_AES_ROM_TABLES
-
-/* Save RAM by adjusting to our exact needs */
-#define MBEDTLS_MPI_MAX_SIZE    48 // 384 bits is 48 bytes
-
-/* Save RAM at the expense of speed, see ecp.h */
-#define MBEDTLS_ECP_WINDOW_SIZE        2
-#define MBEDTLS_ECP_FIXED_POINT_OPTIM  0
-
-/* Significant speed benefit at the expense of some ROM */
-#define MBEDTLS_ECP_NIST_OPTIM
-
-/*
- * You should adjust this to the exact number of sources you're using: default
- * is the "mbedtls_platform_entropy_poll" source, but you may want to add other ones.
- * Minimum is 2 for the entropy test suite.
- */
-#define MBEDTLS_ENTROPY_MAX_SOURCES 2
-
-/* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
-#define MBEDTLS_SSL_CIPHERSUITES                        \
-    MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,    \
-    MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-
-/*
- * Save RAM at the expense of interoperability: do this only if you control
- * both ends of the connection!  (See comments in "mbedtls/ssl.h".)
- * The minimum size here depends on the certificate chain used as well as the
- * typical size of records.
- */
-#define MBEDTLS_SSL_MAX_CONTENT_LEN             1024
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-thread.h b/modules/mbedtls/configs/config-thread.h
deleted file mode 100644
index 24ac5a928cbaa..0000000000000
--- a/modules/mbedtls/configs/config-thread.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * \file config-thread.h
- *
- * \brief Minimal configuration for using TLS as part of Thread
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- *
- *  This file is provided under the Apache License 2.0, or the
- *  GNU General Public License v2.0 or later.
- *
- *  **********
- *  Apache License 2.0:
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  **********
- *
- *  **********
- *  GNU General Public License v2.0 or later:
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *  **********
- */
-
-/*
- * Minimal configuration for using TLS a part of Thread
- * http://threadgroup.org/
- *
- * Distinguishing features:
- * - no RSA or classic DH, fully based on ECC
- * - no X.509
- * - support for experimental EC J-PAKE key exchange
- *
- * See README.txt for usage instructions.
- */
-
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_HAVE_ASM
-
-/* mbed TLS feature support */
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_NIST_OPTIM
-#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-#define MBEDTLS_SSL_EXPORT_KEYS
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_CMAC_C
-#define MBEDTLS_ECJPAKE_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_HMAC_DRBG_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SSL_COOKIE_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-
-/* For tests using ssl-opt.sh */
-#define MBEDTLS_NET_C
-#define MBEDTLS_TIMING_C
-
-/* Save RAM at the expense of ROM */
-#define MBEDTLS_AES_ROM_TABLES
-
-/* Save RAM by adjusting to our exact needs */
-#define MBEDTLS_MPI_MAX_SIZE              32 // 256 bits is 32 bytes
-
-/* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
-#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-threadnet.h b/modules/mbedtls/configs/config-threadnet.h
deleted file mode 100644
index c6676f0343397..0000000000000
--- a/modules/mbedtls/configs/config-threadnet.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Minimal configuration for using TLS as part of Thread
- *
- *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- */
-
-/*
- * Minimal configuration for using TLS a part of Thread
- * http://threadgroup.org/
- *
- * Distinguishing features:
- * - no RSA or classic DH, fully based on ECC
- * - no X.509
- * - support for experimental EC J-PAKE key exchange
- *
- * See README.txt for usage instructions.
- */
-
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-#define MBEDTLS_MEMORY_ALIGN_MULTIPLE (sizeof(void *))
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_PLATFORM_EXIT_ALT
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-#define MBEDTLS_PLATFORM_PRINTF_ALT
-
-#if !defined(CONFIG_ARM)
-#define MBEDTLS_HAVE_ASM
-#endif
-
-#if defined(CONFIG_MBEDTLS_TEST)
-#define MBEDTLS_SELF_TEST
-#define MBEDTLS_DEBUG_C
-#else
-#define MBEDTLS_ENTROPY_C
-#endif
-
-/* mbed TLS feature support */
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_NIST_OPTIM
-#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-#define MBEDTLS_SSL_EXPORT_KEYS
-
-/* mbed TLS modules */
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_CMAC_C
-#define MBEDTLS_ECJPAKE_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_HMAC_DRBG_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_SHA224_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SSL_COOKIE_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-
-
-/* Save RAM at the expense of ROM */
-#define MBEDTLS_AES_ROM_TABLES
-
-/* Save RAM by adjusting to our exact needs */
-#define MBEDTLS_MPI_MAX_SIZE              32 // 256 bits is 32 bytes
-
-#define MBEDTLS_SSL_MAX_CONTENT_LEN 1024
-
-/* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
-#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
-
-#include "mbedtls/check_config.h"
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h
deleted file mode 100644
index 087246327cfab..0000000000000
--- a/modules/mbedtls/configs/config-tls-generic.h
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- * Copyright (c) 2017 Intel Corporation.
- * Copyright (c) 2018 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Generic configuration for TLS, manageable by Kconfig.
- */
-
-#ifndef MBEDTLS_CONFIG_H
-#define MBEDTLS_CONFIG_H
-
-/* System support */
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-#define MBEDTLS_MEMORY_ALIGN_MULTIPLE (sizeof(void *))
-#define MBEDTLS_PLATFORM_EXIT_ALT
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-
-#if defined(CONFIG_MBEDTLS_ZEROIZE_ALT)
-#define MBEDTLS_PLATFORM_ZEROIZE_ALT
-#endif
-
-#if defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
-#define MBEDTLS_ENTROPY_HARDWARE_ALT
-#else
-#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-#endif
-
-#if defined(CONFIG_MBEDTLS_HAVE_ASM)
-#define MBEDTLS_HAVE_ASM
-#endif
-
-#if defined(CONFIG_MBEDTLS_LMS)
-#define MBEDTLS_LMS_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_HAVE_TIME_DATE)
-#define MBEDTLS_HAVE_TIME
-#define MBEDTLS_HAVE_TIME_DATE
-#define MBEDTLS_PLATFORM_MS_TIME_ALT
-#endif
-
-#if defined(CONFIG_MBEDTLS_TEST)
-#define MBEDTLS_SELF_TEST
-#define MBEDTLS_DEBUG_C
-#endif
-
-/* mbedTLS feature support */
-
-/* Supported TLS versions */
-
-
-#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2)
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#endif
-
-#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_3)
-#define MBEDTLS_SSL_PROTO_TLS1_3
-#define MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
-#define MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
-#endif
-
-#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2) || \
-	defined(CONFIG_MBEDTLS_TLS_VERSION_1_3)
-
-/* Common modules required for TLS 1.2 and 1.3 */
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_CLI_C
-
-/* This is not supported by Mbed TLS in TLS 1.3 mode
- * (see modules/crypto/mbedtls/docs/architecture/tls13-support.md).
- */
-#if !defined(CONFIG_MBEDTLS_TLS_VERSION_1_3)
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#endif
-
-#endif /* CONFIG_MBEDTLS_TLS_VERSION_1_2 || CONFIG_MBEDTLS_TLS_VERSION_1_3 */
-
-#if defined(CONFIG_MBEDTLS_TLS_SESSION_TICKETS)
-#define MBEDTLS_SSL_SESSION_TICKETS
-#define MBEDTLS_SSL_TICKET_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_DTLS)
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-#define MBEDTLS_SSL_COOKIE_C
-#endif
-
-/* Supported key exchange methods */
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_PSK_MAX_LEN)
-#define MBEDTLS_PSK_MAX_LEN	CONFIG_MBEDTLS_PSK_MAX_LEN
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECDSA_DETERMINISTIC)
-#define MBEDTLS_ECDSA_DETERMINISTIC
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
-#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED)
-#define MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
-#define MBEDTLS_SSL_EARLY_DATA
-#endif
-
-#if defined(CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED)
-#define MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED)
-#define MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
-#define MBEDTLS_SSL_EARLY_DATA
-#endif
-
-#if defined(CONFIG_MBEDTLS_HKDF_C)
-#define MBEDTLS_HKDF_C
-#endif
-
-/* Supported cipher modes */
-
-#if defined(CONFIG_MBEDTLS_CIPHER_AES_ENABLED)
-#define MBEDTLS_AES_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_AES_ROM_TABLES)
-#define MBEDTLS_AES_ROM_TABLES
-#endif
-
-#if defined(CONFIG_MBEDTLS_AES_FEWER_TABLES)
-#define MBEDTLS_AES_FEWER_TABLES
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_CAMELLIA_ENABLED)
-#define MBEDTLS_CAMELLIA_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_DES_ENABLED)
-#define MBEDTLS_DES_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_CHACHA20_ENABLED)
-#define MBEDTLS_CHACHA20_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_CCM_ENABLED)
-#define MBEDTLS_CCM_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_GCM_ENABLED)
-#define MBEDTLS_GCM_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_MODE_XTS_ENABLED)
-#define MBEDTLS_CIPHER_MODE_XTS
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_MODE_CBC_ENABLED)
-#define MBEDTLS_CIPHER_MODE_CBC
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER_MODE_CTR_ENABLED)
-#define MBEDTLS_CIPHER_MODE_CTR
-#endif
-
-/* Supported elliptic curve libraries */
-
-#if defined(CONFIG_MBEDTLS_ECDH_C)
-#define MBEDTLS_ECDH_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECDSA_C)
-#define MBEDTLS_ECDSA_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECJPAKE_C)
-#define MBEDTLS_ECJPAKE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_C)
-#define MBEDTLS_ECP_C
-#endif
-
-/* Supported elliptic curves */
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED)
-#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED)
-#define MBEDTLS_ECP_DP_BP256R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED)
-#define MBEDTLS_ECP_DP_BP384R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED)
-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED)
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_DP_CURVE448_ENABLED)
-#define MBEDTLS_ECP_DP_CURVE448_ENABLED
-#endif
-
-#if defined(CONFIG_MBEDTLS_ECP_NIST_OPTIM)
-#define MBEDTLS_ECP_NIST_OPTIM
-#endif
-
-/* Supported hash algorithms */
-
-#if defined(CONFIG_MBEDTLS_MD5)
-#define MBEDTLS_MD5_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_SHA1)
-#define MBEDTLS_SHA1_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_SHA224)
-#define MBEDTLS_SHA224_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_SHA256)
-#define MBEDTLS_SHA256_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_SHA256_SMALLER)
-#define MBEDTLS_SHA256_SMALLER
-#endif
-
-#if defined(CONFIG_MBEDTLS_SHA384)
-#define MBEDTLS_SHA384_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_SHA512)
-#define MBEDTLS_SHA512_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_POLY1305)
-#define MBEDTLS_POLY1305_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_CMAC)
-#define MBEDTLS_CMAC_C
-#endif
-
-/* mbedTLS modules */
-#if defined(CONFIG_MBEDTLS_CTR_DRBG_ENABLED)
-#define MBEDTLS_CTR_DRBG_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_HMAC_DRBG_ENABLED)
-#define MBEDTLS_HMAC_DRBG_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_DEBUG)
-#define MBEDTLS_ERROR_C
-#define MBEDTLS_DEBUG_C
-#define MBEDTLS_SSL_DEBUG_ALL
-#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
-#endif
-
-#if defined(CONFIG_MBEDTLS_MEMORY_DEBUG)
-#define MBEDTLS_MEMORY_DEBUG
-#endif
-
-#if defined(CONFIG_MBEDTLS_CHACHAPOLY_AEAD_ENABLED)
-#define MBEDTLS_CHACHAPOLY_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_GENPRIME_ENABLED)
-#define MBEDTLS_GENPRIME
-#endif
-
-#if defined(CONFIG_MBEDTLS_ENTROPY_C)
-#define MBEDTLS_ENTROPY_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_SSL_ALPN)
-#define MBEDTLS_SSL_ALPN
-#endif
-
-#if defined(CONFIG_MBEDTLS_CIPHER)
-#define MBEDTLS_CIPHER_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_MD)
-#define MBEDTLS_MD_C
-#endif
-
-/* Automatic dependencies */
-
-#if defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED) || \
-    defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED)
-#define MBEDTLS_DHM_C
-#endif
-
-#if defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) || \
-    defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) || \
-    defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) || \
-    defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED)
-#define MBEDTLS_RSA_C
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_PKCS1_V21
-#endif
-
-#if defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) || \
-	defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) || \
-	defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) || \
-	defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) || \
-	defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) || \
-	defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) || \
-	defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
-	defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED)
-#define MBEDTLS_X509_CRT_PARSE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT) && \
-    defined(MBEDTLS_X509_CRT_PARSE_C)
-#define MBEDTLS_PEM_PARSE_C
-#define MBEDTLS_PEM_WRITE_C
-#define MBEDTLS_BASE64_C
-#endif
-
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-#define MBEDTLS_X509_USE_C
-#endif
-
-#if defined(MBEDTLS_DHM_C) || \
-    defined(MBEDTLS_ECP_C) || \
-    defined(MBEDTLS_RSA_C) || \
-    defined(MBEDTLS_X509_USE_C) || \
-    defined(MBEDTLS_GENPRIME)
-#define MBEDTLS_BIGNUM_C
-#endif
-
-#if defined(MBEDTLS_RSA_C) || \
-    defined(MBEDTLS_X509_USE_C)
-#define MBEDTLS_OID_C
-#endif
-
-#if defined(MBEDTLS_X509_USE_C)
-#define MBEDTLS_PK_PARSE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_PK_WRITE_C)
-#define MBEDTLS_PK_WRITE_C
-#endif
-
-#if defined(MBEDTLS_PK_PARSE_C) || defined(MBEDTLS_PK_WRITE_C)
-#define MBEDTLS_PK_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_ASN1_PARSE_C) || defined(MBEDTLS_X509_USE_C)
-#define MBEDTLS_ASN1_PARSE_C
-#endif
-
-#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_RSA_C) || defined(MBEDTLS_PK_WRITE_C)
-#define MBEDTLS_ASN1_WRITE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_PKCS5_C)
-#define MBEDTLS_PKCS5_C
-#endif
-
-#define MBEDTLS_SSL_IN_CONTENT_LEN  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
-#define MBEDTLS_SSL_OUT_CONTENT_LEN  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
-
-/* Enable OpenThread optimizations. */
-#if defined(CONFIG_MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED)
-#define MBEDTLS_MPI_WINDOW_SIZE            1 /**< Maximum windows size used. */
-#define MBEDTLS_MPI_MAX_SIZE              32 /**< Maximum number of bytes for usable MPIs. */
-#define MBEDTLS_ECP_WINDOW_SIZE            2 /**< Maximum window size used */
-#define MBEDTLS_ECP_FIXED_POINT_OPTIM      0 /**< Enable fixed-point speed-up */
-#define MBEDTLS_ENTROPY_MAX_SOURCES        1 /**< Maximum number of sources supported */
-#endif
-
-#if defined(CONFIG_MBEDTLS_SERVER_NAME_INDICATION) && \
-	defined(MBEDTLS_X509_CRT_PARSE_C)
-#define MBEDTLS_SSL_SERVER_NAME_INDICATION
-#endif
-
-#if defined(CONFIG_MBEDTLS_SSL_CACHE_C)
-#define MBEDTLS_SSL_CACHE_C
-#define MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT CONFIG_MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT
-#define MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES CONFIG_MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES
-#endif
-
-#if defined(CONFIG_MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
-#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET
-#endif
-
-#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
-#define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
-#endif
-
-#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
-#define MBEDTLS_PSA_CRYPTO_C
-#define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS
-
-#if defined(CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED)
-#define MBEDTLS_PSA_P256M_DRIVER_ENABLED
-#endif
-
-#if defined(CONFIG_SECURE_STORAGE)
-#define MBEDTLS_PSA_CRYPTO_STORAGE_C
-#endif
-
-#endif /* CONFIG_MBEDTLS_PSA_CRYPTO_C */
-
-#if defined(CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOTS)
-#define MBEDTLS_PSA_STATIC_KEY_SLOTS
-#endif
-
-#if defined(CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT)
-#define MBEDTLS_PSA_KEY_SLOT_COUNT CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT
-#endif
-
-#if defined(CONFIG_MBEDTLS_USE_PSA_CRYPTO)
-#define MBEDTLS_USE_PSA_CRYPTO
-#endif
-
-#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_CLIENT)
-#define MBEDTLS_PSA_CRYPTO_CLIENT
-#define MBEDTLS_PSA_CRYPTO_CONFIG
-#define MBEDTLS_PSA_CRYPTO_CONFIG_FILE   "config-psa.h"
-#endif
-
-#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2) && defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
-#define MBEDTLS_SSL_ENCRYPT_THEN_MAC
-#endif
-
-#if defined(CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID)
-#define MBEDTLS_SSL_DTLS_CONNECTION_ID
-#endif
-
-#if defined(CONFIG_MBEDTLS_NIST_KW_C)
-#define MBEDTLS_NIST_KW_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_DHM_C)
-#define MBEDTLS_DHM_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_X509_CRL_PARSE_C)
-#define MBEDTLS_X509_CRL_PARSE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_X509_CSR_WRITE_C)
-#define MBEDTLS_X509_CSR_WRITE_C
-#define MBEDTLS_X509_CREATE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_X509_CSR_PARSE_C)
-#define MBEDTLS_X509_CSR_PARSE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_X509_CRT_WRITE_C)
-#define MBEDTLS_X509_CRT_WRITE_C
-#endif
-
-#if defined(CONFIG_MBEDTLS_USER_CONFIG_FILE)
-#include CONFIG_MBEDTLS_USER_CONFIG_FILE
-#endif
-
-#endif /* MBEDTLS_CONFIG_H */
diff --git a/modules/nrf_wifi/bus/CMakeLists.txt b/modules/nrf_wifi/bus/CMakeLists.txt
index f939ce3287cd9..d822cea551d8a 100644
--- a/modules/nrf_wifi/bus/CMakeLists.txt
+++ b/modules/nrf_wifi/bus/CMakeLists.txt
@@ -1,23 +1,26 @@
 #
 # Copyright (c) 2024 Nordic Semiconductor ASA
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 
-# Check if ZEPHYR_BASE is set
-if(NOT DEFINED ENV{ZEPHYR_BASE})
-    message(FATAL_ERROR "ZEPHYR_BASE environment variable is not set. Please set it to the Zephyr base directory.")
-endif()
+set(NRF_WIFI_DIR ${ZEPHYR_CURRENT_MODULE_DIR})
 
 if (CONFIG_NRF70_BUSLIB)
   zephyr_library_named(nrf70-buslib)
   zephyr_library_include_directories(
     inc
+    ${NRF_WIFI_DIR}/os_if/inc
   )
   zephyr_library_sources(
     rpu_hw_if.c
     device.c
   )
+  if(NOT CONFIG_WIFI_NRF70)
+    zephyr_library_sources(
+      ${NRF_WIFI_DIR}/os_if/src/osal.c
+    )
+  endif()
   zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
     qspi_if.c
   )
diff --git a/modules/nrf_wifi/bus/qspi_if.c b/modules/nrf_wifi/bus/qspi_if.c
index 8c381ff60c5a2..6107a5c4157ff 100644
--- a/modules/nrf_wifi/bus/qspi_if.c
+++ b/modules/nrf_wifi/bus/qspi_if.c
@@ -24,6 +24,7 @@
 #include <hal/nrf_gpio.h>
 
 #include "spi_nor.h"
+#include "osal_api.h"
 
 /* The QSPI bus node which the NRF70 is on */
 #define QSPI_IF_BUS_NODE DT_NODELABEL(qspi)
@@ -1287,7 +1288,7 @@ int qspi_hl_readw(unsigned int addr, void *data)
 
 	len = len + (4 * qspi_cfg->qspi_slave_latency);
 
-	rxb = k_malloc(len);
+	rxb = nrf_wifi_osal_mem_alloc(len);
 
 	if (rxb == NULL) {
 		LOG_ERR("%s: ERROR ENOMEM line %d", __func__, __LINE__);
@@ -1306,7 +1307,7 @@ int qspi_hl_readw(unsigned int addr, void *data)
 
 	*(uint32_t *)data = *(uint32_t *)(rxb + (len - 4));
 
-	k_free(rxb);
+	nrf_wifi_osal_mem_free(rxb);
 
 	return status;
 }
diff --git a/modules/nrf_wifi/bus/rpu_hw_if.c b/modules/nrf_wifi/bus/rpu_hw_if.c
index 8b9393f6f2e97..5dd71a86de2b1 100644
--- a/modules/nrf_wifi/bus/rpu_hw_if.c
+++ b/modules/nrf_wifi/bus/rpu_hw_if.c
@@ -239,8 +239,8 @@ static int rpu_pwron(void)
 		gpio_pin_set_dt(&bucken_spec, 0);
 		return ret;
 	}
-	/* Settling time for iovdd nRF7002 DK/EK - switch (TCK106AG): ~600us */
-	k_msleep(1);
+	/* Settling time for IOVDD */
+	k_msleep(DT_PROP(NRF7002_NODE, iovdd_power_up_delay_ms));
 
 	if ((bucken_spec.port == iovdd_ctrl_spec.port) &&
 	    (bucken_spec.pin == iovdd_ctrl_spec.pin)) {
diff --git a/modules/nrf_wifi/bus/spi_if.c b/modules/nrf_wifi/bus/spi_if.c
index fba9f1f00bfcb..7ef1694da58b9 100644
--- a/modules/nrf_wifi/bus/spi_if.c
+++ b/modules/nrf_wifi/bus/spi_if.c
@@ -26,6 +26,9 @@ static struct qspi_config *spim_config;
 static const struct spi_dt_spec spi_spec =
 SPI_DT_SPEC_GET(NRF7002_NODE, SPI_WORD_SET(8) | SPI_TRANSFER_MSB, 0);
 
+static struct spi_dt_spec spi_spec_8mhz =
+SPI_DT_SPEC_GET(NRF7002_NODE, SPI_WORD_SET(8) | SPI_TRANSFER_MSB, 0);
+
 static int spim_xfer_tx(unsigned int addr, void *data, unsigned int len)
 {
 	int err;
@@ -116,7 +119,7 @@ int spim_read_reg(uint32_t reg_addr, uint8_t *reg_value)
 	return err;
 }
 
-int spim_write_reg(uint32_t reg_addr, const uint8_t reg_value)
+int spim_write_reg(const struct spi_dt_spec *spi_spec, uint32_t reg_addr, const uint8_t reg_value)
 {
 	int err;
 	uint8_t tx_buffer[] = { reg_addr, reg_value };
@@ -124,7 +127,7 @@ int spim_write_reg(uint32_t reg_addr, const uint8_t reg_value)
 	const struct spi_buf tx_buf = { .buf = tx_buffer, .len = sizeof(tx_buffer) };
 	const struct spi_buf_set tx = { .buffers = &tx_buf, .count = 1 };
 
-	err = spi_transceive_dt(&spi_spec, &tx, NULL);
+	err = spi_transceive_dt(spi_spec, &tx, NULL);
 
 	if (err) {
 		LOG_ERR("SPI error: %d", err);
@@ -150,7 +153,7 @@ int spim_RDSR2(const struct device *dev, uint8_t *rdsr1)
 
 int spim_WRSR2(const struct device *dev, const uint8_t wrsr2)
 {
-	return spim_write_reg(0x3F, wrsr2);
+	return spim_write_reg(&spi_spec, 0x3F, wrsr2);
 }
 
 int _spim_wait_while_rpu_awake(void)
@@ -208,7 +211,13 @@ int spim_wait_while_rpu_wake_write(void)
 
 int spim_cmd_rpu_wakeup(uint32_t data)
 {
-	return spim_write_reg(0x3F, data);
+	struct spi_dt_spec *spi_spec_tmp = (struct spi_dt_spec *)&spi_spec;
+
+	if (spi_spec.config.frequency > MHZ(8)) {
+		spi_spec_tmp = &spi_spec_8mhz;
+	}
+	/* Waking RPU works reliably only with lowest frequency (8MHz) */
+	return spim_write_reg(spi_spec_tmp, 0x3F, data);
 }
 
 unsigned int spim_cmd_sleep_rpu(void)
@@ -243,6 +252,8 @@ int spim_init(struct qspi_config *config)
 		spim_config->qspi_slave_latency = 1;
 	}
 
+	spi_spec_8mhz.config.frequency = MHZ(8);
+
 	LOG_INF("SPIM %s: freq = %d MHz", spi_spec.bus->name,
 		spi_spec.config.frequency / MHZ(1));
 	LOG_INF("SPIM %s: latency = %d", spi_spec.bus->name, spim_config->qspi_slave_latency);
diff --git a/modules/nrf_wifi/os/CMakeLists.txt b/modules/nrf_wifi/os/CMakeLists.txt
index 42610b9bf572b..e4f9cf2a0b6dc 100644
--- a/modules/nrf_wifi/os/CMakeLists.txt
+++ b/modules/nrf_wifi/os/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(${ZEPHYR_NRF_WIFI_MODULE_DIR} nrf_wifi_osal)
 
 zephyr_library_named(nrf-wifi-shim)
 zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR})
+zephyr_include_directories(${ZEPHYR_NRF_WIFI_MODULE_DIR}/os_if/inc)
 zephyr_library_sources(
   shim.c
   timer.c
diff --git a/modules/nrf_wifi/os/shim.c b/modules/nrf_wifi/os/shim.c
index ed6acf958464e..997704b01bb1c 100644
--- a/modules/nrf_wifi/os/shim.c
+++ b/modules/nrf_wifi/os/shim.c
@@ -20,6 +20,7 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
 #include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
+#include <zephyr/sys/math_extras.h>
 
 #include "shim.h"
 #include "work.h"
@@ -27,6 +28,14 @@
 #include "osal_ops.h"
 
 LOG_MODULE_REGISTER(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
+#if defined(CONFIG_NOCACHE_MEMORY)
+K_HEAP_DEFINE_NOCACHE(wifi_drv_ctrl_mem_pool, CONFIG_NRF_WIFI_CTRL_HEAP_SIZE);
+K_HEAP_DEFINE_NOCACHE(wifi_drv_data_mem_pool, CONFIG_NRF_WIFI_DATA_HEAP_SIZE);
+#else
+K_HEAP_DEFINE(wifi_drv_ctrl_mem_pool, CONFIG_NRF_WIFI_CTRL_HEAP_SIZE);
+K_HEAP_DEFINE(wifi_drv_data_mem_pool, CONFIG_NRF_WIFI_DATA_HEAP_SIZE);
+#endif /* CONFIG_NOCACHE_MEMORY */
+#define WORD_SIZE 4
 
 struct zep_shim_intr_priv *intr_priv;
 
@@ -34,14 +43,66 @@ static void *zep_shim_mem_alloc(size_t size)
 {
 	size_t size_aligned = ROUND_UP(size, 4);
 
-	return k_malloc(size_aligned);
+	return k_heap_aligned_alloc(&wifi_drv_ctrl_mem_pool, WORD_SIZE, size_aligned, K_FOREVER);
+}
+
+static void *zep_shim_data_mem_alloc(size_t size)
+{
+	size_t size_aligned = ROUND_UP(size, 4);
+
+	return k_heap_aligned_alloc(&wifi_drv_data_mem_pool, WORD_SIZE, size_aligned, K_FOREVER);
 }
 
 static void *zep_shim_mem_zalloc(size_t size)
 {
+	void *ret;
+	size_t bounds;
+
 	size_t size_aligned = ROUND_UP(size, 4);
 
-	return k_calloc(size_aligned, sizeof(char));
+	if (size_mul_overflow(size_aligned, sizeof(char), &bounds)) {
+		return NULL;
+	}
+
+	ret = zep_shim_mem_alloc(bounds);
+	if (ret != NULL) {
+		(void)memset(ret, 0, bounds);
+	}
+
+	return ret;
+}
+
+static void *zep_shim_data_mem_zalloc(size_t size)
+{
+	void *ret;
+	size_t bounds;
+
+	size_t size_aligned = ROUND_UP(size, 4);
+
+	if (size_mul_overflow(size_aligned, sizeof(char), &bounds)) {
+		return NULL;
+	}
+
+	ret = zep_shim_data_mem_alloc(bounds);
+	if (ret != NULL) {
+		(void)memset(ret, 0, bounds);
+	}
+
+	return ret;
+}
+
+static void zep_shim_mem_free(void *buf)
+{
+	if (buf) {
+		k_heap_free(&wifi_drv_ctrl_mem_pool, buf);
+	}
+}
+
+static void zep_shim_data_mem_free(void *buf)
+{
+	if (buf) {
+		k_heap_free(&wifi_drv_data_mem_pool, buf);
+	}
 }
 
 static void *zep_shim_mem_cpy(void *dest, const void *src, size_t count)
@@ -118,7 +179,7 @@ static void *zep_shim_spinlock_alloc(void)
 {
 	struct k_mutex *lock = NULL;
 
-	lock = k_malloc(sizeof(*lock));
+	lock = zep_shim_mem_zalloc(sizeof(*lock));
 
 	if (!lock) {
 		LOG_ERR("%s: Unable to allocate memory for spinlock", __func__);
@@ -129,7 +190,7 @@ static void *zep_shim_spinlock_alloc(void)
 
 static void zep_shim_spinlock_free(void *lock)
 {
-	k_free(lock);
+	k_heap_free(&wifi_drv_ctrl_mem_pool, lock);
 }
 
 static void zep_shim_spinlock_init(void *lock)
@@ -207,22 +268,25 @@ struct nwb {
 	void (*cleanup_cb)();
 	unsigned char priority;
 	bool chksum_done;
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	struct net_pkt *pkt;
+#endif
 };
 
 static void *zep_shim_nbuf_alloc(unsigned int size)
 {
 	struct nwb *nbuff;
 
-	nbuff = (struct nwb *)k_calloc(sizeof(struct nwb), sizeof(char));
+	nbuff = (struct nwb *)zep_shim_data_mem_zalloc(sizeof(struct nwb));
 
 	if (!nbuff) {
 		return NULL;
 	}
 
-	nbuff->priv = k_calloc(size, sizeof(char));
+	nbuff->priv = zep_shim_data_mem_zalloc(size);
 
 	if (!nbuff->priv) {
-		k_free(nbuff);
+		zep_shim_data_mem_free(nbuff);
 		return NULL;
 	}
 
@@ -240,9 +304,15 @@ static void zep_shim_nbuf_free(void *nbuf)
 	if (!nbuf) {
 		return;
 	}
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	if (((struct nwb *)nbuf)->pkt) {
+		net_pkt_unref(((struct nwb *)nbuf)->pkt);
+		((struct nwb *)nbuf)->pkt = NULL;
+	}
+#endif /* CONFIG_NRF_WIFI_ZERO_COPY_TX */
 
-	k_free(((struct nwb *)nbuf)->priv);
-	k_free(nbuf);
+	zep_shim_data_mem_free(((struct nwb *)nbuf)->priv);
+	zep_shim_data_mem_free(nbuf);
 }
 
 static void zep_shim_nbuf_headroom_res(void *nbuf, unsigned int size)
@@ -326,12 +396,62 @@ static void zep_shim_nbuf_set_chksum_done(void *nbuf, unsigned char chksum_done)
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/net_core.h>
 
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+void *net_pkt_to_nbuf_zc(struct net_pkt *pkt)
+{
+	struct nwb *nbuff;
+
+	if (!pkt || !pkt->buffer) {
+		LOG_DBG("Invalid packet, dropping");
+		return NULL;
+	}
+
+	/* Check if packet has more than one fragment */
+	if (pkt->buffer->frags) {
+		LOG_ERR("Zero-copy only supports single buffer packets");
+		return NULL;
+	}
+
+	nbuff = zep_shim_nbuf_alloc(NRF_WIFI_EXTRA_TX_HEADROOM); /* Just for headers */
+	if (!nbuff) {
+		return NULL;
+	}
+
+	zep_shim_nbuf_headroom_res(nbuff, NRF_WIFI_EXTRA_TX_HEADROOM);
+
+	/* Zero-copy: point to the single data buffer */
+	/* TODO: Use API for proper cursor access? */
+	nbuff->data = pkt->buffer->data;
+	nbuff->len = pkt->buffer->len;
+
+	nbuff->priority = net_pkt_priority(pkt);
+	nbuff->chksum_done = (bool)net_pkt_is_chksum_done(pkt);
+
+	nbuff->pkt = pkt;
+	/* Ref the packet so that it is not freed */
+	net_pkt_ref(pkt);
+
+	return nbuff;
+}
+#endif /* CONFIG_NRF_WIFI_ZERO_COPY_TX */
+
 void *net_pkt_to_nbuf(struct net_pkt *pkt)
 {
 	struct nwb *nbuff;
 	unsigned char *data;
 	unsigned int len;
 
+	if (!pkt) {
+		return NULL;
+	}
+
+#ifdef CONFIG_NRF_WIFI_ZERO_COPY_TX
+	/* For zero-copy, check if packet has single buffer */
+	if (pkt->buffer && !pkt->buffer->frags) {
+		return net_pkt_to_nbuf_zc(pkt);
+	}
+#endif /* CONFIG_NRF_WIFI_ZERO_COPY_TX */
+
 	len = net_pkt_get_len(pkt);
 
 	nbuff = zep_shim_nbuf_alloc(len + 100);
@@ -406,7 +526,7 @@ void *net_raw_pkt_from_nbuf(void *iface, void *frm,
 	nwb_data = zep_shim_nbuf_data_get(nwb);
 	total_len = raw_hdr_len + nwb_len;
 
-	data = (unsigned char *)k_malloc(total_len);
+	data = (unsigned char *)zep_shim_data_mem_zalloc(total_len);
 	if (!data) {
 		LOG_ERR("%s: Unable to allocate memory for sniffer data packet", __func__);
 		goto out;
@@ -428,7 +548,7 @@ void *net_raw_pkt_from_nbuf(void *iface, void *frm,
 	}
 out:
 	if (data != NULL) {
-		k_free(data);
+		zep_shim_data_mem_free(data);
 	}
 
 	if (pkt_free) {
@@ -443,7 +563,23 @@ static void *zep_shim_llist_node_alloc(void)
 {
 	struct zep_shim_llist_node *llist_node = NULL;
 
-	llist_node = k_calloc(sizeof(*llist_node), sizeof(char));
+	llist_node = zep_shim_data_mem_zalloc(sizeof(*llist_node));
+
+	if (!llist_node) {
+		LOG_ERR("%s: Unable to allocate memory for linked list node", __func__);
+		return NULL;
+	}
+
+	sys_dnode_init(&llist_node->head);
+
+	return llist_node;
+}
+
+static void *zep_shim_ctrl_llist_node_alloc(void)
+{
+	struct zep_shim_llist_node *llist_node = NULL;
+
+	llist_node = zep_shim_mem_zalloc(sizeof(*llist_node));
 
 	if (!llist_node) {
 		LOG_ERR("%s: Unable to allocate memory for linked list node", __func__);
@@ -457,7 +593,12 @@ static void *zep_shim_llist_node_alloc(void)
 
 static void zep_shim_llist_node_free(void *llist_node)
 {
-	k_free(llist_node);
+	zep_shim_data_mem_free(llist_node);
+}
+
+static void zep_shim_ctrl_llist_node_free(void *llist_node)
+{
+	zep_shim_mem_free(llist_node);
 }
 
 static void *zep_shim_llist_node_data_get(void *llist_node)
@@ -482,7 +623,20 @@ static void *zep_shim_llist_alloc(void)
 {
 	struct zep_shim_llist *llist = NULL;
 
-	llist = k_calloc(sizeof(*llist), sizeof(char));
+	llist = zep_shim_data_mem_zalloc(sizeof(*llist));
+
+	if (!llist) {
+		LOG_ERR("%s: Unable to allocate memory for linked list", __func__);
+	}
+
+	return llist;
+}
+
+static void *zep_shim_ctrl_llist_alloc(void)
+{
+	struct zep_shim_llist *llist = NULL;
+
+	llist = zep_shim_mem_zalloc(sizeof(*llist));
 
 	if (!llist) {
 		LOG_ERR("%s: Unable to allocate memory for linked list", __func__);
@@ -493,7 +647,12 @@ static void *zep_shim_llist_alloc(void)
 
 static void zep_shim_llist_free(void *llist)
 {
-	k_free(llist);
+	zep_shim_data_mem_free(llist);
+}
+
+static void zep_shim_ctrl_llist_free(void *llist)
+{
+	zep_shim_mem_free(llist);
 }
 
 static void zep_shim_llist_init(void *llist)
@@ -698,7 +857,7 @@ static void *zep_shim_bus_qspi_init(void)
 {
 	struct zep_shim_bus_qspi_priv *qspi_priv = NULL;
 
-	qspi_priv = k_calloc(sizeof(*qspi_priv), sizeof(char));
+	qspi_priv = zep_shim_mem_zalloc(sizeof(*qspi_priv));
 
 	if (!qspi_priv) {
 		LOG_ERR("%s: Unable to allocate memory for qspi_priv", __func__);
@@ -714,7 +873,7 @@ static void zep_shim_bus_qspi_deinit(void *os_qspi_priv)
 
 	qspi_priv = os_qspi_priv;
 
-	k_free(qspi_priv);
+	zep_shim_mem_free(qspi_priv);
 }
 
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
@@ -789,7 +948,7 @@ static enum nrf_wifi_status zep_shim_bus_qspi_intr_reg(void *os_dev_ctx, void *c
 
 	ARG_UNUSED(os_dev_ctx);
 
-	intr_priv = k_calloc(sizeof(*intr_priv), sizeof(char));
+	intr_priv = zep_shim_mem_zalloc(sizeof(*intr_priv));
 
 	if (!intr_priv) {
 		LOG_ERR("%s: Unable to allocate memory for intr_priv", __func__);
@@ -805,7 +964,7 @@ static enum nrf_wifi_status zep_shim_bus_qspi_intr_reg(void *os_dev_ctx, void *c
 
 	if (ret) {
 		LOG_ERR("%s: request_irq failed", __func__);
-		k_free(intr_priv);
+		zep_shim_mem_free(intr_priv);
 		intr_priv = NULL;
 		goto out;
 	}
@@ -831,7 +990,7 @@ static void zep_shim_bus_qspi_intr_unreg(void *os_qspi_dev_ctx)
 
 	k_work_cancel_delayable_sync(&intr_priv->work, &sync);
 
-	k_free(intr_priv);
+	zep_shim_mem_free(intr_priv);
 	intr_priv = NULL;
 }
 
@@ -840,7 +999,7 @@ static void *zep_shim_timer_alloc(void)
 {
 	struct timer_list *timer = NULL;
 
-	timer = k_malloc(sizeof(*timer));
+	timer = zep_shim_mem_zalloc(sizeof(*timer));
 
 	if (!timer) {
 		LOG_ERR("%s: Unable to allocate memory for work", __func__);
@@ -859,7 +1018,7 @@ static void zep_shim_timer_init(void *timer, void (*callback)(unsigned long), un
 
 static void zep_shim_timer_free(void *timer)
 {
-	k_free(timer);
+	zep_shim_mem_free(timer);
 }
 
 static void zep_shim_timer_schedule(void *timer, unsigned long duration)
@@ -907,7 +1066,9 @@ static unsigned int zep_shim_strlen(const void *str)
 const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.mem_alloc = zep_shim_mem_alloc,
 	.mem_zalloc = zep_shim_mem_zalloc,
-	.mem_free = k_free,
+	.data_mem_zalloc = zep_shim_data_mem_zalloc,
+	.mem_free = zep_shim_mem_free,
+	.data_mem_free = zep_shim_data_mem_free,
 	.mem_cpy = zep_shim_mem_cpy,
 	.mem_set = zep_shim_mem_set,
 	.mem_cmp = zep_shim_mem_cmp,
@@ -931,12 +1092,16 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.log_err = zep_shim_pr_err,
 
 	.llist_node_alloc = zep_shim_llist_node_alloc,
+	.ctrl_llist_node_alloc = zep_shim_ctrl_llist_node_alloc,
 	.llist_node_free = zep_shim_llist_node_free,
+	.ctrl_llist_node_free = zep_shim_ctrl_llist_node_free,
 	.llist_node_data_get = zep_shim_llist_node_data_get,
 	.llist_node_data_set = zep_shim_llist_node_data_set,
 
 	.llist_alloc = zep_shim_llist_alloc,
+	.ctrl_llist_alloc = zep_shim_ctrl_llist_alloc,
 	.llist_free = zep_shim_llist_free,
+	.ctrl_llist_free = zep_shim_ctrl_llist_free,
 	.llist_init = zep_shim_llist_init,
 	.llist_add_node_tail = zep_shim_llist_add_node_tail,
 	.llist_add_node_head = zep_shim_llist_add_node_head,
diff --git a/modules/nrf_wifi/os/shim.h b/modules/nrf_wifi/os/shim.h
index be26fd6355e62..b479f5c8df815 100644
--- a/modules/nrf_wifi/os/shim.h
+++ b/modules/nrf_wifi/os/shim.h
@@ -16,6 +16,8 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/net/net_pkt.h>
 
+#define NRF_WIFI_EXTRA_TX_HEADROOM 100
+
 /**
  * struct zep_shim_bus_qspi_priv - Structure to hold context information for the Linux OS
  *                        shim.
diff --git a/modules/openthread/Kconfig.thread b/modules/openthread/Kconfig.thread
index 81c0ab20afc09..2bababd4fee5d 100644
--- a/modules/openthread/Kconfig.thread
+++ b/modules/openthread/Kconfig.thread
@@ -250,11 +250,3 @@ config OPENTHREAD_MLE_CHILD_TIMEOUT
 	default 240
 	help
 	  The value of MLE child timeout in seconds.
-
-config OPENTHREAD_PSA_ITS_NVM_OFFSET
-	hex "NVM offset while using key refs"
-	default 0x20000
-	help
-	  The offset value in the PSA ITS non-volatile space is dedicated to OpenThread
-	  key reference IDs. This offset must not overwrite any other ranges already in
-	  use within the PSA ITS non-volatile space.
diff --git a/modules/openthread/platform/ble.c b/modules/openthread/platform/ble.c
index b3d841d46d5c4..ca40ae117be93 100644
--- a/modules/openthread/platform/ble.c
+++ b/modules/openthread/platform/ble.c
@@ -433,6 +433,30 @@ otError otPlatBleGapAdvSetData(otInstance *aInstance, uint8_t *aAdvertisementDat
 	return OT_ERROR_NONE;
 }
 
+otError otPlatBleGapAdvUpdateData(otInstance *aInstance, uint8_t *aAdvertisementData,
+				  uint16_t aAdvertisementLen)
+{
+	ARG_UNUSED(aInstance);
+
+	int err;
+
+	if (aAdvertisementLen > OT_TCAT_ADVERTISEMENT_MAX_LEN || aAdvertisementData == NULL) {
+		LOG_ERR("Invalid TCAT Advertisement parameters advlen: %d", aAdvertisementLen);
+		return OT_ERROR_INVALID_ARGS;
+	}
+
+	ad[1].data_len = (uint8_t)aAdvertisementLen;
+	sd[1].data_len = (uint8_t)aAdvertisementLen;
+
+	err = bt_le_adv_update_data(ad, ARRAY_SIZE(ad), sd, ARRAY_SIZE(sd));
+
+	if (err != 0) {
+		return OT_ERROR_FAILED;
+	}
+
+	return OT_ERROR_NONE;
+}
+
 otError otPlatBleGapAdvStart(otInstance *aInstance, uint16_t aInterval)
 {
 	ARG_UNUSED(aInstance);
diff --git a/modules/openthread/platform/crypto_psa.c b/modules/openthread/platform/crypto_psa.c
index 6ad286f3734f9..bab1afbd7e9dd 100644
--- a/modules/openthread/platform/crypto_psa.c
+++ b/modules/openthread/platform/crypto_psa.c
@@ -226,7 +226,7 @@ otError otPlatCryptoHmacSha256Init(otCryptoContext *aContext)
 	}
 
 	operation = aContext->mContext;
-	*operation = psa_mac_operation_init();
+	memset(operation, 0, sizeof(*operation));
 
 	return OT_ERROR_NONE;
 }
@@ -347,7 +347,7 @@ otError otPlatCryptoSha256Init(otCryptoContext *aContext)
 	}
 
 	operation = aContext->mContext;
-	*operation = psa_hash_operation_init();
+	memset(operation, 0, sizeof(*operation));
 
 	return OT_ERROR_NONE;
 }
diff --git a/modules/openthread/platform/diag.c b/modules/openthread/platform/diag.c
index 79f4e38984af9..3bd4b549536b0 100644
--- a/modules/openthread/platform/diag.c
+++ b/modules/openthread/platform/diag.c
@@ -90,10 +90,16 @@ otError otPlatDiagProcess(otInstance *aInstance, uint8_t aArgsLength, char *aArg
 
 void otPlatDiagModeSet(bool aMode)
 {
+	otError error;
+
 	sDiagMode = aMode;
 
 	if (!sDiagMode) {
-		otPlatRadioSleep(NULL);
+		error = otPlatRadioSleep(NULL);
+		if (error != OT_ERROR_NONE) {
+			otPlatLog(OT_LOG_LEVEL_WARN, OT_LOG_REGION_PLATFORM,
+				  "%s failed (%d)", "otPlatRadioSleep", error);
+		}
 	}
 }
 
@@ -345,6 +351,7 @@ static otError startModCarrier(otInstance *aInstance, uint8_t aArgsLength, char
 void otPlatDiagAlarmCallback(otInstance *aInstance)
 {
 	uint32_t now;
+	otError error;
 	otRadioFrame *txPacket;
 	const uint16_t diag_packet_len = 30;
 
@@ -370,7 +377,11 @@ void otPlatDiagAlarmCallback(otInstance *aInstance)
 				txPacket->mPsdu[i] = i;
 			}
 
-			otPlatRadioTransmit(aInstance, txPacket);
+			error = otPlatRadioTransmit(aInstance, txPacket);
+			if (error != OT_ERROR_NONE) {
+				otPlatLog(OT_LOG_LEVEL_WARN, OT_LOG_REGION_PLATFORM,
+					  "%s failed (%d)", "otPlatRadioTransmit", error);
+			}
 
 			if (sTxCount != -1) {
 				sTxCount--;
@@ -405,8 +416,11 @@ static otError processTransmit(otInstance *aInstance, uint8_t aArgsLength, char
 		otPlatAlarmMilliStop(aInstance);
 		diag_output("diagnostic message transmission is stopped\r\n");
 		sTransmitMode = DIAG_TRANSMIT_MODE_IDLE;
-		otPlatRadioReceive(aInstance, sChannel);
-
+		error = otPlatRadioReceive(aInstance, sChannel);
+		if (error != OT_ERROR_NONE) {
+			otPlatLog(OT_LOG_LEVEL_WARN, OT_LOG_REGION_PLATFORM,
+				  "%s failed (%d)", "otPlatRadioReceive", error);
+		}
 	} else if (strcmp(aArgs[0], "start") == 0) {
 		if (sTransmitMode != DIAG_TRANSMIT_MODE_IDLE) {
 			return OT_ERROR_INVALID_STATE;
diff --git a/modules/openthread/platform/openthread-core-zephyr-config.h b/modules/openthread/platform/openthread-core-zephyr-config.h
index c495c8ca4eff2..15688bf67a2d9 100644
--- a/modules/openthread/platform/openthread-core-zephyr-config.h
+++ b/modules/openthread/platform/openthread-core-zephyr-config.h
@@ -14,6 +14,7 @@
 #define OPENTHREAD_CORE_ZEPHYR_CONFIG_H_
 
 #include <zephyr/devicetree.h>
+#include <zephyr/psa/key_ids.h>
 #include <zephyr/toolchain.h>
 
 /**
@@ -516,8 +517,6 @@
  * NVM offset while using key refs.
  *
  */
-#ifdef CONFIG_OPENTHREAD_PSA_ITS_NVM_OFFSET
-#define OPENTHREAD_CONFIG_PSA_ITS_NVM_OFFSET CONFIG_OPENTHREAD_PSA_ITS_NVM_OFFSET
-#endif
+#define OPENTHREAD_CONFIG_PSA_ITS_NVM_OFFSET ZEPHYR_PSA_OPENTHREAD_KEY_ID_RANGE_BEGIN
 
 #endif  /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */
diff --git a/modules/openthread/platform/platform-zephyr.h b/modules/openthread/platform/platform-zephyr.h
index d6dd26adea047..7671729208eaa 100644
--- a/modules/openthread/platform/platform-zephyr.h
+++ b/modules/openthread/platform/platform-zephyr.h
@@ -117,4 +117,4 @@ int notify_new_rx_frame(struct net_pkt *pkt);
  */
 int notify_new_tx_frame(struct net_pkt *pkt);
 
-#endif  /* PLATFORM_POSIX_H_ */
+#endif /* PLATFORM_ZEPHYR_H_ */
diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
index 82b54a34763e6..4a9fc1279cf7e 100644
--- a/modules/openthread/platform/radio.c
+++ b/modules/openthread/platform/radio.c
@@ -158,11 +158,6 @@ static void reset_pending_event(enum pending_events event)
 	atomic_clear_bit(pending_events, event);
 }
 
-static inline void clear_pending_events(void)
-{
-	atomic_clear(pending_events);
-}
-
 void energy_detected(const struct device *dev, int16_t max_ed)
 {
 	if (dev == radio_dev) {
diff --git a/modules/segger/CMakeLists.txt b/modules/segger/CMakeLists.txt
index ab15d7c17fccb..5b3181743e2aa 100644
--- a/modules/segger/CMakeLists.txt
+++ b/modules/segger/CMakeLists.txt
@@ -13,6 +13,8 @@ if(CONFIG_USE_SEGGER_RTT)
   zephyr_library_sources_ifdef(CONFIG_SEGGER_SYSTEMVIEW ${SEGGER_DIR}/SEGGER/SEGGER_SYSVIEW.c)
   # Using sort key AAA to ensure that we are placed at start of RAM
   zephyr_linker_sources_ifdef(CONFIG_SEGGER_RTT_SECTION_CUSTOM RAM_SECTIONS SORT_KEY aaa segger_rtt.ld)
+  zephyr_linker_section_ifdef(CONFIG_SEGGER_RTT_SECTION_CUSTOM NAME "rtt_buff_data" GROUP RAM_REGION ALIGN 4 NOINPUT)
+  zephyr_linker_section_configure(SECTION "rtt_buff_data" INPUT "${CONFIG_SEGGER_RTT_SECTION_CUSTOM_NAME}" SYMBOLS )
 endif()
 
 if(CONFIG_SEGGER_DEBUGMON)
diff --git a/modules/tflite-micro/CMakeLists.txt b/modules/tflite-micro/CMakeLists.txt
index c0893a7d807e0..95301b34c7939 100644
--- a/modules/tflite-micro/CMakeLists.txt
+++ b/modules/tflite-micro/CMakeLists.txt
@@ -41,9 +41,12 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
     ${TENSORFLOW_LITE_MICRO_DIR}/signal/src/kiss_fft_wrappers/kiss_fft_float.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/signal/src/kiss_fft_wrappers/kiss_fft_int16.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/signal/src/kiss_fft_wrappers/kiss_fft_int32.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/compiler/mlir/lite/core/api/error_reporter.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/compiler/mlir/lite/schema/schema_utils.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/array.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/c/common.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/debug_log.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/hexdump.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/fake_micro_context.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/memory_helpers.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/micro_allocation_info.cc
@@ -81,9 +84,7 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/kernels/internal/reference/portable_tensor_utils.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/kernels/kernel_util.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/api/flatbuffer_conversions.cc
-    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/api/error_reporter.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/core/api/tensor_utils.cc
-    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/schema/schema_utils.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/activations.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/activations_common.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/${CMSIS_NN_OPTIMIZED_KERNEL_DIR}/add.cc
@@ -91,7 +92,7 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/add_n.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/arg_min_max.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/assign_variable.cc
-    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/batch_matmul.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/${CMSIS_NN_OPTIMIZED_KERNEL_DIR}/batch_matmul.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/batch_to_space_nd.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/broadcast_args.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/broadcast_to.cc
@@ -105,6 +106,8 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/${CMSIS_NN_OPTIMIZED_KERNEL_DIR}/conv.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/conv_common.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/cumsum.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/decompress.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/decompress_common.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/depth_to_space.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/${CMSIS_NN_OPTIMIZED_KERNEL_DIR}/depthwise_conv.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/depthwise_conv_common.cc
@@ -142,7 +145,7 @@ if(CONFIG_TENSORFLOW_LITE_MICRO)
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/lstm_eval.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/lstm_eval_common.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/log_softmax.cc
-    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/maximum_minimum.cc
+    ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/${CMSIS_NN_OPTIMIZED_KERNEL_DIR}/maximum_minimum.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/micro_tensor_utils.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/mirror_pad.cc
     ${TENSORFLOW_LITE_MICRO_DIR}/tensorflow/lite/micro/kernels/${CMSIS_NN_OPTIMIZED_KERNEL_DIR}/mul.cc
diff --git a/modules/tflite-micro/Kconfig b/modules/tflite-micro/Kconfig
index 72789bd51de61..99a49d6a633bf 100644
--- a/modules/tflite-micro/Kconfig
+++ b/modules/tflite-micro/Kconfig
@@ -28,6 +28,8 @@ config TENSORFLOW_LITE_MICRO_CMSIS_NN_KERNELS
 	select CMSIS_NN_SOFTMAX
 	select CMSIS_NN_SVD
 	select CMSIS_NN_LSTM
+	select CMSIS_NN_TRANSPOSE
+	select CMSIS_NN_PAD
 	help
 	  This option adds support for CMSIS-NN optimized kernels when using TensorFlow Lite Micro.
 
diff --git a/modules/thrift/src/thrift/server/TServerFramework.cpp b/modules/thrift/src/thrift/server/TServerFramework.cpp
index c5061fcaeacaf..678d70702d7d8 100644
--- a/modules/thrift/src/thrift/server/TServerFramework.cpp
+++ b/modules/thrift/src/thrift/server/TServerFramework.cpp
@@ -236,8 +236,7 @@ void TServerFramework::newlyConnectedClient(const shared_ptr<TConnectedClient> &
 	onClientConnected(pClient);
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR)
 void TServerFramework::disposeConnectedClient(TConnectedClient *pClient)
 {
 	onClientDisconnected(pClient);
@@ -248,7 +247,7 @@ void TServerFramework::disposeConnectedClient(TConnectedClient *pClient)
 		// mon_.notify();
 	}
 }
-#pragma GCC diagnostic pop
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_DELETE_NON_VIRTUAL_DTOR)
 
 } // namespace server
 } // namespace thrift
diff --git a/modules/thrift/src/thrift/transport/TSSLSocket.cpp b/modules/thrift/src/thrift/transport/TSSLSocket.cpp
index 3ac178ede3be5..f23c6b4f96dc3 100644
--- a/modules/thrift/src/thrift/transport/TSSLSocket.cpp
+++ b/modules/thrift/src/thrift/transport/TSSLSocket.cpp
@@ -450,7 +450,7 @@ void TSSLSocketFactory::loadCertificateFromBuffer(const char *aCertificate, cons
 
 	if (strcmp(format, "PEM") == 0) {
 		const int status = tls_credential_add(Thrift_TLS_SERVER_CERT_TAG,
-						      TLS_CREDENTIAL_SERVER_CERTIFICATE,
+						      TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 						      aCertificate, strlen(aCertificate) + 1);
 
 		if (status != 0) {
diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt
index cce52e45eb3de..698b23aaf78b4 100644
--- a/modules/trusted-firmware-m/CMakeLists.txt
+++ b/modules/trusted-firmware-m/CMakeLists.txt
@@ -18,6 +18,14 @@ set(TFM_VALID_PARTITIONS
 if (CONFIG_BUILD_WITH_TFM)
   # PSA API awareness for the Non-Secure application
   target_compile_definitions(app PRIVATE "TFM_PSA_API")
+
+  if(CONFIG_TFM_BL1)
+    list(APPEND TFM_CMAKE_ARGS -DBL1:BOOL=ON)
+    if(CONFIG_TFM_BL2_SIGNING_KEY_PATH)
+      list(APPEND TFM_CMAKE_ARGS -DTFM_BL2_SIGNING_KEY_PATH=${CONFIG_TFM_BL2_SIGNING_KEY_PATH})
+    endif()
+  endif()
+
   if (CONFIG_TFM_SFN)
     list(APPEND TFM_CMAKE_ARGS -DCONFIG_TFM_SPM_BACKEND="SFN")
   else() # CONFIG_TFM_IPC
@@ -162,6 +170,10 @@ if (CONFIG_BUILD_WITH_TFM)
     set(BL2_ELF_FILE ${TFM_BINARY_DIR}/bin/bl2.elf)
     set(BL2_BIN_FILE ${TFM_BINARY_DIR}/bin/bl2.bin)
     set(BL2_HEX_FILE ${TFM_BINARY_DIR}/bin/bl2.hex)
+    if(CONFIG_TFM_BL1)
+      set(BL2_SIGNED_BIN_FILE ${TFM_BINARY_DIR}/bin/bl2_signed.bin)
+      set(BL2_SIGNED_HEX_FILE ${TFM_BINARY_DIR}/bin/bl2_signed.hex)
+    endif()
   endif()
   set(TFM_S_ELF_FILE ${TFM_BINARY_DIR}/bin/tfm_s.elf)
   set(TFM_S_BIN_FILE ${TFM_BINARY_DIR}/bin/tfm_s.bin)
@@ -179,6 +191,8 @@ if (CONFIG_BUILD_WITH_TFM)
     ${BL2_ELF_FILE}
     ${BL2_BIN_FILE}
     ${BL2_HEX_FILE}
+    $<$<BOOL:${CONFIG_TFM_BL1}>:${BL2_SIGNED_BIN_FILE}>
+    $<$<BOOL:${CONFIG_TFM_BL1}>:${BL2_SIGNED_HEX_FILE}>
     ${TFM_S_ELF_FILE}
     ${TFM_S_BIN_FILE}
     ${TFM_S_HEX_FILE}
@@ -253,7 +267,9 @@ if (CONFIG_BUILD_WITH_TFM)
 
   list(APPEND TFM_CMAKE_ARGS -DTFM_TESTS_REVISION_CHECKS=OFF)
 
-  list(APPEND TFM_CMAKE_ARGS -DETHOS_DRIVER_PATH=${CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL})
+  if(CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL)
+    list(APPEND TFM_CMAKE_ARGS -DETHOS_DRIVER_PATH=${CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL})
+  endif()
 
   file(MAKE_DIRECTORY ${TFM_BINARY_DIR})
   add_custom_target(tfm_cmake
@@ -324,6 +340,10 @@ if (CONFIG_BUILD_WITH_TFM)
       BL2_BIN_FILE ${BL2_BIN_FILE}
       BL2_HEX_FILE ${BL2_HEX_FILE}
       )
+      if(CONFIG_TFM_BL1)
+        set_target_properties(tfm PROPERTIES BL2_SIGNED_BIN_FILE ${BL2_SIGNED_BIN_FILE})
+        set_target_properties(tfm PROPERTIES BL2_SIGNED_HEX_FILE ${BL2_SIGNED_HEX_FILE})
+      endif()
   endif()
 
   # Set TFM S/NS executable file paths as target properties on 'tfm'
@@ -483,7 +503,8 @@ if (CONFIG_BUILD_WITH_TFM)
 
       COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
         -o ${MERGED_FILE}
-        $<TARGET_PROPERTY:tfm,BL2_HEX_FILE>
+        $<$<BOOL:${CONFIG_TFM_BL1}>:$<TARGET_PROPERTY:tfm,BL2_SIGNED_HEX_FILE>>
+        $<$<NOT:$<BOOL:${CONFIG_TFM_BL1}>>:$<TARGET_PROPERTY:tfm,BL2_HEX_FILE>>
         ${S_NS_SIGNED_FILE}
     )
 
@@ -509,7 +530,8 @@ if (CONFIG_BUILD_WITH_TFM)
 
       COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
         -o ${MERGED_FILE}
-        $<TARGET_PROPERTY:tfm,BL2_HEX_FILE>
+        $<$<BOOL:${CONFIG_TFM_BL1}>:$<TARGET_PROPERTY:tfm,BL2_SIGNED_HEX_FILE>>
+        $<$<NOT:$<BOOL:${CONFIG_TFM_BL1}>>:$<TARGET_PROPERTY:tfm,BL2_HEX_FILE>>
         ${S_SIGNED_FILE}
         ${NS_SIGNED_FILE}
     )
diff --git a/modules/trusted-firmware-m/Kconfig.tfm b/modules/trusted-firmware-m/Kconfig.tfm
index ade226a0a4fcd..7a8e4592009ff 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm
+++ b/modules/trusted-firmware-m/Kconfig.tfm
@@ -25,6 +25,8 @@ config TFM_BOARD
 	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf9160" if SOC_NRF9160
 	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf9120" if SOC_NRF9120
 	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP
+	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp" if SOC_NRF54L15_CPUAPP
+	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp" if SOC_NRF54L10_CPUAPP
 	help
 	  The board name used for building TFM. Building with TFM requires that
 	  TFM has been ported to the given board/SoC.
@@ -206,6 +208,12 @@ config TFM_IMAGE_VERSION_NS
 	help
 	  Version of the non-secure image.
 
+config TFM_BL1
+	bool "Add BL1 to TFM"
+	help
+	  TFM is designed to run with BL1 in a certain configuration.
+	  This config adds BL1 to the build - built via TFM's build system.
+
 config TFM_BL2
 	bool "Add MCUboot to TFM"
 	depends on !TFM_BL2_NOT_SUPPORTED
@@ -240,6 +248,18 @@ config TFM_CONNECTION_BASED_SERVICE_API
 	  system. When this option is not enabled in the TF-M build system this
 	  will result in compilation error.
 
+
+if TFM_BL1
+
+config TFM_BL2_SIGNING_KEY_PATH
+	string "Path to private key used to sign BL2 firmware images."
+	help
+	  Path to binary BL2 signing private key
+	  Default is ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/bl1/bl1_2/bl1_dummy_rotpk
+	  if it has not been changed on TF-M side for your board
+
+endif # TFM_BL1
+
 if TFM_BL2
 
 config TFM_IMAGE_SECURITY_COUNTER
@@ -312,6 +332,7 @@ endchoice
 
 config TFM_ETHOS_DRIVER_PATH_LOCAL
 	string "Path to a locally available Ethos-U driver or an empty string"
+	depends on SOC_SERIES_MPS3
 	default "${ZEPHYR_HAL_ETHOS_U_MODULE_DIR}"
 	help
 	  Path to a locally available Ethos-U driver to be used for TF-M builds or
diff --git a/modules/trusted-firmware-m/nordic/include/RTE_Device.h b/modules/trusted-firmware-m/nordic/include/RTE_Device.h
index 0c5c498e43a27..86d6101cd30ef 100644
--- a/modules/trusted-firmware-m/nordic/include/RTE_Device.h
+++ b/modules/trusted-firmware-m/nordic/include/RTE_Device.h
@@ -29,10 +29,10 @@
 	) \
 }
 
-#endif
+#else
 
 /* Configuration settings for Driver_USART1. */
-#if DT_PINCTRL_HAS_NAME(DT_NODELABEL(uart1), default) && DOMAIN_NS != 1U
+#if DT_PINCTRL_HAS_NAME(DT_NODELABEL(uart1), default)
 
 #define RTE_USART1 1
 
@@ -44,6 +44,20 @@
 	) \
 }
 
+#elif DT_PINCTRL_HAS_NAME(DT_NODELABEL(uart30), default)
+
+#define RTE_USART30 1
+
+#define RTE_USART30_PINS \
+{ \
+	DT_FOREACH_CHILD_VARGS( \
+		DT_PINCTRL_BY_NAME(DT_NODELABEL(uart30), default, 0), \
+		DT_FOREACH_PROP_ELEM, psels, UART_PIN_INIT \
+	) \
+}
+
+#endif
+
 #endif
 
 /* Configuration settings for Driver_FLASH0. */
diff --git a/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h b/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h
index 577b583ad0339..2b50abc57ae11 100644
--- a/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h
+++ b/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h
@@ -12,9 +12,15 @@ extern "C" {
 #endif
 
 #ifdef SECURE_UART1
+
+#if defined(NRF54L_SERIES)
+#define TFM_PERIPHERAL_UARTE30_SECURE 1
+#else
 #define TFM_PERIPHERAL_UARTE1_SECURE 1
 #endif
 
+#endif /* SECURE_UART1 */
+
 #if TEST_NS_SLIH_IRQ || TEST_NS_FLIH_IRQ
 #define TFM_PERIPHERAL_TIMER0_SECURE 1
 #endif
@@ -29,6 +35,8 @@ extern "C" {
     #include <tfm_peripherals_config_nrf91.h>
 #elif defined(NRF5340_XXAA_APPLICATION)
     #include <tfm_peripherals_config_nrf5340_application.h>
+#elif defined(NRF54L_SERIES)
+    #include <tfm_peripherals_config_nrf54l.h>
 #else
     #error "Unknown device."
 #endif
diff --git a/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/CMakeLists.txt b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/CMakeLists.txt
new file mode 100644
index 0000000000000..c1bdb28c52c23
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/CMakeLists.txt
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(NRF_BOARD_SELECTED True)
+
+add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf54l10 nrf54l10)
+
+add_subdirectory(.. common)
+
+install(FILES       ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}
+        RENAME      cpuarch.cmake)
+
+install(FILES       config.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR})
+
+install(DIRECTORY   ${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/nrf54l15dk_nrf54l10_cpuapp/tests
+
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}
+)
diff --git a/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/config.cmake b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/config.cmake
new file mode 100644
index 0000000000000..275295a164d55
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/config.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(NRF_SOC_VARIANT nrf54l10 CACHE STRING "nRF SoC Variant")
+
+include(${PLATFORM_PATH}/common/nrf54l10/config.cmake)
diff --git a/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/cpuarch.cmake b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/cpuarch.cmake
new file mode 100644
index 0000000000000..e6b6c70674ed5
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/cpuarch.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(PLATFORM_PATH platform/ext/target/nordic_nrf)
+
+include(${PLATFORM_PATH}/common/nrf54l10/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/ns/cpuarch_ns.cmake
new file mode 100644
index 0000000000000..c45f535be70a2
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp/ns/cpuarch_ns.cmake
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(PLATFORM_DIR  ${CMAKE_CURRENT_LIST_DIR})
+set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+include(${CMAKE_CURRENT_LIST_DIR}/common/nrf54l10/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/CMakeLists.txt b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/CMakeLists.txt
new file mode 100644
index 0000000000000..42b292bab4c03
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/CMakeLists.txt
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(NRF_BOARD_SELECTED True)
+
+add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf54l15 nrf54l15)
+
+add_subdirectory(.. common)
+
+install(FILES       ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}
+        RENAME      cpuarch.cmake)
+
+install(FILES       config.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR})
+
+install(DIRECTORY   ${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/nrf54l15dk_nrf54l15_cpuapp/tests
+
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}
+)
diff --git a/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/config.cmake b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/config.cmake
new file mode 100644
index 0000000000000..5ad75ff1945da
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/config.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(NRF_SOC_VARIANT nrf54l15 CACHE STRING "nRF SoC Variant")
+
+include(${PLATFORM_PATH}/common/nrf54l15/config.cmake)
diff --git a/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/cpuarch.cmake b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/cpuarch.cmake
new file mode 100644
index 0000000000000..85ad0dd10c4e2
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/cpuarch.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(PLATFORM_PATH platform/ext/target/nordic_nrf)
+
+include(${PLATFORM_PATH}/common/nrf54l15/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/ns/cpuarch_ns.cmake
new file mode 100644
index 0000000000000..da46677c7fab3
--- /dev/null
+++ b/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp/ns/cpuarch_ns.cmake
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2025, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(PLATFORM_DIR  ${CMAKE_CURRENT_LIST_DIR})
+set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+include(${CMAKE_CURRENT_LIST_DIR}/common/nrf54l15/cpuarch.cmake)
diff --git a/modules/uoscore-uedhoc/CMakeLists.txt b/modules/uoscore-uedhoc/CMakeLists.txt
index aaf842e392ca6..a7f08928381d5 100644
--- a/modules/uoscore-uedhoc/CMakeLists.txt
+++ b/modules/uoscore-uedhoc/CMakeLists.txt
@@ -107,7 +107,8 @@ if (CONFIG_UOSCORE OR CONFIG_UEDHOC)
       ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_message_1.c
       ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_message_2.c
       ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_message_3.c
-      ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_plaintext.c
+      ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_plaintext2.c
+      ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_plaintext3.c
       ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_bstr_type.c
       ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_data_2.c
       ${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_enc_structure.c
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 0000000000000..8303508138954
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_FLASH=y
diff --git a/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..ab53f12725d77
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,17 @@
+&cpuapp_ram0x_region {
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWXS>;
+};
+
+&xip_region {
+	status = "okay";
+	nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RX>;
+};
+
+&mx25uw63 {
+	read-command = <0xEC13>;
+	command-length = "INSTR_2_BYTE";
+	address-length = "ADDR_4_BYTE";
+	rx-dummy = <20>;
+
+	xip-config = <1 0 0x20000000 0>;
+};
diff --git a/samples/application_development/code_relocation_nocopy/boards/stm32f746g_disco.conf b/samples/application_development/code_relocation_nocopy/boards/stm32f746g_disco.conf
new file mode 100644
index 0000000000000..eac2504a7850e
--- /dev/null
+++ b/samples/application_development/code_relocation_nocopy/boards/stm32f746g_disco.conf
@@ -0,0 +1,2 @@
+CONFIG_FLASH=y
+CONFIG_STM32_MEMMAP=y
diff --git a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
index a1467f8e26454..699a044373b4c 100644
--- a/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
+++ b/samples/application_development/code_relocation_nocopy/linker_arm_nocopy.ld
@@ -31,21 +31,28 @@
 
 #define EXTFLASH_NODE	DT_INST(0, st_stm32_ospi_nor)
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_ospi_nor))
-#define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_ospi_nor), 1)
+#define EXTFLASH_SIZE	DT_REG_SIZE(DT_INST(0, st_stm32_ospi_nor))
 
 #elif defined(CONFIG_STM32_MEMMAP) && DT_NODE_EXISTS(DT_INST(0, st_stm32_qspi_nor))
 /* On stm32 QSPI, external flash is mapped in XIP region at address given by the reg property. */
 
 #define EXTFLASH_NODE	DT_INST(0, st_stm32_qspi_nor)
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_qspi_nor))
-#define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_qspi_nor), 1)
+#define EXTFLASH_SIZE	DT_REG_SIZE(DT_INST(0, st_stm32_qspi_nor))
 
 #elif defined(CONFIG_STM32_MEMMAP) && DT_NODE_EXISTS(DT_INST(0, st_stm32_xspi_nor))
 /* On stm32 XSPI, external flash is mapped in XIP region at address given by the reg property. */
 
 #define EXTFLASH_NODE	DT_INST(0, st_stm32_xspi_nor)
 #define EXTFLASH_ADDR	DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
-#define EXTFLASH_SIZE	DT_REG_ADDR_BY_IDX(DT_INST(0, st_stm32_xspi_nor), 1)
+#define EXTFLASH_SIZE	DT_REG_SIZE(DT_INST(0, st_stm32_xspi_nor))
+
+#elif defined(CONFIG_FLASH_MSPI_NOR) && defined(CONFIG_SOC_NRF54H20_CPUAPP)
+
+#define EXTFLASH_NODE	DT_INST(0, jedec_mspi_nor)
+#define EXTFLASH_ADDR	0x60000000
+#define EXTFLASH_SIZE	DT_PROP_OR(EXTFLASH_NODE, size_in_bytes, \
+				   DT_PROP(EXTFLASH_NODE, size) / 8)
 
 #else
 
diff --git a/samples/application_development/code_relocation_nocopy/sample.yaml b/samples/application_development/code_relocation_nocopy/sample.yaml
index d90172ee140f5..37e009bc98711 100644
--- a/samples/application_development/code_relocation_nocopy/sample.yaml
+++ b/samples/application_development/code_relocation_nocopy/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: Code data relocation nocopy Sample
   name: code relocation nocopy
 tests:
-  sample.application_development.code_relocation_nocopy:
+  sample.app_dev.code_relocation_nocopy:
     platform_allow:
       - qemu_cortex_m3
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/arch/mpu/mpu_test/sample.yaml b/samples/arch/mpu/mpu_test/sample.yaml
index 49f97f3217417..29bd87d91736b 100644
--- a/samples/arch/mpu/mpu_test/sample.yaml
+++ b/samples/arch/mpu/mpu_test/sample.yaml
@@ -7,3 +7,5 @@ tests:
     tags:
       - mpu
     harness: shell
+    integration_platforms:
+      - mps2/an385
diff --git a/samples/arch/mpu/mpu_test/test_shell.yml b/samples/arch/mpu/mpu_test/test_shell.yml
index 36815e9b684fd..fcce9e59ce9c9 100644
--- a/samples/arch/mpu/mpu_test/test_shell.yml
+++ b/samples/arch/mpu/mpu_test/test_shell.yml
@@ -1,4 +1,3 @@
-test_shell_harness:
 - command: "mpu mtest 1"
   expected: "The value is: 0x.*"
 - command: "mpu mtest 2"
diff --git a/samples/arch/smp/pi/src/main.c b/samples/arch/smp/pi/src/main.c
index f5797c43f79b1..fe6a67cacc68f 100644
--- a/samples/arch/smp/pi/src/main.c
+++ b/samples/arch/smp/pi/src/main.c
@@ -30,6 +30,8 @@ static struct k_thread tthread[THREADS_NUM];
 static char th_buffer[THREADS_NUM][DIGITS_NUM + 1];
 static atomic_t th_counter = THREADS_NUM;
 
+K_SEM_DEFINE(main_sem, 0, 1);
+
 void test_thread(void *arg1, void *arg2, void *arg3)
 {
 	atomic_t *counter = (atomic_t *)arg1;
@@ -74,7 +76,9 @@ void test_thread(void *arg1, void *arg2, void *arg3)
 		buffer += 4;
 	}
 
-	atomic_dec(counter);
+	if (atomic_dec(counter) == 1) {
+		k_sem_give(&main_sem);
+	}
 }
 
 int main(void)
@@ -96,9 +100,7 @@ int main(void)
 	}
 
 	/* Wait for all workers to finish their calculations */
-	while (th_counter) {
-		k_sleep(K_MSEC(1));
-	}
+	k_sem_take(&main_sem, K_FOREVER);
 
 	/* Capture final time stamp */
 	stop_time = k_cycle_get_32();
diff --git a/samples/basic/blinky_pwm/README.rst b/samples/basic/blinky_pwm/README.rst
index 21e086edfc3e8..d9863b1a78699 100644
--- a/samples/basic/blinky_pwm/README.rst
+++ b/samples/basic/blinky_pwm/README.rst
@@ -63,7 +63,7 @@ In these other cases, however, manual wiring is necessary:
 Building and Running
 ********************
 
-To build and flash this sample for the :ref:`nrf52840dk_nrf52840`:
+To build and flash this sample for the :zephyr:board:`nrf52840dk`:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/blinky_pwm
diff --git a/samples/basic/blinky_pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay b/samples/basic/blinky_pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
new file mode 100644
index 0000000000000..3f413b4120bd4
--- /dev/null
+++ b/samples/basic/blinky_pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	leds {
+		status = "disabled";
+	};
+
+	pwm_leds {
+		status = "okay";
+	};
+};
+
+&pinctrl {
+	pwm3_default: pwm3_default {
+		group1 {
+			/* GTIOC3A */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 11)>;
+		};
+	};
+};
+
+&pwm3 {
+	pinctrl-0 = <&pwm3_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+	divider = <RA_PWM_SOURCE_DIV_1024>;
+};
diff --git a/samples/basic/blinky_pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay b/samples/basic/blinky_pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
new file mode 100644
index 0000000000000..45912b9358bc3
--- /dev/null
+++ b/samples/basic/blinky_pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	leds {
+		status = "disabled";
+	};
+
+	pwm_leds {
+		status = "okay";
+	};
+};
+
+&pinctrl {
+	pwm2_default: pwm2_default {
+		group1 {
+			/* GTIOC2B */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 2)>;
+		};
+	};
+};
+
+&pwm2 {
+	pinctrl-0 = <&pwm2_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+	divider = <RA_PWM_SOURCE_DIV_1024>;
+};
diff --git a/samples/basic/blinky_pwm/boards/esp32c3_supermini.overlay b/samples/basic/blinky_pwm/boards/esp32c3_supermini.overlay
new file mode 100644
index 0000000000000..ed2fc7c1b7b50
--- /dev/null
+++ b/samples/basic/blinky_pwm/boards/esp32c3_supermini.overlay
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2021 Andrei-Edward Popa
+ * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
+ */
+
+ #include <zephyr/dt-bindings/pwm/pwm.h>
+
+/ {
+	aliases {
+		pwm-0 = &ledc0;
+		pwm-led0 = &pwm_led_blue;
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+		pwm_led_blue: pwm-led-gpio0-2 {
+			label = "PWM LED0";
+			pwms = <&ledc0 0 1000 PWM_POLARITY_NORMAL>;
+		};
+	};
+};
+
+&pinctrl {
+	ledc0_default: ledc0-default {
+		group1 {
+			pinmux = <LEDC_CH0_GPIO2>;
+			output-enable;
+		};
+	};
+};
+
+&ledc0 {
+	pinctrl-0 = <&ledc0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	channel0@0 {
+		reg = <0x0>;
+		timer = <0>;
+	};
+};
diff --git a/samples/basic/blinky_pwm/sample.yaml b/samples/basic/blinky_pwm/sample.yaml
index d2087f73347f3..cdf568b307d0d 100644
--- a/samples/basic/blinky_pwm/sample.yaml
+++ b/samples/basic/blinky_pwm/sample.yaml
@@ -3,6 +3,8 @@ sample:
 tests:
   sample.basic.blink_led:
     filter: dt_alias_exists("pwm-led0") and dt_compat_enabled("pwm-leds")
+    integration_platforms:
+      - esp32c3_devkitm
     tags:
       - drivers
       - pwm
diff --git a/samples/basic/button/boards/rd_rw612_bga.conf b/samples/basic/button/boards/rd_rw612_bga.conf
new file mode 100644
index 0000000000000..b0995a93b88dd
--- /dev/null
+++ b/samples/basic/button/boards/rd_rw612_bga.conf
@@ -0,0 +1,6 @@
+#
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+CONFIG_PM=y
diff --git a/samples/basic/button/boards/rd_rw612_bga.overlay b/samples/basic/button/boards/rd_rw612_bga.overlay
new file mode 100644
index 0000000000000..65821c8b3eb56
--- /dev/null
+++ b/samples/basic/button/boards/rd_rw612_bga.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&standby {
+	status = "okay";
+};
diff --git a/samples/basic/fade_led/README.rst b/samples/basic/fade_led/README.rst
index 2b569f6d5a5ad..9de9c79cc3778 100644
--- a/samples/basic/fade_led/README.rst
+++ b/samples/basic/fade_led/README.rst
@@ -24,7 +24,7 @@ This sample has the same requirements and wiring considerations as the
 Building and Running
 ********************
 
-To build and flash this sample for the :ref:`nrf52840dk_nrf52840`:
+To build and flash this sample for the :zephyr:board:`nrf52840dk`:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/basic/fade_led
diff --git a/samples/basic/fade_led/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay b/samples/basic/fade_led/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
new file mode 100644
index 0000000000000..3f413b4120bd4
--- /dev/null
+++ b/samples/basic/fade_led/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	leds {
+		status = "disabled";
+	};
+
+	pwm_leds {
+		status = "okay";
+	};
+};
+
+&pinctrl {
+	pwm3_default: pwm3_default {
+		group1 {
+			/* GTIOC3A */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 11)>;
+		};
+	};
+};
+
+&pwm3 {
+	pinctrl-0 = <&pwm3_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+	divider = <RA_PWM_SOURCE_DIV_1024>;
+};
diff --git a/samples/basic/fade_led/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay b/samples/basic/fade_led/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
new file mode 100644
index 0000000000000..45912b9358bc3
--- /dev/null
+++ b/samples/basic/fade_led/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	leds {
+		status = "disabled";
+	};
+
+	pwm_leds {
+		status = "okay";
+	};
+};
+
+&pinctrl {
+	pwm2_default: pwm2_default {
+		group1 {
+			/* GTIOC2B */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 2)>;
+		};
+	};
+};
+
+&pwm2 {
+	pinctrl-0 = <&pwm2_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+	divider = <RA_PWM_SOURCE_DIV_1024>;
+};
diff --git a/samples/basic/hash_map/sample.yaml b/samples/basic/hash_map/sample.yaml
index dad9af8a994b9..b4fcf4a784c4d 100644
--- a/samples/basic/hash_map/sample.yaml
+++ b/samples/basic/hash_map/sample.yaml
@@ -20,34 +20,34 @@ common:
 
 tests:
   # Minimal Libc
-  libraries.hash_map.minimal.separate_chaining.djb2:
+  sample.libraries.hash_map.minimal.separate_chaining.djb2:
     extra_configs:
       - CONFIG_MINIMAL_LIBC=y
       - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
       - CONFIG_SYS_HASH_MAP_CHOICE_SC=y
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
-  libraries.hash_map.minimal.open_addressing.djb2:
+  sample.libraries.hash_map.minimal.open_addressing.djb2:
     extra_configs:
       - CONFIG_MINIMAL_LIBC=y
       - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
       - CONFIG_SYS_HASH_MAP_CHOICE_OA_LP=y
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
   # Newlib
-  libraries.hash_map.newlib.separate_chaining.djb2:
+  sample.libraries.hash_map.newlib.separate_chaining.djb2:
     filter: TOOLCHAIN_HAS_NEWLIB == 1
     extra_configs:
       - CONFIG_NEWLIB_LIBC=y
       - CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
       - CONFIG_SYS_HASH_MAP_CHOICE_SC=y
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
-  libraries.hash_map.newlib.open_addressing.djb2:
+  sample.libraries.hash_map.newlib.open_addressing.djb2:
     filter: TOOLCHAIN_HAS_NEWLIB == 1
     extra_configs:
       - CONFIG_NEWLIB_LIBC=y
       - CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
       - CONFIG_SYS_HASH_MAP_CHOICE_OA_LP=y
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
-  libraries.hash_map.newlib.cxx_unordered_map.djb2:
+  sample.libraries.hash_map.newlib.cxx_unordered_map.djb2:
     filter: TOOLCHAIN_HAS_NEWLIB == 1
     extra_configs:
       - CONFIG_NEWLIB_LIBC=y
@@ -56,13 +56,13 @@ tests:
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
       - CONFIG_MAIN_STACK_SIZE=2048
   # PicoLibc
-  libraries.hash_map.picolibc.separate_chaining.djb2:
+  sample.libraries.hash_map.picolibc.separate_chaining.djb2:
     extra_configs:
       - CONFIG_PICOLIBC=y
       - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
       - CONFIG_SYS_HASH_MAP_CHOICE_SC=y
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
-  libraries.hash_map.picolibc.open_addressing.djb2:
+  sample.libraries.hash_map.picolibc.open_addressing.djb2:
     extra_configs:
       - CONFIG_PICOLIBC=y
       - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
diff --git a/samples/basic/minimal/mt.conf b/samples/basic/minimal/mt.conf
index d9cea53036598..ea573a9d5018f 100644
--- a/samples/basic/minimal/mt.conf
+++ b/samples/basic/minimal/mt.conf
@@ -3,6 +3,5 @@ CONFIG_NUM_COOP_PRIORITIES=16
 CONFIG_NUM_METAIRQ_PRIORITIES=0
 
 CONFIG_ERRNO=n
-CONFIG_SCHED_DUMB=y
-CONFIG_WAITQ_DUMB=y
-
+CONFIG_SCHED_SIMPLE=y
+CONFIG_WAITQ_SIMPLE=y
diff --git a/samples/basic/minimal/sample.yaml b/samples/basic/minimal/sample.yaml
index 5665dd7faced8..d1b276ae374f2 100644
--- a/samples/basic/minimal/sample.yaml
+++ b/samples/basic/minimal/sample.yaml
@@ -18,6 +18,7 @@ tests:
       - nrf51dk/nrf51822
       - nucleo_f429zi
       - disco_l475_iot1
+      - xg29_rb4412a
     integration_platforms:
       - frdm_k64f
   sample.minimal.mt-no-preempt.arm:
@@ -29,6 +30,7 @@ tests:
       - nrf51dk/nrf51822
       - nucleo_f429zi
       - disco_l475_iot1
+      - xg29_rb4412a
     integration_platforms:
       - frdm_k64f
   sample.minimal.mt-no-preempt-no-timers.arm:
@@ -40,6 +42,7 @@ tests:
       - nrf51dk/nrf51822
       - nucleo_f429zi
       - disco_l475_iot1
+      - xg29_rb4412a
     integration_platforms:
       - frdm_k64f
   sample.minimal.no-mt.arm:
@@ -51,6 +54,7 @@ tests:
       - nrf51dk/nrf51822
       - nucleo_f429zi
       - disco_l475_iot1
+      - xg29_rb4412a
     integration_platforms:
       - frdm_k64f
   sample.minimal.no-mt-no-timers.arm:
@@ -62,6 +66,7 @@ tests:
       - nrf51dk/nrf51822
       - nucleo_f429zi
       - disco_l475_iot1
+      - xg29_rb4412a
     integration_platforms:
       - frdm_k64f
   sample.minimal.mt.x86:
diff --git a/samples/bluetooth/bap_broadcast_assistant/src/main.c b/samples/bluetooth/bap_broadcast_assistant/src/main.c
index 49b630d1dbbf6..a0471f2ee6f08 100644
--- a/samples/bluetooth/bap_broadcast_assistant/src/main.c
+++ b/samples/bluetooth/bap_broadcast_assistant/src/main.c
@@ -383,8 +383,7 @@ static void scan_recv_cb(const struct bt_le_scan_recv_info *info,
 			printk("Connecting to Broadcast Sink: %s\n", sr_info.bt_name);
 
 			err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN,
-						BT_LE_CONN_PARAM_DEFAULT,
-						&broadcast_sink_conn);
+						BT_BAP_CONN_PARAM_RELAXED, &broadcast_sink_conn);
 			if (err != 0) {
 				printk("Failed creating connection (err=%u)\n", err);
 				scan_for_broadcast_sink();
diff --git a/samples/bluetooth/bap_broadcast_sink/CMakeLists.txt b/samples/bluetooth/bap_broadcast_sink/CMakeLists.txt
index 66649d87a33c8..3efc14377b1ff 100644
--- a/samples/bluetooth/bap_broadcast_sink/CMakeLists.txt
+++ b/samples/bluetooth/bap_broadcast_sink/CMakeLists.txt
@@ -2,10 +2,16 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(bap_unicast_server)
+project(bap_unicast_sink)
 
 target_sources(app PRIVATE
   src/main.c
+  src/stream_rx.c
 )
 
-zephyr_library_include_directories(${ZEPHYR_BASE}/samples/bluetooth)
+target_sources_ifdef(CONFIG_ENABLE_LC3 app PRIVATE src/lc3.c)
+
+if (CONFIG_USE_USB_AUDIO_OUTPUT)
+  include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
+  target_sources(app PRIVATE src/usb.c)
+endif()
diff --git a/samples/bluetooth/bap_broadcast_sink/Kconfig b/samples/bluetooth/bap_broadcast_sink/Kconfig
index bf46aa0f48fbf..2d483082fd474 100644
--- a/samples/bluetooth/bap_broadcast_sink/Kconfig
+++ b/samples/bluetooth/bap_broadcast_sink/Kconfig
@@ -55,8 +55,8 @@ config ENABLE_LC3
 config USE_USB_AUDIO_OUTPUT
 	bool "Use USB Audio as output"
 	depends on ENABLE_LC3
-	select USB_DEVICE_STACK
-	select USB_DEVICE_AUDIO
+	select USB_DEVICE_STACK_NEXT
+	select USBD_AUDIO2_CLASS
 	select RING_BUFFER
 	help
 	  Enables USB audio as output as a USB peripheral. This does not support providing USB
@@ -80,4 +80,16 @@ config TARGET_BROADCAST_CHANNEL
 	  Channel Audio Location to sync to. These corresponds to the bt_audio_location,
 	  supporting mono, left and right channels
 
+config INFO_REPORTING_INTERVAL
+	int "Number of SDUs received between each information report"
+	default 1000
+	help
+	  Determines how often information about received data is logged.
+	  Set to 0 to disable reporting.
+
+# Source common USB sample options used to initialize new experimental USB device stack.
+# The scope of these options is limited to USB samples in project tree,
+# you cannot use them in your own application.
+source "samples/subsys/usb/common/Kconfig.sample_usbd"
+
 source "Kconfig.zephyr"
diff --git a/samples/bluetooth/bap_broadcast_sink/app.overlay b/samples/bluetooth/bap_broadcast_sink/app.overlay
new file mode 100644
index 0000000000000..7ea46c511569f
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/app.overlay
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dt-bindings/usb/audio.h>
+
+/ {
+	uac2_microphone: usb_audio2 {
+		compatible = "zephyr,uac2";
+		status = "okay";
+		full-speed;
+		audio-function = <AUDIO_FUNCTION_MICROPHONE>;
+
+		/* Clock supporting 48KHz
+		 *
+		 * Since the incoming audio may be between 8 and 48 KHz, we always upsample to 48KHz
+		 */
+		uac_aclk: aclk {
+			compatible = "zephyr,uac2-clock-source";
+			clock-type = "internal-programmable";
+			frequency-control = "read-only";
+			sampling-frequencies = <48000>;
+			/* Falsely claim synchronous audio because we
+			 * currently don't calculate feedback value
+			 */
+			sof-synchronized;
+		};
+
+		/* The out_terminal supports the incoming Bluetooth LE Audio over ISO
+		 * and treats it as a microphone towards the USB host
+		 */
+		out_terminal: out_terminal {
+			compatible = "zephyr,uac2-input-terminal";
+			clock-source = <&uac_aclk>;
+			terminal-type = <INPUT_TERMINAL_MICROPHONE>;
+			front-left;
+			front-right;
+		};
+
+		/* USB Audio terminal from USB device to USB host */
+		in_terminal: in_terminal {
+			compatible = "zephyr,uac2-output-terminal";
+			data-source = <&out_terminal>;
+			clock-source = <&uac_aclk>;
+			terminal-type = <USB_TERMINAL_STREAMING>;
+		};
+
+		as_iso_in: in_interface {
+			compatible = "zephyr,uac2-audio-streaming";
+			linked-terminal = <&in_terminal>;
+			subslot-size = <2>;
+			bit-resolution = <16>;
+		};
+	};
+};
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.conf
index 69b3cc51473c7..a37005f3bca34 100644
--- a/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.conf
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.conf
@@ -1,3 +1,3 @@
 # Use USB Audio as audio sink
 CONFIG_USE_USB_AUDIO_OUTPUT=y
-CONFIG_USB_DEVICE_PRODUCT="USB Broadcast Sink"
+CONFIG_SAMPLE_USBD_PRODUCT="USB Broadcast Sink sample"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.overlay
index b8e72f1b61c5b..94b67c37c7050 100644
--- a/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.overlay
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.overlay
@@ -1,15 +1,7 @@
-zephyr_udc0: &usbd {
-	compatible = "nordic,nrf-usbd";
-	status = "okay";
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
-	hs_0: hs_0 {
-		compatible = "usb-audio-hs";
-		mic-feature-mute;
-		mic-channel-l;
-		mic-channel-r;
-
-		hp-feature-mute;
-		hp-channel-l;
-		hp-channel-r;
-	};
-};
+#include "../app.overlay"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dk_nrf52840.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dk_nrf52840.conf
new file mode 100644
index 0000000000000..a37005f3bca34
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dk_nrf52840.conf
@@ -0,0 +1,3 @@
+# Use USB Audio as audio sink
+CONFIG_USE_USB_AUDIO_OUTPUT=y
+CONFIG_SAMPLE_USBD_PRODUCT="USB Broadcast Sink sample"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dk_nrf52840.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 0000000000000..94b67c37c7050
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "../app.overlay"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.conf
index 69b3cc51473c7..61db369175b2f 100644
--- a/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.conf
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.conf
@@ -1,3 +1,5 @@
 # Use USB Audio as audio sink
 CONFIG_USE_USB_AUDIO_OUTPUT=y
-CONFIG_USB_DEVICE_PRODUCT="USB Broadcast Sink"
+CONFIG_SAMPLE_USBD_PRODUCT="USB Broadcast Sink sample"
+
+CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.overlay
index b8e72f1b61c5b..94b67c37c7050 100644
--- a/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.overlay
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.overlay
@@ -1,15 +1,7 @@
-zephyr_udc0: &usbd {
-	compatible = "nordic,nrf-usbd";
-	status = "okay";
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
-	hs_0: hs_0 {
-		compatible = "usb-audio-hs";
-		mic-feature-mute;
-		mic-channel-l;
-		mic-channel-r;
-
-		hp-feature-mute;
-		hp-channel-l;
-		hp-channel-r;
-	};
-};
+#include "../app.overlay"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index 69b3cc51473c7..a37005f3bca34 100644
--- a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -1,3 +1,3 @@
 # Use USB Audio as audio sink
 CONFIG_USE_USB_AUDIO_OUTPUT=y
-CONFIG_USB_DEVICE_PRODUCT="USB Broadcast Sink"
+CONFIG_SAMPLE_USBD_PRODUCT="USB Broadcast Sink sample"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
new file mode 100644
index 0000000000000..94b67c37c7050
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "../app.overlay"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf
index 69b3cc51473c7..a37005f3bca34 100644
--- a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -1,3 +1,3 @@
 # Use USB Audio as audio sink
 CONFIG_USE_USB_AUDIO_OUTPUT=y
-CONFIG_USB_DEVICE_PRODUCT="USB Broadcast Sink"
+CONFIG_SAMPLE_USBD_PRODUCT="USB Broadcast Sink sample"
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay
index b8e72f1b61c5b..94b67c37c7050 100644
--- a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -1,15 +1,7 @@
-zephyr_udc0: &usbd {
-	compatible = "nordic,nrf-usbd";
-	status = "okay";
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
-	hs_0: hs_0 {
-		compatible = "usb-audio-hs";
-		mic-feature-mute;
-		mic-channel-l;
-		mic-channel-r;
-
-		hp-feature-mute;
-		hp-channel-l;
-		hp-channel-r;
-	};
-};
+#include "../app.overlay"
diff --git a/samples/bluetooth/bap_broadcast_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf
index 69c575267035f..c3780e12539c4 100644
--- a/samples/bluetooth/bap_broadcast_sink/prj.conf
+++ b/samples/bluetooth/bap_broadcast_sink/prj.conf
@@ -4,6 +4,12 @@ CONFIG_BT_AUDIO=y
 CONFIG_BT_SMP=y
 CONFIG_BT_PAC_SNK=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_EXT_ADV=y
@@ -12,8 +18,8 @@ CONFIG_BT_ISO_SYNC_RECEIVER=y
 CONFIG_BT_BAP_BROADCAST_SINK=y
 CONFIG_BT_BAP_SCAN_DELEGATOR=y
 CONFIG_BT_ISO_MAX_CHAN=2
-# Allocate 2 RX buffers per channel
-CONFIG_BT_ISO_RX_BUF_COUNT=4
+# Allocate 4 RX buffers per channel
+CONFIG_BT_ISO_RX_BUF_COUNT=8
 CONFIG_BT_BAP_BROADCAST_SNK_SUBGROUP_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT=2
 CONFIG_BT_BAP_BASS_MAX_SUBGROUPS=2
diff --git a/samples/bluetooth/bap_broadcast_sink/src/lc3.c b/samples/bluetooth/bap_broadcast_sink/src/lc3.c
new file mode 100644
index 0000000000000..c05de47d355eb
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/src/lc3.c
@@ -0,0 +1,487 @@
+/**
+ * @file
+ * @brief Bluetooth BAP Broadcast Sink LC3 extension
+ *
+ * This files handles all the LC3 related functionality for the sample
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_audio.h>
+
+#include <lc3.h>
+
+#include "lc3.h"
+#include "stream_rx.h"
+#include "usb.h"
+
+LOG_MODULE_REGISTER(lc3, CONFIG_LOG_DEFAULT_LEVEL);
+
+#define LC3_ENCODER_STACK_SIZE 4096
+#define LC3_ENCODER_PRIORITY   5
+
+struct lc3_data {
+	void *fifo_reserved; /* 1st word reserved for use by FIFO */
+	struct net_buf *buf;
+	struct stream_rx *stream;
+	uint32_t ts;
+	bool do_plc;
+};
+
+K_MEM_SLAB_DEFINE_STATIC(lc3_data_slab, sizeof(struct lc3_data), CONFIG_BT_ISO_RX_BUF_COUNT,
+			 __alignof__(struct lc3_data));
+
+static int16_t lc3_rx_buf[LC3_MAX_NUM_SAMPLES_MONO];
+static K_FIFO_DEFINE(lc3_in_fifo);
+
+/* We only want to send USB to left/right from a single stream. If we have 2 left streams, the
+ * outgoing audio is going to be terrible.
+ * Since a stream can contain stereo data, both of these may be the same stream.
+ */
+static struct stream_rx *usb_left_stream;
+static struct stream_rx *usb_right_stream;
+
+static int init_lc3_decoder(struct stream_rx *stream, uint32_t lc3_frame_duration_us,
+			    uint32_t lc3_freq_hz)
+{
+	if (stream == NULL) {
+		LOG_ERR("NULL stream to init LC3 decoder");
+		return -EINVAL;
+	}
+
+	if (stream->lc3_decoder != NULL) {
+		LOG_ERR("Already initialized");
+		return -EALREADY;
+	}
+
+	if (lc3_freq_hz == 0U || lc3_frame_duration_us == 0U) {
+		LOG_ERR("Invalid freq (%u) or frame duration (%u)", lc3_freq_hz,
+			lc3_frame_duration_us);
+
+		return -EINVAL;
+	}
+
+	LOG_INF("Initializing the LC3 decoder with %u us duration and %u Hz frequency",
+		lc3_frame_duration_us, lc3_freq_hz);
+	/* Create the decoder instance. This shall complete before stream_started() is called. */
+	stream->lc3_decoder =
+		lc3_setup_decoder(lc3_frame_duration_us, lc3_freq_hz,
+				  IS_ENABLED(CONFIG_USE_USB_AUDIO_OUTPUT) ? USB_SAMPLE_RATE_HZ : 0,
+				  &stream->lc3_decoder_mem);
+	if (stream->lc3_decoder == NULL) {
+		LOG_ERR("Failed to setup LC3 decoder - wrong parameters?\n");
+		return -EINVAL;
+	}
+
+	LOG_INF("Initialized LC3 decoder for %p", stream);
+
+	return 0;
+}
+
+static bool decode_frame(struct lc3_data *data, size_t frame_cnt)
+{
+	const struct stream_rx *stream = data->stream;
+	const size_t total_frames = stream->lc3_chan_cnt * stream->lc3_frame_blocks_per_sdu;
+	const uint16_t octets_per_frame = stream->lc3_octets_per_frame;
+	struct net_buf *buf = data->buf;
+	void *iso_data;
+	int err;
+
+	if (data->do_plc) {
+		iso_data = NULL; /* perform PLC */
+
+#if CONFIG_INFO_REPORTING_INTERVAL > 0
+		if ((stream->reporting_info.lc3_decoded_cnt % CONFIG_INFO_REPORTING_INTERVAL) ==
+		    0) {
+			LOG_DBG("[%zu]: Performing PLC", stream->reporting_info.lc3_decoded_cnt);
+		}
+#endif /* CONFIG_INFO_REPORTING_INTERVAL > 0 */
+
+		data->do_plc = false; /* clear flag */
+	} else {
+		iso_data = net_buf_pull_mem(data->buf, octets_per_frame);
+
+#if CONFIG_INFO_REPORTING_INTERVAL > 0
+		if ((stream->reporting_info.lc3_decoded_cnt % CONFIG_INFO_REPORTING_INTERVAL) ==
+		    0) {
+			LOG_DBG("[%zu]: Decoding frame of size %u (%u/%u)",
+				stream->reporting_info.lc3_decoded_cnt, octets_per_frame,
+				frame_cnt + 1, total_frames);
+		}
+#endif /* CONFIG_INFO_REPORTING_INTERVAL > 0 */
+	}
+
+	err = lc3_decode(stream->lc3_decoder, iso_data, octets_per_frame, LC3_PCM_FORMAT_S16,
+			 lc3_rx_buf, 1);
+	if (err < 0) {
+		LOG_ERR("Failed to decode LC3 data (%u/%u - %u/%u)", frame_cnt + 1, total_frames,
+			octets_per_frame * frame_cnt, buf->len);
+		return false;
+	}
+
+	return true;
+}
+
+static int get_lc3_chan_alloc_from_index(const struct stream_rx *stream, uint8_t index,
+					 enum bt_audio_location *chan_alloc)
+{
+#if defined(CONFIG_USE_USB_AUDIO_OUTPUT)
+	const bool has_left = (stream->lc3_chan_allocation & BT_AUDIO_LOCATION_FRONT_LEFT) != 0;
+	const bool has_right = (stream->lc3_chan_allocation & BT_AUDIO_LOCATION_FRONT_RIGHT) != 0;
+	const bool is_mono = stream->lc3_chan_allocation == BT_AUDIO_LOCATION_MONO_AUDIO;
+	const bool is_left = index == 0 && has_left;
+	const bool is_right = has_right && (index == 0U || (index == 1U && has_left));
+
+	/* LC3 is always Left before Right, so we can use the index and the stream channel
+	 * allocation to determine if index 0 is left or right.
+	 */
+	if (is_left) {
+		*chan_alloc = BT_AUDIO_LOCATION_FRONT_LEFT;
+	} else if (is_right) {
+		*chan_alloc = BT_AUDIO_LOCATION_FRONT_RIGHT;
+	} else if (is_mono) {
+		*chan_alloc = BT_AUDIO_LOCATION_MONO_AUDIO;
+	} else {
+		/* Not suitable for USB */
+		return -EINVAL;
+	}
+
+	return 0;
+#else  /* !CONFIG_USE_USB_AUDIO_OUTPUT */
+	return -EINVAL;
+#endif /* CONFIG_USE_USB_AUDIO_OUTPUT */
+}
+
+static size_t decode_frame_block(struct lc3_data *data, size_t frame_cnt)
+{
+	const struct stream_rx *stream = data->stream;
+	const uint8_t chan_cnt = stream->lc3_chan_cnt;
+	size_t decoded_frames = 0U;
+
+	for (uint8_t i = 0U; i < chan_cnt; i++) {
+		/* We provide the total number of decoded frames to `decode_frame` for logging
+		 * purposes
+		 */
+		if (decode_frame(data, frame_cnt + decoded_frames)) {
+			decoded_frames++;
+
+			if (IS_ENABLED(CONFIG_USE_USB_AUDIO_OUTPUT)) {
+				enum bt_audio_location chan_alloc;
+				int err;
+
+				err = get_lc3_chan_alloc_from_index(stream, i, &chan_alloc);
+				if (err != 0) {
+					/* Not suitable for USB */
+					continue;
+				}
+
+				/* We only want to left or right from one stream to USB */
+				if ((chan_alloc == BT_AUDIO_LOCATION_FRONT_LEFT &&
+				     stream != usb_left_stream) ||
+				    (chan_alloc == BT_AUDIO_LOCATION_FRONT_RIGHT &&
+				     stream != usb_right_stream)) {
+					continue;
+				}
+
+				/* TODO: Add support for properly support the presentation delay.
+				 * For now we just send audio to USB as soon as we get it
+				 */
+				err = usb_add_frame_to_usb(chan_alloc, lc3_rx_buf,
+							   sizeof(lc3_rx_buf), data->ts);
+				if (err == -EINVAL) {
+					continue;
+				}
+			}
+		} else {
+			/* If decoding failed, we clear the data to USB as it would contain
+			 * invalid data
+			 */
+			if (IS_ENABLED(CONFIG_USE_USB_AUDIO_OUTPUT)) {
+				usb_clear_frames_to_usb();
+			}
+
+			break;
+		}
+	}
+
+	return decoded_frames;
+}
+
+static void do_lc3_decode(struct lc3_data *data)
+{
+	struct stream_rx *stream = data->stream;
+
+	if (stream->lc3_decoder != NULL) {
+		const uint8_t frame_blocks_per_sdu = stream->lc3_frame_blocks_per_sdu;
+		size_t frame_cnt;
+
+		frame_cnt = 0;
+		for (uint8_t i = 0U; i < frame_blocks_per_sdu; i++) {
+			const size_t decoded_frames = decode_frame_block(data, frame_cnt);
+
+			if (decoded_frames == 0) {
+				break;
+			}
+
+			frame_cnt += decoded_frames;
+		}
+
+#if CONFIG_INFO_REPORTING_INTERVAL > 0
+		stream->reporting_info.lc3_decoded_cnt++;
+#endif /* CONFIG_INFO_REPORTING_INTERVAL > 0 */
+	}
+
+	net_buf_unref(data->buf);
+}
+
+static void lc3_decoder_thread_func(void *arg1, void *arg2, void *arg3)
+{
+	while (true) {
+		struct lc3_data *data = k_fifo_get(&lc3_in_fifo, K_FOREVER);
+		struct stream_rx *stream = data->stream;
+
+		if (stream->lc3_decoder == NULL) {
+			LOG_WRN("Decoder is NULL, discarding data from FIFO");
+			k_mem_slab_free(&lc3_data_slab, (void *)data);
+			continue; /* Wait for new data */
+		}
+
+		do_lc3_decode(data);
+
+		k_mem_slab_free(&lc3_data_slab, (void *)data);
+	}
+}
+
+int lc3_enable(struct stream_rx *stream)
+{
+	const struct bt_audio_codec_cfg *codec_cfg = stream->stream.codec_cfg;
+	uint32_t lc3_frame_duration_us;
+	uint32_t lc3_freq_hz;
+	int ret;
+
+	if (codec_cfg->id != BT_HCI_CODING_FORMAT_LC3) {
+		return -EINVAL;
+	}
+
+	ret = bt_audio_codec_cfg_get_freq(codec_cfg);
+	if (ret >= 0) {
+		ret = bt_audio_codec_cfg_freq_to_freq_hz(ret);
+
+		if (ret > 0) {
+			if (ret == 8000 || ret == 16000 || ret == 24000 || ret == 32000 ||
+			    ret == 48000) {
+				lc3_freq_hz = (uint32_t)ret;
+			} else {
+				LOG_ERR("Unsupported frequency for LC3: %d", ret);
+				lc3_freq_hz = 0U;
+			}
+		} else {
+			LOG_ERR("Invalid frequency: %d", ret);
+			lc3_freq_hz = 0U;
+		}
+	} else {
+		LOG_ERR("Could not get frequency: %d", ret);
+		lc3_freq_hz = 0U;
+	}
+
+	if (lc3_freq_hz == 0U) {
+		return -EINVAL;
+	}
+
+	ret = bt_audio_codec_cfg_get_frame_dur(codec_cfg);
+	if (ret >= 0) {
+		ret = bt_audio_codec_cfg_frame_dur_to_frame_dur_us(ret);
+		if (ret > 0) {
+			lc3_frame_duration_us = (uint32_t)ret;
+		} else {
+			LOG_ERR("Invalid frame duration: %d", ret);
+			lc3_frame_duration_us = 0U;
+		}
+	} else {
+		LOG_ERR("Could not get frame duration: %d", ret);
+		lc3_frame_duration_us = 0U;
+	}
+
+	if (lc3_frame_duration_us == 0U) {
+		return -EINVAL;
+	}
+
+	ret = bt_audio_codec_cfg_get_chan_allocation(codec_cfg, &stream->lc3_chan_allocation, true);
+	if (ret == 0) {
+		stream->lc3_chan_cnt = bt_audio_get_chan_count(stream->lc3_chan_allocation);
+	} else {
+		LOG_DBG("Could not get channel allocation: %d", ret);
+		stream->lc3_chan_cnt = 0U;
+	}
+
+	if (stream->lc3_chan_cnt == 0U) {
+		return -EINVAL;
+	}
+
+	ret = bt_audio_codec_cfg_get_frame_blocks_per_sdu(codec_cfg, true);
+	if (ret >= 0) {
+		stream->lc3_frame_blocks_per_sdu = (uint8_t)ret;
+	} else {
+		LOG_ERR("Could not get frame blocks per SDU: %d", ret);
+		stream->lc3_frame_blocks_per_sdu = 0U;
+	}
+
+	if (stream->lc3_frame_blocks_per_sdu == 0U) {
+		return -EINVAL;
+	}
+
+	ret = bt_audio_codec_cfg_get_octets_per_frame(codec_cfg);
+	if (ret >= 0) {
+		stream->lc3_octets_per_frame = (uint16_t)ret;
+	} else {
+		LOG_ERR("Could not get octets per frame: %d", ret);
+		stream->lc3_octets_per_frame = 0U;
+	}
+
+	if (stream->lc3_octets_per_frame == 0U) {
+		return -EINVAL;
+	}
+
+	if (stream->lc3_decoder == NULL) {
+		const int err = init_lc3_decoder(stream, lc3_frame_duration_us, lc3_freq_hz);
+
+		if (err != 0) {
+			LOG_ERR("Failed to init LC3 decoder: %d", err);
+
+			return err;
+		}
+	}
+
+	if (IS_ENABLED(CONFIG_USE_USB_AUDIO_OUTPUT)) {
+		if ((stream->lc3_chan_allocation & BT_AUDIO_LOCATION_FRONT_LEFT) != 0) {
+			if (usb_left_stream == NULL) {
+				LOG_INF("Setting USB left stream to %p", stream);
+				usb_left_stream = stream;
+			} else {
+				LOG_WRN("Multiple left streams started");
+			}
+		}
+
+		if ((stream->lc3_chan_allocation & BT_AUDIO_LOCATION_FRONT_RIGHT) != 0) {
+			if (usb_right_stream == NULL) {
+				LOG_INF("Setting USB right stream to %p", stream);
+				usb_right_stream = stream;
+			} else {
+				LOG_WRN("Multiple right streams started");
+			}
+		}
+	}
+
+	return 0;
+}
+
+int lc3_disable(struct stream_rx *stream)
+{
+	if (stream->lc3_decoder == NULL) {
+		return -EINVAL;
+	}
+
+	stream->lc3_decoder = NULL;
+
+	if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+		if (usb_left_stream == stream) {
+			usb_left_stream = NULL;
+		}
+		if (usb_right_stream == stream) {
+			usb_right_stream = NULL;
+		}
+	}
+
+	return 0;
+}
+
+void lc3_enqueue_for_decoding(struct stream_rx *stream, const struct bt_iso_recv_info *info,
+			      struct net_buf *buf)
+{
+	const uint8_t frame_blocks_per_sdu = stream->lc3_frame_blocks_per_sdu;
+	const uint16_t octets_per_frame = stream->lc3_octets_per_frame;
+	const uint8_t chan_cnt = stream->lc3_chan_cnt;
+	struct lc3_data *data;
+
+	if (stream->lc3_decoder == NULL) {
+		return;
+	}
+
+	/* Allocate a context that holds both the buffer and the stream so that we can
+	 * send both of these values to the LC3 decoder thread as a single struct
+	 * in a FIFO
+	 */
+	if (k_mem_slab_alloc(&lc3_data_slab, (void **)&data, K_NO_WAIT)) {
+		LOG_WRN("Could not allocate LC3 data item");
+		return;
+	}
+
+	if ((info->flags & BT_ISO_FLAGS_VALID) == 0) {
+		data->do_plc = true;
+	} else if (buf->len != (octets_per_frame * chan_cnt * frame_blocks_per_sdu)) {
+		if (buf->len != 0U) {
+			LOG_WRN("Expected %u frame blocks with %u channels of size %u, but "
+				"length is %u",
+				frame_blocks_per_sdu, chan_cnt, octets_per_frame, buf->len);
+		}
+
+		data->do_plc = true;
+	}
+
+	data->buf = net_buf_ref(buf);
+	data->stream = stream;
+	if (info->flags & BT_ISO_FLAGS_TS) {
+		data->ts = info->ts;
+	} else {
+		data->ts = 0U;
+	}
+
+	k_fifo_put(&lc3_in_fifo, data);
+}
+
+int lc3_init(void)
+{
+	static K_KERNEL_STACK_DEFINE(lc3_decoder_thread_stack, 4096);
+	const int lc3_decoder_thread_prio = K_PRIO_PREEMPT(5);
+	static struct k_thread lc3_decoder_thread;
+	static bool initialized;
+
+	if (initialized) {
+		return -EALREADY;
+	}
+
+	k_thread_create(&lc3_decoder_thread, lc3_decoder_thread_stack,
+			K_KERNEL_STACK_SIZEOF(lc3_decoder_thread_stack), lc3_decoder_thread_func,
+			NULL, NULL, NULL, lc3_decoder_thread_prio, 0, K_NO_WAIT);
+	k_thread_name_set(&lc3_decoder_thread, "LC3 Decoder");
+
+	LOG_INF("LC3 initialized");
+	initialized = true;
+
+	return 0;
+}
diff --git a/samples/bluetooth/bap_broadcast_sink/src/lc3.h b/samples/bluetooth/bap_broadcast_sink/src/lc3.h
new file mode 100644
index 0000000000000..865d5c021f6f1
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/src/lc3.h
@@ -0,0 +1,85 @@
+/**
+ * @file
+ * @brief Bluetooth BAP Broadcast Sink LC3 header
+ *
+ * This files handles all the LC3 related functionality for the sample
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef SAMPLE_BAP_BROADCAST_SINK_LC3_H
+#define SAMPLE_BAP_BROADCAST_SINK_LC3_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_audio.h>
+
+#include "stream_rx.h"
+
+#define LC3_MAX_SAMPLE_RATE_HZ     48000U
+#define LC3_MAX_FRAME_DURATION_US  10000U
+#define LC3_MAX_NUM_SAMPLES_MONO                                                                   \
+	((LC3_MAX_FRAME_DURATION_US * LC3_MAX_SAMPLE_RATE_HZ) / USEC_PER_SEC)
+#define LC3_MAX_NUM_SAMPLES_STEREO (LC3_MAX_NUM_SAMPLES_MONO * 2U)
+
+/**
+ * @brief Enables LC3 for a stream
+ *
+ * This will initialize the LC3 decoder given the @p stream codec configuration
+ *
+ * @param stream The stream to enable LC3 for
+
+ * @retval 0 Success
+ * @retval -EINVAL The stream is not LC3 codec configured or the codec configuration is invalid
+ */
+int lc3_enable(struct stream_rx *stream);
+
+/**
+ * @brief Disabled LC3 for a stream
+ *
+ * @param stream The stream to disable LC3 for
+
+ * @retval 0 Success
+ * @retval -EINVAL The stream is LC3 initialized
+ */
+int lc3_disable(struct stream_rx *stream);
+
+/**
+ * @brief Enqueue an SDU for decoding
+ *
+ * @param stream The stream that received the SDU
+ * @param info Information about the SDU
+ * @param buf The buffer of the SDU
+ */
+void lc3_enqueue_for_decoding(struct stream_rx *stream, const struct bt_iso_recv_info *info,
+			      struct net_buf *buf);
+
+/**
+ * @brief Initialize the LC3 module
+ *
+ * This will start the thread if not already initialized
+ *
+ * @retval 0 Success
+ * @retval -EALREADY Already initialized
+ */
+int lc3_init(void);
+#endif /* SAMPLE_BAP_BROADCAST_SINK_LC3_H */
diff --git a/samples/bluetooth/bap_broadcast_sink/src/main.c b/samples/bluetooth/bap_broadcast_sink/src/main.c
index a5d541b420d35..98b404f9e899b 100644
--- a/samples/bluetooth/bap_broadcast_sink/src/main.c
+++ b/samples/bluetooth/bap_broadcast_sink/src/main.c
@@ -32,17 +32,9 @@
 #include <zephyr/sys_clock.h>
 #include <zephyr/toolchain.h>
 
-#if defined(CONFIG_LIBLC3)
 #include "lc3.h"
-#endif /* defined(CONFIG_LIBLC3) */
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-#include <zephyr/device.h>
-#include <zephyr/devicetree.h>
-#include <zephyr/usb/usb_device.h>
-#include <zephyr/usb/class/usb_audio.h>
-#include <zephyr/sys/ring_buffer.h>
-#endif /* defined(CONFIG_USB_DEVICE_AUDIO) */
-
+#include "stream_rx.h"
+#include "usb.h"
 
 BUILD_ASSERT(IS_ENABLED(CONFIG_SCAN_SELF) || IS_ENABLED(CONFIG_SCAN_OFFLOAD),
 	     "Either SCAN_SELF or SCAN_OFFLOAD must be enabled");
@@ -63,27 +55,6 @@ BUILD_ASSERT(IS_ENABLED(CONFIG_SCAN_SELF) || IS_ENABLED(CONFIG_SCAN_OFFLOAD),
 #define NAME_LEN                    sizeof(CONFIG_TARGET_BROADCAST_NAME) + 1
 #define BROADCAST_DATA_ELEMENT_SIZE sizeof(int16_t)
 
-#if defined(CONFIG_LIBLC3)
-#define LC3_MAX_SAMPLE_RATE        48000U
-#define LC3_MAX_FRAME_DURATION_US  10000U
-#define LC3_MAX_NUM_SAMPLES_MONO   ((LC3_MAX_FRAME_DURATION_US * LC3_MAX_SAMPLE_RATE)              \
-				    / USEC_PER_SEC)
-#define LC3_MAX_NUM_SAMPLES_STEREO (LC3_MAX_NUM_SAMPLES_MONO * 2)
-
-#define LC3_ENCODER_STACK_SIZE  4096
-#define LC3_ENCODER_PRIORITY    5
-#endif /* defined(CONFIG_LIBLC3) */
-
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-#define USB_ENQUEUE_COUNT            10U
-#define USB_SAMPLE_RATE	             48000U
-#define USB_FRAME_DURATION_US        1000U
-#define USB_MONO_SAMPLE_SIZE                                                                       \
-	((USB_FRAME_DURATION_US * USB_SAMPLE_RATE * BROADCAST_DATA_ELEMENT_SIZE) / USEC_PER_SEC)
-#define USB_STEREO_SAMPLE_SIZE       (USB_MONO_SAMPLE_SIZE * 2)
-#define USB_RING_BUF_SIZE            (5 * LC3_MAX_NUM_SAMPLES_STEREO) /* 5 SDUs*/
-#endif /* defined(CONFIG_USB_DEVICE_AUDIO) */
-
 static K_SEM_DEFINE(sem_broadcast_sink_stopped, 0U, 1U);
 static K_SEM_DEFINE(sem_connected, 0U, 1U);
 static K_SEM_DEFINE(sem_disconnected, 0U, 1U);
@@ -107,29 +78,7 @@ static struct bt_le_scan_recv_info broadcaster_info;
 static bt_addr_le_t broadcaster_addr;
 static struct bt_le_per_adv_sync *pa_sync;
 static uint32_t broadcaster_broadcast_id;
-static struct broadcast_sink_stream {
-	struct bt_bap_stream stream;
-	size_t recv_cnt;
-	size_t loss_cnt;
-	size_t error_cnt;
-	size_t valid_cnt;
-#if defined(CONFIG_LIBLC3)
-	struct net_buf *in_buf;
-	struct k_work_delayable lc3_decode_work;
-
-	/* LC3 config values */
-	enum bt_audio_location chan_allocation;
-	uint16_t lc3_octets_per_frame;
-	uint8_t lc3_frames_blocks_per_sdu;
-
-	/* Internal lock for protecting net_buf from multiple access */
-	struct k_mutex lc3_decoder_mutex;
-	lc3_decoder_t lc3_decoder;
-	lc3_decoder_mem_48k_t lc3_decoder_mem;
-#endif /* defined(CONFIG_LIBLC3) */
-} streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT];
-
-static struct bt_bap_stream *streams_p[ARRAY_SIZE(streams)];
+static struct bt_bap_stream *bap_streams_p[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT];
 static volatile bool big_synced;
 static volatile bool base_received;
 static struct bt_conn *broadcast_assistant_conn;
@@ -145,360 +94,25 @@ static const struct bt_audio_codec_cap codec_cap = BT_AUDIO_CODEC_CAP_LC3(
 /* Create a mask for the maximum BIS we can sync to using the number of streams
  * we have. Bit 0 is BIS index 1.
  */
-static const uint32_t bis_index_mask = BIT_MASK(ARRAY_SIZE(streams));
+static const uint32_t bis_index_mask = BIT_MASK(CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT);
 static uint32_t requested_bis_sync;
 static uint32_t bis_index_bitfield;
 static uint8_t sink_broadcast_code[BT_ISO_BROADCAST_CODE_SIZE];
 
-uint64_t total_rx_iso_packet_count; /* This value is exposed to test code */
-
 static int stop_adv(void);
 
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-RING_BUF_DECLARE(usb_ring_buf, USB_RING_BUF_SIZE);
-NET_BUF_POOL_DEFINE(usb_tx_buf_pool, USB_ENQUEUE_COUNT, USB_STEREO_SAMPLE_SIZE, 0, net_buf_destroy);
-
-static void add_to_usb_ring_buf(const int16_t audio_buf[LC3_MAX_NUM_SAMPLES_STEREO]);
-#endif /* defined(CONFIG_USB_DEVICE_AUDIO) */
-
-#if defined(CONFIG_LIBLC3)
-static K_SEM_DEFINE(lc3_decoder_sem, 0, 1);
-
-static void do_lc3_decode(lc3_decoder_t decoder, const void *in_data, uint8_t octets_per_frame,
-			  int16_t out_data[LC3_MAX_NUM_SAMPLES_MONO]);
-static void lc3_decoder_thread(void *arg1, void *arg2, void *arg3);
-K_THREAD_DEFINE(decoder_tid, LC3_ENCODER_STACK_SIZE, lc3_decoder_thread,
-		NULL, NULL, NULL, LC3_ENCODER_PRIORITY, 0, -1);
-
-/* Consumer thread of the decoded stream data */
-static void lc3_decoder_thread(void *arg1, void *arg2, void *arg3)
+static void stream_connected_cb(struct bt_bap_stream *bap_stream)
 {
-	while (true) {
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-		static int16_t right_frames[CONFIG_MAX_CODEC_FRAMES_PER_SDU]
-					   [LC3_MAX_NUM_SAMPLES_MONO];
-		static int16_t left_frames[CONFIG_MAX_CODEC_FRAMES_PER_SDU]
-					  [LC3_MAX_NUM_SAMPLES_MONO];
-		size_t right_frames_cnt = 0;
-		size_t left_frames_cnt = 0;
-
-		memset(right_frames, 0, sizeof(right_frames));
-		memset(left_frames, 0, sizeof(left_frames));
-#else
-		static int16_t lc3_audio_buf[LC3_MAX_NUM_SAMPLES_MONO];
-#endif /* CONFIG_USB_DEVICE_AUDIO */
-
-		k_sem_take(&lc3_decoder_sem, K_FOREVER);
-
-		for (size_t i = 0; i < ARRAY_SIZE(streams); i++) {
-			struct broadcast_sink_stream *stream = &streams[i];
-			const uint8_t frames_blocks_per_sdu = stream->lc3_frames_blocks_per_sdu;
-			const uint16_t octets_per_frame = stream->lc3_octets_per_frame;
-			uint16_t frames_per_block;
-			struct net_buf *buf;
-
-			k_mutex_lock(&stream->lc3_decoder_mutex, K_FOREVER);
-
-			if (stream->in_buf == NULL) {
-				k_mutex_unlock(&stream->lc3_decoder_mutex);
-
-				continue;
-			}
-
-			buf = net_buf_ref(stream->in_buf);
-			net_buf_unref(stream->in_buf);
-			stream->in_buf = NULL;
-			k_mutex_unlock(&stream->lc3_decoder_mutex);
-
-			frames_per_block = bt_audio_get_chan_count(stream->chan_allocation);
-			if (buf->len !=
-			    (frames_per_block * octets_per_frame * frames_blocks_per_sdu)) {
-				printk("Expected %u frame blocks with %u frames of size %u, but "
-				       "length is %u\n",
-				       frames_blocks_per_sdu, frames_per_block, octets_per_frame,
-				       buf->len);
-
-				net_buf_unref(buf);
-
-				continue;
-			}
-
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-			const bool has_left =
-				(stream->chan_allocation & BT_AUDIO_LOCATION_FRONT_LEFT) != 0;
-			const bool has_right =
-				(stream->chan_allocation & BT_AUDIO_LOCATION_FRONT_RIGHT) != 0;
-			const bool is_mono =
-				stream->chan_allocation == BT_AUDIO_LOCATION_MONO_AUDIO;
-
-			/* Split the SDU into frames*/
-			for (uint8_t i = 0U; i < frames_blocks_per_sdu; i++) {
-				for (uint16_t j = 0U; j < frames_per_block; j++) {
-					const bool is_left = j == 0 && has_left;
-					const bool is_right =
-						has_right && (j == 0 || (j == 1 && has_left));
-					const void *data = net_buf_pull_mem(buf, octets_per_frame);
-					int16_t *out_frame;
-
-					if (is_left) {
-						out_frame = left_frames[left_frames_cnt++];
-					} else if (is_right) {
-						out_frame = right_frames[right_frames_cnt++];
-					} else if (is_mono) {
-						/* Use left as mono*/
-						out_frame = left_frames[left_frames_cnt++];
-					} else {
-						/* unused channel */
-						break;
-					}
-
-					do_lc3_decode(stream->lc3_decoder, data, octets_per_frame,
-						      out_frame);
-				}
-			}
-#else
-			/* Dummy behavior: Decode and discard data */
-			for (uint8_t i = 0U; i < frames_blocks_per_sdu; i++) {
-				for (uint16_t j = 0U; j < frames_per_block; j++) {
-					const void *data = net_buf_pull_mem(buf, octets_per_frame);
-
-					do_lc3_decode(stream->lc3_decoder, data, octets_per_frame,
-						      lc3_audio_buf);
-				}
-			}
-#endif /* CONFIG_USB_DEVICE_AUDIO */
-
-			net_buf_unref(buf);
-		}
-
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-		const bool is_left_only = right_frames_cnt == 0U;
-		const bool is_right_only = left_frames_cnt == 0U;
-
-		if (!is_left_only && !is_right_only && left_frames_cnt != right_frames_cnt) {
-			printk("Mismatch between number of left (%zu) and right (%zu) frames, "
-			       "discard SDU",
-			       left_frames_cnt, right_frames_cnt);
-			continue;
-		}
-
-		/* Send frames to USB - If we only have a single channel we mix it to stereo */
-		for (size_t i = 0U; i < MAX(left_frames_cnt, right_frames_cnt); i++) {
-			const bool is_single_channel = is_left_only || is_right_only;
-			static int16_t stereo_frame[LC3_MAX_NUM_SAMPLES_STEREO];
-			int16_t *right_frame = right_frames[i];
-			int16_t *left_frame = left_frames[i];
-
-			/* Not enough space to store data */
-			if (ring_buf_space_get(&usb_ring_buf) < sizeof(stereo_frame)) {
-				break;
-			}
-
-			memset(stereo_frame, 0, sizeof(stereo_frame));
-
-			/* Generate the stereo frame
-			 *
-			 * If we only have single channel then that is always stored in the
-			 * left_frame, and we mix that to stereo
-			 */
-			for (int j = 0; j < LC3_MAX_NUM_SAMPLES_MONO; j++) {
-				if (is_single_channel) {
-					/* Mix to stereo */
-					if (is_left_only) {
-						stereo_frame[j * 2] = left_frame[j];
-						stereo_frame[j * 2 + 1] = left_frame[j];
-					} else if (is_right_only) {
-						stereo_frame[j * 2] = right_frame[j];
-						stereo_frame[j * 2 + 1] = right_frame[j];
-					}
-				} else {
-					stereo_frame[j * 2] = left_frame[j];
-					stereo_frame[j * 2 + 1] = right_frame[j];
-				}
-			}
-
-			add_to_usb_ring_buf(stereo_frame);
-		}
-#endif /* CONFIG_USB_DEVICE_AUDIO */
-	}
-}
-
-/** Decode LC3 data on a stream and returns true if successful */
-static void do_lc3_decode(lc3_decoder_t decoder, const void *in_data, uint8_t octets_per_frame,
-			  int16_t out_data[LC3_MAX_NUM_SAMPLES_MONO])
-{
-	int err;
-
-	err = lc3_decode(decoder, in_data, octets_per_frame, LC3_PCM_FORMAT_S16, out_data, 1);
-	if (err == 1) {
-		printk("  decoder performed PLC\n");
-	} else if (err < 0) {
-		printk("  decoder failed - wrong parameters? (err = %d)\n", err);
-	}
-}
-
-static int lc3_enable(struct broadcast_sink_stream *sink_stream)
-{
-	size_t chan_alloc_bit_cnt;
-	size_t sdu_size_required;
-	int frame_duration_us;
-	int freq_hz;
-	int ret;
-
-	printk("Enable: stream with codec %p\n", sink_stream->stream.codec_cfg);
-
-	ret = bt_audio_codec_cfg_get_freq(sink_stream->stream.codec_cfg);
-	if (ret > 0) {
-		freq_hz = bt_audio_codec_cfg_freq_to_freq_hz(ret);
-	} else {
-		printk("Error: Codec frequency not set, cannot start codec.");
-		return -1;
-	}
-
-	ret = bt_audio_codec_cfg_get_frame_dur(sink_stream->stream.codec_cfg);
-	if (ret > 0) {
-		frame_duration_us = bt_audio_codec_cfg_frame_dur_to_frame_dur_us(ret);
-	} else {
-		printk("Error: Frame duration not set, cannot start codec.");
-		return ret;
-	}
-
-	ret = bt_audio_codec_cfg_get_chan_allocation(sink_stream->stream.codec_cfg,
-						     &sink_stream->chan_allocation, true);
-	if (ret != 0) {
-		printk("Error: Channel allocation not set, invalid configuration for LC3");
-		return ret;
-	}
-
-	ret = bt_audio_codec_cfg_get_octets_per_frame(sink_stream->stream.codec_cfg);
-	if (ret > 0) {
-		sink_stream->lc3_octets_per_frame = (uint16_t)ret;
-	} else {
-		printk("Error: Octets per frame not set, invalid configuration for LC3");
-		return ret;
-	}
-
-	ret = bt_audio_codec_cfg_get_frame_blocks_per_sdu(sink_stream->stream.codec_cfg, true);
-	if (ret > 0) {
-		sink_stream->lc3_frames_blocks_per_sdu = (uint8_t)ret;
-	} else {
-		printk("Error: Frame blocks per SDU not set, invalid configuration for LC3");
-		return ret;
-	}
-
-	/* An SDU can consist of X frame blocks, each with Y frames (one per channel) of size Z in
-	 * them. The minimum SDU size required for this is X * Y * Z.
-	 */
-	chan_alloc_bit_cnt = bt_audio_get_chan_count(sink_stream->chan_allocation);
-	sdu_size_required = chan_alloc_bit_cnt * sink_stream->lc3_octets_per_frame *
-			    sink_stream->lc3_frames_blocks_per_sdu;
-	if (sdu_size_required > sink_stream->stream.qos->sdu) {
-		printk("With %zu channels and %u octets per frame and %u frames per block, SDUs "
-		       "shall be at minimum %zu, but the stream has been configured for %u",
-		       chan_alloc_bit_cnt, sink_stream->lc3_octets_per_frame,
-		       sink_stream->lc3_frames_blocks_per_sdu, sdu_size_required,
-		       sink_stream->stream.qos->sdu);
-
-		return -EINVAL;
-	}
-
-	printk("Enabling LC3 decoder with frame duration %uus, frequency %uHz and with channel "
-	       "allocation 0x%08X, %u octets per frame and %u frame blocks per SDU\n",
-	       frame_duration_us, freq_hz, sink_stream->chan_allocation,
-	       sink_stream->lc3_octets_per_frame, sink_stream->lc3_frames_blocks_per_sdu);
-
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-	sink_stream->lc3_decoder = lc3_setup_decoder(frame_duration_us, freq_hz, USB_SAMPLE_RATE,
-						     &sink_stream->lc3_decoder_mem);
-#else
-	sink_stream->lc3_decoder = lc3_setup_decoder(frame_duration_us, freq_hz, 0,
-						     &sink_stream->lc3_decoder_mem);
-#endif /* defined(CONFIG_USB_DEVICE_AUDIO) */
-
-	if (sink_stream->lc3_decoder == NULL) {
-		printk("ERROR: Failed to setup LC3 decoder - wrong parameters?\n");
-		return -1;
-	}
-
-	k_thread_start(decoder_tid);
-
-	return 0;
-}
-#endif /* defined(CONFIG_LIBLC3) */
-
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-/* Move the LC3 data to the USB ring buffer */
-static void add_to_usb_ring_buf(const int16_t audio_buf[LC3_MAX_NUM_SAMPLES_STEREO])
-{
-	uint32_t size;
-
-	size = ring_buf_put(&usb_ring_buf, (uint8_t *)audio_buf,
-			    LC3_MAX_NUM_SAMPLES_STEREO * sizeof(int16_t));
-	if (size != LC3_MAX_NUM_SAMPLES_STEREO) {
-		static int rb_put_failures;
-
-		rb_put_failures++;
-		if (rb_put_failures == LOG_INTERVAL) {
-			printk("%s: Failure to add to usb_ring_buf %d, %u\n", __func__,
-			       rb_put_failures, size);
-		}
-	}
-}
-
-/* USB consumer callback, called every 1ms, consumes data from ring-buffer */
-static void usb_data_request_cb(const struct device *dev)
-{
-	uint8_t usb_audio_data[USB_STEREO_SAMPLE_SIZE] = {0};
-	static struct net_buf *pcm_buf;
-	static size_t cnt;
-	int err;
-
-	ring_buf_get(&usb_ring_buf, (uint8_t *)usb_audio_data, sizeof(usb_audio_data));
-	/* Ignore ring_buf_get() return value, if size is 0 we send empty PCM frames to
-	 * not starve USB audio interface, if size is lower than USB_STEREO_SAMPLE_SIZE
-	 * we send frames padded with 0's as usb_audio_data is 0-initialized
-	 */
-
-	pcm_buf = net_buf_alloc(&usb_tx_buf_pool, K_NO_WAIT);
-	if (pcm_buf == NULL) {
-		printk("Could not allocate pcm_buf\n");
-		return;
-	}
-
-	net_buf_add_mem(pcm_buf, usb_audio_data, sizeof(usb_audio_data));
-
-	if (cnt % LOG_INTERVAL == 0) {
-		printk("Sending USB audio (count = %zu)\n", cnt);
-	}
-
-	err = usb_audio_send(dev, pcm_buf, USB_STEREO_SAMPLE_SIZE);
-	if (err) {
-		printk("Failed to send USB audio: %d\n", err);
-		net_buf_unref(pcm_buf);
-	}
-
-	cnt++;
-}
-
-static void usb_data_written_cb(const struct device *dev, struct net_buf *buf, size_t size)
-{
-	/* Unreference the buffer now that the USB is done with it */
-	net_buf_unref(buf);
-}
-#endif /* defined(CONFIG_USB_DEVICE_AUDIO) */
-
-static void stream_connected_cb(struct bt_bap_stream *stream)
-{
-	printk("Stream %p connected\n", stream);
+	printk("Stream %p connected\n", bap_stream);
 
 	k_sem_give(&sem_stream_connected);
 }
 
-static void stream_disconnected_cb(struct bt_bap_stream *stream, uint8_t reason)
+static void stream_disconnected_cb(struct bt_bap_stream *bap_stream, uint8_t reason)
 {
 	int err;
 
-	printk("Stream %p disconnected with reason 0x%02X\n", stream, reason);
+	printk("Stream %p disconnected with reason 0x%02X\n", bap_stream, reason);
 
 	err = k_sem_take(&sem_stream_connected, K_NO_WAIT);
 	if (err != 0) {
@@ -506,43 +120,30 @@ static void stream_disconnected_cb(struct bt_bap_stream *stream, uint8_t reason)
 	}
 }
 
-static void stream_started_cb(struct bt_bap_stream *stream)
+static void stream_started_cb(struct bt_bap_stream *bap_stream)
 {
-	struct broadcast_sink_stream *sink_stream =
-		CONTAINER_OF(stream, struct broadcast_sink_stream, stream);
-
-	printk("Stream %p started\n", stream);
-
-	total_rx_iso_packet_count = 0U;
-	sink_stream->recv_cnt = 0U;
-	sink_stream->loss_cnt = 0U;
-	sink_stream->valid_cnt = 0U;
-	sink_stream->error_cnt = 0U;
-
-#if defined(CONFIG_LIBLC3)
 	int err;
 
-	if (stream->codec_cfg != 0 && stream->codec_cfg->id != BT_HCI_CODING_FORMAT_LC3) {
-		/* No subgroups with LC3 was found */
-		printk("Did not parse an LC3 codec\n");
-		return;
-	}
+	printk("Stream %p started\n", bap_stream);
 
-	err = lc3_enable(sink_stream);
-	if (err < 0) {
-		printk("Error: cannot enable LC3 codec: %d", err);
-		return;
+	err = stream_rx_started(bap_stream);
+	if (err != 0) {
+		printk("stream_rx_started returned error: %d\n", err);
 	}
-#endif /* CONFIG_LIBLC3 */
 
 	k_sem_give(&sem_stream_started);
 }
 
-static void stream_stopped_cb(struct bt_bap_stream *stream, uint8_t reason)
+static void stream_stopped_cb(struct bt_bap_stream *bap_stream, uint8_t reason)
 {
 	int err;
 
-	printk("Stream %p stopped with reason 0x%02X\n", stream, reason);
+	printk("Stream %p stopped with reason 0x%02X\n", bap_stream, reason);
+
+	err = stream_rx_stopped(bap_stream);
+	if (err != 0) {
+		printk("stream_rx_stopped returned error: %d\n", err);
+	}
 
 	err = k_sem_take(&sem_stream_started, K_NO_WAIT);
 	if (err != 0) {
@@ -550,42 +151,10 @@ static void stream_stopped_cb(struct bt_bap_stream *stream, uint8_t reason)
 	}
 }
 
-static void stream_recv_cb(struct bt_bap_stream *stream, const struct bt_iso_recv_info *info,
+static void stream_recv_cb(struct bt_bap_stream *bap_stream, const struct bt_iso_recv_info *info,
 			   struct net_buf *buf)
 {
-	struct broadcast_sink_stream *sink_stream =
-		CONTAINER_OF(stream, struct broadcast_sink_stream, stream);
-
-	if (info->flags & BT_ISO_FLAGS_ERROR) {
-		sink_stream->error_cnt++;
-	}
-
-	if (info->flags & BT_ISO_FLAGS_LOST) {
-		sink_stream->loss_cnt++;
-	}
-
-	if (info->flags & BT_ISO_FLAGS_VALID) {
-		sink_stream->valid_cnt++;
-#if defined(CONFIG_LIBLC3)
-		k_mutex_lock(&sink_stream->lc3_decoder_mutex, K_FOREVER);
-		if (sink_stream->in_buf != NULL) {
-			net_buf_unref(sink_stream->in_buf);
-			sink_stream->in_buf = NULL;
-		}
-
-		sink_stream->in_buf = net_buf_ref(buf);
-		k_mutex_unlock(&sink_stream->lc3_decoder_mutex);
-		k_sem_give(&lc3_decoder_sem);
-#endif /* defined(CONFIG_LIBLC3) */
-	}
-
-	total_rx_iso_packet_count++;
-	sink_stream->recv_cnt++;
-	if ((sink_stream->recv_cnt % LOG_INTERVAL) == 0U) {
-		printk("Stream %p: received %u total ISO packets: Valid %u | Error %u | Loss %u\n",
-		       &sink_stream->stream, sink_stream->recv_cnt, sink_stream->valid_cnt,
-		       sink_stream->error_cnt, sink_stream->loss_cnt);
-	}
+	stream_rx_recv(bap_stream, info, buf);
 }
 
 static struct bt_bap_stream_ops stream_ops = {
@@ -1311,30 +880,19 @@ static int init(void)
 	bt_le_per_adv_sync_cb_register(&bap_pa_sync_cb);
 	bt_le_scan_cb_register(&bap_scan_cb);
 
-	for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) {
-		streams[i].stream.ops = &stream_ops;
-	}
+	stream_rx_get_streams(bap_streams_p);
 
-	/* Initialize ring buffers and USB */
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-	const struct device *hs_dev = DEVICE_DT_GET(DT_NODELABEL(hs_0));
-	static const struct usb_audio_ops usb_ops = {
-		.data_request_cb = usb_data_request_cb,
-		.data_written_cb = usb_data_written_cb,
-	};
+	for (size_t i = 0U; i < CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT; i++) {
+		bt_bap_stream_cb_register(bap_streams_p[i], &stream_ops);
+	}
 
-	if (!device_is_ready(hs_dev)) {
-		printk("Cannot get USB Headset Device\n");
-		return -EIO;
+	if (IS_ENABLED(CONFIG_LIBLC3)) {
+		lc3_init();
 	}
 
-	usb_audio_register(hs_dev, &usb_ops);
-	err = usb_enable(NULL);
-	if (err && err != -EALREADY) {
-		printk("Failed to enable USB\n");
-		return err;
+	if (IS_ENABLED(CONFIG_USE_USB_AUDIO_OUTPUT)) {
+		usb_init();
 	}
-#endif /* defined(CONFIG_USB_DEVICE_AUDIO) */
 
 	return 0;
 }
@@ -1406,7 +964,7 @@ static int start_adv(void)
 	int err;
 
 	/* Create a connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &ext_adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_REDUCED, NULL, &ext_adv);
 	if (err != 0) {
 		printk("Failed to create advertising set (err %d)\n", err);
 
@@ -1476,13 +1034,6 @@ int main(void)
 		return 0;
 	}
 
-	for (size_t i = 0U; i < ARRAY_SIZE(streams_p); i++) {
-		streams_p[i] = &streams[i].stream;
-#if defined(CONFIG_LIBLC3)
-		k_mutex_init(&streams[i].lc3_decoder_mutex);
-#endif /* defined(CONFIG_LIBLC3) */
-	}
-
 	while (true) {
 		uint32_t sync_bitfield;
 
@@ -1645,7 +1196,7 @@ int main(void)
 		       "(req_bis_sync), stream_count = %u\n",
 		       sync_bitfield, bis_index_bitfield, requested_bis_sync, stream_count);
 
-		err = bt_bap_broadcast_sink_sync(broadcast_sink, sync_bitfield, streams_p,
+		err = bt_bap_broadcast_sink_sync(broadcast_sink, sync_bitfield, bap_streams_p,
 						 sink_broadcast_code);
 		if (err != 0) {
 			printk("Unable to sync to broadcast source: %d\n", err);
diff --git a/samples/bluetooth/bap_broadcast_sink/src/stream_rx.c b/samples/bluetooth/bap_broadcast_sink/src/stream_rx.c
new file mode 100644
index 0000000000000..1caaec5361c2e
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/src/stream_rx.c
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+
+#if defined(CONFIG_LIBLC3)
+#include <lc3.h>
+#endif /* defined(CONFIG_LIBLC3) */
+
+#include "stream_rx.h"
+#include "lc3.h"
+
+struct stream_rx rx_streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT];
+uint64_t total_rx_iso_packet_count; /* This value is exposed to test code */
+
+LOG_MODULE_REGISTER(stream_rx, CONFIG_LOG_DEFAULT_LEVEL);
+
+#if CONFIG_INFO_REPORTING_INTERVAL > 0
+static void log_stream_rx(const struct stream_rx *stream, const struct bt_iso_recv_info *info,
+			  const struct net_buf *buf)
+{
+	LOG_INF("[%zu]: Incoming audio on stream %p len %u, flags 0x%02X, seq_num %u and ts %u: "
+		"Valid %zu | Error %zu | Loss %zu | Dup TS %zu | Dup PSN %zu",
+		stream->reporting_info.recv_cnt, &stream->stream, buf->len, info->flags,
+		info->seq_num, info->ts, stream->reporting_info.valid_cnt,
+		stream->reporting_info.error_cnt, stream->reporting_info.loss_cnt,
+		stream->reporting_info.dup_ts_cnt, stream->reporting_info.dup_psn_cnt);
+}
+#endif /* CONFIG_INFO_REPORTING_INTERVAL > 0 */
+
+void stream_rx_recv(struct bt_bap_stream *bap_stream, const struct bt_iso_recv_info *info,
+		    struct net_buf *buf)
+{
+	struct stream_rx *stream = CONTAINER_OF(bap_stream, struct stream_rx, stream);
+
+#if CONFIG_INFO_REPORTING_INTERVAL > 0
+	if ((stream->reporting_info.recv_cnt % CONFIG_INFO_REPORTING_INTERVAL) == 0U) {
+		log_stream_rx(stream, info, buf);
+	}
+
+	if (stream->reporting_info.recv_cnt > 0U && info->ts == stream->reporting_info.last_ts) {
+		log_stream_rx(stream, info, buf);
+		LOG_WRN("Duplicated timestamp received: %u\n", stream->reporting_info.last_ts);
+		stream->reporting_info.dup_ts_cnt++;
+	}
+
+	if (stream->reporting_info.recv_cnt > 0U &&
+	    info->seq_num == stream->reporting_info.last_seq_num) {
+		log_stream_rx(stream, info, buf);
+		LOG_WRN("Duplicated PSN received: %u\n", stream->reporting_info.last_seq_num);
+		stream->reporting_info.dup_psn_cnt++;
+	}
+
+	if (info->flags & BT_ISO_FLAGS_ERROR) {
+		log_stream_rx(stream, info, buf);
+		LOG_DBG("ISO receive error\n");
+		stream->reporting_info.error_cnt++;
+	}
+
+	if (info->flags & BT_ISO_FLAGS_LOST) {
+		log_stream_rx(stream, info, buf);
+		LOG_DBG("ISO receive lost\n");
+		stream->reporting_info.loss_cnt++;
+	}
+
+	if (info->flags & BT_ISO_FLAGS_VALID) {
+		if (buf->len == 0U) {
+			stream->reporting_info.empty_sdu_cnt++;
+		} else {
+			stream->reporting_info.valid_cnt++;
+		}
+	}
+
+	stream->reporting_info.last_seq_num = info->seq_num;
+	stream->reporting_info.last_ts = info->ts;
+	stream->reporting_info.recv_cnt++;
+#endif /* CONFIG_INFO_REPORTING_INTERVAL > 0 */
+
+	total_rx_iso_packet_count++;
+
+	if (IS_ENABLED(CONFIG_LIBLC3)) {
+		/* Invalid SDUs will trigger PLC */
+		lc3_enqueue_for_decoding(stream, info, buf);
+	}
+}
+
+int stream_rx_started(struct bt_bap_stream *bap_stream)
+{
+	struct stream_rx *stream = CONTAINER_OF(bap_stream, struct stream_rx, stream);
+
+	if (stream == NULL) {
+		return -EINVAL;
+	}
+
+#if CONFIG_INFO_REPORTING_INTERVAL > 0
+	memset(&stream->reporting_info, 0, sizeof((stream->reporting_info)));
+#endif /* CONFIG_INFO_REPORTING_INTERVAL > 0 */
+
+	if (IS_ENABLED(CONFIG_LIBLC3) && bap_stream->codec_cfg != NULL &&
+	    bap_stream->codec_cfg->id == BT_HCI_CODING_FORMAT_LC3) {
+		int err;
+
+		err = lc3_enable(stream);
+		if (err < 0) {
+			LOG_ERR("Error: cannot enable LC3 codec: %d", err);
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+int stream_rx_stopped(struct bt_bap_stream *bap_stream)
+{
+	struct stream_rx *stream = CONTAINER_OF(bap_stream, struct stream_rx, stream);
+
+	if (bap_stream == NULL) {
+		return -EINVAL;
+	}
+
+	if (IS_ENABLED(CONFIG_LIBLC3) && bap_stream->codec_cfg != NULL &&
+	    bap_stream->codec_cfg->id == BT_HCI_CODING_FORMAT_LC3) {
+		int err;
+
+		err = lc3_disable(stream);
+		if (err < 0) {
+			LOG_ERR("Error: cannot disable LC3 codec: %d", err);
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+void stream_rx_get_streams(
+	struct bt_bap_stream *bap_streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT])
+{
+	for (size_t i = 0U; i < ARRAY_SIZE(rx_streams); i++) {
+		bap_streams[i] = &rx_streams[i].stream;
+	}
+}
diff --git a/samples/bluetooth/bap_broadcast_sink/src/stream_rx.h b/samples/bluetooth/bap_broadcast_sink/src/stream_rx.h
new file mode 100644
index 0000000000000..b2afc64349237
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/src/stream_rx.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef SAMPLE_BAP_BROADCAST_SINK_STREAM_RX_H
+#define SAMPLE_BAP_BROADCAST_SINK_STREAM_RX_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+
+#if defined(CONFIG_LIBLC3)
+#include <lc3.h>
+#endif /* defined(CONFIG_LIBLC3) */
+
+struct stream_rx {
+	/* A BAP stream object */
+	struct bt_bap_stream stream;
+#if CONFIG_INFO_REPORTING_INTERVAL > 0
+	/** Struct containing information useful for logging purposes */
+	struct {
+		/** Total Number of SDUs received */
+		size_t recv_cnt;
+		/** Number of lost SDUs */
+		size_t loss_cnt;
+		/** Number of SDUs containing errors */
+		size_t error_cnt;
+		/** Number of valid SDUs received */
+		size_t valid_cnt;
+		/** Number of empty SDUs received */
+		size_t empty_sdu_cnt;
+		/** Number of SDUs with duplicated packet sequence number received */
+		size_t dup_psn_cnt;
+		/** Number of SDUs with duplicated timestamps received */
+		size_t dup_ts_cnt;
+		/** The last received timestamp to track dup_ts_cnt */
+		uint32_t last_ts;
+		/** The last received sequence number to track dup_psn_cnt */
+		uint16_t last_seq_num;
+#if CONFIG_LIBLC3 > 0
+		/** Number of SDUs decoded  */
+		size_t lc3_decoded_cnt;
+#endif /* CONFIG_LIBLC3 > 0 */
+	} reporting_info;
+#endif /* CONFIG_INFO_REPORTING_INTERVAL > 0 */
+
+#if defined(CONFIG_LIBLC3)
+	/** Octets per frame - Used to validate that the incoming data is of correct size  */
+	uint16_t lc3_octets_per_frame;
+	/** Frame blocks per SDU - Used to split the SDU into frame blocks when decoding */
+	uint8_t lc3_frame_blocks_per_sdu;
+
+	/** Number of channels - Used to split the SDU into frame blocks when decoding */
+	uint8_t lc3_chan_cnt;
+
+	/**
+	 * @brief The configured channels of the stream
+	 *
+	 * Used to determine whether to send data to USB and count number of channels
+	 */
+	enum bt_audio_location lc3_chan_allocation;
+
+	/** Memory use for the LC3 decoder - Supports any configuration */
+	lc3_decoder_mem_48k_t lc3_decoder_mem;
+	/** Reference to the LC3 decoder */
+	lc3_decoder_t lc3_decoder;
+#endif /* defined(CONFIG_LIBLC3) */
+};
+
+/**
+ * @brief Function to call for each SDU received
+ *
+ * Will decode with LC3 and send to USB if enabled
+ */
+void stream_rx_recv(struct bt_bap_stream *bap_stream, const struct bt_iso_recv_info *info,
+		    struct net_buf *buf);
+
+size_t stream_rx_get_streaming_cnt(void);
+int stream_rx_started(struct bt_bap_stream *bap_stream);
+int stream_rx_stopped(struct bt_bap_stream *bap_stream);
+void stream_rx_get_streams(
+	struct bt_bap_stream *bap_streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT]);
+
+#endif /* SAMPLE_BAP_BROADCAST_SINK_STREAM_RX_H */
diff --git a/samples/bluetooth/bap_broadcast_sink/src/usb.c b/samples/bluetooth/bap_broadcast_sink/src/usb.c
new file mode 100644
index 0000000000000..5dc2f82590206
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/src/usb.c
@@ -0,0 +1,376 @@
+/**
+ * @file
+ * @brief Bluetooth BAP Broadcast Sink Sample LC3
+ *
+ * This files handles all the USB related functionality to audio out for the Sample
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/usb/udc_buf.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/usb/class/usbd_uac2.h>
+#include <zephyr/usb/usbd.h>
+
+#include <sample_usbd.h>
+
+#include "lc3.h"
+#include "usb.h"
+
+LOG_MODULE_REGISTER(usb, CONFIG_LOG_DEFAULT_LEVEL);
+
+#define USB_ENQUEUE_COUNT        30U /* 30 times 1ms frames => 30ms */
+#define USB_FRAME_DURATION_US    1000U
+#define USB_SAMPLE_CNT           ((USB_FRAME_DURATION_US * USB_SAMPLE_RATE_HZ) / USEC_PER_SEC)
+#define USB_BYTES_PER_SAMPLE     sizeof(int16_t)
+#define USB_MONO_FRAME_SIZE      (USB_SAMPLE_CNT * USB_BYTES_PER_SAMPLE)
+#define USB_CHANNELS             2U
+#define USB_STEREO_FRAME_SIZE    (USB_MONO_FRAME_SIZE * USB_CHANNELS)
+#define USB_OUT_RING_BUF_SIZE    (CONFIG_BT_ISO_RX_BUF_COUNT * LC3_MAX_NUM_SAMPLES_STEREO)
+#define USB_IN_RING_BUF_SIZE     (USB_MONO_FRAME_SIZE * USB_ENQUEUE_COUNT)
+
+#define IN_TERMINAL_ID UAC2_ENTITY_ID(DT_NODELABEL(in_terminal))
+
+struct decoded_sdu {
+	int16_t right_frames[CONFIG_MAX_CODEC_FRAMES_PER_SDU][LC3_MAX_NUM_SAMPLES_MONO];
+	int16_t left_frames[CONFIG_MAX_CODEC_FRAMES_PER_SDU][LC3_MAX_NUM_SAMPLES_MONO];
+	size_t right_frames_cnt;
+	size_t left_frames_cnt;
+	size_t mono_frames_cnt;
+	uint32_t ts;
+} decoded_sdu;
+
+RING_BUF_DECLARE(usb_out_ring_buf, USB_OUT_RING_BUF_SIZE);
+K_MEM_SLAB_DEFINE_STATIC(usb_out_buf_pool, ROUND_UP(USB_STEREO_FRAME_SIZE, UDC_BUF_GRANULARITY),
+			 USB_ENQUEUE_COUNT, UDC_BUF_ALIGN);
+static volatile bool terminal_enabled;
+
+/* USB consumer callback, called every 1ms, consumes data from ring-buffer */
+static void uac2_sof_cb(const struct device *dev, void *user_data)
+{
+	void *pcm_buf;
+	uint32_t size;
+	int err;
+
+	if (!terminal_enabled) {
+		/* Simply discard the data then */
+		(void)ring_buf_get(&usb_out_ring_buf, NULL, USB_STEREO_FRAME_SIZE);
+		return;
+	}
+
+	err = k_mem_slab_alloc(&usb_out_buf_pool, &pcm_buf, K_NO_WAIT);
+	if (err != 0) {
+		LOG_WRN("Could not allocate pcm_buf");
+		return;
+	}
+
+	size = ring_buf_get(&usb_out_ring_buf, pcm_buf, USB_STEREO_FRAME_SIZE);
+	if (size != USB_STEREO_FRAME_SIZE) {
+		/* If we could not fill the buffer, zero-fill the rest (possibly all) */
+		memset(((uint8_t *)pcm_buf) + size, 0, USB_STEREO_FRAME_SIZE - size);
+	}
+
+	if (CONFIG_INFO_REPORTING_INTERVAL > 0) {
+		if (size != 0) {
+			static size_t cnt;
+
+			if (++cnt % (CONFIG_INFO_REPORTING_INTERVAL * 10) == 0U) {
+				LOG_INF("[%zu]: Sending USB audio", cnt);
+			}
+		} else {
+			static size_t cnt;
+
+			if (++cnt % (CONFIG_INFO_REPORTING_INTERVAL * 10) == 0U) {
+				LOG_INF("[%zu]: Sending empty USB audio", cnt);
+			}
+		}
+	}
+
+	err = usbd_uac2_send(dev, IN_TERMINAL_ID, pcm_buf, USB_STEREO_FRAME_SIZE);
+	if (err != 0) {
+		if (CONFIG_INFO_REPORTING_INTERVAL > 0) {
+			static size_t cnt;
+
+			if (cnt++ % (CONFIG_INFO_REPORTING_INTERVAL * 10) == 0) {
+				LOG_ERR("[%zu]: Failed to send USB audio: %d", cnt, err);
+			}
+		}
+
+		k_mem_slab_free(&usb_out_buf_pool, pcm_buf);
+	} /* USB owns the buffer which will be released in uac2_buf_release_cb */
+}
+
+static void uac2_buf_release_cb(const struct device *dev, uint8_t terminal, void *buf,
+				void *user_data)
+{
+	k_mem_slab_free(&usb_out_buf_pool, buf);
+}
+
+static void terminal_update_cb(const struct device *dev, uint8_t terminal, bool enabled,
+			       bool microframes, void *user_data)
+{
+	terminal_enabled = enabled;
+}
+
+static void usb_send_frames_to_usb(void)
+{
+	const bool is_left_only =
+		decoded_sdu.right_frames_cnt == 0U && decoded_sdu.mono_frames_cnt == 0U;
+	const bool is_right_only =
+		decoded_sdu.left_frames_cnt == 0U && decoded_sdu.mono_frames_cnt == 0U;
+	const bool is_mono_only =
+		decoded_sdu.left_frames_cnt == 0U && decoded_sdu.right_frames_cnt == 0U;
+	const bool is_single_channel = is_left_only || is_right_only || is_mono_only;
+	const size_t frame_cnt =
+		MAX(decoded_sdu.mono_frames_cnt,
+		    MAX(decoded_sdu.left_frames_cnt, decoded_sdu.right_frames_cnt));
+	static size_t cnt;
+
+	/* Send frames to USB - If we only have a single channel we mix it to stereo */
+	for (size_t i = 0U; i < frame_cnt; i++) {
+		static int16_t stereo_frame[LC3_MAX_NUM_SAMPLES_STEREO];
+		const int16_t *right_frame = decoded_sdu.right_frames[i];
+		const int16_t *left_frame = decoded_sdu.left_frames[i];
+		const int16_t *mono_frame = decoded_sdu.left_frames[i]; /* use left as mono */
+		static size_t fail_cnt;
+		uint32_t rb_size;
+
+		/* Not enough space to store data */
+		if (ring_buf_space_get(&usb_out_ring_buf) < sizeof(stereo_frame)) {
+			if (CONFIG_INFO_REPORTING_INTERVAL > 0 &&
+			    (fail_cnt % CONFIG_INFO_REPORTING_INTERVAL) == 0U) {
+				LOG_WRN("[%zu] Could not send more than %zu frames to USB",
+					fail_cnt, i);
+			}
+
+			fail_cnt++;
+
+			break;
+		}
+
+		fail_cnt = 0U;
+
+		/* Generate the stereo frame
+		 *
+		 * If we only have single channel then we mix that to stereo
+		 */
+		for (int j = 0; j < LC3_MAX_NUM_SAMPLES_MONO; j++) {
+			if (is_single_channel) {
+				int16_t sample = 0;
+
+				/* Mix to stereo as LRLRLRLR */
+				if (is_left_only) {
+					sample = left_frame[j];
+				} else if (is_right_only) {
+					sample = right_frame[j];
+				} else if (is_mono_only) {
+					sample = mono_frame[j];
+				}
+
+				stereo_frame[j * 2] = sample;
+				stereo_frame[j * 2 + 1] = sample;
+			} else {
+				stereo_frame[j * 2] = left_frame[j];
+				stereo_frame[j * 2 + 1] = right_frame[j];
+			}
+		}
+
+		rb_size = ring_buf_put(&usb_out_ring_buf, (uint8_t *)stereo_frame,
+				       sizeof(stereo_frame));
+		if (rb_size != sizeof(stereo_frame)) {
+			LOG_WRN("Failed to put frame on USB ring buf");
+
+			break;
+		}
+	}
+
+	if (CONFIG_INFO_REPORTING_INTERVAL > 0 && (++cnt % CONFIG_INFO_REPORTING_INTERVAL) == 0U) {
+		LOG_INF("[%zu]: Sending %u USB audio frame", cnt, frame_cnt);
+	}
+
+	usb_clear_frames_to_usb();
+}
+
+static bool ts_overflowed(uint32_t ts)
+{
+	/* If the timestamp is a factor of 10 in difference, then we assume that TS overflowed
+	 * We cannot simply check if `ts < decoded_sdu.ts` as that could also indicate old data
+	 */
+	return ((uint64_t)ts * 10 < decoded_sdu.ts);
+}
+
+int usb_add_frame_to_usb(enum bt_audio_location chan_allocation, const int16_t *frame,
+			 size_t frame_size, uint32_t ts)
+{
+	const bool is_left = (chan_allocation & BT_AUDIO_LOCATION_FRONT_LEFT) != 0;
+	const bool is_right = (chan_allocation & BT_AUDIO_LOCATION_FRONT_RIGHT) != 0;
+	const bool is_mono = chan_allocation == BT_AUDIO_LOCATION_MONO_AUDIO;
+	const uint8_t ts_jitter_us = 100; /* timestamps may have jitter */
+	static size_t cnt;
+
+	if (!terminal_enabled) {
+		/* Simply discard the data then */
+		/* TODO: Consider if we still want to decode the incoming audio */
+		return 0;
+	}
+
+	if (CONFIG_INFO_REPORTING_INTERVAL > 0 && (++cnt % CONFIG_INFO_REPORTING_INTERVAL) == 0U) {
+		LOG_INF("[%zu]: Adding USB audio frame", cnt);
+	}
+
+	if (frame_size > LC3_MAX_NUM_SAMPLES_MONO * sizeof(int16_t) || frame_size == 0U) {
+		LOG_DBG("Invalid frame of size %zu", frame_size);
+
+		return -EINVAL;
+	}
+
+	if (bt_audio_get_chan_count(chan_allocation) != 1) {
+		LOG_DBG("Invalid channel allocation %d", chan_allocation);
+
+		return -EINVAL;
+	}
+
+	if (((is_left || is_right) && decoded_sdu.mono_frames_cnt != 0) ||
+	    (is_mono &&
+	     (decoded_sdu.left_frames_cnt != 0U || decoded_sdu.right_frames_cnt != 0U))) {
+		LOG_DBG("Cannot mix and match mono with left or right");
+
+		return -EINVAL;
+	}
+
+	/* Check if the frame can be combined with a previous frame from another channel, of if
+	 * we have to send previous data to USB and then store the current frame
+	 *
+	 * This is done by comparing the timestamps of the frames, and in the case that they are the
+	 * same, there are additional checks to see if we have received more left than right frames,
+	 * in which case we also send existing data
+	 */
+
+	if (ts + ts_jitter_us < decoded_sdu.ts && !ts_overflowed(ts)) {
+		/* Old data, discard */
+		return -ENOEXEC;
+	} else if (ts > decoded_sdu.ts + ts_jitter_us || ts_overflowed(ts)) {
+		/* We are getting new data - Send existing data to ring buffer */
+		usb_send_frames_to_usb();
+	} else { /* same timestamp */
+		bool send = false;
+
+		if (is_left && decoded_sdu.left_frames_cnt > decoded_sdu.right_frames_cnt) {
+			/* We are receiving left again before a right, send to USB */
+			send = true;
+		} else if (is_right && decoded_sdu.right_frames_cnt > decoded_sdu.left_frames_cnt) {
+			/* We are receiving right again before a left, send to USB */
+			send = true;
+		} else if (is_mono) {
+			/* always send mono as it comes */
+			send = true;
+		}
+
+		if (send) {
+			usb_send_frames_to_usb();
+		}
+	}
+
+	if (is_left) {
+		if (decoded_sdu.left_frames_cnt >= ARRAY_SIZE(decoded_sdu.left_frames)) {
+			LOG_WRN("Could not add more left frames");
+
+			return -ENOMEM;
+		}
+
+		memcpy(decoded_sdu.left_frames[decoded_sdu.left_frames_cnt++], frame, frame_size);
+	} else if (is_right) {
+		if (decoded_sdu.right_frames_cnt >= ARRAY_SIZE(decoded_sdu.right_frames)) {
+			LOG_WRN("Could not add more right frames");
+
+			return -ENOMEM;
+		}
+
+		memcpy(decoded_sdu.right_frames[decoded_sdu.right_frames_cnt++], frame, frame_size);
+	} else if (is_mono) {
+		/* Use left as mono*/
+		if (decoded_sdu.mono_frames_cnt >= ARRAY_SIZE(decoded_sdu.left_frames)) {
+			LOG_WRN("Could not add more mono frames");
+
+			return -ENOMEM;
+		}
+
+		memcpy(decoded_sdu.left_frames[decoded_sdu.mono_frames_cnt++], frame, frame_size);
+	} else {
+		/* Unsupported channel */
+		LOG_DBG("Unsupported channel %d", chan_allocation);
+
+		return -EINVAL;
+	}
+
+	decoded_sdu.ts = ts;
+
+	return 0;
+}
+
+void usb_clear_frames_to_usb(void)
+{
+	decoded_sdu.mono_frames_cnt = 0U;
+	decoded_sdu.right_frames_cnt = 0U;
+	decoded_sdu.left_frames_cnt = 0U;
+	decoded_sdu.ts = 0U;
+}
+
+int usb_init(void)
+{
+	const struct device *mic_dev = DEVICE_DT_GET(DT_NODELABEL(uac2_microphone));
+	static struct uac2_ops usb_audio_ops = {
+		.sof_cb = uac2_sof_cb,
+		.buf_release_cb = uac2_buf_release_cb,
+		.terminal_update_cb = terminal_update_cb,
+	};
+	struct usbd_context *sample_usbd;
+	static bool initialized;
+	int err;
+
+	if (initialized) {
+		return -EALREADY;
+	}
+
+	if (!device_is_ready(mic_dev)) {
+		LOG_ERR("Cannot get USB Microphone Device");
+		return -EIO;
+	}
+
+	usbd_uac2_set_ops(mic_dev, &usb_audio_ops, NULL);
+
+	sample_usbd = sample_usbd_init_device(NULL);
+	if (sample_usbd == NULL) {
+		return -ENODEV;
+	}
+
+	err = usbd_enable(sample_usbd);
+	if (err != 0) {
+		return err;
+	}
+
+	LOG_INF("USB initialized");
+	initialized = true;
+
+	return 0;
+}
diff --git a/samples/bluetooth/bap_broadcast_sink/src/usb.h b/samples/bluetooth/bap_broadcast_sink/src/usb.h
new file mode 100644
index 0000000000000..e05a997c2516a
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_sink/src/usb.h
@@ -0,0 +1,71 @@
+/**
+ * @file
+ * @brief Bluetooth BAP Broadcast Sink sample USB header
+ *
+ * This files handles all the USB related functionality for the sample
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef SAMPLE_BAP_BROADCAST_SINK_USB_H
+#define SAMPLE_BAP_BROADCAST_SINK_USB_H
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_audio.h>
+
+#define USB_SAMPLE_RATE_HZ 48000U
+
+/**
+ * @brief Add decoded frame to the USB buffer
+ *
+ * @param chan_allocation The channel of the frame (@ref BT_AUDIO_LOCATION_FRONT_LEFT, @ref
+ *                        BT_AUDIO_LOCATION_FRONT_RIGHT or @ref BT_AUDIO_LOCATION_MONO_AUDIO)
+ * @param frame The frame
+ * @param frame_size The size of @p in octets
+ * @param ts The timestamp of the frame
+ *
+ * @retval 0 Success
+ * @retval -EINVAL Invalid channel, frame of framesize
+ * @retval -ENOEXEC Old timestamp, discarded
+ * @retval -ENOMEM No memory to enqueue
+ */
+int usb_add_frame_to_usb(enum bt_audio_location chan_allocation, const int16_t *frame,
+			 size_t frame_size, uint32_t ts);
+
+/**
+ * @brief Clear last sent SDU
+ *
+ * If only part of the SDU could be decoded, this should be called
+ */
+void usb_clear_frames_to_usb(void);
+
+/**
+ * @brief Initialize the USB module
+ *
+ * This will start the USB thread if not already initialized
+ *
+ * @retval 0 Success
+ * @retval -EALREADY Already initialized
+ */
+int usb_init(void);
+
+#endif /* SAMPLE_BAP_BROADCAST_SINK_USB_H */
diff --git a/samples/bluetooth/bap_broadcast_source/Kconfig b/samples/bluetooth/bap_broadcast_source/Kconfig
index a765abcf3d4d9..27e0fcf384c85 100644
--- a/samples/bluetooth/bap_broadcast_source/Kconfig
+++ b/samples/bluetooth/bap_broadcast_source/Kconfig
@@ -29,6 +29,11 @@ config ENABLE_LC3
 	select LIBLC3
 	select FPU
 
+config ISO_PACKING_INTERLEAVED
+	bool "Use interleaved packing"
+	help
+	  Use interleaved packing between BIS ISO stream subevents.
+
 config USE_USB_AUDIO_INPUT
 	bool "Use USB Audio as input"
 	# By default, use the USB Audio path is disabled.
diff --git a/samples/bluetooth/bap_broadcast_source/README.rst b/samples/bluetooth/bap_broadcast_source/README.rst
index 501f4231b9878..7235ee8343e30 100644
--- a/samples/bluetooth/bap_broadcast_source/README.rst
+++ b/samples/bluetooth/bap_broadcast_source/README.rst
@@ -31,6 +31,8 @@ Building and Running
 When building targeting an nrf52 series board with the Zephyr Bluetooth Controller,
 use ``-DEXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf`` to enable the required ISO
 feature support.
+The sample defaults to sequential packing of BIS subevents, add
+``-DCONFIG_ISO_PACKING_INTERLEAVED=y`` to use interleaved packing.
 
 Building for an nrf5340dk
 -------------------------
diff --git a/samples/bluetooth/bap_broadcast_source/boards/nrf5340_audio_dk_nrf5340_cpuapp_nrf21540_ek.overlay b/samples/bluetooth/bap_broadcast_source/boards/nrf5340_audio_dk_nrf5340_cpuapp_nrf21540_ek.overlay
new file mode 100644
index 0000000000000..d35e19ce79b0d
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_source/boards/nrf5340_audio_dk_nrf5340_cpuapp_nrf21540_ek.overlay
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "../app.overlay"
+
+/ {
+	gpio_fwd: nrf-gpio-forwarder {
+		compatible = "nordic,nrf-gpio-forwarder";
+		status = "okay";
+
+		nrf21540-gpio-if {
+			gpios = <&arduino_header 11 0>, /* tx-en-gpios */
+				<&arduino_header 9  0>, /* rx-en-gpios */
+				<&arduino_header 15 0>,	/* pdn-gpios */
+				<&arduino_header 10 0>, /* ant-sel-gpios */
+				<&arduino_header 8  0>; /* mode-gpios */
+		};
+
+		nrf21540-spi-if {
+			gpios = <&arduino_header 16 0>, /* cs-gpios */
+				<&gpio0          8  0>, /* SPIM_SCK */
+				<&gpio0          10 0>, /* SPIM_MISO */
+				<&gpio0          9  0>; /* SPIM_MOSI */
+		};
+	};
+};
diff --git a/samples/bluetooth/bap_broadcast_source/overlay-bt_ll_sw_split.conf b/samples/bluetooth/bap_broadcast_source/overlay-bt_ll_sw_split.conf
index 3711a34921368..4e873d42cb220 100644
--- a/samples/bluetooth/bap_broadcast_source/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/bap_broadcast_source/overlay-bt_ll_sw_split.conf
@@ -6,6 +6,8 @@ CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 
 # Enable support for Broadcast ISO in Zephyr Bluetooth Controller
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 
 # Sufficient ISO PDU length for any BAP LC3 presets (155)
 CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=155
@@ -18,3 +20,4 @@ CONFIG_BT_CTLR_ISOAL_SOURCES=2
 # packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
 # the optional Time_Stamp field, if supplied)
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=163
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=155
diff --git a/samples/bluetooth/bap_broadcast_source/overlay-interleaved.conf b/samples/bluetooth/bap_broadcast_source/overlay-interleaved.conf
new file mode 100644
index 0000000000000..3e5f87fa69b1d
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_source/overlay-interleaved.conf
@@ -0,0 +1 @@
+CONFIG_ISO_PACKING_INTERLEAVED=y
diff --git a/samples/bluetooth/bap_broadcast_source/overlay-sequential.conf b/samples/bluetooth/bap_broadcast_source/overlay-sequential.conf
new file mode 100644
index 0000000000000..5ce5226aef959
--- /dev/null
+++ b/samples/bluetooth/bap_broadcast_source/overlay-sequential.conf
@@ -0,0 +1 @@
+CONFIG_ISO_PACKING_INTERLEAVED=n
diff --git a/samples/bluetooth/bap_broadcast_source/prj.conf b/samples/bluetooth/bap_broadcast_source/prj.conf
index 8daf74f8571f6..34d636f7e0fd9 100644
--- a/samples/bluetooth/bap_broadcast_source/prj.conf
+++ b/samples/bluetooth/bap_broadcast_source/prj.conf
@@ -11,6 +11,9 @@ CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 # Two streams in one subgroup (stereo)
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=1
 
+# Uncomment below to use Broadcast ISO interleaved packing
+# CONFIG_ISO_PACKING_INTERLEAVED=y
+
 CONFIG_BT_ISO_TX_BUF_COUNT=6
 CONFIG_BT_ISO_TX_MTU=60
 
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
index 246a62a535f47..5e5b01d942d08 100644
--- a/samples/bluetooth/bap_broadcast_source/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -14,6 +14,17 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     sysbuild: true
+  sample.bluetooth.bap_broadcast_source.nrf5340_audio_dk_cpuapp.fem:
+    harness: bluetooth
+    platform_allow:
+      - nrf5340_audio_dk/nrf5340/cpuapp
+    integration_platforms:
+      - nrf5340_audio_dk/nrf5340/cpuapp
+    extra_args:
+      - DTC_OVERLAY_FILE=boards/nrf5340_audio_dk_nrf5340_cpuapp_nrf21540_ek.overlay
+      - hci_ipc_DTC_OVERLAY_FILE=boards/nrf5340_audio_dk_nrf5340_cpunet_nrf21540_ek.overlay
+    tags: bluetooth
+    sysbuild: true
   sample.bluetooth.bap_broadcast_source.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
diff --git a/samples/bluetooth/bap_broadcast_source/src/main.c b/samples/bluetooth/bap_broadcast_source/src/main.c
index ee8c046130777..30ca1a5026c2b 100644
--- a/samples/bluetooth/bap_broadcast_source/src/main.c
+++ b/samples/bluetooth/bap_broadcast_source/src/main.c
@@ -34,20 +34,6 @@
 
 BUILD_ASSERT(strlen(CONFIG_BROADCAST_CODE) <= BT_ISO_BROADCAST_CODE_SIZE, "Invalid broadcast code");
 
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- *
- * I.e. for a 7.5 ms ISO interval use 90 ms minus 10 ms ==> 80 ms advertising
- * interval.
- * And, for 10 ms ISO interval, can use 90 ms minus 10 ms ==> 80 ms advertising
- * interval.
- */
-#define BT_LE_EXT_ADV_CUSTOM                                                                       \
-	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(80),                      \
-			BT_GAP_MS_TO_ADV_INTERVAL(80), NULL)
-
 /* When BROADCAST_ENQUEUE_COUNT > 1 we can enqueue enough buffers to ensure that
  * the controller is never idle
  */
@@ -462,7 +448,9 @@ static int setup_broadcast_source(struct bt_bap_broadcast_source **source)
 	create_param.params = subgroup_param;
 	create_param.qos = &preset_active.qos;
 	create_param.encryption = strlen(CONFIG_BROADCAST_CODE) > 0;
-	create_param.packing = BT_ISO_PACKING_SEQUENTIAL;
+	create_param.packing = (IS_ENABLED(CONFIG_ISO_PACKING_INTERLEAVED) ?
+				BT_ISO_PACKING_INTERLEAVED :
+				BT_ISO_PACKING_SEQUENTIAL);
 
 	if (create_param.encryption) {
 		memcpy(create_param.broadcast_code, CONFIG_BROADCAST_CODE,
@@ -576,14 +564,14 @@ int main(void)
 		uint32_t broadcast_id;
 
 		/* Create a connectable advertising set */
-		err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CUSTOM, NULL, &adv);
+		err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, &adv);
 		if (err != 0) {
 			printk("Unable to create extended advertising set: %d\n", err);
 			return 0;
 		}
 
 		/* Set periodic advertising parameters */
-		err = bt_le_per_adv_set_param(adv, BT_LE_PER_ADV_DEFAULT);
+		err = bt_le_per_adv_set_param(adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 		if (err) {
 			printk("Failed to set periodic advertising parameters (err %d)\n", err);
 			return 0;
diff --git a/samples/bluetooth/bap_unicast_client/boards/native_sim.conf b/samples/bluetooth/bap_unicast_client/boards/native_sim.conf
index 8ab1d7be11310..87e355c867514 100644
--- a/samples/bluetooth/bap_unicast_client/boards/native_sim.conf
+++ b/samples/bluetooth/bap_unicast_client/boards/native_sim.conf
@@ -6,4 +6,4 @@ CONFIG_FPU=y
 # For LE-audio at 10ms intervals we need the tick counter to occur more frequently
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
+CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/bluetooth/bap_unicast_client/overlay-bt_ll_sw_split.conf b/samples/bluetooth/bap_unicast_client/overlay-bt_ll_sw_split.conf
index 755e7fafa786f..722b8c25ef1ea 100644
--- a/samples/bluetooth/bap_unicast_client/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/bap_unicast_client/overlay-bt_ll_sw_split.conf
@@ -8,6 +8,7 @@ CONFIG_BT_CTLR_ISOAL_SINKS=1
 # packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
 # the optional Time_Stamp field, if supplied)
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=163
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=155
 
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
diff --git a/samples/bluetooth/bap_unicast_client/src/main.c b/samples/bluetooth/bap_unicast_client/src/main.c
index 082b9fe7d528e..fdc0ed249ff9e 100644
--- a/samples/bluetooth/bap_unicast_client/src/main.c
+++ b/samples/bluetooth/bap_unicast_client/src/main.c
@@ -162,8 +162,7 @@ static bool check_audio_support_and_connect(struct bt_data *data,
 	printk("Audio server found with type %u, contexts 0x%08x and meta_len %u; connecting\n",
 	       announcement_type, audio_contexts, meta_len);
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err != 0) {
 		printk("Create conn to failed (%u)\n", err);
diff --git a/samples/bluetooth/bap_unicast_server/boards/native_sim.conf b/samples/bluetooth/bap_unicast_server/boards/native_sim.conf
index 8ab1d7be11310..87e355c867514 100644
--- a/samples/bluetooth/bap_unicast_server/boards/native_sim.conf
+++ b/samples/bluetooth/bap_unicast_server/boards/native_sim.conf
@@ -6,4 +6,4 @@ CONFIG_FPU=y
 # For LE-audio at 10ms intervals we need the tick counter to occur more frequently
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
+CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
index 9b059b92ddc14..a8d2d0a04d6b4 100644
--- a/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -1,6 +1,9 @@
 # For LC3 the following configs are needed
 CONFIG_FPU=y
 CONFIG_LIBLC3=y
+# The LC3 codec uses a large amount of stack. This app runs the codec in the BT RX thread, hence
+# increase stack size for that thread.
+CONFIG_BT_RX_STACK_SIZE=4096
 
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
diff --git a/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf
index 31b3a09380fc7..a8d2d0a04d6b4 100644
--- a/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -1,9 +1,9 @@
 # For LC3 the following configs are needed
 CONFIG_FPU=y
 CONFIG_LIBLC3=y
-# The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
-# inctease stack size for that thread.
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+# The LC3 codec uses a large amount of stack. This app runs the codec in the BT RX thread, hence
+# increase stack size for that thread.
+CONFIG_BT_RX_STACK_SIZE=4096
 
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
diff --git a/samples/bluetooth/bap_unicast_server/overlay-bt_ll_sw_split.conf b/samples/bluetooth/bap_unicast_server/overlay-bt_ll_sw_split.conf
index 8c6d99253a6b8..fd04f621bfd5e 100644
--- a/samples/bluetooth/bap_unicast_server/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/bap_unicast_server/overlay-bt_ll_sw_split.conf
@@ -8,6 +8,7 @@ CONFIG_BT_CTLR_ISOAL_SINKS=2
 # packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
 # the optional Time_Stamp field, if supplied)
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=163
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=155
 
 # Use the below if the sample is sending stale packet sequence number
 # CONFIG_BT_CTLR_ADVANCED_FEATURES=y
diff --git a/samples/bluetooth/bap_unicast_server/prj.conf b/samples/bluetooth/bap_unicast_server/prj.conf
index 566baa8e83075..103858af574b2 100644
--- a/samples/bluetooth/bap_unicast_server/prj.conf
+++ b/samples/bluetooth/bap_unicast_server/prj.conf
@@ -2,9 +2,14 @@ CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_AUDIO=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_ASCS=y
diff --git a/samples/bluetooth/bap_unicast_server/src/main.c b/samples/bluetooth/bap_unicast_server/src/main.c
index cc13491a77d03..cdf3bb01fe69a 100644
--- a/samples/bluetooth/bap_unicast_server/src/main.c
+++ b/samples/bluetooth/bap_unicast_server/src/main.c
@@ -509,7 +509,7 @@ static void stream_recv_lc3_codec(struct bt_bap_stream *stream,
 				  const struct bt_iso_recv_info *info,
 				  struct net_buf *buf)
 {
-	const bool valid_data = (info->flags & BT_ISO_FLAGS_VALID) == 0;
+	const bool valid_data = (info->flags & BT_ISO_FLAGS_VALID) != 0;
 	const int octets_per_frame = buf->len / frames_per_sdu;
 
 	if (lc3_decoder == NULL) {
@@ -778,7 +778,7 @@ int main(void)
 	}
 
 	/* Create a connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, NULL, &adv);
 	if (err) {
 		printk("Failed to create advertising set (err %d)\n", err);
 		return 0;
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index e0bf6d22fb991..f6f08790092fb 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -9,12 +9,14 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     tags: bluetooth
     integration_platforms:
       - qemu_cortex_m3
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
     extra_args: CONF_FILE="prj-coex.conf"
     harness: bluetooth
diff --git a/samples/bluetooth/cap_acceptor/Kconfig b/samples/bluetooth/cap_acceptor/Kconfig
index 9c0ef35140467..9ec0440cef27c 100644
--- a/samples/bluetooth/cap_acceptor/Kconfig
+++ b/samples/bluetooth/cap_acceptor/Kconfig
@@ -7,7 +7,6 @@ config SAMPLE_UNICAST
 	bool "Whether or not to search for CAP acceptors for unicast audio"
 	default y
 	select BT_BAP_UNICAST_SERVER
-	select BT_GATT_CACHING
 	select BT_ISO_PERIPHERAL
 	select BT_ASCS
 	select BT_PAC_SNK
diff --git a/samples/bluetooth/cap_acceptor/overlay-bt_ll_sw_split.conf b/samples/bluetooth/cap_acceptor/overlay-bt_ll_sw_split.conf
index fa88804bece3b..940133b21e5e3 100644
--- a/samples/bluetooth/cap_acceptor/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/cap_acceptor/overlay-bt_ll_sw_split.conf
@@ -9,3 +9,4 @@ CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 # packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
 # the optional Time_Stamp field, if supplied)
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=163
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=155
diff --git a/samples/bluetooth/cap_acceptor/prj.conf b/samples/bluetooth/cap_acceptor/prj.conf
index 816ed1dcc9a79..b2f6b49d671f9 100644
--- a/samples/bluetooth/cap_acceptor/prj.conf
+++ b/samples/bluetooth/cap_acceptor/prj.conf
@@ -1,6 +1,12 @@
 CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_EXT_ADV=y
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index 132ee499c8771..55a9f91099e5b 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -456,5 +456,8 @@ int init_cap_acceptor_unicast(struct peer_config *peer)
 		}
 	}
 
+	k_sem_init(&peer->source_stream_sem, 0, 1);
+	k_sem_init(&peer->sink_stream_sem, 0, 1);
+
 	return 0;
 }
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index d0bc49cd63086..702bd074b326f 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -12,6 +12,7 @@
 
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/cap.h>
 #include <zephyr/bluetooth/audio/lc3.h>
 #include <zephyr/bluetooth/audio/pacs.h>
@@ -104,7 +105,7 @@ static int advertise(void)
 {
 	int err;
 
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, NULL, &adv);
 	if (err) {
 		LOG_ERR("Failed to create advertising set: %d", err);
 
diff --git a/samples/bluetooth/cap_initiator/overlay-bt_ll_sw_split.conf b/samples/bluetooth/cap_initiator/overlay-bt_ll_sw_split.conf
index fa88804bece3b..940133b21e5e3 100644
--- a/samples/bluetooth/cap_initiator/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/cap_initiator/overlay-bt_ll_sw_split.conf
@@ -9,3 +9,4 @@ CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 # packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
 # the optional Time_Stamp field, if supplied)
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=163
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=155
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c
index 7f2cbb1305a6a..55898056e75e2 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_broadcast.c
@@ -73,16 +73,14 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	/* Create a non-connectable non-scannable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, adv);
 	if (err != 0) {
 		LOG_ERR("Unable to create extended advertising set: %d", err);
 		return err;
 	}
 
 	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2,
-								BT_GAP_PER_ADV_FAST_INT_MAX_2,
-								BT_LE_PER_ADV_OPT_NONE));
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 	if (err != 0) {
 		LOG_ERR("Failed to set periodic advertising parameters: %d", err);
 		return err;
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 25dba8cc16d1f..df45dfcadaa48 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -599,7 +599,8 @@ static bool check_audio_support_and_connect_cb(struct bt_data *data, void *user_
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &peer.conn);
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
+				&peer.conn);
 	if (err != 0) {
 		LOG_WRN("Create conn to failed: %d, restarting scan", err);
 		start_scan();
diff --git a/samples/bluetooth/ccp_call_control_client/README.rst b/samples/bluetooth/ccp_call_control_client/README.rst
index db2779297883b..ae27a843a6dfc 100644
--- a/samples/bluetooth/ccp_call_control_client/README.rst
+++ b/samples/bluetooth/ccp_call_control_client/README.rst
@@ -29,7 +29,7 @@ Building and Running
 ********************
 
 When building targeting an nrf52 series board with the Zephyr Bluetooth Controller,
-use ``-DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf`` to enable the required feature support.
+use ``-DEXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf`` to enable the required feature support.
 
 Building for an nrf5340dk
 -------------------------
@@ -75,4 +75,4 @@ Building for a simulated nrf52_bsim
    :zephyr-app: samples/bluetooth/ccp_call_control_client/
    :board: nrf52_bsim
    :goals: build
-   :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+   :gen-args: -DEXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
diff --git a/samples/bluetooth/ccp_call_control_client/sample.yaml b/samples/bluetooth/ccp_call_control_client/sample.yaml
index 88fc3e30aa101..c4e565d1bb6c0 100644
--- a/samples/bluetooth/ccp_call_control_client/sample.yaml
+++ b/samples/bluetooth/ccp_call_control_client/sample.yaml
@@ -26,5 +26,5 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/ccp_call_control_server/README.rst b/samples/bluetooth/ccp_call_control_server/README.rst
index eab3bbbdc0ab9..da8594e034903 100644
--- a/samples/bluetooth/ccp_call_control_server/README.rst
+++ b/samples/bluetooth/ccp_call_control_server/README.rst
@@ -28,7 +28,7 @@ Building and Running
 ********************
 
 When building targeting an nrf52 series board with the Zephyr Bluetooth Controller,
-use ``-DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf`` to enable the required feature support.
+use ``-DEXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf`` to enable the required feature support.
 
 Building for an nrf5340dk
 -------------------------
@@ -74,4 +74,4 @@ Building for a simulated nrf52_bsim
    :zephyr-app: samples/bluetooth/ccp_call_control_server/
    :board: nrf52_bsim
    :goals: build
-   :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+   :gen-args: -DEXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
diff --git a/samples/bluetooth/ccp_call_control_server/sample.yaml b/samples/bluetooth/ccp_call_control_server/sample.yaml
index 501c5b374210d..1e93a6938e5fa 100644
--- a/samples/bluetooth/ccp_call_control_server/sample.yaml
+++ b/samples/bluetooth/ccp_call_control_server/sample.yaml
@@ -26,5 +26,5 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/central/README.rst b/samples/bluetooth/central/README.rst
index 0a47dd07b5c4b..9b67dbd54f55d 100644
--- a/samples/bluetooth/central/README.rst
+++ b/samples/bluetooth/central/README.rst
@@ -2,14 +2,41 @@
    :name: Central
    :relevant-api: bluetooth
 
-   Implement basic Bluetooth LE Central role functionality (scanning and connecting).
+   Implement basic Bluetooth LE Central role functionality
+   (scanning and connecting).
 
 Overview
 ********
 
-Application demonstrating very basic Bluetooth LE Central role functionality by scanning
-for other Bluetooth LE devices and establishing a connection to the first one with a
-strong enough signal.
+This application demonstrates basic Bluetooth LE Central role functionality
+by scanning for other Bluetooth LE devices and establishing a connection
+to the first one with a strong enough signal.
+
+Core features
+*************
+
+Scanning for devices
+====================
+
+The application initiates a passive scan to detect nearby Bluetooth LE devices.
+It specifically looks for devices that have a signal strength greater
+than -50dBm. This threshold helps the app filter out weaker signals,
+ensuring it only interacts with devices that are within a reasonable RSSI
+range for communication.
+
+Connection handling
+===================
+
+1. The Central scans for Peripheral devices and if it finds a Peripheral
+   which has a signal strength higher than -50dBm, an attempt to establish
+   LE connection is made.
+2. If the connection is successful, the Central initiates disconnect to
+   the Peripheral and then restarts the scan.
+3. If there are no connections, the Central keeps scanning continuously.
+
+The sample is used to demonstrate the Central mode capabilities of Bluetooth LE and
+hence a disconnect is issued right immediately after establishing a connection with
+a Peripheral, allowing the Central to resume scanning for other devices.
 
 Requirements
 ************
@@ -17,9 +44,18 @@ Requirements
 * BlueZ running on the host, or
 * A board with Bluetooth LE support
 
-Building and Running
+Building and running
 ********************
-This sample can be found under :zephyr_file:`samples/bluetooth/central` in the
-Zephyr tree.
 
-See :zephyr:code-sample-category:`bluetooth` samples for details.
+Build and flash the sample as follows, replacing board_name with your
+target board:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/bluetooth/central
+   :board: board_name
+   :goals: build flash
+   :compact:
+
+To test Central's scanning functionality, either flash the :zephyr:code-sample:`ble_peripheral`
+sample on a second compatible board or use an off-the-shelf Bluetooth LE enabled
+device that can act as a Peripheral (eg. smartphone, smartwatch, etc.).
diff --git a/samples/bluetooth/central_hr/prj_minimal.conf b/samples/bluetooth/central_hr/prj_minimal.conf
index be0ed341b7833..2a4b31d5f0343 100644
--- a/samples/bluetooth/central_hr/prj_minimal.conf
+++ b/samples/bluetooth/central_hr/prj_minimal.conf
@@ -94,7 +94,7 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=45
-CONFIG_BT_BUF_EVT_RX_COUNT=2
+CONFIG_BT_BUF_EVT_RX_COUNT=4
 
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
 CONFIG_BT_CTLR_RX_BUFFERS=1
diff --git a/samples/bluetooth/channel_sounding/README.rst b/samples/bluetooth/channel_sounding/README.rst
index 8f94a00b78cf7..971e3c4b94077 100644
--- a/samples/bluetooth/channel_sounding/README.rst
+++ b/samples/bluetooth/channel_sounding/README.rst
@@ -37,7 +37,7 @@ connected devices are available in [#cs_setup_phase]_ and [#cs_start]_.
 Requirements
 ************
 
-* Two boards with Bluetooth LE and Channel Sounding support (such as an :ref:`nRF54L15 <nrf54l15dk_nrf54l15>`)
+* Two boards with Bluetooth LE and Channel Sounding support (such as an :zephyr:board:`nrf54l15dk`)
 * A controller that supports the Channel Sounding feature
 
 Building and Running
diff --git a/samples/bluetooth/channel_sounding/include/cs_test_params.h b/samples/bluetooth/channel_sounding/include/cs_test_params.h
index 1171ea1ee1e2d..84931c4533f20 100644
--- a/samples/bluetooth/channel_sounding/include/cs_test_params.h
+++ b/samples/bluetooth/channel_sounding/include/cs_test_params.h
@@ -31,7 +31,7 @@ static struct bt_le_cs_test_param test_params_get(enum bt_conn_le_cs_role role)
 	params.t_fcs_time = 150;
 	params.t_pm_time = 40;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
 
 	params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 	params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
diff --git a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
index 13f23d3c8e05e..5f5250bad2c8c 100644
--- a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
+++ b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
@@ -138,32 +138,54 @@ static void security_changed_cb(struct bt_conn *conn, bt_security_t level, enum
 	k_sem_give(&sem_acl_encryption_enabled);
 }
 
-static void remote_capabilities_cb(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
+static void remote_capabilities_cb(struct bt_conn *conn,
+				   uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params)
 {
 	ARG_UNUSED(params);
-	printk("CS capability exchange completed.\n");
-	k_sem_give(&sem_remote_capabilities_obtained);
+
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS capability exchange completed.\n");
+		k_sem_give(&sem_remote_capabilities_obtained);
+	} else {
+		printk("CS capability exchange failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void config_created_cb(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
+static void config_create_cb(struct bt_conn *conn,
+			     uint8_t status,
+			     struct bt_conn_le_cs_config *config)
 {
-	printk("CS config creation complete. ID: %d\n", config->id);
-	k_sem_give(&sem_config_created);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS config creation complete. ID: %d\n", config->id);
+		k_sem_give(&sem_config_created);
+	} else {
+		printk("CS config creation failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void security_enabled_cb(struct bt_conn *conn)
+static void security_enable_cb(struct bt_conn *conn, uint8_t status)
 {
-	printk("CS security enabled.\n");
-	k_sem_give(&sem_cs_security_enabled);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS security enabled.\n");
+		k_sem_give(&sem_cs_security_enabled);
+	} else {
+		printk("CS security enable failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void procedure_enabled_cb(struct bt_conn *conn,
+static void procedure_enable_cb(struct bt_conn *conn,
+				 uint8_t status,
 				 struct bt_conn_le_cs_procedure_enable_complete *params)
 {
-	if (params->state == 1) {
-		printk("CS procedures enabled.\n");
+	if (status == BT_HCI_ERR_SUCCESS) {
+		if (params->state == 1) {
+			printk("CS procedures enabled.\n");
+		} else {
+			printk("CS procedures disabled.\n");
+		}
 	} else {
-		printk("CS procedures disabled.\n");
+		printk("CS procedures enable failed. (HCI status 0x%02x)\n", status);
 	}
 }
 
@@ -223,10 +245,10 @@ BT_CONN_CB_DEFINE(conn_cb) = {
 	.connected = connected_cb,
 	.disconnected = disconnected_cb,
 	.security_changed = security_changed_cb,
-	.le_cs_remote_capabilities_available = remote_capabilities_cb,
-	.le_cs_config_created = config_created_cb,
-	.le_cs_security_enabled = security_enabled_cb,
-	.le_cs_procedure_enabled = procedure_enabled_cb,
+	.le_cs_read_remote_capabilities_complete = remote_capabilities_cb,
+	.le_cs_config_complete = config_create_cb,
+	.le_cs_security_enable_complete = security_enable_cb,
+	.le_cs_procedure_enable_complete = procedure_enable_cb,
 	.le_cs_subevent_data_available = subevent_result_cb,
 };
 
@@ -329,7 +351,7 @@ int main(void)
 		.max_procedure_count = 0,
 		.min_subevent_len = 6750,
 		.max_subevent_len = 6750,
-		.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE,
+		.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1,
 		.phy = BT_LE_CS_PROCEDURE_PHY_1M,
 		.tx_power_delta = 0x80,
 		.preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1,
diff --git a/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c b/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c
index 2563d6043871f..404ee1ad4e347 100644
--- a/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c
+++ b/samples/bluetooth/channel_sounding/src/connected_cs_reflector.c
@@ -89,32 +89,54 @@ static void disconnected_cb(struct bt_conn *conn, uint8_t reason)
 	connection = NULL;
 }
 
-static void remote_capabilities_cb(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
+static void remote_capabilities_cb(struct bt_conn *conn,
+				   uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params)
 {
 	ARG_UNUSED(params);
-	printk("CS capability exchange completed.\n");
-	k_sem_give(&sem_remote_capabilities_obtained);
+
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS capability exchange completed.\n");
+		k_sem_give(&sem_remote_capabilities_obtained);
+	} else {
+		printk("CS capability exchange failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void config_created_cb(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
+static void config_create_cb(struct bt_conn *conn,
+			     uint8_t status,
+			     struct bt_conn_le_cs_config *config)
 {
-	printk("CS config creation complete. ID: %d\n", config->id);
-	k_sem_give(&sem_config_created);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS config creation complete. ID: %d\n", config->id);
+		k_sem_give(&sem_config_created);
+	} else {
+		printk("CS config creation failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void security_enabled_cb(struct bt_conn *conn)
+static void security_enable_cb(struct bt_conn *conn, uint8_t status)
 {
-	printk("CS security enabled.\n");
-	k_sem_give(&sem_cs_security_enabled);
+	if (status == BT_HCI_ERR_SUCCESS) {
+		printk("CS security enabled.\n");
+		k_sem_give(&sem_cs_security_enabled);
+	} else {
+		printk("CS security enable failed. (HCI status 0x%02x)\n", status);
+	}
 }
 
-static void procedure_enabled_cb(struct bt_conn *conn,
-				 struct bt_conn_le_cs_procedure_enable_complete *params)
+static void procedure_enable_cb(struct bt_conn *conn,
+				uint8_t status,
+				struct bt_conn_le_cs_procedure_enable_complete *params)
 {
-	if (params->state == 1) {
-		printk("CS procedures enabled.\n");
+	if (status == BT_HCI_ERR_SUCCESS) {
+		if (params->state == 1) {
+			printk("CS procedures enabled.\n");
+		} else {
+			printk("CS procedures disabled.\n");
+		}
 	} else {
-		printk("CS procedures disabled.\n");
+		printk("CS procedures enable failed. (HCI status 0x%02x)\n", status);
 	}
 }
 
@@ -160,10 +182,10 @@ static void write_func(struct bt_conn *conn, uint8_t err, struct bt_gatt_write_p
 BT_CONN_CB_DEFINE(conn_cb) = {
 	.connected = connected_cb,
 	.disconnected = disconnected_cb,
-	.le_cs_remote_capabilities_available = remote_capabilities_cb,
-	.le_cs_config_created = config_created_cb,
-	.le_cs_security_enabled = security_enabled_cb,
-	.le_cs_procedure_enabled = procedure_enabled_cb,
+	.le_cs_read_remote_capabilities_complete = remote_capabilities_cb,
+	.le_cs_config_complete = config_create_cb,
+	.le_cs_security_enable_complete = security_enable_cb,
+	.le_cs_procedure_enable_complete = procedure_enable_cb,
 	.le_cs_subevent_data_available = subevent_result_cb,
 };
 
diff --git a/samples/bluetooth/direction_finding_central/README.rst b/samples/bluetooth/direction_finding_central/README.rst
index e6ce68d0352c7..9484092f88532 100644
--- a/samples/bluetooth/direction_finding_central/README.rst
+++ b/samples/bluetooth/direction_finding_central/README.rst
@@ -15,7 +15,7 @@ Requirements
 ************
 
 * Nordic nRF SoC based board with Direction Finding support (example boards:
-  :ref:`nrf52833dk_nrf52833`, :ref:`nrf52833dk_nrf52820`, :ref:`nrf5340dk_nrf5340`)
+  :zephyr:board:`nrf52833dk`, :zephyr:board:`nrf5340dk`)
 * Antenna matrix for AoA (optional)
 
 Check your SoC's product specification for Direction Finding support if you are
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/README.rst b/samples/bluetooth/direction_finding_connectionless_rx/README.rst
index 691e3f7e4eb4b..ec3cbfccf404f 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/README.rst
+++ b/samples/bluetooth/direction_finding_connectionless_rx/README.rst
@@ -15,7 +15,7 @@ Requirements
 ************
 
 * Nordic nRF SoC based board with Direction Finding support (example boards:
-  :ref:`nrf52833dk_nrf52833`, :ref:`nrf5340dk_nrf5340`)
+  :zephyr:board:`nrf52833dk`, :zephyr:board:`nrf5340dk`)
 * Antenna matrix for AoA (optional)
 
 Check your SoC's product specification for Direction Finding support if you are
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/README.rst b/samples/bluetooth/direction_finding_connectionless_tx/README.rst
index 004c50999626e..437f53ee08556 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/README.rst
+++ b/samples/bluetooth/direction_finding_connectionless_tx/README.rst
@@ -14,7 +14,7 @@ Requirements
 ************
 
 * Nordic nRF SoC based board with Direction Finding support (example boards:
-  :ref:`nrf52833dk_nrf52833`, :ref:`nrf5340dk_nrf5340`)
+  :zephyr:board:`nrf52833dk`, :zephyr:board:`nrf5340dk`)
 * Antenna matrix for AoD (optional)
 
 Check your SoC's product specification for Direction Finding support if you are
diff --git a/samples/bluetooth/direction_finding_peripheral/README.rst b/samples/bluetooth/direction_finding_peripheral/README.rst
index a7eb3cdf39888..5bd4ee2a11b2a 100644
--- a/samples/bluetooth/direction_finding_peripheral/README.rst
+++ b/samples/bluetooth/direction_finding_peripheral/README.rst
@@ -14,7 +14,7 @@ Requirements
 ************
 
 * Nordic nRF SoC based board with Direction Finding support (example boards:
-  :ref:`nrf52833dk_nrf52833`, :ref:`nrf52833dk_nrf52820`, :ref:`nrf5340dk_nrf5340`)
+  :zephyr:board:`nrf52833dk`, :zephyr:board:`nrf5340dk`)
 * Antenna matrix for AoA (optional)
 
 Check your SoC's product specification for Direction Finding support if you are
diff --git a/samples/bluetooth/handsfree/src/main.c b/samples/bluetooth/handsfree/src/main.c
index 6aeb7219f0a37..140eed4a350da 100644
--- a/samples/bluetooth/handsfree/src/main.c
+++ b/samples/bluetooth/handsfree/src/main.c
@@ -19,67 +19,103 @@
 #include <zephyr/bluetooth/classic/hfp_hf.h>
 #include <zephyr/settings/settings.h>
 
-static void connected(struct bt_conn *conn)
+static void hf_connected(struct bt_conn *conn, struct bt_hfp_hf *hf)
 {
 	printk("HFP HF Connected!\n");
 }
 
-static void disconnected(struct bt_conn *conn)
+static void hf_disconnected(struct bt_hfp_hf *hf)
 {
 	printk("HFP HF Disconnected!\n");
 }
 
-static void service(struct bt_conn *conn, uint32_t value)
+static void hf_sco_connected(struct bt_hfp_hf *hf, struct bt_conn *sco_conn)
+{
+	printk("HF SCO connected\n");
+}
+
+static void hf_sco_disconnected(struct bt_conn *sco_conn, uint8_t reason)
+{
+	printk("HF SCO disconnected\n");
+}
+
+static void hf_service(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Service indicator value: %u\n", value);
 }
 
-static void call(struct bt_conn *conn, uint32_t value)
+static void hf_outgoing(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call)
+{
+	printk("HF call %p outgoing\n", call);
+}
+
+static void hf_remote_ringing(struct bt_hfp_hf_call *call)
+{
+	printk("HF remote call %p start ringing\n", call);
+}
+
+static void hf_incoming(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call)
+{
+	printk("HF call %p incoming\n", call);
+}
+
+static void hf_incoming_held(struct bt_hfp_hf_call *call)
+{
+	printk("HF call %p is held\n", call);
+}
+
+static void hf_accept(struct bt_hfp_hf_call *call)
 {
-	printk("Call indicator value: %u\n", value);
+	printk("HF call %p accepted\n", call);
 }
 
-static void call_setup(struct bt_conn *conn, uint32_t value)
+static void hf_reject(struct bt_hfp_hf_call *call)
 {
-	printk("Call Setup indicator value: %u\n", value);
+	printk("HF call %p rejected\n", call);
 }
 
-static void call_held(struct bt_conn *conn, uint32_t value)
+static void hf_terminate(struct bt_hfp_hf_call *call)
 {
-	printk("Call Held indicator value: %u\n", value);
+	printk("HF call %p terminated\n", call);
 }
 
-static void signal(struct bt_conn *conn, uint32_t value)
+static void hf_signal(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Signal indicator value: %u\n", value);
 }
 
-static void roam(struct bt_conn *conn, uint32_t value)
+static void hf_roam(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Roaming indicator value: %u\n", value);
 }
 
-static void battery(struct bt_conn *conn, uint32_t value)
+static void hf_battery(struct bt_hfp_hf *hf, uint32_t value)
 {
 	printk("Battery indicator value: %u\n", value);
 }
 
-static void ring_cb(struct bt_conn *conn)
+static void hf_ring_indication(struct bt_hfp_hf_call *call)
 {
-	printk("Incoming Call...\n");
+	printk("HF call %p ring\n", call);
 }
 
 static struct bt_hfp_hf_cb hf_cb = {
-	.connected = connected,
-	.disconnected = disconnected,
-	.service = service,
-	.call = call,
-	.call_setup = call_setup,
-	.call_held = call_held,
-	.signal = signal,
-	.roam = roam,
-	.battery = battery,
-	.ring_indication = ring_cb,
+	.connected = hf_connected,
+	.disconnected = hf_disconnected,
+	.sco_connected = hf_sco_connected,
+	.sco_disconnected = hf_sco_disconnected,
+	.service = hf_service,
+	.outgoing = hf_outgoing,
+	.remote_ringing = hf_remote_ringing,
+	.incoming = hf_incoming,
+	.incoming_held = hf_incoming_held,
+	.accept = hf_accept,
+	.reject = hf_reject,
+	.terminate = hf_terminate,
+	.signal = hf_signal,
+	.roam = hf_roam,
+	.battery = hf_battery,
+	.ring_indication = hf_ring_indication,
 };
 
 static void bt_ready(int err)
@@ -100,7 +136,7 @@ static void bt_ready(int err)
 		printk("BR/EDR set/rest connectable failed (err %d)\n", err);
 		return;
 	}
-	err = bt_br_set_discoverable(true);
+	err = bt_br_set_discoverable(true, false);
 	if (err) {
 		printk("BR/EDR set discoverable failed (err %d)\n", err);
 		return;
diff --git a/samples/bluetooth/handsfree_ag/src/main.c b/samples/bluetooth/handsfree_ag/src/main.c
index a87608c6eaafb..0adbc9515954d 100644
--- a/samples/bluetooth/handsfree_ag/src/main.c
+++ b/samples/bluetooth/handsfree_ag/src/main.c
@@ -25,8 +25,7 @@
 
 static struct bt_conn *default_conn;
 struct bt_hfp_ag *hfp_ag;
-
-static struct bt_br_discovery_param br_discover;
+struct bt_hfp_ag_call *hfp_ag_call;
 
 static struct bt_br_discovery_param br_discover;
 static struct bt_br_discovery_result scan_result[CONFIG_BT_HFP_AG_DISCOVER_RESULT_COUNT];
@@ -41,8 +40,15 @@ struct k_work_delayable call_remote_accept_work;
 NET_BUF_POOL_DEFINE(sdp_discover_pool, 10, BT_L2CAP_BUF_SIZE(CONFIG_BT_L2CAP_TX_MTU),
 		    CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
 
-static void ag_connected(struct bt_hfp_ag *ag)
+static void ag_connected(struct bt_conn *conn, struct bt_hfp_ag *ag)
 {
+	if (conn != default_conn) {
+		printk("The conn %p is not aligned with ACL conn %p", conn, default_conn);
+	}
+
+	if (!hfp_ag) {
+		hfp_ag = ag;
+	}
 	printk("HFP AG connected!\n");
 	k_work_schedule(&call_connect_work, K_MSEC(CONFIG_BT_HFP_AG_START_CALL_DELAY_TIME));
 }
@@ -57,43 +63,45 @@ static void ag_sco_connected(struct bt_hfp_ag *ag, struct bt_conn *sco_conn)
 	printk("HFP AG SCO connected!\n");
 }
 
-static void ag_sco_disconnected(struct bt_hfp_ag *ag)
+static void ag_sco_disconnected(struct bt_conn *sco_conn, uint8_t reason)
 {
-	printk("HFP AG SCO disconnected!\n");
+	printk("HFP AG SCO disconnected %u!\n", reason);
 }
 
-static void ag_ringing(struct bt_hfp_ag *ag, bool in_band)
+static void ag_ringing(struct bt_hfp_ag_call *call, bool in_band)
 {
 	printk("Ringing (in bond? %s)\n", in_band ? "Yes" : "No");
 }
 
-static void ag_accept(struct bt_hfp_ag *ag)
+static void ag_accept(struct bt_hfp_ag_call *call)
 {
 	printk("Call Accepted\n");
 	k_work_schedule(&call_disconnect_work, K_SECONDS(10));
 }
 
-static void ag_reject(struct bt_hfp_ag *ag)
+static void ag_reject(struct bt_hfp_ag_call *call)
 {
 	printk("Call Rejected\n");
 	k_work_schedule(&call_disconnect_work, K_SECONDS(1));
 }
 
-static void ag_terminate(struct bt_hfp_ag *ag)
+static void ag_terminate(struct bt_hfp_ag_call *call)
 {
 	printk("Call terminated\n");
 	k_work_schedule(&call_disconnect_work, K_SECONDS(1));
 }
 
-static void ag_outgoing(struct bt_hfp_ag *ag, const char *number)
+static void ag_outgoing(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number)
 {
+	hfp_ag_call = call;
 	printk("Call outgoing, remote number %s\n", number);
 	k_work_cancel_delayable(&call_connect_work);
 	k_work_schedule(&call_remote_ringing_work, K_SECONDS(1));
 }
 
-static void ag_incoming(struct bt_hfp_ag *ag, const char *number)
+static void ag_incoming(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number)
 {
+	hfp_ag_call = call;
 	printk("Incoming call, remote number %s\n", number);
 	k_work_cancel_delayable(&call_connect_work);
 }
@@ -329,7 +337,7 @@ static void call_remote_ringing_work_handler(struct k_work *work)
 
 	printk("Remote starts ringing\n");
 
-	err = bt_hfp_ag_remote_ringing(hfp_ag);
+	err = bt_hfp_ag_remote_ringing(hfp_ag_call);
 
 	if (err != 0) {
 		printk("Fail to notify hfp unit that the remote starts ringing (err %d)\n", err);
@@ -344,7 +352,7 @@ static void call_remote_accept_work_handler(struct k_work *work)
 
 	printk("Remote accepts the call\n");
 
-	err = bt_hfp_ag_remote_accept(hfp_ag);
+	err = bt_hfp_ag_remote_accept(hfp_ag_call);
 
 	if (err != 0) {
 		printk("Fail to notify hfp unit that the remote accepts call (err %d)\n", err);
diff --git a/samples/bluetooth/hap_ha/prj.conf b/samples/bluetooth/hap_ha/prj.conf
index efd5a4004f9e4..964280e8d9413 100644
--- a/samples/bluetooth/hap_ha/prj.conf
+++ b/samples/bluetooth/hap_ha/prj.conf
@@ -1,8 +1,13 @@
 CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_PRIVACY=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
diff --git a/samples/bluetooth/hap_ha/src/main.c b/samples/bluetooth/hap_ha/src/main.c
index 6053ccf0d6dc6..0822ef95abd50 100644
--- a/samples/bluetooth/hap_ha/src/main.c
+++ b/samples/bluetooth/hap_ha/src/main.c
@@ -107,7 +107,7 @@ static void adv_work_handler(struct k_work *work)
 
 	if (ext_adv == NULL) {
 		/* Create a connectable advertising set */
-		err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, &adv_cb, &ext_adv);
+		err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, &adv_cb, &ext_adv);
 		if (err) {
 			printk("Failed to create advertising set (err %d)\n", err);
 		}
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf
index f58d44035a74d..e1b91fa381ad5 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf
@@ -10,12 +10,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_EVT_RX_COUNT=16
-
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
@@ -106,6 +101,7 @@ CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf
index 8a031231c5a90..89ba46ff357a8 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf
@@ -10,11 +10,6 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=16
 
-
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
 
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf
index db4705c7b1e24..c71e29d0b072f 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf
@@ -10,12 +10,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_EVT_RX_COUNT=16
-
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
@@ -89,7 +84,6 @@ CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CONN_ISO_GROUPS=1
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=2
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
@@ -97,6 +91,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf
index 19adc889598cc..538d965c12add 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf
@@ -10,12 +10,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_EVT_RX_COUNT=16
-
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf
index 6c28a4537e63f..21c5ac86e7c63 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf
@@ -14,12 +14,7 @@ CONFIG_LTO=y
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_EVT_RX_COUNT=16
-
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
@@ -104,6 +99,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_ADV_ISO_SET=1
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=2
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -114,6 +111,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_SYNC_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_CTLR_SYNC_ISO=y
+CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2
@@ -125,7 +124,6 @@ CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CONN_ISO_GROUPS=1
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=2
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
@@ -133,6 +131,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=8
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf
index 0fec7c0d82423..c63928dd27ca5 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf
@@ -10,10 +10,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 # Host and Controller common dependencies
 CONFIG_BT_BROADCASTER=y
 CONFIG_BT_OBSERVER=n
@@ -45,6 +41,7 @@ CONFIG_BT_CTLR_ISOAL_SOURCES=4
 
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf
index 58469a0309bd9..90565665e3a20 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf
@@ -10,10 +10,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
@@ -53,7 +49,6 @@ CONFIG_BT_CTLR_PERIPHERAL_ISO=n
 CONFIG_BT_CTLR_CONN_ISO_GROUPS=1
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=2
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
@@ -61,6 +56,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf
index 1ff7ad685cfd9..9120f5178001f 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf
@@ -10,10 +10,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
@@ -53,7 +49,6 @@ CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CONN_ISO_GROUPS=1
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=2
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
@@ -61,6 +56,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf
index 0375097d09181..ed0ccb14ef77c 100644
--- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf
@@ -10,10 +10,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 # Host and Controller common dependencies
 CONFIG_BT_BROADCASTER=n
 CONFIG_BT_OBSERVER=y
diff --git a/samples/bluetooth/hci_ipc/prj.conf b/samples/bluetooth/hci_ipc/prj.conf
index 08b1aed9e7f60..f73553b47e66a 100644
--- a/samples/bluetooth/hci_ipc/prj.conf
+++ b/samples/bluetooth/hci_ipc/prj.conf
@@ -10,11 +10,6 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=16
 
-
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 # Enable and adjust the below value as necessary
 # CONFIG_BT_BUF_EVT_RX_COUNT=16
 # CONFIG_BT_BUF_EVT_RX_SIZE=255
diff --git a/samples/bluetooth/hci_ipc/src/main.c b/samples/bluetooth/hci_ipc/src/main.c
index 4de71c85e3457..c08a485df1c82 100644
--- a/samples/bluetooth/hci_ipc/src/main.c
+++ b/samples/bluetooth/hci_ipc/src/main.c
@@ -29,6 +29,9 @@
 
 LOG_MODULE_REGISTER(hci_ipc, CONFIG_BT_LOG_LEVEL);
 
+BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_CONN) || IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL),
+	     "HCI IPC driver can drop ACL data without Controller-to-Host ACL flow control");
+
 static struct ipc_ept hci_ept;
 
 static K_THREAD_STACK_DEFINE(tx_thread_stack, CONFIG_BT_HCI_TX_STACK_SIZE);
diff --git a/samples/bluetooth/hci_spi/README.rst b/samples/bluetooth/hci_spi/README.rst
index b29ab85b72ce0..8964b5d6cabc9 100644
--- a/samples/bluetooth/hci_spi/README.rst
+++ b/samples/bluetooth/hci_spi/README.rst
@@ -25,7 +25,7 @@ the host and associates the application with a SPI bus to use.
 
 See :zephyr_file:`boards/nrf51dk_nrf51822.overlay
 <samples/bluetooth/hci_spi/boards/nrf51dk_nrf51822.overlay>` in this sample
-directory for an example overlay for the :ref:`nrf51dk_nrf51822` board.
+directory for an example overlay for the :zephyr:board:`nrf51dk` board.
 
 You can then build this application and flash it onto your board in
 the usual way; see :ref:`boards` for board-specific building and
diff --git a/samples/bluetooth/hci_spi/prj.conf b/samples/bluetooth/hci_spi/prj.conf
index fbab977c26656..54fa4acf0c539 100644
--- a/samples/bluetooth/hci_spi/prj.conf
+++ b/samples/bluetooth/hci_spi/prj.conf
@@ -5,7 +5,3 @@ CONFIG_MAIN_STACK_SIZE=512
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=16
-
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
diff --git a/samples/bluetooth/hci_uart/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/hci_uart/boards/nrf5340dk_nrf5340_cpuapp.conf
new file mode 100644
index 0000000000000..b290e9f8eebfe
--- /dev/null
+++ b/samples/bluetooth/hci_uart/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1,16 @@
+# Host and Controller common dependencies
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+CONFIG_BT_PER_ADV_SYNC_MAX=2
+
+# Broadcast and Connected ISO
+CONFIG_BT_ISO_BROADCASTER=y
+CONFIG_BT_ISO_SYNC_RECEIVER=y
+CONFIG_BT_ISO_CENTRAL=y
+CONFIG_BT_ISO_PERIPHERAL=y
+
+# ISO Streams
+CONFIG_BT_ISO_MAX_CHAN=4
+CONFIG_BT_ISO_TX_BUF_COUNT=18
+CONFIG_BT_ISO_RX_BUF_COUNT=1
diff --git a/samples/bluetooth/hci_uart/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/bluetooth/hci_uart/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..32ba783784003
--- /dev/null
+++ b/samples/bluetooth/hci_uart/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&uart20 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
+	status = "okay";
+	hw-flow-control;
+};
diff --git a/samples/bluetooth/hci_uart/boards/panb511evb_nrf54l15_cpuapp.overlay b/samples/bluetooth/hci_uart/boards/panb511evb_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..fde3e0775dd3b
--- /dev/null
+++ b/samples/bluetooth/hci_uart/boards/panb511evb_nrf54l15_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&uart30 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
+	status = "okay";
+	hw-flow-control;
+};
diff --git a/samples/bluetooth/hci_uart/boards/panb511evb_nrf54l15_cpuapp_df.overlay b/samples/bluetooth/hci_uart/boards/panb511evb_nrf54l15_cpuapp_df.overlay
new file mode 100644
index 0000000000000..0d2af26d4ed7b
--- /dev/null
+++ b/samples/bluetooth/hci_uart/boards/panb511evb_nrf54l15_cpuapp_df.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&uart30 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
+	status = "okay";
+	hw-flow-control;
+};
+
+&radio {
+	status = "okay";
+	/* This is an example number of antennas that may be available
+	 * on antenna matrix board.
+	 */
+	dfe-antenna-num = <10>;
+	/* This is an example switch pattern that will be used to set an
+	 * antenna for Tx PDU (period before start of Tx CTE).
+	 */
+	dfe-pdu-antenna = <0x0>;
+
+	/* These are example GPIO pin numbers that are provided to
+	 * Radio peripheral. The pins will be acquired by Radio to
+	 * drive antenna switching when AoD is enabled.
+	 */
+	dfegpio0-gpios = <&gpio1 4 0>;
+	dfegpio1-gpios = <&gpio1 5 0>;
+	dfegpio2-gpios = <&gpio1 6 0>;
+	dfegpio3-gpios = <&gpio1 7 0>;
+};
diff --git a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf
index a4054de093452..18c87bc0c1831 100644
--- a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf
@@ -94,6 +94,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_ADV_ISO_SET=2
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -104,6 +106,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_SYNC_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_CTLR_SYNC_ISO=y
+CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2
@@ -115,7 +119,6 @@ CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=2
 CONFIG_BT_CTLR_CONN_ISO_GROUPS=1
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
@@ -123,6 +126,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=18
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
diff --git a/samples/bluetooth/hci_uart/prj.conf b/samples/bluetooth/hci_uart/prj.conf
index bb4a25b2886b0..b5b1a30fee624 100644
--- a/samples/bluetooth/hci_uart/prj.conf
+++ b/samples/bluetooth/hci_uart/prj.conf
@@ -16,7 +16,3 @@ CONFIG_BT_MAX_CONN=16
 CONFIG_BT_CTLR_DTM_HCI=y
 
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
-
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
diff --git a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf
index 8a0f9d3364acc..72dd6caa609d5 100644
--- a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf
+++ b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf
@@ -93,6 +93,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_ADV_ISO_SET=2
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -103,6 +105,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_SYNC_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_CTLR_SYNC_ISO=y
+CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2
@@ -114,7 +118,6 @@ CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=2
 CONFIG_BT_CTLR_CONN_ISO_GROUPS=1
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
@@ -122,6 +125,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=18
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
diff --git a/samples/bluetooth/hci_uart_3wire/prj.conf b/samples/bluetooth/hci_uart_3wire/prj.conf
index d9a03554f9fd3..b8fb9fef61faa 100644
--- a/samples/bluetooth/hci_uart_3wire/prj.conf
+++ b/samples/bluetooth/hci_uart_3wire/prj.conf
@@ -15,7 +15,3 @@ CONFIG_BT_MAX_CONN=16
 CONFIG_BT_CTLR_DTM_HCI=y
 
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
-
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
diff --git a/samples/bluetooth/hci_usb/README.rst b/samples/bluetooth/hci_usb/README.rst
index c8ac294a72fc2..c87dbb0e013e7 100644
--- a/samples/bluetooth/hci_usb/README.rst
+++ b/samples/bluetooth/hci_usb/README.rst
@@ -8,7 +8,7 @@ Overview
 ********
 
 Make a USB Bluetooth dongle out of Zephyr. Requires USB device support from the
-board it runs on (e.g. :ref:`nrf52840dk_nrf52840` supports both Bluetooth LE and USB).
+board it runs on (e.g. :zephyr:board:`nrf52840dk` supports both Bluetooth LE and USB).
 
 Requirements
 ************
diff --git a/samples/bluetooth/hci_usb/prj.conf b/samples/bluetooth/hci_usb/prj.conf
index 0f809e424d6dc..7f0a2d9fe6aa3 100644
--- a/samples/bluetooth/hci_usb/prj.conf
+++ b/samples/bluetooth/hci_usb/prj.conf
@@ -11,7 +11,3 @@ CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 CONFIG_SERIAL=n
 CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
-
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
diff --git a/samples/bluetooth/iso_broadcast/Kconfig b/samples/bluetooth/iso_broadcast/Kconfig
index 21df24566f6b9..0183fa782c830 100644
--- a/samples/bluetooth/iso_broadcast/Kconfig
+++ b/samples/bluetooth/iso_broadcast/Kconfig
@@ -1,13 +1,18 @@
 # Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-source "Kconfig.zephyr"
-
 mainmenu "Bluetooth: ISO Broadcast"
 
+config ISO_PACKING_INTERLEAVED
+	bool "Use interleaved packing"
+	help
+	  Use interleaved packing between BIS ISO stream subevents.
+
 config ISO_PRINT_INTERVAL
 	int "Interval between each packet report"
 	range 1 360000
 	default 1
 	help
 	  Only print the packet report once in a given interval of ISO packets.
+
+source "Kconfig.zephyr"
diff --git a/samples/bluetooth/iso_broadcast/README.rst b/samples/bluetooth/iso_broadcast/README.rst
index 79eae0e3a7d53..3662230ca2b22 100644
--- a/samples/bluetooth/iso_broadcast/README.rst
+++ b/samples/bluetooth/iso_broadcast/README.rst
@@ -24,6 +24,8 @@ Building and Running
 This sample can be found under :zephyr_file:`samples/bluetooth/iso_broadcast` in
 the Zephyr tree. Use ``-DEXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf`` to enable
 required ISO feature support in Zephyr Bluetooth Controller on supported boards.
+The sample defaults to sequential packing of BIS subevents, add
+``-DCONFIG_ISO_PACKING_INTERLEAVED=y`` to use interleaved packing.
 
 Use the sample found under :zephyr_file:`samples/bluetooth/iso_receive` in the
 Zephyr tree that will scan, establish a periodic advertising synchronization,
diff --git a/samples/bluetooth/iso_broadcast/overlay-bt_ll_sw_split.conf b/samples/bluetooth/iso_broadcast/overlay-bt_ll_sw_split.conf
index 19264a9d041af..0f8fa6c128c30 100644
--- a/samples/bluetooth/iso_broadcast/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/iso_broadcast/overlay-bt_ll_sw_split.conf
@@ -6,6 +6,8 @@ CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 
 # Enable support for Broadcast ISO in Zephyr Bluetooth Controller
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 
 # Sufficient ISO PDU length for this sample
 CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=4
@@ -14,7 +16,6 @@ CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
 
-# Support the highest SDU size required by any BAP LC3 presets (155) + 8 bytes of HCI ISO Data
-# packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
-# the optional Time_Stamp field, if supplied)
+# Support the highest SDU size required by this sample
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=12
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=4
diff --git a/samples/bluetooth/iso_broadcast/prj.conf b/samples/bluetooth/iso_broadcast/prj.conf
index 8a9a5f196918b..d6d4c9936ce53 100644
--- a/samples/bluetooth/iso_broadcast/prj.conf
+++ b/samples/bluetooth/iso_broadcast/prj.conf
@@ -6,5 +6,9 @@ CONFIG_BT_DEVICE_NAME="Test ISO Broadcaster"
 CONFIG_BT_ISO_MAX_CHAN=2
 CONFIG_BT_ISO_TX_BUF_COUNT=4
 
+# This sample defaults to sequential packing.
+# Uncomment below to use Broadcast ISO interleaved packing.
+# CONFIG_ISO_PACKING_INTERLEAVED=y
+
 # Just needs to send a uint32_t value
 CONFIG_BT_ISO_TX_MTU=4
diff --git a/samples/bluetooth/iso_broadcast/src/main.c b/samples/bluetooth/iso_broadcast/src/main.c
index da06a9c417df7..5f7296b28dbfa 100644
--- a/samples/bluetooth/iso_broadcast/src/main.c
+++ b/samples/bluetooth/iso_broadcast/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/sys/byteorder.h>
 
@@ -31,10 +32,21 @@ static uint16_t seq_num;
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	printk("ISO Channel %p connected\n", chan);
 
 	seq_num = 0U;
 
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+	if (err != 0) {
+		printk("Failed to setup ISO TX data path: %d\n", err);
+	}
+
 	k_sem_give(&sem_big_cmplt);
 }
 
@@ -81,7 +93,9 @@ static struct bt_iso_big_create_param big_create_param = {
 	.bis_channels = bis,
 	.interval = BIG_SDU_INTERVAL_US, /* in microseconds */
 	.latency = 10, /* in milliseconds */
-	.packing = 0, /* 0 - sequential, 1 - interleaved */
+	.packing = (IS_ENABLED(CONFIG_ISO_PACKING_INTERLEAVED) ?
+		    BT_ISO_PACKING_INTERLEAVED :
+		    BT_ISO_PACKING_SEQUENTIAL),
 	.framing = 0, /* 0 - unframed, 1 - framed */
 };
 
diff --git a/samples/bluetooth/iso_broadcast_benchmark/src/broadcaster.c b/samples/bluetooth/iso_broadcast_benchmark/src/broadcaster.c
index 4665eed3ca870..3f12619ed81e6 100644
--- a/samples/bluetooth/iso_broadcast_benchmark/src/broadcaster.c
+++ b/samples/bluetooth/iso_broadcast_benchmark/src/broadcaster.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/console/console.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/iso.h>
@@ -72,8 +73,19 @@ static const struct bt_data ad[] = {
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	LOG_INF("ISO Channel %p connected", chan);
 
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+	if (err != 0) {
+		printk("Failed to setup ISO TX data path: %d\n", err);
+	}
+
 	connected_bis++;
 	if (connected_bis == big_create_param.num_bis) {
 		seq_num = 0U;
diff --git a/samples/bluetooth/iso_broadcast_benchmark/src/receiver.c b/samples/bluetooth/iso_broadcast_benchmark/src/receiver.c
index af684cecc52f3..45efaf66a4bbb 100644
--- a/samples/bluetooth/iso_broadcast_benchmark/src/receiver.c
+++ b/samples/bluetooth/iso_broadcast_benchmark/src/receiver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/console/console.h>
@@ -229,10 +230,21 @@ static void iso_recv(struct bt_iso_chan *chan,
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	LOG_INF("ISO Channel %p connected", chan);
 
 	big_sync_start_time = k_uptime_get();
 
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+	if (err != 0) {
+		printk("Failed to setup ISO RX data path: %d\n", err);
+	}
+
 	k_sem_give(&sem_big_sync);
 }
 
diff --git a/samples/bluetooth/iso_central/overlay-bt_ll_sw_split.conf b/samples/bluetooth/iso_central/overlay-bt_ll_sw_split.conf
index 320c5c352b116..2c91650470dff 100644
--- a/samples/bluetooth/iso_central/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/iso_central/overlay-bt_ll_sw_split.conf
@@ -13,7 +13,7 @@ CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650
 CONFIG_BT_CTLR_RX_BUFFERS=9
 
 # Sufficient ISO SDU and PDU length for this sample with ISO_TX_MTU of 247
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 
 # Number of supported streami sources and sinks
diff --git a/samples/bluetooth/iso_central/src/main.c b/samples/bluetooth/iso_central/src/main.c
index a9352363714c8..24b2f0d066829 100644
--- a/samples/bluetooth/iso_central/src/main.c
+++ b/samples/bluetooth/iso_central/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/settings/settings.h>
 #include <zephyr/sys/byteorder.h>
@@ -142,18 +143,36 @@ static void start_scan(void)
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	printk("ISO Channel %p connected\n", chan);
 
 	seq_num = 0U;
 
-	/* Start send timer */
-	k_work_schedule(&iso_send_work, K_MSEC(0));
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+	if (err != 0) {
+		printk("Failed to setup ISO TX data path: %d\n", err);
+	} else {
+		/* Start send timer */
+		k_work_schedule(&iso_send_work, K_NO_WAIT);
+	}
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 {
+	int err;
+
 	printk("ISO Channel %p disconnected (reason 0x%02x)\n", chan, reason);
 	k_work_cancel_delayable(&iso_send_work);
+
+	err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR);
+	if (err != 0) {
+		printk("Failed to setup ISO TX data path: %d\n", err);
+	}
 }
 
 static struct bt_iso_chan_ops iso_ops = {
@@ -165,7 +184,6 @@ static struct bt_iso_chan_io_qos iso_tx = {
 	.sdu = CONFIG_BT_ISO_TX_MTU,
 	.phy = BT_GAP_LE_PHY_2M,
 	.rtn = 1,
-	.path = NULL,
 };
 
 static struct bt_iso_chan_qos iso_qos = {
diff --git a/samples/bluetooth/iso_connected_benchmark/src/main.c b/samples/bluetooth/iso_connected_benchmark/src/main.c
index 1933033f8442b..c6c807125ad6b 100644
--- a/samples/bluetooth/iso_connected_benchmark/src/main.c
+++ b/samples/bluetooth/iso_connected_benchmark/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/kernel.h>
 #include <string.h>
 #include <stdint.h>
@@ -306,7 +307,12 @@ static void iso_recv(struct bt_iso_chan *chan,
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
 	struct iso_chan_work *chan_work;
+	struct bt_iso_info iso_info;
 	int err;
 
 	LOG_INF("ISO Channel %p connected", chan);
@@ -325,6 +331,20 @@ static void iso_connected(struct bt_iso_chan *chan)
 	chan_work = CONTAINER_OF(chan, struct iso_chan_work, chan);
 	chan_work->seq_num = 0U;
 
+	if (iso_info.can_recv) {
+		err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+		if (err != 0) {
+			LOG_ERR("Failed to setup ISO RX data path: %d", err);
+		}
+	}
+
+	if (iso_info.can_send) {
+		err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+		if (err != 0) {
+			LOG_ERR("Failed to setup ISO TX data path: %d", err);
+		}
+	}
+
 	k_sem_give(&sem_iso_connected);
 }
 
@@ -337,8 +357,10 @@ static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 	 * of the last created CIS.
 	 */
 	static int64_t average_duration;
+	struct bt_iso_info iso_info;
 	uint64_t iso_conn_duration;
 	uint64_t total_duration;
+	int err;
 
 	if (iso_conn_start_time > 0) {
 		iso_conn_duration = k_uptime_get() - iso_conn_start_time;
@@ -354,6 +376,25 @@ static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 		chan, reason, iso_conn_duration, average_duration);
 
 	k_sem_give(&sem_iso_disconnected);
+
+	err = bt_iso_chan_get_info(chan, &iso_info);
+	if (err != 0) {
+		LOG_ERR("Failed to get ISO info: %d\n", err);
+	} else if (iso_info.type == BT_ISO_CHAN_TYPE_CENTRAL) {
+		if (iso_info.can_recv) {
+			err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST);
+			if (err != 0) {
+				LOG_ERR("Failed to remove ISO RX data path: %d\n", err);
+			}
+		}
+
+		if (iso_info.can_send) {
+			err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR);
+			if (err != 0) {
+				LOG_ERR("Failed to remove ISO TX data path: %d\n", err);
+			}
+		}
+	}
 }
 
 static struct bt_iso_chan_ops iso_ops = {
diff --git a/samples/bluetooth/iso_peripheral/src/main.c b/samples/bluetooth/iso_peripheral/src/main.c
index d11baa9633fa2..47d69595b5e38 100644
--- a/samples/bluetooth/iso_peripheral/src/main.c
+++ b/samples/bluetooth/iso_peripheral/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,6 +15,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/settings/settings.h>
 
@@ -104,7 +105,18 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	printk("ISO Channel %p connected\n", chan);
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+	if (err != 0) {
+		printk("Failed to setup ISO RX data path: %d", err);
+	}
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
@@ -120,7 +132,6 @@ static struct bt_iso_chan_ops iso_ops = {
 
 static struct bt_iso_chan_io_qos iso_rx = {
 	.sdu = CONFIG_BT_ISO_TX_MTU,
-	.path = NULL,
 };
 
 static struct bt_iso_chan_qos iso_qos = {
diff --git a/samples/bluetooth/iso_receive/src/main.c b/samples/bluetooth/iso_receive/src/main.c
index e51bbe6d34be1..81f2b80da663b 100644
--- a/samples/bluetooth/iso_receive/src/main.c
+++ b/samples/bluetooth/iso_receive/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2024 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,6 +9,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/sys/byteorder.h>
 
@@ -233,7 +234,19 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	printk("ISO Channel %p connected\n", chan);
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+	if (err != 0) {
+		printk("Failed to setup ISO RX data path: %d\n", err);
+	}
+
 	k_sem_give(&sem_big_sync);
 }
 
diff --git a/samples/bluetooth/mesh/README.rst b/samples/bluetooth/mesh/README.rst
index 1d884bc0d0204..0d131a864be4f 100644
--- a/samples/bluetooth/mesh/README.rst
+++ b/samples/bluetooth/mesh/README.rst
@@ -45,7 +45,7 @@ For other boards, build and flash the application as follows:
 Refer to your :ref:`board's documentation <boards>` for alternative
 flash instructions if your board doesn't support the ``flash`` target.
 
-To run the application on an :ref:`nrf5340dk_nrf5340`, a Bluetooth controller application
+To run the application on an :zephyr:board:`nrf5340dk`, a Bluetooth controller application
 must also run on the network core. The :zephyr:code-sample:`bluetooth_hci_ipc` sample
 application may be used. Build this sample with configuration
 :zephyr_file:`samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf`
diff --git a/samples/bluetooth/mesh/boards/bbc_microbit.conf b/samples/bluetooth/mesh/boards/bbc_microbit.conf
index 053053e781878..d71bc9400ae70 100644
--- a/samples/bluetooth/mesh/boards/bbc_microbit.conf
+++ b/samples/bluetooth/mesh/boards/bbc_microbit.conf
@@ -13,9 +13,11 @@ CONFIG_BT_PERIPHERAL=n
 CONFIG_BT_EXT_ADV=n
 CONFIG_BT_RX_STACK_SIZE=1100
 CONFIG_BT_BUF_EVT_RX_COUNT=3
-CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=3
 
+# CONFIG_BT_BUF_ACL_TX_COUNT has to be less than CONFIG_BT_BUF_EVT_RX_COUNT
+CONFIG_BT_BUF_ACL_TX_COUNT=1
+
 CONFIG_BT_CTLR_ADV_EXT=n
 
 CONFIG_BT_MESH_ADV_BUF_COUNT=3
diff --git a/samples/bluetooth/mesh_demo/README.rst b/samples/bluetooth/mesh_demo/README.rst
index 070dd5a45a483..44be6e907823f 100644
--- a/samples/bluetooth/mesh_demo/README.rst
+++ b/samples/bluetooth/mesh_demo/README.rst
@@ -56,7 +56,7 @@ For other boards, build and flash the application as follows:
 Refer to your :ref:`board's documentation <boards>` for alternative
 flash instructions if your board doesn't support the ``flash`` target.
 
-To run the application on an :ref:`nrf5340dk_nrf5340`, a Bluetooth controller application
+To run the application on an :zephyr:board:`nrf5340dk`, a Bluetooth controller application
 must also run on the network core. The :zephyr:code-sample:`bluetooth_hci_ipc` sample
 application may be used. Build this sample with configuration
 :zephyr_file:`samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf`
diff --git a/samples/bluetooth/mesh_provisioner/README.rst b/samples/bluetooth/mesh_provisioner/README.rst
index 10600ef89f353..db693735d6ded 100644
--- a/samples/bluetooth/mesh_provisioner/README.rst
+++ b/samples/bluetooth/mesh_provisioner/README.rst
@@ -54,7 +54,7 @@ For other boards, build and flash the application as follows:
 Refer to your :ref:`board's documentation <boards>` for alternative
 flash instructions if your board doesn't support the ``flash`` target.
 
-To run the application on an :ref:`nrf5340dk_nrf5340`, a Bluetooth controller application
+To run the application on an :zephyr:board:`nrf5340dk`, a Bluetooth controller application
 must also run on the network core. The :zephyr:code-sample:`bluetooth_hci_ipc` sample
 application may be used. Build this sample with configuration
 :zephyr_file:`samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf`
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf
index 1cc458a47988b..b2054ce9be30f 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf
+++ b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf
@@ -10,7 +10,6 @@ CONFIG_UTF8=y
 CONFIG_BT_SMP=y
 CONFIG_BT_KEYS_OVERWRITE_OLDEST=y
 CONFIG_BT_L2CAP_TX_BUF_COUNT=20
-CONFIG_BT_HCI_ACL_FLOW_CONTROL=n
 CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=196
 
 # CAP
diff --git a/samples/bluetooth/pbp_public_broadcast_source/overlay-bt_ll_sw_split.conf b/samples/bluetooth/pbp_public_broadcast_source/overlay-bt_ll_sw_split.conf
index 3711a34921368..4e873d42cb220 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/overlay-bt_ll_sw_split.conf
+++ b/samples/bluetooth/pbp_public_broadcast_source/overlay-bt_ll_sw_split.conf
@@ -6,6 +6,8 @@ CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 
 # Enable support for Broadcast ISO in Zephyr Bluetooth Controller
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 
 # Sufficient ISO PDU length for any BAP LC3 presets (155)
 CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=155
@@ -18,3 +20,4 @@ CONFIG_BT_CTLR_ISOAL_SOURCES=2
 # packet overhead (the Packet_Sequence_Number, ISO_SDU_Length, Packet_Status_Flag fields; and
 # the optional Time_Stamp field, if supplied)
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=163
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=155
diff --git a/samples/bluetooth/pbp_public_broadcast_source/prj.conf b/samples/bluetooth/pbp_public_broadcast_source/prj.conf
index 004e1832b64a4..d7d6e9fe66769 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/prj.conf
+++ b/samples/bluetooth/pbp_public_broadcast_source/prj.conf
@@ -10,7 +10,6 @@ CONFIG_BT_ISO_MAX_CHAN=2
 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=2
 CONFIG_BT_ISO_TX_BUF_COUNT=4
-CONFIG_BT_HCI_ACL_FLOW_CONTROL=n
 
 # PBP support
 CONFIG_BT_PBP=y
diff --git a/samples/bluetooth/pbp_public_broadcast_source/src/main.c b/samples/bluetooth/pbp_public_broadcast_source/src/main.c
index b996889190c53..2f97db6922027 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/src/main.c
+++ b/samples/bluetooth/pbp_public_broadcast_source/src/main.c
@@ -150,7 +150,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, adv);
 	if (err != 0) {
 		printk("Unable to create extended advertising set: %d\n", err);
 
@@ -166,7 +166,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	}
 
 	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 	if (err) {
 		printk("Failed to set periodic advertising parameters: %d\n", err);
 
diff --git a/samples/bluetooth/peripheral_dis/prj.conf b/samples/bluetooth/peripheral_dis/prj.conf
index 4fed0a4e66fe7..c6f74dba8c5af 100644
--- a/samples/bluetooth/peripheral_dis/prj.conf
+++ b/samples/bluetooth/peripheral_dis/prj.conf
@@ -3,17 +3,38 @@ CONFIG_BT_PERIPHERAL=y
 
 CONFIG_BT_DIS=y
 CONFIG_BT_DIS_PNP=n
-CONFIG_BT_DIS_MODEL="Zephyr Model"
-CONFIG_BT_DIS_MANUF="Zephyr"
+CONFIG_BT_DIS_MODEL_NUMBER=y
+CONFIG_BT_DIS_MANUF_NAME=y
 CONFIG_BT_DIS_SERIAL_NUMBER=y
 CONFIG_BT_DIS_FW_REV=y
 CONFIG_BT_DIS_HW_REV=y
 CONFIG_BT_DIS_SW_REV=y
+CONFIG_BT_DIS_MODEL_NUMBER_STR="Zephyr Model"
+CONFIG_BT_DIS_MANUF_NAME_STR="Zephyr"
 CONFIG_BT_DIS_SERIAL_NUMBER_STR="Zephyr Serial"
 CONFIG_BT_DIS_FW_REV_STR="Zephyr Firmware"
 CONFIG_BT_DIS_HW_REV_STR="Zephyr Hardware"
 CONFIG_BT_DIS_SW_REV_STR="Zephyr Software"
 
+CONFIG_BT_DIS_UDI=y
+CONFIG_BT_DIS_UDI_LABEL_STR="Zephyr Test UDI Label"
+CONFIG_BT_DIS_UDI_DI_STR="(01)0123456789ABCD(11)241125(17)341125(10)A1234(21)0123456789"
+CONFIG_BT_DIS_UDI_ISSUER_STR="1.3.6.1.4.1.99999"
+CONFIG_BT_DIS_UDI_AUTHORITY_STR="1.3.6.1.4.1.99999"
+
+CONFIG_BT_DIS_PNP=y
+CONFIG_BT_DIS_PNP_VID_SRC=1
+CONFIG_BT_DIS_PNP_VID=0xFFFF
+CONFIG_BT_DIS_PNP_PID=0xFFFF
+CONFIG_BT_DIS_PNP_VER=0
+
+CONFIG_BT_DIS_SYSTEM_ID=y
+CONFIG_BT_DIS_SYSTEM_ID_OUI=0xFFFFFF
+CONFIG_BT_DIS_SYSTEM_ID_IDENTIFIER=0xFFFFFFFFFF
+
+CONFIG_BT_DIS_IEEE_RCDL=y
+CONFIG_BT_DIS_IEEE_RCDL_STR="Zephyr Test IEEE RCDL"
+
 CONFIG_BT_DEVICE_NAME="DIS peripheral"
 
 # Below is setup to let DIS information be read from settings
@@ -23,4 +44,4 @@ CONFIG_SETTINGS=y
 CONFIG_SETTINGS_NONE=y
 
 CONFIG_BT_DIS_SETTINGS=y
-CONFIG_BT_DIS_STR_MAX=21
+CONFIG_BT_DIS_STR_MAX=100
diff --git a/samples/bluetooth/peripheral_dis/sample.yaml b/samples/bluetooth/peripheral_dis/sample.yaml
index 0521956f6e13d..7a2bc6ca023b2 100644
--- a/samples/bluetooth/peripheral_dis/sample.yaml
+++ b/samples/bluetooth/peripheral_dis/sample.yaml
@@ -7,6 +7,7 @@ tests:
     platform_allow:
       - qemu_cortex_m3
       - qemu_x86
+      - ophelia4ev/nrf54l15/cpuapp
     tags: bluetooth
     integration_platforms:
       - qemu_cortex_m3
diff --git a/samples/bluetooth/peripheral_hr/prj_minimal.conf b/samples/bluetooth/peripheral_hr/prj_minimal.conf
index 203ab47808dfd..5e3f92c91cb1c 100644
--- a/samples/bluetooth/peripheral_hr/prj_minimal.conf
+++ b/samples/bluetooth/peripheral_hr/prj_minimal.conf
@@ -100,7 +100,7 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=45
-CONFIG_BT_BUF_EVT_RX_COUNT=2
+CONFIG_BT_BUF_EVT_RX_COUNT=4
 
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
 CONFIG_BT_CTLR_RX_BUFFERS=1
diff --git a/samples/bluetooth/peripheral_hr/sample.yaml b/samples/bluetooth/peripheral_hr/sample.yaml
index b233fb48abc49..8b0722d169fde 100644
--- a/samples/bluetooth/peripheral_hr/sample.yaml
+++ b/samples/bluetooth/peripheral_hr/sample.yaml
@@ -14,6 +14,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - qemu_cortex_m3
       - nrf52_bsim
@@ -23,6 +24,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     tags: bluetooth
   sample.bluetooth.peripheral_hr.minimal:
     harness: bluetooth
diff --git a/samples/bluetooth/peripheral_nus/sample.yaml b/samples/bluetooth/peripheral_nus/sample.yaml
index af70193ec1e0b..0bb22b190e3e7 100644
--- a/samples/bluetooth/peripheral_nus/sample.yaml
+++ b/samples/bluetooth/peripheral_nus/sample.yaml
@@ -8,6 +8,7 @@ tests:
       - qemu_cortex_m3
       - qemu_x86
       - nrf52840dk/nrf52840
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - qemu_cortex_m3
     tags: bluetooth
diff --git a/samples/bluetooth/tmap_bmr/boards/native_posix.conf b/samples/bluetooth/tmap_bmr/boards/native_posix.conf
deleted file mode 100644
index 8ab1d7be11310..0000000000000
--- a/samples/bluetooth/tmap_bmr/boards/native_posix.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_LOG_MODE_IMMEDIATE=y
-
-CONFIG_LIBLC3=y
-CONFIG_FPU=y
-
-# For LE-audio at 10ms intervals we need the tick counter to occur more frequently
-# than every 10 ms as each PDU for some reason takes 2 ticks to process.
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/bluetooth/tmap_bms/boards/native_posix.conf b/samples/bluetooth/tmap_bms/boards/native_posix.conf
deleted file mode 100644
index 8ab1d7be11310..0000000000000
--- a/samples/bluetooth/tmap_bms/boards/native_posix.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_LOG_MODE_IMMEDIATE=y
-
-CONFIG_LIBLC3=y
-CONFIG_FPU=y
-
-# For LE-audio at 10ms intervals we need the tick counter to occur more frequently
-# than every 10 ms as each PDU for some reason takes 2 ticks to process.
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/bluetooth/tmap_bms/src/cap_initiator.c b/samples/bluetooth/tmap_bms/src/cap_initiator.c
index 0a81a3026cd91..c8b701d62a725 100644
--- a/samples/bluetooth/tmap_bms/src/cap_initiator.c
+++ b/samples/bluetooth/tmap_bms/src/cap_initiator.c
@@ -137,7 +137,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_BROADCAST_FAST, NULL, adv);
 	if (err != 0) {
 		printk("Unable to create extended advertising set: %d\n", err);
 		return err;
@@ -151,7 +151,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	}
 
 	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_FAST);
 	if (err) {
 		printk("Failed to set periodic advertising parameters: %d\n",
 		       err);
diff --git a/samples/bluetooth/tmap_central/boards/native_posix.conf b/samples/bluetooth/tmap_central/boards/native_posix.conf
deleted file mode 100644
index 8ab1d7be11310..0000000000000
--- a/samples/bluetooth/tmap_central/boards/native_posix.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_LOG_MODE_IMMEDIATE=y
-
-CONFIG_LIBLC3=y
-CONFIG_FPU=y
-
-# For LE-audio at 10ms intervals we need the tick counter to occur more frequently
-# than every 10 ms as each PDU for some reason takes 2 ticks to process.
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/bluetooth/tmap_central/src/main.c b/samples/bluetooth/tmap_central/src/main.c
index 4c47e232bc08b..a4f426f92762f 100644
--- a/samples/bluetooth/tmap_central/src/main.c
+++ b/samples/bluetooth/tmap_central/src/main.c
@@ -188,8 +188,7 @@ static bool check_audio_support_and_connect(struct bt_data *data, void *user_dat
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err != 0) {
 		printk("Create conn to failed (%u)\n", err);
diff --git a/samples/bluetooth/tmap_peripheral/boards/native_posix.conf b/samples/bluetooth/tmap_peripheral/boards/native_posix.conf
deleted file mode 100644
index 8ab1d7be11310..0000000000000
--- a/samples/bluetooth/tmap_peripheral/boards/native_posix.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_LOG_MODE_IMMEDIATE=y
-
-CONFIG_LIBLC3=y
-CONFIG_FPU=y
-
-# For LE-audio at 10ms intervals we need the tick counter to occur more frequently
-# than every 10 ms as each PDU for some reason takes 2 ticks to process.
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/bluetooth/tmap_peripheral/prj.conf b/samples/bluetooth/tmap_peripheral/prj.conf
index b073c27e2fa75..837e3d4807f7e 100644
--- a/samples/bluetooth/tmap_peripheral/prj.conf
+++ b/samples/bluetooth/tmap_peripheral/prj.conf
@@ -1,6 +1,12 @@
 CONFIG_BT=y
 CONFIG_LOG=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
@@ -50,7 +56,6 @@ CONFIG_BT_TBS_CLIENT_TERMINATE_CALL=y
 CONFIG_BT_TBS_CLIENT_BEARER_URI_SCHEMES_SUPPORTED_LIST=y
 
 # Generic config
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_EXT_ADV=y
diff --git a/samples/bluetooth/tmap_peripheral/src/main.c b/samples/bluetooth/tmap_peripheral/src/main.c
index 30a1855493f5f..f26d65767f96f 100644
--- a/samples/bluetooth/tmap_peripheral/src/main.c
+++ b/samples/bluetooth/tmap_peripheral/src/main.c
@@ -252,7 +252,7 @@ int main(void)
 	}
 	printk("BAP initialized\n");
 
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, &adv_cb, &adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, &adv_cb, &adv);
 	if (err) {
 		printk("Failed to create advertising set (err %d)\n", err);
 		return err;
diff --git a/samples/boards/bbc/microbit/pong/boards/bbc_microbit_v2.overlay b/samples/boards/bbc/microbit/pong/boards/bbc_microbit_v2.overlay
new file mode 100644
index 0000000000000..33e471dc6b52c
--- /dev/null
+++ b/samples/boards/bbc/microbit/pong/boards/bbc_microbit_v2.overlay
@@ -0,0 +1,6 @@
+/ {
+	zephyr,user {
+		/* period cell corresponds to initial period */
+		pwms = <&pwm1 0 PWM_USEC(1500) PWM_POLARITY_NORMAL>;
+	};
+};
diff --git a/samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc.conf b/samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc_hpcore.conf
similarity index 100%
rename from samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc.conf
rename to samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc_hpcore.conf
diff --git a/samples/boards/espressif/ulp/index.rst b/samples/boards/espressif/ulp/index.rst
new file mode 100644
index 0000000000000..89ff6980ec0c9
--- /dev/null
+++ b/samples/boards/espressif/ulp/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: ulp
+   :name: Ultra Low Power coprocessor (ULP)
+   :show-listing:
+
+   These samples demonstrate how to use the ULP in Espressif SOCs.
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/CMakeLists.txt b/samples/boards/espressif/ulp/lp_core/debug_ulp/CMakeLists.txt
new file mode 100644
index 0000000000000..c12f9e3c74c7b
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../hello_ulp_lpcore/zephyr)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+message(STATUS "${CONFIG_BOARD_TARGET} compile as Master in this sample")
+project(debug_ulp_hpcore)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/Kconfig.sysbuild b/samples/boards/espressif/ulp/lp_core/debug_ulp/Kconfig.sysbuild
new file mode 100644
index 0000000000000..1a54b95872baf
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/Kconfig.sysbuild
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config ULP_REMOTE_BOARD
+	string
+	default "esp32c6_devkitc/esp32c6/lpcore" if $(BOARD) = "esp32c6_devkitc"
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/README.rst b/samples/boards/espressif/ulp/lp_core/debug_ulp/README.rst
new file mode 100644
index 0000000000000..c1011edf4e1d8
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/README.rst
@@ -0,0 +1,123 @@
+.. zephyr:code-sample:: debug-ulp
+   :name: Debug ULP
+
+   Debug the LP Core in ESP32C6.
+
+Overview
+********
+
+This example demonstrates how to build, flash and debug a simple application on the LP core.
+
+This sample also provides a custom ``gdbinit`` file to be loaded by GDB to set up the debugging environment.
+It connects with the remote OpenOCD server, loads the symbols from the LP Core application
+and sets an initial breakpoint.
+
+Limitations
+***********
+1. Currently debugging is not supported when either HP or LP core enters any sleep mode. So this limits debugging scenarios.
+2. OS support is disabled when debugging the LP core, so you won't be able to see tasks running in the system. Instead there will be two threads representing HP ('esp32c6.cpu0') and LP ('esp32c6.cpu1') cores:
+
+.. code-block:: console
+
+   (gdb) info thread
+     Id   Target Id                                                                Frame
+     1    Thread 1 "esp32c6.hp.cpu0" (Name: esp32c6.hp.cpu0, state: debug-request) arch_irq_unlock (key=8) at zephyr/include/zephyr/arch/riscv/arch.h:259
+   * 2    Thread 2 "esp32c6.lp.cpu" (Name: esp32c6.lp.cpu, state: breakpoint)      do_things (max=1000000000) at zephyr/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/src/main.c:28
+
+3. When setting HW breakpoint in GDB it is set on both cores, so the number of available HW breakpoints is limited to the number of them supported by LP core (2 for ESP32-C6).
+
+Sysbuild
+********
+
+Sysbuild is in charge of building the application located in the ``remote`` folder for the LP Core target.
+The build and flashing orders are as follows:
+
+Build:
+
+- MCUboot bootloader
+- LP Core application
+- HP Core application
+
+Flash:
+
+- MCUboot bootloader
+- HP Core application
+- LP Core application
+
+Building and Flashing
+*********************
+
+Build the sample code as follows:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/espressif/ulp/lp_core/debug_ulp
+   :board: esp32c6_devkitc/esp32c6/hpcore
+   :west-args: --sysbuild
+   :goals: build
+   :compact:
+
+Flash it to the device with the command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/espressif/ulp/lp_core/debug_ulp
+   :board: esp32c6_devkitc/esp32c6/hpcore
+   :west-args: --sysbuild
+   :goals: flash
+   :compact:
+
+Debugging
+*********
+
+Connect the USB cable to the USB port of the ESP32-C6 Devkitc board.
+
+The ESP32-C6 modules require patches to OpenOCD that are not upstreamed yet.
+Espressif maintains their own fork of the project.
+The custom OpenOCD can be obtained at `OpenOCD ESP32`_.
+
+In one terminal instance run the Espressif's OpenOCD:
+
+.. code-block:: shell
+
+   <path/to/openocd-esp32>/bin/openocd -f board/esp32c6-lpcore-builtin.cfg
+
+Wait for the following output to show up in the console:
+
+.. code-block:: console
+
+   Info : Listening on port 3333 for gdb connections
+
+On another terminal instance, run the GDB:
+
+.. code-block:: shell
+
+   <path/to/zephyr/sdk>/riscv64-zephyr-elf/bin/riscv64-zephyr-elf-gdb -x samples/boards/espressif/ulp/lp_core/debug_ulp/gdbinit build/debug_ulp/zephyr/zephyr.elf
+
+The following output should be displayed:
+
+.. code-block:: console
+
+   [esp32c6.hp.cpu0] Reset cause (24) - (JTAG CPU reset)
+   add symbol table from file "build/debug_ulp_lpcore/zephyr/zephyr.elf"
+   Hardware assisted breakpoint 1 at 0x500000ec: file zephyr/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/src/main.c, line 28.
+   (gdb)
+
+From now on you can use the GDB commands to debug the application. By using the command ``continue`` the LP Core application stop at the assigned breakpoint:
+
+.. code-block:: console
+
+   (gdb) continue
+   Continuing.
+   [Switching to Thread 2]
+
+   Thread 2 "esp32c6.lp.cpu" hit Temporary breakpoint 1, do_things (max=1000000000) at zephyr/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/src/main.c:28
+   28                      for (int i = 0; i < max; i++) {
+   (gdb)
+
+When the application reaches the ``abort()`` function it will automatically break.
+
+References
+**********
+
+.. target-notes::
+
+.. _`OpenOCD ESP32`: https://github.com/espressif/openocd-esp32/releases
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/gdbinit b/samples/boards/espressif/ulp/lp_core/debug_ulp/gdbinit
new file mode 100644
index 0000000000000..b1da390631b2e
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/gdbinit
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+set pagination off
+target extended-remote :3333
+
+mon reset halt
+maintenance flush register-cache
+
+add-symbol build/debug_ulp_lpcore/zephyr/zephyr.elf
+thb do_things
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/prj.conf b/samples/boards/espressif/ulp/lp_core/debug_ulp/prj.conf
new file mode 100644
index 0000000000000..ddeb8d78974aa
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_ULP_COPROC_ENABLED=y
+CONFIG_LOG=y
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/CMakeLists.txt b/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/CMakeLists.txt
new file mode 100644
index 0000000000000..bca02c90158f6
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+message(STATUS "${BOARD} compiles as remote in this sample")
+project(debug_ulp_lpcore)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/prj.conf b/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/prj.conf
new file mode 100644
index 0000000000000..7c76e06e876f8
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/prj.conf
@@ -0,0 +1,6 @@
+CONFIG_DEBUG=y
+CONFIG_NO_OPTIMIZATIONS=y
+
+# Create a disassembly file
+CONFIG_OUTPUT_DISASSEMBLY=y
+CONFIG_OUTPUT_DISASSEMBLE_ALL=y
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/src/main.c b/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/src/main.c
new file mode 100644
index 0000000000000..b8a7ffc5a253a
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/remote/src/main.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include "ulp_lp_core_utils.h"
+#include <esp_cpu.h>
+#include "riscv/rvruntime-frames.h"
+
+/* Override for the ulp_lp_core_panic_handler() so it stops the debugger when abort() is called */
+void ulp_lp_core_panic_handler(RvExcFrame *frame, int exccause)
+{
+	esp_cpu_dbgr_break();
+}
+
+void do_crash(void)
+{
+	volatile int *p = (int *)0x0;
+	*p = 32;
+	abort();
+}
+
+void do_things(int max)
+{
+	while (1) {
+		for (int i = 0; i < max; i++) {
+			ulp_lp_core_delay_us(100000);
+			if (i > 0) {
+				do_crash();
+			}
+		}
+	}
+}
+
+int main(void)
+{
+	do_things(1000000000);
+	return 0;
+}
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/sample.yaml b/samples/boards/espressif/ulp/lp_core/debug_ulp/sample.yaml
new file mode 100644
index 0000000000000..d5f80d99f9e47
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/sample.yaml
@@ -0,0 +1,9 @@
+sample:
+  name: ESP32C6 LP_CORE Debug Sample
+tests:
+  sample.boards.espressif.ulp.lp_core.debug_ulp:
+    platform_allow:
+      - esp32c6_devkitc/esp32c6/hpcore
+    tags:
+      - samples
+    sysbuild: true
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/src/main.c b/samples/boards/espressif/ulp/lp_core/debug_ulp/src/main.c
new file mode 100644
index 0000000000000..bfb97b8f2714f
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/src/main.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <zephyr/sys/poweroff.h>
+#include <esp_sleep.h>
+#include <ulp_lp_core.h>
+#include <zephyr/kernel.h>
+
+int main(void)
+{
+	while (1) {
+		k_sleep(K_MSEC(1000));
+	}
+
+	return 0;
+}
diff --git a/samples/boards/espressif/ulp/lp_core/debug_ulp/sysbuild.cmake b/samples/boards/espressif/ulp/lp_core/debug_ulp/sysbuild.cmake
new file mode 100644
index 0000000000000..79b72a6fd8d35
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/debug_ulp/sysbuild.cmake
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2025 Espressif
+
+# Add external project
+ExternalZephyrProject_Add(
+    APPLICATION debug_ulp_lpcore
+    SOURCE_DIR ${APP_DIR}/remote
+    BOARD ${SB_CONFIG_ULP_REMOTE_BOARD}
+  )
+
+# Add dependencies so that the remote sample will be built first
+# This is required because some primary cores need information from the
+# remote core's build, such as the output image's LMA
+add_dependencies(debug_ulp debug_ulp_lpcore)
+sysbuild_add_dependencies(CONFIGURE debug_ulp debug_ulp_lpcore)
+sysbuild_add_dependencies(FLASH debug_ulp_lpcore debug_ulp)
+
+if(SB_CONFIG_BOOTLOADER_MCUBOOT)
+  # Make sure MCUboot is flashed first
+  sysbuild_add_dependencies(FLASH debug_ulp mcuboot)
+endif()
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/CMakeLists.txt b/samples/boards/espressif/ulp/lp_core/echo_ulp/CMakeLists.txt
new file mode 100644
index 0000000000000..8567bfb13c7da
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../echo_ulp_lpcore/zephyr)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+message(STATUS "${CONFIG_BOARD_TARGET} compile as Master in this sample")
+project(echo_ulp_hpcore)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/Kconfig.sysbuild b/samples/boards/espressif/ulp/lp_core/echo_ulp/Kconfig.sysbuild
new file mode 100644
index 0000000000000..1a54b95872baf
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/Kconfig.sysbuild
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config ULP_REMOTE_BOARD
+	string
+	default "esp32c6_devkitc/esp32c6/lpcore" if $(BOARD) = "esp32c6_devkitc"
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/README.rst b/samples/boards/espressif/ulp/lp_core/echo_ulp/README.rst
new file mode 100644
index 0000000000000..5e1b63bfe8f21
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/README.rst
@@ -0,0 +1,39 @@
+.. zephyr:code-sample:: echo-ulp
+   :name: Echo ULP
+
+   Leverage Zephyr's UART API to use the LP UART on the ESP32-C6's LP core.
+
+Overview
+********
+
+This sample application demonstrates how to use poll-based APIs from the Zephyr
+UART driver subsystem. It reads characters from the LP UART using
+:c:func:`uart_poll_in` and echoes them back using :c:func:`uart_poll_out`.
+
+Building and Flashing
+*********************
+
+Build the sample code as follows:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/espressif/ulp/lp_core/echo_ulp
+   :board: esp32c6_devkitc/esp32c6/hpcore
+   :west-args: --sysbuild
+   :goals: build
+   :compact:
+
+Flash it to the device with the command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/espressif/ulp/lp_core/echo_ulp
+   :board: esp32c6_devkitc/esp32c6/hpcore
+   :west-args: --sysbuild
+   :goals: flash
+   :compact:
+
+Sample Output
+=============
+
+.. code-block:: console
+
+    UART echo example started. Type something...
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/app.overlay b/samples/boards/espressif/ulp/lp_core/echo_ulp/app.overlay
new file mode 100644
index 0000000000000..244dc34aa9732
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/app.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&lp_uart {
+	status = "okay";
+};
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/prj.conf b/samples/boards/espressif/ulp/lp_core/echo_ulp/prj.conf
new file mode 100644
index 0000000000000..7d425a10aa2c1
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/prj.conf
@@ -0,0 +1 @@
+CONFIG_ULP_COPROC_ENABLED=y
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/CMakeLists.txt b/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/CMakeLists.txt
new file mode 100644
index 0000000000000..27258dcbb0d5b
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+message(STATUS "${BOARD} compiles as remote in this sample")
+project(echo_ulp_lpcore)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/prj.conf b/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/prj.conf
new file mode 100644
index 0000000000000..5b2f334cc4a85
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_ISR_STACK_SIZE=64
+CONFIG_IDLE_STACK_SIZE=32
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/src/main.c b/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/src/main.c
new file mode 100644
index 0000000000000..53c6ee4fd5abb
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/remote/src/main.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+
+#define UART_DEVICE_NODE DT_NODELABEL(lp_uart)
+
+int main(void)
+{
+	const struct device *uart_dev = DEVICE_DT_GET(UART_DEVICE_NODE);
+	char c;
+	int ret = 0;
+
+	printf("UART echo example started. Type something...\n");
+
+	while (1) {
+		ret = uart_poll_in(uart_dev, &c);
+		if (ret == 0) {
+			/* Echo character back out */
+			uart_poll_out(uart_dev, c);
+			if (c == '\r') {
+				uart_poll_out(uart_dev, '\n');
+			}
+		}
+	}
+
+	return 0;
+}
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/sample.yaml b/samples/boards/espressif/ulp/lp_core/echo_ulp/sample.yaml
new file mode 100644
index 0000000000000..a3260b2b60e73
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/sample.yaml
@@ -0,0 +1,9 @@
+sample:
+  name: ESP32-C6 LP_CORE Echo Sample
+tests:
+  sample.boards.espressif.ulp.lp_core.echo_ulp:
+    platform_allow:
+      - esp32c6_devkitc/esp32c6/hpcore
+    tags:
+      - samples
+    sysbuild: true
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/src/main.c b/samples/boards/espressif/ulp/lp_core/echo_ulp/src/main.c
new file mode 100644
index 0000000000000..bfb97b8f2714f
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/src/main.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <zephyr/sys/poweroff.h>
+#include <esp_sleep.h>
+#include <ulp_lp_core.h>
+#include <zephyr/kernel.h>
+
+int main(void)
+{
+	while (1) {
+		k_sleep(K_MSEC(1000));
+	}
+
+	return 0;
+}
diff --git a/samples/boards/espressif/ulp/lp_core/echo_ulp/sysbuild.cmake b/samples/boards/espressif/ulp/lp_core/echo_ulp/sysbuild.cmake
new file mode 100644
index 0000000000000..5eaf61a64dacc
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/echo_ulp/sysbuild.cmake
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2024 Espressif
+
+# Add external project
+ExternalZephyrProject_Add(
+    APPLICATION echo_ulp_lpcore
+    SOURCE_DIR ${APP_DIR}/remote
+    BOARD ${SB_CONFIG_ULP_REMOTE_BOARD}
+  )
+
+# Add dependencies so that the remote sample will be built first
+# This is required because some primary cores need information from the
+# remote core's build, such as the output image's LMA
+add_dependencies(echo_ulp echo_ulp_lpcore)
+sysbuild_add_dependencies(CONFIGURE echo_ulp echo_ulp_lpcore)
+sysbuild_add_dependencies(FLASH echo_ulp_lpcore echo_ulp)
+
+if(SB_CONFIG_BOOTLOADER_MCUBOOT)
+  # Make sure MCUboot is flashed first
+  sysbuild_add_dependencies(FLASH echo_ulp mcuboot)
+endif()
diff --git a/samples/boards/espressif/ulp/lp_core/index.rst b/samples/boards/espressif/ulp/lp_core/index.rst
new file mode 100644
index 0000000000000..d06d7a11443fa
--- /dev/null
+++ b/samples/boards/espressif/ulp/lp_core/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: lp-core
+   :name: Low-Power CPU (LP CORE)
+   :show-listing:
+
+   These samples demonstrate how to use the LP Core in Espressif SOCs.
diff --git a/samples/boards/microchip/mec15xxevb_assy6853/power_management/prj.conf b/samples/boards/microchip/mec15xxevb_assy6853/power_management/prj.conf
index 5f4d0ced0e89d..1db43e4d329b5 100644
--- a/samples/boards/microchip/mec15xxevb_assy6853/power_management/prj.conf
+++ b/samples/boards/microchip/mec15xxevb_assy6853/power_management/prj.conf
@@ -9,6 +9,5 @@ CONFIG_THREAD_NAME=y
 
 # Enable additional drivers to evaluate power consumption without activity
 CONFIG_PECI=y
-CONFIG_KSCAN=y
 
 CONFIG_IDLE_STACK_SIZE=512
diff --git a/samples/boards/nordic/clock_control/configs/audiopll.conf b/samples/boards/nordic/clock_control/configs/audiopll.conf
new file mode 100644
index 0000000000000..c06f206ab8615
--- /dev/null
+++ b/samples/boards/nordic/clock_control/configs/audiopll.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CLOCK_CONTROL=y
diff --git a/samples/boards/nordic/clock_control/configs/audiopll.overlay b/samples/boards/nordic/clock_control/configs/audiopll.overlay
new file mode 100644
index 0000000000000..3e99bbdbeb88d
--- /dev/null
+++ b/samples/boards/nordic/clock_control/configs/audiopll.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/{
+	aliases {
+		sample-clock = &audiopll;
+	};
+};
+
+&audiopll {
+	status = "okay";
+};
diff --git a/samples/boards/nordic/clock_control/sample.yaml b/samples/boards/nordic/clock_control/sample.yaml
index 820ad0de75f44..ee63e7c518ed4 100644
--- a/samples/boards/nordic/clock_control/sample.yaml
+++ b/samples/boards/nordic/clock_control/sample.yaml
@@ -41,3 +41,8 @@ tests:
     extra_args:
       - CONF_FILE="configs/global_hsfll.conf"
       - DTC_OVERLAY_FILE="configs/global_hsfll.overlay"
+  sample.boards.nrf.clock_control.audiopll:
+    filter: dt_nodelabel_enabled("audiopll")
+    extra_args:
+      - CONF_FILE="configs/audiopll.conf"
+      - DTC_OVERLAY_FILE="configs/audiopll.overlay"
diff --git a/samples/boards/nordic/nrf_sys_event/sample.yaml b/samples/boards/nordic/nrf_sys_event/sample.yaml
index c5ea3d8a23de8..40e6d6d229b2f 100644
--- a/samples/boards/nordic/nrf_sys_event/sample.yaml
+++ b/samples/boards/nordic/nrf_sys_event/sample.yaml
@@ -19,6 +19,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
@@ -26,3 +27,4 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/samples/boards/nordic/nrfx_prs/src/main.c b/samples/boards/nordic/nrfx_prs/src/main.c
index cf989b4c4c9ec..1b9411d2da43a 100644
--- a/samples/boards/nordic/nrfx_prs/src/main.c
+++ b/samples/boards/nordic/nrfx_prs/src/main.c
@@ -122,6 +122,7 @@ static bool switch_to_spim(void)
 {
 	int ret;
 	nrfx_err_t err;
+	uint32_t sck_pin;
 
 	PINCTRL_DT_DEFINE(SPIM_NODE);
 
@@ -155,8 +156,11 @@ static bool switch_to_spim(void)
 	}
 
 	/* Set initial state of SCK according to the SPI mode. */
-	nrfy_gpio_pin_write(nrfy_spim_sck_pin_get(spim.p_reg),
-			    (spim_config.mode <= NRF_SPIM_MODE_1) ? 0 : 1);
+	sck_pin = nrfy_spim_sck_pin_get(spim.p_reg);
+
+	if (sck_pin != NRF_SPIM_PIN_NOT_CONNECTED) {
+		nrfy_gpio_pin_write(sck_pin, (spim_config.mode <= NRF_SPIM_MODE_1) ? 0 : 1);
+	}
 
 	err = nrfx_spim_init(&spim, &spim_config, spim_handler, NULL);
 	if (err != NRFX_SUCCESS) {
diff --git a/samples/boards/nordic/spis_wakeup/CMakeLists.txt b/samples/boards/nordic/spis_wakeup/CMakeLists.txt
new file mode 100644
index 0000000000000..db945ce39f58c
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/CMakeLists.txt
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+if(NOT SYSBUILD)
+	message(FATAL_ERROR
+		" This is a multi-image application that should be built using sysbuild.\n"
+		" Add --sysbuild argument to west build command to prepare all the images.")
+endif()
+
+project(spis_wakeup)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/boards/nordic/spis_wakeup/README.rst b/samples/boards/nordic/spis_wakeup/README.rst
new file mode 100644
index 0000000000000..a008f89918fd2
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/README.rst
@@ -0,0 +1,73 @@
+.. zephyr:code-sample:: spis-wakeup
+   :name: SPIS wake up
+   :relevant-api: spi_interface
+
+   Reduce current consumption by handling the wake line while using an SPIS.
+
+Overview
+********
+
+Sample showing how to use the additional wake line in nrf-spis driver. The application, configured
+as a SPIS, is put to sleep while waiting for an SPI transmission. An external device (other core in
+this sample) working as a SPIM and also handling the wake line wakes the application up just before
+the transmission starts. To simulate two separate devices the Nordic Semiconductor nRF54H20 DK has
+been used and SPIS / SPIM drivers are controlled by two independent cores:
+
+- nrf54h20dk/nrf54h20/cpuapp works as a SPIS controller device
+- nrf54h20dk/nrf54h20/cpurad works as a SPIM controller device
+
+
+Requirements
+************
+
+This sample can be run on multicore SoCs like nRF54H20 and requires additional wiring as below.
+
+Wiring
+******
+
+Wires (jumpers) for connecting SPIS and SPIM devices are needed:
+
+- SPIS WAKE <-> WAKE SPIM
+- SPIS CS <-----> CS SPIM
+- SPIS SCK <---> SCK SPIM
+- SPIS MOSI <-> MOSI SPIM
+- SPIS MISO <-> MISO SPIM
+
+Building and Running
+********************
+
+The code can be found in :zephyr_file:`samples/boards/nordic/spis_wakeup`.
+
+To build and flash the application:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/nordic/spis_wakeup
+   :board: nrf54h20dk/nrf54h20/cpuapp
+   :goals: build flash
+   :compact:
+
+Sample Output
+=============
+
+nrf54h20/cpuapp:
+
+.. code-block:: console
+
+    [00:00:00.272,217] <inf> spi_wakeup: Hello world from nrf54h20dk@0.9.0/nrf54h20/cpuapp
+    [00:00:00.272,241] <inf> spi_wakeup: SPIS: waiting for SPI transfer; going to sleep...
+    [00:00:02.274,192] <inf> spi_wakeup: SPIS: woken up by nrf54h20/cpurad
+    [00:00:02.274,215] <inf> spi_wakeup: SPIS: will be active for 500ms after transfer
+
+nrf54h20/cpurad:
+
+.. code-block:: console
+
+    [00:00:00.272,195] <inf> spi_wakeup: Hello world from nrf54h20dk@0.9.0/nrf54h20/cpurad
+    [00:00:00.272,219] <inf> spi_wakeup: SPIM: going to sleep for 1.5s...
+    [00:00:01.772,352] <inf> spi_wakeup: SPIM: will be active for 500ms before transfer
+    [00:00:02.273,456] <inf> spi_wakeup: SPIM: transferring the CONFIG_BOARD_QUALIFIERS: 'nrf54h20/cpurad'
+
+References
+**********
+
+:zephyr_file:`dts/bindings/spi/nordic,nrf-spi-common.yaml`
diff --git a/samples/boards/nordic/spis_wakeup/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/boards/nordic/spis_wakeup/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..40b2ae3d64b95
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		led = &led0;
+		spis = &spi130;
+		/delete-property/ led1;
+		/delete-property/ sw0;
+		/delete-property/ sw1;
+		/delete-property/ sw2;
+		/delete-property/ sw3;
+	};
+	/delete-node/ buttons;
+};
+
+/delete-node/ &led1;
+
+&exmif {
+	status = "disabled";
+};
+
+&gpiote130 {
+	status = "okay";
+	owned-channels = <0>;
+};
+
+&pinctrl {
+	spi130_default_alt: spi130_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 0, 0)>,
+				<NRF_PSEL(SPIS_MOSI, 0, 6)>,
+				<NRF_PSEL(SPIS_MISO, 0, 8)>,
+				<NRF_PSEL(SPIS_CSN, 0, 10)>;
+		};
+	};
+
+	spi130_sleep_alt: spi130_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 0, 0)>,
+				<NRF_PSEL(SPIS_MOSI, 0, 6)>,
+				<NRF_PSEL(SPIS_MISO, 0, 8)>,
+				<NRF_PSEL(SPIS_CSN, 0, 10)>;
+			low-power-enable;
+		};
+	};
+};
+
+&spi130 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spi130_default_alt>;
+	pinctrl-1 = <&spi130_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	wake-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
+	memory-regions = <&cpuapp_dma_region>;
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+};
+
+&uart136 {
+	zephyr,pm-device-runtime-auto;
+};
diff --git a/samples/boards/nordic/spis_wakeup/prj.conf b/samples/boards/nordic/spis_wakeup/prj.conf
new file mode 100644
index 0000000000000..ca92fc6de6ae7
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/prj.conf
@@ -0,0 +1,13 @@
+CONFIG_SPI=y
+CONFIG_SPI_SLAVE=y
+CONFIG_GPIO=y
+
+CONFIG_PM=y
+CONFIG_PM_S2RAM=y
+CONFIG_PM_S2RAM_CUSTOM_MARKING=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
+
+CONFIG_ASSERT=y
+
+CONFIG_LOG=y
diff --git a/samples/boards/nordic/spis_wakeup/sample.yaml b/samples/boards/nordic/spis_wakeup/sample.yaml
new file mode 100644
index 0000000000000..7bc97eedcb99c
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/sample.yaml
@@ -0,0 +1,22 @@
+common:
+  sysbuild: true
+  depends_on: spi
+
+sample:
+  name: SPI wakeup sample
+tests:
+  sample.drivers.spis.wakeup:
+    tags:
+      - spi
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    harness_config:
+      fixture: spi_loopback
+      type: multi_line
+      ordered: true
+      regex:
+        - ".*SPIS: waiting for SPI transfer"
+        - ".*SPIS: woken up by"
diff --git a/samples/boards/nordic/spis_wakeup/src/main.c b/samples/boards/nordic/spis_wakeup/src/main.c
new file mode 100644
index 0000000000000..a3a6c8f3eda23
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/src/main.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+
+#define BUF_SIZE 32
+static const struct device *spis_dev = DEVICE_DT_GET(DT_ALIAS(spis));
+static const struct spi_config spis_config = {.operation = SPI_OP_MODE_SLAVE | SPI_WORD_SET(8)};
+
+static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios);
+
+LOG_MODULE_REGISTER(spi_wakeup);
+
+int main(void)
+{
+	bool status;
+	static char rx_buffer[BUF_SIZE];
+	struct spi_buf rx_spi_bufs = {.buf = rx_buffer, .len = sizeof(rx_buffer)};
+	struct spi_buf_set rx_spi_buf_set = {.buffers = &rx_spi_bufs, .count = 1};
+
+	LOG_INF("Hello world from %s", CONFIG_BOARD_TARGET);
+
+	status = gpio_is_ready_dt(&led);
+	__ASSERT(status, "Error: GPIO Device not ready");
+
+	status = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
+	__ASSERT(status == 0, "Could not configure led GPIO");
+
+	status = device_is_ready(spis_dev);
+	__ASSERT(status, "Error: SPI device is not ready");
+
+	while (1) {
+		memset(rx_buffer, 0x00, sizeof(rx_buffer));
+		LOG_INF("SPIS: waiting for SPI transfer; going to sleep...");
+		gpio_pin_set_dt(&led, 0);
+		spi_read(spis_dev, &spis_config, &rx_spi_buf_set);
+		gpio_pin_set_dt(&led, 1);
+		LOG_INF("SPIS: woken up by %s", rx_buffer);
+		LOG_INF("SPIS: will be active for 500ms after transfer");
+		k_busy_wait(500000);
+	}
+
+	return 0;
+}
diff --git a/samples/boards/nordic/spis_wakeup/sysbuild.cmake b/samples/boards/nordic/spis_wakeup/sysbuild.cmake
new file mode 100644
index 0000000000000..bbd350fbe6372
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/sysbuild.cmake
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if(SB_CONFIG_SOC_NRF54H20)
+  # Add remote project
+  ExternalZephyrProject_Add(
+    APPLICATION wakeup_trigger
+    SOURCE_DIR ${APP_DIR}/wakeup_trigger
+    BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad
+    BOARD_REVISION ${BOARD_REVISION}
+  )
+endif()
diff --git a/samples/boards/nordic/spis_wakeup/wakeup_trigger/CMakeLists.txt b/samples/boards/nordic/spis_wakeup/wakeup_trigger/CMakeLists.txt
new file mode 100644
index 0000000000000..ab604e084ef11
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/wakeup_trigger/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(wakeup_trigger)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/boards/nordic/spis_wakeup/wakeup_trigger/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/boards/nordic/spis_wakeup/wakeup_trigger/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 0000000000000..c54fb28742e96
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/wakeup_trigger/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		led = &led1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led1: led_1 {
+			gpios = <&gpio9 1 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 1";
+		};
+	};
+};
+
+&gpiote130 {
+	status = "okay";
+	owned-channels = <1>;
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio9 {
+	status = "okay";
+};
+
+&pinctrl {
+	spi131_default_alt: spi131_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 7)>,
+				<NRF_PSEL(SPIM_MISO, 0, 9)>;
+		};
+	};
+
+	spi131_sleep_alt: spi131_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 0, 1)>,
+				<NRF_PSEL(SPIM_MOSI, 0, 7)>,
+				<NRF_PSEL(SPIM_MISO, 0, 9)>;
+			low-power-enable;
+		};
+	};
+};
+
+&spi131 {
+	compatible = "nordic,nrf-spim";
+	status = "okay";
+	pinctrl-0 = <&spi131_default_alt>;
+	pinctrl-1 = <&spi131_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+	wake-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+	zephyr,pm-device-runtime-auto;
+	memory-regions = <&cpurad_dma_region>;
+	spim_dt: spi-device@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+	};
+};
+
+&uart135 {
+	zephyr,pm-device-runtime-auto;
+};
diff --git a/samples/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf b/samples/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf
new file mode 100644
index 0000000000000..1de6459a60839
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf
@@ -0,0 +1,13 @@
+CONFIG_SPI=y
+CONFIG_SPI_NRFX_WAKE_TIMEOUT_US=500
+CONFIG_GPIO=y
+
+CONFIG_PM=y
+CONFIG_PM_S2RAM=y
+CONFIG_PM_S2RAM_CUSTOM_MARKING=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
+
+CONFIG_ASSERT=y
+
+CONFIG_LOG=y
diff --git a/samples/boards/nordic/spis_wakeup/wakeup_trigger/src/main.c b/samples/boards/nordic/spis_wakeup/wakeup_trigger/src/main.c
new file mode 100644
index 0000000000000..6668dc11d9e9e
--- /dev/null
+++ b/samples/boards/nordic/spis_wakeup/wakeup_trigger/src/main.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+
+#define SPI_MODE (SPI_OP_MODE_MASTER | SPI_WORD_SET(8))
+static const struct spi_dt_spec spim = SPI_DT_SPEC_GET(DT_NODELABEL(spim_dt), SPI_MODE, 0);
+
+static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios);
+
+LOG_MODULE_REGISTER(spi_wakeup);
+
+int main(void)
+{
+	bool status;
+	static char tx_buffer[] = CONFIG_BOARD_QUALIFIERS;
+	struct spi_buf tx_spi_bufs = {.buf = tx_buffer, .len = sizeof(tx_buffer)};
+	struct spi_buf_set tx_spi_buf_set = {.buffers = &tx_spi_bufs, .count = 1};
+
+	LOG_INF("Hello world from %s", CONFIG_BOARD_TARGET);
+
+	status = gpio_is_ready_dt(&led);
+	__ASSERT(status, "Error: GPIO Device not ready");
+
+	status = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
+	__ASSERT(status == 0, "Could not configure led GPIO");
+
+	status = spi_is_ready_dt(&spim);
+	__ASSERT(status, "Error: SPI device is not ready");
+
+	while (1) {
+		LOG_INF("SPIM: going to sleep for 1.5s...");
+		gpio_pin_set_dt(&led, 0);
+		k_msleep(1500);
+		gpio_pin_set_dt(&led, 1);
+		LOG_INF("SPIM: will be active for 500ms before transfer");
+		k_busy_wait(500000);
+		LOG_INF("SPIM: transferring the CONFIG_BOARD_QUALIFIERS: '%s'", tx_buffer);
+		spi_write_dt(&spim, &tx_spi_buf_set);
+	}
+
+	return 0;
+}
diff --git a/samples/boards/nordic/system_off/prj.conf b/samples/boards/nordic/system_off/prj.conf
index 3849b9c274678..04450d5a22d37 100644
--- a/samples/boards/nordic/system_off/prj.conf
+++ b/samples/boards/nordic/system_off/prj.conf
@@ -2,3 +2,4 @@ CONFIG_PM_DEVICE=y
 CONFIG_GPIO=y
 CONFIG_CRC=y
 CONFIG_POWEROFF=y
+CONFIG_HWINFO=y
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index bed08d8fe525a..81c2f0f262b61 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -68,6 +68,7 @@ tests:
         - "Retained data not supported"
         - "Entering system off; wait 2 seconds to restart"
         - "system off demo"
+        - "Wakeup from System OFF by GRTC."
         - "Retained data not supported"
         - "Entering system off; wait 2 seconds to restart"
   sample.boards.nrf.system_off.retained_mem.grtc_wakeup:
@@ -97,6 +98,7 @@ tests:
         - "Off count: 1"
         - "Active Ticks:"
         - "Entering system off; wait 2 seconds to restart"
+        - "Wakeup from System OFF by GRTC."
   sample.boards.nrf.system_off.lpcomp_wakeup:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_comparator.overlay"
     platform_allow:
diff --git a/samples/boards/nordic/system_off/src/main.c b/samples/boards/nordic/system_off/src/main.c
index e8617be2c5f96..0b0cbf3cb0bbc 100644
--- a/samples/boards/nordic/system_off/src/main.c
+++ b/samples/boards/nordic/system_off/src/main.c
@@ -11,6 +11,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <zephyr/drivers/comparator.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/device.h>
@@ -28,6 +29,20 @@ static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
 static const struct device *comp_dev = DEVICE_DT_GET(DT_NODELABEL(comp));
 #endif
 
+void print_reset_cause(void)
+{
+	uint32_t reset_cause;
+
+	hwinfo_get_reset_cause(&reset_cause);
+	if (reset_cause & RESET_DEBUG) {
+		printf("Reset by debugger.\n");
+	} else if (reset_cause & RESET_CLOCK) {
+		printf("Wakeup from System OFF by GRTC.\n");
+	} else  {
+		printf("Other wake up cause 0x%08X.\n", reset_cause);
+	}
+}
+
 int main(void)
 {
 	int rc;
@@ -39,6 +54,7 @@ int main(void)
 	}
 
 	printf("\n%s system off demo\n", CONFIG_BOARD);
+	print_reset_cause();
 
 	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
 		bool retained_ok = retained_validate();
@@ -98,6 +114,7 @@ int main(void)
 		retained_update();
 	}
 
+	hwinfo_clear_reset_cause();
 	sys_poweroff();
 
 	return 0;
diff --git a/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
new file mode 100644
index 0000000000000..3a05d47bdfb0a
--- /dev/null
+++ b/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
@@ -0,0 +1,19 @@
+/* default fuse */
+&flexram {
+	flexram,bank-spec = <FLEXRAM_DTCM>,
+			    <FLEXRAM_DTCM>,
+			    <FLEXRAM_DTCM>,
+			    <FLEXRAM_DTCM>,
+			    <FLEXRAM_ITCM>,
+			    <FLEXRAM_ITCM>,
+			    <FLEXRAM_ITCM>,
+			    <FLEXRAM_ITCM>,
+			    <FLEXRAM_DTCM>,
+			    <FLEXRAM_DTCM>,
+			    <FLEXRAM_DTCM>,
+			    <FLEXRAM_DTCM>,
+			    <FLEXRAM_ITCM>,
+			    <FLEXRAM_ITCM>,
+			    <FLEXRAM_ITCM>,
+			    <FLEXRAM_ITCM>;
+};
diff --git a/samples/boards/renesas/comparator/CMakeLists.txt b/samples/boards/renesas/comparator/CMakeLists.txt
new file mode 100644
index 0000000000000..3fffa20e3ffcb
--- /dev/null
+++ b/samples/boards/renesas/comparator/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(renesas_comparator)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/boards/renesas/comparator/Kconfig b/samples/boards/renesas/comparator/Kconfig
new file mode 100644
index 0000000000000..97b44b8c88696
--- /dev/null
+++ b/samples/boards/renesas/comparator/Kconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "Comparator sample additional options"
+
+source "Kconfig.zephyr"
+
+ZEPHYR_USER := zephyr,user
+
+config DAC_REFERENCE_SOURCE
+	bool
+	select DAC
+	default y if $(dt_node_has_prop,/$(ZEPHYR_USER),vref-dac)
diff --git a/samples/boards/renesas/comparator/README.rst b/samples/boards/renesas/comparator/README.rst
new file mode 100644
index 0000000000000..d9fefcf422259
--- /dev/null
+++ b/samples/boards/renesas/comparator/README.rst
@@ -0,0 +1,48 @@
+.. zephyr:code-sample:: renesas_comparator
+   :name: Renesas comparator
+
+   Monitor the output of comparator.
+
+Overview
+********
+
+A sample that help to monitor the output of comparator.
+
+Hardware Setup
+**************
+
+* The IVREF is connected to the internal output of DA0 (DAC module).
+  By default, DA0 is set to ~1.75V (half of the full-scale voltage).
+
+* For IVCOMP, the user can connect the IVCMP3 input to either:
+
+   * Case 1: IVCMP3 with SW0 (button on board, on ek_ra8m1 is P600).
+   * Case 2: IVCMP3 with external voltage for comparison.
+
+Building and Running
+********************
+
+This application can be built and executed on RA boards as follows:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/renesas/comparator
+   :board: ek_ra8m1
+   :goals: build flash
+   :compact:
+
+The comparator's output controls LED0:
+
+   * If the comparator output is HIGH, LED0 turns on.
+   * If the comparator output is LOW, LED0 turns off.
+
+   Example case:
+
+   * Case 1: IVCMP3 connected to SW0 (Pull up)
+
+      * SW0 not pressed --> Comparator output HIGH --> LED0 on
+      * SW0 pressed --> Comparator output LOW --> LED0 off
+
+   * Case 2: IVCMP3 connected to another reference voltage
+
+      * IVCMP3 HIGH --> Comparator output HIGH --> LED0 on
+      * IVCMP3 LOW --> Comparator output LOW --> LED0 off
diff --git a/samples/boards/renesas/comparator/boards/ek_ra8d1.overlay b/samples/boards/renesas/comparator/boards/ek_ra8d1.overlay
new file mode 100644
index 0000000000000..ea9bcf5b4870b
--- /dev/null
+++ b/samples/boards/renesas/comparator/boards/ek_ra8d1.overlay
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	aliases {
+		sample-comp = &acmphs0;
+	};
+
+	zephyr,user {
+		vref-dac = <&dac0>;
+	};
+};
+
+&acmphs_global {
+	status = "okay";
+
+	acmphs0 {
+		/*
+		 * Since ivref3 is internally routed from to DA0 (DAC),
+		 * there is no need to add pinsel of ivref3.
+		 */
+		pinctrl-0 = <&acmphs0_ivcmp3>;
+		pinctrl-names = "default";
+		interrupts = <90 12>;
+		interrupt-names = "hs";
+		reference-input-source = "ivref3";
+		compare-input-source = "ivcmp3";
+		status = "okay";
+	};
+};
diff --git a/samples/boards/renesas/comparator/boards/ek_ra8m1.overlay b/samples/boards/renesas/comparator/boards/ek_ra8m1.overlay
new file mode 100644
index 0000000000000..5d97c6005a2cb
--- /dev/null
+++ b/samples/boards/renesas/comparator/boards/ek_ra8m1.overlay
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		sample-comp = &acmphs0;
+	};
+
+	zephyr,user {
+		vref-dac = <&dac0>;
+	};
+};
+
+&acmphs_global {
+	status = "okay";
+
+	acmphs0 {
+		/*
+		 * Since ivref3 is internally routed from to DA0 (DAC),
+		 * there is no need to add pinsel of ivref3.
+		 */
+		pinctrl-0 = <&acmphs0_ivcmp3>;
+		pinctrl-names = "default";
+		interrupts = <90 12>;
+		interrupt-names = "hs";
+		reference-input-source = "ivref3";
+		compare-input-source = "ivcmp3";
+		status = "okay";
+	};
+};
diff --git a/samples/boards/renesas/comparator/prj.conf b/samples/boards/renesas/comparator/prj.conf
new file mode 100644
index 0000000000000..94d0c848f17ef
--- /dev/null
+++ b/samples/boards/renesas/comparator/prj.conf
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_GPIO=y
+CONFIG_COMPARATOR=y
diff --git a/samples/boards/renesas/comparator/sample.yaml b/samples/boards/renesas/comparator/sample.yaml
new file mode 100644
index 0000000000000..133521066a75e
--- /dev/null
+++ b/samples/boards/renesas/comparator/sample.yaml
@@ -0,0 +1,9 @@
+sample:
+  name: Comparator
+tests:
+  sample.boards.renesas.comparator:
+    build_only: true
+    platform_allow:
+      - ek_ra8m1
+      - ek_ra8d1
+    tags: comparator
diff --git a/samples/boards/renesas/comparator/src/main.c b/samples/boards/renesas/comparator/src/main.c
new file mode 100644
index 0000000000000..053280da0e4a5
--- /dev/null
+++ b/samples/boards/renesas/comparator/src/main.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/comparator.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/printk.h>
+#ifdef CONFIG_DAC_REFERENCE_SOURCE
+#include <zephyr/drivers/dac.h>
+#endif
+
+/*
+ * Get button configuration from the devicetree sw0 alias. This is mandatory.
+ */
+#define SW0_NODE DT_ALIAS(sw0)
+#if !DT_NODE_HAS_STATUS_OKAY(SW0_NODE)
+#error "Unsupported board: sw0 devicetree alias is not defined"
+#endif
+
+static const struct gpio_dt_spec button = GPIO_DT_SPEC_GET_OR(SW0_NODE, gpios, {0});
+static struct gpio_dt_spec led = GPIO_DT_SPEC_GET_OR(DT_ALIAS(led0), gpios, {0});
+static const struct device *comp_dev = DEVICE_DT_GET(DT_ALIAS(sample_comp));
+
+#ifdef CONFIG_DAC_REFERENCE_SOURCE
+static const struct dac_channel_cfg dac_ch_cfg = {
+	.channel_id = 0,
+	.resolution = 12,
+	.buffered = true,
+};
+
+static const struct device *init_dac(void)
+{
+	int ret;
+	const struct device *const dac_dev = DEVICE_DT_GET(DT_PROP(DT_PATH(zephyr_user), vref_dac));
+
+	ret = device_is_ready(dac_dev);
+	if (ret != true) {
+		printk("DAC device is not ready\n");
+		return NULL;
+	}
+
+	ret = dac_channel_setup(dac_dev, &dac_ch_cfg);
+	if (ret != 0) {
+		printk("Setting up of the first channel failed with code %d\n", ret);
+		return NULL;
+	}
+
+	return dac_dev;
+}
+#endif
+
+static void comp_callback(const struct device *dev, void *user_data)
+{
+	int val = comparator_get_output(comp_dev);
+
+	gpio_pin_set_dt(&led, val);
+	printk("Comparator output value %d\n", val);
+}
+
+int main(void)
+{
+	int ret;
+#ifdef CONFIG_DAC_REFERENCE_SOURCE
+	const struct device *dac_dev = init_dac();
+
+	if (dac_dev == NULL) {
+		printk("Init_dac failed\n");
+		return 0;
+	}
+	/* write a value of half the full scale resolution */
+	ret = dac_write_value(dac_dev, dac_ch_cfg.channel_id, (1U << dac_ch_cfg.resolution) / 2);
+	if (ret != 0) {
+		printk("dac_write_value() failed with code %d", ret);
+		return 0;
+	}
+#endif
+
+	if (!gpio_is_ready_dt(&button)) {
+		printk("Error: button device %s is not ready\n", button.port->name);
+		return 0;
+	}
+
+	ret = gpio_pin_configure_dt(&button, GPIO_INPUT);
+	if (ret != 0) {
+		printk("Error %d: failed to configure %s pin %d\n", ret, button.port->name,
+		       button.pin);
+		return 0;
+	}
+
+	if (led.port && !gpio_is_ready_dt(&led)) {
+		printk("Error %d: LED device %s is not ready; ignoring it\n", ret, led.port->name);
+		led.port = NULL;
+	}
+
+	if (led.port) {
+		ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT);
+		if (ret != 0) {
+			printk("Error %d: failed to configure LED device %s pin %d\n", ret,
+			       led.port->name, led.pin);
+			led.port = NULL;
+		}
+	}
+
+	comparator_set_trigger(comp_dev, COMPARATOR_TRIGGER_BOTH_EDGES);
+	comparator_set_trigger_callback(comp_dev, comp_callback, NULL);
+
+	printk("Press the button\n");
+
+	return 0;
+}
diff --git a/samples/boards/renesas/index.rst b/samples/boards/renesas/index.rst
new file mode 100644
index 0000000000000..e0b2898847a80
--- /dev/null
+++ b/samples/boards/renesas/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: renesas
+   :name: Renesas
+   :show-listing:
+
+   Samples that showcase the use of Renesas boards in Zephyr.
diff --git a/samples/boards/renesas/openamp_linux_zephyr/CMakeLists.txt b/samples/boards/renesas/openamp_linux_zephyr/CMakeLists.txt
new file mode 100644
index 0000000000000..7e6ce78c07b4c
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.20.0)
+# Copyright (c) 2025 Renesas Electronics Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(openamp_linux_zephyr)
+
+# METAL_MAX_DEVICE_REGIONS is used to give the number of memory regions shared
+# between processors. By default only one region is defined for the vrings
+# and rpmsg buffers. The METAL_MAX_DEVICE_REGIONS has to be redefined to add a
+# second region for the resource table.
+zephyr_compile_definitions(METAL_MAX_DEVICE_REGIONS=2)
+
+target_include_directories(app PRIVATE ${LIBMETAL_INCLUDE_DIR} ${OPENAMP_INCLUDE_DIR} ${PLATFORM_DIR})
+target_include_directories(app PRIVATE src)
+
+target_sources(app PRIVATE src/resource_table.c src/main_remote.c)
diff --git a/samples/boards/renesas/openamp_linux_zephyr/README.rst b/samples/boards/renesas/openamp_linux_zephyr/README.rst
new file mode 100644
index 0000000000000..1afac299194ca
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/README.rst
@@ -0,0 +1,175 @@
+.. zephyr:code-sample:: rz-openamp-linux-zephyr
+   :name: OpenAMP Linux Zephyr RPMsg
+   :relevant-api: mbox_interface
+
+   Enable message exchange between two cores, with the application core running Linux
+   and the real-time core running Zephyr, using the OpenAMP library.
+
+Overview
+********
+
+This application demonstrates how to use OpenAMP for communication between Zephyr and Linux,
+where both sides utilize the OpenAMP library.
+
+On the Linux side, the application uses the OpenAMP library provided by `meta-openamp <https://github.com/OpenAMP/meta-openamp>`_, ensuring
+a consistent and standardized approach to inter-core communication.
+
+Building the application
+*************************
+
+Zephyr
+======
+
+Build command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/renesas/openamp_linux_zephyr
+   :board: rzg3s_smarc/r9a08g045s33gbg/cm33
+   :goals: build
+   :compact:
+
+Running the sample
+*************************
+
+Linux setup
+===========
+
+The sample currently supports the Linux RZ/G Multi-OS Package V2.2.0. The build steps for Renesas Multi-OS Package V2.2.0 are described below.
+
+1. Follow the procedures in ''3.Multi-OS Package Setup'' of `Release Note for RZ/G Multi-OS Package V2.2.0 <https://www.renesas.com/en/document/rln/release-note-rzg-multi-os-package-v220?r=1522841>`_
+   without initiating the build process.
+2. For RZ/G3S, add ``PLAT_M33_BOOT_SUPPORT=1`` by following this guide:
+   `RZ/G3S SMARC Evaluation Board Kit <https://docs.zephyrproject.org/latest/boards/renesas/rzg3s_smarc/doc/index.html#programming-and-debugging>`_
+
+3. Insert the highlighted lines of code into the following file: meta-rz-features/meta-rz-multi-os/meta-rzg3s/recipes-example/rpmsg-sample/files/platform_info.c
+
+   .. code-block:: c
+      :emphasize-lines: 5,6,7,8,9,10
+
+      if (ret) {
+      LPRINTF("failed rpmsg_init_vdev");
+      goto err;
+      }
+      /* RPMsg virtio enables callback for avail flags */
+      ret = virtqueue_enable_cb(rpmsg_vdev->rvq);
+      if (ret) {
+         LPRINTF("Failed release availability flags");
+         goto err;
+      }
+      #ifndef __linux__ /* uC3 */
+      start_ipi_task(rproc);
+      #endif
+      return rpmsg_virtio_get_rpmsg_device(rpmsg_vdev);
+
+4. Start the build.
+
+5. For deploying bootloader files, Linux kernel image, device tree and rootfs, follow the procedures in ''3.5.1 In case of configuring CA55 as Boot CPU'' of `Release Note for RZ/G Multi-OS Package V2.2.0 <https://www.renesas.com/en/document/rln/release-note-rzg-multi-os-package-v220?r=1522841>`_
+
+Zephyr setup
+============
+
+1. Flash the sample to the board.
+
+2. Open a serial terminal (minicom, putty, etc.) and connect to the board with the following
+   settings:
+
+   - Speed: 115200
+   - Data: 8 bits
+   - Parity: None
+   - Stop bits: 1
+
+Linux console
+=============
+
+1. Open a Linux shell (minicom, ssh, etc.) and login as root:
+
+   .. code-block:: console
+
+      smarc-<device> login: root
+
+2. Run the following command:
+
+   .. code-block:: console
+
+      root@smarc-<device>:~# rpmsg_sample_client 0 0
+
+3. The following output should appear:
+
+   .. code-block:: console
+
+      root@smarc-<device>:~# rpmsg_sample_client 0 0
+      [211] proc_id:0 rsc_id:0 mbx_id:0
+      metal: info:      metal_uio_dev_open: No IRQ for device 10400000.mbox-uio.
+      metal: info:      metal_uio_dev_open: No IRQ for device 11010000.cpg-uio.
+      [211] Successfully probed IPI device
+      metal: info:      metal_uio_dev_open: No IRQ for device 42f00000.rsctbl.
+      [211] Successfully open uio device: 42f00000.rsctbl.
+      [211] Successfully added memory device 42f00000.rsctbl.
+      metal: info:      metal_uio_dev_open: No IRQ for device 43000000.vring-ctl0.
+      [211] Successfully open uio device: 43000000.vring-ctl0.
+      [211] Successfully added memory device 43000000.vring-ctl0.
+      metal: info:      metal_uio_dev_open: No IRQ for device 43200000.vring-shm0.
+      [211] Successfully open uio device: 43200000.vring-shm0.
+      [211] Successfully added memory device 43200000.vring-shm0.
+      metal: info:      metal_uio_dev_open: No IRQ for device 43100000.vring-ctl1.
+      [211] Successfully open uio device: 43100000.vring-ctl1.
+      [211] Successfully added memory device 43100000.vring-ctl1.
+      metal: info:      metal_uio_dev_open: No IRQ for device 43500000.vring-shm1.
+      [211] Successfully open uio device: 43500000.vring-shm1.
+      [211] Successfully added memory device 43500000.vring-shm1.
+      metal: info:      metal_uio_dev_open: No IRQ for device 42f01000.mhu-shm.
+      [211] Successfully open uio device: 42f01000.mhu-shm.
+      [211] Successfully added memory device 42f01000.mhu-shm.
+      [211] Initialize remoteproc successfully.
+      [211] proc_id:1 rsc_id:1 mbx_id:0
+      [211] Initialize remoteproc successfully.
+      [211] proc_id:0 rsc_id:0 mbx_id:1
+      [211] Initialize remoteproc successfully.
+      [211] proc_id:1 rsc_id:1 mbx_id:1
+      [211] Initialize remoteproc successfully.
+      [217] thread start
+      [CM33] creating remoteproc virtio
+      [CM33] initializing rpmsg shared buffer pool
+      [CM33] initializing rpmsg vdev
+      [CM33]  1 - Send data to remote core, retrieve the echo and validate its integrity ..
+      [CM33] Remote proc init.
+      [CM33] RPMSG endpoint has created. rp_ept:0xffff9c86f870
+      [CM33] register sig:2 succeeded.
+      [CM33] register sig:15 succeeded.
+      [CM33] RPMSG service has created.
+      [CM33] sending payload number 0 of size 17
+      [CM33]  received payload number 0 of size 17
+      [CM33] sending payload number 1 of size 18
+      [CM33]  received payload number 1 of size 18
+
+      [snip]
+
+      [CM33] sending payload number 471 of size 488
+      [CM33]  received payload number 471 of size 488
+      [CM33] ************************************
+      [CM33]  Test Results: Error count = 0
+      [CM33] ************************************
+      [CM33] Quitting application .. Echo test end
+      [CM33] Stopping application...
+      [211] 42f00000.rsctbl closed
+      [211] 43000000.vring-ctl0 closed
+      [211] 43200000.vring-shm0 closed
+      [211] 43100000.vring-ctl1 closed
+      [211] 43500000.vring-shm1 closed
+      [211] 42f01000.mhu-shm closed
+
+Zephyr console
+==============
+
+The following message will appear on the Zephyr console.
+
+   .. code-block:: console
+
+      *** Booting Zephyr OS build zephyr-v#.#.#-####-g########## ***
+      I: Starting application..!
+      I: Starting application threads!
+      I: OpenAMP[remote]  linux responder demo started
+      I: new_service_cb: message received from service rpmsg-service-0
+      I: OpenAMP[remote] Linux sample client responder started
+      I: OpenAMP demo ended
+      I: OpenAMP Linux sample client responder ended
diff --git a/samples/boards/renesas/openamp_linux_zephyr/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/samples/boards/renesas/openamp_linux_zephyr/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..4c78b84427dcf
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2024 Epam Systems
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	/*
+	 * Allocating whole openamp region as reserved memory
+	 * to save MPU entries
+	 */
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		openamp_shm: memory-region@62F00000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x62F00000 0x600000>;
+			zephyr,memory-region = "openamp_memory";
+			zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>;
+		};
+	};
+
+	chosen {
+		zephyr,ipc_shm = &vring_shm0;
+		zephyr,ipc = &mbox_consumer;
+	};
+
+	vring_ctrl0: memory@63000000 {
+		compatible = "mmio-sram";
+		reg = <0x63000000 0x50000>;
+	};
+
+	vring_ctrl1: memory@63050000 {
+		compatible = "mmio-sram";
+		reg = <0x63050000 0x50000>;
+	};
+
+	vring_shm0: memory@63200000 {
+		compatible = "mmio-sram";
+		reg = <0x63200000 0x300000>;
+	};
+
+	rsctbl: memory@62F00000 {
+		compatible = "mmio-sram";
+		reg = <0x62F00000 0x1000>;
+	};
+
+	mhu1_shm: memory@62F01008 {
+		compatible = "mmio-sram";
+		reg = <0x62F01008 0x8>;
+	};
+
+	mhu3_shm: memory@62F01018 {
+		compatible = "mmio-sram";
+		reg = <0x62F01018 0x8>;
+	};
+
+	mhu4_shm: memory@62F01020 {
+		compatible = "mmio-sram";
+		reg = <0x62F01020 0x8>;
+	};
+
+	mhu5_shm: memory@62F01028 {
+		compatible = "mmio-sram";
+		reg = <0x62F01028 0x8>;
+	};
+
+	mbox_consumer: mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1 1>, <&mbox1 0>;
+		mbox-names = "tx", "rx";
+	};
+
+};
+
+&mbox1 {
+	shared-memory = <&mhu1_shm>;
+	status = "okay";
+};
diff --git a/samples/boards/renesas/openamp_linux_zephyr/prj.conf b/samples/boards/renesas/openamp_linux_zephyr/prj.conf
new file mode 100644
index 0000000000000..2264866c65e2c
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/prj.conf
@@ -0,0 +1,7 @@
+CONFIG_KERNEL_BIN_NAME="openamp_linux_zephyr"
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
+CONFIG_MBOX=y
+CONFIG_HEAP_MEM_POOL_SIZE=16384
+CONFIG_OPENAMP=y
+CONFIG_OPENAMP_RSC_TABLE=n
diff --git a/samples/boards/renesas/openamp_linux_zephyr/sample.yaml b/samples/boards/renesas/openamp_linux_zephyr/sample.yaml
new file mode 100644
index 0000000000000..31c68f14575b0
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/sample.yaml
@@ -0,0 +1,14 @@
+sample:
+  description: Enable message exchange between two cores, with the application core running Linux
+   and the real-time core running Zephyr, using the OpenAMP library.
+  name: OpenAMP Linux Zephyr RPMsg
+tests:
+  sample.boards.renesas.openamp_linux_zephyr:
+    build_only: true
+    platform_allow:
+      - rzg3s_smarc/r9a08g045s33gbg/cm33
+    integration_platforms:
+      - rzg3s_smarc/r9a08g045s33gbg/cm33
+    tags:
+      - mbox
+      - openamp
diff --git a/samples/boards/renesas/openamp_linux_zephyr/src/main_remote.c b/samples/boards/renesas/openamp_linux_zephyr/src/main_remote.c
new file mode 100644
index 0000000000000..49df6c27c3313
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/src/main_remote.c
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2024 EPAM Systems
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <zephyr/drivers/mbox.h>
+
+#include <openamp/open_amp.h>
+#include <metal/device.h>
+#include "resource_table.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(openamp_rsc_table);
+
+#define SHM_DEVICE_NAME "shm"
+
+#if !DT_HAS_CHOSEN(zephyr_ipc_shm)
+#error "Sample requires definition of shared memory for rpmsg"
+#endif
+
+#define APP_EPT_ADDR 1024
+
+#define SHUTDOWN_MSG (0xEF56A55A)
+
+/* Constants derived from device tree */
+#define SHM_NODE       DT_CHOSEN(zephyr_ipc_shm)
+#define SHM_START_ADDR DT_REG_ADDR(SHM_NODE)
+#define SHM_SIZE       DT_REG_SIZE(SHM_NODE)
+
+#define RSC_TABLE_ADDR DT_REG_ADDR(DT_NODELABEL(rsctbl))
+
+#define APP_TASK_STACK_SIZE (1024)
+
+K_THREAD_STACK_DEFINE(thread_mng_stack, APP_TASK_STACK_SIZE);
+K_THREAD_STACK_DEFINE(thread_rp__client_stack, APP_TASK_STACK_SIZE);
+
+static struct k_thread thread_mng_data;
+static struct k_thread thread_rp__client_data;
+
+const struct mbox_dt_spec tx_channel = MBOX_DT_SPEC_GET(DT_CHOSEN(zephyr_ipc), tx);
+const struct mbox_dt_spec rx_channel = MBOX_DT_SPEC_GET(DT_CHOSEN(zephyr_ipc), rx);
+
+static metal_phys_addr_t shm_physmap = CM33_TO_A55_ADDR_NS(SHM_START_ADDR);
+static metal_phys_addr_t rsc_physmap = RSC_TABLE_ADDR;
+
+struct metal_device shm_device = {
+	.name = SHM_DEVICE_NAME,
+	.num_regions = 2,
+	{
+		{.virt = NULL}, /* shared memory */
+		{.virt = NULL}, /* rsc_table memory */
+	},
+	.node = {NULL},
+	.irq_num = 0,
+
+};
+
+struct rpmsg_rcv_msg {
+	void *data;
+	size_t len;
+};
+
+static struct metal_io_region *shm_io;
+static struct rpmsg_virtio_shm_pool shpool;
+
+static struct metal_io_region *rsc_io;
+static struct rpmsg_virtio_device rvdev;
+
+static void *rsc_table;
+static struct rpmsg_device *rpdev;
+
+static char rx_sc_msg[512];
+static struct rpmsg_endpoint sc_ept;
+static struct rpmsg_rcv_msg sc_msg = {.data = rx_sc_msg};
+
+static K_SEM_DEFINE(data_sem, 0, 1);
+static K_SEM_DEFINE(data_sc_sem, 0, 1);
+
+static volatile int finish;
+
+static void platform_mbox_callback(const struct device *dev, mbox_channel_id_t channel_id,
+				   void *user_data, struct mbox_msg *data)
+{
+	k_sem_give(&data_sem);
+}
+
+static int rpmsg_recv_cs_callback(struct rpmsg_endpoint *ept, void *data, size_t len, uint32_t src,
+				  void *priv)
+{
+	memcpy(sc_msg.data, data, len);
+	sc_msg.len = len;
+	if ((*(unsigned int *)data) == SHUTDOWN_MSG) {
+		finish = 1;
+	}
+	k_sem_give(&data_sc_sem);
+
+	return RPMSG_SUCCESS;
+}
+
+static void receive_message(unsigned char **msg, unsigned int *len)
+{
+	int status = k_sem_take(&data_sem, K_FOREVER);
+
+	if (status == 0) {
+		rproc_virtio_notified(rvdev.vdev, VRING1_ID);
+	}
+}
+
+static void new_service_cb(struct rpmsg_device *rdev, const char *name, uint32_t src)
+{
+	LOG_INF("%s: message received from service %s", __func__, name);
+}
+
+int mailbox_notify(void *priv, uint32_t id)
+{
+	ARG_UNUSED(priv);
+
+	mbox_send_dt(&tx_channel, NULL);
+	return 0;
+}
+
+int platform_init(void)
+{
+	void *rsc_tab_addr;
+	int rsc_size;
+	struct metal_device *device;
+	struct metal_init_params metal_params = METAL_INIT_DEFAULTS;
+	int status;
+
+	status = metal_init(&metal_params);
+	if (status) {
+		LOG_ERR("metal_init: failed: %d", status);
+		return -1;
+	}
+
+	status = metal_register_generic_device(&shm_device);
+	if (status) {
+		LOG_ERR("Couldn't register shared memory: %d", status);
+		return -1;
+	}
+
+	status = metal_device_open("generic", SHM_DEVICE_NAME, &device);
+	if (status) {
+		LOG_ERR("metal_device_open failed: %d", status);
+		return -1;
+	}
+
+	/* declare shared memory region */
+	metal_io_init(&device->regions[0], (void *)SHM_START_ADDR, &shm_physmap, SHM_SIZE, -1, 0,
+		      NULL);
+
+	shm_io = metal_device_io_region(device, 0);
+	if (!shm_io) {
+		LOG_ERR("Failed to get shm_io region");
+		return -1;
+	}
+
+	/* declare resource table region */
+	rsc_table_get(&rsc_tab_addr, &rsc_size);
+	memcpy((void *)RSC_TABLE_ADDR, rsc_tab_addr, rsc_size);
+	rsc_table = (struct st_resource_table *)RSC_TABLE_ADDR;
+
+	metal_io_init(&device->regions[1], (void *)RSC_TABLE_ADDR, &rsc_physmap, rsc_size, -1, 0,
+		      NULL);
+
+	rsc_io = metal_device_io_region(device, 1);
+	if (!rsc_io) {
+		LOG_ERR("Failed to get rsc_io region");
+		return -1;
+	}
+
+	/* Setup MBOX */
+	if (!mbox_is_ready_dt(&tx_channel)) {
+		LOG_ERR("MBOX TX device is not ready");
+		return -1;
+	}
+
+	if (!mbox_is_ready_dt(&rx_channel)) {
+		LOG_ERR("MBOX RX device is not ready");
+		return -1;
+	}
+
+	mbox_register_callback_dt(&rx_channel, platform_mbox_callback, NULL);
+
+	status = mbox_set_enabled_dt(&rx_channel, true);
+	if (status) {
+		LOG_ERR("mbox_set_enabled_dt failed");
+		return -1;
+	}
+
+	return 0;
+}
+
+static void platform_deinit(void)
+{
+	mbox_set_enabled_dt(&rx_channel, false);
+
+	metal_finish();
+}
+
+static void cleanup_system(void)
+{
+	struct fw_resource_table *rsc_tbl = (struct fw_resource_table *)RSC_TABLE_ADDR;
+
+	rpmsg_deinit_vdev(&rvdev);
+	rproc_virtio_remove_vdev(rvdev.vdev);
+	/*
+	 * Clean vdev status in rsc_table because it may not be cleared from
+	 * master end. This is not default work behavior. By default rsc_table
+	 * should be provided and managed by master.
+	 */
+	rsc_tbl->vdev.status = 0;
+}
+
+struct rpmsg_device *platform_create_rpmsg_vdev(unsigned int vdev_index, unsigned int role,
+						void (*rst_cb)(struct virtio_device *vdev),
+						rpmsg_ns_bind_cb ns_cb)
+{
+	struct fw_rsc_vdev_vring *vring_rsc;
+	struct virtio_device *vdev;
+	int ret;
+
+	vdev = rproc_virtio_create_vdev(VIRTIO_DEV_DEVICE, VDEV_ID, rsc_table_to_vdev(rsc_table),
+					rsc_io, NULL, mailbox_notify, NULL);
+
+	if (!vdev) {
+		LOG_ERR("failed to create vdev");
+		return NULL;
+	}
+
+	/* Set gfeatures because they should be equal to dfeatures
+	 * when create_ept is called. As rproc_virtio_create_vdev
+	 * doesn't set them because its VIRTIO_DEVICE not DRIVER.
+	 * Assume the virtio driver support all remote features.
+	 */
+	virtio_set_features(vdev, 0x1);
+
+	/* wait master rpmsg init completion */
+	rproc_virtio_wait_remote_ready(vdev);
+
+	vring_rsc = rsc_table_get_vring0(rsc_table);
+
+	ret = rproc_virtio_init_vring(vdev, 0, vring_rsc->notifyid, (void *)VRING_TX_ADDR_CM33,
+				      rsc_io, vring_rsc->num, vring_rsc->align);
+	if (ret) {
+		LOG_ERR("failed to init vring 0");
+		goto failed;
+	}
+
+	vring_rsc = rsc_table_get_vring1(rsc_table);
+
+	ret = rproc_virtio_init_vring(vdev, 1, vring_rsc->notifyid, (void *)VRING_RX_ADDR_CM33,
+				      rsc_io, vring_rsc->num, vring_rsc->align);
+	if (ret) {
+		LOG_ERR("failed to init vring 1");
+		goto failed;
+	}
+
+	rpmsg_virtio_init_shm_pool(&shpool, NULL, SHM_SIZE);
+	ret = rpmsg_init_vdev(&rvdev, vdev, ns_cb, shm_io, &shpool);
+
+	if (ret) {
+		LOG_ERR("failed rpmsg_init_vdev");
+		goto failed;
+	}
+
+	return rpmsg_virtio_get_rpmsg_device(&rvdev);
+
+failed:
+	rproc_virtio_remove_vdev(vdev);
+
+	return NULL;
+}
+
+void app_rpmsg_client_sample(void *arg1, void *arg2, void *arg3)
+{
+	ARG_UNUSED(arg1);
+	ARG_UNUSED(arg2);
+	ARG_UNUSED(arg3);
+	unsigned int msg_cnt = 0;
+	int ret = 0;
+
+	k_sem_take(&data_sc_sem, K_FOREVER);
+
+	LOG_INF("OpenAMP[remote] Linux sample client responder started");
+
+	ret = rpmsg_create_ept(&sc_ept, rpdev, "rpmsg-service-0", APP_EPT_ADDR, RPMSG_ADDR_ANY,
+			       rpmsg_recv_cs_callback, NULL);
+
+	while (!finish) {
+		k_sem_take(&data_sc_sem, K_FOREVER);
+		msg_cnt++;
+		rpmsg_send(&sc_ept, sc_msg.data, sc_msg.len);
+	}
+
+	rpmsg_destroy_ept(&sc_ept);
+	k_sem_reset(&data_sc_sem);
+
+	LOG_INF("OpenAMP Linux sample client responder ended");
+}
+
+void rpmsg_mng_task(void *arg1, void *arg2, void *arg3)
+{
+	ARG_UNUSED(arg1);
+	ARG_UNUSED(arg2);
+	ARG_UNUSED(arg3);
+	unsigned char *msg;
+	unsigned int len;
+	int ret = 0;
+
+	LOG_INF("OpenAMP[remote]  linux responder demo started");
+
+	/* Initialize platform */
+	rpdev = platform_create_rpmsg_vdev(0, VIRTIO_DEV_DEVICE, NULL, new_service_cb);
+	if (!rpdev) {
+		LOG_ERR("Failed to create rpmsg virtio device");
+		ret = -1;
+		goto task_end;
+	}
+
+	/* start the rpmsg clients */
+	k_sem_give(&data_sc_sem);
+
+	while (!finish) {
+		receive_message(&msg, &len);
+	}
+
+task_end:
+	cleanup_system();
+
+	LOG_INF("OpenAMP demo ended");
+}
+
+int main(void)
+{
+	LOG_INF("Starting application..!");
+
+	/* Initialize platform */
+	int ret = platform_init();
+
+	if (ret) {
+		LOG_ERR("Failed to initialize platform");
+		return -1;
+	}
+
+	while (1) {
+		finish = 0;
+
+		LOG_INF("Starting application threads!");
+		k_thread_create(&thread_mng_data, thread_mng_stack, APP_TASK_STACK_SIZE,
+				(k_thread_entry_t)rpmsg_mng_task, NULL, NULL, NULL, K_PRIO_COOP(8),
+				0, K_NO_WAIT);
+		k_thread_create(&thread_rp__client_data, thread_rp__client_stack,
+				APP_TASK_STACK_SIZE, (k_thread_entry_t)app_rpmsg_client_sample,
+				NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
+
+		k_thread_join(&thread_mng_data, K_FOREVER);
+		k_thread_join(&thread_rp__client_data, K_FOREVER);
+	}
+
+	platform_deinit();
+	return 0;
+}
diff --git a/samples/boards/renesas/openamp_linux_zephyr/src/resource_table.c b/samples/boards/renesas/openamp_linux_zephyr/src/resource_table.c
new file mode 100644
index 0000000000000..8f50e2d944b1d
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/src/resource_table.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024 EPAM Systems
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Overriding Zephyr resource_table and set correct vring 0 and vring 1 addresses
+ * to match the work behaviour of master device. According to the commit:
+ * 25ec73986b (lib: open-amp: add helper to add resource table in project)
+ * vring RX and TX addresses should be allocated by master processor.
+ * Current Master Sample implementation expects slave to provide valid
+ * rsc_table so update vring addresses here.
+ *
+ * Dependencies:
+ *   to be compliant with Linux kernel OS the resource table must be linked in a
+ *   specific section named ".resource_table".
+ */
+
+#include <zephyr/kernel.h>
+#include <resource_table.h>
+
+#define __resource Z_GENERIC_SECTION(.resource_table)
+
+static struct fw_resource_table __resource resource_table = {
+	.ver = 1,
+	.num = RSC_TABLE_NUM_ENTRY,
+	.reserved = {0, 0},
+	/* Offset */
+	{
+		offsetof(struct fw_resource_table, vdev),
+	},
+	/* Virtio device entry */
+	{
+		RSC_VDEV,
+		VIRTIO_ID_RPMSG,
+		0,
+		RPMSG_IPU_C0_FEATURES,
+		0,
+		0,
+		0,
+		VRING_COUNT,
+		{0, 0},
+	},
+	/* Vring rsc entry - part of vdev rsc entry */
+	.vring0 = {VRING_TX_ADDR_A55, VRING_ALIGNMENT, RSC_TABLE_NUM_RPMSG_BUFF, VRING0_ID, 0},
+	.vring1 = {VRING_RX_ADDR_A55, VRING_ALIGNMENT, RSC_TABLE_NUM_RPMSG_BUFF, VRING1_ID, 0},
+};
+
+void rsc_table_get(void **table_ptr, int *length)
+{
+	*table_ptr = (void *)&resource_table;
+	*length = sizeof(resource_table);
+}
diff --git a/samples/boards/renesas/openamp_linux_zephyr/src/resource_table.h b/samples/boards/renesas/openamp_linux_zephyr/src/resource_table.h
new file mode 100644
index 0000000000000..5c950097f6bcc
--- /dev/null
+++ b/samples/boards/renesas/openamp_linux_zephyr/src/resource_table.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024 EPAM Systems
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef RESOURCE_TABLE_H__
+#define RESOURCE_TABLE_H__
+
+#include <openamp/remoteproc.h>
+#include <openamp/virtio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define VDEV_ID   0xFF
+#define VRING0_ID 0
+#define VRING1_ID 1
+
+#define VRING_COUNT           2
+#define RPMSG_IPU_C0_FEATURES 1
+
+#define R_VRING_TX         DT_NODELABEL(vring_ctrl0)
+#define R_VRING_RX         DT_NODELABEL(vring_ctrl1)
+#define VRING_TX_ADDR_CM33 DT_REG_ADDR(R_VRING_TX)
+#define VRING_RX_ADDR_CM33 DT_REG_ADDR(R_VRING_RX)
+
+/*
+ * Macro to convert across CM33/CM33_FPU and A55 address spaces
+ * This macro are designed to convert CM33 addresses to A55 addresses
+ * in secure and non-secure space. According to Table 5.2 of HW Manual.
+ */
+#ifndef _ASMLANGUAGE
+
+#define CM33_ADDRESS_OFFSET_SECURE    (0x30000000)
+#define CM33_ADDRESS_OFFSET_NONSECURE (0x20000000)
+#define CM33_TO_A55_ADDR_S(x)         ((x) - CM33_ADDRESS_OFFSET_SECURE)
+#define CM33_TO_A55_ADDR_NS(x)        ((x) - CM33_ADDRESS_OFFSET_NONSECURE)
+
+#endif
+/* End of convert macro */
+
+#define VRING_TX_ADDR_A55 CM33_TO_A55_ADDR_NS(VRING_TX_ADDR_CM33)
+#define VRING_RX_ADDR_A55 CM33_TO_A55_ADDR_NS(VRING_RX_ADDR_CM33)
+#define VRING_ALIGNMENT   (0x100U)
+
+#define RSC_TABLE_NUM_RPMSG_BUFF 512
+
+enum rsc_table_entries {
+	RSC_TABLE_VDEV_ENTRY,
+	RSC_TABLE_NUM_ENTRY
+};
+
+struct fw_resource_table {
+	unsigned int ver;
+	unsigned int num;
+	unsigned int reserved[2];
+	unsigned int offset[RSC_TABLE_NUM_ENTRY];
+
+	struct fw_rsc_vdev vdev;
+	struct fw_rsc_vdev_vring vring0;
+	struct fw_rsc_vdev_vring vring1;
+} METAL_PACKED_END;
+
+void rsc_table_get(void **table_ptr, int *length);
+
+static inline struct fw_rsc_vdev *rsc_table_to_vdev(void *rsc_table)
+{
+	return &((struct fw_resource_table *)rsc_table)->vdev;
+}
+
+static inline struct fw_rsc_vdev_vring *rsc_table_get_vring0(void *rsc_table)
+{
+	return &((struct fw_resource_table *)rsc_table)->vring0;
+}
+
+static inline struct fw_rsc_vdev_vring *rsc_table_get_vring1(void *rsc_table)
+{
+	return &((struct fw_resource_table *)rsc_table)->vring1;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/samples/boards/st/backup_sram/sample.yaml b/samples/boards/st/backup_sram/sample.yaml
index 8c22ee9566bf6..2a73295db8d5b 100644
--- a/samples/boards/st/backup_sram/sample.yaml
+++ b/samples/boards/st/backup_sram/sample.yaml
@@ -6,3 +6,7 @@ tests:
     depends_on: backup_sram
     build_only: true
     filter: dt_compat_enabled("st,stm32-backup-sram")
+    vendor_allow:
+      - st
+    integration_platforms:
+      - nucleo_f207zg/stm32f207xx
diff --git a/samples/boards/st/ccm/src/main.c b/samples/boards/st/ccm/src/main.c
index 8cd888641b76f..36630d02858b6 100644
--- a/samples/boards/st/ccm/src/main.c
+++ b/samples/boards/st/ccm/src/main.c
@@ -125,7 +125,7 @@ int main(void)
 	printf("Initialised DATA area     : [%p, %p)\n",
 		&__ccm_data_start, &__ccm_data_end);
 	printf("Start of DATA in FLASH    : %p\n",
-		&__ccm_data_rom_start);
+		&__ccm_data_load_start);
 
 	check_initial_var_values();
 
diff --git a/samples/boards/st/h7_dual_core/sample.yaml b/samples/boards/st/h7_dual_core/sample.yaml
index 08ffab25c48ad..9b3e2b11e07d3 100644
--- a/samples/boards/st/h7_dual_core/sample.yaml
+++ b/samples/boards/st/h7_dual_core/sample.yaml
@@ -3,6 +3,9 @@ sample:
   name: stm32_h7_dual_core
 tests:
   sample.boards.stm32.h7_dual_core:
-    depends_on: mailbox
     build_only: true
+    vendor_allow:
+      - st
     filter: dt_compat_enabled("st,stm32-hsem-mailbox")
+    integration_platforms:
+      - stm32h747i_disco/stm32h747xx/m4
diff --git a/samples/boards/st/mco/boards/nucleo_f411re.overlay b/samples/boards/st/mco/boards/nucleo_f411re.overlay
index 3e71e127fd0dc..7c83914b2c068 100644
--- a/samples/boards/st/mco/boards/nucleo_f411re.overlay
+++ b/samples/boards/st/mco/boards/nucleo_f411re.overlay
@@ -8,6 +8,11 @@
 	status = "okay";
 };
 
+/* Enable HSI as it will be output on MCO pin by this sample */
+&clk_hsi {
+	status = "okay";
+};
+
 /* see RefMan RM0383 */
 &mco1 {
 	/* Select One of the line below for clock source */
diff --git a/samples/boards/st/mco/boards/nucleo_wba55cg.overlay b/samples/boards/st/mco/boards/nucleo_wba55cg.overlay
new file mode 100644
index 0000000000000..328e5058a98ba
--- /dev/null
+++ b/samples/boards/st/mco/boards/nucleo_wba55cg.overlay
@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 STMicroelectronics
+ */
+
+/* The clock that is output must be enabled. */
+&clk_lse {
+	status = "okay";
+};
+
+/ {
+	chosen {
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+	};
+};
+
+&usart1 {
+	/* Do not use the console RX pin : dedicated to the MCO */
+	pinctrl-0 = <&usart1_tx_pb12 &analog_pa8>;
+};
+
+&mco1 {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_LSE MCO1_SEL(MCO_SEL_LSE)>;
+	prescaler = <MCO1_PRE(MCO_PRE_DIV_2)>;
+	pinctrl-0 = <&rcc_mco_pa8>;
+	pinctrl-names = "default";
+};
diff --git a/samples/boards/st/mco/boards/nucleo_wl55jc.overlay b/samples/boards/st/mco/boards/nucleo_wl55jc.overlay
new file mode 100644
index 0000000000000..fced2482454fa
--- /dev/null
+++ b/samples/boards/st/mco/boards/nucleo_wl55jc.overlay
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 STMicroelectronics
+ */
+
+/* Enable the clock we are going to output */
+&clk_lse {
+	status = "okay";
+};
+
+&mco1 {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_LSE MCO1_SEL(MCO_SEL_LSE)>;
+	prescaler = <MCO1_PRE(MCO_PRE_DIV_1)>;
+	pinctrl-0 = <&rcc_mco_pa8>;
+	pinctrl-names = "default";
+};
diff --git a/samples/boards/st/mco/sample.yaml b/samples/boards/st/mco/sample.yaml
index 6d052cae771ab..77dda18c803da 100644
--- a/samples/boards/st/mco/sample.yaml
+++ b/samples/boards/st/mco/sample.yaml
@@ -2,11 +2,14 @@ sample:
   name: STM32 microcontroller clock output (MCO) example
 tests:
   sample.board.stm32.mco:
+    build_only: true
     platform_allow:
       - nucleo_f411re
       - nucleo_f446ze
       - stm32f746g_disco
       - nucleo_u5a5zj_q
+      - nucleo_wba55cg
+      - nucleo_wl55jc
     integration_platforms:
       - stm32f746g_disco
     tags: board
diff --git a/samples/boards/st/power_mgmt/adc/boards/nucleo_wba52cg.overlay b/samples/boards/st/power_mgmt/adc/boards/nucleo_wba55cg.overlay
similarity index 100%
rename from samples/boards/st/power_mgmt/adc/boards/nucleo_wba52cg.overlay
rename to samples/boards/st/power_mgmt/adc/boards/nucleo_wba55cg.overlay
diff --git a/samples/boards/st/power_mgmt/blinky/README.rst b/samples/boards/st/power_mgmt/blinky/README.rst
index 6e2920ca0ecda..0d114180c42e1 100644
--- a/samples/boards/st/power_mgmt/blinky/README.rst
+++ b/samples/boards/st/power_mgmt/blinky/README.rst
@@ -31,7 +31,7 @@ Building and Running
 Build and flash Blinky as follows, changing ``stm32l562e_dk`` for your board:
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
+   :zephyr-app: samples/boards/st/power_mgmt/blinky
    :board: stm32l562e_dk
    :goals: build flash
    :compact:
diff --git a/samples/boards/st/uart/circular_dma/README.rst b/samples/boards/st/uart/circular_dma/README.rst
index 9614365eeb843..d4c448670c095 100644
--- a/samples/boards/st/uart/circular_dma/README.rst
+++ b/samples/boards/st/uart/circular_dma/README.rst
@@ -1,8 +1,8 @@
-.. zephyr:code-sample:: uart
+.. zephyr:code-sample:: uart-circular-dma
    :name: UART circular mode
    :relevant-api: uart_interface
 
-   Read data from the console and echo it back using a circular dma configuration.
+   Read data from the console and echo it back using a circular DMA configuration.
 
 Overview
 ********
diff --git a/samples/boards/st/uart/circular_dma/boards/nucleo_u575zi_q.overlay b/samples/boards/st/uart/circular_dma/boards/nucleo_u575zi_q.overlay
new file mode 100644
index 0000000000000..370cf3def478e
--- /dev/null
+++ b/samples/boards/st/uart/circular_dma/boards/nucleo_u575zi_q.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&usart1 {
+	dmas = <&gpdma1 0 25 (STM32_DMA_PERIPH_TX)
+		&gpdma1 1 24 (STM32_DMA_MODE_CYCLIC | STM32_DMA_PERIPH_RX | STM32_DMA_MEM_8BITS)>;
+	dma-names = "tx", "rx";
+	fifo-enable;
+};
+
+&gpdma1 {
+	status = "okay";
+};
diff --git a/samples/cpp/hello_world/sample.yaml b/samples/cpp/hello_world/sample.yaml
index 244c7b4f3453c..98ae71ebe8345 100644
--- a/samples/cpp/hello_world/sample.yaml
+++ b/samples/cpp/hello_world/sample.yaml
@@ -2,7 +2,9 @@ sample:
   description: Hello World C++ sample, the simplest C++ Zephyr application
   name: hello cpp world
 common:
-  tags: introduction
+  tags:
+    - introduction
+    - cpp
   integration_platforms:
     - qemu_riscv32
   harness: console
diff --git a/samples/drivers/adc/adc_dt/boards/arduino_uno_r4.overlay b/samples/drivers/adc/adc_dt/boards/arduino_uno_r4.overlay
new file mode 100644
index 0000000000000..c9a0303f4bee5
--- /dev/null
+++ b/samples/drivers/adc/adc_dt/boards/arduino_uno_r4.overlay
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&arduino_adc 0>, <&arduino_adc 1>, <&arduino_adc 2>,
+			      <&arduino_adc 3>, <&arduino_adc 4>, <&arduino_adc 5>;
+	};
+};
+
+&adc0 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+
+	channel@9 {
+		reg = <9>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+
+	channel@21 {
+		reg = <21>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+
+	channel@22 {
+		reg = <22>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+};
diff --git a/samples/drivers/adc/adc_dt/boards/cyw920829m2evk_02.overlay b/samples/drivers/adc/adc_dt/boards/cyw920829m2evk_02.overlay
index 540cbef09bff2..71b416c018a1d 100644
--- a/samples/drivers/adc/adc_dt/boards/cyw920829m2evk_02.overlay
+++ b/samples/drivers/adc/adc_dt/boards/cyw920829m2evk_02.overlay
@@ -23,7 +23,7 @@
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 1)>;
 		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,resolution = <12>;
+		zephyr,resolution = <16>;
 		zephyr,input-positive = <4>;   /* P3.4 */
 	};
 
@@ -32,7 +32,7 @@
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 1)>;
 		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,resolution = <12>;
+		zephyr,resolution = <16>;
 		zephyr,input-positive = <5>;   /* P3.5 */
 	};
 
@@ -41,7 +41,7 @@
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 1)>;
 		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,resolution = <12>;
+		zephyr,resolution = <16>;
 		zephyr,input-positive = <6>;   /* P3.6 */
 	};
 
@@ -50,7 +50,7 @@
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 1)>;
 		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,resolution = <12>;
+		zephyr,resolution = <16>;
 		zephyr,input-positive = <7>;   /* P3.7 */
 	};
 };
diff --git a/samples/drivers/adc/adc_dt/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/drivers/adc/adc_dt/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
rename to samples/drivers/adc/adc_dt/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
diff --git a/samples/drivers/adc/adc_dt/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/samples/drivers/adc/adc_dt/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
deleted file mode 100644
index b07fe80528be6..0000000000000
--- a/samples/drivers/adc/adc_dt/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2020 Linaro Limited
- * Copyright 2023-2024 NXP
- */
-
-#include <zephyr/dt-bindings/adc/mcux-lpadc.h>
-
-/ {
-	zephyr,user {
-		/* adjust channel number according to pinmux in board.dts */
-		io-channels = <&lpadc0 0>;
-	};
-};
-
-&lpadc0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	/*
-	 * To use this sample:
-	 * - Connect LPADC0 CH0 signal to voltage between 0~1.8V (J9 pin 10)
-	 */
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_EXTERNAL0";
-		zephyr,vref-mv = <1800>;
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_TICKS, 7)>;
-		zephyr,resolution = <12>;
-		zephyr,input-positive = <MCUX_LPADC_CH0A>;
-	};
-};
diff --git a/samples/drivers/adc/adc_dt/boards/nucleo_wba52cg.overlay b/samples/drivers/adc/adc_dt/boards/nucleo_wba55cg.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/nucleo_wba52cg.overlay
rename to samples/drivers/adc/adc_dt/boards/nucleo_wba55cg.overlay
diff --git a/samples/drivers/adc/adc_dt/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_dt/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..321f7e6b05aab
--- /dev/null
+++ b/samples/drivers/adc/adc_dt/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>; /* P1.11 */
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>; /* P1.06 */
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_VDD>;
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
+	channel@7 {
+		reg = <7>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN6>; /* P1.13 */
+		zephyr,input-negative = <NRF_SAADC_AIN7>; /* P1.14 */
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/samples/drivers/adc/adc_dt/boards/pico_plus2_rp2350b_m33.overlay b/samples/drivers/adc/adc_dt/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..abf2d227844b9
--- /dev/null
+++ b/samples/drivers/adc/adc_dt/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,24 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/samples/drivers/adc/adc_dt/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/samples/drivers/adc/adc_dt/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..1d80e7ce4219a
--- /dev/null
+++ b/samples/drivers/adc/adc_dt/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 2>;
+	};
+};
+
+&adc {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <1800>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <1800>;
+	};
+};
diff --git a/samples/drivers/adc/adc_dt/boards/xg29_rb4412a.overlay b/samples/drivers/adc/adc_dt/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..720a26a5688cb
--- /dev/null
+++ b/samples/drivers/adc/adc_dt/boards/xg29_rb4412a.overlay
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ */
+
+#include <dt-bindings/pinctrl/silabs/xg29-pinctrl.h>
+#include <dt-bindings/adc/silabs-adc.h>
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 3>, <&adc0 4>;
+	};
+};
+
+&pinctrl {
+	adc0_default: adc0_default {
+		group0 {
+			/* Allocate odd bus 0 on GPIO port B to IADC for access to pin PB1 */
+			silabs,analog-bus = <ABUS_BODD0_IADC0>;
+		};
+	};
+};
+
+&adc0 {
+	pinctrl-0 = <&adc0_default>;
+	pinctrl-names = "default";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	channel@3 {
+		reg = <3>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_AVDD>;
+	};
+
+	channel@4 {
+		reg = <4>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_VDD_1";
+		zephyr,vref-mv = <3300>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_PD3>;
+	};
+};
diff --git a/samples/drivers/adc/adc_dt/sample.yaml b/samples/drivers/adc/adc_dt/sample.yaml
index f686b8edcb5f1..63cbdef98b949 100644
--- a/samples/drivers/adc/adc_dt/sample.yaml
+++ b/samples/drivers/adc/adc_dt/sample.yaml
@@ -17,6 +17,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - mec172xevb_assy6906
       - gd32f350r_eval
       - gd32f450i_eval
@@ -36,6 +37,7 @@ tests:
       - frdm_mcxc242
       - ucans32k1sic
       - xg24_rb4187c
+      - xg29_rb4412a
     integration_platforms:
       - nucleo_l073rz
       - nrf52840dk/nrf52840
diff --git a/samples/drivers/adc/adc_sequence/README.rst b/samples/drivers/adc/adc_sequence/README.rst
index 1227f44d9a17b..5c5cd9b58e169 100644
--- a/samples/drivers/adc/adc_sequence/README.rst
+++ b/samples/drivers/adc/adc_sequence/README.rst
@@ -31,7 +31,7 @@ Building and Running for Nordic nRF52840
 ========================================
 
 The sample can be built and executed for the
-:ref:`nrf52840dk_nrf52840` as follows:
+:zephyr:board:`nrf52840dk` as follows:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/adc/adc_sequence
diff --git a/samples/drivers/adc/adc_sequence/boards/arduino_due.overlay b/samples/drivers/adc/adc_sequence/boards/arduino_due.overlay
new file mode 100644
index 0000000000000..ca34d9d18ad15
--- /dev/null
+++ b/samples/drivers/adc/adc_sequence/boards/arduino_due.overlay
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 Centro de Inovacao EDGE
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		adc0 = &adc0;
+	};
+};
+
+&adc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	pinctrl-0 = <&adc0_default>;
+	pinctrl-names = "default";
+
+	prescaler = <9>;
+	startup-time = <64>;
+	settling-time = <3>;
+	tracking-time = <2>;
+
+	/* External ADC(+) */
+	channel@6 { // Connector A1
+		reg = <6>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <6>;
+		zephyr,vref-mv = <3300>;
+	};
+	channel@7 { // Connector A0
+		reg = <7>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <7>;
+		zephyr,vref-mv = <3300>;
+	};
+};
diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 5f7e20136b49c..bf53616d92856 100644
--- a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -12,7 +12,7 @@
 
 / {
 	zephyr,user {
-		io-channels = <&adc 0>, <&adc 1>, <&adc 7>;
+		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
 	};
 };
 
@@ -39,6 +39,16 @@
 		zephyr,oversampling = <8>;
 	};
 
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1_2";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN9>; /* P9.01 */
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
 	channel@7 {
 		reg = <7>;
 		zephyr,gain = "ADC_GAIN_1_2";
diff --git a/samples/drivers/adc/adc_sequence/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..7fedbe52ad2fc
--- /dev/null
+++ b/samples/drivers/adc/adc_sequence/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 7>;
+	};
+};
+
+/ {
+	aliases {
+		adc0 = &adc;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>; /* P1.11 */
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>; /* P1.06 */
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_DVDD>; /* 0.9 V internal */
+		zephyr,resolution = <12>;
+		zephyr,oversampling = <8>;
+	};
+
+	channel@7 {
+		reg = <7>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN6>; /* P1.13 */
+		zephyr,input-negative = <NRF_SAADC_AIN7>; /* P1.14 */
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/samples/drivers/adc/adc_sequence/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.conf b/samples/drivers/adc/adc_sequence/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.conf
new file mode 100644
index 0000000000000..65f176fd23b9c
--- /dev/null
+++ b/samples/drivers/adc/adc_sequence/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.conf
@@ -0,0 +1 @@
+CONFIG_SEQUENCE_RESOLUTION=12
diff --git a/samples/drivers/adc/adc_sequence/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/samples/drivers/adc/adc_sequence/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..8f8b9739b9704
--- /dev/null
+++ b/samples/drivers/adc/adc_sequence/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+/ {
+	aliases {
+		adc0 = &adc;
+	};
+};
+
+&adc {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <1800>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <1800>;
+	};
+};
diff --git a/samples/drivers/adc/adc_sequence/sample.yaml b/samples/drivers/adc/adc_sequence/sample.yaml
index 0461205a058f6..099cedca654ae 100644
--- a/samples/drivers/adc/adc_sequence/sample.yaml
+++ b/samples/drivers/adc/adc_sequence/sample.yaml
@@ -11,6 +11,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - ucans32k1sic
       - frdm_mcxc242
       - stm32f3_disco
diff --git a/samples/drivers/audio/dmic/README.rst b/samples/drivers/audio/dmic/README.rst
index 1382ff0a9cea1..2c124b8e83d42 100644
--- a/samples/drivers/audio/dmic/README.rst
+++ b/samples/drivers/audio/dmic/README.rst
@@ -17,8 +17,8 @@ Requirements
 
 The device to be used by the sample is specified by defining a devicetree node
 label named ``dmic_dev``.
-The sample has been tested on :ref:`nrf52840dk_nrf52840` (nrf52840dk/nrf52840)
-and :ref:`nrf5340dk_nrf5340` (nrf5340dk/nrf5340/cpuapp), and provides overlay
+The sample has been tested on :zephyr:board:`nrf52840dk` (nrf52840dk/nrf52840)
+and :zephyr:board:`nrf5340dk` (nrf5340dk/nrf5340/cpuapp), and provides overlay
 files for both of these boards.
 
 Building and Running
diff --git a/samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..3699a9e9563e7
--- /dev/null
+++ b/samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 10)>,
+				<NRF_PSEL(PDM_DIN, 1, 11)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};
diff --git a/samples/drivers/audio/dmic/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/drivers/audio/dmic/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..45e09d9a0f33d
--- /dev/null
+++ b/samples/drivers/audio/dmic/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 12)>,
+				<NRF_PSEL(PDM_DIN, 1, 13)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};
diff --git a/samples/drivers/clock_control_litex/README.rst b/samples/drivers/clock_control_litex/README.rst
index eb01b39b9949c..c32ecb27767f6 100644
--- a/samples/drivers/clock_control_litex/README.rst
+++ b/samples/drivers/clock_control_litex/README.rst
@@ -132,4 +132,5 @@ Sample output
 
 References
 **********
-- :ref:`litex-vexriscv`
+
+- :zephyr:board:`litex_vexriscv`
diff --git a/samples/drivers/counter/alarm/boards/ek_ra4m1.overlay b/samples/drivers/counter/alarm/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..5b83678c38c07
--- /dev/null
+++ b/samples/drivers/counter/alarm/boards/ek_ra4m1.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&agt0 {
+	status = "okay";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "agti", "agtcmai";
+	renesas,prescaler = <4>;
+	counter0: counter {
+		status = "okay";
+	};
+};
diff --git a/samples/drivers/counter/alarm/src/main.c b/samples/drivers/counter/alarm/src/main.c
index d7f577e72c7e5..6690aca834489 100644
--- a/samples/drivers/counter/alarm/src/main.c
+++ b/samples/drivers/counter/alarm/src/main.c
@@ -31,7 +31,7 @@ struct counter_alarm_cfg alarm_cfg;
 #define TIMER DT_INST(0, st_stm32_rtc)
 #elif defined(CONFIG_COUNTER_SMARTBOND_TIMER)
 #define TIMER DT_NODELABEL(timer3)
-#elif defined(CONFIG_COUNTER_NATIVE_POSIX)
+#elif defined(CONFIG_COUNTER_NATIVE_SIM)
 #define TIMER DT_NODELABEL(counter0)
 #elif defined(CONFIG_COUNTER_XLNX_AXI_TIMER)
 #define TIMER DT_INST(0, xlnx_xps_timer_1_00_a)
@@ -54,7 +54,11 @@ struct counter_alarm_cfg alarm_cfg;
 #elif defined(CONFIG_COUNTER_SNPS_DW)
 #define TIMER DT_NODELABEL(timer0)
 #elif defined(CONFIG_COUNTER_TIMER_RPI_PICO)
+#ifdef CONFIG_SOC_SERIES_RP2040
 #define TIMER DT_NODELABEL(timer)
+#elif CONFIG_SOC_SERIES_RP2350
+#define TIMER DT_NODELABEL(timer0)
+#endif
 #elif defined(CONFIG_COUNTER_TIMER_MAX32)
 #define TIMER DT_NODELABEL(counter0)
 #elif defined(CONFIG_COUNTER_RA_AGT)
diff --git a/samples/drivers/crypto/src/main.c b/samples/drivers/crypto/src/main.c
index d4609fc2d10c0..a5a2fe01fabd8 100644
--- a/samples/drivers/crypto/src/main.c
+++ b/samples/drivers/crypto/src/main.c
@@ -31,6 +31,8 @@ LOG_MODULE_REGISTER(main);
 #define CRYPTO_DEV_COMPAT nordic_nrf_ecb
 #elif DT_HAS_COMPAT_STATUS_OKAY(renesas_smartbond_crypto)
 #define CRYPTO_DEV_COMPAT renesas_smartbond_crypto
+#elif DT_HAS_COMPAT_STATUS_OKAY(ti_cc23x0_aes)
+#define CRYPTO_DEV_COMPAT ti_cc23x0_aes
 #elif CONFIG_CRYPTO_SI32
 #define CRYPTO_DEV_COMPAT silabs_si32_aes
 #else
@@ -396,7 +398,7 @@ static const uint8_t ccm_expected[31] = {0x58, 0x8c, 0x97, 0x9a, 0x61, 0xc6, 0x6
 void ccm_mode(const struct device *dev)
 {
 	uint8_t encrypted[50] __aligned(IO_ALIGNMENT_BYTES);
-	uint8_t decrypted[25] __aligned(IO_ALIGNMENT_BYTES);
+	uint8_t decrypted[32] __aligned(IO_ALIGNMENT_BYTES);
 	struct cipher_ctx ini = {
 		.keylen = sizeof(ccm_key),
 		.key.bit_stream = ccm_key,
diff --git a/samples/drivers/dac/Kconfig b/samples/drivers/dac/Kconfig
index 2194ec09a5116..ce025e047cf44 100644
--- a/samples/drivers/dac/Kconfig
+++ b/samples/drivers/dac/Kconfig
@@ -1,6 +1,7 @@
 # Private config options for dac sample
 
 # Copyright (c) 2025 NXP
+# Copyright (c) 2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 mainmenu "DAC sample application"
@@ -14,3 +15,8 @@ config DAC_SAMPLE_RUN
 	default y if $(dt_node_has_prop,/$(ZEPHYR_USER),dac)
 	help
 	  platform supports dac sample
+
+config DAC_BUFFER_NOT_SUPPORT
+	bool "DAC on board/SoC does not support output buffer mode"
+	help
+	  If this config is turned on, the sample will run with no output buffer enabled
diff --git a/samples/drivers/dac/boards/ek_ra4l1.conf b/samples/drivers/dac/boards/ek_ra4l1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/samples/drivers/dac/boards/ek_ra4l1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/samples/drivers/dac/boards/ek_ra4l1.overlay b/samples/drivers/dac/boards/ek_ra4l1.overlay
new file mode 100644
index 0000000000000..a726274e2b2ff
--- /dev/null
+++ b/samples/drivers/dac/boards/ek_ra4l1.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
+	};
+};
diff --git a/samples/drivers/dac/boards/ek_ra4m1.conf b/samples/drivers/dac/boards/ek_ra4m1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/samples/drivers/dac/boards/ek_ra4m1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/samples/drivers/dac/boards/ek_ra4m1.overlay b/samples/drivers/dac/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..a726274e2b2ff
--- /dev/null
+++ b/samples/drivers/dac/boards/ek_ra4m1.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
+	};
+};
diff --git a/samples/drivers/dac/boards/ek_ra4w1.conf b/samples/drivers/dac/boards/ek_ra4w1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/samples/drivers/dac/boards/ek_ra4w1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/samples/drivers/dac/boards/ek_ra4w1.overlay b/samples/drivers/dac/boards/ek_ra4w1.overlay
new file mode 100644
index 0000000000000..a726274e2b2ff
--- /dev/null
+++ b/samples/drivers/dac/boards/ek_ra4w1.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
+	};
+};
diff --git a/samples/drivers/dac/boards/fpb_ra4e1.overlay b/samples/drivers/dac/boards/fpb_ra4e1.overlay
new file mode 100644
index 0000000000000..a726274e2b2ff
--- /dev/null
+++ b/samples/drivers/dac/boards/fpb_ra4e1.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
+	};
+};
diff --git a/samples/drivers/dac/boards/sam_v71_xult_samv71q21.overlay b/samples/drivers/dac/boards/sam_v71_xult_samv71q21.overlay
index a075a04a5e749..dad493e5f043e 100644
--- a/samples/drivers/dac/boards/sam_v71_xult_samv71q21.overlay
+++ b/samples/drivers/dac/boards/sam_v71_xult_samv71q21.overlay
@@ -5,3 +5,17 @@
 		dac-resolution = <12>;
 	};
 };
+
+&dacc{
+	status = "okay";
+	pinctrl-0 = <&dac_default>;
+	pinctrl-names = "default";
+};
+
+&pinctrl{
+	dac_default: dac_default{
+		group1 {
+			pinmux = <PB13X_DACC_DAC0>;
+		};
+	};
+};
diff --git a/samples/drivers/dac/boards/sam_v71_xult_samv71q21b.overlay b/samples/drivers/dac/boards/sam_v71_xult_samv71q21b.overlay
index a075a04a5e749..dad493e5f043e 100644
--- a/samples/drivers/dac/boards/sam_v71_xult_samv71q21b.overlay
+++ b/samples/drivers/dac/boards/sam_v71_xult_samv71q21b.overlay
@@ -5,3 +5,17 @@
 		dac-resolution = <12>;
 	};
 };
+
+&dacc{
+	status = "okay";
+	pinctrl-0 = <&dac_default>;
+	pinctrl-names = "default";
+};
+
+&pinctrl{
+	dac_default: dac_default{
+		group1 {
+			pinmux = <PB13X_DACC_DAC0>;
+		};
+	};
+};
diff --git a/samples/drivers/dac/boards/voice_ra4e1.overlay b/samples/drivers/dac/boards/voice_ra4e1.overlay
new file mode 100644
index 0000000000000..a726274e2b2ff
--- /dev/null
+++ b/samples/drivers/dac/boards/voice_ra4e1.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
+	};
+};
diff --git a/samples/drivers/dac/src/main.c b/samples/drivers/dac/src/main.c
index 308777928b129..71657a193418f 100644
--- a/samples/drivers/dac/src/main.c
+++ b/samples/drivers/dac/src/main.c
@@ -28,7 +28,11 @@ static const struct device *const dac_dev = DEVICE_DT_GET(DAC_NODE);
 static const struct dac_channel_cfg dac_ch_cfg = {
 	.channel_id  = DAC_CHANNEL_ID,
 	.resolution  = DAC_RESOLUTION,
-	.buffered = true
+#if defined(CONFIG_DAC_BUFFER_NOT_SUPPORT)
+	.buffered = false,
+#else
+	.buffered = true,
+#endif /* CONFIG_DAC_BUFFER_NOT_SUPPORT */
 };
 
 int main(void)
diff --git a/samples/drivers/display/README.rst b/samples/drivers/display/README.rst
index 628202888cca8..a0d3616dd3ef0 100644
--- a/samples/drivers/display/README.rst
+++ b/samples/drivers/display/README.rst
@@ -31,7 +31,7 @@ Building and Running
 
 As this is a generic sample it should work with any display supported by Zephyr.
 
-Below is an example on how to build for a :ref:`nrf52840dk_nrf52840` board with a
+Below is an example on how to build for a :zephyr:board:`nrf52840dk` board with a
 :ref:`adafruit_2_8_tft_touch_v2`.
 
 .. zephyr-app-commands::
diff --git a/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
similarity index 100%
rename from samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
rename to samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
diff --git a/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
deleted file mode 100644
index 0fbbef94c32ac..0000000000000
--- a/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2023, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_HEAP_MEM_POOL_SIZE=64928
diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml
index 494b117f1cf32..a235c8892cf3e 100644
--- a/samples/drivers/display/sample.yaml
+++ b/samples/drivers/display/sample.yaml
@@ -5,12 +5,10 @@ tests:
   sample.display.sdl:
     build_only: true
     platform_allow:
-      - native_posix/native/64
       - native_sim/native/64
     tags: display
   sample.display.dummy:
     platform_allow:
-      - native_posix
       - native_sim
     extra_args: DTC_OVERLAY_FILE="dummy_dc.overlay"
     extra_configs:
@@ -109,4 +107,6 @@ tests:
       - platform:frdm_mcxn947/mcxn947/cpu0:SHIELD=lcd_par_s035_8080
       - platform:frdm_mcxn236/mcxn236:SHIELD=lcd_par_s035_8080
       - platform:frdm_mcxa156/mcxa156:SHIELD=lcd_par_s035_8080
+      - platform:frdm_rw612:SHIELD=lcd_par_s035_spi
       - platform:ek_ra8d1:SHIELD=rtkmipilcdb00000be
+      - platform:ek_ra8d1:SHIELD=rtk7eka6m3b00001bu
diff --git a/samples/drivers/display/src/main.c b/samples/drivers/display/src/main.c
index fc12cc86e8fcf..d7b53938f787f 100644
--- a/samples/drivers/display/src/main.c
+++ b/samples/drivers/display/src/main.c
@@ -158,6 +158,13 @@ static void fill_buffer_mono(enum corner corner, uint8_t grey,
 	memset(buf, color, buf_size);
 }
 
+static inline void fill_buffer_l_8(enum corner corner, uint8_t grey, uint8_t *buf, size_t buf_size)
+{
+	for (size_t idx = 0; idx < buf_size; idx += 1) {
+		*(uint8_t *)(buf + idx) = grey;
+	}
+}
+
 static inline void fill_buffer_mono01(enum corner corner, uint8_t grey,
 				      uint8_t *buf, size_t buf_size)
 {
@@ -262,6 +269,10 @@ int main(void)
 		fill_buffer_fnc = fill_buffer_bgr565;
 		buf_size *= 2;
 		break;
+	case PIXEL_FORMAT_L_8:
+		bg_color = 0xFFu;
+		fill_buffer_fnc = fill_buffer_l_8;
+		break;
 	case PIXEL_FORMAT_MONO01:
 		bg_color = 0xFFu;
 		fill_buffer_fnc = fill_buffer_mono01;
diff --git a/samples/drivers/eeprom/sample.yaml b/samples/drivers/eeprom/sample.yaml
index 95fb7f8841836..b3eec0f461884 100644
--- a/samples/drivers/eeprom/sample.yaml
+++ b/samples/drivers/eeprom/sample.yaml
@@ -6,8 +6,6 @@ tests:
     tags: eeprom
     platform_allow:
       - gd32f450i_eval
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
     integration_platforms:
diff --git a/samples/drivers/espi/boards/mec1501modular_assy6885.overlay b/samples/drivers/espi/boards/mec1501modular_assy6885.overlay
index b89552680567e..a9be143174833 100644
--- a/samples/drivers/espi/boards/mec1501modular_assy6885.overlay
+++ b/samples/drivers/espi/boards/mec1501modular_assy6885.overlay
@@ -16,8 +16,8 @@
 
 &spi0 {
 	status = "okay";
-	port_sel = <0>;
-	chip_select = <0>;
+	port-sel = <0>;
+	chip-select = <0>;
 	lines = <4>;
 	pinctrl-0 = < &shd_cs0_n_gpio055
 		      &shd_clk_gpio056
diff --git a/samples/drivers/espi/boards/mec15xxevb_assy6853.overlay b/samples/drivers/espi/boards/mec15xxevb_assy6853.overlay
index 2fc8aeaede7ac..a68e6ffda611e 100644
--- a/samples/drivers/espi/boards/mec15xxevb_assy6853.overlay
+++ b/samples/drivers/espi/boards/mec15xxevb_assy6853.overlay
@@ -20,7 +20,7 @@
 
 &spi0 {
 	status = "okay";
-	port_sel = <0>;
-	chip_select = <0>;
+	port-sel = <0>;
+	chip-select = <0>;
 	lines = <4>;
 };
diff --git a/samples/drivers/flash_shell/sample.yaml b/samples/drivers/flash_shell/sample.yaml
index 01c5596b6ee84..0fa0e1440cfb4 100644
--- a/samples/drivers/flash_shell/sample.yaml
+++ b/samples/drivers/flash_shell/sample.yaml
@@ -7,12 +7,13 @@ tests:
       - flash
       - shell
     filter: CONFIG_FLASH_HAS_DRIVER_ENABLED and dt_chosen_enabled('zephyr,flash-controller')
+            and not CONFIG_SOC_SERIES_BSIM_NRFXX
     platform_exclude:
       - stm32h7s78_dk
       - gd32f350r_eval
     harness: shell
     extra_configs:
-      - arch:posix:CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+      - arch:posix:CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
     min_ram: 12
     integration_platforms:
       - qemu_x86
diff --git a/samples/drivers/flash_shell/test_shell.yml b/samples/drivers/flash_shell/test_shell.yml
index f04555d8935b0..2e4dbee98a022 100644
--- a/samples/drivers/flash_shell/test_shell.yml
+++ b/samples/drivers/flash_shell/test_shell.yml
@@ -1,3 +1,2 @@
-test_shell_harness:
 - command: "flash page_info 0"
   expected: "Page for address 0x0"
diff --git a/samples/drivers/gnss/sample.yaml b/samples/drivers/gnss/sample.yaml
index 385a4ca0b6796..0ddd7262a2186 100644
--- a/samples/drivers/gnss/sample.yaml
+++ b/samples/drivers/gnss/sample.yaml
@@ -9,4 +9,5 @@ tests:
       - drivers
       - gnss
     filter: dt_alias_exists("gnss")
-    depends_on: gnss
+    integration_platforms:
+      - mimxrt1062_fmurt6
diff --git a/samples/drivers/ht16k33/README.rst b/samples/drivers/ht16k33/README.rst
index a7e747f2f92e8..eb6f730022ed5 100644
--- a/samples/drivers/ht16k33/README.rst
+++ b/samples/drivers/ht16k33/README.rst
@@ -1,6 +1,6 @@
 .. zephyr:code-sample:: ht16k33
    :name: HT16K33 LED driver with keyscan
-   :relevant-api: led_interface kscan_interface
+   :relevant-api: led_interface input_interface
 
    Control up to 128 LEDs connected to an HT16K33 LED driver and log keyscan events.
 
@@ -23,7 +23,7 @@ The sample logs keyscan events on the console.
 Building and Running
 ********************
 
-Build the application for the :ref:`nrf52840dk_nrf52840` board, and
+Build the application for the :zephyr:board:`nrf52840dk` board, and
 connect an HT16K33 LED driver at address 0x70 on the I2C-0 bus.
 
 .. zephyr-app-commands::
@@ -33,7 +33,7 @@ connect an HT16K33 LED driver at address 0x70 on the I2C-0 bus.
    :compact:
 
 For flashing the application, refer to the Flashing section of the
-:ref:`nrf52840dk_nrf52840` board documentation.
+:zephyr:board:`nrf52840dk` board documentation.
 
 References
 **********
diff --git a/samples/drivers/ht16k33/boards/nrf52840dk_nrf52840.overlay b/samples/drivers/ht16k33/boards/nrf52840dk_nrf52840.overlay
index 7f859fb161524..3fc5507ad25e8 100644
--- a/samples/drivers/ht16k33/boards/nrf52840dk_nrf52840.overlay
+++ b/samples/drivers/ht16k33/boards/nrf52840dk_nrf52840.overlay
@@ -12,9 +12,5 @@
 		reg = <0x70>;
 		/* Uncomment to use IRQ instead of polling: */
 		/* irq-gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; */
-
-		kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
 	};
 };
diff --git a/samples/drivers/ht16k33/prj.conf b/samples/drivers/ht16k33/prj.conf
index fb580b9300246..acfe5eba3eaf2 100644
--- a/samples/drivers/ht16k33/prj.conf
+++ b/samples/drivers/ht16k33/prj.conf
@@ -1,6 +1,6 @@
 CONFIG_LOG=y
 CONFIG_I2C=y
 CONFIG_LED=y
-CONFIG_KSCAN=y
 CONFIG_INPUT=y
+CONFIG_INPUT_EVENT_DUMP=y
 CONFIG_HT16K33_KEYSCAN=y
diff --git a/samples/drivers/ht16k33/src/main.c b/samples/drivers/ht16k33/src/main.c
index 7ede8c6a0d358..e30c36122f961 100644
--- a/samples/drivers/ht16k33/src/main.c
+++ b/samples/drivers/ht16k33/src/main.c
@@ -5,7 +5,6 @@
  */
 
 #include <zephyr/drivers/led.h>
-#include <zephyr/drivers/kscan.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
@@ -13,20 +12,10 @@
 LOG_MODULE_REGISTER(main, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define LED_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(holtek_ht16k33)
-#define KEY_NODE DT_CHILD(LED_NODE, kscan_input)
-
-static void keyscan_callback(const struct device *dev, uint32_t row,
-			     uint32_t column, bool pressed)
-{
-	LOG_INF("Row %d, column %d %s", row, column,
-		pressed ? "pressed" : "released");
-}
 
 int main(void)
 {
 	const struct device *const led = DEVICE_DT_GET(LED_NODE);
-	const struct device *const key = DEVICE_DT_GET(KEY_NODE);
-	int err;
 	int i;
 
 	if (!device_is_ready(led)) {
@@ -34,16 +23,6 @@ int main(void)
 		return 0;
 	}
 
-	if (!device_is_ready(key)) {
-		LOG_ERR("Keyscan device not ready");
-		return 0;
-	}
-
-	err = kscan_config(key, keyscan_callback);
-	if (err) {
-		LOG_ERR("Failed to add keyscan callback (err %d)", err);
-	}
-
 	while (1) {
 		LOG_INF("Iterating through all LEDs, turning them on "
 			"one-by-one");
diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 0000000000000..9a83d7afb811c
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..928b52a66f57a
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P2.8 and P2.9
+ * SCL = P1.2 and P1.3
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c130;
+		i2c-controller-target = &i2c131;
+	};
+};
+
+&pinctrl {
+	i2c130_default: i2c130_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c130_sleep: i2c130_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	i2c131_default: i2c131_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c131_sleep: i2c131_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c130_default>;
+	pinctrl-1 = <&i2c130_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
+
+&i2c131 {
+	compatible = "nordic,nrf-twis";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c131_default>;
+	pinctrl-1 = <&i2c131_sleep>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
diff --git a/samples/drivers/i2c/rtio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.conf b/samples/drivers/i2c/rtio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.conf
new file mode 100644
index 0000000000000..c8ffd42673e4b
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/samples/drivers/i2c/rtio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/drivers/i2c/rtio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..f47fe8bad2af2
--- /dev/null
+++ b/samples/drivers/i2c/rtio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.10 and P1.11
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c21;
+		i2c-controller-target = &i2c22;
+	};
+};
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+};
diff --git a/samples/drivers/i2c/rtio_loopback/sample.yaml b/samples/drivers/i2c/rtio_loopback/sample.yaml
index e7d5563f5b1b2..cf081c7670c70 100644
--- a/samples/drivers/i2c/rtio_loopback/sample.yaml
+++ b/samples/drivers/i2c/rtio_loopback/sample.yaml
@@ -5,7 +5,15 @@ tests:
     tags:
       - rtio
       - i2c_target
+    harness: console
+    harness_config:
+      fixture: i2c_bus_short
+      type: one_line
+      regex:
+        - "sample complete"
     platform_allow:
       - b_u585i_iot02a
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/samples/drivers/i2s/echo/README.rst b/samples/drivers/i2s/echo/README.rst
index 6dfb674c1e242..041bfd0de73a0 100644
--- a/samples/drivers/i2s/echo/README.rst
+++ b/samples/drivers/i2s/echo/README.rst
@@ -22,8 +22,8 @@ a devicetree node label named ``i2s_rxtx`` or separate node labels ``i2s_rx``
 and ``i2s_tx`` if separate I2S devices are to be used for the RX and TX
 streams.
 
-This sample has been tested on :ref:`nrf52840dk_nrf52840` (nrf52840dk/nrf52840)
-and :ref:`nrf5340dk_nrf5340` (nrf5340dk/nrf5340/cpuapp), using the Audio Codec
+This sample has been tested on :zephyr:board:`nrf52840dk` (nrf52840dk/nrf52840)
+and :zephyr:board:`nrf5340dk` (nrf5340dk/nrf5340/cpuapp), using the Audio Codec
 Shield, and provides overlay files for both of these boards.
 
 More information about the used shield and the CODEC itself can be found here:
diff --git a/samples/drivers/i2s/echo/boards/esp32_devkitc_wrover_procpu.overlay b/samples/drivers/i2s/echo/boards/esp32_devkitc_wrover_procpu.overlay
new file mode 100644
index 0000000000000..a0eb2eb24cc69
--- /dev/null
+++ b/samples/drivers/i2s/echo/boards/esp32_devkitc_wrover_procpu.overlay
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&i2s0_default {
+	group1 {
+		pinmux = <I2S0_O_WS_GPIO33>,
+				<I2S0_O_BCK_GPIO32>,
+				<I2S0_O_SD_GPIO27>,
+				<I2S0_I_WS_GPIO26>,
+				<I2S0_I_BCK_GPIO25>;
+		output-enable;
+	};
+	group2 {
+		pinmux = <I2S0_I_SD_GPIO18>;
+		input-enable;
+	};
+};
+
+i2s_rxtx: &i2s0 {
+	status = "okay";
+
+	interrupts = <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>,
+		<I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>;
+	interrupt-names = "tx", "rx";
+
+};
diff --git a/samples/drivers/i2s/echo/boards/esp32s2_devkitc.overlay b/samples/drivers/i2s/echo/boards/esp32s2_devkitc.overlay
new file mode 100644
index 0000000000000..fca91d46bd570
--- /dev/null
+++ b/samples/drivers/i2s/echo/boards/esp32s2_devkitc.overlay
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&i2s0_default {
+	group1 {
+		pinmux = <I2S0_O_WS_GPIO17>,
+				<I2S0_O_BCK_GPIO16>,
+				<I2S0_O_SD_GPIO15>,
+				<I2S0_I_WS_GPIO11>,
+				<I2S0_I_BCK_GPIO10>;
+		output-enable;
+	};
+	group2 {
+		pinmux = <I2S0_I_SD_GPIO18>;
+		input-enable;
+	};
+};
+
+i2s_rxtx: &i2s0 {
+	status = "okay";
+
+	interrupts = <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>,
+		<I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>;
+	interrupt-names = "tx", "rx";
+
+};
diff --git a/samples/drivers/i2s/echo/boards/esp32s3_devkitc_procpu.overlay b/samples/drivers/i2s/echo/boards/esp32s3_devkitc_procpu.overlay
index 951f535893d85..de41dcb08d279 100644
--- a/samples/drivers/i2s/echo/boards/esp32s3_devkitc_procpu.overlay
+++ b/samples/drivers/i2s/echo/boards/esp32s3_devkitc_procpu.overlay
@@ -1,52 +1,28 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-&pinctrl {
-	i2s0_pinconf: i2s0_pinconf {
-		group1 {
-			pinmux = <I2S0_MCLK_GPIO42>,
-				 <I2S0_O_WS_GPIO41>,
-				 <I2S0_O_BCK_GPIO40>,
-				 <I2S0_O_SD_GPIO39>;
-			output-enable;
-		};
+&i2s0_default {
+	group1 {
+		pinmux = <I2S0_MCLK_GPIO42>,
+				<I2S0_O_WS_GPIO41>,
+				<I2S0_O_BCK_GPIO40>,
+				<I2S0_O_SD_GPIO39>;
+		output-enable;
 	};
-
-	i2s1_pinconf: i2s1_pinconf {
-		group1 {
-			pinmux = <I2S1_MCLK_GPIO35>,
-				 <I2S1_I_WS_GPIO36>,
-				 <I2S1_I_BCK_GPIO37>;
-			output-enable;
-		};
-		group2 {
-			pinmux = <I2S1_I_SD_GPIO38>;
-			input-enable;
-		};
+	group2 {
+		pinmux = <I2S0_I_SD_GPIO38>;
+		input-enable;
 	};
 };
 
-i2s_tx: &i2s0 {
+i2s_rxtx: &i2s0 {
 	status = "okay";
 
-	pinctrl-0 = <&i2s0_pinconf>;
-	pinctrl-names = "default";
-
-	dmas = <&dma 3>;
-	dma-names = "tx";
-};
-
-i2s_rx: &i2s1 {
-	status = "okay";
-
-	pinctrl-0 = <&i2s1_pinconf>;
-	pinctrl-names = "default";
-
-	dmas = <&dma 4>;
-	dma-names = "rx";
+	dmas = <&dma 2>, <&dma 3>;
+	dma-names = "rx", "tx";
 };
 
 &dma {
diff --git a/samples/drivers/i2s/i2s_codec/boards/stm32f4_disco.conf b/samples/drivers/i2s/i2s_codec/boards/stm32f4_disco.conf
new file mode 100644
index 0000000000000..b3872c1efe5e2
--- /dev/null
+++ b/samples/drivers/i2s/i2s_codec/boards/stm32f4_disco.conf
@@ -0,0 +1,8 @@
+# Copyright 2025 Titouan Christophe
+# SPDX-License-Identifier: Apache-2.0
+
+# Even though the stm32f4_disco board overlay is tuned for 22.05/44.1/88.2kHz
+# audio output, it hasn't enough RAM to hold all buffers allocated by this
+# sample at such higher audio rates
+CONFIG_SAMPLE_FREQ=8000
+CONFIG_AUDIO_CODEC=y
diff --git a/samples/drivers/i2s/i2s_codec/boards/stm32f4_disco.overlay b/samples/drivers/i2s/i2s_codec/boards/stm32f4_disco.overlay
new file mode 100644
index 0000000000000..e4adf92457874
--- /dev/null
+++ b/samples/drivers/i2s/i2s_codec/boards/stm32f4_disco.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Titouan Christophe
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		i2s-codec-tx = &i2s3;
+	};
+};
diff --git a/samples/drivers/i2s/output/boards/esp32_devkitc_wrover_procpu.overlay b/samples/drivers/i2s/output/boards/esp32_devkitc_wrover_procpu.overlay
new file mode 100644
index 0000000000000..ee5fa6e31d570
--- /dev/null
+++ b/samples/drivers/i2s/output/boards/esp32_devkitc_wrover_procpu.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		i2s-tx = &i2s0;
+	};
+};
+
+&i2s0_default {
+	group1 {
+		pinmux = <I2S0_O_WS_GPIO33>,
+				<I2S0_O_BCK_GPIO32>,
+				<I2S0_O_SD_GPIO27>;
+		output-enable;
+	};
+	group2 {
+		pinmux = <I2S0_I_SD_GPIO18>;
+		input-enable;
+	};
+};
+
+&i2s0 {
+	status = "okay";
+
+	interrupts = <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>;
+	interrupt-names = "tx";
+};
diff --git a/samples/drivers/i2s/output/sample.yaml b/samples/drivers/i2s/output/sample.yaml
index 5b58271ec2646..d86bd18278b74 100644
--- a/samples/drivers/i2s/output/sample.yaml
+++ b/samples/drivers/i2s/output/sample.yaml
@@ -5,7 +5,8 @@ common:
   tags:
     - drivers
     - i2s
-  depends_on: i2s
 tests:
   sample.drivers.i2s.output:
     filter: dt_alias_exists("i2s-tx")
+    integration_platforms:
+      - mimxrt1060_evk@B/mimxrt1062/qspi
diff --git a/samples/drivers/ipm/ipm_esp32/sample.yaml b/samples/drivers/ipm/ipm_esp32/sample.yaml
index 68ef394450ceb..14e81e1dbbe8f 100644
--- a/samples/drivers/ipm/ipm_esp32/sample.yaml
+++ b/samples/drivers/ipm/ipm_esp32/sample.yaml
@@ -8,4 +8,3 @@ tests:
     tags:
       - samples
       - ipm
-    skip: true
diff --git a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..b8f138ad2b2e2
--- /dev/null
+++ b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml
index 0ea0dae331aee..4be5e5defbbe4 100644
--- a/samples/drivers/jesd216/sample.yaml
+++ b/samples/drivers/jesd216/sample.yaml
@@ -21,7 +21,7 @@ tests:
       - hifive_unmatched/fu740/u74
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm4
-    filter: dt_compat_enabled("jedec,spi-nor")
+    filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("jedec,mspi-nor")
     depends_on: spi
   sample.drivers.jesd216.nrf52840dk_spi:
     extra_args:
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index 480649397b6b2..b8dad485997a3 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -14,6 +14,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor)
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor)
 #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor)
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
@@ -201,7 +203,7 @@ static void summarize_dw15(const struct jesd216_param_header *php,
 		printf("0-4-4 Mode methods: entry 0x%01x ; exit 0x%02x\n",
 		       dw15.entry_044, dw15.exit_044);
 	} else {
-		printf("0-4-4 Mode: not supported");
+		printf("0-4-4 Mode: not supported\n");
 	}
 	printf("4-4-4 Mode sequences: enable 0x%02x ; disable 0x%01x\n",
 	       dw15.enable_444, dw15.disable_444);
diff --git a/samples/drivers/kscan/CMakeLists.txt b/samples/drivers/kscan/CMakeLists.txt
deleted file mode 100644
index 1c5812ccffb1d..0000000000000
--- a/samples/drivers/kscan/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(kscan)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/samples/drivers/kscan/README.rst b/samples/drivers/kscan/README.rst
deleted file mode 100644
index e2d2d129b6b57..0000000000000
--- a/samples/drivers/kscan/README.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-.. zephyr:code-sample:: kscan
-   :name: KSCAN
-   :relevant-api: kscan_interface timer_apis
-
-   Use the KSCAN API to read key presses and releases on a keyboard matrix.
-
-Overview
-********
-
-This sample demonstrates how to use the :ref:`KSCAN API <kscan_api>`.
-Callbacks are registered that will write to the console indicating KSCAN events.
-These events indicate key presses and releases.
-
-Building and Running
-********************
-
-The sample can be built and executed on boards supporting a Keyboard Matrix.
-It requires a correct fixture setup. Please connect a Keyboard Matrix to
-exercise the functionality (you need to obtain the right keymap from the vendor
-because they vary across different manufactures).
-For the correct execution of that sample in twister, add into boards's
-map-file next fixture settings::
-
-      - fixture: fixture_connect_keyboard
-
-Sample output
-=============
-
-.. code-block:: console
-
-   KSCAN test with a Keyboard matrix
-   Note: You are expected to see several callbacks
-   as you press and release keys!
diff --git a/samples/drivers/kscan/boards/mec15xxevb_assy6853.conf b/samples/drivers/kscan/boards/mec15xxevb_assy6853.conf
deleted file mode 100644
index 1eed72b67d5e9..0000000000000
--- a/samples/drivers/kscan/boards/mec15xxevb_assy6853.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_CONSOLE=y
-CONFIG_LOG=y
-CONFIG_LOG_PROCESS_THREAD_SLEEP_MS=100
diff --git a/samples/drivers/kscan/prj.conf b/samples/drivers/kscan/prj.conf
deleted file mode 100644
index e55038ab55868..0000000000000
--- a/samples/drivers/kscan/prj.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_STDOUT_CONSOLE=y
-CONFIG_PRINTK=y
-CONFIG_KSCAN=y
-CONFIG_LOG=y
diff --git a/samples/drivers/kscan/sample.yaml b/samples/drivers/kscan/sample.yaml
deleted file mode 100644
index e276641711ab6..0000000000000
--- a/samples/drivers/kscan/sample.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-sample:
-  name: KSCAN driver sample
-tests:
-  sample.drivers.kscan:
-    tags:
-      - drivers
-      - kscan
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "kb data(.*)"
-      fixture: fixture_connect_keyboard
-    depends_on: kscan
-    filter: dt_chosen_enabled("zephyr,keyboard-scan")
diff --git a/samples/drivers/kscan/src/main.c b/samples/drivers/kscan/src/main.c
deleted file mode 100644
index 66fdd5727bb62..0000000000000
--- a/samples/drivers/kscan/src/main.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2019 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/sys/printk.h>
-#include <soc.h>
-#include <zephyr/drivers/kscan.h>
-
-#define LOG_LEVEL LOG_LEVEL_DBG
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_REGISTER(main);
-
-const struct device *const kscan_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_keyboard_scan));
-static struct k_timer typematic_timer;
-static struct k_timer block_matrix_timer;
-
-#define KEY_RSVD 0U
-#define MAX_MATRIX_KEY_COLS 16
-#define MAX_MATRIX_KEY_ROWS 8
-
-/****************************************************************************/
-/*  Fujitsu keyboard model N860-7401-TOO1                                   */
-/*                                                                          */
-/*  Sense7  Sense6  Sense5  Sense4  Sense3  Sense2  Sense1  Sense0          */
-/*+---------------------------------------------------------------+         */
-/*|       | Capslk|       |   1!  |  Tab  |   F1  |   `~  |       | Scan  0 */
-/*|       |  (30) |       |  (2)  |  (16) | (112) |  (1)  |       | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|       |   W   |   Q   |   F7  |       |  Esc  |   F6  |   F5  | Scan  1 */
-/*|       |  (18) |  (17) | (118) |       | (110) | (117) | (116) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|       |   F8  |       |   2@  |   F4  |   F3  |       |   F2  | Scan  2 */
-/*|       | (119) |       |  (3)  | (115) | (114) |       | (113) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|       |   R   |   E   |   3#  |   4$  |   C   |   F   |   V   | Scan  3 */
-/*|       |  (20) |  (19) |  (4)  |  (5)  |  (48) |  (34) |  (49) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|   N   |   Y   |   6^  |   5%  |   B   |   T   |   H   |   G   | Scan  4 */
-/*|  (51) |  (22) |  (7)  |  (6)  | (50)  |  (21) |  (36) |  (35) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*| SpaceB|   M   |   A   |   7&  |   J   |   D   |   S   |   U   | Scan  5 */
-/*|  (61) |  (52) |  (31) |  (8)  |  (37) |  (33) |  (32) |  (23) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|   F9  |   I   |   ,<  |   8*  |       |   Z   |   X   |   K   | Scan  6 */
-/*| (120) |  (24) |  (53) |  (9)  |       |  (46) |  (47) |  (38) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|       |   =+  |   ]}  |   9(  |   L   |       |  CRSL |   O   | Scan  7 */
-/*|       |  (13) |  (28) |  (10) |  (39) |       |  (79) |  (25) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|   -_  |   0)  |   /?  |   [{  |   ;:  |       |       |   '"  | Scan  8 */
-/*|  (12) |  (11) |  (55) |  (27) |  (40) |       |       |  (41) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|  F10  | Pause | NumLK |   P   |       |       |       |       | Scan  9 */
-/*| (121) | (126) |  (90) |  (26) |       |       |       |       | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*| BkSpac|   \|  |  F11  |   .>  |       |       | W-Appl|  CRSD | Scan 10 */
-/*|  (15) |  (29) | (122) |  (54) |       |       |  (71) |  (84) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*| Enter | Delete| Insert|  F12  |       |       |  CRSU |  CRSR | Scan 11 */
-/*|  (43) |  (76) |  (75) | (123) |       |       |  (83) |  (89) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|       | R-WIN |       |       |       |       | L-WIN |   Fn  | Scan 12 */
-/*|       |  (87) |       |       |       |       |  (59) | (255) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|       |       |       | RShift| LShift|       |       |       | Scan 13 */
-/*|       |       |       |  (57) |  (44) |       |       |       | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*|       |       |       |       |       |       | L Alt | R Alt | Scan 14 */
-/*|       |       |       |       |       |       |  (60) |  (62) | (KEY #) */
-/*|-------+-------+-------+-------+-------+-------+-------+-------|         */
-/*| R Ctrl|       |       |       |       | L Ctrl|       |       | Scan 15 */
-/*|  (64) |       |       |       |       |  (58) |       |       | (KEY #) */
-/*+---------------------------------------------------------------+         */
-/*                                                                          */
-/****************************************************************************/
-
-static const uint8_t keymap[MAX_MATRIX_KEY_COLS][MAX_MATRIX_KEY_ROWS] = {
-	{KEY_RSVD, 1, 112, 16, 2, KEY_RSVD, 30, KEY_RSVD},
-	{116, 117, 110, KEY_RSVD, 118, 17, 18, KEY_RSVD},
-	{113, KEY_RSVD, 114, 115, 3, KEY_RSVD, 119, KEY_RSVD},
-	{49, 34, 48, 5, 4, 19, 20, KEY_RSVD},
-	{35, 36, 21, 50, 6, 7, 22, 51},
-	{23, 32, 33, 37, 8, 31, 52, 61},
-	{38, 47, 46, KEY_RSVD, 9, 53, 24, 120},
-	{25, 79, KEY_RSVD, 39, 10, 28, 13, KEY_RSVD},
-	{41, KEY_RSVD, KEY_RSVD, 40, 27, 55, 11, 12},
-	{KEY_RSVD, KEY_RSVD, KEY_RSVD, KEY_RSVD, 26, 90, 126, 121},
-	{84, 71, KEY_RSVD, KEY_RSVD, 54, 122, 29, 15},
-	{89, 83, KEY_RSVD, KEY_RSVD, 123, 75, 76, 43},
-	{255, 59, KEY_RSVD, KEY_RSVD, KEY_RSVD, KEY_RSVD, 87, KEY_RSVD},
-	{KEY_RSVD, KEY_RSVD, 44, 57, KEY_RSVD, KEY_RSVD, KEY_RSVD},
-	{62, 60, KEY_RSVD, KEY_RSVD, KEY_RSVD, KEY_RSVD, KEY_RSVD, KEY_RSVD},
-	{KEY_RSVD, KEY_RSVD, 58, KEY_RSVD, KEY_RSVD, KEY_RSVD, KEY_RSVD, 64},
-};
-
-/* Key used for typematic */
-static uint8_t last_key;
-
-/* Typematic rate and delay values correspond to the data passed after
- * the F3 command (See the 8042 spec online)
- */
-static const uint16_t period[] = {
-	33U,  37U,  42U,  46U,  50U,  54U,  58U,  63U,
-	67U,  75U,  83U,  92U, 100U, 109U, 116U, 125U,
-	133U, 149U, 167U, 182U, 200U, 217U, 232U, 250U,
-	270U, 303U, 333U, 370U, 400U, 435U, 470U, 500U
-};
-
-static const uint16_t delay[] = { 250U, 500U, 750U, 1000U };
-
-static bool block_kb_matrix;
-
-static void typematic_callback(struct k_timer *timer)
-{
-	LOG_INF("Typematic : %u\n", last_key);
-}
-
-static void kb_callback(const struct device *dev, uint32_t row, uint32_t col,
-			bool pressed)
-{
-	ARG_UNUSED(dev);
-	last_key = keymap[col][row];
-
-	LOG_INF("Key code = %u Pressed = %u\n", last_key, pressed);
-
-	if (pressed) {
-		k_timer_start(&typematic_timer,
-			      K_MSEC(delay[0]), K_MSEC(period[0]));
-	} else {
-		k_timer_stop(&typematic_timer);
-	}
-}
-
-static void block_matrix_callback(struct k_timer *timer)
-{
-	LOG_DBG("block host : %d\n", block_kb_matrix);
-	if (block_kb_matrix) {
-		kscan_disable_callback(kscan_dev);
-		block_kb_matrix = false;
-		k_timer_stop(&typematic_timer);
-	} else {
-		kscan_enable_callback(kscan_dev);
-		block_kb_matrix = true;
-	}
-}
-
-int main(void)
-{
-	printk("Kscan matrix sample application\n");
-
-	if (!device_is_ready(kscan_dev)) {
-		LOG_ERR("kscan device %s not ready", kscan_dev->name);
-		return 0;
-	}
-
-	kscan_config(kscan_dev, kb_callback);
-	k_timer_init(&typematic_timer, typematic_callback, NULL);
-	k_timer_init(&block_matrix_timer, block_matrix_callback, NULL);
-	k_timer_start(&block_matrix_timer, K_SECONDS(1), K_SECONDS(3));
-
-	return 0;
-}
diff --git a/samples/drivers/led/is31fl3733/sample.yaml b/samples/drivers/led/is31fl3733/sample.yaml
index a16b0c469a076..468d91c87fd0f 100644
--- a/samples/drivers/led/is31fl3733/sample.yaml
+++ b/samples/drivers/led/is31fl3733/sample.yaml
@@ -6,3 +6,5 @@ tests:
     filter: dt_compat_enabled("issi,is31fl3733")
     tags: LED
     depends_on: i2c
+    integration_platforms:
+      - frdm_k22f
diff --git a/samples/drivers/led/led_strip/Kconfig b/samples/drivers/led/led_strip/Kconfig
index fdf12abde2446..803a1ea6cc9d6 100644
--- a/samples/drivers/led/led_strip/Kconfig
+++ b/samples/drivers/led/led_strip/Kconfig
@@ -9,6 +9,14 @@ config SAMPLE_LED_UPDATE_DELAY
 	help
 	  Delay between LED updates in ms.
 
+config SAMPLE_LED_BRIGHTNESS
+	int "LED brightness"
+	default 16
+	range 1 255
+	help
+	  Brightness level of each LED. Defaults to a low value to make
+	  it easier to distinguish colors.
+
 endmenu
 
 source "Kconfig.zephyr"
diff --git a/samples/drivers/led/led_strip/README.rst b/samples/drivers/led/led_strip/README.rst
index 9c4efdc2c4418..0807639c0af89 100644
--- a/samples/drivers/led/led_strip/README.rst
+++ b/samples/drivers/led/led_strip/README.rst
@@ -65,6 +65,9 @@ Building and Running
 The sample updates the LED strip periodically. The update frequency can be
 modified by changing the :kconfig:option:`CONFIG_SAMPLE_LED_UPDATE_DELAY`.
 
+The brightness level of each LED can be adjusted by changing the
+:kconfig:option:`CONFIG_SAMPLE_LED_BRIGHTNESS` configuration option.
+
 Then build and flash the application:
 
 .. zephyr-app-commands::
diff --git a/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2.conf b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2.conf
new file mode 100644
index 0000000000000..8230eb9896b4f
--- /dev/null
+++ b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2.conf
@@ -0,0 +1,2 @@
+CONFIG_GPIO=y
+CONFIG_GPIO_HOGS=y
diff --git a/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2_tft.conf b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2_tft.conf
new file mode 100644
index 0000000000000..8230eb9896b4f
--- /dev/null
+++ b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2_tft.conf
@@ -0,0 +1,2 @@
+CONFIG_GPIO=y
+CONFIG_GPIO_HOGS=y
diff --git a/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2_tft_reverse.conf b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2_tft_reverse.conf
new file mode 100644
index 0000000000000..8230eb9896b4f
--- /dev/null
+++ b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s2_tft_reverse.conf
@@ -0,0 +1,2 @@
+CONFIG_GPIO=y
+CONFIG_GPIO_HOGS=y
diff --git a/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s3_procpu.conf b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s3_procpu.conf
new file mode 100644
index 0000000000000..0968fb220e006
--- /dev/null
+++ b/samples/drivers/led/led_strip/boards/adafruit_feather_esp32s3_procpu.conf
@@ -0,0 +1,4 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
diff --git a/samples/drivers/led/led_strip/boards/esp32s2_devkitc.conf b/samples/drivers/led/led_strip/boards/esp32s2_devkitc.conf
new file mode 100644
index 0000000000000..c1378264b967c
--- /dev/null
+++ b/samples/drivers/led/led_strip/boards/esp32s2_devkitc.conf
@@ -0,0 +1 @@
+CONFIG_I2S=y
diff --git a/samples/drivers/led/led_strip/boards/esp32s2_devkitc.overlay b/samples/drivers/led/led_strip/boards/esp32s2_devkitc.overlay
new file mode 100644
index 0000000000000..9b7c301a3fcd8
--- /dev/null
+++ b/samples/drivers/led/led_strip/boards/esp32s2_devkitc.overlay
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/led/led.h>
+
+/ {
+	aliases {
+		led-strip = &led_strip;
+	};
+};
+
+&i2s0_default {
+	group1 {
+		pinmux = <I2S0_O_SD_GPIO18>;
+		output-enable;
+	};
+};
+
+i2s_led: &i2s0 {
+	status = "okay";
+
+	interrupts = <I2S0_INTR_SOURCE IRQ_DEFAULT_PRIORITY 0>;
+	interrupt-names = "tx";
+
+	led_strip: ws2812@0 {
+		compatible = "worldsemi,ws2812-i2s";
+		reg = <0>;
+
+		chain-length = <1>;
+		color-mapping = <LED_COLOR_ID_GREEN
+				 LED_COLOR_ID_RED
+				 LED_COLOR_ID_BLUE>;
+		reset-delay = <500>;
+	};
+};
diff --git a/samples/drivers/led/led_strip/boards/esp32s3_devkitc_procpu.conf b/samples/drivers/led/led_strip/boards/esp32s3_devkitc_procpu.conf
new file mode 100644
index 0000000000000..c1378264b967c
--- /dev/null
+++ b/samples/drivers/led/led_strip/boards/esp32s3_devkitc_procpu.conf
@@ -0,0 +1 @@
+CONFIG_I2S=y
diff --git a/samples/drivers/led/led_strip/boards/esp32s3_devkitc_procpu.overlay b/samples/drivers/led/led_strip/boards/esp32s3_devkitc_procpu.overlay
index 8818cbd2384d2..ab31f1d9b7739 100644
--- a/samples/drivers/led/led_strip/boards/esp32s3_devkitc_procpu.overlay
+++ b/samples/drivers/led/led_strip/boards/esp32s3_devkitc_procpu.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,11 +12,16 @@
 	};
 };
 
+&i2s0_default {
+	group1 {
+		pinmux = <I2S0_O_SD_GPIO38>;
+		output-enable;
+	};
+};
+
 i2s_led: &i2s0 {
 	status = "okay";
 
-	pinctrl-0 = <&i2s0_pinconf>;
-
 	dmas = <&dma 3>;
 	dma-names = "tx";
 
@@ -24,7 +29,7 @@ i2s_led: &i2s0 {
 		compatible = "worldsemi,ws2812-i2s";
 
 		reg = <0>;
-		chain-length = <46>;
+		chain-length = <1>;
 		color-mapping = <LED_COLOR_ID_GREEN
 				 LED_COLOR_ID_RED
 				 LED_COLOR_ID_BLUE>;
@@ -35,12 +40,3 @@ i2s_led: &i2s0 {
 &dma {
 	status = "okay";
 };
-
-&pinctrl {
-	i2s0_pinconf: i2s0_pinconf {
-		group1 {
-			pinmux = <I2S0_O_SD_GPIO38>;
-			output-enable;
-		};
-	};
-};
diff --git a/samples/drivers/led/led_strip/src/main.c b/samples/drivers/led/led_strip/src/main.c
index 45e8fad35cd9d..c2bd74268d688 100644
--- a/samples/drivers/led/led_strip/src/main.c
+++ b/samples/drivers/led/led_strip/src/main.c
@@ -32,9 +32,9 @@ LOG_MODULE_REGISTER(main);
 #define RGB(_r, _g, _b) { .r = (_r), .g = (_g), .b = (_b) }
 
 static const struct led_rgb colors[] = {
-	RGB(0x0f, 0x00, 0x00), /* red */
-	RGB(0x00, 0x0f, 0x00), /* green */
-	RGB(0x00, 0x00, 0x0f), /* blue */
+	RGB(CONFIG_SAMPLE_LED_BRIGHTNESS, 0x00, 0x00), /* red */
+	RGB(0x00, CONFIG_SAMPLE_LED_BRIGHTNESS, 0x00), /* green */
+	RGB(0x00, 0x00, CONFIG_SAMPLE_LED_BRIGHTNESS), /* blue */
 };
 
 static struct led_rgb pixels[STRIP_NUM_PIXELS];
diff --git a/samples/drivers/led/lp5562/README.rst b/samples/drivers/led/lp5562/README.rst
index 9cc8583161d84..657e75c2d365d 100644
--- a/samples/drivers/led/lp5562/README.rst
+++ b/samples/drivers/led/lp5562/README.rst
@@ -30,7 +30,7 @@ mappings used by this sample.
 Building and Running
 ********************
 
-Build the application for the :ref:`nrf52840dk_nrf52840` board, and connect
+Build the application for the :zephyr:board:`nrf52840dk` board, and connect
 a LP5562 LED driver on the bus I2C0 at the address 0x30.
 
 .. zephyr-app-commands::
@@ -40,6 +40,6 @@ a LP5562 LED driver on the bus I2C0 at the address 0x30.
    :compact:
 
 For flashing the application, refer to the Flashing section of the
-:ref:`nrf52840dk_nrf52840` board documentation.
+:zephyr:board:`nrf52840dk` board documentation.
 
 .. _LP5562 Manual: http://www.ti.com/lit/ds/symlink/lp5562.pdf
diff --git a/samples/drivers/led/lp5569/README.rst b/samples/drivers/led/lp5569/README.rst
index f39fcd1678c63..488ffb769644b 100644
--- a/samples/drivers/led/lp5569/README.rst
+++ b/samples/drivers/led/lp5569/README.rst
@@ -16,7 +16,7 @@ This pattern then repeats indefinitely.
 Building and Running
 ********************
 
-Build the application for the :ref:`nrf52840dk_nrf52840` board, and connect
+Build the application for the :zephyr:board:`nrf52840dk` board, and connect
 a LP5569 LED controller on the bus I2C0 at the address 0x32.
 
 .. zephyr-app-commands::
@@ -26,7 +26,7 @@ a LP5569 LED controller on the bus I2C0 at the address 0x32.
    :compact:
 
 For flashing the application, refer to the Flashing section of the
-:ref:`nrf52840dk_nrf52840` board documentation.
+:zephyr:board:`nrf52840dk` board documentation.
 
 .. code-block:: none
 
diff --git a/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.conf b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.conf
new file mode 100644
index 0000000000000..0febfc7560562
--- /dev/null
+++ b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.conf
@@ -0,0 +1,3 @@
+CONFIG_BLINK_DELAY_SHORT=20
+CONFIG_BLINK_DELAY_LONG=65
+CONFIG_FADE_DELAY=15
diff --git a/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
new file mode 100644
index 0000000000000..9f5fb4f94d910
--- /dev/null
+++ b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
@@ -0,0 +1,30 @@
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	leds {
+		status = "disabled";
+	};
+
+	pwm_leds {
+		status = "okay";
+	};
+};
+
+&pinctrl {
+	pwm3_default: pwm3_default {
+		group1 {
+			/* GTIOC3A */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 11)>;
+		};
+	};
+};
+
+&pwm3 {
+	pinctrl-0 = <&pwm3_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+	divider = <RA_PWM_SOURCE_DIV_1024>;
+};
diff --git a/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.conf b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.conf
new file mode 100644
index 0000000000000..0febfc7560562
--- /dev/null
+++ b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.conf
@@ -0,0 +1,3 @@
+CONFIG_BLINK_DELAY_SHORT=20
+CONFIG_BLINK_DELAY_LONG=65
+CONFIG_FADE_DELAY=15
diff --git a/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
new file mode 100644
index 0000000000000..c845d33d23b6b
--- /dev/null
+++ b/samples/drivers/led/pwm/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
@@ -0,0 +1,30 @@
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	leds {
+		status = "disabled";
+	};
+
+	pwm_leds {
+		status = "okay";
+	};
+};
+
+&pinctrl {
+	pwm2_default: pwm2_default {
+		group1 {
+			/* GTIOC2B */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 2)>;
+		};
+	};
+};
+
+&pwm2 {
+	pinctrl-0 = <&pwm2_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+	divider = <RA_PWM_SOURCE_DIV_1024>;
+};
diff --git a/samples/drivers/led/pwm/boards/pico_plus2_rp2350b_m33.overlay b/samples/drivers/led/pwm/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..565dcd6fbbab9
--- /dev/null
+++ b/samples/drivers/led/pwm/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,15 @@
+/ {
+	leds {
+		status = "disabled";
+	};
+
+	pwm_leds {
+		status = "okay";
+	};
+};
+
+&pwm {
+	status = "okay";
+	divider-frac-4 = <15>;
+	divider-int-4 = <255>;
+};
diff --git a/samples/drivers/led/pwm/sample.yaml b/samples/drivers/led/pwm/sample.yaml
index 8b7e745a292ca..8551f658e1571 100644
--- a/samples/drivers/led/pwm/sample.yaml
+++ b/samples/drivers/led/pwm/sample.yaml
@@ -7,6 +7,8 @@ tests:
     tags: LED
     depends_on: pwm
     platform_exclude: reel_board
+    integration_platforms:
+      - frdm_k22f
     timeout: 20
     harness: console
     harness_config:
diff --git a/samples/drivers/mbox/CMakeLists.txt b/samples/drivers/mbox/CMakeLists.txt
index 919dd6439eaf4..a33f7c0c472b7 100644
--- a/samples/drivers/mbox/CMakeLists.txt
+++ b/samples/drivers/mbox/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2021 Carlo Caione <ccaione@baylibre.com>
-# Copyright 2023-2024 NXP
+# Copyright 2023-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -16,13 +16,16 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
    CONFIG_BOARD_ADP_XC7K_AE350 OR
    CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
    CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
+   CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM33 OR
    CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
    CONFIG_BOARD_FRDM_MCXN947_MCXN947_CPU0 OR
    CONFIG_BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU OR
    CONFIG_BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
+   CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUAPP OR
+   CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUAPP OR
    CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample")
 else()
diff --git a/samples/drivers/mbox/Kconfig.sysbuild b/samples/drivers/mbox/Kconfig.sysbuild
index 8101ce82a4e62..273912e8c0cf9 100644
--- a/samples/drivers/mbox/Kconfig.sysbuild
+++ b/samples/drivers/mbox/Kconfig.sysbuild
@@ -1,5 +1,5 @@
 # Copyright 2023 Nordic Semiconductor ASA
-# Copyright 2023-2024 NXP
+# Copyright 2023-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -13,10 +13,14 @@ config REMOTE_BOARD
 	default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
+	default "mimxrt1180_evk/mimxrt1189/cm7" if $(BOARD) = "mimxrt1180_evk"
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "frdm_mcxn947/mcxn947/cpu1" if $(BOARD) = "frdm_mcxn947"
 	default "nrf54h20dk/nrf54h20/cpuapp" if "$(BOARD)${BOARD_QUALIFIERS}" = "nrf54h20dk/nrf54h20/cpurad"
+	default "nrf54l09pdk/nrf54l09/cpuflpr" if $(BOARD) = "nrf54l09pdk"
 	default "nrf54l15dk/nrf54l15/cpuflpr" if $(BOARD) = "nrf54l15dk"
+	default "nrf54l20pdk/nrf54l20/cpuflpr" if $(BOARD) = "nrf54l20pdk"
+	default "ophelia4ev/cpuflpr" if $(BOARD) = "ophelia4ev"
 	default "stm32h747i_disco/stm32h747xx/m4" if $(BOARD) = "stm32h747i_disco"
 	default "esp32_devkitc_wroom/esp32/appcpu" if "$(BOARD)${BOARD_QUALIFIERS}" = "esp32_devkitc_wroom/esp32/procpu"
 	default "esp32s3_devkitm/esp32s3/appcpu" if "$(BOARD)${BOARD_QUALIFIERS}" = "esp32s3_devkitm/esp32s3/procpu"
diff --git a/samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay b/samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
index 4ee8379dc9e1f..dea949213a5d3 100644
--- a/samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
+++ b/samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay b/samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
index 254741183ee57..5113882e1bc2d 100644
--- a/samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
+++ b/samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
similarity index 100%
rename from samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
rename to samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
new file mode 100644
index 0000000000000..5113882e1bc2d
--- /dev/null
+++ b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		/* Delete ipc chosen property where old IPM mailbox driver below is
+		 * configured.
+		 */
+		/delete-property/ zephyr,ipc;
+	};
+
+	soc {
+		/* Delete IPM Driver node nxp,imx-mu */
+		/delete-node/ mailbox@40c48000;
+
+		/* Attach MBOX driver to MU Unit */
+		mbox:mbox@40c48000 {
+			compatible = "nxp,mbox-imx-mu";
+			reg = <0x40c48000 0x4000>;
+			interrupts = <118 0>;
+			rx-channels = <4>;
+			#mbox-cells = <1>;
+			status = "okay";
+		};
+	};
+
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox 1>, <&mbox 0>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
deleted file mode 100644
index 254741183ee57..0000000000000
--- a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2023 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
-		 * configured.
-		 */
-		/delete-property/ zephyr,ipc;
-	};
-
-	soc {
-		/* Delete IPM Driver node nxp,imx-mu */
-		/delete-node/ mailbox@40c48000;
-
-		/* Attach MBOX driver to MU Unit */
-		mbox:mbox@40c48000 {
-			compatible = "nxp,mbox-imx-mu";
-			reg = <0x40c48000 0x4000>;
-			interrupts = <118 0>;
-			rx-channels = <4>;
-			#mbox-cells = <1>;
-			status = "okay";
-		};
-	};
-
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&mbox 1>, <&mbox 0>;
-		mbox-names = "tx", "rx";
-	};
-};
diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
deleted file mode 100644
index 254741183ee57..0000000000000
--- a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2023 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
-		 * configured.
-		 */
-		/delete-property/ zephyr,ipc;
-	};
-
-	soc {
-		/* Delete IPM Driver node nxp,imx-mu */
-		/delete-node/ mailbox@40c48000;
-
-		/* Attach MBOX driver to MU Unit */
-		mbox:mbox@40c48000 {
-			compatible = "nxp,mbox-imx-mu";
-			reg = <0x40c48000 0x4000>;
-			interrupts = <118 0>;
-			rx-channels = <4>;
-			#mbox-cells = <1>;
-			status = "okay";
-		};
-	};
-
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&mbox 1>, <&mbox 0>;
-		mbox-names = "tx", "rx";
-	};
-};
diff --git a/samples/drivers/mbox/boards/mimxrt1180_evk_mimxrt1189_cm33.conf b/samples/drivers/mbox/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
new file mode 100644
index 0000000000000..60eead5a076e4
--- /dev/null
+++ b/samples/drivers/mbox/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
@@ -0,0 +1,2 @@
+CONFIG_SECOND_CORE_MCUX=y
+CONFIG_INCLUDE_REMOTE_DIR=y
diff --git a/samples/drivers/mbox/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay b/samples/drivers/mbox/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
new file mode 100644
index 0000000000000..9836b08ebe3d3
--- /dev/null
+++ b/samples/drivers/mbox/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1_a 1>, <&mbox1_a 0>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuflpr.overlay b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuflpr.overlay
index 421881adb2e39..7007a6eb329d0 100644
--- a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuflpr.overlay
+++ b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuflpr.overlay
@@ -13,6 +13,10 @@
 
 &cpuapp_bellboard {
 	status = "okay";
+	/* When other cpuapp_bellboard channel is selected for RX,
+	 * make sure it's enabled in the interrupt mask.
+	 * See `nordic,interrupt-mapping` property.
+	 */
 };
 
 &cpuflpr_vevif {
diff --git a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.overlay b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.overlay
index 2e5aba6d2f019..86e800350ec17 100644
--- a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.overlay
+++ b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.overlay
@@ -13,6 +13,10 @@
 
 &cpuapp_bellboard {
 	status = "okay";
+	/* When other cpuapp_bellboard channel is selected for RX,
+	 * make sure it's enabled in the interrupt mask.
+	 * See `nordic,interrupt-mapping` property.
+	 */
 };
 
 &cpuppr_vevif {
diff --git a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index d2230e8ef209c..42e6f83cbff2a 100644
--- a/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/samples/drivers/mbox/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -17,4 +17,8 @@
 
 &cpurad_bellboard {
 	status = "okay";
+	/* When other cpurad_bellboard channel is selected for RX,
+	 * make sure it's enabled in the interrupt mask.
+	 * See `nordic,interrupt-mapping` property.
+	 */
 };
diff --git a/samples/drivers/mbox/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/samples/drivers/mbox/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 0000000000000..fd2f23402f5ea
--- /dev/null
+++ b/samples/drivers/mbox/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/samples/drivers/mbox/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/samples/drivers/mbox/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..fd2f23402f5ea
--- /dev/null
+++ b/samples/drivers/mbox/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/samples/drivers/mbox/remote/CMakeLists.txt b/samples/drivers/mbox/remote/CMakeLists.txt
index 2196c270628f7..d65bbb452344b 100644
--- a/samples/drivers/mbox/remote/CMakeLists.txt
+++ b/samples/drivers/mbox/remote/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2021 Carlo Caione <ccaione@baylibre.com>
-# Copyright 2023-2024 NXP
+# Copyright 2023-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -14,6 +14,7 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
    CONFIG_BOARD_ADP_XC7K_AE350 OR
    CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM4 OR
    CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 OR
+   CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM7 OR
    CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1 OR
    CONFIG_BOARD_FRDM_MCXN947_MCXN947_CPU1 OR
    CONFIG_BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU OR
@@ -21,7 +22,9 @@ if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUFLPR OR
    CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
+   CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR OR
    CONFIG_BOARD_NRF54L15DK_NRF54L15_CPUFLPR OR
+   CONFIG_BOARD_NRF54L20PDK_NRF54L20_CPUFLPR OR
    CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample")
 else()
diff --git a/samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay b/samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
index c1b12825fc059..689cf0e39775a 100644
--- a/samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
+++ b/samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
index 93538b0acf236..0d15908a63c14 100644
--- a/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
+++ b/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart1;
 		zephyr,shell-uart = &lpuart1;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
index 93538b0acf236..0d15908a63c14 100644
--- a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
+++ b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart1;
 		zephyr,shell-uart = &lpuart1;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
index c2c38c0b930d0..56d26cc1b598e 100644
--- a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
+++ b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart1;
 		zephyr,shell-uart = &lpuart1;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf b/samples/drivers/mbox/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
new file mode 100644
index 0000000000000..77adcfa24f4e2
--- /dev/null
+++ b/samples/drivers/mbox/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
@@ -0,0 +1,2 @@
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_SECOND_CORE_MCUX=y
diff --git a/samples/drivers/mbox/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay b/samples/drivers/mbox/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
new file mode 100644
index 0000000000000..db51f5184fd5a
--- /dev/null
+++ b/samples/drivers/mbox/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1_b 0>, <&mbox1_b 1>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index a3ee9c3e06086..3ee1deb934139 100644
--- a/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/drivers/mbox/remote/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -13,6 +13,10 @@
 
 &cpuapp_bellboard {
 	status = "okay";
+	/* When other cpurad_bellboard channel is selected for RX,
+	 * make sure it's enabled in the interrupt mask.
+	 * See `nordic,interrupt-mapping` property.
+	 */
 };
 
 &cpurad_bellboard {
diff --git a/samples/drivers/mbox/remote/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay b/samples/drivers/mbox/remote/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
new file mode 100644
index 0000000000000..ea88120ad0653
--- /dev/null
+++ b/samples/drivers/mbox/remote/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuflpr_vevif_rx {
+	status = "okay";
+};
+
+&cpuflpr_vevif_tx {
+	status = "okay";
+};
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/drivers/mbox/remote/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/samples/drivers/mbox/remote/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 0000000000000..ea88120ad0653
--- /dev/null
+++ b/samples/drivers/mbox/remote/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&cpuflpr_vevif_rx 21>, <&cpuflpr_vevif_tx 20>;
+		mbox-names = "rx", "tx";
+	};
+};
+
+&cpuflpr_vevif_rx {
+	status = "okay";
+};
+
+&cpuflpr_vevif_tx {
+	status = "okay";
+};
+
+&uart30 {
+	/delete-property/ hw-flow-control;
+};
diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml
index aacac1eea1c9c..f1a1e56e771f9 100644
--- a/samples/drivers/mbox/sample.yaml
+++ b/samples/drivers/mbox/sample.yaml
@@ -5,24 +5,23 @@ common:
   tags: mbox
   timeout: 30
 tests:
-  sample.drivers.mbox.real_hw:
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-      - adp_xc7k/ae350
-      - mimxrt1170_evk@B/mimxrt1176/cm7
-      - mimxrt1170_evk/mimxrt1176/cm7
-      - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69/lpc55s69/cpu0
-      - frdm_mcxn947/mcxn947/cpu0
+  sample.drivers.mbox:
+    filter: dt_compat_enabled("vnd,mbox-consumer")
+    platform_exclude:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54l09pdk/nrf54l09/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
-      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340bsim/nrf5340/cpuapp
     harness: console
     harness_config:
       type: multi_line
       ordered: false
       regex:
-        - "Pong \\(on channel 0\\)"
-        - "Ping \\(on channel 1\\)"
+        - "Pong \\(on channel.*\\)"
+        - "Ping \\(on channel.*\\)"
 
   sample.drivers.mbox.nrf54h20_app_ppr:
     platform_allow:
@@ -74,20 +73,11 @@ tests:
         - "Ping \\(on channel 18\\)"
         - "Pong \\(on channel 12\\)"
 
-  sample.drivers.mbox.simu:
-    platform_allow:
-      - nrf5340bsim/nrf5340/cpuapp
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: false
-      regex:
-        - "Pong \\(on channel 0\\)"
-        - "Ping \\(on channel 1\\)"
-
-  sample.drivers.mbox.nrf54l15:
+  sample.drivers.mbox.nrf54l:
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args: mbox_SNIPPET=nordic-flpr
@@ -100,9 +90,11 @@ tests:
         - "Ping \\(on channel 21\\)"
         - "Pong \\(on channel 20\\)"
 
-  sample.drivers.mbox.nrf54l15_no_multithreading:
+  sample.drivers.mbox.nrf54l_no_multithreading:
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
@@ -118,9 +110,11 @@ tests:
         - "Ping \\(on channel 21\\)"
         - "Pong \\(on channel 20\\)"
 
-  sample.drivers.mbox.nrf54l15_remote_no_multithreading:
+  sample.drivers.mbox.nrf54l_remote_no_multithreading:
     platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
diff --git a/samples/drivers/mbox/sysbuild.cmake b/samples/drivers/mbox/sysbuild.cmake
index e2a5a03b87eb6..3180273351476 100644
--- a/samples/drivers/mbox/sysbuild.cmake
+++ b/samples/drivers/mbox/sysbuild.cmake
@@ -1,5 +1,5 @@
 # Copyright (c) 2023 Nordic Semiconductor ASA
-# Copyright 2023-2024 NXP
+# Copyright 2023-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
@@ -22,6 +22,7 @@ native_simulator_set_final_executable(${DEFAULT_IMAGE})
 
 if(SB_CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
    SB_CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
+   SB_CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM33 OR
    SB_CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0)
   # For these NXP boards the main core application is dependent on
   # 'zephyr_image_info.h' generated by remote application.
diff --git a/samples/drivers/mbox_data/CMakeLists.txt b/samples/drivers/mbox_data/CMakeLists.txt
index 077c62257e2f3..31cd00e202b1c 100644
--- a/samples/drivers/mbox_data/CMakeLists.txt
+++ b/samples/drivers/mbox_data/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -12,6 +12,7 @@ set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
 if(CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
    CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
    CONFIG_BOARD_FRDM_MCXN947_MCXN947_CPU0 OR
+   CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM33 OR
    CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample")
 else()
diff --git a/samples/drivers/mbox_data/Kconfig.sysbuild b/samples/drivers/mbox_data/Kconfig.sysbuild
index 6efff4d3ad50a..106ccb1cb7d39 100644
--- a/samples/drivers/mbox_data/Kconfig.sysbuild
+++ b/samples/drivers/mbox_data/Kconfig.sysbuild
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -9,5 +9,6 @@ string
 	default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
+	default "mimxrt1180_evk/mimxrt1189/cm7" if $(BOARD) = "mimxrt1180_evk"
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
 	default "frdm_mcxn947/mcxn947/cpu1" if $(BOARD) = "frdm_mcxn947"
diff --git a/samples/drivers/mbox_data/README.rst b/samples/drivers/mbox_data/README.rst
index 1ad37ea1ed15a..b42a52e452f4d 100644
--- a/samples/drivers/mbox_data/README.rst
+++ b/samples/drivers/mbox_data/README.rst
@@ -36,15 +36,6 @@ Building the application for mimxrt1170_evk_cm7
    :goals: debug
    :west-args: --sysbuild
 
-Building the application for mimxrt1170_evkb_cm7
-================================================
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/drivers/mbox_data/
-   :board: mimxrt1170_evkb_cm7
-   :goals: debug
-   :west-args: --sysbuild
-
 Building the application for lpcxpresso55s69_cpu1
 =================================================
 
diff --git a/samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay b/samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
index 76773b87fcde5..eafeeb83cbaa1 100644
--- a/samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
+++ b/samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay b/samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
index c2014d3d809e4..0ed27fea4f30a 100644
--- a/samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
+++ b/samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
similarity index 100%
rename from samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
rename to samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
new file mode 100644
index 0000000000000..0ed27fea4f30a
--- /dev/null
+++ b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		/* Delete ipc chosen property where old IPM mailbox driver below is
+		 * configured.
+		 */
+		/delete-property/ zephyr,ipc;
+	};
+
+	soc {
+		/* Delete IPM Driver node nxp,imx-mu */
+		/delete-node/ mailbox@40c48000;
+
+		/* Attach MBOX driver to MU Unit */
+		mbox:mbox@40c48000 {
+			compatible = "nxp,mbox-imx-mu";
+			reg = <0x40c48000 0x4000>;
+			interrupts = <118 0>;
+			rx-channels = <4>;
+			#mbox-cells = <1>;
+			status = "okay";
+		};
+	};
+
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox 3>, <&mbox 2>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
deleted file mode 100644
index c2014d3d809e4..0000000000000
--- a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
-		 * configured.
-		 */
-		/delete-property/ zephyr,ipc;
-	};
-
-	soc {
-		/* Delete IPM Driver node nxp,imx-mu */
-		/delete-node/ mailbox@40c48000;
-
-		/* Attach MBOX driver to MU Unit */
-		mbox:mbox@40c48000 {
-			compatible = "nxp,mbox-imx-mu";
-			reg = <0x40c48000 0x4000>;
-			interrupts = <118 0>;
-			rx-channels = <4>;
-			#mbox-cells = <1>;
-			status = "okay";
-		};
-	};
-
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&mbox 3>, <&mbox 2>;
-		mbox-names = "tx", "rx";
-	};
-};
diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
deleted file mode 100644
index 0dfb100ed7047..0000000000000
--- a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_MBOX_NXP_IMX_MU=y
-CONFIG_SECOND_CORE_MCUX=y
-CONFIG_INCLUDE_REMOTE_DIR=y
diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
deleted file mode 100644
index c2014d3d809e4..0000000000000
--- a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
-		 * configured.
-		 */
-		/delete-property/ zephyr,ipc;
-	};
-
-	soc {
-		/* Delete IPM Driver node nxp,imx-mu */
-		/delete-node/ mailbox@40c48000;
-
-		/* Attach MBOX driver to MU Unit */
-		mbox:mbox@40c48000 {
-			compatible = "nxp,mbox-imx-mu";
-			reg = <0x40c48000 0x4000>;
-			interrupts = <118 0>;
-			rx-channels = <4>;
-			#mbox-cells = <1>;
-			status = "okay";
-		};
-	};
-
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&mbox 3>, <&mbox 2>;
-		mbox-names = "tx", "rx";
-	};
-};
diff --git a/samples/drivers/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.conf b/samples/drivers/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
new file mode 100644
index 0000000000000..60eead5a076e4
--- /dev/null
+++ b/samples/drivers/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
@@ -0,0 +1,2 @@
+CONFIG_SECOND_CORE_MCUX=y
+CONFIG_INCLUDE_REMOTE_DIR=y
diff --git a/samples/drivers/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay b/samples/drivers/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
new file mode 100644
index 0000000000000..9836b08ebe3d3
--- /dev/null
+++ b/samples/drivers/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1_a 1>, <&mbox1_a 0>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/drivers/mbox_data/remote/CMakeLists.txt b/samples/drivers/mbox_data/remote/CMakeLists.txt
index 0a708a8ed6536..5342a2c98156f 100644
--- a/samples/drivers/mbox_data/remote/CMakeLists.txt
+++ b/samples/drivers/mbox_data/remote/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -10,6 +10,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 if(CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM4 OR
    CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 OR
    CONFIG_BOARD_FRDM_MCXN947_MCXN947_CPU1 OR
+   CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM7 OR
    CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample")
 else()
diff --git a/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay b/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
index c0d1a02708766..5f623200d9e09 100644
--- a/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
+++ b/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
index 42453413134d1..cb93c8b88cb5f 100644
--- a/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
+++ b/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
index 42453413134d1..cb93c8b88cb5f 100644
--- a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
+++ b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
index 42453413134d1..cb93c8b88cb5f 100644
--- a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
+++ b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf b/samples/drivers/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
new file mode 100644
index 0000000000000..77adcfa24f4e2
--- /dev/null
+++ b/samples/drivers/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
@@ -0,0 +1,2 @@
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_SECOND_CORE_MCUX=y
diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay b/samples/drivers/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
new file mode 100644
index 0000000000000..db51f5184fd5a
--- /dev/null
+++ b/samples/drivers/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1_b 0>, <&mbox1_b 1>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/drivers/mbox_data/sample.yaml b/samples/drivers/mbox_data/sample.yaml
index 33fd2574e50f4..b874ec6e85505 100644
--- a/samples/drivers/mbox_data/sample.yaml
+++ b/samples/drivers/mbox_data/sample.yaml
@@ -5,12 +5,7 @@ common:
   tags: mbox
 tests:
   sample.drivers.mbox_data.real_hw:
-    platform_allow:
-      - mimxrt1170_evk@B/mimxrt1176/cm7
-      - mimxrt1170_evk/mimxrt1176/cm7
-      - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69/lpc55s69/cpu0
-      - frdm_mcxn947/mcxn947/cpu0
+    filter: dt_compat_enabled("vnd,mbox-consumer")
     integration_platforms:
       - mimxrt1160_evk/mimxrt1166/cm7
       - lpcxpresso55s69/lpc55s69/cpu0
@@ -19,12 +14,12 @@ tests:
       type: multi_line
       ordered: false
       regex:
-        - "Client received \\(on channel 2\\) value: 1"
-        - "Client send \\(on channel 3\\) value: 2"
-        - "Client received \\(on channel 2\\) value: 3"
-        - "Client send \\(on channel 3\\) value: 4"
-        - "Client received \\(on channel 2\\) value: 41"
-        - "Client send \\(on channel 3\\) value: 42"
-        - "Client received \\(on channel 2\\) value: 97"
-        - "Client send \\(on channel 3\\) value: 98"
-        - "Client received \\(on channel 2\\) value: 99"
+        - "Client received .+ value: 1"
+        - "Client send .+ value: 2"
+        - "Client received .+ value: 3"
+        - "Client send .+ value: 4"
+        - "Client received .+ value: 41"
+        - "Client send .+ value: 42"
+        - "Client received .+ value: 97"
+        - "Client send .+ value: 98"
+        - "Client received .+ value: 99"
diff --git a/samples/drivers/mbox_data/sysbuild.cmake b/samples/drivers/mbox_data/sysbuild.cmake
index 0fb83fbadd3e2..dcb2509a05d57 100644
--- a/samples/drivers/mbox_data/sysbuild.cmake
+++ b/samples/drivers/mbox_data/sysbuild.cmake
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -18,6 +18,7 @@ ExternalZephyrProject_Add(
 
 if(SB_CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
    SB_CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
+   SB_CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM33 OR
    SB_CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0)
   # For these NXP boards the main core application is dependent on
   # 'zephyr_image_info.h' generated by remote application.
diff --git a/samples/drivers/mspi/mspi_flash/sample.yaml b/samples/drivers/mspi/mspi_flash/sample.yaml
index db742ac8f46f9..0e6abf8406c9b 100644
--- a/samples/drivers/mspi/mspi_flash/sample.yaml
+++ b/samples/drivers/mspi/mspi_flash/sample.yaml
@@ -20,3 +20,5 @@ tests:
         - "Attempting to write 4 bytes"
         - "Data read matches data written. Good!!"
     depends_on: mspi
+    integration_platforms:
+      - apollo3p_evb
diff --git a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..b8f138ad2b2e2
--- /dev/null
+++ b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/drivers/spi_flash/sample.yaml b/samples/drivers/spi_flash/sample.yaml
index a3b8cfed380a5..351e33997a0b8 100644
--- a/samples/drivers/spi_flash/sample.yaml
+++ b/samples/drivers/spi_flash/sample.yaml
@@ -7,7 +7,7 @@ tests:
       - flash
     filter: dt_compat_enabled("jedec,spi-nor") or dt_compat_enabled("st,stm32-qspi-nor")
       or dt_compat_enabled("st,stm32-ospi-nor") or dt_compat_enabled("st,stm32-xspi-nor")
-      or (dt_compat_enabled("nordic,qspi-nor") and CONFIG_NORDIC_QSPI_NOR)
+      or dt_compat_enabled("nordic,qspi-nor") or dt_compat_enabled("jedec,mspi-nor")
     platform_exclude:
       - hifive_unmatched/fu740/s7
       - hifive_unmatched/fu740/u74
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index b84359ae05bb1..52e8b6062b538 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -34,6 +34,8 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor)
 #define SPI_FLASH_COMPAT jedec_spi_nor
+#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor)
+#define SPI_FLASH_COMPAT jedec_mspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_qspi_nor)
 #define SPI_FLASH_COMPAT st_stm32_qspi_nor
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_ospi_nor)
diff --git a/samples/drivers/spi_flash_at45/sample.yaml b/samples/drivers/spi_flash_at45/sample.yaml
index c362fa5a69362..e7a25239a2b33 100644
--- a/samples/drivers/spi_flash_at45/sample.yaml
+++ b/samples/drivers/spi_flash_at45/sample.yaml
@@ -1,44 +1,27 @@
 sample:
   name: SPI Flash AT45 Sample
+common:
+  depends_on: spi
+  filter: dt_compat_enabled("atmel,at45")
+  integration_platforms:
+    - sam4l_wm400_cape
+  tags:
+    - spi
+    - flash
 tests:
   sample.drivers.spi.flash.at45.build:
-    tags:
-      - spi
-      - flash
-    depends_on: spi
-    filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.page_layout:
     extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf"
-    tags:
-      - spi
-      - flash
-    depends_on: spi
-    filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.pm:
     extra_args: EXTRA_CONF_FILE="overlay-pm.conf"
-    tags:
-      - spi
-      - flash
-    depends_on: spi
-    filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45.build.page_layout_pm:
     extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
-    tags:
-      - spi
-      - flash
-    depends_on: spi
-    filter: dt_compat_enabled("atmel,at45")
     build_only: true
   sample.drivers.spi.flash.at45:
     extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
-    tags:
-      - spi
-      - flash
-    depends_on: spi
-    filter: dt_compat_enabled("atmel,at45")
     harness: console
     harness_config:
       type: multi_line
diff --git a/samples/drivers/stepper/generic/CMakeLists.txt b/samples/drivers/stepper/generic/CMakeLists.txt
new file mode 100644
index 0000000000000..3139442c041cc
--- /dev/null
+++ b/samples/drivers/stepper/generic/CMakeLists.txt
@@ -0,0 +1,10 @@
+ # SPDX-FileCopyrightText: Copyright (c) 2025 Jilay Sandeep Pandya
+ # SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(stepper_generic)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/drivers/stepper/generic/Kconfig b/samples/drivers/stepper/generic/Kconfig
new file mode 100644
index 0000000000000..a9259ff3b8a65
--- /dev/null
+++ b/samples/drivers/stepper/generic/Kconfig
@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 Jilay Sandeep Pandya
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "Stepper generic sample application"
+
+config STEPS_PER_REV
+	int "Steps per revolution"
+	default 200
+
+config STEP_INTERVAL_NS
+	int "Step interval (ns)"
+	default 1000000
+
+config PING_PONG_N_REV
+	int "Change direction every N revolutions"
+	default 1
+
+config MONITOR_THREAD_TIMEOUT_MS
+	int "Monitor thread timeout (ms)"
+	default 1000
+
+config MONITOR_THREAD_STACK_SIZE
+	int "Monitor thread stack size"
+	default 1024
+
+source "Kconfig.zephyr"
diff --git a/samples/drivers/stepper/generic/README.rst b/samples/drivers/stepper/generic/README.rst
new file mode 100644
index 0000000000000..e23461f8d7790
--- /dev/null
+++ b/samples/drivers/stepper/generic/README.rst
@@ -0,0 +1,56 @@
+.. zephyr:code-sample:: stepper
+   :name: Stepper
+   :relevant-api: stepper_interface
+
+   Rotate a stepper motor in 4 different modes.
+
+Description
+***********
+
+This sample demonstrates how to use the stepper driver API to control a stepper motor. The sample
+spins, enables, disables, stops the stepper and outputs the events to the console.
+
+The stepper spins in 4 different modes: ping_pong_relative, ping_pong_absolute, continuous_clockwise
+and continuous_anticlockwise. The micro-step interval in nanoseconds can be configured using the
+:kconfig:option:`CONFIG_STEP_INTERVAL_NS`. The sample also demonstrates how to use the stepper callback
+to change the direction of the stepper after a certain number of steps.
+
+Pressing any button should change the mode of the stepper. The mode is printed to the console.
+Following modes are supported: enable, ping_pong_relative, ping_pong_absolute, rotate_cw, rotate_ccw,
+stop and disable.
+
+The sample also has a monitor thread that prints the actual position of the stepper motor every
+:kconfig:option:`CONFIG_MONITOR_THREAD_TIMEOUT_MS` milliseconds.
+
+Building and Running
+********************
+
+This project spins the stepper and outputs the events to the console.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/drivers/stepper/generic
+   :board: nucleo_g071rb
+   :goals: build flash
+
+Sample Output
+=============
+
+.. code-block:: console
+
+   *** Booting Zephyr OS build v4.1.0-568-gad33d28d0348 ***
+   [00:00:00.000,000] <inf> stepper: Starting generic stepper sample
+   [00:00:00.000,000] <dbg> stepper: main: stepper is 0x80086b8, name is gpio_stepper
+   [00:00:00.000,000] <dbg> gpio_stepper_motor_controller: gpio_stepper_set_microstep_interval: Setting Motor step interval to 1000000
+   [00:00:00.000,000] <dbg> stepper: monitor_thread: Actual position: 0
+   [00:00:00.491,000] <inf> stepper: mode: enable
+   [00:00:00.876,000] <inf> stepper: mode: ping pong relative
+   [00:00:01.000,000] <dbg> stepper: monitor_thread: Actual position: -114
+   [00:00:01.237,000] <inf> stepper: mode: ping pong absolute
+   [00:00:01.564,000] <inf> stepper: mode: rotate cw
+   [00:00:01.871,000] <inf> stepper: mode: rotate ccw
+   [00:00:02.000,000] <dbg> stepper: monitor_thread: Actual position: 129
+   [00:00:02.164,000] <inf> stepper: mode: stop
+   [00:00:02.444,000] <inf> stepper: mode: disable
+   [00:00:02.755,000] <inf> stepper: mode: enable
+
+   <repeats endlessly>
diff --git a/samples/drivers/stepper/generic/boards/nucleo_g071rb.overlay b/samples/drivers/stepper/generic/boards/nucleo_g071rb.overlay
new file mode 100644
index 0000000000000..e392a028cb32a
--- /dev/null
+++ b/samples/drivers/stepper/generic/boards/nucleo_g071rb.overlay
@@ -0,0 +1,17 @@
+/ {
+	aliases {
+		stepper = &gpio_stepper;
+	};
+};
+
+/ {
+	gpio_stepper: gpio_stepper {
+		compatible = "zephyr,gpio-stepper";
+		status = "okay";
+		micro-step-res = <2>;
+		gpios = <&gpioa 9 GPIO_ACTIVE_HIGH>,	/* D8 */
+			<&gpioc 7 GPIO_ACTIVE_HIGH>,	/* D9 */
+			<&gpiob 0 GPIO_ACTIVE_HIGH>,	/* D10 */
+			<&gpioa 7 GPIO_ACTIVE_HIGH>;	/* D11 */
+	};
+};
diff --git a/samples/drivers/stepper/generic/prj.conf b/samples/drivers/stepper/generic/prj.conf
new file mode 100644
index 0000000000000..7b579deb99fba
--- /dev/null
+++ b/samples/drivers/stepper/generic/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_STEPPER=y
+CONFIG_LOG=y
+CONFIG_INPUT=y
diff --git a/samples/drivers/stepper/generic/sample.yaml b/samples/drivers/stepper/generic/sample.yaml
new file mode 100644
index 0000000000000..765b3b35c6edc
--- /dev/null
+++ b/samples/drivers/stepper/generic/sample.yaml
@@ -0,0 +1,8 @@
+sample:
+  name: Generic Stepper Sample
+tests:
+  sample.drivers.stepper.generic:
+    harness: stepper
+    tags: stepper
+    platform_allow: nucleo_g071rb
+    depends_on: gpio input
diff --git a/samples/drivers/stepper/generic/src/main.c b/samples/drivers/stepper/generic/src/main.c
new file mode 100644
index 0000000000000..f1323e50850a2
--- /dev/null
+++ b/samples/drivers/stepper/generic/src/main.c
@@ -0,0 +1,128 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2025 Jilay Sandeep Pandya.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/stepper.h>
+#include <zephyr/input/input.h>
+#include <zephyr/kernel.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(stepper, CONFIG_STEPPER_LOG_LEVEL);
+
+static const struct device *stepper = DEVICE_DT_GET(DT_ALIAS(stepper));
+
+enum stepper_mode {
+	STEPPER_MODE_ENABLE,
+	STEPPER_MODE_PING_PONG_RELATIVE,
+	STEPPER_MODE_PING_PONG_ABSOLUTE,
+	STEPPER_MODE_ROTATE_CW,
+	STEPPER_MODE_ROTATE_CCW,
+	STEPPER_MODE_STOP,
+	STEPPER_MODE_DISABLE,
+};
+
+static atomic_t stepper_mode = ATOMIC_INIT(STEPPER_MODE_DISABLE);
+
+static int32_t ping_pong_target_position =
+	CONFIG_STEPS_PER_REV * CONFIG_PING_PONG_N_REV * DT_PROP(DT_ALIAS(stepper), micro_step_res);
+
+static K_SEM_DEFINE(stepper_generic_sem, 0, 1);
+
+static void stepper_callback(const struct device *dev, const enum stepper_event event,
+			     void *user_data)
+{
+	switch (event) {
+	case STEPPER_EVENT_STEPS_COMPLETED:
+		k_sem_give(&stepper_generic_sem);
+		break;
+	default:
+		break;
+	}
+}
+
+static void button_pressed(struct input_event *event, void *user_data)
+{
+	ARG_UNUSED(user_data);
+
+	if (event->value == 0 && event->type == INPUT_EV_KEY) {
+		return;
+	}
+	enum stepper_mode mode = atomic_get(&stepper_mode);
+
+	if (mode == STEPPER_MODE_DISABLE) {
+		atomic_set(&stepper_mode, STEPPER_MODE_ENABLE);
+	} else {
+		atomic_inc(&stepper_mode);
+	}
+	k_sem_give(&stepper_generic_sem);
+}
+
+INPUT_CALLBACK_DEFINE(NULL, button_pressed, NULL);
+
+int main(void)
+{
+	LOG_INF("Starting generic stepper sample\n");
+	if (!device_is_ready(stepper)) {
+		LOG_ERR("Device %s is not ready\n", stepper->name);
+		return -ENODEV;
+	}
+	LOG_DBG("stepper is %p, name is %s\n", stepper, stepper->name);
+
+	stepper_set_event_callback(stepper, stepper_callback, NULL);
+	stepper_set_reference_position(stepper, 0);
+	stepper_set_microstep_interval(stepper, CONFIG_STEP_INTERVAL_NS);
+
+	for (;;) {
+		k_sem_take(&stepper_generic_sem, K_FOREVER);
+		switch (atomic_get(&stepper_mode)) {
+		case STEPPER_MODE_ENABLE:
+			stepper_enable(stepper);
+			LOG_INF("mode: enable\n");
+			break;
+		case STEPPER_MODE_STOP:
+			stepper_stop(stepper);
+			LOG_INF("mode: stop\n");
+			break;
+		case STEPPER_MODE_ROTATE_CW:
+			stepper_run(stepper, STEPPER_DIRECTION_POSITIVE);
+			LOG_INF("mode: rotate cw\n");
+			break;
+		case STEPPER_MODE_ROTATE_CCW:
+			stepper_run(stepper, STEPPER_DIRECTION_NEGATIVE);
+			LOG_INF("mode: rotate ccw\n");
+			break;
+		case STEPPER_MODE_PING_PONG_RELATIVE:
+			ping_pong_target_position *= -1;
+			stepper_move_by(stepper, ping_pong_target_position);
+			LOG_INF("mode: ping pong relative\n");
+			break;
+		case STEPPER_MODE_PING_PONG_ABSOLUTE:
+			ping_pong_target_position *= -1;
+			stepper_move_to(stepper, ping_pong_target_position);
+			LOG_INF("mode: ping pong absolute\n");
+			break;
+		case STEPPER_MODE_DISABLE:
+			stepper_disable(stepper);
+			LOG_INF("mode: disable\n");
+			break;
+		}
+	}
+	return 0;
+}
+
+static void monitor_thread(void)
+{
+	for (;;) {
+		int32_t actual_position;
+
+		stepper_get_actual_position(stepper, &actual_position);
+		LOG_DBG("Actual position: %d\n", actual_position);
+		k_sleep(K_MSEC(CONFIG_MONITOR_THREAD_TIMEOUT_MS));
+	}
+}
+
+K_THREAD_DEFINE(monitor_tid, CONFIG_MONITOR_THREAD_STACK_SIZE, monitor_thread, NULL, NULL, NULL, 5,
+		0, 0);
diff --git a/samples/drivers/stepper/index.rst b/samples/drivers/stepper/index.rst
new file mode 100644
index 0000000000000..7592d15577ca9
--- /dev/null
+++ b/samples/drivers/stepper/index.rst
@@ -0,0 +1,5 @@
+.. zephyr:code-sample-category:: stepper
+   :name: Stepper
+   :show-listing:
+
+   These samples demonstrate how to use the :ref:`stepper <stepper_api>` driver API.
diff --git a/samples/drivers/stepper/tmc50xx/CMakeLists.txt b/samples/drivers/stepper/tmc50xx/CMakeLists.txt
new file mode 100644
index 0000000000000..7d5a7d600f21b
--- /dev/null
+++ b/samples/drivers/stepper/tmc50xx/CMakeLists.txt
@@ -0,0 +1,10 @@
+ # SPDX-FileCopyrightText: Copyright (c) 2025 Jilay Sandeep Pandya
+ # SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(tmc50xx)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/drivers/stepper/tmc50xx/Kconfig b/samples/drivers/stepper/tmc50xx/Kconfig
new file mode 100644
index 0000000000000..59e2cc9f8d66e
--- /dev/null
+++ b/samples/drivers/stepper/tmc50xx/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 Jilay Sandeep Pandya
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "TMC50XX sample application"
+
+config STEPS_PER_REV
+	int "Steps per revolution"
+	default 200
+
+config PING_PONG_N_REV
+	int "Change direction every N revolutions"
+	default 1
+
+config MAX_VELOCITY_MULTIPLIER
+	int "Max velocity multiplier"
+	default 1
+
+source "Kconfig.zephyr"
diff --git a/samples/drivers/stepper/tmc50xx/README.rst b/samples/drivers/stepper/tmc50xx/README.rst
new file mode 100644
index 0000000000000..75e2dd22ee074
--- /dev/null
+++ b/samples/drivers/stepper/tmc50xx/README.rst
@@ -0,0 +1,48 @@
+.. zephyr:code-sample:: tmc50xx
+   :name: TMC50XX stepper
+   :relevant-api: stepper_interface
+
+   Rotate a TMC50XX stepper motor and change velocity at runtime.
+
+Description
+***********
+
+This sample application periodically spins the stepper clockwise and counterclockwise depending on
+the :kconfig:option:`CONFIG_PING_PONG_N_REV` configuration.
+
+References
+**********
+
+ - TMC5041: https://www.analog.com/media/en/technical-documentation/data-sheets/TMC5041_datasheet_rev1.16.pdf
+ - TMC5072: https://www.analog.com/media/en/technical-documentation/data-sheets/TMC5072_datasheet_rev1.26.pdf
+
+Wiring
+*******
+
+This sample uses the TMC5072 BOB controlled using the SPI interface. The board's Devicetree must define
+a ``stepper`` alias for the stepper motor node.
+
+Building and Running
+********************
+
+This project spins the stepper and outputs the events to the console. It requires an TMC50XX stepper
+driver. It should work with any platform featuring a SPI peripheral interface.
+It does not work on QEMU.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/drivers/stepper/tmc50xx
+   :board: nucleo_g071rb
+   :goals: build flash
+
+Sample Output
+=============
+
+.. code-block:: console
+
+   Starting tmc50xx stepper sample
+   stepper is 0x8007240, name is tmc_stepper@0
+   stepper_callback steps completed changing direction
+   stepper_callback steps completed changing direction
+   stepper_callback steps completed changing direction
+
+   <repeats endlessly>
diff --git a/samples/drivers/stepper/tmc50xx/boards/nucleo_g071rb.overlay b/samples/drivers/stepper/tmc50xx/boards/nucleo_g071rb.overlay
new file mode 100644
index 0000000000000..e3b70a3553140
--- /dev/null
+++ b/samples/drivers/stepper/tmc50xx/boards/nucleo_g071rb.overlay
@@ -0,0 +1,52 @@
+/ {
+	aliases {
+		stepper = &tmc_stepper;
+	};
+};
+
+&spi1 {
+	pinctrl-0 = <&spi1_sck_pa5 &spi1_miso_pa6 &spi1_mosi_pa7>;
+	pinctrl-names = "default";
+	cs-gpios = <&gpiob 0 GPIO_ACTIVE_LOW>;
+	status = "okay";
+	tmc50xx: tmc50xx@0 {
+		compatible = "adi,tmc50xx";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(1)>; /* Maximum SPI bus frequency */
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		clock-frequency = <DT_FREQ_M(10)>; /* Internal/External Clock frequency */
+
+		tmc_stepper: tmc_stepper@0 {
+			status = "okay";
+			reg = <0>;
+
+			/* common stepper controller settings */
+			micro-step-res = <256>;
+
+			/* ADI TMC stallguard settings specific to TMC50XX */
+			activate-stallguard2;
+			stallguard-velocity-check-interval-ms=<1000>;
+			stallguard2-threshold=<30>;
+			stallguard-threshold-velocity=<200000>;
+
+			/* ADI TMC ramp generator as well as current settings */
+			vstart = <1000>;
+			vstop = <10>;
+			a1 = <10000>;
+			v1 = <50000>;
+			d1 = <14000>;
+			vmax = <900000>;
+			amax = <50000>;
+			dmax = <7000>;
+			tzerowait = <100>;
+			vhigh = <900000>;
+			vcoolthrs = <900000>;
+			ihold = <1>;
+			irun = <10>;
+			iholddelay = <1>;
+		};
+	};
+};
diff --git a/samples/drivers/stepper/tmc50xx/prj.conf b/samples/drivers/stepper/tmc50xx/prj.conf
new file mode 100644
index 0000000000000..f17d0707cf5d4
--- /dev/null
+++ b/samples/drivers/stepper/tmc50xx/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_STEPPER=y
+CONFIG_LOG=y
diff --git a/samples/drivers/stepper/tmc50xx/sample.yaml b/samples/drivers/stepper/tmc50xx/sample.yaml
new file mode 100644
index 0000000000000..dddd010d191b3
--- /dev/null
+++ b/samples/drivers/stepper/tmc50xx/sample.yaml
@@ -0,0 +1,8 @@
+sample:
+  name: TMC50XX Stepper Sample
+tests:
+  sample.drivers.stepper.tmc50xx:
+    harness: stepper
+    tags: stepper
+    platform_allow: nucleo_g071rb
+    depends_on: spi
diff --git a/samples/drivers/stepper/tmc50xx/src/main.c b/samples/drivers/stepper/tmc50xx/src/main.c
new file mode 100644
index 0000000000000..8604f610c9670
--- /dev/null
+++ b/samples/drivers/stepper/tmc50xx/src/main.c
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2025 Jilay Sandeep Pandya.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/stepper.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/stepper/stepper_trinamic.h>
+
+const struct device *stepper = DEVICE_DT_GET(DT_ALIAS(stepper));
+
+int32_t ping_pong_target_position = CONFIG_STEPS_PER_REV * CONFIG_PING_PONG_N_REV *
+				    DT_PROP(DT_ALIAS(stepper), micro_step_res);
+
+K_SEM_DEFINE(steps_completed_sem, 0, 1);
+
+void stepper_callback(const struct device *dev, const enum stepper_event event, void *user_data)
+{
+	switch (event) {
+	case STEPPER_EVENT_STEPS_COMPLETED:
+		k_sem_give(&steps_completed_sem);
+		break;
+	default:
+		break;
+	}
+}
+
+int main(void)
+{
+	printf("Starting tmc50xx stepper sample\n");
+	if (!device_is_ready(stepper)) {
+		printf("Device %s is not ready\n", stepper->name);
+		return -ENODEV;
+	}
+	printf("stepper is %p, name is %s\n", stepper, stepper->name);
+
+	stepper_set_event_callback(stepper, stepper_callback, NULL);
+	stepper_enable(stepper);
+	stepper_set_reference_position(stepper, 0);
+	stepper_move_by(stepper, ping_pong_target_position);
+
+	/* Change Max Velocity during runtime */
+	int32_t tmc_velocity = DT_PROP(DT_ALIAS(stepper), vmax) * CONFIG_MAX_VELOCITY_MULTIPLIER;
+	(void)tmc50xx_stepper_set_max_velocity(stepper, tmc_velocity);
+
+	for (;;) {
+		if (k_sem_take(&steps_completed_sem, K_FOREVER) == 0) {
+			ping_pong_target_position *= -1;
+			stepper_move_by(stepper, ping_pong_target_position);
+		}
+	}
+	return 0;
+}
diff --git a/samples/drivers/uart/native_tty/boards/native_posix.overlay b/samples/drivers/uart/native_tty/boards/native_posix.overlay
deleted file mode 100644
index 6a3daca3241ac..0000000000000
--- a/samples/drivers/uart/native_tty/boards/native_posix.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "native_sim.overlay"
diff --git a/samples/drivers/uart/native_tty/sample.yaml b/samples/drivers/uart/native_tty/sample.yaml
index 1e059d9ce3aab..a8d570701e110 100644
--- a/samples/drivers/uart/native_tty/sample.yaml
+++ b/samples/drivers/uart/native_tty/sample.yaml
@@ -4,7 +4,6 @@ tests:
   sample.drivers.uart.native_tty:
     build_only: true
     platform_allow:
-      - native_posix
       - native_sim
     tags:
       - serial
diff --git a/samples/drivers/video/capture/README.rst b/samples/drivers/video/capture/README.rst
index 823e263ebdcf7..2a8fefc0ff0e4 100644
--- a/samples/drivers/video/capture/README.rst
+++ b/samples/drivers/video/capture/README.rst
@@ -24,7 +24,7 @@ Supported camera modules on some i.MX RT boards can be found below.
 - :zephyr:board:`mimxrt1170_evk`
 - `OV5640 camera module`_
 
-Also :ref:`arduino_nicla_vision_board` can be used in this sample as capture device, in that case
+Also :zephyr:board:`arduino_nicla_vision` can be used in this sample as capture device, in that case
 The user can transfer the captured frames through on board USB.
 
 Wiring
@@ -38,7 +38,7 @@ On :zephyr:board:`mimxrt1170_evk`, the OV5640 camera module should be plugged in
 J2 camera connector. A USB cable should be connected from a host to the micro
 USB debug connector (J11) in order to get console output via the daplink interface.
 
-For :ref:`arduino_nicla_vision_board` there is no extra wiring required.
+For :zephyr:board:`arduino_nicla_vision` there is no extra wiring required.
 
 Building and Running
 ********************
@@ -61,7 +61,8 @@ For :zephyr:board:`mimxrt1170_evk`, build this sample application with the follo
    :goals: build
    :compact:
 
-For :ref:`arduino_nicla_vision_board`, build this sample application with the following commands:
+For :zephyr:board:`arduino_nicla_vision`, build this sample application with the following
+commands:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/video/capture
diff --git a/samples/drivers/video/capture/boards/esp32s3_eye_procpu.conf b/samples/drivers/video/capture/boards/esp32s3_eye_procpu.conf
index 76321800fa069..24a8455c94ba4 100644
--- a/samples/drivers/video/capture/boards/esp32s3_eye_procpu.conf
+++ b/samples/drivers/video/capture/boards/esp32s3_eye_procpu.conf
@@ -9,3 +9,4 @@ CONFIG_VIDEO_BUFFER_SMH_ATTRIBUTE=2
 CONFIG_VIDEO_FRAME_HEIGHT=240
 CONFIG_VIDEO_FRAME_WIDTH=240
 CONFIG_VIDEO_PIXEL_FORMAT="RGBP"
+CONFIG_ST7789V_BGR565=y
diff --git a/samples/drivers/video/capture/src/main.c b/samples/drivers/video/capture/src/main.c
index 59f200b94d8d0..22a1a743d7f2c 100644
--- a/samples/drivers/video/capture/src/main.c
+++ b/samples/drivers/video/capture/src/main.c
@@ -120,11 +120,10 @@ int main(void)
 	while (caps.format_caps[i].pixelformat) {
 		const struct video_format_cap *fcap = &caps.format_caps[i];
 		/* fourcc to string */
-		LOG_INF("  %c%c%c%c width [%u; %u; %u] height [%u; %u; %u]",
-		       (char)fcap->pixelformat, (char)(fcap->pixelformat >> 8),
-		       (char)(fcap->pixelformat >> 16), (char)(fcap->pixelformat >> 24),
-		       fcap->width_min, fcap->width_max, fcap->width_step, fcap->height_min,
-		       fcap->height_max, fcap->height_step);
+		LOG_INF("  %s width [%u; %u; %u] height [%u; %u; %u]",
+		       VIDEO_FOURCC_TO_STR(fcap->pixelformat),
+		       fcap->width_min, fcap->width_max, fcap->width_step,
+		       fcap->height_min, fcap->height_max, fcap->height_step);
 		i++;
 	}
 
@@ -147,9 +146,8 @@ int main(void)
 		fmt.pixelformat = VIDEO_FOURCC_FROM_STR(CONFIG_VIDEO_PIXEL_FORMAT);
 	}
 
-	LOG_INF("- Video format: %c%c%c%c %ux%u", (char)fmt.pixelformat,
-	       (char)(fmt.pixelformat >> 8), (char)(fmt.pixelformat >> 16),
-	       (char)(fmt.pixelformat >> 24), fmt.width, fmt.height);
+	LOG_INF("- Video format: %s %ux%u",
+		VIDEO_FOURCC_TO_STR(fmt.pixelformat), fmt.width, fmt.height);
 
 	if (video_set_format(video_dev, VIDEO_EP_OUT, &fmt)) {
 		LOG_ERR("Unable to set format");
diff --git a/samples/drivers/video/tcpserversink/src/main.c b/samples/drivers/video/tcpserversink/src/main.c
index af728d85887ba..da3f9e4a8319e 100644
--- a/samples/drivers/video/tcpserversink/src/main.c
+++ b/samples/drivers/video/tcpserversink/src/main.c
@@ -94,9 +94,8 @@ int main(void)
 		return 0;
 	}
 
-	printk("Video device detected, format: %c%c%c%c %ux%u\n", (char)fmt.pixelformat,
-	       (char)(fmt.pixelformat >> 8), (char)(fmt.pixelformat >> 16),
-	       (char)(fmt.pixelformat >> 24), fmt.width, fmt.height);
+	printk("Video device detected, format: %s %ux%u\n",
+		VIDEO_FOURCC_TO_STR(fmt.pixelformat), fmt.width, fmt.height);
 
 	if (caps.min_line_count != LINE_COUNT_HEIGHT) {
 		LOG_ERR("Partial framebuffers not supported by this sample");
diff --git a/samples/drivers/watchdog/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/samples/drivers/watchdog/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
new file mode 100644
index 0000000000000..102abfc8ef27b
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/samples/drivers/watchdog/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 0000000000000..cfb41e09b99ec
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay b/samples/drivers/watchdog/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
new file mode 100644
index 0000000000000..cfb41e09b99ec
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/samples/drivers/watchdog/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 0000000000000..cfb41e09b99ec
--- /dev/null
+++ b/samples/drivers/watchdog/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/drivers/watchdog/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..025e0b8aedb68
--- /dev/null
+++ b/samples/drivers/watchdog/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/ophelia4ev_nrf54l15_cpuflpr.overlay b/samples/drivers/watchdog/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
new file mode 100644
index 0000000000000..025e0b8aedb68
--- /dev/null
+++ b/samples/drivers/watchdog/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/boards/siwx917_rb4338a.overlay b/samples/drivers/watchdog/boards/siwx917_rb4338a.overlay
new file mode 100644
index 0000000000000..bccfe1a3d69d1
--- /dev/null
+++ b/samples/drivers/watchdog/boards/siwx917_rb4338a.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &watchdog;
+	};
+};
+
+&watchdog {
+	status = "okay";
+};
diff --git a/samples/drivers/watchdog/sample.yaml b/samples/drivers/watchdog/sample.yaml
index ce97a6f921319..285727ae19200 100644
--- a/samples/drivers/watchdog/sample.yaml
+++ b/samples/drivers/watchdog/sample.yaml
@@ -22,6 +22,11 @@ tests:
       - s32z2xxdc2/s32z270/rtu1
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
+      - panb511evb/nrf54l15/cpuapp
+      - panb511evb/nrf54l15/cpuflpr
+      - panb511evb/nrf54l15/cpuflpr/xip
+      - nrf54l15dk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l10/cpuapp/ns
   sample.drivers.watchdog.stm32_wwdg:
     extra_args: DTC_OVERLAY_FILE=boards/stm32_wwdg.overlay
     filter: dt_compat_enabled("st,stm32-window-watchdog")
diff --git a/samples/drivers/watchdog/src/main.c b/samples/drivers/watchdog/src/main.c
index cad88ebcf6648..faeb79c5b8a68 100644
--- a/samples/drivers/watchdog/src/main.c
+++ b/samples/drivers/watchdog/src/main.c
@@ -40,6 +40,8 @@
 #define WDT_MIN_WINDOW	320U
 #define WDT_OPT 0
 #define WDG_FEED_INTERVAL (WDT_MIN_WINDOW + ((WDT_MAX_WINDOW - WDT_MIN_WINDOW) / 4))
+#elif DT_HAS_COMPAT_STATUS_OKAY(renesas_ra_wdt)
+#define WDT_ALLOW_CALLBACK 0
 #endif
 
 #ifndef WDT_ALLOW_CALLBACK
diff --git a/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_C.conf b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_C.conf
new file mode 100644
index 0000000000000..0968fb220e006
--- /dev/null
+++ b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_C.conf
@@ -0,0 +1,4 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
diff --git a/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_C.overlay b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_C.overlay
new file mode 100644
index 0000000000000..66298554285cb
--- /dev/null
+++ b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_C.overlay
@@ -0,0 +1,8 @@
+&i2c0 {
+	max17048: max17048@36 {
+		compatible = "maxim,max17048";
+		status = "okay";
+		reg = <0x36 >;
+		power-domains = <&i2c_reg>;
+	};
+};
diff --git a/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft.conf b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft.conf
new file mode 100644
index 0000000000000..0968fb220e006
--- /dev/null
+++ b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft.conf
@@ -0,0 +1,4 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
diff --git a/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft.overlay b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft.overlay
new file mode 100644
index 0000000000000..66298554285cb
--- /dev/null
+++ b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft.overlay
@@ -0,0 +1,8 @@
+&i2c0 {
+	max17048: max17048@36 {
+		compatible = "maxim,max17048";
+		status = "okay";
+		reg = <0x36 >;
+		power-domains = <&i2c_reg>;
+	};
+};
diff --git a/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft_reverse.conf b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft_reverse.conf
new file mode 100644
index 0000000000000..0968fb220e006
--- /dev/null
+++ b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s2_tft_reverse.conf
@@ -0,0 +1,4 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
diff --git a/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s3_procpu.conf b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s3_procpu.conf
new file mode 100644
index 0000000000000..0968fb220e006
--- /dev/null
+++ b/samples/fuel_gauge/max17048/boards/adafruit_feather_esp32s3_procpu.conf
@@ -0,0 +1,4 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
diff --git a/samples/hello_world/sample.yaml b/samples/hello_world/sample.yaml
index 1bcb7db62f255..ac4dfeac52d68 100644
--- a/samples/hello_world/sample.yaml
+++ b/samples/hello_world/sample.yaml
@@ -3,6 +3,8 @@ sample:
     application
   name: hello world
 common:
+  min_ram: 2
+  min_flash: 16
   tags: introduction
   integration_platforms:
     - native_sim
diff --git a/samples/modules/lvgl/accelerometer_chart/README.rst b/samples/modules/lvgl/accelerometer_chart/README.rst
index a41f79a091ba3..c572ffcbc11ed 100644
--- a/samples/modules/lvgl/accelerometer_chart/README.rst
+++ b/samples/modules/lvgl/accelerometer_chart/README.rst
@@ -25,7 +25,7 @@ Requirements
 .. note::
 
    A Devicetree overlay declaring an emulated BMI160 accelerometer is provided for the
-   ``native_posix*`` and ``native_sim*`` board variants, making it possible to run this sample on
+   ``native_sim*`` board variants, making it possible to run this sample on
    your local machine.
 
 .. _lvgl_accelerometer_chart_building_and_running:
diff --git a/samples/modules/lvgl/accelerometer_chart/boards/native_posix.overlay b/samples/modules/lvgl/accelerometer_chart/boards/native_posix.overlay
deleted file mode 100644
index dc4174b58d738..0000000000000
--- a/samples/modules/lvgl/accelerometer_chart/boards/native_posix.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright (c) 2023 Benjamin Cabé <benjamin@zephyrproject.org>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		accel0 = &bmi_i2c;
-	};
-};
-
-&i2c0 {
-	bmi_i2c: bmi@68 {
-		compatible = "bosch,bmi160";
-		reg = <0x68>;
-	};
-};
diff --git a/samples/modules/lvgl/accelerometer_chart/boards/native_sim.overlay b/samples/modules/lvgl/accelerometer_chart/boards/native_sim.overlay
index 2b055bf3de6de..dc4174b58d738 100644
--- a/samples/modules/lvgl/accelerometer_chart/boards/native_sim.overlay
+++ b/samples/modules/lvgl/accelerometer_chart/boards/native_sim.overlay
@@ -1 +1,16 @@
-#include "native_posix.overlay"
+/* Copyright (c) 2023 Benjamin Cabé <benjamin@zephyrproject.org>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		accel0 = &bmi_i2c;
+	};
+};
+
+&i2c0 {
+	bmi_i2c: bmi@68 {
+		compatible = "bosch,bmi160";
+		reg = <0x68>;
+	};
+};
diff --git a/samples/modules/lvgl/accelerometer_chart/boards/native_posix.conf b/samples/modules/lvgl/accelerometer_chart/boards/native_sim_native_64.conf
similarity index 100%
rename from samples/modules/lvgl/accelerometer_chart/boards/native_posix.conf
rename to samples/modules/lvgl/accelerometer_chart/boards/native_sim_native_64.conf
diff --git a/samples/modules/lvgl/accelerometer_chart/boards/native_sim_native_64.overlay b/samples/modules/lvgl/accelerometer_chart/boards/native_sim_native_64.overlay
new file mode 100644
index 0000000000000..d4b0ac659d8a7
--- /dev/null
+++ b/samples/modules/lvgl/accelerometer_chart/boards/native_sim_native_64.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2023 Benjamin Cabé <benjamin@zephyrproject.org>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "native_sim.overlay"
diff --git a/samples/modules/lvgl/demos/boards/native_posix.conf b/samples/modules/lvgl/demos/boards/native_posix.conf
deleted file mode 100644
index a99f38b8d8449..0000000000000
--- a/samples/modules/lvgl/demos/boards/native_posix.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2023 Fabian Blatz <fabianblatz@gmail.com>
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_LV_COLOR_DEPTH_32=y
diff --git a/samples/modules/lvgl/demos/boards/native_posix.overlay b/samples/modules/lvgl/demos/boards/native_posix.overlay
deleted file mode 100644
index eab17f916bd2e..0000000000000
--- a/samples/modules/lvgl/demos/boards/native_posix.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2023, Fabian Blatz <fabianblatz@gmail.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&sdl_dc {
-	compatible = "zephyr,sdl-dc";
-	height = <272>;
-	width = <480>;
-};
diff --git a/samples/modules/lvgl/demos/boards/native_posix_64.overlay b/samples/modules/lvgl/demos/boards/native_posix_64.overlay
deleted file mode 100644
index eab17f916bd2e..0000000000000
--- a/samples/modules/lvgl/demos/boards/native_posix_64.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2023, Fabian Blatz <fabianblatz@gmail.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&sdl_dc {
-	compatible = "zephyr,sdl-dc";
-	height = <272>;
-	width = <480>;
-};
diff --git a/samples/modules/lvgl/demos/boards/native_posix_native_64.conf b/samples/modules/lvgl/demos/boards/native_posix_native_64.conf
deleted file mode 100644
index c7a2f1ff941ae..0000000000000
--- a/samples/modules/lvgl/demos/boards/native_posix_native_64.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2023 Fabian Blatz <fabianblatz@gmail.com>
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_LV_COLOR_DEPTH_32=y
-CONFIG_LV_Z_MEM_POOL_SIZE=65536
diff --git a/samples/modules/lvgl/demos/boards/native_sim.overlay b/samples/modules/lvgl/demos/boards/native_sim.overlay
index ab50aa66f82d5..eab17f916bd2e 100644
--- a/samples/modules/lvgl/demos/boards/native_sim.overlay
+++ b/samples/modules/lvgl/demos/boards/native_sim.overlay
@@ -3,4 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "native_posix.overlay"
+
+&sdl_dc {
+	compatible = "zephyr,sdl-dc";
+	height = <272>;
+	width = <480>;
+};
diff --git a/samples/modules/lvgl/demos/boards/native_sim_64.overlay b/samples/modules/lvgl/demos/boards/native_sim_64.overlay
index ab50aa66f82d5..47fdc4be34c6f 100644
--- a/samples/modules/lvgl/demos/boards/native_sim_64.overlay
+++ b/samples/modules/lvgl/demos/boards/native_sim_64.overlay
@@ -3,4 +3,4 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "native_posix.overlay"
+#include "native_sim.overlay"
diff --git a/samples/modules/lvgl/demos/boards/native_sim_native_64.conf b/samples/modules/lvgl/demos/boards/native_sim_native_64.conf
index c7a2f1ff941ae..36220318e8a8b 100644
--- a/samples/modules/lvgl/demos/boards/native_sim_native_64.conf
+++ b/samples/modules/lvgl/demos/boards/native_sim_native_64.conf
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_LV_COLOR_DEPTH_32=y
-CONFIG_LV_Z_MEM_POOL_SIZE=65536
+CONFIG_LV_Z_MEM_POOL_SIZE=75264
diff --git a/samples/modules/lvgl/demos/prj.conf b/samples/modules/lvgl/demos/prj.conf
index aad236d1c362a..4b7ab1bb7dbb3 100644
--- a/samples/modules/lvgl/demos/prj.conf
+++ b/samples/modules/lvgl/demos/prj.conf
@@ -3,7 +3,7 @@ CONFIG_LOG=y
 CONFIG_SHELL=y
 
 CONFIG_LVGL=y
-CONFIG_LV_Z_MEM_POOL_SIZE=49152
+CONFIG_LV_Z_MEM_POOL_SIZE=58368
 CONFIG_LV_Z_SHELL=y
 CONFIG_LV_USE_MONKEY=y
 
diff --git a/samples/modules/lvgl/demos/rtk7eka6m3b00001bu.overlay b/samples/modules/lvgl/demos/rtk7eka6m3b00001bu.overlay
new file mode 100644
index 0000000000000..8bfc417358174
--- /dev/null
+++ b/samples/modules/lvgl/demos/rtk7eka6m3b00001bu.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	lvgl_pointer {
+		compatible = "zephyr,lvgl-pointer-input";
+		swap-xy;
+		input = <&ft5336_rtk7eka6m3b00001bu>;
+	};
+};
diff --git a/samples/modules/lvgl/demos/sample.yaml b/samples/modules/lvgl/demos/sample.yaml
index 4fdb529d9986a..1d9a9b306a99d 100644
--- a/samples/modules/lvgl/demos/sample.yaml
+++ b/samples/modules/lvgl/demos/sample.yaml
@@ -97,3 +97,21 @@ tests:
       - shield
       - lvgl
       - gui
+  sample.modules.lvgl.demos.rtk7eka6m3b00001bu:
+    platform_allow: ek_ra8d1
+    harness: console
+    harness_config:
+      fixture: fixture_display
+    extra_args:
+      - SHIELD=rtk7eka6m3b00001bu
+      - DTC_OVERLAY_FILE=rtk7eka6m3b00001bu.overlay
+    extra_configs:
+      - CONFIG_LV_DEMO_MUSIC_LANDSCAPE=y
+    modules:
+      - lvgl
+    tags:
+      - samples
+      - display
+      - shield
+      - lvgl
+      - gui
diff --git a/samples/modules/tflite-micro/magic_wand/README.rst b/samples/modules/tflite-micro/magic_wand/README.rst
index e1ca13faf58cb..a3507f3c61503 100644
--- a/samples/modules/tflite-micro/magic_wand/README.rst
+++ b/samples/modules/tflite-micro/magic_wand/README.rst
@@ -32,7 +32,7 @@ Add the tflite-micro module to your West manifest and pull it:
     west config manifest.project-filter -- +tflite-micro
     west update
 
-The application can be built for the :ref:`litex-vexriscv` for
+The application can be built for the :zephyr:board:`litex_vexriscv` for
 emulation in Renode as follows:
 
 .. zephyr-app-commands::
diff --git a/samples/net/cellular_modem/boards/mg100.conf b/samples/net/cellular_modem/boards/mg100.conf
index 3b6ae6e7d570d..636c416d8381c 100644
--- a/samples/net/cellular_modem/boards/mg100.conf
+++ b/samples/net/cellular_modem/boards/mg100.conf
@@ -1,3 +1,2 @@
 CONFIG_MODEM_HL7800=n
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=255
 CONFIG_NET_BUF_TX_COUNT=32
diff --git a/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf b/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf
index 78e64e0c4c942..226ce728a19af 100644
--- a/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf
+++ b/samples/net/cellular_modem/boards/nrf9160dk_nrf52840.conf
@@ -3,7 +3,6 @@ CONFIG_UART_1_ASYNC=y
 CONFIG_UART_1_INTERRUPT_DRIVEN=n
 
 # Align with the Serial LTE Modem (SLM) application.
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=1500
 CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000
 
 # Print logs and printk() output on uart0.
diff --git a/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf b/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf
index c0586115e19ae..907cc9baed1fc 100644
--- a/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf
+++ b/samples/net/cellular_modem/boards/nrf9160dk_nrf9160_ns.conf
@@ -3,7 +3,6 @@ CONFIG_UART_1_ASYNC=y
 CONFIG_UART_1_INTERRUPT_DRIVEN=n
 
 # Align with the Serial LTE Modem (SLM) application.
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=1500
 CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000
 
 # Prevent sockets getting offloaded to the modem.
diff --git a/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf b/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf
index 3b6ae6e7d570d..636c416d8381c 100644
--- a/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf
+++ b/samples/net/cellular_modem/boards/pinnacle_100_dvk.conf
@@ -1,3 +1,2 @@
 CONFIG_MODEM_HL7800=n
-CONFIG_MODEM_CELLULAR_CMUX_MAX_FRAME_SIZE=255
 CONFIG_NET_BUF_TX_COUNT=32
diff --git a/samples/net/cloud/aws_iot_mqtt/src/main.c b/samples/net/cloud/aws_iot_mqtt/src/main.c
index 5c78e78530c43..61548c338f4a2 100644
--- a/samples/net/cloud/aws_iot_mqtt/src/main.c
+++ b/samples/net/cloud/aws_iot_mqtt/src/main.c
@@ -414,7 +414,7 @@ void aws_client_loop(void)
 	}
 
 cleanup:
-	mqtt_disconnect(&client_ctx);
+	mqtt_disconnect(&client_ctx, NULL);
 
 	close(fds.fd);
 	fds.fd = -1;
diff --git a/samples/net/common/Kconfig b/samples/net/common/Kconfig
index 8692a8b3120e2..afaab763ac58f 100644
--- a/samples/net/common/Kconfig
+++ b/samples/net/common/Kconfig
@@ -10,3 +10,43 @@ config NET_SAMPLE_COMMON_WAIT_DNS_SERVER_ADDITION
 	help
 	  Make sure we get DNS server addresses from the network
 	  before considering the connection to be up.
+
+config NET_SAMPLE_COMMON_VLAN_SETUP_1
+	string "VLAN setup for the 1st VLAN interface"
+	default ""
+	depends on NET_VLAN
+	help
+	  This can setup the first VLAN network interface.
+	  The format of the string looks like this:
+	    <VLAN-tag>;<ip-address/mask-len>,...
+	  Example:
+	    100;198.51.100.1/24,2001:db8:100::1/64
+	  The VLAN tag can have values between 0 and 4094.
+	  There can be multiple IP addresses specified, and the
+	  code tries to apply them all to this interface.
+
+config NET_SAMPLE_COMMON_VLAN_SETUP_2
+	string "VLAN setup for the 2nd VLAN interface"
+	default ""
+	depends on NET_VLAN
+	help
+	  This can setup the first VLAN network interface.
+	  The format of the string looks like this:
+	    <VLAN-tag>;<ip-address/mask-len>,...
+	  Example:
+	    200;203.0.113.1/24,2001:db8:200::1/64
+	  The VLAN tag can have values between 0 and 4094.
+	  There can be multiple IP addresses specified, and the
+	  code tries to apply them all to this interface.
+
+config NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR
+	string "Remote IP address of the tunnel interface"
+	depends on NET_L2_IPIP
+	help
+	  Use overlay-tunnel.conf to setup the tunnel support.
+
+config NET_SAMPLE_COMMON_TUNNEL_MY_ADDR
+	string "My address for tunnel interface"
+	depends on NET_L2_IPIP
+	help
+	  The value depends on your network setup.
diff --git a/samples/net/common/README.rst b/samples/net/common/README.rst
new file mode 100644
index 0000000000000..774e099046249
--- /dev/null
+++ b/samples/net/common/README.rst
@@ -0,0 +1,64 @@
+.. _networking_samples_common:
+
+Overview
+********
+
+Various network samples can utilize common code to enable generic
+features like VLAN support.
+
+The source code for the common sample can be found at:
+:zephyr_file:`samples/net/common`.
+
+VLAN
+****
+
+If you want to enable VLAN support to network sample application,
+then add :file:`overlay-vlan.conf` to your sample application compilation
+like in this example for echo-server sample application:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/net/sockets/echo_server
+   :host-os: unix
+   :board: native_sim
+   :conf: "prj.conf overlay-vlan.conf"
+   :goals: run
+   :compact:
+
+You host setup for the VLAN can be done like this:
+
+.. code-block:: console
+
+    $ cd tools/net-setup
+    $ ./net-setup.sh -c zeth-vlan.conf
+
+The example configuration will create this kind of configuration:
+
+* In host side:
+
+  * Normal ``zeth`` interface is created. It has ``192.0.2.2/24``
+    address. All the network traffic to Zephyr will go through this
+    interface.
+
+  * VLAN interface ``vlan.100`` is used for VLAN tag 100 network traffic.
+    It has ``198.51.100.2`` IPv4 and ``2001:db8:100::2`` IPv6 addresses.
+
+  * VLAN interface ``vlan.200`` is used for VLAN tag 200 network traffic.
+    It has ``203.0.113.2`` IPv4 and ``2001:db8:200::2`` IPv6 addresses.
+
+* The network interfaces and addresses in Zephyr side:
+
+  * The ``eth0`` is the main interface, it has ``192.0.2.1/24``
+    address and it has connection to the host.
+
+  * The ``VLAN-100`` is a virtual interface for VLAN tag 100 traffic.
+    It has ``198.51.100.1/24`` IPv4 and ``2001:db8:100::1/64`` addresses.
+
+  * The ``VLAN-200`` is a virtual interface for VLAN tag 200 traffic.
+    It has ``203.0.113.1/24`` IPv4 and ``2001:db8:200::1/64`` addresses.
+
+.. warning::
+
+   The IPv4 and IPv6 addresses used in the samples are not to be used
+   in any live network and are only meant for these network samples.
+   These IPv4 and IPv6 addresses are meant for documentation use only and
+   are not routable.
diff --git a/samples/net/common/common.cmake b/samples/net/common/common.cmake
index c0e0e51117940..6c4de029eebe7 100644
--- a/samples/net/common/common.cmake
+++ b/samples/net/common/common.cmake
@@ -4,3 +4,9 @@
 
 target_include_directories(app PRIVATE ${ZEPHYR_BASE}/samples/net/common/)
 target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/net/common/net_sample_common.c)
+
+target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE
+  $ENV{ZEPHYR_BASE}/samples/net/common/vlan.c)
+
+target_sources_ifdef(CONFIG_NET_L2_IPIP app PRIVATE
+  $ENV{ZEPHYR_BASE}/samples/net/common/tunnel.c)
diff --git a/samples/net/common/net_sample_common.c b/samples/net/common/net_sample_common.c
index 9c785963298fa..e1b91c911222b 100644
--- a/samples/net/common/net_sample_common.c
+++ b/samples/net/common/net_sample_common.c
@@ -8,6 +8,7 @@
 LOG_MODULE_REGISTER(net_samples_common, LOG_LEVEL_DBG);
 
 #include <zephyr/net/conn_mgr_connectivity.h>
+#include <zephyr/net/conn_mgr_monitor.h>
 
 #if defined(CONFIG_NET_CONNECTION_MANAGER)
 #if defined(CONFIG_NET_SAMPLE_COMMON_WAIT_DNS_SERVER_ADDITION)
@@ -42,6 +43,7 @@ void wait_for_network(void)
 {
 	net_mgmt_init_event_callback(&l4_cb, l4_event_handler, L4_EVENT_MASK);
 	net_mgmt_add_event_callback(&l4_cb);
+	conn_mgr_mon_resend_status();
 
 	LOG_INF("Waiting for network...");
 
diff --git a/samples/net/common/net_sample_common.h b/samples/net/common/net_sample_common.h
index f44e852a0da30..bef73f6b07d9f 100644
--- a/samples/net/common/net_sample_common.h
+++ b/samples/net/common/net_sample_common.h
@@ -4,8 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/net/net_if.h>
+
 #if defined(CONFIG_NET_CONNECTION_MANAGER)
 void wait_for_network(void);
 #else
 static inline void wait_for_network(void) { }
 #endif /* CONFIG_NET_CONNECTION_MANAGER */
+
+#if defined(CONFIG_NET_VLAN)
+int init_vlan(void);
+#else
+static inline int init_vlan(void)
+{
+	return 0;
+}
+#endif /* CONFIG_NET_VLAN */
+
+#if defined(CONFIG_NET_L2_IPIP)
+int init_tunnel(void);
+bool is_tunnel(struct net_if *iface);
+#else
+static inline int init_tunnel(void)
+{
+	return 0;
+}
+
+static inline bool is_tunnel(struct net_if *iface)
+{
+	ARG_UNUSED(iface);
+	return false;
+}
+#endif /* CONFIG_NET_L2_IPIP */
diff --git a/samples/net/sockets/echo_server/src/tunnel.c b/samples/net/common/tunnel.c
similarity index 82%
rename from samples/net/sockets/echo_server/src/tunnel.c
rename to samples/net/common/tunnel.c
index da04f6f864a57..613527aa103fa 100644
--- a/samples/net/sockets/echo_server/src/tunnel.c
+++ b/samples/net/common/tunnel.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
+LOG_MODULE_DECLARE(net_samples_common, LOG_LEVEL_DBG);
 
 #include <zephyr/kernel.h>
 
@@ -13,6 +13,18 @@ LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/virtual_mgmt.h>
 #include <zephyr/net/conn_mgr_monitor.h>
 
+#if defined(CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR)
+#define NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR
+#else
+#define NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR ""
+#endif
+
+#if defined(CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR)
+#define NET_SAMPLE_COMMON_TUNNEL_MY_ADDR CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR
+#else
+#define NET_SAMPLE_COMMON_TUNNEL_MY_ADDR ""
+#endif
+
 /* User data for the interface callback */
 struct ud {
 	struct net_if *tunnel;
@@ -88,16 +100,16 @@ int init_tunnel(void)
 
 	memset(&ud, 0, sizeof(ud));
 
-	if (CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR[0] == '\0') {
+	if (NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR[0] == '\0') {
 		LOG_INF("Tunnel peer address not set.");
 		return 0;
 	}
 
-	if (!net_ipaddr_parse(CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR,
-			      strlen(CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR),
+	if (!net_ipaddr_parse(NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR,
+			      strlen(NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR),
 			      &peer)) {
 		LOG_ERR("Tunnel peer address \"%s\" invalid.",
-			CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR);
+			NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR);
 		return -EINVAL;
 	}
 
@@ -130,7 +142,7 @@ int init_tunnel(void)
 
 	if (ud.peer == NULL) {
 		LOG_ERR("Peer address %s unreachable",
-			CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR);
+			NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR);
 		return -ENETUNREACH;
 	}
 
@@ -146,7 +158,7 @@ int init_tunnel(void)
 	if (ret < 0 && ret != -ENOTSUP) {
 		LOG_ERR("Cannot set peer address %s to "
 			"interface %d (%d)",
-			CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR,
+			NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR,
 			net_if_get_by_iface(ud.tunnel),
 			ret);
 	}
@@ -161,10 +173,10 @@ int init_tunnel(void)
 	}
 
 	ret = setup_iface(ud.tunnel,
-			  CONFIG_NET_SAMPLE_TUNNEL_MY_ADDR);
+			  NET_SAMPLE_COMMON_TUNNEL_MY_ADDR);
 	if (ret < 0) {
 		LOG_ERR("Cannot set IP address %s to tunnel interface",
-			CONFIG_NET_SAMPLE_TUNNEL_MY_ADDR);
+			NET_SAMPLE_COMMON_TUNNEL_MY_ADDR);
 		return -EINVAL;
 	}
 
diff --git a/samples/net/common/vlan.c b/samples/net/common/vlan.c
new file mode 100644
index 0000000000000..0c04ff15b2e96
--- /dev/null
+++ b/samples/net/common/vlan.c
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2018 Intel Corporation.
+ * Copyright (c) 2025 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(net_samples_common, LOG_LEVEL_DBG);
+
+#include <stdlib.h>
+#include <zephyr/kernel.h>
+#include <zephyr/posix/arpa/inet.h>
+#include <zephyr/net/ethernet.h>
+
+/* User data for the interface callback */
+struct ud {
+	struct net_if *first;
+	struct net_if *second;
+	struct net_if *eth;
+};
+
+static void iface_cb(struct net_if *iface, void *user_data)
+{
+	struct ud *ud = user_data;
+
+	if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET) && ud->eth == NULL) {
+		ud->eth = iface;
+		return;
+	}
+
+	if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
+		return;
+	}
+
+	if (!ud->first) {
+		ud->first = iface;
+		return;
+	}
+
+	if (!ud->second) {
+		ud->second = iface;
+		return;
+	}
+}
+
+static int setup_iface(struct net_if *eth_iface,
+		       struct net_if *vlan_iface,
+		       const char *option)
+{
+	struct sockaddr_storage addr = { 0 };
+	struct sockaddr *paddr = (struct sockaddr *)&addr;
+	const char *addr_str, *next;
+	struct net_if_addr *ifaddr;
+	uint8_t mask_len = 0;
+	unsigned long value;
+	uint16_t vlan_tag;
+	char *endptr;
+	bool status;
+	int ret;
+
+	if (option[0] == '\0') {
+		return 0;
+	}
+
+	next = strstr(option, ";");
+	if (next == NULL) {
+		LOG_ERR("VLAN tag not found, invalid option \"%s\"", option);
+		return -EINVAL;
+	}
+
+	value = strtoul(option, &endptr, 10);
+	if (*endptr != '\0' && endptr != next) {
+		LOG_ERR("Invalid VLAN tag \"%s\"", option);
+		return -EINVAL;
+	}
+
+	vlan_tag = (uint16_t)value;
+	addr_str = ++next;
+
+	do {
+		char my_addr[INET6_ADDRSTRLEN] = { 'N', 'o', ' ', 'I', 'P', '\0'};
+
+		next = net_ipaddr_parse_mask(addr_str, strlen(addr_str),
+					     paddr, &mask_len);
+		if (next == NULL) {
+			LOG_ERR("Cannot parse IP address \"%s\"", addr_str);
+			return -EINVAL;
+		}
+
+		inet_ntop(paddr->sa_family, net_sin(paddr)->sin_addr.s4_addr,
+			  my_addr, sizeof(my_addr));
+
+		if (paddr->sa_family == AF_INET) {
+			struct sockaddr_in *addr4 = (struct sockaddr_in *)paddr;
+			struct sockaddr_in mask;
+
+			ifaddr = net_if_ipv4_addr_add(vlan_iface, &addr4->sin_addr,
+						      NET_ADDR_MANUAL, 0);
+
+			ret = net_mask_len_to_netmask(AF_INET, mask_len,
+						      (struct sockaddr *)&mask);
+			if (ret < 0) {
+				LOG_ERR("Invalid network mask length (%d)", ret);
+				return ret;
+			}
+
+			status = net_if_ipv4_set_netmask_by_addr(vlan_iface,
+								 &addr4->sin_addr,
+								 &mask.sin_addr);
+
+		} else if (paddr->sa_family == AF_INET6) {
+			struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)paddr;
+			struct in6_addr netaddr6;
+
+			ifaddr = net_if_ipv6_addr_add(vlan_iface, &addr6->sin6_addr,
+						      NET_ADDR_MANUAL, 0);
+
+			net_ipv6_addr_prefix_mask((uint8_t *)&addr6->sin6_addr,
+						  (uint8_t *)&netaddr6,
+						  mask_len);
+
+			if (!net_if_ipv6_prefix_add(vlan_iface, &netaddr6, mask_len,
+						    (uint32_t)0xffffffff)) {
+				LOG_ERR("Cannot add %s to interface %d", my_addr,
+					net_if_get_by_iface(vlan_iface));
+				return -EINVAL;
+			}
+
+		} else {
+			LOG_ERR("Cannot parse IP address \"%s\"", my_addr);
+			return -EAFNOSUPPORT;
+		}
+
+		if (ifaddr == NULL) {
+			LOG_ERR("Cannot add IP address \"%s\" to interface %d",
+				my_addr, net_if_get_by_iface(vlan_iface));
+			return -ENOENT;
+		}
+
+		addr_str = next;
+	} while (addr_str != NULL && *addr_str != '\0');
+
+	ret = net_eth_vlan_enable(eth_iface, vlan_tag);
+	if (ret < 0) {
+		LOG_ERR("Cannot enable VLAN for tag %d (%d)", vlan_tag, ret);
+	}
+
+	LOG_DBG("Interface %d VLAN tag %d setup done.",
+		net_if_get_by_iface(vlan_iface), vlan_tag);
+
+	/* Take the interface up if the setup was ok */
+	net_if_up(vlan_iface);
+
+	return 0;
+}
+
+int init_vlan(void)
+{
+	struct ud user_data;
+	int ret;
+
+	if (CONFIG_NET_VLAN_COUNT == 0) {
+		LOG_DBG("No VLAN interfaces defined.");
+		return 0;
+	}
+
+	memset(&user_data, 0, sizeof(user_data));
+
+	net_if_foreach(iface_cb, &user_data);
+
+	/* This sample has two VLANs. For the second one we need to manually
+	 * create IP address for this test. But first the VLAN needs to be
+	 * added to the interface so that IPv6 DAD can work properly.
+	 */
+	ret = setup_iface(user_data.eth, user_data.first,
+			  CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = setup_iface(user_data.eth, user_data.second,
+			  CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
diff --git a/samples/net/dhcpv4_client/sample.yaml b/samples/net/dhcpv4_client/sample.yaml
index 44e1f91dc48f4..5656717934ece 100644
--- a/samples/net/dhcpv4_client/sample.yaml
+++ b/samples/net/dhcpv4_client/sample.yaml
@@ -4,9 +4,6 @@ tests:
   sample.net.dhcpv4_client:
     harness: net
     depends_on: netif
-    platform_exclude:
-      - native_posix/native/64
-      - native_posix
     tags:
       - net
       - http
diff --git a/samples/net/dns_resolve/sample.yaml b/samples/net/dns_resolve/sample.yaml
index 0d346fec82119..f62c25fccc81b 100644
--- a/samples/net/dns_resolve/sample.yaml
+++ b/samples/net/dns_resolve/sample.yaml
@@ -4,9 +4,6 @@ common:
   tags:
     - net
     - dns
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 sample:
   description: DNS resolver, mDNS and LLMNR responder
   name: DNS resolver and responder sample application
diff --git a/samples/net/dsa/src/dsa_lldp.c b/samples/net/dsa/src/dsa_lldp.c
index 3a25f683fa97a..f148207121403 100644
--- a/samples/net/dsa/src/dsa_lldp.c
+++ b/samples/net/dsa/src/dsa_lldp.c
@@ -36,11 +36,12 @@ static const uint8_t eth_filter_l2_addr_base[][6] = {
 enum net_verdict dsa_ll_addr_switch_cb(struct net_if *iface, struct net_pkt *pkt)
 {
 	struct net_eth_hdr *hdr = NET_ETH_HDR(pkt);
-	struct net_linkaddr lladst;
+	struct net_linkaddr lladst = { 0 };
 
 	net_pkt_cursor_init(pkt);
-	lladst.len = sizeof(hdr->dst.addr);
-	lladst.addr = &hdr->dst.addr[0];
+
+	(void)net_linkaddr_set(&lladst, (const uint8_t *)hdr->dst.addr,
+			       sizeof(hdr->dst.addr));
 
 	/*
 	 * Pass packet to lan1..3 when matching one from
diff --git a/samples/net/gptp/boards/mimxrt1050_evk.conf b/samples/net/gptp/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
similarity index 100%
rename from samples/net/gptp/boards/mimxrt1050_evk.conf
rename to samples/net/gptp/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
diff --git a/samples/net/gptp/boards/native_sim.conf b/samples/net/gptp/boards/native_sim.conf
index c514520186c2b..104c6cd4817ce 100644
--- a/samples/net/gptp/boards/native_sim.conf
+++ b/samples/net/gptp/boards/native_sim.conf
@@ -1,8 +1,8 @@
-# Settings for native_posix ethernet driver
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
+# Settings for native_sim / native_tap ethernet driver
+CONFIG_ETH_NATIVE_TAP_PTP_CLOCK=y
 
-#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
+#CONFIG_ETH_NATIVE_TAP_RANDOM_MAC=y
+CONFIG_ETH_NATIVE_TAP_MAC_ADDR="00:00:5e:00:53:2a"
 
-# Assume 1 ms accuracy for native_posix simulated clock
+# Assume 1 ms accuracy for native_sim simulated clock
 CONFIG_NET_GPTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/lwm2m_client/Kconfig b/samples/net/lwm2m_client/Kconfig
index 888e83152f7f8..9625cb1b949fe 100644
--- a/samples/net/lwm2m_client/Kconfig
+++ b/samples/net/lwm2m_client/Kconfig
@@ -5,7 +5,7 @@
 
 mainmenu "LwM2M Client sample"
 
-config LWM2M_APP_ID
+config NET_SAMPLE_LWM2M_ID
 	string "LwM2M Client identity"
 	default ""
 	help
@@ -13,24 +13,28 @@ config LWM2M_APP_ID
 	  Leave empty for using CONFIG_BOARD
 
 if LWM2M_DTLS_SUPPORT
-config LWM2M_APP_PSK
+config NET_SAMPLE_LWM2M_PSK
 	string "PSK key"
 	default "000102030405060708090a0b0c0d0e0f"
 	help
 	  PSK key as a hex string.
 	  Maximum binary size is CONFIG_LWM2M_SECURITY_KEY_SIZE.
 
-config LWM2M_APP_TLS_TAG
+config NET_SAMPLE_LWM2M_TLS_TAG
 	int "TLS security tag"
 	default 1
 	help
 	  TLS security tag to use when connecting.
 endif
 
-config LWM2M_APP_SERVER
+config NET_SAMPLE_MIGHT_HAVE_INTERNET
+	bool
+	default y if (WIFI || MODEM)
+
+config NET_SAMPLE_LWM2M_SERVER
 	string "LwM2M server address"
-	default "coap://leshan.eclipseprojects.io:5683" if (WIFI && !LWM2M_DTLS_SUPPORT)
-	default "coaps://leshan.eclipseprojects.io:5684" if (WIFI && LWM2M_DTLS_SUPPORT)
+	default "coap://leshan.eclipseprojects.io:5683" if (NET_SAMPLE_MIGHT_HAVE_INTERNET && !LWM2M_DTLS_SUPPORT)
+	default "coaps://leshan.eclipseprojects.io:5684" if (NET_SAMPLE_MIGHT_HAVE_INTERNET && LWM2M_DTLS_SUPPORT)
 	default "coap://192.0.2.2:5683" if !LWM2M_DTLS_SUPPORT
 	default "coaps://192.0.2.2:5684" if (LWM2M_DTLS_SUPPORT && !LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
 	default "coaps://192.0.2.2:5784" if (LWM2M_DTLS_SUPPORT && LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
@@ -41,7 +45,7 @@ config LWM2M_APP_SERVER
 	  When port number is missing, CONFIG_LWM2M_PEER_PORT is used instead.
 	  IPv6 addresses must be enclosed in square brackets, for example "coap://[fd00::1]".
 
-config WAIT_DNS_SERVER_ADDITION
+config NET_SAMPLE_LWM2M_WAIT_DNS
 	bool "Wait DNS server addition before considering connection to be up"
 	depends on MODEM_HL7800 && !DNS_SERVER_IP_ADDRESSES
 	help
diff --git a/samples/net/lwm2m_client/boards/native_posix.conf b/samples/net/lwm2m_client/boards/native_posix.conf
deleted file mode 100644
index 3e21f837f7c2e..0000000000000
--- a/samples/net/lwm2m_client/boards/native_posix.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_DNS_RESOLVER=y
-CONFIG_DNS_SERVER_IP_ADDRESSES=y
-CONFIG_DNS_SERVER1="192.0.2.2"
-CONFIG_LWM2M_DNS_SUPPORT=y
-CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
diff --git a/samples/net/lwm2m_client/boards/nrf9160dk_nrf52840.conf b/samples/net/lwm2m_client/boards/nrf9160dk_nrf52840.conf
new file mode 100644
index 0000000000000..175066b865a27
--- /dev/null
+++ b/samples/net/lwm2m_client/boards/nrf9160dk_nrf52840.conf
@@ -0,0 +1,34 @@
+CONFIG_UART_ASYNC_API=y
+CONFIG_UART_1_ASYNC=y
+CONFIG_UART_1_INTERRUPT_DRIVEN=n
+
+# Align with the Serial LTE Modem (SLM) application.
+CONFIG_MODEM_CELLULAR_UART_BUFFER_SIZES=6000
+
+# Networking
+CONFIG_NETWORKING=y
+CONFIG_NET_NATIVE=y
+CONFIG_NET_L2_PPP=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_UDP=y
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_CONTEXT_RCVTIMEO=y
+
+# DNS
+CONFIG_DNS_RESOLVER=y
+CONFIG_NET_L2_PPP_OPTION_DNS_USE=y
+CONFIG_DNS_SERVER_IP_ADDRESSES=y
+CONFIG_DNS_SERVER1="8.8.8.8"
+CONFIG_LWM2M_DNS_SUPPORT=y
+
+# Network management
+CONFIG_NET_MGMT=y
+CONFIG_NET_MGMT_EVENT=y
+CONFIG_NET_CONNECTION_MANAGER=y
+
+# Modem driver
+CONFIG_MODEM=y
+CONFIG_MODEM_CELLULAR=y
+
+# LwM2M client does not use power management
+CONFIG_PM_DEVICE=n
diff --git a/samples/net/lwm2m_client/boards/nrf9160dk_nrf52840.overlay b/samples/net/lwm2m_client/boards/nrf9160dk_nrf52840.overlay
new file mode 100644
index 0000000000000..6fd249e01c4ee
--- /dev/null
+++ b/samples/net/lwm2m_client/boards/nrf9160dk_nrf52840.overlay
@@ -0,0 +1,18 @@
+#include <nrf52840/nrf9160dk_uart1_on_if0_3.dtsi>
+
+/ {
+	aliases {
+		modem = &modem;
+	};
+};
+
+&uart1 {
+	current-speed = <115200>;
+	hw-flow-control;
+
+	modem: modem {
+		compatible = "nordic,nrf91-slm";
+		status = "okay";
+		mdm-power-gpios = <&interface_to_nrf9160 4 GPIO_ACTIVE_LOW>;
+	};
+};
diff --git a/samples/net/lwm2m_client/overlay-data-cache.conf b/samples/net/lwm2m_client/overlay-data-cache.conf
new file mode 100644
index 0000000000000..e7c410f51c065
--- /dev/null
+++ b/samples/net/lwm2m_client/overlay-data-cache.conf
@@ -0,0 +1,5 @@
+CONFIG_ZCBOR=y
+CONFIG_ZCBOR_CANONICAL=y
+CONFIG_LWM2M_RW_SENML_CBOR_SUPPORT=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT=y
diff --git a/samples/net/lwm2m_client/overlay-hl7800.conf b/samples/net/lwm2m_client/overlay-hl7800.conf
index 99ecce48a1e08..645222db49fb9 100644
--- a/samples/net/lwm2m_client/overlay-hl7800.conf
+++ b/samples/net/lwm2m_client/overlay-hl7800.conf
@@ -5,7 +5,7 @@ CONFIG_MODEM_HL7800=y
 # The HL7800 driver gets its IP settings from the cell network
 CONFIG_NET_CONFIG_SETTINGS=n
 CONFIG_NET_CONNECTION_MANAGER=y
-CONFIG_WAIT_DNS_SERVER_ADDITION=y
+CONFIG_NET_SAMPLE_LWM2M_WAIT_DNS=y
 CONFIG_DNS_RESOLVER=y
 
 # NB-IoT has large latency, so increase timeouts. It is ok to use this for Cat-M1 as well.
diff --git a/samples/net/lwm2m_client/overlay-ot.conf b/samples/net/lwm2m_client/overlay-ot.conf
index ee9750d2518d2..92b6900662767 100644
--- a/samples/net/lwm2m_client/overlay-ot.conf
+++ b/samples/net/lwm2m_client/overlay-ot.conf
@@ -35,7 +35,7 @@ CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
 
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"
-CONFIG_LWM2M_APP_SERVER="coap://[fdde:ad00:beef::2]"
+CONFIG_NET_SAMPLE_LWM2M_SERVER="coap://[fdde:ad00:beef::2]"
 
 # mbedTLS tweaks
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=768
diff --git a/samples/net/lwm2m_client/sample.yaml b/samples/net/lwm2m_client/sample.yaml
index 5c8f0eb7f1182..a3f21d89a01c1 100644
--- a/samples/net/lwm2m_client/sample.yaml
+++ b/samples/net/lwm2m_client/sample.yaml
@@ -64,6 +64,18 @@ tests:
     tags:
       - net
       - lwm2m
+  sample.net.lwm2m_client.data_cache:
+    harness: net
+    depends_on: netif
+    extra_args: EXTRA_CONF_FILE=overlay-data-cache.conf
+    platform_allow:
+      - qemu_x86
+      - native_sim
+    integration_platforms:
+      - qemu_x86
+    tags:
+      - net
+      - lwm2m
   sample.net.lwm2m_client.wnc_m14a2a:
     harness: net
     extra_args: SHIELD=wnc_m14a2a
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index b2a1f4e2077cf..9127769ff6b84 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -30,10 +30,10 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define CLIENT_SERIAL_NUMBER	"345000123"
 #define CLIENT_FIRMWARE_VER	"1.0"
 #define CLIENT_HW_VER		"1.0.1"
-#define TEMP_SENSOR_UNITS	"Celcius"
+#define TEMP_SENSOR_UNITS       "Celsius"
 
 /* Macros used to subscribe to specific Zephyr NET management events. */
-#if defined(CONFIG_WAIT_DNS_SERVER_ADDITION)
+#if defined(CONFIG_NET_SAMPLE_LWM2M_WAIT_DNS)
 #define L4_EVENT_MASK (NET_EVENT_DNS_SERVER_ADD | NET_EVENT_L4_DISCONNECTED)
 #else
 #define L4_EVENT_MASK (NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED)
@@ -56,7 +56,7 @@ static double max_range = 100;
 static struct lwm2m_ctx client_ctx;
 
 static const char *endpoint =
-	(sizeof(CONFIG_LWM2M_APP_ID) > 1 ? CONFIG_LWM2M_APP_ID : CONFIG_BOARD);
+	(sizeof(CONFIG_NET_SAMPLE_LWM2M_ID) > 1 ? CONFIG_NET_SAMPLE_LWM2M_ID : CONFIG_BOARD);
 
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
 BUILD_ASSERT(sizeof(endpoint) <= CONFIG_LWM2M_SECURITY_KEY_SIZE,
@@ -109,17 +109,17 @@ static int lwm2m_setup(void)
 	/* setup SECURITY object */
 
 	/* Server URL */
-	lwm2m_set_string(&LWM2M_OBJ(0, 0, 0), CONFIG_LWM2M_APP_SERVER);
+	lwm2m_set_string(&LWM2M_OBJ(0, 0, 0), CONFIG_NET_SAMPLE_LWM2M_SERVER);
 
 	/* Security Mode */
 	lwm2m_set_u8(&LWM2M_OBJ(0, 0, 2), IS_ENABLED(CONFIG_LWM2M_DTLS_SUPPORT) ? 0 : 3);
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
 	lwm2m_set_string(&LWM2M_OBJ(0, 0, 3), endpoint);
-	if (sizeof(CONFIG_LWM2M_APP_PSK) > 1) {
-		char psk[1 + sizeof(CONFIG_LWM2M_APP_PSK) / 2];
+	if (sizeof(CONFIG_NET_SAMPLE_LWM2M_PSK) > 1) {
+		char psk[1 + sizeof(CONFIG_NET_SAMPLE_LWM2M_PSK) / 2];
 		/* Need to skip the nul terminator from string */
-		size_t len = hex2bin(CONFIG_LWM2M_APP_PSK, sizeof(CONFIG_LWM2M_APP_PSK) - 1, psk,
-				     sizeof(psk));
+		size_t len = hex2bin(CONFIG_NET_SAMPLE_LWM2M_PSK,
+				     sizeof(CONFIG_NET_SAMPLE_LWM2M_PSK) - 1, psk, sizeof(psk));
 		if (len <= 0) {
 			return -EINVAL;
 		}
@@ -338,7 +338,7 @@ static void l4_event_handler(struct net_mgmt_event_callback *cb,
 			     struct net_if *iface)
 {
 	switch (event) {
-#if defined(CONFIG_WAIT_DNS_SERVER_ADDITION)
+#if defined(CONFIG_NET_SAMPLE_LWM2M_WAIT_DNS)
 	case NET_EVENT_DNS_SERVER_ADD:
 #else
 	case NET_EVENT_L4_CONNECTED:
@@ -376,6 +376,13 @@ int main(void)
 	k_sem_init(&quit_lock, 0, K_SEM_MAX_LIMIT);
 
 	if (IS_ENABLED(CONFIG_NET_CONNECTION_MANAGER)) {
+		struct net_if *iface = net_if_get_default();
+
+		if (!iface) {
+			LOG_ERR("No network interface found!");
+			return -ENODEV;
+		}
+
 		/* Setup handler for Zephyr NET Connection Manager events. */
 		net_mgmt_init_event_callback(&l4_cb, l4_event_handler, L4_EVENT_MASK);
 		net_mgmt_add_event_callback(&l4_cb);
@@ -385,14 +392,14 @@ int main(void)
 					     CONN_LAYER_EVENT_MASK);
 		net_mgmt_add_event_callback(&conn_cb);
 
-		ret = net_if_up(net_if_get_default());
+		ret = net_if_up(iface);
 
 		if (ret < 0 && ret != -EALREADY) {
 			LOG_ERR("net_if_up, error: %d", ret);
 			return ret;
 		}
 
-		(void)conn_mgr_if_connect(net_if_get_default());
+		(void)conn_mgr_if_connect(iface);
 
 		LOG_INF("Waiting for network connection...");
 		k_sem_take(&network_connected_sem, K_FOREVER);
@@ -406,7 +413,7 @@ int main(void)
 
 	(void)memset(&client_ctx, 0x0, sizeof(client_ctx));
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
-	client_ctx.tls_tag = CONFIG_LWM2M_APP_TLS_TAG;
+	client_ctx.tls_tag = CONFIG_NET_SAMPLE_LWM2M_TLS_TAG;
 #endif
 	client_ctx.set_socket_state = socket_state;
 
diff --git a/samples/net/mdns_responder/CMakeLists.txt b/samples/net/mdns_responder/CMakeLists.txt
index 5c4e88178a922..a9003b52486e8 100644
--- a/samples/net/mdns_responder/CMakeLists.txt
+++ b/samples/net/mdns_responder/CMakeLists.txt
@@ -6,6 +6,5 @@ project(mdns_responder)
 
 target_sources(app PRIVATE src/main.c)
 target_sources(app PRIVATE src/service.c)
-target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE src/vlan.c)
 
 include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/mdns_responder/Kconfig b/samples/net/mdns_responder/Kconfig
index 53cc3d2153d48..ceeb6f1abba2f 100644
--- a/samples/net/mdns_responder/Kconfig
+++ b/samples/net/mdns_responder/Kconfig
@@ -5,52 +5,5 @@
 
 mainmenu "Networking mDNS responder sample application"
 
-config NET_SAMPLE_IFACE2_MY_IPV6_ADDR
-	string "My IPv6 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_MY_IPV4_ADDR
-	string "My IPv4 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_MY_IPV4_NETMASK
-	string "My IPv4 netmask for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_VLAN_TAG
-	int "VLAN tag for second interface"
-	default 100
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_IFACE3_MY_IPV6_ADDR
-	string "My IPv6 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_ADDR
-	string "My IPv4 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_NETMASK
-	string "My IPv4 netmask for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_VLAN_TAG
-	int "VLAN tag for third interface"
-	default 200
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
+source "samples/net/common/Kconfig"
 source "Kconfig.zephyr"
diff --git a/samples/net/mdns_responder/overlay-vlan.conf b/samples/net/mdns_responder/overlay-vlan.conf
index bdab8a44350b1..bcae2b5799d7f 100644
--- a/samples/net/mdns_responder/overlay-vlan.conf
+++ b/samples/net/mdns_responder/overlay-vlan.conf
@@ -11,21 +11,11 @@ CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
-# Second ethernet interface will have these settings
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"
-# TEST-NET-2 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR="198.51.100.1"
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG=100
+# Second VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1="100;2001:db8:100::1/64,198.51.100.1/24"
 
-# Settings for the third network interface
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR="2001:db8:200::1"
-# TEST-NET-3 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR="203.0.113.1"
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG=200
+# Third VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"
 
 # Each interface needs at least 2 context. So if we have three
 # interfaces we need minimum 6 context but allocate more so that
diff --git a/samples/net/mdns_responder/src/main.c b/samples/net/mdns_responder/src/main.c
index 663ebc27545d6..b373ea78ca8e8 100644
--- a/samples/net/mdns_responder/src/main.c
+++ b/samples/net/mdns_responder/src/main.c
@@ -16,15 +16,6 @@ LOG_MODULE_REGISTER(net_mdns_responder_sample, LOG_LEVEL_DBG);
 
 extern void service(void);
 
-#if defined(CONFIG_NET_VLAN)
-int init_vlan(void);
-#else
-static inline int init_vlan(void)
-{
-	return 0;
-}
-#endif /* CONFIG_NET_VLAN */
-
 /*
  * Note that mDNS support requires no application interaction with zephyr,
  * beyond optional runtime hostname configuration calls and setting
diff --git a/samples/net/mdns_responder/src/vlan.c b/samples/net/mdns_responder/src/vlan.c
deleted file mode 100644
index 6f29520ec7e4e..0000000000000
--- a/samples/net/mdns_responder/src/vlan.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(net_mdns_responder_sample, LOG_LEVEL_DBG);
-
-#include <zephyr/kernel.h>
-
-#include <zephyr/net/ethernet.h>
-
-/* User data for the interface callback */
-struct ud {
-	struct net_if *first;
-	struct net_if *second;
-};
-
-static void iface_cb(struct net_if *iface, void *user_data_param)
-{
-	struct ud *user_data = user_data_param;
-
-	if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
-		return;
-	}
-
-	if (!user_data->first) {
-		user_data->first = iface;
-		return;
-	}
-
-	if (!user_data->second) {
-		user_data->second = iface;
-		return;
-	}
-}
-
-static int setup_iface(struct net_if *eth_iface,
-		       struct net_if *iface,
-		       const char *ipv6_addr,
-		       const char *ipv4_addr,
-		       const char *netmask,
-		       uint16_t vlan_tag)
-{
-	struct net_if_addr *ifaddr;
-	struct in_addr addr4;
-	struct in6_addr addr6;
-	int ret;
-
-	ret = net_eth_vlan_enable(eth_iface, vlan_tag);
-	if (ret < 0) {
-		LOG_ERR("Cannot enable VLAN for tag %d (%d)", vlan_tag, ret);
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV6)) {
-		if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) {
-			LOG_ERR("Invalid address: %s", ipv6_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv6_addr_add(iface, &addr6,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv6_addr, iface);
-			return -EINVAL;
-		}
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV4)) {
-		if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) {
-			LOG_ERR("Invalid address: %s", ipv4_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv4_addr_add(iface, &addr4,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv4_addr, iface);
-			return -EINVAL;
-		}
-
-		if (netmask && netmask[0]) {
-			struct in_addr nm;
-
-			if (net_addr_pton(AF_INET, netmask, &nm)) {
-				LOG_ERR("Invalid netmask: %s", ipv4_addr);
-				return -EINVAL;
-			}
-
-			net_if_ipv4_set_netmask_by_addr(iface, &addr4, &nm);
-		}
-	}
-
-	LOG_DBG("Interface %p VLAN tag %d setup done.", iface, vlan_tag);
-
-	return 0;
-}
-
-int init_vlan(void)
-{
-	struct net_if *iface;
-	struct ud user_data;
-	int ret;
-
-	if (CONFIG_NET_VLAN_COUNT == 0) {
-		LOG_DBG("No VLAN interfaces defined.");
-		return 0;
-	}
-
-	iface = net_if_get_first_by_type(&NET_L2_GET_NAME(ETHERNET));
-	if (!iface) {
-		LOG_ERR("No ethernet interfaces found.");
-		return -ENOENT;
-	}
-
-	memset(&user_data, 0, sizeof(user_data));
-
-	net_if_foreach(iface_cb, &user_data);
-
-	/* This sample has two VLANs. For the second one we need to manually
-	 * create IP address for this test. But first the VLAN needs to be
-	 * added to the interface so that IPv6 DAD can work properly.
-	 */
-	ret = setup_iface(iface, user_data.first,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_NETMASK,
-			  CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = setup_iface(iface, user_data.second,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_NETMASK,
-			  CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	/* Bring up the VLAN interface automatically */
-	net_if_up(user_data.first);
-	net_if_up(user_data.second);
-
-	return 0;
-}
diff --git a/samples/net/mqtt_publisher/docker-test.sh b/samples/net/mqtt_publisher/docker-test.sh
index 4c26be0771849..797e250747a2f 100644
--- a/samples/net/mqtt_publisher/docker-test.sh
+++ b/samples/net/mqtt_publisher/docker-test.sh
@@ -13,7 +13,7 @@ start_configuration || return $?
 start_docker \
     "/usr/local/sbin/mosquitto -v -c /usr/local/etc/mosquitto/mosquitto.conf" || return $?
 
-start_zephyr -DOVERLAY_CONFIG=overlay-sample.conf "$overlay"
+start_zephyr -DEXTRA_CONF_FILE=overlay-sample.conf "$overlay"
 
 wait_zephyr
 result=$?
@@ -30,7 +30,7 @@ echo "Starting MQTT TLS test"
 start_docker \
     "/usr/local/sbin/mosquitto -v -c /usr/local/etc/mosquitto/mosquitto-tls.conf" || return $?
 
-start_zephyr -DOVERLAY_CONFIG="overlay-tls.conf overlay-sample.conf" "$overlay"
+start_zephyr -DEXTRA_CONF_FILE="overlay-tls.conf overlay-sample.conf" "$overlay"
 
 wait_zephyr
 result=$?
@@ -49,7 +49,9 @@ echo "Starting MQTT TLS + proxy test"
 
 start_docker "/usr/sbin/danted" || return $?
 
-start_zephyr -DOVERLAY_CONFIG="overlay-tls.conf overlay-sample.conf overlay-socks5.conf" "$overlay" || return $?
+start_zephyr \
+    -DEXTRA_CONF_FILE="overlay-tls.conf overlay-sample.conf overlay-socks5.conf" "$overlay" || \
+    return $?
 
 wait_zephyr
 result=$?
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index faa96e33b5c05..7ae967058e3c9 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -475,7 +475,7 @@ static int publisher(void)
 		r = 0;
 	}
 
-	rc = mqtt_disconnect(&client_ctx);
+	rc = mqtt_disconnect(&client_ctx, NULL);
 	PRINT_RESULT("mqtt_disconnect", rc);
 
 	LOG_INF("Bye!");
diff --git a/samples/net/mqtt_sn_publisher/boards/native_posix.conf b/samples/net/mqtt_sn_publisher/boards/native_posix.conf
deleted file mode 100644
index 357bbc8f5df0a..0000000000000
--- a/samples/net/mqtt_sn_publisher/boards/native_posix.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Configuration options for MQTT-SN sample
-
-# Copyright (c) 2022 René Beckmann
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/net/openthread/coprocessor/overlay-tri-n4m-br.conf b/samples/net/openthread/coprocessor/overlay-tri-n4m-br.conf
index 4cb1b26b30d71..35781afcf5e31 100644
--- a/samples/net/openthread/coprocessor/overlay-tri-n4m-br.conf
+++ b/samples/net/openthread/coprocessor/overlay-tri-n4m-br.conf
@@ -16,6 +16,5 @@ CONFIG_USB_REQUEST_BUFFER_SIZE=2048
 
 # disable ethernet on K64
 CONFIG_NET_L2_ETHERNET=n
-CONFIG_ETH_MCUX=n
 
 CONFIG_ISR_STACK_SIZE=4096
diff --git a/samples/net/pkt_filter/CMakeLists.txt b/samples/net/pkt_filter/CMakeLists.txt
new file mode 100644
index 0000000000000..e7491e45d3c5c
--- /dev/null
+++ b/samples/net/pkt_filter/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(pkt_filter)
+
+target_sources(app PRIVATE src/main.c)
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/pkt_filter/Kconfig b/samples/net/pkt_filter/Kconfig
new file mode 100644
index 0000000000000..5a084b0fff52e
--- /dev/null
+++ b/samples/net/pkt_filter/Kconfig
@@ -0,0 +1,7 @@
+# Private config options for pkt_filter sample app
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "samples/net/common/Kconfig"
+source "Kconfig.zephyr"
diff --git a/samples/net/pkt_filter/README.rst b/samples/net/pkt_filter/README.rst
new file mode 100644
index 0000000000000..2759085475b5b
--- /dev/null
+++ b/samples/net/pkt_filter/README.rst
@@ -0,0 +1,120 @@
+.. zephyr:code-sample:: net-pkt-filter
+   :name: Network packet filter
+   :relevant-api: net_pkt_filter
+
+   Install network packet filter hooks.
+
+Overview
+********
+
+This sample shows how to set network packet filters from a user application.
+
+The source code for this sample application can be found at:
+:zephyr_file:`samples/net/pkt_filter`.
+
+Requirements
+************
+
+- :ref:`networking_with_host`
+
+Building and Running
+********************
+
+A good way to run this sample application is with QEMU or native_sim board
+as described in :ref:`networking_with_host`.
+
+For demo purposes, the VLAN support needs to be enabled in host side like this.
+Execute these commands in a terminal window:
+
+.. code-block:: console
+
+   $ cd tools/net-tools
+   $ ./net-setup.sh  -c zeth-vlan.conf
+
+Then follow these steps to build the network packet filter sample application for
+either ``qemu_x86`` or ``native_sim`` boards:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/net/pkt_filter
+   :board: <board to use>
+   :conf: "prj.conf overlay-vlan.conf"
+   :goals: build
+   :compact:
+
+In this example, we enable VLAN support with these settings:
+
+The VLAN overlay configuration file :zephyr_file:`samples/net/pkt_filter/overlay-vlan.conf`
+creates two virtual LAN networks with these settings:
+
+- VLAN tag 100: IPv4 198.51.100.1 and IPv6 2001:db8:100::1
+- VLAN tag 200: IPv4 203.0.113.1 and IPv6 2001:db8:200::1
+
+In network shell, you can monitor the network packet filters:
+
+.. code-block:: console
+
+   uart:~$ net filter
+   Rule  Type        Verdict  Tests
+   [ 1]  recv        OK       3    eth vlan type[0x0800],size max[200],iface[2]
+   [ 2]  recv        OK       3    eth vlan type[0x0800],size min[100],iface[3]
+   [ 3]  recv        OK       1    iface[1]
+   [ 4]  recv        OK       2    eth vlan type[0x0806],iface[2]
+   [ 5]  recv        OK       2    eth vlan type[0x0806],iface[3]
+   [ 6]  recv        DROP     0
+
+The above sample application network packet filter rules can be interpreted
+like this:
+
+* Rule 1: Allow IPv4 (Ethernet type 0x0800) packets with max size 200 bytes
+  to network interface 2 which is the first VLAN interface.
+
+* Rule 2: Allow IPv4 packets with min size 100 bytes to network interface 3
+  which is the second VLAN interface.
+
+* Rule 3: Allow all incoming traffic to Ethernet interface 1
+
+* Rule 4: Allow ARP packets (Ethernet type 0x0806) to VLAN interface 2
+
+* Rule 5: Allow ARP packets (Ethernet type 0x0806) to VLAN interface 3
+
+* Rule 6: Drop all other packets. This also means that IPv6 packets are
+  dropped.
+
+The network statistics can be used to see that the packets are dropped.
+Use ``net stats`` command to monitor statistics.
+
+You can verify the rules from network shell:
+
+.. code-block:: console
+
+   uart:~$ net ping 2001:db8:100::2 -c 2
+   PING 2001:db8:100::2
+   Ping timeout
+   uart:~$ net stats 2
+   Interface 0x8089c6c (Virtual) [2]
+   ==================================
+   IPv6 recv      0        sent    3       drop    0       forwarded       0
+   IPv6 ND recv   0        sent    7       drop    1
+   IPv6 MLD recv  0        sent    0       drop    0
+   ICMP recv      0        sent    3       drop    0
+   ...
+   Filter drop rx 10       tx      0
+   Bytes received 320
+   Bytes sent     660
+   Processing err 10
+
+   uart:~$ net ping 198.51.100.2 -c 1
+   PING 198.51.100.2
+   28 bytes from 198.51.100.2 to 198.51.100.1: icmp_seq=1 ttl=64 time=100 ms
+
+   uart:~$ net ping 198.51.100.2 -c 1 -s 201
+   PING 198.51.100.2
+   Ping timeout
+
+   uart:~$ net ping 203.0.113.2 -c 1
+   PING 203.0.113.2
+   Ping timeout
+
+   uart:~$ net ping 203.0.113.2 -c 1 -s 101
+   PING 203.0.113.2
+   125 bytes from 203.0.113.2 to 203.0.113.1: icmp_seq=1 ttl=64 time=20 ms
diff --git a/samples/net/pkt_filter/overlay-vlan.conf b/samples/net/pkt_filter/overlay-vlan.conf
new file mode 100644
index 0000000000000..21da953356ed4
--- /dev/null
+++ b/samples/net/pkt_filter/overlay-vlan.conf
@@ -0,0 +1,23 @@
+CONFIG_NET_VLAN=y
+
+# Allow useful interface assigned to VLAN interface
+CONFIG_NET_INTERFACE_NAME_LEN=15
+
+# We have one non-vlan interface and two VLAN interfaces
+CONFIG_NET_VLAN_COUNT=2
+
+# There will be three network interfaces so allocate enough IPv4 and IPv6 configs.
+CONFIG_NET_IF_MAX_IPV4_COUNT=3
+CONFIG_NET_IF_MAX_IPV6_COUNT=3
+
+# First ethernet interface will use these settings
+CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
+CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
+CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
+CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
+
+# First VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1="100;2001:db8:100::1/64,198.51.100.1/24"
+
+# Second VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"
diff --git a/samples/net/pkt_filter/prj.conf b/samples/net/pkt_filter/prj.conf
new file mode 100644
index 0000000000000..1ec1c27ef7feb
--- /dev/null
+++ b/samples/net/pkt_filter/prj.conf
@@ -0,0 +1,54 @@
+# Generic network options
+CONFIG_NETWORKING=y
+CONFIG_NET_LOG=y
+CONFIG_NET_IPV6=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_DHCPV4=n
+CONFIG_NET_UDP=y
+CONFIG_NET_TCP=y
+CONFIG_NET_L2_ETHERNET=y
+
+# Enable packet filtering
+CONFIG_NET_PKT_FILTER=y
+CONFIG_NET_PKT_FILTER_IPV4_HOOK=y
+CONFIG_NET_PKT_FILTER_IPV6_HOOK=y
+CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK=y
+
+# Network statistics options
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_STATISTICS_USER_API=y
+CONFIG_NET_STATISTICS_PER_INTERFACE=y
+CONFIG_NET_STATISTICS_ETHERNET=y
+
+CONFIG_TEST_RANDOM_GENERATOR=y
+
+# Network packet configuration
+CONFIG_NET_PKT_RX_COUNT=32
+CONFIG_NET_PKT_TX_COUNT=32
+CONFIG_NET_BUF_RX_COUNT=32
+CONFIG_NET_BUF_TX_COUNT=32
+
+# IP address configuration
+CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=5
+CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1
+CONFIG_NET_MAX_CONTEXTS=10
+
+CONFIG_INIT_STACKS=y
+CONFIG_PRINTK=y
+CONFIG_NET_SHELL=y
+
+# Application configuration
+CONFIG_NET_CONFIG_NEED_IPV6=y
+CONFIG_NET_CONFIG_NEED_IPV4=y
+CONFIG_NET_CONFIG_SETTINGS=y
+
+# IP address configuration
+CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
+CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
+CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
+CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
+
+# Logging
+CONFIG_LOG=y
+CONFIG_LOG_BUFFER_SIZE=4096
diff --git a/samples/net/pkt_filter/sample.yaml b/samples/net/pkt_filter/sample.yaml
new file mode 100644
index 0000000000000..7122b4b8926c9
--- /dev/null
+++ b/samples/net/pkt_filter/sample.yaml
@@ -0,0 +1,14 @@
+sample:
+  description: Network packet filtering functionality
+  name: Network packet filter sample app
+tests:
+  sample.net.pkt_filter:
+    harness: net
+    min_ram: 64
+    tags:
+      - net
+      - statistics
+      - net_pkt_filter
+    depends_on: netif
+    integration_platforms:
+      - native_sim
diff --git a/samples/net/pkt_filter/src/main.c b/samples/net/pkt_filter/src/main.c
new file mode 100644
index 0000000000000..d88a29436bed5
--- /dev/null
+++ b/samples/net/pkt_filter/src/main.c
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(net_stats_sample, LOG_LEVEL_DBG);
+
+#include <zephyr/kernel.h>
+#include <errno.h>
+
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_pkt_filter.h>
+
+#include "net_sample_common.h"
+
+#define MAX_INTERFACES 3
+
+static struct net_if *interfaces[MAX_INTERFACES];
+
+/* Interface match rule. The interface value is set at runtime in init_app() */
+static NPF_IFACE_MATCH(match_iface_vlan1, NULL);
+static NPF_IFACE_MATCH(match_iface_vlan2, NULL);
+static NPF_IFACE_MATCH(match_iface_eth, NULL);
+
+/* Allow all traffic to Ethernet interface, drop VLAN traffic except
+ * couple of exceptions for IPv4 and IPv6
+ */
+static NPF_RULE(eth_iface_rule, NET_OK, match_iface_eth);
+
+/* Match max size rule */
+static NPF_SIZE_MAX(maxsize_200, 200);
+static NPF_ETH_VLAN_TYPE_MATCH(ipv4_packet1, NET_ETH_PTYPE_IP);
+static NPF_RULE(small_ipv4_pkt, NET_OK, ipv4_packet1, maxsize_200,
+		match_iface_vlan1);
+
+/* Match min size rule */
+static NPF_SIZE_MIN(minsize_100, 100);
+static NPF_ETH_VLAN_TYPE_MATCH(ipv4_packet2, NET_ETH_PTYPE_IP);
+static NPF_RULE(large_ipv4_pkt, NET_OK, ipv4_packet2, minsize_100,
+		match_iface_vlan2);
+
+/* Allow ARP for VLAN interface */
+static NPF_ETH_VLAN_TYPE_MATCH(arp_packet, NET_ETH_PTYPE_ARP);
+static NPF_RULE(arp_pkt_vlan1, NET_OK, arp_packet, match_iface_vlan1);
+static NPF_RULE(arp_pkt_vlan2, NET_OK, arp_packet, match_iface_vlan2);
+
+static void iface_cb(struct net_if *iface, void *user_data)
+{
+	int count = 0;
+
+	ARG_UNUSED(user_data);
+
+	ARRAY_FOR_EACH(interfaces, i) {
+		if (interfaces[i] == NULL) {
+			interfaces[i] = iface;
+			return;
+		}
+
+		count++;
+	}
+
+	LOG_ERR("Too many interfaces %d (max is %d)", count, MAX_INTERFACES);
+}
+
+static void init_app(void)
+{
+	struct net_if *iface, *eth = NULL, *vlan1 = NULL, *vlan2 = NULL;
+	int found = 0;
+
+	ARRAY_FOR_EACH(interfaces, i) {
+		if (interfaces[i] == NULL) {
+			continue;
+		}
+
+		iface = interfaces[i];
+
+		if (net_eth_is_vlan_interface(iface)) {
+			if (vlan1 == NULL) {
+				vlan1 = iface;
+			} else if (vlan2 == NULL) {
+				vlan2 = iface;
+			}
+		} else if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET)) {
+			eth = iface;
+		} else {
+			continue;
+		}
+
+		found++;
+	}
+
+	if (found == 0) {
+		LOG_ERR("No interfaces found");
+		return;
+	}
+
+	match_iface_vlan1.iface = vlan1;
+	match_iface_vlan2.iface = vlan2;
+	match_iface_eth.iface = eth;
+
+	/* The sample will setup the Ethernet interface and two VLAN
+	 * optional interfaces (if VLAN is enabled).
+	 * We allow all traffic to the Ethernet interface, but have
+	 * filters for the VLAN interfaces.
+	 */
+
+	/* We allow small IPv4 packets to the VLAN interface 1 */
+	npf_append_recv_rule(&small_ipv4_pkt);
+
+	/* We allow large IPv4 packets to the VLAN interface 2 */
+	npf_append_recv_rule(&large_ipv4_pkt);
+
+	/* We allow all traffic to the Ethernet interface */
+	npf_append_recv_rule(&eth_iface_rule);
+
+	/* We allow ARP traffic to the VLAN 1 interface */
+	npf_append_recv_rule(&arp_pkt_vlan1);
+
+	/* We allow ARP traffic to the VLAN 2 interface */
+	npf_append_recv_rule(&arp_pkt_vlan2);
+
+	/* The remaining packets that do not match are dropped */
+	npf_append_recv_rule(&npf_default_drop);
+}
+
+int main(void)
+{
+	net_if_foreach(iface_cb, interfaces);
+
+	init_vlan();
+	init_app();
+
+	return 0;
+}
diff --git a/samples/net/prometheus/prj.conf b/samples/net/prometheus/prj.conf
index d7c2741f01edc..b863915a8386c 100644
--- a/samples/net/prometheus/prj.conf
+++ b/samples/net/prometheus/prj.conf
@@ -5,7 +5,7 @@ CONFIG_LOG=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_INIT_STACKS=y
-CONFIG_POSIX_MAX_FDS=32
+CONFIG_ZVFS_OPEN_MAX=32
 CONFIG_POSIX_API=y
 CONFIG_FDTABLE=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
diff --git a/samples/net/prometheus/sample.yaml b/samples/net/prometheus/sample.yaml
index 57fa5abfef1e8..944e0df61a3ae 100644
--- a/samples/net/prometheus/sample.yaml
+++ b/samples/net/prometheus/sample.yaml
@@ -11,10 +11,9 @@ common:
     - server
     - socket
     - prometheus
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
   # Exclude CONFIG_HAS_RENESAS_RA_FSP as Renesas RA HAL has build error with mbedtls Socket
   filter: not CONFIG_HAS_RENESAS_RA_FSP
+  integration_platforms:
+    - qemu_x86
 tests:
   sample.net.prometheus: {}
diff --git a/samples/net/prometheus/src/main.c b/samples/net/prometheus/src/main.c
index 399a783236c60..61aa362cc3280 100644
--- a/samples/net/prometheus/src/main.c
+++ b/samples/net/prometheus/src/main.c
@@ -39,8 +39,8 @@ struct app_context {
 
 #if defined(CONFIG_NET_SAMPLE_HTTP_SERVICE)
 static uint16_t test_http_service_port = CONFIG_NET_SAMPLE_HTTP_SERVER_SERVICE_PORT;
-HTTP_SERVICE_DEFINE(test_http_service, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &test_http_service_port, 1,
-		    10, NULL, NULL);
+HTTP_SERVICE_DEFINE(test_http_service, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &test_http_service_port,
+		    CONFIG_HTTP_SERVER_MAX_CLIENTS, 10, NULL, NULL);
 
 static int dyn_handler(struct http_client_ctx *client, enum http_data_status status,
 		       const struct http_request_ctx *request_ctx,
@@ -99,7 +99,8 @@ const sec_tag_t sec_tag_list_verify_none[] = {
 
 static uint16_t test_https_service_port = CONFIG_NET_SAMPLE_HTTPS_SERVER_SERVICE_PORT;
 HTTPS_SERVICE_DEFINE(test_https_service, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &test_https_service_port,
-		     1, 10, NULL, NULL, sec_tag_list_verify_none, sizeof(sec_tag_list_verify_none));
+		     CONFIG_HTTP_SERVER_MAX_CLIENTS, 10, NULL, NULL, sec_tag_list_verify_none,
+		     sizeof(sec_tag_list_verify_none));
 
 HTTP_RESOURCE_DEFINE(index_html_gz_resource_https, test_https_service, "/metrics",
 		     &dyn_resource_detail);
@@ -120,7 +121,7 @@ static void setup_tls(void)
 	}
 #endif /* defined(CONFIG_NET_SAMPLE_CERTS_WITH_SC) */
 
-	err = tls_credential_add(HTTP_SERVER_CERTIFICATE_TAG, TLS_CREDENTIAL_SERVER_CERTIFICATE,
+	err = tls_credential_add(HTTP_SERVER_CERTIFICATE_TAG, TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				 server_certificate, sizeof(server_certificate));
 	if (err < 0) {
 		LOG_ERR("Failed to register public certificate: %d", err);
diff --git a/samples/net/ptp/boards/native_posix.conf b/samples/net/ptp/boards/native_posix.conf
deleted file mode 100644
index e2f26372eede3..0000000000000
--- a/samples/net/ptp/boards/native_posix.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Settings for native_posix ethernet driver
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
-
-#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
-
-# Assume 1 ms accuracy for native_posix simulated clock
-CONFIG_PTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/ptp/boards/native_posix_native_64.conf b/samples/net/ptp/boards/native_posix_native_64.conf
deleted file mode 100644
index e2f26372eede3..0000000000000
--- a/samples/net/ptp/boards/native_posix_native_64.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Settings for native_posix ethernet driver
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
-
-#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
-
-# Assume 1 ms accuracy for native_posix simulated clock
-CONFIG_PTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/ptp/boards/native_sim.conf b/samples/net/ptp/boards/native_sim.conf
index e2f26372eede3..830898e1d9afb 100644
--- a/samples/net/ptp/boards/native_sim.conf
+++ b/samples/net/ptp/boards/native_sim.conf
@@ -1,8 +1,8 @@
-# Settings for native_posix ethernet driver
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
+# Settings for native_sim / native_tap ethernet driver
+CONFIG_ETH_NATIVE_TAP_PTP_CLOCK=y
 
-#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
+#CONFIG_ETH_NATIVE_TAP_RANDOM_MAC=y
+CONFIG_ETH_NATIVE_TAP_MAC_ADDR="00:00:5e:00:53:2a"
 
-# Assume 1 ms accuracy for native_posix simulated clock
+# Assume 1 ms accuracy for native_sim simulated clock
 CONFIG_PTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/ptp/boards/native_sim_native_64.conf b/samples/net/ptp/boards/native_sim_native_64.conf
index e2f26372eede3..830898e1d9afb 100644
--- a/samples/net/ptp/boards/native_sim_native_64.conf
+++ b/samples/net/ptp/boards/native_sim_native_64.conf
@@ -1,8 +1,8 @@
-# Settings for native_posix ethernet driver
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
+# Settings for native_sim / native_tap ethernet driver
+CONFIG_ETH_NATIVE_TAP_PTP_CLOCK=y
 
-#CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y
-CONFIG_ETH_NATIVE_POSIX_MAC_ADDR="00:00:5e:00:53:2a"
+#CONFIG_ETH_NATIVE_TAP_RANDOM_MAC=y
+CONFIG_ETH_NATIVE_TAP_MAC_ADDR="00:00:5e:00:53:2a"
 
-# Assume 1 ms accuracy for native_posix simulated clock
+# Assume 1 ms accuracy for native_sim simulated clock
 CONFIG_PTP_CLOCK_ACCURACY_1MS=y
diff --git a/samples/net/secure_mqtt_sensor_actuator/overlay-static-insecure.conf b/samples/net/secure_mqtt_sensor_actuator/overlay-static-insecure.conf
index 33655bfe4e10b..cd6fa5a716615 100644
--- a/samples/net/secure_mqtt_sensor_actuator/overlay-static-insecure.conf
+++ b/samples/net/secure_mqtt_sensor_actuator/overlay-static-insecure.conf
@@ -1,7 +1,7 @@
 # Config to disable TLS and DHCPv4, allowing insecure MQTT and a static IP address.
 # This allows quick testing of the application without need for a DHCP server or secure MQTT broker set up.
 # Only recommended for quick sampling/testing.
-# Usage: west build -b <board> -- -DOVERLAY_CONFIG=overlay-static-insecure.conf
+# Usage: west build -b <board> -- -DEXTRA_CONF_FILE=overlay-static-insecure.conf
 
 # Disable MQTT with TLS
 CONFIG_MQTT_LIB_TLS=n
diff --git a/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c b/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c
index 3fdb6f3abf479..df515b2e5b2f5 100644
--- a/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c
+++ b/samples/net/secure_mqtt_sensor_actuator/src/mqtt_client.c
@@ -402,7 +402,7 @@ void app_mqtt_run(struct mqtt_client *client)
 		}
 	}
 	/* Gracefully close connection */
-	mqtt_disconnect(client);
+	mqtt_disconnect(client, NULL);
 }
 
 void app_mqtt_connect(struct mqtt_client *client)
diff --git a/samples/net/sockets/big_http_download/sample.yaml b/samples/net/sockets/big_http_download/sample.yaml
index 0851eeffec07c..4c70c0d15d059 100644
--- a/samples/net/sockets/big_http_download/sample.yaml
+++ b/samples/net/sockets/big_http_download/sample.yaml
@@ -10,9 +10,6 @@ common:
   tags:
     - net
     - socket
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   sample.net.sockets.big_http_download:
     extra_configs:
diff --git a/samples/net/sockets/can/sample.yaml b/samples/net/sockets/can/sample.yaml
index a9dff7079d369..4e1d9d1c9fa25 100644
--- a/samples/net/sockets/can/sample.yaml
+++ b/samples/net/sockets/can/sample.yaml
@@ -8,10 +8,6 @@ common:
   filter: dt_chosen_enabled("zephyr,canbus") and not dt_compat_enabled("kvaser,pcican")
   depends_on: can
   harness: console
-  # native_posix does not work with CONFIG_POSIX_API
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   sample.net.sockets.can.one_socket:
     extra_configs:
diff --git a/samples/net/sockets/coap_download/src/main.c b/samples/net/sockets/coap_download/src/main.c
index 2bc935f9d7d82..bb15551cfba41 100644
--- a/samples/net/sockets/coap_download/src/main.c
+++ b/samples/net/sockets/coap_download/src/main.c
@@ -82,6 +82,8 @@ static void do_coap_download(struct sockaddr *sa)
 	/* Wait for CoAP request to complete */
 	k_sem_take(&coap_done_sem, K_FOREVER);
 
+	coap_client_cancel_requests(&client);
+
 	zsock_close(sockfd);
 }
 
diff --git a/samples/net/sockets/coap_server/boards/native_posix.conf b/samples/net/sockets/coap_server/boards/native_posix.conf
deleted file mode 100644
index b8f2d57be7431..0000000000000
--- a/samples/net/sockets/coap_server/boards/native_posix.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_NET_L2_ETHERNET=y
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
-CONFIG_NATIVE_UART_0_ON_STDINOUT=y
diff --git a/samples/net/sockets/coap_server/boards/native_sim.conf b/samples/net/sockets/coap_server/boards/native_sim.conf
index ac091ebe5db39..605b575e76a4c 100644
--- a/samples/net/sockets/coap_server/boards/native_sim.conf
+++ b/samples/net/sockets/coap_server/boards/native_sim.conf
@@ -1,4 +1,4 @@
 CONFIG_NET_L2_ETHERNET=y
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
-CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
 CONFIG_PICOLIBC=y
diff --git a/samples/net/sockets/dumb_http_server_mt/docker-test.sh b/samples/net/sockets/dumb_http_server_mt/docker-test.sh
index 442272c86feeb..5036b140a7eb9 100644
--- a/samples/net/sockets/dumb_http_server_mt/docker-test.sh
+++ b/samples/net/sockets/dumb_http_server_mt/docker-test.sh
@@ -36,7 +36,7 @@ fi
 if [ -n "$zephyr_overlay" ]; then
 	overlay="${zephyr_overlay};overlay-tls.conf"
 else
-	overlay="-DOVERLAY_CONFIG=overlay-tls.conf"
+	overlay="-DEXTRA_CONF_FILE=overlay-tls.conf"
 fi
 
 start_configuration || return $?
diff --git a/samples/net/sockets/dumb_http_server_mt/sample.yaml b/samples/net/sockets/dumb_http_server_mt/sample.yaml
index 4d278431c2241..1fffeb3174d78 100644
--- a/samples/net/sockets/dumb_http_server_mt/sample.yaml
+++ b/samples/net/sockets/dumb_http_server_mt/sample.yaml
@@ -10,10 +10,6 @@ common:
     - net
     - socket
     - http
-  # native_posix does not work with CONFIG_POSIX_API
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   sample.net.sockets.dumb_http_server_mt:
     extra_configs:
diff --git a/samples/net/sockets/dumb_http_server_mt/src/main.c b/samples/net/sockets/dumb_http_server_mt/src/main.c
index 06f9f0c6e7169..ed19fa968332c 100644
--- a/samples/net/sockets/dumb_http_server_mt/src/main.c
+++ b/samples/net/sockets/dumb_http_server_mt/src/main.c
@@ -413,7 +413,7 @@ int main(void)
 {
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 	int err = tls_credential_add(SERVER_CERTIFICATE_TAG,
-				     TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				     TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				     server_certificate,
 				     sizeof(server_certificate));
 	if (err < 0) {
diff --git a/samples/net/sockets/echo_client/CMakeLists.txt b/samples/net/sockets/echo_client/CMakeLists.txt
index 0fe1ad126cc17..0a176e2499b66 100644
--- a/samples/net/sockets/echo_client/CMakeLists.txt
+++ b/samples/net/sockets/echo_client/CMakeLists.txt
@@ -21,7 +21,6 @@ endif()
 target_sources(                     app PRIVATE src/echo-client.c)
 target_sources_ifdef(CONFIG_NET_UDP app PRIVATE src/udp.c)
 target_sources_ifdef(CONFIG_NET_TCP app PRIVATE src/tcp.c)
-target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE src/vlan.c)
 
 include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
 
diff --git a/samples/net/sockets/echo_client/README.rst b/samples/net/sockets/echo_client/README.rst
index 02cc74b302df7..db92c35104ba9 100644
--- a/samples/net/sockets/echo_client/README.rst
+++ b/samples/net/sockets/echo_client/README.rst
@@ -48,6 +48,10 @@ echo-client directory:
 - :file:`overlay-tls.conf`
   This overlay config enables support for TLS.
 
+- :file:`overlay-vlan.conf`
+  This overlay config enables support for Virtual LAN.
+  See :ref:`networking_samples_common` for details.
+
 Build echo-client sample application like this:
 
 .. zephyr-app-commands::
diff --git a/samples/net/sockets/echo_client/boards/frdm_mcxw71.conf b/samples/net/sockets/echo_client/boards/frdm_mcxw71.conf
new file mode 100644
index 0000000000000..36b66408f8675
--- /dev/null
+++ b/samples/net/sockets/echo_client/boards/frdm_mcxw71.conf
@@ -0,0 +1,4 @@
+CONFIG_COUNTER=y
+
+CONFIG_OPENTHREAD_MAX_IP_ADDR_PER_CHILD=4
+CONFIG_OPENTHREAD_MAX_CHILDREN=30
diff --git a/samples/net/sockets/echo_client/boards/frdm_mcxw71.overlay b/samples/net/sockets/echo_client/boards/frdm_mcxw71.overlay
new file mode 100644
index 0000000000000..71da6a25089fd
--- /dev/null
+++ b/samples/net/sockets/echo_client/boards/frdm_mcxw71.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2023-2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&stcm {
+	ranges = <0x0 0x30000000 DT_SIZE_K(112)>;
+
+	stcm1: system_memory@1a000 {
+		compatible = "zephyr,memory-region","mmio-sram";
+		reg = <0x1a000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+	};
+};
+
+&stcm0 {
+	/* With only the first 64KB having ECC */
+	reg = <0x0 DT_SIZE_K(108)>;
+};
diff --git a/samples/net/sockets/echo_client/overlay-vlan.conf b/samples/net/sockets/echo_client/overlay-vlan.conf
index 73d1fc9cb6ed8..c34f79c3ac7eb 100644
--- a/samples/net/sockets/echo_client/overlay-vlan.conf
+++ b/samples/net/sockets/echo_client/overlay-vlan.conf
@@ -12,16 +12,8 @@ CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
-# Second ethernet interface will have these settings
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"
-# TEST-NET-2 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR="198.51.100.1"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG=100
+# First VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1="100;2001:db8:100::1/64,198.51.100.1/24"
 
-# Settings for the third network interface
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR="2001:db8:200::1"
-# TEST-NET-3 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR="203.0.113.1"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG=200
+# Second VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"
diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml
index ccde0349ed4d9..c640696c20990 100644
--- a/samples/net/sockets/echo_client/sample.yaml
+++ b/samples/net/sockets/echo_client/sample.yaml
@@ -70,39 +70,27 @@ tests:
   sample.net.sockets.echo_client.nrf_802154:
     extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: nrf52840dk/nrf52840
-  sample.net.sockets.echo_client.nrf_openthread:
+  sample.net.sockets.echo_client.openthread:
     extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
       - openthread
-    platform_allow: nrf52840dk/nrf52840
+    platform_allow:
+      - frdm_kw41z
+      - frdm_mcxw71
+      - nrf52840dk/nrf52840
+      - tlsr9518adk80d
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.b91_802154:
     extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: tlsr9518adk80d
-  sample.net.sockets.echo_client.b91_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
-    slow: true
-    tags:
-      - net
-      - openthread
-    platform_allow: tlsr9518adk80d
-    filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
-  sample.net.sockets.echo_client.kw41z_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
-    slow: true
-    tags:
-      - net
-      - openthread
-    platform_allow: frdm_kw41z
-    filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.rw612_openthread_rcp_host:
     build_only: true
     extra_args:
       # Disabling monolithic since CI environment doesn't use blobs
       - CONFIG_NXP_MONOLITHIC_NBU=n
-      - OVERLAY_CONFIG="overlay-ot-rcp-host-nxp.conf"
+      - EXTRA_CONF_FILE="overlay-ot-rcp-host-nxp.conf"
     slow: true
     tags:
       - net
diff --git a/samples/net/sockets/echo_client/src/common.h b/samples/net/sockets/echo_client/src/common.h
index 76bbc5604ded0..65749c83f7bdc 100644
--- a/samples/net/sockets/echo_client/src/common.h
+++ b/samples/net/sockets/echo_client/src/common.h
@@ -7,6 +7,8 @@
 
 #include <zephyr/kernel.h>
 
+#include "net_sample_common.h"
+
 /* Value of 0 will cause the IP stack to select next free port */
 #define MY_PORT 0
 
@@ -96,12 +98,3 @@ static inline void stop_udp(void) { }
 int start_tcp(void);
 int process_tcp(void);
 void stop_tcp(void);
-
-#if defined(CONFIG_NET_VLAN)
-int init_vlan(void);
-#else
-static inline int init_vlan(void)
-{
-	return 0;
-}
-#endif
diff --git a/samples/net/sockets/echo_client/src/vlan.c b/samples/net/sockets/echo_client/src/vlan.c
deleted file mode 100644
index 7611ae096416d..0000000000000
--- a/samples/net/sockets/echo_client/src/vlan.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG);
-
-#include <zephyr/kernel.h>
-
-#include <zephyr/net/ethernet.h>
-
-/* User data for the interface callback */
-struct ud {
-	struct net_if *first;
-	struct net_if *second;
-};
-
-static void iface_cb(struct net_if *iface, void *user_data)
-{
-	struct ud *ud = user_data;
-
-	if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
-		return;
-	}
-
-	if (!ud->first) {
-		ud->first = iface;
-		return;
-	}
-
-	if (!ud->second) {
-		ud->second = iface;
-		return;
-	}
-}
-
-static int setup_iface(struct net_if *eth_iface,
-		       struct net_if *iface,
-		       const char *ipv6_addr,
-		       const char *ipv4_addr,
-		       uint16_t vlan_tag)
-{
-	struct net_if_addr *ifaddr;
-	struct in_addr addr4;
-	struct in6_addr addr6;
-	int ret;
-
-	ret = net_eth_vlan_enable(eth_iface, vlan_tag);
-	if (ret < 0) {
-		LOG_ERR("Cannot enable VLAN for tag %d (%d)", vlan_tag, ret);
-	}
-
-	if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) {
-		LOG_ERR("Invalid address: %s", ipv6_addr);
-		return -EINVAL;
-	}
-
-	ifaddr = net_if_ipv6_addr_add(iface, &addr6, NET_ADDR_MANUAL, 0);
-	if (!ifaddr) {
-		LOG_ERR("Cannot add %s to interface %p", ipv6_addr, iface);
-		return -EINVAL;
-	}
-
-	if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) {
-		LOG_ERR("Invalid address: %s", ipv4_addr);
-		return -EINVAL;
-	}
-
-	ifaddr = net_if_ipv4_addr_add(iface, &addr4, NET_ADDR_MANUAL, 0);
-	if (!ifaddr) {
-		LOG_ERR("Cannot add %s to interface %p", ipv4_addr, iface);
-		return -EINVAL;
-	}
-
-	LOG_DBG("Interface %p VLAN tag %d setup done.", iface, vlan_tag);
-
-	return 0;
-}
-
-int init_vlan(void)
-{
-	struct net_if *iface;
-	struct ud ud;
-	int ret;
-
-	if (CONFIG_NET_VLAN_COUNT == 0) {
-		LOG_DBG("No VLAN interfaces defined.");
-		return 0;
-	}
-
-	iface = net_if_get_first_by_type(&NET_L2_GET_NAME(ETHERNET));
-	if (!iface) {
-		LOG_ERR("No ethernet interfaces found.");
-		return -ENOENT;
-	}
-
-	memset(&ud, 0, sizeof(ud));
-
-	net_if_foreach(iface_cb, &ud);
-
-	ret = setup_iface(iface, ud.first,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = setup_iface(iface, ud.second,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	/* Bring up the VLAN interface automatically */
-	net_if_up(ud.first);
-	net_if_up(ud.second);
-
-	return 0;
-}
diff --git a/samples/net/sockets/echo_server/CMakeLists.txt b/samples/net/sockets/echo_server/CMakeLists.txt
index 52251bca3949f..9f7ce64760d6a 100644
--- a/samples/net/sockets/echo_server/CMakeLists.txt
+++ b/samples/net/sockets/echo_server/CMakeLists.txt
@@ -21,8 +21,6 @@ endif()
 target_sources(                     app PRIVATE src/echo-server.c)
 target_sources_ifdef(CONFIG_NET_UDP app PRIVATE src/udp.c)
 target_sources_ifdef(CONFIG_NET_TCP app PRIVATE src/tcp.c)
-target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE src/vlan.c)
-target_sources_ifdef(CONFIG_NET_L2_IPIP app PRIVATE src/tunnel.c)
 
 if (CONFIG_USB_DEVICE_STACK)
   target_sources(app PRIVATE src/usb.c)
diff --git a/samples/net/sockets/echo_server/Kconfig b/samples/net/sockets/echo_server/Kconfig
index 5f1334b7f1980..66bd5b63ca2a2 100644
--- a/samples/net/sockets/echo_server/Kconfig
+++ b/samples/net/sockets/echo_server/Kconfig
@@ -27,51 +27,6 @@ config NET_SAMPLE_IFACE2_MY_IPV4_NETMASK
 	help
 	  The value depends on your network setup.
 
-config NET_SAMPLE_IFACE2_VLAN_TAG
-	int "VLAN tag for second interface"
-	default 100
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_IFACE3_MY_IPV6_ADDR
-	string "My IPv6 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_ADDR
-	string "My IPv4 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_NETMASK
-	string "My IPv4 netmask for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_VLAN_TAG
-	int "VLAN tag for third interface"
-	default 200
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_TUNNEL_PEER_ADDR
-	string "Remote IP address of the tunnel interface"
-	depends on NET_L2_IPIP
-	help
-	  Use overlay-tunnel.conf to setup the tunnel support.
-
-config NET_SAMPLE_TUNNEL_MY_ADDR
-	string "My address for tunnel interface"
-	depends on NET_L2_IPIP
-	help
-	  The value depends on your network setup.
-
 config NET_SAMPLE_PSK_HEADER_FILE
 	string "Header file containing PSK"
 	default "dummy_psk.h"
@@ -111,4 +66,5 @@ if USB_DEVICE_STACK_NEXT
 	source "samples/subsys/usb/common/Kconfig.sample_usbd"
 endif
 
+source "samples/net/common/Kconfig"
 source "Kconfig.zephyr"
diff --git a/samples/net/sockets/echo_server/README.rst b/samples/net/sockets/echo_server/README.rst
index cb4aa3756ae34..c8d8a8bec949a 100644
--- a/samples/net/sockets/echo_server/README.rst
+++ b/samples/net/sockets/echo_server/README.rst
@@ -52,6 +52,10 @@ echo-server directory:
 - :file:`overlay-tunnel.conf`
   This overlay config enables support for IP tunneling.
 
+- :file:`overlay-vlan.conf`
+  This overlay config enables support for Virtual LAN.
+  See :ref:`networking_samples_common` for details.
+
 Build echo-server sample application like this:
 
 .. zephyr-app-commands::
diff --git a/samples/net/sockets/echo_server/boards/frdm_mcxw71.conf b/samples/net/sockets/echo_server/boards/frdm_mcxw71.conf
new file mode 100644
index 0000000000000..36b66408f8675
--- /dev/null
+++ b/samples/net/sockets/echo_server/boards/frdm_mcxw71.conf
@@ -0,0 +1,4 @@
+CONFIG_COUNTER=y
+
+CONFIG_OPENTHREAD_MAX_IP_ADDR_PER_CHILD=4
+CONFIG_OPENTHREAD_MAX_CHILDREN=30
diff --git a/samples/net/sockets/echo_server/boards/frdm_mcxw71.overlay b/samples/net/sockets/echo_server/boards/frdm_mcxw71.overlay
new file mode 100644
index 0000000000000..71da6a25089fd
--- /dev/null
+++ b/samples/net/sockets/echo_server/boards/frdm_mcxw71.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2023-2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&stcm {
+	ranges = <0x0 0x30000000 DT_SIZE_K(112)>;
+
+	stcm1: system_memory@1a000 {
+		compatible = "zephyr,memory-region","mmio-sram";
+		reg = <0x1a000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+	};
+};
+
+&stcm0 {
+	/* With only the first 64KB having ECC */
+	reg = <0x0 DT_SIZE_K(108)>;
+};
diff --git a/samples/net/sockets/echo_server/overlay-nsos.conf b/samples/net/sockets/echo_server/overlay-nsos.conf
index eaee3e5561583..b6e0ca5a02bae 100644
--- a/samples/net/sockets/echo_server/overlay-nsos.conf
+++ b/samples/net/sockets/echo_server/overlay-nsos.conf
@@ -1,4 +1,4 @@
-CONFIG_ETH_NATIVE_POSIX=n
+CONFIG_ETH_NATIVE_TAP=n
 CONFIG_NET_DRIVERS=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
diff --git a/samples/net/sockets/echo_server/overlay-tunnel.conf b/samples/net/sockets/echo_server/overlay-tunnel.conf
index 54e7ab149bff8..4f5a850c08bbb 100644
--- a/samples/net/sockets/echo_server/overlay-tunnel.conf
+++ b/samples/net/sockets/echo_server/overlay-tunnel.conf
@@ -6,11 +6,11 @@ CONFIG_NET_IF_MAX_IPV6_COUNT=4
 CONFIG_NET_IF_MAX_IPV4_COUNT=4
 
 # First tunneling interface will have these settings
-CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR="192.0.2.2"
-#CONFIG_NET_SAMPLE_TUNNEL_PEER_ADDR="2001:db8::2"
+CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR="192.0.2.2"
+#CONFIG_NET_SAMPLE_COMMON_TUNNEL_PEER_ADDR="2001:db8::2"
 
 # Use this for IPv6 over IPv4
-CONFIG_NET_SAMPLE_TUNNEL_MY_ADDR="2001:db8:200::1"
+CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR="2001:db8:200::1"
 
 # Use this for IPv4 over IPv4
-#CONFIG_NET_SAMPLE_TUNNEL_MY_ADDR="198.51.100.1"
+#CONFIG_NET_SAMPLE_COMMON_TUNNEL_MY_ADDR="198.51.100.1"
diff --git a/samples/net/sockets/echo_server/overlay-vlan.conf b/samples/net/sockets/echo_server/overlay-vlan.conf
index 8467c436e2713..21da953356ed4 100644
--- a/samples/net/sockets/echo_server/overlay-vlan.conf
+++ b/samples/net/sockets/echo_server/overlay-vlan.conf
@@ -16,18 +16,8 @@ CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
-# Second ethernet interface will have these settings
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"
-# TEST-NET-2 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR="198.51.100.1"
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG=100
+# First VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1="100;2001:db8:100::1/64,198.51.100.1/24"
 
-# Settings for the third network interface
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR="2001:db8:200::1"
-# TEST-NET-3 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR="203.0.113.1"
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG=200
+# Second VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"
diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml
index deaa6247aa495..e3cfd3527d9f4 100644
--- a/samples/net/sockets/echo_server/sample.yaml
+++ b/samples/net/sockets/echo_server/sample.yaml
@@ -86,38 +86,24 @@ tests:
     platform_exclude:
       - native_sim
       - native_sim/native/64
-      - native_posix
-      - native_posix/native/64
-  sample.net.sockets.echo_server.nrf_openthread:
+  sample.net.sockets.echo_server.openthread:
     extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:
       - net
       - openthread
-    platform_allow: nrf52840dk/nrf52840
-    filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
-  sample.net.sockets.echo_server.b91_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
-    slow: true
-    tags:
-      - net
-      - openthread
-    platform_allow: tlsr9518adk80d
-    filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
-  sample.net.sockets.echo_server.kw41z_openthread:
-    extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
-    slow: true
-    tags:
-      - net
-      - openthread
-    platform_allow: frdm_kw41z
+    platform_allow:
+      - frdm_kw41z
+      - frdm_mcxw71
+      - nrf52840dk/nrf52840
+      - tlsr9518adk80d
     filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_server.rw612_openthread_rcp_host:
     build_only: true
     extra_args:
       # Disabling monolithic since CI environment doesn't use blobs
       - CONFIG_NXP_MONOLITHIC_NBU=n
-      - OVERLAY_CONFIG="overlay-ot-rcp-host-nxp.conf"
+      - EXTRA_CONF_FILE="overlay-ot-rcp-host-nxp.conf"
     slow: true
     tags:
       - net
@@ -151,11 +137,21 @@ tests:
     integration_platforms:
       - qemu_x86
   sample.net.sockets.echo_server.nsos:
+    harness: console
     platform_allow:
       - native_sim
       - native_sim/native/64
     extra_args:
       - EXTRA_CONF_FILE="overlay-nsos.conf"
+    harness_config:
+      type: multi_line
+      ordered: false
+      regex:
+        - "Network connected"
+        - "Waiting for TCP.*IPv4"
+        - "Waiting for TCP.*IPv6"
+        - "Waiting for UDP.*IPv4"
+        - "Waiting for UDP.*IPv6"
   sample.net.sockets.echo_server.802154.subg:
     extra_args: EXTRA_CONF_FILE="overlay-802154-subg.conf"
     platform_allow: beagleconnect_freedom
diff --git a/samples/net/sockets/echo_server/src/common.h b/samples/net/sockets/echo_server/src/common.h
index d5641fdf5f745..10268c15338ac 100644
--- a/samples/net/sockets/echo_server/src/common.h
+++ b/samples/net/sockets/echo_server/src/common.h
@@ -5,6 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "net_sample_common.h"
 
 #define MY_PORT 4242
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS) || defined(CONFIG_NET_TCP) || \
@@ -73,15 +74,6 @@ void stop_tcp(void);
 
 void quit(void);
 
-#if defined(CONFIG_NET_VLAN)
-int init_vlan(void);
-#else
-static inline int init_vlan(void)
-{
-	return 0;
-}
-#endif /* CONFIG_NET_VLAN */
-
 #if defined(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE)
 int init_ws(void);
 #else
@@ -91,22 +83,6 @@ static inline int init_ws(void)
 }
 #endif /* CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE */
 
-#if defined(CONFIG_NET_L2_IPIP)
-int init_tunnel(void);
-bool is_tunnel(struct net_if *iface);
-#else
-static inline int init_tunnel(void)
-{
-	return 0;
-}
-
-static inline bool is_tunnel(struct net_if *iface)
-{
-	ARG_UNUSED(iface);
-	return false;
-}
-#endif /* CONFIG_NET_L2_IPIP */
-
 #if defined(CONFIG_USB_DEVICE_STACK) || defined(CONFIG_USB_DEVICE_STACK_NEXT)
 int init_usb(void);
 #else
diff --git a/samples/net/sockets/echo_server/src/echo-server.c b/samples/net/sockets/echo_server/src/echo-server.c
index d7a80da856469..fd6bd4f6acf08 100644
--- a/samples/net/sockets/echo_server/src/echo-server.c
+++ b/samples/net/sockets/echo_server/src/echo-server.c
@@ -153,7 +153,7 @@ static void init_app(void)
 #endif /* defined(CONFIG_NET_SAMPLE_CERTS_WITH_SC) */
 
 	err = tls_credential_add(SERVER_CERTIFICATE_TAG,
-				 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				 server_certificate,
 				 sizeof(server_certificate));
 	if (err < 0) {
diff --git a/samples/net/sockets/echo_server/src/vlan.c b/samples/net/sockets/echo_server/src/vlan.c
deleted file mode 100644
index 1c70b91fe46b8..0000000000000
--- a/samples/net/sockets/echo_server/src/vlan.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
-
-#include <zephyr/kernel.h>
-
-#include <zephyr/net/ethernet.h>
-
-/* User data for the interface callback */
-struct ud {
-	struct net_if *first;
-	struct net_if *second;
-	struct net_if *eth;
-};
-
-static void iface_cb(struct net_if *iface, void *user_data)
-{
-	struct ud *ud = user_data;
-
-	if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET) && ud->eth == NULL) {
-		ud->eth = iface;
-		return;
-	}
-
-	if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
-		return;
-	}
-
-	if (!ud->first) {
-		ud->first = iface;
-		return;
-	}
-
-	if (!ud->second) {
-		ud->second = iface;
-		return;
-	}
-}
-
-static int setup_iface(struct net_if *iface, struct net_if *vlan,
-		       const char *ipv6_addr, const char *ipv4_addr,
-		       const char *netmask, uint16_t vlan_tag)
-{
-	struct net_if_addr *ifaddr;
-	struct in_addr addr4;
-	struct in6_addr addr6;
-	int ret;
-
-	ret = net_eth_vlan_enable(iface, vlan_tag);
-	if (ret < 0) {
-		LOG_ERR("Cannot enable VLAN for tag %d (%d)", vlan_tag, ret);
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV6)) {
-		if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) {
-			LOG_ERR("Invalid address: %s", ipv6_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv6_addr_add(vlan, &addr6,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv6_addr, vlan);
-			return -EINVAL;
-		}
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV4)) {
-		if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) {
-			LOG_ERR("Invalid address: %s", ipv4_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv4_addr_add(vlan, &addr4,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv4_addr, vlan);
-			return -EINVAL;
-		}
-
-		if (netmask && netmask[0]) {
-			struct in_addr nm;
-
-			if (net_addr_pton(AF_INET, netmask, &nm)) {
-				LOG_ERR("Invalid netmask: %s", ipv4_addr);
-				return -EINVAL;
-			}
-
-			net_if_ipv4_set_netmask_by_addr(vlan, &addr4, &nm);
-		}
-	}
-
-	LOG_DBG("Interface %p VLAN tag %d setup done.", vlan, vlan_tag);
-
-	return 0;
-}
-
-int init_vlan(void)
-{
-	struct ud ud;
-	int ret;
-
-	if (CONFIG_NET_VLAN_COUNT == 0) {
-		LOG_DBG("No VLAN interfaces defined.");
-		return 0;
-	}
-
-	memset(&ud, 0, sizeof(ud));
-
-	net_if_foreach(iface_cb, &ud);
-
-	/* This sample has two VLANs. For the second one we need to manually
-	 * create IP address for this test. But first the VLAN needs to be
-	 * added to the interface so that IPv6 DAD can work properly.
-	 */
-	ret = setup_iface(ud.eth, ud.first,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_NETMASK,
-			  CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = setup_iface(ud.eth, ud.second,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_NETMASK,
-			  CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	return 0;
-}
diff --git a/samples/net/sockets/echo_service/README.rst b/samples/net/sockets/echo_service/README.rst
index 3e1d7625d7015..abb791b07b00e 100644
--- a/samples/net/sockets/echo_service/README.rst
+++ b/samples/net/sockets/echo_service/README.rst
@@ -7,8 +7,8 @@
 Overview
 ********
 
-The sockets/echo_service sample application for Zephyr implements a TCP echo
-server supporting both IPv4 and IPv6 and using a BSD Sockets compatible API.
+The sockets/echo_service sample application for Zephyr implements a TCP and UDP
+echo server supporting both IPv4 and IPv6 and using a BSD Sockets compatible API.
 
 The purpose of this sample is to show how to use socket service API.
 The socket service is a concept where many blocking sockets can be listened by
diff --git a/samples/net/sockets/echo_service/sample.yaml b/samples/net/sockets/echo_service/sample.yaml
index 5feb3cc826c82..40ea95ed33290 100644
--- a/samples/net/sockets/echo_service/sample.yaml
+++ b/samples/net/sockets/echo_service/sample.yaml
@@ -5,10 +5,6 @@ common:
   harness: net
   depends_on: netif
   filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
-  # eventfd does not work properly with native_posix so exclude it here
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   sample.net.sockets.service.echo:
     tags:
diff --git a/samples/net/sockets/echo_service/src/main.c b/samples/net/sockets/echo_service/src/main.c
index d1728049f2176..0db44ad30c530 100644
--- a/samples/net/sockets/echo_service/src/main.c
+++ b/samples/net/sockets/echo_service/src/main.c
@@ -38,11 +38,6 @@ static void tcp_service_handler(struct net_socket_service_event *pev)
 {
 	static char buf[1500];
 
-	/* Note that in this application we receive / send data from
-	 * system work queue. In proper application the socket reading and data
-	 * sending should be done so that the system work queue is not blocked.
-	 * It is possible to create a socket service that uses own work queue.
-	 */
 	receive_data(false, pev, buf, sizeof(buf));
 }
 
diff --git a/samples/net/sockets/http_client/docker-test.sh b/samples/net/sockets/http_client/docker-test.sh
index 5f9468112d495..f9022aa44156c 100644
--- a/samples/net/sockets/http_client/docker-test.sh
+++ b/samples/net/sockets/http_client/docker-test.sh
@@ -28,7 +28,7 @@ echo "HTTPS client test"
 if [ -n "$zephyr_overlay" ]; then
 	overlay="${zephyr_overlay};overlay-tls.conf"
 else
-	overlay="-DOVERLAY_CONFIG=overlay-tls.conf"
+	overlay="-DEXTRA_CONF_FILE=overlay-tls.conf"
 fi
 
 start_configuration "--ip=192.0.2.2 --ip6=2001:db8::2" || return $?
diff --git a/samples/net/sockets/http_client/sample.yaml b/samples/net/sockets/http_client/sample.yaml
index afd14a1a255dc..271f61b94ec01 100644
--- a/samples/net/sockets/http_client/sample.yaml
+++ b/samples/net/sockets/http_client/sample.yaml
@@ -5,10 +5,6 @@ common:
     - http_client
   min_ram: 32
   depends_on: netif
-  # native_posix does not work with CONFIG_POSIX_API
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 sample:
   description: HTTP client sample
   name: http_client
diff --git a/samples/net/sockets/http_get/overlay-nsos.conf b/samples/net/sockets/http_get/overlay-nsos.conf
index 0af19c1b1129e..dfe7324e0f99c 100644
--- a/samples/net/sockets/http_get/overlay-nsos.conf
+++ b/samples/net/sockets/http_get/overlay-nsos.conf
@@ -1,4 +1,4 @@
-CONFIG_ETH_NATIVE_POSIX=n
+CONFIG_ETH_NATIVE_TAP=n
 CONFIG_NET_DRIVERS=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml
index d30583f7a84b3..d6e385c49e989 100644
--- a/samples/net/sockets/http_get/sample.yaml
+++ b/samples/net/sockets/http_get/sample.yaml
@@ -9,9 +9,6 @@ common:
   tags:
     - net
     - socket
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   sample.net.sockets.http_get:
     filter: not CONFIG_NET_SOCKETS_OFFLOAD and not CONFIG_NATIVE_LIBC
diff --git a/samples/net/sockets/http_server/README.rst b/samples/net/sockets/http_server/README.rst
index e7f1771be29c3..c058971537b9b 100644
--- a/samples/net/sockets/http_server/README.rst
+++ b/samples/net/sockets/http_server/README.rst
@@ -37,6 +37,9 @@ There are configuration files for various setups in the
     * - :zephyr_file:`overlay-tls.conf <samples/net/sockets/http_server/overlay-tls.conf>`
       - This overlay config can be added to build the HTTPS variant.
 
+    * - :zephyr_file:`overlay-dhcpv4.conf <samples/net/sockets/http_server/overlay-dhcpv4.conf>`
+      - This overlay enables DHCPv4 client feature.
+
 To build and run the HTTP server application:
 
 .. code-block:: bash
diff --git a/samples/net/sockets/http_server/overlay-dhcpv4.conf b/samples/net/sockets/http_server/overlay-dhcpv4.conf
new file mode 100644
index 0000000000000..95842b1da5523
--- /dev/null
+++ b/samples/net/sockets/http_server/overlay-dhcpv4.conf
@@ -0,0 +1,2 @@
+CONFIG_NET_DHCPV4=y
+CONFIG_ZVFS_EVENTFD_MAX=2
diff --git a/samples/net/sockets/http_server/sample.yaml b/samples/net/sockets/http_server/sample.yaml
index 5a2413e62a2ae..bce7a11e4b80b 100644
--- a/samples/net/sockets/http_server/sample.yaml
+++ b/samples/net/sockets/http_server/sample.yaml
@@ -11,8 +11,6 @@ common:
     - server
     - socket
   platform_exclude:
-    - native_posix
-    - native_posix/native/64
     - nrf5340dk/nrf5340/cpuapp/ns # Excluding due to ROM overflow.
 tests:
   sample.net.sockets.http.server: {}
diff --git a/samples/net/sockets/http_server/src/main.c b/samples/net/sockets/http_server/src/main.c
index 1341a91169be3..4615d0dcb2484 100644
--- a/samples/net/sockets/http_server/src/main.c
+++ b/samples/net/sockets/http_server/src/main.c
@@ -247,8 +247,8 @@ struct http_resource_detail_websocket ws_netstats_resource_detail = {
 
 #if defined(CONFIG_NET_SAMPLE_HTTP_SERVICE)
 static uint16_t test_http_service_port = CONFIG_NET_SAMPLE_HTTP_SERVER_SERVICE_PORT;
-HTTP_SERVICE_DEFINE(test_http_service, NULL, &test_http_service_port, 1,
-		    10, NULL, NULL);
+HTTP_SERVICE_DEFINE(test_http_service, NULL, &test_http_service_port,
+		    CONFIG_HTTP_SERVER_MAX_CLIENTS, 10, NULL, NULL);
 
 HTTP_RESOURCE_DEFINE(index_html_gz_resource, test_http_service, "/",
 		     &index_html_gz_resource_detail);
@@ -280,9 +280,9 @@ static const sec_tag_t sec_tag_list_verify_none[] = {
 	};
 
 static uint16_t test_https_service_port = CONFIG_NET_SAMPLE_HTTPS_SERVER_SERVICE_PORT;
-HTTPS_SERVICE_DEFINE(test_https_service, NULL,
-		     &test_https_service_port, 1, 10, NULL, NULL,
-		     sec_tag_list_verify_none, sizeof(sec_tag_list_verify_none));
+HTTPS_SERVICE_DEFINE(test_https_service, NULL, &test_https_service_port,
+		     CONFIG_HTTP_SERVER_MAX_CLIENTS, 10, NULL, NULL, sec_tag_list_verify_none,
+		     sizeof(sec_tag_list_verify_none));
 
 HTTP_RESOURCE_DEFINE(index_html_gz_resource_https, test_https_service, "/",
 		     &index_html_gz_resource_detail);
@@ -312,7 +312,7 @@ static void setup_tls(void)
 	int err;
 
 	err = tls_credential_add(HTTP_SERVER_CERTIFICATE_TAG,
-				 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				 server_certificate,
 				 sizeof(server_certificate));
 	if (err < 0) {
diff --git a/samples/net/sockets/net_mgmt/sample.yaml b/samples/net/sockets/net_mgmt/sample.yaml
index e2d7a0e0ed92d..ee966ef949109 100644
--- a/samples/net/sockets/net_mgmt/sample.yaml
+++ b/samples/net/sockets/net_mgmt/sample.yaml
@@ -6,9 +6,6 @@ common:
     - net
     - socket
     - mgmt
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 sample:
   description: Test network management socket sample
   name: net_mgmt socket
diff --git a/samples/net/sockets/sntp_client/Kconfig b/samples/net/sockets/sntp_client/Kconfig
new file mode 100644
index 0000000000000..8841fa1fc7433
--- /dev/null
+++ b/samples/net/sockets/sntp_client/Kconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2024 Embeint Inc
+
+config NET_SAMPLE_SNTP_SERVER_ADDRESS
+	string "SNTP server address"
+	default "pool.ntp.org"
+
+config NET_SAMPLE_SNTP_SERVER_PORT
+	int "SNTP server port"
+	default 123
+
+config NET_SAMPLE_SNTP_SERVER_TIMEOUT_MS
+	int "Duration to wait for response"
+	default 2000
+
+source "Kconfig.zephyr"
diff --git a/samples/net/sockets/sntp_client/overlay-nsos.conf b/samples/net/sockets/sntp_client/overlay-nsos.conf
new file mode 100644
index 0000000000000..dec4079422e81
--- /dev/null
+++ b/samples/net/sockets/sntp_client/overlay-nsos.conf
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Embeint Inc
+
+CONFIG_ETH_NATIVE_TAP=n
+CONFIG_NET_DRIVERS=y
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_SOCKETS_OFFLOAD=y
+CONFIG_NET_NATIVE_OFFLOADED_SOCKETS=y
+CONFIG_HEAP_MEM_POOL_SIZE=4096
+
+# IPv6 DAD requires lower level network interface access, below exposed socket-level access
+CONFIG_NET_IPV6_DAD=n
diff --git a/samples/net/sockets/sntp_client/prj.conf b/samples/net/sockets/sntp_client/prj.conf
index 12798c12cf33f..4b94923895b16 100644
--- a/samples/net/sockets/sntp_client/prj.conf
+++ b/samples/net/sockets/sntp_client/prj.conf
@@ -11,6 +11,7 @@ CONFIG_NET_SHELL=y
 
 # Sockets
 CONFIG_NET_SOCKETS=y
+CONFIG_NET_SOCKETS_SERVICE=y
 CONFIG_ZVFS_POLL_MAX=4
 
 # Network driver config
@@ -21,12 +22,7 @@ CONFIG_NET_CONFIG_SETTINGS=y
 CONFIG_NET_CONFIG_NEED_IPV4=y
 CONFIG_NET_CONFIG_NEED_IPV6=y
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
-CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
-# Address of SNTP IPv4 server
-CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
-# Address of SNTP IPv6 server
-CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
 
 # SNTP
 CONFIG_SNTP=y
diff --git a/samples/net/sockets/sntp_client/sample.yaml b/samples/net/sockets/sntp_client/sample.yaml
index 81d5fc6e95ba4..e4cf1ac99659b 100644
--- a/samples/net/sockets/sntp_client/sample.yaml
+++ b/samples/net/sockets/sntp_client/sample.yaml
@@ -9,6 +9,15 @@ tests:
     platform_allow:
       - qemu_x86
       - native_sim
+  sample.net.sockets.sntp_client.native:
+    platform_allow:
+      - native_sim
+    integration_platforms:
+      - native_sim
+    extra_configs:
+      - CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-nsos.conf"
   sample.net.sockets.sntp_client.wifi.nrf70dk:
     extra_args:
       - SNIPPET=wifi-ipv4
diff --git a/samples/net/sockets/sntp_client/src/config.h b/samples/net/sockets/sntp_client/src/config.h
deleted file mode 100644
index 38ceb54eeaa50..0000000000000
--- a/samples/net/sockets/sntp_client/src/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2019 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
-
-#ifdef CONFIG_NET_CONFIG_SETTINGS
-#ifdef CONFIG_NET_IPV6
-#define SERVER_ADDR6		CONFIG_NET_CONFIG_PEER_IPV6_ADDR
-#endif
-#define SERVER_ADDR		CONFIG_NET_CONFIG_PEER_IPV4_ADDR
-#else
-#ifdef CONFIG_NET_IPV6
-#define SERVER_ADDR6		"2001:db8::2"
-#endif
-#define SERVER_ADDR		"192.0.2.2"
-#endif
-
-#endif
diff --git a/samples/net/sockets/sntp_client/src/main.c b/samples/net/sockets/sntp_client/src/main.c
index 66cf8a759e855..3725f46d91a45 100644
--- a/samples/net/sockets/sntp_client/src/main.c
+++ b/samples/net/sockets/sntp_client/src/main.c
@@ -8,80 +8,134 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sntp_client_sample, LOG_LEVEL_DBG);
 
+#include <zephyr/net/socket.h>
+#include <zephyr/net/socket_service.h>
 #include <zephyr/net/sntp.h>
 #include <arpa/inet.h>
 
-#include "config.h"
 #include "net_sample_common.h"
 
-#define SNTP_PORT 123
+static K_SEM_DEFINE(sntp_async_received, 0, 1);
+static void sntp_service_handler(struct net_socket_service_event *pev);
 
-int main(void)
+NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(service_sntp_async, sntp_service_handler, 1);
+
+int dns_query(const char *host, uint16_t port, int family, int socktype, struct sockaddr *addr,
+			  socklen_t *addrlen)
 {
-	struct sntp_ctx ctx;
-	struct sockaddr_in addr;
-#if defined(CONFIG_NET_IPV6)
-	struct sockaddr_in6 addr6;
-#endif
-	struct sntp_time sntp_time;
+	struct addrinfo hints = {
+		.ai_family = family,
+		.ai_socktype = socktype,
+	};
+	struct addrinfo *res = NULL;
+	char addr_str[INET6_ADDRSTRLEN] = {0};
 	int rv;
 
-	wait_for_network();
+	/* Perform DNS query */
+	rv = getaddrinfo(host, NULL, &hints, &res);
+	if (rv < 0) {
+		LOG_ERR("getaddrinfo failed (%d, errno %d)", rv, errno);
+		return rv;
+	}
+	/* Store the first result */
+	*addr = *res->ai_addr;
+	*addrlen = res->ai_addrlen;
+	/* Free the allocated memory */
+	freeaddrinfo(res);
+	/* Store the port */
+	net_sin(addr)->sin_port = htons(port);
+	/* Print the found address */
+	inet_ntop(addr->sa_family, &net_sin(addr)->sin_addr, addr_str, sizeof(addr_str));
+	LOG_INF("%s -> %s", host, addr_str);
+	return 0;
+}
 
-	/* ipv4 */
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons(SNTP_PORT);
-	inet_pton(AF_INET, SERVER_ADDR, &addr.sin_addr);
+static void sntp_service_handler(struct net_socket_service_event *pev)
+{
+	struct sntp_time s_time;
+	int rc;
+
+	/* Read the response from the socket */
+	rc = sntp_read_async(pev, &s_time);
+	if (rc != 0) {
+		LOG_ERR("Failed to read SNTP response (%d)", rc);
+		return;
+	}
+
+	/* Close the service */
+	sntp_close_async(&service_sntp_async);
 
-	rv = sntp_init(&ctx, (struct sockaddr *) &addr,
-		       sizeof(struct sockaddr_in));
+	LOG_INF("SNTP Time: %llu (async)", s_time.seconds);
+
+	/* Notify test thread */
+	k_sem_give(&sntp_async_received);
+}
+
+static void do_sntp(int family)
+{
+	char *family_str = family == AF_INET ? "IPv4" : "IPv6";
+	struct sntp_time s_time;
+	struct sntp_ctx ctx;
+	struct sockaddr addr;
+	socklen_t addrlen;
+	int rv;
+
+	/* Get SNTP server */
+	rv = dns_query(CONFIG_NET_SAMPLE_SNTP_SERVER_ADDRESS, CONFIG_NET_SAMPLE_SNTP_SERVER_PORT,
+				   family, SOCK_DGRAM, &addr, &addrlen);
+	if (rv != 0) {
+		LOG_ERR("Failed to lookup %s SNTP server (%d)", family_str, rv);
+		return;
+	}
+
+	rv = sntp_init(&ctx, &addr, addrlen);
 	if (rv < 0) {
-		LOG_ERR("Failed to init SNTP IPv4 ctx: %d", rv);
+		LOG_ERR("Failed to init SNTP %s ctx: %d", family_str, rv);
 		goto end;
 	}
 
-	LOG_INF("Sending SNTP IPv4 request...");
-	rv = sntp_query(&ctx, 4 * MSEC_PER_SEC, &sntp_time);
+	LOG_INF("Sending SNTP %s request...", family_str);
+	rv = sntp_query(&ctx, 4 * MSEC_PER_SEC, &s_time);
 	if (rv < 0) {
-		LOG_ERR("SNTP IPv4 request failed: %d", rv);
+		LOG_ERR("SNTP %s request failed: %d", family_str, rv);
 		goto end;
 	}
 
-	LOG_INF("status: %d", rv);
-	LOG_INF("time since Epoch: high word: %u, low word: %u",
-		(uint32_t)(sntp_time.seconds >> 32), (uint32_t)sntp_time.seconds);
+	LOG_INF("SNTP Time: %llu", s_time.seconds);
 
-#if defined(CONFIG_NET_IPV6)
 	sntp_close(&ctx);
 
-	/* ipv6 */
-	memset(&addr6, 0, sizeof(addr6));
-	addr6.sin6_family = AF_INET6;
-	addr6.sin6_port = htons(SNTP_PORT);
-	inet_pton(AF_INET6, SERVER_ADDR6, &addr6.sin6_addr);
-
-	rv = sntp_init(&ctx, (struct sockaddr *) &addr6,
-		       sizeof(struct sockaddr_in6));
+	rv = sntp_init_async(&ctx, &addr, addrlen, &service_sntp_async);
 	if (rv < 0) {
-		LOG_ERR("Failed to init SNTP IPv6 ctx: %d", rv);
+		LOG_ERR("Failed to initialise SNTP context (%d)", rv);
 		goto end;
 	}
 
-	LOG_INF("Sending SNTP IPv6 request...");
-	/* With such a timeout, this is expected to fail. */
-	rv = sntp_query(&ctx, 0, &sntp_time);
+	rv = sntp_send_async(&ctx);
 	if (rv < 0) {
-		LOG_ERR("SNTP IPv6 request: %d", rv);
+		LOG_ERR("Failed to send SNTP query (%d)", rv);
 		goto end;
 	}
 
-	LOG_INF("status: %d", rv);
-	LOG_INF("time since Epoch: high word: %u, low word: %u",
-		(uint32_t)(sntp_time.seconds >> 32), (uint32_t)sntp_time.seconds);
-#endif
+	/* Wait for the response to be received asynchronously */
+	rv = k_sem_take(&sntp_async_received, K_MSEC(CONFIG_NET_SAMPLE_SNTP_SERVER_TIMEOUT_MS));
+	if (rv < 0) {
+		LOG_INF("SNTP response timed out (%d)", rv);
+	}
 
 end:
 	sntp_close(&ctx);
+}
+
+int main(void)
+{
+	wait_for_network();
+
+	do_sntp(AF_INET);
+
+#if defined(CONFIG_NET_IPV6)
+	do_sntp(AF_INET6);
+#endif
+
 	return 0;
 }
diff --git a/samples/net/sockets/txtime/CMakeLists.txt b/samples/net/sockets/txtime/CMakeLists.txt
index 2077eff590916..44eef0c70e496 100644
--- a/samples/net/sockets/txtime/CMakeLists.txt
+++ b/samples/net/sockets/txtime/CMakeLists.txt
@@ -6,4 +6,5 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(sockets_txtime)
 
 target_sources(app PRIVATE src/main.c)
-target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE src/vlan.c)
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
diff --git a/samples/net/sockets/txtime/Kconfig b/samples/net/sockets/txtime/Kconfig
index b4feeb33d1ac3..5c03c83cb96d3 100644
--- a/samples/net/sockets/txtime/Kconfig
+++ b/samples/net/sockets/txtime/Kconfig
@@ -63,42 +63,5 @@ config NET_SAMPLE_PACKET_TXTIME
 	  but for purpose of this sample application, we set the time in
 	  microseconds in this config option.
 
-config NET_SAMPLE_IFACE2_MY_IPV6_ADDR
-	string "My IPv6 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_MY_IPV4_ADDR
-	string "My IPv4 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_VLAN_TAG
-	int "VLAN tag for second interface"
-	default 100
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_IFACE3_MY_IPV6_ADDR
-	string "My IPv6 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_ADDR
-	string "My IPv4 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_VLAN_TAG
-	int "VLAN tag for third interface"
-	default 200
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
+source "samples/net/common/Kconfig"
 source "Kconfig.zephyr"
diff --git a/samples/net/sockets/txtime/boards/native_sim.conf b/samples/net/sockets/txtime/boards/native_sim.conf
index 6e1628ae39113..641cb846fc1f8 100644
--- a/samples/net/sockets/txtime/boards/native_sim.conf
+++ b/samples/net/sockets/txtime/boards/native_sim.conf
@@ -1,2 +1,2 @@
-CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK=y
+CONFIG_ETH_NATIVE_TAP_PTP_CLOCK=y
 CONFIG_PTP=y
diff --git a/samples/net/sockets/txtime/overlay-vlan.conf b/samples/net/sockets/txtime/overlay-vlan.conf
index 78b6e1f383106..73ac192ee460f 100644
--- a/samples/net/sockets/txtime/overlay-vlan.conf
+++ b/samples/net/sockets/txtime/overlay-vlan.conf
@@ -11,16 +11,8 @@ CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
-# Second ethernet interface will have these settings
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"
-# TEST-NET-2 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR="198.51.100.1"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG=100
+# First VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1="100;2001:db8:100::1/64,198.51.100.1/24"
 
-# Settings for the third network interface
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR="2001:db8:200::1"
-# TEST-NET-3 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR="203.0.113.1"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG=200
+# Second VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"
diff --git a/samples/net/sockets/txtime/src/main.c b/samples/net/sockets/txtime/src/main.c
index f5f9df9647596..d4bc85a3f2a5f 100644
--- a/samples/net/sockets/txtime/src/main.c
+++ b/samples/net/sockets/txtime/src/main.c
@@ -22,6 +22,8 @@ LOG_MODULE_REGISTER(net_txtime_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/ethernet_mgmt.h>
 
+#include "net_sample_common.h"
+
 #define APP_BANNER "Run SO_TXTIME client"
 
 #define DHCPV4_MASK (NET_EVENT_IPV4_DHCP_BOUND | \
@@ -63,8 +65,6 @@ K_SEM_DEFINE(run_app, 0, 1);
 static bool want_to_quit;
 static bool connected;
 
-extern int init_vlan(void);
-
 static void quit(void)
 {
 	k_sem_give(&quit_lock);
diff --git a/samples/net/sockets/txtime/src/vlan.c b/samples/net/sockets/txtime/src/vlan.c
deleted file mode 100644
index 04b28e427e365..0000000000000
--- a/samples/net/sockets/txtime/src/vlan.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2020 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_DECLARE(net_txtime_sample, LOG_LEVEL_DBG);
-
-#include <zephyr/kernel.h>
-
-#include <zephyr/net/ethernet.h>
-
-/* User data for the interface callback */
-struct ud {
-	struct net_if *first;
-	struct net_if *second;
-};
-
-static void iface_cb(struct net_if *iface, void *user_data)
-{
-	struct ud *ud = user_data;
-
-	if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
-		return;
-	}
-
-	if (!ud->first) {
-		ud->first = iface;
-		return;
-	}
-
-	if (!ud->second) {
-		ud->second = iface;
-		return;
-	}
-}
-
-static int setup_iface(struct net_if *eth_iface,
-		       struct net_if *iface,
-		       const char *ipv6_addr,
-		       const char *ipv4_addr,
-		       uint16_t vlan_tag)
-{
-	struct net_if_addr *ifaddr;
-	struct in_addr addr4;
-	struct in6_addr addr6;
-	int ret;
-
-	if (!iface) {
-		LOG_DBG("VLAN interface not set");
-		return -ENOENT;
-	}
-
-	ret = net_eth_vlan_enable(eth_iface, vlan_tag);
-	if (ret < 0) {
-		LOG_ERR("Cannot enable VLAN for tag %d (%d)", vlan_tag, ret);
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV6)) {
-		if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) {
-			LOG_ERR("Invalid address: %s", ipv6_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv6_addr_add(iface, &addr6,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv6_addr, iface);
-			return -EINVAL;
-		}
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV4)) {
-		if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) {
-			LOG_ERR("Invalid address: %s", ipv6_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv4_addr_add(iface, &addr4,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv4_addr, iface);
-			return -EINVAL;
-		}
-	}
-
-	LOG_DBG("Interface %p VLAN tag %d setup done.", iface, vlan_tag);
-
-	return 0;
-}
-
-int init_vlan(void)
-{
-	struct net_if *iface;
-	enum ethernet_hw_caps caps;
-	struct ud ud;
-	int ret;
-
-	if (CONFIG_NET_VLAN_COUNT == 0) {
-		LOG_DBG("No VLAN interfaces defined.");
-		return 0;
-	}
-
-	iface = net_if_get_first_by_type(&NET_L2_GET_NAME(ETHERNET));
-	if (!iface) {
-		LOG_ERR("No ethernet interfaces found.");
-		return -ENOENT;
-	}
-
-	memset(&ud, 0, sizeof(ud));
-
-	net_if_foreach(iface_cb, &ud);
-
-	caps = net_eth_get_hw_capabilities(iface);
-	if (!(caps & ETHERNET_HW_VLAN)) {
-		LOG_DBG("Interface %p does not support %s", iface, "VLAN");
-		return -ENOENT;
-	}
-
-	ret = setup_iface(iface, ud.first,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = setup_iface(iface, ud.second,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	/* Bring up the VLAN interface automatically */
-	net_if_up(ud.first);
-	net_if_up(ud.second);
-
-	return 0;
-}
diff --git a/samples/net/sockets/websocket_client/sample.yaml b/samples/net/sockets/websocket_client/sample.yaml
index df7603cf1a16b..a0472b856f967 100644
--- a/samples/net/sockets/websocket_client/sample.yaml
+++ b/samples/net/sockets/websocket_client/sample.yaml
@@ -7,10 +7,6 @@ common:
     - websocket
   min_ram: 35
   depends_on: netif
-  # native_posix does not work with CONFIG_POSIX_API
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 sample:
   description: Websocket client sample
   name: websocket_client
diff --git a/samples/net/telnet/sample.yaml b/samples/net/telnet/sample.yaml
index 5dd685e6bf36a..2a29b5af54285 100644
--- a/samples/net/telnet/sample.yaml
+++ b/samples/net/telnet/sample.yaml
@@ -7,10 +7,7 @@ common:
 sample:
   name: Telnet Server
 tests:
-  sample.net.telnet:
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
+  sample.net.telnet: {}
   sample.net.telnet.wifi.nrf70dk:
     extra_args:
       - SNIPPET=wifi-ipv4
diff --git a/samples/net/vlan/Kconfig b/samples/net/vlan/Kconfig
index 88ae77ef98352..fde211744a700 100644
--- a/samples/net/vlan/Kconfig
+++ b/samples/net/vlan/Kconfig
@@ -5,54 +5,6 @@
 
 mainmenu "Networking VLAN sample application"
 
-config NET_SAMPLE_IFACE2_MY_IPV6_ADDR
-	string "My IPv6 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_MY_IPV4_ADDR
-	string "My IPv4 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_MY_IPV4_NETMASK
-	string "My IPv4 netmask for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_VLAN_TAG
-	int "VLAN tag for second interface"
-	default 100
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_IFACE3_MY_IPV6_ADDR
-	string "My IPv6 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_ADDR
-	string "My IPv4 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_NETMASK
-	string "My IPv4 netmask for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_VLAN_TAG
-	int "VLAN tag for third interface"
-	default 200
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
 config NET_SAMPLE_IFACE_MY_IPV6_PREFIXLEN
 	int "IPv6 address prefix length for the interfaces"
 	default 64
@@ -61,4 +13,5 @@ config NET_SAMPLE_IFACE_MY_IPV6_PREFIXLEN
 	  Set the IPv6 address prefix length (netmask) for the interfaces
 	  that is used in the sample application.
 
+source "samples/net/common/Kconfig"
 source "Kconfig.zephyr"
diff --git a/samples/net/vlan/prj.conf b/samples/net/vlan/prj.conf
index 20ea9f0627b6d..8215a18a80912 100644
--- a/samples/net/vlan/prj.conf
+++ b/samples/net/vlan/prj.conf
@@ -6,6 +6,7 @@ CONFIG_NET_DHCPV4=n
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_STATISTICS=y
+CONFIG_POSIX_API=y
 
 CONFIG_TEST_RANDOM_GENERATOR=y
 
@@ -41,21 +42,13 @@ CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
-# Second VLAN supported network interface will have these settings
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"
+# First VLAN interface will have these settings
 # TEST-NET-2 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR="198.51.100.1"
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG=100
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1="100;2001:db8:100::1/64,198.51.100.1/24"
 
-# Settings for the third VLAN supported network interface
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR="2001:db8:200::1"
+# Second VLAN interface will have these settings
 # TEST-NET-3 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR="203.0.113.1"
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG=200
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"
 
 # Logging
 CONFIG_LOG=y
diff --git a/samples/net/vlan/src/main.c b/samples/net/vlan/src/main.c
index cfcff4c264378..865e9f306b86f 100644
--- a/samples/net/vlan/src/main.c
+++ b/samples/net/vlan/src/main.c
@@ -15,144 +15,10 @@ LOG_MODULE_REGISTER(net_vlan_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ethernet.h>
 
-struct ud {
-	struct net_if *first;
-	struct net_if *second;
-};
-
-static void iface_cb(struct net_if *iface, void *user_data)
-{
-	struct ud *ud = user_data;
-
-	if (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL)) {
-		return;
-	}
-
-	if (ud->first == NULL) {
-		ud->first = iface;
-		return;
-	}
-
-	ud->second = iface;
-}
-
-static int setup_iface(struct net_if *iface, struct net_if *vlan,
-		       const char *ipv6_addr, const char *ipv4_addr,
-		       const char *netmask, uint16_t vlan_tag)
-{
-	struct net_if_addr *ifaddr;
-	struct in_addr addr4;
-	struct in6_addr addr6, netaddr6;
-	int ret;
-
-	ret = net_eth_vlan_enable(iface, vlan_tag);
-	if (ret < 0) {
-		LOG_ERR("Cannot enable VLAN for tag %d (%d)", vlan_tag, ret);
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV6)) {
-		if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) {
-			LOG_ERR("Invalid address: %s", ipv6_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv6_addr_add(vlan, &addr6,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv6_addr, vlan);
-			return -EINVAL;
-		}
-
-		net_ipv6_addr_prefix_mask((uint8_t *)&addr6,
-					  (uint8_t *)&netaddr6,
-					  CONFIG_NET_SAMPLE_IFACE_MY_IPV6_PREFIXLEN);
-
-		if (!net_if_ipv6_prefix_add(vlan, &netaddr6,
-					    CONFIG_NET_SAMPLE_IFACE_MY_IPV6_PREFIXLEN,
-					    (uint32_t)0xffffffff)) {
-			LOG_ERR("Cannot add %s with prefix_len %d to interface %p",
-				ipv6_addr,
-				CONFIG_NET_SAMPLE_IFACE_MY_IPV6_PREFIXLEN,
-				vlan);
-			return -EINVAL;
-		}
-	}
-
-	if (IS_ENABLED(CONFIG_NET_IPV4)) {
-		if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) {
-			LOG_ERR("Invalid address: %s", ipv4_addr);
-			return -EINVAL;
-		}
-
-		ifaddr = net_if_ipv4_addr_add(vlan, &addr4,
-					      NET_ADDR_MANUAL, 0);
-		if (!ifaddr) {
-			LOG_ERR("Cannot add %s to interface %p",
-				ipv4_addr, vlan);
-			return -EINVAL;
-		}
-
-		if (netmask && netmask[0]) {
-			struct in_addr nm;
-
-			if (net_addr_pton(AF_INET, netmask, &nm)) {
-				LOG_ERR("Invalid netmask: %s", ipv4_addr);
-				return -EINVAL;
-			}
-
-			net_if_ipv4_set_netmask_by_addr(vlan, &addr4, &nm);
-		}
-	}
-
-	LOG_DBG("Interface %p VLAN tag %d setup done.", vlan, vlan_tag);
-
-	return 0;
-}
-
-static int init_app(void)
-{
-	struct net_if *iface;
-	struct ud ud;
-	int ret;
-
-	iface = net_if_get_first_by_type(&NET_L2_GET_NAME(ETHERNET));
-	if (!iface) {
-		LOG_ERR("No ethernet interfaces found.");
-		return -ENOENT;
-	}
-
-	memset(&ud, 0, sizeof(ud));
-
-	net_if_foreach(iface_cb, &ud);
-
-	ret = setup_iface(iface, ud.first,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_NETMASK,
-			  CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	ret = setup_iface(iface, ud.second,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR,
-			  CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_NETMASK,
-			  CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG);
-	if (ret < 0) {
-		return ret;
-	}
-
-	/* Bring up the VLAN interface automatically */
-	net_if_up(ud.first);
-	net_if_up(ud.second);
-
-	return ret;
-}
+#include "net_sample_common.h"
 
 int main(void)
 {
-	init_app();
+	init_vlan();
 	return 0;
 }
diff --git a/samples/net/wifi/apsta_mode/README.rst b/samples/net/wifi/apsta_mode/README.rst
index 38f5c1c2e7c37..06a6b46381eaf 100644
--- a/samples/net/wifi/apsta_mode/README.rst
+++ b/samples/net/wifi/apsta_mode/README.rst
@@ -40,7 +40,7 @@ Building, Flashing and Running
 ******************************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/espressif/deep_sleep
+   :zephyr-app: samples/net/wifi/apsta_mode
    :board: esp32_devkitc_wroom/esp32/procpu
    :goals: build flash
    :compact:
diff --git a/samples/net/wifi/apsta_mode/boards/esp32_devkitc_wroom_procpu.overlay b/samples/net/wifi/apsta_mode/boards/esp32_devkitc_wroom_procpu.overlay
deleted file mode 100644
index a53651c69a22f..0000000000000
--- a/samples/net/wifi/apsta_mode/boards/esp32_devkitc_wroom_procpu.overlay
+++ /dev/null
@@ -1,10 +0,0 @@
-&wifi {
-	status = "okay";
-};
-
-/ {
-	wifi_ap: wifi_ap {
-		compatible = "espressif,esp32-wifi";
-		status = "okay";
-	};
-};
diff --git a/samples/net/wifi/apsta_mode/boards/esp32_devkitc_wroom_procpu.conf b/samples/net/wifi/apsta_mode/socs/esp32_procpu.conf
similarity index 100%
rename from samples/net/wifi/apsta_mode/boards/esp32_devkitc_wroom_procpu.conf
rename to samples/net/wifi/apsta_mode/socs/esp32_procpu.conf
diff --git a/samples/net/wifi/apsta_mode/socs/esp32_procpu.overlay b/samples/net/wifi/apsta_mode/socs/esp32_procpu.overlay
new file mode 100644
index 0000000000000..7d1a4893c713b
--- /dev/null
+++ b/samples/net/wifi/apsta_mode/socs/esp32_procpu.overlay
@@ -0,0 +1,6 @@
+/ {
+	wifi_ap: wifi_ap {
+		compatible = "espressif,esp32-wifi";
+		status = "okay";
+	};
+};
diff --git a/samples/net/wifi/shell/boards/frdm_rw612.conf b/samples/net/wifi/shell/boards/frdm_rw612.conf
index 7ea696cf074ac..89a89028522aa 100644
--- a/samples/net/wifi/shell/boards/frdm_rw612.conf
+++ b/samples/net/wifi/shell/boards/frdm_rw612.conf
@@ -1,124 +1,11 @@
 CONFIG_WIFI_NXP=y
 CONFIG_NXP_RW610=y
-CONFIG_NXP_WIFI_SHELL=y
-
-#
-# C Library
-#
-CONFIG_REQUIRES_FULL_LIBC=y
-CONFIG_CBPRINTF_FP_SUPPORT=y
-
-# log
-CONFIG_WIFI_LOG_LEVEL_DBG=y
-CONFIG_THREAD_LOCAL_STORAGE=y
-CONFIG_ASSERT=y
-CONFIG_ASSERT_LEVEL=2
-CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_LOG_PRINTK=n
-
-# os
-CONFIG_THREAD_CUSTOM_DATA=y
-CONFIG_EVENTS=y
-CONFIG_SYS_HEAP_AUTO=y
-CONFIG_SCHED_MULTIQ=y
-CONFIG_ZVFS_OPEN_MAX=30
-
-# shell
-CONFIG_SHELL_ARGC_MAX=48
-CONFIG_WIFI_SHELL_MAX_AP_STA=8
-CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=8
-CONFIG_SHELL_CMD_BUFF_SIZE=512
-
-# net
-CONFIG_NET_L2_ETHERNET=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=y
-CONFIG_ETH_MCUX=n
-CONFIG_NET_ZPERF=y
-CONFIG_NET_ZPERF_MAX_PACKET_SIZE=1500
-CONFIG_NET_BUF_LOG=y
-CONFIG_NET_PKT_RX_COUNT=36
-CONFIG_NET_PKT_TX_COUNT=36
-CONFIG_NET_BUF_RX_COUNT=40
-CONFIG_NET_BUF_TX_COUNT=40
-CONFIG_NET_BUF_DATA_SIZE=1744
-CONFIG_NET_TCP_MAX_SEND_WINDOW_SIZE=46720
-CONFIG_NET_TCP_MAX_RECV_WINDOW_SIZE=46720
-CONFIG_NET_TC_TX_COUNT=1
-CONFIG_NET_TC_RX_COUNT=1
-CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=20
-CONFIG_NET_IF_MAX_IPV4_COUNT=2
-CONFIG_NET_IF_MAX_IPV6_COUNT=2
-CONFIG_DNS_RESOLVER=y
-CONFIG_DNS_RESOLVER_MAX_SERVERS=2
-CONFIG_NET_SOCKETS_POLL_MAX=14
-CONFIG_NET_ZPERF_MAX_SESSIONS=6
-CONFIG_NET_IPV4_FRAGMENT=y
-CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=3
-CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=7
-CONFIG_NET_IPV4_FRAGMENT_TIMEOUT=3
-CONFIG_NET_IPV6_FRAGMENT=y
-CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3
-CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8
-CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3
-CONFIG_NET_MAX_CONN=10
 CONFIG_ETH_DRIVER=n
 
-# net threads priority
-CONFIG_NET_TC_THREAD_PRIO_CUSTOM=y
-CONFIG_NET_TC_THREAD_PREEMPTIVE=y
-CONFIG_NET_TCP_WORKER_PRIO=-16
-CONFIG_NET_TC_TX_THREAD_BASE_PRIO=3
-CONFIG_NET_TC_RX_THREAD_BASE_PRIO=3
-CONFIG_ZPERF_WORK_Q_THREAD_PRIORITY=3
-CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=3
-CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO=y
-CONFIG_NET_CONTEXT_PRIORITY=y
-CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
-CONFIG_NET_MGMT_THREAD_PRIORITY=3
-
-# power management
-CONFIG_PM=y
-CONFIG_PM_DEVICE=y
-CONFIG_PM_LOG_LEVEL_OFF=y
-CONFIG_PM_DEVICE_LOG_LEVEL_OFF=y
-CONFIG_IDLE_STACK_SIZE=1024
-
 # stack size
 CONFIG_SHELL_STACK_SIZE=6144
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_NET_MGMT_EVENT_STACK_SIZE=4608
 CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=4096
-CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
-
-# optimization level
-# refer to Kconfig.zephyr for Optimizations Level
-CONFIG_SPEED_OPTIMIZATIONS=y
-#CONFIG_SIZE_OPTIMIZATIONS=y
-#CONFIG_DEBUG_OPTIMIZATIONS=y
-#CONFIG_NO_OPTIMIZATIONS=y
-
-# debug & stats
-CONFIG_SYS_HEAP_VALIDATE=y
-CONFIG_SYS_HEAP_RUNTIME_STATS=y
-#CONFIG_NET_PKT_TXTIME_STATS=y
-#CONFIG_NET_PKT_TXTIME_STATS_DETAIL=y
-CONFIG_NET_STATISTICS_WIFI=y
-CONFIG_NET_STATISTICS_USER_API=y
-#CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=y
-#CONFIG_NET_BUF_POOL_USAGE=y
-#CONFIG_NET_DEBUG_NET_PKT_ALLOC=y
-
-# stack size for -O0
-#CONFIG_SHELL_STACK_SIZE=8192
-#CONFIG_NET_TCP_WORKQ_STACK_SIZE=4096
-#CONFIG_NET_TX_STACK_SIZE=4096
-#CONFIG_NET_RX_STACK_SIZE=4096
-#CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-#CONFIG_ZPERF_WORK_Q_STACK_SIZE=4096
-#CONFIG_MAIN_STACK_SIZE=4096
-#CONFIG_IDLE_STACK_SIZE=2048
-
-# comment out for -O0
-CONFIG_CODE_DATA_RELOCATION_SRAM=y
+CONFIG_IDLE_STACK_SIZE=1024
diff --git a/samples/net/wifi/shell/boards/rd_rw612_bga.conf b/samples/net/wifi/shell/boards/rd_rw612_bga.conf
index 9681eceb3ed19..2ebe1e0001a73 100644
--- a/samples/net/wifi/shell/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/shell/boards/rd_rw612_bga.conf
@@ -1,87 +1,5 @@
 CONFIG_WIFI_NXP=y
 CONFIG_NXP_RW610=y
-CONFIG_NXP_WIFI_SHELL=y
-
-#
-# C Library
-#
-CONFIG_REQUIRES_FULL_LIBC=y
-CONFIG_CBPRINTF_FP_SUPPORT=y
-
-# log
-CONFIG_WIFI_LOG_LEVEL_DBG=y
-CONFIG_THREAD_LOCAL_STORAGE=y
-CONFIG_ASSERT=y
-CONFIG_ASSERT_LEVEL=2
-CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_LOG_PRINTK=n
-
-# os
-CONFIG_THREAD_CUSTOM_DATA=y
-CONFIG_EVENTS=y
-CONFIG_SYS_HEAP_AUTO=y
-CONFIG_SCHED_MULTIQ=y
-CONFIG_ZVFS_OPEN_MAX=30
-
-# shell
-CONFIG_SHELL_ARGC_MAX=48
-CONFIG_WIFI_SHELL_MAX_AP_STA=8
-CONFIG_WIFI_MGMT_AP_MAX_NUM_STA=8
-CONFIG_SHELL_CMD_BUFF_SIZE=512
-
-# net
-CONFIG_NET_L2_ETHERNET=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=y
-CONFIG_ETH_MCUX=n
-CONFIG_NET_ZPERF=y
-CONFIG_NET_ZPERF_MAX_PACKET_SIZE=1500
-CONFIG_NET_BUF_LOG=y
-CONFIG_NET_PKT_RX_COUNT=36
-CONFIG_NET_PKT_TX_COUNT=36
-CONFIG_NET_BUF_RX_COUNT=40
-CONFIG_NET_BUF_TX_COUNT=40
-CONFIG_NET_BUF_DATA_SIZE=1744
-CONFIG_NET_TCP_MAX_SEND_WINDOW_SIZE=46720
-CONFIG_NET_TCP_MAX_RECV_WINDOW_SIZE=46720
-CONFIG_NET_TC_TX_COUNT=1
-CONFIG_NET_TC_RX_COUNT=1
-CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=20
-CONFIG_NET_IF_MAX_IPV4_COUNT=2
-CONFIG_NET_IF_MAX_IPV6_COUNT=2
-CONFIG_DNS_RESOLVER=y
-CONFIG_DNS_RESOLVER_MAX_SERVERS=2
-CONFIG_NET_SOCKETS_POLL_MAX=14
-CONFIG_NET_ZPERF_MAX_SESSIONS=6
-CONFIG_NET_IPV4_FRAGMENT=y
-CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=3
-CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=7
-CONFIG_NET_IPV4_FRAGMENT_TIMEOUT=3
-CONFIG_NET_IPV6_FRAGMENT=y
-CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3
-CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8
-CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3
-CONFIG_NET_MAX_CONN=10
-
-# net threads priority
-CONFIG_NET_TC_THREAD_PRIO_CUSTOM=y
-CONFIG_NET_TC_THREAD_PREEMPTIVE=y
-CONFIG_NET_TCP_WORKER_PRIO=-16
-CONFIG_NET_TC_TX_THREAD_BASE_PRIO=3
-CONFIG_NET_TC_RX_THREAD_BASE_PRIO=3
-CONFIG_ZPERF_WORK_Q_THREAD_PRIORITY=3
-CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=3
-CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO=y
-CONFIG_NET_CONTEXT_PRIORITY=y
-CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
-CONFIG_NET_MGMT_THREAD_PRIORITY=3
-
-# power management
-CONFIG_PM=y
-CONFIG_PM_DEVICE=y
-CONFIG_PM_LOG_LEVEL_OFF=y
-CONFIG_PM_DEVICE_LOG_LEVEL_OFF=y
-CONFIG_IDLE_STACK_SIZE=1024
 
 # stack size
 CONFIG_SHELL_STACK_SIZE=6144
@@ -89,35 +7,4 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_NET_MGMT_EVENT_STACK_SIZE=4608
 CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=4096
-CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
-
-# optimization level
-# refer to Kconfig.zephyr for Optimizations Level
-CONFIG_SPEED_OPTIMIZATIONS=y
-#CONFIG_SIZE_OPTIMIZATIONS=y
-#CONFIG_DEBUG_OPTIMIZATIONS=y
-#CONFIG_NO_OPTIMIZATIONS=y
-
-# debug & stats
-CONFIG_SYS_HEAP_VALIDATE=y
-CONFIG_SYS_HEAP_RUNTIME_STATS=y
-#CONFIG_NET_PKT_TXTIME_STATS=y
-#CONFIG_NET_PKT_TXTIME_STATS_DETAIL=y
-CONFIG_NET_STATISTICS_WIFI=y
-CONFIG_NET_STATISTICS_USER_API=y
-#CONFIG_NET_STATISTICS_PERIODIC_OUTPUT=y
-#CONFIG_NET_BUF_POOL_USAGE=y
-#CONFIG_NET_DEBUG_NET_PKT_ALLOC=y
-
-# stack size for -O0
-#CONFIG_SHELL_STACK_SIZE=8192
-#CONFIG_NET_TCP_WORKQ_STACK_SIZE=4096
-#CONFIG_NET_TX_STACK_SIZE=4096
-#CONFIG_NET_RX_STACK_SIZE=4096
-#CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-#CONFIG_ZPERF_WORK_Q_STACK_SIZE=4096
-#CONFIG_MAIN_STACK_SIZE=4096
-#CONFIG_IDLE_STACK_SIZE=2048
-
-# comment out for -O0
-CONFIG_CODE_DATA_RELOCATION_SRAM=y
+CONFIG_IDLE_STACK_SIZE=1024
diff --git a/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf b/samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf
similarity index 85%
rename from samples/net/wifi/shell/boards/overlay_hostap_rw612.conf
rename to samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf
index 694ccc1353404..28bb9eec041fc 100644
--- a/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf
+++ b/samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf
@@ -1,3 +1,6 @@
+# This conf is used for supplicant support, including enterprise,
+# WPS and DPP mode.
+
 # wpa_supplicant
 CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
@@ -20,11 +23,12 @@ CONFIG_ENTROPY_GENERATOR=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_MBEDTLS_ENTROPY_C=y
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
+
 # mbedtls heap for enterprise case
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=69952
 
-#priority
+# priority
 CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=3
 CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO=3
 
@@ -32,10 +36,5 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO=3
 CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=12288
 CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
 
-# stack size for -O0
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=16384
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=16384
-
 # debug level
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=2
 CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
diff --git a/samples/net/wifi/shell/nxp/overlay_hostap_rw612_debug.conf b/samples/net/wifi/shell/nxp/overlay_hostap_rw612_debug.conf
new file mode 100644
index 0000000000000..6e57a8f1a3904
--- /dev/null
+++ b/samples/net/wifi/shell/nxp/overlay_hostap_rw612_debug.conf
@@ -0,0 +1,9 @@
+# This conf is used for supplicant debug mode.
+
+# stack size
+CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=16384
+CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=16384
+
+# debug level
+CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=2
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DBG=y
diff --git a/samples/net/wifi/shell/nxp/overlay_rw612.conf b/samples/net/wifi/shell/nxp/overlay_rw612.conf
new file mode 100644
index 0000000000000..e638fe79c61f6
--- /dev/null
+++ b/samples/net/wifi/shell/nxp/overlay_rw612.conf
@@ -0,0 +1,92 @@
+# This conf is used for adding SAP, IPv4/IPv6, Zperf, PM support,
+# and is optimized to get higher throughput performance.
+
+# log & stats
+CONFIG_WIFI_LOG_LEVEL_DBG=y
+CONFIG_THREAD_LOCAL_STORAGE=y
+CONFIG_ASSERT=y
+CONFIG_ASSERT_LEVEL=2
+CONFIG_LOG_MODE_IMMEDIATE=y
+CONFIG_LOG_PRINTK=n
+CONFIG_SYS_HEAP_VALIDATE=y
+CONFIG_SYS_HEAP_RUNTIME_STATS=y
+CONFIG_NET_STATISTICS_WIFI=y
+CONFIG_NET_STATISTICS_USER_API=y
+
+# lib & os
+CONFIG_REQUIRES_FULL_LIBC=y
+CONFIG_CBPRINTF_FP_SUPPORT=y
+CONFIG_THREAD_CUSTOM_DATA=y
+CONFIG_EVENTS=y
+CONFIG_SYS_HEAP_AUTO=y
+CONFIG_SCHED_MULTIQ=y
+CONFIG_ZVFS_OPEN_MAX=30
+
+# shell
+CONFIG_SHELL_ARGC_MAX=48
+CONFIG_SHELL_CMD_BUFF_SIZE=512
+
+# wifi
+CONFIG_NXP_WIFI_SOFTAP_SUPPORT=y
+CONFIG_WIFI_SHELL_MAX_AP_STA=8
+CONFIG_NXP_WIFI_TX_RX_ZERO_COPY=y
+
+# net
+CONFIG_NET_IPV4=y
+CONFIG_NET_IPV6=y
+CONFIG_NET_ZPERF=y
+CONFIG_NET_ZPERF_MAX_PACKET_SIZE=1500
+CONFIG_NET_BUF_LOG=y
+CONFIG_NET_PKT_RX_COUNT=36
+CONFIG_NET_PKT_TX_COUNT=36
+CONFIG_NET_BUF_RX_COUNT=40
+CONFIG_NET_BUF_TX_COUNT=40
+CONFIG_NET_BUF_DATA_SIZE=1744
+CONFIG_NET_TCP_MAX_SEND_WINDOW_SIZE=46720
+CONFIG_NET_TCP_MAX_RECV_WINDOW_SIZE=46720
+CONFIG_NET_TC_TX_COUNT=1
+CONFIG_NET_TC_RX_COUNT=1
+CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=20
+CONFIG_NET_IF_MAX_IPV4_COUNT=2
+CONFIG_NET_IF_MAX_IPV6_COUNT=2
+CONFIG_DNS_RESOLVER=y
+CONFIG_DNS_RESOLVER_MAX_SERVERS=2
+CONFIG_NET_SOCKETS_POLL_MAX=14
+CONFIG_NET_ZPERF_MAX_SESSIONS=6
+CONFIG_NET_IPV4_FRAGMENT=y
+CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=3
+CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=7
+CONFIG_NET_IPV4_FRAGMENT_TIMEOUT=3
+CONFIG_NET_IPV6_FRAGMENT=y
+CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3
+CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8
+CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3
+CONFIG_NET_MAX_CONN=10
+
+# net threads priority
+CONFIG_NET_TC_THREAD_PRIO_CUSTOM=y
+CONFIG_NET_TC_THREAD_PREEMPTIVE=y
+CONFIG_NET_TCP_WORKER_PRIO=-16
+CONFIG_NET_TC_TX_THREAD_BASE_PRIO=3
+CONFIG_NET_TC_RX_THREAD_BASE_PRIO=3
+CONFIG_ZPERF_WORK_Q_THREAD_PRIORITY=3
+CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=3
+CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO=y
+CONFIG_NET_CONTEXT_PRIORITY=y
+CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
+CONFIG_NET_MGMT_THREAD_PRIORITY=3
+
+# stack size
+CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
+
+# power management
+CONFIG_PM=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_LOG_LEVEL_OFF=y
+CONFIG_PM_DEVICE_LOG_LEVEL_OFF=y
+
+# optimization level
+CONFIG_SPEED_OPTIMIZATIONS=y
+
+# data relocation
+CONFIG_CODE_DATA_RELOCATION_SRAM=y
diff --git a/samples/net/wifi/shell/nxp/overlay_rw612_debug.conf b/samples/net/wifi/shell/nxp/overlay_rw612_debug.conf
new file mode 100644
index 0000000000000..39084d8bf9788
--- /dev/null
+++ b/samples/net/wifi/shell/nxp/overlay_rw612_debug.conf
@@ -0,0 +1,27 @@
+# This conf is used for O0 debug mode and net debug support
+
+# optimization level
+CONFIG_SPEED_OPTIMIZATIONS=n
+CONFIG_NO_OPTIMIZATIONS=y
+
+# power management
+CONFIG_PM=n
+CONFIG_PM_DEVICE=n
+
+# stack size
+CONFIG_SHELL_STACK_SIZE=8192
+CONFIG_NET_TCP_WORKQ_STACK_SIZE=4096
+CONFIG_NET_TX_STACK_SIZE=4096
+CONFIG_NET_RX_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+CONFIG_ZPERF_WORK_Q_STACK_SIZE=4096
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_IDLE_STACK_SIZE=2048
+CONFIG_NXP_WIFI_DRIVER_TASK_STACK_SIZE=4096
+
+# net
+CONFIG_NET_BUF_POOL_USAGE=y
+CONFIG_MEM_SLAB_TRACE_MAX_UTILIZATION=y
+
+# data relocation
+CONFIG_CODE_DATA_RELOCATION_SRAM=n
diff --git a/samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf b/samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf
deleted file mode 100644
index 627d77a924785..0000000000000
--- a/samples/net/wifi/shell/overlay-enterprise-variable-bufs.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-# EAP frames are ~1100 bytes, so, for efficiency, we set the data size to 1100
-CONFIG_NET_BUF_DATA_SIZE=1100
-# Use variable data size to reduce memory usage for small data packets
-CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
-# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
-# for MbedTLS gives us more control over the heap size.
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000
diff --git a/samples/net/wifi/shell/overlay-enterprise.conf b/samples/net/wifi/shell/overlay-enterprise.conf
deleted file mode 100644
index 3441628281129..0000000000000
--- a/samples/net/wifi/shell/overlay-enterprise.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-# EAP frames are ~1100 bytes, so, need higher packet counts as default packet size is 128
-CONFIG_NET_PKT_TX_COUNT=36
-CONFIG_NET_PKT_RX_COUNT=36
-CONFIG_NET_BUF_TX_COUNT=72
-CONFIG_NET_BUF_RX_COUNT=36
-# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
-# for MbedTLS gives us more control over the heap size.
-CONFIG_MBEDTLS_ENABLE_HEAP=y
-CONFIG_MBEDTLS_HEAP_SIZE=55000
diff --git a/samples/net/wifi/shell/sample.yaml b/samples/net/wifi/shell/sample.yaml
index 82be44c22cc62..d39379bd6136b 100644
--- a/samples/net/wifi/shell/sample.yaml
+++ b/samples/net/wifi/shell/sample.yaml
@@ -90,7 +90,7 @@ tests:
       - esp32c3_devkitm
       - esp32s3_devkitm/esp32s3/procpu
       - esp8684_devkitm
-      - esp32c6_devkitc
+      - esp32c6_devkitc/esp32c6/hpcore
   sample.net.wifi.siwx91x_offloaded:
     extra_args:
       - CONFIG_WIFI_SILABS_SIWX91X_NET_STACK_OFFLOAD=y
diff --git a/samples/net/wifi/shell/socs/esp32_procpu.conf b/samples/net/wifi/shell/socs/esp32_procpu.conf
index a72fdf39efa24..97ce6b96475a3 100644
--- a/samples/net/wifi/shell/socs/esp32_procpu.conf
+++ b/samples/net/wifi/shell/socs/esp32_procpu.conf
@@ -1,11 +1 @@
-CONFIG_WIFI=y
-
-CONFIG_NETWORKING=y
-CONFIG_NET_L2_ETHERNET=y
-
-CONFIG_NET_IPV6=n
-CONFIG_NET_IPV4=y
-CONFIG_NET_DHCPV4=y
 CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
-
-CONFIG_NET_LOG=y
diff --git a/samples/net/wifi/shell/socs/esp32_procpu.overlay b/samples/net/wifi/shell/socs/esp32_procpu.overlay
deleted file mode 100644
index ea9865cf5f8a3..0000000000000
--- a/samples/net/wifi/shell/socs/esp32_procpu.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wifi {
-	status = "okay";
-};
diff --git a/samples/net/wifi/shell/socs/esp32c3.conf b/samples/net/wifi/shell/socs/esp32c3.conf
index a72fdf39efa24..97ce6b96475a3 100644
--- a/samples/net/wifi/shell/socs/esp32c3.conf
+++ b/samples/net/wifi/shell/socs/esp32c3.conf
@@ -1,11 +1 @@
-CONFIG_WIFI=y
-
-CONFIG_NETWORKING=y
-CONFIG_NET_L2_ETHERNET=y
-
-CONFIG_NET_IPV6=n
-CONFIG_NET_IPV4=y
-CONFIG_NET_DHCPV4=y
 CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
-
-CONFIG_NET_LOG=y
diff --git a/samples/net/wifi/shell/socs/esp32c3.overlay b/samples/net/wifi/shell/socs/esp32c3.overlay
deleted file mode 100644
index ea9865cf5f8a3..0000000000000
--- a/samples/net/wifi/shell/socs/esp32c3.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wifi {
-	status = "okay";
-};
diff --git a/samples/net/wifi/shell/socs/esp32c3_usb.conf b/samples/net/wifi/shell/socs/esp32c3_usb.conf
index a72fdf39efa24..97ce6b96475a3 100644
--- a/samples/net/wifi/shell/socs/esp32c3_usb.conf
+++ b/samples/net/wifi/shell/socs/esp32c3_usb.conf
@@ -1,11 +1 @@
-CONFIG_WIFI=y
-
-CONFIG_NETWORKING=y
-CONFIG_NET_L2_ETHERNET=y
-
-CONFIG_NET_IPV6=n
-CONFIG_NET_IPV4=y
-CONFIG_NET_DHCPV4=y
 CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
-
-CONFIG_NET_LOG=y
diff --git a/samples/net/wifi/shell/socs/esp32c3_usb.overlay b/samples/net/wifi/shell/socs/esp32c3_usb.overlay
deleted file mode 100644
index ea9865cf5f8a3..0000000000000
--- a/samples/net/wifi/shell/socs/esp32c3_usb.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wifi {
-	status = "okay";
-};
diff --git a/samples/net/wifi/shell/socs/esp32c6.conf b/samples/net/wifi/shell/socs/esp32c6.conf
deleted file mode 100644
index a72fdf39efa24..0000000000000
--- a/samples/net/wifi/shell/socs/esp32c6.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_WIFI=y
-
-CONFIG_NETWORKING=y
-CONFIG_NET_L2_ETHERNET=y
-
-CONFIG_NET_IPV6=n
-CONFIG_NET_IPV4=y
-CONFIG_NET_DHCPV4=y
-CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
-
-CONFIG_NET_LOG=y
diff --git a/samples/net/wifi/shell/socs/esp32c6_hpcore.conf b/samples/net/wifi/shell/socs/esp32c6_hpcore.conf
new file mode 100644
index 0000000000000..97ce6b96475a3
--- /dev/null
+++ b/samples/net/wifi/shell/socs/esp32c6_hpcore.conf
@@ -0,0 +1 @@
+CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
diff --git a/samples/net/wifi/shell/socs/esp32s2.conf b/samples/net/wifi/shell/socs/esp32s2.conf
index da326160cb51b..97ce6b96475a3 100644
--- a/samples/net/wifi/shell/socs/esp32s2.conf
+++ b/samples/net/wifi/shell/socs/esp32s2.conf
@@ -1,12 +1 @@
-CONFIG_WIFI=y
-
-CONFIG_NETWORKING=y
-CONFIG_NET_L2_ETHERNET=y
-
-CONFIG_NET_IPV6=n
-CONFIG_NET_IPV4=y
-CONFIG_NET_DHCPV4=y
 CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
-
-CONFIG_LOG_MODE_MINIMAL=y
-CONFIG_NET_LOG=y
diff --git a/samples/net/wifi/shell/socs/esp32s2.overlay b/samples/net/wifi/shell/socs/esp32s2.overlay
deleted file mode 100644
index ea9865cf5f8a3..0000000000000
--- a/samples/net/wifi/shell/socs/esp32s2.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wifi {
-	status = "okay";
-};
diff --git a/samples/net/wifi/shell/socs/esp32s3_procpu.conf b/samples/net/wifi/shell/socs/esp32s3_procpu.conf
index a72fdf39efa24..97ce6b96475a3 100644
--- a/samples/net/wifi/shell/socs/esp32s3_procpu.conf
+++ b/samples/net/wifi/shell/socs/esp32s3_procpu.conf
@@ -1,11 +1 @@
-CONFIG_WIFI=y
-
-CONFIG_NETWORKING=y
-CONFIG_NET_L2_ETHERNET=y
-
-CONFIG_NET_IPV6=n
-CONFIG_NET_IPV4=y
-CONFIG_NET_DHCPV4=y
 CONFIG_ESP32_WIFI_STA_AUTO_DHCPV4=y
-
-CONFIG_NET_LOG=y
diff --git a/samples/net/wifi/shell/socs/esp32s3_procpu.overlay b/samples/net/wifi/shell/socs/esp32s3_procpu.overlay
deleted file mode 100644
index ea9865cf5f8a3..0000000000000
--- a/samples/net/wifi/shell/socs/esp32s3_procpu.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wifi {
-	status = "okay";
-};
diff --git a/samples/net/wifi/test_certs/rsa2k/ca.pem b/samples/net/wifi/test_certs/rsa2k/ca.pem
new file mode 100644
index 0000000000000..a267be8fe47e5
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/ca.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE+TCCA+GgAwIBAgIUH614zvmCngpSc26BLLFu2loqvfgwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQGV4YW1wbGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1
+dGhvcml0eTAgFw0yNTAzMjcxMjUwNDhaGA8yMDUyMDgxMTEyNTA0OFowgZIxCzAJ
+BgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNvbWV3aGVyZTEU
+MBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1w
+bGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1dGhvcml0eTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALljCArLJs7rdS4pJDrpbSd3
+pNCo1skN3h9FSdboWnz5uvy4dUfOQcPzd1i/Kav7R+eURTIlIe24slDobYW7dS+u
+U+mlw8yzd6Xs9L8BvHrE/JvHMdaCubSWJwJ+BtTZMAvwfpysw0TrYgUw10v4O6PU
+0ri80I/79IKXCQjLnoqrf7OylYnSeuufMrcojZlqMD444EcJS8OAhm648D7w9xWp
+YwGhhV7gLgFZfIZ3vq/VQE6//pasHZ4P2bdej4Up7Nhsqa3qLtPYlUsJB8uTp04h
+YLA600hKoGKJiW1fHrmVIQiYamwkpUSmhY1mw/RJ0GbWE1BT+vLC2BMckw+cwF0C
+AwEAAaOCAUEwggE9MB0GA1UdDgQWBBTgzBbVi3ycphRotu7Am6ynMwVAyTCB0gYD
+VR0jBIHKMIHHgBTgzBbVi3ycphRotu7Am6ynMwVAyaGBmKSBlTCBkjELMAkGA1UE
+BhMCRlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYD
+VQQKDAtFeGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcxJjAkBgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5ghQfrXjO
++YKeClJzboEssW7aWiq9+DAPBgNVHRMBAf8EBTADAQH/MDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly93d3cuZXhhbXBsZS5jb20vZXhhbXBsZV9jYS5jcmwwDQYJKoZI
+hvcNAQELBQADggEBAAV8StX4zFbOqcNVzF0JaZGu7CquFR4pOjCbM9XJVcwCxc0+
+DtIxy+w9KMLGgwB6LHh51tAExCR3UTktG8FqFxdjESCD8qlQoLU1uzt0kadKvQUr
+wjn8ToEp1UP8UZa+SzaXVAYv09DC+VMYqBmkUtze/F5LC0LMWQBR3bn2EGdwBoMl
+k2Gq6BdJZRCotyraSvG01mMyORY6UzLi25WFVg6B284VlD0cqFqmUMEmk2f76Ix3
+WpUkoGZ/ArAoS6+vaFmSrhZ9W+YBfBoBgjXrGMKi2dkUUngbm4yGxrhnN1MFu2lA
+xnBWRxSQjzLGzqQP/bfxAVlNyXwQNPETGVZpGzc=
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/ca2.pem b/samples/net/wifi/test_certs/rsa2k/ca2.pem
new file mode 100644
index 0000000000000..a267be8fe47e5
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/ca2.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE+TCCA+GgAwIBAgIUH614zvmCngpSc26BLLFu2loqvfgwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQGV4YW1wbGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1
+dGhvcml0eTAgFw0yNTAzMjcxMjUwNDhaGA8yMDUyMDgxMTEyNTA0OFowgZIxCzAJ
+BgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNvbWV3aGVyZTEU
+MBIGA1UECgwLRXhhbXBsZSBJbmMxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1w
+bGUub3JnMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRlIEF1dGhvcml0eTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALljCArLJs7rdS4pJDrpbSd3
+pNCo1skN3h9FSdboWnz5uvy4dUfOQcPzd1i/Kav7R+eURTIlIe24slDobYW7dS+u
+U+mlw8yzd6Xs9L8BvHrE/JvHMdaCubSWJwJ+BtTZMAvwfpysw0TrYgUw10v4O6PU
+0ri80I/79IKXCQjLnoqrf7OylYnSeuufMrcojZlqMD444EcJS8OAhm648D7w9xWp
+YwGhhV7gLgFZfIZ3vq/VQE6//pasHZ4P2bdej4Up7Nhsqa3qLtPYlUsJB8uTp04h
+YLA600hKoGKJiW1fHrmVIQiYamwkpUSmhY1mw/RJ0GbWE1BT+vLC2BMckw+cwF0C
+AwEAAaOCAUEwggE9MB0GA1UdDgQWBBTgzBbVi3ycphRotu7Am6ynMwVAyTCB0gYD
+VR0jBIHKMIHHgBTgzBbVi3ycphRotu7Am6ynMwVAyaGBmKSBlTCBkjELMAkGA1UE
+BhMCRlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYD
+VQQKDAtFeGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcxJjAkBgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5ghQfrXjO
++YKeClJzboEssW7aWiq9+DAPBgNVHRMBAf8EBTADAQH/MDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly93d3cuZXhhbXBsZS5jb20vZXhhbXBsZV9jYS5jcmwwDQYJKoZI
+hvcNAQELBQADggEBAAV8StX4zFbOqcNVzF0JaZGu7CquFR4pOjCbM9XJVcwCxc0+
+DtIxy+w9KMLGgwB6LHh51tAExCR3UTktG8FqFxdjESCD8qlQoLU1uzt0kadKvQUr
+wjn8ToEp1UP8UZa+SzaXVAYv09DC+VMYqBmkUtze/F5LC0LMWQBR3bn2EGdwBoMl
+k2Gq6BdJZRCotyraSvG01mMyORY6UzLi25WFVg6B284VlD0cqFqmUMEmk2f76Ix3
+WpUkoGZ/ArAoS6+vaFmSrhZ9W+YBfBoBgjXrGMKi2dkUUngbm4yGxrhnN1MFu2lA
+xnBWRxSQjzLGzqQP/bfxAVlNyXwQNPETGVZpGzc=
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client-key.pem b/samples/net/wifi/test_certs/rsa2k/client-key.pem
new file mode 100644
index 0000000000000..4fbf52d284f13
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client-key.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcm3x/CvLYRcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCSqbBrS+vObBIIEyPSMbzL5DvaJ
+tW/lEoNvmujkYw/qADyExm4JidoemiTxMJB6TkXJE+W8glDeY+TCZUD6UyeiSx7J
+HC1R2rQmpy91LT5o6P7Eyq/VHIsXVE77rS91NCKjiljdPWbzkLFo5oNwguhsvKI9
+YjU8m0V6KVLx21DZFDi5OZQ8g0ULu9FR9WIr4eDUnAIjJnpqw00hZF6FVKe7lu9t
+2uCiKABXpODMqQyrDrTTsQNB4MV8axVWMaYW4P6JVf40ByzA4ISNYhmFH3DWMlAH
+c6LhZstT7n3lXbpsq3pTvn/07+5yuTIvOmFvOoUnXo+kIU7gf1ODma7kPHrcD62c
+9ZgMh/Y90YcQamoLUXJqKBk96ybj9v4p6CTzJC8vOj8GOJqEoUgs6lNYrNQmdJka
+InZJnMfCgX67g60NrQ7vb/LPXTs1gShk/fn2EdLCvhqJNQwNgLjwFtio2DObBD4b
+kuIV/h83moZ/yGrW2PPjxDrzWCxgFhMXs8kGZX6119J8Ki8L+EgKXz0Vfed6XQP6
+RK2anaQzmtJgM4gzzXDOPBPKYDMjqZHqZpMCl1J6TOYbVELDu+OAPGrLSXt71O+T
+toPVrUNdKvYB5H4hosoqMiyeNGwEVjFlSKEInSM6IlwWK2+/xeqTued74nKgj/Je
+xmLbZEurHtOctY0807gj2aNO2/iR4n+1kk9nniBcZNJ7la5GEqAp4wRSH2KI+hu0
+YoJHLtRX/BccawOTvWnLXOsbBTxXtZV9m4ojLbqCzpEV5alFkO0ycP/ao6A/ZTej
+52X01EoUi7Nq5uoIxx+BKj5LN4Pa0Wpe4/DryiEqjSQ2sZMnkD+DhHw/soGcJrJm
+s9zV0YFfFk9Flfnq/9uteHOj+CLxE4BQCpaEBkE+2IooU2Vtw9i5YOeQB+4971XE
+JFBqNknjSfFqaL9zzBliKA9bizZawBub/HUX5P+3k71761k+Li1ID+RYOhTGjqKh
+ws8bke2BtAOB/vccxQGYEOdi8U6+AgK7Dz1AmMQhLlDA8S7qAwodLmnaC6WhP1rA
+1koQYnAGCxOcARTZCLzlfidNf1KzYMRdSVjTh9QAGW7cxEnNEnai5nU4VXUVT3xB
+LWRP98yWzOIsQLFtXzjE0P+ESYGOsQj8aVyy/QHSOg5oEHxZ/myUbr1QB58Z+VKa
+T8/EE2lQazINMIxfsxjDygHX3iF3BlxpwCBk2ykdbfqQFwZ3cr1l53ixuKqd2pTV
+xsEhuAvAfJ1OadUM8HefT+ijUuKPUowtcrcA8URqgy1V/vgcM0qiw7fWysKK7oWl
+L7Oa3JfTE1mpZuocOvF7e5ueNzIgEgnxQEkEE3AJmS0YxMqI6ShTnUx6p79OlVZr
+/Izdkwqqhene+zudNd3z0TMhkjI8LZa6x4SBfCZmCOzOgoZ9XMrf80S/9CKTLWFv
+UrLOe8RJz/6SYweQTMakejC/sbHSSTrqmIf9mrVLP1sMBm8R7TPLMRt8CFNtuYB0
+3nHO9kP7qT3U3sTZ9A0NQyaOfQYcWSLSGBkLSJAM3wh590hp7i6hnM3FeOYY3+lL
+2a9q59B2H3HJfSUUCXtPA8wsEkZyCfz+y5YGscrhQcCbBq1FkkarluKJFonFCEKK
+D4mU9Io0mhON+5ZNhwqurQ==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client-key2.pem b/samples/net/wifi/test_certs/rsa2k/client-key2.pem
new file mode 100644
index 0000000000000..4fbf52d284f13
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client-key2.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcm3x/CvLYRcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCSqbBrS+vObBIIEyPSMbzL5DvaJ
+tW/lEoNvmujkYw/qADyExm4JidoemiTxMJB6TkXJE+W8glDeY+TCZUD6UyeiSx7J
+HC1R2rQmpy91LT5o6P7Eyq/VHIsXVE77rS91NCKjiljdPWbzkLFo5oNwguhsvKI9
+YjU8m0V6KVLx21DZFDi5OZQ8g0ULu9FR9WIr4eDUnAIjJnpqw00hZF6FVKe7lu9t
+2uCiKABXpODMqQyrDrTTsQNB4MV8axVWMaYW4P6JVf40ByzA4ISNYhmFH3DWMlAH
+c6LhZstT7n3lXbpsq3pTvn/07+5yuTIvOmFvOoUnXo+kIU7gf1ODma7kPHrcD62c
+9ZgMh/Y90YcQamoLUXJqKBk96ybj9v4p6CTzJC8vOj8GOJqEoUgs6lNYrNQmdJka
+InZJnMfCgX67g60NrQ7vb/LPXTs1gShk/fn2EdLCvhqJNQwNgLjwFtio2DObBD4b
+kuIV/h83moZ/yGrW2PPjxDrzWCxgFhMXs8kGZX6119J8Ki8L+EgKXz0Vfed6XQP6
+RK2anaQzmtJgM4gzzXDOPBPKYDMjqZHqZpMCl1J6TOYbVELDu+OAPGrLSXt71O+T
+toPVrUNdKvYB5H4hosoqMiyeNGwEVjFlSKEInSM6IlwWK2+/xeqTued74nKgj/Je
+xmLbZEurHtOctY0807gj2aNO2/iR4n+1kk9nniBcZNJ7la5GEqAp4wRSH2KI+hu0
+YoJHLtRX/BccawOTvWnLXOsbBTxXtZV9m4ojLbqCzpEV5alFkO0ycP/ao6A/ZTej
+52X01EoUi7Nq5uoIxx+BKj5LN4Pa0Wpe4/DryiEqjSQ2sZMnkD+DhHw/soGcJrJm
+s9zV0YFfFk9Flfnq/9uteHOj+CLxE4BQCpaEBkE+2IooU2Vtw9i5YOeQB+4971XE
+JFBqNknjSfFqaL9zzBliKA9bizZawBub/HUX5P+3k71761k+Li1ID+RYOhTGjqKh
+ws8bke2BtAOB/vccxQGYEOdi8U6+AgK7Dz1AmMQhLlDA8S7qAwodLmnaC6WhP1rA
+1koQYnAGCxOcARTZCLzlfidNf1KzYMRdSVjTh9QAGW7cxEnNEnai5nU4VXUVT3xB
+LWRP98yWzOIsQLFtXzjE0P+ESYGOsQj8aVyy/QHSOg5oEHxZ/myUbr1QB58Z+VKa
+T8/EE2lQazINMIxfsxjDygHX3iF3BlxpwCBk2ykdbfqQFwZ3cr1l53ixuKqd2pTV
+xsEhuAvAfJ1OadUM8HefT+ijUuKPUowtcrcA8URqgy1V/vgcM0qiw7fWysKK7oWl
+L7Oa3JfTE1mpZuocOvF7e5ueNzIgEgnxQEkEE3AJmS0YxMqI6ShTnUx6p79OlVZr
+/Izdkwqqhene+zudNd3z0TMhkjI8LZa6x4SBfCZmCOzOgoZ9XMrf80S/9CKTLWFv
+UrLOe8RJz/6SYweQTMakejC/sbHSSTrqmIf9mrVLP1sMBm8R7TPLMRt8CFNtuYB0
+3nHO9kP7qT3U3sTZ9A0NQyaOfQYcWSLSGBkLSJAM3wh590hp7i6hnM3FeOYY3+lL
+2a9q59B2H3HJfSUUCXtPA8wsEkZyCfz+y5YGscrhQcCbBq1FkkarluKJFonFCEKK
+D4mU9Io0mhON+5ZNhwqurQ==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client.pem b/samples/net/wifi/test_certs/rsa2k/client.pem
new file mode 100644
index 0000000000000..33eeed9918ee3
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEgzCCA2ugAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTI1MDMyNzEy
+NTA0OVoYDzIwNTIwODExMTI1MDQ5WjB0MQswCQYDVQQGEwJGUjEPMA0GA1UECAwG
+UmFkaXVzMRQwEgYDVQQKDAtFeGFtcGxlIEluYzEVMBMGA1UEAwwMRXhhbXBsZSB1
+c2VyMScwJQYJKoZIhvcNAQkBFhh1c2VyLmV4YW1wbGVAZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkyPDf2/pHiJ6Bb7JK2syekEMh
+j67IpFshtBy/6WAxQfbu9i8LAtyTiEg/7FvZbtAhfPtOnXc45Lu64EHyF8o60Y0X
+6+45Ja3TCrPI609uTf1wTk8cpuRbm5u5blVwECaRiUJQL+Jm6TVNHF4byrNgKmUn
+KY7JFYHQCp6FTCfyex7pTkZSWdNo/EWTuAtOqmwjVLBEQCGtdpbQZmnE9b0WcoPL
+TB5vw3T30UBf3ve5wj6y3BFgMnbaoGvZd07lQtKVjkf50fVwuenPJF6+5XQS68qO
+qeNTq77//qtjFEukobQ5CxFUTrLTO3XTfN+to7xI1WRxDCAIO7wxPCPOcAx3AgMB
+AAGjgf4wgfswCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwEwYDVR0lBAwwCgYIKwYB
+BQUHAwIwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL3d3dy5leGFtcGxlLmNvbS9l
+eGFtcGxlX2NhLmNybDA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6
+Ly93d3cuZXhhbXBsZS5vcmcvb2NzcDAbBgNVHREEFDASgRB1c2VyQGV4YW1wbGUu
+b3JnMB0GA1UdDgQWBBReX3pn9AYI0W0cD5Qrd1PP4mNtOjAfBgNVHSMEGDAWgBTg
+zBbVi3ycphRotu7Am6ynMwVAyTANBgkqhkiG9w0BAQsFAAOCAQEAbXo1Wc2a4053
+jBgl/lGN7p1KNyTO92V/gNT1jM6lOfy+qK6NZGZsayLLT2qubX5t9+1FI/RbRq3i
+FVCocIGRbZD+vKWTfxe4XowCwF9aE2od3xbQjWfSRGZCCYJpPkr5oh3i5qfztYos
+ONclAY54yx3cpsEj5VG/TXA4BmlaoJRrBbAVCGwRHL/KXGu4Y/AlAKHQWnZp6+sl
+UraELVaPeSRuZLgustDtIbMdyC6yTBTfCaRHPDmgYAxVVhzR29kitMO/hoJIAt8d
+MDWMXTRNsJMGMVOy6YWZAdvW0pj9tTN1shhYBRA3Wi8W/HrvlPtQWfrJqaTHNJ32
+sTKtziYlCg==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/client2.pem b/samples/net/wifi/test_certs/rsa2k/client2.pem
new file mode 100644
index 0000000000000..33eeed9918ee3
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/client2.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEgzCCA2ugAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTI1MDMyNzEy
+NTA0OVoYDzIwNTIwODExMTI1MDQ5WjB0MQswCQYDVQQGEwJGUjEPMA0GA1UECAwG
+UmFkaXVzMRQwEgYDVQQKDAtFeGFtcGxlIEluYzEVMBMGA1UEAwwMRXhhbXBsZSB1
+c2VyMScwJQYJKoZIhvcNAQkBFhh1c2VyLmV4YW1wbGVAZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkyPDf2/pHiJ6Bb7JK2syekEMh
+j67IpFshtBy/6WAxQfbu9i8LAtyTiEg/7FvZbtAhfPtOnXc45Lu64EHyF8o60Y0X
+6+45Ja3TCrPI609uTf1wTk8cpuRbm5u5blVwECaRiUJQL+Jm6TVNHF4byrNgKmUn
+KY7JFYHQCp6FTCfyex7pTkZSWdNo/EWTuAtOqmwjVLBEQCGtdpbQZmnE9b0WcoPL
+TB5vw3T30UBf3ve5wj6y3BFgMnbaoGvZd07lQtKVjkf50fVwuenPJF6+5XQS68qO
+qeNTq77//qtjFEukobQ5CxFUTrLTO3XTfN+to7xI1WRxDCAIO7wxPCPOcAx3AgMB
+AAGjgf4wgfswCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwEwYDVR0lBAwwCgYIKwYB
+BQUHAwIwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL3d3dy5leGFtcGxlLmNvbS9l
+eGFtcGxlX2NhLmNybDA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6
+Ly93d3cuZXhhbXBsZS5vcmcvb2NzcDAbBgNVHREEFDASgRB1c2VyQGV4YW1wbGUu
+b3JnMB0GA1UdDgQWBBReX3pn9AYI0W0cD5Qrd1PP4mNtOjAfBgNVHSMEGDAWgBTg
+zBbVi3ycphRotu7Am6ynMwVAyTANBgkqhkiG9w0BAQsFAAOCAQEAbXo1Wc2a4053
+jBgl/lGN7p1KNyTO92V/gNT1jM6lOfy+qK6NZGZsayLLT2qubX5t9+1FI/RbRq3i
+FVCocIGRbZD+vKWTfxe4XowCwF9aE2od3xbQjWfSRGZCCYJpPkr5oh3i5qfztYos
+ONclAY54yx3cpsEj5VG/TXA4BmlaoJRrBbAVCGwRHL/KXGu4Y/AlAKHQWnZp6+sl
+UraELVaPeSRuZLgustDtIbMdyC6yTBTfCaRHPDmgYAxVVhzR29kitMO/hoJIAt8d
+MDWMXTRNsJMGMVOy6YWZAdvW0pj9tTN1shhYBRA3Wi8W/HrvlPtQWfrJqaTHNJ32
+sTKtziYlCg==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa2k/server-key.pem b/samples/net/wifi/test_certs/rsa2k/server-key.pem
new file mode 100644
index 0000000000000..5a6a2e77e653e
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/server-key.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIZwdmrQt6RogCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHEftLym1jQkBIIEyH5UdHK2L2sR
+frTjMbkJBty0NxC8ucPqmBleZPkpAOF8XazZkfiq40/Vj9D+wTgXWL9/UNQHrY1m
+MbJvBaONODXnJe14rsL18NzN+LoUscE4poKBcrZ4Hbua5mS8mJ+WtPs9AfARyaEZ
+t60lDQMyJ/Hj2Nr7jbUykP6OOkAy1xqcjytcIRA+3q2Jiivv8XMozBzi8t+njODZ
+huMbuj13IFqLtZzTZikL+DpalNCezi7D8kttpkQul1uAtmtIAq3QZ99Ed8/XkRV1
+PiKkcj9J5oOcIyH9PE5D9Mid7+As2kkz614J3zeCG2s9xtUkgoasiabTKZNYgL4K
+sjuTFU4vOoGNasfH+j4tEFRozySW7z53C4jB1KZ8MmOUG+G9tlJk/jAHyFGiK0LN
+CTIsY/ZiA5f7Gk6BL1MbRTsLqch+5pmh43gDwfbq22gPs/TwQKxx3YZJfuUy2L7A
+T5sX3VjqQZ+rTwMEql790AnKSFsCbIH4Y7XcFY2Ux6tYzddiViLMTR29kJ0GJSEv
+aw5VIDAexec2M72p+l7kMecJiJgB2cDwkGFgD8qAd/hkWj6k6R9rRdI6Dg4a3Ta3
+Q50colSh0XfpPQ9jg6NjGJCUVO+uICOa5rD5tI5s/Ogd7MzgTcdDnzl7RDgOH1W+
+TivRMpFwCLdrtDmq9DSA0H7XCeSvf6orROK15dkQn1nmtK4/zhG20DVNJxV9UK0u
+GNCkEqqvcGXu75PKkw0bO7BFPAksP4WX+RPIEyZLasB8PxrorkDZTqNh7AJ5CuwO
+xy+ekOrNkfcqHIl2vJvrAhl6i68zM9e6sDV6+J1Eia0naFpZ3cjYC+AAgxcUZT23
+xLcNrNlZbcFJvCrb7JNgSbsQnHSjA1rtMXfNNTpnOGP29gv49rWiSL5QFMTSEBEZ
+4CGs6fpBNQxjvRfxGTnKaZWhenVE98r35zALeD74P8WWieRj7qDPMS8VJmvN6JmN
+VaQ2ysHeFlUEZxC2STHlUl0RAQU/Um4ee2kK6rzywjiZuOv3GeG7zB9P0kIpROa2
+KlxLN+EDffwFytiAlCMfqHrS7iqHPzMxWxzo/Fv7KFngrCxNSPTwxkRu/VVZouOl
+g6ip7VIYxuWgpUD4jZNllLKbJyQ8QABkmZIZI3nZqPX2K6OhqKPdnqF1BiuwrDRD
+k1f2jQBC4cue2nIuitr+mgsw5GG3mwob6Sniv4a6vy19DJImD+bGAxduiUH0laPq
+D2L5BH/Q3c+GtuQGfcemtPD3lteV4Qw/keOEBoLG0tPSVjs+uADUK3cBI4f2C3pd
+gb7Ze1dOPH8Fy/hy+wGp7+gLLLTv23RRYFZZsHBCat9qTyP97vzsckvL3VQN6zWE
+3W8TB2HBVKKkszv5ov0r8/mf5k6aqSw+IYHnkXehkTcRfENUdl7X/x0LM5Hi+I5F
+ZhbtWEETZlcu8XWaIAvW3eV2AOlf0xzC1SmCYEuQ6V9dSxGNuVn4pIMzxfLDfPOw
+gqheYFzSrKZJfB/iGI7XpN2XjWo61ZKudKRxZXSVxPM1hTOqtAFiE4mKarJUTkvC
+TWKmPppA4suT1wV79CMMxWBhe4Kj4STHYSHQfUS22SqsqJbdK/1DD9u+nNANnKol
+riIOT3CiCzNDQyu627UONg==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa2k/server.pem b/samples/net/wifi/test_certs/rsa2k/server.pem
new file mode 100644
index 0000000000000..d894c33ded171
--- /dev/null
+++ b/samples/net/wifi/test_certs/rsa2k/server.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFaTCCBFGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMCRlIx
+DzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQKDAtF
+eGFtcGxlIEluYzEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcxJjAk
+BgNVBAMMHUV4YW1wbGUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MCAXDTI1MDMyNzEy
+NTA0OVoYDzIwNTIwODExMTI1MDQ5WjB7MQswCQYDVQQGEwJGUjEPMA0GA1UECAwG
+UmFkaXVzMRQwEgYDVQQKDAtFeGFtcGxlIEluYzEjMCEGA1UEAwwaRXhhbXBsZSBT
+ZXJ2ZXIgQ2VydGlmaWNhdGUxIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1wbGUu
+b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxtIpRygUsyReit9O
+/15T0lf3p0ck1Sjw3ufaqaXXzEcM7i/w7UoSfNyqrjmCsZhfIDHqzWKdRUD+jE3Z
+TfRzrF/nGtyG2jjjqZy/p+0uTL0cN/QdMjUEvla/eRIgMHPPNG0oFn7GkzbrrqFt
++f3RgsWV6Anw+8ipZvd8BjsummA4W4v6A86zXgORlefU4A7JOlxHXYvhFwS044nd
+N1Fvi0bjyZ7ciKltVCxjLDJEzV7I3ttoO57TI85vtEIjMMwkGywx6ICyLbLrgycl
+OeMmArC86MFINUor3oz+mfI8ETOIfLftqVN+oPRtDqjLlrIvtaDV6PsEoiFajpdx
+faMLhwIDAQABo4IB3DCCAdgwHQYDVR0OBBYEFMGuQKFgIgEb+q+VVWotbLlNZUxu
+MIHSBgNVHSMEgcowgceAFODMFtWLfJymFGi27sCbrKczBUDJoYGYpIGVMIGSMQsw
+CQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUx
+FDASBgNVBAoMC0V4YW1wbGUgSW5jMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzEmMCQGA1UEAwwdRXhhbXBsZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmC
+FB+teM75gp4KUnNugSyxbtpaKr34MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDDjA2BgNVHR8ELzAtMCugKaAnhiVo
+dHRwOi8vd3d3LmV4YW1wbGUuY29tL2V4YW1wbGVfY2EuY3JsMDcGCCsGAQUFBwEB
+BCswKTAnBggrBgEFBQcwAYYbaHR0cDovL3d3dy5leGFtcGxlLm9yZy9vY3NwMDoG
+A1UdEQQzMDGCEnJhZGl1cy5leGFtcGxlLm9yZ6AbBggrBgEFBQcICKAPDA0qLmV4
+YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAov9HxapiYtoAUebNdGU6hFz7G
+3F6Jtpg5d34/AW1ntmgxHryNn5dJp/fmc3eyndMLQRJhDIksc/6Tmp0jUs6DhxE5
+5BmdAPVsAPhYfr3ylOoOP21wtmaH4MeRtBYuBsdvLgyiIXMWrliQnJa+12ovdqMX
++9KJJLWJm81IH6O2kEZ7HmoWkY6XXYpJZqw3c8FukuUoFQQk2mJ4u2yncq4oFQSn
+uu5G4UL8o3blhkY1pK8WmuzUiafyJjjlwBcsBkk47BuKbyQCquOXl/O+lzteJMEZ
+Z83ZANWQb7g1vhIVvse5qLZ9Osa68TJFDaHWcmIyFutbyfdAJy4XEGawf1Fq
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/ca.pem b/samples/net/wifi/test_certs/rsa3k/ca.pem
similarity index 100%
rename from samples/net/wifi/test_certs/ca.pem
rename to samples/net/wifi/test_certs/rsa3k/ca.pem
diff --git a/samples/net/wifi/test_certs/ca2.pem b/samples/net/wifi/test_certs/rsa3k/ca2.pem
similarity index 100%
rename from samples/net/wifi/test_certs/ca2.pem
rename to samples/net/wifi/test_certs/rsa3k/ca2.pem
diff --git a/samples/net/wifi/test_certs/client-key.pem b/samples/net/wifi/test_certs/rsa3k/client-key.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client-key.pem
rename to samples/net/wifi/test_certs/rsa3k/client-key.pem
diff --git a/samples/net/wifi/test_certs/client-key2.pem b/samples/net/wifi/test_certs/rsa3k/client-key2.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client-key2.pem
rename to samples/net/wifi/test_certs/rsa3k/client-key2.pem
diff --git a/samples/net/wifi/test_certs/client.pem b/samples/net/wifi/test_certs/rsa3k/client.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client.pem
rename to samples/net/wifi/test_certs/rsa3k/client.pem
diff --git a/samples/net/wifi/test_certs/client2.pem b/samples/net/wifi/test_certs/rsa3k/client2.pem
similarity index 100%
rename from samples/net/wifi/test_certs/client2.pem
rename to samples/net/wifi/test_certs/rsa3k/client2.pem
diff --git a/samples/net/wifi/test_certs/server-key.pem b/samples/net/wifi/test_certs/rsa3k/server-key.pem
similarity index 100%
rename from samples/net/wifi/test_certs/server-key.pem
rename to samples/net/wifi/test_certs/rsa3k/server-key.pem
diff --git a/samples/net/wifi/test_certs/server.pem b/samples/net/wifi/test_certs/rsa3k/server.pem
similarity index 100%
rename from samples/net/wifi/test_certs/server.pem
rename to samples/net/wifi/test_certs/rsa3k/server.pem
diff --git a/samples/net/wpan_serial/sample.yaml b/samples/net/wpan_serial/sample.yaml
index 78c8c9c517bc8..2a17bf5d62c16 100644
--- a/samples/net/wpan_serial/sample.yaml
+++ b/samples/net/wpan_serial/sample.yaml
@@ -15,6 +15,8 @@ tests:
       - thingy53/nrf5340/cpuapp/ns
       - raytac_mdbt53_db_40/nrf5340/cpuapp/ns
       - raytac_mdbt53_db_40/nrf5340/cpuapp
+    integration_platforms:
+      - usb_kw24d512
   sample.net.wpan_serial.frdm_cr20a:
     extra_args: SHIELD=frdm_cr20a
     platform_allow: frdm_k64f
diff --git a/samples/net/zperf/boards/frdm_rw612.conf b/samples/net/zperf/boards/frdm_rw612.conf
new file mode 100644
index 0000000000000..70aa6c94b2793
--- /dev/null
+++ b/samples/net/zperf/boards/frdm_rw612.conf
@@ -0,0 +1,15 @@
+CONFIG_WIFI_NXP=y
+CONFIG_NXP_RW610=y
+CONFIG_NXP_WIFI_SHELL=y
+
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+
+# stack size
+CONFIG_SHELL_STACK_SIZE=6144
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+CONFIG_NET_MGMT_EVENT_STACK_SIZE=4608
+CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
+CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=12288
+CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
diff --git a/samples/net/zperf/boards/mimxrt1050_evk.conf b/samples/net/zperf/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
similarity index 100%
rename from samples/net/zperf/boards/mimxrt1050_evk.conf
rename to samples/net/zperf/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
diff --git a/samples/net/zperf/boards/native_posix.conf b/samples/net/zperf/boards/native_posix.conf
deleted file mode 100644
index eb56d825c96d1..0000000000000
--- a/samples/net/zperf/boards/native_posix.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
index 7842b0da31e47..2b7f5e48de160 100644
--- a/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
+++ b/samples/net/zperf/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -1,10 +1,11 @@
 # Optimized networking settings for performance
 CONFIG_NET_PKT_RX_COUNT=28
-CONFIG_NET_PKT_TX_COUNT=27
+CONFIG_NET_PKT_TX_COUNT=28
 CONFIG_NET_BUF_RX_COUNT=28
-CONFIG_NET_BUF_TX_COUNT=54
-CONFIG_NET_BUF_DATA_SIZE=1100
-CONFIG_HEAP_MEM_POOL_SIZE=260000
+CONFIG_NET_BUF_TX_COUNT=28
+CONFIG_NRF70_RX_NUM_BUFS=16
+CONFIG_NRF_WIFI_DATA_HEAP_SIZE=30000
+CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE=20000
 CONFIG_NRF70_MAX_TX_AGGREGATION=4
 CONFIG_NRF70_QSPI_LOW_POWER=n
 
diff --git a/samples/net/zperf/sample.yaml b/samples/net/zperf/sample.yaml
index 7dbb0cb8acff3..be6ab8b031993 100644
--- a/samples/net/zperf/sample.yaml
+++ b/samples/net/zperf/sample.yaml
@@ -2,10 +2,7 @@ common:
   tags:
     - net
     - zperf
-  # TODO: Does not work properly with native_posix, need more TLC
   platform_exclude:
-    - native_posix
-    - native_posix/native/64
     - sam_e70_xplained/same70q21
   min_ram: 64
 sample:
diff --git a/samples/philosophers/src/main.c b/samples/philosophers/src/main.c
index 493d11dc5e155..ddda605d5d21e 100644
--- a/samples/philosophers/src/main.c
+++ b/samples/philosophers/src/main.c
@@ -147,7 +147,7 @@ void philosopher(void *id, void *unused1, void *unused2)
 
 	int my_id = POINTER_TO_INT(id);
 
-	/* Djkstra's solution: always pick up the lowest numbered fork first */
+	/* Dijkstra's solution: always pick up the lowest numbered fork first */
 	if (is_last_philosopher(my_id)) {
 		my_fork1 = fork(0);
 		my_fork2 = fork(my_id);
diff --git a/samples/posix/env/sample.yaml b/samples/posix/env/sample.yaml
index 7cca65b292e98..756b914dcc8d7 100644
--- a/samples/posix/env/sample.yaml
+++ b/samples/posix/env/sample.yaml
@@ -5,9 +5,6 @@ common:
   tags:
     - posix
     - env
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
   integration_platforms:
     - native_sim
   harness: console
diff --git a/samples/posix/gettimeofday/sample.yaml b/samples/posix/gettimeofday/sample.yaml
index 88748aab2a63f..a71d29f09c50a 100644
--- a/samples/posix/gettimeofday/sample.yaml
+++ b/samples/posix/gettimeofday/sample.yaml
@@ -10,9 +10,6 @@ common:
   tags:
     - posix
     - net
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   sample.posix.gettimeofday:
     harness: net
diff --git a/samples/posix/uname/sample.yaml b/samples/posix/uname/sample.yaml
index 6b0b0817c16b4..d65596b72a316 100644
--- a/samples/posix/uname/sample.yaml
+++ b/samples/posix/uname/sample.yaml
@@ -3,9 +3,6 @@ sample:
   name: posix uname
 common:
   tags: posix
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
   integration_platforms:
     - native_sim
     - qemu_riscv64
diff --git a/samples/psa/its/overlay-entropy_driver.conf b/samples/psa/its/overlay-entropy_driver.conf
deleted file mode 100644
index 0feb3ad09493f..0000000000000
--- a/samples/psa/its/overlay-entropy_driver.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/psa/its/overlay-secure_storage.conf b/samples/psa/its/overlay-secure_storage.conf
index 3473ae389101a..9265b38ccc7cc 100644
--- a/samples/psa/its/overlay-secure_storage.conf
+++ b/samples/psa/its/overlay-secure_storage.conf
@@ -8,3 +8,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_MAIN_STACK_SIZE=3072
 
 CONFIG_SECURE_STORAGE=y
+CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
diff --git a/samples/psa/its/overlay-tfm.conf b/samples/psa/its/overlay-tfm.conf
new file mode 100644
index 0000000000000..5379af81ede19
--- /dev/null
+++ b/samples/psa/its/overlay-tfm.conf
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/samples/psa/its/prj.conf b/samples/psa/its/prj.conf
index 4c214a79a528c..9ab1f303a6a99 100644
--- a/samples/psa/its/prj.conf
+++ b/samples/psa/its/prj.conf
@@ -2,3 +2,5 @@
 
 CONFIG_LOG=y
 CONFIG_LOG_DEFAULT_LEVEL=3
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/psa/its/sample.yaml b/samples/psa/its/sample.yaml
index c4ee3543696a7..8d67cddd15731 100644
--- a/samples/psa/its/sample.yaml
+++ b/samples/psa/its/sample.yaml
@@ -13,19 +13,20 @@ common:
 tests:
   sample.psa.its.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     tags:
       - trusted-firmware-m
   sample.psa.its.secure_storage.entropy_driver:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
     tags:
       - drivers.entropy
       - settings
   sample.psa.its.secure_storage.entropy_not_secure:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and not CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE="overlay-secure_storage.conf;overlay-entropy_not_secure.conf"
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_not_secure.conf
     tags:
       - random
       - settings
diff --git a/samples/psa/persistent_key/overlay-entropy_driver.conf b/samples/psa/persistent_key/overlay-entropy_driver.conf
deleted file mode 100644
index 0feb3ad09493f..0000000000000
--- a/samples/psa/persistent_key/overlay-entropy_driver.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/psa/persistent_key/overlay-secure_storage.conf b/samples/psa/persistent_key/overlay-secure_storage.conf
index 3473ae389101a..c5cff5f364ac3 100644
--- a/samples/psa/persistent_key/overlay-secure_storage.conf
+++ b/samples/psa/persistent_key/overlay-secure_storage.conf
@@ -2,9 +2,17 @@
 
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=1024
 
 # The default stack size (1024) is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
 CONFIG_MAIN_STACK_SIZE=3072
 
 CONFIG_SECURE_STORAGE=y
+CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
diff --git a/samples/psa/persistent_key/overlay-tfm.conf b/samples/psa/persistent_key/overlay-tfm.conf
new file mode 100644
index 0000000000000..5379af81ede19
--- /dev/null
+++ b/samples/psa/persistent_key/overlay-tfm.conf
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
diff --git a/samples/psa/persistent_key/prj.conf b/samples/psa/persistent_key/prj.conf
index 9e78a182bf46e..af300c0c334b7 100644
--- a/samples/psa/persistent_key/prj.conf
+++ b/samples/psa/persistent_key/prj.conf
@@ -4,5 +4,7 @@ CONFIG_LOG=y
 CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_ASSERT=y
 
+CONFIG_ENTROPY_GENERATOR=y
+
 CONFIG_PSA_WANT_KEY_TYPE_AES=y
 CONFIG_PSA_WANT_ALG_CTR=y
diff --git a/samples/psa/persistent_key/sample.yaml b/samples/psa/persistent_key/sample.yaml
index 01cf9f450d1d1..490f2ea8f156d 100644
--- a/samples/psa/persistent_key/sample.yaml
+++ b/samples/psa/persistent_key/sample.yaml
@@ -13,19 +13,20 @@ common:
 tests:
   sample.psa.persistent_key.tfm:
     filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     tags:
       - trusted-firmware-m
   sample.psa.persistent_key.secure_storage.entropy_driver:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
     tags:
       - drivers.entropy
       - settings
   sample.psa.persistent_key.secure_storage.entropy_not_secure:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and not CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE="overlay-secure_storage.conf;overlay-entropy_not_secure.conf"
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_not_secure.conf
     tags:
       - random
       - settings
diff --git a/samples/psa/persistent_key/src/main.c b/samples/psa/persistent_key/src/main.c
index c79d8184f94fe..2f010a012ea08 100644
--- a/samples/psa/persistent_key/src/main.c
+++ b/samples/psa/persistent_key/src/main.c
@@ -3,10 +3,11 @@
  */
 #include <psa/crypto.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/psa/key_ids.h>
 
 LOG_MODULE_REGISTER(persistent_key);
 
-#define SAMPLE_KEY_ID   PSA_KEY_ID_USER_MIN
+#define SAMPLE_KEY_ID   ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN
 #define SAMPLE_KEY_TYPE PSA_KEY_TYPE_AES
 #define SAMPLE_ALG      PSA_ALG_CTR
 #define SAMPLE_KEY_BITS 256
diff --git a/samples/sensor/accel_polling/sample.yaml b/samples/sensor/accel_polling/sample.yaml
index b4752dfcff3da..74c5f07f5ba42 100644
--- a/samples/sensor/accel_polling/sample.yaml
+++ b/samples/sensor/accel_polling/sample.yaml
@@ -1,15 +1,16 @@
 sample:
   name: Accelerometer polling sample
+common:
+  tags: sensors
+  harness: console
+  harness_config:
+    type: one_line
+    regex:
+      - "^\\s*[0-9A-Za-z_,+-.]*@[0-9A-Fa-f]* \\[m\/s\\^2\\]:    \
+         \\(\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*\\)$"
 tests:
   sample.sensor.accel_polling:
-    harness: console
-    tags: sensors
     filter: dt_alias_exists("accel0")
-    harness_config:
-      type: one_line
-      regex:
-        - "^\\s*[0-9A-Za-z_,+-.]*@[0-9A-Fa-f]* \\[m\/s\\^2\\]:    \
-           \\(\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*\\)$"
     integration_platforms:
       - cc1352r_sensortag               # adxl362
       - blueclover_plt_demo_v2/nrf52832 # bmi270
@@ -27,13 +28,6 @@ tests:
       - sensortile_box                  # lis2dw12, lsm6dso, iisdhhc
       - thingy53/nrf5340/cpuapp         # adxl362, bmi270
   sample.sensor.accel_polling.adxl362-stream:
-    harness: console
-    tags: sensors
-    harness_config:
-      type: one_line
-      regex:
-        - "^\\s*[0-9A-Za-z_,+-.]*@[0-9A-Fa-f]* \\[m\/s\\^2\\]:    \
-           \\(\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*\\)$"
     extra_args:
       - SHIELD=eval_adxl362_ardz
       - EXTRA_CONF_FILE=adxl362-stream.conf
diff --git a/samples/sensor/accel_trig/Kconfig b/samples/sensor/accel_trig/Kconfig
new file mode 100644
index 0000000000000..ec0fa9d253e80
--- /dev/null
+++ b/samples/sensor/accel_trig/Kconfig
@@ -0,0 +1,13 @@
+#
+#  Copyright (c) 2025 Pierrick Curt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+mainmenu "Accelerometer trigger sample application"
+
+config SAMPLE_TAP_DETECTION
+	bool "Set tap detection as trigger in the sample"
+	default n
+
+source "Kconfig.zephyr"
diff --git a/samples/sensor/accel_trig/README.rst b/samples/sensor/accel_trig/README.rst
index 37a3f18e8c8e5..29b952a684765 100644
--- a/samples/sensor/accel_trig/README.rst
+++ b/samples/sensor/accel_trig/README.rst
@@ -7,6 +7,10 @@ Overview
 ********
 
 This sample application demonstrates how to use 3-Axis accelerometers with triggers.
+By default it uses a data ready trigger to read the accelerometer data and print it to the console.
+
+If the accelerometer is enabled with a tap trigger, the sample uses the tap trigger event to
+read the accelerometer data and print it to the console.
 
 Building and Running
 ********************
@@ -27,8 +31,22 @@ Make sure the aliases are in devicetree, then build and run with:
    :goals: build flash
    :compact:
 
-Sample Output
-=============
+With this example, you can also detect a double tap with an accelerometer by activating the
+:kconfig:option:`CONFIG_SAMPLE_TAP_DETECTION`.
+In this example we use a x_nucleo_iks01a3 shield with a LIS2DW12 accelerometer.
+You can build it with the following command:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/sensor/accel_trig
+   :board: nrf52dk/nrf52832
+   :shield: x_nucleo_iks01a3
+   :goals: build
+   :west-args: --extra-dtc-overlay x_nucleo_iks01a3.overlay
+   :compact:
+
+
+Sample Output (SENSOR_TRIG_DATA_READY)
+=======================================
 
 .. code-block:: console
 
@@ -43,3 +61,28 @@ Sample Output
      fxos8700@1d [m/s^2]:    (   -0.105345,    -0.028731,     9.921571)
      fxos8700@1d [m/s^2]:    (   -0.095769,    -0.028731,     9.931148)
      fxos8700@1d [m/s^2]:    (   -0.095769,    -0.009577,     9.940725)
+
+
+Sample Output (SENSOR_TRIG_DOUBLE_TAP)
+======================================
+
+.. code-block:: console
+
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (   -1.899901,   -12.550355,    -2.742174)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (   12.349357,   -18.125630,     6.015556)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (  -11.385050,    -7.274181,    -9.229117)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (    9.214760,    -9.286545,     2.311466)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (   10.090533,   -17.391034,    12.320643)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (   -0.478564,     2.390429,    15.876378)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (   -5.668596,   -13.138989,     0.741775)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (   -2.385644,   -10.559526,     9.899107)
+  TAP detected
+     lis2dw12@19 [m/s^2]:    (    7.537391,    -8.551948,    16.740187)
diff --git a/samples/sensor/accel_trig/boards/mimxrt1050_evk.conf b/samples/sensor/accel_trig/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
similarity index 100%
rename from samples/sensor/accel_trig/boards/mimxrt1050_evk.conf
rename to samples/sensor/accel_trig/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
diff --git a/samples/sensor/accel_trig/boards/stm32f3_disco.conf b/samples/sensor/accel_trig/boards/stm32f3_disco.conf
new file mode 100644
index 0000000000000..67dc73ec34251
--- /dev/null
+++ b/samples/sensor/accel_trig/boards/stm32f3_disco.conf
@@ -0,0 +1,4 @@
+CONFIG_I2C=y
+CONFIG_SENSOR_LOG_LEVEL_DBG=y
+CONFIG_LIS2DW12_TRIGGER_GLOBAL_THREAD=y
+CONFIG_LIS2DW12_TAP=y
diff --git a/samples/sensor/accel_trig/boards/stm32f3_disco.overlay b/samples/sensor/accel_trig/boards/stm32f3_disco.overlay
new file mode 100644
index 0000000000000..79d5a106a8894
--- /dev/null
+++ b/samples/sensor/accel_trig/boards/stm32f3_disco.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024, Pierrick Curt.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/sensor/lis2dw12.h>
+
+/ {
+	aliases {
+		accel0 = &lis2dw12_accel;
+	};
+};
+
+&i2c2 {
+	pinctrl-0 = <&i2c2_scl_pa9 &i2c2_sda_pa10>;
+	pinctrl-names = "default";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+
+	lis2dw12_accel: lis2dw12@19 {
+		compatible = "st,lis2dw12";
+		reg = <0x19>;
+		odr = <400>;
+		tap-mode = <LIS2DW12_DT_SINGLE_DOUBLE_TAP>;
+		tap-threshold = <12>, <12>, <12>;
+		power-mode = <LIS2DW12_DT_HP_MODE>;
+		tap-shock = <0x03>;
+		tap-quiet = <0x03>;
+		tap-latency = <0x03>;
+		irq-gpios = <&gpioe 6 GPIO_ACTIVE_HIGH>;
+	};
+};
diff --git a/samples/sensor/accel_trig/sample.yaml b/samples/sensor/accel_trig/sample.yaml
index a35b8731f6f35..31b7ddfbb72e2 100644
--- a/samples/sensor/accel_trig/sample.yaml
+++ b/samples/sensor/accel_trig/sample.yaml
@@ -1,16 +1,18 @@
 sample:
   name: Accelerometer trigger sample
+common:
+  tags: sensors
+  harness: console
+  harness_config:
+    type: one_line
+    regex:
+      - "^\\s*[0-9A-Za-z_,+-.]*@[0-9A-Fa-f]* \\[m\/s\\^2\\]:    \
+        \\(\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*\\)$"
 tests:
   sample.sensor.accel_trig:
-    harness: console
-    tags: sensors
     filter: dt_alias_exists("accel0")
     harness_config:
       fixture: fixture_sensor_accel_int
-      type: one_line
-      regex:
-        - "^\\s*[0-9A-Za-z_,+-.]*@[0-9A-Fa-f]* \\[m\/s\\^2\\]:    \
-          \\(\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*\\)$"
     integration_platforms:
       - frdm_k64f                       # fxos8700
     platform_exclude:
@@ -22,16 +24,28 @@ tests:
       - stm32l562e_dk
       - stm32wb5mm_dk
   sample.sensor.accel_trig.adxl362-trigger:
-    harness: console
-    tags: sensors
-    harness_config:
-      type: one_line
-      regex:
-        - "^\\s*[0-9A-Za-z_,+-.]*@[0-9A-Fa-f]* \\[m\/s\\^2\\]:    \
-          \\(\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*,\\s*-?[0-9\\.]*\\)$"
     extra_args:
       - SHIELD=eval_adxl362_ardz
       - EXTRA_CONF_FILE=adxl362-trigger.conf
       - SNIPPET=rtt-tracing;rtt-console
     platform_allow:
       - apard32690/max32690/m4
+  sample.sensor.accel_trig.shield-tap:
+    extra_args:
+      - SHIELD=x_nucleo_iks01a3
+      - EXTRA_DTC_OVERLAY_FILE=x_nucleo_iks01a3.overlay
+      - CONFIG_SAMPLE_TAP_DETECTION=y
+    depends_on:
+      - arduino_i2c
+      - arduino_gpio
+    platform_allow:
+      - nrf52dk/nrf52832
+    integration_platforms:
+      - nrf52dk/nrf52832
+  sample.sensor.accel_trig.generic-tap:
+    filter: dt_compat_enabled("nxp,fxos8700") or dt_compat_enabled("invensense,icm42605") or
+            dt_compat_enabled("st,iis2dlpc") or dt_compat_enabled("st,lis2dw12")
+    extra_args:
+      - CONFIG_SAMPLE_TAP_DETECTION=y
+    integration_platforms:
+      - stm32f3_disco
diff --git a/samples/sensor/accel_trig/src/main.c b/samples/sensor/accel_trig/src/main.c
index e5ddde1e2bef3..6f56cc1e9d51e 100644
--- a/samples/sensor/accel_trig/src/main.c
+++ b/samples/sensor/accel_trig/src/main.c
@@ -11,6 +11,19 @@
 
 K_SEM_DEFINE(sem, 0, 1); /* starts off "not available" */
 
+#ifdef CONFIG_SAMPLE_TAP_DETECTION
+static void tap_trigger_handler(const struct device *dev, const struct sensor_trigger *trigger)
+{
+	ARG_UNUSED(trigger);
+	printf("TAP detected\n");
+
+	if (sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ) < 0) {
+		printf("ERROR: SENSOR_CHAN_ACCEL_XYZ fetch failed\n");
+	}
+
+	k_sem_give(&sem);
+}
+#else
 static void trigger_handler(const struct device *dev, const struct sensor_trigger *trigger)
 {
 	ARG_UNUSED(trigger);
@@ -25,6 +38,7 @@ static void trigger_handler(const struct device *dev, const struct sensor_trigge
 
 	k_sem_give(&sem);
 }
+#endif
 
 int main(void)
 {
@@ -41,10 +55,19 @@ int main(void)
 		return 0;
 	}
 
+#ifdef CONFIG_SAMPLE_TAP_DETECTION
+	trig.type = SENSOR_TRIG_DOUBLE_TAP;
+	trig.chan = SENSOR_CHAN_ACCEL_XYZ;
+	if (sensor_trigger_set(dev, &trig, tap_trigger_handler) < 0) {
+		printf("Could not set tap trigger\n");
+		return 0;
+	}
+#else
 	if (sensor_trigger_set(dev, &trig, trigger_handler)) {
 		printf("Could not set trigger\n");
 		return 0;
 	}
+#endif
 
 	while (1) {
 		k_sem_take(&sem, K_FOREVER);
diff --git a/samples/sensor/accel_trig/x_nucleo_iks01a3.overlay b/samples/sensor/accel_trig/x_nucleo_iks01a3.overlay
new file mode 100644
index 0000000000000..f33cce2022116
--- /dev/null
+++ b/samples/sensor/accel_trig/x_nucleo_iks01a3.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2025 Pierrick Curt
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/dt-bindings/sensor/lis2dw12.h>
+
+&lis2dw12_19_x_nucleo_iks01a3 {
+	status = "okay";
+	compatible = "st,lis2dw12";
+	reg = <0x19>;
+	odr = <400>;
+	tap-mode = <LIS2DW12_DT_SINGLE_DOUBLE_TAP>;
+	tap-threshold = <12>, <12>, <12>;
+	power-mode = <LIS2DW12_DT_HP_MODE>;
+	tap-shock = <0x03>;
+	tap-quiet = <0x03>;
+	tap-latency = <0x03>;
+	irq-gpios =  <&arduino_header 3 GPIO_ACTIVE_HIGH>; /* A3 */
+};
diff --git a/samples/sensor/adt7420/README.rst b/samples/sensor/adt7420/README.rst
index 7900a15df9566..02ccc01c2ae23 100644
--- a/samples/sensor/adt7420/README.rst
+++ b/samples/sensor/adt7420/README.rst
@@ -37,7 +37,7 @@ Building and Running
 This project outputs sensor data to the console. It requires an ADT7420
 sensor. It should work with any platform featuring a I2C peripheral interface.
 It does not work on QEMU.
-In this example below the :ref:`nrf52dk_nrf52832` board is used.
+In this example below the :zephyr:board:`nrf52dk` board is used.
 
 
 .. zephyr-app-commands::
diff --git a/samples/sensor/bme280/boards/adafruit_feather_esp32s2.overlay b/samples/sensor/bme280/boards/adafruit_feather_esp32s2.overlay
new file mode 100644
index 0000000000000..7259b070ebb79
--- /dev/null
+++ b/samples/sensor/bme280/boards/adafruit_feather_esp32s2.overlay
@@ -0,0 +1,6 @@
+&i2c0 {
+	bme280: bme280@77 {
+		compatible = "bosch,bme280";
+		reg = <0x77>;
+	};
+};
diff --git a/samples/sensor/bme280/boards/adafruit_feather_esp32s2_tft.overlay b/samples/sensor/bme280/boards/adafruit_feather_esp32s2_tft.overlay
new file mode 100644
index 0000000000000..7259b070ebb79
--- /dev/null
+++ b/samples/sensor/bme280/boards/adafruit_feather_esp32s2_tft.overlay
@@ -0,0 +1,6 @@
+&i2c0 {
+	bme280: bme280@77 {
+		compatible = "bosch,bme280";
+		reg = <0x77>;
+	};
+};
diff --git a/samples/sensor/bme280/boards/adafruit_feather_esp32s2_tft_reverse.overlay b/samples/sensor/bme280/boards/adafruit_feather_esp32s2_tft_reverse.overlay
new file mode 100644
index 0000000000000..7259b070ebb79
--- /dev/null
+++ b/samples/sensor/bme280/boards/adafruit_feather_esp32s2_tft_reverse.overlay
@@ -0,0 +1,6 @@
+&i2c0 {
+	bme280: bme280@77 {
+		compatible = "bosch,bme280";
+		reg = <0x77>;
+	};
+};
diff --git a/samples/sensor/bme280/sample.yaml b/samples/sensor/bme280/sample.yaml
index 2e84cd1af03e7..94b7ebf4afacb 100644
--- a/samples/sensor/bme280/sample.yaml
+++ b/samples/sensor/bme280/sample.yaml
@@ -1,9 +1,13 @@
 sample:
   name: BME280 Sensor sample
+common:
+  filter: dt_compat_enabled("bosch,bme280")
+  tags:
+    - sensors
+    - bme280
 tests:
   sample.sensor.bme280:
     harness: console
-    tags: sensors
     platform_allow:
       - adafruit_feather_m0_basic_proto
       - rpi_pico
@@ -16,11 +20,11 @@ tests:
       fixture: fixture_i2c_bme280
   sample.sensor.bme280.spi:
     harness: console
-    tags: sensors
+    platform_allow:
+      - lpcxpresso55s16
     depends_on:
       - spi
-      - bme280
-    extra_args: "DTC_OVERLAY_FILE=arduino_spi.overlay"
+    extra_args: "SHIELD=mikroe_weather_click_spi"
     harness_config:
       type: one_line
       regex:
@@ -28,7 +32,6 @@ tests:
       fixture: fixture_spi_bme280
   sample.sensor.bme280.rpi_pico.pio:
     harness: console
-    tags: sensors
     platform_allow: rpi_pico
     integration_platforms:
       - rpi_pico
diff --git a/samples/sensor/bmg160/README.rst b/samples/sensor/bmg160/README.rst
new file mode 100644
index 0000000000000..a46995a68fd60
--- /dev/null
+++ b/samples/sensor/bmg160/README.rst
@@ -0,0 +1,61 @@
+.. zephyr:code-sample:: bmg160
+   :name: BMG160 3-axis gyroscope
+   :relevant-api: sensor_interface
+
+   Get temperature, and angular velocity data from a BMG160 sensor.
+
+Overview
+********
+
+This sample shows how to use the Zephyr :ref:`sensor` API driver for the
+`Bosch BMG160`_ environmental sensor.
+
+.. _Bosch BMG160:
+   https://web.archive.org/web/20181111220522/https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMG160-DS000-09.pdf
+
+The sample first runs in polling mode for 15 seconds, then in trigger mode, display the temperature and angular velocity data from the BMG160 sensor.
+
+Building and Running
+********************
+
+The sample can be configured to support BMG160 sensors connected via I2C. Configuration is done via :ref:`devicetree <dt-guide>`. The devicetree
+must have an enabled node with ``compatible = "bosch,bmg160";``. See
+:dtcompatible:`bosch,bmg160` for the devicetree binding and see below for
+examples and common configurations.
+
+If the sensor is not built into your board, start by wiring the sensor pins
+according to the connection diagram given in the `BMG160 datasheet`_ at
+page 78.
+
+.. _BMG160 datasheet:
+   https://www.mouser.com/datasheet/2/783/BST-BMG160-DS000-1509613.pdf
+
+Sample Output
+=============
+
+The sample prints output to the serial console. BMG160 device driver messages
+are also logged. Refer to your board's documentation for information on
+connecting to its serial console.
+
+Here is example output for the default application settings, assuming that only
+one BMG160 sensor is connected to the standard Arduino I2C pins:
+
+.. code-block:: none
+
+   *** Booting Zephyr OS v3.7.0 ***
+   Testing the polling mode.
+   Gyro (rad/s): X=3.6, Y=14.0, Z=0.0f,
+   Temperature (Celsius): 29.4
+   Gyro (rad/s): X=5.1, Y=-9.0, Z=0.0f,
+   Temperature (Celsius): 29.5
+   ...
+   Polling mode test finished.
+   Testing the trigger mode.
+   Gyro: Testing anymotion trigger.
+   Gyro: rotate the device and wait for events.
+   Gyro (rad/s): X=13.6, Y=14.0, Z=10.0f,
+   Gyro: Anymotion trigger test finished.
+   Gyro: Testing data ready trigger.
+   Gyro (rad/s): X=3.6, Y=5.4, Z=1.1f,
+   Gyro: Data ready trigger test finished.
+   Trigger mode test finished
diff --git a/samples/sensor/bmi270/README.rst b/samples/sensor/bmi270/README.rst
index e7985c4d54722..798de78968f4d 100644
--- a/samples/sensor/bmi270/README.rst
+++ b/samples/sensor/bmi270/README.rst
@@ -30,7 +30,7 @@ Building and Running
 This project outputs sensor data to the console. It requires a BMI270
 sensor. It should work with any platform featuring a I2C peripheral interface.
 It does not work on QEMU.
-In this example below the :ref:`nrf52840dk_nrf52840` board is used.
+In this example below the :zephyr:board:`nrf52840dk` board is used.
 
 
 .. zephyr-app-commands::
diff --git a/samples/sensor/clock/README.rst b/samples/sensor/clock/README.rst
index b213e787beb82..551cf681b0260 100644
--- a/samples/sensor/clock/README.rst
+++ b/samples/sensor/clock/README.rst
@@ -13,7 +13,7 @@ and utilize the Sensor Clock API.
 Building and Running
 ********************
 
-The sample below uses the :ref:`nrf52840dk_nrf52840` and :ref:`nrf52833dk_nrf52833` boards.
+The sample below uses the :zephyr:board:`nrf52840dk` and :zephyr:board:`nrf52833dk` boards.
 
 To run this sample, ensure the following configurations:
 
diff --git a/samples/sensor/clock/sample.yaml b/samples/sensor/clock/sample.yaml
index 08ee185c212c2..0f4b1e05c79f3 100644
--- a/samples/sensor/clock/sample.yaml
+++ b/samples/sensor/clock/sample.yaml
@@ -3,6 +3,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+common:
+  harness: console
+  harness_config:
+    type: multi_line
+    ordered: false
+    regex:
+      - "Cycles:.*"
+      - "Nanoseconds:.*"
+
 tests:
   sample.sensor.clock.counter:
     filter: CONFIG_SENSOR_CLOCK_COUNTER
diff --git a/samples/sensor/co2_polling/sample.yaml b/samples/sensor/co2_polling/sample.yaml
index 2bba3191fa20b..b7f6019aed972 100644
--- a/samples/sensor/co2_polling/sample.yaml
+++ b/samples/sensor/co2_polling/sample.yaml
@@ -5,6 +5,5 @@ tests:
     harness: sensor
     tags: sensors
     filter: dt_alias_exists("co2")
-    depends_on:
-      - serial
-      - uart_interrupt_driven
+    integration_platforms:
+      - nucleo_h563zi
diff --git a/samples/sensor/die_temp_polling/boards/esp32c6_devkitc_hpcore.overlay b/samples/sensor/die_temp_polling/boards/esp32c6_devkitc_hpcore.overlay
new file mode 100644
index 0000000000000..cd60462728c59
--- /dev/null
+++ b/samples/sensor/die_temp_polling/boards/esp32c6_devkitc_hpcore.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Patrick Harböck
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Application overlay for enabling temperature sensor device instance
+ */
+
+&coretemp {
+	status = "okay";
+};
diff --git a/samples/sensor/die_temp_polling/boards/mimxrt1050_evk.conf b/samples/sensor/die_temp_polling/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
similarity index 100%
rename from samples/sensor/die_temp_polling/boards/mimxrt1050_evk.conf
rename to samples/sensor/die_temp_polling/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
diff --git a/samples/sensor/die_temp_polling/boards/mimxrt1064_evk.overlay b/samples/sensor/die_temp_polling/boards/mimxrt1064_evk.overlay
new file mode 100644
index 0000000000000..77b70f05777b4
--- /dev/null
+++ b/samples/sensor/die_temp_polling/boards/mimxrt1064_evk.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 SECO Mind Srl
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&tempmon {
+	status = "okay";
+};
diff --git a/samples/sensor/die_temp_polling/boards/pico_plus2_rp2350b_m33.conf b/samples/sensor/die_temp_polling/boards/pico_plus2_rp2350b_m33.conf
new file mode 100644
index 0000000000000..488a81dca5204
--- /dev/null
+++ b/samples/sensor/die_temp_polling/boards/pico_plus2_rp2350b_m33.conf
@@ -0,0 +1 @@
+CONFIG_ADC=y
diff --git a/samples/sensor/die_temp_polling/boards/pico_plus2_rp2350b_m33.overlay b/samples/sensor/die_temp_polling/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..38f5ece1c98a1
--- /dev/null
+++ b/samples/sensor/die_temp_polling/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,9 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 TOKITA Hiroshi
+ */
+
+&die_temp {
+	status = "okay";
+};
diff --git a/samples/sensor/grove_light/CMakeLists.txt b/samples/sensor/grove_light/CMakeLists.txt
deleted file mode 100644
index 7c0b23d07789d..0000000000000
--- a/samples/sensor/grove_light/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(grove_light)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/samples/sensor/grove_light/README.rst b/samples/sensor/grove_light/README.rst
deleted file mode 100644
index 696235ab9024b..0000000000000
--- a/samples/sensor/grove_light/README.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-.. zephyr:code-sample:: grove_light
-   :name: Grove Light Sensor
-   :relevant-api: sensor_interface
-
-   Get illuminance data from a Grove Light Sensor.
-
-Overview
-********
-
-This sample application gets the output of the grove light sensor and prints it to the console, in
-units of lux, once every second.
-
-Requirements
-************
-
-To use this sample, the following hardware is required:
-
-* A board with ADC support
-* `Grove Light Sensor`_
-* `Grove Base Shield`_
-
-Wiring
-******
-
-The easiest way to connect the sensor is to connect it to a Grove shield on a board that supports
-Arduino shields. Provide a devicetree overlay that specifies the sensor location. If using the
-overlay provided for the sample, the sensor should be connected to A0 on the Grove shield.
-
-Building and Running
-********************
-
-Build and flash the sample as follows, changing ``nrf52dk_nrf52832`` to your board:
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/sensor/grove_light
-   :board: nrf52dk_nrf52832
-   :goals: build flash
-   :compact:
-
-Sample Output
-=============
-
-.. code-block:: console
-
-    *** Booting Zephyr OS build v3.6.0-rc1-32-gba639ed6a893 ***
-    lux: 0.945751
-    lux: 0.882292
-    lux: 0.755973
-
-.. _Grove Base Shield: https://wiki.seeedstudio.com/Base_Shield_V2/
-.. _Grove Light Sensor: https://wiki.seeedstudio.com/Grove-Light_Sensor/
diff --git a/samples/sensor/grove_light/boards/nrf52dk_nrf52832.overlay b/samples/sensor/grove_light/boards/nrf52dk_nrf52832.overlay
deleted file mode 100644
index 5556e2ce0540b..0000000000000
--- a/samples/sensor/grove_light/boards/nrf52dk_nrf52832.overlay
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2019 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	ntc {
-		compatible = "seeed,grove-light";
-		io-channels = <&arduino_adc 0>;
-	};
-};
diff --git a/samples/sensor/grove_light/sample.yaml b/samples/sensor/grove_light/sample.yaml
deleted file mode 100644
index 24e020f7fb505..0000000000000
--- a/samples/sensor/grove_light/sample.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-common:
-  filter: CONFIG_FULL_LIBC_SUPPORTED
-sample:
-  name: Grove Light Sensor
-tests:
-  sample.sensor.grove_light:
-    tags:
-      - drivers
-      - sensor
-      - grove
-      - light
-    platform_allow: nrf52dk/nrf52832
-    integration_platforms:
-      - nrf52dk/nrf52832
-    harness: grove
-    depends_on: adc
diff --git a/samples/sensor/grove_light/src/main.c b/samples/sensor/grove_light/src/main.c
deleted file mode 100644
index 57de0ea99674c..0000000000000
--- a/samples/sensor/grove_light/src/main.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2016 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/init.h>
-#include <stdio.h>
-#include <zephyr/drivers/sensor.h>
-
-#define SLEEP_TIME	K_MSEC(1000)
-
-int main(void)
-{
-	const struct device *const dev = DEVICE_DT_GET_ONE(seeed_grove_light);
-
-	if (!device_is_ready(dev)) {
-		printk("sensor: device not ready.\n");
-		return 0;
-	}
-
-	while (1) {
-		int read;
-		struct sensor_value lux;
-
-		read = sensor_sample_fetch(dev);
-		if (read) {
-			printf("sample fetch error %d\n", read);
-			continue;
-		}
-
-		sensor_channel_get(dev, SENSOR_CHAN_LIGHT, &lux);
-
-		printf("lux: %f\n", sensor_value_to_double(&lux));
-
-		k_sleep(SLEEP_TIME);
-	}
-	return 0;
-}
diff --git a/samples/sensor/light_polling/CMakeLists.txt b/samples/sensor/light_polling/CMakeLists.txt
new file mode 100644
index 0000000000000..78c0ee9c7de6e
--- /dev/null
+++ b/samples/sensor/light_polling/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(light)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/sensor/light_polling/README.rst b/samples/sensor/light_polling/README.rst
new file mode 100644
index 0000000000000..183180e9624ba
--- /dev/null
+++ b/samples/sensor/light_polling/README.rst
@@ -0,0 +1,48 @@
+.. zephyr:code-sample:: light_sensor_polling
+   :name: Generic Light Sensor Polling
+   :relevant-api: sensor_interface
+
+   Get illuminance data from a light sensor.
+
+Overview
+********
+
+This sample application gets the output of the light sensor and prints it to the console, in
+units of lux, once every second.
+
+Requirements
+************
+
+To use this sample, the following hardware is required:
+
+* A board with ADC support
+* A supported light sensor (e.g., `Grove Light Sensor`_), available as ``light-sensor`` Devicetree alias.
+
+Wiring
+******
+
+The wiring depends on the specific light sensor and board being used. Provide a devicetree
+overlay that specifies the sensor configuration for your setup.
+
+Building and Running
+********************
+
+Build and flash the sample as follows, changing ``nrf52dk_nrf52832`` to your board:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/sensor/light_polling
+   :board: nrf52dk_nrf52832
+   :goals: build flash
+   :compact:
+
+Sample Output
+=============
+
+.. code-block:: console
+
+    *** Booting Zephyr OS build v3.6.0-rc1-32-gba639ed6a893 ***
+    lux: 0.945751
+    lux: 0.882292
+    lux: 0.755973
+
+.. _Grove Light Sensor: https://wiki.seeedstudio.com/Grove-Light_Sensor/
diff --git a/samples/sensor/light_polling/boards/frdm_mcxw71.overlay b/samples/sensor/light_polling/boards/frdm_mcxw71.overlay
new file mode 100644
index 0000000000000..25d7461675bf9
--- /dev/null
+++ b/samples/sensor/light_polling/boards/frdm_mcxw71.overlay
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 Dipak Shetty <shetty.dipak@gmx.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/adc/adc.h>
+#include <zephyr/dt-bindings/adc/mcux-lpadc.h>
+
+/ {
+	aliases {
+		light-sensor = &als_pt19_315c;
+	};
+
+	als_pt19_315c: als-pt19-315c {
+		compatible = "everlight,als-pt19";
+		io-channels = <&adc0 2>;
+		load-resistor = <15000>;
+	};
+};
+
+&adc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@2 {
+		reg = <0x2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,vref-mv = <3300>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <MCUX_LPADC_CH2B>;
+	};
+};
diff --git a/samples/sensor/light_polling/boards/nrf52dk_nrf52832.overlay b/samples/sensor/light_polling/boards/nrf52dk_nrf52832.overlay
new file mode 100644
index 0000000000000..c61fcd45593ca
--- /dev/null
+++ b/samples/sensor/light_polling/boards/nrf52dk_nrf52832.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+
+	aliases {
+		light-sensor = &grove_light;
+	};
+
+	grove_light: grove_light {
+		compatible = "seeed,grove-light";
+		io-channels = <&arduino_adc 0>;
+	};
+};
diff --git a/samples/sensor/grove_light/prj.conf b/samples/sensor/light_polling/prj.conf
similarity index 100%
rename from samples/sensor/grove_light/prj.conf
rename to samples/sensor/light_polling/prj.conf
diff --git a/samples/sensor/light_polling/sample.yaml b/samples/sensor/light_polling/sample.yaml
new file mode 100644
index 0000000000000..ddfecfd0feb4e
--- /dev/null
+++ b/samples/sensor/light_polling/sample.yaml
@@ -0,0 +1,28 @@
+sample:
+  name: Light Sensor Polling Sample
+common:
+  filter: dt_alias_exists("light-sensor")
+tests:
+  sample.sensor.light_polling.grove:
+    tags:
+      - drivers
+      - sensor
+      - grove
+      - light
+    platform_allow:
+      - nrf52dk/nrf52832
+    integration_platforms:
+      - nrf52dk/nrf52832
+    harness: grove
+    depends_on: adc
+  sample.sensor.light_polling.als_pt19:
+    tags:
+      - drivers
+      - sensor
+      - light
+    platform_allow:
+      - frdm_mcxw71/mcxw716c
+    integration_platforms:
+      - frdm_mcxw71/mcxw716c
+    depends_on:
+      - adc
diff --git a/samples/sensor/light_polling/src/main.c b/samples/sensor/light_polling/src/main.c
new file mode 100644
index 0000000000000..b598c9a2f4c4f
--- /dev/null
+++ b/samples/sensor/light_polling/src/main.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <stdio.h>
+#include <zephyr/drivers/sensor.h>
+
+#define SLEEP_TIME K_MSEC(1000)
+
+int main(void)
+{
+	const struct device *const dev = DEVICE_DT_GET(DT_ALIAS(light_sensor));
+
+	if (!device_is_ready(dev)) {
+		printk("sensor: device not ready.\n");
+		return 0;
+	}
+
+	while (1) {
+		int read;
+		struct sensor_value lux;
+
+		read = sensor_sample_fetch(dev);
+		if (read) {
+			printf("sample fetch error %d\n", read);
+			continue;
+		}
+
+		sensor_channel_get(dev, SENSOR_CHAN_LIGHT, &lux);
+
+		printf("lux: %f\n", sensor_value_to_double(&lux));
+
+		k_sleep(SLEEP_TIME);
+	}
+	return 0;
+}
diff --git a/samples/sensor/lis2dh/README.rst b/samples/sensor/lis2dh/README.rst
index 0b635de1c47ee..274277e1e8f9d 100644
--- a/samples/sensor/lis2dh/README.rst
+++ b/samples/sensor/lis2dh/README.rst
@@ -30,7 +30,7 @@ The LIS2DH2 or compatible sensors are available on a variety of boards
 and shields supported by Zephyr, including:
 
 * :zephyr:board:`actinius_icarus`
-* :ref:`thingy52_nrf52832`
+* :zephyr:board:`thingy52`
 * :zephyr:board:`stm32f3_disco`
 * :ref:`x-nucleo-iks01a2`
 
diff --git a/samples/sensor/lis2dh/sample.yaml b/samples/sensor/lis2dh/sample.yaml
index 8054b378686cd..27296cf1e533d 100644
--- a/samples/sensor/lis2dh/sample.yaml
+++ b/samples/sensor/lis2dh/sample.yaml
@@ -2,10 +2,12 @@ sample:
   name: LIS2DH Accelerometer Monitor
 tests:
   sample.sensor.lis2dh:
+    filter: dt_compat_enabled("st,lis2dh")
     harness: sensor
     tags:
       - samples
       - sensor
     depends_on:
       - i2c
-      - lis2dh
+    integration_platforms:
+      - sparkfun_thing_plus/nrf9160
diff --git a/samples/sensor/magn_trig/boards/mimxrt1050_evk.conf b/samples/sensor/magn_trig/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
similarity index 100%
rename from samples/sensor/magn_trig/boards/mimxrt1050_evk.conf
rename to samples/sensor/magn_trig/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
diff --git a/samples/sensor/mpr/README.rst b/samples/sensor/mpr/README.rst
index b1f8d8ff0e742..4813b8d111619 100644
--- a/samples/sensor/mpr/README.rst
+++ b/samples/sensor/mpr/README.rst
@@ -27,7 +27,7 @@ Building and Running
 This project outputs sensor data to the console. It requires a sensor from the
 MPR series.
 It does not work on QEMU.
-In the sample below the :ref:`arduino_due` board is used.
+In the sample below the :zephyr:board:`arduino_due` board is used.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/sensor/mpr
diff --git a/samples/sensor/mpu6050/README.rst b/samples/sensor/mpu6050/README.rst
index d128746147603..189bd24f7354f 100644
--- a/samples/sensor/mpu6050/README.rst
+++ b/samples/sensor/mpu6050/README.rst
@@ -12,8 +12,8 @@ This sample application periodically (0.5 Hz) measures the sensor
 temperature, acceleration, and angular velocity, displaying the values
 on the console along with a timestamp since startup.
 
-When triggered mode is enabled the measurements are displayed at the
-rate they are produced by the sensor.
+When triggered mode is enabled the measurements are displayed at a rate
+of 32Hz governed by the sensor's internal clock and divider.
 
 Wiring
 *******
diff --git a/samples/sensor/mpu6050/boards/nrf52dk_nrf52832.overlay b/samples/sensor/mpu6050/boards/nrf52dk_nrf52832.overlay
index 77bcfef9825ee..d328de20ba607 100644
--- a/samples/sensor/mpu6050/boards/nrf52dk_nrf52832.overlay
+++ b/samples/sensor/mpu6050/boards/nrf52dk_nrf52832.overlay
@@ -10,5 +10,6 @@
 		reg = <0x68>;
 		status = "okay";
 		int-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+		smplrt-div = <249>;
 	};
 };
diff --git a/samples/sensor/ms5837/README.rst b/samples/sensor/ms5837/README.rst
index 6bc90fa531223..d05ee011640e5 100644
--- a/samples/sensor/ms5837/README.rst
+++ b/samples/sensor/ms5837/README.rst
@@ -42,7 +42,7 @@ Build this sample using the following commands:
    :goals: build
    :compact:
 
-See :ref:`nrf52840dk_nrf52840` on how to flash the build.
+See :zephyr:board:`nrf52840dk` on how to flash the build.
 
 References
 **********
diff --git a/samples/sensor/ms5837/boards/nrf52840dk_nrf52840.overlay b/samples/sensor/ms5837/boards/nrf52840dk_nrf52840.overlay
index 7b5e801a828fc..39dcb323ccd1d 100644
--- a/samples/sensor/ms5837/boards/nrf52840dk_nrf52840.overlay
+++ b/samples/sensor/ms5837/boards/nrf52840dk_nrf52840.overlay
@@ -8,7 +8,8 @@
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_STANDARD>;
 	ms5837@76 {
-		compatible = "meas,ms5837";
+		compatible = "meas,ms5837-30ba";
 		reg = <0x76>;
+		status = "okay";
 	};
 };
diff --git a/samples/sensor/pressure_interrupt/CMakeLists.txt b/samples/sensor/pressure_interrupt/CMakeLists.txt
new file mode 100644
index 0000000000000..09ca28e4cb172
--- /dev/null
+++ b/samples/sensor/pressure_interrupt/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 TDK Invensense
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(icp201xx)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/sensor/pressure_interrupt/Kconfig b/samples/sensor/pressure_interrupt/Kconfig
new file mode 100644
index 0000000000000..b5062e52ff293
--- /dev/null
+++ b/samples/sensor/pressure_interrupt/Kconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2024, TDK Invensense
+# SPDX-License-Identifier: Apache-2.0
+
+config LOG
+	default y
+
+config LOG_PRINTK
+	default y
+
+config SENSOR_LOG_LEVEL
+	default 4
+
+config PRESSURE_DRDY
+	bool "Enable pressure data ready interrupt"
+	default y
+
+config PRESSURE_THRESHOLD
+	bool "Enable pressure threshold interrupt"
+	default y
+
+config PRESSURE_DELTA
+	bool "Enable pressure delta interrupt"
+	default y
+
+choice ICP201XX_TRIGGER_MODE
+	default ICP201XX_TRIGGER_GLOBAL_THREAD
+	depends on ICP201XX
+
+endchoice
+
+source "Kconfig.zephyr"
diff --git a/samples/sensor/pressure_interrupt/README.rst b/samples/sensor/pressure_interrupt/README.rst
new file mode 100644
index 0000000000000..d59dce60fbd14
--- /dev/null
+++ b/samples/sensor/pressure_interrupt/README.rst
@@ -0,0 +1,73 @@
+.. zephyr:code-sample:: pressure_interrupt
+   :name: Barometric pressure and temperature sensor interrupt example
+   :relevant-api: sensor_interface
+
+   Manage interrupts from a barometric pressure and temperature sensor.
+
+Overview
+********
+
+This sample application uses a pressure sensor interrupt line to:
+
+* Inform when a measure is available in the sensor FIFO.
+  Temperature and pressure data are read and displayed in terminal.
+  If floats are supported, estimated altitude is also displayed.
+* Inform when the pressure value crosses a specified threshold.
+  Threshold corresponds to around a 50cm altitude increase.
+  A message is displayed in the terminal.
+* Inform when the pressure value changed more than the specified
+  value between two consecutive samples.
+  Change value corresponds to a finger pressing the sensor.
+  A message is displayed in the terminal.
+
+Wiring
+*******
+
+This sample uses an external breakout for the sensor.  A devicetree
+overlay must be provided to identify the I2C/SPI bus and GPIO used to
+control the sensor.
+
+Building and Running
+********************
+
+This sample supports pressure sensor devices. Device needs
+to be aliased as ``pressure-sensor``. For example:
+
+.. code-block:: devicetree
+
+	/ {
+		aliases {
+			pressure-sensor = &icp201xx;
+		};
+	};
+
+Make sure the aliases are in devicetree, then build and run with:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/sensor/pressure_interrupt
+   :board: nrf52dk/nrf52832
+   :goals: build flash
+
+Sample Output
+=============
+
+.. code-block:: console
+
+## Default configuration
+
+   [00:00:00.266,479] <inf> PRESS_INT_SAMPLE: Starting ICP201xx sample.
+   [00:00:00.273,803] <inf> PRESS_INT_SAMPLE: temp 25.49 Cel, pressure 96.271438 kPa, altitude 447.208465 m
+   [00:00:00.280,914] <inf> PRESS_INT_SAMPLE: temp 25.50 Cel, pressure 96.271331 kPa, altitude 447.234161 m
+   [00:00:00.288,024] <inf> PRESS_INT_SAMPLE: temp 25.49 Cel, pressure 96.266685 kPa, altitude 447.636077 m
+   [00:00:00.295,135] <inf> PRESS_INT_SAMPLE: temp 25.50 Cel, pressure 96.267951 kPa, altitude 447.537078 m
+   [00:00:00.302,246] <inf> PRESS_INT_SAMPLE: temp 25.51 Cel, pressure 96.268577 kPa, altitude 447.488281 m
+   [00:00:00.309,356] <inf> PRESS_INT_SAMPLE: temp 25.50 Cel, pressure 96.269340 kPa, altitude 447.414978 m
+   [00:00:00.316,467] <inf> PRESS_INT_SAMPLE: temp 25.50 Cel, pressure 96.268562 kPa, altitude 447.473663 m
+   [00:00:00.323,547] <inf> PRESS_INT_SAMPLE: temp 25.50 Cel, pressure 96.267341 kPa, altitude 447.596496 m
+   <repeats endlessly>
+
+   <when sensor is pressed>
+   [00:00:09.819,061] <inf> PRESS_INT_SAMPLE: PRESSURE CHANGE INTERRUPT
+
+   <when the sensor pressure crosses defined threhold>
+   [00:00:09.859,039] <inf> PRESS_INT_SAMPLE: PRESSURE THRESHOLD INTERRUPT
diff --git a/samples/sensor/pressure_interrupt/boards/nrf52dk_nrf52832.overlay b/samples/sensor/pressure_interrupt/boards/nrf52dk_nrf52832.overlay
new file mode 100644
index 0000000000000..ad26418fd22b0
--- /dev/null
+++ b/samples/sensor/pressure_interrupt/boards/nrf52dk_nrf52832.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024, TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Get a node identifier for pressure sensor.
+ */
+/ {
+	aliases {
+		pressure-sensor = &icp201xx;
+	};
+};
+
+/* Example configuration of a ICP2021XX device on an Arduino SPI bus. */
+&arduino_spi {
+	status = "okay";
+	cs-gpios = <&arduino_header 14 GPIO_ACTIVE_LOW>; /* D8 */
+	icp201xx: icp201xx@0 {
+		compatible = "invensense,icp201xx";
+		reg = <0>;
+		spi-max-frequency = <500000>; /* conservatively set to 500k */
+		int-gpios = <&arduino_header 8 GPIO_ACTIVE_HIGH>; /* D2 */
+		drive-strength = "current_4mA_1_8V"; /* Avoid cross talk */
+	};
+};
+
+/*
+ * Increase native UART speed.
+ */
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	status = "okay";
+	current-speed = <1000000>;
+};
diff --git a/samples/sensor/pressure_interrupt/prj.conf b/samples/sensor/pressure_interrupt/prj.conf
new file mode 100644
index 0000000000000..bea79e439ebc9
--- /dev/null
+++ b/samples/sensor/pressure_interrupt/prj.conf
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2024 TDK Invensense
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SENSOR=y
+
+# Floating point format support
+# Selecting this increases stack size requirements slightly, but increases code size significantly.
+CONFIG_CBPRINTF_FP_SUPPORT=y
+
+# Buffer size for console. The defaults are optimized to save RAM
+CONFIG_CONSOLE_SUBSYS=y
+CONFIG_CONSOLE_GETCHAR=y
+CONFIG_CONSOLE_GETCHAR_BUFSIZE=16
+CONFIG_CONSOLE_PUTCHAR_BUFSIZE=512
diff --git a/samples/sensor/pressure_interrupt/sample.yaml b/samples/sensor/pressure_interrupt/sample.yaml
new file mode 100644
index 0000000000000..e170db1509a39
--- /dev/null
+++ b/samples/sensor/pressure_interrupt/sample.yaml
@@ -0,0 +1,9 @@
+sample:
+  name: Pressure sensor interrupt
+tests:
+  sample.sensor.pressure_interrupt:
+    build_only: true
+    tags: sensors
+    filter: dt_alias_exists("pressure-sensor")
+    integration_platforms:
+      - nrf52dk/nrf52832
diff --git a/samples/sensor/pressure_interrupt/src/main.c b/samples/sensor/pressure_interrupt/src/main.c
new file mode 100644
index 0000000000000..6c55e6d1840f7
--- /dev/null
+++ b/samples/sensor/pressure_interrupt/src/main.c
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2024 TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/sensor.h>
+#include <stdio.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(PRESS_INT_SAMPLE, CONFIG_SENSOR_LOG_LEVEL);
+
+/*
+ * Get a device structure from a devicetree node from alias
+ * "pressure_sensor".
+ */
+static const struct device *get_pressure_sensor_device(void)
+{
+	const struct device *const dev = DEVICE_DT_GET(DT_ALIAS(pressure_sensor));
+
+	if (!device_is_ready(dev)) {
+		printk("\nError: Device \"%s\" is not ready; "
+		       "check the driver initialization logs for errors.\n",
+		       dev->name);
+		return NULL;
+	}
+
+	printk("Found device \"%s\", getting sensor data\n", dev->name);
+	return dev;
+}
+
+#ifdef CONFIG_PRESSURE_DRDY
+static void data_ready_handler(const struct device *dev, const struct sensor_trigger *trig)
+{
+
+	if (trig->type == SENSOR_TRIG_DATA_READY) {
+		int rc = sensor_sample_fetch_chan(dev, trig->chan);
+
+		if (rc < 0) {
+			printf("sample fetch failed: %d\n", rc);
+			printf("cancelling trigger\n");
+			(void)sensor_trigger_set(dev, trig, NULL);
+			return;
+		} else if (rc == 0) {
+
+			struct sensor_value pressure;
+			struct sensor_value temperature;
+			struct sensor_value altitude;
+
+			sensor_channel_get(dev, SENSOR_CHAN_PRESS, &pressure);
+			sensor_channel_get(dev, SENSOR_CHAN_AMBIENT_TEMP, &temperature);
+			sensor_channel_get(dev, SENSOR_CHAN_ALTITUDE, &altitude);
+
+			LOG_INF("temp %.2f Cel, pressure %f kPa, altitude %f m",
+				sensor_value_to_double(&temperature),
+				sensor_value_to_double(&pressure),
+				sensor_value_to_double(&altitude));
+		}
+	}
+}
+#endif
+
+#ifdef CONFIG_PRESSURE_THRESHOLD
+static void threshold_handler(const struct device *dev, const struct sensor_trigger *trig)
+{
+	if (trig->type == SENSOR_TRIG_THRESHOLD) {
+		LOG_INF("PRESSURE THRESHOLD INTERRUPT");
+	}
+}
+#endif
+
+#ifdef CONFIG_PRESSURE_DELTA
+static void delta_handler(const struct device *dev, const struct sensor_trigger *trig)
+{
+	if (trig->type == SENSOR_TRIG_DELTA) {
+		LOG_INF("PRESSURE CHANGE INTERRUPT\n");
+	}
+}
+#endif
+
+int main(void)
+{
+	static struct sensor_trigger data_ready_trigger;
+	const struct device *dev = get_pressure_sensor_device();
+#ifdef CONFIG_PRESSURE_THRESHOLD
+	static struct sensor_trigger threshold_trigger;
+	struct sensor_value pressure, pressure_threshold;
+#endif
+#ifdef CONFIG_PRESSURE_DELTA
+	static struct sensor_trigger delta_trigger;
+	struct sensor_value pressure_delta;
+#endif
+
+	if (dev == NULL) {
+		return 0;
+	}
+#ifdef CONFIG_PRESSURE_DRDY
+	/* Configure data ready trigger */
+	data_ready_trigger = (struct sensor_trigger){
+		.type = SENSOR_TRIG_DATA_READY,
+		.chan = SENSOR_CHAN_ALL,
+	};
+	if (sensor_trigger_set(dev, &data_ready_trigger, data_ready_handler) < 0) {
+		printf("Cannot configure data trigger!!!\n");
+		return 0;
+	}
+#endif
+
+#ifdef CONFIG_PRESSURE_THRESHOLD
+	/* Configure pressure threshold trigger */
+	/* Interrupt is triggered if sensor is lifted of about 50cm */
+	/* Read current pressure */
+	k_sleep(K_MSEC(50));
+	sensor_sample_fetch_chan(dev, SENSOR_CHAN_PRESS);
+	sensor_channel_get(dev, SENSOR_CHAN_PRESS, &pressure);
+
+	/* Retrieve 5 Pa, around 50cm altitude increase */
+	pressure_threshold.val1 = pressure.val1;
+	pressure_threshold.val2 = pressure.val2 - 5000;
+	sensor_attr_set(dev, SENSOR_CHAN_PRESS, SENSOR_ATTR_LOWER_THRESH, &pressure_threshold);
+
+	LOG_INF("Pressure at reset %.3f kPa, interrupt sets at %.3f kPa.\n",
+		sensor_value_to_double(&pressure), sensor_value_to_double(&pressure_threshold));
+
+	threshold_trigger = (struct sensor_trigger){
+		.type = SENSOR_TRIG_THRESHOLD,
+		.chan = SENSOR_CHAN_PRESS,
+	};
+	if (sensor_trigger_set(dev, &threshold_trigger, threshold_handler) < 0) {
+		printf("Cannot configure threshold trigger!!!\n");
+		return 0;
+	}
+#endif
+
+#ifdef CONFIG_PRESSURE_DELTA
+	/* Configure pressure delta trigger */
+	/* Set pressure delta to 0.01 kPa to detect a press on the sensor */
+	pressure_delta.val1 = 0;
+	pressure_delta.val2 = 10000;
+	sensor_attr_set(dev, SENSOR_CHAN_PRESS, SENSOR_ATTR_SLOPE_TH, &pressure_delta);
+	delta_trigger = (struct sensor_trigger){
+		.type = SENSOR_TRIG_DELTA,
+		.chan = SENSOR_CHAN_PRESS,
+	};
+	if (sensor_trigger_set(dev, &delta_trigger, delta_handler) < 0) {
+		printf("Cannot configure threshold trigger!!!\n");
+		return 0;
+	}
+#endif
+
+	LOG_INF("Starting pressure event sample.\n");
+
+	return 0;
+}
diff --git a/samples/sensor/pressure_polling/CMakeLists.txt b/samples/sensor/pressure_polling/CMakeLists.txt
new file mode 100644
index 0000000000000..b7dbb9dc728fb
--- /dev/null
+++ b/samples/sensor/pressure_polling/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 TDK Invensense
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(pressure_polling)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/sensor/pressure_polling/Kconfig b/samples/sensor/pressure_polling/Kconfig
new file mode 100644
index 0000000000000..fc80e21146426
--- /dev/null
+++ b/samples/sensor/pressure_polling/Kconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2024, TDK Invensense
+# SPDX-License-Identifier: Apache-2.0
+
+config LOG
+	default y
+
+config LOG_PRINTK
+	default y
+
+config SENSOR_LOG_LEVEL
+	default 4
+
+source "Kconfig.zephyr"
diff --git a/samples/sensor/pressure_polling/README.rst b/samples/sensor/pressure_polling/README.rst
new file mode 100644
index 0000000000000..f224c4a534300
--- /dev/null
+++ b/samples/sensor/pressure_polling/README.rst
@@ -0,0 +1,60 @@
+.. zephyr:code-sample:: pressure_polling
+   :name: Barometric pressure and temperature sensor polling example
+   :relevant-api: sensor_interface
+
+   Get barometric pressure and temperature data from a sensor.
+
+Overview
+********
+
+This sample application periodically reads the sensor
+temperature and pressure, displaying the
+values on the console along with a timestamp since startup.
+It also displays the estimated altitude if floating point is supported.
+
+Wiring
+*******
+
+This sample uses an external breakout for the sensor.  A devicetree
+overlay must be provided to identify the I2C/SPI used to control the sensor.
+
+Building and Running
+********************
+
+This sample supports pressure sensor devices. Device needs
+to be aliased as ``pressure-sensor``. For example:
+
+.. code-block:: devicetree
+
+	/ {
+		aliases {
+			pressure-sensor = &icp201xx;
+		};
+	};
+
+Make sure the aliases are in devicetree, then build and run with:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/sensor/pressure_polling
+   :board: nrf52dk/nrf52832
+   :goals: build flash
+
+Sample Output
+=============
+
+.. code-block:: console
+
+## Default configuration
+
+   Found device "icp101xx@63", getting sensor data
+   [00:00:00.266,479] <inf> PRESSURE_POLLING: Starting pressure and altitude polling sample.
+   [00:00:00.273,803] <inf> PRESSURE_POLLING: temp 25.49 Cel, pressure 96.271438 kPa, altitude 447.208465 m
+   [00:00:00.280,914] <inf> PRESSURE_POLLING: temp 25.50 Cel, pressure 96.271331 kPa, altitude 447.234161 m
+   [00:00:00.288,024] <inf> PRESSURE_POLLING: temp 25.49 Cel, pressure 96.266685 kPa, altitude 447.636077 m
+   [00:00:00.295,135] <inf> PRESSURE_POLLING: temp 25.50 Cel, pressure 96.267951 kPa, altitude 447.537078 m
+   [00:00:00.302,246] <inf> PRESSURE_POLLING: temp 25.51 Cel, pressure 96.268577 kPa, altitude 447.488281 m
+   [00:00:00.309,356] <inf> PRESSURE_POLLING: temp 25.50 Cel, pressure 96.269340 kPa, altitude 447.414978 m
+   [00:00:00.316,467] <inf> PRESSURE_POLLING: temp 25.50 Cel, pressure 96.268562 kPa, altitude 447.473663 m
+   [00:00:00.323,547] <inf> PRESSURE_POLLING: temp 25.50 Cel, pressure 96.267341 kPa, altitude 447.596496 m
+
+   <repeats endlessly>
diff --git a/samples/sensor/pressure_polling/boards/nrf52dk_nrf52832.overlay b/samples/sensor/pressure_polling/boards/nrf52dk_nrf52832.overlay
new file mode 100644
index 0000000000000..5409e0c3a6e57
--- /dev/null
+++ b/samples/sensor/pressure_polling/boards/nrf52dk_nrf52832.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Get a node identifier for pressure sensor.
+ */
+/ {
+	aliases {
+		pressure-sensor = &icp201xx;
+	};
+};
+
+/*
+ * Example configuration of a icp201xx device on an Arduino I2C bus.
+ *
+ * Device address 0x63 is assumed. Your device may have a different
+ * address; check your device documentation if unsure.
+ */
+&arduino_i2c {
+	status = "okay";
+	icp201xx: icp201xx@63 {
+		compatible = "invensense,icp201xx";
+		reg = <0x63>;
+	};
+};
+
+/*
+ * Increase native UART speed to report sensor data.
+ */
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	status = "okay";
+	current-speed = <1000000>;
+};
diff --git a/samples/sensor/pressure_polling/prj.conf b/samples/sensor/pressure_polling/prj.conf
new file mode 100644
index 0000000000000..bea79e439ebc9
--- /dev/null
+++ b/samples/sensor/pressure_polling/prj.conf
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2024 TDK Invensense
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SENSOR=y
+
+# Floating point format support
+# Selecting this increases stack size requirements slightly, but increases code size significantly.
+CONFIG_CBPRINTF_FP_SUPPORT=y
+
+# Buffer size for console. The defaults are optimized to save RAM
+CONFIG_CONSOLE_SUBSYS=y
+CONFIG_CONSOLE_GETCHAR=y
+CONFIG_CONSOLE_GETCHAR_BUFSIZE=16
+CONFIG_CONSOLE_PUTCHAR_BUFSIZE=512
diff --git a/samples/sensor/pressure_polling/sample.yaml b/samples/sensor/pressure_polling/sample.yaml
new file mode 100644
index 0000000000000..1fae99115af9f
--- /dev/null
+++ b/samples/sensor/pressure_polling/sample.yaml
@@ -0,0 +1,9 @@
+sample:
+  name: Pressure polling sample
+tests:
+  sample.sensor.pressure_sensor:
+    build_only: true
+    tags: sensors
+    filter: dt_alias_exists("pressure-sensor")
+    integration_platforms:
+      - nrf52dk/nrf52832
diff --git a/samples/sensor/pressure_polling/src/main.c b/samples/sensor/pressure_polling/src/main.c
new file mode 100644
index 0000000000000..ea3af570db9c3
--- /dev/null
+++ b/samples/sensor/pressure_polling/src/main.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2024 TDK Invensense
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/sensor.h>
+#include <stdio.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(PRESSURE_POLLING, CONFIG_SENSOR_LOG_LEVEL);
+
+/*
+ * Get a device structure from a devicetree node from alias
+ * "pressure_sensor".
+ */
+static const struct device *get_pressure_sensor_device(void)
+{
+	const struct device *const dev = DEVICE_DT_GET(DT_ALIAS(pressure_sensor));
+
+	if (!device_is_ready(dev)) {
+		printk("\nError: Device \"%s\" is not ready; "
+		       "check the driver initialization logs for errors.\n",
+		       dev->name);
+		return NULL;
+	}
+
+	printk("Found device \"%s\", getting sensor data\n", dev->name);
+	return dev;
+}
+
+int main(void)
+{
+	const struct device *dev = get_pressure_sensor_device();
+
+	if (dev == NULL) {
+		return 0;
+	}
+	struct sensor_value pressure;
+	struct sensor_value temperature;
+	struct sensor_value altitude;
+
+	LOG_INF("Starting pressure and altitude polling sample.\n");
+
+	while (1) {
+		if (sensor_sample_fetch_chan(dev, SENSOR_CHAN_ALL) == 0) {
+			sensor_channel_get(dev, SENSOR_CHAN_PRESS, &pressure);
+			sensor_channel_get(dev, SENSOR_CHAN_AMBIENT_TEMP, &temperature);
+			sensor_channel_get(dev, SENSOR_CHAN_ALTITUDE, &altitude);
+
+			LOG_INF("temp %.2f Cel, pressure %f kPa, altitude %f m",
+				sensor_value_to_double(&temperature),
+				sensor_value_to_double(&pressure),
+				sensor_value_to_double(&altitude));
+		}
+	}
+	return 0;
+}
diff --git a/samples/sensor/qdec/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/sensor/qdec/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..58cf87f20b142
--- /dev/null
+++ b/samples/sensor/qdec/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		qdec0 = &qdec20;
+		qenca = &phase_a;
+		qencb = &phase_b;
+	};
+
+	encoder-emulate {
+		compatible = "gpio-leds";
+
+		phase_a: phase_a {
+			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+		};
+
+		phase_b: phase_b {
+			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&pinctrl {
+	qdec_pinctrl: qdec_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
+				<NRF_PSEL(QDEC_B, 1, 10)>;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&qdec20 {
+	status = "okay";
+	pinctrl-0 = <&qdec_pinctrl>;
+	pinctrl-names = "default";
+	steps = <120>;
+	led-pre = <500>;
+};
diff --git a/samples/sensor/qdec/sample.yaml b/samples/sensor/qdec/sample.yaml
index d4d685c43fbc1..0cb399b21fcdd 100644
--- a/samples/sensor/qdec/sample.yaml
+++ b/samples/sensor/qdec/sample.yaml
@@ -43,11 +43,13 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     harness_config:
       fixture: gpio_loopback
       type: multi_line
diff --git a/samples/sensor/sensor_shell/Kconfig b/samples/sensor/sensor_shell/Kconfig
index 38fcdfa7eb6eb..8d274a19032d6 100644
--- a/samples/sensor/sensor_shell/Kconfig
+++ b/samples/sensor/sensor_shell/Kconfig
@@ -3,6 +3,8 @@
 
 config SAMPLES_SENSOR_SHELL_FAKE_SENSOR
 	bool "Enable fake sensor"
+	default y
+	depends on DT_HAS_VND_FAKE_SENSOR_ENABLED
 	help
 	  On boards that do not have a sensor, enabling this will build a fake
 	  sensor that can be interacted with via the sensor shell.
diff --git a/samples/sensor/sensor_shell/README.rst b/samples/sensor/sensor_shell/README.rst
index 9853157d89ff4..65653741bc216 100644
--- a/samples/sensor/sensor_shell/README.rst
+++ b/samples/sensor/sensor_shell/README.rst
@@ -19,13 +19,14 @@ enabled, for example:
    :board: reel_board
    :goals: build flash
 
-For boards that do not have a sensor, a simple fake sensor driver is provided, for example:
+For boards that do not have a sensor, a simple fake sensor driver is provided and can enabled by
+adding the following overlay:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/sensor/sensor_shell
    :board: qemu_riscv64
    :goals: run
-   :gen-args: -DCONFIG_SAMPLES_SENSOR_SHELL_FAKE_SENSOR=y
+   :gen-args: -DEXTRA_DTC_OVERLAY_FILE=fake_sensor.overlay
 
 Shell Module Command Help
 =========================
diff --git a/samples/sensor/sensor_shell/dts/bindings/vnd,sensor.yaml b/samples/sensor/sensor_shell/dts/bindings/vnd,fake-sensor.yaml
similarity index 100%
rename from samples/sensor/sensor_shell/dts/bindings/vnd,sensor.yaml
rename to samples/sensor/sensor_shell/dts/bindings/vnd,fake-sensor.yaml
diff --git a/samples/sensor/sensor_shell/app.overlay b/samples/sensor/sensor_shell/fake_sensor.overlay
similarity index 100%
rename from samples/sensor/sensor_shell/app.overlay
rename to samples/sensor/sensor_shell/fake_sensor.overlay
diff --git a/samples/sensor/sensor_shell/sample.yaml b/samples/sensor/sensor_shell/sample.yaml
index a694f14058920..b8e98572dbdd8 100644
--- a/samples/sensor/sensor_shell/sample.yaml
+++ b/samples/sensor/sensor_shell/sample.yaml
@@ -21,7 +21,7 @@ tests:
     harness: pytest
     timeout: 180
     extra_configs:
-      - arch:posix:CONFIG_NATIVE_UART_0_ON_STDINOUT=y
-      - CONFIG_SAMPLES_SENSOR_SHELL_FAKE_SENSOR=y
+      - arch:posix:CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
+    extra_args: DTC_OVERLAY_FILE=fake_sensor.overlay
     integration_platforms:
       - native_sim
diff --git a/samples/sensor/stream_fifo/boards/sensortile_box_pro.conf b/samples/sensor/stream_fifo/boards/sensortile_box_pro.conf
new file mode 100644
index 0000000000000..c0b1e377b349d
--- /dev/null
+++ b/samples/sensor/stream_fifo/boards/sensortile_box_pro.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI_RTIO=y
+CONFIG_LSM6DSV16X_STREAM=y
+CONFIG_LSM6DSV16X_ENABLE_TEMP=y
diff --git a/samples/sensor/stream_fifo/boards/sensortile_box_pro.overlay b/samples/sensor/stream_fifo/boards/sensortile_box_pro.overlay
new file mode 100644
index 0000000000000..4ed5566a47bcb
--- /dev/null
+++ b/samples/sensor/stream_fifo/boards/sensortile_box_pro.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/dt-bindings/sensor/lsm6dsv16x.h>
+
+
+/*
+ * This devicetree overlay file will be automatically picked by the Zephyr
+ * build system when building the sample for the sensortile_box_pro board.
+ */
+
+/ {
+	aliases {
+		stream0 = &lsm6dsv16x_0;
+	};
+};
+
+&spi2 {
+	lsm6dsv16x_0: lsm6dsv16x@0 {
+		compatible = "st,lsm6dsv16x";
+
+		accel-odr = <LSM6DSV16X_DT_ODR_AT_480Hz>;
+		accel-range = <LSM6DSV16X_DT_FS_16G>;
+		gyro-odr = <LSM6DSV16X_DT_ODR_AT_480Hz>;
+		gyro-range = <LSM6DSV16X_DT_FS_500DPS>;
+		fifo-watermark = <64>;
+		accel-fifo-batch-rate = <LSM6DSV16X_DT_XL_BATCHED_AT_15Hz>;
+		gyro-fifo-batch-rate = <LSM6DSV16X_DT_GY_BATCHED_AT_15Hz>;
+		temp-fifo-batch-rate = <LSM6DSV16X_DT_TEMP_BATCHED_AT_15Hz>;
+
+		sflp-odr = <LSM6DSV16X_DT_SFLP_ODR_AT_15Hz>;
+		sflp-fifo-enable = <LSM6DSV16X_DT_SFLP_FIFO_GAME_ROTATION_GRAVITY_GBIAS>;
+	};
+};
diff --git a/samples/sensor/stream_fifo/src/main.c b/samples/sensor/stream_fifo/src/main.c
index 9b7564bd1becc..45dd3cab8f4f7 100644
--- a/samples/sensor/stream_fifo/src/main.c
+++ b/samples/sensor/stream_fifo/src/main.c
@@ -230,6 +230,8 @@ static void check_sensor_is_off(const struct device *dev)
 
 int main(void)
 {
+	struct sensor_value gbias[3];
+
 	for (size_t i = 0; i < ARRAY_SIZE(sensors); i++) {
 		if (!device_is_ready(sensors[i])) {
 			printk("sensor: device %s not ready.\n", sensors[i]->name);
@@ -237,6 +239,20 @@ int main(void)
 		}
 		check_sensor_is_off(sensors[i]);
 
+		/*
+		 * Set GBIAS as 0.5 rad/s, -1 rad/s, 0.2 rad/s
+		 *
+		 * (here application should initialize gbias x/y/z with latest values
+		 * calculated from previous run and probably saved to non volatile memory)
+		 */
+		gbias[0].val1 = 0;
+		gbias[0].val2 = 500000;
+		gbias[1].val1 = -1;
+		gbias[1].val2 = 0;
+		gbias[2].val1 = 0;
+		gbias[2].val2 = 200000;
+		sensor_attr_set(sensors[i], SENSOR_CHAN_GBIAS_XYZ, SENSOR_ATTR_OFFSET, gbias);
+
 		k_thread_create(&thread_id[i], thread_stack[i], TASK_STACK_SIZE, print_stream,
 			(void *)sensors[i], (void *)iodevs[i], NULL, K_PRIO_COOP(5),
 			K_INHERIT_PERMS, K_FOREVER);
diff --git a/samples/sensor/tdk_apex/README.rst b/samples/sensor/tdk_apex/README.rst
index 9d6f9c20d13dc..e38188b6ef8f4 100644
--- a/samples/sensor/tdk_apex/README.rst
+++ b/samples/sensor/tdk_apex/README.rst
@@ -51,7 +51,7 @@ to be aliased as ``tdk-apex-sensorN`` where ``N`` goes from ``0`` to ``9``. For
 		};
 	};
 
-This sample supports APEX feature of TDK device. It needs to be specified as bellow:
+This sample supports APEX feature of TDK device. It needs to be specified as below:
 
 .. code-block:: devicetree
 
diff --git a/samples/sensor/th02/sample.yaml b/samples/sensor/th02/sample.yaml
index eace959779b82..b0ab5881f6f0d 100644
--- a/samples/sensor/th02/sample.yaml
+++ b/samples/sensor/th02/sample.yaml
@@ -6,3 +6,5 @@ tests:
     tags: sensors
     depends_on: i2c
     filter: dt_compat_enabled("hoperf,th02") and dt_compat_enabled("seeed,grove-lcd-rgb")
+    integration_platforms:
+      - frdm_k64f
diff --git a/samples/sensor/thermometer/sample.yaml b/samples/sensor/thermometer/sample.yaml
index ce7c59c53d2a2..c482ee6dc34ae 100644
--- a/samples/sensor/thermometer/sample.yaml
+++ b/samples/sensor/thermometer/sample.yaml
@@ -18,6 +18,7 @@ tests:
       - frdm_k22f             # tcn75a
       - robokit1              # ntc_thermistor
       - adi_eval_adin1110ebz  # adt7420
+      - frdm_rw612            # p3t1755
     extra_args:
       - platform:mimxrt1180_evk/mimxrt1189/cm33:SHIELD=p3t1755dp_ard_i2c
       - platform:mimxrt1180_evk/mimxrt1189/cm7:SHIELD=p3t1755dp_ard_i2c
diff --git a/samples/sensor/tmp116/CMakeLists.txt b/samples/sensor/tmp116/CMakeLists.txt
deleted file mode 100644
index ccbe7ff815a75..0000000000000
--- a/samples/sensor/tmp116/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(tmp116)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/samples/sensor/tmp116/README.rst b/samples/sensor/tmp116/README.rst
deleted file mode 100644
index 87c91f83f3c6f..0000000000000
--- a/samples/sensor/tmp116/README.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-.. _ti_tmp116_sample:
-
-TI_TMP116 Sample
-################
-
-Description
-***********
-
-This sample application periodically takes temperature readings using the ti_tmp116
-sensor driver. The result is written to the console. This sample also included the code
-to use the  features provided by TMP117, which is a sensor similar to TMP116
-
-Requirements
-************
-
-This sample needs a TI TMP116 or TI TMP117 sensor connected to the target board's I2C
-connector.
-
-
-Wiring
-******
-
-This sample is tested with Nucleo STM32F401RE board.
-
-The sensor operates at 3.3V and uses I2C to communicate with the board.
-
-External Wires:
-
-* Breakout **GND** pin <--> Nucleo **GND** pin
-* Breakout **VCC** pin <--> Nucleo **3V3** pin
-* Breakout **SDA** pin <--> Nucleo **CN5-D14** pin
-* Breakout **SCL** pin <--> Nucleo **CN5-D15** pin
-
-Building and Running
-********************
-
-In order to build the sample, connect the board to the computer with a USB cable and enter the
-following commands:
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/sensor/tmp116
-   :board: nucleo_f401re
-   :goals: build flash
-   :compact:
-
-Sample Output
-*************
-The output can be seen via a terminal emulator (e.g. minicom). Connect the board with a USB cable
-to the computer and open /dev/ttyACM0 with the below serial settings:
-
-* Baudrate: 115200
-* Parity: None
-* Data: 8
-* Stop bits: 1
-
-The output should look like this:
-
-.. code-block:: console
-
-    Device TMP116 - 0x200010a8 is ready
-    temp is 26.7031250 oC
-    temp is 26.7109375 oC
-    ...
diff --git a/samples/sensor/tmp116/boards/nucleo_f401re.overlay b/samples/sensor/tmp116/boards/nucleo_f401re.overlay
deleted file mode 100644
index 0ab15f7bf6439..0000000000000
--- a/samples/sensor/tmp116/boards/nucleo_f401re.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2019 Centaur Analytics, Inc
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&i2c1 {
-
-	ti_tmp116: ti_tmp116@4b {
-		compatible = "ti,tmp116";
-		reg = <0x4B>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		eeprom: ti_tmp116_eeprom@0 {
-			compatible = "ti,tmp116-eeprom";
-			reg = <0x0>;
-			read-only;
-		};
-	};
-
-};
diff --git a/samples/sensor/tmp116/prj.conf b/samples/sensor/tmp116/prj.conf
deleted file mode 100644
index 27651f09f3fdf..0000000000000
--- a/samples/sensor/tmp116/prj.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_STDOUT_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_SENSOR=y
-CONFIG_SENSOR_INIT_PRIORITY=90
-CONFIG_EEPROM=y
-CONFIG_EEPROM_INIT_PRIORITY=91
-CONFIG_EEPROM_TMP116=y
diff --git a/samples/sensor/tmp116/sample.yaml b/samples/sensor/tmp116/sample.yaml
deleted file mode 100644
index 3527b16edcaed..0000000000000
--- a/samples/sensor/tmp116/sample.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-sample:
-  name: TI TMP116 Sensor Sample
-tests:
-  sample.sensor.tmp116:
-    harness: console
-    platform_allow: nucleo_f401re
-    integration_platforms:
-      - nucleo_f401re
-    tags: sensors
-    depends_on: i2c
-    harness_config:
-      type: one_line
-      regex:
-        - "temp is (.*) oC"
-      fixture: fixture_i2c_tmp116
diff --git a/samples/sensor/tmp116/src/main.c b/samples/sensor/tmp116/src/main.c
deleted file mode 100644
index d594a2664d7eb..0000000000000
--- a/samples/sensor/tmp116/src/main.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2019 Centaur Analytics, Inc
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-#include <zephyr/device.h>
-#include <zephyr/drivers/sensor.h>
-#include <zephyr/drivers/eeprom.h>
-#include <zephyr/drivers/sensor/tmp116.h>
-#include <zephyr/sys/printk.h>
-#include <zephyr/sys/__assert.h>
-
-#define TMP116_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(ti_tmp116)
-#define TMP116_EEPROM_NODE DT_CHILD(TMP116_NODE, ti_tmp116_eeprom_0)
-
-static uint8_t eeprom_content[EEPROM_TMP116_SIZE];
-
-int main(void)
-{
-	const struct device *const dev = DEVICE_DT_GET(TMP116_NODE);
-	const struct device *const eeprom = DEVICE_DT_GET(TMP116_EEPROM_NODE);
-	struct sensor_value temp_value;
-
-	/* offset to be added to the temperature
-	 * only supported by TMP117
-	 */
-	struct sensor_value offset_value;
-	int ret;
-
-	__ASSERT(device_is_ready(dev), "TMP116 device not ready");
-	__ASSERT(device_is_ready(eeprom), "TMP116 eeprom device not ready");
-
-	printk("Device %s - %p is ready\n", dev->name, dev);
-
-	ret = eeprom_read(eeprom, 0, eeprom_content, sizeof(eeprom_content));
-	if (ret == 0) {
-		printk("eeprom content %02x%02x%02x%02x%02x%02x%02x%02x\n",
-		       eeprom_content[0], eeprom_content[1],
-		       eeprom_content[2], eeprom_content[3],
-		       eeprom_content[4], eeprom_content[5],
-		       eeprom_content[6], eeprom_content[7]);
-	} else {
-		printk("Failed to get eeprom content\n");
-	}
-
-	/*
-	 * if an offset of 2.5 oC is to be added,
-	 * set val1 = 2 and val2 = 500000.
-	 * See struct sensor_value documentation for more details.
-	 */
-	offset_value.val1 = 0;
-	offset_value.val2 = 0;
-	ret = sensor_attr_set(dev, SENSOR_CHAN_AMBIENT_TEMP,
-			      SENSOR_ATTR_OFFSET, &offset_value);
-	if (ret) {
-		printk("sensor_attr_set failed ret = %d\n", ret);
-		printk("SENSOR_ATTR_OFFSET is only supported by TMP117\n");
-	}
-	while (1) {
-		ret = sensor_sample_fetch(dev);
-		if (ret) {
-			printk("Failed to fetch measurements (%d)\n", ret);
-			return 0;
-		}
-
-		ret = sensor_channel_get(dev, SENSOR_CHAN_AMBIENT_TEMP,
-					 &temp_value);
-		if (ret) {
-			printk("Failed to get measurements (%d)\n", ret);
-			return 0;
-		}
-
-		printk("temp is %d.%d oC\n", temp_value.val1, temp_value.val2);
-
-		k_sleep(K_MSEC(1000));
-	}
-	return 0;
-}
diff --git a/samples/sensor/tmp11x/CMakeLists.txt b/samples/sensor/tmp11x/CMakeLists.txt
new file mode 100644
index 0000000000000..9241a3e9b27c4
--- /dev/null
+++ b/samples/sensor/tmp11x/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(tmp11x)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/sensor/tmp11x/README.rst b/samples/sensor/tmp11x/README.rst
new file mode 100644
index 0000000000000..1cc257ec70d3a
--- /dev/null
+++ b/samples/sensor/tmp11x/README.rst
@@ -0,0 +1,63 @@
+.. _ti_tmp11x_sample:
+
+TI_TMP11X Sample
+################
+
+Description
+***********
+
+This sample application periodically takes temperature readings using the ti_tmp11x
+sensor driver. The result is written to the console. This sample also included the code
+to use the features provided by TMP117 and TMP119, which are sensors similar to TMP116.
+
+Requirements
+************
+
+This sample needs a TI TMP116, TI TMP117 or TI TMP119 sensor connected to the target board's I2C
+connector.
+
+
+Wiring
+******
+
+This sample is tested with Nucleo STM32F401RE board.
+
+The sensor operates at 3.3V and uses I2C to communicate with the board.
+
+External Wires:
+
+* Breakout **GND** pin <--> Nucleo **GND** pin
+* Breakout **VCC** pin <--> Nucleo **3V3** pin
+* Breakout **SDA** pin <--> Nucleo **CN5-D14** pin
+* Breakout **SCL** pin <--> Nucleo **CN5-D15** pin
+
+Building and Running
+********************
+
+In order to build the sample, connect the board to the computer with a USB cable and enter the
+following commands:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/sensor/tmp11x
+   :board: nucleo_f401re
+   :goals: build flash
+   :compact:
+
+Sample Output
+*************
+The output can be seen via a terminal emulator (e.g. minicom). Connect the board with a USB cable
+to the computer and open /dev/ttyACM0 with the below serial settings:
+
+* Baudrate: 115200
+* Parity: None
+* Data: 8
+* Stop bits: 1
+
+The output should look like this:
+
+.. code-block:: console
+
+    Device TMP11X - 0x200010a8 is ready
+    temp is 26.7031250 oC
+    temp is 26.7109375 oC
+    ...
diff --git a/samples/sensor/tmp11x/boards/nucleo_f401re.overlay b/samples/sensor/tmp11x/boards/nucleo_f401re.overlay
new file mode 100644
index 0000000000000..ba29a788befa3
--- /dev/null
+++ b/samples/sensor/tmp11x/boards/nucleo_f401re.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2019 Centaur Analytics, Inc
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&i2c1 {
+
+	ti_tmp11x: ti_tmp11x@4b {
+		compatible = "ti,tmp11x";
+		reg = <0x4B>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		eeprom: ti_tmp11x_eeprom@0 {
+			compatible = "ti,tmp11x-eeprom";
+			reg = <0x0>;
+			read-only;
+		};
+	};
+
+};
diff --git a/samples/sensor/tmp11x/prj.conf b/samples/sensor/tmp11x/prj.conf
new file mode 100644
index 0000000000000..8bd0810adcc1c
--- /dev/null
+++ b/samples/sensor/tmp11x/prj.conf
@@ -0,0 +1,7 @@
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_I2C=y
+CONFIG_SENSOR=y
+CONFIG_SENSOR_INIT_PRIORITY=90
+CONFIG_EEPROM=y
+CONFIG_EEPROM_INIT_PRIORITY=91
+CONFIG_EEPROM_TMP11X=y
diff --git a/samples/sensor/tmp11x/sample.yaml b/samples/sensor/tmp11x/sample.yaml
new file mode 100644
index 0000000000000..3246dffedbba7
--- /dev/null
+++ b/samples/sensor/tmp11x/sample.yaml
@@ -0,0 +1,15 @@
+sample:
+  name: TI TMP11X Sensor Sample
+tests:
+  sample.sensor.tmp11x:
+    harness: console
+    platform_allow: nucleo_f401re
+    integration_platforms:
+      - nucleo_f401re
+    tags: sensors
+    depends_on: i2c
+    harness_config:
+      type: one_line
+      regex:
+        - "temp is (.*) oC"
+      fixture: fixture_i2c_tmp11x
diff --git a/samples/sensor/tmp11x/src/main.c b/samples/sensor/tmp11x/src/main.c
new file mode 100644
index 0000000000000..1aaa8eb9da845
--- /dev/null
+++ b/samples/sensor/tmp11x/src/main.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2019 Centaur Analytics, Inc
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/sensor/tmp11x.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/__assert.h>
+
+#define TMP11X_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(ti_tmp11x)
+#define TMP11X_EEPROM_NODE DT_CHILD(TMP11X_NODE, ti_tmp11x_eeprom_0)
+
+static uint8_t eeprom_content[EEPROM_TMP11X_SIZE];
+
+int main(void)
+{
+	const struct device *const dev = DEVICE_DT_GET(TMP11X_NODE);
+	const struct device *const eeprom = DEVICE_DT_GET(TMP11X_EEPROM_NODE);
+	struct sensor_value temp_value;
+
+	/* offset to be added to the temperature
+	 * only supported by TMP117 and TMP119
+	 */
+	struct sensor_value offset_value;
+	int ret;
+
+	__ASSERT(device_is_ready(dev), "tmp11x device not ready");
+	__ASSERT(device_is_ready(eeprom), "tmp11x eeprom device not ready");
+
+	printk("Device %s - %p is ready\n", dev->name, dev);
+
+	ret = eeprom_read(eeprom, 0, eeprom_content, sizeof(eeprom_content));
+	if (ret == 0) {
+		printk("eeprom content %02x%02x%02x%02x%02x%02x%02x%02x\n",
+		       eeprom_content[0], eeprom_content[1],
+		       eeprom_content[2], eeprom_content[3],
+		       eeprom_content[4], eeprom_content[5],
+		       eeprom_content[6], eeprom_content[7]);
+	} else {
+		printk("Failed to get eeprom content\n");
+	}
+
+	/*
+	 * if an offset of 2.5 oC is to be added,
+	 * set val1 = 2 and val2 = 500000.
+	 * See struct sensor_value documentation for more details.
+	 */
+	offset_value.val1 = 0;
+	offset_value.val2 = 0;
+	ret = sensor_attr_set(dev, SENSOR_CHAN_AMBIENT_TEMP,
+			      SENSOR_ATTR_OFFSET, &offset_value);
+	if (ret) {
+		printk("sensor_attr_set failed ret = %d\n", ret);
+		printk("SENSOR_ATTR_OFFSET is only supported by TMP117 and TMP119\n");
+	}
+	while (1) {
+		ret = sensor_sample_fetch(dev);
+		if (ret) {
+			printk("Failed to fetch measurements (%d)\n", ret);
+			return 0;
+		}
+
+		ret = sensor_channel_get(dev, SENSOR_CHAN_AMBIENT_TEMP,
+					 &temp_value);
+		if (ret) {
+			printk("Failed to get measurements (%d)\n", ret);
+			return 0;
+		}
+
+		printk("temp is %d.%d oC\n", temp_value.val1, temp_value.val2);
+
+		k_sleep(K_MSEC(1000));
+	}
+	return 0;
+}
diff --git a/samples/sensor/veaa_x_3/sample.yaml b/samples/sensor/veaa_x_3/sample.yaml
index 0191620ffb623..89be41f00ed23 100644
--- a/samples/sensor/veaa_x_3/sample.yaml
+++ b/samples/sensor/veaa_x_3/sample.yaml
@@ -8,3 +8,5 @@ tests:
     depends_on:
       - adc
       - dac
+    integration_platforms:
+      - nucleo_h563zi
diff --git a/samples/sensor/veml6031/CMakeLists.txt b/samples/sensor/veml6031/CMakeLists.txt
new file mode 100644
index 0000000000000..641ae9ad6ecf4
--- /dev/null
+++ b/samples/sensor/veml6031/CMakeLists.txt
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(veml6031)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/sensor/veml6031/README.rst b/samples/sensor/veml6031/README.rst
new file mode 100644
index 0000000000000..e686ef373f1bc
--- /dev/null
+++ b/samples/sensor/veml6031/README.rst
@@ -0,0 +1,92 @@
+.. zephyr:code-sample:: veml6031
+   :name: VEML6031 High Accuracy Ambient Light Sensor
+   :relevant-api: sensor_interface
+
+   Get ambient light data from a VEML4040 sensor (polling mode).
+
+Overview
+********
+
+ This sample measures the ambient light for all possible combinations of sensor
+ attributes. There are:
+ - integration time
+ - effective photodiode size
+ - gain
+ These attributes can be used to put the sensor in an optimal working area.
+ When the light value reaches the maximum raw value (0xFFFF) an error is
+ returned to indicate the out of bounds situation to the user program.
+ With this program the raw value is also printed out together with the
+ attributes to be able to select good attribute values.
+ Interrupt and trigger mode is not supported so far, but planned for future
+ development.
+
+Requirements
+************
+
+ This sample uses the VEML6031 sensor controlled using the I2C-2 interface at
+ the Olimex-STM32-E407 board on feather PF0 and PF1.
+
+References
+**********
+
+ - VEML6031: https://www.vishay.com/docs/80007/veml6031x00.pdf
+
+Building and Running
+********************
+
+ This project outputs sensor data to the console. It requires a VEML6031
+ sensor to be connected to the desired board.
+
+ .. zephyr-app-commands::
+    :zephyr-app: samples/sensor/veml6031/
+    :goals: build flash
+
+
+Sample Output
+=============
+
+ .. code-block:: console
+
+    Test all attributes for a good guess of attribute usage away of saturation.
+    Light (lux):   6179 ALS (raw):   7100 IR (raw):     27   it: 0 div4: 0 gain: 0  --
+    Light (lux):   1500 ALS (raw):   3447 IR (raw):     34   it: 0 div4: 0 gain: 1  --
+    Light (lux):   4664 ALS (raw):   3537 IR (raw):     17   it: 0 div4: 0 gain: 2  --
+    Light (lux):   5601 ALS (raw):   3218 IR (raw):     13   it: 0 div4: 0 gain: 3  --
+    Light (lux):   1302 ALS (raw):    374 IR (raw):      5   it: 0 div4: 1 gain: 0  --
+    Light (lux):   5584 ALS (raw):   3208 IR (raw):     11   it: 0 div4: 1 gain: 1  --
+    Light (lux):   5285 ALS (raw):   1002 IR (raw):      3   it: 0 div4: 1 gain: 2  --
+    Light (lux):   1455 ALS (raw):    209 IR (raw):      2   it: 0 div4: 1 gain: 3  --
+    Light (lux):   4925 ALS (raw):  11317 IR (raw):     50   it: 1 div4: 0 gain: 0  --
+    Light (lux):   3916 ALS (raw):  17999 IR (raw):     90   it: 1 div4: 0 gain: 1  --
+    Light (lux):   2796 ALS (raw):   4299 IR (raw):     28   it: 1 div4: 0 gain: 2  --
+    Light (lux):   5178 ALS (raw):   5950 IR (raw):     26   it: 1 div4: 0 gain: 3  --
+    Light (lux):   4339 ALS (raw):   2493 IR (raw):     12   it: 1 div4: 1 gain: 0  --
+    Light (lux):   2186 ALS (raw):   2512 IR (raw):     19   it: 1 div4: 1 gain: 1  --
+    Light (lux):   5578 ALS (raw):   2115 IR (raw):      8   it: 1 div4: 1 gain: 2  --
+    Light (lux):   4494 ALS (raw):   1291 IR (raw):      6   it: 1 div4: 1 gain: 3  --
+    Light (lux):   3675 ALS (raw):  16892 IR (raw):     93   it: 2 div4: 0 gain: 0  --
+    Light (lux):   3209 ALS (raw):  29495 IR (raw):    172   it: 2 div4: 0 gain: 1  --
+    Light (lux):   4520 ALS (raw):  13710 IR (raw):     66   it: 2 div4: 0 gain: 2  --
+    Light (lux):   4215 ALS (raw):   9687 IR (raw):     49   it: 2 div4: 0 gain: 3  --
+    Light (lux):   3492 ALS (raw):   4013 IR (raw):     22   it: 2 div4: 1 gain: 0  --
+    Light (lux):   3786 ALS (raw):   8700 IR (raw):     43   it: 2 div4: 1 gain: 1  --
+    Light (lux):   4735 ALS (raw):   3591 IR (raw):     15   it: 2 div4: 1 gain: 2  --
+    Light (lux):   3779 ALS (raw):   2171 IR (raw):     11   it: 2 div4: 1 gain: 3  --
+    Light (lux):   3848 ALS (raw):  35376 IR (raw):    188   it: 3 div4: 0 gain: 0  --
+    Light (lux):   3565 ALS (raw):  65535 IR (raw):    359   it: 3 div4: 0 gain: 1  --  OVERFLOW
+    Light (lux):   4333 ALS (raw):  26297 IR (raw):    130   it: 3 div4: 0 gain: 2  --
+    Light (lux):   3576 ALS (raw):  16435 IR (raw):     93   it: 3 div4: 0 gain: 3  --
+    Light (lux):   4409 ALS (raw):  10133 IR (raw):     47   it: 3 div4: 1 gain: 0  --
+    Light (lux):   3395 ALS (raw):  15606 IR (raw):     85   it: 3 div4: 1 gain: 1  --
+    Light (lux):   4519 ALS (raw):   6854 IR (raw):     31   it: 3 div4: 1 gain: 2  --
+    Light (lux):   3694 ALS (raw):   4245 IR (raw):     23   it: 3 div4: 1 gain: 3  --
+    Light (lux):   3565 ALS (raw):  65535 IR (raw):    376   it: 4 div4: 0 gain: 0  --  OVERFLOW
+    Light (lux):   1782 ALS (raw):  65535 IR (raw):    723   it: 4 div4: 0 gain: 1  --  OVERFLOW
+    Light (lux):   3992 ALS (raw):  48450 IR (raw):    253   it: 4 div4: 0 gain: 2  --
+    Light (lux):   3943 ALS (raw):  36247 IR (raw):    191   it: 4 div4: 0 gain: 3  --
+    Light (lux):   3970 ALS (raw):  18248 IR (raw):     92   it: 4 div4: 1 gain: 0  --
+    Light (lux):   3814 ALS (raw):  35064 IR (raw):    176   it: 4 div4: 1 gain: 1  --
+    Light (lux):   4082 ALS (raw):  12381 IR (raw):     62   it: 4 div4: 1 gain: 2  --
+    Light (lux):   4052 ALS (raw):   9311 IR (raw):     47   it: 4 div4: 1 gain: 3  --
+    [...]
+    Test finished.
diff --git a/samples/sensor/veml6031/boards/olimex_stm32_e407.overlay b/samples/sensor/veml6031/boards/olimex_stm32_e407.overlay
new file mode 100644
index 0000000000000..d6b785d083921
--- /dev/null
+++ b/samples/sensor/veml6031/boards/olimex_stm32_e407.overlay
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Andreas Klinger
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	i2c2_sda_pf0: i2c2_sda_pf0 {
+		pinmux = < 0xa04 >;
+		bias-pull-up;
+		drive-open-drain;
+	};
+	i2c2_scl_pf1: i2c2_scl_pf1 {
+		pinmux = < 0xa24 >;
+		bias-pull-up;
+		drive-open-drain;
+	};
+};
+
+&i2c2 {
+	pinctrl-0 = < &i2c2_scl_pf1 &i2c2_sda_pf0 >;
+	pinctrl-names = "default";
+	status = "okay";
+	light: light@29 {
+		compatible = "vishay,veml6031";
+		reg = <0x29>;
+	};
+};
diff --git a/samples/sensor/veml6031/prj.conf b/samples/sensor/veml6031/prj.conf
new file mode 100644
index 0000000000000..42fcd3c973bcb
--- /dev/null
+++ b/samples/sensor/veml6031/prj.conf
@@ -0,0 +1 @@
+CONFIG_SENSOR=y
diff --git a/samples/sensor/veml6031/sample.yaml b/samples/sensor/veml6031/sample.yaml
new file mode 100644
index 0000000000000..9e0792971afec
--- /dev/null
+++ b/samples/sensor/veml6031/sample.yaml
@@ -0,0 +1,10 @@
+sample:
+  name: VEML6031 Sensor Sample
+tests:
+  sample.sensor.veml6031:
+    harness: sensor
+    platform_allow: olimex_stm32_e407
+    integration_platforms:
+      - olimex_stm32_e407
+    tags: sensors
+    filter: dt_compat_enabled("vishay,veml6031")
diff --git a/samples/sensor/veml6031/src/main.c b/samples/sensor/veml6031/src/main.c
new file mode 100644
index 0000000000000..97239aa32a05d
--- /dev/null
+++ b/samples/sensor/veml6031/src/main.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2025 Andreas Klinger
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys_clock.h>
+#include <stdio.h>
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+
+#include <zephyr/drivers/sensor/veml6031.h>
+
+static void read_with_attr(const struct device *dev, int it, int div4, int gain)
+{
+	int ret;
+	struct sensor_value light;
+	struct sensor_value als_raw;
+	struct sensor_value ir_raw;
+	struct sensor_value sen;
+
+	sen.val2 = 0;
+
+	sen.val1 = it;
+	ret = sensor_attr_set(dev, SENSOR_CHAN_LIGHT, SENSOR_ATTR_VEML6031_IT, &sen);
+	if (ret) {
+		printf("Failed to set it attribute ret: %d\n", ret);
+	}
+	sen.val1 = div4;
+	ret = sensor_attr_set(dev, SENSOR_CHAN_LIGHT, SENSOR_ATTR_VEML6031_DIV4, &sen);
+	if (ret) {
+		printf("Failed to set div4 attribute ret: %d\n", ret);
+	}
+	sen.val1 = gain;
+	ret = sensor_attr_set(dev, SENSOR_CHAN_LIGHT, SENSOR_ATTR_VEML6031_GAIN, &sen);
+	if (ret) {
+		printf("Failed to set gain attribute ret: %d\n", ret);
+	}
+
+	ret = sensor_sample_fetch(dev);
+	if ((ret < 0) && (ret != -E2BIG)) {
+		printf("sample update error. ret: %d\n", ret);
+	}
+
+	sensor_channel_get(dev, SENSOR_CHAN_LIGHT, &light);
+
+	sensor_channel_get(dev, SENSOR_CHAN_VEML6031_ALS_RAW_COUNTS, &als_raw);
+
+	sensor_channel_get(dev, SENSOR_CHAN_VEML6031_IR_RAW_COUNTS, &ir_raw);
+
+	printf("Light (lux): %6d ALS (raw): %6d IR (raw): %6d "
+	       "  it: %d div4: %d gain: %d  --  %s\n",
+	       light.val1, als_raw.val1, ir_raw.val1, it, div4, gain,
+	       ret == -E2BIG ? "OVERFLOW"
+	       : ret         ? "ERROR"
+			     : "");
+}
+
+static void read_with_all_attr(const struct device *dev)
+{
+	int it, div4, gain;
+
+	for (it = VEML6031_IT_3_125; it <= VEML6031_IT_400; it++) {
+		for (div4 = VEML6031_SIZE_4_4; div4 <= VEML6031_SIZE_1_4; div4++) {
+			for (gain = VEML6031_GAIN_1; gain <= VEML6031_GAIN_0_5; gain++) {
+				read_with_attr(dev, it, div4, gain);
+			}
+		}
+	}
+}
+
+int main(void)
+{
+	const struct device *const veml = DEVICE_DT_GET(DT_NODELABEL(light));
+
+	if (!device_is_ready(veml)) {
+		printk("sensor: device not ready.\n");
+		return 0;
+	}
+
+	printf("Test all attributes for a good guess of attribute usage away of saturation.\n");
+	read_with_all_attr(veml);
+	printf("Test finished.\n");
+
+	return 0;
+}
diff --git a/samples/sensor/vl53l0x/sample.yaml b/samples/sensor/vl53l0x/sample.yaml
index 01c6912550cb6..ca3dbbb9410db 100644
--- a/samples/sensor/vl53l0x/sample.yaml
+++ b/samples/sensor/vl53l0x/sample.yaml
@@ -2,8 +2,16 @@ sample:
   name: Sample for MEMS sensors VL53L0X
 tests:
   sample.sensor.vl53l0x:
-    build_only: true
     depends_on:
       - i2c
       - vl53l0x
-    tags: sensors
+    tags:
+      - sensors
+    integration_platforms:
+      - disco_l475_iot1
+    harness: console
+    harness_config:
+      type: multi_line
+      regex:
+        - "prox is .*"
+        - "distance is .*"
diff --git a/samples/shields/x_nucleo_53l0a1/sample.yaml b/samples/shields/x_nucleo_53l0a1/sample.yaml
index c380e1c964f11..81f4896e66470 100644
--- a/samples/shields/x_nucleo_53l0a1/sample.yaml
+++ b/samples/shields/x_nucleo_53l0a1/sample.yaml
@@ -6,3 +6,5 @@ tests:
     tags: shield
     depends_on: arduino_i2c
     filter: dt_enabled_alias_with_parent_compat("sw0", "gpio-keys")
+    integration_platforms:
+      - nucleo_g431rb/stm32g431xx
diff --git a/samples/subsys/bindesc/read_bindesc/sample.yaml b/samples/subsys/bindesc/read_bindesc/sample.yaml
index d6fafc34a745b..c24a718346801 100644
--- a/samples/subsys/bindesc/read_bindesc/sample.yaml
+++ b/samples/subsys/bindesc/read_bindesc/sample.yaml
@@ -11,3 +11,5 @@ tests:
     tags: bindesc
     filter: dt_chosen_enabled("zephyr,flash-controller") and CONFIG_FLASH_HAS_DRIVER_ENABLED
       and CONFIG_ARCH_SUPPORTS_ROM_START
+    integration_platforms:
+      - mps2/an385
diff --git a/samples/subsys/dap/CMakeLists.txt b/samples/subsys/dap/CMakeLists.txt
index 72ea1953b3c18..f0b914c0dab41 100644
--- a/samples/subsys/dap/CMakeLists.txt
+++ b/samples/subsys/dap/CMakeLists.txt
@@ -5,5 +5,6 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(dap)
 
+include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/samples/subsys/dap/Kconfig b/samples/subsys/dap/Kconfig
new file mode 100644
index 0000000000000..96c5455894806
--- /dev/null
+++ b/samples/subsys/dap/Kconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Source common USB sample options used to initialize new experimental USB
+# device stack. The scope of these options is limited to USB samples in project
+# tree, you cannot use them in your own application.
+source "samples/subsys/usb/common/Kconfig.sample_usbd"
+
+source "Kconfig.zephyr"
diff --git a/samples/subsys/dap/README.rst b/samples/subsys/dap/README.rst
index 1f34f02c523ea..cec0e1681a3c8 100644
--- a/samples/subsys/dap/README.rst
+++ b/samples/subsys/dap/README.rst
@@ -7,7 +7,7 @@ Overview
 ********
 
 This sample app demonstrates use of a SWDP interface driver and CMSIS DAP
-controller through USB Bulk interface.
+controller through DAP USB backend.
 
 Requirements
 ************
@@ -21,8 +21,6 @@ e.g. if the SWD connections are multiplexed.
 Building and Running
 ********************
 
-In order for our debug adapter to be recognized by pyOCD we need to change
-Zephyr's VID/PID to IDs known to pyOCD, this is up to the user.
 The following commands build and flash DAP sample.
 
 .. zephyr-app-commands::
diff --git a/samples/subsys/dap/prj.conf b/samples/subsys/dap/prj.conf
index 85e26acafa9fc..062bec175698d 100644
--- a/samples/subsys/dap/prj.conf
+++ b/samples/subsys/dap/prj.conf
@@ -1,19 +1,18 @@
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_SAMPLE_USBD_PRODUCT="Zephyr CMSIS-DAP"
+CONFIG_SAMPLE_USBD_PID=0x0204
+CONFIG_SAMPLE_USBD_20_EXTENSION_DESC=y
+
 CONFIG_STDOUT_CONSOLE=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_BOS=y
 CONFIG_SERIAL=y
-CONFIG_USB_DEVICE_PRODUCT="Zephyr CMSIS-DAP"
-CONFIG_USB_DEVICE_PID=0x0204
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_LINE_CTRL=y
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 
 CONFIG_LOG=y
+CONFIG_LOG_DEFAULT_LEVEL=2
 
-CONFIG_USB_DRIVER_LOG_LEVEL_INF=y
-CONFIG_USB_DEVICE_LOG_LEVEL_INF=y
 CONFIG_DAP_LOG_LEVEL_INF=y
 CONFIG_DP_DRIVER_LOG_LEVEL_INF=y
 CONFIG_DAP=y
+CONFIG_DAP_BACKEND_USB=y
 CONFIG_GPIO=y
-CONFIG_NET_BUF=y
diff --git a/samples/subsys/dap/sample.yaml b/samples/subsys/dap/sample.yaml
index 7730fcade6736..bcdcd53658fe0 100644
--- a/samples/subsys/dap/sample.yaml
+++ b/samples/subsys/dap/sample.yaml
@@ -5,7 +5,7 @@ tests:
     build_only: true
     depends_on:
       - arduino_gpio
-      - usb_device
+      - usbd
     platform_allow:
       - nrf52840dk/nrf52840
       - frdm_k64f
diff --git a/samples/subsys/dap/src/main.c b/samples/subsys/dap/src/main.c
index c8682f2e5c039..55288af1eff10 100644
--- a/samples/subsys/dap/src/main.c
+++ b/samples/subsys/dap/src/main.c
@@ -4,367 +4,64 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <sample_usbd.h>
+
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/usbd.h>
 #include <zephyr/usb/bos.h>
 #include <zephyr/usb/msos_desc.h>
-#include <zephyr/net_buf.h>
 
-#include <usb_descriptor.h>
 #include <cmsis_dap.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dap_sample, LOG_LEVEL_INF);
 
-NET_BUF_POOL_FIXED_DEFINE(dapusb_rx_pool, CONFIG_CMSIS_DAP_PACKET_COUNT,
-			  CONFIG_CMSIS_DAP_PACKET_SIZE, 0, NULL);
-
-static uint8_t rx_buf[CONFIG_CMSIS_DAP_PACKET_SIZE];
-static uint8_t tx_buf[CONFIG_CMSIS_DAP_PACKET_SIZE];
-
-static K_FIFO_DEFINE(dap_rx_queue);
-
-#define DAP_IFACE_STR_DESC		"CMSIS-DAP v2"
-
-struct dap_iface_descriptor {
-	uint8_t bLength;
-	uint8_t bDescriptorType;
-	uint8_t bString[USB_BSTRING_LENGTH(DAP_IFACE_STR_DESC)];
-} __packed;
-
-USBD_STRING_DESCR_USER_DEFINE(primary) struct dap_iface_descriptor dap_iface_desc = {
-	.bLength = USB_STRING_DESCRIPTOR_LENGTH(DAP_IFACE_STR_DESC),
-	.bDescriptorType = USB_DESC_STRING,
-	.bString = DAP_IFACE_STR_DESC
-};
-
-#define DAP_USB_EP_IN		0x81
-#define DAP_USB_EP_OUT		0x01
-#define DAP_USB_EP_IN_IDX	0
-#define DAP_USB_EP_OUT_IDX	1
-
-#define WEBUSB_VENDOR_CODE	0x21
-#define WINUSB_VENDOR_CODE	0x20
-
-/* {CDB3B5AD-293B-4663-AA36-1AAE46463776} */
-#define CMSIS_DAP_V2_DEVICE_INTERFACE_GUID \
-	'{', 0x00, 'C', 0x00, 'D', 0x00, 'B', 0x00, '3', 0x00, 'B', 0x00, \
-	'5', 0x00, 'A', 0x00, 'D', 0x00, '-', 0x00, '2', 0x00, '9', 0x00, \
-	'3', 0x00, 'B', 0x00, '-', 0x00, '4', 0x00, '6', 0x00, '6', 0x00, \
-	'3', 0x00, '-', 0x00, 'A', 0x00, 'A', 0x00, '3', 0x00, '6', 0x00, \
-	'-', 0x00, '1', 0x00, 'A', 0x00, 'A', 0x00, 'E', 0x00, '4', 0x00, \
-	'6', 0x00, '4', 0x00, '6', 0x00, '3', 0x00, '7', 0x00, '7', 0x00, \
-	'6', 0x00, '}', 0x00, 0x00, 0x00, 0x00, 0x00
-
-#define COMPATIBLE_ID_WINUSB \
-	'W', 'I', 'N', 'U', 'S', 'B', 0x00, 0x00
-
-static struct msosv2_descriptor {
-	struct msosv2_descriptor_set_header header;
-#if defined(CONFIG_USB_COMPOSITE_DEVICE)
-	struct msosv2_function_subset_header subset_header;
-#endif
-	struct msosv2_compatible_id compatible_id;
-	struct msosv2_guids_property guids_property;
-} __packed msosv2_cmsis_dap_desc = {
-	/*
-	 * Microsoft OS 2.0 descriptor set. This tells Windows what kind
-	 * of device this is and to install the WinUSB driver.
-	 */
-	.header = {
-		.wLength = sizeof(struct msosv2_descriptor_set_header),
-		.wDescriptorType = MS_OS_20_SET_HEADER_DESCRIPTOR,
-		.dwWindowsVersion = 0x06030000,
-		.wTotalLength = sizeof(struct msosv2_descriptor),
-	},
-#if defined(CONFIG_USB_COMPOSITE_DEVICE)
-	.subset_header = {
-		.wLength = sizeof(struct msosv2_function_subset_header),
-		.wDescriptorType = MS_OS_20_SUBSET_HEADER_FUNCTION,
-		.wSubsetLength = sizeof(struct msosv2_function_subset_header)
-			+ sizeof(struct msosv2_compatible_id)
-			+ sizeof(struct msosv2_guids_property),
-	},
-#endif
-	.compatible_id = {
-		.wLength = sizeof(struct msosv2_compatible_id),
-		.wDescriptorType = MS_OS_20_FEATURE_COMPATIBLE_ID,
-		.CompatibleID = {COMPATIBLE_ID_WINUSB},
-	},
-	.guids_property = {
-		.wLength = sizeof(struct msosv2_guids_property),
-		.wDescriptorType = MS_OS_20_FEATURE_REG_PROPERTY,
-		.wPropertyDataType = MS_OS_20_PROPERTY_DATA_REG_MULTI_SZ,
-		.wPropertyNameLength = 42,
-		.PropertyName = {DEVICE_INTERFACE_GUIDS_PROPERTY_NAME},
-		.wPropertyDataLength = 80,
-		.bPropertyData = {CMSIS_DAP_V2_DEVICE_INTERFACE_GUID},
-	},
-};
-
-USB_DEVICE_BOS_DESC_DEFINE_CAP struct usb_bos_msosv2_desc {
-	struct usb_bos_platform_descriptor platform;
-	struct usb_bos_capability_msos cap;
-} __packed bos_cap_msosv2 = {
-	/* Microsoft OS 2.0 Platform Capability Descriptor */
-	.platform = {
-		.bLength = sizeof(struct usb_bos_platform_descriptor)
-			+ sizeof(struct usb_bos_capability_msos),
-		.bDescriptorType = USB_DESC_DEVICE_CAPABILITY,
-		.bDevCapabilityType = USB_BOS_CAPABILITY_PLATFORM,
-		.bReserved = 0,
-		.PlatformCapabilityUUID = {
-			/**
-			 * MS OS 2.0 Platform Capability ID
-			 * D8DD60DF-4589-4CC7-9CD2-659D9E648A9F
-			 */
-			0xDF, 0x60, 0xDD, 0xD8,
-			0x89, 0x45,
-			0xC7, 0x4C,
-			0x9C, 0xD2,
-			0x65, 0x9D, 0x9E, 0x64, 0x8A, 0x9F,
-		},
-	},
-	.cap = {
-		/* Windows version (8.1) (0x06030000) */
-		.dwWindowsVersion = sys_cpu_to_le32(0x06030000),
-		.wMSOSDescriptorSetTotalLength =
-			sys_cpu_to_le16(sizeof(msosv2_cmsis_dap_desc)),
-		.bMS_VendorCode = WINUSB_VENDOR_CODE,
-		.bAltEnumCode = 0x00
-	},
-};
-
-USB_DEVICE_BOS_DESC_DEFINE_CAP struct usb_bos_webusb_desc {
-	struct usb_bos_platform_descriptor platform;
-	struct usb_bos_capability_webusb cap;
-} __packed bos_cap_webusb = {
-	/* WebUSB Platform Capability Descriptor:
-	 * https://wicg.github.io/webusb/#webusb-platform-capability-descriptor
-	 */
-	.platform = {
-		.bLength = sizeof(struct usb_bos_platform_descriptor)
-			 + sizeof(struct usb_bos_capability_webusb),
-		.bDescriptorType = USB_DESC_DEVICE_CAPABILITY,
-		.bDevCapabilityType = USB_BOS_CAPABILITY_PLATFORM,
-		.bReserved = 0,
-		/* WebUSB Platform Capability UUID
-		 * 3408b638-09a9-47a0-8bfd-a0768815b665
-		 */
-		.PlatformCapabilityUUID = {
-			0x38, 0xB6, 0x08, 0x34,
-			0xA9, 0x09,
-			0xA0, 0x47,
-			0x8B, 0xFD,
-			0xA0, 0x76, 0x88, 0x15, 0xB6, 0x65,
-		},
-	},
-	.cap = {
-		.bcdVersion = sys_cpu_to_le16(0x0100),
-		.bVendorCode = WEBUSB_VENDOR_CODE,
-		.iLandingPage = 0x01
-	}
-};
-
-/* URL Descriptor: https://wicg.github.io/webusb/#url-descriptor */
-static const uint8_t webusb_origin_url[] = {
-	/* Length, DescriptorType, Scheme */
-	24, 0x03, 0x01,
-	'w', 'w', 'w', '.',
-	'z', 'e', 'p', 'h', 'y', 'r', 'p', 'r', 'o', 'j', 'e', 'c', 't', '.',
-	'o', 'r', 'g', '/',
-};
-
-static int msosv2_vendor_handle_req(struct usb_setup_packet *setup,
-				    int32_t *len, uint8_t **data)
-{
-	if (usb_reqtype_is_to_device(setup)) {
-		return -ENOTSUP;
-	}
-
-	if (setup->bRequest == WEBUSB_VENDOR_CODE && setup->wIndex == 0x02) {
-		*data = (uint8_t *)(&webusb_origin_url);
-		*len = sizeof(webusb_origin_url);
-
-		LOG_DBG("Get URL request");
-
-		return 0;
-	}
-
-	if (setup->bRequest == WINUSB_VENDOR_CODE &&
-	    setup->wIndex == MS_OS_20_DESCRIPTOR_INDEX) {
-		*data = (uint8_t *)(&msosv2_cmsis_dap_desc);
-		*len = sizeof(msosv2_cmsis_dap_desc);
-
-		LOG_DBG("Get MS OS Descriptors v2");
-
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-USBD_CLASS_DESCR_DEFINE(primary, 0) struct {
-	struct usb_if_descriptor if0;
-	struct usb_ep_descriptor if0_out_ep;
-	struct usb_ep_descriptor if0_in_ep;
-} __packed dapusb_desc = {
-	.if0 = {
-		.bLength = sizeof(struct usb_if_descriptor),
-		.bDescriptorType = USB_DESC_INTERFACE,
-		.bInterfaceNumber = 0,
-		.bAlternateSetting = 0,
-		.bNumEndpoints = 2,
-		.bInterfaceClass = USB_BCC_VENDOR,
-		.bInterfaceSubClass = 0,
-		.bInterfaceProtocol = 0,
-		.iInterface = 0,
-	},
-	.if0_out_ep = {
-		.bLength = sizeof(struct usb_ep_descriptor),
-		.bDescriptorType = USB_DESC_ENDPOINT,
-		.bEndpointAddress = DAP_USB_EP_OUT,
-		.bmAttributes = USB_DC_EP_BULK,
-		.wMaxPacketSize = sys_cpu_to_le16(CONFIG_CMSIS_DAP_PACKET_SIZE),
-		.bInterval = 0,
-	},
-	.if0_in_ep = {
-		.bLength = sizeof(struct usb_ep_descriptor),
-		.bDescriptorType = USB_DESC_ENDPOINT,
-		.bEndpointAddress = DAP_USB_EP_IN,
-		.bmAttributes = USB_DC_EP_BULK,
-		.wMaxPacketSize = sys_cpu_to_le16(CONFIG_CMSIS_DAP_PACKET_SIZE),
-		.bInterval = 0,
-	},
-};
-
-static struct usb_ep_cfg_data dapusb_ep_data[] = {
-	{
-		.ep_cb	= usb_transfer_ep_callback,
-		.ep_addr = DAP_USB_EP_OUT
-	},
-	{
-		.ep_cb = usb_transfer_ep_callback,
-		.ep_addr = DAP_USB_EP_IN
-	}
-};
-
-static void iface_string_desc_init(struct usb_cfg_data *bulk_cfg)
-{
-	struct usb_if_descriptor *bulk_if = bulk_cfg->interface_descriptor;
-
-	bulk_if->iInterface = usb_get_str_descriptor_idx(&dap_iface_desc);
-}
-
-static void dapusb_read_cb(uint8_t ep, int size, void *priv)
-{
-	struct usb_cfg_data *cfg = priv;
-	struct net_buf *buf;
-
-	LOG_DBG("cfg %p ep %x size %u", cfg, ep, size);
-
-	if (size <= 0) {
-		goto read_cb_done;
-	}
-
-	buf = net_buf_alloc(&dapusb_rx_pool, K_FOREVER);
-	net_buf_add_mem(buf, rx_buf, MIN(size, CONFIG_CMSIS_DAP_PACKET_SIZE));
-	k_fifo_put(&dap_rx_queue, buf);
-
-read_cb_done:
-	usb_transfer(ep, rx_buf, sizeof(rx_buf), USB_TRANS_READ, dapusb_read_cb, cfg);
-}
-
-static void dapusb_dev_status_cb(struct usb_cfg_data *cfg,
-				 enum usb_dc_status_code status,
-				 const uint8_t *param)
-{
-	ARG_UNUSED(param);
-
-	if (status == USB_DC_CONFIGURED) {
-		dapusb_read_cb(cfg->endpoint[DAP_USB_EP_IN_IDX].ep_addr, 0, cfg);
-	}
-}
-
-static void dapusb_interface_config(struct usb_desc_header *head,
-				    uint8_t bInterfaceNumber)
-{
-	ARG_UNUSED(head);
-
-	dapusb_desc.if0.bInterfaceNumber = bInterfaceNumber;
-#if defined(CONFIG_USB_COMPOSITE_DEVICE)
-	msosv2_cmsis_dap_desc.subset_header.bFirstInterface = bInterfaceNumber;
-#endif
-}
-
-USBD_DEFINE_CFG_DATA(dapusb_config) = {
-	.usb_device_description = NULL,
-	.interface_config = dapusb_interface_config,
-	.interface_descriptor = &dapusb_desc.if0,
-	.cb_usb_status = dapusb_dev_status_cb,
-	.interface = {
-		.class_handler = NULL,
-		.custom_handler = NULL,
-		.vendor_handler = msosv2_vendor_handle_req,
-	},
-	.num_endpoints = ARRAY_SIZE(dapusb_ep_data),
-	.endpoint = dapusb_ep_data
-};
-
-static int dap_usb_process(void)
-{
-	uint8_t ep = dapusb_config.endpoint[DAP_USB_EP_OUT_IDX].ep_addr;
-	struct net_buf *buf;
-	size_t len;
-	int err;
-
-	buf = k_fifo_get(&dap_rx_queue, K_FOREVER);
-
-	len = dap_execute_cmd(buf->data, tx_buf);
-	LOG_DBG("response length %u, starting with [0x%02X, 0x%02X]",
-		len, tx_buf[0], tx_buf[1]);
-	net_buf_unref(buf);
-
-	err = usb_transfer_sync(ep, tx_buf, len, USB_TRANS_WRITE | USB_TRANS_NO_ZLP);
-	if (err < 0 || err != len) {
-		LOG_ERR("usb_transfer_sync failed, %d", err);
-		return -EIO;
-	}
-
-	return 0;
-}
+#include "webusb.h"
+#include "msosv2.h"
 
 int main(void)
 {
 	const struct device *const swd_dev = DEVICE_DT_GET_ONE(zephyr_swdp_gpio);
+	struct usbd_context *sample_usbd;
 	int ret;
 
-	if (!device_is_ready(swd_dev)) {
-		LOG_ERR("SWD device is not ready");
+	ret = dap_setup(swd_dev);
+	if (ret) {
+		LOG_ERR("Failed to initialize DAP controller, %d", ret);
+		return ret;
+	}
+
+	sample_usbd = sample_usbd_setup_device(NULL);
+	if (sample_usbd == NULL) {
+		LOG_ERR("Failed to setup USB device");
 		return -ENODEV;
 	}
 
-	ret = dap_setup(swd_dev);
+	ret = usbd_add_descriptor(sample_usbd, &bos_vreq_msosv2);
 	if (ret) {
-		LOG_ERR("Failed to initialize DAP controller, %d", ret);
+		LOG_ERR("Failed to add MSOSv2 capability descriptor");
 		return ret;
 	}
 
-	/* Add MS OS 2.0 BOS descriptor to BOS structure */
-	usb_bos_register_cap((void *)&bos_cap_msosv2);
-	/* Point interface index to string descriptor */
-	iface_string_desc_init(&dapusb_config);
+	ret = usbd_add_descriptor(sample_usbd, &bos_vreq_webusb);
+	if (ret) {
+		LOG_ERR("Failed to add WebUSB capability descriptor");
+		return ret;
+	}
 
-	ret = usb_enable(NULL);
-	if (ret != 0) {
-		LOG_ERR("Failed to enable USB");
-		return 0;
+	ret = usbd_init(sample_usbd);
+	if (ret) {
+		LOG_ERR("Failed to initialize device support");
+		return ret;
 	}
 
-	while (!dap_usb_process()) {
+	ret = usbd_enable(sample_usbd);
+	if (ret) {
+		LOG_ERR("Failed to enable device support");
+		return ret;
 	}
 
-	return usb_disable();
+	return 0;
 }
diff --git a/samples/subsys/dap/src/msosv2.h b/samples/subsys/dap/src/msosv2.h
new file mode 100644
index 0000000000000..c00d614c3508e
--- /dev/null
+++ b/samples/subsys/dap/src/msosv2.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2016-2019 Intel Corporation
+ * Copyright (c) 2023-2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_MSOSV2_DESCRIPTOR_H
+#define ZEPHYR_INCLUDE_MSOSV2_DESCRIPTOR_H
+
+/*
+ * Microsoft OS 2.0 platform capability and Microsoft OS 2.0 descriptor set.
+ * See Microsoft OS 2.0 Descriptors Specification for reference.
+ */
+
+#define SAMPLE_MSOS2_VENDOR_CODE	0x02U
+/* Windows version (10)*/
+#define SAMPLE_MSOS2_OS_VERSION		0x0A000000UL
+
+/* {CDB3B5AD-293B-4663-AA36-1AAE46463776} */
+#define CMSIS_DAP_V2_DEVICE_INTERFACE_GUID \
+	'{', 0x00, 'C', 0x00, 'D', 0x00, 'B', 0x00, '3', 0x00, 'B', 0x00, \
+	'5', 0x00, 'A', 0x00, 'D', 0x00, '-', 0x00, '2', 0x00, '9', 0x00, \
+	'3', 0x00, 'B', 0x00, '-', 0x00, '4', 0x00, '6', 0x00, '6', 0x00, \
+	'3', 0x00, '-', 0x00, 'A', 0x00, 'A', 0x00, '3', 0x00, '6', 0x00, \
+	'-', 0x00, '1', 0x00, 'A', 0x00, 'A', 0x00, 'E', 0x00, '4', 0x00, \
+	'6', 0x00, '4', 0x00, '6', 0x00, '3', 0x00, '7', 0x00, '7', 0x00, \
+	'6', 0x00, '}', 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define CDC_ACM_DESCRIPTOR_LENGTH 160
+
+struct msosv2_descriptor {
+	struct msosv2_descriptor_set_header header;
+#if defined(CONFIG_USBD_CDC_ACM_CLASS)
+	/*
+	 * The composition of this descriptor is specific to the WebUSB example
+	 * in its default configuration. If you use it for your application or
+	 * change the configuration, you may need to modify this descriptor for
+	 * your USB device. The following only covers the case where the CDC
+	 * ACM implementation is enabled, and there is only one CDC ACM UART
+	 * instance, and the CDC ACM communication interface is the first in
+	 * the configuration.
+	 */
+	struct msosv2_function_subset_header subset_header;
+#endif
+	struct msosv2_compatible_id compatible_id;
+	struct msosv2_guids_property guids_property;
+} __packed;
+
+static struct msosv2_descriptor msosv2_desc = {
+	.header = {
+		.wLength = sizeof(struct msosv2_descriptor_set_header),
+		.wDescriptorType = MS_OS_20_SET_HEADER_DESCRIPTOR,
+		.dwWindowsVersion = sys_cpu_to_le32(SAMPLE_MSOS2_OS_VERSION),
+		.wTotalLength = sizeof(msosv2_desc),
+	},
+#if defined(CONFIG_USBD_CDC_ACM_CLASS)
+	.subset_header = {
+		.wLength = sizeof(struct msosv2_function_subset_header),
+		.wDescriptorType = MS_OS_20_SUBSET_HEADER_FUNCTION,
+		.bFirstInterface = 0,
+		.wSubsetLength = CDC_ACM_DESCRIPTOR_LENGTH,
+	},
+#endif
+	.compatible_id = {
+		.wLength = sizeof(struct msosv2_compatible_id),
+		.wDescriptorType = MS_OS_20_FEATURE_COMPATIBLE_ID,
+		.CompatibleID = {'W', 'I', 'N', 'U', 'S', 'B', 0x00, 0x00},
+	},
+	.guids_property = {
+		.wLength = sizeof(struct msosv2_guids_property),
+		.wDescriptorType = MS_OS_20_FEATURE_REG_PROPERTY,
+		.wPropertyDataType = MS_OS_20_PROPERTY_DATA_REG_MULTI_SZ,
+		.wPropertyNameLength = 42,
+		.PropertyName = {DEVICE_INTERFACE_GUIDS_PROPERTY_NAME},
+		.wPropertyDataLength = 80,
+		.bPropertyData = {CMSIS_DAP_V2_DEVICE_INTERFACE_GUID},
+	},
+};
+
+struct bos_msosv2_descriptor {
+	struct usb_bos_platform_descriptor platform;
+	struct usb_bos_capability_msos cap;
+} __packed;
+
+struct bos_msosv2_descriptor bos_msosv2_desc = {
+	/*
+	 * Microsoft OS 2.0 Platform Capability Descriptor,
+	 * see Microsoft OS 2.0 Descriptors Specification
+	 */
+	.platform = {
+		.bLength = sizeof(struct usb_bos_platform_descriptor)
+			 + sizeof(struct usb_bos_capability_msos),
+		.bDescriptorType = USB_DESC_DEVICE_CAPABILITY,
+		.bDevCapabilityType = USB_BOS_CAPABILITY_PLATFORM,
+		.bReserved = 0,
+		/* Microsoft OS 2.0 descriptor platform capability UUID
+		 * D8DD60DF-4589-4CC7-9CD2-659D9E648A9F
+		 */
+		.PlatformCapabilityUUID = {
+			0xDF, 0x60, 0xDD, 0xD8,
+			0x89, 0x45,
+			0xC7, 0x4C,
+			0x9C, 0xD2,
+			0x65, 0x9D, 0x9E, 0x64, 0x8A, 0x9F,
+		},
+	},
+	.cap = {
+		.dwWindowsVersion = sys_cpu_to_le32(SAMPLE_MSOS2_OS_VERSION),
+		.wMSOSDescriptorSetTotalLength = sys_cpu_to_le16(sizeof(msosv2_desc)),
+		.bMS_VendorCode = SAMPLE_MSOS2_VENDOR_CODE,
+		.bAltEnumCode = 0x00
+	},
+};
+
+static int msosv2_to_host_cb(const struct usbd_context *const ctx,
+			     const struct usb_setup_packet *const setup,
+			     struct net_buf *const buf)
+{
+	LOG_INF("Vendor callback to host");
+
+	if (setup->bRequest == SAMPLE_MSOS2_VENDOR_CODE &&
+	    setup->wIndex == MS_OS_20_DESCRIPTOR_INDEX) {
+		LOG_INF("Get MS OS 2.0 Descriptor Set");
+
+		net_buf_add_mem(buf, &msosv2_desc,
+				MIN(net_buf_tailroom(buf), sizeof(msosv2_desc)));
+
+		return 0;
+	}
+
+	return -ENOTSUP;
+}
+
+USBD_DESC_BOS_VREQ_DEFINE(bos_vreq_msosv2, sizeof(bos_msosv2_desc), &bos_msosv2_desc,
+			  SAMPLE_MSOS2_VENDOR_CODE, msosv2_to_host_cb, NULL);
+
+#endif /* ZEPHYR_INCLUDE_MSOSV2_DESCRIPTOR_H */
diff --git a/samples/subsys/dap/src/webusb.h b/samples/subsys/dap/src/webusb.h
new file mode 100644
index 0000000000000..c1cda8924ec12
--- /dev/null
+++ b/samples/subsys/dap/src/webusb.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016-2019 Intel Corporation
+ * Copyright (c) 2023-2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_WEBUSB_DESCRIPTOR_H
+#define ZEPHYR_INCLUDE_WEBUSB_DESCRIPTOR_H
+
+/*
+ * WebUSB platform capability and WebUSB URL descriptor.
+ * See https://wicg.github.io/webusb for reference.
+ */
+
+#define WEBUSB_REQ_GET_URL		0x02U
+#define WEBUSB_DESC_TYPE_URL		0x03U
+#define WEBUSB_URL_PREFIX_HTTP		0x00U
+#define WEBUSB_URL_PREFIX_HTTPS		0x01U
+
+#define SAMPLE_WEBUSB_VENDOR_CODE	0x01U
+#define SAMPLE_WEBUSB_LANDING_PAGE	0x01U
+
+struct usb_bos_webusb_desc {
+	struct usb_bos_platform_descriptor platform;
+	struct usb_bos_capability_webusb cap;
+} __packed;
+
+static const struct usb_bos_webusb_desc bos_cap_webusb = {
+	/* WebUSB Platform Capability Descriptor:
+	 * https://wicg.github.io/webusb/#webusb-platform-capability-descriptor
+	 */
+	.platform = {
+		.bLength = sizeof(struct usb_bos_platform_descriptor)
+			 + sizeof(struct usb_bos_capability_webusb),
+		.bDescriptorType = USB_DESC_DEVICE_CAPABILITY,
+		.bDevCapabilityType = USB_BOS_CAPABILITY_PLATFORM,
+		.bReserved = 0,
+		/* WebUSB Platform Capability UUID
+		 * 3408b638-09a9-47a0-8bfd-a0768815b665
+		 */
+		.PlatformCapabilityUUID = {
+			0x38, 0xB6, 0x08, 0x34,
+			0xA9, 0x09,
+			0xA0, 0x47,
+			0x8B, 0xFD,
+			0xA0, 0x76, 0x88, 0x15, 0xB6, 0x65,
+		},
+	},
+	.cap = {
+		.bcdVersion = sys_cpu_to_le16(0x0100),
+		.bVendorCode = SAMPLE_WEBUSB_VENDOR_CODE,
+		.iLandingPage = SAMPLE_WEBUSB_LANDING_PAGE
+	}
+};
+
+/* WebUSB URL Descriptor, see https://wicg.github.io/webusb/#webusb-descriptors */
+static const uint8_t webusb_origin_url[] = {
+	/* bLength, bDescriptorType, bScheme, UTF-8 encoded URL */
+	0x24, WEBUSB_DESC_TYPE_URL, WEBUSB_URL_PREFIX_HTTPS,
+	'w', 'w', 'w', '.',
+	'z', 'e', 'p', 'h', 'y', 'r', 'p', 'r', 'o', 'j', 'e', 'c', 't', '.',
+	'o', 'r', 'g', '/',
+};
+
+static int webusb_to_host_cb(const struct usbd_context *const ctx,
+			     const struct usb_setup_packet *const setup,
+			     struct net_buf *const buf)
+{
+	LOG_INF("Vendor callback to host");
+
+	if (setup->wIndex == WEBUSB_REQ_GET_URL) {
+		uint8_t index = USB_GET_DESCRIPTOR_INDEX(setup->wValue);
+
+		if (index != SAMPLE_WEBUSB_LANDING_PAGE) {
+			return -ENOTSUP;
+		}
+
+		LOG_INF("Get URL request, index %u", index);
+		net_buf_add_mem(buf, &webusb_origin_url,
+				MIN(net_buf_tailroom(buf), sizeof(webusb_origin_url)));
+
+		return 0;
+	}
+
+	return -ENOTSUP;
+}
+
+USBD_DESC_BOS_VREQ_DEFINE(bos_vreq_webusb, sizeof(bos_cap_webusb), &bos_cap_webusb,
+			  SAMPLE_WEBUSB_VENDOR_CODE, webusb_to_host_cb, NULL);
+
+#endif /* ZEPHYR_INCLUDE_WEBUSB_DESCRIPTOR_H */
diff --git a/samples/subsys/debug/fuzz/sample.yaml b/samples/subsys/debug/fuzz/sample.yaml
index 3b1dc0b92ec85..917986aeaf59f 100644
--- a/samples/subsys/debug/fuzz/sample.yaml
+++ b/samples/subsys/debug/fuzz/sample.yaml
@@ -1,10 +1,10 @@
 sample:
-  description: native_posix-based libfuzzer example
+  description: native_sim-based libfuzzer example
   name: fuzz
 tests:
   sample.debug.fuzz:
     toolchain_allow: llvm
-    platform_allow: native_posix/native/64
+    platform_allow: native_sim/native/64
     harness: console
     harness_config:
       type: one_line
diff --git a/samples/subsys/debug/fuzz/src/main.c b/samples/subsys/debug/fuzz/src/main.c
index 95de59862821e..bac005be7d12f 100644
--- a/samples/subsys/debug/fuzz/src/main.c
+++ b/samples/subsys/debug/fuzz/src/main.c
@@ -9,12 +9,6 @@
 #if defined(CONFIG_BOARD_NATIVE_SIM)
 #include <nsi_cpu_if.h>
 #include <nsi_main_semipublic.h>
-#elif defined(CONFIG_BOARD_NATIVE_POSIX)
-/* Note: native_posix will be deprecated soon */
-extern void posix_init(int argc, char *argv[]);
-extern void posix_exec_for(uint64_t us);
-#define nsi_init posix_init
-#define nsi_exec_for posix_exec_for
 #else
 #error "Platform not supported"
 #endif
diff --git a/samples/subsys/display/cfb/src/main.c b/samples/subsys/display/cfb/src/main.c
index 45369d7ffabf8..079dd0a355f2b 100644
--- a/samples/subsys/display/cfb/src/main.c
+++ b/samples/subsys/display/cfb/src/main.c
@@ -44,7 +44,7 @@ int main(void)
 	display_blanking_off(dev);
 
 	x_res = cfb_get_display_parameter(dev, CFB_DISPLAY_WIDTH);
-	y_res = cfb_get_display_parameter(dev, CFB_DISPLAY_HEIGH);
+	y_res = cfb_get_display_parameter(dev, CFB_DISPLAY_HEIGHT);
 	rows = cfb_get_display_parameter(dev, CFB_DISPLAY_ROWS);
 	ppt = cfb_get_display_parameter(dev, CFB_DISPLAY_PPT);
 
diff --git a/samples/subsys/display/lvgl/README.rst b/samples/subsys/display/lvgl/README.rst
index 0bfeff7c7639c..080c5f33a3313 100644
--- a/samples/subsys/display/lvgl/README.rst
+++ b/samples/subsys/display/lvgl/README.rst
@@ -38,14 +38,15 @@ Requirements
 Display shield and a board which provides a configuration
 for corresponding connectors, for example:
 
-- :ref:`adafruit_2_8_tft_touch_v2` and :ref:`nrf52840dk_nrf52840`
-- :ref:`buydisplay_2_8_tft_touch_arduino` and :ref:`nrf52840dk_nrf52840`
+- :ref:`adafruit_2_8_tft_touch_v2` and :zephyr:board:`nrf52840dk`
+- :ref:`buydisplay_2_8_tft_touch_arduino` and :zephyr:board:`nrf52840dk`
 - :ref:`ssd1306_128_shield` and :zephyr:board:`frdm_k64f`
 - :ref:`seeed_xiao_round_display` and :zephyr:board:`xiao_ble`
 
 or a board with an integrated display:
 
 - :zephyr:board:`esp_wrover_kit`
+- :zephyr:board:`adafruit_feather_esp32s3_tft`
 
 or a simulated display environment in a :ref:`native_sim <native_sim>` application:
 
@@ -65,7 +66,7 @@ or
 Building and Running
 ********************
 
-Example building for :ref:`nrf52840dk_nrf52840`:
+Example building for :zephyr:board:`nrf52840dk`:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/display/lvgl
diff --git a/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft.conf b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft.conf
new file mode 100644
index 0000000000000..cf023663fe53a
--- /dev/null
+++ b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft.conf
@@ -0,0 +1,6 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
+
+CONFIG_MAIN_STACK_SIZE=4096
diff --git a/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft.overlay b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft.overlay
new file mode 100644
index 0000000000000..bf62c27670add
--- /dev/null
+++ b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft.overlay
@@ -0,0 +1,3 @@
+&st7789v_tft {
+	status = "okay";
+};
diff --git a/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft_reverse.conf b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft_reverse.conf
new file mode 100644
index 0000000000000..cf023663fe53a
--- /dev/null
+++ b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft_reverse.conf
@@ -0,0 +1,6 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
+
+CONFIG_MAIN_STACK_SIZE=4096
diff --git a/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft_reverse.overlay b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft_reverse.overlay
new file mode 100644
index 0000000000000..bf62c27670add
--- /dev/null
+++ b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s2_tft_reverse.overlay
@@ -0,0 +1,3 @@
+&st7789v_tft {
+	status = "okay";
+};
diff --git a/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s3_tft_procpu.conf b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s3_tft_procpu.conf
new file mode 100644
index 0000000000000..cf023663fe53a
--- /dev/null
+++ b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s3_tft_procpu.conf
@@ -0,0 +1,6 @@
+CONFIG_POWER_DOMAIN=y
+CONFIG_GPIO=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
+
+CONFIG_MAIN_STACK_SIZE=4096
diff --git a/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s3_tft_procpu.overlay b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s3_tft_procpu.overlay
new file mode 100644
index 0000000000000..bf62c27670add
--- /dev/null
+++ b/samples/subsys/display/lvgl/boards/adafruit_feather_esp32s3_tft_procpu.overlay
@@ -0,0 +1,3 @@
+&st7789v_tft {
+	status = "okay";
+};
diff --git a/samples/subsys/display/lvgl/boards/native_posix.conf b/samples/subsys/display/lvgl/boards/native_posix.conf
deleted file mode 100644
index e5f19abc888f7..0000000000000
--- a/samples/subsys/display/lvgl/boards/native_posix.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_LV_COLOR_DEPTH_32=y
-CONFIG_GPIO=y
-CONFIG_INPUT=y
diff --git a/samples/subsys/display/lvgl/boards/native_posix.overlay b/samples/subsys/display/lvgl/boards/native_posix.overlay
deleted file mode 100644
index 29c03cc09284a..0000000000000
--- a/samples/subsys/display/lvgl/boards/native_posix.overlay
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2022, Basalte bv
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-#include <zephyr/dt-bindings/lvgl/lvgl.h>
-
-/ {
-	aliases {
-		sw0 = &button0;
-	};
-
-	qdec {
-		compatible = "gpio-qdec";
-		gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>, <&gpio0 5 GPIO_ACTIVE_HIGH>;
-		steps-per-period = <4>;
-		zephyr,axis = <INPUT_REL_WHEEL>;
-		sample-time-us = <2000>;
-		idle-timeout-ms = <200>;
-	};
-
-	keys: keys {
-		compatible = "gpio-keys";
-		button0: button0 {
-			/* gpio0 pin 0 is already aliased to led0 */
-			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
-			zephyr,code = <INPUT_KEY_R>;
-		};
-
-		button1: button1 {
-			gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
-			zephyr,code = <INPUT_KEY_B>;
-		};
-
-		encoder_button: encoder_button {
-			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
-			zephyr,code = <INPUT_KEY_0>;
-		};
-
-		button_left: button_left {
-			gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
-			zephyr,code = <INPUT_KEY_LEFT>;
-		};
-
-		button_right: button_right {
-			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
-			zephyr,code = <INPUT_KEY_RIGHT>;
-		};
-
-		button_enter: button_enter {
-			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
-			zephyr,code = <INPUT_KEY_ENTER>;
-		};
-	};
-
-	lvgl_button_input {
-		compatible = "zephyr,lvgl-button-input";
-		input = <&keys>;
-		input-codes = <INPUT_KEY_B>;
-		coordinates = <160 120>;
-	};
-
-	lvgl_encoder_input {
-		compatible = "zephyr,lvgl-encoder-input";
-		rotation-input-code = <INPUT_REL_WHEEL>;
-		button-input-code = <INPUT_KEY_0>;
-	};
-
-	lvgl_keypad_input {
-		compatible = "zephyr,lvgl-keypad-input";
-		input = <&keys>;
-		input-codes = <INPUT_KEY_LEFT INPUT_KEY_RIGHT INPUT_KEY_ENTER>;
-		lvgl-codes = <LV_KEY_LEFT LV_KEY_RIGHT LV_KEY_ENTER>;
-	};
-};
-
-&gpio0 {
-	ngpios = <9>;
-
-	sdl_gpio {
-		status = "okay";
-		compatible = "zephyr,gpio-emul-sdl";
-		/* Skip pin 0 with the unknown code 0 */
-		scancodes = <0 21 5 30 31 32 80 79 40>;
-	};
-};
diff --git a/samples/subsys/display/lvgl/boards/native_sim.overlay b/samples/subsys/display/lvgl/boards/native_sim.overlay
index a77c43378bd62..29c03cc09284a 100644
--- a/samples/subsys/display/lvgl/boards/native_sim.overlay
+++ b/samples/subsys/display/lvgl/boards/native_sim.overlay
@@ -1,6 +1,88 @@
 /*
- * Copyright (c) 2023, Nordic Semiconductor ASA
+ * Copyright (c) 2022, Basalte bv
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "native_posix.overlay"
+
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+#include <zephyr/dt-bindings/lvgl/lvgl.h>
+
+/ {
+	aliases {
+		sw0 = &button0;
+	};
+
+	qdec {
+		compatible = "gpio-qdec";
+		gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>, <&gpio0 5 GPIO_ACTIVE_HIGH>;
+		steps-per-period = <4>;
+		zephyr,axis = <INPUT_REL_WHEEL>;
+		sample-time-us = <2000>;
+		idle-timeout-ms = <200>;
+	};
+
+	keys: keys {
+		compatible = "gpio-keys";
+		button0: button0 {
+			/* gpio0 pin 0 is already aliased to led0 */
+			gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_R>;
+		};
+
+		button1: button1 {
+			gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_B>;
+		};
+
+		encoder_button: encoder_button {
+			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_0>;
+		};
+
+		button_left: button_left {
+			gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_LEFT>;
+		};
+
+		button_right: button_right {
+			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_RIGHT>;
+		};
+
+		button_enter: button_enter {
+			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+			zephyr,code = <INPUT_KEY_ENTER>;
+		};
+	};
+
+	lvgl_button_input {
+		compatible = "zephyr,lvgl-button-input";
+		input = <&keys>;
+		input-codes = <INPUT_KEY_B>;
+		coordinates = <160 120>;
+	};
+
+	lvgl_encoder_input {
+		compatible = "zephyr,lvgl-encoder-input";
+		rotation-input-code = <INPUT_REL_WHEEL>;
+		button-input-code = <INPUT_KEY_0>;
+	};
+
+	lvgl_keypad_input {
+		compatible = "zephyr,lvgl-keypad-input";
+		input = <&keys>;
+		input-codes = <INPUT_KEY_LEFT INPUT_KEY_RIGHT INPUT_KEY_ENTER>;
+		lvgl-codes = <LV_KEY_LEFT LV_KEY_RIGHT LV_KEY_ENTER>;
+	};
+};
+
+&gpio0 {
+	ngpios = <9>;
+
+	sdl_gpio {
+		status = "okay";
+		compatible = "zephyr,gpio-emul-sdl";
+		/* Skip pin 0 with the unknown code 0 */
+		scancodes = <0 21 5 30 31 32 80 79 40>;
+	};
+};
diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml
index 185cf55e0135d..b2dc1af4750da 100644
--- a/samples/subsys/display/lvgl/sample.yaml
+++ b/samples/subsys/display/lvgl/sample.yaml
@@ -80,12 +80,13 @@ tests:
     extra_args: SHIELD=rk043fn02h_ct
     harness_config:
       fixture: fixture_display_rk043fn02h_ct
-  sample.subsys.display.lvgl.rtkmipilcdb00000be:
-    tags: shield
-    platform_allow:
-      - ek_ra8d1
-    harness: console
-    extra_args: SHIELD=rtkmipilcdb00000be
+  sample.subsys.display.lvgl.renesas_ra_glcdc:
+    tags:
+      - shield
+    filter: dt_compat_enabled("renesas,ra-glcdc")
+    extra_args:
+      - platform:ek_ra8d1/r7fa8d1bhecbd:SHIELD=rtkmipilcdb00000be
+      - platform:ek_ra8d1/r7fa8d1bhecbd:SHIELD=rtk7eka6m3b00001bu
     harness_config:
       fixture: fixture_display
   sample.subsys.display.lvgl.seeed_xiao_round_display:
diff --git a/samples/subsys/fs/fatfs_fstab/CMakeLists.txt b/samples/subsys/fs/fatfs_fstab/CMakeLists.txt
new file mode 100644
index 0000000000000..3b5f0cb2158f7
--- /dev/null
+++ b/samples/subsys/fs/fatfs_fstab/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Endress+Hauser AG
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(fatfs_fstab_sample)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/subsys/fs/fatfs_fstab/README.rst b/samples/subsys/fs/fatfs_fstab/README.rst
new file mode 100644
index 0000000000000..6ad098d0a6e3c
--- /dev/null
+++ b/samples/subsys/fs/fatfs_fstab/README.rst
@@ -0,0 +1,36 @@
+.. zephyr:code-sample:: fatfs-fstab
+   :name: Fatfs filesystem fstab
+   :relevant-api: file_system_api
+
+   Define fatfs filesystems in the devicetree.
+
+Overview
+***********
+
+This sample shows how to define a fatfs fstab entry in the devicetree.
+This scenario uses a fatfs on a RAM disk. The sample is run on the
+``native_sim`` board.
+
+Building and running
+********************
+
+To run this sample, build it for the ``native_sim`` board
+and afterwards run the generated executable file within the build folder.
+
+The RAM disk sample for the ``native_sim`` board can be built as follows:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/fs/fatfs_fstab
+   :host-os: unix
+   :board: native_sim
+   :gen-args: -DDTC_OVERLAY_FILE=fatfs_fstab.overlay
+   :goals: build
+   :compact:
+
+Sample Output
+=============
+
+When the sample runs successfully you should see following message on the screen:
+.. code-block:: console
+
+  I: Filesystem access successful
diff --git a/samples/subsys/fs/fatfs_fstab/fatfs_fstab.overlay b/samples/subsys/fs/fatfs_fstab/fatfs_fstab.overlay
new file mode 100644
index 0000000000000..d537973911c3a
--- /dev/null
+++ b/samples/subsys/fs/fatfs_fstab/fatfs_fstab.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Endress+Hauser AG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	fstab {
+		compatible = "zephyr,fstab";
+		ffs1: ffs1 {
+			compatible = "zephyr,fstab,fatfs";
+			automount;
+			disk-access;
+			mount-point = "/RAM:";
+		};
+	};
+
+	ramdisk0 {
+		compatible = "zephyr,ram-disk";
+		disk-name = "RAM";
+		sector-size = <512>;
+		sector-count = <128>;
+	};
+};
diff --git a/samples/subsys/fs/fatfs_fstab/prj.conf b/samples/subsys/fs/fatfs_fstab/prj.conf
new file mode 100644
index 0000000000000..339f38486f879
--- /dev/null
+++ b/samples/subsys/fs/fatfs_fstab/prj.conf
@@ -0,0 +1,10 @@
+CONFIG_DISK_ACCESS=y
+CONFIG_DISK_DRIVERS=y
+
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
+
+CONFIG_FILE_SYSTEM=y
+CONFIG_FILE_SYSTEM_MKFS=y
+CONFIG_FAT_FILESYSTEM_ELM=y
+CONFIG_FS_FATFS_FSTAB_AUTOMOUNT=y
diff --git a/samples/subsys/fs/fatfs_fstab/sample.yaml b/samples/subsys/fs/fatfs_fstab/sample.yaml
new file mode 100644
index 0000000000000..b9464174925da
--- /dev/null
+++ b/samples/subsys/fs/fatfs_fstab/sample.yaml
@@ -0,0 +1,14 @@
+sample:
+  name: fatfs fstab sample
+tests:
+  sample.filesystem.fat_fs.fstab:
+    platform_allow:
+      - native_sim
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE="fatfs_fstab.overlay"
+    tags: filesystem
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "I: Filesystem access successful"
diff --git a/samples/subsys/fs/fatfs_fstab/src/main.c b/samples/subsys/fs/fatfs_fstab/src/main.c
new file mode 100644
index 0000000000000..3f98d0debda6f
--- /dev/null
+++ b/samples/subsys/fs/fatfs_fstab/src/main.c
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2025 Endress+Hauser AG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <ff.h>
+#include <zephyr/device.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/storage/disk_access.h>
+
+LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
+
+#define AUTOMOUNT_NODE DT_NODELABEL(ffs1)
+FS_FSTAB_DECLARE_ENTRY(AUTOMOUNT_NODE);
+
+#define FILE_PATH "/RAM:/hello.txt"
+
+int main(void)
+{
+	struct fs_file_t file;
+	int rc;
+	static const char data[] = "Hello";
+	/* You can get direct mount point to automounted node too */
+	struct fs_mount_t *auto_mount_point = &FS_FSTAB_ENTRY(AUTOMOUNT_NODE);
+	struct fs_dirent stat;
+
+	fs_file_t_init(&file);
+
+	rc = fs_open(&file, FILE_PATH, FS_O_CREATE | FS_O_WRITE);
+	if (rc != 0) {
+		LOG_ERR("Accessing filesystem failed");
+		return rc;
+	}
+
+	rc = fs_write(&file, data, strlen(data));
+	if (rc != strlen(data)) {
+		LOG_ERR("Writing filesystem failed");
+		return rc;
+	}
+
+	rc = fs_close(&file);
+	if (rc != 0) {
+		LOG_ERR("Closing file failed");
+		return rc;
+	}
+
+	/* You can unmount the automount node */
+	rc = fs_unmount(auto_mount_point);
+	if (rc != 0) {
+		LOG_ERR("Failed to do unmount");
+		return rc;
+	};
+
+	/* And mount it back */
+	rc = fs_mount(auto_mount_point);
+	if (rc != 0) {
+		LOG_ERR("Failed to remount the auto-mount node");
+		return rc;
+	}
+
+	/* Is the file still there? */
+	rc = fs_stat(FILE_PATH, &stat);
+	if (rc != 0) {
+		LOG_ERR("File status check failed %d", rc);
+		return rc;
+	}
+
+	LOG_INF("Filesystem access successful");
+
+	return 0;
+}
diff --git a/samples/subsys/fs/fs_sample/boards/apollo4p_evb.conf b/samples/subsys/fs/fs_sample/boards/apollo4p_evb.conf
new file mode 100644
index 0000000000000..dd0e39f6b3788
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/apollo4p_evb.conf
@@ -0,0 +1,11 @@
+CONFIG_DISK_DRIVER_MMC=y
+CONFIG_MMC_STACK=y
+CONFIG_SDHC=y
+CONFIG_MMC_SUBSYS=y
+
+CONFIG_MAIN_STACK_SIZE=8192
+CONFIG_IDLE_STACK_SIZE=4096
+CONFIG_AMBIQ_SDIO_ASYNC=y
+CONFIG_PM=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
diff --git a/samples/subsys/fs/fs_sample/boards/max32666fthr_max32666_cpu0.conf b/samples/subsys/fs/fs_sample/boards/max32666fthr_max32666_cpu0.conf
new file mode 100644
index 0000000000000..7b52334dee751
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/max32666fthr_max32666_cpu0.conf
@@ -0,0 +1,3 @@
+CONFIG_SDMMC_SUBSYS=y
+CONFIG_SDHC=y
+CONFIG_LOG=n
diff --git a/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.conf b/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.conf
new file mode 100644
index 0000000000000..e142dedd45088
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.conf
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_DISK_DRIVERS=y
+CONFIG_DISK_DRIVER_FLASH=y
+# There may be no files on internal SoC flash, so this Kconfig
+# options has ben enabled to create some if listing does not
+# find in the first place.
+CONFIG_FS_SAMPLE_CREATE_SOME_ENTRIES=y
diff --git a/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..da13128938aa5
--- /dev/null
+++ b/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Because FAT FS needs at least 64kiB partition and default
+ * storage_partition is 36kiB for this board, we need to reorganize
+ * partitions to get at least 64KiB.
+ */
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_ns_partition;
+/delete-node/ &storage_partition;
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot0_partition: parition@10000 {
+			reg = <0x00010000 DT_SIZE_K(300)>;
+		};
+
+		slot1_partition: partition@5b000 {
+			reg = <0x0005b000 DT_SIZE_K(300)>;
+		};
+
+		storage_partition: partition@a6000 {
+			label = "storage";
+			reg = <0x000a6000 DT_SIZE_K(128)>;
+		};
+	};
+};
+
+/ {
+	msc_disk0 {
+		status = "okay";
+		compatible = "zephyr,flash-disk";
+		partition = <&storage_partition>;
+		disk-name = "SD";
+		cache-size = <512>;
+	};
+};
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
index af7e4913c6b3f..e62f32eaee881 100644
--- a/samples/subsys/fs/fs_sample/sample.yaml
+++ b/samples/subsys/fs/fs_sample/sample.yaml
@@ -58,6 +58,9 @@ tests:
   sample.filesystem.fat_fs.nrf54l15dk:
     build_only: true
     platform_allow: nrf54l15dk/nrf54l15/cpuapp
+  sample.filesystem.fat_fs.ophelia4ev:
+    build_only: true
+    platform_allow: ophelia4ev/nrf54l15/cpuapp
   sample.filesystem.fat_fs.nrf52840dk_nrf52840.qspi:
     build_only: true
     platform_allow: nrf52840dk/nrf52840
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
index 85fa6468ee45d..2ab2b47a3c3dd 100644
--- a/samples/subsys/fs/littlefs/sample.yaml
+++ b/samples/subsys/fs/littlefs/sample.yaml
@@ -24,6 +24,7 @@ tests:
       - stm32h747i_disco/stm32h747xx/m7
       - stm32h750b_dk
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - frdm_ke17z
       - frdm_ke17z512
       - s32z2xxdc2/s32z270/rtu0
diff --git a/samples/subsys/fs/zms/Kconfig b/samples/subsys/fs/zms/Kconfig
new file mode 100644
index 0000000000000..0184fbdc4ef66
--- /dev/null
+++ b/samples/subsys/fs/zms/Kconfig
@@ -0,0 +1,16 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "ZMS sample configuration"
+
+config MAX_ITERATIONS
+	int "The number of iterations that the sample writes the all set of data."
+	default 300
+	range 1 300
+
+config DELETE_ITERATION
+	int "The number of iterations after the sample delete all set of data and verify that it has been deleted."
+	default 10
+	range 1 MAX_ITERATIONS
+
+source "Kconfig.zephyr"
diff --git a/samples/subsys/fs/zms/README.rst b/samples/subsys/fs/zms/README.rst
index f05d1fa0838f2..98deead06d8e8 100644
--- a/samples/subsys/fs/zms/README.rst
+++ b/samples/subsys/fs/zms/README.rst
@@ -20,7 +20,7 @@ Overview
  A loop is executed where we mount the storage system, and then write all set
  of data.
 
- Each DELETE_ITERATION period, we delete all set of data and verify that it has been deleted.
+ Each CONFIG_DELETE_ITERATION period, we delete all set of data and verify that it has been deleted.
  We generate as well incremented ID/value pairs, we store them until storage is full, then we
  delete them and verify that storage is empty.
 
diff --git a/samples/subsys/fs/zms/prj.conf b/samples/subsys/fs/zms/prj.conf
index 343c5021899e8..195027ea287c6 100644
--- a/samples/subsys/fs/zms/prj.conf
+++ b/samples/subsys/fs/zms/prj.conf
@@ -3,3 +3,4 @@ CONFIG_FLASH_MAP=y
 
 CONFIG_ZMS=y
 CONFIG_LOG=y
+CONFIG_LOG_BLOCK_IN_THREAD=y
diff --git a/samples/subsys/fs/zms/sample.yaml b/samples/subsys/fs/zms/sample.yaml
index 802dabcf0f118..c28770ec78a86 100644
--- a/samples/subsys/fs/zms/sample.yaml
+++ b/samples/subsys/fs/zms/sample.yaml
@@ -4,7 +4,11 @@ sample:
 tests:
   sample.zms.basic:
     tags: zms
-    depends_on: zms
     platform_allow:
       - qemu_x86
-      - native_posix
+      - native_sim
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "Sample code finished Successfully"
diff --git a/samples/subsys/fs/zms/src/main.c b/samples/subsys/fs/zms/src/main.c
index 959d5ac5f3e5b..a9615823608f0 100644
--- a/samples/subsys/fs/zms/src/main.c
+++ b/samples/subsys/fs/zms/src/main.c
@@ -26,9 +26,6 @@ static struct zms_fs fs;
 #define CNT_ID        2
 #define LONG_DATA_ID  3
 
-#define MAX_ITERATIONS   300
-#define DELETE_ITERATION 10
-
 static int delete_and_verify_items(struct zms_fs *fs, uint32_t id)
 {
 	int rc = 0;
@@ -112,7 +109,7 @@ int main(void)
 	fs.sector_size = info.size;
 	fs.sector_count = 3U;
 
-	for (i = 0; i < MAX_ITERATIONS; i++) {
+	for (i = 0; i < CONFIG_MAX_ITERATIONS; i++) {
 		rc = zms_mount(&fs);
 		if (rc) {
 			printk("Storage Init failed, rc=%d\n", rc);
@@ -164,7 +161,8 @@ int main(void)
 		rc = zms_read(&fs, CNT_ID, &i_cnt, sizeof(i_cnt));
 		if (rc > 0) { /* item was found, show it */
 			printk("Id: %d, loop_cnt: %u\n", CNT_ID, i_cnt);
-			if (i_cnt != (i - 1)) {
+			if ((i > 0) && (i_cnt != (i - 1))) {
+				printk("Error loop_cnt %u must be %d\n", i_cnt, i - 1);
 				break;
 			}
 		}
@@ -195,8 +193,8 @@ int main(void)
 			break;
 		}
 
-		/* Each DELETE_ITERATION delete all basic items */
-		if (!(i % DELETE_ITERATION) && (i)) {
+		/* Each CONFIG_DELETE_ITERATION delete all basic items */
+		if (!(i % CONFIG_DELETE_ITERATION) && (i)) {
 			rc = delete_basic_items(&fs);
 			if (rc) {
 				break;
@@ -204,7 +202,7 @@ int main(void)
 		}
 	}
 
-	if (i != MAX_ITERATIONS) {
+	if (i != CONFIG_MAX_ITERATIONS) {
 		printk("Error: Something went wrong at iteration %u rc=%d\n", i, rc);
 		return 0;
 	}
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..22c74fe1178ca
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			sram_rx: memory@20018000 {
+				reg = <0x20018000 0x0800>;
+			};
+
+			sram_tx: memory@20020000 {
+				reg = <0x20020000 0x0800>;
+			};
+		};
+	};
+
+	ipc {
+		ipc0: ipc0 {
+			compatible = "zephyr,ipc-icmsg";
+			dcache-alignment = <32>;
+			tx-region = <&sram_tx>;
+			rx-region = <&sram_rx>;
+			mboxes = <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_tx 21>;
+			mbox-names = "rx", "tx";
+			status = "okay";
+		};
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/samples/subsys/ipc/ipc_service/icmsg/src/main.c b/samples/subsys/ipc/ipc_service/icmsg/src/main.c
index 86469cac64b02..afb5016dbeb36 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/src/main.c
+++ b/samples/subsys/ipc/ipc_service/icmsg/src/main.c
@@ -40,6 +40,11 @@ static void ep_bound(void *priv)
 	LOG_INF("Ep bounded");
 }
 
+static void ep_unbound(void *priv)
+{
+	LOG_INF("Ep unbounded");
+}
+
 static void ep_recv(const void *data, size_t len, void *priv)
 {
 #if defined(CONFIG_ASSERT)
@@ -68,6 +73,11 @@ static void ep_recv(const void *data, size_t len, void *priv)
 	}
 }
 
+static void ep_error(const char *message, void *priv)
+{
+	LOG_ERR("ICMsg error: %s", message);
+}
+
 static int send_for_time(struct ipc_ept *ep, const int64_t sending_time_ms)
 {
 	struct data_packet msg = {.data[0] = 'a'};
@@ -123,7 +133,9 @@ static int send_for_time(struct ipc_ept *ep, const int64_t sending_time_ms)
 static struct ipc_ept_cfg ep_cfg = {
 	.cb = {
 		.bound    = ep_bound,
+		.unbound  = ep_unbound,
 		.received = ep_recv,
+		.error    = ep_error,
 	},
 };
 
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
index 29201c036641e..914329396bcb7 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
+++ b/samples/subsys/ipc/ipc_service/static_vrings/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2021 Carlo Caione <ccaione@baylibre.com>
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -9,19 +9,23 @@ cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
+if(CONFIG_INCLUDE_REMOTE_DIR)
 set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
+endif()
 
 if(NOT (CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
         CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP OR
         CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
         CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
         CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
-        CONFIG_BOARD_FRDM_MCXN947_MCXN947_CPU0
+        CONFIG_BOARD_FRDM_MCXN947_MCXN947_CPU0 OR
+        CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM33
        )
   )
-  message(FATAL_ERROR "${BOARD} is not supported for this sample")
+  message("${BOARD} is not supported for this sample")
 endif()
 
+
 project(ipc_service)
 
 if(CONFIG_INCLUDE_REMOTE_DIR)
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
index f00c11c4cf8da..a0a4146d396ee 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
+++ b/samples/subsys/ipc/ipc_service/static_vrings/Kconfig.sysbuild
@@ -1,5 +1,5 @@
 # Copyright 2023 Nordic Semiconductor ASA
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -14,3 +14,4 @@ string
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
 	default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
 	default "frdm_mcxn947/mcxn947/cpu1" if $(BOARD) = "frdm_mcxn947"
+	default "mimxrt1180_evk/mimxrt1189/cm7" if $(BOARD) = "mimxrt1180_evk"
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/README.rst b/samples/subsys/ipc/ipc_service/static_vrings/README.rst
index 086c16ccb1f1c..b0b164abf4eed 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/README.rst
+++ b/samples/subsys/ipc/ipc_service/static_vrings/README.rst
@@ -47,15 +47,6 @@ Building the application for mimxrt1170_evk/mimxrt1176/cm7
    :goals: debug
    :west-args: --sysbuild
 
-Building the application for mimxrt1170_evk@B/mimxrt1176/cm7
-************************************************************
-
-.. zephyr-app-commands::
-   :zephyr-app: samples/subsys/ipc/ipc_service/static_vrings
-   :board: mimxrt1170_evk@B/mimxrt1176/cm7
-   :goals: debug
-   :west-args: --sysbuild
-
 Building the application for frdm_mcxn947/mcxn947/cpu0
 ************************************************************
 
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
index 63efb05fee538..282c868cd1499 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
+++ b/samples/subsys/ipc/ipc_service/static_vrings/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
index 0abcec2d6470c..35cf8f60649b6 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
+++ b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
index 132401362cb70..13f89c250e230 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
+++ b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
deleted file mode 100644
index 0dfb100ed7047..0000000000000
--- a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_MBOX_NXP_IMX_MU=y
-CONFIG_SECOND_CORE_MCUX=y
-CONFIG_INCLUDE_REMOTE_DIR=y
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
deleted file mode 100644
index 132401362cb70..0000000000000
--- a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
-#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
-
-/ {
-	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
-		 * configured.
-		 */
-		/delete-property/ zephyr,ipc;
-		/delete-property/ zephyr,ipc_shm;
-
-		zephyr,console = &lpuart1;
-		zephyr,shell-uart = &lpuart1;
-	};
-
-	/* Define memory regions for IPC
-	 * Note that shared memory must have specific MPU attributes set.
-	 */
-	ocram2_ipc0: memory@202c0000{
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x202c0000 DT_SIZE_K(32)>;
-		zephyr,memory-region="OCRAM2_IPC0";
-		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO))>;
-	};
-	ocram2_ipc1: memory@202c8000{
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x202c8000 DT_SIZE_K(32)>;
-		zephyr,memory-region="OCRAM2_IPC1";
-		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO))>;
-	};
-
-	soc {
-		/* Delete IPM Driver node nxp,imx-mu */
-		/delete-node/ mailbox@40c48000;
-
-		/* Attach MBOX driver to MU Unit */
-		mbox:mbox@40c48000 {
-			compatible = "nxp,mbox-imx-mu";
-			reg = <0x40c48000 0x4000>;
-			interrupts = <118 0>;
-			rx-channels = <4>;
-			#mbox-cells = <1>;
-			status = "okay";
-		};
-	};
-
-	ipc {
-		/delete-node/ ipc0;
-
-		ipc0: ipc0 {
-			compatible = "zephyr,ipc-openamp-static-vrings";
-			memory-region = <&ocram2_ipc0>;
-			mboxes = <&mbox 0>, <&mbox 1>;
-			mbox-names = "tx", "rx";
-			role = "host";
-			status = "okay";
-		};
-
-		ipc1: ipc1 {
-			compatible = "zephyr,ipc-openamp-static-vrings";
-			memory-region = <&ocram2_ipc1>;
-			mboxes = <&mbox 2>, <&mbox 3>;
-			mbox-names = "tx", "rx";
-			role = "host";
-			zephyr,priority = <1 PRIO_COOP>;
-			zephyr,buffer-size = <128>;
-			status = "okay";
-		};
-	};
-};
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1180_evk_mimxrt1189_cm33.conf b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
new file mode 100644
index 0000000000000..60eead5a076e4
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
@@ -0,0 +1,2 @@
+CONFIG_SECOND_CORE_MCUX=y
+CONFIG_INCLUDE_REMOTE_DIR=y
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
new file mode 100644
index 0000000000000..2bcb576660516
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
+/ {
+	/* Define memory regions for IPC */
+	ocram2_ipc0: memory@20500000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20500000 DT_SIZE_K(16)>;
+		zephyr,memory-region="OCRAM2_IPC0";
+		zephyr,memory-attr = <(DT_MEM_ARM(ATTR_MPU_IO))>;
+	};
+
+	ocram2_ipc1: memory@20504000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20504000 DT_SIZE_K(16)>;
+		zephyr,memory-region="OCRAM2_IPC1";
+		zephyr,memory-attr = <(DT_MEM_ARM(ATTR_MPU_IO))>;
+	};
+
+	ipc {
+		/delete-node/ ipc0;
+
+		ipc0: ipc0 {
+			compatible = "zephyr,ipc-openamp-static-vrings";
+			memory-region = <&ocram2_ipc0>;
+			mboxes = <&mbox1_a 0>, <&mbox1_a 1>;
+			mbox-names = "tx", "rx";
+			role = "host";
+			status = "okay";
+		};
+
+		ipc1: ipc1 {
+			compatible = "zephyr,ipc-openamp-static-vrings";
+			memory-region = <&ocram2_ipc1>;
+			mboxes = <&mbox1_a 2>, <&mbox1_a 3>;
+			mbox-names = "tx", "rx";
+			role = "host";
+			zephyr,priority = <1 PRIO_COOP>;
+			zephyr,buffer-size = <128>;
+			status = "okay";
+		};
+	};
+};
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
index 9c15559824623..2fba21fb1e411 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
index 274700289bfaa..8ba9d176fd3ae 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
@@ -13,7 +13,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
index 274700289bfaa..8ba9d176fd3ae 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
@@ -13,7 +13,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
index 274700289bfaa..8ba9d176fd3ae 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
@@ -13,7 +13,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
new file mode 100644
index 0000000000000..77adcfa24f4e2
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
@@ -0,0 +1,2 @@
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_SECOND_CORE_MCUX=y
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
new file mode 100644
index 0000000000000..d6958308790ea
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
+/ {
+	/* Define memory regions for IPC */
+	ocram2_ipc0: memory@20500000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20500000 DT_SIZE_K(16)>;
+		zephyr,memory-region="OCRAM2_IPC0";
+		zephyr,memory-attr = <(DT_MEM_ARM(ATTR_MPU_IO))>;
+	};
+
+	ocram2_ipc1: memory@20504000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20504000 DT_SIZE_K(16)>;
+		zephyr,memory-region="OCRAM2_IPC1";
+		zephyr,memory-attr = <(DT_MEM_ARM(ATTR_MPU_IO))>;
+	};
+
+	ipc {
+		/delete-node/ ipc0;
+
+		ipc0: ipc0 {
+			compatible = "zephyr,ipc-openamp-static-vrings";
+			memory-region = <&ocram2_ipc0>;
+			mboxes = <&mbox1_b 0>, <&mbox1_b 1>;
+			mbox-names = "rx", "tx";
+			role = "remote";
+			status = "okay";
+		};
+
+		ipc1: ipc1 {
+			compatible = "zephyr,ipc-openamp-static-vrings";
+			memory-region = <&ocram2_ipc1>;
+			mboxes = <&mbox1_b 2>, <&mbox1_b 3>;
+			mbox-names = "rx", "tx";
+			role = "remote";
+			zephyr,priority = <1 PRIO_COOP>;
+			zephyr,buffer-size = <128>;
+			status = "okay";
+		};
+	};
+};
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
index d73c17429d75f..64abcf6375acb 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sample.yaml
@@ -2,14 +2,8 @@ sample:
   name: IPC Service example integration (OpenAMP static_vrings backend)
 tests:
   sample.ipc.static_vrings:
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-      - nrf5340bsim/nrf5340/cpuapp
-      - lpcxpresso55s69/lpc55s69/cpu0
-      - mimxrt1160_evk/mimxrt1166/cm7
-      - mimxrt1170_evk/mimxrt1176/cm7
-      - mimxrt1170_evk@B/mimxrt1176/cm7
-      - frdm_mcxn947/mcxn947/cpu0
+    filter: dt_compat_enabled("zephyr,ipc-openamp-static-vrings") and
+            dt_nodelabel_enabled("ipc0") and dt_nodelabel_enabled("ipc1")
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340bsim/nrf5340/cpuapp
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
index cf5de9dd941c7..0e58efa5f6fe2 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.cmake
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL "")
-	message(FATAL_ERROR
+	message(
 	"Target ${BOARD} not supported for this sample. "
 	"There is no remote board selected in Kconfig.sysbuild")
 endif()
diff --git a/samples/subsys/ipc/openamp/Kconfig.sysbuild b/samples/subsys/ipc/openamp/Kconfig.sysbuild
index f9fb79495bff7..61dc0f4b8bf75 100644
--- a/samples/subsys/ipc/openamp/Kconfig.sysbuild
+++ b/samples/subsys/ipc/openamp/Kconfig.sysbuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 NXP
+# Copyright 2022-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -14,3 +14,4 @@ string
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
 	default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
 	default "frdm_mcxn947/mcxn947/cpu1" if $(BOARD) = "frdm_mcxn947"
+	default "mimxrt1180_evk/mimxrt1189/cm7" if $(BOARD) = "mimxrt1180_evk"
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
similarity index 100%
rename from samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
rename to samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
similarity index 100%
rename from samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
rename to samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
deleted file mode 100644
index 630a1933d62bd..0000000000000
--- a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_INCLUDE_REMOTE_DIR=y
-CONFIG_SECOND_CORE_MCUX=y
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
deleted file mode 100644
index 7facea692cbea..0000000000000
--- a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2022 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
-
-/ {
-	chosen {
-		zephyr,ipc_shm = &ocram2_overlay;
-	};
-
-	/* OpenAMP fails with full 512K OCRAM2 memory region as shared memory.
-	 * Define a subset of the OCRAM2 region for demo to use
-	 * Note that shared memory must have specific MPU attributes set.
-	 */
-	ocram2_overlay: memory@202c0000{
-		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x202c0000 DT_SIZE_K(16)>;
-		zephyr,memory-region="OCRAM2_OVERLAY";
-		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>;
-	};
-};
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1180_evk_mimxrt1189_cm33.conf b/samples/subsys/ipc/openamp/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
new file mode 100644
index 0000000000000..b57d6b0281ac6
--- /dev/null
+++ b/samples/subsys/ipc/openamp/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
@@ -0,0 +1,5 @@
+CONFIG_SECOND_CORE_MCUX=y
+CONFIG_INCLUDE_REMOTE_DIR=y
+CONFIG_IPM=y
+CONFIG_IPM_MBOX=y
+CONFIG_MBOX=y
diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
new file mode 100644
index 0000000000000..582c4271c5d67
--- /dev/null
+++ b/samples/subsys/ipc/openamp/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
+/ {
+	chosen {
+		/*
+		 * shared memory reserved for the inter-processor communication
+		 */
+
+		zephyr,ipc_shm = &ocram2_sh_mem;
+		zephyr,ipc = &mailbox_a;
+	};
+
+	/* Define memory regions for IPC */
+	ocram2_sh_mem: memory@20500000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20500000 DT_SIZE_K(32)>;
+		zephyr,memory-region="OCRAM2_SH_MEM";
+		zephyr,memory-attr = <(DT_MEM_ARM(ATTR_MPU_IO))>;
+	};
+
+	mailbox_a: ipm-mbox {
+		compatible = "zephyr,mbox-ipm";
+		mboxes = <&mbox1_a 1>, <&mbox1_a 0>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf b/samples/subsys/ipc/openamp/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
new file mode 100644
index 0000000000000..b31b3845defda
--- /dev/null
+++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
@@ -0,0 +1,5 @@
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_SECOND_CORE_MCUX=y
+CONFIG_IPM=y
+CONFIG_IPM_MBOX=y
+CONFIG_MBOX=y
diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay b/samples/subsys/ipc/openamp/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
new file mode 100644
index 0000000000000..80831a425fc9e
--- /dev/null
+++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
+/ {
+	chosen {
+		/*
+		 * shared memory reserved for the inter-processor communication
+		 */
+
+		zephyr,ipc_shm = &ocram2_sh_mem;
+		zephyr,ipc = &mailbox_b;
+	};
+
+	/* Define memory regions for IPC */
+	ocram2_sh_mem: memory@20500000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x20500000 DT_SIZE_K(32)>;
+		zephyr,memory-region="OCRAM2_SH_MEM";
+		zephyr,memory-attr = <(DT_MEM_ARM(ATTR_MPU_IO))>;
+	};
+
+	mailbox_b: ipm-mbox {
+		compatible = "zephyr,mbox-ipm";
+		mboxes = <&mbox1_b 0>, <&mbox1_b 1>;
+		mbox-names = "tx", "rx";
+	};
+};
diff --git a/samples/subsys/ipc/openamp/remote/sample.yaml b/samples/subsys/ipc/openamp/remote/sample.yaml
index 906449cfdc319..09d67460237a9 100644
--- a/samples/subsys/ipc/openamp/remote/sample.yaml
+++ b/samples/subsys/ipc/openamp/remote/sample.yaml
@@ -3,9 +3,7 @@ sample:
   name: OpenAMP example integration (remote)
 tests:
   sample.ipc.openamp.remote:
-    platform_allow:
-      - lpcxpresso54114/lpc54114/m0
-      - lpcxpresso55s69/lpc55s69/cpu1
+    filter: dt_chosen_enabled("zephyr,ipc") and dt_chosen_enabled("zephyr,ipc_shm")
     integration_platforms:
       - lpcxpresso54114/lpc54114/m0
     tags: ipm
diff --git a/samples/subsys/ipc/openamp/sample.yaml b/samples/subsys/ipc/openamp/sample.yaml
index 70668a77425e5..0a2debc8690cc 100644
--- a/samples/subsys/ipc/openamp/sample.yaml
+++ b/samples/subsys/ipc/openamp/sample.yaml
@@ -3,12 +3,8 @@ sample:
   name: OpenAMP example integration
 tests:
   sample.ipc.openamp:
-    platform_allow:
-      - lpcxpresso54114/lpc54114/m4
-      - lpcxpresso55s69/lpc55s69/cpu0
-      - frdm_mcxn947/mcxn947/cpu0
-      - mps2/an521/cpu0
-      - v2m_musca_b1/musca_b1
+    filter: dt_chosen_enabled("zephyr,ipc") and dt_chosen_enabled("zephyr,ipc_shm")
+      and not (CONFIG_SOC_ESP32_APPCPU or CONFIG_SOC_ESP32S3_APPCPU)
     integration_platforms:
       - mps2/an521/cpu0
     tags:
diff --git a/samples/subsys/ipc/openamp_rsc_table/boards/colibri_imx7d_mcimx7d_m4.conf b/samples/subsys/ipc/openamp_rsc_table/boards/colibri_imx7d_mcimx7d_m4.conf
index 1933f35d626f6..f1ca31a8d94fd 100644
--- a/samples/subsys/ipc/openamp_rsc_table/boards/colibri_imx7d_mcimx7d_m4.conf
+++ b/samples/subsys/ipc/openamp_rsc_table/boards/colibri_imx7d_mcimx7d_m4.conf
@@ -1,11 +1,7 @@
-CONFIG_IPM=y
 CONFIG_IPM_IMX_MAX_DATA_SIZE_4=y
 CONFIG_OPENAMP_WITH_DCACHE=y
 CONFIG_SOC_RESET_HOOK=n
-CONFIG_OPENAMP=y
 CONFIG_OPENAMP_RSC_TABLE_NUM_RPMSG_BUFF=32
-CONFIG_OPENAMP_RSC_TABLE=y
-CONFIG_OPENAMP_MASTER=n
 
 
 CONFIG_ROMSTART_RELOCATION_ROM=y
diff --git a/samples/subsys/ipc/openamp_rsc_table/boards/imx95_evk_mimx9596_m7.conf b/samples/subsys/ipc/openamp_rsc_table/boards/imx95_evk_mimx9596_m7.conf
new file mode 100644
index 0000000000000..69b5f1215d5c4
--- /dev/null
+++ b/samples/subsys/ipc/openamp_rsc_table/boards/imx95_evk_mimx9596_m7.conf
@@ -0,0 +1,12 @@
+CONFIG_CLOCK_CONTROL=y
+CONFIG_LOG=y
+CONFIG_CONSOLE=y
+CONFIG_OPENAMP_WITH_DCACHE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_ARM_SCMI=y
+CONFIG_IPM_MBOX=y
+CONFIG_MBOX_NXP_IMX_MU=y
+CONFIG_MBOX_INIT_PRIORITY=0
+CONFIG_LOG_MODE_MINIMAL=y
+CONFIG_LOG_DEFAULT_LEVEL=0
+CONFIG_OPENAMP_COPY_RSC_TABLE=y
diff --git a/samples/subsys/ipc/openamp_rsc_table/boards/imx95_evk_mimx9596_m7.overlay b/samples/subsys/ipc/openamp_rsc_table/boards/imx95_evk_mimx9596_m7.overlay
new file mode 100644
index 0000000000000..471887b945249
--- /dev/null
+++ b/samples/subsys/ipc/openamp_rsc_table/boards/imx95_evk_mimx9596_m7.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		/*
+		 * shared memory reserved for the inter-processor communication
+		 */
+		zephyr,ipc_shm = &shmem;
+		zephyr,ipc_rsc_table = &rsc_table;
+		zephyr,ipc = &mailbox0;
+	};
+
+	shmem: memory@88000000 {
+		compatible = "mmio-sram";
+		reg = <0x88000000 0x500000>;
+	};
+
+	rsc_table: memory@88220000 {
+		compatible = "mmio-sram";
+		reg = <0x88220000 0x100>;
+	};
+
+	mailbox0: mailbox {
+		compatible = "zephyr,mbox-ipm";
+		mboxes = <&mu7 1>, <&mu7 1>;
+		mbox-names = "tx", "rx";
+		status = "okay";
+	};
+};
+
+&mu7 {
+	status = "okay";
+};
diff --git a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
index a28e017e9be7a..ef8e2c47bf53c 100644
--- a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
+++ b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(openamp_rsc_table, LOG_LEVEL_DBG);
+LOG_MODULE_REGISTER(openamp_rsc_table);
 
 #define SHM_DEVICE_NAME	"shm"
 
@@ -133,7 +133,7 @@ int mailbox_notify(void *priv, uint32_t id)
 	ARG_UNUSED(priv);
 
 	LOG_DBG("%s: msg received", __func__);
-	ipm_send(ipm_handle, 0, id, NULL, 0);
+	ipm_send(ipm_handle, 0, id, &id, 4);
 
 	return 0;
 }
diff --git a/samples/subsys/lorawan/fuota/src/main.c b/samples/subsys/lorawan/fuota/src/main.c
index ef6f8680cea6d..1cfb5ec2fba81 100644
--- a/samples/subsys/lorawan/fuota/src/main.c
+++ b/samples/subsys/lorawan/fuota/src/main.c
@@ -41,6 +41,18 @@ static void datarate_changed(enum lorawan_datarate dr)
 	LOG_INF("New Datarate: DR %d, Max Payload %d", dr, max_size);
 }
 
+int descriptor_cb(uint32_t descriptor)
+{
+	/*
+	 * In an actual application the firmware may be able to handle
+	 * the descriptor field
+	 */
+
+	LOG_INF("Received descriptor %u", descriptor);
+
+	return 0;
+}
+
 static void fuota_finished(void)
 {
 	LOG_INF("FUOTA finished. Reset device to apply firmware upgrade.");
@@ -114,6 +126,8 @@ int main(void)
 	 */
 	lorawan_frag_transport_run(fuota_finished);
 
+	lorawan_frag_transport_register_descriptor_callback(descriptor_cb);
+
 	/*
 	 * Regular uplinks are required to open downlink slots in class A for
 	 * FUOTA setup by the server.
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
index 8d8830903b9d0..755f880ab6c6a 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/README.rst
@@ -12,7 +12,7 @@ This sample application implements a Simple Management Protocol (SMP) server.
 SMP is a basic transfer encoding for use with the MCUmgr management protocol.
 For more information about MCUmgr and SMP, please see :ref:`device_mgmt`.
 
-This sample application supports the following mcumgr transports by default:
+This sample application supports the following MCUmgr transports by default:
 
     * Shell
     * Bluetooth
@@ -41,7 +41,8 @@ Use of a tool
 
 To interact remotely with the management subsystem on a device, a tool is required to interact with
 it. There are various tools available which are listed on the :ref:`mcumgr_tools_libraries` page
-of the Management subsystem documentation.
+of the Management subsystem documentation which can be used as a client for a Zephyr MCUmgr SMP
+server.
 
 Building a BLE Controller
 =========================
@@ -54,30 +55,13 @@ Bluetooth Low Energy (BLE) and do not have a built-in or pluggable BLE radio,
 you can build one and use it following the instructions in
 :ref:`bluetooth-hci-uart-bluez`.
 
-Building and flashing MCUboot
-*****************************
-
-The below steps describe how to build and run the MCUboot bootloader.
-Detailed instructions can be found in the :ref:`mcuboot` documentation page.
-
-The Zephyr port of MCUboot is essentially a normal Zephyr application, which means that
-it can be built and flashed like normal using ``west``, like so:
-
-.. code-block:: console
-
-   west build -b <board> -d build_mcuboot bootloader/mcuboot/boot/zephyr
-   west flash -d build_mcuboot
-
-Substitute <board> for one of the boards supported by the sample, see
-:file:`sample.yaml`.
-
 .. _smp_svr_sample_build:
 
 Building the sample application
 *******************************
 
-The below steps describe how to build and run the ``smp_svr`` sample in
-Zephyr. The ``smp_svr`` sample comes in different flavours.
+The below steps describe how to build and run the ``smp_svr`` sample in Zephyr with ``MCUboot``
+included. The ``smp_svr`` sample comes in different flavours.
 
 .. tabs::
 
@@ -85,50 +69,53 @@ Zephyr. The ``smp_svr`` sample comes in different flavours.
 
       To build the bluetooth sample:
 
-      .. code-block:: console
-
-         west build \
-            -b nrf52dk/nrf52832 \
-            samples/subsys/mgmt/mcumgr/smp_svr \
-            -- \
-            -DEXTRA_CONF_FILE=overlay-bt.conf
+      .. zephyr-app-commands::
+         :tool: west
+         :zephyr-app: samples/subsys/mgmt/mcumgr/smp_svr
+         :board: nrf52dk/nrf52832
+         :goals: build
+         :west-args: --sysbuild
+         :gen-args: -DEXTRA_CONF_FILE="overlay-bt.conf"
+         :compact:
 
    .. group-tab:: Serial
 
       To build the serial sample with file-system and shell management support:
 
-      .. code-block:: console
-
-         west build \
-            -b frdm_k64f \
-            samples/subsys/mgmt/mcumgr/smp_svr \
-            -- \
-            -DEXTRA_CONF_FILE='overlay-serial.conf;overlay-fs.conf;overlay-shell-mgmt.conf'
+      .. zephyr-app-commands::
+         :tool: west
+         :zephyr-app: samples/subsys/mgmt/mcumgr/smp_svr
+         :board: frdm_k64f
+         :goals: build
+         :west-args: --sysbuild
+         :gen-args: -DEXTRA_CONF_FILE="overlay-serial.conf;overlay-fs.conf;overlay-shell-mgmt.conf"
+         :compact:
 
    .. group-tab:: USB CDC_ACM
 
       To build the serial sample with USB CDC_ACM backend:
 
-      .. code-block:: console
-
-         west build \
-            -b nrf52840dk/nrf52840 \
-            samples/subsys/mgmt/mcumgr/smp_svr \
-            -- \
-            -DEXTRA_CONF_FILE=overlay-cdc.conf \
-            -DDTC_OVERLAY_FILE=usb.overlay
+      .. zephyr-app-commands::
+         :tool: west
+         :zephyr-app: samples/subsys/mgmt/mcumgr/smp_svr
+         :board: nrf52840dk/nrf52840
+         :goals: build
+         :west-args: --sysbuild
+         :gen-args: -DEXTRA_CONF_FILE="overlay-cdc.conf" -DEXTRA_DTC_OVERLAY_FILE="usb.overlay"
+         :compact:
 
    .. group-tab:: Shell
 
       To build the shell sample:
 
-      .. code-block:: console
-
-         west build \
-            -b frdm_k64f \
-            samples/subsys/mgmt/mcumgr/smp_svr \
-            -- \
-            -DEXTRA_CONF_FILE='overlay-shell.conf'
+      .. zephyr-app-commands::
+         :tool: west
+         :zephyr-app: samples/subsys/mgmt/mcumgr/smp_svr
+         :board: frdm_k64f
+         :goals: build
+         :west-args: --sysbuild
+         :gen-args: -DEXTRA_CONF_FILE="overlay-shell.conf"
+         :compact:
 
    .. group-tab:: UDP
 
@@ -138,49 +125,24 @@ Zephyr. The ``smp_svr`` sample comes in different flavours.
 
       To build the UDP sample:
 
-      .. code-block:: console
-
-         west build \
-            -b frdm_k64f \
-            samples/subsys/mgmt/mcumgr/smp_svr \
-            -- \
-            -DEXTRA_CONF_FILE=overlay-udp.conf
-
-.. _smp_svr_sample_sign:
-
-Signing the sample image
-************************
-
-A key feature of MCUboot is that images must be signed before they can be successfully
-uploaded and run on a target. To sign images, the MCUboot tool :file:`imgtool` can be used.
-
-To sign the sample image built in the previous step:
-
-.. code-block:: console
-
-    west sign -t imgtool -- --key bootloader/mcuboot/root-rsa-2048.pem
-
-The above command creates an image file called :file:`zephyr.signed.bin` in the
-build directory.
-
-For more information on image signing and ``west sign``, see the :ref:`west-sign`
-documentation.
+      .. zephyr-app-commands::
+         :tool: west
+         :zephyr-app: samples/subsys/mgmt/mcumgr/smp_svr
+         :board: frdm_k64f
+         :goals: build
+         :west-args: --sysbuild
+         :gen-args: -DEXTRA_CONF_FILE="overlay-udp.conf"
+         :compact:
 
 Flashing the sample image
 *************************
 
-Upload the :file:`zephyr.signed.bin` file from the previous to image slot-0 of your
-board.  See :ref:`flash_map_api` for details on flash partitioning.
-
-To upload the initial image file to an empty slot-0, use ``west flash`` like normal.
-``west flash`` will automatically detect slot-0 address and confirm the image.
+The original application will be built for slot-0, see :ref:`flash_map_api` for details on flash
+partitioning. Flash both MCUboot and the sample application:
 
 .. code-block:: console
 
-    west flash --bin-file build/zephyr/zephyr.signed.bin
-
-The *signed* image file needs to be used specifically, otherwise the non-signed version
-will be used and the image won't be runnable.
+    west flash
 
 Sample image: hello world!
 ==========================
@@ -204,24 +166,23 @@ instructions on :ref:`nordic_segger_msd` to disable MSD support.
 Device Firmware Upgrade (DFU)
 *****************************
 
-Now that the SMP server is running on your board and you are able to communicate
-with it using :file:`mcumgr`, you might want to test what is commonly called
-"OTA DFU", or Over-The-Air Device Firmware Upgrade. This works for both BT and UDP.
+Now that the SMP server is running on your board and you are able to communicate with it using a
+client, you might want to test what is commonly called "OTA DFU", or Over-The-Air Device Firmware
+Upgrade. This works for both BT and UDP.
 
 The general sequence of a DFU process is as follows:
 
-* Build an MCUboot enabled application, see :ref:`smp_svr_sample_build`
-* Sign the application image, see :ref:`smp_svr_sample_sign`
-* Upload the signed image using :file:`mcumgr`
-* Listing the images on the device using :file:`mcumgr`
-* Mark the uploaded image for testing using :file:`mcumgr`
-* Reset the device remotely using :file:`mcumgr`
-* Confirm the uploaded image using :file:`mcumgr` (optional)
+* Build an MCUboot enabled application using sysbuild, see :ref:`smp_svr_sample_build`
+* Upload the signed image using an MCUmgr client
+* Listing the images on the device using an MCUmgr client
+* Mark the uploaded image for testing using an MCUmgr client
+* Reset the device remotely using an MCUmgr client
+* Confirm the uploaded image using an MCUmgr client (optional)
 
 Direct image upload and Image mapping to MCUboot slot
 =====================================================
 
-Currently the mcumgr supports, for direct upload, 4 target images, of which first two are mapped
+Currently MCUmgr supports, for direct upload, 4 target images, of which first two are mapped
 into MCUboot primary (slot-0) and secondary (slot-1) respectively.
 
 For clarity, here is DTS label to slot to ``<image>`` translation table:
@@ -238,6 +199,12 @@ For clarity, here is DTS label to slot to ``<image>`` translation table:
     | "image-3" |        |     3      |
     +-----------+--------+------------+
 
+.. note::
+
+   There is a slot info command that can be used to see information on all slots and get the
+   upload ``image`` ID to use to update that slot, see :ref:`mcumgr_smp_group_1_slot_info` for
+   details.
+
 Upload the signed image
 =======================
 
@@ -246,15 +213,15 @@ firmware file to upload and begin the upload.
 
 .. note::
 
-   At the beginning of the upload process, the target might start erasing
-   the image slot, taking several dozen seconds for some targets.
+   At the beginning of the upload process, the target might start erasing the image slot, taking
+   several dozen seconds for some targets.
 
 List the images
 ===============
 
-A list of images (slot-0 and slot-1) that are present can now be obtained on the remote target device using
-the tool of your choice, which should print the status and hash values of each of the images
-present.
+A list of images (slot-0 and slot-1) that are present can now be obtained on the remote target
+device using the tool of your choice, which should print the status and hash values of each of
+the images present.
 
 Test the image
 ==============
@@ -264,8 +231,35 @@ boots, see the instructions in the tool of your choice. Upon reboot, MCUBoot wil
 image.
 
 .. note::
-   There is not yet any way of getting the image hash without actually uploading the
-   image and getting the hash.
+
+   Some tools may allow for listing the hash of an image without needing to upload them.
+   ``imgtool`` can also be used to list the image hash, albeit in a C hex-array format, by using
+   the ``dumpinfo`` command on the signed update file, e.g.
+
+   .. code-block:: console
+
+       imgtool dumpinfo smp_svr/zephyr/zephyr.signed.bin
+
+       Printing content of signed image: zephyr.signed.bin
+
+       #### Image header (offset: 0x0) ############################
+       magic:              0x96f3b83d
+       ...
+       #### TLV area (offset: 0xbfa0) #############################
+       magic:     0x6907
+       area size: 0x150
+               ---------------------------------------------
+               type: SHA256 (0x10)
+               len:  0x20
+               data: 0x9b 0xa9 0x84 0x48 0xe5 0x4d 0xac 0x40
+                     0x62 0x29 0xe2 0x11 0x17 0x96 0x66 0xd9
+                     0xae 0x83 0x9a 0x37 0x71 0x00 0xfc 0xe2
+                     0xc0 0x30 0x30 0x4f 0xfc 0x40 0x58 0xaa
+               ---------------------------------------------
+       ...
+
+   The full SHA256 hash for the above output would be:
+   9ba98448e54dac406229e211179666d9ae839a377100fce2c030304ffc4058aa
 
 Reset remotely
 ==============
@@ -280,14 +274,16 @@ Confirm new image
 The new image is now loaded into slot-0, but it will be swapped back into slot-1 on the next
 reset unless the image is confirmed. Confirm the image using the tool of your choice.
 
-Note that if you try to send the very same image that is already flashed in
-slot-0 then the procedure will not complete successfully since the hash values
-for both slots will be identical.
+.. note::
+
+   If you try to send the very same image that is already flashed in slot-0 then the procedure
+   will not complete successfully since the hash values for both slots will be identical.
 
-Download file from File System
-******************************
+Download files from/upload files to file system
+***********************************************
 
-SMP server supports downloading files from File System on device via
-:file:`mcumgr`. This is useful with FS log backend, when files are stored in
-non-volatile memory. Build and flash both MCUboot and smp_svr applications and
-then use the tool of your choice to download files from the file system.
+SMP server supports downloading files from/uploading files to the on-device
+:ref:`file_system_api`, this is useful with e.g. FS log backend, when files are stored in
+non-volatile memory. Build and flash ``smp_svr`` using sysbuild and then use the tool of your
+choice to download files from the file system. The full path of the file on the device must be
+known and used.
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
new file mode 100644
index 0000000000000..13e4e98c203df
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
@@ -0,0 +1,3 @@
+# Disable GPD because no IPC is enabled in SSDFW
+CONFIG_SOC_NRF54H20_GPD=n
+CONFIG_PM=n
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 3d9cb6489cfb2..c0e6b658bf6eb 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -85,6 +85,7 @@ tests:
       - mimxrt685_evk/mimxrt685s/cm33
       - rd_rw612_bga
       - nrf52840dk/nrf52840
+      - nrf54h20dk/nrf54h20/cpuapp/iron
       - pinnacle_100_dvk
       - mg100
     integration_platforms:
diff --git a/samples/subsys/mgmt/updatehub/README.rst b/samples/subsys/mgmt/updatehub/README.rst
index 733df73b267cb..0e973dda0290e 100644
--- a/samples/subsys/mgmt/updatehub/README.rst
+++ b/samples/subsys/mgmt/updatehub/README.rst
@@ -454,7 +454,7 @@ The below list of hardware have been used by UpdateHub team.
    :width: 800px
 
    :zephyr:board:`frdm_k64f`, "1, 2, 3, 4"
-   :ref:`nrf52840dk_nrf52840`, "2, 3, 4, 5, 6"
+   :zephyr:board:`nrf52840dk`, "2, 3, 4, 5, 6"
    :zephyr:board:`nucleo_f767zi`, "1, 2, 3, 4"
 
 
diff --git a/samples/subsys/mgmt/updatehub/src/main.c b/samples/subsys/mgmt/updatehub/src/main.c
index b8b1406ba0c9d..73d64a1a6947a 100644
--- a/samples/subsys/mgmt/updatehub/src/main.c
+++ b/samples/subsys/mgmt/updatehub/src/main.c
@@ -89,7 +89,7 @@ int main(void)
 
 #if defined(CONFIG_UPDATEHUB_DTLS)
 	if (tls_credential_add(CA_CERTIFICATE_TAG,
-			       TLS_CREDENTIAL_SERVER_CERTIFICATE,
+			       TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 			       server_certificate,
 			       sizeof(server_certificate)) < 0) {
 		LOG_ERR("Failed to register server certificate");
diff --git a/samples/subsys/nvs/Kconfig b/samples/subsys/nvs/Kconfig
new file mode 100644
index 0000000000000..1caa07ef74972
--- /dev/null
+++ b/samples/subsys/nvs/Kconfig
@@ -0,0 +1,28 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "NVS Sample Configuration"
+
+config NVS_SAMPLE_MAX_REBOOT
+	int "Maximum reboot counter value"
+	default 5
+	range 1 1000
+	help
+	  Maximum number of reboots to perform before resetting the counter.
+
+config NVS_SAMPLE_REBOOT_COUNTDOWN
+	int "Reboot countdown value (in iterations)"
+	default 5
+	range 1 60
+	help
+	  Number of countdown iterations to wait before rebooting the device.
+	  Each iteration takes NVS_SAMPLE_SLEEP_TIME milliseconds.
+
+config NVS_SAMPLE_SLEEP_TIME
+	int "Sleep time between reboot countdown iterations (in milliseconds)"
+	default 100
+	range 10 10000
+	help
+	  Duration in milliseconds to sleep between reboot countdown iterations.
+
+source "Kconfig.zephyr"
diff --git a/samples/subsys/nvs/boards/nucleo_f091rc.conf b/samples/subsys/nvs/boards/nucleo_f091rc.conf
deleted file mode 100644
index d862c64353b75..0000000000000
--- a/samples/subsys/nvs/boards/nucleo_f091rc.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MAIN_STACK_SIZE=2048
diff --git a/samples/subsys/nvs/boards/nucleo_g071rb.conf b/samples/subsys/nvs/boards/nucleo_g071rb.conf
deleted file mode 100644
index d862c64353b75..0000000000000
--- a/samples/subsys/nvs/boards/nucleo_g071rb.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MAIN_STACK_SIZE=2048
diff --git a/samples/subsys/nvs/prj.conf b/samples/subsys/nvs/prj.conf
index 17bcf7fb2e315..bbec69f5f4d3c 100644
--- a/samples/subsys/nvs/prj.conf
+++ b/samples/subsys/nvs/prj.conf
@@ -6,3 +6,4 @@ CONFIG_LOG_MODE_IMMEDIATE=y
 CONFIG_NVS_LOG_LEVEL_DBG=y
 CONFIG_REBOOT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_MAIN_STACK_SIZE=2048
diff --git a/samples/subsys/nvs/src/main.c b/samples/subsys/nvs/src/main.c
index 5df97ab9c1b54..222ebe0ac95d4 100644
--- a/samples/subsys/nvs/src/main.c
+++ b/samples/subsys/nvs/src/main.c
@@ -52,12 +52,6 @@ static struct nvs_fs fs;
 #define NVS_PARTITION_DEVICE	FIXED_PARTITION_DEVICE(NVS_PARTITION)
 #define NVS_PARTITION_OFFSET	FIXED_PARTITION_OFFSET(NVS_PARTITION)
 
-/* 1000 msec = 1 sec */
-#define SLEEP_TIME      100
-/* maximum reboot counts, make high enough to trigger sector change (buffer */
-/* rotation). */
-#define MAX_REBOOT 400
-
 #define ADDRESS_ID 1
 #define KEY_ID 2
 #define RBT_CNT_ID 3
@@ -192,11 +186,11 @@ int main(void)
 		}
 	}
 
-	cnt = 5;
+	cnt = CONFIG_NVS_SAMPLE_REBOOT_COUNTDOWN;
 	while (1) {
-		k_msleep(SLEEP_TIME);
-		if (reboot_counter < MAX_REBOOT) {
-			if (cnt == 5) {
+		k_msleep(CONFIG_NVS_SAMPLE_SLEEP_TIME);
+		if (reboot_counter < CONFIG_NVS_SAMPLE_MAX_REBOOT) {
+			if (cnt == CONFIG_NVS_SAMPLE_REBOOT_COUNTDOWN) {
 				/* print some history information about
 				 * the reboot counter
 				 * Check the counter history in flash
@@ -230,7 +224,7 @@ int main(void)
 				(void)nvs_write(
 					&fs, RBT_CNT_ID, &reboot_counter,
 					sizeof(reboot_counter));
-				if (reboot_counter == MAX_REBOOT) {
+				if (reboot_counter == CONFIG_NVS_SAMPLE_MAX_REBOOT) {
 					printk("Doing last reboot...\n");
 				}
 				sys_reboot(0);
diff --git a/samples/subsys/pm/latency/boards/native_posix.overlay b/samples/subsys/pm/latency/boards/native_posix.overlay
deleted file mode 100644
index 6a3daca3241ac..0000000000000
--- a/samples/subsys/pm/latency/boards/native_posix.overlay
+++ /dev/null
@@ -1 +0,0 @@
-#include "native_sim.overlay"
diff --git a/samples/subsys/settings/boards/mimxrt1020_evk.conf b/samples/subsys/settings/boards/mimxrt1020_evk.conf
deleted file mode 100644
index 3746c13c741b0..0000000000000
--- a/samples/subsys/settings/boards/mimxrt1020_evk.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/mr_canhubk3.conf b/samples/subsys/settings/boards/mr_canhubk3.conf
deleted file mode 100644
index 6ca210a81ac21..0000000000000
--- a/samples/subsys/settings/boards/mr_canhubk3.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2023 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-# Use LittleFS file system as Settings backend
-CONFIG_FILE_SYSTEM=y
-CONFIG_FILE_SYSTEM_LITTLEFS=y
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"
diff --git a/samples/subsys/settings/boards/native_sim.conf b/samples/subsys/settings/boards/native_sim.conf
deleted file mode 100644
index 21877f886f3a7..0000000000000
--- a/samples/subsys/settings/boards/native_sim.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Enable the LittleFS file system.
-CONFIG_FILE_SYSTEM=y
-CONFIG_FILE_SYSTEM_LITTLEFS=y
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"
diff --git a/samples/subsys/settings/boards/native_sim.overlay b/samples/subsys/settings/boards/native_sim.overlay
deleted file mode 100644
index 0e4839ad02658..0000000000000
--- a/samples/subsys/settings/boards/native_sim.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/delete-node/ &storage_partition;
-/delete-node/ &scratch_partition;
-
-&flash0 {
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		storage_partition: partition@70000 {
-			label = "storage";
-			reg = <0x00070000 0x8000>;
-		};
-	};
-};
diff --git a/samples/subsys/settings/boards/native_sim_native_64.conf b/samples/subsys/settings/boards/native_sim_native_64.conf
deleted file mode 100644
index 21877f886f3a7..0000000000000
--- a/samples/subsys/settings/boards/native_sim_native_64.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Enable the LittleFS file system.
-CONFIG_FILE_SYSTEM=y
-CONFIG_FILE_SYSTEM_LITTLEFS=y
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/ff/settings/run"
diff --git a/samples/subsys/settings/boards/native_sim_native_64.overlay b/samples/subsys/settings/boards/native_sim_native_64.overlay
deleted file mode 100644
index e4994493dd696..0000000000000
--- a/samples/subsys/settings/boards/native_sim_native_64.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "native_sim.overlay"
diff --git a/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf b/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf
deleted file mode 100644
index 248bc56424e34..0000000000000
--- a/samples/subsys/settings/boards/nrf52840dk_nrf52840.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_ARM_MPU=n
diff --git a/samples/subsys/settings/boards/nrf52dk_nrf52832.conf b/samples/subsys/settings/boards/nrf52dk_nrf52832.conf
deleted file mode 100644
index 248bc56424e34..0000000000000
--- a/samples/subsys/settings/boards/nrf52dk_nrf52832.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_ARM_MPU=n
diff --git a/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 3746c13c741b0..0000000000000
--- a/samples/subsys/settings/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
deleted file mode 100644
index 3746c13c741b0..0000000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l05_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
deleted file mode 100644
index 3746c13c741b0..0000000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l10_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
deleted file mode 100644
index 3746c13c741b0..0000000000000
--- a/samples/subsys/settings/boards/nrf54l15dk_nrf54l15_cpuapp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/qemu_x86.conf b/samples/subsys/settings/boards/qemu_x86.conf
deleted file mode 100644
index 3746c13c741b0..0000000000000
--- a/samples/subsys/settings/boards/qemu_x86.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
deleted file mode 100644
index 1535e4d46cd99..0000000000000
--- a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu0.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf b/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
deleted file mode 100644
index 1535e4d46cd99..0000000000000
--- a/samples/subsys/settings/boards/s32z2xxdc2_s32z270_rtu1.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
diff --git a/samples/subsys/settings/boards/yd_esp32_procpu.conf b/samples/subsys/settings/boards/yd_esp32_procpu.conf
deleted file mode 100644
index 498fb072287d6..0000000000000
--- a/samples/subsys/settings/boards/yd_esp32_procpu.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/prj.conf b/samples/subsys/settings/prj.conf
index 25c662538460e..d9ae787141afd 100644
--- a/samples/subsys/settings/prj.conf
+++ b/samples/subsys/settings/prj.conf
@@ -1,6 +1,9 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
-
 CONFIG_SETTINGS=y
 CONFIG_SETTINGS_RUNTIME=y
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_HEAP_MEM_POOL_SIZE=256
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/sample.yaml b/samples/subsys/settings/sample.yaml
index aafc61e555ecd..51b050dfd4b27 100644
--- a/samples/subsys/settings/sample.yaml
+++ b/samples/subsys/settings/sample.yaml
@@ -4,20 +4,10 @@ sample:
 tests:
   sample.subsys.settings:
     tags: settings
-    timeout: 10
-    platform_allow:
-      - qemu_x86
-      - native_sim
-      - native_sim/native/64
-      - mr_canhubk3
-      - nrf54l15dk/nrf54l05/cpuapp
-      - nrf54l15dk/nrf54l10/cpuapp
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54h20dk/nrf54h20/cpuapp
-      - s32z2xxdc2/s32z270/rtu0
-      - s32z2xxdc2/s32z270/rtu1
-      - s32z2xxdc2@D/s32z270/rtu0
-      - s32z2xxdc2@D/s32z270/rtu1
+    timeout: 20
+    filter: dt_label_with_parent_compat_enabled("storage_partition", "fixed-partitions")
+    platform_exclude:
+      - qemu_cortex_m0/nrf51822
     integration_platforms:
       - native_sim
     harness: console
diff --git a/samples/subsys/settings/socs/cc1352p7.conf b/samples/subsys/settings/socs/cc1352p7.conf
deleted file mode 100644
index ca92a061c6a37..0000000000000
--- a/samples/subsys/settings/socs/cc1352p7.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVS=y
diff --git a/samples/subsys/settings/socs/esp32_procpu.conf b/samples/subsys/settings/socs/esp32_procpu.conf
deleted file mode 100644
index 498fb072287d6..0000000000000
--- a/samples/subsys/settings/socs/esp32_procpu.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32c3.conf b/samples/subsys/settings/socs/esp32c3.conf
deleted file mode 100644
index 498fb072287d6..0000000000000
--- a/samples/subsys/settings/socs/esp32c3.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32c3_usb.conf b/samples/subsys/settings/socs/esp32c3_usb.conf
deleted file mode 100644
index 498fb072287d6..0000000000000
--- a/samples/subsys/settings/socs/esp32c3_usb.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32c6.conf b/samples/subsys/settings/socs/esp32c6.conf
deleted file mode 100644
index 498fb072287d6..0000000000000
--- a/samples/subsys/settings/socs/esp32c6.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32s2.conf b/samples/subsys/settings/socs/esp32s2.conf
deleted file mode 100644
index 498fb072287d6..0000000000000
--- a/samples/subsys/settings/socs/esp32s2.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/settings/socs/esp32s3_procpu.conf b/samples/subsys/settings/socs/esp32s3_procpu.conf
deleted file mode 100644
index 498fb072287d6..0000000000000
--- a/samples/subsys/settings/socs/esp32s3_procpu.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/samples/subsys/shell/fs/sample.yaml b/samples/subsys/shell/fs/sample.yaml
index afba7ddf0e29e..2ac6864f71905 100644
--- a/samples/subsys/shell/fs/sample.yaml
+++ b/samples/subsys/shell/fs/sample.yaml
@@ -18,7 +18,7 @@ tests:
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
     integration_platforms:
-      - reel_board
+      - native_sim
   sample.filesystem.shell.fuse:
     platform_allow:
       - native_sim
diff --git a/samples/subsys/shell/shell_module/sample.yaml b/samples/subsys/shell/shell_module/sample.yaml
index 3c439e928cac3..9b9e8662ccfa0 100644
--- a/samples/subsys/shell/shell_module/sample.yaml
+++ b/samples/subsys/shell/shell_module/sample.yaml
@@ -1,10 +1,7 @@
 sample:
   name: Shell Sample
 common:
-  filter: not CONFIG_NATIVE_LIBC
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
+  filter: not CONFIG_NATIVE_LIBC and not CONFIG_SOC_SERIES_BSIM_NRFXX
 tests:
   sample.shell.shell_module:
     filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
@@ -14,7 +11,7 @@ tests:
     integration_platforms:
       - native_sim
     extra_configs:
-      - arch:posix:CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+      - arch:posix:CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
   sample.shell.shell_module.usb:
     depends_on: usb_device
     tags:
diff --git a/samples/subsys/shell/shell_module/shell_module.robot b/samples/subsys/shell/shell_module/shell_module.robot
index 334d040a2cc76..c0675287bab33 100644
--- a/samples/subsys/shell/shell_module/shell_module.robot
+++ b/samples/subsys/shell/shell_module/shell_module.robot
@@ -7,7 +7,6 @@ Resource                      ${KEYWORDS}
 Should Read Version From Shell
     # `Prepare Machine` keyword comes from $ZEPHYR_BASE/tests/robot/common.robot file, which is imported as a resource
     Prepare Machine
-    Start Emulation
     Wait For Prompt On Uart   uart:~$
     Write Line To Uart        version
     Wait For Line On Uart     Zephyr version
diff --git a/samples/subsys/shell/shell_module/test_shell.yml b/samples/subsys/shell/shell_module/test_shell.yml
index 1f78f105227b6..172651f7847b1 100644
--- a/samples/subsys/shell/shell_module/test_shell.yml
+++ b/samples/subsys/shell/shell_module/test_shell.yml
@@ -1,4 +1,3 @@
-test_shell_harness:
 - command: "kernel cycles"
   expected: "cycles: .* hw cycles"
 - command: "kernel version"
diff --git a/samples/subsys/task_wdt/src/main.c b/samples/subsys/task_wdt/src/main.c
index 6b5202fee6138..143bece966649 100644
--- a/samples/subsys/task_wdt/src/main.c
+++ b/samples/subsys/task_wdt/src/main.c
@@ -67,9 +67,11 @@ int main(void)
 
 	if (!device_is_ready(hw_wdt_dev)) {
 		printk("Hardware watchdog not ready; ignoring it.\n");
+		ret = task_wdt_init(NULL);
+	} else {
+		ret = task_wdt_init(hw_wdt_dev);
 	}
 
-	ret = task_wdt_init(hw_wdt_dev);
 	if (ret != 0) {
 		printk("task wdt init failure: %d\n", ret);
 		return 0;
diff --git a/samples/subsys/testsuite/integration/testcase.yaml b/samples/subsys/testsuite/integration/testcase.yaml
index 1cc0ad1c8ee19..90bbd9bf64eef 100644
--- a/samples/subsys/testsuite/integration/testcase.yaml
+++ b/samples/subsys/testsuite/integration/testcase.yaml
@@ -3,7 +3,6 @@ tests:
   sample.testing.ztest:
     build_only: true
     platform_allow:
-      - native_posix
       - native_sim
     integration_platforms:
       - native_sim
diff --git a/samples/subsys/testsuite/pytest/shell/testcase.yaml b/samples/subsys/testsuite/pytest/shell/testcase.yaml
index f256cd9df8f5e..2e76f92086588 100644
--- a/samples/subsys/testsuite/pytest/shell/testcase.yaml
+++ b/samples/subsys/testsuite/pytest/shell/testcase.yaml
@@ -1,28 +1,34 @@
+common:
+  tags:
+    - test_framework
+    - pytest
+    - shell
+  filter: CONFIG_SERIAL and not CONFIG_SMP and dt_chosen_enabled("zephyr,shell-uart")
+  extra_configs:
+    - arch:posix:CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
+  min_ram: 40
+  integration_platforms:
+    - native_sim
+    - qemu_cortex_m3
 tests:
   sample.pytest.shell:
-    filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
-    min_ram: 40
     harness: pytest
-    extra_configs:
-      - arch:posix:CONFIG_NATIVE_UART_0_ON_STDINOUT=y
-    integration_platforms:
-      - native_sim
-      - qemu_cortex_m3
-    tags:
-      - test_framework
-      - pytest
-      - shell
   sample.pytest.shell.vt100_colors_off:
-    filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
-    min_ram: 40
     harness: pytest
     extra_configs:
-      - arch:posix:CONFIG_NATIVE_UART_0_ON_STDINOUT=y
       - CONFIG_SHELL_VT100_COLORS=n
-    integration_platforms:
-      - native_sim
-      - qemu_cortex_m3
-    tags:
-      - test_framework
-      - pytest
-      - shell
+  sample.harness.shell:
+    harness: shell
+    harness_config:
+      shell_commands: &kernel_commands
+        - command: "kernel cycles"
+          expected: "cycles: .* hw cycles"
+        - command: "kernel version"
+          expected: "Zephyr version .*"
+        - command: "kernel sleep 100"
+  sample.harness.shell.vt100_colors_off:
+    harness: shell
+    extra_configs:
+      - CONFIG_SHELL_VT100_COLORS=n
+    harness_config:
+      shell_commands: *kernel_commands
diff --git a/samples/subsys/usb/cdc_acm/README.rst b/samples/subsys/usb/cdc_acm/README.rst
index e30edfcec7bdc..21ce853ae0819 100644
--- a/samples/subsys/usb/cdc_acm/README.rst
+++ b/samples/subsys/usb/cdc_acm/README.rst
@@ -93,6 +93,3 @@ For this example, it would look like this:
 .. code-block:: none
 
    ATTRS{idVendor}=="8086" ATTRS{idProduct}=="f8a1", ENV{ID_MM_DEVICE_IGNORE}="1"
-
-You can use
-``/lib/udev/rules.d/77-mm-usb-device-blacklist.rules`` as reference.
diff --git a/samples/subsys/usb/cdc_acm/sample.yaml b/samples/subsys/usb/cdc_acm/sample.yaml
index d1906f58502c3..f802443cad5e0 100644
--- a/samples/subsys/usb/cdc_acm/sample.yaml
+++ b/samples/subsys/usb/cdc_acm/sample.yaml
@@ -22,6 +22,7 @@ tests:
       - nucleo_f413zh
       - mimxrt685_evk/mimxrt685s/cm33
       - mimxrt1060_evk/mimxrt1062/qspi
+      - max32690evkit/max32690/m4
     harness: console
     harness_config:
       type: one_line
diff --git a/samples/subsys/usb/common/sample_usbd_init.c b/samples/subsys/usb/common/sample_usbd_init.c
index 2d3266b4c7577..69642372a585a 100644
--- a/samples/subsys/usb/common/sample_usbd_init.c
+++ b/samples/subsys/usb/common/sample_usbd_init.c
@@ -36,7 +36,8 @@ USBD_DEVICE_DEFINE(sample_usbd,
 USBD_DESC_LANG_DEFINE(sample_lang);
 USBD_DESC_MANUFACTURER_DEFINE(sample_mfr, CONFIG_SAMPLE_USBD_MANUFACTURER);
 USBD_DESC_PRODUCT_DEFINE(sample_product, CONFIG_SAMPLE_USBD_PRODUCT);
-USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn);
+IF_ENABLED(CONFIG_HWINFO, (USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn)));
+
 /* doc string instantiation end */
 
 USBD_DESC_CONFIG_DEFINE(fs_cfg_desc, "FS Configuration");
@@ -116,14 +117,17 @@ struct usbd_context *sample_usbd_setup_device(usbd_msg_cb_t msg_cb)
 		return NULL;
 	}
 
-	err = usbd_add_descriptor(&sample_usbd, &sample_sn);
+	IF_ENABLED(CONFIG_HWINFO, (
+		err = usbd_add_descriptor(&sample_usbd, &sample_sn);
+	))
 	if (err) {
 		LOG_ERR("Failed to initialize SN descriptor (%d)", err);
 		return NULL;
 	}
 	/* doc add string descriptor end */
 
-	if (usbd_caps_speed(&sample_usbd) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_caps_speed(&sample_usbd) == USBD_SPEED_HS) {
 		err = usbd_add_configuration(&sample_usbd, USBD_SPEED_HS,
 					     &sample_hs_config);
 		if (err) {
@@ -159,6 +163,7 @@ struct usbd_context *sample_usbd_setup_device(usbd_msg_cb_t msg_cb)
 	/* doc functions register end */
 
 	sample_fix_code_triple(&sample_usbd, USBD_SPEED_FS);
+	usbd_self_powered(&sample_usbd, attributes & USB_SCD_SELF_POWERED);
 
 	if (msg_cb != NULL) {
 		/* doc device init-and-msg start */
diff --git a/samples/subsys/usb/dfu-next/sample.yaml b/samples/subsys/usb/dfu-next/sample.yaml
index 02b53e25d5362..2190adf686f4a 100644
--- a/samples/subsys/usb/dfu-next/sample.yaml
+++ b/samples/subsys/usb/dfu-next/sample.yaml
@@ -4,6 +4,11 @@ common:
   min_ram: 64
   depends_on:
     - usbd
+  harness: console
+  harness_config:
+    type: one_line
+    regex:
+      - "USB DFU sample is initialized"
 tests:
   sample.usbd.dfu:
     integration_platforms:
diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
index dea42901cc7b9..e9b9c21332361 100644
--- a/samples/subsys/usb/dfu/sample.yaml
+++ b/samples/subsys/usb/dfu/sample.yaml
@@ -18,6 +18,7 @@ common:
     - mimxrt1050_evk/mimxrt1052/qspi
     - mimxrt1060_evk/mimxrt1062/hyperflash
     - mimxrt1180_evk/mimxrt1189/cm7
+    - mimxrt700_evk/mimxrt798s/cm33_cpu0
     - nucleo_f207zg
     - teensy40
     - teensy41
diff --git a/samples/subsys/usb/hid-keyboard/prj.conf b/samples/subsys/usb/hid-keyboard/prj.conf
index 04ce14ad588e1..a854a502f0683 100644
--- a/samples/subsys/usb/hid-keyboard/prj.conf
+++ b/samples/subsys/usb/hid-keyboard/prj.conf
@@ -6,6 +6,7 @@ CONFIG_USBD_LOG_LEVEL_WRN=y
 CONFIG_USBD_HID_LOG_LEVEL_WRN=y
 CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
 CONFIG_SAMPLE_USBD_PID=0x0007
+CONFIG_SAMPLE_USBD_REMOTE_WAKEUP=y
 
 CONFIG_GPIO=y
 CONFIG_INPUT=y
diff --git a/samples/subsys/usb/hid-keyboard/src/main.c b/samples/subsys/usb/hid-keyboard/src/main.c
index 14f360beb3a8d..c02072d3f5df9 100644
--- a/samples/subsys/usb/hid-keyboard/src/main.c
+++ b/samples/subsys/usb/hid-keyboard/src/main.c
@@ -279,6 +279,17 @@ int main(void)
 			continue;
 		}
 
+		if (usbd_is_suspended(sample_usbd)) {
+			/* on a press of any button, send wakeup request */
+			if (kb_evt.value) {
+				ret = usbd_wakeup_request(sample_usbd);
+				if (ret) {
+					LOG_ERR("Remote wakeup error, %d", ret);
+				}
+			}
+			continue;
+		}
+
 		ret = hid_device_submit_report(hid_dev, KB_REPORT_COUNT, report);
 		if (ret) {
 			LOG_ERR("HID submit report error, %d", ret);
diff --git a/samples/subsys/usb/hid-mouse/sample.yaml b/samples/subsys/usb/hid-mouse/sample.yaml
index ea670e849e9f9..132c71c928b61 100644
--- a/samples/subsys/usb/hid-mouse/sample.yaml
+++ b/samples/subsys/usb/hid-mouse/sample.yaml
@@ -22,6 +22,7 @@ tests:
       - stm32f723e_disco
       - nucleo_f413zh
       - mimxrt1060_evk/mimxrt1062/qspi
+      - max32690evkit/max32690/m4
     extra_args:
       - CONF_FILE="usbd_next_prj.conf"
       - EXTRA_DTC_OVERLAY_FILE="usbd_next.overlay"
diff --git a/samples/subsys/usb/mass/sample.yaml b/samples/subsys/usb/mass/sample.yaml
index 352ee21002275..4dbf2126798bb 100644
--- a/samples/subsys/usb/mass/sample.yaml
+++ b/samples/subsys/usb/mass/sample.yaml
@@ -30,6 +30,7 @@ tests:
       - nucleo_f413zh
       - mimxrt685_evk/mimxrt685s/cm33
       - mimxrt1060_evk/mimxrt1062/qspi
+      - max32690evkit/max32690/m4
     extra_args:
       - CONF_FILE="usbd_next_prj.conf"
       - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
diff --git a/samples/subsys/usb/testusb/sample.yaml b/samples/subsys/usb/testusb/sample.yaml
index c251eaded7392..93b1313a1565f 100644
--- a/samples/subsys/usb/testusb/sample.yaml
+++ b/samples/subsys/usb/testusb/sample.yaml
@@ -4,7 +4,4 @@ tests:
   sample.usb.loopback:
     depends_on: usb_device
     tags: usb
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     harness: button
diff --git a/samples/subsys/usb/uac2_explicit_feedback/README.rst b/samples/subsys/usb/uac2_explicit_feedback/README.rst
index 4cc856f234340..d0ea63c5acf82 100644
--- a/samples/subsys/usb/uac2_explicit_feedback/README.rst
+++ b/samples/subsys/usb/uac2_explicit_feedback/README.rst
@@ -15,6 +15,12 @@ The device running this sample presents itself to the host as a Full-Speed
 Asynchronous USB Audio 2 class device supporting 48 kHz 16-bit 2-channel
 (stereo) playback.
 
+.. warning::
+   Microsoft Windows USB Audio 2.0 driver available since Windows 10,
+   release 1703 expects Full-Speed explicit feedback endpoint wMaxPacketSize to
+   be equal 4, which violates the USB 2.0 Specification.
+   See https://aka.ms/AArvnax for Windows Feedback Hub report.
+
 Explicit Feedback
 *****************
 
@@ -42,11 +48,11 @@ is not available, the DPPI and TIMER peripherals on nRF5340 can be configured to
 provide relative timing information between I2S FRAMESTART and USB SOF.
 
 This sample in both modes (direct sample counting and indirect I2S buffer output
-to USB SOF offset) has been tested on :ref:`nrf5340dk_nrf5340`.
+to USB SOF offset) has been tested on :zephyr:board:`nrf5340dk`.
 
 The sample defaults to indirect feedback calculation because direct sample
 counting requires external connection between I2S LRCLK output pin to GPIOTE
-input pin (hardcoded to P1.09) on :ref:`nrf5340dk_nrf5340`. In the indirect mode
+input pin (hardcoded to P1.09) on :zephyr:board:`nrf5340dk`. In the indirect mode
 no extra connections are necessary and the sample can even be used without any
 I2S device connected where I2S signals can be checked e.g. on logic analyzer.
 
diff --git a/samples/subsys/usb/uac2_implicit_feedback/README.rst b/samples/subsys/usb/uac2_implicit_feedback/README.rst
index 99e4bd72aa6d9..b878f95e5f5aa 100644
--- a/samples/subsys/usb/uac2_implicit_feedback/README.rst
+++ b/samples/subsys/usb/uac2_implicit_feedback/README.rst
@@ -12,6 +12,10 @@ This sample demonstrates how to implement USB asynchronous bidirectional audio
 with implicit feedback. The host adjusts number of stereo samples sent for
 headphones playback based on the number of mono microphone samples received.
 
+.. warning::
+   Microsoft Windows USB Audio 2.0 driver available since Windows 10,
+   release 1703 does not support implicit feedback.
+
 Requirements
 ************
 
@@ -19,7 +23,7 @@ Target must be able to measure I2S block start (i.e. first sample from output
 buffer gets out) relative to USB SOF. The relative offset must be reported with
 single sample accuracy.
 
-This sample has been tested on :ref:`nrf5340dk_nrf5340`. While for actual audio
+This sample has been tested on :zephyr:board:`nrf5340dk`. While for actual audio
 experience it is necessary to connect external I2S ADC and I2S DAC, simple echo
 can be accomplished by shorting I2S data output with I2S data input.
 
diff --git a/samples/subsys/usb/webusb-next/sample.yaml b/samples/subsys/usb/webusb-next/sample.yaml
index e26352fe50e56..d1f6d44f84b60 100644
--- a/samples/subsys/usb/webusb-next/sample.yaml
+++ b/samples/subsys/usb/webusb-next/sample.yaml
@@ -12,4 +12,5 @@ tests:
       - nucleo_f413zh
       - mimxrt685_evk/mimxrt685s/cm33
       - mimxrt1060_evk/mimxrt1062/qspi
+      - max32690evkit/max32690/m4
     harness: TBD
diff --git a/samples/subsys/usb/webusb/sample.yaml b/samples/subsys/usb/webusb/sample.yaml
index c68c0366eaa96..a640ffb97ce1a 100644
--- a/samples/subsys/usb/webusb/sample.yaml
+++ b/samples/subsys/usb/webusb/sample.yaml
@@ -4,7 +4,4 @@ tests:
   sample.usb.webusb:
     depends_on: usb_device
     tags: usb
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     harness: TBD
diff --git a/samples/subsys/uuid/CMakeLists.txt b/samples/subsys/uuid/CMakeLists.txt
new file mode 100644
index 0000000000000..98b06b9420393
--- /dev/null
+++ b/samples/subsys/uuid/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, SECO Mind Srl
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(dap)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/samples/subsys/uuid/README.rst b/samples/subsys/uuid/README.rst
new file mode 100644
index 0000000000000..3e399af2d55f4
--- /dev/null
+++ b/samples/subsys/uuid/README.rst
@@ -0,0 +1,36 @@
+.. zephyr:code-sample:: uuid
+   :name: UUID
+
+   Manipulate UUID v4 and v5 compliant with IETF RFC 9562.
+
+Overview
+********
+
+This sample app demonstrates the use of the UUID utilities to generate and manipulate UUIDs
+accordingly to IETF RFC 9562.
+
+The following functionality is demonstrated:
+- UUIDv4 generation
+- UUIDv5 generation from namespace and data
+- UUID conversion from/to string and to base64 and base64 URL safe formats
+
+Requirements
+************
+
+This sample relies on the following modules:
+- MbedTLS for the UUIDv5 hash functions
+- Base64 for the base64 encoding of UUIDs
+- Entropy source for the pseudo-random generation of UUIDv4
+
+Building and Running
+********************
+
+Use the standard ``west`` commands to build and flash this application.
+For example for ``native_sim`` build with:
+```
+west build -p -b native_sim samples/subsys/uuid
+```
+Then run with:
+```
+west build -t run
+```
diff --git a/samples/subsys/uuid/prj.conf b/samples/subsys/uuid/prj.conf
new file mode 100644
index 0000000000000..e68bba789fbcf
--- /dev/null
+++ b/samples/subsys/uuid/prj.conf
@@ -0,0 +1,13 @@
+CONFIG_UUID=y
+CONFIG_UUID_V5=y
+CONFIG_UUID_V4=y
+CONFIG_UUID_BASE64=y
+
+CONFIG_ENTROPY_GENERATOR=y
+
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_MD=y
+CONFIG_MBEDTLS_SHA1=y
+CONFIG_BASE64=y
+
+CONFIG_LOG=y
diff --git a/samples/subsys/uuid/sample.yaml b/samples/subsys/uuid/sample.yaml
new file mode 100644
index 0000000000000..b8ec922c99493
--- /dev/null
+++ b/samples/subsys/uuid/sample.yaml
@@ -0,0 +1,17 @@
+sample:
+  name: UUID
+tests:
+  sample.subsys.uuid:
+    tags: uuid
+    platform_allow:
+      - qemu_x86
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+    filter: CONFIG_ENTROPY_HAS_DRIVER
+    harness: console
+    harness_config:
+      type: one_line
+      regex:
+        - "UUID sample completed successfully"
diff --git a/samples/subsys/uuid/src/main.c b/samples/subsys/uuid/src/main.c
new file mode 100644
index 0000000000000..436e790e562ed
--- /dev/null
+++ b/samples/subsys/uuid/src/main.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2025, SECO Mind Srl
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/uuid.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(uuid_sample, LOG_LEVEL_INF);
+
+int main(void)
+{
+	int result;
+	struct uuid uuid_v4 = {0};
+	struct uuid uuid_v5_namespace = {0};
+	struct uuid uuid_v5 = {0};
+	char uuid_v4_str[UUID_STR_LEN] = {0};
+	char uuid_v5_str[UUID_STR_LEN] = {0};
+	char uuid_v4_base64[UUID_BASE64_LEN] = {0};
+	char uuid_v4_base64url[UUID_BASE64URL_LEN] = {0};
+
+	/* Generate an UUID v4 from pseudo-random data */
+	result = uuid_generate_v4(&uuid_v4);
+	if (result != 0) {
+		LOG_ERR("UUID v4 generation failed, error: %s (%d)", strerror(result), result);
+		return -1;
+	}
+	/* Convert the UUID to string and to its base 64 and base 64 URL safe formats */
+	result = uuid_to_string(&uuid_v4, uuid_v4_str);
+	if (result != 0) {
+		LOG_ERR("UUID v4 to string failed, error: %s (%d)", strerror(result), result);
+		return -1;
+	}
+	LOG_INF("UUID v4: '%s'", uuid_v4_str);
+	result = uuid_to_base64(&uuid_v4, uuid_v4_base64);
+	if (result != 0) {
+		LOG_ERR("UUID v4 to base 64 failed, error: %s (%d)", strerror(result), result);
+		return -1;
+	}
+	LOG_INF("UUID v4 base 64: '%s'", uuid_v4_base64);
+	result = uuid_to_base64url(&uuid_v4, uuid_v4_base64url);
+	if (result != 0) {
+		LOG_ERR("UUID v4 to base 64 URL safe failed, error: %s (%d)", strerror(result),
+			result);
+		return -1;
+	}
+	LOG_INF("UUID v4 base 64 URL safe: '%s'", uuid_v4_base64url);
+
+	/* Generate an UUID v5 */
+	/* This UUID is the same as in RFC 9562 Appendix A.4: "Example of a UUIDv5 Value" */
+	result = uuid_from_string("6ba7b810-9dad-11d1-80b4-00c04fd430c8", &uuid_v5_namespace);
+	if (result != 0) {
+		LOG_ERR("Namespace string to UUID failed, error: %s (%d)", strerror(result),
+			result);
+		return -1;
+	}
+	result = uuid_generate_v5(&uuid_v5_namespace, "www.example.com", strlen("www.example.com"),
+				  &uuid_v5);
+	if (result != 0) {
+		LOG_ERR("UUID v5 generation failed, error: %s (%d)", strerror(result), result);
+		return -1;
+	}
+	result = uuid_to_string(&uuid_v5, uuid_v5_str);
+	if (result != 0) {
+		LOG_ERR("UUID v4 to string failed, error: %s (%d)", strerror(result), result);
+		return -1;
+	}
+	LOG_INF("UUID v5: '%s'", uuid_v5_str);
+
+	LOG_INF("UUID sample completed successfully");
+
+	return 0;
+}
diff --git a/samples/subsys/zbus/remote_mock/boards/native_sim.conf b/samples/subsys/zbus/remote_mock/boards/native_sim.conf
index f328c599f2639..0843e94acbdbd 100644
--- a/samples/subsys/zbus/remote_mock/boards/native_sim.conf
+++ b/samples/subsys/zbus/remote_mock/boards/native_sim.conf
@@ -1,2 +1 @@
-CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE=y
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
diff --git a/samples/subsys/zbus/remote_mock/boards/native_sim.overlay b/samples/subsys/zbus/remote_mock/boards/native_sim.overlay
new file mode 100644
index 0000000000000..c49b63d8e4b6e
--- /dev/null
+++ b/samples/subsys/zbus/remote_mock/boards/native_sim.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+&uart1 {
+	status = "okay";
+};
diff --git a/samples/subsys/zbus/runtime_obs_registration/src/main.c b/samples/subsys/zbus/runtime_obs_registration/src/main.c
index f389d61c70612..8f66f3644e117 100644
--- a/samples/subsys/zbus/runtime_obs_registration/src/main.c
+++ b/samples/subsys/zbus/runtime_obs_registration/src/main.c
@@ -44,10 +44,11 @@ int main(void)
 	LOG_INF("System started");
 
 	const struct zbus_channel *chan;
+	struct zbus_observer_node obs_node;
 
 	while (1) {
 		LOG_INF("Activating filter");
-		zbus_chan_add_obs(&raw_data_chan, &filter_lis, K_MSEC(200));
+		zbus_chan_add_obs(&raw_data_chan, &filter_lis, &obs_node, K_MSEC(200));
 
 		zbus_sub_wait(&state_change_sub, &chan, K_FOREVER);
 
@@ -55,7 +56,7 @@ int main(void)
 		zbus_chan_rm_obs(&raw_data_chan, &filter_lis, K_MSEC(200));
 
 		LOG_INF("Bypass filter");
-		zbus_chan_add_obs(&raw_data_chan, &consumer_sub, K_MSEC(200));
+		zbus_chan_add_obs(&raw_data_chan, &consumer_sub, &obs_node, K_MSEC(200));
 
 		zbus_sub_wait(&state_change_sub, &chan, K_FOREVER);
 
diff --git a/samples/subsys/zbus/uart_bridge/boards/native_posix.conf b/samples/subsys/zbus/uart_bridge/boards/native_posix.conf
deleted file mode 100644
index b552360756cab..0000000000000
--- a/samples/subsys/zbus/uart_bridge/boards/native_posix.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE=y
diff --git a/samples/subsys/zbus/uart_bridge/boards/native_posix_native_64.conf b/samples/subsys/zbus/uart_bridge/boards/native_posix_native_64.conf
deleted file mode 100644
index b552360756cab..0000000000000
--- a/samples/subsys/zbus/uart_bridge/boards/native_posix_native_64.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE=y
diff --git a/samples/subsys/zbus/uart_bridge/boards/native_sim.conf b/samples/subsys/zbus/uart_bridge/boards/native_sim.conf
deleted file mode 100644
index b552360756cab..0000000000000
--- a/samples/subsys/zbus/uart_bridge/boards/native_sim.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE=y
diff --git a/samples/subsys/zbus/uart_bridge/boards/native_sim.overlay b/samples/subsys/zbus/uart_bridge/boards/native_sim.overlay
new file mode 100644
index 0000000000000..c49b63d8e4b6e
--- /dev/null
+++ b/samples/subsys/zbus/uart_bridge/boards/native_sim.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+&uart1 {
+	status = "okay";
+};
diff --git a/samples/subsys/zbus/uart_bridge/boards/native_sim_native_64.conf b/samples/subsys/zbus/uart_bridge/boards/native_sim_native_64.conf
deleted file mode 100644
index b552360756cab..0000000000000
--- a/samples/subsys/zbus/uart_bridge/boards/native_sim_native_64.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UART_NATIVE_POSIX_PORT_1_ENABLE=y
diff --git a/samples/subsys/zbus/uart_bridge/boards/native_sim_native_64.overlay b/samples/subsys/zbus/uart_bridge/boards/native_sim_native_64.overlay
new file mode 100644
index 0000000000000..0b47ddd433232
--- /dev/null
+++ b/samples/subsys/zbus/uart_bridge/boards/native_sim_native_64.overlay
@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "native_sim.overlay"
diff --git a/samples/sysbuild/hello_world/README.rst b/samples/sysbuild/hello_world/README.rst
index 611d4a4781e8b..d16f0fa51c6fa 100644
--- a/samples/sysbuild/hello_world/README.rst
+++ b/samples/sysbuild/hello_world/README.rst
@@ -30,7 +30,7 @@ to boot a remote core.
    ``-T`` option.
 
 Here's an example to build and flash the sample for the
-:ref:`nrf54h20dk_nrf54h20`, using application and radio cores:
+:zephyr:board:`nrf54h20dk`, using application and radio cores:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/sysbuild/hello_world
diff --git a/samples/sysbuild/hello_world/sample.yaml b/samples/sysbuild/hello_world/sample.yaml
index 68eae58739c14..545f8a0b756cd 100644
--- a/samples/sysbuild/hello_world/sample.yaml
+++ b/samples/sysbuild/hello_world/sample.yaml
@@ -48,8 +48,10 @@ tests:
   sample.sysbuild.hello_world.nrf54l15dk_nrf54l15_cpuflpr:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_args:
 
       - SB_CONF_FILE=sysbuild/nrf54l15dk_nrf54l15_cpuflpr.conf
diff --git a/samples/sysbuild/with_mcuboot/CMakeLists.txt b/samples/sysbuild/with_mcuboot/CMakeLists.txt
index ca0a689a6d954..41a45be011aac 100644
--- a/samples/sysbuild/with_mcuboot/CMakeLists.txt
+++ b/samples/sysbuild/with_mcuboot/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(sample_with_mcuboot)
 
-# Verify that this samnple is built through sysbuild to ensure MCUboot is
+# Verify that this sample is built through sysbuild to ensure MCUboot is
 # automatically included and that sample specific MCUboot configurations are
 # used when building MCUboot.
 test_sysbuild()
diff --git a/samples/sysbuild/with_mcuboot/sample.yaml b/samples/sysbuild/with_mcuboot/sample.yaml
index 2478fa9df345a..0348b74dfe305 100644
--- a/samples/sysbuild/with_mcuboot/sample.yaml
+++ b/samples/sysbuild/with_mcuboot/sample.yaml
@@ -13,14 +13,14 @@ tests:
       - esp32s2_devkitc
       - esp32s3_devkitm/esp32s3/procpu
       - esp32c3_devkitm
-      - esp32c6_devkitc
+      - esp32c6_devkitc/esp32c6/hpcore
     integration_platforms:
       - nrf52840dk/nrf52840
       - esp32_devkitc_wrover/esp32/procpu
       - esp32s2_devkitc
       - esp32s3_devkitm/esp32s3/procpu
       - esp32c3_devkitm
-      - esp32c6_devkitc
+      - esp32c6_devkitc/esp32c6/hpcore
     tags: mcuboot
     harness: console
     harness_config:
diff --git a/samples/tfm_integration/config_build/sample.yaml b/samples/tfm_integration/config_build/sample.yaml
index e19873a174f48..3c46c148f7bab 100644
--- a/samples/tfm_integration/config_build/sample.yaml
+++ b/samples/tfm_integration/config_build/sample.yaml
@@ -8,6 +8,8 @@ common:
     - v2m_musca_s1/musca_s1/ns
     - nrf5340dk/nrf5340/cpuapp/ns
     - nrf9160dk/nrf9160/ns
+    - nrf54l15dk/nrf54l15/cpuapp/ns
+    - nrf54l15dk/nrf54l10/cpuapp/ns
     - bl5340_dvk/nrf5340/cpuapp/ns
   integration_platforms:
     - nrf5340dk/nrf5340/cpuapp/ns
diff --git a/samples/tfm_integration/tfm_ipc/sample.yaml b/samples/tfm_integration/tfm_ipc/sample.yaml
index 0d141f4555ce0..390efa24fb7e1 100644
--- a/samples/tfm_integration/tfm_ipc/sample.yaml
+++ b/samples/tfm_integration/tfm_ipc/sample.yaml
@@ -31,7 +31,10 @@ tests:
     tags:
       - introduction
       - trusted-firmware-m
-    platform_allow: mps2/an521/cpu0/ns
+    platform_allow:
+      - mps2/an521/cpu0/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l10/cpuapp/ns
     extra_configs:
       - CONFIG_TFM_BL2=n
     harness: console
diff --git a/scripts/build/file2hex.py b/scripts/build/file2hex.py
index 71336d0bb3d69..b6e1acc8c0727 100755
--- a/scripts/build/file2hex.py
+++ b/scripts/build/file2hex.py
@@ -78,8 +78,14 @@ def main():
                     gz_obj.write(fg.read(args.length))
 
             content.seek(0)
-            for chunk in iter(lambda: content.read(8), b''):
-                make_hex(chunk)
+            if args.format == "literal":
+                print('"', end='')
+                for chunk in iter(lambda: content.read(1024), b''):
+                    make_string_literal(chunk)
+                print('"', end='')
+            else:
+                for chunk in iter(lambda: content.read(1024), b''):
+                    make_hex(chunk)
     else:
         with open(args.file, "rb") as fp:
             fp.seek(args.offset)
diff --git a/scripts/build/gen_app_partitions.py b/scripts/build/gen_app_partitions.py
index ec0a4bbfc7e7f..4a178762afcc5 100755
--- a/scripts/build/gen_app_partitions.py
+++ b/scripts/build/gen_app_partitions.py
@@ -27,11 +27,148 @@
 - key/value pairs mapping static library files to what partitions their globals
   should end up in.
 
-The output is a linker script fragment containing the definition of the
-app shared memory section, which is further divided, for each partition
-found, into data and BSS for each partition.
+The output is either a linker script fragment or linker-script generator
+fragments containing the definition of the app shared memory section, which
+is further divided, for each partition found, into data and BSS for each
+partition.
 """
 
+#The linker script fragments looks something like this:
+# SECTION_PROLOGUE(_APP_SMEM_SECTION_NAME,,)
+# 	{
+# 		APP_SHARED_ALIGN;
+# 		_app_smem_start = .;
+
+# 		/* Auto generated code do not modify */
+# 		SMEM_PARTITION_ALIGN(z_data_smem_ztest_mem_partition_bss_end - z_data_smem_ztest_mem_partition_part_start);
+# 		z_data_smem_ztest_mem_partition_part_start = .;
+# 		KEEP(*(data_smem_ztest_mem_partition_data*))
+
+# 		z_data_smem_ztest_mem_partition_bss_start = .;
+# 		KEEP(*(data_smem_ztest_mem_partition_bss*))
+
+# 		z_data_smem_ztest_mem_partition_bss_end = .;
+# 		SMEM_PARTITION_ALIGN(z_data_smem_ztest_mem_partition_bss_end - z_data_smem_ztest_mem_partition_part_start);
+# 		z_data_smem_ztest_mem_partition_part_end = .;
+
+# 		/* Auto generated code do not modify */
+# 		SMEM_PARTITION_ALIGN(z_data_smem_z_libc_partition_bss_end - z_data_smem_z_libc_partition_part_start);
+# 		z_data_smem_z_libc_partition_part_start = .;
+# 		KEEP(*(data_smem_z_libc_partition_data*))
+
+# 		z_data_smem_z_libc_partition_bss_start = .;
+# 		KEEP(*(data_smem_z_libc_partition_bss*))
+
+# 		z_data_smem_z_libc_partition_bss_end = .;
+# 		SMEM_PARTITION_ALIGN(z_data_smem_z_libc_partition_bss_end - z_data_smem_z_libc_partition_part_start);
+# 		z_data_smem_z_libc_partition_part_end = .;
+
+# 		APP_SHARED_ALIGN;
+# 		_app_smem_end = .;
+# 	} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+
+# 	z_data_smem_ztest_mem_partition_part_size = z_data_smem_ztest_mem_partition_part_end - z_data_smem_ztest_mem_partition_part_start;
+# 	z_data_smem_ztest_mem_partition_bss_size = z_data_smem_ztest_mem_partition_bss_end - z_data_smem_ztest_mem_partition_bss_start;
+
+# 	z_data_smem_z_libc_partition_part_size = z_data_smem_z_libc_partition_part_end - z_data_smem_z_libc_partition_part_start;
+# 	z_data_smem_z_libc_partition_bss_size = z_data_smem_z_libc_partition_bss_end - z_data_smem_z_libc_partition_bss_start;
+
+# the linker script generator fragments looks something like this:
+# There is a zephyr_linker_group() called APP_SMEM_GROUP for these sections
+# defined in linker.cmake
+# _APP_SMEM_SECTION_NAME is #defined in sections.h to "app_smem". Ideally we should have that here too.
+#
+# zephyr_linker_section(NAME _APP_SMEM_SECTION_NAME GROUP APP_SMEM_GROUP NOINPUT ALIGN_WITH_INPUT)
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     SYMBOLS
+#     _app_smem_start
+#     )
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     INPUT
+#     "data_smem_ztest_mem_partition_data*"
+#     KEEP
+#     SYMBOLS
+#     z_data_smem_ztest_mem_partition_part_start
+#     )
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     INPUT
+#     "data_smem_ztest_mem_partition_bss*"
+#     KEEP
+#     SYMBOLS
+#     z_data_smem_ztest_mem_partition_bss_start
+#     z_data_smem_ztest_mem_partition_bss_end
+#     )
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     SYMBOLS
+#     z_data_smem_ztest_mem_partition_part_end
+#     )
+
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     INPUT
+#     "data_smem_z_libc_partition_data*"
+#     KEEP
+#     SYMBOLS
+#     z_data_smem_z_libc_partition_part_start
+#     )
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     INPUT
+#     "data_smem_z_libc_partition_bss*"
+#     KEEP
+#     SYMBOLS
+#     z_data_smem_z_libc_partition_bss_start
+#     z_data_smem_z_libc_partition_bss_end
+#     )
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     SYMBOLS
+#     z_data_smem_z_libc_partition_part_end
+#     )
+#   zephyr_linker_section_configure(
+#     SECTION
+#     _APP_SMEM_SECTION_NAME
+#     SYMBOLS
+#     _app_smem_end
+#     )
+#   zephyr_linker_symbol(
+#     SYMBOL
+#     z_data_smem_ztest_mem_partition_part_size
+#     EXPR
+#     "(@z_data_smem_ztest_mem_partition_part_end@ - @z_data_smem_ztest_mem_partition_part_start@)"
+#     )
+#   zephyr_linker_symbol(
+#     SYMBOL
+#     z_data_smem_ztest_mem_partition_bss_size
+#     EXPR
+#     "(@z_data_smem_ztest_mem_partition_bss_end@ - @z_data_smem_ztest_mem_partition_bss_start@)"
+#     )
+
+#   zephyr_linker_symbol(
+#     SYMBOL
+#     z_data_smem_z_libc_partition_part_size
+#     EXPR
+#     "(@z_data_smem_z_libc_partition_part_end@ - @z_data_smem_z_libc_partition_part_start@)"
+#     )
+#   zephyr_linker_symbol(
+#     SYMBOL
+#     z_data_smem_z_libc_partition_bss_size
+#     EXPR
+#     "(@z_data_smem_z_libc_partition_bss_end@ - @z_data_smem_z_libc_partition_bss_start@)"
+#     )
+
+
 import sys
 import argparse
 import json
@@ -50,60 +187,133 @@
 # application shared memory partitions.
 # these are later read by the macros defined in app_memdomain.h for
 # initialization purpose when USERSPACE is enabled.
-data_template = """
-		/* Auto generated code do not modify */
-		SMEM_PARTITION_ALIGN(z_data_smem_{0}_bss_end - z_data_smem_{0}_part_start);
-		z_data_smem_{0}_part_start = .;
-		KEEP(*(data_smem_{0}_data*))
-"""
-
-library_data_template = """
-		\"*{0}:*\"(.data .data.* .sdata .sdata.*)
-"""
 
-bss_template = """
-		z_data_smem_{0}_bss_start = .;
-		KEEP(*(data_smem_{0}_bss*))
-"""
-
-library_bss_template = """
-		\"*{0}:*\"(.bss .bss.* .sbss .sbss.* COMMON COMMON.*)
-"""
-
-footer_template = """
-		z_data_smem_{0}_bss_end = .;
-		SMEM_PARTITION_ALIGN(z_data_smem_{0}_bss_end - z_data_smem_{0}_part_start);
-		z_data_smem_{0}_part_end = .;
-"""
-
-linker_start_seq = """
-	SECTION_PROLOGUE(_APP_SMEM{1}_SECTION_NAME,,)
-	{{
-		APP_SHARED_ALIGN;
-		_app_smem{0}_start = .;
-"""
-
-linker_end_seq = """
-		APP_SHARED_ALIGN;
-		_app_smem{0}_end = .;
-	}} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
-"""
-
-empty_app_smem = """
-	SECTION_PROLOGUE(_APP_SMEM{1}_SECTION_NAME,,)
-	{{
-#ifdef EMPTY_APP_SHARED_ALIGN
-		EMPTY_APP_SHARED_ALIGN;
-#endif
-		_app_smem{0}_start = .;
-		_app_smem{0}_end = .;
-	}} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
-"""
-
-size_cal_string = """
-	z_data_smem_{0}_part_size = z_data_smem_{0}_part_end - z_data_smem_{0}_part_start;
-	z_data_smem_{0}_bss_size = z_data_smem_{0}_bss_end - z_data_smem_{0}_bss_start;
-"""
+class LDScriptTemlate:
+    data_template = """
+            /* Auto generated code do not modify */
+            SMEM_PARTITION_ALIGN(z_data_smem_{partition}_bss_end - z_data_smem_{partition}_part_start);
+            z_data_smem_{partition}_part_start = .;
+            KEEP(*(data_smem_{partition}_data*))
+    """
+
+    library_data_template = """
+            \"*{lib}:*\"(.data .data.* .sdata .sdata.*)
+    """
+
+    bss_template = """
+            z_data_smem_{partition}_bss_start = .;
+            KEEP(*(data_smem_{partition}_bss*))
+    """
+
+    library_bss_template = """
+            \"*{lib}:*\"(.bss .bss.* .sbss .sbss.* COMMON COMMON.*)
+    """
+
+    footer_template = """
+            z_data_smem_{partition}_bss_end = .;
+            SMEM_PARTITION_ALIGN(z_data_smem_{partition}_bss_end - z_data_smem_{partition}_part_start);
+            z_data_smem_{partition}_part_end = .;
+    """
+
+    linker_start_seq = """
+        SECTION_PROLOGUE(_APP_SMEM{SECTION}_SECTION_NAME,,)
+        {{
+            APP_SHARED_ALIGN;
+            _app_smem{section}_start = .;
+    """
+
+    linker_end_seq = """
+            APP_SHARED_ALIGN;
+            _app_smem{section}_end = .;
+        }} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+    """
+
+    empty_app_smem = """
+        SECTION_PROLOGUE(_APP_SMEM{SECTION}_SECTION_NAME,,)
+        {{
+    #ifdef EMPTY_APP_SHARED_ALIGN
+            EMPTY_APP_SHARED_ALIGN;
+    #endif
+            _app_smem{section}_start = .;
+            _app_smem{section}_end = .;
+        }} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+    """
+
+    size_cal_string = """
+        z_data_smem_{partition}_part_size = z_data_smem_{partition}_part_end - z_data_smem_{partition}_part_start;
+        z_data_smem_{partition}_bss_size = z_data_smem_{partition}_bss_end - z_data_smem_{partition}_bss_start;
+    """
+
+def cmake_list_append(list, props):
+    tokens = [fr"{key}\;{value}" for key, value in props.items()]
+    stuff = r"\;".join(tokens)
+    return """list(APPEND """+ list + """ \"{{""" + stuff + """}}\")\n"""
+
+def zephyr_linker_section(name, group, align = None, noinput = True, align_with_input = True, hidden = False, noinit = False):
+    props = {"""NAME""": name, """GROUP""": group}
+    if align :
+        props['ALIGN'] = align
+    #The bool flags are always there:
+    props['NOIPUT'] = noinput
+    props['ALIGN_WITH_INPUT'] = align_with_input
+    props['HIDDEN'] = hidden
+    props['NOINIT'] = noinit
+    return cmake_list_append("SECTIONS", props)
+
+def zephyr_linker_section_configure(section, input = None, symbols = None, align = None, any = False, first = False, keep = False):
+    props = {"SECTION": section}
+    if input:
+        props["INPUT"] = input
+    #ANY\;FALSE\;FIRST\;FALSE\;KEEP\;FALSE\
+    props['ANY'] = any
+    props['FIRST'] = first
+    props['KEEP'] = keep
+    if symbols:
+        props["SYMBOLS"] = symbols
+    if align:
+        props["ALIGN"] = align
+    return cmake_list_append("SECTION_SETTINGS", props)
+
+def zephyr_linker_symbol(symbol, expr) :
+    return cmake_list_append("SYMBOLS", {'SYMBOL': symbol, 'EXPR':expr})
+
+class CmakeTemplate:
+    section_name = "@_APP_SMEM{SECTION}_SECTION_NAME@"
+    data_template = (
+        zephyr_linker_section_configure(section=section_name, align="@SMEM_PARTITION_ALIGN_BYTES@")+
+        zephyr_linker_section_configure(section=section_name, input="data_smem_{partition}_data*", symbols="z_data_smem_{partition}_part_start", keep=True)
+    )
+
+    library_data_template = zephyr_linker_section_configure(section=section_name, input="*{lib}:*(.data .data.* .sdata .sdata.*)")
+
+    bss_template = (
+        zephyr_linker_section_configure(section=section_name, input="data_smem_{partition}_bss*", symbols="z_data_smem_{partition}_bss_start", keep=True)
+    )
+
+    library_bss_template = zephyr_linker_section_configure(section=section_name, input="*{lib}:*(.bss .bss.* .sbss .sbss.* COMMON COMMON.*)")
+
+    footer_template = (
+        zephyr_linker_section_configure(section=section_name, symbols="z_data_smem_{partition}_bss_end", keep=True) +
+        zephyr_linker_section_configure(section=section_name, align="@SMEM_PARTITION_ALIGN_BYTES@") +
+        zephyr_linker_section_configure(section=section_name, symbols="z_data_smem_{partition}_part_end", keep=True)
+    )
+
+    linker_start_seq = (
+        zephyr_linker_section(name=section_name, group="APP_SMEM_GROUP", noinput=True, align_with_input=True) +
+        zephyr_linker_section_configure(section=section_name, align="@APP_SHARED_ALIGN_BYTES@", symbols="_app_smem{section}_start"))
+
+    linker_end_seq = (
+        zephyr_linker_section_configure(section=section_name, align="@APP_SHARED_ALIGN_BYTES@") +
+        zephyr_linker_section_configure(section=section_name, symbols="_app_smem{section}_end") )
+
+    empty_app_smem = (
+        zephyr_linker_section(name=section_name, group="APP_SMEM_GROUP", align="@APP_SHARED_ALIGN_BYTES@", noinput=True, align_with_input=True) +
+        zephyr_linker_section_configure(section = section_name, symbols="_app_smem{section}_start") +
+        zephyr_linker_section_configure(section = section_name, symbols="_app_smem{section}_end") )
+
+    size_cal_string = (
+        zephyr_linker_symbol(symbol='z_data_smem_{partition}_part_size', expr='@z_data_smem_{partition}_part_end@ - @z_data_smem_{partition}_part_start@') +
+        zephyr_linker_symbol(symbol='z_data_smem_{partition}_bss_size', expr='@z_data_smem_{partition}_bss_end@ - @z_data_smem_{partition}_bss_start@'))
 
 section_regex = re.compile(r'data_smem_([A-Za-z0-9_]*)_(data|bss)*')
 
@@ -200,34 +410,45 @@ def parse_elf_file(partitions):
                 else:
                     partitions[partition_name][SZ] += size
 
+def generate_final(linker_file, partitions, lnkr_sect=""):
+    if linker_file.endswith(".ld"):
+        template = LDScriptTemlate
+    else:
+        template = CmakeTemplate
+    generate_final_linker(template, linker_file, partitions, lnkr_sect)
 
-def generate_final_linker(linker_file, partitions, lnkr_sect=""):
+def generate_final_linker(template, linker_file, partitions, lnkr_sect):
     string = ""
-
+    props = { 'section' : lnkr_sect, 'SECTION' : lnkr_sect.upper() }
     if len(partitions) > 0:
-        string = linker_start_seq.format(lnkr_sect, lnkr_sect.upper())
+        string = template.linker_start_seq.format(**props)
         size_string = ''
         for partition, item in partitions.items():
-            string += data_template.format(partition)
+            part_props = props
+            part_props["partition"] = partition
+            string += template.data_template.format(**part_props)
             if LIB in item:
                 for lib in item[LIB]:
-                    string += library_data_template.format(lib)
-            string += bss_template.format(partition, lnkr_sect)
+                    lib_props = part_props
+                    lib_props["lib"] = lib
+                    string += template.library_data_template.format(**lib_props)
+            string += template.bss_template.format(**part_props)
             if LIB in item:
                 for lib in item[LIB]:
-                    string += library_bss_template.format(lib)
-            string += footer_template.format(partition)
-            size_string += size_cal_string.format(partition)
+                    lib_props = part_props
+                    lib_props["lib"] = lib
+                    string += template.library_bss_template.format(**lib_props)
+            string += template.footer_template.format(**part_props)
+            size_string += template.size_cal_string.format(**part_props)
 
-        string += linker_end_seq.format(lnkr_sect)
+        string += template.linker_end_seq.format(**props)
         string += size_string
     else:
-        string = empty_app_smem.format(lnkr_sect, lnkr_sect.upper())
+        string = template.empty_app_smem.format(**props) #lnkr_sect, lnkr_sect.upper())
 
     with open(linker_file, "w") as fw:
         fw.write(string)
 
-
 def parse_args():
     global args
     parser = argparse.ArgumentParser(
@@ -294,7 +515,8 @@ def main():
 
     partsorted = OrderedDict(decreasing_tuples)
 
-    generate_final_linker(args.output, partsorted)
+    generate_final(args.output, partsorted)
+
     if args.verbose:
         print("Partitions retrieved:")
         for key in partsorted:
@@ -308,7 +530,7 @@ def main():
 
         partsorted = OrderedDict(decreasing_tuples)
 
-        generate_final_linker(args.pinoutput, partsorted, lnkr_sect="_pinned")
+        generate_final(args.pinoutput, partsorted, lnkr_sect="_pinned")
         if args.verbose:
             print("Pinned partitions retrieved:")
             for key in partsorted:
diff --git a/scripts/build/gen_relocate_app.py b/scripts/build/gen_relocate_app.py
index f1bcccf1df699..8baae18c57612 100755
--- a/scripts/build/gen_relocate_app.py
+++ b/scripts/build/gen_relocate_app.py
@@ -8,21 +8,22 @@
 """
 This script will relocate .text, .rodata, .data and .bss sections from required files
 and places it in the required memory region. This memory region and file
-are given to this python script in the form of a string.
+are given to this python script in the form of a file.
+A regular expression filter can be applied to select only the required sections from the file.
 
-Example of such a string would be::
+Example of content in such an input file would be::
 
-   SRAM2:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c,\
-   SRAM1:COPY:/home/xyz/zephyr/samples/hello_world/src/main2.c, \
-   FLASH2:NOCOPY:/home/xyz/zephyr/samples/hello_world/src/main3.c
+   SRAM2:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c,.*foo|.*bar
+   SRAM1:COPY:/home/xyz/zephyr/samples/hello_world/src/main2.c,.*bar
+   FLASH2:NOCOPY:/home/xyz/zephyr/samples/hello_world/src/main3.c,
 
 One can also specify the program header for a given memory region:
 
-   SRAM2\\ :phdr0:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c
+   SRAM2\\ :phdr0:COPY:/home/xyz/zephyr/samples/hello_world/src/main.c,
 
 To invoke this script::
 
-   python3 gen_relocate_app.py -i input_string -o generated_linker -c generated_code
+   python3 gen_relocate_app.py -i input_file -o generated_linker -c generated_code
 
 Configuration that needs to be sent to the python script.
 
@@ -43,8 +44,8 @@
 
 import sys
 import argparse
-import os
 import glob
+import re
 import warnings
 from collections import defaultdict
 from enum import Enum
@@ -225,7 +226,7 @@ def region_is_default_ram(region_name: str) -> bool:
     return region_name == args.default_ram_region
 
 
-def find_sections(filename: str) -> 'dict[SectionKind, list[OutputSection]]':
+def find_sections(filename: str, symbol_filter: str) -> 'dict[SectionKind, list[OutputSection]]':
     """
     Locate relocatable sections in the given object file.
 
@@ -243,6 +244,9 @@ def find_sections(filename: str) -> 'dict[SectionKind, list[OutputSection]]':
         out = defaultdict(list)
 
         for section in sections:
+            if not re.search(symbol_filter, section.name):
+                # Section is filtered-out
+                continue
             section_kind = SectionKind.for_section_named(section.name)
             if section_kind is None:
                 continue
@@ -486,24 +490,24 @@ def parse_args():
                         help="Verbose Output")
     args = parser.parse_args()
 
+def gen_all_obj_files(searchpath):
+    return list(Path(searchpath).rglob('*.o')) + list(Path(searchpath).rglob('*.obj'))
 
 # return the absolute path for the object file.
-def get_obj_filename(searchpath, filename):
+def get_obj_filename(all_obj_files, filename):
     # get the object file name which is almost always pended with .obj
     obj_filename = filename.split("/")[-1] + ".obj"
 
-    for dirpath, _, files in os.walk(searchpath):
-        for filename1 in files:
-            if filename1 == obj_filename:
-                if filename.split("/")[-2] in dirpath.split("/")[-1]:
-                    fullname = os.path.join(dirpath, filename1)
-                    return fullname
-
+    for obj_file in all_obj_files:
+        if obj_file.name == obj_filename:
+            if filename.split("/")[-2] in obj_file.parent.name:
+                return str(obj_file)
 
 # Extracts all possible components for the input string:
-# <mem_region>[\ :program_header]:<flag_1>[;<flag_2>...]:<file_1>[;<file_2>...]
-# Returns a 4-tuple with them: (mem_region, program_header, flags, files)
+# <mem_region>[\ :program_header]:<flag_1>[;<flag_2>...]:<file_1>[;<file_2>...][,filter]
+# Returns a 5-tuple with them: (mem_region, program_header, flags, files, filter)
 # If no `program_header` is defined, returns an empty string
+# If no `filter` is defined, returns an empty string
 def parse_input_string(line):
     # Be careful when splitting by : to avoid breaking absolute paths on Windows
     mem_region, rest = line.split(':', 1)
@@ -513,27 +517,34 @@ def parse_input_string(line):
         mem_region = mem_region.rstrip()
         phdr, rest = rest.split(':', 1)
 
-    # Split lists by semicolons, in part to support generator expressions
-    flag_list, file_list = (lst.split(';') for lst in rest.split(':', 1))
+    flag_list, rest = rest.split(':', 1)
+    flag_list = flag_list.split(';')
+
 
-    return mem_region, phdr, flag_list, file_list
+    # Split file list by semicolons, in part to support generator expressions
+    file_list, symbol_filter = rest.split(',', 1)
+    file_list = file_list.split(';')
 
+    return mem_region, phdr, flag_list, file_list, symbol_filter
 
-# Create a dict with key as memory type and files as a list of values.
+
+# Create a dict with key as memory type and (files, symbol_filter) tuple
+# as a list of values.
 # Also, return another dict with program headers for memory regions
 def create_dict_wrt_mem():
     # need to support wild card *
     rel_dict = dict()
     phdrs = dict()
 
-    input_rel_dict = args.input_rel_dict.read()
-    if input_rel_dict == '':
+    input_rel_dict = args.input_rel_dict.read().splitlines()
+    if not input_rel_dict:
         sys.exit("Disable CONFIG_CODE_DATA_RELOCATION if no file needs relocation")
-    for line in input_rel_dict.split('|'):
+
+    for line in input_rel_dict:
         if ':' not in line:
             continue
 
-        mem_region, phdr, flag_list, file_list = parse_input_string(line)
+        mem_region, phdr, flag_list, file_list, symbol_filter = parse_input_string(line)
 
         # Handle any program header
         if phdr != '':
@@ -556,12 +567,15 @@ def create_dict_wrt_mem():
         if args.verbose:
             print("Memory region ", mem_region, " Selected for files:", file_name_list)
 
+        # Apply filter on files
+        file_name_filter_list = [(f, symbol_filter) for f in file_name_list]
+
         mem_region = "|".join((mem_region, *flag_list))
 
         if mem_region in rel_dict:
-            rel_dict[mem_region].extend(file_name_list)
+            rel_dict[mem_region].extend(file_name_filter_list)
         else:
-            rel_dict[mem_region] = file_name_list
+            rel_dict[mem_region] = file_name_filter_list
 
     return rel_dict, phdrs
 
@@ -571,6 +585,7 @@ def main():
     mpu_align = {}
     parse_args()
     searchpath = args.directory
+    all_obj_files = gen_all_obj_files(searchpath)
     linker_file = args.output
     sram_data_linker_file = args.output_sram_data
     sram_bss_linker_file = args.output_sram_bss
@@ -585,13 +600,13 @@ def main():
     for memory_type, files in rel_dict.items():
         full_list_of_sections: 'dict[SectionKind, list[OutputSection]]' = defaultdict(list)
 
-        for filename in files:
-            obj_filename = get_obj_filename(searchpath, filename)
+        for filename, symbol_filter in files:
+            obj_filename = get_obj_filename(all_obj_files, filename)
             # the obj file wasn't found. Probably not compiled.
             if not obj_filename:
                 continue
 
-            file_sections = find_sections(obj_filename)
+            file_sections = find_sections(obj_filename, symbol_filter)
             # Merge sections from file into collection of sections for all files
             for category, sections in file_sections.items():
                 full_list_of_sections[category].extend(sections)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 27c1f54e54f1d..25b09073bdb33 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -6050,6 +6050,7 @@ sub process {
 
 # Check for __attribute__ aligned, prefer __aligned
 		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $realfile !~ m@\binclude/zephyr/toolchain@ &&
 		    $line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
 			WARN("PREFER_ALIGNED",
 			     "__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr);
@@ -6565,9 +6566,10 @@ sub process {
 		}
 
 # check for uses of __BYTE_ORDER__
-		while ($line =~ /\b(__BYTE_ORDER__)\b/g) {
-			ERROR("BYTE_ORDER",
-			      "Use of the '$1' macro is disallowed. Use CONFIG_(BIG|LITTLE)_ENDIAN instead\n" . $herecurr);
+		while ($realfile !~ m@^include/zephyr/toolchain@ &&
+		       $line =~ /\b(__BYTE_ORDER__)\b/g) {
+				ERROR("BYTE_ORDER",
+				      "Use of the '$1' macro is disallowed. Use CONFIG_(BIG|LITTLE)_ENDIAN instead\n" . $herecurr);
 		}
 
 # check for use of yield()
diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 7155a8a859bb8..7fa60fd205357 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -6,7 +6,6 @@
 
 import argparse
 import collections
-from email.utils import parseaddr
 from itertools import takewhile
 import json
 import logging
@@ -76,11 +75,47 @@ def get_files(filter=None, paths=None):
     out = git('diff', '--name-only', *filter_arg, COMMIT_RANGE, *paths_arg)
     files = out.splitlines()
     for file in list(files):
-        if not os.path.isfile(os.path.join(GIT_TOP, file)):
+        if not (GIT_TOP / file).exists():
             # Drop submodule directories from the list.
             files.remove(file)
     return files
 
+def get_module_setting_root(root, settings_file):
+    """
+    Parse the Zephyr module generated settings file given by 'settings_file'
+    and return all root settings defined by 'root'.
+    """
+    # Invoke the script directly using the Python executable since this is
+    # not a module nor a pip-installed Python utility
+    root_paths = []
+
+    if os.path.exists(settings_file):
+        with open(settings_file, 'r') as fp_setting_file:
+            content = fp_setting_file.read()
+
+        lines = content.strip().split('\n')
+        for line in lines:
+            root = root.upper()
+            if line.startswith(f'"{root}_ROOT":'):
+                _, root_path = line.split(":", 1)
+                root_paths.append(Path(root_path.strip('"')))
+    return root_paths
+
+def get_vendor_prefixes(path, errfn = print) -> set[str]:
+    vendor_prefixes = set()
+    with open(path) as fp:
+        for line in fp.readlines():
+            line = line.strip()
+            if not line or line.startswith("#"):
+                continue
+            try:
+                vendor, _ = line.split("\t", 2)
+                vendor_prefixes.add(vendor)
+            except ValueError:
+                errfn(f"Invalid line in {path}:\"{line}\".")
+                errfn("Did you forget the tab character?")
+    return vendor_prefixes
+
 class FmtdFailure(Failure):
     def __init__(
         self, severity, title, file, line=None, col=None, desc="", end_line=None, end_col=None
@@ -121,19 +156,21 @@ class ComplianceTest:
       Link to documentation related to what's being tested
 
     path_hint:
-      The path the test runs itself in. This is just informative and used in
-      the message that gets printed when running the test.
-
-      There are two magic strings that can be used instead of a path:
-      - The magic string "<zephyr-base>" can be used to refer to the
-      environment variable ZEPHYR_BASE or, when missing, the calculated base of
-      the zephyr tree
-      - The magic string "<git-top>" refers to the top-level repository
-      directory. This avoids running 'git' to find the top-level directory
-      before main() runs (class variable assignments run when the 'class ...'
-      statement runs). That avoids swallowing errors, because main() reports
-      them to GitHub
+      The path the test runs itself in. By default it uses the magic string
+      "<git-top>" which refers to the top-level repository directory.
+
+      This avoids running 'git' to find the top-level directory before main()
+      runs (class variable assignments run when the 'class ...' statement
+      runs). That avoids swallowing errors, because main() reports them to
+      GitHub.
+
+      Subclasses may override the default with a specific path or one of the
+      magic strings below:
+      - "<zephyr-base>" can be used to refer to the environment variable
+        ZEPHYR_BASE or, when missing, the calculated base of the zephyr tree.
     """
+    path_hint = "<git-top>"
+
     def __init__(self):
         self.case = TestCase(type(self).name, "Guidelines")
         # This is necessary because Failure can be subclassed, but since it is
@@ -205,11 +242,10 @@ class CheckPatch(ComplianceTest):
     """
     name = "Checkpatch"
     doc = "See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details."
-    path_hint = "<git-top>"
 
     def run(self):
-        checkpatch = os.path.join(ZEPHYR_BASE, 'scripts', 'checkpatch.pl')
-        if not os.path.exists(checkpatch):
+        checkpatch = ZEPHYR_BASE / 'scripts' / 'checkpatch.pl'
+        if not checkpatch.exists():
             self.skip(f'{checkpatch} not found')
 
         # check for Perl installation on Windows
@@ -225,7 +261,7 @@ def run(self):
             cmd = [checkpatch]
 
         cmd.extend(['--mailback', '--no-tree', '-'])
-        diff = subprocess.Popen(('git', 'diff', '--no-ext-diff', COMMIT_RANGE),
+        diff = subprocess.Popen(('git', 'diff', '--no-ext-diff', '--', ':!*.diff', ':!*.patch', COMMIT_RANGE),
                                 stdout=subprocess.PIPE,
                                 cwd=GIT_TOP)
         try:
@@ -264,7 +300,6 @@ class BoardYmlCheck(ComplianceTest):
     """
     name = "BoardYml"
     doc = "Check the board.yml file format"
-    path_hint = "<zephyr-base>"
 
     def check_board_file(self, file, vendor_prefixes):
         """Validate a single board file."""
@@ -279,20 +314,19 @@ def check_board_file(self, file, vendor_prefixes):
                                           desc=desc)
 
     def run(self):
-        vendor_prefixes = ["others"]
-        with open(os.path.join(ZEPHYR_BASE, "dts", "bindings", "vendor-prefixes.txt")) as fp:
-            for line in fp.readlines():
-                line = line.strip()
-                if not line or line.startswith("#"):
-                    continue
-                try:
-                    vendor, _ = line.split("\t", 2)
-                    vendor_prefixes.append(vendor)
-                except ValueError:
-                    self.error(f"Invalid line in vendor-prefixes.txt:\"{line}\".")
-                    self.error("Did you forget the tab character?")
-
-        path = Path(ZEPHYR_BASE)
+        path = resolve_path_hint(self.path_hint)
+
+        vendor_prefixes = {"others"}
+        # add vendor prefixes from the main zephyr repo
+        vendor_prefixes |= get_vendor_prefixes(ZEPHYR_BASE / "dts" / "bindings" / "vendor-prefixes.txt", self.error)
+
+        # add vendor prefixes from the current repo
+        dts_roots = get_module_setting_root('dts', path / "zephyr" / "module.yml")
+        for dts_root in dts_roots:
+            vendor_prefix_file = dts_root / "dts" / "bindings" / "vendor-prefixes.txt"
+            if vendor_prefix_file.exists():
+                vendor_prefixes |= get_vendor_prefixes(vendor_prefix_file, self.error)
+
         for file in path.glob("**/board.yml"):
             self.check_board_file(file, vendor_prefixes)
 
@@ -303,7 +337,6 @@ class ClangFormatCheck(ComplianceTest):
     """
     name = "ClangFormat"
     doc = "See https://docs.zephyrproject.org/latest/contribute/guidelines.html#clang-format for more details."
-    path_hint = "<git-top>"
 
     def run(self):
         exe = f"clang-format-diff.{'exe' if platform.system() == 'Windows' else 'py'}"
@@ -345,7 +378,6 @@ class DevicetreeBindingsCheck(ComplianceTest):
     """
     name = "DevicetreeBindings"
     doc = "See https://docs.zephyrproject.org/latest/build/dts/bindings.html for more details."
-    path_hint = "<zephyr-base>"
 
     def run(self, full=True):
         dts_bindings = self.parse_dt_bindings()
@@ -382,7 +414,6 @@ class KconfigCheck(ComplianceTest):
     """
     name = "Kconfig"
     doc = "See https://docs.zephyrproject.org/latest/build/kconfig/tips.html for more details."
-    path_hint = "<zephyr-base>"
 
     # Top-level Kconfig file. The path can be relative to srctree (ZEPHYR_BASE).
     FILENAME = "Kconfig"
@@ -412,8 +443,7 @@ def get_modules(self, modules_file, sysbuild_modules_file, settings_file):
         """
         # Invoke the script directly using the Python executable since this is
         # not a module nor a pip-installed Python utility
-        zephyr_module_path = os.path.join(ZEPHYR_BASE, "scripts",
-                                          "zephyr_module.py")
+        zephyr_module_path = ZEPHYR_BASE / "scripts" / "zephyr_module.py"
         cmd = [sys.executable, zephyr_module_path,
                '--kconfig-out', modules_file,
                '--sysbuild-kconfig-out', sysbuild_modules_file,
@@ -424,9 +454,9 @@ def get_modules(self, modules_file, sysbuild_modules_file, settings_file):
         except subprocess.CalledProcessError as ex:
             self.error(ex.output.decode("utf-8"))
 
-        modules_dir = ZEPHYR_BASE + '/modules'
+        modules_dir = ZEPHYR_BASE / 'modules'
         modules = [name for name in os.listdir(modules_dir) if
-                   os.path.exists(os.path.join(modules_dir, name, 'Kconfig'))]
+                   modules_dir / name / 'Kconfig']
 
         with open(modules_file, 'r') as fp_module_file:
             content = fp_module_file.read()
@@ -435,31 +465,10 @@ def get_modules(self, modules_file, sysbuild_modules_file, settings_file):
             for module in modules:
                 fp_module_file.write("ZEPHYR_{}_KCONFIG = {}\n".format(
                     re.sub('[^a-zA-Z0-9]', '_', module).upper(),
-                    modules_dir + '/' + module + '/Kconfig'
+                    modules_dir / module / 'Kconfig'
                 ))
             fp_module_file.write(content)
 
-    def get_module_setting_root(self, root, settings_file):
-        """
-        Parse the Zephyr module generated settings file given by 'settings_file'
-        and return all root settings defined by 'root'.
-        """
-        # Invoke the script directly using the Python executable since this is
-        # not a module nor a pip-installed Python utility
-        root_paths = []
-
-        if os.path.exists(settings_file):
-            with open(settings_file, 'r') as fp_setting_file:
-                content = fp_setting_file.read()
-
-            lines = content.strip().split('\n')
-            for line in lines:
-                root = root.upper()
-                if line.startswith(f'"{root}_ROOT":'):
-                    _, root_path = line.split(":", 1)
-                    root_paths.append(Path(root_path.strip('"')))
-        return root_paths
-
     def get_kconfig_dts(self, kconfig_dts_file, settings_file):
         """
         Generate the Kconfig.dts using dts/bindings as the source.
@@ -469,12 +478,11 @@ def get_kconfig_dts(self, kconfig_dts_file, settings_file):
         """
         # Invoke the script directly using the Python executable since this is
         # not a module nor a pip-installed Python utility
-        zephyr_drv_kconfig_path = os.path.join(ZEPHYR_BASE, "scripts", "dts",
-                                               "gen_driver_kconfig_dts.py")
+        zephyr_drv_kconfig_path = ZEPHYR_BASE / "scripts" / "dts" / "gen_driver_kconfig_dts.py"
         binding_paths = []
-        binding_paths.append(os.path.join(ZEPHYR_BASE, "dts", "bindings"))
+        binding_paths.append(ZEPHYR_BASE / "dts" / "bindings")
 
-        dts_root_paths = self.get_module_setting_root('dts', settings_file)
+        dts_root_paths = get_module_setting_root('dts', settings_file)
         for p in dts_root_paths:
             binding_paths.append(p / "dts" / "bindings")
 
@@ -507,10 +515,10 @@ def get_v2_model(self, kconfig_dir, settings_file):
         kconfig_sysbuild_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.sysbuild')
         kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
 
-        board_roots = self.get_module_setting_root('board', settings_file)
-        board_roots.insert(0, Path(ZEPHYR_BASE))
-        soc_roots = self.get_module_setting_root('soc', settings_file)
-        soc_roots.insert(0, Path(ZEPHYR_BASE))
+        board_roots = get_module_setting_root('board', settings_file)
+        board_roots.insert(0, ZEPHYR_BASE)
+        soc_roots = get_module_setting_root('soc', settings_file)
+        soc_roots.insert(0, ZEPHYR_BASE)
         root_args = argparse.Namespace(**{'board_roots': board_roots,
                                           'soc_roots': soc_roots, 'board': None,
                                           'board_dir': []})
@@ -573,7 +581,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
 
         kconfig_file = os.path.join(kconfig_dir, 'arch', 'Kconfig')
 
-        root_args = argparse.Namespace(**{'arch_roots': [Path(ZEPHYR_BASE)], 'arch': None})
+        root_args = argparse.Namespace(**{'arch_roots': [ZEPHYR_BASE], 'arch': None})
         v2_archs = list_hardware.find_v2_archs(root_args)
 
         with open(kconfig_file, 'w') as fp:
@@ -587,20 +595,20 @@ def parse_kconfig(self):
         """
         # Put the Kconfiglib path first to make sure no local Kconfiglib version is
         # used
-        kconfig_path = os.path.join(ZEPHYR_BASE, "scripts", "kconfig")
-        if not os.path.exists(kconfig_path):
+        kconfig_path = ZEPHYR_BASE / "scripts" / "kconfig"
+        if not kconfig_path.exists():
             self.error(kconfig_path + " not found")
 
         kconfiglib_dir = tempfile.mkdtemp(prefix="kconfiglib_")
 
-        sys.path.insert(0, kconfig_path)
+        sys.path.insert(0, str(kconfig_path))
         # Import globally so that e.g. kconfiglib.Symbol can be referenced in
         # tests
         global kconfiglib
         import kconfiglib
 
         # Look up Kconfig files relative to ZEPHYR_BASE
-        os.environ["srctree"] = ZEPHYR_BASE
+        os.environ["srctree"] = str(ZEPHYR_BASE)
 
         # Parse the entire Kconfig tree, to make sure we see all symbols
         os.environ["SOC_DIR"] = "soc/"
@@ -705,6 +713,8 @@ def check_disallowed_defconfigs(self, kconf):
 
         disallowed_symbols = {
             "PINCTRL": "Drivers requiring PINCTRL must SELECT it instead.",
+            "BOARD_EARLY_INIT_HOOK": "Boards requiring hooks must SELECT them instead.",
+            "BOARD_LATE_INIT_HOOK": "Boards requiring hooks must SELECT them instead.",
         }
 
         disallowed_regex = "(" + "|".join(disallowed_symbols.keys()) + ")$"
@@ -715,10 +725,10 @@ def check_disallowed_defconfigs(self, kconf):
 
         grep_stdout_boards = git("grep", "--line-number", "-I", "--null",
                                  "--perl-regexp", regex_boards, "--", ":boards",
-                                 cwd=Path(GIT_TOP))
+                                 cwd=ZEPHYR_BASE)
         grep_stdout_socs = git("grep", "--line-number", "-I", "--null",
                                "--perl-regexp", regex_socs, "--", ":soc",
-                               cwd=Path(GIT_TOP))
+                               cwd=ZEPHYR_BASE)
 
         # Board processing
         # splitlines() supports various line terminators
@@ -880,7 +890,7 @@ def check_no_undef_within_kconfig(self, kconf):
             self.failure(f"Undefined Kconfig symbols:\n\n {undef_ref_warnings}")
 
     def check_soc_name_sync(self, kconf):
-        root_args = argparse.Namespace(**{'soc_roots': [Path(ZEPHYR_BASE)]})
+        root_args = argparse.Namespace(**{'soc_roots': [ZEPHYR_BASE]})
         v2_systems = list_hardware.find_v2_systems(root_args)
 
         soc_names = {soc.name for soc in v2_systems.get_socs()}
@@ -924,7 +934,7 @@ def check_no_undef_outside_kconfig(self, kconf):
         # so we extract the references from each line ourselves instead.
         #
         # The regex uses word boundaries (\b) to isolate the reference, and
-        # negative lookahead to automatically whitelist the following:
+        # negative lookahead to automatically allowlist the following:
         #
         #  - ##, for token pasting (CONFIG_FOO_##X)
         #
@@ -949,7 +959,7 @@ def check_no_undef_outside_kconfig(self, kconf):
         grep_stdout = git("grep", "--line-number", "-I", "--null",
                           "--perl-regexp", regex, "--", ":!/doc/releases",
                           ":!/doc/security/vulnerabilities.rst",
-                          cwd=Path(GIT_TOP))
+                          cwd=GIT_TOP)
 
         # splitlines() supports various line terminators
         for grep_line in grep_stdout.splitlines():
@@ -1059,6 +1069,11 @@ def check_no_undef_outside_kconfig(self, kconf):
         "FOO_SETTING_2",
         "HEAP_MEM_POOL_ADD_SIZE_", # Used as an option matching prefix
         "HUGETLBFS",          # Linux, in boards/xtensa/intel_adsp_cavs25/doc
+        "IAR_BUFFERED_WRITE",
+        "IAR_LIBCPP",
+        "IAR_SEMIHOSTING",
+        "IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS", # Used in ICMsg tests for intercompatibility
+                                                      # with older versions of the ICMsg.
         "LIBGCC_RTLIB",
         "LLVM_USE_LD",   # Both LLVM_USE_* are in cmake/toolchain/llvm/Kconfig
         "LLVM_USE_LLD",  # which are only included if LLVM is selected but
@@ -1071,6 +1086,7 @@ def check_no_undef_outside_kconfig(self, kconf):
         "MCUBOOT_CLEANUP_ARM_CORE", # Used in (sysbuild-based) test
         "MCUBOOT_DOWNGRADE_PREVENTION", # but symbols are defined in MCUboot
                                         # itself.
+        "MCUBOOT_LOG_LEVEL_DBG",
         "MCUBOOT_LOG_LEVEL_INF",
         "MCUBOOT_LOG_LEVEL_WRN",        # Used in example adjusting MCUboot
                                         # config,
@@ -1095,6 +1111,7 @@ def check_no_undef_outside_kconfig(self, kconf):
         "SEL",
         "SHIFT",
         "SINGLE_APPLICATION_SLOT", # Used in sysbuild for MCUboot configuration
+        "SINGLE_APPLICATION_SLOT_RAM_LOAD", # Used in sysbuild for MCUboot configuration
         "SOC_SERIES_", # Used as regex in scripts/utils/board_v1_to_v2.py
         "SOC_WATCH",  # Issue 13749
         "SOME_BOOL",
@@ -1140,6 +1157,7 @@ class KconfigBasicNoModulesCheck(KconfigBasicCheck):
     defined only in a module.
     """
     name = "KconfigBasicNoModules"
+    path_hint = "<zephyr-base>"
 
     def get_modules(self, modules_file, sysbuild_modules_file, settings_file):
         with open(modules_file, 'w') as fp_module_file:
@@ -1177,6 +1195,9 @@ class SysbuildKconfigCheck(KconfigCheck):
     UNDEF_KCONFIG_ALLOWLIST = {
         # zephyr-keep-sorted-start re(^\s+")
         "FOO",
+        "MY_IMAGE", # Used in sysbuild documentation as example
+        "OTHER_APP_IMAGE_NAME", # Used in sysbuild documentation as example
+        "OTHER_APP_IMAGE_PATH", # Used in sysbuild documentation as example
         "SECOND_SAMPLE", # Used in sysbuild documentation
         "SUIT_ENVELOPE", # Used by nRF runners to program provisioning data
         "SUIT_MPI_APP_AREA_PATH", # Used by nRF runners to program provisioning data
@@ -1203,6 +1224,7 @@ class SysbuildKconfigBasicNoModulesCheck(SysbuildKconfigCheck, KconfigBasicNoMod
     but defined only in a module.
     """
     name = "SysbuildKconfigBasicNoModules"
+    path_hint = "<zephyr-base>"
 
 
 class Nits(ComplianceTest):
@@ -1212,7 +1234,6 @@ class Nits(ComplianceTest):
     """
     name = "Nits"
     doc = "See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details."
-    path_hint = "<git-top>"
 
     def run(self):
         # Loop through added/modified files
@@ -1236,7 +1257,7 @@ def run(self):
     def check_kconfig_header(self, fname):
         # Checks for a spammy copy-pasted header format
 
-        with open(os.path.join(GIT_TOP, fname), encoding="utf-8") as f:
+        with open(GIT_TOP / fname, encoding="utf-8") as f:
             contents = f.read()
 
         # 'Kconfig - yada yada' has a copy-pasted redundant filename at the
@@ -1262,7 +1283,7 @@ def check_redundant_zephyr_source(self, fname):
         # Checks for 'source "$(ZEPHYR_BASE)/Kconfig[.zephyr]"', which can be
         # be simplified to 'source "Kconfig[.zephyr]"'
 
-        with open(os.path.join(GIT_TOP, fname), encoding="utf-8") as f:
+        with open(GIT_TOP / fname, encoding="utf-8") as f:
             # Look for e.g. rsource as well, for completeness
             match = re.search(
                 r'^\s*(?:o|r|or)?source\s*"\$\(?ZEPHYR_BASE\)?/(Kconfig(?:\.zephyr)?)"',
@@ -1277,7 +1298,7 @@ def check_redundant_zephyr_source(self, fname):
     def check_redundant_document_separator(self, fname):
         # Looks for redundant '...' document separators in bindings
 
-        with open(os.path.join(GIT_TOP, fname), encoding="utf-8") as f:
+        with open(GIT_TOP / fname, encoding="utf-8") as f:
             if re.search(r"^\.\.\.", f.read(), re.MULTILINE):
                 self.failure(f"""\
 Redundant '...' document separator in {fname}. Binding YAML files are never
@@ -1286,7 +1307,7 @@ def check_redundant_document_separator(self, fname):
     def check_source_file(self, fname):
         # Generic nits related to various source files
 
-        with open(os.path.join(GIT_TOP, fname), encoding="utf-8") as f:
+        with open(GIT_TOP / fname, encoding="utf-8") as f:
             contents = f.read()
 
         if not contents.endswith("\n"):
@@ -1306,7 +1327,6 @@ class GitDiffCheck(ComplianceTest):
     """
     name = "GitDiffCheck"
     doc = "Git conflict markers and whitespace errors are not allowed in added changes"
-    path_hint = "<git-top>"
 
     def run(self):
         offending_lines = []
@@ -1317,7 +1337,7 @@ def run(self):
         for shaidx in get_shas(COMMIT_RANGE):
             # Ignore non-zero return status code
             # Reason: `git diff --check` sets the return code to the number of offending lines
-            diff = git("diff", f"{shaidx}^!", "--check", ignore_non_zero=True)
+            diff = git("diff", f"{shaidx}^!", "--check", "--", ":!*.diff", ":!*.patch", ignore_non_zero=True)
 
             lines = p.findall(diff)
             lines = map(lambda x: f"{shaidx}: {x}", lines)
@@ -1334,7 +1354,6 @@ class GitLint(ComplianceTest):
     """
     name = "Gitlint"
     doc = "See https://docs.zephyrproject.org/latest/contribute/guidelines.html#commit-guidelines for more details"
-    path_hint = "<git-top>"
 
     def run(self):
         # By default gitlint looks for .gitlint configuration only in
@@ -1357,7 +1376,6 @@ class PyLint(ComplianceTest):
     """
     name = "Pylint"
     doc = "See https://www.pylint.org/ for more details"
-    path_hint = "<git-top>"
 
     def run(self):
         # Path to pylint configuration file
@@ -1432,50 +1450,38 @@ class Identity(ComplianceTest):
     """
     name = "Identity"
     doc = "See https://docs.zephyrproject.org/latest/contribute/guidelines.html#commit-guidelines for more details"
-    # git rev-list and git log don't depend on the current (sub)directory
-    # unless explicited
-    path_hint = "<git-top>"
 
     def run(self):
         for shaidx in get_shas(COMMIT_RANGE):
-            commit = git("log", "--decorate=short", "--no-use-mailmap", "-n 1", shaidx)
-            signed = []
-            author = ""
-            sha = ""
-            parsed_addr = None
-            for line in commit.split("\n"):
-                match = re.search(r"^commit\s([^\s]*)", line)
-                if match:
-                    sha = match.group(1)
-                match = re.search(r"^Author:\s(.*)", line)
-                if match:
-                    author = match.group(1)
-                    parsed_addr = parseaddr(author)
-                match = re.search(r"signed-off-by:\s(.*)", line, re.IGNORECASE)
-                if match:
-                    signed.append(match.group(1))
-
-            error1 = f"{sha}: author email ({author}) needs to match one of " \
-                     f"the signed-off-by entries."
-            error2 = f"{sha}: author email ({author}) does not follow the " \
-                     f"syntax: First Last <email>."
-            error3 = f"{sha}: author email ({author}) must be a real email " \
-                     f"and cannot end in @users.noreply.github.com"
-            failure = None
-            if author not in signed:
-                failure = error1
-
-            if not parsed_addr or len(parsed_addr[0].split(" ")) < 2:
-                if not failure:
-
-                    failure = error2
-                else:
-                    failure = failure + "\n" + error2
-            elif parsed_addr[1].endswith("@users.noreply.github.com"):
-                failure = error3
-
-            if failure:
-                self.failure(failure)
+            auth_name, auth_email, body = git(
+                'show', '-s', '--format=%an%n%ae%n%b', shaidx
+            ).split('\n', 2)
+
+            match_signoff = re.search(r"signed-off-by:\s(.*)", body,
+                                      re.IGNORECASE)
+            detailed_match = re.search(r"signed-off-by:\s(.*) <(.*)>", body,
+                                       re.IGNORECASE)
+
+            failures = []
+
+            if auth_email.endswith("@users.noreply.github.com"):
+                failures.append(f"{shaidx}: author email ({auth_email}) must "
+                                "be a real email and cannot end in "
+                                "@users.noreply.github.com")
+
+            if not match_signoff:
+                failures.append(f'{shaidx}: Missing signed-off-by line')
+            elif not detailed_match:
+                signoff = match_signoff.group(0)
+                failures.append(f"{shaidx}: Signed-off-by line ({signoff}) "
+                                "does not follow the syntax: First "
+                                "Last <email>.")
+            elif (auth_name, auth_email) != detailed_match.groups():
+                failures.append(f"{shaidx}: author email ({auth_email}) needs "
+                                "to match one of the signed-off-by entries.")
+
+            if failures:
+                self.failure('\n'.join(failures))
 
 
 class BinaryFiles(ComplianceTest):
@@ -1484,7 +1490,6 @@ class BinaryFiles(ComplianceTest):
     """
     name = "BinaryFiles"
     doc = "No binary files allowed."
-    path_hint = "<git-top>"
 
     def run(self):
         BINARY_ALLOW_PATHS = ("doc/", "boards/", "samples/")
@@ -1507,14 +1512,13 @@ class ImageSize(ComplianceTest):
     """
     name = "ImageSize"
     doc = "Check the size of image files."
-    path_hint = "<git-top>"
 
     def run(self):
         SIZE_LIMIT = 250 << 10
         BOARD_SIZE_LIMIT = 100 << 10
 
         for file in get_files(filter="d"):
-            full_path = os.path.join(GIT_TOP, file)
+            full_path = GIT_TOP / file
             mime_type = magic.from_file(full_path, mime=True)
 
             if not mime_type.startswith("image/"):
@@ -1537,7 +1541,6 @@ class MaintainersFormat(ComplianceTest):
     """
     name = "MaintainersFormat"
     doc = "Check that MAINTAINERS file parses correctly."
-    path_hint = "<git-top>"
 
     def run(self):
         MAINTAINERS_FILES = ["MAINTAINERS.yml", "MAINTAINERS.yaml"]
@@ -1557,7 +1560,6 @@ class ModulesMaintainers(ComplianceTest):
     """
     name = "ModulesMaintainers"
     doc = "Check that all modules have a MAINTAINERS entry."
-    path_hint = "<git-top>"
 
     def run(self):
         MAINTAINERS_FILES = ["MAINTAINERS.yml", "MAINTAINERS.yaml"]
@@ -1592,10 +1594,9 @@ class YAMLLint(ComplianceTest):
     """
     name = "YAMLLint"
     doc = "Check YAML files with YAMLLint."
-    path_hint = "<git-top>"
 
     def run(self):
-        config_file = os.path.join(ZEPHYR_BASE, ".yamllint")
+        config_file = ZEPHYR_BASE / ".yamllint"
 
         for file in get_files(filter="d"):
             if Path(file).suffix not in ['.yaml', '.yml']:
@@ -1623,7 +1624,6 @@ class SphinxLint(ComplianceTest):
 
     name = "SphinxLint"
     doc = "Check Sphinx/reStructuredText files with sphinx-lint."
-    path_hint = "<git-top>"
 
     # Checkers added/removed to sphinx-lint's default set
     DISABLE_CHECKERS = ["horizontal-tab", "missing-space-before-default-role"]
@@ -1665,7 +1665,6 @@ class KeepSorted(ComplianceTest):
     """
     name = "KeepSorted"
     doc = "Check for blocks of code or config that should be kept sorted."
-    path_hint = "<git-top>"
 
     MARKER = "zephyr-keep-sorted"
 
@@ -1761,11 +1760,10 @@ class Ruff(ComplianceTest):
     """
     name = "Ruff"
     doc = "Check python files with ruff."
-    path_hint = "<git-top>"
 
     def run(self):
         for file in get_files(filter="d"):
-            if not file.endswith(".py"):
+            if not file.endswith((".py", ".pyi")):
                 continue
 
             try:
@@ -1809,7 +1807,6 @@ class TextEncoding(ComplianceTest):
     """
     name = "TextEncoding"
     doc = "Check the encoding of text files."
-    path_hint = "<git-top>"
 
     ALLOWED_CHARSETS = ["us-ascii", "utf-8"]
 
@@ -1817,7 +1814,7 @@ def run(self):
         m = magic.Magic(mime=True, mime_encoding=True)
 
         for file in get_files(filter="d"):
-            full_path = os.path.join(GIT_TOP, file)
+            full_path = GIT_TOP / file
             mime_type = m.from_file(full_path)
 
             if not mime_type.startswith("text/"):
@@ -1927,11 +1924,12 @@ def _main(args):
 
         # Propagate this decision to child processes.
         os.environ['ZEPHYR_BASE'] = ZEPHYR_BASE
+    ZEPHYR_BASE = Path(ZEPHYR_BASE)
 
     # The absolute path of the top-level git directory. Initialize it here so
     # that issues running Git can be reported to GitHub.
     global GIT_TOP
-    GIT_TOP = git("rev-parse", "--show-toplevel")
+    GIT_TOP = Path(git("rev-parse", "--show-toplevel"))
 
     # The commit range passed in --commit, e.g. "HEAD~3"
     global COMMIT_RANGE
diff --git a/scripts/ci/twister_ignore.txt b/scripts/ci/twister_ignore.txt
index 96dfdfd83d5b9..846495d6ce6d2 100644
--- a/scripts/ci/twister_ignore.txt
+++ b/scripts/ci/twister_ignore.txt
@@ -25,6 +25,7 @@
 .github/workflows/issues-report-config.json
 .github/workflows/backport_issue_check.yml
 MAINTAINERS.yml
+CODEOWNERS
 LICENSE
 Makefile
 doc/*
diff --git a/scripts/ci/twister_report_analyzer.py b/scripts/ci/twister_report_analyzer.py
index 74ee9862c110e..3a52c8a2bfe9c 100755
--- a/scripts/ci/twister_report_analyzer.py
+++ b/scripts/ci/twister_report_analyzer.py
@@ -85,7 +85,7 @@ def add_counter(self, key: str, test: str = '') -> None:
     def print_counters(self, indent: int = 0):
         for key, value in self.counters.items():
             print(f'{" " * indent}{value.quantity:4}    {key}')
-            if value.subcounters.counters:
+            if value.has_subcounters():
                 value.subcounters.print_counters(indent + 4)
 
     def sort_by_quantity(self):
@@ -93,14 +93,14 @@ def sort_by_quantity(self):
             sorted(self.counters.items(), key=lambda item: item[1].quantity, reverse=True)
         )
         for value in self.counters.values():
-            if value.subcounters.counters:
+            if value.has_subcounters():
                 value.subcounters.sort_by_quantity()
 
     def get_next_entry(self, depth: int = 0, max_depth: int = 10):
         for key, value in self.counters.items():
             # limit number of test files to 100 to not exceed CSV cell limit
             yield depth, value.quantity, key, ', '.join(value.tests[0:100])
-            if value.subcounters.counters and depth < max_depth:
+            if value.has_subcounters() and depth < max_depth:
                 yield from value.subcounters.get_next_entry(depth + 1, max_depth)
 
     def _flatten(self):
@@ -110,7 +110,7 @@ def _flatten(self):
         do not contain any further nested subcounters.
         """
         for key, value in self.counters.items():
-            if value.subcounters.counters:
+            if value.has_subcounters():
                 yield from value.subcounters._flatten()
             else:
                 yield key, value
@@ -130,6 +130,9 @@ def append(self, test: str = ''):
         if test:
             self.tests.append(test)
 
+    def has_subcounters(self):
+        return bool(self.subcounters.counters)
+
 
 class TwisterReports:
     def __init__(self):
@@ -161,16 +164,33 @@ def parse_testsuite(self, testsuite):
         if ts_status not in ('error', 'failed'):
             return
 
-        ts_reason = testsuite.get('reason') or 'Unknown reason'
-        self.errors.add_counter(ts_reason)
         ts_platform = testsuite.get('platform') or 'Unknown platform'
         self.platforms.add_counter(ts_platform)
+        ts_reason = testsuite.get('reason') or 'Unknown reason'
         ts_log = testsuite.get('log')
         test_identifier = f'{testsuite.get("platform")}:{testsuite.get("name")}'
 
-        matched = self._parse_ts_error_log(
-            self.errors.counters[ts_reason].subcounters, ts_reason, ts_log, test_identifier
-        )
+        # CMake and Build failures are treated separately.
+        # Extract detailed information to group errors. Keep the parsing methods
+        # to allow for further customization and keep backward compatibility.
+        if ts_reason.startswith('CMake build failure'):
+            reason = 'CMake build failure'
+            self.errors.add_counter(reason)
+            error_key = ts_reason.split(reason, 1)[-1].lstrip(' -')
+            if not error_key:
+                error_key = self._parse_cmake_build_failure(ts_log)
+            self.errors.counters[reason].subcounters.add_counter(error_key, test_identifier)
+            ts_reason = reason
+        elif ts_reason.startswith('Build failure'):
+            reason = 'Build failure'
+            self.errors.add_counter(reason)
+            error_key = ts_reason.split(reason, 1)[-1].lstrip(' -')
+            if not error_key:
+                error_key = self._parse_build_failure(ts_log)
+            self.errors.counters[reason].subcounters.add_counter(error_key, test_identifier)
+            ts_reason = reason
+        else:
+            self.errors.add_counter(ts_reason)
 
         # Process testcases
         for tc in testsuite.get('testcases', []):
@@ -178,24 +198,10 @@ def parse_testsuite(self, testsuite):
             tc_log = tc.get('log')
             if tc_reason and tc_log:
                 self.errors.counters[ts_reason].subcounters.add_counter(tc_reason, test_identifier)
-                matched = True
 
-        if not matched:
+        if not self.errors.counters[ts_reason].has_subcounters():
             self.errors.counters[ts_reason].tests.append(test_identifier)
 
-    def _parse_ts_error_log(
-        self, counters: Counters, reason: str, log: str, test: str = ''
-    ) -> bool:
-        if reason == 'CMake build failure':
-            if error_key := self._parse_cmake_build_failure(log):
-                counters.add_counter(error_key, test)
-                return True
-        elif reason == 'Build failure':  # noqa SIM102
-            if error_key := self._parse_build_failure(log):
-                counters.add_counter(error_key, test)
-                return True
-        return False
-
     def _parse_cmake_build_failure(self, log: str) -> str | None:
         last_warning = 'no warning found'
         lines = log.splitlines()
@@ -263,32 +269,23 @@ def parse_testsuite(self, testsuite):
         if ts_status not in ('error', 'failed'):
             return
 
-        ts_reason = testsuite.get('reason') or 'Unknown reason'
-        self.errors.add_counter(ts_reason)
         ts_log = testsuite.get('log')
         test_identifier = f'{testsuite.get("platform")}:{testsuite.get("name")}'
-        self._parse_log_with_error_paterns(
-            self.errors.counters[ts_reason].subcounters, ts_log, test_identifier
-        )
+        if key := self._parse_log_with_error_paterns(ts_log):
+            self.errors.add_counter(key, test_identifier)
         # Process testcases
         for tc in testsuite.get('testcases', []):
-            tc_reason = tc.get('reason')
             tc_log = tc.get('log')
-            if tc_reason and tc_log:
-                self.errors.counters[ts_reason].subcounters.add_counter(tc_reason)
-                self._parse_log_with_error_paterns(
-                    self.errors.counters[ts_reason].subcounters.counters[tc_reason].subcounters,
-                    tc_log,
-                    test_identifier,
-                )
-
-    def _parse_log_with_error_paterns(self, counters: Counters, log: str, test: str = ''):
+            if tc_log and (key := self._parse_log_with_error_paterns(tc_log)):
+                self.errors.add_counter(key, test_identifier)
+
+    def _parse_log_with_error_paterns(self, log: str) -> str | None:
         for line in log.splitlines():
             for error_pattern in self.error_patterns:
                 if error_pattern in line:
                     logger.debug(f'Matched: {error_pattern} in {line}')
-                    counters.add_counter(error_pattern, test)
-                    return
+                    return error_pattern
+        return None
 
 
 class EnhancedJSONEncoder(json.JSONEncoder):
@@ -363,7 +360,7 @@ def main():
     if not reports.errors.counters:
         return
 
-    if args.platforms:
+    if args.platforms and reports.platforms.counters:
         print('\nErrors per platform:')
         reports.platforms.print_counters()
 
diff --git a/scripts/dts/python-devicetree/src/devicetree/dtlib.py b/scripts/dts/python-devicetree/src/devicetree/dtlib.py
index c4cd1cdbb2b25..38f74f338d2f1 100644
--- a/scripts/dts/python-devicetree/src/devicetree/dtlib.py
+++ b/scripts/dts/python-devicetree/src/devicetree/dtlib.py
@@ -20,9 +20,8 @@
 import string
 import sys
 import textwrap
-from typing import (Any, Iterable,
-                    NamedTuple, NoReturn, Optional,
-                    TYPE_CHECKING, Union)
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, Any, NamedTuple, NoReturn, Optional, Union
 
 # NOTE: tests/test_dtlib.py is the test suite for this library.
 
@@ -38,6 +37,12 @@ class Node:
     name:
       The name of the node (a string).
 
+    filename:
+      The name of the .dts file where the node is defined
+
+    lineno:
+      The line number in the .dts file where the node starts.
+
     unit_addr:
       The portion after the '@' in the node's name, or the empty string if the
       name has no '@' in it.
@@ -85,13 +90,15 @@ class Node:
     # Public interface
     #
 
-    def __init__(self, name: str, parent: Optional['Node'], dt: 'DT'):
+    def __init__(self, name: str, parent: Optional["Node"], dt: "DT", filename: str, lineno: int):
         """
         Node constructor. Not meant to be called directly by clients.
         """
         # Remember to update DT.__deepcopy__() if you change this.
 
         self._name = name
+        self._filename = filename
+        self._lineno = lineno
         self.props: dict[str, Property] = {}
         self.nodes: dict[str, Node] = {}
         self.labels: list[str] = []
@@ -103,7 +110,7 @@ def __init__(self, name: str, parent: Optional['Node'], dt: 'DT'):
 
         if name.count("@") > 1:
             dt._parse_error("multiple '@' in node name")
-        if not name == "/":
+        if name != "/":
             for char in name:
                 if char not in _nodename_chars:
                     dt._parse_error(f"{self.path}: bad character '{char}' "
@@ -118,6 +125,20 @@ def name(self) -> str:
         # via DT.move_node.
         return self._name
 
+    @property
+    def lineno(self) -> int:
+        """
+        See the class documentation.
+        """
+        return self._lineno
+
+    @property
+    def filename(self) -> str:
+        """
+        See the class documentation.
+        """
+        return self._filename
+
     @property
     def unit_addr(self) -> str:
         """
@@ -240,6 +261,12 @@ class Property:
     name:
       The name of the property (a string).
 
+    filename:
+      The name of the .dts file where the property is defined
+
+    lineno:
+      The line number in the .dts file where the property starts.
+
     value:
       The value of the property, as a 'bytes' string. Numbers are stored in
       big-endian format, and strings are null-terminated. Putting multiple
@@ -308,6 +335,8 @@ def __init__(self, node: Node, name: str):
             node.dt._parse_error("'@' is only allowed in node names")
 
         self.name = name
+        self.filename = ""
+        self.lineno = -1
         self.value = b""
         self.labels: list[str] = []
         # We have to wait to set this until later, when we've got
@@ -613,7 +642,6 @@ def __str__(self):
 
         return s + ";"
 
-
     def __repr__(self):
         return (f"<Property '{self.name}' at '{self.node.path}' in "
                 f"'{self.node.dt.filename}'>")
@@ -927,7 +955,7 @@ def __deepcopy__(self, memo):
         # them without any properties. We will recursively initialize
         # copies of parents before copies of children next.
         path2node_copy = {
-            node.path: Node(node.name, None, ret)
+            node.path: Node(node.name, None, ret, node.filename, node.lineno)
             for node in self.node_iter()
         }
 
@@ -956,6 +984,8 @@ def __deepcopy__(self, memo):
                 prop_copy.offset_labels = prop.offset_labels.copy()
                 prop_copy._label_offset_lst = prop._label_offset_lst[:]
                 prop_copy._markers = [marker[:] for marker in prop._markers]
+                prop_copy.filename = prop.filename
+                prop_copy.lineno = prop.lineno
             node_copy.props = prop_name2prop_copy
 
             node_copy.nodes = {
@@ -1083,7 +1113,9 @@ def _parse_dt(self):
             if tok.val == "/":
                 # '/ { ... };', the root node
                 if not self._root:
-                    self._root = Node(name="/", parent=None, dt=self)
+                    self._root = Node(
+                        name="/", parent=None, dt=self, filename=self.filename, lineno=self._lineno
+                    )
                 self._parse_node(self.root)
 
             elif tok.id in (_T.LABEL, _T.REF):
@@ -1146,7 +1178,13 @@ def _parse_node(self, node):
                         if child.name in current_child_names:
                             self._parse_error(f'{child.path}: duplicate node name')
                     else:
-                        child = Node(name=tok.val, parent=node, dt=self)
+                        child = Node(
+                            name=tok.val,
+                            parent=node,
+                            dt=self,
+                            filename=self.filename,
+                            lineno=self._lineno,
+                        )
                         current_child_names.add(tok.val)
 
                     for label in labels:
@@ -1166,6 +1204,8 @@ def _parse_node(self, node):
                             "/omit-if-no-ref/ can only be used on nodes")
 
                     prop = node._get_prop(tok.val)
+                    prop.filename = self.filename
+                    prop.lineno = self._lineno
 
                     if self._check_token("="):
                         self._parse_assignment(prop)
@@ -1943,13 +1983,20 @@ def _unescape(self, b):
 
         def sub(match):
             esc = match.group(1)
-            if esc == b"a": return b"\a"
-            if esc == b"b": return b"\b"
-            if esc == b"t": return b"\t"
-            if esc == b"n": return b"\n"
-            if esc == b"v": return b"\v"
-            if esc == b"f": return b"\f"
-            if esc == b"r": return b"\r"
+            if esc == b"a":
+                return b"\a"
+            if esc == b"b":
+                return b"\b"
+            if esc == b"t":
+                return b"\t"
+            if esc == b"n":
+                return b"\n"
+            if esc == b"v":
+                return b"\v"
+            if esc == b"f":
+                return b"\f"
+            if esc == b"r":
+                return b"\r"
 
             if esc[0] in b"01234567":
                 # Octal escape
diff --git a/scripts/dts/python-devicetree/src/devicetree/edtlib.py b/scripts/dts/python-devicetree/src/devicetree/edtlib.py
index 0238c239065aa..b6f93543580a2 100644
--- a/scripts/dts/python-devicetree/src/devicetree/edtlib.py
+++ b/scripts/dts/python-devicetree/src/devicetree/edtlib.py
@@ -67,30 +67,32 @@
 #   @properties are documented in the class docstring, as if they were
 #   variables. See the existing @properties for a template.
 
-from collections import defaultdict
-from copy import deepcopy
-from dataclasses import dataclass
-from typing import (Any, Callable, Iterable, NoReturn,
-                    Optional, TYPE_CHECKING, Union)
 import base64
 import hashlib
 import logging
 import os
 import re
+from collections import defaultdict
+from collections.abc import Callable, Iterable
+from copy import deepcopy
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any, NoReturn, Optional, Union
 
 import yaml
+
 try:
     # Use the C LibYAML parser if available, rather than the Python parser.
     # This makes e.g. gen_defines.py more than twice as fast.
     from yaml import CLoader as Loader
 except ImportError:
-    from yaml import Loader     # type: ignore
+    from yaml import Loader  # type: ignore
 
-from devicetree.dtlib import DT, DTError, to_num, to_nums, Type
+from devicetree._private import _slice_helper
+from devicetree.dtlib import DT, DTError, Type, to_num, to_nums
 from devicetree.dtlib import Node as dtlib_Node
 from devicetree.dtlib import Property as dtlib_Property
 from devicetree.grutils import Graph
-from devicetree._private import _slice_helper
+
 
 def _compute_hash(path: str) -> str:
     # Calculates the hash associated with the node's full path.
@@ -112,8 +114,21 @@ class Binding:
     path:
       The absolute path to the file defining the binding.
 
+    title:
+      The free-form title of the binding (optional).
+
+      When the content in the 'description:' is too long, the 'title:' can
+      be used as a heading for the extended description. Typically, it serves
+      as a description of the hardware model. For example:
+
+      title: Nordic GPIO
+
+      description: |
+        Descriptions and example nodes related to GPIO.
+        ...
+
     description:
-      The free-form description of the binding, or None.
+      The free-form description of the binding.
 
     compatible:
       The compatible string the binding matches.
@@ -171,7 +186,7 @@ class Binding:
 
     def __init__(self, path: Optional[str], fname2path: dict[str, str],
                  raw: Any = None, require_compatible: bool = True,
-                 require_description: bool = True):
+                 require_description: bool = True, require_title: bool = False):
         """
         Binding constructor.
 
@@ -199,6 +214,12 @@ def __init__(self, path: Optional[str], fname2path: dict[str, str],
           "description:" line. If False, a missing "description:" is
           not an error. Either way, "description:" must be a string
           if it is present in the binding.
+
+        require_title:
+          If True, it is an error if the binding does not contain a
+          "title:" line. If False, a missing "title:" is not an error.
+          Either way, "title:" must be a string if it is present in
+          the binding.
         """
         self.path: Optional[str] = path
         self._fname2path: dict[str, str] = fname2path
@@ -215,13 +236,13 @@ def __init__(self, path: Optional[str], fname2path: dict[str, str],
         self.raw: dict = self._merge_includes(raw, self.path)
 
         # Recursively initialize any child bindings. These don't
-        # require a 'compatible' or 'description' to be well defined,
-        # but they must be dicts.
+        # require a 'compatible', 'description' or 'title' to be well
+        # defined, but they must be dicts.
         if "child-binding" in raw:
             if not isinstance(raw["child-binding"], dict):
                 _err(f"malformed 'child-binding:' in {self.path}, "
                      "expected a binding (dictionary with keys/values)")
-            self.child_binding: Optional['Binding'] = Binding(
+            self.child_binding: Optional[Binding] = Binding(
                 path, fname2path,
                 raw=raw["child-binding"],
                 require_compatible=False,
@@ -230,11 +251,11 @@ def __init__(self, path: Optional[str], fname2path: dict[str, str],
             self.child_binding = None
 
         # Make sure this is a well defined object.
-        self._check(require_compatible, require_description)
+        self._check(require_compatible, require_description, require_title)
 
         # Initialize look up tables.
-        self.prop2specs: dict[str, 'PropertySpec'] = {}
-        for prop_name in self.raw.get("properties", {}).keys():
+        self.prop2specs: dict[str, PropertySpec] = {}
+        for prop_name in self.raw.get("properties", {}):
             self.prop2specs[prop_name] = PropertySpec(prop_name, self)
         self.specifier2cells: dict[str, list[str]] = {}
         for key, val in self.raw.items():
@@ -249,6 +270,11 @@ def __repr__(self) -> str:
         basename = os.path.basename(self.path or "")
         return f"<Binding {basename}" + compat + ">"
 
+    @property
+    def title(self) -> Optional[str]:
+        "See the class docstring"
+        return self.raw.get('title')
+
     @property
     def description(self) -> Optional[str]:
         "See the class docstring"
@@ -362,7 +388,8 @@ def _load_raw(self, fname: str) -> dict:
 
         return self._merge_includes(contents, path)
 
-    def _check(self, require_compatible: bool, require_description: bool):
+    def _check(self, require_compatible: bool, require_description: bool,
+               require_title: bool):
         # Does sanity checking on the binding.
 
         raw = self.raw
@@ -376,6 +403,13 @@ def _check(self, require_compatible: bool, require_description: bool):
         elif require_compatible:
             _err(f"missing 'compatible' in {self.path}")
 
+        if "title" in raw:
+            title = raw["title"]
+            if not isinstance(title, str) or not title:
+                _err(f"malformed or empty 'title' in {self.path}")
+        elif require_title:
+            _err(f"missing 'title' in {self.path}")
+
         if "description" in raw:
             description = raw["description"]
             if not isinstance(description, str) or not description:
@@ -385,8 +419,8 @@ def _check(self, require_compatible: bool, require_description: bool):
 
         # Allowed top-level keys. The 'include' key should have been
         # removed by _load_raw() already.
-        ok_top = {"description", "compatible", "bus", "on-bus",
-                  "properties", "child-binding"}
+        ok_top = {"title", "description", "compatible", "bus",
+                  "on-bus", "properties", "child-binding"}
 
         # Descriptive errors for legacy bindings.
         legacy_errors = {
@@ -396,7 +430,6 @@ def _check(self, require_compatible: bool, require_description: bool):
             "parent": "use 'on-bus: <bus>' instead",
             "parent-bus": "use 'on-bus: <bus>' instead",
             "sub-node": "use 'child-binding' instead",
-            "title": "use 'description' instead",
         }
 
         for key in raw:
@@ -429,11 +462,11 @@ def _check(self, require_compatible: bool, require_description: bool):
         self._check_properties()
 
         for key, val in raw.items():
-            if key.endswith("-cells"):
-                if (not isinstance(val, list)
-                    or not all(isinstance(elem, str) for elem in val)):
-                    _err(f"malformed '{key}:' in {self.path}, "
-                         "expected a list of strings")
+            if (key.endswith("-cells")
+                and not isinstance(val, list)
+                or not all(isinstance(elem, str) for elem in val)):
+                _err(f"malformed '{key}:' in {self.path}, "
+                     "expected a list of strings")
 
     def _check_properties(self) -> None:
         # _check() helper for checking the contents of 'properties:'.
@@ -1034,7 +1067,7 @@ def __init__(
         self._binding: Optional[Binding] = None
 
         # Public, some of which are initialized properly later:
-        self.edt: 'EDT' = edt
+        self.edt: EDT = edt
         self.dep_ordinal: int = -1
         self.compats: list[str] = compats
         self.ranges: list[Range] = []
@@ -1054,6 +1087,16 @@ def name(self) -> str:
         "See the class docstring"
         return self._node.name
 
+    @property
+    def filename(self) -> str:
+        "See the class docstring"
+        return self._node.filename
+
+    @property
+    def lineno(self) -> int:
+        "See the class docstring"
+        return self._node.lineno
+
     @property
     def unit_addr(self) -> Optional[int]:
         "See the class docstring"
@@ -1248,10 +1291,10 @@ def gpio_hogs(self) -> list[ControllerAndData]:
         if "gpio-hog" not in self.props:
             return []
 
-        if not self.parent or not "gpio-controller" in self.parent.props:
+        if not self.parent or "gpio-controller" not in self.parent.props:
             _err(f"GPIO hog {self!r} lacks parent GPIO controller node")
 
-        if not "#gpio-cells" in self.parent._node.props:
+        if "#gpio-cells" not in self.parent._node.props:
             _err(f"GPIO hog {self!r} parent node lacks #gpio-cells")
 
         n_cells = self.parent._node.props["#gpio-cells"].to_num()
@@ -1867,7 +1910,7 @@ def _named_cells(
                  f"{controller._node!r} - {len(cell_names)} "
                  f"instead of {len(data_list)}")
 
-        return dict(zip(cell_names, data_list))
+        return dict(zip(cell_names, data_list, strict=False))
 
 
 class EDT:
@@ -2111,7 +2154,7 @@ def scc_order(self) -> list[list[Node]]:
         try:
             return self._graph.scc_order()
         except Exception as e:
-            raise EDTError(e)
+            raise EDTError(e) from None
 
     def _process_properties_r(self, root_node: Node, props_node: Node) -> None:
         """
@@ -2445,7 +2488,7 @@ def load_vendor_prefixes_txt(vendor_prefixes: str) -> dict[str, str]:
     representation mapping a vendor prefix to the vendor name.
     """
     vnd2vendor: dict[str, str] = {}
-    with open(vendor_prefixes, 'r', encoding='utf-8') as f:
+    with open(vendor_prefixes, encoding='utf-8') as f:
         for line in f:
             line = line.strip()
 
@@ -2472,23 +2515,19 @@ def _dt_compats(dt: DT) -> set[str]:
 
     return {compat
             for node in dt.node_iter()
-                if "compatible" in node.props
-                    for compat in node.props["compatible"].to_strings()}
+            if "compatible" in node.props
+            for compat in node.props["compatible"].to_strings()}
 
 
 def _binding_paths(bindings_dirs: list[str]) -> list[str]:
     # Returns a list with the paths to all bindings (.yaml files) in
     # 'bindings_dirs'
 
-    binding_paths = []
-
-    for bindings_dir in bindings_dirs:
-        for root, _, filenames in os.walk(bindings_dir):
-            for filename in filenames:
-                if filename.endswith(".yaml") or filename.endswith(".yml"):
-                    binding_paths.append(os.path.join(root, filename))
-
-    return binding_paths
+    return [os.path.join(root, filename)
+            for bindings_dir in bindings_dirs
+            for root, _, filenames in os.walk(bindings_dir)
+            for filename in filenames
+            if filename.endswith((".yaml", ".yml"))]
 
 
 def _binding_inc_error(msg):
@@ -2703,11 +2742,12 @@ def _check_prop_by_type(prop_name: str,
         _err(f"'specifier-space' in 'properties: {prop_name}' "
              f"has type '{prop_type}', expected 'phandle-array'")
 
-    if prop_type == "phandle-array":
-        if not prop_name.endswith("s") and not "specifier-space" in options:
-            _err(f"'{prop_name}' in 'properties:' in {binding_path} "
-                 f"has type 'phandle-array' and its name does not end in 's', "
-                 f"but no 'specifier-space' was provided.")
+    if (prop_type == "phandle-array"
+        and not prop_name.endswith("s")
+        and "specifier-space" not in options):
+        _err(f"'{prop_name}' in 'properties:' in {binding_path} "
+             f"has type 'phandle-array' and its name does not end in 's', "
+             f"but no 'specifier-space' was provided.")
 
     # If you change const_types, be sure to update the type annotation
     # for PropertySpec.const.
@@ -2829,7 +2869,7 @@ def _add_names(node: dtlib_Node, names_ident: str, objs: Any) -> None:
                  f"in {node.dt.filename} has {len(names)} strings, "
                  f"expected {len(objs)} strings")
 
-        for obj, name in zip(objs, names):
+        for obj, name in zip(objs, names, strict=False):
             if obj is None:
                 continue
             obj.name = name
@@ -3105,7 +3145,7 @@ def _and(b1: bytes, b2: bytes) -> bytes:
     # Pad on the left, to equal length
     maxlen = max(len(b1), len(b2))
     return bytes(x & y for x, y in zip(b1.rjust(maxlen, b'\xff'),
-                                       b2.rjust(maxlen, b'\xff')))
+                                       b2.rjust(maxlen, b'\xff'), strict=False))
 
 
 def _or(b1: bytes, b2: bytes) -> bytes:
@@ -3115,7 +3155,7 @@ def _or(b1: bytes, b2: bytes) -> bytes:
     # Pad on the left, to equal length
     maxlen = max(len(b1), len(b2))
     return bytes(x | y for x, y in zip(b1.rjust(maxlen, b'\x00'),
-                                       b2.rjust(maxlen, b'\x00')))
+                                       b2.rjust(maxlen, b'\x00'), strict=False))
 
 
 def _not(b: bytes) -> bytes:
@@ -3239,11 +3279,10 @@ def _check_dt(dt: DT) -> None:
                      " (see the devicetree specification)")
 
         ranges_prop = node.props.get("ranges")
-        if ranges_prop:
-            if ranges_prop.type not in (Type.EMPTY, Type.NUMS):
-                _err(f"expected 'ranges = < ... >;' in {node.path} in "
-                     f"{node.dt.filename}, not '{ranges_prop}' "
-                     "(see the devicetree specification)")
+        if ranges_prop and ranges_prop.type not in (Type.EMPTY, Type.NUMS):
+            _err(f"expected 'ranges = < ... >;' in {node.path} in "
+                 f"{node.dt.filename}, not '{ranges_prop}' "
+                  "(see the devicetree specification)")
 
 
 def _err(msg) -> NoReturn:
@@ -3316,7 +3355,8 @@ def _raw_default_property_for(
             for name in _DEFAULT_PROP_TYPES
         },
     },
-    require_compatible=False, require_description=False,
+    require_compatible=False,
+    require_description=False,
 )
 
 _DEFAULT_PROP_SPECS: dict[str, PropertySpec] = {
diff --git a/scripts/dts/python-devicetree/tests/test-bindings-init/base_multi.yaml b/scripts/dts/python-devicetree/tests/test-bindings-init/base_multi.yaml
index c713f1b8d3a66..7165dd16e9182 100644
--- a/scripts/dts/python-devicetree/tests/test-bindings-init/base_multi.yaml
+++ b/scripts/dts/python-devicetree/tests/test-bindings-init/base_multi.yaml
@@ -9,7 +9,7 @@
 #     child-binding:
 #       include: base.yaml
 #
-# Which properties are specified at which levels is summarized bellow
+# Which properties are specified at which levels is summarized below
 # for convenience.
 #
 # Child-binding level:
diff --git a/scripts/dts/python-devicetree/tests/test-bindings-init/compat_desc_multi.yaml b/scripts/dts/python-devicetree/tests/test-bindings-init/compat_desc_multi.yaml
index c729875d02bc9..fc7fdd95eae48 100644
--- a/scripts/dts/python-devicetree/tests/test-bindings-init/compat_desc_multi.yaml
+++ b/scripts/dts/python-devicetree/tests/test-bindings-init/compat_desc_multi.yaml
@@ -7,7 +7,7 @@ description: Binding description (multi).
 
 compatible: vnd,compat-desc-multi
 
-# Descriptions at the child-binding level and bellow
+# Descriptions at the child-binding level and below
 # will depend on inclusion order: the first wins.
 include:
   - compat_desc_base.yaml
diff --git a/scripts/dts/python-devicetree/tests/test-bindings-init/diamond.yaml b/scripts/dts/python-devicetree/tests/test-bindings-init/diamond.yaml
index 0a3865506eaa6..dfd573e1a19be 100644
--- a/scripts/dts/python-devicetree/tests/test-bindings-init/diamond.yaml
+++ b/scripts/dts/python-devicetree/tests/test-bindings-init/diamond.yaml
@@ -10,7 +10,7 @@
 #                 \       /
 #                 base.yaml
 #
-# Which properties are specified at which levels is summarized bellow
+# Which properties are specified at which levels is summarized below
 # for convenience.
 #
 # * Binding level.
diff --git a/scripts/dts/python-devicetree/tests/test-bindings/defaults.yaml b/scripts/dts/python-devicetree/tests/test-bindings/defaults.yaml
index 4d3cfda3067f1..0a9b63a87aec5 100644
--- a/scripts/dts/python-devicetree/tests/test-bindings/defaults.yaml
+++ b/scripts/dts/python-devicetree/tests/test-bindings/defaults.yaml
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
+title: Test binding
+
 description: Property default value test
 
 compatible: "defaults"
diff --git a/scripts/dts/python-devicetree/tests/test_dtlib.py b/scripts/dts/python-devicetree/tests/test_dtlib.py
index bf80e85638fca..c16e1eae6885c 100644
--- a/scripts/dts/python-devicetree/tests/test_dtlib.py
+++ b/scripts/dts/python-devicetree/tests/test_dtlib.py
@@ -2499,3 +2499,59 @@ def test_move_node():
     with dtlib_raises("can't move '/newpath' to '/foo/bar': "
                       "parent node '/foo' doesn't exist"):
         dt.move_node(parent, '/foo/bar')
+
+def test_filename_and_lineno():
+    """Test that filename and lineno are correctly tracked for nodes and properties."""
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        included_file = os.path.join(tmpdir, 'included.dtsi')
+        with open(included_file, 'w') as f:
+            f.write('''/* a new node */
+/ {
+	node1: test-node1 {
+		prop1A = "value1A";
+	};
+};
+''')
+
+        main_file = os.path.join(tmpdir, 'test_with_include.dts')
+        with open(main_file, 'w') as f:
+            f.write('''/dts-v1/;
+
+/include/ "included.dtsi"
+
+/ {
+	node2: test-node2 {
+		prop2A = "value2A";
+		prop2B = "value2B";
+	};
+};
+
+&node1 {
+	prop1B = "value1B";
+};
+''')
+
+        dt = dtlib.DT(main_file, include_path=[tmpdir])
+
+        test_node2 = dt.get_node('/test-node2')
+        prop2A = test_node2.props['prop2A']
+        prop2B = test_node2.props['prop2B']
+
+        assert os.path.samefile(test_node2.filename, main_file)
+        assert test_node2.lineno == 6
+        assert os.path.samefile(prop2A.filename, main_file)
+        assert prop2A.lineno == 7
+        assert os.path.samefile(prop2B.filename, main_file)
+        assert prop2B.lineno == 8
+
+        test_node1 = dt.get_node('/test-node1')
+        prop1A = test_node1.props['prop1A']
+        prop1B = test_node1.props['prop1B']
+
+        assert os.path.samefile(test_node1.filename, included_file)
+        assert test_node1.lineno == 3
+        assert os.path.samefile(prop1A.filename, included_file)
+        assert prop1A.lineno == 4
+        assert os.path.samefile(prop1B.filename, main_file)
+        assert prop1B.lineno == 13
diff --git a/scripts/dts/python-devicetree/tests/test_edtlib.py b/scripts/dts/python-devicetree/tests/test_edtlib.py
index 30fbc7c3fc36f..8c826225c9b57 100644
--- a/scripts/dts/python-devicetree/tests/test_edtlib.py
+++ b/scripts/dts/python-devicetree/tests/test_edtlib.py
@@ -531,6 +531,20 @@ def test_bus():
     assert str(edt.get_node("/buses/foo-bus/node1/nested").binding_path) == \
         hpath("test-bindings/device-on-foo-bus.yaml")
 
+def test_binding_top_key():
+    fname2path = {'include.yaml': 'test-bindings-include/include.yaml',
+                  'include-2.yaml': 'test-bindings-include/include-2.yaml'}
+
+    with from_here():
+        binding = edtlib.Binding("test-bindings/defaults.yaml", fname2path)
+    title = binding.title
+    description = binding.description
+    compatible = binding.compatible
+
+    assert title == "Test binding"
+    assert description == "Property default value test"
+    assert compatible == "defaults"
+
 def test_child_binding():
     '''Test 'child-binding:' in bindings'''
     with from_here():
diff --git a/scripts/footprint/size_report b/scripts/footprint/size_report
index 3712d0f7d53da..c4d73b8e2d0db 100755
--- a/scripts/footprint/size_report
+++ b/scripts/footprint/size_report
@@ -207,6 +207,11 @@ def get_section_ranges(elf):
     ram_size = 0
     unassigned_size = 0
 
+    xip = any(section.get_symbol_by_name('CONFIG_XIP')
+              for section in elf.iter_sections('SHT_SYMTAB'))
+    if args.verbose:
+        print(f'INFO: XIP={xip}')
+
     for section in elf.iter_sections():
         size = section['sh_size']
         sec_start = section['sh_addr']
@@ -232,14 +237,16 @@ def get_section_ranges(elf):
                 print_section_info(section, "ROM txt section")
 
             elif (flags & SHF_WRITE_ALLOC) == SHF_WRITE_ALLOC:
-                # Data occupies both ROM and RAM
-                # since at boot, content is copied from ROM to RAM
-                rom_addr_ranges.append(bound)
-                rom_size += size
+                # Read/write data
+                if xip:
+                    # For XIP, the data section occupies both ROM and RAM
+                    # since at boot, content is copied from ROM to RAM
+                    rom_addr_ranges.append(bound)
+                    rom_size += size
                 ram_addr_ranges.append(bound)
                 ram_size += size
                 is_assigned = True
-                print_section_info(section, "ROM,RAM section")
+                print_section_info(section, "DATA r/w section")
 
             elif (flags & SHF_ALLOC) == SHF_ALLOC:
                 # Read only data
diff --git a/scripts/kconfig/hardened.csv b/scripts/kconfig/hardened.csv
index d91029a046dbc..4a126b96fc172 100644
--- a/scripts/kconfig/hardened.csv
+++ b/scripts/kconfig/hardened.csv
@@ -17,7 +17,6 @@ CORTEX_M_DEBUG_MONITOR_HOOK,n
 DMA_INTEL_ADSP_GPDMA_DEBUG,n
 ESPI_PERIPHERAL_DEBUG_PORT_80,n
 ETH_E1000_VERBOSE_DEBUG,n
-ETH_MCUX_PHY_EXTRA_DEBUG,n
 EXECUTE_XOR_WRITE,y
 FAULT_DUMP,0
 HW_STACK_PROTECTION,y
diff --git a/scripts/kconfig/kconfigfunctions.py b/scripts/kconfig/kconfigfunctions.py
index 81411a9d7a1cc..04dab9ca2e548 100644
--- a/scripts/kconfig/kconfigfunctions.py
+++ b/scripts/kconfig/kconfigfunctions.py
@@ -149,6 +149,18 @@ def dt_node_enabled(kconf, name, node):
     return "y" if node and node.status == "okay" else "n"
 
 
+def dt_nodelabel_exists(kconf, _, label):
+    """
+    This function returns "y" if a nodelabel exists and "n" otherwise.
+    """
+    if doc_mode or edt is None:
+        return "n"
+
+    node = edt.label2node.get(label)
+
+    return "y" if node else "n"
+
+
 def dt_nodelabel_enabled(kconf, _, label):
     """
     This function is like dt_node_enabled(), but the 'label' argument
@@ -1030,6 +1042,7 @@ def inc_dec(kconf, name, *args):
         "dt_chosen_has_compat": (dt_chosen_has_compat, 2, 2),
         "dt_path_enabled": (dt_node_enabled, 1, 1),
         "dt_alias_enabled": (dt_node_enabled, 1, 1),
+        "dt_nodelabel_exists": (dt_nodelabel_exists, 1, 1),
         "dt_nodelabel_enabled": (dt_nodelabel_enabled, 1, 1),
         "dt_nodelabel_enabled_with_compat": (dt_nodelabel_enabled_with_compat, 2, 2),
         "dt_chosen_reg_addr_int": (dt_chosen_reg, 1, 3),
diff --git a/scripts/native_simulator/Makefile b/scripts/native_simulator/Makefile
index 392df5f541222..905fe88be98e1 100644
--- a/scripts/native_simulator/Makefile
+++ b/scripts/native_simulator/Makefile
@@ -38,6 +38,8 @@ NSI_COVERAGE?=--coverage
 NSI_LOCALIZE_OPTIONS?=
 NSI_BUILD_OPTIONS?=${NSI_ARCH} ${NSI_COVERAGE}
 NSI_LINK_OPTIONS?=${NSI_ARCH} ${NSI_COVERAGE}
+NSI_BUILD_C_OPTIONS?=
+NSI_BUILD_CXX_OPTIONS?=
 #  Extra source files to be built in the runner context
 NSI_EXTRA_SRCS?=
 #  Extra include directories to be used while building in the runner context
@@ -48,6 +50,8 @@ NSI_EXTRA_LIBS?=
 SHELL?=bash
 #  Compiler
 NSI_CC?=gcc
+NSI_CXX?=g++
+NSI_LINKER?=${NSI_CC}
 #  Archive program (it is unlikely you'll need to change this)
 NSI_AR?=ar
 #  Objcopy program (it is unlikely you'll need to change this)
@@ -64,8 +68,10 @@ NSI_CPPFLAGS?=-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTE
 
 NO_PIE_CO:=-fno-pie -fno-pic
 DEPENDFLAGS:=-MMD -MP
-CFLAGS:=${NSI_DEBUG} ${NSI_WARNINGS} ${NSI_OPT} ${NO_PIE_CO} -DNSI_N_CPUS=${NSI_N_CPUS} \
-  -ffunction-sections -fdata-sections ${DEPENDFLAGS} -std=c11 ${NSI_BUILD_OPTIONS}
+COMMON_BUILD_FLAGS:=-DNSI_RUNNER_BUILD ${NSI_DEBUG} ${NSI_WARNINGS} ${NSI_OPT} ${NO_PIE_CO} \
+  -DNSI_N_CPUS=${NSI_N_CPUS} -ffunction-sections -fdata-sections ${DEPENDFLAGS} ${NSI_BUILD_OPTIONS}
+CFLAGS:=-std=c11 ${COMMON_BUILD_FLAGS} ${NSI_BUILD_C_OPTIONS}
+CXXFLAGS:=${COMMON_BUILD_FLAGS} ${NSI_BUILD_CXX_OPTIONS}
 FINALLINK_FLAGS:=${NO_PIE_CO} -no-pie  ${NSI_WARNINGS} \
   -Wl,--gc-sections -ldl -pthread \
   ${NSI_LINK_OPTIONS} -lm
@@ -89,7 +95,7 @@ ifdef NSI_NATIVE
   INCLUDES+=-I${NSI_PATH}native/src/include/
 endif
 
-EXTRA_OBJS:=$(abspath $(addprefix $(NSI_BUILD_PATH)/,$(sort ${NSI_EXTRA_SRCS:%.c=%.o})))
+EXTRA_OBJS:=$(abspath $(addprefix $(NSI_BUILD_PATH)/,$(sort $(patsubst %.c,%.o,${NSI_EXTRA_SRCS:%.cpp=%.c}))))
 OBJS:=$(abspath $(addprefix $(NSI_BUILD_PATH)/,${SRCS:${NSI_PATH}%.c=%.o})) ${EXTRA_OBJS}
 
 DEPENDFILES:=$(addsuffix .d,$(basename ${OBJS}))
@@ -106,6 +112,11 @@ ${NSI_BUILD_PATH}/%.o: /%.c ${NSI_PATH}Makefile ${NSI_CONFIG_FILE}
 	@if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi
 	${NSI_CC} ${NSI_CPPFLAGS} ${INCLUDES} ${CFLAGS} -c $< -o $@
 
+#Extra C++ sources build:
+${NSI_BUILD_PATH}/%.o: /%.cpp ${NSI_PATH}Makefile ${NSI_CONFIG_FILE}
+	@if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi
+	${NSI_CXX} ${NSI_CPPFLAGS} ${INCLUDES} ${CXXFLAGS} -c $< -o $@
+
 ${NSI_BUILD_PATH}/%.o: ${NSI_PATH}/%.c ${NSI_PATH}Makefile ${NSI_CONFIG_FILE}
 	@if [ ! -d $(dir $@) ]; then mkdir -p $(dir $@); fi
 	${NSI_CC} ${NSI_CPPFLAGS} ${INCLUDES} ${CFLAGS} -c $< -o $@
@@ -128,7 +139,7 @@ ${NSI_BUILD_PATH}/%.loc_cpusw.o: /% ${NSI_CONFIG_FILE}
 
 ${NSI_EXE}: ${NSI_BUILD_PATH}/${RUNNER_LIB} ${LOCALIZED_EMBSW} ${NSI_EXTRA_LIBS} \
  ${NSI_BUILD_PATH}/linker_script.ld
-	${NSI_CC} -Wl,--whole-archive ${LOCALIZED_EMBSW} ${NSI_BUILD_PATH}/${RUNNER_LIB} \
+	${NSI_LINKER} -Wl,--whole-archive ${LOCALIZED_EMBSW} ${NSI_BUILD_PATH}/${RUNNER_LIB} \
 	  ${NSI_EXTRA_LIBS} -Wl,--no-whole-archive \
 	  -o $@ ${FINALLINK_FLAGS} -T ${NSI_BUILD_PATH}/linker_script.ld
 
diff --git a/scripts/native_simulator/common/src/include/nsi_errno.h b/scripts/native_simulator/common/src/include/nsi_errno.h
new file mode 100644
index 0000000000000..317d113cdde29
--- /dev/null
+++ b/scripts/native_simulator/common/src/include/nsi_errno.h
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2023-2024 Marcin Niestroj
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NSI_COMMON_SRC_NSI_ERRNO_H
+#define NSI_COMMON_SRC_NSI_ERRNO_H
+
+/*
+ * Optional utility module to convert errno values from one libC to another,
+ * where one libC would normally be the embedded libC used to build the embedded code and the other
+ * the host libC.
+ *
+ * It works by converting the errno values from/to either libC into an intermediate set of values
+ * (NSI_ERRNO_MID_E*).
+ * When two components would like to exchange errors, they should include nsi_errno.h and build and
+ * link to nsi_errno.c in their context. And convert to/from these intermediate error values
+ * before passing them to/after receiving them from the other side by using
+ * nsi_errno_to_mid() / nsi_errno_from_mid().
+ */
+
+#include <errno.h>
+
+#define NSI_ERRNO_MID_EPERM             1 /**< Not owner */
+#define NSI_ERRNO_MID_ENOENT            2 /**< No such file or directory */
+#define NSI_ERRNO_MID_ESRCH             3 /**< No such context */
+#define NSI_ERRNO_MID_EINTR             4 /**< Interrupted system call */
+#define NSI_ERRNO_MID_EIO               5 /**< I/O error */
+#define NSI_ERRNO_MID_ENXIO             6 /**< No such device or address */
+#define NSI_ERRNO_MID_E2BIG             7 /**< Arg list too long */
+#define NSI_ERRNO_MID_ENOEXEC           8 /**< Exec format error */
+#define NSI_ERRNO_MID_EBADF             9 /**< Bad file number */
+#define NSI_ERRNO_MID_ECHILD           10 /**< No children */
+#define NSI_ERRNO_MID_EAGAIN           11 /**< No more contexts */
+#define NSI_ERRNO_MID_ENOMEM           12 /**< Not enough core */
+#define NSI_ERRNO_MID_EACCES           13 /**< Permission denied */
+#define NSI_ERRNO_MID_EFAULT           14 /**< Bad address */
+#define NSI_ERRNO_MID_ENOTBLK          15 /**< Block device required */
+#define NSI_ERRNO_MID_EBUSY            16 /**< Mount device busy */
+#define NSI_ERRNO_MID_EEXIST           17 /**< File exists */
+#define NSI_ERRNO_MID_EXDEV            18 /**< Cross-device link */
+#define NSI_ERRNO_MID_ENODEV           19 /**< No such device */
+#define NSI_ERRNO_MID_ENOTDIR          20 /**< Not a directory */
+#define NSI_ERRNO_MID_EISDIR           21 /**< Is a directory */
+#define NSI_ERRNO_MID_EINVAL           22 /**< Invalid argument */
+#define NSI_ERRNO_MID_ENFILE           23 /**< File table overflow */
+#define NSI_ERRNO_MID_EMFILE           24 /**< Too many open files */
+#define NSI_ERRNO_MID_ENOTTY           25 /**< Not a typewriter */
+#define NSI_ERRNO_MID_ETXTBSY          26 /**< Text file busy */
+#define NSI_ERRNO_MID_EFBIG            27 /**< File too large */
+#define NSI_ERRNO_MID_ENOSPC           28 /**< No space left on device */
+#define NSI_ERRNO_MID_ESPIPE           29 /**< Illegal seek */
+#define NSI_ERRNO_MID_EROFS            30 /**< Read-only file system */
+#define NSI_ERRNO_MID_EMLINK           31 /**< Too many links */
+#define NSI_ERRNO_MID_EPIPE            32 /**< Broken pipe */
+#define NSI_ERRNO_MID_EDOM             33 /**< Argument too large */
+#define NSI_ERRNO_MID_ERANGE           34 /**< Result too large */
+#define NSI_ERRNO_MID_ENOMSG           35 /**< Unexpected message type */
+#define NSI_ERRNO_MID_EDEADLK          45 /**< Resource deadlock avoided */
+#define NSI_ERRNO_MID_ENOLCK           46 /**< No locks available */
+#define NSI_ERRNO_MID_ENOSTR           60 /**< STREAMS device required */
+#define NSI_ERRNO_MID_ENODATA          61 /**< Missing expected message data */
+#define NSI_ERRNO_MID_ETIME            62 /**< STREAMS timeout occurred */
+#define NSI_ERRNO_MID_ENOSR            63 /**< Insufficient memory */
+#define NSI_ERRNO_MID_EPROTO           71 /**< Generic STREAMS error */
+#define NSI_ERRNO_MID_EBADMSG          77 /**< Invalid STREAMS message */
+#define NSI_ERRNO_MID_ENOSYS           88 /**< Function not implemented */
+#define NSI_ERRNO_MID_ENOTEMPTY        90 /**< Directory not empty */
+#define NSI_ERRNO_MID_ENAMETOOLONG     91 /**< File name too long */
+#define NSI_ERRNO_MID_ELOOP            92 /**< Too many levels of symbolic links */
+#define NSI_ERRNO_MID_EOPNOTSUPP       95 /**< Operation not supported on socket */
+#define NSI_ERRNO_MID_EPFNOSUPPORT     96 /**< Protocol family not supported */
+#define NSI_ERRNO_MID_ECONNRESET      104 /**< Connection reset by peer */
+#define NSI_ERRNO_MID_ENOBUFS         105 /**< No buffer space available */
+#define NSI_ERRNO_MID_EAFNOSUPPORT    106 /**< Addr family not supported */
+#define NSI_ERRNO_MID_EPROTOTYPE      107 /**< Protocol wrong type for socket */
+#define NSI_ERRNO_MID_ENOTSOCK        108 /**< Socket operation on non-socket */
+#define NSI_ERRNO_MID_ENOPROTOOPT     109 /**< Protocol not available */
+#define NSI_ERRNO_MID_ESHUTDOWN       110 /**< Can't send after socket shutdown */
+#define NSI_ERRNO_MID_ECONNREFUSED    111 /**< Connection refused */
+#define NSI_ERRNO_MID_EADDRINUSE      112 /**< Address already in use */
+#define NSI_ERRNO_MID_ECONNABORTED    113 /**< Software caused connection abort */
+#define NSI_ERRNO_MID_ENETUNREACH     114 /**< Network is unreachable */
+#define NSI_ERRNO_MID_ENETDOWN        115 /**< Network is down */
+#define NSI_ERRNO_MID_ETIMEDOUT       116 /**< Connection timed out */
+#define NSI_ERRNO_MID_EHOSTDOWN       117 /**< Host is down */
+#define NSI_ERRNO_MID_EHOSTUNREACH    118 /**< No route to host */
+#define NSI_ERRNO_MID_EINPROGRESS     119 /**< Operation now in progress */
+#define NSI_ERRNO_MID_EALREADY        120 /**< Operation already in progress */
+#define NSI_ERRNO_MID_EDESTADDRREQ    121 /**< Destination address required */
+#define NSI_ERRNO_MID_EMSGSIZE        122 /**< Message size */
+#define NSI_ERRNO_MID_EPROTONOSUPPORT 123 /**< Protocol not supported */
+#define NSI_ERRNO_MID_ESOCKTNOSUPPORT 124 /**< Socket type not supported */
+#define NSI_ERRNO_MID_EADDRNOTAVAIL   125 /**< Can't assign requested address */
+#define NSI_ERRNO_MID_ENETRESET       126 /**< Network dropped connection on reset */
+#define NSI_ERRNO_MID_EISCONN         127 /**< Socket is already connected */
+#define NSI_ERRNO_MID_ENOTCONN        128 /**< Socket is not connected */
+#define NSI_ERRNO_MID_ETOOMANYREFS    129 /**< Too many references: can't splice */
+#define NSI_ERRNO_MID_ENOTSUP         134 /**< Unsupported value */
+#define NSI_ERRNO_MID_EILSEQ          138 /**< Illegal byte sequence */
+#define NSI_ERRNO_MID_EOVERFLOW       139 /**< Value overflow */
+#define NSI_ERRNO_MID_ECANCELED       140 /**< Operation canceled */
+
+/* Convert a errno value to the intermediate represetation to pass it to the other side */
+int nsi_errno_to_mid(int err);
+/* Convert a errno value from the intermediate representation into the local libC value */
+int nsi_errno_from_mid(int err);
+/* Return the middleground representation of the current host libC errno */
+int nsi_get_errno_in_mid(void);
+/* Return the local representation of the current host libC errno */
+int nsi_host_get_errno(void);
+
+#endif /* NSI_COMMON_SRC_NSI_ERRNO_H */
diff --git a/scripts/native_simulator/common/src/include/nsi_utils.h b/scripts/native_simulator/common/src/include/nsi_utils.h
index 43d171a8e896f..aff6e9aff4381 100644
--- a/scripts/native_simulator/common/src/include/nsi_utils.h
+++ b/scripts/native_simulator/common/src/include/nsi_utils.h
@@ -21,6 +21,8 @@
 #define NSI_MAX(a, b)  (((a) > (b)) ? (a) : (b))
 #define NSI_MIN(a, b) (((a) < (b)) ? (a) : (b))
 
+#define NSI_ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
+
 #ifndef NSI_ARG_UNUSED
 #define NSI_ARG_UNUSED(x) (void)(x)
 #endif
diff --git a/scripts/native_simulator/common/src/nsi_errno.c b/scripts/native_simulator/common/src/nsi_errno.c
new file mode 100644
index 0000000000000..25b58e85fa80d
--- /dev/null
+++ b/scripts/native_simulator/common/src/nsi_errno.c
@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) 2023-2024 Marcin Niestroj
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nsi_errno.h"
+#include "nsi_utils.h"
+
+struct nsi_errno_mid_map {
+	/** Embedded/host error code */
+	int err;
+	/** NSI_errno middleground error code */
+	int mid_err;
+};
+
+#define ERR(_name) {_name, NSI_ERRNO_MID_##_name}
+
+static const struct nsi_errno_mid_map map[] = {
+	ERR(EPERM),
+	ERR(ENOENT),
+	ERR(ESRCH),
+	ERR(EINTR),
+	ERR(EIO),
+	ERR(ENXIO),
+	ERR(E2BIG),
+	ERR(ENOEXEC),
+	ERR(EBADF),
+	ERR(ECHILD),
+	ERR(EAGAIN),
+	ERR(ENOMEM),
+	ERR(EACCES),
+	ERR(EFAULT),
+	ERR(ENOTBLK),
+	ERR(EBUSY),
+	ERR(EEXIST),
+	ERR(EXDEV),
+	ERR(ENODEV),
+	ERR(ENOTDIR),
+	ERR(EISDIR),
+	ERR(EINVAL),
+	ERR(ENFILE),
+	ERR(EMFILE),
+	ERR(ENOTTY),
+	ERR(ETXTBSY),
+	ERR(EFBIG),
+	ERR(ENOSPC),
+	ERR(ESPIPE),
+	ERR(EROFS),
+	ERR(EMLINK),
+	ERR(EPIPE),
+	ERR(EDOM),
+	ERR(ERANGE),
+	ERR(ENOMSG),
+	ERR(EDEADLK),
+	ERR(ENOLCK),
+	ERR(ENOSTR),
+	ERR(ENODATA),
+	ERR(ETIME),
+	ERR(ENOSR),
+	ERR(EPROTO),
+	ERR(EBADMSG),
+	ERR(ENOSYS),
+	ERR(ENOTEMPTY),
+	ERR(ENAMETOOLONG),
+	ERR(ELOOP),
+	ERR(EOPNOTSUPP),
+	ERR(EPFNOSUPPORT),
+	ERR(ECONNRESET),
+	ERR(ENOBUFS),
+	ERR(EAFNOSUPPORT),
+	ERR(EPROTOTYPE),
+	ERR(ENOTSOCK),
+	ERR(ENOPROTOOPT),
+	ERR(ESHUTDOWN),
+	ERR(ECONNREFUSED),
+	ERR(EADDRINUSE),
+	ERR(ECONNABORTED),
+	ERR(ENETUNREACH),
+	ERR(ENETDOWN),
+	ERR(ETIMEDOUT),
+	ERR(EHOSTDOWN),
+	ERR(EHOSTUNREACH),
+	ERR(EINPROGRESS),
+	ERR(EALREADY),
+	ERR(EDESTADDRREQ),
+	ERR(EMSGSIZE),
+	ERR(EPROTONOSUPPORT),
+	ERR(ESOCKTNOSUPPORT),
+	ERR(EADDRNOTAVAIL),
+	ERR(ENETRESET),
+	ERR(EISCONN),
+	ERR(ENOTCONN),
+	ERR(ETOOMANYREFS),
+	ERR(ENOTSUP),
+	ERR(EILSEQ),
+	ERR(EOVERFLOW),
+	ERR(ECANCELED),
+};
+
+int nsi_errno_to_mid(int err)
+{
+	if (err == 0) {
+		return err;
+	}
+
+	for (int i = 0; i < NSI_ARRAY_SIZE(map); i++) {
+		if (map[i].err == err) {
+			return map[i].mid_err;
+		}
+	}
+
+	return err;
+}
+
+int nsi_errno_from_mid(int err)
+{
+	if (err == 0) {
+		return err;
+	}
+
+	for (int i = 0; i < NSI_ARRAY_SIZE(map); i++) {
+		if (map[i].mid_err == err) {
+			return map[i].err;
+		}
+	}
+
+	return err;
+}
+
+#if defined(NSI_RUNNER_BUILD)
+int nsi_get_errno_in_mid(void)
+{
+	return nsi_errno_to_mid(errno);
+}
+#endif
+
+int nsi_host_get_errno(void)
+{
+	return nsi_errno_from_mid(nsi_get_errno_in_mid());
+}
diff --git a/scripts/pylib/power-twister-harness/abstract/PowerMonitor.py b/scripts/pylib/power-twister-harness/abstract/PowerMonitor.py
new file mode 100644
index 0000000000000..75618b681f015
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/abstract/PowerMonitor.py
@@ -0,0 +1,40 @@
+# Copyright: (c)  2025, Intel Corporation
+# Author: Arkadiusz Cholewinski <arkadiuszx.cholewinski@intel.com>
+
+import string
+from abc import ABC, abstractmethod
+
+
+class PowerMonitor(ABC):
+    @abstractmethod
+    def init(self, device_id: string):
+        """
+        Abstract method to initialize the power monitor.
+
+        Agr:
+            string: Address of the power monitor
+
+        Return:
+            bool: True of False.
+        """
+
+    @abstractmethod
+    def measure(self, duration: int):
+        """
+        Abstract method to measure current with specified measurement time.
+
+        Args:
+            duration (int): The duration of the measurement in seconds.
+        """
+
+    @abstractmethod
+    def get_data(self, duration: int) -> list[float]:
+        """
+        Measure current with specified measurement time.
+
+        Args:
+            duration (int): The duration of the measurement in seconds.
+
+        Returns:
+            List[float]: An array of measured current values in amperes.
+        """
diff --git a/scripts/pylib/power-twister-harness/conftest.py b/scripts/pylib/power-twister-harness/conftest.py
new file mode 100644
index 0000000000000..01c880043e5c3
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/conftest.py
@@ -0,0 +1,61 @@
+# Copyright: (c)  2025, Intel Corporation
+import json
+import logging
+
+import pytest
+from twister_harness import DeviceAdapter
+
+
+def pytest_addoption(parser):
+    parser.addoption('--testdata')
+
+
+@pytest.fixture
+def probe_class(request, probe_path):
+    path = probe_path  # Get path of power device
+    if request.param == 'stm_powershield':
+        from stm32l562e_dk.PowerShield import PowerShield
+
+        probe = PowerShield()  # Instantiate the power monitor probe
+        probe.connect(path)
+        probe.init()
+
+    yield probe
+
+    if request.param == 'stm_powershield':
+        probe.disconnect()
+
+
+@pytest.fixture(name='probe_path', scope='session')
+def fixture_probe_path(request, dut: DeviceAdapter):
+    for fixture in dut.device_config.fixtures:
+        if fixture.startswith('pm_probe'):
+            probe_port = fixture.split(':')[1]
+    return probe_port
+
+
+@pytest.fixture(name='test_data', scope='session')
+def fixture_test_data(request):
+    # Get test data from the configuration and parse it into a dictionary
+    measurements = request.config.getoption("--testdata")
+    measurements = measurements.replace("'", '"')  # Ensure the data is properly formatted as JSON
+    measurements_dict = json.loads(measurements)
+
+    # Data validation
+    required_keys = [
+        'elements_to_trim',
+        'min_peak_distance',
+        'min_peak_height',
+        'peak_padding',
+        'measurement_duration',
+        'num_of_transitions',
+        'expected_rms_values',
+        'tolerance_percentage',
+    ]
+
+    for key in required_keys:
+        if key not in measurements_dict:
+            logging.error(f"Missing required test data key: {key}")
+            pytest.fail(f"Missing required test data key: {key}")
+
+    return measurements_dict
diff --git a/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShield.py b/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShield.py
new file mode 100644
index 0000000000000..c5b95bd9864d0
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShield.py
@@ -0,0 +1,484 @@
+# Copyright: (c)  2025, Intel Corporation
+# Author: Arkadiusz Cholewinski <arkadiuszx.cholewinski@intel.com>
+
+import csv
+import logging
+import queue
+import re
+import threading
+import time
+
+import utils.UtilityFunctions as UtilityFunctions
+from abstract.PowerMonitor import PowerMonitor
+from stm32l562e_dk.PowerShieldConfig import PowerShieldConf
+from stm32l562e_dk.PowerShieldData import PowerShieldData
+from stm32l562e_dk.SerialHandler import SerialHandler
+
+
+class PowerShield(PowerMonitor):
+    def __init__(self):
+        """
+        Initializes the PowerShield.
+        """
+        self.handler = None
+        self.dataQueue = queue.Queue()
+        self.acqComplete = False
+        self.acqStart = False
+        self.target_voltage = None
+        self.target_temperature = None
+        self.acqTimeoutThread = None
+        self.power_shield_conf = PowerShieldConf()
+        self.power_shield_data = PowerShieldData()
+
+    def init(self):
+        """
+        Initializes the power monitor.
+        """
+        self.__take_control()
+        self.__set_voltage(self.power_shield_conf.target_voltage)
+        self.__set_format(self.power_shield_conf.data_format)
+        self.__set_func_mode(self.power_shield_conf.function_mode)
+
+    def connect(self, power_device_path: str):
+        """Opens the connection using the SerialHandler."""
+        self.handler = SerialHandler(power_device_path, 3686400)
+        self.handler.open()
+
+    def disconnect(self):
+        """Closes the connection using the SerialHandler."""
+        self.handler.close()
+
+    def __send_command(self, command: str, expected_ack: str = None, ack: bool = False) -> str:
+        """
+        Sends a command to the device, retrieves the response,
+        and optionally verifies the acknowledgment.
+
+        :param command: The command to send.
+        :param expected_ack: The expected acknowledgment response (e.g., "ack htc").
+        :return: The response received from the device.
+        """
+        if not self.handler.is_open():
+            logging.info(f"Error: Connection is not open. Cannot send command: {command}")
+            return ""
+
+        logging.debug(f"Sending command: {command}")
+        self.handler.send_cmd(command)
+        if ack:
+            response = self.handler.receive_cmd()
+            logging.debug(f"Response: {response}")
+
+            # Check if the response contains the expected acknowledgment
+            if expected_ack and expected_ack not in response:
+                logging.error(f"Error: Expected acknowledgment '{expected_ack}' not found.")
+                return ""
+
+            return response
+        return 0
+
+    def __test_communication(self):
+        """
+        Sends a version command to the device.
+        """
+        if not self.handler.is_open():
+            logging.error("Error: Connection is not open. Cannot send version command.")
+            return ""
+        command = 'version'
+        logging.info(f"Sending command: {command}")
+        self.handler.send_cmd(command)
+        response = self.handler.receive_cmd()
+        logging.info(f"Response: {response}")
+        return response
+
+    def __reset(self):
+        """
+        Sends the reset command ('PSRST') to the power monitor device,
+        closes the connection, waits for the reset process to complete,
+        and repeatedly attempts to reconnect until successful.
+        """
+        command = "psrst"
+
+        if not self.handler.is_open():
+            logging.error("Error: Connection is not open. Cannot reset the device.")
+            return
+
+        logging.info(f"Sending reset command: {command}")
+        self.handler.send_cmd(command)
+
+        # Close the connection
+        self.handler.close()
+        self.handler.serial_connection = None
+
+        time.sleep(5)
+        # Attempt to reopen the connection
+        try:
+            self.handler.open()
+            logging.info("Connection reopened after reset.")
+        except Exception as e:
+            logging.error(f"Failed to reopen connection after reset: {e}")
+
+    def __get_voltage_level(self) -> float:
+        """
+        Sends the 'volt get' command and returns the voltage value as a float.
+
+        :return: The voltage level as a float, in volts (V).
+        """
+        command = 'volt get'
+        response = self.__send_command(command, expected_ack="ack volt get", ack=True)
+
+        # If response contains the expected acknowledgment, extract and return the voltage
+        if response:
+            parts = response.split()
+            try:
+                if len(parts) >= 5:
+                    # Use regex to find a string that matches the pattern, e.g., "3292-03"
+                    match = re.search(r'(\d+)-(\d+)', parts[5])
+                    if match:
+                        # Extract the base (3292) and exponent (03)
+                        base = match.group(1)
+                        exponent = match.group(2)
+
+                        # Construct the scientific notation string (e.g., 3292e-03)
+                        voltage_str = f"{base}e-{exponent}"
+
+                        # Convert the string into a float
+                        voltage = float(voltage_str)
+
+                        # Return the voltage as a float
+                        self.target_voltage = round(voltage, 3)
+                        return self.target_voltage
+            except ValueError:
+                logging.error("Error: Could not convert temperature value.")
+                return float('nan')
+        else:
+            logging.error("Error: No response for voltage command.")
+        return float('nan')
+
+    def __get_temperature(self, unit: str = PowerShieldConf.TemperatureUnit.CELSIUS) -> float:
+        """
+        Sends the temperature command and returns the temperature as a float.
+
+        :param unit: The unit to request the temperature in, either 'degc' or 'degf'.
+        :return: The temperature value as a float, in the specified unit (°C or °F).
+        """
+        # Send the temp command with the unit
+        response = self.__send_command(f"temp {unit}", expected_ack=f"ack temp {unit}", ack=True)
+
+        # If response contains the expected acknowledgment, extract the temperature
+        if response:
+            try:
+                # Example response format: "PowerShield > ack temp degc 28.0"
+                parts = response.split()
+                if len(parts) >= 5 and parts[5].replace('.', '', 1).isdigit():
+                    # Extract temperature and convert to float
+                    self.target_temetarute = float(parts[5])
+                    logging.info(f"Temperature: {self.target_temetarute} {unit}")
+                    return self.target_temetarute
+                else:
+                    print("Error: Temperature value not found in response.")
+                    return None
+            except ValueError:
+                logging.error("Error: Could not convert temperature value.")
+                return None
+        else:
+            logging.error("Error: No response for temp command.")
+        return None
+
+    def __take_control(self) -> str:
+        """
+        Sends the 'htc' command and verifies the acknowledgment.
+
+        :return: The acknowledgment response or error message.
+        """
+        return self.__send_command("htc", expected_ack="ack htc", ack=True)
+
+    def __set_format(self, data_format: str = PowerShieldConf.DataFormat.ASCII_DEC):
+        """
+        Sets the measurement data format.
+        The format can be either ASCII (decimal) or Binary (hexadecimal).
+
+        :param data_format: The data format to set.
+                            Options are 'ascii_dec' or 'bin_hexa'.
+        :return: None
+        """
+        # Validate the input format
+        if data_format not in vars(PowerShieldConf.DataFormat).values():
+            logging.error(
+                f"Error: Invalid format '{data_format}'. "
+                "Valid options are 'ascii_dec' or 'bin_hexa'."
+            )
+            return
+
+        command = f"format {data_format}"
+        response = self.__send_command(command, expected_ack=f"ack format {data_format}", ack=True)
+
+        # If response contains the expected acknowledgment, the format was set successfully
+        if response:
+            logging.info(f"Data format set to {data_format}.")
+        else:
+            logging.error(f"Error: Failed to set data format to {data_format}.")
+
+    def __set_frequency(self, frequency: enumerate):
+        """
+        Sets the sampling frequency for the measurement.
+        The frequency can be any valid value from the list.
+
+        :param frequency: The sampling frequency to set.
+        Valid options include:
+        {100k, 50k, 20k, 10k, 5k, 2k, 1k, 500, 200, 100, 50, 20, 10, 5, 2, 1}.
+
+        :return: None
+        """
+        # Validate the input frequency
+        if frequency not in vars(PowerShieldConf.SamplingFrequency).values():
+            logging.error(
+                f"Error: Invalid frequency '{frequency}'."
+                "Valid options are:"
+                "100k, 50k, 20k, 10k, 5k, 2k, 1k, 500, 200, 100, 50, 20, 10, 5, 2, 1."
+            )
+            return
+
+        command = f"freq {frequency}"
+        response = self.__send_command(command, expected_ack=f"ack freq {frequency}", ack=True)
+
+        if response:
+            logging.info(f"Sampling frequency set to {frequency}.")
+        else:
+            logging.error(f"Error: Failed to set sampling frequency to {frequency}.")
+
+    def __set_acquisition_time(self, acquisition_time: str = '0'):
+        command = f"acqtime {acquisition_time}"
+        response = self.__send_command(
+            command, expected_ack=f"ack acqtime {acquisition_time}", ack=True
+        )
+
+        if response:
+            logging.info(f"Acquisition time set to {acquisition_time}.")
+        else:
+            logging.error(f"Error: Failed to set acquisition time to {acquisition_time}.")
+
+    def __set_voltage(self, voltage: enumerate):
+        command = f"volt {voltage}"
+        response = self.__send_command(command, expected_ack=f"ack volt {voltage}", ack=True)
+
+        if response:
+            logging.info(f"Voltage set to {voltage}.")
+        else:
+            logging.error(f"Error: Failed to set voltage to {voltage}.")
+
+    def __set_func_mode(self, function_mode: str = PowerShieldConf.FunctionMode.HIGH):
+        """
+        Sets the acquisition mode for current measurement.
+        The function_mode can be either 'optim' or 'high'.
+
+        - 'optim': Priority on current resolution (100 nA - 10 mA) with max freq at 100 kHz.
+        - 'high': High current (30 µA - 10 mA), high frequency (50-100 kHz), high resolution.
+
+        :param mode: The acquisition mode. Must be either 'optim' or 'high'.
+        :return: None
+        """
+        # Validate the input format
+        if function_mode not in vars(PowerShieldConf.FunctionMode).values():
+            logging.error(
+                f"Error: Invalid format '{function_mode}'."
+                "Valid options are 'ascii_dec' or 'bin_hexa'."
+            )
+            return
+
+        command = f"funcmode {function_mode}"
+        response = self.__send_command(
+            command, expected_ack=f"ack funcmode {function_mode}", ack=True
+        )
+
+        if response:
+            logging.info(f"Data format set to {function_mode}.")
+        else:
+            logging.error(f"Error: Failed to set data format to {function_mode}.")
+
+    def __acq_data(self):
+        """
+        Continuously reads data from the serial port and puts it
+        into a queue until acquisition is complete.
+        """
+        logging.info("Started data acquisition...")
+        while True:
+            # Read the first byte
+            first_byte = self.handler.read_bytes(1)
+            if len(first_byte) < 1 or self.acqComplete:  # Exit conditions
+                logging.info("Stopping data acquisition...")
+                return
+
+            # Check if it's metadata
+            if first_byte == b'\xf0':  # Metadata marker
+                second_byte = self.handler.read_bytes(1)
+                # Handle metadata types
+                metadata_type = second_byte[0]
+                self.__handle_metadata(metadata_type)
+            else:
+                # Not metadata, treat as data
+                if self.acqStart:
+                    second_byte = self.handler.read_bytes(1)
+                    data = []
+                    data.append(first_byte)
+                    if len(second_byte) < 1 or self.acqComplete:
+                        logging.info("Stopping data acquisition...")
+                        return
+                    data.append(second_byte)
+                    amps = UtilityFunctions.convert_to_amps(
+                        UtilityFunctions.bytes_to_twobyte_values(data)
+                    )
+                    self.dataQueue.put([amps])
+
+    def __handle_metadata(self, metadata_type):
+        if metadata_type == 0xF1:
+            logging.info("Received Metadata: ASCII error message.")
+            # self.handle_metadata_error()
+        elif metadata_type == 0xF2:
+            logging.info("Received Metadata: ASCII information message.")
+            # self.handle_metadata_info()
+        elif metadata_type == 0xF3:
+            logging.info("Received Metadata: Timestamp message.")
+            self.__handle_metadata_timestamp()
+            self.acqStart = True
+        elif metadata_type == 0xF4:
+            logging.info("Received Metadata: End of acquisition tag.")
+            self.__handle_metadata_end()
+            self.__handle_summary()
+        elif metadata_type == 0xF5:
+            logging.info("Received Metadata: Overcurrent detected.")
+            # self.handle_metadata_overcurrent()
+        else:
+            logging.error(f"Error: Unknown Metadata Type: {metadata_type:#04x}")
+
+    def __handle_summary(self):
+        s = ""
+        while True:
+            # Read the first byte
+            x = self.handler.read_bytes(1)
+            if len(x) < 1 or x == 0xF0:
+                self.acqComplete = True
+                return s.replace("\0", "").strip().replace("\r", "").replace("\n\n\n", "\n")
+            s += str(x, encoding='ascii', errors='ignore')
+
+    def __handle_metadata_end(self):
+        """
+        Handle metadata end of acquisition message.
+        """
+        # Read the next 2 bytes
+        metadata_bytes = self.handler.read_bytes(2)
+        if len(metadata_bytes) < 2:
+            logging.error("Error: Incomplete end of acquisition metadata reveived.")
+            return
+        # Check for end tags (last 2 bytes)
+        end_tag_1 = metadata_bytes[0]
+        end_tag_2 = metadata_bytes[1]
+        if end_tag_1 != 0xFF or end_tag_2 != 0xFF:
+            logging.error("Error: Invalid metadata end tags received.")
+            return
+
+    def __handle_metadata_timestamp(self):
+        """
+        Handle metadata timestamp message. Parses and displays the timestamp and buffer load.
+        """
+        # Read the next 7 bytes (timestamp + buffer load + end tags)
+        metadata_bytes = self.handler.read_bytes(7)
+        if len(metadata_bytes) < 7:
+            logging.error("Error: Incomplete timestamp metadata received.")
+            return
+
+        # Parse the timestamp (4 bytes, big-endian)
+        timestamp_ms = int.from_bytes(metadata_bytes[0:4], byteorder='big', signed=False)
+        # Parse the buffer Tx load value (1 byte)
+        buffer_load = metadata_bytes[4]
+        # Check for end tags (last 2 bytes)
+        end_tag_1 = metadata_bytes[5]
+        end_tag_2 = metadata_bytes[6]
+        if end_tag_1 != 0xFF or end_tag_2 != 0xFF:
+            logging.error("Error: Invalid metadata end tags received.")
+            return
+
+        # Display parsed values
+        logging.info(f"Metadata Timestamp: {timestamp_ms} ms")
+        logging.info(f"Buffer Tx Load: {buffer_load}%")
+
+    def __start_measurement(self):
+        """
+        Starts the measurement by sending the 'start' command. Once the measurement starts,
+        data can be received continuously until the 'stop' command is sent.
+
+        :return: None
+        """
+        command = "start"
+        self.acqComplete = False
+        self.__send_command(command)
+
+        raw_to_file_Thread = threading.Thread(
+            target=self.__raw_to_file, args=(self.power_shield_conf.output_file,)
+        )
+        raw_to_file_Thread.start()
+        logging.info("Measurement started. Receiving data...")
+        self.__acq_data()
+        raw_to_file_Thread.join()
+
+    def __raw_to_file(self, outputFilePath: str):
+        # Open a CSV file for writing
+        with open(outputFilePath, 'w', newline='') as outputFile:
+            writer = csv.writer(outputFile)
+            while True:
+                if self.dataQueue.empty() and bool(self.acqComplete):
+                    outputFile.close()
+                    break
+                if not self.dataQueue.empty():
+                    data = self.dataQueue.get()
+                    writer.writerow(data)
+                    outputFile.flush()
+                else:
+                    time.sleep(0.1)
+
+    def measure(self, time: int, freq: str = None, reset: bool = False):
+        self.power_shield_conf.acquisition_time = time
+        _time, self.power_shield_conf.acquisition_time_unit = UtilityFunctions.convert_acq_time(
+            time
+        )
+
+        if reset:
+            self.__reset()
+        self.__take_control()
+        self.__set_format(self.power_shield_conf.data_format)
+        if freq is not None:
+            self.__set_frequency(freq)
+        else:
+            self.__set_frequency(self.power_shield_conf.sampling_frequency)
+        self.__set_acquisition_time(
+            UtilityFunctions.convert_to_scientific_notation(
+                time=_time, unit=self.power_shield_conf.acquisition_time_unit
+            )
+        )
+        self.__start_measurement()
+
+    def get_data(self, unit: str = PowerShieldConf.MeasureUnit.RAW_DATA):
+        if self.acqComplete:
+            # Open the CSV file
+            with open(self.power_shield_conf.output_file) as file:
+                csv_reader = csv.reader(file)
+                for row in csv_reader:
+                    self.power_shield_data.data.append(row[0])
+                if unit == PowerShieldConf.MeasureUnit.CURRENT_RMS:
+                    self.power_shield_data.current_RMS = UtilityFunctions.calculate_rms(
+                        self.power_shield_data.data
+                    )
+                    return self.power_shield_data.current_RMS
+                elif unit == PowerShieldConf.MeasureUnit.POWER:
+                    _delta_time = self.power_shield_conf.acquisition_time
+                    self.power_shield_data.power = 0
+                    for data in self.power_shield_data.data:
+                        self.power_shield_data.power += float(
+                            float(data) * float(_delta_time) * float(self.target_voltage)
+                        )
+                    return self.power_shield_data.power
+                elif unit == PowerShieldConf.MeasureUnit.RAW_DATA:
+                    return self.power_shield_data.data
+                else:
+                    logging.error("Error: Unknown unit of requested data")
+        else:
+            logging.info("Acquisition not complete.")
+        return None
diff --git a/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShieldConfig.py b/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShieldConfig.py
new file mode 100644
index 0000000000000..abd3a9d7e320c
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShieldConfig.py
@@ -0,0 +1,79 @@
+# Copyright: (c)  2025, Intel Corporation
+# Author: Arkadiusz Cholewinski <arkadiuszx.cholewinski@intel.com>
+from dataclasses import dataclass, field
+
+
+@dataclass
+class PowerShieldConf:
+    class PowerMode:
+        """
+        Class representing power mode
+        """
+
+        AUTO = "auto"  # Power-on when acquisition start
+        ON = "on"  # Power-on manually
+        OFF = "off"  # Power-off manually
+
+    class MeasureUnit:
+        """
+        Class representing measure units.
+        """
+
+        VOLTAGE = "voltage"  # Target Volatege
+        CURRENT_RMS = "current_rms"  # Current RMS value
+        POWER = "power"  # Total power consumption
+        RAW_DATA = "rawdata"  # Get Raw Data (current probes)
+
+    class TemperatureUnit:
+        """
+        Class representing temperature units.
+        """
+
+        CELSIUS = "degc"  # Celsius temperature unit
+        FAHRENHEIT = "degf"  # Fahrenheit temperature unit
+
+    class FunctionMode:
+        """
+        Class representing functional modes of a power monitor.
+        """
+
+        OPTIM = "optim"  # Optimized mode for lower power or efficiency
+        HIGH = "high"  # High performance mode
+
+    class DataFormat:
+        """
+        Class representing different data formats for representation.
+        """
+
+        ASCII_DEC = "ascii_dec"  # ASCII encoded decimal format
+        BIN_HEXA = "bin_hexa"  # Binary/hexadecimal format
+
+    class SamplingFrequency:
+        """
+        Class representing various sampling frequencies.
+        """
+
+        FREQ_100K = "100k"  # 100 kHz frequency
+        FREQ_50K = "50k"  # 50 kHz frequency
+        FREQ_20K = "20k"  # 20 kHz frequency
+        FREQ_10K = "10k"  # 10 kHz frequency
+        FREQ_5K = "5k"  # 5 kHz frequency
+        FREQ_2K = "2k"  # 2 kHz frequency
+        FREQ_1K = "1k"  # 1 kHz frequency
+        FREQ_500 = "500"  # 500 Hz frequency
+        FREQ_200 = "200"  # 200 Hz frequency
+        FREQ_100 = "100"  # 100 Hz frequency
+        FREQ_50 = "50"  # 50 Hz frequency
+        FREQ_20 = "20"  # 20 Hz frequency
+        FREQ_10 = "10"  # 10 Hz frequency
+        FREQ_5 = "5"  # 5 Hz frequency
+        FREQ_2 = "2"  # 2 Hz frequency
+        FREQ_1 = "1"  # 1 Hz frequency
+
+    output_file: str = "rawData.csv"
+    sampling_frequency: str = SamplingFrequency.FREQ_1K
+    data_format: str = DataFormat.BIN_HEXA
+    function_mode: str = FunctionMode.HIGH
+    target_voltage: str = "3300m"
+    temperature_unit: str = TemperatureUnit.CELSIUS
+    acquisition_time: str = field(default=None, init=False)
diff --git a/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShieldData.py b/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShieldData.py
new file mode 100644
index 0000000000000..db51b00b73c5a
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/stm32l562e_dk/PowerShieldData.py
@@ -0,0 +1,9 @@
+# Copyright: (c)  2025, Intel Corporation
+# Author: Arkadiusz Cholewinski <arkadiuszx.cholewinski@intel.com>
+
+
+class PowerShieldData:
+    def __init__(self):
+        self.data = []
+        self.current_RMS = None
+        self.power = None
diff --git a/scripts/pylib/power-twister-harness/stm32l562e_dk/SerialHandler.py b/scripts/pylib/power-twister-harness/stm32l562e_dk/SerialHandler.py
new file mode 100644
index 0000000000000..28812f877727d
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/stm32l562e_dk/SerialHandler.py
@@ -0,0 +1,80 @@
+# Copyright: (c)  2025, Intel Corporation
+# Author: Arkadiusz Cholewinski <arkadiuszx.cholewinski@intel.com>
+
+import logging
+import re
+
+import serial
+
+
+class SerialHandler:
+    def __init__(self, port: str, baudrate: int = 9600, timeout: float = 1.0):
+        """
+        Initializes the class for serial communication.
+
+        :param port: The serial port name (e.g., 'COM1', '/dev/ttyUSB0').
+        :param baudrate: The baud rate for the connection (default is 9600).
+        :param timeout: The timeout for read operations in seconds (default is 1.0).
+        """
+        self.port = port
+        self.baudrate = baudrate
+        self.timeout = timeout
+        self.serial_connection = None
+
+    def open(self):
+        """
+        Opens the serial connection.
+        """
+        if self.serial_connection is None:
+            try:
+                self.serial_connection = serial.Serial(
+                    self.port, self.baudrate, timeout=self.timeout
+                )
+                logging.info(
+                    "Connection to %s at %d baud opened successfully.", self.port, self.baudrate
+                )
+            except serial.SerialException as e:
+                logging.error("Error opening serial port %s: %s", self.port, str(e))
+                self.serial_connection = None
+                raise
+
+    def close(self):
+        """Closes the serial connection."""
+        if self.serial_connection and self.serial_connection.is_open:
+            self.serial_connection.close()
+            logging.info("Serial connection closed.")
+
+    def send_cmd(self, cmd: str):
+        """
+        Sends a command to the serial device with a newline, and prints it.
+
+        :param cmd: The command to be sent.
+        """
+        if self.serial_connection and self.serial_connection.is_open:
+            try:
+                self.serial_connection.write((cmd + "\r\n").encode('ascii'))
+            except serial.SerialException as e:
+                logging.error(f"Error sending command: {e}")
+
+    def read_bytes(self, count: int):
+        if self.serial_connection:
+            x = self.serial_connection.read(count)
+            return x
+
+    def receive_cmd(self) -> str:
+        """
+        Reads data from the serial device until no more data is available.
+
+        :return: The processed received data as a string.
+        """
+        output = ""
+        if self.serial_connection and self.serial_connection.is_open:
+            while True:
+                x = self.serial_connection.read()
+                if len(x) < 1 or x == 0xF0:
+                    return re.sub(r'(\0|\r|\n\n\n)', '', output).strip()
+                output += str(x, encoding='ascii', errors='ignore')
+
+    def is_open(self) -> bool:
+        """Checks if the connection is open."""
+        return self.serial_connection and self.serial_connection.is_open
diff --git a/scripts/pylib/power-twister-harness/test_power.py b/scripts/pylib/power-twister-harness/test_power.py
new file mode 100644
index 0000000000000..b6a4158525c25
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/test_power.py
@@ -0,0 +1,82 @@
+# Copyright: (c)  2024, Intel Corporation
+
+import logging
+
+import pytest
+from abstract.PowerMonitor import PowerMonitor
+from twister_harness import DeviceAdapter
+from utils.UtilityFunctions import current_RMS
+
+logger = logging.getLogger(__name__)
+
+
+@pytest.mark.parametrize("probe_class", ['stm_powershield'], indirect=True)
+def test_power_harness(probe_class: PowerMonitor, test_data, request, dut: DeviceAdapter):
+    """
+    This test measures and validates the RMS current values from the power monitor
+    and compares them against expected RMS values.
+
+    Arguments:
+    probe_class -- The Abstract class of the power monitor.
+    test_data -- Fixture to prepare data.
+    request -- Request object that provides access to test configuration.
+    dut -- The Device Under Test (DUT) that the power monitor is measuring.
+    """
+
+    # Initialize the probe with the provided path
+    probe = probe_class  # Instantiate the power monitor probe
+
+    # Get test data
+    measurements_dict = test_data
+
+    # Start the measurement process with the provided duration
+    probe.measure(time=measurements_dict['measurement_duration'])
+
+    # Retrieve the measured data
+    data = probe.get_data()
+
+    # Calculate the RMS current values using utility functions
+    rms_values_measured = current_RMS(
+        data,
+        trim=measurements_dict['elements_to_trim'],
+        num_peaks=measurements_dict['num_of_transitions'],
+        peak_distance=measurements_dict['min_peak_distance'],
+        peak_height=measurements_dict['min_peak_height'],
+        padding=measurements_dict['peak_padding'],
+    )
+
+    # # Convert measured values from amps to milliamps for comparison
+    rms_values_in_milliamps = [value * 1e4 for value in rms_values_measured]
+
+    # # Log the calculated values in milliamps for debugging purposes
+    logger.debug(f"Measured RMS values in mA: {rms_values_in_milliamps}")
+
+    tuples = zip(measurements_dict['expected_rms_values'], rms_values_in_milliamps, strict=False)
+    for expected_rms_value, measured_rms_value in tuples:
+        assert is_within_tolerance(
+            measured_rms_value, expected_rms_value, measurements_dict['tolerance_percentage']
+        )
+
+
+def is_within_tolerance(measured_rms_value, expected_rms_value, tolerance_percentage) -> bool:
+    """
+    Checks if the measured RMS value is within the acceptable tolerance.
+
+    Arguments:
+    measured_rms_value -- The measured RMS current value in milliamps.
+    expected_rms_value -- The expected RMS current value in milliamps.
+    tolerance_percentage -- The allowed tolerance as a percentage of the expected value.
+
+    Returns:
+    bool -- True if the measured value is within the tolerance, False otherwise.
+    """
+    # Calculate tolerance as a percentage of the expected value
+    tolerance = (tolerance_percentage / 100) * expected_rms_value
+
+    # Log the values for debugging purposes
+    logger.debug(f"Expected RMS: {expected_rms_value:.2f} mA")
+    logger.debug(f"Tolerance: {tolerance:.2f} mA")
+    logger.debug(f"Measured  RMS: {measured_rms_value:.2f} mA")
+
+    # Check if the measured value is within the range of expected ± tolerance
+    return (expected_rms_value - tolerance) < measured_rms_value < (expected_rms_value + tolerance)
diff --git a/scripts/pylib/power-twister-harness/utils/UtilityFunctions.py b/scripts/pylib/power-twister-harness/utils/UtilityFunctions.py
new file mode 100644
index 0000000000000..00ae294f3fa40
--- /dev/null
+++ b/scripts/pylib/power-twister-harness/utils/UtilityFunctions.py
@@ -0,0 +1,154 @@
+# Copyright: (c)  2025, Intel Corporation
+# Author: Arkadiusz Cholewinski <arkadiuszx.cholewinski@intel.com>
+
+import numpy as np
+from scipy import signal
+
+
+def convert_acq_time(value):
+    """
+    Converts an acquisition time value to a more readable format with units.
+    - Converts values to m (milli), u (micro), or leaves them as is for whole numbers.
+
+    :param value: The numeric value to convert.
+    :return: A tuple with the value and the unit as separate elements.
+    """
+    if value < 1e-3:
+        # If the value is smaller than 1 millisecond (10^-3), express in micro (u)
+        return f"{value * 1e6:.0f}", "us"
+    elif value < 1:
+        # If the value is smaller than 1 but larger than or equal to 1 milli (10^-3)
+        return f"{value * 1e3:.0f}", "ms"
+    else:
+        # If the value is 1 or larger, express in seconds (s)
+        return f"{value:.0f}", "s"
+
+
+def calculate_rms(data):
+    """
+    Calculate the Root Mean Square (RMS) of a given data array.
+
+    :param data: List or numpy array containing the data
+    :return: RMS value
+    """
+    # Convert to a numpy array for easier mathematical operations
+    data_array = np.array(data, dtype=np.float64)  # Convert to float64 to avoid type issues
+
+    # Calculate the RMS value
+    rms = np.sqrt(np.mean(np.square(data_array)))
+    return rms
+
+
+def bytes_to_twobyte_values(data):
+    value = int.from_bytes(data[0], 'big') << 8 | int.from_bytes(data[1], 'big')
+    return value
+
+
+def convert_to_amps(value):
+    """
+    Convert amps to watts
+    """
+    amps = (value & 4095) * (16 ** (0 - (value >> 12)))
+    return amps
+
+
+def convert_to_scientific_notation(time: int, unit: str) -> str:
+    """
+    Converts time to scientific notation based on the provided unit.
+    :param time: The time value to convert.
+    :param unit: The unit of the time ('us', 'ms', or 's').
+    :return: A string representing the time in scientific notation.
+    """
+    if unit == 'us':  # microseconds
+        return f"{time}-6"
+    elif unit == 'ms':  # milliseconds
+        return f"{time}-3"
+    elif unit == 's':  # seconds
+        return f"{time}"
+    else:
+        raise ValueError("Invalid unit. Use 'us', 'ms', or 's'.")
+
+
+def current_RMS(data, trim=100, num_peaks=1, peak_height=0.008, peak_distance=40, padding=40):
+    """
+    Function to process a given data array, find peaks, split data into chunks,
+    and then compute the Root Mean Square (RMS) value for each chunk. The function
+    allows for excluding the first `trim` number of data points, specifies the
+    number of peaks to consider for chunking, and allows for configurable peak
+    height and peak distance for detecting peaks.
+
+    Args:
+    - data (list or numpy array): The input data array for RMS calculation.
+    - trim (int): The number of initial elements to exclude
+    from the data before processing (default is 100).
+    - num_peaks (int): The number of peaks to consider for splitting
+    the data into chunks (default is 1).
+    - peak_height (float): The minimum height of the peaks to consider
+    when detecting them (default is 0.008).
+    - peak_distance (int): The minimum distance (in samples) between
+    consecutive peaks (default is 40).
+    - padding (int): The padding to add around the detected peaks when
+    chunking the data (default is 40).
+
+    Returns:
+    - rms_values (list): A list of RMS values calculated
+    from the data chunks based on the detected peaks.
+
+    The function will exclude the first `trim` elements of the data and look
+    for peaks that meet the specified criteria (`peak_height` and `peak_distance`).
+    The data will be split into chunks around the detected peaks, and RMS values
+    will be computed for each chunk.
+    """
+
+    # Optionally exclude the first x elements of the data
+    data = data[trim:]
+
+    # Convert the data to a list of floats for consistency
+    data = [float(x) for x in data]
+
+    # Find the peaks in the data using the `find_peaks` function
+    peaks = signal.find_peaks(data, distance=peak_distance, height=peak_height)[0]
+
+    # Check if we have enough peaks, otherwise raise an exception
+    if len(peaks) < num_peaks:
+        raise ValueError(
+            f"Not enough peaks detected. Expected at least {num_peaks}, but found {len(peaks)}."
+        )
+
+    # Limit the number of peaks based on the `num_peaks` parameter
+    peaks = peaks[:num_peaks]
+
+    # Add the start (index 0) and end (index of the last data point) to the list of peak indices
+    indices = np.concatenate(([0], np.array(peaks), [len(data)]))
+
+    # Split the data into chunks based on the peak indices
+    # with padding of 'padding' elements at both ends
+    split_data = []
+    for i in range(len(indices) - 1):
+        start_idx = indices[i] + padding
+        end_idx = indices[i + 1] - padding
+        split_data.append(data[start_idx:end_idx])
+
+    # Function to calculate RMS for a given list of data chunks
+    def calculate_rms(chunks):
+        """
+        Helper function to compute RMS values for each data chunk.
+
+        Args:
+        - chunks (list): A list of data chunks.
+
+        Returns:
+        - rms (list): A list of RMS values, one for each data chunk.
+        """
+        rms = []
+        for chunk in chunks:
+            # Calculate RMS by taking the square root of the mean of squared values
+            rms_value = np.sqrt(np.mean(np.square(chunk)))
+            rms.append(rms_value)
+        return rms
+
+    # Calculate RMS for each chunk of data
+    rms_values = calculate_rms(split_data)
+
+    # Return the calculated RMS values
+    return rms_values
diff --git a/scripts/pylib/pytest-twister-harness/README.rst b/scripts/pylib/pytest-twister-harness/README.rst
index 99e0045ee0877..81e8300d14095 100644
--- a/scripts/pylib/pytest-twister-harness/README.rst
+++ b/scripts/pylib/pytest-twister-harness/README.rst
@@ -35,7 +35,7 @@ or build shell application by west and call pytest directly:
   cd ${ZEPHYR_BASE}/samples/subsys/testsuite/pytest/shell
 
   # native_sim
-  west build -p -b native_sim -- -DCONFIG_NATIVE_UART_0_ON_STDINOUT=y
+  west build -p -b native_sim -- -DCONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
   pytest --twister-harness --device-type=native --build-dir=build -p twister_harness.plugin
 
   # QEMU
diff --git a/scripts/pylib/pytest-twister-harness/src/twister_harness/device/hardware_adapter.py b/scripts/pylib/pytest-twister-harness/src/twister_harness/device/hardware_adapter.py
index 991b347b7521f..79a3a93564481 100644
--- a/scripts/pylib/pytest-twister-harness/src/twister_harness/device/hardware_adapter.py
+++ b/scripts/pylib/pytest-twister-harness/src/twister_harness/device/hardware_adapter.py
@@ -73,6 +73,9 @@ def _prepare_runner_args(self) -> tuple[list[str], list[str]]:
             if runner == 'pyocd':
                 extra_args.append('--board-id')
                 extra_args.append(board_id)
+            elif runner == "esp32":
+                extra_args.append("--esp-device")
+                extra_args.append(board_id)
             elif runner in ('nrfjprog', 'nrfutil'):
                 extra_args.append('--dev-id')
                 extra_args.append(board_id)
diff --git a/scripts/pylib/pytest-twister-harness/src/twister_harness/device/utils.py b/scripts/pylib/pytest-twister-harness/src/twister_harness/device/utils.py
index 60ee2537bb8d5..787b4e6a72e7e 100644
--- a/scripts/pylib/pytest-twister-harness/src/twister_harness/device/utils.py
+++ b/scripts/pylib/pytest-twister-harness/src/twister_harness/device/utils.py
@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import logging
 import os
 import platform
@@ -41,11 +42,10 @@ def terminate_process(proc: subprocess.Popen) -> None:
     """
     Try to terminate provided process and all its subprocesses recursively.
     """
-    for child in psutil.Process(proc.pid).children(recursive=True):
-        try:
-            os.kill(child.pid, signal.SIGTERM)
-        except (ProcessLookupError, psutil.NoSuchProcess):
-            pass
+    with contextlib.suppress(ProcessLookupError, psutil.NoSuchProcess):
+        for child in psutil.Process(proc.pid).children(recursive=True):
+            with contextlib.suppress(ProcessLookupError, psutil.NoSuchProcess):
+                os.kill(child.pid, signal.SIGTERM)
     proc.terminate()
     # sleep for a while before attempting to kill
     time.sleep(0.5)
diff --git a/scripts/pylib/shell-twister-harness/test_shell.py b/scripts/pylib/shell-twister-harness/test_shell.py
index 0a3317329cfd0..62c224537303b 100644
--- a/scripts/pylib/shell-twister-harness/test_shell.py
+++ b/scripts/pylib/shell-twister-harness/test_shell.py
@@ -19,14 +19,19 @@ def testdata_path(request):
 def get_next_commands(testdata_path):
     with open(testdata_path) as yaml_file:
         data = yaml.safe_load(yaml_file)
-    for entry in data['test_shell_harness']:
-        yield entry['command'], entry['expected']
+    for entry in data:
+        yield entry['command'], entry.get('expected', None)
 
 
 def test_shell_harness(shell: Shell, testdata_path):
+    if not testdata_path:
+        pytest.skip('testdata not provided')
     for command, expected in get_next_commands(testdata_path):
         logger.info('send command: %s', command)
         lines = shell.exec_command(command)
+        if not expected:
+            logger.debug('no expected response')
+            continue
         match = False
         for line in lines:
             if re.match(expected, line):
diff --git a/scripts/pylib/twister/__init__.py b/scripts/pylib/twister/__init__.py
new file mode 100644
index 0000000000000..f90a0a326fe25
--- /dev/null
+++ b/scripts/pylib/twister/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
diff --git a/scripts/pylib/twister/twisterlib/__init__.py b/scripts/pylib/twister/twisterlib/__init__.py
new file mode 100644
index 0000000000000..f90a0a326fe25
--- /dev/null
+++ b/scripts/pylib/twister/twisterlib/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
diff --git a/scripts/pylib/twister/twisterlib/config_parser.py b/scripts/pylib/twister/twisterlib/config_parser.py
index e5a379d0445de..738fa8285b406 100644
--- a/scripts/pylib/twister/twisterlib/config_parser.py
+++ b/scripts/pylib/twister/twisterlib/config_parser.py
@@ -5,18 +5,21 @@
 
 import copy
 import warnings
+from typing import Any
 
 import scl
 from twisterlib.error import ConfigurationError
 
 
-def extract_fields_from_arg_list(target_fields: set, arg_list: str | list):
+def extract_fields_from_arg_list(
+    target_fields: set, arg_list: str | list
+ ) -> tuple[dict[str, list[str]], list[str]]:
     """
     Given a list of "FIELD=VALUE" args, extract values of args with a
     given field name and return the remaining args separately.
     """
-    extracted_fields = {f : list() for f in target_fields}
-    other_fields = []
+    extracted_fields: dict[str, list[str]] = {f: list() for f in target_fields}
+    other_fields: list[str] = []
 
     if isinstance(arg_list, str):
         args = arg_list.strip().split()
@@ -39,64 +42,66 @@ def extract_fields_from_arg_list(target_fields: set, arg_list: str | list):
 
     return extracted_fields, other_fields
 
+
 class TwisterConfigParser:
     """Class to read testsuite yaml files with semantic checking
     """
 
-    testsuite_valid_keys = {"tags": {"type": "set", "required": False},
-                       "type": {"type": "str", "default": "integration"},
-                       "extra_args": {"type": "list"},
-                       "extra_configs": {"type": "list"},
-                       "extra_conf_files": {"type": "list", "default": []},
-                       "extra_overlay_confs" : {"type": "list", "default": []},
-                       "extra_dtc_overlay_files": {"type": "list", "default": []},
-                       "required_snippets": {"type": "list"},
-                       "build_only": {"type": "bool", "default": False},
-                       "build_on_all": {"type": "bool", "default": False},
-                       "skip": {"type": "bool", "default": False},
-                       "slow": {"type": "bool", "default": False},
-                       "timeout": {"type": "int", "default": 60},
-                       "min_ram": {"type": "int", "default": 16},
-                       "modules": {"type": "list", "default": []},
-                       "depends_on": {"type": "set"},
-                       "min_flash": {"type": "int", "default": 32},
-                       "arch_allow": {"type": "set"},
-                       "arch_exclude": {"type": "set"},
-                       "vendor_allow": {"type": "set"},
-                       "vendor_exclude": {"type": "set"},
-                       "extra_sections": {"type": "list", "default": []},
-                       "integration_platforms": {"type": "list", "default": []},
-                       "integration_toolchains": {"type": "list", "default": []},
-                       "ignore_faults": {"type": "bool", "default": False },
-                       "ignore_qemu_crash": {"type": "bool", "default": False },
-                       "testcases": {"type": "list", "default": []},
-                       "platform_type": {"type": "list", "default": []},
-                       "platform_exclude": {"type": "set"},
-                       "platform_allow": {"type": "set"},
-                       "platform_key": {"type": "list", "default": []},
-                       "simulation_exclude": {"type": "list", "default": []},
-                       "toolchain_exclude": {"type": "set"},
-                       "toolchain_allow": {"type": "set"},
-                       "filter": {"type": "str"},
-                       "levels": {"type": "list", "default": []},
-                       "harness": {"type": "str", "default": "test"},
-                       "harness_config": {"type": "map", "default": {}},
-                       "seed": {"type": "int", "default": 0},
-                       "sysbuild": {"type": "bool", "default": False}
-                       }
-
-    def __init__(self, filename, schema):
+    testsuite_valid_keys: dict[str, dict[str, Any]] = {
+        "tags": {"type": "set", "required": False},
+        "type": {"type": "str", "default": "integration"},
+        "extra_args": {"type": "list"},
+        "extra_configs": {"type": "list"},
+        "extra_conf_files": {"type": "list", "default": []},
+        "extra_overlay_confs": {"type": "list", "default": []},
+        "extra_dtc_overlay_files": {"type": "list", "default": []},
+        "required_snippets": {"type": "list"},
+        "build_only": {"type": "bool", "default": False},
+        "build_on_all": {"type": "bool", "default": False},
+        "skip": {"type": "bool", "default": False},
+        "slow": {"type": "bool", "default": False},
+        "timeout": {"type": "int", "default": 60},
+        "min_ram": {"type": "int", "default": 16},
+        "modules": {"type": "list", "default": []},
+        "depends_on": {"type": "set"},
+        "min_flash": {"type": "int", "default": 32},
+        "arch_allow": {"type": "set"},
+        "arch_exclude": {"type": "set"},
+        "vendor_allow": {"type": "set"},
+        "vendor_exclude": {"type": "set"},
+        "extra_sections": {"type": "list", "default": []},
+        "integration_platforms": {"type": "list", "default": []},
+        "integration_toolchains": {"type": "list", "default": []},
+        "ignore_faults": {"type": "bool", "default": False},
+        "ignore_qemu_crash": {"type": "bool", "default": False},
+        "testcases": {"type": "list", "default": []},
+        "platform_type": {"type": "list", "default": []},
+        "platform_exclude": {"type": "set"},
+        "platform_allow": {"type": "set"},
+        "platform_key": {"type": "list", "default": []},
+        "simulation_exclude": {"type": "list", "default": []},
+        "toolchain_exclude": {"type": "set"},
+        "toolchain_allow": {"type": "set"},
+        "filter": {"type": "str"},
+        "levels": {"type": "list", "default": []},
+        "harness": {"type": "str", "default": "test"},
+        "harness_config": {"type": "map", "default": {}},
+        "seed": {"type": "int", "default": 0},
+        "sysbuild": {"type": "bool", "default": False}
+    }
+
+    def __init__(self, filename: str, schema: dict[str, Any]) -> None:
         """Instantiate a new TwisterConfigParser object
 
         @param filename Source .yaml file to read
         """
-        self.data = {}
         self.schema = schema
         self.filename = filename
-        self.scenarios = {}
-        self.common = {}
+        self.data: dict[str, Any] = {}
+        self.scenarios: dict[str, Any] = {}
+        self.common: dict[str, Any] = {}
 
-    def load(self):
+    def load(self) -> dict[str, Any]:
         data = scl.yaml_load_verify(self.filename, self.schema)
         self.data = data
 
@@ -106,7 +111,7 @@ def load(self):
             self.common = self.data['common']
         return data
 
-    def _cast_value(self, value, typestr):
+    def _cast_value(self, value: Any, typestr: str) -> Any:
         if typestr == "str":
             return value.strip()
 
@@ -142,7 +147,7 @@ def _cast_value(self, value, typestr):
         else:
             raise ConfigurationError(self.filename, f"unknown type '{value}'")
 
-    def get_scenario(self, name):
+    def get_scenario(self, name: str) -> dict[str, Any]:
         """Get a dictionary representing the keys/values within a scenario
 
         @param name The scenario in the .yaml file to retrieve data from
@@ -152,10 +157,10 @@ def get_scenario(self, name):
 
         # "CONF_FILE", "OVERLAY_CONFIG", and "DTC_OVERLAY_FILE" fields from each
         # of the extra_args lines
-        extracted_common = {}
-        extracted_testsuite = {}
+        extracted_common: dict = {}
+        extracted_testsuite: dict = {}
 
-        d = {}
+        d: dict[str, Any] = {}
         for k, v in self.common.items():
             if k == "extra_args":
                 # Pull out these fields and leave the rest
@@ -223,7 +228,7 @@ def get_scenario(self, name):
             self.scenarios[name].get("extra_dtc_overlay_files", [])
 
         if any({len(x) > 0 for x in extracted_common.values()}) or \
-           any({len(x) > 0 for x in extracted_testsuite.values()}):
+            any({len(x) > 0 for x in extracted_testsuite.values()}):
             warnings.warn(
                 "Do not specify CONF_FILE, OVERLAY_CONFIG, or DTC_OVERLAY_FILE "
                 "in extra_args. This feature is deprecated and will soon "
diff --git a/scripts/pylib/twister/twisterlib/coverage.py b/scripts/pylib/twister/twisterlib/coverage.py
index 3ae14a50131cc..3aba6705a8a4a 100644
--- a/scripts/pylib/twister/twisterlib/coverage.py
+++ b/scripts/pylib/twister/twisterlib/coverage.py
@@ -15,7 +15,6 @@
 import tempfile
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 supported_coverage_formats = {
     "gcovr": ["html", "xml", "csv", "txt", "coveralls", "sonarqube"],
diff --git a/scripts/pylib/twister/twisterlib/environment.py b/scripts/pylib/twister/twisterlib/environment.py
index 4aae6e39f3905..ba0c9737a8cfa 100644
--- a/scripts/pylib/twister/twisterlib/environment.py
+++ b/scripts/pylib/twister/twisterlib/environment.py
@@ -27,7 +27,6 @@
 from twisterlib.log_helper import log_command
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 ZEPHYR_BASE = os.getenv("ZEPHYR_BASE")
 if not ZEPHYR_BASE:
@@ -134,7 +133,7 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
         "--load-tests",
         metavar="FILENAME",
         action="store",
-        help="Load a list of tests and platforms to be run"
+        help="Load a list of tests and platforms to be run "
              "from a JSON file ('testplan.json' schema)."
     )
 
@@ -235,7 +234,7 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
 
     test_or_build.add_argument(
         "--prep-artifacts-for-testing", action="store_true",
-        help="Generate artifacts for testing, do not attempt to run the"
+        help="Generate artifacts for testing, do not attempt to run the "
               "code on targets.")
 
     parser.add_argument(
@@ -411,7 +410,7 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
     )
 
     parser.add_argument("--level", action="store",
-        help="Test level to be used. By default, no levels are used for filtering"
+        help="Test level to be used. By default, no levels are used for filtering "
              "and do the selection based on existing filters.")
 
     parser.add_argument(
@@ -483,12 +482,6 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
         action="store_true",
         help="Collect and report ROM/RAM section sizes for each test image built.")
 
-    parser.add_argument(
-        "--disable-unrecognized-section-test",
-        action="store_true",
-        default=False,
-        help="Don't error on unrecognized sections in the binary images.")
-
     footprint_group.add_argument(
         "--footprint-from-buildlog",
         action = "store_true",
@@ -578,6 +571,11 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
         which only removes artifacts of passing tests. If you wish to
         remove all artificats including those of failed tests, use 'all'.""")
 
+    parser.add_argument(
+        "--keep-artifacts", action="append", default=[],
+        help="""Keep specified artifacts when cleaning up at runtime. Multiple invocations
+        are possible."""
+    )
     test_xor_generator.add_argument(
         "-N", "--ninja", action="store_true",
         default=not any(a in sys.argv for a in ("-k", "--make")),
@@ -624,7 +622,7 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
 
     parser.add_argument(
         "--detailed-skipped-report", action="store_true",
-        help="Generate a detailed report with all skipped test cases"
+        help="Generate a detailed report with all skipped test cases "
              "including those that are filtered based on testsuite definition."
         )
 
@@ -696,7 +694,7 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
     parser.add_argument(
         "--quarantine-verify",
         action="store_true",
-        help="Use the list of test scenarios under quarantine and run them"
+        help="Use the list of test scenarios under quarantine and run them "
              "to verify their current status.")
 
     parser.add_argument(
diff --git a/scripts/pylib/twister/twisterlib/error.py b/scripts/pylib/twister/twisterlib/error.py
index 26180653a9514..7a88a5d9d541b 100644
--- a/scripts/pylib/twister/twisterlib/error.py
+++ b/scripts/pylib/twister/twisterlib/error.py
@@ -6,7 +6,7 @@
 import traceback
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
+
 
 class TwisterException(Exception):
     def __init__(self, message="TwisterException"):
diff --git a/scripts/pylib/twister/twisterlib/handlers.py b/scripts/pylib/twister/twisterlib/handlers.py
index 5b3922f9de794..dc1ff2589356c 100755
--- a/scripts/pylib/twister/twisterlib/handlers.py
+++ b/scripts/pylib/twister/twisterlib/handlers.py
@@ -47,7 +47,6 @@
         raise capture_error
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 
 def terminate_process(proc):
@@ -59,9 +58,10 @@ def terminate_process(proc):
     so we need to use try_kill_process_by_pid.
     """
 
-    for child in psutil.Process(proc.pid).children(recursive=True):
-        with contextlib.suppress(ProcessLookupError, psutil.NoSuchProcess):
-            os.kill(child.pid, signal.SIGTERM)
+    with contextlib.suppress(ProcessLookupError, psutil.NoSuchProcess):
+        for child in psutil.Process(proc.pid).children(recursive=True):
+            with contextlib.suppress(ProcessLookupError, psutil.NoSuchProcess):
+                os.kill(child.pid, signal.SIGTERM)
     proc.terminate()
     # sleep for a while before attempting to kill
     time.sleep(0.5)
@@ -565,14 +565,13 @@ def _create_command(self, runner, hardware):
 
                 board_id = hardware.probe_id or hardware.id
                 product = hardware.product
-                serial_port = hardware.serial
                 if board_id is not None:
                     if runner in ("pyocd", "nrfjprog", "nrfutil"):
                         command_extra_args.append("--dev-id")
                         command_extra_args.append(board_id)
                     elif runner == "esp32":
                         command_extra_args.append("--esp-device")
-                        command_extra_args.append(serial_port)
+                        command_extra_args.append(board_id)
                     elif (
                         runner == "openocd"
                         and product == "STM32 STLink"
diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
index 1121301c577cb..d3308b8cbe3fb 100644
--- a/scripts/pylib/twister/twisterlib/hardwaremap.py
+++ b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -30,7 +30,6 @@
     print("Install tabulate python module with pip to use --device-testing option.")
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 
 class DUT:
@@ -383,6 +382,9 @@ def readlink(link):
                 logger.warning(f"Unsupported device ({d.manufacturer}): {d}")
 
     def save(self, hwm_file):
+        # list of board ids with boot-serial sequence
+        boot_ids = []
+
         # use existing map
         self.detected = natsorted(self.detected, key=lambda x: x.serial or '')
         if os.path.exists(hwm_file):
@@ -391,10 +393,13 @@ def save(self, hwm_file):
                 if hwm:
                     hwm.sort(key=lambda x: x.get('id', ''))
 
-                    # disconnect everything
+                    # disconnect everything except boards with boot-serial sequence
                     for h in hwm:
-                        h['connected'] = False
-                        h['serial'] = None
+                        if h['product'] != 'BOOT-SERIAL' :
+                            h['connected'] = False
+                            h['serial'] = None
+                        else :
+                            boot_ids.append(h['id'])
 
                     for _detected in self.detected:
                         for h in hwm:
@@ -419,6 +424,11 @@ def save(self, hwm_file):
                 else:
                     hwm = new
 
+            #remove duplicated devices with unknown platform names before saving the file
+            for h in hwm :
+                if h['id'] in boot_ids and h['platform'] == 'unknown':
+                    hwm.remove(h)
+
             with open(hwm_file, 'w') as yaml_file:
                 yaml.dump(hwm, yaml_file, Dumper=Dumper, default_flow_style=False)
 
diff --git a/scripts/pylib/twister/twisterlib/harness.py b/scripts/pylib/twister/twisterlib/harness.py
index dae3531a03ae5..33120ccf7aaef 100644
--- a/scripts/pylib/twister/twisterlib/harness.py
+++ b/scripts/pylib/twister/twisterlib/harness.py
@@ -17,6 +17,7 @@
 from enum import Enum
 
 import junitparser.junitparser as junit
+import yaml
 from pytest import ExitCode
 from twisterlib.constants import SUPPORTED_SIMS_IN_PYTEST
 from twisterlib.environment import PYTEST_PLUGIN_INSTALLED, ZEPHYR_BASE
@@ -27,7 +28,6 @@
 from twisterlib.testinstance import TestInstance
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 _WINDOWS = platform.system() == 'Windows'
 
@@ -91,6 +91,7 @@ def configure(self, instance):
         config = instance.testsuite.harness_config
         self.id = instance.testsuite.id
         self.run_id = instance.run_id
+        self.expect_reboot = getattr(instance.testsuite, 'expect_reboot', False)
         if instance.testsuite.ignore_faults:
             self.fail_on_fault = False
 
@@ -196,7 +197,7 @@ def handle(self, line):
         ''' Test cases that make use of this harness care about results given
             by Robot Framework which is called in run_robot_test(), so works of this
             handle is trying to give a PASS or FAIL to avoid timeout, nothing
-            is writen into handler.log
+            is written into handler.log
         '''
         self.instance.status = TwisterStatus.PASS
         tc = self.instance.get_case_or_create(self.id)
@@ -628,6 +629,7 @@ def _parse_report_file(self, report):
             self.status = TwisterStatus.SKIP
             self.instance.reason = 'No tests collected'
 
+
 class Shell(Pytest):
     def generate_command(self):
         config = self.instance.testsuite.harness_config
@@ -635,11 +637,38 @@ def generate_command(self):
         config['pytest_root'] = pytest_root
 
         command = super().generate_command()
-        if config.get('shell_params_file'):
-            p_file = os.path.join(self.source_dir, config.get('shell_params_file'))
-            command.append(f'--testdata={p_file}')
+        if test_shell_file := self._get_shell_commands_file(config):
+            command.append(f'--testdata={test_shell_file}')
         else:
-            command.append(f'--testdata={os.path.join(self.source_dir, "test_shell.yml")}')
+            logger.warning('No shell commands provided')
+        return command
+
+    def _get_shell_commands_file(self, harness_config):
+        if shell_commands := harness_config.get('shell_commands'):
+            test_shell_file = os.path.join(self.running_dir, 'test_shell.yml')
+            with open(test_shell_file, 'w') as f:
+                yaml.dump(shell_commands, f)
+            return test_shell_file
+
+        test_shell_file = harness_config.get('shell_commands_file', 'test_shell.yml')
+        test_shell_file = os.path.join(
+            self.source_dir, os.path.expanduser(os.path.expandvars(test_shell_file))
+        )
+        if os.path.exists(test_shell_file):
+            return test_shell_file
+        return None
+
+class Power(Pytest):
+    def generate_command(self):
+        config = self.instance.testsuite.harness_config
+        pytest_root = [os.path.join(ZEPHYR_BASE, 'scripts', 'pylib', 'power-twister-harness')]
+        config['pytest_root'] = pytest_root
+
+        command = super().generate_command()
+
+        if self.instance.testsuite.harness == 'power':
+            measurements = config.get('power_measurements')
+            command.append(f'--testdata={measurements}')
         return command
 
 class Gtest(Harness):
@@ -757,6 +786,9 @@ def _check_result(self, line):
 class Test(Harness):
     __test__ = False  # for pytest to skip this class when collects tests
 
+    # Ztest log patterns don't require to match the line start exactly: there are platforms
+    # where there is some logging prefix at each console line whereas on other platforms
+    # without prefixes the leading space is stripped.
     test_suite_start_pattern = re.compile(r"Running TESTSUITE (?P<suite_name>\S*)")
     test_suite_end_pattern = re.compile(
         r"TESTSUITE (?P<suite_name>\S*)\s+(?P<suite_status>succeeded|failed)"
@@ -770,7 +802,7 @@ class Test(Harness):
         r" .* duration = (\d*[.,]?\d*) seconds"
     )
     test_case_summary_pattern = re.compile(
-        r" - (PASS|FAIL|SKIP) - \[([^\.]*).(test_)?(\S*)\] duration = (\d*[.,]?\d*) seconds"
+        r".*- (PASS|FAIL|SKIP) - \[([^\.]*).(test_)?(\S*)\] duration = (\d*[.,]?\d*) seconds"
     )
 
 
@@ -817,7 +849,7 @@ def start_suite(self, suite_name, phase='TS_START'):
             logger.debug(f"{phase}: unexpected Ztest suite '{suite_name}' is "
                          f"not present among: {self.instance.testsuite.ztest_suite_names}")
         if suite_name in self.started_suites:
-            if self.started_suites[suite_name]['count'] > 0:
+            if self.started_suites[suite_name]['count'] > 0 and not self.expect_reboot:
                 # Either the suite restarts itself or unexpected state transition.
                 logger.warning(f"{phase}: already STARTED '{suite_name}':"
                                f"{self.started_suites[suite_name]}")
@@ -847,7 +879,7 @@ def end_suite(self, suite_name, phase='TS_END', suite_status=None):
 
     def start_case(self, tc_name, phase='TC_START'):
         if tc_name in self.started_cases:
-            if self.started_cases[tc_name]['count'] > 0:
+            if self.started_cases[tc_name]['count'] > 0 and not self.expect_reboot:
                 logger.warning(f"{phase}: already STARTED case "
                                f"'{tc_name}':{self.started_cases[tc_name]}")
             self.started_cases[tc_name]['count'] += 1
@@ -868,17 +900,16 @@ def end_case(self, tc_name, phase='TC_END'):
         elif phase != 'TS_SUM':
             logger.warning(f"{phase}: END case '{tc_name}' without START detected")
 
-
     def handle(self, line):
         testcase_match = None
         if self._match:
             self.testcase_output += line + "\n"
-
         if test_suite_start_match := re.search(self.test_suite_start_pattern, line):
             self.start_suite(test_suite_start_match.group("suite_name"))
         elif test_suite_end_match := re.search(self.test_suite_end_pattern, line):
             suite_name=test_suite_end_match.group("suite_name")
             self.end_suite(suite_name)
+            self.ztest = True
         elif testcase_match := re.search(self.test_case_start_pattern, line):
             tc_name = testcase_match.group(2)
             tc = self.get_testcase(tc_name, 'TC_START')
@@ -919,6 +950,11 @@ def handle(self, line):
             tc_name = test_case_summary_match.group(4)
             tc = self.get_testcase(tc_name, 'TS_SUM', suite_name)
             self.end_case(tc.name, 'TS_SUM')
+            if tc.status not in [TwisterStatus.NONE, TwisterStatus[matched_status]]:
+                # TestCase miss its END log entry, so its status is from the Suite summary.
+                logger.warning(
+                    f"TS_SUM: {tc.name} force status: {tc.status}->{TwisterStatus[matched_status]}"
+                )
             tc.status = TwisterStatus[matched_status]
             if tc.status == TwisterStatus.SKIP:
                 tc.reason = "ztest skip"
@@ -932,7 +968,7 @@ def handle(self, line):
         self.process_test(line)
 
         if not self.ztest and self.status != TwisterStatus.NONE:
-            logger.debug(f"not a ztest and no state for {self.id}")
+            logger.debug(f"{self.id} is not a Ztest, status:{self.status}")
             tc = self.instance.get_case_or_create(self.id)
             if self.status == TwisterStatus.PASS:
                 tc.status = TwisterStatus.PASS
diff --git a/scripts/pylib/twister/twisterlib/jobserver.py b/scripts/pylib/twister/twisterlib/jobserver.py
index f66e6b08db01c..cd08eabf0d2b9 100644
--- a/scripts/pylib/twister/twisterlib/jobserver.py
+++ b/scripts/pylib/twister/twisterlib/jobserver.py
@@ -14,7 +14,7 @@
 import sys
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
+
 
 class JobHandle:
     """Small object to handle claim of a job."""
diff --git a/scripts/pylib/twister/twisterlib/log_helper.py b/scripts/pylib/twister/twisterlib/log_helper.py
index 3604f64ce1e45..a92d4edacef22 100644
--- a/scripts/pylib/twister/twisterlib/log_helper.py
+++ b/scripts/pylib/twister/twisterlib/log_helper.py
@@ -5,10 +5,13 @@
 Common code used when logging that is needed by multiple modules.
 '''
 
+import logging
+import os
 import platform
 import shlex
 
-_WINDOWS = (platform.system() == 'Windows')
+_WINDOWS = platform.system() == 'Windows'
+
 
 def log_command(logger, msg, args):
     '''Platform-independent helper for logging subprocess invocations.
@@ -20,8 +23,59 @@ def log_command(logger, msg, args):
     :param msg: message to associate with the command
     :param args: argument list as passed to subprocess module
     '''
+    logger = logging.getLogger("twister")
+    logger.setLevel(logging.DEBUG)
+
     msg = f'{msg}: %s'
     if _WINDOWS:
         logger.debug(msg, str(args))
     else:
         logger.debug(msg, shlex.join(args))
+
+def setup_logging(outdir, log_file, log_level, timestamps):
+    logger = logging.getLogger("twister")
+    logger.setLevel(logging.DEBUG)
+
+    # create file handler which logs even debug messages
+    if log_file:
+        file_handler = logging.FileHandler(log_file)
+    else:
+        file_handler = logging.FileHandler(os.path.join(outdir, "twister.log"))
+
+    file_handler.setLevel(logging.DEBUG)
+
+    # create console handler with a higher log level
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(getattr(logging, log_level))
+
+    # create formatter and add it to the handlers
+    if timestamps:
+        formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
+    else:
+        formatter = logging.Formatter("%(levelname)-7s - %(message)s")
+
+    formatter_file = logging.Formatter(
+        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    )
+    console_handler.setFormatter(formatter)
+    file_handler.setFormatter(formatter_file)
+
+    # add the handlers to logger
+    logger.addHandler(console_handler)
+    logger.addHandler(file_handler)
+
+
+def close_logging():
+    logger = logging.getLogger("twister")
+    handlers = logger.handlers[:]
+
+    for handler in handlers:
+        logger.removeHandler(handler)
+        handler.close()
+
+    loggers = [logging.getLogger(name) for name in logging.root.manager.loggerDict]
+    for logg in loggers:
+        handls = logg.handlers[:]
+        for handl in handls:
+            logg.removeHandler(handl)
+            handl.close()
diff --git a/scripts/pylib/twister/twisterlib/platform.py b/scripts/pylib/twister/twisterlib/platform.py
index 3be5ba5cc28f6..b19f908b9154c 100644
--- a/scripts/pylib/twister/twisterlib/platform.py
+++ b/scripts/pylib/twister/twisterlib/platform.py
@@ -9,13 +9,15 @@
 import logging
 import os
 import shutil
+from argparse import Namespace
+from itertools import groupby
 
+import list_boards
 import scl
 from twisterlib.constants import SUPPORTED_SIMS
 from twisterlib.environment import ZEPHYR_BASE
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 
 class Simulator:
@@ -70,6 +72,7 @@ def __init__(self):
         # if no flash size is specified by the board, take a default of 512K
         self.flash = 512
         self.supported = set()
+        self.binaries = []
 
         self.arch = None
         self.vendor = ""
@@ -83,28 +86,18 @@ def __init__(self):
         self.filter_data = dict()
         self.uart = ""
         self.resc = ""
-        self.qualifier = None
 
-    def load(self, board, target, aliases, data):
+    def load(self, board, target, aliases, data, variant_data):
         """Load the platform data from the board data and target data
         board: the board object as per the zephyr build system
         target: the target name of the board as per the zephyr build system
         aliases: list of aliases for the target
-        data: the data from the twister.yaml file for the target
+        data: the default data from the twister.yaml file for the board
+        variant_data: the target-specific data to replace the default data
         """
         self.name = target
         self.aliases = aliases
 
-        # Get data for various targets and use the main board data as a
-        # defauly. Individual variant information will replace the default data
-        # provded in the main twister configuration for this board.
-        variants = data.get("variants", {})
-        variant_data = {}
-        for alias in aliases:
-            variant_data = variants.get(alias, {})
-            if variant_data:
-                break
-
         self.normalized_name = self.name.replace("/", "_")
         self.sysbuild = variant_data.get("sysbuild", data.get("sysbuild", self.sysbuild))
         self.twister = variant_data.get("twister", data.get("twister", self.twister))
@@ -114,15 +107,24 @@ def load(self, board, target, aliases, data):
         # if no flash size is specified by the board, take a default of 512K
         self.flash = variant_data.get("flash", data.get("flash", self.flash))
 
-        testing = variant_data.get("testing", data.get("testing", {}))
-        self.timeout_multiplier = testing.get("timeout_multiplier", self.timeout_multiplier)
-        self.ignore_tags = testing.get("ignore_tags", self.ignore_tags)
-        self.only_tags = testing.get("only_tags", self.only_tags)
+        testing = data.get("testing", {})
+        self.ignore_tags = testing.get("ignore_tags", [])
+        self.only_tags = testing.get("only_tags", [])
         self.default = testing.get("default", self.default)
         self.binaries = testing.get("binaries", [])
+        self.timeout_multiplier = testing.get("timeout_multiplier", self.timeout_multiplier)
+
+        # testing data for variant
+        testing_var = variant_data.get("testing", data.get("testing", {}))
+        self.timeout_multiplier = testing_var.get("timeout_multiplier", self.timeout_multiplier)
+        self.ignore_tags = testing_var.get("ignore_tags", self.ignore_tags)
+        self.only_tags = testing_var.get("only_tags", self.only_tags)
+        self.default = testing_var.get("default", self.default)
+        self.binaries = testing_var.get("binaries", self.binaries)
         renode = testing.get("renode", {})
         self.uart = renode.get("uart", "")
         self.resc = renode.get("resc", "")
+
         self.supported = set()
         for supp_feature in variant_data.get("supported", data.get("supported", [])):
             for item in supp_feature.split(":"):
@@ -184,3 +186,116 @@ def simulator_by_name(self, sim_name: str | None) -> Simulator | None:
 
     def __repr__(self):
         return f"<{self.name} on {self.arch}>"
+
+
+def generate_platforms(board_roots, soc_roots, arch_roots):
+    """Initialize and yield all Platform instances.
+
+    Using the provided board/soc/arch roots, determine the available
+    platform names and load the test platform description files.
+
+    An exception is raised if not all platform files are valid YAML,
+    or if not all platform names are unique.
+    """
+    alias2target = {}
+    target2board = {}
+    target2data = {}
+    dir2data = {}
+    legacy_files = []
+
+    lb_args = Namespace(board_roots=board_roots, soc_roots=soc_roots, arch_roots=arch_roots,
+                        board=None, board_dir=None)
+
+    for board in list_boards.find_v2_boards(lb_args).values():
+        for board_dir in board.directories:
+            if board_dir in dir2data:
+                # don't load the same board data twice
+                continue
+            file = board_dir / "twister.yaml"
+            if file.is_file():
+                data = scl.yaml_load_verify(file, Platform.platform_schema)
+            else:
+                data = None
+            dir2data[board_dir] = data
+
+            legacy_files.extend(
+                file for file in board_dir.glob("*.yaml") if file.name != "twister.yaml"
+            )
+
+        for qual in list_boards.board_v2_qualifiers(board):
+            if board.revisions:
+                for rev in board.revisions:
+                    if rev.name:
+                        target = f"{board.name}@{rev.name}/{qual}"
+                        alias2target[target] = target
+                        if rev.name == board.revision_default:
+                            alias2target[f"{board.name}/{qual}"] = target
+                        if '/' not in qual and len(board.socs) == 1:
+                            if rev.name == board.revision_default:
+                                alias2target[f"{board.name}"] = target
+                            alias2target[f"{board.name}@{rev.name}"] = target
+                    else:
+                        target = f"{board.name}/{qual}"
+                        alias2target[target] = target
+                        if '/' not in qual and len(board.socs) == 1 \
+                                and rev.name == board.revision_default:
+                            alias2target[f"{board.name}"] = target
+
+                    target2board[target] = board
+            else:
+                target = f"{board.name}/{qual}"
+                alias2target[target] = target
+                if '/' not in qual and len(board.socs) == 1:
+                    alias2target[board.name] = target
+                target2board[target] = board
+
+    for board_dir, data in dir2data.items():
+        if data is None:
+            continue
+        # Separate the default and variant information in the loaded board data.
+        # The default (top-level) data can be shared by multiple board targets;
+        # it will be overlaid by the variant data (if present) for each target.
+        variant_data = data.pop("variants", {})
+        for variant in variant_data:
+            target = alias2target.get(variant)
+            if target is None:
+                continue
+            if target in target2data:
+                logger.error(f"Duplicate platform {target} in {board_dir}")
+                raise Exception(f"Duplicate platform identifier {target} found")
+            target2data[target] = variant_data[variant]
+
+    # note: this inverse mapping will only be used for loading legacy files
+    target2aliases = {}
+
+    for target, aliases in groupby(alias2target, alias2target.get):
+        aliases = list(aliases)
+        board = target2board[target]
+
+        # Default board data always comes from the primary 'board.dir'.
+        # Other 'board.directories' can only supply variant data.
+        data = dir2data[board.dir]
+        if data is not None:
+            variant_data = target2data.get(target, {})
+
+            platform = Platform()
+            platform.load(board, target, aliases, data, variant_data)
+            yield platform
+
+        target2aliases[target] = aliases
+
+    for file in legacy_files:
+        data = scl.yaml_load_verify(file, Platform.platform_schema)
+        target = alias2target.get(data.get("identifier"))
+        if target is None:
+            continue
+
+        board = target2board[target]
+        if dir2data[board.dir] is not None:
+            # all targets are already loaded for this board
+            logger.error(f"Duplicate platform {target} in {file.parent}")
+            raise Exception(f"Duplicate platform identifier {target} found")
+
+        platform = Platform()
+        platform.load(board, target, target2aliases[target], data, variant_data={})
+        yield platform
diff --git a/scripts/pylib/twister/twisterlib/py.typed b/scripts/pylib/twister/twisterlib/py.typed
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/scripts/pylib/twister/twisterlib/reports.py b/scripts/pylib/twister/twisterlib/reports.py
index 2131c38a0ddb4..c9eccbf9cae8a 100644
--- a/scripts/pylib/twister/twisterlib/reports.py
+++ b/scripts/pylib/twister/twisterlib/reports.py
@@ -17,7 +17,6 @@
 from twisterlib.statuses import TwisterStatus
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 
 class ReportStatus(str, Enum):
@@ -372,7 +371,6 @@ def json_report(self, filename, version="NA", platform=None, filters=None):
                 suite["available_rom"] = available_rom
             if instance.status in [TwisterStatus.ERROR, TwisterStatus.FAIL]:
                 suite['status'] = instance.status
-                suite["reason"] = instance.reason
                 # FIXME
                 if os.path.exists(pytest_log):
                     suite["log"] = self.process_log(pytest_log)
@@ -382,6 +380,11 @@ def json_report(self, filename, version="NA", platform=None, filters=None):
                     suite["log"] = self.process_log(device_log)
                 else:
                     suite["log"] = self.process_log(build_log)
+
+                suite["reason"] = self.get_detailed_reason(instance.reason, suite["log"])
+                # update the reason to get more details also in other reports (e.g. junit)
+                # where build log is not available
+                instance.reason = suite["reason"]
             elif instance.status == TwisterStatus.FILTER:
                 suite["status"] = TwisterStatus.FILTER
                 suite["reason"] = instance.reason
@@ -629,19 +632,12 @@ def synopsis(self):
             )
             logger.info("-+" * 40)
 
-    def summary(self, results, ignore_unrecognized_sections, duration):
+    def summary(self, results, duration):
         failed = 0
         run = 0
         for instance in self.instances.values():
             if instance.status == TwisterStatus.FAIL:
                 failed += 1
-            elif not ignore_unrecognized_sections and instance.metrics.get("unrecognized"):
-                logger.error(
-                    f"{Fore.RED}FAILED{Fore.RESET}:"
-                    f" {instance.name} has unrecognized binary sections:"
-                    f" {instance.metrics.get('unrecognized', [])!s}"
-                )
-                failed += 1
 
             # FIXME: need a better way to identify executed tests
             handler_time = instance.metrics.get('handler_time', 0)
@@ -798,3 +794,55 @@ def target_report(self, json_file, outdir, suffix):
                 self.json_report(json_platform_file + "_footprint.json",
                                  version=self.env.version, platform=platform.name,
                                  filters=self.json_filters['footprint.json'])
+
+    def get_detailed_reason(self, reason: str, log: str) -> str:
+        if reason == 'CMake build failure':
+            if error_key := self._parse_cmake_build_failure(log):
+                return f"{reason} - {error_key}"
+        elif reason == 'Build failure':  # noqa SIM102
+            if error_key := self._parse_build_failure(log):
+                return f"{reason} - {error_key}"
+        return reason
+
+    @staticmethod
+    def _parse_cmake_build_failure(log: str) -> str | None:
+        last_warning = 'no warning found'
+        lines = log.splitlines()
+        for i, line in enumerate(lines):
+            if "warning: " in line:
+                last_warning = line
+            elif "devicetree error: " in line:
+                return "devicetree error"
+            elif "fatal error: " in line:
+                return line[line.index('fatal error: ') :].strip()
+            elif "error: " in line:  # error: Aborting due to Kconfig warnings
+                if "undefined symbol" in last_warning:
+                    return last_warning[last_warning.index('undefined symbol') :].strip()
+                return last_warning
+            elif "CMake Error at" in line:
+                for next_line in lines[i + 1 :]:
+                    if next_line.strip():
+                        return line + ' ' + next_line
+                return line
+        return None
+
+    @staticmethod
+    def _parse_build_failure(log: str) -> str | None:
+        last_warning = ''
+        lines = log.splitlines()
+        for i, line in enumerate(lines):
+            if "undefined reference" in line:
+                return line[line.index('undefined reference') :].strip()
+            elif "error: ld returned" in line:
+                if last_warning:
+                    return last_warning
+                elif "overflowed by" in lines[i - 1]:
+                    return "ld.bfd: region overflowed"
+                elif "ld.bfd: warning: " in lines[i - 1]:
+                    return "ld.bfd:" + lines[i - 1].split("ld.bfd:", 1)[-1]
+                return line
+            elif "error: " in line:
+                return line[line.index('error: ') :].strip()
+            elif ": in function " in line:
+                last_warning = line[line.index('in function') :].strip()
+        return None
diff --git a/scripts/pylib/twister/twisterlib/runner.py b/scripts/pylib/twister/twisterlib/runner.py
index 0593cbc7fc3a4..54524757e7c24 100644
--- a/scripts/pylib/twister/twisterlib/runner.py
+++ b/scripts/pylib/twister/twisterlib/runner.py
@@ -29,6 +29,7 @@
 from twisterlib.cmakecache import CMakeCache
 from twisterlib.environment import canonical_zephyr_base
 from twisterlib.error import BuildError, ConfigurationError, StatusAttributeError
+from twisterlib.log_helper import setup_logging
 from twisterlib.statuses import TwisterStatus
 
 if version.parse(elftools.__version__) < version.parse('0.24'):
@@ -60,7 +61,6 @@
 from anytree import Node, RenderTree
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 
 class ExecutionCounter:
@@ -978,7 +978,9 @@ def process(self, pipeline, done, message, lock, results):
         additionals = {}
 
         op = message.get('op')
-
+        options = self.options
+        if not logger.handlers:
+            setup_logging(options.outdir, options.log_file, options.log_level, options.timestamps)
         self.instance.setup_handler(self.env)
 
         if op == "filter":
@@ -1207,7 +1209,7 @@ def process(self, pipeline, done, message, lock, results):
                     mode == "passed"
                     or (mode == "all" and self.instance.reason != "CMake build failure")
                 ):
-                    self.cleanup_artifacts()
+                    self.cleanup_artifacts(self.options.keep_artifacts)
             except StatusAttributeError as sae:
                 logger.error(str(sae))
                 self.instance.status = TwisterStatus.ERROR
@@ -1313,6 +1315,8 @@ def cleanup_artifacts(self, additional_keep: list[str] = None):
             'recording.csv',
             'rom.json',
             'ram.json',
+            'build_info.yml',
+            'zephyr/zephyr.dts',
             # below ones are needed to make --test-only work as well
             'Makefile',
             'CMakeCache.txt',
@@ -1346,7 +1350,7 @@ def cleanup_device_testing_artifacts(self):
         files_to_keep = self._get_binaries()
         files_to_keep.append(os.path.join('zephyr', 'runners.yaml'))
 
-        if self.instance.sysbuild:
+        if self.instance.sysbuild and self.instance.domains:
             files_to_keep.append('domains.yaml')
             for domain in self.instance.domains.get_domains():
                 files_to_keep += self._get_artifact_allow_list_for_domain(domain.name)
@@ -1386,7 +1390,7 @@ def _get_binaries(self) -> list[str]:
         # Get binaries for a single-domain build
         binaries += self._get_binaries_from_runners()
         # Get binaries in the case of a multiple-domain build
-        if self.instance.sysbuild:
+        if self.instance.sysbuild and self.instance.domains:
             for domain in self.instance.domains.get_domains():
                 binaries += self._get_binaries_from_runners(domain.name)
 
@@ -1662,8 +1666,8 @@ def cmake_assemble_args(extra_args, handler, extra_conf_files, extra_overlay_con
                             extra_dtc_overlay_files, cmake_extra_args,
                             build_dir):
         # Retain quotes around config options
-        config_options = [arg for arg in extra_args if arg.startswith("CONFIG_")]
-        args = [arg for arg in extra_args if not arg.startswith("CONFIG_")]
+        config_options = [arg for arg in extra_args if arg.startswith(("CONFIG_", "SB_CONFIG_"))]
+        args = [arg for arg in extra_args if not arg.startswith(("CONFIG_", "SB_CONFIG_"))]
 
         args_expanded = ["-D{}".format(a.replace('"', '\"')) for a in config_options]
 
@@ -1753,8 +1757,8 @@ def run(self):
 
             if(self.options.seed is not None and instance.platform.name.startswith("native_")):
                 self.parse_generated()
-                if('CONFIG_FAKE_ENTROPY_NATIVE_POSIX' in self.defconfig and
-                    self.defconfig['CONFIG_FAKE_ENTROPY_NATIVE_POSIX'] == 'y'):
+                if('CONFIG_FAKE_ENTROPY_NATIVE_SIM' in self.defconfig and
+                    self.defconfig['CONFIG_FAKE_ENTROPY_NATIVE_SIM'] == 'y'):
                     instance.handler.seed = self.options.seed
 
             if self.options.extra_test_args and instance.platform.arch == "posix":
@@ -1789,7 +1793,6 @@ def gather_metrics(self, instance: TestInstance):
             instance.metrics["used_rom"] = 0
             instance.metrics["available_rom"] = 0
             instance.metrics["available_ram"] = 0
-            instance.metrics["unrecognized"] = []
         return build_result
 
     @staticmethod
@@ -1805,13 +1808,11 @@ def calc_size(instance: TestInstance, from_buildlog: bool):
                 instance.metrics["used_rom"] = size_calc.get_used_rom()
                 instance.metrics["available_rom"] = size_calc.get_available_rom()
                 instance.metrics["available_ram"] = size_calc.get_available_ram()
-                instance.metrics["unrecognized"] = size_calc.unrecognized_sections()
             else:
                 instance.metrics["used_ram"] = 0
                 instance.metrics["used_rom"] = 0
                 instance.metrics["available_rom"] = 0
                 instance.metrics["available_ram"] = 0
-                instance.metrics["unrecognized"] = []
             instance.metrics["handler_time"] = instance.execution_time
 
 class TwisterRunner:
@@ -1887,7 +1888,6 @@ def run(self):
                 else:
                     inst.metrics.update(self.instances[inst.name].metrics)
                     inst.metrics["handler_time"] = inst.execution_time
-                    inst.metrics["unrecognized"] = []
                     self.instances[inst.name] = inst
 
             print("")
diff --git a/scripts/pylib/twister/twisterlib/size_calc.py b/scripts/pylib/twister/twisterlib/size_calc.py
index 8034dca44eed3..a3f1969b1223d 100644
--- a/scripts/pylib/twister/twisterlib/size_calc.py
+++ b/scripts/pylib/twister/twisterlib/size_calc.py
@@ -13,7 +13,7 @@
 from twisterlib.error import TwisterRuntimeError
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
+
 
 class SizeCalculator:
     alloc_sections = [
@@ -154,17 +154,6 @@ def get_used_rom(self):
         """
         return self.used_rom
 
-    def unrecognized_sections(self):
-        """Get a list of sections inside the binary that weren't recognized
-
-        @return list of unrecognized section names
-        """
-        slist = []
-        for v in self.sections:
-            if not v["recognized"]:
-                slist.append(v["name"])
-        return slist
-
     def get_available_ram(self) -> int:
         """Get the total available RAM.
 
@@ -251,7 +240,6 @@ def _get_info_elf_sections(self) -> None:
 
             # Add section to memory use totals (for both non-XIP and XIP scenarios)
             # Unrecognized section names are not included in the calculations.
-            recognized = True
 
             # If build.log file exists, check errors (unrecognized sections
             # in ELF file).
@@ -262,8 +250,6 @@ def _get_info_elf_sections(self) -> None:
                     continue
                 else:
                     stype = "unknown"
-                    if name not in self.extra_sections:
-                        recognized = False
             else:
                 if name in SizeCalculator.alloc_sections:
                     self.used_ram += size
@@ -279,12 +265,10 @@ def _get_info_elf_sections(self) -> None:
                     stype = "ro"
                 else:
                     stype = "unknown"
-                    if name not in self.extra_sections:
-                        recognized = False
 
             self.sections.append({"name": name, "load_addr": load_addr,
                                   "size": size, "virt_addr": virt_addr,
-                                  "type": stype, "recognized": recognized})
+                                  "type": stype})
 
     def _analyze_elf_file(self) -> None:
         self._check_elf_file()
diff --git a/scripts/pylib/twister/twisterlib/testinstance.py b/scripts/pylib/twister/twisterlib/testinstance.py
index 4822146d93ca1..b205aa895fc4a 100644
--- a/scripts/pylib/twister/twisterlib/testinstance.py
+++ b/scripts/pylib/twister/twisterlib/testinstance.py
@@ -36,7 +36,7 @@
 from twisterlib.testsuite import TestCase, TestSuite
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
+
 
 class TestInstance:
     """Class representing the execution of a particular TestSuite on a platform
@@ -152,7 +152,7 @@ def _get_run_id(self):
             with open(run_id_file) as fp:
                 run_id = fp.read()
         else:
-            hash_object = hashlib.md5(self.name.encode())
+            hash_object = hashlib.md5(self.name.encode(), usedforsecurity=False)
             random_str = f"{random.getrandbits(64)}".encode()
             hash_object.update(random_str)
             run_id = hash_object.hexdigest()
@@ -222,6 +222,7 @@ def testsuite_runnable(testsuite, fixtures):
             'console',
             'ztest',
             'pytest',
+            'power',
             'test',
             'gtest',
             'robot',
@@ -313,7 +314,7 @@ def check_runnable(self,
                             device_testing)
 
         # check if test is runnable in pytest
-        if self.testsuite.harness in ['pytest', 'shell']:
+        if self.testsuite.harness in ['pytest', 'shell', 'power']:
             target_ready = bool(
                 filter == 'runnable' or simulator and simulator.name in SUPPORTED_SIMS_IN_PYTEST
             )
diff --git a/scripts/pylib/twister/twisterlib/testplan.py b/scripts/pylib/twister/twisterlib/testplan.py
index 8f727e09f2057..12c10ee1b14f2 100755
--- a/scripts/pylib/twister/twisterlib/testplan.py
+++ b/scripts/pylib/twister/twisterlib/testplan.py
@@ -7,7 +7,6 @@
 # SPDX-License-Identifier: Apache-2.0
 import collections
 import copy
-import glob
 import itertools
 import json
 import logging
@@ -28,11 +27,10 @@
 except ImportError:
     print("Install the anytree module to use the --test-tree option")
 
-import list_boards
 import scl
 from twisterlib.config_parser import TwisterConfigParser
 from twisterlib.error import TwisterRuntimeError
-from twisterlib.platform import Platform
+from twisterlib.platform import Platform, generate_platforms
 from twisterlib.quarantine import Quarantine
 from twisterlib.statuses import TwisterStatus
 from twisterlib.testinstance import TestInstance
@@ -40,7 +38,6 @@
 from zephyr_module import parse_modules
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 ZEPHYR_BASE = os.getenv("ZEPHYR_BASE")
 if not ZEPHYR_BASE:
@@ -437,99 +434,21 @@ def info(what):
         sys.stdout.write(what + "\n")
         sys.stdout.flush()
 
-    def find_twister_data(self, board_data_list, board_aliases):
-        """Find the twister data for a board in the list of board data based on the aliases"""
-        for board_data in board_data_list:
-            if board_data.get('identifier') in board_aliases:
-                return board_data
-
     def add_configurations(self):
         # Create a list of board roots as defined by the build system in general
         # Note, internally in twister a board root includes the `boards` folder
         # but in Zephyr build system, the board root is without the `boards` in folder path.
         board_roots = [Path(os.path.dirname(root)) for root in self.env.board_roots]
-        lb_args = Namespace(arch_roots=self.env.arch_roots, soc_roots=self.env.soc_roots,
-                            board_roots=board_roots, board=None, board_dir=None)
+        soc_roots = self.env.soc_roots
+        arch_roots = self.env.arch_roots
 
-        known_boards = list_boards.find_v2_boards(lb_args)
-        bdirs = {}
         platform_config = self.test_config.get('platforms', {})
 
-        # helper function to initialize and add platforms
-        def init_and_add_platforms(data, board, target, qualifier, aliases):
-            platform = Platform()
-            if not new_config_found:
-                data = self.find_twister_data(bdirs[board.dir], aliases)
-                if not data:
-                    return
-            platform.load(board, target, aliases, data)
-            platform.qualifier = qualifier
-            if platform.name in [p.name for p in self.platforms]:
-                logger.error(f"Duplicate platform {platform.name} in {board.dir}")
-                raise Exception(f"Duplicate platform identifier {platform.name} found")
+        for platform in generate_platforms(board_roots, soc_roots, arch_roots):
             if not platform.twister:
-                return
+                continue
             self.platforms.append(platform)
 
-        for board in known_boards.values():
-            new_config_found = False
-            # don't load the same board data twice
-            if not bdirs.get(board.dir):
-                datas = []
-                for file in glob.glob(os.path.join(board.dir, "*.yaml")):
-                    if os.path.basename(file) == "twister.yaml":
-                        continue
-                    try:
-                        scp = TwisterConfigParser(file, Platform.platform_schema)
-                        sdata = scp.load()
-                        datas.append(sdata)
-                    except Exception as e:
-                        logger.error(f"Error loading {file}: {e!r}")
-                        self.load_errors += 1
-                        continue
-                bdirs[board.dir] = datas
-            data = {}
-            if os.path.exists(board.dir / 'twister.yaml'):
-                try:
-                    scp = TwisterConfigParser(board.dir / 'twister.yaml', Platform.platform_schema)
-                    data = scp.load()
-                except Exception as e:
-                    logger.error(f"Error loading {board.dir / 'twister.yaml'}: {e!r}")
-                    self.load_errors += 1
-                    continue
-                new_config_found = True
-
-
-
-            for qual in list_boards.board_v2_qualifiers(board):
-
-                if board.revisions:
-                    for rev in board.revisions:
-                        if rev.name:
-                            target = f"{board.name}@{rev.name}/{qual}"
-                            aliases = [target]
-                            if rev.name == board.revision_default:
-                                aliases.append(f"{board.name}/{qual}")
-                            if '/' not in qual and len(board.socs) == 1:
-                                if rev.name == board.revision_default:
-                                    aliases.append(f"{board.name}")
-                                aliases.append(f"{board.name}@{rev.name}")
-                        else:
-                            target = f"{board.name}/{qual}"
-                            aliases = [target]
-                            if '/' not in qual and len(board.socs) == 1 \
-                                    and rev.name == board.revision_default:
-                                aliases.append(f"{board.name}")
-
-                        init_and_add_platforms(data, board, target, qual, aliases)
-                else:
-                    target = f"{board.name}/{qual}"
-                    aliases = [target]
-                    if '/' not in qual and len(board.socs) == 1:
-                        aliases.append(board.name)
-                    init_and_add_platforms(data, board, target, qual, aliases)
-
-        for platform in self.platforms:
             if not platform_config.get('override_default_platforms', False):
                 if platform.default:
                     self.default_platforms.append(platform.name)
@@ -676,12 +595,14 @@ def get_platform(self, name):
 
     def handle_quarantined_tests(self, instance: TestInstance, plat: Platform):
         if self.quarantine:
-            simulator = plat.simulator_by_name(self.options)
+            sim_name = plat.simulation
+            if sim_name != "na" and (simulator := plat.simulator_by_name(self.options.sim_name)):
+                sim_name = simulator.name
             matched_quarantine = self.quarantine.get_matched_quarantine(
                 instance.testsuite.id,
                 plat.name,
                 plat.arch,
-                simulator.name if simulator is not None else 'na'
+                sim_name
             )
             if matched_quarantine and not self.options.quarantine_verify:
                 instance.add_filter("Quarantine: " + matched_quarantine, Filters.QUARANTINE)
@@ -814,7 +735,7 @@ def apply_filters(self, **kwargs):
             logger.info("Selecting default platforms per testsuite scenario")
             default_platforms = True
         elif emu_filter:
-            logger.info("Selecting emulation platforms per testsuite scenraio")
+            logger.info("Selecting emulation platforms per testsuite scenario")
             emulation_platforms = True
         elif vendor_filter:
             vendor_platforms = True
@@ -848,29 +769,35 @@ def apply_filters(self, **kwargs):
             platforms = self.platforms
 
         platform_config = self.test_config.get('platforms', {})
+        # test configuration options
+        test_config_options = self.test_config.get('options', {})
+        integration_mode_list = test_config_options.get('integration_mode', [])
+
         logger.info("Building initial testsuite list...")
 
         keyed_tests = {}
-
         for _, ts in self.testsuites.items():
-            if (
-                ts.build_on_all
-                and not platform_filter
-                and platform_config.get('increased_platform_scope', True)
-            ):
-                platform_scope = self.platforms
-            elif ts.integration_platforms:
-                integration_platforms = list(
+            if ts.integration_platforms:
+                _integration_platforms = list(
                     filter(lambda item: item.name in ts.integration_platforms, self.platforms)
                 )
-                if self.options.integration:
-                    platform_scope = integration_platforms
+            else:
+                _integration_platforms = []
+
+            if (ts.build_on_all and not platform_filter and
+                platform_config.get('increased_platform_scope', True)):
+                # if build_on_all is set, we build on all platforms
+                platform_scope = self.platforms
+            elif ts.integration_platforms and self.options.integration:
+                # if integration is set, we build on integration platforms
+                platform_scope = _integration_platforms
+            elif ts.integration_platforms and not platform_filter:
+                # if integration platforms are set, we build on those and integration mode is set
+                # for this test suite, we build on integration platforms
+                if any(ts.id.startswith(i) for i in integration_mode_list):
+                    platform_scope = _integration_platforms
                 else:
-                    # if not in integration mode, still add integration platforms to the list
-                    if not platform_filter:
-                        platform_scope = platforms + integration_platforms
-                    else:
-                        platform_scope = platforms
+                    platform_scope = platforms + _integration_platforms
             else:
                 platform_scope = platforms
 
@@ -1013,6 +940,8 @@ def apply_filters(self, **kwargs):
                         "Environment ({}) not satisfied".format(", ".join(plat.env)),
                         Filters.ENVIRONMENT
                     )
+                if plat.type == 'native' and sys.platform != 'linux':
+                    instance.add_filter("Native platform requires Linux", Filters.ENVIRONMENT)
 
                 if not force_toolchain \
                         and toolchain and (toolchain not in plat.supported_toolchains):
diff --git a/scripts/pylib/twister/twisterlib/testsuite.py b/scripts/pylib/twister/twisterlib/testsuite.py
index a99e9c88e091a..5d4f346effc14 100644
--- a/scripts/pylib/twister/twisterlib/testsuite.py
+++ b/scripts/pylib/twister/twisterlib/testsuite.py
@@ -18,7 +18,6 @@
 from twisterlib.statuses import TwisterStatus
 
 logger = logging.getLogger('twister')
-logger.setLevel(logging.DEBUG)
 
 class ScanPathResult:
     """Result of the scan_tesuite_path function call.
diff --git a/scripts/pylib/twister/twisterlib/twister_main.py b/scripts/pylib/twister/twisterlib/twister_main.py
index 2c847e49bb119..fabd739ba9c6e 100644
--- a/scripts/pylib/twister/twisterlib/twister_main.py
+++ b/scripts/pylib/twister/twisterlib/twister_main.py
@@ -15,51 +15,19 @@
 from twisterlib.coverage import run_coverage
 from twisterlib.environment import TwisterEnv
 from twisterlib.hardwaremap import HardwareMap
+from twisterlib.log_helper import close_logging, setup_logging
 from twisterlib.package import Artifacts
 from twisterlib.reports import Reporting
 from twisterlib.runner import TwisterRunner
 from twisterlib.statuses import TwisterStatus
 from twisterlib.testplan import TestPlan
 
-logger = logging.getLogger("twister")
-logger.setLevel(logging.DEBUG)
-
-
-def setup_logging(outdir, log_file, log_level, timestamps):
-    # create file handler which logs even debug messages
-    if log_file:
-        fh = logging.FileHandler(log_file)
-    else:
-        fh = logging.FileHandler(os.path.join(outdir, "twister.log"))
-
-    fh.setLevel(logging.DEBUG)
-
-    # create console handler with a higher log level
-    ch = logging.StreamHandler()
-    ch.setLevel(getattr(logging, log_level))
-
-    # create formatter and add it to the handlers
-    if timestamps:
-        formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
-    else:
-        formatter = logging.Formatter("%(levelname)-7s - %(message)s")
-
-    formatter_file = logging.Formatter(
-        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-    )
-    ch.setFormatter(formatter)
-    fh.setFormatter(formatter_file)
-
-    # add the handlers to logger
-    logger.addHandler(ch)
-    logger.addHandler(fh)
-
 
 def init_color(colorama_strip):
     colorama.init(strip=colorama_strip)
 
 
-def main(options: argparse.Namespace, default_options: argparse.Namespace):
+def twister(options: argparse.Namespace, default_options: argparse.Namespace):
     start_time = time.time()
 
     # Configure color output
@@ -108,6 +76,7 @@ def main(options: argparse.Namespace, default_options: argparse.Namespace):
             fp.write(previous_results)
 
     setup_logging(options.outdir, options.log_file, options.log_level, options.timestamps)
+    logger = logging.getLogger("twister")
 
     env = TwisterEnv(options, default_options)
     env.discover()
@@ -212,7 +181,7 @@ def main(options: argparse.Namespace, default_options: argparse.Namespace):
     if options.verbose > 1:
         runner.results.summary()
 
-    report.summary(runner.results, options.disable_unrecognized_section_test, duration)
+    report.summary(runner.results, duration)
 
     report.coverage_status = True
     if options.coverage and not options.disable_coverage_aggregation:
@@ -252,3 +221,11 @@ def main(options: argparse.Namespace, default_options: argparse.Namespace):
 
     logger.info("Run completed")
     return 0
+
+
+def main(options: argparse.Namespace, default_options: argparse.Namespace):
+    try:
+        return_code = twister(options, default_options)
+    finally:
+        close_logging()
+    return return_code
diff --git a/scripts/requirements-actions.in b/scripts/requirements-actions.in
new file mode 100644
index 0000000000000..01b58392914bb
--- /dev/null
+++ b/scripts/requirements-actions.in
@@ -0,0 +1,41 @@
+# zephyr-keep-sorted-start
+anytree
+awscli
+canopen
+clang-format>=15.0.0
+elasticsearch
+exceptiongroup>=1.0.0rc8
+gcovr==6.0
+gitlint>=0.19.1
+gitpython>=3.1.41
+ijson
+intelhex
+junit2html
+junitparser>=2
+lxml>=5.3.0
+mock
+mypy
+natsort
+ply>=3.10
+progress
+psutil>=5.6.6
+pyelftools>=0.29
+pygithub
+pykwalify
+pylint>=3
+pyserial
+pytest
+python-magic-bin; sys_platform == "win32"
+python-magic; sys_platform != "win32"
+pyyaml
+ruff==0.8.1
+setuptools>=70.2.0
+sphinx-lint
+tabulate
+tomli>=1.1.0
+tox
+unidiff
+west>=0.14.0
+xlsxwriter
+yamllint
+# zephyr-keep-sorted-stop
diff --git a/scripts/requirements-actions.txt b/scripts/requirements-actions.txt
new file mode 100644
index 0000000000000..eefc92109a15e
--- /dev/null
+++ b/scripts/requirements-actions.txt
@@ -0,0 +1,1345 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile --universal --python-version 3.10 --generate-hashes requirements-actions.in
+anytree==2.12.1 \
+    --hash=sha256:244def434ccf31b668ed282954e5d315b4e066c4940b94aff4a7962d85947830 \
+    --hash=sha256:5ea9e61caf96db1e5b3d0a914378d2cd83c269dfce1fb8242ce96589fa3382f0
+    # via -r requirements-actions.in
+arrow==1.2.3 \
+    --hash=sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1 \
+    --hash=sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2
+    # via gitlint-core
+astroid==3.3.9 \
+    --hash=sha256:622cc8e3048684aa42c820d9d218978021c3c3d174fb03a9f0d615921744f550 \
+    --hash=sha256:d05bfd0acba96a7bd43e222828b7d9bc1e138aaeb0649707908d3702a9831248
+    # via pylint
+awscli==1.38.23 \
+    --hash=sha256:43815c87b655d1cb8b41be2c40ce8c47348999a93f8b52f6c462fa4ada5768e3 \
+    --hash=sha256:8d4746235f4565760cadcb8b303d9d6756dbba1edd7bae8e219ef0910ed61cf4
+    # via -r requirements-actions.in
+botocore==1.37.23 \
+    --hash=sha256:3a249c950cef9ee9ed7b2278500ad83a4ad6456bc433a43abd1864d1b61b2acb \
+    --hash=sha256:ffbe1f5958adb1c50d72d3ad1018cb265fe349248c08782d334601c0814f0e38
+    # via
+    #   awscli
+    #   s3transfer
+cachetools==5.5.2 \
+    --hash=sha256:1a661caa9175d26759571b2e19580f9d6393969e5dfca11fdb1f947a23e640d4 \
+    --hash=sha256:d26a22bcc62eb95c3beabd9f1ee5e820d3d2704fe2967cbe350e20c8ffcd3f0a
+    # via tox
+canopen==2.3.0 \
+    --hash=sha256:792084a93c138d5b2a406ddd2d4eb5ce208f03bd8fda60f81ad2bb8d56c6b827 \
+    --hash=sha256:7a62274af6ded7ee85ee96f4ada3afa38bc8607a91f306dcc202c3c8cf2850d7
+    # via -r requirements-actions.in
+certifi==2025.1.31 \
+    --hash=sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651 \
+    --hash=sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe
+    # via
+    #   elastic-transport
+    #   requests
+cffi==1.17.1 \
+    --hash=sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8 \
+    --hash=sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2 \
+    --hash=sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1 \
+    --hash=sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15 \
+    --hash=sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36 \
+    --hash=sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824 \
+    --hash=sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8 \
+    --hash=sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36 \
+    --hash=sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17 \
+    --hash=sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf \
+    --hash=sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc \
+    --hash=sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3 \
+    --hash=sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed \
+    --hash=sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702 \
+    --hash=sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1 \
+    --hash=sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8 \
+    --hash=sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903 \
+    --hash=sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6 \
+    --hash=sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d \
+    --hash=sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b \
+    --hash=sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e \
+    --hash=sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be \
+    --hash=sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c \
+    --hash=sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683 \
+    --hash=sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9 \
+    --hash=sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c \
+    --hash=sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8 \
+    --hash=sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1 \
+    --hash=sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4 \
+    --hash=sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655 \
+    --hash=sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67 \
+    --hash=sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595 \
+    --hash=sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0 \
+    --hash=sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65 \
+    --hash=sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41 \
+    --hash=sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6 \
+    --hash=sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401 \
+    --hash=sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6 \
+    --hash=sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3 \
+    --hash=sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16 \
+    --hash=sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93 \
+    --hash=sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e \
+    --hash=sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4 \
+    --hash=sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964 \
+    --hash=sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c \
+    --hash=sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576 \
+    --hash=sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0 \
+    --hash=sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3 \
+    --hash=sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662 \
+    --hash=sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3 \
+    --hash=sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff \
+    --hash=sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5 \
+    --hash=sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd \
+    --hash=sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f \
+    --hash=sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5 \
+    --hash=sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14 \
+    --hash=sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d \
+    --hash=sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9 \
+    --hash=sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7 \
+    --hash=sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382 \
+    --hash=sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a \
+    --hash=sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e \
+    --hash=sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a \
+    --hash=sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4 \
+    --hash=sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99 \
+    --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
+    --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
+    # via
+    #   cryptography
+    #   pynacl
+chardet==5.2.0 \
+    --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
+    --hash=sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970
+    # via tox
+charset-normalizer==3.4.1 \
+    --hash=sha256:0167ddc8ab6508fe81860a57dd472b2ef4060e8d378f0cc555707126830f2537 \
+    --hash=sha256:01732659ba9b5b873fc117534143e4feefecf3b2078b0a6a2e925271bb6f4cfa \
+    --hash=sha256:01ad647cdd609225c5350561d084b42ddf732f4eeefe6e678765636791e78b9a \
+    --hash=sha256:04432ad9479fa40ec0f387795ddad4437a2b50417c69fa275e212933519ff294 \
+    --hash=sha256:0907f11d019260cdc3f94fbdb23ff9125f6b5d1039b76003b5b0ac9d6a6c9d5b \
+    --hash=sha256:0924e81d3d5e70f8126529951dac65c1010cdf117bb75eb02dd12339b57749dd \
+    --hash=sha256:09b26ae6b1abf0d27570633b2b078a2a20419c99d66fb2823173d73f188ce601 \
+    --hash=sha256:09b5e6733cbd160dcc09589227187e242a30a49ca5cefa5a7edd3f9d19ed53fd \
+    --hash=sha256:0af291f4fe114be0280cdd29d533696a77b5b49cfde5467176ecab32353395c4 \
+    --hash=sha256:0f55e69f030f7163dffe9fd0752b32f070566451afe180f99dbeeb81f511ad8d \
+    --hash=sha256:1a2bc9f351a75ef49d664206d51f8e5ede9da246602dc2d2726837620ea034b2 \
+    --hash=sha256:22e14b5d70560b8dd51ec22863f370d1e595ac3d024cb8ad7d308b4cd95f8313 \
+    --hash=sha256:234ac59ea147c59ee4da87a0c0f098e9c8d169f4dc2a159ef720f1a61bbe27cd \
+    --hash=sha256:2369eea1ee4a7610a860d88f268eb39b95cb588acd7235e02fd5a5601773d4fa \
+    --hash=sha256:237bdbe6159cff53b4f24f397d43c6336c6b0b42affbe857970cefbb620911c8 \
+    --hash=sha256:28bf57629c75e810b6ae989f03c0828d64d6b26a5e205535585f96093e405ed1 \
+    --hash=sha256:2967f74ad52c3b98de4c3b32e1a44e32975e008a9cd2a8cc8966d6a5218c5cb2 \
+    --hash=sha256:2a75d49014d118e4198bcee5ee0a6f25856b29b12dbf7cd012791f8a6cc5c496 \
+    --hash=sha256:2bdfe3ac2e1bbe5b59a1a63721eb3b95fc9b6817ae4a46debbb4e11f6232428d \
+    --hash=sha256:2d074908e1aecee37a7635990b2c6d504cd4766c7bc9fc86d63f9c09af3fa11b \
+    --hash=sha256:2fb9bd477fdea8684f78791a6de97a953c51831ee2981f8e4f583ff3b9d9687e \
+    --hash=sha256:311f30128d7d333eebd7896965bfcfbd0065f1716ec92bd5638d7748eb6f936a \
+    --hash=sha256:329ce159e82018d646c7ac45b01a430369d526569ec08516081727a20e9e4af4 \
+    --hash=sha256:345b0426edd4e18138d6528aed636de7a9ed169b4aaf9d61a8c19e39d26838ca \
+    --hash=sha256:363e2f92b0f0174b2f8238240a1a30142e3db7b957a5dd5689b0e75fb717cc78 \
+    --hash=sha256:3a3bd0dcd373514dcec91c411ddb9632c0d7d92aed7093b8c3bbb6d69ca74408 \
+    --hash=sha256:3bed14e9c89dcb10e8f3a29f9ccac4955aebe93c71ae803af79265c9ca5644c5 \
+    --hash=sha256:44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3 \
+    --hash=sha256:44ecbf16649486d4aebafeaa7ec4c9fed8b88101f4dd612dcaf65d5e815f837f \
+    --hash=sha256:4532bff1b8421fd0a320463030c7520f56a79c9024a4e88f01c537316019005a \
+    --hash=sha256:49402233c892a461407c512a19435d1ce275543138294f7ef013f0b63d5d3765 \
+    --hash=sha256:4c0907b1928a36d5a998d72d64d8eaa7244989f7aaaf947500d3a800c83a3fd6 \
+    --hash=sha256:4d86f7aff21ee58f26dcf5ae81a9addbd914115cdebcbb2217e4f0ed8982e146 \
+    --hash=sha256:5777ee0881f9499ed0f71cc82cf873d9a0ca8af166dfa0af8ec4e675b7df48e6 \
+    --hash=sha256:5df196eb874dae23dcfb968c83d4f8fdccb333330fe1fc278ac5ceeb101003a9 \
+    --hash=sha256:619a609aa74ae43d90ed2e89bdd784765de0a25ca761b93e196d938b8fd1dbbd \
+    --hash=sha256:6e27f48bcd0957c6d4cb9d6fa6b61d192d0b13d5ef563e5f2ae35feafc0d179c \
+    --hash=sha256:6ff8a4a60c227ad87030d76e99cd1698345d4491638dfa6673027c48b3cd395f \
+    --hash=sha256:73d94b58ec7fecbc7366247d3b0b10a21681004153238750bb67bd9012414545 \
+    --hash=sha256:7461baadb4dc00fd9e0acbe254e3d7d2112e7f92ced2adc96e54ef6501c5f176 \
+    --hash=sha256:75832c08354f595c760a804588b9357d34ec00ba1c940c15e31e96d902093770 \
+    --hash=sha256:7709f51f5f7c853f0fb938bcd3bc59cdfdc5203635ffd18bf354f6967ea0f824 \
+    --hash=sha256:78baa6d91634dfb69ec52a463534bc0df05dbd546209b79a3880a34487f4b84f \
+    --hash=sha256:7974a0b5ecd505609e3b19742b60cee7aa2aa2fb3151bc917e6e2646d7667dcf \
+    --hash=sha256:7a4f97a081603d2050bfaffdefa5b02a9ec823f8348a572e39032caa8404a487 \
+    --hash=sha256:7b1bef6280950ee6c177b326508f86cad7ad4dff12454483b51d8b7d673a2c5d \
+    --hash=sha256:7d053096f67cd1241601111b698f5cad775f97ab25d81567d3f59219b5f1adbd \
+    --hash=sha256:804a4d582ba6e5b747c625bf1255e6b1507465494a40a2130978bda7b932c90b \
+    --hash=sha256:807f52c1f798eef6cf26beb819eeb8819b1622ddfeef9d0977a8502d4db6d534 \
+    --hash=sha256:80ed5e856eb7f30115aaf94e4a08114ccc8813e6ed1b5efa74f9f82e8509858f \
+    --hash=sha256:8417cb1f36cc0bc7eaba8ccb0e04d55f0ee52df06df3ad55259b9a323555fc8b \
+    --hash=sha256:8436c508b408b82d87dc5f62496973a1805cd46727c34440b0d29d8a2f50a6c9 \
+    --hash=sha256:89149166622f4db9b4b6a449256291dc87a99ee53151c74cbd82a53c8c2f6ccd \
+    --hash=sha256:8bfa33f4f2672964266e940dd22a195989ba31669bd84629f05fab3ef4e2d125 \
+    --hash=sha256:8c60ca7339acd497a55b0ea5d506b2a2612afb2826560416f6894e8b5770d4a9 \
+    --hash=sha256:91b36a978b5ae0ee86c394f5a54d6ef44db1de0815eb43de826d41d21e4af3de \
+    --hash=sha256:955f8851919303c92343d2f66165294848d57e9bba6cf6e3625485a70a038d11 \
+    --hash=sha256:97f68b8d6831127e4787ad15e6757232e14e12060bec17091b85eb1486b91d8d \
+    --hash=sha256:9b23ca7ef998bc739bf6ffc077c2116917eabcc901f88da1b9856b210ef63f35 \
+    --hash=sha256:9f0b8b1c6d84c8034a44893aba5e767bf9c7a211e313a9605d9c617d7083829f \
+    --hash=sha256:aabfa34badd18f1da5ec1bc2715cadc8dca465868a4e73a0173466b688f29dda \
+    --hash=sha256:ab36c8eb7e454e34e60eb55ca5d241a5d18b2c6244f6827a30e451c42410b5f7 \
+    --hash=sha256:b010a7a4fd316c3c484d482922d13044979e78d1861f0e0650423144c616a46a \
+    --hash=sha256:b1ac5992a838106edb89654e0aebfc24f5848ae2547d22c2c3f66454daa11971 \
+    --hash=sha256:b7b2d86dd06bfc2ade3312a83a5c364c7ec2e3498f8734282c6c3d4b07b346b8 \
+    --hash=sha256:b97e690a2118911e39b4042088092771b4ae3fc3aa86518f84b8cf6888dbdb41 \
+    --hash=sha256:bc2722592d8998c870fa4e290c2eec2c1569b87fe58618e67d38b4665dfa680d \
+    --hash=sha256:c0429126cf75e16c4f0ad00ee0eae4242dc652290f940152ca8c75c3a4b6ee8f \
+    --hash=sha256:c30197aa96e8eed02200a83fba2657b4c3acd0f0aa4bdc9f6c1af8e8962e0757 \
+    --hash=sha256:c4c3e6da02df6fa1410a7680bd3f63d4f710232d3139089536310d027950696a \
+    --hash=sha256:c75cb2a3e389853835e84a2d8fb2b81a10645b503eca9bcb98df6b5a43eb8886 \
+    --hash=sha256:c96836c97b1238e9c9e3fe90844c947d5afbf4f4c92762679acfe19927d81d77 \
+    --hash=sha256:d7f50a1f8c450f3925cb367d011448c39239bb3eb4117c36a6d354794de4ce76 \
+    --hash=sha256:d973f03c0cb71c5ed99037b870f2be986c3c05e63622c017ea9816881d2dd247 \
+    --hash=sha256:d98b1668f06378c6dbefec3b92299716b931cd4e6061f3c875a71ced1780ab85 \
+    --hash=sha256:d9c3cdf5390dcd29aa8056d13e8e99526cda0305acc038b96b30352aff5ff2bb \
+    --hash=sha256:dad3e487649f498dd991eeb901125411559b22e8d7ab25d3aeb1af367df5efd7 \
+    --hash=sha256:dccbe65bd2f7f7ec22c4ff99ed56faa1e9f785482b9bbd7c717e26fd723a1d1e \
+    --hash=sha256:dd78cfcda14a1ef52584dbb008f7ac81c1328c0f58184bf9a84c49c605002da6 \
+    --hash=sha256:e218488cd232553829be0664c2292d3af2eeeb94b32bea483cf79ac6a694e037 \
+    --hash=sha256:e358e64305fe12299a08e08978f51fc21fac060dcfcddd95453eabe5b93ed0e1 \
+    --hash=sha256:ea0d8d539afa5eb2728aa1932a988a9a7af94f18582ffae4bc10b3fbdad0626e \
+    --hash=sha256:eab677309cdb30d047996b36d34caeda1dc91149e4fdca0b1a039b3f79d9a807 \
+    --hash=sha256:eb8178fe3dba6450a3e024e95ac49ed3400e506fd4e9e5c32d30adda88cbd407 \
+    --hash=sha256:ecddf25bee22fe4fe3737a399d0d177d72bc22be6913acfab364b40bce1ba83c \
+    --hash=sha256:eea6ee1db730b3483adf394ea72f808b6e18cf3cb6454b4d86e04fa8c4327a12 \
+    --hash=sha256:f08ff5e948271dc7e18a35641d2f11a4cd8dfd5634f55228b691e62b37125eb3 \
+    --hash=sha256:f30bf9fd9be89ecb2360c7d94a711f00c09b976258846efe40db3d05828e8089 \
+    --hash=sha256:fa88b843d6e211393a37219e6a1c1df99d35e8fd90446f1118f4216e307e48cd \
+    --hash=sha256:fc54db6c8593ef7d4b2a331b58653356cf04f67c960f584edb7c3d8c97e8f39e \
+    --hash=sha256:fd4ec41f914fa74ad1b8304bbc634b3de73d2a0889bd32076342a573e0779e00 \
+    --hash=sha256:ffc9202a29ab3920fa812879e95a9e78b2465fd10be7fcbd042899695d75e616
+    # via requests
+clang-format==20.1.0 \
+    --hash=sha256:1a023510c49a5c0bf9966263503b3af20f42ef6425d8f4a53141c41c58f84d25 \
+    --hash=sha256:48369361bf8bef60ca3aeee51c8d55821bb62228489c1a1155703a2634598df6 \
+    --hash=sha256:5413c54938d31673ae9c3043527ee4414e0b8980b89b8417bd9663bf18ab2010 \
+    --hash=sha256:5a2dbe11203275627cea3286f018b4eee36670607b76b467f067132c8eb999d0 \
+    --hash=sha256:5e5d6bc8d2f54d8e8058b93627468c571ce971c541cd3ea7751cd6d711eb5a19 \
+    --hash=sha256:6d054c0a328926436262ba0e00b527059e14c7f65bf5bad5a8f82fbed680bd53 \
+    --hash=sha256:700b32da1e03c485a53113b41693846e930c3066803e713064a1ff2797dbeba3 \
+    --hash=sha256:82b2a19e5b345fcf7d6bf478b5d48e242eb84d47ae04cb54ae0561464f812bcd \
+    --hash=sha256:85599f9f2314d3a82c002362e1119d49726ef8dc2082497acfea2892e9a446f1 \
+    --hash=sha256:934bc103f9cd3009ee7259ac54df08dbcef38d4c970c0171bc68517f67e4720f \
+    --hash=sha256:ade5b45e2faadddbf3fabe93b65d04567ded59fb483708a8417bacc4a96d5bc3 \
+    --hash=sha256:c20b5be0d9347b5b3a2c4af67e3e9d7a7254a8a9fa7f17628639e2c0a3fea8e9 \
+    --hash=sha256:ca6410aacd5e7b827f9025a52ac01344ed5df58bd27adbce0d1564ea331919ea \
+    --hash=sha256:dc4b094b4cd1824342b1f6f78f41d2c7f336df89e785b506fcd098d1d3f02d82 \
+    --hash=sha256:e1cd4a018ea15a5f675158ab1468d4a2e827f8266fa56773916a5f294a32c51d
+    # via -r requirements-actions.in
+click==8.1.3 \
+    --hash=sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e \
+    --hash=sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48
+    # via gitlint-core
+colorama==0.4.6 \
+    --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
+    --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
+    # via
+    #   awscli
+    #   click
+    #   pylint
+    #   pytest
+    #   tox
+    #   west
+cryptography==44.0.2 \
+    --hash=sha256:04abd71114848aa25edb28e225ab5f268096f44cf0127f3d36975bdf1bdf3390 \
+    --hash=sha256:0529b1d5a0105dd3731fa65680b45ce49da4d8115ea76e9da77a875396727b41 \
+    --hash=sha256:1bc312dfb7a6e5d66082c87c34c8a62176e684b6fe3d90fcfe1568de675e6688 \
+    --hash=sha256:268e4e9b177c76d569e8a145a6939eca9a5fec658c932348598818acf31ae9a5 \
+    --hash=sha256:29ecec49f3ba3f3849362854b7253a9f59799e3763b0c9d0826259a88efa02f1 \
+    --hash=sha256:2bf7bf75f7df9715f810d1b038870309342bff3069c5bd8c6b96128cb158668d \
+    --hash=sha256:3b721b8b4d948b218c88cb8c45a01793483821e709afe5f622861fc6182b20a7 \
+    --hash=sha256:3c00b6b757b32ce0f62c574b78b939afab9eecaf597c4d624caca4f9e71e7843 \
+    --hash=sha256:3dc62975e31617badc19a906481deacdeb80b4bb454394b4098e3f2525a488c5 \
+    --hash=sha256:4973da6ca3db4405c54cd0b26d328be54c7747e89e284fcff166132eb7bccc9c \
+    --hash=sha256:4e389622b6927d8133f314949a9812972711a111d577a5d1f4bee5e58736b80a \
+    --hash=sha256:51e4de3af4ec3899d6d178a8c005226491c27c4ba84101bfb59c901e10ca9f79 \
+    --hash=sha256:5f6f90b72d8ccadb9c6e311c775c8305381db88374c65fa1a68250aa8a9cb3a6 \
+    --hash=sha256:6210c05941994290f3f7f175a4a57dbbb2afd9273657614c506d5976db061181 \
+    --hash=sha256:6f101b1f780f7fc613d040ca4bdf835c6ef3b00e9bd7125a4255ec574c7916e4 \
+    --hash=sha256:7bdcd82189759aba3816d1f729ce42ffded1ac304c151d0a8e89b9996ab863d5 \
+    --hash=sha256:7ca25849404be2f8e4b3c59483d9d3c51298a22c1c61a0e84415104dacaf5562 \
+    --hash=sha256:81276f0ea79a208d961c433a947029e1a15948966658cf6710bbabb60fcc2639 \
+    --hash=sha256:8cadc6e3b5a1f144a039ea08a0bdb03a2a92e19c46be3285123d32029f40a922 \
+    --hash=sha256:8e0ddd63e6bf1161800592c71ac794d3fb8001f2caebe0966e77c5234fa9efc3 \
+    --hash=sha256:909c97ab43a9c0c0b0ada7a1281430e4e5ec0458e6d9244c0e821bbf152f061d \
+    --hash=sha256:96e7a5e9d6e71f9f4fca8eebfd603f8e86c5225bb18eb621b2c1e50b290a9471 \
+    --hash=sha256:9a1e657c0f4ea2a23304ee3f964db058c9e9e635cc7019c4aa21c330755ef6fd \
+    --hash=sha256:9eb9d22b0a5d8fd9925a7764a054dca914000607dff201a24c791ff5c799e1fa \
+    --hash=sha256:af4ff3e388f2fa7bff9f7f2b31b87d5651c45731d3e8cfa0944be43dff5cfbdb \
+    --hash=sha256:b042d2a275c8cee83a4b7ae30c45a15e6a4baa65a179a0ec2d78ebb90e4f6699 \
+    --hash=sha256:bc821e161ae88bfe8088d11bb39caf2916562e0a2dc7b6d56714a48b784ef0bb \
+    --hash=sha256:c505d61b6176aaf982c5717ce04e87da5abc9a36a5b39ac03905c4aafe8de7aa \
+    --hash=sha256:c63454aa261a0cf0c5b4718349629793e9e634993538db841165b3df74f37ec0 \
+    --hash=sha256:c7362add18b416b69d58c910caa217f980c5ef39b23a38a0880dfd87bdf8cd23 \
+    --hash=sha256:d03806036b4f89e3b13b6218fefea8d5312e450935b1a2d55f0524e2ed7c59d9 \
+    --hash=sha256:d1b3031093a366ac767b3feb8bcddb596671b3aaff82d4050f984da0c248b615 \
+    --hash=sha256:d1c3572526997b36f245a96a2b1713bf79ce99b271bbcf084beb6b9b075f29ea \
+    --hash=sha256:efcfe97d1b3c79e486554efddeb8f6f53a4cdd4cf6086642784fa31fc384e1d7 \
+    --hash=sha256:f514ef4cd14bb6fb484b4a60203e912cfcb64f2ab139e88c2274511514bf7308
+    # via pyjwt
+deprecated==1.2.18 \
+    --hash=sha256:422b6f6d859da6f2ef57857761bfb392480502a64c3028ca9bbe86085d72115d \
+    --hash=sha256:bd5011788200372a32418f888e326a09ff80d0214bd961147cfed01b5c018eec
+    # via pygithub
+dill==0.3.9 \
+    --hash=sha256:468dff3b89520b474c0397703366b7b95eebe6303f108adf9b19da1f702be87a \
+    --hash=sha256:81aa267dddf68cbfe8029c42ca9ec6a4ab3b22371d1c450abc54422577b4512c
+    # via pylint
+distlib==0.3.9 \
+    --hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
+    --hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
+    # via virtualenv
+docopt==0.6.2 \
+    --hash=sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
+    # via pykwalify
+docutils==0.16 \
+    --hash=sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af \
+    --hash=sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+    # via awscli
+elastic-transport==8.17.1 \
+    --hash=sha256:192718f498f1d10c5e9aa8b9cf32aed405e469a7f0e9d6a8923431dbb2c59fb8 \
+    --hash=sha256:5edef32ac864dca8e2f0a613ef63491ee8d6b8cfb52881fa7313ba9290cac6d2
+    # via elasticsearch
+elasticsearch==8.17.2 \
+    --hash=sha256:2d058dcddd8f2686cd431a916cdf983f9fb7d211d902834f564ab7df05ba6478 \
+    --hash=sha256:ff7f1db8aeefd87ceba4edce3aa4070994582e6cf029d2e67b74e66d634509db
+    # via -r requirements-actions.in
+exceptiongroup==1.2.2 \
+    --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
+    --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
+    # via
+    #   -r requirements-actions.in
+    #   pytest
+filelock==3.18.0 \
+    --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \
+    --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de
+    # via
+    #   tox
+    #   virtualenv
+gcovr==6.0 \
+    --hash=sha256:2e52019fdb76c6e327f48c2a2d8555fb5e362570b79cc74c5498804d1ce54a60 \
+    --hash=sha256:8638d5f44def10e38e3166c8a33bef6643ec204687e0ac7d345ce41a98c5750b
+    # via -r requirements-actions.in
+gitdb==4.0.12 \
+    --hash=sha256:5ef71f855d191a3326fcfbc0d5da835f26b13fbcba60c32c21091c349ffdb571 \
+    --hash=sha256:67073e15955400952c6565cc3e707c554a4eea2e428946f7a4c162fab9bd9bcf
+    # via gitpython
+gitlint==0.19.1 \
+    --hash=sha256:26bb085959148d99fbbc178b4e56fda6c3edd7646b7c2a24d8ee1f8e036ed85d \
+    --hash=sha256:b5b70fb894e80849b69abbb65ee7dbb3520fc3511f202a6e6b6ddf1a71ee8f61
+    # via -r requirements-actions.in
+gitlint-core==0.19.1 \
+    --hash=sha256:7bf977b03ff581624a9e03f65ebb8502cc12dfaa3e92d23e8b2b54bbdaa29992 \
+    --hash=sha256:f41effd1dcbc06ffbfc56b6888cce72241796f517b46bd9fd4ab1b145056988c
+    # via gitlint
+gitpython==3.1.44 \
+    --hash=sha256:9e0e10cda9bed1ee64bc9a6de50e7e38a9c9943241cd7f585f6df3ed28011110 \
+    --hash=sha256:c87e30b26253bf5418b01b0660f818967f3c503193838337fe5e573331249269
+    # via -r requirements-actions.in
+idna==3.10 \
+    --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
+    --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
+    # via requests
+ijson==3.3.0 \
+    --hash=sha256:0015354011303175eae7e2ef5136414e91de2298e5a2e9580ed100b728c07e51 \
+    --hash=sha256:034642558afa57351a0ffe6de89e63907c4cf6849070cc10a3b2542dccda1afe \
+    --hash=sha256:0420c24e50389bc251b43c8ed379ab3e3ba065ac8262d98beb6735ab14844460 \
+    --hash=sha256:04366e7e4a4078d410845e58a2987fd9c45e63df70773d7b6e87ceef771b51ee \
+    --hash=sha256:0b003501ee0301dbf07d1597482009295e16d647bb177ce52076c2d5e64113e0 \
+    --hash=sha256:0ee57a28c6bf523d7cb0513096e4eb4dac16cd935695049de7608ec110c2b751 \
+    --hash=sha256:192e4b65495978b0bce0c78e859d14772e841724d3269fc1667dc6d2f53cc0ea \
+    --hash=sha256:1efb521090dd6cefa7aafd120581947b29af1713c902ff54336b7c7130f04c47 \
+    --hash=sha256:25fd49031cdf5fd5f1fd21cb45259a64dad30b67e64f745cc8926af1c8c243d3 \
+    --hash=sha256:2636cb8c0f1023ef16173f4b9a233bcdb1df11c400c603d5f299fac143ca8d70 \
+    --hash=sha256:29ce02af5fbf9ba6abb70765e66930aedf73311c7d840478f1ccecac53fefbf3 \
+    --hash=sha256:2af323a8aec8a50fa9effa6d640691a30a9f8c4925bd5364a1ca97f1ac6b9b5c \
+    --hash=sha256:30cfea40936afb33b57d24ceaf60d0a2e3d5c1f2335ba2623f21d560737cc730 \
+    --hash=sha256:33afc25057377a6a43c892de34d229a86f89ea6c4ca3dd3db0dcd17becae0dbb \
+    --hash=sha256:36aa56d68ea8def26778eb21576ae13f27b4a47263a7a2581ab2ef58b8de4451 \
+    --hash=sha256:3917b2b3d0dbbe3296505da52b3cb0befbaf76119b2edaff30bd448af20b5400 \
+    --hash=sha256:3aba5c4f97f4e2ce854b5591a8b0711ca3b0c64d1b253b04ea7b004b0a197ef6 \
+    --hash=sha256:3c556f5553368dff690c11d0a1fb435d4ff1f84382d904ccc2dc53beb27ba62e \
+    --hash=sha256:3dc1fb02c6ed0bae1b4bf96971258bf88aea72051b6e4cebae97cff7090c0607 \
+    --hash=sha256:3e8d8de44effe2dbd0d8f3eb9840344b2d5b4cc284a14eb8678aec31d1b6bea8 \
+    --hash=sha256:40ee3821ee90be0f0e95dcf9862d786a7439bd1113e370736bfdf197e9765bfb \
+    --hash=sha256:44367090a5a876809eb24943f31e470ba372aaa0d7396b92b953dda953a95d14 \
+    --hash=sha256:45ff05de889f3dc3d37a59d02096948ce470699f2368b32113954818b21aa74a \
+    --hash=sha256:4690e3af7b134298055993fcbea161598d23b6d3ede11b12dca6815d82d101d5 \
+    --hash=sha256:473f5d921fadc135d1ad698e2697025045cd8ed7e5e842258295012d8a3bc702 \
+    --hash=sha256:47c144117e5c0e2babb559bc8f3f76153863b8dd90b2d550c51dab5f4b84a87f \
+    --hash=sha256:4ac6c3eeed25e3e2cb9b379b48196413e40ac4e2239d910bb33e4e7f6c137745 \
+    --hash=sha256:4b72178b1e565d06ab19319965022b36ef41bcea7ea153b32ec31194bec032a2 \
+    --hash=sha256:4e9ffe358d5fdd6b878a8a364e96e15ca7ca57b92a48f588378cef315a8b019e \
+    --hash=sha256:501dce8eaa537e728aa35810656aa00460a2547dcb60937c8139f36ec344d7fc \
+    --hash=sha256:5378d0baa59ae422905c5f182ea0fd74fe7e52a23e3821067a7d58c8306b2191 \
+    --hash=sha256:542c1e8fddf082159a5d759ee1412c73e944a9a2412077ed00b303ff796907dc \
+    --hash=sha256:63afea5f2d50d931feb20dcc50954e23cef4127606cc0ecf7a27128ed9f9a9e6 \
+    --hash=sha256:658ba9cad0374d37b38c9893f4864f284cdcc7d32041f9808fba8c7bcaadf134 \
+    --hash=sha256:6b661a959226ad0d255e49b77dba1d13782f028589a42dc3172398dd3814c797 \
+    --hash=sha256:72e3488453754bdb45c878e31ce557ea87e1eb0f8b4fc610373da35e8074ce42 \
+    --hash=sha256:7914d0cf083471856e9bc2001102a20f08e82311dfc8cf1a91aa422f9414a0d6 \
+    --hash=sha256:7ab00721304af1ae1afa4313ecfa1bf16b07f55ef91e4a5b93aeaa3e2bd7917c \
+    --hash=sha256:7d0b6b637d05dbdb29d0bfac2ed8425bb369e7af5271b0cc7cf8b801cb7360c2 \
+    --hash=sha256:7e2b3e9ca957153557d06c50a26abaf0d0d6c0ddf462271854c968277a6b5372 \
+    --hash=sha256:7f172e6ba1bee0d4c8f8ebd639577bfe429dee0f3f96775a067b8bae4492d8a0 \
+    --hash=sha256:7f7a5250599c366369fbf3bc4e176f5daa28eb6bc7d6130d02462ed335361675 \
+    --hash=sha256:844c0d1c04c40fd1b60f148dc829d3f69b2de789d0ba239c35136efe9a386529 \
+    --hash=sha256:8643c255a25824ddd0895c59f2319c019e13e949dc37162f876c41a283361527 \
+    --hash=sha256:8795e88adff5aa3c248c1edce932db003d37a623b5787669ccf205c422b91e4a \
+    --hash=sha256:87c727691858fd3a1c085d9980d12395517fcbbf02c69fbb22dede8ee03422da \
+    --hash=sha256:8851584fb931cffc0caa395f6980525fd5116eab8f73ece9d95e6f9c2c326c4c \
+    --hash=sha256:891f95c036df1bc95309951940f8eea8537f102fa65715cdc5aae20b8523813b \
+    --hash=sha256:8c85447569041939111b8c7dbf6f8fa7a0eb5b2c4aebb3c3bec0fb50d7025121 \
+    --hash=sha256:8e0ff16c224d9bfe4e9e6bd0395826096cda4a3ef51e6c301e1b61007ee2bd24 \
+    --hash=sha256:8f83f553f4cde6d3d4eaf58ec11c939c94a0ec545c5b287461cafb184f4b3a14 \
+    --hash=sha256:8f890d04ad33262d0c77ead53c85f13abfb82f2c8f078dfbf24b78f59534dfdd \
+    --hash=sha256:8fdf3721a2aa7d96577970f5604bd81f426969c1822d467f07b3d844fa2fecc7 \
+    --hash=sha256:907f3a8674e489abdcb0206723e5560a5cb1fa42470dcc637942d7b10f28b695 \
+    --hash=sha256:92355f95a0e4da96d4c404aa3cff2ff033f9180a9515f813255e1526551298c1 \
+    --hash=sha256:97a9aea46e2a8371c4cf5386d881de833ed782901ac9f67ebcb63bb3b7d115af \
+    --hash=sha256:988e959f2f3d59ebd9c2962ae71b97c0df58323910d0b368cc190ad07429d1bb \
+    --hash=sha256:99f5c8ab048ee4233cc4f2b461b205cbe01194f6201018174ac269bf09995749 \
+    --hash=sha256:9cd5c03c63ae06d4f876b9844c5898d0044c7940ff7460db9f4cd984ac7862b5 \
+    --hash=sha256:a3b730ef664b2ef0e99dec01b6573b9b085c766400af363833e08ebc1e38eb2f \
+    --hash=sha256:a716e05547a39b788deaf22725490855337fc36613288aa8ae1601dc8c525553 \
+    --hash=sha256:a7ec759c4a0fc820ad5dc6a58e9c391e7b16edcb618056baedbedbb9ea3b1524 \
+    --hash=sha256:aaa6bfc2180c31a45fac35d40e3312a3d09954638ce0b2e9424a88e24d262a13 \
+    --hash=sha256:ad04cf38164d983e85f9cba2804566c0160b47086dcca4cf059f7e26c5ace8ca \
+    --hash=sha256:b2f73f0d0fce5300f23a1383d19b44d103bb113b57a69c36fd95b7c03099b181 \
+    --hash=sha256:b325f42e26659df1a0de66fdb5cde8dd48613da9c99c07d04e9fb9e254b7ee1c \
+    --hash=sha256:b51bab2c4e545dde93cb6d6bb34bf63300b7cd06716f195dd92d9255df728331 \
+    --hash=sha256:b5c3e285e0735fd8c5a26d177eca8b52512cdd8687ca86ec77a0c66e9c510182 \
+    --hash=sha256:b73b493af9e947caed75d329676b1b801d673b17481962823a3e55fe529c8b8b \
+    --hash=sha256:b9d85a02e77ee8ea6d9e3fd5d515bcc3d798d9c1ea54817e5feb97a9bc5d52fe \
+    --hash=sha256:bdcfc88347fd981e53c33d832ce4d3e981a0d696b712fbcb45dcc1a43fe65c65 \
+    --hash=sha256:c594c0abe69d9d6099f4ece17763d53072f65ba60b372d8ba6de8695ce6ee39e \
+    --hash=sha256:c8a9befb0c0369f0cf5c1b94178d0d78f66d9cebb9265b36be6e4f66236076b8 \
+    --hash=sha256:cd174b90db68c3bcca273e9391934a25d76929d727dc75224bf244446b28b03b \
+    --hash=sha256:d5576415f3d76290b160aa093ff968f8bf6de7d681e16e463a0134106b506f49 \
+    --hash=sha256:d654d045adafdcc6c100e8e911508a2eedbd2a1b5f93f930ba13ea67d7704ee9 \
+    --hash=sha256:d92e339c69b585e7b1d857308ad3ca1636b899e4557897ccd91bb9e4a56c965b \
+    --hash=sha256:da3b6987a0bc3e6d0f721b42c7a0198ef897ae50579547b0345f7f02486898f5 \
+    --hash=sha256:dd26b396bc3a1e85f4acebeadbf627fa6117b97f4c10b177d5779577c6607744 \
+    --hash=sha256:de7c1ddb80fa7a3ab045266dca169004b93f284756ad198306533b792774f10a \
+    --hash=sha256:df3ab5e078cab19f7eaeef1d5f063103e1ebf8c26d059767b26a6a0ad8b250a3 \
+    --hash=sha256:e0155a8f079c688c2ccaea05de1ad69877995c547ba3d3612c1c336edc12a3a5 \
+    --hash=sha256:e10c14535abc7ddf3fd024aa36563cd8ab5d2bb6234a5d22c77c30e30fa4fb2b \
+    --hash=sha256:e4396b55a364a03ff7e71a34828c3ed0c506814dd1f50e16ebed3fc447d5188e \
+    --hash=sha256:e5589225c2da4bb732c9c370c5961c39a6db72cf69fb2a28868a5413ed7f39e6 \
+    --hash=sha256:e6576cdc36d5a09b0c1a3d81e13a45d41a6763188f9eaae2da2839e8a4240bce \
+    --hash=sha256:e6850ae33529d1e43791b30575070670070d5fe007c37f5d06aebc1dd152ab3f \
+    --hash=sha256:e9afd97339fc5a20f0542c971f90f3ca97e73d3050cdc488d540b63fae45329a \
+    --hash=sha256:ead50635fb56577c07eff3e557dac39533e0fe603000684eea2af3ed1ad8f941 \
+    --hash=sha256:ed1336a2a6e5c427f419da0154e775834abcbc8ddd703004108121c6dd9eba9d \
+    --hash=sha256:f0c819f83e4f7b7f7463b2dc10d626a8be0c85fbc7b3db0edc098c2b16ac968e \
+    --hash=sha256:f64f01795119880023ba3ce43072283a393f0b90f52b66cc0ea1a89aa64a9ccb \
+    --hash=sha256:f87a7e52f79059f9c58f6886c262061065eb6f7554a587be7ed3aa63e6b71b34 \
+    --hash=sha256:ff835906f84451e143f31c4ce8ad73d83ef4476b944c2a2da91aec8b649570e1
+    # via -r requirements-actions.in
+iniconfig==2.1.0 \
+    --hash=sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7 \
+    --hash=sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760
+    # via pytest
+intelhex==2.3.0 \
+    --hash=sha256:87cc5225657524ec6361354be928adfd56bcf2a3dcc646c40f8f094c39c07db4 \
+    --hash=sha256:892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093
+    # via -r requirements-actions.in
+isort==6.0.1 \
+    --hash=sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450 \
+    --hash=sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615
+    # via pylint
+jinja2==3.1.6 \
+    --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
+    --hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
+    # via
+    #   gcovr
+    #   junit2html
+jmespath==1.0.1 \
+    --hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \
+    --hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe
+    # via botocore
+junit2html==31.0.2 \
+    --hash=sha256:c7fd1f253d423f0df031d0cee8ef7d4d98d9f8bf6383a2d40dca639686814866
+    # via -r requirements-actions.in
+junitparser==3.2.0 \
+    --hash=sha256:b05e89c27e7b74b3c563a078d6e055d95cf397444f8f689b0ca616ebda0b3c65 \
+    --hash=sha256:e14fdc0a999edfc15889b637390e8ef6ca09a49532416d3bd562857d42d4b96d
+    # via -r requirements-actions.in
+lxml==5.3.1 \
+    --hash=sha256:016b96c58e9a4528219bb563acf1aaaa8bc5452e7651004894a973f03b84ba81 \
+    --hash=sha256:05123fad495a429f123307ac6d8fd6f977b71e9a0b6d9aeeb8f80c017cb17131 \
+    --hash=sha256:057e30d0012439bc54ca427a83d458752ccda725c1c161cc283db07bcad43cf9 \
+    --hash=sha256:06a20d607a86fccab2fc15a77aa445f2bdef7b49ec0520a842c5c5afd8381576 \
+    --hash=sha256:094b28ed8a8a072b9e9e2113a81fda668d2053f2ca9f2d202c2c8c7c2d6516b1 \
+    --hash=sha256:0bcfadea3cdc68e678d2b20cb16a16716887dd00a881e16f7d806c2138b8ff0c \
+    --hash=sha256:0d6b2fa86becfa81f0a0271ccb9eb127ad45fb597733a77b92e8a35e53414914 \
+    --hash=sha256:0f2cfae0688fd01f7056a17367e3b84f37c545fb447d7282cf2c242b16262607 \
+    --hash=sha256:106b7b5d2977b339f1e97efe2778e2ab20e99994cbb0ec5e55771ed0795920c8 \
+    --hash=sha256:133f3493253a00db2c870d3740bc458ebb7d937bd0a6a4f9328373e0db305709 \
+    --hash=sha256:136bf638d92848a939fd8f0e06fcf92d9f2e4b57969d94faae27c55f3d85c05b \
+    --hash=sha256:155e1a5693cf4b55af652f5c0f78ef36596c7f680ff3ec6eb4d7d85367259b2c \
+    --hash=sha256:1637fa31ec682cd5760092adfabe86d9b718a75d43e65e211d5931809bc111e7 \
+    --hash=sha256:172d65f7c72a35a6879217bcdb4bb11bc88d55fb4879e7569f55616062d387c2 \
+    --hash=sha256:17b5d7f8acf809465086d498d62a981fa6a56d2718135bb0e4aa48c502055f5c \
+    --hash=sha256:198bb4b4dd888e8390afa4f170d4fa28467a7eaf857f1952589f16cfbb67af27 \
+    --hash=sha256:1b6f92e35e2658a5ed51c6634ceb5ddae32053182851d8cad2a5bc102a359b33 \
+    --hash=sha256:1b92fe86e04f680b848fff594a908edfa72b31bfc3499ef7433790c11d4c8cd8 \
+    --hash=sha256:1bcc211542f7af6f2dfb705f5f8b74e865592778e6cafdfd19c792c244ccce19 \
+    --hash=sha256:1c93ed3c998ea8472be98fb55aed65b5198740bfceaec07b2eba551e55b7b9ae \
+    --hash=sha256:203b1d3eaebd34277be06a3eb880050f18a4e4d60861efba4fb946e31071a295 \
+    --hash=sha256:22ec2b3c191f43ed21f9545e9df94c37c6b49a5af0a874008ddc9132d49a2d9c \
+    --hash=sha256:231cf4d140b22a923b1d0a0a4e0b4f972e5893efcdec188934cc65888fd0227b \
+    --hash=sha256:236610b77589faf462337b3305a1be91756c8abc5a45ff7ca8f245a71c5dab70 \
+    --hash=sha256:29bfc8d3d88e56ea0a27e7c4897b642706840247f59f4377d81be8f32aa0cfbf \
+    --hash=sha256:2b8969dbc8d09d9cd2ae06362c3bad27d03f433252601ef658a49bd9f2b22d79 \
+    --hash=sha256:2dd0b80ac2d8f13ffc906123a6f20b459cb50a99222d0da492360512f3e50f84 \
+    --hash=sha256:2df7ed5edeb6bd5590914cd61df76eb6cce9d590ed04ec7c183cf5509f73530d \
+    --hash=sha256:2e4a570f6a99e96c457f7bec5ad459c9c420ee80b99eb04cbfcfe3fc18ec6423 \
+    --hash=sha256:2f1be45d4c15f237209bbf123a0e05b5d630c8717c42f59f31ea9eae2ad89394 \
+    --hash=sha256:2f23cf50eccb3255b6e913188291af0150d89dab44137a69e14e4dcb7be981f1 \
+    --hash=sha256:3031e4c16b59424e8d78522c69b062d301d951dc55ad8685736c3335a97fc270 \
+    --hash=sha256:33e06717c00c788ab4e79bc4726ecc50c54b9bfb55355eae21473c145d83c2d2 \
+    --hash=sha256:364de8f57d6eda0c16dcfb999af902da31396949efa0e583e12675d09709881b \
+    --hash=sha256:3715cdf0dd31b836433af9ee9197af10e3df41d273c19bb249230043667a5dfd \
+    --hash=sha256:3bb8149840daf2c3f97cebf00e4ed4a65a0baff888bf2605a8d0135ff5cf764e \
+    --hash=sha256:3c3c8b55c7fc7b7e8877b9366568cc73d68b82da7fe33d8b98527b73857a225f \
+    --hash=sha256:3d68eeef7b4d08a25e51897dac29bcb62aba830e9ac6c4e3297ee7c6a0cf6439 \
+    --hash=sha256:3dddf0fb832486cc1ea71d189cb92eb887826e8deebe128884e15020bb6e3f61 \
+    --hash=sha256:3edbb9c9130bac05d8c3fe150c51c337a471cc7fdb6d2a0a7d3a88e88a829314 \
+    --hash=sha256:3effe081b3135237da6e4c4530ff2a868d3f80be0bda027e118a5971285d42d0 \
+    --hash=sha256:422c179022ecdedbe58b0e242607198580804253da220e9454ffe848daa1cfd2 \
+    --hash=sha256:42978a68d3825eaac55399eb37a4d52012a205c0c6262199b8b44fcc6fd686e8 \
+    --hash=sha256:4399b4226c4785575fb20998dc571bc48125dc92c367ce2602d0d70e0c455eb0 \
+    --hash=sha256:45fbb70ccbc8683f2fb58bea89498a7274af1d9ec7995e9f4af5604e028233fc \
+    --hash=sha256:4867361c049761a56bd21de507cab2c2a608c55102311d142ade7dab67b34f32 \
+    --hash=sha256:48fd46bf7155def2e15287c6f2b133a2f78e2d22cdf55647269977b873c65499 \
+    --hash=sha256:4b0d5cdba1b655d5b18042ac9c9ff50bda33568eb80feaaca4fc237b9c4fbfde \
+    --hash=sha256:4df0ec814b50275ad6a99bc82a38b59f90e10e47714ac9871e1b223895825468 \
+    --hash=sha256:4e52e1b148867b01c05e21837586ee307a01e793b94072d7c7b91d2c2da02ffe \
+    --hash=sha256:514fe78fc4b87e7a7601c92492210b20a1b0c6ab20e71e81307d9c2e377c64de \
+    --hash=sha256:524ccfded8989a6595dbdda80d779fb977dbc9a7bc458864fc9a0c2fc15dc877 \
+    --hash=sha256:528f3a0498a8edc69af0559bdcf8a9f5a8bf7c00051a6ef3141fdcf27017bbf5 \
+    --hash=sha256:52d82b0d436edd6a1d22d94a344b9a58abd6c68c357ed44f22d4ba8179b37629 \
+    --hash=sha256:5412500e0dc5481b1ee9cf6b38bb3b473f6e411eb62b83dc9b62699c3b7b79f7 \
+    --hash=sha256:585c4dc429deebc4307187d2b71ebe914843185ae16a4d582ee030e6cfbb4d8a \
+    --hash=sha256:5865b270b420eda7b68928d70bb517ccbe045e53b1a428129bb44372bf3d7dd5 \
+    --hash=sha256:5881aaa4bf3a2d086c5f20371d3a5856199a0d8ac72dd8d0dbd7a2ecfc26ab73 \
+    --hash=sha256:5885bc586f1edb48e5d68e7a4b4757b5feb2a496b64f462b4d65950f5af3364f \
+    --hash=sha256:5a11b16a33656ffc43c92a5343a28dc71eefe460bcc2a4923a96f292692709f6 \
+    --hash=sha256:5a997b784a639e05b9d4053ef3b20c7e447ea80814a762f25b8ed5a89d261eac \
+    --hash=sha256:5be8f5e4044146a69c96077c7e08f0709c13a314aa5315981185c1f00235fe65 \
+    --hash=sha256:63d57fc94eb0bbb4735e45517afc21ef262991d8758a8f2f05dd6e4174944519 \
+    --hash=sha256:673b9d8e780f455091200bba8534d5f4f465944cbdd61f31dc832d70e29064a5 \
+    --hash=sha256:67d2f8ad9dcc3a9e826bdc7802ed541a44e124c29b7d95a679eeb58c1c14ade8 \
+    --hash=sha256:67f5e80adf0aafc7b5454f2c1cb0cde920c9b1f2cbd0485f07cc1d0497c35c5d \
+    --hash=sha256:68018c4c67d7e89951a91fbd371e2e34cd8cfc71f0bb43b5332db38497025d51 \
+    --hash=sha256:6c4dd3bfd0c82400060896717dd261137398edb7e524527438c54a8c34f736bf \
+    --hash=sha256:71f31eda4e370f46af42fc9f264fafa1b09f46ba07bdbee98f25689a04b81c20 \
+    --hash=sha256:7512b4d0fc5339d5abbb14d1843f70499cab90d0b864f790e73f780f041615d7 \
+    --hash=sha256:75fa3d6946d317ffc7016a6fcc44f42db6d514b7fdb8b4b28cbe058303cb6e53 \
+    --hash=sha256:779e851fd0e19795ccc8a9bb4d705d6baa0ef475329fe44a13cf1e962f18ff1e \
+    --hash=sha256:796520afa499732191e39fc95b56a3b07f95256f2d22b1c26e217fb69a9db5b5 \
+    --hash=sha256:7aae7a3d63b935babfdc6864b31196afd5145878ddd22f5200729006366bc4d5 \
+    --hash=sha256:7b82e67c5feb682dbb559c3e6b78355f234943053af61606af126df2183b9ef9 \
+    --hash=sha256:7c0536bd9178f754b277a3e53f90f9c9454a3bd108b1531ffff720e082d824f2 \
+    --hash=sha256:7eda194dd46e40ec745bf76795a7cccb02a6a41f445ad49d3cf66518b0bd9cff \
+    --hash=sha256:82a4bb10b0beef1434fb23a09f001ab5ca87895596b4581fd53f1e5145a8934a \
+    --hash=sha256:85c4f11be9cf08917ac2a5a8b6e1ef63b2f8e3799cec194417e76826e5f1de9c \
+    --hash=sha256:88b72eb7222d918c967202024812c2bfb4048deeb69ca328363fb8e15254c549 \
+    --hash=sha256:89934f9f791566e54c1d92cdc8f8fd0009447a5ecdb1ec6b810d5f8c4955f6be \
+    --hash=sha256:8b1942b3e4ed9ed551ed3083a2e6e0772de1e5e3aca872d955e2e86385fb7ff9 \
+    --hash=sha256:8ffb141361108e864ab5f1813f66e4e1164181227f9b1f105b042729b6c15125 \
+    --hash=sha256:8fffc08de02071c37865a155e5ea5fce0282e1546fd5bde7f6149fcaa32558ac \
+    --hash=sha256:91fb6a43d72b4f8863d21f347a9163eecbf36e76e2f51068d59cd004c506f332 \
+    --hash=sha256:928e75a7200a4c09e6efc7482a1337919cc61fe1ba289f297827a5b76d8969c2 \
+    --hash=sha256:96eef5b9f336f623ffc555ab47a775495e7e8846dde88de5f941e2906453a1ce \
+    --hash=sha256:a0611da6b07dd3720f492db1b463a4d1175b096b49438761cc9f35f0d9eaaef5 \
+    --hash=sha256:a091026c3bf7519ab1e64655a3f52a59ad4a4e019a6f830c24d6430695b1cf6a \
+    --hash=sha256:a22f66270bd6d0804b02cd49dae2b33d4341015545d17f8426f2c4e22f557a23 \
+    --hash=sha256:a243132767150a44e6a93cd1dde41010036e1cbc63cc3e9fe1712b277d926ce3 \
+    --hash=sha256:a31fa7536ec1fb7155a0cd3a4e3d956c835ad0a43e3610ca32384d01f079ea1c \
+    --hash=sha256:a364e8e944d92dcbf33b6b494d4e0fb3499dcc3bd9485beb701aa4b4201fa414 \
+    --hash=sha256:a4058f16cee694577f7e4dd410263cd0ef75644b43802a689c2b3c2a7e69453b \
+    --hash=sha256:a4b382e0e636ed54cd278791d93fe2c4f370772743f02bcbe431a160089025c9 \
+    --hash=sha256:a83d3adea1e0ee36dac34627f78ddd7f093bb9cfc0a8e97f1572a949b695cb98 \
+    --hash=sha256:a8ade0363f776f87f982572c2860cc43c65ace208db49c76df0a21dde4ddd16e \
+    --hash=sha256:aa59974880ab5ad8ef3afaa26f9bda148c5f39e06b11a8ada4660ecc9fb2feb3 \
+    --hash=sha256:aa826340a609d0c954ba52fd831f0fba2a4165659ab0ee1a15e4aac21f302406 \
+    --hash=sha256:aaca5a812f050ab55426c32177091130b1e49329b3f002a32934cd0245571307 \
+    --hash=sha256:ae82fce1d964f065c32c9517309f0c7be588772352d2f40b1574a214bd6e6098 \
+    --hash=sha256:aed57b541b589fa05ac248f4cb1c46cbb432ab82cbd467d1c4f6a2bdc18aecf9 \
+    --hash=sha256:afa578b6524ff85fb365f454cf61683771d0170470c48ad9d170c48075f86725 \
+    --hash=sha256:b0884e3f22d87c30694e625b1e62e6f30d39782c806287450d9dc2fdf07692fd \
+    --hash=sha256:b2aca14c235c7a08558fe0a4786a1a05873a01e86b474dfa8f6df49101853a4e \
+    --hash=sha256:b450d7cabcd49aa7ab46a3c6aa3ac7e1593600a1a0605ba536ec0f1b99a04322 \
+    --hash=sha256:b725e70d15906d24615201e650d5b0388b08a5187a55f119f25874d0103f90dd \
+    --hash=sha256:bfbbab9316330cf81656fed435311386610f78b6c93cc5db4bebbce8dd146675 \
+    --hash=sha256:c093c7088b40d8266f57ed71d93112bd64c6724d31f0794c1e52cc4857c28e0e \
+    --hash=sha256:c2e49dc23a10a1296b04ca9db200c44d3eb32c8d8ec532e8c1fd24792276522a \
+    --hash=sha256:c4393600915c308e546dc7003d74371744234e8444a28622d76fe19b98fa59d1 \
+    --hash=sha256:c5ae125276f254b01daa73e2c103363d3e99e3e10505686ac7d9d2442dd4627a \
+    --hash=sha256:c6aacf00d05b38a5069826e50ae72751cb5bc27bdc4d5746203988e429b385bb \
+    --hash=sha256:c76722b5ed4a31ba103e0dc77ab869222ec36efe1a614e42e9bcea88a36186fe \
+    --hash=sha256:c809eef167bf4a57af4b03007004896f5c60bd38dc3852fcd97a26eae3d4c9e6 \
+    --hash=sha256:c92ea6d9dd84a750b2bae72ff5e8cf5fdd13e58dda79c33e057862c29a8d5b50 \
+    --hash=sha256:cb659702a45136c743bc130760c6f137870d4df3a9e14386478b8a0511abcfca \
+    --hash=sha256:ce0930a963ff593e8bb6fda49a503911accc67dee7e5445eec972668e672a0f0 \
+    --hash=sha256:d0751528b97d2b19a388b302be2a0ee05817097bab46ff0ed76feeec24951f78 \
+    --hash=sha256:d184f85ad2bb1f261eac55cddfcf62a70dee89982c978e92b9a74a1bfef2e367 \
+    --hash=sha256:d2a3e412ce1849be34b45922bfef03df32d1410a06d1cdeb793a343c2f1fd666 \
+    --hash=sha256:d61ec60945d694df806a9aec88e8f29a27293c6e424f8ff91c80416e3c617645 \
+    --hash=sha256:db0c742aad702fd5d0c6611a73f9602f20aec2007c102630c06d7633d9c8f09a \
+    --hash=sha256:db4743e30d6f5f92b6d2b7c86b3ad250e0bad8dee4b7ad8a0c44bfb276af89a3 \
+    --hash=sha256:dbf7bebc2275016cddf3c997bf8a0f7044160714c64a9b83975670a04e6d2252 \
+    --hash=sha256:de1fc314c3ad6bc2f6bd5b5a5b9357b8c6896333d27fdbb7049aea8bd5af2d79 \
+    --hash=sha256:df7e5edac4778127f2bf452e0721a58a1cfa4d1d9eac63bdd650535eb8543615 \
+    --hash=sha256:e220f7b3e8656ab063d2eb0cd536fafef396829cafe04cb314e734f87649058f \
+    --hash=sha256:e3c623923967f3e5961d272718655946e5322b8d058e094764180cdee7bab1af \
+    --hash=sha256:e69add9b6b7b08c60d7ff0152c7c9a6c45b4a71a919be5abde6f98f1ea16421c \
+    --hash=sha256:e8e0d177b1fe251c3b1b914ab64135475c5273c8cfd2857964b2e3bb0fe196a7 \
+    --hash=sha256:ef45f31aec9be01379fc6c10f1d9c677f032f2bac9383c827d44f620e8a88407 \
+    --hash=sha256:f1208c1c67ec9e151d78aa3435aa9b08a488b53d9cfac9b699f15255a3461ef2 \
+    --hash=sha256:f12582b8d3b4c6be1d298c49cb7ae64a3a73efaf4c2ab4e37db182e3545815ac \
+    --hash=sha256:f1de541a9893cf8a1b1db9bf0bf670a2decab42e3e82233d36a74eda7822b4c9 \
+    --hash=sha256:f4eac0584cdc3285ef2e74eee1513a6001681fd9753b259e8159421ed28a72e5 \
+    --hash=sha256:f7b64fcd670bca8800bc10ced36620c6bbb321e7bc1214b9c0c0df269c1dddc2 \
+    --hash=sha256:fb7c61d4be18e930f75948705e9718618862e6fc2ed0d7159b2262be73f167a2
+    # via
+    #   -r requirements-actions.in
+    #   gcovr
+markupsafe==3.0.2 \
+    --hash=sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4 \
+    --hash=sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30 \
+    --hash=sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0 \
+    --hash=sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9 \
+    --hash=sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396 \
+    --hash=sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13 \
+    --hash=sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028 \
+    --hash=sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca \
+    --hash=sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557 \
+    --hash=sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832 \
+    --hash=sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0 \
+    --hash=sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b \
+    --hash=sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579 \
+    --hash=sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a \
+    --hash=sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c \
+    --hash=sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff \
+    --hash=sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c \
+    --hash=sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22 \
+    --hash=sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094 \
+    --hash=sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb \
+    --hash=sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e \
+    --hash=sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5 \
+    --hash=sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a \
+    --hash=sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d \
+    --hash=sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a \
+    --hash=sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b \
+    --hash=sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8 \
+    --hash=sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225 \
+    --hash=sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c \
+    --hash=sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144 \
+    --hash=sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f \
+    --hash=sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87 \
+    --hash=sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d \
+    --hash=sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93 \
+    --hash=sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf \
+    --hash=sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158 \
+    --hash=sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84 \
+    --hash=sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb \
+    --hash=sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48 \
+    --hash=sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171 \
+    --hash=sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c \
+    --hash=sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6 \
+    --hash=sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd \
+    --hash=sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d \
+    --hash=sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1 \
+    --hash=sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d \
+    --hash=sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca \
+    --hash=sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a \
+    --hash=sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29 \
+    --hash=sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe \
+    --hash=sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798 \
+    --hash=sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c \
+    --hash=sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8 \
+    --hash=sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f \
+    --hash=sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f \
+    --hash=sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a \
+    --hash=sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178 \
+    --hash=sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0 \
+    --hash=sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79 \
+    --hash=sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430 \
+    --hash=sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50
+    # via jinja2
+mccabe==0.7.0 \
+    --hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325 \
+    --hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e
+    # via pylint
+mock==5.2.0 \
+    --hash=sha256:4e460e818629b4b173f32d08bf30d3af8123afbb8e04bb5707a1fd4799e503f0 \
+    --hash=sha256:7ba87f72ca0e915175596069dbbcc7c75af7b5e9b9bc107ad6349ede0819982f
+    # via -r requirements-actions.in
+msgpack==1.1.0 ; sys_platform != 'win32' \
+    --hash=sha256:06f5fd2f6bb2a7914922d935d3b8bb4a7fff3a9a91cfce6d06c13bc42bec975b \
+    --hash=sha256:071603e2f0771c45ad9bc65719291c568d4edf120b44eb36324dcb02a13bfddf \
+    --hash=sha256:0907e1a7119b337971a689153665764adc34e89175f9a34793307d9def08e6ca \
+    --hash=sha256:0f92a83b84e7c0749e3f12821949d79485971f087604178026085f60ce109330 \
+    --hash=sha256:115a7af8ee9e8cddc10f87636767857e7e3717b7a2e97379dc2054712693e90f \
+    --hash=sha256:13599f8829cfbe0158f6456374e9eea9f44eee08076291771d8ae93eda56607f \
+    --hash=sha256:17fb65dd0bec285907f68b15734a993ad3fc94332b5bb21b0435846228de1f39 \
+    --hash=sha256:2137773500afa5494a61b1208619e3871f75f27b03bcfca7b3a7023284140247 \
+    --hash=sha256:3180065ec2abbe13a4ad37688b61b99d7f9e012a535b930e0e683ad6bc30155b \
+    --hash=sha256:398b713459fea610861c8a7b62a6fec1882759f308ae0795b5413ff6a160cf3c \
+    --hash=sha256:3d364a55082fb2a7416f6c63ae383fbd903adb5a6cf78c5b96cc6316dc1cedc7 \
+    --hash=sha256:3df7e6b05571b3814361e8464f9304c42d2196808e0119f55d0d3e62cd5ea044 \
+    --hash=sha256:41c991beebf175faf352fb940bf2af9ad1fb77fd25f38d9142053914947cdbf6 \
+    --hash=sha256:42f754515e0f683f9c79210a5d1cad631ec3d06cea5172214d2176a42e67e19b \
+    --hash=sha256:452aff037287acb1d70a804ffd022b21fa2bb7c46bee884dbc864cc9024128a0 \
+    --hash=sha256:4676e5be1b472909b2ee6356ff425ebedf5142427842aa06b4dfd5117d1ca8a2 \
+    --hash=sha256:46c34e99110762a76e3911fc923222472c9d681f1094096ac4102c18319e6468 \
+    --hash=sha256:471e27a5787a2e3f974ba023f9e265a8c7cfd373632247deb225617e3100a3c7 \
+    --hash=sha256:4a1964df7b81285d00a84da4e70cb1383f2e665e0f1f2a7027e683956d04b734 \
+    --hash=sha256:4b51405e36e075193bc051315dbf29168d6141ae2500ba8cd80a522964e31434 \
+    --hash=sha256:4d1b7ff2d6146e16e8bd665ac726a89c74163ef8cd39fa8c1087d4e52d3a2325 \
+    --hash=sha256:53258eeb7a80fc46f62fd59c876957a2d0e15e6449a9e71842b6d24419d88ca1 \
+    --hash=sha256:534480ee5690ab3cbed89d4c8971a5c631b69a8c0883ecfea96c19118510c846 \
+    --hash=sha256:58638690ebd0a06427c5fe1a227bb6b8b9fdc2bd07701bec13c2335c82131a88 \
+    --hash=sha256:58dfc47f8b102da61e8949708b3eafc3504509a5728f8b4ddef84bd9e16ad420 \
+    --hash=sha256:59caf6a4ed0d164055ccff8fe31eddc0ebc07cf7326a2aaa0dbf7a4001cd823e \
+    --hash=sha256:5dbad74103df937e1325cc4bfeaf57713be0b4f15e1c2da43ccdd836393e2ea2 \
+    --hash=sha256:5e1da8f11a3dd397f0a32c76165cf0c4eb95b31013a94f6ecc0b280c05c91b59 \
+    --hash=sha256:646afc8102935a388ffc3914b336d22d1c2d6209c773f3eb5dd4d6d3b6f8c1cb \
+    --hash=sha256:64fc9068d701233effd61b19efb1485587560b66fe57b3e50d29c5d78e7fef68 \
+    --hash=sha256:65553c9b6da8166e819a6aa90ad15288599b340f91d18f60b2061f402b9a4915 \
+    --hash=sha256:685ec345eefc757a7c8af44a3032734a739f8c45d1b0ac45efc5d8977aa4720f \
+    --hash=sha256:6ad622bf7756d5a497d5b6836e7fc3752e2dd6f4c648e24b1803f6048596f701 \
+    --hash=sha256:73322a6cc57fcee3c0c57c4463d828e9428275fb85a27aa2aa1a92fdc42afd7b \
+    --hash=sha256:74bed8f63f8f14d75eec75cf3d04ad581da6b914001b474a5d3cd3372c8cc27d \
+    --hash=sha256:79ec007767b9b56860e0372085f8504db5d06bd6a327a335449508bbee9648fa \
+    --hash=sha256:7a946a8992941fea80ed4beae6bff74ffd7ee129a90b4dd5cf9c476a30e9708d \
+    --hash=sha256:7ad442d527a7e358a469faf43fda45aaf4ac3249c8310a82f0ccff9164e5dccd \
+    --hash=sha256:7c9a35ce2c2573bada929e0b7b3576de647b0defbd25f5139dcdaba0ae35a4cc \
+    --hash=sha256:7e7b853bbc44fb03fbdba34feb4bd414322180135e2cb5164f20ce1c9795ee48 \
+    --hash=sha256:879a7b7b0ad82481c52d3c7eb99bf6f0645dbdec5134a4bddbd16f3506947feb \
+    --hash=sha256:8a706d1e74dd3dea05cb54580d9bd8b2880e9264856ce5068027eed09680aa74 \
+    --hash=sha256:8a84efb768fb968381e525eeeb3d92857e4985aacc39f3c47ffd00eb4509315b \
+    --hash=sha256:8cf9e8c3a2153934a23ac160cc4cba0ec035f6867c8013cc6077a79823370346 \
+    --hash=sha256:8da4bf6d54ceed70e8861f833f83ce0814a2b72102e890cbdfe4b34764cdd66e \
+    --hash=sha256:8e59bca908d9ca0de3dc8684f21ebf9a690fe47b6be93236eb40b99af28b6ea6 \
+    --hash=sha256:914571a2a5b4e7606997e169f64ce53a8b1e06f2cf2c3a7273aa106236d43dd5 \
+    --hash=sha256:a51abd48c6d8ac89e0cfd4fe177c61481aca2d5e7ba42044fd218cfd8ea9899f \
+    --hash=sha256:a52a1f3a5af7ba1c9ace055b659189f6c669cf3657095b50f9602af3a3ba0fe5 \
+    --hash=sha256:ad33e8400e4ec17ba782f7b9cf868977d867ed784a1f5f2ab46e7ba53b6e1e1b \
+    --hash=sha256:b4c01941fd2ff87c2a934ee6055bda4ed353a7846b8d4f341c428109e9fcde8c \
+    --hash=sha256:bce7d9e614a04d0883af0b3d4d501171fbfca038f12c77fa838d9f198147a23f \
+    --hash=sha256:c40ffa9a15d74e05ba1fe2681ea33b9caffd886675412612d93ab17b58ea2fec \
+    --hash=sha256:c5a91481a3cc573ac8c0d9aace09345d989dc4a0202b7fcb312c88c26d4e71a8 \
+    --hash=sha256:c921af52214dcbb75e6bdf6a661b23c3e6417f00c603dd2070bccb5c3ef499f5 \
+    --hash=sha256:d46cf9e3705ea9485687aa4001a76e44748b609d260af21c4ceea7f2212a501d \
+    --hash=sha256:d8ce0b22b890be5d252de90d0e0d119f363012027cf256185fc3d474c44b1b9e \
+    --hash=sha256:dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e \
+    --hash=sha256:e0856a2b7e8dcb874be44fea031d22e5b3a19121be92a1e098f46068a11b0870 \
+    --hash=sha256:e1f3c3d21f7cf67bcf2da8e494d30a75e4cf60041d98b3f79875afb5b96f3a3f \
+    --hash=sha256:f1ba6136e650898082d9d5a5217d5906d1e138024f836ff48691784bbe1adf96 \
+    --hash=sha256:f3e9b4936df53b970513eac1758f3882c88658a220b58dcc1e39606dccaaf01c \
+    --hash=sha256:f80bc7d47f76089633763f952e67f8214cb7b3ee6bfa489b3cb6a84cfac114cd \
+    --hash=sha256:fd2906780f25c8ed5d7b323379f6138524ba793428db5d0e9d226d3fa6aa1788
+    # via python-can
+mypy==1.15.0 \
+    --hash=sha256:1124a18bc11a6a62887e3e137f37f53fbae476dc36c185d549d4f837a2a6a14e \
+    --hash=sha256:171a9ca9a40cd1843abeca0e405bc1940cd9b305eaeea2dda769ba096932bb22 \
+    --hash=sha256:1905f494bfd7d85a23a88c5d97840888a7bd516545fc5aaedff0267e0bb54e2f \
+    --hash=sha256:1fbb8da62dc352133d7d7ca90ed2fb0e9d42bb1a32724c287d3c76c58cbaa9c2 \
+    --hash=sha256:2922d42e16d6de288022e5ca321cd0618b238cfc5570e0263e5ba0a77dbef56f \
+    --hash=sha256:2e2c2e6d3593f6451b18588848e66260ff62ccca522dd231cd4dd59b0160668b \
+    --hash=sha256:2ee2d57e01a7c35de00f4634ba1bbf015185b219e4dc5909e281016df43f5ee5 \
+    --hash=sha256:2f2147ab812b75e5b5499b01ade1f4a81489a147c01585cda36019102538615f \
+    --hash=sha256:404534629d51d3efea5c800ee7c42b72a6554d6c400e6a79eafe15d11341fd43 \
+    --hash=sha256:5469affef548bd1895d86d3bf10ce2b44e33d86923c29e4d675b3e323437ea3e \
+    --hash=sha256:5a95fb17c13e29d2d5195869262f8125dfdb5c134dc8d9a9d0aecf7525b10c2c \
+    --hash=sha256:6983aae8b2f653e098edb77f893f7b6aca69f6cffb19b2cc7443f23cce5f4828 \
+    --hash=sha256:712e962a6357634fef20412699a3655c610110e01cdaa6180acec7fc9f8513ba \
+    --hash=sha256:8023ff13985661b50a5928fc7a5ca15f3d1affb41e5f0a9952cb68ef090b31ee \
+    --hash=sha256:811aeccadfb730024c5d3e326b2fbe9249bb7413553f15499a4050f7c30e801d \
+    --hash=sha256:8f8722560a14cde92fdb1e31597760dc35f9f5524cce17836c0d22841830fd5b \
+    --hash=sha256:93faf3fdb04768d44bf28693293f3904bbb555d076b781ad2530214ee53e3445 \
+    --hash=sha256:973500e0774b85d9689715feeffcc980193086551110fd678ebe1f4342fb7c5e \
+    --hash=sha256:979e4e1a006511dacf628e36fadfecbcc0160a8af6ca7dad2f5025529e082c13 \
+    --hash=sha256:98b7b9b9aedb65fe628c62a6dc57f6d5088ef2dfca37903a7d9ee374d03acca5 \
+    --hash=sha256:aea39e0583d05124836ea645f412e88a5c7d0fd77a6d694b60d9b6b2d9f184fd \
+    --hash=sha256:b9378e2c00146c44793c98b8d5a61039a048e31f429fb0eb546d93f4b000bedf \
+    --hash=sha256:baefc32840a9f00babd83251560e0ae1573e2f9d1b067719479bfb0e987c6357 \
+    --hash=sha256:be68172e9fd9ad8fb876c6389f16d1c1b5f100ffa779f77b1fb2176fcc9ab95b \
+    --hash=sha256:c43a7682e24b4f576d93072216bf56eeff70d9140241f9edec0c104d0c515036 \
+    --hash=sha256:c4bb0e1bd29f7d34efcccd71cf733580191e9a264a2202b0239da95984c5b559 \
+    --hash=sha256:c7be1e46525adfa0d97681432ee9fcd61a3964c2446795714699a998d193f1a3 \
+    --hash=sha256:c9817fa23833ff189db061e6d2eff49b2f3b6ed9856b4a0a73046e41932d744f \
+    --hash=sha256:ce436f4c6d218a070048ed6a44c0bbb10cd2cc5e272b29e7845f6a2f57ee4464 \
+    --hash=sha256:d10d994b41fb3497719bbf866f227b3489048ea4bbbb5015357db306249f7980 \
+    --hash=sha256:e601a7fa172c2131bff456bb3ee08a88360760d0d2f8cbd7a75a65497e2df078 \
+    --hash=sha256:f95579473af29ab73a10bada2f9722856792a36ec5af5399b653aa28360290a5
+    # via -r requirements-actions.in
+mypy-extensions==1.0.0 \
+    --hash=sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d \
+    --hash=sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782
+    # via mypy
+natsort==8.4.0 \
+    --hash=sha256:45312c4a0e5507593da193dedd04abb1469253b601ecaf63445ad80f0a1ea581 \
+    --hash=sha256:4732914fb471f56b5cce04d7bae6f164a592c7712e1c85f9ef585e197299521c
+    # via -r requirements-actions.in
+packaging==24.2 \
+    --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
+    --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
+    # via
+    #   pyproject-api
+    #   pytest
+    #   python-can
+    #   tox
+    #   west
+pathspec==0.12.1 \
+    --hash=sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 \
+    --hash=sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712
+    # via yamllint
+platformdirs==4.3.7 \
+    --hash=sha256:a03875334331946f13c549dbd8f4bac7a13a50a895a0eb1e8c6a8ace80d40a94 \
+    --hash=sha256:eb437d586b6a0986388f0d6f74aa0cde27b48d0e3d66843640bfb6bdcdb6e351
+    # via
+    #   pylint
+    #   tox
+    #   virtualenv
+pluggy==1.5.0 \
+    --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
+    --hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
+    # via
+    #   pytest
+    #   tox
+ply==3.11 \
+    --hash=sha256:00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3 \
+    --hash=sha256:096f9b8350b65ebd2fd1346b12452efe5b9607f7482813ffca50c22722a807ce
+    # via -r requirements-actions.in
+polib==1.2.0 \
+    --hash=sha256:1c77ee1b81feb31df9bca258cbc58db1bbb32d10214b173882452c73af06d62d \
+    --hash=sha256:f3ef94aefed6e183e342a8a269ae1fc4742ba193186ad76f175938621dbfc26b
+    # via sphinx-lint
+progress==1.6 \
+    --hash=sha256:c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd
+    # via -r requirements-actions.in
+psutil==7.0.0 \
+    --hash=sha256:101d71dc322e3cffd7cea0650b09b3d08b8e7c4109dd6809fe452dfd00e58b25 \
+    --hash=sha256:1e744154a6580bc968a0195fd25e80432d3afec619daf145b9e5ba16cc1d688e \
+    --hash=sha256:1fcee592b4c6f146991ca55919ea3d1f8926497a713ed7faaf8225e174581e91 \
+    --hash=sha256:39db632f6bb862eeccf56660871433e111b6ea58f2caea825571951d4b6aa3da \
+    --hash=sha256:4b1388a4f6875d7e2aff5c4ca1cc16c545ed41dd8bb596cefea80111db353a34 \
+    --hash=sha256:4cf3d4eb1aa9b348dec30105c55cd9b7d4629285735a102beb4441e38db90553 \
+    --hash=sha256:7be9c3eba38beccb6495ea33afd982a44074b78f28c434a1f51cc07fd315c456 \
+    --hash=sha256:84df4eb63e16849689f76b1ffcb36db7b8de703d1bc1fe41773db487621b6c17 \
+    --hash=sha256:a5f098451abc2828f7dc6b58d44b532b22f2088f4999a937557b603ce72b1993 \
+    --hash=sha256:ba3fcef7523064a6c9da440fc4d6bd07da93ac726b5733c29027d7dc95b39d99
+    # via -r requirements-actions.in
+pyasn1==0.6.1 \
+    --hash=sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629 \
+    --hash=sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034
+    # via rsa
+pycparser==2.22 \
+    --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
+    --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
+    # via cffi
+pyelftools==0.32 \
+    --hash=sha256:013df952a006db5e138b1edf6d8a68ecc50630adbd0d83a2d41e7f846163d738 \
+    --hash=sha256:6de90ee7b8263e740c8715a925382d4099b354f29ac48ea40d840cf7aa14ace5
+    # via -r requirements-actions.in
+pygithub==2.6.1 \
+    --hash=sha256:6f2fa6d076ccae475f9fc392cc6cdbd54db985d4f69b8833a28397de75ed6ca3 \
+    --hash=sha256:b5c035392991cca63959e9453286b41b54d83bf2de2daa7d7ff7e4312cebf3bf
+    # via -r requirements-actions.in
+pygments==2.19.1 \
+    --hash=sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f \
+    --hash=sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c
+    # via gcovr
+pyjwt==2.10.1 \
+    --hash=sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953 \
+    --hash=sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb
+    # via pygithub
+pykwalify==1.8.0 \
+    --hash=sha256:731dfa87338cca9f559d1fca2bdea37299116e3139b73f78ca90a543722d6651 \
+    --hash=sha256:796b2ad3ed4cb99b88308b533fb2f559c30fa6efb4fa9fda11347f483d245884
+    # via
+    #   -r requirements-actions.in
+    #   west
+pylint==3.3.6 \
+    --hash=sha256:8b7c2d3e86ae3f94fb27703d521dd0b9b6b378775991f504d7c3a6275aa0a6a6 \
+    --hash=sha256:b634a041aac33706d56a0d217e6587228c66427e20ec21a019bc4cdee48c040a
+    # via -r requirements-actions.in
+pynacl==1.5.0 \
+    --hash=sha256:06b8f6fa7f5de8d5d2f7573fe8c863c051225a27b61e6860fd047b1775807858 \
+    --hash=sha256:0c84947a22519e013607c9be43706dd42513f9e6ae5d39d3613ca1e142fba44d \
+    --hash=sha256:20f42270d27e1b6a29f54032090b972d97f0a1b0948cc52392041ef7831fee93 \
+    --hash=sha256:401002a4aaa07c9414132aaed7f6836ff98f59277a234704ff66878c2ee4a0d1 \
+    --hash=sha256:52cb72a79269189d4e0dc537556f4740f7f0a9ec41c1322598799b0bdad4ef92 \
+    --hash=sha256:61f642bf2378713e2c2e1de73444a3778e5f0a38be6fee0fe532fe30060282ff \
+    --hash=sha256:8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba \
+    --hash=sha256:a36d4a9dda1f19ce6e03c9a784a2921a4b726b02e1c736600ca9c22029474394 \
+    --hash=sha256:a422368fc821589c228f4c49438a368831cb5bbc0eab5ebe1d7fac9dded6567b \
+    --hash=sha256:e46dae94e34b085175f8abb3b0aaa7da40767865ac82c928eeb9e57e1ea8a543
+    # via pygithub
+pyproject-api==1.9.0 \
+    --hash=sha256:326df9d68dea22d9d98b5243c46e3ca3161b07a1b9b18e213d1e24fd0e605766 \
+    --hash=sha256:7e8a9854b2dfb49454fae421cb86af43efbb2b2454e5646ffb7623540321ae6e
+    # via tox
+pyserial==3.5 \
+    --hash=sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb \
+    --hash=sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0
+    # via -r requirements-actions.in
+pytest==8.3.5 \
+    --hash=sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820 \
+    --hash=sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845
+    # via -r requirements-actions.in
+python-can==4.5.0 \
+    --hash=sha256:1eec66833c1ac76a7e3d636ee0f8b4ba2752e892bab1c56ce74308b2216b5445 \
+    --hash=sha256:d3684cebe5b028a148c1742b3a45cec4fcaf83a7f7c52d0680b2eaeaf52f8eb7
+    # via canopen
+python-dateutil==2.9.0.post0 \
+    --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
+    --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
+    # via
+    #   arrow
+    #   botocore
+    #   pykwalify
+python-magic==0.4.27 ; sys_platform != 'win32' \
+    --hash=sha256:c1ba14b08e4a5f5c31a302b7721239695b2f0f058d125bd5ce1ee36b9d9d3c3b \
+    --hash=sha256:c212960ad306f700aa0d01e5d7a325d20548ff97eb9920dcd29513174f0294d3
+    # via -r requirements-actions.in
+python-magic-bin==0.4.14 ; sys_platform == 'win32' \
+    --hash=sha256:34a788c03adde7608028203e2dbb208f1f62225ad91518787ae26d603ae68892 \
+    --hash=sha256:7b1743b3dbf16601d6eedf4e7c2c9a637901b0faaf24ad4df4d4527e7d8f66a4 \
+    --hash=sha256:90be6206ad31071a36065a2fc169c5afb5e0355cbe6030e87641c6c62edc2b69
+    # via -r requirements-actions.in
+pyyaml==6.0.2 \
+    --hash=sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff \
+    --hash=sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48 \
+    --hash=sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086 \
+    --hash=sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e \
+    --hash=sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133 \
+    --hash=sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5 \
+    --hash=sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484 \
+    --hash=sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee \
+    --hash=sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5 \
+    --hash=sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68 \
+    --hash=sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a \
+    --hash=sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf \
+    --hash=sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99 \
+    --hash=sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8 \
+    --hash=sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85 \
+    --hash=sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19 \
+    --hash=sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc \
+    --hash=sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a \
+    --hash=sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1 \
+    --hash=sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317 \
+    --hash=sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c \
+    --hash=sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631 \
+    --hash=sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d \
+    --hash=sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652 \
+    --hash=sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5 \
+    --hash=sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e \
+    --hash=sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b \
+    --hash=sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8 \
+    --hash=sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476 \
+    --hash=sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706 \
+    --hash=sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563 \
+    --hash=sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237 \
+    --hash=sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b \
+    --hash=sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083 \
+    --hash=sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180 \
+    --hash=sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425 \
+    --hash=sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e \
+    --hash=sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f \
+    --hash=sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725 \
+    --hash=sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183 \
+    --hash=sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab \
+    --hash=sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774 \
+    --hash=sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725 \
+    --hash=sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e \
+    --hash=sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5 \
+    --hash=sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d \
+    --hash=sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290 \
+    --hash=sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44 \
+    --hash=sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed \
+    --hash=sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4 \
+    --hash=sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba \
+    --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
+    --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
+    # via
+    #   -r requirements-actions.in
+    #   awscli
+    #   west
+    #   yamllint
+regex==2024.11.6 \
+    --hash=sha256:02a02d2bb04fec86ad61f3ea7f49c015a0681bf76abb9857f945d26159d2968c \
+    --hash=sha256:02e28184be537f0e75c1f9b2f8847dc51e08e6e171c6bde130b2687e0c33cf60 \
+    --hash=sha256:040df6fe1a5504eb0f04f048e6d09cd7c7110fef851d7c567a6b6e09942feb7d \
+    --hash=sha256:068376da5a7e4da51968ce4c122a7cd31afaaec4fccc7856c92f63876e57b51d \
+    --hash=sha256:06eb1be98df10e81ebaded73fcd51989dcf534e3c753466e4b60c4697a003b67 \
+    --hash=sha256:072623554418a9911446278f16ecb398fb3b540147a7828c06e2011fa531e773 \
+    --hash=sha256:086a27a0b4ca227941700e0b31425e7a28ef1ae8e5e05a33826e17e47fbfdba0 \
+    --hash=sha256:08986dce1339bc932923e7d1232ce9881499a0e02925f7402fb7c982515419ef \
+    --hash=sha256:0a86e7eeca091c09e021db8eb72d54751e527fa47b8d5787caf96d9831bd02ad \
+    --hash=sha256:0c32f75920cf99fe6b6c539c399a4a128452eaf1af27f39bce8909c9a3fd8cbe \
+    --hash=sha256:0d7f453dca13f40a02b79636a339c5b62b670141e63efd511d3f8f73fba162b3 \
+    --hash=sha256:1062b39a0a2b75a9c694f7a08e7183a80c63c0d62b301418ffd9c35f55aaa114 \
+    --hash=sha256:13291b39131e2d002a7940fb176e120bec5145f3aeb7621be6534e46251912c4 \
+    --hash=sha256:149f5008d286636e48cd0b1dd65018548944e495b0265b45e1bffecce1ef7f39 \
+    --hash=sha256:164d8b7b3b4bcb2068b97428060b2a53be050085ef94eca7f240e7947f1b080e \
+    --hash=sha256:167ed4852351d8a750da48712c3930b031f6efdaa0f22fa1933716bfcd6bf4a3 \
+    --hash=sha256:1c4de13f06a0d54fa0d5ab1b7138bfa0d883220965a29616e3ea61b35d5f5fc7 \
+    --hash=sha256:202eb32e89f60fc147a41e55cb086db2a3f8cb82f9a9a88440dcfc5d37faae8d \
+    --hash=sha256:220902c3c5cc6af55d4fe19ead504de80eb91f786dc102fbd74894b1551f095e \
+    --hash=sha256:2b3361af3198667e99927da8b84c1b010752fa4b1115ee30beaa332cabc3ef1a \
+    --hash=sha256:2c89a8cc122b25ce6945f0423dc1352cb9593c68abd19223eebbd4e56612c5b7 \
+    --hash=sha256:2d548dafee61f06ebdb584080621f3e0c23fff312f0de1afc776e2a2ba99a74f \
+    --hash=sha256:2e34b51b650b23ed3354b5a07aab37034d9f923db2a40519139af34f485f77d0 \
+    --hash=sha256:32f9a4c643baad4efa81d549c2aadefaeba12249b2adc5af541759237eee1c54 \
+    --hash=sha256:3a51ccc315653ba012774efca4f23d1d2a8a8f278a6072e29c7147eee7da446b \
+    --hash=sha256:3cde6e9f2580eb1665965ce9bf17ff4952f34f5b126beb509fee8f4e994f143c \
+    --hash=sha256:40291b1b89ca6ad8d3f2b82782cc33807f1406cf68c8d440861da6304d8ffbbd \
+    --hash=sha256:41758407fc32d5c3c5de163888068cfee69cb4c2be844e7ac517a52770f9af57 \
+    --hash=sha256:4181b814e56078e9b00427ca358ec44333765f5ca1b45597ec7446d3a1ef6e34 \
+    --hash=sha256:4f51f88c126370dcec4908576c5a627220da6c09d0bff31cfa89f2523843316d \
+    --hash=sha256:50153825ee016b91549962f970d6a4442fa106832e14c918acd1c8e479916c4f \
+    --hash=sha256:5056b185ca113c88e18223183aa1a50e66507769c9640a6ff75859619d73957b \
+    --hash=sha256:5071b2093e793357c9d8b2929dfc13ac5f0a6c650559503bb81189d0a3814519 \
+    --hash=sha256:525eab0b789891ac3be914d36893bdf972d483fe66551f79d3e27146191a37d4 \
+    --hash=sha256:52fb28f528778f184f870b7cf8f225f5eef0a8f6e3778529bdd40c7b3920796a \
+    --hash=sha256:5478c6962ad548b54a591778e93cd7c456a7a29f8eca9c49e4f9a806dcc5d638 \
+    --hash=sha256:5670bce7b200273eee1840ef307bfa07cda90b38ae56e9a6ebcc9f50da9c469b \
+    --hash=sha256:5704e174f8ccab2026bd2f1ab6c510345ae8eac818b613d7d73e785f1310f839 \
+    --hash=sha256:59dfe1ed21aea057a65c6b586afd2a945de04fc7db3de0a6e3ed5397ad491b07 \
+    --hash=sha256:5e7e351589da0850c125f1600a4c4ba3c722efefe16b297de54300f08d734fbf \
+    --hash=sha256:63b13cfd72e9601125027202cad74995ab26921d8cd935c25f09c630436348ff \
+    --hash=sha256:658f90550f38270639e83ce492f27d2c8d2cd63805c65a13a14d36ca126753f0 \
+    --hash=sha256:684d7a212682996d21ca12ef3c17353c021fe9de6049e19ac8481ec35574a70f \
+    --hash=sha256:69ab78f848845569401469da20df3e081e6b5a11cb086de3eed1d48f5ed57c95 \
+    --hash=sha256:6f44ec28b1f858c98d3036ad5d7d0bfc568bdd7a74f9c24e25f41ef1ebfd81a4 \
+    --hash=sha256:70b7fa6606c2881c1db9479b0eaa11ed5dfa11c8d60a474ff0e095099f39d98e \
+    --hash=sha256:764e71f22ab3b305e7f4c21f1a97e1526a25ebdd22513e251cf376760213da13 \
+    --hash=sha256:7ab159b063c52a0333c884e4679f8d7a85112ee3078fe3d9004b2dd875585519 \
+    --hash=sha256:805e6b60c54bf766b251e94526ebad60b7de0c70f70a4e6210ee2891acb70bf2 \
+    --hash=sha256:8447d2d39b5abe381419319f942de20b7ecd60ce86f16a23b0698f22e1b70008 \
+    --hash=sha256:86fddba590aad9208e2fa8b43b4c098bb0ec74f15718bb6a704e3c63e2cef3e9 \
+    --hash=sha256:89d75e7293d2b3e674db7d4d9b1bee7f8f3d1609428e293771d1a962617150cc \
+    --hash=sha256:93c0b12d3d3bc25af4ebbf38f9ee780a487e8bf6954c115b9f015822d3bb8e48 \
+    --hash=sha256:94d87b689cdd831934fa3ce16cc15cd65748e6d689f5d2b8f4f4df2065c9fa20 \
+    --hash=sha256:9714398225f299aa85267fd222f7142fcb5c769e73d7733344efc46f2ef5cf89 \
+    --hash=sha256:982e6d21414e78e1f51cf595d7f321dcd14de1f2881c5dc6a6e23bbbbd68435e \
+    --hash=sha256:997d6a487ff00807ba810e0f8332c18b4eb8d29463cfb7c820dc4b6e7562d0cf \
+    --hash=sha256:a03e02f48cd1abbd9f3b7e3586d97c8f7a9721c436f51a5245b3b9483044480b \
+    --hash=sha256:a36fdf2af13c2b14738f6e973aba563623cb77d753bbbd8d414d18bfaa3105dd \
+    --hash=sha256:a6ba92c0bcdf96cbf43a12c717eae4bc98325ca3730f6b130ffa2e3c3c723d84 \
+    --hash=sha256:a7c2155f790e2fb448faed6dd241386719802296ec588a8b9051c1f5c481bc29 \
+    --hash=sha256:a93c194e2df18f7d264092dc8539b8ffb86b45b899ab976aa15d48214138e81b \
+    --hash=sha256:abfa5080c374a76a251ba60683242bc17eeb2c9818d0d30117b4486be10c59d3 \
+    --hash=sha256:ac10f2c4184420d881a3475fb2c6f4d95d53a8d50209a2500723d831036f7c45 \
+    --hash=sha256:ad182d02e40de7459b73155deb8996bbd8e96852267879396fb274e8700190e3 \
+    --hash=sha256:b2837718570f95dd41675328e111345f9b7095d821bac435aac173ac80b19983 \
+    --hash=sha256:b489578720afb782f6ccf2840920f3a32e31ba28a4b162e13900c3e6bd3f930e \
+    --hash=sha256:b583904576650166b3d920d2bcce13971f6f9e9a396c673187f49811b2769dc7 \
+    --hash=sha256:b85c2530be953a890eaffde05485238f07029600e8f098cdf1848d414a8b45e4 \
+    --hash=sha256:b97c1e0bd37c5cd7902e65f410779d39eeda155800b65fc4d04cc432efa9bc6e \
+    --hash=sha256:ba9b72e5643641b7d41fa1f6d5abda2c9a263ae835b917348fc3c928182ad467 \
+    --hash=sha256:bb26437975da7dc36b7efad18aa9dd4ea569d2357ae6b783bf1118dabd9ea577 \
+    --hash=sha256:bb8f74f2f10dbf13a0be8de623ba4f9491faf58c24064f32b65679b021ed0001 \
+    --hash=sha256:bde01f35767c4a7899b7eb6e823b125a64de314a8ee9791367c9a34d56af18d0 \
+    --hash=sha256:bec9931dfb61ddd8ef2ebc05646293812cb6b16b60cf7c9511a832b6f1854b55 \
+    --hash=sha256:c36f9b6f5f8649bb251a5f3f66564438977b7ef8386a52460ae77e6070d309d9 \
+    --hash=sha256:cdf58d0e516ee426a48f7b2c03a332a4114420716d55769ff7108c37a09951bf \
+    --hash=sha256:d1cee317bfc014c2419a76bcc87f071405e3966da434e03e13beb45f8aced1a6 \
+    --hash=sha256:d22326fcdef5e08c154280b71163ced384b428343ae16a5ab2b3354aed12436e \
+    --hash=sha256:d3660c82f209655a06b587d55e723f0b813d3a7db2e32e5e7dc64ac2a9e86fde \
+    --hash=sha256:da8f5fc57d1933de22a9e23eec290a0d8a5927a5370d24bda9a6abe50683fe62 \
+    --hash=sha256:df951c5f4a1b1910f1a99ff42c473ff60f8225baa1cdd3539fe2819d9543e9df \
+    --hash=sha256:e5364a4502efca094731680e80009632ad6624084aff9a23ce8c8c6820de3e51 \
+    --hash=sha256:ea1bfda2f7162605f6e8178223576856b3d791109f15ea99a9f95c16a7636fb5 \
+    --hash=sha256:f02f93b92358ee3f78660e43b4b0091229260c5d5c408d17d60bf26b6c900e86 \
+    --hash=sha256:f056bf21105c2515c32372bbc057f43eb02aae2fda61052e2f7622c801f0b4e2 \
+    --hash=sha256:f1ac758ef6aebfc8943560194e9fd0fa18bcb34d89fd8bd2af18183afd8da3a2 \
+    --hash=sha256:f2a19f302cd1ce5dd01a9099aaa19cae6173306d1302a43b627f62e21cf18ac0 \
+    --hash=sha256:f654882311409afb1d780b940234208a252322c24a93b442ca714d119e68086c \
+    --hash=sha256:f65557897fc977a44ab205ea871b690adaef6b9da6afda4790a2484b04293a5f \
+    --hash=sha256:f9d1e379028e0fc2ae3654bac3cbbef81bf3fd571272a42d56c24007979bafb6 \
+    --hash=sha256:fdabbfc59f2c6edba2a6622c647b716e34e8e3867e0ab975412c5c2f79b82da2 \
+    --hash=sha256:fdd6028445d2460f33136c55eeb1f601ab06d74cb3347132e1c24250187500d9 \
+    --hash=sha256:ff590880083d60acc0433f9c3f713c51f7ac6ebb9adf889c79a261ecf541aa91
+    # via sphinx-lint
+requests==2.32.3 \
+    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
+    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
+    # via pygithub
+rsa==4.7.2 \
+    --hash=sha256:78f9a9bf4e7be0c5ded4583326e7461e3a3c5aae24073648b4bdfa797d78c9d2 \
+    --hash=sha256:9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9
+    # via awscli
+ruamel-yaml==0.18.10 \
+    --hash=sha256:20c86ab29ac2153f80a428e1254a8adf686d3383df04490514ca3b79a362db58 \
+    --hash=sha256:30f22513ab2301b3d2b577adc121c6471f28734d3d9728581245f1e76468b4f1
+    # via pykwalify
+ruamel-yaml-clib==0.2.12 ; python_full_version < '3.13' and platform_python_implementation == 'CPython' \
+    --hash=sha256:040ae85536960525ea62868b642bdb0c2cc6021c9f9d507810c0c604e66f5a7b \
+    --hash=sha256:0467c5965282c62203273b838ae77c0d29d7638c8a4e3a1c8bdd3602c10904e4 \
+    --hash=sha256:0b7e75b4965e1d4690e93021adfcecccbca7d61c7bddd8e22406ef2ff20d74ef \
+    --hash=sha256:11f891336688faf5156a36293a9c362bdc7c88f03a8a027c2c1d8e0bcde998e5 \
+    --hash=sha256:1492a6051dab8d912fc2adeef0e8c72216b24d57bd896ea607cb90bb0c4981d3 \
+    --hash=sha256:20b0f8dc160ba83b6dcc0e256846e1a02d044e13f7ea74a3d1d56ede4e48c632 \
+    --hash=sha256:22353049ba4181685023b25b5b51a574bce33e7f51c759371a7422dcae5402a6 \
+    --hash=sha256:2c59aa6170b990d8d2719323e628aaf36f3bfbc1c26279c0eeeb24d05d2d11c7 \
+    --hash=sha256:32621c177bbf782ca5a18ba4d7af0f1082a3f6e517ac2a18b3974d4edf349680 \
+    --hash=sha256:3bc2a80e6420ca8b7d3590791e2dfc709c88ab9152c00eeb511c9875ce5778bf \
+    --hash=sha256:3eac5a91891ceb88138c113f9db04f3cebdae277f5d44eaa3651a4f573e6a5da \
+    --hash=sha256:4a6679521a58256a90b0d89e03992c15144c5f3858f40d7c18886023d7943db6 \
+    --hash=sha256:4c8c5d82f50bb53986a5e02d1b3092b03622c02c2eb78e29bec33fd9593bae1a \
+    --hash=sha256:4f6f3eac23941b32afccc23081e1f50612bdbe4e982012ef4f5797986828cd01 \
+    --hash=sha256:5a0e060aace4c24dcaf71023bbd7d42674e3b230f7e7b97317baf1e953e5b519 \
+    --hash=sha256:6442cb36270b3afb1b4951f060eccca1ce49f3d087ca1ca4563a6eb479cb3de6 \
+    --hash=sha256:6c8fbb13ec503f99a91901ab46e0b07ae7941cd527393187039aec586fdfd36f \
+    --hash=sha256:749c16fcc4a2b09f28843cda5a193e0283e47454b63ec4b81eaa2242f50e4ccd \
+    --hash=sha256:7dd5adc8b930b12c8fc5b99e2d535a09889941aa0d0bd06f4749e9a9397c71d2 \
+    --hash=sha256:811ea1594b8a0fb466172c384267a4e5e367298af6b228931f273b111f17ef52 \
+    --hash=sha256:932205970b9f9991b34f55136be327501903f7c66830e9760a8ffb15b07f05cd \
+    --hash=sha256:943f32bc9dedb3abff9879edc134901df92cfce2c3d5c9348f172f62eb2d771d \
+    --hash=sha256:95c3829bb364fdb8e0332c9931ecf57d9be3519241323c5274bd82f709cebc0c \
+    --hash=sha256:96777d473c05ee3e5e3c3e999f5d23c6f4ec5b0c38c098b3a5229085f74236c6 \
+    --hash=sha256:a274fb2cb086c7a3dea4322ec27f4cb5cc4b6298adb583ab0e211a4682f241eb \
+    --hash=sha256:a52d48f4e7bf9005e8f0a89209bf9a73f7190ddf0489eee5eb51377385f59f2a \
+    --hash=sha256:a606ef75a60ecf3d924613892cc603b154178ee25abb3055db5062da811fd969 \
+    --hash=sha256:ab007f2f5a87bd08ab1499bdf96f3d5c6ad4dcfa364884cb4549aa0154b13a28 \
+    --hash=sha256:b82a7c94a498853aa0b272fd5bc67f29008da798d4f93a2f9f289feb8426a58d \
+    --hash=sha256:bb43a269eb827806502c7c8efb7ae7e9e9d0573257a46e8e952f4d4caba4f31e \
+    --hash=sha256:bc5f1e1c28e966d61d2519f2a3d451ba989f9ea0f2307de7bc45baa526de9e45 \
+    --hash=sha256:bd0a08f0bab19093c54e18a14a10b4322e1eacc5217056f3c063bd2f59853ce4 \
+    --hash=sha256:beffaed67936fbbeffd10966a4eb53c402fafd3d6833770516bf7314bc6ffa12 \
+    --hash=sha256:bf165fef1f223beae7333275156ab2022cffe255dcc51c27f066b4370da81e31 \
+    --hash=sha256:cf12567a7b565cbf65d438dec6cfbe2917d3c1bdddfce84a9930b7d35ea59642 \
+    --hash=sha256:d84318609196d6bd6da0edfa25cedfbabd8dbde5140a0a23af29ad4b8f91fb1e \
+    --hash=sha256:d85252669dc32f98ebcd5d36768f5d4faeaeaa2d655ac0473be490ecdae3c285 \
+    --hash=sha256:e143ada795c341b56de9418c58d028989093ee611aa27ffb9b7f609c00d813ed \
+    --hash=sha256:e188d2699864c11c36cdfdada94d781fd5d6b0071cd9c427bceb08ad3d7c70e1 \
+    --hash=sha256:e2f1c3765db32be59d18ab3953f43ab62a761327aafc1594a2a1fbe038b8b8a7 \
+    --hash=sha256:e5b8daf27af0b90da7bb903a876477a9e6d7270be6146906b276605997c7e9a3 \
+    --hash=sha256:e7e3736715fbf53e9be2a79eb4db68e4ed857017344d697e8b9749444ae57475 \
+    --hash=sha256:e8c4ebfcfd57177b572e2040777b8abc537cdef58a2120e830124946aa9b42c5 \
+    --hash=sha256:f66efbc1caa63c088dead1c4170d148eabc9b80d95fb75b6c92ac0aad2437d76 \
+    --hash=sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987 \
+    --hash=sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df
+    # via ruamel-yaml
+ruff==0.8.1 \
+    --hash=sha256:2029b8c22da147c50ae577e621a5bfbc5d1fed75d86af53643d7a7aee1d23871 \
+    --hash=sha256:2666520828dee7dfc7e47ee4ea0d928f40de72056d929a7c5292d95071d881d1 \
+    --hash=sha256:288326162804f34088ac007139488dcb43de590a5ccfec3166396530b58fb89d \
+    --hash=sha256:2954cdbe8dfd8ab359d4a30cd971b589d335a44d444b6ca2cb3d1da21b75e4b6 \
+    --hash=sha256:333c57013ef8c97a53892aa56042831c372e0bb1785ab7026187b7abd0135ad5 \
+    --hash=sha256:3583db9a6450364ed5ca3f3b4225958b24f78178908d5c4bc0f46251ccca898f \
+    --hash=sha256:364e6674450cbac8e998f7b30639040c99d81dfb5bbc6dfad69bc7a8f916b3d1 \
+    --hash=sha256:55873cc1a473e5ac129d15eccb3c008c096b94809d693fc7053f588b67822737 \
+    --hash=sha256:93335cd7c0eaedb44882d75a7acb7df4b77cd7cd0d2255c93b28791716e81790 \
+    --hash=sha256:a885d68342a231b5ba4d30b8c6e1b1ee3a65cf37e3d29b3c74069cdf1ee1e3c9 \
+    --hash=sha256:adf314fc458374c25c5c4a4a9270c3e8a6a807b1bec018cfa2813d6546215540 \
+    --hash=sha256:b12c39b9448632284561cbf4191aa1b005882acbc81900ffa9f9f471c8ff7e26 \
+    --hash=sha256:b22346f845fec132aa39cd29acb94451d030c10874408dbf776af3aaeb53284c \
+    --hash=sha256:b2f2f7a7e7648a2bfe6ead4e0a16745db956da0e3a231ad443d2a66a105c04fa \
+    --hash=sha256:b8a4f7385c2285c30f34b200ca5511fcc865f17578383db154e098150ce0a087 \
+    --hash=sha256:cd054486da0c53e41e0086e1730eb77d1f698154f910e0cd9e0d64274979a209 \
+    --hash=sha256:d2c16e3508c8cc73e96aa5127d0df8913d2290098f776416a4b157657bee44c5 \
+    --hash=sha256:fae0805bd514066f20309f6742f6ee7904a773eb9e6c17c45d6b1600ca65c9b5
+    # via -r requirements-actions.in
+s3transfer==0.11.4 \
+    --hash=sha256:559f161658e1cf0a911f45940552c696735f5c74e64362e515f333ebed87d679 \
+    --hash=sha256:ac265fa68318763a03bf2dc4f39d5cbd6a9e178d81cc9483ad27da33637e320d
+    # via awscli
+setuptools==78.1.0 \
+    --hash=sha256:18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54 \
+    --hash=sha256:3e386e96793c8702ae83d17b853fb93d3e09ef82ec62722e61da5cd22376dcd8
+    # via
+    #   -r requirements-actions.in
+    #   west
+sh==1.14.3 ; sys_platform != 'win32' \
+    --hash=sha256:e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7
+    # via gitlint-core
+six==1.17.0 \
+    --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
+    --hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
+    # via
+    #   anytree
+    #   python-dateutil
+smmap==5.0.2 \
+    --hash=sha256:26ea65a03958fa0c8a1c7e8c7a58fdc77221b8910f6be2131affade476898ad5 \
+    --hash=sha256:b30115f0def7d7531d22a0fb6502488d879e75b260a9db4d0819cfb25403af5e
+    # via gitdb
+sphinx-lint==1.0.0 \
+    --hash=sha256:6117a0f340b2dc73eadfc57db7531d4477e0929f92a0c1a2f61e6edbc272f0bc \
+    --hash=sha256:6eafdb44172ce526f405bf36c713eb246f1340ec2d667e7298e2487ed76decd2
+    # via -r requirements-actions.in
+tabulate==0.9.0 \
+    --hash=sha256:0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c \
+    --hash=sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f
+    # via -r requirements-actions.in
+tomli==2.2.1 \
+    --hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \
+    --hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \
+    --hash=sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c \
+    --hash=sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b \
+    --hash=sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8 \
+    --hash=sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6 \
+    --hash=sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77 \
+    --hash=sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff \
+    --hash=sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea \
+    --hash=sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192 \
+    --hash=sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249 \
+    --hash=sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee \
+    --hash=sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4 \
+    --hash=sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98 \
+    --hash=sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8 \
+    --hash=sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4 \
+    --hash=sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281 \
+    --hash=sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744 \
+    --hash=sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69 \
+    --hash=sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13 \
+    --hash=sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140 \
+    --hash=sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e \
+    --hash=sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e \
+    --hash=sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc \
+    --hash=sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff \
+    --hash=sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec \
+    --hash=sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2 \
+    --hash=sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222 \
+    --hash=sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106 \
+    --hash=sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272 \
+    --hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \
+    --hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7
+    # via
+    #   -r requirements-actions.in
+    #   mypy
+    #   pylint
+    #   pyproject-api
+    #   pytest
+    #   tox
+tomlkit==0.13.2 \
+    --hash=sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde \
+    --hash=sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79
+    # via pylint
+tox==4.25.0 \
+    --hash=sha256:4dfdc7ba2cc6fdc6688dde1b21e7b46ff6c41795fb54586c91a3533317b5255c \
+    --hash=sha256:dd67f030317b80722cf52b246ff42aafd3ed27ddf331c415612d084304cf5e52
+    # via -r requirements-actions.in
+typing-extensions==4.13.0 \
+    --hash=sha256:0a4ac55a5820789d87e297727d229866c9650f6521b64206413c4fbada24d95b \
+    --hash=sha256:c8dd92cc0d6425a97c18fbb9d1954e5ff92c1ca881a309c45f06ebc0b79058e5
+    # via
+    #   astroid
+    #   mypy
+    #   pygithub
+    #   python-can
+    #   tox
+unidiff==0.7.5 \
+    --hash=sha256:2e5f0162052248946b9f0970a40e9e124236bf86c82b70821143a6fc1dea2574 \
+    --hash=sha256:c93bf2265cc1ba2a520e415ab05da587370bc2a3ae9e0414329f54f0c2fc09e8
+    # via -r requirements-actions.in
+urllib3==2.3.0 \
+    --hash=sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df \
+    --hash=sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d
+    # via
+    #   botocore
+    #   elastic-transport
+    #   pygithub
+    #   requests
+virtualenv==20.30.0 \
+    --hash=sha256:800863162bcaa5450a6e4d721049730e7f2dae07720e0902b0e4040bd6f9ada8 \
+    --hash=sha256:e34302959180fca3af42d1800df014b35019490b119eba981af27f2fa486e5d6
+    # via tox
+west==1.3.0 \
+    --hash=sha256:89320034be87099d16e75f4760ac0d1ed67e8978928e468ab993e3fba0cfe92f \
+    --hash=sha256:b3af425fcce1f88a955942b3573bc877cdc3c3dbab5912434cdf44a473c5695b
+    # via -r requirements-actions.in
+wrapt==1.17.2 \
+    --hash=sha256:08e7ce672e35efa54c5024936e559469436f8b8096253404faeb54d2a878416f \
+    --hash=sha256:0a6e821770cf99cc586d33833b2ff32faebdbe886bd6322395606cf55153246c \
+    --hash=sha256:0b929ac182f5ace000d459c59c2c9c33047e20e935f8e39371fa6e3b85d56f4a \
+    --hash=sha256:129a150f5c445165ff941fc02ee27df65940fcb8a22a61828b1853c98763a64b \
+    --hash=sha256:13e6afb7fe71fe7485a4550a8844cc9ffbe263c0f1a1eea569bc7091d4898555 \
+    --hash=sha256:1473400e5b2733e58b396a04eb7f35f541e1fb976d0c0724d0223dd607e0f74c \
+    --hash=sha256:18983c537e04d11cf027fbb60a1e8dfd5190e2b60cc27bc0808e653e7b218d1b \
+    --hash=sha256:1a7ed2d9d039bd41e889f6fb9364554052ca21ce823580f6a07c4ec245c1f5d6 \
+    --hash=sha256:1e1fe0e6ab7775fd842bc39e86f6dcfc4507ab0ffe206093e76d61cde37225c8 \
+    --hash=sha256:1fb5699e4464afe5c7e65fa51d4f99e0b2eadcc176e4aa33600a3df7801d6662 \
+    --hash=sha256:2696993ee1eebd20b8e4ee4356483c4cb696066ddc24bd70bcbb80fa56ff9061 \
+    --hash=sha256:35621ae4c00e056adb0009f8e86e28eb4a41a4bfa8f9bfa9fca7d343fe94f998 \
+    --hash=sha256:36ccae62f64235cf8ddb682073a60519426fdd4725524ae38874adf72b5f2aeb \
+    --hash=sha256:3cedbfa9c940fdad3e6e941db7138e26ce8aad38ab5fe9dcfadfed9db7a54e62 \
+    --hash=sha256:3d57c572081fed831ad2d26fd430d565b76aa277ed1d30ff4d40670b1c0dd984 \
+    --hash=sha256:3fc7cb4c1c744f8c05cd5f9438a3caa6ab94ce8344e952d7c45a8ed59dd88392 \
+    --hash=sha256:4011d137b9955791f9084749cba9a367c68d50ab8d11d64c50ba1688c9b457f2 \
+    --hash=sha256:40d615e4fe22f4ad3528448c193b218e077656ca9ccb22ce2cb20db730f8d306 \
+    --hash=sha256:410a92fefd2e0e10d26210e1dfb4a876ddaf8439ef60d6434f21ef8d87efc5b7 \
+    --hash=sha256:41388e9d4d1522446fe79d3213196bd9e3b301a336965b9e27ca2788ebd122f3 \
+    --hash=sha256:468090021f391fe0056ad3e807e3d9034e0fd01adcd3bdfba977b6fdf4213ea9 \
+    --hash=sha256:49703ce2ddc220df165bd2962f8e03b84c89fee2d65e1c24a7defff6f988f4d6 \
+    --hash=sha256:4a721d3c943dae44f8e243b380cb645a709ba5bd35d3ad27bc2ed947e9c68192 \
+    --hash=sha256:4afd5814270fdf6380616b321fd31435a462019d834f83c8611a0ce7484c7317 \
+    --hash=sha256:4c82b8785d98cdd9fed4cac84d765d234ed3251bd6afe34cb7ac523cb93e8b4f \
+    --hash=sha256:4db983e7bca53819efdbd64590ee96c9213894272c776966ca6306b73e4affda \
+    --hash=sha256:582530701bff1dec6779efa00c516496968edd851fba224fbd86e46cc6b73563 \
+    --hash=sha256:58455b79ec2661c3600e65c0a716955adc2410f7383755d537584b0de41b1d8a \
+    --hash=sha256:58705da316756681ad3c9c73fd15499aa4d8c69f9fd38dc8a35e06c12468582f \
+    --hash=sha256:5bb1d0dbf99411f3d871deb6faa9aabb9d4e744d67dcaaa05399af89d847a91d \
+    --hash=sha256:5c803c401ea1c1c18de70a06a6f79fcc9c5acfc79133e9869e730ad7f8ad8ef9 \
+    --hash=sha256:5cbabee4f083b6b4cd282f5b817a867cf0b1028c54d445b7ec7cfe6505057cf8 \
+    --hash=sha256:612dff5db80beef9e649c6d803a8d50c409082f1fedc9dbcdfde2983b2025b82 \
+    --hash=sha256:62c2caa1585c82b3f7a7ab56afef7b3602021d6da34fbc1cf234ff139fed3cd9 \
+    --hash=sha256:69606d7bb691b50a4240ce6b22ebb319c1cfb164e5f6569835058196e0f3a845 \
+    --hash=sha256:6d9187b01bebc3875bac9b087948a2bccefe464a7d8f627cf6e48b1bbae30f82 \
+    --hash=sha256:6ed6ffac43aecfe6d86ec5b74b06a5be33d5bb9243d055141e8cabb12aa08125 \
+    --hash=sha256:703919b1633412ab54bcf920ab388735832fdcb9f9a00ae49387f0fe67dad504 \
+    --hash=sha256:766d8bbefcb9e00c3ac3b000d9acc51f1b399513f44d77dfe0eb026ad7c9a19b \
+    --hash=sha256:80dd7db6a7cb57ffbc279c4394246414ec99537ae81ffd702443335a61dbf3a7 \
+    --hash=sha256:8112e52c5822fc4253f3901b676c55ddf288614dc7011634e2719718eaa187dc \
+    --hash=sha256:8c8b293cd65ad716d13d8dd3624e42e5a19cc2a2f1acc74b30c2c13f15cb61a6 \
+    --hash=sha256:8fdbdb757d5390f7c675e558fd3186d590973244fab0c5fe63d373ade3e99d40 \
+    --hash=sha256:91bd7d1773e64019f9288b7a5101f3ae50d3d8e6b1de7edee9c2ccc1d32f0c0a \
+    --hash=sha256:95c658736ec15602da0ed73f312d410117723914a5c91a14ee4cdd72f1d790b3 \
+    --hash=sha256:99039fa9e6306880572915728d7f6c24a86ec57b0a83f6b2491e1d8ab0235b9a \
+    --hash=sha256:9a2bce789a5ea90e51a02dfcc39e31b7f1e662bc3317979aa7e5538e3a034f72 \
+    --hash=sha256:9a7d15bbd2bc99e92e39f49a04653062ee6085c0e18b3b7512a4f2fe91f2d681 \
+    --hash=sha256:9abc77a4ce4c6f2a3168ff34b1da9b0f311a8f1cfd694ec96b0603dff1c79438 \
+    --hash=sha256:9e8659775f1adf02eb1e6f109751268e493c73716ca5761f8acb695e52a756ae \
+    --hash=sha256:9fee687dce376205d9a494e9c121e27183b2a3df18037f89d69bd7b35bcf59e2 \
+    --hash=sha256:a5aaeff38654462bc4b09023918b7f21790efb807f54c000a39d41d69cf552cb \
+    --hash=sha256:a604bf7a053f8362d27eb9fefd2097f82600b856d5abe996d623babd067b1ab5 \
+    --hash=sha256:abbb9e76177c35d4e8568e58650aa6926040d6a9f6f03435b7a522bf1c487f9a \
+    --hash=sha256:acc130bc0375999da18e3d19e5a86403667ac0c4042a094fefb7eec8ebac7cf3 \
+    --hash=sha256:b18f2d1533a71f069c7f82d524a52599053d4c7166e9dd374ae2136b7f40f7c8 \
+    --hash=sha256:b4e42a40a5e164cbfdb7b386c966a588b1047558a990981ace551ed7e12ca9c2 \
+    --hash=sha256:b5e251054542ae57ac7f3fba5d10bfff615b6c2fb09abeb37d2f1463f841ae22 \
+    --hash=sha256:b60fb58b90c6d63779cb0c0c54eeb38941bae3ecf7a73c764c52c88c2dcb9d72 \
+    --hash=sha256:b870b5df5b71d8c3359d21be8f0d6c485fa0ebdb6477dda51a1ea54a9b558061 \
+    --hash=sha256:ba0f0eb61ef00ea10e00eb53a9129501f52385c44853dbd6c4ad3f403603083f \
+    --hash=sha256:bb87745b2e6dc56361bfde481d5a378dc314b252a98d7dd19a651a3fa58f24a9 \
+    --hash=sha256:bb90fb8bda722a1b9d48ac1e6c38f923ea757b3baf8ebd0c82e09c5c1a0e7a04 \
+    --hash=sha256:bc570b5f14a79734437cb7b0500376b6b791153314986074486e0b0fa8d71d98 \
+    --hash=sha256:c86563182421896d73858e08e1db93afdd2b947a70064b813d515d66549e15f9 \
+    --hash=sha256:c958bcfd59bacc2d0249dcfe575e71da54f9dcf4a8bdf89c4cb9a68a1170d73f \
+    --hash=sha256:d18a4865f46b8579d44e4fe1e2bcbc6472ad83d98e22a26c963d46e4c125ef0b \
+    --hash=sha256:d5e2439eecc762cd85e7bd37161d4714aa03a33c5ba884e26c81559817ca0925 \
+    --hash=sha256:e3890b508a23299083e065f435a492b5435eba6e304a7114d2f919d400888cc6 \
+    --hash=sha256:e496a8ce2c256da1eb98bd15803a79bee00fc351f5dfb9ea82594a3f058309e0 \
+    --hash=sha256:e8b2816ebef96d83657b56306152a93909a83f23994f4b30ad4573b00bd11bb9 \
+    --hash=sha256:eaf675418ed6b3b31c7a989fd007fa7c3be66ce14e5c3b27336383604c9da85c \
+    --hash=sha256:ec89ed91f2fa8e3f52ae53cd3cf640d6feff92ba90d62236a81e4e563ac0e991 \
+    --hash=sha256:ecc840861360ba9d176d413a5489b9a0aff6d6303d7e733e2c4623cfa26904a6 \
+    --hash=sha256:f09b286faeff3c750a879d336fb6d8713206fc97af3adc14def0cdd349df6000 \
+    --hash=sha256:f393cda562f79828f38a819f4788641ac7c4085f30f1ce1a68672baa686482bb \
+    --hash=sha256:f917c1180fdb8623c2b75a99192f4025e412597c50b2ac870f156de8fb101119 \
+    --hash=sha256:fc78a84e2dfbc27afe4b2bd7c80c8db9bca75cc5b85df52bfe634596a1da846b \
+    --hash=sha256:ff04ef6eec3eee8a5efef2401495967a916feaa353643defcc03fc74fe213b58
+    # via
+    #   deprecated
+    #   python-can
+xlsxwriter==3.2.2 \
+    --hash=sha256:272ce861e7fa5e82a4a6ebc24511f2cb952fde3461f6c6e1a1e81d3272db1471 \
+    --hash=sha256:befc7f92578a85fed261639fb6cde1fd51b79c5e854040847dde59d4317077dc
+    # via -r requirements-actions.in
+yamllint==1.37.0 \
+    --hash=sha256:c03ab4e79ab4af964c8eb16ac9746880fc76a3bb0ffb14925b9a55220ae7dda0 \
+    --hash=sha256:ead81921d4d87216b2528b7a055664708f9fb8267beb0c427cb706ac6ab93580
+    # via -r requirements-actions.in
diff --git a/scripts/requirements-base.txt b/scripts/requirements-base.txt
index 1f898b1cd2693..6e3cc0616cf43 100644
--- a/scripts/requirements-base.txt
+++ b/scripts/requirements-base.txt
@@ -18,12 +18,12 @@ canopen
 packaging
 progress
 patool
-psutil
+psutil>=5.6.6
 pylink-square
 pyserial
-requests
+requests>=2.32.0
 semver
-tqdm
+tqdm>=4.67.1
 
 # for ram/rom reports
 anytree
diff --git a/scripts/requirements-compliance.txt b/scripts/requirements-compliance.txt
index bc5de4132b8e0..077b528790232 100644
--- a/scripts/requirements-compliance.txt
+++ b/scripts/requirements-compliance.txt
@@ -5,11 +5,11 @@
 clang-format>=15.0.0
 gitlint
 junitparser>=2
-lxml
+lxml>=5.3.0
 pykwalify
 pylint>=3
-python-magic
 python-magic-bin; sys_platform == "win32"
+python-magic; sys_platform != "win32"
 ruff==0.8.1
 sphinx-lint
 unidiff
diff --git a/scripts/requirements-extras.txt b/scripts/requirements-extras.txt
index 884a8970cb576..78f1ad7dac8c4 100644
--- a/scripts/requirements-extras.txt
+++ b/scripts/requirements-extras.txt
@@ -4,7 +4,7 @@
 anytree
 
 # to use in ./scripts for memory footprint, code coverage, etc.
-gitpython
+gitpython>=3.1.41
 
 # helper for developers - check git commit messages
 gitlint
@@ -16,7 +16,7 @@ junit2html
 lpc_checksum
 
 # used by scripts/build/gen_cfb_font_header.py - helper script for user
-Pillow>=10.0
+Pillow>=10.3.0
 
 # used by scripts/release/bug_bash.py for generating top ten bug squashers
 PyGithub
diff --git a/scripts/requirements-run-test.txt b/scripts/requirements-run-test.txt
index fd7a8ac4e9149..d3a4be916735e 100644
--- a/scripts/requirements-run-test.txt
+++ b/scripts/requirements-run-test.txt
@@ -13,7 +13,7 @@ natsort
 cbor>=1.0.0
 
 # use for twister
-psutil
+psutil>=5.6.6
 
 # used for CAN <=> host testing
 python-can>=4.3.0
diff --git a/scripts/schemas/twister/test-config-schema.yaml b/scripts/schemas/twister/test-config-schema.yaml
index d8e29204e406b..24a92c34361fb 100644
--- a/scripts/schemas/twister/test-config-schema.yaml
+++ b/scripts/schemas/twister/test-config-schema.yaml
@@ -4,6 +4,15 @@
 
 type: map
 mapping:
+  "options":
+    type: map
+    required: false
+    mapping:
+      "integration_mode":
+        type: seq
+        required: false
+        sequence:
+          - type: str
   "platforms":
     type: map
     required: false
diff --git a/scripts/schemas/twister/testsuite-schema.yaml b/scripts/schemas/twister/testsuite-schema.yaml
index 3c2007da4d49a..796c342faa539 100644
--- a/scripts/schemas/twister/testsuite-schema.yaml
+++ b/scripts/schemas/twister/testsuite-schema.yaml
@@ -70,6 +70,9 @@ schema;scenario-schema:
     "extra_sections":
       type: any
       required: false
+    "expect_reboot":
+      type: bool
+      required: false
     "required_snippets":
       type: seq
       required: false
@@ -107,9 +110,23 @@ schema;scenario-schema:
       type: map
       required: false
       mapping:
-        "shell_params_file":
+        "power_measurements":
+          type: any
+          required: false
+        "shell_commands_file":
           type: str
           required: false
+        "shell_commands":
+          type: seq
+          required: false
+          sequence:
+            - type: map
+              mapping:
+                "command":
+                  type: str
+                  required: true
+                "expected":
+                  type: str
         "type":
           type: str
           required: false
diff --git a/scripts/tests/twister/conftest.py b/scripts/tests/twister/conftest.py
index 7c91be6ffc55d..f45e596f5a026 100644
--- a/scripts/tests/twister/conftest.py
+++ b/scripts/tests/twister/conftest.py
@@ -4,12 +4,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 '''Common fixtures for use in testing the twister tool.'''
-
+import logging
 import os
 import sys
 import pytest
 
 pytest_plugins = ["pytester"]
+logging.getLogger("twister").setLevel(logging.DEBUG)  # requires for testing twister
 
 ZEPHYR_BASE = os.getenv("ZEPHYR_BASE")
 sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/pylib/twister"))
diff --git a/scripts/tests/twister/test_harness.py b/scripts/tests/twister/test_harness.py
index bc529932eefbb..3283ff2085abe 100644
--- a/scripts/tests/twister/test_harness.py
+++ b/scripts/tests/twister/test_harness.py
@@ -734,7 +734,7 @@ def test_get_harness(name):
     ),
     (
         True,
-        "not a ztest and no state for dummy.test_id",
+        "dummy.test_id is not a Ztest, status:passed",
         "START - test_testcase",
         [],
         {},
@@ -745,7 +745,7 @@ def test_get_harness(name):
     ),
     (
         False,
-        "not a ztest and no state for dummy.test_id",
+        "dummy.test_id is not a Ztest, status:passed",
         "START - test_testcase",
         [],
         {},
@@ -756,7 +756,7 @@ def test_get_harness(name):
     ),
     (
         True,
-        "not a ztest and no state for dummy.test_id",
+        "dummy.test_id is not a Ztest, status:failed",
         "START - test_testcase",
         [],
         {},
diff --git a/scripts/tests/twister/test_platform.py b/scripts/tests/twister/test_platform.py
index c4b9858d8b1fb..cdbfd15d20c56 100644
--- a/scripts/tests/twister/test_platform.py
+++ b/scripts/tests/twister/test_platform.py
@@ -11,10 +11,13 @@
 import mock
 import pytest
 
+from contextlib import nullcontext
+from pykwalify.errors import SchemaError
+
 ZEPHYR_BASE = os.getenv("ZEPHYR_BASE")
 sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/pylib/twister"))
 
-from twisterlib.platform import Platform, Simulator
+from twisterlib.platform import Platform, Simulator, generate_platforms
 
 
 TESTDATA_1 = [
@@ -129,3 +132,363 @@ def xtest_platform_load(platform_text, expected_data, expected_repr):
             assert att == v
 
     assert platform.__repr__() == expected_repr
+
+
+TESTDATA_2 = [
+    (
+        ['m0'],
+        None,
+        {
+            'p1e1/s1', 'p1e2/s1', 'p2/s1', 'p3@A/s2/c1', 'p3@B/s2/c1',
+        },
+    ),
+    (
+        ['m0', 'm1'],
+        None,
+        {
+            'p1e1/s1', 'p1e2/s1', 'p2/s1', 'p3@A/s2/c1', 'p3@B/s2/c1',
+            'p1e1/s1/v1', 'p1e1/s1/v2', 'p1e2/s1/v1', 'p2/s1/v1',
+        },
+    ),
+    (
+        ['m0', 'm1', 'm2'],
+        None,
+        {
+            'p1e1/s1', 'p1e2/s1', 'p2/s1', 'p3@A/s2/c1', 'p3@B/s2/c1',
+            'p1e1/s1/v1', 'p1e1/s1/v2', 'p1e2/s1/v1', 'p2/s1/v1',
+            'p3@A/s2/c2', 'p3@B/s2/c2', 'p4/s1',
+        },
+    ),
+    (
+        ['m0', 'm3'],
+        Exception("Duplicate platform identifier p1e1/s1 found"),
+        None,
+    ),
+    (
+        ['m0', 'm1', 'm4'],
+        Exception("Duplicate platform identifier p1e2/s1/v1 found"),
+        None,
+    ),
+    (
+        ['m0', 'm5'],
+        SchemaError(), # Unknown message as this is raised externally
+        None,
+    ),
+]
+
+@pytest.mark.parametrize(
+    'roots, expected_exception, expected_platform_names',
+    TESTDATA_2,
+    ids=[
+        'default board root',
+        '1 extra board root',
+        '2 extra board roots',
+        '1 extra board root, duplicate platform',
+        '2 extra board roots, duplicate platform',
+        '1 extra board root, malformed yaml',
+    ]
+)
+def test_generate_platforms(
+    tmp_path,
+    roots,
+    expected_exception,
+    expected_platform_names,
+):
+    tmp_files = {
+        'm0/boards/zephyr/p1/board.yml': """\
+boards:
+  - name: p1e1
+    vendor: zephyr
+    socs:
+      - name: s1
+  - name: p1e2
+    vendor: zephyr
+    socs:
+      - name: s1
+""",
+        'm0/boards/zephyr/p1/twister.yaml': """\
+type: native
+arch: x86
+variants:
+  p1e1:
+    twister: False
+  p1e2:
+    sysbuild: True
+""",
+        'm0/boards/zephyr/p2/board.yml': """\
+boards:
+  - name: p2
+    vendor: zephyr
+    socs:
+      - name: s1
+""",
+        'm0/boards/zephyr/p2/p2.yaml': """\
+identifier: p2/s1
+type: sim
+arch: x86
+vendor: vendor2
+testing:
+  default: True
+""",
+        'm0/boards/arm/p3/board.yml': """\
+board:
+  name: p3
+  vendor: arm
+  revision:
+    format: letter
+    default: "A"
+    revisions:
+      - name: "A"
+      - name: "B"
+  socs:
+    - name: s2
+""",
+        'm0/boards/arm/p3/twister.yaml': """\
+type: unit
+arch: arm
+vendor: vendor3
+sysbuild: True
+variants:
+  p3/s2/c1:
+    testing:
+      timeout_multiplier: 2.71828
+  p3@B/s2/c1:
+    testing:
+      timeout_multiplier: 3.14159
+""",
+        'm0/soc/zephyr/soc.yml': """\
+family:
+  - name: zephyr
+    series:
+      - name: zephyr_testing
+        socs:
+          - name: s1
+          - name: s2
+            cpuclusters:
+              - name: c1
+""",
+        'm1/boards/zephyr/p1e1/board.yml': """\
+board:
+  extend: p1e1
+  variants:
+    - name: v1
+      qualifier: s1
+    - name: v2
+      qualifier: s1
+""",
+        'm1/boards/zephyr/p1e1/twister.yaml': """\
+variants:
+  p1e1/s1/v1:
+    testing:
+      default: True
+""",
+        'm1/boards/zephyr/p1e2/board.yml': """\
+board:
+  extend: p1e2
+  variants:
+    - name: v1
+      qualifier: s1
+""",
+        'm1/boards/zephyr/p2/board.yml': """\
+board:
+  extend: p2
+  variants:
+    - name: v1
+      qualifier: s1
+""",
+        'm1/boards/zephyr/p2/p2_s1_v1.yaml': """\
+identifier: p2/s1/v1
+""",
+        'm2/boards/misc/board.yml': """\
+boards:
+  - extend: p3
+  - name: p4
+    vendor: misc
+    socs:
+      - name: s1
+""",
+        'm2/boards/misc/twister.yaml': """\
+type: qemu
+arch: riscv
+vendor: vendor4
+simulation:
+  - name: qemu
+variants:
+  p3@A/s2/c2:
+    sysbuild: False
+""",
+        'm2/soc/zephyr/soc.yml': """\
+socs:
+  - extend: s2
+    cpuclusters:
+      - name: c2
+""",
+        'm3/boards/zephyr/p1e1/board.yml': """\
+board:
+  extend: p1e1
+""",
+        'm3/boards/zephyr/p1e1/twister.yaml': """\
+variants:
+  p1e1/s1:
+    name: Duplicate Platform
+""",
+        'm4/boards/zephyr/p1e2/board.yml': """\
+board:
+  extend: p2
+""",
+        'm4/boards/zephyr/p1e2/p1e2_s1_v1.yaml': """\
+identifier: p1e2/s1/v1
+""",
+        'm5/boards/zephyr/p2/p2-2.yaml': """\
+testing:
+  ć#@%!#!#^#@%@:1.0
+identifier: p2_2
+type: sim
+arch: x86
+vendor: vendor2
+""",
+        'm5/boards/zephyr/p2/board.yml': """\
+board:
+  extend: p2
+""",
+    }
+
+    for filename, content in tmp_files.items():
+        (tmp_path / filename).parent.mkdir(parents=True, exist_ok=True)
+        (tmp_path / filename).write_text(content)
+
+    roots = list(map(tmp_path.joinpath, roots))
+    with pytest.raises(type(expected_exception)) if \
+          expected_exception else nullcontext() as exception:
+        platforms = list(generate_platforms(board_roots=roots, soc_roots=roots, arch_roots=roots))
+
+    if expected_exception:
+        if expected_exception.args:
+            assert str(expected_exception) == str(exception.value)
+        return
+
+    platform_names = {platform.name for platform in platforms}
+    assert len(platforms) == len(platform_names)
+    assert platform_names == expected_platform_names
+
+    expected_data = {
+        'p1e1/s1': {
+            'aliases': ['p1e1/s1', 'p1e1'],
+            # m0/boards/zephyr/p1/board.yml
+            'vendor': 'zephyr',
+            # m0/boards/zephyr/p1/twister.yaml (base + variant)
+            'twister': False,
+            'arch': 'x86',
+            'type': 'native',
+        },
+        'p1e2/s1': {
+            'aliases': ['p1e2/s1', 'p1e2'],
+            # m0/boards/zephyr/p1/board.yml
+            'vendor': 'zephyr',
+            # m0/boards/zephyr/p1/twister.yaml (base + variant)
+            'sysbuild': True,
+            'arch': 'x86',
+            'type': 'native',
+        },
+        'p1e1/s1/v1': {
+            'aliases': ['p1e1/s1/v1'],
+            # m0/boards/zephyr/p1/board.yml
+            'vendor': 'zephyr',
+            # m0/boards/zephyr/p1/twister.yaml (base)
+            # m1/boards/zephyr/p1e1/twister.yaml (variant)
+            'default': True,
+            'arch': 'x86',
+            'type': 'native',
+        },
+        'p1e1/s1/v2': {
+            'aliases': ['p1e1/s1/v2'],
+            # m0/boards/zephyr/p1/board.yml
+            'vendor': 'zephyr',
+            # m0/boards/zephyr/p1/twister.yaml (base)
+            'arch': 'x86',
+            'type': 'native',
+        },
+        'p1e2/s1/v1': {
+            'aliases': ['p1e2/s1/v1'],
+            # m0/boards/zephyr/p1/board.yml
+            'vendor': 'zephyr',
+            # m0/boards/zephyr/p1/twister.yaml (base)
+            'arch': 'x86',
+            'type': 'native',
+        },
+        'p2/s1': {
+            'aliases': ['p2/s1', 'p2'],
+            # m0/boards/zephyr/p2/board.yml
+            'vendor': 'zephyr',
+            # m0/boards/zephyr/p2/p2.yaml
+            'default': True,
+            'arch': 'x86',
+            'type': 'sim',
+        },
+        'p2/s1/v1': {
+            'aliases': ['p2/s1/v1'],
+            # m0/boards/zephyr/p2/board.yml
+            'vendor': 'zephyr',
+            # m1/boards/zephyr/p2/p2_s1_v1.yaml
+        },
+        'p3@A/s2/c1': {
+            'aliases': ['p3@A/s2/c1', 'p3/s2/c1'],
+            # m0/boards/arm/p3/board.yml
+            'vendor': 'arm',
+            # m0/boards/arm/p3/twister.yaml (base + variant)
+            'sysbuild': True,
+            'timeout_multiplier': 2.71828,
+            'arch': 'arm',
+            'type': 'unit',
+        },
+        'p3@B/s2/c1': {
+            'aliases': ['p3@B/s2/c1'],
+            # m0/boards/arm/p3/board.yml
+            'vendor': 'arm',
+            # m0/boards/arm/p3/twister.yaml (base + variant)
+            'sysbuild': True,
+            'timeout_multiplier': 3.14159,
+            'arch': 'arm',
+            'type': 'unit',
+        },
+        'p3@A/s2/c2': {
+            'aliases': ['p3@A/s2/c2', 'p3/s2/c2'],
+            # m0/boards/arm/p3/board.yml
+            'vendor': 'arm',
+            # m0/boards/arm/p3/twister.yaml (base)
+            # m2/boards/misc/twister.yaml (variant)
+            'sysbuild': False,
+            'arch': 'arm',
+            'type': 'unit',
+        },
+        'p3@B/s2/c2': {
+            'aliases': ['p3@B/s2/c2'],
+            # m0/boards/arm/p3/board.yml
+            'vendor': 'arm',
+            # m0/boards/arm/p3/twister.yaml (base)
+            'sysbuild': True,
+            'arch': 'arm',
+            'type': 'unit',
+        },
+        'p4/s1': {
+            'aliases': ['p4/s1', 'p4'],
+            # m2/boards/misc/board.yml
+            'vendor': 'misc',
+            # m2/boards/misc/twister.yaml (base)
+            'arch': 'riscv',
+            'type': 'qemu',
+            'simulators': [Simulator({'name': 'qemu'})],
+            'simulation': 'qemu',
+        },
+    }
+
+    init_platform = Platform()
+    for platform in platforms:
+        expected_platform_data = expected_data[platform.name]
+        for attr, default in vars(init_platform).items():
+            if attr in {'name', 'normalized_name', 'supported_toolchains'}:
+                continue
+            expected = expected_platform_data.get(attr, default)
+            actual = getattr(platform, attr, None)
+            assert expected == actual, \
+                f"expected '{platform}.{attr}' to be '{expected}', was '{actual}'"
diff --git a/scripts/tests/twister/test_runner.py b/scripts/tests/twister/test_runner.py
index 63894e14aedd2..0e6227acefeb4 100644
--- a/scripts/tests/twister/test_runner.py
+++ b/scripts/tests/twister/test_runner.py
@@ -1482,6 +1482,7 @@ def mock_getsize(filename, *args, **kwargs):
 def test_projectbuilder_process(
     caplog,
     mocked_jobserver,
+    tmp_path,
     message,
     instance_status,
     instance_reason,
@@ -1529,6 +1530,9 @@ def mock_determine_testcases(res):
     pb.options.prep_artifacts_for_testing = options_prep_artifacts
     pb.options.runtime_artifact_cleanup = options_runtime_artifacts
     pb.options.cmake_only = options_cmake_only
+    pb.options.outdir = tmp_path
+    pb.options.log_file = None
+    pb.options.log_level = "DEBUG"
 
     pb.cmake = mock.Mock(return_value=cmake_res)
     pb.build = mock.Mock(return_value=build_res)
@@ -2253,7 +2257,7 @@ def test_projectbuilder_build(mocked_jobserver):
         234,
         'native_sim',
         'posix',
-        {'CONFIG_FAKE_ENTROPY_NATIVE_POSIX': 'y'},
+        {'CONFIG_FAKE_ENTROPY_NATIVE_SIM': 'y'},
         'pytest',
         True,
         True,
@@ -2268,7 +2272,7 @@ def test_projectbuilder_build(mocked_jobserver):
         None,
         'native_sim',
         'not posix',
-        {'CONFIG_FAKE_ENTROPY_NATIVE_POSIX': 'y'},
+        {'CONFIG_FAKE_ENTROPY_NATIVE_SIM': 'y'},
         'not pytest',
         False,
         False,
@@ -2283,7 +2287,7 @@ def test_projectbuilder_build(mocked_jobserver):
         234,
         'native_sim',
         'posix',
-        {'CONFIG_FAKE_ENTROPY_NATIVE_POSIX': 'y'},
+        {'CONFIG_FAKE_ENTROPY_NATIVE_SIM': 'y'},
         'pytest',
         False,
         False,
@@ -2407,7 +2411,6 @@ def test_projectbuilder_gather_metrics(
         assert instance_mock.metrics['used_rom'] == 0
         assert instance_mock.metrics['available_rom'] == 0
         assert instance_mock.metrics['available_ram'] == 0
-        assert instance_mock.metrics['unrecognized'] == []
 
 
 TESTDATA_16 = [
@@ -2459,15 +2462,12 @@ def test_projectbuilder_calc_size(
                size_calc_mock.get_available_rom()
         assert instance_mock.metrics['available_ram'] == \
                size_calc_mock.get_available_ram()
-        assert instance_mock.metrics['unrecognized'] == \
-               size_calc_mock.unrecognized_sections()
 
     if expect_zeroes:
         assert instance_mock.metrics['used_ram'] == 0
         assert instance_mock.metrics['used_rom'] == 0
         assert instance_mock.metrics['available_rom'] == 0
         assert instance_mock.metrics['available_ram'] == 0
-        assert instance_mock.metrics['unrecognized'] == []
 
     if expect_calcs or expect_zeroes:
         assert instance_mock.metrics['handler_time'] == \
@@ -2570,8 +2570,7 @@ def iteration_increment(value=1, decrement=False):
     assert tr.instances['dummy instance'].metrics == {
         'k': 'v',
         'k2': 'v2',
-        'handler_time': 30,
-        'unrecognized': []
+        'handler_time': 30
     }
 
     assert results_mock().error == 0
diff --git a/scripts/tests/twister/test_testplan.py b/scripts/tests/twister/test_testplan.py
index 2a006043870e2..73b2673b08efb 100644
--- a/scripts/tests/twister/test_testplan.py
+++ b/scripts/tests/twister/test_testplan.py
@@ -1110,167 +1110,7 @@ def test_testplan_add_configurations(
     expected_platform_names,
     expected_defaults
 ):
-    # tmp_path
-    # └ boards  <- board root
-    #   ├ zephyr
-    #   │ ├ p1
-    #   │ | ├ p1e1.yaml
-    #   │ | └ p1e2.yaml
-    #   │ └ p2
-    #   │   ├ p2.yaml
-    #   │   └ p2-1.yaml <- duplicate
-    #   │   └ p2-2.yaml <- load error
-    #   └ arm
-    #     └ p3
-    #       ├ p3.yaml
-    #       └ p3_B.conf
-    tmp_soc_root_dir = tmp_path / 'soc'
-    tmp_soc_root_dir.mkdir()
-
-    tmp_vend1_dir = tmp_soc_root_dir / 'zephyr'
-    tmp_vend1_dir.mkdir()
-
-    tmp_soc1_dir = tmp_vend1_dir / 's1'
-    tmp_soc1_dir.mkdir()
-
-    soc1_yaml = """\
-family:
-  - name: zephyr
-    series:
-      - name: zephyr_testing
-        socs:
-          - name: unit_testing
-"""
-    soc1_yamlfile = tmp_soc1_dir / 'soc.yml'
-    soc1_yamlfile.write_text(soc1_yaml)
-
-    tmp_board_root_dir = tmp_path / 'boards'
-    tmp_board_root_dir.mkdir()
-
-    tmp_vend1_dir = tmp_board_root_dir / 'zephyr'
-    tmp_vend1_dir.mkdir()
-
-    tmp_p1_dir = tmp_vend1_dir / 'p1'
-    tmp_p1_dir.mkdir()
-
-    p1e1_bs_yaml = """\
-boards:
-
-  - name: p1e1
-    vendor: zephyr
-    socs:
-      - name: unit_testing
-  - name: p1e2
-    vendor: zephyr
-    socs:
-      - name: unit_testing
-"""
-    p1e1_yamlfile = tmp_p1_dir / 'board.yml'
-    p1e1_yamlfile.write_text(p1e1_bs_yaml)
-
-    p1e1_yaml = """\
-identifier: p1e1
-name: Platform 1 Edition 1
-type: native
-arch: x86
-vendor: zephyr
-toolchain:
-  - zephyr
-twister: False
-"""
-    p1e1_yamlfile = tmp_p1_dir / 'p1e1.yaml'
-    p1e1_yamlfile.write_text(p1e1_yaml)
-
-    p1e2_yaml = """\
-identifier: p1e2
-name: Platform 1 Edition 2
-type: native
-arch: x86
-vendor: zephyr
-toolchain:
-  - zephyr
-"""
-    p1e2_yamlfile = tmp_p1_dir / 'p1e2.yaml'
-    p1e2_yamlfile.write_text(p1e2_yaml)
-
-    tmp_p2_dir = tmp_vend1_dir / 'p2'
-    tmp_p2_dir.mkdir()
-
-    p2_bs_yaml = """\
-boards:
-
-  - name: p2
-    vendor: zephyr
-    socs:
-      - name: unit_testing
-  - name: p2_2
-    vendor: zephyr
-    socs:
-      - name: unit_testing
-"""
-    p2_yamlfile = tmp_p2_dir / 'board.yml'
-    p2_yamlfile.write_text(p2_bs_yaml)
-
-    p2_yaml = """\
-identifier: p2/unit_testing
-name: Platform 2
-type: sim
-arch: x86
-vendor: vendor2
-toolchain:
-  - zephyr
-testing:
-  default: True
-"""
-    p2_yamlfile = tmp_p2_dir / 'p2.yaml'
-    p2_yamlfile.write_text(p2_yaml)
-
-
-    p2_2_yaml = """\
-testing:
-  ć#@%!#!#^#@%@:1.0
-identifier: p2_2
-name: Platform 2 2
-type: sim
-arch: x86
-vendor: vendor2
-toolchain:
-  - zephyr
-"""
-    p2_2_yamlfile = tmp_p2_dir / 'p2-2.yaml'
-    p2_2_yamlfile.write_text(p2_2_yaml)
-
-    tmp_vend2_dir = tmp_board_root_dir / 'arm'
-    tmp_vend2_dir.mkdir()
-
-    tmp_p3_dir = tmp_vend2_dir / 'p3'
-    tmp_p3_dir.mkdir()
-
-    p3_bs_yaml = """\
-boards:
-  - name: p3
-    vendor: zephyr
-    socs:
-      - name: unit_testing
-"""
-    p3_yamlfile = tmp_p3_dir / 'board.yml'
-    p3_yamlfile.write_text(p3_bs_yaml)
-
-    p3_yaml = """\
-identifier: p3
-name: Platform 3
-type: unit
-arch: arm
-vendor: vendor3
-toolchain:
-  - zephyr
-testing:
-  default: True
-"""
-    p3_yamlfile = tmp_p3_dir / 'p3.yaml'
-    p3_yamlfile.write_text(p3_yaml)
-
-    env = mock.Mock(board_roots=[tmp_board_root_dir],soc_roots=[tmp_path], arch_roots=[tmp_path])
+    env = mock.Mock(board_roots=[tmp_path / 'boards'], soc_roots=[tmp_path], arch_roots=[tmp_path])
 
     testplan = TestPlan(env=env)
 
@@ -1281,8 +1121,23 @@ def test_testplan_add_configurations(
         }
     }
 
-
-    testplan.add_configurations()
+    def mock_gen_plat(board_roots, soc_roots, arch_roots):
+        assert [tmp_path] == board_roots
+        assert [tmp_path] == soc_roots
+        assert [tmp_path] == arch_roots
+
+        platforms = [
+            mock.Mock(aliases=['p1e1/unit_testing', 'p1e1'], twister=False, default=False),
+            mock.Mock(aliases=['p1e2/unit_testing', 'p1e2'], twister=True, default=False),
+            mock.Mock(aliases=['p2/unit_testing', 'p2'], twister=True, default=True),
+            mock.Mock(aliases=['p3/unit_testing', 'p3'], twister=True, default=True),
+        ]
+        for platform in platforms:
+            type(platform).name = mock.PropertyMock(return_value=platform.aliases[0])
+            yield platform
+
+    with mock.patch('twisterlib.testplan.generate_platforms', mock_gen_plat):
+        testplan.add_configurations()
 
     if expected_defaults is not None:
         print(expected_defaults)
diff --git a/scripts/tests/twister_blackbox/conftest.py b/scripts/tests/twister_blackbox/conftest.py
index d856261f27624..0fd73927c6fcb 100644
--- a/scripts/tests/twister_blackbox/conftest.py
+++ b/scripts/tests/twister_blackbox/conftest.py
@@ -12,6 +12,8 @@
 import pytest
 import sys
 
+logging.getLogger("twister").setLevel("DEBUG")  # requires for testing twister
+
 ZEPHYR_BASE = os.getenv('ZEPHYR_BASE')
 TEST_DATA = os.path.join(ZEPHYR_BASE, 'scripts', 'tests',
                         'twister_blackbox', 'test_data')
@@ -84,4 +86,10 @@ def provide_out(tmp_path, request):
     # After
     # We're operating in temp, so it is not strictly necessary
     # but the files can get large quickly as we do not need them after the test.
+    loggers = [logging.getLogger(name) for name in logging.root.manager.loggerDict]
+    for logg in loggers:
+        handls = logg.handlers[:]
+        for handl in handls:
+            logg.removeHandler(handl)
+            handl.close()
     shutil.rmtree(out_container_path)
diff --git a/scripts/tests/twister_blackbox/test_data/samples/pytest/shell/test_sample.yaml b/scripts/tests/twister_blackbox/test_data/samples/pytest/shell/test_sample.yaml
index 86b9314f44441..4c1d86a7a1443 100644
--- a/scripts/tests/twister_blackbox/test_data/samples/pytest/shell/test_sample.yaml
+++ b/scripts/tests/twister_blackbox/test_data/samples/pytest/shell/test_sample.yaml
@@ -4,7 +4,7 @@ tests:
     min_ram: 40
     harness: pytest
     extra_configs:
-      - arch:posix:CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+      - arch:posix:CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
     integration_platforms:
       - native_sim
       - qemu_cortex_m3
diff --git a/scripts/tests/twister_blackbox/test_data/tests/seed_native_sim/dummy/Kconfig b/scripts/tests/twister_blackbox/test_data/tests/seed_native_sim/dummy/Kconfig
index db9be4ed558a7..96c1c1960d2b1 100644
--- a/scripts/tests/twister_blackbox/test_data/tests/seed_native_sim/dummy/Kconfig
+++ b/scripts/tests/twister_blackbox/test_data/tests/seed_native_sim/dummy/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) 2024 Intel Corporation
 
-config FAKE_ENTROPY_NATIVE_POSIX
+config FAKE_ENTROPY_NATIVE_SIM
 	default y
 
 source "Kconfig.zephyr"
diff --git a/scripts/tests/twister_blackbox/test_outfile.py b/scripts/tests/twister_blackbox/test_outfile.py
index 57a874041cbff..590e0c8f58a70 100644
--- a/scripts/tests/twister_blackbox/test_outfile.py
+++ b/scripts/tests/twister_blackbox/test_outfile.py
@@ -102,8 +102,8 @@ def test_runtime_artifact_cleanup(self, out_path):
         zephyr_listdir = os.listdir(os.path.join(sample_path, 'zephyr'))
 
         expected_contents = ['CMakeFiles', 'handler.log', 'build.ninja', 'CMakeCache.txt',
-                             'zephyr', 'build.log']
-        expected_zephyr_contents = ['.config']
+                             'zephyr', 'build.log', 'build_info.yml']
+        expected_zephyr_contents = ['.config', 'zephyr.dts']
 
         assert all([content in expected_zephyr_contents for content in zephyr_listdir]), \
                'Cleaned zephyr directory has unexpected files.'
diff --git a/scripts/tests/twister_blackbox/test_output.py b/scripts/tests/twister_blackbox/test_output.py
index a1686b343fb5f..5babfa9662083 100644
--- a/scripts/tests/twister_blackbox/test_output.py
+++ b/scripts/tests/twister_blackbox/test_output.py
@@ -132,7 +132,11 @@ def test_inline_logs(self, out_path):
             r'-- Configuring done \([0-9.]+s\)',
             r'-- Generating done \([0-9.]+s\)',
             # Cache location may vary between CI runs
-            r'^.*-- Cache files will be written to:.*$'
+            r'^.*-- Cache files will be written to:.*$',
+            # List of built C object may differ between runs.
+            # See: Issue #87769.
+            # Probable culprits: the cache mechanism, build error
+            r'^Building C object .*$'
         ]
         for pattern in removal_patterns:
             c_pattern = re.compile(pattern, flags=re.MULTILINE)
diff --git a/scripts/tests/twister_blackbox/test_report.py b/scripts/tests/twister_blackbox/test_report.py
index c2ed41f2747de..83d5942c8554c 100644
--- a/scripts/tests/twister_blackbox/test_report.py
+++ b/scripts/tests/twister_blackbox/test_report.py
@@ -114,8 +114,8 @@ class TestReport:
             os.path.join(TEST_DATA, 'tests', 'one_fail_two_error_one_pass'),
             ['qemu_x86/atom'],
             [r'one_fail_two_error_one_pass.agnostic.group1.subgroup2 on qemu_x86/atom FAILED \(.*\)',
-            r'one_fail_two_error_one_pass.agnostic.group1.subgroup3 on qemu_x86/atom ERROR \(Build failure\)',
-            r'one_fail_two_error_one_pass.agnostic.group1.subgroup4 on qemu_x86/atom ERROR \(Build failure\)'],
+            r'one_fail_two_error_one_pass.agnostic.group1.subgroup3 on qemu_x86/atom ERROR \(Build failure.*\)',
+            r'one_fail_two_error_one_pass.agnostic.group1.subgroup4 on qemu_x86/atom ERROR \(Build failure.*\)'],
         )
     ]
 
diff --git a/scripts/utils/migrate_posix_kconfigs.py b/scripts/utils/migrate_posix_kconfigs.py
index d7667543c24e9..fdbb768c237d2 100644
--- a/scripts/utils/migrate_posix_kconfigs.py
+++ b/scripts/utils/migrate_posix_kconfigs.py
@@ -6,7 +6,7 @@
 
 Usage::
 
-    python $ZEPHYR_BASE/scripts/utils/migrate_posix_kconfigs.py -r root_path
+    python $ZEPHYR_BASE/scripts/utils/migrate_posix_kconfigs.py --root root_path --dry-run
 
 The utility will process c, cpp, h, hpp, rst, conf, CMakeLists.txt,
 yml, yaml and Kconfig files.
@@ -85,6 +85,7 @@ def process_file(path):
         with open(path) as f:
             lines = f.readlines()
 
+            lineno = 1
             for line in lines:
                 longest = ""
                 length = 0
@@ -93,17 +94,24 @@ def process_file(path):
                         length = len(m)
                         longest = m
 
+                # TIMER is just way too frequent an occurrence. Skip it.
+                skip = {"TIMER"}
                 if length != 0:
-                    modified = True
-                    line = line.replace(longest, REPLACEMENTS[longest])
-                    msg = MESSAGES.get(longest)
-                    if msg:
-                        print(
-                            f"Notice: {longest} -> {REPLACEMENTS[longest]}: {msg}")
-
+                    if longest in skip:
+                        pass
+                    else:
+                        modified = True
+                        old = line
+                        line = line.replace(longest, REPLACEMENTS[longest])
+                        msg = MESSAGES.get(longest)
+                        if msg:
+                            print(f"{path}:{lineno}:old:{old.strip()}")
+                            print(f"{path}:{lineno}:new:{line.strip()}")
+
+                lineno += 1
                 output.append(line)
 
-        if modified is False:
+        if modified is False or args.dry_run:
             return
 
         with open(path, "w") as f:
@@ -131,6 +139,11 @@ def process_tree(project):
         type=Path,
         required=True,
         help="Zephyr-based project path")
+    parser.add_argument(
+        "-d",
+        "--dry-run",
+        action="store_true",
+        help="log potential changes without modifying files")
     args = parser.parse_args()
 
     process_tree(args.root)
diff --git a/scripts/utils/tls_creds_installer.py b/scripts/utils/tls_creds_installer.py
new file mode 100755
index 0000000000000..245520ceac43d
--- /dev/null
+++ b/scripts/utils/tls_creds_installer.py
@@ -0,0 +1,326 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+This script is used to install TLS credentials on a device via a serial connection.
+It supports both deleting and writing credentials, as well as checking for their existence.
+It also verifies the hash of the installed credentials against the expected hash.
+
+This script is based on https://github.com/nRFCloud/utils/, specifically
+"command_interface.py" and "device_credentials_installer.py".
+"""
+
+import argparse
+import base64
+import hashlib
+import logging
+import math
+import os
+import sys
+import time
+
+import serial
+
+# Configure logging
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+CMD_TERM_DICT = {'NULL': '\0', 'CR': '\r', 'LF': '\n', 'CRLF': '\r\n'}
+# 'CR' is the default termination value for the at_host library in the nRF Connect SDK
+cmd_term_key = 'CR'
+
+TLS_CRED_TYPES = ["CA", "SERV", "PK"]
+TLS_CRED_CHUNK_SIZE = 48
+serial_timeout = 1
+ser = None
+
+
+class TLSCredShellInterface:
+    def __init__(self, serial_write_line, serial_wait_for_response, verbose):
+        self.serial_write_line = serial_write_line
+        self.serial_wait_for_response = serial_wait_for_response
+        self.verbose = verbose
+
+    def write_raw(self, command):
+        if self.verbose:
+            logger.debug(f'-> {command}')
+        self.serial_write_line(command)
+
+    def write_credential(self, sectag, cred_type, cred_text):
+        # Because the Zephyr shell does not support multi-line commands,
+        # we must base-64 encode our PEM strings and install them as if they were binary.
+        # Yes, this does mean we are base-64 encoding a string which is already mostly base-64.
+        # We could alternatively strip the ===== BEGIN/END XXXX ===== header/footer, and then pass
+        # everything else directly as a binary payload (using BIN mode instead of BINT, since
+        # MBedTLS uses the NULL terminator to determine if the credential is raw DER, or is a
+        # PEM string). But this will fail for multi-CA installs, such as CoAP.
+
+        # text -> bytes -> base64 bytes -> base64 text
+        encoded = base64.b64encode(cred_text.encode()).decode()
+        self.write_raw("cred buf clear")
+        chunks = math.ceil(len(encoded) / TLS_CRED_CHUNK_SIZE)
+        for c in range(chunks):
+            chunk = encoded[c * TLS_CRED_CHUNK_SIZE : (c + 1) * TLS_CRED_CHUNK_SIZE]
+            self.write_raw(f"cred buf {chunk}")
+            self.serial_wait_for_response("Stored")
+        self.write_raw(f"cred add {sectag} {TLS_CRED_TYPES[cred_type]} DEFAULT bint")
+        result, _ = self.serial_wait_for_response("Added TLS credential")
+        time.sleep(1)
+        return result
+
+    def delete_credential(self, sectag, cred_type):
+        self.write_raw(f'cred del {sectag} {TLS_CRED_TYPES[cred_type]}')
+        result, _ = self.serial_wait_for_response(
+            "Deleted TLS credential", "There is no TLS credential"
+        )
+        time.sleep(2)
+        return result
+
+    def check_credential_exists(self, sectag, cred_type, get_hash=True):
+        self.write_raw(f'cred list {sectag} {TLS_CRED_TYPES[cred_type]}')
+        _, output = self.serial_wait_for_response(
+            "1 credentials found.",
+            "0 credentials found.",
+            store=f"{sectag},{TLS_CRED_TYPES[cred_type]}",
+        )
+
+        if not output:
+            return False, None
+
+        if not get_hash:
+            return True, None
+
+        data = output.decode().split(",")
+        hash = data[2].strip()
+        status_code = data[3].strip()
+
+        if status_code != "0":
+            logger.warning(f"Error retrieving credential hash: {output.decode().strip()}.")
+            logger.warning("Device might not support credential digests.")
+            return True, None
+
+        return True, hash
+
+    def calculate_expected_hash(self, cred_text):
+        hash = hashlib.sha256(cred_text.encode('utf-8') + b'\x00')
+        return base64.b64encode(hash.digest()).decode()
+
+    def check_cred_command(self):
+        logger.info("Checking for 'cred' command existence...")
+        self.serial_write_line("cred")
+        result, output = self.serial_wait_for_response(timeout=5)
+        if not result or (output and b"command not found" in output):
+            logger.error("Device does not support 'cred' command.")
+            logger.error("Hint: Add 'CONFIG_TLS_CREDENTIALS_SHELL=y' to your prj.conf file.")
+            return False
+        logger.info("'cred' command found.")
+        return True
+
+
+def write_line(line, hidden=False):
+    if not hidden:
+        logger.debug(f'-> {line}')
+    ser.write(bytes((line + CMD_TERM_DICT[cmd_term_key]).encode('utf-8')))
+
+
+def wait_for_prompt(val1='uart:~$ ', val2=None, timeout=15, store=None):
+    found = False
+    retval = False
+    output = None
+
+    if not ser:
+        logger.error('Serial interface not initialized')
+        return False, None
+
+    if isinstance(val1, str):
+        val1 = val1.encode()
+
+    if isinstance(val2, str):
+        val2 = val2.encode()
+
+    if isinstance(store, str):
+        store = store.encode()
+
+    ser.flush()
+
+    while not found and timeout != 0:
+        try:
+            line = ser.readline()
+        except serial.SerialException as e:
+            logger.error(f"Error reading from serial interface: {e}")
+            return False, None
+        except Exception as e:
+            logger.error(f"Unexpected error: {e}")
+            return False, None
+
+        if line == b'\r\n':
+            continue
+
+        if line is None or len(line) == 0:
+            if timeout > 0:
+                timeout -= serial_timeout
+            continue
+
+        logger.debug(f'<- {line.decode("utf-8", errors="replace")}')
+
+        if val1 in line:
+            found = True
+            retval = True
+        elif val2 is not None and val2 in line:
+            found = True
+            retval = False
+        elif store is not None and (store in line or str(store) in str(line)):
+            output = line
+
+    if b'\n' not in line:
+        logger.debug('')
+
+    ser.flush()
+    if store is not None and output is None:
+        logger.error(f'String {store} not detected in line {line}')
+
+    if timeout == 0:
+        logger.error('Serial timeout waiting for prompt')
+
+    return retval, output
+
+
+def parse_args(in_args):
+    parser = argparse.ArgumentParser(
+        description="Device Credentials Installer",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        allow_abbrev=False,
+    )
+    parser.add_argument(
+        "-p", "--port", type=str, help="Specify which serial port to open", default="/dev/ttyACM1"
+    )
+    parser.add_argument(
+        "-x",
+        "--xonxoff",
+        help="Enable software flow control for serial connection",
+        action='store_true',
+        default=False,
+    )
+    parser.add_argument(
+        "-r",
+        "--rtscts-off",
+        help="Disable hardware (RTS/CTS) flow control for serial connection",
+        action='store_true',
+        default=False,
+    )
+    parser.add_argument(
+        "-f",
+        "--dsrdtr",
+        help="Enable hardware (DSR/DTR) flow control for serial connection",
+        action='store_true',
+        default=False,
+    )
+    parser.add_argument(
+        "-d", "--delete", help="Delete sectag from device first", action='store_true', default=False
+    )
+    parser.add_argument(
+        "-l",
+        "--local-cert-file",
+        type=str,
+        help="Filepath to a local certificate (PEM) to use for the device",
+        required=True,
+    )
+    parser.add_argument(
+        "-t", "--cert-type", type=int, help="Certificate type to use for the device", default=1
+    )
+    parser.add_argument(
+        "-S", "--sectag", type=int, help="integer: Security tag to use", default=16842753
+    )
+    parser.add_argument(
+        "-H",
+        "--check-hash",
+        help="Check hash of the credential after writing",
+        action='store_true',
+        default=False,
+    )
+
+    parser.add_argument("-v", "--verbose", action="store_true", help="Enable verbose output")
+    args = parser.parse_args(in_args)
+    return args
+
+
+def main(in_args):
+    global ser
+
+    args = parse_args(in_args)
+
+    if args.verbose:
+        logger.setLevel(logging.DEBUG)
+
+    if not os.path.isfile(args.local_cert_file):
+        logger.error(f'Local certificate file {args.local_cert_file} does not exist')
+        sys.exit(3)
+
+    logger.info(f'Opening port {args.port}')
+    try:
+        try:
+            ser = serial.Serial(
+                args.port,
+                115200,
+                xonxoff=args.xonxoff,
+                rtscts=(not args.rtscts_off),
+                dsrdtr=args.dsrdtr,
+                timeout=serial_timeout,
+            )
+            ser.reset_input_buffer()
+            ser.reset_output_buffer()
+        except FileNotFoundError:
+            logger.error(f'Specified port {args.port} does not exist or cannot be accessed')
+            sys.exit(2)
+        except serial.SerialException as e:
+            logger.error(f'Failed to open serial port {args.port}: {e}')
+            sys.exit(2)
+    except serial.serialutil.SerialException:
+        logger.error('Port could not be opened; not a device, or open already')
+        sys.exit(2)
+
+    cred_if = TLSCredShellInterface(write_line, wait_for_prompt, args.verbose)
+    cmd_exits = cred_if.check_cred_command()
+    if not cmd_exits:
+        sys.exit(1)
+
+    with open(args.local_cert_file) as f:
+        dev_bytes = f.read()
+
+    if args.delete:
+        logger.info(f'Deleting sectag {args.sectag}...')
+        cred_if.delete_credential(args.sectag, args.cert_type)
+
+    cred_if.write_credential(args.sectag, args.cert_type, dev_bytes)
+    logger.info(f'Writing sectag {args.sectag}...')
+    result, hash = cred_if.check_credential_exists(args.sectag, args.cert_type, args.check_hash)
+    if args.check_hash:
+        logger.debug(f'Checking hash for sectag {args.sectag}...')
+    if not result:
+        logger.error(f'Failed to check credential existence for sectag {args.sectag}')
+        sys.exit(4)
+    if hash:
+        logger.debug(f'Credential hash: {hash}')
+        expected_hash = cred_if.calculate_expected_hash(dev_bytes)
+        if hash != expected_hash:
+            logger.error(
+                f'Hash mismatch for sectag {args.sectag}. Expected: {expected_hash}, got: {hash}'
+            )
+            sys.exit(6)
+    logger.info(f'Credential for sectag {args.sectag} written successfully')
+    sys.exit(0)
+
+
+def run():
+    try:
+        main(sys.argv[1:])
+    except KeyboardInterrupt:
+        logger.info("Execution interrupted by user (Ctrl-C). Exiting...")
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    run()
diff --git a/scripts/utils/wifi_ent_cert_installer.py b/scripts/utils/wifi_ent_cert_installer.py
new file mode 100755
index 0000000000000..537a057cf0240
--- /dev/null
+++ b/scripts/utils/wifi_ent_cert_installer.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+# Copyright (c) 2025, Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+import argparse
+import logging
+import os
+import signal
+import subprocess
+import sys
+
+
+def signal_handler(sig, frame):
+    logger.info('Script terminated by user')
+    sys.exit(0)
+
+
+def main():
+    signal.signal(signal.SIGINT, signal_handler)
+    parser = argparse.ArgumentParser(description='Install Wi-Fi certificates', allow_abbrev=False)
+    parser.add_argument('--path', required=True, help='Path to certificate files')
+    parser.add_argument(
+        '--serial-device', default='/dev/ttyACM1', help='Serial port device (default: /dev/ttyACM1)'
+    )
+    parser.add_argument(
+        '--operation-mode',
+        choices=['AP', 'STA'],
+        default='STA',
+        help='Operation mode: AP or STA (default: STA)',
+    )
+    parser.add_argument('-v', '--verbose', action='store_true', help='Enable verbose output')
+    args = parser.parse_args()
+
+    # Configure logging
+    log_level = logging.DEBUG if args.verbose else logging.INFO
+    logging.basicConfig(level=log_level, format='%(asctime)s - %(levelname)s - %(message)s')
+    global logger
+    logger = logging.getLogger(__name__)
+
+    cert_path = args.path
+    port = args.serial_device
+    mode = args.operation_mode
+    if not os.path.isdir(cert_path):
+        logger.error(f"Directory {cert_path} does not exist.")
+        sys.exit(1)
+
+    logger.warning(
+        "Please make sure that the Serial port is not being used by another application."
+    )
+    input("Press Enter to continue or Ctrl+C to exit...")
+
+    # TLS credential types
+    TLS_CREDENTIAL_CA_CERTIFICATE = 0
+    TLS_CREDENTIAL_PUBLIC_CERTIFICATE = 1
+    TLS_CREDENTIAL_PRIVATE_KEY = 2
+
+    WIFI_CERT_SEC_TAG_BASE = 0x1020001
+    WIFI_CERT_SEC_TAG_MAP = {
+        "ca.pem": (TLS_CREDENTIAL_CA_CERTIFICATE, WIFI_CERT_SEC_TAG_BASE),
+        "client-key.pem": (TLS_CREDENTIAL_PRIVATE_KEY, WIFI_CERT_SEC_TAG_BASE + 1),
+        "server-key.pem": (TLS_CREDENTIAL_PRIVATE_KEY, WIFI_CERT_SEC_TAG_BASE + 2),
+        "client.pem": (TLS_CREDENTIAL_PUBLIC_CERTIFICATE, WIFI_CERT_SEC_TAG_BASE + 3),
+        "server.pem": (TLS_CREDENTIAL_PUBLIC_CERTIFICATE, WIFI_CERT_SEC_TAG_BASE + 4),
+        "ca2.pem": (TLS_CREDENTIAL_CA_CERTIFICATE, WIFI_CERT_SEC_TAG_BASE + 5),
+        "client-key2.pem": (TLS_CREDENTIAL_PRIVATE_KEY, WIFI_CERT_SEC_TAG_BASE + 6),
+        "client2.pem": (TLS_CREDENTIAL_PUBLIC_CERTIFICATE, WIFI_CERT_SEC_TAG_BASE + 7),
+    }
+
+    cert_files = (
+        ["ca.pem", "server-key.pem", "server.pem"]
+        if mode == "AP"
+        else ["ca.pem", "client-key.pem", "client.pem", "ca2.pem", "client-key2.pem", "client2.pem"]
+    )
+
+    total_certs = len(cert_files)
+    for idx, cert in enumerate(cert_files, 1):
+        logger.info(f"Processing certificate {idx} of {total_certs}: {cert}")
+
+        cert_file_path = os.path.join(cert_path, cert)
+        if not os.path.isfile(cert_file_path):
+            logger.warning(f"Certificate file {cert_file_path} does not exist. Skipping...")
+            continue
+
+        cert_type, sec_tag = WIFI_CERT_SEC_TAG_MAP[cert]
+        try:
+            command = [
+                "./scripts/utils/tls_creds_installer.py",
+                "-p",
+                port,
+                "-l",
+                cert_file_path,
+                "-d",
+                "-t",
+                str(cert_type),
+                "-S",
+                str(sec_tag),
+            ]
+            if args.verbose:
+                command.append("-v")
+
+            subprocess.run(command, check=True)
+            logger.info(f"Successfully installed {cert}.")
+        except subprocess.CalledProcessError:
+            logger.error(f"Failed to install {cert}.")
+
+    logger.info("Certificate installation process completed.")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/west-commands.yml b/scripts/west-commands.yml
index 68a0951daf8fb..3096a43881d04 100644
--- a/scripts/west-commands.yml
+++ b/scripts/west-commands.yml
@@ -94,3 +94,8 @@ west-commands:
       - name: patch
         class: Patch
         help: manage patches for Zephyr modules
+  - file: scripts/west_commands/gtags.py
+    commands:
+      - name: gtags
+        class: Gtags
+        help: create a GNU global tags file for the current workspace
diff --git a/scripts/west_commands/boards.py b/scripts/west_commands/boards.py
index 201c370695472..18267999d3a7b 100644
--- a/scripts/west_commands/boards.py
+++ b/scripts/west_commands/boards.py
@@ -49,6 +49,8 @@ def do_add_parser(self, parser_adder):
 
             - name: board name
             - full_name: board full name (typically, its commercial name)
+            - revision_default: board default revision
+            - revisions: list of board revisions
             - qualifiers: board qualifiers (will be empty for legacy boards)
             - arch: board architecture (deprecated)
                     (arch is ambiguous for boards described in new hw model)
@@ -93,16 +95,32 @@ def do_run(self, args, _):
         for board in list_boards.find_boards(args):
             if name_re is not None and not name_re.search(board.name):
                 continue
+
+            if board.revisions:
+                revisions_list = ' '.join([rev.name for rev in board.revisions])
+            else:
+                revisions_list = 'None'
+
             self.inf(args.format.format(name=board.name, arch=board.arch,
+                                        revision_default=board.revision_default,
+                                        revisions=revisions_list,
                                         dir=board.dir, hwm=board.hwm, qualifiers=''))
 
         for board in list_boards.find_v2_boards(args).values():
             if name_re is not None and not name_re.search(board.name):
                 continue
+
+            if board.revisions:
+                revisions_list = ' '.join([rev.name for rev in board.revisions])
+            else:
+                revisions_list = 'None'
+
             self.inf(
                 args.format.format(
                     name=board.name,
                     full_name=board.full_name,
+                    revision_default=board.revision_default,
+                    revisions=revisions_list,
                     dir=board.dir,
                     hwm=board.hwm,
                     vendor=board.vendor,
diff --git a/scripts/west_commands/completion/west-completion.zsh b/scripts/west_commands/completion/west-completion.zsh
index 0ca7e82b5dff7..5fdbf23a050f2 100644
--- a/scripts/west_commands/completion/west-completion.zsh
+++ b/scripts/west_commands/completion/west-completion.zsh
@@ -25,6 +25,7 @@ _west_cmds() {
   local -a zephyr_ext_cmds=(
   'completion[display shell completion scripts]'
   'boards[display information about supported boards]'
+  'shields[display information about supported shields]'
   'build[compile a Zephyr application]'
   'sign[sign a Zephyr binary for bootloader chain-loading]'
   'flash[flash and run a binary on a board]'
@@ -114,6 +115,18 @@ _get_west_boards() {
   _describe 'boards' _west_boards
 }
 
+_get_west_shields() {
+  _west_shields=( $(__west_x shields --format='{name}') )
+  for i in {1..${#_west_shields[@]}}; do
+    local name="${_west_shields[$i]%%|*}"
+    local transformed_shield="${_west_shields[$i]//|//}"
+    _west_shields[$i]="${transformed_shield//,/ ${name}/}"
+  done
+  _west_shields=(${(@s/ /)_west_shields})
+
+  _describe 'shields' _west_shields
+}
+
 _west_init() {
   local -a opts=(
   '(-l --local)'{--mr,--manifest-rev}'[manifest revision]:manifest rev:'
@@ -228,6 +241,16 @@ _west_boards() {
   _arguments -S $opts
 }
 
+_west_shields() {
+  local -a opts=(
+  {-f,--format}'[format string]:format string:'
+  {-n,--name}'[name regex]:regex:'
+  '*--board-root[Add a board root]:board root:_directories'
+  )
+
+  _arguments -S $opts
+}
+
 _west_build() {
   local -a opts=(
   '(-b --board)'{-b,--board}'[board to build for]:board:_get_west_boards'
@@ -243,6 +266,7 @@ _west_build() {
   {-o,--build-opt}'[options to pass to build tool (make or ninja)]:tool opt:'
   '(-n --just-print --dry-run --recon)'{-n,--just-print,--dry-run,--recon}"[just print build commands, don't run them]"
   '(-p --pristine)'{-p,--pristine}'[pristine build setting]:pristine:(auto always never)'
+  '--shield[shield to build for]:shield:_get_west_shields'
   )
   _arguments -S $opts \
       "1:source_dir:_directories"
diff --git a/scripts/west_commands/gtags.py b/scripts/west_commands/gtags.py
new file mode 100644
index 0000000000000..ae8ca2327c63a
--- /dev/null
+++ b/scripts/west_commands/gtags.py
@@ -0,0 +1,98 @@
+# Copyright (c) 2025 Qualcomm Innovation Center, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+"""gtags.py
+
+A west extension for creating tags files (GTAGS) for GNU Global.
+For more information on Global, see: https://www.gnu.org/software/global
+"""
+
+import argparse
+import os.path
+import subprocess
+import tempfile
+
+from west.commands import WestCommand
+
+
+class Gtags(WestCommand):
+    def __init__(self):
+        super().__init__(
+            "gtags",
+            "create a GNU Global tags file for the current workspace",
+            """\
+Indexes source code files in the west workspace using GNU Global's
+"gtags" tool. For more information on Global and gtags, see:
+
+    https://www.gnu.org/software/global/
+
+The index can be useful to find definitions of functions, etc.,
+especially across repository boundaries. One example is
+finding the definition of a vendor HAL function that is
+provided by a Zephyr module for the HAL.
+
+By default, this west command only indexes files that are
+tracked by git projects defined in the west. Inactive west
+projects are ignored by default. For more information on
+projects etc., see the west documentation.""",
+        )
+
+    def do_add_parser(self, parser_adder):
+        parser = parser_adder.add_parser(
+            self.name,
+            help=self.help,
+            description=self.description,
+            formatter_class=argparse.RawDescriptionHelpFormatter,
+        )
+
+        parser.add_argument(
+            "projects",
+            nargs="*",
+            metavar="PROJECT",
+            help="""Name of west project to index, or
+            its path. May be given more than once. Use
+            "manifest" to refer to the manifest
+            repository""",
+        )
+
+        return parser
+
+    def do_run(self, args, unknown_args):
+        all_files = []
+        for project in self.manifest.get_projects(args.projects):
+            all_files.extend(self.files_in_project(project))
+
+        with tempfile.TemporaryDirectory(suffix="gtags") as d:
+            gtags_files = os.path.join(d, "gtags.files")
+            with open(gtags_files, "w") as f:
+                # Due to what looks like a limitation in GNU Global,
+                # this won't work if there are newlines in file names.
+                # Unlike xargs and other commands, though, gtags
+                # doesn't seem to have a way to accept a NUL-delimited
+                # list of input file; its manpage says file names must
+                # be delimited by newlines.
+                f.write("\n".join(all_files))
+            subprocess.run(
+                # Note that "gtags -f -" and passing files via stdin
+                # could run into issues on windows, and there seem to
+                # be win32 builds of global out there
+                ["gtags", "-f", gtags_files],
+                cwd=self.manifest.topdir,
+                check=True,
+            )
+
+    def files_in_project(self, project):
+        if not project.is_cloned() or not self.manifest.is_active(project):
+            return []
+        ls_files = (
+            project.git(["ls-files", "**"], capture_stdout=True).stdout.decode("utf-8").splitlines()
+        )
+        ret = []
+        for filename in ls_files:
+            absolute = os.path.join(project.abspath, filename)
+            # Filter out directories from the git ls-files output.
+            # There didn't seem to be a way to tell it to do that by
+            # itself.
+            if os.path.isfile(absolute):
+                ret.append(absolute)
+        return ret
diff --git a/scripts/west_commands/run_common.py b/scripts/west_commands/run_common.py
index e5492ad2f7b89..b13ca502eb64b 100644
--- a/scripts/west_commands/run_common.py
+++ b/scripts/west_commands/run_common.py
@@ -411,11 +411,17 @@ def do_run_common_image(command, user_args, user_runner_args, used_cmds,
 
             i = i - 1
 
+    # Arguments in this order to allow specific to override general:
+    #
+    # - runner-specific runners.yaml arguments
+    # - user-provided command line arguments
+    final_argv = runners_yaml['args'][runner_name] + runner_args
+
     # If flashing multiple images, the runner supports reset after flashing and
     # the board has enabled this functionality, check if the board should be
     # reset or not. If this is not specified in the board/soc file, leave it up to
     # the runner's default configuration to decide if a reset should occur.
-    if runner_cls.capabilities().reset:
+    if runner_cls.capabilities().reset and '--no-reset' not in final_argv:
         if board_image_count is not None:
             reset = True
 
@@ -449,15 +455,9 @@ def do_run_common_image(command, user_args, user_runner_args, used_cmds,
                                         break
 
             if reset:
-                runner_args.append('--reset')
+                final_argv.append('--reset')
             else:
-                runner_args.append('--no-reset')
-
-    # Arguments in this order to allow specific to override general:
-    #
-    # - runner-specific runners.yaml arguments
-    # - user-provided command line arguments
-    final_argv = runners_yaml['args'][runner_name] + runner_args
+                final_argv.append('--no-reset')
 
     # 'user_args' contains parsed arguments which are:
     #
diff --git a/scripts/west_commands/runners/__init__.py b/scripts/west_commands/runners/__init__.py
index 3ed333c24c28e..659677ec03552 100644
--- a/scripts/west_commands/runners/__init__.py
+++ b/scripts/west_commands/runners/__init__.py
@@ -55,10 +55,12 @@ def _import_runner_module(runner_name):
     'qemu',
     'renode',
     'renode-robot',
+    'rfp',
     'silabs_commander',
     'spi_burn',
     'stm32cubeprogrammer',
     'stm32flash',
+    'sy1xx',
     'teensy',
     'trace32',
     'uf2',
diff --git a/scripts/west_commands/runners/core.py b/scripts/west_commands/runners/core.py
index 20e4b72a8c388..fb160155a49b8 100644
--- a/scripts/west_commands/runners/core.py
+++ b/scripts/west_commands/runners/core.py
@@ -268,6 +268,9 @@ class RunnerCaps:
       connected to a single computer, in order to select which one will be used
       with the command provided.
 
+    - mult_dev_ids: whether the runner supports multiple device identifiers
+      for a single operation, allowing for bulk flashing of devices.
+
     - flash_addr: whether the runner supports flashing to an
       arbitrary address. Default is False. If true, the runner
       must honor the --dt-flash option.
@@ -305,6 +308,7 @@ class RunnerCaps:
 
     commands: set[str] = field(default_factory=lambda: set(_RUNNERCAPS_COMMANDS))
     dev_id: bool = False
+    mult_dev_ids: bool = False
     flash_addr: bool = False
     erase: bool = False
     reset: bool = False
@@ -316,6 +320,8 @@ class RunnerCaps:
                        # to allow other commands to use the rtt address
 
     def __post_init__(self):
+        if self.mult_dev_ids and not self.dev_id:
+            raise RuntimeError('dev_id must be set along mult_dev_ids')
         if not self.commands.issubset(_RUNNERCAPS_COMMANDS):
             raise ValueError(f'{self.commands=} contains invalid command')
 
@@ -543,7 +549,9 @@ def add_parser(cls, parser):
         caps = cls.capabilities()
 
         if caps.dev_id:
+            action = 'append' if caps.mult_dev_ids else 'store'
             parser.add_argument('-i', '--dev-id',
+                                action=action,
                                 dest='dev_id',
                                 help=cls.dev_id_help())
         else:
@@ -749,10 +757,13 @@ def thread_info_enabled(self) -> bool:
     @classmethod
     def dev_id_help(cls) -> str:
         ''' Get the ArgParse help text for the --dev-id option.'''
-        return '''Device identifier. Use it to select
+        help = '''Device identifier. Use it to select
                   which debugger, device, node or instance to
                   target when multiple ones are available or
                   connected.'''
+        addendum = '''\nThis option can be present multiple times.''' if \
+                   cls.capabilities().mult_dev_ids else ''
+        return help + addendum
 
     @classmethod
     def extload_help(cls) -> str:
diff --git a/scripts/west_commands/runners/intel_adsp.py b/scripts/west_commands/runners/intel_adsp.py
index 3e74746cc2ca0..02b13fe6491f6 100644
--- a/scripts/west_commands/runners/intel_adsp.py
+++ b/scripts/west_commands/runners/intel_adsp.py
@@ -90,7 +90,7 @@ def do_run(self, command, **kwargs):
 
     def flash(self, **kwargs):
         'Generate a hash string for appending to the sending ri file'
-        hash_object = hashlib.md5(self.bin_fw.encode())
+        hash_object = hashlib.md5(self.bin_fw.encode(), usedforsecurity=False)
         random_str = f"{random.getrandbits(64)}".encode()
         hash_object.update(random_str)
         send_bin_fw = str(self.bin_fw + "." + hash_object.hexdigest())
diff --git a/scripts/west_commands/runners/jlink.py b/scripts/west_commands/runners/jlink.py
index 00438ba6e5dd4..5dc4f626ba3c5 100644
--- a/scripts/west_commands/runners/jlink.py
+++ b/scripts/west_commands/runners/jlink.py
@@ -5,7 +5,6 @@
 '''Runner for debugging with J-Link.'''
 
 import argparse
-import glob
 import ipaddress
 import logging
 import os
@@ -26,37 +25,8 @@
 except ImportError:
     MISSING_REQUIREMENTS = True
 
-if sys.platform == 'win32':
-    # JLink.exe can collide with the JDK executable of the same name
-    # Look in the usual locations before falling back to $PATH
-    for root in [os.environ["ProgramFiles"], os.environ["ProgramFiles(x86)"], str(Path.home())]: # noqa SIM112
-        # SEGGER folder can contain a single "JLink" folder
-        _direct = Path(root) / "SEGGER" / "JLink" / "JLink.exe"
-        if _direct.exists():
-            DEFAULT_JLINK_EXE = str(_direct)
-            del _direct
-        else:
-            # SEGGER folder can contain multiple versions such as:
-            #   JLink_V796b
-            #   JLink_V796t
-            #   JLink_V798c
-            # Find the latest version
-            _versions = glob.glob(str(Path(root) / "SEGGER" / "JLink_V*"))
-            if len(_versions) == 0:
-                continue
-            _expected_jlink = Path(_versions[-1]) / "JLink.exe"
-            if not _expected_jlink.exists():
-                continue
-            DEFAULT_JLINK_EXE = str(_expected_jlink)
-            # Cleanup variables
-            del _versions
-            del _expected_jlink
-        break
-    else:
-        # Not found in the normal locations, hope that $PATH is correct
-        DEFAULT_JLINK_EXE = "JLink.exe"
-else:
-    DEFAULT_JLINK_EXE = "JLinkExe"
+# Populated in do_add_parser()
+DEFAULT_JLINK_EXE = None
 DEFAULT_JLINK_GDB_PORT = 2331
 DEFAULT_JLINK_RTT_PORT = 19021
 
@@ -138,8 +108,36 @@ def dev_id_help(cls) -> str:
     def tool_opt_help(cls) -> str:
         return "Additional options for JLink Commander, e.g. '-autoconnect 1'"
 
+    @staticmethod
+    def default_jlink():
+        global DEFAULT_JLINK_EXE
+
+        if sys.platform == 'win32':
+            # JLink.exe can collide with the JDK executable of the same name
+            # Locate the executable using the registry
+            try:
+                import winreg
+
+                # Note that when multiple JLink versions are installed on the
+                # machine this points to the one that was installed
+                # last, and not to the latest version.
+                key = winreg.OpenKeyEx(
+                    winreg.HKEY_CURRENT_USER, r"Software\SEGGER\J-Link")
+                DEFAULT_JLINK_EXE = (
+                    Path(winreg.QueryValueEx(key, "InstallPath")[0])
+                    / "JLink.exe")
+            except Exception:
+                # Not found via the registry, hope that $PATH is correct
+                DEFAULT_JLINK_EXE = "JLink.exe"
+        else:
+            DEFAULT_JLINK_EXE = "JLinkExe"
+
     @classmethod
     def do_add_parser(cls, parser):
+
+        # Find the default JLink executable
+        cls.default_jlink()
+
         # Required:
         parser.add_argument('--device', required=True, help='device name')
 
@@ -281,6 +279,7 @@ def do_run(self, command, **kwargs):
         # version of the tools we're using.
         self.commander = os.fspath(
             Path(self.require(self.commander)).resolve())
+        self.logger.debug(f'JLink executable: {self.commander}')
         self.logger.info(f'JLink version: {self.jlink_version_str}')
 
         rtos = self.thread_info_enabled and self.supports_thread_info
diff --git a/scripts/west_commands/runners/nrf_common.py b/scripts/west_commands/runners/nrf_common.py
index 5895456d8ea65..d18029c6b2e68 100644
--- a/scripts/west_commands/runners/nrf_common.py
+++ b/scripts/west_commands/runners/nrf_common.py
@@ -79,7 +79,8 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
     '''Runner front-end base class for nrf tools.'''
 
     def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
-                 reset=True, tool_opt=None, force=False, recover=False):
+                 erase_mode=None, ext_erase_mode=None, reset=True,
+                 tool_opt=None, force=False, recover=False):
         super().__init__(cfg)
         self.hex_ = cfg.hex_file
         # The old --nrf-family options takes upper-case family names
@@ -88,6 +89,8 @@ def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
         self.pinreset = pinreset
         self.dev_id = dev_id
         self.erase = bool(erase)
+        self.erase_mode = erase_mode
+        self.ext_erase_mode = ext_erase_mode
         self.reset = bool(reset)
         self.force = force
         self.recover = bool(recover)
@@ -101,12 +104,13 @@ def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
                 self.tool_opt += opts
 
     @classmethod
-    def capabilities(cls):
-        return RunnerCaps(commands={'flash'}, dev_id=True, erase=True,
-                          reset=True, tool_opt=True)
+    def _capabilities(cls, mult_dev_ids=False):
+        return RunnerCaps(commands={'flash'}, dev_id=True,
+                          mult_dev_ids=mult_dev_ids, erase=True, reset=True,
+                          tool_opt=True)
 
     @classmethod
-    def dev_id_help(cls) -> str:
+    def _dev_id_help(cls) -> str:
         return '''Device identifier. Use it to select the J-Link Serial Number
                   of the device connected over USB. '*' matches one or more
                   characters/digits'''
@@ -136,6 +140,14 @@ def do_add_parser(cls, parser):
                             help='''erase all user available non-volatile
                             memory and disable read back protection before
                             flashing (erases flash for both cores on nRF53)''')
+        parser.add_argument('--erase-mode', required=False,
+                            choices=['none', 'ranges', 'all'],
+                            help='Select the type of erase operation for the '
+                                 'internal non-volatile memory')
+        parser.add_argument('--ext-erase-mode', required=False,
+                            choices=['none', 'ranges', 'all'],
+                            help='Select the type of erase operation for the '
+                                 'external non-volatile memory')
 
         parser.set_defaults(reset=True)
 
@@ -146,9 +158,19 @@ def args_from_previous_runner(cls, previous_runner, args):
             args.dev_id = previous_runner.dev_id
 
     def ensure_snr(self):
-        if not self.dev_id or "*" in self.dev_id:
-            self.dev_id = self.get_board_snr(self.dev_id or "*")
-        self.dev_id = self.dev_id.lstrip("0")
+        # dev_id can be None, str or list of str
+        dev_id = self.dev_id
+        if isinstance(dev_id, list):
+            if len(dev_id) == 0:
+                dev_id = None
+            elif len(dev_id) == 1:
+                dev_id = dev_id[0]
+            else:
+                self.dev_id = [d.lstrip("0") for d in dev_id]
+                return
+        if not dev_id or "*" in dev_id:
+            dev_id = self.get_board_snr(dev_id or "*")
+        self.dev_id = dev_id.lstrip("0")
 
     @abc.abstractmethod
     def do_get_boards(self):
@@ -325,6 +347,18 @@ def _get_core(self):
 
         return None
 
+    def _get_erase_mode(self, mode):
+        if not mode:
+            return None
+        elif mode == "none":
+            return "ERASE_NONE"
+        elif mode == "ranges":
+            return "ERASE_RANGES_TOUCHED_BY_FIRMWARE"
+        elif mode == "all":
+            return "ERASE_ALL"
+        else:
+            raise RuntimeError(f"Invalid erase mode: {mode}")
+
     def program_hex(self):
         # Get the command use to actually program self.hex_.
         self.logger.info(f'Flashing file: {self.hex_}')
@@ -345,8 +379,11 @@ def program_hex(self):
                 )
 
             if self.erase:
-                self.exec_op('erase', core='Application', kind='all')
-                self.exec_op('erase', core='Network', kind='all')
+                if self.build_conf.get('CONFIG_SOC_NRF54H20_IRON'):
+                    self.exec_op('erase', kind='all')
+                else:
+                    self.exec_op('erase', core='Application', kind='all')
+                    self.exec_op('erase', core='Network', kind='all')
 
             # Manage SUIT artifacts.
             # This logic should be executed only once per build.
@@ -402,6 +439,8 @@ def program_hex(self):
         else:
             if self.erase:
                 erase_arg = 'ERASE_ALL'
+            elif self.family == 'nrf54l':
+                erase_arg = self._get_erase_mode(self.erase_mode) or 'ERASE_NONE'
             else:
                 erase_arg = 'ERASE_RANGES_TOUCHED_BY_FIRMWARE'
 
@@ -413,7 +452,17 @@ def program_hex(self):
         if self.family in xip_ranges:
             xip_start, xip_end = xip_ranges[self.family]
             if self.hex_refers_region(xip_start, xip_end):
-                ext_mem_erase_opt = erase_arg
+                # Default to pages for the external memory
+                ext_mem_erase_opt = self._get_erase_mode(self.ext_erase_mode) or \
+                        (erase_arg if erase_arg == 'ERASE_ALL' else \
+                                    'ERASE_RANGES_TOUCHED_BY_FIRMWARE')
+
+        if not ext_mem_erase_opt and self.ext_erase_mode:
+            self.logger.warning('Option --ext-erase-mode ignored, no parts of the '
+                                'image refer to external memory')
+
+        self.logger.debug(f'Erase modes: chip:{erase_arg} ext_mem:'
+                          f'{ext_mem_erase_opt}')
 
         self.op_program(self.hex_, erase_arg, ext_mem_erase_opt, defer=True, core=core)
         self.flush(force=False)
@@ -506,6 +555,20 @@ def do_run(self, command, **kwargs):
             raise RuntimeError('Options --softreset and --pinreset are mutually '
                                'exclusive.')
 
+        if self.erase and self.erase_mode:
+            raise RuntimeError('Options --erase and --erase-mode are mutually '
+                               'exclusive.')
+
+        if self.erase and self.ext_erase_mode:
+            raise RuntimeError('Options --erase and --ext-erase-mode are mutually '
+                               'exclusive.')
+
+        self.ensure_family()
+
+        if self.family != 'nrf54l' and self.erase_mode:
+            raise RuntimeError('Option --erase-mode can only be used with the '
+                               'nRF54L family.')
+
         self.ensure_output('hex')
         if IntelHex is None:
             raise RuntimeError('Python dependency intelhex was missing; '
@@ -516,7 +579,6 @@ def do_run(self, command, **kwargs):
             self.hex_contents.loadfile(self.hex_, format='hex')
 
         self.ensure_snr()
-        self.ensure_family()
 
         self.ops = deque()
 
@@ -528,5 +590,5 @@ def do_run(self, command, **kwargs):
         # All done, now flush any outstanding ops
         self.flush(force=True)
 
-        self.logger.info(f'Board with serial number {self.dev_id} '
-                         'flashed successfully.')
+        self.logger.info(f'Board(s) with serial number(s) {self.dev_id} '
+                          'flashed successfully.')
diff --git a/scripts/west_commands/runners/nrfjprog.py b/scripts/west_commands/runners/nrfjprog.py
index 36461b7236de6..fd0a47e5dc40b 100644
--- a/scripts/west_commands/runners/nrfjprog.py
+++ b/scripts/west_commands/runners/nrfjprog.py
@@ -18,11 +18,12 @@ class NrfJprogBinaryRunner(NrfBinaryRunner):
     '''Runner front-end for nrfjprog.'''
 
     def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
-                 reset=True, tool_opt=None, force=False, recover=False,
-                 qspi_ini=None):
+                 erase_mode=None, ext_erase_mode=None, reset=True, tool_opt=None,
+                 force=False, recover=False, qspi_ini=None):
 
-        super().__init__(cfg, family, softreset, pinreset, dev_id, erase, reset,
-                         tool_opt, force, recover)
+        super().__init__(cfg, family, softreset, pinreset, dev_id, erase,
+                         erase_mode, ext_erase_mode, reset, tool_opt, force,
+                         recover)
 
         self.qspi_ini = qspi_ini
 
@@ -30,6 +31,14 @@ def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
     def name(cls):
         return 'nrfjprog'
 
+    @classmethod
+    def capabilities(cls):
+        return NrfBinaryRunner._capabilities()
+
+    @classmethod
+    def dev_id_help(cls) -> str:
+        return NrfBinaryRunner._dev_id_help()
+
     @classmethod
     def tool_opt_help(cls) -> str:
         return 'Additional options for nrfjprog, e.g. "--clockspeed"'
@@ -38,9 +47,11 @@ def tool_opt_help(cls) -> str:
     def do_create(cls, cfg, args):
         return NrfJprogBinaryRunner(cfg, args.nrf_family, args.softreset,
                                     args.pinreset, args.dev_id, erase=args.erase,
-                                    reset=args.reset,
-                                    tool_opt=args.tool_opt, force=args.force,
-                                    recover=args.recover, qspi_ini=args.qspi_ini)
+                                    erase_mode=args.erase_mode,
+                                    ext_erase_mode=args.ext_erase_mode,
+                                    reset=args.reset, tool_opt=args.tool_opt,
+                                    force=args.force, recover=args.recover,
+                                    qspi_ini=args.qspi_ini)
     @classmethod
     def do_add_parser(cls, parser):
         super().do_add_parser(parser)
@@ -85,7 +96,7 @@ def do_exec_op(self, op, force=False):
                     cmd.append('--sectoranduicrerase')
                 else:
                     cmd.append('--sectorerase')
-            elif erase == 'NO_ERASE':
+            elif erase == 'ERASE_NONE':
                 pass
             else:
                 raise RuntimeError(f'Invalid erase mode: {erase}')
diff --git a/scripts/west_commands/runners/nrfutil.py b/scripts/west_commands/runners/nrfutil.py
index f937da74c071b..e7efda9ac5aa3 100644
--- a/scripts/west_commands/runners/nrfutil.py
+++ b/scripts/west_commands/runners/nrfutil.py
@@ -17,11 +17,13 @@ class NrfUtilBinaryRunner(NrfBinaryRunner):
     '''Runner front-end for nrfutil.'''
 
     def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
-                 reset=True, tool_opt=None, force=False, recover=False,
-                 suit_starter=False, ext_mem_config_file=None):
+                 erase_mode=None, ext_erase_mode=None, reset=True, tool_opt=None,
+                 force=False, recover=False, suit_starter=False,
+                 ext_mem_config_file=None):
 
-        super().__init__(cfg, family, softreset, pinreset, dev_id, erase, reset,
-                         tool_opt, force, recover)
+        super().__init__(cfg, family, softreset, pinreset, dev_id, erase,
+                         erase_mode, ext_erase_mode, reset, tool_opt, force,
+                         recover)
 
         self.suit_starter = suit_starter
         self.ext_mem_config_file = ext_mem_config_file
@@ -33,6 +35,15 @@ def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
     def name(cls):
         return 'nrfutil'
 
+    @classmethod
+    def capabilities(cls):
+        return NrfBinaryRunner._capabilities(mult_dev_ids=True)
+
+    @classmethod
+    def dev_id_help(cls) -> str:
+        return NrfBinaryRunner._dev_id_help() + \
+               '''.\n This option can be specified multiple times'''
+
     @classmethod
     def tool_opt_help(cls) -> str:
         return 'Additional options for nrfutil, e.g. "--log-level"'
@@ -41,9 +52,10 @@ def tool_opt_help(cls) -> str:
     def do_create(cls, cfg, args):
         return NrfUtilBinaryRunner(cfg, args.nrf_family, args.softreset,
                                    args.pinreset, args.dev_id, erase=args.erase,
-                                   reset=args.reset,
-                                   tool_opt=args.tool_opt, force=args.force,
-                                   recover=args.recover,
+                                   erase_mode=args.erase_mode,
+                                   ext_erase_mode=args.ext_erase_mode,
+                                   reset=args.reset, tool_opt=args.tool_opt,
+                                   force=args.force, recover=args.recover,
                                    suit_starter=args.suit_manifest_starter,
                                    ext_mem_config_file=args.ext_mem_config_file)
 
@@ -57,7 +69,6 @@ def do_add_parser(cls, parser):
                             dest='ext_mem_config_file',
                             help='path to an JSON file with external memory configuration')
 
-
     def _exec(self, args):
         jout_all = []
 
@@ -107,6 +118,12 @@ def _insert_op(self, op):
         self._op_id += 1
         self._ops.append(op)
 
+    def _format_dev_ids(self):
+        if isinstance(self.dev_id, list):
+            return ','.join(self.dev_id)
+        else:
+            return self.dev_id
+
     def _append_batch(self, op, json_file):
         _op = op['operation']
         op_type = _op['type']
@@ -151,7 +168,7 @@ def _exec_batch(self):
             precmd = ['--x-ext-mem-config-file', self.ext_mem_config_file]
 
         self._exec(precmd + ['x-execute-batch', '--batch-path', f'{json_file}',
-                             '--serial-number', f'{self.dev_id}'])
+                             '--serial-number', self._format_dev_ids()])
 
     def do_exec_op(self, op, force=False):
         self.logger.debug(f'Executing op: {op}')
diff --git a/scripts/west_commands/runners/openocd.py b/scripts/west_commands/runners/openocd.py
index d30992a30a00b..abb4a5809282d 100644
--- a/scripts/west_commands/runners/openocd.py
+++ b/scripts/west_commands/runners/openocd.py
@@ -232,7 +232,8 @@ def read_version(self):
         out = self.check_output([self.openocd_cmd[0], '--version'],
                                 stderr=subprocess.STDOUT).decode()
 
-        version_match = re.search(r"Open On-Chip Debugger v?(\d+.\d+.\d+)", out)
+        # Account for version info format of ADI fork of OpenOCD as well
+        version_match = re.search(r"Open On-Chip Debugger.* v?(\d+.\d+.\d+)", out)
         version = version_match.group(1).split('.')
 
         return [to_num(i) for i in version]
diff --git a/scripts/west_commands/runners/rfp.py b/scripts/west_commands/runners/rfp.py
new file mode 100644
index 0000000000000..507c36e36428b
--- /dev/null
+++ b/scripts/west_commands/runners/rfp.py
@@ -0,0 +1,120 @@
+# Copyright (c) 2025 Pete Johanson
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# pylint: disable=duplicate-code
+
+'''Runner for rfp.'''
+
+import platform
+import re
+
+from runners.core import RunnerCaps, ZephyrBinaryRunner
+
+if platform.system() == 'Darwin':
+    DEFAULT_RFP_PORT = None
+else:
+    DEFAULT_RFP_PORT = '/dev/ttyACM0'
+
+
+def to_num(number):
+    dev_match = re.search(r"^\d*\+dev", number)
+    dev_version = dev_match is not None
+
+    num_match = re.search(r"^\d*", number)
+    num = int(num_match.group(0))
+
+    if dev_version:
+        num += 1
+
+    return num
+
+
+class RfpBinaryRunner(ZephyrBinaryRunner):
+    '''Runner front-end for rfp.'''
+
+    def __init__(
+        self,
+        cfg,
+        rfp_cli='rfp-cli',
+        device=None,
+        erase=False,
+        verify=False,
+        port=DEFAULT_RFP_PORT,
+        speed=None,
+    ):
+        super().__init__(cfg)
+
+        self.rfp_cmd = [rfp_cli]
+        self.verify = verify
+        self.erase = erase
+        self.port = port
+        self.device = device
+        self.speed = speed
+
+    @classmethod
+    def name(cls):
+        return 'rfp'
+
+    @classmethod
+    def capabilities(cls):
+        return RunnerCaps(commands={'flash'}, erase=True)
+
+    @classmethod
+    def do_add_parser(cls, parser):
+        parser.add_argument(
+            '--rfp-cli', default='rfp-cli', help='path to rfp-cli, default is rfp-cli'
+        )
+        parser.add_argument(
+            '--port',
+            default=DEFAULT_RFP_PORT,
+            help='serial port to use, default is ' + str(DEFAULT_RFP_PORT),
+        )
+        parser.add_argument('--device', help='Specify the device type to pass to rfp-cli')
+        parser.add_argument('--verify', action='store_true', help='if given, verify after flash')
+        parser.add_argument('--speed', help='Specify the serial port speed')
+
+    @classmethod
+    def do_create(cls, cfg, args):
+        return RfpBinaryRunner(
+            cfg,
+            rfp_cli=args.rfp_cli,
+            device=args.device,
+            port=args.port,
+            erase=args.erase,
+            speed=args.speed,
+            verify=args.verify,
+        )
+
+    def do_run(self, command, **kwargs):
+        if command == 'flash':
+            self.do_flash(**kwargs)
+        else:
+            self.logger.error("Unsuppported command")
+
+    def do_flash(self, **kwargs):
+        self.ensure_output('hex')
+
+        hex_name = self.cfg.hex_file
+
+        self.logger.info(f'Flashing file: {hex_name}')
+
+        load_image = ['-run']
+        if self.erase:
+            load_image += ['-erase']
+        else:
+            load_image += ['-noerase']
+
+        if self.verify:
+            load_image += ['-v']
+
+        # Load image
+        load_image += ['-p', '-file', hex_name]
+
+        port = ['-port', self.port]
+        if self.speed:
+            port += ['-s', self.speed]
+        device = ['-device', self.device]
+
+        cmd = self.rfp_cmd + port + device + load_image
+        self.check_call(cmd)
diff --git a/scripts/west_commands/runners/stm32cubeprogrammer.py b/scripts/west_commands/runners/stm32cubeprogrammer.py
index 032e40837bf88..1335fa3c66e9b 100644
--- a/scripts/west_commands/runners/stm32cubeprogrammer.py
+++ b/scripts/west_commands/runners/stm32cubeprogrammer.py
@@ -146,6 +146,10 @@ def capabilities(cls):
 
     @classmethod
     def do_add_parser(cls, parser):
+        # To accept arguments in hex format, a wrapper lambda around int() must be used.
+        # Wrapping the lambda with functools.wraps() makes it so that 'invalid int value'
+        # is displayed when an invalid value is provided for these arguments.
+        multi_base=functools.wraps(int)(lambda s: int(s, base=0))
         parser.add_argument(
             "--port",
             type=str,
@@ -164,12 +168,9 @@ def do_add_parser(cls, parser):
         )
         parser.add_argument(
             "--download-address",
-            # To accept arguments in hex format, a wrapper lambda around int() must be used.
-            # Wrapping the lambda with functools.wraps() makes it so that 'invalid int value'
-            # is displayed when an invalid value is provided for this argument.
-            type=functools.wraps(int)(lambda s: int(s, base=0)),
+            type=multi_base,
             required=False,
-            help="Address where flashing should be done"
+            help="Flashing location address. If present, .bin used instead of .hex"
         )
         parser.add_argument(
             "--download-modifiers",
@@ -180,10 +181,7 @@ def do_add_parser(cls, parser):
         )
         parser.add_argument(
             "--start-address",
-            # To accept arguments in hex format, a wrapper lambda around int() must be used.
-            # Wrapping the lambda with functools.wraps() makes it so that 'invalid int value'
-            # is displayed when an invalid value is provided for this argument.
-            type=functools.wraps(int)(lambda s: int(s, base=0)),
+            type=multi_base,
             required=False,
             help="Address where execution should begin after flashing"
         )
@@ -271,15 +269,23 @@ def flash(self, **kwargs) -> None:
         if self._erase:
             self.check_call(cmd + ["--erase", "all"])
 
-        # flash image and run application
+        # Define binary to be loaded
         if self._use_elf:
+            # Use elf file if instructed to do so.
             dl_file = self.cfg.elf_file
-        elif self.cfg.bin_file is not None and os.path.isfile(self.cfg.bin_file) and \
-            "zephyr.signed" in self.cfg.bin_file:
+        elif (self.cfg.bin_file is not None and
+               (self._download_address is not None or
+                  (str(self._port).startswith("usb") and self._download_modifiers is not None))):
+            # Use bin file if a binary is available and
+            # --download-address provided
+            # or flashing by dfu (port=usb and download-modifier used)
             dl_file = self.cfg.bin_file
-        elif self.cfg.hex_file is not None and os.path.isfile(self.cfg.hex_file):
-            # --user-elf not used and no bin file given, default to hex
+        elif self.cfg.hex_file is not None:
+            # Neither --use-elf nor --download-address are present:
+            # default to flashing using hex file.
             dl_file = self.cfg.hex_file
+
+        # Verify file configuration
         if dl_file is None:
             raise RuntimeError('cannot flash; no download file was specified')
         elif not os.path.isfile(dl_file):
diff --git a/scripts/west_commands/runners/sy1xx.py b/scripts/west_commands/runners/sy1xx.py
new file mode 100755
index 0000000000000..5cb9719b0ac60
--- /dev/null
+++ b/scripts/west_commands/runners/sy1xx.py
@@ -0,0 +1,74 @@
+# Copyright (c) 2025 sensry.io
+# SPDX-License-Identifier: Apache-2.0
+
+'''Runner for Sensry SY1xx Soc Flashing Tool.'''
+
+import importlib.util
+
+from runners.core import RunnerCaps, ZephyrBinaryRunner
+
+
+class Sy1xxBinaryRunner(ZephyrBinaryRunner):
+    '''Runner front-end for Sensry SY1xx Soc'''
+
+    def __init__(self, cfg, dev_id=None):
+        super().__init__(cfg)
+        print(cfg)
+        self.bin_file = cfg.bin_file
+        self.dev_id = dev_id
+
+    @classmethod
+    def name(cls):
+        return 'sy1xx'
+
+    @classmethod
+    def capabilities(cls):
+        return RunnerCaps(commands={'flash'}, dev_id=True)
+
+    @classmethod
+    def do_add_parser(cls, parser):
+        parser.set_defaults(dev_id='/dev/ttyUSB0')
+
+    @classmethod
+    def dev_id_help(cls) -> str:
+        return 'Device identifier such as /dev/ttyUSB0'
+
+    @classmethod
+    def do_create(cls, cfg, args):
+        # make sure the ganymed tools are installed
+        if importlib.util.find_spec('ganymed') is None:
+            raise RuntimeError("ganymed not found; can be installed with 'pip install ganymed'")
+
+        if not hasattr(args, "dev_id") or args.dev_id is None:
+            raise RuntimeError("missing --dev-id argument, such as /dev/ttyUSB0")
+
+        return Sy1xxBinaryRunner(cfg, args.dev_id)
+
+    def do_run(self, command, **kwargs):
+        if command == 'flash':
+            self.flash(**kwargs)
+
+    def flash(self, **kwargs):
+        self.logger.info(f'Flashing file: {self.bin_file} to {self.dev_id}')
+
+        from ganymed.bootloader import Bootloader
+
+        # convert binary to application ganymed-image
+        application_gnm = Bootloader.convert_zephyr_bin(self.bin_file)
+
+        # create the loader
+        flash_loader = Bootloader()
+
+        # connect to serial
+        flash_loader.connect(self.dev_id)
+
+        # set the controller into bootloader mode
+        flash_loader.enter_loading_mode()
+
+        # clear the internal flash
+        flash_loader.clear_mram()
+
+        # write the new binary
+        flash_loader.write_image(application_gnm)
+
+        self.logger.info('Flashing SY1xx finished. You may reset the device.')
diff --git a/scripts/west_commands/runners/xsdb.py b/scripts/west_commands/runners/xsdb.py
index e084a917a0ccc..7029a3a9354ae 100644
--- a/scripts/west_commands/runners/xsdb.py
+++ b/scripts/west_commands/runners/xsdb.py
@@ -54,5 +54,5 @@ def do_run(self, command, **kwargs):
         elif self.fsbl:
             cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file, self.fsbl]
         else:
-            cmd = ['xsdb', self.xsdb_cfg_file]
+            cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file]
         self.check_call(cmd)
diff --git a/scripts/west_commands/tests/test_imports.py b/scripts/west_commands/tests/test_imports.py
index 3fb08b68a9e1f..f59ba65daa954 100644
--- a/scripts/west_commands/tests/test_imports.py
+++ b/scripts/west_commands/tests/test_imports.py
@@ -46,10 +46,12 @@ def test_runner_imports():
         'qemu',
         'renode',
         'renode-robot',
+        'rfp',
         'silabs_commander',
         'spi_burn',
         'stm32cubeprogrammer',
         'stm32flash',
+        'sy1xx',
         'teensy',
         'trace32',
         'uf2',
diff --git a/scripts/west_commands/tests/test_rfp.py b/scripts/west_commands/tests/test_rfp.py
new file mode 100644
index 0000000000000..26440f8dbc8d0
--- /dev/null
+++ b/scripts/west_commands/tests/test_rfp.py
@@ -0,0 +1,256 @@
+# Copyright (c) 2025 Pete Johanson
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import argparse
+import os
+from unittest.mock import call, patch
+
+from conftest import RC_KERNEL_HEX
+from runners.rfp import RfpBinaryRunner
+
+TEST_RFP_PORT = 'test-rfp-serial'
+TEST_RFP_PORT_SPEED = '115200'
+TEST_RFP_DEVICE = 'RA'
+TEST_RFP_USR_LOCAL_RFP_CLI = '/usr/local/bin/rfp-cli'
+
+EXPECTED_COMMANDS = [
+    [
+        'rfp-cli',
+        '-port',
+        TEST_RFP_PORT,
+        '-device',
+        TEST_RFP_DEVICE,
+        '-run',
+        '-noerase',
+        '-p',
+        '-file',
+        RC_KERNEL_HEX,
+    ],
+]
+
+EXPECTED_COMMANDS_WITH_SPEED = [
+    [
+        'rfp-cli',
+        '-port',
+        TEST_RFP_PORT,
+        '-s',
+        TEST_RFP_PORT_SPEED,
+        '-device',
+        TEST_RFP_DEVICE,
+        '-run',
+        '-noerase',
+        '-p',
+        '-file',
+        RC_KERNEL_HEX,
+    ],
+]
+
+
+EXPECTED_COMMANDS_WITH_ERASE = [
+    [
+        'rfp-cli',
+        '-port',
+        TEST_RFP_PORT,
+        '-device',
+        TEST_RFP_DEVICE,
+        '-run',
+        '-erase',
+        '-p',
+        '-file',
+        RC_KERNEL_HEX,
+    ],
+]
+
+EXPECTED_COMMANDS_WITH_VERIFY = [
+    [
+        'rfp-cli',
+        '-port',
+        TEST_RFP_PORT,
+        '-device',
+        TEST_RFP_DEVICE,
+        '-run',
+        '-noerase',
+        '-v',
+        '-p',
+        '-file',
+        RC_KERNEL_HEX,
+    ],
+]
+
+EXPECTED_COMMANDS_WITH_RFP_CLI = [
+    [
+        TEST_RFP_USR_LOCAL_RFP_CLI,
+        '-port',
+        TEST_RFP_PORT,
+        '-device',
+        TEST_RFP_DEVICE,
+        '-run',
+        '-noerase',
+        '-p',
+        '-file',
+        RC_KERNEL_HEX,
+    ],
+]
+
+
+def require_patch(program):
+    assert program in ['rfp']
+
+
+os_path_isfile = os.path.isfile
+
+
+def os_path_isfile_patch(filename):
+    if filename == RC_KERNEL_HEX:
+        return True
+    return os_path_isfile(filename)
+
+
+@patch('runners.core.ZephyrBinaryRunner.require', side_effect=require_patch)
+@patch('runners.core.ZephyrBinaryRunner.check_call')
+def test_rfp_init(cc, req, runner_config, tmpdir):
+    """
+    Test commands using a runner created by constructor.
+
+    Input:
+        port=A
+    device=B
+
+    Output:
+        -port A
+        -device B
+    """
+    runner = RfpBinaryRunner(runner_config, port=TEST_RFP_PORT, device=TEST_RFP_DEVICE)
+    with patch('os.path.isfile', side_effect=os_path_isfile_patch):
+        runner.run('flash')
+    assert cc.call_args_list == [call(x) for x in EXPECTED_COMMANDS]
+
+
+@patch('runners.core.ZephyrBinaryRunner.require', side_effect=require_patch)
+@patch('runners.core.ZephyrBinaryRunner.check_call')
+def test_rfp_create(cc, req, runner_config, tmpdir):
+    """
+    Test commands using a runner created from command line parameters.
+
+
+    Input:
+        ---port A
+    --device B
+
+    Output:
+        -port A
+        -device B
+    """
+    args = ['--port', str(TEST_RFP_PORT), "--device", str(TEST_RFP_DEVICE)]
+    parser = argparse.ArgumentParser(allow_abbrev=False)
+    RfpBinaryRunner.add_parser(parser)
+    arg_namespace = parser.parse_args(args)
+    runner = RfpBinaryRunner.create(runner_config, arg_namespace)
+    with patch('os.path.isfile', side_effect=os_path_isfile_patch):
+        runner.run('flash')
+    assert cc.call_args_list == [call(x) for x in EXPECTED_COMMANDS]
+
+
+@patch('runners.core.ZephyrBinaryRunner.require', side_effect=require_patch)
+@patch('runners.core.ZephyrBinaryRunner.check_call')
+def test_rfp_create_with_speed(cc, req, runner_config, tmpdir):
+    """
+    Test commands using a runner created from command line parameters.
+
+    Input:
+        --port
+        --speed
+    --speed
+
+    Output:
+        -s SPEED
+    """
+    args = [
+        '--device',
+        str(TEST_RFP_DEVICE),
+        '--port',
+        str(TEST_RFP_PORT),
+        '--speed',
+        str(TEST_RFP_PORT_SPEED),
+    ]
+    parser = argparse.ArgumentParser(allow_abbrev=False)
+    RfpBinaryRunner.add_parser(parser)
+    arg_namespace = parser.parse_args(args)
+    runner = RfpBinaryRunner.create(runner_config, arg_namespace)
+    with patch('os.path.isfile', side_effect=os_path_isfile_patch):
+        runner.run('flash')
+    assert cc.call_args_list == [call(x) for x in EXPECTED_COMMANDS_WITH_SPEED]
+
+
+@patch('runners.core.ZephyrBinaryRunner.require', side_effect=require_patch)
+@patch('runners.core.ZephyrBinaryRunner.check_call')
+def test_rfp_create_with_erase(cc, req, runner_config, tmpdir):
+    """
+    Test commands using a runner created from command line parameters.
+
+    Input:
+        --erase
+
+    Output:
+        -erase
+    """
+    args = ['--device', str(TEST_RFP_DEVICE), '--port', str(TEST_RFP_PORT), '--erase']
+    parser = argparse.ArgumentParser(allow_abbrev=False)
+    RfpBinaryRunner.add_parser(parser)
+    arg_namespace = parser.parse_args(args)
+    runner = RfpBinaryRunner.create(runner_config, arg_namespace)
+    with patch('os.path.isfile', side_effect=os_path_isfile_patch):
+        runner.run('flash')
+    assert cc.call_args_list == [call(x) for x in EXPECTED_COMMANDS_WITH_ERASE]
+
+
+@patch('runners.core.ZephyrBinaryRunner.require', side_effect=require_patch)
+@patch('runners.core.ZephyrBinaryRunner.check_call')
+def test_rfp_create_with_verify(cc, req, runner_config, tmpdir):
+    """
+    Test commands using a runner created from command line parameters.
+
+    Input:
+        --verify
+
+    Output:
+        -v
+    """
+    args = ['--device', str(TEST_RFP_DEVICE), '--port', str(TEST_RFP_PORT), '--verify']
+    parser = argparse.ArgumentParser(allow_abbrev=False)
+    RfpBinaryRunner.add_parser(parser)
+    arg_namespace = parser.parse_args(args)
+    runner = RfpBinaryRunner.create(runner_config, arg_namespace)
+    with patch('os.path.isfile', side_effect=os_path_isfile_patch):
+        runner.run('flash')
+    assert cc.call_args_list == [call(x) for x in EXPECTED_COMMANDS_WITH_VERIFY]
+
+
+@patch('runners.core.ZephyrBinaryRunner.require', side_effect=require_patch)
+@patch('runners.core.ZephyrBinaryRunner.check_call')
+def test_rfp_create_with_rfp_cli(cc, req, runner_config, tmpdir):
+    """
+    Test commands using a runner created from command line parameters.
+
+    Input:
+        --rfp-cli /usr/local/bin/rfp-cli
+
+    Output:
+        /usr/local/bin/rfp-cli
+    """
+    args = [
+        '--device',
+        str(TEST_RFP_DEVICE),
+        '--port',
+        str(TEST_RFP_PORT),
+        '--rfp-cli',
+        str(TEST_RFP_USR_LOCAL_RFP_CLI),
+    ]
+    parser = argparse.ArgumentParser(allow_abbrev=False)
+    RfpBinaryRunner.add_parser(parser)
+    arg_namespace = parser.parse_args(args)
+    runner = RfpBinaryRunner.create(runner_config, arg_namespace)
+    with patch('os.path.isfile', side_effect=os_path_isfile_patch):
+        runner.run('flash')
+    assert cc.call_args_list == [call(x) for x in EXPECTED_COMMANDS_WITH_RFP_CLI]
diff --git a/scripts/west_commands/tests/test_stm32cubeprogrammer.py b/scripts/west_commands/tests/test_stm32cubeprogrammer.py
index 917a0099b45ea..252ac745bdbb4 100644
--- a/scripts/west_commands/tests/test_stm32cubeprogrammer.py
+++ b/scripts/west_commands/tests/test_stm32cubeprogrammer.py
@@ -3,14 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import argparse
+import os
 from pathlib import Path
 from unittest.mock import patch, call
 
 import pytest
 
 from runners.stm32cubeprogrammer import STM32CubeProgrammerBinaryRunner
-from conftest import RC_KERNEL_HEX, RC_KERNEL_ELF
-
+from conftest import RC_KERNEL_HEX, RC_KERNEL_ELF, RC_KERNEL_BIN
 
 CLI_PATH = Path("STM32_Programmer_CLI")
 """Default CLI path used in tests."""
@@ -436,7 +436,7 @@
                 "--connect",
                 "port=swd",
                 "--download",
-                RC_KERNEL_HEX,
+                RC_KERNEL_BIN,
                 "0x80000000",
                 "0x1",
                 "--start",
@@ -447,6 +447,12 @@
 )
 """Test cases."""
 
+os_path_isfile = os.path.isfile
+
+def os_path_isfile_patch(filename):
+    if filename == RC_KERNEL_BIN:
+        return True
+    return os_path_isfile(filename)
 
 @pytest.mark.parametrize("tc", TEST_CASES)
 @patch("runners.stm32cubeprogrammer.platform.system")
@@ -455,7 +461,9 @@
 @patch.dict("runners.stm32cubeprogrammer.os.environ", ENVIRON)
 @patch("runners.core.ZephyrBinaryRunner.require")
 @patch("runners.stm32cubeprogrammer.STM32CubeProgrammerBinaryRunner.check_call")
+@patch("os.path.isfile", side_effect=os_path_isfile_patch)
 def test_stm32cubeprogrammer_init(
+    os_path_isfile_patch,
     check_call, require, path_exists, path_home, system, tc, runner_config
 ):
     """Tests that ``STM32CubeProgrammerBinaryRunner`` class can be initialized
@@ -494,7 +502,9 @@ def test_stm32cubeprogrammer_init(
 @patch.dict("runners.stm32cubeprogrammer.os.environ", ENVIRON)
 @patch("runners.core.ZephyrBinaryRunner.require")
 @patch("runners.stm32cubeprogrammer.STM32CubeProgrammerBinaryRunner.check_call")
+@patch("os.path.isfile", side_effect=os_path_isfile_patch)
 def test_stm32cubeprogrammer_create(
+    os_path_isfile_patch,
     check_call, require, path_exists, path_home, system, tc, runner_config
 ):
     """Tests that ``STM32CubeProgrammerBinaryRunner`` class can be created using
diff --git a/scripts/west_commands/tests/test_xsdb.py b/scripts/west_commands/tests/test_xsdb.py
index ca97e7ad5118b..0711da5f38e3e 100644
--- a/scripts/west_commands/tests/test_xsdb.py
+++ b/scripts/west_commands/tests/test_xsdb.py
@@ -13,13 +13,13 @@
         "config": None,
         "bitstream": None,
         "fsbl": None,
-        "expected_cmd": ["xsdb", "default_cfg_path"],
+        "expected_cmd": ["xsdb", "default_cfg_path", RC_KERNEL_ELF],
     },
     {
         "config": "custom_cfg_path",
         "bitstream": None,
         "fsbl": None,
-        "expected_cmd": ["xsdb", "custom_cfg_path"],
+        "expected_cmd": ["xsdb", "custom_cfg_path", RC_KERNEL_ELF],
     },
     {
         "config": None,
diff --git a/scripts/west_commands/zcmake.py b/scripts/west_commands/zcmake.py
index aad616aadd423..1b6770196ff5d 100644
--- a/scripts/west_commands/zcmake.py
+++ b/scripts/west_commands/zcmake.py
@@ -10,6 +10,7 @@
 '''
 
 from collections import OrderedDict
+import argparse
 import os.path
 import re
 import subprocess
@@ -26,7 +27,7 @@
 '''Name of the default CMake generator.'''
 
 
-def run_cmake(args, cwd=None, capture_output=False, dry_run=False):
+def run_cmake(args, cwd=None, capture_output=False, dry_run=False, env=None):
     '''Run cmake to (re)generate a build system, a script, etc.
 
     :param args: arguments to pass to CMake
@@ -36,6 +37,7 @@ def run_cmake(args, cwd=None, capture_output=False, dry_run=False):
                            dry_run is also True)
     :param dry_run: don't actually execute the command, just print what
                     would have been run
+    :param env: used adjusted environment when running CMake
 
     If capture_output is set to True, returns the output of the command instead
     of displaying it on stdout/stderr..'''
@@ -60,7 +62,7 @@ def run_cmake(args, cwd=None, capture_output=False, dry_run=False):
         return None
 
     log.dbg('Running CMake:', quote_sh_list(cmd), level=log.VERBOSE_NORMAL)
-    p = subprocess.Popen(cmd, **kwargs)
+    p = subprocess.Popen(cmd, env=env, **kwargs)
     out, _ = p.communicate()
     if p.returncode == 0:
         if out:
@@ -82,8 +84,29 @@ def run_build(build_directory, **kwargs):
 
     Any additional keyword arguments are passed as-is to run_cmake().
     '''
+    cmake_env = None
     extra_args = kwargs.pop('extra_args', [])
-    return run_cmake(['--build', build_directory] + extra_args, **kwargs)
+
+    try:
+        index = extra_args.index('--') + 1
+        build_opt_parser = argparse.ArgumentParser(allow_abbrev=False)
+        build_opt_parser.add_argument('-j', '--jobs')
+        build_opt_parser.add_argument('-v', '--verbose', action='store_true')
+        build_opts, native_args = build_opt_parser.parse_known_args(extra_args[index:])
+        extra_args = extra_args[:index] + native_args
+
+        if build_opts:
+            cmake_env = os.environ.copy()
+            if build_opts.jobs:
+                cmake_env["CMAKE_BUILD_PARALLEL_LEVEL"] = build_opts.jobs
+
+            if build_opts.verbose:
+                cmake_env["VERBOSE"] = "1"
+
+    except ValueError:
+        pass # Ignore, no presence of '--' so nothing to do.
+
+    return run_cmake(['--build', build_directory] + extra_args, env=cmake_env, **kwargs)
 
 
 def make_c_identifier(string):
diff --git a/scripts/west_commands/zspdx/scanner.py b/scripts/west_commands/zspdx/scanner.py
index cf6e71a0f236b..21975242acdf5 100644
--- a/scripts/west_commands/zspdx/scanner.py
+++ b/scripts/west_commands/zspdx/scanner.py
@@ -115,7 +115,7 @@ def calculateVerificationCode(pkg):
     hashes.sort()
     filelist = "".join(hashes)
 
-    hSHA1 = hashlib.sha1()
+    hSHA1 = hashlib.sha1(usedforsecurity=False)
     hSHA1.update(filelist.encode('utf-8'))
     return hSHA1.hexdigest()
 
diff --git a/scripts/west_commands/zspdx/util.py b/scripts/west_commands/zspdx/util.py
index e02a981b6027f..05cfbdcd436ad 100644
--- a/scripts/west_commands/zspdx/util.py
+++ b/scripts/west_commands/zspdx/util.py
@@ -16,9 +16,9 @@ def getHashes(filePath):
     Returns: tuple of (SHA1, SHA256, MD5) hashes for filePath, or
              None if file is not found.
     """
-    hSHA1 = hashlib.sha1()
+    hSHA1 = hashlib.sha1(usedforsecurity=False)
     hSHA256 = hashlib.sha256()
-    hMD5 = hashlib.md5()
+    hMD5 = hashlib.md5(usedforsecurity=False)
 
     log.dbg(f"  - getting hashes for {filePath}")
 
diff --git a/scripts/west_commands/zspdx/walker.py b/scripts/west_commands/zspdx/walker.py
index eaa8c5dadc292..196c68228fe73 100644
--- a/scripts/west_commands/zspdx/walker.py
+++ b/scripts/west_commands/zspdx/walker.py
@@ -77,12 +77,12 @@ def _build_purl(self, url, version=None):
 
         purl = None
         # This is designed to match repository with the following url pattern:
-        # '<protocol><base_url>/<namespace>/<package>
-        COMMON_GIT_URL_REGEX=r'((git@|http(s)?:\/\/)(?P<base_url>[\w\.@]+)(\/|:))(?P<namespace>[\w,\-,\_]+)\/(?P<package>[\w,\-,\_]+)(.git){0,1}((\/){0,1})$'
+        # '<protocol><type>/<namespace>/<package>
+        COMMON_GIT_URL_REGEX=r'((git@|http(s)?:\/\/)(?P<type>[\w\.@]+)(\.\w+)(\/|:))(?P<namespace>[\w,\-,\_\/]+)\/(?P<package>[\w,\-,\_]+)(.git){0,1}((\/){0,1})$'
 
         match = re.fullmatch(COMMON_GIT_URL_REGEX, url)
         if match:
-            purl = f'pkg:{match.group("base_url")}/{match.group("namespace")}/{match.group("package")}'
+            purl = f'pkg:{match.group("type")}/{match.group("namespace")}/{match.group("package")}'
 
         if purl and (version or len(version) > 0):
             purl += f'@{version}'
diff --git a/share/sysbuild/Kconfig b/share/sysbuild/Kconfig
index 69f2d4cd396c5..e2076941380a9 100644
--- a/share/sysbuild/Kconfig
+++ b/share/sysbuild/Kconfig
@@ -1,8 +1,35 @@
-# Copyright (c) 2021 Nordic Semiconductor
+# Copyright (c) 2021-2023 Nordic Semiconductor
 #
 # SPDX-License-Identifier: Apache-2.0
 
-rsource "Kconfig.$(HWM_SCHEME)"
+config BOARD
+	string
+	default "$(BOARD)"
+	help
+	  This option holds the name of the board and is used to locate the files
+	  related to the board in the source tree (under boards/).
+	  The Board is the first location where we search for a linker.ld file,
+	  if not found we look for the linker file in
+	  soc/<arch>/<family>/<series>
+
+config BOARD_REVISION
+	def_string "$(BOARD_REVISION)"
+	help
+	  If the BOARD has a revision field set, this is the revision.
+	  Otherwise, it is the empty string. For example, if BOARD is
+	  "plank@foo", this option will be "foo". If BOARD is "plank",
+	  this option will be the empty string.
+
+config BOARD_DEPRECATED_RELEASE
+	string
+	help
+	  This hidden option is set in the board configuration and indicates
+	  the Zephyr release that the board configuration will be removed.
+	  When set, any build for that board will generate a clearly visible
+	  deprecation warning.
+
+source "boards/Kconfig.v2"
+source "soc/Kconfig.v2"
 
 comment "Sysbuild image configuration"
 
diff --git a/share/sysbuild/Kconfig.v1 b/share/sysbuild/Kconfig.v1
deleted file mode 100644
index 58191354bb732..0000000000000
--- a/share/sysbuild/Kconfig.v1
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Intentionally left empty as sysbuild Kconfig doesn't support hw model v1.
diff --git a/share/sysbuild/Kconfig.v2 b/share/sysbuild/Kconfig.v2
index c8261b086164e..424117c57940c 100644
--- a/share/sysbuild/Kconfig.v2
+++ b/share/sysbuild/Kconfig.v2
@@ -28,5 +28,5 @@ config BOARD_DEPRECATED_RELEASE
 	  When set, any build for that board will generate a clearly visible
 	  deprecation warning.
 
-source "boards/Kconfig.$(HWM_SCHEME)"
-source "soc/Kconfig.$(HWM_SCHEME)"
+source "boards/Kconfig.v2"
+source "soc/Kconfig.v2"
diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
index b9987fb14d4c5..a0ca87c4253cd 100644
--- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -397,23 +397,17 @@ function(ExternalZephyrProject_Add)
     # The sysbuild BOARD is exported through sysbuild cache, and will be used
     # unless <image>_BOARD is defined.
     if(DEFINED ZBUILD_BOARD_REVISION)
-      # Use provided board revision
-      if(ZBUILD_BOARD MATCHES "/")
-        # HWMv2 requires adding version to the board, split elements up, attach version, then
-        # reassemble into a complete string
-        string(REPLACE "/" ";" split_board_qualifiers "${ZBUILD_BOARD}")
-        list(GET split_board_qualifiers 0 target_board)
-        set(target_board ${target_board}@${ZBUILD_BOARD_REVISION})
-        list(REMOVE_AT split_board_qualifiers 0)
-        list(PREPEND split_board_qualifiers ${target_board})
-        string(REPLACE ";" "/" board_qualifiers "${split_board_qualifiers}")
-        set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${board_qualifiers})
-        set(split_board_qualifiers)
-        set(board_qualifiers)
-      else()
-        # Legacy HWMv1 support, version goes at end
-        set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD}@${ZBUILD_BOARD_REVISION})
-      endif()
+      # Use provided board revision, HWMv2 requires adding version to the board, split elements
+      # up, attach version, then reassemble into a complete string
+      string(REPLACE "/" ";" split_board_qualifiers "${ZBUILD_BOARD}")
+      list(GET split_board_qualifiers 0 target_board)
+      set(target_board ${target_board}@${ZBUILD_BOARD_REVISION})
+      list(REMOVE_AT split_board_qualifiers 0)
+      list(PREPEND split_board_qualifiers ${target_board})
+      string(REPLACE ";" "/" board_qualifiers "${split_board_qualifiers}")
+      set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${board_qualifiers})
+      set(split_board_qualifiers)
+      set(board_qualifiers)
     else()
       set_target_properties(${ZBUILD_APPLICATION} PROPERTIES BOARD ${ZBUILD_BOARD})
     endif()
diff --git a/share/sysbuild/image_configurations/BOOTLOADER_image_default.cmake b/share/sysbuild/image_configurations/BOOTLOADER_image_default.cmake
index 422fdb8303080..75b0bc3668aaf 100644
--- a/share/sysbuild/image_configurations/BOOTLOADER_image_default.cmake
+++ b/share/sysbuild/image_configurations/BOOTLOADER_image_default.cmake
@@ -12,7 +12,8 @@ set(bootmodes CONFIG_SINGLE_APPLICATION_SLOT
               CONFIG_BOOT_SWAP_USING_MOVE
               CONFIG_BOOT_DIRECT_XIP
               CONFIG_BOOT_RAM_LOAD
-              CONFIG_BOOT_FIRMWARE_LOADER)
+              CONFIG_BOOT_FIRMWARE_LOADER
+              CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
 
 if(SB_CONFIG_MCUBOOT_MODE_SINGLE_APP)
   set(bootmode CONFIG_SINGLE_APPLICATION_SLOT)
@@ -30,6 +31,8 @@ elseif(SB_CONFIG_MCUBOOT_MODE_RAM_LOAD)
   set(bootmode CONFIG_BOOT_RAM_LOAD)
 elseif(SB_CONFIG_MCUBOOT_MODE_FIRMWARE_UPDATER)
   set(bootmode CONFIG_BOOT_FIRMWARE_LOADER)
+elseif(SB_CONFIG_MCUBOOT_MODE_SINGLE_APP_RAM_LOAD)
+  set(bootmode CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD)
 endif()
 
 foreach(loopbootmode ${bootmodes})
diff --git a/share/sysbuild/image_configurations/MAIN_image_default.cmake b/share/sysbuild/image_configurations/MAIN_image_default.cmake
index 28dd6d0aacb71..653f7328892fa 100644
--- a/share/sysbuild/image_configurations/MAIN_image_default.cmake
+++ b/share/sysbuild/image_configurations/MAIN_image_default.cmake
@@ -41,5 +41,7 @@ if(SB_CONFIG_BOOTLOADER_MCUBOOT)
     set_config_int(${ZCMAKE_APPLICATION} CONFIG_FLASH_SIZE 0)
   elseif(SB_CONFIG_MCUBOOT_MODE_FIRMWARE_UPDATER)
     set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER y)
+  elseif(SB_CONFIG_MCUBOOT_MODE_SINGLE_APP_RAM_LOAD)
+    set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP_RAM_LOAD y)
   endif()
 endif()
diff --git a/share/sysbuild/images/bootloader/Kconfig b/share/sysbuild/images/bootloader/Kconfig
index 1b5cdec41eae7..54e429fcc97e7 100644
--- a/share/sysbuild/images/bootloader/Kconfig
+++ b/share/sysbuild/images/bootloader/Kconfig
@@ -126,6 +126,19 @@ config MCUBOOT_MODE_FIRMWARE_UPDATER
 	  mechanism defined for entering the slot1_partition which is a dedicated firmware updater
 	  application used to update the slot0_partition application.
 
+config MCUBOOT_MODE_SINGLE_APP_RAM_LOAD
+	bool "Single app RAM load mode"
+	help
+	  MCUboot can load the image to RAM from an arbitrary location. In this mode,
+	  MCUboot will copy the image to RAM and begin execution from there. The image
+	  must be linked to execute from RAM, the address that it is copied to is
+	  specified using the load-addr argument when running imgtool.
+	  Note that while not used directly, a slot0_partition must be defined in the
+	  DT, as it is used to get information about size of the image to be loaded.
+	  This option automatically selects MCUBOOT_BOOTLOADER_NO_DOWNGRADE as it is
+	  not possible to swap back to older version of the application. In fact, none
+	  of the swap operations are supported in this mode.
+
 endchoice
 
 config SIGNATURE_TYPE
diff --git a/snippets/nordic-flpr/snippet.yml b/snippets/nordic-flpr/snippet.yml
index f7578eccaacea..e6f6a41e252d0 100644
--- a/snippets/nordic-flpr/snippet.yml
+++ b/snippets/nordic-flpr/snippet.yml
@@ -9,3 +9,9 @@ boards:
   /.*/nrf54h20/cpuapp/:
     append:
       EXTRA_DTC_OVERLAY_FILE: soc/nrf54h20_cpuapp.overlay
+  /.*/nrf54l09/cpuapp/:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: soc/nrf54l09_cpuapp.overlay
+  /.*/nrf54l20/cpuapp/:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: soc/nrf54l20_cpuapp.overlay
diff --git a/snippets/nordic-flpr/soc/nrf54l09_cpuapp.overlay b/snippets/nordic-flpr/soc/nrf54l09_cpuapp.overlay
new file mode 100644
index 0000000000000..946349c3a8835
--- /dev/null
+++ b/snippets/nordic-flpr/soc/nrf54l09_cpuapp.overlay
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			cpuflpr_code_partition: image@ee000 {
+				/* FLPR core code partition */
+				reg = <0xee000 DT_SIZE_K(48)>;
+			};
+		};
+
+		cpuflpr_sram_code_data: memory@20023c00 {
+			compatible = "mmio-sram";
+			reg = <0x20023c00 DT_SIZE_K(48)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x20023c00 DT_SIZE_K(48)>;
+		};
+	};
+};
+
+&uart30 {
+	status = "reserved";
+};
+
+&cpuflpr_vpr {
+	execution-memory = <&cpuflpr_sram_code_data>;
+	source-memory = <&cpuflpr_code_partition>;
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/snippets/nordic-flpr/soc/nrf54l20_cpuapp.overlay b/snippets/nordic-flpr/soc/nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..1d36ba5ac4882
--- /dev/null
+++ b/snippets/nordic-flpr/soc/nrf54l20_cpuapp.overlay
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	soc {
+		reserved-memory {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			cpuflpr_code_partition: image@1ed000 {
+				/* FLPR core code partition */
+				reg = <0x1ed000 DT_SIZE_K(64)>;
+			};
+		};
+
+		cpuflpr_sram_code_data: memory@2006fc00 {
+			compatible = "mmio-sram";
+			reg = <0x2006fc00 DT_SIZE_K(64)>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2006fc00 0x10000>;
+		};
+	};
+};
+
+&uart30 {
+	status = "reserved";
+};
+
+&cpuflpr_vpr {
+	execution-memory = <&cpuflpr_sram_code_data>;
+	source-memory = <&cpuflpr_code_partition>;
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/snippets/wifi-enterprise/README.rst b/snippets/wifi-enterprise/README.rst
new file mode 100644
index 0000000000000..ddf512b583583
--- /dev/null
+++ b/snippets/wifi-enterprise/README.rst
@@ -0,0 +1,31 @@
+.. _snippet-wifi-enterprise:
+
+Wi-Fi Enterprise Snippet (wifi-enterprise)
+##########################################
+
+.. code-block:: console
+
+   west build  -S wifi-enterprise [...]
+
+Can also be used along with the :ref:`snippet-wifi-ipv4` snippet.
+
+.. code-block:: console
+
+   west build  -S "wifi-enterprise,wifi-ipv4" [...]
+
+Overview
+********
+
+This snippet enables enterprise Wi-Fi support in supported networking samples.
+
+See :ref:`wifi_mgmt` for more information on the usage.
+
+Requirements
+************
+
+Hardware support for:
+
+- :kconfig:option:`CONFIG_WIFI`
+- :kconfig:option:`CONFIG_WIFI_USE_NATIVE_NETWORKING`
+- :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT`
+- :kconfig:option:`CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE`
diff --git a/snippets/wifi-enterprise/snippet.yml b/snippets/wifi-enterprise/snippet.yml
new file mode 100644
index 0000000000000..6a4f73d38b42e
--- /dev/null
+++ b/snippets/wifi-enterprise/snippet.yml
@@ -0,0 +1,3 @@
+name: wifi-enterprise
+append:
+  EXTRA_CONF_FILE: wifi-enterprise.conf
diff --git a/snippets/wifi-enterprise/wifi-enterprise.conf b/snippets/wifi-enterprise/wifi-enterprise.conf
new file mode 100644
index 0000000000000..cf7754989ba53
--- /dev/null
+++ b/snippets/wifi-enterprise/wifi-enterprise.conf
@@ -0,0 +1,16 @@
+# Enable Wi-Fi enterprise mode
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
+# Use variable data size to reduce memory usage for small data packets
+CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
+# For TLS and X.509 processing MbedTLS needs large heap size and using separate heap
+# for MbedTLS gives us more control over the heap size.
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=70000
+
+# For use with TLS credentials
+CONFIG_TLS_CREDENTIALS_SHELL=y
+CONFIG_BASE64=y
+CONFIG_TLS_CREDENTIALS=y
+CONFIG_TLS_CREDENTIALS_SHELL_CRED_BUF_SIZE=8192
+CONFIG_TLS_MAX_CREDENTIALS_NUMBER=6
+CONFIG_HEAP_MEM_POOL_ADD_SIZE_TLS_CRED_SHELL=9000
diff --git a/snippets/wifi-ip/README.rst b/snippets/wifi-ip/README.rst
new file mode 100644
index 0000000000000..b9d6808ce8568
--- /dev/null
+++ b/snippets/wifi-ip/README.rst
@@ -0,0 +1,28 @@
+.. _snippet-wifi-ip:
+
+Wi-Fi IPv4 and IPv6 Snippet (wifi-ip)
+#####################################
+
+.. code-block:: console
+
+   west build -S wifi-ip [...]
+
+Overview
+********
+
+This snippet enables IPv4 and IPv6 Wi-Fi support in supported networking samples.
+The sample execution is postponed until Wi-Fi connectivity is established.
+
+Use Wi-Fi shell to connect to the Wi-Fi network:
+
+.. code-block:: console
+
+   wifi connect -s <SSID> -k <key_management> -p <passphrase>
+
+Requirements
+************
+
+Hardware support for:
+
+- :kconfig:option:`CONFIG_WIFI`
+- :kconfig:option:`CONFIG_WIFI_USE_NATIVE_NETWORKING`
diff --git a/snippets/wifi-ip/snippet.yml b/snippets/wifi-ip/snippet.yml
new file mode 100644
index 0000000000000..0c4b0759b608b
--- /dev/null
+++ b/snippets/wifi-ip/snippet.yml
@@ -0,0 +1,3 @@
+name: wifi-ip
+append:
+  EXTRA_CONF_FILE: wifi-ip.conf
diff --git a/snippets/wifi-ip/wifi-ip.conf b/snippets/wifi-ip/wifi-ip.conf
new file mode 100644
index 0000000000000..788715d59b701
--- /dev/null
+++ b/snippets/wifi-ip/wifi-ip.conf
@@ -0,0 +1,32 @@
+# Wi-Fi
+CONFIG_WIFI=y
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+
+# Make sure there is enough resources for supplicant and most of the samples
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZVFS_OPEN_MAX=24
+CONFIG_NET_MAX_CONN=10
+CONFIG_ZVFS_POLL_MAX=10
+
+# Enable both IPv4 and IPv6
+CONFIG_NET_IPV6=y
+CONFIG_NET_IPV4=y
+
+# DHCPv4 and DHCPv6 are enabled
+CONFIG_NET_DHCPV4=y
+CONFIG_NET_DHCPV6=y
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
+CONFIG_NET_CONFIG_INIT_TIMEOUT=0
+
+# DNS
+CONFIG_DNS_RESOLVER=y
+
+# Connection manager
+CONFIG_NET_CONNECTION_MANAGER=y
+
+# Wi-Fi shell
+CONFIG_NET_SHELL=y
+CONFIG_NET_L2_WIFI_SHELL=y
+CONFIG_SHELL_STACK_SIZE=5200
diff --git a/snippets/wifi-ipv6/README.rst b/snippets/wifi-ipv6/README.rst
new file mode 100644
index 0000000000000..1675c493c6387
--- /dev/null
+++ b/snippets/wifi-ipv6/README.rst
@@ -0,0 +1,28 @@
+.. _snippet-wifi-ipv6:
+
+Wi-Fi IPv6 Snippet (wifi-ipv6)
+##############################
+
+.. code-block:: console
+
+   west build -S wifi-ipv6 [...]
+
+Overview
+********
+
+This snippet enables IPv6 Wi-Fi support in supported networking samples.
+The sample execution is postponed until Wi-Fi connectivity is established.
+
+Use Wi-Fi shell to connect to the Wi-Fi network:
+
+.. code-block:: console
+
+   wifi connect -s <SSID> -k <key_management> -p <passphrase>
+
+Requirements
+************
+
+Hardware support for:
+
+- :kconfig:option:`CONFIG_WIFI`
+- :kconfig:option:`CONFIG_WIFI_USE_NATIVE_NETWORKING`
diff --git a/snippets/wifi-ipv6/snippet.yml b/snippets/wifi-ipv6/snippet.yml
new file mode 100644
index 0000000000000..88983250c94cc
--- /dev/null
+++ b/snippets/wifi-ipv6/snippet.yml
@@ -0,0 +1,3 @@
+name: wifi-ipv6
+append:
+  EXTRA_CONF_FILE: wifi-ipv6.conf
diff --git a/snippets/wifi-ipv6/wifi-ipv6.conf b/snippets/wifi-ipv6/wifi-ipv6.conf
new file mode 100644
index 0000000000000..f4ea1214ece17
--- /dev/null
+++ b/snippets/wifi-ipv6/wifi-ipv6.conf
@@ -0,0 +1,31 @@
+# Wi-Fi
+CONFIG_WIFI=y
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+
+# Make sure there is enough resources for supplicant and most of the samples
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZVFS_OPEN_MAX=24
+CONFIG_NET_MAX_CONN=10
+CONFIG_ZVFS_POLL_MAX=10
+
+# IPv6 only for now
+CONFIG_NET_IPV6=y
+CONFIG_NET_CONFIG_NEED_IPV4=n
+CONFIG_NET_IPV4=n
+
+# DHCPv6
+CONFIG_NET_DHCPV6=y
+CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
+CONFIG_NET_CONFIG_INIT_TIMEOUT=0
+
+# DNS
+CONFIG_DNS_RESOLVER=y
+
+# Connection manager
+CONFIG_NET_CONNECTION_MANAGER=y
+
+# Wi-Fi shell
+CONFIG_NET_SHELL=y
+CONFIG_NET_L2_WIFI_SHELL=y
+CONFIG_SHELL_STACK_SIZE=5200
diff --git a/soc/CMakeLists.txt b/soc/CMakeLists.txt
index 7cd3f1af754bf..5240a3332ca86 100644
--- a/soc/CMakeLists.txt
+++ b/soc/CMakeLists.txt
@@ -11,48 +11,30 @@ unset(_SOC_IS_IN_TREE)
 
 add_subdirectory(common)
 
-if(HWMv1)
-  message(DEPRECATION "
-          ---------------------------------------------------------------------
-          --- WARNING: Functionality to describe SoCs in HWMv1 is           ---
-          --- deprecated and should be replaced with HWMv2, including       ---
-          --- boards. HWMv1 SoCs support remains only to ease the migration ---
-          --- of out-of-tree SoCs and associated boards. It will not be     ---
-          --- possible to build using HWMv1 SoCs at all in future releases. ---
-          ---------------------------------------------------------------------"
-         )
+# Below is inclusion of HWMv2 SoC CMake lists.
+string(TOUPPER SOC_FAMILY_${SOC_FAMILY}_DIR family_setting_dir)
+string(TOUPPER SOC_SERIES_${SOC_SERIES}_DIR series_setting_dir)
+string(TOUPPER SOC_${SOC_NAME}_DIR soc_setting_dir)
 
-  if(EXISTS ${SOC_DIR}/${ARCH}/CMakeLists.txt)
-    add_subdirectory(${SOC_DIR}/${ARCH} soc/${ARCH})
-  else()
-    add_subdirectory(${SOC_DIR}/${ARCH}/${SOC_PATH} soc/${ARCH}/${SOC_PATH})
-  endif()
-elseif(HWMv2)
-  # Below is inclusion of HWMv2 SoC CMake lists.
-  string(TOUPPER SOC_FAMILY_${SOC_FAMILY}_DIR family_setting_dir)
-  string(TOUPPER SOC_SERIES_${SOC_SERIES}_DIR series_setting_dir)
-  string(TOUPPER SOC_${SOC_NAME}_DIR soc_setting_dir)
+if(DEFINED ${soc_setting_dir})
+  add_subdirectory(${${soc_setting_dir}} soc/${SOC_NAME})
+elseif(DEFINED ${series_setting_dir})
+  add_subdirectory(${${series_setting_dir}} soc/${SOC_SERIES})
+elseif(DEFINED ${family_setting_dir})
+  add_subdirectory(${${family_setting_dir}} soc/${SOC_FAMILY})
+else()
+  message(FATAL_ERROR "No CMakeLists.txt file found for SoC: ${SOC_NAME}, "
+                      "series: ${SOC_SERIES}, family: ${SOC_FAMILY}")
+endif()
 
-  if(DEFINED ${soc_setting_dir})
-    add_subdirectory(${${soc_setting_dir}} soc/${SOC_NAME})
-  elseif(DEFINED ${series_setting_dir})
-    add_subdirectory(${${series_setting_dir}} soc/${SOC_SERIES})
-  elseif(DEFINED ${family_setting_dir})
-    add_subdirectory(${${family_setting_dir}} soc/${SOC_FAMILY})
-  else()
-    message(FATAL_ERROR "No CMakeLists.txt file found for SoC: ${SOC_NAME}, "
-                        "series: ${SOC_SERIES}, family: ${SOC_FAMILY}")
+# Include all SoC roots except Zephyr, as we are already in the Zephyr SoC root.
+set(local_soc_root ${SOC_ROOT})
+list(REMOVE_ITEM local_soc_root ${ZEPHYR_BASE})
+foreach(root ${local_soc_root})
+  cmake_path(GET root FILENAME name)
+  # A SoC root for HWMv1 may not contain a CMakeLists.txt file on this so
+  # let's check for existence before including.
+  if(EXISTS ${root}/soc/CMakeLists.txt)
+    add_subdirectory(${root}/soc soc/${name})
   endif()
-
-  # Include all SoC roots except Zephyr, as we are already in the Zephyr SoC root.
-  set(local_soc_root ${SOC_ROOT})
-  list(REMOVE_ITEM local_soc_root ${ZEPHYR_BASE})
-  foreach(root ${local_soc_root})
-    cmake_path(GET root FILENAME name)
-    # A SoC root for HWMv1 may not contain a CMakeLists.txt file on this so
-    # let's check for existence before including.
-    if(EXISTS ${root}/soc/CMakeLists.txt)
-      add_subdirectory(${root}/soc soc/${name})
-    endif()
-  endforeach()
-endif()
+endforeach()
diff --git a/soc/Kconfig b/soc/Kconfig
index af32c5c5cf321..a1ea1f97896b8 100644
--- a/soc/Kconfig
+++ b/soc/Kconfig
@@ -3,11 +3,9 @@
 # Only v1 model has choice for SoC selection, therefore the optional source
 # Sourced here and not in Kconfig.v1 to keep current SoC/CPU selection menu
 # side-by-side with "Hardware Configuration" in the menu structure.
-orsource "Kconfig.$(HWM_SCHEME).choice"
-
 menu "Hardware Configuration"
 
-rsource "Kconfig.$(HWM_SCHEME)"
+rsource "Kconfig.v2"
 
 # Source Zephyr Kconfig specifics from SoC roots.
 osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig"
diff --git a/soc/Kconfig.v1 b/soc/Kconfig.v1
deleted file mode 100644
index bd7f66d77bcb9..0000000000000
--- a/soc/Kconfig.v1
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC
-	string
-	help
-	  SoC name. The value of this setting must be defined by the selected
-	  SoC for hw model v2.
-
-config SOC_SERIES
-	string
-	help
-	  SoC series. The value of this setting must be defined by the selected
-	  SoC if the SoC belongs to a common series.
-
-config SOC_FAMILY
-	string
-	help
-	  SoC family. The value of this setting must be defined by the selected
-	  SoC if the SoC belongs to a SoC family. Usually a SoC family also
-	  indicates the vendor of the SoC.
-
-# This loads custom SoC root Kconfig (only available if custom SoC root are defined)
-osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.soc.arch"
diff --git a/soc/Kconfig.v1.choice b/soc/Kconfig.v1.choice
deleted file mode 100644
index e96dd15bedd30..0000000000000
--- a/soc/Kconfig.v1.choice
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "SoC/CPU/Configuration Selection"
-
-# This loads custom SoC root Kconfig (only available if custom SoC root are defined)
-osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.soc.choice"
-
-endchoice
diff --git a/soc/adi/max32/Kconfig.defconfig.max32650 b/soc/adi/max32/Kconfig.defconfig.max32650
new file mode 100644
index 0000000000000..9c8608b1b775d
--- /dev/null
+++ b/soc/adi/max32/Kconfig.defconfig.max32650
@@ -0,0 +1,14 @@
+# Analog Devices MAX32650 MCU
+
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_MAX32650
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/clocks/clk_ipo,clock-frequency)
+
+config NUM_IRQS
+	default 80
+
+endif # SOC_MAX32650
diff --git a/soc/adi/max32/Kconfig.defconfig.max32660 b/soc/adi/max32/Kconfig.defconfig.max32660
new file mode 100644
index 0000000000000..29848d44d1dc5
--- /dev/null
+++ b/soc/adi/max32/Kconfig.defconfig.max32660
@@ -0,0 +1,14 @@
+# Analog Devices MAX32660 MCU
+
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_MAX32660
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/clocks/clk_ipo,clock-frequency)
+
+config NUM_IRQS
+	default 55
+
+endif # SOC_MAX32660
diff --git a/soc/adi/max32/Kconfig.soc b/soc/adi/max32/Kconfig.soc
index b269a521b5cd1..e0be0041b4b6c 100644
--- a/soc/adi/max32/Kconfig.soc
+++ b/soc/adi/max32/Kconfig.soc
@@ -13,6 +13,10 @@ config SOC_FAMILY_MAX32_M4
 config SOC_FAMILY
 	default "max32" if SOC_FAMILY_MAX32
 
+config SOC_MAX32650
+	bool
+	select SOC_FAMILY_MAX32_M4
+
 config SOC_MAX32655
 	bool
 
@@ -21,6 +25,10 @@ config SOC_MAX32655_M4
 	select SOC_MAX32655
 	select SOC_FAMILY_MAX32_M4
 
+config SOC_MAX32660
+	bool
+	select SOC_FAMILY_MAX32_M4
+
 config SOC_MAX32662
 	bool
 	select SOC_FAMILY_MAX32_M4
@@ -78,7 +86,9 @@ config SOC_MAX78002_M4
 	select SOC_FAMILY_MAX32_M4
 
 config SOC
+	default "max32650" if SOC_MAX32650
 	default "max32655" if SOC_MAX32655
+	default "max32660" if SOC_MAX32660
 	default "max32662" if SOC_MAX32662
 	default "max32666" if SOC_MAX32666
 	default "max32670" if SOC_MAX32670
diff --git a/soc/adi/max32/soc.yml b/soc/adi/max32/soc.yml
index b4001bfd64e8a..3bf7288d120df 100644
--- a/soc/adi/max32/soc.yml
+++ b/soc/adi/max32/soc.yml
@@ -4,9 +4,11 @@
 family:
 - name: max32
   socs:
+  - name: max32650
   - name: max32655
     cpuclusters:
     - name: m4
+  - name: max32660
   - name: max32662
   - name: max32666
     cpuclusters:
diff --git a/soc/ambiq/CMakeLists.txt b/soc/ambiq/CMakeLists.txt
index 7afff4e7ec893..a4e7a49cec933 100644
--- a/soc/ambiq/CMakeLists.txt
+++ b/soc/ambiq/CMakeLists.txt
@@ -5,3 +5,15 @@
 add_subdirectory(${SOC_SERIES})
 
 zephyr_include_directories(.)
+
+if(CONFIG_SOC_AMBIQ_BT_SUPPORTED)
+  if(CONFIG_SOC_APOLLO4P)
+    if(CONFIG_AMBIQ_COMPONENT_USE_BT)
+      message(FATAL_ERROR "AMBIQ_COMPONENT_USE_BT is set to ${CONFIG_AMBIQ_COMPONENT_USE_BT} \
+for not supported SoC ${CONFIG_SOC}")
+    else()
+      message(WARNING "SOC_AMBIQ_BT_SUPPORTED is set to ${CONFIG_SOC_AMBIQ_BT_SUPPORTED} \
+for not supported SoC ${CONFIG_SOC}")
+    endif()
+  endif()
+endif()
diff --git a/soc/ambiq/Kconfig.soc b/soc/ambiq/Kconfig.soc
index ba6d5302abb7b..05104f833ba9e 100644
--- a/soc/ambiq/Kconfig.soc
+++ b/soc/ambiq/Kconfig.soc
@@ -8,4 +8,7 @@ config SOC_FAMILY_AMBIQ
 config SOC_FAMILY
 	default "ambiq" if SOC_FAMILY_AMBIQ
 
+config SOC_AMBIQ_BT_SUPPORTED
+	bool
+
 rsource "*/Kconfig.soc"
diff --git a/soc/ambiq/apollo3x/Kconfig.soc b/soc/ambiq/apollo3x/Kconfig.soc
index 6a6814179934a..d4990b385e033 100644
--- a/soc/ambiq/apollo3x/Kconfig.soc
+++ b/soc/ambiq/apollo3x/Kconfig.soc
@@ -11,12 +11,14 @@ config SOC_SERIES_APOLLO3X
 config SOC_APOLLO3P_BLUE
 	bool
 	select SOC_SERIES_APOLLO3X
+	select SOC_AMBIQ_BT_SUPPORTED
 	help
 	  Apollo3P Blue
 
 config SOC_APOLLO3_BLUE
 	bool
 	select SOC_SERIES_APOLLO3X
+	select SOC_AMBIQ_BT_SUPPORTED
 	help
 	  Apollo3 Blue
 
diff --git a/soc/ambiq/apollo3x/pinctrl_soc.h b/soc/ambiq/apollo3x/pinctrl_soc.h
index 1aa6a32d81fd3..f3f562ae802d7 100644
--- a/soc/ambiq/apollo3x/pinctrl_soc.h
+++ b/soc/ambiq/apollo3x/pinctrl_soc.h
@@ -33,12 +33,14 @@ struct apollo3_pinctrl_soc_pin {
 	uint32_t bias_pull_down: 1;
 	/** pullup resistor value */
 	uint32_t ambiq_pull_up_ohms: 3;
-	/** IOM nCE module select */
-	uint32_t iom_nce: 2;
+	/** nCE module select */
+	uint32_t nce: 2;
 	/** IOM or MSPI */
 	uint32_t iom_mspi: 1;
 	/** IOM/MSPI instance number */
 	uint32_t iom_num: 3;
+	/** nCE module polarity */
+	uint32_t nce_pol: 1;
 };
 
 typedef struct apollo3_pinctrl_soc_pin pinctrl_soc_pin_t;
@@ -62,9 +64,10 @@ typedef struct apollo3_pinctrl_soc_pin pinctrl_soc_pin_t;
 		DT_PROP(node_id, bias_pull_up),                                                    \
 		DT_PROP(node_id, bias_pull_down),                                                  \
 		DT_ENUM_IDX(node_id, ambiq_pull_up_ohms),                                          \
-		DT_PROP(node_id, ambiq_iom_nce_module),                                            \
+		DT_PROP(node_id, ambiq_nce_src),                                                   \
 		DT_PROP(node_id, ambiq_iom_mspi),                                                  \
 		DT_PROP(node_id, ambiq_iom_num),                                                   \
+		DT_PROP(node_id, ambiq_nce_pol),                                                   \
 	},
 
 /**
diff --git a/soc/ambiq/apollo3x/power.c b/soc/ambiq/apollo3x/power.c
index d41dd20c996d3..fcd2022271857 100644
--- a/soc/ambiq/apollo3x/power.c
+++ b/soc/ambiq/apollo3x/power.c
@@ -13,7 +13,7 @@
 #include <zephyr/init.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/soc/ambiq/apollo3x/soc.c b/soc/ambiq/apollo3x/soc.c
index 33bf6568d37eb..81f39e75a99ca 100644
--- a/soc/ambiq/apollo3x/soc.c
+++ b/soc/ambiq/apollo3x/soc.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/init.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 extern void ambiq_power_init(void);
 
diff --git a/soc/ambiq/apollo3x/soc.h b/soc/ambiq/apollo3x/soc.h
index ae9b7e597dfce..1489a277e245c 100644
--- a/soc/ambiq/apollo3x/soc.h
+++ b/soc/ambiq/apollo3x/soc.h
@@ -7,10 +7,6 @@
 #ifndef __SOC_H__
 #define __SOC_H__
 
-#if defined(CONFIG_SOC_APOLLO3P_BLUE)
-#include <apollo3p.h>
-#elif defined(CONFIG_SOC_APOLLO3_BLUE)
-#include <apollo3.h>
-#endif
+#include <am_mcu_apollo.h>
 
 #endif /* __SOC_H__ */
diff --git a/soc/ambiq/apollo4x/Kconfig.soc b/soc/ambiq/apollo4x/Kconfig.soc
index fe06f28a7a85a..b0b6e7c30c403 100644
--- a/soc/ambiq/apollo4x/Kconfig.soc
+++ b/soc/ambiq/apollo4x/Kconfig.soc
@@ -18,6 +18,7 @@ config SOC_APOLLO4P
 config SOC_APOLLO4P_BLUE
 	bool
 	select SOC_SERIES_APOLLO4X
+	select SOC_AMBIQ_BT_SUPPORTED
 	help
 	  Apollo4 Blue Plus
 
diff --git a/soc/ambiq/apollo4x/pinctrl_soc.h b/soc/ambiq/apollo4x/pinctrl_soc.h
index 869101ed2b57d..fdf060c91297e 100644
--- a/soc/ambiq/apollo4x/pinctrl_soc.h
+++ b/soc/ambiq/apollo4x/pinctrl_soc.h
@@ -35,10 +35,10 @@ struct apollo4_pinctrl_soc_pin {
 	uint32_t bias_pull_down : 1;
 	/** pullup resistor value */
 	uint32_t ambiq_pull_up_ohms : 3;
-	/** IOM nCE module select */
-	uint32_t iom_nce : 6;
-	/** IOM interrupt direction */
-	uint32_t interrupt_direction: 2;
+	/** nCE module select */
+	uint32_t nce : 6;
+	/** nCE module polarity */
+	uint32_t nce_pol: 1;
 };
 
 typedef struct apollo4_pinctrl_soc_pin pinctrl_soc_pin_t;
@@ -63,8 +63,8 @@ typedef struct apollo4_pinctrl_soc_pin pinctrl_soc_pin_t;
 		DT_PROP(node_id, bias_pull_up),                                                    \
 		DT_PROP(node_id, bias_pull_down),                                                  \
 		DT_ENUM_IDX(node_id, ambiq_pull_up_ohms),                                          \
-		DT_PROP(node_id, ambiq_iom_nce_module),                                            \
-		DT_PROP(node_id, ambiq_interrupt_direction),                                       \
+		DT_PROP(node_id, ambiq_nce_src),                                                   \
+		DT_PROP(node_id, ambiq_nce_pol),                                                   \
 	},
 
 /**
diff --git a/soc/ambiq/apollo4x/power.c b/soc/ambiq/apollo4x/power.c
index b799f29c224dc..cee069a224979 100644
--- a/soc/ambiq/apollo4x/power.c
+++ b/soc/ambiq/apollo4x/power.c
@@ -13,7 +13,7 @@
 #include <zephyr/init.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/soc/ambiq/apollo4x/soc.c b/soc/ambiq/apollo4x/soc.c
index 5338a2e2f5f82..2bb5003664b8d 100644
--- a/soc/ambiq/apollo4x/soc.c
+++ b/soc/ambiq/apollo4x/soc.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/init.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 extern void ambiq_power_init(void);
 void soc_early_init_hook(void)
diff --git a/soc/ambiq/apollo4x/soc.h b/soc/ambiq/apollo4x/soc.h
index dfa86b201467d..d9c79596d42ce 100644
--- a/soc/ambiq/apollo4x/soc.h
+++ b/soc/ambiq/apollo4x/soc.h
@@ -7,6 +7,6 @@
 #ifndef __SOC_H__
 #define __SOC_H__
 
-#include <apollo4p.h>
+#include <am_mcu_apollo.h>
 
 #endif /* __SOC_H__ */
diff --git a/soc/amd/acp_6_0/Kconfig.soc b/soc/amd/acp_6_0/Kconfig.soc
index 96f7fae4e4bc0..321c4416d31b9 100644
--- a/soc/amd/acp_6_0/Kconfig.soc
+++ b/soc/amd/acp_6_0/Kconfig.soc
@@ -3,7 +3,6 @@
 
 config SOC_ACP_6_0
 	bool
-	default "BOARD_ACP_6_0_ADSP"
 
 config SOC
 	default "acp_6_0" if SOC_ACP_6_0
diff --git a/soc/arm/beetle/pinctrl_soc.h b/soc/arm/beetle/pinctrl_soc.h
new file mode 100644
index 0000000000000..b515a8a02555a
--- /dev/null
+++ b/soc/arm/beetle/pinctrl_soc.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-v2m_beetle-pinctrl.h>
+
+/**
+ * @brief Type to hold a pin's pinctrl configuration.
+ */
+struct beetle_pinctrl_soc_pin {
+	/** Pin number 0..52 */
+	uint32_t pin_num : 6;
+	/** Alternative function (UART, SPI, etc.) */
+	uint32_t alt_func : 3;
+	/** Enable the pin as an input */
+	uint32_t input_enable : 1;
+};
+
+typedef struct beetle_pinctrl_soc_pin pinctrl_soc_pin_t;
+
+/**
+ * @brief Utility macro to initialize each pin.
+ *
+ * @param node_id Node identifier.
+ * @param prop Property name.
+ * @param idx Property entry index.
+ */
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)				\
+	{									\
+		BEETLE_GET_PIN_NUM(DT_PROP_BY_IDX(node_id, prop, idx)),		\
+		BEETLE_GET_PIN_ALT_FUNC(DT_PROP_BY_IDX(node_id, prop, idx)),	\
+		DT_PROP(node_id, input_enable),					\
+	},
+
+/**
+ * @brief Utility macro to initialize state pins contained in a given property.
+ *
+ * @param node_id Node identifier.
+ * @param prop Property name describing state pins.
+ */
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)				\
+	{DT_FOREACH_CHILD_VARGS(DT_PHANDLE(node_id, prop),			\
+				DT_FOREACH_PROP_ELEM, pinmux,			\
+				Z_PINCTRL_STATE_PIN_INIT)}
+
+#define BEETLE_GET_PIN_NUM(pinctrl) \
+	(((pinctrl) >> V2M_BEETLE_EXP_NUM_POS) & V2M_BEETLE_EXP_NUM_MASK)
+#define BEETLE_GET_PIN_ALT_FUNC(pinctrl) \
+	(((pinctrl) >> V2M_BEETLE_ALT_FUNC_POS) & V2M_BEETLE_ALT_FUNC_MASK)
diff --git a/soc/arm/mps2/pinctrl_soc.h b/soc/arm/mps2/pinctrl_soc.h
new file mode 100644
index 0000000000000..b3ab8b95a5893
--- /dev/null
+++ b/soc/arm/mps2/pinctrl_soc.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-mps2-pinctrl.h>
+
+/**
+ * @brief Type to hold a pin's pinctrl configuration.
+ */
+struct mps2_pinctrl_soc_pin {
+	/** Pin number 0..52 */
+	uint32_t pin_num : 6;
+	/** Alternative function (UART, SPI, etc.) */
+	uint32_t alt_func : 2;
+	/** Enable the pin as an input */
+	uint32_t input_enable : 1;
+};
+
+typedef struct mps2_pinctrl_soc_pin pinctrl_soc_pin_t;
+
+/**
+ * @brief Utility macro to initialize each pin.
+ *
+ * @param node_id Node identifier.
+ * @param prop Property name.
+ * @param idx Property entry index.
+ */
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)				\
+	{									\
+		MPS2_GET_PIN_NUM(DT_PROP_BY_IDX(node_id, prop, idx)),		\
+		MPS2_GET_PIN_ALT_FUNC(DT_PROP_BY_IDX(node_id, prop, idx)),	\
+		DT_PROP(node_id, input_enable),					\
+	},
+
+/**
+ * @brief Utility macro to initialize state pins contained in a given property.
+ *
+ * @param node_id Node identifier.
+ * @param prop Property name describing state pins.
+ */
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)				\
+	{DT_FOREACH_CHILD_VARGS(DT_PHANDLE(node_id, prop),			\
+				DT_FOREACH_PROP_ELEM, pinmux,			\
+				Z_PINCTRL_STATE_PIN_INIT)}
+
+#define MPS2_GET_PIN_NUM(pinctrl) \
+	(((pinctrl) >> MPS2_EXP_NUM_POS) & MPS2_EXP_NUM_MASK)
+#define MPS2_GET_PIN_ALT_FUNC(pinctrl) \
+	(((pinctrl) >> MPS2_ALT_FUNC_POS) & MPS2_ALT_FUNC_MASK)
diff --git a/soc/arm/mps2/soc.c b/soc/arm/mps2/soc.c
index 343330d4515c8..a45e1815f3d7e 100644
--- a/soc/arm/mps2/soc.c
+++ b/soc/arm/mps2/soc.c
@@ -7,40 +7,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/drivers/gpio/gpio_mmio32.h>
 #include <soc.h>
 #include <zephyr/linker/linker-defs.h>
 
-
-/* Setup GPIO drivers for accessing FPGAIO registers */
-#define FPGAIO_NODE(n) DT_INST(n, arm_mps2_fpgaio_gpio)
-#define FPGAIO_INIT(n)						\
-	GPIO_MMIO32_INIT(FPGAIO_NODE(n),			\
-			DT_REG_ADDR(FPGAIO_NODE(n)),		\
-			BIT_MASK(DT_PROP(FPGAIO_NODE(n), ngpios)))
-
-/* We expect there to be 3 arm,mps2-fpgaio-gpio devices:
- * led0, button, and misc
- */
-FPGAIO_INIT(0);
-FPGAIO_INIT(1);
-FPGAIO_INIT(2);
-
 /* (Secure System Control) Base Address */
-#define SSE_200_SYSTEM_CTRL_S_BASE	(0x50021000UL)
-#define SSE_200_SYSTEM_CTRL_INITSVTOR1	(SSE_200_SYSTEM_CTRL_S_BASE + 0x114)
-#define SSE_200_SYSTEM_CTRL_CPU_WAIT	(SSE_200_SYSTEM_CTRL_S_BASE + 0x118)
-#define SSE_200_CPU_ID_UNIT_BASE	(0x5001F000UL)
+#define SSE_200_SYSTEM_CTRL_S_BASE     (0x50021000UL)
+#define SSE_200_SYSTEM_CTRL_INITSVTOR1 (SSE_200_SYSTEM_CTRL_S_BASE + 0x114)
+#define SSE_200_SYSTEM_CTRL_CPU_WAIT   (SSE_200_SYSTEM_CTRL_S_BASE + 0x118)
+#define SSE_200_CPU_ID_UNIT_BASE       (0x5001F000UL)
 
 /* The base address that the application image will start at on the secondary
  * (non-TrustZone) Cortex-M33 mcu.
  */
-#define CPU1_FLASH_ADDRESS      (0x38B000)
+#define CPU1_FLASH_ADDRESS (0x38B000)
 
 /* The memory map offset for the application image, which is used
  * to determine the location of the reset vector at startup.
  */
-#define CPU1_FLASH_OFFSET       (0x10000000)
+#define CPU1_FLASH_OFFSET (0x10000000)
 
 /**
  * @brief Wake up CPU 1 from another CPU, this is platform specific.
@@ -49,9 +33,7 @@ void wakeup_cpu1(void)
 {
 	/* Set the Initial Secure Reset Vector Register for CPU 1 */
 	*(uint32_t *)(SSE_200_SYSTEM_CTRL_INITSVTOR1) =
-		(uint32_t)_vector_start +
-		CPU1_FLASH_ADDRESS -
-		CPU1_FLASH_OFFSET;
+		(uint32_t)_vector_start + CPU1_FLASH_ADDRESS - CPU1_FLASH_OFFSET;
 
 	/* Set the CPU Boot wait control after reset */
 	*(uint32_t *)(SSE_200_SYSTEM_CTRL_CPU_WAIT) = 0;
diff --git a/soc/arm/mps3/CMakeLists.txt b/soc/arm/mps3/CMakeLists.txt
index 3cf33caa58dba..bd8fb92d7804f 100644
--- a/soc/arm/mps3/CMakeLists.txt
+++ b/soc/arm/mps3/CMakeLists.txt
@@ -1,10 +1,6 @@
 # Copyright (c) 2021 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_sources(
-  soc.c
-  )
-
 zephyr_include_directories(.)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/arm/mps3/Kconfig b/soc/arm/mps3/Kconfig
index 304e8065fcbdb..732cbb5811a13 100644
--- a/soc/arm/mps3/Kconfig
+++ b/soc/arm/mps3/Kconfig
@@ -1,5 +1,5 @@
 # Copyright (c) 2017-2021 Linaro Limited
-# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_MPS3
@@ -15,6 +15,7 @@ config SOC_MPS3_CORSTONE300
 	select ARMV8_1_M_MVEI
 	select ARMV8_1_M_MVEF
 	select ARMV8_1_M_PMU
+	select ARM_MPU_PXN if ARM_MPU
 
 config SOC_MPS3_CORSTONE310
 	select CPU_CORTEX_M85
@@ -25,6 +26,7 @@ config SOC_MPS3_CORSTONE310
 	select ARMV8_1_M_MVEI
 	select ARMV8_1_M_MVEF
 	select ARMV8_1_M_PMU
+	select ARM_MPU_PXN if ARM_MPU
 
 config ARMV8_1_M_PMU_EVENTCNT
 	int
diff --git a/soc/arm/mps3/pinctrl_soc.h b/soc/arm/mps3/pinctrl_soc.h
new file mode 100644
index 0000000000000..96050defc7f84
--- /dev/null
+++ b/soc/arm/mps3/pinctrl_soc.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-mps3-pinctrl.h>
+
+/**
+ * @brief Type to hold a pin's pinctrl configuration.
+ */
+struct mps3_pinctrl_soc_pin {
+	/** Pin number 0..52 */
+	uint32_t pin_num : 6;
+	/** Alternative function (UART, SPI, etc.) */
+	uint32_t alt_func : 3;
+	/** Enable the pin as an input */
+	uint32_t input_enable : 1;
+};
+
+typedef struct mps3_pinctrl_soc_pin pinctrl_soc_pin_t;
+
+/**
+ * @brief Utility macro to initialize each pin.
+ *
+ * @param node_id Node identifier.
+ * @param prop Property name.
+ * @param idx Property entry index.
+ */
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)				\
+	{									\
+		MPS3_GET_PIN_NUM(DT_PROP_BY_IDX(node_id, prop, idx)),		\
+		MPS3_GET_PIN_ALT_FUNC(DT_PROP_BY_IDX(node_id, prop, idx)),	\
+		DT_PROP(node_id, input_enable),					\
+	},
+
+/**
+ * @brief Utility macro to initialize state pins contained in a given property.
+ *
+ * @param node_id Node identifier.
+ * @param prop Property name describing state pins.
+ */
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)				\
+	{DT_FOREACH_CHILD_VARGS(DT_PHANDLE(node_id, prop),			\
+				DT_FOREACH_PROP_ELEM, pinmux,			\
+				Z_PINCTRL_STATE_PIN_INIT)}
+
+#define MPS3_GET_PIN_NUM(pinctrl)				\
+	(((pinctrl) >> MPS3_EXP_NUM_POS) & MPS3_EXP_NUM_MASK)
+#define MPS3_GET_PIN_ALT_FUNC(pinctrl)				\
+	(((pinctrl) >> MPS3_ALT_FUNC_POS) & MPS3_ALT_FUNC_MASK)
diff --git a/soc/arm/mps3/soc.c b/soc/arm/mps3/soc.c
deleted file mode 100644
index e51a9ba5c59ad..0000000000000
--- a/soc/arm/mps3/soc.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2021 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/gpio/gpio_mmio32.h>
-#include <soc.h>
-#include <zephyr/linker/linker-defs.h>
-
-
-/* Setup GPIO drivers for accessing FPGAIO registers */
-#define FPGAIO_NODE(n) DT_INST(n, arm_mps3_fpgaio_gpio)
-#define FPGAIO_INIT(n)						\
-	GPIO_MMIO32_INIT(FPGAIO_NODE(n),			\
-			DT_REG_ADDR(FPGAIO_NODE(n)),		\
-			BIT_MASK(DT_PROP(FPGAIO_NODE(n), ngpios)))
-
-/* We expect there to be 3 arm,mps3-fpgaio-gpio devices:
- * led0, button, and misc
- */
-FPGAIO_INIT(0);
-FPGAIO_INIT(1);
-FPGAIO_INIT(2);
diff --git a/soc/atmel/sam/common/Kconfig b/soc/atmel/sam/common/Kconfig
index 760288ce486e1..e6c4e2744d129 100644
--- a/soc/atmel/sam/common/Kconfig
+++ b/soc/atmel/sam/common/Kconfig
@@ -32,6 +32,18 @@ config SOC_ATMEL_SAM_EXT_MAINCK
 
 	  Says n here will use the internal fast RC oscillator running at 12 MHz.
 
+config SOC_ATMEL_SAM_EXT_MAINCK_BYPASS
+	bool "Use bypass mode for external crystal oscillator"
+	depends on SOC_ATMEL_SAM_EXT_MAINCK
+	help
+	  When bypass mode is enabled, the external crystal oscillator is bypassed,
+	  and the main clock is directly driven by an external clock signal.
+
+	  Says y here if you want to use an external clock signal directly instead
+	  of the crystal oscillator.
+
+	  Says n here to use the external crystal oscillator normally.
+
 menu "PLL A"
 
 config SOC_ATMEL_SAM_PLLA_MULA
diff --git a/soc/atmel/sam/samx7x/soc.c b/soc/atmel/sam/samx7x/soc.c
index 72360cc141126..6058649171041 100644
--- a/soc/atmel/sam/samx7x/soc.c
+++ b/soc/atmel/sam/samx7x/soc.c
@@ -57,7 +57,9 @@ static ALWAYS_INLINE void clock_init(void)
 		 * this optimization is not deemed
 		 * critical now.
 		 */
-		soc_pmc_switch_mainck_to_xtal(false, 0xff);
+		bool bypass = IS_ENABLED(CONFIG_SOC_ATMEL_SAM_EXT_MAINCK_BYPASS);
+
+		soc_pmc_switch_mainck_to_xtal(bypass, 0xff);
 	}
 
 	/*
diff --git a/soc/cdns/dc233c/Kconfig b/soc/cdns/dc233c/Kconfig
index c0becdd0ba487..df5f3ab2e6451 100644
--- a/soc/cdns/dc233c/Kconfig
+++ b/soc/cdns/dc233c/Kconfig
@@ -13,4 +13,3 @@ config SOC_XTENSA_DC233C
 	select ARCH_HAS_USERSPACE if XTENSA_MMU
 	select ARCH_SUPPORTS_COREDUMP
 	select ARCH_SUPPORTS_COREDUMP_PRIV_STACKS
-	select XTENSA_INVALIDATE_MEM_DOMAIN_TLB_ON_SWAP if XTENSA_MMU
diff --git a/soc/cdns/dc233c/include/xtensa-dc233c.ld b/soc/cdns/dc233c/include/xtensa-dc233c.ld
index fee4ace0282d9..83ab002e97674 100644
--- a/soc/cdns/dc233c/include/xtensa-dc233c.ld
+++ b/soc/cdns/dc233c/include/xtensa-dc233c.ld
@@ -162,7 +162,6 @@ SECTIONS
 
     /* Userspace related stuff */
     LIB_OBJ_FUNC_IN_SECT(libarch__xtensa__core.a,userspace.S.obj,xtensa_do_syscall)
-    LIB_OBJ_FUNC_IN_SECT(libarch__xtensa__core.a,ptables.c.obj,xtensa_swap_update_page_tables)
 
     /* Below are to speed up execution by avoiding TLB misses
      * on frequently used functions.
diff --git a/soc/cdns/sample_controller32/Kconfig.defconfig b/soc/cdns/sample_controller32/Kconfig.defconfig
new file mode 100644
index 0000000000000..70a570f962496
--- /dev/null
+++ b/soc/cdns/sample_controller32/Kconfig.defconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_XTENSA_SAMPLE_CONTROLLER32
+
+# CONFIG_PRIVILEGED_STACK_SIZE must be aligned as specified by XCHAL_MPU_ALIGN.
+# For `sample_controller32`, that value is equal to 4096
+config PRIVILEGED_STACK_SIZE
+	default 4096 if XTENSA_MPU
+
+endif # SOC_XTENSA_SAMPLE_CONTROLLER32
diff --git a/soc/espressif/Kconfig b/soc/espressif/Kconfig
index 7a3b927957c9c..483ac468b67ae 100644
--- a/soc/espressif/Kconfig
+++ b/soc/espressif/Kconfig
@@ -62,4 +62,6 @@ config RTC_CLK_CAL_CYCLES
 	    If the crystal could not start, it will be switched to internal RC.
 endmenu
 
+rsource "Kconfig.ulp"
+
 endif # SOC_FAMILY_ESPRESSIF_ESP32
diff --git a/soc/espressif/Kconfig.ulp b/soc/espressif/Kconfig.ulp
new file mode 100644
index 0000000000000..55d50fc728443
--- /dev/null
+++ b/soc/espressif/Kconfig.ulp
@@ -0,0 +1,87 @@
+# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+menu "Ultra Low Power (ULP) Coprocessor"
+
+config ULP_COPROC_ENABLED
+	bool "Ultra Low Power (ULP) Coprocessor"
+	default y if SOC_ESP32C6_LPCORE
+	select SOC_LATE_INIT_HOOK if SOC_ESP32C6_HPCORE
+	help
+	  Enable this feature if you plan to use the ULP Coprocessor.
+	  Once this option is enabled, further ULP co-processor configuration will appear in the menu.
+
+choice ULP_COPROC_TYPE
+	prompt "ULP Coprocessor type"
+	depends on ULP_COPROC_ENABLED
+	default ULP_COPROC_TYPE_LP_CORE if SOC_SERIES_ESP32C6
+	help
+	  Choose the ULP Coprocessor type: ULP FSM (Finite State Machine) or ULP RISC-V.
+
+config ULP_COPROC_TYPE_FSM
+	bool "ULP FSM (Finite State Machine)"
+	depends on SOC_SERIES_ESP32 || SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3
+
+config ULP_COPROC_TYPE_RISCV
+	bool "ULP RISC-V"
+	depends on SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3
+
+config ULP_COPROC_TYPE_LP_CORE
+	bool "LP core RISC-V"
+	depends on SOC_SERIES_ESP32C6
+endchoice
+
+menu "ULP RISC-V Settings"
+	depends on ULP_COPROC_TYPE_RISCV
+
+config ULP_RISCV_INTERRUPT_ENABLE
+	bool "ULP RISC-V interrupts"
+	help
+	  Turn on this setting to enabled interrupts on the ULP RISC-V core.
+
+endmenu
+
+menu "ULP Debugging Options"
+
+config ULP_PANIC_OUTPUT_ENABLE
+	bool "Panic handler outputs to LP UART"
+	depends on ULP_COPROC_TYPE_LP_CORE
+	help
+	  Set this option to enable panic handler functionality. If this option is
+	  enabled then the LP Core will output a panic dump over LP UART,
+	  similar to what the main core does. Output depends on LP UART already being
+	  initialized and configured.
+	  Disabling this option will reduce the LP core binary size by not
+	  linking in panic handler functionality.
+
+config ULP_HP_UART_CONSOLE_PRINT
+	bool "Route lp_core_printf to the console HP-UART"
+	depends on ULP_COPROC_TYPE_LP_CORE
+	help
+	  Set this option to route lp_core_printf to the console HP-UART.
+	  This allows you to easily view print outputs from the LP core, without
+	  having to connect to the LP-UART. This option comes with the following
+	  limitations:
+
+	  1. There is no mutual exclusion between the HP-Core and the LP-Core accessing
+	  the HP-UART, which means that if both cores are logging heavily the output
+	  strings might get mangled together.
+	  2. The HP-UART can only work while the HP-Core is running, which means that
+	  if the HP-Core is in deep sleep, the LP-Core will not be able to print to the
+	  console HP-UART.
+
+	  Due to these limitations it is only recommended to use this option for easy debugging.
+	  For more serious use-cases you should use the LP-UART.
+
+config ULP_NORESET_UNDER_DEBUG
+	bool "Avoid resetting LP core when debugger is attached"
+	depends on ULP_COPROC_TYPE_LP_CORE
+	default y
+	help
+	  Enable this feature to avoid resetting LP core in sleep mode when debugger is attached,
+	  otherwise configured HW breakpoints and dcsr.ebreak* bits will be missed.
+	  This is a workaround until it will be fixed in HW.
+
+endmenu
+
+endmenu  # Ultra Low Power (ULP) Coprocessor
diff --git a/soc/espressif/common/CMakeLists.txt b/soc/espressif/common/CMakeLists.txt
index 3ba79987a3bc3..ab9558b9d1807 100644
--- a/soc/espressif/common/CMakeLists.txt
+++ b/soc/espressif/common/CMakeLists.txt
@@ -6,3 +6,82 @@ zephyr_include_directories(include)
 if(NOT CONFIG_MCUBOOT AND NOT CONFIG_SOC_ESP32_APPCPU AND NOT CONFIG_SOC_ESP32S3_APPCPU)
   zephyr_sources_ifdef(CONFIG_ESP_SPIRAM esp_psram.c)
 endif()
+
+# Get flash size to use in esptool as string
+math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")
+
+# Get UART baudrate from DT
+dt_chosen(dts_shell_uart PROPERTY "zephyr,shell-uart")
+if(DEFINED dts_shell_uart AND dts_shell_uart)
+  dt_prop(monitor_baud PATH ${dts_shell_uart} PROPERTY "current-speed")
+endif()
+
+message("-- Espressif HAL path: ${ESP_IDF_PATH}")
+
+if((CONFIG_ESP_SIMPLE_BOOT OR CONFIG_MCUBOOT) AND NOT CONFIG_SOC_ESP32C6_LPCORE)
+  if(CONFIG_BUILD_OUTPUT_BIN)
+    set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py)
+    message("-- Use the esptool.py: ${ESPTOOL_PY}")
+
+    set(ELF2IMAGE_ARG "")
+    if(NOT CONFIG_MCUBOOT)
+      set(ELF2IMAGE_ARG "--ram-only-header")
+    endif()
+
+    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+      COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY}
+      ARGS --chip ${CONFIG_SOC} elf2image ${ELF2IMAGE_ARG}
+      --flash_mode dio
+      --flash_freq ${CONFIG_ESPTOOLPY_FLASHFREQ}
+      --flash_size ${esptoolpy_flashsize}MB
+      -o ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}
+      ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME})
+  endif()
+endif()
+
+set_property(TARGET bintools PROPERTY disassembly_flag_inline_source)
+
+# Select the image origin depending on the boot configuration
+if(CONFIG_SOC_ESP32_APPCPU OR CONFIG_SOC_ESP32S3_APPCPU)
+  dt_nodelabel(dts_partition_path NODELABEL "slot0_appcpu_partition")
+elseif(CONFIG_SOC_ESP32C6_LPCORE)
+  dt_nodelabel(dts_partition_path NODELABEL "slot0_lpcore_partition")
+elseif(CONFIG_MCUBOOT OR CONFIG_ESP_SIMPLE_BOOT)
+  dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
+else()
+  dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
+endif()
+
+dt_reg_addr(image_off PATH ${dts_partition_path})
+board_runner_args(esp32 "--esp-app-address=${image_off}")
+board_runner_args(esp32 "--esp-flash-size=${esptoolpy_flashsize}MB")
+board_runner_args(esp32 "--esp-flash-freq=${CONFIG_ESPTOOLPY_FLASHFREQ}")
+board_runner_args(esp32 "--esp-flash-mode=${CONFIG_ESPTOOLPY_FLASHMODE}")
+board_finalize_runner_args(esp32 "--esp-monitor-baud=${monitor_baud}")
+
+message("-- Image partition ${dts_partition_path}")
+
+# Look for cross references between bootloader sections
+if(CONFIG_MCUBOOT)
+    message("check_callgraph using: ${ESP_IDF_PATH}/tools/ci/check_callgraph.py")
+    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+      COMMAND
+        ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/ci/check_callgraph.py
+      ARGS
+        --rtl-dirs ${CMAKE_BINARY_DIR}/zephyr
+        --elf-file ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}
+        find-refs
+        --from-section='.iram0.loader_text'
+        --to-section='.iram0.text'
+        --exit-code)
+endif()
+
+if(CONFIG_MCUBOOT)
+  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/mcuboot.ld CACHE INTERNAL "")
+elseif(CONFIG_SOC_ESP32_APPCPU OR CONFIG_SOC_ESP32S3_APPCPU)
+  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/default_appcpu.ld CACHE INTERNAL "")
+elseif(CONFIG_SOC_ESP32C6_LPCORE)
+  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/default_lpcore.ld CACHE INTERNAL "")
+else()
+  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/default.ld CACHE INTERNAL "")
+endif()
diff --git a/soc/espressif/common/Kconfig.defconfig b/soc/espressif/common/Kconfig.defconfig
index 9e33c4ff7ea3e..bcc34a1a52ca4 100644
--- a/soc/espressif/common/Kconfig.defconfig
+++ b/soc/espressif/common/Kconfig.defconfig
@@ -4,7 +4,7 @@
 if SOC_SERIES_ESP32C2 || SOC_SERIES_ESP32C3 || SOC_SERIES_ESP32C6
 
 config GEN_ISR_TABLES
-	default y
+	default y if !SOC_ESP32C6_LPCORE
 
 config GEN_SW_ISR_TABLE
 	default y
@@ -13,7 +13,7 @@ config GEN_IRQ_VECTOR_TABLE
 	default n
 
 config DYNAMIC_INTERRUPTS
-	default y
+	default y if !SOC_ESP32C6_LPCORE
 
 config ISR_STACK_SIZE
 	default 2048
diff --git a/soc/espressif/common/Kconfig.spiram b/soc/espressif/common/Kconfig.spiram
index 1c209839a7a27..1222b9261d9bf 100644
--- a/soc/espressif/common/Kconfig.spiram
+++ b/soc/espressif/common/Kconfig.spiram
@@ -3,6 +3,8 @@
 
 if SOC_SERIES_ESP32 || SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3
 
+ESP32_PSRAM0_NODE_PATH := $(dt_nodelabel_path,psram0)
+
 config ESP_SPIRAM
 	bool "Support for external, SPI-connected RAM"
 	default n if MCUBOOT
@@ -48,26 +50,26 @@ choice SPIRAM_TYPE
 
 config SPIRAM_TYPE_ESPPSRAM16
 	bool "ESP-PSRAM16 or APS1604"
-	depends on SPIRAM_MODE_QUAD
+	depends on SPIRAM_MODE_QUAD && (ESP_SPIRAM_SIZE = 2097152)
 
 config SPIRAM_TYPE_ESPPSRAM32
 	bool "ESP-PSRAM32 or IS25WP032"
-	depends on SPIRAM_MODE_QUAD
+	depends on SPIRAM_MODE_QUAD && (ESP_SPIRAM_SIZE = 4194304)
 
 config SPIRAM_TYPE_ESPPSRAM64
 	bool "ESP-PSRAM64, LY68L6400 or APS6408"
+	depends on (ESP_SPIRAM_SIZE = 8388608)
 
 endchoice # SPIRAM_TYPE
 
 config ESP_SPIRAM_SIZE
 	int "Size of SPIRAM part"
-	default 2097152 if SPIRAM_TYPE_ESPPSRAM16
-	default 4194304 if SPIRAM_TYPE_ESPPSRAM32
-	default 8388608 if SPIRAM_TYPE_ESPPSRAM64
+	default $(dt_node_int_prop_int,$(ESP32_PSRAM0_NODE_PATH),size) if $(dt_nodelabel_enabled,psram0)
+	default 0
 	help
 	  Specify size of SPIRAM part.
-	  NOTE: If SPIRAM size is greater than 4MB, only
-	  lower 4MB can be allocated using k_malloc().
+	  NOTE: In ESP32, if SPIRAM size is greater than 4MB,
+	  only lower 4MB can be allocated using k_malloc().
 
 choice SPIRAM_SPEED
 	prompt "Set RAM clock speed"
diff --git a/soc/espressif/common/esp_psram.c b/soc/espressif/common/esp_psram.c
index 37e814fcc76e7..aa3b01c8b9319 100644
--- a/soc/espressif/common/esp_psram.c
+++ b/soc/espressif/common/esp_psram.c
@@ -10,22 +10,19 @@
 #include <esp_private/esp_psram_extram.h>
 #include <zephyr/multi_heap/shared_multi_heap.h>
 
-#define PSRAM_ADDR (DT_REG_ADDR(DT_NODELABEL(psram0)))
-
-extern int _spiram_heap_start;
 extern int _ext_ram_bss_start;
 extern int _ext_ram_bss_end;
+extern int _ext_ram_heap_start;
 
 struct shared_multi_heap_region smh_psram = {
-	.addr = (uintptr_t)&_spiram_heap_start,
-	.size = CONFIG_ESP_SPIRAM_SIZE,
+	.addr = (uintptr_t)&_ext_ram_heap_start,
+	.size = CONFIG_ESP_SPIRAM_HEAP_SIZE,
 	.attr = SMH_REG_ATTR_EXTERNAL,
 };
 
 int esp_psram_smh_init(void)
 {
 	shared_multi_heap_pool_init();
-	smh_psram.size = CONFIG_ESP_SPIRAM_SIZE - ((int)&_spiram_heap_start - PSRAM_ADDR);
 	return shared_multi_heap_add(&smh_psram, NULL);
 }
 
diff --git a/soc/espressif/common/loader.c b/soc/espressif/common/loader.c
index 89f6e5d98e070..624fa987542e7 100644
--- a/soc/espressif/common/loader.c
+++ b/soc/espressif/common/loader.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -21,9 +21,11 @@
 #include <esp_log.h>
 #include <bootloader_clock.h>
 #include <bootloader_common.h>
-
 #include <esp_cpu.h>
 
+#include <zephyr/linker/linker-defs.h>
+#include <kernel_internal.h>
+
 #if CONFIG_SOC_SERIES_ESP32C6
 #include <soc/hp_apm_reg.h>
 #include <soc/lp_apm_reg.h>
@@ -99,13 +101,6 @@ static struct rom_segments map = {
 	.drom_size = (uint32_t)&_image_drom_size,
 };
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
-static int spi_flash_read(uint32_t address, void *buffer, size_t length)
-{
-	return esp_flash_read(NULL, buffer, address, length);
-}
-#endif /* CONFIG_BOOTLOADER_MCUBOOT */
-
 void map_rom_segments(int core, struct rom_segments *map)
 {
 	uint32_t app_irom_vaddr_align = map->irom_map_addr & MMU_FLASH_MASK;
@@ -126,7 +121,8 @@ void map_rom_segments(int core, struct rom_segments *map)
 
 	while (segments++ < 16) {
 
-		if (spi_flash_read(offset, &segment_hdr, sizeof(esp_image_segment_header_t)) != 0) {
+		if (esp_rom_flash_read(offset, &segment_hdr,
+					      sizeof(esp_image_segment_header_t), true) != 0) {
 			ESP_EARLY_LOGE(TAG, "Failed to read segment header at %x", offset);
 			abort();
 		}
@@ -255,6 +251,13 @@ void map_rom_segments(int core, struct rom_segments *map)
 void __start(void)
 {
 #ifdef CONFIG_RISCV_GP
+
+	__asm__ __volatile__("la t0, _vector_table\n"
+			     "csrw mtvec, t0\n");
+
+	/* Disable normal interrupts. */
+	csr_read_clear(mstatus, MSTATUS_MIE);
+
 	/* Configure the global pointer register
 	 * (This should be the first thing startup does, as any other piece of code could be
 	 * relaxed by the linker to access something relative to __global_pointer$)
@@ -263,17 +266,40 @@ void __start(void)
 			     ".option norelax\n"
 			     "la gp, __global_pointer$\n"
 			     ".option pop");
-#endif
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
-	/* Init fundamental components */
+	z_bss_zero();
+
+#else /* xtensa */
+
+	extern uint32_t _init_start;
+
+	/* Move the exception vector table to IRAM. */
+	__asm__ __volatile__("wsr %0, vecbase" : : "r"(&_init_start));
+
+	z_bss_zero();
+
+	__asm__ __volatile__("" : : "g"(&__bss_start) : "memory");
+
+	/* Disable normal interrupts. */
+	__asm__ __volatile__("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
+
+	/* Initialize the architecture CPU pointer.  Some of the
+	 * initialization code wants a valid arch_current_thread() before
+	 * arch_kernel_init() is invoked.
+	 */
+	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));
+
+#endif /* CONFIG_RISCV_GP */
+
+/* Initialize hardware only during 1st boot  */
+#if defined(CONFIG_MCUBOOT) || defined(CONFIG_ESP_SIMPLE_BOOT)
 	if (hardware_init()) {
 		ESP_EARLY_LOGE(TAG, "HW init failed, aborting");
 		abort();
 	}
 #endif
 
-#if !defined(CONFIG_MCUBOOT)
+#if defined(CONFIG_ESP_SIMPLE_BOOT) || defined(CONFIG_BOOTLOADER_MCUBOOT)
 	map_rom_segments(0, &map);
 
 	/* Show map segments continue using same log format as during MCUboot phase */
@@ -282,19 +308,19 @@ void __start(void)
 	ESP_EARLY_LOGI(TAG, "%s segment: paddr=%08xh, vaddr=%08xh, size=%05Xh (%6d) map", "DROM",
 		       map.drom_flash_offset, map.drom_map_addr, map.drom_size, map.drom_size);
 	esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
-#endif
 
-#ifndef CONFIG_SOC_SERIES_ESP32C2
 	/* Disable RNG entropy source as it was already used */
 	soc_random_disable();
-#endif
-#if defined(CONFIG_SOC_SERIES_ESP32S3) || defined(CONFIG_SOC_SERIES_ESP32C3)
+
 	/* Disable glitch detection as it can be falsely triggered by EMI interference */
-	ESP_EARLY_LOGI(TAG, "Disabling glitch detection");
 	ana_clock_glitch_reset_config(false);
-#endif
-#ifndef CONFIG_MCUBOOT
+
 	ESP_EARLY_LOGI(TAG, "libc heap size %d kB.", libc_heap_size / 1024);
+
+	__esp_platform_app_start();
+#endif /* CONFIG_ESP_SIMPLE_BOOT || CONFIG_BOOTLOADER_MCUBOOT */
+
+#if defined(CONFIG_MCUBOOT)
+	__esp_platform_mcuboot_start();
 #endif
-	__esp_platform_start();
 }
diff --git a/soc/espressif/esp32/CMakeLists.txt b/soc/espressif/esp32/CMakeLists.txt
index 5ccc92b682ad1..36484e5875ecf 100644
--- a/soc/espressif/esp32/CMakeLists.txt
+++ b/soc/espressif/esp32/CMakeLists.txt
@@ -22,84 +22,3 @@ zephyr_library_sources_ifdef(CONFIG_GDBSTUB gdbstub.c)
 
 zephyr_library_sources_ifdef(CONFIG_PM power.c)
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
-
-# get flash size to use in esptool as string
-math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")
-
-# Get UART baudrate from DT
-dt_chosen(dts_shell_uart PROPERTY "zephyr,shell-uart")
-if(${dts_shell_uart})
-  dt_prop(monitor_baud PATH ${dts_shell_uart} PROPERTY "current-speed")
-endif()
-
-board_runner_args(esp32 "--esp-monitor-baud=${monitor_baud}")
-
-message("-- Espressif HAL path: ${ESP_IDF_PATH}")
-
-# Select image processing
-
-if(CONFIG_ESP_SIMPLE_BOOT OR CONFIG_MCUBOOT)
-
-  if(CONFIG_BUILD_OUTPUT_BIN)
-
-    set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py)
-    message("-- Use the esptool.py: ${ESPTOOL_PY}")
-
-    set(ELF2IMAGE_ARG "")
-    if(NOT CONFIG_MCUBOOT)
-      set(ELF2IMAGE_ARG "--ram-only-header")
-    endif()
-
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY}
-      ARGS --chip ${CONFIG_SOC} elf2image ${ELF2IMAGE_ARG}
-      --flash_mode dio --flash_freq 40m
-      --flash_size ${esptoolpy_flashsize}MB
-      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
-      ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
-
-  endif()
-
-endif()
-
-set_property(TARGET bintools PROPERTY disassembly_flag_inline_source)
-
-  # Select the image origin depending on the boot configuration
-if(CONFIG_SOC_ESP32_APPCPU)
-  dt_nodelabel(dts_partition_path NODELABEL "slot0_appcpu_partition")
-elseif(CONFIG_MCUBOOT)
-  dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-elseif(CONFIG_ESP_SIMPLE_BOOT)
-  dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-else()
-  dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
-endif()
-
-dt_reg_addr(image_off PATH ${dts_partition_path})
-board_finalize_runner_args(esp32 "--esp-app-address=${image_off}")
-
-message("-- Image partition ${dts_partition_path}")
-
-# Look for cross references between bootloader sections
-if(CONFIG_MCUBOOT)
-
-    message("check_callgraph using: ${ESP_IDF_PATH}/tools/ci/check_callgraph.py")
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND
-        ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/ci/check_callgraph.py
-      ARGS
-        --rtl-dirs ${CMAKE_BINARY_DIR}/zephyr
-        --elf-file ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf
-        find-refs
-        --from-section='.iram0.loader_text'
-        --to-section='.iram0.text'
-        --exit-code)
-endif()
-
-if(CONFIG_MCUBOOT)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/mcuboot.ld CACHE INTERNAL "")
-elseif(CONFIG_SOC_ESP32_APPCPU)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default_appcpu.ld CACHE INTERNAL "")
-else()
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default.ld CACHE INTERNAL "")
-endif()
diff --git a/soc/espressif/esp32/Kconfig b/soc/espressif/esp32/Kconfig
index 17d67408c0996..3457b3818cbf3 100644
--- a/soc/espressif/esp32/Kconfig
+++ b/soc/espressif/esp32/Kconfig
@@ -20,16 +20,13 @@ config ESP32_BT_RESERVE_DRAM
 	default 0xdb5c if BT
 	default 0
 
-config ESP_HEAP_MEM_POOL_REGION_1_SIZE
-	int "Internal DRAM region 1 mempool size"
-	default 0 if MCUBOOT
-	default 1024 if SOC_ESP32_PROCPU
-	default 49152
+config ESP32_REGION_1_NOINIT
+	bool "Use DRAM region 1 to spill noinit section"
+	default n
 	help
 	  ESP32 has two banks of size 192K and 128K which can be used
-	  as DRAM, system heap allocates area from region 0.
-	  This configuration can be used to add memory from region 1
-	  to heap and can be allocated using k_malloc.
+	  as DRAM. Enabling this option would allocate .noinit sections
+	  in the DRAM region 1, instead of default region 0.
 
 config ESP32_DEEP_SLEEP_WAKEUP_DELAY
 	int "Extra delay in deep sleep wake stub (in us)"
diff --git a/soc/espressif/esp32/Kconfig.defconfig b/soc/espressif/esp32/Kconfig.defconfig
index 44a4aa96b4fd8..75d3ac95ea8fe 100644
--- a/soc/espressif/esp32/Kconfig.defconfig
+++ b/soc/espressif/esp32/Kconfig.defconfig
@@ -21,7 +21,7 @@ config SCHED_IPI_SUPPORTED
 	default y
 
 config SCHED_CPU_MASK
-	default y if SCHED_DUMB
+	default y if SCHED_SIMPLE
 
 config MP_MAX_NUM_CPUS
 	default 2
diff --git a/soc/espressif/esp32/default.ld b/soc/espressif/esp32/default.ld
index 44c74d4ce8912..e4e956680042c 100644
--- a/soc/espressif/esp32/default.ld
+++ b/soc/espressif/esp32/default.ld
@@ -13,23 +13,40 @@
 #include "memory.h"
 
 /* User available SRAM memory segments */
-procpu_iram_end = USER_IRAM_END - APPCPU_SRAM_SIZE;
-procpu_iram_org = SRAM0_IRAM_START + SRAM0_CACHE_SIZE;
-procpu_iram_len = procpu_iram_end - procpu_iram_org;
+procpu_iram0_end = USER_IRAM_END - APPCPU_SRAM_SIZE;
+procpu_iram0_org = SRAM0_IRAM_START + SRAM0_CACHE_SIZE;
+procpu_iram0_len = procpu_iram0_end - procpu_iram0_org;
 
-procpu_dram_end = SRAM2_DRAM_END;
-procpu_dram_org = SRAM2_DRAM_USER_START + CONFIG_ESP32_BT_RESERVE_DRAM;
-procpu_dram_len = SRAM2_DRAM_USER_SIZE - CONFIG_ESP32_BT_RESERVE_DRAM;
+procpu_dram0_end = SRAM2_DRAM_END;
+procpu_dram0_org = SRAM2_DRAM_USER_START + CONFIG_ESP32_BT_RESERVE_DRAM;
+procpu_dram0_len = SRAM2_DRAM_USER_SIZE - CONFIG_ESP32_BT_RESERVE_DRAM;
 
-user_dram_2_seg_org = SRAM1_DRAM_USER_START;
-user_dram_2_seg_len = SRAM1_USER_SIZE;
+procpu_dram1_org = SRAM1_DRAM_USER_START;
+procpu_dram1_len = SRAM1_DRAM_USER_SIZE;
+
+procpu_irom_org = ICACHE0_START;
+procpu_irom_len = ICACHE0_SIZE;
+procpu_drom_org = DCACHE0_START;
+procpu_drom_len = DCACHE0_SIZE;
+
+#ifdef CONFIG_ESP_SPIRAM
+procpu_ext_ram_org = DCACHE1_START;
+procpu_ext_ram_len = DCACHE1_SIZE;
+#endif
 
 /* Aliases */
-#define FLASH_CODE_REGION   irom0_0_seg
-#define RODATA_REGION       drom0_0_seg
-#define IRAM_REGION         iram0_0_seg
-#define DRAM_REGION         dram0_0_seg
-#define RAMABLE_REGION      dram0_0_seg
+#define FLASH_CODE_REGION irom0_0_seg
+#define RODATA_REGION     drom0_0_seg
+#define IRAM_REGION       iram0_0_seg
+#define DRAM_REGION       dram0_0_seg
+#define RAMABLE_REGION    dram0_0_seg
+
+#ifndef CONFIG_ESP32_REGION_1_NOINIT
+#define RAMABLE_REGION_2  dram0_0_seg
+#else
+#define RAMABLE_REGION_2  dram1_0_seg
+#endif
+
 #define ROMABLE_REGION      FLASH
 
 #undef GROUP_DATA_LINK_IN
@@ -58,33 +75,35 @@ MEMORY
   FLASH (R):       org = 0x80, len = FLASH_SIZE - 0x80
 #else
   /* Make safety margin in the FLASH memory size so the
-   * (esp_img_header + (n*esp_seg_headers)) would fit */
+   * (esp_img_header + (n*esp_seg_headers)) would fit
+   */
   FLASH (R):       org = 0x0,  len = FLASH_SIZE - 0x100
 #endif /* CONFIG_BOOTLOADER_MCUBOOT */
 
-  iram0_0_seg(RX): org = procpu_iram_org, len = procpu_iram_len
-  dram0_0_seg(RW): org = procpu_dram_org, len = procpu_dram_len
+  iram0_0_seg(RX): org = procpu_iram0_org, len = procpu_iram0_len
+  dram0_0_seg(RW): org = procpu_dram0_org, len = procpu_dram0_len
+  dram1_0_seg(RW): org = procpu_dram1_org, len = procpu_dram1_len
 
-  irom0_0_seg(RX): org = IROM_SEG_ORG, len = IROM_SEG_LEN
-  drom0_0_seg(R):  org = DROM_SEG_ORG, len = DROM_SEG_LEN
+  irom0_0_seg(RX): org = procpu_irom_org, len = procpu_irom_len
+  drom0_0_seg(R):  org = procpu_drom_org, len = procpu_drom_len
 
   rtc_iram_seg(RWX): org = 0x400c0000, len = 0x2000
   rtc_slow_seg(RW):  org = 0x50000000, len = 0x2000 - CONFIG_RESERVE_RTC_MEM
   rtc_data_seg(RW):  org = 0x3ff80000, len = 0x2000
 
   /* We reduced the size of rtc_slow_seg by CONFIG_RESERVE_RTC_MEM value.
-     It reserves the amount of RTC slow memory that we use for this memory segment.
-     This segment is intended for keeping rtc timer data (s_rtc_timer_retain_mem, see esp_clk.c files).
-     The aim of this is to keep data that will not be moved around and have a fixed address.
-     org = 0x50000000 + 0x2000 - CONFIG_RESERVE_RTC_MEM
-  */
+   *  It reserves the amount of RTC slow memory that we use for this memory segment.
+   *  This segment is intended for keeping rtc timer data (s_rtc_timer_retain_mem, see esp_clk.c files).
+   *  The aim of this is to keep data that will not be moved around and have a fixed address.
+   *  org = 0x50000000 + 0x2000 - CONFIG_RESERVE_RTC_MEM
+   */
 #if (CONFIG_RESERVE_RTC_MEM > 0)
   rtc_slow_reserved_seg(RW): org = 0x50000000 + 0x2000 - CONFIG_RESERVE_RTC_MEM,
                              len = CONFIG_RESERVE_RTC_MEM
 #endif
 
 #ifdef CONFIG_ESP_SPIRAM
-  ext_ram_seg(RW): org = 0x3f800000, len = CONFIG_ESP_SPIRAM_SIZE
+  ext_ram_seg(RW): org = procpu_ext_ram_org, len = procpu_ext_ram_len
 #endif /* CONFIG_ESP_SPIRAM */
 
 #ifdef CONFIG_GEN_ISR_TABLES
@@ -355,6 +374,7 @@ SECTIONS
     *libzephyr.a:esp_psram_impl_quad.*(.literal .literal.* .text .text.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.literal .literal.* .text .text.*)
     *libzephyr.a:mmu_hal.*(.literal .literal.* .text .text.*)
     *libzephyr.a:cache_utils.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cache_esp32.*(.literal .text .literal.* .text.*)
@@ -390,6 +410,7 @@ SECTIONS
     *libzephyr.a:spi_flash_wrap.*(.literal .literal.* .text .text.*)
     *libzephyr.a:spi_flash_hpm_enable.*(.literal .literal.* .text .text.*)
     *libzephyr.a:flash_ops.*(.literal .literal.* .text .text.*)
+    *libzephyr.a:flash_qio_mode.*(.literal .literal.* .text .text.*)
 
     /* [mapping:esp_system] */
     *libzephyr.a:esp_err.*(.literal .literal.* .text .text.*)
@@ -415,6 +436,7 @@ SECTIONS
     *libzephyr.a:mspi_timing_config.*(.literal .literal.* .text .text.*)
     *libzephyr.a:mspi_timing_tuning.*(.literal .literal.* .text .text.*)
     *libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
+    *libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *(.literal.sar_periph_ctrl_power_enable .text.sar_periph_ctrl_power_enable)
 
     *libzephyr.a:esp_system_chip.*(.literal.esp_system_abort .text.esp_system_abort)
@@ -491,7 +513,6 @@ SECTIONS
     *libzephyr.a:secure_boot_secure_features.*(.literal .text .literal.* .text.*)
     *libzephyr.a:secure_boot_signatures_bootloader.*(.literal .text .literal.* .text.*)
 
-    *libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_efuse_table.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_efuse_fields.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_efuse_api.*(.literal .text .literal.* .text.*)
@@ -593,6 +614,7 @@ SECTIONS
     *libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.rodata .rodata.*)
     *libzephyr.a:mmu_hal.*(.rodata .rodata.*)
     *libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)
@@ -630,6 +652,7 @@ SECTIONS
     *libzephyr.a:spi_flash_wrap.*(.rodata .rodata.*)
     *libzephyr.a:spi_flash_hpm_enable.*(.rodata .rodata.*)
     *libzephyr.a:flash_ops.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
+    *libzephyr.a:flash_qio_mode.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
 
     /* [mapping:esp_mm] */
     *libzephyr.a:esp_cache.*(.rodata .rodata.*)
@@ -700,7 +723,6 @@ SECTIONS
     *libzephyr.a:esp_clk.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
     *libzephyr.a:rtc_clk_init.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
     *libzephyr.a:rtc_time.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
-    *libzephyr.a:efuse_hal.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
     *libzephyr.a:cpu_region_protect.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
 
     *libzephyr.a:periph_ctrl.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
@@ -788,7 +810,7 @@ SECTIONS
 #endif /* CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM */
     __dram_noinit_end = ABSOLUTE(.);
     . = ALIGN (4);
-  } GROUP_LINK_IN(RAMABLE_REGION)
+  } GROUP_LINK_IN(RAMABLE_REGION_2)
 
   /* Provide total SRAM usage, including IRAM and DRAM */
   _image_ram_start = _dram_data_start;
@@ -801,6 +823,7 @@ SECTIONS
 
   /* --- SPIRAM BEGIN --- */
 
+  /* The SPIRAM section needs to be spilled before the dram0.noinit */
 #ifdef CONFIG_ESP_SPIRAM
   .ext_ram (NOLOAD):
   {
@@ -813,25 +836,21 @@ SECTIONS
     *libsubsys__net__lib__config.a:(.noinit .noinit.*)
     *libsubsys__net__ip.a:(.noinit .noinit.*)
     *libsubsys__net.a:(.noinit .noinit.*)
-#endif /* CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM */
+#endif
     . = ALIGN(16);
-
     *(.ext_ram_noinit*)
-    *(.ext_ram_noinit.*)
-
     . = ALIGN(16);
     _ext_ram_noinit_end = ABSOLUTE(.);
 
     _ext_ram_bss_start = ABSOLUTE(.);
-
     *(.ext_ram.bss*)
-
     . = ALIGN(16);
     _ext_ram_bss_end = ABSOLUTE(.);
 
-    _spiram_heap_start = ABSOLUTE(.);
+    _ext_ram_heap_start = ABSOLUTE(.);
     . = . + CONFIG_ESP_SPIRAM_HEAP_SIZE;
-    . = ALIGN(4);
+    . = ALIGN(16);
+    _ext_ram_heap_end = ABSOLUTE(.);
 
     _ext_ram_end = ABSOLUTE(.);
   } GROUP_LINK_IN(ext_ram_seg)
diff --git a/soc/espressif/esp32/esp32-mp.c b/soc/espressif/esp32/esp32-mp.c
index 8733e33340c9b..55bc5fd028e4f 100644
--- a/soc/espressif/esp32/esp32-mp.c
+++ b/soc/espressif/esp32/esp32-mp.c
@@ -453,4 +453,10 @@ int esp_appcpu_init(void)
 
 	return 0;
 }
+
+#if !defined(CONFIG_MCUBOOT)
+extern int esp_appcpu_init(void);
+SYS_INIT(esp_appcpu_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+#endif
+
 #endif /* CONFIG_SOC_ENABLE_APPCPU */
diff --git a/soc/espressif/esp32/hw_init.c b/soc/espressif/esp32/hw_init.c
index db28e5e76cb5f..0282f1706421d 100644
--- a/soc/espressif/esp32/hw_init.c
+++ b/soc/espressif/esp32/hw_init.c
@@ -57,14 +57,8 @@ int hardware_init(void)
 	print_banner();
 #endif /* CONFIG_ESP_CONSOLE */
 
-	spi_flash_init_chip_state();
-	err = esp_flash_init_default_chip();
-	if (err != 0) {
-		ESP_EARLY_LOGE(TAG, "Failed to init flash chip, error %d", err);
-		return err;
-	}
-
 	reset_mmu();
+
 	flash_update_id();
 
 	err = bootloader_flash_xmc_startup();
@@ -90,6 +84,7 @@ int hardware_init(void)
 
 	check_wdt_reset();
 	config_wdt();
+
 	soc_random_enable();
 
 	return 0;
diff --git a/soc/espressif/esp32/mcuboot.ld b/soc/espressif/esp32/mcuboot.ld
index b880e2c7b34ea..6b321111a0e06 100644
--- a/soc/espressif/esp32/mcuboot.ld
+++ b/soc/espressif/esp32/mcuboot.ld
@@ -44,28 +44,17 @@ SECTIONS
     *(.stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
 
     *libarch__xtensa__core.a:xtensa_asm2_util.*(.literal .text .literal.* .text.*)
-    *liblib__libc__common.a:abort.*(.literal .text .literal.* .text.*)
-    *libdrivers__timer.a:xtensa_sys_timer.*(.literal .text .literal.* .text.*)
     *libarch__common.a:dynamic_isr.*(.literal .text .literal.* .text.*)
     *libarch__common.a:sw_isr_common.*(.literal .text .literal.* .text.*)
 
     *libapp.a:flash_map_extended.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:printk.*(.literal.printk .literal.vprintk .literal.char_out .text.printk .text.vprintk .text.char_out)
     *libzephyr.a:cbprintf_nano.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cpu.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
-
-    *libzephyr.a:heap.*(.literal .text .literal.* .text.*)
-
-    *libkernel.a:kheap.*(.literal .text .literal.* .text.*)
-    *libkernel.a:mempool.*(.literal .text .literal.* .text.*)
     *libkernel.a:device.*(.literal .text .literal.* .text.*)
-    *libkernel.a:timeout.*(.literal .text .literal.* .text.*)
-
     *libzephyr.a:esp_loader.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
 
     *(.literal.esp_intr_disable .literal.esp_intr_disable.* .text.esp_intr_disable .text.esp_intr_disable.*)
     *(.literal.default_intr_handler .text.default_intr_handler .iram1.*.default_intr_handler)
diff --git a/soc/espressif/esp32/memory.h b/soc/espressif/esp32/memory.h
index 67da219f2d11b..f03dc9d804f98 100644
--- a/soc/espressif/esp32/memory.h
+++ b/soc/espressif/esp32/memory.h
@@ -16,7 +16,7 @@
 #define SRAM1_DRAM_END        (SRAM1_DRAM_START + SRAM1_SIZE)
 #define SRAM1_RESERVED_SIZE   0x8000
 #define SRAM1_DRAM_USER_START (SRAM1_DRAM_START + SRAM1_RESERVED_SIZE)
-#define SRAM1_USER_SIZE       (0x40000000 - SRAM1_DRAM_USER_START)
+#define SRAM1_DRAM_USER_SIZE  (0x40000000 - SRAM1_DRAM_USER_START)
 
 /* SRAM2 (200kB) data memory */
 #define SRAM2_DRAM_START      DT_REG_ADDR(DT_NODELABEL(sram2))
@@ -87,16 +87,19 @@
 
 #define APPCPU_SRAM_SIZE (APPCPU_IRAM_SIZE + APPCPU_DRAM_SIZE)
 
+/* Cached memories */
+#define ICACHE0_START DT_REG_ADDR(DT_NODELABEL(icache0))
+#define ICACHE0_SIZE  DT_REG_SIZE(DT_NODELABEL(icache0))
+#define DCACHE0_START DT_REG_ADDR(DT_NODELABEL(dcache0))
+#define DCACHE0_SIZE  DT_REG_SIZE(DT_NODELABEL(dcache0))
+#define DCACHE1_START DT_REG_ADDR(DT_NODELABEL(dcache1))
+#define DCACHE1_SIZE  DT_REG_SIZE(DT_NODELABEL(dcache1))
+
+#define CACHE_ALIGN        CONFIG_MMU_PAGE_SIZE
+
 /* Flash */
 #ifdef CONFIG_FLASH_SIZE
 #define FLASH_SIZE          CONFIG_FLASH_SIZE
 #else
 #define FLASH_SIZE          0x400000
 #endif
-
-/* Cached memories */
-#define CACHE_ALIGN        CONFIG_MMU_PAGE_SIZE
-#define IROM_SEG_ORG       0x400d0000
-#define IROM_SEG_LEN       (FLASH_SIZE - 0x1000)
-#define DROM_SEG_ORG       0x3f400000
-#define DROM_SEG_LEN       (FLASH_SIZE - 0x1000)
diff --git a/soc/espressif/esp32/soc.c b/soc/espressif/esp32/soc.c
index ec1fc8c8babeb..69c359a92f927 100644
--- a/soc/espressif/esp32/soc.c
+++ b/soc/espressif/esp32/soc.c
@@ -1,109 +1,34 @@
 /*
  * Copyright (c) 2017 Intel Corporation
+ * Copyright (c) 2025 Espressif Systems (Shanghai) CO LTD.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Include esp-idf headers first to avoid redefining BIT() macro */
 #include <soc.h>
-#include <soc/rtc_cntl_reg.h>
-#include <soc/timer_group_reg.h>
-#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#include <xtensa/config/core-isa.h>
-#include <xtensa/corebits.h>
-#include <esp_private/spi_flash_os.h>
-#include <esp_private/esp_mmu_map_private.h>
-#include <esp_flash_internal.h>
-#if CONFIG_ESP_SPIRAM
-#include "psram.h"
-#endif
-
-#include <zephyr/kernel_structs.h>
-#include <string.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/types.h>
-#include <zephyr/linker/linker-defs.h>
-#include <kernel_internal.h>
-
+#include <soc_init.h>
+#include <flash_init.h>
+#include <esp_private/cache_utils.h>
 #include <esp_private/system_internal.h>
-#include <esp32/rom/cache.h>
-#include <esp_cpu.h>
-#include <hal/soc_hal.h>
-#include <hal/cpu_hal.h>
-#include <soc/gpio_periph.h>
-#include <esp_err.h>
 #include <esp_timer.h>
-#include <hal/wdt_hal.h>
-#include <esp_app_format.h>
-
-#ifndef CONFIG_SOC_ENABLE_APPCPU
-#include "esp_clk_internal.h"
-#endif /* CONFIG_SOC_ENABLE_APPCPU */
-
+#include <psram.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/sys/printk.h>
-#include "esp_log.h"
-
-#define TAG "boot.esp32"
 
 extern void z_prep_c(void);
 extern void esp_reset_reason_init(void);
-extern int esp_appcpu_init(void);
 
-/*
- * This is written in C rather than assembly since, during the port bring up,
- * Zephyr is being booted by the Espressif bootloader.  With it, the C stack
- * is already set up.
- */
-void IRAM_ATTR __esp_platform_start(void)
+void IRAM_ATTR __esp_platform_app_start(void)
 {
-	extern uint32_t _init_start;
-
-	/* Move the exception vector table to IRAM. */
-	__asm__ __volatile__ ("wsr %0, vecbase" : : "r"(&_init_start));
-
-	z_bss_zero();
-
-	__asm__ __volatile__ ("" : : "g"(&__bss_start) : "memory");
-
-	/* Disable normal interrupts. */
-	__asm__ __volatile__ ("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
-
-	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid _current before
-	 * z_prep_c() is invoked.
-	 */
-	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));
-
 	esp_reset_reason_init();
 
-#ifndef CONFIG_MCUBOOT
-	/* ESP-IDF/MCUboot 2nd stage bootloader enables RTC WDT to check
-	 * on startup sequence related issues in application. Hence disable that
-	 * as we are about to start Zephyr environment.
-	 */
-	wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL};
-
-	wdt_hal_write_protect_disable(&rtc_wdt_ctx);
-	wdt_hal_disable(&rtc_wdt_ctx);
-	wdt_hal_write_protect_enable(&rtc_wdt_ctx);
-
 	esp_timer_early_init();
 
-	esp_mspi_pin_init();
-
-	esp_flash_app_init();
-
-	esp_mmu_map_init();
+	esp_flash_config();
 
 #if CONFIG_ESP_SPIRAM
 	esp_init_psram();
-#endif /* CONFIG_ESP_SPIRAM */
 
-#endif /* !CONFIG_MCUBOOT */
-
-	esp_intr_initialize();
-
-#if CONFIG_ESP_SPIRAM
 	/* Init Shared Multi Heap for PSRAM */
 	int err = esp_psram_smh_init();
 
@@ -118,6 +43,14 @@ void IRAM_ATTR __esp_platform_start(void)
 	CODE_UNREACHABLE;
 }
 
+void IRAM_ATTR __esp_platform_mcuboot_start(void)
+{
+	/* Start Zephyr */
+	z_prep_c();
+
+	CODE_UNREACHABLE;
+}
+
 /* Boot-time static default printk handler, possibly to be overridden later. */
 int IRAM_ATTR arch_printk_char_out(int c)
 {
@@ -130,10 +63,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
-
-#if defined(CONFIG_SOC_ENABLE_APPCPU) && !defined(CONFIG_MCUBOOT)
-extern int esp_appcpu_init(void);
-SYS_INIT(esp_appcpu_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
-#endif
diff --git a/soc/espressif/esp32/soc.h b/soc/espressif/esp32/soc.h
index e2ea8cc50b7e6..6958a25fbd0d3 100644
--- a/soc/espressif/esp32/soc.h
+++ b/soc/espressif/esp32/soc.h
@@ -20,7 +20,8 @@
 #include <xtensa/core-macros.h>
 #include <esp_private/esp_clk.h>
 
-void __esp_platform_start(void);
+void __esp_platform_mcuboot_start(void);
+void __esp_platform_app_start(void);
 
 static inline void esp32_set_mask32(uint32_t v, uint32_t mem_addr)
 {
diff --git a/soc/espressif/esp32/soc_appcpu.c b/soc/espressif/esp32/soc_appcpu.c
index 82c8ef1ad6571..32305009336fd 100644
--- a/soc/espressif/esp32/soc_appcpu.c
+++ b/soc/espressif/esp32/soc_appcpu.c
@@ -87,8 +87,6 @@ void IRAM_ATTR __appcpu_start(void)
 
 	core_intr_matrix_clear();
 
-	esp_intr_initialize();
-
 	/* Start Zephyr */
 	z_prep_c();
 
@@ -104,5 +102,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
diff --git a/soc/espressif/esp32c2/CMakeLists.txt b/soc/espressif/esp32c2/CMakeLists.txt
index 2d70c8cd7de6f..0248ccef51e47 100644
--- a/soc/espressif/esp32c2/CMakeLists.txt
+++ b/soc/espressif/esp32c2/CMakeLists.txt
@@ -3,7 +3,6 @@
 zephyr_sources(
   vectors.S
   soc_irq.S
-  soc_irq.c
   soc.c
   ../common/loader.c
   )
@@ -11,71 +10,3 @@ zephyr_sources(
 zephyr_include_directories(.)
 
 zephyr_sources_ifndef(CONFIG_BOOTLOADER_MCUBOOT hw_init.c)
-
-# get flash size to use in esptool as string
-math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")
-
-if(NOT CONFIG_BOOTLOADER_MCUBOOT)
-
-  if(CONFIG_BUILD_OUTPUT_BIN)
-    # make ESP ROM loader compatible image
-    message("ESP-IDF path: ${ESP_IDF_PATH}")
-
-    set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py)
-    message("esptool path: ${ESPTOOL_PY}")
-
-    set(ELF2IMAGE_ARG "")
-    if(NOT CONFIG_MCUBOOT)
-      set(ELF2IMAGE_ARG "--ram-only-header")
-    endif()
-
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY}
-      ARGS --chip esp32c2 elf2image ${ELF2IMAGE_ARG}
-      --flash_mode dio --flash_freq 60m --flash_size ${esptoolpy_flashsize}MB
-      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
-      ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
-  endif()
-
-endif()
-
-# get code-partition slot0 address
-dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
-dt_reg_addr(img_0_off PATH ${dts_partition_path})
-
-# get code-partition boot address
-dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-dt_reg_addr(boot_off PATH ${dts_partition_path})
-
-# get UART baudrate from DT
-dt_chosen(dts_shell_uart PROPERTY "zephyr,shell-uart")
-dt_prop(monitor_baud PATH ${dts_shell_uart} PROPERTY "current-speed")
-
-# C2 uses specific values for flash frequency and UART baudrate
-board_runner_args(esp32 "--esp-flash-freq=60m")
-board_runner_args(esp32 "--esp-monitor-baud=${monitor_baud}")
-
-if(CONFIG_BOOTLOADER_MCUBOOT)
-  board_finalize_runner_args(esp32 "--esp-app-address=${img_0_off}")
-else()
-  board_finalize_runner_args(esp32 "--esp-app-address=${boot_off}")
-endif()
-
-if(CONFIG_MCUBOOT)
-    # search from cross references between bootloader sections
-    message("check_callgraph using: ${ESP_IDF_PATH}/tools/ci/check_callgraph.py")
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND
-        ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/ci/check_callgraph.py
-      ARGS
-        --rtl-dirs ${CMAKE_BINARY_DIR}/zephyr
-	--elf-file ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf
-        find-refs --from-section=.iram0.iram_loader --to-section=.iram0.text
-        --exit-code)
-endif()
-
-if(CONFIG_MCUBOOT)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/mcuboot.ld CACHE INTERNAL "")
-else()
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default.ld CACHE INTERNAL "")
-endif()
diff --git a/soc/espressif/esp32c2/Kconfig.defconfig b/soc/espressif/esp32c2/Kconfig.defconfig
index 21877a186a996..59ec24263c5b7 100644
--- a/soc/espressif/esp32c2/Kconfig.defconfig
+++ b/soc/espressif/esp32c2/Kconfig.defconfig
@@ -1,12 +1,10 @@
-# ESP32C2 SoC configuration
-
-# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_ESP32C2
 
 config NUM_IRQS
-	default 43
+	default 32
 
 config FLASH_SIZE
 	default $(dt_node_reg_size_int,/soc/flash-controller@60002000/flash@0,0)
diff --git a/soc/espressif/esp32c2/default.ld b/soc/espressif/esp32c2/default.ld
index bd72f1ea805d2..53d7a72bac81f 100644
--- a/soc/espressif/esp32c2/default.ld
+++ b/soc/espressif/esp32c2/default.ld
@@ -212,6 +212,7 @@ SECTIONS
     *libzephyr.a:console_init.*(.literal .text .literal.* .text.*)
     *libzephyr.a:soc_init.*(.literal .text .literal.* .text.*)
     *libzephyr.a:hw_init.*(.literal .text .literal.* .text.*)
+    *libzephyr.a:soc_random.*(.literal .text .literal.* .text.*)
     *libarch__riscv__core.a:(.literal .text .literal.* .text.*)
     *libsubsys__net__l2__ethernet.a:(.literal .text .literal.* .text.*)
     *libsubsys__net__lib__config.a:(.literal .text .literal.* .text.*)
@@ -235,11 +236,13 @@ SECTIONS
     *liblib__libc__minimal.a:string.*(.literal .text .literal.* .text.*)
     *liblib__libc__picolib.a:string.*(.literal .text .literal.* .text.*)
     *libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
+    *libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *libgcov.a:(.literal .text .literal.* .text.*)
     *libphy.a:( .phyiram .phyiram.*)
     *libc.a:*(.literal .text .literal.* .text.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -357,7 +360,6 @@ SECTIONS
 
     *libzephyr.a:esp_image_format.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_ops.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:flash_ops_esp32c2.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_encrypt.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_encryption_secure_features.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_partitions.*(.literal .text .literal.* .text.*)
@@ -463,9 +465,11 @@ SECTIONS
     *libzephyr.a:console_init.*(.rodata .rodata.*)
     *libzephyr.a:soc_init.*(.rodata .rodata.*)
     *libzephyr.a:hw_init.*(.rodata .rodata.*)
+    *libzephyr.a:soc_random.*(.rodata .rodata.*)
     *libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
diff --git a/soc/espressif/esp32c2/hw_init.c b/soc/espressif/esp32c2/hw_init.c
index 25c4a3b3f99ec..7ca871282daad 100644
--- a/soc/espressif/esp32c2/hw_init.c
+++ b/soc/espressif/esp32c2/hw_init.c
@@ -36,18 +36,6 @@ int hardware_init(void)
 #ifdef CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE
 	esp_cpu_configure_region_protection();
 #endif
-#if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
-	rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
-
-	if (cfg.enable == 1 && cfg.tieh == RTC_VDDSDIO_TIEH_1_8V) {
-		cfg.drefh = 3;
-		cfg.drefm = 3;
-		cfg.drefl = 3;
-		cfg.force = 1;
-		rtc_vddsdio_set_config(cfg);
-		esp_rom_delay_us(10);
-	}
-#endif /* CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V */
 
 	bootloader_clock_configure();
 
@@ -57,15 +45,9 @@ int hardware_init(void)
 	print_banner();
 #endif /* CONFIG_ESP_CONSOLE */
 
-	spi_flash_init_chip_state();
-	err = esp_flash_init_default_chip();
-	if (err != 0) {
-		ESP_EARLY_LOGE(TAG, "Failed to init flash chip, error %d", err);
-		return err;
-	}
-
 	cache_hal_init();
 	mmu_hal_init();
+
 	flash_update_id();
 
 	err = bootloader_flash_xmc_startup();
@@ -92,5 +74,7 @@ int hardware_init(void)
 	check_wdt_reset();
 	config_wdt();
 
+	soc_random_enable();
+
 	return 0;
 }
diff --git a/soc/espressif/esp32c2/mcuboot.ld b/soc/espressif/esp32c2/mcuboot.ld
index 54aff6076c4b2..595fce23789e6 100644
--- a/soc/espressif/esp32c2/mcuboot.ld
+++ b/soc/espressif/esp32c2/mcuboot.ld
@@ -44,22 +44,14 @@ SECTIONS
     _loader_text_start = ABSOLUTE(.);
     *(.stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
 
-    /* TODO: cross-segments calls in the libzephyr.a:device.* */
-
     *libapp.a:flash_map_extended.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cbprintf_nano.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cpu.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
-
-    *libzephyr.a:heap.*(.literal .text .literal.* .text.*)
-
-    *libkernel.a:kheap.*(.literal .text .literal.* .text.*)
-    *libkernel.a:mempool.*(.literal .text .literal.* .text.*)
-
+    *libkernel.a:device.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_loader.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
 
     *(.literal.esp_intr_disable .literal.esp_intr_disable.* .text.esp_intr_disable .text.esp_intr_disable.*)
     *(.literal.default_intr_handler .text.default_intr_handler .iram1.*.default_intr_handler)
diff --git a/soc/espressif/esp32c2/soc.c b/soc/espressif/esp32c2/soc.c
index 9ed4bbcb4370f..5d0df3e0360ab 100644
--- a/soc/espressif/esp32c2/soc.c
+++ b/soc/espressif/esp32c2/soc.c
@@ -1,85 +1,37 @@
 /*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Include esp-idf headers first to avoid redefining BIT() macro */
-#include <soc/rtc_cntl_reg.h>
-#include <soc/timer_group_reg.h>
-#include <soc/ext_mem_defs.h>
-#include <soc/gpio_reg.h>
-#include <soc/syscon_reg.h>
-#include <soc/system_reg.h>
-#include "hal/wdt_hal.h"
-#include "esp_cpu.h"
-#include "hal/soc_hal.h"
-#include "hal/cpu_hal.h"
-#include "esp_timer.h"
-#include "esp_private/system_internal.h"
-#include "esp_clk_internal.h"
-#include <soc/interrupt_reg.h>
-#include <esp_private/spi_flash_os.h>
-#include "esp_private/esp_mmu_map_private.h"
-#include <esp_flash_internal.h>
-
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-
+#include <soc.h>
+#include <soc_init.h>
+#include <flash_init.h>
+#include <esp_private/cache_utils.h>
+#include <esp_private/system_internal.h>
+#include <esp_timer.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <string.h>
-#include <zephyr/toolchain.h>
-#include <soc.h>
 
 extern void esp_reset_reason_init(void);
 
-/*
- * This is written in C rather than assembly since, during the port bring up,
- * Zephyr is being booted by the Espressif bootloader.  With it, the C stack
- * is already set up.
- */
-void __attribute__((section(".iram1"))) __esp_platform_start(void)
+void IRAM_ATTR __esp_platform_app_start(void)
 {
-	__asm__ __volatile__("la t0, _esp32c2_vector_table\n"
-						"csrw mtvec, t0\n");
-
-	z_bss_zero();
-
-	/* Disable normal interrupts. */
-	csr_read_clear(mstatus, MSTATUS_MIE);
-
 	esp_reset_reason_init();
 
-#ifndef CONFIG_MCUBOOT
-	/* ESP-IDF 2nd stage bootloader enables RTC WDT to check on startup sequence
-	 * related issues in application. Hence disable that as we are about to start
-	 * Zephyr environment.
-	 */
-	wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL};
-
-	wdt_hal_write_protect_disable(&rtc_wdt_ctx);
-	wdt_hal_disable(&rtc_wdt_ctx);
-	wdt_hal_write_protect_enable(&rtc_wdt_ctx);
-
-	/* Enable wireless phy subsystem clock,
-	 * This needs to be done before the kernel starts
-	 */
-	REG_CLR_BIT(SYSTEM_WIFI_CLK_EN_REG, SYSTEM_WIFI_CLK_SDIOSLAVE_EN);
-	SET_PERI_REG_MASK(SYSTEM_WIFI_CLK_EN_REG, SYSTEM_WIFI_CLK_EN);
-
 	esp_timer_early_init();
 
-	esp_mspi_pin_init();
-
-	esp_flash_app_init();
+	esp_flash_config();
 
-	esp_mmu_map_init();
-
-#endif /* !CONFIG_MCUBOOT */
+	/* Start Zephyr */
+	z_cstart();
 
-	/*Initialize the esp32c2 interrupt controller */
-	esp_intr_initialize();
+	CODE_UNREACHABLE;
+}
 
+void IRAM_ATTR __esp_platform_mcuboot_start(void)
+{
 	/* Start Zephyr */
 	z_cstart();
 
@@ -98,5 +50,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
diff --git a/soc/espressif/esp32c2/soc.h b/soc/espressif/esp32c2/soc.h
index da96d9faf83ac..66a098444b2da 100644
--- a/soc/espressif/esp32c2/soc.h
+++ b/soc/espressif/esp32c2/soc.h
@@ -18,7 +18,8 @@
 
 #ifndef _ASMLANGUAGE
 
-void __esp_platform_start(void);
+void __esp_platform_mcuboot_start(void);
+void __esp_platform_app_start(void);
 
 static inline uint32_t esp_core_id(void)
 {
diff --git a/soc/espressif/esp32c2/soc_irq.S b/soc/espressif/esp32c2/soc_irq.S
index b970b84ffa378..7e41a1f961ecf 100644
--- a/soc/espressif/esp32c2/soc_irq.S
+++ b/soc/espressif/esp32c2/soc_irq.S
@@ -1,4 +1,4 @@
-/* Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+/* Copyright 2021-2025 Espressif Systems (Shanghai) PTE LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,13 +8,8 @@
 
 /* Exports */
 GTEXT(__soc_handle_irq)
-GTEXT(soc_intr_get_next_source)
 
 SECTION_FUNC(exception.other, __soc_handle_irq)
-	addi sp, sp,-4
-	sw  ra, 0x00(sp)
-	la t1, soc_intr_get_next_source
-	jalr ra, t1, 0
-	lw  ra, 0x00(sp)
-	addi sp, sp, 4
+
+	/* int status clearing is done at ISR */
 	ret
diff --git a/soc/espressif/esp32c2/soc_irq.c b/soc/espressif/esp32c2/soc_irq.c
deleted file mode 100644
index 713dfc936ebdd..0000000000000
--- a/soc/espressif/esp32c2/soc_irq.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <soc/rtc_cntl_reg.h>
-#include <soc/timer_group_reg.h>
-#include <soc/ext_mem_defs.h>
-#include <soc/gpio_reg.h>
-#include <soc/syscon_reg.h>
-#include <soc/system_reg.h>
-#include <riscv/interrupt.h>
-#include <soc/interrupt_reg.h>
-#include <soc/periph_defs.h>
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-
-#include <zephyr/kernel_structs.h>
-#include <string.h>
-#include <zephyr/toolchain.h>
-#include <soc.h>
-#include <zephyr/arch/riscv/arch.h>
-
-#define ESP32C2_INTSTATUS_SLOT1_THRESHOLD	32
-
-void arch_irq_enable(unsigned int irq)
-{
-	esp_intr_enable(irq);
-}
-
-void arch_irq_disable(unsigned int irq)
-{
-	esp_intr_disable(irq);
-}
-
-int arch_irq_is_enabled(unsigned int irq)
-{
-	bool res = false;
-	uint32_t key = irq_lock();
-
-	if (irq < 32) {
-		res = esp_intr_get_enabled_intmask(0) & BIT(irq);
-	} else {
-		res = esp_intr_get_enabled_intmask(1) & BIT(irq - 32);
-	}
-
-	irq_unlock(key);
-
-	return res;
-}
-
-uint32_t soc_intr_get_next_source(void)
-{
-	uint32_t status;
-	uint32_t source;
-
-	status = REG_READ(INTERRUPT_CORE0_INTR_STATUS_REG_0_REG) &
-		esp_intr_get_enabled_intmask(0);
-
-	if (status) {
-		source = __builtin_ffs(status) - 1;
-	} else {
-		status = REG_READ(INTERRUPT_CORE0_INTR_STATUS_REG_1_REG) &
-			esp_intr_get_enabled_intmask(1);
-		source = (__builtin_ffs(status) - 1 + ESP32C2_INTSTATUS_SLOT1_THRESHOLD);
-	}
-
-	return source;
-}
diff --git a/soc/espressif/esp32c2/vectors.S b/soc/espressif/esp32c2/vectors.S
index e8f8f0213bed2..272ab653a5f61 100644
--- a/soc/espressif/esp32c2/vectors.S
+++ b/soc/espressif/esp32c2/vectors.S
@@ -1,4 +1,4 @@
-/* Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+/* Copyright 2020-2025 Espressif Systems (Shanghai) PTE LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -22,12 +22,12 @@ GTEXT(_isr_wrapper)
 	 * only uses the 24 MSBs of the MTVEC, i.e. (MTVEC & 0xffffff00).
 	 */
 
-	.global  _esp32c2_vector_table
+	.global  _vector_table
 	.section .exception_vectors.text
 	.balign   0x100
-	.type     _esp32c2_vector_table, @function
+	.type     _vector_table, @function
 
-_esp32c2_vector_table:
+_vector_table:
 	.option push
 	.option norvc
 	.rept (32)
diff --git a/soc/espressif/esp32c3/CMakeLists.txt b/soc/espressif/esp32c3/CMakeLists.txt
index bfec91fbc4c94..980863025ef72 100644
--- a/soc/espressif/esp32c3/CMakeLists.txt
+++ b/soc/espressif/esp32c3/CMakeLists.txt
@@ -3,7 +3,6 @@
 zephyr_sources(
   vectors.S
   soc_irq.S
-  soc_irq.c
   soc.c
   ../common/loader.c
   )
@@ -14,63 +13,3 @@ zephyr_sources_ifndef(CONFIG_BOOTLOADER_MCUBOOT hw_init.c)
 
 zephyr_library_sources_ifdef(CONFIG_PM power.c)
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
-
-# get flash size to use in esptool as string
-math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")
-
-if(NOT CONFIG_BOOTLOADER_MCUBOOT)
-
-  if(CONFIG_BUILD_OUTPUT_BIN)
-    # make ESP ROM loader compatible image
-    message("ESP-IDF path: ${ESP_IDF_PATH}")
-
-    set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py)
-    message("esptool path: ${ESPTOOL_PY}")
-
-    set(ELF2IMAGE_ARG "")
-    if(NOT CONFIG_MCUBOOT)
-      set(ELF2IMAGE_ARG "--ram-only-header")
-    endif()
-
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY}
-      ARGS --chip esp32c3 elf2image ${ELF2IMAGE_ARG}
-      --flash_mode dio --flash_freq 40m --flash_size ${esptoolpy_flashsize}MB
-      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
-      ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
-  endif()
-
-endif()
-
-# get code-partition slot0 address
-dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
-dt_reg_addr(img_0_off PATH ${dts_partition_path})
-
-# get code-partition boot address
-dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-dt_reg_addr(boot_off PATH ${dts_partition_path})
-
-if(CONFIG_BOOTLOADER_MCUBOOT)
-  board_finalize_runner_args(esp32 "--esp-app-address=${img_0_off}")
-else()
-  board_finalize_runner_args(esp32 "--esp-app-address=${boot_off}")
-endif()
-
-if(CONFIG_MCUBOOT)
-    # search from cross references between bootloader sections
-    message("check_callgraph using: ${ESP_IDF_PATH}/tools/ci/check_callgraph.py")
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND
-        ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/ci/check_callgraph.py
-      ARGS
-        --rtl-dirs ${CMAKE_BINARY_DIR}/zephyr
-	--elf-file ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf
-        find-refs --from-section=.iram0.iram_loader --to-section=.iram0.text
-        --exit-code)
-endif()
-
-if(CONFIG_MCUBOOT)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/mcuboot.ld CACHE INTERNAL "")
-else()
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default.ld CACHE INTERNAL "")
-endif()
diff --git a/soc/espressif/esp32c3/Kconfig.defconfig b/soc/espressif/esp32c3/Kconfig.defconfig
index 1e9f47ad6a30c..dfa777ae547d7 100644
--- a/soc/espressif/esp32c3/Kconfig.defconfig
+++ b/soc/espressif/esp32c3/Kconfig.defconfig
@@ -1,10 +1,10 @@
-# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2023-2025 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_ESP32C3
 
 config NUM_IRQS
-	default 62
+	default 32
 
 config FLASH_SIZE
 	default $(dt_node_reg_size_int,/soc/flash-controller@60002000/flash@0,0)
diff --git a/soc/espressif/esp32c3/default.ld b/soc/espressif/esp32c3/default.ld
index 4cce6c7f1ebc6..2e0e723a223c3 100644
--- a/soc/espressif/esp32c3/default.ld
+++ b/soc/espressif/esp32c3/default.ld
@@ -330,11 +330,13 @@ SECTIONS
     *liblib__libc__minimal.a:string.*(.literal .text .literal.* .text.*)
     *liblib__libc__picolib.a:string.*(.literal .text .literal.* .text.*)
     *libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
+    *libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *libgcov.a:(.literal .text .literal.* .text.*)
     *libphy.a:( .phyiram .phyiram.*)
     *libc.a:*(.literal .text .literal.* .text.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -560,6 +562,7 @@ SECTIONS
     *libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
diff --git a/soc/espressif/esp32c3/hw_init.c b/soc/espressif/esp32c3/hw_init.c
index 416996ae48787..f3ecc5f4f6ab7 100644
--- a/soc/espressif/esp32c3/hw_init.c
+++ b/soc/espressif/esp32c3/hw_init.c
@@ -38,18 +38,6 @@ int hardware_init(void)
 #ifdef CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE
 	esp_cpu_configure_region_protection();
 #endif
-#if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
-	rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
-
-	if (cfg.enable == 1 && cfg.tieh == RTC_VDDSDIO_TIEH_1_8V) {
-		cfg.drefh = 3;
-		cfg.drefm = 3;
-		cfg.drefl = 3;
-		cfg.force = 1;
-		rtc_vddsdio_set_config(cfg);
-		esp_rom_delay_us(10);
-	}
-#endif /* CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V */
 
 	bootloader_clock_configure();
 
@@ -59,16 +47,9 @@ int hardware_init(void)
 	print_banner();
 #endif /* CONFIG_ESP_CONSOLE */
 
-
-	spi_flash_init_chip_state();
-	err = esp_flash_init_default_chip();
-	if (err != 0) {
-		ESP_EARLY_LOGE(TAG, "Failed to init flash chip, error %d", err);
-		return err;
-	}
-
 	cache_hal_init();
 	mmu_hal_init();
+
 	flash_update_id();
 
 	err = bootloader_flash_xmc_startup();
diff --git a/soc/espressif/esp32c3/mcuboot.ld b/soc/espressif/esp32c3/mcuboot.ld
index cbc727faf0bef..b4dee564e91e1 100644
--- a/soc/espressif/esp32c3/mcuboot.ld
+++ b/soc/espressif/esp32c3/mcuboot.ld
@@ -44,22 +44,14 @@ SECTIONS
     _loader_text_start = ABSOLUTE(.);
     *(.stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
 
-    /* TODO: cross-segments calls in the libzephyr.a:device.* */
-
     *libapp.a:flash_map_extended.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cbprintf_nano.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cpu.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
-
-    *libzephyr.a:heap.*(.literal .text .literal.* .text.*)
-
-    *libkernel.a:kheap.*(.literal .text .literal.* .text.*)
-    *libkernel.a:mempool.*(.literal .text .literal.* .text.*)
-
+    *libkernel.a:device.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_loader.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
 
     *(.literal.esp_intr_disable .literal.esp_intr_disable.* .text.esp_intr_disable .text.esp_intr_disable.*)
     *(.literal.default_intr_handler .text.default_intr_handler .iram1.*.default_intr_handler)
diff --git a/soc/espressif/esp32c3/memory.h b/soc/espressif/esp32c3/memory.h
index 87a832169fc79..07eab679ad301 100644
--- a/soc/espressif/esp32c3/memory.h
+++ b/soc/espressif/esp32c3/memory.h
@@ -47,7 +47,7 @@
 #define BOOTLOADER_STACK_OVERHEAD      0x0
 /* These lengths can be adjusted, if necessary: */
 #define BOOTLOADER_DRAM_SEG_LEN        0x9800
-#define BOOTLOADER_IRAM_SEG_LEN        0x9800
+#define BOOTLOADER_IRAM_SEG_LEN        0x9C00
 #define BOOTLOADER_IRAM_LOADER_SEG_LEN 0x1400
 
 /* Start of the lower region is determined by region size and the end of the higher region */
diff --git a/soc/espressif/esp32c3/soc.c b/soc/espressif/esp32c3/soc.c
index aa21357e72876..485891e2c6caf 100644
--- a/soc/espressif/esp32c3/soc.c
+++ b/soc/espressif/esp32c3/soc.c
@@ -1,85 +1,38 @@
 /*
  * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2025 Espressif Systems (Shanghai) CO LTD.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Include esp-idf headers first to avoid redefining BIT() macro */
-#include <soc/rtc_cntl_reg.h>
-#include <soc/timer_group_reg.h>
-#include <soc/ext_mem_defs.h>
-#include <soc/gpio_reg.h>
-#include <soc/syscon_reg.h>
-#include <soc/system_reg.h>
-#include "hal/wdt_hal.h"
-#include "esp_cpu.h"
-#include "hal/soc_hal.h"
-#include "hal/cpu_hal.h"
-#include "esp_timer.h"
-#include "esp_private/system_internal.h"
-#include "esp_clk_internal.h"
-#include <soc/interrupt_reg.h>
-#include <esp_private/spi_flash_os.h>
-#include "esp_private/esp_mmu_map_private.h"
-#include <esp_flash_internal.h>
-
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-
+#include <soc.h>
+#include <soc_init.h>
+#include <flash_init.h>
+#include <esp_private/cache_utils.h>
+#include <esp_private/system_internal.h>
+#include <esp_timer.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <string.h>
-#include <zephyr/toolchain.h>
-#include <soc.h>
 
 extern void esp_reset_reason_init(void);
 
-/*
- * This is written in C rather than assembly since, during the port bring up,
- * Zephyr is being booted by the Espressif bootloader.  With it, the C stack
- * is already set up.
- */
-void __attribute__((section(".iram1"))) __esp_platform_start(void)
+void IRAM_ATTR __esp_platform_app_start(void)
 {
-	__asm__ __volatile__("la t0, _esp32c3_vector_table\n"
-						"csrw mtvec, t0\n");
-
-	z_bss_zero();
-
-	/* Disable normal interrupts. */
-	csr_read_clear(mstatus, MSTATUS_MIE);
-
 	esp_reset_reason_init();
 
-#ifndef CONFIG_MCUBOOT
-	/* ESP-IDF 2nd stage bootloader enables RTC WDT to check on startup sequence
-	 * related issues in application. Hence disable that as we are about to start
-	 * Zephyr environment.
-	 */
-	wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL};
-
-	wdt_hal_write_protect_disable(&rtc_wdt_ctx);
-	wdt_hal_disable(&rtc_wdt_ctx);
-	wdt_hal_write_protect_enable(&rtc_wdt_ctx);
-
-	/* Enable wireless phy subsystem clock,
-	 * This needs to be done before the kernel starts
-	 */
-	REG_CLR_BIT(SYSTEM_WIFI_CLK_EN_REG, SYSTEM_WIFI_CLK_SDIOSLAVE_EN);
-	SET_PERI_REG_MASK(SYSTEM_WIFI_CLK_EN_REG, SYSTEM_WIFI_CLK_EN);
-
 	esp_timer_early_init();
 
-	esp_mspi_pin_init();
-
-	esp_flash_app_init();
+	esp_flash_config();
 
-	esp_mmu_map_init();
-
-#endif /* !CONFIG_MCUBOOT */
+	/* Start Zephyr */
+	z_cstart();
 
-	/*Initialize the esp32c3 interrupt controller */
-	esp_intr_initialize();
+	CODE_UNREACHABLE;
+}
 
+void IRAM_ATTR __esp_platform_mcuboot_start(void)
+{
 	/* Start Zephyr */
 	z_cstart();
 
@@ -98,5 +51,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
diff --git a/soc/espressif/esp32c3/soc.h b/soc/espressif/esp32c3/soc.h
index 73e2fbfee1ead..192d0aaf6fc97 100644
--- a/soc/espressif/esp32c3/soc.h
+++ b/soc/espressif/esp32c3/soc.h
@@ -18,7 +18,8 @@
 
 #ifndef _ASMLANGUAGE
 
-void __esp_platform_start(void);
+void __esp_platform_mcuboot_start(void);
+void __esp_platform_app_start(void);
 
 static inline uint32_t esp_core_id(void)
 {
diff --git a/soc/espressif/esp32c3/soc_irq.S b/soc/espressif/esp32c3/soc_irq.S
index 0a9e917f5087c..7e41a1f961ecf 100644
--- a/soc/espressif/esp32c3/soc_irq.S
+++ b/soc/espressif/esp32c3/soc_irq.S
@@ -1,4 +1,4 @@
-/* Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/* Copyright 2021-2025 Espressif Systems (Shanghai) PTE LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,13 +8,8 @@
 
 /* Exports */
 GTEXT(__soc_handle_irq)
-GTEXT(soc_intr_get_next_source)
 
 SECTION_FUNC(exception.other, __soc_handle_irq)
-	addi sp, sp,-4
-	sw  ra, 0x00(sp)
-	la t1, soc_intr_get_next_source
-	jalr ra, t1, 0
-	lw  ra, 0x00(sp)
-	addi sp, sp, 4
+
+	/* int status clearing is done at ISR */
 	ret
diff --git a/soc/espressif/esp32c3/soc_irq.c b/soc/espressif/esp32c3/soc_irq.c
deleted file mode 100644
index 6511901a0d4db..0000000000000
--- a/soc/espressif/esp32c3/soc_irq.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <soc/rtc_cntl_reg.h>
-#include <soc/timer_group_reg.h>
-#include <soc/ext_mem_defs.h>
-#include <soc/gpio_reg.h>
-#include <soc/syscon_reg.h>
-#include <soc/system_reg.h>
-#include <riscv/interrupt.h>
-#include <soc/interrupt_reg.h>
-#include <soc/periph_defs.h>
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-
-#include <zephyr/kernel_structs.h>
-#include <string.h>
-#include <zephyr/toolchain.h>
-#include <soc.h>
-#include <zephyr/arch/riscv/arch.h>
-
-#define ESP32C3_INTSTATUS_SLOT1_THRESHOLD	32
-
-void arch_irq_enable(unsigned int irq)
-{
-	esp_intr_enable(irq);
-}
-
-void arch_irq_disable(unsigned int irq)
-{
-	esp_intr_disable(irq);
-}
-
-int arch_irq_is_enabled(unsigned int irq)
-{
-	bool res = false;
-	uint32_t key = irq_lock();
-
-	if (irq < 32) {
-		res = esp_intr_get_enabled_intmask(0) & BIT(irq);
-	} else {
-		res = esp_intr_get_enabled_intmask(1) & BIT(irq - 32);
-	}
-
-	irq_unlock(key);
-
-	return res;
-}
-
-uint32_t soc_intr_get_next_source(void)
-{
-	uint32_t status;
-	uint32_t source;
-
-	status = REG_READ(INTERRUPT_CORE0_INTR_STATUS_0_REG) &
-		esp_intr_get_enabled_intmask(0);
-
-	if (status) {
-		source = __builtin_ffs(status) - 1;
-	} else {
-		status = REG_READ(INTERRUPT_CORE0_INTR_STATUS_1_REG) &
-			esp_intr_get_enabled_intmask(1);
-		source = (__builtin_ffs(status) - 1 + ESP32C3_INTSTATUS_SLOT1_THRESHOLD);
-	}
-
-	return source;
-}
diff --git a/soc/espressif/esp32c3/vectors.S b/soc/espressif/esp32c3/vectors.S
index 570740469eb11..272ab653a5f61 100644
--- a/soc/espressif/esp32c3/vectors.S
+++ b/soc/espressif/esp32c3/vectors.S
@@ -1,4 +1,4 @@
-/* Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+/* Copyright 2020-2025 Espressif Systems (Shanghai) PTE LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -22,12 +22,12 @@ GTEXT(_isr_wrapper)
 	 * only uses the 24 MSBs of the MTVEC, i.e. (MTVEC & 0xffffff00).
 	 */
 
-  .global  _esp32c3_vector_table
- 	.section .exception_vectors.text
-  .balign   0x100
-	.type     _esp32c3_vector_table, @function
+	.global  _vector_table
+	.section .exception_vectors.text
+	.balign   0x100
+	.type     _vector_table, @function
 
-_esp32c3_vector_table:
+_vector_table:
 	.option push
 	.option norvc
 	.rept (32)
diff --git a/soc/espressif/esp32c6/CMakeLists.txt b/soc/espressif/esp32c6/CMakeLists.txt
index 6bd5b99e6ff53..9101292b406a3 100644
--- a/soc/espressif/esp32c6/CMakeLists.txt
+++ b/soc/espressif/esp32c6/CMakeLists.txt
@@ -1,76 +1,24 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_sources(
+zephyr_sources_ifdef(CONFIG_SOC_ESP32C6_HPCORE
   vectors.S
   soc_irq.S
-  soc_irq.c
   soc.c
   ../common/loader.c
   )
 
-zephyr_include_directories(.)
-
-zephyr_sources_ifndef(CONFIG_BOOTLOADER_MCUBOOT hw_init.c)
-
-zephyr_library_sources_ifdef(CONFIG_PM power.c)
-zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
-
-# get flash size to use in esptool as string
-math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")
-
-if(NOT CONFIG_BOOTLOADER_MCUBOOT)
-
-  if(CONFIG_BUILD_OUTPUT_BIN)
-    # make ESP ROM loader compatible image
-    message("ESP-IDF path: ${ESP_IDF_PATH}")
-
-    set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py)
-    message("esptool path: ${ESPTOOL_PY}")
-
-    set(ELF2IMAGE_ARG "")
-    if(NOT CONFIG_MCUBOOT)
-      set(ELF2IMAGE_ARG "--ram-only-header")
-    endif()
-
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY}
-      ARGS --chip esp32c6 elf2image ${ELF2IMAGE_ARG}
-      --flash_mode dio --flash_freq 40m --flash_size ${esptoolpy_flashsize}MB
-      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
-      ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
-  endif()
-
-endif()
-
-# get code-partition slot0 address
-dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
-dt_reg_addr(img_0_off PATH ${dts_partition_path})
-
-# get code-partition boot address
-dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-dt_reg_addr(boot_off PATH ${dts_partition_path})
-
-if(CONFIG_BOOTLOADER_MCUBOOT)
-  board_finalize_runner_args(esp32 "--esp-app-address=${img_0_off}")
-else()
-  board_finalize_runner_args(esp32 "--esp-app-address=${boot_off}")
-endif()
+zephyr_sources_ifdef(CONFIG_SOC_ESP32C6_LPCORE
+  vector_table_lpcore.S
+  vectors_lpcore.S
+  start_lpcore.S
+  soc_lpcore.c
+  )
 
-if(CONFIG_MCUBOOT)
-    # search from cross references between bootloader sections
-    message("check_callgraph using: ${ESP_IDF_PATH}/tools/ci/check_callgraph.py")
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND
-        ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/ci/check_callgraph.py
-      ARGS
-        --rtl-dirs ${CMAKE_BINARY_DIR}/zephyr
-        --elf-file ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf
-        find-refs --from-section=.iram0.iram_loader --to-section=.iram0.text
-        --exit-code)
-endif()
+zephyr_include_directories(.)
 
-if(CONFIG_MCUBOOT)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/mcuboot.ld CACHE INTERNAL "")
-else()
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default.ld CACHE INTERNAL "")
+if(CONFIG_SOC_ESP32C6_HPCORE)
+  zephyr_sources_ifndef(CONFIG_BOOTLOADER_MCUBOOT hw_init.c)
+  zephyr_library_sources_ifdef(CONFIG_PM power.c)
+  zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
+  zephyr_sources_ifdef(CONFIG_ULP_COPROC_ENABLED hpcore_init_ulp.c)
 endif()
diff --git a/soc/espressif/esp32c6/Kconfig b/soc/espressif/esp32c6/Kconfig
index 3908eb4ee1e0e..706bbc86ac9c4 100644
--- a/soc/espressif/esp32c6/Kconfig
+++ b/soc/espressif/esp32c6/Kconfig
@@ -4,14 +4,15 @@
 config SOC_SERIES_ESP32C6
 	select RISCV
 	select RISCV_SOC_HAS_GP_RELATIVE_ADDRESSING
-	select DYNAMIC_INTERRUPTS
-	select CLOCK_CONTROL
-	select PINCTRL
+	select DYNAMIC_INTERRUPTS if SOC_ESP32C6_HPCORE
+	select CLOCK_CONTROL if SOC_ESP32C6_HPCORE
+	select PINCTRL if SOC_ESP32C6_HPCORE
 	select RISCV_ISA_RV32I
 	select RISCV_ISA_EXT_A
 	select RISCV_ISA_EXT_M
 	select RISCV_ISA_EXT_C
 	select RISCV_ISA_EXT_ZICSR
+	select RISCV_ISA_EXT_ZIFENCEI
 	select HAS_ESPRESSIF_HAL
 	select HAS_PM
 	select HAS_POWEROFF
diff --git a/soc/espressif/esp32c6/Kconfig.defconfig b/soc/espressif/esp32c6/Kconfig.defconfig
index 69a04a39a37be..ac076779842b0 100644
--- a/soc/espressif/esp32c6/Kconfig.defconfig
+++ b/soc/espressif/esp32c6/Kconfig.defconfig
@@ -1,12 +1,10 @@
-# ESP32C6 board configuration
-
-# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_ESP32C6
 
 config NUM_IRQS
-	default 77
+	default 32
 
 config FLASH_SIZE
 	default $(dt_node_reg_size_int,/soc/flash-controller@60002000/flash@0,0)
@@ -18,3 +16,25 @@ config MAIN_STACK_SIZE
 	default 2048
 
 endif # SOC_SERIES_ESP32C6
+
+if SOC_ESP32C6_LPCORE
+
+config GEN_ISR_TABLES
+	default n
+
+config SYS_CLOCK_EXISTS
+	default n
+
+config KERNEL_MEM_POOL
+	default n
+
+config COMMON_LIBC_MALLOC_ARENA_SIZE
+	default 0
+
+config MULTITHREADING
+	default n
+
+config NUM_PREEMPT_PRIORITIES
+	default 0
+
+endif
diff --git a/soc/espressif/esp32c6/Kconfig.soc b/soc/espressif/esp32c6/Kconfig.soc
index 0fe5f8faa0582..285478169f6af 100644
--- a/soc/espressif/esp32c6/Kconfig.soc
+++ b/soc/espressif/esp32c6/Kconfig.soc
@@ -17,6 +17,16 @@ config SOC_ESP32C6
 	bool
 	select SOC_SERIES_ESP32C6
 
+config SOC_ESP32C6_HPCORE
+	bool
+	help
+	  This hidden configuration defines that build is targeted for HP CORE.
+
+config SOC_ESP32C6_LPCORE
+	bool
+	help
+	  This hidden configuration defines that build is targeted for LP CORE.
+
 config SOC_SERIES
 	default "esp32c6" if SOC_SERIES_ESP32C6
 
diff --git a/soc/espressif/esp32c6/default.ld b/soc/espressif/esp32c6/default.ld
index ea24cf1abffdc..348ffed362837 100644
--- a/soc/espressif/esp32c6/default.ld
+++ b/soc/espressif/esp32c6/default.ld
@@ -66,9 +66,13 @@ MEMORY
   irom0_0_seg(RX): org = IROM_SEG_ORG, len = IROM_SEG_LEN
   drom0_0_seg(R):  org = DROM_SEG_ORG, len = DROM_SEG_LEN
 
+#if CONFIG_ULP_COPROC_ENABLED
+  lp_ram_seg(RW):    org = LPSRAM_IRAM_START + ULP_COPROC_RESERVE_MEM,
+                     len = LPSRAM_SIZE - ULP_COPROC_RESERVE_MEM - CONFIG_RESERVE_RTC_MEM
+#else
   lp_ram_seg(RW):    org = LPSRAM_IRAM_START,
                      len = 0x4000 - CONFIG_RESERVE_RTC_MEM
-
+#endif
   /* We reduced the size of lp_ram_seg by CONFIG_RESERVE_RTC_MEM value.
      It reserves the amount of LP memory that we use for this memory segment.
      This segment is intended for keeping:
@@ -186,7 +190,6 @@ SECTIONS
 #endif
 
   /* --- START OF RTC --- */
-
   .rtc.text :
   {
     . = ALIGN(4);
@@ -339,11 +342,13 @@ SECTIONS
     *liblib__libc__minimal.a:string.*(.literal .text .literal.* .text.*)
     *liblib__libc__picolib.a:string.*(.literal .text .literal.* .text.*)
     *libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
+    *libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *libgcov.a:(.literal .text .literal.* .text.*)
     *libphy.a:( .phyiram .phyiram.*)
     *libc.a:*(.literal .text .literal.* .text.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -421,7 +426,6 @@ SECTIONS
     *libzephyr.a:esp_rom_systimer.*(.literal .literal.* .text .text.*)
     *libzephyr.a:esp_rom_wdt.*(.literal .literal.* .text .text.*)
     *libzephyr.a:esp_rom_hp_regi2c_esp32c6.*(.literal .literal.* .text .text.*)
-    *libzephyr.a:efuse_hal.*(.literal .literal.* .text .text.*)
 
     /* [mapping:esp_mm] */
     *libzephyr.a:esp_cache.*(.literal .literal.* .text .text.*)
@@ -486,8 +490,6 @@ SECTIONS
     *libzephyr.a:secure_boot_secure_features.*(.literal .text .literal.* .text.*)
     *libzephyr.a:secure_boot_signatures_bootloader.*(.literal .text .literal.* .text.*)
 
-    *libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
-
     *libzephyr.a:cpu_region_protect.*(.literal .text .literal.* .text.*)
 
     /* TODO: optimise */
@@ -572,6 +574,7 @@ SECTIONS
     *libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
@@ -647,7 +650,6 @@ SECTIONS
     *libzephyr.a:esp_rom_efuse.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:esp_rom_systimer.*(.rodata .rodata.* .srodata .srodata.*)
     *libzephyr.a:esp_rom_hp_regi2c_esp32c6.*(.rodata .rodata.* .srodata .srodata.*)
-    *libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
 
     . = ALIGN(4);
     #include <snippets-rwdata.ld>
diff --git a/soc/espressif/esp32c6/default_lpcore.ld b/soc/espressif/esp32c6/default_lpcore.ld
new file mode 100644
index 0000000000000..2730eaffbb4c7
--- /dev/null
+++ b/soc/espressif/esp32c6/default_lpcore.ld
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/devicetree.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/linker/linker-tool.h>
+
+#include "memory.h"
+
+#define ALIGN_DOWN(SIZE, AL)   (SIZE & ~(AL - 1))
+/* Ensure the end where the shared memory starts is aligned to 8 bytes
+   if updating this also update the same in ulp_lp_core_memory_shared.c
+ */
+#define ALIGNED_COPROC_MEM ALIGN_DOWN(ULP_COPROC_RESERVE_MEM, 0x8)
+
+#define RODATA_REGION      ram
+#define RAMABLE_REGION     ram
+#define ROMABLE_REGION     ram
+
+/* User available memory segments  */
+_aligned_coproc_mem = ALIGNED_COPROC_MEM;
+_vector_table_org = LPSRAM_IRAM_START;
+_vector_table_len = 0x80;
+_ram_org = _vector_table_org + _vector_table_len;
+_ram_len = _aligned_coproc_mem - _vector_table_len - ULP_SHARED_MEM;
+_shared_mem_org = _ram_org + _ram_len;
+_shared_mem_len = ULP_SHARED_MEM;
+
+ENTRY(reset_vector)
+
+MEMORY
+{
+    /*first 128byte for exception/interrupt vectors*/
+    vector_table(RX) :   ORIGIN = _vector_table_org , LENGTH = _vector_table_len
+    ram(RWX) :           ORIGIN = _ram_org, LENGTH = _ram_len
+    shared_mem_ram(RW) : ORIGIN = _shared_mem_org, LENGTH = _shared_mem_len
+}
+
+SECTIONS
+{
+    .vector.text :
+    {
+        __mtvec_base = .;
+        KEEP (*(.init.vector .init.vector.*))
+    } > vector_table
+
+    . = ORIGIN(ram);
+
+    .text ALIGN(4):
+    {
+        *(.text.vectors) /* Default reset vector must link to offset 0x80 */
+        __text_region_start = ABSOLUTE(.);
+        *(.text)
+        *(.text*)
+        *(.iram1)
+        *(.iram1.*)
+        __text_region_end = ABSOLUTE(.);
+    } >ram
+
+  #include <zephyr/linker/rel-sections.ld>
+
+    .rodata ALIGN(4):
+    {
+        __rodata_region_start = ABSOLUTE(.);
+        *(.rodata .srodata)
+        *(.rodata* .srodata*)
+        __rodata_region_end = .;
+
+    } > ram
+
+#include <zephyr/linker/common-rom/common-rom-kernel-devices.ld>
+
+    .rodata.end ALIGN(4):
+    {
+        _rodata_reserved_end = ABSOLUTE(.);
+    } > ram
+
+    .data ALIGN(4):
+    {
+        _image_ram_start = ABSOLUTE(.);
+        *(.data)
+        *(.data*)
+        *(.sdata)
+        *(.sdata*)
+
+    } > ram
+
+  #include <snippets-data-sections.ld>
+  #include <zephyr/linker/common-ram.ld>
+  #include <snippets-ram-sections.ld>
+
+    .data.end ALIGN(4):
+    {
+        _image_ram_end = ABSOLUTE(.);
+    } > ram
+
+    .data.noinit (NOLOAD):
+    {
+        . = ALIGN(4);
+        *(.noinit)
+        *(.noinit.*)
+        . = ALIGN(4);
+    } > ram
+
+    .bss ALIGN(4) :
+    {
+        __bss_start = .;
+        *(.bss)
+        *(.bss*)
+        *(.sbss)
+        *(.sbss*)
+        PROVIDE(end = .);
+        __bss_end = .;
+        _heap_sentry = .;
+    } >ram
+
+#include <zephyr/linker/ram-end.ld>
+
+    __stack_top = ORIGIN(ram) + LENGTH(ram);
+
+#include <zephyr/linker/debug-sections.ld>
+    SECTION_PROLOGUE(.riscv.attributes, 0,)
+    {
+    KEEP(*(.riscv.attributes))
+    KEEP(*(.gnu.attributes))
+    }
+
+    . = ORIGIN(shared_mem_ram);
+    .shared_mem (ALIGN(4)) :
+    {
+        KEEP(*(.shared_mem))
+    } > shared_mem_ram
+}
diff --git a/soc/espressif/esp32c6/hpcore_init_ulp.c b/soc/espressif/esp32c6/hpcore_init_ulp.c
new file mode 100644
index 0000000000000..6ba9ed643174a
--- /dev/null
+++ b/soc/espressif/esp32c6/hpcore_init_ulp.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include "bootloader_flash_priv.h"
+#include <zephyr/storage/flash_map.h>
+#include "ulp_lp_core.h"
+#include "lp_core_uart.h"
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
+
+void IRAM_ATTR lp_core_image_init(void)
+{
+	const uint32_t lpcore_img_off = FIXED_PARTITION_OFFSET(slot0_lpcore_partition);
+	const uint32_t lpcore_img_size = 0x4000;
+	int ret = 0;
+
+	LOG_INF("Getting LPU image at %p, size %d", (void *)lpcore_img_off, lpcore_img_size);
+
+	const uint8_t *data = (const uint8_t *)bootloader_mmap(lpcore_img_off, lpcore_img_size);
+
+	ret = ulp_lp_core_load_binary(data, lpcore_img_size);
+	if (ret) {
+		LOG_ERR("Failed to load LP core image: %d", ret);
+	}
+
+	LOG_INF("LP core image loaded");
+
+	/* Set LP core wakeup source as the HP CPU */
+	ulp_lp_core_cfg_t cfg = {
+		.wakeup_source = ULP_LP_CORE_WAKEUP_SOURCE_HP_CPU,
+	};
+
+	ret = ulp_lp_core_run(&cfg);
+	if (ret) {
+		LOG_ERR("Failed to start LP core: %d", ret);
+	}
+}
+
+void soc_late_init_hook(void)
+{
+	lp_core_image_init();
+}
diff --git a/soc/espressif/esp32c6/hw_init.c b/soc/espressif/esp32c6/hw_init.c
index 83838e0778703..3eaf036e68e77 100644
--- a/soc/espressif/esp32c6/hw_init.c
+++ b/soc/espressif/esp32c6/hw_init.c
@@ -54,18 +54,6 @@ int hardware_init(void)
 #ifdef CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE
 	esp_cpu_configure_region_protection();
 #endif
-#if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
-	rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
-
-	if (cfg.enable == 1 && cfg.tieh == RTC_VDDSDIO_TIEH_1_8V) {
-		cfg.drefh = 3;
-		cfg.drefm = 3;
-		cfg.drefl = 3;
-		cfg.force = 1;
-		rtc_vddsdio_set_config(cfg);
-		esp_rom_delay_us(10);
-	}
-#endif /* CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V */
 
 	bootloader_clock_configure();
 
@@ -75,13 +63,6 @@ int hardware_init(void)
 	print_banner();
 #endif /* CONFIG_ESP_CONSOLE */
 
-	spi_flash_init_chip_state();
-	err = esp_flash_init_default_chip();
-	if (err != 0) {
-		ESP_EARLY_LOGE(TAG, "Failed to init flash chip, error %d", err);
-		return err;
-	}
-
 	cache_hal_init();
 	mmu_hal_init();
 
diff --git a/soc/espressif/esp32c6/mcuboot.ld b/soc/espressif/esp32c6/mcuboot.ld
index 8c76315ffe331..da247e2241b0c 100644
--- a/soc/espressif/esp32c6/mcuboot.ld
+++ b/soc/espressif/esp32c6/mcuboot.ld
@@ -50,14 +50,8 @@ SECTIONS
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
-
-    *libzephyr.a:heap.*(.literal .text .literal.* .text.*)
-
-    *libkernel.a:kheap.*(.literal .text .literal.* .text.*)
-    *libkernel.a:mempool.*(.literal .text .literal.* .text.*)
-
+    *libkernel.a:device.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_loader.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
 
     *(.literal.esp_intr_disable .literal.esp_intr_disable.* .text.esp_intr_disable .text.esp_intr_disable.*)
     *(.literal.default_intr_handler .text.default_intr_handler .iram1.*.default_intr_handler)
diff --git a/soc/espressif/esp32c6/memory.h b/soc/espressif/esp32c6/memory.h
index 455c62aba03b4..c9f5dd8530283 100644
--- a/soc/espressif/esp32c6/memory.h
+++ b/soc/espressif/esp32c6/memory.h
@@ -5,15 +5,18 @@
 #pragma once
 
 /* LP-SRAM (16kB) memory */
-#define LPSRAM_IRAM_START  DT_REG_ADDR(DT_NODELABEL(sramlp))
-#define LPSRAM_SIZE        DT_REG_SIZE(DT_NODELABEL(sramlp))
+#define LPSRAM_IRAM_START      DT_REG_ADDR(DT_NODELABEL(sramlp))
+#define LPSRAM_SIZE            DT_REG_SIZE(DT_NODELABEL(sramlp))
+#define ULP_SHARED_MEM         DT_REG_SIZE(DT_NODELABEL(shmlp))
+#define ULP_COPROC_RESERVE_MEM (0x4000)
+
 /* HP-SRAM (512kB) memory */
-#define HPSRAM_START       DT_REG_ADDR(DT_NODELABEL(sramhp))
-#define HPSRAM_SIZE        DT_REG_SIZE(DT_NODELABEL(sramhp))
-#define HPSRAM_DRAM_START  HPSRAM_START
-#define HPSRAM_IRAM_START  HPSRAM_START
+#define HPSRAM_START          DT_REG_ADDR(DT_NODELABEL(sramhp))
+#define HPSRAM_SIZE           DT_REG_SIZE(DT_NODELABEL(sramhp))
+#define HPSRAM_DRAM_START     HPSRAM_START
+#define HPSRAM_IRAM_START     HPSRAM_START
 /* ICache size is fixed to 32KB on ESP32-C6 */
-#define ICACHE_SIZE        0x8000
+#define ICACHE_SIZE           0x8000
 
 /** Simplified memory map for the bootloader.
  *  Make sure the bootloader can load into main memory without overwriting itself.
@@ -27,13 +30,13 @@
  *  buffers area (0x4087c610).
  */
 
-#define DRAM_BUFFERS_START       0x4086ad08
-#define DRAM_BUFFERS_END         0x4087c610
-#define DRAM_STACK_START         DRAM_BUFFERS_END
-#define DRAM_ROM_BSS_DATA_START  0x4087e610
+#define DRAM_BUFFERS_START      0x4086ad08
+#define DRAM_BUFFERS_END        0x4087c610
+#define DRAM_STACK_START        DRAM_BUFFERS_END
+#define DRAM_ROM_BSS_DATA_START 0x4087e610
 
 /* Set the limit for the application runtime dynamic allocations */
-#define DRAM_RESERVED_START      DRAM_BUFFERS_END
+#define DRAM_RESERVED_START DRAM_BUFFERS_END
 
 /* For safety margin between bootloader data section and startup stacks */
 #define BOOTLOADER_STACK_OVERHEAD      0x0
@@ -49,14 +52,14 @@
 
 /* Start of the lower region is determined by region size and the end of the higher region */
 #define BOOTLOADER_IRAM_LOADER_SEG_START (BOOTLOADER_USER_SRAM_END - BOOTLOADER_IRAM_LOADER_SEG_LEN)
-#define BOOTLOADER_IRAM_SEG_START (BOOTLOADER_IRAM_LOADER_SEG_START - BOOTLOADER_IRAM_SEG_LEN)
-#define BOOTLOADER_DRAM_SEG_START (BOOTLOADER_IRAM_SEG_START - BOOTLOADER_DRAM_SEG_LEN)
+#define BOOTLOADER_IRAM_SEG_START       (BOOTLOADER_IRAM_LOADER_SEG_START - BOOTLOADER_IRAM_SEG_LEN)
+#define BOOTLOADER_DRAM_SEG_START        (BOOTLOADER_IRAM_SEG_START - BOOTLOADER_DRAM_SEG_LEN)
 
 /* Flash */
 #ifdef CONFIG_FLASH_SIZE
-#define FLASH_SIZE         CONFIG_FLASH_SIZE
+#define FLASH_SIZE CONFIG_FLASH_SIZE
 #else
-#define FLASH_SIZE         0x400000
+#define FLASH_SIZE 0x400000
 #endif
 
 /* Cached memory */
diff --git a/soc/espressif/esp32c6/soc.c b/soc/espressif/esp32c6/soc.c
index 1c8877d85416a..fb02f77c3b46f 100644
--- a/soc/espressif/esp32c6/soc.c
+++ b/soc/espressif/esp32c6/soc.c
@@ -1,75 +1,37 @@
 /*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2023-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Include esp-idf headers first to avoid redefining BIT() macro */
-#include <soc/timer_group_reg.h>
-#include <soc/ext_mem_defs.h>
-#include <soc/gpio_reg.h>
-#include <soc/system_reg.h>
-#include "hal/wdt_hal.h"
-#include "esp_cpu.h"
-#include "hal/soc_hal.h"
-#include "hal/cpu_hal.h"
-#include "esp_timer.h"
-#include "esp_private/system_internal.h"
-#include "esp_clk_internal.h"
-#include <soc/interrupt_reg.h>
-#include <esp_private/spi_flash_os.h>
-#include "esp_private/esp_mmu_map_private.h"
-#include <esp_flash_internal.h>
-
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-
+#include <soc.h>
+#include <soc_init.h>
+#include <flash_init.h>
+#include <esp_private/cache_utils.h>
+#include <esp_private/system_internal.h>
+#include <esp_timer.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <string.h>
-#include <zephyr/toolchain/gcc.h>
-#include <soc.h>
-
-/*
- * This is written in C rather than assembly since, during the port bring up,
- * Zephyr is being booted by the Espressif bootloader.  With it, the C stack
- * is already set up.
- */
-void IRAM_ATTR __esp_platform_start(void)
-{
-	__asm__ __volatile__("la t0, _esp32c6_vector_table\n"
-						"csrw mtvec, t0\n");
 
-	z_bss_zero();
-
-	/* Disable normal interrupts. */
-	csr_read_clear(mstatus, MSTATUS_MIE);
+extern void esp_reset_reason_init(void);
 
+void IRAM_ATTR __esp_platform_app_start(void)
+{
 	esp_reset_reason_init();
 
-#ifndef CONFIG_MCUBOOT
-	/* ESP-IDF 2nd stage bootloader enables RTC WDT to check on startup sequence
-	 * related issues in application. Hence disable that as we are about to start
-	 * Zephyr environment.
-	 */
-	wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &LP_WDT};
-
-	wdt_hal_write_protect_disable(&rtc_wdt_ctx);
-	wdt_hal_disable(&rtc_wdt_ctx);
-	wdt_hal_write_protect_enable(&rtc_wdt_ctx);
-
 	esp_timer_early_init();
 
-	esp_mspi_pin_init();
-
-	esp_flash_app_init();
+	esp_flash_config();
 
-	esp_mmu_map_init();
-
-#endif /* !CONFIG_MCUBOOT */
+	/* Start Zephyr */
+	z_cstart();
 
-	/*Initialize the esp32c6 interrupt controller */
-	esp_intr_initialize();
+	CODE_UNREACHABLE;
+}
 
+void IRAM_ATTR __esp_platform_mcuboot_start(void)
+{
 	/* Start Zephyr */
 	z_cstart();
 
@@ -88,5 +50,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
diff --git a/soc/espressif/esp32c6/soc.h b/soc/espressif/esp32c6/soc.h
index bfa5644977751..4cbae49783564 100644
--- a/soc/espressif/esp32c6/soc.h
+++ b/soc/espressif/esp32c6/soc.h
@@ -27,7 +27,8 @@
 
 #ifndef _ASMLANGUAGE
 
-void __esp_platform_start(void);
+void __esp_platform_mcuboot_start(void);
+void __esp_platform_app_start(void);
 
 static inline uint32_t esp_core_id(void)
 {
diff --git a/soc/espressif/esp32c6/soc_irq.S b/soc/espressif/esp32c6/soc_irq.S
index c1ad164c1536b..7e41a1f961ecf 100644
--- a/soc/espressif/esp32c6/soc_irq.S
+++ b/soc/espressif/esp32c6/soc_irq.S
@@ -1,26 +1,15 @@
-/* Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/* Copyright 2021-2025 Espressif Systems (Shanghai) PTE LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <offsets.h>
+#include <zephyr/offsets.h>
 #include <zephyr/toolchain.h>
 
 /* Exports */
-GTEXT(__soc_is_irq)
 GTEXT(__soc_handle_irq)
-GTEXT(soc_intr_get_next_source)
-
-SECTION_FUNC(exception.other, __soc_is_irq)
-	csrr a0, mcause
-	srli a0, a0, 31
-	ret
 
 SECTION_FUNC(exception.other, __soc_handle_irq)
-	addi sp, sp,-4
-	sw  ra, 0x00(sp)
-	la t1, soc_intr_get_next_source
-	jalr ra, t1, 0
-	lw  ra, 0x00(sp)
-	addi sp, sp, 4
+
+	/* int status clearing is done at ISR */
 	ret
diff --git a/soc/espressif/esp32c6/soc_irq.c b/soc/espressif/esp32c6/soc_irq.c
deleted file mode 100644
index 6a452ec78b956..0000000000000
--- a/soc/espressif/esp32c6/soc_irq.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <soc/timer_group_reg.h>
-#include <soc/ext_mem_defs.h>
-#include <soc/gpio_reg.h>
-#include <soc/system_reg.h>
-#include <riscv/interrupt.h>
-#include <soc/interrupt_reg.h>
-#include <soc/periph_defs.h>
-#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
-
-#include <zephyr/kernel_structs.h>
-#include <string.h>
-#include <zephyr/toolchain/gcc.h>
-#include <soc.h>
-#include <zephyr/arch/riscv/arch.h>
-
-#define ESP32C6_INTSTATUS_REG1_THRESHOLD	32
-#define ESP32C6_INTSTATUS_REG2_THRESHOLD	64
-
-void arch_irq_enable(unsigned int irq)
-{
-	esp_intr_enable(irq);
-}
-
-void arch_irq_disable(unsigned int irq)
-{
-	esp_intr_disable(irq);
-}
-
-int arch_irq_is_enabled(unsigned int irq)
-{
-	bool res = false;
-	uint32_t key = irq_lock();
-
-	if (irq < 32) {
-		res = esp_intr_get_enabled_intmask(0) & BIT(irq);
-	} else if (irq < 64) {
-		res = esp_intr_get_enabled_intmask(1) & BIT(irq - 32);
-	} else {
-		res = esp_intr_get_enabled_intmask(2) & BIT(irq - 64);
-	}
-
-	irq_unlock(key);
-
-	return res;
-}
-
-uint32_t soc_intr_get_next_source(void)
-{
-	uint32_t status;
-	uint32_t source;
-
-	/* Status register for interrupt sources 0 ~ 31 */
-	status = REG_READ(INTMTX_CORE0_INT_STATUS_REG_0_REG) &
-		esp_intr_get_enabled_intmask(0);
-
-	if (status) {
-		source = __builtin_ffs(status) - 1;
-		goto ret;
-	}
-
-	/* Status register for interrupt sources 32 ~ 63 */
-	status = REG_READ(INTMTX_CORE0_INT_STATUS_REG_1_REG) &
-		esp_intr_get_enabled_intmask(1);
-
-	if (status) {
-		source = (__builtin_ffs(status) - 1 + ESP32C6_INTSTATUS_REG1_THRESHOLD);
-		goto ret;
-	}
-
-	/* Status register for interrupt sources 64 ~ 76 */
-	status = REG_READ(INTMTX_CORE0_INT_STATUS_REG_2_REG) &
-		esp_intr_get_enabled_intmask(2);
-
-	source = (__builtin_ffs(status) - 1 + ESP32C6_INTSTATUS_REG2_THRESHOLD);
-
-ret:
-	return source;
-}
diff --git a/soc/espressif/esp32c6/soc_lpcore.c b/soc/espressif/esp32c6/soc_lpcore.c
new file mode 100644
index 0000000000000..e2e5a5d2b53cf
--- /dev/null
+++ b/soc/espressif/esp32c6/soc_lpcore.c
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "soc/soc_caps.h"
+#include "esp_rom_caps.h"
+#include "rom/ets_sys.h"
+#include "ulp_lp_core_utils.h"
+#include "ulp_lp_core_lp_timer_shared.h"
+#include "ulp_lp_core_memory_shared.h"
+#include "ulp_lp_core_print.h"
+#include <soc.h>
+#include <kernel_internal.h>
+
+extern void main(void);
+
+/* Initialize lp core related system functions before calling user's main*/
+void lp_core_startup(void)
+{
+#if CONFIG_ULP_HP_UART_CONSOLE_PRINT && ESP_ROM_HAS_LP_ROM
+	ets_install_putc1(lp_core_print_char);
+#endif
+
+	ulp_lp_core_update_wakeup_cause();
+
+	/* Start Zephyr */
+	z_cstart();
+
+	CODE_UNREACHABLE;
+}
diff --git a/soc/espressif/esp32c6/start_lpcore.S b/soc/espressif/esp32c6/start_lpcore.S
new file mode 100644
index 0000000000000..b30015b09b7b9
--- /dev/null
+++ b/soc/espressif/esp32c6/start_lpcore.S
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+	.section .text.vectors
+	.global reset_vector
+
+/* The reset vector, jumps to startup code */
+reset_vector:
+
+	/* _vector_table: Only 256-byte aligned addresses are allowed */
+	la      t0, _vector_table
+	csrw    mtvec, t0
+
+	j __start
+
+__start:
+
+	/* setup the stack pointer */
+	la sp, __stack_top
+	call lp_core_startup
+loop:
+	j loop
diff --git a/soc/espressif/esp32c6/vector_table_lpcore.S b/soc/espressif/esp32c6/vector_table_lpcore.S
new file mode 100644
index 0000000000000..3fe3f5a308fba
--- /dev/null
+++ b/soc/espressif/esp32c6/vector_table_lpcore.S
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+	.section	.init.vector,"ax"
+
+	.global _vector_table
+	.type _vector_table, @function
+_vector_table:
+	.option push
+	.option norvc
+
+	.rept 30
+	j _panic_handler
+	.endr
+	j _interrupt_handler // All interrupts are routed to mtvec + 4*30, i.e. the 31st entry
+	j _panic_handler
+
+	.option pop
+	.size _vector_table, .-_vector_table
diff --git a/soc/espressif/esp32c6/vectors.S b/soc/espressif/esp32c6/vectors.S
index d248c0b49b51c..272ab653a5f61 100644
--- a/soc/espressif/esp32c6/vectors.S
+++ b/soc/espressif/esp32c6/vectors.S
@@ -1,4 +1,4 @@
-/* Copyright 2023 Espressif Systems (Shanghai) PTE LTD
+/* Copyright 2020-2025 Espressif Systems (Shanghai) PTE LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -22,12 +22,12 @@ GTEXT(_isr_wrapper)
 	 * only uses the 24 MSBs of the MTVEC, i.e. (MTVEC & 0xffffff00).
 	 */
 
-	.global  _esp32c6_vector_table
+	.global  _vector_table
 	.section .exception_vectors.text
 	.balign   0x100
-	.type     _esp32c6_vector_table, @function
+	.type     _vector_table, @function
 
-_esp32c6_vector_table:
+_vector_table:
 	.option push
 	.option norvc
 	.rept (32)
diff --git a/soc/espressif/esp32c6/vectors_lpcore.S b/soc/espressif/esp32c6/vectors_lpcore.S
new file mode 100644
index 0000000000000..360977cadd1b7
--- /dev/null
+++ b/soc/espressif/esp32c6/vectors_lpcore.S
@@ -0,0 +1,142 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "riscv/rvruntime-frames.h"
+#include <soc/soc_caps.h>
+
+	.equ SAVE_REGS, 32
+	.equ CONTEXT_SIZE, (SAVE_REGS * 4)
+/* Macro which first allocates space on the stack to save general
+ * purpose registers, and then save them. GP register is excluded.
+ * The default size allocated on the stack is CONTEXT_SIZE, but it
+ * can be overridden. */
+.macro save_general_regs cxt_size=CONTEXT_SIZE
+	addi sp, sp, -\cxt_size
+	sw   ra, RV_STK_RA(sp)
+	sw   tp, RV_STK_TP(sp)
+	sw   t0, RV_STK_T0(sp)
+	sw   t1, RV_STK_T1(sp)
+	sw   t2, RV_STK_T2(sp)
+	sw   s0, RV_STK_S0(sp)
+	sw   s1, RV_STK_S1(sp)
+	sw   a0, RV_STK_A0(sp)
+	sw   a1, RV_STK_A1(sp)
+	sw   a2, RV_STK_A2(sp)
+	sw   a3, RV_STK_A3(sp)
+	sw   a4, RV_STK_A4(sp)
+	sw   a5, RV_STK_A5(sp)
+	sw   a6, RV_STK_A6(sp)
+	sw   a7, RV_STK_A7(sp)
+	sw   s2, RV_STK_S2(sp)
+	sw   s3, RV_STK_S3(sp)
+	sw   s4, RV_STK_S4(sp)
+	sw   s5, RV_STK_S5(sp)
+	sw   s6, RV_STK_S6(sp)
+	sw   s7, RV_STK_S7(sp)
+	sw   s8, RV_STK_S8(sp)
+	sw   s9, RV_STK_S9(sp)
+	sw   s10, RV_STK_S10(sp)
+	sw   s11, RV_STK_S11(sp)
+	sw   t3, RV_STK_T3(sp)
+	sw   t4, RV_STK_T4(sp)
+	sw   t5, RV_STK_T5(sp)
+	sw   t6, RV_STK_T6(sp)
+.endm
+
+.macro save_mepc
+	csrr t0, mepc
+	sw   t0, RV_STK_MEPC(sp)
+.endm
+
+/* Restore the general purpose registers (excluding gp) from the context on
+ * the stack. The context is then deallocated. The default size is CONTEXT_SIZE
+ * but it can be overridden. */
+.macro restore_general_regs cxt_size=CONTEXT_SIZE
+	lw   ra, RV_STK_RA(sp)
+	lw   tp, RV_STK_TP(sp)
+	lw   t0, RV_STK_T0(sp)
+	lw   t1, RV_STK_T1(sp)
+	lw   t2, RV_STK_T2(sp)
+	lw   s0, RV_STK_S0(sp)
+	lw   s1, RV_STK_S1(sp)
+	lw   a0, RV_STK_A0(sp)
+	lw   a1, RV_STK_A1(sp)
+	lw   a2, RV_STK_A2(sp)
+	lw   a3, RV_STK_A3(sp)
+	lw   a4, RV_STK_A4(sp)
+	lw   a5, RV_STK_A5(sp)
+	lw   a6, RV_STK_A6(sp)
+	lw   a7, RV_STK_A7(sp)
+	lw   s2, RV_STK_S2(sp)
+	lw   s3, RV_STK_S3(sp)
+	lw   s4, RV_STK_S4(sp)
+	lw   s5, RV_STK_S5(sp)
+	lw   s6, RV_STK_S6(sp)
+	lw   s7, RV_STK_S7(sp)
+	lw   s8, RV_STK_S8(sp)
+	lw   s9, RV_STK_S9(sp)
+	lw   s10, RV_STK_S10(sp)
+	lw   s11, RV_STK_S11(sp)
+	lw   t3, RV_STK_T3(sp)
+	lw   t4, RV_STK_T4(sp)
+	lw   t5, RV_STK_T5(sp)
+	lw   t6, RV_STK_T6(sp)
+	addi sp,sp, \cxt_size
+.endm
+
+.macro restore_mepc
+	lw      t0, RV_STK_MEPC(sp)
+	csrw    mepc, t0
+.endm
+
+
+/* _panic_handler: handle all exception */
+	.section	.text.handlers,"ax"
+	.global _panic_handler
+	.type _panic_handler, @function
+_panic_handler:
+	save_general_regs RV_STK_FRMSZ
+	save_mepc
+
+	addi  t0, sp, RV_STK_FRMSZ /* Restore sp with the value when trap happened */
+
+	/* Save CSRs */
+	sw    t0, RV_STK_SP(sp)
+	csrr  t0, mstatus
+	sw    t0, RV_STK_MSTATUS(sp)
+	csrr  t0, mcause
+	sw    t0, RV_STK_MCAUSE(sp)
+	csrr  t0, mtvec
+	sw    t0, RV_STK_MTVEC(sp)
+	csrr  t0, mhartid
+	sw    t0, RV_STK_MHARTID(sp)
+	csrr  t0, mtval
+	sw    t0, RV_STK_MTVAL(sp)
+
+	csrr	a1, mcause		/* Exception cause */
+
+	mv	a0, sp			/* RvExcFrame *regs */
+	call ulp_lp_core_panic_handler
+_end:
+	j _end /* loop forever */
+
+
+/* _interrupt_handler: handle all interrupt */
+	.section	.text.handlers,"ax"
+	.global _interrupt_handler
+	.type _interrupt_handler, @function
+_interrupt_handler:
+	/* Save registers & mepc to stack */
+	save_general_regs
+	save_mepc
+
+	call ulp_lp_core_intr_handler
+
+	/* Restore registers & mepc from stack */
+	restore_mepc
+	restore_general_regs
+	/* Exit, this will also re-enable the interrupts */
+	mret
diff --git a/soc/espressif/esp32s2/CMakeLists.txt b/soc/espressif/esp32s2/CMakeLists.txt
index ef1d907a64c8b..6cae59aed5b65 100644
--- a/soc/espressif/esp32s2/CMakeLists.txt
+++ b/soc/espressif/esp32s2/CMakeLists.txt
@@ -14,64 +14,3 @@ zephyr_library_sources_ifdef(CONFIG_NEWLIB_LIBC newlib_fix.c)
 
 zephyr_library_sources_ifdef(CONFIG_PM power.c)
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
-
-# get flash size to use in esptool as string
-math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")
-
-if(NOT CONFIG_BOOTLOADER_MCUBOOT)
-
-  if(CONFIG_BUILD_OUTPUT_BIN)
-    # make ESP ROM loader compatible image
-    message("ESP-IDF path: ${ESP_IDF_PATH}")
-
-    set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py)
-    message("esptool path: ${ESPTOOL_PY}")
-
-    set(ELF2IMAGE_ARG "")
-    if(NOT CONFIG_MCUBOOT)
-      set(ELF2IMAGE_ARG "--ram-only-header")
-    endif()
-
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY}
-      ARGS --chip esp32s2 elf2image ${ELF2IMAGE_ARG}
-      --flash_mode dio --flash_freq 40m
-      --flash_size ${esptoolpy_flashsize}MB
-      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
-      ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
-  endif()
-
-endif()
-
-# Get code-partition boot address
-dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-dt_reg_addr(boot_off PATH ${dts_partition_path})
-
-# Get code-partition slot0 address
-dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
-dt_reg_addr(img_0_off PATH ${dts_partition_path})
-
-if(CONFIG_BOOTLOADER_MCUBOOT)
-  board_finalize_runner_args(esp32 "--esp-app-address=${img_0_off}")
-else()
-  board_finalize_runner_args(esp32 "--esp-app-address=${boot_off}")
-endif()
-
-if(CONFIG_MCUBOOT)
-    # search from cross references between bootloader sections
-    message("check_callgraph using: ${ESP_IDF_PATH}/tools/ci/check_callgraph.py")
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND
-        ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/ci/check_callgraph.py
-      ARGS
-        --rtl-dirs ${CMAKE_BINARY_DIR}/zephyr
-	--elf-file ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf
-        find-refs --from-section=.iram0.iram_loader --to-section=.iram0.text
-        --exit-code)
-endif()
-
-if(CONFIG_MCUBOOT)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/mcuboot.ld CACHE INTERNAL "")
-else()
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default.ld CACHE INTERNAL "")
-endif()
diff --git a/soc/espressif/esp32s2/default.ld b/soc/espressif/esp32s2/default.ld
index a9ca15c0dca18..623e061f8a9ff 100644
--- a/soc/espressif/esp32s2/default.ld
+++ b/soc/espressif/esp32s2/default.ld
@@ -23,12 +23,22 @@ user_iram_end = BOOTLOADER_IRAM_LOADER_SEG_START;
 #endif
 
 /* User available SRAM memory segments */
-user_iram_seg_org = SRAM_IRAM_START + SRAM_CACHE_SIZE;
-user_dram_seg_org = SRAM_DRAM_START + SRAM_CACHE_SIZE;
+user_iram_org = SRAM_IRAM_START + SRAM_CACHE_SIZE;
+user_dram_org = SRAM_DRAM_START + SRAM_CACHE_SIZE;
 user_dram_end = user_iram_end - IRAM_DRAM_OFFSET;
-user_sram_size = (user_dram_end - user_dram_seg_org);
-user_iram_seg_len = user_sram_size;
-user_dram_seg_len = user_sram_size;
+user_sram_size = (user_dram_end - user_dram_org);
+user_iram_len = user_sram_size;
+user_dram_len = user_sram_size;
+
+user_irom_org = ICACHE0_START;
+user_irom_len = ICACHE0_SIZE;
+user_drom_org = DCACHE0_START;
+user_drom_len = DCACHE0_SIZE;
+
+#if defined(CONFIG_ESP_SPIRAM)
+ext_ram_org = DCACHE1_START;
+ext_ram_len = DCACHE1_SIZE;
+#endif
 
 /* Aliases */
 #define FLASH_CODE_REGION irom0_0_seg
@@ -67,11 +77,11 @@ MEMORY
   FLASH (R): org = 0x0, len = FLASH_SIZE - 0x100
 #endif
 
-  iram0_0_seg(RX): org = user_iram_seg_org, len = user_iram_seg_len
-  dram0_0_seg(RW): org = user_dram_seg_org, len = user_dram_seg_len
+  iram0_0_seg(RX): org = user_iram_org, len = user_iram_len
+  dram0_0_seg(RW): org = user_dram_org, len = user_dram_len
 
-  irom0_0_seg(RX): org = IROM_SEG_ORG, len = IROM_SEG_LEN
-  drom0_0_seg(R):  org = DROM_SEG_ORG, len = DROM_SEG_LEN
+  irom0_0_seg(RX): org = user_irom_org, len = user_irom_len
+  drom0_0_seg(R):  org = user_drom_org, len = user_drom_len
 
   rtc_iram_seg(RWX): org = 0x40070000, len = 0x2000 - CONFIG_RESERVE_RTC_MEM
   rtc_slow_seg(RW):  org = 0x50000000, len = 0x2000
@@ -90,7 +100,7 @@ MEMORY
 #endif
 
 #ifdef CONFIG_ESP_SPIRAM
-  ext_ram_seg(RW): org = 0x3f800000, len = CONFIG_ESP_SPIRAM_SIZE /* OR 0x780000 */
+  ext_ram_seg(RW): org = ext_ram_org, len = ext_ram_len
 #endif /* CONFIG_ESP_SPIRAM */
 
 #ifdef CONFIG_GEN_ISR_TABLES
@@ -368,6 +378,7 @@ SECTIONS
     *libzephyr.a:esp_psram_impl_octal.*(.literal .literal.* .text .text.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cache_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cache_utils.*(.literal .text .literal.* .text.*)
@@ -429,6 +440,7 @@ SECTIONS
     *libzephyr.a:mspi_timing_config.*(.literal .literal.* .text .text.*)
     *libzephyr.a:mspi_timing_tuning.*(.literal .literal.* .text .text.*)
     *libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
+    *libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *(.literal.sar_periph_ctrl_power_enable .text.sar_periph_ctrl_power_enable)
 
     /* [mapping:soc_pm] */
@@ -500,7 +512,6 @@ SECTIONS
     *libzephyr.a:secure_boot.*(.literal .text .literal.* .text.*)
     *libzephyr.a:secure_boot_secure_features.*(.literal .text .literal.* .text.*)
     *libzephyr.a:secure_boot_signatures_bootloader.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_efuse_table.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_efuse_fields.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_efuse_api.*(.literal .text .literal.* .text.*)
@@ -551,7 +562,7 @@ SECTIONS
     /* This section is required to skip .iram0.text area because iram0_0_seg and
      * dram0_0_seg reflect the same address space on different buses.
      */
-    . = ORIGIN(dram0_0_seg) + MAX(_iram_end, user_iram_seg_org) - user_iram_seg_org;
+    . = ORIGIN(dram0_0_seg) + MAX(_iram_end, user_iram_org) - user_iram_org;
     . = ALIGN(4) + 16;
   } GROUP_LINK_IN(RAMABLE_REGION)
 
@@ -609,6 +620,7 @@ SECTIONS
     *libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.rodata .rodata.*)
     *libzephyr.a:mmu_hal.*(.rodata .rodata.*)
     *libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)
@@ -726,8 +738,6 @@ SECTIONS
     *libzephyr.a:esp_flash_api.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
     *libzephyr.a:esp_flash_spi_init.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
 
-    *libzephyr.a:efuse_hal.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
-
     . = ALIGN(4);
     _loader_data_end = ABSOLUTE(.);
   } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
@@ -791,24 +801,21 @@ SECTIONS
     *libsubsys__net__lib__config.a:(.noinit .noinit.*)
     *libsubsys__net__ip.a:(.noinit .noinit.*)
     *libsubsys__net.a:(.noinit .noinit.*)
-#endif /* CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM */
+#endif
     . = ALIGN(16);
-
     *(.ext_ram_noinit*)
-    *(.ext_ram_noinit.*)
-
     . = ALIGN(16);
     _ext_ram_noinit_end = ABSOLUTE(.);
 
     _ext_ram_bss_start = ABSOLUTE(.);
-
     *(.ext_ram.bss*)
-
     . = ALIGN(16);
     _ext_ram_bss_end = ABSOLUTE(.);
 
-    _spiram_heap_start = ABSOLUTE(.);
+    _ext_ram_heap_start = ABSOLUTE(.);
     . += CONFIG_ESP_SPIRAM_HEAP_SIZE;
+    . = ALIGN(16);
+    _ext_ram_heap_end = ABSOLUTE(.);
 
     _ext_ram_end = ABSOLUTE(.);
   } GROUP_LINK_IN(ext_ram_seg)
diff --git a/soc/espressif/esp32s2/hw_init.c b/soc/espressif/esp32s2/hw_init.c
index b9d1144f8bcc8..abed31dd22006 100644
--- a/soc/espressif/esp32s2/hw_init.c
+++ b/soc/espressif/esp32s2/hw_init.c
@@ -36,18 +36,6 @@ int hardware_init(void)
 #ifdef CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE
 	esp_cpu_configure_region_protection();
 #endif
-#if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
-	rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
-
-	if (cfg.enable == 1 && cfg.tieh == RTC_VDDSDIO_TIEH_1_8V) {
-		cfg.drefh = 3;
-		cfg.drefm = 3;
-		cfg.drefl = 3;
-		cfg.force = 1;
-		rtc_vddsdio_set_config(cfg);
-		esp_rom_delay_us(10);
-	}
-#endif /* CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V */
 
 	bootloader_clock_configure();
 
@@ -57,14 +45,8 @@ int hardware_init(void)
 	print_banner();
 #endif /* CONFIG_ESP_CONSOLE */
 
-	spi_flash_init_chip_state();
-	err = esp_flash_init_default_chip();
-	if (err != 0) {
-		ESP_EARLY_LOGE(TAG, "Failed to init flash chip, error %d", err);
-		return err;
-	}
-
 	cache_hal_init();
+
 	mmu_hal_init();
 
 	/* Workaround: normal ROM bootloader exits with DROM0 cache unmasked, but 2nd bootloader
diff --git a/soc/espressif/esp32s2/mcuboot.ld b/soc/espressif/esp32s2/mcuboot.ld
index bf14afeb6a3e8..b14ad89af4a12 100644
--- a/soc/espressif/esp32s2/mcuboot.ld
+++ b/soc/espressif/esp32s2/mcuboot.ld
@@ -44,28 +44,17 @@ SECTIONS
     *(.stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
 
     *libarch__xtensa__core.a:xtensa_asm2_util.*(.literal .text .literal.* .text.*)
-    *liblib__libc__common.a:abort.*(.literal .text .literal.* .text.*)
-    *libdrivers__timer.a:xtensa_sys_timer.*(.literal .text .literal.* .text.*)
     *libarch__common.a:dynamic_isr.*(.literal .text .literal.* .text.*)
     *libarch__common.a:sw_isr_common.*(.literal .text .literal.* .text.*)
 
     *libapp.a:flash_map_extended.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:printk.*(.literal.printk .literal.vprintk .literal.char_out .text.printk .text.vprintk .text.char_out)
     *libzephyr.a:cbprintf_nano.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cpu.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:heap.*(.literal .text .literal.* .text.*)
-    *libkernel.a:kheap.*(.literal .text .literal.* .text.*)
-    *libkernel.a:mempool.*(.literal .text .literal.* .text.*)
     *libkernel.a:device.*(.literal .text .literal.* .text.*)
-    *libkernel.a:timeout.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_loader.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:rtc_time.*(.literal .literal.* .text .text.*)
-    *libzephyr.a:rtc_clk.*(.literal .literal.* .text .text.*)
-    *libzephyr.a:rtc_clk_init.*(.literal .literal.* .text .text.*)
 
     *(.literal.esp_intr_disable .literal.esp_intr_disable.* .text.esp_intr_disable .text.esp_intr_disable.*)
     *(.literal.default_intr_handler .text.default_intr_handler .iram1.*.default_intr_handler)
diff --git a/soc/espressif/esp32s2/memory.h b/soc/espressif/esp32s2/memory.h
index 4b6e8a17c36c8..92d49dd3dc472 100644
--- a/soc/espressif/esp32s2/memory.h
+++ b/soc/espressif/esp32s2/memory.h
@@ -53,16 +53,19 @@
 #define BOOTLOADER_DRAM_SEG_START \
 	(BOOTLOADER_IRAM_SEG_START - BOOTLOADER_DRAM_SEG_LEN - IRAM_DRAM_OFFSET)
 
+/* Cached memories */
+#define ICACHE0_START DT_REG_ADDR(DT_NODELABEL(icache0))
+#define ICACHE0_SIZE  DT_REG_SIZE(DT_NODELABEL(icache0))
+#define DCACHE0_START DT_REG_ADDR(DT_NODELABEL(dcache0))
+#define DCACHE0_SIZE  DT_REG_SIZE(DT_NODELABEL(dcache0))
+#define DCACHE1_START DT_REG_ADDR(DT_NODELABEL(dcache1))
+#define DCACHE1_SIZE  DT_REG_SIZE(DT_NODELABEL(dcache1))
+
+#define CACHE_ALIGN       CONFIG_MMU_PAGE_SIZE
+
 /* Flash */
 #ifdef CONFIG_FLASH_SIZE
 #define FLASH_SIZE        CONFIG_FLASH_SIZE
 #else
 #define FLASH_SIZE        0x400000
 #endif
-
-/* Cached memories */
-#define CACHE_ALIGN       CONFIG_MMU_PAGE_SIZE
-#define IROM_SEG_ORG      0x40080000
-#define IROM_SEG_LEN      0x780000
-#define DROM_SEG_ORG      0x3f000000
-#define DROM_SEG_LEN      FLASH_SIZE
diff --git a/soc/espressif/esp32s2/soc.c b/soc/espressif/esp32s2/soc.c
index 02a6d1b4dc6fb..bbb4fa973c53e 100644
--- a/soc/espressif/esp32s2/soc.c
+++ b/soc/espressif/esp32s2/soc.c
@@ -1,85 +1,24 @@
 /*
- * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+ * Copyright (c) 2021-2025 Espressif Systems (Shanghai) Co., Ltd.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Include esp-idf headers first to avoid redefining BIT() macro */
-#include "soc.h"
-#include <soc/rtc_cntl_reg.h>
-#include <soc/timer_group_reg.h>
-#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#include <xtensa/config/core-isa.h>
-#include <xtensa/corebits.h>
-#include <esp_private/spi_flash_os.h>
-#include <esp_private/esp_mmu_map_private.h>
-#include <esp_flash_internal.h>
-#if CONFIG_ESP_SPIRAM
-#include "psram.h"
-#endif
-
-#include <zephyr/kernel_structs.h>
-#include <kernel_internal.h>
-#include <string.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/types.h>
-
+#include <soc.h>
+#include <soc_init.h>
+#include <flash_init.h>
+#include <esp_private/cache_utils.h>
 #include <esp_private/system_internal.h>
-#include <esp32s2/rom/cache.h>
-#include <soc/gpio_periph.h>
-#include <esp_cpu.h>
-#include <hal/cpu_hal.h>
-#include <hal/soc_hal.h>
-#include <hal/wdt_hal.h>
 #include <esp_timer.h>
-#include <esp_err.h>
-#include <esp_clk_internal.h>
+#include <psram.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/sys/printk.h>
-#include "esp_log.h"
-
-#define TAG "boot.esp32s2"
 
-extern void rtc_clk_cpu_freq_set_xtal(void);
-extern void esp_reset_reason_init(void);
 extern void z_prep_c(void);
+extern void esp_reset_reason_init(void);
 
-/*
- * This is written in C rather than assembly since, during the port bring up,
- * Zephyr is being booted by the Espressif bootloader.  With it, the C stack
- * is already set up.
- */
-void __attribute__((section(".iram1"))) __esp_platform_start(void)
+void IRAM_ATTR __esp_platform_app_start(void)
 {
-	extern uint32_t _init_start;
-
-	/* Move the exception vector table to IRAM. */
-	__asm__ __volatile__("wsr %0, vecbase" : : "r"(&_init_start));
-
-	/* Zero out BSS */
-	z_bss_zero();
-
-	/* Disable normal interrupts. */
-	__asm__ __volatile__("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
-
-	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid _current before
-	 * arch_kernel_init() is invoked.
-	 */
-	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));
-
-	esp_reset_reason_init();
-
-#ifndef CONFIG_MCUBOOT
-	/* ESP-IDF 2nd stage bootloader enables RTC WDT to check on startup sequence
-	 * related issues in application. Hence disable that as we are about to start
-	 * Zephyr environment.
-	 */
-	wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL};
-
-	wdt_hal_write_protect_disable(&rtc_wdt_ctx);
-	wdt_hal_disable(&rtc_wdt_ctx);
-	wdt_hal_write_protect_enable(&rtc_wdt_ctx);
-
 	/*
 	 * Configure the mode of instruction cache :
 	 * cache size, cache associated ways, cache line size.
@@ -96,23 +35,15 @@ void __attribute__((section(".iram1"))) __esp_platform_start(void)
 	esp_config_data_cache_mode();
 	esp_rom_Cache_Enable_DCache(0);
 
-	esp_timer_early_init();
-
-	esp_mspi_pin_init();
+	esp_reset_reason_init();
 
-	esp_flash_app_init();
+	esp_timer_early_init();
 
-	esp_mmu_map_init();
+	esp_flash_config();
 
 #if CONFIG_ESP_SPIRAM
 	esp_init_psram();
-#endif /* CONFIG_ESP_SPIRAM */
-
-#endif /* !CONFIG_MCUBOOT */
 
-	esp_intr_initialize();
-
-#if CONFIG_ESP_SPIRAM
 	/* Init Shared Multi Heap for PSRAM */
 	int err = esp_psram_smh_init();
 
@@ -127,6 +58,14 @@ void __attribute__((section(".iram1"))) __esp_platform_start(void)
 	CODE_UNREACHABLE;
 }
 
+void IRAM_ATTR __esp_platform_mcuboot_start(void)
+{
+	/* Start Zephyr */
+	z_prep_c();
+
+	CODE_UNREACHABLE;
+}
+
 /* Boot-time static default printk handler, possibly to be overridden later. */
 int IRAM_ATTR arch_printk_char_out(int c)
 {
@@ -139,5 +78,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
diff --git a/soc/espressif/esp32s2/soc.h b/soc/espressif/esp32s2/soc.h
index 2edd0d12cc947..9a5c5e9795955 100644
--- a/soc/espressif/esp32s2/soc.h
+++ b/soc/espressif/esp32s2/soc.h
@@ -22,7 +22,8 @@
 #include <zephyr/arch/xtensa/arch.h>
 #include <stdlib.h>
 
-void __esp_platform_start(void);
+void __esp_platform_mcuboot_start(void);
+void __esp_platform_app_start(void);
 
 static inline uint32_t esp_core_id(void)
 {
diff --git a/soc/espressif/esp32s3/CMakeLists.txt b/soc/espressif/esp32s3/CMakeLists.txt
index 4de4df54cfe61..48c6936487bac 100644
--- a/soc/espressif/esp32s3/CMakeLists.txt
+++ b/soc/espressif/esp32s3/CMakeLists.txt
@@ -26,84 +26,3 @@ zephyr_library_sources_ifdef(CONFIG_NEWLIB_LIBC newlib_fix.c)
 # Power Management
 zephyr_library_sources_ifdef(CONFIG_PM power.c)
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
-
-# Get flash size to use in esptool as string
-math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")
-
-# Get UART baudrate from DT
-dt_chosen(dts_shell_uart PROPERTY "zephyr,shell-uart")
-if(${dts_shell_uart})
-  dt_prop(monitor_baud PATH ${dts_shell_uart} PROPERTY "current-speed")
-endif()
-
-board_runner_args(esp32 "--esp-monitor-baud=${monitor_baud}")
-
-message("-- Espressif HAL path: ${ESP_IDF_PATH}")
-
-# Select image processing
-
-if(CONFIG_ESP_SIMPLE_BOOT OR CONFIG_MCUBOOT)
-
-  if(CONFIG_BUILD_OUTPUT_BIN)
-
-    set(ESPTOOL_PY ${ESP_IDF_PATH}/tools/esptool_py/esptool.py)
-    message("-- Use the esptool.py: ${ESPTOOL_PY}")
-
-    set(ELF2IMAGE_ARG "")
-    if(NOT CONFIG_MCUBOOT)
-      set(ELF2IMAGE_ARG "--ram-only-header")
-    endif()
-
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND ${PYTHON_EXECUTABLE} ${ESPTOOL_PY}
-      ARGS --chip ${CONFIG_SOC} elf2image ${ELF2IMAGE_ARG}
-      --flash_mode dio --flash_freq 40m
-      --flash_size ${esptoolpy_flashsize}MB
-      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
-      ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
-
- endif()
-
-endif()
-
-set_property(TARGET bintools PROPERTY disassembly_flag_inline_source)
-
-# Select the image origin depending on the boot configuration
-if(CONFIG_SOC_ESP32S3_APPCPU)
-  dt_nodelabel(dts_partition_path NODELABEL "slot0_appcpu_partition")
-elseif(CONFIG_MCUBOOT)
-  dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-elseif(CONFIG_ESP_SIMPLE_BOOT)
-  dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
-else()
-  dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
-endif()
-
-dt_reg_addr(image_off PATH ${dts_partition_path})
-board_finalize_runner_args(esp32 "--esp-app-address=${image_off}")
-
-message("-- Image partition ${dts_partition_path}")
-
-# Look for cross references between bootloader sections
-if(CONFIG_MCUBOOT)
-
-    message("check_callgraph using: ${ESP_IDF_PATH}/tools/ci/check_callgraph.py")
-    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      COMMAND
-        ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/ci/check_callgraph.py
-      ARGS
-        --rtl-dirs ${CMAKE_BINARY_DIR}/zephyr
-        --elf-file ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf
-        find-refs
-        --from-section='.iram0.loader_text'
-        --to-section='.iram0.text'
-        --exit-code)
-endif()
-
-if(CONFIG_MCUBOOT)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/mcuboot.ld CACHE INTERNAL "")
-elseif(CONFIG_SOC_ESP32S3_APPCPU)
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default_appcpu.ld CACHE INTERNAL "")
-else()
-  set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/default.ld CACHE INTERNAL "")
-endif()
diff --git a/soc/espressif/esp32s3/default.ld b/soc/espressif/esp32s3/default.ld
index 79f8af91bd546..bba2fc40c4a93 100644
--- a/soc/espressif/esp32s3/default.ld
+++ b/soc/espressif/esp32s3/default.ld
@@ -17,7 +17,6 @@ procpu_dram_end = USER_DRAM_END - APPCPU_SRAM_SIZE;
 procpu_iram_org = SRAM_USER_IRAM_START;
 procpu_iram_len = procpu_iram_end - procpu_iram_org;
 
-procpu_dram_org2 = ORIGIN(dram0_0_seg);
 procpu_dram_org = SRAM1_DRAM_START;
 procpu_dram_len = procpu_dram_end - procpu_dram_org;
 
@@ -32,16 +31,20 @@ procpu_drom_org = DCACHE0_START;
 procpu_drom_len = DCACHE0_SIZE - APPCPU_ROM_SIZE;
 
 #if defined(CONFIG_ESP_SPIRAM)
-procpu_extram_org = DCACHE0_START;
-procpu_extram_len = CONFIG_ESP_SPIRAM_SIZE;
+procpu_ext_dram_org = procpu_drom_org;
+procpu_ext_dram_len = CONFIG_ESP_SPIRAM_SIZE;
+procpu_ext_iram_org = procpu_irom_org;
+procpu_ext_iram_len = CONFIG_ESP_SPIRAM_SIZE;
 #endif
 
 /* Aliases */
-#define FLASH_CODE_REGION  irom0_0_seg
-#define RODATA_REGION      drom0_0_seg
-#define IRAM_REGION        iram0_0_seg
-#define RAMABLE_REGION     dram0_0_seg
-#define ROMABLE_REGION     FLASH
+#define FLASH_CODE_REGION irom0_0_seg
+#define RODATA_REGION     drom0_0_seg
+#define IRAM_REGION       iram0_0_seg
+#define RAMABLE_REGION    dram0_0_seg
+#define EXT_DRAM_REGION   ext_dram_seg
+#define EXT_IRAM_REGION   ext_iram_seg
+#define ROMABLE_REGION    FLASH
 
 /* Zephyr macro re-definitions */
 #undef GROUP_DATA_LINK_IN
@@ -70,7 +73,8 @@ MEMORY
   FLASH (R):       org = 0x80, len = FLASH_SIZE - 0x80
 #else
   /* Make safety margin in the FLASH memory size so the
-   * (esp_img_header + (n*esp_seg_headers)) would fit */
+   * (esp_img_header + (n*esp_seg_headers)) would fit
+   */
   FLASH (R):       org = 0x0, len = FLASH_SIZE - 0x100
 #endif /* CONFIG_BOOTLOADER_MCUBOOT */
 
@@ -84,30 +88,28 @@ MEMORY
    * A dummy section is used to avoid overlap. See `.ext_ram.dummy` in `sections.ld.in`
    */
 #if defined(CONFIG_ESP_SPIRAM)
-  /* `ext_[id]ram_seg` and `drom0_0_seg` share the same bus and the address region.
+  /* `ext_dram_seg` and `drom0_0_seg` share the same bus and the address region.
    * A dummy section is used to avoid overlap. See `.ext_ram.dummy` */
-  ext_dram_seg(RW): org = procpu_extram_org, len = procpu_extram_len
-  ext_iram_seg(RX): org = procpu_extram_org, len = procpu_extram_len
+  ext_dram_seg(RW): org = procpu_ext_dram_org, len = procpu_ext_dram_len
+  ext_iram_seg(RX): org = procpu_ext_iram_org, len = procpu_ext_iram_len
 #endif
 
-  /* RTC fast memory (executable). Persists over deep sleep.
-   */
+  /* RTC fast memory (executable). Persists over deep sleep. */
   rtc_iram_seg(RWX): org = 0x600fe000, len = 0x2000 - CONFIG_RESERVE_RTC_MEM
 
   /* We reduced the size of rtc_iram_seg by CONFIG_RESERVE_RTC_MEM value.
-     It reserves the amount of RTC fast memory that we use for this memory segment.
-     This segment is intended for keeping:
-       - (lower addr) rtc timer data (s_rtc_timer_retain_mem, see esp_clk.c files).
-       - (higher addr) bootloader rtc data (s_bootloader_retain_mem, when a Kconfig option is on).
-     The aim of this is to keep data that will not be moved around and have a fixed address.
-  */
+   * It reserves the amount of RTC fast memory that we use for this memory segment.
+   * This segment is intended for keeping:
+   *   - (lower addr) rtc timer data (s_rtc_timer_retain_mem, see esp_clk.c files).
+   *   - (higher addr) bootloader rtc data (s_bootloader_retain_mem, when a Kconfig option is on).
+   * The aim of this is to keep data that will not be moved around and have a fixed address.
+   */
 #if (CONFIG_RESERVE_RTC_MEM > 0)
   rtc_reserved_seg(RW): org = 0x600fe000 + 0x2000 - CONFIG_RESERVE_RTC_MEM,
                         len = CONFIG_RESERVE_RTC_MEM
 #endif
 
-  /* RTC slow memory (data accessible). Persists over deep sleep.
-   */
+  /* RTC slow memory (data accessible). Persists over deep sleep. */
   rtc_slow_seg(RW): org = 0x50000000, len = 0x2000
 
 #ifdef CONFIG_GEN_ISR_TABLES
@@ -396,6 +398,7 @@ SECTIONS
     *libzephyr.a:esp_psram_impl_octal.*(.literal .literal.* .text .text.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:spi_flash_hal_iram.*(.literal .text .literal.* .text.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -455,6 +458,7 @@ SECTIONS
     *libzephyr.a:systimer.*(.literal .literal.* .text .text.*)
     *libzephyr.a:mspi_timing_config.*(.literal .literal.* .text .text.*)
     *libzephyr.a:mspi_timing_tuning.*(.literal .literal.* .text .text.*)
+    *libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *(.literal.sar_periph_ctrl_power_enable .text.sar_periph_ctrl_power_enable)
 
     /* [mapping:soc_pm] */
@@ -637,6 +641,7 @@ SECTIONS
     *libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)
 
     /* [mapping:hal] */
+    *libzephyr.a:efuse_hal.*(.rodata .rodata.*)
     *libzephyr.a:mmu_hal.*(.rodata .rodata.*)
     *libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
     *libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)
@@ -983,22 +988,17 @@ SECTIONS
 
   /* --- START OF SPIRAM --- */
 
-  /**
-   * This section is required to skip flash rodata sections, because `ext_ram_seg`
-   * and `drom0_0_seg` are on the same bus
-   */
 #if defined(CONFIG_ESP_SPIRAM)
-
-  /* This section is required to skip flash rodata sections, because `ext_[id]ram_seg`
+  /* This section is required to skip flash rodata sections, because SPIRAM
    * and `drom0_0_seg` are on the same bus */
   .ext_ram.dummy (NOLOAD):
   {
     . = ADDR(.flash.rodata_end) - ORIGIN(ext_dram_seg);
     . = ALIGN (CACHE_ALIGN);
-  } GROUP_LINK_IN(ext_dram_seg)
+  } GROUP_LINK_IN(EXT_DRAM_REGION)
 
   /* This section holds .ext_ram.bss data, and will be put in PSRAM */
-  .ext_ram.bss (NOLOAD) :
+  .ext_ram.data (NOLOAD) :
   {
     _ext_ram_start = ABSOLUTE(.);
     _ext_ram_noinit_start = ABSOLUTE(.);
@@ -1009,7 +1009,9 @@ SECTIONS
     *libsubsys__net__lib__config.a:(.noinit .noinit.*)
     *libsubsys__net__ip.a:(.noinit .noinit.*)
     *libsubsys__net.a:(.noinit .noinit.*)
-#endif /* CONFIG_ESP32_WIFI_NET_ALLOC_SPIRAM */
+#endif
+    . = ALIGN(16);
+    *(.ext_ram_noinit.*)
     . = ALIGN(16);
     _ext_ram_noinit_end = ABSOLUTE(.);
 
@@ -1018,13 +1020,13 @@ SECTIONS
     . = ALIGN(16);
     _ext_ram_bss_end = ABSOLUTE(.);
 
-    _spiram_heap_start = ABSOLUTE(.);
-    . = . + CONFIG_ESP_SPIRAM_HEAP_SIZE - (_spiram_heap_start - _ext_ram_bss_start);
+    _ext_ram_heap_start = ABSOLUTE(.);
+    . += CONFIG_ESP_SPIRAM_HEAP_SIZE;
     . = ALIGN(16);
+    _ext_ram_heap_end = ABSOLUTE(.);
 
     _ext_ram_end = ABSOLUTE(.);
-  } GROUP_LINK_IN(ext_dram_seg)
-
+  } GROUP_LINK_IN(EXT_DRAM_REGION)
 #endif /* CONFIG_ESP_SPIRAM */
 
   /* --- END OF SPIRAM --- */
diff --git a/soc/espressif/esp32s3/esp32s3-mp.c b/soc/espressif/esp32s3/esp32s3-mp.c
index 80207a823d6d0..fadbd9224189e 100644
--- a/soc/espressif/esp32s3/esp32s3-mp.c
+++ b/soc/espressif/esp32s3/esp32s3-mp.c
@@ -191,4 +191,10 @@ int esp_appcpu_init(void)
 
 	return 0;
 }
+
+#if !defined(CONFIG_MCUBOOT)
+extern int esp_appcpu_init(void);
+SYS_INIT(esp_appcpu_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+#endif
+
 #endif /* CONFIG_SOC_ENABLE_APPCPU */
diff --git a/soc/espressif/esp32s3/hw_init.c b/soc/espressif/esp32s3/hw_init.c
index 9cb549119638f..a53f7753148b6 100644
--- a/soc/espressif/esp32s3/hw_init.c
+++ b/soc/espressif/esp32s3/hw_init.c
@@ -42,18 +42,6 @@ int hardware_init(void)
 #ifdef CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE
 	esp_cpu_configure_region_protection();
 #endif
-#if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
-	rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
-
-	if (cfg.enable == 1 && cfg.tieh == RTC_VDDSDIO_TIEH_1_8V) {
-		cfg.drefh = 3;
-		cfg.drefm = 3;
-		cfg.drefl = 3;
-		cfg.force = 1;
-		rtc_vddsdio_set_config(cfg);
-		esp_rom_delay_us(10);
-	}
-#endif /* CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V */
 
 	bootloader_clock_configure();
 
@@ -63,14 +51,8 @@ int hardware_init(void)
 	print_banner();
 #endif /* CONFIG_ESP_CONSOLE */
 
-	spi_flash_init_chip_state();
-	err = esp_flash_init_default_chip();
-	if (err != 0) {
-		ESP_EARLY_LOGE(TAG, "Failed to init flash chip, error %d", err);
-		return err;
-	}
-
 	cache_hal_init();
+
 	mmu_hal_init();
 
 	flash_update_id();
@@ -97,6 +79,7 @@ int hardware_init(void)
 	}
 
 	check_wdt_reset();
+
 	config_wdt();
 
 	soc_random_enable();
diff --git a/soc/espressif/esp32s3/mcuboot.ld b/soc/espressif/esp32s3/mcuboot.ld
index f0fb717d5d91b..7c5271ae50fcb 100644
--- a/soc/espressif/esp32s3/mcuboot.ld
+++ b/soc/espressif/esp32s3/mcuboot.ld
@@ -47,28 +47,17 @@ SECTIONS
     *(.stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
 
     *libarch__xtensa__core.a:xtensa_asm2_util.*(.literal .text .literal.* .text.*)
-    *liblib__libc__common.a:abort.*(.literal .text .literal.* .text.*)
-    *libdrivers__timer.a:xtensa_sys_timer.*(.literal .text .literal.* .text.*)
     *libarch__common.a:dynamic_isr.*(.literal .text .literal.* .text.*)
     *libarch__common.a:sw_isr_common.*(.literal .text .literal.* .text.*)
 
     *libapp.a:flash_map_extended.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:printk.*(.literal.printk .literal.vprintk .literal.char_out .text.printk .text.vprintk .text.char_out)
     *libzephyr.a:cbprintf_nano.*(.literal .text .literal.* .text.*)
     *libzephyr.a:cpu.*(.literal .text .literal.* .text.*)
     *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
     *libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
     *libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
-
-    *libzephyr.a:heap.*(.literal .text .literal.* .text.*)
-
-    *libkernel.a:kheap.*(.literal .text .literal.* .text.*)
-    *libkernel.a:mempool.*(.literal .text .literal.* .text.*)
     *libkernel.a:device.*(.literal .text .literal.* .text.*)
-    *libkernel.a:timeout.*(.literal .text .literal.* .text.*)
-
     *libzephyr.a:esp_loader.*(.literal .text .literal.* .text.*)
-    *libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
 
     *(.literal.esp_intr_disable .literal.esp_intr_disable.* .text.esp_intr_disable .text.esp_intr_disable.*)
     *(.literal.default_intr_handler .text.default_intr_handler .iram1.*.default_intr_handler)
diff --git a/soc/espressif/esp32s3/soc.c b/soc/espressif/esp32s3/soc.c
index 763ba341940f0..4e7f9bffc44e1 100644
--- a/soc/espressif/esp32s3/soc.c
+++ b/soc/espressif/esp32s3/soc.c
@@ -1,66 +1,23 @@
 /*
  * Copyright (c) 2017 Intel Corporation
+ * Copyright (c) 2025 Espressif Systems (Shanghai) CO LTD.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Include esp-idf headers first to avoid redefining BIT() macro */
 #include <soc.h>
-#include <soc/rtc_cntl_reg.h>
-#include <soc/timer_group_reg.h>
-#include <soc/ext_mem_defs.h>
-#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#include <xtensa/config/core-isa.h>
-#include <xtensa/corebits.h>
-#include <esp_private/spi_flash_os.h>
-#include <esp_private/esp_mmu_map_private.h>
-#include <esp_private/mspi_timing_tuning.h>
-#include <esp_flash_internal.h>
+#include <soc_init.h>
+#include <flash_init.h>
 #include <esp_private/cache_utils.h>
-#include <sdkconfig.h>
-
-#if CONFIG_ESP_SPIRAM
-#include "psram.h"
-#endif
-
-#include <zephyr/kernel_structs.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/types.h>
-#include <zephyr/linker/linker-defs.h>
-#include <kernel_internal.h>
-#include <zephyr/sys/util.h>
-
 #include <esp_private/system_internal.h>
-#include <esp32s3/rom/cache.h>
-#include <esp32s3/rom/rtc.h>
-#include <soc/syscon_reg.h>
-#include <hal/soc_hal.h>
-#include <hal/wdt_hal.h>
-#include <hal/cpu_hal.h>
-#include <esp_cpu.h>
-#include <soc/gpio_periph.h>
-#include <esp_err.h>
 #include <esp_timer.h>
-#include <esp_clk_internal.h>
-#include <esp_app_format.h>
-
+#include <psram.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <zephyr/sys/printk.h>
-#include "esp_log.h"
-
-#include <zephyr/drivers/flash.h>
-#include <zephyr/storage/flash_map.h>
-
-#define TAG "boot.esp32s3"
 
 extern void z_prep_c(void);
 extern void esp_reset_reason_init(void);
-extern int esp_appcpu_init(void);
 
-#ifndef CONFIG_MCUBOOT
-/*
- * This function is a container for SoC patches
- * that needs to be applied during the startup.
- */
 static void IRAM_ATTR esp_errata(void)
 {
 	/* Handle the clock gating fix */
@@ -77,32 +34,9 @@ static void IRAM_ATTR esp_errata(void)
 	Cache_Occupy_Addr(SOC_DROM_LOW, 0x4000);
 #endif
 }
-#endif /* CONFIG_MCUBOOT */
 
-/*
- * This is written in C rather than assembly since, during the port bring up,
- * Zephyr is being booted by the Espressif bootloader.  With it, the C stack
- * is already set up.
- */
-void IRAM_ATTR __esp_platform_start(void)
+void IRAM_ATTR __esp_platform_app_start(void)
 {
-	extern uint32_t _init_start;
-
-	/* Move the exception vector table to IRAM. */
-	__asm__ __volatile__("wsr %0, vecbase" : : "r"(&_init_start));
-
-	z_bss_zero();
-
-	/* Disable normal interrupts. */
-	__asm__ __volatile__("wsr %0, PS" : : "r"(PS_INTLEVEL(XCHAL_EXCM_LEVEL) | PS_UM | PS_WOE));
-
-	/* Initialize the architecture CPU pointer.  Some of the
-	 * initialization code wants a valid _current before
-	 * arch_kernel_init() is invoked.
-	 */
-	__asm__ __volatile__("wsr.MISC0 %0; rsync" : : "r"(&_kernel.cpus[0]));
-
-#ifndef CONFIG_MCUBOOT
 	/* Configure the mode of instruction cache : cache size, cache line size. */
 	esp_config_instruction_cache_mode();
 
@@ -114,38 +48,15 @@ void IRAM_ATTR __esp_platform_start(void)
 	/* Apply SoC patches */
 	esp_errata();
 
-	/* ESP-IDF/MCUboot 2nd stage bootloader enables RTC WDT to check on startup sequence
-	 * related issues in application. Hence disable that as we are about to start
-	 * Zephyr environment.
-	 */
-	wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL};
-
-	wdt_hal_write_protect_disable(&rtc_wdt_ctx);
-	wdt_hal_disable(&rtc_wdt_ctx);
-	wdt_hal_write_protect_enable(&rtc_wdt_ctx);
-
 	esp_reset_reason_init();
 
 	esp_timer_early_init();
 
-	esp_mspi_pin_init();
-
-	esp_flash_app_init();
-
-	mspi_timing_flash_tuning();
-
-	esp_mmu_map_init();
+	esp_flash_config();
 
 #if CONFIG_ESP_SPIRAM
 	esp_init_psram();
-#endif /* CONFIG_ESP_SPIRAM */
-
-#endif /* !CONFIG_MCUBOOT */
 
-	esp_intr_initialize();
-
-#if CONFIG_ESP_SPIRAM
-	/* Init Shared Multi Heap for PSRAM */
 	int err = esp_psram_smh_init();
 
 	if (err) {
@@ -159,6 +70,14 @@ void IRAM_ATTR __esp_platform_start(void)
 	CODE_UNREACHABLE;
 }
 
+void IRAM_ATTR __esp_platform_mcuboot_start(void)
+{
+	/* Start Zephyr */
+	z_prep_c();
+
+	CODE_UNREACHABLE;
+}
+
 /* Boot-time static default printk handler, possibly to be overridden later. */
 int IRAM_ATTR arch_printk_char_out(int c)
 {
@@ -171,10 +90,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
-
-#if defined(CONFIG_SOC_ENABLE_APPCPU) && !defined(CONFIG_MCUBOOT)
-extern int esp_appcpu_init(void);
-SYS_INIT(esp_appcpu_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
-#endif
diff --git a/soc/espressif/esp32s3/soc.h b/soc/espressif/esp32s3/soc.h
index 1d6d2204cf41c..f74376cc5ba58 100644
--- a/soc/espressif/esp32s3/soc.h
+++ b/soc/espressif/esp32s3/soc.h
@@ -25,7 +25,8 @@
 #include <xtensa/core-macros.h>
 #include <esp_private/esp_clk.h>
 
-void __esp_platform_start(void);
+void __esp_platform_mcuboot_start(void);
+void __esp_platform_app_start(void);
 
 static inline void esp32_set_mask32(uint32_t v, uint32_t mem_addr)
 {
diff --git a/soc/espressif/esp32s3/soc_appcpu.c b/soc/espressif/esp32s3/soc_appcpu.c
index a03304c87519e..517b1e187d753 100644
--- a/soc/espressif/esp32s3/soc_appcpu.c
+++ b/soc/espressif/esp32s3/soc_appcpu.c
@@ -72,8 +72,6 @@ void IRAM_ATTR __appcpu_start(void)
 
 	core_intr_matrix_clear();
 
-	esp_intr_initialize();
-
 	/* Start Zephyr */
 	z_prep_c();
 
@@ -89,5 +87,5 @@ int IRAM_ATTR arch_printk_char_out(int c)
 
 void sys_arch_reboot(int type)
 {
-	esp_restart_noos();
+	esp_restart();
 }
diff --git a/soc/espressif/soc.yml b/soc/espressif/soc.yml
index 1ec21c88aaea5..cd20df8a60b1c 100644
--- a/soc/espressif/soc.yml
+++ b/soc/espressif/soc.yml
@@ -25,3 +25,6 @@ family:
   - name: esp32c6
     socs:
     - name: esp32c6
+      cpuclusters:
+      - name: hpcore
+      - name: lpcore
diff --git a/soc/infineon/cat1a/psoc6_01/Kconfig.defconfig b/soc/infineon/cat1a/psoc6_01/Kconfig.defconfig
index acfefd580e24f..030ff86c57c55 100644
--- a/soc/infineon/cat1a/psoc6_01/Kconfig.defconfig
+++ b/soc/infineon/cat1a/psoc6_01/Kconfig.defconfig
@@ -13,6 +13,12 @@ config NUM_IRQS
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 100000000
 
+config MAIN_STACK_SIZE
+	default 2048
+
+config IDLE_STACK_SIZE
+	default 1024 if PM
+
 # add additional die specific params
 
 endif # SOC_DIE_PSOC6_01
diff --git a/soc/infineon/cat1a/psoc6_02/Kconfig.defconfig b/soc/infineon/cat1a/psoc6_02/Kconfig.defconfig
index e88081ea213ab..e5620c9ef959f 100644
--- a/soc/infineon/cat1a/psoc6_02/Kconfig.defconfig
+++ b/soc/infineon/cat1a/psoc6_02/Kconfig.defconfig
@@ -16,6 +16,12 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 config BUILD_OUTPUT_HEX
 	default y
 
+config MAIN_STACK_SIZE
+	default 2048
+
+config IDLE_STACK_SIZE
+	default 1024 if PM
+
 # add additional die specific params
 
 endif # SOC_DIE_PSOC6_02
diff --git a/soc/infineon/cat1a/psoc6_03/Kconfig.defconfig b/soc/infineon/cat1a/psoc6_03/Kconfig.defconfig
index 1516df04b3365..8ea4139ef3de1 100644
--- a/soc/infineon/cat1a/psoc6_03/Kconfig.defconfig
+++ b/soc/infineon/cat1a/psoc6_03/Kconfig.defconfig
@@ -13,6 +13,12 @@ config NUM_IRQS
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 100000000
 
+config MAIN_STACK_SIZE
+	default 2048
+
+config IDLE_STACK_SIZE
+	default 1024 if PM
+
 # add additional die specific params
 
 endif # SOC_DIE_PSOC6_03
diff --git a/soc/infineon/cat1a/psoc6_04/Kconfig.defconfig b/soc/infineon/cat1a/psoc6_04/Kconfig.defconfig
index 3ebc2882b79be..7c05e248055b6 100644
--- a/soc/infineon/cat1a/psoc6_04/Kconfig.defconfig
+++ b/soc/infineon/cat1a/psoc6_04/Kconfig.defconfig
@@ -13,6 +13,12 @@ config NUM_IRQS
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 100000000
 
+config MAIN_STACK_SIZE
+	default 2048
+
+config IDLE_STACK_SIZE
+	default 1024 if PM
+
 # add additional die specific params
 
 endif # SOC_DIE_PSOC6_04
diff --git a/soc/infineon/cat1b/cyw20829/Kconfig.defconfig b/soc/infineon/cat1b/cyw20829/Kconfig.defconfig
index 78b2cdd8956f2..b28a10847ca4e 100644
--- a/soc/infineon/cat1b/cyw20829/Kconfig.defconfig
+++ b/soc/infineon/cat1b/cyw20829/Kconfig.defconfig
@@ -22,6 +22,12 @@ config BUILD_OUTPUT_ADJUST_LMA
 	depends on XIP
 	default "0x60000000 - $(dt_node_reg_addr_hex,$(dt_nodelabel_path,flash0))"
 
+config MAIN_STACK_SIZE
+	default 2048
+
+config IDLE_STACK_SIZE
+	default 1024 if PM
+
 # add additional die specific params
 
 endif # SOC_DIE_CYW20829
diff --git a/soc/intel/intel_adsp/ace/ace-link.ld b/soc/intel/intel_adsp/ace/ace-link.ld
index 2a220746b5dd2..3e6d9428c5909 100644
--- a/soc/intel/intel_adsp/ace/ace-link.ld
+++ b/soc/intel/intel_adsp/ace/ace-link.ld
@@ -175,11 +175,14 @@ SECTIONS {
 
   /* Cold code in IMR memory */
   .cold : ALIGN(4096) {
+    __cold_start = .;
     *(.cold .cold.* )
+    __cold_end = .;
   } >imr
 
   /* Cold data. */
   .coldrodata : ALIGN(4096) {
+    __coldrodata_start = .;
     *(.coldrodata .coldrodata.*)
     _imr_end = .;
   } >imr
diff --git a/soc/intel/intel_adsp/ace/include/adsp_memory.h b/soc/intel/intel_adsp/ace/include/adsp_memory.h
index 1a643b0c42d1b..b4271da136835 100644
--- a/soc/intel/intel_adsp/ace/include/adsp_memory.h
+++ b/soc/intel/intel_adsp/ace/include/adsp_memory.h
@@ -68,6 +68,13 @@
 #define IMR_BOOT_LDR_STACK_BASE		(IMR_BOOT_LDR_BSS_BASE + IMR_BOOT_LDR_BSS_SIZE)
 #define IMR_BOOT_LDR_STACK_SIZE		0x1000
 
+/* ROM_EXT sections, used only for MMU mapping */
+#define IMR_ROM_EXT_OFFSET		0xB000
+#define IMR_ROM_EXT_CODE_BASE		(L3_MEM_BASE_ADDR + IMR_ROM_EXT_OFFSET)
+#define IMR_ROM_EXT_CODE_SIZE		0xD000
+#define IMR_ROM_EXT_DATABSS_BASE	(IMR_ROM_EXT_CODE_BASE + IMR_ROM_EXT_CODE_SIZE)
+#define IMR_ROM_EXT_DATABSS_SIZE	0x18000
+
 /* position of L3 heap, size of L3 heap - till end of the L3 memory */
 /* !!! FIXME: L3 heap base MUST be automatically calculated. !!! */
 #define IMR_L3_HEAP_BASE		(IMR_BOOT_LDR_STACK_BASE + IMR_BOOT_LDR_STACK_SIZE)
diff --git a/soc/intel/intel_adsp/ace/mmu_ace30.c b/soc/intel/intel_adsp/ace/mmu_ace30.c
index a59b231fbe3fe..ed233ddf8624a 100644
--- a/soc/intel/intel_adsp/ace/mmu_ace30.c
+++ b/soc/intel/intel_adsp/ace/mmu_ace30.c
@@ -19,6 +19,10 @@ extern char __common_rom_region_start[];
 extern char __common_rom_region_end[];
 extern char __common_ram_region_start[];
 extern char __common_ram_region_end[];
+extern char __cold_start[];
+extern char __cold_end[];
+extern char __coldrodata_start[];
+
 
 const struct xtensa_mmu_range xtensa_soc_mmu_ranges[] = {
 	{
@@ -71,6 +75,18 @@ const struct xtensa_mmu_range xtensa_soc_mmu_ranges[] = {
 		.name = "win3",
 	},
 	/* Map IMR */
+	{
+		.start = (uint32_t)IMR_ROM_EXT_CODE_BASE,
+		.end   = (uint32_t)(IMR_ROM_EXT_CODE_BASE + IMR_ROM_EXT_CODE_SIZE),
+		.attrs = XTENSA_MMU_PERM_X,
+		.name = "IMR_rom_ext_code",
+	},
+	{
+		.start = (uint32_t)IMR_ROM_EXT_DATABSS_BASE,
+		.end   = (uint32_t)(IMR_ROM_EXT_DATABSS_BASE + IMR_ROM_EXT_DATABSS_SIZE),
+		.attrs = XTENSA_MMU_PERM_W,
+		.name = "IMR_rom_ext_data_bss",
+	},
 	{
 		.start = (uint32_t)(IMR_BOOT_LDR_MANIFEST_BASE - IMR_BOOT_LDR_MANIFEST_SIZE),
 		.end   = (uint32_t)IMR_BOOT_LDR_MANIFEST_BASE,
@@ -106,6 +122,17 @@ const struct xtensa_mmu_range xtensa_soc_mmu_ranges[] = {
 		.attrs = XTENSA_MMU_PERM_W | XTENSA_MMU_CACHED_WB,
 		.name = "imr layout",
 	},
+	{
+		.start = (uint32_t)__cold_start,
+		.end   = (uint32_t)__cold_end,
+		.attrs = XTENSA_MMU_PERM_X,
+		.name = "imr cold",
+	},
+	{
+		.start = (uint32_t)__coldrodata_start,
+		.end   = (uint32_t)_imr_end,
+		.name = "imr coldrodata",
+	},
 	{
 		.start = (uint32_t)IMR_L3_HEAP_BASE,
 		.end   = (uint32_t)(IMR_L3_HEAP_BASE + IMR_L3_HEAP_SIZE),
@@ -133,7 +160,7 @@ const struct xtensa_mmu_range xtensa_soc_mmu_ranges[] = {
 	},
 	{
 		/* FIXME: definitely need more refinements... */
-		.start = (uint32_t)0x170000,
+		.start = (uint32_t)0x160000,
 		.end   = (uint32_t)0x180000,
 		.attrs = XTENSA_MMU_PERM_W,
 		.name = "hwreg1",
diff --git a/soc/intel/intel_adsp/tools/cavstool_client.py b/soc/intel/intel_adsp/tools/cavstool_client.py
index fe4adc0b8b18a..76e6d5d2208b7 100755
--- a/soc/intel/intel_adsp/tools/cavstool_client.py
+++ b/soc/intel/intel_adsp/tools/cavstool_client.py
@@ -62,7 +62,8 @@ def uploading(self, filename):
         fname = os.path.basename(filename)
         fsize = os.path.getsize(filename)
 
-        md5_tx = hashlib.md5(open(filename,'rb').read()).hexdigest()
+        md5_tx = hashlib.md5(open(filename,'rb').read(),
+                             usedforsecurity=False).hexdigest()
 
         # Pack the header and the expecting packed size is 78 bytes.
         # The header by convention includes:
diff --git a/soc/intel/intel_adsp/tools/remote-fw-service.py b/soc/intel/intel_adsp/tools/remote-fw-service.py
index 1d68a7db2a1d8..276f2323f867d 100755
--- a/soc/intel/intel_adsp/tools/remote-fw-service.py
+++ b/soc/intel/intel_adsp/tools/remote-fw-service.py
@@ -77,7 +77,7 @@ def receive_fw(self):
             return None
 
         # Check the MD5 of the firmware
-        md5_rx = hashlib.md5(total).hexdigest()
+        md5_rx = hashlib.md5(total, usedforsecurity=False).hexdigest()
         md5_tx = md5_tx_b.decode('utf-8')
 
         if md5_tx != md5_rx:
diff --git a/soc/intel/raptor_lake/soc_gpio.h b/soc/intel/raptor_lake/soc_gpio.h
index 6901cab92211f..79db43a7e7d2d 100644
--- a/soc/intel/raptor_lake/soc_gpio.h
+++ b/soc/intel/raptor_lake/soc_gpio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Intel Corporation
+ * Copyright (c) 2023-2025, Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,7 +15,7 @@
 #ifndef __SOC_GPIO_H_
 #define __SOC_GPIO_H_
 
-#if defined(CONFIG_BOARD_INTEL_RPL_S_CRB)
+#if defined(CONFIG_BOARD_INTEL_RPL_S_CRB) || defined(CONFIG_BOARD_INTEL_BTL_S_CRB)
 #define GPIO_INTEL_NR_SUBDEVS		13
 #define REG_PAD_OWNER_BASE		0x00A0
 #define REG_GPI_INT_STS_BASE		0x0200
diff --git a/soc/ite/ec/Kconfig.defconfig b/soc/ite/ec/Kconfig.defconfig
index 646437f9c5385..2030dc8a68c81 100644
--- a/soc/ite/ec/Kconfig.defconfig
+++ b/soc/ite/ec/Kconfig.defconfig
@@ -5,4 +5,8 @@ if SOC_FAMILY_ITE_EC
 
 rsource "*/Kconfig.defconfig.series"
 
+choice PM_POLICY
+	default PM_POLICY_CUSTOM if SOC_FAMILY_ITE_EC
+endchoice
+
 endif # SOC_FAMILY_ITE_EC
diff --git a/soc/ite/ec/common/CMakeLists.txt b/soc/ite/ec/common/CMakeLists.txt
index 120b54fe2d70a..39f3ded83289e 100644
--- a/soc/ite/ec/common/CMakeLists.txt
+++ b/soc/ite/ec/common/CMakeLists.txt
@@ -1,10 +1,8 @@
 zephyr_include_directories(.)
 
 zephyr_sources(
-  check_regs.c
   soc_irq.S
   soc_common_irq.c
-  vector.S
   )
 
 zephyr_sources_ifdef(CONFIG_PM power.c)
diff --git a/soc/ite/ec/common/chip_chipregs.h b/soc/ite/ec/common/chip_chipregs.h
deleted file mode 100644
index 08e15aeebba59..0000000000000
--- a/soc/ite/ec/common/chip_chipregs.h
+++ /dev/null
@@ -1,2275 +0,0 @@
-/*
- * Copyright (c) 2020 ITE Corporation. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef CHIP_CHIPREGS_H
-#define CHIP_CHIPREGS_H
-
-#include <zephyr/sys/util.h>
-
-#define EC_REG_BASE_ADDR 0x00f00000
-
-#ifdef _ASMLANGUAGE
-#define ECREG(x)        x
-#else
-
-/*
- * Macros for hardware registers access.
- */
-#define ECREG(x)		(*((volatile unsigned char *)(x)))
-#define ECREG_u16(x)		(*((volatile unsigned short *)(x)))
-#define ECREG_u32(x)		(*((volatile unsigned long  *)(x)))
-
-/*
- * MASK operation macros
- */
-#define SET_MASK(reg, bit_mask)			((reg) |= (bit_mask))
-#define CLEAR_MASK(reg, bit_mask)		((reg) &= (~(bit_mask)))
-#define IS_MASK_SET(reg, bit_mask)		(((reg) & (bit_mask)) != 0)
-#endif /* _ASMLANGUAGE */
-
-#ifndef REG_BASE_ADDR
-#define REG_BASE_ADDR				EC_REG_BASE_ADDR
-#endif
-
-/* Common definition */
-/*
- * EC clock frequency (PWM and tachometer driver need it to reply
- * to api or calculate RPM)
- */
-#ifdef CONFIG_SOC_IT8XXX2_EC_BUS_24MHZ
-#define EC_FREQ			MHZ(24)
-#else
-#define EC_FREQ			MHZ(8)
-
-#endif
-
-/* --- General Control (GCTRL) --- */
-#define IT8XXX2_GCTRL_BASE      0x00F02000
-#define IT8XXX2_GCTRL_EIDSR     ECREG(IT8XXX2_GCTRL_BASE + 0x31)
-#define IT8XXX2_GCTRL_PMER3     ECREG(IT8XXX2_GCTRL_BASE + 0x46)
-/* RISC-V JTAG Debug Interface Enable */
-#define IT8XXX2_GCTRL_JTAGEN    BIT(1)
-/* RISC-V JTAG Debug Interface Selection */
-#define IT8XXX2_GCTRL_JTAGSEL   BIT(0)
-#define IT8XXX2_GCTRL_JTAG      (IT8XXX2_GCTRL_JTAGEN | IT8XXX2_GCTRL_JTAGSEL)
-
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V2
-#define IT8XXX2_JTAG_PINS_BASE  ECREG(0xF01660)
-#define IT8XXX2_JTAG_VOLT_SET   ECREG(0xF01648)
-#elif CONFIG_SOC_IT8XXX2_REG_SET_V1
-#define IT8XXX2_JTAG_PINS_BASE  ECREG(0xF01610)
-#define IT8XXX2_JTAG_VOLT_SET   ECREG(0xF016e9)
-#endif
-
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V2
-/* --- External GPIO Control (EGPIO) --- */
-#define IT8XXX2_EGPIO_BASE      0x00F02100
-#define IT8XXX2_EGPIO_EGCR      ECREG(IT8XXX2_EGPIO_BASE + 0x04)
-
-/* EGPIO register fields */
-/*
- * 0x04: External GPIO Control
- * BIT(4): EXGPIO EGAD Pin Output Driving Disable
- */
-#define IT8XXX2_EGPIO_EEPODD    BIT(4)
-#endif
-
-/**
- *
- * (11xxh) Interrupt controller (INTC)
- *
- */
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
-#define ISR0			ECREG(EC_REG_BASE_ADDR + 0x3F00)
-#define ISR1			ECREG(EC_REG_BASE_ADDR + 0x3F01)
-#define ISR2			ECREG(EC_REG_BASE_ADDR + 0x3F02)
-#define ISR3			ECREG(EC_REG_BASE_ADDR + 0x3F03)
-#define ISR4			ECREG(EC_REG_BASE_ADDR + 0x3F14)
-#define ISR5			ECREG(EC_REG_BASE_ADDR + 0x3F18)
-#define ISR6			ECREG(EC_REG_BASE_ADDR + 0x3F1C)
-#define ISR7			ECREG(EC_REG_BASE_ADDR + 0x3F20)
-#define ISR8			ECREG(EC_REG_BASE_ADDR + 0x3F24)
-#define ISR9			ECREG(EC_REG_BASE_ADDR + 0x3F28)
-#define ISR10			ECREG(EC_REG_BASE_ADDR + 0x3F2C)
-#define ISR11			ECREG(EC_REG_BASE_ADDR + 0x3F30)
-#define ISR12			ECREG(EC_REG_BASE_ADDR + 0x3F34)
-#define ISR13			ECREG(EC_REG_BASE_ADDR + 0x3F38)
-#define ISR14			ECREG(EC_REG_BASE_ADDR + 0x3F3C)
-#define ISR15			ECREG(EC_REG_BASE_ADDR + 0x3F40)
-#define ISR16			ECREG(EC_REG_BASE_ADDR + 0x3F44)
-#define ISR17			ECREG(EC_REG_BASE_ADDR + 0x3F48)
-#define ISR18			ECREG(EC_REG_BASE_ADDR + 0x3F4C)
-#define ISR19			ECREG(EC_REG_BASE_ADDR + 0x3F50)
-#define ISR20			ECREG(EC_REG_BASE_ADDR + 0x3F54)
-#define ISR21			ECREG(EC_REG_BASE_ADDR + 0x3F58)
-#define ISR22			ECREG(EC_REG_BASE_ADDR + 0x3F5C)
-#define ISR23			ECREG(EC_REG_BASE_ADDR + 0x3F90)
-
-#define IER0			ECREG(EC_REG_BASE_ADDR + 0x3F04)
-#define IER1			ECREG(EC_REG_BASE_ADDR + 0x3F05)
-#define IER2			ECREG(EC_REG_BASE_ADDR + 0x3F06)
-#define IER3			ECREG(EC_REG_BASE_ADDR + 0x3F07)
-#define IER4			ECREG(EC_REG_BASE_ADDR + 0x3F15)
-#define IER5			ECREG(EC_REG_BASE_ADDR + 0x3F19)
-#define IER6			ECREG(EC_REG_BASE_ADDR + 0x3F1D)
-#define IER7			ECREG(EC_REG_BASE_ADDR + 0x3F21)
-#define IER8			ECREG(EC_REG_BASE_ADDR + 0x3F25)
-#define IER9			ECREG(EC_REG_BASE_ADDR + 0x3F29)
-#define IER10			ECREG(EC_REG_BASE_ADDR + 0x3F2D)
-#define IER11			ECREG(EC_REG_BASE_ADDR + 0x3F31)
-#define IER12			ECREG(EC_REG_BASE_ADDR + 0x3F35)
-#define IER13			ECREG(EC_REG_BASE_ADDR + 0x3F39)
-#define IER14			ECREG(EC_REG_BASE_ADDR + 0x3F3D)
-#define IER15			ECREG(EC_REG_BASE_ADDR + 0x3F41)
-#define IER16			ECREG(EC_REG_BASE_ADDR + 0x3F45)
-#define IER17			ECREG(EC_REG_BASE_ADDR + 0x3F49)
-#define IER18			ECREG(EC_REG_BASE_ADDR + 0x3F4D)
-#define IER19			ECREG(EC_REG_BASE_ADDR + 0x3F51)
-#define IER20			ECREG(EC_REG_BASE_ADDR + 0x3F55)
-#define IER21			ECREG(EC_REG_BASE_ADDR + 0x3F59)
-#define IER22			ECREG(EC_REG_BASE_ADDR + 0x3F5D)
-#define IER23			ECREG(EC_REG_BASE_ADDR + 0x3F91)
-
-#define IELMR0			ECREG(EC_REG_BASE_ADDR + 0x3F08)
-#define IELMR1			ECREG(EC_REG_BASE_ADDR + 0x3F09)
-#define IELMR2			ECREG(EC_REG_BASE_ADDR + 0x3F0A)
-#define IELMR3			ECREG(EC_REG_BASE_ADDR + 0x3F0B)
-#define IELMR4			ECREG(EC_REG_BASE_ADDR + 0x3F16)
-#define IELMR5			ECREG(EC_REG_BASE_ADDR + 0x3F1A)
-#define IELMR6			ECREG(EC_REG_BASE_ADDR + 0x3F1E)
-#define IELMR7			ECREG(EC_REG_BASE_ADDR + 0x3F22)
-#define IELMR8			ECREG(EC_REG_BASE_ADDR + 0x3F26)
-#define IELMR9			ECREG(EC_REG_BASE_ADDR + 0x3F2A)
-#define IELMR10			ECREG(EC_REG_BASE_ADDR + 0x3F2E)
-#define IELMR11			ECREG(EC_REG_BASE_ADDR + 0x3F32)
-#define IELMR12			ECREG(EC_REG_BASE_ADDR + 0x3F36)
-#define IELMR13			ECREG(EC_REG_BASE_ADDR + 0x3F3A)
-#define IELMR14			ECREG(EC_REG_BASE_ADDR + 0x3F3E)
-#define IELMR15			ECREG(EC_REG_BASE_ADDR + 0x3F42)
-#define IELMR16			ECREG(EC_REG_BASE_ADDR + 0x3F46)
-#define IELMR17			ECREG(EC_REG_BASE_ADDR + 0x3F4A)
-#define IELMR18			ECREG(EC_REG_BASE_ADDR + 0x3F4E)
-#define IELMR19			ECREG(EC_REG_BASE_ADDR + 0x3F52)
-#define IELMR20			ECREG(EC_REG_BASE_ADDR + 0x3F56)
-#define IELMR21			ECREG(EC_REG_BASE_ADDR + 0x3F5A)
-#define IELMR22			ECREG(EC_REG_BASE_ADDR + 0x3F5E)
-#define IELMR23			ECREG(EC_REG_BASE_ADDR + 0x3F92)
-
-#define IPOLR0			ECREG(EC_REG_BASE_ADDR + 0x3F0C)
-#define IPOLR1			ECREG(EC_REG_BASE_ADDR + 0x3F0D)
-#define IPOLR2			ECREG(EC_REG_BASE_ADDR + 0x3F0E)
-#define IPOLR3			ECREG(EC_REG_BASE_ADDR + 0x3F0F)
-#define IPOLR4			ECREG(EC_REG_BASE_ADDR + 0x3F17)
-#define IPOLR5			ECREG(EC_REG_BASE_ADDR + 0x3F1B)
-#define IPOLR6			ECREG(EC_REG_BASE_ADDR + 0x3F1F)
-#define IPOLR7			ECREG(EC_REG_BASE_ADDR + 0x3F23)
-#define IPOLR8			ECREG(EC_REG_BASE_ADDR + 0x3F27)
-#define IPOLR9			ECREG(EC_REG_BASE_ADDR + 0x3F2B)
-#define IPOLR10			ECREG(EC_REG_BASE_ADDR + 0x3F2F)
-#define IPOLR11			ECREG(EC_REG_BASE_ADDR + 0x3F33)
-#define IPOLR12			ECREG(EC_REG_BASE_ADDR + 0x3F37)
-#define IPOLR13			ECREG(EC_REG_BASE_ADDR + 0x3F3B)
-#define IPOLR14			ECREG(EC_REG_BASE_ADDR + 0x3F3F)
-#define IPOLR15			ECREG(EC_REG_BASE_ADDR + 0x3F43)
-#define IPOLR16			ECREG(EC_REG_BASE_ADDR + 0x3F47)
-#define IPOLR17			ECREG(EC_REG_BASE_ADDR + 0x3F4B)
-#define IPOLR18			ECREG(EC_REG_BASE_ADDR + 0x3F4F)
-#define IPOLR19			ECREG(EC_REG_BASE_ADDR + 0x3F53)
-#define IPOLR20			ECREG(EC_REG_BASE_ADDR + 0x3F57)
-#define IPOLR21			ECREG(EC_REG_BASE_ADDR + 0x3F5B)
-#define IPOLR22			ECREG(EC_REG_BASE_ADDR + 0x3F5F)
-#define IPOLR23			ECREG(EC_REG_BASE_ADDR + 0x3F93)
-#endif
-#define IVECT			ECREG(EC_REG_BASE_ADDR + 0x3F10)
-
-
-/*
- * TODO: use pinctrl node instead of following register declarations
- *       to fix in tcpm\it83xx_pd.h.
- */
-/* GPIO control register */
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
-#define GPCRF4			ECREG(EC_REG_BASE_ADDR + 0x163C)
-#define GPCRF5			ECREG(EC_REG_BASE_ADDR + 0x163D)
-#define GPCRH1			ECREG(EC_REG_BASE_ADDR + 0x1649)
-#define GPCRH2			ECREG(EC_REG_BASE_ADDR + 0x164A)
-#elif CONFIG_SOC_IT8XXX2_REG_SET_V2
-#define GPCRF4			ECREG(EC_REG_BASE_ADDR + 0x168C)
-#define GPCRF5			ECREG(EC_REG_BASE_ADDR + 0x168D)
-#define GPCRH1			ECREG(EC_REG_BASE_ADDR + 0x1699)
-#define GPCRH2			ECREG(EC_REG_BASE_ADDR + 0x169A)
-#endif
-
-/*
- * IT8XXX2 register structure size/offset checking macro function to mitigate
- * the risk of unexpected compiling results.
- */
-#define IT8XXX2_REG_SIZE_CHECK(reg_def, size) \
-	BUILD_ASSERT(sizeof(struct reg_def) == size, \
-		"Failed in size check of register structure!")
-#define IT8XXX2_REG_OFFSET_CHECK(reg_def, member, offset) \
-	BUILD_ASSERT(offsetof(struct reg_def, member) == offset, \
-		"Failed in offset check of register structure member!")
-
-/**
- *
- * (18xxh) PWM & SmartAuto Fan Control (PWM)
- *
- */
-#ifndef __ASSEMBLER__
-struct pwm_it8xxx2_regs {
-	/* 0x000: Channel0 Clock Prescaler */
-	volatile uint8_t C0CPRS;
-	/* 0x001: Cycle Time0 */
-	volatile uint8_t CTR;
-	/* 0x002~0x00A: Reserved1 */
-	volatile uint8_t Reserved1[9];
-	/* 0x00B: Prescaler Clock Frequency Select */
-	volatile uint8_t PCFSR;
-	/* 0x00C~0x00F: Reserved2 */
-	volatile uint8_t Reserved2[4];
-	/* 0x010: Cycle Time1 MSB */
-	volatile uint8_t CTR1M;
-	/* 0x011~0x022: Reserved3 */
-	volatile uint8_t Reserved3[18];
-	/* 0x023: PWM Clock Control */
-	volatile uint8_t ZTIER;
-	/* 0x024~0x026: Reserved4 */
-	volatile uint8_t Reserved4[3];
-	/* 0x027: Channel4 Clock Prescaler */
-	volatile uint8_t C4CPRS;
-	/* 0x028: Channel4 Clock Prescaler MSB */
-	volatile uint8_t C4MCPRS;
-	/* 0x029~0x02A: Reserved5 */
-	volatile uint8_t Reserved5[2];
-	/* 0x02B: Channel6 Clock Prescaler */
-	volatile uint8_t C6CPRS;
-	/* 0x02C: Channel6 Clock Prescaler MSB */
-	volatile uint8_t C6MCPRS;
-	/* 0x02D: Channel7 Clock Prescaler */
-	volatile uint8_t C7CPRS;
-	/* 0x02E: Channel7 Clock Prescaler MSB */
-	volatile uint8_t C7MCPRS;
-	/* 0x02F~0x040: Reserved6 */
-	volatile uint8_t reserved6[18];
-	/* 0x041: Cycle Time1 */
-	volatile uint8_t CTR1;
-	/* 0x042: Cycle Time2 */
-	volatile uint8_t CTR2;
-	/* 0x043: Cycle Time3 */
-	volatile uint8_t CTR3;
-	/* 0x044~0x048: Reserved7 */
-	volatile uint8_t reserved7[5];
-	/* 0x049: PWM Output Open-Drain Enable */
-	volatile uint8_t PWMODENR;
-};
-#endif /* !__ASSEMBLER__ */
-
-/* PWM register fields */
-/* 0x023: PWM Clock Control */
-#define IT8XXX2_PWM_PCCE		BIT(1)
-/* 0x048: Tachometer Switch Control */
-#define IT8XXX2_PWM_T0DVS		BIT(3)
-#define IT8XXX2_PWM_T0CHSEL		BIT(2)
-#define IT8XXX2_PWM_T1DVS		BIT(1)
-#define IT8XXX2_PWM_T1CHSEL		BIT(0)
-
-
-/* --- Wake-Up Control (WUC) --- */
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
-#define IT8XXX2_WUC_BASE   0x00F01B00
-
-/* TODO: should a defined interface for configuring wake-up interrupts */
-#define IT8XXX2_WUC_WUEMR1 (IT8XXX2_WUC_BASE + 0x00)
-#define IT8XXX2_WUC_WUEMR5 (IT8XXX2_WUC_BASE + 0x0c)
-#define IT8XXX2_WUC_WUESR1 (IT8XXX2_WUC_BASE + 0x04)
-#define IT8XXX2_WUC_WUESR5 (IT8XXX2_WUC_BASE + 0x0d)
-#define IT8XXX2_WUC_WUBEMR1 (IT8XXX2_WUC_BASE + 0x3c)
-#define IT8XXX2_WUC_WUBEMR5 (IT8XXX2_WUC_BASE + 0x0f)
-#endif
-
-/**
- *
- * (1Dxxh) Keyboard Matrix Scan control (KSCAN)
- *
- */
-#ifndef __ASSEMBLER__
-struct kscan_it8xxx2_regs {
-	/* 0x000: Keyboard Scan Out */
-	volatile uint8_t KBS_KSOL;
-	/* 0x001: Keyboard Scan Out */
-	volatile uint8_t KBS_KSOH1;
-	/* 0x002: Keyboard Scan Out Control */
-	volatile uint8_t KBS_KSOCTRL;
-	/* 0x003: Keyboard Scan Out */
-	volatile uint8_t KBS_KSOH2;
-	/* 0x004: Keyboard Scan In */
-	volatile uint8_t KBS_KSI;
-	/* 0x005: Keyboard Scan In Control */
-	volatile uint8_t KBS_KSICTRL;
-	/* 0x006: Keyboard Scan In [7:0] GPIO Control */
-	volatile uint8_t KBS_KSIGCTRL;
-	/* 0x007: Keyboard Scan In [7:0] GPIO Output Enable */
-	volatile uint8_t KBS_KSIGOEN;
-	/* 0x008: Keyboard Scan In [7:0] GPIO Data */
-	volatile uint8_t KBS_KSIGDAT;
-	/* 0x009: Keyboard Scan In [7:0] GPIO Data Mirror */
-	volatile uint8_t KBS_KSIGDMRR;
-	/* 0x00A: Keyboard Scan Out [15:8] GPIO Control */
-	volatile uint8_t KBS_KSOHGCTRL;
-	/* 0x00B: Keyboard Scan Out [15:8] GPIO Output Enable */
-	volatile uint8_t KBS_KSOHGOEN;
-	/* 0x00C: Keyboard Scan Out [15:8] GPIO Data Mirror */
-	volatile uint8_t KBS_KSOHGDMRR;
-	/* 0x00D: Keyboard Scan Out [7:0] GPIO Control */
-	volatile uint8_t KBS_KSOLGCTRL;
-	/* 0x00E: Keyboard Scan Out [7:0] GPIO Output Enable */
-	volatile uint8_t KBS_KSOLGOEN;
-};
-#endif /* !__ASSEMBLER__ */
-
-/* KBS register fields */
-/* 0x002: Keyboard Scan Out Control */
-#define IT8XXX2_KBS_KSOPU	BIT(2)
-#define IT8XXX2_KBS_KSOOD	BIT(0)
-/* 0x005: Keyboard Scan In Control */
-#define IT8XXX2_KBS_KSIPU	BIT(2)
-/* 0x00D: Keyboard Scan Out [7:0] GPIO Control */
-#define IT8XXX2_KBS_KSO2GCTRL	BIT(2)
-/* 0x00E: Keyboard Scan Out [7:0] GPIO Output Enable */
-#define IT8XXX2_KBS_KSO2GOEN	BIT(2)
-
-
-/**
- *
- * (1Fxxh) External Timer & External Watchdog (ETWD)
- *
- */
-#define WDT_IT8XXX2_REGS_BASE \
-	((struct wdt_it8xxx2_regs *)DT_REG_ADDR(DT_NODELABEL(twd0)))
-
-#ifndef __ASSEMBLER__
-struct wdt_it8xxx2_regs {
-	/* 0x000: Reserved1 */
-	volatile uint8_t reserved1;
-	/* 0x001: External Timer1/WDT Configuration */
-	volatile uint8_t ETWCFG;
-	/* 0x002: External Timer1 Prescaler */
-	volatile uint8_t ET1PSR;
-	/* 0x003: External Timer1 Counter High Byte */
-	volatile uint8_t ET1CNTLHR;
-	/* 0x004: External Timer1 Counter Low Byte */
-	volatile uint8_t ET1CNTLLR;
-	/* 0x005: External Timer1/WDT Control */
-	volatile uint8_t ETWCTRL;
-	/* 0x006: External WDT Counter Low Byte */
-	volatile uint8_t EWDCNTLR;
-	/* 0x007: External WDT Key */
-	volatile uint8_t EWDKEYR;
-	/* 0x008: Reserved2 */
-	volatile uint8_t reserved2;
-	/* 0x009: External WDT Counter High Byte */
-	volatile uint8_t EWDCNTHR;
-	/* 0x00A: External Timer2 Prescaler */
-	volatile uint8_t ET2PSR;
-	/* 0x00B: External Timer2 Counter High Byte */
-	volatile uint8_t ET2CNTLHR;
-	/* 0x00C: External Timer2 Counter Low Byte */
-	volatile uint8_t ET2CNTLLR;
-	/* 0x00D: Reserved3 */
-	volatile uint8_t reserved3;
-	/* 0x00E: External Timer2 Counter High Byte2 */
-	volatile uint8_t ET2CNTLH2R;
-};
-#endif /* !__ASSEMBLER__ */
-
-/* WDT register fields */
-/* 0x001: External Timer1/WDT Configuration */
-#define IT8XXX2_WDT_EWDKEYEN		BIT(5)
-#define IT8XXX2_WDT_EWDSRC		BIT(4)
-#define IT8XXX2_WDT_LEWDCNTL		BIT(3)
-#define IT8XXX2_WDT_LET1CNTL		BIT(2)
-#define IT8XXX2_WDT_LET1PS		BIT(1)
-#define IT8XXX2_WDT_LETWCFG		BIT(0)
-/* 0x002: External Timer1 Prescaler */
-#define IT8XXX2_WDT_ETPS_32P768_KHZ	0x00
-#define IT8XXX2_WDT_ETPS_1P024_KHZ	0x01
-#define IT8XXX2_WDT_ETPS_32_HZ		0x02
-/* 0x005: External Timer1/WDT Control */
-#define IT8XXX2_WDT_EWDSCEN		BIT(5)
-#define IT8XXX2_WDT_EWDSCMS		BIT(4)
-#define IT8XXX2_WDT_ET2TC		BIT(3)
-#define IT8XXX2_WDT_ET2RST		BIT(2)
-#define IT8XXX2_WDT_ET1TC		BIT(1)
-#define IT8XXX2_WDT_ET1RST		BIT(0)
-
-/* External Timer register fields */
-/* External Timer 3~8 control */
-#define IT8XXX2_EXT_ETX_COMB_RST_EN	(IT8XXX2_EXT_ETXCOMB | \
-					 IT8XXX2_EXT_ETXRST | \
-					 IT8XXX2_EXT_ETXEN)
-#define IT8XXX2_EXT_ETXCOMB		BIT(3)
-#define IT8XXX2_EXT_ETXRST		BIT(1)
-#define IT8XXX2_EXT_ETXEN		BIT(0)
-
-/* Control external timer3~8 */
-#define IT8XXX2_EXT_TIMER_BASE  DT_REG_ADDR(DT_NODELABEL(timer))  /*0x00F01F10*/
-#define IT8XXX2_EXT_CTRLX(n)    ECREG(IT8XXX2_EXT_TIMER_BASE + (n << 3))
-#define IT8XXX2_EXT_PSRX(n)     ECREG(IT8XXX2_EXT_TIMER_BASE + 0x01 + (n << 3))
-#define IT8XXX2_EXT_CNTX(n)     ECREG_u32(IT8XXX2_EXT_TIMER_BASE + 0x04 + \
-					(n << 3))
-#define IT8XXX2_EXT_CNTOX(n)    ECREG_u32(IT8XXX2_EXT_TIMER_BASE + 0x38 + \
-					(n << 2))
-
-/* Free run timer configurations */
-#define FREE_RUN_TIMER          EXT_TIMER_4
-#define FREE_RUN_TIMER_IRQ      DT_IRQ_BY_IDX(DT_NODELABEL(timer), 1, irq)
-/* Free run timer configurations */
-#define FREE_RUN_TIMER_FLAG     DT_IRQ_BY_IDX(DT_NODELABEL(timer), 1, flags)
-/* Free run timer max count is 36.4 hr (base on clock source 32768Hz) */
-#define FREE_RUN_TIMER_MAX_CNT  0xFFFFFFFFUL
-
-#ifndef __ASSEMBLER__
-enum ext_clk_src_sel {
-	EXT_PSR_32P768K = 0,
-	EXT_PSR_1P024K,
-	EXT_PSR_32,
-	EXT_PSR_EC_CLK,
-};
-/*
- * 24-bit timers: external timer 3, 5, and 7
- * 32-bit timers: external timer 4, 6, and 8
- */
-enum ext_timer_idx {
-	EXT_TIMER_3 = 0,	/* Event timer */
-	EXT_TIMER_4,		/* Free run timer */
-	EXT_TIMER_5,		/* Busy wait low timer */
-	EXT_TIMER_6,		/* Busy wait high timer */
-	EXT_TIMER_7,
-	EXT_TIMER_8,
-};
-#endif
-
-
-/*
- *
- * (2Cxxh) Platform Environment Control Interface (PECI)
- *
- */
-#ifndef __ASSEMBLER__
-struct peci_it8xxx2_regs {
-	/* 0x00: Host Status */
-	volatile uint8_t HOSTAR;
-	/* 0x01: Host Control */
-	volatile uint8_t HOCTLR;
-	/* 0x02: Host Command */
-	volatile uint8_t HOCMDR;
-	/* 0x03: Host Target Address */
-	volatile uint8_t HOTRADDR;
-	/* 0x04: Host Write Length */
-	volatile uint8_t HOWRLR;
-	/* 0x05: Host Read Length */
-	volatile uint8_t HORDLR;
-	/* 0x06: Host Write Data */
-	volatile uint8_t HOWRDR;
-	/* 0x07: Host Read Data */
-	volatile uint8_t HORDDR;
-	/* 0x08: Host Control 2 */
-	volatile uint8_t HOCTL2R;
-	/* 0x09: Received Write FCS value */
-	volatile uint8_t RWFCSV;
-	/* 0x0A: Received Read FCS value */
-	volatile uint8_t RRFCSV;
-	/* 0x0B: Write FCS Value */
-	volatile uint8_t WFCSV;
-	/* 0x0C: Read FCS Value */
-	volatile uint8_t RFCSV;
-	/* 0x0D: Assured Write FCS Value */
-	volatile uint8_t AWFCSV;
-	/* 0x0E: Pad Control */
-	volatile uint8_t PADCTLR;
-};
-#endif /* !__ASSEMBLER__ */
-
-/**
- *
- * (2Fxxh) USB Device Controller (USBDC) Registers
- *
- */
-#define EP_EXT_REGS_9X        1
-#define EP_EXT_REGS_BX        2
-#define EP_EXT_REGS_DX        3
-
-#ifndef __ASSEMBLER__
-
-/* EP0 to EP15 Enumeration */
-enum usb_dc_endpoints {
-	EP0,
-	EP1,
-	EP2,
-	EP3,
-	EP4,
-	EP5,
-	EP6,
-	EP7,
-	EP8,
-	EP9,
-	EP10,
-	EP11,
-	EP12,
-	EP13,
-	EP14,
-	EP15,
-	MAX_NUM_ENDPOINTS
-};
-
-union ep_ctrl_reg {
-	volatile uint8_t value;
-	struct {
-		volatile uint8_t enable_bit: 1;
-		volatile uint8_t ready_bit: 1;
-		volatile uint8_t outdata_sequence_bit: 1;
-		volatile uint8_t send_stall_bit: 1;
-		volatile uint8_t iso_enable_bit: 1;
-		volatile uint8_t direction_bit: 1;
-		volatile uint8_t reserved: 2;
-	} __packed fields;
-} __packed;
-
-struct it82xx2_usb_ep_regs {
-	union ep_ctrl_reg ep_ctrl;
-	volatile uint8_t ep_status;
-	volatile uint8_t ep_transtype_sts;
-	volatile uint8_t ep_nak_transtype_sts;
-};
-
-/* Reserved EP Extended Registers */
-struct ep_ext_regs_7x {
-	/* 0x75 Reserved */
-	volatile uint8_t ep_ext_ctrl_75;
-	/* 0x76 Reserved */
-	volatile uint8_t ep_ext_ctrl_76;
-	/* 0x77 Reserved */
-	volatile uint8_t ep_ext_ctrl_77;
-	/* 0x78 Reserved */
-	volatile uint8_t ep_ext_ctrl_78;
-	/* 0x79 Reserved */
-	volatile uint8_t ep_ext_ctrl_79;
-	/* 0x7A Reserved */
-	volatile uint8_t ep_ext_ctrl_7a;
-	/* 0x7B Reserved */
-	volatile uint8_t ep_ext_ctrl_7b;
-	/* 0x7C Reserved */
-	volatile uint8_t ep_ext_ctrl_7c;
-	/* 0x7D Reserved */
-	volatile uint8_t ep_ext_ctrl_7d;
-	/* 0x7E Reserved */
-	volatile uint8_t ep_ext_ctrl_7e;
-	/* 0x7F Reserved */
-	volatile uint8_t ep_ext_ctrl_7f;
-};
-
-/* From 98h to 9Dh, the EP45/67/89/1011/1213/1415 Extended Control Registers
- * are defined, and their bits definitions are as follows:
- *
- * Bit    Description
- *  7     Reserved
- *  6     EPPOINT5_ISO_ENABLE
- *  5     EPPOINT5_SEND_STALL
- *  4     EPPOINT5_OUT_DATA_SEQUENCE
- *  3     Reserved
- *  2     EPPOINT4_ISO_ENABLE
- *  1     EPPOINT4_SEND_STALL
- *  0     EPPOINT4_OUT_DATA_SEQUENCE
- *
- * Apparently, we can tell that the EP4 and EP5 share the same register, and
- * the EP6 and EP7 share the same one, and the rest EPs are defined in the
- * same way.
- */
-union epn0n1_extend_ctrl_reg {
-	volatile uint8_t value;
-	struct {
-		volatile uint8_t epn0_outdata_sequence_bit: 1;
-		volatile uint8_t epn0_send_stall_bit: 1;
-		volatile uint8_t epn0_iso_enable_bit: 1;
-		volatile uint8_t reserved0: 1;
-		volatile uint8_t epn1_outdata_sequence_bit: 1;
-		volatile uint8_t epn1_send_stall_bit: 1;
-		volatile uint8_t epn1_iso_enable_bit: 1;
-		volatile uint8_t reserved1: 1;
-	} __packed fields;
-} __packed;
-
-struct ep_ext_regs_9x {
-	/* 0x95 Reserved */
-	volatile uint8_t ep_ext_ctrl_95;
-	/* 0x96 Reserved */
-	volatile uint8_t ep_ext_ctrl_96;
-	/* 0x97 Reserved */
-	volatile uint8_t ep_ext_ctrl_97;
-	/* 0x98 ~ 0x9D EP45/67/89/1011/1213/1415 Extended Control Registers */
-	union epn0n1_extend_ctrl_reg epn0n1_ext_ctrl[6];
-	/* 0x9E Reserved */
-	volatile uint8_t ep_ext_ctrl_9e;
-	/* 0x9F Reserved */
-	volatile uint8_t ep_ext_ctrl_9f;
-};
-
-/* From BXh to BDh are EP FIFO 1-3 Control 0/1 Registers, and their
- * definitions as follows:
- * B8h: EP_FIFO1_CONTROL0_REG
- * B9h: EP_FIFO1_CONTROL1_REG
- * BAh: EP_FIFO2_CONTROL0_REG
- * BBh: EP_FIFO2_CONTROL1_REG
- * BCh: EP_FIFO3_CONTROL0_REG
- * BDh: EP_FIFO3_CONTROL1_REG
- *
- * For each one, its bits definitions are as follows:
- * (take EP_FIFO1_CONTROL1_REG as example, which controls from EP8 to EP15)
- *
- * Bit  Description
- *
- *  7   EP15 select FIFO1 as data buffer
- *  6   EP14 select FIFO1 as data buffer
- *  5   EP13 select FIFO1 as data buffer
- *  4   EP12 select FIFO1 as data buffer
- *  3   EP11 select FIFO1 as data buffer
- *  2   EP10 select FIFO1 as data buffer
- *  1   EP9 select FIFO1 as data buffer
- *  0   EP8 select FIFO1 as data buffer
- *
- *  1: Select
- *  0: Not select
- */
-struct ep_ext_regs_bx {
-	/* 0xB5 Reserved */
-	volatile uint8_t ep_ext_ctrl_b5;
-	/* 0xB6 Reserved */
-	volatile uint8_t ep_ext_ctrl_b6;
-	/* 0xB7 Reserved */
-	volatile uint8_t ep_ext_ctrl_b7;
-	/* 0xB8 ~ 0xBD EP FIFO 1-3 Control 0/1 Registers */
-	volatile uint8_t ep_fifo_ctrl[6];
-	/* 0xBE Reserved */
-	volatile uint8_t ep_ext_ctrl_be;
-	/* 0xBF Reserved */
-	volatile uint8_t ep_ext_ctrl_bf;
-};
-
-
-/* From D6h to DDh are EP Extended Control Registers, and their
- * definitions as follows:
- * D6h: EP0_EXT_CTRL1
- * D7h: EP0_EXT_CTRL2
- * D8h: EP1_EXT_CTRL1
- * D9h: EP1_EXT_CTRL2
- * DAh: EP2_EXT_CTRL1
- * DBh: EP2_EXT_CTRL2
- * DCh: EP3_EXT_CTRL1
- * DDh: EP3_EXT_CTRL2
- *
- * We classify them into 4 groups which each of them contains Control 1 and 2
- * according to the EP number as follows:
- */
-union epn_extend_ctrl1_reg {
-	volatile uint8_t value;
-	struct {
-		volatile uint8_t epn0_enable_bit: 1;
-		volatile uint8_t epn0_direction_bit: 1;
-		volatile uint8_t epn3_enable_bit: 1;
-		volatile uint8_t epn3_direction_bit: 1;
-		volatile uint8_t epn6_enable_bit: 1;
-		volatile uint8_t epn6_direction_bit: 1;
-		volatile uint8_t epn9_enable_bit: 1;
-		volatile uint8_t epn9_direction_bit: 1;
-	} __packed fields;
-} __packed;
-
-struct epn_ext_ctrl_regs {
-	/* 0xD6/0xD8/0xDA/0xDC EPN Extended Control1 Register */
-	union epn_extend_ctrl1_reg epn_ext_ctrl1;
-	/* 0xD7/0xD9/0xDB/0xDD EPB Extended Control2 Register */
-	volatile uint8_t epn_ext_ctrl2;
-};
-
-struct ep_ext_regs_dx {
-	/* 0xD5 Reserved */
-	volatile uint8_t ep_ext_ctrl_d5;
-	/* 0xD6 ~ 0xDD EPN Extended Control 1/2 Registers */
-	struct epn_ext_ctrl_regs epn_ext_ctrl[4];
-	/* 0xDE Reserved */
-	volatile uint8_t ep_ext_ctrl_de;
-	/* 0xDF Reserved */
-	volatile uint8_t ep_ext_ctrl_df;
-};
-
-
-/* The USB EPx FIFO Registers Definitions
- * EP0: 60h ~ 74h
- * EP1: 80h ~ 94h
- * EP2: A0h ~ B4h
- * EP3: C0h ~ D4h (D6h to DDh will be defined as marcos for usage)
- */
-struct it82xx2_usb_ep_fifo_regs {
-	/* 0x60 + ep * 0x20 : EP RX FIFO Data Register  */
-	volatile uint8_t ep_rx_fifo_data;
-	/* 0x61 + ep * 0x20 : EP RX FIFO DMA Count Register */
-	volatile uint8_t ep_rx_fifo_dma_count;
-	/* 0x62 + ep * 0x20 : EP RX FIFO Data Count MSB */
-	volatile uint8_t ep_rx_fifo_dcnt_msb;
-	/* 0x63 + ep * 0x20 : EP RX FIFO Data Count LSB */
-	volatile uint8_t ep_rx_fifo_dcnt_lsb;
-	/* 0x64 + ep * 0x20  : EP RX FIFO Control Register */
-	volatile uint8_t ep_rx_fifo_ctrl;
-	/* (0x65 ~ 0x6F) + ep * 0x20 */
-	volatile uint8_t reserved_65_6f_add_20[11];
-	/* 0x70 + ep * 0x20 : EP TX FIFO Data Register  */
-	volatile uint8_t ep_tx_fifo_data;
-	/* (0x71 ~ 0x73) + ep * 0x20 */
-	volatile uint8_t reserved_71_73_add_20[3];
-	/* 0x74 + ep * 0x20 : EP TX FIFO Control Register */
-	volatile uint8_t ep_tx_fifo_ctrl;
-	/* (0x75 ~ 0x7F) + ep * 0x20 */
-	union {
-		struct ep_ext_regs_7x ep_res;
-		struct ep_ext_regs_9x ext_4_15;
-		struct ep_ext_regs_bx fifo_ctrl;
-		struct ep_ext_regs_dx ext_0_3;
-	};
-
-};
-
-/* USB Control registers */
-#define USB_IT82XX2_REGS_BASE \
-	((struct usb_it82xx2_regs *)DT_REG_ADDR(DT_NODELABEL(usb0)))
-
-/* Bit definitions of the register Port0/Port1 MISC Control: 0XE4/0xE8 */
-#define PULL_DOWN_EN	BIT(4)
-
-struct usb_it82xx2_regs {
-	/* 0x00:  Host TX Contrl Register */
-	volatile uint8_t host_tx_ctrl;
-	/* 0x01:  Host TX Transaction Type Register */
-	volatile uint8_t host_tx_trans_type;
-	/* 0x02:  Host TX Line Control Register */
-	volatile uint8_t host_tx_line_ctrl;
-	/* 0x03:  Host TX SOF Enable Register */
-	volatile uint8_t host_tx_sof_enable;
-	/* 0x04:  Host TX Address Register */
-	volatile uint8_t host_tx_addr;
-	/* 0x05:  Host TX EP Number Register */
-	volatile uint8_t host_tx_endp;
-	/* 0x06:  Host Frame Number MSP Register */
-	volatile uint8_t host_frame_num_msp;
-	/* 0x07:  Host Frame Number LSP Register */
-	volatile uint8_t host_frame_num_lsp;
-	/* 0x08:  Host Interrupt Status Register */
-	volatile uint8_t host_interrupt_status;
-	/* 0x09:  Host Interrupt Mask Register */
-	volatile uint8_t host_interrupt_mask;
-	/* 0x0A:  Host RX Status Register */
-	volatile uint8_t host_rx_status;
-	/* 0x0B:  Host RX PID Register */
-	volatile uint8_t host_rx_pid;
-	/* 0x0C:  MISC Control Register */
-	volatile uint8_t misc_control;
-	/* 0x0D:  MISC Status Register */
-	volatile uint8_t misc_status;
-	/* 0x0E:  Host RX Connect State Register */
-	volatile uint8_t host_rx_connect_state;
-	/* 0x0F:  Host SOF Timer MSB Register */
-	volatile uint8_t host_sof_timer_msb;
-	/* 0x10 ~ 0x1F:  Reserved Registers 10h - 1Fh */
-	volatile uint8_t reserved_10_1f[16];
-	/* 0x20:  Host RX FIFO Data Port Register */
-	volatile uint8_t host_rx_fifo_data;
-	/* 0x21:  Host RX FIFO DMA Input Data Count Register */
-	volatile uint8_t host_rx_fifo_dma_data_count;
-	/* 0x22:  Host TX FIFO Data Count MSB Register */
-	volatile uint8_t host_rx_fifo_data_count_msb;
-	/* 0x23:  Host TX FIFO Data Count LSB Register */
-	volatile uint8_t host_rx_fifo_data_count_lsb;
-	/* 0x24:  Host RX FIFO Data Port Register */
-	volatile uint8_t host_rx_fifo_control;
-	/* 0x25 ~ 0x2F:  Reserved Registers 25h - 2Fh */
-	volatile uint8_t reserved_25_2f[11];
-	/* 0x30:  Host TX FIFO Data Port Register */
-	volatile uint8_t host_tx_fifo_data;
-	/* 0x31 ~ 0x3F:  Reserved Registers 31h - 3Fh */
-	volatile uint8_t reserved_31_3f[15];
-	/* 0x40 ~ 0x4F: Endpoint Registers 40h - 4Fh */
-	struct it82xx2_usb_ep_regs usb_ep_regs[4];
-	/* 0x50:  Device Controller Control Register */
-	volatile uint8_t dc_control;
-	/* 0x51:  Device Controller LINE Status Register */
-	volatile uint8_t dc_line_status;
-	/* 0x52:  Device Controller Interrupt Status Register */
-	volatile uint8_t dc_interrupt_status;
-	/* 0x53:  Device Controller Interrupt Mask Register */
-	volatile uint8_t dc_interrupt_mask;
-	/* 0x54:  Device Controller Address Register */
-	volatile uint8_t dc_address;
-	/* 0x55:  Device Controller Frame Number MSP Register */
-	volatile uint8_t dc_frame_num_msp;
-	/* 0x56:  Device Controller Frame Number LSP Register */
-	volatile uint8_t dc_frame_num_lsp;
-	/* 0x57 ~ 0x5F:  Reserved Registers 57h - 5Fh */
-	volatile uint8_t reserved_57_5f[9];
-	/* 0x60 ~ 0xDF: EP FIFO Registers 60h - DFh */
-	struct it82xx2_usb_ep_fifo_regs fifo_regs[4];
-	/* 0xE0:  Host/Device Control Register */
-	volatile uint8_t host_device_control;
-	/* 0xE1 ~ 0xE3:  Reserved Registers E1h - E3h */
-	volatile uint8_t reserved_e1_e3[3];
-	/* 0xE4:  Port0 MISC Control Register */
-	volatile uint8_t port0_misc_control;
-	/* 0xE5 ~ 0xE7:  Reserved Registers E5h - E7h */
-	volatile uint8_t reserved_e5_e7[3];
-	/* 0xE8:  Port1 MISC Control Register */
-	volatile uint8_t port1_misc_control;
-};
-#endif /* #ifndef __ASSEMBLER__ */
-
-/**
- *
- * (37xxh, 38xxh) USBPD Controller
- *
- */
-#ifndef __ASSEMBLER__
-struct usbpd_it8xxx2_regs {
-	/* 0x000~0x003: Reserved1 */
-	volatile uint8_t Reserved1[4];
-	/* 0x004: CC General Configuration */
-	volatile uint8_t CCGCR;
-	/* 0x005: CC Channel Setting */
-	volatile uint8_t CCCSR;
-	/* 0x006: CC Pad Setting */
-	volatile uint8_t CCPSR;
-};
-#endif /* !__ASSEMBLER__ */
-
-/* USBPD controller register fields */
-/* 0x004: CC General Configuration */
-#define IT8XXX2_USBPD_DISABLE_CC			BIT(7)
-#define IT8XXX2_USBPD_DISABLE_CC_VOL_DETECTOR		BIT(6)
-#define IT8XXX2_USBPD_CC_SELECT_RP_RESERVED		(BIT(3) | BIT(2) | BIT(1))
-#define IT8XXX2_USBPD_CC_SELECT_RP_DEF			(BIT(3) | BIT(2))
-#define IT8XXX2_USBPD_CC_SELECT_RP_1A5			BIT(3)
-#define IT8XXX2_USBPD_CC_SELECT_RP_3A0			BIT(2)
-#define IT8XXX2_USBPD_CC1_CC2_SELECTION			BIT(0)
-/* 0x005: CC Channel Setting */
-#define IT8XXX2_USBPD_CC2_DISCONNECT			BIT(7)
-#define IT8XXX2_USBPD_CC2_DISCONNECT_5_1K_TO_GND	BIT(6)
-#define IT8XXX2_USBPD_CC1_DISCONNECT			BIT(3)
-#define IT8XXX2_USBPD_CC1_DISCONNECT_5_1K_TO_GND	BIT(2)
-#define IT8XXX2_USBPD_CC1_CC2_RP_RD_SELECT		(BIT(1) | BIT(5))
-/* 0x006: CC Pad Setting */
-#define IT8XXX2_USBPD_DISCONNECT_5_1K_CC2_DB		BIT(6)
-#define IT8XXX2_USBPD_DISCONNECT_POWER_CC2		BIT(5)
-#define IT8XXX2_USBPD_DISCONNECT_5_1K_CC1_DB		BIT(2)
-#define IT8XXX2_USBPD_DISCONNECT_POWER_CC1		BIT(1)
-
-
-/**
- *
- * (10xxh) Shared Memory Flash Interface Bridge (SMFI) registers
- *
- */
-#ifndef __ASSEMBLER__
-struct smfi_it8xxx2_regs {
-	volatile uint8_t reserved1[59];
-	/* 0x3B: EC-Indirect memory address 0 */
-	volatile uint8_t SMFI_ECINDAR0;
-	/* 0x3C: EC-Indirect memory address 1 */
-	volatile uint8_t SMFI_ECINDAR1;
-	/* 0x3D: EC-Indirect memory address 2 */
-	volatile uint8_t SMFI_ECINDAR2;
-	/* 0x3E: EC-Indirect memory address 3 */
-	volatile uint8_t SMFI_ECINDAR3;
-	/* 0x3F: EC-Indirect memory data */
-	volatile uint8_t SMFI_ECINDDR;
-	/* 0x40: Scratch SRAM 0 address low byte */
-	volatile uint8_t SMFI_SCAR0L;
-	/* 0x41: Scratch SRAM 0 address middle byte */
-	volatile uint8_t SMFI_SCAR0M;
-	/* 0x42: Scratch SRAM 0 address high byte */
-	volatile uint8_t SMFI_SCAR0H;
-	volatile uint8_t reserved1_1[23];
-	/* 0x5A: Host RAM Window Control */
-	volatile uint8_t SMFI_HRAMWC;
-	/* 0x5B: Host RAM Window 0 Base Address [11:4] */
-	volatile uint8_t SMFI_HRAMW0BA;
-	/* 0x5C: Host RAM Window 1 Base Address [11:4] */
-	volatile uint8_t SMFI_HRAMW1BA;
-	/* 0x5D: Host RAM Window 0 Access Allow Size */
-	volatile uint8_t SMFI_HRAMW0AAS;
-	/* 0x5E: Host RAM Window 1 Access Allow Size */
-	volatile uint8_t SMFI_HRAMW1AAS;
-	volatile uint8_t reserved2[67];
-	/* 0xA2: Flash control 6 */
-	volatile uint8_t SMFI_FLHCTRL6R;
-	volatile uint8_t reserved3[46];
-};
-#endif /* !__ASSEMBLER__ */
-
-/* SMFI register fields */
-/* EC-Indirect read internal flash */
-#define EC_INDIRECT_READ_INTERNAL_FLASH BIT(6)
-/* Enable EC-indirect page program command */
-#define IT8XXX2_SMFI_MASK_ECINDPP BIT(3)
-/* Scratch SRAM 0 address(BIT(19)) */
-#define IT8XXX2_SMFI_SC0A19 BIT(7)
-/* Scratch SRAM enable */
-#define IT8XXX2_SMFI_SCAR0H_ENABLE BIT(3)
-
-/* H2RAM Path Select. 1b: H2RAM through LPC IO cycle. */
-#define SMFI_H2RAMPS           BIT(4)
-/* H2RAM Window 1 Enable */
-#define SMFI_H2RAMW1E          BIT(1)
-/* H2RAM Window 0 Enable */
-#define SMFI_H2RAMW0E          BIT(0)
-
-/* Host RAM Window x Write Protect Enable (All protected) */
-#define SMFI_HRAMWXWPE_ALL     (BIT(5) | BIT(4))
-
-
-/**
- *
- * (16xxh) General Purpose I/O Port (GPIO) registers
- *
- */
-#define GPIO_IT8XXX2_REG_BASE \
-	((struct gpio_it8xxx2_regs *)DT_REG_ADDR(DT_NODELABEL(gpiogcr)))
-
-#ifndef __ASSEMBLER__
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
-struct gpio_it8xxx2_regs {
-	/* 0x00: General Control */
-	volatile uint8_t GPIO_GCR;
-	/* 0x01-D0: Reserved1 */
-	volatile uint8_t reserved1[208];
-	/* 0xD1: General Control 25 */
-	volatile uint8_t GPIO_GCR25;
-	/* 0xD2: General Control 26 */
-	volatile uint8_t GPIO_GCR26;
-	/* 0xD3: General Control 27 */
-	volatile uint8_t GPIO_GCR27;
-	/* 0xD4: General Control 28 */
-	volatile uint8_t GPIO_GCR28;
-	/* 0xD5: General Control 31 */
-	volatile uint8_t GPIO_GCR31;
-	/* 0xD6: General Control 32 */
-	volatile uint8_t GPIO_GCR32;
-	/* 0xD7: General Control 33 */
-	volatile uint8_t GPIO_GCR33;
-	/* 0xD8-0xDF: Reserved2 */
-	volatile uint8_t reserved2[8];
-	/* 0xE0: General Control 16 */
-	volatile uint8_t GPIO_GCR16;
-	/* 0xE1: General Control 17 */
-	volatile uint8_t GPIO_GCR17;
-	/* 0xE2: General Control 18 */
-	volatile uint8_t GPIO_GCR18;
-	/* 0xE3: Reserved3 */
-	volatile uint8_t reserved3;
-	/* 0xE4: General Control 19 */
-	volatile uint8_t GPIO_GCR19;
-	/* 0xE5: General Control 20 */
-	volatile uint8_t GPIO_GCR20;
-	/* 0xE6: General Control 21 */
-	volatile uint8_t GPIO_GCR21;
-	/* 0xE7: General Control 22 */
-	volatile uint8_t GPIO_GCR22;
-	/* 0xE8: General Control 23 */
-	volatile uint8_t GPIO_GCR23;
-	/* 0xE9: General Control 24 */
-	volatile uint8_t GPIO_GCR24;
-	/* 0xEA-0xEC: Reserved4 */
-	volatile uint8_t reserved4[3];
-	/* 0xED: General Control 30 */
-	volatile uint8_t GPIO_GCR30;
-	/* 0xEE: General Control 29 */
-	volatile uint8_t GPIO_GCR29;
-	/* 0xEF: Reserved5 */
-	volatile uint8_t reserved5;
-	/* 0xF0: General Control 1 */
-	volatile uint8_t GPIO_GCR1;
-	/* 0xF1: General Control 2 */
-	volatile uint8_t GPIO_GCR2;
-	/* 0xF2: General Control 3 */
-	volatile uint8_t GPIO_GCR3;
-	/* 0xF3: General Control 4 */
-	volatile uint8_t GPIO_GCR4;
-	/* 0xF4: General Control 5 */
-	volatile uint8_t GPIO_GCR5;
-	/* 0xF5: General Control 6 */
-	volatile uint8_t GPIO_GCR6;
-	/* 0xF6: General Control 7 */
-	volatile uint8_t GPIO_GCR7;
-	/* 0xF7: General Control 8 */
-	volatile uint8_t GPIO_GCR8;
-	/* 0xF8: General Control 9 */
-	volatile uint8_t GPIO_GCR9;
-	/* 0xF9: General Control 10 */
-	volatile uint8_t GPIO_GCR10;
-	/* 0xFA: General Control 11 */
-	volatile uint8_t GPIO_GCR11;
-	/* 0xFB: General Control 12 */
-	volatile uint8_t GPIO_GCR12;
-	/* 0xFC: General Control 13 */
-	volatile uint8_t GPIO_GCR13;
-	/* 0xFD: General Control 14 */
-	volatile uint8_t GPIO_GCR14;
-	/* 0xFE: General Control 15 */
-	volatile uint8_t GPIO_GCR15;
-	/* 0xFF: Power Good Watch Control */
-	volatile uint8_t GPIO_PGWCR;
-};
-#elif CONFIG_SOC_IT8XXX2_REG_SET_V2
-struct gpio_it8xxx2_regs {
-	/* 0x00: General Control */
-	volatile uint8_t GPIO_GCR;
-	/* 0x01-0x0F: Reserved1 */
-	volatile uint8_t reserved1[15];
-	/* 0x10: General Control 1 */
-	volatile uint8_t GPIO_GCR1;
-	/* 0x11: General Control 2 */
-	volatile uint8_t GPIO_GCR2;
-	/* 0x12: General Control 3 */
-	volatile uint8_t GPIO_GCR3;
-	/* 0x13: General Control 4 */
-	volatile uint8_t GPIO_GCR4;
-	/* 0x14: General Control 5 */
-	volatile uint8_t GPIO_GCR5;
-	/* 0x15: General Control 6 */
-	volatile uint8_t GPIO_GCR6;
-	/* 0x16: General Control 7 */
-	volatile uint8_t GPIO_GCR7;
-	/* 0x17: General Control 8 */
-	volatile uint8_t GPIO_GCR8;
-	/* 0x18: General Control 9 */
-	volatile uint8_t GPIO_GCR9;
-	/* 0x19: General Control 10 */
-	volatile uint8_t GPIO_GCR10;
-	/* 0x1A: General Control 11 */
-	volatile uint8_t GPIO_GCR11;
-	/* 0x1B: General Control 12 */
-	volatile uint8_t GPIO_GCR12;
-	/* 0x1C: General Control 13 */
-	volatile uint8_t GPIO_GCR13;
-	/* 0x1D: General Control 14 */
-	volatile uint8_t GPIO_GCR14;
-	/* 0x1E: General Control 15 */
-	volatile uint8_t GPIO_GCR15;
-	/* 0x1F: Power Good Watch Control */
-	volatile uint8_t GPIO_PGWCR;
-	/* 0x20: General Control 16 */
-	volatile uint8_t GPIO_GCR16;
-	/* 0x21: General Control 17 */
-	volatile uint8_t GPIO_GCR17;
-	/* 0x22: General Control 18 */
-	volatile uint8_t GPIO_GCR18;
-	/* 0x23: Reserved2 */
-	volatile uint8_t reserved2;
-	/* 0x24: General Control 19 */
-	volatile uint8_t GPIO_GCR19;
-	/* 0x25: Reserved3 */
-	volatile uint8_t reserved3;
-	/* 0x26: General Control 21 */
-	volatile uint8_t GPIO_GCR21;
-	/* 0x27-0x28: Reserved4 */
-	volatile uint8_t reserved4[2];
-	/* 0x29: General Control 24 */
-	volatile uint8_t GPIO_GCR24;
-	/* 0x2A-0x2C: Reserved5 */
-	volatile uint8_t reserved5[3];
-	/* 0x2D: General Control 30 */
-	volatile uint8_t GPIO_GCR30;
-	/* 0x2E: General Control 29 */
-	volatile uint8_t GPIO_GCR29;
-};
-
-/* GPIO register fields */
-/* 0x16: General Control 7 */
-#define IT8XXX2_GPIO_SMB2PS                BIT(7)
-#define IT8XXX2_GPIO_SMB3PS                BIT(6)
-#define IT8XXX2_GPIO_SMB5PS                BIT(5)
-
-#endif
-#endif /* !__ASSEMBLER__ */
-
-/* GPIO register fields */
-/* 0x00: General Control */
-#define IT8XXX2_GPIO_LPCRSTEN              (BIT(2) | BIT(1))
-#define IT8XXX2_GPIO_GCR_ESPI_RST_D2       0x2
-#define IT8XXX2_GPIO_GCR_ESPI_RST_POS      1
-#define IT8XXX2_GPIO_GCR_ESPI_RST_EN_MASK  (0x3 << IT8XXX2_GPIO_GCR_ESPI_RST_POS)
-/* 0xF0: General Control 1 */
-#define IT8XXX2_GPIO_U2CTRL_SIN1_SOUT1_EN  BIT(2)
-#define IT8XXX2_GPIO_U1CTRL_SIN0_SOUT0_EN  BIT(0)
-/* 0xE6: General Control 21 */
-#define IT8XXX2_GPIO_GPH1VS                BIT(1)
-#define IT8XXX2_GPIO_GPH2VS                BIT(0)
-
-#define KSIX_KSOX_KBS_GPIO_MODE     BIT(7)
-#define KSIX_KSOX_GPIO_OUTPUT       BIT(6)
-#define KSIX_KSOX_GPIO_PULLUP       BIT(2)
-#define KSIX_KSOX_GPIO_PULLDOWN     BIT(1)
-
-#define GPCR_PORT_PIN_MODE_INPUT    BIT(7)
-#define GPCR_PORT_PIN_MODE_OUTPUT   BIT(6)
-#define GPCR_PORT_PIN_MODE_PULLUP   BIT(2)
-#define GPCR_PORT_PIN_MODE_PULLDOWN BIT(1)
-
-/*
- * If both PULLUP and PULLDOWN are set to 1b, the corresponding port would be
- * configured as tri-state.
- */
-#define GPCR_PORT_PIN_MODE_TRISTATE	(GPCR_PORT_PIN_MODE_INPUT |  \
-					 GPCR_PORT_PIN_MODE_PULLUP | \
-					 GPCR_PORT_PIN_MODE_PULLDOWN)
-
-/* --- GPIO --- */
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
-#define IT8XXX2_GPIO_BASE  0x00F01600
-
-#define IT8XXX2_GPIO_GCRX(offset) ECREG(IT8XXX2_GPIO_BASE + (offset))
-#define IT8XXX2_GPIO_GCR25_OFFSET 0xd1
-#define IT8XXX2_GPIO_GCR26_OFFSET 0xd2
-#define IT8XXX2_GPIO_GCR27_OFFSET 0xd3
-#define IT8XXX2_GPIO_GCR28_OFFSET 0xd4
-#define IT8XXX2_GPIO_GCR31_OFFSET 0xd5
-#define IT8XXX2_GPIO_GCR32_OFFSET 0xd6
-#define IT8XXX2_GPIO_GCR33_OFFSET 0xd7
-#define IT8XXX2_GPIO_GCR19_OFFSET 0xe4
-#define IT8XXX2_GPIO_GCR20_OFFSET 0xe5
-#define IT8XXX2_GPIO_GCR21_OFFSET 0xe6
-#define IT8XXX2_GPIO_GCR22_OFFSET 0xe7
-#define IT8XXX2_GPIO_GCR23_OFFSET 0xe8
-#define IT8XXX2_GPIO_GCR24_OFFSET 0xe9
-#define IT8XXX2_GPIO_GCR30_OFFSET 0xed
-#define IT8XXX2_GPIO_GCR29_OFFSET 0xee
-#endif
-
-/*
- * TODO: use pinctrl node instead of following register declarations
- *       to fix in tcpm\it83xx_pd.h.
- */
-#define IT8XXX2_GPIO2_BASE 0x00F03E00
-
-#define IT8XXX2_GPIO_GPCRP0     ECREG(IT8XXX2_GPIO2_BASE + 0x18)
-#define IT8XXX2_GPIO_GPCRP1     ECREG(IT8XXX2_GPIO2_BASE + 0x19)
-
-
-/**
- *
- * (19xxh) Analog to Digital Converter (ADC) registers
- *
- */
-#ifndef __ASSEMBLER__
-
-/* Data structure to define ADC channel 13-16 control registers. */
-struct adc_vchs_ctrl_t {
-	/* 0x60: Voltage Channel Control */
-	volatile uint8_t VCHCTL;
-	/* 0x61: Voltage Channel Data Buffer MSB */
-	volatile uint8_t VCHDATM;
-	/* 0x62: Voltage Channel Data Buffer LSB */
-	volatile uint8_t VCHDATL;
-};
-
-struct adc_it8xxx2_regs {
-	/* 0x00: ADC Status */
-	volatile uint8_t ADCSTS;
-	/* 0x01: ADC Configuration */
-	volatile uint8_t ADCCFG;
-	/* 0x02: ADC Clock Control */
-	volatile uint8_t ADCCTL;
-	/* 0x03: General Control */
-	volatile uint8_t ADCGCR;
-	/* 0x04: Voltage Channel 0 Control */
-	volatile uint8_t VCH0CTL;
-	/* 0x05: Calibration Data Control */
-	volatile uint8_t KDCTL;
-	/* 0x06-0x17: Reserved1 */
-	volatile uint8_t reserved1[18];
-	/* 0x18: Voltage Channel 0 Data Buffer LSB */
-	volatile uint8_t VCH0DATL;
-	/* 0x19: Voltage Channel 0 Data Buffer MSB */
-	volatile uint8_t VCH0DATM;
-	/* 0x1a-0x43: Reserved2 */
-	volatile uint8_t reserved2[42];
-	/* 0x44: ADC Data Valid Status */
-	volatile uint8_t ADCDVSTS;
-	/* 0x45-0x54: Reserved2-1 */
-	volatile uint8_t reserved2_1[16];
-	/* 0x55: ADC Input Voltage Mapping Full-Scale Code Selection 1 */
-	volatile uint8_t ADCIVMFSCS1;
-	/* 0x56: ADC Input Voltage Mapping Full-Scale Code Selection 2 */
-	volatile uint8_t ADCIVMFSCS2;
-	/* 0x57: ADC Input Voltage Mapping Full-Scale Code Selection 3 */
-	volatile uint8_t ADCIVMFSCS3;
-	/* 0x58-0x5f: Reserved3 */
-	volatile uint8_t reserved3[8];
-	/* 0x60-0x6b: ADC channel 13~16 controller */
-	struct adc_vchs_ctrl_t adc_vchs_ctrl[4];
-	/* 0x6c: ADC Data Valid Status 2 */
-	volatile uint8_t ADCDVSTS2;
-	/* 0x6d-0xef: Reserved4 */
-	volatile uint8_t reserved4[131];
-	/* 0xf0: ADC Clock Control Register 1 */
-	volatile uint8_t ADCCTL1;
-};
-#endif /* !__ASSEMBLER__ */
-
-/* ADC conversion time select 1 */
-#define IT8XXX2_ADC_ADCCTS1			BIT(7)
-/* Analog accuracy initialization */
-#define IT8XXX2_ADC_AINITB			BIT(3)
-/* ADC conversion time select 0 */
-#define IT8XXX2_ADC_ADCCTS0			BIT(5)
-/* ADC module enable */
-#define IT8XXX2_ADC_ADCEN			BIT(0)
-/* ADC data buffer keep enable */
-#define IT8XXX2_ADC_DBKEN			BIT(7)
-/* W/C data valid flag */
-#define IT8XXX2_ADC_DATVAL			BIT(7)
-/* Data valid interrupt of adc */
-#define IT8XXX2_ADC_INTDVEN			BIT(5)
-/* Voltage channel enable (Channel 4~7 and 13~16) */
-#define IT8XXX2_ADC_VCHEN			BIT(4)
-/* Automatic hardware calibration enable */
-#define IT8XXX2_ADC_AHCE			BIT(7)
-/* 0x046, 0x049, 0x04c, 0x06e, 0x071, 0x074: Voltage comparator x control */
-#define IT8XXX2_VCMP_CMPEN			BIT(7)
-#define IT8XXX2_VCMP_CMPINTEN			BIT(6)
-#define IT8XXX2_VCMP_GREATER_THRESHOLD		BIT(5)
-#define IT8XXX2_VCMP_EDGE_TRIGGER		BIT(4)
-#define IT8XXX2_VCMP_GPIO_ACTIVE_LOW		BIT(3)
-/* 0x077~0x07c: Voltage comparator x channel select MSB */
-#define IT8XXX2_VCMP_VCMPXCSELM			BIT(0)
-
-/**
- *
- * (1Exxh) Clock and Power Management (ECPM) registers
- *
- */
-#define IT8XXX2_ECPM_BASE  0x00F01E00
-
-#ifndef __ASSEMBLER__
-enum chip_pll_mode {
-	CHIP_PLL_DOZE = 0,
-	CHIP_PLL_SLEEP = 1,
-	CHIP_PLL_DEEP_DOZE = 3,
-};
-#endif
-/*
- * TODO: use ecpm_it8xxx2_regs instead of following register declarations
- *       to fix in soc.c.
- */
-#define IT8XXX2_ECPM_PLLCTRL    ECREG(IT8XXX2_ECPM_BASE + 0x03)
-#define IT8XXX2_ECPM_AUTOCG     ECREG(IT8XXX2_ECPM_BASE + 0x04)
-#define IT8XXX2_ECPM_CGCTRL3R   ECREG(IT8XXX2_ECPM_BASE + 0x05)
-#define IT8XXX2_ECPM_PLLFREQR   ECREG(IT8XXX2_ECPM_BASE + 0x06)
-#define IT8XXX2_ECPM_PLLCSS     ECREG(IT8XXX2_ECPM_BASE + 0x08)
-#define IT8XXX2_ECPM_SCDCR0     ECREG(IT8XXX2_ECPM_BASE + 0x0c)
-#define IT8XXX2_ECPM_SCDCR1     ECREG(IT8XXX2_ECPM_BASE + 0x0d)
-#define IT8XXX2_ECPM_SCDCR2     ECREG(IT8XXX2_ECPM_BASE + 0x0e)
-#define IT8XXX2_ECPM_SCDCR3     ECREG(IT8XXX2_ECPM_BASE + 0x0f)
-#define IT8XXX2_ECPM_SCDCR4     ECREG(IT8XXX2_ECPM_BASE + 0x10)
-#define IT8XXX2_ECPM_PFACC0R    ECREG(IT8XXX2_ECPM_BASE + 0x20)
-#define IT8XXX2_ECPM_PFACC1R    ECREG(IT8XXX2_ECPM_BASE + 0x21)
-#define IT8XXX2_ECPM_PFACC2R    ECREG(IT8XXX2_ECPM_BASE + 0x40)
-#define IT8XXX2_ECPM_LCOTF2     ECREG(IT8XXX2_ECPM_BASE + 0x54)
-#define IT8XXX2_ECPM_LCOCR      ECREG(IT8XXX2_ECPM_BASE + 0x55)
-#define IT8XXX2_ECPM_LCOCR1     ECREG(IT8XXX2_ECPM_BASE + 0x57)
-
-/*
- * The count number of the counter for 25 ms register.
- * The 25 ms register is calculated by (count number *1.024 kHz).
- */
-
-#define I2C_CLK_LOW_TIMEOUT		255 /* ~=249 ms */
-
-/**
- *
- * (1Cxxh) SMBus Interface (SMB) registers
- *
- */
-#define IT8XXX2_SMB_BASE            0x00F01C00
-#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
-#define IT8XXX2_SMB_4P7USL          ECREG(IT8XXX2_SMB_BASE + 0x00)
-#define IT8XXX2_SMB_4P0USL          ECREG(IT8XXX2_SMB_BASE + 0x01)
-#define IT8XXX2_SMB_300NS           ECREG(IT8XXX2_SMB_BASE + 0x02)
-#define IT8XXX2_SMB_250NS           ECREG(IT8XXX2_SMB_BASE + 0x03)
-#define IT8XXX2_SMB_25MS            ECREG(IT8XXX2_SMB_BASE + 0x04)
-#define IT8XXX2_SMB_45P3USL         ECREG(IT8XXX2_SMB_BASE + 0x05)
-#define IT8XXX2_SMB_45P3USH         ECREG(IT8XXX2_SMB_BASE + 0x06)
-#define IT8XXX2_SMB_4P7A4P0H        ECREG(IT8XXX2_SMB_BASE + 0x07)
-#define IT8XXX2_SMB_SLVISELR        ECREG(IT8XXX2_SMB_BASE + 0x08)
-#define IT8XXX2_SMB_SCLKTS(ch)      ECREG(IT8XXX2_SMB_BASE + 0x09 + ch)
-#define IT8XXX2_SMB_MSTFCTRL1       ECREG(IT8XXX2_SMB_BASE + 0x0D)
-#define IT8XXX2_SMB_MSTFSTS1        ECREG(IT8XXX2_SMB_BASE + 0x0E)
-#define IT8XXX2_SMB_MSTFCTRL2       ECREG(IT8XXX2_SMB_BASE + 0x0F)
-#define IT8XXX2_SMB_MSTFSTS2        ECREG(IT8XXX2_SMB_BASE + 0x10)
-#define IT8XXX2_SMB_SMB45CHS        ECREG(IT8XXX2_SMB_BASE + 0x11)
-#define IT8XXX2_SMB_I2CW2RF         ECREG(IT8XXX2_SMB_BASE + 0x12)
-#define IT8XXX2_SMB_IWRFISTA        ECREG(IT8XXX2_SMB_BASE + 0x13)
-#define IT8XXX2_SMB_SMB01CHS        ECREG(IT8XXX2_SMB_BASE + 0x20)
-#define IT8XXX2_SMB_SMB23CHS        ECREG(IT8XXX2_SMB_BASE + 0x21)
-#define IT8XXX2_SMB_SFFCTL          ECREG(IT8XXX2_SMB_BASE + 0x55)
-#define IT8XXX2_SMB_HOSTA(base)     ECREG(base + 0x00)
-#define IT8XXX2_SMB_HOCTL(base)     ECREG(base + 0x01)
-#define IT8XXX2_SMB_HOCMD(base)     ECREG(base + 0x02)
-#define IT8XXX2_SMB_TRASLA(base)    ECREG(base + 0x03)
-#define IT8XXX2_SMB_D0REG(base)     ECREG(base + 0x04)
-#define IT8XXX2_SMB_D1REG(base)     ECREG(base + 0x05)
-#define IT8XXX2_SMB_HOBDB(base)     ECREG(base + 0x06)
-#define IT8XXX2_SMB_PECERC(base)    ECREG(base + 0x07)
-#define IT8XXX2_SMB_SMBPCTL(base)   ECREG(base + 0x0A)
-#define IT8XXX2_SMB_HOCTL2(base)    ECREG(base + 0x10)
-#elif CONFIG_SOC_IT8XXX2_REG_SET_V2
-#define IT8XXX2_SMB_SLVISEL         ECREG(IT8XXX2_SMB_BASE + 0x08)
-#define IT8XXX2_SMB_SMB01CHS        ECREG(IT8XXX2_SMB_BASE + 0x09)
-#define IT8XXX2_SMB_SMB23CHS        ECREG(IT8XXX2_SMB_BASE + 0x0A)
-#define IT8XXX2_SMB_SMB45CHS        ECREG(IT8XXX2_SMB_BASE + 0x0B)
-#define IT8XXX2_SMB_SCLKTS_BRGS     ECREG(IT8XXX2_SMB_BASE + 0x80)
-#define IT8XXX2_SMB_SCLKTS_BRGM     ECREG(IT8XXX2_SMB_BASE + 0x81)
-#define IT8XXX2_SMB_CHSBRG          ECREG(IT8XXX2_SMB_BASE + 0x82)
-#define IT8XXX2_SMB_CHSMOT          ECREG(IT8XXX2_SMB_BASE + 0x83)
-
-/* SMBus register fields */
-/* 0x80: SMCLK Timing Setting Register Bridge Slave */
-#define IT8XXX2_SMB_PREDEN            BIT(7)
-#endif
-
-/**
- * Enhanced SMBus/I2C Interface
- * Ch_D: 0x00F03680, Ch_E: 0x00F03500, Ch_F: 0x00F03580
- * Ch_D: ch = 0x03, Ch_E: ch = 0x00, Ch_F: ch = 0x01
- */
-#define IT8XXX2_I2C_DRR(base)         ECREG(base + 0x00)
-#define IT8XXX2_I2C_PSR(base)         ECREG(base + 0x01)
-#define IT8XXX2_I2C_HSPR(base)        ECREG(base + 0x02)
-#define IT8XXX2_I2C_STR(base)         ECREG(base + 0x03)
-#define IT8XXX2_I2C_DHTR(base)        ECREG(base + 0x04)
-#define IT8XXX2_I2C_TOR(base)         ECREG(base + 0x05)
-#define IT8XXX2_I2C_DTR(base)         ECREG(base + 0x08)
-#define IT8XXX2_I2C_CTR(base)         ECREG(base + 0x09)
-#define IT8XXX2_I2C_CTR1(base)        ECREG(base + 0x0A)
-#define IT8XXX2_I2C_BYTE_CNT_H(base)  ECREG(base + 0x0B)
-#define IT8XXX2_I2C_BYTE_CNT_L(base)  ECREG(base + 0x0C)
-#define IT8XXX2_I2C_IRQ_ST(base)      ECREG(base + 0x0D)
-#define IT8XXX2_I2C_IDR(base)         ECREG(base + 0x06)
-#define IT8XXX2_I2C_TOS(base)         ECREG(base + 0x07)
-#define IT8XXX2_I2C_SLV_NUM_H(base)   ECREG(base + 0x10)
-#define IT8XXX2_I2C_SLV_NUM_L(base)   ECREG(base + 0x11)
-#define IT8XXX2_I2C_STR2(base)        ECREG(base + 0x12)
-#define IT8XXX2_I2C_NST(base)         ECREG(base + 0x13)
-#define IT8XXX2_I2C_TO_ARB_ST(base)   ECREG(base + 0x18)
-#define IT8XXX2_I2C_ERR_ST(base)      ECREG(base + 0x19)
-#define IT8XXX2_I2C_FST(base)         ECREG(base + 0x1B)
-#define IT8XXX2_I2C_EM(base)          ECREG(base + 0x1C)
-#define IT8XXX2_I2C_MODE_SEL(base)    ECREG(base + 0x1D)
-#define IT8XXX2_I2C_IDR2(base)        ECREG(base + 0x1F)
-#define IT8XXX2_I2C_CTR2(base)        ECREG(base + 0x20)
-#define IT8XXX2_I2C_RAMHA(base)       ECREG(base + 0x23)
-#define IT8XXX2_I2C_RAMLA(base)       ECREG(base + 0x24)
-#define IT8XXX2_I2C_RAMHA2(base)      ECREG(base + 0x2C)
-#define IT8XXX2_I2C_RAMLA2(base)      ECREG(base + 0x2D)
-#define IT8XXX2_I2C_CMD_ADDH(base)    ECREG(base + 0x25)
-#define IT8XXX2_I2C_CMD_ADDL(base)    ECREG(base + 0x26)
-#define IT8XXX2_I2C_RAMH2A(base)      ECREG(base + 0x50)
-#define IT8XXX2_I2C_CMD_ADDH2(base)   ECREG(base + 0x52)
-
-/* SMBus/I2C register fields */
-/* 0x09-0xB: SMCLK Timing Setting */
-#define IT8XXX2_SMB_SMCLKS_1M         4
-#define IT8XXX2_SMB_SMCLKS_400K       3
-#define IT8XXX2_SMB_SMCLKS_100K       2
-#define IT8XXX2_SMB_SMCLKS_50K        1
-
-/* 0x0E: SMBus FIFO Status 1 */
-#define IT8XXX2_SMB_FIFO1_EMPTY       BIT(7)
-#define IT8XXX2_SMB_FIFO1_FULL        BIT(6)
-/* 0x0D: SMBus FIFO Control 1 */
-/* 0x0F: SMBus FIFO Control 2 */
-#define IT8XXX2_SMB_BLKDS             BIT(4)
-#define IT8XXX2_SMB_FFEN              BIT(3)
-#define IT8XXX2_SMB_FFCHSEL2_B        0
-#define IT8XXX2_SMB_FFCHSEL2_C        BIT(0)
-/* 0x10: SMBus FIFO Status 2 */
-#define IT8XXX2_SMB_FIFO2_EMPTY       BIT(7)
-#define IT8XXX2_SMB_FIFO2_FULL        BIT(6)
-/* 0x12: I2C Wr To Rd FIFO */
-#define IT8XXX2_SMB_MAIF              BIT(7)
-#define IT8XXX2_SMB_MBCIF             BIT(6)
-#define IT8XXX2_SMB_MCIFI             BIT(2)
-#define IT8XXX2_SMB_MBIFI             BIT(1)
-#define IT8XXX2_SMB_MAIFI             BIT(0)
-/* 0x13: I2C Wr To Rd FIFO Interrupt Status */
-#define IT8XXX2_SMB_MCIFID            BIT(2)
-#define IT8XXX2_SMB_MAIFID            BIT(0)
-/* 0x41 0x81 0xC1: Host Control */
-#define IT8XXX2_SMB_SRT               BIT(6)
-#define IT8XXX2_SMB_LABY              BIT(5)
-#define IT8XXX2_SMB_SMCD_EXTND        BIT(4) | BIT(3) | BIT(2)
-#define IT8XXX2_SMB_KILL              BIT(1)
-#define IT8XXX2_SMB_INTREN            BIT(0)
-/* 0x43 0x83 0xC3: Transmit Slave Address */
-#define IT8XXX2_SMB_DIR               BIT(0)
-/* 0x4A 0x8A 0xCA: SMBus Pin Control */
-#define IT8XXX2_SMB_SMBDCS            BIT(1)
-#define IT8XXX2_SMB_SMBCS             BIT(0)
-/* 0x50 0x90 0xD0: Host Control 2 */
-#define IT8XXX2_SMB_SMD_TO_EN         BIT(4)
-#define IT8XXX2_SMB_I2C_SW_EN         BIT(3)
-#define IT8XXX2_SMB_I2C_SW_WAIT       BIT(2)
-#define IT8XXX2_SMB_I2C_EN            BIT(1)
-#define IT8XXX2_SMB_SMHEN             BIT(0)
-/* 0x55: Slave A FIFO Control */
-#define IT8XXX2_SMB_HSAPE             BIT(1)
-/* 0x03: Status Register */
-#define IT8XXX2_I2C_BYTE_DONE         BIT(7)
-#define IT8XXX2_I2C_RW                BIT(2)
-#define IT8XXX2_I2C_INT_PEND          BIT(1)
-/* 0x04: Data Hold Time */
-#define IT8XXX2_I2C_SOFT_RST          BIT(7)
-/* 0x07: Time Out Status */
-#define IT8XXX2_I2C_CLK_STRETCH       BIT(7)
-#define IT8XXX2_I2C_SCL_IN            BIT(2)
-#define IT8XXX2_I2C_SDA_IN            BIT(0)
-/* 0x09: Control Register */
-#define IT8XXX2_I2C_INT_EN            BIT(6)
-#define IT8XXX2_I2C_ACK               BIT(3)
-#define IT8XXX2_I2C_HALT              BIT(0)
-/* 0x0A: Control 1 */
-#define IT8XXX2_I2C_COMQ_EN           BIT(7)
-#define IT8XXX2_I2C_MDL_EN            BIT(1)
-/* 0x0C: Byte count */
-#define IT8XXX2_I2C_DMA_ADDR_RELOAD   BIT(5)
-#define IT8XXX2_I2C_BYTE_CNT_ENABLE   BIT(3)
-/* 0x0D: Interrupt Status */
-#define IT8XXX2_I2C_CNT_HOLD          BIT(4)
-#define IT8XXX2_I2C_IDW_CLR           BIT(3)
-#define IT8XXX2_I2C_IDR_CLR           BIT(2)
-#define IT8XXX2_I2C_SLVDATAFLG        BIT(1)
-#define IT8XXX2_I2C_P_CLR             BIT(0)
-/* 0x13: Nack Status */
-#define IT8XXX2_I2C_NST_CNS           BIT(7)
-#define IT8XXX2_I2C_NST_ID_NACK       BIT(3)
-/* 0x18: Timeout and Arbiter Status */
-#define IT8XXX2_I2C_SCL_TIMEOUT_EN    BIT(7)
-#define IT8XXX2_I2C_SDA_TIMEOUT_EN    BIT(6)
-/* 0x19: Error Status */
-#define IT8XXX2_I2C_ERR_ST_DEV1_EIRQ  BIT(0)
-/* 0x1B: Finish Status */
-#define IT8XXX2_I2C_FST_DEV1_IRQ      BIT(4)
-/* 0x1C: Error Mask */
-#define IT8XXX2_I2C_EM_DEV1_IRQ       BIT(4)
-
-/*
- * TODO: use gctrl_it8xxx2_regs instead of following register declarations
- *       to fix in cros_flash_it8xxx2.c, cros_shi_it8xxx2.c and tcpm\it8xxx2.c.
- */
-/* --- General Control (GCTRL) --- */
-#define IT83XX_GCTRL_BASE 0x00F02000
-
-#define IT83XX_GCTRL_CHIPID1         ECREG(IT83XX_GCTRL_BASE + 0x85)
-#define IT83XX_GCTRL_CHIPID2         ECREG(IT83XX_GCTRL_BASE + 0x86)
-#define IT83XX_GCTRL_CHIPVER         ECREG(IT83XX_GCTRL_BASE + 0x02)
-#define IT83XX_GCTRL_MCCR3           ECREG(IT83XX_GCTRL_BASE + 0x20)
-#define IT83XX_GCTRL_SPISLVPFE             BIT(6)
-#define IT83XX_GCTRL_EWPR0PFH(i)     ECREG(IT83XX_GCTRL_BASE + 0x60 + i)
-#define IT83XX_GCTRL_EWPR0PFD(i)     ECREG(IT83XX_GCTRL_BASE + 0xA0 + i)
-#define IT83XX_GCTRL_EWPR0PFEC(i)    ECREG(IT83XX_GCTRL_BASE + 0xC0 + i)
-
-/*
- * TODO: use spisc_it8xxx2_regs instead of following register declarations
- *       to fix in cros_shi_it8xxx2.c.
- */
-/* Serial Peripheral Interface (SPI) */
-#define IT83XX_SPI_BASE  0x00F03A00
-
-#define IT83XX_SPI_SPISGCR           ECREG(IT83XX_SPI_BASE + 0x00)
-#define IT83XX_SPI_SPISCEN                 BIT(0)
-#define IT83XX_SPI_TXRXFAR           ECREG(IT83XX_SPI_BASE + 0x01)
-#define IT83XX_SPI_CPURXF2A                BIT(4)
-#define IT83XX_SPI_CPURXF1A                BIT(3)
-#define IT83XX_SPI_CPUTFA                  BIT(1)
-#define IT83XX_SPI_TXFCR             ECREG(IT83XX_SPI_BASE + 0x02)
-#define IT83XX_SPI_TXFCMR                  BIT(2)
-#define IT83XX_SPI_TXFR                    BIT(1)
-#define IT83XX_SPI_TXFS                    BIT(0)
-#define IT83XX_SPI_GCR2              ECREG(IT83XX_SPI_BASE + 0x03)
-#define IT83XX_SPI_RXF2OC                  BIT(4)
-#define IT83XX_SPI_RXF1OC                  BIT(3)
-#define IT83XX_SPI_RXFAR                   BIT(0)
-#define IT83XX_SPI_IMR               ECREG(IT83XX_SPI_BASE + 0x04)
-#define IT83XX_SPI_RX_FIFO_FULL            BIT(7)
-#define IT83XX_SPI_RX_REACH                BIT(5)
-#define IT83XX_SPI_EDIM                    BIT(2)
-#define IT83XX_SPI_ISR               ECREG(IT83XX_SPI_BASE + 0x05)
-#define IT83XX_SPI_TXFSR             ECREG(IT83XX_SPI_BASE + 0x06)
-#define IT83XX_SPI_ENDDETECTINT            BIT(2)
-#define IT83XX_SPI_RXFSR             ECREG(IT83XX_SPI_BASE + 0x07)
-#define IT83XX_SPI_RXFFSM                  (BIT(4) | BIT(3))
-#define IT83XX_SPI_RXF2FS                  BIT(2)
-#define IT83XX_SPI_RXF1FS                  BIT(1)
-#define IT83XX_SPI_SPISRDR           ECREG(IT83XX_SPI_BASE + 0x0b)
-#define IT83XX_SPI_CPUWTFDB0         ECREG_u32(IT83XX_SPI_BASE + 0x08)
-#define IT83XX_SPI_FCR               ECREG(IT83XX_SPI_BASE + 0x09)
-#define IT83XX_SPI_SPISRTXF                BIT(2)
-#define IT83XX_SPI_RXFR                    BIT(1)
-#define IT83XX_SPI_RXFCMR                  BIT(0)
-#define IT83XX_SPI_RXFRDRB0          ECREG_u32(IT83XX_SPI_BASE + 0x0C)
-#define IT83XX_SPI_FTCB0R            ECREG(IT83XX_SPI_BASE + 0x18)
-#define IT83XX_SPI_FTCB1R            ECREG(IT83XX_SPI_BASE + 0x19)
-#define IT83XX_SPI_TCCB0             ECREG(IT83XX_SPI_BASE + 0x1A)
-#define IT83XX_SPI_TCCB1             ECREG(IT83XX_SPI_BASE + 0x1B)
-#define IT83XX_SPI_HPR2              ECREG(IT83XX_SPI_BASE + 0x1E)
-#define IT83XX_SPI_EMMCBMR           ECREG(IT83XX_SPI_BASE + 0x21)
-#define IT83XX_SPI_EMMCABM                 BIT(1) /* eMMC Alternative Boot Mode */
-#define IT83XX_SPI_RX_VLISMR         ECREG(IT83XX_SPI_BASE + 0x26)
-#define IT83XX_SPI_RVLIM                   BIT(0)
-#define IT83XX_SPI_RX_VLISR          ECREG(IT83XX_SPI_BASE + 0x27)
-#define IT83XX_SPI_RVLI                    BIT(0)
-
-/**
- *
- * (20xxh) General Control (GCTRL) registers
- *
- */
-#define GCTRL_IT8XXX2_REGS_BASE \
-	((struct gctrl_it8xxx2_regs *)DT_REG_ADDR(DT_NODELABEL(gctrl)))
-
-#ifndef __ASSEMBLER__
-struct gctrl_it8xxx2_regs {
-	/* 0x00-0x01: Reserved_00_01 */
-	volatile uint8_t reserved_00_01[2];
-	/* 0x02: Chip Version */
-	volatile uint8_t GCTRL_ECHIPVER;
-	/* 0x03: DBGR Operate Status */
-	volatile uint8_t GCTRL_DBGROS;
-	/* 0x04-0x05: Reserved_04_05 */
-	volatile uint8_t reserved_04_05[2];
-	/* 0x06: Reset Status */
-	volatile uint8_t GCTRL_RSTS;
-	/* 0x07-0x09: Reserved_07_09 */
-	volatile uint8_t reserved_07_09[3];
-	/* 0x0A: Base Address Select */
-	volatile uint8_t GCTRL_BADRSEL;
-	/* 0x0B: Wait Next Clock Rising */
-	volatile uint8_t GCTRL_WNCKR;
-	/* 0x0C: reserved_0c */
-	volatile uint8_t reserved_0c;
-	/* 0x0D: Special Control 1 */
-	volatile uint8_t GCTRL_SPCTRL1;
-	/* 0x0E-0x0F: reserved_0e_0f */
-	volatile uint8_t reserved_0e_0f[2];
-	/* 0x10: Reset Control DMM */
-	volatile uint8_t GCTRL_RSTDMMC;
-	/* 0x11: Reset Control 4 */
-	volatile uint8_t GCTRL_RSTC4;
-	/* 0x12-0x1B: reserved_12_1b */
-	volatile uint8_t reserved_12_1b[10];
-	/* 0x1C: Special Control 4 */
-	volatile uint8_t GCTRL_SPCTRL4;
-	/* 0x1D-0x1F: reserved_1d_1f */
-	volatile uint8_t reserved_1d_1f[3];
-	/* 0x20: Memory Controller Configuration 3 */
-	volatile uint8_t GCTRL_MCCR3;
-	/* 0x21: Reset Control 5 */
-	volatile uint8_t GCTRL_RSTC5;
-	/* 0x22-0x2F: reserved_22_2f */
-	volatile uint8_t reserved_22_2f[14];
-	/* 0x30: Memory Controller Configuration */
-	volatile uint8_t GCTRL_MCCR;
-	/* 0x31: Externel ILM/DLM Size */
-	volatile uint8_t GCTRL_EIDSR;
-	/* 0x32: Reserved_32 */
-	volatile uint8_t reserved_32;
-	/* 0x33: Pin Multi-function Enable 2 */
-	volatile uint8_t gctrl_pmer2;
-	/* 0x34-0x36: Reserved_34_36 */
-	volatile uint8_t reserved_34_36[3];
-	/* 0x37: Eflash Protect Lock */
-	volatile uint8_t GCTRL_EPLR;
-	/* 0x38-0x40: Reserved_38_40 */
-	volatile uint8_t reserved_38_40[9];
-	/* 0x41: Interrupt Vector Table Base Address */
-	volatile uint8_t GCTRL_IVTBAR;
-	/* 0x42-0x43: Reserved_42_43 */
-	volatile uint8_t reserved_42_43[2];
-	/* 0x44: Memory Controller Configuration 2 */
-	volatile uint8_t GCTRL_MCCR2;
-	/* 0x45: Reserved_45 */
-	volatile uint8_t reserved_45;
-	/* 0x46: Pin Multi-function Enable 3 */
-	volatile uint8_t GCTRL_PMER3;
-	/* 0x47-0x4A: reserved_47_4a */
-	volatile uint8_t reserved_47_4a[4];
-	/* 0x4B: ETWD and UART Control */
-	volatile uint8_t GCTRL_ETWDUARTCR;
-	/* 0x4C: Wakeup MCU Control */
-	volatile uint8_t GCTRL_WMCR;
-	/* 0x4D-0x4F: reserved_4d_4f */
-	volatile uint8_t reserved_4d_4f[3];
-	/* 0x50: Port 80h/81h Status Register */
-	volatile uint8_t GCTRL_P80H81HSR;
-	/* 0x51: Port 80h Data Register */
-	volatile uint8_t GCTRL_P80HDR;
-	/* 0x52: Port 81h Data Register */
-	volatile uint8_t GCTRL_P81HDR;
-	/* 0x53: H2RAM Offset Register */
-	volatile uint8_t GCTRL_H2ROFSR;
-	/* 0x54-0x5C: reserved_54_5c */
-	volatile uint8_t reserved_54_5c[9];
-	/* 0x5D: RISCV ILM Configuration 0 */
-	volatile uint8_t GCTRL_RVILMCR0;
-	/* 0x5E-0x84: reserved_5e_84 */
-	volatile uint8_t reserved_5e_84[39];
-	/* 0x85: Chip ID Byte 1 */
-	volatile uint8_t GCTRL_ECHIPID1;
-	/* 0x86: Chip ID Byte 2 */
-	volatile uint8_t GCTRL_ECHIPID2;
-	/* 0x87: Chip ID Byte 3 */
-	volatile uint8_t GCTRL_ECHIPID3;
-};
-#endif /* !__ASSEMBLER__ */
-
-/* GCTRL register fields */
-/* 0x03: DBGR Operate Status */
-#define IT8XXX2_GCTRL_SMB_DBGR		BIT(0)
-/* 0x06: Reset Status */
-#define IT8XXX2_GCTRL_LRS		(BIT(1) | BIT(0))
-#define IT8XXX2_GCTRL_IWDTR		BIT(1)
-/* 0x0B: Wait Next 65K Rising */
-#define IT8XXX2_GCTRL_WN65K		0x00
-/* 0x10: Reset Control DMM */
-#define IT8XXX2_GCTRL_UART1SD		BIT(3)
-#define IT8XXX2_GCTRL_UART2SD		BIT(2)
-/* 0x11: Reset Control 4 */
-#define IT8XXX2_GCTRL_RPECI		BIT(4)
-#define IT8XXX2_GCTRL_RUART2		BIT(2)
-#define IT8XXX2_GCTRL_RUART1		BIT(1)
-/* 0x1C: Special Control 4 */
-#define IT8XXX2_GCTRL_LRSIWR		BIT(2)
-#define IT8XXX2_GCTRL_LRSIPWRSWTR	BIT(1)
-#define IT8XXX2_GCTRL_LRSIPGWR		BIT(0)
-/* 0x20: Memory Controller Configuration 3 */
-#define IT8XXX2_GCTRL_SPISLVPFE		BIT(6)
-/* 0x30: Memory Controller Configuration */
-#define IT8XXX2_GCTRL_USB_DEBUG_EN      BIT(7)
-#define IT8XXX2_GCTRL_ICACHE_RESET	BIT(4)
-/* 0x37: Eflash Protect Lock */
-#define IT8XXX2_GCTRL_EPLR_ENABLE	BIT(0)
-/* 0x46: Pin Multi-function Enable 3 */
-#define IT8XXX2_GCTRL_SMB3PSEL		BIT(6)
-#define IT8XXX2_GCTRL_SRAM_CRYPTO_USED	BIT(5)
-/* 0x4B: ETWD and UART Control */
-#define IT8XXX2_GCTRL_ETWD_HW_RST_EN	BIT(0)
-/* 0x5D: RISCV ILM Configuration 0 */
-#define IT8XXX2_GCTRL_ILM0_ENABLE	BIT(0)
-/* Accept Port 80h Cycle */
-#define IT8XXX2_GCTRL_ACP80		BIT(6)
-/* Accept Port 81h Cycle */
-#define IT8XXX2_GCTRL_ACP81		BIT(3)
-/* USB Debug Enable */
-#define IT8XXX2_GCTRL_MCCR_USB_EN	BIT(7)
-/* USB Pad Power-On Enable */
-#define IT8XXX2_GCTRL_PMER2_USB_PAD_EN	BIT(7)
-
-/*
- * VCC Detector Option.
- * bit[7-6] = 1: The VCC power status is treated as power-on.
- * The VCC supply of eSPI and related functions (EC2I, KBC, PMC and
- * PECI). It means VCC should be logic high before using these
- * functions, or firmware treats VCC logic high.
- */
-#define IT8XXX2_GCTRL_VCCDO_MASK	(BIT(6) | BIT(7))
-#define IT8XXX2_GCTRL_VCCDO_VCC_ON	BIT(6)
-/*
- * bit[3] = 0: The reset source of PNPCFG is RSTPNP bit in RSTCH
- * register and WRST#.
- */
-#define IT8XXX2_GCTRL_HGRST		BIT(3)
-/* bit[2] = 1: Enable global reset. */
-#define IT8XXX2_GCTRL_GRST		BIT(2)
-
-/**
- *
- * (22xxh) Battery-backed SRAM (BRAM) registers
- *
- */
-#ifndef __ASSEMBLER__
-/* Battery backed RAM indices. */
-#define BRAM_MAGIC_FIELD_OFFSET 0xbc
-enum bram_indices {
-
-	/* This field is used to indicate BRAM is valid or not. */
-	BRAM_IDX_VALID_FLAGS0 = BRAM_MAGIC_FIELD_OFFSET,
-	BRAM_IDX_VALID_FLAGS1,
-	BRAM_IDX_VALID_FLAGS2,
-	BRAM_IDX_VALID_FLAGS3
-};
-#endif /* !__ASSEMBLER__ */
-
-#ifndef __ASSEMBLER__
-/*
- * EC2I bridge registers
- */
-struct ec2i_regs {
-	/* 0x00: Indirect Host I/O Address Register */
-	volatile uint8_t IHIOA;
-	/* 0x01: Indirect Host Data Register */
-	volatile uint8_t IHD;
-	/* 0x02: Lock Super I/O Host Access Register */
-	volatile uint8_t LSIOHA;
-	/* 0x03: Super I/O Access Lock Violation Register */
-	volatile uint8_t SIOLV;
-	/* 0x04: EC to I-Bus Modules Access Enable Register */
-	volatile uint8_t IBMAE;
-	/* 0x05: I-Bus Control Register */
-	volatile uint8_t IBCTL;
-};
-
-/* Index list of the host interface registers of PNPCFG */
-enum host_pnpcfg_index {
-	/* Logical Device Number */
-	HOST_INDEX_LDN = 0x07,
-	/* Chip ID Byte 1 */
-	HOST_INDEX_CHIPID1 = 0x20,
-	/* Chip ID Byte 2 */
-	HOST_INDEX_CHIPID2 = 0x21,
-	/* Chip Version */
-	HOST_INDEX_CHIPVER = 0x22,
-	/* Super I/O Control */
-	HOST_INDEX_SIOCTRL = 0x23,
-	/* Super I/O IRQ Configuration */
-	HOST_INDEX_SIOIRQ = 0x25,
-	/* Super I/O General Purpose */
-	HOST_INDEX_SIOGP = 0x26,
-	/* Super I/O Power Mode */
-	HOST_INDEX_SIOPWR = 0x2D,
-	/* Depth 2 I/O Address */
-	HOST_INDEX_D2ADR = 0x2E,
-	/* Depth 2 I/O Data */
-	HOST_INDEX_D2DAT = 0x2F,
-	/* Logical Device Activate Register */
-	HOST_INDEX_LDA = 0x30,
-	/* I/O Port Base Address Bits [15:8] for Descriptor 0 */
-	HOST_INDEX_IOBAD0_MSB = 0x60,
-	/* I/O Port Base Address Bits [7:0] for Descriptor 0 */
-	HOST_INDEX_IOBAD0_LSB = 0x61,
-	/* I/O Port Base Address Bits [15:8] for Descriptor 1 */
-	HOST_INDEX_IOBAD1_MSB = 0x62,
-	/* I/O Port Base Address Bits [7:0] for Descriptor 1 */
-	HOST_INDEX_IOBAD1_LSB = 0x63,
-	/* Interrupt Request Number and Wake-Up on IRQ Enabled */
-	HOST_INDEX_IRQNUMX = 0x70,
-	/* Interrupt Request Type Select */
-	HOST_INDEX_IRQTP = 0x71,
-	/* DMA Channel Select 0 */
-	HOST_INDEX_DMAS0 = 0x74,
-	/* DMA Channel Select 1 */
-	HOST_INDEX_DMAS1 = 0x75,
-	/* Device Specific Logical Device Configuration 1 to 10 */
-	HOST_INDEX_DSLDC1 = 0xF0,
-	HOST_INDEX_DSLDC2 = 0xF1,
-	HOST_INDEX_DSLDC3 = 0xF2,
-	HOST_INDEX_DSLDC4 = 0xF3,
-	HOST_INDEX_DSLDC5 = 0xF4,
-	HOST_INDEX_DSLDC6 = 0xF5,
-	HOST_INDEX_DSLDC7 = 0xF6,
-	HOST_INDEX_DSLDC8 = 0xF7,
-	HOST_INDEX_DSLDC9 = 0xF8,
-	HOST_INDEX_DSLDC10 = 0xF9,
-};
-
-/* List of logical device number (LDN) assignments */
-enum logical_device_number {
-	/* Serial Port 1 */
-	LDN_UART1 = 0x01,
-	/* Serial Port 2 */
-	LDN_UART2 = 0x02,
-	/* System Wake-Up Control */
-	LDN_SWUC = 0x04,
-	/* KBC/Mouse Interface */
-	LDN_KBC_MOUSE = 0x05,
-	/* KBC/Keyboard Interface */
-	LDN_KBC_KEYBOARD = 0x06,
-	/* Consumer IR */
-	LDN_CIR = 0x0A,
-	/* Shared Memory/Flash Interface */
-	LDN_SMFI = 0x0F,
-	/* RTC-like Timer */
-	LDN_RTCT = 0x10,
-	/* Power Management I/F Channel 1 */
-	LDN_PMC1 = 0x11,
-	/* Power Management I/F Channel 2 */
-	LDN_PMC2 = 0x12,
-	/* Serial Peripheral Interface */
-	LDN_SSPI = 0x13,
-	/* Platform Environment Control Interface */
-	LDN_PECI = 0x14,
-	/* Power Management I/F Channel 3 */
-	LDN_PMC3 = 0x17,
-	/* Power Management I/F Channel 4 */
-	LDN_PMC4 = 0x18,
-	/* Power Management I/F Channel 5 */
-	LDN_PMC5 = 0x19,
-};
-
-/* Structure for initializing PNPCFG via ec2i. */
-struct ec2i_t {
-	/* index port */
-	enum host_pnpcfg_index index_port;
-	/* data port */
-	uint8_t data_port;
-};
-
-/* EC2I access index/data port */
-enum ec2i_access {
-	/* index port */
-	EC2I_ACCESS_INDEX = 0,
-	/* data port */
-	EC2I_ACCESS_DATA = 1,
-};
-
-/* EC to I-Bus Access Enabled */
-#define EC2I_IBCTL_CSAE  BIT(0)
-/* EC Read from I-Bus */
-#define EC2I_IBCTL_CRIB  BIT(1)
-/* EC Write to I-Bus */
-#define EC2I_IBCTL_CWIB  BIT(2)
-#define EC2I_IBCTL_CRWIB (EC2I_IBCTL_CRIB | EC2I_IBCTL_CWIB)
-
-/* PNPCFG Register EC Access Enable */
-#define EC2I_IBMAE_CFGAE BIT(0)
-
-/*
- * KBC registers
- */
-struct kbc_regs {
-	/* 0x00: KBC Host Interface Control Register */
-	volatile uint8_t KBHICR;
-	/* 0x01: Reserved1 */
-	volatile uint8_t reserved1;
-	/* 0x02: KBC Interrupt Control Register */
-	volatile uint8_t KBIRQR;
-	/* 0x03: Reserved2 */
-	volatile uint8_t reserved2;
-	/* 0x04: KBC Host Interface Keyboard/Mouse Status Register */
-	volatile uint8_t KBHISR;
-	/* 0x05: Reserved3 */
-	volatile uint8_t reserved3;
-	/* 0x06: KBC Host Interface Keyboard Data Output Register */
-	volatile uint8_t KBHIKDOR;
-	/* 0x07: Reserved4 */
-	volatile uint8_t reserved4;
-	/* 0x08: KBC Host Interface Mouse Data Output Register */
-	volatile uint8_t KBHIMDOR;
-	/* 0x09: Reserved5 */
-	volatile uint8_t reserved5;
-	/* 0x0a: KBC Host Interface Keyboard/Mouse Data Input Register */
-	volatile uint8_t KBHIDIR;
-};
-
-/* Output Buffer Full */
-#define KBC_KBHISR_OBF      BIT(0)
-/* Input Buffer Full */
-#define KBC_KBHISR_IBF      BIT(1)
-/* A2 Address (A2) */
-#define KBC_KBHISR_A2_ADDR  BIT(3)
-#define KBC_KBHISR_STS_MASK (KBC_KBHISR_OBF | KBC_KBHISR_IBF \
-						| KBC_KBHISR_A2_ADDR)
-
-/* Clear Output Buffer Full */
-#define KBC_KBHICR_COBF      BIT(6)
-/* IBF/OBF Clear Mode Enable */
-#define KBC_KBHICR_IBFOBFCME BIT(5)
-/* Input Buffer Full CPU Interrupt Enable */
-#define KBC_KBHICR_IBFCIE    BIT(3)
-/* Output Buffer Empty CPU Interrupt Enable */
-#define KBC_KBHICR_OBECIE    BIT(2)
-/* Output Buffer Full Mouse Interrupt Enable */
-#define KBC_KBHICR_OBFMIE    BIT(1)
-/* Output Buffer Full Keyboard Interrupt Enable */
-#define KBC_KBHICR_OBFKIE    BIT(0)
-
-/*
- * PMC registers
- */
-struct pmc_regs {
-	/* 0x00: Host Interface PM Channel 1 Status */
-	volatile uint8_t PM1STS;
-	/* 0x01: Host Interface PM Channel 1 Data Out Port */
-	volatile uint8_t PM1DO;
-	/* 0x02: Host Interface PM Channel 1 Data Out Port with SCI# */
-	volatile uint8_t PM1DOSCI;
-	/* 0x03: Host Interface PM Channel 1 Data Out Port with SMI# */
-	volatile uint8_t PM1DOSMI;
-	/* 0x04: Host Interface PM Channel 1 Data In Port */
-	volatile uint8_t PM1DI;
-	/* 0x05: Host Interface PM Channel 1 Data In Port with SCI# */
-	volatile uint8_t PM1DISCI;
-	/* 0x06: Host Interface PM Channel 1 Control */
-	volatile uint8_t PM1CTL;
-	/* 0x07: Host Interface PM Channel 1 Interrupt Control */
-	volatile uint8_t PM1IC;
-	/* 0x08: Host Interface PM Channel 1 Interrupt Enable */
-	volatile uint8_t PM1IE;
-	/* 0x09-0x0f: Reserved1 */
-	volatile uint8_t reserved1[7];
-	/* 0x10: Host Interface PM Channel 2 Status */
-	volatile uint8_t PM2STS;
-	/* 0x11: Host Interface PM Channel 2 Data Out Port */
-	volatile uint8_t PM2DO;
-	/* 0x12: Host Interface PM Channel 2 Data Out Port with SCI# */
-	volatile uint8_t PM2DOSCI;
-	/* 0x13: Host Interface PM Channel 2 Data Out Port with SMI# */
-	volatile uint8_t PM2DOSMI;
-	/* 0x14: Host Interface PM Channel 2 Data In Port */
-	volatile uint8_t PM2DI;
-	/* 0x15: Host Interface PM Channel 2 Data In Port with SCI# */
-	volatile uint8_t PM2DISCI;
-	/* 0x16: Host Interface PM Channel 2 Control */
-	volatile uint8_t PM2CTL;
-	/* 0x17: Host Interface PM Channel 2 Interrupt Control */
-	volatile uint8_t PM2IC;
-	/* 0x18: Host Interface PM Channel 2 Interrupt Enable */
-	volatile uint8_t PM2IE;
-	/* 0x19: Mailbox Control */
-	volatile uint8_t MBXCTRL;
-	/* 0x1a-0x1f: Reserved2 */
-	volatile uint8_t reserved2[6];
-	/* 0x20-0xff: Reserved3 */
-	volatile uint8_t reserved3[0xe0];
-};
-
-/* Input Buffer Full Interrupt Enable */
-#define PMC_PM1CTL_IBFIE    BIT(0)
-/* Output Buffer Full */
-#define PMC_PM1STS_OBF      BIT(0)
-/* Input Buffer Full */
-#define PMC_PM1STS_IBF      BIT(1)
-/* General Purpose Flag */
-#define PMC_PM1STS_GPF      BIT(2)
-/* A2 Address (A2) */
-#define PMC_PM1STS_A2_ADDR  BIT(3)
-
-/* PMC2 Input Buffer Full Interrupt Enable */
-#define PMC_PM2CTL_IBFIE    BIT(0)
-/* General Purpose Flag */
-#define PMC_PM2STS_GPF      BIT(2)
-
-/*
- * Dedicated Interrupt
- * 0b:
- * INT3: PMC Output Buffer Empty Int
- * INT25: PMC Input Buffer Full Int
- * 1b:
- * INT3: PMC1 Output Buffer Empty Int
- * INT25: PMC1 Input Buffer Full Int
- * INT26: PMC2 Output Buffer Empty Int
- * INT27: PMC2 Input Buffer Full Int
- */
-#define PMC_MBXCTRL_DINT    BIT(5)
-
-/*
- * eSPI slave registers
- */
-struct espi_slave_regs {
-	/* 0x00-0x03: Reserved1 */
-	volatile uint8_t reserved1[4];
-
-	/* 0x04: General Capabilities and Configuration 0 */
-	volatile uint8_t GCAPCFG0;
-	/* 0x05: General Capabilities and Configuration 1 */
-	volatile uint8_t GCAPCFG1;
-	/* 0x06: General Capabilities and Configuration 2 */
-	volatile uint8_t GCAPCFG2;
-	/* 0x07: General Capabilities and Configuration 3 */
-	volatile uint8_t GCAPCFG3;
-
-	/* Channel 0 (Peripheral Channel) Capabilities and Configurations */
-	/* 0x08: Channel 0 Capabilities and Configuration 0 */
-	volatile uint8_t CH_PC_CAPCFG0;
-	/* 0x09: Channel 0 Capabilities and Configuration 1 */
-	volatile uint8_t CH_PC_CAPCFG1;
-	/* 0x0A: Channel 0 Capabilities and Configuration 2 */
-	volatile uint8_t CH_PC_CAPCFG2;
-	/* 0x0B: Channel 0 Capabilities and Configuration 3 */
-	volatile uint8_t CH_PC_CAPCFG3;
-
-	/* Channel 1 (Virtual Wire Channel) Capabilities and Configurations */
-	/* 0x0C: Channel 1 Capabilities and Configuration 0 */
-	volatile uint8_t CH_VW_CAPCFG0;
-	/* 0x0D: Channel 1 Capabilities and Configuration 1 */
-	volatile uint8_t CH_VW_CAPCFG1;
-	/* 0x0E: Channel 1 Capabilities and Configuration 2 */
-	volatile uint8_t CH_VW_CAPCFG2;
-	/* 0x0F: Channel 1 Capabilities and Configuration 3 */
-	volatile uint8_t CH_VW_CAPCFG3;
-
-	/* Channel 2 (OOB Message Channel) Capabilities and Configurations */
-	/* 0x10: Channel 2 Capabilities and Configuration 0 */
-	volatile uint8_t CH_OOB_CAPCFG0;
-	/* 0x11: Channel 2 Capabilities and Configuration 1 */
-	volatile uint8_t CH_OOB_CAPCFG1;
-	/* 0x12: Channel 2 Capabilities and Configuration 2 */
-	volatile uint8_t CH_OOB_CAPCFG2;
-	/* 0x13: Channel 2 Capabilities and Configuration 3 */
-	volatile uint8_t CH_OOB_CAPCFG3;
-
-	/* Channel 3 (Flash Access Channel) Capabilities and Configurations */
-	/* 0x14: Channel 3 Capabilities and Configuration 0 */
-	volatile uint8_t CH_FLASH_CAPCFG0;
-	/* 0x15: Channel 3 Capabilities and Configuration 1 */
-	volatile uint8_t CH_FLASH_CAPCFG1;
-	/* 0x16: Channel 3 Capabilities and Configuration 2 */
-	volatile uint8_t CH_FLASH_CAPCFG2;
-	/* 0x17: Channel 3 Capabilities and Configuration 3 */
-	volatile uint8_t CH_FLASH_CAPCFG3;
-	/* Channel 3 Capabilities and Configurations 2 */
-	/* 0x18: Channel 3 Capabilities and Configuration 2-0 */
-	volatile uint8_t CH_FLASH_CAPCFG2_0;
-	/* 0x19: Channel 3 Capabilities and Configuration 2-1 */
-	volatile uint8_t CH_FLASH_CAPCFG2_1;
-	/* 0x1A: Channel 3 Capabilities and Configuration 2-2 */
-	volatile uint8_t CH_FLASH_CAPCFG2_2;
-	/* 0x1B: Channel 3 Capabilities and Configuration 2-3 */
-	volatile uint8_t CH_FLASH_CAPCFG2_3;
-
-	/* 0x1c-0x1f: Reserved2 */
-	volatile uint8_t reserved2[4];
-	/* 0x20-0x8f: Reserved3 */
-	volatile uint8_t reserved3[0x70];
-
-	/* 0x90: eSPI PC Control 0 */
-	volatile uint8_t ESPCTRL0;
-	/* 0x91: eSPI PC Control 1 */
-	volatile uint8_t ESPCTRL1;
-	/* 0x92: eSPI PC Control 2 */
-	volatile uint8_t ESPCTRL2;
-	/* 0x93: eSPI PC Control 3 */
-	volatile uint8_t ESPCTRL3;
-	/* 0x94: eSPI PC Control 4 */
-	volatile uint8_t ESPCTRL4;
-	/* 0x95: eSPI PC Control 5 */
-	volatile uint8_t ESPCTRL5;
-	/* 0x96: eSPI PC Control 6 */
-	volatile uint8_t ESPCTRL6;
-	/* 0x97: eSPI PC Control 7 */
-	volatile uint8_t ESPCTRL7;
-	/* 0x98-0x9f: Reserved4 */
-	volatile uint8_t reserved4[8];
-
-	/* 0xa0: eSPI General Control 0 */
-	volatile uint8_t ESGCTRL0;
-	/* 0xa1: eSPI General Control 1 */
-	volatile uint8_t ESGCTRL1;
-	/* 0xa2: eSPI General Control 2 */
-	volatile uint8_t ESGCTRL2;
-	/* 0xa3: eSPI General Control 3 */
-	volatile uint8_t ESGCTRL3;
-	/* 0xa4-0xaf: Reserved5 */
-	volatile uint8_t reserved5[12];
-
-	/* 0xb0: eSPI Upstream Control 0 */
-	volatile uint8_t ESUCTRL0;
-	/* 0xb1: eSPI Upstream Control 1 */
-	volatile uint8_t ESUCTRL1;
-	/* 0xb2: eSPI Upstream Control 2 */
-	volatile uint8_t ESUCTRL2;
-	/* 0xb3: eSPI Upstream Control 3 */
-	volatile uint8_t ESUCTRL3;
-	/* 0xb4-0xb5: Reserved6 */
-	volatile uint8_t reserved6[2];
-	/* 0xb6: eSPI Upstream Control 6 */
-	volatile uint8_t ESUCTRL6;
-	/* 0xb7: eSPI Upstream Control 7 */
-	volatile uint8_t ESUCTRL7;
-	/* 0xb8: eSPI Upstream Control 8 */
-	volatile uint8_t ESUCTRL8;
-	/* 0xb9-0xbf: Reserved7 */
-	volatile uint8_t reserved7[7];
-
-	/* 0xc0: eSPI OOB Control 0 */
-	volatile uint8_t ESOCTRL0;
-	/* 0xc1: eSPI OOB Control 1 */
-	volatile uint8_t ESOCTRL1;
-	/* 0xc2-0xc3: Reserved8 */
-	volatile uint8_t reserved8[2];
-	/* 0xc4: eSPI OOB Control 4 */
-	volatile uint8_t ESOCTRL4;
-	/* 0xc5-0xcf: Reserved9 */
-	volatile uint8_t reserved9[11];
-
-	/* 0xd0: eSPI SAFS Control 0 */
-	volatile uint8_t ESPISAFSC0;
-	/* 0xd1: eSPI SAFS Control 1 */
-	volatile uint8_t ESPISAFSC1;
-	/* 0xd2: eSPI SAFS Control 2 */
-	volatile uint8_t ESPISAFSC2;
-	/* 0xd3: eSPI SAFS Control 3 */
-	volatile uint8_t ESPISAFSC3;
-	/* 0xd4: eSPI SAFS Control 4 */
-	volatile uint8_t ESPISAFSC4;
-	/* 0xd5: eSPI SAFS Control 5 */
-	volatile uint8_t ESPISAFSC5;
-	/* 0xd6: eSPI SAFS Control 6 */
-	volatile uint8_t ESPISAFSC6;
-	/* 0xd7: eSPI SAFS Control 7 */
-	volatile uint8_t ESPISAFSC7;
-};
-
-/*
- * eSPI VW registers
- */
-struct espi_vw_regs {
-	/* 0x00-0x7f: VW index */
-	volatile uint8_t VW_INDEX[0x80];
-	/* 0x80-0x8f: Reserved1 */
-	volatile uint8_t reserved1[0x10];
-	/* 0x90: VW Contrl 0 */
-	volatile uint8_t VWCTRL0;
-	/* 0x91: VW Contrl 1 */
-	volatile uint8_t VWCTRL1;
-	/* 0x92: VW Contrl 2 */
-	volatile uint8_t VWCTRL2;
-	/* 0x93: VW Contrl 3 */
-	volatile uint8_t VWCTRL3;
-	/* 0x94: Reserved2 */
-	volatile uint8_t reserved2;
-	/* 0x95: VW Contrl 5 */
-	volatile uint8_t VWCTRL5;
-	/* 0x96: VW Contrl 6 */
-	volatile uint8_t VWCTRL6;
-	/* 0x97: VW Contrl 7 */
-	volatile uint8_t VWCTRL7;
-	/* 0x98-0x99: Reserved3 */
-	volatile uint8_t reserved3[2];
-};
-
-#define ESPI_IT8XXX2_OOB_MAX_PAYLOAD_SIZE 80
-/*
- * eSPI Queue 0 registers
- */
-struct espi_queue0_regs {
-	/* 0x00-0x3f: PUT_PC Data Byte 0-63 */
-	volatile uint8_t PUT_PC_DATA[0x40];
-	/* 0x40-0x7f: Reserved1 */
-	volatile uint8_t reserved1[0x40];
-	/* 0x80-0xcf: PUT_OOB Data Byte 0-79 */
-	volatile uint8_t PUT_OOB_DATA[ESPI_IT8XXX2_OOB_MAX_PAYLOAD_SIZE];
-};
-
-/*
- * eSPI Queue 1 registers
- */
-struct espi_queue1_regs {
-	/* 0x00-0x4f: Upstream Data Byte 0-79 */
-	volatile uint8_t UPSTREAM_DATA[ESPI_IT8XXX2_OOB_MAX_PAYLOAD_SIZE];
-	/* 0x50-0x7f: Reserved1 */
-	volatile uint8_t reserved1[0x30];
-	/* 0x80-0xbf: PUT_FLASH_NP Data Byte 0-63 */
-	volatile uint8_t PUT_FLASH_NP_DATA[0x40];
-};
-
-#endif /* !__ASSEMBLER__ */
-
-
-/**
- *
- * (3Axxh) SPI Slave Controller (SPISC) registers
- *
- */
-#ifndef __ASSEMBLER__
-struct spisc_it8xxx2_regs {
-	/* 0x00: SPI Slave General Control */
-	volatile uint8_t SPISC_SPISGCR;
-	/* 0x01: Tx/Rx FIFO Access */
-	volatile uint8_t SPISC_TXRXFAR;
-	/* 0x02: Tx FIFO Control */
-	volatile uint8_t SPISC_TXFCR;
-	/* 0x03: SPI Slave General Control 2 */
-	volatile uint8_t SPISC_SPISGCR2;
-	/* 0x04: Interrupt Mask */
-	volatile uint8_t SPISC_IMR;
-	/* 0x05: Interrupt Status */
-	volatile uint8_t SPISC_ISR;
-	/* 0x06: Tx FIFO Status */
-	volatile uint8_t SPISC_TXFSR;
-	/* 0x07: Rx FIFO Status */
-	volatile uint8_t SPISC_RXFSR;
-	/* 0x08: CPU Write Tx FIFO Data Byte0 */
-	volatile uint8_t SPISC_CPUWTXFDB0R;
-	/* 0x09: FIFO Control / CPU Write Tx FIFO Data Byte1 */
-	volatile uint8_t SPISC_FCR;
-	/* 0x0A: CPU Write Tx FIFO Data Byte2 */
-	volatile uint8_t SPISC_CPUWTXFDB2R;
-	/* 0x0B: SPI Slave Response Data / CPU Write Tx FIFO Data Byte3 */
-	volatile uint8_t SPISC_SPISRDR;
-	/* 0x0C: Rx FIFO Readout Data Byte0 */
-	volatile uint8_t SPISC_RXFRDRB0;
-	/* 0x0D: Rx FIFO Readout Data Byte1 */
-	volatile uint8_t SPISC_RXFRDRB1;
-	/* 0x0E: Rx FIFO Readout Data Byte2 */
-	volatile uint8_t SPISC_RXFRDRB2;
-	/* 0x0F: Rx FIFO Readout Data Byte3 */
-	volatile uint8_t SPISC_RXFRDRB3;
-	/* 0x10-0x17: Reserved1 */
-	volatile uint8_t reserved1[8];
-	/* 0x18: FIFO Target Count Byte0 */
-	volatile uint8_t SPISC_FTCB0R;
-	/* 0x19: FIFO Target Count Byte1 */
-	volatile uint8_t SPISC_FTCB1R;
-	/* 0x1A: Target Count Capture Byte0 */
-	volatile uint8_t SPISC_TCCB0;
-	/* 0x1B: Target Count Capture Byte1 */
-	volatile uint8_t SPISC_TCCB1;
-	/* 0x1C-0x1D: Reserved2 */
-	volatile uint8_t reserved2[2];
-	/* 0x1E: Hardware Parsing 2 */
-	volatile uint8_t SPISC_HPR2;
-	/* 0x1F-0x25: Reserved3 */
-	volatile uint8_t reserved3[7];
-	/* 0x26: Rx Valid Length Interrupt Status Mask */
-	volatile uint8_t SPISC_RXVLISMR;
-	/* 0x27: Rx Valid Length Interrupt Status */
-	volatile uint8_t SPISC_RXVLISR;
-};
-#endif /* !__ASSEMBLER__ */
-
-/* SPISC register fields */
-/* 0x00: SPI Slave General Control */
-#define IT8XXX2_SPISC_SPISCEN		BIT(0)
-/* 0x01: Tx/Rx FIFO Access */
-#define IT8XXX2_SPISC_CPURXF1A		BIT(3)
-#define IT8XXX2_SPISC_CPUTFA		BIT(1)
-/* 0x02: Tx FIFO Control */
-#define IT8XXX2_SPISC_TXFCMR		BIT(2)
-#define IT8XXX2_SPISC_TXFR		BIT(1)
-#define IT8XXX2_SPISC_TXFS		BIT(0)
-/* 0x03: SPI Slave General Control 2 */
-#define IT8XXX2_SPISC_RXF2OC		BIT(4)
-#define IT8XXX2_SPISC_RXF1OC		BIT(3)
-#define IT8XXX2_SPISC_RXFAR		BIT(0)
-/* 0x04: Interrupt Mask */
-#define IT8XXX2_SPISC_EDIM		BIT(2)
-/* 0x06: Tx FIFO Status */
-#define IT8XXX2_SPISC_ENDDETECTINT	BIT(2)
-/* 0x09: FIFO Control */
-#define IT8XXX2_SPISC_SPISRTXF		BIT(2)
-#define IT8XXX2_SPISC_RXFR		BIT(1)
-#define IT8XXX2_SPISC_RXFCMR		BIT(0)
-/* 0x26: Rx Valid Length Interrupt Status Mask */
-#define IT8XXX2_SPISC_RVLIM		BIT(0)
-/* 0x27: Rx Valid Length Interrupt Status */
-#define IT8XXX2_SPISC_RVLI		BIT(0)
-
-#endif /* CHIP_CHIPREGS_H */
diff --git a/soc/ite/ec/common/soc_common.h b/soc/ite/ec/common/soc_common.h
index b7e0cdd5e55f1..31e1d8a9553a5 100644
--- a/soc/ite/ec/common/soc_common.h
+++ b/soc/ite/ec/common/soc_common.h
@@ -16,6 +16,11 @@
 
 #ifndef _ASMLANGUAGE
 
+struct ite_clk_cfg {
+	uint8_t ctrl;
+	uint8_t bits;
+};
+
 #ifdef CONFIG_HAS_ITE_INTC
 /*
  * Save current interrupt state of soc-level into ier_setting[] with
@@ -43,11 +48,10 @@ uint32_t chip_get_pll_freq(void);
 void chip_pll_ctrl(enum chip_pll_mode mode);
 void riscv_idle(enum chip_pll_mode mode, unsigned int key);
 
-#ifdef CONFIG_SOC_IT8XXX2_CPU_IDLE_GATING
+/* Functions for managing the CPU idle state */
 void chip_permit_idle(void);
 void chip_block_idle(void);
 bool cpu_idle_not_allowed(void);
-#endif
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/soc/ite/ec/it51xxx/CMakeLists.txt b/soc/ite/ec/it51xxx/CMakeLists.txt
new file mode 100644
index 0000000000000..94ad7b7a0df55
--- /dev/null
+++ b/soc/ite/ec/it51xxx/CMakeLists.txt
@@ -0,0 +1,8 @@
+zephyr_sources(soc.c vector.S)
+zephyr_include_directories(.)
+
+zephyr_sources_ifdef(CONFIG_SOC_IT51XXX_USE_ILM ../it8xxx2/ilm.c ilm_wrapper.c)
+
+set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld
+    CACHE INTERNAL "SoC Linker script ${SOC_NAME}"
+)
diff --git a/soc/ite/ec/it51xxx/Kconfig b/soc/ite/ec/it51xxx/Kconfig
new file mode 100644
index 0000000000000..1b910657b694d
--- /dev/null
+++ b/soc/ite/ec/it51xxx/Kconfig
@@ -0,0 +1,47 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_IT51XXX
+	select HAS_PM
+	select ARCH_HAS_CUSTOM_CPU_IDLE
+	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
+	select SOC_PREP_HOOK
+
+if SOC_SERIES_IT51XXX
+
+config SOC_IT51XXX
+	select RISCV
+	select ATOMIC_OPERATIONS_C
+	select RISCV_ISA_RV32I
+	select RISCV_ISA_EXT_ZICSR
+	select RISCV_ISA_EXT_ZIFENCEI
+	select RISCV_ISA_EXT_M
+	select RISCV_ISA_EXT_C if !SOC_IT51526AW
+	select RISCV_ISA_EXT_ZBA
+	select RISCV_ISA_EXT_ZBB
+	select RISCV_ISA_EXT_ZBS
+	select FLASH
+	imply XIP
+
+config SOC_IT51XXX_CPU_IDLE_GATING
+	bool
+	help
+	  This option determines whether the entering CPU idle mode can be
+	  gated by individual drivers. When this option is disabled, CPU idle
+	  mode is always permitted.
+
+config SOC_IT51XXX_USE_ILM
+	bool
+	default y
+	help
+	  If enabled, Instruction Local Memory (ILM) will be configured to execute
+	  code placed in the .__ram_code section out of RAM. This consumes RAM in
+	  blocks of 4 kilobytes, but performance of code in ILM is much more
+	  predictable than executing from Flash directly, and some code (such as code
+	  that writes to the internal Flash) must execute out of RAM.
+
+config ILM_MAX_SIZE
+	int "ILM Size in kB"
+	default 4
+
+endif # SOC_SERIES_IT51XXX
diff --git a/soc/ite/ec/it51xxx/Kconfig.defconfig.series b/soc/ite/ec/it51xxx/Kconfig.defconfig.series
new file mode 100644
index 0000000000000..5e705263429b6
--- /dev/null
+++ b/soc/ite/ec/it51xxx/Kconfig.defconfig.series
@@ -0,0 +1,40 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_IT51XXX
+
+config ARCH_HAS_CUSTOM_BUSY_WAIT
+	default y
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 4096
+
+config UART_NS16550_WA_ISR_REENABLE_INTERRUPT
+	default y
+	depends on UART_NS16550
+
+config FLASH_INIT_PRIORITY
+	default 0
+
+config NUM_IRQS
+	default 225
+
+config DYNAMIC_INTERRUPTS
+	default y
+
+config GEN_ISR_TABLES
+	default y
+
+config GEN_IRQ_START_VECTOR
+	default 0
+
+config GEN_SW_ISR_TABLE
+	default y
+
+config RISCV_SOC_INTERRUPT_INIT
+	default y
+
+endif # SOC_SERIES_IT51XXX
diff --git a/soc/ite/ec/it51xxx/Kconfig.soc b/soc/ite/ec/it51xxx/Kconfig.soc
new file mode 100644
index 0000000000000..dccc1678d2761
--- /dev/null
+++ b/soc/ite/ec/it51xxx/Kconfig.soc
@@ -0,0 +1,22 @@
+# Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_IT51XXX
+	bool
+	select SOC_FAMILY_ITE_EC
+	help
+	  Enable support for ITE IT51XXX
+
+config SOC_IT51XXX
+	bool
+	select SOC_SERIES_IT51XXX
+
+config SOC_IT51526AW
+	bool
+	select SOC_IT51XXX
+
+config SOC_SERIES
+	default "it51xxx" if SOC_SERIES_IT51XXX
+
+config SOC
+	default "it51526aw" if SOC_IT51526AW
diff --git a/soc/ite/ec/it51xxx/chip_chipregs.h b/soc/ite/ec/it51xxx/chip_chipregs.h
new file mode 100644
index 0000000000000..d589c59460a36
--- /dev/null
+++ b/soc/ite/ec/it51xxx/chip_chipregs.h
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef CHIP_CHIPREGS_H
+#define CHIP_CHIPREGS_H
+
+#include <zephyr/sys/util.h>
+
+#ifdef _ASMLANGUAGE
+#define ECREG(x) x
+#else
+
+/*
+ * Macros for hardware registers access.
+ */
+#define ECREG(x)     (*((volatile unsigned char *)(x)))
+#define ECREG_u16(x) (*((volatile unsigned short *)(x)))
+#define ECREG_u32(x) (*((volatile unsigned long *)(x)))
+
+#endif /* _ASMLANGUAGE */
+
+/**
+ *
+ * (10xxh) Shared Memory Flash Interface Bridge (SMFI) registers
+ *
+ */
+#ifndef __ASSEMBLER__
+struct smfi_it51xxx_regs {
+	volatile uint8_t reserved1[59];
+	/* 0x3B: EC-Indirect memory address 0 */
+	volatile uint8_t SMFI_ECINDAR0;
+	/* 0x3C: EC-Indirect memory address 1 */
+	volatile uint8_t SMFI_ECINDAR1;
+	/* 0x3D: EC-Indirect memory address 2 */
+	volatile uint8_t SMFI_ECINDAR2;
+	/* 0x3E: EC-Indirect memory address 3 */
+	volatile uint8_t SMFI_ECINDAR3;
+	/* 0x3F: EC-Indirect memory data */
+	volatile uint8_t SMFI_ECINDDR;
+	/* 0x40: Scratch SRAM 0 address low byte */
+	volatile uint8_t SMFI_SCAR0L;
+	/* 0x41: Scratch SRAM 0 address middle byte */
+	volatile uint8_t SMFI_SCAR0M;
+	/* 0x42: Scratch SRAM 0 address high byte */
+	volatile uint8_t SMFI_SCAR0H;
+	volatile uint8_t reserved1_1[23];
+	/* 0x5A: Host RAM Window Control */
+	volatile uint8_t SMFI_HRAMWC;
+	/* 0x5B: Host RAM Window 0 Base Address [11:4] */
+	volatile uint8_t SMFI_HRAMW0BA;
+	/* 0x5C: Host RAM Window 1 Base Address [11:4] */
+	volatile uint8_t SMFI_HRAMW1BA;
+	/* 0x5D: Host RAM Window 0 Access Allow Size */
+	volatile uint8_t SMFI_HRAMW0AAS;
+	/* 0x5E: Host RAM Window 1 Access Allow Size */
+	volatile uint8_t SMFI_HRAMW1AAS;
+	volatile uint8_t reserved_5f_80[34];
+	/* 0x81: Flash control 6 */
+	volatile uint8_t SMFI_FLHCTRL6R;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* SMFI register fields */
+/* EC-Indirect read internal flash */
+#define EC_INDIRECT_READ_INTERNAL_FLASH BIT(6)
+/* Enable EC-indirect page program command */
+#define IT51XXX_SMFI_MASK_ECINDPP       BIT(3)
+#define ITE_EC_SMFI_MASK_ECINDPP        IT51XXX_SMFI_MASK_ECINDPP
+/* 0x42: Scratch SRAM 0 address high byte */
+#define SCARH_ENABLE                    BIT(7)
+#define SCARH_ADDR_BIT19                BIT(3)
+
+/**
+ *
+ * (16xxh) General Purpose I/O Port (GPIO) registers
+ *
+ */
+#define GPIO_IT51XXX_REGS_BASE ((struct gpio_it51xxx_regs *)DT_REG_ADDR(DT_NODELABEL(gpiogcr)))
+
+#ifndef __ASSEMBLER__
+struct gpio_it51xxx_regs {
+	/* 0x00: General Control */
+	volatile uint8_t GPIO_GCR;
+	/* 0x01-CF: Reserved_01_cf */
+	volatile uint8_t reserved_01_cf[207];
+	/* 0xD0: General Control 31 */
+	volatile uint8_t GPIO_GCR31;
+	/* 0xD1: General Control 32 */
+	volatile uint8_t GPIO_GCR32;
+	/* 0xD2: Reserved_d2 */
+	volatile uint8_t reserved_d2[1];
+	/* 0xD3: General Control 34 */
+	volatile uint8_t GPIO_GCR34;
+	/* 0xD4: GPA Voltage Selection */
+	volatile uint8_t GPIO_GPAVSR;
+	/* 0xD5: GPB Voltage Selection */
+	volatile uint8_t GPIO_GPBVSR;
+	/* 0xD6: GPC Voltage Selection */
+	volatile uint8_t GPIO_GPCVSR;
+	/* 0xD7: GPD Voltage Selection */
+	volatile uint8_t GPIO_GPDVSR;
+	/* 0xD8: GPE Voltage Selection */
+	volatile uint8_t GPIO_GPEVSR;
+	/* 0xD9: GPF Voltage Selection */
+	volatile uint8_t GPIO_GPFVSR;
+	/* 0xDA: GPG Voltage Selection */
+	volatile uint8_t GPIO_GPGVSR;
+	/* 0xDB: GPH Voltage Selection */
+	volatile uint8_t GPIO_GPHVSR;
+	/* 0xDC: GPI Voltage Selection */
+	volatile uint8_t GPIO_GPIVSR;
+	/* 0xDD: GPJ Voltage Selection */
+	volatile uint8_t GPIO_GPJVSR;
+	/* 0xDE: GP I3C Control */
+	volatile uint8_t GPIO_GPI3CCR;
+	/* 0xDF: Reserved_df */
+	volatile uint8_t reserved_df[1];
+	/* 0xE0: General Control 16 */
+	volatile uint8_t GPIO_GCR16;
+	/* 0xE1: General Control 17 */
+	volatile uint8_t GPIO_GCR17;
+	/* 0xE2: General Control 18 */
+	volatile uint8_t GPIO_GCR18;
+	/* 0xE3: Reserved_e3 */
+	volatile uint8_t reserved_e3;
+	/* 0xE4: General Control 19 */
+	volatile uint8_t GPIO_GCR19;
+	/* 0xE5: General Control 20 */
+	volatile uint8_t GPIO_GCR20;
+	/* 0xE6: General Control 21 */
+	volatile uint8_t GPIO_GCR21;
+	/* 0xE7: General Control 22 */
+	volatile uint8_t GPIO_GCR22;
+	/* 0xE8: Reserved_e8 */
+	volatile uint8_t reserved_e8[1];
+	/* 0xE9: General Control 24 */
+	volatile uint8_t GPIO_GCR24;
+	/* 0xEA: General Control 25 */
+	volatile uint8_t GPIO_GCR25;
+	/* 0xEB: General Control 26 */
+	volatile uint8_t GPIO_GCR26;
+	/* 0xEC: Reserved_ec */
+	volatile uint8_t reserved_ec[1];
+	/* 0xED: General Control 28 */
+	volatile uint8_t GPIO_GCR28;
+	/* 0xEE-0xEF: Reserved_ee_ef */
+	volatile uint8_t reserved_ee_ef[2];
+	/* 0xF0: General Control 1 */
+	volatile uint8_t GPIO_GCR1;
+	/* 0xF1: General Control 2 */
+	volatile uint8_t GPIO_GCR2;
+	/* 0xF2: General Control 3 */
+	volatile uint8_t GPIO_GCR3;
+	/* 0xF3: General Control 4 */
+	volatile uint8_t GPIO_GCR4;
+	/* 0xF4: General Control 5 */
+	volatile uint8_t GPIO_GCR5;
+	/* 0xF5: General Control 6 */
+	volatile uint8_t GPIO_GCR6;
+	/* 0xF6: General Control 7 */
+	volatile uint8_t GPIO_GCR7;
+	/* 0xF7: General Control 8 */
+	volatile uint8_t GPIO_GCR8;
+	/* 0xF8: General Control 9 */
+	volatile uint8_t GPIO_GCR9;
+	/* 0xF9: General Control 10 */
+	volatile uint8_t GPIO_GCR10;
+	/* 0xFA: General Control 11 */
+	volatile uint8_t GPIO_GCR11;
+	/* 0xFB: General Control 12 */
+	volatile uint8_t GPIO_GCR12;
+	/* 0xFC: General Control 13 */
+	volatile uint8_t GPIO_GCR13;
+	/* 0xFD: General Control 14 */
+	volatile uint8_t GPIO_GCR14;
+	/* 0xFE: General Control 15 */
+	volatile uint8_t GPIO_GCR15;
+	/* 0xFF: Power Good Watch Control */
+	volatile uint8_t GPIO_PGWCR;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* GPIO register fields */
+/* 0x00: General Control */
+#define IT51XXX_GPIO_LPCRSTEN             (BIT(2) | BIT(1))
+#define ITE_EC_GPIO_LPCRSTEN              IT51XXX_GPIO_LPCRSTEN
+#define IT51XXX_GPIO_GCR_ESPI_RST_D2      0x2
+#define IT51XXX_GPIO_GCR_ESPI_RST_POS     1
+#define IT51XXX_GPIO_GCR_ESPI_RST_EN_MASK (0x3 << IT51XXX_GPIO_GCR_ESPI_RST_POS)
+/* 0xF0: General Control 1 */
+#define IT51XXX_GPIO_U2CTRL_SIN1_SOUT1_EN BIT(2)
+#define IT51XXX_GPIO_U1CTRL_SIN0_SOUT0_EN BIT(0)
+/* 0xE6: General Control 21 */
+#define IT51XXX_GPIO_GPH1VS               BIT(1)
+#define IT51XXX_GPIO_GPH2VS               BIT(0)
+
+#define KSIX_KSOX_KBS_GPIO_MODE BIT(7)
+#define KSIX_KSOX_GPIO_OUTPUT   BIT(6)
+#define KSIX_KSOX_GPIO_PULLUP   BIT(2)
+#define KSIX_KSOX_GPIO_PULLDOWN BIT(1)
+
+#define GPCR_PORT_PIN_MODE_INPUT    BIT(7)
+#define GPCR_PORT_PIN_MODE_OUTPUT   BIT(6)
+#define GPCR_PORT_PIN_MODE_PULLUP   BIT(2)
+#define GPCR_PORT_PIN_MODE_PULLDOWN BIT(1)
+
+/*
+ * If both PULLUP and PULLDOWN are set to 1b, the corresponding port would be
+ * configured as tri-state.
+ */
+#define GPCR_PORT_PIN_MODE_TRISTATE                                                                \
+	(GPCR_PORT_PIN_MODE_INPUT | GPCR_PORT_PIN_MODE_PULLUP | GPCR_PORT_PIN_MODE_PULLDOWN)
+
+/**
+ *
+ * (1Exxh) PLL Control Mode
+ *
+ */
+#ifndef __ASSEMBLER__
+enum chip_pll_mode {
+	CHIP_PLL_DOZE = 0,
+	CHIP_PLL_SLEEP = 1,
+	CHIP_PLL_DEEP_DOZE = 3,
+};
+#endif
+
+/**
+ *
+ * (20xxh) General Control (GCTRL) registers
+ *
+ */
+#define GCTRL_IT51XXX_REGS_BASE ((struct gctrl_it51xxx_regs *)DT_REG_ADDR(DT_NODELABEL(gctrl)))
+
+#ifndef __ASSEMBLER__
+struct gctrl_it51xxx_regs {
+	/* 0x00-0x01: Reserved_00_01 */
+	volatile uint8_t reserved_00_01[2];
+	/* 0x02: Chip Version */
+	volatile uint8_t GCTRL_ECHIPVER;
+	/* 0x03-0x05: Reserved_03_05 */
+	volatile uint8_t reserved_03_05[3];
+	/* 0x06: Reset Status */
+	volatile uint8_t GCTRL_RSTS;
+	/* 0x07-0x09: Reserved_07_09 */
+	volatile uint8_t reserved_07_09[3];
+	/* 0x0A: Base Address Select */
+	volatile uint8_t GCTRL_BADRSEL;
+	/* 0x0B: Wait Next Clock Rising */
+	volatile uint8_t GCTRL_WNCKR;
+	/* 0x0C: Special Control 5 */
+	volatile uint8_t GCTRL_SPCTRL5;
+	/* 0x0D: Special Control 1 */
+	volatile uint8_t GCTRL_SPCTRL1;
+	/* 0x0E-0x0F: reserved_0e_0f */
+	volatile uint8_t reserved_0e_0f[2];
+	/* 0x10: Reset Control DMM */
+	volatile uint8_t GCTRL_RSTDMMC;
+	/* 0x11: Reset Control 4 */
+	volatile uint8_t GCTRL_RSTC4;
+	/* 0x12-0x1B: reserved_12_1b */
+	volatile uint8_t reserved_12_1b[10];
+	/* 0x1C: Special Control 4 */
+	volatile uint8_t GCTRL_SPCTRL4;
+	/* 0x1D-0x1F: reserved_1d_1f */
+	volatile uint8_t reserved_1d_1f[3];
+	/* 0x20: Reset Control 5 */
+	volatile uint8_t GCTRL_RSTC5;
+	/* 0x21-0x37: reserved_21_37 */
+	volatile uint8_t reserved_21_37[23];
+	/* 0x38: Special Control 9 */
+	volatile uint8_t GCTRL_SPCTRL9;
+	/* 0x39-0x46: reserved_39_46 */
+	volatile uint8_t reserved_39_46[14];
+	/* 0x47: Scratch SRAM0 Base Address */
+	volatile uint8_t GCTRL_SCR0BAR;
+	/* 0x48: Scratch ROM 0 Size */
+	volatile uint8_t GCTRL_SCR0SZR;
+	/* 0x49-0x84: reserved_49_84 */
+	volatile uint8_t reserved_49_84[60];
+	/* 0x85: Chip ID Byte 1 */
+	volatile uint8_t GCTRL_ECHIPID1;
+	/* 0x86: Chip ID Byte 2 */
+	volatile uint8_t GCTRL_ECHIPID2;
+	/* 0x87: Chip ID Byte 3 */
+	volatile uint8_t GCTRL_ECHIPID3;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* GCTRL register fields */
+/* 0x06: Reset Status */
+#define IT51XXX_GCTRL_LRS         (BIT(1) | BIT(0))
+#define IT51XXX_GCTRL_IWDTR       BIT(1)
+/* 0x0B: Wait Next 65K Rising */
+#define IT51XXX_GCTRL_WN65K       0x00
+/* 0x10: Reset Control DMM */
+#define IT51XXX_GCTRL_UART1SD     BIT(3)
+#define IT51XXX_GCTRL_UART2SD     BIT(2)
+/* 0x11: Reset Control 4 */
+#define IT51XXX_GCTRL_RPECI       BIT(4)
+#define IT51XXX_GCTRL_RUART       BIT(2)
+/* 0x1C: Special Control 4 */
+#define IT51XXX_GCTRL_LRSIWR      BIT(2)
+#define IT51XXX_GCTRL_LRSIPWRSWTR BIT(1)
+#define IT51XXX_GCTRL_LRSIPGWR    BIT(0)
+/* 0x38: Special Control 9 */
+#define IT51XXX_GCTRL_ALTIE       BIT(4)
+/* 0x47: Scratch SRAM0 Base Address */
+#define IT51XXX_SEL_SRAM0_BASE_4K 0x04
+/* 0x48: Scratch ROM 0 Size */
+#define IT51XXX_GCTRL_SCRSIZE_4K  0x03
+
+/* Alias gpio_ite_ec_regs to gpio_it51xxx_regs for compatibility */
+#define gpio_ite_ec_regs       gpio_it51xxx_regs
+#define GPIO_ITE_EC_REGS_BASE  GPIO_IT51XXX_REGS_BASE
+/* Alias smfi_ite_ec_regs to smfi_it51xxx_regs for compatibility */
+#define smfi_ite_ec_regs       smfi_it51xxx_regs
+/* Alias gctrl_ite_ec_regs to gctrl_it51xxx_regs for compatibility */
+#define gctrl_ite_ec_regs      gctrl_it51xxx_regs
+#define GCTRL_ITE_EC_REGS_BASE GCTRL_IT51XXX_REGS_BASE
+
+#endif /* CHIP_CHIPREGS_H */
diff --git a/soc/ite/ec/it51xxx/ilm.h b/soc/ite/ec/it51xxx/ilm.h
new file mode 100644
index 0000000000000..40f3e57d1103a
--- /dev/null
+++ b/soc/ite/ec/it51xxx/ilm.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdbool.h>
+
+/* Places code in the section that gets mapped into ILM */
+#define __soc_ram_code __attribute__((section(".__ram_code")))
+
+#ifndef _ASMLANGUAGE
+void custom_reset_instr_cache(void);
+bool it8xxx2_is_ilm_configured(void);
+
+#endif
diff --git a/soc/ite/ec/it51xxx/ilm_wrapper.c b/soc/ite/ec/it51xxx/ilm_wrapper.c
new file mode 100644
index 0000000000000..668b2a4d1276b
--- /dev/null
+++ b/soc/ite/ec/it51xxx/ilm_wrapper.c
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <ilm.h>
+#include <soc_common.h>
+#include <zephyr/kernel.h>
+
+void __soc_ram_code custom_reset_instr_cache(void)
+{
+	/* Make sure the I-Cache is reset */
+	__asm__ volatile("fence.i" ::: "memory");
+}
diff --git a/soc/ite/ec/it51xxx/linker.ld b/soc/ite/ec/it51xxx/linker.ld
new file mode 100644
index 0000000000000..ec3feb5ee8a36
--- /dev/null
+++ b/soc/ite/ec/it51xxx/linker.ld
@@ -0,0 +1,493 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/devicetree.h>
+
+#include <zephyr/linker/sections.h>
+#include <zephyr/linker/devicetree_regions.h>
+
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/linker/linker-tool.h>
+
+#ifdef CONFIG_XIP
+#define ROMABLE_REGION              ROM
+#else
+#define ROMABLE_REGION              RAM
+#endif
+#define RAMABLE_REGION              RAM
+
+#define _EXCEPTION_SECTION_NAME     exceptions
+#define _RESET_SECTION_NAME         reset
+
+#if defined(CONFIG_ROM_END_OFFSET)
+#define ROM_END_OFFSET CONFIG_ROM_END_OFFSET
+#else
+#define ROM_END_OFFSET 0
+#endif
+
+#if defined(CONFIG_FLASH_LOAD_OFFSET)
+#define FLASH_LOAD_OFFSET CONFIG_FLASH_LOAD_OFFSET
+#else
+#define FLASH_LOAD_OFFSET 0
+#endif
+
+#ifdef CONFIG_XIP
+
+#if CONFIG_FLASH_LOAD_SIZE > 0
+#define ROM_SIZE (CONFIG_FLASH_LOAD_SIZE - ROM_END_OFFSET)
+#endif
+
+#if DT_NODE_HAS_COMPAT_STATUS(DT_CHOSEN(zephyr_flash), soc_nv_flash, okay)
+#define ROM_BASE (DT_REG_ADDR(DT_CHOSEN(zephyr_flash)) + FLASH_LOAD_OFFSET)
+#ifndef ROM_SIZE
+#define ROM_SIZE (DT_REG_SIZE(DT_CHOSEN(zephyr_flash)) - ROM_END_OFFSET)
+#endif
+
+#elif DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_flash), jedec_spi_nor)
+/* For jedec,spi-nor we expect the spi controller to memory map the flash
+ * and for that mapping to be on the register with the name flash_mmap and if a register with that
+ * name doesn't exists, we expect it to be in the second register property of the spi controller.
+ */
+#define SPI_CTRL DT_PARENT(DT_CHOSEN(zephyr_flash))
+#define FLASH_MMAP_NAME flash_mmap
+#define ROM_BASE                                                                                   \
+	(DT_REG_ADDR_BY_NAME_OR(SPI_CTRL, FLASH_MMAP_NAME, DT_REG_ADDR_BY_IDX(SPI_CTRL, 1)) +      \
+	 FLASH_LOAD_OFFSET)
+#ifndef ROM_SIZE
+#define ROM_SIZE                                                                                   \
+	(DT_REG_SIZE_BY_NAME_OR(SPI_CTRL, FLASH_MMAP_NAME, DT_REG_SIZE_BY_IDX(SPI_CTRL, 1)) -      \
+	 ROM_END_OFFSET)
+#endif
+
+#else /* Use Kconfig to cover the remaining cases */
+#define ROM_BASE (CONFIG_FLASH_BASE_ADDRESS + FLASH_LOAD_OFFSET)
+#ifndef ROM_SIZE
+#define ROM_SIZE (CONFIG_FLASH_SIZE * 1024 - FLASH_LOAD_OFFSET - ROM_END_OFFSET)
+#endif
+
+#endif /* DT_NODE_HAS_COMPAT_STATUS */
+
+#else /* CONFIG_XIP */
+#define ROM_BASE CONFIG_SRAM_BASE_ADDRESS
+#define ROM_SIZE (KB(CONFIG_SRAM_SIZE) - ROM_END_OFFSET)
+#endif /* CONFIG_XIP */
+
+#define RAM_BASE CONFIG_SRAM_BASE_ADDRESS
+#define RAM_SIZE KB(CONFIG_SRAM_SIZE)
+
+#ifdef CONFIG_RISCV_PMP
+	#define MPU_MIN_SIZE CONFIG_PMP_GRANULARITY
+	#define MPU_MIN_SIZE_ALIGN . = ALIGN(MPU_MIN_SIZE);
+	#if defined(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
+		#define MPU_ALIGN(region_size) \
+			. = ALIGN(MPU_MIN_SIZE); \
+			. = ALIGN( 1 << LOG2CEIL(region_size))
+	#else
+		#define MPU_ALIGN(region_size) \
+			. = ALIGN(MPU_MIN_SIZE)
+	#endif
+#else
+	#define MPU_MIN_SIZE_ALIGN
+	#define MPU_ALIGN(region_size) . = ALIGN(4)
+#endif
+
+#include <zephyr/linker/linker-devnull.h>
+
+MEMORY
+{
+#ifdef CONFIG_XIP
+    ROM (rx)  : ORIGIN = ROM_BASE, LENGTH = ROM_SIZE
+#endif
+    RAM (rwx) : ORIGIN = RAM_BASE, LENGTH = RAM_SIZE
+
+#if defined(CONFIG_LINKER_DEVNULL_MEMORY)
+    DEVNULL_ROM (rx) : ORIGIN = DEVNULL_ADDR, LENGTH = DEVNULL_SIZE
+#endif
+
+    LINKER_DT_REGIONS()
+
+    /* Used by and documented in include/linker/intlist.ld */
+    IDT_LIST  (wx)      : ORIGIN = 0xFFFFF7FF, LENGTH = 2K
+}
+
+ENTRY(CONFIG_KERNEL_ENTRY)
+
+SECTIONS
+    {
+
+#include <zephyr/linker/rel-sections.ld>
+
+#ifdef CONFIG_LLEXT
+#include <zephyr/linker/llext-sections.ld>
+#endif
+
+    /*
+     * The .plt and .iplt are here according to
+     * 'riscv32-zephyr-elf-ld --verbose', before text section.
+     */
+    SECTION_PROLOGUE(.plt,,)
+	{
+		*(.plt)
+	}
+
+    SECTION_PROLOGUE(.iplt,,)
+	{
+		*(.iplt)
+	}
+
+    GROUP_START(ROMABLE_REGION)
+    __rom_region_start = ROM_BASE;
+
+    SECTION_PROLOGUE(rom_start,,)
+    {
+		. = ALIGN(16);
+/* Located in generated directory. This file is populated by calling
+ * zephyr_linker_sources(ROM_START ...).
+ */
+#include <snippets-rom-start.ld>
+    } GROUP_LINK_IN(ROMABLE_REGION)
+
+#ifdef CONFIG_CODE_DATA_RELOCATION
+#include <linker_relocate.ld>
+#endif
+
+    SECTION_PROLOGUE(_RESET_SECTION_NAME,,)
+    {
+		KEEP(*(.reset.*))
+    } GROUP_LINK_IN(ROMABLE_REGION)
+
+    SECTION_PROLOGUE(_EXCEPTION_SECTION_NAME,,)
+    {
+		. = ALIGN(256);
+		 KEEP(*(".exception.entry.*"))
+		 *(".exception.other.*")
+    } GROUP_LINK_IN(ROMABLE_REGION)
+
+    SECTION_PROLOGUE(_TEXT_SECTION_NAME,,)
+	{
+		. = ALIGN(4);
+		KEEP(*(.openocd_debug))
+		KEEP(*(".openocd_debug.*"))
+
+		__text_region_start = .;
+
+		*(.text)
+		*(".text.*")
+		*(.gnu.linkonce.t.*)
+#include <zephyr/linker/kobject-text.ld>
+		. = ALIGN(0x1000);
+		/* Mapping base address must be 4k-aligned */
+		__ilm_flash_start = .;
+		/* Specially-tagged functions in SoC sources */
+		KEEP(*(.__ram_code))
+		*(.__ram_code.*)
+		__ilm_flash_end = .;
+		/* ILM mapping is always a multiple of 4k size; ensure following
+		 * sections won't incorrectly redirect to RAM. */
+		. = ALIGN(0x1000);
+
+	} GROUP_LINK_IN(ROMABLE_REGION)
+
+    __text_region_end = .;
+
+	__rodata_region_start = .;
+#include <zephyr/linker/common-rom.ld>
+/* Located in generated directory. This file is populated by calling
+ * zephyr_linker_sources(ROM_SECTIONS ...). Useful for grouping iterable RO structs.
+ */
+#include <snippets-rom-sections.ld>
+#include <zephyr/linker/thread-local-storage.ld>
+
+    SECTION_PROLOGUE(_RODATA_SECTION_NAME,,)
+	{
+		 . = ALIGN(4);
+		 *(.srodata)
+		 *(".srodata.*")
+		 *(.rodata)
+		 *(".rodata.*")
+		 *(.gnu.linkonce.r.*)
+		 *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+
+/* Located in generated directory. This file is populated by the
+ * zephyr_linker_sources() Cmake function.
+ */
+#include <snippets-rodata.ld>
+#include <zephyr/linker/kobject-rom.ld>
+	. = ALIGN(4);
+	} GROUP_LINK_IN(ROMABLE_REGION)
+
+#include <zephyr/linker/cplusplus-rom.ld>
+	__rodata_region_end = .;
+
+	/* For non-XIP system, __rom_region_end symbol should be set to
+	 * the end of common ROMABLE_REGIONs (text and rodata) instead of
+	 * the linker script end, so it wouldn't mistakenly contain
+	 * RAMABLE_REGION in it.
+	 */
+#ifndef CONFIG_XIP
+#ifdef CONFIG_RISCV_PMP
+	SECTION_PROLOGUE(rom_mpu_padding,,)
+	{
+		MPU_ALIGN(__rodata_region_end - __rom_region_start);
+#ifdef CONFIG_QEMU_TARGET
+		/*
+		 * QEMU doesn't vet each instruction fetch individually.
+		 * Instead, it grabs a whole page and perform dynamic
+		 * translation on it in a batch. It therefore validates
+		 * PMP permissions using page-sized and -aligned chunks.
+		 */
+		. = ALIGN(0x1000);
+#endif
+	} GROUP_LINK_IN(ROMABLE_REGION)
+#endif /* CONFIG_RISCV_PMP */
+
+	__rom_region_end = .;
+	__rom_region_size = __rom_region_end - __rom_region_start;
+#endif /* CONFIG_XIP */
+    GROUP_END(ROMABLE_REGION)
+
+    GROUP_START(RAMABLE_REGION)
+
+	. = RAM_BASE;
+
+    /* Claim RAM for ILM mappings; must be 4k-aligned and each mapping is 4k in size */
+    SECTION_PROLOGUE(ilm_ram,(NOLOAD),ALIGN(0x1000))
+	{
+		/* On IT51XXX chip, scratch RAM must start at RAM_BASE+0x1000 */
+		. += 0x1000;
+		__ilm_ram_start = .;
+		. += __ilm_flash_end - __ilm_flash_start;
+		__ilm_ram_end = .;
+		/* Aligning 4k ensures ILM doesn't overwritte RAM. */
+		. = ALIGN(0x1000);
+	} GROUP_LINK_IN(RAMABLE_REGION)
+
+	_image_ram_start = .;
+/* Located in generated directory. This file is populated by the
+ * zephyr_linker_sources() Cmake function.
+ */
+#include <snippets-ram-sections.ld>
+
+#if defined(CONFIG_USERSPACE)
+#define APP_SHARED_ALIGN MPU_MIN_SIZE_ALIGN
+#define SMEM_PARTITION_ALIGN MPU_ALIGN
+
+#include <app_smem.ld>
+
+	_app_smem_size = _app_smem_end - _app_smem_start;
+	_app_smem_rom_start = LOADADDR(_APP_SMEM_SECTION_NAME);
+#endif /* CONFIG_USERSPACE */
+
+    SECTION_DATA_PROLOGUE(_BSS_SECTION_NAME,(NOLOAD),)
+	{
+		MPU_MIN_SIZE_ALIGN
+		/*
+		 * For performance, BSS section is assumed to be 4 byte aligned and
+		 * a multiple of 4 bytes
+		 */
+		 . = ALIGN(4);
+		 __bss_start = .;
+		__kernel_ram_start = .;
+		 *(.sbss)
+		 *(".sbss.*")
+		 *(.bss)
+		 *(".bss.*")
+		 COMMON_SYMBOLS
+
+#ifdef CONFIG_CODE_DATA_RELOCATION
+#include <linker_sram_bss_relocate.ld>
+#endif
+
+		 /*
+		  * As memory is cleared in words only, it is simpler to ensure the BSS
+		  * section ends on a 4 byte boundary. This wastes a maximum of 3 bytes.
+		  */
+		  __bss_end = ALIGN(4);
+	}  GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
+
+#include <zephyr/linker/common-noinit.ld>
+
+    SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
+	{
+		 . = ALIGN(4);
+		/* _image_ram_start = .; */
+		 __data_region_start = .;
+		 __data_start = .;
+
+		 *(.data)
+		 *(".data.*")
+
+#ifdef CONFIG_RISCV_GP
+		/*
+		 * RISC-V architecture has 12-bit signed immediate offsets in the
+		 * instructions. If we can put the most commonly accessed globals
+		 * in a special 4K span of memory addressed by the GP register, then
+		 * we can access those values in a single instruction, saving both
+		 * codespace and runtime.
+		 *
+		 * Since these immediate offsets are signed, place gp 0x800 past the
+		 * beginning of .sdata so that we can use both positive and negative
+		 * offsets.
+		 */
+		 . = ALIGN(8);
+		 PROVIDE (__global_pointer$ = . + 0x800);
+#endif
+
+		 *(.sdata .sdata.* .gnu.linkonce.s.*)
+
+/* Located in generated directory. This file is populated by the
+ * zephyr_linker_sources() Cmake function.
+ */
+#include <snippets-rwdata.ld>
+
+#ifdef CONFIG_CODE_DATA_RELOCATION
+#include <linker_sram_data_relocate.ld>
+#endif
+
+		 __data_end = .;
+
+	}  GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+	__data_size = __data_end - __data_start;
+	__data_load_start = LOADADDR(_DATA_SECTION_NAME);
+
+	__data_region_load_start = LOADADDR(_DATA_SECTION_NAME);
+
+#include <zephyr/linker/common-ram.ld>
+#include <zephyr/linker/kobject-data.ld>
+#include <zephyr/linker/cplusplus-ram.ld>
+
+/* Located in generated directory. This file is populated by the
+ * zephyr_linker_sources() Cmake function.
+ */
+#include <snippets-data-sections.ld>
+
+    __data_region_end = .;
+
+	__kernel_ram_end = .;
+	__kernel_ram_size = __kernel_ram_end - __kernel_ram_start;
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
+GROUP_START(ITCM)
+
+	SECTION_PROLOGUE(_ITCM_SECTION_NAME,,SUBALIGN(8))
+	{
+		__itcm_start = .;
+		*(.itcm)
+		*(".itcm.*")
+
+/* Located in generated directory. This file is populated by the
+ * zephyr_linker_sources() Cmake function. */
+#include <snippets-itcm-section.ld>
+
+		__itcm_end = .;
+	} GROUP_LINK_IN(ITCM AT> ROMABLE_REGION)
+
+	__itcm_size = __itcm_end - __itcm_start;
+	__itcm_load_start = LOADADDR(_ITCM_SECTION_NAME);
+
+GROUP_END(ITCM)
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+GROUP_START(DTCM)
+
+	SECTION_PROLOGUE(_DTCM_BSS_SECTION_NAME, (NOLOAD),SUBALIGN(8))
+	{
+		__dtcm_start = .;
+		__dtcm_bss_start = .;
+		*(.dtcm_bss)
+		*(".dtcm_bss.*")
+		__dtcm_bss_end = .;
+	} GROUP_LINK_IN(DTCM)
+
+	SECTION_PROLOGUE(_DTCM_NOINIT_SECTION_NAME, (NOLOAD),SUBALIGN(8))
+	{
+		__dtcm_noinit_start = .;
+		*(.dtcm_noinit)
+		*(".dtcm_noinit.*")
+		__dtcm_noinit_end = .;
+	} GROUP_LINK_IN(DTCM)
+
+	SECTION_PROLOGUE(_DTCM_DATA_SECTION_NAME,,SUBALIGN(8))
+	{
+		__dtcm_data_start = .;
+		*(.dtcm_data)
+		*(".dtcm_data.*")
+
+/* Located in generated directory. This file is populated by the
+ * zephyr_linker_sources() Cmake function. */
+#include <snippets-dtcm-section.ld>
+
+		__dtcm_data_end = .;
+	} GROUP_LINK_IN(DTCM AT> ROMABLE_REGION)
+
+	__dtcm_end = .;
+
+	__dtcm_data_load_start = LOADADDR(_DTCM_DATA_SECTION_NAME);
+
+GROUP_END(DTCM)
+#endif
+
+/* Located in generated directory. This file is populated by the
+ * zephyr_linker_sources() Cmake function.
+ */
+#include <snippets-sections.ld>
+
+#define LAST_RAM_ALIGN MPU_MIN_SIZE_ALIGN
+
+#include <zephyr/linker/ram-end.ld>
+
+    GROUP_END(RAMABLE_REGION)
+
+#include <zephyr/linker/debug-sections.ld>
+
+    /DISCARD/ : { *(.note.GNU-stack) }
+
+    SECTION_PROLOGUE(.riscv.attributes, 0,)
+	{
+	KEEP(*(.riscv.attributes))
+	KEEP(*(.gnu.attributes))
+	}
+
+/* Output section descriptions are needed for these sections to suppress
+ * warnings when "--orphan-handling=warn" is set for lld.
+ */
+#if defined(CONFIG_LLVM_USE_LLD)
+    SECTION_PROLOGUE(.symtab, 0,) { *(.symtab) }
+    SECTION_PROLOGUE(.strtab, 0,) { *(.strtab) }
+    SECTION_PROLOGUE(.shstrtab, 0,) { *(.shstrtab) }
+#endif
+
+    /* Sections generated from 'zephyr,memory-region' nodes */
+    LINKER_DT_SECTIONS()
+
+/* Because ROMABLE_REGION != RAMABLE_REGION in XIP-system, it is valid
+ * to set __rom_region_end symbol at the end of linker script and
+ * doesn't mistakenly contain the RAMABLE_REGION in it.
+ */
+#ifdef CONFIG_XIP
+/* Must be last in romable region */
+SECTION_PROLOGUE(.last_section,,)
+{
+#ifdef CONFIG_LINKER_LAST_SECTION_ID
+  /* Fill last section with a word to ensure location counter and actual rom
+   * region data usage match. */
+  LONG(CONFIG_LINKER_LAST_SECTION_ID_PATTERN)
+  /* __rom_region_size is used when configuring the PMP entry of the ROM region.
+   * Addresses (pmpaddr) in PMP registers need to be aligned to 4. Align
+   * __rom_region_size to 4 to meet that requirement. */
+  MPU_MIN_SIZE_ALIGN
+#endif
+} GROUP_LINK_IN(ROMABLE_REGION)
+
+/* To provide the image size as a const expression,
+ * calculate this value here. */
+__rom_region_end = LOADADDR(.last_section) + SIZEOF(.last_section);
+__rom_region_size = __rom_region_end - __rom_region_start;
+#endif
+
+}
diff --git a/soc/ite/ec/it51xxx/soc.c b/soc/ite/ec/it51xxx/soc.c
new file mode 100644
index 0000000000000..df691a0784b69
--- /dev/null
+++ b/soc/ite/ec/it51xxx/soc.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc_common.h>
+#include <zephyr/kernel.h>
+
+static mm_reg_t ecpm_base = DT_REG_ADDR(DT_NODELABEL(ecpm));
+/* it51xxx ECPM registers definition */
+/* 0x03: PLL Control */
+#define ECPM_PLLCTRL 0x03
+
+void chip_pll_ctrl(enum chip_pll_mode mode)
+{
+	volatile uint8_t _pll_ctrl __unused;
+
+	sys_write8(mode, ecpm_base + ECPM_PLLCTRL);
+	/*
+	 * for deep doze / sleep mode
+	 * This load operation will ensure PLL setting is taken into
+	 * control register before wait for interrupt instruction.
+	 */
+	_pll_ctrl = sys_read8(ecpm_base + ECPM_PLLCTRL);
+}
+
+#ifdef CONFIG_SOC_IT51XXX_CPU_IDLE_GATING
+/* Preventing CPU going into idle mode during command queue. */
+static atomic_t cpu_idle_disabled;
+
+void chip_permit_idle(void)
+{
+	atomic_dec(&cpu_idle_disabled);
+}
+
+void chip_block_idle(void)
+{
+	atomic_inc(&cpu_idle_disabled);
+}
+
+bool cpu_idle_not_allowed(void)
+{
+	return atomic_get(&cpu_idle_disabled);
+}
+#endif
+
+/* The routine must be called with interrupts locked */
+void riscv_idle(enum chip_pll_mode mode, unsigned int key)
+{
+	/*
+	 * The routine is called with interrupts locked (in kernel/idle()).
+	 * But on kernel/context test_kernel_cpu_idle test, the routine will be
+	 * called without interrupts locked. Hence we disable M-mode external
+	 * interrupt here to protect the below content.
+	 */
+	csr_clear(mie, MIP_MEIP);
+	sys_trace_idle();
+
+	/* Chip doze after wfi instruction */
+	chip_pll_ctrl(mode);
+
+	/* Wait for interrupt */
+	__asm__ volatile("wfi");
+
+	/*
+	 * Enable M-mode external interrupt
+	 * An interrupt can not be fired yet until we enable global interrupt
+	 */
+	csr_set(mie, MIP_MEIP);
+
+	/* Restore global interrupt lockout state */
+	irq_unlock(key);
+}
+
+void arch_cpu_idle(void)
+{
+#ifdef CONFIG_SOC_IT51XXX_CPU_IDLE_GATING
+	/*
+	 * The EC processor(CPU) cannot be in the k_cpu_idle() during
+	 * the transactions with the CQ mode(DMA mode). Otherwise,
+	 * the EC processor would be clock gated.
+	 */
+	if (cpu_idle_not_allowed()) {
+		/* Restore global interrupt lockout state */
+		irq_unlock(MSTATUS_IEN);
+	} else {
+#endif
+		riscv_idle(CHIP_PLL_DOZE, MSTATUS_IEN);
+#ifdef CONFIG_SOC_IT51XXX_CPU_IDLE_GATING
+	}
+#endif
+}
+
+void arch_cpu_atomic_idle(unsigned int key)
+{
+	riscv_idle(CHIP_PLL_DOZE, key);
+}
+
+void soc_prep_hook(void)
+{
+	struct gpio_ite_ec_regs *const gpio_regs = GPIO_ITE_EC_REGS_BASE;
+	struct gctrl_ite_ec_regs *const gctrl_regs = GCTRL_ITE_EC_REGS_BASE;
+
+	/* Scratch SRAM0 uses the 4KB based form 0x801000h */
+	gctrl_regs->GCTRL_SCR0BAR = IT51XXX_SEL_SRAM0_BASE_4K;
+
+	/* bit4: wake up CPU if it is in low power mode and an interrupt is pending. */
+	gctrl_regs->GCTRL_SPCTRL9 |= IT51XXX_GCTRL_ALTIE;
+
+	/* UART1 and UART2 board init */
+	/* bit3: UART1 and UART2 belong to the EC side. */
+	gctrl_regs->GCTRL_RSTDMMC |= IT51XXX_GCTRL_UART1SD | IT51XXX_GCTRL_UART2SD;
+	/* Reset UART before config it */
+	gctrl_regs->GCTRL_RSTC4 = IT51XXX_GCTRL_RUART;
+	/* Switch UART1 and UART2 on without hardware flow control */
+	gpio_regs->GPIO_GCR1 |=
+		IT51XXX_GPIO_U1CTRL_SIN0_SOUT0_EN | IT51XXX_GPIO_U2CTRL_SIN1_SOUT1_EN;
+}
diff --git a/soc/ite/ec/it51xxx/soc.h b/soc/ite/ec/it51xxx/soc.h
new file mode 100644
index 0000000000000..869206638dcb6
--- /dev/null
+++ b/soc/ite/ec/it51xxx/soc.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __RISCV_ITE_SOC_H_
+#define __RISCV_ITE_SOC_H_
+
+#include <soc_common.h>
+
+#endif /* __RISCV_ITE_SOC_H_ */
diff --git a/soc/ite/ec/it51xxx/vector.S b/soc/ite/ec/it51xxx/vector.S
new file mode 100644
index 0000000000000..74d33f894c751
--- /dev/null
+++ b/soc/ite/ec/it51xxx/vector.S
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/toolchain.h>
+
+/* exports */
+GTEXT(__start)
+
+/* imports */
+GTEXT(__initialize)
+GTEXT(_isr_wrapper)
+
+SECTION_FUNC(vectors, __start)
+#ifdef CONFIG_RISCV_GP
+	.option push
+	.option norelax
+	/* Configure the GP register */
+	la gp, __global_pointer$
+	.option pop
+#endif
+
+	.option norvc;
+	/*
+	 * Set mtvec (Machine Trap-Vector Base-Address Register)
+	 * to _isr_wrapper.
+	 */
+	la t0, _isr_wrapper
+	csrw mtvec, t0
+	csrwi mie, 0
+	/* Jump to __initialize */
+	tail __initialize
+
+/*
+ * eflash signature used to enable specific function after power-on reset.
+ * (HW mechanism)
+ * The content of 16-bytes must be the following and at offset 0x40 of binary.
+ * ----------------------------------------------------------------------------
+ * 1st 2nd 3rd 4th 5th 6th 7th    8th    9th 10th 11th 12th 13th 14th 15th 16th
+ * ----------------------------------------------------------------------------
+ * A5h A5h A5h A5h A5h A5h [host] [flag] 85h  12h  5Ah  5Ah  AAh  AAh  55h  55h
+ * ----------------------------------------------------------------------------
+ * 7th [host]: A4h = enable eSPI, A5h = enable LPC
+ */
+.org 0x40
+.balign 16
+.global eflash_sig
+eflash_sig:
+.byte 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5
+/* Enable eSPI */
+.byte 0xA4
+/* Flag of signature. Enable internal clock generator */
+.byte 0xB4
+.byte 0x85, 0x12, 0x5A, 0x5A, 0xAA, 0xAA, 0x55, 0x55
diff --git a/soc/ite/ec/it8xxx2/CMakeLists.txt b/soc/ite/ec/it8xxx2/CMakeLists.txt
index 425642c1727d2..9d101f2b83aba 100644
--- a/soc/ite/ec/it8xxx2/CMakeLists.txt
+++ b/soc/ite/ec/it8xxx2/CMakeLists.txt
@@ -1,4 +1,4 @@
-zephyr_sources(soc.c)
+zephyr_sources(soc.c check_regs.c vector.S)
 zephyr_include_directories(.)
 
 zephyr_library_sources_ifndef(CONFIG_RISCV_ISA_EXT_M __arithmetic.S)
diff --git a/soc/ite/ec/it8xxx2/Kconfig b/soc/ite/ec/it8xxx2/Kconfig
index 739278e97f931..c959e886d277b 100644
--- a/soc/ite/ec/it8xxx2/Kconfig
+++ b/soc/ite/ec/it8xxx2/Kconfig
@@ -7,6 +7,7 @@ config SOC_SERIES_IT8XXX2
 	select ARCH_HAS_CUSTOM_CPU_IDLE
 	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 	select RISCV_SOC_HAS_GP_RELATIVE_ADDRESSING
+	select SOC_PREP_HOOK
 
 if SOC_SERIES_IT8XXX2
 
diff --git a/soc/ite/ec/common/check_regs.c b/soc/ite/ec/it8xxx2/check_regs.c
similarity index 94%
rename from soc/ite/ec/common/check_regs.c
rename to soc/ite/ec/it8xxx2/check_regs.c
index 2fb6dcb41285d..5c0a74891ceb7 100644
--- a/soc/ite/ec/common/check_regs.c
+++ b/soc/ite/ec/it8xxx2/check_regs.c
@@ -165,30 +165,23 @@ IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, host_rx_connect_state, 0x0E);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, host_sof_timer_msb, 0x0F);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[0].ep_ctrl, 0x40);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[0].ep_status, 0x41);
-IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs,
-	usb_ep_regs[EP0].ep_transtype_sts, 0x42);
-IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs,
-	usb_ep_regs[EP0].ep_nak_transtype_sts, 0x43);
+IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[EP0].ep_transtype_sts, 0x42);
+IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[EP0].ep_nak_transtype_sts, 0x43);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[3].ep_ctrl, 0x4C);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[3].ep_status, 0x4D);
-IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs,
-	usb_ep_regs[EP3].ep_transtype_sts, 0x4E);
-IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs,
-	usb_ep_regs[EP3].ep_nak_transtype_sts, 0x4F);
+IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[EP3].ep_transtype_sts, 0x4E);
+IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, usb_ep_regs[EP3].ep_nak_transtype_sts, 0x4F);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, dc_control, 0x50);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, dc_frame_num_lsp, 0x56);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, fifo_regs[0].ep_rx_fifo_data, 0x60);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, fifo_regs[0].ep_tx_fifo_ctrl, 0x74);
-IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs,
-	fifo_regs[EP_EXT_REGS_9X].ext_4_15.epn0n1_ext_ctrl, 0x98);
-IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs,
-	fifo_regs[EP_EXT_REGS_BX].fifo_ctrl.ep_fifo_ctrl, 0xB8);
-IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs,
-	fifo_regs[EP_EXT_REGS_DX].ext_0_3.epn_ext_ctrl, 0xD6);
+IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, fifo_regs[EP_EXT_REGS_9X].ext_4_15.epn0n1_ext_ctrl,
+			 0x98);
+IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, fifo_regs[EP_EXT_REGS_BX].fifo_ctrl.ep_fifo_ctrl, 0xB8);
+IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, fifo_regs[EP_EXT_REGS_DX].ext_0_3.epn_ext_ctrl, 0xD6);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, host_device_control, 0xE0);
 IT8XXX2_REG_OFFSET_CHECK(usb_it82xx2_regs, port1_misc_control, 0xE8);
 
-
 /* KSCAN register structure check */
 IT8XXX2_REG_SIZE_CHECK(kscan_it8xxx2_regs, 0x0F);
 IT8XXX2_REG_OFFSET_CHECK(kscan_it8xxx2_regs, KBS_KSOL, 0x00);
diff --git a/soc/ite/ec/it8xxx2/chip_chipregs.h b/soc/ite/ec/it8xxx2/chip_chipregs.h
new file mode 100644
index 0000000000000..d7c9c1ca27e46
--- /dev/null
+++ b/soc/ite/ec/it8xxx2/chip_chipregs.h
@@ -0,0 +1,2270 @@
+/*
+ * Copyright (c) 2020 ITE Corporation. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef CHIP_CHIPREGS_H
+#define CHIP_CHIPREGS_H
+
+#include <zephyr/sys/util.h>
+
+#define EC_REG_BASE_ADDR 0x00f00000
+
+#ifdef _ASMLANGUAGE
+#define ECREG(x) x
+#else
+
+/*
+ * Macros for hardware registers access.
+ */
+#define ECREG(x)                   (*((volatile unsigned char *)(x)))
+#define ECREG_u16(x)               (*((volatile unsigned short *)(x)))
+#define ECREG_u32(x)               (*((volatile unsigned long *)(x)))
+
+/*
+ * MASK operation macros
+ */
+#define SET_MASK(reg, bit_mask)    ((reg) |= (bit_mask))
+#define CLEAR_MASK(reg, bit_mask)  ((reg) &= (~(bit_mask)))
+#define IS_MASK_SET(reg, bit_mask) (((reg) & (bit_mask)) != 0)
+#endif /* _ASMLANGUAGE */
+
+#ifndef REG_BASE_ADDR
+#define REG_BASE_ADDR EC_REG_BASE_ADDR
+#endif
+
+/* Common definition */
+/*
+ * EC clock frequency (PWM and tachometer driver need it to reply
+ * to api or calculate RPM)
+ */
+#ifdef CONFIG_SOC_IT8XXX2_EC_BUS_24MHZ
+#define EC_FREQ MHZ(24)
+#else
+#define EC_FREQ MHZ(8)
+
+#endif
+
+/* --- General Control (GCTRL) --- */
+#define IT8XXX2_GCTRL_BASE    0x00F02000
+#define IT8XXX2_GCTRL_EIDSR   ECREG(IT8XXX2_GCTRL_BASE + 0x31)
+#define IT8XXX2_GCTRL_PMER3   ECREG(IT8XXX2_GCTRL_BASE + 0x46)
+/* RISC-V JTAG Debug Interface Enable */
+#define IT8XXX2_GCTRL_JTAGEN  BIT(1)
+/* RISC-V JTAG Debug Interface Selection */
+#define IT8XXX2_GCTRL_JTAGSEL BIT(0)
+#define IT8XXX2_GCTRL_JTAG    (IT8XXX2_GCTRL_JTAGEN | IT8XXX2_GCTRL_JTAGSEL)
+
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V2
+#define IT8XXX2_JTAG_PINS_BASE ECREG(0xF01660)
+#define IT8XXX2_JTAG_VOLT_SET  ECREG(0xF01648)
+#elif CONFIG_SOC_IT8XXX2_REG_SET_V1
+#define IT8XXX2_JTAG_PINS_BASE ECREG(0xF01610)
+#define IT8XXX2_JTAG_VOLT_SET  ECREG(0xF016e9)
+#endif
+
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V2
+/* --- External GPIO Control (EGPIO) --- */
+#define IT8XXX2_EGPIO_BASE 0x00F02100
+#define IT8XXX2_EGPIO_EGCR ECREG(IT8XXX2_EGPIO_BASE + 0x04)
+
+/* EGPIO register fields */
+/*
+ * 0x04: External GPIO Control
+ * BIT(4): EXGPIO EGAD Pin Output Driving Disable
+ */
+#define IT8XXX2_EGPIO_EEPODD BIT(4)
+#endif
+
+/**
+ *
+ * (11xxh) Interrupt controller (INTC)
+ *
+ */
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+#define ISR0  ECREG(EC_REG_BASE_ADDR + 0x3F00)
+#define ISR1  ECREG(EC_REG_BASE_ADDR + 0x3F01)
+#define ISR2  ECREG(EC_REG_BASE_ADDR + 0x3F02)
+#define ISR3  ECREG(EC_REG_BASE_ADDR + 0x3F03)
+#define ISR4  ECREG(EC_REG_BASE_ADDR + 0x3F14)
+#define ISR5  ECREG(EC_REG_BASE_ADDR + 0x3F18)
+#define ISR6  ECREG(EC_REG_BASE_ADDR + 0x3F1C)
+#define ISR7  ECREG(EC_REG_BASE_ADDR + 0x3F20)
+#define ISR8  ECREG(EC_REG_BASE_ADDR + 0x3F24)
+#define ISR9  ECREG(EC_REG_BASE_ADDR + 0x3F28)
+#define ISR10 ECREG(EC_REG_BASE_ADDR + 0x3F2C)
+#define ISR11 ECREG(EC_REG_BASE_ADDR + 0x3F30)
+#define ISR12 ECREG(EC_REG_BASE_ADDR + 0x3F34)
+#define ISR13 ECREG(EC_REG_BASE_ADDR + 0x3F38)
+#define ISR14 ECREG(EC_REG_BASE_ADDR + 0x3F3C)
+#define ISR15 ECREG(EC_REG_BASE_ADDR + 0x3F40)
+#define ISR16 ECREG(EC_REG_BASE_ADDR + 0x3F44)
+#define ISR17 ECREG(EC_REG_BASE_ADDR + 0x3F48)
+#define ISR18 ECREG(EC_REG_BASE_ADDR + 0x3F4C)
+#define ISR19 ECREG(EC_REG_BASE_ADDR + 0x3F50)
+#define ISR20 ECREG(EC_REG_BASE_ADDR + 0x3F54)
+#define ISR21 ECREG(EC_REG_BASE_ADDR + 0x3F58)
+#define ISR22 ECREG(EC_REG_BASE_ADDR + 0x3F5C)
+#define ISR23 ECREG(EC_REG_BASE_ADDR + 0x3F90)
+
+#define IER0  ECREG(EC_REG_BASE_ADDR + 0x3F04)
+#define IER1  ECREG(EC_REG_BASE_ADDR + 0x3F05)
+#define IER2  ECREG(EC_REG_BASE_ADDR + 0x3F06)
+#define IER3  ECREG(EC_REG_BASE_ADDR + 0x3F07)
+#define IER4  ECREG(EC_REG_BASE_ADDR + 0x3F15)
+#define IER5  ECREG(EC_REG_BASE_ADDR + 0x3F19)
+#define IER6  ECREG(EC_REG_BASE_ADDR + 0x3F1D)
+#define IER7  ECREG(EC_REG_BASE_ADDR + 0x3F21)
+#define IER8  ECREG(EC_REG_BASE_ADDR + 0x3F25)
+#define IER9  ECREG(EC_REG_BASE_ADDR + 0x3F29)
+#define IER10 ECREG(EC_REG_BASE_ADDR + 0x3F2D)
+#define IER11 ECREG(EC_REG_BASE_ADDR + 0x3F31)
+#define IER12 ECREG(EC_REG_BASE_ADDR + 0x3F35)
+#define IER13 ECREG(EC_REG_BASE_ADDR + 0x3F39)
+#define IER14 ECREG(EC_REG_BASE_ADDR + 0x3F3D)
+#define IER15 ECREG(EC_REG_BASE_ADDR + 0x3F41)
+#define IER16 ECREG(EC_REG_BASE_ADDR + 0x3F45)
+#define IER17 ECREG(EC_REG_BASE_ADDR + 0x3F49)
+#define IER18 ECREG(EC_REG_BASE_ADDR + 0x3F4D)
+#define IER19 ECREG(EC_REG_BASE_ADDR + 0x3F51)
+#define IER20 ECREG(EC_REG_BASE_ADDR + 0x3F55)
+#define IER21 ECREG(EC_REG_BASE_ADDR + 0x3F59)
+#define IER22 ECREG(EC_REG_BASE_ADDR + 0x3F5D)
+#define IER23 ECREG(EC_REG_BASE_ADDR + 0x3F91)
+
+#define IELMR0  ECREG(EC_REG_BASE_ADDR + 0x3F08)
+#define IELMR1  ECREG(EC_REG_BASE_ADDR + 0x3F09)
+#define IELMR2  ECREG(EC_REG_BASE_ADDR + 0x3F0A)
+#define IELMR3  ECREG(EC_REG_BASE_ADDR + 0x3F0B)
+#define IELMR4  ECREG(EC_REG_BASE_ADDR + 0x3F16)
+#define IELMR5  ECREG(EC_REG_BASE_ADDR + 0x3F1A)
+#define IELMR6  ECREG(EC_REG_BASE_ADDR + 0x3F1E)
+#define IELMR7  ECREG(EC_REG_BASE_ADDR + 0x3F22)
+#define IELMR8  ECREG(EC_REG_BASE_ADDR + 0x3F26)
+#define IELMR9  ECREG(EC_REG_BASE_ADDR + 0x3F2A)
+#define IELMR10 ECREG(EC_REG_BASE_ADDR + 0x3F2E)
+#define IELMR11 ECREG(EC_REG_BASE_ADDR + 0x3F32)
+#define IELMR12 ECREG(EC_REG_BASE_ADDR + 0x3F36)
+#define IELMR13 ECREG(EC_REG_BASE_ADDR + 0x3F3A)
+#define IELMR14 ECREG(EC_REG_BASE_ADDR + 0x3F3E)
+#define IELMR15 ECREG(EC_REG_BASE_ADDR + 0x3F42)
+#define IELMR16 ECREG(EC_REG_BASE_ADDR + 0x3F46)
+#define IELMR17 ECREG(EC_REG_BASE_ADDR + 0x3F4A)
+#define IELMR18 ECREG(EC_REG_BASE_ADDR + 0x3F4E)
+#define IELMR19 ECREG(EC_REG_BASE_ADDR + 0x3F52)
+#define IELMR20 ECREG(EC_REG_BASE_ADDR + 0x3F56)
+#define IELMR21 ECREG(EC_REG_BASE_ADDR + 0x3F5A)
+#define IELMR22 ECREG(EC_REG_BASE_ADDR + 0x3F5E)
+#define IELMR23 ECREG(EC_REG_BASE_ADDR + 0x3F92)
+
+#define IPOLR0  ECREG(EC_REG_BASE_ADDR + 0x3F0C)
+#define IPOLR1  ECREG(EC_REG_BASE_ADDR + 0x3F0D)
+#define IPOLR2  ECREG(EC_REG_BASE_ADDR + 0x3F0E)
+#define IPOLR3  ECREG(EC_REG_BASE_ADDR + 0x3F0F)
+#define IPOLR4  ECREG(EC_REG_BASE_ADDR + 0x3F17)
+#define IPOLR5  ECREG(EC_REG_BASE_ADDR + 0x3F1B)
+#define IPOLR6  ECREG(EC_REG_BASE_ADDR + 0x3F1F)
+#define IPOLR7  ECREG(EC_REG_BASE_ADDR + 0x3F23)
+#define IPOLR8  ECREG(EC_REG_BASE_ADDR + 0x3F27)
+#define IPOLR9  ECREG(EC_REG_BASE_ADDR + 0x3F2B)
+#define IPOLR10 ECREG(EC_REG_BASE_ADDR + 0x3F2F)
+#define IPOLR11 ECREG(EC_REG_BASE_ADDR + 0x3F33)
+#define IPOLR12 ECREG(EC_REG_BASE_ADDR + 0x3F37)
+#define IPOLR13 ECREG(EC_REG_BASE_ADDR + 0x3F3B)
+#define IPOLR14 ECREG(EC_REG_BASE_ADDR + 0x3F3F)
+#define IPOLR15 ECREG(EC_REG_BASE_ADDR + 0x3F43)
+#define IPOLR16 ECREG(EC_REG_BASE_ADDR + 0x3F47)
+#define IPOLR17 ECREG(EC_REG_BASE_ADDR + 0x3F4B)
+#define IPOLR18 ECREG(EC_REG_BASE_ADDR + 0x3F4F)
+#define IPOLR19 ECREG(EC_REG_BASE_ADDR + 0x3F53)
+#define IPOLR20 ECREG(EC_REG_BASE_ADDR + 0x3F57)
+#define IPOLR21 ECREG(EC_REG_BASE_ADDR + 0x3F5B)
+#define IPOLR22 ECREG(EC_REG_BASE_ADDR + 0x3F5F)
+#define IPOLR23 ECREG(EC_REG_BASE_ADDR + 0x3F93)
+#endif
+#define IVECT ECREG(EC_REG_BASE_ADDR + 0x3F10)
+
+/*
+ * TODO: use pinctrl node instead of following register declarations
+ *       to fix in tcpm\it83xx_pd.h.
+ */
+/* GPIO control register */
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+#define IT8XXX2_GPIO_GPCRB3 ECREG(EC_REG_BASE_ADDR + 0x161B)
+#define IT8XXX2_GPIO_GPCRB4 ECREG(EC_REG_BASE_ADDR + 0x161C)
+#define GPCRF4              ECREG(EC_REG_BASE_ADDR + 0x163C)
+#define GPCRF5              ECREG(EC_REG_BASE_ADDR + 0x163D)
+#define GPCRH1              ECREG(EC_REG_BASE_ADDR + 0x1649)
+#define GPCRH2              ECREG(EC_REG_BASE_ADDR + 0x164A)
+#elif CONFIG_SOC_IT8XXX2_REG_SET_V2
+#define GPCRF4 ECREG(EC_REG_BASE_ADDR + 0x168C)
+#define GPCRF5 ECREG(EC_REG_BASE_ADDR + 0x168D)
+#define GPCRH1 ECREG(EC_REG_BASE_ADDR + 0x1699)
+#define GPCRH2 ECREG(EC_REG_BASE_ADDR + 0x169A)
+#endif
+
+/*
+ * IT8XXX2 register structure size/offset checking macro function to mitigate
+ * the risk of unexpected compiling results.
+ */
+#define IT8XXX2_REG_SIZE_CHECK(reg_def, size)                                                      \
+	BUILD_ASSERT(sizeof(struct reg_def) == size, "Failed in size check of register "           \
+						     "structure!")
+#define IT8XXX2_REG_OFFSET_CHECK(reg_def, member, offset)                                          \
+	BUILD_ASSERT(offsetof(struct reg_def, member) == offset,                                   \
+		     "Failed in offset check of register structure member!")
+
+/**
+ *
+ * (18xxh) PWM & SmartAuto Fan Control (PWM)
+ *
+ */
+#ifndef __ASSEMBLER__
+struct pwm_it8xxx2_regs {
+	/* 0x000: Channel0 Clock Prescaler */
+	volatile uint8_t C0CPRS;
+	/* 0x001: Cycle Time0 */
+	volatile uint8_t CTR;
+	/* 0x002~0x00A: Reserved1 */
+	volatile uint8_t Reserved1[9];
+	/* 0x00B: Prescaler Clock Frequency Select */
+	volatile uint8_t PCFSR;
+	/* 0x00C~0x00F: Reserved2 */
+	volatile uint8_t Reserved2[4];
+	/* 0x010: Cycle Time1 MSB */
+	volatile uint8_t CTR1M;
+	/* 0x011~0x022: Reserved3 */
+	volatile uint8_t Reserved3[18];
+	/* 0x023: PWM Clock Control */
+	volatile uint8_t ZTIER;
+	/* 0x024~0x026: Reserved4 */
+	volatile uint8_t Reserved4[3];
+	/* 0x027: Channel4 Clock Prescaler */
+	volatile uint8_t C4CPRS;
+	/* 0x028: Channel4 Clock Prescaler MSB */
+	volatile uint8_t C4MCPRS;
+	/* 0x029~0x02A: Reserved5 */
+	volatile uint8_t Reserved5[2];
+	/* 0x02B: Channel6 Clock Prescaler */
+	volatile uint8_t C6CPRS;
+	/* 0x02C: Channel6 Clock Prescaler MSB */
+	volatile uint8_t C6MCPRS;
+	/* 0x02D: Channel7 Clock Prescaler */
+	volatile uint8_t C7CPRS;
+	/* 0x02E: Channel7 Clock Prescaler MSB */
+	volatile uint8_t C7MCPRS;
+	/* 0x02F~0x040: Reserved6 */
+	volatile uint8_t reserved6[18];
+	/* 0x041: Cycle Time1 */
+	volatile uint8_t CTR1;
+	/* 0x042: Cycle Time2 */
+	volatile uint8_t CTR2;
+	/* 0x043: Cycle Time3 */
+	volatile uint8_t CTR3;
+	/* 0x044~0x048: Reserved7 */
+	volatile uint8_t reserved7[5];
+	/* 0x049: PWM Output Open-Drain Enable */
+	volatile uint8_t PWMODENR;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* PWM register fields */
+/* 0x023: PWM Clock Control */
+#define IT8XXX2_PWM_PCCE    BIT(1)
+/* 0x048: Tachometer Switch Control */
+#define IT8XXX2_PWM_T0DVS   BIT(3)
+#define IT8XXX2_PWM_T0CHSEL BIT(2)
+#define IT8XXX2_PWM_T1DVS   BIT(1)
+#define IT8XXX2_PWM_T1CHSEL BIT(0)
+
+/* --- Wake-Up Control (WUC) --- */
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+#define IT8XXX2_WUC_BASE 0x00F01B00
+
+/* TODO: should a defined interface for configuring wake-up interrupts */
+#define IT8XXX2_WUC_WUEMR1  (IT8XXX2_WUC_BASE + 0x00)
+#define IT8XXX2_WUC_WUEMR5  (IT8XXX2_WUC_BASE + 0x0c)
+#define IT8XXX2_WUC_WUESR1  (IT8XXX2_WUC_BASE + 0x04)
+#define IT8XXX2_WUC_WUESR5  (IT8XXX2_WUC_BASE + 0x0d)
+#define IT8XXX2_WUC_WUBEMR1 (IT8XXX2_WUC_BASE + 0x3c)
+#define IT8XXX2_WUC_WUBEMR5 (IT8XXX2_WUC_BASE + 0x0f)
+#endif
+
+/**
+ *
+ * (1Dxxh) Keyboard Matrix Scan control (KSCAN)
+ *
+ */
+#ifndef __ASSEMBLER__
+struct kscan_it8xxx2_regs {
+	/* 0x000: Keyboard Scan Out */
+	volatile uint8_t KBS_KSOL;
+	/* 0x001: Keyboard Scan Out */
+	volatile uint8_t KBS_KSOH1;
+	/* 0x002: Keyboard Scan Out Control */
+	volatile uint8_t KBS_KSOCTRL;
+	/* 0x003: Keyboard Scan Out */
+	volatile uint8_t KBS_KSOH2;
+	/* 0x004: Keyboard Scan In */
+	volatile uint8_t KBS_KSI;
+	/* 0x005: Keyboard Scan In Control */
+	volatile uint8_t KBS_KSICTRL;
+	/* 0x006: Keyboard Scan In [7:0] GPIO Control */
+	volatile uint8_t KBS_KSIGCTRL;
+	/* 0x007: Keyboard Scan In [7:0] GPIO Output Enable */
+	volatile uint8_t KBS_KSIGOEN;
+	/* 0x008: Keyboard Scan In [7:0] GPIO Data */
+	volatile uint8_t KBS_KSIGDAT;
+	/* 0x009: Keyboard Scan In [7:0] GPIO Data Mirror */
+	volatile uint8_t KBS_KSIGDMRR;
+	/* 0x00A: Keyboard Scan Out [15:8] GPIO Control */
+	volatile uint8_t KBS_KSOHGCTRL;
+	/* 0x00B: Keyboard Scan Out [15:8] GPIO Output Enable */
+	volatile uint8_t KBS_KSOHGOEN;
+	/* 0x00C: Keyboard Scan Out [15:8] GPIO Data Mirror */
+	volatile uint8_t KBS_KSOHGDMRR;
+	/* 0x00D: Keyboard Scan Out [7:0] GPIO Control */
+	volatile uint8_t KBS_KSOLGCTRL;
+	/* 0x00E: Keyboard Scan Out [7:0] GPIO Output Enable */
+	volatile uint8_t KBS_KSOLGOEN;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* KBS register fields */
+/* 0x002: Keyboard Scan Out Control */
+#define IT8XXX2_KBS_KSOPU     BIT(2)
+#define IT8XXX2_KBS_KSOOD     BIT(0)
+/* 0x005: Keyboard Scan In Control */
+#define IT8XXX2_KBS_KSIPU     BIT(2)
+/* 0x00D: Keyboard Scan Out [7:0] GPIO Control */
+#define IT8XXX2_KBS_KSO2GCTRL BIT(2)
+/* 0x00E: Keyboard Scan Out [7:0] GPIO Output Enable */
+#define IT8XXX2_KBS_KSO2GOEN  BIT(2)
+
+/**
+ *
+ * (1Fxxh) External Timer & External Watchdog (ETWD)
+ *
+ */
+#define WDT_IT8XXX2_REGS_BASE ((struct wdt_it8xxx2_regs *)DT_REG_ADDR(DT_NODELABEL(twd0)))
+
+#ifndef __ASSEMBLER__
+struct wdt_it8xxx2_regs {
+	/* 0x000: Reserved1 */
+	volatile uint8_t reserved1;
+	/* 0x001: External Timer1/WDT Configuration */
+	volatile uint8_t ETWCFG;
+	/* 0x002: External Timer1 Prescaler */
+	volatile uint8_t ET1PSR;
+	/* 0x003: External Timer1 Counter High Byte */
+	volatile uint8_t ET1CNTLHR;
+	/* 0x004: External Timer1 Counter Low Byte */
+	volatile uint8_t ET1CNTLLR;
+	/* 0x005: External Timer1/WDT Control */
+	volatile uint8_t ETWCTRL;
+	/* 0x006: External WDT Counter Low Byte */
+	volatile uint8_t EWDCNTLR;
+	/* 0x007: External WDT Key */
+	volatile uint8_t EWDKEYR;
+	/* 0x008: Reserved2 */
+	volatile uint8_t reserved2;
+	/* 0x009: External WDT Counter High Byte */
+	volatile uint8_t EWDCNTHR;
+	/* 0x00A: External Timer2 Prescaler */
+	volatile uint8_t ET2PSR;
+	/* 0x00B: External Timer2 Counter High Byte */
+	volatile uint8_t ET2CNTLHR;
+	/* 0x00C: External Timer2 Counter Low Byte */
+	volatile uint8_t ET2CNTLLR;
+	/* 0x00D: Reserved3 */
+	volatile uint8_t reserved3;
+	/* 0x00E: External Timer2 Counter High Byte2 */
+	volatile uint8_t ET2CNTLH2R;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* WDT register fields */
+/* 0x001: External Timer1/WDT Configuration */
+#define IT8XXX2_WDT_EWDKEYEN        BIT(5)
+#define IT8XXX2_WDT_EWDSRC          BIT(4)
+#define IT8XXX2_WDT_LEWDCNTL        BIT(3)
+#define IT8XXX2_WDT_LET1CNTL        BIT(2)
+#define IT8XXX2_WDT_LET1PS          BIT(1)
+#define IT8XXX2_WDT_LETWCFG         BIT(0)
+/* 0x002: External Timer1 Prescaler */
+#define IT8XXX2_WDT_ETPS_32P768_KHZ 0x00
+#define IT8XXX2_WDT_ETPS_1P024_KHZ  0x01
+#define IT8XXX2_WDT_ETPS_32_HZ      0x02
+/* 0x005: External Timer1/WDT Control */
+#define IT8XXX2_WDT_EWDSCEN         BIT(5)
+#define IT8XXX2_WDT_EWDSCMS         BIT(4)
+#define IT8XXX2_WDT_ET2TC           BIT(3)
+#define IT8XXX2_WDT_ET2RST          BIT(2)
+#define IT8XXX2_WDT_ET1TC           BIT(1)
+#define IT8XXX2_WDT_ET1RST          BIT(0)
+
+/* External Timer register fields */
+/* External Timer 3~8 control */
+#define IT8XXX2_EXT_ETX_COMB_RST_EN (IT8XXX2_EXT_ETXCOMB | IT8XXX2_EXT_ETXRST | IT8XXX2_EXT_ETXEN)
+#define IT8XXX2_EXT_ETXCOMB         BIT(3)
+#define IT8XXX2_EXT_ETXRST          BIT(1)
+#define IT8XXX2_EXT_ETXEN           BIT(0)
+
+/* Control external timer3~8 */
+#define IT8XXX2_EXT_TIMER_BASE DT_REG_ADDR(DT_NODELABEL(timer)) /*0x00F01F10*/
+#define IT8XXX2_EXT_CTRLX(n)   ECREG(IT8XXX2_EXT_TIMER_BASE + (n << 3))
+#define IT8XXX2_EXT_PSRX(n)    ECREG(IT8XXX2_EXT_TIMER_BASE + 0x01 + (n << 3))
+#define IT8XXX2_EXT_CNTX(n)    ECREG_u32(IT8XXX2_EXT_TIMER_BASE + 0x04 + (n << 3))
+#define IT8XXX2_EXT_CNTOX(n)   ECREG_u32(IT8XXX2_EXT_TIMER_BASE + 0x38 + (n << 2))
+
+/* Free run timer configurations */
+#define FREE_RUN_TIMER         EXT_TIMER_4
+#define FREE_RUN_TIMER_IRQ     DT_IRQ_BY_IDX(DT_NODELABEL(timer), 1, irq)
+/* Free run timer configurations */
+#define FREE_RUN_TIMER_FLAG    DT_IRQ_BY_IDX(DT_NODELABEL(timer), 1, flags)
+/* Free run timer max count is 36.4 hr (base on clock source 32768Hz) */
+#define FREE_RUN_TIMER_MAX_CNT 0xFFFFFFFFUL
+
+#ifndef __ASSEMBLER__
+enum ext_clk_src_sel {
+	EXT_PSR_32P768K = 0,
+	EXT_PSR_1P024K,
+	EXT_PSR_32,
+	EXT_PSR_EC_CLK,
+};
+/*
+ * 24-bit timers: external timer 3, 5, and 7
+ * 32-bit timers: external timer 4, 6, and 8
+ */
+enum ext_timer_idx {
+	EXT_TIMER_3 = 0, /* Event timer */
+	EXT_TIMER_4,     /* Free run timer */
+	EXT_TIMER_5,     /* Busy wait low timer */
+	EXT_TIMER_6,     /* Busy wait high timer */
+	EXT_TIMER_7,
+	EXT_TIMER_8,
+};
+#endif
+
+/*
+ *
+ * (2Cxxh) Platform Environment Control Interface (PECI)
+ *
+ */
+#ifndef __ASSEMBLER__
+struct peci_it8xxx2_regs {
+	/* 0x00: Host Status */
+	volatile uint8_t HOSTAR;
+	/* 0x01: Host Control */
+	volatile uint8_t HOCTLR;
+	/* 0x02: Host Command */
+	volatile uint8_t HOCMDR;
+	/* 0x03: Host Target Address */
+	volatile uint8_t HOTRADDR;
+	/* 0x04: Host Write Length */
+	volatile uint8_t HOWRLR;
+	/* 0x05: Host Read Length */
+	volatile uint8_t HORDLR;
+	/* 0x06: Host Write Data */
+	volatile uint8_t HOWRDR;
+	/* 0x07: Host Read Data */
+	volatile uint8_t HORDDR;
+	/* 0x08: Host Control 2 */
+	volatile uint8_t HOCTL2R;
+	/* 0x09: Received Write FCS value */
+	volatile uint8_t RWFCSV;
+	/* 0x0A: Received Read FCS value */
+	volatile uint8_t RRFCSV;
+	/* 0x0B: Write FCS Value */
+	volatile uint8_t WFCSV;
+	/* 0x0C: Read FCS Value */
+	volatile uint8_t RFCSV;
+	/* 0x0D: Assured Write FCS Value */
+	volatile uint8_t AWFCSV;
+	/* 0x0E: Pad Control */
+	volatile uint8_t PADCTLR;
+};
+#endif /* !__ASSEMBLER__ */
+
+/**
+ *
+ * (2Fxxh) USB Device Controller (USBDC) Registers
+ *
+ */
+#define EP_EXT_REGS_9X 1
+#define EP_EXT_REGS_BX 2
+#define EP_EXT_REGS_DX 3
+
+#ifndef __ASSEMBLER__
+
+/* EP0 to EP15 Enumeration */
+enum usb_dc_endpoints {
+	EP0,
+	EP1,
+	EP2,
+	EP3,
+	EP4,
+	EP5,
+	EP6,
+	EP7,
+	EP8,
+	EP9,
+	EP10,
+	EP11,
+	EP12,
+	EP13,
+	EP14,
+	EP15,
+	MAX_NUM_ENDPOINTS
+};
+
+union ep_ctrl_reg {
+	volatile uint8_t value;
+	struct {
+		volatile uint8_t enable_bit: 1;
+		volatile uint8_t ready_bit: 1;
+		volatile uint8_t outdata_sequence_bit: 1;
+		volatile uint8_t send_stall_bit: 1;
+		volatile uint8_t iso_enable_bit: 1;
+		volatile uint8_t direction_bit: 1;
+		volatile uint8_t reserved: 2;
+	} __packed fields;
+} __packed;
+
+struct it82xx2_usb_ep_regs {
+	union ep_ctrl_reg ep_ctrl;
+	volatile uint8_t ep_status;
+	volatile uint8_t ep_transtype_sts;
+	volatile uint8_t ep_nak_transtype_sts;
+};
+
+/* Reserved EP Extended Registers */
+struct ep_ext_regs_7x {
+	/* 0x75 Reserved */
+	volatile uint8_t ep_ext_ctrl_75;
+	/* 0x76 Reserved */
+	volatile uint8_t ep_ext_ctrl_76;
+	/* 0x77 Reserved */
+	volatile uint8_t ep_ext_ctrl_77;
+	/* 0x78 Reserved */
+	volatile uint8_t ep_ext_ctrl_78;
+	/* 0x79 Reserved */
+	volatile uint8_t ep_ext_ctrl_79;
+	/* 0x7A Reserved */
+	volatile uint8_t ep_ext_ctrl_7a;
+	/* 0x7B Reserved */
+	volatile uint8_t ep_ext_ctrl_7b;
+	/* 0x7C Reserved */
+	volatile uint8_t ep_ext_ctrl_7c;
+	/* 0x7D Reserved */
+	volatile uint8_t ep_ext_ctrl_7d;
+	/* 0x7E Reserved */
+	volatile uint8_t ep_ext_ctrl_7e;
+	/* 0x7F Reserved */
+	volatile uint8_t ep_ext_ctrl_7f;
+};
+
+/* From 98h to 9Dh, the EP45/67/89/1011/1213/1415 Extended Control Registers
+ * are defined, and their bits definitions are as follows:
+ *
+ * Bit    Description
+ *  7     Reserved
+ *  6     EPPOINT5_ISO_ENABLE
+ *  5     EPPOINT5_SEND_STALL
+ *  4     EPPOINT5_OUT_DATA_SEQUENCE
+ *  3     Reserved
+ *  2     EPPOINT4_ISO_ENABLE
+ *  1     EPPOINT4_SEND_STALL
+ *  0     EPPOINT4_OUT_DATA_SEQUENCE
+ *
+ * Apparently, we can tell that the EP4 and EP5 share the same register, and
+ * the EP6 and EP7 share the same one, and the rest EPs are defined in the
+ * same way.
+ */
+union epn0n1_extend_ctrl_reg {
+	volatile uint8_t value;
+	struct {
+		volatile uint8_t epn0_outdata_sequence_bit: 1;
+		volatile uint8_t epn0_send_stall_bit: 1;
+		volatile uint8_t epn0_iso_enable_bit: 1;
+		volatile uint8_t reserved0: 1;
+		volatile uint8_t epn1_outdata_sequence_bit: 1;
+		volatile uint8_t epn1_send_stall_bit: 1;
+		volatile uint8_t epn1_iso_enable_bit: 1;
+		volatile uint8_t reserved1: 1;
+	} __packed fields;
+} __packed;
+
+struct ep_ext_regs_9x {
+	/* 0x95 Reserved */
+	volatile uint8_t ep_ext_ctrl_95;
+	/* 0x96 Reserved */
+	volatile uint8_t ep_ext_ctrl_96;
+	/* 0x97 Reserved */
+	volatile uint8_t ep_ext_ctrl_97;
+	/* 0x98 ~ 0x9D EP45/67/89/1011/1213/1415 Extended Control Registers */
+	union epn0n1_extend_ctrl_reg epn0n1_ext_ctrl[6];
+	/* 0x9E Reserved */
+	volatile uint8_t ep_ext_ctrl_9e;
+	/* 0x9F Reserved */
+	volatile uint8_t ep_ext_ctrl_9f;
+};
+
+/* From BXh to BDh are EP FIFO 1-3 Control 0/1 Registers, and their
+ * definitions as follows:
+ * B8h: EP_FIFO1_CONTROL0_REG
+ * B9h: EP_FIFO1_CONTROL1_REG
+ * BAh: EP_FIFO2_CONTROL0_REG
+ * BBh: EP_FIFO2_CONTROL1_REG
+ * BCh: EP_FIFO3_CONTROL0_REG
+ * BDh: EP_FIFO3_CONTROL1_REG
+ *
+ * For each one, its bits definitions are as follows:
+ * (take EP_FIFO1_CONTROL1_REG as example, which controls from EP8 to EP15)
+ *
+ * Bit  Description
+ *
+ *  7   EP15 select FIFO1 as data buffer
+ *  6   EP14 select FIFO1 as data buffer
+ *  5   EP13 select FIFO1 as data buffer
+ *  4   EP12 select FIFO1 as data buffer
+ *  3   EP11 select FIFO1 as data buffer
+ *  2   EP10 select FIFO1 as data buffer
+ *  1   EP9 select FIFO1 as data buffer
+ *  0   EP8 select FIFO1 as data buffer
+ *
+ *  1: Select
+ *  0: Not select
+ */
+struct ep_ext_regs_bx {
+	/* 0xB5 Reserved */
+	volatile uint8_t ep_ext_ctrl_b5;
+	/* 0xB6 Reserved */
+	volatile uint8_t ep_ext_ctrl_b6;
+	/* 0xB7 Reserved */
+	volatile uint8_t ep_ext_ctrl_b7;
+	/* 0xB8 ~ 0xBD EP FIFO 1-3 Control 0/1 Registers */
+	volatile uint8_t ep_fifo_ctrl[6];
+	/* 0xBE Reserved */
+	volatile uint8_t ep_ext_ctrl_be;
+	/* 0xBF Reserved */
+	volatile uint8_t ep_ext_ctrl_bf;
+};
+
+/* From D6h to DDh are EP Extended Control Registers, and their
+ * definitions as follows:
+ * D6h: EP0_EXT_CTRL1
+ * D7h: EP0_EXT_CTRL2
+ * D8h: EP1_EXT_CTRL1
+ * D9h: EP1_EXT_CTRL2
+ * DAh: EP2_EXT_CTRL1
+ * DBh: EP2_EXT_CTRL2
+ * DCh: EP3_EXT_CTRL1
+ * DDh: EP3_EXT_CTRL2
+ *
+ * We classify them into 4 groups which each of them contains Control 1 and 2
+ * according to the EP number as follows:
+ */
+union epn_extend_ctrl1_reg {
+	volatile uint8_t value;
+	struct {
+		volatile uint8_t epn0_enable_bit: 1;
+		volatile uint8_t epn0_direction_bit: 1;
+		volatile uint8_t epn3_enable_bit: 1;
+		volatile uint8_t epn3_direction_bit: 1;
+		volatile uint8_t epn6_enable_bit: 1;
+		volatile uint8_t epn6_direction_bit: 1;
+		volatile uint8_t epn9_enable_bit: 1;
+		volatile uint8_t epn9_direction_bit: 1;
+	} __packed fields;
+} __packed;
+
+struct epn_ext_ctrl_regs {
+	/* 0xD6/0xD8/0xDA/0xDC EPN Extended Control1 Register */
+	union epn_extend_ctrl1_reg epn_ext_ctrl1;
+	/* 0xD7/0xD9/0xDB/0xDD EPB Extended Control2 Register */
+	volatile uint8_t epn_ext_ctrl2;
+};
+
+struct ep_ext_regs_dx {
+	/* 0xD5 Reserved */
+	volatile uint8_t ep_ext_ctrl_d5;
+	/* 0xD6 ~ 0xDD EPN Extended Control 1/2 Registers */
+	struct epn_ext_ctrl_regs epn_ext_ctrl[4];
+	/* 0xDE Reserved */
+	volatile uint8_t ep_ext_ctrl_de;
+	/* 0xDF Reserved */
+	volatile uint8_t ep_ext_ctrl_df;
+};
+
+/* The USB EPx FIFO Registers Definitions
+ * EP0: 60h ~ 74h
+ * EP1: 80h ~ 94h
+ * EP2: A0h ~ B4h
+ * EP3: C0h ~ D4h (D6h to DDh will be defined as marcos for usage)
+ */
+struct it82xx2_usb_ep_fifo_regs {
+	/* 0x60 + ep * 0x20 : EP RX FIFO Data Register  */
+	volatile uint8_t ep_rx_fifo_data;
+	/* 0x61 + ep * 0x20 : EP RX FIFO DMA Count Register */
+	volatile uint8_t ep_rx_fifo_dma_count;
+	/* 0x62 + ep * 0x20 : EP RX FIFO Data Count MSB */
+	volatile uint8_t ep_rx_fifo_dcnt_msb;
+	/* 0x63 + ep * 0x20 : EP RX FIFO Data Count LSB */
+	volatile uint8_t ep_rx_fifo_dcnt_lsb;
+	/* 0x64 + ep * 0x20  : EP RX FIFO Control Register */
+	volatile uint8_t ep_rx_fifo_ctrl;
+	/* (0x65 ~ 0x6F) + ep * 0x20 */
+	volatile uint8_t reserved_65_6f_add_20[11];
+	/* 0x70 + ep * 0x20 : EP TX FIFO Data Register  */
+	volatile uint8_t ep_tx_fifo_data;
+	/* (0x71 ~ 0x73) + ep * 0x20 */
+	volatile uint8_t reserved_71_73_add_20[3];
+	/* 0x74 + ep * 0x20 : EP TX FIFO Control Register */
+	volatile uint8_t ep_tx_fifo_ctrl;
+	/* (0x75 ~ 0x7F) + ep * 0x20 */
+	union {
+		struct ep_ext_regs_7x ep_res;
+		struct ep_ext_regs_9x ext_4_15;
+		struct ep_ext_regs_bx fifo_ctrl;
+		struct ep_ext_regs_dx ext_0_3;
+	};
+};
+
+/* USB Control registers */
+#define USB_IT82XX2_REGS_BASE ((struct usb_it82xx2_regs *)DT_REG_ADDR(DT_NODELABEL(usb0)))
+
+/* Bit definitions of the register Port0/Port1 MISC Control: 0XE4/0xE8 */
+#define PULL_DOWN_EN BIT(4)
+
+struct usb_it82xx2_regs {
+	/* 0x00:  Host TX Contrl Register */
+	volatile uint8_t host_tx_ctrl;
+	/* 0x01:  Host TX Transaction Type Register */
+	volatile uint8_t host_tx_trans_type;
+	/* 0x02:  Host TX Line Control Register */
+	volatile uint8_t host_tx_line_ctrl;
+	/* 0x03:  Host TX SOF Enable Register */
+	volatile uint8_t host_tx_sof_enable;
+	/* 0x04:  Host TX Address Register */
+	volatile uint8_t host_tx_addr;
+	/* 0x05:  Host TX EP Number Register */
+	volatile uint8_t host_tx_endp;
+	/* 0x06:  Host Frame Number MSP Register */
+	volatile uint8_t host_frame_num_msp;
+	/* 0x07:  Host Frame Number LSP Register */
+	volatile uint8_t host_frame_num_lsp;
+	/* 0x08:  Host Interrupt Status Register */
+	volatile uint8_t host_interrupt_status;
+	/* 0x09:  Host Interrupt Mask Register */
+	volatile uint8_t host_interrupt_mask;
+	/* 0x0A:  Host RX Status Register */
+	volatile uint8_t host_rx_status;
+	/* 0x0B:  Host RX PID Register */
+	volatile uint8_t host_rx_pid;
+	/* 0x0C:  MISC Control Register */
+	volatile uint8_t misc_control;
+	/* 0x0D:  MISC Status Register */
+	volatile uint8_t misc_status;
+	/* 0x0E:  Host RX Connect State Register */
+	volatile uint8_t host_rx_connect_state;
+	/* 0x0F:  Host SOF Timer MSB Register */
+	volatile uint8_t host_sof_timer_msb;
+	/* 0x10 ~ 0x1F:  Reserved Registers 10h - 1Fh */
+	volatile uint8_t reserved_10_1f[16];
+	/* 0x20:  Host RX FIFO Data Port Register */
+	volatile uint8_t host_rx_fifo_data;
+	/* 0x21:  Host RX FIFO DMA Input Data Count Register */
+	volatile uint8_t host_rx_fifo_dma_data_count;
+	/* 0x22:  Host TX FIFO Data Count MSB Register */
+	volatile uint8_t host_rx_fifo_data_count_msb;
+	/* 0x23:  Host TX FIFO Data Count LSB Register */
+	volatile uint8_t host_rx_fifo_data_count_lsb;
+	/* 0x24:  Host RX FIFO Data Port Register */
+	volatile uint8_t host_rx_fifo_control;
+	/* 0x25 ~ 0x2F:  Reserved Registers 25h - 2Fh */
+	volatile uint8_t reserved_25_2f[11];
+	/* 0x30:  Host TX FIFO Data Port Register */
+	volatile uint8_t host_tx_fifo_data;
+	/* 0x31 ~ 0x3F:  Reserved Registers 31h - 3Fh */
+	volatile uint8_t reserved_31_3f[15];
+	/* 0x40 ~ 0x4F: Endpoint Registers 40h - 4Fh */
+	struct it82xx2_usb_ep_regs usb_ep_regs[4];
+	/* 0x50:  Device Controller Control Register */
+	volatile uint8_t dc_control;
+	/* 0x51:  Device Controller LINE Status Register */
+	volatile uint8_t dc_line_status;
+	/* 0x52:  Device Controller Interrupt Status Register */
+	volatile uint8_t dc_interrupt_status;
+	/* 0x53:  Device Controller Interrupt Mask Register */
+	volatile uint8_t dc_interrupt_mask;
+	/* 0x54:  Device Controller Address Register */
+	volatile uint8_t dc_address;
+	/* 0x55:  Device Controller Frame Number MSP Register */
+	volatile uint8_t dc_frame_num_msp;
+	/* 0x56:  Device Controller Frame Number LSP Register */
+	volatile uint8_t dc_frame_num_lsp;
+	/* 0x57 ~ 0x5F:  Reserved Registers 57h - 5Fh */
+	volatile uint8_t reserved_57_5f[9];
+	/* 0x60 ~ 0xDF: EP FIFO Registers 60h - DFh */
+	struct it82xx2_usb_ep_fifo_regs fifo_regs[4];
+	/* 0xE0:  Host/Device Control Register */
+	volatile uint8_t host_device_control;
+	/* 0xE1 ~ 0xE3:  Reserved Registers E1h - E3h */
+	volatile uint8_t reserved_e1_e3[3];
+	/* 0xE4:  Port0 MISC Control Register */
+	volatile uint8_t port0_misc_control;
+	/* 0xE5 ~ 0xE7:  Reserved Registers E5h - E7h */
+	volatile uint8_t reserved_e5_e7[3];
+	/* 0xE8:  Port1 MISC Control Register */
+	volatile uint8_t port1_misc_control;
+};
+#endif /* #ifndef __ASSEMBLER__ */
+
+/**
+ *
+ * (37xxh, 38xxh) USBPD Controller
+ *
+ */
+#ifndef __ASSEMBLER__
+struct usbpd_it8xxx2_regs {
+	/* 0x000~0x003: Reserved1 */
+	volatile uint8_t Reserved1[4];
+	/* 0x004: CC General Configuration */
+	volatile uint8_t CCGCR;
+	/* 0x005: CC Channel Setting */
+	volatile uint8_t CCCSR;
+	/* 0x006: CC Pad Setting */
+	volatile uint8_t CCPSR;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* USBPD controller register fields */
+/* 0x004: CC General Configuration */
+#define IT8XXX2_USBPD_DISABLE_CC                 BIT(7)
+#define IT8XXX2_USBPD_DISABLE_CC_VOL_DETECTOR    BIT(6)
+#define IT8XXX2_USBPD_CC_SELECT_RP_RESERVED      (BIT(3) | BIT(2) | BIT(1))
+#define IT8XXX2_USBPD_CC_SELECT_RP_DEF           (BIT(3) | BIT(2))
+#define IT8XXX2_USBPD_CC_SELECT_RP_1A5           BIT(3)
+#define IT8XXX2_USBPD_CC_SELECT_RP_3A0           BIT(2)
+#define IT8XXX2_USBPD_CC1_CC2_SELECTION          BIT(0)
+/* 0x005: CC Channel Setting */
+#define IT8XXX2_USBPD_CC2_DISCONNECT             BIT(7)
+#define IT8XXX2_USBPD_CC2_DISCONNECT_5_1K_TO_GND BIT(6)
+#define IT8XXX2_USBPD_CC1_DISCONNECT             BIT(3)
+#define IT8XXX2_USBPD_CC1_DISCONNECT_5_1K_TO_GND BIT(2)
+#define IT8XXX2_USBPD_CC1_CC2_RP_RD_SELECT       (BIT(1) | BIT(5))
+/* 0x006: CC Pad Setting */
+#define IT8XXX2_USBPD_DISCONNECT_5_1K_CC2_DB     BIT(6)
+#define IT8XXX2_USBPD_DISCONNECT_POWER_CC2       BIT(5)
+#define IT8XXX2_USBPD_DISCONNECT_5_1K_CC1_DB     BIT(2)
+#define IT8XXX2_USBPD_DISCONNECT_POWER_CC1       BIT(1)
+
+/**
+ *
+ * (10xxh) Shared Memory Flash Interface Bridge (SMFI) registers
+ *
+ */
+#ifndef __ASSEMBLER__
+struct smfi_it8xxx2_regs {
+	volatile uint8_t reserved1[59];
+	/* 0x3B: EC-Indirect memory address 0 */
+	volatile uint8_t SMFI_ECINDAR0;
+	/* 0x3C: EC-Indirect memory address 1 */
+	volatile uint8_t SMFI_ECINDAR1;
+	/* 0x3D: EC-Indirect memory address 2 */
+	volatile uint8_t SMFI_ECINDAR2;
+	/* 0x3E: EC-Indirect memory address 3 */
+	volatile uint8_t SMFI_ECINDAR3;
+	/* 0x3F: EC-Indirect memory data */
+	volatile uint8_t SMFI_ECINDDR;
+	/* 0x40: Scratch SRAM 0 address low byte */
+	volatile uint8_t SMFI_SCAR0L;
+	/* 0x41: Scratch SRAM 0 address middle byte */
+	volatile uint8_t SMFI_SCAR0M;
+	/* 0x42: Scratch SRAM 0 address high byte */
+	volatile uint8_t SMFI_SCAR0H;
+	volatile uint8_t reserved1_1[23];
+	/* 0x5A: Host RAM Window Control */
+	volatile uint8_t SMFI_HRAMWC;
+	/* 0x5B: Host RAM Window 0 Base Address [11:4] */
+	volatile uint8_t SMFI_HRAMW0BA;
+	/* 0x5C: Host RAM Window 1 Base Address [11:4] */
+	volatile uint8_t SMFI_HRAMW1BA;
+	/* 0x5D: Host RAM Window 0 Access Allow Size */
+	volatile uint8_t SMFI_HRAMW0AAS;
+	/* 0x5E: Host RAM Window 1 Access Allow Size */
+	volatile uint8_t SMFI_HRAMW1AAS;
+	volatile uint8_t reserved2[67];
+	/* 0xA2: Flash control 6 */
+	volatile uint8_t SMFI_FLHCTRL6R;
+	volatile uint8_t reserved3[46];
+};
+#endif /* !__ASSEMBLER__ */
+
+/* SMFI register fields */
+/* EC-Indirect read internal flash */
+#define EC_INDIRECT_READ_INTERNAL_FLASH BIT(6)
+/* Enable EC-indirect page program command */
+#define IT8XXX2_SMFI_MASK_ECINDPP       BIT(3)
+#define ITE_EC_SMFI_MASK_ECINDPP        IT8XXX2_SMFI_MASK_ECINDPP
+/* Scratch SRAM 0 address(BIT(19)) */
+#define IT8XXX2_SMFI_SC0A19             BIT(7)
+/* Scratch SRAM enable */
+#define IT8XXX2_SMFI_SCAR0H_ENABLE      BIT(3)
+
+/* H2RAM Path Select. 1b: H2RAM through LPC IO cycle. */
+#define SMFI_H2RAMPS  BIT(4)
+/* H2RAM Window 1 Enable */
+#define SMFI_H2RAMW1E BIT(1)
+/* H2RAM Window 0 Enable */
+#define SMFI_H2RAMW0E BIT(0)
+
+/* Host RAM Window x Write Protect Enable (All protected) */
+#define SMFI_HRAMWXWPE_ALL (BIT(5) | BIT(4))
+/* 0x42: Scratch SRAM 0 address high byte */
+#define SCARH_ADDR_BIT19   BIT(7)
+#define SCARH_ENABLE       BIT(3)
+
+/**
+ *
+ * (16xxh) General Purpose I/O Port (GPIO) registers
+ *
+ */
+#define GPIO_IT8XXX2_REG_BASE ((struct gpio_it8xxx2_regs *)DT_REG_ADDR(DT_NODELABEL(gpiogcr)))
+
+#ifndef __ASSEMBLER__
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+struct gpio_it8xxx2_regs {
+	/* 0x00: General Control */
+	volatile uint8_t GPIO_GCR;
+	/* 0x01-D0: Reserved1 */
+	volatile uint8_t reserved1[208];
+	/* 0xD1: General Control 25 */
+	volatile uint8_t GPIO_GCR25;
+	/* 0xD2: General Control 26 */
+	volatile uint8_t GPIO_GCR26;
+	/* 0xD3: General Control 27 */
+	volatile uint8_t GPIO_GCR27;
+	/* 0xD4: General Control 28 */
+	volatile uint8_t GPIO_GCR28;
+	/* 0xD5: General Control 31 */
+	volatile uint8_t GPIO_GCR31;
+	/* 0xD6: General Control 32 */
+	volatile uint8_t GPIO_GCR32;
+	/* 0xD7: General Control 33 */
+	volatile uint8_t GPIO_GCR33;
+	/* 0xD8-0xDF: Reserved2 */
+	volatile uint8_t reserved2[8];
+	/* 0xE0: General Control 16 */
+	volatile uint8_t GPIO_GCR16;
+	/* 0xE1: General Control 17 */
+	volatile uint8_t GPIO_GCR17;
+	/* 0xE2: General Control 18 */
+	volatile uint8_t GPIO_GCR18;
+	/* 0xE3: Reserved3 */
+	volatile uint8_t reserved3;
+	/* 0xE4: General Control 19 */
+	volatile uint8_t GPIO_GCR19;
+	/* 0xE5: General Control 20 */
+	volatile uint8_t GPIO_GCR20;
+	/* 0xE6: General Control 21 */
+	volatile uint8_t GPIO_GCR21;
+	/* 0xE7: General Control 22 */
+	volatile uint8_t GPIO_GCR22;
+	/* 0xE8: General Control 23 */
+	volatile uint8_t GPIO_GCR23;
+	/* 0xE9: General Control 24 */
+	volatile uint8_t GPIO_GCR24;
+	/* 0xEA-0xEC: Reserved4 */
+	volatile uint8_t reserved4[3];
+	/* 0xED: General Control 30 */
+	volatile uint8_t GPIO_GCR30;
+	/* 0xEE: General Control 29 */
+	volatile uint8_t GPIO_GCR29;
+	/* 0xEF: Reserved5 */
+	volatile uint8_t reserved5;
+	/* 0xF0: General Control 1 */
+	volatile uint8_t GPIO_GCR1;
+	/* 0xF1: General Control 2 */
+	volatile uint8_t GPIO_GCR2;
+	/* 0xF2: General Control 3 */
+	volatile uint8_t GPIO_GCR3;
+	/* 0xF3: General Control 4 */
+	volatile uint8_t GPIO_GCR4;
+	/* 0xF4: General Control 5 */
+	volatile uint8_t GPIO_GCR5;
+	/* 0xF5: General Control 6 */
+	volatile uint8_t GPIO_GCR6;
+	/* 0xF6: General Control 7 */
+	volatile uint8_t GPIO_GCR7;
+	/* 0xF7: General Control 8 */
+	volatile uint8_t GPIO_GCR8;
+	/* 0xF8: General Control 9 */
+	volatile uint8_t GPIO_GCR9;
+	/* 0xF9: General Control 10 */
+	volatile uint8_t GPIO_GCR10;
+	/* 0xFA: General Control 11 */
+	volatile uint8_t GPIO_GCR11;
+	/* 0xFB: General Control 12 */
+	volatile uint8_t GPIO_GCR12;
+	/* 0xFC: General Control 13 */
+	volatile uint8_t GPIO_GCR13;
+	/* 0xFD: General Control 14 */
+	volatile uint8_t GPIO_GCR14;
+	/* 0xFE: General Control 15 */
+	volatile uint8_t GPIO_GCR15;
+	/* 0xFF: Power Good Watch Control */
+	volatile uint8_t GPIO_PGWCR;
+};
+#elif CONFIG_SOC_IT8XXX2_REG_SET_V2
+struct gpio_it8xxx2_regs {
+	/* 0x00: General Control */
+	volatile uint8_t GPIO_GCR;
+	/* 0x01-0x0F: Reserved1 */
+	volatile uint8_t reserved1[15];
+	/* 0x10: General Control 1 */
+	volatile uint8_t GPIO_GCR1;
+	/* 0x11: General Control 2 */
+	volatile uint8_t GPIO_GCR2;
+	/* 0x12: General Control 3 */
+	volatile uint8_t GPIO_GCR3;
+	/* 0x13: General Control 4 */
+	volatile uint8_t GPIO_GCR4;
+	/* 0x14: General Control 5 */
+	volatile uint8_t GPIO_GCR5;
+	/* 0x15: General Control 6 */
+	volatile uint8_t GPIO_GCR6;
+	/* 0x16: General Control 7 */
+	volatile uint8_t GPIO_GCR7;
+	/* 0x17: General Control 8 */
+	volatile uint8_t GPIO_GCR8;
+	/* 0x18: General Control 9 */
+	volatile uint8_t GPIO_GCR9;
+	/* 0x19: General Control 10 */
+	volatile uint8_t GPIO_GCR10;
+	/* 0x1A: General Control 11 */
+	volatile uint8_t GPIO_GCR11;
+	/* 0x1B: General Control 12 */
+	volatile uint8_t GPIO_GCR12;
+	/* 0x1C: General Control 13 */
+	volatile uint8_t GPIO_GCR13;
+	/* 0x1D: General Control 14 */
+	volatile uint8_t GPIO_GCR14;
+	/* 0x1E: General Control 15 */
+	volatile uint8_t GPIO_GCR15;
+	/* 0x1F: Power Good Watch Control */
+	volatile uint8_t GPIO_PGWCR;
+	/* 0x20: General Control 16 */
+	volatile uint8_t GPIO_GCR16;
+	/* 0x21: General Control 17 */
+	volatile uint8_t GPIO_GCR17;
+	/* 0x22: General Control 18 */
+	volatile uint8_t GPIO_GCR18;
+	/* 0x23: Reserved2 */
+	volatile uint8_t reserved2;
+	/* 0x24: General Control 19 */
+	volatile uint8_t GPIO_GCR19;
+	/* 0x25: Reserved3 */
+	volatile uint8_t reserved3;
+	/* 0x26: General Control 21 */
+	volatile uint8_t GPIO_GCR21;
+	/* 0x27-0x28: Reserved4 */
+	volatile uint8_t reserved4[2];
+	/* 0x29: General Control 24 */
+	volatile uint8_t GPIO_GCR24;
+	/* 0x2A-0x2C: Reserved5 */
+	volatile uint8_t reserved5[3];
+	/* 0x2D: General Control 30 */
+	volatile uint8_t GPIO_GCR30;
+	/* 0x2E: General Control 29 */
+	volatile uint8_t GPIO_GCR29;
+};
+
+/* GPIO register fields */
+/* 0x16: General Control 7 */
+#define IT8XXX2_GPIO_SMB2PS BIT(7)
+#define IT8XXX2_GPIO_SMB3PS BIT(6)
+#define IT8XXX2_GPIO_SMB5PS BIT(5)
+
+#endif
+#endif /* !__ASSEMBLER__ */
+
+/* GPIO register fields */
+/* 0x00: General Control */
+#define IT8XXX2_GPIO_LPCRSTEN             (BIT(2) | BIT(1))
+#define ITE_EC_GPIO_LPCRSTEN              IT8XXX2_GPIO_LPCRSTEN
+#define IT8XXX2_GPIO_GCR_ESPI_RST_D2      0x2
+#define IT8XXX2_GPIO_GCR_ESPI_RST_POS     1
+#define IT8XXX2_GPIO_GCR_ESPI_RST_EN_MASK (0x3 << IT8XXX2_GPIO_GCR_ESPI_RST_POS)
+/* 0xF0: General Control 1 */
+#define IT8XXX2_GPIO_U2CTRL_SIN1_SOUT1_EN BIT(2)
+#define IT8XXX2_GPIO_U1CTRL_SIN0_SOUT0_EN BIT(0)
+/* 0xE6: General Control 21 */
+#define IT8XXX2_GPIO_GPH1VS               BIT(1)
+#define IT8XXX2_GPIO_GPH2VS               BIT(0)
+
+#define KSIX_KSOX_KBS_GPIO_MODE BIT(7)
+#define KSIX_KSOX_GPIO_OUTPUT   BIT(6)
+#define KSIX_KSOX_GPIO_PULLUP   BIT(2)
+#define KSIX_KSOX_GPIO_PULLDOWN BIT(1)
+
+#define GPCR_PORT_PIN_MODE_INPUT    BIT(7)
+#define GPCR_PORT_PIN_MODE_OUTPUT   BIT(6)
+#define GPCR_PORT_PIN_MODE_PULLUP   BIT(2)
+#define GPCR_PORT_PIN_MODE_PULLDOWN BIT(1)
+
+/*
+ * If both PULLUP and PULLDOWN are set to 1b, the corresponding port would be
+ * configured as tri-state.
+ */
+#define GPCR_PORT_PIN_MODE_TRISTATE                                                                \
+	(GPCR_PORT_PIN_MODE_INPUT | GPCR_PORT_PIN_MODE_PULLUP | GPCR_PORT_PIN_MODE_PULLDOWN)
+
+/* --- GPIO --- */
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+#define IT8XXX2_GPIO_BASE 0x00F01600
+
+#define IT8XXX2_GPIO_GCRX(offset) ECREG(IT8XXX2_GPIO_BASE + (offset))
+#define IT8XXX2_GPIO_GCR25_OFFSET 0xd1
+#define IT8XXX2_GPIO_GCR26_OFFSET 0xd2
+#define IT8XXX2_GPIO_GCR27_OFFSET 0xd3
+#define IT8XXX2_GPIO_GCR28_OFFSET 0xd4
+#define IT8XXX2_GPIO_GCR31_OFFSET 0xd5
+#define IT8XXX2_GPIO_GCR32_OFFSET 0xd6
+#define IT8XXX2_GPIO_GCR33_OFFSET 0xd7
+#define IT8XXX2_GPIO_GCR19_OFFSET 0xe4
+#define IT8XXX2_GPIO_GCR20_OFFSET 0xe5
+#define IT8XXX2_GPIO_GCR21_OFFSET 0xe6
+#define IT8XXX2_GPIO_GCR22_OFFSET 0xe7
+#define IT8XXX2_GPIO_GCR23_OFFSET 0xe8
+#define IT8XXX2_GPIO_GCR24_OFFSET 0xe9
+#define IT8XXX2_GPIO_GCR30_OFFSET 0xed
+#define IT8XXX2_GPIO_GCR29_OFFSET 0xee
+#endif
+
+/*
+ * TODO: use pinctrl node instead of following register declarations
+ *       to fix in tcpm\it83xx_pd.h.
+ */
+#define IT8XXX2_GPIO2_BASE 0x00F03E00
+
+#define IT8XXX2_GPIO_GPCRP0 ECREG(IT8XXX2_GPIO2_BASE + 0x18)
+#define IT8XXX2_GPIO_GPCRP1 ECREG(IT8XXX2_GPIO2_BASE + 0x19)
+
+/**
+ *
+ * (19xxh) Analog to Digital Converter (ADC) registers
+ *
+ */
+#ifndef __ASSEMBLER__
+
+/* Data structure to define ADC channel 13-16 control registers. */
+struct adc_vchs_ctrl_t {
+	/* 0x60: Voltage Channel Control */
+	volatile uint8_t VCHCTL;
+	/* 0x61: Voltage Channel Data Buffer MSB */
+	volatile uint8_t VCHDATM;
+	/* 0x62: Voltage Channel Data Buffer LSB */
+	volatile uint8_t VCHDATL;
+};
+
+struct adc_it8xxx2_regs {
+	/* 0x00: ADC Status */
+	volatile uint8_t ADCSTS;
+	/* 0x01: ADC Configuration */
+	volatile uint8_t ADCCFG;
+	/* 0x02: ADC Clock Control */
+	volatile uint8_t ADCCTL;
+	/* 0x03: General Control */
+	volatile uint8_t ADCGCR;
+	/* 0x04: Voltage Channel 0 Control */
+	volatile uint8_t VCH0CTL;
+	/* 0x05: Calibration Data Control */
+	volatile uint8_t KDCTL;
+	/* 0x06-0x17: Reserved1 */
+	volatile uint8_t reserved1[18];
+	/* 0x18: Voltage Channel 0 Data Buffer LSB */
+	volatile uint8_t VCH0DATL;
+	/* 0x19: Voltage Channel 0 Data Buffer MSB */
+	volatile uint8_t VCH0DATM;
+	/* 0x1a-0x43: Reserved2 */
+	volatile uint8_t reserved2[42];
+	/* 0x44: ADC Data Valid Status */
+	volatile uint8_t ADCDVSTS;
+	/* 0x45-0x54: Reserved2-1 */
+	volatile uint8_t reserved2_1[16];
+	/* 0x55: ADC Input Voltage Mapping Full-Scale Code Selection 1 */
+	volatile uint8_t ADCIVMFSCS1;
+	/* 0x56: ADC Input Voltage Mapping Full-Scale Code Selection 2 */
+	volatile uint8_t ADCIVMFSCS2;
+	/* 0x57: ADC Input Voltage Mapping Full-Scale Code Selection 3 */
+	volatile uint8_t ADCIVMFSCS3;
+	/* 0x58-0x5f: Reserved3 */
+	volatile uint8_t reserved3[8];
+	/* 0x60-0x6b: ADC channel 13~16 controller */
+	struct adc_vchs_ctrl_t adc_vchs_ctrl[4];
+	/* 0x6c: ADC Data Valid Status 2 */
+	volatile uint8_t ADCDVSTS2;
+	/* 0x6d-0xef: Reserved4 */
+	volatile uint8_t reserved4[131];
+	/* 0xf0: ADC Clock Control Register 1 */
+	volatile uint8_t ADCCTL1;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* ADC conversion time select 1 */
+#define IT8XXX2_ADC_ADCCTS1            BIT(7)
+/* Analog accuracy initialization */
+#define IT8XXX2_ADC_AINITB             BIT(3)
+/* ADC conversion time select 0 */
+#define IT8XXX2_ADC_ADCCTS0            BIT(5)
+/* ADC module enable */
+#define IT8XXX2_ADC_ADCEN              BIT(0)
+/* ADC data buffer keep enable */
+#define IT8XXX2_ADC_DBKEN              BIT(7)
+/* W/C data valid flag */
+#define IT8XXX2_ADC_DATVAL             BIT(7)
+/* Data valid interrupt of adc */
+#define IT8XXX2_ADC_INTDVEN            BIT(5)
+/* Voltage channel enable (Channel 4~7 and 13~16) */
+#define IT8XXX2_ADC_VCHEN              BIT(4)
+/* Automatic hardware calibration enable */
+#define IT8XXX2_ADC_AHCE               BIT(7)
+/* 0x046, 0x049, 0x04c, 0x06e, 0x071, 0x074: Voltage comparator x control */
+#define IT8XXX2_VCMP_CMPEN             BIT(7)
+#define IT8XXX2_VCMP_CMPINTEN          BIT(6)
+#define IT8XXX2_VCMP_GREATER_THRESHOLD BIT(5)
+#define IT8XXX2_VCMP_EDGE_TRIGGER      BIT(4)
+#define IT8XXX2_VCMP_GPIO_ACTIVE_LOW   BIT(3)
+/* 0x077~0x07c: Voltage comparator x channel select MSB */
+#define IT8XXX2_VCMP_VCMPXCSELM        BIT(0)
+
+/**
+ *
+ * (1Exxh) Clock and Power Management (ECPM) registers
+ *
+ */
+#define IT8XXX2_ECPM_BASE 0x00F01E00
+
+#ifndef __ASSEMBLER__
+enum chip_pll_mode {
+	CHIP_PLL_DOZE = 0,
+	CHIP_PLL_SLEEP = 1,
+	CHIP_PLL_DEEP_DOZE = 3,
+};
+#endif
+/*
+ * TODO: use ecpm_it8xxx2_regs instead of following register declarations
+ *       to fix in soc.c.
+ */
+#define IT8XXX2_ECPM_PLLCTRL  ECREG(IT8XXX2_ECPM_BASE + 0x03)
+#define IT8XXX2_ECPM_AUTOCG   ECREG(IT8XXX2_ECPM_BASE + 0x04)
+#define IT8XXX2_ECPM_CGCTRL3R ECREG(IT8XXX2_ECPM_BASE + 0x05)
+#define IT8XXX2_ECPM_PLLFREQR ECREG(IT8XXX2_ECPM_BASE + 0x06)
+#define IT8XXX2_ECPM_PLLCSS   ECREG(IT8XXX2_ECPM_BASE + 0x08)
+#define IT8XXX2_ECPM_SCDCR0   ECREG(IT8XXX2_ECPM_BASE + 0x0c)
+#define IT8XXX2_ECPM_SCDCR1   ECREG(IT8XXX2_ECPM_BASE + 0x0d)
+#define IT8XXX2_ECPM_SCDCR2   ECREG(IT8XXX2_ECPM_BASE + 0x0e)
+#define IT8XXX2_ECPM_SCDCR3   ECREG(IT8XXX2_ECPM_BASE + 0x0f)
+#define IT8XXX2_ECPM_SCDCR4   ECREG(IT8XXX2_ECPM_BASE + 0x10)
+#define IT8XXX2_ECPM_PFACC0R  ECREG(IT8XXX2_ECPM_BASE + 0x20)
+#define IT8XXX2_ECPM_PFACC1R  ECREG(IT8XXX2_ECPM_BASE + 0x21)
+#define IT8XXX2_ECPM_PFACC2R  ECREG(IT8XXX2_ECPM_BASE + 0x40)
+#define IT8XXX2_ECPM_LCOTF2   ECREG(IT8XXX2_ECPM_BASE + 0x54)
+#define IT8XXX2_ECPM_LCOCR    ECREG(IT8XXX2_ECPM_BASE + 0x55)
+#define IT8XXX2_ECPM_LCOCR1   ECREG(IT8XXX2_ECPM_BASE + 0x57)
+
+/*
+ * The count number of the counter for 25 ms register.
+ * The 25 ms register is calculated by (count number *1.024 kHz).
+ */
+
+#define I2C_CLK_LOW_TIMEOUT 255 /* ~=249 ms */
+
+/**
+ *
+ * (1Cxxh) SMBus Interface (SMB) registers
+ *
+ */
+#define IT8XXX2_SMB_BASE 0x00F01C00
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+#define IT8XXX2_SMB_4P7USL        ECREG(IT8XXX2_SMB_BASE + 0x00)
+#define IT8XXX2_SMB_4P0USL        ECREG(IT8XXX2_SMB_BASE + 0x01)
+#define IT8XXX2_SMB_300NS         ECREG(IT8XXX2_SMB_BASE + 0x02)
+#define IT8XXX2_SMB_250NS         ECREG(IT8XXX2_SMB_BASE + 0x03)
+#define IT8XXX2_SMB_25MS          ECREG(IT8XXX2_SMB_BASE + 0x04)
+#define IT8XXX2_SMB_45P3USL       ECREG(IT8XXX2_SMB_BASE + 0x05)
+#define IT8XXX2_SMB_45P3USH       ECREG(IT8XXX2_SMB_BASE + 0x06)
+#define IT8XXX2_SMB_4P7A4P0H      ECREG(IT8XXX2_SMB_BASE + 0x07)
+#define IT8XXX2_SMB_SLVISELR      ECREG(IT8XXX2_SMB_BASE + 0x08)
+#define IT8XXX2_SMB_SCLKTS(ch)    ECREG(IT8XXX2_SMB_BASE + 0x09 + ch)
+#define IT8XXX2_SMB_MSTFCTRL1     ECREG(IT8XXX2_SMB_BASE + 0x0D)
+#define IT8XXX2_SMB_MSTFSTS1      ECREG(IT8XXX2_SMB_BASE + 0x0E)
+#define IT8XXX2_SMB_MSTFCTRL2     ECREG(IT8XXX2_SMB_BASE + 0x0F)
+#define IT8XXX2_SMB_MSTFSTS2      ECREG(IT8XXX2_SMB_BASE + 0x10)
+#define IT8XXX2_SMB_SMB45CHS      ECREG(IT8XXX2_SMB_BASE + 0x11)
+#define IT8XXX2_SMB_I2CW2RF       ECREG(IT8XXX2_SMB_BASE + 0x12)
+#define IT8XXX2_SMB_IWRFISTA      ECREG(IT8XXX2_SMB_BASE + 0x13)
+#define IT8XXX2_SMB_SMB01CHS      ECREG(IT8XXX2_SMB_BASE + 0x20)
+#define IT8XXX2_SMB_SMB23CHS      ECREG(IT8XXX2_SMB_BASE + 0x21)
+#define IT8XXX2_SMB_SFFCTL        ECREG(IT8XXX2_SMB_BASE + 0x55)
+#define IT8XXX2_SMB_HOSTA(base)   ECREG(base + 0x00)
+#define IT8XXX2_SMB_HOCTL(base)   ECREG(base + 0x01)
+#define IT8XXX2_SMB_HOCMD(base)   ECREG(base + 0x02)
+#define IT8XXX2_SMB_TRASLA(base)  ECREG(base + 0x03)
+#define IT8XXX2_SMB_D0REG(base)   ECREG(base + 0x04)
+#define IT8XXX2_SMB_D1REG(base)   ECREG(base + 0x05)
+#define IT8XXX2_SMB_HOBDB(base)   ECREG(base + 0x06)
+#define IT8XXX2_SMB_PECERC(base)  ECREG(base + 0x07)
+#define IT8XXX2_SMB_SMBPCTL(base) ECREG(base + 0x0A)
+#define IT8XXX2_SMB_HOCTL2(base)  ECREG(base + 0x10)
+#elif CONFIG_SOC_IT8XXX2_REG_SET_V2
+#define IT8XXX2_SMB_SLVISEL     ECREG(IT8XXX2_SMB_BASE + 0x08)
+#define IT8XXX2_SMB_SMB01CHS    ECREG(IT8XXX2_SMB_BASE + 0x09)
+#define IT8XXX2_SMB_SMB23CHS    ECREG(IT8XXX2_SMB_BASE + 0x0A)
+#define IT8XXX2_SMB_SMB45CHS    ECREG(IT8XXX2_SMB_BASE + 0x0B)
+#define IT8XXX2_SMB_SCLKTS_BRGS ECREG(IT8XXX2_SMB_BASE + 0x80)
+#define IT8XXX2_SMB_SCLKTS_BRGM ECREG(IT8XXX2_SMB_BASE + 0x81)
+#define IT8XXX2_SMB_CHSBRG      ECREG(IT8XXX2_SMB_BASE + 0x82)
+#define IT8XXX2_SMB_CHSMOT      ECREG(IT8XXX2_SMB_BASE + 0x83)
+
+/* SMBus register fields */
+/* 0x80: SMCLK Timing Setting Register Bridge Slave */
+#define IT8XXX2_SMB_PREDEN      BIT(7)
+#endif
+
+/**
+ * Enhanced SMBus/I2C Interface
+ * Ch_D: 0x00F03680, Ch_E: 0x00F03500, Ch_F: 0x00F03580
+ * Ch_D: ch = 0x03, Ch_E: ch = 0x00, Ch_F: ch = 0x01
+ */
+#define IT8XXX2_I2C_DRR(base)        ECREG(base + 0x00)
+#define IT8XXX2_I2C_PSR(base)        ECREG(base + 0x01)
+#define IT8XXX2_I2C_HSPR(base)       ECREG(base + 0x02)
+#define IT8XXX2_I2C_STR(base)        ECREG(base + 0x03)
+#define IT8XXX2_I2C_DHTR(base)       ECREG(base + 0x04)
+#define IT8XXX2_I2C_TOR(base)        ECREG(base + 0x05)
+#define IT8XXX2_I2C_DTR(base)        ECREG(base + 0x08)
+#define IT8XXX2_I2C_CTR(base)        ECREG(base + 0x09)
+#define IT8XXX2_I2C_CTR1(base)       ECREG(base + 0x0A)
+#define IT8XXX2_I2C_BYTE_CNT_H(base) ECREG(base + 0x0B)
+#define IT8XXX2_I2C_BYTE_CNT_L(base) ECREG(base + 0x0C)
+#define IT8XXX2_I2C_IRQ_ST(base)     ECREG(base + 0x0D)
+#define IT8XXX2_I2C_IDR(base)        ECREG(base + 0x06)
+#define IT8XXX2_I2C_TOS(base)        ECREG(base + 0x07)
+#define IT8XXX2_I2C_SLV_NUM_H(base)  ECREG(base + 0x10)
+#define IT8XXX2_I2C_SLV_NUM_L(base)  ECREG(base + 0x11)
+#define IT8XXX2_I2C_STR2(base)       ECREG(base + 0x12)
+#define IT8XXX2_I2C_NST(base)        ECREG(base + 0x13)
+#define IT8XXX2_I2C_TO_ARB_ST(base)  ECREG(base + 0x18)
+#define IT8XXX2_I2C_ERR_ST(base)     ECREG(base + 0x19)
+#define IT8XXX2_I2C_FST(base)        ECREG(base + 0x1B)
+#define IT8XXX2_I2C_EM(base)         ECREG(base + 0x1C)
+#define IT8XXX2_I2C_MODE_SEL(base)   ECREG(base + 0x1D)
+#define IT8XXX2_I2C_IDR2(base)       ECREG(base + 0x1F)
+#define IT8XXX2_I2C_CTR2(base)       ECREG(base + 0x20)
+#define IT8XXX2_I2C_RAMHA(base)      ECREG(base + 0x23)
+#define IT8XXX2_I2C_RAMLA(base)      ECREG(base + 0x24)
+#define IT8XXX2_I2C_RAMHA2(base)     ECREG(base + 0x2C)
+#define IT8XXX2_I2C_RAMLA2(base)     ECREG(base + 0x2D)
+#define IT8XXX2_I2C_CMD_ADDH(base)   ECREG(base + 0x25)
+#define IT8XXX2_I2C_CMD_ADDL(base)   ECREG(base + 0x26)
+#define IT8XXX2_I2C_RAMH2A(base)     ECREG(base + 0x50)
+#define IT8XXX2_I2C_CMD_ADDH2(base)  ECREG(base + 0x52)
+
+/* SMBus/I2C register fields */
+/* 0x09-0xB: SMCLK Timing Setting */
+#define IT8XXX2_SMB_SMCLKS_1M   4
+#define IT8XXX2_SMB_SMCLKS_400K 3
+#define IT8XXX2_SMB_SMCLKS_100K 2
+#define IT8XXX2_SMB_SMCLKS_50K  1
+
+/* 0x0E: SMBus FIFO Status 1 */
+#define IT8XXX2_SMB_FIFO1_EMPTY      BIT(7)
+#define IT8XXX2_SMB_FIFO1_FULL       BIT(6)
+/* 0x0D: SMBus FIFO Control 1 */
+/* 0x0F: SMBus FIFO Control 2 */
+#define IT8XXX2_SMB_BLKDS            BIT(4)
+#define IT8XXX2_SMB_FFEN             BIT(3)
+#define IT8XXX2_SMB_FFCHSEL2_B       0
+#define IT8XXX2_SMB_FFCHSEL2_C       BIT(0)
+/* 0x10: SMBus FIFO Status 2 */
+#define IT8XXX2_SMB_FIFO2_EMPTY      BIT(7)
+#define IT8XXX2_SMB_FIFO2_FULL       BIT(6)
+/* 0x12: I2C Wr To Rd FIFO */
+#define IT8XXX2_SMB_MAIF             BIT(7)
+#define IT8XXX2_SMB_MBCIF            BIT(6)
+#define IT8XXX2_SMB_MCIFI            BIT(2)
+#define IT8XXX2_SMB_MBIFI            BIT(1)
+#define IT8XXX2_SMB_MAIFI            BIT(0)
+/* 0x13: I2C Wr To Rd FIFO Interrupt Status */
+#define IT8XXX2_SMB_MCIFID           BIT(2)
+#define IT8XXX2_SMB_MAIFID           BIT(0)
+/* 0x41 0x81 0xC1: Host Control */
+#define IT8XXX2_SMB_SRT              BIT(6)
+#define IT8XXX2_SMB_LABY             BIT(5)
+#define IT8XXX2_SMB_SMCD_EXTND       BIT(4) | BIT(3) | BIT(2)
+#define IT8XXX2_SMB_KILL             BIT(1)
+#define IT8XXX2_SMB_INTREN           BIT(0)
+/* 0x43 0x83 0xC3: Transmit Slave Address */
+#define IT8XXX2_SMB_DIR              BIT(0)
+/* 0x4A 0x8A 0xCA: SMBus Pin Control */
+#define IT8XXX2_SMB_SMBDCS           BIT(1)
+#define IT8XXX2_SMB_SMBCS            BIT(0)
+/* 0x50 0x90 0xD0: Host Control 2 */
+#define IT8XXX2_SMB_SMD_TO_EN        BIT(4)
+#define IT8XXX2_SMB_I2C_SW_EN        BIT(3)
+#define IT8XXX2_SMB_I2C_SW_WAIT      BIT(2)
+#define IT8XXX2_SMB_I2C_EN           BIT(1)
+#define IT8XXX2_SMB_SMHEN            BIT(0)
+/* 0x55: Slave A FIFO Control */
+#define IT8XXX2_SMB_HSAPE            BIT(1)
+/* 0x03: Status Register */
+#define IT8XXX2_I2C_BYTE_DONE        BIT(7)
+#define IT8XXX2_I2C_RW               BIT(2)
+#define IT8XXX2_I2C_INT_PEND         BIT(1)
+/* 0x04: Data Hold Time */
+#define IT8XXX2_I2C_SOFT_RST         BIT(7)
+/* 0x07: Time Out Status */
+#define IT8XXX2_I2C_CLK_STRETCH      BIT(7)
+#define IT8XXX2_I2C_SCL_IN           BIT(2)
+#define IT8XXX2_I2C_SDA_IN           BIT(0)
+/* 0x09: Control Register */
+#define IT8XXX2_I2C_INT_EN           BIT(6)
+#define IT8XXX2_I2C_ACK              BIT(3)
+#define IT8XXX2_I2C_HALT             BIT(0)
+/* 0x0A: Control 1 */
+#define IT8XXX2_I2C_COMQ_EN          BIT(7)
+#define IT8XXX2_I2C_MDL_EN           BIT(1)
+/* 0x0C: Byte count */
+#define IT8XXX2_I2C_DMA_ADDR_RELOAD  BIT(5)
+#define IT8XXX2_I2C_BYTE_CNT_ENABLE  BIT(3)
+/* 0x0D: Interrupt Status */
+#define IT8XXX2_I2C_CNT_HOLD         BIT(4)
+#define IT8XXX2_I2C_IDW_CLR          BIT(3)
+#define IT8XXX2_I2C_IDR_CLR          BIT(2)
+#define IT8XXX2_I2C_SLVDATAFLG       BIT(1)
+#define IT8XXX2_I2C_P_CLR            BIT(0)
+/* 0x13: Nack Status */
+#define IT8XXX2_I2C_NST_CNS          BIT(7)
+#define IT8XXX2_I2C_NST_ID_NACK      BIT(3)
+/* 0x18: Timeout and Arbiter Status */
+#define IT8XXX2_I2C_SCL_TIMEOUT_EN   BIT(7)
+#define IT8XXX2_I2C_SDA_TIMEOUT_EN   BIT(6)
+/* 0x19: Error Status */
+#define IT8XXX2_I2C_ERR_ST_DEV1_EIRQ BIT(0)
+/* 0x1B: Finish Status */
+#define IT8XXX2_I2C_FST_DEV1_IRQ     BIT(4)
+/* 0x1C: Error Mask */
+#define IT8XXX2_I2C_EM_DEV1_IRQ      BIT(4)
+
+/*
+ * TODO: use gctrl_ite_ec_regs instead of following register declarations
+ *       to fix in cros_flash_it8xxx2.c, cros_shi_it8xxx2.c and tcpm\it8xxx2.c.
+ */
+/* --- General Control (GCTRL) --- */
+#define IT83XX_GCTRL_BASE 0x00F02000
+
+#define IT83XX_GCTRL_CHIPID1      ECREG(IT83XX_GCTRL_BASE + 0x85)
+#define IT83XX_GCTRL_CHIPID2      ECREG(IT83XX_GCTRL_BASE + 0x86)
+#define IT83XX_GCTRL_CHIPVER      ECREG(IT83XX_GCTRL_BASE + 0x02)
+#define IT83XX_GCTRL_MCCR3        ECREG(IT83XX_GCTRL_BASE + 0x20)
+#define IT83XX_GCTRL_SPISLVPFE    BIT(6)
+#define IT83XX_GCTRL_EWPR0PFH(i)  ECREG(IT83XX_GCTRL_BASE + 0x60 + i)
+#define IT83XX_GCTRL_EWPR0PFD(i)  ECREG(IT83XX_GCTRL_BASE + 0xA0 + i)
+#define IT83XX_GCTRL_EWPR0PFEC(i) ECREG(IT83XX_GCTRL_BASE + 0xC0 + i)
+
+/*
+ * TODO: use spisc_it8xxx2_regs instead of following register declarations
+ *       to fix in cros_shi_it8xxx2.c.
+ */
+/* Serial Peripheral Interface (SPI) */
+#define IT83XX_SPI_BASE 0x00F03A00
+
+#define IT83XX_SPI_SPISGCR      ECREG(IT83XX_SPI_BASE + 0x00)
+#define IT83XX_SPI_SPISCEN      BIT(0)
+#define IT83XX_SPI_TXRXFAR      ECREG(IT83XX_SPI_BASE + 0x01)
+#define IT83XX_SPI_CPURXF2A     BIT(4)
+#define IT83XX_SPI_CPURXF1A     BIT(3)
+#define IT83XX_SPI_CPUTFA       BIT(1)
+#define IT83XX_SPI_TXFCR        ECREG(IT83XX_SPI_BASE + 0x02)
+#define IT83XX_SPI_TXFCMR       BIT(2)
+#define IT83XX_SPI_TXFR         BIT(1)
+#define IT83XX_SPI_TXFS         BIT(0)
+#define IT83XX_SPI_GCR2         ECREG(IT83XX_SPI_BASE + 0x03)
+#define IT83XX_SPI_RXF2OC       BIT(4)
+#define IT83XX_SPI_RXF1OC       BIT(3)
+#define IT83XX_SPI_RXFAR        BIT(0)
+#define IT83XX_SPI_IMR          ECREG(IT83XX_SPI_BASE + 0x04)
+#define IT83XX_SPI_RX_FIFO_FULL BIT(7)
+#define IT83XX_SPI_RX_REACH     BIT(5)
+#define IT83XX_SPI_EDIM         BIT(2)
+#define IT83XX_SPI_ISR          ECREG(IT83XX_SPI_BASE + 0x05)
+#define IT83XX_SPI_TXFSR        ECREG(IT83XX_SPI_BASE + 0x06)
+#define IT83XX_SPI_ENDDETECTINT BIT(2)
+#define IT83XX_SPI_RXFSR        ECREG(IT83XX_SPI_BASE + 0x07)
+#define IT83XX_SPI_RXFFSM       (BIT(4) | BIT(3))
+#define IT83XX_SPI_RXF2FS       BIT(2)
+#define IT83XX_SPI_RXF1FS       BIT(1)
+#define IT83XX_SPI_SPISRDR      ECREG(IT83XX_SPI_BASE + 0x0b)
+#define IT83XX_SPI_CPUWTFDB0    ECREG_u32(IT83XX_SPI_BASE + 0x08)
+#define IT83XX_SPI_FCR          ECREG(IT83XX_SPI_BASE + 0x09)
+#define IT83XX_SPI_SPISRTXF     BIT(2)
+#define IT83XX_SPI_RXFR         BIT(1)
+#define IT83XX_SPI_RXFCMR       BIT(0)
+#define IT83XX_SPI_RXFRDRB0     ECREG_u32(IT83XX_SPI_BASE + 0x0C)
+#define IT83XX_SPI_FTCB0R       ECREG(IT83XX_SPI_BASE + 0x18)
+#define IT83XX_SPI_FTCB1R       ECREG(IT83XX_SPI_BASE + 0x19)
+#define IT83XX_SPI_TCCB0        ECREG(IT83XX_SPI_BASE + 0x1A)
+#define IT83XX_SPI_TCCB1        ECREG(IT83XX_SPI_BASE + 0x1B)
+#define IT83XX_SPI_HPR2         ECREG(IT83XX_SPI_BASE + 0x1E)
+#define IT83XX_SPI_EMMCBMR      ECREG(IT83XX_SPI_BASE + 0x21)
+#define IT83XX_SPI_EMMCABM      BIT(1) /* eMMC Alternative Boot Mode */
+#define IT83XX_SPI_RX_VLISMR    ECREG(IT83XX_SPI_BASE + 0x26)
+#define IT83XX_SPI_RVLIM        BIT(0)
+#define IT83XX_SPI_RX_VLISR     ECREG(IT83XX_SPI_BASE + 0x27)
+#define IT83XX_SPI_RVLI         BIT(0)
+
+/**
+ *
+ * (20xxh) General Control (GCTRL) registers
+ *
+ */
+#define GCTRL_IT8XXX2_REGS_BASE ((struct gctrl_it8xxx2_regs *)DT_REG_ADDR(DT_NODELABEL(gctrl)))
+
+#ifndef __ASSEMBLER__
+struct gctrl_it8xxx2_regs {
+	/* 0x00-0x01: Reserved_00_01 */
+	volatile uint8_t reserved_00_01[2];
+	/* 0x02: Chip Version */
+	volatile uint8_t GCTRL_ECHIPVER;
+	/* 0x03: DBGR Operate Status */
+	volatile uint8_t GCTRL_DBGROS;
+	/* 0x04-0x05: Reserved_04_05 */
+	volatile uint8_t reserved_04_05[2];
+	/* 0x06: Reset Status */
+	volatile uint8_t GCTRL_RSTS;
+	/* 0x07-0x09: Reserved_07_09 */
+	volatile uint8_t reserved_07_09[3];
+	/* 0x0A: Base Address Select */
+	volatile uint8_t GCTRL_BADRSEL;
+	/* 0x0B: Wait Next Clock Rising */
+	volatile uint8_t GCTRL_WNCKR;
+	/* 0x0C: reserved_0c */
+	volatile uint8_t reserved_0c;
+	/* 0x0D: Special Control 1 */
+	volatile uint8_t GCTRL_SPCTRL1;
+	/* 0x0E-0x0F: reserved_0e_0f */
+	volatile uint8_t reserved_0e_0f[2];
+	/* 0x10: Reset Control DMM */
+	volatile uint8_t GCTRL_RSTDMMC;
+	/* 0x11: Reset Control 4 */
+	volatile uint8_t GCTRL_RSTC4;
+	/* 0x12-0x1B: reserved_12_1b */
+	volatile uint8_t reserved_12_1b[10];
+	/* 0x1C: Special Control 4 */
+	volatile uint8_t GCTRL_SPCTRL4;
+	/* 0x1D-0x1F: reserved_1d_1f */
+	volatile uint8_t reserved_1d_1f[3];
+	/* 0x20: Memory Controller Configuration 3 */
+	volatile uint8_t GCTRL_MCCR3;
+	/* 0x21: Reset Control 5 */
+	volatile uint8_t GCTRL_RSTC5;
+	/* 0x22-0x2F: reserved_22_2f */
+	volatile uint8_t reserved_22_2f[14];
+	/* 0x30: Memory Controller Configuration */
+	volatile uint8_t GCTRL_MCCR;
+	/* 0x31: Externel ILM/DLM Size */
+	volatile uint8_t GCTRL_EIDSR;
+	/* 0x32: Reserved_32 */
+	volatile uint8_t reserved_32;
+	/* 0x33: Pin Multi-function Enable 2 */
+	volatile uint8_t gctrl_pmer2;
+	/* 0x34-0x36: Reserved_34_36 */
+	volatile uint8_t reserved_34_36[3];
+	/* 0x37: Eflash Protect Lock */
+	volatile uint8_t GCTRL_EPLR;
+	/* 0x38-0x40: Reserved_38_40 */
+	volatile uint8_t reserved_38_40[9];
+	/* 0x41: Interrupt Vector Table Base Address */
+	volatile uint8_t GCTRL_IVTBAR;
+	/* 0x42-0x43: Reserved_42_43 */
+	volatile uint8_t reserved_42_43[2];
+	/* 0x44: Memory Controller Configuration 2 */
+	volatile uint8_t GCTRL_MCCR2;
+	/* 0x45: Reserved_45 */
+	volatile uint8_t reserved_45;
+	/* 0x46: Pin Multi-function Enable 3 */
+	volatile uint8_t GCTRL_PMER3;
+	/* 0x47-0x4A: reserved_47_4a */
+	volatile uint8_t reserved_47_4a[4];
+	/* 0x4B: ETWD and UART Control */
+	volatile uint8_t GCTRL_ETWDUARTCR;
+	/* 0x4C: Wakeup MCU Control */
+	volatile uint8_t GCTRL_WMCR;
+	/* 0x4D-0x4F: reserved_4d_4f */
+	volatile uint8_t reserved_4d_4f[3];
+	/* 0x50: Port 80h/81h Status Register */
+	volatile uint8_t GCTRL_P80H81HSR;
+	/* 0x51: Port 80h Data Register */
+	volatile uint8_t GCTRL_P80HDR;
+	/* 0x52: Port 81h Data Register */
+	volatile uint8_t GCTRL_P81HDR;
+	/* 0x53: H2RAM Offset Register */
+	volatile uint8_t GCTRL_H2ROFSR;
+	/* 0x54-0x5C: reserved_54_5c */
+	volatile uint8_t reserved_54_5c[9];
+	/* 0x5D: RISCV ILM Configuration 0 */
+	volatile uint8_t GCTRL_RVILMCR0;
+	/* 0x5E-0x84: reserved_5e_84 */
+	volatile uint8_t reserved_5e_84[39];
+	/* 0x85: Chip ID Byte 1 */
+	volatile uint8_t GCTRL_ECHIPID1;
+	/* 0x86: Chip ID Byte 2 */
+	volatile uint8_t GCTRL_ECHIPID2;
+	/* 0x87: Chip ID Byte 3 */
+	volatile uint8_t GCTRL_ECHIPID3;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* GCTRL register fields */
+/* 0x03: DBGR Operate Status */
+#define IT8XXX2_GCTRL_SMB_DBGR         BIT(0)
+/* 0x06: Reset Status */
+#define IT8XXX2_GCTRL_LRS              (BIT(1) | BIT(0))
+#define IT8XXX2_GCTRL_IWDTR            BIT(1)
+/* 0x0B: Wait Next 65K Rising */
+#define IT8XXX2_GCTRL_WN65K            0x00
+/* 0x10: Reset Control DMM */
+#define IT8XXX2_GCTRL_UART1SD          BIT(3)
+#define IT8XXX2_GCTRL_UART2SD          BIT(2)
+/* 0x11: Reset Control 4 */
+#define IT8XXX2_GCTRL_RPECI            BIT(4)
+#define IT8XXX2_GCTRL_RUART2           BIT(2)
+#define IT8XXX2_GCTRL_RUART1           BIT(1)
+/* 0x1C: Special Control 4 */
+#define IT8XXX2_GCTRL_LRSIWR           BIT(2)
+#define IT8XXX2_GCTRL_LRSIPWRSWTR      BIT(1)
+#define IT8XXX2_GCTRL_LRSIPGWR         BIT(0)
+/* 0x20: Memory Controller Configuration 3 */
+#define IT8XXX2_GCTRL_SPISLVPFE        BIT(6)
+/* 0x30: Memory Controller Configuration */
+#define IT8XXX2_GCTRL_USB_DEBUG_EN     BIT(7)
+#define IT8XXX2_GCTRL_ICACHE_RESET     BIT(4)
+/* 0x37: Eflash Protect Lock */
+#define IT8XXX2_GCTRL_EPLR_ENABLE      BIT(0)
+/* 0x46: Pin Multi-function Enable 3 */
+#define IT8XXX2_GCTRL_SMB3PSEL         BIT(6)
+#define IT8XXX2_GCTRL_SRAM_CRYPTO_USED BIT(5)
+/* 0x4B: ETWD and UART Control */
+#define IT8XXX2_GCTRL_ETWD_HW_RST_EN   BIT(0)
+/* 0x5D: RISCV ILM Configuration 0 */
+#define IT8XXX2_GCTRL_ILM0_ENABLE      BIT(0)
+/* Accept Port 80h Cycle */
+#define IT8XXX2_GCTRL_ACP80            BIT(6)
+/* Accept Port 81h Cycle */
+#define IT8XXX2_GCTRL_ACP81            BIT(3)
+/* USB Debug Enable */
+#define IT8XXX2_GCTRL_MCCR_USB_EN      BIT(7)
+/* USB Pad Power-On Enable */
+#define IT8XXX2_GCTRL_PMER2_USB_PAD_EN BIT(7)
+
+/*
+ * VCC Detector Option.
+ * bit[7-6] = 1: The VCC power status is treated as power-on.
+ * The VCC supply of eSPI and related functions (EC2I, KBC, PMC and
+ * PECI). It means VCC should be logic high before using these
+ * functions, or firmware treats VCC logic high.
+ */
+#define IT8XXX2_GCTRL_VCCDO_MASK   (BIT(6) | BIT(7))
+#define IT8XXX2_GCTRL_VCCDO_VCC_ON BIT(6)
+/*
+ * bit[3] = 0: The reset source of PNPCFG is RSTPNP bit in RSTCH
+ * register and WRST#.
+ */
+#define IT8XXX2_GCTRL_HGRST        BIT(3)
+/* bit[2] = 1: Enable global reset. */
+#define IT8XXX2_GCTRL_GRST         BIT(2)
+
+/**
+ *
+ * (22xxh) Battery-backed SRAM (BRAM) registers
+ *
+ */
+#ifndef __ASSEMBLER__
+/* Battery backed RAM indices. */
+#define BRAM_MAGIC_FIELD_OFFSET 0xbc
+enum bram_indices {
+
+	/* This field is used to indicate BRAM is valid or not. */
+	BRAM_IDX_VALID_FLAGS0 = BRAM_MAGIC_FIELD_OFFSET,
+	BRAM_IDX_VALID_FLAGS1,
+	BRAM_IDX_VALID_FLAGS2,
+	BRAM_IDX_VALID_FLAGS3
+};
+#endif /* !__ASSEMBLER__ */
+
+#ifndef __ASSEMBLER__
+/*
+ * EC2I bridge registers
+ */
+struct ec2i_regs {
+	/* 0x00: Indirect Host I/O Address Register */
+	volatile uint8_t IHIOA;
+	/* 0x01: Indirect Host Data Register */
+	volatile uint8_t IHD;
+	/* 0x02: Lock Super I/O Host Access Register */
+	volatile uint8_t LSIOHA;
+	/* 0x03: Super I/O Access Lock Violation Register */
+	volatile uint8_t SIOLV;
+	/* 0x04: EC to I-Bus Modules Access Enable Register */
+	volatile uint8_t IBMAE;
+	/* 0x05: I-Bus Control Register */
+	volatile uint8_t IBCTL;
+};
+
+/* Index list of the host interface registers of PNPCFG */
+enum host_pnpcfg_index {
+	/* Logical Device Number */
+	HOST_INDEX_LDN = 0x07,
+	/* Chip ID Byte 1 */
+	HOST_INDEX_CHIPID1 = 0x20,
+	/* Chip ID Byte 2 */
+	HOST_INDEX_CHIPID2 = 0x21,
+	/* Chip Version */
+	HOST_INDEX_CHIPVER = 0x22,
+	/* Super I/O Control */
+	HOST_INDEX_SIOCTRL = 0x23,
+	/* Super I/O IRQ Configuration */
+	HOST_INDEX_SIOIRQ = 0x25,
+	/* Super I/O General Purpose */
+	HOST_INDEX_SIOGP = 0x26,
+	/* Super I/O Power Mode */
+	HOST_INDEX_SIOPWR = 0x2D,
+	/* Depth 2 I/O Address */
+	HOST_INDEX_D2ADR = 0x2E,
+	/* Depth 2 I/O Data */
+	HOST_INDEX_D2DAT = 0x2F,
+	/* Logical Device Activate Register */
+	HOST_INDEX_LDA = 0x30,
+	/* I/O Port Base Address Bits [15:8] for Descriptor 0 */
+	HOST_INDEX_IOBAD0_MSB = 0x60,
+	/* I/O Port Base Address Bits [7:0] for Descriptor 0 */
+	HOST_INDEX_IOBAD0_LSB = 0x61,
+	/* I/O Port Base Address Bits [15:8] for Descriptor 1 */
+	HOST_INDEX_IOBAD1_MSB = 0x62,
+	/* I/O Port Base Address Bits [7:0] for Descriptor 1 */
+	HOST_INDEX_IOBAD1_LSB = 0x63,
+	/* Interrupt Request Number and Wake-Up on IRQ Enabled */
+	HOST_INDEX_IRQNUMX = 0x70,
+	/* Interrupt Request Type Select */
+	HOST_INDEX_IRQTP = 0x71,
+	/* DMA Channel Select 0 */
+	HOST_INDEX_DMAS0 = 0x74,
+	/* DMA Channel Select 1 */
+	HOST_INDEX_DMAS1 = 0x75,
+	/* Device Specific Logical Device Configuration 1 to 10 */
+	HOST_INDEX_DSLDC1 = 0xF0,
+	HOST_INDEX_DSLDC2 = 0xF1,
+	HOST_INDEX_DSLDC3 = 0xF2,
+	HOST_INDEX_DSLDC4 = 0xF3,
+	HOST_INDEX_DSLDC5 = 0xF4,
+	HOST_INDEX_DSLDC6 = 0xF5,
+	HOST_INDEX_DSLDC7 = 0xF6,
+	HOST_INDEX_DSLDC8 = 0xF7,
+	HOST_INDEX_DSLDC9 = 0xF8,
+	HOST_INDEX_DSLDC10 = 0xF9,
+};
+
+/* List of logical device number (LDN) assignments */
+enum logical_device_number {
+	/* Serial Port 1 */
+	LDN_UART1 = 0x01,
+	/* Serial Port 2 */
+	LDN_UART2 = 0x02,
+	/* System Wake-Up Control */
+	LDN_SWUC = 0x04,
+	/* KBC/Mouse Interface */
+	LDN_KBC_MOUSE = 0x05,
+	/* KBC/Keyboard Interface */
+	LDN_KBC_KEYBOARD = 0x06,
+	/* Consumer IR */
+	LDN_CIR = 0x0A,
+	/* Shared Memory/Flash Interface */
+	LDN_SMFI = 0x0F,
+	/* RTC-like Timer */
+	LDN_RTCT = 0x10,
+	/* Power Management I/F Channel 1 */
+	LDN_PMC1 = 0x11,
+	/* Power Management I/F Channel 2 */
+	LDN_PMC2 = 0x12,
+	/* Serial Peripheral Interface */
+	LDN_SSPI = 0x13,
+	/* Platform Environment Control Interface */
+	LDN_PECI = 0x14,
+	/* Power Management I/F Channel 3 */
+	LDN_PMC3 = 0x17,
+	/* Power Management I/F Channel 4 */
+	LDN_PMC4 = 0x18,
+	/* Power Management I/F Channel 5 */
+	LDN_PMC5 = 0x19,
+};
+
+/* Structure for initializing PNPCFG via ec2i. */
+struct ec2i_t {
+	/* index port */
+	enum host_pnpcfg_index index_port;
+	/* data port */
+	uint8_t data_port;
+};
+
+/* EC2I access index/data port */
+enum ec2i_access {
+	/* index port */
+	EC2I_ACCESS_INDEX = 0,
+	/* data port */
+	EC2I_ACCESS_DATA = 1,
+};
+
+/* EC to I-Bus Access Enabled */
+#define EC2I_IBCTL_CSAE  BIT(0)
+/* EC Read from I-Bus */
+#define EC2I_IBCTL_CRIB  BIT(1)
+/* EC Write to I-Bus */
+#define EC2I_IBCTL_CWIB  BIT(2)
+#define EC2I_IBCTL_CRWIB (EC2I_IBCTL_CRIB | EC2I_IBCTL_CWIB)
+
+/* PNPCFG Register EC Access Enable */
+#define EC2I_IBMAE_CFGAE BIT(0)
+
+/*
+ * KBC registers
+ */
+struct kbc_regs {
+	/* 0x00: KBC Host Interface Control Register */
+	volatile uint8_t KBHICR;
+	/* 0x01: Reserved1 */
+	volatile uint8_t reserved1;
+	/* 0x02: KBC Interrupt Control Register */
+	volatile uint8_t KBIRQR;
+	/* 0x03: Reserved2 */
+	volatile uint8_t reserved2;
+	/* 0x04: KBC Host Interface Keyboard/Mouse Status Register */
+	volatile uint8_t KBHISR;
+	/* 0x05: Reserved3 */
+	volatile uint8_t reserved3;
+	/* 0x06: KBC Host Interface Keyboard Data Output Register */
+	volatile uint8_t KBHIKDOR;
+	/* 0x07: Reserved4 */
+	volatile uint8_t reserved4;
+	/* 0x08: KBC Host Interface Mouse Data Output Register */
+	volatile uint8_t KBHIMDOR;
+	/* 0x09: Reserved5 */
+	volatile uint8_t reserved5;
+	/* 0x0a: KBC Host Interface Keyboard/Mouse Data Input Register */
+	volatile uint8_t KBHIDIR;
+};
+
+/* Output Buffer Full */
+#define KBC_KBHISR_OBF      BIT(0)
+/* Input Buffer Full */
+#define KBC_KBHISR_IBF      BIT(1)
+/* A2 Address (A2) */
+#define KBC_KBHISR_A2_ADDR  BIT(3)
+#define KBC_KBHISR_STS_MASK (KBC_KBHISR_OBF | KBC_KBHISR_IBF | KBC_KBHISR_A2_ADDR)
+
+/* Clear Output Buffer Full */
+#define KBC_KBHICR_COBF      BIT(6)
+/* IBF/OBF Clear Mode Enable */
+#define KBC_KBHICR_IBFOBFCME BIT(5)
+/* Input Buffer Full CPU Interrupt Enable */
+#define KBC_KBHICR_IBFCIE    BIT(3)
+/* Output Buffer Empty CPU Interrupt Enable */
+#define KBC_KBHICR_OBECIE    BIT(2)
+/* Output Buffer Full Mouse Interrupt Enable */
+#define KBC_KBHICR_OBFMIE    BIT(1)
+/* Output Buffer Full Keyboard Interrupt Enable */
+#define KBC_KBHICR_OBFKIE    BIT(0)
+
+/*
+ * PMC registers
+ */
+struct pmc_regs {
+	/* 0x00: Host Interface PM Channel 1 Status */
+	volatile uint8_t PM1STS;
+	/* 0x01: Host Interface PM Channel 1 Data Out Port */
+	volatile uint8_t PM1DO;
+	/* 0x02: Host Interface PM Channel 1 Data Out Port with SCI# */
+	volatile uint8_t PM1DOSCI;
+	/* 0x03: Host Interface PM Channel 1 Data Out Port with SMI# */
+	volatile uint8_t PM1DOSMI;
+	/* 0x04: Host Interface PM Channel 1 Data In Port */
+	volatile uint8_t PM1DI;
+	/* 0x05: Host Interface PM Channel 1 Data In Port with SCI# */
+	volatile uint8_t PM1DISCI;
+	/* 0x06: Host Interface PM Channel 1 Control */
+	volatile uint8_t PM1CTL;
+	/* 0x07: Host Interface PM Channel 1 Interrupt Control */
+	volatile uint8_t PM1IC;
+	/* 0x08: Host Interface PM Channel 1 Interrupt Enable */
+	volatile uint8_t PM1IE;
+	/* 0x09-0x0f: Reserved1 */
+	volatile uint8_t reserved1[7];
+	/* 0x10: Host Interface PM Channel 2 Status */
+	volatile uint8_t PM2STS;
+	/* 0x11: Host Interface PM Channel 2 Data Out Port */
+	volatile uint8_t PM2DO;
+	/* 0x12: Host Interface PM Channel 2 Data Out Port with SCI# */
+	volatile uint8_t PM2DOSCI;
+	/* 0x13: Host Interface PM Channel 2 Data Out Port with SMI# */
+	volatile uint8_t PM2DOSMI;
+	/* 0x14: Host Interface PM Channel 2 Data In Port */
+	volatile uint8_t PM2DI;
+	/* 0x15: Host Interface PM Channel 2 Data In Port with SCI# */
+	volatile uint8_t PM2DISCI;
+	/* 0x16: Host Interface PM Channel 2 Control */
+	volatile uint8_t PM2CTL;
+	/* 0x17: Host Interface PM Channel 2 Interrupt Control */
+	volatile uint8_t PM2IC;
+	/* 0x18: Host Interface PM Channel 2 Interrupt Enable */
+	volatile uint8_t PM2IE;
+	/* 0x19: Mailbox Control */
+	volatile uint8_t MBXCTRL;
+	/* 0x1a-0x1f: Reserved2 */
+	volatile uint8_t reserved2[6];
+	/* 0x20-0xff: Reserved3 */
+	volatile uint8_t reserved3[0xe0];
+};
+
+/* Input Buffer Full Interrupt Enable */
+#define PMC_PM1CTL_IBFIE   BIT(0)
+/* Output Buffer Full */
+#define PMC_PM1STS_OBF     BIT(0)
+/* Input Buffer Full */
+#define PMC_PM1STS_IBF     BIT(1)
+/* General Purpose Flag */
+#define PMC_PM1STS_GPF     BIT(2)
+/* A2 Address (A2) */
+#define PMC_PM1STS_A2_ADDR BIT(3)
+
+/* PMC2 Input Buffer Full Interrupt Enable */
+#define PMC_PM2CTL_IBFIE BIT(0)
+/* General Purpose Flag */
+#define PMC_PM2STS_GPF   BIT(2)
+
+/*
+ * Dedicated Interrupt
+ * 0b:
+ * INT3: PMC Output Buffer Empty Int
+ * INT25: PMC Input Buffer Full Int
+ * 1b:
+ * INT3: PMC1 Output Buffer Empty Int
+ * INT25: PMC1 Input Buffer Full Int
+ * INT26: PMC2 Output Buffer Empty Int
+ * INT27: PMC2 Input Buffer Full Int
+ */
+#define PMC_MBXCTRL_DINT BIT(5)
+
+/*
+ * eSPI slave registers
+ */
+struct espi_slave_regs {
+	/* 0x00-0x03: Reserved1 */
+	volatile uint8_t reserved1[4];
+
+	/* 0x04: General Capabilities and Configuration 0 */
+	volatile uint8_t GCAPCFG0;
+	/* 0x05: General Capabilities and Configuration 1 */
+	volatile uint8_t GCAPCFG1;
+	/* 0x06: General Capabilities and Configuration 2 */
+	volatile uint8_t GCAPCFG2;
+	/* 0x07: General Capabilities and Configuration 3 */
+	volatile uint8_t GCAPCFG3;
+
+	/* Channel 0 (Peripheral Channel) Capabilities and Configurations */
+	/* 0x08: Channel 0 Capabilities and Configuration 0 */
+	volatile uint8_t CH_PC_CAPCFG0;
+	/* 0x09: Channel 0 Capabilities and Configuration 1 */
+	volatile uint8_t CH_PC_CAPCFG1;
+	/* 0x0A: Channel 0 Capabilities and Configuration 2 */
+	volatile uint8_t CH_PC_CAPCFG2;
+	/* 0x0B: Channel 0 Capabilities and Configuration 3 */
+	volatile uint8_t CH_PC_CAPCFG3;
+
+	/* Channel 1 (Virtual Wire Channel) Capabilities and Configurations */
+	/* 0x0C: Channel 1 Capabilities and Configuration 0 */
+	volatile uint8_t CH_VW_CAPCFG0;
+	/* 0x0D: Channel 1 Capabilities and Configuration 1 */
+	volatile uint8_t CH_VW_CAPCFG1;
+	/* 0x0E: Channel 1 Capabilities and Configuration 2 */
+	volatile uint8_t CH_VW_CAPCFG2;
+	/* 0x0F: Channel 1 Capabilities and Configuration 3 */
+	volatile uint8_t CH_VW_CAPCFG3;
+
+	/* Channel 2 (OOB Message Channel) Capabilities and Configurations */
+	/* 0x10: Channel 2 Capabilities and Configuration 0 */
+	volatile uint8_t CH_OOB_CAPCFG0;
+	/* 0x11: Channel 2 Capabilities and Configuration 1 */
+	volatile uint8_t CH_OOB_CAPCFG1;
+	/* 0x12: Channel 2 Capabilities and Configuration 2 */
+	volatile uint8_t CH_OOB_CAPCFG2;
+	/* 0x13: Channel 2 Capabilities and Configuration 3 */
+	volatile uint8_t CH_OOB_CAPCFG3;
+
+	/* Channel 3 (Flash Access Channel) Capabilities and Configurations */
+	/* 0x14: Channel 3 Capabilities and Configuration 0 */
+	volatile uint8_t CH_FLASH_CAPCFG0;
+	/* 0x15: Channel 3 Capabilities and Configuration 1 */
+	volatile uint8_t CH_FLASH_CAPCFG1;
+	/* 0x16: Channel 3 Capabilities and Configuration 2 */
+	volatile uint8_t CH_FLASH_CAPCFG2;
+	/* 0x17: Channel 3 Capabilities and Configuration 3 */
+	volatile uint8_t CH_FLASH_CAPCFG3;
+	/* Channel 3 Capabilities and Configurations 2 */
+	/* 0x18: Channel 3 Capabilities and Configuration 2-0 */
+	volatile uint8_t CH_FLASH_CAPCFG2_0;
+	/* 0x19: Channel 3 Capabilities and Configuration 2-1 */
+	volatile uint8_t CH_FLASH_CAPCFG2_1;
+	/* 0x1A: Channel 3 Capabilities and Configuration 2-2 */
+	volatile uint8_t CH_FLASH_CAPCFG2_2;
+	/* 0x1B: Channel 3 Capabilities and Configuration 2-3 */
+	volatile uint8_t CH_FLASH_CAPCFG2_3;
+
+	/* 0x1c-0x1f: Reserved2 */
+	volatile uint8_t reserved2[4];
+	/* 0x20-0x8f: Reserved3 */
+	volatile uint8_t reserved3[0x70];
+
+	/* 0x90: eSPI PC Control 0 */
+	volatile uint8_t ESPCTRL0;
+	/* 0x91: eSPI PC Control 1 */
+	volatile uint8_t ESPCTRL1;
+	/* 0x92: eSPI PC Control 2 */
+	volatile uint8_t ESPCTRL2;
+	/* 0x93: eSPI PC Control 3 */
+	volatile uint8_t ESPCTRL3;
+	/* 0x94: eSPI PC Control 4 */
+	volatile uint8_t ESPCTRL4;
+	/* 0x95: eSPI PC Control 5 */
+	volatile uint8_t ESPCTRL5;
+	/* 0x96: eSPI PC Control 6 */
+	volatile uint8_t ESPCTRL6;
+	/* 0x97: eSPI PC Control 7 */
+	volatile uint8_t ESPCTRL7;
+	/* 0x98-0x9f: Reserved4 */
+	volatile uint8_t reserved4[8];
+
+	/* 0xa0: eSPI General Control 0 */
+	volatile uint8_t ESGCTRL0;
+	/* 0xa1: eSPI General Control 1 */
+	volatile uint8_t ESGCTRL1;
+	/* 0xa2: eSPI General Control 2 */
+	volatile uint8_t ESGCTRL2;
+	/* 0xa3: eSPI General Control 3 */
+	volatile uint8_t ESGCTRL3;
+	/* 0xa4-0xaf: Reserved5 */
+	volatile uint8_t reserved5[12];
+
+	/* 0xb0: eSPI Upstream Control 0 */
+	volatile uint8_t ESUCTRL0;
+	/* 0xb1: eSPI Upstream Control 1 */
+	volatile uint8_t ESUCTRL1;
+	/* 0xb2: eSPI Upstream Control 2 */
+	volatile uint8_t ESUCTRL2;
+	/* 0xb3: eSPI Upstream Control 3 */
+	volatile uint8_t ESUCTRL3;
+	/* 0xb4-0xb5: Reserved6 */
+	volatile uint8_t reserved6[2];
+	/* 0xb6: eSPI Upstream Control 6 */
+	volatile uint8_t ESUCTRL6;
+	/* 0xb7: eSPI Upstream Control 7 */
+	volatile uint8_t ESUCTRL7;
+	/* 0xb8: eSPI Upstream Control 8 */
+	volatile uint8_t ESUCTRL8;
+	/* 0xb9-0xbf: Reserved7 */
+	volatile uint8_t reserved7[7];
+
+	/* 0xc0: eSPI OOB Control 0 */
+	volatile uint8_t ESOCTRL0;
+	/* 0xc1: eSPI OOB Control 1 */
+	volatile uint8_t ESOCTRL1;
+	/* 0xc2-0xc3: Reserved8 */
+	volatile uint8_t reserved8[2];
+	/* 0xc4: eSPI OOB Control 4 */
+	volatile uint8_t ESOCTRL4;
+	/* 0xc5-0xcf: Reserved9 */
+	volatile uint8_t reserved9[11];
+
+	/* 0xd0: eSPI SAFS Control 0 */
+	volatile uint8_t ESPISAFSC0;
+	/* 0xd1: eSPI SAFS Control 1 */
+	volatile uint8_t ESPISAFSC1;
+	/* 0xd2: eSPI SAFS Control 2 */
+	volatile uint8_t ESPISAFSC2;
+	/* 0xd3: eSPI SAFS Control 3 */
+	volatile uint8_t ESPISAFSC3;
+	/* 0xd4: eSPI SAFS Control 4 */
+	volatile uint8_t ESPISAFSC4;
+	/* 0xd5: eSPI SAFS Control 5 */
+	volatile uint8_t ESPISAFSC5;
+	/* 0xd6: eSPI SAFS Control 6 */
+	volatile uint8_t ESPISAFSC6;
+	/* 0xd7: eSPI SAFS Control 7 */
+	volatile uint8_t ESPISAFSC7;
+};
+
+/*
+ * eSPI VW registers
+ */
+struct espi_vw_regs {
+	/* 0x00-0x7f: VW index */
+	volatile uint8_t VW_INDEX[0x80];
+	/* 0x80-0x8f: Reserved1 */
+	volatile uint8_t reserved1[0x10];
+	/* 0x90: VW Contrl 0 */
+	volatile uint8_t VWCTRL0;
+	/* 0x91: VW Contrl 1 */
+	volatile uint8_t VWCTRL1;
+	/* 0x92: VW Contrl 2 */
+	volatile uint8_t VWCTRL2;
+	/* 0x93: VW Contrl 3 */
+	volatile uint8_t VWCTRL3;
+	/* 0x94: Reserved2 */
+	volatile uint8_t reserved2;
+	/* 0x95: VW Contrl 5 */
+	volatile uint8_t VWCTRL5;
+	/* 0x96: VW Contrl 6 */
+	volatile uint8_t VWCTRL6;
+	/* 0x97: VW Contrl 7 */
+	volatile uint8_t VWCTRL7;
+	/* 0x98-0x99: Reserved3 */
+	volatile uint8_t reserved3[2];
+};
+
+#define ESPI_IT8XXX2_OOB_MAX_PAYLOAD_SIZE 80
+/*
+ * eSPI Queue 0 registers
+ */
+struct espi_queue0_regs {
+	/* 0x00-0x3f: PUT_PC Data Byte 0-63 */
+	volatile uint8_t PUT_PC_DATA[0x40];
+	/* 0x40-0x7f: Reserved1 */
+	volatile uint8_t reserved1[0x40];
+	/* 0x80-0xcf: PUT_OOB Data Byte 0-79 */
+	volatile uint8_t PUT_OOB_DATA[ESPI_IT8XXX2_OOB_MAX_PAYLOAD_SIZE];
+};
+
+/*
+ * eSPI Queue 1 registers
+ */
+struct espi_queue1_regs {
+	/* 0x00-0x4f: Upstream Data Byte 0-79 */
+	volatile uint8_t UPSTREAM_DATA[ESPI_IT8XXX2_OOB_MAX_PAYLOAD_SIZE];
+	/* 0x50-0x7f: Reserved1 */
+	volatile uint8_t reserved1[0x30];
+	/* 0x80-0xbf: PUT_FLASH_NP Data Byte 0-63 */
+	volatile uint8_t PUT_FLASH_NP_DATA[0x40];
+};
+
+#endif /* !__ASSEMBLER__ */
+
+/**
+ *
+ * (3Axxh) SPI Slave Controller (SPISC) registers
+ *
+ */
+#ifndef __ASSEMBLER__
+struct spisc_it8xxx2_regs {
+	/* 0x00: SPI Slave General Control */
+	volatile uint8_t SPISC_SPISGCR;
+	/* 0x01: Tx/Rx FIFO Access */
+	volatile uint8_t SPISC_TXRXFAR;
+	/* 0x02: Tx FIFO Control */
+	volatile uint8_t SPISC_TXFCR;
+	/* 0x03: SPI Slave General Control 2 */
+	volatile uint8_t SPISC_SPISGCR2;
+	/* 0x04: Interrupt Mask */
+	volatile uint8_t SPISC_IMR;
+	/* 0x05: Interrupt Status */
+	volatile uint8_t SPISC_ISR;
+	/* 0x06: Tx FIFO Status */
+	volatile uint8_t SPISC_TXFSR;
+	/* 0x07: Rx FIFO Status */
+	volatile uint8_t SPISC_RXFSR;
+	/* 0x08: CPU Write Tx FIFO Data Byte0 */
+	volatile uint8_t SPISC_CPUWTXFDB0R;
+	/* 0x09: FIFO Control / CPU Write Tx FIFO Data Byte1 */
+	volatile uint8_t SPISC_FCR;
+	/* 0x0A: CPU Write Tx FIFO Data Byte2 */
+	volatile uint8_t SPISC_CPUWTXFDB2R;
+	/* 0x0B: SPI Slave Response Data / CPU Write Tx FIFO Data Byte3 */
+	volatile uint8_t SPISC_SPISRDR;
+	/* 0x0C: Rx FIFO Readout Data Byte0 */
+	volatile uint8_t SPISC_RXFRDRB0;
+	/* 0x0D: Rx FIFO Readout Data Byte1 */
+	volatile uint8_t SPISC_RXFRDRB1;
+	/* 0x0E: Rx FIFO Readout Data Byte2 */
+	volatile uint8_t SPISC_RXFRDRB2;
+	/* 0x0F: Rx FIFO Readout Data Byte3 */
+	volatile uint8_t SPISC_RXFRDRB3;
+	/* 0x10-0x17: Reserved1 */
+	volatile uint8_t reserved1[8];
+	/* 0x18: FIFO Target Count Byte0 */
+	volatile uint8_t SPISC_FTCB0R;
+	/* 0x19: FIFO Target Count Byte1 */
+	volatile uint8_t SPISC_FTCB1R;
+	/* 0x1A: Target Count Capture Byte0 */
+	volatile uint8_t SPISC_TCCB0;
+	/* 0x1B: Target Count Capture Byte1 */
+	volatile uint8_t SPISC_TCCB1;
+	/* 0x1C-0x1D: Reserved2 */
+	volatile uint8_t reserved2[2];
+	/* 0x1E: Hardware Parsing 2 */
+	volatile uint8_t SPISC_HPR2;
+	/* 0x1F-0x25: Reserved3 */
+	volatile uint8_t reserved3[7];
+	/* 0x26: Rx Valid Length Interrupt Status Mask */
+	volatile uint8_t SPISC_RXVLISMR;
+	/* 0x27: Rx Valid Length Interrupt Status */
+	volatile uint8_t SPISC_RXVLISR;
+};
+#endif /* !__ASSEMBLER__ */
+
+/* SPISC register fields */
+/* 0x00: SPI Slave General Control */
+#define IT8XXX2_SPISC_SPISCEN      BIT(0)
+/* 0x01: Tx/Rx FIFO Access */
+#define IT8XXX2_SPISC_CPURXF1A     BIT(3)
+#define IT8XXX2_SPISC_CPUTFA       BIT(1)
+/* 0x02: Tx FIFO Control */
+#define IT8XXX2_SPISC_TXFCMR       BIT(2)
+#define IT8XXX2_SPISC_TXFR         BIT(1)
+#define IT8XXX2_SPISC_TXFS         BIT(0)
+/* 0x03: SPI Slave General Control 2 */
+#define IT8XXX2_SPISC_RXF2OC       BIT(4)
+#define IT8XXX2_SPISC_RXF1OC       BIT(3)
+#define IT8XXX2_SPISC_RXFAR        BIT(0)
+/* 0x04: Interrupt Mask */
+#define IT8XXX2_SPISC_EDIM         BIT(2)
+/* 0x06: Tx FIFO Status */
+#define IT8XXX2_SPISC_ENDDETECTINT BIT(2)
+/* 0x09: FIFO Control */
+#define IT8XXX2_SPISC_SPISRTXF     BIT(2)
+#define IT8XXX2_SPISC_RXFR         BIT(1)
+#define IT8XXX2_SPISC_RXFCMR       BIT(0)
+/* 0x26: Rx Valid Length Interrupt Status Mask */
+#define IT8XXX2_SPISC_RVLIM        BIT(0)
+/* 0x27: Rx Valid Length Interrupt Status */
+#define IT8XXX2_SPISC_RVLI         BIT(0)
+
+/* Alias gpio_ite_ec_regs to gpio_it8xxx2_regs for compatibility */
+#define gpio_ite_ec_regs       gpio_it8xxx2_regs
+#define GPIO_ITE_EC_REGS_BASE  GPIO_IT8XXX2_REG_BASE
+/* Alias smfi_ite_ec_regs to smfi_it8xxx2_regs for compatibility */
+#define smfi_ite_ec_regs       smfi_it8xxx2_regs
+/* Alias gctrl_ite_ec_regs to  gctrl_it8xxx2_regs for compatibility */
+#define gctrl_ite_ec_regs      gctrl_it8xxx2_regs
+#define GCTRL_ITE_EC_REGS_BASE GCTRL_IT8XXX2_REGS_BASE
+
+#endif /* CHIP_CHIPREGS_H */
diff --git a/soc/ite/ec/it8xxx2/ilm.c b/soc/ite/ec/it8xxx2/ilm.c
index f586e38dd4574..3bd76114bd5c3 100644
--- a/soc/ite/ec/it8xxx2/ilm.c
+++ b/soc/ite/ec/it8xxx2/ilm.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <soc_common.h>
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -46,9 +47,6 @@ BUILD_ASSERT((ILM_BLOCK_SIZE & (ILM_BLOCK_SIZE - 1)) == 0, "ILM_BLOCK_SIZE must
 
 #define ILM_NODE DT_NODELABEL(ilm)
 
-#define SCARH_ENABLE	 BIT(3)
-#define SCARH_ADDR_BIT19 BIT(7)
-
 /*
  * SCAR registers contain 20-bit addresses in three registers, with one set
  * of SCAR registers for each ILM block that may be configured.
@@ -82,8 +80,13 @@ static int it8xxx2_configure_ilm_block(const struct ilm_config *const config, vo
 	if ((uintptr_t)ram_addr < RAM_BASE) {
 		return -EFAULT; /* Not in RAM */
 	}
-	const int dirmap_index = ((uintptr_t)ram_addr - RAM_BASE) / ILM_BLOCK_SIZE;
 
+#ifdef CONFIG_SOC_IT51XXX
+	/* Since IT51XXX only supports one 4KB ILM block (SCAR0), set dirmap_index to 0 directly. */
+	const int dirmap_index = 0;
+#else
+	const int dirmap_index = ((uintptr_t)ram_addr - RAM_BASE) / ILM_BLOCK_SIZE;
+#endif
 	if (dirmap_index >= ARRAY_SIZE(config->scar_regs)) {
 		return -EFAULT; /* Past the end of RAM */
 	}
@@ -103,8 +106,10 @@ static int it8xxx2_configure_ilm_block(const struct ilm_config *const config, vo
 
 	int irq_key = irq_lock();
 
+#if !defined(CONFIG_SOC_IT51XXX)
 	/* Ensure scratch RAM for block data access is enabled */
 	scar->h = SCARH_ENABLE;
+#endif
 	/* Copy block contents from flash into RAM */
 	memcpy(ram_addr, flash_addr, copy_sz);
 	/* Program SCAR */
@@ -118,6 +123,11 @@ static int it8xxx2_configure_ilm_block(const struct ilm_config *const config, vo
 	}
 	scar->h = scarh_value;
 
+#ifdef CONFIG_SOC_IT51XXX
+	struct gctrl_it51xxx_regs *const gctrl_regs = GCTRL_IT51XXX_REGS_BASE;
+	/* Scratch ROM0 is 4kb size */
+	gctrl_regs->GCTRL_SCR0SZR = IT51XXX_GCTRL_SCRSIZE_4K;
+#endif
 	irq_unlock(irq_key);
 	return 0;
 }
@@ -158,51 +168,41 @@ static int it8xxx2_ilm_init(const struct device *dev)
 #define SCAR_REG(n) (volatile struct scar_reg *)DT_REG_ADDR_BY_IDX(ILM_NODE, n)
 
 static const struct ilm_config ilm_config = {
-	.scar_regs = {
-		/* SCAR0 SRAM 4KB */
-		SCAR_REG(0),
-		SCAR_REG(1),
-		SCAR_REG(2),
-		SCAR_REG(3),
-		SCAR_REG(4),
-		SCAR_REG(5),
-		SCAR_REG(6),
-		SCAR_REG(7),
-		SCAR_REG(8),
-		SCAR_REG(9),
-		SCAR_REG(10),
-		SCAR_REG(11),
-		SCAR_REG(12),
-		SCAR_REG(13),
-		SCAR_REG(14),
-		/*
-		 * Except for CONFIG_SOC_IT81202CX and CONFIG_SOC_IT81302CX
-		 * maximum ILM size are 60KB, the ILM size of other varients
-		 * are equal to the SRAM size.
-		 */
+	.scar_regs = {/* SCAR0 SRAM 4KB */
+		      SCAR_REG(0),
+#if (CONFIG_ILM_MAX_SIZE > 4)
+		      SCAR_REG(1), SCAR_REG(2), SCAR_REG(3), SCAR_REG(4), SCAR_REG(5), SCAR_REG(6),
+		      SCAR_REG(7), SCAR_REG(8), SCAR_REG(9), SCAR_REG(10), SCAR_REG(11),
+		      SCAR_REG(12), SCAR_REG(13), SCAR_REG(14),
+#endif
+/*
+ * Except for CONFIG_SOC_IT81202CX and CONFIG_SOC_IT81302CX
+ * maximum ILM size are 60KB, the ILM size of other variants
+ * are equal to the SRAM size.
+ */
 #if (CONFIG_ILM_MAX_SIZE == 256)
-		/* SCAR15 SRAM 4KB */
-		SCAR_REG(15),
-		/* SCAR16 SRAM 16KB */
-		SCAR_REG(16), SCAR_REG(16), SCAR_REG(16), SCAR_REG(16),
-		/* SCAR17 SRAM 16KB */
-		SCAR_REG(17), SCAR_REG(17), SCAR_REG(17), SCAR_REG(17),
-		/* SCAR18 SRAM 16KB */
-		SCAR_REG(18), SCAR_REG(18), SCAR_REG(18), SCAR_REG(18),
-		/* SCAR19 SRAM 16KB */
-		SCAR_REG(19), SCAR_REG(19), SCAR_REG(19), SCAR_REG(19),
-		/* SCAR20 SRAM 32KB */
-		SCAR_REG(20), SCAR_REG(20), SCAR_REG(20), SCAR_REG(20),
-		SCAR_REG(20), SCAR_REG(20), SCAR_REG(20), SCAR_REG(20),
-		/* SCAR21 SRAM 32KB */
-		SCAR_REG(21), SCAR_REG(21), SCAR_REG(21), SCAR_REG(21),
-		SCAR_REG(21), SCAR_REG(21), SCAR_REG(21), SCAR_REG(21),
-		/* SCAR22 SRAM 32KB */
-		SCAR_REG(22), SCAR_REG(22), SCAR_REG(22), SCAR_REG(22),
-		SCAR_REG(22), SCAR_REG(22), SCAR_REG(22), SCAR_REG(22),
-		/* SCAR23 SRAM 32KB */
-		SCAR_REG(23), SCAR_REG(23), SCAR_REG(23), SCAR_REG(23),
-		SCAR_REG(23), SCAR_REG(23), SCAR_REG(23), SCAR_REG(23)
+		      /* SCAR15 SRAM 4KB */
+		      SCAR_REG(15),
+		      /* SCAR16 SRAM 16KB */
+		      SCAR_REG(16), SCAR_REG(16), SCAR_REG(16), SCAR_REG(16),
+		      /* SCAR17 SRAM 16KB */
+		      SCAR_REG(17), SCAR_REG(17), SCAR_REG(17), SCAR_REG(17),
+		      /* SCAR18 SRAM 16KB */
+		      SCAR_REG(18), SCAR_REG(18), SCAR_REG(18), SCAR_REG(18),
+		      /* SCAR19 SRAM 16KB */
+		      SCAR_REG(19), SCAR_REG(19), SCAR_REG(19), SCAR_REG(19),
+		      /* SCAR20 SRAM 32KB */
+		      SCAR_REG(20), SCAR_REG(20), SCAR_REG(20), SCAR_REG(20), SCAR_REG(20),
+		      SCAR_REG(20), SCAR_REG(20), SCAR_REG(20),
+		      /* SCAR21 SRAM 32KB */
+		      SCAR_REG(21), SCAR_REG(21), SCAR_REG(21), SCAR_REG(21), SCAR_REG(21),
+		      SCAR_REG(21), SCAR_REG(21), SCAR_REG(21),
+		      /* SCAR22 SRAM 32KB */
+		      SCAR_REG(22), SCAR_REG(22), SCAR_REG(22), SCAR_REG(22), SCAR_REG(22),
+		      SCAR_REG(22), SCAR_REG(22), SCAR_REG(22),
+		      /* SCAR23 SRAM 32KB */
+		      SCAR_REG(23), SCAR_REG(23), SCAR_REG(23), SCAR_REG(23), SCAR_REG(23),
+		      SCAR_REG(23), SCAR_REG(23), SCAR_REG(23)
 #endif
 	}};
 BUILD_ASSERT(ARRAY_SIZE(ilm_config.scar_regs) * ILM_BLOCK_SIZE == KB(CONFIG_ILM_MAX_SIZE),
diff --git a/soc/ite/ec/it8xxx2/linker.ld b/soc/ite/ec/it8xxx2/linker.ld
index b5b0f686d732b..3d46d9e00e2df 100644
--- a/soc/ite/ec/it8xxx2/linker.ld
+++ b/soc/ite/ec/it8xxx2/linker.ld
@@ -131,9 +131,9 @@ SECTIONS
     } GROUP_LINK_IN(ROMABLE_REGION)
 
 #ifdef CONFIG_SOC_IT8XXX2_JTAG_DEBUG_INTERFACE
-#define JTAG_DEBUG_RESERVED_ADDR_START 0x80000800
-#define JTAG_DEBUG_RESERVED_ADDR_END 0x800008FF
-	/* The CPU address from 0x80000800 to 0x800008FF is reserved for JTAG
+#define JTAG_DEBUG_RESERVED_ADDR_START (ROM_BASE + 0x800)
+#define JTAG_DEBUG_RESERVED_ADDR_END (ROM_BASE + 0x8FF)
+	/* The flash range at offset 0x800 to 0x8FF is reserved for JTAG
 	 * debug usage. */
 	SECTION_PROLOGUE(jtag_dbg,,)
 	{
diff --git a/soc/ite/ec/it8xxx2/soc.c b/soc/ite/ec/it8xxx2/soc.c
index 73768c7ab83aa..e8a9b7fb3d7da 100644
--- a/soc/ite/ec/it8xxx2/soc.c
+++ b/soc/ite/ec/it8xxx2/soc.c
@@ -369,6 +369,18 @@ void arch_cpu_atomic_idle(unsigned int key)
 	riscv_idle(CHIP_PLL_DOZE, key);
 }
 
+void soc_prep_hook(void)
+{
+#ifdef CONFIG_SOC_IT8XXX2_REG_SET_V1
+	/*
+	 * Disables the I2C0 alternate function before executing the PLL sequence change
+	 * to ensure that the EC can enter sleep mode successfully.
+	 */
+	IT8XXX2_GPIO_GPCRB3 = GPCR_PORT_PIN_MODE_INPUT;
+	IT8XXX2_GPIO_GPCRB4 = GPCR_PORT_PIN_MODE_INPUT;
+#endif
+}
+
 static int ite_it8xxx2_init(void)
 {
 	struct gpio_it8xxx2_regs *const gpio_regs = GPIO_IT8XXX2_REG_BASE;
diff --git a/soc/ite/ec/common/vector.S b/soc/ite/ec/it8xxx2/vector.S
similarity index 100%
rename from soc/ite/ec/common/vector.S
rename to soc/ite/ec/it8xxx2/vector.S
diff --git a/soc/ite/ec/soc.yml b/soc/ite/ec/soc.yml
index b73270535f931..b0cba7d8eae35 100644
--- a/soc/ite/ec/soc.yml
+++ b/soc/ite/ec/soc.yml
@@ -15,3 +15,8 @@ family:
           - name: it82302ax
           - name: it82202bw
           - name: it82302bw
+  - name: ite_ec
+    series:
+      - name: it51xxx
+        socs:
+          - name: it51526aw
diff --git a/soc/mediatek/mt8xxx/mtk_adsp_load.py b/soc/mediatek/mt8xxx/mtk_adsp_load.py
index 03efcd2f1cc76..42127b75ec5c8 100755
--- a/soc/mediatek/mt8xxx/mtk_adsp_load.py
+++ b/soc/mediatek/mt8xxx/mtk_adsp_load.py
@@ -277,7 +277,13 @@ def find_winstream(maps):
     magic = b'\x74\x5f\x6a\xd0\x79\xe2\x4f\x00\xcd\xb8\xbd\xf9'
     for m in maps:
         if "dram" in m:
-            magoff = maps[m].find(magic)
+            # Some python versions produce bus errors (!) on the
+            # hardware when finding a 12 byte substring (maybe a SIMD
+            # load that the hardware doesn't like?).  Do it in two
+            # chunks.
+            magoff = maps[m].find(magic[0:8])
+            if magoff >= 0:
+                magoff = maps[m].find(magic[8:], magoff) - 8
             if magoff >= 0:
                 addr = le4(maps[m][magoff + 12 : magoff + 16])
                 return addr
diff --git a/soc/mediatek/mt8xxx/soc.c b/soc/mediatek/mt8xxx/soc.c
index 2b375ccf3951f..330a247bbe93d 100644
--- a/soc/mediatek/mt8xxx/soc.c
+++ b/soc/mediatek/mt8xxx/soc.c
@@ -197,7 +197,6 @@ static void enable_mpu(void)
 		{ 0x10000000, 0x06f00 },          /* MMIO registers */
 		{ 0x1d000000, 0x06000 },          /* inaccessible */
 		{ SRAM_START, 0xf7f00 },          /* cached SRAM */
-		{ (uint32_t)&_mtk_adsp_sram_end, 0x06f00 }, /* uncached SRAM */
 		{ SRAM_END,   0x06000 },          /* inaccessible */
 		{ DRAM_START, 0xf7f00 },          /* cached DRAM */
 		{ (uint32_t)&_mtk_adsp_dram_end, 0x06f00 }, /* uncached DRAM */
diff --git a/soc/microchip/mec/mec15xx/Kconfig b/soc/microchip/mec/mec15xx/Kconfig
index 510fbd898eaa3..9a22e03cdc154 100644
--- a/soc/microchip/mec/mec15xx/Kconfig
+++ b/soc/microchip/mec/mec15xx/Kconfig
@@ -16,9 +16,6 @@ config SOC_MEC1501_HSZ
 
 if SOC_SERIES_MEC15XX
 
-config RTOS_TIMER
-	bool "MEC1501 RTOS timer"
-
 config SOC_MEC1501_PROC_CLK_DIV
 	int "PROC_CLK_DIV"
 	default 1
diff --git a/soc/microchip/mec/mec15xx/Kconfig.defconfig.series b/soc/microchip/mec/mec15xx/Kconfig.defconfig.series
index d12e702312893..ba99d1850918a 100644
--- a/soc/microchip/mec/mec15xx/Kconfig.defconfig.series
+++ b/soc/microchip/mec/mec15xx/Kconfig.defconfig.series
@@ -13,7 +13,16 @@ config NUM_IRQS
 
 rsource "Kconfig.defconfig.mec1501*"
 
-if RTOS_TIMER
+config CORTEX_M_SYSTICK
+	depends on !MCHP_XEC_RTOS_TIMER
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency) if MCHP_XEC_RTOS_TIMER
+
+if MCHP_XEC_RTOS_TIMER
+config SYS_CLOCK_TICKS_PER_SEC
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency)
 
 config SOC_HAS_TIMING_FUNCTIONS
 	default y if !CORTEX_M_DWT
@@ -21,9 +30,6 @@ config SOC_HAS_TIMING_FUNCTIONS
 config ARCH_HAS_CUSTOM_BUSY_WAIT
 	default y
 
-endif # RTOS_TIMER
-
-config CORTEX_M_SYSTICK
-	depends on !RTOS_TIMER
+endif # MCHP_XEC_RTOS_TIMER
 
 endif # SOC_SERIES_MEC15XX
diff --git a/soc/microchip/mec/mec172x/Kconfig b/soc/microchip/mec/mec172x/Kconfig
index 85f579ec77650..2a7589be700ab 100644
--- a/soc/microchip/mec/mec172x/Kconfig
+++ b/soc/microchip/mec/mec172x/Kconfig
@@ -15,9 +15,6 @@ config SOC_SERIES_MEC172X
 
 if SOC_SERIES_MEC172X
 
-config RTOS_TIMER
-	bool "MEC172x RTOS Timer(32KHz) as kernel timer"
-
 choice
 	prompt "MEC172x debug interface general configuration"
 	default SOC_MEC172X_DEBUG_WITHOUT_TRACING
diff --git a/soc/microchip/mec/mec172x/Kconfig.defconfig.series b/soc/microchip/mec/mec172x/Kconfig.defconfig.series
index 016d13b6818ea..b64aeb2e02230 100644
--- a/soc/microchip/mec/mec172x/Kconfig.defconfig.series
+++ b/soc/microchip/mec/mec172x/Kconfig.defconfig.series
@@ -13,7 +13,16 @@ config NUM_IRQS
 
 rsource "Kconfig.defconfig.mec172x*"
 
-if RTOS_TIMER
+config CORTEX_M_SYSTICK
+	depends on !MCHP_XEC_RTOS_TIMER
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency) if MCHP_XEC_RTOS_TIMER
+
+if MCHP_XEC_RTOS_TIMER
+config SYS_CLOCK_TICKS_PER_SEC
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency)
 
 config SOC_HAS_TIMING_FUNCTIONS
 	default y if !CORTEX_M_DWT
@@ -21,10 +30,7 @@ config SOC_HAS_TIMING_FUNCTIONS
 config ARCH_HAS_CUSTOM_BUSY_WAIT
 	default y
 
-endif # RTOS_TIMER
-
-config CORTEX_M_SYSTICK
-	depends on !RTOS_TIMER
+endif # MCHP_XEC_RTOS_TIMER
 
 config PS2_XEC
 	default y
diff --git a/soc/microchip/mec/mec172x/device_power.c b/soc/microchip/mec/mec172x/device_power.c
index eab5bfb04196a..d6a627efdc6a6 100644
--- a/soc/microchip/mec/mec172x/device_power.c
+++ b/soc/microchip/mec/mec172x/device_power.c
@@ -92,10 +92,10 @@ void soc_deep_sleep_non_wake_dis(void)
 /* When MEC172x drivers are power-aware this should be move there */
 void soc_deep_sleep_wake_en(void)
 {
-#if defined(CONFIG_KSCAN) ||	\
+#if defined(INPUT_XEC_KBD) ||	\
 	(!defined(CONFIG_PM_DEVICE) && DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ps2_0)))
 	struct ecia_named_regs *regs = ECIA_XEC_REG_BASE;
-#if defined(CONFIG_KSCAN)
+#if defined(INPUT_XEC_KBD)
 	/* Enable PLL wake via KSCAN  */
 	regs->GIRQ21.SRC = MCHP_KEYSCAN_GIRQ_BIT;
 	regs->GIRQ21.EN_SET = MCHP_KEYSCAN_GIRQ_BIT;
diff --git a/soc/microchip/mec/mec174x/Kconfig b/soc/microchip/mec/mec174x/Kconfig
index eeb77525d725b..bdee97015bc61 100644
--- a/soc/microchip/mec/mec174x/Kconfig
+++ b/soc/microchip/mec/mec174x/Kconfig
@@ -11,12 +11,8 @@ config SOC_SERIES_MEC174X
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	select HAS_MEC5_HAL
-	select HAS_PM
 	select SOC_PREP_HOOK
 
 if SOC_SERIES_MEC174X
 
-config RTOS_TIMER
-	bool "MEC174x RTOS Timer(32KHz) as kernel timer"
-
 endif # SOC_SERIES_MEC174X
diff --git a/soc/microchip/mec/mec174x/Kconfig.defconfig.series b/soc/microchip/mec/mec174x/Kconfig.defconfig.series
index f434af934096e..2b750776fe972 100644
--- a/soc/microchip/mec/mec174x/Kconfig.defconfig.series
+++ b/soc/microchip/mec/mec174x/Kconfig.defconfig.series
@@ -12,6 +12,15 @@ config NUM_IRQS
 	default 194
 
 config CORTEX_M_SYSTICK
-	depends on !RTOS_TIMER
+	depends on !MCHP_MEC5_KTIMER
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency) if MCHP_MEC5_KTIMER
+
+if MCHP_MEC5_KTIMER
+config SYS_CLOCK_TICKS_PER_SEC
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency)
+endif # MCHP_MEC5_KTIMER
 
 endif # SOC_SERIES_MEC174X
diff --git a/soc/microchip/mec/mec175x/Kconfig b/soc/microchip/mec/mec175x/Kconfig
index 5670fe72540a4..e2136d7a2df99 100644
--- a/soc/microchip/mec/mec175x/Kconfig
+++ b/soc/microchip/mec/mec175x/Kconfig
@@ -11,12 +11,8 @@ config SOC_SERIES_MEC175X
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	select HAS_MEC5_HAL
-	select HAS_PM
 	select SOC_PREP_HOOK
 
 if SOC_SERIES_MEC175X
 
-config RTOS_TIMER
-	bool "MEC175x RTOS Timer(32KHz) as kernel timer"
-
 endif # SOC_SERIES_MEC175X
diff --git a/soc/microchip/mec/mec175x/Kconfig.defconfig.series b/soc/microchip/mec/mec175x/Kconfig.defconfig.series
index 01abcebfe8755..e32cacf68cd72 100644
--- a/soc/microchip/mec/mec175x/Kconfig.defconfig.series
+++ b/soc/microchip/mec/mec175x/Kconfig.defconfig.series
@@ -12,6 +12,15 @@ config NUM_IRQS
 	default 198
 
 config CORTEX_M_SYSTICK
-	depends on !RTOS_TIMER
+	depends on !MCHP_MEC5_KTIMER
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency) if MCHP_MEC5_KTIMER
+
+if MCHP_MEC5_KTIMER
+config SYS_CLOCK_TICKS_PER_SEC
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency)
+endif # MCHP_MEC5_KTIMER
 
 endif # SOC_SERIES_MEC175X
diff --git a/soc/microchip/mec/mech172x/Kconfig b/soc/microchip/mec/mech172x/Kconfig
index d58d267e9cce9..7154644bf1f61 100644
--- a/soc/microchip/mec/mech172x/Kconfig
+++ b/soc/microchip/mec/mech172x/Kconfig
@@ -11,12 +11,8 @@ config SOC_SERIES_MECH172X
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	select HAS_MEC5_HAL
-	select HAS_PM
 	select SOC_PREP_HOOK
 
 if SOC_SERIES_MECH172X
 
-config RTOS_TIMER
-	bool "MECH172x RTOS Timer(32KHz) as kernel timer"
-
 endif # SOC_SERIES_MECH172X
diff --git a/soc/microchip/mec/mech172x/Kconfig.defconfig.series b/soc/microchip/mec/mech172x/Kconfig.defconfig.series
index cec629c0e470c..ddb1a4a2850bd 100644
--- a/soc/microchip/mec/mech172x/Kconfig.defconfig.series
+++ b/soc/microchip/mec/mech172x/Kconfig.defconfig.series
@@ -12,6 +12,15 @@ config NUM_IRQS
 	default 181
 
 config CORTEX_M_SYSTICK
-	depends on !RTOS_TIMER
+	depends on !MCHP_MEC5_KTIMER
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency) if MCHP_MEC5_KTIMER
+
+if MCHP_MEC5_KTIMER
+config SYS_CLOCK_TICKS_PER_SEC
+	default $(dt_node_int_prop_int,/soc/timer@40007400,clock-frequency)
+endif # MCHP_MEC5_KTIMER
 
 endif # SOC_SERIES_MECH172X
diff --git a/soc/microchip/miv/polarfire/Kconfig.defconfig b/soc/microchip/miv/polarfire/Kconfig.defconfig
index 26b0f2c9a258a..927ced7e08af9 100644
--- a/soc/microchip/miv/polarfire/Kconfig.defconfig
+++ b/soc/microchip/miv/polarfire/Kconfig.defconfig
@@ -23,6 +23,6 @@ config MAX_IRQ_PER_AGGREGATOR
 	default 186
 
 config NUM_IRQS
-	default 186
+	default 199
 
 endif # SOC_SERIES_POLARFIRE
diff --git a/soc/neorv32/CMakeLists.txt b/soc/neorv32/CMakeLists.txt
index 42731316d8460..ffbadbff4944f 100644
--- a/soc/neorv32/CMakeLists.txt
+++ b/soc/neorv32/CMakeLists.txt
@@ -7,4 +7,4 @@ zephyr_sources(
   soc.c
 )
 
-set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/riscv/common/linker.ld CACHE INTERNAL "")
diff --git a/soc/neorv32/Kconfig b/soc/neorv32/Kconfig
index d0b2a04967b21..bba678a61c721 100644
--- a/soc/neorv32/Kconfig
+++ b/soc/neorv32/Kconfig
@@ -1,37 +1,34 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_NEORV32
 	select RISCV
-	select RISCV_ISA_RV32I
-	select RISCV_ISA_EXT_M
-	select RISCV_ISA_EXT_A
-	select RISCV_ISA_EXT_ZICSR
-	select RISCV_ISA_EXT_ZIFENCEI
 	select RISCV_PRIVILEGED
 	select RISCV_SOC_HAS_GP_RELATIVE_ADDRESSING
+	select RISCV_ISA_EXT_ZICSR
+	select RISCV_ISA_EXT_ZIFENCEI
 	imply XIP
 
 if SOC_NEORV32
 
-config SOC_NEORV32_V1_8_6
-	bool "v1.8.6"
-	# NEORV32 RISC-V ISA A extension implements only LR/SC, not AMO
-	select ATOMIC_OPERATIONS_C
-
 config SOC_NEORV32_VERSION
 	hex
-	default 0x01080600 if SOC_NEORV32_V1_8_6
+	default 0x01110200
 	help
 	  The targeted NEORV32 version as BCD-coded number. The format is
 	  identical to that of the NEORV32 Machine implementation ID (mimpid)
 	  register.
 
-config SOC_NEORV32_ISA_C
-	bool "RISC-V ISA Extension \"C\""
-	select RISCV_ISA_EXT_C
+config SOC_NEORV32_READ_FREQUENCY_AT_RUNTIME
+	bool "Read the NEORV32 clock frequency at runtime"
+	default y
+	depends on !$(dt_node_has_prop,/cpus/cpu@0,clock-frequency)
+	depends on SYS_CLOCK_EXISTS
+	select SOC_EARLY_INIT_HOOK
+	select TIMER_READS_ITS_FREQUENCY_AT_RUNTIME
 	help
-	  Enable this if the NEORV32 CPU implementation supports the RISC-V ISA
-	  "C" extension (Compressed Instructions).
+	  If enabled, the NEORV32 clock frequency will be read from SYSINFO during boot. This
+	  results in small overhead, which can be avoided by setting the clock-frequency property of
+	  the cpu@0 devicetree node if the frequency is known at build-time.
 
 endif # SOC_NEORV32
diff --git a/soc/neorv32/Kconfig.defconfig b/soc/neorv32/Kconfig.defconfig
index 3608ae244a011..db169985f453f 100644
--- a/soc/neorv32/Kconfig.defconfig
+++ b/soc/neorv32/Kconfig.defconfig
@@ -1,10 +1,10 @@
-# Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_NEORV32
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if RISCV_MACHINE_TIMER
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if !SOC_NEORV32_READ_FREQUENCY_AT_RUNTIME
 
 config NUM_IRQS
 	default 32
@@ -12,12 +12,4 @@ config NUM_IRQS
 config SYSCON
 	default y
 
-config SERIAL_INIT_PRIORITY
-	default 55
-	depends on SERIAL
-
-config ENTROPY_INIT_PRIORITY
-	default 55
-	depends on ENTROPY_GENERATOR
-
 endif # SOC_NEORV32
diff --git a/soc/neorv32/Kconfig.soc b/soc/neorv32/Kconfig.soc
index 37a28ec7b446a..8350679b5e82a 100644
--- a/soc/neorv32/Kconfig.soc
+++ b/soc/neorv32/Kconfig.soc
@@ -8,15 +8,9 @@ config SOC_NEORV32
 
 	  The NEORV32 CPU implementation must have the following RISC-V ISA
 	  extensions enabled in order to support Zephyr:
-	  - M (Integer Multiplication and Division)
-	  - Zicsr (Control and Status Register (CSR) Instructions)
-
-	  The following NEORV32 CPU ISA extensions are not currently supported
-	  by Zephyr and can safely be disabled:
-	  - A (Atomic Instructions)
-	  - E (Embedded, only 16 integer registers)
-	  - Zbb (Basic Bit Manipulation)
-	  - Zfinx (Floating Point in Integer Registers)
+	  - Zicsr (always enabled)
+	  - Zifencei (always enabled)
+	  - Zicntr
 
 config SOC
 	default "neorv32" if SOC_NEORV32
diff --git a/soc/neorv32/linker.ld b/soc/neorv32/linker.ld
deleted file mode 100644
index 24a138865ca69..0000000000000
--- a/soc/neorv32/linker.ld
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/linker/linker-tool.h>
-
-MEMORY
-{
-	IO (rw) : ORIGIN = 0xFFFFFE00, LENGTH = 512
-}
-
-SECTIONS
-{
-	SECTION_PROLOGUE(io, (NOLOAD),)
-	{
-		PROVIDE(__io_start = ORIGIN(IO));
-		PROVIDE(__io_end   = ORIGIN(IO) + LENGTH(IO));
-	} GROUP_LINK_IN(IO)
-}
-
-#include <zephyr/arch/riscv/common/linker.ld>
diff --git a/soc/neorv32/reset.S b/soc/neorv32/reset.S
index ca91f0376b1a7..005835f8e9a6c 100644
--- a/soc/neorv32/reset.S
+++ b/soc/neorv32/reset.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+ * Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -13,9 +13,6 @@ GTEXT(__reset)
 GTEXT(__initialize)
 
 SECTION_FUNC(reset, __reset)
-	/* Zerorize zero register */
-	lui x0, 0
-
 	/* Disable interrupts */
 	csrw mstatus, x0
 	csrw mie, x0
@@ -26,7 +23,7 @@ SECTION_FUNC(reset, __reset)
 #endif /* CONFIG_USERSPACE */
 
 	/* Allow mcycle and minstret counters to increment */
-	li x11, ~2
+	li x11, ~5
 	csrw mcountinhibit, x11
 
 	/* Zerorize counters */
@@ -35,39 +32,5 @@ SECTION_FUNC(reset, __reset)
 	csrw minstret, x0
 	csrw minstreth, x0
 
-	/*
-	 * Simplify dummy machine trap code by not having to decode
-	 * instruction width.
-	 */
-	.option push
-	.option norvc
-
-	/*
-	 * Temporarily setup a dummy machine trap vector to catch (and ignore)
-	 * Store Access faults due to unimplemented peripherals.
-	 */
-	csrr x6, mtvec
-	la x7, __dummy_trap_handler
-	csrw mtvec, x7
-
-	/* Attempt to zerorize all IO peripheral registers */
-	la x8, __io_start
-	la x9, __io_end
-1:	sw x0, 0(x8)
-	addi x8, x8, 4
-	bne x8, x9, 1b
-
-	/* Restore previous machine trap vector */
-	csrw mtvec, x6
-
-	.option pop
-
 	/* Jump to __initialize */
 	call __initialize
-
-.balign 4
-SECTION_FUNC(reset, __dummy_trap_handler)
-	csrr x5, mepc
-	addi x5, x5, 4
-	csrw mepc, x5
-	mret
diff --git a/soc/neorv32/soc.c b/soc/neorv32/soc.c
index 2a72eed16d9bb..ba80b2e717a56 100644
--- a/soc/neorv32/soc.c
+++ b/soc/neorv32/soc.c
@@ -7,11 +7,22 @@
 #include <zephyr/irq.h>
 #include <soc.h>
 
-#if defined(CONFIG_RISCV_SOC_INTERRUPT_INIT)
+#ifdef CONFIG_SOC_NEORV32_READ_FREQUENCY_AT_RUNTIME
+extern unsigned int z_clock_hw_cycles_per_sec;
+
+void soc_early_init_hook(void)
+{
+	uint32_t base = DT_REG_ADDR(DT_NODELABEL(sysinfo));
+
+	z_clock_hw_cycles_per_sec = sys_read32(base + NEORV32_SYSINFO_CLK);
+}
+#endif /* CONFIG_SOC_NEORV32_READ_FREQUENCY_AT_RUNTIME */
+
+#ifdef CONFIG_RISCV_SOC_INTERRUPT_INIT
 void soc_interrupt_init(void)
 {
 	(void)arch_irq_lock();
 
 	csr_write(mie, 0);
 }
-#endif
+#endif /* CONFIG_RISCV_SOC_INTERRUPT_INIT */
diff --git a/soc/neorv32/soc.h b/soc/neorv32/soc.h
index a97daa0fc153b..1e31ec1e6d063 100644
--- a/soc/neorv32/soc.h
+++ b/soc/neorv32/soc.h
@@ -1,56 +1,60 @@
 /*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
+ * Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef RISCV_NEORV32_SOC_H
-#define RISCV_NEORV32_SOC_H
+#ifndef _NEORV32_SOC_H
+#define _NEORV32_SOC_H
 
 /* System information (SYSINFO) register offsets */
 #define NEORV32_SYSINFO_CLK         0x00U
-#define NEORV32_SYSINFO_CPU         0x04U
-#define NEORV32_SYSINFO_FEATURES    0x08U
+#define NEORV32_SYSINFO_MISC        0x04U
+#define NEORV32_SYSINFO_SOC         0x08U
 #define NEORV32_SYSINFO_CACHE       0x0cU
-#define NEORV32_SYSINFO_ISPACE_BASE 0xf0U
-#define NEORV32_SYSINFO_IMEM_SIZE   0xf4U
-#define NEORV32_SYSINFO_DSPACE_BASE 0xf8U
-#define NEORV32_SYSINFO_DMEM_SIZE   0xfcU
 
-/* System information (SYSINFO) CPU register bits */
-#define NEORV32_SYSINFO_CPU_ZICSR     BIT(0)
-#define NEORV32_SYSINFO_CPU_ZIFENCEI  BIT(1)
-#define NEORV32_SYSINFO_CPU_ZMMUL     BIT(2)
-#define NEORV32_SYSINFO_CPU_ZBB       BIT(3)
-#define NEORV32_SYSINFO_CPU_ZFINX     BIT(5)
-#define NEORV32_SYSINFO_CPU_ZXSCNT    BIT(6)
-#define NEORV32_SYSINFO_CPU_ZXNOCNT   BIT(7)
-#define NEORV32_SYSINFO_CPU_PMP       BIT(8)
-#define NEORV32_SYSINFO_CPU_HPM       BIT(9)
-#define NEORV32_SYSINFO_CPU_DEBUGMODE BIT(10)
-#define NEORV32_SYSINFO_CPU_FASTMUL   BIT(30)
-#define NEORV32_SYSINFO_CPU_FASTSHIFT BIT(31)
+/* System information (SYSINFO) MISC register bits */
+#define NEORV32_SYSINFO_MISC_IMEM GENMASK(7, 0)
+#define NEORV32_SYSINFO_MISC_DMEM GENMASK(15, 8)
+#define NEORV32_SYSINFO_MISC_HART GENMASK(23, 16)
+#define NEORV32_SYSINFO_MISC_BOOT GENMASK(31, 24)
 
-/* System information (SYSINFO) FEATURES register bits */
-#define NEORV32_SYSINFO_FEATURES_BOOTLOADER     BIT(0)
-#define NEORV32_SYSINFO_FEATURES_MEM_EXT        BIT(1)
-#define NEORV32_SYSINFO_FEATURES_MEM_INT_IMEM   BIT(2)
-#define NEORV32_SYSINFO_FEATURES_MEM_INT_DMEM   BIT(3)
-#define NEORV32_SYSINFO_FEATURES_MEM_EXT_ENDIAN BIT(4)
-#define NEORV32_SYSINFO_FEATURES_ICACHE         BIT(5)
-#define NEORV32_SYSINFO_FEATURES_OCD            BIT(14)
-#define NEORV32_SYSINFO_FEATURES_HW_RESET       BIT(15)
-#define NEORV32_SYSINFO_FEATURES_IO_GPIO        BIT(16)
-#define NEORV32_SYSINFO_FEATURES_IO_MTIME       BIT(17)
-#define NEORV32_SYSINFO_FEATURES_IO_UART0       BIT(18)
-#define NEORV32_SYSINFO_FEATURES_IO_SPI         BIT(19)
-#define NEORV32_SYSINFO_FEATURES_IO_TWI         BIT(20)
-#define NEORV32_SYSINFO_FEATURES_IO_PWM         BIT(21)
-#define NEORV32_SYSINFO_FEATURES_IO_WDT         BIT(22)
-#define NEORV32_SYSINFO_FEATURES_IO_CFS         BIT(23)
-#define NEORV32_SYSINFO_FEATURES_IO_TRNG        BIT(24)
-#define NEORV32_SYSINFO_FEATURES_IO_SLINK       BIT(25)
-#define NEORV32_SYSINFO_FEATURES_IO_UART1       BIT(26)
-#define NEORV32_SYSINFO_FEATURES_IO_NEOLED      BIT(27)
+/* System information (SYSINFO) SOC register bits */
+#define NEORV32_SYSINFO_SOC_BOOTLOADER   BIT(0)
+#define NEORV32_SYSINFO_SOC_XBUS         BIT(1)
+#define NEORV32_SYSINFO_SOC_MEM_INT_IMEM BIT(2)
+#define NEORV32_SYSINFO_SOC_MEM_INT_DMEM BIT(3)
+#define NEORV32_SYSINFO_SOC_OCD          BIT(4)
+#define NEORV32_SYSINFO_SOC_ICACHE       BIT(5)
+#define NEORV32_SYSINFO_SOC_DCACHE       BIT(6)
+#define NEORV32_SYSINFO_SOC_XBUS_CACHE   BIT(8)
+#define NEORV32_SYSINFO_SOC_OCD_AUTH     BIT(11)
+#define NEORV32_SYSINFO_SOC_IMEM_ROM     BIT(12)
+#define NEORV32_SYSINFO_SOC_IO_TWD       BIT(13)
+#define NEORV32_SYSINFO_SOC_IO_DMA       BIT(14)
+#define NEORV32_SYSINFO_SOC_IO_GPIO      BIT(15)
+#define NEORV32_SYSINFO_SOC_IO_CLINT     BIT(16)
+#define NEORV32_SYSINFO_SOC_IO_UART0     BIT(17)
+#define NEORV32_SYSINFO_SOC_IO_SPI       BIT(18)
+#define NEORV32_SYSINFO_SOC_IO_TWI       BIT(19)
+#define NEORV32_SYSINFO_SOC_IO_PWM       BIT(20)
+#define NEORV32_SYSINFO_SOC_IO_WDT       BIT(21)
+#define NEORV32_SYSINFO_SOC_IO_CFS       BIT(22)
+#define NEORV32_SYSINFO_SOC_IO_TRNG      BIT(23)
+#define NEORV32_SYSINFO_SOC_IO_SDI       BIT(24)
+#define NEORV32_SYSINFO_SOC_IO_UART1     BIT(25)
+#define NEORV32_SYSINFO_SOC_IO_NEOLED    BIT(26)
+#define NEORV32_SYSINFO_SOC_IO_GPTMR     BIT(28)
+#define NEORV32_SYSINFO_SOC_IO_SLINK     BIT(29)
+#define NEORV32_SYSINFO_SOC_IO_ONEWIRE   BIT(30)
+#define NEORV32_SYSINFO_SOC_IO_CRC       BIT(31)
 
-#endif /* RISCV_NEORV32_SOC_H */
+/* System information (SYSINFO) CACHE register bits */
+#define NEORV32_SYSINFO_CACHE_INST_BLOCK_SIZE GENMASK(3, 0)
+#define NEORV32_SYSINFO_CACHE_INST_NUM_BLOCKS GENMASK(7, 4)
+#define NEORV32_SYSINFO_CACHE_DATA_BLOCK_SIZE GENMASK(11, 8)
+#define NEORV32_SYSINFO_CACHE_DATA_NUM_BLOCKS GENMASK(15, 12)
+#define NEORV32_SYSINFO_CACHE_XBUS_BLOCK_SIZE GENMASK(27, 24)
+#define NEORV32_SYSINFO_CACHE_XBUS_NUM_BLOCKS GENMASK(31, 28)
+
+#endif /* _NEORV32_SOC_H */
diff --git a/soc/neorv32/soc_irq.S b/soc/neorv32/soc_irq.S
index b82043d343459..4feae8400000b 100644
--- a/soc/neorv32/soc_irq.S
+++ b/soc/neorv32/soc_irq.S
@@ -13,16 +13,4 @@ GTEXT(__soc_handle_irq)
  * Exception number is given as parameter via register a0.
  */
 SECTION_FUNC(exception.other, __soc_handle_irq)
-	/*
-	 * The MIP CSR on the NEORV32 is read-only and can thus not be used for
-	 * clearing a pending IRQ. Instead we disable the IRQ in the MIE CSR and
-	 * re-enable it (if it was enabled when clearing).
-	 */
-	li t1, 1
-	sll t0, t1, a0
-	csrrc t2, mie, t0
-	and t1, t2, t0
-	csrrs t2, mie, t1
-
-	/* Return */
 	ret
diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt
index 04cd174d28eea..ac75d0838696d 100644
--- a/soc/nordic/common/CMakeLists.txt
+++ b/soc/nordic/common/CMakeLists.txt
@@ -9,6 +9,11 @@ zephyr_linker_symbol(SYMBOL soc_reset_hook EXPR "@SystemInit@")
 # This file is used when the CMake linker script generator is disabled.
 zephyr_linker_sources(SECTIONS platform_init.ld)
 
+# TF-M provides its own reboot sequence
+if(NOT CONFIG_TFM_PARTITION_PLATFORM)
+  zephyr_library_sources_ifdef(CONFIG_ARM reboot.c)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
 if(CONFIG_ARM)
   zephyr_library_sources_ifdef(CONFIG_NRF_PLATFORM_HALTIUM soc_lrcconf.c)
diff --git a/soc/nordic/common/Kconfig b/soc/nordic/common/Kconfig
index a5bae67d5a114..059274fd299f8 100644
--- a/soc/nordic/common/Kconfig
+++ b/soc/nordic/common/Kconfig
@@ -7,6 +7,16 @@ config HAS_NORDIC_DMM
 config HAS_NORDIC_RAM_CTRL
 	bool
 
+config NRF_FORCE_RAM_ON_REBOOT
+	bool "Force all RAM blocks to be powered on before rebooting"
+	depends on HAS_NORDIC_RAM_CTRL
+	help
+	  RAM power configuration is preserved through soft reset,
+	  meaning that there is a risk of accessing powered off RAM blocks
+	  when booting in different application (i.e. bootloader).
+	  Force all RAM blocks to be powered on before triggering soft reset
+	  to prevent this from happening.
+
 config NRF_SYS_EVENT
 	bool "nRF system event support"
 	select NRFX_POWER if !NRF_PLATFORM_HALTIUM
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index 8ba97b225b93d..f5d7a52c698c4 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -340,7 +340,7 @@ config HAS_HW_NRF_SPIS30
 	def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
 
 config HAS_HW_NRF_SPIS120
-	def_bool $(dt_nodelabel_enabled_with_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIS))
+	def_bool $(dt_nodelabel_enabled_with_compat,spis120,$(DT_COMPAT_NORDIC_NRF_SPIS))
 
 config HAS_HW_NRF_SPIS130
 	def_bool $(dt_nodelabel_enabled_with_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIS))
diff --git a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
index b76fac86bcd3d..a9e8b3de7a912 100644
--- a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
+++ b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
@@ -18,6 +18,9 @@
 #define CAN121_SIZE	DT_REG_SIZE_BY_NAME(DT_NODELABEL(can121), message_ram) + \
 			DT_REG_SIZE_BY_NAME(DT_NODELABEL(can121), m_can)
 
+#define SOFTPERIPH_BASE	DT_REG_ADDR(DT_NODELABEL(softperiph_ram))
+#define SOFTPERIPH_SIZE	DT_REG_SIZE(DT_NODELABEL(softperiph_ram))
+
 static struct arm_mpu_region mpu_regions[] = {
 	MPU_REGION_ENTRY("FLASH_0",
 			 CONFIG_FLASH_BASE_ADDRESS,
@@ -40,6 +43,10 @@ static struct arm_mpu_region mpu_regions[] = {
 	MPU_REGION_ENTRY("CAN121_MCAN", CAN121_BASE,
 			 REGION_RAM_NOCACHE_ATTR(CAN121_BASE, CAN121_SIZE)),
 #endif
+#if DT_NODE_EXISTS(DT_NODELABEL(softperiph_ram))
+	MPU_REGION_ENTRY("SOFTPERIPH_RAM", SOFTPERIPH_BASE,
+			 REGION_RAM_NOCACHE_ATTR(SOFTPERIPH_BASE, SOFTPERIPH_SIZE)),
+#endif
 };
 
 const struct arm_mpu_config mpu_config = {
diff --git a/soc/nordic/common/reboot.c b/soc/nordic/common/reboot.c
new file mode 100644
index 0000000000000..43ecc589ce9cf
--- /dev/null
+++ b/soc/nordic/common/reboot.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/reboot.h>
+#if defined(CONFIG_HAS_NORDIC_RAM_CTRL)
+#include <helpers/nrfx_ram_ctrl.h>
+#endif
+
+void sys_arch_reboot(int type)
+{
+	ARG_UNUSED(type);
+
+#ifdef CONFIG_NRF_FORCE_RAM_ON_REBOOT
+	uint8_t *ram_start;
+	size_t ram_size;
+
+#if defined(NRF_MEMORY_RAM_BASE)
+	ram_start = (uint8_t *)NRF_MEMORY_RAM_BASE;
+#else
+	ram_start = (uint8_t *)NRF_MEMORY_RAM0_BASE;
+#endif
+
+	ram_size = 0;
+#if defined(NRF_MEMORY_RAM_SIZE)
+	ram_size += NRF_MEMORY_RAM_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM0_SIZE)
+	ram_size += NRF_MEMORY_RAM0_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM1_SIZE)
+	ram_size += NRF_MEMORY_RAM1_SIZE;
+#endif
+#if defined(NRF_MEMORY_RAM2_SIZE)
+	ram_size += NRF_MEMORY_RAM2_SIZE;
+#endif
+
+	/* Power on all RAM blocks */
+	nrfx_ram_ctrl_power_enable_set(ram_start, ram_size, true);
+#endif
+
+	NVIC_SystemReset();
+}
diff --git a/soc/nordic/common/soc_nrf_common.h b/soc/nordic/common/soc_nrf_common.h
index 1e5e603967b56..dd6fb8866bfc8 100644
--- a/soc/nordic/common/soc_nrf_common.h
+++ b/soc/nordic/common/soc_nrf_common.h
@@ -236,6 +236,25 @@
 		     DT_PINCTRL_HAS_NAME(node_id, sleep),		       \
 		     DT_NODE_PATH(node_id) " defined without sleep state")
 
+/** @brief Get clock frequency that is used for the given node.
+ *
+ * Macro checks if node has clock property and if yes then if clock has clock_frequency property
+ * then it is returned. If it has supported_clock_frequency property with the list of supported
+ * frequencies then the last one is returned with assumption that they are ordered and the last
+ * one is the highest. If node does not have clock then 16 MHz is returned which is the default
+ * frequency.
+ *
+ * @param node Devicetree node.
+ *
+ * @return Frequency of the clock that is used for the node.
+ */
+#define NRF_PERIPH_GET_FREQUENCY(node) \
+	COND_CODE_1(DT_CLOCKS_HAS_IDX(node, 0),							\
+		(COND_CODE_1(DT_NODE_HAS_PROP(DT_CLOCKS_CTLR(node), clock_frequency),		\
+			     (DT_PROP(DT_CLOCKS_CTLR(node), clock_frequency)),			\
+			     (DT_PROP_LAST(DT_CLOCKS_CTLR(node), supported_clock_frequency)))),	\
+		(NRFX_MHZ_TO_HZ(16)))
+
 #endif /* !_ASMLANGUAGE */
 
 #endif
diff --git a/soc/nordic/common/vpr/CMakeLists.txt b/soc/nordic/common/vpr/CMakeLists.txt
index cf14c817a1b4d..5a4fe40dbcfe4 100644
--- a/soc/nordic/common/vpr/CMakeLists.txt
+++ b/soc/nordic/common/vpr/CMakeLists.txt
@@ -3,6 +3,7 @@
 
 zephyr_include_directories(.)
 
-zephyr_library_sources(soc_context.S soc_idle.c soc_init.c)
+zephyr_library_sources(soc_context.S soc_init.c)
+zephyr_library_sources_ifdef(CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE soc_idle.c)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/riscv/common/linker.ld CACHE INTERNAL "")
diff --git a/soc/nordic/common/vpr/Kconfig b/soc/nordic/common/vpr/Kconfig
index 6c207afcd3a25..bdcf9236faca8 100644
--- a/soc/nordic/common/vpr/Kconfig
+++ b/soc/nordic/common/vpr/Kconfig
@@ -16,8 +16,8 @@ config RISCV_CORE_NORDIC_VPR
 	select RISCV_HAS_CLIC
 	select RISCV_SOC_CONTEXT_SAVE
 	select HAS_FLASH_LOAD_OFFSET
-	select ARCH_HAS_CUSTOM_CPU_IDLE
-	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
+	select ARCH_HAS_CUSTOM_CPU_IDLE if !SOC_SERIES_NRF54LX
+	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE if !SOC_SERIES_NRF54LX
 	select INCLUDE_RESET_VECTOR
 	imply XIP
 	help
diff --git a/soc/nordic/common/vpr/Kconfig.sysbuild b/soc/nordic/common/vpr/Kconfig.sysbuild
index cfbd619f623f6..4dcc06face87f 100644
--- a/soc/nordic/common/vpr/Kconfig.sysbuild
+++ b/soc/nordic/common/vpr/Kconfig.sysbuild
@@ -4,7 +4,7 @@
 config VPR_LAUNCHER
 	bool "VPR launcher"
 	default y
-	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF9280_CPUPPR)
+	depends on (SOC_NRF54H20_CPUPPR || SOC_NRF54H20_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF9280_CPUPPR)
 	help
 	  Include VPR launcher in build.
 	  VPR launcher is a minimal sample built for an ARM core that starts given VPR core.
diff --git a/soc/nordic/nrf52/Kconfig b/soc/nordic/nrf52/Kconfig
index edc2b70d66768..9e68fe0df2ca5 100644
--- a/soc/nordic/nrf52/Kconfig
+++ b/soc/nordic/nrf52/Kconfig
@@ -120,4 +120,12 @@ config NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
 	help
 	  EGU instance used by the nRF52 Anomaly 109 workaround for PWM.
 
+config NRF52_ANOMALY_219_WORKAROUND
+	bool "Anomaly 219 workaround"
+	depends on NRFX_TWIM
+	help
+	  Due to Anomaly 219 the low period of SCL clock is too short to meet
+	  the I2C specification at 400 kHz. This workaround configures the I2C
+	  frequency to 390 kHz instead of 400 kHz.
+
 endif # SOC_SERIES_NRF52X
diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 856330992d222..33c938384cca1 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -41,6 +41,14 @@ if SOC_SERIES_NRF53X
 VREGMAIN_PATH := $(dt_nodelabel_path,vregmain)
 VREGRADIO_PATH := $(dt_nodelabel_path,vregradio)
 
+config SOC_NRF53_ANOMALY_47_WORKAROUND
+	bool "Anomaly 47 workaround"
+	depends on NRFX_TWIM
+	help
+	  Due to Anomaly 47 the low period of SCL clock is too short to meet
+	  the I2C specification at 400 kHz. This workaround configures the I2C
+	  frequency to 390 kHz instead of 400 kHz.
+
 config SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED
 	bool "Workaround for nRF5340 anomaly 160"
 	imply SOC_NRF53_ANOMALY_160_WORKAROUND
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 10428b77ec754..0373e00d07ba1 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -14,6 +14,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
+	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
 	select CPU_HAS_DCACHE
@@ -23,11 +24,13 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select HAS_NORDIC_DMM
 	select HAS_NORDIC_RAM_CTRL
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select NRFS_HAS_AUDIOPLL_SERVICE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_DVFS_SERVICE
 	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
+	select NRFS_HAS_SWEXT_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_PM
@@ -41,6 +44,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
+	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
 	select CPU_HAS_DCACHE
@@ -48,10 +52,12 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select NRFS_HAS_AUDIOPLL_SERVICE
 	select NRFS_HAS_CLOCK_SERVICE
 	select NRFS_HAS_GDFS_SERVICE
 	select NRFS_HAS_GDPWR_SERVICE
 	select NRFS_HAS_MRAM_SERVICE
+	select NRFS_HAS_SWEXT_SERVICE
 	select NRFS_HAS_TEMP_SERVICE
 	select NRFS_HAS_VBUS_DETECTOR_SERVICE
 	select HAS_NORDIC_DMM
@@ -70,3 +76,6 @@ config SOC_NRF54H20_CPUFLPR
 
 rsource "bicr/Kconfig"
 rsource "gpd/Kconfig"
+
+config SOC_NRF54H20_IRON
+	select EXPERIMENTAL if MCUBOOT
diff --git a/soc/nordic/nrf54h/Kconfig.defconfig b/soc/nordic/nrf54h/Kconfig.defconfig
index 65023fc18ca91..e1bd0aa68014f 100644
--- a/soc/nordic/nrf54h/Kconfig.defconfig
+++ b/soc/nordic/nrf54h/Kconfig.defconfig
@@ -42,4 +42,7 @@ config SPI_DW_ACCESS_WORD_ONLY
 config PM_DEVICE_POWER_DOMAIN
 	default n if PM_DEVICE
 
+config PM_DEVICE_RUNTIME
+	default y if PM_DEVICE
+
 endif # SOC_SERIES_NRF54HX
diff --git a/soc/nordic/nrf54h/Kconfig.soc b/soc/nordic/nrf54h/Kconfig.soc
index 459854e13b2dc..ac9101c177ca3 100644
--- a/soc/nordic/nrf54h/Kconfig.soc
+++ b/soc/nordic/nrf54h/Kconfig.soc
@@ -33,5 +33,10 @@ config SOC_NRF54H20_CPUFLPR
 	help
 	  nRF54H20 CPUFLPR
 
+config SOC_NRF54H20_IRON
+	bool
+	help
+	  Indicates that local domain firmware is compatible with Nordic IRONside SE.
+
 config SOC
 	default "nrf54h20" if SOC_NRF54H20
diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 20c28e42df555..56e5e08023387 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -9,6 +9,7 @@
 #include <zephyr/sys/util.h>
 #include <hal/nrf_resetinfo.h>
 #include "pm_s2ram.h"
+#include "power.h"
 
 #include <cmsis_core.h>
 
@@ -40,9 +41,26 @@ typedef struct {
 	uint32_t CTRL;
 } _mpu_context_t;
 
+typedef struct {
+	uint32_t ICSR;
+	uint32_t VTOR;
+	uint32_t AIRCR;
+	uint32_t SCR;
+	uint32_t CCR;
+	uint32_t SHPR[12U];
+	uint32_t SHCSR;
+	uint32_t CFSR;
+	uint32_t HFSR;
+	uint32_t DFSR;
+	uint32_t MMFAR;
+	uint32_t BFAR;
+	uint32_t AFSR;
+} _scb_context_t;
+
 struct backup {
 	_nvic_context_t nvic_context;
 	_mpu_context_t mpu_context;
+	_scb_context_t scb_context;
 };
 
 static __noinit struct backup backup_data;
@@ -107,10 +125,45 @@ static void nvic_resume(_nvic_context_t *backup)
 	memcpy((uint32_t *)NVIC->IPR, backup->IPR, sizeof(NVIC->IPR));
 }
 
+static void scb_suspend(_scb_context_t *backup)
+{
+	backup->ICSR = SCB->ICSR;
+	backup->VTOR = SCB->VTOR;
+	backup->AIRCR = SCB->AIRCR;
+	backup->SCR = SCB->SCR;
+	backup->CCR = SCB->CCR;
+	memcpy(backup->SHPR, (uint32_t *)SCB->SHPR, sizeof(SCB->SHPR));
+	backup->SHCSR = SCB->SHCSR;
+	backup->CFSR = SCB->CFSR;
+	backup->HFSR = SCB->HFSR;
+	backup->DFSR = SCB->DFSR;
+	backup->MMFAR = SCB->MMFAR;
+	backup->BFAR = SCB->BFAR;
+	backup->AFSR = SCB->AFSR;
+}
+
+static void scb_resume(_scb_context_t *backup)
+{
+	SCB->ICSR = backup->ICSR;
+	SCB->VTOR = backup->VTOR;
+	SCB->AIRCR = backup->AIRCR;
+	SCB->SCR = backup->SCR;
+	SCB->CCR = backup->CCR;
+	memcpy((uint32_t *)SCB->SHPR, backup->SHPR, sizeof(SCB->SHPR));
+	SCB->SHCSR = backup->SHCSR;
+	SCB->CFSR = backup->CFSR;
+	SCB->HFSR = backup->HFSR;
+	SCB->DFSR = backup->DFSR;
+	SCB->MMFAR = backup->MMFAR;
+	SCB->BFAR = backup->BFAR;
+	SCB->AFSR = backup->AFSR;
+}
+
 int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 {
 	int ret;
 
+	scb_suspend(&backup_data.scb_context);
 	nvic_suspend(&backup_data.nvic_context);
 	mpu_suspend(&backup_data.mpu_context);
 	ret = arch_pm_s2ram_suspend(system_off);
@@ -118,8 +171,11 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 		return ret;
 	}
 
+	nrf_power_up_cache();
+
 	mpu_resume(&backup_data.mpu_context);
 	nvic_resume(&backup_data.nvic_context);
+	scb_resume(&backup_data.scb_context);
 
 	return ret;
 }
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
index a3b39a4c5fe96..e1263be0d0e51 100644
--- a/soc/nordic/nrf54h/power.c
+++ b/soc/nordic/nrf54h/power.c
@@ -18,42 +18,50 @@
 
 extern sys_snode_t soc_node;
 
-static void common_suspend(void)
+static void nrf_power_down_cache(void)
 {
-	if (IS_ENABLED(CONFIG_DCACHE)) {
-		/* Flush, disable and power down DCACHE */
-		sys_cache_data_flush_all();
-		sys_cache_data_disable();
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_DCACHE, false);
-	}
+	static const uint32_t msk =
+		(IS_ENABLED(CONFIG_DCACHE) ? BIT(RAMBLOCK_CONTROL_BIT_DCACHE) : 0) |
+		(IS_ENABLED(CONFIG_ICACHE) ? BIT(RAMBLOCK_CONTROL_BIT_ICACHE) : 0);
 
-	if (IS_ENABLED(CONFIG_ICACHE)) {
-		/* Disable and power down ICACHE */
-		sys_cache_instr_disable();
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_ICACHE, false);
+	if (msk == 0) {
+		return;
 	}
 
-	soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
+	/* Functions are non-empty only if cache is enabled.
+	 * Data cache disabling include flushing.
+	 */
+	sys_cache_data_disable();
+	sys_cache_instr_disable();
+	nrf_memconf_ramblock_control_mask_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID, msk, false);
 }
 
-static void common_resume(void)
+void nrf_power_up_cache(void)
 {
-	if (IS_ENABLED(CONFIG_ICACHE)) {
-		/* Power up and re-enable ICACHE */
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_ICACHE, true);
-		sys_cache_instr_enable();
-	}
+	static const uint32_t msk =
+		(IS_ENABLED(CONFIG_DCACHE) ? BIT(RAMBLOCK_CONTROL_BIT_DCACHE) : 0) |
+		(IS_ENABLED(CONFIG_ICACHE) ? BIT(RAMBLOCK_CONTROL_BIT_ICACHE) : 0);
 
-	if (IS_ENABLED(CONFIG_DCACHE)) {
-		/* Power up and re-enable DCACHE */
-		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
-							RAMBLOCK_CONTROL_BIT_DCACHE, true);
-		sys_cache_data_enable();
+	if (msk == 0) {
+		return;
 	}
 
+	nrf_memconf_ramblock_control_mask_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID, msk, true);
+	sys_cache_instr_enable();
+	sys_cache_data_enable();
+}
+
+static void common_suspend(void)
+{
+	soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
+	nrf_power_down_cache();
+}
+
+static void common_resume(void)
+{
+	/* Common part does not include cache enabling. In case of s2ram it is done
+	 * as early as possible to speed up the process.
+	 */
 	soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
 }
 
@@ -112,6 +120,7 @@ static void s2idle_exit(uint8_t substate_id)
 	case 1: /* Substate for idle with cache retained - not implemented yet. */
 		break;
 	case 2: /* Substate for idle with cache disabled. */
+		nrf_power_up_cache();
 		common_resume();
 #if !defined(CONFIG_SOC_NRF54H20_CPURAD)
 		soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_MAIN);
@@ -175,17 +184,21 @@ void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
 	if (state == PM_STATE_SUSPEND_TO_IDLE) {
 		__disable_irq();
+		sys_trace_idle();
 		s2idle_enter(substate_id);
 		/* Resume here. */
 		s2idle_exit(substate_id);
+		sys_trace_idle_exit();
 		__enable_irq();
 	}
 #if defined(CONFIG_PM_S2RAM)
 	else if (state == PM_STATE_SUSPEND_TO_RAM) {
 		__disable_irq();
+		sys_trace_idle();
 		s2ram_enter();
 		/* On resuming or error we return exactly *HERE* */
 		s2ram_exit();
+		sys_trace_idle_exit();
 		__enable_irq();
 	}
 #endif
diff --git a/soc/nordic/nrf54h/power.h b/soc/nordic/nrf54h/power.h
index 021c20ec4dcf7..87489574e7278 100644
--- a/soc/nordic/nrf54h/power.h
+++ b/soc/nordic/nrf54h/power.h
@@ -17,4 +17,9 @@
  */
 void nrf_poweroff(void);
 
+/**
+ * @brief Power up and enable instruction and data cache.
+ */
+void nrf_power_up_cache(void);
+
 #endif /* _ZEPHYR_SOC_ARM_NORDIC_NRF_POWER_H_ */
diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c
index 43c84e1b9a738..6dc8100e00c56 100644
--- a/soc/nordic/nrf54h/soc.c
+++ b/soc/nordic/nrf54h/soc.c
@@ -18,6 +18,7 @@
 #include <hal/nrf_lrcconf.h>
 #include <hal/nrf_spu.h>
 #include <hal/nrf_memconf.h>
+#include <hal/nrf_nfct.h>
 #include <soc/nrfx_coredep.h>
 #include <soc_lrcconf.h>
 #include <dmm.h>
@@ -151,6 +152,11 @@ static int nordicsemi_nrf54h_init(void)
 	nrf_spu_periph_perm_dmasec_set(spu, nrf_address_slave_get(ccm030_addr), true);
 #endif
 
+	if (DT_NODE_HAS_STATUS(DT_NODELABEL(nfct), disabled) &&
+	    DT_PROP_OR(DT_NODELABEL(nfct), nfct_pins_as_gpios, 0)) {
+		nrf_nfct_pad_config_enable_set(NRF_NFCT, false);
+	}
+
 	return 0;
 }
 
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 35c698c7b0866..019487126b532 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -14,6 +14,7 @@ config SOC_NRF54L_CPUAPP_COMMON
 	select ARM
 	select ARMV8_M_DSP
 	select CPU_CORTEX_M33
+	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ICACHE
 	select CPU_HAS_ARM_SAU
@@ -37,6 +38,9 @@ config SOC_NRF54L15_CPUAPP
 config SOC_NRF54L05_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
+config SOC_NRF54L09_ENGA_CPUFLPR
+	select RISCV_CORE_NORDIC_VPR
+
 config SOC_NRF54L10_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
@@ -46,6 +50,9 @@ config SOC_NRF54L15_CPUFLPR
 config SOC_NRF54L20_ENGA_CPUAPP
 	select SOC_NRF54L_CPUAPP_COMMON
 
+config SOC_NRF54L20_ENGA_CPUFLPR
+	select RISCV_CORE_NORDIC_VPR
+
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig b/soc/nordic/nrf54l/Kconfig.defconfig
index b6ba2a07a871e..03a93d4cda8df 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig
+++ b/soc/nordic/nrf54l/Kconfig.defconfig
@@ -12,9 +12,26 @@ if ARM
 config CORTEX_M_SYSTICK
 	default !NRF_GRTC_TIMER
 
+# Start SYSCOUNTER on driver init
+config NRF_GRTC_START_SYSCOUNTER
+	default NRF_GRTC_TIMER
+
 config CACHE_NRF_CACHE
 	default y if EXTERNAL_CACHE
 
+config CACHE_MANAGEMENT
+	default y
+
+choice CACHE_TYPE
+	default EXTERNAL_CACHE
+endchoice
+
+# MPU-based null-pointer dereferencing detection cannot
+# be applied as the (0x0 - 0x400) is unmapped for this target.
+choice NULL_POINTER_EXCEPTION_DETECTION
+	default NULL_POINTER_EXCEPTION_DETECTION_NONE
+endchoice
+
 endif # ARM
 
 if RISCV
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp
index 95d2d43fca125..e81c383730052 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuapp
@@ -6,7 +6,7 @@
 if SOC_NRF54L09_ENGA_CPUAPP
 
 config NUM_IRQS
-	default 274
+	default 271
 
 config IEEE802154_NRF5
 	default IEEE802154
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
new file mode 100644
index 0000000000000..c471e105db2a6
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l09_enga_cpuflpr
@@ -0,0 +1,11 @@
+# Nordic Semiconductor nRF54L09 MCU
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L09_ENGA_CPUFLPR
+
+config NUM_IRQS
+	default 287
+
+endif # SOC_NRF54L09_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp
index 6aabb1a873884..153f2fd767b0c 100644
--- a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuapp
@@ -6,6 +6,6 @@
 if SOC_NRF54L20_ENGA_CPUAPP
 
 config NUM_IRQS
-	default 274
+	default 290
 
 endif # SOC_NRF54L20_ENGA_CPUAPP
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr
new file mode 100644
index 0000000000000..dd8fed9db581f
--- /dev/null
+++ b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54l20_enga_cpuflpr
@@ -0,0 +1,11 @@
+# Nordic Semiconductor nRF54L20 MCU
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_NRF54L20_ENGA_CPUFLPR
+
+config NUM_IRQS
+	default 306
+
+endif # SOC_NRF54L20_ENGA_CPUFLPR
diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc
index e1feb7cdef1e1..5fd8260b9bbbd 100644
--- a/soc/nordic/nrf54l/Kconfig.soc
+++ b/soc/nordic/nrf54l/Kconfig.soc
@@ -39,6 +39,12 @@ config SOC_NRF54L09_ENGA_CPUAPP
 	help
 	  NRF54L09 ENGA CPUAPP
 
+config SOC_NRF54L09_ENGA_CPUFLPR
+	bool
+	select SOC_NRF54L09_ENGA
+	help
+	  NRF54L09 ENGA CPUFLPR
+
 config SOC_NRF54L10
 	bool
 	select SOC_SERIES_NRF54LX
@@ -93,6 +99,12 @@ config SOC_NRF54L20_ENGA_CPUAPP
 	help
 	  NRF54L20 ENGA CPUAPP
 
+config SOC_NRF54L20_ENGA_CPUFLPR
+	bool
+	select SOC_NRF54L20_ENGA
+	help
+	  NRF54L20 ENGA CPUFLPR
+
 config SOC
 	default "nrf54l05" if SOC_NRF54L05
 	default "nrf54l09" if SOC_NRF54L09
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 5c24df49d54d2..737a0fbaa9780 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -12,46 +12,42 @@
  * for the Nordic Semiconductor nRF54L family processor.
  */
 
+/* Include autoconf for cases when this file is used in special build (e.g. TFM) */
+#include <zephyr/autoconf.h>
+
 #include <zephyr/devicetree.h>
-#include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/cache.h>
-#include <zephyr/dt-bindings/regulator/nrf5x.h>
+#include <soc/nrfx_coredep.h>
+#include <system_nrf54l.h>
+#include <soc.h>
+LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
+
+#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \
+	!defined(__ZEPHYR__)
 
-#if defined(NRF_APPLICATION)
-#include <cmsis_core.h>
+#include <nrf_erratas.h>
 #include <hal/nrf_glitchdet.h>
 #include <hal/nrf_oscillators.h>
 #include <hal/nrf_power.h>
 #include <hal/nrf_regulators.h>
-#endif
-#include <soc/nrfx_coredep.h>
-
-#include <nrf_erratas.h>
-#include <system_nrf54l.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-
-LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
+#include <zephyr/dt-bindings/regulator/nrf5x.h>
 
-#if defined(NRF_APPLICATION)
 #define LFXO_NODE DT_NODELABEL(lfxo)
 #define HFXO_NODE DT_NODELABEL(hfxo)
-#endif
 
-static int nordicsemi_nrf54l_init(void)
+static inline void power_and_clock_configuration(void)
 {
-	/* Update the SystemCoreClock global variable with current core clock
-	 * retrieved from the DT.
-	 */
-	SystemCoreClock = NRF_PERIPH_GET_FREQUENCY(DT_NODELABEL(cpu));
-
-#if defined(NRF_APPLICATION)
-	/* Enable ICACHE */
-	sys_cache_instr_enable();
-
+/* NRF_REGULATORS and NRF_OSCILLATORS are configured to be secure
+ * as NRF_REGULATORS.POFCON is needed by the secure image to
+ * prevent glitches when the power supply is attacked.
+ *
+ * NRF_OSCILLATORS is also configured as secure because of a HW limitation
+ * that requires them to be configured with the same security property.
+ */
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
 
@@ -65,7 +61,7 @@ static int nordicsemi_nrf54l_init(void)
 	int32_t slope_k = (int32_t)(slope_field_k ^ slope_sign_k) - (int32_t)slope_sign_k;
 
 	/* As specified in the nRF54L15 PS:
-	 * CAPVALUE = round( (CAPACITANCE - 4) * (FICR->XOSC32KTRIM.SLOPE + 0.765625 * 2^9)/(2^9)
+	 * CAPVALUE = round( (2*CAPACITANCE - 12) * (FICR->XOSC32KTRIM.SLOPE + 0.765625 * 2^9)/(2^9)
 	 *            + FICR->XOSC32KTRIM.OFFSET/(2^6) );
 	 * where CAPACITANCE is the desired capacitor value in pF, holding any
 	 * value between 4 pF and 18 pF in 0.5 pF steps.
@@ -86,7 +82,7 @@ static int nordicsemi_nrf54l_init(void)
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
 	 * multiply it be 2^3.
 	 */
-	uint32_t mid_val = (cap_val_encoded - 4UL) * (uint32_t)(slope_k + 392UL)
+	uint32_t mid_val = (2UL * cap_val_encoded - 12UL) * (uint32_t)(slope_k + 392UL)
 			   + (offset_k << 3UL);
 
 	/* Get integer part of the INTCAP code */
@@ -165,7 +161,22 @@ static int nordicsemi_nrf54l_init(void)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_MAIN, true);
 #endif
 
-#endif /* NRF_APPLICATION */
+}
+#endif /* NRF_APPLICATION && !CONFIG_TRUSTED_EXECUTION_NONSECURE */
+
+int nordicsemi_nrf54l_init(void)
+{
+	/* Update the SystemCoreClock global variable with current core clock
+	 * retrieved from the DT.
+	 */
+	SystemCoreClock = NRF_PERIPH_GET_FREQUENCY(DT_NODELABEL(cpu));
+
+	sys_cache_instr_enable();
+
+#if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \
+	!defined(__ZEPHYR__)
+	power_and_clock_configuration();
+#endif
 
 	return 0;
 }
diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml
index b4c8ef5a034d4..923403f053034 100644
--- a/soc/nordic/soc.yml
+++ b/soc/nordic/soc.yml
@@ -28,6 +28,7 @@ family:
           - name: nrf54l09
             cpuclusters:
               - name: cpuapp
+              - name: cpuflpr
           - name: nrf54l10
             cpuclusters:
               - name: cpuapp
@@ -39,6 +40,7 @@ family:
           - name: nrf54l20
             cpuclusters:
               - name: cpuapp
+              - name: cpuflpr
       - name: nrf54h
         socs:
           - name: nrf54h20
@@ -110,14 +112,18 @@ runners:
               - nrf54l05/cpuflpr
           - qualifiers:
               - nrf54l09/cpuapp
+              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
+              - nrf54l10/cpuapp/ns
               - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
+              - nrf54l15/cpuapp/ns
               - nrf54l15/cpuflpr
           - qualifiers:
               - nrf54l20/cpuapp
+              - nrf54l20/cpuflpr
           - qualifiers:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
@@ -172,14 +178,18 @@ runners:
               - nrf54l05/cpuflpr
           - qualifiers:
               - nrf54l09/cpuapp
+              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
+              - nrf54l10/cpuapp/ns
               - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
+              - nrf54l15/cpuapp/ns
               - nrf54l15/cpuflpr
           - qualifiers:
               - nrf54l20/cpuapp
+              - nrf54l20/cpuflpr
           - qualifiers:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
@@ -232,12 +242,20 @@ runners:
           - qualifiers:
               - nrf54l05/cpuapp
               - nrf54l05/cpuflpr
+          - qualifiers:
+              - nrf54l09/cpuapp
+              - nrf54l09/cpuflpr
           - qualifiers:
               - nrf54l10/cpuapp
+              - nrf54l10/cpuapp/ns
               - nrf54l10/cpuflpr
           - qualifiers:
               - nrf54l15/cpuapp
+              - nrf54l15/cpuapp/ns
               - nrf54l15/cpuflpr
+          - qualifiers:
+              - nrf54l20/cpuapp
+              - nrf54l20/cpuflpr
           - qualifiers:
               - nrf54h20/cpuapp
               - nrf54h20/cpurad
diff --git a/soc/nordic/validate_base_addresses.c b/soc/nordic/validate_base_addresses.c
index ef1dd19457894..9de947a5c7f68 100644
--- a/soc/nordic/validate_base_addresses.c
+++ b/soc/nordic/validate_base_addresses.c
@@ -277,6 +277,7 @@ CHECK_DT_REG(spi134, NRF_SPIM134);
 CHECK_DT_REG(spi135, NRF_SPIM135);
 CHECK_DT_REG(spi136, NRF_SPIM136);
 CHECK_DT_REG(spi137, NRF_SPIM137);
+CHECK_DT_REG(spis120, NRF_SPIS120);
 CHECK_DT_REG(spu, NRF_SPU);
 CHECK_DT_REG(swi0, NRF_SWI0);
 CHECK_DT_REG(swi1, NRF_SWI1);
@@ -339,7 +340,7 @@ CHECK_DT_REG(usbreg, NRF_USBREGULATOR);
 CHECK_DT_REG(vmc, NRF_VMC);
 CHECK_DT_REG(cpuflpr_clic, NRF_FLPR_VPRCLIC);
 CHECK_DT_REG(cpuppr_clic, NRF_PPR_VPRCLIC);
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_SERIES_NRF54LX)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR00);
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 CHECK_DT_REG(cpuflpr_vpr, NRF_VPR121);
diff --git a/soc/nuvoton/npcx/Kconfig.soc b/soc/nuvoton/npcx/Kconfig.soc
index 1c8002f855320..be4408758784a 100644
--- a/soc/nuvoton/npcx/Kconfig.soc
+++ b/soc/nuvoton/npcx/Kconfig.soc
@@ -9,4 +9,17 @@ config SOC_FAMILY_NPCX
 config SOC_FAMILY
 	default "nuvoton_npcx" if SOC_FAMILY_NPCX
 
+config NPCX_SOC_VARIANT_NPCXN
+	bool
+	select SOC_FAMILY_NPCX
+
+config NPCX_SOC_VARIANT_NPCKN
+	bool
+	select SOC_FAMILY_NPCX
+
+config NPCX_SOC_VARIANT
+	string
+	default "npcxn" if NPCX_SOC_VARIANT_NPCXN
+	default "npckn" if NPCX_SOC_VARIANT_NPCKN
+
 rsource "*/Kconfig.soc"
diff --git a/soc/nuvoton/npcx/common/CMakeLists.txt b/soc/nuvoton/npcx/common/CMakeLists.txt
index 86780d1ad68bc..8b883247136d8 100644
--- a/soc/nuvoton/npcx/common/CMakeLists.txt
+++ b/soc/nuvoton/npcx/common/CMakeLists.txt
@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_include_directories(.)
+
 zephyr_sources_ifdef(CONFIG_PM power.c)
 zephyr_sources(
   scfg.c
-  registers.c
+  ${CONFIG_NPCX_SOC_VARIANT}/registers.c
 )
+zephyr_include_directories(${CONFIG_NPCX_SOC_VARIANT}/include)
 
 # Check for disabling header CRC.
 if (NOT DEFINED CONFIG_NPCX_HEADER_ENABLE_HEADER_CRC)
diff --git a/soc/nuvoton/npcx/common/npcxn/include/clock_def.h b/soc/nuvoton/npcx/common/npcxn/include/clock_def.h
new file mode 100644
index 0000000000000..249c613ce7057
--- /dev/null
+++ b/soc/nuvoton/npcx/common/npcxn/include/clock_def.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2020 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _NUVOTON_NPCX_CLOCK_DEF_H_
+#define _NUVOTON_NPCX_CLOCK_DEF_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/devicetree.h>
+#include <soc_clock.h>
+
+/* FMUL clock */
+#if (OFMCLK > (MAX_OFMCLK / 2))
+#define FMCLK (OFMCLK / 2) /* FMUL clock = OFMCLK/2 */
+#else
+#define FMCLK OFMCLK /* FMUL clock = OFMCLK */
+#endif
+
+/* APBs source clock */
+#define APBSRC_CLK OFMCLK
+
+/* AHB6 clock */
+#if (CORE_CLK > (MAX_OFMCLK / 2))
+#define AHB6DIV_VAL 1 /* AHB6_CLK = CORE_CLK/2 */
+#else
+#define AHB6DIV_VAL 0 /* AHB6_CLK = CORE_CLK */
+#endif
+
+/* FIU clock divider */
+#if (CORE_CLK > (MAX_OFMCLK / 2))
+#define FIUDIV_VAL 1 /* FIU_CLK = CORE_CLK/2 */
+#else
+#define FIUDIV_VAL 0 /* FIU_CLK = CORE_CLK */
+#endif
+
+#if defined(CONFIG_CLOCK_CONTROL_NPCX_SUPP_FIU1)
+#if (CORE_CLK > (MAX_OFMCLK / 2))
+#define FIU1DIV_VAL 1 /* FIU1_CLK = CORE_CLK/2 */
+#else
+#define FIU1DIV_VAL 0 /* FIU1_CLK = CORE_CLK */
+#endif
+#endif /* CONFIG_CLOCK_CONTROL_NPCX_SUPP_FIU1 */
+
+/* I3C clock divider */
+#if (OFMCLK == MHZ(120)) /* MCLkD must between 40 mhz to 50 mhz*/
+#define MCLKD_SL 2       /* I3C_CLK = (MCLK / 3) */
+#elif (OFMCLK <= MHZ(100) && OFMCLK >= MHZ(80))
+#define MCLKD_SL 1 /* I3C_CLK = (MCLK / 2) */
+#else
+#define MCLKD_SL 0 /* I3C_CLK = MCLK */
+#endif
+
+/* Get APB clock freq */
+#define NPCX_APB_CLOCK(no) (APBSRC_CLK / (APB##no##DIV_VAL + 1))
+
+/*
+ * Frequency multiplier M/N value definitions according to the requested
+ * OFMCLK (Unit:Hz).
+ */
+#if (OFMCLK > (MAX_OFMCLK / 2))
+#define HFCGN_VAL 0x82 /* Set XF_RANGE as 1 */
+#else
+#define HFCGN_VAL 0x02
+#endif
+#if (OFMCLK == 120000000)
+#define HFCGMH_VAL 0x0E
+#define HFCGML_VAL 0x4E
+#elif (OFMCLK == 100000000)
+#define HFCGMH_VAL 0x0B
+#define HFCGML_VAL 0xEC
+#elif (OFMCLK == 96000000)
+#define HFCGMH_VAL 0x0B
+#define HFCGML_VAL 0x72
+#elif (OFMCLK == 90000000)
+#define HFCGMH_VAL 0x0A
+#define HFCGML_VAL 0xBA
+#elif (OFMCLK == 80000000)
+#define HFCGMH_VAL 0x09
+#define HFCGML_VAL 0x89
+#elif (OFMCLK == 66000000)
+#define HFCGMH_VAL 0x07
+#define HFCGML_VAL 0xDE
+#elif (OFMCLK == 50000000)
+#define HFCGMH_VAL 0x0B
+#define HFCGML_VAL 0xEC
+#elif (OFMCLK == 48000000)
+#define HFCGMH_VAL 0x0B
+#define HFCGML_VAL 0x72
+#else
+#error "Unsupported OFMCLK Frequency"
+#endif
+
+/* Clock prescaler configurations in different series */
+#define VAL_HFCGP ((FPRED_VAL << 4) | AHB6DIV_VAL)
+#if defined(FIU1DIV_VAL)
+#define VAL_HFCBCD ((FIU1DIV_VAL << 4) | (FIUDIV_VAL << 2))
+#else
+#define VAL_HFCBCD (FIUDIV_VAL << 4)
+#endif /* FIU1DIV_VAL */
+#define VAL_HFCBCD1 (APB1DIV_VAL | (APB2DIV_VAL << 4))
+#if defined(APB4DIV_VAL)
+#define VAL_HFCBCD2 (APB3DIV_VAL | (APB4DIV_VAL << 4))
+#else
+#define VAL_HFCBCD2 APB3DIV_VAL
+#endif /* APB4DIV_VAL */
+/* I3C1~I3C3 share the same configuration */
+#define VAL_HFCBCD3 MCLKD_SL
+
+#endif /* _NUVOTON_NPCX_CLOCK_DEF_H_ */
diff --git a/soc/nuvoton/npcx/common/npcxn/include/reg_def.h b/soc/nuvoton/npcx/common/npcxn/include/reg_def.h
new file mode 100644
index 0000000000000..4ce9c0a998609
--- /dev/null
+++ b/soc/nuvoton/npcx/common/npcxn/include/reg_def.h
@@ -0,0 +1,2191 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _NUVOTON_NPCX_REG_DEF_H
+#define _NUVOTON_NPCX_REG_DEF_H
+
+#include <reg_access.h>
+
+/*
+ * Core Domain Clock Generator (CDCG) device registers
+ */
+struct cdcg_reg {
+	/* High Frequency Clock Generator (HFCG) registers */
+	/* 0x000: HFCG Control */
+	volatile uint8_t HFCGCTRL;
+	volatile uint8_t reserved1;
+	/* 0x002: HFCG M Low Byte Value */
+	volatile uint8_t HFCGML;
+	volatile uint8_t reserved2;
+	/* 0x004: HFCG M High Byte Value */
+	volatile uint8_t HFCGMH;
+	volatile uint8_t reserved3;
+	/* 0x006: HFCG N Value */
+	volatile uint8_t HFCGN;
+	volatile uint8_t reserved4;
+	/* 0x008: HFCG Prescaler */
+	volatile uint8_t HFCGP;
+	volatile uint8_t reserved5[7];
+	/* 0x010: HFCG Bus Clock Dividers */
+	volatile uint8_t HFCBCD;
+	volatile uint8_t reserved6;
+	/* 0x012: HFCG Bus Clock Dividers */
+	volatile uint8_t HFCBCD1;
+	volatile uint8_t reserved7;
+	/* 0x014: HFCG Bus Clock Dividers */
+	volatile uint8_t HFCBCD2;
+	volatile uint8_t reserved12[8];
+	/* 0x01d: HFCG Bus Clock Dividers */
+	volatile uint8_t HFCBCD3;
+	volatile uint8_t reserved8[226];
+
+	/* Low Frequency Clock Generator (LFCG) registers */
+	/* 0x100: LFCG Control */
+	volatile uint8_t LFCGCTL;
+	volatile uint8_t reserved9;
+	/* 0x102: High-Frequency Reference Divisor I */
+	volatile uint16_t HFRDI;
+	/* 0x104: High-Frequency Reference Divisor F */
+	volatile uint16_t HFRDF;
+	/* 0x106: FRCLK Clock Divisor */
+	volatile uint16_t FRCDIV;
+	/* 0x108: Divisor Correction Value 1 */
+	volatile uint16_t DIVCOR1;
+	/* 0x10A: Divisor Correction Value 2 */
+	volatile uint16_t DIVCOR2;
+	volatile uint8_t reserved10[8];
+	/* 0x114: LFCG Control 2 */
+	volatile uint8_t LFCGCTL2;
+	volatile uint8_t reserved11;
+};
+
+/* CDCG register fields */
+#define NPCX_HFCGCTRL_LOAD     0
+#define NPCX_HFCGCTRL_LOCK     2
+#define NPCX_HFCGCTRL_CLK_CHNG 7
+
+#define NPCX_LFCGCTL2_XT_OSC_SL_EN 6
+
+/*
+ * Power Management Controller (PMC) device registers
+ */
+struct pmc_reg {
+	/* 0x000: Power Management Controller */
+	volatile uint8_t PMCSR;
+	volatile uint8_t reserved1[2];
+	/* 0x003: Enable in Sleep Control */
+	volatile uint8_t ENIDL_CTL;
+	/* 0x004: Disable in Idle Control */
+	volatile uint8_t DISIDL_CTL;
+	/* 0x005: Disable in Idle Control 1 */
+	volatile uint8_t DISIDL_CTL1;
+	volatile uint8_t reserved2[2];
+	/* 0x008 - 0D: Power-Down Control 1 - 6 */
+	volatile uint8_t PWDWN_CTL1[6];
+	volatile uint8_t reserved3[18];
+	/* 0x020 - 21: Power-Down Control 1 - 2 */
+	volatile uint8_t RAM_PD[2];
+	volatile uint8_t reserved4[2];
+	/* 0x024: Power-Down Control 7 */
+	volatile uint8_t PWDWN_CTL7[1];
+};
+
+/* PMC internal inline functions for multi-registers */
+static inline uint32_t npcx_pwdwn_ctl_offset(uint32_t ctl_no)
+{
+	if (ctl_no < 6) {
+		return 0x008 + ctl_no;
+	} else {
+		return 0x024 + ctl_no - 6;
+	}
+}
+
+/* Macro functions for PMC multi-registers */
+#define NPCX_PWDWN_CTL(base, n) (*(volatile uint8_t *)(base + npcx_pwdwn_ctl_offset(n)))
+
+/* PMC register fields */
+#define NPCX_PMCSR_DI_INSTW        0
+#define NPCX_PMCSR_DHF             1
+#define NPCX_PMCSR_IDLE            2
+#define NPCX_PMCSR_NWBI            3
+#define NPCX_PMCSR_OHFC            6
+#define NPCX_PMCSR_OLFC            7
+#define NPCX_DISIDL_CTL_RAM_DID    5
+#define NPCX_ENIDL_CTL_ADC_LFSL    7
+#define NPCX_ENIDL_CTL_LP_WK_CTL   6
+#define NPCX_ENIDL_CTL_PECI_ENI    2
+#define NPCX_ENIDL_CTL_ADC_ACC_DIS 1
+
+/* Macro functions for Development and Debugger Interface (DDI) registers */
+#define NPCX_DBGCTRL(base)   (*(volatile uint8_t *)(base + 0x004))
+#define NPCX_DBGFRZEN1(base) (*(volatile uint8_t *)(base + 0x006))
+#define NPCX_DBGFRZEN2(base) (*(volatile uint8_t *)(base + 0x007))
+#define NPCX_DBGFRZEN3(base) (*(volatile uint8_t *)(base + 0x008))
+#define NPCX_DBGFRZEN4(base) (*(volatile uint8_t *)(base + 0x009))
+
+/* DDI register fields */
+#define NPCX_DBGCTRL_CCDEV_SEL      FIELD(6, 2)
+#define NPCX_DBGCTRL_CCDEV_DIR      5
+#define NPCX_DBGCTRL_SEQ_WK_EN      4
+#define NPCX_DBGCTRL_FRCLK_SEL_DIS  3
+#define NPCX_DBGFRZEN1_SPIFEN       7
+#define NPCX_DBGFRZEN1_HIFEN        6
+#define NPCX_DBGFRZEN1_ESPISEN      5
+#define NPCX_DBGFRZEN1_UART1FEN     4
+#define NPCX_DBGFRZEN1_SMB3FEN      3
+#define NPCX_DBGFRZEN1_SMB2FEN      2
+#define NPCX_DBGFRZEN1_MFT2FEN      1
+#define NPCX_DBGFRZEN1_MFT1FEN      0
+#define NPCX_DBGFRZEN2_ITIM6FEN     7
+#define NPCX_DBGFRZEN2_ITIM5FEN     6
+#define NPCX_DBGFRZEN2_ITIM4FEN     5
+#define NPCX_DBGFRZEN2_ITIM64FEN    3
+#define NPCX_DBGFRZEN2_SMB1FEN      2
+#define NPCX_DBGFRZEN2_SMB0FEN      1
+#define NPCX_DBGFRZEN2_MFT3FEN      0
+#define NPCX_DBGFRZEN3_GLBL_FRZ_DIS 7
+#define NPCX_DBGFRZEN3_ITIM3FEN     6
+#define NPCX_DBGFRZEN3_ITIM2FEN     5
+#define NPCX_DBGFRZEN3_ITIM1FEN     4
+#define NPCX_DBGFRZEN3_I3CFEN       2
+#define NPCX_DBGFRZEN3_SMB4FEN      1
+#define NPCX_DBGFRZEN3_SHMFEN       0
+#define NPCX_DBGFRZEN4_UART2FEN     6
+#define NPCX_DBGFRZEN4_UART3FEN     5
+#define NPCX_DBGFRZEN4_UART4FEN     4
+#define NPCX_DBGFRZEN4_LCTFEN       3
+#define NPCX_DBGFRZEN4_SMB7FEN      2
+#define NPCX_DBGFRZEN4_SMB6FEN      1
+#define NPCX_DBGFRZEN4_SMB5FEN      0
+
+/*
+ * System Configuration (SCFG) device registers
+ */
+struct scfg_reg {
+	/* 0x000: Device Control */
+	volatile uint8_t DEVCNT;
+	/* 0x001: Straps Status */
+	volatile uint8_t STRPST;
+	/* 0x002: Reset Control and Status */
+	volatile uint8_t RSTCTL;
+	volatile uint8_t reserved1;
+	/* 0x004: Device Control 3*/
+	volatile uint8_t DEV_CTL3;
+	volatile uint8_t reserved2;
+	/* 0x006: Device Control 4 */
+	volatile uint8_t DEV_CTL4;
+	volatile uint8_t reserved3[9];
+	/* 0x010 - 1F: Device Alternate Function 0 - F */
+	volatile uint8_t DEVALT0[16];
+	volatile uint8_t reserved4[6];
+	/* 0x026: Low-Voltage GPIO Pins Control 5 */
+	volatile uint8_t LV_GPIO_CTL5[1];
+	volatile uint8_t reserved5;
+	/* 0x028: Pull-Up/Pull-Down Enable 0 */
+	volatile uint8_t PUPD_EN0;
+	/* 0x029: Pull-Up/Pull-Down Enable 1 */
+	volatile uint8_t PUPD_EN1;
+	/* 0x02A - 2E: Low-Voltage GPIO Pins Control 0 - 4 */
+	volatile uint8_t LV_GPIO_CTL0[5];
+};
+
+/* Macro functions for SCFG multi-registers */
+#define NPCX_DEV_CTL(base, n)     (*(volatile uint8_t *)(base + n))
+#define NPCX_DEVALT(base, n)      (*(volatile uint8_t *)(base + NPCX_DEVALT_OFFSET(n)))
+#define NPCX_DEVALT_LK(base, n)   (*(volatile uint8_t *)(base + NPCX_DEVALT_LK_OFFSET(n)))
+#define NPCX_PUPD_EN(base, n)     (*(volatile uint8_t *)(base + NPCX_PUPD_EN_OFFSET(n)))
+#define NPCX_LV_GPIO_CTL(base, n) (*(volatile uint8_t *)(base + NPCX_LV_GPIO_CTL_OFFSET(n)))
+
+#define NPCX_JEN_CTL1_OFFSET 0x120
+#define NPCX_JEN_CTL1(base)  (*(volatile uint8_t *)(base + (NPCX_JEN_CTL1_OFFSET)))
+
+#define NPCX_JEN_CTL1_JEN_EN      FIELD(0, 4)
+#define NPCX_JEN_CTL1_JEN_HEN     FIELD(4, 4)
+#define NPCX_JEN_CTL1_JEN_ENABLE  0x9
+#define NPCX_JEN_CTL1_JEN_DISABLE 0x6
+
+/* SCFG register fields */
+#define NPCX_DEVCNT_F_SPI_TRIS         6
+#define NPCX_DEVCNT_HIF_TYP_SEL_FIELD  FIELD(2, 2)
+#define NPCX_DEVCNT_JEN1_HEN           5
+#define NPCX_DEVCNT_JEN0_HEN           4
+#define NPCX_STRPST_TRIST              1
+#define NPCX_STRPST_TEST               2
+#define NPCX_STRPST_JEN1               4
+#define NPCX_STRPST_JEN0               5
+#define NPCX_STRPST_SPI_COMP           7
+#define NPCX_RSTCTL_VCC1_RST_STS       0
+#define NPCX_RSTCTL_DBGRST_STS         1
+#define NPCX_RSTCTL_VCC1_RST_SCRATCH   3
+#define NPCX_RSTCTL_LRESET_PLTRST_MODE 5
+#define NPCX_RSTCTL_HIPRST_MODE        6
+#define NPCX_DEV_CTL3_RNGINT_MD        1
+#define NPCX_DEV_CTL3_FVCC1_PURST_EN   2
+#define NPCX_DEV_CTL3_I3C1_MS          3
+#define NPCX_DEV_CTL3_I3C2_MS          4
+#define NPCX_DEV_CTL3_I3C3_MS          5
+#define NPCX_DEV_CTL3_SIO_CLK_SEL      FIELD(6, 2)
+#define NPCX_DEV_CTL4_F_SPI_SLLK       2
+#define NPCX_DEV_CTL4_SPI_SP_SEL       4
+#define NPCX_DEV_CTL4_WP_IF            5
+#define NPCX_DEV_CTL4_VCC1_RST_LK      6
+#define NPCX_DEVPU0_I2C0_0_PUE         0
+#define NPCX_DEVPU0_I2C0_1_PUE         1
+#define NPCX_DEVPU0_I2C1_0_PUE         2
+#define NPCX_DEVPU0_I2C2_0_PUE         4
+#define NPCX_DEVPU0_I2C3_0_PUE         6
+#define NPCX_DEVPU1_F_SPI_PUD_EN       7
+
+#if defined(CONFIG_SOC_SERIES_NPCX4)
+/* I3C module controller, target mode for the MDMA module operation */
+#define NPCX_DEV_CTL3_I3C_MODE_BIT(inst_id) BIT(inst_id + 3)
+#endif /* End of CONFIG_SOC_SERIES_NPCX4 */
+
+/* Supported host interface type for HIF_TYP_SEL FILED in DEVCNT register. */
+enum npcx_hif_type {
+	NPCX_HIF_TYPE_NONE,
+	NPCX_HIF_TYPE_LPC,
+	NPCX_HIF_TYPE_ESPI_SHI,
+};
+
+/* Supported VOSCCLK frequency for SIO_CLK_SEL FILED in DEV_CTL3 register. */
+enum npcx_voscclk_type {
+	NPCX_VOSCCLK_96MHz,
+	NPCX_VOSCCLK_100MHz,
+	NPCX_VOSCCLK_120MHz,
+	NPCX_VOSCCLK_90MHz,
+};
+
+/*
+ * System Glue (GLUE) device registers
+ */
+struct glue_reg {
+	volatile uint8_t reserved1[2];
+	/* 0x002: SMBus Start Bit Detection */
+	volatile uint8_t SMB_SBD;
+	/* 0x003: SMBus Event Enable */
+	volatile uint8_t SMB_EEN;
+	volatile uint8_t reserved2[12];
+	/* 0x010: Simple Debug Port Data 0 */
+	volatile uint8_t SDPD0;
+	volatile uint8_t reserved3;
+	/* 0x012: Simple Debug Port Data 1 */
+	volatile uint8_t SDPD1;
+	volatile uint8_t reserved4;
+	/* 0x014: Simple Debug Port Control and Status */
+	volatile uint8_t SDP_CTS;
+	volatile uint8_t reserved5[12];
+	/* 0x021: SMBus Bus Select */
+	volatile uint8_t SMB_SEL;
+	volatile uint8_t reserved6[5];
+	/* 0x027: PSL Control and Status */
+	volatile uint8_t PSL_CTS;
+};
+
+/* GLUE register fields */
+/* PSL input detection mode is configured by bits 7:4 of PSL_CTS */
+#define NPCX_PSL_CTS_MODE_BIT(bit)  BIT(bit + 4)
+/* PSL input assertion events are reported by bits 3:0 of PSL_CTS */
+#define NPCX_PSL_CTS_EVENT_BIT(bit) BIT(bit)
+
+/*
+ * Universal Asynchronous Receiver-Transmitter (UART) device registers
+ */
+struct uart_reg {
+	/* 0x000: Transmit Data Buffer */
+	volatile uint8_t UTBUF;
+	volatile uint8_t reserved1;
+	/* 0x002: Receive Data Buffer */
+	volatile uint8_t URBUF;
+	volatile uint8_t reserved2;
+	/* 0x004: Interrupt Control */
+	volatile uint8_t UICTRL;
+	volatile uint8_t reserved3;
+	/* 0x006: Status */
+	volatile uint8_t USTAT;
+	volatile uint8_t reserved4;
+	/* 0x008: Frame Select */
+	volatile uint8_t UFRS;
+	volatile uint8_t reserved5;
+	/* 0x00A: Mode Select */
+	volatile uint8_t UMDSL;
+	volatile uint8_t reserved6;
+	/* 0x00C: Baud Rate Divisor */
+	volatile uint8_t UBAUD;
+	volatile uint8_t reserved7;
+	/* 0x00E: Baud Rate Prescaler */
+	volatile uint8_t UPSR;
+	volatile uint8_t reserved8[17];
+	/* 0x020: FIFO Mode Transmit Status */
+	volatile uint8_t UFTSTS;
+	volatile uint8_t reserved9;
+	/* 0x022: FIFO Mode Receive Status */
+	volatile uint8_t UFRSTS;
+	volatile uint8_t reserved10;
+	/* 0x024: FIFO Mode Transmit Control */
+	volatile uint8_t UFTCTL;
+	volatile uint8_t reserved11;
+	/* 0x026: FIFO Mode Receive Control */
+	volatile uint8_t UFRCTL;
+};
+
+/* UART register fields */
+#define NPCX_UICTRL_TBE      0
+#define NPCX_UICTRL_RBF      1
+#define NPCX_UICTRL_ETI      5
+#define NPCX_UICTRL_ERI      6
+#define NPCX_UICTRL_EEI      7
+#define NPCX_USTAT_PE        0
+#define NPCX_USTAT_FE        1
+#define NPCX_USTAT_DOE       2
+#define NPCX_USTAT_ERR       3
+#define NPCX_USTAT_BKD       4
+#define NPCX_USTAT_RB9       5
+#define NPCX_USTAT_XMIP      6
+#define NPCX_UFRS_CHAR_FIELD FIELD(0, 2)
+#define NPCX_UFRS_STP        2
+#define NPCX_UFRS_XB9        3
+#define NPCX_UFRS_PSEL_FIELD FIELD(4, 2)
+#define NPCX_UFRS_PEN        6
+#define NPCX_UMDSL_FIFO_MD   0
+#define NPCX_UMDSL_ETD       4
+#define NPCX_UMDSL_ERD       5
+
+#define NPCX_UFTSTS_TEMPTY_LVL       FIELD(0, 5)
+#define NPCX_UFTSTS_TEMPTY_LVL_STS   5
+#define NPCX_UFTSTS_TFIFO_EMPTY_STS  6
+#define NPCX_UFTSTS_NXMIP            7
+#define NPCX_UFRSTS_RFULL_LVL_STS    5
+#define NPCX_UFRSTS_RFIFO_NEMPTY_STS 6
+#define NPCX_UFRSTS_ERR              7
+#define NPCX_UFTCTL_TEMPTY_LVL_SEL   FIELD(0, 5)
+#define NPCX_UFTCTL_TEMPTY_LVL_EN    5
+#define NPCX_UFTCTL_TEMPTY_EN        6
+#define NPCX_UFTCTL_NXMIP_EN         7
+#define NPCX_UFRCTL_RFULL_LVL_SEL    FIELD(0, 5)
+#define NPCX_UFRCTL_RFULL_LVL_EN     5
+#define NPCX_UFRCTL_RNEMPTY_EN       6
+#define NPCX_UFRCTL_ERR_EN           7
+
+/* Macro functions for MIWU multi-registers */
+#define NPCX_WKEDG(base, group)  (*(volatile uint8_t *)(base + NPCX_WKEDG_OFFSET(group)))
+#define NPCX_WKAEDG(base, group) (*(volatile uint8_t *)(base + NPCX_WKAEDG_OFFSET(group)))
+#define NPCX_WKPND(base, group)  (*(volatile uint8_t *)(base + NPCX_WKPND_OFFSET(group)))
+#define NPCX_WKPCL(base, group)  (*(volatile uint8_t *)(base + NPCX_WKPCL_OFFSET(group)))
+#define NPCX_WKEN(base, group)   (*(volatile uint8_t *)(base + NPCX_WKEN_OFFSET(group)))
+#define NPCX_WKINEN(base, group) (*(volatile uint8_t *)(base + NPCX_WKINEN_OFFSET(group)))
+#define NPCX_WKMOD(base, group)  (*(volatile uint8_t *)(base + NPCX_WKMOD_OFFSET(group)))
+#define NPCX_WKST(base, group)   (*(volatile uint8_t *)(base + NPCX_WKST_OFFSET(group)))
+
+/*
+ * General-Purpose I/O (GPIO) device registers
+ */
+struct gpio_reg {
+	/* 0x000: Port GPIOx Data Out */
+	volatile uint8_t PDOUT;
+	/* 0x001: Port GPIOx Data In */
+	volatile uint8_t PDIN;
+	/* 0x002: Port GPIOx Direction */
+	volatile uint8_t PDIR;
+	/* 0x003: Port GPIOx Pull-Up or Pull-Down Enable */
+	volatile uint8_t PPULL;
+	/* 0x004: Port GPIOx Pull-Up/Down Selection */
+	volatile uint8_t PPUD;
+	/* 0x005: Port GPIOx Drive Enable by VDD Present */
+	volatile uint8_t PENVDD;
+	/* 0x006: Port GPIOx Output Type */
+	volatile uint8_t PTYPE;
+	/* 0x007: Port GPIOx Lock Control */
+	volatile uint8_t PLOCK_CTL;
+};
+
+/*
+ * Pulse Width Modulator (PWM) device registers
+ */
+struct pwm_reg {
+	/* 0x000: Clock Prescaler */
+	volatile uint16_t PRSC;
+	/* 0x002: Cycle Time */
+	volatile uint16_t CTR;
+	/* 0x004: PWM Control */
+	volatile uint8_t PWMCTL;
+	volatile uint8_t reserved1;
+	/* 0x006: Duty Cycle */
+	volatile uint16_t DCR;
+	volatile uint8_t reserved2[4];
+	/* 0x00C: PWM Control Extended */
+	volatile uint8_t PWMCTLEX;
+	volatile uint8_t reserved3;
+};
+
+/* PWM register fields */
+#define NPCX_PWMCTL_INVP            0
+#define NPCX_PWMCTL_CKSEL           1
+#define NPCX_PWMCTL_HB_DC_CTL_FIELD FIELD(2, 2)
+#define NPCX_PWMCTL_PWR             7
+#define NPCX_PWMCTLEX_FCK_SEL_FIELD FIELD(4, 2)
+#define NPCX_PWMCTLEX_OD_OUT        7
+
+/*
+ * Analog-To-Digital Converter (ADC) device registers
+ */
+struct adc_reg {
+	/* 0x000: ADC Status */
+	volatile uint16_t ADCSTS;
+	/* 0x002: ADC Configuration */
+	volatile uint16_t ADCCNF;
+	/* 0x004: ADC Timing Control */
+	volatile uint16_t ATCTL;
+	/* 0x006: ADC Single Channel Address */
+	volatile uint16_t ASCADD;
+	/* 0x008: ADC Scan Channels Select */
+	volatile uint16_t ADCCS;
+	/* 0x00A: ADC Scan Channels Select 2 */
+	volatile uint16_t ADCCS2;
+	volatile uint8_t reserved1[14];
+	/* 0x01A:  Threshold Status */
+	volatile uint16_t THRCTS;
+	volatile uint8_t reserved2[4];
+	/* 0x020: Internal register 1 for ADC Speed */
+	volatile uint16_t ADCCNF2;
+	/* 0x022: Internal register 2 for ADC Speed */
+	volatile uint16_t GENDLY;
+	volatile uint8_t reserved3[2];
+	/* 0x026: Internal register 3 for ADC Speed */
+	volatile uint16_t MEAST;
+};
+
+/* ADC internal inline functions for multi-registers */
+#define CHNDAT(base, ch)   (*(volatile uint16_t *)((base) + NPCX_CHNDAT_OFFSET(ch)))
+#define THRCTL(base, ctrl) (*(volatile uint16_t *)(base + NPCX_THRCTL_OFFSET(ctrl)))
+
+/* ADC register fields */
+#define NPCX_ATCTL_SCLKDIV_FIELD FIELD(0, 6)
+#define NPCX_ATCTL_DLY_FIELD     FIELD(8, 3)
+#define NPCX_ASCADD_SADDR_FIELD  FIELD(0, 5)
+#define NPCX_ADCSTS_EOCEV        0
+#define NPCX_ADCSTS_EOCCEV       1
+#define NPCX_ADCCNF_ADCEN        0
+#define NPCX_ADCCNF_ADCMD_FIELD  FIELD(1, 2)
+#define NPCX_ADCCNF_ADCRPTC      3
+#define NPCX_ADCCNF_START        4
+#define NPCX_ADCCNF_ADCTTE       5
+#define NPCX_ADCCNF_INTECEN      6
+#define NPCX_ADCCNF_INTECCEN     7
+#define NPCX_ADCCNF_INTETCEN     8
+#define NPCX_ADCCNF_INTOVFEN     9
+#define NPCX_ADCCNF_STOP         11
+#define NPCX_CHNDAT_CHDAT_FIELD  FIELD(0, 10)
+#define NPCX_CHNDAT_NEW          15
+#define NPCX_THRCTS_ADC_WKEN     15
+#define NPCX_THRCTS_THR3_IEN     10
+#define NPCX_THRCTS_THR2_IEN     9
+#define NPCX_THRCTS_THR1_IEN     8
+#define NPCX_THRCTS_ADC_EVENT    7
+#define NPCX_THRCTS_THR3_STS     2
+#define NPCX_THRCTS_THR2_STS     1
+#define NPCX_THRCTS_THR1_STS     0
+#define NPCX_THR_DCTL_THRD_EN    15
+#define NPCX_THR_DCTL_THR_DVAL   FIELD(0, 10)
+
+/*
+ * Timer Watchdog (TWD) device registers
+ */
+struct twd_reg {
+	/* 0x000: Timer and Watchdog Configuration */
+	volatile uint8_t TWCFG;
+	volatile uint8_t reserved1;
+	/* 0x002: Timer and Watchdog Clock Prescaler */
+	volatile uint8_t TWCP;
+	volatile uint8_t reserved2;
+	/* 0x004: TWD Timer 0 */
+	volatile uint16_t TWDT0;
+	/* 0x006: TWDT0 Control and Status */
+	volatile uint8_t T0CSR;
+	volatile uint8_t reserved3;
+	/* 0x008: Watchdog Count */
+	volatile uint8_t WDCNT;
+	volatile uint8_t reserved4;
+	/* 0x00A: Watchdog Service Data Match */
+	volatile uint8_t WDSDM;
+	volatile uint8_t reserved5;
+	/* 0x00C: TWD Timer 0 Counter */
+	volatile uint16_t TWMT0;
+	/* 0x00E: Watchdog Counter */
+	volatile uint8_t TWMWD;
+	volatile uint8_t reserved6;
+	/* 0x010: Watchdog Clock Prescaler */
+	volatile uint8_t WDCP;
+	volatile uint8_t reserved7;
+};
+
+/* TWD register fields */
+#define NPCX_TWCFG_LTWCFG    0
+#define NPCX_TWCFG_LTWCP     1
+#define NPCX_TWCFG_LTWDT0    2
+#define NPCX_TWCFG_LWDCNT    3
+#define NPCX_TWCFG_WDCT0I    4
+#define NPCX_TWCFG_WDSDME    5
+#define NPCX_T0CSR_RST       0
+#define NPCX_T0CSR_TC        1
+#define NPCX_T0CSR_WDLTD     3
+#define NPCX_T0CSR_WDRST_STS 4
+#define NPCX_T0CSR_WD_RUN    5
+#define NPCX_T0CSR_TESDIS    7
+
+/*
+ * Enhanced Serial Peripheral Interface (eSPI) device registers
+ */
+struct espi_reg {
+	/* 0x000: eSPI Identification */
+	volatile uint32_t ESPIID;
+	/* 0x004: eSPI Configuration */
+	volatile uint32_t ESPICFG;
+	/* 0x008: eSPI Status */
+	volatile uint32_t ESPISTS;
+	/* 0x00C: eSPI Interrupt Enable */
+	volatile uint32_t ESPIIE;
+	/* 0x010: eSPI Wake-Up Enable */
+	volatile uint32_t ESPIWE;
+	/* 0x014: Virtual Wire Register Index */
+	volatile uint32_t VWREGIDX;
+	/* 0x018: Virtual Wire Register Data */
+	volatile uint32_t VWREGDATA;
+	/* 0x01C: OOB Receive Buffer Read Head */
+	volatile uint32_t OOBRXRDHEAD;
+	/* 0x020: OOB Transmit Buffer Write Head */
+	volatile uint32_t OOBTXWRHEAD;
+	/* 0x024: OOB Channel Control */
+	volatile uint32_t OOBCTL;
+	/* 0x028: Flash Receive Buffer Read Head */
+	volatile uint32_t FLASHRXRDHEAD;
+	/* 0x02C: Flash Transmit Buffer Write Head */
+	volatile uint32_t FLASHTXWRHEAD;
+	volatile uint32_t reserved1;
+	/* 0x034: Flash Channel Configuration */
+	volatile uint32_t FLASHCFG;
+	/* 0x038: Flash Channel Control */
+	volatile uint32_t FLASHCTL;
+	/* 0x03C: eSPI Error Status */
+	volatile uint32_t ESPIERR;
+	/* 0x040: Peripheral Bus Master Receive Buffer Read Head */
+	volatile uint32_t PBMRXRDHEAD;
+	/* 0x044: Peripheral Bus Master Transmit Buffer Write Head */
+	volatile uint32_t PBMTXWRHEAD;
+	/* 0x048: Peripheral Channel Configuration */
+	volatile uint32_t PERCFG;
+	/* 0x04C: Peripheral Channel Control */
+	volatile uint32_t PERCTL;
+	/* 0x050: Status Image Register */
+	volatile uint16_t STATUS_IMG;
+	volatile uint16_t reserved2[79];
+	/* 0x0F0: NPCX specific eSPI Register1 */
+	volatile uint8_t NPCX_ONLY_ESPI_REG1;
+	/* 0x0F1: NPCX specific eSPI Register2 */
+	volatile uint8_t NPCX_ONLY_ESPI_REG2;
+	volatile uint16_t reserved3[7];
+	/* 0x100 - 127: Virtual Wire Event Slave-to-Master 0 - 9 */
+	volatile uint32_t VWEVSM[10];
+	volatile uint32_t reserved4[6];
+	/* 0x140 - 16F: Virtual Wire Event Master-to-Slave 0 - 11 */
+	volatile uint32_t VWEVMS[12];
+	volatile uint32_t reserved5[4];
+	/* 0x180 - 1BF: Virtual Wire GPIO Event Master-to-Slave 0 - 15 */
+	volatile uint32_t VWGPSM[16];
+	volatile uint32_t reserved6[79];
+	/* 0x2FC: Virtual Wire Channel Control */
+	volatile uint32_t VWCTL;
+	/* 0x300 - 34F: OOB Receive Buffer 0 - 19 */
+	volatile uint32_t OOBRXBUF[20];
+	volatile uint32_t reserved7[12];
+	/* 0x380 - 3CF: OOB Transmit Buffer 0-19 */
+	volatile uint32_t OOBTXBUF[20];
+	volatile uint32_t reserved8[11];
+	/* 0x3FC: OOB Channel Control used in 'direct' mode */
+	volatile uint32_t OOBCTL_DIRECT;
+	/* 0x400 - 443: Flash Receive Buffer 0-17 */
+	volatile uint32_t FLASHRXBUF[18];
+	volatile uint32_t reserved9[14];
+	/* 0x480 - 497: Flash Transmit Buffer 0-16 */
+	volatile uint32_t FLASHTXBUF[17];
+	volatile uint32_t reserved10[14];
+	/* 0x4FC: Flash Channel Control used in 'direct' mode */
+	volatile uint32_t FLASHCTL_DIRECT;
+	volatile uint32_t reserved12[64];
+	/* 0x600 - 63F */
+	volatile uint32_t FLASH_PRTR_BADDR[16];
+	/* 0x640 - 67F */
+	volatile uint32_t FLASH_PRTR_HADDR[16];
+	/* 0x680 - 6BF */
+	volatile uint32_t FLASH_RGN_TAG_OVR[16];
+	volatile uint32_t reserved13[80];
+	/* 0x800 */
+	volatile uint32_t FLASH_RPMC_CFG_1;
+	/* 0x804 */
+	volatile uint32_t FLASH_RPMC_CFG_2;
+	/* 0x808 */
+	volatile uint32_t RMAP_FLASH_OFFS;
+	/* 0x80C */
+	volatile uint32_t RMAP_DST_BASE;
+	/* 0x810 */
+	volatile uint32_t RMAP_WIN_SIZE;
+	/* 0x814 */
+	volatile uint32_t FLASHBASE;
+	volatile uint32_t reserved14[58];
+};
+
+/* eSPI register fields */
+#define NPCX_ESPICFG_PCHANEN             0
+#define NPCX_ESPICFG_VWCHANEN            1
+#define NPCX_ESPICFG_OOBCHANEN           2
+#define NPCX_ESPICFG_FLASHCHANEN         3
+#define NPCX_ESPICFG_HPCHANEN            4
+#define NPCX_ESPICFG_HVWCHANEN           5
+#define NPCX_ESPICFG_HOOBCHANEN          6
+#define NPCX_ESPICFG_HFLASHCHANEN        7
+#define NPCX_ESPICFG_CHANS_FIELD         FIELD(0, 4)
+#define NPCX_ESPICFG_HCHANS_FIELD        FIELD(4, 4)
+#define NPCX_ESPICFG_IOMODE_FIELD        FIELD(8, 2)
+#define NPCX_ESPICFG_MAXFREQ_FIELD       FIELD(10, 3)
+#define NPCX_ESPICFG_FLCHANMODE          16
+#define NPCX_ESPICFG_PCCHN_SUPP          24
+#define NPCX_ESPICFG_VWCHN_SUPP          25
+#define NPCX_ESPICFG_OOBCHN_SUPP         26
+#define NPCX_ESPICFG_FLASHCHN_SUPP       27
+#define NPCX_ESPIIE_IBRSTIE              0
+#define NPCX_ESPIIE_CFGUPDIE             1
+#define NPCX_ESPIIE_BERRIE               2
+#define NPCX_ESPIIE_OOBRXIE              3
+#define NPCX_ESPIIE_FLASHRXIE            4
+#define NPCX_ESPIIE_FLNACSIE             5
+#define NPCX_ESPIIE_PERACCIE             6
+#define NPCX_ESPIIE_DFRDIE               7
+#define NPCX_ESPIIE_VWUPDIE              8
+#define NPCX_ESPIIE_ESPIRSTIE            9
+#define NPCX_ESPIIE_PLTRSTIE             10
+#define NPCX_ESPIIE_AMERRIE              15
+#define NPCX_ESPIIE_AMDONEIE             16
+#define NPCX_ESPIIE_BMTXDONEIE           19
+#define NPCX_ESPIIE_PBMRXIE              20
+#define NPCX_ESPIIE_PMSGRXIE             21
+#define NPCX_ESPIIE_BMBURSTERRIE         22
+#define NPCX_ESPIIE_BMBURSTDONEIE        23
+#define NPCX_ESPIWE_IBRSTWE              0
+#define NPCX_ESPIWE_CFGUPDWE             1
+#define NPCX_ESPIWE_BERRWE               2
+#define NPCX_ESPIWE_OOBRXWE              3
+#define NPCX_ESPIWE_FLASHRXWE            4
+#define NPCX_ESPIWE_FLNACSWE             5
+#define NPCX_ESPIWE_PERACCWE             6
+#define NPCX_ESPIWE_DFRDWE               7
+#define NPCX_ESPIWE_VWUPDWE              8
+#define NPCX_ESPIWE_ESPIRSTWE            9
+#define NPCX_ESPIWE_PBMRXWE              20
+#define NPCX_ESPIWE_PMSGRXWE             21
+#define NPCX_ESPISTS_IBRST               0
+#define NPCX_ESPISTS_CFGUPD              1
+#define NPCX_ESPISTS_BERR                2
+#define NPCX_ESPISTS_OOBRX               3
+#define NPCX_ESPISTS_FLASHRX             4
+#define NPCX_ESPISTS_FLNACS              5
+#define NPCX_ESPISTS_PERACC              6
+#define NPCX_ESPISTS_DFRD                7
+#define NPCX_ESPISTS_VWUPD               8
+#define NPCX_ESPISTS_ESPIRST             9
+#define NPCX_ESPISTS_PLTRST              10
+#define NPCX_ESPISTS_FLAUTORDREQ         14
+#define NPCX_ESPISTS_AMERR               15
+#define NPCX_ESPISTS_AMDONE              16
+#define NPCX_ESPISTS_VWUPDW              17
+#define NPCX_ESPISTS_BMTXDONE            19
+#define NPCX_ESPISTS_PBMRX               20
+#define NPCX_ESPISTS_PMSGRX              21
+#define NPCX_ESPISTS_BMBURSTERR          22
+#define NPCX_ESPISTS_BMBURSTDONE         23
+#define NPCX_ESPISTS_ESPIRST_LVL         24
+#define NPCX_ESPISTS_AUTO_RD_DIS_STS     29
+#define NPCX_VWSWIRQ_IRQ_NUM             FIELD(0, 7)
+#define NPCX_VWSWIRQ_IRQ_LVL             7
+#define NPCX_VWSWIRQ_INDEX               FIELD(8, 7)
+#define NPCX_VWSWIRQ_INDEX_EN            15
+#define NPCX_VWSWIRQ_DIRTY               16
+#define NPCX_VWSWIRQ_ENPLTRST            17
+#define NPCX_VWSWIRQ_ENCDRST             19
+#define NPCX_VWSWIRQ_EDGE_IRQ            28
+#define NPCX_VWEVMS_WIRE                 FIELD(0, 4)
+#define NPCX_VWEVMS_VALID                FIELD(4, 4)
+#define NPCX_VWEVMS_INDEX                FIELD(8, 7)
+#define NPCX_VWEVMS_INDEX_EN             15
+#define NPCX_VWEVMS_IE                   18
+#define NPCX_VWEVMS_ENESPIRST            19
+#define NPCX_VWEVMS_WE                   20
+#define NPCX_VWEVSM_WIRE                 FIELD(0, 4)
+#define NPCX_VWEVSM_VALID                FIELD(4, 4)
+#define NPCX_VWEVSM_INDEX                FIELD(8, 7)
+#define NPCX_VWEVSM_INDEX_EN             15
+#define NPCX_VWEVSM_BIT_VALID(n)         (4+n)
+#define NPCX_VWEVSM_DIRTY                16
+#define NPCX_VWEVSM_HW_WIRE              FIELD(24, 4)
+#define NPCX_VWGPSM_INDEX_EN             15
+#define NPCX_OOBCTL_OOB_FREE             0
+#define NPCX_OOBCTL_OOB_AVAIL            1
+#define NPCX_OOBCTL_RSTBUFHEADS          2
+#define NPCX_OOBCTL_OOBPLSIZE            FIELD(10, 3)
+#define NPCX_FLASHCFG_FLASHBLERSSIZE     FIELD(7, 3)
+#define NPCX_FLASHCFG_FLASHPLSIZE        FIELD(10, 3)
+#define NPCX_FLASHCFG_FLASHREQSIZE       FIELD(13, 3)
+#define NPCX_FLASHCFG_FLCAPA             FIELD(24, 2)
+#define NPCX_FLASHCFG_TRGFLEBLKSIZE      FIELD(16, 8)
+#define NPCX_FLASHCFG_FLREQSUP           FIELD(0, 3)
+#define NPCX_FLASHCTL_FLASH_NP_FREE      0
+#define NPCX_FLASHCTL_FLASH_TX_AVAIL     1
+#define NPCX_FLASHCTL_STRPHDR            2
+#define NPCX_FLASHCTL_DMATHRESH          FIELD(3, 2)
+#define NPCX_FLASHCTL_AMTSIZE            FIELD(5, 8)
+#define NPCX_FLASHCTL_RSTBUFHEADS        13
+#define NPCX_FLASHCTL_CRCEN              14
+#define NPCX_FLASHCTL_CHKSUMSEL          15
+#define NPCX_FLASHCTL_AMTEN              16
+#define NPCX_FLASHCTL_SAF_AUTO_READ      18
+#define NPCX_FLASHCTL_AUTO_RD_DIS_CTL    19
+#define NPCX_FLASHCTL_BLK_FLASH_NP_FREE  20
+#define NPCX_FLASHBASE_FLBASE_ADDR       FIELD(12, 15)
+#define NPCX_FLASH_PRTR_BADDR            FIELD(12, 15)
+#define NPCX_FRGN_WPR                    29
+#define SAF_PROT_LCK                     31
+#define NPCX_FRGN_RPR                    30
+#define NPCX_FLASH_PRTR_HADDR            FIELD(12, 15)
+#define NPCX_FLASH_TAG_OVR_RPR           FIELD(16, 16)
+#define NPCX_FLASH_TAG_OVR_WPR           FIELD(0, 16)
+#define NPCX_FLASH_RPMC_CFG1_CNTR        FIELD(0, 4)
+#define NPCX_FLASH_RPMC_CFG1_OP1         FIELD(4, 8)
+#define NPCX_FLASH_RPMC_CFG1_TRGRPMCSUP  FIELD(26, 6)
+#define NPCX_ONLY_ESPI_REG1_UNLOCK_REG2         0x55
+#define NPCX_ONLY_ESPI_REG1_LOCK_REG2           0
+#define NPCX_ONLY_ESPI_REG2_TRANS_END_CONFIG    4
+
+/*
+ * Mobile System Wake-Up Control (MSWC) device registers
+ */
+struct mswc_reg {
+	/* 0x000: MSWC Control Status 1 */
+	volatile uint8_t MSWCTL1;
+	volatile uint8_t reserved1;
+	/* 0x002: MSWC Control Status 2 */
+	volatile uint8_t MSWCTL2;
+	volatile uint8_t reserved2[5];
+	/* 0x008: Host Configuration Base Address Low */
+	volatile uint8_t HCBAL;
+	volatile uint8_t reserved3;
+	/* 0x00A: Host Configuration Base Address High */
+	volatile uint8_t HCBAH;
+	volatile uint8_t reserved4;
+	/* 0X00C: MSWC INTERRUPT ENABLE 2 */
+	volatile uint8_t MSIEN2;
+	volatile uint8_t reserved5;
+	/* 0x00E: MSWC Host Event Status 0 */
+	volatile uint8_t MSHES0;
+	volatile uint8_t reserved6;
+	/* 0x010: MSWC Host Event Interrupt Enable */
+	volatile uint8_t MSHEIE0;
+	volatile uint8_t reserved7;
+	/* 0x012: Host Control */
+	volatile uint8_t HOST_CTL;
+	volatile uint8_t reserved8;
+	/* 0x014: SMI Pulse Length */
+	volatile uint8_t SMIP_LEN;
+	volatile uint8_t reserved9;
+	/* 0x016: SCI Pulse Length */
+	volatile uint8_t SCIP_LEN;
+	volatile uint8_t reserved10[5];
+	/* 0x01C: SRID Core Access */
+	volatile uint8_t SRID_CR;
+	volatile uint8_t reserved11[3];
+	/* 0x020: SID Core Access */
+	volatile uint8_t SID_CR;
+	volatile uint8_t reserved12;
+	/* 0x022: DEVICE_ID Core Access */
+	volatile uint8_t DEVICE_ID_CR;
+	volatile uint8_t reserved13[5];
+	/* 0x028: Chip Revision Core Access */
+	volatile uint8_t CHPREV_CR;
+	volatile uint8_t reserved14[5];
+	/* 0x02E: Virtual Wire Sleep States */
+	volatile uint8_t VW_SLPST1;
+	volatile uint8_t reserved15;
+};
+
+/* MSWC register fields */
+#define NPCX_MSWCTL1_HRSTOB     0
+#define NPCS_MSWCTL1_HWPRON     1
+#define NPCX_MSWCTL1_PLTRST_ACT 2
+#define NPCX_MSWCTL1_VHCFGA     3
+#define NPCX_MSWCTL1_HCFGLK     4
+#define NPCX_MSWCTL1_PWROFFB    6
+#define NPCX_MSWCTL1_A20MB      7
+
+/*
+ * Shared Memory (SHM) device registers
+ */
+struct shm_reg {
+	/* 0x000: Shared Memory Core Status */
+	volatile uint8_t SMC_STS;
+	/* 0x001: Shared Memory Core Control */
+	volatile uint8_t SMC_CTL;
+	/* 0x002: Shared Memory Host Control */
+	volatile uint8_t SHM_CTL;
+	volatile uint8_t reserved1[2];
+	/* 0x005: Indirect Memory Access Window Size */
+	volatile uint8_t IMA_WIN_SIZE;
+	volatile uint8_t reserved2;
+	/* 0x007: Shared Access Windows Size */
+	volatile uint8_t WIN_SIZE;
+	/* 0x008: Shared Access Window 1, Semaphore */
+	volatile uint8_t SHAW1_SEM;
+	/* 0x009: Shared Access Window 2, Semaphore */
+	volatile uint8_t SHAW2_SEM;
+	volatile uint8_t reserved3;
+	/* 0x00B: Indirect Memory Access, Semaphore */
+	volatile uint8_t IMA_SEM;
+	volatile uint8_t reserved4[2];
+	/* 0x00E: Shared Memory Configuration */
+	volatile uint16_t SHCFG;
+	/* 0x010: Shared Access Window 1 Write Protect */
+	volatile uint8_t WIN1_WR_PROT;
+	/* 0x011: Shared Access Window 1 Read Protect */
+	volatile uint8_t WIN1_RD_PROT;
+	/* 0x012: Shared Access Window 2 Write Protect */
+	volatile uint8_t WIN2_WR_PROT;
+	/* 0x013: Shared Access Window 2 Read Protect */
+	volatile uint8_t WIN2_RD_PROT;
+	volatile uint8_t reserved5[2];
+	/* 0x016: Indirect Memory Access Write Protect */
+	volatile uint8_t IMA_WR_PROT;
+	/* 0x017: Indirect Memory Access Read Protect */
+	volatile uint8_t IMA_RD_PROT;
+	volatile uint8_t reserved6[8];
+	/* 0x020: Shared Access Window 1 Base */
+	volatile uint32_t WIN_BASE1;
+	/* 0x024: Shared Access Window 2 Base */
+	volatile uint32_t WIN_BASE2;
+	volatile uint32_t reserved7;
+	/* 0x02C: Indirect Memory Access Base */
+	volatile uint32_t IMA_BASE;
+	volatile uint8_t reserved8[10];
+	/* 0x03A: Reset Configuration */
+	volatile uint8_t RST_CFG;
+	volatile uint8_t reserved9[5];
+	/* 0x040: Debug Port 80 Buffered Data */
+	volatile uint16_t DP80BUF;
+	/* 0x042: Debug Port 80 Status */
+	volatile uint8_t DP80STS;
+	volatile uint8_t reserved10;
+	/* 0x044: Debug Port 80 Control */
+	volatile uint8_t DP80CTL;
+	volatile uint8_t reserved11[3];
+	/* 0x048: Host_Offset in Windows 1, 2 Status */
+	volatile uint8_t HOFS_STS;
+	/* 0x049: Host_Offset in Windows 1, 2 Control */
+	volatile uint8_t HOFS_CTL;
+	/* 0x04A: Core_Offset in Window 2 Address */
+	volatile uint16_t COFS2;
+	/* 0x04C: Core_Offset in Window 1 Address */
+	volatile uint16_t COFS1;
+	volatile uint16_t reserved12;
+};
+
+/* SHM register fields */
+#define NPCX_SMC_STS_HRERR             0
+#define NPCX_SMC_STS_HWERR             1
+#define NPCX_SMC_STS_HSEM1W            4
+#define NPCX_SMC_STS_HSEM2W            5
+#define NPCX_SMC_STS_SHM_ACC           6
+#define NPCX_SMC_CTL_HERR_IE           2
+#define NPCX_SMC_CTL_HSEM1_IE          3
+#define NPCX_SMC_CTL_HSEM2_IE          4
+#define NPCX_SMC_CTL_ACC_IE            5
+#define NPCX_SMC_CTL_PREF_EN           6
+#define NPCX_SMC_CTL_HOSTWAIT          7
+#define NPCX_FLASH_SIZE_STALL_HOST     6
+#define NPCX_FLASH_SIZE_RD_BURST       7
+#define NPCX_WIN_SIZE_RWIN1_SIZE_FIELD FIELD(0, 4)
+#define NPCX_WIN_SIZE_RWIN2_SIZE_FIELD FIELD(4, 4)
+#define NPCX_WIN_PROT_RW1L_RP          0
+#define NPCX_WIN_PROT_RW1L_WP          1
+#define NPCX_WIN_PROT_RW1H_RP          2
+#define NPCX_WIN_PROT_RW1H_WP          3
+#define NPCX_WIN_PROT_RW2L_RP          4
+#define NPCX_WIN_PROT_RW2L_WP          5
+#define NPCX_WIN_PROT_RW2H_RP          6
+#define NPCX_WIN_PROT_RW2H_WP          7
+#define NPCX_PWIN_SIZEI_RPROT          13
+#define NPCX_PWIN_SIZEI_WPROT          14
+#define NPCX_CSEM2                     6
+#define NPCX_CSEM3                     7
+#define NPCX_DP80STS_FWR               5
+#define NPCX_DP80STS_FNE               6
+#define NPCX_DP80STS_FOR               7
+#define NPCX_DP80CTL_DP80EN            0
+#define NPCX_DP80CTL_SYNCEN            1
+#define NPCX_DP80CTL_ADV               2
+#define NPCX_DP80CTL_RAA               3
+#define NPCX_DP80CTL_RFIFO             4
+#define NPCX_DP80CTL_CIEN              5
+#define NPCX_DP80CTL_DP80_HF_CFG       7
+#define NPCX_DP80BUF_OFFS_FIELD        FIELD(8, 3)
+
+/*
+ * Keyboard and Mouse Controller (KBC) device registers
+ */
+struct kbc_reg {
+	/* 0x000h: Host Interface Control */
+	volatile uint8_t HICTRL;
+	volatile uint8_t reserved1;
+	/* 0x002h: Host Interface IRQ Control */
+	volatile uint8_t HIIRQC;
+	volatile uint8_t reserved2;
+	/* 0x004h: Host Interface Keyboard/Mouse Status */
+	volatile uint8_t HIKMST;
+	volatile uint8_t reserved3;
+	/* 0x006h: Host Interface Keyboard Data Out Buffer */
+	volatile uint8_t HIKDO;
+	volatile uint8_t reserved4;
+	/* 0x008h: Host Interface Mouse Data Out Buffer */
+	volatile uint8_t HIMDO;
+	volatile uint8_t reserved5;
+	/* 0x00Ah: Host Interface Keyboard/Mouse Data In Buffer */
+	volatile uint8_t HIKMDI;
+	/* 0x00Bh: Host Interface Keyboard/Mouse Shadow Data In Buffer */
+	volatile uint8_t SHIKMDI;
+};
+
+/* KBC register field */
+#define NPCX_HICTRL_OBFKIE  0
+#define NPCX_HICTRL_OBFMIE  1
+#define NPCX_HICTRL_OBECIE  2
+#define NPCX_HICTRL_IBFCIE  3
+#define NPCX_HICTRL_PMIHIE  4
+#define NPCX_HICTRL_PMIOCIE 5
+#define NPCX_HICTRL_PMICIE  6
+#define NPCX_HICTRL_FW_OBF  7
+#define NPCX_HIKMST_OBF     0
+#define NPCX_HIKMST_IBF     1
+#define NPCX_HIKMST_F0      2
+#define NPCX_HIKMST_A2      3
+#define NPCX_HIKMST_ST0     4
+#define NPCX_HIKMST_ST1     5
+#define NPCX_HIKMST_ST2     6
+#define NPCX_HIKMST_ST3     7
+
+/*
+ * Power Management Channel (PMCH) device registers
+ */
+
+struct pmch_reg {
+	/* 0x000: Host Interface PM Status */
+	volatile uint8_t HIPMST;
+	volatile uint8_t reserved1;
+	/* 0x002: Host Interface PM Data Out Buffer */
+	volatile uint8_t HIPMDO;
+	volatile uint8_t reserved2;
+	/* 0x004: Host Interface PM Data In Buffer */
+	volatile uint8_t HIPMDI;
+	/* 0x005: Host Interface PM Shadow Data In Buffer */
+	volatile uint8_t SHIPMDI;
+	/* 0x006: Host Interface PM Data Out Buffer with SCI */
+	volatile uint8_t HIPMDOC;
+	volatile uint8_t reserved3;
+	/* 0x008: Host Interface PM Data Out Buffer with SMI */
+	volatile uint8_t HIPMDOM;
+	volatile uint8_t reserved4;
+	/* 0x00A: Host Interface PM Data In Buffer with SCI */
+	volatile uint8_t HIPMDIC;
+	volatile uint8_t reserved5;
+	/* 0x00C: Host Interface PM Control */
+	volatile uint8_t HIPMCTL;
+	/* 0x00D: Host Interface PM Control 2 */
+	volatile uint8_t HIPMCTL2;
+	/* 0x00E: Host Interface PM Interrupt Control */
+	volatile uint8_t HIPMIC;
+	volatile uint8_t reserved6;
+	/* 0x010: Host Interface PM Interrupt Enable */
+	volatile uint8_t HIPMIE;
+	volatile uint8_t reserved7;
+};
+
+/* PMCH register field */
+#define NPCX_HIPMIE_SCIE    1
+#define NPCX_HIPMIE_SMIE    2
+#define NPCX_HIPMCTL_IBFIE  0
+#define NPCX_HIPMCTL_OBEIE  1
+#define NPCX_HIPMCTL_SCIPOL 6
+#define NPCX_HIPMST_OBF     0
+#define NPCX_HIPMST_IBF     1
+#define NPCX_HIPMST_F0      2
+#define NPCX_HIPMST_CMD     3
+#define NPCX_HIPMST_ST0     4
+#define NPCX_HIPMST_ST1     5
+#define NPCX_HIPMST_ST2     6
+#define NPCX_HIPMIC_SMIB    1
+#define NPCX_HIPMIC_SCIB    2
+#define NPCX_HIPMIC_SMIPOL  6
+
+/*
+ * Core Access to Host (C2H) device registers
+ */
+struct c2h_reg {
+	/* 0x000: Indirect Host I/O Address */
+	volatile uint16_t IHIOA;
+	/* 0x002: Indirect Host Data */
+	volatile uint8_t IHD;
+	volatile uint8_t reserved1;
+	/* 0x004: Lock Host Access */
+	volatile uint16_t LKSIOHA;
+	/* 0x006: Access Lock Violation */
+	volatile uint16_t SIOLV;
+	/* 0x008: Core-to-Host Modules Access Enable */
+	volatile uint16_t CRSMAE;
+	/* 0x00A: Module Control */
+	volatile uint8_t SIBCTRL;
+	volatile uint8_t reserved3;
+};
+
+/* C2H register fields */
+#define NPCX_LKSIOHA_LKCFG   0
+#define NPCX_LKSIOHA_LKSPHA  2
+#define NPCX_LKSIOHA_LKHIKBD 11
+#define NPCX_CRSMAE_CFGAE    0
+#define NPCX_CRSMAE_HIKBDAE  11
+#define NPCX_SIOLV_SPLV      2
+#define NPCX_SIBCTRL_CSAE    0
+#define NPCX_SIBCTRL_CSRD    1
+#define NPCX_SIBCTRL_CSWR    2
+
+/*
+ * SMBUS (SMB) device registers
+ */
+struct smb_reg {
+	/* 0x000: SMB Serial Data */
+	volatile uint8_t SMBSDA;
+	volatile uint8_t reserved1;
+	/* 0x002: SMB Status */
+	volatile uint8_t SMBST;
+	volatile uint8_t reserved2;
+	/* 0x004: SMB Control Status */
+	volatile uint8_t SMBCST;
+	volatile uint8_t reserved3;
+	/* 0x006: SMB Control 1 */
+	volatile uint8_t SMBCTL1;
+	volatile uint8_t reserved4;
+	/* 0x008: SMB Own Address */
+	volatile uint8_t SMBADDR1;
+	volatile uint8_t reserved5;
+	/* 0x00A: SMB Control 2 */
+	volatile uint8_t SMBCTL2;
+	volatile uint8_t reserved6;
+	/* 0x00C: SMB Own Address */
+	volatile uint8_t SMBADDR2;
+	volatile uint8_t reserved7;
+	/* 0x00E: SMB Control 3 */
+	volatile uint8_t SMBCTL3;
+	/* 0x00F: SMB Bus Timeout */
+	volatile uint8_t SMBT_OUT;
+	union {
+		/* Bank 0 */
+		struct {
+			/* 0x010: SMB Own Address 3 */
+			volatile uint8_t SMBADDR3;
+			/* 0x011: SMB Own Address 7 */
+			volatile uint8_t SMBADDR7;
+			/* 0x012: SMB Own Address 4 */
+			volatile uint8_t SMBADDR4;
+			/* 0x013: SMB Own Address 8 */
+			volatile uint8_t SMBADDR8;
+			/* 0x014: SMB Own Address 5 */
+			volatile uint8_t SMBADDR5;
+			volatile uint8_t reserved8;
+			/* 0x016: SMB Own Address 6 */
+			volatile uint8_t SMBADDR6;
+			volatile uint8_t reserved9;
+			/* 0x018: SMB Control Status 2 */
+			volatile uint8_t SMBCST2;
+			/* 0x019: SMB Control Status 3 */
+			volatile uint8_t SMBCST3;
+			/* 0x01A: SMB Control 4 */
+			volatile uint8_t SMBCTL4;
+			volatile uint8_t reserved10;
+			/* 0x01C: SMB SCL Low Time */
+			volatile uint8_t SMBSCLLT;
+			/* 0x01D: SMB FIFO Control */
+			volatile uint8_t SMBFIF_CTL;
+			/* 0x01E: SMB SCL High Time */
+			volatile uint8_t SMBSCLHT;
+			volatile uint8_t reserved11;
+		};
+		/* Bank 1 */
+		struct {
+			/* 0x010: SMB FIFO Control */
+			volatile uint8_t SMBFIF_CTS;
+			volatile uint8_t reserved12;
+			/* 0x012: SMB Tx-FIFO Control */
+			volatile uint8_t SMBTXF_CTL;
+			volatile uint8_t reserved13;
+			/* 0x014: SMB Bus Timeout */
+			volatile uint8_t SMB_T_OUT;
+			volatile uint8_t reserved14[3];
+			/* 0x018: SMB Control Status 2 (FIFO) */
+			volatile uint8_t SMBCST2_FIFO;
+			/* 0x019: SMB Control Status 3 (FIFO) */
+			volatile uint8_t SMBCST3_FIFO;
+			/* 0x01A: SMB Tx-FIFO Status */
+			volatile uint8_t SMBTXF_STS;
+			volatile uint8_t reserved15;
+			/* 0x01C: SMB Rx-FIFO Status */
+			volatile uint8_t SMBRXF_STS;
+			volatile uint8_t reserved16;
+			/* 0x01E: SMB Rx-FIFO Control */
+			volatile uint8_t SMBRXF_CTL;
+			volatile uint8_t reserved17[1];
+		};
+	};
+};
+
+/* SMB register fields */
+#define NPCX_SMBST_XMIT              0
+#define NPCX_SMBST_MASTER            1
+#define NPCX_SMBST_NMATCH            2
+#define NPCX_SMBST_STASTR            3
+#define NPCX_SMBST_NEGACK            4
+#define NPCX_SMBST_BER               5
+#define NPCX_SMBST_SDAST             6
+#define NPCX_SMBST_SLVSTP            7
+#define NPCX_SMBCST_BUSY             0
+#define NPCX_SMBCST_BB               1
+#define NPCX_SMBCST_MATCH            2
+#define NPCX_SMBCST_GCMATCH          3
+#define NPCX_SMBCST_TSDA             4
+#define NPCX_SMBCST_TGSCL            5
+#define NPCX_SMBCST_MATCHAF          6
+#define NPCX_SMBCST_ARPMATCH         7
+#define NPCX_SMBCST2_MATCHA1F        0
+#define NPCX_SMBCST2_MATCHA2F        1
+#define NPCX_SMBCST2_MATCHA3F        2
+#define NPCX_SMBCST2_MATCHA4F        3
+#define NPCX_SMBCST2_MATCHA5F        4
+#define NPCX_SMBCST2_MATCHA6F        5
+#define NPCX_SMBCST2_MATCHA7F        6
+#define NPCX_SMBCST2_INTSTS          7
+#define NPCX_SMBCST3_MATCHA8F        0
+#define NPCX_SMBCST3_MATCHA9F        1
+#define NPCX_SMBCST3_MATCHA10F       2
+#define NPCX_SMBCTL1_START           0
+#define NPCX_SMBCTL1_STOP            1
+#define NPCX_SMBCTL1_INTEN           2
+#define NPCX_SMBCTL1_ACK             4
+#define NPCX_SMBCTL1_GCMEN           5
+#define NPCX_SMBCTL1_NMINTE          6
+#define NPCX_SMBCTL1_STASTRE         7
+#define NPCX_SMBCTL2_ENABLE          0
+#define NPCX_SMBCTL2_SCLFRQ0_6_FIELD FIELD(1, 7)
+#define NPCX_SMBCTL3_ARPMEN          2
+#define NPCX_SMBCTL3_SCLFRQ7_8_FIELD FIELD(0, 2)
+#define NPCX_SMBCTL3_IDL_START       3
+#define NPCX_SMBCTL3_400K            4
+#define NPCX_SMBCTL3_BNK_SEL         5
+#define NPCX_SMBCTL3_SDA_LVL         6
+#define NPCX_SMBCTL3_SCL_LVL         7
+#define NPCX_SMBCTL4_HLDT_FIELD      FIELD(0, 6)
+#define NPCX_SMBCTL4_LVL_WE          7
+#define NPCX_SMBADDR1_SAEN           7
+#define NPCX_SMBADDR2_SAEN           7
+#define NPCX_SMBADDR3_SAEN           7
+#define NPCX_SMBADDR4_SAEN           7
+#define NPCX_SMBADDR5_SAEN           7
+#define NPCX_SMBADDR6_SAEN           7
+#define NPCX_SMBADDR7_SAEN           7
+#define NPCX_SMBADDR8_SAEN           7
+#define NPCX_SMBSEL_SMB4SEL          4
+#define NPCX_SMBSEL_SMB5SEL          5
+#define NPCX_SMBSEL_SMB6SEL          6
+#define NPCX_SMBFIF_CTS_RXF_TXE      1
+#define NPCX_SMBFIF_CTS_CLR_FIFO     6
+#define NPCX_SMBFIF_CTL_FIFO_EN      4
+#define NPCX_SMBRXF_STS_RX_THST      6
+
+/* RX FIFO threshold */
+#define NPCX_SMBRXF_CTL_RX_THR FIELD(0, 6)
+#define NPCX_SMBRXF_CTL_LAST   7
+
+/*
+ * Internal 32-bit Timer (ITIM32) device registers
+ */
+struct itim32_reg {
+	volatile uint8_t reserved1;
+	/* 0x001: Internal 32-bit Timer Prescaler */
+	volatile uint8_t ITPRE32;
+	volatile uint8_t reserved2[2];
+	/* 0x004: Internal 32-bit Timer Control and Status */
+	volatile uint8_t ITCTS32;
+	volatile uint8_t reserved3[3];
+	/* 0x008: Internal 32-Bit Timer Counter */
+	volatile uint32_t ITCNT32;
+};
+
+/*
+ * Internal 64-bit Timer (ITIM54) device registers
+ */
+struct itim64_reg {
+	volatile uint8_t reserved1;
+	/* 0x001: Internal 64-bit Timer Prescaler */
+	volatile uint8_t ITPRE64;
+	volatile uint8_t reserved2[2];
+	/* 0x004: Internal 64-bit Timer Control and Status */
+	volatile uint8_t ITCTS64;
+	volatile uint8_t reserved3[3];
+	/* 0x008: Internal 32-Bit Timer Counter */
+	volatile uint32_t ITCNT64L;
+	/* 0x00C: Internal 32-Bit Timer Counter */
+	volatile uint32_t ITCNT64H;
+};
+
+/* ITIM register fields */
+#define NPCX_ITCTSXX_TO_STS 0
+#define NPCX_ITCTSXX_TO_IE  2
+#define NPCX_ITCTSXX_TO_WUE 3
+#define NPCX_ITCTSXX_CKSEL  4
+#define NPCX_ITCTSXX_ITEN   7
+
+/*
+ * Tachometer (TACH) Sensor device registers
+ */
+struct tach_reg {
+	/* 0x000: Timer/Counter 1 */
+	volatile uint16_t TCNT1;
+	/* 0x002: Reload/Capture A */
+	volatile uint16_t TCRA;
+	/* 0x004: Reload/Capture B */
+	volatile uint16_t TCRB;
+	/* 0x006: Timer/Counter 2 */
+	volatile uint16_t TCNT2;
+	/* 0x008: Clock Prescaler */
+	volatile uint8_t TPRSC;
+	volatile uint8_t reserved1;
+	/* 0x00A: Clock Unit Control */
+	volatile uint8_t TCKC;
+	volatile uint8_t reserved2;
+	/* 0x00C: Timer Mode Control */
+	volatile uint8_t TMCTRL;
+	volatile uint8_t reserved3;
+	/* 0x00E: Timer Event Control */
+	volatile uint8_t TECTRL;
+	volatile uint8_t reserved4;
+	/* 0x010: Timer Event Clear */
+	volatile uint8_t TECLR;
+	volatile uint8_t reserved5;
+	/* 0x012: Timer Interrupt Enable */
+	volatile uint8_t TIEN;
+	volatile uint8_t reserved6;
+	/* 0x014: Compare A */
+	volatile uint16_t TCPA;
+	/* 0x016: Compare B */
+	volatile uint16_t TCPB;
+	/* 0x018: Compare Configuration */
+	volatile uint8_t TCPCFG;
+	volatile uint8_t reserved7;
+	/* 0x01A: Timer Wake-Up Enable */
+	volatile uint8_t TWUEN;
+	volatile uint8_t reserved8;
+	/* 0x01C: Timer Configuration */
+	volatile uint8_t TCFG;
+	volatile uint8_t reserved9;
+};
+
+/* TACH register fields */
+#define NPCX_TCKC_LOW_PWR       7
+#define NPCX_TCKC_PLS_ACC_CLK   6
+#define NPCX_TCKC_C1CSEL_FIELD  FIELD(0, 3)
+#define NPCX_TCKC_C2CSEL_FIELD  FIELD(3, 3)
+#define NPCX_TMCTRL_MDSEL_FIELD FIELD(0, 3)
+#define NPCX_TMCTRL_TAEN        5
+#define NPCX_TMCTRL_TBEN        6
+#define NPCX_TMCTRL_TAEDG       3
+#define NPCX_TMCTRL_TBEDG       4
+#define NPCX_TCFG_TADBEN        6
+#define NPCX_TCFG_TBDBEN        7
+#define NPCX_TECTRL_TAPND       0
+#define NPCX_TECTRL_TBPND       1
+#define NPCX_TECTRL_TCPND       2
+#define NPCX_TECTRL_TDPND       3
+#define NPCX_TECLR_TACLR        0
+#define NPCX_TECLR_TBCLR        1
+#define NPCX_TECLR_TCCLR        2
+#define NPCX_TECLR_TDCLR        3
+#define NPCX_TIEN_TAIEN         0
+#define NPCX_TIEN_TBIEN         1
+#define NPCX_TIEN_TCIEN         2
+#define NPCX_TIEN_TDIEN         3
+#define NPCX_TWUEN_TAWEN        0
+#define NPCX_TWUEN_TBWEN        1
+#define NPCX_TWUEN_TCWEN        2
+#define NPCX_TWUEN_TDWEN        3
+
+/* Debug Interface registers */
+struct dbg_reg {
+	/* 0x000: Debug Control */
+	volatile uint8_t DBGCTRL;
+	volatile uint8_t reserved1;
+	/* 0x002: Debug Freeze Enable 1 */
+	volatile uint8_t DBGFRZEN1;
+	/* 0x003: Debug Freeze Enable 2 */
+	volatile uint8_t DBGFRZEN2;
+	/* 0x004: Debug Freeze Enable 3 */
+	volatile uint8_t DBGFRZEN3;
+	/* 0x005: Debug Freeze Enable 4 */
+	volatile uint8_t DBGFRZEN4;
+};
+/* Debug Interface registers fields */
+#define NPCX_DBGFRZEN3_GLBL_FRZ_DIS 7
+
+/* PS/2 Interface registers */
+struct ps2_reg {
+	/* 0x000: PS/2 Data */
+	volatile uint8_t PSDAT;
+	volatile uint8_t reserved1;
+	/* 0x002: PS/2 Status */
+	volatile uint8_t PSTAT;
+	volatile uint8_t reserved2;
+	/* 0x004: PS/2 Control */
+	volatile uint8_t PSCON;
+	volatile uint8_t reserved3;
+	/* 0x006: PS/2 Output Signal */
+	volatile uint8_t PSOSIG;
+	volatile uint8_t reserved4;
+	/* 0x008: PS/2 Input Signal */
+	volatile uint8_t PSISIG;
+	volatile uint8_t reserved5;
+	/* 0x00A: PS/2 Interrupt Enable */
+	volatile uint8_t PSIEN;
+	volatile uint8_t reserved6;
+};
+
+/* PS/2 Interface registers fields */
+#define NPCX_PSTAT_SOT   0
+#define NPCX_PSTAT_EOT   1
+#define NPCX_PSTAT_PERR  2
+#define NPCX_PSTAT_ACH   FIELD(3, 3)
+#define NPCX_PSTAT_RFERR 6
+
+#define NPCX_PSCON_EN    0
+#define NPCX_PSCON_XMT   1
+#define NPCX_PSCON_HDRV  FIELD(2, 2)
+#define NPCX_PSCON_IDB   FIELD(4, 3)
+#define NPCX_PSCON_WPUED 7
+
+#define NPCX_PSOSIG_WDAT0   0
+#define NPCX_PSOSIG_WDAT1   1
+#define NPCX_PSOSIG_WDAT2   2
+#define NPCX_PSOSIG_CLK0    3
+#define NPCX_PSOSIG_CLK1    4
+#define NPCX_PSOSIG_CLK2    5
+#define NPCX_PSOSIG_WDAT3   6
+#define NPCX_PSOSIG_CLK3    7
+#define NPCX_PSOSIG_CLK(n)  (((n) < 3) ? ((n) + 3) : 7)
+#define NPCX_PSOSIG_WDAT(n) (((n) < 3) ? ((n) + 0) : 6)
+#define NPCX_PSOSIG_CLK_MASK_ALL                                                                   \
+	(BIT(NPCX_PSOSIG_CLK0) | BIT(NPCX_PSOSIG_CLK1) | BIT(NPCX_PSOSIG_CLK2) |                   \
+	 BIT(NPCX_PSOSIG_CLK3))
+
+#define NPCX_PSIEN_SOTIE       0
+#define NPCX_PSIEN_EOTIE       1
+#define NPCX_PSIEN_PS2_WUE     4
+#define NPCX_PSIEN_PS2_CLK_SEL 7
+
+/* Flash Interface Unit (FIU) device registers */
+struct fiu_reg {
+	volatile uint8_t reserved1;
+	/* 0x001: Burst Configuration */
+	volatile uint8_t BURST_CFG;
+	/* 0x002: FIU Response Configuration */
+	volatile uint8_t RESP_CFG;
+	volatile uint8_t reserved2[17];
+	/* 0x014: SPI Flash Configuration */
+	volatile uint8_t SPI_FL_CFG;
+	volatile uint8_t reserved3;
+	/* 0x016: UMA Code Byte */
+	volatile uint8_t UMA_CODE;
+	/* 0x017: UMA Address Byte 0 */
+	volatile uint8_t UMA_AB0;
+	/* 0x018: UMA Address Byte 1 */
+	volatile uint8_t UMA_AB1;
+	/* 0x019: UMA Address Byte 2 */
+	volatile uint8_t UMA_AB2;
+	/* 0x01A: UMA Data Byte 0 */
+	volatile uint8_t UMA_DB0;
+	/* 0x01B: UMA Data Byte 1 */
+	volatile uint8_t UMA_DB1;
+	/* 0x01C: UMA Data Byte 2 */
+	volatile uint8_t UMA_DB2;
+	/* 0x01D: UMA Data Byte 3 */
+	volatile uint8_t UMA_DB3;
+	/* 0x01E: UMA Control and Status */
+	volatile uint8_t UMA_CTS;
+	/* 0x01F: UMA Extended Control and Status */
+	volatile uint8_t UMA_ECTS;
+	/* 0x020: UMA Data Bytes 0-3 */
+	volatile uint32_t UMA_DB0_3;
+	volatile uint8_t reserved4[2];
+	/* 0x026: CRC Control Register */
+	volatile uint8_t CRCCON;
+	/* 0x027: CRC Entry Register */
+	volatile uint8_t CRCENT;
+	/* 0x028: CRC Initialization and Result Register */
+	volatile uint32_t CRCRSLT;
+	volatile uint8_t reserved5[4];
+	/* 0x030: FIU Read Command */
+	volatile uint8_t FIU_RD_CMD;
+	volatile uint8_t reserved6;
+	/* 0x032: FIU Dummy Cycles */
+	volatile uint8_t FIU_DMM_CYC;
+	/* 0x033: FIU Extended Configuration */
+	volatile uint8_t FIU_EXT_CFG;
+#if defined(CONFIG_SOC_SERIES_NPCX9)
+	/* 0x034: UMA address byte 0-3 */
+	volatile uint32_t UMA_AB0_3;
+	/* 0x038-0x3C */
+	volatile uint8_t reserved8[5];
+	/* 0x03D: SPI Device */
+	volatile uint8_t SPI1_DEV;
+	/* 0x03E-0x3F */
+	volatile uint8_t reserved9[2];
+#elif defined(CONFIG_SOC_SERIES_NPCX4)
+	/* 0x034: UMA address byte 0-3 */
+	volatile uint32_t UMA_AB0_3;
+	/* 0x038-0x3B */
+	volatile uint8_t reserved8[4];
+	/* 0x03C: SPI Device */
+	volatile uint8_t SPI_DEV;
+	/* 0x03D */
+	volatile uint8_t reserved9;
+	/* 0x03E */
+	volatile uint8_t SPI_DEV_SIZE;
+	/* 0x03F */
+	volatile uint8_t reserved10;
+#endif
+};
+
+/* FIU register fields */
+#define NPCX_BURST_CFG_SPI_DEV_SEL     FIELD(4, 2)
+#define NPCX_RESP_CFG_IAD_EN           0
+#define NPCX_RESP_CFG_DEV_SIZE_EX      2
+#define NPCX_RESP_CFG_QUAD_EN          3
+#define NPCX_SPI_FL_CFG_RD_MODE        FIELD(6, 2)
+#define NPCX_UMA_CTS_A_SIZE            3
+#define NPCX_UMA_CTS_C_SIZE            4
+#define NPCX_UMA_CTS_RD_WR             5
+#define NPCX_UMA_CTS_DEV_NUM           6
+#define NPCX_UMA_CTS_EXEC_DONE         7
+#define NPCX_UMA_ECTS_SW_CS0           0
+#define NPCX_UMA_ECTS_SW_CS1           1
+#define NPCX_UMA_ECTS_SEC_CS           2
+#define NPCX_UMA_ECTS_UMA_LOCK         3
+#define NPCX_UMA_ECTS_UMA_ADDR_SIZE    FIELD(4, 3)
+#define NPCX_SPI1_DEV_FOUR_BADDR_CS10  6
+#define NPCX_SPI1_DEV_FOUR_BADDR_CS11  7
+#define NPCX_SPI1_DEV_SPI1_LO_DEV_SIZE FIELD(0, 4)
+#define NPCX_FIU_EXT_CFG_SET_DMM_EN    2
+#define NPCX_FIU_EXT_CFG_SET_CMD_EN    1
+#define NPCX_SPI_DEV_NADDRB            FIELD(5, 3)
+
+#define NPCX_MSR_IE_CFG_UMA_BLOCK 3
+
+/* UMA fields selections */
+#define UMA_FLD_ADDR   BIT(NPCX_UMA_CTS_A_SIZE)  /* 3-bytes ADR field */
+#define UMA_FLD_NO_CMD BIT(NPCX_UMA_CTS_C_SIZE)  /* No 1-Byte CMD field */
+#define UMA_FLD_WRITE  BIT(NPCX_UMA_CTS_RD_WR)   /* Write transaction */
+#define UMA_FLD_SHD_SL BIT(NPCX_UMA_CTS_DEV_NUM) /* Shared flash selected */
+#define UMA_FLD_EXEC   BIT(NPCX_UMA_CTS_EXEC_DONE)
+
+#define UMA_FIELD_DATA_1 0x01
+#define UMA_FIELD_DATA_2 0x02
+#define UMA_FIELD_DATA_3 0x03
+#define UMA_FIELD_DATA_4 0x04
+
+/* UMA code for transaction */
+#define UMA_CODE_CMD_ONLY       (UMA_FLD_EXEC | UMA_FLD_SHD_SL)
+#define UMA_CODE_CMD_ADR        (UMA_FLD_EXEC | UMA_FLD_ADDR | UMA_FLD_SHD_SL)
+#define UMA_CODE_CMD_RD_BYTE(n) (UMA_FLD_EXEC | UMA_FIELD_DATA_##n | UMA_FLD_SHD_SL)
+#define UMA_CODE_RD_BYTE(n)                                                                        \
+	(UMA_FLD_EXEC | UMA_FLD_NO_CMD | UMA_FIELD_DATA_##n | UMA_FLD_SHD_SL)
+#define UMA_CODE_CMD_WR_ONLY    (UMA_FLD_EXEC | UMA_FLD_WRITE | UMA_FLD_SHD_SL)
+#define UMA_CODE_CMD_WR_BYTE(n) (UMA_FLD_EXEC | UMA_FLD_WRITE | UMA_FIELD_DATA_##n | UMA_FLD_SHD_SL)
+#define UMA_CODE_CMD_WR_ADR     (UMA_FLD_EXEC | UMA_FLD_WRITE | UMA_FLD_ADDR | UMA_FLD_SHD_SL)
+
+#define UMA_CODE_CMD_ADR_WR_BYTE(n)                                                                \
+	(UMA_FLD_EXEC | UMA_FLD_WRITE | UMA_FLD_ADDR | UMA_FIELD_DATA_##n | UMA_FLD_SHD_SL)
+
+/* Platform Environment Control Interface (PECI) device registers */
+struct peci_reg {
+	/* 0x000: PECI Control Status */
+	volatile uint8_t PECI_CTL_STS;
+	/* 0x001: PECI Read Length */
+	volatile uint8_t PECI_RD_LENGTH;
+	/* 0x002: PECI Address */
+	volatile uint8_t PECI_ADDR;
+	/* 0x003: PECI Command */
+	volatile uint8_t PECI_CMD;
+	/* 0x004: PECI Control 2 */
+	volatile uint8_t PECI_CTL2;
+	/* 0x005: PECI Index */
+	volatile uint8_t PECI_INDEX;
+	/* 0x006: PECI Index Data */
+	volatile uint8_t PECI_IDATA;
+	/* 0x007: PECI Write Length */
+	volatile uint8_t PECI_WR_LENGTH;
+	volatile uint8_t reserved1[3];
+	/* 0x00B: PECI Write FCS */
+	volatile uint8_t PECI_WR_FCS;
+	/* 0x00C: PECI Read FCS */
+	volatile uint8_t PECI_RD_FCS;
+	/* 0x00D: PECI Assured Write FCS */
+	volatile uint8_t PECI_AW_FCS;
+	volatile uint8_t reserved2;
+	/* 0x00F: PECI Transfer Rate */
+	volatile uint8_t PECI_RATE;
+	/* 0x010 - 0x04F: PECI Data In/Out */
+	union {
+		volatile uint8_t PECI_DATA_IN[64];
+		volatile uint8_t PECI_DATA_OUT[64];
+	};
+};
+
+/* PECI register fields */
+#define NPCX_PECI_CTL_STS_START_BUSY     0
+#define NPCX_PECI_CTL_STS_DONE           1
+#define NPCX_PECI_CTL_STS_CRC_ERR        3
+#define NPCX_PECI_CTL_STS_ABRT_ERR       4
+#define NPCX_PECI_CTL_STS_AWFCS_EB       5
+#define NPCX_PECI_CTL_STS_DONE_EN        6
+#define NPCX_PECI_RATE_MAX_BIT_RATE      FIELD(0, 5)
+#define NPCX_PECI_RATE_MAX_BIT_RATE_MASK 0x1F
+/* The minimal valid value of NPCX_PECI_RATE_MAX_BIT_RATE field */
+#define PECI_MAX_BIT_RATE_VALID_MIN      0x05
+#define PECI_HIGH_SPEED_MIN_VAL          0x07
+
+#define NPCX_PECI_RATE_EHSP 6
+
+/* KBS (Keyboard Scan) device registers */
+struct kbs_reg {
+	volatile uint8_t reserved1[4];
+	/* 0x004: Keyboard Scan In */
+	volatile uint8_t KBSIN;
+	/* 0x005: Keyboard Scan In Pull-Up Enable */
+	volatile uint8_t KBSINPU;
+	/* 0x006: Keyboard Scan Out 0 */
+	volatile uint16_t KBSOUT0;
+	/* 0x008: Keyboard Scan Out 1 */
+	volatile uint16_t KBSOUT1;
+	/* 0x00A: Keyboard Scan Buffer Index */
+	volatile uint8_t KBS_BUF_INDX;
+	/* 0x00B: Keyboard Scan Buffer Data */
+	volatile uint8_t KBS_BUF_DATA;
+	/* 0x00C: Keyboard Scan Event */
+	volatile uint8_t KBSEVT;
+	/* 0x00D: Keyboard Scan Control */
+	volatile uint8_t KBSCTL;
+	/* 0x00E: Keyboard Scan Configuration Index */
+	volatile uint8_t KBS_CFG_INDX;
+	/* 0x00F: Keyboard Scan Configuration Data */
+	volatile uint8_t KBS_CFG_DATA;
+};
+
+/* KBS register fields */
+#define NPCX_KBSBUFINDX          0
+#define NPCX_KBSEVT_KBSDONE      0
+#define NPCX_KBSEVT_KBSERR       1
+#define NPCX_KBSCTL_START        0
+#define NPCX_KBSCTL_KBSMODE      1
+#define NPCX_KBSCTL_KBSIEN       2
+#define NPCX_KBSCTL_KBSINC       3
+#define NPCX_KBSCTL_KBHDRV_FIELD FIELD(6, 2)
+#define NPCX_KBSCFGINDX          0
+/* Index of 'Automatic Scan' configuration register */
+#define KBS_CFG_INDX_DLY1        0 /* Keyboard Scan Delay T1 Byte */
+#define KBS_CFG_INDX_DLY2        1 /* Keyboard Scan Delay T2 Byte */
+#define KBS_CFG_INDX_RTYTO       2 /* Keyboard Scan Retry Timeout */
+#define KBS_CFG_INDX_CNUM        3 /* Keyboard Scan Columns Number */
+#define KBS_CFG_INDX_CDIV        4 /* Keyboard Scan Clock Divisor */
+
+/* SHI (Serial Host Interface) registers */
+struct shi_reg {
+	volatile uint8_t reserved1;
+	/* 0x001: SHI Configuration 1 */
+	volatile uint8_t SHICFG1;
+	/* 0x002: SHI Configuration 2 */
+	volatile uint8_t SHICFG2;
+	volatile uint8_t reserved2[2];
+	/* 0x005: Event Enable */
+	volatile uint8_t EVENABLE;
+	/* 0x006: Event Status */
+	volatile uint8_t EVSTAT;
+	/* 0x007: SHI Capabilities */
+	volatile uint8_t CAPABILITY;
+	/* 0x008: Status */
+	volatile uint8_t STATUS;
+	volatile uint8_t reserved3;
+	/* 0x00A: Input Buffer Status */
+	volatile uint8_t IBUFSTAT;
+	/* 0x00B: Output Buffer Status */
+	volatile uint8_t OBUFSTAT;
+	/* 0x00C: SHI Configuration 3 */
+	volatile uint8_t SHICFG3;
+	/* 0x00D: SHI Configuration 4 */
+	volatile uint8_t SHICFG4;
+	/* 0x00E: SHI Configuration 5 */
+	volatile uint8_t SHICFG5;
+	/* 0x00F: Event Status 2 */
+	volatile uint8_t EVSTAT2;
+	/* 0x010: Event Enable 2 */
+	volatile uint8_t EVENABLE2;
+	/* 0x011: SHI Configuration 6 - only in chips which support enhanced buffer mode */
+	volatile uint8_t SHICFG6;
+	/* 0x012: Single Byte Output Buffer - only in chips which support enhanced buffer mode */
+	volatile uint8_t SBOBUF;
+	volatile uint8_t reserved4[13];
+	/* 0x20~0x9F: Output Buffer */
+	volatile uint8_t OBUF[128];
+	/* 0xA0~0x11F: Input Buffer */
+	volatile uint8_t IBUF[128];
+};
+
+/* SHI register fields */
+#define NPCX_SHICFG1_EN          0
+#define NPCX_SHICFG1_MODE        1
+#define NPCX_SHICFG1_WEN         2
+#define NPCX_SHICFG1_AUTIBF      3
+#define NPCX_SHICFG1_AUTOBE      4
+#define NPCX_SHICFG1_DAS         5
+#define NPCX_SHICFG1_CPOL        6
+#define NPCX_SHICFG1_IWRAP       7
+#define NPCX_SHICFG2_SIMUL       0
+#define NPCX_SHICFG2_BUSY        1
+#define NPCX_SHICFG2_ONESHOT     2
+#define NPCX_SHICFG2_SLWU        3
+#define NPCX_SHICFG2_REEN        4
+#define NPCX_SHICFG2_RESTART     5
+#define NPCX_SHICFG2_REEVEN      6
+#define NPCX_EVENABLE_OBEEN      0
+#define NPCX_EVENABLE_OBHEEN     1
+#define NPCX_EVENABLE_IBFEN      2
+#define NPCX_EVENABLE_IBHFEN     3
+#define NPCX_EVENABLE_EOREN      4
+#define NPCX_EVENABLE_EOWEN      5
+#define NPCX_EVENABLE_STSREN     6
+#define NPCX_EVENABLE_IBOREN     7
+#define NPCX_EVSTAT_OBE          0
+#define NPCX_EVSTAT_OBHE         1
+#define NPCX_EVSTAT_IBF          2
+#define NPCX_EVSTAT_IBHF         3
+#define NPCX_EVSTAT_EOR          4
+#define NPCX_EVSTAT_EOW          5
+#define NPCX_EVSTAT_STSR         6
+#define NPCX_EVSTAT_IBOR         7
+#define NPCX_STATUS_OBES         6
+#define NPCX_STATUS_IBFS         7
+#define NPCX_SHICFG3_OBUFLVLDIS  7
+#define NPCX_SHICFG4_IBUFLVLDIS  7
+#define NPCX_SHICFG5_IBUFLVL2    FIELD(0, 6)
+#define NPCX_SHICFG5_IBUFLVL2DIS 7
+#define NPCX_EVSTAT2_IBHF2       0
+#define NPCX_EVSTAT2_CSNRE       1
+#define NPCX_EVSTAT2_CSNFE       2
+#define NPCX_EVENABLE2_IBHF2EN   0
+#define NPCX_EVENABLE2_CSNREEN   1
+#define NPCX_EVENABLE2_CSNFEEN   2
+#define NPCX_SHICFG6_EBUFMD      0
+#define NPCX_SHICFG6_OBUF_SL     1
+
+#define IBF_IBHF_EN_MASK (BIT(NPCX_EVENABLE_IBFEN) | BIT(NPCX_EVENABLE_IBHFEN))
+
+/* SPIP (SPI Peripheral Interface) registers */
+struct spip_reg {
+	/* 0x000: SPIP Data In/Out */
+	volatile uint16_t SPIP_DATA;
+	/* 0x002: SPIP Control 1 */
+	volatile uint16_t SPIP_CTL1;
+	/* 0x004: SPIP Status */
+	volatile uint8_t SPIP_STAT;
+	volatile uint8_t reserved1;
+};
+
+#define NPCX_SPIP_CTL1_SPIEN 0
+#define NPCX_SPIP_CTL1_MOD   2
+#define NPCX_SPIP_CTL1_EIR   5
+#define NPCX_SPIP_CTL1_EIW   6
+#define NPCX_SPIP_CTL1_SCM   7
+#define NPCX_SPIP_CTL1_SCIDL 8
+#define NPCX_SPIP_CTL1_SCDV  FIELD(9, 7)
+#define NPCX_SPIP_STAT_BSY   0
+#define NPCX_SPIP_STAT_RBF   1
+
+/* Software-triggered Pheripheral Reset Controller Register */
+struct swrst_reg {
+	/* 0x000: Software Reset Trigger */
+	volatile uint16_t SWRST_TRG;
+	volatile uint8_t reserved1[2];
+	volatile uint32_t SWRST_CTL[4];
+};
+
+/* Improved Inter Integrated Circuit  (I3C) device registers */
+struct i3c_reg {
+	/* 0x000: Controller Configuration */
+	volatile uint32_t MCONFIG;
+	/* 0x004: Target Configuration */
+	volatile uint32_t CONFIG;
+	/* 0x008: Target Status */
+	volatile uint32_t STATUS;
+	/* 0x00C: Target Control  */
+	volatile uint32_t CTRL;
+	/* 0x010: Target Interrupt Enable Set  */
+	volatile uint32_t INTSET;
+	/* 0x014: Target Interrupt Enable Clear */
+	volatile uint32_t INTCLR;
+	/* 0x018: Target Interrupt Masked */
+	volatile uint32_t INTMASKED;
+	/* 0x01C: Target Error and Warning */
+	volatile uint32_t ERRWARN;
+	/* 0x020: Target DMA Control */
+	volatile uint32_t DMACTRL;
+	/* 0x024-0x02B: reserved */
+	volatile uint32_t reserved0[2];
+	/* 0x02C: Target Data Control */
+	volatile uint32_t DATACTRL;
+	/* 0x030: Target Write Byte Data */
+	volatile uint32_t WDATAB;
+	/* 0x034: Target Write Byte Data as End */
+	volatile uint32_t WDATABE;
+	/* 0x038: Target Write Half-Word Data */
+	volatile uint32_t WDATAH;
+	/* 0x03C: Target Write Half-Word Data as End */
+	volatile uint32_t WDATAHE;
+	/* 0x040: Target Read Byte Data */
+	volatile uint32_t RDATAB;
+	/* 0x044: reserved */
+	volatile uint32_t reserved1;
+	/* 0x048: Target Read Half-Word Data */
+	volatile uint32_t RDATAH;
+	/* 0x04C-0x05B: reserved */
+	volatile uint32_t reserved2[4];
+	/* 0x05C: Target Capabilities 2 */
+	volatile uint32_t CCAPABILITIES2;
+	/* 0x060: Target Capabilities */
+	volatile uint32_t CCAPABILITIES;
+	/* 0x064: Target Dynamic Address */
+	volatile uint32_t DYNADDR;
+	/* 0x068: Target Maximum Limits */
+	volatile uint32_t MAXLIMITS;
+	/* 0x06C: Target Part Number */
+	volatile uint32_t PARTNO;
+	/* 0x070: Target ID Extension */
+	volatile uint32_t IDEXT;
+	/* 0x074: Target Vendor ID */
+	volatile uint32_t VENDORID;
+	/* 0x078: Target Timing Control Clock */
+	volatile uint32_t TCCLOCK;
+	/* 0x07C: Target Matching Address Index */
+	volatile uint32_t MSGLAST;
+	/* 0x080: reserved */
+	volatile uint32_t reserved3;
+	/* 0x084: Controller Control  */
+	volatile uint32_t MCTRL;
+	/* 0x088: Controller Status */
+	volatile uint32_t MSTATUS;
+	/* 0x08C: IBI Registry and Rules */
+	volatile uint32_t IBIRULES;
+	/* 0x090: Controller Interrupt Enable Set  */
+	volatile uint32_t MINTSET;
+	/* 0x094: Controller Interrupt Enable Clear */
+	volatile uint32_t MINTCLR;
+	/* 0x098: Controller Interrupt Masked */
+	volatile uint32_t MINTMASKED;
+	/* 0x09C: Controller Error and Warning */
+	volatile uint32_t MERRWARN;
+	/* 0x0A0: Controller DMA Control */
+	volatile uint32_t MDMACTRL;
+	/* 0x0A0-0x0AB: reserved */
+	volatile uint32_t reserved4[2];
+	/* 0x0AC: Controller Data Control */
+	volatile uint32_t MDATACTRL;
+	/* 0x0B0: Controller Write Byte Data */
+	volatile uint32_t MWDATAB;
+	/* 0x0B4: Controller Write Byte Data as End */
+	volatile uint32_t MWDATABE;
+	/* 0x0B8: Controller Write Half-Word Data */
+	volatile uint32_t MWDATAH;
+	/* 0x0BC: Controller Write Half-Word Data as End */
+	volatile uint32_t MWDATAHE;
+	/* 0x0C0: Controller Read Byte Data */
+	volatile uint32_t MRDATAB;
+	/* 0x0C4: reserved */
+	volatile uint32_t reserved5;
+	/* 0x0C8: Controller Read Half-Word Data */
+	volatile uint32_t MRDATAH;
+	/* 0x0CC-0x0D7: reserved */
+	volatile uint32_t reserved6[3];
+	/* 0x0D8: Start or Continue DDR Message */
+	volatile uint32_t MWMSG_DDR;
+	/* 0x0DC: Read DDR Message Data */
+	volatile uint32_t MRMSG_DDR;
+	/* 0x0E0: reserved */
+	volatile uint32_t reserved7;
+	/* 0x0E4: Controller Dynamic Address */
+	volatile uint32_t MDYNADDR;
+	/* 0x0E8-0x0FF reserved */
+	volatile uint32_t reserved8[6];
+	/* 0x100: Target Reset Recovery Time */
+	volatile uint32_t RSTACTTIME;
+	/* 0x104: reserved */
+	volatile uint32_t reserved9;
+	/* 0x108: Target HDR Command Byte */
+	volatile uint32_t HDRCMD;
+	/* 0x10C-0x113: reserved */
+	volatile uint32_t reserved10[2];
+	/* 0x114: Target Group Definition */
+	volatile uint32_t GROUPDEF;
+	/* 0x118: reserved */
+	volatile uint32_t reserved11;
+	/* 0x11C: Target Map Control 0 */
+	volatile uint32_t MAPCTRL0;
+	/* 0x120: Target Map Control 1 */
+	volatile uint32_t MAPCTRL1;
+	/* 0x124: Target Map Control 2 */
+	volatile uint32_t MAPCTRL2;
+	/* 0x128: Target Map Control 3 */
+	volatile uint32_t MAPCTRL3;
+	/* 0x12C: Target Map Control 4 */
+	volatile uint32_t MAPCTRL4;
+	/* 0x130: Target Map Control 5 */
+	volatile uint32_t MAPCTRL5;
+	/* 0x134: Target Map Control 6 */
+	volatile uint32_t MAPCTRL6;
+	/* 0x138: Target Map Control 7 */
+	volatile uint32_t MAPCTRL7;
+	/* 0x13C: Target Map Control 8 */
+	volatile uint32_t MAPCTRL8;
+	/* 0x140: Target Extended IBI Data 1 */
+	volatile uint32_t IBIEXT1;
+	/* 0x144: Target Extended IBI Data 2 */
+	volatile uint32_t IBIEXT2;
+};
+
+/* I3C controller register fields */
+#define NPCX_I3C_MCONFIG_CTRENA      FIELD(0, 2)
+#define NPCX_I3C_MCONFIG_DISTO       3
+#define NPCX_I3C_MCONFIG_HKEEP       FIELD(4, 2) /* Must be '11' */
+#define NPCX_I3C_MCONFIG_ODSTOP      6
+#define NPCX_I3C_MCONFIG_PPBAUD      FIELD(8, 4)
+#define NPCX_I3C_MCONFIG_PPLOW       FIELD(12, 4)
+#define NPCX_I3C_MCONFIG_ODBAUD      FIELD(16, 8)
+#define NPCX_I3C_MCONFIG_ODHPP       24
+#define NPCX_I3C_MCONFIG_SKEW        FIELD(25, 3)
+#define NPCX_I3C_MCONFIG_I2CBAUD     FIELD(28, 4)
+#define NPCX_I3C_MCTRL_REQUEST       FIELD(0, 3)
+#define NPCX_I3C_MCTRL_TYPE          FIELD(4, 2)
+#define NPCX_I3C_MCTRL_IBIRESP       FIELD(6, 2)
+#define NPCX_I3C_MCTRL_DIR           8
+#define NPCX_I3C_MCTRL_ADDR          FIELD(9, 7)
+#define NPCX_I3C_MCTRL_RDTERM        FIELD(16, 8)
+#define NPCX_I3C_MSTATUS_STATE       FIELD(0, 3)
+#define NPCX_I3C_MSTATUS_BETWEEN     4
+#define NPCX_I3C_MSTATUS_NACKED      5
+#define NPCX_I3C_MSTATUS_IBITYPE     FIELD(6, 2)
+#define NPCX_I3C_MSTATUS_TGTSTART    8
+#define NPCX_I3C_MSTATUS_MCTRLDONE   9
+#define NPCX_I3C_MSTATUS_COMPLETE    10
+#define NPCX_I3C_MSTATUS_RXPEND      11
+#define NPCX_I3C_MSTATUS_TXNOTFULL   12
+#define NPCX_I3C_MSTATUS_IBIWON      13
+#define NPCX_I3C_MSTATUS_ERRWARN     15
+#define NPCX_I3C_MSTATUS_NOWCNTLR    19
+#define NPCX_I3C_MSTATUS_IBIADDR     FIELD(24, 7)
+#define NPCX_I3C_IBIRULES_MSB0       30
+#define NPCX_I3C_IBIRULES_NOBYTE     31
+#define NPCX_I3C_MINTSET_TGTSTART    8
+#define NPCX_I3C_MINTSET_MCTRLDONE   9
+#define NPCX_I3C_MINTSET_COMPLETE    10
+#define NPCX_I3C_MINTSET_RXPEND      11
+#define NPCX_I3C_MINTSET_TXNOTFULL   12
+#define NPCX_I3C_MINTSET_IBIWON      13
+#define NPCX_I3C_MINTSET_ERRWARN     15
+#define NPCX_I3C_MINTSET_NOWCNTLR    19
+#define NPCX_I3C_MINTCLR_TGTSTART    8
+#define NPCX_I3C_MINTCLR_MCTRLDONE   9
+#define NPCX_I3C_MINTCLR_COMPLETE    10
+#define NPCX_I3C_MINTCLR_RXPEND      11
+#define NPCX_I3C_MINTCLR_TXNOTFULL   12
+#define NPCX_I3C_MINTCLR_IBIWON      13
+#define NPCX_I3C_MINTCLR_ERRWARN     15
+#define NPCX_I3C_MINTCLR_NOWCNTLR    19
+#define NPCX_I3C_MINTMASKED_NOWCNTLR 19
+#define NPCX_I3C_MDATACTRL_FLUSHTB   0
+#define NPCX_I3C_MDATACTRL_FLUSHFB   1
+#define NPCX_I3C_MDATACTRL_UNLOCK    3
+#define NPCX_I3C_MDATACTRL_TXTRIG    FIELD(4, 2)
+#define NPCX_I3C_MDATACTRL_RXTRIG    FIELD(6, 2)
+#define NPCX_I3C_MDATACTRL_TXCOUNT   FIELD(16, 5)
+#define NPCX_I3C_MDATACTRL_RXCOUNT   FIELD(24, 5)
+#define NPCX_I3C_MDATACTRL_TXFULL    30
+#define NPCX_I3C_MDATACTRL_RXEMPTY   31
+#define NPCX_I3C_MERRWARN_NACK       2
+#define NPCX_I3C_MERRWARN_WRABT      3
+#define NPCX_I3C_MERRWARN_TERM       4
+#define NPCX_I3C_MERRWARN_HPAR       9
+#define NPCX_I3C_MERRWARN_HCRC       10
+#define NPCX_I3C_MERRWARN_OREAD      16
+#define NPCX_I3C_MERRWARN_OWRITE     17
+#define NPCX_I3C_MERRWARN_MSGERR     18
+#define NPCX_I3C_MERRWARN_INVERQ     19
+#define NPCX_I3C_MERRWARN_TIMEOUT    20
+#define NPCX_I3C_MDMACTRL_DMAFB      FIELD(0, 2)
+#define NPCX_I3C_MDMACTRL_DMATB      FIELD(2, 2)
+
+/* I3C target register fields */
+#define NPCX_I3C_CONFIG_TGTENA          0
+#define NPCX_I3C_CONFIG_MATCHSS         2
+#define NPCX_I3C_CONFIG_S0IGNORE        3
+#define NPCX_I3C_CONFIG_IDRAND          8
+#define NPCX_I3C_CONFIG_OFFLINE         9
+#define NPCX_I3C_CONFIG_HDRCMD          FIELD(10, 2)
+#define NPCX_I3C_CONFIG_BAMATCH         FIELD(16, 7)
+#define NPCX_I3C_CONFIG_SADDR           FIELD(25, 7)
+#define NPCX_I3C_STATUS_STNOTSTOP       0
+#define NPCX_I3C_STATUS_STMSG           1
+#define NPCX_I3C_STATUS_STCCCH          2
+#define NPCX_I3C_STATUS_STREQRD         3
+#define NPCX_I3C_STATUS_STREQWR         4
+#define NPCX_I3C_STATUS_STDAA           5
+#define NPCX_I3C_STATUS_STHDR           6
+#define NPCX_I3C_STATUS_START           8
+#define NPCX_I3C_STATUS_MATCHED         9
+#define NPCX_I3C_STATUS_STOP            10
+#define NPCX_I3C_STATUS_RXPEND          11
+#define NPCX_I3C_STATUS_TXNOTFULL       12
+#define NPCX_I3C_STATUS_DACHG           13
+#define NPCX_I3C_STATUS_CCC             14
+#define NPCX_I3C_STATUS_ERRWARN         15
+#define NPCX_I3C_STATUS_HDRMATCH        16
+#define NPCX_I3C_STATUS_CHANDLED        17
+#define NPCX_I3C_STATUS_EVENT           18
+#define NPCX_I3C_STATUS_TGTRST          19
+#define NPCX_I3C_STATUS_EVDET           FIELD(20, 2)
+#define NPCX_I3C_STATUS_IBIDIS          24
+#define NPCX_I3C_STATUS_MRDIS           25
+#define NPCX_I3C_STATUS_HJDIS           27
+#define NPCX_I3C_STATUS_ACTSTATE        FIELD(28, 2)
+#define NPCX_I3C_STATUS_TIMECTRL        FIELD(30, 2)
+#define NPCX_I3C_CTRL_EVENT             FIELD(0, 2)
+#define NPCX_I3C_CTRL_EXTDATA           3
+#define NPCX_I3C_CTRL_MAPIDX            FIELD(4, 4)
+#define NPCX_I3C_CTRL_IBIDATA           FIELD(8, 8)
+#define NPCX_I3C_CTRL_PENDINT           FIELD(16, 4)
+#define NPCX_I3C_CTRL_ACTSTATE          FIELD(20, 2)
+#define NPCX_I3C_CTRL_VENDINFO          FIELD(24, 8)
+#define NPCX_I3C_INTSET_START           8
+#define NPCX_I3C_INTSET_MATCHED         9
+#define NPCX_I3C_INTSET_STOP            10
+#define NPCX_I3C_INTSET_RXPEND          11
+#define NPCX_I3C_INTSET_TXNOTFULL       12
+#define NPCX_I3C_INTSET_DACHG           13
+#define NPCX_I3C_INTSET_CCC             14
+#define NPCX_I3C_INTSET_ERRWARN         15
+#define NPCX_I3C_INTSET_HDRMATCH        16
+#define NPCX_I3C_INTSET_CHANDLED        17
+#define NPCX_I3C_INTSET_EVENT           18
+#define NPCX_I3C_INTSET_TGTRST          19
+#define NPCX_I3C_INTCLR_START           8
+#define NPCX_I3C_INTCLR_MATCHED         9
+#define NPCX_I3C_INTCLR_STOP            10
+#define NPCX_I3C_INTCLR_RXPEND          11
+#define NPCX_I3C_INTCLR_TXNOTFULL       12
+#define NPCX_I3C_INTCLR_DACHG           13
+#define NPCX_I3C_INTCLR_CCC             14
+#define NPCX_I3C_INTCLR_ERRWARN         15
+#define NPCX_I3C_INTCLR_HDRMATCH        16
+#define NPCX_I3C_INTCLR_CHANDLED        17
+#define NPCX_I3C_INTCLR_EVENT           18
+#define NPCX_I3C_INTCLR_TGTRST          19
+#define NPCX_I3C_INTMASKED_START        8
+#define NPCX_I3C_INTMASKED_MATCHED      9
+#define NPCX_I3C_INTMASKED_STOP         10
+#define NPCX_I3C_INTMASKED_RXPEND       11
+#define NPCX_I3C_INTMASKED_TXNOTFULL    12
+#define NPCX_I3C_INTMASKED_DACHG        13
+#define NPCX_I3C_INTMASKED_CCC          14
+#define NPCX_I3C_INTMASKED_ERRWARN      15
+#define NPCX_I3C_INTMASKED_HDRMATCH     16
+#define NPCX_I3C_INTMASKED_CHANDLED     17
+#define NPCX_I3C_INTMASKED_EVENT        18
+#define NPCX_I3C_INTMASKED_TGTRST       19
+#define NPCX_I3C_ERRWARN_ORUN           0
+#define NPCX_I3C_ERRWARN_URUN           1
+#define NPCX_I3C_ERRWARN_URUNNACK       2
+#define NPCX_I3C_ERRWARN_TERM           3
+#define NPCX_I3C_ERRWARN_INVSTART       4
+#define NPCX_I3C_ERRWARN_SPAR           8
+#define NPCX_I3C_ERRWARN_HPAR           9
+#define NPCX_I3C_ERRWARN_HCRC           10
+#define NPCX_I3C_ERRWARN_S0S1           11
+#define NPCX_I3C_ERRWARN_OREAD          16
+#define NPCX_I3C_ERRWARN_OWRITE         17
+#define NPCX_I3C_DMACTRL_DMAFB          FIELD(0, 2)
+#define NPCX_I3C_DMACTRL_DMATB          FIELD(2, 2)
+#define NPCX_I3C_DATACTRL_FLUSHTB       0
+#define NPCX_I3C_DATACTRL_FLUSHFB       1
+#define NPCX_I3C_DATACTRL_UNLOCK        3
+#define NPCX_I3C_DATACTRL_TXTRIG        FIELD(4, 2)
+#define NPCX_I3C_DATACTRL_RXTRIG        FIELD(6, 2)
+#define NPCX_I3C_DATACTRL_TXCOUNT       FIELD(16, 6)
+#define NPCX_I3C_DATACTRL_RXCOUNT       FIELD(24, 6)
+#define NPCX_I3C_DATACTRL_TXFULL        30
+#define NPCX_I3C_DATACTRL_RXEMPTY       31
+#define NPCX_I3C_WDATAB_DATA            FIELD(0, 8)
+#define NPCX_I3C_WDATAB_END_B           8
+#define NPCX_I3C_WDATAB_END_A           16
+#define NPCX_I3C_WDATABE_DATA           FIELD(0, 8)
+#define NPCX_I3C_WDATAH_DATA0           FIELD(0, 8)
+#define NPCX_I3C_WDATAH_DATA1           FIELD(8, 8)
+#define NPCX_I3C_WDATAH_END             16
+#define NPCX_I3C_WDATAHE_DATA0          FIELD(0, 8)
+#define NPCX_I3C_WDATAHE_DATA1          FIELD(8, 8)
+#define NPCX_I3C_RDATAB_DATA            FIELD(0, 8)
+#define NPCX_I3C_RDATAH_DATA0           FIELD(0, 8)
+#define NPCX_I3C_RDATAH_DATA1           FIELD(8, 8)
+#define NPCX_I3C_CAPABILITIES2_MAPCNT   FIELD(0, 4)
+#define NPCX_I3C_CAPABILITIES2_I2C10B   4
+#define NPCX_I3C_CAPABILITIES2_I2CRST   5
+#define NPCX_I3C_CAPABILITIES2_I2CDEVID 6
+#define NPCX_I3C_CAPABILITIES2_DATA32   7
+#define NPCX_I3C_CAPABILITIES2_IBIEXT   8
+#define NPCX_I3C_CAPABILITIES2_IBIXREG  9
+#define NPCX_I3C_CAPABILITIES2_SMLANE   FIELD(12, 2)
+#define NPCX_I3C_CAPABILITIES2_V1_1     16
+#define NPCX_I3C_CAPABILITIES2_TGTRST   17
+#define NPCX_I3C_CAPABILITIES2_GROUP    FIELD(18, 2)
+#define NPCX_I3C_CAPABILITIES2_AASA     21
+#define NPCX_I3C_CAPABILITIES2_SSTSUB   22
+#define NPCX_I3C_CAPABILITIES2_SSTWR    23
+#define NPCX_I3C_CAPABILITIES_IDENA     FIELD(0, 2)
+#define NPCX_I3C_CAPABILITIES_IDREG     FIELD(2, 4)
+#define NPCX_I3C_CAPABILITIES_HDRSUPP   FIELD(6, 3)
+#define NPCX_I3C_CAPABILITIES_CNTLR     9
+#define NPCX_I3C_CAPABILITIES_SADDR     FIELD(10, 2)
+#define NPCX_I3C_CAPABILITIES_CCCHANDLE FIELD(12, 4)
+#define NPCX_I3C_CAPABILITIES_IBI_MR_HJ FIELD(16, 5)
+#define NPCX_I3C_CAPABILITIES_TIMECTRL  21
+#define NPCX_I3C_CAPABILITIES_EXTFIFO   FIELD(23, 3)
+#define NPCX_I3C_CAPABILITIES_FIFOTX    FIELD(26, 2)
+#define NPCX_I3C_CAPABILITIES_FIFORX    FIELD(28, 2)
+#define NPCX_I3C_CAPABILITIES_INT       30
+#define NPCX_I3C_CAPABILITIES_DMA       31
+#define NPCX_I3C_DYNADDR_DAVALID        0
+#define NPCX_I3C_DYNADDR_DADDR          FIELD(1, 7)
+#define NPCX_I3C_DYNADDR_CAUSE          FIELD(8, 3)
+#define NPCX_I3C_MAXLIMITS_MAXRD        FIELD(0, 12)
+#define NPCX_I3C_MAXLIMITS_MAXWR        FIELD(16, 12)
+#define NPCX_I3C_IDEXT_DCR              FIELD(8, 8)
+#define NPCX_I3C_IDEXT_BCR              FIELD(16, 8)
+#define NPCX_I3C_VENDORID_VID           FIELD(0, 15)
+#define NPCX_I3C_TCCLOCK_ACCURACY       FIELD(0, 8)
+#define NPCX_I3C_TCCLOCK_FREQ           FIELD(8, 8)
+#define NPCX_I3C_MSGLAST_MAPLAST        FIELD(0, 4)
+#define NPCX_I3C_MSGLAST_LASTSTATIC     4
+#define NPCX_I3C_MSGLAST_LASTGROUP      5
+#define NPCX_I3C_MSGLAST_LASTMODE       FIELD(6, 2)
+#define NPCX_I3C_MSGLAST_MAPLASTM1      FIELD(8, 4)
+#define NPCX_I3C_MSGLAST_LASTGROUPM1    13
+#define NPCX_I3C_MSGLAST_LASTMODE1      FIELD(14, 2)
+#define NPCX_I3C_MSGLAST_MAPLASTM2      FIELD(16, 4)
+#define NPCX_I3C_MSGLAST_LASTGROUPM2    21
+#define NPCX_I3C_MSGLAST_LASTMODE2      FIELD(22, 2)
+#define NPCX_I3C_RSTACTTIME_PERRSTTIM   FIELD(0, 8)
+#define NPCX_I3C_RSTACTTIME_SYSRSTTIM   FIELD(8, 8)
+#define NPCX_I3C_HDRCMD_CMD0            FIELD(0, 8)
+#define NPCX_I3C_HDRCMD_OVFL            30
+#define NPCX_I3C_HDRCMD_NEWCMD          31
+#define NPCX_I3C_GROUPDEF_GRP0ENA       0
+#define NPCX_I3C_GROUPDEF_GRP0DA        FIELD(1, 7)
+#define NPCX_I3C_GROUPDEF_GRP1ENA       8
+#define NPCX_I3C_GROUPDEF_GRP1DA        FIELD(9, 7)
+#define NPCX_I3C_GROUPDEF_GRP2ENA       16
+#define NPCX_I3C_GROUPDEF_GRP2DA        FIELD(17, 7)
+#define NPCX_I3C_MAPCTRL0_ENA           0
+#define NPCX_I3C_MAPCTRL0_DA            FIELD(1, 7)
+#define NPCX_I3C_MAPCTRL0_CAUSE         FIELD(8, 3)
+#define NPCX_I3C_MAPCTRLn_ENA           0
+#define NPCX_I3C_MAPCTRLn_ADDR          FIELD(1, 7)
+#define NPCX_I3C_MAPCTRLn_MAPSA         8
+#define NPCX_I3C_MAPCTRLn_NACK          12
+#define NPCX_I3C_MAPCTRLn_AUTO          13
+#define NPCX_I3C_MAPCTRLn_SLOT_PID      FIELD(14, 5)
+#define NPCX_I3C_IBIEXT1_CNT            FIELD(0, 3)
+#define NPCX_I3C_IBIEXT1_EXT1           FIELD(8, 8)
+#define NPCX_I3C_IBIEXT1_EXT2           FIELD(16, 8)
+#define NPCX_I3C_IBIEXT1_EXT3           FIELD(24, 8)
+#define NPCX_I3C_IBIEXT2_EXT4           FIELD(0, 8)
+#define NPCX_I3C_IBIEXT2_EXT5           FIELD(8, 8)
+#define NPCX_I3C_IBIEXT2_EXT6           FIELD(16, 8)
+#define NPCX_I3C_IBIEXT2_EXT7           FIELD(24, 8)
+
+/* MDMA Controller registers */
+struct mdma_reg {
+	/* Channel 0 */
+	/* 0x000: Channel 0 Control */
+	volatile uint32_t MDMA_CTL0;
+	/* 0x004: Channel 0 Source Base Address */
+	volatile uint32_t MDMA_SRCB0;
+	/* 0x008: Channel 0 Destination Base Address */
+	volatile uint32_t MDMA_DSTB0;
+	/* 0x00C: Channel 0 Transfer Count */
+	volatile uint32_t MDMA_TCNT0;
+	/* 0x010: reserved1 */
+	volatile uint32_t reserved1;
+	/* 0x014: Channel 0 Current Destination */
+	volatile uint32_t MDMA_CDST0;
+	/* 0x018: Channel 0 Current Transfer Count */
+	volatile uint32_t MDMA_CTCNT0;
+	/* 0x01C: reserved2 */
+	volatile uint32_t reserved2;
+
+	/* Channel 1 */
+	/* 0x020: Channel 1 Control */
+	volatile uint32_t MDMA_CTL1;
+	/* 0x024: Channel 1 Source Base Address */
+	volatile uint32_t MDMA_SRCB1;
+	/* 0x028: Channel 1 Destination Base Address */
+	volatile uint32_t MDMA_DSTB1;
+	/* 0x02C: Channel 1 Transfer Count */
+	volatile uint32_t MDMA_TCNT1;
+	/* 0x030: Channel 1 Current Source */
+	volatile uint32_t MDMA_CSRC1;
+	/* 0x034: reserved3 */
+	volatile uint32_t reserved3;
+	/* 0x038: Channel 1 Current Transfer Count */
+	volatile uint32_t MDMA_CTCNT1;
+};
+
+/* MDMA register fields */
+#define NPCX_MDMA_CTL_MDMAEN 0
+#define NPCX_MDMA_CTL_MPD    1
+#define NPCX_MDMA_CTL_SIEN   8
+#define NPCX_MDMA_CTL_MPS    14
+#define NPCX_MDMA_CTL_TC     18
+
+/* Channel 0/1 Transfer Count Register (MDMA_TCNT0/MDMA_TCNT1) */
+#define NPCX_MDMA_TCNT_TFR_CNT FIELD(0, 13)
+
+/* Channel 0/1 Current Transfer Count Register (MDMA_CTCNT0/MDMA_CTCNT1) */
+#define NPCX_MDMA_CTCNT_CURRENT_TFR_CNT FIELD(0, 13)
+
+#endif /* _NUVOTON_NPCX_REG_DEF_H */
diff --git a/soc/nuvoton/npcx/common/registers.c b/soc/nuvoton/npcx/common/npcxn/registers.c
similarity index 99%
rename from soc/nuvoton/npcx/common/registers.c
rename to soc/nuvoton/npcx/common/npcxn/registers.c
index e54775bc64795..5483fc978b928 100644
--- a/soc/nuvoton/npcx/common/registers.c
+++ b/soc/nuvoton/npcx/common/npcxn/registers.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/device.h>
 #include <soc.h>
+#include "reg_def.h"
 
 /* CDCG register structure check */
 NPCX_REG_SIZE_CHECK(cdcg_reg, 0x116);
diff --git a/soc/nuvoton/npcx/common/power.c b/soc/nuvoton/npcx/common/power.c
index ea36d4b37f7d6..8c909a50fb979 100644
--- a/soc/nuvoton/npcx/common/power.c
+++ b/soc/nuvoton/npcx/common/power.c
@@ -199,7 +199,7 @@ static void npcx_power_enter_system_sleep(int slp_mode, int wk_mode)
 }
 
 /* Invoke when enter "Suspend/Low Power" mode. */
-void pm_state_set(enum pm_state state, uint8_t substate_id)
+__weak void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
 	if (state != PM_STATE_SUSPEND_TO_IDLE) {
 		LOG_DBG("Unsupported power state %u", state);
@@ -228,7 +228,7 @@ void pm_state_set(enum pm_state state, uint8_t substate_id)
 }
 
 /* Handle soc specific activity after exiting "Suspend/Low Power" mode. */
-void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
+__weak void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 {
 	if (state != PM_STATE_SUSPEND_TO_IDLE) {
 		LOG_DBG("Unsupported power state %u", state);
diff --git a/soc/nuvoton/npcx/common/reg/reg_access.h b/soc/nuvoton/npcx/common/reg/reg_access.h
deleted file mode 100644
index b779b98fa2a62..0000000000000
--- a/soc/nuvoton/npcx/common/reg/reg_access.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020 Nuvoton Technology Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NUVOTON_NPCX_REG_ACCESS_H
-#define _NUVOTON_NPCX_REG_ACCESS_H
-
-/*
- * NPCX register bit/field access operations
- */
-
-#define GET_POS_FIELD(pos, size)    pos
-#define GET_SIZE_FIELD(pos, size)   size
-#define FIELD_POS(field)            GET_POS_##field
-#define FIELD_SIZE(field)           GET_SIZE_##field
-
-#define GET_FIELD(reg, field) \
-	_GET_FIELD_(reg, FIELD_POS(field), FIELD_SIZE(field))
-#define _GET_FIELD_(reg, f_pos, f_size) (((reg)>>(f_pos)) & ((1<<(f_size))-1))
-
-#define SET_FIELD(reg, field, value) \
-	_SET_FIELD_(reg, FIELD_POS(field), FIELD_SIZE(field), value)
-#define _SET_FIELD_(reg, f_pos, f_size, value) \
-	((reg) = ((reg) & (~(((1 << (f_size))-1) << (f_pos)))) \
-			| ((value) << (f_pos)))
-
-#define GET_FIELD_POS(field) \
-	_GET_FIELD_POS_(FIELD_POS(field))
-#define _GET_FIELD_POS_(f_ops) f_ops
-
-#define GET_FIELD_SZ(field) \
-	_GET_FIELD_SZ_(FIELD_SIZE(field))
-#define _GET_FIELD_SZ_(f_ops) f_ops
-
-#endif /* _NUVOTON_NPCX_REG_ACCESS_H */
diff --git a/soc/nuvoton/npcx/common/reg/reg_def.h b/soc/nuvoton/npcx/common/reg/reg_def.h
deleted file mode 100644
index b35089f65b6ba..0000000000000
--- a/soc/nuvoton/npcx/common/reg/reg_def.h
+++ /dev/null
@@ -1,2252 +0,0 @@
-/*
- * Copyright (c) 2020 Nuvoton Technology Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _NUVOTON_NPCX_REG_DEF_H
-#define _NUVOTON_NPCX_REG_DEF_H
-
-#include <stdint.h>
-
-#include <zephyr/devicetree.h>
-#include <zephyr/sys/__assert.h>
-#include <zephyr/sys/util_macro.h>
-#include <zephyr/toolchain.h>
-
-/*
- * NPCX register structure size/offset checking macro function to mitigate
- * the risk of unexpected compiling results. All addresses of NPCX registers
- * must meet the alignment requirement of cortex-m4.
- * DO NOT use 'packed' attribute if module contains different length ie.
- * 8/16/32 bits registers.
- */
-#define NPCX_REG_SIZE_CHECK(reg_def, size) \
-	BUILD_ASSERT(sizeof(struct reg_def) == size, \
-		"Failed in size check of register structure!")
-#define NPCX_REG_OFFSET_CHECK(reg_def, member, offset) \
-	BUILD_ASSERT(offsetof(struct reg_def, member) == offset, \
-		"Failed in offset check of register structure member!")
-
-/*
- * NPCX register access checking via structure macro function to mitigate the
- * risk of unexpected compiling results if module contains different length
- * registers. For example, a word register access might break into two byte
- * register accesses by adding 'packed' attribute.
- *
- * For example, add this macro for word register 'PRSC' of PWM module in its
- * device init function for checking violation. Once it occurred, core will be
- * stalled forever and easy to find out what happens.
- */
-#define NPCX_REG_WORD_ACCESS_CHECK(reg, val) { \
-		uint16_t placeholder = reg; \
-		reg = val; \
-		__ASSERT(reg == val, "16-bit reg access failed!"); \
-		reg = placeholder; \
-	}
-#define NPCX_REG_DWORD_ACCESS_CHECK(reg, val) { \
-		uint32_t placeholder = reg; \
-		reg = val; \
-		__ASSERT(reg == val, "32-bit reg access failed!"); \
-		reg = placeholder; \
-	}
-/*
- * Core Domain Clock Generator (CDCG) device registers
- */
-struct cdcg_reg {
-	/* High Frequency Clock Generator (HFCG) registers */
-	/* 0x000: HFCG Control */
-	volatile uint8_t HFCGCTRL;
-	volatile uint8_t reserved1;
-	/* 0x002: HFCG M Low Byte Value */
-	volatile uint8_t HFCGML;
-	volatile uint8_t reserved2;
-	/* 0x004: HFCG M High Byte Value */
-	volatile uint8_t HFCGMH;
-	volatile uint8_t reserved3;
-	/* 0x006: HFCG N Value */
-	volatile uint8_t HFCGN;
-	volatile uint8_t reserved4;
-	/* 0x008: HFCG Prescaler */
-	volatile uint8_t HFCGP;
-	volatile uint8_t reserved5[7];
-	/* 0x010: HFCG Bus Clock Dividers */
-	volatile uint8_t HFCBCD;
-	volatile uint8_t reserved6;
-	/* 0x012: HFCG Bus Clock Dividers */
-	volatile uint8_t HFCBCD1;
-	volatile uint8_t reserved7;
-	/* 0x014: HFCG Bus Clock Dividers */
-	volatile uint8_t HFCBCD2;
-	volatile uint8_t reserved12[8];
-	/* 0x01d: HFCG Bus Clock Dividers */
-	volatile uint8_t HFCBCD3;
-	volatile uint8_t reserved8[226];
-
-	/* Low Frequency Clock Generator (LFCG) registers */
-	/* 0x100: LFCG Control */
-	volatile uint8_t  LFCGCTL;
-	volatile uint8_t reserved9;
-	/* 0x102: High-Frequency Reference Divisor I */
-	volatile uint16_t HFRDI;
-	/* 0x104: High-Frequency Reference Divisor F */
-	volatile uint16_t HFRDF;
-	/* 0x106: FRCLK Clock Divisor */
-	volatile uint16_t FRCDIV;
-	/* 0x108: Divisor Correction Value 1 */
-	volatile uint16_t DIVCOR1;
-	/* 0x10A: Divisor Correction Value 2 */
-	volatile uint16_t DIVCOR2;
-	volatile uint8_t reserved10[8];
-	/* 0x114: LFCG Control 2 */
-	volatile uint8_t  LFCGCTL2;
-	volatile uint8_t  reserved11;
-};
-
-/* CDCG register fields */
-#define NPCX_HFCGCTRL_LOAD                    0
-#define NPCX_HFCGCTRL_LOCK                    2
-#define NPCX_HFCGCTRL_CLK_CHNG                7
-
-#define NPCX_LFCGCTL2_XT_OSC_SL_EN            6
-
-/*
- * Power Management Controller (PMC) device registers
- */
-struct pmc_reg {
-	/* 0x000: Power Management Controller */
-	volatile uint8_t PMCSR;
-	volatile uint8_t reserved1[2];
-	/* 0x003: Enable in Sleep Control */
-	volatile uint8_t ENIDL_CTL;
-	/* 0x004: Disable in Idle Control */
-	volatile uint8_t DISIDL_CTL;
-	/* 0x005: Disable in Idle Control 1 */
-	volatile uint8_t DISIDL_CTL1;
-	volatile uint8_t reserved2[2];
-	/* 0x008 - 0D: Power-Down Control 1 - 6 */
-	volatile uint8_t PWDWN_CTL1[6];
-	volatile uint8_t reserved3[18];
-	/* 0x020 - 21: Power-Down Control 1 - 2 */
-	volatile uint8_t RAM_PD[2];
-	volatile uint8_t reserved4[2];
-	/* 0x024: Power-Down Control 7 */
-	volatile uint8_t PWDWN_CTL7[1];
-};
-
-/* PMC internal inline functions for multi-registers */
-static inline uint32_t npcx_pwdwn_ctl_offset(uint32_t ctl_no)
-{
-	if (ctl_no < 6) {
-		return 0x008 + ctl_no;
-	} else {
-		return 0x024 + ctl_no - 6;
-	}
-}
-
-/* Macro functions for PMC multi-registers */
-#define NPCX_PWDWN_CTL(base, n) (*(volatile uint8_t *)(base + \
-						npcx_pwdwn_ctl_offset(n)))
-
-/* PMC register fields */
-#define NPCX_PMCSR_DI_INSTW                   0
-#define NPCX_PMCSR_DHF                        1
-#define NPCX_PMCSR_IDLE                       2
-#define NPCX_PMCSR_NWBI                       3
-#define NPCX_PMCSR_OHFC                       6
-#define NPCX_PMCSR_OLFC                       7
-#define NPCX_DISIDL_CTL_RAM_DID               5
-#define NPCX_ENIDL_CTL_ADC_LFSL               7
-#define NPCX_ENIDL_CTL_LP_WK_CTL              6
-#define NPCX_ENIDL_CTL_PECI_ENI               2
-#define NPCX_ENIDL_CTL_ADC_ACC_DIS            1
-
-/* Macro functions for Development and Debugger Interface (DDI) registers */
-#define NPCX_DBGCTRL(base)   (*(volatile uint8_t *)(base + 0x004))
-#define NPCX_DBGFRZEN1(base) (*(volatile uint8_t *)(base + 0x006))
-#define NPCX_DBGFRZEN2(base) (*(volatile uint8_t *)(base + 0x007))
-#define NPCX_DBGFRZEN3(base) (*(volatile uint8_t *)(base + 0x008))
-#define NPCX_DBGFRZEN4(base) (*(volatile uint8_t *)(base + 0x009))
-
-/* DDI register fields */
-#define NPCX_DBGCTRL_CCDEV_SEL		FIELD(6, 2)
-#define NPCX_DBGCTRL_CCDEV_DIR		5
-#define NPCX_DBGCTRL_SEQ_WK_EN		4
-#define NPCX_DBGCTRL_FRCLK_SEL_DIS	3
-#define NPCX_DBGFRZEN1_SPIFEN		7
-#define NPCX_DBGFRZEN1_HIFEN		6
-#define NPCX_DBGFRZEN1_ESPISEN		5
-#define NPCX_DBGFRZEN1_UART1FEN		4
-#define NPCX_DBGFRZEN1_SMB3FEN		3
-#define NPCX_DBGFRZEN1_SMB2FEN		2
-#define NPCX_DBGFRZEN1_MFT2FEN		1
-#define NPCX_DBGFRZEN1_MFT1FEN		0
-#define NPCX_DBGFRZEN2_ITIM6FEN		7
-#define NPCX_DBGFRZEN2_ITIM5FEN		6
-#define NPCX_DBGFRZEN2_ITIM4FEN		5
-#define NPCX_DBGFRZEN2_ITIM64FEN	3
-#define NPCX_DBGFRZEN2_SMB1FEN		2
-#define NPCX_DBGFRZEN2_SMB0FEN		1
-#define NPCX_DBGFRZEN2_MFT3FEN		0
-#define NPCX_DBGFRZEN3_GLBL_FRZ_DIS	7
-#define NPCX_DBGFRZEN3_ITIM3FEN		6
-#define NPCX_DBGFRZEN3_ITIM2FEN		5
-#define NPCX_DBGFRZEN3_ITIM1FEN		4
-#define NPCX_DBGFRZEN3_I3CFEN		2
-#define NPCX_DBGFRZEN3_SMB4FEN		1
-#define NPCX_DBGFRZEN3_SHMFEN		0
-#define NPCX_DBGFRZEN4_UART2FEN		6
-#define NPCX_DBGFRZEN4_UART3FEN		5
-#define NPCX_DBGFRZEN4_UART4FEN		4
-#define NPCX_DBGFRZEN4_LCTFEN		3
-#define NPCX_DBGFRZEN4_SMB7FEN		2
-#define NPCX_DBGFRZEN4_SMB6FEN		1
-#define NPCX_DBGFRZEN4_SMB5FEN		0
-
-/*
- * System Configuration (SCFG) device registers
- */
-struct scfg_reg {
-	/* 0x000: Device Control */
-	volatile uint8_t DEVCNT;
-	/* 0x001: Straps Status */
-	volatile uint8_t STRPST;
-	/* 0x002: Reset Control and Status */
-	volatile uint8_t RSTCTL;
-	volatile uint8_t reserved1;
-	/* 0x004: Device Control 3*/
-	volatile uint8_t DEV_CTL3;
-	volatile uint8_t reserved2;
-	/* 0x006: Device Control 4 */
-	volatile uint8_t DEV_CTL4;
-	volatile uint8_t reserved3[9];
-	/* 0x010 - 1F: Device Alternate Function 0 - F */
-	volatile uint8_t DEVALT0[16];
-	volatile uint8_t reserved4[6];
-	/* 0x026: Low-Voltage GPIO Pins Control 5 */
-	volatile uint8_t LV_GPIO_CTL5[1];
-	volatile uint8_t reserved5;
-	/* 0x028: Pull-Up/Pull-Down Enable 0 */
-	volatile uint8_t PUPD_EN0;
-	/* 0x029: Pull-Up/Pull-Down Enable 1 */
-	volatile uint8_t PUPD_EN1;
-	/* 0x02A - 2E: Low-Voltage GPIO Pins Control 0 - 4 */
-	volatile uint8_t LV_GPIO_CTL0[5];
-};
-
-/* Macro functions for SCFG multi-registers */
-#define NPCX_DEV_CTL(base, n) \
-	(*(volatile uint8_t *)(base + n))
-#define NPCX_DEVALT(base, n) \
-	(*(volatile uint8_t *)(base + NPCX_DEVALT_OFFSET(n)))
-#define NPCX_DEVALT_LK(base, n) \
-	(*(volatile uint8_t *)(base + NPCX_DEVALT_LK_OFFSET(n)))
-#define NPCX_PUPD_EN(base, n) \
-	(*(volatile uint8_t *)(base + NPCX_PUPD_EN_OFFSET(n)))
-#define NPCX_LV_GPIO_CTL(base, n) \
-	(*(volatile uint8_t *)(base + NPCX_LV_GPIO_CTL_OFFSET(n)))
-
-#define NPCX_JEN_CTL1_OFFSET 0x120
-#define NPCX_JEN_CTL1(base) (*(volatile uint8_t *)(base + (NPCX_JEN_CTL1_OFFSET)))
-
-#define NPCX_JEN_CTL1_JEN_EN       FIELD(0, 4)
-#define NPCX_JEN_CTL1_JEN_HEN      FIELD(4, 4)
-#define NPCX_JEN_CTL1_JEN_ENABLE   0x9
-#define NPCX_JEN_CTL1_JEN_DISABLE  0x6
-
-/* SCFG register fields */
-#define NPCX_DEVCNT_F_SPI_TRIS                6
-#define NPCX_DEVCNT_HIF_TYP_SEL_FIELD         FIELD(2, 2)
-#define NPCX_DEVCNT_JEN1_HEN                  5
-#define NPCX_DEVCNT_JEN0_HEN                  4
-#define NPCX_STRPST_TRIST                     1
-#define NPCX_STRPST_TEST                      2
-#define NPCX_STRPST_JEN1                      4
-#define NPCX_STRPST_JEN0                      5
-#define NPCX_STRPST_SPI_COMP                  7
-#define NPCX_RSTCTL_VCC1_RST_STS              0
-#define NPCX_RSTCTL_DBGRST_STS                1
-#define NPCX_RSTCTL_VCC1_RST_SCRATCH          3
-#define NPCX_RSTCTL_LRESET_PLTRST_MODE        5
-#define NPCX_RSTCTL_HIPRST_MODE               6
-#define NPCX_DEV_CTL3_RNGINT_MD               1
-#define NPCX_DEV_CTL3_FVCC1_PURST_EN          2
-#define NPCX_DEV_CTL3_I3C1_MS                 3
-#define NPCX_DEV_CTL3_I3C2_MS                 4
-#define NPCX_DEV_CTL3_I3C3_MS                 5
-#define NPCX_DEV_CTL3_SIO_CLK_SEL             FIELD(6, 2)
-#define NPCX_DEV_CTL4_F_SPI_SLLK              2
-#define NPCX_DEV_CTL4_SPI_SP_SEL              4
-#define NPCX_DEV_CTL4_WP_IF                   5
-#define NPCX_DEV_CTL4_VCC1_RST_LK             6
-#define NPCX_DEVPU0_I2C0_0_PUE                0
-#define NPCX_DEVPU0_I2C0_1_PUE                1
-#define NPCX_DEVPU0_I2C1_0_PUE                2
-#define NPCX_DEVPU0_I2C2_0_PUE                4
-#define NPCX_DEVPU0_I2C3_0_PUE                6
-#define NPCX_DEVPU1_F_SPI_PUD_EN              7
-
-#if defined(CONFIG_SOC_SERIES_NPCX4)
-/* I3C module controller, target mode for the MDMA module operation */
-#define NPCX_DEV_CTL3_I3C_MODE_BIT(inst_id) BIT(inst_id + 3)
-#endif /* End of CONFIG_SOC_SERIES_NPCX4 */
-
-/* Supported host interface type for HIF_TYP_SEL FILED in DEVCNT register. */
-enum npcx_hif_type {
-	NPCX_HIF_TYPE_NONE,
-	NPCX_HIF_TYPE_LPC,
-	NPCX_HIF_TYPE_ESPI_SHI,
-};
-
-/* Supported VOSCCLK frequency for SIO_CLK_SEL FILED in DEV_CTL3 register. */
-enum npcx_voscclk_type {
-	NPCX_VOSCCLK_96MHz,
-	NPCX_VOSCCLK_100MHz,
-	NPCX_VOSCCLK_120MHz,
-	NPCX_VOSCCLK_90MHz,
-};
-
-/*
- * System Glue (GLUE) device registers
- */
-struct glue_reg {
-	volatile uint8_t reserved1[2];
-	/* 0x002: SMBus Start Bit Detection */
-	volatile uint8_t SMB_SBD;
-	/* 0x003: SMBus Event Enable */
-	volatile uint8_t SMB_EEN;
-	volatile uint8_t reserved2[12];
-	/* 0x010: Simple Debug Port Data 0 */
-	volatile uint8_t SDPD0;
-	volatile uint8_t reserved3;
-	/* 0x012: Simple Debug Port Data 1 */
-	volatile uint8_t SDPD1;
-	volatile uint8_t reserved4;
-	/* 0x014: Simple Debug Port Control and Status */
-	volatile uint8_t SDP_CTS;
-	volatile uint8_t reserved5[12];
-	/* 0x021: SMBus Bus Select */
-	volatile uint8_t SMB_SEL;
-	volatile uint8_t reserved6[5];
-	/* 0x027: PSL Control and Status */
-	volatile uint8_t PSL_CTS;
-};
-
-/* GLUE register fields */
-/* PSL input detection mode is configured by bits 7:4 of PSL_CTS */
-#define NPCX_PSL_CTS_MODE_BIT(bit) BIT(bit + 4)
-/* PSL input assertion events are reported by bits 3:0 of PSL_CTS */
-#define NPCX_PSL_CTS_EVENT_BIT(bit) BIT(bit)
-
-/*
- * Universal Asynchronous Receiver-Transmitter (UART) device registers
- */
-struct uart_reg {
-	/* 0x000: Transmit Data Buffer */
-	volatile uint8_t UTBUF;
-	volatile uint8_t reserved1;
-	/* 0x002: Receive Data Buffer */
-	volatile uint8_t URBUF;
-	volatile uint8_t reserved2;
-	/* 0x004: Interrupt Control */
-	volatile uint8_t UICTRL;
-	volatile uint8_t reserved3;
-	/* 0x006: Status */
-	volatile uint8_t USTAT;
-	volatile uint8_t reserved4;
-	/* 0x008: Frame Select */
-	volatile uint8_t UFRS;
-	volatile uint8_t reserved5;
-	/* 0x00A: Mode Select */
-	volatile uint8_t UMDSL;
-	volatile uint8_t reserved6;
-	/* 0x00C: Baud Rate Divisor */
-	volatile uint8_t UBAUD;
-	volatile uint8_t reserved7;
-	/* 0x00E: Baud Rate Prescaler */
-	volatile uint8_t UPSR;
-	volatile uint8_t reserved8[17];
-	/* 0x020: FIFO Mode Transmit Status */
-	volatile uint8_t UFTSTS;
-	volatile uint8_t reserved9;
-	/* 0x022: FIFO Mode Receive Status */
-	volatile uint8_t UFRSTS;
-	volatile uint8_t reserved10;
-	/* 0x024: FIFO Mode Transmit Control */
-	volatile uint8_t UFTCTL;
-	volatile uint8_t reserved11;
-	/* 0x026: FIFO Mode Receive Control */
-	volatile uint8_t UFRCTL;
-};
-
-/* UART register fields */
-#define NPCX_UICTRL_TBE                       0
-#define NPCX_UICTRL_RBF                       1
-#define NPCX_UICTRL_ETI                       5
-#define NPCX_UICTRL_ERI                       6
-#define NPCX_UICTRL_EEI                       7
-#define NPCX_USTAT_PE                         0
-#define NPCX_USTAT_FE                         1
-#define NPCX_USTAT_DOE                        2
-#define NPCX_USTAT_ERR                        3
-#define NPCX_USTAT_BKD                        4
-#define NPCX_USTAT_RB9                        5
-#define NPCX_USTAT_XMIP                       6
-#define NPCX_UFRS_CHAR_FIELD                  FIELD(0, 2)
-#define NPCX_UFRS_STP                         2
-#define NPCX_UFRS_XB9                         3
-#define NPCX_UFRS_PSEL_FIELD                  FIELD(4, 2)
-#define NPCX_UFRS_PEN                         6
-#define NPCX_UMDSL_FIFO_MD                    0
-#define NPCX_UMDSL_ETD                        4
-#define NPCX_UMDSL_ERD                        5
-
-#define NPCX_UFTSTS_TEMPTY_LVL                FIELD(0, 5)
-#define NPCX_UFTSTS_TEMPTY_LVL_STS            5
-#define NPCX_UFTSTS_TFIFO_EMPTY_STS           6
-#define NPCX_UFTSTS_NXMIP                     7
-#define NPCX_UFRSTS_RFULL_LVL_STS             5
-#define NPCX_UFRSTS_RFIFO_NEMPTY_STS          6
-#define NPCX_UFRSTS_ERR                       7
-#define NPCX_UFTCTL_TEMPTY_LVL_SEL            FIELD(0, 5)
-#define NPCX_UFTCTL_TEMPTY_LVL_EN             5
-#define NPCX_UFTCTL_TEMPTY_EN                 6
-#define NPCX_UFTCTL_NXMIP_EN                  7
-#define NPCX_UFRCTL_RFULL_LVL_SEL             FIELD(0, 5)
-#define NPCX_UFRCTL_RFULL_LVL_EN              5
-#define NPCX_UFRCTL_RNEMPTY_EN                6
-#define NPCX_UFRCTL_ERR_EN                    7
-
-/* Macro functions for MIWU multi-registers */
-#define NPCX_WKEDG(base, group) \
-	(*(volatile uint8_t *)(base +  NPCX_WKEDG_OFFSET(group)))
-#define NPCX_WKAEDG(base, group) \
-	(*(volatile uint8_t *)(base + NPCX_WKAEDG_OFFSET(group)))
-#define NPCX_WKPND(base, group) \
-	(*(volatile uint8_t *)(base + NPCX_WKPND_OFFSET(group)))
-#define NPCX_WKPCL(base, group) \
-	(*(volatile uint8_t *)(base + NPCX_WKPCL_OFFSET(group)))
-#define NPCX_WKEN(base, group) \
-	(*(volatile uint8_t *)(base + NPCX_WKEN_OFFSET(group)))
-#define NPCX_WKINEN(base, group) \
-	(*(volatile uint8_t *)(base + NPCX_WKINEN_OFFSET(group)))
-#define NPCX_WKMOD(base, group) \
-	(*(volatile uint8_t *)(base + NPCX_WKMOD_OFFSET(group)))
-#define NPCX_WKST(base, group) \
-	(*(volatile uint8_t *)(base + NPCX_WKST_OFFSET(group)))
-
-/*
- * General-Purpose I/O (GPIO) device registers
- */
-struct gpio_reg {
-	/* 0x000: Port GPIOx Data Out */
-	volatile uint8_t PDOUT;
-	/* 0x001: Port GPIOx Data In */
-	volatile uint8_t PDIN;
-	/* 0x002: Port GPIOx Direction */
-	volatile uint8_t PDIR;
-	/* 0x003: Port GPIOx Pull-Up or Pull-Down Enable */
-	volatile uint8_t PPULL;
-	/* 0x004: Port GPIOx Pull-Up/Down Selection */
-	volatile uint8_t PPUD;
-	/* 0x005: Port GPIOx Drive Enable by VDD Present */
-	volatile uint8_t PENVDD;
-	/* 0x006: Port GPIOx Output Type */
-	volatile uint8_t PTYPE;
-	/* 0x007: Port GPIOx Lock Control */
-	volatile uint8_t PLOCK_CTL;
-};
-
-/*
- * Pulse Width Modulator (PWM) device registers
- */
-struct pwm_reg {
-	/* 0x000: Clock Prescaler */
-	volatile uint16_t PRSC;
-	/* 0x002: Cycle Time */
-	volatile uint16_t CTR;
-	/* 0x004: PWM Control */
-	volatile uint8_t PWMCTL;
-	volatile uint8_t reserved1;
-	/* 0x006: Duty Cycle */
-	volatile uint16_t DCR;
-	volatile uint8_t reserved2[4];
-	/* 0x00C: PWM Control Extended */
-	volatile uint8_t PWMCTLEX;
-	volatile uint8_t reserved3;
-};
-
-/* PWM register fields */
-#define NPCX_PWMCTL_INVP                      0
-#define NPCX_PWMCTL_CKSEL                     1
-#define NPCX_PWMCTL_HB_DC_CTL_FIELD           FIELD(2, 2)
-#define NPCX_PWMCTL_PWR                       7
-#define NPCX_PWMCTLEX_FCK_SEL_FIELD           FIELD(4, 2)
-#define NPCX_PWMCTLEX_OD_OUT                  7
-
-/*
- * Analog-To-Digital Converter (ADC) device registers
- */
-struct adc_reg {
-	/* 0x000: ADC Status */
-	volatile uint16_t ADCSTS;
-	/* 0x002: ADC Configuration */
-	volatile uint16_t ADCCNF;
-	/* 0x004: ADC Timing Control */
-	volatile uint16_t ATCTL;
-	/* 0x006: ADC Single Channel Address */
-	volatile uint16_t ASCADD;
-	/* 0x008: ADC Scan Channels Select */
-	volatile uint16_t ADCCS;
-	/* 0x00A: ADC Scan Channels Select 2 */
-	volatile uint16_t ADCCS2;
-	volatile uint8_t reserved1[14];
-	/* 0x01A:  Threshold Status */
-	volatile uint16_t THRCTS;
-	volatile uint8_t reserved2[4];
-	/* 0x020: Internal register 1 for ADC Speed */
-	volatile uint16_t ADCCNF2;
-	/* 0x022: Internal register 2 for ADC Speed */
-	volatile uint16_t GENDLY;
-	volatile uint8_t reserved3[2];
-	/* 0x026: Internal register 3 for ADC Speed */
-	volatile uint16_t MEAST;
-};
-
-/* ADC internal inline functions for multi-registers */
-#define CHNDAT(base, ch) \
-	(*(volatile uint16_t *)((base) + NPCX_CHNDAT_OFFSET(ch)))
-#define THRCTL(base, ctrl) \
-	(*(volatile uint16_t *)(base + NPCX_THRCTL_OFFSET(ctrl)))
-
-/* ADC register fields */
-#define NPCX_ATCTL_SCLKDIV_FIELD              FIELD(0, 6)
-#define NPCX_ATCTL_DLY_FIELD                  FIELD(8, 3)
-#define NPCX_ASCADD_SADDR_FIELD               FIELD(0, 5)
-#define NPCX_ADCSTS_EOCEV                     0
-#define NPCX_ADCSTS_EOCCEV                    1
-#define NPCX_ADCCNF_ADCEN                     0
-#define NPCX_ADCCNF_ADCMD_FIELD               FIELD(1, 2)
-#define NPCX_ADCCNF_ADCRPTC                   3
-#define NPCX_ADCCNF_START                     4
-#define NPCX_ADCCNF_ADCTTE                    5
-#define NPCX_ADCCNF_INTECEN                   6
-#define NPCX_ADCCNF_INTECCEN                  7
-#define NPCX_ADCCNF_INTETCEN                  8
-#define NPCX_ADCCNF_INTOVFEN                  9
-#define NPCX_ADCCNF_STOP                      11
-#define NPCX_CHNDAT_CHDAT_FIELD               FIELD(0, 10)
-#define NPCX_CHNDAT_NEW                       15
-#define NPCX_THRCTS_ADC_WKEN                  15
-#define NPCX_THRCTS_THR3_IEN                  10
-#define NPCX_THRCTS_THR2_IEN                  9
-#define NPCX_THRCTS_THR1_IEN                  8
-#define NPCX_THRCTS_ADC_EVENT                 7
-#define NPCX_THRCTS_THR3_STS                  2
-#define NPCX_THRCTS_THR2_STS                  1
-#define NPCX_THRCTS_THR1_STS                  0
-#define NPCX_THR_DCTL_THRD_EN                 15
-#define NPCX_THR_DCTL_THR_DVAL                FIELD(0, 10)
-
-/*
- * Timer Watchdog (TWD) device registers
- */
-struct twd_reg {
-	/* 0x000: Timer and Watchdog Configuration */
-	volatile uint8_t TWCFG;
-	volatile uint8_t reserved1;
-	/* 0x002: Timer and Watchdog Clock Prescaler */
-	volatile uint8_t TWCP;
-	volatile uint8_t reserved2;
-	/* 0x004: TWD Timer 0 */
-	volatile uint16_t TWDT0;
-	/* 0x006: TWDT0 Control and Status */
-	volatile uint8_t T0CSR;
-	volatile uint8_t reserved3;
-	/* 0x008: Watchdog Count */
-	volatile uint8_t WDCNT;
-	volatile uint8_t reserved4;
-	/* 0x00A: Watchdog Service Data Match */
-	volatile uint8_t WDSDM;
-	volatile uint8_t reserved5;
-	/* 0x00C: TWD Timer 0 Counter */
-	volatile uint16_t TWMT0;
-	/* 0x00E: Watchdog Counter */
-	volatile uint8_t TWMWD;
-	volatile uint8_t reserved6;
-	/* 0x010: Watchdog Clock Prescaler */
-	volatile uint8_t WDCP;
-	volatile uint8_t reserved7;
-};
-
-/* TWD register fields */
-#define NPCX_TWCFG_LTWCFG                      0
-#define NPCX_TWCFG_LTWCP                       1
-#define NPCX_TWCFG_LTWDT0                      2
-#define NPCX_TWCFG_LWDCNT                      3
-#define NPCX_TWCFG_WDCT0I                      4
-#define NPCX_TWCFG_WDSDME                      5
-#define NPCX_T0CSR_RST                         0
-#define NPCX_T0CSR_TC                          1
-#define NPCX_T0CSR_WDLTD                       3
-#define NPCX_T0CSR_WDRST_STS                   4
-#define NPCX_T0CSR_WD_RUN                      5
-#define NPCX_T0CSR_TESDIS                      7
-
-/*
- * Enhanced Serial Peripheral Interface (eSPI) device registers
- */
-struct espi_reg {
-	/* 0x000: eSPI Identification */
-	volatile uint32_t ESPIID;
-	/* 0x004: eSPI Configuration */
-	volatile uint32_t ESPICFG;
-	/* 0x008: eSPI Status */
-	volatile uint32_t ESPISTS;
-	/* 0x00C: eSPI Interrupt Enable */
-	volatile uint32_t ESPIIE;
-	/* 0x010: eSPI Wake-Up Enable */
-	volatile uint32_t ESPIWE;
-	/* 0x014: Virtual Wire Register Index */
-	volatile uint32_t VWREGIDX;
-	/* 0x018: Virtual Wire Register Data */
-	volatile uint32_t VWREGDATA;
-	/* 0x01C: OOB Receive Buffer Read Head */
-	volatile uint32_t OOBRXRDHEAD;
-	/* 0x020: OOB Transmit Buffer Write Head */
-	volatile uint32_t OOBTXWRHEAD;
-	/* 0x024: OOB Channel Control */
-	volatile uint32_t OOBCTL;
-	/* 0x028: Flash Receive Buffer Read Head */
-	volatile uint32_t FLASHRXRDHEAD;
-	/* 0x02C: Flash Transmit Buffer Write Head */
-	volatile uint32_t FLASHTXWRHEAD;
-	volatile uint32_t reserved1;
-	/* 0x034: Flash Channel Configuration */
-	volatile uint32_t FLASHCFG;
-	/* 0x038: Flash Channel Control */
-	volatile uint32_t FLASHCTL;
-	/* 0x03C: eSPI Error Status */
-	volatile uint32_t ESPIERR;
-	/* 0x040: Peripheral Bus Master Receive Buffer Read Head */
-	volatile uint32_t PBMRXRDHEAD;
-	/* 0x044: Peripheral Bus Master Transmit Buffer Write Head */
-	volatile uint32_t PBMTXWRHEAD;
-	/* 0x048: Peripheral Channel Configuration */
-	volatile uint32_t PERCFG;
-	/* 0x04C: Peripheral Channel Control */
-	volatile uint32_t PERCTL;
-	/* 0x050: Status Image Register */
-	volatile uint16_t STATUS_IMG;
-	volatile uint16_t reserved2[79];
-	/* 0x0F0: NPCX specific eSPI Register1 */
-	volatile uint8_t NPCX_ONLY_ESPI_REG1;
-	/* 0x0F1: NPCX specific eSPI Register2 */
-	volatile uint8_t NPCX_ONLY_ESPI_REG2;
-	volatile uint16_t reserved3[7];
-	/* 0x100 - 127: Virtual Wire Event Slave-to-Master 0 - 9 */
-	volatile uint32_t VWEVSM[10];
-	volatile uint32_t reserved4[6];
-	/* 0x140 - 16F: Virtual Wire Event Master-to-Slave 0 - 11 */
-	volatile uint32_t VWEVMS[12];
-	volatile uint32_t reserved5[4];
-	/* 0x180 - 1BF: Virtual Wire GPIO Event Master-to-Slave 0 - 15 */
-	volatile uint32_t VWGPSM[16];
-	volatile uint32_t reserved6[79];
-	/* 0x2FC: Virtual Wire Channel Control */
-	volatile uint32_t VWCTL;
-	/* 0x300 - 34F: OOB Receive Buffer 0 - 19 */
-	volatile uint32_t OOBRXBUF[20];
-	volatile uint32_t reserved7[12];
-	/* 0x380 - 3CF: OOB Transmit Buffer 0-19 */
-	volatile uint32_t OOBTXBUF[20];
-	volatile uint32_t reserved8[11];
-	/* 0x3FC: OOB Channel Control used in 'direct' mode */
-	volatile uint32_t OOBCTL_DIRECT;
-	/* 0x400 - 443: Flash Receive Buffer 0-17 */
-	volatile uint32_t FLASHRXBUF[18];
-	volatile uint32_t reserved9[14];
-	/* 0x480 - 497: Flash Transmit Buffer 0-16 */
-	volatile uint32_t FLASHTXBUF[17];
-	volatile uint32_t reserved10[14];
-	/* 0x4FC: Flash Channel Control used in 'direct' mode */
-	volatile uint32_t FLASHCTL_DIRECT;
-	volatile uint32_t reserved12[64];
-	/* 0x600 - 63F */
-	volatile uint32_t FLASH_PRTR_BADDR[16];
-	/* 0x640 - 67F */
-	volatile uint32_t FLASH_PRTR_HADDR[16];
-	/* 0x680 - 6BF */
-	volatile uint32_t FLASH_RGN_TAG_OVR[16];
-	volatile uint32_t reserved13[80];
-	/* 0x800 */
-	volatile uint32_t FLASH_RPMC_CFG_1;
-	/* 0x804 */
-	volatile uint32_t FLASH_RPMC_CFG_2;
-	/* 0x808 */
-	volatile uint32_t RMAP_FLASH_OFFS;
-	/* 0x80C */
-	volatile uint32_t RMAP_DST_BASE;
-	/* 0x810 */
-	volatile uint32_t RMAP_WIN_SIZE;
-	/* 0x814 */
-	volatile uint32_t FLASHBASE;
-	volatile uint32_t reserved14[58];
-};
-
-/* eSPI register fields */
-#define NPCX_ESPICFG_PCHANEN             0
-#define NPCX_ESPICFG_VWCHANEN            1
-#define NPCX_ESPICFG_OOBCHANEN           2
-#define NPCX_ESPICFG_FLASHCHANEN         3
-#define NPCX_ESPICFG_HPCHANEN            4
-#define NPCX_ESPICFG_HVWCHANEN           5
-#define NPCX_ESPICFG_HOOBCHANEN          6
-#define NPCX_ESPICFG_HFLASHCHANEN        7
-#define NPCX_ESPICFG_CHANS_FIELD         FIELD(0, 4)
-#define NPCX_ESPICFG_HCHANS_FIELD        FIELD(4, 4)
-#define NPCX_ESPICFG_IOMODE_FIELD        FIELD(8, 2)
-#define NPCX_ESPICFG_MAXFREQ_FIELD       FIELD(10, 3)
-#define NPCX_ESPICFG_FLCHANMODE          16
-#define NPCX_ESPICFG_PCCHN_SUPP          24
-#define NPCX_ESPICFG_VWCHN_SUPP          25
-#define NPCX_ESPICFG_OOBCHN_SUPP         26
-#define NPCX_ESPICFG_FLASHCHN_SUPP       27
-#define NPCX_ESPIIE_IBRSTIE              0
-#define NPCX_ESPIIE_CFGUPDIE             1
-#define NPCX_ESPIIE_BERRIE               2
-#define NPCX_ESPIIE_OOBRXIE              3
-#define NPCX_ESPIIE_FLASHRXIE            4
-#define NPCX_ESPIIE_FLNACSIE             5
-#define NPCX_ESPIIE_PERACCIE             6
-#define NPCX_ESPIIE_DFRDIE               7
-#define NPCX_ESPIIE_VWUPDIE              8
-#define NPCX_ESPIIE_ESPIRSTIE            9
-#define NPCX_ESPIIE_PLTRSTIE             10
-#define NPCX_ESPIIE_AMERRIE              15
-#define NPCX_ESPIIE_AMDONEIE             16
-#define NPCX_ESPIIE_BMTXDONEIE           19
-#define NPCX_ESPIIE_PBMRXIE              20
-#define NPCX_ESPIIE_PMSGRXIE             21
-#define NPCX_ESPIIE_BMBURSTERRIE         22
-#define NPCX_ESPIIE_BMBURSTDONEIE        23
-#define NPCX_ESPIWE_IBRSTWE              0
-#define NPCX_ESPIWE_CFGUPDWE             1
-#define NPCX_ESPIWE_BERRWE               2
-#define NPCX_ESPIWE_OOBRXWE              3
-#define NPCX_ESPIWE_FLASHRXWE            4
-#define NPCX_ESPIWE_FLNACSWE             5
-#define NPCX_ESPIWE_PERACCWE             6
-#define NPCX_ESPIWE_DFRDWE               7
-#define NPCX_ESPIWE_VWUPDWE              8
-#define NPCX_ESPIWE_ESPIRSTWE            9
-#define NPCX_ESPIWE_PBMRXWE              20
-#define NPCX_ESPIWE_PMSGRXWE             21
-#define NPCX_ESPISTS_IBRST               0
-#define NPCX_ESPISTS_CFGUPD              1
-#define NPCX_ESPISTS_BERR                2
-#define NPCX_ESPISTS_OOBRX               3
-#define NPCX_ESPISTS_FLASHRX             4
-#define NPCX_ESPISTS_FLNACS              5
-#define NPCX_ESPISTS_PERACC              6
-#define NPCX_ESPISTS_DFRD                7
-#define NPCX_ESPISTS_VWUPD               8
-#define NPCX_ESPISTS_ESPIRST             9
-#define NPCX_ESPISTS_PLTRST              10
-#define NPCX_ESPISTS_AMERR               15
-#define NPCX_ESPISTS_AMDONE              16
-#define NPCX_ESPISTS_VWUPDW              17
-#define NPCX_ESPISTS_BMTXDONE            19
-#define NPCX_ESPISTS_PBMRX               20
-#define NPCX_ESPISTS_PMSGRX              21
-#define NPCX_ESPISTS_BMBURSTERR          22
-#define NPCX_ESPISTS_BMBURSTDONE         23
-#define NPCX_ESPISTS_ESPIRST_LVL         24
-#define NPCX_VWSWIRQ_IRQ_NUM             FIELD(0, 7)
-#define NPCX_VWSWIRQ_IRQ_LVL             7
-#define NPCX_VWSWIRQ_INDEX               FIELD(8, 7)
-#define NPCX_VWSWIRQ_INDEX_EN            15
-#define NPCX_VWSWIRQ_DIRTY               16
-#define NPCX_VWSWIRQ_ENPLTRST            17
-#define NPCX_VWSWIRQ_ENCDRST             19
-#define NPCX_VWSWIRQ_EDGE_IRQ            28
-#define NPCX_VWEVMS_WIRE                 FIELD(0, 4)
-#define NPCX_VWEVMS_VALID                FIELD(4, 4)
-#define NPCX_VWEVMS_INDEX                FIELD(8, 7)
-#define NPCX_VWEVMS_INDEX_EN             15
-#define NPCX_VWEVMS_IE                   18
-#define NPCX_VWEVMS_WE                   20
-#define NPCX_VWEVSM_WIRE                 FIELD(0, 4)
-#define NPCX_VWEVSM_VALID                FIELD(4, 4)
-#define NPCX_VWEVSM_INDEX                FIELD(8, 7)
-#define NPCX_VWEVSM_INDEX_EN             15
-#define NPCX_VWEVSM_BIT_VALID(n)         (4+n)
-#define NPCX_VWEVSM_HW_WIRE              FIELD(24, 4)
-#define NPCX_VWGPSM_INDEX_EN             15
-#define NPCX_OOBCTL_OOB_FREE             0
-#define NPCX_OOBCTL_OOB_AVAIL            1
-#define NPCX_OOBCTL_RSTBUFHEADS          2
-#define NPCX_OOBCTL_OOBPLSIZE            FIELD(10, 3)
-#define NPCX_FLASHCFG_FLASHBLERSSIZE     FIELD(7, 3)
-#define NPCX_FLASHCFG_FLASHPLSIZE        FIELD(10, 3)
-#define NPCX_FLASHCFG_FLASHREQSIZE       FIELD(13, 3)
-#define NPCX_FLASHCFG_FLCAPA             FIELD(24, 2)
-#define NPCX_FLASHCFG_TRGFLEBLKSIZE      FIELD(16, 8)
-#define NPCX_FLASHCFG_FLREQSUP           FIELD(0, 3)
-#define NPCX_FLASHCTL_FLASH_NP_FREE      0
-#define NPCX_FLASHCTL_FLASH_TX_AVAIL     1
-#define NPCX_FLASHCTL_STRPHDR            2
-#define NPCX_FLASHCTL_DMATHRESH          FIELD(3, 2)
-#define NPCX_FLASHCTL_AMTSIZE            FIELD(5, 8)
-#define NPCX_FLASHCTL_RSTBUFHEADS        13
-#define NPCX_FLASHCTL_CRCEN              14
-#define NPCX_FLASHCTL_CHKSUMSEL          15
-#define NPCX_FLASHCTL_AMTEN              16
-#define NPCX_FLASHCTL_SAF_AUTO_READ      18
-#define NPCX_FLASHCTL_AUTO_RD_DIS_CTL    19
-#define NPCX_FLASHCTL_BLK_FLASH_NP_FREE  20
-#define NPCX_FLASHBASE_FLBASE_ADDR       FIELD(12, 15)
-#define NPCX_FLASH_PRTR_BADDR            FIELD(12, 15)
-#define NPCX_FRGN_WPR                    29
-#define SAF_PROT_LCK                     31
-#define NPCX_FRGN_RPR                    30
-#define NPCX_FLASH_PRTR_HADDR            FIELD(12, 15)
-#define NPCX_FLASH_TAG_OVR_RPR           FIELD(16, 16)
-#define NPCX_FLASH_TAG_OVR_WPR           FIELD(0, 16)
-#define NPCX_FLASH_RPMC_CFG1_CNTR        FIELD(0, 4)
-#define NPCX_FLASH_RPMC_CFG1_OP1         FIELD(4, 8)
-#define NPCX_FLASH_RPMC_CFG1_TRGRPMCSUP  FIELD(26, 6)
-#define NPCX_ONLY_ESPI_REG1_UNLOCK_REG2         0x55
-#define NPCX_ONLY_ESPI_REG1_LOCK_REG2           0
-#define NPCX_ONLY_ESPI_REG2_TRANS_END_CONFIG    4
-
-/*
- * Mobile System Wake-Up Control (MSWC) device registers
- */
-struct mswc_reg {
-	/* 0x000: MSWC Control Status 1 */
-	volatile uint8_t MSWCTL1;
-	volatile uint8_t reserved1;
-	/* 0x002: MSWC Control Status 2 */
-	volatile uint8_t MSWCTL2;
-	volatile uint8_t reserved2[5];
-	/* 0x008: Host Configuration Base Address Low */
-	volatile uint8_t HCBAL;
-	volatile uint8_t reserved3;
-	/* 0x00A: Host Configuration Base Address High */
-	volatile uint8_t HCBAH;
-	volatile uint8_t reserved4;
-	/* 0X00C: MSWC INTERRUPT ENABLE 2 */
-	volatile uint8_t MSIEN2;
-	volatile uint8_t reserved5;
-	/* 0x00E: MSWC Host Event Status 0 */
-	volatile uint8_t MSHES0;
-	volatile uint8_t reserved6;
-	/* 0x010: MSWC Host Event Interrupt Enable */
-	volatile uint8_t MSHEIE0;
-	volatile uint8_t reserved7;
-	/* 0x012: Host Control */
-	volatile uint8_t HOST_CTL;
-	volatile uint8_t reserved8;
-	/* 0x014: SMI Pulse Length */
-	volatile uint8_t SMIP_LEN;
-	volatile uint8_t reserved9;
-	/* 0x016: SCI Pulse Length */
-	volatile uint8_t SCIP_LEN;
-	volatile uint8_t reserved10[5];
-	/* 0x01C: SRID Core Access */
-	volatile uint8_t SRID_CR;
-	volatile uint8_t reserved11[3];
-	/* 0x020: SID Core Access */
-	volatile uint8_t SID_CR;
-	volatile uint8_t reserved12;
-	/* 0x022: DEVICE_ID Core Access */
-	volatile uint8_t DEVICE_ID_CR;
-	volatile uint8_t reserved13[5];
-	/* 0x028: Chip Revision Core Access */
-	volatile uint8_t CHPREV_CR;
-	volatile uint8_t reserved14[5];
-	/* 0x02E: Virtual Wire Sleep States */
-	volatile uint8_t VW_SLPST1;
-	volatile uint8_t reserved15;
-};
-
-/* MSWC register fields */
-#define NPCX_MSWCTL1_HRSTOB              0
-#define NPCS_MSWCTL1_HWPRON              1
-#define NPCX_MSWCTL1_PLTRST_ACT          2
-#define NPCX_MSWCTL1_VHCFGA              3
-#define NPCX_MSWCTL1_HCFGLK              4
-#define NPCX_MSWCTL1_PWROFFB             6
-#define NPCX_MSWCTL1_A20MB               7
-
-/*
- * Shared Memory (SHM) device registers
- */
-struct shm_reg {
-	/* 0x000: Shared Memory Core Status */
-	volatile uint8_t SMC_STS;
-	/* 0x001: Shared Memory Core Control */
-	volatile uint8_t SMC_CTL;
-	/* 0x002: Shared Memory Host Control */
-	volatile uint8_t SHM_CTL;
-	volatile uint8_t reserved1[2];
-	/* 0x005: Indirect Memory Access Window Size */
-	volatile uint8_t IMA_WIN_SIZE;
-	volatile uint8_t reserved2;
-	/* 0x007: Shared Access Windows Size */
-	volatile uint8_t WIN_SIZE;
-	/* 0x008: Shared Access Window 1, Semaphore */
-	volatile uint8_t SHAW1_SEM;
-	/* 0x009: Shared Access Window 2, Semaphore */
-	volatile uint8_t SHAW2_SEM;
-	volatile uint8_t reserved3;
-	/* 0x00B: Indirect Memory Access, Semaphore */
-	volatile uint8_t IMA_SEM;
-	volatile uint8_t reserved4[2];
-	/* 0x00E: Shared Memory Configuration */
-	volatile uint16_t SHCFG;
-	/* 0x010: Shared Access Window 1 Write Protect */
-	volatile uint8_t WIN1_WR_PROT;
-	/* 0x011: Shared Access Window 1 Read Protect */
-	volatile uint8_t WIN1_RD_PROT;
-	/* 0x012: Shared Access Window 2 Write Protect */
-	volatile uint8_t WIN2_WR_PROT;
-	/* 0x013: Shared Access Window 2 Read Protect */
-	volatile uint8_t WIN2_RD_PROT;
-	volatile uint8_t reserved5[2];
-	/* 0x016: Indirect Memory Access Write Protect */
-	volatile uint8_t IMA_WR_PROT;
-	/* 0x017: Indirect Memory Access Read Protect */
-	volatile uint8_t IMA_RD_PROT;
-	volatile uint8_t reserved6[8];
-	/* 0x020: Shared Access Window 1 Base */
-	volatile uint32_t WIN_BASE1;
-	/* 0x024: Shared Access Window 2 Base */
-	volatile uint32_t WIN_BASE2;
-	volatile uint32_t reserved7;
-	/* 0x02C: Indirect Memory Access Base */
-	volatile uint32_t IMA_BASE;
-	volatile uint8_t reserved8[10];
-	/* 0x03A: Reset Configuration */
-	volatile uint8_t RST_CFG;
-	volatile uint8_t reserved9[5];
-	/* 0x040: Debug Port 80 Buffered Data */
-	volatile uint16_t DP80BUF;
-	/* 0x042: Debug Port 80 Status */
-	volatile uint8_t DP80STS;
-	volatile uint8_t reserved10;
-	/* 0x044: Debug Port 80 Control */
-	volatile uint8_t DP80CTL;
-	volatile uint8_t reserved11[3];
-	/* 0x048: Host_Offset in Windows 1, 2 Status */
-	volatile uint8_t HOFS_STS;
-	/* 0x049: Host_Offset in Windows 1, 2 Control */
-	volatile uint8_t HOFS_CTL;
-	/* 0x04A: Core_Offset in Window 2 Address */
-	volatile uint16_t COFS2;
-	/* 0x04C: Core_Offset in Window 1 Address */
-	volatile uint16_t COFS1;
-	volatile uint16_t reserved12;
-};
-
-/* SHM register fields */
-#define NPCX_SMC_STS_HRERR               0
-#define NPCX_SMC_STS_HWERR               1
-#define NPCX_SMC_STS_HSEM1W              4
-#define NPCX_SMC_STS_HSEM2W              5
-#define NPCX_SMC_STS_SHM_ACC             6
-#define NPCX_SMC_CTL_HERR_IE             2
-#define NPCX_SMC_CTL_HSEM1_IE            3
-#define NPCX_SMC_CTL_HSEM2_IE            4
-#define NPCX_SMC_CTL_ACC_IE              5
-#define NPCX_SMC_CTL_PREF_EN             6
-#define NPCX_SMC_CTL_HOSTWAIT            7
-#define NPCX_FLASH_SIZE_STALL_HOST       6
-#define NPCX_FLASH_SIZE_RD_BURST         7
-#define NPCX_WIN_SIZE_RWIN1_SIZE_FIELD   FIELD(0, 4)
-#define NPCX_WIN_SIZE_RWIN2_SIZE_FIELD   FIELD(4, 4)
-#define NPCX_WIN_PROT_RW1L_RP            0
-#define NPCX_WIN_PROT_RW1L_WP            1
-#define NPCX_WIN_PROT_RW1H_RP            2
-#define NPCX_WIN_PROT_RW1H_WP            3
-#define NPCX_WIN_PROT_RW2L_RP            4
-#define NPCX_WIN_PROT_RW2L_WP            5
-#define NPCX_WIN_PROT_RW2H_RP            6
-#define NPCX_WIN_PROT_RW2H_WP            7
-#define NPCX_PWIN_SIZEI_RPROT            13
-#define NPCX_PWIN_SIZEI_WPROT            14
-#define NPCX_CSEM2                       6
-#define NPCX_CSEM3                       7
-#define NPCX_DP80STS_FWR                 5
-#define NPCX_DP80STS_FNE                 6
-#define NPCX_DP80STS_FOR                 7
-#define NPCX_DP80CTL_DP80EN              0
-#define NPCX_DP80CTL_SYNCEN              1
-#define NPCX_DP80CTL_ADV                 2
-#define NPCX_DP80CTL_RAA                 3
-#define NPCX_DP80CTL_RFIFO               4
-#define NPCX_DP80CTL_CIEN                5
-#define NPCX_DP80CTL_DP80_HF_CFG         7
-#define NPCX_DP80BUF_OFFS_FIELD          FIELD(8, 3)
-
-/*
- * Keyboard and Mouse Controller (KBC) device registers
- */
-struct kbc_reg {
-	/* 0x000h: Host Interface Control */
-	volatile uint8_t HICTRL;
-	volatile uint8_t reserved1;
-	/* 0x002h: Host Interface IRQ Control */
-	volatile uint8_t HIIRQC;
-	volatile uint8_t reserved2;
-	/* 0x004h: Host Interface Keyboard/Mouse Status */
-	volatile uint8_t HIKMST;
-	volatile uint8_t reserved3;
-	/* 0x006h: Host Interface Keyboard Data Out Buffer */
-	volatile uint8_t HIKDO;
-	volatile uint8_t reserved4;
-	/* 0x008h: Host Interface Mouse Data Out Buffer */
-	volatile uint8_t HIMDO;
-	volatile uint8_t reserved5;
-	/* 0x00Ah: Host Interface Keyboard/Mouse Data In Buffer */
-	volatile uint8_t HIKMDI;
-	/* 0x00Bh: Host Interface Keyboard/Mouse Shadow Data In Buffer */
-	volatile uint8_t SHIKMDI;
-};
-
-/* KBC register field */
-#define NPCX_HICTRL_OBFKIE               0
-#define NPCX_HICTRL_OBFMIE               1
-#define NPCX_HICTRL_OBECIE               2
-#define NPCX_HICTRL_IBFCIE               3
-#define NPCX_HICTRL_PMIHIE               4
-#define NPCX_HICTRL_PMIOCIE              5
-#define NPCX_HICTRL_PMICIE               6
-#define NPCX_HICTRL_FW_OBF               7
-#define NPCX_HIKMST_OBF                  0
-#define NPCX_HIKMST_IBF                  1
-#define NPCX_HIKMST_F0                   2
-#define NPCX_HIKMST_A2                   3
-#define NPCX_HIKMST_ST0                  4
-#define NPCX_HIKMST_ST1                  5
-#define NPCX_HIKMST_ST2                  6
-#define NPCX_HIKMST_ST3                  7
-
-/*
- * Power Management Channel (PMCH) device registers
- */
-
-struct pmch_reg {
-	/* 0x000: Host Interface PM Status */
-	volatile uint8_t HIPMST;
-	volatile uint8_t reserved1;
-	/* 0x002: Host Interface PM Data Out Buffer */
-	volatile uint8_t HIPMDO;
-	volatile uint8_t reserved2;
-	/* 0x004: Host Interface PM Data In Buffer */
-	volatile uint8_t HIPMDI;
-	/* 0x005: Host Interface PM Shadow Data In Buffer */
-	volatile uint8_t SHIPMDI;
-	/* 0x006: Host Interface PM Data Out Buffer with SCI */
-	volatile uint8_t HIPMDOC;
-	volatile uint8_t reserved3;
-	/* 0x008: Host Interface PM Data Out Buffer with SMI */
-	volatile uint8_t HIPMDOM;
-	volatile uint8_t reserved4;
-	/* 0x00A: Host Interface PM Data In Buffer with SCI */
-	volatile uint8_t HIPMDIC;
-	volatile uint8_t reserved5;
-	/* 0x00C: Host Interface PM Control */
-	volatile uint8_t HIPMCTL;
-	/* 0x00D: Host Interface PM Control 2 */
-	volatile uint8_t HIPMCTL2;
-	/* 0x00E: Host Interface PM Interrupt Control */
-	volatile uint8_t HIPMIC;
-	volatile uint8_t reserved6;
-	/* 0x010: Host Interface PM Interrupt Enable */
-	volatile uint8_t HIPMIE;
-	volatile uint8_t reserved7;
-};
-
-/* PMCH register field */
-#define NPCX_HIPMIE_SCIE                 1
-#define NPCX_HIPMIE_SMIE                 2
-#define NPCX_HIPMCTL_IBFIE               0
-#define NPCX_HIPMCTL_OBEIE               1
-#define NPCX_HIPMCTL_SCIPOL              6
-#define NPCX_HIPMST_OBF                  0
-#define NPCX_HIPMST_IBF                  1
-#define NPCX_HIPMST_F0                   2
-#define NPCX_HIPMST_CMD                  3
-#define NPCX_HIPMST_ST0                  4
-#define NPCX_HIPMST_ST1                  5
-#define NPCX_HIPMST_ST2                  6
-#define NPCX_HIPMIC_SMIB                 1
-#define NPCX_HIPMIC_SCIB                 2
-#define NPCX_HIPMIC_SMIPOL               6
-
-/*
- * Core Access to Host (C2H) device registers
- */
-struct c2h_reg {
-	/* 0x000: Indirect Host I/O Address */
-	volatile uint16_t IHIOA;
-	/* 0x002: Indirect Host Data */
-	volatile uint8_t IHD;
-	volatile uint8_t reserved1;
-	/* 0x004: Lock Host Access */
-	volatile uint16_t LKSIOHA;
-	/* 0x006: Access Lock Violation */
-	volatile uint16_t SIOLV;
-	/* 0x008: Core-to-Host Modules Access Enable */
-	volatile uint16_t CRSMAE;
-	/* 0x00A: Module Control */
-	volatile uint8_t SIBCTRL;
-	volatile uint8_t reserved3;
-};
-
-/* C2H register fields */
-#define NPCX_LKSIOHA_LKCFG               0
-#define NPCX_LKSIOHA_LKSPHA              2
-#define NPCX_LKSIOHA_LKHIKBD             11
-#define NPCX_CRSMAE_CFGAE                0
-#define NPCX_CRSMAE_HIKBDAE              11
-#define NPCX_SIOLV_SPLV                  2
-#define NPCX_SIBCTRL_CSAE                0
-#define NPCX_SIBCTRL_CSRD                1
-#define NPCX_SIBCTRL_CSWR                2
-
-/*
- * SMBUS (SMB) device registers
- */
-struct smb_reg {
-	/* 0x000: SMB Serial Data */
-	volatile uint8_t SMBSDA;
-	volatile uint8_t reserved1;
-	/* 0x002: SMB Status */
-	volatile uint8_t SMBST;
-	volatile uint8_t reserved2;
-	/* 0x004: SMB Control Status */
-	volatile uint8_t SMBCST;
-	volatile uint8_t reserved3;
-	/* 0x006: SMB Control 1 */
-	volatile uint8_t SMBCTL1;
-	volatile uint8_t reserved4;
-	/* 0x008: SMB Own Address */
-	volatile uint8_t SMBADDR1;
-	volatile uint8_t reserved5;
-	/* 0x00A: SMB Control 2 */
-	volatile uint8_t SMBCTL2;
-	volatile uint8_t reserved6;
-	/* 0x00C: SMB Own Address */
-	volatile uint8_t SMBADDR2;
-	volatile uint8_t reserved7;
-	/* 0x00E: SMB Control 3 */
-	volatile uint8_t SMBCTL3;
-	/* 0x00F: SMB Bus Timeout */
-	volatile uint8_t SMBT_OUT;
-	union {
-		/* Bank 0 */
-		struct {
-			/* 0x010: SMB Own Address 3 */
-			volatile uint8_t SMBADDR3;
-			/* 0x011: SMB Own Address 7 */
-			volatile uint8_t SMBADDR7;
-			/* 0x012: SMB Own Address 4 */
-			volatile uint8_t SMBADDR4;
-			/* 0x013: SMB Own Address 8 */
-			volatile uint8_t SMBADDR8;
-			/* 0x014: SMB Own Address 5 */
-			volatile uint8_t SMBADDR5;
-			volatile uint8_t reserved8;
-			/* 0x016: SMB Own Address 6 */
-			volatile uint8_t SMBADDR6;
-			volatile uint8_t reserved9;
-			/* 0x018: SMB Control Status 2 */
-			volatile uint8_t SMBCST2;
-			/* 0x019: SMB Control Status 3 */
-			volatile uint8_t SMBCST3;
-			/* 0x01A: SMB Control 4 */
-			volatile uint8_t SMBCTL4;
-			volatile uint8_t reserved10;
-			/* 0x01C: SMB SCL Low Time */
-			volatile uint8_t SMBSCLLT;
-			/* 0x01D: SMB FIFO Control */
-			volatile uint8_t SMBFIF_CTL;
-			/* 0x01E: SMB SCL High Time */
-			volatile uint8_t SMBSCLHT;
-			volatile uint8_t reserved11;
-		};
-		/* Bank 1 */
-		struct {
-			/* 0x010: SMB FIFO Control */
-			volatile uint8_t SMBFIF_CTS;
-			volatile uint8_t reserved12;
-			/* 0x012: SMB Tx-FIFO Control */
-			volatile uint8_t SMBTXF_CTL;
-			volatile uint8_t reserved13;
-			/* 0x014: SMB Bus Timeout */
-			volatile uint8_t SMB_T_OUT;
-			volatile uint8_t reserved14[3];
-			/* 0x018: SMB Control Status 2 (FIFO) */
-			volatile uint8_t SMBCST2_FIFO;
-			/* 0x019: SMB Control Status 3 (FIFO) */
-			volatile uint8_t SMBCST3_FIFO;
-			/* 0x01A: SMB Tx-FIFO Status */
-			volatile uint8_t SMBTXF_STS;
-			volatile uint8_t reserved15;
-			/* 0x01C: SMB Rx-FIFO Status */
-			volatile uint8_t SMBRXF_STS;
-			volatile uint8_t reserved16;
-			/* 0x01E: SMB Rx-FIFO Control */
-			volatile uint8_t SMBRXF_CTL;
-			volatile uint8_t reserved17[1];
-		};
-	};
-};
-
-/* SMB register fields */
-#define NPCX_SMBST_XMIT                  0
-#define NPCX_SMBST_MASTER                1
-#define NPCX_SMBST_NMATCH                2
-#define NPCX_SMBST_STASTR                3
-#define NPCX_SMBST_NEGACK                4
-#define NPCX_SMBST_BER                   5
-#define NPCX_SMBST_SDAST                 6
-#define NPCX_SMBST_SLVSTP                7
-#define NPCX_SMBCST_BUSY                 0
-#define NPCX_SMBCST_BB                   1
-#define NPCX_SMBCST_MATCH                2
-#define NPCX_SMBCST_GCMATCH              3
-#define NPCX_SMBCST_TSDA                 4
-#define NPCX_SMBCST_TGSCL                5
-#define NPCX_SMBCST_MATCHAF              6
-#define NPCX_SMBCST_ARPMATCH             7
-#define NPCX_SMBCST2_MATCHA1F            0
-#define NPCX_SMBCST2_MATCHA2F            1
-#define NPCX_SMBCST2_MATCHA3F            2
-#define NPCX_SMBCST2_MATCHA4F            3
-#define NPCX_SMBCST2_MATCHA5F            4
-#define NPCX_SMBCST2_MATCHA6F            5
-#define NPCX_SMBCST2_MATCHA7F            6
-#define NPCX_SMBCST2_INTSTS              7
-#define NPCX_SMBCST3_MATCHA8F            0
-#define NPCX_SMBCST3_MATCHA9F            1
-#define NPCX_SMBCST3_MATCHA10F           2
-#define NPCX_SMBCTL1_START               0
-#define NPCX_SMBCTL1_STOP                1
-#define NPCX_SMBCTL1_INTEN               2
-#define NPCX_SMBCTL1_ACK                 4
-#define NPCX_SMBCTL1_GCMEN               5
-#define NPCX_SMBCTL1_NMINTE              6
-#define NPCX_SMBCTL1_STASTRE             7
-#define NPCX_SMBCTL2_ENABLE              0
-#define NPCX_SMBCTL2_SCLFRQ0_6_FIELD     FIELD(1, 7)
-#define NPCX_SMBCTL3_ARPMEN              2
-#define NPCX_SMBCTL3_SCLFRQ7_8_FIELD     FIELD(0, 2)
-#define NPCX_SMBCTL3_IDL_START           3
-#define NPCX_SMBCTL3_400K                4
-#define NPCX_SMBCTL3_BNK_SEL             5
-#define NPCX_SMBCTL3_SDA_LVL             6
-#define NPCX_SMBCTL3_SCL_LVL             7
-#define NPCX_SMBCTL4_HLDT_FIELD          FIELD(0, 6)
-#define NPCX_SMBCTL4_LVL_WE              7
-#define NPCX_SMBADDR1_SAEN               7
-#define NPCX_SMBADDR2_SAEN               7
-#define NPCX_SMBADDR3_SAEN               7
-#define NPCX_SMBADDR4_SAEN               7
-#define NPCX_SMBADDR5_SAEN               7
-#define NPCX_SMBADDR6_SAEN               7
-#define NPCX_SMBADDR7_SAEN               7
-#define NPCX_SMBADDR8_SAEN               7
-#define NPCX_SMBSEL_SMB4SEL              4
-#define NPCX_SMBSEL_SMB5SEL              5
-#define NPCX_SMBSEL_SMB6SEL              6
-#define NPCX_SMBFIF_CTS_RXF_TXE          1
-#define NPCX_SMBFIF_CTS_CLR_FIFO         6
-#define NPCX_SMBFIF_CTL_FIFO_EN          4
-#define NPCX_SMBRXF_STS_RX_THST          6
-
-/* RX FIFO threshold */
-#define NPCX_SMBRXF_CTL_RX_THR           FIELD(0, 6)
-#define NPCX_SMBRXF_CTL_LAST             7
-
-/*
- * Internal 32-bit Timer (ITIM32) device registers
- */
-struct itim32_reg {
-	volatile uint8_t reserved1;
-	/* 0x001: Internal 32-bit Timer Prescaler */
-	volatile uint8_t ITPRE32;
-	volatile uint8_t reserved2[2];
-	/* 0x004: Internal 32-bit Timer Control and Status */
-	volatile uint8_t ITCTS32;
-	volatile uint8_t reserved3[3];
-	/* 0x008: Internal 32-Bit Timer Counter */
-	volatile uint32_t ITCNT32;
-};
-
-/*
- * Internal 64-bit Timer (ITIM54) device registers
- */
-struct itim64_reg {
-	volatile uint8_t reserved1;
-	/* 0x001: Internal 64-bit Timer Prescaler */
-	volatile uint8_t ITPRE64;
-	volatile uint8_t reserved2[2];
-	/* 0x004: Internal 64-bit Timer Control and Status */
-	volatile uint8_t ITCTS64;
-	volatile uint8_t reserved3[3];
-	/* 0x008: Internal 32-Bit Timer Counter */
-	volatile uint32_t ITCNT64L;
-	/* 0x00C: Internal 32-Bit Timer Counter */
-	volatile uint32_t ITCNT64H;
-};
-
-/* ITIM register fields */
-#define NPCX_ITCTSXX_TO_STS              0
-#define NPCX_ITCTSXX_TO_IE               2
-#define NPCX_ITCTSXX_TO_WUE              3
-#define NPCX_ITCTSXX_CKSEL               4
-#define NPCX_ITCTSXX_ITEN                7
-
-/*
- * Tachometer (TACH) Sensor device registers
- */
-struct tach_reg {
-	/* 0x000: Timer/Counter 1 */
-	volatile uint16_t TCNT1;
-	/* 0x002: Reload/Capture A */
-	volatile uint16_t TCRA;
-	/* 0x004: Reload/Capture B */
-	volatile uint16_t TCRB;
-	/* 0x006: Timer/Counter 2 */
-	volatile uint16_t TCNT2;
-	/* 0x008: Clock Prescaler */
-	volatile uint8_t TPRSC;
-	volatile uint8_t reserved1;
-	/* 0x00A: Clock Unit Control */
-	volatile uint8_t TCKC;
-	volatile uint8_t reserved2;
-	/* 0x00C: Timer Mode Control */
-	volatile uint8_t TMCTRL;
-	volatile uint8_t reserved3;
-	/* 0x00E: Timer Event Control */
-	volatile uint8_t TECTRL;
-	volatile uint8_t reserved4;
-	/* 0x010: Timer Event Clear */
-	volatile uint8_t TECLR;
-	volatile uint8_t reserved5;
-	/* 0x012: Timer Interrupt Enable */
-	volatile uint8_t TIEN;
-	volatile uint8_t reserved6;
-	/* 0x014: Compare A */
-	volatile uint16_t TCPA;
-	/* 0x016: Compare B */
-	volatile uint16_t TCPB;
-	/* 0x018: Compare Configuration */
-	volatile uint8_t TCPCFG;
-	volatile uint8_t reserved7;
-	/* 0x01A: Timer Wake-Up Enable */
-	volatile uint8_t TWUEN;
-	volatile uint8_t reserved8;
-	/* 0x01C: Timer Configuration */
-	volatile uint8_t TCFG;
-	volatile uint8_t reserved9;
-};
-
-/* TACH register fields */
-#define NPCX_TCKC_LOW_PWR                7
-#define NPCX_TCKC_PLS_ACC_CLK            6
-#define NPCX_TCKC_C1CSEL_FIELD           FIELD(0, 3)
-#define NPCX_TCKC_C2CSEL_FIELD           FIELD(3, 3)
-#define NPCX_TMCTRL_MDSEL_FIELD          FIELD(0, 3)
-#define NPCX_TMCTRL_TAEN                 5
-#define NPCX_TMCTRL_TBEN                 6
-#define NPCX_TMCTRL_TAEDG                3
-#define NPCX_TMCTRL_TBEDG                4
-#define NPCX_TCFG_TADBEN                 6
-#define NPCX_TCFG_TBDBEN                 7
-#define NPCX_TECTRL_TAPND                0
-#define NPCX_TECTRL_TBPND                1
-#define NPCX_TECTRL_TCPND                2
-#define NPCX_TECTRL_TDPND                3
-#define NPCX_TECLR_TACLR                 0
-#define NPCX_TECLR_TBCLR                 1
-#define NPCX_TECLR_TCCLR                 2
-#define NPCX_TECLR_TDCLR                 3
-#define NPCX_TIEN_TAIEN                  0
-#define NPCX_TIEN_TBIEN                  1
-#define NPCX_TIEN_TCIEN                  2
-#define NPCX_TIEN_TDIEN                  3
-#define NPCX_TWUEN_TAWEN                 0
-#define NPCX_TWUEN_TBWEN                 1
-#define NPCX_TWUEN_TCWEN                 2
-#define NPCX_TWUEN_TDWEN                 3
-
-/* Debug Interface registers */
-struct dbg_reg {
-	/* 0x000: Debug Control */
-	volatile uint8_t DBGCTRL;
-	volatile uint8_t reserved1;
-	/* 0x002: Debug Freeze Enable 1 */
-	volatile uint8_t DBGFRZEN1;
-	/* 0x003: Debug Freeze Enable 2 */
-	volatile uint8_t DBGFRZEN2;
-	/* 0x004: Debug Freeze Enable 3 */
-	volatile uint8_t DBGFRZEN3;
-	/* 0x005: Debug Freeze Enable 4 */
-	volatile uint8_t DBGFRZEN4;
-};
-/* Debug Interface registers fields */
-#define NPCX_DBGFRZEN3_GLBL_FRZ_DIS      7
-
-/* PS/2 Interface registers */
-struct ps2_reg {
-	/* 0x000: PS/2 Data */
-	volatile uint8_t PSDAT;
-	volatile uint8_t reserved1;
-	/* 0x002: PS/2 Status */
-	volatile uint8_t PSTAT;
-	volatile uint8_t reserved2;
-	/* 0x004: PS/2 Control */
-	volatile uint8_t PSCON;
-	volatile uint8_t reserved3;
-	/* 0x006: PS/2 Output Signal */
-	volatile uint8_t PSOSIG;
-	volatile uint8_t reserved4;
-	/* 0x008: PS/2 Input Signal */
-	volatile uint8_t PSISIG;
-	volatile uint8_t reserved5;
-	/* 0x00A: PS/2 Interrupt Enable */
-	volatile uint8_t PSIEN;
-	volatile uint8_t reserved6;
-};
-
-/* PS/2 Interface registers fields */
-#define NPCX_PSTAT_SOT                   0
-#define NPCX_PSTAT_EOT                   1
-#define NPCX_PSTAT_PERR                  2
-#define NPCX_PSTAT_ACH                   FIELD(3, 3)
-#define NPCX_PSTAT_RFERR                 6
-
-#define NPCX_PSCON_EN                    0
-#define NPCX_PSCON_XMT                   1
-#define NPCX_PSCON_HDRV                  FIELD(2, 2)
-#define NPCX_PSCON_IDB                   FIELD(4, 3)
-#define NPCX_PSCON_WPUED                 7
-
-#define NPCX_PSOSIG_WDAT0                0
-#define NPCX_PSOSIG_WDAT1                1
-#define NPCX_PSOSIG_WDAT2                2
-#define NPCX_PSOSIG_CLK0                 3
-#define NPCX_PSOSIG_CLK1                 4
-#define NPCX_PSOSIG_CLK2                 5
-#define NPCX_PSOSIG_WDAT3                6
-#define NPCX_PSOSIG_CLK3                 7
-#define NPCX_PSOSIG_CLK(n)               (((n) < 3) ? ((n) + 3) : 7)
-#define NPCX_PSOSIG_WDAT(n)              (((n) < 3) ? ((n) + 0) : 6)
-#define NPCX_PSOSIG_CLK_MASK_ALL \
-					 (BIT(NPCX_PSOSIG_CLK0) | \
-					  BIT(NPCX_PSOSIG_CLK1) | \
-					  BIT(NPCX_PSOSIG_CLK2) | \
-					  BIT(NPCX_PSOSIG_CLK3))
-
-#define NPCX_PSIEN_SOTIE                 0
-#define NPCX_PSIEN_EOTIE                 1
-#define NPCX_PSIEN_PS2_WUE               4
-#define NPCX_PSIEN_PS2_CLK_SEL           7
-
-/* Flash Interface Unit (FIU) device registers */
-struct fiu_reg {
-	volatile uint8_t reserved1;
-	/* 0x001: Burst Configuration */
-	volatile uint8_t BURST_CFG;
-	/* 0x002: FIU Response Configuration */
-	volatile uint8_t RESP_CFG;
-	volatile uint8_t reserved2[17];
-	/* 0x014: SPI Flash Configuration */
-	volatile uint8_t SPI_FL_CFG;
-	volatile uint8_t reserved3;
-	/* 0x016: UMA Code Byte */
-	volatile uint8_t UMA_CODE;
-	/* 0x017: UMA Address Byte 0 */
-	volatile uint8_t UMA_AB0;
-	/* 0x018: UMA Address Byte 1 */
-	volatile uint8_t UMA_AB1;
-	/* 0x019: UMA Address Byte 2 */
-	volatile uint8_t UMA_AB2;
-	/* 0x01A: UMA Data Byte 0 */
-	volatile uint8_t UMA_DB0;
-	/* 0x01B: UMA Data Byte 1 */
-	volatile uint8_t UMA_DB1;
-	/* 0x01C: UMA Data Byte 2 */
-	volatile uint8_t UMA_DB2;
-	/* 0x01D: UMA Data Byte 3 */
-	volatile uint8_t UMA_DB3;
-	/* 0x01E: UMA Control and Status */
-	volatile uint8_t UMA_CTS;
-	/* 0x01F: UMA Extended Control and Status */
-	volatile uint8_t UMA_ECTS;
-	/* 0x020: UMA Data Bytes 0-3 */
-	volatile uint32_t UMA_DB0_3;
-	volatile uint8_t reserved4[2];
-	/* 0x026: CRC Control Register */
-	volatile uint8_t CRCCON;
-	/* 0x027: CRC Entry Register */
-	volatile uint8_t CRCENT;
-	/* 0x028: CRC Initialization and Result Register */
-	volatile uint32_t CRCRSLT;
-	volatile uint8_t reserved5[4];
-	/* 0x030: FIU Read Command */
-	volatile uint8_t FIU_RD_CMD;
-	volatile uint8_t reserved6;
-	/* 0x032: FIU Dummy Cycles */
-	volatile uint8_t FIU_DMM_CYC;
-	/* 0x033: FIU Extended Configuration */
-	volatile uint8_t FIU_EXT_CFG;
-#if defined(CONFIG_SOC_SERIES_NPCX9)
-	/* 0x034: UMA address byte 0-3 */
-	volatile uint32_t UMA_AB0_3;
-	/* 0x038-0x3C */
-	volatile uint8_t reserved8[5];
-	/* 0x03D: SPI Device */
-	volatile uint8_t SPI1_DEV;
-	/* 0x03E-0x3F */
-	volatile uint8_t reserved9[2];
-#elif defined(CONFIG_SOC_SERIES_NPCX4)
-	/* 0x034: UMA address byte 0-3 */
-	volatile uint32_t UMA_AB0_3;
-	/* 0x038-0x3B */
-	volatile uint8_t reserved8[4];
-	/* 0x03C: SPI Device */
-	volatile uint8_t SPI_DEV;
-	/* 0x03D */
-	volatile uint8_t reserved9;
-	/* 0x03E */
-	volatile uint8_t SPI_DEV_SIZE;
-	/* 0x03F */
-	volatile uint8_t reserved10;
-#endif
-};
-
-/* FIU register fields */
-#define NPCX_BURST_CFG_SPI_DEV_SEL       FIELD(4, 2)
-#define NPCX_RESP_CFG_IAD_EN             0
-#define NPCX_RESP_CFG_DEV_SIZE_EX        2
-#define NPCX_RESP_CFG_QUAD_EN            3
-#define NPCX_SPI_FL_CFG_RD_MODE          FIELD(6, 2)
-#define NPCX_UMA_CTS_A_SIZE              3
-#define NPCX_UMA_CTS_C_SIZE              4
-#define NPCX_UMA_CTS_RD_WR               5
-#define NPCX_UMA_CTS_DEV_NUM             6
-#define NPCX_UMA_CTS_EXEC_DONE           7
-#define NPCX_UMA_ECTS_SW_CS0             0
-#define NPCX_UMA_ECTS_SW_CS1             1
-#define NPCX_UMA_ECTS_SEC_CS             2
-#define NPCX_UMA_ECTS_UMA_LOCK           3
-#define NPCX_UMA_ECTS_UMA_ADDR_SIZE      FIELD(4, 3)
-#define NPCX_SPI1_DEV_FOUR_BADDR_CS10    6
-#define NPCX_SPI1_DEV_FOUR_BADDR_CS11    7
-#define NPCX_SPI1_DEV_SPI1_LO_DEV_SIZE   FIELD(0, 4)
-#define NPCX_FIU_EXT_CFG_SET_DMM_EN      2
-#define NPCX_FIU_EXT_CFG_SET_CMD_EN      1
-#define NPCX_SPI_DEV_NADDRB              FIELD(5, 3)
-
-#define NPCX_MSR_IE_CFG_UMA_BLOCK        3
-
-/* UMA fields selections */
-#define UMA_FLD_ADDR     BIT(NPCX_UMA_CTS_A_SIZE)  /* 3-bytes ADR field */
-#define UMA_FLD_NO_CMD   BIT(NPCX_UMA_CTS_C_SIZE)  /* No 1-Byte CMD field */
-#define UMA_FLD_WRITE    BIT(NPCX_UMA_CTS_RD_WR)   /* Write transaction */
-#define UMA_FLD_SHD_SL   BIT(NPCX_UMA_CTS_DEV_NUM) /* Shared flash selected */
-#define UMA_FLD_EXEC     BIT(NPCX_UMA_CTS_EXEC_DONE)
-
-#define UMA_FIELD_DATA_1 0x01
-#define UMA_FIELD_DATA_2 0x02
-#define UMA_FIELD_DATA_3 0x03
-#define UMA_FIELD_DATA_4 0x04
-
-/* UMA code for transaction */
-#define UMA_CODE_CMD_ONLY       (UMA_FLD_EXEC | UMA_FLD_SHD_SL)
-#define UMA_CODE_CMD_ADR        (UMA_FLD_EXEC | UMA_FLD_ADDR | \
-					UMA_FLD_SHD_SL)
-#define UMA_CODE_CMD_RD_BYTE(n) (UMA_FLD_EXEC | UMA_FIELD_DATA_##n | \
-					UMA_FLD_SHD_SL)
-#define UMA_CODE_RD_BYTE(n)     (UMA_FLD_EXEC | UMA_FLD_NO_CMD | \
-					UMA_FIELD_DATA_##n | UMA_FLD_SHD_SL)
-#define UMA_CODE_CMD_WR_ONLY    (UMA_FLD_EXEC | UMA_FLD_WRITE | \
-					UMA_FLD_SHD_SL)
-#define UMA_CODE_CMD_WR_BYTE(n) (UMA_FLD_EXEC | UMA_FLD_WRITE | \
-					UMA_FIELD_DATA_##n | UMA_FLD_SHD_SL)
-#define UMA_CODE_CMD_WR_ADR     (UMA_FLD_EXEC | UMA_FLD_WRITE | UMA_FLD_ADDR | \
-				UMA_FLD_SHD_SL)
-
-#define UMA_CODE_CMD_ADR_WR_BYTE(n) (UMA_FLD_EXEC | UMA_FLD_WRITE | \
-					UMA_FLD_ADDR | UMA_FIELD_DATA_##n | \
-					UMA_FLD_SHD_SL)
-
-/* Platform Environment Control Interface (PECI) device registers */
-struct peci_reg {
-	/* 0x000: PECI Control Status */
-	volatile uint8_t PECI_CTL_STS;
-	/* 0x001: PECI Read Length */
-	volatile uint8_t PECI_RD_LENGTH;
-	/* 0x002: PECI Address */
-	volatile uint8_t PECI_ADDR;
-	/* 0x003: PECI Command */
-	volatile uint8_t PECI_CMD;
-	/* 0x004: PECI Control 2 */
-	volatile uint8_t PECI_CTL2;
-	/* 0x005: PECI Index */
-	volatile uint8_t PECI_INDEX;
-	/* 0x006: PECI Index Data */
-	volatile uint8_t PECI_IDATA;
-	/* 0x007: PECI Write Length */
-	volatile uint8_t PECI_WR_LENGTH;
-	volatile uint8_t reserved1[3];
-	/* 0x00B: PECI Write FCS */
-	volatile uint8_t PECI_WR_FCS;
-	/* 0x00C: PECI Read FCS */
-	volatile uint8_t PECI_RD_FCS;
-	/* 0x00D: PECI Assured Write FCS */
-	volatile uint8_t PECI_AW_FCS;
-	volatile uint8_t reserved2;
-	/* 0x00F: PECI Transfer Rate */
-	volatile uint8_t PECI_RATE;
-	/* 0x010 - 0x04F: PECI Data In/Out */
-	union {
-		volatile uint8_t PECI_DATA_IN[64];
-		volatile uint8_t PECI_DATA_OUT[64];
-	};
-};
-
-/* PECI register fields */
-#define NPCX_PECI_CTL_STS_START_BUSY     0
-#define NPCX_PECI_CTL_STS_DONE           1
-#define NPCX_PECI_CTL_STS_CRC_ERR        3
-#define NPCX_PECI_CTL_STS_ABRT_ERR       4
-#define NPCX_PECI_CTL_STS_AWFCS_EB       5
-#define NPCX_PECI_CTL_STS_DONE_EN        6
-#define NPCX_PECI_RATE_MAX_BIT_RATE      FIELD(0, 5)
-#define NPCX_PECI_RATE_MAX_BIT_RATE_MASK 0x1F
-/* The minimal valid value of NPCX_PECI_RATE_MAX_BIT_RATE field */
-#define PECI_MAX_BIT_RATE_VALID_MIN      0x05
-#define PECI_HIGH_SPEED_MIN_VAL          0x07
-
-#define NPCX_PECI_RATE_EHSP              6
-
-/* KBS (Keyboard Scan) device registers */
-struct kbs_reg {
-	volatile uint8_t reserved1[4];
-	/* 0x004: Keyboard Scan In */
-	volatile uint8_t KBSIN;
-	/* 0x005: Keyboard Scan In Pull-Up Enable */
-	volatile uint8_t KBSINPU;
-	/* 0x006: Keyboard Scan Out 0 */
-	volatile uint16_t KBSOUT0;
-	/* 0x008: Keyboard Scan Out 1 */
-	volatile uint16_t KBSOUT1;
-	/* 0x00A: Keyboard Scan Buffer Index */
-	volatile uint8_t KBS_BUF_INDX;
-	/* 0x00B: Keyboard Scan Buffer Data */
-	volatile uint8_t KBS_BUF_DATA;
-	/* 0x00C: Keyboard Scan Event */
-	volatile uint8_t KBSEVT;
-	/* 0x00D: Keyboard Scan Control */
-	volatile uint8_t KBSCTL;
-	/* 0x00E: Keyboard Scan Configuration Index */
-	volatile uint8_t KBS_CFG_INDX;
-	/* 0x00F: Keyboard Scan Configuration Data */
-	volatile uint8_t KBS_CFG_DATA;
-};
-
-/* KBS register fields */
-#define NPCX_KBSBUFINDX                  0
-#define NPCX_KBSEVT_KBSDONE              0
-#define NPCX_KBSEVT_KBSERR               1
-#define NPCX_KBSCTL_START                0
-#define NPCX_KBSCTL_KBSMODE              1
-#define NPCX_KBSCTL_KBSIEN               2
-#define NPCX_KBSCTL_KBSINC               3
-#define NPCX_KBSCTL_KBHDRV_FIELD         FIELD(6, 2)
-#define NPCX_KBSCFGINDX                  0
-/* Index of 'Automatic Scan' configuration register */
-#define KBS_CFG_INDX_DLY1                0 /* Keyboard Scan Delay T1 Byte */
-#define KBS_CFG_INDX_DLY2                1 /* Keyboard Scan Delay T2 Byte */
-#define KBS_CFG_INDX_RTYTO               2 /* Keyboard Scan Retry Timeout */
-#define KBS_CFG_INDX_CNUM                3 /* Keyboard Scan Columns Number */
-#define KBS_CFG_INDX_CDIV                4 /* Keyboard Scan Clock Divisor */
-
-/* SHI (Serial Host Interface) registers */
-struct shi_reg {
-	volatile uint8_t reserved1;
-	/* 0x001: SHI Configuration 1 */
-	volatile uint8_t SHICFG1;
-	/* 0x002: SHI Configuration 2 */
-	volatile uint8_t SHICFG2;
-	volatile uint8_t reserved2[2];
-	/* 0x005: Event Enable */
-	volatile uint8_t EVENABLE;
-	/* 0x006: Event Status */
-	volatile uint8_t EVSTAT;
-	/* 0x007: SHI Capabilities */
-	volatile uint8_t CAPABILITY;
-	/* 0x008: Status */
-	volatile uint8_t STATUS;
-	volatile uint8_t reserved3;
-	/* 0x00A: Input Buffer Status */
-	volatile uint8_t IBUFSTAT;
-	/* 0x00B: Output Buffer Status */
-	volatile uint8_t OBUFSTAT;
-	/* 0x00C: SHI Configuration 3 */
-	volatile uint8_t SHICFG3;
-	/* 0x00D: SHI Configuration 4 */
-	volatile uint8_t SHICFG4;
-	/* 0x00E: SHI Configuration 5 */
-	volatile uint8_t SHICFG5;
-	/* 0x00F: Event Status 2 */
-	volatile uint8_t EVSTAT2;
-	/* 0x010: Event Enable 2 */
-	volatile uint8_t EVENABLE2;
-	/* 0x011: SHI Configuration 6 - only in chips which support enhanced buffer mode */
-	volatile uint8_t SHICFG6;
-	/* 0x012: Single Byte Output Buffer - only in chips which support enhanced buffer mode */
-	volatile uint8_t SBOBUF;
-	volatile uint8_t reserved4[13];
-	/* 0x20~0x9F: Output Buffer */
-	volatile uint8_t OBUF[128];
-	/* 0xA0~0x11F: Input Buffer */
-	volatile uint8_t IBUF[128];
-};
-
-/* SHI register fields */
-#define NPCX_SHICFG1_EN                  0
-#define NPCX_SHICFG1_MODE                1
-#define NPCX_SHICFG1_WEN                 2
-#define NPCX_SHICFG1_AUTIBF              3
-#define NPCX_SHICFG1_AUTOBE              4
-#define NPCX_SHICFG1_DAS                 5
-#define NPCX_SHICFG1_CPOL                6
-#define NPCX_SHICFG1_IWRAP               7
-#define NPCX_SHICFG2_SIMUL               0
-#define NPCX_SHICFG2_BUSY                1
-#define NPCX_SHICFG2_ONESHOT             2
-#define NPCX_SHICFG2_SLWU                3
-#define NPCX_SHICFG2_REEN                4
-#define NPCX_SHICFG2_RESTART             5
-#define NPCX_SHICFG2_REEVEN              6
-#define NPCX_EVENABLE_OBEEN              0
-#define NPCX_EVENABLE_OBHEEN             1
-#define NPCX_EVENABLE_IBFEN              2
-#define NPCX_EVENABLE_IBHFEN             3
-#define NPCX_EVENABLE_EOREN              4
-#define NPCX_EVENABLE_EOWEN              5
-#define NPCX_EVENABLE_STSREN             6
-#define NPCX_EVENABLE_IBOREN             7
-#define NPCX_EVSTAT_OBE                  0
-#define NPCX_EVSTAT_OBHE                 1
-#define NPCX_EVSTAT_IBF                  2
-#define NPCX_EVSTAT_IBHF                 3
-#define NPCX_EVSTAT_EOR                  4
-#define NPCX_EVSTAT_EOW                  5
-#define NPCX_EVSTAT_STSR                 6
-#define NPCX_EVSTAT_IBOR                 7
-#define NPCX_STATUS_OBES                 6
-#define NPCX_STATUS_IBFS                 7
-#define NPCX_SHICFG3_OBUFLVLDIS          7
-#define NPCX_SHICFG4_IBUFLVLDIS          7
-#define NPCX_SHICFG5_IBUFLVL2            FIELD(0, 6)
-#define NPCX_SHICFG5_IBUFLVL2DIS         7
-#define NPCX_EVSTAT2_IBHF2               0
-#define NPCX_EVSTAT2_CSNRE               1
-#define NPCX_EVSTAT2_CSNFE               2
-#define NPCX_EVENABLE2_IBHF2EN           0
-#define NPCX_EVENABLE2_CSNREEN           1
-#define NPCX_EVENABLE2_CSNFEEN           2
-#define NPCX_SHICFG6_EBUFMD              0
-#define NPCX_SHICFG6_OBUF_SL             1
-
-#define IBF_IBHF_EN_MASK                 (BIT(NPCX_EVENABLE_IBFEN) | BIT(NPCX_EVENABLE_IBHFEN))
-
-/* SPIP (SPI Peripheral Interface) registers */
-struct spip_reg {
-	/* 0x000: SPIP Data In/Out */
-	volatile uint16_t SPIP_DATA;
-	/* 0x002: SPIP Control 1 */
-	volatile uint16_t SPIP_CTL1;
-	/* 0x004: SPIP Status */
-	volatile uint8_t SPIP_STAT;
-	volatile uint8_t reserved1;
-};
-
-#define NPCX_SPIP_CTL1_SPIEN            0
-#define NPCX_SPIP_CTL1_MOD              2
-#define NPCX_SPIP_CTL1_EIR              5
-#define NPCX_SPIP_CTL1_EIW              6
-#define NPCX_SPIP_CTL1_SCM              7
-#define NPCX_SPIP_CTL1_SCIDL            8
-#define NPCX_SPIP_CTL1_SCDV             FIELD(9, 7)
-#define NPCX_SPIP_STAT_BSY              0
-#define NPCX_SPIP_STAT_RBF              1
-
-/* Software-triggered Pheripheral Reset Controller Register */
-struct swrst_reg {
-	/* 0x000: Software Reset Trigger */
-	volatile uint16_t SWRST_TRG;
-	volatile uint8_t reserved1[2];
-	volatile uint32_t SWRST_CTL[4];
-};
-
-/* Improved Inter Integrated Circuit  (I3C) device registers */
-struct i3c_reg {
-	/* 0x000: Controller Configuration */
-	volatile uint32_t MCONFIG;
-	/* 0x004: Target Configuration */
-	volatile uint32_t CONFIG;
-	/* 0x008: Target Status */
-	volatile uint32_t STATUS;
-	/* 0x00C: Target Control  */
-	volatile uint32_t CTRL;
-	/* 0x010: Target Interrupt Enable Set  */
-	volatile uint32_t INTSET;
-	/* 0x014: Target Interrupt Enable Clear */
-	volatile uint32_t INTCLR;
-	/* 0x018: Target Interrupt Masked */
-	volatile uint32_t INTMASKED;
-	/* 0x01C: Target Error and Warning */
-	volatile uint32_t ERRWARN;
-	/* 0x020: Target DMA Control */
-	volatile uint32_t DMACTRL;
-	/* 0x024-0x02B: reserved */
-	volatile uint32_t reserved0[2];
-	/* 0x02C: Target Data Control */
-	volatile uint32_t DATACTRL;
-	/* 0x030: Target Write Byte Data */
-	volatile uint32_t WDATAB;
-	/* 0x034: Target Write Byte Data as End */
-	volatile uint32_t WDATABE;
-	/* 0x038: Target Write Half-Word Data */
-	volatile uint32_t WDATAH;
-	/* 0x03C: Target Write Half-Word Data as End */
-	volatile uint32_t WDATAHE;
-	/* 0x040: Target Read Byte Data */
-	volatile uint32_t RDATAB;
-	/* 0x044: reserved */
-	volatile uint32_t reserved1;
-	/* 0x048: Target Read Half-Word Data */
-	volatile uint32_t RDATAH;
-	/* 0x04C-0x05B: reserved */
-	volatile uint32_t reserved2[4];
-	/* 0x05C: Target Capabilities 2 */
-	volatile uint32_t CCAPABILITIES2;
-	/* 0x060: Target Capabilities */
-	volatile uint32_t CCAPABILITIES;
-	/* 0x064: Target Dynamic Address */
-	volatile uint32_t DYNADDR;
-	/* 0x068: Target Maximum Limits */
-	volatile uint32_t MAXLIMITS;
-	/* 0x06C: Target Part Number */
-	volatile uint32_t PARTNO;
-	/* 0x070: Target ID Extension */
-	volatile uint32_t IDEXT;
-	/* 0x074: Target Vendor ID */
-	volatile uint32_t VENDORID;
-	/* 0x078: Target Timing Control Clock */
-	volatile uint32_t TCCLOCK;
-	/* 0x07C: Target Matching Address Index */
-	volatile uint32_t MSGLAST;
-	/* 0x080: reserved */
-	volatile uint32_t reserved3;
-	/* 0x084: Controller Control  */
-	volatile uint32_t MCTRL;
-	/* 0x088: Controller Status */
-	volatile uint32_t MSTATUS;
-	/* 0x08C: IBI Registry and Rules */
-	volatile uint32_t IBIRULES;
-	/* 0x090: Controller Interrupt Enable Set  */
-	volatile uint32_t MINTSET;
-	/* 0x094: Controller Interrupt Enable Clear */
-	volatile uint32_t MINTCLR;
-	/* 0x098: Controller Interrupt Masked */
-	volatile uint32_t MINTMASKED;
-	/* 0x09C: Controller Error and Warning */
-	volatile uint32_t MERRWARN;
-	/* 0x0A0: Controller DMA Control */
-	volatile uint32_t MDMACTRL;
-	/* 0x0A0-0x0AB: reserved */
-	volatile uint32_t reserved4[2];
-	/* 0x0AC: Controller Data Control */
-	volatile uint32_t MDATACTRL;
-	/* 0x0B0: Controller Write Byte Data */
-	volatile uint32_t MWDATAB;
-	/* 0x0B4: Controller Write Byte Data as End */
-	volatile uint32_t MWDATABE;
-	/* 0x0B8: Controller Write Half-Word Data */
-	volatile uint32_t MWDATAH;
-	/* 0x0BC: Controller Write Half-Word Data as End */
-	volatile uint32_t MWDATAHE;
-	/* 0x0C0: Controller Read Byte Data */
-	volatile uint32_t MRDATAB;
-	/* 0x0C4: reserved */
-	volatile uint32_t reserved5;
-	/* 0x0C8: Controller Read Half-Word Data */
-	volatile uint32_t MRDATAH;
-	/* 0x0CC-0x0D7: reserved */
-	volatile uint32_t reserved6[3];
-	/* 0x0D8: Start or Continue DDR Message */
-	volatile uint32_t MWMSG_DDR;
-	/* 0x0DC: Read DDR Message Data */
-	volatile uint32_t MRMSG_DDR;
-	/* 0x0E0: reserved */
-	volatile uint32_t reserved7;
-	/* 0x0E4: Controller Dynamic Address */
-	volatile uint32_t MDYNADDR;
-	/* 0x0E8-0x0FF reserved */
-	volatile uint32_t reserved8[6];
-	/* 0x100: Target Reset Recovery Time */
-	volatile uint32_t RSTACTTIME;
-	/* 0x104: reserved */
-	volatile uint32_t reserved9;
-	/* 0x108: Target HDR Command Byte */
-	volatile uint32_t HDRCMD;
-	/* 0x10C-0x113: reserved */
-	volatile uint32_t reserved10[2];
-	/* 0x114: Target Group Definition */
-	volatile uint32_t GROUPDEF;
-	/* 0x118: reserved */
-	volatile uint32_t reserved11;
-	/* 0x11C: Target Map Control 0 */
-	volatile uint32_t MAPCTRL0;
-	/* 0x120: Target Map Control 1 */
-	volatile uint32_t MAPCTRL1;
-	/* 0x124: Target Map Control 2 */
-	volatile uint32_t MAPCTRL2;
-	/* 0x128: Target Map Control 3 */
-	volatile uint32_t MAPCTRL3;
-	/* 0x12C: Target Map Control 4 */
-	volatile uint32_t MAPCTRL4;
-	/* 0x130: Target Map Control 5 */
-	volatile uint32_t MAPCTRL5;
-	/* 0x134: Target Map Control 6 */
-	volatile uint32_t MAPCTRL6;
-	/* 0x138: Target Map Control 7 */
-	volatile uint32_t MAPCTRL7;
-	/* 0x13C: Target Map Control 8 */
-	volatile uint32_t MAPCTRL8;
-	/* 0x140: Target Extended IBI Data 1 */
-	volatile uint32_t IBIEXT1;
-	/* 0x144: Target Extended IBI Data 2 */
-	volatile uint32_t IBIEXT2;
-};
-
-/* I3C controller register fields */
-#define NPCX_I3C_MCONFIG_CTRENA         FIELD(0, 2)
-#define NPCX_I3C_MCONFIG_DISTO          3
-#define NPCX_I3C_MCONFIG_HKEEP          FIELD(4, 2) /* Must be '11' */
-#define NPCX_I3C_MCONFIG_ODSTOP         6
-#define NPCX_I3C_MCONFIG_PPBAUD         FIELD(8, 4)
-#define NPCX_I3C_MCONFIG_PPLOW          FIELD(12, 4)
-#define NPCX_I3C_MCONFIG_ODBAUD         FIELD(16, 8)
-#define NPCX_I3C_MCONFIG_ODHPP          24
-#define NPCX_I3C_MCONFIG_SKEW           FIELD(25, 3)
-#define NPCX_I3C_MCONFIG_I2CBAUD        FIELD(28, 4)
-#define NPCX_I3C_MCTRL_REQUEST          FIELD(0, 3)
-#define NPCX_I3C_MCTRL_TYPE             FIELD(4, 2)
-#define NPCX_I3C_MCTRL_IBIRESP          FIELD(6, 2)
-#define NPCX_I3C_MCTRL_DIR              8
-#define NPCX_I3C_MCTRL_ADDR             FIELD(9, 7)
-#define NPCX_I3C_MCTRL_RDTERM           FIELD(16, 8)
-#define NPCX_I3C_MSTATUS_STATE          FIELD(0, 3)
-#define NPCX_I3C_MSTATUS_BETWEEN        4
-#define NPCX_I3C_MSTATUS_NACKED         5
-#define NPCX_I3C_MSTATUS_IBITYPE        FIELD(6, 2)
-#define NPCX_I3C_MSTATUS_TGTSTART       8
-#define NPCX_I3C_MSTATUS_MCTRLDONE      9
-#define NPCX_I3C_MSTATUS_COMPLETE       10
-#define NPCX_I3C_MSTATUS_RXPEND         11
-#define NPCX_I3C_MSTATUS_TXNOTFULL      12
-#define NPCX_I3C_MSTATUS_IBIWON         13
-#define NPCX_I3C_MSTATUS_ERRWARN        15
-#define NPCX_I3C_MSTATUS_NOWCNTLR       19
-#define NPCX_I3C_MSTATUS_IBIADDR        FIELD(24, 7)
-#define NPCX_I3C_IBIRULES_MSB0          30
-#define NPCX_I3C_IBIRULES_NOBYTE        31
-#define NPCX_I3C_MINTSET_TGTSTART       8
-#define NPCX_I3C_MINTSET_MCTRLDONE      9
-#define NPCX_I3C_MINTSET_COMPLETE       10
-#define NPCX_I3C_MINTSET_RXPEND         11
-#define NPCX_I3C_MINTSET_TXNOTFULL      12
-#define NPCX_I3C_MINTSET_IBIWON         13
-#define NPCX_I3C_MINTSET_ERRWARN        15
-#define NPCX_I3C_MINTSET_NOWCNTLR       19
-#define NPCX_I3C_MINTCLR_TGTSTART       8
-#define NPCX_I3C_MINTCLR_MCTRLDONE      9
-#define NPCX_I3C_MINTCLR_COMPLETE       10
-#define NPCX_I3C_MINTCLR_RXPEND         11
-#define NPCX_I3C_MINTCLR_TXNOTFULL      12
-#define NPCX_I3C_MINTCLR_IBIWON         13
-#define NPCX_I3C_MINTCLR_ERRWARN        15
-#define NPCX_I3C_MINTCLR_NOWCNTLR       19
-#define NPCX_I3C_MINTMASKED_NOWCNTLR    19
-#define NPCX_I3C_MDATACTRL_FLUSHTB      0
-#define NPCX_I3C_MDATACTRL_FLUSHFB      1
-#define NPCX_I3C_MDATACTRL_UNLOCK       3
-#define NPCX_I3C_MDATACTRL_TXTRIG       FIELD(4, 2)
-#define NPCX_I3C_MDATACTRL_RXTRIG       FIELD(6, 2)
-#define NPCX_I3C_MDATACTRL_TXCOUNT      FIELD(16, 5)
-#define NPCX_I3C_MDATACTRL_RXCOUNT      FIELD(24, 5)
-#define NPCX_I3C_MDATACTRL_TXFULL       30
-#define NPCX_I3C_MDATACTRL_RXEMPTY      31
-#define NPCX_I3C_MERRWARN_NACK          2
-#define NPCX_I3C_MERRWARN_WRABT         3
-#define NPCX_I3C_MERRWARN_TERM          4
-#define NPCX_I3C_MERRWARN_HPAR          9
-#define NPCX_I3C_MERRWARN_HCRC          10
-#define NPCX_I3C_MERRWARN_OREAD         16
-#define NPCX_I3C_MERRWARN_OWRITE        17
-#define NPCX_I3C_MERRWARN_MSGERR        18
-#define NPCX_I3C_MERRWARN_INVERQ        19
-#define NPCX_I3C_MERRWARN_TIMEOUT       20
-#define NPCX_I3C_MDMACTRL_DMAFB         FIELD(0, 2)
-#define NPCX_I3C_MDMACTRL_DMATB         FIELD(2, 2)
-
-/* I3C target register fields */
-#define NPCX_I3C_CONFIG_TGTENA          0
-#define NPCX_I3C_CONFIG_MATCHSS         2
-#define NPCX_I3C_CONFIG_S0IGNORE        3
-#define NPCX_I3C_CONFIG_IDRAND          8
-#define NPCX_I3C_CONFIG_OFFLINE         9
-#define NPCX_I3C_CONFIG_HDRCMD          FIELD(10, 2)
-#define NPCX_I3C_CONFIG_BAMATCH         FIELD(16, 7)
-#define NPCX_I3C_CONFIG_SADDR           FIELD(25, 7)
-#define NPCX_I3C_STATUS_STNOTSTOP       0
-#define NPCX_I3C_STATUS_STMSG           1
-#define NPCX_I3C_STATUS_STCCCH          2
-#define NPCX_I3C_STATUS_STREQRD         3
-#define NPCX_I3C_STATUS_STREQWR         4
-#define NPCX_I3C_STATUS_STDAA           5
-#define NPCX_I3C_STATUS_STHDR           6
-#define NPCX_I3C_STATUS_START           8
-#define NPCX_I3C_STATUS_MATCHED         9
-#define NPCX_I3C_STATUS_STOP            10
-#define NPCX_I3C_STATUS_RXPEND          11
-#define NPCX_I3C_STATUS_TXNOTFULL       12
-#define NPCX_I3C_STATUS_DACHG           13
-#define NPCX_I3C_STATUS_CCC             14
-#define NPCX_I3C_STATUS_ERRWARN         15
-#define NPCX_I3C_STATUS_HDRMATCH        16
-#define NPCX_I3C_STATUS_CHANDLED        17
-#define NPCX_I3C_STATUS_EVENT           18
-#define NPCX_I3C_STATUS_TGTRST          19
-#define NPCX_I3C_STATUS_EVDET           FIELD(20, 2)
-#define NPCX_I3C_STATUS_IBIDIS          24
-#define NPCX_I3C_STATUS_MRDIS           25
-#define NPCX_I3C_STATUS_HJDIS           27
-#define NPCX_I3C_STATUS_ACTSTATE        FIELD(28, 2)
-#define NPCX_I3C_STATUS_TIMECTRL        FIELD(30, 2)
-#define NPCX_I3C_CTRL_EVENT             FIELD(0, 2)
-#define NPCX_I3C_CTRL_EXTDATA           3
-#define NPCX_I3C_CTRL_MAPIDX            FIELD(4, 4)
-#define NPCX_I3C_CTRL_IBIDATA           FIELD(8, 8)
-#define NPCX_I3C_CTRL_PENDINT           FIELD(16, 4)
-#define NPCX_I3C_CTRL_ACTSTATE          FIELD(20, 2)
-#define NPCX_I3C_CTRL_VENDINFO          FIELD(24, 8)
-#define NPCX_I3C_INTSET_START           8
-#define NPCX_I3C_INTSET_MATCHED         9
-#define NPCX_I3C_INTSET_STOP            10
-#define NPCX_I3C_INTSET_RXPEND          11
-#define NPCX_I3C_INTSET_TXNOTFULL       12
-#define NPCX_I3C_INTSET_DACHG           13
-#define NPCX_I3C_INTSET_CCC             14
-#define NPCX_I3C_INTSET_ERRWARN         15
-#define NPCX_I3C_INTSET_HDRMATCH        16
-#define NPCX_I3C_INTSET_CHANDLED        17
-#define NPCX_I3C_INTSET_EVENT           18
-#define NPCX_I3C_INTSET_TGTRST          19
-#define NPCX_I3C_INTCLR_START           8
-#define NPCX_I3C_INTCLR_MATCHED         9
-#define NPCX_I3C_INTCLR_STOP            10
-#define NPCX_I3C_INTCLR_RXPEND          11
-#define NPCX_I3C_INTCLR_TXNOTFULL       12
-#define NPCX_I3C_INTCLR_DACHG           13
-#define NPCX_I3C_INTCLR_CCC             14
-#define NPCX_I3C_INTCLR_ERRWARN         15
-#define NPCX_I3C_INTCLR_HDRMATCH        16
-#define NPCX_I3C_INTCLR_CHANDLED        17
-#define NPCX_I3C_INTCLR_EVENT           18
-#define NPCX_I3C_INTCLR_TGTRST          19
-#define NPCX_I3C_INTMASKED_START        8
-#define NPCX_I3C_INTMASKED_MATCHED      9
-#define NPCX_I3C_INTMASKED_STOP         10
-#define NPCX_I3C_INTMASKED_RXPEND       11
-#define NPCX_I3C_INTMASKED_TXNOTFULL    12
-#define NPCX_I3C_INTMASKED_DACHG        13
-#define NPCX_I3C_INTMASKED_CCC          14
-#define NPCX_I3C_INTMASKED_ERRWARN      15
-#define NPCX_I3C_INTMASKED_HDRMATCH     16
-#define NPCX_I3C_INTMASKED_CHANDLED     17
-#define NPCX_I3C_INTMASKED_EVENT        18
-#define NPCX_I3C_INTMASKED_TGTRST       19
-#define NPCX_I3C_ERRWARN_ORUN           0
-#define NPCX_I3C_ERRWARN_URUN           1
-#define NPCX_I3C_ERRWARN_URUNNACK       2
-#define NPCX_I3C_ERRWARN_TERM           3
-#define NPCX_I3C_ERRWARN_INVSTART       4
-#define NPCX_I3C_ERRWARN_SPAR           8
-#define NPCX_I3C_ERRWARN_HPAR           9
-#define NPCX_I3C_ERRWARN_HCRC           10
-#define NPCX_I3C_ERRWARN_S0S1           11
-#define NPCX_I3C_ERRWARN_OREAD          16
-#define NPCX_I3C_ERRWARN_OWRITE         17
-#define NPCX_I3C_DMACTRL_DMAFB          FIELD(0, 2)
-#define NPCX_I3C_DMACTRL_DMATB          FIELD(2, 2)
-#define NPCX_I3C_DATACTRL_FLUSHTB       0
-#define NPCX_I3C_DATACTRL_FLUSHFB       1
-#define NPCX_I3C_DATACTRL_UNLOCK        3
-#define NPCX_I3C_DATACTRL_TXTRIG        FIELD(4, 2)
-#define NPCX_I3C_DATACTRL_RXTRIG        FIELD(6, 2)
-#define NPCX_I3C_DATACTRL_TXCOUNT       FIELD(16, 6)
-#define NPCX_I3C_DATACTRL_RXCOUNT       FIELD(24, 6)
-#define NPCX_I3C_DATACTRL_TXFULL        30
-#define NPCX_I3C_DATACTRL_RXEMPTY       31
-#define NPCX_I3C_WDATAB_DATA            FIELD(0, 8)
-#define NPCX_I3C_WDATAB_END_B           8
-#define NPCX_I3C_WDATAB_END_A           16
-#define NPCX_I3C_WDATABE_DATA           FIELD(0, 8)
-#define NPCX_I3C_WDATAH_DATA0           FIELD(0, 8)
-#define NPCX_I3C_WDATAH_DATA1           FIELD(8, 8)
-#define NPCX_I3C_WDATAH_END             16
-#define NPCX_I3C_WDATAHE_DATA0          FIELD(0, 8)
-#define NPCX_I3C_WDATAHE_DATA1          FIELD(8, 8)
-#define NPCX_I3C_RDATAB_DATA            FIELD(0, 8)
-#define NPCX_I3C_RDATAH_DATA0           FIELD(0, 8)
-#define NPCX_I3C_RDATAH_DATA1           FIELD(8, 8)
-#define NPCX_I3C_CAPABILITIES2_MAPCNT   FIELD(0, 4)
-#define NPCX_I3C_CAPABILITIES2_I2C10B   4
-#define NPCX_I3C_CAPABILITIES2_I2CRST   5
-#define NPCX_I3C_CAPABILITIES2_I2CDEVID 6
-#define NPCX_I3C_CAPABILITIES2_DATA32   7
-#define NPCX_I3C_CAPABILITIES2_IBIEXT   8
-#define NPCX_I3C_CAPABILITIES2_IBIXREG  9
-#define NPCX_I3C_CAPABILITIES2_SMLANE   FIELD(12, 2)
-#define NPCX_I3C_CAPABILITIES2_V1_1     16
-#define NPCX_I3C_CAPABILITIES2_TGTRST   17
-#define NPCX_I3C_CAPABILITIES2_GROUP    FIELD(18, 2)
-#define NPCX_I3C_CAPABILITIES2_AASA     21
-#define NPCX_I3C_CAPABILITIES2_SSTSUB   22
-#define NPCX_I3C_CAPABILITIES2_SSTWR    23
-#define NPCX_I3C_CAPABILITIES_IDENA     FIELD(0, 2)
-#define NPCX_I3C_CAPABILITIES_IDREG     FIELD(2, 4)
-#define NPCX_I3C_CAPABILITIES_HDRSUPP   FIELD(6, 3)
-#define NPCX_I3C_CAPABILITIES_CNTLR     9
-#define NPCX_I3C_CAPABILITIES_SADDR     FIELD(10, 2)
-#define NPCX_I3C_CAPABILITIES_CCCHANDLE FIELD(12, 4)
-#define NPCX_I3C_CAPABILITIES_IBI_MR_HJ FIELD(16, 5)
-#define NPCX_I3C_CAPABILITIES_TIMECTRL  21
-#define NPCX_I3C_CAPABILITIES_EXTFIFO   FIELD(23, 3)
-#define NPCX_I3C_CAPABILITIES_FIFOTX    FIELD(26, 2)
-#define NPCX_I3C_CAPABILITIES_FIFORX    FIELD(28, 2)
-#define NPCX_I3C_CAPABILITIES_INT       30
-#define NPCX_I3C_CAPABILITIES_DMA       31
-#define NPCX_I3C_DYNADDR_DAVALID        0
-#define NPCX_I3C_DYNADDR_DADDR          FIELD(1, 7)
-#define NPCX_I3C_DYNADDR_CAUSE          FIELD(8, 3)
-#define NPCX_I3C_MAXLIMITS_MAXRD        FIELD(0, 12)
-#define NPCX_I3C_MAXLIMITS_MAXWR        FIELD(16, 12)
-#define NPCX_I3C_IDEXT_DCR              FIELD(8, 8)
-#define NPCX_I3C_IDEXT_BCR              FIELD(16, 8)
-#define NPCX_I3C_VENDORID_VID           FIELD(0, 15)
-#define NPCX_I3C_TCCLOCK_ACCURACY       FIELD(0, 8)
-#define NPCX_I3C_TCCLOCK_FREQ           FIELD(8, 8)
-#define NPCX_I3C_MSGLAST_MAPLAST        FIELD(0, 4)
-#define NPCX_I3C_MSGLAST_LASTSTATIC     4
-#define NPCX_I3C_MSGLAST_LASTGROUP      5
-#define NPCX_I3C_MSGLAST_LASTMODE       FIELD(6, 2)
-#define NPCX_I3C_MSGLAST_MAPLASTM1      FIELD(8, 4)
-#define NPCX_I3C_MSGLAST_LASTGROUPM1    13
-#define NPCX_I3C_MSGLAST_LASTMODE1      FIELD(14, 2)
-#define NPCX_I3C_MSGLAST_MAPLASTM2      FIELD(16, 4)
-#define NPCX_I3C_MSGLAST_LASTGROUPM2    21
-#define NPCX_I3C_MSGLAST_LASTMODE2      FIELD(22, 2)
-#define NPCX_I3C_RSTACTTIME_PERRSTTIM   FIELD(0, 8)
-#define NPCX_I3C_RSTACTTIME_SYSRSTTIM   FIELD(8, 8)
-#define NPCX_I3C_HDRCMD_CMD0            FIELD(0, 8)
-#define NPCX_I3C_HDRCMD_OVFL            30
-#define NPCX_I3C_HDRCMD_NEWCMD          31
-#define NPCX_I3C_GROUPDEF_GRP0ENA       0
-#define NPCX_I3C_GROUPDEF_GRP0DA        FIELD(1, 7)
-#define NPCX_I3C_GROUPDEF_GRP1ENA       8
-#define NPCX_I3C_GROUPDEF_GRP1DA        FIELD(9, 7)
-#define NPCX_I3C_GROUPDEF_GRP2ENA       16
-#define NPCX_I3C_GROUPDEF_GRP2DA        FIELD(17, 7)
-#define NPCX_I3C_MAPCTRL0_ENA           0
-#define NPCX_I3C_MAPCTRL0_DA            FIELD(1, 7)
-#define NPCX_I3C_MAPCTRL0_CAUSE         FIELD(8, 3)
-#define NPCX_I3C_MAPCTRLn_ENA           0
-#define NPCX_I3C_MAPCTRLn_ADDR          FIELD(1, 7)
-#define NPCX_I3C_MAPCTRLn_MAPSA         8
-#define NPCX_I3C_MAPCTRLn_NACK          12
-#define NPCX_I3C_MAPCTRLn_AUTO          13
-#define NPCX_I3C_MAPCTRLn_SLOT_PID      FIELD(14, 5)
-#define NPCX_I3C_IBIEXT1_CNT            FIELD(0, 3)
-#define NPCX_I3C_IBIEXT1_EXT1           FIELD(8, 8)
-#define NPCX_I3C_IBIEXT1_EXT2           FIELD(16, 8)
-#define NPCX_I3C_IBIEXT1_EXT3           FIELD(24, 8)
-#define NPCX_I3C_IBIEXT2_EXT4           FIELD(0, 8)
-#define NPCX_I3C_IBIEXT2_EXT5           FIELD(8, 8)
-#define NPCX_I3C_IBIEXT2_EXT6           FIELD(16, 8)
-#define NPCX_I3C_IBIEXT2_EXT7           FIELD(24, 8)
-
-/* MDMA Controller registers */
-struct mdma_reg {
-	/* Channel 0 */
-	/* 0x000: Channel 0 Control */
-	volatile uint32_t MDMA_CTL0;
-	/* 0x004: Channel 0 Source Base Address */
-	volatile uint32_t MDMA_SRCB0;
-	/* 0x008: Channel 0 Destination Base Address */
-	volatile uint32_t MDMA_DSTB0;
-	/* 0x00C: Channel 0 Transfer Count */
-	volatile uint32_t MDMA_TCNT0;
-	/* 0x010: reserved1 */
-	volatile uint32_t reserved1;
-	/* 0x014: Channel 0 Current Destination */
-	volatile uint32_t MDMA_CDST0;
-	/* 0x018: Channel 0 Current Transfer Count */
-	volatile uint32_t MDMA_CTCNT0;
-	/* 0x01C: reserved2 */
-	volatile uint32_t reserved2;
-
-	/* Channel 1 */
-	/* 0x020: Channel 1 Control */
-	volatile uint32_t MDMA_CTL1;
-	/* 0x024: Channel 1 Source Base Address */
-	volatile uint32_t MDMA_SRCB1;
-	/* 0x028: Channel 1 Destination Base Address */
-	volatile uint32_t MDMA_DSTB1;
-	/* 0x02C: Channel 1 Transfer Count */
-	volatile uint32_t MDMA_TCNT1;
-	/* 0x030: Channel 1 Current Source */
-	volatile uint32_t MDMA_CSRC1;
-	/* 0x034: reserved3 */
-	volatile uint32_t reserved3;
-	/* 0x038: Channel 1 Current Transfer Count */
-	volatile uint32_t MDMA_CTCNT1;
-};
-
-/* MDMA register fields */
-#define NPCX_MDMA_CTL_MDMAEN 0
-#define NPCX_MDMA_CTL_MPD    1
-#define NPCX_MDMA_CTL_SIEN   8
-#define NPCX_MDMA_CTL_MPS    14
-#define NPCX_MDMA_CTL_TC     18
-
-/* Channel 0/1 Transfer Count Register (MDMA_TCNT0/MDMA_TCNT1) */
-#define NPCX_MDMA_TCNT_TFR_CNT FIELD(0, 13)
-
-/* Channel 0/1 Current Transfer Count Register (MDMA_CTCNT0/MDMA_CTCNT1) */
-#define NPCX_MDMA_CTCNT_CURRENT_TFR_CNT FIELD(0, 13)
-
-#endif /* _NUVOTON_NPCX_REG_DEF_H */
diff --git a/soc/nuvoton/npcx/common/reg_access.h b/soc/nuvoton/npcx/common/reg_access.h
new file mode 100644
index 0000000000000..69e7e0003299f
--- /dev/null
+++ b/soc/nuvoton/npcx/common/reg_access.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2020 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _NUVOTON_NPCX_REG_ACCESS_H
+#define _NUVOTON_NPCX_REG_ACCESS_H
+
+/*
+ * NPCX register structure size/offset checking macro function to mitigate
+ * the risk of unexpected compiling results. All addresses of NPCX registers
+ * must meet the alignment requirement of cortex-m4.
+ * DO NOT use 'packed' attribute if module contains different length ie.
+ * 8/16/32 bits registers.
+ */
+#define NPCX_REG_SIZE_CHECK(reg_def, size)                                                         \
+	BUILD_ASSERT(sizeof(struct reg_def) == size, "Failed in size check of register "           \
+						     "structure!")
+#define NPCX_REG_OFFSET_CHECK(reg_def, member, offset)                                             \
+	BUILD_ASSERT(offsetof(struct reg_def, member) == offset,                                   \
+		     "Failed in offset check of register structure member!")
+
+/*
+ * NPCX register access checking via structure macro function to mitigate the
+ * risk of unexpected compiling results if module contains different length
+ * registers. For example, a word register access might break into two byte
+ * register accesses by adding 'packed' attribute.
+ *
+ * For example, add this macro for word register 'PRSC' of PWM module in its
+ * device init function for checking violation. Once it occurred, core will be
+ * stalled forever and easy to find out what happens.
+ */
+#define NPCX_REG_WORD_ACCESS_CHECK(reg, val)                                                       \
+	{                                                                                          \
+		uint16_t placeholder = reg;                                                        \
+		reg = val;                                                                         \
+		__ASSERT(reg == val, "16-bit reg access failed!");                                 \
+		reg = placeholder;                                                                 \
+	}
+#define NPCX_REG_DWORD_ACCESS_CHECK(reg, val)                                                      \
+	{                                                                                          \
+		uint32_t placeholder = reg;                                                        \
+		reg = val;                                                                         \
+		__ASSERT(reg == val, "32-bit reg access failed!");                                 \
+		reg = placeholder;                                                                 \
+	}
+
+/*
+ * NPCX register bit/field access operations
+ */
+
+#define GET_POS_FIELD(pos, size)  pos
+#define GET_SIZE_FIELD(pos, size) size
+#define FIELD_POS(field)          GET_POS_##field
+#define FIELD_SIZE(field)         GET_SIZE_##field
+
+#define GET_FIELD(reg, field)           _GET_FIELD_(reg, FIELD_POS(field), FIELD_SIZE(field))
+#define _GET_FIELD_(reg, f_pos, f_size) (((reg) >> (f_pos)) & ((1 << (f_size)) - 1))
+
+#define SET_FIELD(reg, field, value) _SET_FIELD_(reg, FIELD_POS(field), FIELD_SIZE(field), value)
+#define _SET_FIELD_(reg, f_pos, f_size, value)                                                     \
+	((reg) = ((reg) & (~(((1 << (f_size)) - 1) << (f_pos)))) | ((value) << (f_pos)))
+
+#define GET_FIELD_POS(field)   _GET_FIELD_POS_(FIELD_POS(field))
+#define _GET_FIELD_POS_(f_ops) f_ops
+
+#define GET_FIELD_SZ(field)   _GET_FIELD_SZ_(FIELD_SIZE(field))
+#define _GET_FIELD_SZ_(f_ops) f_ops
+
+#endif /* _NUVOTON_NPCX_REG_ACCESS_H */
diff --git a/soc/nuvoton/npcx/common/soc_clock.h b/soc/nuvoton/npcx/common/soc_clock.h
index 4ec4c591b04b4..314a7b5b9020b 100644
--- a/soc/nuvoton/npcx/common/soc_clock.h
+++ b/soc/nuvoton/npcx/common/soc_clock.h
@@ -26,16 +26,16 @@ extern "C" {
  * register/bit to turn on/off its source clock.
  */
 struct npcx_clk_cfg {
-	uint16_t bus:8;
-	uint16_t ctrl:5;
-	uint16_t bit:3;
+	uint16_t bus: 8;
+	uint16_t ctrl: 5;
+	uint16_t bit: 3;
 };
 
 /* Clock settings from pcc node */
 /* Target OFMCLK freq */
-#define OFMCLK DT_PROP(DT_NODELABEL(pcc), clock_frequency)
+#define OFMCLK      DT_PROP(DT_NODELABEL(pcc), clock_frequency)
 /* Core clock prescaler */
-#define FPRED_VAL (DT_PROP(DT_NODELABEL(pcc), core_prescaler) - 1)
+#define FPRED_VAL   (DT_PROP(DT_NODELABEL(pcc), core_prescaler) - 1)
 /* APB1 clock divider */
 #define APB1DIV_VAL (DT_PROP(DT_NODELABEL(pcc), apb1_prescaler) - 1)
 /* APB2 clock divider */
@@ -53,8 +53,8 @@ struct npcx_clk_cfg {
 
 /* Construct a uint8_t array from 'pwdwn-ctl-val' prop for PWDWN_CTL initialization. */
 #define NPCX_PWDWN_CTL_ITEMS_INIT(node, prop, idx) DT_PROP_BY_IDX(node, prop, idx),
-#define NPCX_PWDWN_CTL_INIT DT_FOREACH_PROP_ELEM(DT_NODELABEL(pcc), \
-				pwdwn_ctl_val, NPCX_PWDWN_CTL_ITEMS_INIT)
+#define NPCX_PWDWN_CTL_INIT                                                                        \
+	DT_FOREACH_PROP_ELEM(DT_NODELABEL(pcc), pwdwn_ctl_val, NPCX_PWDWN_CTL_ITEMS_INIT)
 
 /*
  * NPCX7 and later series clock tree macros:
@@ -71,105 +71,7 @@ struct npcx_clk_cfg {
 /* Core domain clock */
 #define CORE_CLK (OFMCLK / DT_PROP(DT_NODELABEL(pcc), core_prescaler))
 /* Low Frequency clock */
-#define LFCLK 32768
-
-/* FMUL clock */
-#if (OFMCLK > (MAX_OFMCLK / 2))
-#define FMCLK (OFMCLK / 2) /* FMUL clock = OFMCLK/2 */
-#else
-#define FMCLK OFMCLK /* FMUL clock = OFMCLK */
-#endif
-
-/* APBs source clock */
-#define APBSRC_CLK OFMCLK
-
-/* AHB6 clock */
-#if (CORE_CLK > (MAX_OFMCLK / 2))
-#define AHB6DIV_VAL 1 /* AHB6_CLK = CORE_CLK/2 */
-#else
-#define AHB6DIV_VAL 0 /* AHB6_CLK = CORE_CLK */
-#endif
-
-/* FIU clock divider */
-#if (CORE_CLK > (MAX_OFMCLK / 2))
-#define FIUDIV_VAL 1 /* FIU_CLK = CORE_CLK/2 */
-#else
-#define FIUDIV_VAL 0 /* FIU_CLK = CORE_CLK */
-#endif
-
-#if defined(CONFIG_CLOCK_CONTROL_NPCX_SUPP_FIU1)
-#if (CORE_CLK > (MAX_OFMCLK / 2))
-#define FIU1DIV_VAL 1 /* FIU1_CLK = CORE_CLK/2 */
-#else
-#define FIU1DIV_VAL 0 /* FIU1_CLK = CORE_CLK */
-#endif
-#endif /* CONFIG_CLOCK_CONTROL_NPCX_SUPP_FIU1 */
-
-/* I3C clock divider */
-#if (OFMCLK == MHZ(120)) /* MCLkD must between 40 mhz to 50 mhz*/
-#define MCLKD_SL 2    /* I3C_CLK = (MCLK / 3) */
-#elif (OFMCLK <= MHZ(100) && OFMCLK >= MHZ(80))
-#define MCLKD_SL 1    /* I3C_CLK = (MCLK / 2) */
-#else
-#define MCLKD_SL 0    /* I3C_CLK = MCLK */
-#endif
-
-
-/* Get APB clock freq */
-#define NPCX_APB_CLOCK(no) (APBSRC_CLK / (APB##no##DIV_VAL + 1))
-
-/*
- * Frequency multiplier M/N value definitions according to the requested
- * OFMCLK (Unit:Hz).
- */
-#if (OFMCLK > (MAX_OFMCLK / 2))
-#define HFCGN_VAL    0x82 /* Set XF_RANGE as 1 */
-#else
-#define HFCGN_VAL    0x02
-#endif
-#if   (OFMCLK == 120000000)
-#define HFCGMH_VAL   0x0E
-#define HFCGML_VAL   0x4E
-#elif (OFMCLK == 100000000)
-#define HFCGMH_VAL   0x0B
-#define HFCGML_VAL   0xEC
-#elif (OFMCLK == 96000000)
-#define HFCGMH_VAL   0x0B
-#define HFCGML_VAL   0x72
-#elif (OFMCLK == 90000000)
-#define HFCGMH_VAL   0x0A
-#define HFCGML_VAL   0xBA
-#elif (OFMCLK == 80000000)
-#define HFCGMH_VAL   0x09
-#define HFCGML_VAL   0x89
-#elif (OFMCLK == 66000000)
-#define HFCGMH_VAL   0x07
-#define HFCGML_VAL   0xDE
-#elif (OFMCLK == 50000000)
-#define HFCGMH_VAL   0x0B
-#define HFCGML_VAL   0xEC
-#elif (OFMCLK == 48000000)
-#define HFCGMH_VAL   0x0B
-#define HFCGML_VAL   0x72
-#else
-#error "Unsupported OFMCLK Frequency"
-#endif
-
-/* Clock prescaler configurations in different series */
-#define VAL_HFCGP   ((FPRED_VAL << 4) | AHB6DIV_VAL)
-#if defined(FIU1DIV_VAL)
-#define VAL_HFCBCD  ((FIU1DIV_VAL << 4) | (FIUDIV_VAL << 2))
-#else
-#define VAL_HFCBCD  (FIUDIV_VAL << 4)
-#endif /* FIU1DIV_VAL */
-#define VAL_HFCBCD1 (APB1DIV_VAL | (APB2DIV_VAL << 4))
-#if defined(APB4DIV_VAL)
-#define VAL_HFCBCD2 (APB3DIV_VAL | (APB4DIV_VAL << 4))
-#else
-#define VAL_HFCBCD2 APB3DIV_VAL
-#endif /* APB4DIV_VAL */
-/* I3C1~I3C3 share the same configuration */
-#define VAL_HFCBCD3 MCLKD_SL
+#define LFCLK    32768
 
 /**
  * @brief Function to notify clock driver that backup the counter value of
diff --git a/soc/nuvoton/npcx/common/soc_espi_taf.h b/soc/nuvoton/npcx/common/soc_espi_taf.h
index f4a80a2289646..4169f2c6ee51f 100644
--- a/soc/nuvoton/npcx/common/soc_espi_taf.h
+++ b/soc/nuvoton/npcx/common/soc_espi_taf.h
@@ -151,6 +151,8 @@ struct npcx_taf_head {
 
 int npcx_init_taf(const struct device *dev, sys_slist_t *callbacks);
 
+int espi_taf_npcx_block(const struct device *dev, bool en_block);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/soc/nuvoton/npcx/common/soc_pins.h b/soc/nuvoton/npcx/common/soc_pins.h
index dcd403aa306a4..3f057266fa0e2 100644
--- a/soc/nuvoton/npcx/common/soc_pins.h
+++ b/soc/nuvoton/npcx/common/soc_pins.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "reg/reg_def.h"
+#include "reg_def.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/nuvoton/npcx/npcx4/Kconfig.defconfig b/soc/nuvoton/npcx/npcx4/Kconfig.defconfig
index 330f309e1a23c..d30b62f3afe1b 100644
--- a/soc/nuvoton/npcx/npcx4/Kconfig.defconfig
+++ b/soc/nuvoton/npcx/npcx4/Kconfig.defconfig
@@ -6,7 +6,7 @@
 if SOC_SERIES_NPCX4
 
 config NUM_IRQS
-	default 128
+	default 86
 
 config CORTEX_M_SYSTICK
 	default !NPCX_ITIM_TIMER
diff --git a/soc/nuvoton/npcx/npcx4/Kconfig.soc b/soc/nuvoton/npcx/npcx4/Kconfig.soc
index e825bc7fc6ff3..940bf6c3bad9e 100644
--- a/soc/nuvoton/npcx/npcx4/Kconfig.soc
+++ b/soc/nuvoton/npcx/npcx4/Kconfig.soc
@@ -5,7 +5,7 @@
 
 config SOC_SERIES_NPCX4
 	bool
-	select SOC_FAMILY_NPCX
+	select NPCX_SOC_VARIANT_NPCXN
 	help
 	  Enable support for Nuvoton NPCX4 series
 
diff --git a/soc/nuvoton/npcx/npcx4/soc.h b/soc/nuvoton/npcx/npcx4/soc.h
index d3f387edd2738..5f92e153c4608 100644
--- a/soc/nuvoton/npcx/npcx4/soc.h
+++ b/soc/nuvoton/npcx/npcx4/soc.h
@@ -50,10 +50,9 @@
 /* NPCX4 Clock Configuration */
 #define MAX_OFMCLK 120000000
 
-#include <reg/reg_access.h>
-#include <reg/reg_def.h>
+#include "reg_def.h"
+#include "clock_def.h"
 #include <soc_dt.h>
-#include <soc_clock.h>
 #include <soc_espi_taf.h>
 #include <soc_pins.h>
 #include <soc_power.h>
diff --git a/soc/nuvoton/npcx/npcx7/Kconfig.soc b/soc/nuvoton/npcx/npcx7/Kconfig.soc
index ca2bb268d239e..ea7ac6f3479f2 100644
--- a/soc/nuvoton/npcx/npcx7/Kconfig.soc
+++ b/soc/nuvoton/npcx/npcx7/Kconfig.soc
@@ -5,7 +5,7 @@
 
 config SOC_SERIES_NPCX7
 	bool
-	select SOC_FAMILY_NPCX
+	select NPCX_SOC_VARIANT_NPCXN
 	help
 	  Enable support for Nuvoton NPCX7 series
 
diff --git a/soc/nuvoton/npcx/npcx7/soc.h b/soc/nuvoton/npcx/npcx7/soc.h
index 9b523ce1b8fc6..782db67bbad8a 100644
--- a/soc/nuvoton/npcx/npcx7/soc.h
+++ b/soc/nuvoton/npcx/npcx7/soc.h
@@ -42,10 +42,9 @@
 /* NPCX7 Clock configuration */
 #define MAX_OFMCLK 100000000
 
-#include <reg/reg_access.h>
-#include <reg/reg_def.h>
+#include "reg_def.h"
+#include "clock_def.h"
 #include <soc_dt.h>
-#include <soc_clock.h>
 #include <soc_pins.h>
 #include <soc_power.h>
 
diff --git a/soc/nuvoton/npcx/npcx9/Kconfig.soc b/soc/nuvoton/npcx/npcx9/Kconfig.soc
index c7abe79ffd428..3dc775d05b3a6 100644
--- a/soc/nuvoton/npcx/npcx9/Kconfig.soc
+++ b/soc/nuvoton/npcx/npcx9/Kconfig.soc
@@ -5,7 +5,7 @@
 
 config SOC_SERIES_NPCX9
 	bool
-	select SOC_FAMILY_NPCX
+	select NPCX_SOC_VARIANT_NPCXN
 	help
 	  Enable support for Nuvoton NPCX9 series
 
diff --git a/soc/nuvoton/npcx/npcx9/soc.h b/soc/nuvoton/npcx/npcx9/soc.h
index 2ce745650fb03..566890ce952be 100644
--- a/soc/nuvoton/npcx/npcx9/soc.h
+++ b/soc/nuvoton/npcx/npcx9/soc.h
@@ -47,10 +47,9 @@
 /* NPCX9 Clock configuration and limitation */
 #define MAX_OFMCLK 100000000
 
-#include <reg/reg_access.h>
-#include <reg/reg_def.h>
+#include "reg_def.h"
+#include "clock_def.h"
 #include <soc_dt.h>
-#include <soc_clock.h>
 #include <soc_pins.h>
 #include <soc_power.h>
 
diff --git a/soc/nuvoton/numaker/m55m1x/CMakeLists.txt b/soc/nuvoton/numaker/m55m1x/CMakeLists.txt
new file mode 100644
index 0000000000000..c8a814f0ce5b6
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(soc.c)
+
+zephyr_include_directories(.)
+
+zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
+
+zephyr_sources_ifdef(CONFIG_ARM_MPU mpu_regions.c)
+zephyr_linker_sources(SECTIONS sections.ld)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/nuvoton/numaker/m55m1x/Kconfig b/soc/nuvoton/numaker/m55m1x/Kconfig
new file mode 100644
index 0000000000000..c97e9fbadb8a7
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/Kconfig
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_M55M1X
+	select ARM
+	select CPU_CORTEX_M55
+	select CPU_CORTEX_M_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_VTOR
+	select CPU_HAS_ARM_MPU
+	select CPU_HAS_FPU
+	select ARMV8_M_DSP
+	select CPU_CORTEX_M_HAS_DWT
+	select ARMV8_1_M_PMU
+	select SOC_EARLY_INIT_HOOK
+	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
+	select HAS_POWEROFF
+
+config ARMV8_1_M_PMU_EVENTCNT
+	int
+	default 8 if SOC_SERIES_M55M1X
+
+config SOC_M55M1XXX
+	select HAS_NUMAKER_HAL
diff --git a/soc/nuvoton/numaker/m55m1x/Kconfig.defconfig b/soc/nuvoton/numaker/m55m1x/Kconfig.defconfig
new file mode 100644
index 0000000000000..71e688e8cdd23
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_M55M1X
+
+rsource "Kconfig.defconfig.m55m1*"
+
+endif # SOC_SERIES_M55M1X
diff --git a/soc/nuvoton/numaker/m55m1x/Kconfig.defconfig.m55m1xxx b/soc/nuvoton/numaker/m55m1x/Kconfig.defconfig.m55m1xxx
new file mode 100644
index 0000000000000..53f6d9d01e274
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/Kconfig.defconfig.m55m1xxx
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_M55M1XXX
+
+config NUM_IRQS
+	default 161
+
+endif # SOC_M55M1XXX
diff --git a/soc/nuvoton/numaker/m55m1x/Kconfig.soc b/soc/nuvoton/numaker/m55m1x/Kconfig.soc
new file mode 100644
index 0000000000000..c533dc57a4c57
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/Kconfig.soc
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Nuvoton Technology Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_M55M1X
+	bool
+	select SOC_FAMILY_NUMAKER
+	help
+	  Enable support for Nuvoton M55M1X MCU series
+
+config SOC_M55M1XXX
+	bool
+	select SOC_SERIES_M55M1X
+
+config SOC_SERIES
+	default "m55m1x" if SOC_SERIES_M55M1X
+
+config SOC
+	default "m55m1xxx" if SOC_M55M1XXX
diff --git a/soc/nuvoton/numaker/m55m1x/mpu_regions.c b/soc/nuvoton/numaker/m55m1x/mpu_regions.c
new file mode 100644
index 0000000000000..33e59b71fba18
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/mpu_regions.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 The Chromium OS Authors
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/devicetree.h>
+#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+
+static const struct arm_mpu_region mpu_regions[] = {
+	MPU_REGION_ENTRY("FLASH",
+			 CONFIG_FLASH_BASE_ADDRESS,
+			 REGION_FLASH_ATTR(CONFIG_FLASH_BASE_ADDRESS, CONFIG_FLASH_SIZE * 1024)),
+
+	MPU_REGION_ENTRY("SRAM",
+			 CONFIG_SRAM_BASE_ADDRESS,
+			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS, CONFIG_SRAM_SIZE * 1024)),
+
+#if DT_NODE_EXISTS(DT_NODELABEL(itcm))
+	MPU_REGION_ENTRY("ITCM",
+			 DT_REG_ADDR(DT_NODELABEL(itcm)),
+			 REGION_RAM_ATTR(DT_REG_ADDR(DT_NODELABEL(itcm)),
+			 DT_REG_SIZE(DT_NODELABEL(itcm)))),
+#endif
+
+#if DT_NODE_EXISTS(DT_NODELABEL(dtcm))
+	MPU_REGION_ENTRY("DTCM",
+			 DT_REG_ADDR(DT_NODELABEL(dtcm)),
+			 REGION_RAM_ATTR(DT_REG_ADDR(DT_NODELABEL(dtcm)),
+			 DT_REG_SIZE(DT_NODELABEL(dtcm)))),
+#endif
+};
+
+const struct arm_mpu_config mpu_config = {
+	.num_regions = ARRAY_SIZE(mpu_regions),
+	.mpu_regions = mpu_regions,
+};
diff --git a/soc/nuvoton/numaker/m55m1x/poweroff.c b/soc/nuvoton/numaker/m55m1x/poweroff.c
new file mode 100644
index 0000000000000..232da98fcabae
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/poweroff.c
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/poweroff.h>
+#include <NuMicro.h>
+
+void z_sys_poweroff(void)
+{
+	SYS_UnlockReg();
+
+	/* Select Power-down mode */
+	PMC_SetPowerDownMode(DT_PROP_OR(DT_NODELABEL(scc), powerdown_mode, PMC_SPD0),
+			     PMC_PLCTL_PLSEL_PL0);
+
+	/* Clear all wake-up flag */
+	PMC->INTSTS |= PMC_INTSTS_CLRWK_Msk;
+
+	/* Enter to Power-down mode */
+	PMC_PowerDown();
+
+	k_cpu_idle();
+
+	CODE_UNREACHABLE;
+}
diff --git a/soc/nuvoton/numaker/m55m1x/sections.ld b/soc/nuvoton/numaker/m55m1x/sections.ld
new file mode 100644
index 0000000000000..b60f3fcc0f5a8
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/sections.ld
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2020 Mario Jaun
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#if DT_NODE_EXISTS(DT_NODELABEL(dtcm))
+.dtcm_noinit (NOLOAD) : SUBALIGN(4)
+ {
+  __dtcm_noinit_start = .;
+  *(.dtcm_noinit)
+  *(".dtcm_noinit.*")
+  *(".kernel_noinit.*")
+  *(".noinit.*kernel/init.*")
+  *(".noinit.*kernel/mempool.*")
+  __dtcm_noinit_end = .;
+ } > DTCM
+#endif
diff --git a/soc/nuvoton/numaker/m55m1x/soc.c b/soc/nuvoton/numaker/m55m1x/soc.c
new file mode 100644
index 0000000000000..19722c9058c54
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/soc.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/devicetree.h>
+#include <zephyr/init.h>
+#include <zephyr/cache.h>
+#include <zephyr/drivers/clock_control/clock_control_numaker.h>
+/* Hardware and starter kit includes. */
+#include <NuMicro.h>
+
+static void memory_setup(void)
+{
+	/* Enable SRAM1/2 functions are only available in secure mode. */
+	if (SCU_IS_CPU_NS(SCU_NS) == 0) {
+		uint32_t wait_cnt;
+
+		/* To assign __HIRC value directly before BSS initialization. */
+		SystemCoreClock = __HIRC;
+		wait_cnt = SystemCoreClock;
+
+		/* Unlock protected registers */
+		do {
+			SYS->REGLCTL = 0x59UL;
+			SYS->REGLCTL = 0x16UL;
+			SYS->REGLCTL = 0x88UL;
+		} while (SYS->REGLCTL == 0UL);
+
+		/* Switch SRAM1 to normal power mode */
+		if (PMC->SYSRB1PC != 0) {
+			PMC->SYSRB1PC = 0;
+		}
+
+		/* Switch SRAM2 to normal power mode */
+		if (PMC->SYSRB2PC != 0) {
+			PMC->SYSRB2PC = 0;
+		}
+
+		/* Wait SRAM1/2 power mode change finish */
+		while (1) {
+			if ((PMC->SYSRB1PC & PMC_SYSRB1PC_PCBUSY_Msk) == 0 &&
+			    (PMC->SYSRB2PC & PMC_SYSRB2PC_PCBUSY_Msk) == 0) {
+				break;
+			}
+
+			if (wait_cnt-- == 0) {
+				break;
+			}
+		}
+
+		/* Enable SRAM1/2 clock */
+		CLK->SRAMCTL |= (CLK_SRAMCTL_SRAM1CKEN_Msk | CLK_SRAMCTL_SRAM2CKEN_Msk);
+	}
+
+#if (defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U))
+	/* Enable CP10 & CP11 Full Access */
+	SCB->CPACR |= ((3U << 10U * 2U) | (3U << 11U * 2U));
+
+	/* Set low-power state for PDEPU
+	 * 0b00  | ON, PDEPU is not in low-power state
+	 * 0b01  | ON, but the clock is off
+	 * 0b10  | RET(ention)
+	 * 0b11  | OFF
+	 * Clear ELPSTATE, value is 0b11 on Cold reset
+	 */
+	PWRMODCTL->CPDLPSTATE &= ~(PWRMODCTL_CPDLPSTATE_ELPSTATE_Msk <<
+				   PWRMODCTL_CPDLPSTATE_ELPSTATE_Pos);
+
+	/* PDEPU ON with clock off, value is 0b01 */
+	PWRMODCTL->CPDLPSTATE |= 0x1 << PWRMODCTL_CPDLPSTATE_ELPSTATE_Pos;
+#endif
+
+	/* Enable only if configured to do so. */
+	SCB_InvalidateICache();
+	sys_cache_instr_enable();
+
+	/* Enable d-cache only if configured to do so. */
+	SCB_InvalidateDCache();
+	sys_cache_data_enable();
+}
+
+void soc_early_init_hook(void)
+{
+	/* To ensure H/W I/O buffer with correct init data in SRAM,
+	 * to clean D-Cache here to let all .bss & .data flush to SRAM.
+	 */
+#ifdef CONFIG_DCACHE
+	SCB_CleanDCache();
+#endif
+
+	SystemInit();
+}
+
+void soc_reset_hook(void)
+{
+	memory_setup();
+
+	/* Unlock protected registers */
+	SYS_UnlockReg();
+
+	/* Release GPIO hold status */
+	PMC_RELEASE_GPIO();
+
+	/*
+	 * -------------------
+	 * Init System Clock
+	 * -------------------
+	 */
+
+#if DT_NODE_HAS_PROP(DT_NODELABEL(scc), hxt)
+	/* Enable/disable 4~24 MHz external crystal oscillator (HXT) */
+	if (DT_ENUM_IDX(DT_NODELABEL(scc), hxt) == NUMAKER_SCC_CLKSW_ENABLE) {
+		CLK_EnableXtalRC(CLK_SRCCTL_HXTEN_Msk);
+		/* Wait for HXT clock ready */
+		CLK_WaitClockReady(CLK_STATUS_HXTSTB_Msk);
+	} else if (DT_ENUM_IDX(DT_NODELABEL(scc), hxt) == NUMAKER_SCC_CLKSW_DISABLE) {
+		CLK_DisableXtalRC(CLK_SRCCTL_HXTEN_Msk);
+	}
+#endif
+
+#if DT_NODE_HAS_PROP(DT_NODELABEL(scc), lxt)
+	/* Enable/disable 32.768 kHz low-speed external crystal oscillator (LXT) */
+	if (DT_ENUM_IDX(DT_NODELABEL(scc), lxt) == NUMAKER_SCC_CLKSW_ENABLE) {
+		CLK_EnableXtalRC(CLK_SRCCTL_LXTEN_Msk);
+		/* Wait for LXT clock ready */
+		CLK_WaitClockReady(CLK_STATUS_LXTSTB_Msk);
+	} else if (DT_ENUM_IDX(DT_NODELABEL(scc), lxt) == NUMAKER_SCC_CLKSW_DISABLE) {
+		CLK_DisableXtalRC(CLK_SRCCTL_LXTEN_Msk);
+	}
+#endif
+
+	/* Enable 12 MHz high-speed internal RC oscillator (HIRC) */
+	CLK_EnableXtalRC(CLK_SRCCTL_HIRCEN_Msk);
+	/* Wait for HIRC clock ready */
+	CLK_WaitClockReady(CLK_STATUS_HIRCSTB_Msk);
+
+	/* Enable 32 KHz low-speed internal RC oscillator (LIRC) */
+	CLK_EnableXtalRC(CLK_SRCCTL_LIRCEN_Msk);
+	/* Wait for LIRC clock ready */
+	CLK_WaitClockReady(CLK_STATUS_LIRCSTB_Msk);
+
+#if DT_NODE_HAS_PROP(DT_NODELABEL(scc), hirc48)
+	/* Enable/disable 48 MHz high-speed internal RC oscillator (HIRC48) */
+	if (DT_ENUM_IDX(DT_NODELABEL(scc), hirc48) == NUMAKER_SCC_CLKSW_ENABLE) {
+		CLK_EnableXtalRC(CLK_SRCCTL_HIRC48MEN_Msk);
+		/* Wait for HIRC48 clock ready */
+		CLK_WaitClockReady(CLK_STATUS_HIRC48MSTB_Msk);
+	} else if (DT_ENUM_IDX(DT_NODELABEL(scc), hirc48) == NUMAKER_SCC_CLKSW_DISABLE) {
+		CLK_DisableXtalRC(CLK_SRCCTL_HIRC48MEN_Msk);
+	}
+#endif
+
+#if DT_NODE_HAS_PROP(DT_NODELABEL(scc), clk_pclkdiv)
+	/* Set CLK_PCLKDIV register on request */
+	CLK->PCLKDIV = DT_PROP(DT_NODELABEL(scc), clk_pclkdiv);
+#endif
+
+#if DT_NODE_HAS_PROP(DT_NODELABEL(scc), core_clock)
+	/* Set core clock (HCLK) on request */
+	CLK_SetCoreClock(DT_PROP(DT_NODELABEL(scc), core_clock));
+#endif
+
+	/*
+	 * Update System Core Clock
+	 * User can use SystemCoreClockUpdate() to calculate SystemCoreClock.
+	 */
+	SystemCoreClockUpdate();
+
+	/* Lock protected registers */
+	SYS_LockReg();
+}
diff --git a/soc/nuvoton/numaker/m55m1x/soc.h b/soc/nuvoton/numaker/m55m1x/soc.h
new file mode 100644
index 0000000000000..7582578c58174
--- /dev/null
+++ b/soc/nuvoton/numaker/m55m1x/soc.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Nuvoton Technology Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_ARM_NUVOTON_M55M1X_SOC_H_
+#define ZEPHYR_SOC_ARM_NUVOTON_M55M1X_SOC_H_
+
+/* Hardware and starter kit includes. */
+#include <NuMicro.h>
+
+#endif /* ZEPHYR_SOC_ARM_NUVOTON_M55M1X_SOC_H_*/
diff --git a/soc/nuvoton/numaker/soc.yml b/soc/nuvoton/numaker/soc.yml
index ec1059c497f50..e4bf9ad4f4924 100644
--- a/soc/nuvoton/numaker/soc.yml
+++ b/soc/nuvoton/numaker/soc.yml
@@ -7,3 +7,6 @@ family:
   - name: m2l31x
     socs:
     - name: m2l31xxx
+  - name: m55m1x
+    socs:
+    - name: m55m1xxx
diff --git a/soc/nxp/imx/imx8m/Kconfig b/soc/nxp/imx/imx8m/Kconfig
index 66b08e44700e4..6aa1acc6fe0e3 100644
--- a/soc/nxp/imx/imx8m/Kconfig
+++ b/soc/nxp/imx/imx8m/Kconfig
@@ -93,6 +93,9 @@ config SOC_MIMX8MQ6_M4
 config MCUX_CORE_SUFFIX
 	default "_ca53" if SOC_MIMX8MM6_A53 || SOC_MIMX8MN6_A53 || SOC_MIMX8ML8_A53
 	default "_dsp" if SOC_MIMX8ML8_ADSP
+	default "_cm4" if SOC_MIMX8MM6_M4
+	default "_cm7" if SOC_MIMX8ML8_M7
+	default "_cm4" if SOC_MIMX8MQ6_M4
 
 if SOC_MIMX8ML8_M7
 
diff --git a/soc/nxp/imx/imx8m/a53/pinctrl_soc.h b/soc/nxp/imx/imx8m/a53/pinctrl_soc.h
index 51e9e58b2f29e..a1286f6f180ed 100644
--- a/soc/nxp/imx/imx8m/a53/pinctrl_soc.h
+++ b/soc/nxp/imx/imx8m/a53/pinctrl_soc.h
@@ -19,11 +19,18 @@ extern "C" {
 #define MCUX_IMX_BIAS_PULL_UP_SHIFT IOMUXC_SW_PAD_CTL_PAD_PUE_SHIFT
 #define MCUX_IMX_BIAS_PULL_ENABLE_SHIFT IOMUXC_SW_PAD_CTL_PAD_PE_SHIFT
 #define MCUX_IMX_DRIVE_OPEN_DRAIN_SHIFT IOMUXC_SW_PAD_CTL_PAD_ODE_SHIFT
-#define MCUX_IMX_SLEW_RATE_SHIFT IOMUXC_SW_PAD_CTL_PAD_FSEL_SHIFT
-#define MCUX_IMX_DRIVE_STRENGTH_SHIFT IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT
 #define MCUX_IMX_INPUT_ENABLE_SHIFT 31 /* Shift to a bit not used by IOMUXC_SW_PAD_CTL */
 #define MCUX_IMX_INPUT_ENABLE(x) ((x >> MCUX_IMX_INPUT_ENABLE_SHIFT) & 0x1)
 
+#if defined(CONFIG_SOC_MIMX8MM6_A53) || defined(CONFIG_SOC_MIMX8MN6_A53)
+/* fixed for DSE and FSEL for as there is one bit not used in these field */
+#define MCUX_IMX_SLEW_RATE_SHIFT (IOMUXC_SW_PAD_CTL_PAD_FSEL_SHIFT + 1)
+#define MCUX_IMX_DRIVE_STRENGTH_SHIFT (IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT + 1)
+#else
+#define MCUX_IMX_SLEW_RATE_SHIFT IOMUXC_SW_PAD_CTL_PAD_FSEL_SHIFT
+#define MCUX_IMX_DRIVE_STRENGTH_SHIFT IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT
+#endif
+
 #define Z_PINCTRL_MCUX_IMX_PINCFG_INIT(node_id)							\
 	((DT_PROP(node_id, input_schmitt_enable) << MCUX_IMX_INPUT_SCHMITT_ENABLE_SHIFT) |	\
 	 (DT_PROP(node_id, bias_pull_up) << MCUX_IMX_BIAS_PULL_UP_SHIFT) |			\
diff --git a/soc/nxp/imx/imx8m/m4_mini/pinctrl_soc.h b/soc/nxp/imx/imx8m/m4_mini/pinctrl_soc.h
index ceb9d33eff036..754bf5826b694 100644
--- a/soc/nxp/imx/imx8m/m4_mini/pinctrl_soc.h
+++ b/soc/nxp/imx/imx8m/m4_mini/pinctrl_soc.h
@@ -19,8 +19,9 @@ extern "C" {
 #define MCUX_IMX_BIAS_PULL_UP_SHIFT IOMUXC_SW_PAD_CTL_PAD_PUE_SHIFT
 #define MCUX_IMX_BIAS_PULL_ENABLE_SHIFT IOMUXC_SW_PAD_CTL_PAD_PE_SHIFT
 #define MCUX_IMX_DRIVE_OPEN_DRAIN_SHIFT IOMUXC_SW_PAD_CTL_PAD_ODE_SHIFT
-#define MCUX_IMX_SLEW_RATE_SHIFT IOMUXC_SW_PAD_CTL_PAD_FSEL_SHIFT
-#define MCUX_IMX_DRIVE_STRENGTH_SHIFT IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT
+/* fixed for DSE and FSEL for as there is one bit not used in these field */
+#define MCUX_IMX_SLEW_RATE_SHIFT (IOMUXC_SW_PAD_CTL_PAD_FSEL_SHIFT + 1)
+#define MCUX_IMX_DRIVE_STRENGTH_SHIFT (IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT + 1)
 #define MCUX_IMX_INPUT_ENABLE_SHIFT 31 /* Shift to a bit not used by IOMUXC_SW_PAD_CTL */
 #define MCUX_IMX_INPUT_ENABLE(x) ((x >> MCUX_IMX_INPUT_ENABLE_SHIFT) & 0x1)
 
diff --git a/soc/nxp/imx/imx8ulp/adsp/linker.ld b/soc/nxp/imx/imx8ulp/adsp/linker.ld
index 45283cce03cd9..2f957819ae3ee 100644
--- a/soc/nxp/imx/imx8ulp/adsp/linker.ld
+++ b/soc/nxp/imx/imx8ulp/adsp/linker.ld
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 NXP
+ * Copyright 2023-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -172,6 +172,13 @@ EXTERN(ext_man_fw_ver)
 SECTIONS
 {
 
+#ifdef CONFIG_OPENAMP_RSC_TABLE
+    SECTION_PROLOGUE(.resource_table,, SUBALIGN(4))
+    {
+      KEEP(*(.resource_table*))
+    } GROUP_LINK_IN(ROMABLE_REGION)
+#endif
+
 #include <zephyr/linker/rel-sections.ld>
 
 #ifdef CONFIG_LLEXT
diff --git a/soc/nxp/imx/imx9/imx91/pinctrl_soc.h b/soc/nxp/imx/imx9/imx91/pinctrl_soc.h
index da79bbfab43a2..b168d6457aee0 100644
--- a/soc/nxp/imx/imx9/imx91/pinctrl_soc.h
+++ b/soc/nxp/imx/imx9/imx91/pinctrl_soc.h
@@ -30,7 +30,8 @@ extern "C" {
 	 (DT_PROP(node_id, bias_pull_down) << MCUX_IMX_BIAS_PULL_DOWN_SHIFT) |                     \
 	 (DT_PROP(node_id, bias_pull_up) << MCUX_IMX_BIAS_PULL_UP_SHIFT) |                         \
 	 (DT_ENUM_IDX(node_id, slew_rate) << MCUX_IMX_SLEW_RATE_SHIFT) |                           \
-	 ((~(0xff << DT_ENUM_IDX(node_id, drive_strength))) << MCUX_IMX_DRIVE_STRENGTH_SHIFT) |    \
+	 ((~(0xffffffff << DT_ENUM_IDX(node_id, drive_strength)))                                  \
+	  << MCUX_IMX_DRIVE_STRENGTH_SHIFT) |                                                      \
 	 (DT_PROP(node_id, input_enable) << MCUX_IMX_INPUT_ENABLE_SHIFT))
 
 /* This struct must be present. It is used by the mcux gpio driver */
diff --git a/soc/nxp/imx/imx9/imx93/pinctrl_soc.h b/soc/nxp/imx/imx9/imx93/pinctrl_soc.h
index 91d06ea9681b6..c03a5a045f587 100644
--- a/soc/nxp/imx/imx9/imx93/pinctrl_soc.h
+++ b/soc/nxp/imx/imx9/imx93/pinctrl_soc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NXP
+ * Copyright 2022-2023, 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -30,7 +30,8 @@ extern "C" {
 	 (DT_PROP(node_id, bias_pull_down) << MCUX_IMX_BIAS_PULL_DOWN_SHIFT) |                     \
 	 (DT_PROP(node_id, bias_pull_up) << MCUX_IMX_BIAS_PULL_UP_SHIFT) |                         \
 	 (DT_ENUM_IDX(node_id, slew_rate) << MCUX_IMX_SLEW_RATE_SHIFT) |                           \
-	 ((~(0xff << DT_ENUM_IDX(node_id, drive_strength))) << MCUX_IMX_DRIVE_STRENGTH_SHIFT) |    \
+	 ((~(0xffffffff << DT_ENUM_IDX(node_id, drive_strength)))                                  \
+	  << MCUX_IMX_DRIVE_STRENGTH_SHIFT) |                                                      \
 	 (DT_PROP(node_id, input_enable) << MCUX_IMX_INPUT_ENABLE_SHIFT))
 
 /* This struct must be present. It is used by the mcux gpio driver */
diff --git a/soc/nxp/imx/imx9/imx95/Kconfig b/soc/nxp/imx/imx9/imx95/Kconfig
index 6b4e22b89ff64..60d1f424b0a5a 100644
--- a/soc/nxp/imx/imx9/imx95/Kconfig
+++ b/soc/nxp/imx/imx9/imx95/Kconfig
@@ -12,6 +12,7 @@ config SOC_MIMX9596_M7
 	select ARM_MPU
 	select SOC_LATE_INIT_HOOK
 	select HAS_MCUX
+	select HAS_MCUX_CACHE
 
 config SOC_MIMX9596_A55
 	select ARM64
diff --git a/soc/nxp/imx/imx9/imx95/Kconfig.defconfig.mimx95.m7 b/soc/nxp/imx/imx9/imx95/Kconfig.defconfig.mimx95.m7
index 4265f5233b4c8..ee356a0ead0d4 100644
--- a/soc/nxp/imx/imx9/imx95/Kconfig.defconfig.mimx95.m7
+++ b/soc/nxp/imx/imx9/imx95/Kconfig.defconfig.mimx95.m7
@@ -11,8 +11,36 @@ config FLASH_SIZE
 config FLASH_BASE_ADDRESS
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
 
+# multi-level interrupts
+config MULTI_LEVEL_INTERRUPTS
+	default y
+
+config 1ST_LEVEL_INTERRUPT_BITS
+	default 8
+
+config MAX_IRQ_PER_AGGREGATOR
+	default 16
+
+config 2ND_LEVEL_INTERRUPTS
+	default y
+
+config 2ND_LVL_ISR_TBL_OFFSET
+	default 234
+
+config NUM_2ND_LEVEL_AGGREGATORS
+	default 1
+
+config 2ND_LEVEL_INTERRUPT_BITS
+	default 8
+
+config 2ND_LVL_INTR_00_OFFSET
+	default 224
+
+config 3RD_LEVEL_INTERRUPTS
+	default n
+
 config NUM_IRQS
-	default 230
+	default 250 # 2ND_LVL_ISR_TBL_OFFSET + MAX_IRQ_PER_AGGREGATOR * NUM_2ND_LEVEL_AGGREGATORS
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 800000000
@@ -20,4 +48,7 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 config CACHE_MANAGEMENT
 	default y
 
+config ETH_NXP_IMX_MSGINTR
+	default 2
+
 endif # SOC_MIMX9596_M7
diff --git a/soc/nxp/imx/imx9/imx95/m7/CMakeLists.txt b/soc/nxp/imx/imx9/imx95/m7/CMakeLists.txt
index 0eedd7f7d4044..68ee8d2bc0e2c 100644
--- a/soc/nxp/imx/imx9/imx95/m7/CMakeLists.txt
+++ b/soc/nxp/imx/imx9/imx95/m7/CMakeLists.txt
@@ -5,4 +5,4 @@ zephyr_include_directories(.)
 zephyr_library()
 zephyr_library_sources(soc.c)
 
-set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
+set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/nxp/imx/imx9/imx95/m7/linker.ld b/soc/nxp/imx/imx9/imx95/m7/linker.ld
new file mode 100644
index 0000000000000..280416c0cc0b0
--- /dev/null
+++ b/soc/nxp/imx/imx9/imx95/m7/linker.ld
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>
+
+SECTIONS
+{
+#ifdef CONFIG_OPENAMP_RSC_TABLE
+	SECTION_PROLOGUE(.resource_table,, SUBALIGN(4))
+	{
+		KEEP(*(.resource_table*))
+	} GROUP_LINK_IN(ROMABLE_REGION)
+#endif
+}
diff --git a/soc/nxp/imx/imx9/imx95/m7/soc.c b/soc/nxp/imx/imx9/imx95/m7/soc.c
index 7100428a1490b..bfafe47113f85 100644
--- a/soc/nxp/imx/imx9/imx95/m7/soc.c
+++ b/soc/nxp/imx/imx9/imx95/m7/soc.c
@@ -5,6 +5,18 @@
  */
 
 #include <zephyr/cache.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/firmware/scmi/clk.h>
+#include <zephyr/drivers/firmware/scmi/power.h>
+#include <zephyr/dt-bindings/clock/imx95_clock.h>
+#include <zephyr/dt-bindings/power/imx95_power.h>
+#include <soc.h>
+
+/* SCMI power domain states */
+#define POWER_DOMAIN_STATE_ON  0x00000000
+#define POWER_DOMAIN_STATE_OFF 0x40000000
 
 void soc_late_init_hook(void)
 {
@@ -13,3 +25,56 @@ void soc_late_init_hook(void)
 	sys_cache_instr_enable();
 #endif /* CONFIG_CACHE_MANAGEMENT */
 }
+
+static int soc_init(void)
+{
+#if defined(CONFIG_ETH_NXP_IMX_NETC) && (DT_CHILD_NUM_STATUS_OKAY(DT_NODELABEL(netc)) != 0)
+	const struct device *clk_dev = DEVICE_DT_GET(DT_NODELABEL(scmi_clk));
+	struct scmi_protocol *proto = clk_dev->data;
+	struct scmi_clock_rate_config clk_cfg = {0};
+	struct scmi_power_state_config pwr_cfg = {0};
+	uint32_t power_state = POWER_DOMAIN_STATE_OFF;
+	uint64_t enetref_clk = 250000000; /* 250 MHz*/
+	int ret;
+
+	/* Power up NETCMIX */
+	pwr_cfg.domain_id = IMX95_PD_NETC;
+	pwr_cfg.power_state = POWER_DOMAIN_STATE_ON;
+
+	ret = scmi_power_state_set(&pwr_cfg);
+	if (ret) {
+		return ret;
+	}
+
+	while (power_state != POWER_DOMAIN_STATE_ON) {
+		ret = scmi_power_state_get(IMX95_PD_NETC, &power_state);
+		if (ret) {
+			return ret;
+		}
+	}
+
+	/* ENETREF clock init */
+	ret = scmi_clock_parent_set(proto, IMX95_CLK_ENETREF, IMX95_CLK_SYSPLL1_PFD0);
+	if (ret) {
+		return ret;
+	}
+
+	clk_cfg.flags = SCMI_CLK_RATE_SET_FLAGS_ROUNDS_AUTO;
+	clk_cfg.clk_id = IMX95_CLK_ENETREF;
+	clk_cfg.rate[0] = enetref_clk & 0xffffffff;
+	clk_cfg.rate[1] = (enetref_clk >> 32) & 0xffffffff;
+
+	ret = scmi_clock_rate_set(proto, &clk_cfg);
+	if (ret) {
+		return ret;
+	}
+#endif
+	return 0;
+}
+
+/*
+ * Because platform is using ARM SCMI, drivers like scmi, mbox etc. are
+ * initialized during PRE_KERNEL_1. Common init hooks is not able to use.
+ * SoC early init and board early init could be run during PRE_KERNEL_2 instead.
+ */
+SYS_INIT(soc_init, PRE_KERNEL_2, 0);
diff --git a/soc/nxp/imx/imx9/imx95/pinctrl_soc.h b/soc/nxp/imx/imx9/imx95/pinctrl_soc.h
index 08fd409955081..6065a5c8a343a 100644
--- a/soc/nxp/imx/imx9/imx95/pinctrl_soc.h
+++ b/soc/nxp/imx/imx9/imx95/pinctrl_soc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -27,23 +27,24 @@ extern "C" {
 #define IOMUXC_CFGREG   (IOMUXC_BASE + 0x204)
 #define IOMUXC_DAISYREG (IOMUXC_BASE + 0x408)
 
-#define IOMUXC_INPUT_SCHMITT_ENABLE_SHIFT IOMUXC_SW_PAD_CTL_PAD_HYS_SHIFT
-#define IOMUXC_DRIVE_OPEN_DRAIN_SHIFT     IOMUXC_SW_PAD_CTL_PAD_OD_SHIFT
-#define IOMUXC_BIAS_PULL_DOWN_SHIFT       IOMUXC_SW_PAD_CTL_PAD_PD_SHIFT
-#define IOMUXC_BIAS_PULL_UP_SHIFT         IOMUXC_SW_PAD_CTL_PAD_PU_SHIFT
-#define IOMUXC_SLEW_RATE_SHIFT            IOMUXC_SW_PAD_CTL_PAD_FSEL1_SHIFT
-#define IOMUXC_DRIVE_STRENGTH_SHIFT       IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT
+#define MCUX_IMX_INPUT_SCHMITT_ENABLE_SHIFT IOMUXC_SW_PAD_CTL_PAD_HYS_SHIFT
+#define MCUX_IMX_DRIVE_OPEN_DRAIN_SHIFT     IOMUXC_SW_PAD_CTL_PAD_OD_SHIFT
+#define MCUX_IMX_BIAS_PULL_DOWN_SHIFT       IOMUXC_SW_PAD_CTL_PAD_PD_SHIFT
+#define MCUX_IMX_BIAS_PULL_UP_SHIFT         IOMUXC_SW_PAD_CTL_PAD_PU_SHIFT
+#define MCUX_IMX_SLEW_RATE_SHIFT            IOMUXC_SW_PAD_CTL_PAD_FSEL1_SHIFT
+#define MCUX_IMX_DRIVE_STRENGTH_SHIFT       IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT
 
 #define IOMUXC_INPUT_ENABLE_SHIFT 23 /* Shift to a bit not used by IOMUXC_SW_PAD_CTL */
 #define IOMUXC_INPUT_ENABLE(x)    ((x >> IOMUXC_INPUT_ENABLE_SHIFT) & 0x1)
 
 #define Z_PINCTRL_IOMUXC_PINCFG_INIT(node_id)                                                      \
-	((DT_PROP(node_id, input_schmitt_enable) << IOMUXC_INPUT_SCHMITT_ENABLE_SHIFT) |           \
-	 (DT_PROP(node_id, drive_open_drain) << IOMUXC_DRIVE_OPEN_DRAIN_SHIFT) |                   \
-	 (DT_PROP(node_id, bias_pull_down) << IOMUXC_BIAS_PULL_DOWN_SHIFT) |                       \
-	 (DT_PROP(node_id, bias_pull_up) << IOMUXC_BIAS_PULL_UP_SHIFT) |                           \
-	 (DT_ENUM_IDX(node_id, slew_rate) << IOMUXC_SLEW_RATE_SHIFT) |                             \
-	 ((~(0xff << DT_ENUM_IDX(node_id, drive_strength))) << IOMUXC_DRIVE_STRENGTH_SHIFT) |      \
+	((DT_PROP(node_id, input_schmitt_enable) << MCUX_IMX_INPUT_SCHMITT_ENABLE_SHIFT) |         \
+	 (DT_PROP(node_id, drive_open_drain) << MCUX_IMX_DRIVE_OPEN_DRAIN_SHIFT) |                 \
+	 (DT_PROP(node_id, bias_pull_down) << MCUX_IMX_BIAS_PULL_DOWN_SHIFT) |                     \
+	 (DT_PROP(node_id, bias_pull_up) << MCUX_IMX_BIAS_PULL_UP_SHIFT) |                         \
+	 (DT_ENUM_IDX(node_id, slew_rate) << MCUX_IMX_SLEW_RATE_SHIFT) |                           \
+	 ((~(0xffffffff << DT_ENUM_IDX(node_id, drive_strength)))                                  \
+	  << MCUX_IMX_DRIVE_STRENGTH_SHIFT) |                                                      \
 	 (DT_PROP(node_id, input_enable) << IOMUXC_INPUT_ENABLE_SHIFT))
 
 /* This struct must be present. It is used by the mcux gpio driver */
@@ -63,7 +64,7 @@ struct pinctrl_soc_pin {
 typedef struct pinctrl_soc_pin pinctrl_soc_pin_t;
 
 /* This definition must be present. It is used by the mcux gpio driver */
-#define IOMUXC_PINMUX(node_id)                                                                     \
+#define MCUX_IMX_PINMUX(node_id)                                                                   \
 	{                                                                                          \
 		.mux_register = DT_PROP_BY_IDX(node_id, pinmux, 0),                                \
 		.config_register = DT_PROP_BY_IDX(node_id, pinmux, 4),                             \
@@ -73,7 +74,7 @@ typedef struct pinctrl_soc_pin pinctrl_soc_pin_t;
 	}
 
 #define Z_PINCTRL_PINMUX(group_id, pin_prop, idx)                                                  \
-	IOMUXC_PINMUX(DT_PHANDLE_BY_IDX(group_id, pin_prop, idx))
+	MCUX_IMX_PINMUX(DT_PHANDLE_BY_IDX(group_id, pin_prop, idx))
 
 #define Z_PINCTRL_STATE_PIN_INIT(group_id, pin_prop, idx)                                          \
 	{                                                                                          \
diff --git a/soc/nxp/imxrt/CMakeLists.txt b/soc/nxp/imxrt/CMakeLists.txt
index 82d23ee5b5a0d..ac5302a32fc7e 100644
--- a/soc/nxp/imxrt/CMakeLists.txt
+++ b/soc/nxp/imxrt/CMakeLists.txt
@@ -66,7 +66,7 @@ if(CONFIG_SOC_SERIES_IMXRT118X)
   zephyr_compile_definitions(XIP_EXTERNAL_FLASH)
 endif()
 
-if(CONFIG_SOC_SERIES_IMXRT6XX OR CONFIG_SOC_SERIES_IMXRT5XX OR CONFIG_SOC_SERIES_IMXRT7XX)
+if(CONFIG_SOC_SERIES_IMXRT6XX OR CONFIG_SOC_SERIES_IMXRT5XX)
   zephyr_linker_sources_ifdef(CONFIG_USB_DEVICE_DRIVER SECTIONS usb.ld)
   zephyr_linker_sources_ifdef(CONFIG_UDC_DRIVER SECTIONS usb.ld)
 endif()
diff --git a/soc/nxp/imxrt/Kconfig b/soc/nxp/imxrt/Kconfig
index 648b30d750d55..37a2916120b8c 100644
--- a/soc/nxp/imxrt/Kconfig
+++ b/soc/nxp/imxrt/Kconfig
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_FAMILY_NXP_IMXRT
@@ -141,9 +141,10 @@ config NXP_IMX_EXTERNAL_HYPERRAM
 	  This setting should be enabled when the application uses HYPERRAM,
 	  or an MPU region will be defined to disable cached access to the
 	  HYPERRAM memory space.
+
 config SECOND_CORE_MCUX
 	bool "Dual core operation on the RT11xx series"
-	depends on SOC_SERIES_IMXRT11XX
+	depends on SOC_SERIES_IMXRT11XX || SOC_SERIES_IMXRT118X
 	help
 	  Indicates the second core will be enabled, and the part will run
 	  in dual core mode. Enables dual core operation on the RT11xx series,
@@ -170,6 +171,10 @@ config PM_MCUX_DCDC
 config PM_MCUX_PMU
 	bool "MCUX power management unit driver"
 
+config ADJUST_DCDC
+	default y
+	bool "Adjust internal DCDC output"
+
 config DCDC_VALUE
 	hex "DCDC value for VDD_SOC"
 
diff --git a/soc/nxp/imxrt/Kconfig.defconfig b/soc/nxp/imxrt/Kconfig.defconfig
index f82e9e126f01b..78469d24fee23 100644
--- a/soc/nxp/imxrt/Kconfig.defconfig
+++ b/soc/nxp/imxrt/Kconfig.defconfig
@@ -13,10 +13,6 @@ config ROM_START_OFFSET
 	default 0x400 if BOOTLOADER_MCUBOOT
 	default 0x2000 if BOOT_FLEXSPI_NOR || BOOT_SEMC_NOR
 
-config ADC_MCUX_12B1MSPS_SAR
-	default y if HAS_MCUX_12B1MSPS_SAR
-	depends on ADC
-
 config LOG_BACKEND_SWO_FREQ_HZ
 	default 7500000
 	depends on LOG_BACKEND_SWO
@@ -39,10 +35,6 @@ config PM_MCUX_GPC
 	default y if HAS_MCUX_GPC
 	depends on SOC_SERIES_IMXRT11XX && PM
 
-# Don't allow SOC to sleep after tests complete when PM is enabled
-config ZTEST_NO_YIELD
-	default y if (ZTEST && PM)
-
 if SOC_SERIES_IMXRT10XX && PM
 
 config CODE_DATA_RELOCATION
diff --git a/soc/nxp/imxrt/imxrt10xx/Kconfig b/soc/nxp/imxrt/imxrt10xx/Kconfig
index 4a9508777abc9..13dc3063acf81 100644
--- a/soc/nxp/imxrt/imxrt10xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt10xx/Kconfig
@@ -11,7 +11,6 @@ config SOC_SERIES_IMXRT10XX
 	select CLOCK_CONTROL
 	select HAS_MCUX
 	select HAS_MCUX_CACHE
-	select HAS_MCUX_12B1MSPS_SAR if !SOC_MIMXRT1042
 	select HAS_MCUX_CCM if !SOC_MIMXRT1042
 	select HAS_MCUX_FLEXSPI
 	select HAS_MCUX_IGPIO
diff --git a/soc/nxp/imxrt/imxrt10xx/soc.c b/soc/nxp/imxrt/imxrt10xx/soc.c
index e6b6160600d35..83135d7d834da 100644
--- a/soc/nxp/imxrt/imxrt10xx/soc.c
+++ b/soc/nxp/imxrt/imxrt10xx/soc.c
@@ -51,7 +51,7 @@ const clock_sys_pll_config_t sysPllConfig = {
 #endif
 
 #if CONFIG_USB_DC_NXP_EHCI
-/* USB PHY condfiguration */
+/* USB PHY configuration */
 #define BOARD_USB_PHY_D_CAL (0x0CU)
 #define BOARD_USB_PHY_TXCAL45DP (0x06U)
 #define BOARD_USB_PHY_TXCAL45DM (0x06U)
@@ -66,7 +66,7 @@ const clock_enet_pll_config_t ethPllConfig = {
 	defined(CONFIG_SOC_MIMXRT1024)
 	.enableClkOutput500M = true,
 #endif
-#if defined(CONFIG_ETH_NXP_ENET) || defined(CONFIG_ETH_MCUX)
+#if defined(CONFIG_ETH_NXP_ENET)
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
 	.enableClkOutput = true,
 #endif
@@ -74,7 +74,7 @@ const clock_enet_pll_config_t ethPllConfig = {
 	.enableClkOutput1 = true,
 #endif
 #endif
-#if defined(CONFIG_PTP_CLOCK_MCUX) || defined(CONFIG_PTP_CLOCK_NXP_ENET)
+#if defined(CONFIG_PTP_CLOCK_NXP_ENET)
 	.enableClkOutput25M = true,
 #else
 	.enableClkOutput25M = false,
@@ -151,14 +151,15 @@ __weak void clock_init(void)
 	/* Set PERIPH_CLK MUX to PERIPH_CLK2 */
 	CLOCK_SetMux(kCLOCK_PeriphMux, 0x1);
 
-	/* Setting the VDD_SOC value.
-	 */
+#if CONFIG_ADJUST_DCDC
+	/* Setting the VDD_SOC value */
 	DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(CONFIG_DCDC_VALUE);
 	/* Waiting for DCDC_STS_DC_OK bit is asserted */
 	while (DCDC_REG0_STS_DC_OK_MASK !=
 			(DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
 		;
 	}
+#endif
 
 #ifdef CONFIG_INIT_ARM_PLL
 	CLOCK_InitArmPll(&armPllConfig); /* Configure ARM PLL to 1200M */
@@ -209,8 +210,9 @@ __weak void clock_init(void)
 #endif
 
 #ifdef CONFIG_SPI_MCUX_LPSPI
-	CLOCK_SetMux(kCLOCK_LpspiMux, 1); /* Set SPI source to USB1 PFD0 720M */
-	CLOCK_SetDiv(kCLOCK_LpspiDiv, 7); /* Set SPI divider to 8 */
+	/* Configure input clock to be able to reach the datasheet specified band rate. */
+	CLOCK_SetMux(kCLOCK_LpspiMux, 1); /* Set SPI source to USB1 PFD0 */
+	CLOCK_SetDiv(kCLOCK_LpspiDiv, 0); /* Set SPI divider to 1 */
 #endif
 
 #ifdef CONFIG_DISPLAY_MCUX_ELCDIF
@@ -227,7 +229,7 @@ __weak void clock_init(void)
 
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet)) && CONFIG_NET_L2_ETHERNET
-#if CONFIG_ETH_MCUX_RMII_EXT_CLK
+#if CONFIG_ETH_NXP_ENET_RMII_EXT_CLK
 	/* Enable clock input for ENET1 */
 	IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, false);
 #else
diff --git a/soc/nxp/imxrt/imxrt118x/CMakeLists.txt b/soc/nxp/imxrt/imxrt118x/CMakeLists.txt
index 4441a41b39ec1..75a79185fb62a 100644
--- a/soc/nxp/imxrt/imxrt118x/CMakeLists.txt
+++ b/soc/nxp/imxrt/imxrt118x/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -24,4 +24,13 @@ if(CONFIG_MEMC_MCUX_FLEXSPI)
   endif()
 endif()
 
+if((CONFIG_NXP_IMXRT_BOOT_HEADER) AND (CONFIG_BOOT_FLEXSPI_NOR))
+  set(RT118x_DEVICE_BOOT_HEADER_DIR
+    "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/devices/RT/RT1180/MIMXRT1189")
+
+  zephyr_library_sources(${RT118x_DEVICE_BOOT_HEADER_DIR}/xip/fsl_flexspi_nor_boot.c)
+  zephyr_library_include_directories(${RT118x_DEVICE_BOOT_HEADER_DIR}/xip)
+  zephyr_library_include_directories(${RT118x_DEVICE_BOOT_HEADER_DIR})
+endif()
+
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig b/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig
index ebdfa78693b29..439d49d74c4f3 100644
--- a/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig
+++ b/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig
@@ -1,8 +1,11 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_IMXRT118X
 
+config CORTEX_M_SYSTICK
+	default n if MCUX_LPTMR_TIMER
+
 config NUM_IRQS
 	default 239
 
diff --git a/soc/nxp/imxrt/imxrt118x/m33/mpu_regions.c b/soc/nxp/imxrt/imxrt118x/m33/mpu_regions.c
index 0e017caa56b3c..8783ad6a77edf 100644
--- a/soc/nxp/imxrt/imxrt118x/m33/mpu_regions.c
+++ b/soc/nxp/imxrt/imxrt118x/m33/mpu_regions.c
@@ -11,6 +11,8 @@
 #define REGION_FLEXSPI2_SIZE           0x04000000
 #define REGION_DTCM_BASE_ADDRESS       0x30000000
 #define REGION_DTCM_SIZE               0x00020000
+#define REGION_SRAM2_SHM_BASE_ADDRESS  0x20500000
+#define REGION_SRAM2_SHM_SIZE          0x00008000
 #define REGION_FLEXSPI_BASE_ADDRESS    0x38000000
 #define REGION_FLEXSPI_SIZE            0x08000000
 #define REGION_PERIPHERAL_BASE_ADDRESS 0x50000000
@@ -23,6 +25,9 @@ static const struct arm_mpu_region mpu_regions[] = {
 			 REGION_FLASH_ATTR(REGION_FLEXSPI_BASE_ADDRESS, REGION_FLEXSPI_SIZE)),
 	MPU_REGION_ENTRY("DTCM", REGION_DTCM_BASE_ADDRESS,
 			 REGION_RAM_NOCACHE_ATTR(REGION_DTCM_BASE_ADDRESS, REGION_DTCM_SIZE)),
+	MPU_REGION_ENTRY(
+		"SRAM2_SHM", REGION_SRAM2_SHM_BASE_ADDRESS,
+		REGION_RAM_NOCACHE_ATTR(REGION_SRAM2_SHM_BASE_ADDRESS, REGION_SRAM2_SHM_SIZE)),
 	MPU_REGION_ENTRY(
 		"PERIPHERAL", REGION_PERIPHERAL_BASE_ADDRESS,
 		REGION_DEVICE_ATTR(REGION_PERIPHERAL_BASE_ADDRESS, REGION_PERIPHERAL_SIZE)),
diff --git a/soc/nxp/imxrt/imxrt118x/soc.c b/soc/nxp/imxrt/imxrt118x/soc.c
index 169234e1bbf6c..5106e6477493d 100644
--- a/soc/nxp/imxrt/imxrt118x/soc.c
+++ b/soc/nxp/imxrt/imxrt118x/soc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,6 +7,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/linker/linker-defs.h>
@@ -23,6 +24,20 @@
 #include <zephyr/dt-bindings/clock/imx_ccm_rev2.h>
 #include <cmsis_core.h>
 
+LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
+
+#if  defined(CONFIG_SECOND_CORE_MCUX) && defined(CONFIG_CPU_CORTEX_M33)
+#include <zephyr_image_info.h>
+/* Memcpy macro to copy segments from secondary core image stored in flash
+ * to RAM section that secondary core boots from.
+ * n is the segment number, as defined in zephyr_image_info.h
+ */
+#define MEMCPY_SEGMENT(n, _)							\
+	memcpy((uint32_t *)(((SEGMENT_LMA_ADDRESS_ ## n) - ADJUSTED_LMA) + 0x303C0000),	\
+		(uint32_t *)(SEGMENT_LMA_ADDRESS_ ## n),			\
+		(SEGMENT_SIZE_ ## n))
+#endif
+
 /*
  * Set ELE_STICK_FAILED_STS to 0 when ELE status check is not required,
  * which is useful when debug reset, where the core has already get the
@@ -43,6 +58,17 @@
 #define ELE_CORE_CM7_ID    0x2
 #define EDMA_DID           0x7U
 
+/* When CM33 sets TRDC, CM7 must NOT require TRDC ownership from ELE */
+#if defined(CONFIG_SECOND_CORE_MCUX) && defined(CONFIG_SOC_MIMXRT1189_CM7)
+/* When CONFIG_SECOND_CORE_MCUX then TRDC(AON/WAKEUP) ownership cannot be released
+ * to CM33 and CM7 both in one ELE reset cycle.
+ * Only CM33 will set TRDC.
+ */
+#define CM33_SET_TRDC 0U
+#else
+#define CM33_SET_TRDC 1U
+#endif
+
 #ifdef CONFIG_INIT_ARM_PLL
 static const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN = {
 #if defined(CONFIG_SOC_MIMXRT1189_CM33) || defined(CONFIG_SOC_MIMXRT1189_CM7)
@@ -233,14 +259,58 @@ __weak void clock_init(void)
 	CLOCK_SetRootClock(kCLOCK_Root_M7_Systick, &rootCfg);
 #endif
 
-#if defined(CONFIG_UART_MCUX_LPUART) && \
-	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1)) \
+#if defined(CONFIG_UART_MCUX_LPUART)
+
+#if	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart1)) \
 	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart2)))
 	/* Configure LPUART0102 using SYS_PLL3_DIV2_CLK */
 	rootCfg.mux = kCLOCK_LPUART0102_ClockRoot_MuxSysPll3Div2;
 	rootCfg.div = 10;
+	CLOCK_SetRootClock(kCLOCK_Root_Lpuart0102, &rootCfg);
+#endif
+
+#if	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart3)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart4)))
+	/* Configure LPUART0304 using SYS_PLL3_DIV2_CLK */
+	rootCfg.mux = kCLOCK_LPUART0304_ClockRoot_MuxSysPll3Div2;
+	rootCfg.div = 10;
+	CLOCK_SetRootClock(kCLOCK_Root_Lpuart0304, &rootCfg);
+#endif
+
+#if	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart5)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart6)))
+	/* Configure LPUART0506 using SYS_PLL3_DIV2_CLK */
+	rootCfg.mux = kCLOCK_LPUART0506_ClockRoot_MuxSysPll3Div2;
+	rootCfg.div = 10;
+	CLOCK_SetRootClock(kCLOCK_Root_Lpuart0506, &rootCfg);
+#endif
+
+#if	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart7)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart8)))
+	/* Configure LPUART0708 using SYS_PLL3_DIV2_CLK */
+	rootCfg.mux = kCLOCK_LPUART0708_ClockRoot_MuxSysPll3Div2;
+	rootCfg.div = 10;
+	CLOCK_SetRootClock(kCLOCK_Root_Lpuart0708, &rootCfg);
+#endif
+
+#if	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart9)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart10)))
+	/* Configure LPUART0910 using SYS_PLL3_DIV2_CLK */
+	rootCfg.mux = kCLOCK_LPUART0910_ClockRoot_MuxSysPll3Div2;
+	rootCfg.div = 10;
+	CLOCK_SetRootClock(kCLOCK_Root_Lpuart0910, &rootCfg);
 #endif
 
+#if	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart11)) \
+	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpuart12)))
+	/* Configure LPUART1112 using SYS_PLL3_DIV2_CLK */
+	rootCfg.mux = kCLOCK_LPUART1112_ClockRoot_MuxSysPll3Div2;
+	rootCfg.div = 10;
+	CLOCK_SetRootClock(kCLOCK_Root_Lpuart1112, &rootCfg);
+#endif
+
+#endif /* CONFIG_UART_MCUX_LPUART */
+
 #if defined(CONFIG_I2C_MCUX_LPI2C) && \
 	(DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c1)) \
 	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lpi2c2)))
@@ -314,7 +384,7 @@ __weak void clock_init(void)
 
 #endif /* CONFIG_COUNTER_MCUX_GPT */
 
-#ifdef CONFIG_MCUX_ACMP
+#if defined(CONFIG_COMPARATOR_MCUX_ACMP) || defined(CONFIG_SENSOR_MCUX_ACMP)
 
 #if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp1))  \
 	|| DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp2)) \
@@ -326,7 +396,7 @@ __weak void clock_init(void)
 	CLOCK_SetRootClock(kCLOCK_Root_Acmp, &rootCfg);
 #endif
 
-#endif /* CONFIG_MCUX_ACMP */
+#endif /* CONFIG_COMPARATOR_MCUX_ACMP || CONFIG_SENSOR_MCUX_ACMP */
 
 #if defined(CONFIG_ETH_NXP_IMX_NETC) && (DT_CHILD_NUM_STATUS_OKAY(DT_NODELABEL(netc)) != 0)
 	/* Configure ENET using SYS_PLL1_DIV2_CLK */
@@ -501,9 +571,38 @@ __weak void clock_init(void)
 		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb1), clocks, clock_frequency));
 #endif
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb2)) && CONFIG_UDC_NXP_EHCI
+	CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usb480M,
+		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
+	CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M,
+		DT_PROP_BY_PHANDLE(DT_NODELABEL(usb2), clocks, clock_frequency));
+#endif
+
+#ifdef CONFIG_IMX_USDHC
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc1), okay)
+	/* Configure USDHC1 using SysPll2Pfd2 */
+	rootCfg.mux = kCLOCK_USDHC1_ClockRoot_MuxSysPll2Pfd2;
+	rootCfg.div = 2;
+	CLOCK_SetRootClock(kCLOCK_Root_Usdhc1, &rootCfg);
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(usdhc2), okay)
+	/* Configure USDHC2 using SysPll2Pfd2 */
+	rootCfg.mux = kCLOCK_USDHC2_ClockRoot_MuxSysPll2Pfd2;
+	rootCfg.div = 2;
+	CLOCK_SetRootClock(kCLOCK_Root_Usdhc2, &rootCfg);
+#endif
+
+#endif /* CONFIG_IMX_USDHC */
+
 	/* Keep core clock ungated during WFI */
 	CCM->LPCG[1].LPM0 = 0x33333333;
 	CCM->LPCG[1].LPM1 = 0x33333333;
+
+	/* Let the core clock still running in WAIT mode */
+	BLK_CTRL_S_AONMIX->M7_CFG |= BLK_CTRL_S_AONMIX_M7_CFG_CORECLK_FORCE_ON_MASK;
+
 	/* Keep the system clock running so SYSTICK can wake up
 	 * the system from wfi.
 	 */
@@ -521,34 +620,36 @@ static ALWAYS_INLINE void trdc_enable_all_access(void)
 	status_t sts;
 	uint8_t i, j;
 
-    /* Get ELE FW status */
+	/* Get ELE FW status */
 	do {
 		uint32_t ele_fw_sts;
 
 		sts = ELE_BaseAPI_GetFwStatus(MU_RT_S3MUA, &ele_fw_sts);
 	} while (sts != kStatus_Success);
 
-	do {
 #if defined(CONFIG_SOC_MIMXRT1189_CM33)
-		/* Release TRDC A to CM33 core */
-		sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM33_ID);
+	/* Release TRDC AON to CM33 core */
+	sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM33_ID);
 #elif defined(CONFIG_SOC_MIMXRT1189_CM7)
-		/* Release TRDC A to CM7 core */
-		sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM7_ID);
+	/* Release TRDC AON to CM7 core */
+	sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_AON_ID, ELE_CORE_CM7_ID);
 #endif
-	} while (ELE_IS_FAILED(sts));
+	if (sts != kStatus_Success) {
+		LOG_WRN("warning: TRDC AON permission get failed. If core don't get TRDC "
+			"AON permission, AON domain permission can't be configured.");
+	}
 
-	/* Release TRDC W to CM33 core */
-	do {
 #if defined(CONFIG_SOC_MIMXRT1189_CM33)
-		/* Release TRDC A to CM33 core */
-		sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM33_ID);
+	/* Release TRDC Wakeup to CM33 core */
+	sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM33_ID);
 #elif defined(CONFIG_SOC_MIMXRT1189_CM7)
-		/* Release TRDC A to CM7 core */
-		sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM7_ID);
+	/* Release TRDC Wakeup to CM7 core */
+	sts = ELE_BaseAPI_ReleaseRDC(MU_RT_S3MUA, ELE_TRDC_WAKEUP_ID, ELE_CORE_CM7_ID);
 #endif
-	} while (ELE_IS_FAILED(sts));
-
+	if (sts != kStatus_Success) {
+		LOG_WRN("warning: TRDC Wakeup permission get failed. If core don't get TRDC "
+			"Wakeup permission, Wakeup domain permission can't be configured.");
+	}
 
 	/* Set the master domain access configuration for eDMA3/eDMA4 */
 	trdc_non_processor_domain_assignment_t edmaAssignment;
@@ -641,8 +742,12 @@ void soc_early_init_hook(void)
 {
 	/* Initialize system clock */
 	clock_init();
+
+#if (defined(CM33_SET_TRDC) && (CM33_SET_TRDC > 0U))
 	/* Get trdc and enable all access modes for MBC and MRC of TRDCA and TRDCW */
 	trdc_enable_all_access();
+#endif /* (defined(CM33_SET_TRDC) && (CM33_SET_TRDC > 0U) */
+
 #if defined(CONFIG_WDT_MCUX_RTWDOG)
 	/* Unmask the watchdog reset channel */
 	RTWDOG_IF_SET_SRC(0, 1)
@@ -655,7 +760,20 @@ void soc_early_init_hook(void)
 	uint32_t mask = SRC_GetResetStatusFlags(SRC_GENERAL_REG);
 
 	SRC_ClearGlobalSystemResetStatus(SRC_GENERAL_REG, mask);
-#endif
+#endif /* defined(CONFIG_WDT_MCUX_RTWDOG) */
+
+#if (defined(CONFIG_SECOND_CORE_MCUX) && defined(CONFIG_CPU_CORTEX_M33))
+	/**
+	 * Copy CM7 core from flash to memory. Note that depending on where the
+	 * user decided to store CM7 code, this is likely going to read from the
+	 * flexspi while using XIP. Provided we DO NOT WRITE TO THE FLEXSPI,
+	 * this operation is safe.
+	 *
+	 * Note that this copy MUST occur before enabling the M33 caching to
+	 * ensure the data is written directly to RAM (since the M4 core will use it)
+	 */
+	LISTIFY(SEGMENT_NUM, MEMCPY_SEGMENT, (;));
+#endif /* (defined(CONFIG_SECOND_CORE_MCUX) && defined(CONFIG_CPU_CORTEX_M33)) */
 
 	/* Enable data cache */
 	sys_cache_data_enable();
@@ -668,5 +786,41 @@ void soc_early_init_hook(void)
 void soc_reset_hook(void)
 {
 	SystemInit();
+
+#if defined(CONFIG_SECOND_CORE_MCUX) && defined(CONFIG_CPU_CORTEX_M33)
+	Prepare_CM7(0);
+#endif
 }
 #endif
+
+#if defined(CONFIG_SECOND_CORE_MCUX) && defined(CONFIG_CPU_CORTEX_M33)
+
+static int second_core_boot(void)
+{
+	/*
+	 * RT1180 Specific CM7 Kick Off operation
+	 */
+	/* Trigger S401 */
+	while ((MU_RT_S3MUA->TSR & MU_TSR_TE0_MASK) == 0) {
+		; } /* Wait TR empty */
+	MU_RT_S3MUA->TR[0] = 0x17d20106;
+	while ((MU_RT_S3MUA->RSR & MU_RSR_RF0_MASK) == 0) {
+		; } /* Wait RR Full */
+	while ((MU_RT_S3MUA->RSR & MU_RSR_RF1_MASK) == 0) {
+		; } /* Wait RR Full */
+
+	/* Response from ELE must be always read */
+	__attribute__((unused)) volatile uint32_t result1, result2;
+	result1 = MU_RT_S3MUA->RR[0];
+	result2 = MU_RT_S3MUA->RR[1];
+
+	/* Deassert Wait */
+	BLK_CTRL_S_AONMIX->M7_CFG =
+		(BLK_CTRL_S_AONMIX->M7_CFG & (~BLK_CTRL_S_AONMIX_M7_CFG_WAIT_MASK)) |
+		BLK_CTRL_S_AONMIX_M7_CFG_WAIT(0);
+
+	return 0;
+}
+
+SYS_INIT(second_core_boot, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+#endif
diff --git a/soc/nxp/imxrt/imxrt11xx/Kconfig b/soc/nxp/imxrt/imxrt11xx/Kconfig
index 624831f3bf56e..61a5635c2b80c 100644
--- a/soc/nxp/imxrt/imxrt11xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt11xx/Kconfig
@@ -69,8 +69,4 @@ config BYPASS_LDO_LPSR
 config ADJUST_LDO
 	bool "Adjust LDO setting"
 
-config ADJUST_DCDC
-	default y
-	bool "Adjust internal DCDC output"
-
 endif # SOC_SERIES_IMXRT11XX
diff --git a/soc/nxp/imxrt/imxrt11xx/power.c b/soc/nxp/imxrt/imxrt11xx/power.c
index 04209b807e9bf..06dee0a901eab 100644
--- a/soc/nxp/imxrt/imxrt11xx/power.c
+++ b/soc/nxp/imxrt/imxrt11xx/power.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NXP
+ * Copyright (c) 2021, 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -57,7 +57,6 @@ static void gpc_set_transition_flow(void)
 	gpc_tran_step_config_t step_cfg;
 
 	step_cfg.enableStep = true;
-	step_cfg.cntMode = kGPC_StepCounterDisableMode;
 
 	/* Cortex M7 */
 	GPC_CM_ConfigCpuModeTransitionStep(GPC_CPU_MODE_CTRL,
diff --git a/soc/nxp/imxrt/imxrt11xx/soc.c b/soc/nxp/imxrt/imxrt11xx/soc.c
index a75297fe2963d..e8261016bb3f1 100644
--- a/soc/nxp/imxrt/imxrt11xx/soc.c
+++ b/soc/nxp/imxrt/imxrt11xx/soc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 NXP
+ * Copyright 2021-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -19,7 +19,7 @@
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
-#ifdef CONFIG_NXP_IMXRT_BOOT_HEADER
+#if defined(CONFIG_NXP_IMXRT_BOOT_HEADER) && defined(CONFIG_CPU_CORTEX_M7)
 #include <fsl_flexspi_nor_boot.h>
 #endif
 #include <zephyr/dt-bindings/clock/imx_ccm_rev2.h>
@@ -127,7 +127,7 @@ usb_phy_config_struct_t usbPhyConfig = {
 };
 #endif
 
-#ifdef CONFIG_NXP_IMXRT_BOOT_HEADER
+#if defined(CONFIG_NXP_IMXRT_BOOT_HEADER) && defined(CONFIG_CPU_CORTEX_M7)
 const __imx_boot_data_section BOOT_DATA_T boot_data = {
 #ifdef CONFIG_XIP
 	.start = CONFIG_FLASH_BASE_ADDRESS,
@@ -408,13 +408,13 @@ __weak void clock_init(void)
 	CLOCK_SetRootClock(kCLOCK_Root_Lpi2c6, &rootCfg);
 #endif
 
-#if CONFIG_ETH_MCUX || CONFIG_ETH_NXP_ENET
+#if CONFIG_ETH_NXP_ENET
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(enet))
 	/* 50 MHz ENET clock */
 	rootCfg.mux = kCLOCK_ENET1_ClockRoot_MuxSysPll1Div2;
 	rootCfg.div = 10;
 	CLOCK_SetRootClock(kCLOCK_Root_Enet1, &rootCfg);
-#if CONFIG_ETH_MCUX_RMII_EXT_CLK
+#if CONFIG_ETH_NXP_ENET_RMII_EXT_CLK
 	/* Set ENET_REF_CLK as an input driven by PHY */
 	IOMUXC_GPR->GPR4 &= ~IOMUXC_GPR_GPR4_ENET_REF_CLK_DIR(0x01U);
 	IOMUXC_GPR->GPR4 |= IOMUXC_GPR_GPR4_ENET_TX_CLK_SEL(0x1U);
@@ -442,7 +442,7 @@ __weak void clock_init(void)
 	 */
 	rootCfg.div = 10;
 	CLOCK_SetRootClock(kCLOCK_Root_Enet2, &rootCfg);
-#if CONFIG_ETH_MCUX_RMII_EXT_CLK
+#if CONFIG_ETH_NXP_ENET_RMII_EXT_CLK
 	/* Set ENET1G_REF_CLK as an input driven by PHY */
 	IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_ENET1G_REF_CLK_DIR(0x01U);
 	IOMUXC_GPR->GPR5 |= IOMUXC_GPR_GPR5_ENET1G_TX_CLK_SEL(0x1U);
@@ -455,7 +455,7 @@ __weak void clock_init(void)
 #endif
 #endif
 
-#if defined(CONFIG_PTP_CLOCK_MCUX) || defined(CONFIG_PTP_CLOCK_NXP_ENET)
+#if defined(CONFIG_PTP_CLOCK_NXP_ENET)
 	/* 24MHz PTP clock */
 	rootCfg.mux = kCLOCK_ENET_TIMER1_ClockRoot_MuxOscRc48MDiv2;
 	rootCfg.div = 1;
@@ -463,8 +463,8 @@ __weak void clock_init(void)
 #endif
 
 #ifdef CONFIG_SPI_MCUX_LPSPI
-	/* Configure lpspi using Osc48MDiv2 */
-	rootCfg.mux = kCLOCK_LPSPI1_ClockRoot_MuxOscRc48MDiv2;
+	/* Configure input clock to be able to reach the datasheet specified band rate. */
+	rootCfg.mux = kCLOCK_LPSPI1_ClockRoot_MuxOscRc400M;
 	rootCfg.div = 1;
 	CLOCK_SetRootClock(kCLOCK_Root_Lpspi1, &rootCfg);
 #endif
@@ -494,7 +494,7 @@ __weak void clock_init(void)
 #endif
 #endif
 
-#ifdef CONFIG_MCUX_ACMP
+#if defined(CONFIG_COMPARATOR_MCUX_ACMP) || defined(CONFIG_SENSOR_MCUX_ACMP)
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(acmp1))
 	/* Configure ACMP1 using Osc48MDiv2*/
 	rootCfg.mux = kCLOCK_ACMP_ClockRoot_MuxOscRc48MDiv2;
diff --git a/soc/nxp/imxrt/imxrt5xx/Kconfig.defconfig b/soc/nxp/imxrt/imxrt5xx/Kconfig.defconfig
index 0f91836ca5258..63af825bacfd8 100644
--- a/soc/nxp/imxrt/imxrt5xx/Kconfig.defconfig
+++ b/soc/nxp/imxrt/imxrt5xx/Kconfig.defconfig
@@ -17,9 +17,6 @@ config ROM_START_OFFSET
 config NUM_IRQS
 	default 76
 
-config ZTEST_NO_YIELD
-	default y if (PM && ZTEST)
-
 if MBEDTLS
 #
 # MBEDTLS CTR_DRBG code path needs extra stack space for initialization than
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/CMakeLists.txt b/soc/nxp/imxrt/imxrt5xx/cm33/CMakeLists.txt
index dc952c53fa228..cffd07d17e666 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/CMakeLists.txt
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/CMakeLists.txt
@@ -7,6 +7,7 @@
 zephyr_compile_definitions(FSL_SDK_DRIVER_QUICK_ACCESS_ENABLE)
 
 zephyr_compile_definitions_ifdef(CONFIG_USB_DEVICE_DRIVER USB_STACK_USE_DEDICATED_RAM=1)
+zephyr_compile_definitions_ifdef(CONFIG_UDC_DRIVER USB_STACK_USE_DEDICATED_RAM=1)
 
 zephyr_include_directories(.)
 
diff --git a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
index dd95cee362d36..b826080323f12 100644
--- a/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt5xx/cm33/soc.c
@@ -72,7 +72,7 @@ const clock_frg_clk_config_t g_frg12Config_clock_init = {
 	.num = 12, .sfg_clock_src = kCLOCK_FrgMainClk, .divider = 255U, .mult = 167};
 
 #if CONFIG_USB_DC_NXP_LPCIP3511
-/* USB PHY condfiguration */
+/* USB PHY configuration */
 #define BOARD_USB_PHY_D_CAL     (0x0CU)
 #define BOARD_USB_PHY_TXCAL45DP (0x06U)
 #define BOARD_USB_PHY_TXCAL45DM (0x06U)
@@ -177,7 +177,7 @@ static void usb_device_clock_init(void)
 	while (SYSCTL0->USB0CLKSTAT & SYSCTL0_USB0CLKSTAT_HOST_NEED_CLKST_MASK) {
 		__ASM("nop");
 	}
-	/* According to reference mannual, device mode setting has to be set by access
+	/* According to reference manual, device mode setting has to be set by access
 	 * usb host register
 	 */
 	USBHSH->PORTMODE |= USBHSH_PORTMODE_DEV_ENABLE_MASK;
diff --git a/soc/nxp/imxrt/imxrt6xx/Kconfig.defconfig b/soc/nxp/imxrt/imxrt6xx/Kconfig.defconfig
index b36ea66ad6272..097c5c49cf12f 100644
--- a/soc/nxp/imxrt/imxrt6xx/Kconfig.defconfig
+++ b/soc/nxp/imxrt/imxrt6xx/Kconfig.defconfig
@@ -35,9 +35,6 @@ config ROM_START_OFFSET
 config NUM_IRQS
 	default 60
 
-config ZTEST_NO_YIELD
-	default y if (ZTEST && PM)
-
 if MBEDTLS
 #
 # MBEDTLS CTR_DRBG code path needs extra stack space for initialization than
diff --git a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
index e390528e6abca..68f5b9faf16db 100644
--- a/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
+++ b/soc/nxp/imxrt/imxrt6xx/cm33/soc.c
@@ -67,7 +67,7 @@ const clock_audio_pll_config_t g_audioPllConfig = {.audio_pll_src = kCLOCK_Audio
 #endif
 
 #if CONFIG_USB_DC_NXP_LPCIP3511 || CONFIG_UDC_NXP_IP3511
-/* USB PHY condfiguration */
+/* USB PHY configuration */
 #define BOARD_USB_PHY_D_CAL     (0x0CU)
 #define BOARD_USB_PHY_TXCAL45DP (0x06U)
 #define BOARD_USB_PHY_TXCAL45DM (0x06U)
@@ -168,7 +168,7 @@ static void usb_device_clock_init(void)
 	while (SYSCTL0->USBCLKSTAT & SYSCTL0_USBCLKSTAT_HOST_NEED_CLKST_MASK) {
 		__ASM("nop");
 	}
-	/* According to reference mannual, device mode setting has to be set by
+	/* According to reference manual, device mode setting has to be set by
 	 * access usb host register
 	 */
 	USBHSH->PORTMODE |= USBHSH_PORTMODE_DEV_ENABLE_MASK;
diff --git a/soc/nxp/imxrt/imxrt7xx/CMakeLists.txt b/soc/nxp/imxrt/imxrt7xx/CMakeLists.txt
index dc36672a9ba2c..aeb9af94d04d9 100644
--- a/soc/nxp/imxrt/imxrt7xx/CMakeLists.txt
+++ b/soc/nxp/imxrt/imxrt7xx/CMakeLists.txt
@@ -1,9 +1,13 @@
 #
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
 if(CONFIG_SOC_MIMXRT798S_CM33_CPU0 OR CONFIG_SOC_MIMXRT798S_CM33_CPU1)
   add_subdirectory(cm33)
+elseif(CONFIG_SOC_MIMXRT798S_HIFI4)
+  add_subdirectory(hifi4)
+elseif(CONFIG_SOC_MIMXRT798S_HIFI1)
+  add_subdirectory(hifi1)
 endif()
diff --git a/soc/nxp/imxrt/imxrt7xx/Kconfig b/soc/nxp/imxrt/imxrt7xx/Kconfig
index a35c2dbd8ee7a..20dc534d8553a 100644
--- a/soc/nxp/imxrt/imxrt7xx/Kconfig
+++ b/soc/nxp/imxrt/imxrt7xx/Kconfig
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_MIMXRT798S_CM33_CPU0
@@ -38,6 +38,26 @@ config SOC_MIMXRT798S_CM33_CPU1
 	select HAS_MCUX_SYSCON
 	select HAS_MCUX_FLEXCOMM
 
+config SOC_MIMXRT798S_HIFI4
+	select XTENSA
+	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")
+	select XTENSA_RESET_VECTOR
+	select XTENSA_USE_CORE_CRT1
+	select XTENSA_GEN_HANDLERS
+	select XTENSA_SMALL_VECTOR_TABLE_ENTRY
+	select GEN_ISR_TABLES
+	select HAS_MCUX
+
+config SOC_MIMXRT798S_HIFI1
+	select XTENSA
+	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")
+	select XTENSA_RESET_VECTOR
+	select XTENSA_USE_CORE_CRT1
+	select XTENSA_GEN_HANDLERS
+	select XTENSA_SMALL_VECTOR_TABLE_ENTRY
+	select GEN_ISR_TABLES
+	select HAS_MCUX
+
 if SOC_SERIES_IMXRT7XX
 
 if NXP_IMXRT_BOOT_HEADER
@@ -54,5 +74,7 @@ config GLIKEY_MCUX_GLIKEY
 config MCUX_CORE_SUFFIX
 	default "_cm33_core0" if SOC_MIMXRT798S_CM33_CPU0
 	default "_cm33_core1" if SOC_MIMXRT798S_CM33_CPU1
+	default "_hifi4" if SOC_MIMXRT798S_HIFI4
+	default "_hifi1" if SOC_MIMXRT798S_HIFI1
 
 endif # SOC_SERIES_IMXRT7XX
diff --git a/soc/nxp/imxrt/imxrt7xx/Kconfig.defconfig b/soc/nxp/imxrt/imxrt7xx/Kconfig.defconfig
index c7b1d1d4b0557..f4b910a2578e2 100644
--- a/soc/nxp/imxrt/imxrt7xx/Kconfig.defconfig
+++ b/soc/nxp/imxrt/imxrt7xx/Kconfig.defconfig
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_MIMXRT798S_CM33_CPU0
@@ -11,6 +11,7 @@ config NUM_IRQS
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 237500000 if CORTEX_M_SYSTICK
+	default 1000000 if MCUX_OS_TIMER
 
 choice CACHE_TYPE
 	default EXTERNAL_CACHE
@@ -25,9 +26,54 @@ config NUM_IRQS
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 100000000 if CORTEX_M_SYSTICK
+	default 1000000 if MCUX_OS_TIMER
 
 endif # SOC_MIMXRT798S_CM33_CPU1
 
 config MFD
 	default y
 	depends on DT_HAS_NXP_LP_FLEXCOMM_ENABLED
+
+if SOC_MIMXRT798S_HIFI4
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
+
+config XTENSA_TIMER
+	default y
+
+config XTENSA_CCOUNT_HZ
+	default SYS_CLOCK_HW_CYCLES_PER_SEC
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 1000
+
+config GEN_IRQ_VECTOR_TABLE
+	default n
+
+config NXP_IMXRT_BOOT_HEADER
+	default n
+
+endif # SOC_MIMXRT798S_HIFI4
+
+if SOC_MIMXRT798S_HIFI1
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
+
+config XTENSA_TIMER
+	default y
+
+config GEN_IRQ_VECTOR_TABLE
+	default n
+
+config NXP_IMXRT_BOOT_HEADER
+	default n
+
+config XTENSA_CCOUNT_HZ
+	default SYS_CLOCK_HW_CYCLES_PER_SEC
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 1000
+
+endif # SOC_MIMXRT798S_HIFI1
diff --git a/soc/nxp/imxrt/imxrt7xx/Kconfig.soc b/soc/nxp/imxrt/imxrt7xx/Kconfig.soc
index 5e321bdc9bb26..384f99cdb6aba 100644
--- a/soc/nxp/imxrt/imxrt7xx/Kconfig.soc
+++ b/soc/nxp/imxrt/imxrt7xx/Kconfig.soc
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_IMXRT7XX
@@ -9,6 +9,12 @@ config SOC_MIMXRT798S
 	bool
 	select SOC_SERIES_IMXRT7XX
 
+config SOC_SERIES
+	default "imxrt7xx" if SOC_SERIES_IMXRT7XX
+
+config SOC
+	default "mimxrt798s" if SOC_MIMXRT798S
+
 config SOC_MIMXRT798S_CM33_CPU0
 	bool
 	select SOC_MIMXRT798S
@@ -17,11 +23,22 @@ config SOC_MIMXRT798S_CM33_CPU1
 	bool
 	select SOC_MIMXRT798S
 
-config SOC_SERIES
-	default "imxrt7xx" if SOC_SERIES_IMXRT7XX
+config SOC_MIMXRT798S_HIFI4
+	bool
+	select SOC_MIMXRT798S
+	help
+	  NXP i.MXRT7xx HiFi4 DSP Core
 
-config SOC
-	default "mimxrt798s" if SOC_MIMXRT798S
+config SOC_MIMXRT798S_HIFI1
+	bool
+	select SOC_MIMXRT798S
+	help
+	  NXP i.MXRT7xx HiFi1 DSP Core
+
+config SOC_TOOLCHAIN_NAME
+	string
+	default "nxp_rt700_hifi4" if SOC_MIMXRT798S_HIFI4
+	default "nxp_rt700_hifi1" if SOC_MIMXRT798S_HIFI1
 
 config SOC_PART_NUMBER_MIMXRT798SGAWAR
 	bool
diff --git a/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt b/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt
index cd9319bffaaf4..5bb16ce1e04e9 100644
--- a/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt
+++ b/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt
@@ -5,6 +5,7 @@
 #
 
 zephyr_compile_definitions_ifdef(CONFIG_NXP_LP_FLEXCOMM LPFLEXCOMM_INIT_NOT_USED_IN_DRIVER=1)
+zephyr_compile_definitions_ifdef(CONFIG_UDC_DRIVER USB_DEVICE_CONFIG_BUFFER_PROPERTY_CACHEABLE=1)
 
 zephyr_compile_definitions(FSL_SDK_DRIVER_QUICK_ACCESS_ENABLE)
 
diff --git a/soc/nxp/imxrt/imxrt7xx/cm33/flash_clock_setup.c b/soc/nxp/imxrt/imxrt7xx/cm33/flash_clock_setup.c
index 9994fc3885f29..65b7021268b99 100644
--- a/soc/nxp/imxrt/imxrt7xx/cm33/flash_clock_setup.c
+++ b/soc/nxp/imxrt/imxrt7xx/cm33/flash_clock_setup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -88,12 +88,9 @@ static void flash_init(XSPI_Type *base, CACHE64_CTRL_Type *cache)
 	/* Enable subordinate as auto update mode. */
 	base->DLLCR[0] |= XSPI_DLLCR_SLV_EN_MASK | XSPI_DLLCR_SLAVE_AUTO_UPDT_MASK;
 	/* program DLL to desired delay. */
-	base->DLLCR[0] |=
-		XSPI_DLLCR_DLLRES(FSL_FEATURE_XSPI_DLL_REF_VALUE_AUTOUPDATE_X16_DISABLE_RES) |
-		XSPI_DLLCR_DLL_REFCNTR(
-			FSL_FEATURE_XSPI_DLL_REF_VALUE_AUTOUPDATE_X16_DISABLED_REF_COUNTER) |
-		XSPI_DLLCR_SLV_FINE_OFFSET(0) | XSPI_DLLCR_SLV_DLY_OFFSET(0) |
-		XSPI_DLLCR_FREQEN(1U);
+	base->DLLCR[0] |= XSPI_DLLCR_DLLRES(FSL_FEATURE_XSPI_DLL_REF_VALUE_AUTOUPDATE_RES) |
+		XSPI_DLLCR_DLL_REFCNTR(2U) | XSPI_DLLCR_DLL_CDL8(1U) | XSPI_DLLCR_FREQEN(1U) |
+		XSPI_DLLCR_SLV_FINE_OFFSET(0) | XSPI_DLLCR_SLV_DLY_OFFSET(0);
 	/* Load above settings into delay chain. */
 	base->DLLCR[0] |= XSPI_DLLCR_SLV_UPD_MASK;
 	base->DLLCR[0] |= XSPI_DLLCR_DLLEN_MASK;
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi1/CMakeLists.txt b/soc/nxp/imxrt/imxrt7xx/hifi1/CMakeLists.txt
new file mode 100644
index 0000000000000..1c10b21b9eac5
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi1/CMakeLists.txt
@@ -0,0 +1,9 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi1/include/dsp/cache.h b/soc/nxp/imxrt/imxrt7xx/hifi1/include/dsp/cache.h
new file mode 100644
index 0000000000000..d67fca16f87d0
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi1/include/dsp/cache.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __COMMON_DSP_CACHE_H__
+#define __COMMON_DSP_CACHE_H__
+
+#include <xtensa/hal.h>
+
+#endif
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi1/include/dsp/io.h b/soc/nxp/imxrt/imxrt7xx/hifi1/include/dsp/io.h
new file mode 100644
index 0000000000000..7bdd1c5ad2781
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi1/include/dsp/io.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __INCLUDE_IO__
+#define __INCLUDE_IO__
+
+#include <stdint.h>
+#include <soc/memory.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/arch/common/sys_io.h>
+
+static inline uint32_t io_reg_read(uint32_t reg)
+{
+	return sys_read32(reg);
+}
+
+static inline void io_reg_write(uint32_t reg, uint32_t val)
+{
+	sys_write32(val, reg);
+}
+
+static inline void io_reg_update_bits(uint32_t reg, uint32_t mask, uint32_t value)
+{
+	io_reg_write(reg, (io_reg_read(reg) & (~mask)) | (value & mask));
+}
+
+static inline uint16_t io_reg_read16(uint32_t reg)
+{
+	return sys_read16(reg);
+}
+
+static inline void io_reg_write16(uint32_t reg, uint16_t val)
+{
+	sys_write16(val, reg);
+}
+
+#endif
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi1/include/soc.h b/soc/nxp/imxrt/imxrt7xx/hifi1/include/soc.h
new file mode 100644
index 0000000000000..f4b7380d84ed0
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi1/include/soc.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <string.h>
+#include <errno.h>
+
+#include <zephyr/sys/sys_io.h>
+#include <dsp/cache.h>
+
+#ifndef __INC_IMXRT_SOC_H
+#define __INC_IMXRT_SOC_H
+
+/* Macros related to interrupt handling */
+#define XTENSA_IRQ_NUM_SHIFT 0
+#define XTENSA_IRQ_NUM_MASK  0xff
+
+/*
+ * IRQs are mapped on levels. 2nd, 3rd and 4th level are left as 0x00.
+ *
+ * 1. Peripheral Register bit offset.
+ */
+#define XTENSA_IRQ_NUMBER(_irq) ((_irq >> XTENSA_IRQ_NUM_SHIFT) & XTENSA_IRQ_NUM_MASK)
+
+extern void z_soc_irq_enable(uint32_t irq);
+extern void z_soc_irq_disable(uint32_t irq);
+extern int z_soc_irq_is_enabled(unsigned int irq);
+
+#endif /* __INC_IMXRT_SOC_H */
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi1/include/soc/memory.h b/soc/nxp/imxrt/imxrt7xx/hifi1/include/soc/memory.h
new file mode 100644
index 0000000000000..0ddd29f386512
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi1/include/soc/memory.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __XTENSA_MEMORY_H__
+#define __XTENSA_MEMORY_H__
+
+#include <zephyr/autoconf.h>
+
+#define IRAM_RESERVE_HEADER_SPACE 0x400
+
+#define IRAM0_BASE 0x00580000
+#define IRAM0_SIZE 0x8000
+
+#define IRAM1_BASE 0x00680000
+#define IRAM1_SIZE 0x80000
+
+#define DRAM_BASE 0x20700000
+#define DRAM_SIZE 0x80000
+
+/* The reset vector address in IRAM and its size. */
+#define XCHAL_RESET_VECTOR0_PADDR_IRAM IRAM0_BASE
+#define MEM_RESET_TEXT_SIZE            (0x2E0)
+#define MEM_RESET_LIT_SIZE             (0x120)
+
+/* Base address of all interrupt vectors in IRAM. */
+#define XCHAL_VECBASE_RESET_PADDR_IRAM (IRAM0_BASE + IRAM_RESERVE_HEADER_SPACE)
+#define MEM_VECBASE_LIT_SIZE           (0x178)
+/* Vector and literal sizes. */
+#define MEM_VECT_LIT_SIZE  (0x4)
+#define MEM_VECT_TEXT_SIZE (0x1C)
+
+/* Addresses of the interrupt vectors. */
+#define XCHAL_INT_VECTOR_ADDR(x)          (XCHAL_VECBASE_RESET_PADDR_IRAM + (x))
+#define XCHAL_INTLEVEL2_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x17C))
+#define XCHAL_INTLEVEL3_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x19C))
+#define XCHAL_INTLEVEL4_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x1BC))
+#define XCHAL_INTLEVEL5_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x1DC))
+#define XCHAL_KERNEL_VECTOR_PADDR_IRAM    (XCHAL_INT_VECTOR_ADDR(0x1FC))
+#define XCHAL_USER_VECTOR_PADDR_IRAM      (XCHAL_INT_VECTOR_ADDR(0x21C))
+#define XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x23C))
+
+/* Location for the intList section which is later used to construct the
+ * Interrupt Descriptor Table (IDT). This is a bogus address as this
+ * section will be stripped off in the final image.
+ */
+#define IDT_BASE (IRAM0_BASE + IRAM0_SIZE)
+
+/* Size of the Interrupt Descriptor Table (IDT). */
+#define IDT_SIZE (0x2000)
+
+#endif
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi1/linker.ld b/soc/nxp/imxrt/imxrt7xx/hifi1/linker.ld
new file mode 100644
index 0000000000000..7d8e2b7b03be8
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi1/linker.ld
@@ -0,0 +1,498 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+OUTPUT_ARCH(xtensa)
+
+#include <soc/memory.h>
+#include <xtensa/config/core-isa.h>
+
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/linker/linker-tool.h>
+#include <zephyr/linker/sections.h>
+
+#define RAMABLE_REGION dram :dram_phdr
+#define ROMABLE_REGION dram :dram_phdr
+
+MEMORY
+{
+  vector_reset_text :
+    org = XCHAL_RESET_VECTOR0_PADDR_IRAM,
+    len = MEM_RESET_TEXT_SIZE
+  vector_reset_lit :
+    org = XCHAL_RESET_VECTOR0_PADDR_IRAM + MEM_RESET_TEXT_SIZE,
+    len = MEM_RESET_LIT_SIZE
+  vector_base_text :
+    org = XCHAL_VECBASE_RESET_PADDR_IRAM,
+    len = MEM_VECBASE_LIT_SIZE
+  vector_int2_lit :
+    org = XCHAL_INTLEVEL2_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int2_text :
+    org = XCHAL_INTLEVEL2_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_int3_lit :
+    org = XCHAL_INTLEVEL3_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int3_text :
+    org = XCHAL_INTLEVEL3_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_int4_lit :
+    org = XCHAL_INTLEVEL4_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int4_text :
+    org = XCHAL_INTLEVEL4_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_int5_lit :
+    org = XCHAL_INTLEVEL5_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int5_text :
+    org = XCHAL_INTLEVEL5_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_kernel_lit :
+    org = XCHAL_KERNEL_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_kernel_text :
+    org = XCHAL_KERNEL_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_user_lit :
+    org = XCHAL_USER_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_user_text :
+    org = XCHAL_USER_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_double_lit :
+    org = XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_double_text :
+    org = XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  iram0_text :
+    org = XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM + MEM_VECT_TEXT_SIZE,
+    len = (IRAM0_BASE + IRAM0_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + MEM_VECT_TEXT_SIZE)
+  iram_text_start :
+    org = IRAM1_BASE,
+    len = IRAM1_SIZE
+  dram :
+    org = DRAM_BASE,
+    len = DRAM_SIZE
+#ifdef CONFIG_GEN_ISR_TABLES
+  IDT_LIST :
+    org = IDT_BASE,
+    len = IDT_SIZE
+#endif
+}
+
+PHDRS
+{
+  vector_reset_text_phdr PT_LOAD;
+  vector_reset_lit_phdr PT_LOAD;
+  vector_base_text_phdr PT_LOAD;
+  vector_base_lit_phdr PT_LOAD;
+  vector_int2_text_phdr PT_LOAD;
+  vector_int2_lit_phdr PT_LOAD;
+  vector_int3_text_phdr PT_LOAD;
+  vector_int3_lit_phdr PT_LOAD;
+  vector_int4_text_phdr PT_LOAD;
+  vector_int4_lit_phdr PT_LOAD;
+  vector_int5_text_phdr PT_LOAD;
+  vector_int5_lit_phdr PT_LOAD;
+  vector_kernel_text_phdr PT_LOAD;
+  vector_kernel_lit_phdr PT_LOAD;
+  vector_user_text_phdr PT_LOAD;
+  vector_user_lit_phdr PT_LOAD;
+  vector_double_text_phdr PT_LOAD;
+  vector_double_lit_phdr PT_LOAD;
+  iram0_text_phdr PT_LOAD;
+  iram_text_start_phdr PT_LOAD;
+  dram_phdr PT_LOAD;
+}
+
+/*  Default entry point:  */
+ENTRY(CONFIG_KERNEL_ENTRY)
+
+_rom_store_table = 0;
+
+PROVIDE(_memmap_reset_vector = XCHAL_RESET_VECTOR0_PADDR_IRAM);
+PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR_IRAM);
+
+/* Various memory-map dependent cache attribute settings: */
+_memmap_cacheattr_wb_base = 0x00021022;
+_memmap_cacheattr_wt_base = 0x00021022;
+_memmap_cacheattr_bp_base = 0x00022022;
+_memmap_cacheattr_unused_mask = 0xFFF00F00;
+_memmap_cacheattr_wb_trapnull = 0x22221222;
+_memmap_cacheattr_wba_trapnull = 0x22221222;
+_memmap_cacheattr_wbna_trapnull = 0x22221222;
+_memmap_cacheattr_wt_trapnull = 0x22221222;
+_memmap_cacheattr_bp_trapnull = 0x22222222;
+_memmap_cacheattr_wb_strict = 0xFFF21F22;
+_memmap_cacheattr_wt_strict = 0xFFF21F22;
+_memmap_cacheattr_bp_strict = 0xFFF22F22;
+_memmap_cacheattr_wb_allvalid = 0x22221222;
+_memmap_cacheattr_wt_allvalid = 0x22221222;
+_memmap_cacheattr_bp_allvalid = 0x22222222;
+_memmap_region_map = 0x0000001B;
+PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wb_trapnull);
+
+SECTIONS
+{
+
+#include <zephyr/linker/rel-sections.ld>
+
+ .ResetVector.text : ALIGN(4)
+  {
+    _ResetVector_text_start = ABSOLUTE(.);
+    KEEP (*(.ResetVector.text))
+    _ResetVector_text_end = ABSOLUTE(.);
+  } >vector_reset_text :vector_reset_text_phdr
+
+  .ResetVector.literal : ALIGN(4)
+  {
+    _ResetVector_literal_start = ABSOLUTE(.);
+    *(.ResetVector.literal)
+    _ResetVector_literal_end = ABSOLUTE(.);
+  } >vector_reset_lit :vector_reset_lit_phdr
+
+  .WindowVectors.text : ALIGN(4)
+  {
+    _WindowVectors_text_start = ABSOLUTE(.);
+    KEEP (*(.WindowVectors.text))
+    _WindowVectors_text_end = ABSOLUTE(.);
+  } >vector_base_text :vector_base_text_phdr
+
+  .Level2InterruptVector.literal : ALIGN(4)
+  {
+    _Level2InterruptVector_literal_start = ABSOLUTE(.);
+    *(.Level2InterruptVector.literal)
+    _Level2InterruptVector_literal_end = ABSOLUTE(.);
+  } >vector_int2_lit :vector_int2_lit_phdr
+
+  .Level2InterruptVector.text : ALIGN(4)
+  {
+    _Level2InterruptVector_text_start = ABSOLUTE(.);
+    KEEP (*(.Level2InterruptVector.text))
+    _Level2InterruptVector_text_end = ABSOLUTE(.);
+  } >vector_int2_text :vector_int2_text_phdr
+
+  .Level3InterruptVector.literal : ALIGN(4)
+  {
+    _Level3InterruptVector_literal_start = ABSOLUTE(.);
+    *(.Level3InterruptVector.literal)
+    _Level3InterruptVector_literal_end = ABSOLUTE(.);
+  } >vector_int3_lit :vector_int3_lit_phdr
+
+  .Level3InterruptVector.text : ALIGN(4)
+  {
+    _Level3InterruptVector_text_start = ABSOLUTE(.);
+    KEEP (*(.Level3InterruptVector.text))
+    _Level3InterruptVector_text_end = ABSOLUTE(.);
+  } >vector_int3_text :vector_int3_text_phdr
+
+  .DebugExceptionVector.literal : ALIGN(4)
+  {
+    _DebugExceptionVector_literal_start = ABSOLUTE(.);
+    *(.DebugExceptionVector.literal)
+    _DebugExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_int4_lit :vector_int4_lit_phdr
+
+  .DebugExceptionVector.text : ALIGN(4)
+  {
+    _DebugExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.DebugExceptionVector.text))
+    _DebugExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_int4_text :vector_int4_text_phdr
+
+  .NMIExceptionVector.literal : ALIGN(4)
+  {
+    _NMIExceptionVector_literal_start = ABSOLUTE(.);
+    *(.NMIExceptionVector.literal)
+    _NMIExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_int5_lit :vector_int5_lit_phdr
+
+  .NMIExceptionVector.text : ALIGN(4)
+  {
+    _NMIExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.NMIExceptionVector.text))
+    _NMIExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_int5_text :vector_int5_text_phdr
+
+  .KernelExceptionVector.literal : ALIGN(4)
+  {
+    _KernelExceptionVector_literal_start = ABSOLUTE(.);
+    *(.KernelExceptionVector.literal)
+    _KernelExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_kernel_lit :vector_kernel_lit_phdr
+
+  .KernelExceptionVector.text : ALIGN(4)
+  {
+    _KernelExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.KernelExceptionVector.text))
+    _KernelExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_kernel_text :vector_kernel_text_phdr
+
+  .UserExceptionVector.literal : ALIGN(4)
+  {
+    _UserExceptionVector_literal_start = ABSOLUTE(.);
+    *(.UserExceptionVector.literal)
+    _UserExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_user_lit :vector_user_lit_phdr
+
+  .UserExceptionVector.text : ALIGN(4)
+  {
+    _UserExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.UserExceptionVector.text))
+    _UserExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_user_text :vector_user_text_phdr
+
+  .DoubleExceptionVector.literal : ALIGN(4)
+  {
+    _DoubleExceptionVector_literal_start = ABSOLUTE(.);
+    *(.DoubleExceptionVector.literal)
+    _DoubleExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_double_lit :vector_double_lit_phdr
+
+  .DoubleExceptionVector.text : ALIGN(4)
+  {
+    _DoubleExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.DoubleExceptionVector.text))
+    _DoubleExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_double_text :vector_double_text_phdr
+
+  .iram0.text : ALIGN(4)
+  {
+    _iram0_text_start = ABSOLUTE(.);
+    *(.iram0.text)
+    *(.iram.text)
+    . = ALIGN (4);
+    _iram0_text_end = ABSOLUTE(.);
+  } >iram0_text :iram0_text_phdr
+
+  .text : ALIGN(4)
+  {
+    _stext = .;
+    _text_start = ABSOLUTE(.);
+    KEEP (*(.ResetVector.text))
+    *(.ResetVector.literal)
+    *(.entry.text)
+    *(.init.literal)
+    KEEP(*(.init))
+    *(.literal.sort.* SORT(.text.sort.*))
+    KEEP (*(.literal.keepsort.* SORT(.text.keepsort.*) .literal.keep.* .text.keep.* .literal.*personality* .text.*personality*))
+    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.fini.literal)
+    KEEP(*(.fini))
+    *(.gnu.version)
+    . = ALIGN (4);
+    _text_end = ABSOLUTE(.);
+    _etext = .;
+  } >iram_text_start :iram_text_start_phdr
+
+  _memmap_mem_iram_max = ABSOLUTE(.);
+
+  .rodata : ALIGN(4)
+  {
+    __rodata_region_start = ABSOLUTE(.);
+    *(.rodata)
+    *(SORT(.rodata.sort.*))
+    KEEP (*(SORT(.rodata.keepsort.*) .rodata.keep.*))
+    *(.rodata.*)
+    *(.gnu.linkonce.r.*)
+    *(.rodata1)
+    __XT_EXCEPTION_TABLE__ = ABSOLUTE(.);
+    KEEP (*(.xt_except_table))
+    KEEP (*(.gcc_except_table))
+    *(.gnu.linkonce.e.*)
+    *(.gnu.version_r)
+    PROVIDE (__eh_frame_start = .);
+    KEEP (*(.eh_frame))
+    PROVIDE (__eh_frame_end = .);
+    /*  C++ constructor and destructor tables, properly ordered:  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+    /*  C++ exception handlers table:  */
+    __XT_EXCEPTION_DESCS__ = ABSOLUTE(.);
+    *(.xt_except_desc)
+    *(.gnu.linkonce.h.*)
+    __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.);
+    *(.xt_except_desc_end)
+    *(.dynamic)
+    *(.gnu.version_d)
+    . = ALIGN(4);		/* this table MUST be 4-byte aligned */
+    _bss_table_start = ABSOLUTE(.);
+    LONG(_bss_start)
+    LONG(_bss_end)
+    _bss_table_end = ABSOLUTE(.);
+    . = ALIGN (4);
+    __rodata_region_end = ABSOLUTE(.);
+  } >dram :dram_phdr
+
+  .module_init : ALIGN(4)
+  {
+   _module_init_start = ABSOLUTE(.);
+    *(*.initcall)
+    _module_init_end = ABSOLUTE(.);
+  } >dram :dram_phdr
+
+  .noinit : ALIGN(4)
+  {
+    *(.noinit)
+    *(.noinit.*)
+  } >dram :dram_phdr
+
+  .data : ALIGN(4)
+  {
+    _data_start = ABSOLUTE(.);
+    *(.data)
+    *(SORT(.data.sort.*))
+    KEEP (*(SORT(.data.keepsort.*) .data.keep.*))
+    *(.data.*)
+    *(.gnu.linkonce.d.*)
+    KEEP(*(.gnu.linkonce.d.*personality*))
+    *(.data1)
+    *(.sdata)
+    *(.sdata.*)
+    *(.gnu.linkonce.s.*)
+    *(.sdata2)
+    *(.sdata2.*)
+    *(.gnu.linkonce.s2.*)
+    KEEP(*(.jcr))
+    *(__llvm_prf_cnts)
+    *(__llvm_prf_data)
+    *(__llvm_prf_vnds)
+    . = ALIGN (4);
+    _data_end = ABSOLUTE(.);
+  } >dram :dram_phdr
+
+  __llvm_prf_names : ALIGN(4)
+  {
+    __llvm_prf_names_start = ABSOLUTE(.);
+    *(__llvm_prf_names)
+    . = ALIGN (4);
+    __llvm_prf_names_end = ABSOLUTE(.);
+  } >dram :dram_phdr
+
+  .note.gnu.build-id : ALIGN(4)
+  {
+    _note_gnu_build-id_start = ABSOLUTE(.);
+    *(.note.gnu.build-id)
+    . = ALIGN (4);
+    _note_gnu_build-id_end = ABSOLUTE(.);
+  } >dram :dram_phdr
+
+  .bss (NOLOAD) : ALIGN(8)
+  {
+    . = ALIGN (8);
+    _bss_start = ABSOLUTE(.);
+    *(.dynsbss)
+    *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
+    *(.scommon)
+    *(.sbss2)
+    *(.sbss2.*)
+    *(.gnu.linkonce.sb2.*)
+    *(.dynbss)
+    *(.bss)
+    *(SORT(.bss.sort.*))
+    KEEP (*(SORT(.bss.keepsort.*) .bss.keep.*))
+    *(.bss.*)
+    *(.gnu.linkonce.b.*)
+    *(COMMON)
+    *(.clib.bss)
+    *(.clib.percpu.bss)
+    *(.rtos.percpu.bss)
+    *(.rtos.bss)
+    . = ALIGN (8);
+    _bss_end = ABSOLUTE(.);
+    _end = ALIGN(0x8);
+    PROVIDE(end = ALIGN(0x8));
+    _stack_sentry = ALIGN(0x8);
+    _memmap_seg_dsp_core_end = ALIGN(0x8);
+  } >dram :dram_phdr
+
+  .heap_mem (NOLOAD) : ALIGN(8)
+  {
+    . = ALIGN (8);
+    _heap_mem_start = ABSOLUTE(.);
+    *(*.heap_mem)
+    _heap_mem_end = ABSOLUTE(.);
+  } >dram :dram_phdr
+
+  /* stack */
+  _end = ALIGN (8);
+
+  _heap_sentry = DRAM_BASE + DRAM_SIZE - 0x1000;
+  __stack = DRAM_BASE + DRAM_SIZE - 0x1000;
+  .comment  0 :  { *(.comment) }
+  .debug  0 :  { *(.debug) }
+  .line  0 :  { *(.line) }
+  .debug_srcinfo  0 :  { *(.debug_srcinfo) }
+  .debug_sfnames  0 :  { *(.debug_sfnames) }
+  .debug_aranges  0 :  { *(.debug_aranges) }
+  .debug_ranges   0 :  { *(.debug_ranges) }
+  .debug_pubnames  0 :  { *(.debug_pubnames) }
+  .debug_info  0 :  { *(.debug_info) }
+  .debug_abbrev  0 :  { *(.debug_abbrev) }
+  .debug_line  0 :  { *(.debug_line) }
+  .debug_frame  0 :  { *(.debug_frame) }
+  .debug_str  0 :  { *(.debug_str) }
+  .debug_loc  0 :  { *(.debug_loc) }
+  .debug_macinfo  0 :  { *(.debug_macinfo) }
+  .debug_weaknames  0 :  { *(.debug_weaknames) }
+  .debug_funcnames  0 :  { *(.debug_funcnames) }
+  .debug_typenames  0 :  { *(.debug_typenames) }
+  .debug_varnames  0 :  { *(.debug_varnames) }
+  .xt.insn 0 :
+  {
+    KEEP (*(.xt.insn))
+    KEEP (*(.gnu.linkonce.x.*))
+  }
+  .xt.prop 0 :
+  {
+    *(.xt.prop)
+    *(.xt.prop.*)
+    *(.gnu.linkonce.prop.*)
+  }
+  .xt.lit 0 :
+  {
+    *(.xt.lit)
+    *(.xt.lit.*)
+    *(.gnu.linkonce.p.*)
+  }
+  .xtensa.info 0 :
+  {
+    *(.xtensa.info)
+  }
+  .debug.xt.callgraph 0 :
+  {
+    KEEP (*(.debug.xt.callgraph .debug.xt.callgraph.* .gnu.linkonce.xt.callgraph.*))
+  }
+  .comment 0 :
+  {
+    KEEP(*(.comment))
+  }
+  .note.GNU-stack 0 :
+  {
+    *(.note.GNU-stack)
+  }
+#include <zephyr/linker/common-rom.ld>
+/* Located in generated directory. This file is populated by calling
+ * zephyr_linker_sources(ROM_SECTIONS ...). Useful for grouping iterable RO structs.
+ */
+#include <snippets-rom-sections.ld>
+#include <zephyr/linker/common-ram.ld>
+
+#ifdef CONFIG_GEN_ISR_TABLES
+#include <zephyr/linker/intlist.ld>
+#endif
+
+}
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi4/CMakeLists.txt b/soc/nxp/imxrt/imxrt7xx/hifi4/CMakeLists.txt
new file mode 100644
index 0000000000000..1c10b21b9eac5
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi4/CMakeLists.txt
@@ -0,0 +1,9 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi4/include/dsp/cache.h b/soc/nxp/imxrt/imxrt7xx/hifi4/include/dsp/cache.h
new file mode 100644
index 0000000000000..d67fca16f87d0
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi4/include/dsp/cache.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __COMMON_DSP_CACHE_H__
+#define __COMMON_DSP_CACHE_H__
+
+#include <xtensa/hal.h>
+
+#endif
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi4/include/dsp/io.h b/soc/nxp/imxrt/imxrt7xx/hifi4/include/dsp/io.h
new file mode 100644
index 0000000000000..7bdd1c5ad2781
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi4/include/dsp/io.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __INCLUDE_IO__
+#define __INCLUDE_IO__
+
+#include <stdint.h>
+#include <soc/memory.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/arch/common/sys_io.h>
+
+static inline uint32_t io_reg_read(uint32_t reg)
+{
+	return sys_read32(reg);
+}
+
+static inline void io_reg_write(uint32_t reg, uint32_t val)
+{
+	sys_write32(val, reg);
+}
+
+static inline void io_reg_update_bits(uint32_t reg, uint32_t mask, uint32_t value)
+{
+	io_reg_write(reg, (io_reg_read(reg) & (~mask)) | (value & mask));
+}
+
+static inline uint16_t io_reg_read16(uint32_t reg)
+{
+	return sys_read16(reg);
+}
+
+static inline void io_reg_write16(uint32_t reg, uint16_t val)
+{
+	sys_write16(val, reg);
+}
+
+#endif
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi4/include/soc.h b/soc/nxp/imxrt/imxrt7xx/hifi4/include/soc.h
new file mode 100644
index 0000000000000..f4b7380d84ed0
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi4/include/soc.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <string.h>
+#include <errno.h>
+
+#include <zephyr/sys/sys_io.h>
+#include <dsp/cache.h>
+
+#ifndef __INC_IMXRT_SOC_H
+#define __INC_IMXRT_SOC_H
+
+/* Macros related to interrupt handling */
+#define XTENSA_IRQ_NUM_SHIFT 0
+#define XTENSA_IRQ_NUM_MASK  0xff
+
+/*
+ * IRQs are mapped on levels. 2nd, 3rd and 4th level are left as 0x00.
+ *
+ * 1. Peripheral Register bit offset.
+ */
+#define XTENSA_IRQ_NUMBER(_irq) ((_irq >> XTENSA_IRQ_NUM_SHIFT) & XTENSA_IRQ_NUM_MASK)
+
+extern void z_soc_irq_enable(uint32_t irq);
+extern void z_soc_irq_disable(uint32_t irq);
+extern int z_soc_irq_is_enabled(unsigned int irq);
+
+#endif /* __INC_IMXRT_SOC_H */
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi4/include/soc/memory.h b/soc/nxp/imxrt/imxrt7xx/hifi4/include/soc/memory.h
new file mode 100644
index 0000000000000..b74e695c66d05
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi4/include/soc/memory.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __XTENSA_MEMORY_H__
+#define __XTENSA_MEMORY_H__
+
+#include <zephyr/autoconf.h>
+
+#define IRAM_RESERVE_HEADER_SPACE 0x400
+
+#define IRAM_BASE 0x24020000
+#define IRAM_SIZE 0x10000
+
+#define DRAM_BASE 0x24000000
+#define DRAM_SIZE 0x10000
+
+#define SDRAM0_BASE 0x20200000
+#define SDRAM0_SIZE 0xFFFFF
+
+/* The reset vector address in IRAM and its size. */
+#define XCHAL_RESET_VECTOR0_PADDR_IRAM IRAM_BASE
+#define MEM_RESET_TEXT_SIZE            (0x2E0)
+#define MEM_RESET_LIT_SIZE             (0x120)
+
+/* Base address of all interrupt vectors in IRAM. */
+#define XCHAL_VECBASE_RESET_PADDR_IRAM (IRAM_BASE + IRAM_RESERVE_HEADER_SPACE)
+#define MEM_VECBASE_LIT_SIZE           (0x178)
+/* Vector and literal sizes. */
+#define MEM_VECT_LIT_SIZE  (0x4)
+#define MEM_VECT_TEXT_SIZE (0x1C)
+
+/* Addresses of the interrupt vectors. */
+#define XCHAL_INT_VECTOR_ADDR(x)          (XCHAL_VECBASE_RESET_PADDR_IRAM + (x))
+#define XCHAL_INTLEVEL2_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x17C))
+#define XCHAL_INTLEVEL3_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x19C))
+#define XCHAL_INTLEVEL4_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x1BC))
+#define XCHAL_INTLEVEL5_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x1DC))
+#define XCHAL_KERNEL_VECTOR_PADDR_IRAM    (XCHAL_INT_VECTOR_ADDR(0x1FC))
+#define XCHAL_USER_VECTOR_PADDR_IRAM      (XCHAL_INT_VECTOR_ADDR(0x21C))
+#define XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM (XCHAL_INT_VECTOR_ADDR(0x23C))
+
+/* Location for the intList section which is later used to construct the
+ * Interrupt Descriptor Table (IDT). This is a bogus address as this
+ * section will be stripped off in the final image.
+ */
+#define IDT_BASE (IRAM_BASE + IRAM_SIZE)
+
+/* Size of the Interrupt Descriptor Table (IDT). */
+#define IDT_SIZE (0x2000)
+
+#endif
diff --git a/soc/nxp/imxrt/imxrt7xx/hifi4/linker.ld b/soc/nxp/imxrt/imxrt7xx/hifi4/linker.ld
new file mode 100644
index 0000000000000..5ec321fcdcf58
--- /dev/null
+++ b/soc/nxp/imxrt/imxrt7xx/hifi4/linker.ld
@@ -0,0 +1,492 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+OUTPUT_ARCH(xtensa)
+
+#include <soc/memory.h>
+#include <xtensa/config/core-isa.h>
+
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/linker/linker-tool.h>
+#include <zephyr/linker/sections.h>
+
+#define RAMABLE_REGION sdram0 :sdram0_phdr
+#define ROMABLE_REGION sdram0 :sdram0_phdr
+
+MEMORY
+{
+  vector_reset_text :
+    org = XCHAL_RESET_VECTOR0_PADDR_IRAM,
+    len = MEM_RESET_TEXT_SIZE
+  vector_reset_lit :
+    org = XCHAL_RESET_VECTOR0_PADDR_IRAM + MEM_RESET_TEXT_SIZE,
+    len = MEM_RESET_LIT_SIZE
+  vector_base_text :
+    org = XCHAL_VECBASE_RESET_PADDR_IRAM,
+    len = MEM_VECBASE_LIT_SIZE
+  vector_int2_lit :
+    org = XCHAL_INTLEVEL2_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int2_text :
+    org = XCHAL_INTLEVEL2_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_int3_lit :
+    org = XCHAL_INTLEVEL3_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int3_text :
+    org = XCHAL_INTLEVEL3_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_int4_lit :
+    org = XCHAL_INTLEVEL4_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int4_text :
+    org = XCHAL_INTLEVEL4_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_int5_lit :
+    org = XCHAL_INTLEVEL5_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_int5_text :
+    org = XCHAL_INTLEVEL5_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_kernel_lit :
+    org = XCHAL_KERNEL_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_kernel_text :
+    org = XCHAL_KERNEL_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_user_lit :
+    org = XCHAL_USER_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_user_text :
+    org = XCHAL_USER_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  vector_double_lit :
+    org = XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM - MEM_VECT_LIT_SIZE,
+    len = MEM_VECT_LIT_SIZE
+  vector_double_text :
+    org = XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM,
+    len = MEM_VECT_TEXT_SIZE
+  iram_text_start :
+    org = XCHAL_DOUBLEEXC_VECTOR_PADDR_IRAM + MEM_VECT_TEXT_SIZE,
+    len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + MEM_VECT_TEXT_SIZE)
+  sdram0 :
+    org = SDRAM0_BASE,
+    len = SDRAM0_SIZE
+#ifdef CONFIG_GEN_ISR_TABLES
+  IDT_LIST :
+    org = IDT_BASE,
+    len = IDT_SIZE
+#endif
+}
+
+PHDRS
+{
+  vector_reset_text_phdr PT_LOAD;
+  vector_reset_lit_phdr PT_LOAD;
+  vector_base_text_phdr PT_LOAD;
+  vector_base_lit_phdr PT_LOAD;
+  vector_int2_text_phdr PT_LOAD;
+  vector_int2_lit_phdr PT_LOAD;
+  vector_int3_text_phdr PT_LOAD;
+  vector_int3_lit_phdr PT_LOAD;
+  vector_int4_text_phdr PT_LOAD;
+  vector_int4_lit_phdr PT_LOAD;
+  vector_int5_text_phdr PT_LOAD;
+  vector_int5_lit_phdr PT_LOAD;
+  vector_kernel_text_phdr PT_LOAD;
+  vector_kernel_lit_phdr PT_LOAD;
+  vector_user_text_phdr PT_LOAD;
+  vector_user_lit_phdr PT_LOAD;
+  vector_double_text_phdr PT_LOAD;
+  vector_double_lit_phdr PT_LOAD;
+  iram_text_start_phdr PT_LOAD;
+  sdram0_phdr PT_LOAD;
+}
+
+/*  Default entry point:  */
+ENTRY(CONFIG_KERNEL_ENTRY)
+
+_rom_store_table = 0;
+
+PROVIDE(_memmap_reset_vector = XCHAL_RESET_VECTOR0_PADDR_IRAM);
+PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR_IRAM);
+
+/* Various memory-map dependent cache attribute settings: */
+_memmap_cacheattr_wb_base = 0x00000040;
+_memmap_cacheattr_wt_base = 0x00000010;
+_memmap_cacheattr_bp_base = 0x00000020;
+_memmap_cacheattr_unused_mask = 0xFFFFFF0F;
+_memmap_cacheattr_wb_trapnull = 0x22222244;
+_memmap_cacheattr_wba_trapnull = 0x2222224F;
+_memmap_cacheattr_wbna_trapnull = 0x2222225F;
+_memmap_cacheattr_wt_trapnull = 0x2222221F;
+_memmap_cacheattr_bp_trapnull = 0x2222222F;
+_memmap_cacheattr_wb_strict = 0xFFFFFF4F;
+_memmap_cacheattr_wt_strict = 0xFFFFFF1F;
+_memmap_cacheattr_bp_strict = 0xFFFFFF2F;
+_memmap_cacheattr_wb_allvalid = 0x22222242;
+_memmap_cacheattr_wt_allvalid = 0x22222212;
+_memmap_cacheattr_bp_allvalid = 0x22222222;
+_memmap_region_map = 0x00000002;
+PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wb_trapnull);
+
+SECTIONS
+{
+
+#include <zephyr/linker/rel-sections.ld>
+
+  .ResetVector.text : ALIGN(4)
+  {
+    _ResetVector_text_start = ABSOLUTE(.);
+    KEEP (*(.ResetVector.text))
+    _ResetVector_text_end = ABSOLUTE(.);
+  } >vector_reset_text :vector_reset_text_phdr
+
+  .ResetVector.literal : ALIGN(4)
+  {
+    _ResetVector_literal_start = ABSOLUTE(.);
+    *(.ResetVector.literal)
+    _ResetVector_literal_end = ABSOLUTE(.);
+  } >vector_reset_lit :vector_reset_lit_phdr
+
+  .WindowVectors.text : ALIGN(4)
+  {
+    _WindowVectors_text_start = ABSOLUTE(.);
+    KEEP (*(.WindowVectors.text))
+    _WindowVectors_text_end = ABSOLUTE(.);
+  } >vector_base_text :vector_base_text_phdr
+
+  .Level2InterruptVector.literal : ALIGN(4)
+  {
+    _Level2InterruptVector_literal_start = ABSOLUTE(.);
+    *(.Level2InterruptVector.literal)
+    _Level2InterruptVector_literal_end = ABSOLUTE(.);
+  } >vector_int2_lit :vector_int2_lit_phdr
+
+  .Level2InterruptVector.text : ALIGN(4)
+  {
+    _Level2InterruptVector_text_start = ABSOLUTE(.);
+    KEEP (*(.Level2InterruptVector.text))
+    _Level2InterruptVector_text_end = ABSOLUTE(.);
+  } >vector_int2_text :vector_int2_text_phdr
+
+  .Level3InterruptVector.literal : ALIGN(4)
+  {
+    _Level3InterruptVector_literal_start = ABSOLUTE(.);
+    *(.Level3InterruptVector.literal)
+    _Level3InterruptVector_literal_end = ABSOLUTE(.);
+  } >vector_int3_lit :vector_int3_lit_phdr
+
+  .Level3InterruptVector.text : ALIGN(4)
+  {
+    _Level3InterruptVector_text_start = ABSOLUTE(.);
+    KEEP (*(.Level3InterruptVector.text))
+    _Level3InterruptVector_text_end = ABSOLUTE(.);
+  } >vector_int3_text :vector_int3_text_phdr
+
+  .DebugExceptionVector.literal : ALIGN(4)
+  {
+    _DebugExceptionVector_literal_start = ABSOLUTE(.);
+    *(.DebugExceptionVector.literal)
+    _DebugExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_int4_lit :vector_int4_lit_phdr
+
+  .DebugExceptionVector.text : ALIGN(4)
+  {
+    _DebugExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.DebugExceptionVector.text))
+    _DebugExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_int4_text :vector_int4_text_phdr
+
+  .NMIExceptionVector.literal : ALIGN(4)
+  {
+    _NMIExceptionVector_literal_start = ABSOLUTE(.);
+    *(.NMIExceptionVector.literal)
+    _NMIExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_int5_lit :vector_int5_lit_phdr
+
+  .NMIExceptionVector.text : ALIGN(4)
+  {
+    _NMIExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.NMIExceptionVector.text))
+    _NMIExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_int5_text :vector_int5_text_phdr
+
+  .KernelExceptionVector.literal : ALIGN(4)
+  {
+    _KernelExceptionVector_literal_start = ABSOLUTE(.);
+    *(.KernelExceptionVector.literal)
+    _KernelExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_kernel_lit :vector_kernel_lit_phdr
+
+  .KernelExceptionVector.text : ALIGN(4)
+  {
+    _KernelExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.KernelExceptionVector.text))
+    _KernelExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_kernel_text :vector_kernel_text_phdr
+
+  .UserExceptionVector.literal : ALIGN(4)
+  {
+    _UserExceptionVector_literal_start = ABSOLUTE(.);
+    *(.UserExceptionVector.literal)
+    _UserExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_user_lit :vector_user_lit_phdr
+
+  .UserExceptionVector.text : ALIGN(4)
+  {
+    _UserExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.UserExceptionVector.text))
+    _UserExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_user_text :vector_user_text_phdr
+
+  .DoubleExceptionVector.literal : ALIGN(4)
+  {
+    _DoubleExceptionVector_literal_start = ABSOLUTE(.);
+    *(.DoubleExceptionVector.literal)
+    _DoubleExceptionVector_literal_end = ABSOLUTE(.);
+  } >vector_double_lit :vector_double_lit_phdr
+
+  .DoubleExceptionVector.text : ALIGN(4)
+  {
+    _DoubleExceptionVector_text_start = ABSOLUTE(.);
+    KEEP (*(.DoubleExceptionVector.text))
+    _DoubleExceptionVector_text_end = ABSOLUTE(.);
+  } >vector_double_text :vector_double_text_phdr
+
+  .iram.text : ALIGN(4)
+   {
+    _iram_text_start = ABSOLUTE(.);
+    *(.iram0.literal .iram.literal .iram.text.literal .iram0.text .iram.text)
+    _iram_text_end = ABSOLUTE(.);
+   } >iram_text_start :iram_text_start_phdr
+
+  .text : ALIGN(4)
+  {
+    _stext = .;
+    _text_start = ABSOLUTE(.);
+    KEEP (*(.ResetVector.text))
+    *(.ResetVector.literal)
+    *(.entry.text)
+    *(.init.literal)
+    KEEP(*(.init))
+    *(.literal.sort.* SORT(.text.sort.*))
+    KEEP (*(.literal.keepsort.* SORT(.text.keepsort.*) .literal.keep.* .text.keep.* .literal.*personality* .text.*personality*))
+    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.fini.literal)
+    KEEP(*(.fini))
+    *(.gnu.version)
+    . = ALIGN (4);
+    _text_end = ABSOLUTE(.);
+    _etext = .;
+  } >iram_text_start :iram_text_start_phdr
+
+  _memmap_mem_iram0_max = ABSOLUTE(.);
+
+  .rodata : ALIGN(4)
+  {
+    __rodata_region_start = ABSOLUTE(.);
+    *(.rodata)
+    *(SORT(.rodata.sort.*))
+    KEEP (*(SORT(.rodata.keepsort.*) .rodata.keep.*))
+    *(.rodata.*)
+    *(.gnu.linkonce.r.*)
+    *(.rodata1)
+    __XT_EXCEPTION_TABLE__ = ABSOLUTE(.);
+    KEEP (*(.xt_except_table))
+    KEEP (*(.gcc_except_table))
+    *(.gnu.linkonce.e.*)
+    *(.gnu.version_r)
+    PROVIDE (__eh_frame_start = .);
+    KEEP (*(.eh_frame))
+    PROVIDE (__eh_frame_end = .);
+    /*  C++ constructor and destructor tables, properly ordered:  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+    /*  C++ exception handlers table:  */
+    __XT_EXCEPTION_DESCS__ = ABSOLUTE(.);
+    *(.xt_except_desc)
+    *(.gnu.linkonce.h.*)
+    __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.);
+    *(.xt_except_desc_end)
+    *(.dynamic)
+    *(.gnu.version_d)
+    . = ALIGN(4);		/* this table MUST be 4-byte aligned */
+    _bss_table_start = ABSOLUTE(.);
+    LONG(_bss_start)
+    LONG(_bss_end)
+    _bss_table_end = ABSOLUTE(.);
+    . = ALIGN (4);
+    __rodata_region_end = ABSOLUTE(.);
+  } >sdram0 :sdram0_phdr
+
+  .module_init : ALIGN(4)
+  {
+   _module_init_start = ABSOLUTE(.);
+    *(*.initcall)
+    _module_init_end = ABSOLUTE(.);
+  } >sdram0 :sdram0_phdr
+
+  .noinit : ALIGN(4)
+  {
+    *(.noinit)
+    *(.noinit.*)
+  } >sdram0 :sdram0_phdr
+
+  .data : ALIGN(4)
+  {
+    _data_start = ABSOLUTE(.);
+    *(.data)
+    *(SORT(.data.sort.*))
+    KEEP (*(SORT(.data.keepsort.*) .data.keep.*))
+    *(.data.*)
+    *(.gnu.linkonce.d.*)
+    KEEP(*(.gnu.linkonce.d.*personality*))
+    *(.data1)
+    *(.sdata)
+    *(.sdata.*)
+    *(.gnu.linkonce.s.*)
+    *(.sdata2)
+    *(.sdata2.*)
+    *(.gnu.linkonce.s2.*)
+    KEEP(*(.jcr))
+    *(__llvm_prf_cnts)
+    *(__llvm_prf_data)
+    *(__llvm_prf_vnds)
+    . = ALIGN (4);
+    _data_end = ABSOLUTE(.);
+  } >sdram0 :sdram0_phdr
+
+  __llvm_prf_names : ALIGN(4)
+  {
+    __llvm_prf_names_start = ABSOLUTE(.);
+    *(__llvm_prf_names)
+    . = ALIGN (4);
+    __llvm_prf_names_end = ABSOLUTE(.);
+  } >sdram0 :sdram0_phdr
+
+  .note.gnu.build-id : ALIGN(4)
+  {
+    _note_gnu_build-id_start = ABSOLUTE(.);
+    *(.note.gnu.build-id)
+    . = ALIGN (4);
+    _note_gnu_build-id_end = ABSOLUTE(.);
+  } >sdram0 :sdram0_phdr
+
+  .bss (NOLOAD) : ALIGN(8)
+  {
+    . = ALIGN (8);
+    _bss_start = ABSOLUTE(.);
+    *(.dynsbss)
+    *(.sbss)
+    *(.sbss.*)
+    *(.gnu.linkonce.sb.*)
+    *(.scommon)
+    *(.sbss2)
+    *(.sbss2.*)
+    *(.gnu.linkonce.sb2.*)
+    *(.dynbss)
+    *(.bss)
+    *(SORT(.bss.sort.*))
+    KEEP (*(SORT(.bss.keepsort.*) .bss.keep.*))
+    *(.bss.*)
+    *(.gnu.linkonce.b.*)
+    *(COMMON)
+    *(.clib.bss)
+    *(.clib.percpu.bss)
+    *(.rtos.percpu.bss)
+    *(.rtos.bss)
+    . = ALIGN (8);
+    _bss_end = ABSOLUTE(.);
+    _end = ALIGN(0x8);
+    PROVIDE(end = ALIGN(0x8));
+    _stack_sentry = ALIGN(0x8);
+    _memmap_seg_dsp_core_end = ALIGN(0x8);
+  } >sdram0 :sdram0_phdr
+
+  .heap_mem (NOLOAD) : ALIGN(8)
+  {
+    . = ALIGN (8);
+    _heap_mem_start = ABSOLUTE(.);
+    *(*.heap_mem)
+    _heap_mem_end = ABSOLUTE(.);
+  } >sdram0 :sdram0_phdr
+
+  /* stack */
+  _end = ALIGN (8);
+
+  _heap_sentry = SDRAM0_BASE + SDRAM0_SIZE - 0x1000;
+  __stack = SDRAM0_BASE + SDRAM0_SIZE - 0x1000;
+  .comment  0 :  { *(.comment) }
+  .debug  0 :  { *(.debug) }
+  .line  0 :  { *(.line) }
+  .debug_srcinfo  0 :  { *(.debug_srcinfo) }
+  .debug_sfnames  0 :  { *(.debug_sfnames) }
+  .debug_aranges  0 :  { *(.debug_aranges) }
+  .debug_ranges   0 :  { *(.debug_ranges) }
+  .debug_pubnames  0 :  { *(.debug_pubnames) }
+  .debug_info  0 :  { *(.debug_info) }
+  .debug_abbrev  0 :  { *(.debug_abbrev) }
+  .debug_line  0 :  { *(.debug_line) }
+  .debug_frame  0 :  { *(.debug_frame) }
+  .debug_str  0 :  { *(.debug_str) }
+  .debug_loc  0 :  { *(.debug_loc) }
+  .debug_macinfo  0 :  { *(.debug_macinfo) }
+  .debug_weaknames  0 :  { *(.debug_weaknames) }
+  .debug_funcnames  0 :  { *(.debug_funcnames) }
+  .debug_typenames  0 :  { *(.debug_typenames) }
+  .debug_varnames  0 :  { *(.debug_varnames) }
+  .xt.insn 0 :
+  {
+    KEEP (*(.xt.insn))
+    KEEP (*(.gnu.linkonce.x.*))
+  }
+  .xt.prop 0 :
+  {
+    *(.xt.prop)
+    *(.xt.prop.*)
+    *(.gnu.linkonce.prop.*)
+  }
+  .xt.lit 0 :
+  {
+    *(.xt.lit)
+    *(.xt.lit.*)
+    *(.gnu.linkonce.p.*)
+  }
+  .xtensa.info 0 :
+  {
+    *(.xtensa.info)
+  }
+  .debug.xt.callgraph 0 :
+  {
+    KEEP (*(.debug.xt.callgraph .debug.xt.callgraph.* .gnu.linkonce.xt.callgraph.*))
+  }
+  .comment 0 :
+  {
+    KEEP(*(.comment))
+  }
+  .note.GNU-stack 0 :
+  {
+    *(.note.GNU-stack)
+  }
+#include <zephyr/linker/common-rom.ld>
+/* Located in generated directory. This file is populated by calling
+ * zephyr_linker_sources(ROM_SECTIONS ...). Useful for grouping iterable RO structs.
+ */
+#include <snippets-rom-sections.ld>
+#include <zephyr/linker/common-ram.ld>
+
+#ifdef CONFIG_GEN_ISR_TABLES
+#include <zephyr/linker/intlist.ld>
+#endif
+
+}
diff --git a/soc/nxp/imxrt/soc.yml b/soc/nxp/imxrt/soc.yml
index 75ca12e72f76c..f01629f3f8fce 100644
--- a/soc/nxp/imxrt/soc.yml
+++ b/soc/nxp/imxrt/soc.yml
@@ -44,6 +44,8 @@ family:
       cpuclusters:
       - name: cm33_cpu0
       - name: cm33_cpu1
+      - name: hifi4
+      - name: hifi1
 runners:
   run_once:
     '--erase':
diff --git a/soc/nxp/kinetis/k6x/soc.c b/soc/nxp/kinetis/k6x/soc.c
index 7f95d7d8f1cfc..f46d02163cb54 100644
--- a/soc/nxp/kinetis/k6x/soc.c
+++ b/soc/nxp/kinetis/k6x/soc.c
@@ -105,10 +105,10 @@ __weak void clock_init(void)
 	CLOCK_SetLpuartClock(LPUART0SRC_OSCERCLK);
 #endif
 
-#if CONFIG_ETH_MCUX || CONFIG_ETH_NXP_ENET
+#if CONFIG_ETH_NXP_ENET
 	CLOCK_SetEnetTime0Clock(TIMESRC_OSCERCLK);
 #endif
-#if CONFIG_ETH_MCUX_RMII_EXT_CLK
+#if CONFIG_ETH_NXP_ENET_RMII_EXT_CLK
 	CLOCK_SetRmii0Clock(1);
 #endif
 #if CONFIG_USB_KINETIS || CONFIG_UDC_KINETIS
diff --git a/soc/nxp/lpc/lpc55xxx/soc.c b/soc/nxp/lpc/lpc55xxx/soc.c
index 47adb934616b0..2d353583336ca 100644
--- a/soc/nxp/lpc/lpc55xxx/soc.c
+++ b/soc/nxp/lpc/lpc55xxx/soc.c
@@ -245,7 +245,7 @@ __weak void clock_init(void)
 	/* enable usb0 host clock */
 	CLOCK_EnableClock(kCLOCK_Usbhsl0);
 	/*
-	 * According to reference mannual, device mode setting has to be set by access
+	 * According to reference manual, device mode setting has to be set by access
 	 * usb host register
 	 */
 	USBFSH->PORTMODE |= USBFSH_PORTMODE_DEV_ENABLE_MASK;
diff --git a/soc/nxp/mcx/mcxa/Kconfig b/soc/nxp/mcx/mcxa/Kconfig
index 6037d43b55d34..194bb57915c8b 100644
--- a/soc/nxp/mcx/mcxa/Kconfig
+++ b/soc/nxp/mcx/mcxa/Kconfig
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_MCXA
@@ -10,8 +10,26 @@ config SOC_SERIES_MCXA
 	select CPU_CORTEX_M_HAS_DWT
 	select SOC_RESET_HOOK
 
+config SOC_MCXA153
+	select CPU_CORTEX_M33
+	select HAS_MCUX_CACHE
+
 config SOC_MCXA156
 	select CPU_CORTEX_M33
 	select CPU_HAS_FPU
 	select ARMV8_M_DSP
 	select HAS_MCUX_CACHE
+
+config SOC_MCXA166
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select CPU_HAS_FPU
+	select ARMV8_M_DSP
+	select HAS_MCUX_CACHE
+
+config SOC_MCXA276
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select CPU_HAS_FPU
+	select ARMV8_M_DSP
+	select HAS_MCUX_CACHE
diff --git a/soc/nxp/mcx/mcxa/Kconfig.defconfig b/soc/nxp/mcx/mcxa/Kconfig.defconfig
index 11195acc0d7b3..3ee3181cd81cf 100644
--- a/soc/nxp/mcx/mcxa/Kconfig.defconfig
+++ b/soc/nxp/mcx/mcxa/Kconfig.defconfig
@@ -3,6 +3,9 @@
 
 if SOC_SERIES_MCXA
 
+config CORTEX_M_SYSTICK
+	default n if MCUX_LPTMR_TIMER
+
 config NUM_IRQS
 	default 88
 
diff --git a/soc/nxp/mcx/mcxa/Kconfig.soc b/soc/nxp/mcx/mcxa/Kconfig.soc
index 7f59251affee3..2aba6a95a0503 100644
--- a/soc/nxp/mcx/mcxa/Kconfig.soc
+++ b/soc/nxp/mcx/mcxa/Kconfig.soc
@@ -1,4 +1,4 @@
-# Copyright 2024 NXP
+# Copyright 2024-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_MCXA
@@ -8,12 +8,39 @@ config SOC_SERIES_MCXA
 config SOC_SERIES
 	default "mcxa" if SOC_SERIES_MCXA
 
+config SOC_MCXA153
+	bool
+	select SOC_SERIES_MCXA
+
 config SOC_MCXA156
 	bool
 	select SOC_SERIES_MCXA
 
+config SOC_MCXA166
+	bool
+	select SOC_SERIES_MCXA
+
+config SOC_MCXA276
+	bool
+	select SOC_SERIES_MCXA
+
 config SOC
+	default "mcxa153" if SOC_MCXA153
 	default "mcxa156" if SOC_MCXA156
+	default "mcxa166" if SOC_MCXA166
+	default "mcxa276" if SOC_MCXA276
+
+config SOC_PART_NUMBER_MCXA153VFM
+	bool
+
+config SOC_PART_NUMBER_MCXA153VFT
+	bool
+
+config SOC_PART_NUMBER_MCXA153VLF
+	bool
+
+config SOC_PART_NUMBER_MCXA153VLH
+	bool
 
 config SOC_PART_NUMBER_MCXA156VPJ
 	bool
@@ -24,7 +51,43 @@ config SOC_PART_NUMBER_MCXA156VLL
 config SOC_PART_NUMBER_MCXA156VMP
 	bool
 
+config SOC_PART_NUMBER_MCXA166VLQ
+	bool
+
+config SOC_PART_NUMBER_MCXA166VLL
+	bool
+
+config SOC_PART_NUMBER_MCXA166VLH
+	bool
+
+config SOC_PART_NUMBER_MCXA166VPN
+	bool
+
+config SOC_PART_NUMBER_MCXA276VLQ
+	bool
+
+config SOC_PART_NUMBER_MCXA276VLL
+	bool
+
+config SOC_PART_NUMBER_MCXA276VLH
+	bool
+
+config SOC_PART_NUMBER_MCXA276VPN
+	bool
+
 config SOC_PART_NUMBER
+	default "MCXA153VFM" if SOC_PART_NUMBER_MCXA153VFM
+	default "MCXA153VFT" if SOC_PART_NUMBER_MCXA153VFT
+	default "MCXA153VLF" if SOC_PART_NUMBER_MCXA153VLF
+	default "MCXA153VLH" if SOC_PART_NUMBER_MCXA153VLH
 	default "MCXA156VPJ" if SOC_PART_NUMBER_MCXA156VPJ
 	default "MCXA156VLL" if SOC_PART_NUMBER_MCXA156VLL
 	default "MCXA156VMP" if SOC_PART_NUMBER_MCXA156VMP
+	default "MCXA166VLQ" if SOC_PART_NUMBER_MCXA166VLQ
+	default "MCXA166VLL" if SOC_PART_NUMBER_MCXA166VLL
+	default "MCXA166VLH" if SOC_PART_NUMBER_MCXA166VLH
+	default "MCXA166VPN" if SOC_PART_NUMBER_MCXA166VPN
+	default "MCXA276VLQ" if SOC_PART_NUMBER_MCXA276VLQ
+	default "MCXA276VLL" if SOC_PART_NUMBER_MCXA276VLL
+	default "MCXA276VLH" if SOC_PART_NUMBER_MCXA276VLH
+	default "MCXA276VPN" if SOC_PART_NUMBER_MCXA276VPN
diff --git a/soc/nxp/mcx/mcxc/Kconfig.defconfig b/soc/nxp/mcx/mcxc/Kconfig.defconfig
index 717158585bcda..c1b1f44eb6340 100644
--- a/soc/nxp/mcx/mcxc/Kconfig.defconfig
+++ b/soc/nxp/mcx/mcxc/Kconfig.defconfig
@@ -3,6 +3,9 @@
 
 if SOC_SERIES_MCXC
 
+config CORTEX_M_SYSTICK
+	default n if MCUX_LPTMR_TIMER
+
 config NUM_IRQS
 	default 32
 
diff --git a/soc/nxp/mcx/mcxc/Kconfig.soc b/soc/nxp/mcx/mcxc/Kconfig.soc
index 67948a6d9580e..7a60b59129628 100644
--- a/soc/nxp/mcx/mcxc/Kconfig.soc
+++ b/soc/nxp/mcx/mcxc/Kconfig.soc
@@ -52,9 +52,9 @@ config SOC_PART_NUMBER_MCXC444VMP
 	bool
 
 config SOC_PART_NUMBER
-	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC141VLH
+	default "MCXC141VLH" if SOC_PART_NUMBER_MCXC141VLH
 	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC141VFM
-	default "MCXC141VFM" if SOC_PART_NUMBER_MCXC142VFM
+	default "MCXC142VFM" if SOC_PART_NUMBER_MCXC142VFM
 	default "MCXC242VLH" if SOC_PART_NUMBER_MCXC242VLH
 	default "MCXC242VFM" if SOC_PART_NUMBER_MCXC242VFM
 	default "MCXC444VLH" if SOC_PART_NUMBER_MCXC444VLH
diff --git a/soc/nxp/mcx/mcxn/Kconfig.defconfig b/soc/nxp/mcx/mcxn/Kconfig.defconfig
index 1668cfad798a7..24ba2e4a2ec1f 100644
--- a/soc/nxp/mcx/mcxn/Kconfig.defconfig
+++ b/soc/nxp/mcx/mcxn/Kconfig.defconfig
@@ -3,6 +3,9 @@
 
 if SOC_SERIES_MCXN
 
+config CORTEX_M_SYSTICK
+	default n if MCUX_LPTMR_TIMER
+
 config MFD
 	default y if DT_HAS_NXP_LP_FLEXCOMM_ENABLED
 
@@ -12,9 +15,6 @@ config NUM_IRQS
 config ROM_START_OFFSET
 	default 0x400 if BOOTLOADER_MCUBOOT
 
-config ZTEST_NO_YIELD
-	default y if (PM && ZTEST)
-
 config MCUX_LPTMR_TIMER
 	default n if (DT_HAS_NXP_OS_TIMER_ENABLED || DT_HAS_ARM_ARMV8M_SYSTICK_ENABLED)
 
diff --git a/soc/nxp/mcx/mcxw/CMakeLists.txt b/soc/nxp/mcx/mcxw/CMakeLists.txt
index 5109d3175ab3f..aad110de351bf 100644
--- a/soc/nxp/mcx/mcxw/CMakeLists.txt
+++ b/soc/nxp/mcx/mcxw/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 NXP
+# Copyright 2023-2025 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -14,4 +14,6 @@ zephyr_include_directories(.)
 
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
 
-zephyr_linker_sources_ifdef(CONFIG_BT RAM_SECTIONS sections.ld)
+if (CONFIG_BT OR CONFIG_IEEE802154)
+  zephyr_linker_sources(RAM_SECTIONS sections.ld)
+endif()
diff --git a/soc/nxp/mcx/mcxw/Kconfig.defconfig b/soc/nxp/mcx/mcxw/Kconfig.defconfig
index 5f7ad6800e628..330d7b80d853d 100644
--- a/soc/nxp/mcx/mcxw/Kconfig.defconfig
+++ b/soc/nxp/mcx/mcxw/Kconfig.defconfig
@@ -1,8 +1,11 @@
-# Copyright 2023-2024 NXP
+# Copyright 2023-2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_MCXW
 
+config CORTEX_M_SYSTICK
+	default n if MCUX_LPTMR_TIMER
+
 config NUM_IRQS
 	default 77 if SOC_MCXW727C
 	default 75
@@ -45,4 +48,14 @@ config HCI_NXP_RX_THREAD
 	default y
 
 endif # BT
+
+if NET_L2_IEEE802154 || NET_L2_OPENTHREAD
+
+# Include intercore messaging component
+config NXP_RF_IMU
+	default y
+
+endif # NET_L2_IEEE802154 || NET_L2_OPENTHREAD
+
+
 endif # SOC_SERIES_MCXW
diff --git a/soc/nxp/mcx/soc.yml b/soc/nxp/mcx/soc.yml
index fef7853a0298a..d5591b0b66801 100644
--- a/soc/nxp/mcx/soc.yml
+++ b/soc/nxp/mcx/soc.yml
@@ -16,7 +16,10 @@ family:
     - name: mcxc444
   - name: mcxa
     socs:
+    - name: mcxa153
     - name: mcxa156
+    - name: mcxa166
+    - name: mcxa276
   - name: mcxw
     socs:
     - name: mcxw716c
@@ -44,8 +47,14 @@ runners:
         - mcxc242
       - qualifiers:
         - mcxc444
+      - qualifiers:
+        - mcxa153
       - qualifiers:
         - mcxa156
+      - qualifiers:
+        - mcxa166
+      - qualifiers:
+        - mcxa276
       - qualifiers:
         - mcxw716c
     '--reset':
@@ -66,7 +75,13 @@ runners:
         - mcxc242
       - qualifiers:
         - mcxc444
+      - qualifiers:
+        - mcxa153
       - qualifiers:
         - mcxa156
+      - qualifiers:
+        - mcxa166
+      - qualifiers:
+        - mcxa276
       - qualifiers:
         - mcxw716c
diff --git a/soc/nxp/rw/Kconfig b/soc/nxp/rw/Kconfig
index 13b6b4e5dc907..a32483ad0c120 100644
--- a/soc/nxp/rw/Kconfig
+++ b/soc/nxp/rw/Kconfig
@@ -55,4 +55,9 @@ endif # NXP_RW6XX_BOOT_HEADER
 rsource "../common/Kconfig.flexspi_xip"
 rsource "../common/Kconfig.nbu"
 
+config XTAL32K
+	bool "Use the External 32K clock"
+	help
+	  This clock is used by certain peripherals such as RTC.
+
 endif # SOC_SERIES_RW6XX
diff --git a/soc/nxp/rw/Kconfig.defconfig b/soc/nxp/rw/Kconfig.defconfig
index d627e9906475a..d2da02597fd0b 100644
--- a/soc/nxp/rw/Kconfig.defconfig
+++ b/soc/nxp/rw/Kconfig.defconfig
@@ -29,6 +29,7 @@ config MAIN_STACK_SIZE
 	default 2560
 
 config BT_LONG_WQ_STACK_SIZE
+	default 5120 if (WIFI || IEEE802154)
 	default 2560
 
 config SYSTEM_WORKQUEUE_STACK_SIZE
@@ -56,4 +57,46 @@ if WIFI
 orsource "Kconfig.defconfig.wifi"
 endif # WIFI
 
+if PM
+# For PM mode 3 we change this config to get better accuracy
+# when using the iKHz RTC clock as system clock.
+config SYS_CLOCK_TICKS_PER_SEC
+	default 1000
+	depends on $(dt_nodelabel_enabled,standby)
+
+# Enable PM_DEVICE by default if STANDBY mode is enabled
+# as we use the TURN_OFF and TURN_ON actions to recover
+# from Standby mode (PM Mode 3)
+config PM_DEVICE
+	default y
+	depends on "$(dt_nodelabel_enabled,standby)"
+
+# Enable PM_POLICY_DEVICE_CONSTRAINTS by default when doing PM_DEVICE.
+# This will allow support of device power states.
+config PM_POLICY_DEVICE_CONSTRAINTS
+	default y if PM_DEVICE
+
+# Enable the counter if STANDBY mode is enabled
+# RTC counter is the wakeup source from STANDBY mode
+config COUNTER
+	default y
+	depends on "$(dt_nodelabel_enabled,standby)"
+
+config MCUX_OS_TIMER_PM_POWERED_OFF
+	default y
+
+# PM code that runs from the idle loop has a large
+# footprint. Hence increase the size when PM is enabled.
+config IDLE_STACK_SIZE
+	default 640
+
+endif # PM
+
+if PM_DEVICE
+
+config POWER_DOMAIN
+	default y
+
+endif # PM_DEVICE
+
 endif # SOC_SERIES_RW6XX
diff --git a/soc/nxp/rw/power.c b/soc/nxp/rw/power.c
index f4176b6349cf5..09734d2f50562 100644
--- a/soc/nxp/rw/power.c
+++ b/soc/nxp/rw/power.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, NXP
+ * Copyright 2023-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,10 +7,16 @@
 #include <zephyr/pm/pm.h>
 #include <zephyr/init.h>
 #include <zephyr/drivers/pinctrl.h>
+#if CONFIG_GPIO && (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0)) || \
+		    DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1)))
+#include <zephyr/drivers/gpio/gpio_mcux_lpc.h>
+#endif
 
 #include "fsl_power.h"
 
 #include <zephyr/logging/log.h>
+#include <zephyr/drivers/timer/system_timer.h>
+
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* Active mode */
@@ -26,10 +32,15 @@ LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 #define NODE_ID DT_INST(0, nxp_pdcfg_power)
 
+extern void clock_init(void);
+
 power_sleep_config_t slp_cfg;
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0)) || DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1))
 pinctrl_soc_pin_t pin_cfg;
+#if CONFIG_GPIO
+const struct device *gpio;
+#endif
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0))
@@ -56,6 +67,81 @@ static void pin1_isr(const struct device *dev)
 }
 #endif
 
+#ifdef CONFIG_MPU
+
+#define MPU_NUM_REGIONS 8
+
+typedef struct mpu_conf {
+	uint32_t CTRL;
+	uint32_t RNR;
+	uint32_t RBAR[MPU_NUM_REGIONS];
+	uint32_t RLAR[MPU_NUM_REGIONS];
+	uint32_t RBAR_A1;
+	uint32_t RLAR_A1;
+	uint32_t RBAR_A2;
+	uint32_t RLAR_A2;
+	uint32_t RBAR_A3;
+	uint32_t RLAR_A3;
+	uint32_t MAIR0;
+	uint32_t MAIR1;
+} mpu_conf;
+mpu_conf saved_mpu_conf;
+
+static void save_mpu_state(void)
+{
+	uint32_t index;
+
+	/*
+	 * MPU is divided in `MPU_NUM_REGIONS` regions.
+	 * Here we save those regions configuration to be restored after PM3 entry
+	 */
+	for (index = 0U; index < MPU_NUM_REGIONS; index++) {
+		MPU->RNR = index;
+		saved_mpu_conf.RBAR[index] = MPU->RBAR;
+		saved_mpu_conf.RLAR[index] = MPU->RLAR;
+	}
+
+	saved_mpu_conf.CTRL = MPU->CTRL;
+	saved_mpu_conf.RNR = MPU->RNR;
+	saved_mpu_conf.RBAR_A1 = MPU->RBAR_A1;
+	saved_mpu_conf.RLAR_A1 = MPU->RLAR_A1;
+	saved_mpu_conf.RBAR_A2 = MPU->RBAR_A2;
+	saved_mpu_conf.RLAR_A2 = MPU->RLAR_A2;
+	saved_mpu_conf.RBAR_A3 = MPU->RBAR_A3;
+	saved_mpu_conf.RLAR_A3 = MPU->RLAR_A3;
+	saved_mpu_conf.MAIR0 = MPU->MAIR0;
+	saved_mpu_conf.MAIR1 = MPU->MAIR1;
+}
+
+static void restore_mpu_state(void)
+{
+	uint32_t index;
+
+	for (index = 0U; index < MPU_NUM_REGIONS; index++) {
+		MPU->RNR = index;
+		MPU->RBAR = saved_mpu_conf.RBAR[index];
+		MPU->RLAR = saved_mpu_conf.RLAR[index];
+	}
+
+	MPU->RNR = saved_mpu_conf.RNR;
+	MPU->RBAR_A1 = saved_mpu_conf.RBAR_A1;
+	MPU->RLAR_A1 = saved_mpu_conf.RLAR_A1;
+	MPU->RBAR_A2 = saved_mpu_conf.RBAR_A2;
+	MPU->RLAR_A2 = saved_mpu_conf.RLAR_A2;
+	MPU->RBAR_A3 = saved_mpu_conf.RBAR_A3;
+	MPU->RLAR_A3 = saved_mpu_conf.RLAR_A3;
+	MPU->MAIR0 = saved_mpu_conf.MAIR0;
+	MPU->MAIR1 = saved_mpu_conf.MAIR1;
+
+	/*
+	 * CTRL register must be restored last in case MPU was enabled,
+	 * because some MPU registers can't be programmed while the MPU is enabled
+	 */
+	MPU->CTRL = saved_mpu_conf.CTRL;
+}
+
+#endif /* CONFIG_MPU */
+
 /* Invoke Low Power/System Off specific Tasks */
 __weak void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
@@ -92,6 +178,28 @@ __weak void pm_state_set(enum pm_state state, uint8_t substate_id)
 		break;
 	case PM_STATE_SUSPEND_TO_IDLE:
 		POWER_EnterPowerMode(POWER_MODE2, &slp_cfg);
+		break;
+	case PM_STATE_STANDBY:
+#ifdef CONFIG_MPU
+		/* Save MPU state before entering PM3 */
+		save_mpu_state();
+#endif /* CONFIG_MPU */
+
+		POWER_EnableWakeup(DT_IRQN(DT_NODELABEL(rtc)));
+		if (POWER_EnterPowerMode(POWER_MODE3, &slp_cfg)) {
+#ifdef CONFIG_MPU
+			/* Restore MPU as is lost after PM3 exit*/
+			restore_mpu_state();
+#endif /* CONFIG_MPU */
+			clock_init();
+
+			sys_clock_idle_exit();
+		}
+
+		/* Clear the RTC wakeup bits */
+		POWER_ClearWakeupStatus(DT_IRQN(DT_NODELABEL(rtc)));
+		POWER_DisableWakeup(DT_IRQN(DT_NODELABEL(rtc)));
+
 		break;
 	default:
 		LOG_DBG("Unsupported power state %u", state);
@@ -105,6 +213,15 @@ __weak void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 	ARG_UNUSED(state);
 	ARG_UNUSED(substate_id);
 
+#if CONFIG_GPIO && (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0)) || \
+		    DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1)))
+	if (state == PM_STATE_STANDBY) {
+		/* GPIO_0_24 & GPIO_0_25 are used for wakeup */
+		uint32_t pins = PMU->WAKEUP_STATUS &
+				(PMU_WAKEUP_STATUS_PIN0_MASK | PMU_WAKEUP_STATUS_PIN1_MASK);
+		gpio_mcux_lpc_trigger_cb(gpio, (pins << 24));
+	}
+#endif
 	/* Clear PRIMASK */
 	__enable_irq();
 }
@@ -142,4 +259,16 @@ void nxp_rw6xx_power_init(void)
 	IRQ_CONNECT(DT_IRQN(DT_NODELABEL(pin1)), DT_IRQ(DT_NODELABEL(pin1), priority), pin1_isr,
 		    NULL, 0);
 #endif
+
+	/* Clear the RTC wakeup bits */
+	POWER_ClearWakeupStatus(DT_IRQN(DT_NODELABEL(rtc)));
+	POWER_DisableWakeup(DT_IRQN(DT_NODELABEL(rtc)));
+
+#if CONFIG_GPIO && (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin0)) || \
+		    DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(pin1)))
+	gpio = DEVICE_DT_GET(DT_NODELABEL(hsgpio0));
+	if (!device_is_ready(gpio)) {
+		return;
+	}
+#endif
 }
diff --git a/soc/nxp/rw/soc.c b/soc/nxp/rw/soc.c
index 0eb068349cf12..3e928123c496c 100644
--- a/soc/nxp/rw/soc.c
+++ b/soc/nxp/rw/soc.c
@@ -67,12 +67,6 @@ __imx_boot_ivt_section void (*const image_vector_table[])(void) = {
 };
 #endif /* CONFIG_NXP_RW6XX_BOOT_HEADER */
 
-const clock_avpll_config_t avpll_config = {
-	.ch1Freq = kCLOCK_AvPllChFreq12p288m,
-	.ch2Freq = kCLOCK_AvPllChFreq64m,
-	.enableCali = true
-};
-
 /**
  * @brief Initialize the system clocks and peripheral clocks
  *
@@ -95,8 +89,6 @@ __weak __ramfunc void clock_init(void)
 
 	/* Initialize T3 clocks and t3pll_mci_48_60m_irc configured to 48.3MHz */
 	CLOCK_InitT3RefClk(kCLOCK_T3MciIrc48m);
-	/* Enable FFRO */
-	CLOCK_EnableClock(kCLOCK_T3PllMciIrcClk);
 	/* Enable T3 256M clock and SFRO */
 	CLOCK_EnableClock(kCLOCK_T3PllMci256mClk);
 
@@ -114,17 +106,9 @@ __weak __ramfunc void clock_init(void)
 	/* Enable tcpu_mci_clk 260MHz. Keep tcpu_mci_flexspi_clk gated. */
 	CLOCK_EnableClock(kCLOCK_TcpuMciClk);
 
-	/* tddr_mci_flexspi_clk 320MHz */
-	CLOCK_InitTddrRefClk(kCLOCK_TddrFlexspiDiv10);
-	CLOCK_EnableClock(kCLOCK_TddrMciFlexspiClk); /* 320MHz */
-
 	/* Enable AUX0 PLL to 260 MHz */
 	CLOCK_SetClkDiv(kCLOCK_DivAux0PllClk, 1U);
 
-	/* Init AVPLL and enable both channels */
-	CLOCK_InitAvPll(&avpll_config);
-	CLOCK_SetClkDiv(kCLOCK_DivAudioPllClk, 1U);
-
 	/* Configure MainPll to 260MHz, then let CM33 run on Main PLL. */
 	CLOCK_SetClkDiv(kCLOCK_DivSysCpuAhbClk, 1U);
 	CLOCK_SetClkDiv(kCLOCK_DivMainPllClk, 1U);
@@ -134,6 +118,8 @@ __weak __ramfunc void clock_init(void)
 	CLOCK_SetClkDiv(kCLOCK_DivSystickClk, 1U);
 	CLOCK_AttachClk(kSYSTICK_DIV_to_SYSTICK_CLK);
 
+	SystemCoreClockUpdate();
+
 	/* Set PLL FRG clock to 20MHz. */
 	CLOCK_SetClkDiv(kCLOCK_DivPllFrgClk, 13U);
 
@@ -199,6 +185,10 @@ __weak __ramfunc void clock_init(void)
 #if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm14), nxp_lpc_i2c, okay)) && CONFIG_I2C
 	CLOCK_AttachClk(kSFRO_to_FLEXCOMM14);
 #endif
+#if CONFIG_XTAL32K
+	CLOCK_EnableXtal32K(true);
+	CLOCK_AttachClk(kXTAL32K_to_CLK32K);
+#endif
 
 /* Clock flexcomms when used as SPI */
 #ifdef CONFIG_SPI
@@ -223,13 +213,39 @@ __weak __ramfunc void clock_init(void)
 #endif
 #endif /* CONFIG_SPI */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmic0)) && CONFIG_AUDIO_DMIC_MCUX
+#if (DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(dmic0)) && CONFIG_AUDIO_DMIC_MCUX) || CONFIG_I2S
+	const clock_avpll_config_t avpll_config = {
+		.ch1Freq = kCLOCK_AvPllChFreq12p288m,
+		.ch2Freq = kCLOCK_AvPllChFreq64m,
+		.enableCali = true
+	};
+
+	/* Init AVPLL and enable both channels */
+	CLOCK_InitAvPll(&avpll_config);
+	CLOCK_SetClkDiv(kCLOCK_DivAudioPllClk, 1U);
+
 	/* Clock DMIC from Audio PLL. PLL output is sourced from AVPLL
 	 * channel 1, which is clocked at 12.288 MHz. We can divide this
 	 * by 4 to achieve the desired DMIC bit clk of 3.072 MHz
 	 */
 	CLOCK_AttachClk(kAUDIO_PLL_to_DMIC_CLK);
 	CLOCK_SetClkDiv(kCLOCK_DivDmicClk, 4);
+
+	#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm0), nxp_lpc_i2s, okay))
+		CLOCK_AttachClk(kAUDIO_PLL_to_FLEXCOMM0);
+	#endif
+	#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm1), nxp_lpc_i2s, okay))
+		CLOCK_AttachClk(kAUDIO_PLL_to_FLEXCOMM1);
+	#endif
+	#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm2), nxp_lpc_i2s, okay))
+		CLOCK_AttachClk(kAUDIO_PLL_to_FLEXCOMM2);
+	#endif
+	#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm3), nxp_lpc_i2s, okay))
+		CLOCK_AttachClk(kAUDIO_PLL_to_FLEXCOMM3);
+	#endif
+	#if (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm14), nxp_lpc_i2s, okay))
+		CLOCK_AttachClk(kAUDIO_PLL_to_FLEXCOMM14);
+	#endif
 #endif
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(lcdic)) && CONFIG_MIPI_DBI_NXP_LCDIC
@@ -252,7 +268,8 @@ __weak __ramfunc void clock_init(void)
 #endif
 #endif /* CONFIG_COUNTER_MCUX_CTIMER */
 
-#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb_otg)) && CONFIG_USB_DC_NXP_EHCI
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(usb_otg)) && \
+	(CONFIG_USB_DC_NXP_EHCI || CONFIG_UDC_NXP_EHCI)
 	/* Enable system xtal from Analog */
 	SYSCTL2->ANA_GRP_CTRL |= SYSCTL2_ANA_GRP_CTRL_PU_AG_MASK;
 	/* reset USB */
diff --git a/soc/oct/osd32mp15x/Kconfig b/soc/oct/osd32mp15x/Kconfig
new file mode 100644
index 0000000000000..3cf3468fdd28f
--- /dev/null
+++ b/soc/oct/osd32mp15x/Kconfig
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_OSD32MP15X
+	select SOC_STM32MP15_M4
diff --git a/soc/oct/osd32mp15x/Kconfig.soc b/soc/oct/osd32mp15x/Kconfig.soc
new file mode 100644
index 0000000000000..e62fc487b41cd
--- /dev/null
+++ b/soc/oct/osd32mp15x/Kconfig.soc
@@ -0,0 +1,19 @@
+# Copyright (c) 2024 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: Apache-2.0
+
+# The OSD32MP15X is technically a SiP (System-in-Package) that consists of
+# the STM32MP15 MCU and additional components like EEPROM. So for
+# OSD32MP1-BRK platform the STM32MP15_M4 SoC is to be indicated as
+# the build target, but since the OSD32MP15x SiP is what a user can actually
+# see on a board, using only STM32MP15_M4 in the Zephyr build
+# infrastructure might be confusing. That's why in the top level of SoC
+# definitions (for user-configurable options in Kconfig, for example)
+# the OSD32MP15X term is used and STM32MP15_M4 underneath.
+
+config SOC_OSD32MP15X
+	bool
+	help
+	  Octavo Systems OSD32MP15X SiP
+
+config SOC
+	default "osd32mp15x" if SOC_OSD32MP15X
diff --git a/soc/oct/osd32mp15x/soc.yml b/soc/oct/osd32mp15x/soc.yml
new file mode 100644
index 0000000000000..a254e50656857
--- /dev/null
+++ b/soc/oct/osd32mp15x/soc.yml
@@ -0,0 +1,2 @@
+socs:
+  - name: osd32mp15x
diff --git a/soc/openhwgroup/cva6/CMakeLists.txt b/soc/openhwgroup/cva6/CMakeLists.txt
new file mode 100644
index 0000000000000..5eab77204200b
--- /dev/null
+++ b/soc/openhwgroup/cva6/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(${SOC_SERIES})
+
+zephyr_library_sources_ifdef(CONFIG_CACHE_MANAGEMENT soc_cache_management.c)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/riscv/common/linker.ld CACHE INTERNAL "")
diff --git a/soc/openhwgroup/cva6/Kconfig b/soc/openhwgroup/cva6/Kconfig
new file mode 100644
index 0000000000000..a90cbce7cfd89
--- /dev/null
+++ b/soc/openhwgroup/cva6/Kconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_FAMILY_OPENHWGROUP_CVA6
+
+rsource "*/Kconfig"
+
+endif # SOC_FAMILY_OPENHWGROUP_CVA6
diff --git a/soc/openhwgroup/cva6/Kconfig.defconfig b/soc/openhwgroup/cva6/Kconfig.defconfig
new file mode 100644
index 0000000000000..3a0637761120d
--- /dev/null
+++ b/soc/openhwgroup/cva6/Kconfig.defconfig
@@ -0,0 +1,45 @@
+# Copyright (c) 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_FAMILY_OPENHWGROUP_CVA6
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	int
+	default $(dt_node_int_prop_int,/cpus/cpu@0,timebase-frequency)
+
+config RISCV_SOC_INTERRUPT_INIT
+	default y
+
+# highest implemented first-level interrupt is machine external, 11
+config 2ND_LVL_ISR_TBL_OFFSET
+	default 12
+
+config 2ND_LVL_INTR_00_OFFSET
+	default 11
+
+# 12 first level, 30 second level
+config MAX_IRQ_PER_AGGREGATOR
+	default 30
+
+# one 2nd level aggregator (PLIC) with 30 interrupts
+# offset of 12
+config NUM_IRQS
+	default 42
+
+config MULTI_LEVEL_INTERRUPTS
+	default y
+
+config 2ND_LEVEL_INTERRUPTS
+	default y
+
+# 1 PLIC
+config NUM_2ND_LEVEL_AGGREGATORS
+	default 1
+
+config PLIC
+	default y
+
+config 3RD_LEVEL_INTERRUPTS
+	default n
+
+endif # SOC_FAMILY_OPENHWGROUP_CVA6
diff --git a/soc/openhwgroup/cva6/Kconfig.soc b/soc/openhwgroup/cva6/Kconfig.soc
new file mode 100644
index 0000000000000..36b8f2e29a282
--- /dev/null
+++ b/soc/openhwgroup/cva6/Kconfig.soc
@@ -0,0 +1,14 @@
+#Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+#SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_OPENHWGROUP_CVA6
+	bool
+	help
+	  CVA6 RISC-V CPUs, commonly used as soft cores on FPGAs.
+	  There is a 64-bit version with imafdc extensions and sv39 MMU and
+	  several 32-bit configurations, optionally with up to imafdc and sv32 MMU.
+
+config SOC_FAMILY
+	default "openhwgroup_cva6" if SOC_FAMILY_OPENHWGROUP_CVA6
+
+rsource "*/Kconfig.soc"
diff --git a/soc/openhwgroup/cva6/cv32a6/CMakeLists.txt b/soc/openhwgroup/cva6/cv32a6/CMakeLists.txt
new file mode 100644
index 0000000000000..da374abd68f7a
--- /dev/null
+++ b/soc/openhwgroup/cva6/cv32a6/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources()
+
+zephyr_include_directories_ifdef(CONFIG_SOC_FAMILY_OPENHWGROUP_CVA6 ".")
diff --git a/soc/openhwgroup/cva6/cv32a6/Kconfig b/soc/openhwgroup/cva6/cv32a6/Kconfig
new file mode 100644
index 0000000000000..6582c97826f3d
--- /dev/null
+++ b/soc/openhwgroup/cva6/cv32a6/Kconfig
@@ -0,0 +1,19 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+# RISCV32 OpenHW Group cva6 configuration options
+
+config SOC_CV32A6
+	select RISCV
+	select RISCV_PRIVILEGED
+	select ATOMIC_OPERATIONS_BUILTIN
+	select RISCV_HAS_PLIC
+	select USE_SWITCH_SUPPORTED
+	select USE_SWITCH
+	select SCHED_IPI_SUPPORTED
+	select RISCV_ISA_RV32I
+	select RISCV_ISA_EXT_M
+	select RISCV_ISA_EXT_A
+	select RISCV_ISA_EXT_ZICSR
+	select RISCV_ISA_EXT_ZIFENCEI
+	select CPU_HAS_DCACHE
+	select CPU_HAS_ICACHE
diff --git a/soc/openhwgroup/cva6/cv32a6/Kconfig.soc b/soc/openhwgroup/cva6/cv32a6/Kconfig.soc
new file mode 100644
index 0000000000000..a1c8eac6e19ee
--- /dev/null
+++ b/soc/openhwgroup/cva6/cv32a6/Kconfig.soc
@@ -0,0 +1,22 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_CV32A6
+	bool
+	select SOC_FAMILY_OPENHWGROUP_CVA6
+	help
+	  CVA6 32-bit RISC-V CPUs, commonly used as soft cores on FPGAs.
+	  This configuration works with the upstream project (https://github.com/openhwgroup/cva6).
+
+config SOC_CV32A6
+	bool
+	select SOC_SERIES_CV32A6
+	help
+	  Minimal CVA6 core in 32-bit configuration: ima extensions, no MMU or PMP,
+	  SoC with CLINT, PLIC, UART, SPI, and Ethernet (Xilinx or lowRISC).
+
+config SOC_SERIES
+	default "cv32a6" if SOC_SERIES_CV32A6
+
+config SOC
+	default "cv32a6" if SOC_CV32A6
diff --git a/soc/openhwgroup/cva6/cv64a6/CMakeLists.txt b/soc/openhwgroup/cva6/cv64a6/CMakeLists.txt
new file mode 100644
index 0000000000000..da374abd68f7a
--- /dev/null
+++ b/soc/openhwgroup/cva6/cv64a6/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources()
+
+zephyr_include_directories_ifdef(CONFIG_SOC_FAMILY_OPENHWGROUP_CVA6 ".")
diff --git a/soc/openhwgroup/cva6/cv64a6/Kconfig b/soc/openhwgroup/cva6/cv64a6/Kconfig
new file mode 100644
index 0000000000000..64d7f54bd0431
--- /dev/null
+++ b/soc/openhwgroup/cva6/cv64a6/Kconfig
@@ -0,0 +1,35 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+# RISCV64 OpenHW Group cva6 configuration options
+
+# Shared properties
+config SOC_CV64A6
+	bool
+	select RISCV
+	select RISCV_PRIVILEGED
+	select ATOMIC_OPERATIONS_BUILTIN
+	select RISCV_HAS_PLIC
+	select USE_SWITCH_SUPPORTED
+	select USE_SWITCH
+	select SCHED_IPI_SUPPORTED
+	select 64BIT
+	select RISCV_ISA_RV64I
+	select RISCV_ISA_EXT_M
+	select RISCV_ISA_EXT_A
+	select RISCV_ISA_EXT_C
+	select RISCV_ISA_EXT_ZICSR
+	select RISCV_ISA_EXT_ZIFENCEI
+	select CPU_HAS_DCACHE
+	select CPU_HAS_ICACHE
+
+# Variant with FPU
+config SOC_CV64A6_IMAFDC
+	select SOC_CV64A6
+	select CPU_HAS_FPU
+	select CPU_HAS_FPU_DOUBLE_PRECISION
+	select RISCV_ISA_EXT_F
+	select RISCV_ISA_EXT_D
+
+# Variant without FPU
+config SOC_CV64A6_IMAC
+	select SOC_CV64A6
diff --git a/soc/openhwgroup/cva6/cv64a6/Kconfig.soc b/soc/openhwgroup/cva6/cv64a6/Kconfig.soc
new file mode 100644
index 0000000000000..c3be28de83463
--- /dev/null
+++ b/soc/openhwgroup/cva6/cv64a6/Kconfig.soc
@@ -0,0 +1,32 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_CV64A6
+	bool
+	select SOC_FAMILY_OPENHWGROUP_CVA6
+	help
+	  CVA6 64-bit RISC-V CPUs, commonly used as soft cores on FPGAs.
+	  This configuration works with the upstream project (https://github.com/openhwgroup/cva6)
+	  as well as the forked project with support for the Xilinx AXI Ethernet Subsystem
+	  (https://github.com/cispa/CVA6-Vivado-Project-with-Xilinx-AXI-Ethernet).
+
+config SOC_CV64A6_IMAFDC
+	bool
+	select SOC_SERIES_CV64A6
+	help
+	  Standard CVA6 core in 64-bit configuration: SV39 MMU and SoC with CLINT, PLIC, UART,
+	  SPI, and Ethernet (Xilinx or lowRISC). Supports imafdc instruction sets.
+
+config SOC_CV64A6_IMAC
+	bool
+	select SOC_SERIES_CV64A6
+	help
+	  Minimal CVA6 core in 64-bit configuration: SV39 MMU and SoC with CLINT, PLIC, UART,
+	  SPI, and Ethernet (Xilinx or lowRISC). Supports imac instruction sets.
+
+config SOC_SERIES
+	default "cv64a6" if SOC_SERIES_CV64A6
+
+config SOC
+	default "cv64a6_imac" if SOC_CV64A6_IMAC
+	default "cv64a6_imafdc" if SOC_CV64A6_IMAFDC
diff --git a/soc/openhwgroup/cva6/cva6.h b/soc/openhwgroup/cva6/cva6.h
new file mode 100644
index 0000000000000..f2bd8a3432e85
--- /dev/null
+++ b/soc/openhwgroup/cva6/cva6.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2024, CISPA Helmholtz Center for Information Security
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * @file
+ * OpenHwGroup CVA6 declarations
+ */
+
+#ifndef ZEPHYR_SOC_RISCV_OPENHWGROUP_CVA6_H
+#define ZEPHYR_SOC_RISCV_OPENHWGROUP_CVA6_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * CVA6 provides two custom CSRs for cache management:
+ * CSR 7C1 controls the data cache, CSR 7C0 controls the instruction cache.
+ * The least significant bit of the CSRs can be written to enable or disable the cache.
+ * Writing a value of 1 means enabling the cache, writing 0 disables it.
+ * After reset, both caches are enabled by default.
+ *
+ */
+
+#define SOC_CVA6_CUSTOM_CSR_DCACHE 0x7C1
+#define SOC_CVA6_CUSTOM_CSR_ICACHE 0x7C0
+
+#define SOC_CVA6_CUSTOM_CSR_DCACHE_ENABLE  0x1
+#define SOC_CVA6_CUSTOM_CSR_DCACHE_DISABLE 0x0
+
+#define SOC_CVA6_CUSTOM_CSR_ICACHE_ENABLE  0x1
+#define SOC_CVA6_CUSTOM_CSR_ICACHE_DISABLE 0x0
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_SOC_RISCV_OPENHWGROUP_CVA6_H */
diff --git a/soc/openhwgroup/cva6/soc.yml b/soc/openhwgroup/cva6/soc.yml
new file mode 100644
index 0000000000000..bd250f81d4b44
--- /dev/null
+++ b/soc/openhwgroup/cva6/soc.yml
@@ -0,0 +1,13 @@
+# Copyright 2024 CISPA Helmholtz Center for Information Security gGmbH
+# SPDX-License-Identifier: Apache-2.0
+family:
+- name: openhwgroup_cva6
+  series:
+  - name: cv64a6
+    socs:
+    - name: cv64a6_imafdc
+    - name: cv64a6_imac
+  - name: cv32a6
+    socs:
+    - name: cv32a6
+vendor: OpenHW Group
diff --git a/soc/openhwgroup/cva6/soc_cache_management.c b/soc/openhwgroup/cva6/soc_cache_management.c
new file mode 100644
index 0000000000000..0e602779b2ddd
--- /dev/null
+++ b/soc/openhwgroup/cva6/soc_cache_management.c
@@ -0,0 +1,124 @@
+/*
+ * Non-standard CVA6 cache management operations.
+ *
+ * Copyright(c) 2024, CISPA Helmholtz Center for Information Security
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stddef.h>
+#include <zephyr/arch/cache.h>
+#include <zephyr/arch/riscv/csr.h>
+#include <zephyr/kernel.h>
+
+#include "cva6.h"
+
+void __weak arch_dcache_enable(void)
+{
+	csr_write(SOC_CVA6_CUSTOM_CSR_DCACHE, SOC_CVA6_CUSTOM_CSR_DCACHE_ENABLE);
+}
+
+void __weak arch_dcache_disable(void)
+{
+	csr_write(SOC_CVA6_CUSTOM_CSR_DCACHE, SOC_CVA6_CUSTOM_CSR_DCACHE_DISABLE);
+}
+
+int __weak arch_dcache_flush_all(void)
+{
+	arch_dcache_disable();
+	arch_dcache_enable();
+
+	return 0;
+}
+
+int __weak arch_dcache_invd_all(void)
+{
+	return arch_dcache_flush_all();
+}
+
+int __weak arch_dcache_flush_and_invd_all(void)
+{
+	return arch_dcache_flush_all();
+}
+
+/* FIXME currently not supported by all CVA6 - overwrite at board or SoC level */
+int __weak arch_dcache_flush_range(void *addr, size_t size)
+{
+	ARG_UNUSED(addr);
+	ARG_UNUSED(size);
+
+	return arch_dcache_flush_all();
+}
+
+int __weak arch_dcache_invd_range(void *addr, size_t size)
+{
+	ARG_UNUSED(addr);
+	ARG_UNUSED(size);
+
+	return arch_dcache_flush_all();
+}
+
+int __weak arch_dcache_flush_and_invd_range(void *addr, size_t size)
+{
+	ARG_UNUSED(addr);
+	ARG_UNUSED(size);
+
+	return arch_dcache_flush_all();
+}
+
+void __weak arch_icache_enable(void)
+{
+	csr_write(SOC_CVA6_CUSTOM_CSR_ICACHE, SOC_CVA6_CUSTOM_CSR_ICACHE_ENABLE);
+}
+
+void __weak arch_icache_disable(void)
+{
+	csr_write(SOC_CVA6_CUSTOM_CSR_ICACHE, SOC_CVA6_CUSTOM_CSR_ICACHE_DISABLE);
+}
+
+int __weak arch_icache_flush_all(void)
+{
+	arch_icache_disable();
+	arch_icache_enable();
+
+	return 0;
+}
+
+int __weak arch_icache_invd_all(void)
+{
+	return arch_icache_flush_all();
+}
+
+int __weak arch_icache_flush_and_invd_all(void)
+{
+	return arch_icache_flush_all();
+}
+
+/* FIXME currently not supported by all CVA6 - overwrite at board or SoC level */
+int __weak arch_icache_flush_range(void *addr, size_t size)
+{
+	ARG_UNUSED(addr);
+	ARG_UNUSED(size);
+
+	return arch_icache_flush_all();
+}
+
+int __weak arch_icache_invd_range(void *addr, size_t size)
+{
+	ARG_UNUSED(addr);
+	ARG_UNUSED(size);
+
+	return arch_icache_flush_all();
+}
+
+int __weak arch_icache_flush_and_invd_range(void *addr, size_t size)
+{
+	ARG_UNUSED(addr);
+	ARG_UNUSED(size);
+
+	return arch_icache_flush_all();
+}
+
+/* FIXME there is no common implementation for RISC-V, so we provide a SoC-level definition */
+/* this prevents a linker error when the function is not defined */
+void __weak arch_cache_init(void)
+{
+}
diff --git a/soc/raspberrypi/rpi_pico/rp2350/Kconfig b/soc/raspberrypi/rpi_pico/rp2350/Kconfig
index 2de28a5dd56f2..28553021e2cb2 100644
--- a/soc/raspberrypi/rpi_pico/rp2350/Kconfig
+++ b/soc/raspberrypi/rpi_pico/rp2350/Kconfig
@@ -18,6 +18,15 @@ config SOC_RP2350A_M33
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
 
+config SOC_RP2350B_M33
+	select ARM
+	select ARM_TRUSTZONE_M
+	select CPU_CORTEX_M_HAS_SYSTICK
+	select CPU_CORTEX_M_HAS_VTOR
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select CPU_HAS_ARM_SAU
+
 config RP2_REQUIRES_IMAGE_DEFINITION_BLOCK
 	bool
 	default y
diff --git a/soc/raspberrypi/rpi_pico/rp2350/Kconfig.soc b/soc/raspberrypi/rpi_pico/rp2350/Kconfig.soc
index 19012bb5648ab..069bc56cfbf32 100644
--- a/soc/raspberrypi/rpi_pico/rp2350/Kconfig.soc
+++ b/soc/raspberrypi/rpi_pico/rp2350/Kconfig.soc
@@ -20,5 +20,16 @@ config SOC_RP2350A_M33
 	help
 	  Use the RP2350A with a Cortex-M33 core in both 'sockets'.
 
+config SOC_RP2350B
+	bool
+	select SOC_SERIES_RP2350
+
+config SOC_RP2350B_M33
+	bool
+	select SOC_RP2350B
+	help
+	  Use the RP2350B with a Cortex-M33 core in both 'sockets'.
+
 config SOC
 	default "rp2350a" if SOC_RP2350A
+	default "rp2350b" if SOC_RP2350B
diff --git a/soc/raspberrypi/rpi_pico/soc.yml b/soc/raspberrypi/rpi_pico/soc.yml
index 32039c2094401..fac2f36cd9693 100644
--- a/soc/raspberrypi/rpi_pico/soc.yml
+++ b/soc/raspberrypi/rpi_pico/soc.yml
@@ -9,3 +9,6 @@ family:
     - name: rp2350a
       cpuclusters:
       - name: m33
+    - name: rp2350b
+      cpuclusters:
+      - name: m33
diff --git a/soc/realtek/ec/rts5912/CMakeLists.txt b/soc/realtek/ec/rts5912/CMakeLists.txt
index 219c68e5a8dee..a9e58c970ac24 100644
--- a/soc/realtek/ec/rts5912/CMakeLists.txt
+++ b/soc/realtek/ec/rts5912/CMakeLists.txt
@@ -12,6 +12,6 @@ zephyr_sources_ifdef(CONFIG_PM
   power.c
   )
 
-zephyr_sources_ifdef(CONFIG_DT_HAS_SWJ_CONNECTOR_ENABLED debug_swj.c)
+zephyr_sources_ifdef(CONFIG_RTS5912_DEBUG_SWJ debug_swj.c)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/realtek/ec/rts5912/Kconfig b/soc/realtek/ec/rts5912/Kconfig
index aebac7b3d008b..c3a86e9b8e1b9 100644
--- a/soc/realtek/ec/rts5912/Kconfig
+++ b/soc/realtek/ec/rts5912/Kconfig
@@ -22,4 +22,11 @@ config RTS5912_ON_ENTER_CPU_IDLE_HOOK
 	  If needed, this hook can be used to prevent the CPU from actually
 	  entering sleep by skipping the WFE/WFI instruction.
 
+config RTS5912_DEBUG_SWJ
+	bool "Serial wire JTAG"
+	default y
+	depends on DT_HAS_SWJ_CONNECTOR_ENABLED
+	help
+	  Enables the serial wire JTAG connection on the RTS5912 EC.
+
 endif # SOC_SERIES_RTS5912
diff --git a/soc/realtek/ec/rts5912/reg/reg_kbm.h b/soc/realtek/ec/rts5912/reg/reg_kbm.h
new file mode 100644
index 0000000000000..1d27d5ecc4f74
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_kbm.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_KBM_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_KBM_H
+
+/**
+ * @brief Keyboard Matrix Controller (KBM)
+ */
+
+struct kbm_regs {
+	uint32_t scan_out;
+	uint32_t scan_in;
+	uint32_t int_en;
+	uint32_t ctrl;
+};
+
+#define KBM_CTRL_KSOTYPE_Msk   BIT(0)
+#define KBM_CTRL_KSI8EN_Msk    BIT(1)
+#define KBM_CTRL_KSI9EN_Msk    BIT(2)
+#define KBM_CTRL_KSO18EN_Msk   BIT(16)
+#define KBM_CTRL_KSO19EN_Msk   BIT(17)
+#define KBM_CTRL_KSIINTSTS_Msk BIT(18)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_KBM_H */
diff --git a/soc/realtek/ec/rts5912/reg/reg_rtc.h b/soc/realtek/ec/rts5912/reg/reg_rtc.h
new file mode 100644
index 0000000000000..c339fa653a016
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_rtc.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_RTC_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_RTC_H
+
+#include <zephyr/kernel.h>
+
+/*
+ * @brief RTC Controller (RTC)
+ */
+
+typedef struct {
+	volatile uint8_t SEC;
+	volatile uint8_t SECALARM;
+	volatile uint8_t MIN;
+	volatile uint8_t MINALARM;
+	volatile uint8_t HR;
+	volatile uint8_t HRALARM;
+	volatile uint8_t DAYWEEK;
+	volatile uint8_t DAYMONTH;
+	volatile uint8_t MONTH;
+	volatile uint8_t YEAR;
+	volatile uint8_t CTRL0;
+	volatile uint8_t CTRL1;
+	volatile uint8_t CTRL2;
+	volatile uint8_t DAYWEEKALARM;
+	volatile uint8_t DAYMONTHALARM;
+	volatile const uint8_t RESERVED;
+	volatile const uint32_t RESERVED1[2];
+	volatile uint32_t DLSFW;
+	volatile uint32_t DLSBW;
+	volatile uint32_t WEEK;
+} RTC_Type;
+
+/* HR */
+#define RTC_HR_VAL_Pos         (0UL)
+#define RTC_HR_VAL_Msk         GENMASK(5, 0)
+#define RTC_HR_AMPM_Pos        (7UL)
+#define RTC_HR_AMPM_Msk        BIT(RTC_HR_AMPM_Pos)
+/* DAYWEEK */
+#define RTC_DAYWEEK_Pos        (0UL)
+#define RTC_DAYWEEK_Msk        GENMASK(3, 0)
+/* DAYMONTH */
+#define RTC_DAYMONTH_Pos       (0UL)
+#define RTC_DAYMONTH_Msk       GENMASK(5, 0)
+/* CTRL0 */
+#define RTC_CTRL0_DIVCTL_Pos   (4UL)
+#define RTC_CTRL0_DIVCTL_Msk   GENMASK(6, 4)
+/* CTRL1 */
+#define RTC_CTRL1_HRMODE_Pos   (1UL)
+#define RTC_CTRL1_HRMODE_Msk   BIT(RTC_CTRL1_HRMODE_Pos)
+#define RTC_CTRL1_DATEMODE_Pos (2UL)
+#define RTC_CTRL1_DATEMODE_Msk BIT(RTC_CTRL1_DATEMODE_Pos)
+#define RTC_CTRL1_SETMODE_Pos  (7UL)
+#define RTC_CTRL1_SETMODE_Msk  BIT(RTC_CTRL1_SETMODE_Pos)
+/* WEEK */
+#define RTC_WEEK_NUM_Pos       (0UL)
+#define RTC_WEEK_NUM_Msk       GENMASK(7, 0)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_RTC_H */
diff --git a/soc/realtek/ec/rts5912/reg/reg_slwtmr.h b/soc/realtek/ec/rts5912/reg/reg_slwtmr.h
new file mode 100644
index 0000000000000..be37eafc0d563
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_slwtmr.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_SLWTMR_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_SLWTMR_H
+
+/**
+ * @brief SLOW Timer Controller (SLWTMR)
+ */
+
+struct slwtmr_type {
+	uint32_t ldcnt;
+	uint32_t cnt;
+	uint32_t ctrl;
+	uint32_t insts;
+};
+
+/* CTRL */
+#define SLWTMR_CTRL_EN BIT(0)
+
+#define SLWTMR_CTRL_MDSELS_ONESHOT 0
+#define SLWTMR_CTRL_MDSELS_PERIOD  BIT(1)
+
+#define SLWTMR_CTRL_INTEN_EN BIT(2)
+/* INTSTS */
+#define SLWTMR_INTSTS_STS    BIT(0)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_SLWTMR_H */
diff --git a/soc/realtek/ec/rts5912/reg/reg_tacho.h b/soc/realtek/ec/rts5912/reg/reg_tacho.h
new file mode 100644
index 0000000000000..4e7b9d0851f93
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_tacho.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2025 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_TACHO_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_TACHO_H
+
+struct tacho_regs {
+	uint32_t ctrl;
+	uint32_t status;
+	uint32_t limit_high;
+	uint32_t limit_low;
+	uint32_t int_en;
+};
+
+/* CTRL */
+#define TACHO_CTRL_EN          BIT(0UL)
+#define TACHO_CTRL_FILTEREN    BIT(1UL)
+#define TACHO_CTRL_SELEDGE_Pos (2UL)
+#define TACHO_CTRL_SELEDGE_Msk GENMASK(3, TACHO_CTRL_SELEDGE_Pos)
+#define TACHO_CTRL_READMODE    BIT(4UL)
+#define TACHO_CTRL_CNT_Pos     (16UL)
+#define TACHO_CTRL_CNT_Msk     GENMASK(31, TACHO_CTRL_CNT_Pos)
+/* STS */
+#define TACHO_STS_LIMIT        BIT(0UL)
+#define TACHO_STS_PIN          BIT(1UL)
+#define TACHO_STS_CHG          BIT(2UL)
+#define TACHO_STS_CNTRDY       BIT(3UL)
+/* LIMITH */
+#define TACHO_LIMITH_VAL_Pos   (0UL)
+#define TACHO_LIMITH_VAL_Msk   GENMASK(15, TACHO_LIMITH_VAL_Pos)
+/* LIMITL */
+#define TACHO_LIMITL_VAL_Pos   (0UL)
+#define TACHO_LIMITL_VAL_Msk   GENMASK(15, TACHO_LIMITL_VAL_Pos)
+/* INTEN */
+#define TACHO_INTEN_LIMITEN    BIT(0UL)
+#define TACHO_INTEN_CNTRDYEN   BIT(1UL)
+#define TACHO_INTEN_CHGEN      BIT(2UL)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_TACHO_H */
diff --git a/soc/realtek/ec/rts5912/reg/reg_wdt.h b/soc/realtek/ec/rts5912/reg/reg_wdt.h
new file mode 100644
index 0000000000000..2f3fd5db6f1e8
--- /dev/null
+++ b/soc/realtek/ec/rts5912/reg/reg_wdt.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025 Realtek, SIBG-SD7
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_REALTEK_RTS5912_REG_WDT_H
+#define ZEPHYR_SOC_REALTEK_RTS5912_REG_WDT_H
+
+/**
+ * @brief WDT Controller (WDT)
+ */
+
+typedef struct {
+	volatile uint32_t CTRL;
+	const volatile uint32_t STS;
+	volatile uint32_t CNT;
+	volatile uint32_t DIV;
+	volatile uint32_t INTEN;
+} WDT_Type;
+
+/* CTRL */
+#define WDT_CTRL_EN         BIT(0)
+#define WDT_CTRL_RSTEN      BIT(1)
+#define WDT_CTRL_RELOAD     BIT(2)
+#define WDT_CTRL_CLRRSTFLAG BIT(3)
+/* STS */
+#define WDT_STS_RSTFLAG     BIT(0)
+/* INTEN */
+#define WDT_INTEN_WDTINTEN  BIT(0)
+
+#endif /* ZEPHYR_SOC_REALTEK_RTS5912_REG_WDT_H */
diff --git a/soc/realtek/ec/rts5912/soc.c b/soc/realtek/ec/rts5912/soc.c
index ce1e254e0517d..e08495e22a2f6 100644
--- a/soc/realtek/ec/rts5912/soc.c
+++ b/soc/realtek/ec/rts5912/soc.c
@@ -28,6 +28,10 @@ bool z_arm_on_enter_cpu_idle(void)
  */
 void soc_early_init_hook(void)
 {
+	if (!IS_ENABLED(CONFIG_RTS5912_DEBUG_SWJ)) {
+		return;
+	}
+
 	int ret;
 
 	/* Apply device related preinit configuration */
diff --git a/soc/renesas/ra/common_fsp/pinctrl_soc.h b/soc/renesas/ra/common_fsp/pinctrl_soc.h
index dc08dc3db10f5..ff345032f8030 100644
--- a/soc/renesas/ra/common_fsp/pinctrl_soc.h
+++ b/soc/renesas/ra/common_fsp/pinctrl_soc.h
@@ -28,8 +28,6 @@ struct ra_pinctrl_soc_pin {
 
 typedef struct ra_pinctrl_soc_pin pinctrl_soc_pin_t;
 
-int ra_pinctrl_query_config(uint32_t port, uint32_t pin, pinctrl_soc_pin_t *pincfg);
-
 /**
  * @brief Utility macro to initialize each pin.
  *
diff --git a/soc/renesas/ra/ra2a1/Kconfig.defconfig b/soc/renesas/ra/ra2a1/Kconfig.defconfig
index 7176e95746acb..e0ae0c6bd23dc 100644
--- a/soc/renesas/ra/ra2a1/Kconfig.defconfig
+++ b/soc/renesas/ra/ra2a1/Kconfig.defconfig
@@ -6,4 +6,15 @@ if SOC_SERIES_RA2A1
 config NUM_IRQS
 	default 32
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 endif # SOC_SERIES_RA2A1
diff --git a/soc/renesas/ra/ra2a1/sections.ld b/soc/renesas/ra/ra2a1/sections.ld
index e3034adb244ea..9338be067c817 100644
--- a/soc/renesas/ra/ra2a1/sections.ld
+++ b/soc/renesas/ra/ra2a1/sections.ld
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(id_code), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
 
 SECTION_PROLOGUE(.id_code,,)
 {
@@ -13,7 +13,7 @@ SECTION_PROLOGUE(.id_code,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ofs), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
 
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
@@ -28,7 +28,7 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_sas), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
 
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
@@ -39,7 +39,7 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ns), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ns))
 
 SECTION_PROLOGUE(.option_setting_ns,,)
 {
@@ -70,7 +70,7 @@ SECTION_PROLOGUE(.option_setting_ns,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_s), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
 
 SECTION_PROLOGUE(.option_setting_s,,)
 {
diff --git a/soc/renesas/ra/ra2a1/soc.c b/soc/renesas/ra/ra2a1/soc.c
index 76fc4803360bd..5585eba6a6d71 100644
--- a/soc/renesas/ra/ra2a1/soc.c
+++ b/soc/renesas/ra/ra2a1/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -35,4 +40,12 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 	bsp_clock_init();
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra2l1/CMakeLists.txt b/soc/renesas/ra/ra2l1/CMakeLists.txt
new file mode 100644
index 0000000000000..240342ab88d24
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (c) 2022-2024 MUNIC SA
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_include_directories(.)
+
+zephyr_sources(
+  soc.c
+)
+
+zephyr_linker_sources(ROM_START opt_set_mem.ld)
+
+zephyr_linker_sources(SECTIONS sections.ld)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/ra/ra2l1/Kconfig b/soc/renesas/ra/ra2l1/Kconfig
new file mode 100644
index 0000000000000..e3a0ab7ceabe0
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/Kconfig
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 MUNIC SA
+# Copyright (c) 2024 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RA2L1
+	select ARM
+	select CPU_CORTEX_M23
+	select CPU_HAS_ARM_MPU
+	select HAS_RENESAS_RA_FSP
+	select CPU_CORTEX_M_HAS_VTOR
+	select CPU_CORTEX_M_HAS_SYSTICK
+	select CLOCK_CONTROL_RENESAS_RA_CGC if CLOCK_CONTROL
+	select HAS_SWO
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/renesas/ra/ra2l1/Kconfig.defconfig b/soc/renesas/ra/ra2l1/Kconfig.defconfig
new file mode 100644
index 0000000000000..ccfd393a9f5ac
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/Kconfig.defconfig
@@ -0,0 +1,20 @@
+# Copyright (c) 2024 MUNIC SA
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RA2L1
+
+config NUM_IRQS
+	default 32
+
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
+endif # SOC_SERIES_RA2L1
diff --git a/soc/renesas/ra/ra2l1/Kconfig.soc b/soc/renesas/ra/ra2l1/Kconfig.soc
new file mode 100644
index 0000000000000..5a4fdb1cfd7a3
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/Kconfig.soc
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 MUNIC SA
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RA2L1
+	bool
+	select SOC_FAMILY_RENESAS_RA
+
+config SOC_R7FA2L1A9XXFP
+	bool
+	select SOC_SERIES_RA2L1
+
+config SOC_R7FA2L1ABXXFP
+	bool
+	select SOC_SERIES_RA2L1
+
+config SOC_SERIES
+	default "ra2l1" if SOC_SERIES_RA2L1
+
+config SOC
+	default "r7fa2l1a9xxfp" if SOC_R7FA2L1A9XXFP
+	default "r7fa2l1abxxfp" if SOC_R7FA2L1ABXXFP
diff --git a/soc/renesas/ra/ra2l1/opt_set_mem.ld b/soc/renesas/ra/ra2l1/opt_set_mem.ld
new file mode 100644
index 0000000000000..07aef9e92d838
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/opt_set_mem.ld
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* ROM Registers start at address 0x00000400 */
+. = 0x400;
+KEEP(*(.rom_registers*))
+/* Reserving 0x100 bytes of space for ROM registers. */
+. = 0x500;
diff --git a/soc/renesas/ra/ra2l1/sections.ld b/soc/renesas/ra/ra2l1/sections.ld
new file mode 100644
index 0000000000000..5e7aad11ed7c3
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/sections.ld
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
+{
+	/* If DTC is used, put the DTC vector table at the start of SRAM.
+	   This avoids memory holes due to 1K alignment required by it. */
+	*(.fsp_dtc_vector_table)
+} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ofs), okay)
+
+SECTION_PROLOGUE(.option_setting_ofs,,)
+{
+	__OPTION_SETTING_OFS_Start = .;
+	KEEP(*(.option_setting_ofs0))
+	. = __OPTION_SETTING_OFS_Start + 0x04;
+	KEEP(*(.option_setting_ofs2))
+	. = __OPTION_SETTING_OFS_Start + 0x10;
+	KEEP(*(.option_setting_dualsel))
+	__OPTION_SETTING_OFS_End = .;
+} GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
+
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_sas), okay)
+
+SECTION_PROLOGUE(.option_setting_sas,,)
+{
+	__OPTION_SETTING_SAS_Start = .;
+	KEEP(*(.option_setting_sas))
+	__OPTION_SETTING_SAS_End = .;
+} GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
+
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ns), okay)
+
+SECTION_PROLOGUE(.option_setting_ns,,)
+{
+	__OPTION_SETTING_NS_Start = .;
+	KEEP(*(.option_setting_ofs1))
+        . = __OPTION_SETTING_NS_Start + 0x04;
+	KEEP(*(.option_setting_ofs3))
+        . = __OPTION_SETTING_NS_Start + 0x10;
+	KEEP(*(.option_setting_banksel))
+        . = __OPTION_SETTING_NS_Start + 0x40;
+	KEEP(*(.option_setting_bps0))
+        . = __OPTION_SETTING_NS_Start + 0x44;
+	KEEP(*(.option_setting_bps1))
+        . = __OPTION_SETTING_NS_Start + 0x48;
+	KEEP(*(.option_setting_bps2))
+        . = __OPTION_SETTING_NS_Start + 0x4C;
+	KEEP(*(.option_setting_bps3))
+        . = __OPTION_SETTING_NS_Start + 0x60;
+	KEEP(*(.option_setting_pbps0))
+        . = __OPTION_SETTING_NS_Start + 0x64;
+	KEEP(*(.option_setting_pbps1))
+        . = __OPTION_SETTING_NS_Start + 0x68;
+	KEEP(*(.option_setting_pbps2))
+        . = __OPTION_SETTING_NS_Start + 0x6C;
+	KEEP(*(.option_setting_pbps3))
+	__OPTION_SETTING_NS_End = .;
+} GROUP_LINK_IN(OPTION_SETTING) = 0xFF
+
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_s), okay)
+
+SECTION_PROLOGUE(.option_setting_s,,)
+{
+	__OPTION_SETTING_S_Start = .;
+	KEEP(*(.option_setting_ofs1_sec))
+	. = __OPTION_SETTING_S_Start + 0x04;
+	KEEP(*(.option_setting_ofs3_sec))
+	. = __OPTION_SETTING_S_Start + 0x10;
+	KEEP(*(.option_setting_banksel_sec))
+	. = __OPTION_SETTING_S_Start + 0x40;
+	KEEP(*(.option_setting_bps_sec0))
+	. = __OPTION_SETTING_S_Start + 0x44;
+	KEEP(*(.option_setting_bps_sec1))
+	. = __OPTION_SETTING_S_Start + 0x48;
+	KEEP(*(.option_setting_bps_sec2))
+	. = __OPTION_SETTING_S_Start + 0x4C;
+	KEEP(*(.option_setting_bps_sec3))
+	. = __OPTION_SETTING_S_Start + 0x60;
+	KEEP(*(.option_setting_pbps_sec0))
+	. = __OPTION_SETTING_S_Start + 0x64;
+	KEEP(*(.option_setting_pbps_sec1))
+	. = __OPTION_SETTING_S_Start + 0x68;
+	KEEP(*(.option_setting_pbps_sec2))
+	. = __OPTION_SETTING_S_Start + 0x6C;
+	KEEP(*(.option_setting_pbps_sec3))
+	. = __OPTION_SETTING_S_Start + 0x80;
+	KEEP(*(.option_setting_ofs1_sel))
+	. = __OPTION_SETTING_S_Start + 0x84;
+	KEEP(*(.option_setting_ofs3_sel))
+	. = __OPTION_SETTING_S_Start + 0x90;
+	KEEP(*(.option_setting_banksel_sel))
+	. = __OPTION_SETTING_S_Start + 0xC0;
+	KEEP(*(.option_setting_bps_sel0))
+	. = __OPTION_SETTING_S_Start + 0xC4;
+	KEEP(*(.option_setting_bps_sel1))
+	. = __OPTION_SETTING_S_Start + 0xC8;
+	KEEP(*(.option_setting_bps_sel2))
+	. = __OPTION_SETTING_S_Start + 0xCC;
+	KEEP(*(.option_setting_bps_sel3))
+	__OPTION_SETTING_S_End = .;
+} GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(id_code), okay)
+
+SECTION_PROLOGUE(.id_code,,)
+{
+	KEEP(*(.id_code*))
+} GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra2l1/soc.c b/soc/renesas/ra/ra2l1/soc.c
new file mode 100644
index 0000000000000..82a889c994ab8
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/soc.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023-2024 MUNIC SA
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief System/hardware module for Renesas RA2L1 family processor
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <cmsis_core.h>
+#include <zephyr/arch/arm/nmi.h>
+#include <zephyr/irq.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
+
+#include "bsp_cfg.h"
+#include <bsp_api.h>
+
+uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
+
+volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
+
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
+/**
+ * @brief Perform basic hardware initialization at boot.
+ *
+ * This needs to be run from the very beginning.
+ */
+void soc_early_init_hook(void)
+{
+	SystemCoreClock = BSP_MOCO_HZ;
+	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
+}
diff --git a/soc/renesas/ra/ra2l1/soc.h b/soc/renesas/ra/ra2l1/soc.h
new file mode 100644
index 0000000000000..2fa588a6c0c3f
--- /dev/null
+++ b/soc/renesas/ra/ra2l1/soc.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021-2024 MUNIC SA
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file SoC configuration macros for the Renesas RA2L1 family MCU
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RA2L1_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RA2L1_SOC_H_
+
+#include <bsp_api.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RA2L1_SOC_H_ */
diff --git a/soc/renesas/ra/ra4e1/Kconfig b/soc/renesas/ra/ra4e1/Kconfig
index 24613396e3b06..dd5a14ef2bf43 100644
--- a/soc/renesas/ra/ra4e1/Kconfig
+++ b/soc/renesas/ra/ra4e1/Kconfig
@@ -14,3 +14,4 @@ config SOC_SERIES_RA4E1
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra4e1/sections.ld b/soc/renesas/ra/ra4e1/sections.ld
index 38f0a5e25f929..24f3f69d86c59 100644
--- a/soc/renesas/ra/ra4e1/sections.ld
+++ b/soc/renesas/ra/ra4e1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra4e1/soc.c b/soc/renesas/ra/ra4e1/soc.c
index a14c81ddb4ce4..c243bb776b37c 100644
--- a/soc/renesas/ra/ra4e1/soc.c
+++ b/soc/renesas/ra/ra4e1/soc.c
@@ -26,6 +26,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -59,4 +64,12 @@ void soc_early_init_hook(void)
 
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra4e2/CMakeLists.txt b/soc/renesas/ra/ra4e2/CMakeLists.txt
index 1c7457569ef3e..2020d20561f95 100644
--- a/soc/renesas/ra/ra4e2/CMakeLists.txt
+++ b/soc/renesas/ra/ra4e2/CMakeLists.txt
@@ -7,6 +7,16 @@ zephyr_sources(
   soc.c
 )
 
-zephyr_linker_sources(SECTIONS sections.ld)
+if(CONFIG_CMAKE_LINKER_GENERATOR)
+  zephyr_linker_section(NAME .fsp_dtc_vector_table GROUP RAM)
+  zephyr_linker_section(NAME .option_setting_ofs0 GROUP OPTION_SETTING_OFS ADDRESS 0x0100a100)
+  zephyr_linker_section(NAME .option_setting_sas GROUP OPTION_SETTING_SAS ADDRESS 0x0100a134)
+  zephyr_linker_section(NAME .option_setting_ofs1_sec GROUP OPTION_SETTING_S ADDRESS 0x0100a200)
+  zephyr_linker_section(NAME .option_setting_bps_sec0 GROUP OPTION_SETTING_S ADDRESS 0x0100a240)
+  zephyr_linker_section(NAME .option_setting_pbps_sec0 GROUP OPTION_SETTING_S ADDRESS 0x0100a260)
+  zephyr_linker_section(NAME .id_code GROUP ID_CODE)
+else()
+  zephyr_linker_sources_ifdef(CONFIG_LD_LINKER_TEMPLATE SECTIONS sections.ld)
+endif()
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/ra/ra4e2/Kconfig.defconfig b/soc/renesas/ra/ra4e2/Kconfig.defconfig
index f484852e0de22..ff781e3becb39 100644
--- a/soc/renesas/ra/ra4e2/Kconfig.defconfig
+++ b/soc/renesas/ra/ra4e2/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA4E2
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra4e2/sections.ld b/soc/renesas/ra/ra4e2/sections.ld
index 8999a6524ed40..78c380e9fa183 100644
--- a/soc/renesas/ra/ra4e2/sections.ld
+++ b/soc/renesas/ra/ra4e2/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -70,7 +80,13 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra4e2/soc.c b/soc/renesas/ra/ra4e2/soc.c
index 6d11bae820898..dbac92defa91c 100644
--- a/soc/renesas/ra/ra4e2/soc.c
+++ b/soc/renesas/ra/ra4e2/soc.c
@@ -26,6 +26,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -59,4 +64,12 @@ void soc_early_init_hook(void)
 
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra4l1/CMakeLists.txt b/soc/renesas/ra/ra4l1/CMakeLists.txt
new file mode 100644
index 0000000000000..e6758812e492e
--- /dev/null
+++ b/soc/renesas/ra/ra4l1/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_include_directories(.)
+
+zephyr_sources(
+  soc.c
+)
+
+zephyr_linker_sources(SECTIONS sections.ld)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/ra/ra4l1/Kconfig b/soc/renesas/ra/ra4l1/Kconfig
new file mode 100644
index 0000000000000..314e037d34e7b
--- /dev/null
+++ b/soc/renesas/ra/ra4l1/Kconfig
@@ -0,0 +1,16 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RA4L1
+	select ARM
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select CPU_CORTEX_M_HAS_DWT
+	select CPU_HAS_FPU
+	select FPU
+	select ARMV8_M_DSP
+	select HAS_SWO
+	select HAS_RENESAS_RA_FSP
+	select CLOCK_CONTROL_RENESAS_RA_CGC if CLOCK_CONTROL
+	select XIP
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/renesas/ra/ra4l1/Kconfig.defconfig b/soc/renesas/ra/ra4l1/Kconfig.defconfig
new file mode 100644
index 0000000000000..afa4ac00fd333
--- /dev/null
+++ b/soc/renesas/ra/ra4l1/Kconfig.defconfig
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RA4L1
+
+config NUM_IRQS
+	default 64
+
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
+endif # SOC_SERIES_RA4L1
diff --git a/soc/renesas/ra/ra4l1/Kconfig.soc b/soc/renesas/ra/ra4l1/Kconfig.soc
new file mode 100644
index 0000000000000..b7a8acf6714ac
--- /dev/null
+++ b/soc/renesas/ra/ra4l1/Kconfig.soc
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RA4L1
+	bool
+	select SOC_FAMILY_RENESAS_RA
+	help
+	  Renesas RA4L1 series
+
+config SOC_R7FA4L1BD4CFP
+	bool
+	select SOC_SERIES_RA4L1
+	help
+	  R7FA4L1BD4CFP
+
+config SOC_SERIES
+	default "ra4l1" if SOC_SERIES_RA4L1
+
+config SOC
+	default "r7fa4l1bd4cfp" if SOC_R7FA4L1BD4CFP
diff --git a/soc/renesas/ra/ra4l1/sections.ld b/soc/renesas/ra/ra4l1/sections.ld
new file mode 100644
index 0000000000000..d9eb2cd4a9a34
--- /dev/null
+++ b/soc/renesas/ra/ra4l1/sections.ld
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
+{
+	/* If DTC is used, put the DTC vector table at the start of SRAM.
+		This avoids memory holes due to 1K alignment required by it. */
+	*(.fsp_dtc_vector_table)
+} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ofs), okay)
+SECTION_PROLOGUE(.option_setting_ofs,,)
+{
+	__OPTION_SETTING_OFS_Start = .;
+	KEEP(*(.option_setting_ofs0))
+	. = __OPTION_SETTING_OFS_Start + 0x04;
+	KEEP(*(.option_setting_ofs2))
+	. = __OPTION_SETTING_OFS_Start + 0x10;
+	KEEP(*(.option_setting_dualsel))
+	__OPTION_SETTING_OFS_End = .;
+} GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_sas), okay)
+SECTION_PROLOGUE(.option_setting_sas,,)
+{
+	__OPTION_SETTING_SAS_Start = .;
+	KEEP(*(.option_setting_sas))
+	__OPTION_SETTING_SAS_End = .;
+} GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_s), okay)
+SECTION_PROLOGUE(.option_setting_s,,)
+{
+	__OPTION_SETTING_S_Start = .;
+	KEEP(*(.option_setting_ofs1_sec))
+	. = __OPTION_SETTING_S_Start + 0x04;
+	KEEP(*(.option_setting_ofs3_sec))
+	. = __OPTION_SETTING_S_Start + 0x10;
+	KEEP(*(.option_setting_banksel_sec))
+	. = __OPTION_SETTING_S_Start + 0x40;
+	KEEP(*(.option_setting_bps_sec0))
+	. = __OPTION_SETTING_S_Start + 0x44;
+	KEEP(*(.option_setting_bps_sec1))
+	. = __OPTION_SETTING_S_Start + 0x48;
+	KEEP(*(.option_setting_bps_sec2))
+	. = __OPTION_SETTING_S_Start + 0x4C;
+	KEEP(*(.option_setting_bps_sec3))
+	. = __OPTION_SETTING_S_Start + 0x60;
+	KEEP(*(.option_setting_pbps_sec0))
+	. = __OPTION_SETTING_S_Start + 0x64;
+	KEEP(*(.option_setting_pbps_sec1))
+	. = __OPTION_SETTING_S_Start + 0x68;
+	KEEP(*(.option_setting_pbps_sec2))
+	. = __OPTION_SETTING_S_Start + 0x6C;
+	KEEP(*(.option_setting_pbps_sec3))
+	. = __OPTION_SETTING_S_Start + 0x80;
+	KEEP(*(.option_setting_ofs1_sel))
+	. = __OPTION_SETTING_S_Start + 0x84;
+	KEEP(*(.option_setting_ofs3_sel))
+	. = __OPTION_SETTING_S_Start + 0x90;
+	KEEP(*(.option_setting_banksel_sel))
+	. = __OPTION_SETTING_S_Start + 0xC0;
+	KEEP(*(.option_setting_bps_sel0))
+	. = __OPTION_SETTING_S_Start + 0xC4;
+	KEEP(*(.option_setting_bps_sel1))
+	. = __OPTION_SETTING_S_Start + 0xC8;
+	KEEP(*(.option_setting_bps_sel2))
+	. = __OPTION_SETTING_S_Start + 0xCC;
+	KEEP(*(.option_setting_bps_sel3))
+	__OPTION_SETTING_S_End = .;
+} GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+#endif
diff --git a/soc/renesas/ra/ra4l1/soc.c b/soc/renesas/ra/ra4l1/soc.c
new file mode 100644
index 0000000000000..b756cdd319c53
--- /dev/null
+++ b/soc/renesas/ra/ra4l1/soc.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief System/hardware module for Renesas RA4L1 family processor
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <cmsis_core.h>
+#include <zephyr/arch/arm/nmi.h>
+#include <zephyr/irq.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
+
+#include "bsp_cfg.h"
+#include "bsp_api.h"
+
+uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
+
+volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
+
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
+/**
+ * @brief Perform basic hardware initialization at boot.
+ *
+ * This needs to be run from the very beginning.
+ */
+void soc_early_init_hook(void)
+{
+	extern volatile uint16_t g_protect_counters[];
+
+	for (uint32_t i = 0; i < 4; i++) {
+		g_protect_counters[i] = 0;
+	}
+
+#if FSP_PRIV_TZ_USE_SECURE_REGS
+	/* Disable protection using PRCR register. */
+	R_BSP_RegisterProtectDisable(BSP_REG_PROTECT_SAR);
+
+	/* Initialize peripherals to secure mode for flat projects */
+	R_PSCU->PSARB = 0;
+	R_PSCU->PSARC = 0;
+	R_PSCU->PSARD = 0;
+	R_PSCU->PSARE = 0;
+
+	R_CPSCU->ICUSARG = 0;
+	R_CPSCU->ICUSARH = 0;
+	R_CPSCU->ICUSARI = 0;
+
+	/* Enable protection using PRCR register. */
+	R_BSP_RegisterProtectEnable(BSP_REG_PROTECT_SAR);
+#endif
+
+	SystemCoreClock = BSP_MOCO_HZ;
+	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
+}
diff --git a/soc/renesas/ra/ra4l1/soc.h b/soc/renesas/ra/ra4l1/soc.h
new file mode 100644
index 0000000000000..cf99273edd374
--- /dev/null
+++ b/soc/renesas/ra/ra4l1/soc.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file SoC configuration macros for the Renesas RA4L1 family MCU
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RA4L1_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RA4L1_SOC_H_
+
+#include <bsp_api.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RA4L1_SOC_H_ */
diff --git a/soc/renesas/ra/ra4m1/Kconfig b/soc/renesas/ra/ra4m1/Kconfig
index bcc26d4d04750..f75e56ae2063f 100644
--- a/soc/renesas/ra/ra4m1/Kconfig
+++ b/soc/renesas/ra/ra4m1/Kconfig
@@ -13,7 +13,7 @@ config SOC_SERIES_RA4M1
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
-	select DYNAMIC_INTERRUPTS if SOC_R7FA4M1AB3CFM
+	select GPIO_RA_HAS_VBTICTLR
 
 if SOC_SERIES_RA4M1
 
diff --git a/soc/renesas/ra/ra4m1/Kconfig.soc b/soc/renesas/ra/ra4m1/Kconfig.soc
index dbe0c57fa8ba6..86c3a5d6399e3 100644
--- a/soc/renesas/ra/ra4m1/Kconfig.soc
+++ b/soc/renesas/ra/ra4m1/Kconfig.soc
@@ -19,9 +19,16 @@ config SOC_R7FA4M1AB3CFP
 	help
 	  R7FA4M1AB3CFP
 
+config SOC_R7FA4M1AB3CNE
+	bool
+	select SOC_SERIES_RA4M1
+	help
+	  R7FA4M1AB3CNE
+
 config SOC_SERIES
 	default "ra4m1" if SOC_SERIES_RA4M1
 
 config SOC
 	default "r7fa4m1ab3cfm" if SOC_R7FA4M1AB3CFM
 	default "r7fa4m1ab3cfp" if SOC_R7FA4M1AB3CFP
+	default "r7fa4m1ab3cne" if SOC_R7FA4M1AB3CNE
diff --git a/soc/renesas/ra/ra4m1/sections.ld b/soc/renesas/ra/ra4m1/sections.ld
index e3034adb244ea..9338be067c817 100644
--- a/soc/renesas/ra/ra4m1/sections.ld
+++ b/soc/renesas/ra/ra4m1/sections.ld
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(id_code), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
 
 SECTION_PROLOGUE(.id_code,,)
 {
@@ -13,7 +13,7 @@ SECTION_PROLOGUE(.id_code,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ofs), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
 
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
@@ -28,7 +28,7 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_sas), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
 
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
@@ -39,7 +39,7 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ns), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ns))
 
 SECTION_PROLOGUE(.option_setting_ns,,)
 {
@@ -70,7 +70,7 @@ SECTION_PROLOGUE(.option_setting_ns,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_s), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
 
 SECTION_PROLOGUE(.option_setting_s,,)
 {
diff --git a/soc/renesas/ra/ra4m1/soc.c b/soc/renesas/ra/ra4m1/soc.c
index 06202352c518d..dcdbda4872644 100644
--- a/soc/renesas/ra/ra4m1/soc.c
+++ b/soc/renesas/ra/ra4m1/soc.c
@@ -26,13 +26,13 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HOCO_FREQ DT_PROP(DT_PATH(clocks, clock_hoco), clock_frequency)
 
 #if HOCO_FREQ == MHZ(24)
-#define OFS1_HOCO_FREQ		0
+#define OFS1_HOCO_FREQ 0
 #elif HOCO_FREQ == MHZ(32)
-#define OFS1_HOCO_FREQ		2
+#define OFS1_HOCO_FREQ 2
 #elif HOCO_FREQ == MHZ(48)
-#define OFS1_HOCO_FREQ		4
+#define OFS1_HOCO_FREQ 4
 #elif HOCO_FREQ == MHZ(64)
-#define OFS1_HOCO_FREQ		5
+#define OFS1_HOCO_FREQ 5
 #else
 #error "Unsupported HOCO frequency"
 #endif
@@ -93,38 +93,47 @@ struct opt_set_mem {
 };
 
 #ifdef CONFIG_SOC_OPTION_SETTING_MEMORY
-const struct opt_set_mem ops __attribute__((section(".rom_registers"))) = {
-	.ofs0 = {
-			/*
-			 * Initial settings for watchdog timers. Set all fields to 1,
-			 * disabling watchdog functionality as config options have not
-			 * yet been implemented.
-			 */
-			.RSVD1 = 0x1,       .IWDTSTRT = 0x1, /* Disable independent watchdog timer
-							      */
-			.IWDTTOPS = 0x3,    .IWDTCKS = 0xf,  .IWDTRPES = 0x3,   .IWDTRPSS = 0x3,
-			.IWDTRSTIRQS = 0x1, .RSVD2 = 0x1,    .IWDTSTPCTL = 0x1, .RSVD3 = 0x3,
-			.WDTSTRT = 0x1, /* Stop watchdog timer following reset */
-			.WDTTOPS = 0x3,     .WDTCKS = 0xf,   .WDTRPES = 0x3,    .WDTRPSS = 0x3,
-			.WDTRSTIRQS = 0x1,  .RSVD4 = 0x1,    .WDTSTPCTL = 0x1,  .RSVD5 = 0x1,
-		},
-	.ofs1 = {
-			.RSVD1 = 0x3,
-			.LVDAS = 0x1, /* Disable voltage monitor 0 following reset */
-			.VDSEL1 = 0x3,
-			.RSVD2 = 0x3,
-			.HOCOEN = !DT_NODE_HAS_STATUS(DT_PATH(clocks, clock_hoco), okay),
-			.RSVD3 = 0x7,
-			.HOCOFRQ1 = OFS1_HOCO_FREQ,
-			.RSVD4 = 0x1ffff,
-		},
-	.mpu = {
-		/*
-		 * Initial settings for MPU. Set all areas to maximum values
-		 * essentially disabling MPU functionality as config options
-		 * have not yet been implemented.
-		 */
-		.SECMPUPCSO = 0x00fffffc,
+Z_GENERIC_SECTION(".rom_registers")
+const struct opt_set_mem ops = {
+	/*
+	 * Initial settings for watchdog timers. Set all fields to 1,
+	 * disabling watchdog functionality as config options have not
+	 * yet been implemented.
+	 */
+	.ofs0 = {.RSVD1 = 0x1,
+		 .IWDTSTRT = 0x1, /* Disable independent watchdog timer */
+		 .IWDTTOPS = 0x3,
+		 .IWDTCKS = 0xf,
+		 .IWDTRPES = 0x3,
+		 .IWDTRPSS = 0x3,
+		 .IWDTRSTIRQS = 0x1,
+		 .RSVD2 = 0x1,
+		 .IWDTSTPCTL = 0x1,
+		 .RSVD3 = 0x3,
+		 /* Stop watchdog timer following reset */
+		 .WDTSTRT = !IS_ENABLED(CONFIG_WDT_RENESAS_RA_START_IN_BOOT),
+		 .WDTTOPS = 0x3,
+		 .WDTCKS = 0xf,
+		 .WDTRPES = 0x3,
+		 .WDTRPSS = 0x3,
+		 .WDTRSTIRQS = 0x1,
+		 .RSVD4 = 0x1,
+		 .WDTSTPCTL = 0x1,
+		 .RSVD5 = 0x1},
+	.ofs1 = {.RSVD1 = 0x3,
+		 .LVDAS = 0x1, /* Disable voltage monitor 0 following reset */
+		 .VDSEL1 = 0x3,
+		 .RSVD2 = 0x3,
+		 .HOCOEN = !DT_NODE_HAS_STATUS(DT_PATH(clocks, clock_hoco), okay),
+		 .RSVD3 = 0x7,
+		 .HOCOFRQ1 = OFS1_HOCO_FREQ,
+		 .RSVD4 = 0x1ffff},
+	/*
+	 * Initial settings for MPU. Set all areas to maximum values
+	 * essentially disabling MPU functionality as config options
+	 * have not yet been implemented.
+	 */
+	.mpu = {.SECMPUPCSO = 0x00fffffc,
 		.SECMPUPCEO = 0x00ffffff,
 		.SECMPUPCS1 = 0x00fffffc,
 		.SECMPUPCE1 = 0x00ffffff,
@@ -136,14 +145,18 @@ const struct opt_set_mem ops __attribute__((section(".rom_registers"))) = {
 		.SECMPUE2 = 0x407fffff,
 		.SECMPUS3 = 0x40dffffc,
 		.SECMPUE3 = 0x40dfffff,
-		.SECMPUAC = 0xffffffff,
-	}};
+		.SECMPUAC = 0xffffffff}};
 #endif
 
 uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -158,5 +171,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra4m2/Kconfig b/soc/renesas/ra/ra4m2/Kconfig
index a4b6d2c7c50fe..5058fde961655 100644
--- a/soc/renesas/ra/ra4m2/Kconfig
+++ b/soc/renesas/ra/ra4m2/Kconfig
@@ -14,3 +14,4 @@ config SOC_SERIES_RA4M2
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra4m2/Kconfig.defconfig b/soc/renesas/ra/ra4m2/Kconfig.defconfig
index 3c6f986e5ffa6..87ce2fc6817cd 100644
--- a/soc/renesas/ra/ra4m2/Kconfig.defconfig
+++ b/soc/renesas/ra/ra4m2/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA4M2
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra4m2/sections.ld b/soc/renesas/ra/ra4m2/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra4m2/sections.ld
+++ b/soc/renesas/ra/ra4m2/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra4m2/soc.c b/soc/renesas/ra/ra4m2/soc.c
index c3c21184aa430..7c95131bebe14 100644
--- a/soc/renesas/ra/ra4m2/soc.c
+++ b/soc/renesas/ra/ra4m2/soc.c
@@ -26,6 +26,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -59,4 +64,12 @@ void soc_early_init_hook(void)
 
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra4m3/Kconfig b/soc/renesas/ra/ra4m3/Kconfig
index 0898c3796bce1..dfa3719068650 100644
--- a/soc/renesas/ra/ra4m3/Kconfig
+++ b/soc/renesas/ra/ra4m3/Kconfig
@@ -14,3 +14,4 @@ config SOC_SERIES_RA4M3
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra4m3/Kconfig.defconfig b/soc/renesas/ra/ra4m3/Kconfig.defconfig
index 717b6bce4322c..af4c164af81fd 100644
--- a/soc/renesas/ra/ra4m3/Kconfig.defconfig
+++ b/soc/renesas/ra/ra4m3/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA4M3
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra4m3/sections.ld b/soc/renesas/ra/ra4m3/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra4m3/sections.ld
+++ b/soc/renesas/ra/ra4m3/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra4m3/soc.c b/soc/renesas/ra/ra4m3/soc.c
index 10658184372b7..d751f7e6829b8 100644
--- a/soc/renesas/ra/ra4m3/soc.c
+++ b/soc/renesas/ra/ra4m3/soc.c
@@ -26,6 +26,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -59,4 +64,12 @@ void soc_early_init_hook(void)
 
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra4w1/Kconfig b/soc/renesas/ra/ra4w1/Kconfig
index c9d1fbb37033e..34f44bf6d0742 100644
--- a/soc/renesas/ra/ra4w1/Kconfig
+++ b/soc/renesas/ra/ra4w1/Kconfig
@@ -13,3 +13,4 @@ config SOC_SERIES_RA4W1
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra4w1/Kconfig.defconfig b/soc/renesas/ra/ra4w1/Kconfig.defconfig
index 56c1866d0e96b..3e3cbb9747c44 100644
--- a/soc/renesas/ra/ra4w1/Kconfig.defconfig
+++ b/soc/renesas/ra/ra4w1/Kconfig.defconfig
@@ -6,4 +6,15 @@ if SOC_SERIES_RA4W1
 config NUM_IRQS
 	default 32
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 endif # SOC_SERIES_RA4W1
diff --git a/soc/renesas/ra/ra4w1/sections.ld b/soc/renesas/ra/ra4w1/sections.ld
index b850a64f64374..f86dac778f7d2 100644
--- a/soc/renesas/ra/ra4w1/sections.ld
+++ b/soc/renesas/ra/ra4w1/sections.ld
@@ -19,7 +19,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra4w1/soc.c b/soc/renesas/ra/ra4w1/soc.c
index 6d84c068f7d51..c62592e320c29 100644
--- a/soc/renesas/ra/ra4w1/soc.c
+++ b/soc/renesas/ra/ra4w1/soc.c
@@ -26,6 +26,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -35,4 +40,12 @@ void soc_early_init_hook(void)
 {
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra6e1/Kconfig b/soc/renesas/ra/ra6e1/Kconfig
index accd57e26a069..097baa6241484 100644
--- a/soc/renesas/ra/ra6e1/Kconfig
+++ b/soc/renesas/ra/ra6e1/Kconfig
@@ -14,3 +14,4 @@ config SOC_SERIES_RA6E1
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra6e1/Kconfig.defconfig b/soc/renesas/ra/ra6e1/Kconfig.defconfig
index 5920c21c75962..d8478071e7a60 100644
--- a/soc/renesas/ra/ra6e1/Kconfig.defconfig
+++ b/soc/renesas/ra/ra6e1/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA6E1
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra6e1/sections.ld b/soc/renesas/ra/ra6e1/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra6e1/sections.ld
+++ b/soc/renesas/ra/ra6e1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra6e1/soc.c b/soc/renesas/ra/ra6e1/soc.c
index ca37db8e2748d..7b4331e69264f 100644
--- a/soc/renesas/ra/ra6e1/soc.c
+++ b/soc/renesas/ra/ra6e1/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -63,5 +68,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra6e2/Kconfig.defconfig b/soc/renesas/ra/ra6e2/Kconfig.defconfig
index d19b73b87a00c..9d56855abe191 100644
--- a/soc/renesas/ra/ra6e2/Kconfig.defconfig
+++ b/soc/renesas/ra/ra6e2/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA6E2
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra6e2/sections.ld b/soc/renesas/ra/ra6e2/sections.ld
index 8999a6524ed40..78c380e9fa183 100644
--- a/soc/renesas/ra/ra6e2/sections.ld
+++ b/soc/renesas/ra/ra6e2/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -70,7 +80,13 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6e2/soc.c b/soc/renesas/ra/ra6e2/soc.c
index 2b34260479e63..0a929d7b300d5 100644
--- a/soc/renesas/ra/ra6e2/soc.c
+++ b/soc/renesas/ra/ra6e2/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -63,5 +68,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra6m1/Kconfig b/soc/renesas/ra/ra6m1/Kconfig
index 649b6702629d3..ffe573117178b 100644
--- a/soc/renesas/ra/ra6m1/Kconfig
+++ b/soc/renesas/ra/ra6m1/Kconfig
@@ -13,3 +13,4 @@ config SOC_SERIES_RA6M1
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra6m1/Kconfig.defconfig b/soc/renesas/ra/ra6m1/Kconfig.defconfig
index 520d9aac59ebc..f863f67d6f22d 100644
--- a/soc/renesas/ra/ra6m1/Kconfig.defconfig
+++ b/soc/renesas/ra/ra6m1/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA6M1
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra6m1/sections.ld b/soc/renesas/ra/ra6m1/sections.ld
index 8d31894fc387d..fb5ec4d7e24dc 100644
--- a/soc/renesas/ra/ra6m1/sections.ld
+++ b/soc/renesas/ra/ra6m1/sections.ld
@@ -11,7 +11,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6m1/soc.c b/soc/renesas/ra/ra6m1/soc.c
index c9809254ae246..1986da3ec8c4a 100644
--- a/soc/renesas/ra/ra6m1/soc.c
+++ b/soc/renesas/ra/ra6m1/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -39,5 +44,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra6m2/Kconfig b/soc/renesas/ra/ra6m2/Kconfig
index 680e649349d7a..09c6427a52ea8 100644
--- a/soc/renesas/ra/ra6m2/Kconfig
+++ b/soc/renesas/ra/ra6m2/Kconfig
@@ -13,3 +13,4 @@ config SOC_SERIES_RA6M2
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra6m2/Kconfig.defconfig b/soc/renesas/ra/ra6m2/Kconfig.defconfig
index ca2dc7346d415..7e5cd7a2eec12 100644
--- a/soc/renesas/ra/ra6m2/Kconfig.defconfig
+++ b/soc/renesas/ra/ra6m2/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA6M2
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra6m2/sections.ld b/soc/renesas/ra/ra6m2/sections.ld
index 8d31894fc387d..fb5ec4d7e24dc 100644
--- a/soc/renesas/ra/ra6m2/sections.ld
+++ b/soc/renesas/ra/ra6m2/sections.ld
@@ -11,7 +11,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6m2/soc.c b/soc/renesas/ra/ra6m2/soc.c
index f0d399463f543..90d7cd7fad1d0 100644
--- a/soc/renesas/ra/ra6m2/soc.c
+++ b/soc/renesas/ra/ra6m2/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -39,5 +44,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra6m3/Kconfig b/soc/renesas/ra/ra6m3/Kconfig
index bebd78f1babbf..3dea36935aeaf 100644
--- a/soc/renesas/ra/ra6m3/Kconfig
+++ b/soc/renesas/ra/ra6m3/Kconfig
@@ -13,3 +13,4 @@ config SOC_SERIES_RA6M3
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra6m3/Kconfig.defconfig b/soc/renesas/ra/ra6m3/Kconfig.defconfig
index 43f112acb609c..ae8951e40c5ca 100644
--- a/soc/renesas/ra/ra6m3/Kconfig.defconfig
+++ b/soc/renesas/ra/ra6m3/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA6M3
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra6m3/sections.ld b/soc/renesas/ra/ra6m3/sections.ld
index 8d31894fc387d..fb5ec4d7e24dc 100644
--- a/soc/renesas/ra/ra6m3/sections.ld
+++ b/soc/renesas/ra/ra6m3/sections.ld
@@ -11,7 +11,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6m3/soc.c b/soc/renesas/ra/ra6m3/soc.c
index 99f9a60e6ebfc..9c520b99e3a18 100644
--- a/soc/renesas/ra/ra6m3/soc.c
+++ b/soc/renesas/ra/ra6m3/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -39,5 +44,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra6m4/Kconfig b/soc/renesas/ra/ra6m4/Kconfig
index ee2acc2855fd4..dec6aba2581e9 100644
--- a/soc/renesas/ra/ra6m4/Kconfig
+++ b/soc/renesas/ra/ra6m4/Kconfig
@@ -14,3 +14,4 @@ config SOC_SERIES_RA6M4
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra6m4/Kconfig.defconfig b/soc/renesas/ra/ra6m4/Kconfig.defconfig
index 5352885ee93ba..7e6de81829e88 100644
--- a/soc/renesas/ra/ra6m4/Kconfig.defconfig
+++ b/soc/renesas/ra/ra6m4/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA6M4
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra6m4/sections.ld b/soc/renesas/ra/ra6m4/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra6m4/sections.ld
+++ b/soc/renesas/ra/ra6m4/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra6m4/soc.c b/soc/renesas/ra/ra6m4/soc.c
index f561d631b67ab..c93933f4fb8f5 100644
--- a/soc/renesas/ra/ra6m4/soc.c
+++ b/soc/renesas/ra/ra6m4/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -63,5 +68,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra6m5/Kconfig b/soc/renesas/ra/ra6m5/Kconfig
index 4a8f750eab60a..792239394c72c 100644
--- a/soc/renesas/ra/ra6m5/Kconfig
+++ b/soc/renesas/ra/ra6m5/Kconfig
@@ -14,3 +14,4 @@ config SOC_SERIES_RA6M5
 	select HAS_SWO
 	select XIP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
diff --git a/soc/renesas/ra/ra6m5/Kconfig.defconfig b/soc/renesas/ra/ra6m5/Kconfig.defconfig
index 3e473cd89320b..51c5a3c0de2f5 100644
--- a/soc/renesas/ra/ra6m5/Kconfig.defconfig
+++ b/soc/renesas/ra/ra6m5/Kconfig.defconfig
@@ -6,6 +6,17 @@ if SOC_SERIES_RA6M5
 config NUM_IRQS
 	default 96
 
+DT_ICLK_PATH := $(dt_nodelabel_path,iclk)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency)
+
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
diff --git a/soc/renesas/ra/ra6m5/sections.ld b/soc/renesas/ra/ra6m5/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra6m5/sections.ld
+++ b/soc/renesas/ra/ra6m5/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra6m5/soc.c b/soc/renesas/ra/ra6m5/soc.c
index f156a3c5fb22e..87d4b090b5cf5 100644
--- a/soc/renesas/ra/ra6m5/soc.c
+++ b/soc/renesas/ra/ra6m5/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -52,9 +57,16 @@ void soc_early_init_hook(void)
 	R_PSCU->PSARD = 0;
 	R_PSCU->PSARE = 0;
 
-	R_CPSCU->ICUSARG = 0;
-	R_CPSCU->ICUSARH = 0;
-	R_CPSCU->ICUSARI = 0;
+	/* The secure Attribute managed within the ARM CPU NVIC must match the
+	 * security attribution of IELSEn registers (Reference section 13.2.9
+	 * in the RA6M4 manual R01UH0890EJ0050).
+	 */
+	uint32_t volatile *p_icusarg = &R_CPSCU->ICUSARG;
+
+	for (int i = 0; i < BSP_ICU_VECTOR_MAX_ENTRIES / NUM_BITS(uint32_t); i++) {
+		p_icusarg[i] = 0;
+		NVIC->ITNS[i] = 0;
+	}
 
 	/* Enable protection using PRCR register. */
 	R_BSP_RegisterProtectEnable(BSP_REG_PROTECT_SAR);
@@ -63,5 +75,13 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif
+
 	irq_unlock(key);
 }
diff --git a/soc/renesas/ra/ra8d1/CMakeLists.txt b/soc/renesas/ra/ra8d1/CMakeLists.txt
index 1c7457569ef3e..d648d3689af46 100644
--- a/soc/renesas/ra/ra8d1/CMakeLists.txt
+++ b/soc/renesas/ra/ra8d1/CMakeLists.txt
@@ -7,6 +7,10 @@ zephyr_sources(
   soc.c
 )
 
+zephyr_sources_ifdef(CONFIG_PM
+  power.c
+)
+
 zephyr_linker_sources(SECTIONS sections.ld)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/ra/ra8d1/Kconfig b/soc/renesas/ra/ra8d1/Kconfig
index 968c60343c6d8..b229ca3816892 100644
--- a/soc/renesas/ra/ra8d1/Kconfig
+++ b/soc/renesas/ra/ra8d1/Kconfig
@@ -14,3 +14,5 @@ config SOC_SERIES_RA8D1
 	select CLOCK_CONTROL_RENESAS_RA_CGC if CLOCK_CONTROL
 	select HAS_RENESAS_RA_FSP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
+	select HAS_PM
diff --git a/soc/renesas/ra/ra8d1/Kconfig.defconfig b/soc/renesas/ra/ra8d1/Kconfig.defconfig
index e009261b4b6c2..b74c5986b14e0 100644
--- a/soc/renesas/ra/ra8d1/Kconfig.defconfig
+++ b/soc/renesas/ra/ra8d1/Kconfig.defconfig
@@ -6,11 +6,36 @@ if SOC_SERIES_RA8D1
 config NUM_IRQS
 	default 96
 
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
 
+config DCACHE
+	default n
+
 config CACHE_MANAGEMENT
-	default y
+	default n
+
+config CORTEX_M_SYSTICK
+	default n if RENESAS_RA_ULPT_TIMER
+
+DT_ICLK_PATH := $(dt_nodelabel_path,cpuclk)
+DT_LOCO_PATH := $(dt_nodelabel_path,loco)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,$(DT_LOCO_PATH),clock-frequency) if RENESAS_RA_ULPT_TIMER
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 4096 if RENESAS_RA_ULPT_TIMER
+
+config PM_DEVICE
+	default y if PM
 
 endif # SOC_SERIES_RA8D1
diff --git a/soc/renesas/ra/ra8d1/power.c b/soc/renesas/ra/ra8d1/power.c
new file mode 100644
index 0000000000000..fe8b7c291f4dc
--- /dev/null
+++ b/soc/renesas/ra/ra8d1/power.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/init.h>
+#include <soc.h>
+#include <r_lpm.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
+
+/* Low Power Mode instance control structure */
+static lpm_instance_ctrl_t pm_state_ctrl;
+
+/* Configuration for Runtime Idle Power State */
+const lpm_cfg_t pm_state_runtime_idle_cfg = {
+	.low_power_mode = LPM_MODE_SLEEP,
+	.standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_ULP0U,
+	.output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+	.io_port_state = LPM_IO_PORT_NO_CHANGE,
+	.power_supply_state = LPM_POWER_SUPPLY_DEEP_STANDBY_MODE1,
+	.deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+	.deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+	.ram_retention_cfg.ram_retention = (uint16_t)(0x7F),
+	.ram_retention_cfg.tcm_retention = true,
+	.ram_retention_cfg.standby_ram_retention = true,
+	.ldo_standby_cfg.pll1_ldo = false,
+	.ldo_standby_cfg.pll2_ldo = false,
+	.ldo_standby_cfg.hoco_ldo = false,
+	.p_extend = NULL,
+};
+
+/* Configuration for Standby Power State */
+const lpm_cfg_t pm_state_standby_cfg = {
+	.low_power_mode = LPM_MODE_STANDBY,
+	.standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_ULP0U,
+	.output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+	.io_port_state = LPM_IO_PORT_NO_CHANGE,
+	.power_supply_state = LPM_POWER_SUPPLY_DEEP_STANDBY_MODE1,
+	.deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+	.deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+	.ram_retention_cfg.ram_retention = (uint16_t)(0x7F),
+	.ram_retention_cfg.tcm_retention = true,
+	.ram_retention_cfg.standby_ram_retention = true,
+	.ldo_standby_cfg.pll1_ldo = false,
+	.ldo_standby_cfg.pll2_ldo = false,
+	.ldo_standby_cfg.hoco_ldo = false,
+	.p_extend = NULL,
+};
+
+void pm_state_set(enum pm_state state, uint8_t substate_id)
+{
+	switch (state) {
+	case PM_STATE_RUNTIME_IDLE:
+		R_LPM_LowPowerReconfigure(&pm_state_ctrl, &pm_state_runtime_idle_cfg);
+		__disable_irq();
+		__set_BASEPRI(0);
+		__ISB();
+
+		R_LPM_LowPowerModeEnter(&pm_state_ctrl);
+		__enable_irq();
+		__ISB();
+		break;
+
+	case PM_STATE_STANDBY:
+		R_LPM_Open(&pm_state_ctrl, &pm_state_standby_cfg);
+		__disable_irq();
+		__set_BASEPRI(0);
+		__ISB();
+
+		R_LPM_LowPowerModeEnter(&pm_state_ctrl);
+		__enable_irq();
+		__ISB();
+		break;
+
+	default:
+		break;
+	}
+}
+
+void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
+{
+	switch (state) {
+	case PM_STATE_RUNTIME_IDLE:
+		__fallthrough;
+	case PM_STATE_STANDBY:
+		R_LPM_Close(&pm_state_ctrl);
+		break;
+
+	default:
+		break;
+	}
+	irq_unlock(0);
+}
diff --git a/soc/renesas/ra/ra8d1/sections.ld b/soc/renesas/ra/ra8d1/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra8d1/sections.ld
+++ b/soc/renesas/ra/ra8d1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra8d1/soc.c b/soc/renesas/ra/ra8d1/soc.c
index 685ec6b349e39..afde75b266abb 100644
--- a/soc/renesas/ra/ra8d1/soc.c
+++ b/soc/renesas/ra/ra8d1/soc.c
@@ -29,6 +29,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -39,10 +44,12 @@ void soc_early_init_hook(void)
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
 
+#ifdef CONFIG_ICACHE
 	SCB->CCR = (uint32_t)CCR_CACHE_ENABLE;
 	barrier_dsync_fence_full();
 	barrier_isync_fence_full();
-
+#endif
+#if defined(CONFIG_DCACHE) && defined(CONFIG_CACHE_MANAGEMENT)
 	/* Apply Arm Cortex-M85 errata workarounds for D-Cache
 	 * Attributing all cacheable memory as write-through set FORCEWT bit in MSCR register.
 	 * Set bit 16 in ACTLR to 1.
@@ -58,4 +65,13 @@ void soc_early_init_hook(void)
 	barrier_isync_fence_full();
 
 	sys_cache_data_enable();
+#endif
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra8m1/CMakeLists.txt b/soc/renesas/ra/ra8m1/CMakeLists.txt
index 1c7457569ef3e..d648d3689af46 100644
--- a/soc/renesas/ra/ra8m1/CMakeLists.txt
+++ b/soc/renesas/ra/ra8m1/CMakeLists.txt
@@ -7,6 +7,10 @@ zephyr_sources(
   soc.c
 )
 
+zephyr_sources_ifdef(CONFIG_PM
+  power.c
+)
+
 zephyr_linker_sources(SECTIONS sections.ld)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/ra/ra8m1/Kconfig b/soc/renesas/ra/ra8m1/Kconfig
index f1fd9d9967e6e..e7ee49781390a 100644
--- a/soc/renesas/ra/ra8m1/Kconfig
+++ b/soc/renesas/ra/ra8m1/Kconfig
@@ -14,5 +14,7 @@ config SOC_SERIES_RA8M1
 	select CLOCK_CONTROL_RENESAS_RA_CGC if CLOCK_CONTROL
 	select HAS_RENESAS_RA_FSP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
+	select HAS_PM
 	help
 	  Enable support for Renesas RA8M1 MCU series
diff --git a/soc/renesas/ra/ra8m1/Kconfig.defconfig b/soc/renesas/ra/ra8m1/Kconfig.defconfig
index d963468bb07e3..faaec2c206860 100644
--- a/soc/renesas/ra/ra8m1/Kconfig.defconfig
+++ b/soc/renesas/ra/ra8m1/Kconfig.defconfig
@@ -1,4 +1,4 @@
-# Copyright (c) 2024 Renesas Electronics Corporation
+# Copyright (c) 2024-2025 Renesas Electronics Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_RA8M1
@@ -6,8 +6,30 @@ if SOC_SERIES_RA8M1
 config NUM_IRQS
 	default 96
 
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
 
+config CORTEX_M_SYSTICK
+	default n if RENESAS_RA_ULPT_TIMER
+
+DT_ICLK_PATH := $(dt_nodelabel_path,cpuclk)
+DT_LOCO_PATH := $(dt_nodelabel_path,loco)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,$(DT_LOCO_PATH),clock-frequency) if RENESAS_RA_ULPT_TIMER
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 4096 if RENESAS_RA_ULPT_TIMER
+
+config PM_DEVICE
+	default y if PM
+
 endif # SOC_SERIES_RA8M1
diff --git a/soc/renesas/ra/ra8m1/power.c b/soc/renesas/ra/ra8m1/power.c
new file mode 100644
index 0000000000000..fe8b7c291f4dc
--- /dev/null
+++ b/soc/renesas/ra/ra8m1/power.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/init.h>
+#include <soc.h>
+#include <r_lpm.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
+
+/* Low Power Mode instance control structure */
+static lpm_instance_ctrl_t pm_state_ctrl;
+
+/* Configuration for Runtime Idle Power State */
+const lpm_cfg_t pm_state_runtime_idle_cfg = {
+	.low_power_mode = LPM_MODE_SLEEP,
+	.standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_ULP0U,
+	.output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+	.io_port_state = LPM_IO_PORT_NO_CHANGE,
+	.power_supply_state = LPM_POWER_SUPPLY_DEEP_STANDBY_MODE1,
+	.deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+	.deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+	.ram_retention_cfg.ram_retention = (uint16_t)(0x7F),
+	.ram_retention_cfg.tcm_retention = true,
+	.ram_retention_cfg.standby_ram_retention = true,
+	.ldo_standby_cfg.pll1_ldo = false,
+	.ldo_standby_cfg.pll2_ldo = false,
+	.ldo_standby_cfg.hoco_ldo = false,
+	.p_extend = NULL,
+};
+
+/* Configuration for Standby Power State */
+const lpm_cfg_t pm_state_standby_cfg = {
+	.low_power_mode = LPM_MODE_STANDBY,
+	.standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_ULP0U,
+	.output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+	.io_port_state = LPM_IO_PORT_NO_CHANGE,
+	.power_supply_state = LPM_POWER_SUPPLY_DEEP_STANDBY_MODE1,
+	.deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+	.deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+	.ram_retention_cfg.ram_retention = (uint16_t)(0x7F),
+	.ram_retention_cfg.tcm_retention = true,
+	.ram_retention_cfg.standby_ram_retention = true,
+	.ldo_standby_cfg.pll1_ldo = false,
+	.ldo_standby_cfg.pll2_ldo = false,
+	.ldo_standby_cfg.hoco_ldo = false,
+	.p_extend = NULL,
+};
+
+void pm_state_set(enum pm_state state, uint8_t substate_id)
+{
+	switch (state) {
+	case PM_STATE_RUNTIME_IDLE:
+		R_LPM_LowPowerReconfigure(&pm_state_ctrl, &pm_state_runtime_idle_cfg);
+		__disable_irq();
+		__set_BASEPRI(0);
+		__ISB();
+
+		R_LPM_LowPowerModeEnter(&pm_state_ctrl);
+		__enable_irq();
+		__ISB();
+		break;
+
+	case PM_STATE_STANDBY:
+		R_LPM_Open(&pm_state_ctrl, &pm_state_standby_cfg);
+		__disable_irq();
+		__set_BASEPRI(0);
+		__ISB();
+
+		R_LPM_LowPowerModeEnter(&pm_state_ctrl);
+		__enable_irq();
+		__ISB();
+		break;
+
+	default:
+		break;
+	}
+}
+
+void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
+{
+	switch (state) {
+	case PM_STATE_RUNTIME_IDLE:
+		__fallthrough;
+	case PM_STATE_STANDBY:
+		R_LPM_Close(&pm_state_ctrl);
+		break;
+
+	default:
+		break;
+	}
+	irq_unlock(0);
+}
diff --git a/soc/renesas/ra/ra8m1/sections.ld b/soc/renesas/ra/ra8m1/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra8m1/sections.ld
+++ b/soc/renesas/ra/ra8m1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra8m1/soc.c b/soc/renesas/ra/ra8m1/soc.c
index a0da08c86160c..d898ab3957c81 100644
--- a/soc/renesas/ra/ra8m1/soc.c
+++ b/soc/renesas/ra/ra8m1/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -34,4 +39,12 @@ void soc_early_init_hook(void)
 {
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/ra8t1/CMakeLists.txt b/soc/renesas/ra/ra8t1/CMakeLists.txt
index 1c7457569ef3e..d648d3689af46 100644
--- a/soc/renesas/ra/ra8t1/CMakeLists.txt
+++ b/soc/renesas/ra/ra8t1/CMakeLists.txt
@@ -7,6 +7,10 @@ zephyr_sources(
   soc.c
 )
 
+zephyr_sources_ifdef(CONFIG_PM
+  power.c
+)
+
 zephyr_linker_sources(SECTIONS sections.ld)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/ra/ra8t1/Kconfig b/soc/renesas/ra/ra8t1/Kconfig
index 426e72be95d11..17afc4ced6086 100644
--- a/soc/renesas/ra/ra8t1/Kconfig
+++ b/soc/renesas/ra/ra8t1/Kconfig
@@ -14,3 +14,5 @@ config SOC_SERIES_RA8T1
 	select CLOCK_CONTROL_RENESAS_RA_CGC if CLOCK_CONTROL
 	select HAS_RENESAS_RA_FSP
 	select SOC_EARLY_INIT_HOOK
+	select GPIO_RA_HAS_VBTICTLR
+	select HAS_PM
diff --git a/soc/renesas/ra/ra8t1/Kconfig.defconfig b/soc/renesas/ra/ra8t1/Kconfig.defconfig
index 3e721bd8fc3ac..60aaa70c14891 100644
--- a/soc/renesas/ra/ra8t1/Kconfig.defconfig
+++ b/soc/renesas/ra/ra8t1/Kconfig.defconfig
@@ -6,8 +6,30 @@ if SOC_SERIES_RA8T1
 config NUM_IRQS
 	default 96
 
+config BUILD_OUTPUT_HEX
+	default y
+
+config CLOCK_CONTROL
+	default y
+
 # Set to the minimal size of data which can be written.
 config FLASH_FILL_BUFFER_SIZE
 	default 128
 
+config CORTEX_M_SYSTICK
+	default n if RENESAS_RA_ULPT_TIMER
+
+DT_ICLK_PATH := $(dt_nodelabel_path,cpuclk)
+DT_LOCO_PATH := $(dt_nodelabel_path,loco)
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,$(DT_ICLK_PATH),clock-frequency) if CORTEX_M_SYSTICK
+	default $(dt_node_int_prop_int,$(DT_LOCO_PATH),clock-frequency) if RENESAS_RA_ULPT_TIMER
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 4096 if RENESAS_RA_ULPT_TIMER
+
+config PM_DEVICE
+	default y if PM
+
 endif # SOC_SERIES_RA8T1
diff --git a/soc/renesas/ra/ra8t1/power.c b/soc/renesas/ra/ra8t1/power.c
new file mode 100644
index 0000000000000..fe8b7c291f4dc
--- /dev/null
+++ b/soc/renesas/ra/ra8t1/power.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/init.h>
+#include <soc.h>
+#include <r_lpm.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
+
+/* Low Power Mode instance control structure */
+static lpm_instance_ctrl_t pm_state_ctrl;
+
+/* Configuration for Runtime Idle Power State */
+const lpm_cfg_t pm_state_runtime_idle_cfg = {
+	.low_power_mode = LPM_MODE_SLEEP,
+	.standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_ULP0U,
+	.output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+	.io_port_state = LPM_IO_PORT_NO_CHANGE,
+	.power_supply_state = LPM_POWER_SUPPLY_DEEP_STANDBY_MODE1,
+	.deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+	.deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+	.ram_retention_cfg.ram_retention = (uint16_t)(0x7F),
+	.ram_retention_cfg.tcm_retention = true,
+	.ram_retention_cfg.standby_ram_retention = true,
+	.ldo_standby_cfg.pll1_ldo = false,
+	.ldo_standby_cfg.pll2_ldo = false,
+	.ldo_standby_cfg.hoco_ldo = false,
+	.p_extend = NULL,
+};
+
+/* Configuration for Standby Power State */
+const lpm_cfg_t pm_state_standby_cfg = {
+	.low_power_mode = LPM_MODE_STANDBY,
+	.standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_ULP0U,
+	.output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+	.io_port_state = LPM_IO_PORT_NO_CHANGE,
+	.power_supply_state = LPM_POWER_SUPPLY_DEEP_STANDBY_MODE1,
+	.deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+	.deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+	.ram_retention_cfg.ram_retention = (uint16_t)(0x7F),
+	.ram_retention_cfg.tcm_retention = true,
+	.ram_retention_cfg.standby_ram_retention = true,
+	.ldo_standby_cfg.pll1_ldo = false,
+	.ldo_standby_cfg.pll2_ldo = false,
+	.ldo_standby_cfg.hoco_ldo = false,
+	.p_extend = NULL,
+};
+
+void pm_state_set(enum pm_state state, uint8_t substate_id)
+{
+	switch (state) {
+	case PM_STATE_RUNTIME_IDLE:
+		R_LPM_LowPowerReconfigure(&pm_state_ctrl, &pm_state_runtime_idle_cfg);
+		__disable_irq();
+		__set_BASEPRI(0);
+		__ISB();
+
+		R_LPM_LowPowerModeEnter(&pm_state_ctrl);
+		__enable_irq();
+		__ISB();
+		break;
+
+	case PM_STATE_STANDBY:
+		R_LPM_Open(&pm_state_ctrl, &pm_state_standby_cfg);
+		__disable_irq();
+		__set_BASEPRI(0);
+		__ISB();
+
+		R_LPM_LowPowerModeEnter(&pm_state_ctrl);
+		__enable_irq();
+		__ISB();
+		break;
+
+	default:
+		break;
+	}
+}
+
+void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
+{
+	switch (state) {
+	case PM_STATE_RUNTIME_IDLE:
+		__fallthrough;
+	case PM_STATE_STANDBY:
+		R_LPM_Close(&pm_state_ctrl);
+		break;
+
+	default:
+		break;
+	}
+	irq_unlock(0);
+}
diff --git a/soc/renesas/ra/ra8t1/sections.ld b/soc/renesas/ra/ra8t1/sections.ld
index 1fe7db907a3d9..7859d28dea57e 100644
--- a/soc/renesas/ra/ra8t1/sections.ld
+++ b/soc/renesas/ra/ra8t1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra8t1/soc.c b/soc/renesas/ra/ra8t1/soc.c
index 33948ba30973c..3c02a1cae0bb7 100644
--- a/soc/renesas/ra/ra8t1/soc.c
+++ b/soc/renesas/ra/ra8t1/soc.c
@@ -25,6 +25,11 @@ uint32_t SystemCoreClock BSP_SECTION_EARLY_INIT;
 
 volatile uint32_t g_protect_pfswe_counter BSP_SECTION_EARLY_INIT;
 
+#ifdef CONFIG_RUNTIME_NMI
+extern bsp_grp_irq_cb_t g_bsp_group_irq_sources[];
+extern void NMI_Handler(void);
+#endif /* CONFIG_RUNTIME_NMI */
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -34,4 +39,12 @@ void soc_early_init_hook(void)
 {
 	SystemCoreClock = BSP_MOCO_HZ;
 	g_protect_pfswe_counter = 0;
+
+#ifdef CONFIG_RUNTIME_NMI
+	for (uint32_t i = 0; i < 16; i++) {
+		g_bsp_group_irq_sources[i] = 0;
+	}
+
+	z_arm_nmi_set_handler(NMI_Handler);
+#endif /* CONFIG_RUNTIME_NMI */
 }
diff --git a/soc/renesas/ra/soc.yml b/soc/renesas/ra/soc.yml
index 29f0fc26ba9cf..4d708f02177f0 100644
--- a/soc/renesas/ra/soc.yml
+++ b/soc/renesas/ra/soc.yml
@@ -4,6 +4,10 @@ family:
       - name: ra2a1
         socs:
           - name: r7fa2a1ab3cfm
+      - name: ra2l1
+        socs:
+          - name: r7fa2l1a9xxfp
+          - name: r7fa2l1abxxfp
       - name: ra4e1
         socs:
           - name: r7fa4e10d2cfm
@@ -11,10 +15,14 @@ family:
       - name: ra4e2
         socs:
           - name: r7fa4e2b93cfm
+      - name: ra4l1
+        socs:
+          - name: r7fa4l1bd4cfp
       - name: ra4m1
         socs:
           - name: r7fa4m1ab3cfm
           - name: r7fa4m1ab3cfp
+          - name: r7fa4m1ab3cne
       - name: ra4m2
         socs:
           - name: r7fa4m2ad3cfp
diff --git a/soc/renesas/rz/common/loader_program.S b/soc/renesas/rz/common/loader_program.S
new file mode 100644
index 0000000000000..5556f42eada48
--- /dev/null
+++ b/soc/renesas/rz/common/loader_program.S
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/devicetree.h>
+#include <zephyr/linker/sections.h>
+
+/* Require CONFIG_XIP=n */
+#define ROM_START	(CONFIG_FLASH_BASE_ADDRESS + DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition)))
+#define RAM_START	CONFIG_SRAM_BASE_ADDRESS
+#define APP_SIZE	_flash_used
+
+_ASM_FILE_PROLOGUE
+
+GTEXT(loader_program)
+
+/*
+ * Loader program
+ */
+SECTION_FUNC(loader_text, loader_program)
+	ldr r0, =ROM_START         // Src in ROM
+	ldr r1, =RAM_START         // Des in RAM
+	ldr r2, =APP_SIZE
+
+	cmp r2, #0
+	beq exit
+
+loop:
+	ldrb r3, [r0], #1    // Load byte from src and increment src pointer
+	strb r3, [r1], #1    // Store byte to des and increment des pointer
+	subs r2, r2, #1      // Decrement size and updates the condition flags
+	bne loop             // If size is not 0, repeat loop
+
+done:
+	dsb sy
+	ldr pc, =__start
+
+exit:
+	wfi
diff --git a/soc/renesas/rz/common/pinctrl_rza.h b/soc/renesas/rz/common/pinctrl_rza.h
new file mode 100644
index 0000000000000..5471a358699fd
--- /dev/null
+++ b/soc/renesas/rz/common/pinctrl_rza.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZA_H_
+#define ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZA_H_
+
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/types.h>
+#include "r_ioport.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Porting */
+typedef struct pinctrl_cfg_data_t {
+	uint32_t reserved: 4;
+	uint32_t pupd_reg: 6;
+	uint32_t iolh_reg: 6;
+	uint32_t pmc_reg: 1;
+	uint32_t sr_reg: 1;
+	uint32_t ien_reg: 1;
+	uint32_t filonoff_reg: 1;
+	uint32_t filnum_reg: 2;
+	uint32_t filclksel_reg: 2;
+	uint32_t pfc_reg: 3;
+} pinctrl_cfg_data_t;
+
+typedef struct pinctrl_soc_pin_t {
+	bsp_io_port_pin_t port_pin;
+	pinctrl_cfg_data_t config;
+} pinctrl_soc_pin_t;
+
+/* Iterate over each pinctrl-n phandle child */
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, state_prop, idx)                                         \
+	DT_FOREACH_CHILD(DT_PHANDLE_BY_IDX(node_id, state_prop, idx),                              \
+			 Z_PINCTRL_STATE_PIN_CHILD_INIT)
+
+/* Iterate over each pinctrl-n phandle child */
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                                                   \
+	{DT_FOREACH_PROP_ELEM_SEP(node_id, prop, Z_PINCTRL_STATE_PIN_INIT, ())};
+
+#define Z_PINCTRL_STATE_PIN_CHILD_INIT(node_id)                                                    \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, pinmux), \
+		    (DT_FOREACH_PROP_ELEM(node_id, pinmux, Z_PINCTRL_PINMUX_INIT)), \
+		    ())                                           \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, pins), \
+		    (DT_FOREACH_PROP_ELEM(node_id, pins, Z_PINCTRL_SPECIAL_PINS_INIT)), \
+		    ())
+
+#define RZA_GET_PORT_PIN(pinmux) (pinmux & ~(0xF << 4))
+#define RZA_GET_FUNC(pinmux)     ((pinmux & 0xF0) >> 4)
+
+#define RZA_GET_PU_PD(node_id)                                                                     \
+	DT_PROP(node_id, bias_pull_up) == 1 ? 1U : (DT_PROP(node_id, bias_pull_down) == 1 ? 2U : 0U)
+
+#define RZA_GET_FILNUM(node_id) ((DT_PROP(node_id, renesas_filter) >> 2) & 0x3)
+
+#define RZA_GET_FILCLKSEL(node_id) (DT_PROP(node_id, renesas_filter) & 0x3)
+
+#define RZA_FILTER_ON_OFF(node_id) COND_CODE_0(DT_PROP(node_id, renesas_filter), (0), (1))
+
+/* Process pinmux cfg */
+#define Z_PINCTRL_PINMUX_INIT(node_id, state_prop, idx)                                            \
+	{                                                                                          \
+		.port_pin = RZA_GET_PORT_PIN(DT_PROP_BY_IDX(node_id, state_prop, idx)),            \
+		.config =                                                                          \
+			{                                                                          \
+				.reserved = 0,                                                     \
+				.pupd_reg = RZA_GET_PU_PD(node_id),                                \
+				.iolh_reg = DT_PROP(node_id, drive_strength),                      \
+				.pmc_reg = 1,                                                      \
+				.sr_reg = DT_ENUM_IDX(node_id, slew_rate),                         \
+				.ien_reg = DT_PROP(node_id, input_enable),                         \
+				.filonoff_reg = RZA_FILTER_ON_OFF(node_id),                        \
+				.filnum_reg = RZA_GET_FILNUM(node_id),                             \
+				.filclksel_reg = RZA_GET_FILCLKSEL(node_id),                       \
+				.pfc_reg = RZA_GET_FUNC(DT_PROP_BY_IDX(node_id, state_prop, idx)), \
+			},                                                                         \
+	},
+
+#define Z_PINCTRL_SPECIAL_PINS_INIT(node_id, state_prop, idx)                                      \
+	{                                                                                          \
+		.port_pin = DT_PROP_BY_IDX(node_id, state_prop, idx),                              \
+		.config =                                                                          \
+			{                                                                          \
+				.reserved = 0,                                                     \
+				.pupd_reg = RZA_GET_PU_PD(node_id),                                \
+				.iolh_reg = DT_PROP(node_id, drive_strength),                      \
+				.pmc_reg = 0,                                                      \
+				.sr_reg = DT_ENUM_IDX(node_id, slew_rate),                         \
+				.ien_reg = DT_PROP(node_id, input_enable),                         \
+				.filonoff_reg = RZA_FILTER_ON_OFF(node_id),                        \
+				.filnum_reg = RZA_GET_FILNUM(node_id),                             \
+				.filclksel_reg = RZA_GET_FILCLKSEL(node_id),                       \
+				.pfc_reg = 0,                                                      \
+			},                                                                         \
+	},
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZA_H_ */
diff --git a/soc/renesas/rz/common/pinctrl_rzg.h b/soc/renesas/rz/common/pinctrl_rzg.h
index e2ef13fbe33f9..9a580540a7163 100644
--- a/soc/renesas/rz/common/pinctrl_rzg.h
+++ b/soc/renesas/rz/common/pinctrl_rzg.h
@@ -61,6 +61,14 @@ typedef struct pinctrl_soc_pin_t {
 
 #define RZG_FILTER_ON_OFF(node_id) COND_CODE_0(DT_PROP(node_id, renesas_filter), (0), (1))
 
+#if defined(CONFIG_SOC_SERIES_RZG3S)
+#define RZG_GET_PFC(node_id, state_prop, idx)                                                      \
+	(RZG_GET_FUNC(DT_PROP_BY_IDX(node_id, state_prop, idx)) - 1)
+#else
+#define RZG_GET_PFC(node_id, state_prop, idx)                                                      \
+	(RZG_GET_FUNC(DT_PROP_BY_IDX(node_id, state_prop, idx)))
+#endif
+
 /* Process pinmux cfg */
 #define Z_PINCTRL_PINMUX_INIT(node_id, state_prop, idx)                                            \
 	{                                                                                          \
@@ -75,9 +83,7 @@ typedef struct pinctrl_soc_pin_t {
 				.filonoff_reg = RZG_FILTER_ON_OFF(node_id),                        \
 				.filnum_reg = RZG_GET_FILNUM(node_id),                             \
 				.filclksel_reg = RZG_GET_FILCLKSEL(node_id),                       \
-				.pfc_reg =                                                         \
-					(RZG_GET_FUNC(DT_PROP_BY_IDX(node_id, state_prop, idx)) -  \
-					 1),                                                       \
+				.pfc_reg = RZG_GET_PFC(node_id, state_prop, idx),                  \
 			},                                                                         \
 	},
 
@@ -101,4 +107,4 @@ typedef struct pinctrl_soc_pin_t {
 #ifdef __cplusplus
 }
 #endif
-#endif /*ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZG_H_*/
+#endif /* ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZG_H_ */
diff --git a/soc/renesas/rz/common/pinctrl_rzn.h b/soc/renesas/rz/common/pinctrl_rzn.h
new file mode 100644
index 0000000000000..5779dab1a49f1
--- /dev/null
+++ b/soc/renesas/rz/common/pinctrl_rzn.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZN_H_
+#define ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZN_H_
+
+#include <zephyr/types.h>
+#include <zephyr/devicetree.h>
+#include "r_ioport.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RZN_GET_PORT_PIN(pinmux) (pinmux & ~(0xF << 4))
+#define RZN_GET_FUNC(pinmux)     ((pinmux & 0xF0) >> 4)
+
+/* Porting */
+typedef struct pinctrl_cfg_data_t {
+	uint32_t p_reg: 1;
+	uint32_t pm_reg: 2;
+	uint32_t pmc_reg: 1;
+	uint32_t pfc_reg: 4;
+	uint32_t drct_reg: 6;
+	uint32_t rsel_reg: 1;
+	uint32_t reserved: 17;
+} pinctrl_cfg_data_t;
+
+typedef struct pinctrl_soc_pin_t {
+	bsp_io_port_pin_t port_pin;
+	pinctrl_cfg_data_t config;
+} pinctrl_soc_pin_t;
+
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)                                               \
+	{                                                                                          \
+		.port_pin = RZN_GET_PORT_PIN(DT_PROP_BY_IDX(node_id, prop, idx)),                  \
+		.config =                                                                          \
+			{                                                                          \
+				.p_reg = DT_PROP(node_id, output_high),                            \
+				.pm_reg = DT_PROP(node_id, input_enable) == 1                      \
+						  ? 1U                                             \
+						  : (DT_PROP(node_id, output_enable) == 1 ? 2U     \
+											  : 0U),   \
+				.pmc_reg = 1,                                                      \
+				.pfc_reg = RZN_GET_FUNC(DT_PROP_BY_IDX(node_id, prop, idx)),       \
+				.drct_reg =                                                        \
+					(DT_ENUM_IDX(node_id, drive_strength)) |                   \
+					((DT_PROP(node_id, bias_pull_up) == 1                      \
+						  ? 1U                                             \
+						  : (DT_PROP(node_id, bias_pull_down) == 1 ? 2U    \
+											   : 0))   \
+					 << 2) |                                                   \
+					(DT_PROP(node_id, input_schmitt_enable) << 4) |            \
+					(DT_ENUM_IDX(node_id, slew_rate) << 5),                    \
+				.rsel_reg = 1,                                                     \
+				.reserved = 0,                                                     \
+			},                                                                         \
+	},
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                                                   \
+	{DT_FOREACH_CHILD_VARGS(DT_PHANDLE(node_id, prop), DT_FOREACH_PROP_ELEM, pinmux,           \
+				Z_PINCTRL_STATE_PIN_INIT)}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZN_H_ */
diff --git a/soc/renesas/rz/common/pinctrl_rzt.h b/soc/renesas/rz/common/pinctrl_rzt.h
new file mode 100644
index 0000000000000..e9dc810a572bd
--- /dev/null
+++ b/soc/renesas/rz/common/pinctrl_rzt.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZT_H_
+#define ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZT_H_
+
+#include <zephyr/types.h>
+#include <zephyr/devicetree.h>
+#include "r_ioport.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RZT_GET_PORT_PIN(pinmux) (pinmux & ~(0xF << 4))
+#define RZT_GET_FUNC(pinmux)     ((pinmux & 0xF0) >> 4)
+
+/*Porting*/
+typedef struct pinctrl_cfg_data_t {
+	uint32_t p_reg: 1;
+	uint32_t pm_reg: 2;
+	uint32_t pmc_reg: 1;
+	uint32_t pfc_reg: 4;
+	uint32_t drct_reg: 6;
+	uint32_t rsel_reg: 1;
+	uint32_t reserved: 17;
+} pinctrl_cfg_data_t;
+
+typedef struct pinctrl_soc_pin_t {
+	bsp_io_port_pin_t port_pin;
+	pinctrl_cfg_data_t config;
+} pinctrl_soc_pin_t;
+
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)                                               \
+	{                                                                                          \
+		.port_pin = RZT_GET_PORT_PIN(DT_PROP_BY_IDX(node_id, prop, idx)),                  \
+		.config =                                                                          \
+			{                                                                          \
+				.p_reg = DT_PROP(node_id, output_high),                            \
+				.pm_reg = DT_PROP(node_id, input_enable) == 1                      \
+						  ? 1U                                             \
+						  : (DT_PROP(node_id, output_enable) == 1 ? 2U     \
+											  : 0U),   \
+				.pmc_reg = 1,                                                      \
+				.pfc_reg = RZT_GET_FUNC(DT_PROP_BY_IDX(node_id, prop, idx)),       \
+				.drct_reg =                                                        \
+					(DT_ENUM_IDX(node_id, drive_strength)) |                   \
+					((DT_PROP(node_id, bias_pull_up) == 1                      \
+						  ? 1U                                             \
+						  : (DT_PROP(node_id, bias_pull_down) == 1 ? 2U    \
+											   : 0))   \
+					 << 2) |                                                   \
+					(DT_PROP(node_id, input_schmitt_enable) << 4) |            \
+					(DT_ENUM_IDX(node_id, slew_rate) << 5),                    \
+				.rsel_reg = 1,                                                     \
+				.reserved = 0,                                                     \
+			},                                                                         \
+	},
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                                                   \
+	{DT_FOREACH_CHILD_VARGS(DT_PHANDLE(node_id, prop), DT_FOREACH_PROP_ELEM, pinmux,           \
+				Z_PINCTRL_STATE_PIN_INIT)}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZT_H_ */
diff --git a/soc/renesas/rz/common/pinctrl_rzv.h b/soc/renesas/rz/common/pinctrl_rzv.h
new file mode 100644
index 0000000000000..a4dd50aef2939
--- /dev/null
+++ b/soc/renesas/rz/common/pinctrl_rzv.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZV_H_
+#define ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZV_H_
+
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/types.h>
+#include "r_ioport.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Porting */
+typedef struct pinctrl_cfg_data_t {
+	uint32_t reserved: 4;
+	uint32_t pupd_reg: 6;
+	uint32_t iolh_reg: 6;
+	uint32_t pmc_reg: 1;
+	uint32_t sr_reg: 1;
+	uint32_t ien_reg: 1;
+	uint32_t filonoff_reg: 1;
+	uint32_t filnum_reg: 2;
+	uint32_t filclksel_reg: 2;
+	uint32_t pfc_reg: 3;
+} pinctrl_cfg_data_t;
+
+typedef struct pinctrl_soc_pin_t {
+	bsp_io_port_pin_t port_pin;
+	pinctrl_cfg_data_t config;
+} pinctrl_soc_pin_t;
+
+/* Iterate over each pinctrl-n phandle child */
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, state_prop, idx)                                         \
+	DT_FOREACH_CHILD(DT_PHANDLE_BY_IDX(node_id, state_prop, idx),                              \
+			 Z_PINCTRL_STATE_PIN_CHILD_INIT)
+
+/* Iterate over each pinctrl-n phandle child */
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                                                   \
+	{DT_FOREACH_PROP_ELEM_SEP(node_id, prop, Z_PINCTRL_STATE_PIN_INIT, ())};
+
+#define Z_PINCTRL_STATE_PIN_CHILD_INIT(node_id)                                                    \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, pinmux), \
+		    (DT_FOREACH_PROP_ELEM(node_id, pinmux, Z_PINCTRL_PINMUX_INIT)), \
+		    ())                                           \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, pins), \
+		    (DT_FOREACH_PROP_ELEM(node_id, pins, Z_PINCTRL_SPECIAL_PINS_INIT)), \
+		    ())
+
+#define RZV_GET_PORT_PIN(pinmux) (pinmux & ~(0xF << 4))
+#define RZV_GET_FUNC(pinmux)     ((pinmux & 0xF0) >> 4)
+
+#define RZV_GET_PU_PD(node_id)                                                                     \
+	DT_PROP(node_id, bias_pull_up) == 1 ? 1U : (DT_PROP(node_id, bias_pull_down) == 1 ? 2U : 0U)
+
+#define RZV_GET_FILNUM(node_id) ((DT_PROP(node_id, renesas_filter) >> 2) & 0x3)
+
+#define RZV_GET_FILCLKSEL(node_id) (DT_PROP(node_id, renesas_filter) & 0x3)
+
+#define RZV_FILTER_ON_OFF(node_id) COND_CODE_0(DT_PROP(node_id, renesas_filter), (0), (1))
+
+/* Process pinmux cfg */
+#define Z_PINCTRL_PINMUX_INIT(node_id, state_prop, idx)                                            \
+	{                                                                                          \
+		.port_pin = RZV_GET_PORT_PIN(DT_PROP_BY_IDX(node_id, state_prop, idx)),            \
+		.config = {.reserved = 0,                                                          \
+			   .pupd_reg = RZV_GET_PU_PD(node_id),                                     \
+			   .iolh_reg = DT_PROP(node_id, drive_strength),                           \
+			   .pmc_reg = 1,                                                           \
+			   .sr_reg = DT_ENUM_IDX(node_id, slew_rate),                              \
+			   .ien_reg = DT_PROP(node_id, input_enable),                              \
+			   .filonoff_reg = RZV_FILTER_ON_OFF(node_id),                             \
+			   .filnum_reg = RZV_GET_FILNUM(node_id),                                  \
+			   .filclksel_reg = RZV_GET_FILCLKSEL(node_id),                            \
+			   .pfc_reg = RZV_GET_FUNC(DT_PROP_BY_IDX(node_id, state_prop, idx))},     \
+	},
+
+#define Z_PINCTRL_SPECIAL_PINS_INIT(node_id, state_prop, idx)                                      \
+	{                                                                                          \
+		.port_pin = DT_PROP_BY_IDX(node_id, state_prop, idx),                              \
+		.config =                                                                          \
+			{                                                                          \
+				.reserved = 0,                                                     \
+				.pupd_reg = RZV_GET_PU_PD(node_id),                                \
+				.iolh_reg = DT_PROP(node_id, drive_strength),                      \
+				.pmc_reg = 0,                                                      \
+				.sr_reg = DT_ENUM_IDX(node_id, slew_rate),                         \
+				.ien_reg = DT_PROP(node_id, input_enable),                         \
+				.filonoff_reg = RZV_FILTER_ON_OFF(node_id),                        \
+				.filnum_reg = RZV_GET_FILNUM(node_id),                             \
+				.filclksel_reg = RZV_GET_FILCLKSEL(node_id),                       \
+				.pfc_reg = 0,                                                      \
+			},                                                                         \
+	},
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* ZEPHYR_SOC_RENESAS_RZ_COMMON_PINCTRL_RZV_H_ */
diff --git a/soc/renesas/rz/rza3ul/CMakeLists.txt b/soc/renesas/rz/rza3ul/CMakeLists.txt
new file mode 100644
index 0000000000000..b7bb7ee2f2a6e
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(soc.c)
+zephyr_library_sources_ifdef(CONFIG_ARM_MMU mmu_regions.c)
+
+zephyr_include_directories(.)
+
+zephyr_linker_sources(SECTIONS sections.ld)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm64/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/rz/rza3ul/Kconfig b/soc/renesas/rz/rza3ul/Kconfig
new file mode 100644
index 0000000000000..f5b3226633ca8
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/Kconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZA3UL
+	select ARM64
+	select CPU_CORTEX_A55
+	select ARM_ARCH_TIMER
+	select HAS_RENESAS_RZ_FSP
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/renesas/rz/rza3ul/Kconfig.defconfig b/soc/renesas/rz/rza3ul/Kconfig.defconfig
new file mode 100644
index 0000000000000..6af7d5b7c9a2f
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/Kconfig.defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RZA3UL
+
+config SYS_CLOCK_EXISTS
+	default y
+
+config NUM_IRQS
+	default 512
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 24000000
+
+config FLASH_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
+
+config FLASH_BASE_ADDRESS
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+DT_CHOSEN_IMAGE_ZEPHYR = zephyr,code-partition
+DT_CHOSEN_SRAM_ZEPHYR = zephyr,sram
+
+config BUILD_OUTPUT_ADJUST_LMA
+	default "$(dt_chosen_partition_addr_hex,$(DT_CHOSEN_IMAGE_ZEPHYR)) - \
+	$(dt_chosen_reg_addr_hex,$(DT_CHOSEN_SRAM_ZEPHYR))"
+
+config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
+	default "*;!.header"
+
+endif # SOC_SERIES_RZA3UL
diff --git a/soc/renesas/rz/rza3ul/Kconfig.soc b/soc/renesas/rz/rza3ul/Kconfig.soc
new file mode 100644
index 0000000000000..f77dd2aa1d572
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/Kconfig.soc
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZA3UL
+	bool
+	select SOC_FAMILY_RENESAS_RZ
+	help
+	  Renesas RZ/A3UL series
+
+config SOC_SERIES
+	default "rza3ul" if SOC_SERIES_RZA3UL
+
+config SOC_R9A07G063U02GBG
+	bool
+	select SOC_SERIES_RZA3UL
+	help
+	  R9A07G063U02GBG
+
+config SOC
+	default "r9a07g063u02gbg" if SOC_R9A07G063U02GBG
diff --git a/soc/renesas/rz/rza3ul/mmu_regions.c b/soc/renesas/rz/rza3ul/mmu_regions.c
new file mode 100644
index 0000000000000..3f07572e5804a
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/mmu_regions.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/arch/arm64/arm_mmu.h>
+#include <zephyr/devicetree.h>
+
+static const struct arm_mmu_region mmu_regions[] = {
+	MMU_REGION_FLAT_ENTRY("IO_REG", 0x10000000, 0x10000000,
+			      MT_DEVICE_nGnRnE | MT_RW | MT_DEFAULT_SECURE_STATE),
+};
+
+const struct arm_mmu_config mmu_config = {
+	.num_regions = ARRAY_SIZE(mmu_regions),
+	.mmu_regions = mmu_regions,
+};
diff --git a/soc/renesas/rz/rza3ul/pinctrl_soc.h b/soc/renesas/rz/rza3ul/pinctrl_soc.h
new file mode 100644
index 0000000000000..44733d79afdc9
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/pinctrl_soc.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZ_RZA3UL_PINCTRL_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZ_RZA3UL_PINCTRL_SOC_H_
+
+#include <pinctrl_rza.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_RZA3UL_PINCTRL_SOC_H_ */
diff --git a/soc/renesas/rz/rza3ul/sections.ld b/soc/renesas/rz/rza3ul/sections.ld
new file mode 100644
index 0000000000000..bdc29c67e39d2
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/sections.ld
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+SECTION_PROLOGUE(.header, CONFIG_FLASH_BASE_ADDRESS,)
+{
+	QUAD(__start)
+	QUAD(0xFFFFFFFFFFFFFFFF-__start)
+	QUAD(CONFIG_SRAM_BASE_ADDRESS)
+	QUAD(0xFFFFFFFFFFFFFFFF-CONFIG_SRAM_BASE_ADDRESS)
+	QUAD(z_mapped_size)
+	QUAD(0xFFFFFFFFFFFFFFFF-z_mapped_size)
+	FILL(0x00)
+	. += 0x1B0;
+	QUAD(0x4120505346205a52)
+	QUAD(0x69746163696c7070)
+	QUAD(0x0000000000006e6f)
+	QUAD(0x0000000000000000)
+} > FLASH
+
+z_mapped_size = z_mapped_end - z_mapped_start;
diff --git a/soc/renesas/rz/rza3ul/soc.c b/soc/renesas/rz/rza3ul/soc.c
new file mode 100644
index 0000000000000..dbfb58d4f1762
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/soc.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief System/hardware module for Renesas RZ/A3UL Group
+ */
+
+#include <zephyr/init.h>
+#include "soc.h"
+
+uint32_t SystemCoreClock;
+
+void soc_early_init_hook(void)
+{
+	/* Configure system clocks. */
+	bsp_clock_init();
+
+	/* InitFialize SystemCoreClock variable. */
+	SystemCoreClockUpdate();
+}
diff --git a/soc/renesas/rz/rza3ul/soc.h b/soc/renesas/rz/rza3ul/soc.h
new file mode 100644
index 0000000000000..5df3ba6851e62
--- /dev/null
+++ b/soc/renesas/rz/rza3ul/soc.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZA3UL_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZA3UL_SOC_H_
+
+#include <bsp_api.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZG3S_SOC_H_ */
diff --git a/soc/renesas/rz/rzg2l/CMakeLists.txt b/soc/renesas/rz/rzg2l/CMakeLists.txt
new file mode 100644
index 0000000000000..a58ca9b77f578
--- /dev/null
+++ b/soc/renesas/rz/rzg2l/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(soc.c)
+
+zephyr_include_directories(.)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/rz/rzg2l/Kconfig b/soc/renesas/rz/rzg2l/Kconfig
new file mode 100644
index 0000000000000..fa2ec4ab067c2
--- /dev/null
+++ b/soc/renesas/rz/rzg2l/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZG2L
+	select ARM
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select HAS_RENESAS_RZ_FSP
+	select CPU_CORTEX_M_HAS_DWT
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/renesas/rz/rzg2l/Kconfig.defconfig b/soc/renesas/rz/rzg2l/Kconfig.defconfig
new file mode 100644
index 0000000000000..bfde46db7e167
--- /dev/null
+++ b/soc/renesas/rz/rzg2l/Kconfig.defconfig
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RZG2L
+
+config NUM_IRQS
+	default 480
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default	$(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
+
+config FLASH_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
+
+config FLASH_BASE_ADDRESS
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+config SYS_CLOCK_EXISTS
+	default y
+
+config INIT_ARCH_HW_AT_BOOT
+	default y
+
+endif # SOC_SERIES_RZG2L
diff --git a/soc/renesas/rz/rzg2l/Kconfig.soc b/soc/renesas/rz/rzg2l/Kconfig.soc
new file mode 100644
index 0000000000000..a5971ea64c0b3
--- /dev/null
+++ b/soc/renesas/rz/rzg2l/Kconfig.soc
@@ -0,0 +1,35 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZG2L
+	bool
+	select SOC_FAMILY_RENESAS_RZ
+	help
+	  Renesas RZ/G2L series
+
+config SOC_SERIES
+	default "rzg2l" if SOC_SERIES_RZG2L
+
+config SOC_R9A07G044L23GBG
+	bool
+	select SOC_SERIES_RZG2L
+	help
+	  R9A07G044L23GBG
+
+config SOC_R9A07G044C22GBG
+	bool
+	select SOC_SERIES_RZG2L
+	help
+	  R9A07G044C22GBG
+
+config SOC_R9A07G044L23GBG_CM33
+	bool
+	select SOC_R9A07G044L23GBG
+
+config SOC_R9A07G044C22GBG_CM33
+	bool
+	select SOC_R9A07G044C22GBG
+
+config SOC
+	default "r9a07g044l23gbg" if SOC_R9A07G044L23GBG
+	default "r9a07g044c22gbg" if SOC_R9A07G044C22GBG
diff --git a/soc/renesas/rz/rzg2l/pinctrl_soc.h b/soc/renesas/rz/rzg2l/pinctrl_soc.h
new file mode 100644
index 0000000000000..cd19f2593252c
--- /dev/null
+++ b/soc/renesas/rz/rzg2l/pinctrl_soc.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZ_RZG2L_PINCTRL_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZ_RZG2L_PINCTRL_SOC_H_
+
+#include <pinctrl_rzg.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_RZG2L_PINCTRL_SOC_H_ */
diff --git a/soc/renesas/rz/rzg2l/soc.c b/soc/renesas/rz/rzg2l/soc.c
new file mode 100644
index 0000000000000..2418462b14a39
--- /dev/null
+++ b/soc/renesas/rz/rzg2l/soc.c
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief System/hardware module for Renesas RZ/G2L Group
+ */
+
+#include <zephyr/init.h>
+#include <bsp_api.h>
+
+/* System core clock is set to 200 MHz after reset */
+uint32_t SystemCoreClock = 200000000;
+
+void soc_early_init_hook(void)
+{
+	bsp_clock_init();
+}
diff --git a/soc/renesas/rz/rzg2l/soc.h b/soc/renesas/rz/rzg2l/soc.h
new file mode 100644
index 0000000000000..20cdc8fd15a01
--- /dev/null
+++ b/soc/renesas/rz/rzg2l/soc.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZG2L_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZG2L_SOC_H_
+
+#include <bsp_api.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZG2L_SOC_H_ */
diff --git a/soc/renesas/rz/rzg3s/CMakeLists.txt b/soc/renesas/rz/rzg3s/CMakeLists.txt
index 2db47f0bb7946..7947143a2aba8 100644
--- a/soc/renesas/rz/rzg3s/CMakeLists.txt
+++ b/soc/renesas/rz/rzg3s/CMakeLists.txt
@@ -6,3 +6,8 @@ zephyr_sources(soc.c)
 zephyr_include_directories(.)
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
+
+zephyr_linker_sources_ifdef(CONFIG_OPENAMP
+  RODATA
+  resource_table.ld
+)
diff --git a/soc/renesas/rz/rzg3s/resource_table.ld b/soc/renesas/rz/rzg3s/resource_table.ld
new file mode 100644
index 0000000000000..d33e1f917c112
--- /dev/null
+++ b/soc/renesas/rz/rzg3s/resource_table.ld
@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+KEEP(*(.resource_table*))
diff --git a/soc/renesas/rz/rzn2l/CMakeLists.txt b/soc/renesas/rz/rzn2l/CMakeLists.txt
new file mode 100644
index 0000000000000..7633a8ff2a699
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(
+  soc.c
+  loader_param.c
+  ../common/loader_program.S
+)
+
+zephyr_include_directories(.)
+
+zephyr_linker_sources(SECTIONS sections.ld)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/rz/rzn2l/Kconfig b/soc/renesas/rz/rzn2l/Kconfig
new file mode 100644
index 0000000000000..3833827bae2bb
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/Kconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZN2L
+	select ARM
+	select CPU_CORTEX_R52
+	select CPU_HAS_ARM_MPU
+	select HAS_RENESAS_RZ_FSP
+	select ARM_ARCH_TIMER
+	select GIC_SINGLE_SECURITY_STATE
+	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
+	select ARM_CUSTOM_INTERRUPT_CONTROLLER
diff --git a/soc/renesas/rz/rzn2l/Kconfig.defconfig b/soc/renesas/rz/rzn2l/Kconfig.defconfig
new file mode 100644
index 0000000000000..dd1fbedacd3e3
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/Kconfig.defconfig
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RZN2L
+
+config NUM_IRQS
+	default 480
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 25000000
+
+config FPU
+	default y
+
+config FLASH_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
+
+config FLASH_BASE_ADDRESS
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+DT_CHOSEN_IMAGE_ZEPHYR = zephyr,code-partition
+
+config BUILD_OUTPUT_ADJUST_LMA
+	default "($(dt_chosen_reg_addr_hex,$(DT_CHOSEN_IMAGE_ZEPHYR)) + \
+	$(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)))"
+
+config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
+	default "*;!.loader"
+
+endif # SOC_SERIES_RZN2L
diff --git a/soc/renesas/rz/rzn2l/Kconfig.soc b/soc/renesas/rz/rzn2l/Kconfig.soc
new file mode 100644
index 0000000000000..c95b6f596a1a1
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/Kconfig.soc
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZN2L
+	bool
+	select SOC_FAMILY_RENESAS_RZ
+	help
+	  Renesas RZ/N2L series
+
+config SOC_SERIES
+	default "rzn2l" if SOC_SERIES_RZN2L
+
+config SOC_R9A07G084M04GBG
+	bool
+	select SOC_SERIES_RZN2L
+	help
+	  R9A07G084M04GBG
+
+config SOC
+	default "r9a07g084m04gbg" if SOC_R9A07G084M04GBG
diff --git a/soc/renesas/rz/rzn2l/loader_param.c b/soc/renesas/rz/rzn2l/loader_param.c
new file mode 100644
index 0000000000000..8c15d563bce1d
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/loader_param.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+#include <zephyr/linker/section_tags.h>
+
+#define CACHE_FLG            (0x00000000)
+#define CS0BCR_V_WRAPCFG_V   (0x00000000)
+#define CS0WCR_V_COMCFG_V    (0x00000000)
+#define DUMMY0_BMCFG_V       (0x00000000)
+#define BSC_FLG_xSPI_FLG     (0x00000000)
+#define LDR_ADDR_NML         (0x6000004C)
+#define LDR_SIZE_NML         (0x00006000)
+#define DEST_ADDR_NML        (0x00102000)
+#define DUMMY1               (0x00000000)
+#define DUMMY2               (0x00000000)
+#define DUMMY3_CSSCTL_V      (0x0000003F)
+#define DUMMY4_LIOCFGCS0_V   (0x00070000)
+#define DUMMY5               (0x00000000)
+#define DUMMY6               (0x00000000)
+#define DUMMY7               (0x00000000)
+#define DUMMY8               (0x00000000)
+#define DUMMY9               (0x00000000)
+#define DUMMY10_ACCESS_SPEED (0x00000006)
+#define CHECK_SUM            (0xE0A8)
+#define LOADER_PARAM_MAX     (19)
+
+#define __loader_param Z_GENERIC_SECTION(.loader_param)
+
+const uint32_t loader_param[LOADER_PARAM_MAX] __loader_param = {
+	CACHE_FLG,
+	CS0BCR_V_WRAPCFG_V,
+	CS0WCR_V_COMCFG_V,
+	DUMMY0_BMCFG_V,
+	BSC_FLG_xSPI_FLG,
+	LDR_ADDR_NML,
+	LDR_SIZE_NML,
+	DEST_ADDR_NML,
+	DUMMY1,
+	DUMMY2,
+	DUMMY3_CSSCTL_V,
+	DUMMY4_LIOCFGCS0_V,
+	DUMMY5,
+	DUMMY6,
+	DUMMY7,
+	DUMMY8,
+	DUMMY9,
+	DUMMY10_ACCESS_SPEED,
+	CHECK_SUM,
+};
diff --git a/soc/renesas/rz/rzn2l/pinctrl_soc.h b/soc/renesas/rz/rzn2l/pinctrl_soc.h
new file mode 100644
index 0000000000000..459bcd6cbd850
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/pinctrl_soc.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZ_RZN2L_PINCTRL_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZ_RZN2L_PINCTRL_SOC_H_
+
+#include <pinctrl_rzn.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_RZN2L_PINCTRL_SOC_H_ */
diff --git a/soc/renesas/rz/rzn2l/sections.ld b/soc/renesas/rz/rzn2l/sections.ld
new file mode 100644
index 0000000000000..f1f3a9665b2ec
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/sections.ld
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/devicetree.h>
+
+SECTION_PROLOGUE(.loader, CONFIG_FLASH_BASE_ADDRESS,)
+{
+	__loader_param_start = .;
+	KEEP(*(.loader_param))
+	__loader_param_end = .;
+	. = DT_REG_ADDR(DT_NODELABEL(loader_program));
+	__loader_program_start = .;
+	KEEP(*(.loader_text.*))
+	__loader_program_end = .;
+} GROUP_LINK_IN(FLASH)
diff --git a/soc/renesas/rz/rzn2l/soc.c b/soc/renesas/rz/rzn2l/soc.c
new file mode 100644
index 0000000000000..b8d2b30c235f0
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/soc.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief System/hardware module for Renesas RZ/N2L Group
+ */
+
+#include <bsp_api.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/barrier.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
+#include <zephyr/irq.h>
+
+extern void bsp_global_system_counter_init(void);
+
+void *gp_renesas_isr_context[BSP_ICU_VECTOR_MAX_ENTRIES + BSP_CORTEX_VECTOR_TABLE_ENTRIES];
+IRQn_Type g_current_interrupt_num[32];
+uint8_t g_current_interrupt_pointer;
+
+void soc_reset_hook(void)
+{
+	/* Enable peripheral port access at EL1 and EL0 */
+	__asm__ volatile("mrc p15, 0, r0, c15, c0, 0\n");
+	__asm__ volatile("orr r0, #1\n");
+	__asm__ volatile("mcr p15, 0, r0, c15, c0, 0\n");
+	barrier_dsync_fence_full();
+	barrier_isync_fence_full();
+}
+
+void soc_early_init_hook(void)
+{
+	/* Configure system clocks. */
+	bsp_clock_init();
+
+	/* Initialize SystemCoreClock variable. */
+	SystemCoreClockUpdate();
+
+	/* Initialize global system counter. The counter is enabled and is incrementing. */
+	bsp_global_system_counter_init();
+}
+
+unsigned int z_soc_irq_get_active(void)
+{
+	int intid = arm_gic_get_active();
+
+	g_current_interrupt_num[g_current_interrupt_pointer++] = intid;
+
+	return intid;
+}
+
+void z_soc_irq_eoi(unsigned int intid)
+{
+	g_current_interrupt_pointer--;
+	arm_gic_eoi(intid);
+}
+
+void z_soc_irq_enable(unsigned int irq)
+{
+	arm_gic_irq_enable(irq);
+}
+
+void z_soc_irq_disable(unsigned int irq)
+{
+	arm_gic_irq_disable(irq);
+}
+
+int z_soc_irq_is_enabled(unsigned int irq)
+{
+	return arm_gic_irq_is_enabled(irq);
+}
+
+void z_soc_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
+{
+	arm_gic_irq_set_priority(irq, prio, flags);
+}
+
+void z_soc_irq_init(void)
+{
+	g_current_interrupt_pointer = 0;
+}
+
+/* Porting FSP IRQ configuration by an empty function */
+/* Let Zephyr handle IRQ configuration */
+void bsp_irq_core_cfg(void)
+{
+	/* Do nothing */
+}
diff --git a/soc/renesas/rz/rzn2l/soc.h b/soc/renesas/rz/rzn2l/soc.h
new file mode 100644
index 0000000000000..e99f72f790b18
--- /dev/null
+++ b/soc/renesas/rz/rzn2l/soc.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZN2L_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZN2L_SOC_H_
+
+typedef enum IRQn {
+	SoftwareGeneratedInt0 = 0,
+	SoftwareGeneratedInt1,
+	SoftwareGeneratedInt2,
+	SoftwareGeneratedInt3,
+	SoftwareGeneratedInt4,
+	SoftwareGeneratedInt5,
+	SoftwareGeneratedInt6,
+	SoftwareGeneratedInt7,
+	SoftwareGeneratedInt8,
+	SoftwareGeneratedInt9,
+	SoftwareGeneratedInt10,
+	SoftwareGeneratedInt11,
+	SoftwareGeneratedInt12,
+	SoftwareGeneratedInt13,
+	SoftwareGeneratedInt14,
+	SoftwareGeneratedInt15,
+	DebugCommunicationsChannelInt = 22,
+	PerformanceMonitorCounterOverflowInt = 23,
+	CrossTriggerInterfaceInt = 24,
+	VritualCPUInterfaceMaintenanceInt = 25,
+	HypervisorTimerInt = 26,
+	VirtualTimerInt = 27,
+	NonSecurePhysicalTimerInt = 30,
+	SHARED_PERIPHERAL_INTERRUPTS_MAX_ENTRIES = CONFIG_NUM_IRQS
+} IRQn_Type;
+
+/* Do not let CMSIS to handle GIC and Timer */
+#define __GIC_PRESENT 0
+#define __TIM_PRESENT 0
+#define __FPU_PRESENT 1
+
+/* Porting FSP IRQ configuration by an empty function */
+/* Let Zephyr handle IRQ configuration */
+void bsp_irq_core_cfg(void);
+
+#endif /* ZEPHYR_SOC_RENESAS_RZN2L_SOC_H_ */
diff --git a/soc/renesas/rz/rzt2l/CMakeLists.txt b/soc/renesas/rz/rzt2l/CMakeLists.txt
new file mode 100644
index 0000000000000..7633a8ff2a699
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(
+  soc.c
+  loader_param.c
+  ../common/loader_program.S
+)
+
+zephyr_include_directories(.)
+
+zephyr_linker_sources(SECTIONS sections.ld)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/rz/rzt2l/Kconfig b/soc/renesas/rz/rzt2l/Kconfig
new file mode 100644
index 0000000000000..90fdc7792d500
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/Kconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZT2L
+	select ARM
+	select CPU_CORTEX_R52
+	select CPU_HAS_ARM_MPU
+	select GIC_SINGLE_SECURITY_STATE
+	select ARM_ARCH_TIMER
+	select HAS_RENESAS_RZ_FSP
+	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
+	select ARM_CUSTOM_INTERRUPT_CONTROLLER
diff --git a/soc/renesas/rz/rzt2l/Kconfig.defconfig b/soc/renesas/rz/rzt2l/Kconfig.defconfig
new file mode 100644
index 0000000000000..3a8c8b13c65fb
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/Kconfig.defconfig
@@ -0,0 +1,30 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RZT2L
+
+config NUM_IRQS
+	default 480
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 25000000
+
+config FPU
+	default y
+
+config FLASH_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
+
+config FLASH_BASE_ADDRESS
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+DT_CHOSEN_IMAGE_ZEPHYR = zephyr,code-partition
+
+config BUILD_OUTPUT_ADJUST_LMA
+	default "($(dt_chosen_reg_addr_hex,$(DT_CHOSEN_IMAGE_ZEPHYR)) + \
+	$(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)))"
+
+config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
+	default "*;!.loader"
+
+endif # SOC_SERIES_RZT2L
diff --git a/soc/renesas/rz/rzt2l/Kconfig.soc b/soc/renesas/rz/rzt2l/Kconfig.soc
new file mode 100644
index 0000000000000..6e2625b32002c
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/Kconfig.soc
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZT2L
+	bool
+	select SOC_FAMILY_RENESAS_RZ
+	help
+	  Renesas RZ/T2L series
+
+config SOC_SERIES
+	default "rzt2l" if SOC_SERIES_RZT2L
+
+config SOC_R9A07G074M04GBG
+	bool
+	select SOC_SERIES_RZT2L
+	help
+	  R9A07G074M04GBG
+
+config SOC
+	default "r9a07g074m04gbg" if SOC_R9A07G074M04GBG
diff --git a/soc/renesas/rz/rzt2l/loader_param.c b/soc/renesas/rz/rzt2l/loader_param.c
new file mode 100644
index 0000000000000..7e948b3f72c35
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/loader_param.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+#include <zephyr/linker/section_tags.h>
+
+#define CACHE_FLG            (0x00000000)
+#define CS0BCR_V_WRAPCFG_V   (0x00000000)
+#define CS0WCR_V_COMCFG_V    (0x00000000)
+#define DUMMY0_BMCFG_V       (0x00000000)
+#define BSC_FLG_xSPI_FLG     (0x00000000)
+#define LDR_ADDR_NML         (0x6800004C)
+#define LDR_SIZE_NML         (0x00006000)
+#define DEST_ADDR_NML        (0x00102000)
+#define DUMMY1               (0x00000000)
+#define DUMMY2               (0x00000000)
+#define DUMMY3_CSSCTL_V      (0x0000003F)
+#define DUMMY4_LIOCFGCS0_V   (0x00070000)
+#define DUMMY5               (0x00000000)
+#define DUMMY6               (0x00000000)
+#define DUMMY7               (0x00000000)
+#define DUMMY8               (0x00000000)
+#define DUMMY9               (0x00000000)
+#define DUMMY10_ACCESS_SPEED (0x00000600)
+#define CHECK_SUM            (0xEEA2)
+#define LOADER_PARAM_MAX     (19)
+
+#define __loader_param Z_GENERIC_SECTION(.loader_param)
+
+const uint32_t loader_param[LOADER_PARAM_MAX] __loader_param = {
+	CACHE_FLG,
+	CS0BCR_V_WRAPCFG_V,
+	CS0WCR_V_COMCFG_V,
+	DUMMY0_BMCFG_V,
+	BSC_FLG_xSPI_FLG,
+	LDR_ADDR_NML,
+	LDR_SIZE_NML,
+	DEST_ADDR_NML,
+	DUMMY1,
+	DUMMY2,
+	DUMMY3_CSSCTL_V,
+	DUMMY4_LIOCFGCS0_V,
+	DUMMY5,
+	DUMMY6,
+	DUMMY7,
+	DUMMY8,
+	DUMMY9,
+	DUMMY10_ACCESS_SPEED,
+	CHECK_SUM,
+};
diff --git a/soc/renesas/rz/rzt2l/pinctrl_soc.h b/soc/renesas/rz/rzt2l/pinctrl_soc.h
new file mode 100644
index 0000000000000..adcf52454b0e4
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/pinctrl_soc.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZ_RZT2L_PINCTRL_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZ_RZT2L_PINCTRL_SOC_H_
+
+#include <pinctrl_rzt.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_RZT2L_PINCTRL_SOC_H_ */
diff --git a/soc/renesas/rz/rzt2l/sections.ld b/soc/renesas/rz/rzt2l/sections.ld
new file mode 100644
index 0000000000000..f1f3a9665b2ec
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/sections.ld
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/devicetree.h>
+
+SECTION_PROLOGUE(.loader, CONFIG_FLASH_BASE_ADDRESS,)
+{
+	__loader_param_start = .;
+	KEEP(*(.loader_param))
+	__loader_param_end = .;
+	. = DT_REG_ADDR(DT_NODELABEL(loader_program));
+	__loader_program_start = .;
+	KEEP(*(.loader_text.*))
+	__loader_program_end = .;
+} GROUP_LINK_IN(FLASH)
diff --git a/soc/renesas/rz/rzt2l/soc.c b/soc/renesas/rz/rzt2l/soc.c
new file mode 100644
index 0000000000000..28a554f6aa53f
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/soc.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <bsp_api.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/barrier.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
+#include <zephyr/irq.h>
+
+extern void bsp_global_system_counter_init(void);
+
+void *gp_renesas_isr_context[BSP_ICU_VECTOR_MAX_ENTRIES + BSP_CORTEX_VECTOR_TABLE_ENTRIES];
+IRQn_Type g_current_interrupt_num[32];
+uint8_t g_current_interrupt_pointer;
+
+void soc_reset_hook(void)
+{
+	/* Enable peripheral port access at EL1 and EL0 */
+	__asm__ volatile("mrc p15, 0, r0, c15, c0, 0\n");
+	__asm__ volatile("orr r0, #1\n");
+	__asm__ volatile("mcr p15, 0, r0, c15, c0, 0\n");
+	barrier_dsync_fence_full();
+	barrier_isync_fence_full();
+}
+
+void soc_early_init_hook(void)
+{
+	/* Configure system clocks. */
+	bsp_clock_init();
+
+	/* Initialize SystemCoreClock variable. */
+	SystemCoreClockUpdate();
+
+	/* Initialize global system counter. The counter is enabled and is incrementing. */
+	bsp_global_system_counter_init();
+}
+
+unsigned int z_soc_irq_get_active(void)
+{
+	int intid = arm_gic_get_active();
+
+	g_current_interrupt_num[g_current_interrupt_pointer++] = intid;
+
+	return intid;
+}
+
+void z_soc_irq_eoi(unsigned int intid)
+{
+	g_current_interrupt_pointer--;
+	arm_gic_eoi(intid);
+}
+
+void z_soc_irq_enable(unsigned int irq)
+{
+	arm_gic_irq_enable(irq);
+}
+
+void z_soc_irq_disable(unsigned int irq)
+{
+	arm_gic_irq_disable(irq);
+}
+
+int z_soc_irq_is_enabled(unsigned int irq)
+{
+	return arm_gic_irq_is_enabled(irq);
+}
+
+void z_soc_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
+{
+	arm_gic_irq_set_priority(irq, prio, flags);
+}
+
+void z_soc_irq_init(void)
+{
+	g_current_interrupt_pointer = 0;
+}
+
+/* Porting FSP IRQ configuration by an empty function */
+/* Let Zephyr handle IRQ configuration */
+void bsp_irq_core_cfg(void)
+{
+	/* Do nothing */
+}
diff --git a/soc/renesas/rz/rzt2l/soc.h b/soc/renesas/rz/rzt2l/soc.h
new file mode 100644
index 0000000000000..79436f6ad16f4
--- /dev/null
+++ b/soc/renesas/rz/rzt2l/soc.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZT2L_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZT2L_SOC_H_
+
+typedef enum IRQn {
+	SoftwareGeneratedInt0 = 0,
+	SoftwareGeneratedInt1,
+	SoftwareGeneratedInt2,
+	SoftwareGeneratedInt3,
+	SoftwareGeneratedInt4,
+	SoftwareGeneratedInt5,
+	SoftwareGeneratedInt6,
+	SoftwareGeneratedInt7,
+	SoftwareGeneratedInt8,
+	SoftwareGeneratedInt9,
+	SoftwareGeneratedInt10,
+	SoftwareGeneratedInt11,
+	SoftwareGeneratedInt12,
+	SoftwareGeneratedInt13,
+	SoftwareGeneratedInt14,
+	SoftwareGeneratedInt15,
+	DebugCommunicationsChannelInt = 22,
+	PerformanceMonitorCounterOverflowInt = 23,
+	CrossTriggerInterfaceInt = 24,
+	VritualCPUInterfaceMaintenanceInt = 25,
+	HypervisorTimerInt = 26,
+	VirtualTimerInt = 27,
+	NonSecurePhysicalTimerInt = 30,
+	SHARED_PERIPHERAL_INTERRUPTS_MAX_ENTRIES = CONFIG_NUM_IRQS
+} IRQn_Type;
+
+/* Do not let CMSIS to handle GIC and Timer */
+#define __GIC_PRESENT 0
+#define __TIM_PRESENT 0
+#define __FPU_PRESENT 1
+
+/* Porting FSP IRQ configuration by an empty function */
+/* Let Zephyr handle IRQ configuration */
+void bsp_irq_core_cfg(void);
+
+#endif /* ZEPHYR_SOC_RENESAS_RZT2L_SOC_H_ */
diff --git a/soc/renesas/rz/rzt2m/CMakeLists.txt b/soc/renesas/rz/rzt2m/CMakeLists.txt
new file mode 100644
index 0000000000000..539837b1be67f
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(
+  soc.c
+  loader_param.c
+  ../common/loader_program.S
+)
+
+zephyr_include_directories(.)
+
+zephyr_linker_sources(SECTIONS sections.ld)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/rz/rzt2m/Kconfig b/soc/renesas/rz/rzt2m/Kconfig
new file mode 100644
index 0000000000000..5f8948a7c3b61
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/Kconfig
@@ -0,0 +1,14 @@
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZT2M
+	select ARM
+	select CPU_CORTEX_R52
+	select CPU_HAS_ARM_MPU
+	select GIC_SINGLE_SECURITY_STATE
+	select ARM_ARCH_TIMER
+	select HAS_RENESAS_RZ_FSP
+	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
+	select ARM_CUSTOM_INTERRUPT_CONTROLLER
diff --git a/soc/renesas/rz/rzt2m/Kconfig.defconfig b/soc/renesas/rz/rzt2m/Kconfig.defconfig
new file mode 100644
index 0000000000000..c6fc83fcae0e7
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/Kconfig.defconfig
@@ -0,0 +1,31 @@
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RZT2M
+
+config NUM_IRQS
+	default 480
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 25000000
+
+config FPU
+	default y
+
+config FLASH_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
+
+config FLASH_BASE_ADDRESS
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+DT_CHOSEN_IMAGE_ZEPHYR = zephyr,code-partition
+
+config BUILD_OUTPUT_ADJUST_LMA
+	default "($(dt_chosen_reg_addr_hex,$(DT_CHOSEN_IMAGE_ZEPHYR)) + \
+	$(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)))"
+
+config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
+	default "*;!.loader"
+
+endif # SOC_SERIES_RZT2M
diff --git a/soc/renesas/rz/rzt2m/Kconfig.soc b/soc/renesas/rz/rzt2m/Kconfig.soc
new file mode 100644
index 0000000000000..c14a76612e80e
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/Kconfig.soc
@@ -0,0 +1,25 @@
+# Copyright (c) 2023 Antmicro <www.antmicro.com>
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZT2M
+	bool
+	select SOC_FAMILY_RENESAS_RZ
+	help
+	  Renesas RZ/T2M series
+
+config SOC_SERIES
+	default "rzt2m" if SOC_SERIES_RZT2M
+
+config SOC_R9A07G075M24GBG
+	bool
+	select SOC_SERIES_RZT2M
+	help
+	  R9A07G075M24GBG
+
+config SOC_R9A07G075M24GBG_CR520
+	bool
+	select SOC_R9A07G075M24GBG
+
+config SOC
+	default "r9a07g075m24gbg" if SOC_R9A07G075M24GBG
diff --git a/soc/renesas/rzt2m/linker.ld b/soc/renesas/rz/rzt2m/linker.ld
similarity index 100%
rename from soc/renesas/rzt2m/linker.ld
rename to soc/renesas/rz/rzt2m/linker.ld
diff --git a/soc/renesas/rz/rzt2m/loader_param.c b/soc/renesas/rz/rzt2m/loader_param.c
new file mode 100644
index 0000000000000..8c15d563bce1d
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/loader_param.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+#include <zephyr/linker/section_tags.h>
+
+#define CACHE_FLG            (0x00000000)
+#define CS0BCR_V_WRAPCFG_V   (0x00000000)
+#define CS0WCR_V_COMCFG_V    (0x00000000)
+#define DUMMY0_BMCFG_V       (0x00000000)
+#define BSC_FLG_xSPI_FLG     (0x00000000)
+#define LDR_ADDR_NML         (0x6000004C)
+#define LDR_SIZE_NML         (0x00006000)
+#define DEST_ADDR_NML        (0x00102000)
+#define DUMMY1               (0x00000000)
+#define DUMMY2               (0x00000000)
+#define DUMMY3_CSSCTL_V      (0x0000003F)
+#define DUMMY4_LIOCFGCS0_V   (0x00070000)
+#define DUMMY5               (0x00000000)
+#define DUMMY6               (0x00000000)
+#define DUMMY7               (0x00000000)
+#define DUMMY8               (0x00000000)
+#define DUMMY9               (0x00000000)
+#define DUMMY10_ACCESS_SPEED (0x00000006)
+#define CHECK_SUM            (0xE0A8)
+#define LOADER_PARAM_MAX     (19)
+
+#define __loader_param Z_GENERIC_SECTION(.loader_param)
+
+const uint32_t loader_param[LOADER_PARAM_MAX] __loader_param = {
+	CACHE_FLG,
+	CS0BCR_V_WRAPCFG_V,
+	CS0WCR_V_COMCFG_V,
+	DUMMY0_BMCFG_V,
+	BSC_FLG_xSPI_FLG,
+	LDR_ADDR_NML,
+	LDR_SIZE_NML,
+	DEST_ADDR_NML,
+	DUMMY1,
+	DUMMY2,
+	DUMMY3_CSSCTL_V,
+	DUMMY4_LIOCFGCS0_V,
+	DUMMY5,
+	DUMMY6,
+	DUMMY7,
+	DUMMY8,
+	DUMMY9,
+	DUMMY10_ACCESS_SPEED,
+	CHECK_SUM,
+};
diff --git a/soc/renesas/rz/rzt2m/pinctrl_soc.h b/soc/renesas/rz/rzt2m/pinctrl_soc.h
new file mode 100644
index 0000000000000..b4844f72964e6
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/pinctrl_soc.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2023 Antmicro <www.antmicro.com>
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZ_RZT2M_PINCTRL_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZ_RZT2M_PINCTRL_SOC_H_
+
+#include <pinctrl_rzt.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_RZT2M_PINCTRL_SOC_H_ */
diff --git a/soc/renesas/rz/rzt2m/sections.ld b/soc/renesas/rz/rzt2m/sections.ld
new file mode 100644
index 0000000000000..f1f3a9665b2ec
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/sections.ld
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/devicetree.h>
+
+SECTION_PROLOGUE(.loader, CONFIG_FLASH_BASE_ADDRESS,)
+{
+	__loader_param_start = .;
+	KEEP(*(.loader_param))
+	__loader_param_end = .;
+	. = DT_REG_ADDR(DT_NODELABEL(loader_program));
+	__loader_program_start = .;
+	KEEP(*(.loader_text.*))
+	__loader_program_end = .;
+} GROUP_LINK_IN(FLASH)
diff --git a/soc/renesas/rz/rzt2m/soc.c b/soc/renesas/rz/rzt2m/soc.c
new file mode 100644
index 0000000000000..951f99473e36a
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/soc.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2023 Antmicro <www.antmicro.com>
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <bsp_api.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/barrier.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
+#include <zephyr/irq.h>
+
+extern void bsp_global_system_counter_init(void);
+
+void *gp_renesas_isr_context[BSP_ICU_VECTOR_MAX_ENTRIES + BSP_CORTEX_VECTOR_TABLE_ENTRIES];
+IRQn_Type g_current_interrupt_num[32];
+uint8_t g_current_interrupt_pointer;
+
+void soc_reset_hook(void)
+{
+	/* Enable peripheral port access at EL1 and EL0 */
+	__asm__ volatile("mrc p15, 0, r0, c15, c0, 0\n");
+	__asm__ volatile("orr r0, #1\n");
+	__asm__ volatile("mcr p15, 0, r0, c15, c0, 0\n");
+	barrier_dsync_fence_full();
+	barrier_isync_fence_full();
+}
+
+void soc_early_init_hook(void)
+{
+	/* Configure system clocks. */
+	bsp_clock_init();
+
+	/* Initialize SystemCoreClock variable. */
+	SystemCoreClockUpdate();
+
+	/* Initialize global system counter. The counter is enabled and is incrementing. */
+	bsp_global_system_counter_init();
+}
+
+unsigned int z_soc_irq_get_active(void)
+{
+	int intid = arm_gic_get_active();
+
+	g_current_interrupt_num[g_current_interrupt_pointer++] = intid;
+
+	return intid;
+}
+
+void z_soc_irq_eoi(unsigned int intid)
+{
+	g_current_interrupt_pointer--;
+	arm_gic_eoi(intid);
+}
+
+void z_soc_irq_enable(unsigned int irq)
+{
+	arm_gic_irq_enable(irq);
+}
+
+void z_soc_irq_disable(unsigned int irq)
+{
+	arm_gic_irq_disable(irq);
+}
+
+int z_soc_irq_is_enabled(unsigned int irq)
+{
+	return arm_gic_irq_is_enabled(irq);
+}
+
+void z_soc_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
+{
+	arm_gic_irq_set_priority(irq, prio, flags);
+}
+
+void z_soc_irq_init(void)
+{
+	g_current_interrupt_pointer = 0;
+}
+
+/* Porting FSP IRQ configuration by an empty function */
+/* Let Zephyr handle IRQ configuration */
+void bsp_irq_core_cfg(void)
+{
+	/* Do nothing */
+}
diff --git a/soc/renesas/rz/rzt2m/soc.h b/soc/renesas/rz/rzt2m/soc.h
new file mode 100644
index 0000000000000..e17e05f67a589
--- /dev/null
+++ b/soc/renesas/rz/rzt2m/soc.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023 Antmicro <www.antmicro.com>
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZT2M_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZT2M_SOC_H_
+
+typedef enum IRQn {
+	SoftwareGeneratedInt0 = 0,
+	SoftwareGeneratedInt1,
+	SoftwareGeneratedInt2,
+	SoftwareGeneratedInt3,
+	SoftwareGeneratedInt4,
+	SoftwareGeneratedInt5,
+	SoftwareGeneratedInt6,
+	SoftwareGeneratedInt7,
+	SoftwareGeneratedInt8,
+	SoftwareGeneratedInt9,
+	SoftwareGeneratedInt10,
+	SoftwareGeneratedInt11,
+	SoftwareGeneratedInt12,
+	SoftwareGeneratedInt13,
+	SoftwareGeneratedInt14,
+	SoftwareGeneratedInt15,
+	DebugCommunicationsChannelInt = 22,
+	PerformanceMonitorCounterOverflowInt = 23,
+	CrossTriggerInterfaceInt = 24,
+	VritualCPUInterfaceMaintenanceInt = 25,
+	HypervisorTimerInt = 26,
+	VirtualTimerInt = 27,
+	NonSecurePhysicalTimerInt = 30,
+	SHARED_PERIPHERAL_INTERRUPTS_MAX_ENTRIES = CONFIG_NUM_IRQS
+} IRQn_Type;
+
+/* Do not let CMSIS to handle GIC and Timer */
+#define __GIC_PRESENT 0
+#define __TIM_PRESENT 0
+#define __FPU_PRESENT 1
+
+/* Porting FSP IRQ configuration by an empty function */
+/* Let Zephyr handle IRQ configuration */
+void bsp_irq_core_cfg(void);
+
+#endif /* ZEPHYR_SOC_RENESAS_RZT2M_SOC_H_ */
diff --git a/soc/renesas/rz/rzv2l/CMakeLists.txt b/soc/renesas/rz/rzv2l/CMakeLists.txt
new file mode 100644
index 0000000000000..a58ca9b77f578
--- /dev/null
+++ b/soc/renesas/rz/rzv2l/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(soc.c)
+
+zephyr_include_directories(.)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/rz/rzv2l/Kconfig b/soc/renesas/rz/rzv2l/Kconfig
new file mode 100644
index 0000000000000..408fc656c7ea0
--- /dev/null
+++ b/soc/renesas/rz/rzv2l/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZV2L
+	select ARM
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_MPU
+	select HAS_RENESAS_RZ_FSP
+	select CPU_CORTEX_M_HAS_DWT
+	select SOC_EARLY_INIT_HOOK
diff --git a/soc/renesas/rz/rzv2l/Kconfig.defconfig b/soc/renesas/rz/rzv2l/Kconfig.defconfig
new file mode 100644
index 0000000000000..335d6e01d91dc
--- /dev/null
+++ b/soc/renesas/rz/rzv2l/Kconfig.defconfig
@@ -0,0 +1,27 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_RZV2L
+
+config NUM_IRQS
+	default 480
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default	$(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
+
+config FLASH_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
+
+config FLASH_BASE_ADDRESS
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
+
+config SYS_CLOCK_EXISTS
+	default y
+
+config INIT_ARCH_HW_AT_BOOT
+	default y
+
+config BUILD_OUTPUT_S19
+	default y
+
+endif # SOC_SERIES_RZV2L
diff --git a/soc/renesas/rz/rzv2l/Kconfig.soc b/soc/renesas/rz/rzv2l/Kconfig.soc
new file mode 100644
index 0000000000000..8741126737975
--- /dev/null
+++ b/soc/renesas/rz/rzv2l/Kconfig.soc
@@ -0,0 +1,24 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_RZV2L
+	bool
+	select SOC_FAMILY_RENESAS_RZ
+	help
+	  Renesas RZ/V2L series
+
+config SOC_SERIES
+	default "rzv2l" if SOC_SERIES_RZV2L
+
+config SOC_R9A07G054L23GBG
+	bool
+	select SOC_SERIES_RZV2L
+	help
+	  R9A07G054L23GBG
+
+config SOC_R9A07G054L23GBG_CM33
+	bool
+	select SOC_R9A07G054L23GBG
+
+config SOC
+	default "r9a07g054l23gbg" if SOC_R9A07G054L23GBG
diff --git a/soc/renesas/rz/rzv2l/pinctrl_soc.h b/soc/renesas/rz/rzv2l/pinctrl_soc.h
new file mode 100644
index 0000000000000..e2c055c173da6
--- /dev/null
+++ b/soc/renesas/rz/rzv2l/pinctrl_soc.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZ_RZV2L_PINCTRL_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZ_RZV2L_PINCTRL_SOC_H_
+
+#include <pinctrl_rzv.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZ_RZV2L_PINCTRL_SOC_H_ */
diff --git a/soc/renesas/rz/rzv2l/soc.c b/soc/renesas/rz/rzv2l/soc.c
new file mode 100644
index 0000000000000..ac2139cf7fa8c
--- /dev/null
+++ b/soc/renesas/rz/rzv2l/soc.c
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief System/hardware module for Renesas RZ/V2L Group
+ */
+
+#include <zephyr/init.h>
+#include <bsp_api.h>
+
+/* System core clock is set to 200 MHz after reset */
+uint32_t SystemCoreClock = 200000000;
+
+void soc_early_init_hook(void)
+{
+	bsp_clock_init();
+}
diff --git a/soc/renesas/rz/rzv2l/soc.h b/soc/renesas/rz/rzv2l/soc.h
new file mode 100644
index 0000000000000..dd59487008aed
--- /dev/null
+++ b/soc/renesas/rz/rzv2l/soc.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_RENESAS_RZV2L_SOC_H_
+#define ZEPHYR_SOC_RENESAS_RZV2L_SOC_H_
+
+#include <bsp_api.h>
+
+#endif /* ZEPHYR_SOC_RENESAS_RZV2L_SOC_H_ */
diff --git a/soc/renesas/rz/soc.yml b/soc/renesas/rz/soc.yml
index 3cc8edd8baf78..9d831dc8b0793 100644
--- a/soc/renesas/rz/soc.yml
+++ b/soc/renesas/rz/soc.yml
@@ -1,8 +1,35 @@
 family:
   - name: renesas_rz
     series:
+      - name: rza3ul
+        socs:
+          - name: r9a07g063u02gbg
+      - name: rzg2l
+        socs:
+          - name: r9a07g044l23gbg
+            cpuclusters:
+              - name: cm33
+          - name: r9a07g044c22gbg
+            cpuclusters:
+              - name: cm33
       - name: rzg3s
         socs:
           - name: r9a08g045s33gbg
             cpuclusters:
               - name: cm33
+      - name: rzv2l
+        socs:
+          - name: r9a07g054l23gbg
+            cpuclusters:
+              - name: cm33
+      - name: rzn2l
+        socs:
+          - name: r9a07g084m04gbg
+      - name: rzt2l
+        socs:
+          - name: r9a07g074m04gbg
+      - name: rzt2m
+        socs:
+          - name: r9a07g075m24gbg
+            cpuclusters:
+              - name: cr520
diff --git a/soc/renesas/rzt2m/CMakeLists.txt b/soc/renesas/rzt2m/CMakeLists.txt
deleted file mode 100644
index 8cf72713d110d..0000000000000
--- a/soc/renesas/rzt2m/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2023 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_sources(soc.c)
-
-zephyr_include_directories(.)
-
-set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/renesas/rzt2m/Kconfig b/soc/renesas/rzt2m/Kconfig
deleted file mode 100644
index 1b0d438c31f55..0000000000000
--- a/soc/renesas/rzt2m/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2023 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_RENESAS_RZT2M
-	select ARM
-	select CPU_CORTEX_R52
-	select CPU_HAS_ARM_MPU
-	select GIC_SINGLE_SECURITY_STATE
-	select ARM_ARCH_TIMER
-	select SYSCON
-	select SOC_EARLY_INIT_HOOK
diff --git a/soc/renesas/rzt2m/Kconfig.defconfig b/soc/renesas/rzt2m/Kconfig.defconfig
deleted file mode 100644
index 7eedc53ffc64d..0000000000000
--- a/soc/renesas/rzt2m/Kconfig.defconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2023 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_RENESAS_RZT2M
-
-config NUM_IRQS
-	default 994
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 20000000
-
-config FPU
-	default y
-
-config FLASH_SIZE
-	default 0
-
-config FLASH_BASE_ADDRESS
-	default 0
-
-endif # SOC_RENESAS_RZT2M
diff --git a/soc/renesas/rzt2m/Kconfig.soc b/soc/renesas/rzt2m/Kconfig.soc
deleted file mode 100644
index 9304484d06558..0000000000000
--- a/soc/renesas/rzt2m/Kconfig.soc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2023 Antmicro <www.antmicro.com>
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_RENESAS_RZT2M
-	bool
-
-config SOC_PART_NUMBER_R9A07G075
-	bool
-
-config SOC
-	default "renesas_rzt2m" if SOC_RENESAS_RZT2M
-
-config SOC_PART_NUMBER
-	default "R9A07G075" if SOC_PART_NUMBER_R9A07G075
diff --git a/soc/renesas/rzt2m/pinctrl_soc.h b/soc/renesas/rzt2m/pinctrl_soc.h
deleted file mode 100644
index d740d6c115e9b..0000000000000
--- a/soc/renesas/rzt2m/pinctrl_soc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2023 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_SOC_ARM_RENESAS_RZT2M_PINCTRL_H_
-#define ZEPHYR_SOC_ARM_RENESAS_RZT2M_PINCTRL_H_
-
-#include <zephyr/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct pinctrl_soc_pin_t {
-	uint32_t port;
-	uint32_t pin;
-	uint32_t func;
-	uint32_t input_enable: 1;
-	uint32_t output_enable: 1;
-	uint32_t pull_up: 1;
-	uint32_t pull_down: 1;
-	uint32_t high_impedance: 1;
-	uint32_t slew_rate: 2;
-	uint8_t drive_strength;
-	uint32_t schmitt_enable: 1;
-} pinctrl_soc_pin_t;
-
-#define RZT2M_GET_PORT(pinctrl) ((pinctrl >> 16) & 0xff)
-#define RZT2M_GET_PIN(pinctrl) ((pinctrl >> 8) & 0xff)
-#define RZT2M_GET_FUNC(pinctrl) (pinctrl & 0xff)
-
-#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)			\
-	{							\
-		.port = RZT2M_GET_PORT(DT_PROP_BY_IDX(node_id, prop, idx)),	\
-		.pin = RZT2M_GET_PIN(DT_PROP_BY_IDX(node_id, prop, idx)),	\
-		.func = RZT2M_GET_FUNC(DT_PROP_BY_IDX(node_id, prop, idx)),	\
-		.input_enable = DT_PROP(node_id, input_enable),	\
-		.pull_up = DT_PROP(node_id, bias_pull_up),	\
-		.pull_down = DT_PROP(node_id, bias_pull_down),	\
-		.high_impedance = DT_PROP(node_id, bias_high_impedance),	\
-		.slew_rate = DT_ENUM_IDX(node_id, slew_rate),	\
-		.drive_strength = DT_ENUM_IDX(node_id, drive_strength),	\
-		.schmitt_enable = DT_PROP(node_id, input_schmitt_enable),	\
-	},
-
-#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                \
-	{DT_FOREACH_CHILD_VARGS(DT_PHANDLE(node_id, prop),	\
-				DT_FOREACH_PROP_ELEM, pinmux,   \
-				Z_PINCTRL_STATE_PIN_INIT)}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_SOC_ARM_RENESAS_RZT2M_PINCTRL_H_ */
diff --git a/soc/renesas/rzt2m/soc.c b/soc/renesas/rzt2m/soc.c
deleted file mode 100644
index 183381179ba61..0000000000000
--- a/soc/renesas/rzt2m/soc.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2023 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/init.h>
-#include <stdint.h>
-#include <zephyr/drivers/syscon.h>
-#include "soc.h"
-#include <zephyr/sys/util_macro.h>
-
-static const struct device *const prcrn_dev = DEVICE_DT_GET(DT_NODELABEL(prcrn));
-static const struct device *const prcrs_dev = DEVICE_DT_GET(DT_NODELABEL(prcrs));
-static const struct device *const sckcr_dev = DEVICE_DT_GET(DT_NODELABEL(sckcr));
-static const struct device *const sckcr2_dev = DEVICE_DT_GET(DT_NODELABEL(sckcr2));
-
-void rzt2m_unlock_prcrn(uint32_t mask)
-{
-	uint32_t prcrn;
-
-	syscon_read_reg(prcrn_dev, 0, &prcrn);
-	prcrn |= PRC_KEY_CODE | mask;
-
-	syscon_write_reg(prcrn_dev, 0, prcrn);
-}
-
-void rzt2m_lock_prcrn(uint32_t mask)
-{
-	uint32_t prcrn;
-
-	syscon_read_reg(prcrn_dev, 0, &prcrn);
-	prcrn &= ~mask;
-	prcrn |= PRC_KEY_CODE;
-
-	syscon_write_reg(prcrn_dev, 0, prcrn);
-}
-
-void rzt2m_unlock_prcrs(uint32_t mask)
-{
-	uint32_t prcrs;
-
-	syscon_read_reg(prcrs_dev, 0, &prcrs);
-	prcrs |= PRC_KEY_CODE | mask;
-
-	syscon_write_reg(prcrs_dev, 0, prcrs);
-}
-
-void rzt2m_lock_prcrs(uint32_t mask)
-{
-	uint32_t prcrs;
-
-	syscon_read_reg(prcrs_dev, 0, &prcrs);
-	prcrs &= ~mask;
-	prcrs |= PRC_KEY_CODE;
-
-	syscon_write_reg(prcrs_dev, 0, prcrs);
-}
-
-void rzt2m_set_sckcr2(uint32_t mask)
-{
-	syscon_write_reg(sckcr2_dev, 0, mask);
-}
-
-uint32_t rzt2m_get_sckcr2(void)
-{
-	uint32_t reg;
-
-	syscon_read_reg(sckcr2_dev, 0, &reg);
-	return reg;
-}
-
-void rzt2m_set_sckcr(uint32_t mask)
-{
-	syscon_write_reg(sckcr_dev, 0, mask);
-}
-
-uint32_t rzt2m_get_sckcr(void)
-{
-	uint32_t reg;
-
-	syscon_read_reg(sckcr_dev, 0, &reg);
-	return reg;
-}
-
-void rzt2m_enable_counters(void)
-{
-	const struct device *const dev = DEVICE_DT_GET(DT_NODELABEL(gsc));
-
-	syscon_write_reg(dev, 0, CNTCR_EN);
-}
-
-void soc_early_init_hook(void)
-{
-	/* Unlock the Protect Registers
-	 * so that device drivers can access configuration registers of peripherals.
-	 */
-	/* After the device drivers are done, lock the Protect Registers. */
-	rzt2m_unlock_prcrs(PRCRS_GPIO | PRCRS_CLK);
-	rzt2m_unlock_prcrn(PRCRN_PRC1 | PRCRN_PRC2 | PRCRN_PRC0);
-
-	/* Reset the System Clock Control Registers to default values */
-	rzt2m_set_sckcr(
-		CLMASEL |
-		PHYSEL |
-		FSELCANFD |
-		FSELXSPI0_DEFAULT |
-		FSELXSPI1_DEFAULT |
-		CKIO_DEFAULT
-	);
-
-	rzt2m_set_sckcr2(FSELCPU0_DEFAULT | FSELCPU1_DEFAULT);
-
-	rzt2m_lock_prcrs(PRCRS_GPIO | PRCRS_CLK);
-	rzt2m_lock_prcrn(PRCRN_PRC1 | PRCRN_PRC2 | PRCRN_PRC0);
-
-	rzt2m_enable_counters();
-}
diff --git a/soc/renesas/rzt2m/soc.h b/soc/renesas/rzt2m/soc.h
deleted file mode 100644
index 64ccdc0e0b5e7..0000000000000
--- a/soc/renesas/rzt2m/soc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2023 Antmicro <www.antmicro.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _SOC__H_
-#define _SOC__H_
-
-/* Do not let CMSIS to handle GIC and Timer */
-#include <stdint.h>
-#define __GIC_PRESENT 0
-#define __TIM_PRESENT 0
-
-/* Global system counter */
-#define CNTCR_EN   BIT(0)
-#define CNTCR_HDBG BIT(1)
-
-/* Safety area protect register */
-#define PRCRS_CLK       BIT(0)
-#define PRCRS_LPC_RESET BIT(1)
-#define PRCRS_GPIO      BIT(2)
-#define PRCRS_SYS_CTRL  BIT(3)
-
-/* Non-safety area protect register */
-#define PRCRN_PRC0 BIT(0)
-#define PRCRN_PRC1 BIT(1)
-#define PRCRN_PRC2 BIT(2)
-
-#define SCI4ASYNCSEL BIT(31)
-#define SCI3ASYNCSEL BIT(30)
-#define SCI2ASYNCSEL BIT(29)
-#define SCI1ASYNCSEL BIT(28)
-#define SCI0ASYNCSEL BIT(27)
-#define SPI2ASYNCSEL BIT(26)
-#define SPI1ASYNCSEL BIT(25)
-#define SPI0ASYNCSEL BIT(24)
-#define CLMASEL      BIT(22)
-#define PHYSEL       BIT(21)
-#define FSELCANFD    BIT(20)
-#define DIVSELXSPI1  BIT(14)
-#define DIVSELXSPI0  BIT(6)
-
-#define CKIO_DEFAULT      BIT(17)
-#define FSELXSPI1_DEFAULT GENMASK(10, 9)
-#define FSELXSPI0_DEFAULT GENMASK(2, 1)
-
-#define SCI5ASYNCSEL     BIT(25)
-#define SPI3ASYNCSEL     BIT(24)
-#define DIVSELSUB        BIT(5)
-#define FSELCPU1_DEFAULT 0b10 << 2
-#define FSELCPU0_DEFAULT 0b10 << 0
-
-/* PRC Key Code - this value is required to allow any write operation
- * to the PRCRS / PRCRN registers.
- * See section 10.2 of the RZ/T2M User's Manual: Hardware.
- */
-#define PRC_KEY_CODE 0xa500
-
-void rzt2m_unlock_prcrn(uint32_t mask);
-void rzt2m_lock_prcrn(uint32_t mask);
-void rzt2m_unlock_prcrs(uint32_t mask);
-void rzt2m_lock_prcrs(uint32_t mask);
-
-void rzt2m_set_sckcr2(uint32_t mask);
-uint32_t rzt2m_get_sckcr2(void);
-void rzt2m_set_sckcr(uint32_t mask);
-uint32_t rzt2m_get_sckcr(void);
-
-#endif /* _SOC__H_ */
diff --git a/soc/renesas/rzt2m/soc.yml b/soc/renesas/rzt2m/soc.yml
deleted file mode 100644
index 35c7cc27f7703..0000000000000
--- a/soc/renesas/rzt2m/soc.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-socs:
-  - name: renesas_rzt2m
diff --git a/soc/renesas/smartbond/da1469x/Kconfig.soc b/soc/renesas/smartbond/da1469x/Kconfig.soc
index b52b290593615..748db2d2c465a 100644
--- a/soc/renesas/smartbond/da1469x/Kconfig.soc
+++ b/soc/renesas/smartbond/da1469x/Kconfig.soc
@@ -13,6 +13,12 @@ config SOC_DA14695
 	help
 	  DA14695
 
+config SOC_DA14697
+	bool
+	select SOC_SERIES_DA1469X
+	help
+	  DA14697
+
 config SOC_DA14699
 	bool
 	select SOC_SERIES_DA1469X
@@ -24,4 +30,5 @@ config SOC_SERIES
 
 config SOC
 	default "da14695" if SOC_DA14695
+	default "da14697" if SOC_DA14697
 	default "da14699" if SOC_DA14699
diff --git a/soc/renesas/smartbond/soc.yml b/soc/renesas/smartbond/soc.yml
index ee32857c5b75e..34e9a0da30280 100644
--- a/soc/renesas/smartbond/soc.yml
+++ b/soc/renesas/smartbond/soc.yml
@@ -4,4 +4,5 @@ family:
       - name: da1469x
         socs:
           - name: da14695
+          - name: da14697
           - name: da14699
diff --git a/soc/silabs/common/pinctrl_soc.h b/soc/silabs/common/pinctrl_soc.h
index 9b4d27c9a54fd..079c056c63639 100644
--- a/soc/silabs/common/pinctrl_soc.h
+++ b/soc/silabs/common/pinctrl_soc.h
@@ -74,7 +74,10 @@ typedef struct pinctrl_soc_pin {
 		 (FIELD_GET(SILABS_PINCTRL_HAVE_EN_MASK, DT_PROP_BY_IDX(node, prop, idx))          \
 			  ? FIELD_GET(SILABS_PINCTRL_EN_BIT_MASK, DT_PROP_BY_IDX(node, prop, idx)) \
 			  : SILABS_PINCTRL_UNUSED),                                                \
-	 .route_offset = FIELD_GET(SILABS_PINCTRL_ROUTE_MASK, DT_PROP_BY_IDX(node, prop, idx)),    \
+	 .route_offset =                                                                           \
+		 (FIELD_GET(SILABS_PINCTRL_HAVE_ROUTE_MASK, DT_PROP_BY_IDX(node, prop, idx))       \
+			  ? FIELD_GET(SILABS_PINCTRL_ROUTE_MASK, DT_PROP_BY_IDX(node, prop, idx))  \
+			  : SILABS_PINCTRL_UNUSED),                                                \
 	 .mode = Z_PINCTRL_SILABS_MODE_INIT(node),                                                 \
 	 .dout = Z_PINCTRL_SILABS_DOUT_INIT(node)},
 
diff --git a/soc/silabs/silabs_s2/Kconfig.defconfig b/soc/silabs/silabs_s2/Kconfig.defconfig
index d7dec5deb3df8..339b1df67783c 100644
--- a/soc/silabs/silabs_s2/Kconfig.defconfig
+++ b/soc/silabs/silabs_s2/Kconfig.defconfig
@@ -5,17 +5,32 @@ rsource "*/Kconfig.defconfig"
 
 if SOC_FAMILY_SILABS_S2
 
-config SYS_CLOCK_HW_CYCLES_PER_SEC
+configdefault SYS_CLOCK_HW_CYCLES_PER_SEC
 	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency) if CORTEX_M_SYSTICK
 	default 32768
 
-config SYS_CLOCK_TICKS_PER_SEC
-	default 1024 if SILABS_SLEEPTIMER_TIMER || GECKO_BURTC_TIMER
+configdefault SYS_CLOCK_TICKS_PER_SEC
+	default 128 if !TICKLESS_KERNEL && (SILABS_SLEEPTIMER_TIMER || GECKO_BURTC_TIMER)
+	default 32768 if SILABS_SLEEPTIMER_TIMER
+	default 1024 if GECKO_BURTC_TIMER
 
-config SILABS_SLEEPTIMER_TIMER
+configdefault SILABS_SLEEPTIMER_TIMER
 	default y
 
-config CORTEX_M_SYSTICK
+configdefault CORTEX_M_SYSTICK
 	default n if SILABS_SLEEPTIMER_TIMER || GECKO_BURTC_TIMER
 
+# silabs_s2 uses simplicity_sdk hal library, which already have by default a zero latency
+# IRQs mechanism with a hardcoded value. In order to be aligned with simplicity_sdk, we
+# need to activate Zero Latency IRQ in Zephyr by default. The level (2) depends on the
+# hardcoded value in simplicity_sdk (CORE_ATOMIC_BASE_PRIORITY_LEVEL). Without this config,
+# if you use an IRQ with a priority of 0 or 1, irq_lock() and irq_unlock() have no effect
+# over this IRQ.
+
+configdefault ZERO_LATENCY_IRQS
+	default y
+
+configdefault ZERO_LATENCY_LEVELS
+	default 2
+
 endif
diff --git a/soc/silabs/silabs_siwx91x/Kconfig b/soc/silabs/silabs_siwx91x/Kconfig
index a1f7371e9fb02..eb696d43d1934 100644
--- a/soc/silabs/silabs_siwx91x/Kconfig
+++ b/soc/silabs/silabs_siwx91x/Kconfig
@@ -9,3 +9,8 @@ config SOC_FAMILY_SILABS_SIWX91X
 	select CPU_HAS_ARM_MPU
 	select HAS_SILABS_WISECONNECT
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+
+config SOC_SILABS_SLEEPTIMER
+	bool
+	help
+	  The Sleeptimer HAL module is used for SIWX91X.
diff --git a/soc/silabs/silabs_siwx91x/Kconfig.defconfig b/soc/silabs/silabs_siwx91x/Kconfig.defconfig
index eeef3b6a75363..7485a1750289b 100644
--- a/soc/silabs/silabs_siwx91x/Kconfig.defconfig
+++ b/soc/silabs/silabs_siwx91x/Kconfig.defconfig
@@ -3,6 +3,16 @@
 
 if SOC_FAMILY_SILABS_SIWX91X
 
+configdefault SILABS_SLEEPTIMER_TIMER
+	default y if PM
+
+configdefault CORTEX_M_SYSTICK
+	default n if SILABS_SLEEPTIMER_TIMER
+
+configdefault SYS_CLOCK_TICKS_PER_SEC
+	default 128 if !TICKLESS_KERNEL && SILABS_SLEEPTIMER_TIMER
+	default 1024 if SILABS_SLEEPTIMER_TIMER
+
 config WISECONNECT_NETWORK_STACK
 	bool
 	select CMSIS_RTOS_V2
diff --git a/soc/silabs/silabs_siwx91x/siwg917/CMakeLists.txt b/soc/silabs/silabs_siwx91x/siwg917/CMakeLists.txt
index 33985be7796fc..d49353f778112 100644
--- a/soc/silabs/silabs_siwx91x/siwg917/CMakeLists.txt
+++ b/soc/silabs/silabs_siwx91x/siwg917/CMakeLists.txt
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources_ifdef(CONFIG_SOC_SERIES_SIWG917 soc.c)
-zephyr_sources_ifdef(CONFIG_WISECONNECT_NETWORK_STACK nwp_init.c)
+zephyr_sources_ifdef(CONFIG_WISECONNECT_NETWORK_STACK nwp.c)
 
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/silabs/silabs_siwx91x/siwg917/linker.ld b/soc/silabs/silabs_siwx91x/siwg917/linker.ld
index b21a3cca0ee51..b6e2b16cc91bd 100644
--- a/soc/silabs/silabs_siwx91x/siwg917/linker.ld
+++ b/soc/silabs/silabs_siwx91x/siwg917/linker.ld
@@ -5,29 +5,10 @@
  */
 #include <zephyr/arch/arm/cortex_m/scripts/linker.ld>
 
-MEMORY
-{
-	udma0   (rwx)  : ORIGIN = 0x0002fc00, LENGTH = 0x00000400
-	udma1   (rwx)  : ORIGIN = 0x24061c00, LENGTH = 0x00000400
-}
-
 SECTIONS
 {
 	.common_tcm_code :
 	{
 		*(.common_tcm_code*)
 	} > FLASH
-
-	/* These regions of SRAM is where the UDMA descriptors are stored. The corresponding
-	   section must be properly declared in the linker script to ensure correct data transfer
-	   and proper functioning of the UDMA module */
-	.udma_addr0 :
-	{
-		*(.udma_addr0*)
-	} > udma0 AT> FLASH
-
-	.udma_addr1 :
-	{
-		*(.udma_addr1*)
-	} > udma1 AT> FLASH
 }
diff --git a/soc/silabs/silabs_siwx91x/siwg917/nwp.c b/soc/silabs/silabs_siwx91x/siwg917/nwp.c
new file mode 100644
index 0000000000000..3882fcf07fb10
--- /dev/null
+++ b/soc/silabs/silabs_siwx91x/siwg917/nwp.c
@@ -0,0 +1,212 @@
+/**
+ * @file
+ * @brief Network Processor Initialization for SiWx91x.
+ *
+ * This file contains the initialization routine for the (ThreadArch) network processor
+ * on the SiWx91x platform. The component is responsible for setting up the necessary
+ * hardware and software components to enable network communication.
+ *
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/net/wifi.h>
+#include <zephyr/logging/log.h>
+
+#include "nwp.h"
+#include "sl_wifi_callback_framework.h"
+#ifdef CONFIG_BT_SILABS_SIWX91X
+#include "rsi_ble_common_config.h"
+#endif
+
+LOG_MODULE_REGISTER(siwx91x_nwp);
+
+BUILD_ASSERT(DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) == KB(196) ||
+	     DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) == KB(256) ||
+	     DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) == KB(320));
+
+int siwg91x_get_nwp_config(int wifi_oper_mode, sl_wifi_device_configuration_t *get_config)
+{
+	sl_wifi_device_configuration_t default_config = {
+		.band = SL_SI91X_WIFI_BAND_2_4GHZ,
+		.region_code = DEFAULT_REGION,
+		.boot_option = LOAD_NWP_FW,
+		.boot_config = {
+			.feature_bit_map = SL_SI91X_FEAT_SECURITY_OPEN | SL_SI91X_FEAT_WPS_DISABLE,
+			.tcp_ip_feature_bit_map = SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID,
+			.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
+			.ext_custom_feature_bit_map = SL_SI91X_EXT_FEAT_XTAL_CLK,
+		}
+	};
+	sl_si91x_boot_configuration_t *boot_config = &default_config.boot_config;
+
+	__ASSERT(get_config, "get_config cannot be NULL");
+
+	if (DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) == KB(196)) {
+		boot_config->ext_custom_feature_bit_map |= SL_SI91X_EXT_FEAT_480K_M4SS_192K;
+	} else if (DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) == KB(256)) {
+		boot_config->ext_custom_feature_bit_map |= SL_SI91X_EXT_FEAT_416K_M4SS_256K;
+	} else if (DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) == KB(320)) {
+		boot_config->ext_custom_feature_bit_map |= SL_SI91X_EXT_FEAT_352K_M4SS_320K;
+	} else {
+		 k_panic();
+	}
+
+	if (wifi_oper_mode == SL_SI91X_CLIENT_MODE) {
+		boot_config->oper_mode = SL_SI91X_CLIENT_MODE;
+
+		if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X_ROAMING_USE_DEAUTH)) {
+			boot_config->custom_feature_bit_map |=
+				SL_SI91X_CUSTOM_FEAT_ROAM_WITH_DEAUTH_OR_NULL_DATA;
+		}
+
+		if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X) &&
+		    IS_ENABLED(CONFIG_BT_SILABS_SIWX91X)) {
+			boot_config->coex_mode = SL_SI91X_WLAN_BLE_MODE;
+		} else if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X)) {
+			boot_config->coex_mode = SL_SI91X_WLAN_ONLY_MODE;
+		} else if (IS_ENABLED(CONFIG_BT_SILABS_SIWX91X)) {
+			boot_config->coex_mode = SL_SI91X_BLE_MODE;
+		} else {
+			/*
+			 * Even if neither WiFi or BLE is used we have to specify a Coex mode
+			 */
+			boot_config->coex_mode = SL_SI91X_BLE_MODE;
+		}
+
+#ifdef CONFIG_WIFI_SILABS_SIWX91X
+		boot_config->ext_tcp_ip_feature_bit_map = SL_SI91X_CONFIG_FEAT_EXTENSION_VALID;
+		boot_config->config_feature_bit_map = SL_SI91X_ENABLE_ENHANCED_MAX_PSP;
+		boot_config->ext_custom_feature_bit_map |=
+			SL_SI91X_EXT_FEAT_IEEE_80211W |
+			SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0;
+#endif
+
+#ifdef CONFIG_BT_SILABS_SIWX91X
+		boot_config->ext_custom_feature_bit_map |= SL_SI91X_EXT_FEAT_BT_CUSTOM_FEAT_ENABLE;
+		boot_config->bt_feature_bit_map |=
+			SL_SI91X_BT_RF_TYPE | SL_SI91X_ENABLE_BLE_PROTOCOL;
+		boot_config->ble_feature_bit_map |=
+			SL_SI91X_BLE_MAX_NBR_PERIPHERALS(RSI_BLE_MAX_NBR_PERIPHERALS) |
+			SL_SI91X_BLE_MAX_NBR_CENTRALS(RSI_BLE_MAX_NBR_CENTRALS) |
+			SL_SI91X_BLE_MAX_NBR_ATT_SERV(RSI_BLE_MAX_NBR_ATT_SERV) |
+			SL_SI91X_BLE_MAX_NBR_ATT_REC(RSI_BLE_MAX_NBR_ATT_REC) |
+			SL_SI91X_BLE_PWR_INX(RSI_BLE_PWR_INX) |
+			SL_SI91X_BLE_PWR_SAVE_OPTIONS(RSI_BLE_PWR_SAVE_OPTIONS) |
+			SL_SI91X_916_BLE_COMPATIBLE_FEAT_ENABLE |
+			SL_SI91X_FEAT_BLE_CUSTOM_FEAT_EXTENSION_VALID;
+		boot_config->ble_ext_feature_bit_map |=
+			SL_SI91X_BLE_NUM_CONN_EVENTS(RSI_BLE_NUM_CONN_EVENTS) |
+			SL_SI91X_BLE_NUM_REC_BYTES(RSI_BLE_NUM_REC_BYTES) |
+			SL_SI91X_BLE_ENABLE_ADV_EXTN |
+			SL_SI91X_BLE_AE_MAX_ADV_SETS(RSI_BLE_AE_MAX_ADV_SETS);
+#endif
+	} else if (wifi_oper_mode == SL_SI91X_ACCESS_POINT_MODE) {
+		boot_config->oper_mode = SL_SI91X_ACCESS_POINT_MODE;
+		boot_config->coex_mode = SL_SI91X_WLAN_ONLY_MODE;
+
+		if (IS_ENABLED(CONFIG_BT_SILABS_SIWX91X)) {
+			LOG_WRN("Bluetooth is not supported in AP mode");
+		}
+	} else {
+		return -EINVAL;
+	}
+
+#ifdef CONFIG_WIFI_SILABS_SIWX91X
+	if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X_NET_STACK_OFFLOAD)) {
+		boot_config->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_ICMP;
+		boot_config->ext_tcp_ip_feature_bit_map |= SL_SI91X_EXT_TCP_IP_WINDOW_SCALING;
+		boot_config->ext_tcp_ip_feature_bit_map |= SL_SI91X_EXT_TCP_IP_TOTAL_SELECTS(10);
+
+		if (IS_ENABLED(CONFIG_NET_IPV6)) {
+			boot_config->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_IPV6;
+			if (wifi_oper_mode == SL_SI91X_CLIENT_MODE) {
+				boot_config->tcp_ip_feature_bit_map |=
+					SL_SI91X_TCP_IP_FEAT_DHCPV6_CLIENT;
+			} else if (wifi_oper_mode == SL_SI91X_ACCESS_POINT_MODE) {
+				boot_config->tcp_ip_feature_bit_map |=
+					SL_SI91X_TCP_IP_FEAT_DHCPV6_SERVER;
+			}
+		}
+
+		if (IS_ENABLED(CONFIG_NET_IPV4)) {
+			if (wifi_oper_mode == SL_SI91X_CLIENT_MODE) {
+				boot_config->tcp_ip_feature_bit_map |=
+					SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT;
+			} else if (wifi_oper_mode == SL_SI91X_ACCESS_POINT_MODE) {
+				boot_config->tcp_ip_feature_bit_map |=
+					SL_SI91X_TCP_IP_FEAT_DHCPV4_SERVER;
+			}
+		}
+	} else {
+		boot_config->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_BYPASS;
+	}
+#endif
+	memcpy(get_config, &default_config, sizeof(default_config));
+	return 0;
+}
+
+int siwx91x_nwp_mode_switch(uint8_t oper_mode)
+{
+	sl_wifi_device_configuration_t nwp_config;
+	sl_status_t status;
+
+	switch (oper_mode) {
+	case WIFI_STA_MODE:
+		siwg91x_get_nwp_config(SL_SI91X_CLIENT_MODE, &nwp_config);
+		break;
+	case WIFI_AP_MODE:
+		siwg91x_get_nwp_config(SL_SI91X_ACCESS_POINT_MODE, &nwp_config);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	/* FIXME: Calling sl_wifi_deinit() impacts Bluetooth if coexistence is enabled */
+	status = sl_wifi_deinit();
+	if (status != SL_STATUS_OK) {
+		return -ETIMEDOUT;
+	}
+
+	status = sl_wifi_init(&nwp_config, NULL, sl_wifi_default_event_handler);
+	if (status != SL_STATUS_OK) {
+		return -ETIMEDOUT;
+	}
+
+	return 0;
+}
+
+static int siwg917_nwp_init(void)
+{
+	sl_wifi_device_configuration_t network_config;
+	sl_status_t status;
+
+	siwg91x_get_nwp_config(SL_SI91X_CLIENT_MODE, &network_config);
+	/* TODO: If sl_net_*_profile() functions will be needed for WiFi then call
+	 * sl_net_set_profile() here. Currently these are unused.
+	 */
+	status = sl_wifi_init(&network_config, NULL, sl_wifi_default_event_handler);
+	if (status != SL_STATUS_OK) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+SYS_INIT(siwg917_nwp_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+
+/* IRQn 74 is used for communication with co-processor */
+Z_ISR_DECLARE(74, 0, IRQ074_Handler, 0);
+
+/* Co-processor will use value stored in IVT to store its stack.
+ *
+ * FIXME: We can't use Z_ISR_DECLARE() to declare this entry
+ * FIXME: Allow to configure size of buffer
+ */
+static uint8_t __aligned(8) siwg917_nwp_stack[10 * 1024];
+static Z_DECL_ALIGN(struct _isr_list) Z_GENERIC_SECTION(.intList)
+	__used __isr_siwg917_coprocessor_stack_irq = {
+		.irq = 30,
+		.flags = ISR_FLAG_DIRECT,
+		.func = &siwg917_nwp_stack[sizeof(siwg917_nwp_stack) - 1],
+	};
diff --git a/soc/silabs/silabs_siwx91x/siwg917/nwp.h b/soc/silabs/silabs_siwx91x/siwg917/nwp.h
new file mode 100644
index 0000000000000..74fbec48b85ba
--- /dev/null
+++ b/soc/silabs/silabs_siwx91x/siwg917/nwp.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef SIWG917_NWP_H
+#define SIWG917_NWP_H
+
+#include "sl_wifi.h"
+
+#define SIWX91X_INTERFACE_MASK (0x03)
+
+/**
+ * @brief Switch the Wi-Fi operating modes.
+ *
+ * This function switches the mode. If the requested mode is already active,
+ * no action is performed. Otherwise, it reinitializes the Wi-Fi subsystem to
+ * apply the new mode.
+ *
+ * @param[in] oper_mode  Desired Wi-Fi operating mode:
+ *
+ * @return 0 on success, or a negative error code on failure:
+ */
+int siwx91x_nwp_mode_switch(uint8_t oper_mode);
+
+#endif
diff --git a/soc/silabs/silabs_siwx91x/siwg917/nwp_init.c b/soc/silabs/silabs_siwx91x/siwg917/nwp_init.c
deleted file mode 100644
index fb508dae7101c..0000000000000
--- a/soc/silabs/silabs_siwx91x/siwg917/nwp_init.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * @file
- * @brief Network Processor Initialization for SiWx91x.
- *
- * This file contains the initialization routine for the (ThreadArch) network processor
- * on the SiWx91x platform. The component is responsible for setting up the necessary
- * hardware and software components to enable network communication.
- *
- * Copyright (c) 2024 Silicon Laboratories Inc.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/kernel.h>
-
-#include "sl_wifi.h"
-#include "sl_wifi_callback_framework.h"
-#ifdef CONFIG_BT_SILABS_SIWX91X
-#include "rsi_ble_common_config.h"
-#endif
-
-static int siwg917_nwp_init(void)
-{
-	sl_wifi_device_configuration_t network_config = {
-		.boot_option = LOAD_NWP_FW,
-		.band = SL_SI91X_WIFI_BAND_2_4GHZ,
-		.region_code = DEFAULT_REGION,
-		.boot_config = {
-			.oper_mode = SL_SI91X_CLIENT_MODE,
-			.tcp_ip_feature_bit_map = SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID,
-			.ext_tcp_ip_feature_bit_map = SL_SI91X_CONFIG_FEAT_EXTENSION_VALID,
-			.config_feature_bit_map = SL_SI91X_ENABLE_ENHANCED_MAX_PSP,
-			.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
-			.ext_custom_feature_bit_map =
-				MEMORY_CONFIG |
-				SL_SI91X_EXT_FEAT_XTAL_CLK |
-				SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0,
-		}
-	};
-	sl_si91x_boot_configuration_t *cfg = &network_config.boot_config;
-
-	if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X) && IS_ENABLED(CONFIG_BT_SILABS_SIWX91X)) {
-		cfg->coex_mode = SL_SI91X_WLAN_BLE_MODE;
-	} else if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X)) {
-		cfg->coex_mode = SL_SI91X_WLAN_ONLY_MODE;
-	} else if (IS_ENABLED(CONFIG_BT_SILABS_SIWX91X)) {
-		cfg->coex_mode = SL_SI91X_BLE_MODE;
-	} else {
-		/*
-		 * Even if neither WiFi or BLE is used we have to specify a Coex mode
-		 */
-		cfg->coex_mode = SL_SI91X_BLE_MODE;
-	}
-
-#ifdef CONFIG_WIFI_SILABS_SIWX91X
-	cfg->feature_bit_map |= SL_SI91X_FEAT_SECURITY_OPEN | SL_SI91X_FEAT_WPS_DISABLE,
-	cfg->ext_custom_feature_bit_map |= SL_SI91X_EXT_FEAT_IEEE_80211W;
-	if (IS_ENABLED(CONFIG_WIFI_SILABS_SIWX91X_NET_STACK_OFFLOAD)) {
-		cfg->ext_tcp_ip_feature_bit_map |= SL_SI91X_EXT_TCP_IP_WINDOW_SCALING;
-		cfg->ext_tcp_ip_feature_bit_map |= SL_SI91X_EXT_TCP_IP_TOTAL_SELECTS(10);
-		cfg->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_ICMP;
-		if (IS_ENABLED(CONFIG_NET_IPV6)) {
-			cfg->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_DHCPV6_CLIENT;
-			cfg->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_IPV6;
-		}
-		if (IS_ENABLED(CONFIG_NET_IPV4)) {
-			cfg->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT;
-		}
-	} else {
-		cfg->tcp_ip_feature_bit_map |= SL_SI91X_TCP_IP_FEAT_BYPASS;
-	}
-#endif
-
-#ifdef CONFIG_BT_SILABS_SIWX91X
-	cfg->ext_custom_feature_bit_map |= SL_SI91X_EXT_FEAT_BT_CUSTOM_FEAT_ENABLE;
-	cfg->bt_feature_bit_map |= SL_SI91X_BT_RF_TYPE | SL_SI91X_ENABLE_BLE_PROTOCOL;
-	cfg->ble_feature_bit_map |= SL_SI91X_BLE_MAX_NBR_PERIPHERALS(RSI_BLE_MAX_NBR_PERIPHERALS) |
-				    SL_SI91X_BLE_MAX_NBR_CENTRALS(RSI_BLE_MAX_NBR_CENTRALS) |
-				    SL_SI91X_BLE_MAX_NBR_ATT_SERV(RSI_BLE_MAX_NBR_ATT_SERV) |
-				    SL_SI91X_BLE_MAX_NBR_ATT_REC(RSI_BLE_MAX_NBR_ATT_REC) |
-				    SL_SI91X_BLE_PWR_INX(RSI_BLE_PWR_INX) |
-				    SL_SI91X_BLE_PWR_SAVE_OPTIONS(RSI_BLE_PWR_SAVE_OPTIONS) |
-				    SL_SI91X_916_BLE_COMPATIBLE_FEAT_ENABLE |
-				    SL_SI91X_FEAT_BLE_CUSTOM_FEAT_EXTENSION_VALID;
-	cfg->ble_ext_feature_bit_map |= SL_SI91X_BLE_NUM_CONN_EVENTS(RSI_BLE_NUM_CONN_EVENTS) |
-					SL_SI91X_BLE_NUM_REC_BYTES(RSI_BLE_NUM_REC_BYTES) |
-					SL_SI91X_BLE_ENABLE_ADV_EXTN |
-					SL_SI91X_BLE_AE_MAX_ADV_SETS(RSI_BLE_AE_MAX_ADV_SETS);
-#endif
-
-	/* TODO: If sl_net_*_profile() functions will be needed for WiFi then call
-	 * sl_net_set_profile() here. Currently these are unused.
-	 */
-	return sl_wifi_init(&network_config, NULL, sl_wifi_default_event_handler);
-}
-SYS_INIT(siwg917_nwp_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
-
-/* IRQn 74 is used for communication with co-processor */
-Z_ISR_DECLARE(74, 0, IRQ074_Handler, 0);
-
-/* Co-processor will use value stored in IVT to store its stack.
- *
- * FIXME: We can't use Z_ISR_DECLARE() to declare this entry
- * FIXME: Allow to configure size of buffer
- */
-static uint8_t __aligned(8) siwg917_nwp_stack[10 * 1024];
-static Z_DECL_ALIGN(struct _isr_list) Z_GENERIC_SECTION(.intList)
-	__used __isr_siwg917_coprocessor_stack_irq = {
-		.irq = 30,
-		.flags = ISR_FLAG_DIRECT,
-		.func = &siwg917_nwp_stack[sizeof(siwg917_nwp_stack) - 1],
-	};
diff --git a/soc/silabs/silabs_siwx91x/siwg917/soc.h b/soc/silabs/silabs_siwx91x/siwg917/soc.h
index b96cf08e1a9dd..43b7088894e32 100644
--- a/soc/silabs/silabs_siwx91x/siwg917/soc.h
+++ b/soc/silabs/silabs_siwx91x/siwg917/soc.h
@@ -7,4 +7,6 @@
 
 #include "si91x_device.h"
 
+#define SYSRTC_IRQHandler IRQ022_Handler
+
 #endif
diff --git a/soc/st/stm32/Kconfig b/soc/st/stm32/Kconfig
index 4f3371ab79b48..59a245fb17a9f 100644
--- a/soc/st/stm32/Kconfig
+++ b/soc/st/stm32/Kconfig
@@ -60,7 +60,7 @@ choice POWER_SUPPLY_CHOICE
 	prompt "STM32 power supply configuration"
 	default POWER_SUPPLY_LDO
 	depends on SOC_SERIES_STM32H7X || SOC_SERIES_STM32H7RSX || \
-		SOC_SERIES_STM32U5X || SOC_STM32WBA55XX
+		SOC_SERIES_STM32U5X || SOC_STM32WBA55XX || SOC_STM32WBA65XX
 
 config POWER_SUPPLY_LDO
 	bool "LDO supply"
diff --git a/soc/st/stm32/Kconfig.defconfig b/soc/st/stm32/Kconfig.defconfig
index 67879e6cf6285..b34e0c775beba 100644
--- a/soc/st/stm32/Kconfig.defconfig
+++ b/soc/st/stm32/Kconfig.defconfig
@@ -63,10 +63,6 @@ config CLOCK_CONTROL_INIT_PRIORITY
 	default 1
 	depends on CLOCK_CONTROL
 
-config PHY_INIT_PRIORITY
-	default 81
-	depends on NET_L2_ETHERNET && ETH_DRIVER
-
 # Get flash configuration for NS image from dts flash partition
 config USE_DT_CODE_PARTITION
 	default y if TRUSTED_EXECUTION_NONSECURE
diff --git a/soc/st/stm32/common/CMakeLists.txt b/soc/st/stm32/common/CMakeLists.txt
index 3ff3d1f5d6f64..6d97ebd9ac0fd 100644
--- a/soc/st/stm32/common/CMakeLists.txt
+++ b/soc/st/stm32/common/CMakeLists.txt
@@ -7,7 +7,14 @@ zephyr_sources(
 	soc_config.c
 )
 
-zephyr_linker_sources_ifdef(CONFIG_STM32_CCM SECTIONS ccm.ld)
+if(DEFINED CONFIG_STM32_CCM)
+  zephyr_linker_group(NAME CCM_REGION VMA CCM LMA ROM_REGION)
+  zephyr_linker_section(NAME .ccm_bss GROUP CCM_REGION SUBALIGN 4 TYPE BSS )
+  zephyr_linker_section(NAME .ccm_noinit GROUP CCM_REGION SUBALIGN 4 TYPE NOLOAD NOINIT)
+  zephyr_linker_section(NAME .ccm_data GROUP CCM_REGION SUBALIGN 4)
+
+  zephyr_linker_sources(SECTIONS ccm.ld)
+endif()
 
 zephyr_sources_ifdef(CONFIG_STM32_BACKUP_SRAM stm32_backup_sram.c)
 zephyr_linker_sources_ifdef(CONFIG_STM32_BACKUP_SRAM SECTIONS stm32_backup_sram.ld)
@@ -19,3 +26,10 @@ endif()
 if (CONFIG_STM32_WKUP_PINS)
   zephyr_sources(stm32_wkup_pins.c)
 endif()
+
+if (CONFIG_PM AND CONFIG_STM32_ENABLE_DEBUG_SLEEP_STOP)
+  message(WARNING "\
+SoC Power Management (CONFIG_PM) enabled but the DBGMCU is still enabled \
+(CONFIG_STM32_ENABLE_DEBUG_SLEEP_STOP). The SoC will use more power than expected \
+in STOP modes due to internal oscillators that remain active.")
+endif()
diff --git a/soc/st/stm32/common/ccm.ld b/soc/st/stm32/common/ccm.ld
index ee2396b3c7900..656b4567b6f37 100644
--- a/soc/st/stm32/common/ccm.ld
+++ b/soc/st/stm32/common/ccm.ld
@@ -29,6 +29,6 @@ GROUP_START(CCM)
 
 	__ccm_end = .;
 
-	__ccm_data_rom_start = LOADADDR(_CCM_DATA_SECTION_NAME);
+	__ccm_data_load_start = LOADADDR(_CCM_DATA_SECTION_NAME);
 
 GROUP_END(CCM)
diff --git a/soc/st/stm32/common/soc_config.c b/soc/st/stm32/common/soc_config.c
index 9275ce72babba..07eb74a697c65 100644
--- a/soc/st/stm32/common/soc_config.c
+++ b/soc/st/stm32/common/soc_config.c
@@ -76,6 +76,8 @@ static int st_stm32_common_config(void)
 	LL_DBGMCU_EnableDebugInStopMode();
 #elif defined(CONFIG_SOC_SERIES_STM32WB0X)
 	LL_PWR_EnableDEEPSTOP2();
+#elif defined(CONFIG_SOC_SERIES_STM32MP13X)
+	LL_DBGMCU_EnableDebugInLowPowerMode();
 #else /* all other parts */
 	LL_DBGMCU_EnableDBGStopMode();
 #endif
@@ -90,6 +92,8 @@ static int st_stm32_common_config(void)
 	LL_DBGMCU_DisableDebugInStopMode();
 #elif defined(CONFIG_SOC_SERIES_STM32WB0X)
 	LL_PWR_DisableDEEPSTOP2();
+#elif defined(CONFIG_SOC_SERIES_STM32MP13X)
+	LL_DBGMCU_DisableDebugInLowPowerMode();
 #else /* all other parts */
 	LL_DBGMCU_DisableDBGStopMode();
 #endif
diff --git a/soc/st/stm32/common/stm32_wkup_pins.c b/soc/st/stm32/common/stm32_wkup_pins.c
index c25887dfc3993..0ca40b9b2a946 100644
--- a/soc/st/stm32/common/stm32_wkup_pins.c
+++ b/soc/st/stm32/common/stm32_wkup_pins.c
@@ -225,11 +225,11 @@ static void wkup_pin_setup(const struct wkup_pin_cfg_t *wakeup_pin_cfg)
 
 #if defined(CONFIG_SOC_SERIES_STM32U5X) || defined(CONFIG_SOC_SERIES_STM32WBAX)
 	/* Select the proper wake-up signal source */
-	if (wakeup_pin_cfg->src_selection & STM32_PWR_WKUP_PIN_SRC_0) {
+	if (wakeup_pin_cfg->src_selection & STM32_PWR_WKUP_EVT_SRC_0) {
 		LL_PWR_SetWakeUpPinSignal0Selection(table_wakeup_pins[wkup_pin_index]);
-	} else if (wakeup_pin_cfg->src_selection & STM32_PWR_WKUP_PIN_SRC_1) {
+	} else if (wakeup_pin_cfg->src_selection & STM32_PWR_WKUP_EVT_SRC_1) {
 		LL_PWR_SetWakeUpPinSignal1Selection(table_wakeup_pins[wkup_pin_index]);
-	} else if (wakeup_pin_cfg->src_selection & STM32_PWR_WKUP_PIN_SRC_2) {
+	} else if (wakeup_pin_cfg->src_selection & STM32_PWR_WKUP_EVT_SRC_2) {
 		LL_PWR_SetWakeUpPinSignal2Selection(table_wakeup_pins[wkup_pin_index]);
 	} else {
 		LL_PWR_SetWakeUpPinSignal3Selection(table_wakeup_pins[wkup_pin_index]);
@@ -275,7 +275,7 @@ int stm32_pwr_wkup_pin_cfg_gpio(const struct gpio_dt_spec *gpio)
 	}
 
 	if (!found_gpio) {
-		LOG_DBG("Couldn't find a wake-up event correspending to GPIO %s pin %d\n",
+		LOG_DBG("Couldn't find a wake-up event corresponding to GPIO %s pin %d\n",
 			gpio->port->name, gpio->pin);
 		LOG_DBG("=> It cannot be used as a wake-up source\n");
 		return -EINVAL;
@@ -286,9 +286,9 @@ int stm32_pwr_wkup_pin_cfg_gpio(const struct gpio_dt_spec *gpio)
 /* Each wake-up pin on STM32U5 is associated with 4 wkup srcs, 3 of them correspond to GPIOs. */
 #if defined(CONFIG_SOC_SERIES_STM32U5X) || defined(CONFIG_SOC_SERIES_STM32WBAX)
 	wakeup_pin_cfg.src_selection = wkup_pin_gpio_cfg->dt_flags &
-					(STM32_PWR_WKUP_PIN_SRC_0 |
-					STM32_PWR_WKUP_PIN_SRC_1 |
-					STM32_PWR_WKUP_PIN_SRC_2);
+					(STM32_PWR_WKUP_EVT_SRC_0 |
+					STM32_PWR_WKUP_EVT_SRC_1 |
+					STM32_PWR_WKUP_EVT_SRC_2);
 #else
 	wakeup_pin_cfg.src_selection = 0;
 #endif /* CONFIG_SOC_SERIES_STM32U5X or CONFIG_SOC_SERIES_STM32WBAX */
diff --git a/soc/st/stm32/soc.yml b/soc/st/stm32/soc.yml
index 4e5d659573395..d4184f77b2c8a 100644
--- a/soc/st/stm32/soc.yml
+++ b/soc/st/stm32/soc.yml
@@ -59,8 +59,10 @@ family:
     - name: stm32f427xx
     - name: stm32f429xx
     - name: stm32f437xx
+    - name: stm32f439xx
     - name: stm32f446xx
     - name: stm32f469xx
+    - name: stm32f479xx
   - name: stm32f7x
     socs:
     - name: stm32f722xx
@@ -186,6 +188,9 @@ family:
   - name: stm32mp1x
     socs:
     - name: stm32mp157cxx
+  - name: stm32mp13x
+    socs:
+    - name: stm32mp135fxx
   - name: stm32n6x
     socs:
     - name: stm32n657xx
@@ -198,6 +203,7 @@ family:
     socs:
     - name: stm32u5a5xx
     - name: stm32u5a9xx
+    - name: stm32u5g9xx
     - name: stm32u545xx
     - name: stm32u575xx
     - name: stm32u585xx
@@ -216,6 +222,7 @@ family:
     socs:
     - name: stm32wba52xx
     - name: stm32wba55xx
+    - name: stm32wba65xx
   - name: stm32wlx
     socs:
     - name: stm32wle4xx
diff --git a/soc/st/stm32/stm32c0x/poweroff.c b/soc/st/stm32/stm32c0x/poweroff.c
index c9c4db49e9d6b..ec07aaf81bf4d 100644
--- a/soc/st/stm32/stm32c0x/poweroff.c
+++ b/soc/st/stm32/stm32c0x/poweroff.c
@@ -1,19 +1,30 @@
 /*
  * Copyright (c) 2024 Kickmaker
+ * Copyright (c) 2025 Tomas Jurena
+ *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/poweroff.h>
 #include <zephyr/toolchain.h>
+#include <zephyr/drivers/misc/stm32_wkup_pins/stm32_wkup_pins.h>
 
 #include <stm32_ll_cortex.h>
 #include <stm32_ll_pwr.h>
+#include <stm32_ll_system.h>
 
 void z_sys_poweroff(void)
 {
+#ifdef CONFIG_STM32_WKUP_PINS
+	stm32_pwr_wkup_pin_cfg_pupd();
+
+	LL_PWR_ClearFlag_WU();
+#endif /* CONFIG_STM32_WKUP_PINS */
+
 	LL_PWR_SetPowerMode(LL_PWR_MODE_SHUTDOWN);
 	LL_LPM_EnableDeepSleep();
+	LL_DBGMCU_DisableDBGStandbyMode();
 
 	k_cpu_idle();
 
diff --git a/soc/st/stm32/stm32f4x/CMakeLists.txt b/soc/st/stm32/stm32f4x/CMakeLists.txt
index ea800d26565a0..b2b70aedeeae4 100644
--- a/soc/st/stm32/stm32f4x/CMakeLists.txt
+++ b/soc/st/stm32/stm32f4x/CMakeLists.txt
@@ -12,3 +12,4 @@ set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/li
 zephyr_sources_ifdef(CONFIG_PM
   power.c
   )
+zephyr_sources_ifdef(CONFIG_POWEROFF poweroff.c)
diff --git a/soc/st/stm32/stm32f4x/Kconfig b/soc/st/stm32/stm32f4x/Kconfig
index 2d8681f3da34b..a738978109cb3 100644
--- a/soc/st/stm32/stm32f4x/Kconfig
+++ b/soc/st/stm32/stm32f4x/Kconfig
@@ -12,4 +12,5 @@ config SOC_SERIES_STM32F4X
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	select HAS_PM
+	select HAS_POWEROFF
 	select SOC_EARLY_INIT_HOOK
diff --git a/soc/st/stm32/stm32f4x/Kconfig.defconfig.stm32f439xx b/soc/st/stm32/stm32f4x/Kconfig.defconfig.stm32f439xx
new file mode 100644
index 0000000000000..0abc2c8fbbe92
--- /dev/null
+++ b/soc/st/stm32/stm32f4x/Kconfig.defconfig.stm32f439xx
@@ -0,0 +1,11 @@
+# ST STM32F439XX MCU configuration options
+
+# Copyright (c) 2025 Mathieu Anquetin <mathieu.anquetin@groupe-cahors.com>.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_STM32F439XX
+
+config NUM_IRQS
+	default 91
+
+endif # SOC_STM32F439XX
diff --git a/soc/st/stm32/stm32f4x/Kconfig.defconfig.stm32f479xx b/soc/st/stm32/stm32f4x/Kconfig.defconfig.stm32f479xx
new file mode 100644
index 0000000000000..baea858199f13
--- /dev/null
+++ b/soc/st/stm32/stm32f4x/Kconfig.defconfig.stm32f479xx
@@ -0,0 +1,11 @@
+# ST STM32F479XI MCU configuration options
+
+# Copyright (c) 2025 Christopher Cichiwskyj
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_STM32F479XX
+
+config NUM_IRQS
+	default 93
+
+endif # SOC_STM32F479XX
diff --git a/soc/st/stm32/stm32f4x/Kconfig.soc b/soc/st/stm32/stm32f4x/Kconfig.soc
index 0f830e8a36566..3ee84f5fb5db4 100644
--- a/soc/st/stm32/stm32f4x/Kconfig.soc
+++ b/soc/st/stm32/stm32f4x/Kconfig.soc
@@ -82,6 +82,10 @@ config SOC_STM32F437XX
 	bool
 	select SOC_SERIES_STM32F4X
 
+config SOC_STM32F439XX
+	bool
+	select SOC_SERIES_STM32F4X
+
 config SOC_STM32F446XX
 	bool
 	select SOC_SERIES_STM32F4X
@@ -90,6 +94,10 @@ config SOC_STM32F469XX
 	bool
 	select SOC_SERIES_STM32F4X
 
+config SOC_STM32F479XX
+	bool
+	select SOC_SERIES_STM32F4X
+
 config SOC
 	default "stm32f401xc" if SOC_STM32F401XC
 	default "stm32f401xe" if SOC_STM32F401XE
@@ -109,5 +117,7 @@ config SOC
 	default "stm32f427xx" if SOC_STM32F427XX
 	default "stm32f429xx" if SOC_STM32F429XX
 	default "stm32f437xx" if SOC_STM32F437XX
+	default "stm32f439xx" if SOC_STM32F439XX
 	default "stm32f446xx" if SOC_STM32F446XX
 	default "stm32f469xx" if SOC_STM32F469XX
+	default "stm32f479xx" if SOC_STM32F479XX
diff --git a/soc/st/stm32/stm32f4x/poweroff.c b/soc/st/stm32/stm32f4x/poweroff.c
new file mode 100644
index 0000000000000..2809922418414
--- /dev/null
+++ b/soc/st/stm32/stm32f4x/poweroff.c
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ * Copyright (c) 2024 STMicroelectronics
+ * Copyright (c) 2025 Tomas Jurena
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/poweroff.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/drivers/misc/stm32_wkup_pins/stm32_wkup_pins.h>
+
+#include <stm32_ll_cortex.h>
+#include <stm32_ll_pwr.h>
+
+void z_sys_poweroff(void)
+{
+#ifdef CONFIG_STM32_WKUP_PINS
+	LL_PWR_ClearFlag_WU();
+#endif /* CONFIG_STM32_WKUP_PINS */
+
+	LL_PWR_SetPowerMode(LL_PWR_MODE_STANDBY);
+	LL_LPM_EnableDeepSleep();
+
+	k_cpu_idle();
+
+	CODE_UNREACHABLE;
+}
diff --git a/soc/st/stm32/stm32h7x/mpu_regions.c b/soc/st/stm32/stm32h7x/mpu_regions.c
index 8582db6072493..f77018d36caed 100644
--- a/soc/st/stm32/stm32h7x/mpu_regions.c
+++ b/soc/st/stm32/stm32h7x/mpu_regions.c
@@ -22,19 +22,19 @@ static const struct arm_mpu_region mpu_regions[] = {
 					MPU_RASR_XN_Msk | P_RW_U_NA_Msk) }),
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mac))
+
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram3))
-	MPU_REGION_ENTRY("SRAM3_ETH_BUF",
-					 DT_REG_ADDR(DT_NODELABEL(sram3)),
-					 REGION_RAM_NOCACHE_ATTR(REGION_16K)),
-	MPU_REGION_ENTRY("SRAM3_ETH_DESC",
-					 DT_REG_ADDR(DT_NODELABEL(sram3)),
-					 REGION_PPB_ATTR(REGION_256B)),
+#define sram_eth_node	DT_NODELABEL(sram3)
 #else
-	MPU_REGION_ENTRY("SRAM2_ETH_BUF",
-					 DT_REG_ADDR(DT_NODELABEL(sram2)),
+#define sram_eth_node	DT_NODELABEL(sram2)
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(sram_eth_node)
+	MPU_REGION_ENTRY("SRAM_ETH_BUF",
+					 DT_REG_ADDR(sram_eth_node),
 					 REGION_RAM_NOCACHE_ATTR(REGION_16K)),
-	MPU_REGION_ENTRY("SRAM2_ETH_DESC",
-					 DT_REG_ADDR(DT_NODELABEL(sram2)),
+	MPU_REGION_ENTRY("SRAM_ETH_DESC",
+					 DT_REG_ADDR(sram_eth_node),
 					 REGION_PPB_ATTR(REGION_256B)),
 #endif
 #endif
diff --git a/soc/st/stm32/stm32h7x/sections.ld b/soc/st/stm32/stm32h7x/sections.ld
index 5f4fd794dd2a1..4989d8e90ea38 100644
--- a/soc/st/stm32/stm32h7x/sections.ld
+++ b/soc/st/stm32/stm32h7x/sections.ld
@@ -4,24 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(mac), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(mac))
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(sram3))
+#define sram_eth_node	DT_NODELABEL(sram3)
+#else
+#define sram_eth_node	DT_NODELABEL(sram2)
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(sram_eth_node)
 SECTION_DATA_PROLOGUE(eth_stm32,(NOLOAD),)
 {
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(sram3), okay)
-    . = ABSOLUTE(DT_REG_ADDR(DT_NODELABEL(sram3)));
+    . = ABSOLUTE(DT_REG_ADDR(sram_eth_node));
     *(.eth_stm32_desc)
-    . = ABSOLUTE(DT_REG_ADDR(DT_NODELABEL(sram3))) + 256;
+    . = ABSOLUTE(DT_REG_ADDR(sram_eth_node)) + 256;
     *(.eth_stm32_buf)
-    . = ABSOLUTE(DT_REG_ADDR(DT_NODELABEL(sram3))) + 16K;
-} GROUP_DATA_LINK_IN(LINKER_DT_NODE_REGION_NAME(DT_NODELABEL(sram3)), LINKER_DT_NODE_REGION_NAME(DT_NODELABEL(sram3)))
-
-#else
-    . = ABSOLUTE(DT_REG_ADDR(DT_NODELABEL(sram2)));
-    *(.eth_stm32_desc)
-    . = ABSOLUTE(DT_REG_ADDR(DT_NODELABEL(sram2))) + 256;
-    *(.eth_stm32_buf)
-    . = ABSOLUTE(DT_REG_ADDR(DT_NODELABEL(sram2))) + 16K;
-} GROUP_DATA_LINK_IN(LINKER_DT_NODE_REGION_NAME(DT_NODELABEL(sram2)), LINKER_DT_NODE_REGION_NAME(DT_NODELABEL(sram2)))
-#endif
+    . = ABSOLUTE(DT_REG_ADDR(sram_eth_node)) + 16K;
+} GROUP_DATA_LINK_IN(LINKER_DT_NODE_REGION_NAME(sram_eth_node), LINKER_DT_NODE_REGION_NAME(sram_eth_node))
 #endif
+
+#endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(mac), okay) */
diff --git a/soc/st/stm32/stm32h7x/soc_m7.c b/soc/st/stm32/stm32h7x/soc_m7.c
index 79715a5f39e54..46c9c954e95ff 100644
--- a/soc/st/stm32/stm32h7x/soc_m7.c
+++ b/soc/st/stm32/stm32h7x/soc_m7.c
@@ -89,9 +89,6 @@ void soc_early_init_hook(void)
 #else
 	LL_PWR_ConfigSupply(LL_PWR_LDO_SUPPLY);
 #endif
-	LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
-	while (LL_PWR_IsActiveFlag_VOS() == 0) {
-	}
 
 	/* Errata ES0392 Rev 8:
 	 * 2.2.9: Reading from AXI SRAM may lead to data read corruption
diff --git a/soc/st/stm32/stm32mp13x/CMakeLists.txt b/soc/st/stm32/stm32mp13x/CMakeLists.txt
new file mode 100644
index 0000000000000..792d64f8df5ca
--- /dev/null
+++ b/soc/st/stm32/stm32mp13x/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 STMicroelectronics
+#
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_include_directories(${ZEPHYR_BASE}/drivers)
+zephyr_sources(
+  soc.c
+  )
+
+zephyr_include_directories(.)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/st/stm32/stm32mp13x/Kconfig b/soc/st/stm32/stm32mp13x/Kconfig
new file mode 100644
index 0000000000000..7be5ca01a0c1e
--- /dev/null
+++ b/soc/st/stm32/stm32mp13x/Kconfig
@@ -0,0 +1,14 @@
+# STMicroelectronics STM32MP13 MPU series
+
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_STM32MP13X
+	select ARM
+	select CPU_CORTEX_A7
+	select HAS_STM32CUBE
+	select CPU_HAS_FPU
+	select SOC_EARLY_INIT_HOOK
+	select ARM_ARCH_TIMER
+	select SYS_CLOCK_EXISTS
+	select XIP
diff --git a/soc/st/stm32/stm32mp13x/Kconfig.defconfig b/soc/st/stm32/stm32mp13x/Kconfig.defconfig
new file mode 100644
index 0000000000000..2a3929e30a7ba
--- /dev/null
+++ b/soc/st/stm32/stm32mp13x/Kconfig.defconfig
@@ -0,0 +1,20 @@
+# STMicroelectronics STM32MP13 MPU series
+
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_STM32MP13X
+
+rsource "Kconfig.defconfig.stm32mp13_a7"
+
+config CACHE_MANAGEMENT
+	default y
+
+DT_STM32_CPU_CLOCK_PATH := $(dt_nodelabel_path,cpusw)
+DT_STM32_CPU_CLOCK_FREQ := $(dt_node_int_prop_int,$(DT_STM32_CPU_CLOCK_PATH),clock-frequency)
+
+# For STM32MP13, override the default value defined in STM32 Kconfig
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(DT_STM32_CPU_CLOCK_FREQ) if $(dt_nodelabel_enabled,cpusw)
+
+endif # SOC_SERIES_STM32MP13X
diff --git a/soc/st/stm32/stm32mp13x/Kconfig.defconfig.stm32mp13_a7 b/soc/st/stm32/stm32mp13x/Kconfig.defconfig.stm32mp13_a7
new file mode 100644
index 0000000000000..f65e137dab620
--- /dev/null
+++ b/soc/st/stm32/stm32mp13x/Kconfig.defconfig.stm32mp13_a7
@@ -0,0 +1,11 @@
+# STMicroelectronics STM32MP13_A7 MPU
+
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_STM32MP135FXX
+
+config NUM_IRQS
+	default 181
+
+endif # SOC_STM32MP135FXX
diff --git a/soc/st/stm32/stm32mp13x/Kconfig.soc b/soc/st/stm32/stm32mp13x/Kconfig.soc
new file mode 100644
index 0000000000000..9507ce31a9be8
--- /dev/null
+++ b/soc/st/stm32/stm32mp13x/Kconfig.soc
@@ -0,0 +1,18 @@
+# STMicroelectronics STM32MP13 MPU series
+
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_STM32MP13X
+	bool
+	select SOC_FAMILY_STM32
+
+config SOC_SERIES
+	default "stm32mp13x" if SOC_SERIES_STM32MP13X
+
+config SOC_STM32MP135FXX
+	bool
+	select SOC_SERIES_STM32MP13X
+
+config SOC
+	default "stm32mp135fxx" if SOC_STM32MP135FXX
diff --git a/soc/st/stm32/stm32mp13x/soc.c b/soc/st/stm32/stm32mp13x/soc.c
new file mode 100644
index 0000000000000..96874d8c48330
--- /dev/null
+++ b/soc/st/stm32/stm32mp13x/soc.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief System/hardware module for STM32MP13 processor
+ */
+
+#include <zephyr/arch/arm/mmu/arm_mmu.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/linker/linker-defs.h>
+
+#include <stm32_ll_bus.h>
+#include <cmsis_core.h>
+
+#define VECTOR_ADDRESS ((uintptr_t)_vector_start)
+
+void relocate_vector_table(void)
+{
+	write_sctlr(read_sctlr() & ~HIVECS);
+	write_vbar(VECTOR_ADDRESS & VBAR_MASK);
+	barrier_isync_fence_full();
+}
+
+/**
+ * @brief Perform basic hardware initialization at boot.
+ *
+ * This needs to be run from the very beginning.
+ */
+
+void soc_early_init_hook(void)
+{
+	/* Update CMSIS SystemCoreClock variable (HCLK) */
+	SystemCoreClock = 1000000000U;
+
+	/* Clear TE bit to take exceptions in Thumb mode to fix the DDR init */
+	write_sctlr(read_sctlr() & ~SCTLR_TE_Msk);
+	barrier_isync_fence_full();
+}
+
+static const struct arm_mmu_region mmu_regions[] = {
+	MMU_REGION_FLAT_ENTRY("APB1", 0x40000000, 0x19400, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("APB2", 0x44000000, 0x14000, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("AHB2", 0x48000000, 0x1040000, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("APB6", 0x4C000000, 0xC400, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("AHB4", 0x50000000, 0xD400, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("APB3", 0x50020000, 0xA400, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("DEBUG APB", 0x50080000, 0x5D000, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("AHB5", 0x54000000, 0x8000, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("AXIMC", 0x57000000, 0x100000, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("AHB6", 0x58000000, 0x10000, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("APB4", 0x5A000000, 0x7400, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("APB5", 0x5C000000, 0xA400, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("GIC", 0xA0021000, 0x7000, MPERM_R | MPERM_W | MT_DEVICE),
+
+	MMU_REGION_FLAT_ENTRY("vectors", 0xC0000000, 0x1000, MPERM_R | MPERM_X | MT_NORMAL),
+
+	MMU_REGION_FLAT_ENTRY("DAPBUS", 0xE0080000, 0x5D000, MPERM_R | MPERM_W | MT_DEVICE),
+};
+
+const struct arm_mmu_config mmu_config = {
+	.num_regions = ARRAY_SIZE(mmu_regions),
+	.mmu_regions = mmu_regions,
+};
diff --git a/soc/st/stm32/stm32mp13x/soc.h b/soc/st/stm32/stm32mp13x/soc.h
new file mode 100644
index 0000000000000..49847550700e1
--- /dev/null
+++ b/soc/st/stm32/stm32mp13x/soc.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _STM32MP13SOC_H_
+#define _STM32MP13SOC_H_
+
+#ifndef _ASMLANGUAGE
+
+#include <stm32mp13xx.h>
+
+#endif /* !_ASMLANGUAGE */
+
+#endif /* _STM32MP13SOC_H_ */
diff --git a/soc/st/stm32/stm32n6x/CMakeLists.txt b/soc/st/stm32/stm32n6x/CMakeLists.txt
index d8ded3541e4f7..48adb9166448b 100644
--- a/soc/st/stm32/stm32n6x/CMakeLists.txt
+++ b/soc/st/stm32/stm32n6x/CMakeLists.txt
@@ -20,11 +20,9 @@ if(SIGNING_TOOL_FIND STREQUAL SIGNING_TOOL_FIND-NOTFOUND)
   message(WARNING "
   Signing Image tool (${SIGNING_TOOL}) is not available.
   Signed image will not be generated.
-  You won't be able to run image on board.")
-endif()
-
-if(NOT SIGNING_TOOL_FIND STREQUAL SIGNING_TOOL_FIND-NOTFOUND)
-
+  You won't be able to run application on the board.
+  Refer to board documentation for more information")
+else()
   set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
     COMMAND ${SIGNING_TOOL}
     -in ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
@@ -35,5 +33,4 @@ if(NOT SIGNING_TOOL_FIND STREQUAL SIGNING_TOOL_FIND-NOTFOUND)
   )
 
   set_property(TARGET runners_yaml_props_target PROPERTY bin_file ${CONFIG_KERNEL_BIN_NAME}.signed.bin)
-
 endif()
diff --git a/soc/st/stm32/stm32n6x/soc.c b/soc/st/stm32/stm32n6x/soc.c
index c967404862c17..fa06138ce67c0 100644
--- a/soc/st/stm32/stm32n6x/soc.c
+++ b/soc/st/stm32/stm32n6x/soc.c
@@ -59,4 +59,8 @@ void soc_early_init_hook(void)
 	LL_PWR_EnableVddIO3();
 	LL_PWR_EnableVddIO4();
 	LL_PWR_EnableVddIO5();
+
+	/* Set Vdd IO2 and IO3 to 1.8V */
+	LL_PWR_SetVddIO2VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_1V8);
+	LL_PWR_SetVddIO3VoltageRange(LL_PWR_VDDIO_VOLTAGE_RANGE_1V8);
 }
diff --git a/soc/st/stm32/stm32u5x/Kconfig.defconfig.stm32u5g9xx b/soc/st/stm32/stm32u5x/Kconfig.defconfig.stm32u5g9xx
new file mode 100644
index 0000000000000..635fbdd476f43
--- /dev/null
+++ b/soc/st/stm32/stm32u5x/Kconfig.defconfig.stm32u5g9xx
@@ -0,0 +1,11 @@
+# STMicroelectronics STM32U5G9XX MCU
+
+# Copyright (c) 2025 Charles Dias
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_STM32U5G9XX
+
+config NUM_IRQS
+	default 141
+
+endif # SOC_STM32U5G9XX
diff --git a/soc/st/stm32/stm32u5x/Kconfig.soc b/soc/st/stm32/stm32u5x/Kconfig.soc
index b3360e9ac10d7..14f80d74aa7ef 100644
--- a/soc/st/stm32/stm32u5x/Kconfig.soc
+++ b/soc/st/stm32/stm32u5x/Kconfig.soc
@@ -3,6 +3,7 @@
 # Copyright (c) 2021 Linaro Limited
 # Copyright (c) 2023 PSICONTROL nv
 # Copyright (c) 2023 STMicroelectronics
+# Copyright (c) 2025 Charles Dias
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_STM32U5X
@@ -40,9 +41,14 @@ config SOC_STM32U5A9XX
 	bool
 	select SOC_SERIES_STM32U5X
 
+config SOC_STM32U5G9XX
+	bool
+	select SOC_SERIES_STM32U5X
+
 config SOC
 	default "stm32u5a5xx" if SOC_STM32U5A5XX
 	default "stm32u5a9xx" if SOC_STM32U5A9XX
+	default "stm32u5g9xx" if SOC_STM32U5G9XX
 	default "stm32u545xx" if SOC_STM32U545XX
 	default "stm32u575xx" if SOC_STM32U575XX
 	default "stm32u585xx" if SOC_STM32U585XX
diff --git a/soc/st/stm32/stm32wbax/Kconfig.defconfig.stm32wba65xx b/soc/st/stm32/stm32wbax/Kconfig.defconfig.stm32wba65xx
new file mode 100644
index 0000000000000..bd811b035ef8b
--- /dev/null
+++ b/soc/st/stm32/stm32wbax/Kconfig.defconfig.stm32wba65xx
@@ -0,0 +1,11 @@
+# ST Microelectronics STM32WBA65XX MCU
+
+# Copyright (c) 2025 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_STM32WBA65XX
+
+config NUM_IRQS
+	default 82
+
+endif # SOC_STM32WBA65XX
diff --git a/soc/st/stm32/stm32wbax/Kconfig.soc b/soc/st/stm32/stm32wbax/Kconfig.soc
index 104a3923989bd..cee2f81308f88 100644
--- a/soc/st/stm32/stm32wbax/Kconfig.soc
+++ b/soc/st/stm32/stm32wbax/Kconfig.soc
@@ -18,6 +18,11 @@ config SOC_STM32WBA55XX
 	bool
 	select SOC_SERIES_STM32WBAX
 
+config SOC_STM32WBA65XX
+	bool
+	select SOC_SERIES_STM32WBAX
+
 config SOC
 	default "stm32wba52xx" if SOC_STM32WBA52XX
 	default "stm32wba55xx" if SOC_STM32WBA55XX
+	default "stm32wba65xx" if SOC_STM32WBA65XX
diff --git a/soc/st/stm32/stm32wbax/hci_if/host_stack_if.c b/soc/st/stm32/stm32wbax/hci_if/host_stack_if.c
index 6cc224cc60ae5..2c9f1e57b2c4f 100644
--- a/soc/st/stm32/stm32wbax/hci_if/host_stack_if.c
+++ b/soc/st/stm32/stm32wbax/hci_if/host_stack_if.c
@@ -7,38 +7,36 @@
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
 
-#include "app_conf.h"
 #include "blestack.h"
 #include "bpka.h"
 #include "ll_intf.h"
 
-K_MUTEX_DEFINE(ble_ctlr_stack_mutex);
-struct k_work_q ble_ctlr_work_q, ll_work_q;
-struct k_work ble_ctlr_stack_work, bpka_work;
+K_MUTEX_DEFINE(ble_ctrl_stack_mutex);
+struct k_work_q ble_ctrl_work_q, ll_work_q;
+struct k_work ble_ctrl_stack_work, bpka_work;
 
 uint8_t ll_state_busy;
 
-#define BLE_CTLR_TASK_STACK_SIZE (256 * 7)
-#define LL_TASK_STACK_SIZE (256 * 7)
-#define BLE_CTLR_TASK_PRIO	 (14)
-#define LL_TASK_PRIO (14)
+/* TODO: More tests to be done to optimize thread stacks' sizes */
+#define BLE_CTRL_THREAD_STACK_SIZE (256 * 7)
+#define LL_THREAD_STACK_SIZE (256 * 7)
+#define BLE_CTRL_THREAD_PRIO (14)
+/* The LL thread has higher priority than the BLE CTRL thread and the Zephyr BLE stack threads */
+#define LL_THREAD_PRIO (4)
 
-K_THREAD_STACK_DEFINE(ble_ctlr_work_area, BLE_CTLR_TASK_STACK_SIZE);
-K_THREAD_STACK_DEFINE(ll_work_area, LL_TASK_STACK_SIZE);
+K_THREAD_STACK_DEFINE(ble_ctrl_work_area, BLE_CTRL_THREAD_STACK_SIZE);
+K_THREAD_STACK_DEFINE(ll_work_area, LL_THREAD_STACK_SIZE);
 
-void HostStack_Process(void)
-{
-	k_work_submit_to_queue(&ble_ctlr_work_q, &ble_ctlr_stack_work);
-}
+void HostStack_Process(void);
 
-static void ble_ctlr_stack_handler(struct k_work *work)
+static void ble_ctrl_stack_handler(struct k_work *work)
 {
-	uint8_t running = 0x0;
+	uint8_t running = 0x00;
 	change_state_options_t options;
 
-	k_mutex_lock(&ble_ctlr_stack_mutex, K_FOREVER);
+	k_mutex_lock(&ble_ctrl_stack_mutex, K_FOREVER);
 	running = BleStack_Process();
-	k_mutex_unlock(&ble_ctlr_stack_mutex);
+	k_mutex_unlock(&ble_ctrl_stack_mutex);
 
 	if (ll_state_busy == 1) {
 		options.combined_value = 0x0F;
@@ -51,32 +49,37 @@ static void ble_ctlr_stack_handler(struct k_work *work)
 	}
 }
 
-void BPKACB_Process(void)
-{
-	k_work_submit_to_queue(&ble_ctlr_work_q, &bpka_work);
-}
-
 static void bpka_work_handler(struct k_work *work)
 {
 	BPKA_BG_Process();
 }
 
-static int stm32wba_ble_ctlr_init(void)
+static int stm32wba_ble_ctrl_init(void)
 {
-	k_work_queue_init(&ble_ctlr_work_q);
-	k_work_queue_start(&ble_ctlr_work_q, ble_ctlr_work_area,
-				K_THREAD_STACK_SIZEOF(ble_ctlr_work_area),
-				BLE_CTLR_TASK_PRIO, NULL);
+	k_work_queue_init(&ble_ctrl_work_q);
+	k_work_queue_start(&ble_ctrl_work_q, ble_ctrl_work_area,
+			   K_THREAD_STACK_SIZEOF(ble_ctrl_work_area),
+			   BLE_CTRL_THREAD_PRIO, NULL);
 
 	k_work_queue_init(&ll_work_q);
 	k_work_queue_start(&ll_work_q, ll_work_area,
-				K_THREAD_STACK_SIZEOF(ll_work_area),
-				LL_TASK_PRIO, NULL);
+			   K_THREAD_STACK_SIZEOF(ll_work_area),
+			   LL_THREAD_PRIO, NULL);
 
-	k_work_init(&ble_ctlr_stack_work, &ble_ctlr_stack_handler);
+	k_work_init(&ble_ctrl_stack_work, &ble_ctrl_stack_handler);
 	k_work_init(&bpka_work, &bpka_work_handler);
 
 	return 0;
 }
 
-SYS_INIT(stm32wba_ble_ctlr_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+void HostStack_Process(void)
+{
+	k_work_submit_to_queue(&ble_ctrl_work_q, &ble_ctrl_stack_work);
+}
+
+void BPKACB_Process(void)
+{
+	k_work_submit_to_queue(&ble_ctrl_work_q, &bpka_work);
+}
+
+SYS_INIT(stm32wba_ble_ctrl_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/st/stm32/stm32wbax/hci_if/linklayer_plat_adapt.c b/soc/st/stm32/stm32wbax/hci_if/linklayer_plat_adapt.c
index b482c0b86fc8f..a5d06d591eb93 100644
--- a/soc/st/stm32/stm32wbax/hci_if/linklayer_plat_adapt.c
+++ b/soc/st/stm32/stm32wbax/hci_if/linklayer_plat_adapt.c
@@ -29,6 +29,8 @@ volatile int32_t prio_high_isr_counter;
 volatile int32_t prio_low_isr_counter;
 volatile int32_t prio_sys_isr_counter;
 volatile uint32_t local_basepri_value;
+volatile uint8_t irq_counter;
+static uint32_t primask_bit;
 
 /* Radio SW low ISR global variable */
 volatile uint8_t radio_sw_low_isr_is_running_high_prio;
@@ -74,7 +76,7 @@ void radio_high_prio_isr(void)
 
 void radio_low_prio_isr(void)
 {
-	irq_disable((IRQn_Type)RADIO_SW_LOW_INTR_NUM);
+	irq_disable(RADIO_SW_LOW_INTR_NUM);
 
 	low_isr_callback();
 
@@ -85,7 +87,7 @@ void radio_low_prio_isr(void)
 	}
 
 	/* Re-enable SW radio low interrupt */
-	irq_enable((IRQn_Type)RADIO_SW_LOW_INTR_NUM);
+	irq_enable(RADIO_SW_LOW_INTR_NUM);
 
 	ISR_DIRECT_PM();
 }
@@ -96,22 +98,22 @@ void link_layer_register_isr(void)
 	ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_INTR_NUM, 0, 0, reschedule);
 
 	/* Ensure the IRQ is disabled before enabling it at run time */
-	irq_disable((IRQn_Type)RADIO_INTR_NUM);
+	irq_disable(RADIO_INTR_NUM);
 
-	irq_connect_dynamic((IRQn_Type)RADIO_INTR_NUM, RADIO_INTR_PRIO_HIGH_Z,
+	irq_connect_dynamic(RADIO_INTR_NUM, RADIO_INTR_PRIO_HIGH_Z,
 			    (void (*)(const void *))radio_high_prio_isr, NULL, 0);
 
-	irq_enable((IRQn_Type)RADIO_INTR_NUM);
+	irq_enable(RADIO_INTR_NUM);
 
 	ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_SW_LOW_INTR_NUM, 0, 0, reschedule);
 
 	/* Ensure the IRQ is disabled before enabling it at run time */
-	irq_disable((IRQn_Type)RADIO_SW_LOW_INTR_NUM);
+	irq_disable(RADIO_SW_LOW_INTR_NUM);
 
-	irq_connect_dynamic((IRQn_Type)RADIO_SW_LOW_INTR_NUM, RADIO_SW_LOW_INTR_PRIO,
+	irq_connect_dynamic(RADIO_SW_LOW_INTR_NUM, RADIO_SW_LOW_INTR_PRIO,
 			    (void (*)(const void *))radio_low_prio_isr, NULL, 0);
 
-	irq_enable((IRQn_Type)RADIO_SW_LOW_INTR_NUM);
+	irq_enable(RADIO_SW_LOW_INTR_NUM);
 }
 
 
@@ -119,24 +121,20 @@ void LINKLAYER_PLAT_TriggerSwLowIT(uint8_t priority)
 {
 	uint8_t low_isr_priority = RADIO_INTR_PRIO_LOW_Z;
 
-	LOG_DBG("Priotity: %d", priority);
+	LOG_DBG("Priority: %d", priority);
 
 	/* Check if a SW low interrupt as already been raised.
 	 * Nested call far radio low isr are not supported
 	 **/
-
-	if (NVIC_GetActive(RADIO_SW_LOW_INTR_NUM) == 0) {
+	if (NVIC_GetActive((IRQn_Type)RADIO_SW_LOW_INTR_NUM) == 0) {
 		/* No nested SW low ISR, default behavior */
-
 		if (priority == 0) {
 			low_isr_priority = RADIO_SW_LOW_INTR_PRIO;
 		}
-
 		NVIC_SetPriority((IRQn_Type)RADIO_SW_LOW_INTR_NUM, low_isr_priority);
 	} else {
 		/* Nested call detected */
 		/* No change for SW radio low interrupt priority for the moment */
-
 		if (priority != 0) {
 			/* At the end of current SW radio low ISR, this pending SW
 			 * low interrupt will run with RADIO_INTR_PRIO_LOW_Z priority
@@ -153,6 +151,26 @@ void LINKLAYER_PLAT_Assert(uint8_t condition)
 	__ASSERT_NO_MSG(condition);
 }
 
+void LINKLAYER_PLAT_EnableIRQ(void)
+{
+	if (irq_counter > 0) {
+		irq_counter--;
+		if (irq_counter == 0) {
+			__set_PRIMASK(primask_bit);
+		}
+	}
+}
+
+void LINKLAYER_PLAT_DisableIRQ(void)
+{
+	if (irq_counter == 0) {
+		/* Save primask bit at first time interrupts disabling */
+		primask_bit = __get_PRIMASK();
+	}
+	__disable_irq();
+	irq_counter++;
+}
+
 void LINKLAYER_PLAT_EnableSpecificIRQ(uint8_t isr_type)
 {
 
@@ -208,11 +226,23 @@ void LINKLAYER_PLAT_DisableSpecificIRQ(uint8_t isr_type)
 	}
 }
 
+void LINKLAYER_PLAT_EnableRadioIT(void)
+{
+	LOG_DBG("Enable RADIO IRQ");
+	irq_enable(RADIO_INTR_NUM);
+}
+
+void LINKLAYER_PLAT_DisableRadioIT(void)
+{
+	LOG_DBG("Disable RADIO IRQ");
+	irq_disable(RADIO_INTR_NUM);
+}
+
 void LINKLAYER_PLAT_StartRadioEvt(void)
 {
 	__HAL_RCC_RADIO_CLK_SLEEP_ENABLE();
 
-	NVIC_SetPriority(RADIO_INTR_NUM, RADIO_INTR_PRIO_HIGH_Z);
+	NVIC_SetPriority((IRQn_Type)RADIO_INTR_NUM, RADIO_INTR_PRIO_HIGH_Z);
 
 	scm_notifyradiostate(SCM_RADIO_ACTIVE);
 }
@@ -221,7 +251,7 @@ void LINKLAYER_PLAT_StopRadioEvt(void)
 {
 	__HAL_RCC_RADIO_CLK_SLEEP_DISABLE();
 
-	NVIC_SetPriority(RADIO_INTR_NUM, RADIO_INTR_PRIO_LOW_Z);
+	NVIC_SetPriority((IRQn_Type)RADIO_INTR_NUM, RADIO_INTR_PRIO_LOW_Z);
 
 	scm_notifyradiostate(SCM_RADIO_NOT_ACTIVE);
 }
@@ -238,10 +268,23 @@ void LINKLAYER_PLAT_RCOStopClbr(void)
 /* Required only for RCO module usage in the context of LSI2 calibration */
 }
 
+/* TODO: To do when porting the temperature measurement function and thread */
 void LINKLAYER_PLAT_RequestTemperature(void) {}
 
 void LINKLAYER_PLAT_SCHLDR_TIMING_UPDATE_NOT(Evnt_timing_t *p_evnt_timing) {}
 
-void LINKLAYER_PLAT_EnableOSContextSwitch(void) {}
+void LINKLAYER_PLAT_EnableOSContextSwitch(void)
+{
+	/* No implementation is needed. However, this function may be used to notify
+	 * upper layers that the link layer has just finished a critical radio job
+	 * (radio channels' calibration).
+	 **/
+}
 
-void LINKLAYER_PLAT_DisableOSContextSwitch(void) {}
+void LINKLAYER_PLAT_DisableOSContextSwitch(void)
+{
+	/* No implementation is needed. However, this function may be used to notify upper layers
+	 * that the link layer is running a critical radio job (radio channels' calibration);
+	 * A sequence of radio ISRs will appear in the next few milli seconds.
+	 **/
+}
diff --git a/soc/st/stm32/stm32wbax/hci_if/ll_sys_if_adapt.c b/soc/st/stm32/stm32wbax/hci_if/ll_sys_if_adapt.c
index df0342ff1f19c..f555304ee4ec8 100644
--- a/soc/st/stm32/stm32wbax/hci_if/ll_sys_if_adapt.c
+++ b/soc/st/stm32/stm32wbax/hci_if/ll_sys_if_adapt.c
@@ -12,28 +12,32 @@ LOG_MODULE_REGISTER(ll_sys_if_adapt);
 
 #include "ll_sys.h"
 
-extern struct k_mutex ble_ctlr_stack_mutex;
+extern struct k_mutex ble_ctrl_stack_mutex;
 extern struct k_work_q ll_work_q;
 struct k_work ll_sys_work;
 
-void ll_sys_schedule_bg_process(void)
+static void ll_sys_bg_process_handler(struct k_work *work)
 {
-	k_work_submit_to_queue(&ll_work_q, &ll_sys_work);
+	k_mutex_lock(&ble_ctrl_stack_mutex, K_FOREVER);
+	ll_sys_bg_process();
+	k_mutex_unlock(&ble_ctrl_stack_mutex);
 }
 
-void ll_sys_schedule_bg_process_isr(void)
+void ll_sys_schedule_bg_process(void)
 {
 	k_work_submit_to_queue(&ll_work_q, &ll_sys_work);
 }
 
-static void ll_sys_bg_process_handler(struct k_work *work)
+void ll_sys_schedule_bg_process_isr(void)
 {
-	k_mutex_lock(&ble_ctlr_stack_mutex, K_FOREVER);
-	ll_sys_bg_process();
-	k_mutex_unlock(&ble_ctlr_stack_mutex);
+	k_work_submit_to_queue(&ll_work_q, &ll_sys_work);
 }
 
 void ll_sys_bg_process_init(void)
 {
 	k_work_init(&ll_sys_work, &ll_sys_bg_process_handler);
 }
+
+/* TODO: Implement temperature measurement thread after
+ * implementing temperature measurement request function
+ **/
diff --git a/soc/ti/k3/am6x/CMakeLists.txt b/soc/ti/k3/am6x/CMakeLists.txt
index d5e88b78e25a9..79e4cd1259611 100644
--- a/soc/ti/k3/am6x/CMakeLists.txt
+++ b/soc/ti/k3/am6x/CMakeLists.txt
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_include_directories(.)
+zephyr_sources(common/ctrl_partitions.c)
 
 if(CONFIG_SOC_AM6234_A53)
   zephyr_sources_ifdef(CONFIG_ARM_MMU a53/mmu_regions.c)
diff --git a/soc/ti/k3/am6x/Kconfig b/soc/ti/k3/am6x/Kconfig
index a28996cc30589..2612712d55124 100644
--- a/soc/ti/k3/am6x/Kconfig
+++ b/soc/ti/k3/am6x/Kconfig
@@ -9,6 +9,7 @@ config SOC_SERIES_AM6X_A53
 config SOC_SERIES_AM6X_M4
 	select ARM
 	select CPU_CORTEX_M4
+	select CPU_HAS_FPU
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select DYNAMIC_INTERRUPTS
 	select CPU_CORTEX_M_HAS_DWT
@@ -23,13 +24,16 @@ config SOC_SERIES_AM6X_R5
 	select ARM
 	select CPU_CORTEX_R5
 	select CPU_HAS_ARM_MPU
+	select VFP_SP_D16
 	select ARM_CUSTOM_INTERRUPT_CONTROLLER
 	select VIM
 	select TI_DM_TIMER
 	select OPENAMP_RSC_TABLE
 	select UART_NS16550_ACCESS_WORD_ONLY if UART_NS16550
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_PART_NUMBER
+	default "AM6232" if SOC_AM6232_M4
 	default "AM6234" if SOC_AM6234_A53
 	default "AM6234" if SOC_AM6234_M4
 	default "AM6442" if SOC_AM6442_M4
diff --git a/soc/ti/k3/am6x/Kconfig.soc b/soc/ti/k3/am6x/Kconfig.soc
index 82c56f200b876..8efcc1ed546ce 100644
--- a/soc/ti/k3/am6x/Kconfig.soc
+++ b/soc/ti/k3/am6x/Kconfig.soc
@@ -31,6 +31,10 @@ config SOC_AM6234_M4
 	bool
 	select SOC_SERIES_AM6X_M4
 
+config SOC_AM6232_M4
+	bool
+	select SOC_SERIES_AM6X_M4
+
 config SOC_AM6442_M4
 	bool
 	select SOC_SERIES_AM6X_M4
@@ -51,6 +55,7 @@ config SOC_SERIES
 	default "am6x" if SOC_SERIES_AM6X
 
 config SOC
+	default "am6232" if SOC_AM6232_M4
 	default "am6234" if SOC_AM6234_M4 || SOC_AM6234_A53
 	default "am6442" if SOC_AM6442_M4
 	default "j721e" if SOC_J721E_MAIN_R5F0_0
diff --git a/soc/ti/k3/am6x/common/ctrl_partitions.c b/soc/ti/k3/am6x/common/ctrl_partitions.c
new file mode 100644
index 0000000000000..83df836e5ce82
--- /dev/null
+++ b/soc/ti/k3/am6x/common/ctrl_partitions.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025 Texas Instruments Incorporated
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/device_mmio.h>
+#include <zephyr/arch/common/sys_io.h>
+
+#define KICK0_OFFSET     (0x1008)
+#define KICK1_OFFSET     (0x100C)
+#define KICK0_UNLOCK_VAL (0x68EF3490U)
+#define KICK1_UNLOCK_VAL (0xD172BC5AU)
+#define KICK_LOCK_VAL    (0x0U)
+
+#define CTRL_PARTITION_SIZE        (0x4000)
+#define CTRL_PARTITION(base, part) ((base) + (part) * CTRL_PARTITION_SIZE)
+
+#if defined CONFIG_SOC_AM6442_M4
+#define MCU_PADCFG_BASE (0x4080000)
+#elif defined CONFIG_SOC_AM6234_M4 | defined CONFIG_SOC_AM6232_M4
+#define WKUP_PADCFG_BASE (0x4080000)
+#endif
+
+static const uintptr_t ctrl_partitions[] = {
+#if defined CONFIG_SOC_AM6442_M4
+	CTRL_PARTITION(MCU_PADCFG_BASE, 0),
+	CTRL_PARTITION(MCU_PADCFG_BASE, 1),
+#elif defined CONFIG_SOC_AM6234_M4 | defined CONFIG_SOC_AM6232_M4
+	CTRL_PARTITION(WKUP_PADCFG_BASE, 0),
+	CTRL_PARTITION(WKUP_PADCFG_BASE, 1),
+#endif
+};
+
+void k3_unlock_all_ctrl_partitions(void)
+{
+	ARRAY_FOR_EACH(ctrl_partitions, i) {
+		mm_reg_t base_addr = ctrl_partitions[i];
+
+#ifdef DEVICE_MMIO_IS_IN_RAM
+		device_map(&base_addr, base_addr, sizeof(base_addr), K_MEM_CACHE_NONE);
+#endif
+
+		sys_write32(KICK0_UNLOCK_VAL, base_addr + KICK0_OFFSET);
+		sys_write32(KICK1_UNLOCK_VAL, base_addr + KICK1_OFFSET);
+	}
+}
diff --git a/soc/ti/k3/am6x/common/ctrl_partitions.h b/soc/ti/k3/am6x/common/ctrl_partitions.h
new file mode 100644
index 0000000000000..a2b1b0d883991
--- /dev/null
+++ b/soc/ti/k3/am6x/common/ctrl_partitions.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Texas Instruments Incorporated
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __K3_CTRL_PARTITIONS_H_
+#define __K3_CTRL_PARTITIONS_H_
+
+void k3_unlock_all_ctrl_partitions(void);
+
+#endif /* __K3_CTRL_PARTITIONS_H */
diff --git a/soc/ti/k3/am6x/m4/linker.ld b/soc/ti/k3/am6x/m4/linker.ld
index 5e478a0541ff0..dfe71053cfe6b 100644
--- a/soc/ti/k3/am6x/m4/linker.ld
+++ b/soc/ti/k3/am6x/m4/linker.ld
@@ -13,6 +13,6 @@ SECTIONS
 	SECTION_PROLOGUE(.resource_table,, SUBALIGN(4))
 	{
 		KEEP(*(.resource_table*))
-	} GROUP_LINK_IN(DDR)
+	} GROUP_LINK_IN(RSC_TABLE)
 #endif
 }
diff --git a/soc/ti/k3/am6x/m4/soc.c b/soc/ti/k3/am6x/m4/soc.c
index f3d5e330071e9..40dc0a7c92ab3 100644
--- a/soc/ti/k3/am6x/m4/soc.c
+++ b/soc/ti/k3/am6x/m4/soc.c
@@ -4,67 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <common/ctrl_partitions.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <soc.h>
 
-#define ADDR_TRANSLATE_RAT_BASE_ADDR		(0x044200000u)
-#define PINCTRL_BASE_ADDR			(0x4080000u)
-#define KICK0_UNLOCK_VAL			(0x68EF3490U)
-#define KICK1_UNLOCK_VAL			(0xD172BC5AU)
-#define CSL_MCU_PADCONFIG_LOCK0_KICK0_OFFSET	(0x1008)
-#define CSL_MCU_PADCONFIG_LOCK1_KICK0_OFFSET	(0x5008)
+#define ADDR_TRANSLATE_RAT_BASE_ADDR (0x44200000u)
 
 static struct address_trans_region_config am6x_region_config[] = {
 	{
-		.system_addr = 0x0u,
-		.local_addr = 0x80000000u,
-		.size = address_trans_region_size_512M,
+		.system_addr = 0x00000000u,
+		.local_addr =  0x60000000u,
+		.size = address_trans_region_size_256M,
 	},
 	{
-		.local_addr = 0xA0000000u,
 		.system_addr = 0x20000000u,
+		.local_addr =  0xc0000000u,
 		.size = address_trans_region_size_512M,
 	},
 	{
-		.local_addr = 0xC0000000u,
 		.system_addr = 0x40000000u,
-		.size = address_trans_region_size_512M,
-	},
-	{
-		.local_addr = 0x60000000u,
-		.system_addr = 0x60000000u,
-		.size = address_trans_region_size_512M,
+		.local_addr =  0x70000000u,
+		.size = address_trans_region_size_256M,
 	},
-
 /*
  * Add regions here if you want to map more memory.
  */
 };
 
-static void am6x_mmr_unlock(void)
-{
-	uint32_t baseAddr = PINCTRL_BASE_ADDR;
-	uintptr_t kickAddr;
-
-	/* Lock 0 */
-	kickAddr = baseAddr + CSL_MCU_PADCONFIG_LOCK0_KICK0_OFFSET;
-	sys_write32(KICK0_UNLOCK_VAL, kickAddr);   /* KICK 0 */
-	kickAddr = kickAddr + sizeof(uint32_t *);
-	sys_write32(KICK1_UNLOCK_VAL, kickAddr);   /* KICK 1 */
-
-	/* Lock 1 */
-	kickAddr = baseAddr + CSL_MCU_PADCONFIG_LOCK1_KICK0_OFFSET;
-	sys_write32(KICK0_UNLOCK_VAL, kickAddr);   /* KICK 0 */
-	kickAddr = kickAddr + sizeof(uint32_t *);
-	sys_write32(KICK1_UNLOCK_VAL, kickAddr);   /* KICK 1 */
-}
-
 void soc_early_init_hook(void)
 {
 	sys_mm_drv_ti_rat_init(am6x_region_config, ADDR_TRANSLATE_RAT_BASE_ADDR,
-		ARRAY_SIZE(am6x_region_config));
-	am6x_mmr_unlock();
+			       ARRAY_SIZE(am6x_region_config));
+
+	k3_unlock_all_ctrl_partitions();
 }
diff --git a/soc/ti/k3/am6x/r5/soc.c b/soc/ti/k3/am6x/r5/soc.c
index 8190f43353fc1..3142fdcd96f59 100644
--- a/soc/ti/k3/am6x/r5/soc.c
+++ b/soc/ti/k3/am6x/r5/soc.c
@@ -8,6 +8,7 @@
 #include <zephyr/fatal.h>
 
 #include "soc.h"
+#include <common/ctrl_partitions.h>
 
 unsigned int z_soc_irq_get_active(void)
 {
@@ -47,3 +48,8 @@ int z_soc_irq_is_enabled(unsigned int irq)
 	/* Check if interrupt is enabled */
 	return z_vim_irq_is_enabled(irq);
 }
+
+void soc_early_init_hook(void)
+{
+	k3_unlock_all_ctrl_partitions();
+}
diff --git a/soc/ti/k3/soc.yml b/soc/ti/k3/soc.yml
index 44e530703a81a..dbfc4d30f4b86 100644
--- a/soc/ti/k3/soc.yml
+++ b/soc/ti/k3/soc.yml
@@ -3,6 +3,9 @@ family:
   series:
   - name: am6x
     socs:
+    - name: am6232
+      cpuclusters:
+      - name: m4
     - name: am6234
       cpuclusters:
       - name: m4
diff --git a/soc/ti/simplelink/cc23x0/soc.h b/soc/ti/simplelink/cc23x0/soc.h
index 968cbc99d9c54..353b64b6a11e4 100644
--- a/soc/ti/simplelink/cc23x0/soc.h
+++ b/soc/ti/simplelink/cc23x0/soc.h
@@ -9,5 +9,6 @@
 #define TI_SIMPLELINK_CC23X0_SOC_H_
 
 #include "cmsis/cc23x0r5.h"
+#include "ti_cc23x0_dt.h"
 
 #endif /* TI_SIMPLELINK_CC23X0_SOC_H_ */
diff --git a/soc/ti/simplelink/cc23x0/ti_cc23x0_dt.h b/soc/ti/simplelink/cc23x0/ti_cc23x0_dt.h
new file mode 100644
index 0000000000000..d5af5a3947e7e
--- /dev/null
+++ b/soc/ti/simplelink/cc23x0/ti_cc23x0_dt.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 BayLibre, SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief TI CC23X0 MCU family devicetree helper macros
+ */
+
+#ifndef _TI_CC23X0_DT_H_
+#define _TI_CC23X0_DT_H_
+
+/* Common macro to get CPU clock frequency */
+#define TI_CC23X0_DT_CPU_CLK_FREQ_HZ \
+	DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
+
+/*
+ * Helper macros for use with TI CC23X0 DMA controller
+ * return 0xff as default value if there is no 'dmas' property
+ */
+#define TI_CC23X0_DT_INST_DMA_CELL(n, name, cell)		\
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(n, dmas),		\
+		    (DT_INST_DMAS_CELL_BY_NAME(n, name, cell)),	\
+		    (0xff))
+
+#define TI_CC23X0_DT_INST_DMA_TRIGSRC(n, name) \
+	TI_CC23X0_DT_INST_DMA_CELL(n, name, trigsrc)
+
+#define TI_CC23X0_DT_INST_DMA_CHANNEL(n, name) \
+	TI_CC23X0_DT_INST_DMA_CELL(n, name, channel)
+
+#define TI_CC23X0_DT_INST_DMA_CTLR(n, name)			\
+	COND_CODE_1(DT_INST_NODE_HAS_PROP(n, dmas),		\
+		    (DT_INST_DMAS_CTLR_BY_NAME(n, name)),	\
+		    (DT_INVALID_NODE))
+
+#endif /* _TI_CC23X0_DT_H_ */
diff --git a/soc/wch/ch32v/qingke_v4c/CMakeLists.txt b/soc/wch/ch32v/qingke_v4c/CMakeLists.txt
new file mode 100644
index 0000000000000..a7e9de643d690
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Michael Hope
+# Copyright (c) 2024 Jianxiong Gu
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(
+  soc_irq.S
+  vector.S
+)
+
+zephyr_include_directories(.)
diff --git a/soc/wch/ch32v/qingke_v4c/Kconfig b/soc/wch/ch32v/qingke_v4c/Kconfig
new file mode 100644
index 0000000000000..732a7d8a9ec0b
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_QINGKE_V4C
+	select RISCV_ISA_RV32I
+	select RISCV_ISA_EXT_M
+	select RISCV_ISA_EXT_A
+	select RISCV_ISA_EXT_C
+	select RISCV_ISA_EXT_ZICSR
+	select RISCV_ISA_EXT_ZIFENCEI
diff --git a/soc/wch/ch32v/qingke_v4c/Kconfig.defconfig b/soc/wch/ch32v/qingke_v4c/Kconfig.defconfig
new file mode 100644
index 0000000000000..a782adfdfd2b3
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/Kconfig.defconfig
@@ -0,0 +1,23 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_SERIES_QINGKE_V4C
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
+
+config MAIN_STACK_SIZE
+	default 512
+
+config IDLE_STACK_SIZE
+	default 256
+
+config ISR_STACK_SIZE
+	default 256
+
+config CLOCK_CONTROL
+	default y
+
+rsource "Kconfig.defconfig.*"
+
+endif # SOC_SERIES_QINGKE_V4C
diff --git a/soc/wch/ch32v/qingke_v4c/Kconfig.defconfig.ch32v208 b/soc/wch/ch32v/qingke_v4c/Kconfig.defconfig.ch32v208
new file mode 100644
index 0000000000000..f7b4b3fe1ec96
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/Kconfig.defconfig.ch32v208
@@ -0,0 +1,12 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_CH32V208
+
+config VECTOR_TABLE_SIZE
+	default 103
+
+config NUM_IRQS
+	default 128
+
+endif # SOC_CH32V208
diff --git a/soc/wch/ch32v/qingke_v4c/Kconfig.soc b/soc/wch/ch32v/qingke_v4c/Kconfig.soc
new file mode 100644
index 0000000000000..33ffd7e3f2194
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/Kconfig.soc
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_QINGKE_V4C
+	bool
+	select SOC_FAMILY_CH32V
+
+config SOC_SERIES
+	default "qingke_v4c" if SOC_SERIES_QINGKE_V4C
+
+rsource "Kconfig.soc.*"
diff --git a/soc/wch/ch32v/qingke_v4c/Kconfig.soc.ch32v208 b/soc/wch/ch32v/qingke_v4c/Kconfig.soc.ch32v208
new file mode 100644
index 0000000000000..8baa7d35833af
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/Kconfig.soc.ch32v208
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_CH32V208
+	bool
+	select SOC_SERIES_QINGKE_V4C
+
+config SOC
+	default "ch32v208" if SOC_CH32V208
diff --git a/soc/wch/ch32v/qingke_v4c/pinctrl_soc.h b/soc/wch/ch32v/qingke_v4c/pinctrl_soc.h
new file mode 100644
index 0000000000000..a448d447b3af3
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/pinctrl_soc.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Michael Hope
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __PINCTRL_SOC_H__
+#define __PINCTRL_SOC_H__
+
+/**
+ * @brief Type to hold a pin's pinctrl configuration.
+ */
+struct ch32v208_pinctrl_soc_pin {
+	uint32_t config: 22;
+	bool bias_pull_up: 1;
+	bool bias_pull_down: 1;
+	bool drive_open_drain: 1;
+	bool drive_push_pull: 1;
+	bool output_high: 1;
+	bool output_low: 1;
+	uint8_t slew_rate: 2;
+};
+
+typedef struct ch32v208_pinctrl_soc_pin pinctrl_soc_pin_t;
+
+#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)                                               \
+	{                                                                                          \
+		.config = DT_PROP_BY_IDX(node_id, prop, idx),                                      \
+		.bias_pull_up = DT_PROP(node_id, bias_pull_up),                                    \
+		.bias_pull_down = DT_PROP(node_id, bias_pull_down),                                \
+		.drive_open_drain = DT_PROP(node_id, drive_open_drain),                            \
+		.drive_push_pull = DT_PROP(node_id, drive_push_pull),                              \
+		.output_high = DT_PROP(node_id, output_high),                                      \
+		.output_low = DT_PROP(node_id, output_low),                                        \
+		.slew_rate = DT_ENUM_IDX(node_id, slew_rate),                                      \
+	},
+
+#define Z_PINCTRL_STATE_PINS_INIT(node_id, prop)                                                   \
+	{DT_FOREACH_CHILD_VARGS(DT_PHANDLE(node_id, prop), DT_FOREACH_PROP_ELEM, pinmux,           \
+				Z_PINCTRL_STATE_PIN_INIT)}
+
+#endif
diff --git a/soc/wch/ch32v/qingke_v4c/soc_irq.S b/soc/wch/ch32v/qingke_v4c/soc_irq.S
new file mode 100644
index 0000000000000..fcb0daea51d01
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/soc_irq.S
@@ -0,0 +1,19 @@
+/* Copyright (c) 2024 Michael Hope
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <offsets.h>
+#include <zephyr/toolchain.h>
+
+/* Exports */
+GTEXT(__soc_is_irq)
+GTEXT(__soc_handle_irq)
+
+SECTION_FUNC(exception.other, __soc_is_irq)
+	csrr a0, mcause
+	srli a0, a0, 31
+	ret
+
+SECTION_FUNC(exception.other, __soc_handle_irq)
+	ret
diff --git a/soc/wch/ch32v/qingke_v4c/vector.S b/soc/wch/ch32v/qingke_v4c/vector.S
new file mode 100644
index 0000000000000..d078444d85e15
--- /dev/null
+++ b/soc/wch/ch32v/qingke_v4c/vector.S
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024 Michael Hope
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/toolchain.h>
+
+#ifndef CONFIG_VECTOR_TABLE_SIZE
+#error "VECTOR_TABLE_SIZE must be defined"
+#endif
+
+/* Exports */
+GTEXT(__start)
+
+/* Imports */
+GTEXT(__initialize)
+
+SECTION_FUNC(vectors, ivt)
+	.option norvc
+	j       __start
+	.rept   CONFIG_VECTOR_TABLE_SIZE
+	.word	_isr_wrapper
+	.endr
+
+SECTION_FUNC(vectors, __start)
+	li 	a0, 3
+	csrw	mtvec, a0
+	j	__initialize
diff --git a/soc/wch/ch32v/soc.yml b/soc/wch/ch32v/soc.yml
index c01905a7ed7c3..a019651b5dc52 100644
--- a/soc/wch/ch32v/soc.yml
+++ b/soc/wch/ch32v/soc.yml
@@ -7,3 +7,6 @@ family:
   - name: qingke-v2
     socs:
     - name: ch32v003
+  - name: qingke-v4c
+    socs:
+    - name: ch32v208
diff --git a/soc/xlnx/versalnet/CMakeLists.txt b/soc/xlnx/versalnet/CMakeLists.txt
new file mode 100644
index 0000000000000..a6ccdf4f20302
--- /dev/null
+++ b/soc/xlnx/versalnet/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+zephyr_sources(
+  soc.c
+)
+zephyr_sources_ifdef(
+  CONFIG_ARM_MPU
+  arm_mpu_regions.c
+)
+
+zephyr_include_directories(.)
+
+if(CONFIG_SOC_AMD_VERSALNET_RPU)
+  set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "")
+endif()
diff --git a/soc/xlnx/versalnet/Kconfig b/soc/xlnx/versalnet/Kconfig
new file mode 100644
index 0000000000000..89e185d62664a
--- /dev/null
+++ b/soc/xlnx/versalnet/Kconfig
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config SOC_AMD_VERSALNET_RPU
+	select ARM
+	select ARM_ARCH_TIMER
+	select CPU_CORTEX_R52
+	select SOC_EARLY_INIT_HOOK
+	select CPU_HAS_DCLS
+	select GIC_SINGLE_SECURITY_STATE
+	select CPU_HAS_ARM_MPU
+	select ARM_MPU
diff --git a/soc/xlnx/versalnet/Kconfig.defconfig b/soc/xlnx/versalnet/Kconfig.defconfig
new file mode 100644
index 0000000000000..7997b8feb6962
--- /dev/null
+++ b/soc/xlnx/versalnet/Kconfig.defconfig
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if SOC_AMD_VERSALNET
+
+if SOC_AMD_VERSALNET_RPU
+
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_CACHE_MANAGEMENT=y
+
+config NUM_IRQS
+	# must be >= the highest interrupt number used
+	# - include the UART interrupts
+	default 256
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
+
+endif # SOC_AMD_VERSALNET_RPU
+
+endif # SOC_AMD_VERSALNET
diff --git a/soc/xlnx/versalnet/Kconfig.soc b/soc/xlnx/versalnet/Kconfig.soc
new file mode 100644
index 0000000000000..181a2100d9bf3
--- /dev/null
+++ b/soc/xlnx/versalnet/Kconfig.soc
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config SOC_AMD_VERSALNET
+	bool
+
+config SOC_AMD_VERSALNET_RPU
+	bool
+	select SOC_AMD_VERSALNET
+	help
+	  AMD Versal NET SoC
+
+config SOC_FAMILY
+	default "amd_versalnet" if SOC_AMD_VERSALNET
+
+config SOC
+	default "amd_versalnet_rpu" if SOC_AMD_VERSALNET_RPU
diff --git a/soc/xlnx/versalnet/arm_mpu_regions.c b/soc/xlnx/versalnet/arm_mpu_regions.c
new file mode 100644
index 0000000000000..865452c6e38cf
--- /dev/null
+++ b/soc/xlnx/versalnet/arm_mpu_regions.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2025 Advanced Micro Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/arch/arm/mpu/arm_mpu.h>
+
+#define DEVICE_REGION_START	0xE2000000U
+#define DEVICE_REGION_END	0xF8000000U
+
+static const struct arm_mpu_region mpu_regions[] = {
+	MPU_REGION_ENTRY("vector",
+			 (uintptr_t)_vector_start,
+			 REGION_RAM_TEXT_ATTR((uintptr_t)_vector_end)),
+
+	MPU_REGION_ENTRY("SRAM_TEXT",
+			 (uintptr_t)__text_region_start,
+			 REGION_RAM_TEXT_ATTR((uintptr_t)__rodata_region_start)),
+
+	MPU_REGION_ENTRY("SRAM_RODATA",
+			 (uintptr_t)__rodata_region_start,
+			 REGION_RAM_RO_ATTR((uintptr_t)__rodata_region_end)),
+
+	MPU_REGION_ENTRY("SRAM_DATA",
+			 (uintptr_t)__rom_region_end,
+			 REGION_RAM_ATTR((uintptr_t)__kernel_ram_end)),
+
+	MPU_REGION_ENTRY("DEVICE",
+			 DEVICE_REGION_START,
+			 REGION_DEVICE_ATTR(DEVICE_REGION_END)),
+};
+
+const struct arm_mpu_config mpu_config = {
+	.num_regions = ARRAY_SIZE(mpu_regions),
+	.mpu_regions = mpu_regions,
+};
diff --git a/soc/xlnx/versalnet/soc.c b/soc/xlnx/versalnet/soc.c
new file mode 100644
index 0000000000000..3b269b4eefc28
--- /dev/null
+++ b/soc/xlnx/versalnet/soc.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Advanced Micro Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/cache.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+
+void soc_early_init_hook(void)
+{
+	if (IS_ENABLED(CONFIG_ICACHE)) {
+		if (!(__get_SCTLR() & SCTLR_I_Msk)) {
+			L1C_InvalidateICacheAll();
+			__set_SCTLR(__get_SCTLR() | SCTLR_I_Msk);
+			barrier_isync_fence_full();
+		}
+	}
+
+	if (IS_ENABLED(CONFIG_DCACHE)) {
+		if (!(__get_SCTLR() & SCTLR_C_Msk)) {
+			L1C_InvalidateDCacheAll();
+			__set_SCTLR(__get_SCTLR() | SCTLR_C_Msk);
+			barrier_dsync_fence_full();
+		}
+	}
+}
diff --git a/soc/xlnx/versalnet/soc.h b/soc/xlnx/versalnet/soc.h
new file mode 100644
index 0000000000000..78bafbaaa5f7e
--- /dev/null
+++ b/soc/xlnx/versalnet/soc.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025 Advanced Micro Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _SOC_XLNX_VERSALNET_SOC_H_
+#define _SOC_XLNX_VERSALNET_SOC_H_
+
+/* Define CMSIS configurations */
+#define __GIC_PRESENT 0
+#define __TIM_PRESENT 0
+
+#endif /* _SOC_XLNX_VERSALNET_SOC_H_ */
diff --git a/soc/xlnx/versalnet/soc.yml b/soc/xlnx/versalnet/soc.yml
new file mode 100644
index 0000000000000..8de1e6c40f4fa
--- /dev/null
+++ b/soc/xlnx/versalnet/soc.yml
@@ -0,0 +1,4 @@
+family:
+- name: amd_versalnet
+  socs:
+  - name: amd_versalnet_rpu
diff --git a/soc/xlnx/zynqmp/Kconfig b/soc/xlnx/zynqmp/Kconfig
index 3c88e5aa90e9e..73f44865b384d 100644
--- a/soc/xlnx/zynqmp/Kconfig
+++ b/soc/xlnx/zynqmp/Kconfig
@@ -6,5 +6,6 @@ config SOC_XILINX_ZYNQMP_RPU
 	select ARM
 	select CPU_CORTEX_R5
 	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 	select CPU_HAS_ARM_MPU
 	select VFP_DP_D16
diff --git a/soc/xlnx/zynqmp/soc.c b/soc/xlnx/zynqmp/soc.c
index db03b6399128c..fc8c8e460976a 100644
--- a/soc/xlnx/zynqmp/soc.c
+++ b/soc/xlnx/zynqmp/soc.c
@@ -7,6 +7,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
+#include <zephyr/cache.h>
 
 #include <cmsis_core.h>
 
@@ -20,3 +21,10 @@ void soc_reset_hook(void)
 	sctlr &= ~SCTLR_V_Msk;
 	__set_SCTLR(sctlr);
 }
+
+void soc_early_init_hook(void)
+{
+	/* Enable caches */
+	sys_cache_instr_enable();
+	sys_cache_data_enable();
+}
diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml
index d4d67d0ec2bd1..62d7d6b83f238 100644
--- a/submanifests/optional.yaml
+++ b/submanifests/optional.yaml
@@ -47,7 +47,7 @@ manifest:
       groups:
         - optional
     - name: tflite-micro
-      revision: 48613f7ba1ffbda46ad771a77a35408f48f922e9
+      revision: 8d404de73acf7687831e16d88e86e4f73cfddf8e
       path: optional/modules/lib/tflite-micro
       repo-path: tflite-micro
       remote: upstream
@@ -60,7 +60,7 @@ manifest:
       groups:
         - optional
     - name: zephyr-lang-rust
-      revision: cf3dc6cb79631717464f1cd6b3fb122220f12915
+      revision: d4f9036a88e53080bf2b186afa5289f9c77a0f73
       path: modules/lang/rust
       remote: upstream
       groups:
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index 4bff894c66f10..45e9bb446f8c1 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -182,8 +182,7 @@ config BT_PATH_LOSS_MONITORING
 	  Bluetooth Core specification, Version 5.4 | Vol 6, Part B, Section 4.6.32.
 
 config BT_SUBRATING
-	bool "LE Connection Subrating [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "LE Connection Subrating"
 	depends on !HAS_BT_CTLR || BT_CTLR_SUBRATING_SUPPORT
 	help
 	  Enable support for LE Connection Subrating feature that is defined in the
diff --git a/subsys/bluetooth/Kconfig.adv b/subsys/bluetooth/Kconfig.adv
index 28e1dea61a240..486d7f1ededa2 100644
--- a/subsys/bluetooth/Kconfig.adv
+++ b/subsys/bluetooth/Kconfig.adv
@@ -44,8 +44,7 @@ config BT_PER_ADV
 	  to periodically get the data.
 
 config BT_PER_ADV_RSP
-	bool "Periodic Advertising with Responses support [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "Periodic Advertising with Responses support"
 	depends on BT_PER_ADV
 	help
 	  Select this to enable Periodic Advertising with Responses
@@ -61,8 +60,7 @@ config BT_PER_ADV_SYNC
 	  manner.
 
 config BT_PER_ADV_SYNC_RSP
-	bool "Periodic Advertising with Responses sync support [EXPERIMENTAL]"
-	select EXPERIMENTAL
+	bool "Periodic Advertising with Responses sync support"
 	depends on BT_OBSERVER
 	help
 	  Select this to enable Periodic Advertising with Responses Sync
diff --git a/subsys/bluetooth/audio/Kconfig.bap b/subsys/bluetooth/audio/Kconfig.bap
index 662d1d6e5a14e..01ab717f379dc 100644
--- a/subsys/bluetooth/audio/Kconfig.bap
+++ b/subsys/bluetooth/audio/Kconfig.bap
@@ -12,7 +12,6 @@ config BT_BAP_UNICAST
 config BT_BAP_UNICAST_SERVER
 	bool "Bluetooth Unicast Audio Server Support"
 	depends on BT_GATT_DYNAMIC_DB
-	depends on BT_GATT_CACHING
 	depends on BT_PERIPHERAL
 	depends on BT_ISO_PERIPHERAL
 	depends on BT_ASCS
diff --git a/subsys/bluetooth/audio/Kconfig.csip b/subsys/bluetooth/audio/Kconfig.csip
index 9796a54329dc6..6601fc38ff6fd 100644
--- a/subsys/bluetooth/audio/Kconfig.csip
+++ b/subsys/bluetooth/audio/Kconfig.csip
@@ -48,11 +48,16 @@ config BT_CSIP_SET_MEMBER_MAX_INSTANCE_COUNT
 	  Enabling BT_CAP_ACCEPTOR_SET_MEMBER will take one of the allocated
 	  instances.
 
-config BT_CSIP_SET_MEMBER_NOTIFIABLE
+config BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE
 	bool "SIRK notifiable Support"
 	help
 	  This option enables support for clients to be notified on SIRK changes.
 
+config BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE
+	bool "Set Size notifiable support"
+	help
+	  This option enables support for clients to be notified on Set Size changes.
+
 endif # BT_CSIP_SET_MEMBER
 
 #################### Coordinated Set Identification Client ####################
diff --git a/subsys/bluetooth/audio/Kconfig.tbs b/subsys/bluetooth/audio/Kconfig.tbs
index 6b3cfa77bc19f..557786a833cdb 100644
--- a/subsys/bluetooth/audio/Kconfig.tbs
+++ b/subsys/bluetooth/audio/Kconfig.tbs
@@ -52,6 +52,14 @@ config BT_TBS_MAX_SCHEME_LIST_LENGTH
 	help
 	  Sets the maximum length of the URI scheme list.
 
+config BT_TBS_LOCK_TIMEOUT
+	int "Milliseconds of timeout when handling concurrent operations"
+	range 0 1000
+	default 10
+	help
+	  The number of milliseconds that the TBS implementation will maximum wait before rejecting
+	  an write request if another is already in progress in another thread.
+
 endif # BT_TBS
 
 
diff --git a/subsys/bluetooth/audio/aics.c b/subsys/bluetooth/audio/aics.c
index 222969aba241b..9c87f718adc68 100644
--- a/subsys/bluetooth/audio/aics.c
+++ b/subsys/bluetooth/audio/aics.c
@@ -487,7 +487,7 @@ int bt_aics_register(struct bt_aics *aics, struct bt_aics_register_param *param)
 		return -EINVAL;
 	}
 
-	CHECKIF(param->type > BT_AICS_INPUT_TYPE_STREAMING) {
+	CHECKIF(param->type > BT_AICS_INPUT_TYPE_AMBIENT) {
 		LOG_DBG("Invalid AICS input type value: %u", param->type);
 		return -EINVAL;
 	}
diff --git a/subsys/bluetooth/audio/ascs.c b/subsys/bluetooth/audio/ascs.c
index a64f6f210561c..6f4924dc60d4f 100644
--- a/subsys/bluetooth/audio/ascs.c
+++ b/subsys/bluetooth/audio/ascs.c
@@ -3,7 +3,7 @@
  */
 /*
  * Copyright (c) 2020 Intel Corporation
- * Copyright (c) 2022-2023 Nordic Semiconductor ASA
+ * Copyright (c) 2022-2025 Nordic Semiconductor ASA
  * Copyright (c) 2024 Demant A/S
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -200,17 +200,6 @@ static void ase_free(struct bt_ascs_ase *ase)
 	(void)k_work_cancel_delayable(&ase->state_transition_work);
 }
 
-static uint16_t get_max_ntf_size(struct bt_conn *conn)
-{
-	const uint16_t mtu = conn == NULL ? 0 : bt_gatt_get_mtu(conn);
-
-	if (mtu > NTF_HEADER_SIZE) {
-		return mtu - NTF_HEADER_SIZE;
-	}
-
-	return 0U;
-}
-
 static int ase_state_notify(struct bt_ascs_ase *ase)
 {
 	struct bt_conn *conn = ase->conn;
@@ -238,7 +227,7 @@ static int ase_state_notify(struct bt_ascs_ase *ase)
 
 	ascs_ep_get_status(&ase->ep, &ase_buf);
 
-	max_ntf_size = get_max_ntf_size(conn);
+	max_ntf_size = bt_audio_get_max_ntf_size(conn);
 
 	ntf_size = MIN(max_ntf_size, ase_buf.len);
 	if (ntf_size < ase_buf.len) {
@@ -329,10 +318,7 @@ static void ase_enter_state_idle(struct bt_ascs_ase *ase)
 
 	ase->ep.receiver_ready = false;
 
-	if (stream->conn != NULL) {
-		bt_conn_unref(stream->conn);
-		stream->conn = NULL;
-	}
+	bt_bap_stream_detach(stream);
 
 	ops = stream->ops;
 	if (ops != NULL && ops->released != NULL) {
@@ -398,6 +384,11 @@ static void ase_enter_state_streaming(struct bt_ascs_ase *ase)
 
 	__ASSERT_NO_MSG(stream != NULL);
 
+	/* Setup the ISO data path when the stream is started. We could do it earlier when the CIS
+	 * is connected, but then we would just receive audio data that we would then just discard
+	 */
+	bt_bap_setup_iso_data_path(stream);
+
 	ops = stream->ops;
 	if (ops != NULL && ops->started != NULL) {
 		ops->started(stream);
@@ -431,6 +422,14 @@ static void ase_exit_state_streaming(struct bt_ascs_ase *ase)
 		reason = BT_HCI_ERR_UNSPECIFIED;
 	}
 
+	if (ase->ep.iso != NULL && ase->ep.iso->chan.state == BT_ISO_STATE_CONNECTED) {
+		/* Remove the ISO data path as we no longer want to process any ISO data for this
+		 * stream, but only if the CIS is still connected. If the CIS disconnected, then the
+		 * data path is automatically removed by the controller
+		 */
+		bt_bap_remove_iso_data_path(stream);
+	}
+
 	ops = stream->ops;
 
 	/*
@@ -1774,7 +1773,7 @@ int bt_ascs_config_ase(struct bt_conn *conn, struct bt_bap_stream *stream,
 
 static uint16_t get_max_ase_rsp_for_conn(struct bt_conn *conn)
 {
-	const uint16_t max_ntf_size = get_max_ntf_size(conn);
+	const uint16_t max_ntf_size = bt_audio_get_max_ntf_size(conn);
 	const size_t rsp_hdr_size = sizeof(struct bt_ascs_cp_rsp);
 
 	if (max_ntf_size > rsp_hdr_size) {
@@ -2010,12 +2009,6 @@ static void ase_qos(struct bt_ascs_ase *ase, uint8_t cig_id, uint8_t cis_id,
 	ep->qos = *qos;
 	stream->qos = &ep->qos;
 
-	/* We setup the data path here, as this is the earliest where
-	 * we have the ISO <-> EP coupling completed (due to setting
-	 * the CIS ID in the QoS procedure).
-	 */
-	bt_bap_iso_configure_data_path(ep, stream->codec_cfg);
-
 	ep->cig_id = cig_id;
 	ep->cis_id = cis_id;
 
diff --git a/subsys/bluetooth/audio/audio.c b/subsys/bluetooth/audio/audio.c
index 695096201c442..75109d4fd9657 100644
--- a/subsys/bluetooth/audio/audio.c
+++ b/subsys/bluetooth/audio/audio.c
@@ -257,4 +257,16 @@ ssize_t bt_audio_ccc_cfg_write(struct bt_conn *conn, const struct bt_gatt_attr *
 
 	return sizeof(value);
 }
+
+uint16_t bt_audio_get_max_ntf_size(struct bt_conn *conn)
+{
+	const uint8_t att_ntf_header_size = 3; /* opcode (1) + handle (2) */
+	const uint16_t mtu = conn == NULL ? 0 : bt_gatt_get_mtu(conn);
+
+	if (mtu > att_ntf_header_size) {
+		return mtu - att_ntf_header_size;
+	}
+
+	return 0U;
+}
 #endif /* CONFIG_BT_CONN */
diff --git a/subsys/bluetooth/audio/audio_internal.h b/subsys/bluetooth/audio/audio_internal.h
index 4336b8ede0609..74cc35b4d04b1 100644
--- a/subsys/bluetooth/audio/audio_internal.h
+++ b/subsys/bluetooth/audio/audio_internal.h
@@ -61,9 +61,10 @@ ssize_t bt_audio_ccc_cfg_write(struct bt_conn *conn, const struct bt_gatt_attr *
 			       uint16_t value);
 
 /** Helper to define LE Audio CCC descriptor. */
-#define BT_AUDIO_CCC(_changed)								\
-	BT_GATT_CCC_MANAGED(((struct _bt_gatt_ccc[])					\
-		{BT_GATT_CCC_INITIALIZER(_changed, bt_audio_ccc_cfg_write, NULL)}),	\
+#define BT_AUDIO_CCC(_changed)                                                                     \
+	BT_GATT_CCC_MANAGED(                                                                       \
+		((struct bt_gatt_ccc_managed_user_data[]){BT_GATT_CCC_MANAGED_USER_DATA_INIT(      \
+			_changed, bt_audio_ccc_cfg_write, NULL)}),                                 \
 		(BT_GATT_PERM_READ | BT_GATT_PERM_WRITE_ENCRYPT))
 
 static inline const char *bt_audio_dir_str(enum bt_audio_dir dir)
@@ -79,3 +80,4 @@ static inline const char *bt_audio_dir_str(enum bt_audio_dir dir)
 }
 
 bool bt_audio_valid_ltv(const uint8_t *data, uint8_t data_len);
+uint16_t bt_audio_get_max_ntf_size(struct bt_conn *conn);
diff --git a/subsys/bluetooth/audio/bap_broadcast_assistant.c b/subsys/bluetooth/audio/bap_broadcast_assistant.c
index 4d38b9307fdfb..34197b9903051 100644
--- a/subsys/bluetooth/audio/bap_broadcast_assistant.c
+++ b/subsys/bluetooth/audio/bap_broadcast_assistant.c
@@ -48,9 +48,8 @@ LOG_MODULE_REGISTER(bt_bap_broadcast_assistant, CONFIG_BT_BAP_BROADCAST_ASSISTAN
 
 #include "common/bt_str.h"
 
+#include "audio_internal.h"
 #include "bap_internal.h"
-#include "../host/conn_internal.h"
-#include "../host/hci_core.h"
 
 #define MINIMUM_RECV_STATE_LEN          15
 
@@ -209,12 +208,30 @@ static bool past_available(const struct bt_conn *conn,
 			   uint8_t sid)
 {
 	if (IS_ENABLED(CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER)) {
+		struct bt_le_local_features local_features;
+		struct bt_conn_remote_info remote_info;
+		int err;
+
+		err = bt_le_get_local_features(&local_features);
+		if (err != 0) {
+			LOG_DBG("Failed to get local features: %d", err);
+			return false;
+		}
+
+		err = bt_conn_get_remote_info(conn, &remote_info);
+		if (err != 0) {
+			LOG_DBG("Failed to get remote info: %d", err);
+			return false;
+		}
+
 		LOG_DBG("%p remote %s PAST, local %s PAST", (void *)conn,
-			BT_FEAT_LE_PAST_RECV(conn->le.features) ? "supports" : "does not support",
-			BT_FEAT_LE_PAST_SEND(bt_dev.le.features) ? "supports" : "does not support");
+			BT_FEAT_LE_PAST_RECV(remote_info.le.features) ? "supports"
+								      : "does not support",
+			BT_FEAT_LE_PAST_SEND(local_features.features) ? "supports"
+								      : "does not support");
 
-		return BT_FEAT_LE_PAST_RECV(conn->le.features) &&
-		       BT_FEAT_LE_PAST_SEND(bt_dev.le.features) &&
+		return BT_FEAT_LE_PAST_RECV(remote_info.le.features) &&
+		       BT_FEAT_LE_PAST_SEND(local_features.features) &&
 		       bt_le_per_adv_sync_lookup_addr(adv_addr, sid) != NULL;
 	} else {
 		return false;
@@ -378,7 +395,7 @@ static uint8_t broadcast_assistant_bap_ntf_read_func(struct bt_conn *conn, uint8
 		return BT_GATT_ITER_STOP;
 	}
 
-	LOG_DBG("conn %p err 0x%02x len %u", conn, err, length);
+	LOG_DBG("conn %p err 0x%02x len %u", (void *)conn, err, length);
 
 	if (err) {
 		LOG_DBG("Failed to read: %u", err);
@@ -427,7 +444,7 @@ static void long_bap_read(struct bt_conn *conn, uint16_t handle)
 	}
 
 	if (atomic_test_and_set_bit(inst->flags, BAP_BA_FLAG_BUSY)) {
-		LOG_DBG("conn %p", conn);
+		LOG_DBG("conn %p", (void *)conn);
 
 		/* If the client is busy reading reschedule the long read */
 		struct bt_conn_info conn_info;
@@ -514,8 +531,7 @@ static uint8_t notify_handler(struct bt_conn *conn,
 	}
 
 	if (length != 0) {
-		const uint8_t att_ntf_header_size = 3; /* opcode (1) + handle (2) */
-		const uint16_t max_ntf_size = bt_gatt_get_mtu(conn) - att_ntf_header_size;
+		const uint16_t max_ntf_size = bt_audio_get_max_ntf_size(conn);
 
 		/* Cancel any pending long reads containing now obsolete information */
 		(void)k_work_cancel_delayable(&inst->bap_read_work);
@@ -1172,7 +1188,6 @@ int bt_bap_broadcast_assistant_scan_start(struct bt_conn *conn, bool start_scan)
 
 	cp->opcode = BT_BAP_BASS_OP_SCAN_START;
 
-	atomic_clear_bit(inst->flags, BAP_BA_FLAG_SCANNING);
 	err = bt_bap_broadcast_assistant_common_cp(conn, &att_buf);
 	if (err != 0 && start_scan) {
 		/* bt_bap_broadcast_assistant_common_cp clears the busy flag on error */
diff --git a/subsys/bluetooth/audio/bap_broadcast_sink.c b/subsys/bluetooth/audio/bap_broadcast_sink.c
index fa1f0b8ee5645..9bb13aec5b95f 100644
--- a/subsys/bluetooth/audio/bap_broadcast_sink.c
+++ b/subsys/bluetooth/audio/bap_broadcast_sink.c
@@ -1,7 +1,7 @@
 /*  Bluetooth Audio Broadcast Sink */
 
 /*
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -356,6 +356,9 @@ static void broadcast_sink_iso_connected(struct bt_iso_chan *chan)
 
 	broadcast_sink_set_ep_state(ep, BT_BAP_EP_STATE_STREAMING);
 
+	/* Setup the ISO data path */
+	bt_bap_setup_iso_data_path(stream);
+
 	if (ops != NULL && ops->started != NULL) {
 		ops->started(stream);
 	} else {
@@ -973,7 +976,6 @@ static int bt_bap_broadcast_sink_setup_stream(struct bt_bap_broadcast_sink *sink
 	bt_bap_iso_bind_ep(iso, ep);
 
 	bt_bap_qos_cfg_to_iso_qos(iso->chan.qos->rx, &sink->qos_cfg);
-	bt_bap_iso_configure_data_path(ep, codec_cfg);
 
 	bt_bap_iso_unref(iso);
 
diff --git a/subsys/bluetooth/audio/bap_broadcast_source.c b/subsys/bluetooth/audio/bap_broadcast_source.c
index 132dca5580a37..748d9d68db9c9 100644
--- a/subsys/bluetooth/audio/bap_broadcast_source.c
+++ b/subsys/bluetooth/audio/bap_broadcast_source.c
@@ -1,7 +1,7 @@
 /*  Bluetooth Audio Broadcast Source */
 
 /*
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -191,6 +191,9 @@ static void broadcast_source_iso_connected(struct bt_iso_chan *chan)
 	stream->_prev_seq_num = 0U;
 #endif /* CONFIG_BT_BAP_DEBUG_STREAM_SEQ_NUM */
 
+	/* Setup the ISO data path */
+	bt_bap_setup_iso_data_path(stream);
+
 	ops = stream->ops;
 	if (ops != NULL && ops->connected != NULL) {
 		ops->connected(stream);
@@ -317,7 +320,7 @@ static int broadcast_source_setup_stream(uint8_t index, struct bt_bap_stream *st
 	bt_bap_iso_bind_ep(iso, ep);
 
 	bt_bap_qos_cfg_to_iso_qos(iso->chan.qos->tx, qos);
-	bt_bap_iso_configure_data_path(ep, codec_cfg);
+
 #if defined(CONFIG_BT_ISO_TEST_PARAMS)
 	iso->chan.qos->num_subevents = qos->num_subevents;
 #endif /* CONFIG_BT_ISO_TEST_PARAMS */
@@ -967,7 +970,6 @@ int bt_bap_broadcast_source_reconfig(struct bt_bap_broadcast_source *source,
 		 */
 		SYS_SLIST_FOR_EACH_CONTAINER(&subgroup->streams, stream, _node) {
 			bt_bap_stream_attach(NULL, stream, stream->ep, codec_cfg);
-			bt_bap_iso_configure_data_path(stream->ep, codec_cfg);
 		}
 	}
 
diff --git a/subsys/bluetooth/audio/bap_iso.c b/subsys/bluetooth/audio/bap_iso.c
index e58e139a7719b..a661e4c357bf7 100644
--- a/subsys/bluetooth/audio/bap_iso.c
+++ b/subsys/bluetooth/audio/bap_iso.c
@@ -170,43 +170,68 @@ static struct bt_bap_iso_dir *bap_iso_get_iso_dir(bool unicast_client, struct bt
 	}
 }
 
-void bt_bap_iso_configure_data_path(struct bt_bap_ep *ep, struct bt_audio_codec_cfg *codec_cfg)
+void bt_bap_setup_iso_data_path(struct bt_bap_stream *stream)
 {
+	struct bt_audio_codec_cfg *codec_cfg = stream->codec_cfg;
+	struct bt_bap_ep *ep = stream->ep;
 	struct bt_bap_iso *bap_iso = ep->iso;
-	struct bt_iso_chan_qos *qos = bap_iso->chan.qos;
 	const bool is_unicast_client =
 		IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) && bt_bap_ep_is_unicast_client(ep);
 	struct bt_bap_iso_dir *iso_dir = bap_iso_get_iso_dir(is_unicast_client, bap_iso, ep->dir);
-	struct bt_iso_chan_path *path = &iso_dir->path;
+	struct bt_iso_chan_path path = {0};
+	uint8_t dir;
+	int err;
 
-	/* Setup the data path objects */
 	if (iso_dir == &bap_iso->rx) {
-		qos->rx->path = path;
+		dir = BT_HCI_DATAPATH_DIR_CTLR_TO_HOST;
 	} else {
-		qos->tx->path = path;
+		dir = BT_HCI_DATAPATH_DIR_HOST_TO_CTLR;
 	}
 
+	path.pid = codec_cfg->path_id;
+
 	/* Configure the data path to either use the controller for transcoding, or set the path to
 	 * be transparent to indicate that the transcoding happens somewhere else
 	 */
-	path->pid = codec_cfg->path_id;
-
 	if (codec_cfg->ctlr_transcode) {
-		path->format = codec_cfg->id;
-		path->cid = codec_cfg->cid;
-		path->vid = codec_cfg->vid;
-		path->delay = 0;
-		path->cc_len = codec_cfg->data_len;
-		path->cc = codec_cfg->data;
+		path.format = codec_cfg->id;
+		path.cid = codec_cfg->cid;
+		path.vid = codec_cfg->vid;
+		path.cc_len = codec_cfg->data_len;
+		path.cc = codec_cfg->data;
+	} else {
+		path.format = BT_HCI_CODING_FORMAT_TRANSPARENT;
+	}
+
+	err = bt_iso_setup_data_path(&bap_iso->chan, dir, &path);
+	if (err != 0) {
+		LOG_ERR("Failed to set ISO data path for ep %p and codec_cfg %p: %d", ep, codec_cfg,
+			err);
+	}
+}
+
+void bt_bap_remove_iso_data_path(struct bt_bap_stream *stream)
+{
+	struct bt_bap_ep *ep = stream->ep;
+	struct bt_bap_iso *bap_iso = ep->iso;
+	const bool is_unicast_client =
+		IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) && bt_bap_ep_is_unicast_client(ep);
+	struct bt_bap_iso_dir *iso_dir = bap_iso_get_iso_dir(is_unicast_client, bap_iso, ep->dir);
+	uint8_t dir;
+	int err;
+
+	if (iso_dir == &bap_iso->rx) {
+		dir = BT_HCI_DATAPATH_DIR_CTLR_TO_HOST;
 	} else {
-		path->format = BT_HCI_CODING_FORMAT_TRANSPARENT;
-		path->cid = 0;
-		path->vid = 0;
-		path->delay = 0;
-		path->cc_len = 0;
-		path->cc = NULL;
+		dir = BT_HCI_DATAPATH_DIR_HOST_TO_CTLR;
+	}
+
+	err = bt_iso_remove_data_path(&bap_iso->chan, dir);
+	if (err != 0) {
+		LOG_ERR("Failed to remove ISO data path for ep %p: %d", ep, err);
 	}
 }
+
 static bool is_unicast_client_ep(struct bt_bap_ep *ep)
 {
 	return IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT) && bt_bap_ep_is_unicast_client(ep);
diff --git a/subsys/bluetooth/audio/bap_iso.h b/subsys/bluetooth/audio/bap_iso.h
index f1ebd0eed9b25..18a65c1ac7a72 100644
--- a/subsys/bluetooth/audio/bap_iso.h
+++ b/subsys/bluetooth/audio/bap_iso.h
@@ -2,7 +2,7 @@
  * @brief Internal APIs for BAP ISO handling
  *
  * Copyright (c) 2022 Codecoup
- * Copyright (c) 2023 Nordic Semiconductor ASA
+ * Copyright (c) 2023-2024 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -19,7 +19,6 @@
 struct bt_bap_iso_dir {
 	struct bt_bap_stream *stream;
 	struct bt_bap_ep *ep;
-	struct bt_iso_chan_path path;
 	struct bt_iso_chan_io_qos qos;
 	uint8_t cc[CONFIG_BT_AUDIO_CODEC_CFG_MAX_DATA_SIZE];
 };
@@ -46,7 +45,8 @@ void bt_bap_iso_foreach(bt_bap_iso_func_t func, void *user_data);
 struct bt_bap_iso *bt_bap_iso_find(bt_bap_iso_func_t func, void *user_data);
 void bt_bap_iso_init(struct bt_bap_iso *iso, struct bt_iso_chan_ops *ops);
 void bt_bap_iso_bind_ep(struct bt_bap_iso *iso, struct bt_bap_ep *ep);
-void bt_bap_iso_configure_data_path(struct bt_bap_ep *ep, struct bt_audio_codec_cfg *codec_cfg);
+void bt_bap_setup_iso_data_path(struct bt_bap_stream *stream);
+void bt_bap_remove_iso_data_path(struct bt_bap_stream *stream);
 void bt_bap_iso_unbind_ep(struct bt_bap_iso *iso, struct bt_bap_ep *ep);
 struct bt_bap_ep *bt_bap_iso_get_ep(bool unicast_client, struct bt_bap_iso *iso,
 				    enum bt_audio_dir dir);
diff --git a/subsys/bluetooth/audio/bap_scan_delegator.c b/subsys/bluetooth/audio/bap_scan_delegator.c
index 883324a8127c6..e75e667b1bfee 100644
--- a/subsys/bluetooth/audio/bap_scan_delegator.c
+++ b/subsys/bluetooth/audio/bap_scan_delegator.c
@@ -151,35 +151,42 @@ static void bt_debug_dump_recv_state(const struct bass_recv_state_internal *recv
 	}
 }
 
-static void bass_notify_receive_state(struct bt_conn *conn,
-				      const struct bass_recv_state_internal *internal_state)
+static void receive_state_notify_cb(struct bt_conn *conn, void *data)
 {
-	const uint8_t att_ntf_header_size = 3; /* opcode (1) + handle (2) */
+	const struct bass_recv_state_internal *internal_state = data;
+	struct bt_conn_info conn_info;
 	uint16_t max_ntf_size;
 	uint16_t ntf_size;
 	int err;
 
-	if (conn != NULL) {
-		max_ntf_size = bt_gatt_get_mtu(conn) - att_ntf_header_size;
-	} else {
-		max_ntf_size = MIN(BT_L2CAP_RX_MTU, BT_L2CAP_TX_MTU) - att_ntf_header_size;
+	err = bt_conn_get_info(conn, &conn_info);
+	__ASSERT_NO_MSG(err == 0);
+
+	if (conn_info.state != BT_CONN_STATE_CONNECTED ||
+	    !bt_gatt_is_subscribed(conn, internal_state->attr, BT_GATT_CCC_NOTIFY)) {
+		return;
 	}
 
+	max_ntf_size = bt_audio_get_max_ntf_size(conn);
+
 	ntf_size = MIN(max_ntf_size, read_buf.len);
 	if (ntf_size < read_buf.len) {
 		LOG_DBG("Sending truncated notification (%u/%u)", ntf_size, read_buf.len);
 	}
 
-	LOG_DBG("Sending bytes %d", ntf_size);
-	err = bt_gatt_notify_uuid(NULL, BT_UUID_BASS_RECV_STATE,
-				  internal_state->attr, read_buf.data,
-				  ntf_size);
-
-	if (err != 0 && err != -ENOTCONN) {
+	LOG_DBG("Sending bytes %u for %p", ntf_size, (void *)conn);
+	err = bt_gatt_notify_uuid(conn, BT_UUID_BASS_RECV_STATE, internal_state->attr,
+				  read_buf.data, ntf_size);
+	if (err != 0) {
 		LOG_DBG("Could not notify receive state: %d", err);
 	}
 }
 
+static void bass_notify_receive_state(const struct bass_recv_state_internal *internal_state)
+{
+	bt_conn_foreach(BT_CONN_TYPE_LE, receive_state_notify_cb, (void *)internal_state);
+}
+
 static void net_buf_put_recv_state(const struct bass_recv_state_internal *recv_state)
 {
 	const struct bt_bap_scan_delegator_recv_state *state = &recv_state->state;
@@ -237,14 +244,14 @@ static void receive_state_updated(struct bt_conn *conn,
 
 	bt_debug_dump_recv_state(internal_state);
 	net_buf_put_recv_state(internal_state);
-	bass_notify_receive_state(conn, internal_state);
+	bass_notify_receive_state(internal_state);
+	k_sem_give(&read_buf_sem);
+
 	if (scan_delegator_cbs != NULL &&
 	    scan_delegator_cbs->recv_state_updated != NULL) {
 		scan_delegator_cbs->recv_state_updated(conn,
 						       &internal_state->state);
 	}
-
-	k_sem_give(&read_buf_sem);
 }
 
 static void bis_sync_request_updated(struct bt_conn *conn,
@@ -264,7 +271,7 @@ static void scan_delegator_security_changed(struct bt_conn *conn,
 					    enum bt_security_err err)
 {
 
-	if (err != 0 || level < BT_SECURITY_L2 || !bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	if (err != 0 || level < BT_SECURITY_L2 || !bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		return;
 	}
 
@@ -285,7 +292,7 @@ static void scan_delegator_security_changed(struct bt_conn *conn,
 		}
 
 		net_buf_put_recv_state(internal_state);
-		bass_notify_receive_state(conn, internal_state);
+		receive_state_notify_cb(conn, (void *)internal_state);
 
 		k_sem_give(&read_buf_sem);
 	}
@@ -412,14 +419,32 @@ static struct bt_le_per_adv_sync_cb pa_sync_cb =  {
 static bool supports_past(struct bt_conn *conn, uint8_t pa_sync_val)
 {
 	if (IS_ENABLED(CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER)) {
+		struct bt_le_local_features local_features;
+		struct bt_conn_remote_info remote_info;
+		int err;
+
+		err = bt_le_get_local_features(&local_features);
+		if (err != 0) {
+			LOG_DBG("Failed to get local features: %d", err);
+			return false;
+		}
+
+		err = bt_conn_get_remote_info(conn, &remote_info);
+		if (err != 0) {
+			LOG_DBG("Failed to get remote info: %d", err);
+			return false;
+		}
+
 		LOG_DBG("%p remote %s PAST, local %s PAST (req %u)", (void *)conn,
-			BT_FEAT_LE_PAST_SEND(conn->le.features) ? "supports" : "does not support",
-			BT_FEAT_LE_PAST_RECV(bt_dev.le.features) ? "supports" : "does not support",
+			BT_FEAT_LE_PAST_SEND(remote_info.le.features) ? "supports"
+								      : "does not support",
+			BT_FEAT_LE_PAST_RECV(local_features.features) ? "supports"
+								      : "does not support",
 			pa_sync_val);
 
 		return pa_sync_val == BT_BAP_BASS_PA_REQ_SYNC_PAST &&
-		       BT_FEAT_LE_PAST_SEND(conn->le.features) &&
-		       BT_FEAT_LE_PAST_RECV(bt_dev.le.features);
+		       BT_FEAT_LE_PAST_SEND(remote_info.le.features) &&
+		       BT_FEAT_LE_PAST_RECV(local_features.features);
 	} else {
 		return false;
 	}
@@ -652,8 +677,8 @@ static int scan_delegator_add_source(struct bt_conn *conn,
 			(void)memset(state, 0, sizeof(*state));
 			internal_state->active = false;
 
-			LOG_DBG("PA sync %u from %p was rejected with reason %d", pa_sync, conn,
-				err);
+			LOG_DBG("PA sync %u from %p was rejected with reason %d", pa_sync,
+				(void *)conn, err);
 
 			return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
 		}
@@ -677,6 +702,7 @@ static int scan_delegator_add_source(struct bt_conn *conn,
 static int scan_delegator_mod_src(struct bt_conn *conn,
 				  struct net_buf_simple *buf)
 {
+	uint32_t requested_bis_sync[CONFIG_BT_BAP_BASS_MAX_SUBGROUPS] = {};
 	struct bt_bap_scan_delegator_recv_state backup_state;
 	struct bass_recv_state_internal *internal_state;
 	struct bt_bap_scan_delegator_recv_state *state;
@@ -758,37 +784,36 @@ static int scan_delegator_mod_src(struct bt_conn *conn,
 	bis_sync_change_requested = false;
 	for (int i = 0; i < num_subgroups; i++) {
 		struct bt_bap_bass_subgroup *subgroup = &subgroups[i];
-		uint32_t old_bis_sync_req;
 		uint8_t *metadata;
 
-		old_bis_sync_req = internal_state->requested_bis_sync[i];
-
-		internal_state->requested_bis_sync[i] = net_buf_simple_pull_le32(buf);
+		requested_bis_sync[i] = net_buf_simple_pull_le32(buf);
 
-		if (internal_state->requested_bis_sync[i] &&
-		    pa_sync == BT_BAP_BASS_PA_REQ_NO_SYNC) {
+		if (requested_bis_sync[i] != 0U && pa_sync == BT_BAP_BASS_PA_REQ_NO_SYNC) {
 			LOG_DBG("Cannot sync to BIS without PA");
 			return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
 		}
 
-		if (old_bis_sync_req != internal_state->requested_bis_sync[i]) {
+		/* If the BIS sync request is different than what was previously was requested, or
+		 * different than what we are current synced to, we set bis_sync_change_requested to
+		 * let the application know that the state may need a change
+		 */
+		if (internal_state->requested_bis_sync[i] != requested_bis_sync[i] ||
+		    internal_state->state.subgroups[i].bis_sync != requested_bis_sync[i]) {
 			bis_sync_change_requested = true;
 		}
 
 		/* Verify that the request BIS sync indexes are unique or no preference */
-		if (!bis_syncs_unique_or_no_pref(internal_state->requested_bis_sync[i],
-						 aggregated_bis_syncs)) {
-			LOG_DBG("Duplicate BIS index [%d]%x (aggregated %x)",
-				i, internal_state->requested_bis_sync[i],
-				aggregated_bis_syncs);
+		if (!bis_syncs_unique_or_no_pref(requested_bis_sync[i], aggregated_bis_syncs)) {
+			LOG_DBG("Duplicate BIS index [%d]%x (aggregated %x)", i,
+				requested_bis_sync[i], aggregated_bis_syncs);
 
 			return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
 		}
 
-		if (!valid_bis_syncs(internal_state->requested_bis_sync[i])) {
+		if (!valid_bis_syncs(requested_bis_sync[i])) {
 			return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
 		}
-		aggregated_bis_syncs |= internal_state->requested_bis_sync[i];
+		aggregated_bis_syncs |= requested_bis_sync[i];
 
 		subgroup->metadata_len = net_buf_simple_pull_u8(buf);
 
@@ -859,8 +884,8 @@ static int scan_delegator_mod_src(struct bt_conn *conn,
 			(void)memcpy(state, &backup_state,
 				     sizeof(backup_state));
 
-			LOG_DBG("PA sync %u from %p was rejected with reason %d", pa_sync, conn,
-				err);
+			LOG_DBG("PA sync %u from %p was rejected with reason %d", pa_sync,
+				(void *)conn, err);
 
 			return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
 		} else if (pa_sync_state != state->pa_sync_state) {
@@ -877,7 +902,8 @@ static int scan_delegator_mod_src(struct bt_conn *conn,
 		const int err = pa_sync_term_request(conn, &internal_state->state);
 
 		if (err != 0) {
-			LOG_DBG("PA sync term from %p was rejected with reason %d", conn, err);
+			LOG_DBG("PA sync term from %p was rejected with reason %d", (void *)conn,
+				err);
 
 			return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
 		}
@@ -885,6 +911,9 @@ static int scan_delegator_mod_src(struct bt_conn *conn,
 		state_changed = true;
 	}
 
+	/* Store requested_bis_sync after everything has been validated */
+	(void)memcpy(internal_state->requested_bis_sync, requested_bis_sync,
+		     sizeof(requested_bis_sync));
 	atomic_clear_bit(internal_state->flags, BASS_RECV_STATE_INTERNAL_FLAG_NOTIFY_PEND);
 
 	/* Notify if changed */
@@ -972,7 +1001,8 @@ static int scan_delegator_rem_src(struct bt_conn *conn,
 		/* Terminate PA sync */
 		err = pa_sync_term_request(conn, &internal_state->state);
 		if (err != 0) {
-			LOG_DBG("PA sync term from %p was rejected with reason %d", conn, err);
+			LOG_DBG("PA sync term from %p was rejected with reason %d", (void *)conn,
+				err);
 
 			return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
 		}
@@ -980,7 +1010,8 @@ static int scan_delegator_rem_src(struct bt_conn *conn,
 
 	bis_sync_was_requested = false;
 	for (uint8_t i = 0U; i < state->num_subgroups; i++) {
-		if (internal_state->requested_bis_sync[i] != 0U) {
+		if (internal_state->requested_bis_sync[i] != 0U &&
+		    internal_state->state.subgroups[i].bis_sync != 0U) {
 			bis_sync_was_requested = true;
 			break;
 		}
diff --git a/subsys/bluetooth/audio/bap_unicast_client.c b/subsys/bluetooth/audio/bap_unicast_client.c
index 280a2ff02226d..1f081ee805b17 100644
--- a/subsys/bluetooth/audio/bap_unicast_client.c
+++ b/subsys/bluetooth/audio/bap_unicast_client.c
@@ -4,7 +4,7 @@
 
 /*
  * Copyright (c) 2020 Intel Corporation
- * Copyright (c) 2022-2023 Nordic Semiconductor ASA
+ * Copyright (c) 2022-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1019,13 +1019,6 @@ static void unicast_client_ep_qos_state(struct bt_bap_ep *ep, struct net_buf_sim
 		if (err != 0) {
 			LOG_ERR("Failed to disconnect stream: %d", err);
 		}
-	} else {
-		/* We setup the data path here, as this is the earliest where
-		 * we have the ISO <-> EP coupling completed (due to setting
-		 * the CIS ID in the QoS procedure).
-		 */
-
-		bt_bap_iso_configure_data_path(ep, stream->codec_cfg);
 	}
 
 	/* Notify upper layer */
@@ -1108,6 +1101,11 @@ static void unicast_client_ep_streaming_state(struct bt_bap_ep *ep, struct net_b
 
 	LOG_DBG("dir %s cig 0x%02x cis 0x%02x", bt_audio_dir_str(ep->dir), ep->cig_id, ep->cis_id);
 
+	/* Setup the ISO data path when the stream is started. We could do it earlier when the CIS
+	 * is connected, but then we would just receive audio data that we would then just discard
+	 */
+	bt_bap_setup_iso_data_path(stream);
+
 	/* Notify upper layer
 	 *
 	 * If the state did not change then only the metadata was changed
@@ -1222,6 +1220,13 @@ static void unicast_client_ep_set_status(struct bt_bap_ep *ep, struct net_buf_si
 				ep->reason = BT_HCI_ERR_SUCCESS;
 			}
 
+			if (ep->iso != NULL) {
+				/* Remove the ISO data path as we no longer want to process any ISO
+				 * data for this stream.
+				 */
+				bt_bap_remove_iso_data_path(stream);
+			}
+
 			if (ops != NULL && ops->stopped != NULL) {
 				ops->stopped(stream, reason);
 			} else {
@@ -1747,7 +1752,6 @@ static uint8_t unicast_client_ep_notify(struct bt_conn *conn,
 {
 	struct net_buf_simple buf;
 	struct bt_bap_unicast_client_ep *client_ep;
-	const uint8_t att_ntf_header_size = 3; /* opcode (1) + handle (2) */
 	uint16_t max_ntf_size;
 	struct bt_bap_ep *ep;
 
@@ -1765,7 +1769,7 @@ static uint8_t unicast_client_ep_notify(struct bt_conn *conn,
 		return BT_GATT_ITER_STOP;
 	}
 
-	max_ntf_size = bt_gatt_get_mtu(conn) - att_ntf_header_size;
+	max_ntf_size = bt_audio_get_max_ntf_size(conn);
 
 	if (length == max_ntf_size) {
 		struct unicast_client *client = &uni_cli_insts[bt_conn_index(conn)];
@@ -2166,8 +2170,7 @@ static void gatt_write_cb(struct bt_conn *conn, uint8_t err, struct bt_gatt_writ
 int bt_bap_unicast_client_ep_send(struct bt_conn *conn, struct bt_bap_ep *ep,
 				  struct net_buf_simple *buf)
 {
-	const uint8_t att_write_header_size = 3; /* opcode (1) + handle (2) */
-	const uint16_t max_write_size = bt_gatt_get_mtu(conn) - att_write_header_size;
+	const uint16_t max_write_size = bt_audio_get_max_ntf_size(conn);
 	struct unicast_client *client = &uni_cli_insts[bt_conn_index(conn)];
 	struct bt_bap_unicast_client_ep *client_ep =
 		CONTAINER_OF(ep, struct bt_bap_unicast_client_ep, ep);
diff --git a/subsys/bluetooth/audio/cap_commander.c b/subsys/bluetooth/audio/cap_commander.c
index 4828dd1970d0a..83ba8941a0a15 100644
--- a/subsys/bluetooth/audio/cap_commander.c
+++ b/subsys/bluetooth/audio/cap_commander.c
@@ -334,26 +334,24 @@ int bt_cap_commander_broadcast_reception_start(
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
-		LOG_DBG("A CAP procedure is already in progress");
-
-		return -EBUSY;
-	}
-
 	if (!valid_broadcast_reception_start_param(param)) {
 		return -EINVAL;
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_BROADCAST_RECEPTION_START, param->count);
+	if (bt_cap_common_test_and_set_proc_active()) {
+		LOG_DBG("A CAP procedure is already in progress");
 
-	broadcast_assistant_cb.add_src = cap_commander_broadcast_assistant_add_src_cb;
-	if (!broadcast_assistant_cb_registered &&
-	    cap_commander_register_broadcast_assistant_cb() != 0) {
-		LOG_DBG("Failed to register broadcast assistant callbacks");
+		return -EBUSY;
+	}
 
-		return -ENOEXEC;
+	broadcast_assistant_cb.add_src = cap_commander_broadcast_assistant_add_src_cb;
+	if (!broadcast_assistant_cb_registered) {
+		err = cap_commander_register_broadcast_assistant_cb();
+		__ASSERT(err == 0, "Failed to register broadcast assistant callbacks: %d", err);
 	}
 
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_BROADCAST_RECEPTION_START, param->count);
+
 	active_proc = bt_cap_common_get_active_proc();
 
 	for (size_t i = 0U; i < param->count; i++) {
@@ -363,9 +361,12 @@ int bt_cap_commander_broadcast_reception_start(
 		struct bt_conn *member_conn =
 			bt_cap_common_get_member_conn(param->type, &member_param->member);
 
+		/* Perform extra check in case that connection state has changed */
 		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->members[%zu]", i);
 
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
@@ -397,6 +398,8 @@ int bt_cap_commander_broadcast_reception_start(
 	if (err != 0) {
 		LOG_DBG("Failed to start broadcast reception for conn %p: %d", (void *)conn, err);
 
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
@@ -606,28 +609,26 @@ int bt_cap_commander_broadcast_reception_stop(
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
-		LOG_DBG("A CAP procedure is already in progress");
-
-		return -EBUSY;
-	}
-
 	if (!valid_broadcast_reception_stop_param(param)) {
 		return -EINVAL;
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_BROADCAST_RECEPTION_STOP, param->count);
+	if (bt_cap_common_test_and_set_proc_active()) {
+		LOG_DBG("A CAP procedure is already in progress");
+
+		return -EBUSY;
+	}
 
 	broadcast_assistant_cb.mod_src = cap_commander_broadcast_assistant_mod_src_cb;
 	broadcast_assistant_cb.rem_src = cap_commander_broadcast_assistant_rem_src_cb;
 	broadcast_assistant_cb.recv_state = cap_commander_broadcast_assistant_recv_state_cb;
-	if (!broadcast_assistant_cb_registered &&
-	    cap_commander_register_broadcast_assistant_cb() != 0) {
-		LOG_DBG("Failed to register broadcast assistant callbacks");
-
-		return -ENOEXEC;
+	if (!broadcast_assistant_cb_registered) {
+		err = cap_commander_register_broadcast_assistant_cb();
+		__ASSERT(err == 0, "Failed to register broadcast assistant callbacks: %d", err);
 	}
 
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_BROADCAST_RECEPTION_STOP, param->count);
+
 	active_proc = bt_cap_common_get_active_proc();
 
 	for (size_t i = 0U; i < param->count; i++) {
@@ -637,11 +638,15 @@ int bt_cap_commander_broadcast_reception_stop(
 		struct bt_conn *member_conn =
 			bt_cap_common_get_member_conn(param->type, &member_param->member);
 
+		/* Perform extra check in case that connection state has changed */
 		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->member[%zu]", i);
 
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
+
 		/* Store the necessary parameters as we cannot assume that the supplied
 		 * parameters are kept valid
 		 */
@@ -666,6 +671,8 @@ int bt_cap_commander_broadcast_reception_stop(
 	if (err != 0) {
 		LOG_DBG("Failed to stop broadcast reception for conn %p: %d", (void *)conn, err);
 
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
@@ -787,27 +794,25 @@ int bt_cap_commander_distribute_broadcast_code(
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
-		LOG_DBG("A CAP procedure is already in progress");
-
-		return -EBUSY;
-	}
-
 	if (!valid_distribute_broadcast_code_param(param)) {
 		return -EINVAL;
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_DISTRIBUTE_BROADCAST_CODE, param->count);
+	if (bt_cap_common_test_and_set_proc_active()) {
+		LOG_DBG("A CAP procedure is already in progress");
+
+		return -EBUSY;
+	}
 
 	broadcast_assistant_cb.broadcast_code =
 		cap_commander_broadcast_assistant_set_broadcast_code_cb;
-	if (!broadcast_assistant_cb_registered &&
-	    cap_commander_register_broadcast_assistant_cb() != 0) {
-		LOG_DBG("Failed to register broadcast assistant callbacks");
-
-		return -ENOEXEC;
+	if (!broadcast_assistant_cb_registered) {
+		err = cap_commander_register_broadcast_assistant_cb();
+		__ASSERT(err == 0, "Failed to register broadcast assistant callbacks: %d", err);
 	}
 
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_DISTRIBUTE_BROADCAST_CODE, param->count);
+
 	active_proc = bt_cap_common_get_active_proc();
 
 	for (size_t i = 0U; i < param->count; i++) {
@@ -817,9 +822,12 @@ int bt_cap_commander_distribute_broadcast_code(
 		struct bt_conn *member_conn =
 			bt_cap_common_get_member_conn(param->type, &member_param->member);
 
+		/* Perform extra check in case that connection state has changed */
 		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->member[%zu]", i);
 
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
@@ -847,6 +855,8 @@ int bt_cap_commander_distribute_broadcast_code(
 		LOG_DBG("Failed to start distribute broadcast code for conn %p: %d", (void *)conn,
 			err);
 
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
@@ -1085,33 +1095,36 @@ int bt_cap_commander_change_volume(const struct bt_cap_commander_change_volume_p
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
-		LOG_DBG("A CAP procedure is already in progress");
-
-		return -EBUSY;
-	}
-
 	if (!valid_change_volume_param(param)) {
 		return -EINVAL;
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_VOLUME_CHANGE, param->count);
+	if (bt_cap_common_test_and_set_proc_active()) {
+		LOG_DBG("A CAP procedure is already in progress");
 
-	vol_ctlr_cb.vol_set = cap_commander_vcp_vol_set_cb;
-	if (!vcp_cb_registered && cap_commander_register_vcp_cb() != 0) {
-		LOG_DBG("Failed to register VCP callbacks");
+		return -EBUSY;
+	}
 
-		return -ENOEXEC;
+	vol_ctlr_cb.vol_set = cap_commander_vcp_vol_set_cb;
+	if (!vcp_cb_registered) {
+		err = cap_commander_register_vcp_cb();
+		__ASSERT(err == 0, "Failed to register VCP callbacks: %d", err);
 	}
 
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_VOLUME_CHANGE, param->count);
+
 	active_proc = bt_cap_common_get_active_proc();
 
 	for (size_t i = 0U; i < param->count; i++) {
 		struct bt_conn *member_conn =
 			bt_cap_common_get_member_conn(param->type, &param->members[i]);
 
+		/* Perform extra check in case that connection state has changed */
 		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->members[%zu]", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
@@ -1129,6 +1142,9 @@ int bt_cap_commander_change_volume(const struct bt_cap_commander_change_volume_p
 				      proc_param->change_volume.volume);
 	if (err != 0) {
 		LOG_DBG("Failed to set volume for conn %p: %d", (void *)conn, err);
+
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
@@ -1264,34 +1280,36 @@ int bt_cap_commander_change_volume_mute_state(
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
-		LOG_DBG("A CAP procedure is already in progress");
-
-		return -EBUSY;
-	}
-
 	if (!valid_change_volume_mute_state_param(param)) {
 		return -EINVAL;
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_VOLUME_MUTE_CHANGE, param->count);
+	if (bt_cap_common_test_and_set_proc_active()) {
+		LOG_DBG("A CAP procedure is already in progress");
+
+		return -EBUSY;
+	}
 
 	vol_ctlr_cb.mute = cap_commander_vcp_vol_mute_cb;
 	vol_ctlr_cb.unmute = cap_commander_vcp_vol_mute_cb;
-	if (!vcp_cb_registered && cap_commander_register_vcp_cb() != 0) {
-		LOG_DBG("Failed to register VCP callbacks");
-
-		return -ENOEXEC;
+	if (!vcp_cb_registered) {
+		err = cap_commander_register_vcp_cb();
+		__ASSERT(err == 0, "Failed to register VCP callbacks: %d", err);
 	}
 
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_VOLUME_MUTE_CHANGE, param->count);
 	active_proc = bt_cap_common_get_active_proc();
 
 	for (size_t i = 0U; i < param->count; i++) {
 		struct bt_conn *member_conn =
 			bt_cap_common_get_member_conn(param->type, &param->members[i]);
 
-		CHECKIF(member_conn == NULL) {
+		/* Perform extra check in case that connection state has changed */
+		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->members[%zu]", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
@@ -1314,6 +1332,9 @@ int bt_cap_commander_change_volume_mute_state(
 
 	if (err != 0) {
 		LOG_DBG("Failed to set volume mute state for conn %p: %d", (void *)conn, err);
+
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
@@ -1467,25 +1488,24 @@ int bt_cap_commander_change_volume_offset(
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
-		LOG_DBG("A CAP procedure is already in progress");
-
-		return -EBUSY;
-	}
-
 	if (!valid_change_offset_param(param)) {
 		return -EINVAL;
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_VOLUME_OFFSET_CHANGE, param->count);
+	if (bt_cap_common_test_and_set_proc_active()) {
+		LOG_DBG("A CAP procedure is already in progress");
 
-	vol_ctlr_cb.vocs_cb.set_offset = cap_commander_vcp_set_offset_cb;
-	if (!vcp_cb_registered && cap_commander_register_vcp_cb() != 0) {
-		LOG_DBG("Failed to register VCP callbacks");
+		return -EBUSY;
+	}
 
-		return -ENOEXEC;
+	vol_ctlr_cb.vocs_cb.set_offset = cap_commander_vcp_set_offset_cb;
+	if (!vcp_cb_registered) {
+		err = cap_commander_register_vcp_cb();
+		__ASSERT(err == 0, "Failed to register VCP callbacks: %d", err);
 	}
 
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_VOLUME_OFFSET_CHANGE, param->count);
+
 	active_proc = bt_cap_common_get_active_proc();
 
 	for (size_t i = 0U; i < param->count; i++) {
@@ -1495,20 +1515,30 @@ int bt_cap_commander_change_volume_offset(
 			bt_cap_common_get_member_conn(param->type, &member_param->member);
 		struct bt_vcp_included included;
 
+		/* Perform extra check in case that connection state has changed */
 		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->members[%zu]", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
 		vol_ctlr = bt_vcp_vol_ctlr_get_by_conn(member_conn);
 		if (vol_ctlr == NULL) {
 			LOG_DBG("Invalid param->members[%zu] vol_ctlr", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
 		err = bt_vcp_vol_ctlr_included_get(vol_ctlr, &included);
 		if (err != 0 || included.vocs_cnt == 0) {
 			LOG_DBG("Invalid param->members[%zu] vocs", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
@@ -1530,6 +1560,9 @@ int bt_cap_commander_change_volume_offset(
 	err = bt_vocs_state_set(proc_param->change_offset.vocs, proc_param->change_offset.offset);
 	if (err != 0) {
 		LOG_DBG("Failed to set volume for conn %p: %d", (void *)conn, err);
+
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
@@ -1687,24 +1720,23 @@ int bt_cap_commander_change_microphone_mute_state(
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
+	if (!valid_change_microphone_mute_state_param(param)) {
+		return -EINVAL;
+	}
+
+	if (bt_cap_common_test_and_set_proc_active()) {
 		LOG_DBG("A CAP procedure is already in progress");
 
 		return -EBUSY;
 	}
 
-	if (!valid_change_microphone_mute_state_param(param)) {
-		return -EINVAL;
-	}
-
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_MICROPHONE_MUTE_CHANGE, param->count);
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_MICROPHONE_MUTE_CHANGE, param->count);
 
 	mic_ctlr_cb.mute_written = cap_commander_micp_mic_mute_cb;
 	mic_ctlr_cb.unmute_written = cap_commander_micp_mic_mute_cb;
-	if (!micp_callbacks_registered && cap_commander_register_micp_callbacks() != 0) {
-		LOG_DBG("Failed to register MICP callbacks");
-
-		return -ENOEXEC;
+	if (!micp_callbacks_registered) {
+		err = cap_commander_register_micp_callbacks();
+		__ASSERT(err == 0, "Failed to register MICP callbacks: %d", err);
 	}
 
 	active_proc = bt_cap_common_get_active_proc();
@@ -1713,8 +1745,12 @@ int bt_cap_commander_change_microphone_mute_state(
 		struct bt_conn *member_conn =
 			bt_cap_common_get_member_conn(param->type, &param->members[i]);
 
-		CHECKIF(member_conn == NULL) {
+		/* Perform extra check in case that connection state has changed */
+		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->members[%zu]", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
@@ -1737,6 +1773,9 @@ int bt_cap_commander_change_microphone_mute_state(
 
 	if (err != 0) {
 		LOG_DBG("Failed to set microphone mute state for conn %p: %d", (void *)conn, err);
+
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
@@ -1880,23 +1919,22 @@ int bt_cap_commander_change_microphone_gain_setting(
 	struct bt_conn *conn;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
+	if (!valid_change_microphone_gain_param(param)) {
+		return -EINVAL;
+	}
+
+	if (bt_cap_common_test_and_set_proc_active()) {
 		LOG_DBG("A CAP procedure is already in progress");
 
 		return -EBUSY;
 	}
 
-	if (!valid_change_microphone_gain_param(param)) {
-		return -EINVAL;
-	}
-
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_MICROPHONE_GAIN_CHANGE, param->count);
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_MICROPHONE_GAIN_CHANGE, param->count);
 
 	mic_ctlr_cb.aics_cb.set_gain = cap_commander_micp_gain_set_cb;
-	if (!micp_callbacks_registered && cap_commander_register_micp_callbacks() != 0) {
-		LOG_DBG("Failed to register MICP callbacks");
-
-		return -ENOEXEC;
+	if (!micp_callbacks_registered) {
+		err = cap_commander_register_micp_callbacks();
+		__ASSERT(err == 0, "Failed to register MICP callbacks: %d", err);
 	}
 
 	active_proc = bt_cap_common_get_active_proc();
@@ -1907,20 +1945,30 @@ int bt_cap_commander_change_microphone_gain_setting(
 		struct bt_micp_mic_ctlr *mic_ctlr;
 		struct bt_micp_included included;
 
+		/* Perform extra check in case that connection state has changed */
 		if (member_conn == NULL) {
 			LOG_DBG("Invalid param->param[%zu].member", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
 		mic_ctlr = bt_micp_mic_ctlr_get_by_conn(member_conn);
 		if (mic_ctlr == NULL) {
 			LOG_DBG("Invalid param->param[%zu].member mic_ctlr", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
 		err = bt_micp_mic_ctlr_included_get(mic_ctlr, &included);
 		if (err != 0 || included.aics_cnt == 0) {
 			LOG_DBG("Invalid param->param[%zu].member aics", i);
+
+			bt_cap_common_clear_active_proc();
+
 			return -EINVAL;
 		}
 
@@ -1942,6 +1990,9 @@ int bt_cap_commander_change_microphone_gain_setting(
 	err = bt_aics_gain_set(proc_param->change_gain.aics, proc_param->change_gain.gain);
 	if (err != 0) {
 		LOG_DBG("Failed to set gain for conn %p: %d", (void *)conn, err);
+
+		bt_cap_common_clear_active_proc();
+
 		return -ENOEXEC;
 	}
 
diff --git a/subsys/bluetooth/audio/cap_common.c b/subsys/bluetooth/audio/cap_common.c
index cd52428eb2b47..59845acb6eb48 100644
--- a/subsys/bluetooth/audio/cap_common.c
+++ b/subsys/bluetooth/audio/cap_common.c
@@ -43,11 +43,10 @@ void bt_cap_common_clear_active_proc(void)
 	(void)memset(&active_proc, 0, sizeof(active_proc));
 }
 
-void bt_cap_common_start_proc(enum bt_cap_common_proc_type proc_type, size_t proc_cnt)
+void bt_cap_common_set_proc(enum bt_cap_common_proc_type proc_type, size_t proc_cnt)
 {
 	LOG_DBG("Setting proc to %d for %zu streams", proc_type, proc_cnt);
 
-	atomic_set_bit(active_proc.proc_state_flags, BT_CAP_COMMON_PROC_STATE_ACTIVE);
 	active_proc.proc_cnt = proc_cnt;
 	active_proc.proc_type = proc_type;
 	active_proc.proc_done_cnt = 0U;
@@ -100,6 +99,12 @@ struct bt_conn *bt_cap_common_get_member_conn(enum bt_cap_set_type type,
 	return member->member;
 }
 
+bool bt_cap_common_test_and_set_proc_active(void)
+{
+	return atomic_test_and_set_bit(active_proc.proc_state_flags,
+				       BT_CAP_COMMON_PROC_STATE_ACTIVE);
+}
+
 bool bt_cap_common_proc_is_active(void)
 {
 	return atomic_test_bit(active_proc.proc_state_flags, BT_CAP_COMMON_PROC_STATE_ACTIVE);
diff --git a/subsys/bluetooth/audio/cap_initiator.c b/subsys/bluetooth/audio/cap_initiator.c
index 45a4b0b03af17..92716c84c24a3 100644
--- a/subsys/bluetooth/audio/cap_initiator.c
+++ b/subsys/bluetooth/audio/cap_initiator.c
@@ -971,7 +971,7 @@ static int cap_initiator_unicast_audio_configure(
 	/* Store the information about the active procedure so that we can
 	 * continue the procedure after each step
 	 */
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_START, param->count);
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_START, param->count);
 	bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_CODEC_CONFIG);
 
 	proc_param = get_next_proc_param(active_proc);
@@ -1008,17 +1008,18 @@ static int cap_initiator_unicast_audio_configure(
 int bt_cap_initiator_unicast_audio_start(const struct bt_cap_unicast_audio_start_param *param)
 {
 	bool all_streaming = true;
+	int err;
+
+	if (!valid_unicast_audio_start_param(param)) {
+		return -EINVAL;
+	}
 
-	if (bt_cap_common_proc_is_active()) {
+	if (bt_cap_common_test_and_set_proc_active()) {
 		LOG_DBG("A CAP procedure is already in progress");
 
 		return -EBUSY;
 	}
 
-	if (!valid_unicast_audio_start_param(param)) {
-		return -EINVAL;
-	}
-
 	for (size_t i = 0U; i < param->count; i++) {
 		const struct bt_bap_stream *bap_stream =
 			&param->stream_params[i].stream->bap_stream;
@@ -1030,10 +1031,18 @@ int bt_cap_initiator_unicast_audio_start(const struct bt_cap_unicast_audio_start
 
 	if (all_streaming) {
 		LOG_DBG("All streams are already in the streaming state");
+
+		bt_cap_common_clear_active_proc();
+
 		return -EALREADY;
 	}
 
-	return cap_initiator_unicast_audio_configure(param);
+	err = cap_initiator_unicast_audio_configure(param);
+	if (err != 0) {
+		bt_cap_common_clear_active_proc();
+	}
+
+	return err;
 }
 
 void bt_cap_initiator_codec_configured(struct bt_cap_stream *cap_stream)
@@ -1639,16 +1648,16 @@ int bt_cap_initiator_unicast_audio_update(const struct bt_cap_unicast_audio_upda
 	size_t meta_len;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
+	if (!valid_unicast_audio_update_param(param)) {
+		return -EINVAL;
+	}
+
+	if (bt_cap_common_test_and_set_proc_active()) {
 		LOG_DBG("A CAP procedure is already in progress");
 
 		return -EBUSY;
 	}
 
-	if (!valid_unicast_audio_update_param(param)) {
-		return -EINVAL;
-	}
-
 	for (size_t i = 0U; i < param->count; i++) {
 		const struct bt_cap_unicast_audio_update_stream_param *stream_param =
 			&param->stream_params[i];
@@ -1663,7 +1672,7 @@ int bt_cap_initiator_unicast_audio_update(const struct bt_cap_unicast_audio_upda
 		       stream_param->meta_len);
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_UPDATE, param->count);
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_UPDATE, param->count);
 	bt_cap_common_set_subproc(BT_CAP_COMMON_SUBPROC_TYPE_META_UPDATE);
 
 	proc_param = get_next_proc_param(active_proc);
@@ -1902,16 +1911,16 @@ int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_p
 	bool can_stop = false;
 	int err;
 
-	if (bt_cap_common_proc_is_active()) {
+	if (!valid_unicast_audio_stop_param(param)) {
+		return -EINVAL;
+	}
+
+	if (bt_cap_common_test_and_set_proc_active()) {
 		LOG_DBG("A CAP procedure is already in progress");
 
 		return -EBUSY;
 	}
 
-	if (!valid_unicast_audio_stop_param(param)) {
-		return -EINVAL;
-	}
-
 	for (size_t i = 0U; i < param->count; i++) {
 		struct bt_cap_stream *cap_stream = param->streams[i];
 		struct bt_bap_stream *bap_stream = &cap_stream->bap_stream;
@@ -1939,10 +1948,13 @@ int bt_cap_initiator_unicast_audio_stop(const struct bt_cap_unicast_audio_stop_p
 		LOG_DBG("Cannot %s any streams", !can_disable ? "disable"
 						 : !can_stop  ? "stop"
 							      : "release");
+
+		bt_cap_common_clear_active_proc();
+
 		return -EALREADY;
 	}
 
-	bt_cap_common_start_proc(BT_CAP_COMMON_PROC_TYPE_STOP, param->count);
+	bt_cap_common_set_proc(BT_CAP_COMMON_PROC_TYPE_STOP, param->count);
 	/** TODO: If this is a CSIP set, then the order of the procedures may
 	 * not match the order in the parameters, and the CSIP ordered access
 	 * procedure should be used.
diff --git a/subsys/bluetooth/audio/cap_internal.h b/subsys/bluetooth/audio/cap_internal.h
index 9eddf63293fa9..f6bdb40d6e3dc 100644
--- a/subsys/bluetooth/audio/cap_internal.h
+++ b/subsys/bluetooth/audio/cap_internal.h
@@ -204,12 +204,13 @@ struct bt_cap_common_client {
 
 struct bt_cap_common_proc *bt_cap_common_get_active_proc(void);
 void bt_cap_common_clear_active_proc(void);
-void bt_cap_common_start_proc(enum bt_cap_common_proc_type proc_type, size_t proc_cnt);
+void bt_cap_common_set_proc(enum bt_cap_common_proc_type proc_type, size_t proc_cnt);
 void bt_cap_common_set_subproc(enum bt_cap_common_subproc_type subproc_type);
 bool bt_cap_common_proc_is_type(enum bt_cap_common_proc_type proc_type);
 bool bt_cap_common_subproc_is_type(enum bt_cap_common_subproc_type subproc_type);
 struct bt_conn *bt_cap_common_get_member_conn(enum bt_cap_set_type type,
 					      const union bt_cap_set_member *member);
+bool bt_cap_common_test_and_set_proc_active(void);
 bool bt_cap_common_proc_is_active(void);
 bool bt_cap_common_proc_is_aborted(void);
 bool bt_cap_common_proc_all_handled(void);
diff --git a/subsys/bluetooth/audio/ccp_call_control_client.c b/subsys/bluetooth/audio/ccp_call_control_client.c
index 641f887c3f483..ade9f28009182 100644
--- a/subsys/bluetooth/audio/ccp_call_control_client.c
+++ b/subsys/bluetooth/audio/ccp_call_control_client.c
@@ -189,7 +189,7 @@ int bt_ccp_call_control_client_discover(struct bt_conn *conn,
 		atomic_clear_bit(client->flags, CCP_CALL_CONTROL_CLIENT_FLAG_BUSY);
 
 		/* Return known errors */
-		if (err == -EBUSY) {
+		if (err == -EBUSY || err == -ENOTCONN) {
 			return err;
 		}
 
@@ -232,3 +232,22 @@ int bt_ccp_call_control_client_unregister_cb(struct bt_ccp_call_control_client_c
 
 	return 0;
 }
+
+int bt_ccp_call_control_client_get_bearers(struct bt_ccp_call_control_client *client,
+					   struct bt_ccp_call_control_client_bearers *bearers)
+{
+	CHECKIF(client == NULL) {
+		LOG_DBG("client is NULL");
+		return -EINVAL;
+	}
+
+	CHECKIF(bearers == NULL) {
+		LOG_DBG("bearers is NULL");
+		return -EINVAL;
+	}
+
+	memset(bearers, 0, sizeof(*bearers));
+	populate_bearers(client, bearers);
+
+	return 0;
+}
diff --git a/subsys/bluetooth/audio/csip_set_coordinator.c b/subsys/bluetooth/audio/csip_set_coordinator.c
index eaf5b1a037524..d1801f5eaf277 100644
--- a/subsys/bluetooth/audio/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/csip_set_coordinator.c
@@ -52,7 +52,6 @@
 #include "common/bt_str.h"
 #include "host/conn_internal.h"
 #include "host/keys.h"
-#include "host/hci_core.h"
 
 LOG_MODULE_REGISTER(bt_csip_set_coordinator, CONFIG_BT_CSIP_SET_COORDINATOR_LOG_LEVEL);
 
@@ -313,6 +312,17 @@ static void sirk_changed(struct bt_csip_set_coordinator_csis_inst *inst)
 	}
 }
 
+static void size_changed(struct bt_conn *conn, struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	struct bt_csip_set_coordinator_cb *listener;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&csip_set_coordinator_cbs, listener, _node) {
+		if (listener->size_changed != NULL) {
+			listener->size_changed(conn, inst);
+		}
+	}
+}
+
 static void release_set_complete(int err)
 {
 	struct bt_csip_set_coordinator_cb *listener;
@@ -469,17 +479,19 @@ static uint8_t size_notify_func(struct bt_conn *conn,
 
 	if (svc_inst != NULL) {
 		if (length == sizeof(set_size)) {
-			struct bt_csip_set_coordinator_inst *client;
 			struct bt_csip_set_coordinator_set_info *set_info;
+			struct bt_csip_set_coordinator_csis_inst *inst;
+			struct bt_csip_set_coordinator_inst *client;
 
 			client = &client_insts[bt_conn_index(conn)];
-			set_info = &client->set_member.insts[svc_inst->idx].info;
+			inst = &client->set_member.insts[svc_inst->idx];
+			set_info = &inst->info;
 
 			(void)memcpy(&set_size, data, length);
 			LOG_DBG("Set size updated from %u to %u", set_info->set_size, set_size);
 
 			set_info->set_size = set_size;
-			/* TODO: Notify app */
+			size_changed(conn, inst);
 		} else {
 			LOG_DBG("Invalid length %u", length);
 		}
@@ -1674,7 +1686,7 @@ static bool all_members_bonded(const struct bt_csip_set_coordinator_set_member *
 		int err;
 
 		err = bt_conn_get_info(client->conn, &info);
-		if (err != 0 || !bt_addr_le_is_bonded(info.id, info.le.dst)) {
+		if (err != 0 || !bt_le_bond_exists(info.id, info.le.dst)) {
 			LOG_DBG("Member[%zu] is not bonded", i);
 
 			return false;
diff --git a/subsys/bluetooth/audio/csip_set_member.c b/subsys/bluetooth/audio/csip_set_member.c
index f7e46e071e989..22f4bd0899ea4 100644
--- a/subsys/bluetooth/audio/csip_set_member.c
+++ b/subsys/bluetooth/audio/csip_set_member.c
@@ -38,7 +38,6 @@
 #include <zephyr/sys/check.h>
 
 #include "../host/conn_internal.h"
-#include "../host/hci_core.h"
 #include "../host/keys.h"
 
 #include "common/bt_str.h"
@@ -57,6 +56,7 @@ enum csip_flag {
 	FLAG_ACTIVE,
 	FLAG_NOTIFY_LOCK,
 	FLAG_NOTIFY_SIRK,
+	FLAG_NOTIFY_SIZE,
 	FLAG_NUM,
 };
 
@@ -72,6 +72,7 @@ struct bt_csip_set_member_svc_inst {
 	uint8_t set_size;
 	uint8_t set_lock;
 	uint8_t rank;
+	bool lockable;
 	struct bt_csip_set_member_cb *cb;
 	struct k_work_delayable set_lock_timer;
 	bt_addr_le_t lock_client_addr;
@@ -80,7 +81,6 @@ struct bt_csip_set_member_svc_inst {
 };
 
 static struct bt_csip_set_member_svc_inst svc_insts[CONFIG_BT_CSIP_SET_MEMBER_MAX_INSTANCE_COUNT];
-static bt_addr_le_t server_dummy_addr; /* 0'ed address */
 
 static void deferred_nfy_work_handler(struct k_work *work);
 
@@ -93,8 +93,7 @@ static bool is_last_client_to_write(const struct bt_csip_set_member_svc_inst *sv
 		return bt_addr_le_eq(bt_conn_get_dst(conn),
 				     &svc_inst->lock_client_addr);
 	} else {
-		return bt_addr_le_eq(&server_dummy_addr,
-				     &svc_inst->lock_client_addr);
+		return bt_addr_le_eq(BT_ADDR_LE_NONE, &svc_inst->lock_client_addr);
 	}
 }
 
@@ -286,12 +285,12 @@ static ssize_t read_sirk(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 				 sirk, sizeof(*sirk));
 }
 
-#if defined(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE)
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)
 static void sirk_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	LOG_DBG("value 0x%04x", value);
 }
-#endif /* CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE */
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE */
 
 static ssize_t read_set_size(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
@@ -306,11 +305,13 @@ static ssize_t read_set_size(struct bt_conn *conn,
 				 sizeof(svc_inst->set_size));
 }
 
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE)
 static void set_size_cfg_changed(const struct bt_gatt_attr *attr,
 				 uint16_t value)
 {
 	LOG_DBG("value 0x%04x", value);
 }
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE */
 
 static ssize_t read_set_lock(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
@@ -368,8 +369,7 @@ static uint8_t set_lock(struct bt_conn *conn,
 		(void)k_work_reschedule(&svc_inst->set_lock_timer,
 					CSIP_SET_LOCK_TIMER_VALUE);
 	} else {
-		(void)memset(&svc_inst->lock_client_addr, 0,
-			     sizeof(svc_inst->lock_client_addr));
+		bt_addr_le_copy(&svc_inst->lock_client_addr, BT_ADDR_LE_NONE);
 		(void)k_work_cancel_delayable(&svc_inst->set_lock_timer);
 	}
 
@@ -464,7 +464,7 @@ static void csip_security_changed(struct bt_conn *conn, bt_security_t level,
 		return;
 	}
 
-	if (!bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	if (!bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		return;
 	}
 
@@ -490,8 +490,7 @@ static void handle_csip_disconnect(struct bt_csip_set_member_svc_inst *svc_inst,
 {
 	LOG_DBG("Non-bonded device");
 	if (is_last_client_to_write(svc_inst, conn)) {
-		(void)memset(&svc_inst->lock_client_addr, 0,
-			     sizeof(svc_inst->lock_client_addr));
+		bt_addr_le_copy(&svc_inst->lock_client_addr, BT_ADDR_LE_NONE);
 		svc_inst->set_lock = BT_CSIP_RELEASE_VALUE;
 		notify_clients(svc_inst, NULL, FLAG_NOTIFY_LOCK);
 
@@ -521,7 +520,7 @@ static void csip_disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	LOG_DBG("Disconnected: %s (reason %u)", bt_addr_le_str(bt_conn_get_dst(conn)), reason);
 
-	if (!bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	if (!bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		for (size_t i = 0U; i < ARRAY_SIZE(svc_insts); i++) {
 			handle_csip_disconnect(&svc_insts[i], conn);
 		}
@@ -615,7 +614,7 @@ static struct bt_conn_auth_info_cb auth_callbacks = {
 	.bond_deleted = csip_bond_deleted
 };
 
-#if defined(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE)
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)
 #define BT_CSIS_CHR_SIRK(_csip)                                                                    \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SIRK, BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,                  \
 		      BT_GATT_PERM_READ_ENCRYPT, read_sirk, NULL, &_csip),                         \
@@ -624,16 +623,23 @@ static struct bt_conn_auth_info_cb auth_callbacks = {
 #define BT_CSIS_CHR_SIRK(_csip)                                                                    \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SIRK, BT_GATT_CHRC_READ, BT_GATT_PERM_READ_ENCRYPT, read_sirk,  \
 		      NULL, &_csip)
-#endif /* CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE */
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE */
+
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE)
+#define BT_CSIS_CHR_SIZE(_csip)                                                                    \
+	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_SIZE, BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,              \
+		      BT_GATT_PERM_READ_ENCRYPT, read_set_size, NULL, &_csip),                     \
+		BT_AUDIO_CCC(set_size_cfg_changed)
+#else
+#define BT_CSIS_CHR_SIZE(_csip)                                                                    \
+	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_SIZE, BT_GATT_CHRC_READ, BT_GATT_PERM_READ_ENCRYPT,         \
+		      read_set_size, NULL, &_csip)
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE */
 
 #define BT_CSIP_SERVICE_DEFINITION(_csip) {\
 	BT_GATT_PRIMARY_SERVICE(BT_UUID_CSIS), \
 	BT_CSIS_CHR_SIRK(_csip), \
-	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_SIZE, \
-		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY, \
-		      BT_GATT_PERM_READ_ENCRYPT, \
-		      read_set_size, NULL, &_csip), \
-	BT_AUDIO_CCC(set_size_cfg_changed), \
+	BT_CSIS_CHR_SIZE(_csip), \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SET_LOCK, \
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY | BT_GATT_CHRC_WRITE, \
 		      BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT, \
@@ -770,11 +776,17 @@ static void notify_cb(struct bt_conn *conn, void *data)
 			       sizeof(svc_inst->set_lock));
 		}
 
-		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE) &&
+		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE) &&
 		    atomic_test_and_clear_bit(client->flags, FLAG_NOTIFY_SIRK)) {
 			notify(svc_inst, conn, BT_UUID_CSIS_SIRK, &svc_inst->sirk,
 			       sizeof(svc_inst->sirk));
 		}
+
+		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE) &&
+		    atomic_test_and_clear_bit(client->flags, FLAG_NOTIFY_SIZE)) {
+			notify(svc_inst, conn, BT_UUID_CSIS_SET_SIZE, &svc_inst->set_size,
+			       sizeof(svc_inst->set_size));
+		}
 	}
 }
 
@@ -872,6 +884,8 @@ int bt_csip_set_member_register(const struct bt_csip_set_member_register_param *
 	inst->set_lock = BT_CSIP_RELEASE_VALUE;
 	inst->sirk.type = BT_CSIP_SIRK_TYPE_PLAIN;
 	inst->cb = param->cb;
+	inst->lockable = param->lockable;
+	bt_addr_le_copy(&inst->lock_client_addr, BT_ADDR_LE_NONE);
 
 	if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_TEST_SAMPLE_DATA)) {
 		uint8_t test_sirk[] = {
@@ -923,9 +937,13 @@ int bt_csip_set_member_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 		return -EINVAL;
 	}
 
-	memcpy(svc_inst->sirk.value, sirk, BT_CSIP_SIRK_SIZE);
+	if (memcmp(sirk, svc_inst->sirk.value, BT_CSIP_SIRK_SIZE) != 0) {
+		memcpy(svc_inst->sirk.value, sirk, BT_CSIP_SIRK_SIZE);
 
-	notify_clients(svc_inst, NULL, FLAG_NOTIFY_SIRK);
+		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)) {
+			notify_clients(svc_inst, NULL, FLAG_NOTIFY_SIRK);
+		}
+	}
 
 	return 0;
 }
@@ -948,6 +966,67 @@ int bt_csip_set_member_get_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
 	return 0;
 }
 
+int bt_csip_set_member_set_size_and_rank(struct bt_csip_set_member_svc_inst *svc_inst, uint8_t size,
+					 uint8_t rank)
+{
+	if (svc_inst == NULL) {
+		LOG_DBG("svc_inst is NULL");
+		return -EINVAL;
+	}
+
+	if (size < 1U) {
+		LOG_DBG("Invalid set size %u", size);
+		return -EINVAL;
+	}
+
+	if (!svc_inst->lockable && rank != 0U) {
+		LOG_DBG("Invalid rank %u for non-lockable service", rank);
+		return -EINVAL;
+	}
+
+	if (svc_inst->lockable && !IN_RANGE(rank, 1U, size)) {
+		LOG_DBG("Invalid rank: %u for size %u", rank, size);
+		return -EINVAL;
+	}
+
+	if (svc_inst->set_size == size && svc_inst->rank == rank) {
+		LOG_DBG("Set size %u and rank %u is already set", size, rank);
+		return -EALREADY;
+	}
+
+	svc_inst->set_size = size;
+	svc_inst->rank = svc_inst->lockable ? rank : 0U;
+
+	if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE)) {
+		notify_clients(svc_inst, NULL, FLAG_NOTIFY_SIZE);
+	}
+
+	return 0;
+}
+
+int bt_csip_set_member_get_info(const struct bt_csip_set_member_svc_inst *svc_inst,
+				struct bt_csip_set_member_set_info *info)
+{
+	if (svc_inst == NULL) {
+		LOG_DBG("svc_inst is NULL");
+		return -EINVAL;
+	}
+
+	if (info == NULL) {
+		LOG_DBG("info is NULL");
+		return -EINVAL;
+	}
+
+	info->lockable = svc_inst->lockable;
+	info->locked = svc_inst->set_lock == BT_CSIP_LOCK_VALUE;
+	info->rank = svc_inst->rank;
+	info->set_size = svc_inst->set_size;
+	memcpy(info->sirk, svc_inst->sirk.value, BT_CSIP_SIRK_SIZE);
+	bt_addr_le_copy(&info->lock_client_addr, &svc_inst->lock_client_addr);
+
+	return 0;
+}
+
 int bt_csip_set_member_lock(struct bt_csip_set_member_svc_inst *svc_inst,
 			    bool lock, bool force)
 {
diff --git a/subsys/bluetooth/audio/has.c b/subsys/bluetooth/audio/has.c
index ad72904ec4351..2cdc8bbe54494 100644
--- a/subsys/bluetooth/audio/has.c
+++ b/subsys/bluetooth/audio/has.c
@@ -34,7 +34,6 @@
 #include <zephyr/sys_clock.h>
 #include <zephyr/toolchain.h>
 
-#include "../bluetooth/host/hci_core.h"
 #include "../bluetooth/host/settings.h"
 
 #include "audio_internal.h"
@@ -270,7 +269,7 @@ static void client_free(struct has_client *client)
 	err = bt_conn_get_info(client->conn, &info);
 	__ASSERT_NO_MSG(err == 0);
 
-	if (client->context != NULL && !bt_addr_le_is_bonded(info.id, info.le.dst)) {
+	if (client->context != NULL && !bt_le_bond_exists(info.id, info.le.dst)) {
 		/* Free stored context of non-bonded client */
 		context_free(client->context);
 		client->context = NULL;
@@ -383,7 +382,7 @@ static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_
 		return;
 	}
 
-	if (!bt_addr_le_is_bonded(info.id, info.le.dst)) {
+	if (!bt_le_bond_exists(info.id, info.le.dst)) {
 		return;
 	}
 
@@ -750,13 +749,11 @@ static void control_point_ind_complete(struct bt_conn *conn,
 
 static int control_point_send(struct has_client *client, struct net_buf_simple *buf)
 {
-	const uint16_t mtu_size = bt_gatt_get_mtu(client->conn);
-	/* PDU structure is [Opcode (1)] [Handle (2)] [...] */
-	const uint16_t pdu_size = 3 + buf->len;
+	const uint16_t max_ntf_size = bt_audio_get_max_ntf_size(client->conn);
 
-	if (mtu_size < pdu_size) {
-		LOG_WRN("Sending truncated control point PDU %d < %d", mtu_size, pdu_size);
-		buf->len -= (pdu_size - mtu_size);
+	if (max_ntf_size < buf->len) {
+		LOG_WRN("Sending truncated control point PDU %u < %u", max_ntf_size, buf->len);
+		buf->len = max_ntf_size;
 	}
 
 #if defined(CONFIG_BT_HAS_PRESET_CONTROL_POINT_NOTIFIABLE)
@@ -778,6 +775,7 @@ static int control_point_send(struct has_client *client, struct net_buf_simple *
 		client->params.ind.func = control_point_ind_complete;
 		client->params.ind.destroy = NULL;
 		client->params.ind.data = buf->data;
+		/* indications have same size as notifications */
 		client->params.ind.len = buf->len;
 
 		return bt_gatt_indicate(client->conn, &client->params.ind);
diff --git a/subsys/bluetooth/audio/mcs.c b/subsys/bluetooth/audio/mcs.c
index d0eb2f7658bb3..4120812af4ea0 100644
--- a/subsys/bluetooth/audio/mcs.c
+++ b/subsys/bluetooth/audio/mcs.c
@@ -985,18 +985,12 @@ static void notify(const struct bt_uuid *uuid, const void *data, uint16_t len)
 
 static void notify_string(struct bt_conn *conn, const struct bt_uuid *uuid, const char *str)
 {
-	const uint8_t att_header_size = 3; /* opcode + handle */
-	uint16_t att_mtu;
-	uint16_t maxlen;
+	const uint16_t max_ntf_size = bt_audio_get_max_ntf_size(conn);
 	int err;
 
-	att_mtu = bt_gatt_get_mtu(conn);
-	__ASSERT(att_mtu > att_header_size, "Could not get valid ATT MTU");
-	maxlen = att_mtu - att_header_size; /* Subtract opcode and handle */
-
 	/* Send notification potentially truncated to the MTU */
 	err = bt_gatt_notify_uuid(conn, uuid, mcs.attrs, (void *)str,
-				  MIN(strlen(str), maxlen));
+				  MIN(strlen(str), max_ntf_size));
 	if (err != 0) {
 		LOG_ERR("Notification error: %d", err);
 	}
diff --git a/subsys/bluetooth/audio/pacs.c b/subsys/bluetooth/audio/pacs.c
index d70442ee8a8dd..05d3a3741882f 100644
--- a/subsys/bluetooth/audio/pacs.c
+++ b/subsys/bluetooth/audio/pacs.c
@@ -37,7 +37,6 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/util_macro.h>
 
-#include "host/hci_core.h"
 #include "common/bt_str.h"
 
 #include "audio_internal.h"
@@ -296,12 +295,14 @@ static uint16_t supported_context_get(enum bt_audio_dir dir)
 		if (atomic_test_bit(pacs.flags, PACS_FLAG_SNK_PAC)) {
 			return snk_supported_contexts | BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED;
 		}
+		break;
 #endif /* CONFIG_BT_PAC_SNK */
 #if defined(CONFIG_BT_PAC_SRC)
 	case BT_AUDIO_DIR_SOURCE:
 		if (atomic_test_bit(pacs.flags, PACS_FLAG_SRC_PAC)) {
 			return src_supported_contexts | BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED;
 		}
+		break;
 #endif /* CONFIG_BT_PAC_SRC */
 	default:
 		break;
@@ -1221,7 +1222,7 @@ static void pacs_security_changed(struct bt_conn *conn, bt_security_t level,
 		return;
 	}
 
-	if (!bt_addr_le_is_bonded(info.id, info.le.dst)) {
+	if (!bt_le_bond_exists(info.id, info.le.dst)) {
 		return;
 	}
 
@@ -1552,12 +1553,12 @@ enum bt_audio_context bt_pacs_get_available_contexts(enum bt_audio_dir dir)
 		if (atomic_test_bit(pacs.flags, PACS_FLAG_SNK_PAC)) {
 			return snk_available_contexts;
 		}
-		return -EINVAL;
+		break;
 	case BT_AUDIO_DIR_SOURCE:
 		if (atomic_test_bit(pacs.flags, PACS_FLAG_SRC_PAC)) {
 			return src_available_contexts;
 		}
-		return -EINVAL;
+		break;
 	}
 
 	return BT_AUDIO_CONTEXT_TYPE_PROHIBITED;
diff --git a/subsys/bluetooth/audio/shell/csip_set_coordinator.c b/subsys/bluetooth/audio/shell/csip_set_coordinator.c
index c2bb032f5b5e9..72baa43d6a870 100644
--- a/subsys/bluetooth/audio/shell/csip_set_coordinator.c
+++ b/subsys/bluetooth/audio/shell/csip_set_coordinator.c
@@ -151,11 +151,33 @@ static void csip_set_coordinator_ordered_access_cb(
 	}
 }
 
+static void csip_set_coordinator_lock_changed_cb(struct bt_csip_set_coordinator_csis_inst *inst,
+						 bool locked)
+{
+	bt_shell_print("Inst %p %s\n", inst, locked ? "locked" : "released");
+}
+
+static void csip_set_coordinator_sirk_changed_cb(struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	bt_shell_print("Inst %p SIRK changed\n", inst);
+	bt_shell_hexdump(inst->info.sirk, BT_CSIP_SIRK_SIZE);
+}
+
+static void
+csip_set_coordinator_size_changed_cb(struct bt_conn *conn,
+				     const struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	bt_shell_print("Inst %p size changed: %u\n", inst, inst->info.set_size);
+}
+
 static struct bt_csip_set_coordinator_cb cbs = {
 	.lock_set = csip_set_coordinator_lock_set_cb,
 	.release_set = csip_set_coordinator_release_set_cb,
 	.discover = csip_discover_cb,
-	.ordered_access = csip_set_coordinator_ordered_access_cb
+	.ordered_access = csip_set_coordinator_ordered_access_cb,
+	.lock_changed = csip_set_coordinator_lock_changed_cb,
+	.sirk_changed = csip_set_coordinator_sirk_changed_cb,
+	.size_changed = csip_set_coordinator_size_changed_cb,
 };
 
 static bool csip_set_coordinator_oap_cb(const struct bt_csip_set_coordinator_set_info *set_info,
diff --git a/subsys/bluetooth/audio/shell/csip_set_member.c b/subsys/bluetooth/audio/shell/csip_set_member.c
index 5faaa2cde5984..96e94b872d3f3 100644
--- a/subsys/bluetooth/audio/shell/csip_set_member.c
+++ b/subsys/bluetooth/audio/shell/csip_set_member.c
@@ -199,8 +199,65 @@ static int cmd_csip_set_member_sirk(const struct shell *sh, size_t argc, char *a
 	return 0;
 }
 
-static int cmd_csip_set_member_get_sirk(const struct shell *sh, size_t argc, char *argv[])
+static int cmd_csip_set_member_set_size_and_rank(const struct shell *sh, size_t argc, char *argv[])
 {
+	struct bt_csip_set_member_set_info info;
+	unsigned long set_size;
+	unsigned long rank;
+	int err = 0;
+
+	if (svc_inst == NULL) {
+		shell_error(sh, "CSIP set member not registered yet");
+
+		return -ENOEXEC;
+	}
+
+	set_size = shell_strtoul(argv[1], 0, &err);
+	if (err != 0) {
+		shell_error(sh, "Could not parse set size from %s: %d", argv[1], err);
+
+		return -ENOEXEC;
+	}
+
+	rank = shell_strtoul(argv[2], 0, &err);
+	if (err != 0) {
+		shell_error(sh, "Could not parse rank from %s: %d", argv[2], err);
+
+		return -ENOEXEC;
+	}
+
+	err = bt_csip_set_member_get_info(svc_inst, &info);
+	if (err != 0) {
+		shell_error(sh, "Failed to get SIRK: %d", err);
+		return -ENOEXEC;
+	}
+
+	if (!IN_RANGE(set_size, 1, UINT8_MAX)) {
+		shell_error(sh, "Invalid set size: %lu", set_size);
+
+		return -ENOEXEC;
+	}
+
+	if (info.lockable && !IN_RANGE(rank, 1, rank)) {
+		shell_error(sh, "Invalid rank: %lu", rank);
+
+		return -ENOEXEC;
+	}
+
+	err = bt_csip_set_member_set_size_and_rank(svc_inst, (uint8_t)set_size, (uint8_t)rank);
+	if (err != 0) {
+		shell_error(sh, "Failed to set set size and rank: %d", err);
+		return -ENOEXEC;
+	}
+
+	shell_print(sh, "Set size and rank updated to %lu and %lu", set_size, rank);
+
+	return 0;
+}
+
+static int cmd_csip_set_member_get_info(const struct shell *sh, size_t argc, char *argv[])
+{
+	struct bt_csip_set_member_set_info info;
 	uint8_t sirk[BT_CSIP_SIRK_SIZE];
 	int err;
 
@@ -210,14 +267,25 @@ static int cmd_csip_set_member_get_sirk(const struct shell *sh, size_t argc, cha
 		return -ENOEXEC;
 	}
 
-	err = bt_csip_set_member_get_sirk(svc_inst, sirk);
+	err = bt_csip_set_member_get_info(svc_inst, &info);
 	if (err != 0) {
 		shell_error(sh, "Failed to get SIRK: %d", err);
 		return -ENOEXEC;
 	}
 
-	shell_print(sh, "SIRK");
+	shell_print(sh, "Info for %p", svc_inst);
+	shell_print(sh, "\tSIRK");
 	shell_hexdump(sh, sirk, sizeof(sirk));
+	shell_print(sh, "\tSet size: %u", info.set_size);
+	shell_print(sh, "\tRank: %u", info.rank);
+	shell_print(sh, "\tLockable: %s", info.lockable ? "true" : "false");
+	shell_print(sh, "\tLocked: %s", info.locked ? "true" : "false");
+	if (info.locked) {
+		char addr_str[BT_ADDR_LE_STR_LEN];
+
+		bt_addr_le_to_str(&info.lock_client_addr, addr_str, sizeof(addr_str));
+		shell_print(sh, "\tLock owner: %s", addr_str);
+	}
 
 	return 0;
 }
@@ -299,14 +367,14 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_CMD_ARG(release, NULL, "Release the set [force]", cmd_csip_set_member_release, 1, 1),
 	SHELL_CMD_ARG(sirk, NULL, "Set the currently used SIRK <sirk>", cmd_csip_set_member_sirk, 2,
 		      0),
-	SHELL_CMD_ARG(get_sirk, NULL, "Get the currently used SIRK", cmd_csip_set_member_get_sirk,
-		      1, 0),
+	SHELL_CMD_ARG(set_size_and_rank, NULL, "Set the currently used size and rank <size> <rank>",
+		      cmd_csip_set_member_set_size_and_rank, 3, 0),
+	SHELL_CMD_ARG(get_info, NULL, "Get service info", cmd_csip_set_member_get_info, 1, 0),
 	SHELL_CMD_ARG(sirk_rsp, NULL,
 		      "Set the response used in SIRK requests "
 		      "<accept, accept_enc, reject, oob>",
 		      cmd_csip_set_member_sirk_rsp, 2, 0),
-	SHELL_SUBCMD_SET_END
-);
+	SHELL_SUBCMD_SET_END);
 
 SHELL_CMD_ARG_REGISTER(csip_set_member, &csip_set_member_cmds,
 		       "Bluetooth CSIP set member shell commands",
diff --git a/subsys/bluetooth/audio/tbs.c b/subsys/bluetooth/audio/tbs.c
index d581eaa86fdf5..e4d4881e88b2a 100644
--- a/subsys/bluetooth/audio/tbs.c
+++ b/subsys/bluetooth/audio/tbs.c
@@ -26,6 +26,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/net_buf.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 #include <zephyr/sys/util.h>
@@ -34,10 +35,26 @@
 
 #include "audio_internal.h"
 #include "tbs_internal.h"
+#include "common/bt_str.h"
 
 LOG_MODULE_REGISTER(bt_tbs, CONFIG_BT_TBS_LOG_LEVEL);
 
 #define BT_TBS_VALID_STATUS_FLAGS(val) ((val) <= (BIT(0) | BIT(1)))
+#define MUTEX_TIMEOUT                  K_MSEC(CONFIG_BT_TBS_LOCK_TIMEOUT)
+
+struct tbs_flags {
+	bool bearer_provider_name_changed: 1;
+	bool bearer_technology_changed: 1;
+	bool bearer_uri_schemes_supported_list_changed: 1;
+	bool bearer_signal_strength_changed: 1;
+	bool bearer_list_current_calls_changed: 1;
+	bool status_flags_changed: 1;
+	bool incoming_call_target_bearer_uri_changed: 1;
+	bool call_state_changed: 1;
+	bool termination_reason_changed: 1;
+	bool incoming_call_changed: 1;
+	bool call_friendly_name_changed: 1;
+};
 
 /* A service instance can either be a GTBS or a TBS instance */
 struct tbs_inst {
@@ -57,8 +74,6 @@ struct tbs_inst {
 	struct bt_tbs_terminate_reason terminate_reason;
 	struct bt_tbs_call calls[CONFIG_BT_TBS_MAX_CALLS];
 
-	bool notify_current_calls;
-	bool notify_call_states;
 	bool pending_signal_strength_notification;
 	struct k_work_delayable reporting_interval_work;
 
@@ -68,6 +83,22 @@ struct tbs_inst {
 	size_t attr_count;
 
 	bool authorization_required;
+
+	struct k_mutex mutex;
+	/* Flags for each client. Access and modification of these shall be guarded by the mutex */
+	struct tbs_flags flags[CONFIG_BT_MAX_CONN];
+
+	/* Control point notifications are handled separately from other notifications - We will not
+	 * accept any new control point operations while a notification is pending
+	 */
+	struct cp_ntf {
+		struct bt_tbs_call_cp_notify notification;
+
+		uint8_t conn_index; /* The conn index that triggered the request */
+		bool pending: 1;
+	} cp_ntf;
+
+	struct k_work_delayable notify_work;
 };
 
 static struct tbs_inst svc_insts[CONFIG_BT_TBS_BEARER_COUNT];
@@ -303,6 +334,116 @@ static struct tbs_inst *lookup_inst_by_uri_scheme(const uint8_t *uri, uint8_t ur
 	return NULL;
 }
 
+static void disconnected(struct bt_conn *conn, uint8_t reason)
+{
+	/* Clear pending notifications */
+	for (size_t i = 0U; i < ARRAY_SIZE(svc_insts); i++) {
+		const uint8_t conn_index = bt_conn_index(conn);
+		int err;
+
+		err = k_mutex_lock(&svc_insts[i].mutex, MUTEX_TIMEOUT);
+		if (err != 0) {
+			LOG_WRN("Failed to take mutex: %d", err);
+			/* In this case we still need to clear the data, so continue and hope for
+			 * the best
+			 */
+		}
+
+		if (svc_insts[i].cp_ntf.pending && conn_index == svc_insts[i].cp_ntf.conn_index) {
+			memset(&svc_insts[i].cp_ntf, 0, sizeof(svc_insts[i].cp_ntf));
+		}
+
+		memset(&svc_insts[i].flags[conn_index], 0, sizeof(svc_insts[i].flags[conn_index]));
+
+		if (err == 0) { /* if mutex was locked */
+			err = k_mutex_unlock(&svc_insts[i].mutex);
+			__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+		}
+	}
+}
+
+BT_CONN_CB_DEFINE(conn_cb) = {
+	.disconnected = disconnected,
+};
+
+static int notify(struct bt_conn *conn, const struct bt_uuid *uuid,
+		  const struct bt_gatt_attr *attrs, const void *value, size_t value_len)
+{
+	const uint8_t att_header_size = 3; /* opcode + handle */
+	const uint16_t att_mtu = bt_gatt_get_mtu(conn);
+
+	__ASSERT(att_mtu > att_header_size, "Could not get valid ATT MTU");
+	const uint16_t maxlen = att_mtu - att_header_size; /* Subtract opcode and handle */
+
+	if (maxlen < value_len) {
+		LOG_DBG("Truncating notification to %u (was %u)", maxlen, value_len);
+		value_len = maxlen;
+	}
+
+	/* Send notification potentially truncated to the MTU */
+	return bt_gatt_notify_uuid(conn, uuid, attrs, value, value_len);
+}
+
+struct tbs_notify_cb_info {
+	struct tbs_inst *inst;
+	const struct bt_gatt_attr *attr;
+	void (*value_cb)(struct tbs_flags *flags);
+};
+
+static void set_value_changed_cb(struct bt_conn *conn, void *data)
+{
+	struct tbs_notify_cb_info *cb_info = data;
+	struct tbs_inst *inst = cb_info->inst;
+	struct tbs_flags *flags = &inst->flags[bt_conn_index(conn)];
+	const struct bt_gatt_attr *attr = cb_info->attr;
+	struct bt_conn_info info;
+	int err;
+
+	err = bt_conn_get_info(conn, &info);
+	__ASSERT(err == 0, "Failed to get conn info: %d", err);
+
+	if (info.state != BT_CONN_STATE_CONNECTED) {
+		/* Not connected */
+		return;
+	}
+
+	if (!bt_gatt_is_subscribed(conn, attr, BT_GATT_CCC_NOTIFY)) {
+		/* Not subscribed */
+		return;
+	}
+
+	/* Set the specific flag based on the provided callback */
+	cb_info->value_cb(flags);
+
+	/* We may schedule the same work multiple times, but that is OK as scheduling the same work
+	 * multiple times is a no-op
+	 */
+	err = k_work_schedule(&inst->notify_work, K_NO_WAIT);
+	__ASSERT(err >= 0, "Failed to schedule work: %d", err);
+}
+
+static void set_value_changed(struct tbs_inst *inst, void (*value_cb)(struct tbs_flags *flags),
+			      const struct bt_uuid *uuid)
+{
+	struct tbs_notify_cb_info cb_info = {
+		.inst = inst,
+		.value_cb = value_cb,
+		.attr = bt_gatt_find_by_uuid(inst->attrs, 0, uuid),
+	};
+
+	__ASSERT(cb_info.attr != NULL, "Failed to look attribute for %s", bt_uuid_str(uuid));
+	bt_conn_foreach(BT_CONN_TYPE_LE, set_value_changed_cb, &cb_info);
+}
+
+static void set_terminate_reason_changed_cb(struct tbs_flags *flags)
+{
+	if (flags->termination_reason_changed) {
+		LOG_DBG("pending notification replaced");
+	}
+
+	flags->termination_reason_changed = true;
+}
+
 static void tbs_set_terminate_reason(struct tbs_inst *inst, uint8_t call_index, uint8_t reason)
 {
 	inst->terminate_reason.call_index = call_index;
@@ -310,8 +451,7 @@ static void tbs_set_terminate_reason(struct tbs_inst *inst, uint8_t call_index,
 	LOG_DBG("Index %u: call index 0x%02x, reason %s", inst_index(inst), call_index,
 		bt_tbs_term_reason_str(reason));
 
-	bt_gatt_notify_uuid(NULL, BT_UUID_TBS_TERMINATE_REASON, inst->attrs,
-			    (void *)&inst->terminate_reason, sizeof(inst->terminate_reason));
+	set_value_changed(inst, set_terminate_reason_changed_cb, BT_UUID_TBS_TERMINATE_REASON);
 }
 
 /**
@@ -481,34 +621,33 @@ static void net_buf_put_current_calls(const struct tbs_inst *inst, struct net_bu
 	}
 }
 
-static int inst_notify_calls(const struct tbs_inst *inst)
+static void set_call_state_changed_cb(struct tbs_flags *flags)
 {
-	int err;
+	if (flags->call_state_changed) {
+		LOG_DBG("pending notification replaced");
+	}
 
-	if (inst->notify_call_states) {
-		net_buf_put_call_states(inst, &read_buf);
+	flags->call_state_changed = true;
+}
 
-		err = bt_gatt_notify_uuid(NULL, BT_UUID_TBS_CALL_STATE, inst->attrs, read_buf.data,
-					  read_buf.len);
-		if (err != 0) {
-			return err;
-		}
+static void set_list_current_calls_changed_cb(struct tbs_flags *flags)
+{
+	if (flags->bearer_list_current_calls_changed) {
+		LOG_DBG("pending notification replaced");
 	}
 
-	if (inst->notify_current_calls) {
-		net_buf_put_current_calls(inst, &read_buf);
+	flags->bearer_list_current_calls_changed = true;
+}
 
-		err = bt_gatt_notify_uuid(NULL, BT_UUID_TBS_LIST_CURRENT_CALLS, inst->attrs,
-					  read_buf.data, read_buf.len);
-		if (err != 0) {
-			return err;
-		}
-	}
+static int inst_notify_calls(struct tbs_inst *inst)
+{
+	set_value_changed(inst, set_call_state_changed_cb, BT_UUID_TBS_CALL_STATE);
+	set_value_changed(inst, set_list_current_calls_changed_cb, BT_UUID_TBS_LIST_CURRENT_CALLS);
 
 	return 0;
 }
 
-static int notify_calls(const struct tbs_inst *inst)
+static int notify_calls(struct tbs_inst *inst)
 {
 	int err;
 
@@ -533,6 +672,281 @@ static int notify_calls(const struct tbs_inst *inst)
 	return 0;
 }
 
+/**
+ * @brief Attempt to move a call in an instance from dialing to alerting
+ *
+ * This function will look through the state of an instance to see if there are any calls in the
+ * instance that are in the dialing state, and move them to the dialing state if we do not have any
+ * pending call state notification. The reason for this is that we do not have an API for the
+ * application to change from dialing to alterting state at this point, but the qualification tests
+ * require us to do this state change.
+ * Since we only notify the latest value, we need to notify dialing first for both current calls and
+ * call states, and then switch to the alerting state for the call and then notify again.
+ *
+ * @param inst The instance to attempt the state change on
+ * @retval true There was a state change
+ * @retval false There was not a state change
+ */
+static bool try_change_dialing_call_to_alerting(struct tbs_inst *inst)
+{
+	bool state_changed = false;
+
+	/* If we still have pending state change notifications, we cannot change the state
+	 * autonomously
+	 */
+	for (size_t i = 0U; i < ARRAY_SIZE(inst->flags); i++) {
+		const struct tbs_flags *flags = &inst->flags[i];
+
+		if (flags->bearer_list_current_calls_changed || flags->call_state_changed) {
+			return false;
+		}
+	}
+
+	if (!inst_is_gtbs(inst)) {
+		/* If inst is not the GTBS then we also need to ensure that GTBS is done notifying
+		 * before changing state
+		 */
+		for (size_t i = 0U; i < ARRAY_SIZE(gtbs_inst.flags); i++) {
+			const struct tbs_flags *flags = &gtbs_inst.flags[i];
+
+			if (flags->bearer_list_current_calls_changed || flags->call_state_changed) {
+				return false;
+			}
+		}
+	}
+
+	/* Check if we have any calls in the dialing state */
+	for (size_t i = 0U; i < ARRAY_SIZE(inst->calls); i++) {
+		if (inst->calls[i].state == BT_TBS_CALL_STATE_DIALING) {
+			inst->calls[i].state = BT_TBS_CALL_STATE_ALERTING;
+			state_changed = true;
+			break;
+		}
+	}
+
+	if (state_changed) {
+		notify_calls(inst);
+	}
+
+	return state_changed;
+}
+
+static void notify_handler_cb(struct bt_conn *conn, void *data)
+{
+	struct tbs_inst *inst = data;
+	struct tbs_flags *flags = &inst->flags[bt_conn_index(conn)];
+	struct bt_conn_info info;
+	int err;
+
+	err = bt_conn_get_info(conn, &info);
+	__ASSERT(err == 0, "Failed to get conn info: %d", err);
+
+	if (info.state != BT_CONN_STATE_CONNECTED) {
+		/* Not connected */
+		return;
+	}
+
+	if (!inst_is_gtbs(inst)) {
+		notify_handler_cb(conn, &gtbs_inst);
+	}
+
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to take mutex: %d", err);
+		goto reschedule;
+	}
+
+	if (flags->bearer_provider_name_changed) {
+		LOG_DBG("Notifying Bearer Provider Name: %s", inst->provider_name);
+
+		err = notify(conn, BT_UUID_TBS_PROVIDER_NAME, inst->attrs, inst->provider_name,
+			     strlen(inst->provider_name));
+		if (err == 0) {
+			flags->bearer_provider_name_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->bearer_technology_changed) {
+		LOG_DBG("Notifying Bearer Technology: %s (0x%02x)",
+			bt_tbs_technology_str(inst->technology), inst->technology);
+
+		err = notify(conn, BT_UUID_TBS_TECHNOLOGY, inst->attrs, &inst->technology,
+			     sizeof(inst->technology));
+		if (err == 0) {
+			flags->bearer_technology_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->bearer_uri_schemes_supported_list_changed) {
+		LOG_DBG("Notifying Bearer URI schemes supported list: %s", inst->uri_scheme_list);
+
+		err = notify(conn, BT_UUID_TBS_URI_LIST, inst->attrs, &inst->uri_scheme_list,
+			     strlen(inst->uri_scheme_list));
+		if (err == 0) {
+			flags->bearer_uri_schemes_supported_list_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->bearer_signal_strength_changed) {
+		LOG_DBG("Notifying Bearer Signal Strength: 0x%02x", inst->signal_strength);
+
+		err = notify(conn, BT_UUID_TBS_SIGNAL_STRENGTH, inst->attrs, &inst->signal_strength,
+			     sizeof(inst->signal_strength));
+		if (err == 0) {
+			flags->bearer_signal_strength_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->bearer_list_current_calls_changed) {
+		LOG_DBG("Notifying Bearer List Current Calls");
+
+		net_buf_put_current_calls(inst, &read_buf);
+		err = notify(conn, BT_UUID_TBS_LIST_CURRENT_CALLS, inst->attrs, read_buf.data,
+			     read_buf.len);
+		if (err == 0) {
+			flags->bearer_list_current_calls_changed = false;
+		} else {
+			goto fail;
+		}
+
+		if (try_change_dialing_call_to_alerting(inst)) {
+			goto reschedule;
+		}
+	}
+
+	if (flags->status_flags_changed) {
+		LOG_DBG("Notifying Status Flags: 0x%02x", inst->status_flags);
+
+		err = notify(conn, BT_UUID_TBS_STATUS_FLAGS, inst->attrs, &inst->status_flags,
+			     sizeof(inst->status_flags));
+		if (err == 0) {
+			flags->status_flags_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->incoming_call_target_bearer_uri_changed) {
+		LOG_DBG("Notifying Incoming Call Target Bearer URI: call index 0x%02x, URI %s",
+			inst->incoming_uri.call_index, inst->incoming_uri.uri);
+
+		err = notify(conn, BT_UUID_TBS_INCOMING_URI, inst->attrs, &inst->incoming_uri,
+			     sizeof(inst->incoming_uri.call_index) +
+				     strlen(inst->incoming_uri.uri));
+		if (err == 0) {
+			flags->incoming_call_target_bearer_uri_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->call_state_changed) {
+		LOG_DBG("Notifying Call States");
+
+		net_buf_put_call_states(inst, &read_buf);
+		err = notify(conn, BT_UUID_TBS_CALL_STATE, inst->attrs, read_buf.data,
+			     read_buf.len);
+		if (err == 0) {
+			flags->call_state_changed = false;
+		} else {
+			goto fail;
+		}
+
+		if (try_change_dialing_call_to_alerting(inst)) {
+			goto reschedule;
+		}
+	}
+
+	if (flags->termination_reason_changed) {
+		LOG_DBG("Notifying Bearer Provider Name: call_index 0x%02x reason 0x%02x",
+			inst->terminate_reason.call_index, inst->terminate_reason.reason);
+
+		err = notify(conn, BT_UUID_TBS_TERMINATE_REASON, inst->attrs,
+			     &inst->terminate_reason, sizeof(inst->terminate_reason));
+		if (err == 0) {
+			flags->termination_reason_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->incoming_call_changed) {
+		LOG_DBG("Notifying Incoming Call: call index 0x%02x, URI %s",
+			inst->in_call.call_index, inst->in_call.uri);
+
+		err = notify(conn, BT_UUID_TBS_INCOMING_CALL, inst->attrs, &inst->in_call,
+			     sizeof(inst->in_call.call_index) + strlen(inst->in_call.uri));
+		if (err == 0) {
+			flags->incoming_call_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	if (flags->call_friendly_name_changed) {
+		LOG_DBG("Notifying Friendly Name: call index 0x%02x, URI %s",
+			inst->friendly_name.call_index, inst->friendly_name.uri);
+
+		err = notify(conn, BT_UUID_TBS_FRIENDLY_NAME, inst->attrs, &inst->friendly_name,
+			     sizeof(inst->friendly_name.call_index) +
+				     strlen(inst->friendly_name.uri));
+		if (err == 0) {
+			flags->call_friendly_name_changed = false;
+		} else {
+			goto fail;
+		}
+	}
+
+	/* The TBS spec is a bit unclear on this, but the TBS test spec states that the control
+	 * operation notification shall be sent after the current calls and call state
+	 * notifications, this shall be triggered after those.
+	 */
+	if (inst->cp_ntf.pending && bt_conn_index(conn) == inst->cp_ntf.conn_index &&
+	    !flags->bearer_list_current_calls_changed && !flags->call_state_changed) {
+		const struct bt_tbs_call_cp_notify *notification = &inst->cp_ntf.notification;
+
+		LOG_DBG("Notifying CCP: Call index %u, %s opcode and status %s",
+			notification->call_index, bt_tbs_opcode_str(notification->opcode),
+			bt_tbs_status_str(notification->status));
+
+		err = notify(conn, BT_UUID_TBS_CALL_CONTROL_POINT, inst->attrs, notification,
+			     sizeof(*notification));
+		if (err == 0) {
+			inst->cp_ntf.pending = false;
+		} else {
+			goto fail;
+		}
+	}
+
+fail:
+	if (err != 0) {
+		LOG_DBG("Notify failed (%d), retrying next connection interval", err);
+reschedule:
+		err = k_work_reschedule(&inst->notify_work,
+					K_USEC(BT_CONN_INTERVAL_TO_US(info.le.interval)));
+		__ASSERT(err >= 0, "Failed to reschedule work: %d", err);
+	}
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+}
+
+static void notify_work_handler(struct k_work *work)
+{
+	struct tbs_inst *inst =
+		CONTAINER_OF(k_work_delayable_from_work(work), struct tbs_inst, notify_work);
+
+	bt_conn_foreach(BT_CONN_TYPE_LE, notify_handler_cb, inst);
+}
+
 static ssize_t read_provider_name(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
 				  uint16_t len, uint16_t offset)
 {
@@ -690,7 +1104,6 @@ static void current_calls_cfg_changed(const struct bt_gatt_attr *attr, uint16_t
 
 	if (inst != NULL) {
 		LOG_DBG("Index %u: value 0x%04x", inst_index(inst), value);
-		inst->notify_current_calls = (value == BT_GATT_CCC_NOTIFY);
 	}
 }
 
@@ -795,22 +1208,9 @@ static void call_state_cfg_changed(const struct bt_gatt_attr *attr, uint16_t val
 
 	if (inst != NULL) {
 		LOG_DBG("Index %u: value 0x%04x", inst_index(inst), value);
-		inst->notify_call_states = (value == BT_GATT_CCC_NOTIFY);
 	}
 }
 
-static int notify_ccp(struct bt_conn *conn, const struct bt_gatt_attr *attr, uint8_t call_index,
-		      uint8_t opcode, uint8_t status)
-{
-	const struct bt_tbs_call_cp_notify ccp_not = {
-		.call_index = call_index, .opcode = opcode, .status = status};
-
-	LOG_DBG("Notifying CCP: Call index %u, %s opcode and status %s", call_index,
-		bt_tbs_opcode_str(opcode), bt_tbs_status_str(status));
-
-	return bt_gatt_notify(conn, attr, &ccp_not, sizeof(ccp_not));
-}
-
 static void hold_other_calls(struct tbs_inst *inst, uint8_t call_index_cnt,
 			     const uint8_t *call_indexes)
 {
@@ -958,10 +1358,6 @@ static int originate_call(struct tbs_inst *inst, const struct bt_tbs_call_cp_ori
 
 	hold_other_calls(inst, 1, &call->index);
 
-	notify_calls(inst);
-	call->state = BT_TBS_CALL_STATE_ALERTING;
-	notify_calls(inst);
-
 	LOG_DBG("New call with call index %u", call->index);
 
 	*call_index = call->index;
@@ -1078,9 +1474,7 @@ static void notify_app(struct bt_conn *conn, struct tbs_inst *inst, uint16_t len
 			remote_party_alerted = tbs_cbs->originate_call(conn, call_index, uri);
 		}
 
-		if (remote_party_alerted) {
-			call->state = BT_TBS_CALL_STATE_ALERTING;
-		} else {
+		if (!remote_party_alerted) {
 			const struct bt_tbs_call_cp_term term = {
 				.call_index = call_index, .opcode = BT_TBS_CALL_OPCODE_TERMINATE};
 
@@ -1088,8 +1482,6 @@ static void notify_app(struct bt_conn *conn, struct tbs_inst *inst, uint16_t len
 			terminate_call(inst, &term, BT_TBS_REASON_CALL_FAILED);
 		}
 
-		notify_calls(inst);
-
 		break;
 	}
 	case BT_TBS_CALL_OPCODE_JOIN: {
@@ -1113,6 +1505,30 @@ static void notify_app(struct bt_conn *conn, struct tbs_inst *inst, uint16_t len
 	}
 }
 
+static bool is_valid_cp_len(uint16_t len, const union bt_tbs_call_cp_t *ccp)
+{
+	if (len < sizeof(ccp->opcode)) {
+		return false;
+	}
+
+	switch (ccp->opcode) {
+	case BT_TBS_CALL_OPCODE_ACCEPT:
+		return len == sizeof(ccp->accept);
+	case BT_TBS_CALL_OPCODE_TERMINATE:
+		return len == sizeof(ccp->terminate);
+	case BT_TBS_CALL_OPCODE_HOLD:
+		return len == sizeof(ccp->hold);
+	case BT_TBS_CALL_OPCODE_RETRIEVE:
+		return len == sizeof(ccp->retrieve);
+	case BT_TBS_CALL_OPCODE_ORIGINATE:
+		return len >= sizeof(ccp->originate) + BT_TBS_MIN_URI_LEN;
+	case BT_TBS_CALL_OPCODE_JOIN:
+		return len >= sizeof(ccp->join) + 1; /* at least 1 call index */
+	default:
+		return true; /* defer to future checks */
+	}
+}
+
 static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf,
 			     uint16_t len, uint16_t offset, uint8_t flags)
 {
@@ -1122,6 +1538,8 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 	uint8_t status;
 	uint8_t call_index = 0;
 	const bool is_gtbs = inst_is_gtbs(inst);
+	bool calls_changed = false;
+	int err;
 
 	if (!is_authorized(inst, conn)) {
 		return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
@@ -1131,19 +1549,28 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
 	}
 
-	if (len < sizeof(ccp->opcode)) {
+	if (!is_valid_cp_len(len, ccp)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
 	}
 
 	LOG_DBG("Index %u: Processing the %s opcode", inst_index(inst),
 		bt_tbs_opcode_str(ccp->opcode));
 
+	err = k_mutex_lock(&inst->mutex, MUTEX_TIMEOUT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
+	if (inst->cp_ntf.pending) {
+		err = k_mutex_unlock(&inst->mutex);
+		__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
+		return BT_GATT_ERR(BT_TBS_RESULT_CODE_OPERATION_NOT_POSSIBLE);
+	}
+
 	switch (ccp->opcode) {
 	case BT_TBS_CALL_OPCODE_ACCEPT:
-		if (len != sizeof(ccp->accept)) {
-			return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
-		}
-
 		call_index = ccp->accept.call_index;
 
 		if (is_gtbs) {
@@ -1159,10 +1586,6 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 		status = accept_call(tbs, &ccp->accept);
 		break;
 	case BT_TBS_CALL_OPCODE_TERMINATE:
-		if (len != sizeof(ccp->terminate)) {
-			return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
-		}
-
 		call_index = ccp->terminate.call_index;
 
 		if (is_gtbs) {
@@ -1178,10 +1601,6 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 		status = terminate_call(tbs, &ccp->terminate, BT_TBS_REASON_CLIENT_TERMINATED);
 		break;
 	case BT_TBS_CALL_OPCODE_HOLD:
-		if (len != sizeof(ccp->hold)) {
-			return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
-		}
-
 		call_index = ccp->hold.call_index;
 
 		if (is_gtbs) {
@@ -1197,10 +1616,6 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 		status = tbs_hold_call(tbs, &ccp->hold);
 		break;
 	case BT_TBS_CALL_OPCODE_RETRIEVE:
-		if (len != sizeof(ccp->retrieve)) {
-			return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
-		}
-
 		call_index = ccp->retrieve.call_index;
 
 		if (is_gtbs) {
@@ -1218,10 +1633,6 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 	case BT_TBS_CALL_OPCODE_ORIGINATE: {
 		const uint16_t uri_len = len - sizeof(ccp->originate);
 
-		if (len < sizeof(ccp->originate) + BT_TBS_MIN_URI_LEN) {
-			return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
-		}
-
 		if (is_gtbs) {
 			tbs = lookup_inst_by_uri_scheme(ccp->originate.uri, uri_len);
 			if (tbs == NULL) {
@@ -1237,11 +1648,6 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 	}
 	case BT_TBS_CALL_OPCODE_JOIN: {
 		const uint16_t call_index_cnt = len - sizeof(ccp->join);
-
-		if (len < sizeof(ccp->join) + 1) { /* at least 1 call index */
-			return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
-		}
-
 		call_index = ccp->join.call_indexes[0];
 
 		if (is_gtbs) {
@@ -1284,12 +1690,31 @@ static ssize_t write_call_cp(struct bt_conn *conn, const struct bt_gatt_attr *at
 		call_index = 0;
 	}
 
-	if (conn != NULL) {
-		notify_ccp(conn, attr, call_index, ccp->opcode, status);
-	} /* else local operation; don't notify */
-
 	if (tbs != NULL && status == BT_TBS_RESULT_CODE_SUCCESS) {
 		notify_calls(tbs);
+		calls_changed = true;
+	}
+
+	if (conn != NULL && bt_gatt_is_subscribed(conn, attr, BT_GATT_CCC_NOTIFY)) {
+		struct bt_tbs_call_cp_notify *notification = &inst->cp_ntf.notification;
+
+		notification->call_index = call_index;
+		notification->opcode = ccp->opcode;
+		notification->status = status;
+		inst->cp_ntf.pending = true;
+		inst->cp_ntf.conn_index = bt_conn_index(conn);
+
+		/* We may schedule the same work multiple times, but that is OK as scheduling the
+		 * same work multiple times is a no-op
+		 */
+		err = k_work_schedule(&inst->notify_work, K_NO_WAIT);
+		__ASSERT(err >= 0, "Failed to schedule work: %d", err);
+	} /* else local operation; don't notify */
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
+	if (calls_changed) {
 		notify_app(conn, tbs, len, ccp, status, call_index);
 	}
 
@@ -1533,6 +1958,10 @@ static int tbs_inst_init_and_register(struct tbs_inst *inst, struct bt_gatt_serv
 	inst->authorization_required = param->authorization_required;
 
 	k_work_init_delayable(&inst->reporting_interval_work, signal_interval_timeout);
+	k_work_init_delayable(&inst->notify_work, notify_work_handler);
+
+	ret = k_mutex_init(&inst->mutex);
+	__ASSERT(ret == 0, "Failed to initialize mutex");
 
 	ret = bt_gatt_service_register(svc);
 	if (ret != 0) {
@@ -1734,6 +2163,13 @@ int bt_tbs_accept(uint8_t call_index)
 	int status = -EINVAL;
 	const struct bt_tbs_call_cp_acc ccp = {.call_index = call_index,
 					       .opcode = BT_TBS_CALL_OPCODE_ACCEPT};
+	int err;
+
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
 
 	if (inst != NULL) {
 		status = accept_call(inst, &ccp);
@@ -1743,6 +2179,9 @@ int bt_tbs_accept(uint8_t call_index)
 		notify_calls(inst);
 	}
 
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
 	return status;
 }
 
@@ -1754,10 +2193,23 @@ int bt_tbs_hold(uint8_t call_index)
 						.opcode = BT_TBS_CALL_OPCODE_HOLD};
 
 	if (inst != NULL) {
+		int err;
+
+		err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+		if (err != 0) {
+			LOG_DBG("Failed to lock mutex");
+			return -EBUSY;
+		}
+
 		status = tbs_hold_call(inst, &ccp);
-	}
 
-	notify_calls(inst);
+		if (status == BT_TBS_RESULT_CODE_SUCCESS) {
+			notify_calls(inst);
+		}
+
+		err = k_mutex_unlock(&inst->mutex);
+		__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+	}
 
 	return status;
 }
@@ -1770,10 +2222,23 @@ int bt_tbs_retrieve(uint8_t call_index)
 						    .opcode = BT_TBS_CALL_OPCODE_RETRIEVE};
 
 	if (inst != NULL) {
+		int err;
+
+		err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+		if (err != 0) {
+			LOG_DBG("Failed to lock mutex");
+			return -EBUSY;
+		}
+
 		status = retrieve_call(inst, &ccp);
-	}
 
-	notify_calls(inst);
+		if (status == BT_TBS_RESULT_CODE_SUCCESS) {
+			notify_calls(inst);
+		}
+
+		err = k_mutex_unlock(&inst->mutex);
+		__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+	}
 
 	return status;
 }
@@ -1786,22 +2251,37 @@ int bt_tbs_terminate(uint8_t call_index)
 						.opcode = BT_TBS_CALL_OPCODE_TERMINATE};
 
 	if (inst != NULL) {
+		int err;
+
+		err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+		if (err != 0) {
+			LOG_DBG("Failed to lock mutex");
+			return -EBUSY;
+		}
+
 		status = terminate_call(inst, &ccp, BT_TBS_REASON_SERVER_ENDED_CALL);
-	}
 
-	notify_calls(inst);
+		if (status == BT_TBS_RESULT_CODE_SUCCESS) {
+			notify_calls(inst);
+		}
+
+		err = k_mutex_unlock(&inst->mutex);
+		__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+	}
 
 	return status;
 }
 
 int bt_tbs_originate(uint8_t bearer_index, char *remote_uri, uint8_t *call_index)
 {
-	struct tbs_inst *tbs = inst_lookup_index(bearer_index);
+	struct tbs_inst *inst = inst_lookup_index(bearer_index);
 	uint8_t buf[CONFIG_BT_TBS_MAX_URI_LENGTH + sizeof(struct bt_tbs_call_cp_originate)];
 	struct bt_tbs_call_cp_originate *ccp = (struct bt_tbs_call_cp_originate *)buf;
 	size_t uri_len;
+	int err;
+	int ret;
 
-	if (tbs == NULL) {
+	if (inst == NULL) {
 		LOG_DBG("Could not find TBS instance from index %u", bearer_index);
 		return -EINVAL;
 	} else if (!bt_tbs_valid_uri((uint8_t *)remote_uri, strlen(remote_uri))) {
@@ -1809,12 +2289,28 @@ int bt_tbs_originate(uint8_t bearer_index, char *remote_uri, uint8_t *call_index
 		return -EINVAL;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
 	uri_len = strlen(remote_uri);
 
 	ccp->opcode = BT_TBS_CALL_OPCODE_ORIGINATE;
 	(void)memcpy(ccp->uri, remote_uri, uri_len);
 
-	return originate_call(tbs, ccp, uri_len, call_index);
+	ret = originate_call(inst, ccp, uri_len, call_index);
+
+	/* In the case that we are not connected to any TBS clients, we won't notify and we can
+	 * attempt to change state from dialing to alerting immediately
+	 */
+	(void)try_change_dialing_call_to_alerting(inst);
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
+	return ret;
 }
 
 int bt_tbs_join(uint8_t call_index_cnt, uint8_t *call_indexes)
@@ -1831,11 +2327,26 @@ int bt_tbs_join(uint8_t call_index_cnt, uint8_t *call_indexes)
 	}
 
 	if (inst != NULL) {
+		int err;
+
+		err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+		if (err != 0) {
+			LOG_DBG("Failed to lock mutex");
+			return -EBUSY;
+		}
+
 		ccp->opcode = BT_TBS_CALL_OPCODE_JOIN;
 		(void)memcpy(ccp->call_indexes, call_indexes,
 			     MIN(call_index_cnt, CONFIG_BT_TBS_MAX_CALLS));
 
 		status = join_calls(inst, ccp, call_index_cnt);
+
+		if (status == BT_TBS_RESULT_CODE_SUCCESS) {
+			notify_calls(inst);
+		}
+
+		err = k_mutex_unlock(&inst->mutex);
+		__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
 	}
 
 	return status;
@@ -1845,6 +2356,8 @@ int bt_tbs_remote_answer(uint8_t call_index)
 {
 	struct tbs_inst *inst = lookup_inst_by_call_index(call_index);
 	struct bt_tbs_call *call;
+	int err;
+	int ret;
 
 	if (inst == NULL) {
 		return BT_TBS_RESULT_CODE_INVALID_CALL_INDEX;
@@ -1856,13 +2369,26 @@ int bt_tbs_remote_answer(uint8_t call_index)
 		return BT_TBS_RESULT_CODE_INVALID_CALL_INDEX;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
 	if (call->state == BT_TBS_CALL_STATE_ALERTING) {
 		call->state = BT_TBS_CALL_STATE_ACTIVE;
 		notify_calls(inst);
-		return BT_TBS_RESULT_CODE_SUCCESS;
+		ret = BT_TBS_RESULT_CODE_SUCCESS;
 	} else {
-		return BT_TBS_RESULT_CODE_STATE_MISMATCH;
+		LOG_DBG("Call with index %u Invalid state %s", call_index,
+			bt_tbs_state_str(call->state));
+		ret = BT_TBS_RESULT_CODE_STATE_MISMATCH;
 	}
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
+	return ret;
 }
 
 int bt_tbs_remote_hold(uint8_t call_index)
@@ -1870,6 +2396,7 @@ int bt_tbs_remote_hold(uint8_t call_index)
 	struct tbs_inst *inst = lookup_inst_by_call_index(call_index);
 	struct bt_tbs_call *call;
 	uint8_t status;
+	int err;
 
 	if (inst == NULL) {
 		return BT_TBS_RESULT_CODE_INVALID_CALL_INDEX;
@@ -1881,6 +2408,12 @@ int bt_tbs_remote_hold(uint8_t call_index)
 		return BT_TBS_RESULT_CODE_INVALID_CALL_INDEX;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
 	if (call->state == BT_TBS_CALL_STATE_ACTIVE) {
 		call->state = BT_TBS_CALL_STATE_REMOTELY_HELD;
 		status = BT_TBS_RESULT_CODE_SUCCESS;
@@ -1895,6 +2428,9 @@ int bt_tbs_remote_hold(uint8_t call_index)
 		notify_calls(inst);
 	}
 
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
 	return status;
 }
 
@@ -1903,6 +2439,7 @@ int bt_tbs_remote_retrieve(uint8_t call_index)
 	struct tbs_inst *inst = lookup_inst_by_call_index(call_index);
 	struct bt_tbs_call *call;
 	int status;
+	int err;
 
 	if (inst == NULL) {
 		return BT_TBS_RESULT_CODE_INVALID_CALL_INDEX;
@@ -1914,6 +2451,11 @@ int bt_tbs_remote_retrieve(uint8_t call_index)
 		return BT_TBS_RESULT_CODE_INVALID_CALL_INDEX;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
 	if (call->state == BT_TBS_CALL_STATE_REMOTELY_HELD) {
 		call->state = BT_TBS_CALL_STATE_ACTIVE;
 		status = BT_TBS_RESULT_CODE_SUCCESS;
@@ -1928,6 +2470,9 @@ int bt_tbs_remote_retrieve(uint8_t call_index)
 		notify_calls(inst);
 	}
 
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
 	return status;
 }
 
@@ -1939,50 +2484,76 @@ int bt_tbs_remote_terminate(uint8_t call_index)
 						.opcode = BT_TBS_CALL_OPCODE_TERMINATE};
 
 	if (inst != NULL) {
+		int err;
+
+		err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+		if (err != 0) {
+			LOG_DBG("Failed to lock mutex");
+			return -EBUSY;
+		}
 		status = terminate_call(inst, &ccp, BT_TBS_REASON_REMOTE_ENDED_CALL);
-	}
 
-	notify_calls(inst);
+		if (status == BT_TBS_RESULT_CODE_SUCCESS) {
+			notify_calls(inst);
+		}
+
+		err = k_mutex_unlock(&inst->mutex);
+		__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+	}
 
 	return status;
 }
 
+static void set_incoming_call_target_bearer_uri_changed_cb(struct tbs_flags *flags)
+{
+	if (flags->incoming_call_target_bearer_uri_changed) {
+		LOG_DBG("pending notification replaced");
+	}
+
+	flags->incoming_call_target_bearer_uri_changed = true;
+}
+
+static void set_incoming_call_changed_cb(struct tbs_flags *flags)
+{
+	if (flags->incoming_call_changed) {
+		LOG_DBG("pending notification replaced");
+	}
+
+	flags->incoming_call_changed = true;
+}
+
+static void set_call_friendly_name_changed_cb(struct tbs_flags *flags)
+{
+	if (flags->call_friendly_name_changed) {
+		LOG_DBG("pending notification replaced");
+	}
+
+	flags->call_friendly_name_changed = true;
+}
+
 static void tbs_inst_remote_incoming(struct tbs_inst *inst, const char *to, const char *from,
 				     const char *friendly_name, const struct bt_tbs_call *call)
 {
-	size_t local_uri_ind_len;
-	size_t remote_uri_ind_len;
-	size_t friend_name_ind_len;
-
 	__ASSERT_NO_MSG(to != NULL);
 	__ASSERT_NO_MSG(from != NULL);
 
-	local_uri_ind_len = strlen(to) + 1;
-	remote_uri_ind_len = strlen(from) + 1;
-
 	inst->in_call.call_index = call->index;
 	(void)utf8_lcpy(inst->in_call.uri, from, sizeof(inst->in_call.uri));
+	set_value_changed(inst, set_incoming_call_target_bearer_uri_changed_cb,
+			  BT_UUID_TBS_INCOMING_URI);
 
 	inst->incoming_uri.call_index = call->index;
 	(void)utf8_lcpy(inst->incoming_uri.uri, to, sizeof(inst->incoming_uri.uri));
-
-	bt_gatt_notify_uuid(NULL, BT_UUID_TBS_INCOMING_URI, inst->attrs, &inst->incoming_uri,
-			    local_uri_ind_len);
-
-	bt_gatt_notify_uuid(NULL, BT_UUID_TBS_INCOMING_CALL, inst->attrs, &inst->in_call,
-			    remote_uri_ind_len);
+	set_value_changed(inst, set_incoming_call_changed_cb, BT_UUID_TBS_INCOMING_CALL);
 
 	if (friendly_name) {
 		inst->friendly_name.call_index = call->index;
 		utf8_lcpy(inst->friendly_name.uri, friendly_name, sizeof(inst->friendly_name.uri));
-		friend_name_ind_len = strlen(from) + 1;
-
-		bt_gatt_notify_uuid(NULL, BT_UUID_TBS_FRIENDLY_NAME, inst->attrs,
-				    &inst->friendly_name, friend_name_ind_len);
 	} else {
 		inst->friendly_name.call_index = BT_TBS_FREE_CALL_INDEX;
-		bt_gatt_notify_uuid(NULL, BT_UUID_TBS_FRIENDLY_NAME, inst->attrs, NULL, 0);
 	}
+
+	set_value_changed(inst, set_call_friendly_name_changed_cb, BT_UUID_TBS_FRIENDLY_NAME);
 }
 
 int bt_tbs_remote_incoming(uint8_t bearer_index, const char *to, const char *from,
@@ -1990,6 +2561,7 @@ int bt_tbs_remote_incoming(uint8_t bearer_index, const char *to, const char *fro
 {
 	struct tbs_inst *inst = inst_lookup_index(bearer_index);
 	struct bt_tbs_call *call = NULL;
+	int err;
 
 	if (inst == NULL) {
 		LOG_DBG("Could not find TBS instance from index %u", bearer_index);
@@ -2007,6 +2579,11 @@ int bt_tbs_remote_incoming(uint8_t bearer_index, const char *to, const char *fro
 		return -ENOMEM;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
 	BT_TBS_CALL_FLAG_SET_INCOMING(call->flags);
 
 	/* Notify TBS*/
@@ -2021,15 +2598,24 @@ int bt_tbs_remote_incoming(uint8_t bearer_index, const char *to, const char *fro
 
 	notify_calls(inst);
 
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
 	LOG_DBG("New call with call index %u", call->index);
 
 	return call->index;
 }
 
+static void set_bearer_provider_name_changed_cb(struct tbs_flags *flags)
+{
+	flags->bearer_provider_name_changed = true;
+}
+
 int bt_tbs_set_bearer_provider_name(uint8_t bearer_index, const char *name)
 {
 	struct tbs_inst *inst = inst_lookup_index(bearer_index);
 	const size_t len = strlen(name);
+	int err;
 
 	if (len >= CONFIG_BT_TBS_MAX_PROVIDER_NAME_LENGTH || len == 0) {
 		return -EINVAL;
@@ -2041,16 +2627,31 @@ int bt_tbs_set_bearer_provider_name(uint8_t bearer_index, const char *name)
 		return 0;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
 	(void)utf8_lcpy(inst->provider_name, name, sizeof(inst->provider_name));
 
-	bt_gatt_notify_uuid(NULL, BT_UUID_TBS_PROVIDER_NAME, inst->attrs, inst->provider_name,
-			    strlen(inst->provider_name));
+	set_value_changed(inst, set_bearer_provider_name_changed_cb, BT_UUID_TBS_PROVIDER_NAME);
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
 	return 0;
 }
 
+static void set_bearer_technology_changed_cb(struct tbs_flags *flags)
+{
+	flags->bearer_technology_changed = true;
+}
+
 int bt_tbs_set_bearer_technology(uint8_t bearer_index, uint8_t new_technology)
 {
 	struct tbs_inst *inst = inst_lookup_index(bearer_index);
+	int err;
 
 	if (new_technology < BT_TBS_TECHNOLOGY_3G || new_technology > BT_TBS_TECHNOLOGY_WCDMA) {
 		return -EINVAL;
@@ -2062,10 +2663,18 @@ int bt_tbs_set_bearer_technology(uint8_t bearer_index, uint8_t new_technology)
 		return 0;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
 	inst->technology = new_technology;
 
-	bt_gatt_notify_uuid(NULL, BT_UUID_TBS_TECHNOLOGY, inst->attrs, &inst->technology,
-			    sizeof(inst->technology));
+	set_value_changed(inst, set_bearer_technology_changed_cb, BT_UUID_TBS_TECHNOLOGY);
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
 
 	return 0;
 }
@@ -2099,9 +2708,15 @@ int bt_tbs_set_signal_strength(uint8_t bearer_index, uint8_t new_signal_strength
 	return 0;
 }
 
+static void set_status_flags_changed_cb(struct tbs_flags *flags)
+{
+	flags->status_flags_changed = true;
+}
+
 int bt_tbs_set_status_flags(uint8_t bearer_index, uint16_t status_flags)
 {
 	struct tbs_inst *inst = inst_lookup_index(bearer_index);
+	int err;
 
 	if (!BT_TBS_VALID_STATUS_FLAGS(status_flags)) {
 		return -EINVAL;
@@ -2113,18 +2728,33 @@ int bt_tbs_set_status_flags(uint8_t bearer_index, uint16_t status_flags)
 		return 0;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
 	inst->status_flags = status_flags;
 
-	bt_gatt_notify_uuid(NULL, BT_UUID_TBS_STATUS_FLAGS, inst->attrs, &status_flags,
-			    sizeof(status_flags));
+	set_value_changed(inst, set_status_flags_changed_cb, BT_UUID_TBS_STATUS_FLAGS);
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
 	return 0;
 }
 
+static void set_bearer_uri_schemes_supported_list_changed_cb(struct tbs_flags *flags)
+{
+	flags->bearer_uri_schemes_supported_list_changed = true;
+}
+
 int bt_tbs_set_uri_scheme_list(uint8_t bearer_index, const char **uri_list, uint8_t uri_count)
 {
 	char uri_scheme_list[CONFIG_BT_TBS_MAX_SCHEME_LIST_LENGTH];
 	size_t len = 0;
 	struct tbs_inst *inst;
+	int err;
 
 	NET_BUF_SIMPLE_DEFINE(uri_scheme_buf, READ_BUF_SIZE);
 
@@ -2159,13 +2789,19 @@ int bt_tbs_set_uri_scheme_list(uint8_t bearer_index, const char **uri_list, uint
 		return 0;
 	}
 
+	err = k_mutex_lock(&inst->mutex, K_NO_WAIT);
+	if (err != 0) {
+		LOG_DBG("Failed to lock mutex");
+		return -EBUSY;
+	}
+
 	/* Store final result */
 	(void)utf8_lcpy(inst->uri_scheme_list, uri_scheme_list, sizeof(inst->uri_scheme_list));
 
 	LOG_DBG("TBS instance %u uri prefix list is now %s", bearer_index, inst->uri_scheme_list);
 
-	bt_gatt_notify_uuid(NULL, BT_UUID_TBS_URI_LIST, inst->attrs, &inst->uri_scheme_list,
-			    strlen(inst->uri_scheme_list));
+	set_value_changed(inst, set_bearer_uri_schemes_supported_list_changed_cb,
+			  BT_UUID_TBS_URI_LIST);
 
 	if (!inst_is_gtbs(inst)) {
 		/* If the instance is different than the GTBS notify on the GTBS instance as well */
@@ -2188,9 +2824,13 @@ int bt_tbs_set_uri_scheme_list(uint8_t bearer_index, const char **uri_list, uint
 
 		LOG_DBG("GTBS: URI scheme %.*s", uri_scheme_buf.len, uri_scheme_buf.data);
 
-		bt_gatt_notify_uuid(NULL, BT_UUID_TBS_URI_LIST, gtbs_inst.attrs,
-				    uri_scheme_buf.data, uri_scheme_buf.len);
+		set_value_changed(&gtbs_inst, set_bearer_uri_schemes_supported_list_changed_cb,
+				  BT_UUID_TBS_URI_LIST);
 	}
+
+	err = k_mutex_unlock(&inst->mutex);
+	__ASSERT(err == 0, "Failed to unlock mutex: %d", err);
+
 	return 0;
 }
 
diff --git a/subsys/bluetooth/audio/tbs_client.c b/subsys/bluetooth/audio/tbs_client.c
index ba5bbf2a5cf4d..f22af7c2e3ee1 100644
--- a/subsys/bluetooth/audio/tbs_client.c
+++ b/subsys/bluetooth/audio/tbs_client.c
@@ -852,7 +852,7 @@ static void tbs_client_discover_complete(struct bt_conn *conn, int err)
 
 static bool can_add_string_to_net_buf(const struct net_buf_simple *buf, size_t len)
 {
-	return buf->len + len + sizeof('\0') <= buf->size;
+	return buf->len + len + sizeof(char) /* NULL terminator size */ <= buf->size;
 }
 
 /**
@@ -880,7 +880,8 @@ static int handle_string_long_read(struct bt_tbs_instance *inst, uint8_t err, co
 				 * terminator
 				 */
 				LOG_DBG("Truncating string");
-				length = net_buf_simple_tailroom(&inst->net_buf) - sizeof('\0');
+				length = net_buf_simple_tailroom(&inst->net_buf) -
+					 sizeof(char) /* NULL terminator size */;
 				net_buf_simple_add_mem(&inst->net_buf, data, length);
 
 				/* Ensure that the data is correctly truncated */
diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index a9c17ebceec55..6159d2f3d0d24 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -78,15 +78,23 @@ config BT_BUF_ACL_RX_SIZE
 	  that the Controller will send to the Host.
 
 config BT_BUF_ACL_RX_COUNT_EXTRA
-	int "Number of extra incoming ACL data buffers"
+	# As Host implementation unconditionally references this Kconfig, we
+	# hide it for !BT_CONN and default to 0.
+	int "Number of extra incoming ACL data buffers" if BT_CONN
+	range 1 65535 if BT_CONN
+	default BT_MAX_CONN if BT_CONN
+	range 0 0
 	default 0
-	range 0 65535
 	help
 	  Number of incoming extra ACL data buffers sent from the Controller to
 	  the Host.
 
-	  By default, the number of incoming ACL data buffers is equal to
-	  CONFIG_BT_MAX_CONN + 1.
+	  By default, the total number of incoming ACL data buffers is equal to
+	  CONFIG_BT_MAX_CONN + 1, to support L2CAP recombination.
+
+	  The L2CAP recombination in the Host keeps the first Rx buffer for each
+	  connection and uses one Rx buffer across all connections to receive a
+	  fragment from the Controller.
 
 config BT_BUF_ACL_RX_COUNT
 	int "[DEPRECATED] Number of incoming ACL data buffers"
@@ -183,12 +191,48 @@ config BT_BUF_CMD_TX_SIZE
 	  to the maximum of 255.
 
 config BT_BUF_CMD_TX_COUNT
-	int "Number of HCI command buffers"
-	default 2
-	range 2 64
+	# This option is only visible for a user when Host and Controller are build together, or for
+	# Host-only builds.
+	int "Number of HCI command buffers" if !BT_HCI_RAW || !HAS_BT_CTLR
+	# This option is present when Host and Controller are build together, or
+	# for Host only builds, or when Controller-to-Host ACL data flow control
+	# is disabled.
+	depends on !BT_HCI_RAW || !HAS_BT_CTLR || !BT_HCI_ACL_FLOW_CONTROL
+	# The Mesh stack usage in applications and tests can start both advertising and scanning in
+	# parallel. Also, when BT_MESH_WORKQ_SYS is enabled, the Mesh stack is starting Extended
+	# Advertising in the receive callback run in the system work queue and as the Host also uses
+	# the system work queue for HCI command Tx towards the Controller, one additional HCI
+	# command buffer is needed.
+	range 2 64 if BT_MESH
+	range 1 64
+	default 2 if BT_MESH
+	default 1
 	help
 	  Number of buffers available for outgoing HCI commands from the Host.
 
+	  HCI Controllers may not support Num_HCI_Command_Packets > 1, hence they default to 1 when
+	  not enabling Controller to Host data flow control (BT_HCI_ACL_FLOW_CONTROL), Read Remote
+	  Version Information (BT_REMOTE_VERSION), Auto-Initiate PHY update (BT_AUTO_PHY_UPDATE), or
+	  Auto-Initiate Data Length Update (BT_AUTO_DATA_LEN_UPDATE).
+
+	  Normal HCI commands follow the HCI command flow control using Num_HCI_Command_Packets
+	  return in HCI command complete and status.
+
+	  The Host Number of Completed Packets command does not follow normal flow control of HCI
+	  commands and the Controller side HCI drivers that allocates HCI command buffers with
+	  K_NO_WAIT can end up running out of command buffers.
+
+	  When Controller to Host data flow control is enabled in the Host-only or combined
+	  Host plus Controller build, the internal BT_BUF_CMD_TX_COUNT is adjusted accordingly
+	  taking into considerations the enabled auto-initiated procedures, and to follow the normal
+	  HCI command flow control to be able to send Ncmd normal HCI commands and
+	  BT_BUF_ACL_RX_COUNT of Host Number of Completed Packets command down to the Controller.
+
+	  When Controller to Host data flow control is supported in the Controller-only build,
+	  the internal BT_BUF_CMD_TX_COUNT is adjusted to be equal to (BT_BUF_RX_COUNT + Ncmd).
+
+	  Where Ncmd is supported maximum Num_HCI_Command_Packets in the Controller implementation.
+
 endmenu
 
 # Workaround to have commas on function arguments
@@ -220,7 +264,7 @@ config BT_HCI_VS_FATAL_ERROR
 config BT_HCI_VS_EXT_DETECT
 	bool "Use heuristics to guess HCI vendor extensions support in advance"
 	depends on BT_HCI_VS && !HAS_BT_CTLR
-	default y if BOARD_QEMU_X86 || BOARD_QEMU_CORTEX_M3 || BOARD_NATIVE_POSIX || BOARD_NATIVE_SIM
+	default y if BOARD_QEMU_X86 || BOARD_QEMU_CORTEX_M3 || BOARD_NATIVE_SIM
 	help
 	  Use some heuristics to try to guess in advance whether the controller
 	  supports the HCI vendor extensions in advance, in order to prevent
diff --git a/subsys/bluetooth/common/hci_common_internal.h b/subsys/bluetooth/common/hci_common_internal.h
new file mode 100644
index 0000000000000..910ea4b4af34e
--- /dev/null
+++ b/subsys/bluetooth/common/hci_common_internal.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#if !defined(CONFIG_BT_HCI_RAW) || !defined(CONFIG_HAS_BT_CTLR) || \
+	!defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
+/* Following build configurations use configurable CONFIG_BT_BUF_CMD_TX_COUNT:
+ * 1. Host + Controller build with and without Controller to Host data flow control, or
+ * 2. Host-only with and without Controller to Host data flow control, or
+ * 3. Controller-only without Controller to Host data flow control support
+ */
+#if !defined(CONFIG_BT_HCI_RAW)
+/* Host + Controller build, and Host-only build */
+
+/* Auto initiated additional HCI command buffers enqueued in the Host */
+#define BT_BUF_CMD_TX_REMOTE_VERSION       COND_CODE_1(CONFIG_BT_REMOTE_VERSION, (1), (0))
+#define BT_BUF_CMD_TX_AUTO_PHY_UPDATE      COND_CODE_1(CONFIG_BT_AUTO_PHY_UPDATE, (1), (0))
+#define BT_BUF_CMD_TX_AUTO_DATA_LEN_UPDATE COND_CODE_1(CONFIG_BT_AUTO_DATA_LEN_UPDATE, (1), (0))
+
+#else /* CONFIG_BT_HCI_RAW */
+#if defined(CONFIG_HAS_BT_CTLR)
+/* Controller-only build need no additional HCI command buffers */
+BUILD_ASSERT((CONFIG_BT_BUF_CMD_TX_COUNT == CONFIG_BT_CTLR_HCI_NUM_CMD_PKT_MAX),
+	     "Mismatch in allocated HCI command buffers compared to Controller supported value.");
+#endif /* CONFIG_HAS_BT_CTLR */
+
+/* Controller-only build do not enqueue auto initiated HCI commands */
+#define BT_BUF_CMD_TX_REMOTE_VERSION       0
+#define BT_BUF_CMD_TX_AUTO_PHY_UPDATE      0
+#define BT_BUF_CMD_TX_AUTO_DATA_LEN_UPDATE 0
+#endif /* !CONFIG_BT_HCI_RAW */
+
+#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
+/* When Controller to Host data flow control is supported in Host plus Controller build, or
+ * Host-only build, then we need additional BT_BUF_ACL_RX_COUNT number of HCI command buffers for
+ * enqueuing Host Number of Completed Packets command.
+ *
+ * Host keeps the first, and subsequent, Rx buffers (that comes from the driver) for each connection
+ * to do re-assembly into, up to the L2CAP SDU length required number of Rx buffers.
+ * BT_BUF_ACL_RX_COUNT_EXTRA holds the application configured number of buffers across active
+ * connections for recombination of HCI data packets to L2CAP SDUs.
+ *
+ * BT_BUF_HCI_EVT_RX_COUNT defines the number of available buffers reserved for "synchronous"
+ * processing of HCI events like Number of Completed Packets, disconnection complete etc.
+ *
+ * BT_BUF_HCI_ACL_RX_COUNT defines the number of available buffers for Controller to Host data
+ * flow control; keeping the application configured BT_BUF_ACL_RX_COUNT_EXTRA number of buffers
+ * available for L2CAP recombination, and a reserved number of buffers for processing HCI events.
+ */
+
+/* FIXME: Calculate the maximum number of HCI events of different types that a connection can
+ *        enqueue while the Host is slow at processing HCI events.
+ *
+ *        1. Disconnection Complete event
+ *        2. LE Connection Update Complete event
+ *        3. LE Long Term Key Request event
+ *        4. LE Remote Connection Parameter Request Event
+ *        5. LE Data Length Change event
+ *        6. LE PHY Update Complete event
+ *        7. ...
+ *
+ * As there is no HCI event flow control defined, implementations will need a transport level flow
+ * control to restrict buffers required on resource constraint devices, i.e. if these events are not
+ * processed "synchronous".
+ */
+#define BT_BUF_HCI_EVT_RX_COUNT          1
+#define BT_BUF_HCI_ACL_RX_COUNT          (BT_BUF_RX_COUNT - BT_BUF_HCI_EVT_RX_COUNT - \
+					  BT_BUF_ACL_RX_COUNT_EXTRA)
+#define BT_BUF_CMD_TX_HOST_NUM_CMPLT_PKT (BT_BUF_HCI_ACL_RX_COUNT)
+
+#else /* !CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+#define BT_BUF_CMD_TX_HOST_NUM_CMPLT_PKT 0
+#endif /* !CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+
+/* Based on Host + Controller, Host-only or Controller-only; Calculate the HCI Command Tx count. */
+#define BT_BUF_CMD_TX_COUNT (CONFIG_BT_BUF_CMD_TX_COUNT + \
+			     BT_BUF_CMD_TX_HOST_NUM_CMPLT_PKT + \
+			     BT_BUF_CMD_TX_REMOTE_VERSION + \
+			     BT_BUF_CMD_TX_AUTO_PHY_UPDATE + \
+			     BT_BUF_CMD_TX_AUTO_DATA_LEN_UPDATE)
+
+#elif defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
+/* When Controller to Host data flow control is supported in the Controller-only build, ensure
+ * that BT_BUF_CMD_TX_COUNT is greater than or equal to (BT_BUF_RX_COUNT + Ncmd),
+ * where Ncmd is supported maximum Num_HCI_Command_Packets in the Controller implementation.
+ */
+BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_BUF_CMD_TX_COUNT),
+	     "Configurable HCI command buffer count disallowed.");
+BUILD_ASSERT(IS_ENABLED(CONFIG_BT_CTLR_HCI_NUM_CMD_PKT_MAX),
+	     "Undefined Controller implementation supported Num_HCI_Command_Packets value.");
+
+/** Can use all of buffer count needed for HCI ACL, HCI ISO or Event RX buffers for ACL RX */
+#define BT_BUF_HCI_ACL_RX_COUNT (BT_BUF_RX_COUNT)
+
+/* Controller-only with Controller to Host data flow control */
+#define BT_BUF_CMD_TX_COUNT     (BT_BUF_RX_COUNT + CONFIG_BT_CTLR_HCI_NUM_CMD_PKT_MAX)
+
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index a92546523fe1b..6ba7af359a95e 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -159,6 +159,16 @@ config BT_CTLR_HCI
 	  This should almost always be enabled, except in a few special
 	  cases, like for unit testing.
 
+config BT_CTLR_HCI_NUM_CMD_PKT_MAX
+	# Hidden Controller implementation supported Num_HCI_Command_Packets value.
+	# This value will be used to calculate the total number of HCI command buffers to be
+	# allocated, BT_BUF_CMD_TX_COUNT, dependent on HCI Controller to Host data flow control
+	# being enabled.
+	int
+	depends on BT_CTLR_HCI
+	default 1 if BT_LL_SW_SPLIT
+	default 1
+
 if HAS_BT_CTLR
 
 comment "Bluetooth Controller configuration"
@@ -787,6 +797,7 @@ config BT_CTLR_ADV_PERIODIC_RSP
 config BT_CTLR_ADV_EXT_CODING_SELECTION
 	bool "Advertising Coding Selection support"
 	depends on BT_CTLR_PHY_CODED && BT_CTLR_ADV_EXT_CODING_SELECTION_SUPPORT
+	select BT_CTLR_SET_HOST_FEATURE if BT_OBSERVER
 	default y if BT_EXT_ADV_CODING_SELECTION
 	help
 	  Enable support for Bluetooth 6.0 Advertising Coding Selection
@@ -876,6 +887,7 @@ endif # BT_CTLR_SYNC_PERIODIC
 config BT_CTLR_SYNC_TRANSFER_SENDER
 	bool "Periodic Advertising Sync Transfer sender"
 	depends on BT_CTLR_SYNC_TRANSFER_SENDER_SUPPORT
+	select BT_TICKER_LAZY_GET
 	default BT_PER_ADV_SYNC_TRANSFER_SENDER
 	help
 	  Enable support for the Periodic Advertising Sync Transfer control procedure
@@ -884,9 +896,10 @@ config BT_CTLR_SYNC_TRANSFER_SENDER
 
 config BT_CTLR_ADV_ISO
 	bool "LE Broadcast Isochronous Channel advertising" if !BT_LL_SW_SPLIT
-	depends on BT_BROADCASTER && BT_CTLR_ADV_ISO_SUPPORT
+	depends on BT_ISO_BROADCASTER && BT_CTLR_ADV_ISO_SUPPORT
 	select BT_CTLR_ADV_PERIODIC
 	select BT_CTLR_SET_HOST_FEATURE
+	select BT_CTLR_ADV_ISO_SEQUENTIAL if !BT_CTLR_ADV_ISO_INTERLEAVED
 	default y if BT_ISO_BROADCASTER
 	help
 	  Enable support for Bluetooth 5.2 LE Isochronous Advertising in the
@@ -896,11 +909,20 @@ config BT_CTLR_ADV_ISO
 	bool "LE Broadcast Isochronous Channel advertising (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
 	select EXPERIMENTAL if BT_LL_SW_SPLIT
 
+config BT_CTLR_ADV_ISO_SEQUENTIAL
+	bool "LE Broadcast Isochronous Channel advertising sequential packing"
+	depends on BT_CTLR_ADV_ISO
+
+config BT_CTLR_ADV_ISO_INTERLEAVED
+	bool "LE Broadcast Isochronous Channel advertising interleaved packing"
+	depends on BT_CTLR_ADV_ISO
+
 config BT_CTLR_SYNC_ISO
 	bool "LE Broadcast Isochronous Channel advertising sync" if !BT_LL_SW_SPLIT
-	depends on BT_OBSERVER && BT_CTLR_SYNC_ISO_SUPPORT
+	depends on BT_ISO_SYNC_RECEIVER && BT_CTLR_SYNC_ISO_SUPPORT
 	select BT_CTLR_SYNC_PERIODIC
 	select BT_CTLR_SET_HOST_FEATURE
+	select BT_CTLR_SYNC_ISO_SEQUENTIAL if !BT_CTLR_SYNC_ISO_INTERLEAVED
 	default y if BT_ISO_SYNC_RECEIVER
 	help
 	  Enable support for Bluetooth 5.2 LE Isochronous Advertising sync in
@@ -910,6 +932,16 @@ config BT_CTLR_SYNC_ISO
 	bool "LE Broadcast Isochronous Channel advertising sync (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
 	select EXPERIMENTAL if BT_LL_SW_SPLIT
 
+config BT_CTLR_SYNC_ISO_SEQUENTIAL
+	bool "LE Broadcast Isochronous Channel advertising sync sequential packing"
+	depends on BT_CTLR_SYNC_ISO
+	default y
+
+config BT_CTLR_SYNC_ISO_INTERLEAVED
+	bool "LE Broadcast Isochronous Channel advertising sync interleaved packing"
+	depends on BT_CTLR_SYNC_ISO
+	default y
+
 config BT_CTLR_BROADCAST_ISO
 	bool
 	default BT_CTLR_ADV_ISO || BT_CTLR_SYNC_ISO
@@ -999,7 +1031,7 @@ config BT_CTLR_SET_HOST_FEATURE
 
 config BT_CTLR_CENTRAL_ISO
 	bool "LE Connected Isochronous Stream Central" if !BT_LL_SW_SPLIT
-	depends on BT_CTLR_CENTRAL_ISO_SUPPORT && BT_CENTRAL
+	depends on BT_CTLR_CENTRAL_ISO_SUPPORT && BT_ISO_CENTRAL
 	default y if BT_ISO_CENTRAL
 	help
 	  Enable support for Bluetooth 5.2 LE Connected Isochronous Stream
@@ -1007,12 +1039,14 @@ config BT_CTLR_CENTRAL_ISO
 
 config BT_CTLR_CENTRAL_ISO
 	bool "LE Connected Isochronous Stream Central (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
+	depends on BT_CTLR_CENTRAL_ISO_SUPPORT && BT_ISO_CENTRAL
+	default y if BT_ISO_CENTRAL
 	select BT_CTLR_SET_HOST_FEATURE
 	select EXPERIMENTAL if BT_LL_SW_SPLIT
 
 config BT_CTLR_PERIPHERAL_ISO
 	bool "LE Connected Isochronous Stream Peripheral" if !BT_LL_SW_SPLIT
-	depends on BT_CTLR_PERIPHERAL_ISO_SUPPORT && BT_PERIPHERAL
+	depends on BT_CTLR_PERIPHERAL_ISO_SUPPORT && BT_ISO_PERIPHERAL
 	default y if BT_ISO_PERIPHERAL
 	help
 	  Enable support for Bluetooth 5.2 LE Connected Isochronous Stream
@@ -1020,6 +1054,8 @@ config BT_CTLR_PERIPHERAL_ISO
 
 config BT_CTLR_PERIPHERAL_ISO
 	bool "LE Connected Isochronous Stream Peripheral (Split Link Layer) [EXPERIMENTAL]" if BT_LL_SW_SPLIT
+	depends on BT_CTLR_PERIPHERAL_ISO_SUPPORT && BT_ISO_PERIPHERAL
+	default y if BT_ISO_PERIPHERAL
 	select BT_CTLR_SET_HOST_FEATURE
 	select EXPERIMENTAL if BT_LL_SW_SPLIT
 
@@ -1060,13 +1096,13 @@ config BT_CTLR_CONN_ISO_PDU_LEN_MAX
 	help
 	  Maximum Connected Isochronous Channel PDU Length.
 
-config BT_CTLR_CONN_ISO_SDU_LEN_MAX
-	int "Maximum Connected Isochronous Channel SDU Length"
-	depends on BT_CTLR_CONN_ISO
+config BT_CTLR_ISO_TX_SDU_LEN_MAX
+	int "Maximum Isochronous Channel Transmit SDU Length"
+	depends on BT_CTLR_ADV_ISO || BT_CTLR_CONN_ISO
 	range 1 4095
-	default 251
+	default 1
 	help
-	  Maximum Connected Isochronous Channel SDU Length.
+	  Maximum Isochronous Channel Transmit SDU Length.
 
 config BT_CTLR_CONN_ISO_STREAMS_MAX_NSE
 	int "LE Connected Isochronous Streams max number of subevents"
diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split
index 69db98344602b..de2716918f483 100644
--- a/subsys/bluetooth/controller/Kconfig.ll_sw_split
+++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split
@@ -12,7 +12,6 @@ config BT_LLL_VENDOR_NORDIC
 	depends on !$(dt_nodelabel_enabled,rtc0)
 
 	select BT_CTLR_ENTROPY_SUPPORT
-	select ENTROPY_NRF_CRACEN_CTR_DRBG if BT_CTLR_ENTROPY && SOC_COMPATIBLE_NRF54LX
 	select ENTROPY_NRF5_RNG if BT_CTLR_ENTROPY && !SOC_COMPATIBLE_NRF54LX
 	select ENTROPY_NRF5_BIAS_CORRECTION if ENTROPY_NRF5_RNG
 	select EXPERIMENTAL if !ENTROPY_HAS_DRIVER
@@ -61,12 +60,13 @@ config BT_LLL_VENDOR_NORDIC
 	select BT_CTLR_TIFS_HW_SUPPORT
 	select BT_CTLR_ULL_LLL_PRIO_SUPPORT
 
-	select BT_TICKER_REMAINDER_SUPPORT
+	select BT_TICKER_REMAINDER_SUPPORT if !SOC_COMPATIBLE_NRF54LX
 	select BT_TICKER_UPDATE if BT_BROADCASTER || BT_CONN || \
 				   (BT_OBSERVER && BT_CTLR_ADV_EXT)
-	select BT_TICKER_START_REMAINDER if BT_CTLR_CENTRAL_ISO
-	select BT_TICKER_REMAINDER_GET if BT_BROADCASTER && BT_CTLR_ADV_EXT
-	select BT_TICKER_LAZY_GET if BT_CTLR_ADV_PERIODIC || BT_CTLR_CENTRAL_ISO || BT_CTLR_SYNC_TRANSFER_SENDER
+	select BT_TICKER_START_REMAINDER if BT_TICKER_REMAINDER_SUPPORT && BT_CTLR_CENTRAL_ISO
+	select BT_TICKER_REMAINDER_GET if BT_TICKER_REMAINDER_SUPPORT && \
+					  (BT_BROADCASTER && BT_CTLR_ADV_EXT)
+	select BT_TICKER_LAZY_GET if BT_CTLR_ADV_PERIODIC || BT_CTLR_CONN_ISO || BT_CTLR_SYNC_TRANSFER_SENDER
 
 	select BT_TICKER_PREFER_START_BEFORE_STOP if BT_TICKER_SLOT_AGNOSTIC
 
@@ -116,10 +116,27 @@ config BT_CTLR_TIFS_HW_SUPPORT
 config BT_CTLR_ULL_LLL_PRIO_SUPPORT
 	bool
 
+config BT_CTLR_RX_POLL
+	# Hidden, Enable Async I/O Framework, i.e. k_poll
+	bool
+	depends on BT_HCI_RAW || BT_HCI_ACL_FLOW_CONTROL
+	select POLL
+	default y
+
 config BT_CTLR_RX_PRIO_STACK_SIZE
-	# Hidden, Controller's Co-Operative high priority Rx thread stack size.
+	# Hidden
 	int
+	depends on !BT_HCI_RAW
 	default 448
+	help
+	  Controller's Co-Operative high priority Rx thread stack size.
+
+	  Rx priority thread is used in Combined Host plus Controller builds to
+	  prioritize Number of Completed Packets event and Disconnect Event
+	  towards the Host while already enqueued ACL and ISO Data are blocked
+	  in the normal Rx thread waiting for free Tx buffer be available.
+
+	  Rx priority thread is redundant in a Controller-only build.
 
 config BT_CTLR_RX_STACK_SIZE
 	# Hidden, Controller's Co-Operative Rx thread stack size.
@@ -890,8 +907,6 @@ config BT_CTLR_LOW_LAT
 config BT_CTLR_LOW_LAT_ULL
 	prompt "Low latency ULL"
 	bool
-	depends on BT_CTLR_LOW_LAT
-	default y
 	help
 	  Low latency ULL implementation that uses tailchaining instead of while
 	  loop to demux rx messages from LLL.
@@ -1088,7 +1103,7 @@ config BT_CTLR_THROUGHPUT
 
 config BT_CTLR_FORCE_MD_COUNT
 	int "Forced MD bit count" if !BT_CTLR_FORCE_MD_AUTO
-	depends on !BT_CTLR_LOW_LAT_ULL
+	depends on !BT_CTLR_LOW_LAT
 	range 0 $(UINT8_MAX)
 	default 1 if BT_CTLR_FORCE_MD_AUTO
 	default 0
@@ -1102,7 +1117,7 @@ config BT_CTLR_FORCE_MD_COUNT
 
 config BT_CTLR_FORCE_MD_AUTO
 	bool "Forced MD bit automatic calculation"
-	depends on !BT_CTLR_LOW_LAT_ULL
+	depends on !BT_CTLR_LOW_LAT
 	select BT_CTLR_THROUGHPUT
 	default y if BT_HCI_RAW
 	help
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index ba6609f7532bc..7081e58aee869 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -21,6 +21,8 @@
 #include <zephyr/bluetooth/hci_vs.h>
 #include <zephyr/bluetooth/buf.h>
 
+#include "common/hci_common_internal.h"
+
 #include "util/util.h"
 #include "util/memq.h"
 #include "util/mem.h"
@@ -182,13 +184,13 @@ static uint8_t sf_curr;
 #endif
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-int32_t    hci_hbuf_total;
-uint32_t    hci_hbuf_sent;
-uint32_t    hci_hbuf_acked;
-uint16_t    hci_hbuf_pend[CONFIG_BT_MAX_CONN];
+int32_t  hci_hbuf_total;
+uint32_t hci_hbuf_sent;
+uint32_t hci_hbuf_acked;
+uint16_t hci_hbuf_pend[CONFIG_BT_MAX_CONN];
 atomic_t hci_state_mask;
 static struct k_poll_signal *hbuf_signal;
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 #if defined(CONFIG_BT_CONN)
 static uint32_t conn_count;
@@ -473,7 +475,7 @@ static void reset(struct net_buf *buf, struct net_buf **evt)
 		atomic_set_bit(&hci_state_mask, HCI_STATE_BIT_RESET);
 		k_poll_signal_raise(hbuf_signal, 0x0);
 	}
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 	hci_recv_fifo_reset();
 }
@@ -521,6 +523,22 @@ static void set_ctl_to_host_flow(struct net_buf *buf, struct net_buf **evt)
 	hci_hbuf_total = -hci_hbuf_total;
 }
 
+/* Host Number of Completed Packets command does not follow normal flow
+ * control of HCI commands and the Controller side HCI drivers that
+ * allocates HCI command buffers with K_NO_WAIT can end up running out
+ * of command buffers.
+ *
+ * Host will generate up to acl_pkts number of Host Number of Completed
+ * Packets command plus a number of normal HCI commands.
+ *
+ * Normal HCI commands follow the HCI command flow control using
+ * Num_HCI_Command_Packets return in HCI command complete and status.
+ *
+ * Note: Zephyr Controller does not support Num_HCI_Command_Packets > 1.
+ */
+BUILD_ASSERT(BT_BUF_HCI_ACL_RX_COUNT < BT_BUF_CMD_TX_COUNT,
+	     "Too low HCI command buffers compare to ACL Rx buffers.");
+
 static void host_buffer_size(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_host_buffer_size *cmd = (void *)buf->data;
@@ -534,15 +552,38 @@ static void host_buffer_size(struct net_buf *buf, struct net_buf **evt)
 		ccst->status = BT_HCI_ERR_CMD_DISALLOWED;
 		return;
 	}
-	/* fragmentation from controller to host not supported, require
+
+	/* Fragmentation from Controller to Host not supported, require
 	 * ACL MTU to be at least the LL MTU
 	 */
 	if (acl_mtu < LL_LENGTH_OCTETS_RX_MAX) {
+		LOG_ERR("FC: Require Host ACL MTU (%u) >= LL Max Data Length (%u)", acl_mtu,
+			LL_LENGTH_OCTETS_RX_MAX);
 		ccst->status = BT_HCI_ERR_INVALID_PARAM;
 		return;
 	}
 
-	LOG_DBG("FC: host buf size: %d", acl_pkts);
+	/* Host Number of Completed Packets command does not follow normal flow
+	 * control of HCI commands and the Controller side HCI drivers that
+	 * allocates HCI command buffers with K_NO_WAIT can end up running out
+	 * of command buffers.
+	 *
+	 * Host will generate up to acl_pkts number of Host Number of Completed
+	 * Packets command plus a number of normal HCI commands.
+	 *
+	 * Normal HCI commands follow the HCI command flow control using
+	 * Num_HCI_Command_Packets return in HCI command complete and status.
+	 *
+	 * Note: Zephyr Controller does not support Num_HCI_Command_Packets > 1.
+	 */
+	if (acl_pkts >= BT_BUF_CMD_TX_COUNT) {
+		LOG_WRN("FC: Host ACL packets (%u), BT_BUF_CMD_TX_COUNT (%u)", acl_pkts,
+			BT_BUF_CMD_TX_COUNT);
+		acl_pkts = BT_BUF_CMD_TX_COUNT - CONFIG_BT_CTLR_HCI_NUM_CMD_PKT_MAX;
+	}
+
+	LOG_DBG("FC: host buf size %u count %u", acl_mtu, acl_pkts);
+
 	hci_hbuf_total = -acl_pkts;
 }
 
@@ -584,7 +625,7 @@ static void host_num_completed_packets(struct net_buf *buf,
 	hci_hbuf_acked += count;
 	k_poll_signal_raise(hbuf_signal, 0x0);
 }
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
 static void read_auth_payload_timeout(struct net_buf *buf, struct net_buf **evt)
@@ -745,7 +786,7 @@ static int ctrl_bb_cmd_handle(uint16_t  ocf, struct net_buf *cmd,
 	case BT_OCF(BT_HCI_OP_HOST_NUM_COMPLETED_PACKETS):
 		host_num_completed_packets(cmd, evt);
 		break;
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
 	case BT_OCF(BT_HCI_OP_READ_AUTH_PAYLOAD_TIMEOUT):
@@ -5876,7 +5917,6 @@ int hci_iso_handle(struct net_buf *buf, struct net_buf **evt)
 	struct bt_hci_iso_sdu_hdr *iso_sdu_hdr;
 	struct isoal_sdu_tx sdu_frag_tx;
 	struct bt_hci_iso_hdr *iso_hdr;
-	uint32_t *time_stamp;
 	uint16_t handle;
 	uint8_t pb_flag;
 	uint8_t ts_flag;
@@ -5924,9 +5964,8 @@ int hci_iso_handle(struct net_buf *buf, struct net_buf **evt)
 	sdu_frag_tx.cntr_time_stamp = HAL_TICKER_TICKS_TO_US(ticker_ticks_now_get());
 	if (ts_flag) {
 		/* Use HCI provided time stamp */
-		time_stamp = net_buf_pull_mem(buf, sizeof(*time_stamp));
-		len -= sizeof(*time_stamp);
-		sdu_frag_tx.time_stamp = sys_le32_to_cpu(*time_stamp);
+		sdu_frag_tx.time_stamp = net_buf_pull_le32(buf);
+		len -= sizeof(uint32_t);
 	} else {
 		/* Use controller's capture time */
 		sdu_frag_tx.time_stamp = sdu_frag_tx.cntr_time_stamp;
@@ -5966,6 +6005,7 @@ int hci_iso_handle(struct net_buf *buf, struct net_buf **evt)
 		struct ll_conn_iso_group *cig;
 		struct ll_iso_stream_hdr *hdr;
 		struct ll_iso_datapath *dp_in;
+		uint32_t sdu_interval;
 		uint8_t event_offset;
 
 		cis = ll_iso_stream_connected_get(handle);
@@ -5976,23 +6016,35 @@ int hci_iso_handle(struct net_buf *buf, struct net_buf **evt)
 		cig = cis->group;
 
 		/* We must ensure sufficient time for ISO-AL to fragment SDU and
-		 * deliver PDUs to the TX queue. By checking ull_ref_get, we
-		 * know if we are within the subevents of an ISO event. If so,
-		 * we can assume that we have enough time to deliver in the next
-		 * ISO event. If we're not active within the ISO event, we don't
-		 * know if there is enough time to deliver in the next event,
-		 * and for safety we set the target to current event + 2.
-		 *
-		 * For FT > 1, we have the opportunity to retransmit in later
+		 * deliver PDUs to the TX queue. We don't know if there is enough
+		 * time to deliver in the next event, and for safety we set the
+		 * target to current event + 2.
+		 */
+		event_offset = 2;
+
+		if (cig->lll.role) {
+			/* peripheral */
+			sdu_interval = cig->p_sdu_interval;
+		} else {
+			/* central */
+			sdu_interval = cig->c_sdu_interval;
+		}
+
+		/* By checking ull_ref_get, we know if we are within the subevents
+		 * of an ISO event. If so, we can assume that we have enough time
+		 * to deliver in the next ISO event, provided CIG sync delay is less
+		 * than an SDU interval
+		 */
+		if (ull_ref_get(&cig->ull) && cig->sync_delay < sdu_interval) {
+			event_offset -= 1;
+		}
+
+		/* For FT > 1, we have the opportunity to retransmit in later
 		 * event(s), in which case we have the option to target an
 		 * earlier event (this or next) because being late does not
 		 * instantly flush the payload.
 		 */
-
-		event_offset = ull_ref_get(&cig->ull) ? 1 : 2;
-
 		if (cis->lll.tx.ft > 1) {
-			/* FT > 1, target an earlier event */
 			event_offset -= 1;
 		}
 
@@ -6001,7 +6053,7 @@ int hci_iso_handle(struct net_buf *buf, struct net_buf **evt)
 		uint64_t pkt_seq_num;
 
 		/* Catch up local pkt_seq_num with internal pkt_seq_num */
-		event_count = cis->lll.event_count + event_offset;
+		event_count = cis->lll.event_count_prepare + event_offset;
 		pkt_seq_num = event_count + 1U;
 
 		/* If pb_flag is BT_ISO_START (0b00) or BT_ISO_SINGLE (0b10)
@@ -6044,7 +6096,7 @@ int hci_iso_handle(struct net_buf *buf, struct net_buf **evt)
 						   ISO_INT_UNIT_US));
 
 #else /* !CONFIG_BT_CTLR_ISOAL_PSN_IGNORE */
-		sdu_frag_tx.target_event = cis->lll.event_count + event_offset;
+		sdu_frag_tx.target_event = cis->lll.event_count_prepare + event_offset;
 		sdu_frag_tx.grp_ref_point =
 			isoal_get_wrapped_time_us(cig->cig_ref_point,
 						  (event_offset *
@@ -8739,6 +8791,15 @@ static void encode_control(struct node_rx_pdu *node_rx,
 
 	case NODE_RX_TYPE_TERMINATE:
 		hci_disconn_complete_encode(pdu_data, handle, buf);
+
+#if !defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+		/* Similar to the design of processing the termination when using Rx priority
+		 * thread, we process the termination event to handle Controller to Host data
+		 * flowcontrol in the Controller here.
+		 */
+		hci_disconn_complete_process(handle);
+#endif /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
 		break;
 
 	case NODE_RX_TYPE_CONN_UPDATE:
@@ -9119,7 +9180,7 @@ void hci_acl_encode(struct node_rx_pdu *node_rx, struct net_buf *buf)
 			LL_ASSERT(handle < ARRAY_SIZE(hci_hbuf_pend));
 			hci_hbuf_pend[handle]++;
 		}
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 		break;
 
 	default:
@@ -9325,6 +9386,7 @@ void hci_init(struct k_poll_signal *signal_host_buf)
 {
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 	hbuf_signal = signal_host_buf;
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+
 	reset(NULL, NULL);
 }
diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c
index 1f856e56f6a8b..0ba42a6728241 100644
--- a/subsys/bluetooth/controller/hci/hci_driver.c
+++ b/subsys/bluetooth/controller/hci/hci_driver.c
@@ -25,7 +25,7 @@
 
 #ifdef CONFIG_CLOCK_CONTROL_NRF
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#endif
+#endif /* CONFIG_CLOCK_CONTROL_NRF */
 
 #include "hal/debug.h"
 
@@ -72,12 +72,9 @@ struct hci_driver_data {
 	bt_hci_recv_t recv;
 };
 
-static struct k_sem sem_prio_recv;
+static struct k_sem sem_recv;
 static struct k_fifo recv_fifo;
 
-struct k_thread prio_recv_thread_data;
-static K_KERNEL_STACK_DEFINE(prio_recv_thread_stack,
-			     CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE);
 struct k_thread recv_thread_data;
 static K_KERNEL_STACK_DEFINE(recv_thread_stack, CONFIG_BT_CTLR_RX_STACK_SIZE);
 
@@ -85,67 +82,9 @@ static K_KERNEL_STACK_DEFINE(recv_thread_stack, CONFIG_BT_CTLR_RX_STACK_SIZE);
 static struct k_poll_signal hbuf_signal;
 static sys_slist_t hbuf_pend;
 static int32_t hbuf_count;
-#endif
-
-#define BT_HCI_EVT_FLAG_RECV_PRIO BIT(0)
-#define BT_HCI_EVT_FLAG_RECV      BIT(1)
-
-/** @brief Get HCI event flags.
- *
- * Helper for the HCI driver to get HCI event flags that describes rules that.
- * must be followed.
- *
- * @param evt HCI event code.
- *
- * @return HCI event flags for the specified event.
- */
-static inline uint8_t bt_hci_evt_get_flags(uint8_t evt)
-{
-	switch (evt) {
-	case BT_HCI_EVT_DISCONN_COMPLETE:
-		return BT_HCI_EVT_FLAG_RECV | BT_HCI_EVT_FLAG_RECV_PRIO;
-		/* fallthrough */
-#if defined(CONFIG_BT_CONN) || defined(CONFIG_BT_ISO)
-	case BT_HCI_EVT_NUM_COMPLETED_PACKETS:
-#if defined(CONFIG_BT_CONN)
-	case BT_HCI_EVT_DATA_BUF_OVERFLOW:
-		__fallthrough;
-#endif /* defined(CONFIG_BT_CONN) */
-#endif /* CONFIG_BT_CONN ||  CONFIG_BT_ISO */
-	case BT_HCI_EVT_CMD_COMPLETE:
-	case BT_HCI_EVT_CMD_STATUS:
-		return BT_HCI_EVT_FLAG_RECV_PRIO;
-	default:
-		return BT_HCI_EVT_FLAG_RECV;
-	}
-}
-
-/* Copied here from `hci_raw.c`, which would be used in
- * conjunction with this driver when serializing HCI over wire.
- * This serves as a converter from the historical (removed from
- * tree) 'recv blocking' API to the normal single-receiver
- * `bt_recv` API.
- */
-static int bt_recv_prio(const struct device *dev, struct net_buf *buf)
-{
-	struct hci_driver_data *data = dev->data;
-
-	if (bt_buf_get_type(buf) == BT_BUF_EVT) {
-		struct bt_hci_evt_hdr *hdr = (void *)buf->data;
-		uint8_t evt_flags = bt_hci_evt_get_flags(hdr->evt);
-
-		if ((evt_flags & BT_HCI_EVT_FLAG_RECV_PRIO) &&
-		    (evt_flags & BT_HCI_EVT_FLAG_RECV)) {
-			/* Avoid queuing the event twice */
-			return 0;
-		}
-	}
-
-	return data->recv(dev, buf);
-}
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 #if defined(CONFIG_BT_CTLR_ISO)
-
 #define SDU_HCI_HDR_SIZE (BT_HCI_ISO_HDR_SIZE + BT_HCI_ISO_SDU_TS_HDR_SIZE)
 
 isoal_status_t sink_sdu_alloc_hci(const struct isoal_sink    *sink_ctx,
@@ -176,7 +115,7 @@ isoal_status_t sink_sdu_emit_hci(const struct isoal_sink             *sink_ctx,
 				 const struct isoal_emitted_sdu      *sdu)
 {
 	const struct device *dev = DEVICE_DT_GET(DT_DRV_INST(0));
-	struct hci_driver_data *data = dev->data;
+	const struct hci_driver_data *data = dev->data;
 	struct bt_hci_iso_sdu_ts_hdr *sdu_hdr;
 	uint16_t packet_status_flag;
 	struct bt_hci_iso_hdr *hdr;
@@ -279,21 +218,68 @@ isoal_status_t sink_sdu_write_hci(void *dbuf,
 
 	return ISOAL_STATUS_OK;
 }
-#endif
+#endif /* CONFIG_BT_CTLR_ISO */
 
-void hci_recv_fifo_reset(void)
+#if defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+struct k_thread prio_recv_thread_data;
+static K_KERNEL_STACK_DEFINE(prio_recv_thread_stack,
+			     CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE);
+
+#define BT_HCI_EVT_FLAG_RECV_PRIO BIT(0)
+#define BT_HCI_EVT_FLAG_RECV      BIT(1)
+
+/** @brief Get HCI event flags.
+ *
+ * Helper for the HCI driver to get HCI event flags that describes rules that.
+ * must be followed.
+ *
+ * @param evt HCI event code.
+ *
+ * @return HCI event flags for the specified event.
+ */
+static inline uint8_t bt_hci_evt_get_flags(uint8_t evt)
 {
-	/* NOTE: As there is no equivalent API to wake up a waiting thread and
-	 * reinitialize the queue so it is empty, we use the cancel wait and
-	 * initialize the queue. As the Tx thread and Rx thread are co-operative
-	 * we should be relatively safe doing the below.
-	 * Added k_sched_lock and k_sched_unlock, as native_posix seems to
-	 * swap to waiting thread on call to k_fifo_cancel_wait!.
-	 */
-	k_sched_lock();
-	k_fifo_cancel_wait(&recv_fifo);
-	k_fifo_init(&recv_fifo);
-	k_sched_unlock();
+	switch (evt) {
+	case BT_HCI_EVT_DISCONN_COMPLETE:
+		return BT_HCI_EVT_FLAG_RECV | BT_HCI_EVT_FLAG_RECV_PRIO;
+		/* fallthrough */
+#if defined(CONFIG_BT_CONN) || defined(CONFIG_BT_ISO)
+	case BT_HCI_EVT_NUM_COMPLETED_PACKETS:
+#if defined(CONFIG_BT_CONN)
+	case BT_HCI_EVT_DATA_BUF_OVERFLOW:
+		__fallthrough;
+#endif /* CONFIG_BT_CONN */
+#endif /* CONFIG_BT_CONN ||  CONFIG_BT_ISO */
+	case BT_HCI_EVT_CMD_COMPLETE:
+	case BT_HCI_EVT_CMD_STATUS:
+		return BT_HCI_EVT_FLAG_RECV_PRIO;
+	default:
+		return BT_HCI_EVT_FLAG_RECV;
+	}
+}
+
+/* Copied here from `hci_raw.c`, which would be used in
+ * conjunction with this driver when serializing HCI over wire.
+ * This serves as a converter from the historical (removed from
+ * tree) 'recv blocking' API to the normal single-receiver
+ * `bt_recv` API.
+ */
+static int bt_recv_prio(const struct device *dev, struct net_buf *buf)
+{
+	const struct hci_driver_data *data = dev->data;
+
+	if (bt_buf_get_type(buf) == BT_BUF_EVT) {
+		struct bt_hci_evt_hdr *hdr = (void *)buf->data;
+		uint8_t evt_flags = bt_hci_evt_get_flags(hdr->evt);
+
+		if ((evt_flags & BT_HCI_EVT_FLAG_RECV_PRIO) &&
+		    (evt_flags & BT_HCI_EVT_FLAG_RECV)) {
+			/* Avoid queuing the event twice */
+			return 0;
+		}
+	}
+
+	return data->recv(dev, buf);
 }
 
 static struct net_buf *process_prio_evt(struct node_rx_pdu *node_rx,
@@ -341,8 +327,6 @@ static void prio_recv_thread(void *p1, void *p2, void *p3)
 		uint8_t num_cmplt;
 		uint16_t handle;
 
-		iso_received = false;
-
 #if defined(CONFIG_BT_CTLR_SYNC_ISO) || defined(CONFIG_BT_CTLR_CONN_ISO)
 		node_rx = ll_iso_rx_get();
 		if (node_rx) {
@@ -358,21 +342,29 @@ static void prio_recv_thread(void *p1, void *p2, void *p3)
 			k_fifo_put(&recv_fifo, node_rx);
 
 			iso_received = true;
+		} else {
+			iso_received = false;
 		}
-#endif /* CONFIG_BT_CTLR_SYNC_ISO || CONFIG_BT_CTLR_CONN_ISO */
+
+#else /* !CONFIG_BT_CTLR_SYNC_ISO && !CONFIG_BT_CTLR_CONN_ISO */
+		iso_received = false;
+#endif /* !CONFIG_BT_CTLR_SYNC_ISO && !CONFIG_BT_CTLR_CONN_ISO */
 
 		/* While there are completed rx nodes */
 		while ((num_cmplt = ll_rx_get((void *)&node_rx, &handle))) {
-#if defined(CONFIG_BT_CONN) || defined(CONFIG_BT_CTLR_ADV_ISO) || \
-	defined(CONFIG_BT_CTLR_CONN_ISO)
+#if defined(CONFIG_BT_CONN) || defined(CONFIG_BT_CTLR_ADV_ISO)
+			int err;
 
 			buf = bt_buf_get_evt(BT_HCI_EVT_NUM_COMPLETED_PACKETS,
 					     false, K_FOREVER);
 			hci_num_cmplt_encode(buf, handle, num_cmplt);
 			LOG_DBG("Num Complete: 0x%04x:%u", handle, num_cmplt);
-			bt_recv_prio(dev, buf);
+
+			err = bt_recv_prio(dev, buf);
+			LL_ASSERT(err == 0);
+
 			k_yield();
-#endif /* CONFIG_BT_CONN || CONFIG_BT_CTLR_ADV_ISO || CONFIG_BT_CTLR_CONN_ISO */
+#endif /* CONFIG_BT_CONN || CONFIG_BT_CTLR_ADV_ISO */
 		}
 
 		if (node_rx) {
@@ -388,13 +380,17 @@ static void prio_recv_thread(void *p1, void *p2, void *p3)
 
 			buf = process_prio_evt(node_rx, &evt_flags);
 			if (buf) {
+				int err;
+
 				LOG_DBG("Priority event");
 				if (!(evt_flags & BT_HCI_EVT_FLAG_RECV)) {
 					node_rx->hdr.next = NULL;
 					ll_rx_mem_release((void **)&node_rx);
 				}
 
-				bt_recv_prio(dev, buf);
+				err = bt_recv_prio(dev, buf);
+				LL_ASSERT(err == 0);
+
 				/* bt_recv_prio would not release normal evt
 				 * buf.
 				 */
@@ -425,12 +421,114 @@ static void prio_recv_thread(void *p1, void *p2, void *p3)
 		 * Blocking-take of the semaphore; we take it once ULL mayfly
 		 * has let it go in ll_rx_sched().
 		 */
-		k_sem_take(&sem_prio_recv, K_FOREVER);
+		k_sem_take(&sem_recv, K_FOREVER);
 		/* Now, ULL mayfly has something to give to us */
 		LOG_DBG("sem taken");
 	}
 }
 
+#else /* !CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+static void node_rx_recv(const struct device *dev)
+{
+#if defined(CONFIG_BT_CONN) || defined(CONFIG_BT_CTLR_ADV_ISO)
+	const struct hci_driver_data *data = dev->data;
+#endif /* CONFIG_BT_CONN || CONFIG_BT_CTLR_ADV_ISO */
+
+	struct node_rx_pdu *node_rx;
+	bool iso_received = false;
+
+	do {
+		uint8_t num_cmplt;
+		uint16_t handle;
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO) || defined(CONFIG_BT_CTLR_CONN_ISO)
+		node_rx = ll_iso_rx_get();
+		if (node_rx != NULL) {
+			ll_iso_rx_dequeue();
+
+			/* Find out and store the class for this node */
+			node_rx->hdr.user_meta = hci_get_class(node_rx);
+
+			/* Send the rx node up to Host thread,
+			 * recv_thread()
+			 */
+			LOG_DBG("ISO RX node enqueue");
+			k_fifo_put(&recv_fifo, node_rx);
+
+			iso_received = true;
+		} else {
+			iso_received = false;
+		}
+#endif /* CONFIG_BT_CTLR_SYNC_ISO || CONFIG_BT_CTLR_CONN_ISO */
+
+		/* While there are completed rx nodes */
+		num_cmplt = ll_rx_get((void *)&node_rx, &handle);
+		while (num_cmplt != 0U) {
+#if defined(CONFIG_BT_CONN) || defined(CONFIG_BT_CTLR_ADV_ISO)
+			struct net_buf *buf;
+
+			LL_ASSERT(node_rx == NULL);
+
+			buf = bt_buf_get_evt(BT_HCI_EVT_NUM_COMPLETED_PACKETS,
+					     false, K_FOREVER);
+			hci_num_cmplt_encode(buf, handle, num_cmplt);
+
+			LOG_DBG("Num Complete: 0x%04x:%u", handle, num_cmplt);
+
+			data->recv(dev, buf);
+			k_yield();
+
+#else /* !CONFIG_BT_CONN && !CONFIG_BT_CTLR_ADV_ISO */
+			LL_ASSERT(0);
+#endif /* !CONFIG_BT_CONN && !CONFIG_BT_CTLR_ADV_ISO */
+
+			num_cmplt = ll_rx_get((void *)&node_rx, &handle);
+		}
+
+		if (node_rx != NULL) {
+			/* Until now we've only peeked, now we really do
+			 * the handover
+			 */
+			ll_rx_dequeue();
+
+			/* Find out and store the class for this node */
+			node_rx->hdr.user_meta = hci_get_class(node_rx);
+
+			/* Send the rx node up to Host thread, recv_thread()
+			 */
+			LOG_DBG("RX node enqueue");
+			k_fifo_put(&recv_fifo, node_rx);
+		}
+
+		/* There may still be completed nodes, continue pushing all those up to Host before
+		 * waiting/polling for sem_recv.
+		 */
+	} while (iso_received || (node_rx != NULL));
+}
+
+static int bt_recv(const struct device *dev, struct net_buf *buf)
+{
+	const struct hci_driver_data *data = dev->data;
+
+	return data->recv(dev, buf);
+}
+#endif /* !CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
+void hci_recv_fifo_reset(void)
+{
+	/* NOTE: As there is no equivalent API to wake up a waiting thread and
+	 * reinitialize the queue so it is empty, we use the cancel wait and
+	 * initialize the queue. As the Tx thread and Rx thread are co-operative
+	 * we should be relatively safe doing the below.
+	 * Added k_sched_lock and k_sched_unlock, as native_sim seems to
+	 * swap to waiting thread on call to k_fifo_cancel_wait!.
+	 */
+	k_sched_lock();
+	k_fifo_cancel_wait(&recv_fifo);
+	k_fifo_init(&recv_fifo);
+	k_sched_unlock();
+}
+
 static inline struct net_buf *encode_node(struct node_rx_pdu *node_rx,
 					  int8_t class)
 {
@@ -458,7 +556,8 @@ static inline struct net_buf *encode_node(struct node_rx_pdu *node_rx,
 		buf = bt_buf_get_rx(BT_BUF_ACL_IN, K_FOREVER);
 		hci_acl_encode(node_rx, buf);
 		break;
-#endif
+#endif /* CONFIG_BT_CONN */
+
 #if defined(CONFIG_BT_CTLR_SYNC_ISO) || defined(CONFIG_BT_CTLR_CONN_ISO)
 	case HCI_CLASS_ISO_DATA: {
 		if (false) {
@@ -569,7 +668,7 @@ static inline struct net_buf *process_node(struct node_rx_pdu *node_rx)
 			break;
 		}
 	}
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 	/* process regular node from radio */
 	buf = encode_node(node_rx, class);
@@ -665,7 +764,7 @@ static inline struct net_buf *process_hbuf(struct node_rx_pdu *n)
 
 	return buf;
 }
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
 /**
  * @brief Blockingly pull from Controller thread's recv_fifo
@@ -674,46 +773,86 @@ static inline struct net_buf *process_hbuf(struct node_rx_pdu *n)
 static void recv_thread(void *p1, void *p2, void *p3)
 {
 	const struct device *dev = p1;
-	struct hci_driver_data *data = dev->data;
+	const struct hci_driver_data *data = dev->data;
 
+#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) || !defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+	enum {
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
+		EVENT_SIGNAL,
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+
+#if !defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+		EVENT_SEM,
+#endif /* !CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
+		EVENT_FIFO,
+		EVENT_MAX,
+	};
+
 	/* @todo: check if the events structure really needs to be static */
-	static struct k_poll_event events[2] = {
+	static struct k_poll_event events[EVENT_MAX] = {
+#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 		K_POLL_EVENT_STATIC_INITIALIZER(K_POLL_TYPE_SIGNAL,
 						K_POLL_MODE_NOTIFY_ONLY,
 						&hbuf_signal, 0),
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+
+#if !defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+		K_POLL_EVENT_STATIC_INITIALIZER(K_POLL_TYPE_SEM_AVAILABLE,
+						K_POLL_MODE_NOTIFY_ONLY,
+						&sem_recv, 0),
+#endif /* !CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
 		K_POLL_EVENT_STATIC_INITIALIZER(K_POLL_TYPE_FIFO_DATA_AVAILABLE,
 						K_POLL_MODE_NOTIFY_ONLY,
 						&recv_fifo, 0),
 	};
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL || !CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
 
 	while (1) {
 		struct node_rx_pdu *node_rx = NULL;
 		struct net_buf *buf = NULL;
 
 		LOG_DBG("blocking");
-#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
+
+#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) || !defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
 		int err;
 
-		err = k_poll(events, 2, K_FOREVER);
+		err = k_poll(events, ARRAY_SIZE(events), K_FOREVER);
 		LL_ASSERT(err == 0 || err == -EINTR);
-		if (events[0].state == K_POLL_STATE_SIGNALED) {
-			events[0].signal->signaled = 0U;
-		} else if (events[1].state ==
-			   K_POLL_STATE_FIFO_DATA_AVAILABLE) {
-			node_rx = k_fifo_get(events[1].fifo, K_NO_WAIT);
+
+		if (false) {
+
+#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
+		} else if (events[EVENT_SIGNAL].state == K_POLL_STATE_SIGNALED) {
+			events[EVENT_SIGNAL].signal->signaled = 0U;
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
+
+#if !defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+		} else if (events[EVENT_SEM].state == K_POLL_STATE_SEM_AVAILABLE) {
+			err = k_sem_take(events[EVENT_SEM].sem, K_NO_WAIT);
+			LL_ASSERT(err == 0);
+
+			node_rx_recv(dev);
+#endif /* !CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
+		} else if (events[EVENT_FIFO].state == K_POLL_STATE_FIFO_DATA_AVAILABLE) {
+			node_rx = k_fifo_get(events[EVENT_FIFO].fifo, K_NO_WAIT);
 		}
 
-		events[0].state = K_POLL_STATE_NOT_READY;
-		events[1].state = K_POLL_STATE_NOT_READY;
+		for (size_t i = 0; i < ARRAY_SIZE(events); i++) {
+			events[i].state = K_POLL_STATE_NOT_READY;
+		}
 
+#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 		/* process host buffers first if any */
 		buf = process_hbuf(node_rx);
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
-#else
+#else /* !CONFIG_BT_HCI_ACL_FLOW_CONTROL && CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
 		node_rx = k_fifo_get(&recv_fifo, K_FOREVER);
-#endif
+#endif /* !CONFIG_BT_HCI_ACL_FLOW_CONTROL && CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
 		LOG_DBG("unblocked");
 
 		if (node_rx && !buf) {
@@ -748,20 +887,26 @@ static int cmd_handle(const struct device *dev, struct net_buf *buf)
 {
 	struct node_rx_pdu *node_rx = NULL;
 	struct net_buf *evt;
+	int err = 0;
 
 	evt = hci_cmd_handle(buf, (void **) &node_rx);
 	if (evt) {
 		LOG_DBG("Replying with event of %u bytes", evt->len);
-		bt_recv_prio(dev, evt);
 
-		if (node_rx) {
+#if defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+		err = bt_recv_prio(dev, evt);
+#else /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+		err = bt_recv(dev, evt);
+#endif /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+
+		if ((err == 0) && (node_rx != NULL)) {
 			LOG_DBG("RX node enqueue");
 			node_rx->hdr.user_meta = hci_get_class(node_rx);
 			k_fifo_put(&recv_fifo, node_rx);
 		}
 	}
 
-	return 0;
+	return err;
 }
 
 #if defined(CONFIG_BT_CONN)
@@ -773,7 +918,12 @@ static int acl_handle(const struct device *dev, struct net_buf *buf)
 	err = hci_acl_handle(buf, &evt);
 	if (evt) {
 		LOG_DBG("Replying with event of %u bytes", evt->len);
-		bt_recv_prio(dev, evt);
+
+#if defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+		err = bt_recv_prio(dev, evt);
+#else /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+		err = bt_recv(dev, evt);
+#endif /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
 	}
 
 	return err;
@@ -789,7 +939,12 @@ static int iso_handle(const struct device *dev, struct net_buf *buf)
 	err = hci_iso_handle(buf, &evt);
 	if (evt) {
 		LOG_DBG("Replying with event of %u bytes", evt->len);
-		bt_recv_prio(dev, evt);
+
+#if defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
+		err = bt_recv_prio(dev, evt);
+#else /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
+		err = bt_recv(dev, evt);
+#endif /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
 	}
 
 	return err;
@@ -845,9 +1000,9 @@ static int hci_driver_open(const struct device *dev, bt_hci_recv_t recv)
 	DEBUG_INIT();
 
 	k_fifo_init(&recv_fifo);
-	k_sem_init(&sem_prio_recv, 0, K_SEM_MAX_LIMIT);
+	k_sem_init(&sem_recv, 0, K_SEM_MAX_LIMIT);
 
-	err = ll_init(&sem_prio_recv);
+	err = ll_init(&sem_recv);
 	if (err) {
 		LOG_ERR("LL initialization failed: %d", err);
 		return err;
@@ -858,15 +1013,17 @@ static int hci_driver_open(const struct device *dev, bt_hci_recv_t recv)
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 	k_poll_signal_init(&hbuf_signal);
 	hci_init(&hbuf_signal);
-#else
+#else /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 	hci_init(NULL);
-#endif
+#endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
+#if defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
 	k_thread_create(&prio_recv_thread_data, prio_recv_thread_stack,
 			K_KERNEL_STACK_SIZEOF(prio_recv_thread_stack),
 			prio_recv_thread, (void *)dev, NULL, NULL,
 			K_PRIO_COOP(CONFIG_BT_DRIVER_RX_HIGH_PRIO), 0, K_NO_WAIT);
 	k_thread_name_set(&prio_recv_thread_data, "BT RX pri");
+#endif /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
 
 	k_thread_create(&recv_thread_data, recv_thread_stack,
 			K_KERNEL_STACK_SIZEOF(recv_thread_stack),
@@ -888,8 +1045,10 @@ static int hci_driver_close(const struct device *dev)
 	err = ll_deinit();
 	LL_ASSERT(!err);
 
+#if defined(CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE)
 	/* Abort prio RX thread */
 	k_thread_abort(&prio_recv_thread_data);
+#endif /* CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE */
 
 	/* Abort RX thread */
 	k_thread_abort(&recv_thread_data);
diff --git a/subsys/bluetooth/controller/ll_sw/lll.h b/subsys/bluetooth/controller/ll_sw/lll.h
index 3abddb9e8fabe..9b890315cfd91 100644
--- a/subsys/bluetooth/controller/ll_sw/lll.h
+++ b/subsys/bluetooth/controller/ll_sw/lll.h
@@ -32,10 +32,6 @@
 /* Intervals after which connection or sync establishment is considered lost */
 #define CONN_ESTAB_COUNTDOWN 6U
 
-#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
-#define XON_BITMASK BIT(31) /* XTAL has been retained from previous prepare */
-#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
-
 #if defined(CONFIG_BT_BROADCASTER)
 #if defined(CONFIG_BT_CTLR_ADV_SET)
 #define BT_CTLR_ADV_SET CONFIG_BT_CTLR_ADV_SET
@@ -213,19 +209,7 @@ struct ull_hdr {
 				*/
 
 	/* Event parameters */
-	/* TODO: The intention is to use the greater of the
-	 *       ticks_prepare_to_start or ticks_active_to_start as the prepare
-	 *       offset. At the prepare tick generate a software interrupt
-	 *       serviceable by application as the per role configurable advance
-	 *       radio event notification, usable for data acquisitions.
-	 *       ticks_preempt_to_start is the per role dynamic preempt offset,
-	 *       which shall be based on role's preparation CPU usage
-	 *       requirements.
-	 */
 	struct {
-		uint32_t ticks_active_to_start;
-		uint32_t ticks_prepare_to_start;
-		uint32_t ticks_preempt_to_start;
 		uint32_t ticks_slot;
 	};
 
diff --git a/subsys/bluetooth/controller/ll_sw/lll_adv.h b/subsys/bluetooth/controller/ll_sw/lll_adv.h
index 94a3035f42bea..5f56f902d196f 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_adv.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_adv.h
@@ -18,6 +18,17 @@ struct lll_adv_iso_stream {
 	uint16_t pkt_seq_num;
 };
 
+struct lll_adv_iso_data_chan {
+	uint16_t prn_s;
+	uint16_t remap_idx;
+};
+
+struct lll_adv_iso_data_chan_interleaved {
+	uint16_t prn_s;
+	uint16_t remap_idx;
+	uint16_t id;
+};
+
 struct lll_adv_iso {
 	struct lll_hdr hdr;
 	struct lll_adv *adv;
@@ -26,8 +37,14 @@ struct lll_adv_iso {
 	uint8_t base_crc_init[2];
 	uint16_t latency_prepare;
 	uint16_t latency_event;
-	uint16_t data_chan_prn_s;
-	uint16_t data_chan_remap_idx;
+	union {
+		struct lll_adv_iso_data_chan data_chan;
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED)
+		struct lll_adv_iso_data_chan_interleaved
+			interleaved_data_chan[BT_CTLR_ADV_ISO_STREAM_MAX];
+#endif /* CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED */
+	};
 	uint8_t  next_chan_use;
 
 	uint64_t payload_count:39;
diff --git a/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h b/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h
index 676c574155e41..884d1322dbc53 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_conn_iso.h
@@ -58,6 +58,14 @@ struct lll_conn_iso_stream {
 	uint8_t datapath_ready_rx:1;/* 1 if datapath for RX is ready */
 
 #if !defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
+	/* A CIS LLL is active and prepared in a CIG radio event when ACL instant has passed
+	 * which set the `active` flag and then when CIG event prepare in LLL has picked up the set
+	 * `active` flag.
+	 * FIXME: There is suspected possibility that ACL ULL Prepare that is processing LLCP could
+	 *        execute between CIG ULL Prepare and deferred CIG LLL Prepare say when there is
+	 *        already another state/role that the CIG tries to pre-empt.
+	 */
+	uint8_t prepared:1;
 	/* Lazy at CIS active. Number of previously skipped CIG events that is
 	 * determined when CIS is made active and subtracted from total CIG
 	 * events that where skipped when this CIS gets to use radio for the
diff --git a/subsys/bluetooth/controller/ll_sw/lll_sync_iso.h b/subsys/bluetooth/controller/ll_sw/lll_sync_iso.h
index 6dd6a0907a571..6e295100437b0 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_sync_iso.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_sync_iso.h
@@ -11,6 +11,17 @@ struct lll_sync_iso_stream {
 	struct ll_iso_datapath *dp;
 };
 
+struct lll_sync_iso_data_chan {
+	uint16_t prn_s;
+	uint16_t remap_idx;
+};
+
+struct lll_sync_iso_data_chan_interleaved {
+	uint16_t prn_s;
+	uint16_t remap_idx;
+	uint16_t id;
+};
+
 struct lll_sync_iso {
 	struct lll_hdr hdr;
 
@@ -21,8 +32,15 @@ struct lll_sync_iso {
 
 	uint16_t latency_prepare;
 	uint16_t latency_event;
-	uint16_t data_chan_prn_s;
-	uint16_t data_chan_remap_idx;
+	union {
+		struct lll_sync_iso_data_chan data_chan;
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+		struct lll_sync_iso_data_chan_interleaved
+			interleaved_data_chan[BT_CTLR_SYNC_ISO_STREAM_MAX];
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
+	};
+	uint8_t  next_chan_use;
 
 	uint64_t payload_count:39;
 	uint64_t framing:1;
@@ -55,11 +73,8 @@ struct lll_sync_iso {
 	uint8_t bis_curr:5;
 
 	uint8_t stream_curr:5;
-
 	uint8_t establish_events:3;
 
-	uint8_t next_chan_use;
-
 	/* Encryption */
 	uint8_t giv[8];
 	struct ccm ccm_rx;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c
index 500720ba35709..1f5c810bc2aed 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c
@@ -399,7 +399,7 @@ void radio_switch_complete_and_phy_end_b2b_tx(uint8_t phy_curr, uint8_t flags_cu
 					      uint8_t phy_next, uint8_t flags_next)
 {
 #if defined(CONFIG_BT_CTLR_TIFS_HW)
-	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk |
+	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk |
 			    RADIO_SHORTS_DISABLED_TXEN_Msk;
 #else /* !CONFIG_BT_CTLR_TIFS_HW */
 	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
index 06aea328eaf46..4dabe97d910bf 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -89,7 +89,8 @@ static inline void hal_radio_disable_on_hcto_ppi_config(void)
  */
 static inline void hal_radio_end_time_capture_ppi_config(void)
 {
-	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_EVENT_END, HAL_RADIO_END_TIME_CAPTURE_PPI);
+	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_EVENT_END,
+			      HAL_RADIO_END_TIME_CAPTURE_PPI);
 	nrf_timer_subscribe_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_END_TASK,
 				HAL_RADIO_END_TIME_CAPTURE_PPI);
 }
@@ -230,15 +231,15 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
 
 /******************************************************************************/
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
-
 /* DPPI setup used for SW-based auto-switching during TIFS. */
-#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-#define HAL_NRF_RADIO_TIFS_DPPI_EVENT_END HAL_NRF_RADIO_EVENT_END
-#define HAL_RADIO_TIFS_DPPI_PUBLISH_END   HAL_RADIO_PUBLISH_END
-#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
-#define HAL_NRF_RADIO_TIFS_DPPI_EVENT_END HAL_NRF_RADIO_EVENT_PHYEND
-#define HAL_RADIO_TIFS_DPPI_PUBLISH_END   HAL_RADIO_PUBLISH_PHYEND
-#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+
+#if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER) && !defined(CONFIG_BT_CTLR_DF)
+#define HAL_NRF_RADIO_TIMER_CLEAR_EVENT_END     HAL_NRF_RADIO_EVENT_END
+#define HAL_RADIO_GROUP_TASK_ENABLE_PUBLISH_END HAL_RADIO_PUBLISH_END
+#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER || CONFIG_BT_CTLR_DF */
+#define HAL_NRF_RADIO_TIMER_CLEAR_EVENT_END     HAL_NRF_RADIO_EVENT_PHYEND
+#define HAL_RADIO_GROUP_TASK_ENABLE_PUBLISH_END HAL_RADIO_PUBLISH_PHYEND
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER || CONFIG_BT_CTLR_DF */
 
 /* Clear SW-switch timer on packet end:
  * wire the RADIO EVENTS_END event to SW_SWITCH_TIMER TASKS_CLEAR task.
@@ -250,7 +251,7 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
  */
 static inline void hal_sw_switch_timer_clear_ppi_config(void)
 {
-	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_TIFS_DPPI_EVENT_END,
+	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_TIMER_CLEAR_EVENT_END,
 			      HAL_SW_SWITCH_TIMER_CLEAR_PPI);
 	nrf_timer_subscribe_set(SW_SWITCH_TIMER,
 				NRF_TIMER_TASK_CLEAR, HAL_SW_SWITCH_TIMER_CLEAR_PPI);
@@ -321,7 +322,7 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
  * a PPI to publish RADIO END event.
  */
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_REGISTER_EVT \
-	(NRF_RADIO->HAL_RADIO_TIFS_DPPI_PUBLISH_END)
+	(NRF_RADIO->HAL_RADIO_GROUP_TASK_ENABLE_PUBLISH_END)
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_EVT \
 	(((HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI << \
 		RADIO_PUBLISH_END_CHIDX_Pos) \
@@ -528,8 +529,10 @@ static inline void hal_radio_sw_switch_cleanup(void)
 {
 	hal_radio_sw_switch_disable();
 	nrf_dppi_channels_disable(NRF_DPPIC,
-				  (BIT(HAL_SW_SWITCH_TIMER_CLEAR_PPI) |
-				   BIT(HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI)));
+#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+				  BIT(HAL_SW_SWITCH_TIMER_CLEAR_PPI) |
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+				  BIT(HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI));
 	nrf_dppi_group_disable(NRF_DPPIC, SW_SWITCH_TIMER_TASK_GROUP(0));
 	nrf_dppi_group_disable(NRF_DPPIC, SW_SWITCH_TIMER_TASK_GROUP(1));
 }
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
index 05445e1fb48bc..d9ead6803a9d2 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
@@ -170,18 +170,18 @@ static inline void hal_radio_end_time_capture_ppi_config(void)
 	/* No need to configure anything for the pre-programmed channel. */
 }
 
-#else
+#else /* !(EVENT_TIMER_ID == 0) */
 
 static inline void hal_radio_end_time_capture_ppi_config(void)
 {
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_END_TIME_CAPTURE_PPI,
-		(uint32_t)&(NRF_RADIO->HAL_RADIO_TRX_EVENTS_END),
+		(uint32_t)&(NRF_RADIO->HAL_RADIO_EVENTS_END),
 		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[HAL_EVENT_TIMER_TRX_END_CC_OFFSET]));
 }
 
-#endif /* (EVENT_TIMER_ID == 0) */
+#endif /* !(EVENT_TIMER_ID == 0) */
 
 /*******************************************************************************
  * Start event timer on RTC tick:
@@ -307,7 +307,7 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 		(uint32_t)&(SW_SWITCH_TIMER->TASKS_CLEAR));
 }
 
-#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#else /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 /* Clear event timer (sw-switch timer) on Radio end:
  * wire the RADIO EVENTS_END event to the
@@ -325,7 +325,7 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 		(uint32_t)&(SW_SWITCH_TIMER->TASKS_CLEAR));
 }
 
-#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 /* The 2 adjacent PPI groups used for implementing SW_SWITCH_TIMER-based
  * auto-switch for TIFS. 'index' must be 0 or 1.
@@ -453,11 +453,15 @@ static inline void hal_radio_sw_switch_disable(void)
 {
 	/* Disable the following PPI channels that implement SW Switch:
 	 * - Clearing SW SWITCH TIMER on RADIO END event
+	 *   - Do not clear for single timer use as it uses the same PPI as
+	 *     end time capture
 	 * - Enabling SW SWITCH PPI Group on RADIO END event
 	 */
 	nrf_ppi_channels_disable(
 		NRF_PPI,
+#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 		BIT(HAL_SW_SWITCH_TIMER_CLEAR_PPI) |
+#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 		BIT(HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI));
 
 	/* Invalidation of subscription of S2 timer Compare used when
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
index 8bd540bbfa658..a60b27e248246 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_resources.h
@@ -18,7 +18,8 @@
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
  */
-#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END    HAL_RADIO_EVENTS_END
+#define HAL_NRF_RADIO_TRX_EVENT_END HAL_NRF_RADIO_EVENT_END
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
  * This is a default shortcut used to automatically disable Radio after end of PDU.
@@ -62,59 +63,62 @@
  */
 #define HAL_RADIO_ISR_LATENCY_MAX_US 80U
 
-#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
-/* Delay of CCM TASKS_CRYPT start in number of bits for Radio Bit counter */
-#define CCM_TASKS_CRYPT_DELAY_BITS 3
-#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
+#define SW_SWITCH_TIMER_EVTS_COMP_BASE 4
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
-#define SW_SWITCH_TIMER_EVTS_COMP_BASE 4
 #define SW_SWITCH_TIMER_EVTS_COMP_S2_BASE 6
+#endif /* !CONFIG_BT_CTLR_PHY_CODED */
+
+#if defined(CONFIG_BT_CTLR_DF)
+#if defined(CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE)
+/* Allocate 2 adjacent channels for PHYEND delay compensation. Use the same channels as for
+ * PHY CODED S2. The CTEINLINE may not be enabled for PHY CODED so PHYEND event is generated
+ * at the same instant as END event. Hence the channels are used interchangeably.
+ * That saves from use of another timer.
+ */
+#define SW_SWITCH_TIMER_EVTS_COMP_PHYEND_DELAY_COMPENSATION_BASE 6
+#endif /* CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE */
 
 /* Wrapper for EVENTS_END event generated by Radio peripheral at the very end of the transmission
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
+ *
+ * When direction finding is enabled a PDU may include Constant Tone Extension at its end. For PDU
+ * including CTE EVENTS_PHYEND event is generated at very end of a PDU. In case there is no CTE in
+ * a PDU the EVENTS_PHYEND event is generated in the same instant as EVENTS_END event.
  */
-#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END    HAL_RADIO_EVENTS_PHYEND
+#define HAL_NRF_RADIO_TRX_EVENT_END HAL_NRF_RADIO_EVENT_PHYEND
 
-/* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
- * This is a default shortcut used to automatically disable Radio after end of PDU.
+/* Wrapper for RADIO_SHORTS mask connecting EVENTS_PHYEND to EVENTS_DISABLE.
+ * This is a mask for SOC that has Direction Finding Extension in a Radio peripheral.
+ * It enables shortcut for EVENTS_PHYEND event generated at very end to Radio EVENTS_DISABLE event.
+ * In case there is a CTE in a PDU then EVENTS_PHYEND event is generated after the CTE.
+ * If there is no CTE, it is generated in the same instant as EVENTS_END.
  */
-#define NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk
-
-#define HAL_EVENT_TIMER_TRX_CC_OFFSET          0
-#define HAL_EVENT_TIMER_TRX_EVENT              NRF_TIMER_EVENT_COMPARE0
-#define HAL_EVENT_TIMER_READY_TASK             NRF_TIMER_TASK_CAPTURE0
-
-#define HAL_EVENT_TIMER_HCTO_CC_OFFSET         1
-#define HAL_EVENT_TIMER_HCTO_EVENT             NRF_TIMER_EVENT_COMPARE1
-#define HAL_EVENT_TIMER_ADDRESS_TASK           NRF_TIMER_TASK_CAPTURE1
-
-#define HAL_EVENT_TIMER_TRX_END_CC_OFFSET      2
-#define HAL_EVENT_TIMER_TRX_END_TASK           NRF_TIMER_TASK_CAPTURE2
-
-#define HAL_EVENT_TIMER_DEFERRED_TRX_CC_OFFSET 2
-#define HAL_EVENT_TIMER_DEFERRED_TX_EVENT      NRF_TIMER_EVENT_COMPARE2
-
-#define HAL_EVENT_TIMER_SAMPLE_CC_OFFSET       3
-#define HAL_EVENT_TIMER_SAMPLE_TASK            NRF_TIMER_TASK_CAPTURE3
+#define NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk HAL_RADIO_SHORTS_TRX_PHYEND_DISABLE_Msk
 
-#define HAL_EVENT_TIMER_PA_LNA_CC_OFFSET       2
-#define HAL_EVENT_TIMER_PA_LNA_PDN_CC_OFFSET   3
+/* Delay of EVENTS_PHYEND event on receive PDU without CTE included when CTEINLINE is enabled */
+#define RADIO_EVENTS_PHYEND_DELAY_US 16
 
-#else /* !CONFIG_BT_CTLR_PHY_CODED */
-#define SW_SWITCH_TIMER_EVTS_COMP_BASE 4
+#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
+/* Delay of CCM TASKS_CRYPT start in number of bits for Radio Bit counter */
+#define CCM_TASKS_CRYPT_DELAY_BITS 3
+#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
 
+#else /* !CONFIG_BT_CTLR_DF */
 /* Wrapper for EVENTS_END event generated by Radio peripheral at the very end of the transmission
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
  */
-#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END    HAL_RADIO_EVENTS_END
+#define HAL_NRF_RADIO_TRX_EVENT_END HAL_NRF_RADIO_EVENT_END
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
  * This is a default shortcut used to automatically disable Radio after end of PDU.
  */
 #define NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk HAL_RADIO_SHORTS_TRX_END_DISABLE_Msk
+#endif /* !CONFIG_BT_CTLR_DF */
 
 #define HAL_EVENT_TIMER_TRX_CC_OFFSET          0
 #define HAL_EVENT_TIMER_TRX_EVENT              NRF_TIMER_EVENT_COMPARE0
@@ -135,7 +139,6 @@
 
 #define HAL_EVENT_TIMER_PA_LNA_CC_OFFSET       2
 #define HAL_EVENT_TIMER_PA_LNA_PDN_CC_OFFSET   3
-#endif /* !CONFIG_BT_CTLR_PHY_CODED */
 
 #else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 #define EVENT_TIMER_ID 0
@@ -155,7 +158,6 @@
 #endif /* !CONFIG_BT_CTLR_PHY_CODED */
 
 #if defined(CONFIG_BT_CTLR_DF)
-
 #if defined(CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE)
 /* Allocate 2 adjacent channels for PHYEND delay compensation. Use the same channels as for
  * PHY CODED S2. The CTEINLINE may not be enabled for PHY CODED so PHYEND event is generated
@@ -173,7 +175,8 @@
  * including CTE EVENTS_PHYEND event is generated at very end of a PDU. In case there is no CTE in
  * a PDU the EVENTS_PHYEND event is generated in the same instant as EVENTS_END event.
  */
-#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_PHYEND
+#define HAL_RADIO_TRX_EVENTS_END    HAL_RADIO_EVENTS_PHYEND
+#define HAL_NRF_RADIO_TRX_EVENT_END HAL_NRF_RADIO_EVENT_PHYEND
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_PHYEND to EVENTS_DISABLE.
  * This is a mask for SOC that has Direction Finding Extension in a Radio peripheral.
@@ -196,7 +199,8 @@
  * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
  * received or transmitted.
  */
-#define HAL_RADIO_TRX_EVENTS_END HAL_RADIO_EVENTS_END
+#define HAL_RADIO_TRX_EVENTS_END    HAL_RADIO_EVENTS_END
+#define HAL_NRF_RADIO_TRX_EVENT_END HAL_NRF_RADIO_EVENT_END
 
 /* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
  * This is a default shortcut used to automatically disable Radio after end of PDU.
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index ebfdf364941ea..d3e1f77b3553e 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -612,16 +612,7 @@ void lll_abort_cb(struct lll_prepare_param *prepare_param, void *param)
 
 uint32_t lll_event_offset_get(struct ull_hdr *ull)
 {
-	if (0) {
-#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
-	} else if (ull->ticks_prepare_to_start & XON_BITMASK) {
-		return MAX(ull->ticks_active_to_start,
-			   ull->ticks_preempt_to_start);
-#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
-	} else {
-		return MAX(ull->ticks_active_to_start,
-			   ull->ticks_prepare_to_start);
-	}
+	return HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 }
 
 uint32_t lll_preempt_calc(struct ull_hdr *ull, uint8_t ticker_id,
@@ -1108,9 +1099,8 @@ static uint32_t preempt_ticker_start(struct lll_event *first,
 		p = &next->prepare_param;
 		ull = HDR_LLL2ULL(p->param);
 		preempt_anchor = p->ticks_at_expire;
-		preempt_to = MAX(ull->ticks_active_to_start,
-				 ull->ticks_prepare_to_start) -
-			     ull->ticks_preempt_to_start;
+		preempt_to = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US) -
+			     HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 
 		ticks_at_preempt_new = preempt_anchor + preempt_to;
 		ticks_at_preempt_new &= HAL_TICKER_CNTR_MASK;
@@ -1134,9 +1124,8 @@ static uint32_t preempt_ticker_start(struct lll_event *first,
 		p = &first->prepare_param;
 		ull = HDR_LLL2ULL(p->param);
 		preempt_anchor = p->ticks_at_expire;
-		preempt_to = MAX(ull->ticks_active_to_start,
-				 ull->ticks_prepare_to_start) -
-			     ull->ticks_preempt_to_start;
+		preempt_to = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US) -
+			     HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 
 		ticks_at_preempt_new = preempt_anchor + preempt_to;
 		ticks_at_preempt_new &= HAL_TICKER_CNTR_MASK;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
index 91ca0b1d0c637..0b9ff8d938c20 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
@@ -56,8 +56,13 @@ static void isr_tx_normal(void *param);
 static void isr_tx_common(void *param,
 			  radio_isr_cb_t isr_tx,
 			  radio_isr_cb_t isr_done);
-static void next_chan_calc(struct lll_adv_iso *lll, uint16_t event_counter,
-			   uint16_t data_chan_id);
+#if defined(CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL)
+static void next_chan_calc_seq(struct lll_adv_iso *lll, uint16_t event_counter,
+			       uint16_t data_chan_id);
+#endif /* CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL */
+#if defined(CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED)
+static void next_chan_calc_int(struct lll_adv_iso *lll, uint16_t event_counter);
+#endif /* CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED */
 static void isr_done_create(void *param);
 static void isr_done_term(void *param);
 
@@ -232,8 +237,8 @@ static int prepare_cb_common(struct lll_prepare_param *p)
 	data_chan_use = lll_chan_iso_event(event_counter, data_chan_id,
 					   lll->data_chan_map,
 					   lll->data_chan_count,
-					   &lll->data_chan_prn_s,
-					   &lll->data_chan_remap_idx);
+					   &lll->data_chan.prn_s,
+					   &lll->data_chan.remap_idx);
 
 	/* Start setting up of Radio h/w */
 	radio_reset();
@@ -378,6 +383,8 @@ static int prepare_cb_common(struct lll_prepare_param *p)
 		radio_pkt_tx_set(pdu);
 	}
 
+	const bool is_sequential_packing = (lll->bis_spacing >= (lll->sub_interval * lll->nse));
+
 	/* Setup radio IFS switching */
 	if ((lll->bn_curr == lll->bn) &&
 	    (lll->irc_curr == lll->irc) &&
@@ -389,9 +396,9 @@ static int prepare_cb_common(struct lll_prepare_param *p)
 		uint16_t iss_us;
 
 		/* Calculate next subevent start based on previous PDU length */
-		iss_us = lll->sub_interval -
-			 PDU_BIS_US(pdu->len, ((pdu->len) ? lll->enc : 0U),
-				    lll->phy, lll->phy_flags);
+		iss_us = is_sequential_packing ? lll->sub_interval : lll->bis_spacing;
+		iss_us -= PDU_BIS_US(pdu->len, ((pdu->len) ? lll->enc : 0U),
+				     lll->phy, lll->phy_flags);
 
 		radio_tmr_tifs_set(iss_us);
 		radio_switch_complete_and_b2b_tx(lll->phy, lll->phy_flags,
@@ -444,7 +451,27 @@ static int prepare_cb_common(struct lll_prepare_param *p)
 	LL_ASSERT(!ret);
 
 	/* Calculate ahead the next subevent channel index */
-	next_chan_calc(lll, event_counter, data_chan_id);
+	if (false) {
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL)
+	} else if (is_sequential_packing) {
+		next_chan_calc_seq(lll, event_counter, data_chan_id);
+#endif /* CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED)
+	} else if (!is_sequential_packing) {
+		struct lll_adv_iso_data_chan_interleaved *interleaved_data_chan;
+
+		interleaved_data_chan =
+			&lll->interleaved_data_chan[lll->bis_curr - 1U];
+		interleaved_data_chan->id = data_chan_id;
+
+		next_chan_calc_int(lll, event_counter);
+#endif /* CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED */
+
+	} else {
+		LL_ASSERT(false);
+	}
 
 	return 0;
 }
@@ -470,6 +497,7 @@ static void isr_tx_common(void *param,
 	uint64_t payload_count;
 	uint16_t data_chan_id;
 	uint8_t crc_init[3];
+	uint8_t is_ctrl;
 	uint8_t bis;
 
 #if defined(HAL_RADIO_GPIO_HAVE_PA_PIN)
@@ -481,35 +509,84 @@ static void isr_tx_common(void *param,
 	}
 
 	lll = param;
-	/* FIXME: Sequential or Interleaved BIS subevents decision */
-	/* Sequential Tx complete flow pseudo code */
-	if (lll->bn_curr < lll->bn) {
-		/* transmit the (bn_curr)th Tx PDU of bis_curr */
-		lll->bn_curr++; /* post increment */
 
-		bis = lll->bis_curr;
+	/* Sequential or Interleaved BIS subevents decision */
+	const bool is_sequential_packing = (lll->bis_spacing >= (lll->sub_interval * lll->nse));
 
-	} else if (lll->irc_curr < lll->irc) {
-		/* transmit the (bn_curr)th Tx PDU of bis_curr */
-		lll->bn_curr = 1U;
-		lll->irc_curr++; /* post increment */
+	is_ctrl = 0U;
+	if (false) {
 
-		bis = lll->bis_curr;
+#if defined(CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL)
+	} else if (is_sequential_packing) {
+		/* Sequential Tx complete flow */
+		if (lll->bn_curr < lll->bn) {
+			/* transmit the (bn_curr)th Tx PDU of bis_curr */
+			lll->bn_curr++; /* post increment */
 
-	} else if (lll->ptc_curr < lll->ptc) {
-		lll->ptc_curr++; /* pre increment */
-		/* transmit the (ptc_curr * bn)th Tx PDU */
+			bis = lll->bis_curr;
 
-		bis = lll->bis_curr;
+		} else if (lll->irc_curr < lll->irc) {
+			/* transmit the (bn_curr)th Tx PDU of bis_curr */
+			lll->bn_curr = 1U;
+			lll->irc_curr++; /* post increment */
 
-	} else if (lll->bis_curr < lll->num_bis) {
-		lll->bis_curr++;
-		lll->ptc_curr = 0U;
-		lll->irc_curr = 1U;
-		/* transmit the (bn_curr)th PDU of bis_curr */
-		lll->bn_curr = 1U;
+			bis = lll->bis_curr;
+
+		} else if (lll->ptc_curr < lll->ptc) {
+			lll->ptc_curr++; /* pre increment */
+			/* transmit the (ptc_curr * bn)th Tx PDU */
+
+			bis = lll->bis_curr;
 
-		bis = lll->bis_curr;
+		} else if (lll->bis_curr < lll->num_bis) {
+			lll->bis_curr++;
+			lll->ptc_curr = 0U;
+			lll->irc_curr = 1U;
+			/* transmit the (bn_curr)th PDU of bis_curr */
+			lll->bn_curr = 1U;
+
+			bis = lll->bis_curr;
+		} else {
+			is_ctrl = 1U;
+		}
+#endif /* CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED)
+	} else if (!is_sequential_packing) {
+		/* Interleaved Tx complete flow */
+		if (lll->bis_curr < lll->num_bis) {
+			lll->bis_curr++;
+
+			bis = lll->bis_curr;
+		} else if (lll->bn_curr < lll->bn) {
+			lll->bn_curr++;
+			lll->bis_curr = 1U;
+
+			bis = lll->bis_curr;
+		} else if (lll->irc_curr < lll->irc) {
+			lll->irc_curr++;
+			lll->bn_curr = 1U;
+			lll->bis_curr = 1U;
+
+			bis = lll->bis_curr;
+		} else if (lll->ptc_curr < lll->ptc) {
+			lll->ptc_curr++;
+			lll->bis_curr = 1U;
+
+			bis = lll->bis_curr;
+		} else {
+			is_ctrl = 1U;
+		}
+#endif /* CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED */
+
+	} else {
+		bis = 0U;
+
+		LL_ASSERT(false);
+	}
+
+	if (!is_ctrl) {
+		/* ISO data subevent, nothing to do here */
 
 	} else if (lll->term_ack) {
 		/* Transmit the control PDU and close the BIG event
@@ -558,6 +635,7 @@ static void isr_tx_common(void *param,
 		payload_count = lll->payload_count - lll->bn;
 
 	} else {
+		/* All subevents in the ISO interval is done. */
 		struct lll_adv_iso_stream *stream;
 		uint16_t stream_handle;
 		memq_link_t *link;
@@ -727,8 +805,8 @@ static void isr_tx_common(void *param,
 		data_chan_use = lll_chan_iso_event(event_counter, data_chan_id,
 						   lll->data_chan_map,
 						   lll->data_chan_count,
-						   &lll->data_chan_prn_s,
-						   &lll->data_chan_remap_idx);
+						   &lll->data_chan.prn_s,
+						   &lll->data_chan.remap_idx);
 	}
 
 	lll_chan_set(data_chan_use);
@@ -772,9 +850,9 @@ static void isr_tx_common(void *param,
 		uint16_t iss_us;
 
 		/* Calculate next subevent start based on previous PDU length */
-		iss_us = lll->sub_interval -
-			 PDU_BIS_US(pdu->len, ((pdu->len) ? lll->enc : 0U),
-				    lll->phy, lll->phy_flags);
+		iss_us = is_sequential_packing ? lll->sub_interval : lll->bis_spacing;
+		iss_us -= PDU_BIS_US(pdu->len, ((pdu->len) ? lll->enc : 0U),
+				     lll->phy, lll->phy_flags);
 
 		radio_tmr_tifs_set(iss_us);
 		radio_switch_complete_and_b2b_tx(lll->phy, lll->phy_flags,
@@ -826,26 +904,42 @@ static void isr_tx_common(void *param,
 	/* Calculate ahead the next subevent channel index */
 	const uint16_t event_counter = (lll->payload_count / lll->bn) - 1U;
 
-	next_chan_calc(lll, event_counter, data_chan_id);
+	if (false) {
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL)
+	} else if (is_sequential_packing) {
+		next_chan_calc_seq(lll, event_counter, data_chan_id);
+#endif /* CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED)
+	} else if (!is_sequential_packing) {
+		next_chan_calc_int(lll, event_counter);
+#endif /* CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED */
+
+	} else {
+		LL_ASSERT(false);
+	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
 		lll_prof_send();
 	}
 }
 
-static void next_chan_calc(struct lll_adv_iso *lll, uint16_t event_counter,
-			   uint16_t data_chan_id)
+#if defined(CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL)
+static void next_chan_calc_seq(struct lll_adv_iso *lll, uint16_t event_counter,
+			       uint16_t data_chan_id)
 {
 	/* Calculate ahead the next subevent channel index */
 	if ((lll->bn_curr < lll->bn) ||
 	    (lll->irc_curr < lll->irc) ||
 	    (lll->ptc_curr < lll->ptc)) {
 		/* Calculate the radio channel to use for next subevent */
-		lll->next_chan_use = lll_chan_iso_subevent(data_chan_id,
-						lll->data_chan_map,
-						lll->data_chan_count,
-						&lll->data_chan_prn_s,
-						&lll->data_chan_remap_idx);
+		lll->next_chan_use =
+			lll_chan_iso_subevent(data_chan_id,
+					      lll->data_chan_map,
+					      lll->data_chan_count,
+					      &lll->data_chan.prn_s,
+					      &lll->data_chan.remap_idx);
 	} else if (lll->bis_curr < lll->num_bis) {
 		uint8_t access_addr[4];
 
@@ -855,14 +949,72 @@ static void next_chan_calc(struct lll_adv_iso *lll, uint16_t event_counter,
 		data_chan_id = lll_chan_id(access_addr);
 
 		/* Calculate the radio channel to use for next BIS */
-		lll->next_chan_use = lll_chan_iso_event(event_counter,
-						data_chan_id,
-						lll->data_chan_map,
-						lll->data_chan_count,
-						&lll->data_chan_prn_s,
-						&lll->data_chan_remap_idx);
+		lll->next_chan_use =
+			lll_chan_iso_event(event_counter,
+					   data_chan_id,
+					   lll->data_chan_map,
+					   lll->data_chan_count,
+					   &lll->data_chan.prn_s,
+					   &lll->data_chan.remap_idx);
+	}
+}
+#endif /* CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED)
+static void next_chan_calc_int(struct lll_adv_iso *lll, uint16_t event_counter)
+{
+	struct lll_adv_iso_data_chan_interleaved *interleaved_data_chan;
+
+	if ((lll->bis_curr >= lll->num_bis) &&
+	    (lll->bn_curr >= lll->bn) &&
+	    (lll->irc_curr >= lll->irc) &&
+	    (lll->ptc_curr >= lll->ptc)) {
+		return;
+	}
+
+	if ((lll->bis_curr < lll->num_bis) &&
+	    (lll->bn_curr == 1U) &&
+	    (lll->irc_curr == 1U) &&
+	    (lll->ptc_curr == 0U)) {
+		uint8_t access_addr[4];
+
+		/* Calculate the Access Address for the next BIS subevent */
+		util_bis_aa_le32((lll->bis_curr + 1U), lll->seed_access_addr,
+				 access_addr);
+
+		interleaved_data_chan =
+			&lll->interleaved_data_chan[lll->bis_curr];
+		interleaved_data_chan->id = lll_chan_id(access_addr);
+
+		/* Calculate the radio channel to use for next BIS */
+		lll->next_chan_use =
+			lll_chan_iso_event(event_counter,
+					   interleaved_data_chan->id,
+					   lll->data_chan_map,
+					   lll->data_chan_count,
+					   &interleaved_data_chan->prn_s,
+					   &interleaved_data_chan->remap_idx);
+	} else {
+		uint8_t bis_idx;
+
+		if (lll->bis_curr >= lll->num_bis) {
+			bis_idx = 0U;
+		} else {
+			bis_idx = lll->bis_curr;
+		}
+
+		interleaved_data_chan = &lll->interleaved_data_chan[bis_idx];
+
+		/* Calculate the radio channel to use for next subevent */
+		lll->next_chan_use =
+			lll_chan_iso_subevent(interleaved_data_chan->id,
+					      lll->data_chan_map,
+					      lll->data_chan_count,
+					      &interleaved_data_chan->prn_s,
+					      &interleaved_data_chan->remap_idx);
 	}
 }
+#endif  /* CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED */
 
 static void isr_done_create(void *param)
 {
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
index 526403e92d995..889ae0541cf84 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c
@@ -144,6 +144,12 @@ static int prepare_cb(struct lll_prepare_param *p)
 
 	LL_ASSERT(cis_lll);
 
+	/* Unconditionally set the prepared flag.
+	 * This flag ensures current CIG event does not pick up a new CIS becoming active when the
+	 * ACL overlaps at the instant with this already started CIG events.
+	 */
+	cis_lll->prepared = 1U;
+
 	/* Save first active CIS offset */
 	cis_offset_first = cis_lll->offset;
 
@@ -360,6 +366,13 @@ static int prepare_cb(struct lll_prepare_param *p)
 	do {
 		cis_lll = ull_conn_iso_lll_stream_get_by_group(cig_lll, &cis_handle);
 		if (cis_lll && cis_lll->active) {
+			/* Unconditionally set the prepared flag.
+			 * This flag ensures current CIG event does not pick up a new CIS becoming
+			 * active when the ACL overlaps at the instant with this already started
+			 * CIG events.
+			 */
+			cis_lll->prepared = 1U;
+
 			/* Pick the event_count calculated in the ULL prepare */
 			cis_lll->event_count = cis_lll->event_count_prepare;
 
@@ -404,7 +417,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 		do {
 			next_cis_lll = ull_conn_iso_lll_stream_get_by_group(cig_lll,
 									    &cis_handle_curr);
-			if (next_cis_lll && next_cis_lll->active) {
+			if (next_cis_lll && next_cis_lll->prepared) {
 				payload_count_flush_or_inc_on_close(next_cis_lll);
 			}
 		} while (next_cis_lll);
@@ -586,7 +599,7 @@ static void isr_tx(void *param)
 		cis_handle = cis_handle_curr;
 		do {
 			next_cis_lll = ull_conn_iso_lll_stream_get_by_group(cig_lll, &cis_handle);
-		} while (next_cis_lll && !next_cis_lll->active);
+		} while (next_cis_lll && !next_cis_lll->prepared);
 
 		if (!next_cis_lll) {
 			return;
@@ -830,7 +843,7 @@ static void isr_rx(void *param)
 		do {
 			next_cis_lll = ull_conn_iso_lll_stream_get_by_group(cig_lll,
 									    &cis_handle_curr);
-		} while (next_cis_lll && !next_cis_lll->active);
+		} while (next_cis_lll && !next_cis_lll->prepared);
 
 		if (!next_cis_lll) {
 			goto isr_rx_done;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
index 00e641fd151e4..0a451053578bb 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
@@ -158,6 +158,12 @@ static int prepare_cb(struct lll_prepare_param *p)
 
 	LL_ASSERT(cis_lll);
 
+	/* Unconditionally set the prepared flag.
+	 * This flag ensures current CIG event does not pick up a new CIS becoming active when the
+	 * ACL overlaps at the instant with this already started CIG events.
+	 */
+	cis_lll->prepared = 1U;
+
 	/* Save first active CIS offset */
 	cis_offset_first = cis_lll->offset;
 
@@ -377,6 +383,12 @@ static int prepare_cb(struct lll_prepare_param *p)
 			break;
 		}
 
+		/* Unconditionally set the prepared flag.
+		 * This flag ensures current CIG event does not pick up a new CIS becoming active
+		 * when the ACL overlaps at the instant with this already started CIG events.
+		 */
+		cis_lll->prepared = 1U;
+
 		/* Pick the event_count calculated in the ULL prepare */
 		cis_lll->event_count = cis_lll->event_count_prepare;
 
@@ -421,7 +433,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 			next_cis_lll =
 				ull_conn_iso_lll_stream_sorted_get_by_group(cig_lll,
 									    &cis_handle_curr);
-			if (next_cis_lll && next_cis_lll->active) {
+			if (next_cis_lll && next_cis_lll->prepared) {
 				payload_count_rx_flush_or_txrx_inc(next_cis_lll);
 			}
 		} while (next_cis_lll);
@@ -782,7 +794,7 @@ static void isr_rx(void *param)
 		do {
 			next_cis_lll =
 				ull_conn_iso_lll_stream_sorted_get_by_group(cig_lll, &cis_handle);
-		} while (next_cis_lll && !next_cis_lll->active);
+		} while (next_cis_lll && !next_cis_lll->prepared);
 
 		if (!next_cis_lll) {
 			/* ISO Event Done */
@@ -994,7 +1006,7 @@ static void next_cis_prepare(void *param)
 	cis_handle = cis_handle_curr;
 	do {
 		next_cis_lll = ull_conn_iso_lll_stream_sorted_get_by_group(cig_lll, &cis_handle);
-	} while (next_cis_lll && !next_cis_lll->active);
+	} while (next_cis_lll && !next_cis_lll->prepared);
 
 	if (!next_cis_lll) {
 		/* ISO Event Done */
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
index 710ef8f620cd7..8aedcd44a4f88 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
@@ -1089,6 +1089,9 @@ static void isr_done_cleanup(void *param)
 		lll->is_stop = 1U;
 	}
 
+	/* LLL scheduled auxiliary PDU reception is_abort on duration expire or
+	 * aborted in the unreserved time space.
+	 */
 	if (lll->is_aux_sched) {
 		struct node_rx_pdu *node_rx2;
 
@@ -1378,9 +1381,10 @@ static inline int isr_rx_pdu(struct lll_scan *lll, struct pdu_adv *pdu_adv_rx,
 					rl_idx, &dir_report))) ||
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 		  ((pdu_adv_rx->type == PDU_ADV_TYPE_EXT_IND) &&
-		   lll->phy && lll_scan_ext_tgta_check(lll, true, false,
-						       pdu_adv_rx, rl_idx,
-						       &dir_report)) ||
+		   lll->phy &&
+		   !lll->state &&
+		   lll_scan_ext_tgta_check(lll, true, false, pdu_adv_rx, rl_idx,
+					   &dir_report)) ||
 #endif /* CONFIG_BT_CTLR_ADV_EXT */
 		  ((pdu_adv_rx->type == PDU_ADV_TYPE_SCAN_RSP) &&
 		   (pdu_adv_rx->len >= offsetof(struct pdu_adv_scan_rsp, data)) &&
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index 7fa1f66f4ddfe..c80591939b1ce 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -635,9 +635,6 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	lll = prepare_param->param;
 	lll->skip_prepare += (lll->lazy_prepare + 1U);
 
-	/* Reset Sync context association with any Aux context as the chain reception is aborted. */
-	lll->lll_aux = NULL;
-
 	/* Extra done event, to check sync lost */
 	e = ull_event_done_extra_get();
 	LL_ASSERT(e);
@@ -817,11 +814,6 @@ static int isr_rx(struct lll_sync *lll, uint8_t node_type, uint8_t crc_ok,
 		 * again a node_rx for periodic report incomplete.
 		 */
 		if (node_type != NODE_RX_TYPE_EXT_AUX_REPORT) {
-			/* Reset Sync context association with any Aux context
-			 * as a new chain is being setup for reception here.
-			 */
-			lll->lll_aux = NULL;
-
 			node_rx = ull_pdu_rx_alloc_peek(4);
 		} else {
 			node_rx = ull_pdu_rx_alloc_peek(3);
@@ -1189,7 +1181,11 @@ static void isr_rx_done_cleanup(struct lll_sync *lll, uint8_t crc_ok, bool sync_
 {
 	struct event_done_extra *e;
 
-	/* Reset Sync context association with any Aux context as the chain reception is done. */
+	/* Reset Sync context association with any Aux context as the chain reception is done.
+	 * By code inspection there should not be a race that ULL execution context assigns lll_aux
+	 * that would be reset here, because either we are here not receiving a chain PDU or the
+	 * lll_aux has been set in the node rx type NODE_RX_TYPE_EXT_AUX_RELEASE before we are here.
+	 */
 	lll->lll_aux = NULL;
 
 	/* Calculate and place the drift information in done event */
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
index 0257bc0eafaa1..dbfec680c8d16 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
@@ -53,8 +53,14 @@ static void isr_rx(void *param);
 static void isr_rx_done(void *param);
 static void isr_done(void *param);
 static uint16_t payload_index_get(const struct lll_sync_iso *lll);
-static void next_chan_calc(struct lll_sync_iso *lll, uint16_t event_counter,
-			   uint16_t data_chan_id);
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL)
+static void next_chan_calc_seq(struct lll_sync_iso *lll, uint16_t event_counter,
+			       uint16_t data_chan_id);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL */
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+static void next_chan_calc_int(struct lll_sync_iso *lll,
+			       uint16_t event_counter);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
 static void isr_rx_iso_data_valid(const struct lll_sync_iso *const lll,
 				  uint16_t handle, struct node_rx_pdu *node_rx);
 static void isr_rx_iso_data_invalid(const struct lll_sync_iso *const lll,
@@ -263,12 +269,14 @@ static int prepare_cb_common(struct lll_prepare_param *p)
 	data_chan_use = lll_chan_iso_event(event_counter, data_chan_id,
 					   lll->data_chan_map,
 					   lll->data_chan_count,
-					   &lll->data_chan_prn_s,
-					   &lll->data_chan_remap_idx);
+					   &lll->data_chan.prn_s,
+					   &lll->data_chan.remap_idx);
 
 	/* Initialize stream current */
 	lll->stream_curr = 0U;
 
+	const bool is_sequential_packing = (lll->bis_spacing >= (lll->sub_interval * lll->nse));
+
 	/* Skip subevents until first selected BIS */
 	stream_handle = lll->stream_handle[lll->stream_curr];
 	stream = ull_sync_iso_lll_stream_get(stream_handle);
@@ -283,12 +291,36 @@ static int prepare_cb_common(struct lll_prepare_param *p)
 		data_chan_id = lll_chan_id(access_addr);
 
 		/* Calculate the channel id for the next BIS subevent */
-		data_chan_use = lll_chan_iso_event(event_counter,
-					data_chan_id,
-					lll->data_chan_map,
-					lll->data_chan_count,
-					&lll->data_chan_prn_s,
-					&lll->data_chan_remap_idx);
+		if (false) {
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL)
+		} else if (is_sequential_packing) {
+			data_chan_use = lll_chan_iso_event(event_counter,
+							   data_chan_id,
+							   lll->data_chan_map,
+							   lll->data_chan_count,
+							   &lll->data_chan.prn_s,
+							   &lll->data_chan.remap_idx);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+		} else if (!is_sequential_packing) {
+			struct lll_sync_iso_data_chan_interleaved *interleaved_data_chan;
+
+			interleaved_data_chan =
+				&lll->interleaved_data_chan[lll->bis_curr - 1U];
+
+			data_chan_use = lll_chan_iso_event(event_counter,
+							   data_chan_id,
+							   lll->data_chan_map,
+							   lll->data_chan_count,
+							   &interleaved_data_chan->prn_s,
+							   &interleaved_data_chan->remap_idx);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
+
+		} else {
+			LL_ASSERT(false);
+		}
 	}
 
 	/* Calculate the CRC init value for the BIS event,
@@ -402,7 +434,27 @@ static int prepare_cb_common(struct lll_prepare_param *p)
 	LL_ASSERT(!ret);
 
 	/* Calculate ahead the next subevent channel index */
-	next_chan_calc(lll, event_counter, data_chan_id);
+	if (false) {
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL)
+	} else if (is_sequential_packing) {
+		next_chan_calc_seq(lll, event_counter, data_chan_id);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+	} else if (!is_sequential_packing) {
+		struct lll_sync_iso_data_chan_interleaved *interleaved_data_chan;
+
+		interleaved_data_chan =
+			&lll->interleaved_data_chan[lll->bis_curr - 1U];
+		interleaved_data_chan->id = data_chan_id;
+
+		next_chan_calc_int(lll, event_counter);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
+
+	} else {
+		LL_ASSERT(false);
+	}
 
 	return 0;
 }
@@ -560,15 +612,17 @@ static void isr_rx(void *param)
 		lll_prof_latency_capture();
 	}
 
+	/* initialize LLL context reference */
+	lll = param;
+
+	const bool is_sequential_packing = (lll->bis_spacing >= (lll->sub_interval * lll->nse));
+
 	/* Read radio status and events */
 	trx_done = radio_is_done();
 	if (!trx_done) {
 		/* Clear radio rx status and events */
 		lll_isr_rx_status_reset();
 
-		/* initialize LLL context reference */
-		lll = param;
-
 		/* BIS index */
 		bis_idx = lll->bis_curr - 1U;
 
@@ -582,23 +636,39 @@ static void isr_rx(void *param)
 	rssi_ready = radio_rssi_is_ready();
 	trx_cnt++;
 
-	/* initialize LLL context reference */
-	lll = param;
-
 	/* Save the AA captured for the first anchor point sync */
 	if (!radio_tmr_aa_restore()) {
 		const struct lll_sync_iso_stream *sync_stream;
 		uint32_t se_offset_us;
-		uint8_t se;
 
 		crc_ok_anchor = crc_ok;
 
 		sync_stream = ull_sync_iso_lll_stream_get(lll->stream_handle[0]);
-		se = ((lll->bis_curr - sync_stream->bis_index) *
-		      ((lll->bn * lll->irc) + lll->ptc)) +
-		     ((lll->irc_curr - 1U) * lll->bn) + (lll->bn_curr - 1U) +
-		     lll->ptc_curr + lll->ctrl;
-		se_offset_us = lll->sub_interval * se;
+
+		if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL) &&
+		    is_sequential_packing) {
+			uint8_t se;
+
+			se = ((lll->bis_curr - sync_stream->bis_index) *
+			      ((lll->bn * lll->irc) + lll->ptc)) +
+			     ((lll->irc_curr - 1U) * lll->bn) +
+			     (lll->bn_curr - 1U) + lll->ptc_curr + lll->ctrl;
+			se_offset_us = lll->sub_interval * se;
+		} else if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED) &&
+			   !is_sequential_packing) {
+			uint8_t se;
+
+			se = (lll->bis_curr - sync_stream->bis_index) +
+			     ((((lll->irc_curr - 1U) * lll->bn) +
+			       (lll->bn_curr - 1U) + lll->ptc_curr) *
+			      lll->num_bis) + lll->ctrl;
+			se_offset_us = lll->bis_spacing * se;
+		} else {
+			se_offset_us = 0U;
+
+			LL_ASSERT(false);
+		}
+
 		radio_tmr_aa_save(radio_tmr_aa_get() - se_offset_us);
 		radio_tmr_ready_save(radio_tmr_ready_get() - se_offset_us);
 	}
@@ -718,7 +788,14 @@ static void isr_rx(void *param)
 	skipped = 0U;
 
 isr_rx_find_subevent:
-	/* FIXME: Sequential or Interleaved BIS subevents decision */
+	/* Sequential or Interleaved BIS subevents decision */
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+	if (!is_sequential_packing) {
+		goto isr_rx_interleaved;
+	}
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL)
 	/* NOTE: below code is for Sequential Rx only */
 
 	/* Find the next (bn_curr)th subevent to receive PDU */
@@ -840,11 +917,11 @@ static void isr_rx(void *param)
 
 	/* Next BIS */
 	if (lll->bis_curr < lll->num_bis) {
-		struct lll_sync_iso_stream *sync_stream;
-		uint16_t stream_handle;
-
 		/* Next selected stream */
 		if ((lll->stream_curr + 1U) < lll->stream_count) {
+			struct lll_sync_iso_stream *sync_stream;
+			uint16_t stream_handle;
+
 			stream_curr = ++lll->stream_curr;
 			stream_handle = lll->stream_handle[stream_curr];
 			sync_stream = ull_sync_iso_lll_stream_get(stream_handle);
@@ -854,9 +931,9 @@ static void isr_rx(void *param)
 				uint8_t bis_idx_new;
 
 				lll->bis_curr = sync_stream->bis_index;
-				lll->ptc_curr = 0U;
-				lll->irc_curr = 1U;
 				lll->bn_curr = 1U;
+				lll->irc_curr = 1U;
+				lll->ptc_curr = 0U;
 
 				/* new BIS index */
 				bis_idx_new = lll->bis_curr - 1U;
@@ -917,7 +994,159 @@ static void isr_rx(void *param)
 			lll->bis_curr = lll->num_bis;
 		}
 	}
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL */
+
+	goto isr_rx_ctrl;
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+isr_rx_interleaved:
+	/* Next BIS */
+	if (lll->bis_curr < lll->num_bis) {
+		/* Next selected stream */
+		if ((lll->stream_curr + 1U) < lll->stream_count) {
+			struct lll_sync_iso_stream *sync_stream;
+			uint16_t stream_handle;
+
+			stream_curr = ++lll->stream_curr;
+			stream_handle = lll->stream_handle[stream_curr];
+			sync_stream = ull_sync_iso_lll_stream_get(stream_handle);
+			if (sync_stream->bis_index <= lll->num_bis) {
+				uint8_t payload_offset;
+				uint8_t payload_index;
+
+				lll->bis_curr = sync_stream->bis_index;
+
+				/* Check payload buffer overflow */
+				payload_offset = (lll->bn_curr - 1U) +
+						 (lll->ptc_curr * lll->pto);
+				if (payload_offset > lll->payload_count_max) {
+					const uint16_t event_counter =
+						(lll->payload_count / lll->bn) - 1U;
+
+					next_chan_calc_int(lll, event_counter);
+
+					goto isr_rx_interleaved;
+				}
+
+				/* Find the index of the (bn_curr)th Rx PDU buffer */
+				payload_index = lll->payload_tail + payload_offset;
+				if (payload_index >= lll->payload_count_max) {
+					payload_index -= lll->payload_count_max;
+				}
+
+				/* Check if (bn_curr)th Rx PDU has been received */
+				if (lll->payload[stream_curr][payload_index]) {
+					const uint16_t event_counter =
+						(lll->payload_count / lll->bn) - 1U;
+
+					next_chan_calc_int(lll, event_counter);
+
+					goto isr_rx_interleaved;
+				}
+
+				bis = lll->bis_curr;
+
+				goto isr_rx_next_subevent;
+			} else {
+				lll->bis_curr = lll->num_bis;
+			}
+		} else {
+			lll->bis_curr = lll->num_bis;
+		}
+	}
+
+	if (lll->bis_curr >= lll->num_bis) {
+		struct lll_sync_iso_stream *sync_stream;
+		uint16_t stream_handle;
+
+		lll->stream_curr = 0U;
+		stream_curr = 0U;
+		stream_handle = lll->stream_handle[stream_curr];
+		sync_stream = ull_sync_iso_lll_stream_get(stream_handle);
+		if (sync_stream->bis_index <= lll->num_bis) {
+			lll->bis_curr = sync_stream->bis_index;
+			bis_idx = lll->bis_curr - 1U;
+		} else {
+			LL_ASSERT(false);
+		}
+	}
+
+	if (lll->bn_curr < lll->bn) {
+		uint8_t payload_offset;
+		uint8_t payload_index;
 
+		lll->bn_curr++;
+
+		/* Check payload buffer overflow */
+		payload_offset = (lll->bn_curr - 1U);
+		if (payload_offset > lll->payload_count_max) {
+			const uint16_t event_counter =
+				(lll->payload_count / lll->bn) - 1U;
+
+			next_chan_calc_int(lll, event_counter);
+
+			goto isr_rx_interleaved;
+		}
+
+		/* Find the index of the (bn_curr)th Rx PDU buffer */
+		payload_index = lll->payload_tail + payload_offset;
+		if (payload_index >= lll->payload_count_max) {
+			payload_index -= lll->payload_count_max;
+		}
+
+		/* Check if (bn_curr)th Rx PDU has been received */
+		if (lll->payload[stream_curr][payload_index]) {
+			const uint16_t event_counter =
+				(lll->payload_count / lll->bn) - 1U;
+
+			next_chan_calc_int(lll, event_counter);
+
+			goto isr_rx_interleaved;
+		}
+
+		bis = lll->bis_curr;
+
+		goto isr_rx_next_subevent;
+	}
+
+	if (lll->irc_curr < lll->irc) {
+		uint8_t payload_index;
+
+		lll->irc_curr++;
+		lll->bn_curr = 1U;
+
+		/* Find the index of the (irc_curr)th bn = 1 Rx PDU
+		 * buffer.
+		 */
+		payload_index = lll->payload_tail;
+
+		/* Check if (irc_curr)th bn = 1 Rx PDU has been
+		 * received.
+		 */
+		if (lll->payload[stream_curr][payload_index]) {
+			const uint16_t event_counter =
+				(lll->payload_count / lll->bn) - 1U;
+
+			next_chan_calc_int(lll, event_counter);
+
+			goto isr_rx_interleaved;
+		}
+
+		bis = lll->bis_curr;
+
+		goto isr_rx_next_subevent;
+	}
+
+	if (lll->ptc_curr < lll->ptc) {
+		lll->ptc_curr++;
+
+		bis = lll->bis_curr;
+
+		goto isr_rx_next_subevent;
+	}
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
+
+isr_rx_ctrl:
 	/* Control subevent */
 	if (!lll->ctrl && (lll->cssn_next != lll->cssn_curr)) {
 		uint8_t pkt_flags;
@@ -983,8 +1212,8 @@ static void isr_rx(void *param)
 		data_chan_use = lll_chan_iso_event(event_counter, data_chan_id,
 						   lll->data_chan_map,
 						   lll->data_chan_count,
-						   &lll->data_chan_prn_s,
-						   &lll->data_chan_remap_idx);
+						   &lll->data_chan.prn_s,
+						   &lll->data_chan.remap_idx);
 	} else if (!skipped) {
 		data_chan_use = lll->next_chan_use;
 	} else {
@@ -1002,8 +1231,8 @@ static void isr_rx(void *param)
 						data_chan_id,
 						lll->data_chan_map,
 						lll->data_chan_count,
-						&lll->data_chan_prn_s,
-						&lll->data_chan_remap_idx);
+						&lll->data_chan.prn_s,
+						&lll->data_chan.remap_idx);
 
 			skipped -= (bis_idx_new - bis_idx_old) *
 				   ((lll->bn * lll->irc) + lll->ptc);
@@ -1014,8 +1243,8 @@ static void isr_rx(void *param)
 			data_chan_use = lll_chan_iso_subevent(data_chan_id,
 						lll->data_chan_map,
 						lll->data_chan_count,
-						&lll->data_chan_prn_s,
-						&lll->data_chan_remap_idx);
+						&lll->data_chan.prn_s,
+						&lll->data_chan.remap_idx);
 		}
 	}
 
@@ -1082,11 +1311,26 @@ static void isr_rx(void *param)
 	 * subevent.
 	 */
 	stream = ull_sync_iso_lll_stream_get(lll->stream_handle[0]);
-	nse = ((lll->bis_curr - stream->bis_index) *
-	       ((lll->bn * lll->irc) + lll->ptc)) +
-	      ((lll->irc_curr - 1U) * lll->bn) + (lll->bn_curr - 1U) +
-	      lll->ptc_curr + lll->ctrl;
-	hcto = lll->sub_interval * nse;
+	if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL) &&
+	    is_sequential_packing) {
+		nse = ((lll->bis_curr - stream->bis_index) *
+		       ((lll->bn * lll->irc) + lll->ptc)) +
+		      ((lll->irc_curr - 1U) * lll->bn) + (lll->bn_curr - 1U) +
+		      lll->ptc_curr + lll->ctrl;
+		hcto = lll->sub_interval * nse;
+	} else if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED) &&
+		   !is_sequential_packing) {
+		nse = (lll->bis_curr - stream->bis_index) +
+		       ((((lll->irc_curr - 1U) * lll->bn) +
+			 (lll->bn_curr - 1U) + lll->ptc_curr) *
+			lll->num_bis) + lll->ctrl;
+		hcto = lll->bis_spacing * nse;
+	} else {
+		nse = 0U;
+		hcto = 0U;
+
+		LL_ASSERT(false);
+	}
 
 	if (trx_cnt) {
 		/* Setup radio packet timer header complete timeout for
@@ -1173,7 +1417,21 @@ static void isr_rx(void *param)
 	/* Calculate ahead the next subevent channel index */
 	const uint16_t event_counter = (lll->payload_count / lll->bn) - 1U;
 
-	next_chan_calc(lll, event_counter, data_chan_id);
+	if (false) {
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL)
+	} else if (is_sequential_packing) {
+		next_chan_calc_seq(lll, event_counter, data_chan_id);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+	} else if (!is_sequential_packing) {
+		next_chan_calc_int(lll, event_counter);
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
+
+	} else {
+		LL_ASSERT(false);
+	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
 		lll_prof_send();
@@ -1377,19 +1635,21 @@ static uint16_t payload_index_get(const struct lll_sync_iso *lll)
 	return payload_index;
 }
 
-static void next_chan_calc(struct lll_sync_iso *lll, uint16_t event_counter,
-			   uint16_t data_chan_id)
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL)
+static void next_chan_calc_seq(struct lll_sync_iso *lll, uint16_t event_counter,
+			       uint16_t data_chan_id)
 {
 	/* Calculate ahead the next subevent channel index */
 	if ((lll->bn_curr < lll->bn) ||
 	    (lll->irc_curr < lll->irc) ||
 	    (lll->ptc_curr < lll->ptc)) {
 		/* Calculate the radio channel to use for next subevent */
-		lll->next_chan_use = lll_chan_iso_subevent(data_chan_id,
-						lll->data_chan_map,
-						lll->data_chan_count,
-						&lll->data_chan_prn_s,
-						&lll->data_chan_remap_idx);
+		lll->next_chan_use =
+			lll_chan_iso_subevent(data_chan_id,
+					      lll->data_chan_map,
+					      lll->data_chan_count,
+					      &lll->data_chan.prn_s,
+					      &lll->data_chan.remap_idx);
 	} else if (lll->bis_curr < lll->num_bis) {
 		uint8_t access_addr[4];
 
@@ -1399,14 +1659,95 @@ static void next_chan_calc(struct lll_sync_iso *lll, uint16_t event_counter,
 		data_chan_id = lll_chan_id(access_addr);
 
 		/* Calculate the radio channel to use for next BIS */
-		lll->next_chan_use = lll_chan_iso_event(event_counter,
-						data_chan_id,
-						lll->data_chan_map,
-						lll->data_chan_count,
-						&lll->data_chan_prn_s,
-						&lll->data_chan_remap_idx);
+		lll->next_chan_use =
+			lll_chan_iso_event(event_counter,
+					   data_chan_id,
+					   lll->data_chan_map,
+					   lll->data_chan_count,
+					   &lll->data_chan.prn_s,
+					   &lll->data_chan.remap_idx);
 	}
 }
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL */
+
+#if defined(CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED)
+static void next_chan_calc_int(struct lll_sync_iso *lll, uint16_t event_counter)
+{
+	struct lll_sync_iso_data_chan_interleaved *interleaved_data_chan;
+	uint8_t stream_curr;
+	uint8_t bis_prev;
+
+	if ((lll->bis_curr >= lll->num_bis) &&
+	    (lll->bn_curr >= lll->bn) &&
+	    (lll->irc_curr >= lll->irc) &&
+	    (lll->ptc_curr >= lll->ptc)) {
+		return;
+	}
+
+	/* Next selected stream */
+	stream_curr = lll->stream_curr + 1U;
+	if ((stream_curr < BT_CTLR_SYNC_ISO_STREAM_MAX) &&
+	    (stream_curr < lll->stream_count)) {
+		struct lll_sync_iso_stream *sync_stream;
+		uint16_t stream_handle;
+
+		stream_handle = lll->stream_handle[stream_curr];
+		sync_stream = ull_sync_iso_lll_stream_get(stream_handle);
+		if (sync_stream->bis_index <= lll->num_bis) {
+			bis_prev = sync_stream->bis_index - 1U;
+		} else {
+			bis_prev = lll->num_bis;
+		}
+	} else {
+		bis_prev = lll->num_bis;
+	}
+
+	if ((bis_prev < lll->num_bis) &&
+	    (lll->bn_curr == 1U) &&
+	    (lll->irc_curr == 1U) &&
+	    (lll->ptc_curr == 0U)) {
+		uint8_t access_addr[4];
+
+		/* Calculate the Access Address for the next BIS subevent */
+		util_bis_aa_le32((bis_prev + 1U), lll->seed_access_addr,
+				 access_addr);
+
+		interleaved_data_chan =
+			&lll->interleaved_data_chan[bis_prev];
+		interleaved_data_chan->id = lll_chan_id(access_addr);
+
+		/* Calculate the radio channel to use for next BIS */
+		lll->next_chan_use =
+			lll_chan_iso_event(event_counter,
+					   interleaved_data_chan->id,
+					   lll->data_chan_map,
+					   lll->data_chan_count,
+					   &interleaved_data_chan->prn_s,
+					   &interleaved_data_chan->remap_idx);
+	} else {
+		uint8_t bis_idx;
+
+		if (bis_prev >= lll->num_bis) {
+			struct lll_sync_iso_stream *sync_stream;
+
+			sync_stream = ull_sync_iso_lll_stream_get(lll->stream_handle[0]);
+			bis_idx = sync_stream->bis_index - 1U;
+		} else {
+			bis_idx = bis_prev;
+		}
+
+		interleaved_data_chan = &lll->interleaved_data_chan[bis_idx];
+
+		/* Calculate the radio channel to use for next subevent */
+		lll->next_chan_use =
+			lll_chan_iso_subevent(interleaved_data_chan->id,
+					      lll->data_chan_map,
+					      lll->data_chan_count,
+					      &interleaved_data_chan->prn_s,
+					      &interleaved_data_chan->remap_idx);
+	}
+}
+#endif /* CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED */
 
 static void isr_rx_iso_data_valid(const struct lll_sync_iso *const lll,
 				  uint16_t handle, struct node_rx_pdu *node_rx)
@@ -1428,12 +1769,21 @@ static void isr_rx_iso_data_valid(const struct lll_sync_iso *const lll,
 			      (DIV_ROUND_UP(lll->ptc_curr, lll->bn) *
 			       lll->pto * lll->iso_interval *
 			       PERIODIC_INT_UNIT_US) -
-			      addr_us_get(lll->phy) -
-			      ((stream->bis_index - 1U) *
-			       lll->sub_interval * ((lll->irc * lll->bn) +
-						    lll->ptc));
+			      addr_us_get(lll->phy);
+
+	const bool is_sequential_packing = (lll->bis_spacing >= (lll->sub_interval * lll->nse));
+
+	if (is_sequential_packing) {
+		iso_meta->timestamp -= (stream->bis_index - 1U) *
+				       lll->sub_interval * lll->nse;
+	} else {
+		iso_meta->timestamp -= (stream->bis_index - 1U) *
+				       lll->bis_spacing;
+	}
+
 	iso_meta->timestamp %=
 		HAL_TICKER_TICKS_TO_US_64BIT(BIT64(HAL_TICKER_CNTR_MSBIT + 1U));
+
 	iso_meta->status = 0U;
 }
 
@@ -1455,14 +1805,24 @@ static void isr_rx_iso_data_invalid(const struct lll_sync_iso *const lll,
 
 	stream = ull_sync_iso_lll_stream_get(lll->stream_handle[0]);
 	iso_meta->timestamp = HAL_TICKER_TICKS_TO_US(radio_tmr_start_get()) +
-			      radio_tmr_aa_restore() - addr_us_get(lll->phy) -
-			      ((stream->bis_index - 1U) *
-			       lll->sub_interval * ((lll->irc * lll->bn) +
-						    lll->ptc));
-	iso_meta->timestamp -= (latency * lll->iso_interval *
-				PERIODIC_INT_UNIT_US);
+			      radio_tmr_aa_restore() - addr_us_get(lll->phy);
+
+	const bool is_sequential_packing = (lll->bis_spacing >= (lll->sub_interval * lll->nse));
+
+	if (is_sequential_packing) {
+		iso_meta->timestamp -= (stream->bis_index - 1U) *
+				       lll->sub_interval * lll->nse;
+	} else {
+		iso_meta->timestamp -= (stream->bis_index - 1U) *
+				       lll->bis_spacing;
+	}
+
+	iso_meta->timestamp -= latency * lll->iso_interval *
+			       PERIODIC_INT_UNIT_US;
+
 	iso_meta->timestamp %=
 		HAL_TICKER_TICKS_TO_US_64BIT(BIT64(HAL_TICKER_CNTR_MSBIT + 1U));
+
 	iso_meta->status = 1U;
 }
 
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
index c77e39e00f9e3..e4a83b0bb85d6 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
@@ -385,16 +385,7 @@ int lll_clk_off(void)
 
 uint32_t lll_event_offset_get(struct ull_hdr *ull)
 {
-	if (0) {
-#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
-	} else if (ull->ticks_prepare_to_start & XON_BITMASK) {
-		return MAX(ull->ticks_active_to_start,
-			   ull->ticks_preempt_to_start);
-#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
-	} else {
-		return MAX(ull->ticks_active_to_start,
-			   ull->ticks_prepare_to_start);
-	}
+	return HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 }
 
 uint32_t lll_preempt_calc(struct ull_hdr *ull, uint8_t ticker_id,
@@ -674,9 +665,8 @@ static uint32_t preempt_ticker_start(struct lll_event *evt,
 	p = &evt->prepare_param;
 	ull = HDR_LLL2ULL(p->param);
 	preempt_anchor = p->ticks_at_expire;
-	preempt_to = MAX(ull->ticks_active_to_start,
-			 ull->ticks_prepare_to_start) -
-		     ull->ticks_preempt_to_start;
+	preempt_to = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US) -
+		     HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 
 	/* Setup pre empt timeout */
 	ret = ticker_start(TICKER_INSTANCE_ID_CTLR,
diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c
index 52ab480b66359..41df97a29cbbf 100644
--- a/subsys/bluetooth/controller/ll_sw/ull.c
+++ b/subsys/bluetooth/controller/ll_sw/ull.c
@@ -544,7 +544,7 @@ static void *mark_update;
 #endif /* CONFIG_BT_CONN */
 
 static MFIFO_DEFINE(tx_ack, sizeof(struct lll_tx),
-		    BT_CTLR_TX_BUFFERS + BT_CTLR_ISO_TX_BUFFERS);
+		    BT_CTLR_TX_BUFFERS + BT_CTLR_ISO_TX_PDU_BUFFERS);
 #endif /* CONFIG_BT_CONN || CONFIG_BT_CTLR_ADV_ISO */
 
 static void *mark_disable;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv.c b/subsys/bluetooth/controller/ll_sw/ull_adv.c
index 19712c8b8a08e..911a433f81de8 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv.c
@@ -1275,16 +1275,9 @@ uint8_t ll_adv_enable(uint8_t enable)
 	/* Initialize ULL context before radio event scheduling is started. */
 	ull_hdr_init(&adv->ull);
 
-	/* TODO: active_to_start feature port */
-	adv->ull.ticks_active_to_start = 0;
-	adv->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	adv->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	adv->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(time_us);
 
-	ticks_slot_offset = MAX(adv->ull.ticks_active_to_start,
-				adv->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
@@ -2381,14 +2374,16 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,
 	defined(CONFIG_BT_TICKER_EXT_EXPIRE_INFO)
 		if (adv->lll.aux) {
 			uint32_t ticks_to_expire;
-			uint32_t other_remainder;
+			uint32_t other_remainder = 0U;
 
 			LL_ASSERT(context->other_expire_info);
 
 			/* Adjust ticks to expire based on remainder value */
 			ticks_to_expire = context->other_expire_info->ticks_to_expire;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 			other_remainder = context->other_expire_info->remainder;
 			hal_ticker_remove_jitter(&ticks_to_expire, &other_remainder);
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 
 			/* Store the ticks and remainder offset for aux ptr population in LLL */
 			adv->lll.aux->ticks_pri_pdu_offset = ticks_to_expire;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
index 41ee575f44768..f6617f8fbd145 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
@@ -2521,17 +2521,10 @@ uint32_t ull_adv_aux_evt_init(struct ll_adv_aux_set *aux,
 
 	time_us = aux_time_min_get(aux);
 
-	/* TODO: active_to_start feature port */
-	aux->ull.ticks_active_to_start = 0;
-	aux->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	aux->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	aux->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(time_us);
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
-		ticks_slot_overhead = MAX(aux->ull.ticks_active_to_start,
-					  aux->ull.ticks_prepare_to_start);
+		ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	} else {
 		ticks_slot_overhead = 0;
 	}
@@ -3197,7 +3190,7 @@ static void mfy_aux_offset_get(void *param)
 	uint16_t chan_counter;
 	struct pdu_adv *pdu;
 	uint32_t ticks_now;
-	uint32_t remainder;
+	uint32_t remainder = 0U;
 	uint32_t offset_us;
 	uint8_t ticker_id;
 	uint16_t pdu_us;
@@ -3222,12 +3215,20 @@ static void mfy_aux_offset_get(void *param)
 		ticks_previous = ticks_current;
 
 		ret_cb = TICKER_STATUS_BUSY;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 		ret = ticker_next_slot_get_ext(TICKER_INSTANCE_ID_CTLR,
 					       TICKER_USER_ID_ULL_LOW,
 					       &id, &ticks_current,
 					       &ticks_to_expire, &remainder,
 					       NULL, NULL, NULL,
 					       ticker_op_cb, (void *)&ret_cb);
+#else /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
+		ret = ticker_next_slot_get(TICKER_INSTANCE_ID_CTLR,
+					   TICKER_USER_ID_ULL_LOW,
+					   &id, &ticks_current,
+					   &ticks_to_expire,
+					   ticker_op_cb, (void *)&ret_cb);
+#endif /* !CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 		if (ret == TICKER_STATUS_BUSY) {
 			while (ret_cb == TICKER_STATUS_BUSY) {
 				ticker_job_sched(TICKER_INSTANCE_ID_CTLR,
@@ -3320,9 +3321,8 @@ static void mfy_aux_offset_get(void *param)
 	/* Assertion check for delayed aux_offset calculations */
 	ticks_now = ticker_ticks_now_get();
 	ticks_elapsed = ticker_ticks_diff_get(ticks_now, ticks_current);
-	ticks_to_start = MAX(adv->ull.ticks_active_to_start,
-			     adv->ull.ticks_prepare_to_start) -
-			 adv->ull.ticks_preempt_to_start;
+	ticks_to_start = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US) -
+			 HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	LL_ASSERT(ticks_elapsed < ticks_to_start);
 }
 
@@ -3369,7 +3369,7 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,
 		sync = HDR_LLL2ULL(adv->lll.sync);
 		if (sync->is_started) {
 			uint32_t ticks_to_expire;
-			uint32_t sync_remainder_us;
+			uint32_t sync_remainder_us = 0U;
 
 			LL_ASSERT(context->other_expire_info);
 
@@ -3377,6 +3377,7 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,
 			 * value.
 			 */
 			ticks_to_expire = context->other_expire_info->ticks_to_expire;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 			sync_remainder_us = context->other_expire_info->remainder;
 			hal_ticker_remove_jitter(&ticks_to_expire, &sync_remainder_us);
 
@@ -3384,6 +3385,7 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,
 			 * value.
 			 */
 			hal_ticker_add_jitter(&ticks_to_expire, &remainder);
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 
 			/* Store the offset in us */
 			lll_sync->us_adv_sync_pdu_offset = HAL_TICKER_TICKS_TO_US(ticks_to_expire) +
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
index d041f1e2a30bd..f8f7cb35d64a0 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
@@ -260,9 +260,7 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 	if (aux && aux->is_started) {
 		ticks_slot_aux = aux->ull.ticks_slot;
 		if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
-			ticks_slot_overhead =
-				MAX(aux->ull.ticks_active_to_start,
-				    aux->ull.ticks_prepare_to_start);
+			ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 		} else {
 			ticks_slot_overhead = 0U;
 		}
@@ -275,9 +273,7 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 		ticks_slot_aux = HAL_TICKER_US_TO_TICKS_CEIL(time_us);
 		if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 			/* Assume primary overheads may be inherited by aux */
-			ticks_slot_overhead =
-				MAX(adv->ull.ticks_active_to_start,
-				    adv->ull.ticks_prepare_to_start);
+			ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 		} else {
 			ticks_slot_overhead = 0U;
 		}
@@ -299,8 +295,7 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 	}
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
-		ticks_slot_overhead = MAX(sync->ull.ticks_active_to_start,
-					  sync->ull.ticks_prepare_to_start);
+		ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	} else {
 		ticks_slot_overhead = 0U;
 	}
@@ -483,15 +478,25 @@ static uint8_t big_create(uint8_t big_handle, uint8_t adv_handle, uint8_t num_bi
 	}
 
 	/* Based on packing requested, sequential or interleaved */
-	if (packing) {
+	if (false) {
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED)
+	} else if (packing) {
 		/* Interleaved Packing */
 		lll_adv_iso->bis_spacing = lll_adv_iso->sub_interval;
 		lll_adv_iso->sub_interval = lll_adv_iso->bis_spacing *
-					lll_adv_iso->nse;
-	} else {
+					    lll_adv_iso->num_bis;
+#endif /* CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED */
+
+#if defined(CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL)
+	} else if (true) {
 		/* Sequential Packing */
 		lll_adv_iso->bis_spacing = lll_adv_iso->sub_interval *
-					lll_adv_iso->nse;
+					   lll_adv_iso->nse;
+#endif /* CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL */
+
+	} else {
+		return BT_HCI_ERR_UNSUPP_FEATURE_PARAM_VAL;
 	}
 
 	/* TODO: Group count, GC = NSE / BN; PTO = GC - IRC;
@@ -1250,11 +1255,26 @@ static uint32_t adv_iso_time_get(const struct ll_adv_iso_set *adv_iso, bool max)
 	 */
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX) || max) {
+		/* Maximum time reservation for both sequential and interleaved
+		 * packing.
+		 */
 		time_us = (pdu_spacing * lll_iso->nse * lll_iso->num_bis) +
 			  ctrl_spacing;
-	} else {
+
+	} else if (lll_iso->bis_spacing >=
+		   (lll_iso->sub_interval * lll_iso->nse)) {
+		/* Time reservation omitting PTC subevents in sequetial
+		 * packing.
+		 */
 		time_us = pdu_spacing * ((lll_iso->nse * lll_iso->num_bis) -
 					 lll_iso->ptc);
+
+	} else {
+		/* Time reservation omitting PTC subevents in interleaved
+		 * packing.
+		 */
+		time_us = pdu_spacing * ((lll_iso->nse - lll_iso->ptc) *
+					 lll_iso->num_bis);
 	}
 
 	/* Add implementation defined radio event overheads */
@@ -1279,15 +1299,9 @@ static uint32_t adv_iso_start(struct ll_adv_iso_set *adv_iso,
 
 	slot_us = adv_iso_time_get(adv_iso, false);
 
-	adv_iso->ull.ticks_active_to_start = 0U;
-	adv_iso->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	adv_iso->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	adv_iso->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(slot_us);
 
-	ticks_slot_offset = MAX(adv_iso->ull.ticks_active_to_start,
-				adv_iso->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c b/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
index fb111a02f8b3a..72b1c3b1983ea 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
@@ -278,7 +278,7 @@ uint8_t ll_adv_sync_ad_data_set(uint8_t handle, uint8_t op, uint8_t len,
 	/* Check if periodic advertising is associated with advertising set */
 	lll_sync = adv->lll.sync;
 	if (!lll_sync) {
-		return BT_HCI_ERR_UNKNOWN_ADV_IDENTIFIER;
+		return BT_HCI_ERR_CMD_DISALLOWED;
 	}
 
 	sync = HDR_LLL2ULL(lll_sync);
@@ -804,16 +804,9 @@ uint32_t ull_adv_sync_evt_init(struct ll_adv_set *adv,
 
 	time_us = sync_time_get(sync, pdu);
 
-	/* TODO: active_to_start feature port */
-	sync->ull.ticks_active_to_start = 0U;
-	sync->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	sync->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	sync->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(time_us);
 
-	ticks_slot_offset = MAX(sync->ull.ticks_active_to_start,
-				sync->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
@@ -2690,7 +2683,7 @@ static void mfy_sync_offset_get(void *param)
 	uint32_t ticks_to_expire;
 	uint32_t ticks_current;
 	struct pdu_adv *pdu;
-	uint32_t remainder;
+	uint32_t remainder = 0U;
 	uint8_t chm_first;
 	uint8_t ticker_id;
 	uint16_t lazy;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_central.c b/subsys/bluetooth/controller/ll_sw/ull_central.c
index aadeeb8d8f6bb..000f1640223f7 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_central.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_central.c
@@ -316,13 +316,6 @@ uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
 	conn_lll->tifs_hcto_us = EVENT_IFS_DEFAULT_US;
 	conn_lll->tifs_cis_us = EVENT_IFS_DEFAULT_US;
 
-	/* TODO: active_to_start feature port */
-	conn->ull.ticks_active_to_start = 0U;
-	conn->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	conn->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
-
 #if defined(CONFIG_BT_CTLR_CHECK_SAME_PEER_CONN)
 	/* Remember peer and own identity address */
 	conn->peer_id_addr_type = peer_addr_type;
@@ -802,8 +795,7 @@ void ull_central_setup(struct node_rx_pdu *rx, struct node_rx_ftr *ftr,
 
 	ll_rx_put_sched(link, rx);
 
-	ticks_slot_offset = MAX(conn->ull.ticks_active_to_start,
-				conn->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
index d49256e3b0952..0459dee9b1626 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
@@ -600,11 +600,6 @@ uint8_t ll_cig_parameters_commit(uint8_t cig_id, uint16_t *handles)
 	slot_us += EVENT_OVERHEAD_START_US + EVENT_OVERHEAD_END_US;
 
 	/* Populate the ULL hdr with event timings overheads */
-	cig->ull.ticks_active_to_start = 0U;
-	cig->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	cig->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	cig->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(slot_us);
 #endif /* !CONFIG_BT_CTLR_JIT_SCHEDULING */
 
@@ -841,7 +836,6 @@ uint8_t ull_central_iso_setup(uint16_t cis_handle,
 {
 	struct ll_conn_iso_stream *cis;
 	struct ll_conn_iso_group *cig;
-	uint16_t event_counter;
 	struct ll_conn *conn;
 	uint16_t instant;
 
@@ -857,12 +851,14 @@ uint8_t ull_central_iso_setup(uint16_t cis_handle,
 
 	/* ACL connection of the new CIS */
 	conn = ll_conn_get(cis->lll.acl_handle);
-	event_counter = ull_conn_event_counter(conn);
-	instant = MAX(*conn_event_count, event_counter + 1);
 
 #if defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
+	uint16_t event_counter;
 	uint32_t cis_offset;
 
+	event_counter = ull_conn_event_counter(conn);
+	instant = MAX(*conn_event_count, event_counter + 1);
+
 	cis_offset = *cis_offset_min;
 
 	/* Calculate offset for CIS */
@@ -902,6 +898,8 @@ uint8_t ull_central_iso_setup(uint16_t cis_handle,
 
 #else /* !CONFIG_BT_CTLR_JIT_SCHEDULING */
 
+	instant = *conn_event_count;
+
 	if (false) {
 
 #if defined(CONFIG_BT_CTLR_CENTRAL_SPACING)
@@ -923,6 +921,8 @@ uint8_t ull_central_iso_setup(uint16_t cis_handle,
 	} else {
 		cis->offset = *cis_offset_min;
 	}
+
+	cis->lll.prepared = 0U;
 #endif /* !CONFIG_BT_CTLR_JIT_SCHEDULING */
 
 	cis->central.instant = instant;
@@ -975,7 +975,18 @@ int ull_central_iso_cis_offset_get(uint16_t cis_handle,
 
 	conn = ll_conn_get(cis->lll.acl_handle);
 
-	cis->central.instant = ull_conn_event_counter(conn) + 3U;
+	/* NOTE: CIS Create Procedure uses 3 PDU transmissions, hence minimum relative instant not
+	 *       be less than 3. As the CIS_REQ PDU will be transmitted in the next ACL interval,
+	 *       add +1 to the instant. The +1 also helps with the fact that currently we do not
+	 *       have Central implementation to handle event latencies at the instant. Refer to
+	 *       `ull_conn_iso_start()` implementation.
+	 *
+	 *       `ull_conn_llcp()` is called before `ull_ref_inc()` hence we do not need to use
+	 *       `ull_conn_event_counter()`.
+	 */
+	cis->central.instant = conn->lll.event_counter + conn->lll.latency_prepare +
+			       conn->llcp.prep.lazy + 4U;
+
 	*conn_event_count = cis->central.instant;
 
 	/* Provide CIS offset range
@@ -1090,7 +1101,7 @@ static void mfy_cis_offset_get(void *param)
 	uint32_t ticks_current;
 	uint32_t offset_min_us;
 	struct ll_conn *conn;
-	uint32_t remainder;
+	uint32_t remainder = 0U;
 	uint8_t ticker_id;
 	uint16_t lazy;
 	uint8_t retry;
@@ -1177,7 +1188,12 @@ static void mfy_cis_offset_get(void *param)
 	 * and latency counts (typically 3) is low enough to avoid 32-bit
 	 * overflow. Refer to ull_central_iso_cis_offset_get().
 	 */
-	latency_acl = cis->central.instant - ull_conn_event_counter(conn);
+	/* FIXME: Mayfly execution of `mfy_cig_offset_get()` could be before "LLL Prepare" or after
+	 *        conn->lll.event_counter could have been pre-incremented.
+	 *        This race condition needs a fix.
+	 */
+	latency_acl = cis->central.instant - conn->lll.event_counter - conn->lll.latency_prepare -
+		      conn->llcp.prep.lazy;
 	elapsed_acl_us = latency_acl * conn->lll.interval * CONN_INT_UNIT_US;
 
 	/* Calculate elapsed CIG intervals until the instant */
@@ -1201,7 +1217,7 @@ static void mfy_cis_offset_get(void *param)
 	 * CIG interval.
 	 */
 	if (offset_min_us > cig_interval_us) {
-		cis->lll.event_count--;
+		cis->lll.event_count_prepare--;
 	}
 
 	ull_cp_cc_offset_calc_reply(conn, offset_min_us, offset_min_us);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index 7661bfa6dd23e..1be21cfe420b1 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -706,6 +706,12 @@ uint8_t ll_apto_get(uint16_t handle, uint16_t *apto)
 {
 	struct ll_conn *conn;
 
+#if defined(CONFIG_BT_CTLR_ISO)
+	if (IS_CIS_HANDLE(handle) || IS_SYNC_ISO_HANDLE(handle) || IS_ADV_ISO_HANDLE(handle)) {
+		return BT_HCI_ERR_CMD_DISALLOWED;
+	}
+#endif /* CONFIG_BT_CTLR_ISO */
+
 	conn = ll_connected_get(handle);
 	if (!conn) {
 		return BT_HCI_ERR_UNKNOWN_CONN_ID;
@@ -726,6 +732,12 @@ uint8_t ll_apto_set(uint16_t handle, uint16_t apto)
 {
 	struct ll_conn *conn;
 
+#if defined(CONFIG_BT_CTLR_ISO)
+	if (IS_CIS_HANDLE(handle) || IS_SYNC_ISO_HANDLE(handle) || IS_ADV_ISO_HANDLE(handle)) {
+		return BT_HCI_ERR_CMD_DISALLOWED;
+	}
+#endif /* CONFIG_BT_CTLR_ISO */
+
 	conn = ll_connected_get(handle);
 	if (!conn) {
 		return BT_HCI_ERR_UNKNOWN_CONN_ID;
@@ -2227,8 +2239,8 @@ void ull_conn_update_parameters(struct ll_conn *conn, uint8_t is_cu_proc, uint8_
 	uint16_t conn_interval_unit_old;
 	uint16_t conn_interval_unit_new;
 	uint32_t ticks_win_offset = 0U;
-	uint16_t conn_interval_old_us;
-	uint16_t conn_interval_new_us;
+	uint32_t conn_interval_old_us;
+	uint32_t conn_interval_new_us;
 	uint32_t ticks_slot_overhead;
 	uint16_t conn_interval_old;
 	uint16_t conn_interval_new;
@@ -2251,18 +2263,6 @@ void ull_conn_update_parameters(struct ll_conn *conn, uint8_t is_cu_proc, uint8_
 
 	ticks_at_expire = conn->llcp.prep.ticks_at_expire;
 
-#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
-	/* restore to normal prepare */
-	if (conn->ull.ticks_prepare_to_start & XON_BITMASK) {
-		uint32_t ticks_prepare_to_start =
-			MAX(conn->ull.ticks_active_to_start, conn->ull.ticks_preempt_to_start);
-
-		conn->ull.ticks_prepare_to_start &= ~XON_BITMASK;
-
-		ticks_at_expire -= (conn->ull.ticks_prepare_to_start - ticks_prepare_to_start);
-	}
-#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
-
 #if defined(CONFIG_BT_CTLR_PHY)
 	ready_delay_us = lll_radio_tx_ready_delay_get(lll->phy_tx,
 						      lll->phy_flags);
@@ -2353,10 +2353,7 @@ void ull_conn_update_parameters(struct ll_conn *conn, uint8_t is_cu_proc, uint8_
 
 	/* calculate the offset */
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
-		ticks_slot_overhead =
-			MAX(conn->ull.ticks_active_to_start,
-			    conn->ull.ticks_prepare_to_start);
-
+		ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	} else {
 		ticks_slot_overhead = 0U;
 	}
@@ -2744,7 +2741,7 @@ static uint32_t get_ticker_offset(uint8_t ticker_id, uint16_t *lazy)
 	uint32_t ticks_to_expire;
 	uint32_t ticks_current;
 	uint32_t sync_remainder_us;
-	uint32_t remainder;
+	uint32_t remainder = 0U;
 	uint32_t start_us;
 	uint32_t ret;
 	uint8_t id;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
index b25267a34bd21..5907e7700799a 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
@@ -311,6 +311,7 @@ ull_conn_iso_lll_stream_sorted_get_by_group(struct lll_conn_iso_group *cig_lll,
 					    uint16_t *handle_iter)
 {
 	struct ll_conn_iso_stream *cis_next = NULL;
+	struct ll_conn_iso_stream *cis_curr;
 	struct ll_conn_iso_group *cig;
 	uint32_t cis_offset_curr;
 	uint32_t cis_offset_next;
@@ -322,16 +323,15 @@ ull_conn_iso_lll_stream_sorted_get_by_group(struct lll_conn_iso_group *cig_lll,
 		/* First in the iteration, start with a minimum offset value and
 		 * find the first CIS offset of the active CIS.
 		 */
+		cis_curr = NULL;
 		cis_offset_curr = 0U;
 	} else {
 		/* Subsequent iteration, get reference to current CIS and use
 		 * its CIS offset to find the next active CIS with offset
 		 * greater than the current CIS.
 		 */
-		struct ll_conn_iso_stream *cis_curr;
-
 		cis_curr = ll_conn_iso_stream_get(*handle_iter);
-		cis_offset_curr = cis_curr->offset;
+		cis_offset_curr = cis_curr->lll.offset;
 	}
 
 	cis_offset_next = UINT32_MAX;
@@ -346,7 +346,7 @@ ull_conn_iso_lll_stream_sorted_get_by_group(struct lll_conn_iso_group *cig_lll,
 
 		/* Match CIS contexts associated with the CIG */
 		if (cis->group == cig) {
-			if (cis->offset <= cis_offset_curr) {
+			if (cis_curr && (cis->lll.offset <= cis_offset_curr)) {
 				/* Skip already returned CISes with offsets less
 				 * than the current CIS.
 				 */
@@ -357,9 +357,9 @@ ull_conn_iso_lll_stream_sorted_get_by_group(struct lll_conn_iso_group *cig_lll,
 			 * lower than previous that we remember as the next CIS
 			 * in ascending order.
 			 */
-			if (cis->offset < cis_offset_next) {
+			if (cis->lll.offset < cis_offset_next) {
 				cis_next = cis;
-				cis_offset_next = cis_next->offset;
+				cis_offset_next = cis_next->lll.offset;
 
 				if (handle_iter) {
 					(*handle_iter) = handle;
@@ -977,10 +977,20 @@ void ull_conn_iso_start(struct ll_conn *conn, uint16_t cis_handle,
 
 			cis->lll.event_count_prepare += lost_cig_events;
 
-			lost_payloads = (lost_cig_events - (cis->lll.rx.ft - 1)) * cis->lll.rx.bn;
+			if (lost_cig_events > (cis->lll.rx.ft - 1)) {
+				lost_payloads = (lost_cig_events - (cis->lll.rx.ft - 1)) *
+						cis->lll.rx.bn;
+			} else {
+				lost_payloads = 0U;
+			}
 			cis->lll.rx.payload_count += lost_payloads;
 
-			lost_payloads = (lost_cig_events - (cis->lll.tx.ft - 1)) * cis->lll.tx.bn;
+			if (lost_cig_events > (cis->lll.tx.ft - 1)) {
+				lost_payloads = (lost_cig_events - (cis->lll.tx.ft - 1)) *
+						cis->lll.tx.bn;
+			} else {
+				lost_payloads = 0U;
+			}
 			cis->lll.tx.payload_count += lost_payloads;
 
 			/* Adjust for extra window widening */
@@ -1054,16 +1064,10 @@ void ull_conn_iso_start(struct ll_conn *conn, uint16_t cis_handle,
 		 */
 
 		/* Populate the ULL hdr with event timings overheads */
-		cig->ull.ticks_active_to_start = 0U;
-		cig->ull.ticks_prepare_to_start =
-			HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-		cig->ull.ticks_preempt_to_start =
-			HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 		cig->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(slot_us);
 	}
 
-	ticks_slot_offset = MAX(cig->ull.ticks_active_to_start,
-				cig->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
@@ -1075,6 +1079,7 @@ void ull_conn_iso_start(struct ll_conn *conn, uint16_t cis_handle,
 
 	/* Initialize CIS event lazy at CIS create */
 	cis->lll.lazy_active = 0U;
+	cis->lll.prepared = 0U;
 #endif /* !CONFIG_BT_CTLR_JIT_SCHEDULING */
 
 	/* Start CIS peripheral CIG ticker */
@@ -1113,7 +1118,7 @@ static void mfy_cis_lazy_fill(void *param)
 	struct ll_conn_iso_group *cig;
 	uint32_t ticks_to_expire;
 	uint32_t ticks_current;
-	uint32_t remainder;
+	uint32_t remainder = 0U;
 	uint16_t lazy = 0U;
 	uint8_t ticker_id;
 	uint8_t retry;
@@ -1178,6 +1183,7 @@ static void mfy_cis_lazy_fill(void *param)
 	 * CIG before the CIS gets active that be decremented when event_count
 	 * is incremented in ull_conn_iso_ticker_cb().
 	 */
+	cis->lll.prepared = 0U;
 	cis->lll.active = 1U;
 	cis->lll.lazy_active = lazy;
 }
@@ -1221,6 +1227,11 @@ static void cis_disabled_cb(void *param)
 	handle_iter = UINT16_MAX;
 	active_cises = 0;
 
+	if (cig->ull.disabled_cb == cis_disabled_cb) {
+		/* Reset disabled_cb */
+		cig->ull.disabled_cb = NULL;
+	}
+
 	/* Remove all CISes marked for teardown */
 	num_cis = cig->lll.num_cis;
 	for (cis_idx = 0; cis_idx < num_cis; cis_idx++) {
@@ -1287,7 +1298,6 @@ static void cis_disabled_cb(void *param)
 		} else if (cis->teardown) {
 			DECLARE_MAYFLY_ARRAY(mfys, cis_tx_lll_flush,
 				CONFIG_BT_CTLR_CONN_ISO_GROUPS);
-			uint32_t ret;
 
 			if (cis->established) {
 				struct node_rx_pdu *node_terminate;
@@ -1328,11 +1338,12 @@ static void cis_disabled_cb(void *param)
 			 */
 			cis->lll.flush = LLL_CIS_FLUSH_PENDING;
 
-			mfys[cig->lll.handle].param = &cis->lll;
-			ret = mayfly_enqueue(TICKER_USER_ID_ULL_HIGH,
+			/* Ignore enqueue error (already enqueued) as all CISes marked for
+			 * flushing will be handled in cis_tx_lll_flush
+			 */
+			mfys[cig->lll.handle].param = cig;
+			(void)mayfly_enqueue(TICKER_USER_ID_ULL_HIGH,
 					     TICKER_USER_ID_LLL, 1, &mfys[cig->lll.handle]);
-			LL_ASSERT(!ret);
-
 			return;
 		}
 	}
@@ -1359,37 +1370,58 @@ static void cis_tx_lll_flush(void *param)
 {
 	DECLARE_MAYFLY_ARRAY(mfys, cis_disabled_cb, CONFIG_BT_CTLR_CONN_ISO_GROUPS);
 
-	struct lll_conn_iso_stream *lll;
-	struct ll_conn_iso_stream *cis;
 	struct ll_conn_iso_group *cig;
-	struct node_tx_iso *tx;
-	memq_link_t *link;
+	uint16_t handle_iter;
+	uint8_t cis_idx;
+	uint8_t num_cis;
 
-	lll = param;
-	lll->active = 0U;
+	cig = param;
+	handle_iter = UINT16_MAX;
 
-	cis = ll_conn_iso_stream_get(lll->handle);
-	cig = cis->group;
+	/* Flush all CISes in CIG marked for flush */
+	num_cis = cig->lll.num_cis;
+	for (cis_idx = 0; cis_idx < num_cis; cis_idx++) {
+		struct lll_conn_iso_stream *lll;
+		struct ll_conn_iso_stream *cis;
+		struct node_tx_iso *tx;
+		memq_link_t *link;
+
+		cis = ll_conn_iso_stream_get_by_group(cig, &handle_iter);
+		LL_ASSERT(cis);
 
-	/* Flush in LLL - may return TX nodes to ack queue */
-	lll_conn_iso_flush(lll->handle, lll);
+		lll = &cis->lll;
 
-	link = memq_dequeue(lll->memq_tx.tail, &lll->memq_tx.head, (void **)&tx);
-	while (link) {
-		link->next = tx->next;
-		tx->next = link;
-		ull_iso_lll_ack_enqueue(lll->handle, tx);
+		if (lll->flush != LLL_CIS_FLUSH_PENDING) {
+			/* Not flushing this CIS, skip */
+			continue;
+		}
 
-		link = memq_dequeue(lll->memq_tx.tail, &lll->memq_tx.head,
-				    (void **)&tx);
-	}
+		lll->active = 0U;
 
-	LL_ASSERT(!lll->link_tx_free);
-	link = memq_deinit(&lll->memq_tx.head, &lll->memq_tx.tail);
-	LL_ASSERT(link);
-	lll->link_tx_free = link;
+#if !defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
+		lll->prepared = 0U;
+#endif /* !CONFIG_BT_CTLR_JIT_SCHEDULING */
+
+		/* Flush in LLL - may return TX nodes to ack queue */
+		lll_conn_iso_flush(lll->handle, lll);
+
+		link = memq_dequeue(lll->memq_tx.tail, &lll->memq_tx.head, (void **)&tx);
+		while (link) {
+			link->next = tx->next;
+			tx->next = link;
+			ull_iso_lll_ack_enqueue(lll->handle, tx);
 
-	lll->flush = LLL_CIS_FLUSH_COMPLETE;
+			link = memq_dequeue(lll->memq_tx.tail, &lll->memq_tx.head,
+					    (void **)&tx);
+		}
+
+		LL_ASSERT(!lll->link_tx_free);
+		link = memq_deinit(&lll->memq_tx.head, &lll->memq_tx.tail);
+		LL_ASSERT(link);
+		lll->link_tx_free = link;
+
+		lll->flush = LLL_CIS_FLUSH_COMPLETE;
+	}
 
 	/* Resume CIS teardown in ULL_HIGH context */
 	mfys[cig->lll.handle].param = &cig->lll;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_iso.c b/subsys/bluetooth/controller/ll_sw/ull_iso.c
index f10b4c15f1129..efbcf41181900 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_iso.c
@@ -156,12 +156,12 @@ void ll_iso_tx_mem_release(void *node_tx);
 
 static struct {
 	void *free;
-	uint8_t pool[NODE_TX_BUFFER_SIZE * BT_CTLR_ISO_TX_BUFFERS];
+	uint8_t pool[NODE_TX_BUFFER_SIZE * BT_CTLR_ISO_TX_PDU_BUFFERS];
 } mem_iso_tx;
 
 static struct {
 	void *free;
-	uint8_t pool[sizeof(memq_link_t) * BT_CTLR_ISO_TX_BUFFERS];
+	uint8_t pool[sizeof(memq_link_t) * BT_CTLR_ISO_TX_PDU_BUFFERS];
 } mem_link_iso_tx;
 
 #endif /* CONFIG_BT_CTLR_ADV_ISO || CONFIG_BT_CTLR_CONN_ISO */
@@ -1165,7 +1165,7 @@ void ll_iso_transmit_test_send_sdu(uint16_t handle, uint32_t ticks_at_expire)
 		sdu.grp_ref_point = isoal_get_wrapped_time_us(cig->cig_ref_point,
 						(event_offset * cig->iso_interval *
 							ISO_INT_UNIT_US));
-		sdu.target_event = cis->lll.event_count + event_offset;
+		sdu.target_event = cis->lll.event_count_prepare + event_offset;
 		sdu.iso_sdu_length = remaining_tx;
 
 		/* Send all SDU fragments */
@@ -1595,7 +1595,7 @@ static void iso_rx_cig_ref_point_update(struct ll_conn_iso_group *cig,
 	cig_sync_delay = cig->sync_delay;
 	cis_sync_delay = cis->sync_delay;
 	burst_number = cis->lll.rx.bn;
-	event_count = cis->lll.event_count;
+	event_count = cis->lll.event_count_prepare;
 
 	if (role) {
 		/* Peripheral */
@@ -1960,12 +1960,12 @@ static int init_reset(void)
 
 #if defined(CONFIG_BT_CTLR_ADV_ISO) || defined(CONFIG_BT_CTLR_CONN_ISO)
 	/* Initialize tx pool. */
-	mem_init(mem_iso_tx.pool, NODE_TX_BUFFER_SIZE, BT_CTLR_ISO_TX_BUFFERS,
+	mem_init(mem_iso_tx.pool, NODE_TX_BUFFER_SIZE, BT_CTLR_ISO_TX_PDU_BUFFERS,
 		 &mem_iso_tx.free);
 
 	/* Initialize tx link pool. */
-	mem_init(mem_link_iso_tx.pool, sizeof(memq_link_t),
-		 BT_CTLR_ISO_TX_BUFFERS, &mem_link_iso_tx.free);
+	mem_init(mem_link_iso_tx.pool, sizeof(memq_link_t), BT_CTLR_ISO_TX_PDU_BUFFERS,
+		 &mem_link_iso_tx.free);
 #endif /* CONFIG_BT_CTLR_ADV_ISO || CONFIG_BT_CTLR_CONN_ISO */
 
 #if BT_CTLR_ISO_STREAMS
diff --git a/subsys/bluetooth/controller/ll_sw/ull_iso_internal.h b/subsys/bluetooth/controller/ll_sw/ull_iso_internal.h
index bf4e66cbde041..4bd8fe1c620e1 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_iso_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_iso_internal.h
@@ -4,21 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if defined(CONFIG_BT_CTLR_ADV_ISO) || defined(CONFIG_BT_CTLR_CONN_ISO)
 /* Calculate ISO PDU buffers required considering SDU fragmentation */
-/* FIXME: Calculation considering both Connected and Broadcast ISO PDU
- *        fragmentation.
+#if defined(CONFIG_BT_CTLR_ADV_ISO) || defined(CONFIG_BT_CTLR_CONN_ISO)
+/* Internal ISO Tx SDU maximum length.
+ * A length that is minimum of the resultant combination of the HCI ISO data fragments provided and
+ * the user configured maximum transmit SDU length (CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX).
+ */
+#define BT_CTLR_ISO_TX_SDU_LEN_MAX MIN(((CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE * \
+					 CONFIG_BT_CTLR_ISO_TX_BUFFERS) - \
+					BT_HCI_ISO_SDU_HDR_SIZE), \
+				       CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX)
+
+BUILD_ASSERT(BT_CTLR_ISO_TX_SDU_LEN_MAX == CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX,
+	     "Insufficient ISO Buffer Size and Count for the required ISO SDU Length");
+
+/* Internal ISO Tx buffers to be allocated.
+ * Based on the internal ISO Tx SDU maximum length, calculate the required ISO Tx buffers (PDUs)
+ * required to fragment the SDU into PDU sizes scheduled for transmission.
+ */
+/* Defines the minimum required PDU length to help calculate the number of PDU buffers required
+ * At least one of CONFIG_BT_CTLR_ADV_ISO or CONFIG_BT_CTLR_CONN_ISO will always be enabled,
+ * so if either of them is not defined, it can default to the other
  */
-#if defined(CONFIG_BT_CTLR_CONN_ISO)
-#define BT_CTLR_ISO_TX_BUFFERS (((CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX + \
-				  CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX - 1U) / \
-				 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX) * \
-				CONFIG_BT_CTLR_ISO_TX_BUFFERS)
-#else /* !CONFIG_BT_CTLR_CONN_ISO */
-#define BT_CTLR_ISO_TX_BUFFERS CONFIG_BT_CTLR_ISO_TX_BUFFERS
-#endif /* !CONFIG_BT_CTLR_CONN_ISO */
+#define BT_CTLR_ISO_TX_MIN_PDU_LEN \
+	MIN(COND_CODE_1(IS_ENABLED(CONFIG_BT_CTLR_ADV_ISO), \
+			(CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX), \
+			(CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX)), \
+	    COND_CODE_1(IS_ENABLED(CONFIG_BT_CTLR_CONN_ISO), \
+			(CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX), \
+			(CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX)))
+#define BT_CTLR_ISO_TX_PDU_BUFFERS \
+	(DIV_ROUND_UP(BT_CTLR_ISO_TX_SDU_LEN_MAX, \
+		      MIN((CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE - BT_HCI_ISO_SDU_TS_HDR_SIZE), \
+			  BT_CTLR_ISO_TX_MIN_PDU_LEN)) * \
+	 CONFIG_BT_CTLR_ISO_TX_BUFFERS)
 #else /* !CONFIG_BT_CTLR_ADV_ISO && !CONFIG_BT_CTLR_CONN_ISO */
-#define BT_CTLR_ISO_TX_BUFFERS 0
+#define BT_CTLR_ISO_TX_PDU_BUFFERS 0
 #endif /* !CONFIG_BT_CTLR_ADV_ISO && !CONFIG_BT_CTLR_CONN_ISO */
 
 int ull_iso_init(void);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c
index 92e66dd8e35f1..f0d09e7635604 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c
@@ -53,6 +53,10 @@
 #include <soc.h>
 #include "hal/debug.h"
 
+#include <zephyr/bluetooth/iso.h>
+
+#define SUB_INTERVAL_MIN 400
+
 static void cc_ntf_established(struct ll_conn *conn, struct proc_ctx *ctx)
 {
 	struct node_rx_conn_iso_estab *pdu;
@@ -321,6 +325,82 @@ static uint8_t rp_cc_check_phy(struct ll_conn *conn, struct proc_ctx *ctx,
 	return BT_HCI_ERR_SUCCESS;
 }
 
+/* Validate that the LL_CIS_REQ parameters are valid according to the rules in
+ * Core Specification v5.4, Vol. 6, Part B, Section 2.4.2.29
+ */
+static uint8_t rp_cc_validate_req(struct ll_conn *conn, struct proc_ctx *ctx,
+				  struct pdu_data *pdu)
+{
+	uint32_t cis_offset_max;
+	uint32_t cis_offset_min;
+	uint32_t c_sdu_interval;
+	uint32_t p_sdu_interval;
+	uint32_t sub_interval;
+	uint16_t iso_interval;
+	uint16_t c_max_pdu;
+	uint16_t p_max_pdu;
+	uint8_t result;
+
+	result = rp_cc_check_phy(conn, ctx, pdu);
+	if (result != BT_HCI_ERR_SUCCESS) {
+		return result;
+	}
+
+	/* Note: SDU intervals are 20 bits; Mask away RFU bits */
+	c_sdu_interval = sys_get_le24(pdu->llctrl.cis_req.c_sdu_interval) & 0x0FFFFF;
+	p_sdu_interval = sys_get_le24(pdu->llctrl.cis_req.p_sdu_interval) & 0x0FFFFF;
+	if (c_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN ||
+	    p_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	c_max_pdu = sys_le16_to_cpu(pdu->llctrl.cis_req.c_max_pdu);
+	p_max_pdu = sys_le16_to_cpu(pdu->llctrl.cis_req.p_max_pdu);
+	if (c_max_pdu > BT_ISO_PDU_MAX || p_max_pdu > BT_ISO_PDU_MAX) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	if (!IN_RANGE(pdu->llctrl.cis_req.nse, BT_ISO_NSE_MIN, BT_ISO_NSE_MAX)) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	iso_interval = sys_le16_to_cpu(pdu->llctrl.cis_req.iso_interval);
+	sub_interval = sys_get_le24(pdu->llctrl.cis_req.sub_interval);
+	if (pdu->llctrl.cis_req.nse == 1) {
+		if (sub_interval > 0) {
+			return BT_HCI_ERR_INVALID_LL_PARAM;
+		}
+	} else if (!IN_RANGE(sub_interval, SUB_INTERVAL_MIN,
+			     iso_interval * CONN_INT_UNIT_US - 1)) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	if ((pdu->llctrl.cis_req.c_bn == 0 && c_max_pdu > 0) ||
+	    (pdu->llctrl.cis_req.p_bn == 0 && p_max_pdu > 0)) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	if (pdu->llctrl.cis_req.c_ft == 0 || pdu->llctrl.cis_req.p_ft == 0) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	if (!IN_RANGE(iso_interval, BT_HCI_ISO_INTERVAL_MIN, BT_HCI_ISO_INTERVAL_MAX)) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	cis_offset_min = sys_get_le24(pdu->llctrl.cis_req.cis_offset_min);
+	if (cis_offset_min < PDU_CIS_OFFSET_MIN_US) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	cis_offset_max = sys_get_le24(pdu->llctrl.cis_req.cis_offset_max);
+	if (!IN_RANGE(cis_offset_max, cis_offset_min, conn->lll.interval * CONN_INT_UNIT_US - 1)) {
+		return BT_HCI_ERR_INVALID_LL_PARAM;
+	}
+
+	return BT_HCI_ERR_SUCCESS;
+}
+
 static void rp_cc_state_wait_rx_cis_req(struct ll_conn *conn, struct proc_ctx *ctx, uint8_t evt,
 					void *param)
 {
@@ -331,8 +411,8 @@ static void rp_cc_state_wait_rx_cis_req(struct ll_conn *conn, struct proc_ctx *c
 		/* Handle CIS request */
 		llcp_pdu_decode_cis_req(ctx, pdu);
 
-		/* Check PHY */
-		ctx->data.cis_create.error = rp_cc_check_phy(conn, ctx, pdu);
+		/* Check validity of request */
+		ctx->data.cis_create.error = rp_cc_validate_req(conn, ctx, pdu);
 
 		if (ctx->data.cis_create.error == BT_HCI_ERR_SUCCESS) {
 			ctx->data.cis_create.error =
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c
index 240f2ccfab736..409200f4116dd 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c
@@ -901,8 +901,15 @@ void llcp_pdu_decode_cis_rsp(struct proc_ctx *ctx, struct pdu_data *pdu)
 		ctx->data.cis_create.cis_offset_max = cis_offset_max;
 	}
 
+	/* FIXME: We do not pick the instant from the response; if we do, then
+	 *        we need to calculate again a new offset because the ACL and
+	 *        ISO intervals can be dissimilar and hence will be a different
+	 *        CIS offset when sending the CIS_IND PDU at this instant.
+	 *
+
 	ctx->data.cis_create.conn_event_count =
 		sys_le16_to_cpu(pdu->llctrl.cis_rsp.conn_event_count);
+	 */
 }
 
 void llcp_pdu_encode_cis_ind(struct proc_ctx *ctx, struct pdu_data *pdu)
diff --git a/subsys/bluetooth/controller/ll_sw/ull_peripheral.c b/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
index 76ea607df4b0c..d23d50f2bf90b 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
@@ -400,16 +400,9 @@ void ull_periph_setup(struct node_rx_pdu *rx, struct node_rx_ftr *ftr,
 		slot_us += EVENT_OVERHEAD_START_US + EVENT_OVERHEAD_END_US;
 	}
 
-	/* TODO: active_to_start feature port */
-	conn->ull.ticks_active_to_start = 0U;
-	conn->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	conn->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	conn->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(slot_us);
 
-	ticks_slot_offset = MAX(conn->ull.ticks_active_to_start,
-				conn->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
index 77b3f240f1b1f..6e6ce570e9fe5 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
@@ -257,6 +257,11 @@ uint8_t ull_peripheral_iso_acquire(struct ll_conn *acl,
 				    req->p_max_sdu[0];
 
 	cis->lll.active = 0U;
+
+#if !defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
+	cis->lll.prepared = 0U;
+#endif /* !CONFIG_BT_CTLR_JIT_SCHEDULING */
+
 	cis->lll.handle = LLL_HANDLE_INVALID;
 	cis->lll.acl_handle = acl->lll.handle;
 	cis->lll.sub_interval = sys_get_le24(req->sub_interval);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan.c b/subsys/bluetooth/controller/ll_sw/ull_scan.c
index a1d90d3cc7500..493c2330db0b8 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan.c
@@ -411,16 +411,8 @@ uint8_t ull_scan_enable(struct ll_scan_set *scan)
 	ticks_interval = HAL_TICKER_US_TO_TICKS((uint64_t)lll->interval *
 						SCAN_INT_UNIT_US);
 
-	/* TODO: active_to_start feature port */
-	scan->ull.ticks_active_to_start = 0U;
-	scan->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	scan->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
-
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
-		ticks_slot_overhead = MAX(scan->ull.ticks_active_to_start,
-					  scan->ull.ticks_prepare_to_start);
+		ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	} else {
 		ticks_slot_overhead = 0U;
 	}
@@ -610,6 +602,9 @@ uint8_t ull_scan_enable(struct ll_scan_set *scan)
 	ret_cb = TICKER_STATUS_BUSY;
 
 #if defined(CONFIG_BT_TICKER_EXT)
+#if defined(CONFIG_BT_TICKER_EXT_EXPIRE_INFO)
+	ll_scan_ticker_ext[handle].expire_info_id = TICKER_NULL;
+#endif /* CONFIG_BT_TICKER_EXT_EXPIRE_INFO */
 	ret = ticker_start_ext(
 #else
 	ret = ticker_start(
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
index 7de4c201768dc..170168df237a1 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
@@ -872,19 +872,12 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 		aux->rx_head = rx;
 	}
 
-	/* TODO: active_to_start feature port */
-	aux->ull.ticks_active_to_start = 0;
-	aux->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	aux->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	aux->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(
 		EVENT_OVERHEAD_START_US + ready_delay_us +
 		PDU_AC_MAX_US(PDU_AC_EXT_PAYLOAD_RX_SIZE, lll_aux->phy) +
 		EVENT_OVERHEAD_END_US);
 
-	ticks_slot_offset = MAX(aux->ull.ticks_active_to_start,
-				aux->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
@@ -1126,6 +1119,10 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 	param_ull = HDR_LLL2ULL(rx->rx_ftr.param);
 
 	if (ull_scan_is_valid_get(param_ull)) {
+		/* Release aux context when LLL scheduled auxiliary PDU
+		 * reception is_abort on duration expire or aborted in the
+		 * unreserved time space.
+		 */
 		struct lll_scan *lll;
 
 		/* Mark for buffer for release */
@@ -1134,8 +1131,21 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		lll = rx->rx_ftr.param;
 		lll_aux = rx->rx_ftr.lll_aux;
 
+		/* Under race condition when LLL scheduling a reception of
+		 * auxiliary PDU, a scan aux context may be assigned late and
+		 * the node rx releasing the aux context will not have it.
+		 * Release the scan aux context assigned in the scan context.
+		 */
+		if (!lll_aux) {
+			lll_aux = lll->lll_aux;
+		}
+
 	} else if (!IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC) ||
 		   ull_scan_aux_is_valid_get(param_ull)) {
+		/* Release aux context when ULL scheduled auxiliary PDU
+		 * reception is aborted.
+		 */
+
 		/* Mark for buffer for release */
 		rx->hdr.type = NODE_RX_TYPE_RELEASE;
 
@@ -1150,9 +1160,21 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		/* reset data len total */
 		sync->data_len = 0U;
 
+		/* Release aux context in case of chain PDU reception, otherwise
+		 * lll_aux is NULL.
+		 */
 		lll = rx->rx_ftr.param;
 		lll_aux = rx->rx_ftr.lll_aux;
 
+		/* Under race condition when LLL scheduling a reception of
+		 * auxiliary PDU, a scan aux context may be assigned late and
+		 * the node rx releasing the aux context will not have it.
+		 * Release the scan aux context assigned in the sync context.
+		 */
+		if (!lll_aux) {
+			lll_aux = lll->lll_aux;
+		}
+
 		/* Change node type so HCI can dispatch report for truncated
 		 * data properly.
 		 */
@@ -1183,13 +1205,16 @@ void ull_scan_aux_release(memq_link_t *link, struct node_rx_pdu *rx)
 		scan = ull_scan_is_valid_get(scan);
 		if (scan) {
 			is_stop = scan->is_stop;
-		} else {
+		} else if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_PERIODIC)) {
 			struct lll_sync *sync_lll;
 			struct ll_sync_set *sync;
 
 			sync_lll = (void *)lll;
 			sync = HDR_LLL2ULL(sync_lll);
 			is_stop = sync->is_stop;
+		} else {
+			LL_ASSERT(0);
+			return;
 		}
 
 		if (!is_stop) {
@@ -2023,6 +2048,10 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 		uint32_t ticks_now;
 		uint32_t diff;
 
+#if defined(CONFIG_BT_TICKER_SLOT_AGNOSTIC)
+		/* CPU execution overhead to setup the radio for reception */
+		overhead_us = EVENT_OVERHEAD_START_US;
+#else /* !CONFIG_BT_TICKER_SLOT_AGNOSTIC */
 		/* CPU execution overhead to setup the radio for reception plus the
 		 * minimum prepare tick offset. And allow one additional event in
 		 * between as overhead (say, an advertising event in between got closed
@@ -2030,6 +2059,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_pdu *rx)
 		 */
 		overhead_us = (EVENT_OVERHEAD_END_US + EVENT_OVERHEAD_START_US +
 			       HAL_TICKER_TICKS_TO_US(HAL_TICKER_CNTR_CMP_OFFSET_MIN)) << 1;
+#endif /* !CONFIG_BT_TICKER_SLOT_AGNOSTIC */
 
 		ticks_now = ticker_ticks_now_get();
 		ticks_at_expire = ftr->ticks_anchor + ticks_aux_offset -
@@ -2728,19 +2758,12 @@ static void chain_start_ticker(struct ll_scan_aux_chain *chain, bool replace)
 
 	ready_delay_us = lll_radio_rx_ready_delay_get(chain->lll.phy, PHY_FLAGS_S8);
 
-	/* TODO: active_to_start feature port */
-	scan_aux_set.ull.ticks_active_to_start = 0;
-	scan_aux_set.ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	scan_aux_set.ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	scan_aux_set.ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(
 		EVENT_OVERHEAD_START_US + ready_delay_us +
 		PDU_AC_MAX_US(PDU_AC_EXT_PAYLOAD_RX_SIZE, chain->lll.phy) +
 		EVENT_OVERHEAD_END_US);
 
-	ticks_slot_offset = MAX(scan_aux_set.ull.ticks_active_to_start,
-				scan_aux_set.ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sched.c b/subsys/bluetooth/controller/ll_sw/ull_sched.c
index 0725d6784dbce..116ea101d1330 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sched.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sched.c
@@ -127,7 +127,7 @@ int ull_sched_after_cen_slot_get(uint8_t user_id, uint32_t ticks_slot_abs,
 {
 	uint32_t ticks_to_expire;
 	uint32_t ticks_slot;
-	uint32_t remainder;
+	uint32_t remainder = 0U;
 	uint8_t ticker_id;
 
 	ticker_id = after_match_slot_get(user_id, ticks_slot_abs,
@@ -180,8 +180,7 @@ void ull_sched_mfy_after_cen_offset_get(void *param)
 
 	conn = HDR_LLL2ULL(lll->conn);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
-		ticks_slot_overhead = MAX(conn->ull.ticks_active_to_start,
-					  conn->ull.ticks_prepare_to_start);
+		ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	} else {
 		ticks_slot_overhead = 0U;
 	}
@@ -204,12 +203,10 @@ void ull_sched_mfy_after_cen_offset_get(void *param)
 
 void ull_sched_mfy_win_offset_use(void *param)
 {
-	struct ll_conn *conn = param;
 	uint32_t ticks_slot_overhead;
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
-		ticks_slot_overhead = MAX(conn->ull.ticks_active_to_start,
-					  conn->ull.ticks_prepare_to_start);
+		ticks_slot_overhead = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	} else {
 		ticks_slot_overhead = 0U;
 	}
@@ -505,28 +502,22 @@ static uint8_t after_match_slot_get(uint8_t user_id, uint32_t ticks_slot_abs,
 			continue;
 		}
 
+#if defined(CONFIG_BT_CONN)
+		/* Consider Peripheral role ticks_slot as available */
+		if (IN_RANGE(ticker_id, TICKER_ID_CONN_BASE, TICKER_ID_CONN_LAST)) {
+			const struct ll_conn *conn;
+
+			conn = ll_conn_get(ticker_id - TICKER_ID_CONN_BASE);
+			if (conn && (conn->lll.role == BT_HCI_ROLE_PERIPHERAL)) {
+				continue;
+			}
+		}
+#endif /* CONFIG_BT_CONN */
+
 		ticks_to_expire_normal = ticks_to_expire;
 
 #if defined(CONFIG_BT_CTLR_LOW_LAT)
-#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
-		if (hdr->ticks_prepare_to_start & XON_BITMASK) {
-			const uint32_t ticks_prepare_to_start =
-				MAX(hdr->ticks_active_to_start,
-				    hdr->ticks_preempt_to_start);
-
-			ticks_slot_abs_curr = hdr->ticks_prepare_to_start &
-					      ~XON_BITMASK;
-			ticks_to_expire_normal -= ticks_slot_abs_curr -
-						  ticks_prepare_to_start;
-		} else
-#endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
-		{
-			const uint32_t ticks_prepare_to_start =
-				MAX(hdr->ticks_active_to_start,
-				    hdr->ticks_prepare_to_start);
-
-			ticks_slot_abs_curr = ticks_prepare_to_start;
-		}
+		ticks_slot_abs_curr = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 #endif
 
 		ticks_slot_abs_curr += ticks_slot;
@@ -701,8 +692,9 @@ static struct ull_hdr *ull_hdr_get_cb(uint8_t ticker_id, uint32_t *ticks_slot)
 		struct ll_conn *conn;
 
 		conn = ll_conn_get(ticker_id - TICKER_ID_CONN_BASE);
-		if (conn && !conn->lll.role) {
-			if (IS_ENABLED(CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX)) {
+		if (conn) {
+			if (IS_ENABLED(CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX) &&
+			    (conn->lll.role == BT_HCI_ROLE_CENTRAL)) {
 				uint32_t ready_delay_us;
 				uint16_t max_tx_time;
 				uint16_t max_rx_time;
@@ -739,7 +731,9 @@ static struct ull_hdr *ull_hdr_get_cb(uint8_t ticker_id, uint32_t *ticks_slot)
 				*ticks_slot = conn->ull.ticks_slot;
 			}
 
-			if (*ticks_slot < HAL_TICKER_US_TO_TICKS(CONFIG_BT_CTLR_CENTRAL_SPACING)) {
+			if ((conn->lll.role == BT_HCI_ROLE_CENTRAL) &&
+			    (*ticks_slot <
+			     HAL_TICKER_US_TO_TICKS(CONFIG_BT_CTLR_CENTRAL_SPACING))) {
 				*ticks_slot =
 					HAL_TICKER_US_TO_TICKS(CONFIG_BT_CTLR_CENTRAL_SPACING);
 			}
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync.c b/subsys/bluetooth/controller/ll_sw/ull_sync.c
index 9094366716ffa..403f5075d6e5c 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync.c
@@ -394,16 +394,9 @@ void ull_sync_setup_from_sync_transfer(struct ll_conn *conn, uint16_t service_da
 		slot_us += EVENT_OVERHEAD_START_US + EVENT_OVERHEAD_END_US;
 	}
 
-	/* TODO: active_to_start feature port */
-	sync->ull.ticks_active_to_start = 0U;
-	sync->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	sync->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	sync->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(slot_us);
 
-	ticks_slot_offset = MAX(sync->ull.ticks_active_to_start,
-				sync->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
@@ -1138,16 +1131,9 @@ void ull_sync_setup(struct ll_scan_set *scan, uint8_t phy,
 		slot_us += EVENT_OVERHEAD_START_US + EVENT_OVERHEAD_END_US;
 	}
 
-	/* TODO: active_to_start feature port */
-	sync->ull.ticks_active_to_start = 0U;
-	sync->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	sync->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	sync->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(slot_us);
 
-	ticks_slot_offset = MAX(sync->ull.ticks_active_to_start,
-				sync->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
index f9aa64863cfa1..816bd18fcc20e 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
@@ -147,7 +147,8 @@ uint8_t ll_big_sync_create(uint8_t big_handle, uint16_t sync_handle,
 	}
 
 	/* Check if free BISes available */
-	if (mem_free_count_get(stream_free) < num_bis) {
+	if ((num_bis > BT_CTLR_SYNC_ISO_STREAM_MAX) ||
+	    (mem_free_count_get(stream_free) < num_bis)) {
 		return BT_HCI_ERR_INSUFFICIENT_RESOURCES;
 	}
 
@@ -580,10 +581,15 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso,
 	sync_iso_offset_us += PDU_BIG_INFO_OFFS_GET(bi) *
 			      lll->window_size_event_us;
 	/* Skip to first selected BIS subevent */
-	/* FIXME: add support for interleaved packing */
 	stream = ull_sync_iso_stream_get(lll->stream_handle[0]);
-	sync_iso_offset_us += (stream->bis_index - 1U) * lll->sub_interval *
-			      ((lll->irc * lll->bn) + lll->ptc);
+	if (lll->bis_spacing >= (lll->sub_interval * lll->nse)) {
+		sync_iso_offset_us += (stream->bis_index - 1U) *
+				      lll->sub_interval *
+				      ((lll->irc * lll->bn) + lll->ptc);
+	} else {
+		sync_iso_offset_us += (stream->bis_index - 1U) *
+				      lll->bis_spacing;
+	}
 	sync_iso_offset_us -= PDU_AC_US(pdu->len, sync_iso->sync->lll.phy,
 					ftr->phy_flags);
 	sync_iso_offset_us -= EVENT_TICKER_RES_MARGIN_US;
@@ -651,16 +657,9 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso,
 		slot_us += EVENT_OVERHEAD_START_US + EVENT_OVERHEAD_END_US;
 	}
 
-	/* TODO: active_to_start feature port */
-	sync_iso->ull.ticks_active_to_start = 0U;
-	sync_iso->ull.ticks_prepare_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
-	sync_iso->ull.ticks_preempt_to_start =
-		HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_PREEMPT_MIN_US);
 	sync_iso->ull.ticks_slot = HAL_TICKER_US_TO_TICKS_CEIL(slot_us);
 
-	ticks_slot_offset = MAX(sync_iso->ull.ticks_active_to_start,
-				sync_iso->ull.ticks_prepare_to_start);
+	ticks_slot_offset = HAL_TICKER_US_TO_TICKS(EVENT_OVERHEAD_XTAL_US);
 	if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT)) {
 		ticks_slot_overhead = ticks_slot_offset;
 	} else {
diff --git a/subsys/bluetooth/controller/ticker/ticker.c b/subsys/bluetooth/controller/ticker/ticker.c
index 7806956c630ac..4c8ef7fa4b40e 100644
--- a/subsys/bluetooth/controller/ticker/ticker.c
+++ b/subsys/bluetooth/controller/ticker/ticker.c
@@ -121,7 +121,9 @@ struct ticker_node {
 
 struct ticker_expire_info_internal {
 	uint32_t ticks_to_expire;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 	uint32_t remainder;
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 	uint16_t lazy;
 	uint8_t ticker_id;
 	uint8_t outdated:1;
@@ -361,8 +363,9 @@ static struct ticker_instance _instance[TICKER_INSTANCE_MAX];
 /*****************************************************************************
  * Static Functions
  ****************************************************************************/
-
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 static inline uint8_t ticker_add_to_remainder(uint32_t *remainder, uint32_t to_add);
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 
 /**
  * @brief Update elapsed index
@@ -1101,7 +1104,9 @@ static void ticker_get_expire_info(struct ticker_instance *instance, uint8_t to_
 		}
 
 		expire_info->ticks_to_expire = to_ticks - from_ticks;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 		expire_info->remainder = to_remainder;
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 		expire_info->lazy = to_ticker->lazy_current;
 		expire_info->found = 1;
 	} else {
@@ -1576,6 +1581,7 @@ static void ticks_to_expire_prep(struct ticker_node *ticker,
 	ticker->ticks_to_expire_minus = ticks_to_expire_minus;
 }
 
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 /**
  * @brief Add to remainder
  *
@@ -1605,7 +1611,6 @@ static inline uint8_t ticker_add_to_remainder(uint32_t *remainder, uint32_t to_a
 	return 0;
 }
 
-#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 /**
  * @brief Increment remainder
  *
@@ -2245,7 +2250,9 @@ static inline void ticker_job_worker_bh(struct ticker_instance *instance,
 			count = 1 + ticker->lazy_periodic;
 			while (count--) {
 				ticks_to_expire += ticker->ticks_periodic;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 				ticks_to_expire += ticker_remainder_inc(ticker);
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 			}
 
 			/* Skip intervals that have elapsed w.r.t. current
@@ -2256,7 +2263,9 @@ static inline void ticker_job_worker_bh(struct ticker_instance *instance,
 			/* Schedule to a tick in the future */
 			while (ticks_to_expire < ticks_latency) {
 				ticks_to_expire += ticker->ticks_periodic;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 				ticks_to_expire += ticker_remainder_inc(ticker);
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 				lazy++;
 			}
 
@@ -2792,8 +2801,10 @@ static inline uint8_t ticker_job_insert(struct ticker_instance *instance,
 
 		/* occupied, try next interval */
 		if (ticker->ticks_periodic != 0U) {
-			ticker->ticks_to_expire += ticker->ticks_periodic +
-						   ticker_remainder_inc(ticker);
+			ticker->ticks_to_expire += ticker->ticks_periodic;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
+			ticker->ticks_to_expire += ticker_remainder_inc(ticker);
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 			ticker->lazy_current++;
 
 			/* No. of times ticker has skipped its interval */
diff --git a/subsys/bluetooth/controller/ticker/ticker.h b/subsys/bluetooth/controller/ticker/ticker.h
index aa666036ab01c..c2dc59318bef8 100644
--- a/subsys/bluetooth/controller/ticker/ticker.h
+++ b/subsys/bluetooth/controller/ticker/ticker.h
@@ -136,7 +136,9 @@ typedef void (*ticker_timeout_func) (uint32_t ticks_at_expire,
 
 struct ticker_expire_info {
 	uint32_t ticks_to_expire;
+#if defined(CONFIG_BT_TICKER_REMAINDER_SUPPORT)
 	uint32_t remainder;
+#endif /* CONFIG_BT_TICKER_REMAINDER_SUPPORT */
 	uint16_t lazy;
 };
 
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index d49ea5c8fdec0..e77bd9220a2ae 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -15,12 +15,13 @@ config BT_LONG_WQ_STACK_SIZE
 	# Hidden: Long workqueue stack size. Should be derived from system
 	# requirements.
 	int
+	default 4096 if NO_OPTIMIZATIONS
 	default 1400 if BT_ECC
 	default 1300 if BT_GATT_CACHING
 	default 1024
 
 config BT_LONG_WQ_PRIO
-	int "Long workqueue priority. Should be pre-emptible."
+	int "Long workqueue priority. Should be preemptible."
 	default 10
 	range 0 NUM_PREEMPT_PRIORITIES
 
@@ -978,7 +979,7 @@ config BT_DF_VS_CL_IQ_REPORT_16_BITS_IQ_SAMPLES
 	bool "Use 16 bits signed integer IQ samples in connectionless IQ reports"
 	depends on BT_DF_CONNECTIONLESS_CTE_RX && BT_HCI_VS
 	help
-	  Direction Finging connectionless IQ reports provide a set of IQ samples collected during
+	  Direction Finding connectionless IQ reports provide a set of IQ samples collected during
 	  sampling of CTE. Bluetooth 5.3 Core Specification defines IQ samples to be 8 bits signed
 	  integer, see Vol 4, Part E section 7.7.65.21. This option enables a vendor specific Host
 	  extension to handle connectionless IQ reports with samples that are in 16 bit signed
@@ -988,7 +989,7 @@ config BT_DF_VS_CONN_IQ_REPORT_16_BITS_IQ_SAMPLES
 	bool "Use 16 bits signed integer IQ samples in connection IQ reports"
 	depends on BT_DF_CONNECTION_CTE_RX && BT_HCI_VS
 	help
-	  Direction Finging connection IQ reports provide a set of IQ samples collected during
+	  Direction Finding connection IQ reports provide a set of IQ samples collected during
 	  sampling of CTE. Bluetooth 5.3 Core Specification defines IQ samples to be 8 bits signed
 	  integer, see Vol 4, Part E sections 7.7.65.22. This option enables a vendor specific Host
 	  extension to handle connection IQ report with samples that are in 16 bit signed integer
diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index eb5eed8a25a3e..a04241a3e94f6 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -272,7 +272,7 @@ choice BT_DEVICE_NAME_GATT_WRITABLE_SECURITY
 	prompt "Security requirements"
 	default DEVICE_NAME_GATT_WRITABLE_ENCRYPT
 	help
-	  Select security requirementsf for writing device name by remote GATT
+	  Select security requirements for writing device name by remote GATT
 	  clients.
 
 config DEVICE_NAME_GATT_WRITABLE_NONE
@@ -300,7 +300,7 @@ choice BT_DEVICE_APPEARANCE_GATT_WRITABLE
 	prompt "Security requirements"
 	default DEVICE_APPEARANCE_GATT_WRITABLE_AUTHEN
 	help
-	  Select security requirementsf for writing device name by remote GATT
+	  Select security requirements for writing device name by remote GATT
 	  clients.
 
 config BT_DEVICE_APPEARANCE_GATT_WRITABLE_NONE
diff --git a/subsys/bluetooth/host/addr.c b/subsys/bluetooth/host/addr.c
index 24e0303efbea0..bc6d984808127 100644
--- a/subsys/bluetooth/host/addr.c
+++ b/subsys/bluetooth/host/addr.c
@@ -5,14 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
 #include <stdbool.h>
 #include <string.h>
-#include <errno.h>
-
-#include <zephyr/sys/util.h>
 
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/crypto.h>
+#include <zephyr/sys/util.h>
 
 #define ADDR_RESOLVED_BITMASK (0x02)
 
diff --git a/subsys/bluetooth/host/adv.c b/subsys/bluetooth/host/adv.c
index d99144a420de0..0694c2ce54b35 100644
--- a/subsys/bluetooth/host/adv.c
+++ b/subsys/bluetooth/host/adv.c
@@ -4,25 +4,38 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <sys/types.h>
-
-#include <zephyr/sys/byteorder.h>
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <sys/types.h>
 
 #include "addr_internal.h"
-#include "hci_core.h"
+#include "common/bt_str.h"
 #include "conn_internal.h"
+#include "hci_core.h"
 #include "id.h"
 #include "scan.h"
 
-#include "common/bt_str.h"
-
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_adv);
 
 enum adv_name_type {
@@ -1127,10 +1140,25 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	uint16_t size;
 	bool dir_adv = param->peer != NULL, scannable;
 	struct net_buf *buf, *rsp;
+	uint8_t own_addr_type;
 	int err;
 	enum adv_name_type name_type;
 	uint16_t props = 0;
 
+	adv->options = param->options;
+
+	err = bt_id_set_adv_own_addr(adv, param->options, dir_adv,
+				     &own_addr_type);
+	if (err) {
+		return err;
+	}
+
+	if (dir_adv) {
+		bt_addr_le_copy(&adv->target_addr, param->peer);
+	} else {
+		bt_addr_le_copy(&adv->target_addr, BT_ADDR_LE_ANY);
+	}
+
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
 	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
 		opcode = BT_HCI_OP_LE_SET_EXT_ADV_PARAM_V2;
@@ -1148,31 +1176,15 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	cp = net_buf_add(buf, size);
 	(void)memset(cp, 0, size);
 
-	adv->options = param->options;
-
-	err = bt_id_set_adv_own_addr(adv, param->options, dir_adv,
-				     &cp->own_addr_type);
-	if (err) {
-		net_buf_unref(buf);
-		return err;
-	}
-
-	if (dir_adv) {
-		bt_addr_le_copy(&adv->target_addr, param->peer);
-	} else {
-		bt_addr_le_copy(&adv->target_addr, BT_ADDR_LE_ANY);
-	}
-
-	name_type = get_adv_name_type_param(param);
-
 	cp->handle = adv->handle;
 	sys_put_le24(param->interval_min, cp->prim_min_interval);
 	sys_put_le24(param->interval_max, cp->prim_max_interval);
 	cp->prim_channel_map = get_adv_channel_map(param->options);
+	cp->own_addr_type = own_addr_type;
 	cp->filter_policy = get_filter_policy(param->options);
 	cp->tx_power = BT_HCI_LE_ADV_TX_POWER_NO_PREF;
-
 	cp->prim_adv_phy = BT_HCI_LE_PHY_1M;
+
 	if ((param->options & BT_LE_ADV_OPT_EXT_ADV) &&
 	    !(param->options & BT_LE_ADV_OPT_NO_2M)) {
 		cp->sec_adv_phy = BT_HCI_LE_PHY_2M;
@@ -1229,6 +1241,8 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 		}
 	}
 
+	name_type = get_adv_name_type_param(param);
+
 	if ((param->options & BT_LE_ADV_OPT_SCANNABLE) || has_scan_data ||
 	    (name_type == ADV_NAME_TYPE_SD)) {
 		props |= BT_HCI_LE_ADV_PROP_SCAN;
@@ -1250,6 +1264,7 @@ static int le_ext_adv_param_set(struct bt_le_ext_adv *adv,
 	cp->sec_adv_max_skip = param->secondary_max_skip;
 
 	cp->props = sys_cpu_to_le16(props);
+
 	err = bt_hci_cmd_send_sync(opcode, buf, &rsp);
 	if (err) {
 		return err;
diff --git a/subsys/bluetooth/host/adv.h b/subsys/bluetooth/host/adv.h
index 3a03bfe8f4c85..65ad51135ce0a 100644
--- a/subsys/bluetooth/host/adv.h
+++ b/subsys/bluetooth/host/adv.h
@@ -5,6 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+
 void bt_le_adv_resume(void);
 
 struct bt_le_ext_adv *bt_le_adv_lookup_legacy(void);
diff --git a/subsys/bluetooth/host/aes_ccm.c b/subsys/bluetooth/host/aes_ccm.c
index 2e0022cf4eb16..8f3f5dc680f78 100644
--- a/subsys/bluetooth/host/aes_ccm.c
+++ b/subsys/bluetooth/host/aes_ccm.c
@@ -5,16 +5,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
+#include <stdint.h>
 #include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/crypto.h>
 #include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/bluetooth/crypto.h>
 
 #include "common/bt_str.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_aes_ccm);
 
 static inline void xor16(uint8_t *dst, const uint8_t *a, const uint8_t *b)
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 1ae38457255ba..b2cfbfee722ba 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -5,34 +5,44 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
-#include <string.h>
-#include <errno.h>
-#include <stdbool.h>
+#include <zephyr/kernel/thread.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
+#include <sys/types.h>
 
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/att.h>
-#include <zephyr/bluetooth/gatt.h>
-
+#include "att_internal.h"
 #include "common/bt_str.h"
-
-#include "hci_core.h"
 #include "conn_internal.h"
+#include "gatt_internal.h"
+#include "hci_core.h"
 #include "l2cap_internal.h"
 #include "smp.h"
-#include "att_internal.h"
-#include "gatt_internal.h"
 
 #define LOG_LEVEL CONFIG_BT_ATT_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_att);
 
 #define ATT_CHAN(_ch) CONTAINER_OF(_ch, struct bt_att_chan, chan.chan)
@@ -295,8 +305,6 @@ static void bt_att_disconnected(struct bt_l2cap_chan *chan);
 
 struct net_buf *bt_att_create_rsp_pdu(struct bt_att_chan *chan, uint8_t op);
 
-static void bt_att_sent(struct bt_l2cap_chan *ch);
-
 static void att_disconnect(struct bt_att_chan *chan)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
@@ -319,26 +327,6 @@ static void att_disconnect(struct bt_att_chan *chan)
 	}
 }
 
-static void att_sent(void *user_data)
-{
-	struct bt_att_tx_meta_data *data = user_data;
-	struct bt_att_chan *att_chan = data->att_chan;
-	struct bt_conn *conn = att_chan->att->conn;
-	struct bt_l2cap_chan *chan = &att_chan->chan.chan;
-
-	__ASSERT_NO_MSG(!bt_att_is_enhanced(att_chan));
-
-	LOG_DBG("conn %p chan %p", conn, chan);
-
-	/* For EATT, `bt_att_sent` is assigned to the `.sent` L2 callback.
-	 * L2CAP will then call it once the SDU has finished sending.
-	 *
-	 * For UATT, this won't happen, as static LE l2cap channels don't have
-	 * SDUs. Call it manually instead.
-	 */
-	bt_att_sent(chan);
-}
-
 /* In case of success the ownership of the buffer is transferred to the stack
  * which takes care of releasing it when it completes transmitting to the
  * controller.
@@ -549,7 +537,7 @@ static int process_queue(struct bt_att_chan *chan, struct k_fifo *queue)
 }
 
 /* Send requests without taking tx_sem */
-static int chan_req_send(struct bt_att_chan *chan, struct bt_att_req *req)
+static int bt_att_chan_req_send(struct bt_att_chan *chan, struct bt_att_req *req)
 {
 	struct net_buf *buf;
 	int err;
@@ -606,7 +594,8 @@ static void bt_att_sent(struct bt_l2cap_chan *ch)
 	if (!chan->req && !sys_slist_is_empty(&att->reqs)) {
 		sys_snode_t *node = sys_slist_get(&att->reqs);
 
-		if (chan_req_send(chan, ATT_REQ(node)) >= 0) {
+		err = bt_att_chan_req_send(chan, ATT_REQ(node));
+		if (err == 0) {
 			return;
 		}
 
@@ -686,9 +675,20 @@ static void att_on_sent_cb(struct bt_att_tx_meta_data *meta)
 	}
 
 	if (!bt_att_is_enhanced(meta->att_chan)) {
-		/* For EATT, L2CAP will call it after the SDU is fully sent. */
-		LOG_DBG("UATT bearer, calling att_sent");
-		att_sent(meta);
+		struct bt_att_chan *att_chan = meta->att_chan;
+		struct bt_conn *conn = att_chan->att->conn;
+		struct bt_l2cap_chan *l2cap_chan = &att_chan->chan.chan;
+
+		ARG_UNUSED(conn);
+		LOG_DBG("UATT bearer, calling bt_att_sent: conn %p chan %p", conn, l2cap_chan);
+
+		/* For EATT, `bt_att_sent` is assigned to the `.sent` L2 callback.
+		 * L2CAP will then call it once the SDU has finished sending.
+		 *
+		 * For UATT, this won't happen, as static LE l2cap channels don't have
+		 * SDUs. Call it manually instead.
+		 */
+		bt_att_sent(l2cap_chan);
 	}
 
 	switch (op_type) {
@@ -729,8 +729,19 @@ static struct net_buf *bt_att_chan_create_pdu(struct bt_att_chan *chan, uint8_t
 		/* Use a timeout only when responding/confirming */
 		timeout = BT_ATT_TIMEOUT;
 		break;
-	default:
-		timeout = K_FOREVER;
+	default: {
+		k_tid_t current_thread = k_current_get();
+
+		if (current_thread == k_work_queue_thread_get(&k_sys_work_q)) {
+			/* No blocking in the sysqueue. */
+			timeout = K_NO_WAIT;
+		} else if (current_thread == att_handle_rsp_thread) {
+			/* Blocking would cause deadlock. */
+			timeout = K_NO_WAIT;
+		} else {
+			timeout = K_FOREVER;
+		}
+	}
 	}
 
 	/* This will reserve headspace for lower layers */
@@ -892,19 +903,6 @@ static uint8_t att_mtu_req(struct bt_att_chan *chan, struct net_buf *buf)
 	return 0;
 }
 
-static int bt_att_chan_req_send(struct bt_att_chan *chan,
-				struct bt_att_req *req)
-{
-	__ASSERT_NO_MSG(chan);
-	__ASSERT_NO_MSG(req);
-	__ASSERT_NO_MSG(req->func);
-	__ASSERT_NO_MSG(!chan->req);
-
-	LOG_DBG("req %p", req);
-
-	return chan_req_send(chan, req);
-}
-
 static void att_req_send_process(struct bt_att *att)
 {
 	struct bt_att_req *req = NULL;
@@ -932,7 +930,7 @@ static void att_req_send_process(struct bt_att *att)
 			continue;
 		}
 
-		if (bt_att_chan_req_send(chan, req) >= 0) {
+		if (bt_att_chan_req_send(chan, req) == 0) {
 			return;
 		}
 
@@ -3359,7 +3357,7 @@ static void bt_att_status(struct bt_l2cap_chan *ch, atomic_t *status)
 		return;
 	}
 
-	if (bt_att_chan_req_send(chan, ATT_REQ(node)) >= 0) {
+	if (bt_att_chan_req_send(chan, ATT_REQ(node)) == 0) {
 		return;
 	}
 
diff --git a/subsys/bluetooth/host/att_internal.h b/subsys/bluetooth/host/att_internal.h
index 6eec4c5496e1b..dc397283de975 100644
--- a/subsys/bluetooth/host/att_internal.h
+++ b/subsys/bluetooth/host/att_internal.h
@@ -1,6 +1,16 @@
 /* att_internal.h - Attribute protocol handling */
 
+#include <stdint.h>
+#include <stddef.h>
+
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys_clock.h>
 
 /*
  * Copyright (c) 2015-2016 Intel Corporation
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index 75bd15834ae97..a4f75bd5248e7 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -5,17 +5,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
 
 #include "buf_view.h"
-#include "hci_core.h"
+#include "common/hci_common_internal.h"
 #include "conn_internal.h"
+#include "hci_core.h"
 #include "iso_internal.h"
 
-#include <zephyr/bluetooth/hci.h>
-
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_buf, CONFIG_BT_LOG_LEVEL);
 
 /* Events have a length field of 1 byte. This size fits all events.
@@ -72,8 +83,9 @@ static void evt_pool_destroy(struct net_buf *buf)
 	buf_rx_freed_notify(BT_BUF_EVT);
 }
 
-NET_BUF_POOL_DEFINE(acl_in_pool, BT_BUF_ACL_RX_COUNT, BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE),
-		    sizeof(struct acl_data), acl_in_pool_destroy);
+NET_BUF_POOL_DEFINE(acl_in_pool, (BT_BUF_ACL_RX_COUNT_EXTRA + BT_BUF_HCI_ACL_RX_COUNT),
+		    BT_BUF_ACL_SIZE(CONFIG_BT_BUF_ACL_RX_SIZE), sizeof(struct acl_data),
+		    acl_in_pool_destroy);
 
 NET_BUF_POOL_FIXED_DEFINE(evt_pool, CONFIG_BT_BUF_EVT_RX_COUNT, BT_BUF_EVT_RX_SIZE,
 			  sizeof(struct bt_buf_data), evt_pool_destroy);
diff --git a/subsys/bluetooth/host/buf_view.h b/subsys/bluetooth/host/buf_view.h
index 1b9a78ec7b408..378d0c4be5c6d 100644
--- a/subsys/bluetooth/host/buf_view.h
+++ b/subsys/bluetooth/host/buf_view.h
@@ -11,6 +11,8 @@
 #ifndef ZEPHYR_SUBSYS_BLUETOOTH_HOST_BUF_VIEW_H_
 #define ZEPHYR_SUBSYS_BLUETOOTH_HOST_BUF_VIEW_H_
 
+#include <stddef.h>
+
 #include <zephyr/net_buf.h>
 
 
diff --git a/subsys/bluetooth/host/classic/CMakeLists.txt b/subsys/bluetooth/host/classic/CMakeLists.txt
index 0f7f01d5c00b5..ab15843b0a9f5 100644
--- a/subsys/bluetooth/host/classic/CMakeLists.txt
+++ b/subsys/bluetooth/host/classic/CMakeLists.txt
@@ -14,6 +14,7 @@ zephyr_library_sources_ifdef(CONFIG_BT_RFCOMM           rfcomm.c)
 zephyr_library_sources_ifdef(
   CONFIG_BT_CLASSIC
   br.c
+  conn_br.c
   keys_br.c
   l2cap_br.c
   sdp.c
diff --git a/subsys/bluetooth/host/classic/Kconfig b/subsys/bluetooth/host/classic/Kconfig
index a967cfa65ae58..1fbf45f9099c6 100644
--- a/subsys/bluetooth/host/classic/Kconfig
+++ b/subsys/bluetooth/host/classic/Kconfig
@@ -13,11 +13,20 @@ config BT_CLASSIC
 	select BT_CENTRAL
 	select BT_SMP
 	select BT_L2CAP_DYNAMIC_CHANNEL
+	select CRC
 	select EXPERIMENTAL
 	help
 	  This option enables Bluetooth BR/EDR support
 
 if BT_CLASSIC
+config BT_LIMITED_DISCOVERABLE_DURATION
+	int "Maximum duration that a device is in limited discoverable mode in seconds"
+	default 60
+	range 31 60
+	help
+	  This option sets the maximum duration that a device is in limited discoverable mode in
+	  seconds.
+
 config BT_BR_MIN_ENC_KEY_SIZE
 	int
 	prompt "Minimum encryption key size accepted in octets" if !BT_SMP_SC_ONLY
@@ -35,6 +44,85 @@ config BT_MAX_SCO_CONN
 	  Maximum number of simultaneous Bluetooth synchronous connections
 	  supported. The minimum (and default) number is 1.
 
+config BT_L2CAP_RET
+	bool "Bluetooth L2CAP retransmission mode [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  This option enables Bluetooth L2CAP retransmission mode
+
+config BT_L2CAP_FC
+	bool "Bluetooth L2CAP flow control mode [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  This option enables Bluetooth L2CAP flow control mode
+
+config BT_L2CAP_ENH_RET
+	bool "Bluetooth L2CAP enhance retransmission [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  This option enables Bluetooth L2CAP enhance retransmission
+
+config BT_L2CAP_STREAM
+	bool "Bluetooth L2CAP streaming mode [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  This option enables Bluetooth L2CAP streaming mode
+
+config BT_L2CAP_RET_FC
+	def_bool BT_L2CAP_RET || BT_L2CAP_FC || BT_L2CAP_ENH_RET || BT_L2CAP_STREAM
+
+if BT_L2CAP_RET_FC
+config BT_L2CAP_FCS
+	bool "Bluetooth L2CAP FCS Option [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	depends on BT_L2CAP_STREAM || BT_L2CAP_ENH_RET
+	help
+	  This option enables Bluetooth L2CAP FCS Option
+
+config BT_L2CAP_EXT_WIN_SIZE
+	bool "Bluetooth L2CAP Extended window size Option [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	depends on BT_L2CAP_STREAM || BT_L2CAP_ENH_RET
+	help
+	  This option enables Bluetooth L2CAP Extended window size Option
+
+config BT_L2CAP_MPS
+	int "Bluetooth L2CAP MPS for retransmission and Flow control"
+	default 48
+	range 48 BT_L2CAP_TX_MTU
+	help
+	  Bluetooth L2CAP MPS for retransmission and Flow control
+
+config BT_L2CAP_MAX_WINDOW_SIZE
+	int "Maximum Windows Size of Retransmission and Flow Control"
+	default 1
+	range 1 32
+	help
+	  Maximum Windows Size of Retransmission and Flow Control.
+	  The minimum (and default) number is 1.
+
+config BT_L2CAP_BR_RET_TIMEOUT
+	int "Retransmission timeout (milliseconds)"
+	default 2000
+	range 1000 2000
+	help
+	  The Retransmission timeout shall be three times the value of flush timeout,
+	  subject to a minimum of 1000 milliseconds and maximum of 2000 milliseconds.
+
+config BT_L2CAP_BR_MONITOR_TIMEOUT
+	int "Monitor timeout (milliseconds)"
+	default 12000 if BT_L2CAP_ENH_RET
+	default BT_L2CAP_BR_RET_TIMEOUT
+	range BT_L2CAP_BR_RET_TIMEOUT 12000
+	help
+	  If a flush timeout exists on the link for Enhanced Retransmission mode and
+	  both sides of the link are configured to the same flush timeout value then the
+	  monitor timeout shall be set to a value at least as large as the Retransmission
+	  timeout otherwise the value of the Monitor timeout shall be six times the value
+	  of flush timeout, subject to a minimum of the retransmission timeout value and
+	  a maximum of 12000 milliseconds.
+endif # BT_L2CAP_RET_FC
+
 config BT_RFCOMM
 	bool "Bluetooth RFCOMM protocol support [EXPERIMENTAL]"
 	select EXPERIMENTAL
@@ -86,7 +174,144 @@ config BT_HFP_AG
 	help
 	  This option enables Bluetooth AG support
 
+if BT_HFP_HF
+config BT_HFP_HF_CLI
+	bool "CLI presentation capability for HFP HF [EXPERIMENTAL]"
+	default y
+	help
+	  This option enables CLI presentation capability for HFP HF
+
+config BT_HFP_HF_VOLUME
+	bool "Remote audio volume control for HFP HF [EXPERIMENTAL]"
+	default y
+	help
+	  This option enables Remote audio volume control for HFP HF
+
+config BT_HFP_HF_CODEC_NEG
+	bool "Codec Negotiation for HFP HF [EXPERIMENTAL]"
+	help
+	  This option enables Codec Negotiation for HFP HF
+
+config BT_HFP_HF_ECNR
+	bool "EC and/or NR function for HFP HF [EXPERIMENTAL]"
+	help
+	  This option enables EC and/or NR function for HFP HF
+
+if BT_HFP_HF_CODEC_NEG
+config BT_HFP_HF_CODEC_MSBC
+	bool "Support Codec mSBC for HFP HF [EXPERIMENTAL]"
+	help
+	  This option enables Codec mSBC for HFP HF
+
+config BT_HFP_HF_CODEC_LC3_SWB
+	bool "Support Codec LC3 SWB for HFP HF [EXPERIMENTAL]"
+	help
+	  This option enables Codec LC3 SWB for HFP HF
+endif # BT_HFP_HF_CODEC_NEG
+
+config BT_HFP_HF_3WAY_CALL
+	bool "Three-way calling for HFP HF [EXPERIMENTAL]"
+	help
+	  This option enables Three-way calling for HFP HF
+
+config BT_HFP_HF_ECS
+	bool "Enhanced Call Status for HFP HF [EXPERIMENTAL]"
+	default y if BT_HFP_HF_3WAY_CALL
+	help
+	  This option enables Enhanced Call Status for HFP HF
+
+config BT_HFP_HF_ECC
+	bool "Enhanced Call Control for HFP HF [EXPERIMENTAL]"
+	default y if BT_HFP_HF_3WAY_CALL
+	help
+	  This option enables Enhanced Call Control for HFP HF
+
+config BT_HFP_HF_MAX_CALLS
+	int "Maximum supported calls for HFP HF [EXPERIMENTAL]"
+	default 2 if BT_HFP_HF_3WAY_CALL
+	default 1
+	range 1 2
+	help
+	  This option sets maximum supported calls for HFP HF
+
+config BT_HFP_HF_VOICE_RECG
+	bool "Voice recognition activation for HFP HF [EXPERIMENTAL]"
+	help
+	  This option enables Voice recognition activation for HFP HF
+
+config BT_HFP_HF_ENH_VOICE_RECG
+	bool "Enhanced Voice Recognition Status for HFP HF [EXPERIMENTAL]"
+	select BT_HFP_HF_VOICE_RECG
+	help
+	  This option enables Enhanced Voice Recognition Status for HFP HF
+
+config BT_HFP_HF_VOICE_RECG_TEXT
+	bool "Voice Recognition Text for HFP HF [EXPERIMENTAL]"
+	select BT_HFP_HF_ENH_VOICE_RECG
+	help
+	  This option enables Voice Recognition Text for HFP HF
+
+config BT_HFP_HF_HF_INDICATORS
+	bool "HF Indicators for HFP HF [EXPERIMENTAL]"
+	help
+	  This option enables HF Indicators for HFP HF
+
+config BT_HFP_HF_HF_INDICATOR_ENH_SAFETY
+	bool "HF Indicator Enhanced Safety for HFP HF [EXPERIMENTAL]"
+	select BT_HFP_HF_HF_INDICATORS
+	help
+	  This option enables HF Indicator Enhanced Safety for HFP HF
+
+config BT_HFP_HF_HF_INDICATOR_BATTERY
+	bool "HF Indicator Battery level for HFP HF [EXPERIMENTAL]"
+	select BT_HFP_HF_HF_INDICATORS
+	help
+	  This option enables HF Indicator Battery level for HFP HF
+
+endif # BT_HFP_HF
+
 if BT_HFP_AG
+config BT_HFP_AG_EXT_ERR
+	bool "Extended Error Result Codes for HFP AG [EXPERIMENTAL]"
+	default y
+	help
+	  This option enables Extended Error Result Codes for HFP AG
+
+config BT_HFP_AG_CODEC_NEG
+	bool "Codec Negotiation for HFP AG [EXPERIMENTAL]"
+	help
+	  This option enables Codec Negotiation for HFP AG
+
+config BT_HFP_AG_ECNR
+	bool "EC and/or NR function for HFP AG [EXPERIMENTAL]"
+	help
+	  This option enables EC and/or NR function for HFP AG
+
+config BT_HFP_AG_3WAY_CALL
+	bool "Three-way calling for HFP AG [EXPERIMENTAL]"
+	help
+	  This option enables Three-way calling for HFP AG
+
+config BT_HFP_AG_MAX_CALLS
+	int "Maximum supported calls for HFP AG [EXPERIMENTAL]"
+	default 2 if BT_HFP_AG_3WAY_CALL
+	default 1
+	range 1 2
+	help
+	  This option sets maximum supported calls for HFP AG
+
+config BT_HFP_AG_ECS
+	bool "Enhanced call status for HFP AG [EXPERIMENTAL]"
+	default y if BT_HFP_AG_3WAY_CALL
+	help
+	  This option enables Enhanced call status for HFP AG
+
+config BT_HFP_AG_ECC
+	bool "Enhanced call control for HFP AG [EXPERIMENTAL]"
+	default y if BT_HFP_AG_3WAY_CALL
+	help
+	  This option enables Enhanced call control for HFP AG
+
 config BT_HFP_AG_TX_BUF_COUNT
 	int "Maximum number of TX buffers for HFP AG [EXPERIMENTAL]"
 	default BT_RFCOMM_TX_MAX
@@ -147,6 +372,53 @@ config BT_HFP_AG_RING_NOTIFY_INTERVAL
 	help
 	  Ring notification interval if the call is in alert state.
 	  The unit is seconds.
+
+config BT_HFP_AG_VOICE_RECG
+	bool "Voice recognition activation for HFP AG [EXPERIMENTAL]"
+	help
+	  This option enables Voice recognition activation for HFP AG
+
+config BT_HFP_AG_ENH_VOICE_RECG
+	bool "Enhanced Voice Recognition Status for HFP AG [EXPERIMENTAL]"
+	select BT_HFP_AG_VOICE_RECG
+	help
+	  This option enables Enhanced Voice Recognition Status for HFP AG
+
+config BT_HFP_AG_VOICE_RECG_TEXT
+	bool "Voice Recognition Text for HFP AG [EXPERIMENTAL]"
+	select BT_HFP_AG_ENH_VOICE_RECG
+	help
+	  This option enables Voice Recognition Text for HFP AG
+
+config BT_HFP_AG_VOICE_TAG
+	bool "Attach a phone number for a voice tag for HFP AG [EXPERIMENTAL]"
+	select BT_HFP_AG_VOICE_RECG
+	help
+	  This option enables Attach a phone number for a voice tag for HFP AG
+
+config BT_HFP_AG_HF_INDICATORS
+	bool "HF Indicators for HFP AG [EXPERIMENTAL]"
+	help
+	  This option enables HF Indicators for HFP AG
+
+config BT_HFP_AG_HF_INDICATOR_ENH_SAFETY
+	bool "HF Indicator Enhanced Safety for HFP AG [EXPERIMENTAL]"
+	select BT_HFP_AG_HF_INDICATORS
+	help
+	  This option enables HF Indicator Enhanced Safety for HFP AG
+
+config BT_HFP_AG_HF_INDICATOR_BATTERY
+	bool "HF Indicator Battery level for HFP AG [EXPERIMENTAL]"
+	select BT_HFP_AG_HF_INDICATORS
+	help
+	  This option enables HF Indicator Battery level for HFP AG
+
+config BT_HFP_AG_REJECT_CALL
+	bool "Ability to reject a call for HFP AG [EXPERIMENTAL]"
+	default y
+	help
+	  This option enables ability to reject a call for HFP AG
+
 endif # BT_HFP_AG
 
 config BT_AVDTP
diff --git a/subsys/bluetooth/host/classic/a2dp.c b/subsys/bluetooth/host/classic/a2dp.c
index 4fdbbb8b76688..504aba7d2806d 100644
--- a/subsys/bluetooth/host/classic/a2dp.c
+++ b/subsys/bluetooth/host/classic/a2dp.c
@@ -83,6 +83,7 @@ static struct bt_a2dp *a2dp_get_connection(struct bt_conn *conn)
 		/* Clean the memory area before returning */
 		(void)memset(a2dp, 0, sizeof(struct bt_a2dp));
 	}
+
 	return a2dp;
 }
 
@@ -92,6 +93,7 @@ static void a2dp_connected(struct bt_avdtp *session)
 	struct bt_a2dp *a2dp = A2DP_AVDTP(session);
 
 	a2dp->a2dp_state = INTERNAL_STATE_AVDTP_CONNECTED;
+
 	/* notify a2dp app the connection. */
 	if ((a2dp_cb != NULL) && (a2dp_cb->connected != NULL)) {
 		a2dp_cb->connected(a2dp, 0);
@@ -276,12 +278,12 @@ static void bt_a2dp_media_data_callback(struct bt_avdtp_sep *sep, struct net_buf
 	if (ep->stream == NULL || buf->len < sizeof(*media_hdr)) {
 		return;
 	}
-	stream = ep->stream;
 
+	stream = ep->stream;
 	media_hdr = net_buf_pull_mem(buf, sizeof(*media_hdr));
 
-	stream->ops->recv(stream, buf, sys_get_be16((uint8_t *)&media_hdr->sequence_number),
-			  sys_get_be32((uint8_t *)&media_hdr->time_stamp));
+	stream->ops->recv(stream, buf, sys_be16_to_cpu(media_hdr->sequence_number),
+			  sys_be32_to_cpu(media_hdr->time_stamp));
 }
 #endif
 
@@ -301,6 +303,7 @@ static int a2dp_ctrl_ind(struct bt_avdtp *session, struct bt_avdtp_sep *sep, uin
 		*errcode = BT_AVDTP_BAD_ACP_SEID;
 		return -EINVAL;
 	}
+
 	stream = ep->stream;
 
 	if (req_cb != NULL) {
@@ -389,7 +392,7 @@ static int a2dp_abort_ind(struct bt_avdtp *session, struct bt_avdtp_sep *sep, ui
 	return a2dp_ctrl_ind(session, sep, errcode, req_cb, done_cb, true);
 }
 
-static int bt_a2dp_set_config_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_set_config_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	struct bt_a2dp *a2dp = SET_CONF_PARAM(SET_CONF_REQ(req));
 	struct bt_a2dp_ep *ep;
@@ -400,11 +403,12 @@ static int bt_a2dp_set_config_cb(struct bt_avdtp_req *req)
 	if (ep->stream == NULL) {
 		return -EINVAL;
 	}
+
 	if ((ep->stream == NULL) || (SET_CONF_REQ(req) != &a2dp->set_config_param)) {
 		return -EINVAL;
 	}
-	stream = ep->stream;
 
+	stream = ep->stream;
 	LOG_DBG("SET CONFIGURATION result:%d", req->status);
 
 	if ((a2dp_cb != NULL) && (a2dp_cb->config_rsp != NULL)) {
@@ -418,7 +422,7 @@ static int bt_a2dp_set_config_cb(struct bt_avdtp_req *req)
 	return 0;
 }
 
-static int bt_a2dp_get_capabilities_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_get_capabilities_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	int err;
 	uint8_t *codec_info_element;
@@ -427,7 +431,7 @@ static int bt_a2dp_get_capabilities_cb(struct bt_avdtp_req *req)
 	uint8_t codec_type;
 	uint8_t user_ret;
 
-	if (GET_CAP_REQ(req) != &a2dp->get_capabilities_param) {
+	if (GET_CAP_REQ(req) != &a2dp->get_capabilities_param || buf == NULL) {
 		return -EINVAL;
 	}
 
@@ -440,7 +444,7 @@ static int bt_a2dp_get_capabilities_cb(struct bt_avdtp_req *req)
 		return 0;
 	}
 
-	err = bt_avdtp_parse_capability_codec(a2dp->get_capabilities_param.buf, &codec_type,
+	err = bt_avdtp_parse_capability_codec(buf, &codec_type,
 					      &codec_info_element, &codec_info_element_len);
 	if (err) {
 		LOG_DBG("codec capability parsing fail");
@@ -456,13 +460,14 @@ static int bt_a2dp_get_capabilities_cb(struct bt_avdtp_req *req)
 		struct bt_a2dp_ep_info *info = &a2dp->discover_cb_param->info;
 
 		info->codec_type = codec_type;
-		info->sep_info = a2dp->discover_cb_param->seps_info[a2dp->get_cap_index];
+		info->sep_info = &a2dp->discover_cb_param->seps_info[a2dp->get_cap_index];
 		memcpy(&info->codec_cap.codec_ie, codec_info_element, codec_info_element_len);
 		info->codec_cap.len = codec_info_element_len;
 		user_ret = a2dp->discover_cb_param->cb(a2dp, info, &ep);
+
 		if (ep != NULL) {
 			ep->codec_type = info->codec_type;
-			ep->sep.sep_info = info->sep_info;
+			ep->sep.sep_info = *info->sep_info;
 			*ep->codec_cap = info->codec_cap;
 			ep->stream = NULL;
 		}
@@ -497,49 +502,57 @@ static int bt_a2dp_get_sep_caps(struct bt_a2dp *a2dp)
 	for (; a2dp->get_cap_index < a2dp->peer_seps_count; a2dp->get_cap_index++) {
 		if (a2dp->discover_cb_param->seps_info[a2dp->get_cap_index].media_type ==
 		    BT_AVDTP_AUDIO) {
+			memset(&a2dp->get_capabilities_param, 0U,
+			       sizeof(a2dp->get_capabilities_param));
 			a2dp->get_capabilities_param.req.func = bt_a2dp_get_capabilities_cb;
-			a2dp->get_capabilities_param.buf = NULL;
 			a2dp->get_capabilities_param.stream_endpoint_id =
 				a2dp->discover_cb_param->seps_info[a2dp->get_cap_index].id;
 			err = bt_avdtp_get_capabilities(&a2dp->session,
 							&a2dp->get_capabilities_param);
+
 			if (err) {
 				LOG_DBG("AVDTP get codec_cap failed");
 				a2dp->discover_cb_param->cb(a2dp, NULL, NULL);
 				a2dp->discover_cb_param = NULL;
 			}
+
 			return 0;
 		}
 	}
 	return -EINVAL;
 }
 
-static int bt_a2dp_discover_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_discover_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	struct bt_a2dp *a2dp = DISCOVER_PARAM(DISCOVER_REQ(req));
 	struct bt_avdtp_sep_info *sep_info;
 	int err;
 
 	LOG_DBG("DISCOVER result:%d", req->status);
-	if (a2dp->discover_cb_param == NULL) {
+	if (a2dp->discover_cb_param == NULL || buf == NULL) {
 		return -EINVAL;
 	}
+
 	a2dp->peer_seps_count = 0U;
+
 	if (!(req->status)) {
 		if (a2dp->discover_cb_param->sep_count == 0) {
 			if (a2dp->discover_cb_param->cb != NULL) {
 				a2dp->discover_cb_param->cb(a2dp, NULL, NULL);
 				a2dp->discover_cb_param = NULL;
 			}
+
 			return -EINVAL;
 		}
 
 		do {
 			sep_info = &a2dp->discover_cb_param->seps_info[a2dp->peer_seps_count];
-			err = bt_avdtp_parse_sep(DISCOVER_REQ(req)->buf, sep_info);
+			err = bt_avdtp_parse_sep(buf, sep_info);
+
 			if (err) {
 				break;
 			}
+
 			a2dp->peer_seps_count++;
 			LOG_DBG("id:%d, inuse:%d, media_type:%d, tsep:%d, ", sep_info->id,
 				sep_info->inuse, sep_info->media_type, sep_info->tsep);
@@ -580,14 +593,16 @@ int bt_a2dp_discover(struct bt_a2dp *a2dp, struct bt_a2dp_discover_param *param)
 		return -EBUSY;
 	}
 
+	memset(&a2dp->discover_cb_param, 0U, sizeof(a2dp->discover_cb_param));
 	a2dp->discover_cb_param = param;
 	a2dp->discover_param.req.func = bt_a2dp_discover_cb;
-	a2dp->discover_param.buf = NULL;
+
 	err = bt_avdtp_discover(&a2dp->session, &a2dp->discover_param);
 	if (err) {
 		if (a2dp->discover_cb_param->cb != NULL) {
 			a2dp->discover_cb_param->cb(a2dp, NULL, NULL);
 		}
+
 		a2dp->discover_cb_param = NULL;
 	}
 
@@ -606,6 +621,7 @@ static inline void bt_a2dp_stream_config_set_param(struct bt_a2dp *a2dp,
 						   uint8_t int_id, uint8_t codec_type,
 						   struct bt_avdtp_sep *sep)
 {
+	memset(&a2dp->set_config_param, 0U, sizeof(a2dp->set_config_param));
 	a2dp->set_config_param.req.func = cb;
 	a2dp->set_config_param.acp_stream_ep_id = remote_id;
 	a2dp->set_config_param.int_stream_endpoint_id = int_id;
@@ -656,7 +672,9 @@ static int bt_a2dp_ctrl_cb(struct bt_avdtp_req *req, bt_a2dp_rsp_cb rsp_cb, bt_a
 	if ((ep->stream == NULL) || (CTRL_REQ(req) != &a2dp->ctrl_param)) {
 		return -EINVAL;
 	}
+
 	stream = ep->stream;
+
 	if (clear_stream) {
 		ep->stream = NULL;
 	}
@@ -670,10 +688,11 @@ static int bt_a2dp_ctrl_cb(struct bt_avdtp_req *req, bt_a2dp_rsp_cb rsp_cb, bt_a
 	if ((!req->status) && (done_cb != NULL)) {
 		done_cb(stream);
 	}
+
 	return 0;
 }
 
-static int bt_a2dp_open_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_open_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	struct bt_a2dp_ep *ep = CONTAINER_OF(CTRL_REQ(req)->sep, struct bt_a2dp_ep, sep);
 	bt_a2dp_rsp_cb rsp_cb = a2dp_cb != NULL ? a2dp_cb->establish_rsp : NULL;
@@ -684,7 +703,7 @@ static int bt_a2dp_open_cb(struct bt_avdtp_req *req)
 	return bt_a2dp_ctrl_cb(req, rsp_cb, done_cb, false);
 }
 
-static int bt_a2dp_start_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_start_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	struct bt_a2dp_ep *ep = CONTAINER_OF(CTRL_REQ(req)->sep, struct bt_a2dp_ep, sep);
 	bt_a2dp_rsp_cb rsp_cb = a2dp_cb != NULL ? a2dp_cb->start_rsp : NULL;
@@ -694,7 +713,7 @@ static int bt_a2dp_start_cb(struct bt_avdtp_req *req)
 	return bt_a2dp_ctrl_cb(req, rsp_cb, done_cb, false);
 }
 
-static int bt_a2dp_suspend_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_suspend_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	struct bt_a2dp_ep *ep = CONTAINER_OF(CTRL_REQ(req)->sep, struct bt_a2dp_ep, sep);
 	bt_a2dp_rsp_cb rsp_cb = a2dp_cb != NULL ? a2dp_cb->suspend_rsp : NULL;
@@ -704,7 +723,7 @@ static int bt_a2dp_suspend_cb(struct bt_avdtp_req *req)
 	return bt_a2dp_ctrl_cb(req, rsp_cb, done_cb, false);
 }
 
-static int bt_a2dp_close_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_close_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	struct bt_a2dp_ep *ep = CONTAINER_OF(CTRL_REQ(req)->sep, struct bt_a2dp_ep, sep);
 	bt_a2dp_rsp_cb rsp_cb = a2dp_cb != NULL ? a2dp_cb->release_rsp : NULL;
@@ -714,7 +733,7 @@ static int bt_a2dp_close_cb(struct bt_avdtp_req *req)
 	return bt_a2dp_ctrl_cb(req, rsp_cb, done_cb, true);
 }
 
-static int bt_a2dp_abort_cb(struct bt_avdtp_req *req)
+static int bt_a2dp_abort_cb(struct bt_avdtp_req *req, struct net_buf *buf)
 {
 	struct bt_a2dp_ep *ep = CONTAINER_OF(CTRL_REQ(req)->sep, struct bt_a2dp_ep, sep);
 	bt_a2dp_rsp_cb rsp_cb = a2dp_cb != NULL ? a2dp_cb->abort_rsp : NULL;
@@ -733,6 +752,7 @@ static int bt_a2dp_stream_ctrl_pre(struct bt_a2dp_stream *stream, bt_avdtp_func_
 	}
 
 	a2dp = stream->a2dp;
+	memset(&a2dp->ctrl_param, 0U, sizeof(a2dp->ctrl_param));
 	a2dp->ctrl_param.req.func = cb;
 	a2dp->ctrl_param.acp_stream_ep_id = stream->remote_ep != NULL
 						    ? stream->remote_ep->sep.sep_info.id
@@ -750,6 +770,7 @@ int bt_a2dp_stream_establish(struct bt_a2dp_stream *stream)
 	if (err) {
 		return err;
 	}
+
 	return bt_avdtp_open(&a2dp->session, &a2dp->ctrl_param);
 }
 
@@ -762,6 +783,7 @@ int bt_a2dp_stream_release(struct bt_a2dp_stream *stream)
 	if (err) {
 		return err;
 	}
+
 	return bt_avdtp_close(&a2dp->session, &a2dp->ctrl_param);
 }
 
@@ -774,6 +796,7 @@ int bt_a2dp_stream_start(struct bt_a2dp_stream *stream)
 	if (err) {
 		return err;
 	}
+
 	return bt_avdtp_start(&a2dp->session, &a2dp->ctrl_param);
 }
 
@@ -786,6 +809,7 @@ int bt_a2dp_stream_suspend(struct bt_a2dp_stream *stream)
 	if (err) {
 		return err;
 	}
+
 	return bt_avdtp_suspend(&a2dp->session, &a2dp->ctrl_param);
 }
 
@@ -798,6 +822,7 @@ int bt_a2dp_stream_abort(struct bt_a2dp_stream *stream)
 	if (err) {
 		return err;
 	}
+
 	return bt_avdtp_abort(&a2dp->session, &a2dp->ctrl_param);
 }
 
@@ -838,6 +863,7 @@ int bt_a2dp_stream_send(struct bt_a2dp_stream *stream, struct net_buf *buf, uint
 
 	media_hdr = net_buf_push(buf, sizeof(struct bt_avdtp_media_hdr));
 	memset(media_hdr, 0, sizeof(struct bt_avdtp_media_hdr));
+
 	if (stream->local_ep->codec_type == BT_A2DP_SBC) {
 		media_hdr->playload_type = A2DP_SBC_PAYLOAD_TYPE;
 	}
@@ -859,6 +885,7 @@ int a2dp_stream_l2cap_disconnected(struct bt_avdtp *session, struct bt_avdtp_sep
 
 	__ASSERT(sep, "Invalid sep");
 	ep = CONTAINER_OF(sep, struct bt_a2dp_ep, sep);
+
 	if (ep->stream != NULL) {
 		struct bt_a2dp_stream_ops *ops;
 		struct bt_a2dp_stream *stream = ep->stream;
@@ -869,6 +896,7 @@ int a2dp_stream_l2cap_disconnected(struct bt_avdtp *session, struct bt_avdtp_sep
 		 * all the related callbacks are in the same zephyr task context.
 		 */
 		ep->stream = NULL;
+
 		if ((ops != NULL) && (ops->released != NULL)) {
 			ops->released(stream);
 		}
@@ -945,8 +973,8 @@ struct bt_a2dp *bt_a2dp_connect(struct bt_conn *conn)
 	}
 
 	a2dp->a2dp_state = INTERNAL_STATE_IDLE;
-
 	a2dp->session.ops = &signaling_avdtp_ops;
+
 	err = bt_avdtp_connect(conn, &(a2dp->session));
 	if (err < 0) {
 		LOG_DBG("AVDTP Connect failed");
@@ -978,6 +1006,7 @@ int bt_a2dp_register_ep(struct bt_a2dp_ep *ep, uint8_t media_type, uint8_t sep_t
 #else
 	ep->sep.media_data_cb = NULL;
 #endif
+
 	err = bt_avdtp_register_sep(media_type, sep_type, &(ep->sep));
 	if (err < 0) {
 		return err;
diff --git a/subsys/bluetooth/host/classic/at.c b/subsys/bluetooth/host/classic/at.c
index fadeeab10fb7c..b56ad286f06fd 100644
--- a/subsys/bluetooth/host/classic/at.c
+++ b/subsys/bluetooth/host/classic/at.c
@@ -119,24 +119,46 @@ static int get_cmd_value(struct at_client *at, struct net_buf *buf,
 	return 0;
 }
 
-static int get_response_string(struct at_client *at, struct net_buf *buf,
-			       char stop_byte, enum at_state state)
+static bool is_stop_byte(char target, char *stop_string)
+{
+	return (strchr(stop_string, target) != NULL);
+}
+
+static bool is_vgm_or_vgs(struct at_client *at)
+{
+	if (!strcmp(at->buf, "VGM")) {
+		return true;
+	}
+
+	if (!strcmp(at->buf, "VGS")) {
+		return true;
+	}
+	return false;
+}
+
+static int get_response_string(struct at_client *at, struct net_buf *buf, char *stop_string,
+			       enum at_state state)
 {
 	int cmd_len = 0;
 	uint8_t pos = at->pos;
 	const char *str = (char *)buf->data;
 
 	while (cmd_len < buf->len && at->pos != at->buf_max_len) {
-		if (*str != stop_byte) {
+		if (!is_stop_byte(*str, stop_string)) {
 			at->buf[at->pos++] = *str;
 			cmd_len++;
 			str++;
 			pos = at->pos;
 		} else {
+			char stop_byte = at->buf[at->pos];
+
 			cmd_len++;
 			at->buf[at->pos] = '\0';
 			at->pos = 0U;
 			at->state = state;
+			if ((stop_byte == '=') && !is_vgm_or_vgs(at)) {
+				return -EINVAL;
+			}
 			break;
 		}
 	}
@@ -197,7 +219,7 @@ static int at_state_start_lf(struct at_client *at, struct net_buf *buf)
 
 static int at_state_get_cmd_string(struct at_client *at, struct net_buf *buf)
 {
-	return get_response_string(at, buf, ':', AT_STATE_PROCESS_CMD);
+	return get_response_string(at, buf, ":=", AT_STATE_PROCESS_CMD);
 }
 
 static bool is_cmer(struct at_client *at)
@@ -227,7 +249,7 @@ static int at_state_process_cmd(struct at_client *at, struct net_buf *buf)
 
 static int at_state_get_result_string(struct at_client *at, struct net_buf *buf)
 {
-	return get_response_string(at, buf, '\r', AT_STATE_PROCESS_RESULT);
+	return get_response_string(at, buf, "\r", AT_STATE_PROCESS_RESULT);
 }
 
 static bool is_ring(struct at_client *at)
@@ -427,7 +449,7 @@ int at_parse_cmd_input(struct at_client *at, struct net_buf *buf,
 
 int at_has_next_list(struct at_client *at)
 {
-	return at->buf[at->pos] != '\0';
+	return at->buf[at->pos] != '\0' && at->buf[at->pos] != ')';
 }
 
 int at_open_list(struct at_client *at)
@@ -535,3 +557,59 @@ void at_register(struct at_client *at, at_resp_cb_t resp, at_finish_cb_t finish)
 	at->finish = finish;
 	at->state = AT_STATE_START;
 }
+
+char *at_get_string(struct at_client *at)
+{
+	uint8_t pos = at->pos;
+	char *string;
+
+	skip_space(at);
+
+	if (at->buf[at->pos] != '"') {
+		at->pos = pos;
+		return NULL;
+	}
+	at->pos++;
+	string = &at->buf[at->pos];
+
+	while (at->buf[at->pos] != '\0' && at->buf[at->pos] != '"') {
+		at->pos++;
+	}
+
+	if (at->buf[at->pos] != '"') {
+		at->pos = pos;
+		return NULL;
+	}
+
+	at->buf[at->pos] = '\0';
+	at->pos++;
+
+	skip_space(at);
+	next_list(at);
+
+	return string;
+}
+
+char *at_get_raw_string(struct at_client *at, size_t *string_len)
+{
+	char *string;
+
+	skip_space(at);
+
+	string = &at->buf[at->pos];
+
+	while (at->buf[at->pos] != '\0' &&
+		   at->buf[at->pos] != ',' &&
+		   at->buf[at->pos] != ')') {
+		at->pos++;
+	}
+
+	if (string_len) {
+		*string_len = &at->buf[at->pos] - string;
+	}
+
+	skip_space(at);
+	next_list(at);
+
+	return string;
+}
diff --git a/subsys/bluetooth/host/classic/at.h b/subsys/bluetooth/host/classic/at.h
index ae2c7f95d8049..fc6ab68ad2fb5 100644
--- a/subsys/bluetooth/host/classic/at.h
+++ b/subsys/bluetooth/host/classic/at.h
@@ -116,3 +116,5 @@ int at_list_get_string(struct at_client *at, char *name, uint8_t len);
 int at_close_list(struct at_client *at);
 int at_open_list(struct at_client *at);
 int at_has_next_list(struct at_client *at);
+char *at_get_string(struct at_client *at);
+char *at_get_raw_string(struct at_client *at, size_t *string_len);
diff --git a/subsys/bluetooth/host/classic/avctp.c b/subsys/bluetooth/host/classic/avctp.c
index 330b22ad9b827..939361552b577 100644
--- a/subsys/bluetooth/host/classic/avctp.c
+++ b/subsys/bluetooth/host/classic/avctp.c
@@ -82,6 +82,7 @@ static int avctp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	uint8_t tid;
 	bt_avctp_pkt_type_t pkt_type;
 	bt_avctp_cr_t cr;
+	int err;
 
 	if (buf->len < sizeof(*hdr)) {
 		LOG_ERR("invalid AVCTP header received");
@@ -113,11 +114,17 @@ static int avctp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 		if (cr == BT_AVCTP_CMD) {
 			rsp = bt_avctp_create_pdu(session, BT_AVCTP_RESPONSE,
 						  BT_AVCTP_PKT_TYPE_SINGLE, BT_AVCTP_IPID_INVALID,
-						  &tid, hdr->pid);
+						  tid, hdr->pid);
 			if (!rsp) {
 				return -ENOMEM;
 			}
-			return bt_avctp_send(session, rsp);
+
+			err = bt_avctp_send(session, rsp);
+			if (err < 0) {
+				net_buf_unref(rsp);
+				LOG_ERR("AVCTP send fail, err = %d", err);
+				return err;
+			}
 		}
 		return 0; /* No need to report to the upper layer */
 	}
@@ -125,15 +132,15 @@ static int avctp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	return session->ops->recv(session, buf);
 }
 
+static const struct bt_l2cap_chan_ops ops = {
+	.connected = avctp_l2cap_connected,
+	.disconnected = avctp_l2cap_disconnected,
+	.encrypt_change = avctp_l2cap_encrypt_changed,
+	.recv = avctp_l2cap_recv,
+};
+
 int bt_avctp_connect(struct bt_conn *conn, struct bt_avctp *session)
 {
-	static const struct bt_l2cap_chan_ops ops = {
-		.connected = avctp_l2cap_connected,
-		.disconnected = avctp_l2cap_disconnected,
-		.encrypt_change = avctp_l2cap_encrypt_changed,
-		.recv = avctp_l2cap_recv,
-	};
-
 	if (!session) {
 		return -EINVAL;
 	}
@@ -158,7 +165,7 @@ int bt_avctp_disconnect(struct bt_avctp *session)
 
 struct net_buf *bt_avctp_create_pdu(struct bt_avctp *session, bt_avctp_cr_t cr,
 				    bt_avctp_pkt_type_t pkt_type, bt_avctp_ipid_t ipid,
-				    uint8_t *tid, uint16_t pid)
+				    uint8_t tid, uint16_t pid)
 {
 	struct net_buf *buf;
 	struct bt_avctp_header *hdr;
@@ -172,16 +179,12 @@ struct net_buf *bt_avctp_create_pdu(struct bt_avctp *session, bt_avctp_cr_t cr,
 	}
 
 	hdr = net_buf_add(buf, sizeof(*hdr));
-	BT_AVCTP_HDR_SET_TRANSACTION_LABLE(hdr, *tid);
+	BT_AVCTP_HDR_SET_TRANSACTION_LABLE(hdr, tid);
 	BT_AVCTP_HDR_SET_PACKET_TYPE(hdr, pkt_type);
 	BT_AVCTP_HDR_SET_CR(hdr, cr);
 	BT_AVCTP_HDR_SET_IPID(hdr, ipid);
 	hdr->pid = pid;
 
-	if (cr == BT_AVCTP_CMD) {
-		*tid = (*tid + 1) & 0x0F; /* Incremented by one */
-	}
-
 	LOG_DBG("cr:0x%lX, tid:0x%02lX", BT_AVCTP_HDR_GET_CR(hdr),
 		BT_AVCTP_HDR_GET_TRANSACTION_LABLE(hdr));
 	return buf;
@@ -189,16 +192,7 @@ struct net_buf *bt_avctp_create_pdu(struct bt_avctp *session, bt_avctp_cr_t cr,
 
 int bt_avctp_send(struct bt_avctp *session, struct net_buf *buf)
 {
-	int err;
-
-	err = bt_l2cap_chan_send(&session->br_chan.chan, buf);
-	if (err < 0) {
-		net_buf_unref(buf);
-		LOG_ERR("L2CAP send fail err = %d", err);
-		return err;
-	}
-
-	return err;
+	return bt_l2cap_chan_send(&session->br_chan.chan, buf);
 }
 
 int bt_avctp_register(const struct bt_avctp_event_cb *cb)
@@ -217,9 +211,29 @@ int bt_avctp_register(const struct bt_avctp_event_cb *cb)
 static int avctp_l2cap_accept(struct bt_conn *conn, struct bt_l2cap_server *server,
 			      struct bt_l2cap_chan **chan)
 {
-	/* TODO */
+	struct bt_avctp *session = NULL;
+	int err;
 
-	return -ENOTSUP;
+	LOG_DBG("conn %p", conn);
+
+	if (!event_cb) {
+		LOG_WRN("AVCTP server is unsupported");
+		return -ENOTSUP;
+	}
+
+	/* Get the AVCTP session from upper layer */
+	err = event_cb->accept(conn, &session);
+	if (err < 0) {
+		LOG_ERR("Get the AVCTP session failed %d", err);
+		return err;
+	}
+
+	session->br_chan.rx.mtu = BT_L2CAP_RX_MTU;
+	session->br_chan.psm = BT_L2CAP_PSM_AVCTP;
+	session->br_chan.chan.ops = &ops;
+	*chan = &session->br_chan.chan;
+
+	return 0;
 }
 
 int bt_avctp_init(void)
diff --git a/subsys/bluetooth/host/classic/avctp_internal.h b/subsys/bluetooth/host/classic/avctp_internal.h
index a0ec073a71acf..280622be438a1 100644
--- a/subsys/bluetooth/host/classic/avctp_internal.h
+++ b/subsys/bluetooth/host/classic/avctp_internal.h
@@ -103,7 +103,7 @@ int bt_avctp_disconnect(struct bt_avctp *session);
 /* Create AVCTP PDU */
 struct net_buf *bt_avctp_create_pdu(struct bt_avctp *session, bt_avctp_cr_t cr,
 				    bt_avctp_pkt_type_t pkt_type, bt_avctp_ipid_t ipid,
-				    uint8_t *tid, uint16_t pid);
+				    uint8_t tid, uint16_t pid);
 
 /* Send AVCTP PDU */
 int bt_avctp_send(struct bt_avctp *session, struct net_buf *buf);
diff --git a/subsys/bluetooth/host/classic/avdtp.c b/subsys/bluetooth/host/classic/avdtp.c
index 237568d5e916f..98d071deeef9e 100644
--- a/subsys/bluetooth/host/classic/avdtp.c
+++ b/subsys/bluetooth/host/classic/avdtp.c
@@ -93,6 +93,7 @@ static void avdtp_sep_unlock(struct bt_avdtp_sep *sep)
 static void bt_avdtp_set_state(struct bt_avdtp_sep *sep, uint8_t state)
 {
 	sep->state = state;
+
 	if (state != AVDTP_IDLE) {
 		sep->sep_info.inuse = 1U;
 	} else {
@@ -132,13 +133,15 @@ void bt_avdtp_media_l2cap_connected(struct bt_l2cap_chan *chan)
 
 	LOG_DBG("chan %p session %p", chan, session);
 	bt_avdtp_set_state_lock(sep, AVDTP_OPEN);
+
 	if (session->req != NULL) {
 		struct bt_avdtp_req *req = session->req;
 
-		req->status = 0;
+		req->status = BT_AVDTP_SUCCESS;
 		bt_avdtp_clear_req(session);
+
 		if (req->func != NULL) {
-			req->func(req);
+			req->func(req, NULL);
 		}
 	}
 }
@@ -156,6 +159,7 @@ void bt_avdtp_media_l2cap_disconnected(struct bt_l2cap_chan *chan)
 	LOG_DBG("chan %p", chan);
 	chan->conn = NULL;
 	avdtp_sep_lock(sep);
+
 	if ((sep->state == AVDTP_CLOSING) && (session->req != NULL) &&
 	    (session->req->sig == BT_AVDTP_CLOSE)) {
 		/* closing the stream */
@@ -163,10 +167,11 @@ void bt_avdtp_media_l2cap_disconnected(struct bt_l2cap_chan *chan)
 
 		bt_avdtp_set_state(sep, AVDTP_IDLE);
 		avdtp_sep_unlock(sep);
-		req->status = 0;
+		req->status = BT_AVDTP_SUCCESS;
 		bt_avdtp_clear_req(session);
+
 		if (req->func != NULL) {
-			req->func(req);
+			req->func(req, NULL);
 		}
 	} else if (sep->state > AVDTP_OPENING) {
 		bt_avdtp_set_state(sep, AVDTP_IDLE);
@@ -245,7 +250,7 @@ static struct net_buf *avdtp_create_reply_pdu(uint8_t msg_type, uint8_t pkt_type
 static void avdtp_set_status(struct bt_avdtp_req *req, struct net_buf *buf, uint8_t msg_type)
 {
 	if (msg_type == BT_AVDTP_ACCEPT) {
-		req->status = 0;
+		req->status = BT_AVDTP_SUCCESS;
 	} else if (msg_type == BT_AVDTP_REJECT) {
 		if (buf->len >= 1U) {
 			req->status = net_buf_pull_u8(buf);
@@ -260,71 +265,68 @@ static void avdtp_set_status(struct bt_avdtp_req *req, struct net_buf *buf, uint
 	}
 }
 
-static void avdtp_discover_handler(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type,
-				   uint8_t tid)
+static void avdtp_discover_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err;
-		struct bt_avdtp_sep *sep;
-		struct net_buf *rsp_buf;
-		uint8_t error_code = 0;
+	int err;
+	struct bt_avdtp_sep *sep;
+	struct net_buf *rsp_buf;
+	uint8_t error_code = 0;
 
-		if (session->ops->discovery_ind == NULL) {
-			err = -ENOTSUP;
-		} else {
-			err = session->ops->discovery_ind(session, &error_code);
-		}
+	if (session->ops->discovery_ind == NULL) {
+		err = -ENOTSUP;
+	} else {
+		err = session->ops->discovery_ind(session, &error_code);
+	}
 
-		rsp_buf =
-			avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
-					       BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_DISCOVER, tid);
-		if (!rsp_buf) {
-			return;
-		}
+	rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
+					 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_DISCOVER, tid);
+	if (!rsp_buf) {
+		return;
+	}
 
-		if (err) {
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_STATE;
-			}
-			LOG_DBG("discover err code:%d", error_code);
-			net_buf_add_u8(rsp_buf, error_code);
-		} else {
-			struct bt_avdtp_sep_data sep_data;
-
-			SYS_SLIST_FOR_EACH_CONTAINER(&seps, sep, _node) {
-				memset(&sep_data, 0, sizeof(sep_data));
-				sep_data.inuse = sep->sep_info.inuse;
-				sep_data.id = sep->sep_info.id;
-				sep_data.tsep = sep->sep_info.tsep;
-				sep_data.media_type = sep->sep_info.media_type;
-				net_buf_add_mem(rsp_buf, &sep_data, sizeof(sep_data));
-			}
+	if (err) {
+		if (error_code == 0) {
+			error_code = BT_AVDTP_BAD_STATE;
 		}
 
-		err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (err < 0) {
-			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", err);
-			return;
-		}
+		LOG_DBG("discover err code:%d", error_code);
+		net_buf_add_u8(rsp_buf, error_code);
 	} else {
-		struct bt_avdtp_req *req = session->req;
+		struct bt_avdtp_sep_data sep_data;
 
-		if (req == NULL) {
-			return;
-		}
-		k_work_cancel_delayable(&session->timeout_work);
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			DISCOVER_REQ(req)->buf = buf;
-		} else {
-			DISCOVER_REQ(req)->buf = NULL;
-		}
-		avdtp_set_status(req, buf, msg_type);
-		bt_avdtp_clear_req(session);
-		if (req->func != NULL) {
-			req->func(req);
+		SYS_SLIST_FOR_EACH_CONTAINER(&seps, sep, _node) {
+			memset(&sep_data, 0, sizeof(sep_data));
+			sep_data.inuse = sep->sep_info.inuse;
+			sep_data.id = sep->sep_info.id;
+			sep_data.tsep = sep->sep_info.tsep;
+			sep_data.media_type = sep->sep_info.media_type;
+			net_buf_add_mem(rsp_buf, &sep_data, sizeof(sep_data));
 		}
 	}
+
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err < 0) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+		return;
+	}
+}
+
+static void avdtp_discover_rsp(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type)
+{
+	struct bt_avdtp_req *req = session->req;
+
+	if (req == NULL) {
+		return;
+	}
+
+	k_work_cancel_delayable(&session->timeout_work);
+	avdtp_set_status(req, buf, msg_type);
+	bt_avdtp_clear_req(session);
+
+	if (req->func != NULL) {
+		req->func(req, buf);
+	}
 }
 
 static struct bt_avdtp_sep *avdtp_get_sep(uint8_t stream_endpoint_id)
@@ -340,602 +342,641 @@ static struct bt_avdtp_sep *avdtp_get_sep(uint8_t stream_endpoint_id)
 	return sep;
 }
 
-static struct bt_avdtp_sep *avdtp_get_cmd_sep(struct net_buf *buf)
+static struct bt_avdtp_sep *avdtp_get_cmd_sep(struct net_buf *buf, uint8_t *error_code)
 {
 	struct bt_avdtp_sep *sep;
 
 	if (buf->len < 1U) {
+		*error_code = BT_AVDTP_BAD_LENGTH;
 		LOG_WRN("Invalid ACP SEID");
 		return NULL;
 	}
+
 	sep = avdtp_get_sep(net_buf_pull_u8(buf) >> 2);
 	return sep;
 }
 
-static void avdtp_get_capabilities_handler(struct bt_avdtp *session, struct net_buf *buf,
-					   uint8_t msg_type, uint8_t tid)
+static void avdtp_get_capabilities_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err = 0;
-		struct net_buf *rsp_buf;
-		struct bt_avdtp_sep *sep;
-		uint8_t error_code = 0;
-
-		sep = avdtp_get_cmd_sep(buf);
-		if ((sep == NULL) || (session->ops->get_capabilities_ind == NULL)) {
-			err = -ENOTSUP;
-		} else {
-			rsp_buf =
-				avdtp_create_reply_pdu(BT_AVDTP_ACCEPT, BT_AVDTP_PACKET_TYPE_SINGLE,
-						       BT_AVDTP_GET_CAPABILITIES, tid);
-			if (!rsp_buf) {
-				return;
-			}
-			err = session->ops->get_capabilities_ind(session, sep, rsp_buf,
-								 &error_code);
-			if (err) {
-				net_buf_unref(rsp_buf);
-			}
-		}
+	int err = 0;
+	struct net_buf *rsp_buf;
+	struct bt_avdtp_sep *sep;
+	uint8_t error_code = 0;
 
-		if (err) {
-			rsp_buf =
-				avdtp_create_reply_pdu(BT_AVDTP_REJECT, BT_AVDTP_PACKET_TYPE_SINGLE,
-						       BT_AVDTP_GET_CAPABILITIES, tid);
-			if (!rsp_buf) {
-				return;
-			}
+	sep = avdtp_get_cmd_sep(buf, &error_code);
 
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_ACP_SEID;
-			}
-			LOG_DBG("get cap err code:%d", error_code);
-			net_buf_add_u8(rsp_buf, error_code);
+	if ((sep == NULL) || (session->ops->get_capabilities_ind == NULL)) {
+		err = -ENOTSUP;
+	} else {
+		rsp_buf = avdtp_create_reply_pdu(BT_AVDTP_ACCEPT, BT_AVDTP_PACKET_TYPE_SINGLE,
+						 BT_AVDTP_GET_CAPABILITIES, tid);
+		if (!rsp_buf) {
+			return;
 		}
 
-		err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (err < 0) {
+		err = session->ops->get_capabilities_ind(session, sep, rsp_buf, &error_code);
+		if (err) {
 			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", err);
-			return;
 		}
-	} else {
-		struct bt_avdtp_req *req = session->req;
+	}
 
-		if (req == NULL) {
+	if (err) {
+		rsp_buf = avdtp_create_reply_pdu(BT_AVDTP_REJECT, BT_AVDTP_PACKET_TYPE_SINGLE,
+						 BT_AVDTP_GET_CAPABILITIES, tid);
+		if (!rsp_buf) {
 			return;
 		}
-		k_work_cancel_delayable(&session->timeout_work);
-		GET_CAP_REQ(session->req)->buf = NULL;
 
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			GET_CAP_REQ(req)->buf = buf;
-		}
-		avdtp_set_status(req, buf, msg_type);
-		bt_avdtp_clear_req(session);
-		if (req->func != NULL) {
-			req->func(req);
+		if (error_code == 0) {
+			error_code = BT_AVDTP_BAD_ACP_SEID;
 		}
+
+		LOG_DBG("get cap err code:%d", error_code);
+		net_buf_add_u8(rsp_buf, error_code);
+	}
+
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err < 0) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+		return;
 	}
 }
 
-static void avdtp_process_configuration(struct bt_avdtp *session, struct net_buf *buf,
-					uint8_t msg_type, uint8_t tid, bool reconfig)
+static void avdtp_get_capabilities_rsp(struct bt_avdtp *session, struct net_buf *buf,
+				       uint8_t msg_type)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err = 0;
-		int ret;
-		struct bt_avdtp_sep *sep;
-		struct net_buf *rsp_buf;
-		uint8_t error_code = 0;
+	struct bt_avdtp_req *req = session->req;
 
-		sep = avdtp_get_cmd_sep(buf);
-		avdtp_sep_lock(sep);
-		if (sep == NULL) {
-			err = -ENOTSUP;
-		} else if (!reconfig && session->ops->set_configuration_ind == NULL) {
-			err = -ENOTSUP;
-		} else if (reconfig && session->ops->re_configuration_ind == NULL) {
-			err = -ENOTSUP;
-		} else {
-			uint8_t expected_state;
+	if (req == NULL) {
+		return;
+	}
 
-			if (reconfig) {
-				expected_state = AVDTP_OPEN | AVDTP_OPENING;
-			} else {
-				expected_state = AVDTP_IDLE;
-			}
+	k_work_cancel_delayable(&session->timeout_work);
+	avdtp_set_status(req, buf, msg_type);
+	bt_avdtp_clear_req(session);
 
-			if (!(sep->state & expected_state)) {
-				err = -ENOTSUP;
-				error_code = BT_AVDTP_BAD_STATE;
-			} else {
-				uint8_t int_seid;
+	if (req->func != NULL) {
+		req->func(req, buf);
+	}
+}
 
-				if (buf->len < 1U) {
-					LOG_WRN("Invalid INT SEID");
-					avdtp_sep_unlock(sep);
-					return;
-				}
-				/* INT Stream Endpoint ID */
-				int_seid = net_buf_pull_u8(buf) >> 2;
-				if (!reconfig) {
-					err = session->ops->set_configuration_ind(
-						session, sep, int_seid, buf, &error_code);
-				} else {
-					err = session->ops->re_configuration_ind(
-						session, sep, int_seid, buf, &error_code);
-				}
-			}
-		}
+static void avdtp_process_configuration_cmd(struct bt_avdtp *session, struct net_buf *buf,
+					    uint8_t tid, bool reconfig)
+{
+	int err = 0;
+	struct bt_avdtp_sep *sep;
+	struct net_buf *rsp_buf;
+	uint8_t avdtp_err_code = 0;
 
-		rsp_buf = avdtp_create_reply_pdu(
-			err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT, BT_AVDTP_PACKET_TYPE_SINGLE,
-			reconfig ? BT_AVDTP_RECONFIGURE : BT_AVDTP_SET_CONFIGURATION, tid);
-		if (!rsp_buf) {
-			avdtp_sep_unlock(sep);
-			return;
+	sep = avdtp_get_cmd_sep(buf, &avdtp_err_code);
+	avdtp_sep_lock(sep);
+
+	if (sep == NULL) {
+		err = -ENOTSUP;
+	} else if (!reconfig && session->ops->set_configuration_ind == NULL) {
+		err = -ENOTSUP;
+	} else if (reconfig && session->ops->re_configuration_ind == NULL) {
+		err = -ENOTSUP;
+	} else {
+		uint8_t expected_state;
+
+		if (reconfig) {
+			expected_state = AVDTP_OPEN | AVDTP_OPENING;
+		} else {
+			expected_state = AVDTP_IDLE;
 		}
 
-		if (err) {
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_ACP_SEID;
+		if (!(sep->state & expected_state)) {
+			err = -ENOTSUP;
+			avdtp_err_code = BT_AVDTP_BAD_STATE;
+		} else if (buf->len >= 1U) {
+			uint8_t int_seid;
+
+			/* INT Stream Endpoint ID */
+			int_seid = net_buf_pull_u8(buf) >> 2;
+
+			if (!reconfig) {
+				err = session->ops->set_configuration_ind(session, sep, int_seid,
+									  buf, &avdtp_err_code);
+			} else {
+				err = session->ops->re_configuration_ind(session, sep, int_seid,
+									 buf, &avdtp_err_code);
 			}
-			LOG_DBG("set configuration err code:%d", error_code);
-			/* Service Category: Media Codec */
-			net_buf_add_u8(rsp_buf, BT_AVDTP_SERVICE_MEDIA_CODEC);
-			/* Length Of Service Capability */
-			net_buf_add_u8(rsp_buf, 0);
-			/* ERROR CODE */
-			net_buf_add_u8(rsp_buf, error_code);
+		} else {
+			LOG_WRN("Invalid INT SEID");
+			err = -ENOTSUP;
+			avdtp_err_code = BT_AVDTP_BAD_LENGTH;
 		}
+	}
 
-		ret = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (ret) {
-			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", ret);
-		}
-		if (!reconfig && !err && !ret) {
-			bt_avdtp_set_state(sep, AVDTP_CONFIGURED);
-		}
+	rsp_buf = avdtp_create_reply_pdu(
+		err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT, BT_AVDTP_PACKET_TYPE_SINGLE,
+		reconfig ? BT_AVDTP_RECONFIGURE : BT_AVDTP_SET_CONFIGURATION, tid);
+	if (!rsp_buf) {
 		avdtp_sep_unlock(sep);
-	} else {
-		struct bt_avdtp_req *req = session->req;
+		return;
+	}
 
-		if (req == NULL) {
-			return;
+	if (err) {
+		if (avdtp_err_code == 0) {
+			avdtp_err_code = BT_AVDTP_BAD_ACP_SEID;
 		}
-		k_work_cancel_delayable(&session->timeout_work);
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			if (!reconfig) {
-				bt_avdtp_set_state_lock(SET_CONF_REQ(req)->sep, AVDTP_CONFIGURED);
-			}
-		} else if (msg_type == BT_AVDTP_REJECT) {
-			if (buf->len < 1U) {
-				LOG_WRN("Invalid RSP frame");
-				return;
-			}
+
+		LOG_DBG("set configuration err code:%d", avdtp_err_code);
+		/* Service Category: Media Codec */
+		net_buf_add_u8(rsp_buf, BT_AVDTP_SERVICE_MEDIA_CODEC);
+		/* Length Of Service Capability */
+		net_buf_add_u8(rsp_buf, 0);
+		/* ERROR CODE */
+		net_buf_add_u8(rsp_buf, avdtp_err_code);
+	}
+
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+	}
+
+	if (!reconfig && !err && !avdtp_err_code) {
+		bt_avdtp_set_state(sep, AVDTP_CONFIGURED);
+	}
+
+	avdtp_sep_unlock(sep);
+}
+
+static void avdtp_process_configuration_rsp(struct bt_avdtp *session, struct net_buf *buf,
+					    uint8_t msg_type, bool reconfig)
+{
+	struct bt_avdtp_req *req = session->req;
+
+	if (req == NULL) {
+		return;
+	}
+
+	k_work_cancel_delayable(&session->timeout_work);
+
+	if (msg_type == BT_AVDTP_ACCEPT) {
+		if (!reconfig) {
+			bt_avdtp_set_state_lock(SET_CONF_REQ(req)->sep, AVDTP_CONFIGURED);
+		}
+	} else if (msg_type == BT_AVDTP_REJECT) {
+		if (buf->len < 1U) {
+			LOG_WRN("Invalid RSP frame");
+			req->status = BT_AVDTP_BAD_LENGTH;
+		} else {
 			/* Service Category */
 			net_buf_pull_u8(buf);
 		}
+	}
+
+	if (req->status == BT_AVDTP_SUCCESS) {
 		avdtp_set_status(req, buf, msg_type);
-		bt_avdtp_clear_req(session);
-		if (req->func != NULL) {
-			req->func(req);
-		}
 	}
+
+	bt_avdtp_clear_req(session);
+
+	if (req->func != NULL) {
+		req->func(req, NULL);
+	}
+}
+
+static void avdtp_set_configuration_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
+{
+	avdtp_process_configuration_cmd(session, buf, tid, false);
+}
+
+static void avdtp_set_configuration_rsp(struct bt_avdtp *session, struct net_buf *buf,
+					uint8_t msg_type)
+{
+	avdtp_process_configuration_rsp(session, buf, msg_type, false);
+}
+
+static void avdtp_re_configure_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
+{
+	avdtp_process_configuration_cmd(session, buf, tid, true);
 }
 
-static void avdtp_set_configuration_handler(struct bt_avdtp *session, struct net_buf *buf,
-					    uint8_t msg_type, uint8_t tid)
+static void avdtp_re_configure_rsp(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type)
 {
-	avdtp_process_configuration(session, buf, msg_type, tid, false);
+	avdtp_process_configuration_rsp(session, buf, msg_type, true);
 }
 
-static void avdtp_get_configuration_handler(struct bt_avdtp *session, struct net_buf *buf,
-					    uint8_t msg_type, uint8_t tid)
+static void avdtp_open_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
 {
-	/* todo: is not supported now, reply reject */
+	int err = 0;
+	struct bt_avdtp_sep *sep;
 	struct net_buf *rsp_buf;
-	int err;
+	uint8_t avdtp_err_code = 0;
+
+	sep = avdtp_get_cmd_sep(buf, &avdtp_err_code);
+	avdtp_sep_lock(sep);
 
-	rsp_buf = avdtp_create_reply_pdu(BT_AVDTP_REJECT, BT_AVDTP_PACKET_TYPE_SINGLE,
-					 BT_AVDTP_GET_CONFIGURATION, tid);
+	if ((sep == NULL) || (session->ops->open_ind == NULL)) {
+		err = -ENOTSUP;
+	} else {
+		if (sep->state != AVDTP_CONFIGURED) {
+			err = -ENOTSUP;
+			avdtp_err_code = BT_AVDTP_BAD_STATE;
+		} else {
+			err = session->ops->open_ind(session, sep, &avdtp_err_code);
+		}
+	}
+
+	rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
+					 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_OPEN, tid);
 	if (!rsp_buf) {
-		LOG_ERR("Error: No Buff available");
+		avdtp_sep_unlock(sep);
 		return;
 	}
 
+	if (err) {
+		if (avdtp_err_code == 0) {
+			avdtp_err_code = BT_AVDTP_BAD_ACP_SEID;
+		}
+
+		LOG_DBG("open_ind err code:%d", avdtp_err_code);
+		net_buf_add_u8(rsp_buf, avdtp_err_code);
+	} else {
+		session->current_sep = sep;
+	}
+
 	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-	if (err < 0) {
+	if (err) {
 		net_buf_unref(rsp_buf);
 		LOG_ERR("Error:L2CAP send fail - result = %d", err);
-		return;
 	}
-}
 
-static void avdtp_re_configure_handler(struct bt_avdtp *session, struct net_buf *buf,
-				       uint8_t msg_type, uint8_t tid)
-{
-	avdtp_process_configuration(session, buf, msg_type, tid, true);
+	if (!err && !avdtp_err_code) {
+		bt_avdtp_set_state(sep, AVDTP_OPENING);
+	}
+
+	avdtp_sep_unlock(sep);
 }
 
-static void avdtp_open_handler(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type,
-			       uint8_t tid)
+static void avdtp_open_rsp(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err = 0;
-		int ret;
-		struct bt_avdtp_sep *sep;
-		struct net_buf *rsp_buf;
-		uint8_t error_code = 0;
+	struct bt_avdtp_req *req = session->req;
 
-		sep = avdtp_get_cmd_sep(buf);
-		avdtp_sep_lock(sep);
-		if ((sep == NULL) || (session->ops->open_ind == NULL)) {
-			err = -ENOTSUP;
-		} else {
-			if (sep->state != AVDTP_CONFIGURED) {
-				err = -ENOTSUP;
-				error_code = BT_AVDTP_BAD_STATE;
-			} else {
-				err = session->ops->open_ind(session, sep, &error_code);
-			}
-		}
+	if (req == NULL) {
+		return;
+	}
 
-		rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
-						 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_OPEN, tid);
-		if (!rsp_buf) {
-			avdtp_sep_unlock(sep);
+	k_work_cancel_delayable(&session->timeout_work);
+	avdtp_set_status(req, buf, msg_type);
+
+	if (req->status == BT_AVDTP_SUCCESS) {
+		bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_OPENING);
+
+		/* wait the media l2cap is established */
+		if (!avdtp_media_connect(session, CTRL_REQ(req)->sep)) {
 			return;
 		}
+	}
 
-		if (err) {
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_ACP_SEID;
-			}
-			LOG_DBG("open_ind err code:%d", error_code);
-			net_buf_add_u8(rsp_buf, error_code);
-		} else {
-			session->current_sep = sep;
-		}
+	if (req->status != BT_AVDTP_SUCCESS) {
+		bt_avdtp_clear_req(session);
 
-		ret = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (ret) {
-			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", ret);
+		if (req->func != NULL) {
+			req->func(req, NULL);
 		}
+	}
+}
 
-		if (!err && !ret) {
-			bt_avdtp_set_state(sep, AVDTP_OPENING);
-		}
-		avdtp_sep_unlock(sep);
-	} else {
-		struct bt_avdtp_req *req = session->req;
+static void avdtp_handle_reject(struct net_buf *buf, struct bt_avdtp_req *req)
+{
+	if (buf->len > 1U) {
+		uint8_t acp_seid;
 
-		if (req == NULL) {
-			return;
-		}
-		k_work_cancel_delayable(&session->timeout_work);
-		avdtp_set_status(req, buf, msg_type);
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_OPENING);
-			/* wait the media l2cap is established */
-			if (!avdtp_media_connect(session, CTRL_REQ(req)->sep)) {
-				return;
-			}
-		}
-		if (req->status) {
-			bt_avdtp_clear_req(session);
-			if (req->func != NULL) {
-				req->func(req);
-			}
+		acp_seid = net_buf_pull_u8(buf);
+
+		if (acp_seid != CTRL_REQ(req)->acp_stream_ep_id) {
+			req->status = BT_AVDTP_BAD_ACP_SEID;
 		}
+	} else {
+		req->status = BT_AVDTP_BAD_LENGTH;
 	}
 }
 
-static void avdtp_start_handler(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type,
-				uint8_t tid)
+static void avdtp_start_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err = 0;
-		int ret;
-		struct bt_avdtp_sep *sep;
-		struct net_buf *rsp_buf;
-		uint8_t error_code = 0;
+	int err = 0;
+	struct bt_avdtp_sep *sep;
+	struct net_buf *rsp_buf;
+	uint8_t avdtp_err_code = 0;
+
+	sep = avdtp_get_cmd_sep(buf, &avdtp_err_code);
+	avdtp_sep_lock(sep);
 
-		sep = avdtp_get_cmd_sep(buf);
-		avdtp_sep_lock(sep);
-		if ((sep == NULL) || (session->ops->start_ind == NULL)) {
+	if ((sep == NULL) || (session->ops->start_ind == NULL)) {
+		err = -ENOTSUP;
+	} else {
+		if (sep->state != AVDTP_OPEN) {
 			err = -ENOTSUP;
+			avdtp_err_code = BT_AVDTP_BAD_STATE;
 		} else {
-			if (sep->state != AVDTP_OPEN) {
-				err = -ENOTSUP;
-				error_code = BT_AVDTP_BAD_STATE;
-			} else {
-				err = session->ops->start_ind(session, sep, &error_code);
-			}
+			err = session->ops->start_ind(session, sep, &avdtp_err_code);
 		}
+	}
 
-		rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
-						 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_START, tid);
-		if (!rsp_buf) {
-			avdtp_sep_unlock(sep);
-			return;
-		}
+	rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
+					 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_START, tid);
+	if (!rsp_buf) {
+		avdtp_sep_unlock(sep);
+		return;
+	}
 
-		if (err) {
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_ACP_SEID;
-			}
-			LOG_DBG("start err code:%d", error_code);
-			net_buf_add_u8(rsp_buf, error_code);
+	if (err) {
+		if (avdtp_err_code == 0) {
+			avdtp_err_code = BT_AVDTP_BAD_ACP_SEID;
 		}
 
-		ret = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (ret) {
-			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", ret);
-		}
-		if (!err && !ret) {
-			bt_avdtp_set_state(sep, AVDTP_STREAMING);
-		}
-		avdtp_sep_unlock(sep);
-	} else {
-		struct bt_avdtp_req *req = session->req;
+		LOG_DBG("start err code:%d", avdtp_err_code);
+		net_buf_add_u8(rsp_buf, avdtp_err_code);
+	}
 
-		if (req == NULL) {
-			return;
-		}
-		k_work_cancel_delayable(&session->timeout_work);
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_STREAMING);
-		} else if (msg_type == BT_AVDTP_REJECT) {
-			if (buf->len > 1U) {
-				uint8_t acp_seid;
-
-				acp_seid = net_buf_pull_u8(buf);
-				if (acp_seid != CTRL_REQ(req)->acp_stream_ep_id) {
-					return;
-				}
-			}
-		}
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+	}
+
+	if (!err && !avdtp_err_code) {
+		bt_avdtp_set_state(sep, AVDTP_STREAMING);
+	}
+
+	avdtp_sep_unlock(sep);
+}
+
+static void avdtp_start_rsp(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type)
+{
+	struct bt_avdtp_req *req = session->req;
+
+	if (req == NULL) {
+		return;
+	}
+
+	k_work_cancel_delayable(&session->timeout_work);
+
+	if (msg_type == BT_AVDTP_ACCEPT) {
+		bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_STREAMING);
+	} else if (msg_type == BT_AVDTP_REJECT) {
+		avdtp_handle_reject(buf, req);
+	}
+
+	if (req->status == BT_AVDTP_SUCCESS) {
 		avdtp_set_status(req, buf, msg_type);
-		bt_avdtp_clear_req(session);
-		if (req->func != NULL) {
-			req->func(req);
-		}
+	}
+
+	bt_avdtp_clear_req(session);
+
+	if (req->func != NULL) {
+		req->func(req, NULL);
 	}
 }
 
-static void avdtp_close_handler(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type,
-				uint8_t tid)
+static void avdtp_close_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err = 0;
-		int ret;
-		struct bt_avdtp_sep *sep;
-		struct net_buf *rsp_buf;
-		uint8_t error_code = 0;
+	int err = 0;
+	struct bt_avdtp_sep *sep;
+	struct net_buf *rsp_buf;
+	uint8_t avdtp_err_code = 0;
+
+	sep = avdtp_get_cmd_sep(buf, &avdtp_err_code);
+	avdtp_sep_lock(sep);
 
-		sep = avdtp_get_cmd_sep(buf);
-		avdtp_sep_lock(sep);
-		if ((sep == NULL) || (session->ops->close_ind == NULL)) {
+	if ((sep == NULL) || (session->ops->close_ind == NULL)) {
+		err = -ENOTSUP;
+	} else {
+		if (!(sep->state & (AVDTP_OPEN | AVDTP_STREAMING))) {
 			err = -ENOTSUP;
+			avdtp_err_code = BT_AVDTP_BAD_STATE;
 		} else {
-			if (!(sep->state & (AVDTP_OPEN | AVDTP_STREAMING))) {
-				err = -ENOTSUP;
-				error_code = BT_AVDTP_BAD_STATE;
-			} else {
-				err = session->ops->close_ind(session, sep, &error_code);
-			}
+			err = session->ops->close_ind(session, sep, &avdtp_err_code);
 		}
+	}
 
-		rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
-						 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_CLOSE, tid);
-		if (!rsp_buf) {
-			avdtp_sep_unlock(sep);
-			return;
-		}
+	rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
+					 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_CLOSE, tid);
+	if (!rsp_buf) {
+		avdtp_sep_unlock(sep);
+		return;
+	}
 
-		if (err) {
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_ACP_SEID;
-			}
-			LOG_DBG("close err code:%d", error_code);
-			net_buf_add_u8(rsp_buf, error_code);
-		} else {
-			bt_avdtp_set_state(sep, AVDTP_CLOSING);
+	if (err) {
+		if (avdtp_err_code == 0) {
+			avdtp_err_code = BT_AVDTP_BAD_ACP_SEID;
 		}
 
-		ret = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (ret) {
-			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", ret);
-		}
-		if (!err && !ret) {
-			bt_avdtp_set_state(sep, AVDTP_IDLE);
-		}
-		avdtp_sep_unlock(sep);
+		LOG_DBG("close err code:%d", avdtp_err_code);
+		net_buf_add_u8(rsp_buf, avdtp_err_code);
 	} else {
-		struct bt_avdtp_req *req = session->req;
+		bt_avdtp_set_state(sep, AVDTP_CLOSING);
+	}
+
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+	}
+
+	if (!err && !avdtp_err_code) {
+		bt_avdtp_set_state(sep, AVDTP_IDLE);
+	}
+
+	avdtp_sep_unlock(sep);
+}
 
-		if (req == NULL) {
+static void avdtp_close_rsp(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type)
+{
+	struct bt_avdtp_req *req = session->req;
+
+	if (req == NULL) {
+		return;
+	}
+
+	k_work_cancel_delayable(&session->timeout_work);
+	avdtp_set_status(req, buf, msg_type);
+
+	if (req->status == BT_AVDTP_SUCCESS) {
+		bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_CLOSING);
+
+		if (!avdtp_media_disconnect(CTRL_REQ(req)->sep)) {
 			return;
 		}
-		k_work_cancel_delayable(&session->timeout_work);
-		avdtp_set_status(req, buf, msg_type);
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_CLOSING);
-			if (!avdtp_media_disconnect(CTRL_REQ(req)->sep)) {
-				return;
-			}
-		}
-		bt_avdtp_clear_req(session);
-		if (req->func != NULL) {
-			req->func(req);
-		}
+	}
+
+	bt_avdtp_clear_req(session);
+
+	if (req->func != NULL) {
+		req->func(req, NULL);
 	}
 }
 
-static void avdtp_suspend_handler(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type,
-				  uint8_t tid)
+static void avdtp_suspend_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err = 0;
-		int ret;
-		struct bt_avdtp_sep *sep;
-		struct net_buf *rsp_buf;
-		uint8_t error_code = 0;
+	int err = 0;
+	struct bt_avdtp_sep *sep;
+	struct net_buf *rsp_buf;
+	uint8_t avdtp_err_code = 0;
+
+	sep = avdtp_get_cmd_sep(buf, &avdtp_err_code);
+	avdtp_sep_lock(sep);
 
-		sep = avdtp_get_cmd_sep(buf);
-		avdtp_sep_lock(sep);
-		if ((sep == NULL) || (session->ops->suspend_ind == NULL)) {
+	if ((sep == NULL) || (session->ops->suspend_ind == NULL)) {
+		err = -ENOTSUP;
+	} else {
+		if (sep->state != AVDTP_STREAMING) {
 			err = -ENOTSUP;
+			avdtp_err_code = BT_AVDTP_BAD_STATE;
 		} else {
-			if (sep->state != AVDTP_STREAMING) {
-				err = -ENOTSUP;
-				error_code = BT_AVDTP_BAD_STATE;
-			} else {
-				err = session->ops->suspend_ind(session, sep, &error_code);
-			}
+			err = session->ops->suspend_ind(session, sep, &avdtp_err_code);
 		}
+	}
 
-		rsp_buf =
-			avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
-					       BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_SUSPEND, tid);
-		if (!rsp_buf) {
-			avdtp_sep_unlock(sep);
-			return;
-		}
+	rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
+					 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_SUSPEND, tid);
+	if (!rsp_buf) {
+		avdtp_sep_unlock(sep);
+		return;
+	}
 
-		if (err) {
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_ACP_SEID;
-			}
-			LOG_DBG("suspend err code:%d", error_code);
-			net_buf_add_u8(rsp_buf, error_code);
+	if (err) {
+		if (avdtp_err_code == 0) {
+			avdtp_err_code = BT_AVDTP_BAD_ACP_SEID;
 		}
 
-		ret = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (ret) {
-			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", ret);
-		}
-		if (!err && !ret) {
-			bt_avdtp_set_state(sep, AVDTP_OPEN);
-		}
-		avdtp_sep_unlock(sep);
-	} else {
-		struct bt_avdtp_req *req = session->req;
+		LOG_DBG("suspend err code:%d", avdtp_err_code);
+		net_buf_add_u8(rsp_buf, avdtp_err_code);
+	}
 
-		if (req == NULL) {
-			return;
-		}
-		k_work_cancel_delayable(&session->timeout_work);
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_OPEN);
-		} else if (msg_type == BT_AVDTP_REJECT) {
-			if (buf->len >= 1U) {
-				uint8_t acp_seid;
-
-				acp_seid = net_buf_pull_u8(buf);
-				if (acp_seid != CTRL_REQ(req)->acp_stream_ep_id) {
-					return;
-				}
-			}
-		}
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+	}
+
+	if (!err && !avdtp_err_code) {
+		bt_avdtp_set_state(sep, AVDTP_OPEN);
+	}
+
+	avdtp_sep_unlock(sep);
+}
+
+static void avdtp_suspend_rsp(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type)
+{
+	struct bt_avdtp_req *req = session->req;
+
+	if (req == NULL) {
+		return;
+	}
+
+	k_work_cancel_delayable(&session->timeout_work);
+
+	if (msg_type == BT_AVDTP_ACCEPT) {
+		bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_OPEN);
+	} else if (msg_type == BT_AVDTP_REJECT) {
+		avdtp_handle_reject(buf, req);
+	}
+
+	if (req->status == BT_AVDTP_SUCCESS) {
 		avdtp_set_status(req, buf, msg_type);
-		bt_avdtp_clear_req(session);
-		if (req->func != NULL) {
-			req->func(req);
-		}
+	}
+
+	bt_avdtp_clear_req(session);
+
+	if (req->func != NULL) {
+		req->func(req, NULL);
 	}
 }
 
-static void avdtp_abort_handler(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type,
-				uint8_t tid)
+static void avdtp_abort_cmd(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid)
 {
-	if (msg_type == BT_AVDTP_CMD) {
-		int err = 0;
-		int ret;
-		struct bt_avdtp_sep *sep;
-		struct net_buf *rsp_buf;
-		uint8_t error_code = 0;
+	int err = 0;
+	struct bt_avdtp_sep *sep;
+	struct net_buf *rsp_buf;
+	uint8_t avdtp_err_code = 0;
 
-		sep = avdtp_get_cmd_sep(buf);
-		avdtp_sep_lock(sep);
-		if ((sep == NULL) || (session->ops->abort_ind == NULL)) {
-			err = -ENOTSUP;
-		} else {
-			/* all current sep state is OK for abort operation */
-			err = session->ops->abort_ind(session, sep, &error_code);
-		}
+	sep = avdtp_get_cmd_sep(buf, &avdtp_err_code);
+	avdtp_sep_lock(sep);
 
-		rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
-						 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_ABORT, tid);
-		if (!rsp_buf) {
-			avdtp_sep_unlock(sep);
-			return;
-		}
+	if ((sep == NULL) || (session->ops->abort_ind == NULL)) {
+		err = -ENOTSUP;
+	} else {
+		/* all current sep state is OK for abort operation */
+		err = session->ops->abort_ind(session, sep, &avdtp_err_code);
+	}
 
-		if (err) {
-			if (error_code == 0) {
-				error_code = BT_AVDTP_BAD_ACP_SEID;
-			}
-			LOG_DBG("abort err code:%d", error_code);
-			net_buf_add_u8(rsp_buf, error_code);
-		}
+	rsp_buf = avdtp_create_reply_pdu(err ? BT_AVDTP_REJECT : BT_AVDTP_ACCEPT,
+					 BT_AVDTP_PACKET_TYPE_SINGLE, BT_AVDTP_ABORT, tid);
+	if (!rsp_buf) {
+		avdtp_sep_unlock(sep);
+		return;
+	}
 
-		ret = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-		if (ret) {
-			net_buf_unref(rsp_buf);
-			LOG_ERR("Error:L2CAP send fail - result = %d", ret);
-		}
-		if (!err && !ret) {
-			if ((sep->state & (AVDTP_OPEN | AVDTP_STREAMING)) &&
-			    (sep->chan.state == BT_L2CAP_CONNECTED)) {
-				bt_avdtp_set_state(sep, AVDTP_ABORTING);
-			} else {
-				bt_avdtp_set_state(sep, AVDTP_IDLE);
-			}
+	if (err) {
+		if (avdtp_err_code == 0) {
+			avdtp_err_code = BT_AVDTP_BAD_ACP_SEID;
 		}
-		avdtp_sep_unlock(sep);
-	} else {
-		struct bt_avdtp_req *req = session->req;
 
-		if (req == NULL) {
-			return;
+		LOG_DBG("abort err code:%d", avdtp_err_code);
+		net_buf_add_u8(rsp_buf, avdtp_err_code);
+	}
+
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+	}
+
+	if (!err && !avdtp_err_code) {
+		if ((sep->state & (AVDTP_OPEN | AVDTP_STREAMING)) &&
+		    (sep->chan.state == BT_L2CAP_CONNECTED)) {
+			bt_avdtp_set_state(sep, AVDTP_ABORTING);
+		} else {
+			bt_avdtp_set_state(sep, AVDTP_IDLE);
 		}
-		k_work_cancel_delayable(&session->timeout_work);
-		if (msg_type == BT_AVDTP_ACCEPT) {
-			uint8_t pre_state = CTRL_REQ(req)->sep->state;
-
-			bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_ABORTING);
-			/* release stream */
-			if (pre_state & (AVDTP_OPEN | AVDTP_STREAMING)) {
-				avdtp_media_disconnect(CTRL_REQ(req)->sep);
-			}
+	}
 
-			/* For abort, make sure the state revert to IDLE state after
-			 * releasing l2cap channel.
-			 */
-			bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_IDLE);
-		} else if (msg_type == BT_AVDTP_REJECT) {
-			if (buf->len >= 1U) {
-				uint8_t acp_seid;
-
-				acp_seid = net_buf_pull_u8(buf);
-				if (acp_seid != CTRL_REQ(req)->acp_stream_ep_id) {
-					return;
-				}
-			}
+	avdtp_sep_unlock(sep);
+}
+
+static void avdtp_abort_rsp(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type)
+{
+	struct bt_avdtp_req *req = session->req;
+
+	if (req == NULL) {
+		return;
+	}
+
+	k_work_cancel_delayable(&session->timeout_work);
+
+	if (msg_type == BT_AVDTP_ACCEPT) {
+		uint8_t pre_state = CTRL_REQ(req)->sep->state;
+
+		bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_ABORTING);
+
+		/* release stream */
+		if (pre_state & (AVDTP_OPEN | AVDTP_STREAMING)) {
+			avdtp_media_disconnect(CTRL_REQ(req)->sep);
 		}
+
+		/* For abort, make sure the state revert to IDLE state after
+		 * releasing l2cap channel.
+		 */
+		bt_avdtp_set_state_lock(CTRL_REQ(req)->sep, AVDTP_IDLE);
+	} else if (msg_type == BT_AVDTP_REJECT) {
+		avdtp_handle_reject(buf, req);
+	}
+
+	if (req->status == BT_AVDTP_SUCCESS) {
 		avdtp_set_status(req, buf, msg_type);
-		bt_avdtp_clear_req(session);
-		if (req->func != NULL) {
-			req->func(req);
-		}
+	}
+
+	bt_avdtp_clear_req(session);
+
+	if (req->func != NULL) {
+		req->func(req, NULL);
 	}
 }
 
@@ -959,7 +1000,7 @@ static void avdtp_timeout(struct k_work *work)
 		case BT_AVDTP_START:
 		case BT_AVDTP_SUSPEND:
 			req->status = BT_AVDTP_TIME_OUT;
-			req->func(req);
+			req->func(req, NULL);
 			break;
 		default:
 			break;
@@ -975,10 +1016,12 @@ static int avdtp_send(struct bt_avdtp *session, struct net_buf *buf, struct bt_a
 	struct bt_avdtp_single_sig_hdr *hdr;
 
 	avdtp_lock(session);
+
 	if (session->req != NULL) {
 		avdtp_unlock(session);
 		return -EBUSY;
 	}
+
 	session->req = req;
 	avdtp_unlock(session);
 	hdr = (struct bt_avdtp_single_sig_hdr *)buf->data;
@@ -986,7 +1029,6 @@ static int avdtp_send(struct bt_avdtp *session, struct net_buf *buf, struct bt_a
 	result = bt_l2cap_chan_send(&session->br_chan.chan, buf);
 	if (result < 0) {
 		LOG_ERR("Error:L2CAP send fail - result = %d", result);
-		net_buf_unref(buf);
 		bt_avdtp_clear_req(session);
 		return result;
 	}
@@ -1052,8 +1094,9 @@ void bt_avdtp_l2cap_disconnected(struct bt_l2cap_chan *chan)
 
 		req->status = BT_AVDTP_BAD_STATE;
 		bt_avdtp_clear_req(session);
+
 		if (req->func != NULL) {
-			req->func(req);
+			req->func(req, NULL);
 		}
 	}
 
@@ -1061,27 +1104,45 @@ void bt_avdtp_l2cap_disconnected(struct bt_l2cap_chan *chan)
 	session->ops->disconnected(session);
 }
 
-static const struct {
-	uint8_t sig_id;
-	void (*func)(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type, uint8_t tid);
-} handler[] = {
-	{BT_AVDTP_DISCOVER, avdtp_discover_handler},
-	{BT_AVDTP_GET_CAPABILITIES, avdtp_get_capabilities_handler},
-	{BT_AVDTP_SET_CONFIGURATION, avdtp_set_configuration_handler},
-	{BT_AVDTP_GET_CONFIGURATION, avdtp_get_configuration_handler},
-	{BT_AVDTP_RECONFIGURE, avdtp_re_configure_handler},
-	{BT_AVDTP_OPEN, avdtp_open_handler},
-	{BT_AVDTP_START, avdtp_start_handler},
-	{BT_AVDTP_CLOSE, avdtp_close_handler},
-	{BT_AVDTP_SUSPEND, avdtp_suspend_handler},
-	{BT_AVDTP_ABORT, avdtp_abort_handler},
+void (*cmd_handler[])(struct bt_avdtp *session, struct net_buf *buf, uint8_t tid) = {
+	avdtp_discover_cmd,          /* BT_AVDTP_DISCOVER */
+	avdtp_get_capabilities_cmd,  /* BT_AVDTP_GET_CAPABILITIES */
+	avdtp_set_configuration_cmd, /* BT_AVDTP_SET_CONFIGURATION */
+	NULL,                        /* BT_AVDTP_GET_CONFIGURATION */
+	avdtp_re_configure_cmd,      /* BT_AVDTP_RECONFIGURE */
+	avdtp_open_cmd,              /* BT_AVDTP_OPEN */
+	avdtp_start_cmd,             /* BT_AVDTP_START */
+	avdtp_close_cmd,             /* BT_AVDTP_CLOSE */
+	avdtp_suspend_cmd,           /* BT_AVDTP_SUSPEND */
+	avdtp_abort_cmd,             /* BT_AVDTP_ABORT */
+	NULL,                        /* BT_AVDTP_SECURITY_CONTROL */
+	NULL,                        /* BT_AVDTP_GET_ALL_CAPABILITIES */
+	NULL,                        /* BT_AVDTP_DELAYREPORT */
+};
+
+void (*rsp_handler[])(struct bt_avdtp *session, struct net_buf *buf, uint8_t msg_type) = {
+	avdtp_discover_rsp,          /* BT_AVDTP_DISCOVER */
+	avdtp_get_capabilities_rsp,  /* BT_AVDTP_GET_CAPABILITIES */
+	avdtp_set_configuration_rsp, /* BT_AVDTP_SET_CONFIGURATION */
+	NULL,                        /* BT_AVDTP_GET_CONFIGURATION */
+	avdtp_re_configure_rsp,      /* BT_AVDTP_RECONFIGURE */
+	avdtp_open_rsp,              /* BT_AVDTP_OPEN */
+	avdtp_start_rsp,             /* BT_AVDTP_START */
+	avdtp_close_rsp,             /* BT_AVDTP_CLOSE */
+	avdtp_suspend_rsp,           /* BT_AVDTP_SUSPEND */
+	avdtp_abort_rsp,             /* BT_AVDTP_ABORT */
+	NULL,                        /* BT_AVDTP_SECURITY_CONTROL */
+	NULL,                        /* BT_AVDTP_GET_ALL_CAPABILITIES */
+	NULL,                        /* BT_AVDTP_DELAYREPORT */
 };
 
 int bt_avdtp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_avdtp_single_sig_hdr *hdr;
 	struct bt_avdtp *session = AVDTP_CHAN(chan);
-	uint8_t i, msgtype, pack_type, sigid, tid;
+	uint8_t msgtype, pack_type, sigid, tid;
+	struct net_buf *rsp_buf;
+	int err;
 
 	if (buf->len < sizeof(*hdr)) {
 		LOG_ERR("Recvd Wrong AVDTP Header");
@@ -1100,30 +1161,27 @@ int bt_avdtp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	/* TODO: only support single packet now */
 	if (pack_type != BT_AVDTP_PACKET_TYPE_SINGLE) {
 		if (pack_type == BT_AVDTP_PACKET_TYPE_START) {
-			struct net_buf *rsp_buf;
-			int err;
-
 			if (buf->len < 1U) {
 				return -EINVAL;
 			}
+
 			sigid = net_buf_pull_u8(buf);
-			rsp_buf = avdtp_create_reply_pdu(BT_AVDTP_REJECT,
-							 BT_AVDTP_PACKET_TYPE_SINGLE, sigid, tid);
-			if (!rsp_buf) {
-				LOG_ERR("Error: No Buff available");
-				return -EINVAL;
-			}
-			err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
-			if (err < 0) {
-				net_buf_unref(rsp_buf);
-				LOG_ERR("Error:L2CAP send fail - result = %d", err);
-			}
+			goto send_reject;
 		}
-		return 0;
+
+		/* discard the continue packet and end packet */
+		return -EINVAL;
 	}
 
-	/* validate if there is an outstanding resp expected*/
-	if (msgtype != BT_AVDTP_CMD) {
+	if (msgtype == BT_AVDTP_CMD) {
+		if (sigid != 0U && sigid <= BT_AVDTP_DELAYREPORT &&
+		    cmd_handler[sigid - 1U] != NULL) {
+			cmd_handler[sigid - 1U](session, buf, tid);
+			return 0;
+		}
+		/* goto send_reject; */
+	} else {
+		/* validate if the response is expected*/
 		if (session->req == NULL) {
 			LOG_DBG("Unexpected peer response");
 			return -EINVAL;
@@ -1135,16 +1193,32 @@ int bt_avdtp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 				session->req->sig, session->req->tid);
 			return -EINVAL;
 		}
-	}
 
-	for (i = 0U; i < ARRAY_SIZE(handler); i++) {
-		if (sigid == handler[i].sig_id) {
-			handler[i].func(session, buf, msgtype, tid);
+		if (sigid != 0U && sigid <= BT_AVDTP_DELAYREPORT &&
+		    cmd_handler[sigid - 1U] != NULL) {
+			rsp_handler[sigid - 1U](session, buf, msgtype);
 			return 0;
 		}
+
+		/* discard unsupported response packet */
+		return -EINVAL;
 	}
 
-	return 0;
+send_reject:
+	rsp_buf = avdtp_create_reply_pdu(BT_AVDTP_GEN_REJECT, BT_AVDTP_PACKET_TYPE_SINGLE, sigid,
+					 tid);
+	if (!rsp_buf) {
+		LOG_ERR("Error: No Buff available");
+		return -EINVAL;
+	}
+
+	err = bt_l2cap_chan_send(&session->br_chan.chan, rsp_buf);
+	if (err < 0) {
+		net_buf_unref(rsp_buf);
+		LOG_ERR("Error:L2CAP send fail - result = %d", err);
+	}
+
+	return err;
 }
 
 static const struct bt_l2cap_chan_ops signal_chan_ops = {
@@ -1166,10 +1240,12 @@ int bt_avdtp_connect(struct bt_conn *conn, struct bt_avdtp *session)
 	 * The whole `session` is cleared by upper layer if it is new l2cap connection.
 	 */
 	k_sem_take(&avdtp_sem_lock, K_FOREVER);
+
 	if (session->br_chan.chan.conn != NULL) {
 		k_sem_give(&avdtp_sem_lock);
 		return -ENOMEM;
 	}
+
 	session->br_chan.chan.conn = conn;
 	k_sem_give(&avdtp_sem_lock);
 	/* Locking semaphore initialized to 1 (unlocked) */
@@ -1211,6 +1287,7 @@ int bt_avdtp_l2cap_accept(struct bt_conn *conn, struct bt_l2cap_server *server,
 	 * The whole `session` is cleared by upper layer if it is new l2cap connection.
 	 */
 	k_sem_take(&avdtp_sem_lock, K_FOREVER);
+
 	if (session->br_chan.chan.conn == NULL) {
 		session->br_chan.chan.conn = conn;
 		k_sem_give(&avdtp_sem_lock);
@@ -1221,6 +1298,7 @@ int bt_avdtp_l2cap_accept(struct bt_conn *conn, struct bt_l2cap_server *server,
 		*chan = &session->br_chan.chan;
 	} else {
 		k_sem_give(&avdtp_sem_lock);
+
 		/* get the current opening endpoint */
 		if (session->current_sep != NULL) {
 			session->current_sep->session = session;
@@ -1306,6 +1384,7 @@ int bt_avdtp_init(void)
 int bt_avdtp_discover(struct bt_avdtp *session, struct bt_avdtp_discover_params *param)
 {
 	struct net_buf *buf;
+	int err;
 
 	LOG_DBG("");
 	if (!param || !session) {
@@ -1319,7 +1398,12 @@ int bt_avdtp_discover(struct bt_avdtp *session, struct bt_avdtp_discover_params
 		return -ENOMEM;
 	}
 
-	return avdtp_send(session, buf, &param->req);
+	err = avdtp_send(session, buf, &param->req);
+	if (err) {
+		net_buf_unref(buf);
+	}
+
+	return err;
 }
 
 int bt_avdtp_parse_sep(struct net_buf *buf, struct bt_avdtp_sep_info *sep_info)
@@ -1345,6 +1429,7 @@ int bt_avdtp_get_capabilities(struct bt_avdtp *session,
 			      struct bt_avdtp_get_capabilities_params *param)
 {
 	struct net_buf *buf;
+	int err;
 
 	LOG_DBG("");
 	if (!param || !session) {
@@ -1362,7 +1447,12 @@ int bt_avdtp_get_capabilities(struct bt_avdtp *session,
 	/* Body of the message */
 	net_buf_add_u8(buf, (param->stream_endpoint_id << 2U));
 
-	return avdtp_send(session, buf, &param->req);
+	err = avdtp_send(session, buf, &param->req);
+	if (err) {
+		net_buf_unref(buf);
+	}
+
+	return err;
 }
 
 int bt_avdtp_parse_capability_codec(struct net_buf *buf, uint8_t *codec_type,
@@ -1395,6 +1485,7 @@ int bt_avdtp_parse_capability_codec(struct net_buf *buf, uint8_t *codec_type,
 				if (buf->len < length) {
 					return -EINVAL;
 				}
+
 				net_buf_pull_mem(buf, length);
 			}
 			break;
@@ -1433,6 +1524,7 @@ static int avdtp_process_configure_command(struct bt_avdtp *session, uint8_t cmd
 					   struct bt_avdtp_set_configuration_params *param)
 {
 	struct net_buf *buf;
+	int err;
 
 	LOG_DBG("");
 	if (!param || !session) {
@@ -1466,7 +1558,12 @@ static int avdtp_process_configure_command(struct bt_avdtp *session, uint8_t cmd
 	/* Codec Info Element */
 	net_buf_add_mem(buf, param->codec_specific_ie, param->codec_specific_ie_len);
 
-	return avdtp_send(session, buf, &param->req);
+	err = avdtp_send(session, buf, &param->req);
+	if (err) {
+		net_buf_unref(buf);
+	}
+
+	return err;
 }
 
 int bt_avdtp_set_configuration(struct bt_avdtp *session,
@@ -1502,6 +1599,7 @@ static int bt_avdtp_ctrl(struct bt_avdtp *session, struct bt_avdtp_ctrl_params *
 			 uint8_t check_state)
 {
 	struct net_buf *buf;
+	int err;
 
 	LOG_DBG("");
 	if (!param || !session || !param->sep) {
@@ -1523,7 +1621,12 @@ static int bt_avdtp_ctrl(struct bt_avdtp *session, struct bt_avdtp_ctrl_params *
 	/* ACP Stream Endpoint ID */
 	net_buf_add_u8(buf, (param->acp_stream_ep_id << 2U));
 
-	return avdtp_send(session, buf, &param->req);
+	err = avdtp_send(session, buf, &param->req);
+	if (err) {
+		net_buf_unref(buf);
+	}
+
+	return err;
 }
 
 int bt_avdtp_open(struct bt_avdtp *session, struct bt_avdtp_ctrl_params *param)
diff --git a/subsys/bluetooth/host/classic/avdtp_internal.h b/subsys/bluetooth/host/classic/avdtp_internal.h
index 86b3c7a2bc741..368dba6c278f0 100644
--- a/subsys/bluetooth/host/classic/avdtp_internal.h
+++ b/subsys/bluetooth/host/classic/avdtp_internal.h
@@ -111,7 +111,7 @@ struct bt_avdtp_sep_data {
 #endif
 } __packed;
 
-typedef int (*bt_avdtp_func_t)(struct bt_avdtp_req *req);
+typedef int (*bt_avdtp_func_t)(struct bt_avdtp_req *req, struct net_buf *buf);
 
 struct bt_avdtp_req {
 	uint8_t sig;
@@ -148,13 +148,11 @@ struct bt_avdtp_media_hdr {
 
 struct bt_avdtp_discover_params {
 	struct bt_avdtp_req req;
-	struct net_buf *buf;
 };
 
 struct bt_avdtp_get_capabilities_params {
 	struct bt_avdtp_req req;
 	uint8_t stream_endpoint_id;
-	struct net_buf *buf;
 };
 
 struct bt_avdtp_set_configuration_params {
diff --git a/subsys/bluetooth/host/classic/avrcp.c b/subsys/bluetooth/host/classic/avrcp.c
index 049bc84a35868..5af99be3149b4 100644
--- a/subsys/bluetooth/host/classic/avrcp.c
+++ b/subsys/bluetooth/host/classic/avrcp.c
@@ -33,21 +33,14 @@ LOG_MODULE_REGISTER(bt_avrcp);
 
 struct bt_avrcp {
 	struct bt_avctp session;
-	struct bt_avrcp_req req;
-	struct k_work_delayable timeout_work;
-	uint8_t local_tid;
 };
 
 struct avrcp_handler {
 	bt_avrcp_opcode_t opcode;
-	void (*func)(struct bt_avrcp *avrcp, struct net_buf *buf, bt_avctp_cr_t cr);
+	void (*func)(struct bt_avrcp *avrcp, uint8_t tid, struct net_buf *buf, bt_avctp_cr_t cr);
 };
 
-#define AVRCP_TIMEOUT       K_SECONDS(3) /* Shell be greater than TMTP (1000ms) */
 #define AVRCP_AVCTP(_avctp) CONTAINER_OF(_avctp, struct bt_avrcp, session)
-#define AVRCP_KWORK(_work)                                                                         \
-	CONTAINER_OF(CONTAINER_OF(_work, struct k_work_delayable, work), struct bt_avrcp,          \
-		     timeout_work)
 
 static const struct bt_avrcp_cb *avrcp_cb;
 static struct bt_avrcp avrcp_connection[CONFIG_BT_MAX_CONN];
@@ -214,13 +207,6 @@ static struct bt_avrcp *get_new_connection(struct bt_conn *conn)
 	return avrcp;
 }
 
-static void avrcp_timeout(struct k_work *work)
-{
-	struct bt_avrcp *avrcp = AVRCP_KWORK(work);
-
-	LOG_WRN("Timeout: tid 0x%X, opc 0x%02X", avrcp->req.tid, avrcp->req.opcode);
-}
-
 /* The AVCTP L2CAP channel established */
 static void avrcp_connected(struct bt_avctp *session)
 {
@@ -229,8 +215,6 @@ static void avrcp_connected(struct bt_avctp *session)
 	if ((avrcp_cb != NULL) && (avrcp_cb->connected != NULL)) {
 		avrcp_cb->connected(avrcp);
 	}
-
-	k_work_init_delayable(&avrcp->timeout_work, avrcp_timeout);
 }
 
 /* The AVCTP L2CAP channel released */
@@ -243,48 +227,133 @@ static void avrcp_disconnected(struct bt_avctp *session)
 	}
 }
 
-static void avrcp_vendor_dependent_handler(struct bt_avrcp *avrcp, struct net_buf *buf,
+static void process_get_cap_rsp(struct bt_avrcp *avrcp, uint8_t tid, struct net_buf *buf)
+{
+	struct bt_avrcp_avc_pdu *pdu;
+	struct bt_avrcp_get_cap_rsp *rsp;
+	uint16_t len;
+	uint16_t expected_len;
+
+	if (buf->len < sizeof(*pdu)) {
+		LOG_ERR("Invalid vendor payload length: %d", buf->len);
+		return;
+	}
+
+	pdu = net_buf_pull_mem(buf, sizeof(*pdu));
+
+	if (BT_AVRCP_AVC_PDU_GET_PACKET_TYPE(pdu) != BT_AVRVP_PKT_TYPE_SINGLE) {
+		LOG_ERR("Invalid packet type");
+		return;
+	}
+
+	len = sys_be16_to_cpu(pdu->param_len);
+
+	if (len < sizeof(*rsp) || buf->len < len) {
+		LOG_ERR("Invalid capability length: %d, buf length = %d", len, buf->len);
+		return;
+	}
+
+	if ((avrcp_cb == NULL) || (avrcp_cb->get_cap_rsp == NULL)) {
+		return;
+	}
+
+	rsp = (struct bt_avrcp_get_cap_rsp *)buf->data;
+
+	switch (rsp->cap_id) {
+	case BT_AVRCP_CAP_COMPANY_ID:
+		expected_len = rsp->cap_cnt * BT_AVRCP_COMPANY_ID_SIZE;
+		break;
+	case BT_AVRCP_CAP_EVENTS_SUPPORTED:
+		expected_len = rsp->cap_cnt;
+		break;
+	default:
+		LOG_ERR("Unrecognized capability = 0x%x", rsp->cap_id);
+		return;
+	}
+
+	if (buf->len < sizeof(*rsp) + expected_len) {
+		LOG_ERR("Invalid capability payload length: %d", buf->len);
+		return;
+	}
+
+	avrcp_cb->get_cap_rsp(avrcp, tid, rsp);
+}
+
+static void avrcp_vendor_dependent_handler(struct bt_avrcp *avrcp, uint8_t tid, struct net_buf *buf,
 					   bt_avctp_cr_t cr)
 {
-	/* ToDo */
+	struct bt_avrcp_avc_pdu *pdu;
+	struct bt_avrcp_header *avrcp_hdr;
+	uint32_t company_id;
+	uint8_t pdu_id;
+
+	if (buf->len < (sizeof(*avrcp_hdr) + BT_AVRCP_COMPANY_ID_SIZE + sizeof(pdu_id))) {
+		LOG_ERR("Invalid vendor frame length: %d", buf->len);
+		return;
+	}
+
+	avrcp_hdr = net_buf_pull_mem(buf, sizeof(*avrcp_hdr));
+	company_id = net_buf_pull_be24(buf);
+	if (company_id != BT_AVRCP_COMPANY_ID_BLUETOOTH_SIG) {
+		LOG_ERR("Invalid company id: 0x%06x", company_id);
+		return;
+	}
+
+	pdu = (struct bt_avrcp_avc_pdu *)buf->data;
+
+	if (cr == BT_AVCTP_CMD) {
+		LOG_DBG("Unhandled command: 0x%02x", pdu->pdu_id);
+	} else { /* BT_AVCTP_RESPONSE */
+		switch (pdu->pdu_id) {
+		case BT_AVRCP_PDU_ID_GET_CAPS:
+			process_get_cap_rsp(avrcp, tid, buf);
+			break;
+		default:
+			LOG_DBG("Unhandled response: 0x%02x", pdu->pdu_id);
+			break;
+		}
+	}
 }
 
-static void avrcp_unit_info_handler(struct bt_avrcp *avrcp, struct net_buf *buf, bt_avctp_cr_t cr)
+static void avrcp_unit_info_handler(struct bt_avrcp *avrcp, uint8_t tid, struct net_buf *buf,
+				    bt_avctp_cr_t cr)
 {
 	struct bt_avrcp_header *avrcp_hdr;
 	struct bt_avrcp_unit_info_rsp rsp;
 
+	avrcp_hdr = net_buf_pull_mem(buf, sizeof(*avrcp_hdr));
+
 	if (cr == BT_AVCTP_CMD) {
 		/* ToDo */
 	} else { /* BT_AVCTP_RESPONSE */
 		if ((avrcp_cb != NULL) && (avrcp_cb->unit_info_rsp != NULL)) {
-			net_buf_pull(buf, sizeof(*avrcp_hdr));
 			if (buf->len != 5) {
-				LOG_ERR("Invalid unit info length");
+				LOG_ERR("Invalid unit info length: %d", buf->len);
 				return;
 			}
 			net_buf_pull_u8(buf); /* Always 0x07 */
 			rsp.unit_type = FIELD_GET(GENMASK(7, 3), net_buf_pull_u8(buf));
 			rsp.company_id = net_buf_pull_be24(buf);
-			avrcp_cb->unit_info_rsp(avrcp, &rsp);
+			avrcp_cb->unit_info_rsp(avrcp, tid, &rsp);
 		}
 	}
 }
 
-static void avrcp_subunit_info_handler(struct bt_avrcp *avrcp, struct net_buf *buf,
+static void avrcp_subunit_info_handler(struct bt_avrcp *avrcp, uint8_t tid, struct net_buf *buf,
 					   bt_avctp_cr_t cr)
 {
 	struct bt_avrcp_header *avrcp_hdr;
 	struct bt_avrcp_subunit_info_rsp rsp;
 	uint8_t tmp;
 
+	avrcp_hdr = net_buf_pull_mem(buf, sizeof(*avrcp_hdr));
+
 	if (cr == BT_AVCTP_CMD) {
 		/* ToDo */
 	} else { /* BT_AVCTP_RESPONSE */
 		if ((avrcp_cb != NULL) && (avrcp_cb->subunit_info_rsp != NULL)) {
-			net_buf_pull(buf, sizeof(*avrcp_hdr));
 			if (buf->len < 5) {
-				LOG_ERR("Invalid subunit info length");
+				LOG_ERR("Invalid subunit info length: %d", buf->len);
 				return;
 			}
 			net_buf_pull_u8(buf); /* Always 0x07 */
@@ -297,22 +366,42 @@ static void avrcp_subunit_info_handler(struct bt_avrcp *avrcp, struct net_buf *b
 			}
 			rsp.extended_subunit_type = buf->data;
 			rsp.extended_subunit_id = rsp.extended_subunit_type + rsp.max_subunit_id;
-			avrcp_cb->subunit_info_rsp(avrcp, &rsp);
+			avrcp_cb->subunit_info_rsp(avrcp, tid, &rsp);
 		}
 	}
 }
 
-static void avrcp_pass_through_handler(struct bt_avrcp *avrcp, struct net_buf *buf,
+static void avrcp_pass_through_handler(struct bt_avrcp *avrcp, uint8_t tid, struct net_buf *buf,
 					   bt_avctp_cr_t cr)
 {
-	/* ToDo */
+	struct bt_avrcp_header *avrcp_hdr;
+	struct bt_avrcp_passthrough_rsp *rsp;
+	bt_avrcp_rsp_t result;
+
+	avrcp_hdr = net_buf_pull_mem(buf, sizeof(*avrcp_hdr));
+
+	if (cr == BT_AVCTP_CMD) {
+		/* ToDo */
+	} else { /* BT_AVCTP_RESPONSE */
+		if ((avrcp_cb != NULL) && (avrcp_cb->subunit_info_rsp != NULL)) {
+			if (buf->len < sizeof(*rsp)) {
+				LOG_ERR("Invalid passthrough length: %d", buf->len);
+				return;
+			}
+
+			result = BT_AVRCP_HDR_GET_CTYPE_OR_RSP(avrcp_hdr);
+			rsp = (struct bt_avrcp_passthrough_rsp *)buf->data;
+
+			avrcp_cb->passthrough_rsp(avrcp, tid, result, rsp);
+		}
+	}
 }
 
 static const struct avrcp_handler handler[] = {
-	{ BT_AVRCP_OPC_VENDOR_DEPENDENT, avrcp_vendor_dependent_handler },
-	{ BT_AVRCP_OPC_UNIT_INFO, avrcp_unit_info_handler },
-	{ BT_AVRCP_OPC_SUBUNIT_INFO, avrcp_subunit_info_handler },
-	{ BT_AVRCP_OPC_PASS_THROUGH, avrcp_pass_through_handler },
+	{BT_AVRCP_OPC_VENDOR_DEPENDENT, avrcp_vendor_dependent_handler},
+	{BT_AVRCP_OPC_UNIT_INFO, avrcp_unit_info_handler},
+	{BT_AVRCP_OPC_SUBUNIT_INFO, avrcp_subunit_info_handler},
+	{BT_AVRCP_OPC_PASS_THROUGH, avrcp_pass_through_handler},
 };
 
 /* An AVRCP message received */
@@ -323,12 +412,11 @@ static int avrcp_recv(struct bt_avctp *session, struct net_buf *buf)
 	struct bt_avrcp_header *avrcp_hdr;
 	uint8_t tid, i;
 	bt_avctp_cr_t cr;
-	bt_avrcp_ctype_t ctype;
+	bt_avrcp_rsp_t rsp;
 	bt_avrcp_subunit_id_t subunit_id;
 	bt_avrcp_subunit_type_t subunit_type;
 
-	avctp_hdr = (void *)buf->data;
-	net_buf_pull(buf, sizeof(*avctp_hdr));
+	avctp_hdr = net_buf_pull_mem(buf, sizeof(*avctp_hdr));
 	if (buf->len < sizeof(*avrcp_hdr)) {
 		LOG_ERR("invalid AVRCP header received");
 		return -EINVAL;
@@ -337,7 +425,7 @@ static int avrcp_recv(struct bt_avctp *session, struct net_buf *buf)
 	avrcp_hdr = (void *)buf->data;
 	tid = BT_AVCTP_HDR_GET_TRANSACTION_LABLE(avctp_hdr);
 	cr = BT_AVCTP_HDR_GET_CR(avctp_hdr);
-	ctype = BT_AVRCP_HDR_GET_CTYPE(avrcp_hdr);
+	rsp = BT_AVRCP_HDR_GET_CTYPE_OR_RSP(avrcp_hdr);
 	subunit_id = BT_AVRCP_HDR_GET_SUBUNIT_ID(avrcp_hdr);
 	subunit_type = BT_AVRCP_HDR_GET_SUBUNIT_TYPE(avrcp_hdr);
 
@@ -345,27 +433,12 @@ static int avrcp_recv(struct bt_avctp *session, struct net_buf *buf)
 		return -EINVAL; /* Ignore other profile */
 	}
 
-	LOG_DBG("AVRCP msg received, cr:0x%X, tid:0x%X, ctype: 0x%X, opc:0x%02X,", cr, tid, ctype,
+	LOG_DBG("AVRCP msg received, cr:0x%X, tid:0x%X, rsp: 0x%X, opc:0x%02X,", cr, tid, rsp,
 		avrcp_hdr->opcode);
-	if (cr == BT_AVCTP_RESPONSE) {
-		if (avrcp_hdr->opcode == BT_AVRCP_OPC_VENDOR_DEPENDENT &&
-		    ctype == BT_AVRCP_CTYPE_CHANGED) {
-			/* Status changed notifiation, do not reset timer */
-		} else if (avrcp_hdr->opcode == BT_AVRCP_OPC_PASS_THROUGH) {
-			/* No max response time for pass through commands  */
-		} else if (tid != avrcp->req.tid || subunit_type != avrcp->req.subunit ||
-			   avrcp_hdr->opcode != avrcp->req.opcode) {
-			LOG_WRN("unexpected AVRCP response, expected tid:0x%X, subunit:0x%X, "
-				"opc:0x%02X",
-				avrcp->req.tid, avrcp->req.subunit, avrcp->req.opcode);
-		} else {
-			k_work_cancel_delayable(&avrcp->timeout_work);
-		}
-	}
 
 	for (i = 0U; i < ARRAY_SIZE(handler); i++) {
 		if (avrcp_hdr->opcode == handler[i].opcode) {
-			handler[i].func(avrcp, buf, cr);
+			handler[i].func(avrcp, tid, buf, cr);
 			return 0;
 		}
 	}
@@ -460,31 +533,31 @@ int bt_avrcp_disconnect(struct bt_avrcp *avrcp)
 	return err;
 }
 
-static struct net_buf *avrcp_create_pdu(struct bt_avrcp *avrcp, bt_avctp_cr_t cr)
+static struct net_buf *avrcp_create_pdu(struct bt_avrcp *avrcp, uint8_t tid, bt_avctp_cr_t cr)
 {
 	struct net_buf *buf;
 
 	buf = bt_avctp_create_pdu(&(avrcp->session), cr, BT_AVCTP_PKT_TYPE_SINGLE,
-				  BT_AVCTP_IPID_NONE, &avrcp->local_tid,
+				  BT_AVCTP_IPID_NONE, tid,
 				  sys_cpu_to_be16(BT_SDP_AV_REMOTE_SVCLASS));
 
 	return buf;
 }
 
-static struct net_buf *avrcp_create_unit_pdu(struct bt_avrcp *avrcp, bt_avctp_cr_t cr)
+static struct net_buf *avrcp_create_unit_pdu(struct bt_avrcp *avrcp, uint8_t tid, bt_avctp_cr_t cr)
 {
 	struct net_buf *buf;
-	struct bt_avrcp_unit_info_cmd *cmd;
+	struct bt_avrcp_frame *cmd;
 
-	buf = avrcp_create_pdu(avrcp, cr);
+	buf = avrcp_create_pdu(avrcp, tid, cr);
 	if (!buf) {
-		return buf;
+		return NULL;
 	}
 
 	cmd = net_buf_add(buf, sizeof(*cmd));
 	memset(cmd, 0, sizeof(*cmd));
-	BT_AVRCP_HDR_SET_CTYPE(&cmd->hdr, cr == BT_AVCTP_CMD ? BT_AVRCP_CTYPE_STATUS
-							     : BT_AVRCP_CTYPE_IMPLEMENTED_STABLE);
+	BT_AVRCP_HDR_SET_CTYPE_OR_RSP(&cmd->hdr, cr == BT_AVCTP_CMD ? BT_AVRCP_CTYPE_STATUS
+								    : BT_AVRCP_RSP_STABLE);
 	BT_AVRCP_HDR_SET_SUBUNIT_ID(&cmd->hdr, BT_AVRCP_SUBUNIT_ID_IGNORE);
 	BT_AVRCP_HDR_SET_SUBUNIT_TYPE(&cmd->hdr, BT_AVRCP_SUBUNIT_TYPE_UNIT);
 	cmd->hdr.opcode = BT_AVRCP_OPC_UNIT_INFO;
@@ -492,20 +565,21 @@ static struct net_buf *avrcp_create_unit_pdu(struct bt_avrcp *avrcp, bt_avctp_cr
 	return buf;
 }
 
-static struct net_buf *avrcp_create_subunit_pdu(struct bt_avrcp *avrcp, bt_avctp_cr_t cr)
+static struct net_buf *avrcp_create_subunit_pdu(struct bt_avrcp *avrcp, uint8_t tid,
+						bt_avctp_cr_t cr)
 {
 	struct net_buf *buf;
-	struct bt_avrcp_unit_info_cmd *cmd;
+	struct bt_avrcp_frame *cmd;
 
-	buf = avrcp_create_pdu(avrcp, cr);
+	buf = avrcp_create_pdu(avrcp, tid, cr);
 	if (!buf) {
-		return buf;
+		return NULL;
 	}
 
 	cmd = net_buf_add(buf, sizeof(*cmd));
 	memset(cmd, 0, sizeof(*cmd));
-	BT_AVRCP_HDR_SET_CTYPE(&cmd->hdr, cr == BT_AVCTP_CMD ? BT_AVRCP_CTYPE_STATUS
-							     : BT_AVRCP_CTYPE_IMPLEMENTED_STABLE);
+	BT_AVRCP_HDR_SET_CTYPE_OR_RSP(&cmd->hdr, cr == BT_AVCTP_CMD ? BT_AVRCP_CTYPE_STATUS
+								    : BT_AVRCP_RSP_STABLE);
 	BT_AVRCP_HDR_SET_SUBUNIT_ID(&cmd->hdr, BT_AVRCP_SUBUNIT_ID_IGNORE);
 	BT_AVRCP_HDR_SET_SUBUNIT_TYPE(&cmd->hdr, BT_AVRCP_SUBUNIT_TYPE_UNIT);
 	cmd->hdr.opcode = BT_AVRCP_OPC_SUBUNIT_INFO;
@@ -513,6 +587,48 @@ static struct net_buf *avrcp_create_subunit_pdu(struct bt_avrcp *avrcp, bt_avctp
 	return buf;
 }
 
+static struct net_buf *avrcp_create_passthrough_pdu(struct bt_avrcp *avrcp, uint8_t tid,
+						    bt_avctp_cr_t cr, uint8_t ctype_or_rsp)
+{
+	struct net_buf *buf;
+	struct bt_avrcp_frame *cmd;
+
+	buf = avrcp_create_pdu(avrcp, tid, cr);
+	if (!buf) {
+		return NULL;
+	}
+
+	cmd = net_buf_add(buf, sizeof(*cmd));
+	memset(cmd, 0, sizeof(*cmd));
+	BT_AVRCP_HDR_SET_CTYPE_OR_RSP(&cmd->hdr, ctype_or_rsp);
+	BT_AVRCP_HDR_SET_SUBUNIT_ID(&cmd->hdr, BT_AVRCP_SUBUNIT_ID_ZERO);
+	BT_AVRCP_HDR_SET_SUBUNIT_TYPE(&cmd->hdr, BT_AVRCP_SUBUNIT_TYPE_PANEL);
+	cmd->hdr.opcode = BT_AVRCP_OPC_PASS_THROUGH;
+
+	return buf;
+}
+
+static struct net_buf *avrcp_create_vendor_pdu(struct bt_avrcp *avrcp, uint8_t tid,
+					       bt_avctp_cr_t cr, uint8_t ctype_or_rsp)
+{
+	struct net_buf *buf;
+	struct bt_avrcp_frame *cmd;
+
+	buf = avrcp_create_pdu(avrcp, tid, cr);
+	if (!buf) {
+		return NULL;
+	}
+
+	cmd = net_buf_add(buf, sizeof(*cmd));
+	memset(cmd, 0, sizeof(*cmd));
+	BT_AVRCP_HDR_SET_CTYPE_OR_RSP(&cmd->hdr, ctype_or_rsp);
+	BT_AVRCP_HDR_SET_SUBUNIT_ID(&cmd->hdr, BT_AVRCP_SUBUNIT_ID_ZERO);
+	BT_AVRCP_HDR_SET_SUBUNIT_TYPE(&cmd->hdr, BT_AVRCP_SUBUNIT_TYPE_PANEL);
+	cmd->hdr.opcode = BT_AVRCP_OPC_VENDOR_DEPENDENT;
+
+	return buf;
+}
+
 static int avrcp_send(struct bt_avrcp *avrcp, struct net_buf *buf)
 {
 	int err;
@@ -521,33 +637,46 @@ static int avrcp_send(struct bt_avrcp *avrcp, struct net_buf *buf)
 		(struct bt_avrcp_header *)(buf->data + sizeof(*avctp_hdr));
 	uint8_t tid = BT_AVCTP_HDR_GET_TRANSACTION_LABLE(avctp_hdr);
 	bt_avctp_cr_t cr = BT_AVCTP_HDR_GET_CR(avctp_hdr);
-	bt_avrcp_ctype_t ctype = BT_AVRCP_HDR_GET_CTYPE(avrcp_hdr);
-	bt_avrcp_subunit_type_t subunit_type = BT_AVRCP_HDR_GET_SUBUNIT_TYPE(avrcp_hdr);
+	bt_avrcp_ctype_t ctype = BT_AVRCP_HDR_GET_CTYPE_OR_RSP(avrcp_hdr);
 
 	LOG_DBG("AVRCP send cr:0x%X, tid:0x%X, ctype: 0x%X, opc:0x%02X\n", cr, tid, ctype,
 		avrcp_hdr->opcode);
 	err = bt_avctp_send(&(avrcp->session), buf);
 	if (err < 0) {
+		net_buf_unref(buf);
+		LOG_ERR("AVCTP send fail, err = %d", err);
 		return err;
 	}
 
-	if (cr == BT_AVCTP_CMD && avrcp_hdr->opcode != BT_AVRCP_OPC_PASS_THROUGH) {
-		avrcp->req.tid = tid;
-		avrcp->req.subunit = subunit_type;
-		avrcp->req.opcode = avrcp_hdr->opcode;
+	return 0;
+}
 
-		k_work_reschedule(&avrcp->timeout_work, AVRCP_TIMEOUT);
+int bt_avrcp_get_cap(struct bt_avrcp *avrcp, uint8_t tid, uint8_t cap_id)
+{
+	struct net_buf *buf;
+	struct bt_avrcp_avc_pdu *pdu;
+
+	buf = avrcp_create_vendor_pdu(avrcp, tid, BT_AVCTP_CMD, BT_AVRCP_CTYPE_STATUS);
+	if (!buf) {
+		return -ENOMEM;
 	}
 
-	return 0;
+	net_buf_add_be24(buf, BT_AVRCP_COMPANY_ID_BLUETOOTH_SIG);
+	pdu = net_buf_add(buf, sizeof(*pdu));
+	pdu->pdu_id = BT_AVRCP_PDU_ID_GET_CAPS;
+	BT_AVRCP_AVC_PDU_SET_PACKET_TYPE(pdu, BT_AVRVP_PKT_TYPE_SINGLE);
+	pdu->param_len = sys_cpu_to_be16(sizeof(cap_id));
+	net_buf_add_u8(buf, cap_id);
+
+	return avrcp_send(avrcp, buf);
 }
 
-int bt_avrcp_get_unit_info(struct bt_avrcp *avrcp)
+int bt_avrcp_get_unit_info(struct bt_avrcp *avrcp, uint8_t tid)
 {
 	struct net_buf *buf;
 	uint8_t param[5];
 
-	buf = avrcp_create_unit_pdu(avrcp, BT_AVCTP_CMD);
+	buf = avrcp_create_unit_pdu(avrcp, tid, BT_AVCTP_CMD);
 	if (!buf) {
 		return -ENOMEM;
 	}
@@ -558,24 +687,43 @@ int bt_avrcp_get_unit_info(struct bt_avrcp *avrcp)
 	return avrcp_send(avrcp, buf);
 }
 
-int bt_avrcp_get_subunit_info(struct bt_avrcp *avrcp)
+int bt_avrcp_get_subunit_info(struct bt_avrcp *avrcp, uint8_t tid)
 {
 	struct net_buf *buf;
 	uint8_t param[5];
 
-	buf = avrcp_create_subunit_pdu(avrcp, BT_AVCTP_CMD);
+	buf = avrcp_create_subunit_pdu(avrcp, tid, BT_AVCTP_CMD);
 	if (!buf) {
 		return -ENOMEM;
 	}
 
 	memset(param, 0xFF, ARRAY_SIZE(param));
 	param[0] = FIELD_PREP(GENMASK(6, 4), AVRCP_SUBUNIT_PAGE) |
-		   FIELD_PREP(GENMASK(2, 0), AVRCP_SUBUNIT_EXTENSION_COED);
+		   FIELD_PREP(GENMASK(2, 0), AVRCP_SUBUNIT_EXTENSION_CODE);
 	net_buf_add_mem(buf, param, sizeof(param));
 
 	return avrcp_send(avrcp, buf);
 }
 
+int bt_avrcp_passthrough(struct bt_avrcp *avrcp, uint8_t tid, uint8_t opid, uint8_t state,
+			 const uint8_t *payload, uint8_t len)
+{
+	struct net_buf *buf;
+
+	buf = avrcp_create_passthrough_pdu(avrcp, tid, BT_AVCTP_CMD, BT_AVRCP_CTYPE_CONTROL);
+	if (!buf) {
+		return -ENOMEM;
+	}
+
+	net_buf_add_u8(buf, FIELD_PREP(BIT(7), state) | FIELD_PREP(GENMASK(6, 0), opid));
+	net_buf_add_u8(buf, len);
+	if (len) {
+		net_buf_add_mem(buf, payload, len);
+	}
+
+	return avrcp_send(avrcp, buf);
+}
+
 int bt_avrcp_register_cb(const struct bt_avrcp_cb *cb)
 {
 	avrcp_cb = cb;
diff --git a/subsys/bluetooth/host/classic/avrcp_internal.h b/subsys/bluetooth/host/classic/avrcp_internal.h
index cbfcc8e824f79..6d4e329da8127 100644
--- a/subsys/bluetooth/host/classic/avrcp_internal.h
+++ b/subsys/bluetooth/host/classic/avrcp_internal.h
@@ -18,22 +18,7 @@
 #define AVRCP_CAT_4 BIT(3) /* Menu */
 
 #define AVRCP_SUBUNIT_PAGE           (0) /* Fixed value according to AVRCP */
-#define AVRCP_SUBUNIT_EXTENSION_COED (7) /* Fixed value according to TA Document 2001012 */
-
-typedef enum __packed {
-	BT_AVRCP_CTYPE_CONTROL = 0x0,
-	BT_AVRCP_CTYPE_STATUS = 0x1,
-	BT_AVRCP_CTYPE_SPECIFIC_INQUIRY = 0x2,
-	BT_AVRCP_CTYPE_NOTIFY = 0x3,
-	BT_AVRCP_CTYPE_GENERAL_INQUIRY = 0x4,
-	BT_AVRCP_CTYPE_NOT_IMPLEMENTED = 0x8,
-	BT_AVRCP_CTYPE_ACCEPTED = 0x9,
-	BT_AVRCP_CTYPE_REJECTED = 0xA,
-	BT_AVRCP_CTYPE_IN_TRANSITION = 0xB,
-	BT_AVRCP_CTYPE_IMPLEMENTED_STABLE = 0xC,
-	BT_AVRCP_CTYPE_CHANGED = 0xD,
-	BT_AVRCP_CTYPE_INTERIM = 0xF,
-} bt_avrcp_ctype_t;
+#define AVRCP_SUBUNIT_EXTENSION_CODE (7) /* Fixed value according to TA Document 2001012 */
 
 typedef enum __packed {
 	BT_AVRCP_SUBUNIT_ID_ZERO = 0x0,
@@ -52,6 +37,74 @@ typedef enum __packed {
 	BT_AVRCP_OPC_PASS_THROUGH = 0x7c,
 } bt_avrcp_opcode_t;
 
+typedef enum __packed {
+	BT_AVRVP_PKT_TYPE_SINGLE = 0b00,
+	BT_AVRVP_PKT_TYPE_START = 0b01,
+	BT_AVRVP_PKT_TYPE_CONTINUE = 0b10,
+	BT_AVRVP_PKT_TYPE_END = 0b11,
+} bt_avrcp_pkt_type_t;
+
+typedef enum __packed {
+	/** Capabilities */
+	BT_AVRCP_PDU_ID_GET_CAPS = 0x10,
+
+	/** Player Application Settings */
+	BT_AVRCP_PDU_ID_LIST_PLAYER_APP_SETTING_ATTRS = 0x11,
+	BT_AVRCP_PDU_ID_LIST_PLAYER_APP_SETTING_VALS = 0x12,
+	BT_AVRCP_PDU_ID_GET_CURR_PLAYER_APP_SETTING_VAL = 0x13,
+	BT_AVRCP_PDU_ID_SET_PLAYER_APP_SETTING_VAL = 0x14,
+	BT_AVRCP_PDU_ID_GET_PLAYER_APP_SETTING_ATTR_TEXT = 0x15,
+	BT_AVRCP_PDU_ID_GET_PLAYER_APP_SETTING_VAL_TEXT = 0x16,
+	BT_AVRCP_PDU_ID_INFORM_DISPLAYABLE_CHAR_SET = 0x17,
+	BT_AVRCP_PDU_ID_INFORM_BATT_STATUS_OF_CT = 0x18,
+
+	/** Metadata Attributes for Current Media Item */
+	BT_AVRCP_PDU_ID_GET_ELEMENT_ATTRS = 0x20,
+
+	/** Notifications */
+	BT_AVRCP_PDU_ID_GET_PLAY_STATUS = 0x30,
+	BT_AVRCP_PDU_ID_REGISTER_NOTIFICATION = 0x31,
+	BT_AVRCP_PDU_ID_EVT_PLAYBACK_STATUS_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_TRACK_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_TRACK_REACHED_END = 0x31,
+	BT_AVRCP_PDU_ID_EVT_TRACK_REACHED_START = 0x31,
+	BT_AVRCP_PDU_ID_EVT_PLAYBACK_POS_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_BATT_STATUS_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_SYSTEM_STATUS_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_PLAYER_APP_SETTING_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_VOLUME_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_ADDRESSED_PLAYER_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_AVAILABLE_PLAYERS_CHANGED = 0x31,
+	BT_AVRCP_PDU_ID_EVT_UIDS_CHANGED = 0x31,
+
+	/** Continuation */
+	BT_AVRCP_PDU_ID_REQ_CONTINUING_RSP = 0x40,
+	BT_AVRCP_PDU_ID_ABORT_CONTINUING_RSP = 0x41,
+
+	/** Absolute Volume */
+	BT_AVRCP_PDU_ID_SET_ABSOLUTE_VOLUME = 0x50,
+
+	/** Media Player Selection */
+	BT_AVRCP_PDU_ID_SET_ADDRESSED_PLAYER = 0x60,
+
+	/** Browsing */
+	BT_AVRCP_PDU_ID_SET_BROWSED_PLAYER = 0x70,
+	BT_AVRCP_PDU_ID_GET_FOLDER_ITEMS = 0x71,
+	BT_AVRCP_PDU_ID_CHANGE_PATH = 0x72,
+	BT_AVRCP_PDU_ID_GET_ITEM_ATTRS = 0x73,
+	BT_AVRCP_PDU_ID_PLAY_ITEM = 0x74,
+	BT_AVRCP_PDU_ID_GET_TOTAL_NUMBER_OF_ITEMS = 0x75,
+
+	/** Search */
+	BT_AVRCP_PDU_ID_SEARCH = 0x80,
+
+	/** Now Playing */
+	BT_AVRCP_PDU_ID_ADD_TO_NOW_PLAYING = 0x90,
+
+	/** Error Response */
+	BT_AVRCP_PDU_ID_GENERAL_REJECT = 0xa0,
+} bt_avrcp_pdu_id_t;
+
 struct bt_avrcp_req {
 	uint8_t tid;
 	uint8_t subunit;
@@ -59,13 +112,20 @@ struct bt_avrcp_req {
 };
 
 struct bt_avrcp_header {
-	uint8_t byte0;  /** [7:4]: RFA, [3:0]: Ctype */
-	uint8_t byte1;  /** [7:3]: Subunit_type, [2:0]: Subunit_ID */
-	uint8_t opcode; /** Unit Info, Subunit Info, Vendor Dependent, or Pass Through */
+	uint8_t byte0;  /**< [7:4]: RFA, [3:0]: Ctype */
+	uint8_t byte1;  /**< [7:3]: Subunit_type, [2:0]: Subunit_ID */
+	uint8_t opcode; /**< Unit Info, Subunit Info, Vendor Dependent, or Pass Through */
+} __packed;
+
+struct bt_avrcp_avc_pdu {
+	uint8_t pdu_id;
+	uint8_t pkt_type; /**< [7:2]: Reserved, [1:0]: Packet Type */
+	uint16_t param_len;
+	uint8_t param[];
 } __packed;
 
 /** The 4-bit command type or the 4-bit response code. */
-#define BT_AVRCP_HDR_GET_CTYPE(hdr)        FIELD_GET(GENMASK(3, 0), ((hdr)->byte0))
+#define BT_AVRCP_HDR_GET_CTYPE_OR_RSP(hdr) FIELD_GET(GENMASK(3, 0), ((hdr)->byte0))
 /** Taken together, the subunit_type and subunit_ID fields define the command recipient’s  address
  *  within the target. These fields enable the target to determine  whether the command is
  *  addressed to the target  unit, or to a specific subunit within the target. The values in these
@@ -80,7 +140,7 @@ struct bt_avrcp_header {
 #define BT_AVRCP_HDR_GET_SUBUNIT_TYPE(hdr) FIELD_GET(GENMASK(7, 3), ((hdr)->byte1))
 
 /** The 4-bit command type or the 4-bit response code. */
-#define BT_AVRCP_HDR_SET_CTYPE(hdr, ctype)                                                         \
+#define BT_AVRCP_HDR_SET_CTYPE_OR_RSP(hdr, ctype)                                                  \
 	(hdr)->byte0 = (((hdr)->byte0) & ~GENMASK(3, 0)) | FIELD_PREP(GENMASK(3, 0), (ctype))
 /** Taken together, the subunit_type and subunit_ID fields define the command recipient’s  address
  *  within the target. These fields enable the target to determine  whether the command is
@@ -97,9 +157,22 @@ struct bt_avrcp_header {
 #define BT_AVRCP_HDR_SET_SUBUNIT_TYPE(hdr, subunit_type)                                           \
 	(hdr)->byte1 = (((hdr)->byte1) & ~GENMASK(7, 3)) | FIELD_PREP(GENMASK(7, 3), (subunit_type))
 
-struct bt_avrcp_unit_info_cmd {
+/** The Packet Type field qualifies each packet as either start (Packet Type=01), continue
+ *  (Packet Type=10), or end packet (Packet Type=11). In the case of a non-fragmented message, this
+ *  field (Packet Type=00) simply indicates that the message is sent in a single AV/C frame.
+ */
+#define BT_AVRCP_AVC_PDU_GET_PACKET_TYPE(pdu) FIELD_GET(GENMASK(1, 0), ((pdu)->pkt_type))
+
+/** The Packet Type field qualifies each packet as either start (Packet Type=01), continue
+ *  (Packet Type=10), or end packet (Packet Type=11). In the case of a non-fragmented message, this
+ *  field (Packet Type=00) simply indicates that the message is sent in a single AV/C frame.
+ */
+#define BT_AVRCP_AVC_PDU_SET_PACKET_TYPE(pdu, packet_type)                                         \
+	(pdu)->pkt_type = FIELD_PREP(GENMASK(1, 0), (packet_type))
+
+struct bt_avrcp_frame {
 	struct bt_avrcp_header hdr;
-	uint8_t data[0];
+	uint8_t data[];
 } __packed;
 
 int bt_avrcp_init(void);
diff --git a/subsys/bluetooth/host/classic/br.c b/subsys/bluetooth/host/classic/br.c
index 082720baf9d29..abbd345b44b14 100644
--- a/subsys/bluetooth/host/classic/br.c
+++ b/subsys/bluetooth/host/classic/br.c
@@ -24,6 +24,12 @@ LOG_MODULE_REGISTER(bt_br);
 
 #define RSSI_INVALID 127
 
+enum __packed resolve_name_state {
+	RESOLVE_REMOTE_NAME_PENDING,
+	RESOLVE_REMOTE_NAME_RESOLVING,
+	RESOLVE_REMOTE_NAME_RESOLVED,
+};
+
 struct bt_br_discovery_result *discovery_results;
 static size_t discovery_results_size;
 static size_t discovery_results_count;
@@ -155,7 +161,7 @@ bool bt_br_update_sec_level(struct bt_conn *conn)
 
 	if (conn->br.link_key) {
 		if (conn->br.link_key->flags & BT_LINK_KEY_AUTHENTICATED) {
-			if (conn->encrypt == 0x02) {
+			if (conn->encrypt == BT_HCI_ENCRYPTION_ON_BR_AES_CCM) {
 				conn->sec_level = BT_SECURITY_L4;
 			} else {
 				conn->sec_level = BT_SECURITY_L3;
@@ -327,11 +333,10 @@ void bt_br_discovery_reset(void)
 	discovery_results_count = 0;
 }
 
-static void report_discovery_results(void)
+static bool check_request_name(void)
 {
-	bool resolving_names = false;
 	int i;
-	struct bt_br_discovery_cb *listener, *next;
+	bool resolving_names = false;
 
 	for (i = 0; i < discovery_results_count; i++) {
 		struct bt_br_discovery_priv *priv;
@@ -342,16 +347,37 @@ static void report_discovery_results(void)
 			continue;
 		}
 
+		if (priv->resolve_state != RESOLVE_REMOTE_NAME_PENDING) {
+			continue;
+		}
+
 		if (request_name(&discovery_results[i].addr, priv->pscan_rep_mode,
 				 priv->clock_offset)) {
+			priv->resolve_state = RESOLVE_REMOTE_NAME_RESOLVED;
 			continue;
 		}
 
-		priv->resolving = true;
+		priv->resolve_state = RESOLVE_REMOTE_NAME_RESOLVING;
 		resolving_names = true;
+		break;
+	}
+
+	return resolving_names;
+}
+
+static void report_discovery_results(void)
+{
+	int i;
+	struct bt_br_discovery_cb *listener, *next;
+
+	for (i = 0; i < discovery_results_count; i++) {
+		struct bt_br_discovery_priv *priv;
+
+		priv = &discovery_results[i]._priv;
+		priv->resolve_state = RESOLVE_REMOTE_NAME_PENDING;
 	}
 
-	if (resolving_names) {
+	if (check_request_name()) {
 		return;
 	}
 
@@ -511,7 +537,6 @@ void bt_hci_remote_name_request_complete(struct net_buf *buf)
 	struct bt_br_discovery_priv *priv;
 	int eir_len = 240;
 	uint8_t *eir;
-	int i;
 	struct bt_br_discovery_cb *listener, *next;
 
 	result = get_result_slot(&evt->bdaddr, RSSI_INVALID);
@@ -520,7 +545,7 @@ void bt_hci_remote_name_request_complete(struct net_buf *buf)
 	}
 
 	priv = &result->_priv;
-	priv->resolving = false;
+	priv->resolve_state = RESOLVE_REMOTE_NAME_RESOLVED;
 
 	if (evt->status) {
 		goto check_names;
@@ -572,15 +597,9 @@ void bt_hci_remote_name_request_complete(struct net_buf *buf)
 	}
 
 check_names:
-	/* if still waiting for names */
-	for (i = 0; i < discovery_results_count; i++) {
-		struct bt_br_discovery_priv *dpriv;
-
-		dpriv = &discovery_results[i]._priv;
-
-		if (dpriv->resolving) {
-			return;
-		}
+	/* if still need to request name */
+	if (check_request_name()) {
+		return;
 	}
 
 	/* all names resolved, report discovery results */
@@ -982,7 +1001,7 @@ int bt_br_discovery_stop(void)
 
 		priv = &discovery_results[i]._priv;
 
-		if (!priv->resolving) {
+		if (priv->resolve_state != RESOLVE_REMOTE_NAME_RESOLVING) {
 			continue;
 		}
 
@@ -1057,8 +1076,128 @@ int bt_br_set_connectable(bool enable)
 	}
 }
 
-int bt_br_set_discoverable(bool enable)
+#define BT_LIAC 0x9e8b00
+#define BT_GIAC 0x9e8b33
+
+static int bt_br_write_current_iac_lap(bool limited)
+{
+	struct bt_hci_cp_write_current_iac_lap *iac_lap;
+	struct net_buf *buf;
+	uint8_t param_len;
+	uint8_t num_current_iac = limited ? 2 : 1;
+
+	LOG_DBG("limited discoverable mode? %s", limited ? "Yes" : "No");
+
+	param_len = sizeof(*iac_lap) + (num_current_iac * sizeof(struct bt_hci_iac_lap));
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_WRITE_CURRENT_IAC_LAP, param_len);
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	iac_lap = net_buf_add(buf, param_len);
+	iac_lap->num_current_iac = num_current_iac;
+	sys_put_le24(BT_GIAC, iac_lap->lap[0].iac);
+	if (num_current_iac > 1) {
+		sys_put_le24(BT_LIAC, iac_lap->lap[1].iac);
+	}
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_WRITE_CURRENT_IAC_LAP, buf, NULL);
+}
+
+#define BT_COD_MAJOR_SVC_CLASS_LIMITED_DISCOVER BIT(13)
+
+static int bt_br_read_cod(uint32_t *cod)
+{
+	struct net_buf *rsp;
+	struct bt_hci_rp_read_class_of_device *rp;
+	int err;
+
+	LOG_DBG("Read COD");
+
+	/* Read Class of device */
+	err = bt_hci_cmd_send_sync(BT_HCI_OP_READ_CLASS_OF_DEVICE, NULL, &rsp);
+	if (err) {
+		LOG_WRN("Fail to read COD");
+		return err;
+	}
+
+	if (!rsp || (rsp->len < sizeof(*rp))) {
+		LOG_WRN("Invalid response");
+		return -EIO;
+	}
+
+	rp = (void *)rsp->data;
+	*cod = sys_get_le24(rp->class_of_device);
+
+	LOG_DBG("Current COD %06x", *cod);
+
+	net_buf_unref(rsp);
+
+	return 0;
+}
+
+static int bt_br_write_cod(uint32_t cod)
+{
+	struct net_buf *buf;
+
+	/* Set Class of device */
+	buf = bt_hci_cmd_create(BT_HCI_OP_WRITE_CLASS_OF_DEVICE,
+				sizeof(struct bt_hci_cp_write_class_of_device));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	net_buf_add_le24(buf, cod);
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_WRITE_CLASS_OF_DEVICE, buf, NULL);
+}
+
+static int bt_br_update_cod(bool limited)
+{
+	int err;
+	uint32_t cod;
+
+	LOG_DBG("Update COD");
+
+	err = bt_br_read_cod(&cod);
+	if (err) {
+		return err;
+	}
+
+	if (limited) {
+		cod |= BT_COD_MAJOR_SVC_CLASS_LIMITED_DISCOVER;
+	} else {
+		cod &= ~BT_COD_MAJOR_SVC_CLASS_LIMITED_DISCOVER;
+	}
+
+	err = bt_br_write_cod(cod);
+	return err;
+}
+
+static void bt_br_limited_discoverable_timeout_handler(struct k_work *work)
+{
+	int err;
+
+	if (!atomic_test_bit(bt_dev.flags, BT_DEV_LIMITED_DISCOVERABLE_MODE)) {
+		LOG_INF("Limited discoverable mode has been disabled");
+		return;
+	}
+
+	err = bt_br_set_discoverable(false, false);
+	if (err) {
+		LOG_WRN("Disable discoverable failure (err %d)", err);
+	}
+}
+
+/* Work used for limited discoverable mode time span */
+static K_WORK_DELAYABLE_DEFINE(bt_br_limited_discoverable_timeout,
+			       bt_br_limited_discoverable_timeout_handler);
+
+int bt_br_set_discoverable(bool enable, bool limited)
 {
+	int err;
+
 	if (enable) {
 		if (atomic_test_bit(bt_dev.flags, BT_DEV_ISCAN)) {
 			return -EALREADY;
@@ -1068,12 +1207,94 @@ int bt_br_set_discoverable(bool enable)
 			return -EPERM;
 		}
 
-		return write_scan_enable(BT_BREDR_SCAN_INQUIRY | BT_BREDR_SCAN_PAGE);
-	} else {
-		if (!atomic_test_bit(bt_dev.flags, BT_DEV_ISCAN)) {
-			return -EALREADY;
+		err = bt_br_write_current_iac_lap(limited);
+		if (err) {
+			return err;
+		}
+
+		err = bt_br_update_cod(limited);
+		if (err) {
+			return err;
+		}
+
+		err = write_scan_enable(BT_BREDR_SCAN_INQUIRY | BT_BREDR_SCAN_PAGE);
+		if (!err && (limited == true)) {
+			atomic_set_bit(bt_dev.flags, BT_DEV_LIMITED_DISCOVERABLE_MODE);
+			k_work_reschedule(&bt_br_limited_discoverable_timeout,
+					  K_SECONDS(CONFIG_BT_LIMITED_DISCOVERABLE_DURATION));
+		}
+		return err;
+	}
+
+	if (!atomic_test_bit(bt_dev.flags, BT_DEV_ISCAN)) {
+		return -EALREADY;
+	}
+
+	err = write_scan_enable(BT_BREDR_SCAN_PAGE);
+	if (err) {
+		return err;
+	}
+
+	if (atomic_test_bit(bt_dev.flags, BT_DEV_LIMITED_DISCOVERABLE_MODE)) {
+		err = bt_br_write_current_iac_lap(false);
+		if (err) {
+			return err;
+		}
+
+		err = bt_br_update_cod(false);
+		if (err) {
+			return err;
+		}
+
+		atomic_clear_bit(bt_dev.flags, BT_DEV_LIMITED_DISCOVERABLE_MODE);
+		k_work_cancel_delayable(&bt_br_limited_discoverable_timeout);
+	}
+
+	return 0;
+}
+
+bool bt_br_bond_exists(const bt_addr_t *addr)
+{
+	struct bt_keys_link_key *key = bt_keys_find_link_key(addr);
+
+	/* if there are any keys stored then device is bonded */
+	return key != NULL;
+}
+
+static void unpair(const bt_addr_t *addr)
+{
+	struct bt_conn *conn = bt_conn_lookup_addr_br(addr);
+	struct bt_conn_auth_info_cb *listener, *next;
+
+	if (conn) {
+		bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+		bt_conn_unref(conn);
+	}
+
+	bt_keys_link_key_clear_addr(addr);
+
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&bt_auth_info_cbs, listener,
+					  next, node) {
+		if (listener->br_bond_deleted) {
+			listener->br_bond_deleted(addr);
 		}
+	}
+}
+
+static void bt_br_unpair_remote(const struct bt_br_bond_info *info, void *data)
+{
+	ARG_UNUSED(data);
+
+	unpair(&info->addr);
+}
 
-		return write_scan_enable(BT_BREDR_SCAN_PAGE);
+int bt_br_unpair(const bt_addr_t *addr)
+{
+	if (!addr || bt_addr_eq(addr, BT_ADDR_ANY)) {
+		bt_br_foreach_bond(bt_br_unpair_remote, NULL);
+	} else {
+		unpair(addr);
 	}
+
+	return 0;
 }
diff --git a/subsys/bluetooth/host/classic/conn_br.c b/subsys/bluetooth/host/classic/conn_br.c
new file mode 100644
index 0000000000000..f57b33a1509b1
--- /dev/null
+++ b/subsys/bluetooth/host/classic/conn_br.c
@@ -0,0 +1,145 @@
+/* conn_br.c - Bluetooth Classic connection handling */
+
+/*
+ * Copyright (c) 2015-2016 Intel Corporation
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/kernel.h>
+#include <string.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/sys/iterable_sections.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/__assert.h>
+
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/direction.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/att.h>
+
+#include "common/assert.h"
+#include "common/bt_str.h"
+
+#include "host/conn_internal.h"
+#include "host/l2cap_internal.h"
+#include "host/keys.h"
+#include "host/smp.h"
+#include "ssp.h"
+#include "sco_internal.h"
+
+#define LOG_LEVEL CONFIG_BT_CONN_LOG_LEVEL
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(bt_conn_br);
+
+void bt_sco_cleanup(struct bt_conn *sco_conn)
+{
+	bt_sco_cleanup_acl(sco_conn);
+	bt_conn_unref(sco_conn);
+}
+
+struct bt_conn *bt_conn_create_br(const bt_addr_t *peer,
+				  const struct bt_br_conn_param *param)
+{
+	struct bt_hci_cp_connect *cp;
+	struct bt_conn *conn;
+	struct net_buf *buf;
+
+	conn = bt_conn_lookup_addr_br(peer);
+	if (conn) {
+		switch (conn->state) {
+		case BT_CONN_INITIATING:
+		case BT_CONN_CONNECTED:
+			return conn;
+		default:
+			bt_conn_unref(conn);
+			return NULL;
+		}
+	}
+
+	conn = bt_conn_add_br(peer);
+	if (!conn) {
+		return NULL;
+	}
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_CONNECT, sizeof(*cp));
+	if (!buf) {
+		bt_conn_unref(conn);
+		return NULL;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+
+	(void)memset(cp, 0, sizeof(*cp));
+
+	memcpy(&cp->bdaddr, peer, sizeof(cp->bdaddr));
+	cp->packet_type = sys_cpu_to_le16(0xcc18); /* DM1 DH1 DM3 DH5 DM5 DH5 */
+	cp->pscan_rep_mode = 0x02; /* R2 */
+	cp->allow_role_switch = param->allow_role_switch ? 0x01 : 0x00;
+	cp->clock_offset = 0x0000; /* TODO used cached clock offset */
+
+	if (bt_hci_cmd_send_sync(BT_HCI_OP_CONNECT, buf, NULL) < 0) {
+		bt_conn_unref(conn);
+		return NULL;
+	}
+
+	bt_conn_set_state(conn, BT_CONN_INITIATING);
+	conn->role = BT_CONN_ROLE_CENTRAL;
+
+	return conn;
+}
+
+int bt_hci_connect_br_cancel(struct bt_conn *conn)
+{
+	struct bt_hci_cp_connect_cancel *cp;
+	struct bt_hci_rp_connect_cancel *rp;
+	struct net_buf *buf, *rsp;
+	int err;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_CONNECT_CANCEL, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	memcpy(&cp->bdaddr, &conn->br.dst, sizeof(cp->bdaddr));
+
+	err = bt_hci_cmd_send_sync(BT_HCI_OP_CONNECT_CANCEL, buf, &rsp);
+	if (err) {
+		return err;
+	}
+
+	rp = (void *)rsp->data;
+
+	err = rp->status ? -EIO : 0;
+
+	net_buf_unref(rsp);
+
+	return err;
+}
+
+const bt_addr_t *bt_conn_get_dst_br(const struct bt_conn *conn)
+{
+	if (conn == NULL) {
+		LOG_DBG("Invalid connect");
+		return NULL;
+	}
+
+	if (!bt_conn_is_type(conn, BT_CONN_TYPE_BR)) {
+		LOG_DBG("Invalid connection type: %u for %p", conn->type, conn);
+		return NULL;
+	}
+
+	return &conn->br.dst;
+}
diff --git a/subsys/bluetooth/host/classic/conn_br_internal.h b/subsys/bluetooth/host/classic/conn_br_internal.h
new file mode 100644
index 0000000000000..7ca8497470201
--- /dev/null
+++ b/subsys/bluetooth/host/classic/conn_br_internal.h
@@ -0,0 +1,12 @@
+/** @file
+ *  @brief Internal APIs for Bluetooth classic connection handling.
+ */
+
+/*
+ * Copyright (c) 2015 Intel Corporation
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+int bt_hci_connect_br_cancel(struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/classic/hfp_ag.c b/subsys/bluetooth/host/classic/hfp_ag.c
index c9f92f1618cf4..c21195be4db51 100644
--- a/subsys/bluetooth/host/classic/hfp_ag.c
+++ b/subsys/bluetooth/host/classic/hfp_ag.c
@@ -17,6 +17,7 @@
 
 #include <zephyr/bluetooth/classic/rfcomm.h>
 #include <zephyr/bluetooth/classic/hfp_ag.h>
+#include <zephyr/bluetooth/classic/sdp.h>
 
 #include "host/hci_core.h"
 #include "host/conn_internal.h"
@@ -24,8 +25,6 @@
 #include "rfcomm_internal.h"
 #include "at.h"
 #include "sco_internal.h"
-
-#include "hfp_internal.h"
 #include "hfp_ag_internal.h"
 
 #define LOG_LEVEL CONFIG_BT_HFP_AG_LOG_LEVEL
@@ -74,21 +73,95 @@ static struct bt_hfp_ag bt_hfp_ag_pool[CONFIG_BT_MAX_CONN];
 
 static struct bt_hfp_ag_cb *bt_ag;
 
+#define AG_SUPT_FEAT(ag, _feature) ((ag->ag_features & (_feature)) != 0)
+#define HF_SUPT_FEAT(ag, _feature) ((ag->hf_features & (_feature)) != 0)
+#define BOTH_SUPT_FEAT(ag, _hf_feature, _ag_feature) \
+	(HF_SUPT_FEAT(ag, _hf_feature) && AG_SUPT_FEAT(ag, _ag_feature))
+
 /* Sent but not acknowledged TX packets with a callback */
 static struct bt_ag_tx ag_tx[CONFIG_BT_HFP_AG_TX_BUF_COUNT * 2];
 static K_FIFO_DEFINE(ag_tx_free);
 static K_FIFO_DEFINE(ag_tx_notify);
 
-struct k_thread ag_thread;
-static K_KERNEL_STACK_MEMBER(ag_thread_stack, CONFIG_BT_HFP_AG_THREAD_STACK_SIZE);
-static k_tid_t ag_thread_id;
+/* HFP Gateway SDP record */
+static struct bt_sdp_attribute hfp_ag_attrs[] = {
+	BT_SDP_NEW_SERVICE,
+	BT_SDP_LIST(
+		BT_SDP_ATTR_SVCLASS_ID_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 6),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+			BT_SDP_ARRAY_16(BT_SDP_HANDSFREE_AGW_SVCLASS)
+		},
+		{
+			BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+			BT_SDP_ARRAY_16(BT_SDP_GENERIC_AUDIO_SVCLASS)
+		}
+		)
+	),
+	BT_SDP_LIST(
+		BT_SDP_ATTR_PROTO_DESC_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 12),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 3),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_L2CAP)
+			},
+			)
+		},
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 5),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_RFCOMM)
+			},
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UINT8),
+				BT_SDP_ARRAY_8(BT_RFCOMM_CHAN_HFP_AG)
+			},
+			)
+		},
+		)
+	),
+	BT_SDP_LIST(
+		BT_SDP_ATTR_PROFILE_DESC_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 6),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+			BT_SDP_ARRAY_16(BT_SDP_HANDSFREE_SVCLASS)
+		},
+		{
+			BT_SDP_TYPE_SIZE(BT_SDP_UINT16),
+			BT_SDP_ARRAY_16(0x0109)
+		},
+		)
+	),
+
+	BT_SDP_LIST(
+		BT_SDP_ATTR_NETWORK,
+		BT_SDP_TYPE_SIZE(BT_SDP_UINT8),
+		BT_SDP_ARRAY_8(IS_ENABLED(CONFIG_BT_HFP_AG_REJECT_CALL))
+	),
+	/* The values of the “SupportedFeatures” bitmap shall be the same as the
+	 * values of the Bits 0 to 4 of the AT-command AT+BRSF (see Section 5.3).
+	 */
+	BT_SDP_SUPPORTED_FEATURES(BT_HFP_AG_SDP_SUPPORTED_FEATURES),
+};
+
+static struct bt_sdp_record hfp_ag_rec = BT_SDP_RECORD(hfp_ag_attrs);
 
 static enum at_cme bt_hfp_ag_get_cme_err(int err)
 {
 	enum at_cme cme_err;
 
 	switch (err) {
-	case -EOPNOTSUPP:
+	case -ENOEXEC:
 		cme_err = CME_ERROR_OPERATION_NOT_SUPPORTED;
 		break;
 	case -EFAULT:
@@ -98,7 +171,6 @@ static enum at_cme bt_hfp_ag_get_cme_err(int err)
 		cme_err = CME_ERROR_MEMORY_FAILURE;
 		break;
 	case -ENOMEM:
-		__fallthrough;
 	case -ENOBUFS:
 		cme_err = CME_ERROR_MEMORY_FULL;
 		break;
@@ -134,12 +206,19 @@ static void hfp_ag_unlock(struct bt_hfp_ag *ag)
 
 static void bt_hfp_ag_set_state(struct bt_hfp_ag *ag, bt_hfp_state_t state)
 {
-	LOG_DBG("update state %p, old %d -> new %d", ag, ag->state, state);
+	bt_hfp_state_t old_state;
 
 	hfp_ag_lock(ag);
+	old_state = ag->state;
 	ag->state = state;
 	hfp_ag_unlock(ag);
 
+	LOG_DBG("update state %p, old %d -> new %d", ag, old_state, state);
+
+	if (old_state == state) {
+		return;
+	}
+
 	switch (state) {
 	case BT_HFP_DISCONNECTED:
 		if (bt_ag && bt_ag->disconnected) {
@@ -152,7 +231,7 @@ static void bt_hfp_ag_set_state(struct bt_hfp_ag *ag, bt_hfp_state_t state)
 		break;
 	case BT_HFP_CONNECTED:
 		if (bt_ag && bt_ag->connected) {
-			bt_ag->connected(ag);
+			bt_ag->connected(ag->acl_conn, ag);
 		}
 		break;
 	case BT_HFP_DISCONNECTING:
@@ -163,50 +242,70 @@ static void bt_hfp_ag_set_state(struct bt_hfp_ag *ag, bt_hfp_state_t state)
 	}
 }
 
-static void bt_hfp_ag_set_call_state(struct bt_hfp_ag *ag, bt_hfp_call_state_t call_state)
+static struct bt_hfp_ag_call *get_call_from_number(struct bt_hfp_ag *ag, const char *number,
+						   uint8_t type)
 {
-	bt_hfp_state_t state;
+	struct bt_hfp_ag_call *call;
 
-	LOG_DBG("update call state %p, old %d -> new %d", ag, ag->call_state, call_state);
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
 
-	hfp_ag_lock(ag);
-	ag->call_state = call_state;
-	state = ag->state;
-	hfp_ag_unlock(ag);
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
 
-	switch (call_state) {
-	case BT_HFP_CALL_TERMINATE:
-		atomic_clear(ag->flags);
-		k_work_cancel_delayable(&ag->deferred_work);
-		break;
-	case BT_HFP_CALL_OUTGOING:
-		k_work_reschedule(&ag->deferred_work, K_SECONDS(CONFIG_BT_HFP_AG_OUTGOING_TIMEOUT));
-		break;
-	case BT_HFP_CALL_INCOMING:
-		k_work_reschedule(&ag->deferred_work, K_SECONDS(CONFIG_BT_HFP_AG_INCOMING_TIMEOUT));
-		break;
-	case BT_HFP_CALL_ALERTING:
-		k_work_reschedule(&ag->ringing_work, K_NO_WAIT);
-		k_work_reschedule(&ag->deferred_work, K_SECONDS(CONFIG_BT_HFP_AG_ALERTING_TIMEOUT));
-		break;
-	case BT_HFP_CALL_ACTIVE:
-		k_work_cancel_delayable(&ag->ringing_work);
-		k_work_cancel_delayable(&ag->deferred_work);
-		break;
-	case BT_HFP_CALL_HOLD:
-		break;
-	default:
-		/* Invalid state */
-		break;
+		if (call->type != type) {
+			continue;
+		}
+
+		if (strcmp(call->number, number)) {
+			continue;
+		}
+
+		return call;
 	}
 
-	if (state == BT_HFP_DISCONNECTING) {
-		int err = bt_rfcomm_dlc_disconnect(&ag->rfcomm_dlc);
+	return NULL;
+}
 
-		if (err) {
-			LOG_ERR("Fail to disconnect DLC %p", &ag->rfcomm_dlc);
+static void bt_ag_deferred_work(struct k_work *work);
+static void bt_ag_ringing_work(struct k_work *work);
+
+static struct bt_hfp_ag_call *get_new_call(struct bt_hfp_ag *ag, const char *number, uint8_t type)
+{
+	struct bt_hfp_ag_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_and_set_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			/* Copy number to ag->number including null-character */
+			strcpy(call->number, number);
+			call->type = type;
+			call->ag = ag;
+			k_work_init_delayable(&call->deferred_work, bt_ag_deferred_work);
+			k_work_init_delayable(&call->ringing_work, bt_ag_ringing_work);
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static int get_none_released_calls(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	int count = 0;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			count++;
 		}
 	}
+
+	return count;
 }
 
 static struct bt_ag_tx *bt_ag_tx_alloc(void)
@@ -266,67 +365,11 @@ static int hfp_ag_next_step(struct bt_hfp_ag *ag, bt_hfp_ag_tx_cb_t cb, void *us
 	return 0;
 }
 
-static int hfp_ag_send(struct bt_hfp_ag *ag, struct bt_ag_tx *tx)
-{
-	int err = bt_rfcomm_dlc_send(&ag->rfcomm_dlc, tx->buf);
-
-	if (err < 0) {
-		net_buf_unref(tx->buf);
-	}
-
-	return err;
-}
-
-static void bt_ag_tx_work(struct k_work *work)
-{
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
-	struct bt_hfp_ag *ag = CONTAINER_OF(dwork, struct bt_hfp_ag, tx_work);
-	sys_snode_t *node;
-	struct bt_ag_tx *tx;
-	bt_hfp_state_t state;
-
-	hfp_ag_lock(ag);
-	state = ag->state;
-	if ((state == BT_HFP_DISCONNECTED) || (state == BT_HFP_DISCONNECTING)) {
-		LOG_ERR("AG %p is not connected", ag);
-		goto unlock;
-	}
-
-	node = sys_slist_peek_head(&ag->tx_pending);
-	if (!node) {
-		LOG_DBG("No pending tx");
-		goto unlock;
-	}
-
-	tx = CONTAINER_OF(node, struct bt_ag_tx, node);
-
-	if (!atomic_test_and_set_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
-		LOG_DBG("AG %p sending tx %p", ag, tx);
-		int err = hfp_ag_send(ag, tx);
-
-		if (err < 0) {
-			LOG_ERR("Rfcomm send error :(%d)", err);
-			sys_slist_find_and_remove(&ag->tx_pending, &tx->node);
-			tx->err = err;
-			k_fifo_put(&ag_tx_notify, tx);
-			/* Clear the tx ongoing flag */
-			if (!atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
-				LOG_WRN("tx ongoing flag is not set");
-			}
-			/* Due to the work is failed, restart the tx work */
-			k_work_reschedule(&ag->tx_work, K_NO_WAIT);
-		}
-	}
-
-unlock:
-	hfp_ag_unlock(ag);
-}
-
 static int hfp_ag_send_data(struct bt_hfp_ag *ag, bt_hfp_ag_tx_cb_t cb, void *user_data,
 			    const char *format, ...)
 {
-	struct net_buf *buf;
-	struct bt_ag_tx *tx;
+	struct net_buf *buf = NULL;
+	struct bt_ag_tx *tx = NULL;
 	va_list vargs;
 	int err;
 	bt_hfp_state_t state;
@@ -338,20 +381,22 @@ static int hfp_ag_send_data(struct bt_hfp_ag *ag, bt_hfp_ag_tx_cb_t cb, void *us
 	hfp_ag_unlock(ag);
 	if ((state == BT_HFP_DISCONNECTED) || (state == BT_HFP_DISCONNECTING)) {
 		LOG_ERR("AG %p is not connected", ag);
-		return -ENOTCONN;
+		err = -ENOTCONN;
+		goto failed;
 	}
 
 	buf = bt_rfcomm_create_pdu(&ag_pool);
 	if (!buf) {
 		LOG_ERR("No Buffers!");
-		return -ENOMEM;
+		err = -ENOMEM;
+		goto failed;
 	}
 
 	tx = bt_ag_tx_alloc();
 	if (tx == NULL) {
 		LOG_ERR("No tx buffers!");
-		net_buf_unref(buf);
-		return -ENOMEM;
+		err = -ENOMEM;
+		goto failed;
 	}
 
 	LOG_DBG("buf %p tx %p", buf, tx);
@@ -367,9 +412,7 @@ static int hfp_ag_send_data(struct bt_hfp_ag *ag, bt_hfp_ag_tx_cb_t cb, void *us
 
 	if (err < 0) {
 		LOG_ERR("Unable to format variable arguments");
-		net_buf_unref(buf);
-		bt_ag_tx_free(tx);
-		return err;
+		goto failed;
 	}
 
 	net_buf_add(buf, err);
@@ -384,133 +427,2278 @@ static int hfp_ag_send_data(struct bt_hfp_ag *ag, bt_hfp_ag_tx_cb_t cb, void *us
 	k_work_reschedule(&ag->tx_work, K_NO_WAIT);
 
 	return 0;
-}
 
-static void skip_space(struct net_buf *buf)
-{
-	while ((buf->len > 0) && (buf->data[0] == ' ')) {
-		(void)net_buf_pull(buf, 1);
+failed:
+	if (buf) {
+		net_buf_unref(buf);
+	}
+
+	if (tx) {
+		bt_ag_tx_free(tx);
 	}
+	bt_hfp_ag_disconnect(ag);
+	return err;
 }
 
-static int get_number(struct net_buf *buf, uint32_t *number)
+static int hfp_ag_update_indicator(struct bt_hfp_ag *ag, enum bt_hfp_ag_indicator index,
+				   uint8_t value, bt_hfp_ag_tx_cb_t cb, void *user_data)
 {
-	int err = -EINVAL;
+	int err;
+	uint8_t old_value;
 
-	*number = 0;
+	if (index >= BT_HFP_AG_IND_MAX) {
+		return -EINVAL;
+	}
 
-	skip_space(buf);
-	while (buf->len > 0) {
-		if ((buf->data[0] >= '0') && (buf->data[0] <= '9')) {
-			*number = *number * 10 + buf->data[0] - '0';
-			(void)net_buf_pull(buf, 1);
-			err = 0;
-		} else {
-			break;
+	if ((ag_ind[index].max < value) || (ag_ind[index].min > value)) {
+		return -EINVAL;
+	}
+
+	hfp_ag_lock(ag);
+	old_value = ag->indicator_value[index];
+	if (value == old_value) {
+		LOG_ERR("Duplicate value setting, indicator %d, old %d -> new %d", index, old_value,
+			value);
+		hfp_ag_unlock(ag);
+		if (cb) {
+			cb(ag, user_data);
 		}
+		return -EINVAL;
 	}
-	skip_space(buf);
 
-	return err;
-}
+	ag->indicator_value[index] = value;
+	hfp_ag_unlock(ag);
 
-static bool is_char(struct net_buf *buf, uint8_t c)
-{
-	bool found = false;
+	LOG_DBG("indicator %d, old %d -> new %d", index, old_value, value);
 
-	skip_space(buf);
-	if (buf->len > 0) {
-		if (buf->data[0] == c) {
-			(void)net_buf_pull(buf, 1);
-			found = true;
-		}
+	if (!(ag->indicator & BIT(index))) {
+		LOG_INF("The indicator %d is deactivated", index);
+		/* If the indicator is deactivated, consider it a successful set. */
+		return 0;
 	}
-	skip_space(buf);
 
-	return found;
+	err = hfp_ag_send_data(ag, cb, user_data, "\r\n+CIEV:%d,%d\r\n", (uint8_t)index + 1, value);
+	if (err) {
+		hfp_ag_lock(ag);
+		ag->indicator_value[index] = old_value;
+		hfp_ag_unlock(ag);
+		LOG_ERR("Fail to update indicator %d, current %d", index, old_value);
+	}
+
+	return err;
 }
 
-static int bt_hfp_ag_brsf_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static int hfp_ag_force_update_indicator(struct bt_hfp_ag *ag, enum bt_hfp_ag_indicator index,
+					 uint8_t value, bt_hfp_ag_tx_cb_t cb, void *user_data)
 {
-	uint32_t hf_features;
 	int err;
+	uint8_t old_value;
 
-	if (!is_char(buf, '=')) {
-		return -ENOTSUP;
-	}
+	hfp_ag_lock(ag);
+	old_value = ag->indicator_value[index];
+	ag->indicator_value[index] = value;
+	hfp_ag_unlock(ag);
 
-	err = get_number(buf, &hf_features);
-	if (err != 0) {
-		return -ENOTSUP;
-	}
+	LOG_DBG("indicator %d, old %d -> new %d", index, old_value, value);
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
+	err = hfp_ag_send_data(ag, cb, user_data, "\r\n+CIEV:%d,%d\r\n", (uint8_t)index + 1, value);
+	if (err) {
+		hfp_ag_lock(ag);
+		ag->indicator_value[index] = old_value;
+		hfp_ag_unlock(ag);
+		LOG_ERR("Fail to update indicator %d, current %d", index, old_value);
 	}
 
-	hfp_ag_lock(ag);
-	ag->hf_features = hf_features;
-	hfp_ag_unlock(ag);
-
-	return hfp_ag_send_data(ag, NULL, NULL, "\r\n+BRSF:%d\r\n", ag->ag_features);
+	return err;
 }
 
-static int bt_hfp_ag_bac_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static void clear_call_setup_ind_cb(struct bt_hfp_ag *ag, void *user_data)
 {
-	uint32_t codec;
-	uint32_t codec_ids = 0U;
-	int err = 0;
-
-	if (!is_char(buf, '=')) {
-		return -ENOTSUP;
-	}
+	uint8_t call_ind;
+	int err;
 
 	hfp_ag_lock(ag);
-	if (!(ag->hf_features & BT_HFP_HF_FEATURE_CODEC_NEG) ||
-	    !(ag->ag_features & BT_HFP_AG_FEATURE_CODEC_NEG)) {
-		hfp_ag_unlock(ag);
-		return -EOPNOTSUPP;
-	}
+	call_ind = ag->indicator_value[BT_HFP_AG_CALL_IND];
 	hfp_ag_unlock(ag);
 
-	while (buf->len > 0) {
-		err = get_number(buf, &codec);
-		if (err != 0) {
-			return -ENOTSUP;
-		}
-
-		if (!is_char(buf, ',')) {
-			if (!is_char(buf, '\r')) {
-				return -ENOTSUP;
-			}
-		}
-
-		if (codec < (sizeof(codec_ids) * 8)) {
-			codec_ids |= BIT(codec);
+	if (call_ind) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, NULL, NULL);
+		if (err) {
+			LOG_ERR("Fail to clear call_setup ind");
 		}
 	}
+}
+
+static void clear_call_ind_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	uint8_t call_setup_ind;
+	int err;
 
 	hfp_ag_lock(ag);
-	ag->hf_codec_ids = codec_ids;
+	call_setup_ind = ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND];
 	hfp_ag_unlock(ag);
 
-	if (bt_ag && bt_ag->codec) {
-		bt_ag->codec(ag, ag->hf_codec_ids);
+	if (call_setup_ind) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+					      NULL, NULL);
+		if (err) {
+			LOG_ERR("Fail to clear call_setup ind");
+		}
 	}
-
-	return 0;
 }
 
-static int bt_hfp_ag_cind_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static void clear_call_and_call_setup_ind(struct bt_hfp_ag *ag)
 {
+	uint8_t call_setup_ind;
+	uint8_t call_ind;
 	int err;
-	bool inquiry_status = true;
 
-	if (is_char(buf, '=')) {
-		inquiry_status = false;
-	}
+	hfp_ag_lock(ag);
+	call_setup_ind = ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND];
+	call_ind = ag->indicator_value[BT_HFP_AG_CALL_IND];
+	hfp_ag_unlock(ag);
+
+	if (call_setup_ind) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+					      clear_call_setup_ind_cb, NULL);
+		if (err) {
+			LOG_ERR("Fail to clear call_setup ind");
+		}
+	}
+
+	if (call_ind) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, clear_call_ind_cb, NULL);
+		if (err) {
+			LOG_ERR("Fail to clear call ind");
+		}
+	}
+}
+
+static int get_active_calls(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	int count = 0;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			hfp_ag_lock(ag);
+			if ((call->call_state == BT_HFP_CALL_ACTIVE) &&
+			    (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD))) {
+				count++;
+			}
+			hfp_ag_unlock(ag);
+		}
+	}
+
+	return count;
+}
+
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+static int get_active_held_calls(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	int count = 0;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			hfp_ag_lock(ag);
+			if ((call->call_state == BT_HFP_CALL_HOLD) ||
+			    ((call->call_state == BT_HFP_CALL_ACTIVE) &&
+			     (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD)))) {
+				count++;
+			}
+			hfp_ag_unlock(ag);
+		}
+	}
+
+	return count;
+}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+
+static int get_held_calls(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	int count = 0;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			hfp_ag_lock(ag);
+			if ((call->call_state == BT_HFP_CALL_ACTIVE) &&
+			    (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD))) {
+				count++;
+			} else if (call->call_state == BT_HFP_CALL_HOLD) {
+				count++;
+			}
+			hfp_ag_unlock(ag);
+		}
+	}
+
+	return count;
+}
+
+static void ag_notify_call_held_ind(struct bt_hfp_ag *ag, void *user_data)
+{
+	int active_call_count;
+	int held_call_count;
+	int err;
+	uint8_t value;
+
+	active_call_count = get_active_calls(ag);
+	held_call_count = get_held_calls(ag);
+	if (active_call_count && held_call_count) {
+		value = BT_HFP_CALL_HELD_ACTIVE_HELD;
+	} else if (held_call_count) {
+		value = BT_HFP_CALL_HELD_HELD;
+	} else {
+		value = BT_HFP_CALL_HELD_NONE;
+	}
+
+	err = hfp_ag_force_update_indicator(ag, BT_HFP_AG_CALL_HELD_IND, value, NULL, NULL);
+	if (err) {
+		LOG_ERR("Fail to notify call_held ind :(%d)", err);
+	}
+}
+
+static void release_call(struct bt_hfp_ag_call *call)
+{
+	atomic_clear_bit(call->flags, BT_HFP_AG_CALL_IN_USING);
+	k_work_cancel_delayable(&call->ringing_work);
+	k_work_cancel_delayable(&call->deferred_work);
+	/*
+	 * Because it is uncertain whether `ringing_work` and `deferred_work` have been cancelled,
+	 * do not clear ringing_work and deferred_work.
+	 * Use `offsetof()` to get the offset of `ringing_work` to avoid access the fields
+	 * `ringing_work` and `deferred_work`.
+	 */
+	(void)memset(call, 0, offsetof(struct bt_hfp_ag_call, ringing_work));
+}
+
+static void free_call(struct bt_hfp_ag_call *call)
+{
+	int call_count;
+	struct bt_hfp_ag *ag;
+	int err;
+
+	ag = call->ag;
+
+	release_call(call);
+
+	call_count = get_none_released_calls(ag);
+
+	if (!call_count) {
+		clear_call_and_call_setup_ind(ag);
+	} else {
+		err = hfp_ag_next_step(ag, ag_notify_call_held_ind, NULL);
+		if (err) {
+			LOG_ERR("Fail to notify call_held ind :(%d)", err);
+		}
+	}
+}
+
+static void bt_hfp_ag_set_call_state(struct bt_hfp_ag_call *call, bt_hfp_call_state_t call_state)
+{
+	bt_hfp_state_t state;
+	struct bt_hfp_ag *ag = call->ag;
+
+	LOG_DBG("update call state %p, old %d -> new %d", call, call->call_state, call_state);
+
+	hfp_ag_lock(ag);
+	call->call_state = call_state;
+	state = ag->state;
+	hfp_ag_unlock(ag);
+
+	switch (call_state) {
+	case BT_HFP_CALL_TERMINATE:
+		atomic_clear_bit(ag->flags, BT_HFP_AG_CREATING_SCO);
+		free_call(call);
+		break;
+	case BT_HFP_CALL_OUTGOING:
+		k_work_reschedule(&call->deferred_work,
+				  K_SECONDS(CONFIG_BT_HFP_AG_OUTGOING_TIMEOUT));
+		break;
+	case BT_HFP_CALL_INCOMING:
+		k_work_reschedule(&call->deferred_work,
+				  K_SECONDS(CONFIG_BT_HFP_AG_INCOMING_TIMEOUT));
+		break;
+	case BT_HFP_CALL_ALERTING:
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_3WAY)) {
+			k_work_reschedule(&call->ringing_work, K_NO_WAIT);
+		} else {
+			k_work_cancel_delayable(&call->ringing_work);
+		}
+		k_work_reschedule(&call->deferred_work,
+				  K_SECONDS(CONFIG_BT_HFP_AG_ALERTING_TIMEOUT));
+		break;
+	case BT_HFP_CALL_ACTIVE:
+		k_work_cancel_delayable(&call->ringing_work);
+		k_work_cancel_delayable(&call->deferred_work);
+		break;
+	case BT_HFP_CALL_HOLD:
+		break;
+	default:
+		/* Invalid state */
+		break;
+	}
+
+	if (state == BT_HFP_DISCONNECTING) {
+		int err = bt_rfcomm_dlc_disconnect(&ag->rfcomm_dlc);
+
+		if (err) {
+			LOG_ERR("Fail to disconnect DLC %p", &ag->rfcomm_dlc);
+		}
+	}
+}
+
+static void hfp_ag_close_sco(struct bt_hfp_ag *ag)
+{
+	struct bt_conn *sco;
+	int call_count;
+
+	LOG_DBG("");
+
+	hfp_ag_lock(ag);
+	call_count = get_none_released_calls(ag);
+	if (call_count > 0) {
+		LOG_INF("Do not close sco because not all calls are released");
+		hfp_ag_unlock(ag);
+		return;
+	}
+
+	sco = ag->sco_chan.sco;
+	ag->sco_chan.sco = NULL;
+	hfp_ag_unlock(ag);
+	if (sco != NULL) {
+		LOG_DBG("Disconnect sco %p", sco);
+		bt_conn_disconnect(sco, BT_HCI_ERR_LOCALHOST_TERM_CONN);
+	}
+}
+
+static void ag_reject_call(struct bt_hfp_ag_call *call)
+{
+	struct bt_hfp_ag *ag;
+
+	ag = call->ag;
+
+	if (bt_ag && bt_ag->reject) {
+		bt_ag->reject(call);
+	}
+
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_TERMINATE);
+
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_AUDIO_CONN)) {
+		LOG_DBG("It is not audio connection");
+		hfp_ag_close_sco(ag);
+	}
+}
+
+static void ag_terminate_call(struct bt_hfp_ag_call *call)
+{
+	struct bt_hfp_ag *ag;
+
+	ag = call->ag;
+
+	if (bt_ag && bt_ag->terminate) {
+		bt_ag->terminate(call);
+	}
+
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_TERMINATE);
+
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_AUDIO_CONN)) {
+		LOG_DBG("It is not audio connection");
+		hfp_ag_close_sco(ag);
+	}
+}
+
+static int hfp_ag_send(struct bt_hfp_ag *ag, struct bt_ag_tx *tx)
+{
+	int err = bt_rfcomm_dlc_send(&ag->rfcomm_dlc, tx->buf);
+
+	if (err < 0) {
+		net_buf_unref(tx->buf);
+	}
+
+	return err;
+}
+
+static void bt_ag_tx_work(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_hfp_ag *ag = CONTAINER_OF(dwork, struct bt_hfp_ag, tx_work);
+	sys_snode_t *node;
+	struct bt_ag_tx *tx;
+	bt_hfp_state_t state;
+
+	hfp_ag_lock(ag);
+	state = ag->state;
+	if ((state == BT_HFP_DISCONNECTED) || (state == BT_HFP_DISCONNECTING)) {
+		LOG_ERR("AG %p is not connected", ag);
+		goto unlock;
+	}
+
+	node = sys_slist_peek_head(&ag->tx_pending);
+	if (!node) {
+		LOG_DBG("No pending tx");
+		goto unlock;
+	}
+
+	tx = CONTAINER_OF(node, struct bt_ag_tx, node);
+
+	if (!atomic_test_and_set_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
+		LOG_DBG("AG %p sending tx %p", ag, tx);
+		int err = hfp_ag_send(ag, tx);
+
+		if (err < 0) {
+			LOG_ERR("Rfcomm send error :(%d)", err);
+			sys_slist_find_and_remove(&ag->tx_pending, &tx->node);
+			tx->err = err;
+			k_fifo_put(&ag_tx_notify, tx);
+			/* Clear the tx ongoing flag */
+			if (!atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
+				LOG_WRN("tx ongoing flag is not set");
+			}
+			/* Due to the work is failed, restart the tx work */
+			k_work_reschedule(&ag->tx_work, K_NO_WAIT);
+		}
+	}
+
+unlock:
+	hfp_ag_unlock(ag);
+}
+
+static void skip_space(struct net_buf *buf)
+{
+	size_t count = 0;
+
+	while ((buf->len > count) && (buf->data[count] == ' ')) {
+		count++;
+	}
+
+	if (count > 0) {
+		(void)net_buf_pull(buf, count);
+	}
+}
+
+static int get_number(struct net_buf *buf, uint32_t *number)
+{
+	int err = -EINVAL;
+
+	*number = 0;
+
+	skip_space(buf);
+	while (buf->len > 0) {
+		if ((buf->data[0] >= '0') && (buf->data[0] <= '9')) {
+			*number = *number * 10 + buf->data[0] - '0';
+			(void)net_buf_pull(buf, 1);
+			err = 0;
+		} else {
+			break;
+		}
+	}
+	skip_space(buf);
+
+	return err;
+}
+
+static int get_char(struct net_buf *buf, char *c)
+{
+	int err = -EINVAL;
+
+	skip_space(buf);
+	if (buf->len > 0) {
+		*c = (char)buf->data[0];
+		(void)net_buf_pull(buf, 1);
+		err = 0;
+	}
+	skip_space(buf);
+
+	return err;
+}
+
+static bool is_char(struct net_buf *buf, uint8_t c)
+{
+	bool found = false;
+
+	skip_space(buf);
+	if (buf->len > 0) {
+		if (buf->data[0] == c) {
+			(void)net_buf_pull(buf, 1);
+			found = true;
+		}
+	}
+	skip_space(buf);
+
+	return found;
+}
+
+static int bt_hfp_ag_brsf_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	uint32_t hf_features;
+	int err;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &hf_features);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	ag->hf_features = hf_features;
+
+	return hfp_ag_send_data(ag, NULL, NULL, "\r\n+BRSF:%d\r\n", ag->ag_features);
+}
+
+static int bt_hfp_ag_bac_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	uint32_t codec;
+	uint32_t codec_ids = 0U;
+	int err = 0;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_CODEC_NEG, BT_HFP_AG_FEATURE_CODEC_NEG)) {
+		return -ENOEXEC;
+	}
+
+	while (buf->len > 0) {
+		err = get_number(buf, &codec);
+		if (err != 0) {
+			return -ENOTSUP;
+		}
+
+		if (!is_char(buf, ',')) {
+			if (!is_char(buf, '\r')) {
+				return -ENOTSUP;
+			}
+		}
+
+		if (codec < NUM_BITS(sizeof(codec_ids))) {
+			codec_ids |= BIT(codec);
+		}
+	}
+
+	if (!(codec_ids & BIT(BT_HFP_AG_CODEC_CVSD))) {
+		return -ENOEXEC;
+	}
+
+	hfp_ag_lock(ag);
+	ag->hf_codec_ids = codec_ids;
+	ag->selected_codec_id = 0;
+	hfp_ag_unlock(ag);
+
+	atomic_set_bit(ag->flags, BT_HFP_AG_CODEC_CHANGED);
+
+	if (atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_CODEC_CONN)) {
+		/* Codec connection is ended. It needs to be restarted. */
+		LOG_DBG("Codec connection is ended. It needs to be restarted.");
+		if (bt_ag && bt_ag->codec_negotiate) {
+			bt_ag->codec_negotiate(ag, -EAGAIN);
+		}
+	}
+
+	if (bt_ag && bt_ag->codec) {
+		bt_ag->codec(ag, ag->hf_codec_ids);
+	}
+
+	return 0;
+}
+
+static int bt_hfp_ag_cind_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	bool inquiry_status = true;
+
+	if (is_char(buf, '=')) {
+		inquiry_status = false;
+	}
+
+	if (!is_char(buf, '?')) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (!inquiry_status) {
+		err = hfp_ag_send_data(
+			ag, NULL, NULL,
+			"\r\n+CIND:(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%"
+			"d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d))\r\n",
+			ag_ind[BT_HFP_AG_SERVICE_IND].name, ag_ind[BT_HFP_AG_SERVICE_IND].min,
+			ag_ind[BT_HFP_AG_SERVICE_IND].connector, ag_ind[BT_HFP_AG_SERVICE_IND].max,
+			ag_ind[BT_HFP_AG_CALL_IND].name, ag_ind[BT_HFP_AG_CALL_IND].min,
+			ag_ind[BT_HFP_AG_CALL_IND].connector, ag_ind[BT_HFP_AG_CALL_IND].max,
+			ag_ind[BT_HFP_AG_CALL_SETUP_IND].name, ag_ind[BT_HFP_AG_CALL_SETUP_IND].min,
+			ag_ind[BT_HFP_AG_CALL_SETUP_IND].connector,
+			ag_ind[BT_HFP_AG_CALL_SETUP_IND].max, ag_ind[BT_HFP_AG_CALL_HELD_IND].name,
+			ag_ind[BT_HFP_AG_CALL_HELD_IND].min,
+			ag_ind[BT_HFP_AG_CALL_HELD_IND].connector,
+			ag_ind[BT_HFP_AG_CALL_HELD_IND].max, ag_ind[BT_HFP_AG_SIGNAL_IND].name,
+			ag_ind[BT_HFP_AG_SIGNAL_IND].min, ag_ind[BT_HFP_AG_SIGNAL_IND].connector,
+			ag_ind[BT_HFP_AG_SIGNAL_IND].max, ag_ind[BT_HFP_AG_ROAM_IND].name,
+			ag_ind[BT_HFP_AG_ROAM_IND].min, ag_ind[BT_HFP_AG_ROAM_IND].connector,
+			ag_ind[BT_HFP_AG_ROAM_IND].max, ag_ind[BT_HFP_AG_BATTERY_IND].name,
+			ag_ind[BT_HFP_AG_BATTERY_IND].min, ag_ind[BT_HFP_AG_BATTERY_IND].connector,
+			ag_ind[BT_HFP_AG_BATTERY_IND].max);
+	} else {
+		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CIND:%d,%d,%d,%d,%d,%d,%d\r\n",
+					 ag->indicator_value[BT_HFP_AG_SERVICE_IND],
+					 ag->indicator_value[BT_HFP_AG_CALL_IND],
+					 ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND],
+					 ag->indicator_value[BT_HFP_AG_CALL_HELD_IND],
+					 ag->indicator_value[BT_HFP_AG_SIGNAL_IND],
+					 ag->indicator_value[BT_HFP_AG_ROAM_IND],
+					 ag->indicator_value[BT_HFP_AG_BATTERY_IND]);
+	}
+
+	return err;
+}
+
+static void bt_hfp_ag_set_in_band_ring(struct bt_hfp_ag *ag, void *user_data)
+{
+	bool is_inband_ringtone;
+
+	is_inband_ringtone = AG_SUPT_FEAT(ag, BT_HFP_AG_FEATURE_INBAND_RINGTONE) ? true : false;
+
+	if (is_inband_ringtone && !atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
+		int err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BSIR:1\r\n");
+
+		atomic_set_bit_to(ag->flags, BT_HFP_AG_INBAND_RING, err == 0);
+	}
+}
+
+static void bt_hfp_ag_slc_connected(struct bt_hfp_ag *ag, void *user_data)
+{
+	bt_hfp_ag_set_state(ag, BT_HFP_CONNECTED);
+	(void)hfp_ag_next_step(ag, bt_hfp_ag_set_in_band_ring, NULL);
+}
+
+static int bt_hfp_ag_cmer_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	uint32_t number;
+	int err;
+	static const uint32_t command_line_prefix[] = {3, 0, 0};
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	for (int i = 0; i < ARRAY_SIZE(command_line_prefix); i++) {
+		err = get_number(buf, &number);
+		if (err != 0) {
+			return -ENOTSUP;
+		}
+
+		if (!is_char(buf, ',')) {
+			return -ENOTSUP;
+		}
+
+		if (command_line_prefix[i] != number) {
+			return -ENOTSUP;
+		}
+	}
+
+	err = get_number(buf, &number);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (number == 1) {
+		atomic_set_bit(ag->flags, BT_HFP_AG_CMER_ENABLE);
+		if (BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_3WAY_CALL, BT_HFP_AG_FEATURE_3WAY_CALL)) {
+			LOG_DBG("Waiting for AT+CHLD=?");
+			return 0;
+		}
+
+		err = hfp_ag_next_step(ag, bt_hfp_ag_slc_connected, NULL);
+		return err;
+	} else if (number == 0) {
+		atomic_clear_bit(ag->flags, BT_HFP_AG_CMER_ENABLE);
+	} else {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static void bt_hfp_ag_accept_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ACTIVE);
+
+	if (bt_ag && bt_ag->accept) {
+		bt_ag->accept(call);
+	}
+}
+
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+static int chld_release_all(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if ((call_state != BT_HFP_CALL_ACTIVE) ||
+		    ((call_state == BT_HFP_CALL_ACTIVE) &&
+		     atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD))) {
+			ag_terminate_call(call);
+		}
+	}
+
+	ag_notify_call_held_ind(ag, NULL);
+
+	return 0;
+}
+
+static void bt_hfp_ag_accept_other_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+	bt_hfp_call_state_t call_state;
+	int err;
+
+	if (!call) {
+		return;
+	}
+
+	hfp_ag_lock(ag);
+	call_state = call->call_state;
+	hfp_ag_unlock(ag);
+
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ACTIVE);
+
+	if (call_state == BT_HFP_CALL_HOLD) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_HELD_IND,
+					      BT_HFP_CALL_HELD_ACTIVE_HELD, NULL, NULL);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+	}
+
+	if (call_state == BT_HFP_CALL_HOLD) {
+		if (bt_ag && bt_ag->retrieve) {
+			bt_ag->retrieve(call);
+		}
+	} else {
+		if (bt_ag && bt_ag->accept) {
+			bt_ag->accept(call);
+		}
+	}
+
+	ag_notify_call_held_ind(ag, NULL);
+}
+
+static void bt_hfp_ag_deactivate_accept_other_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err;
+	uint8_t call_setup;
+
+	hfp_ag_lock(ag);
+	call_setup = ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND];
+	hfp_ag_unlock(ag);
+
+	if (call_setup) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+					      bt_hfp_ag_accept_other_cb, user_data);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+	} else {
+		bt_hfp_ag_accept_other_cb(ag, user_data);
+	}
+}
+
+static struct bt_hfp_ag_call *get_none_accept_calls(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if ((call_state == BT_HFP_CALL_OUTGOING) || (call_state == BT_HFP_CALL_INCOMING) ||
+		    (call_state == BT_HFP_CALL_ALERTING)) {
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static struct bt_hfp_ag_call *get_none_active_calls(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if (call_state != BT_HFP_CALL_ACTIVE) {
+			return call;
+		} else if ((call_state == BT_HFP_CALL_ACTIVE) &&
+			   atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD)) {
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static int chld_deactivate_calls_and_accept_other_call(struct bt_hfp_ag *ag, bool release)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag_call *none_active_call;
+
+	none_active_call = get_none_accept_calls(ag);
+
+	if (!none_active_call) {
+		none_active_call = get_none_active_calls(ag);
+	} else {
+		if (!(atomic_test_bit(none_active_call->flags, BT_HFP_AG_CALL_INCOMING_3WAY) ||
+		      atomic_test_bit(none_active_call->flags, BT_HFP_AG_CALL_INCOMING))) {
+			return -ENOTSUP;
+		}
+	}
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if ((call_state == BT_HFP_CALL_ACTIVE) &&
+		    !atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD)) {
+			if (release) {
+				ag_terminate_call(call);
+			} else {
+				bt_hfp_ag_set_call_state(call, BT_HFP_CALL_HOLD);
+
+				if (bt_ag && bt_ag->held) {
+					bt_ag->held(call);
+				}
+			}
+		}
+	}
+
+	return hfp_ag_next_step(ag, bt_hfp_ag_deactivate_accept_other_cb, none_active_call);
+}
+
+static int chld_activate_held_call(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if (call_state == BT_HFP_CALL_HOLD) {
+			bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ACTIVE);
+
+			if (bt_ag && bt_ag->retrieve) {
+				bt_ag->retrieve(call);
+			}
+		}
+	}
+
+	ag_notify_call_held_ind(ag, NULL);
+
+	return 0;
+}
+
+static int chld_drop_conversation(struct bt_hfp_ag *ag)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if (call_state != BT_HFP_CALL_ACTIVE) {
+			return -ENOTSUP;
+		}
+	}
+
+	if (!bt_ag || !bt_ag->explicit_call_transfer) {
+		return -ENOEXEC;
+	}
+
+	bt_ag->explicit_call_transfer(ag);
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		bt_hfp_ag_set_call_state(call, BT_HFP_CALL_TERMINATE);
+	}
+
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_AUDIO_CONN)) {
+		LOG_DBG("Close SCO connection");
+		hfp_ag_close_sco(ag);
+	}
+
+	ag_notify_call_held_ind(ag, NULL);
+
+	return 0;
+}
+
+static int chld_release_call(struct bt_hfp_ag *ag, uint8_t call_index)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		if (index != call_index) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if ((call_state == BT_HFP_CALL_HOLD) ||
+		    ((call_state == BT_HFP_CALL_ACTIVE) &&
+		     !atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD))) {
+			ag_terminate_call(call);
+		} else {
+			ag_reject_call(call);
+		}
+	}
+
+	ag_notify_call_held_ind(ag, NULL);
+
+	return 0;
+}
+
+static int chld_held_other_calls(struct bt_hfp_ag *ag, uint8_t call_index)
+{
+	struct bt_hfp_ag_call *call;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		if (index == call_index) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if ((call_state == BT_HFP_CALL_ACTIVE) &&
+		    !atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD)) {
+			bt_hfp_ag_set_call_state(call, BT_HFP_CALL_HOLD);
+
+			if (bt_ag && bt_ag->held) {
+				bt_ag->held(call);
+			}
+		}
+	}
+
+	call = &ag->calls[call_index];
+	hfp_ag_lock(ag);
+	call_state = call->call_state;
+	hfp_ag_unlock(ag);
+
+	if (call_state == BT_HFP_CALL_HOLD) {
+		bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ACTIVE);
+		if (bt_ag && bt_ag->retrieve) {
+			bt_ag->retrieve(call);
+		}
+	}
+
+	ag_notify_call_held_ind(ag, NULL);
+
+	return 0;
+}
+
+static int chld_other(struct bt_hfp_ag *ag, uint32_t value)
+{
+	uint8_t index;
+	uint8_t command;
+
+	index = value % 10;
+	command = value / 10;
+
+	if (!index) {
+		return -ENOEXEC;
+	}
+
+	index = index - 1;
+
+	if (index >= ARRAY_SIZE(ag->calls)) {
+		return -ENOEXEC;
+	}
+
+	switch (command) {
+	case BT_HFP_CHLD_RELEASE_ACTIVE_ACCEPT_OTHER:
+		return chld_release_call(ag, index);
+	case BT_HFP_CALL_HOLD_ACTIVE_ACCEPT_OTHER:
+		return chld_held_other_calls(ag, index);
+	}
+
+	return -ENOEXEC;
+}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+
+static int bt_hfp_ag_chld_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+	uint32_t value;
+	int err;
+	char *response;
+
+	if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_3WAY_CALL, BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		return -ENOEXEC;
+	}
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	if (is_char(buf, '?')) {
+		if (!is_char(buf, '\r')) {
+			return -ENOTSUP;
+		}
+
+#if defined(CONFIG_BT_HFP_AG_ECC)
+		response = "+CHLD:(0,1,1x,2,2x,3,4)";
+#else
+		response = "+CHLD:(0,1,2,3,4)";
+#endif /* CONFIG_BT_HFP_AG_ECC */
+		err = hfp_ag_send_data(ag, bt_hfp_ag_slc_connected, NULL, "\r\n%s\r\n", response);
+		return err;
+	}
+
+	err = get_number(buf, &value);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	switch (value) {
+	case BT_HFP_CHLD_RELEASE_ALL:
+		return chld_release_all(ag);
+	case BT_HFP_CHLD_RELEASE_ACTIVE_ACCEPT_OTHER:
+		return chld_deactivate_calls_and_accept_other_call(ag, true);
+	case BT_HFP_CALL_HOLD_ACTIVE_ACCEPT_OTHER:
+		return chld_deactivate_calls_and_accept_other_call(ag, false);
+	case BT_HFP_CALL_ACTIVE_HELD:
+		return chld_activate_held_call(ag);
+	case BT_HFP_CALL_QUITE:
+		return chld_drop_conversation(ag);
+	}
+
+	return chld_other(ag, value);
+#else
+	return -ENOEXEC;
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+}
+
+static int bt_hfp_ag_bind_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	uint32_t indicator;
+	uint32_t hf_indicators = 0U;
+	uint32_t supported_indicators = 0U;
+	int err;
+	char *data;
+	uint32_t len;
+
+	if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_HF_IND, BT_HFP_AG_FEATURE_HF_IND)) {
+		return -ENOEXEC;
+	}
+
+	if (is_char(buf, '?')) {
+		if (!is_char(buf, '\r')) {
+			return -ENOTSUP;
+		}
+
+		hf_indicators = ag->hf_indicators;
+		supported_indicators = ag->hf_indicators_of_ag & ag->hf_indicators_of_hf;
+		len = MIN(NUM_BITS(sizeof(supported_indicators)), HFP_HF_IND_MAX);
+		for (int i = 1; i < len; i++) {
+			bool enabled;
+
+			if (!(BIT(i) & supported_indicators)) {
+				continue;
+			}
+
+			enabled = BIT(i) & hf_indicators;
+			err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BIND:%d,%d\r\n", i,
+				enabled ? 1 : 0);
+			if (err) {
+				return err;
+			}
+
+			supported_indicators &= ~BIT(i);
+
+			if (!supported_indicators) {
+				break;
+			}
+		}
+		return 0;
+	}
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	if (is_char(buf, '?')) {
+		if (!is_char(buf, '\r')) {
+			return -ENOTSUP;
+		}
+
+		data = &ag->buffer[0];
+		*data = '(';
+		data++;
+		hf_indicators = ag->hf_indicators_of_ag;
+		len = MIN(NUM_BITS(sizeof(hf_indicators)), HFP_HF_IND_MAX);
+		for (int i = 1; (i < len) && (hf_indicators != 0); i++) {
+			if (BIT(i) & hf_indicators) {
+				int length = snprintk(
+					data, (char *)&ag->buffer[HF_MAX_BUF_LEN - 1] - data - 2,
+					"%d", i);
+				data += length;
+				hf_indicators &= ~BIT(i);
+			}
+			if (hf_indicators != 0) {
+				*data = ',';
+				data++;
+			}
+		}
+		*data = ')';
+		data++;
+		*data = '\0';
+		data++;
+
+		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BIND:%s\r\n", &ag->buffer[0]);
+		return err;
+	}
+
+	while (buf->len > 0) {
+		err = get_number(buf, &indicator);
+		if (err != 0) {
+			return -ENOTSUP;
+		}
+
+		if (!is_char(buf, ',')) {
+			if (!is_char(buf, '\r')) {
+				return -ENOTSUP;
+			}
+		}
+
+		if (indicator < NUM_BITS(sizeof(hf_indicators))) {
+			hf_indicators |= BIT(indicator);
+		}
+	}
+
+	ag->hf_indicators_of_hf = hf_indicators;
+
+	return 0;
+}
+
+static int bt_hfp_ag_cmee_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	uint32_t cmee;
+	int err;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &cmee);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (cmee > 1) {
+		return -ENOTSUP;
+	}
+
+	if (BT_HFP_AG_FEATURE_EXT_ERR_ENABLE) {
+		atomic_set_bit_to(ag->flags, BT_HFP_AG_CMEE_ENABLE, cmee == 1);
+		return 0;
+	}
+
+	return -ENOTSUP;
+}
+
+static void bt_hfp_ag_reject_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	if (call) {
+		ag_reject_call(call);
+	}
+
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_AUDIO_CONN)) {
+		LOG_DBG("It is not audio connection");
+		hfp_ag_close_sco(ag);
+	}
+}
+
+static void bt_hfp_ag_call_reject(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+					    bt_hfp_ag_reject_cb, user_data);
+	if (err != 0) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+}
+
+static void bt_hfp_ag_terminate_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	if (call) {
+		ag_terminate_call(call);
+	}
+
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_AUDIO_CONN)) {
+		LOG_DBG("It is not audio connection");
+		hfp_ag_close_sco(ag);
+	}
+}
+
+static void bt_hfp_ag_unit_call_terminate(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, bt_hfp_ag_terminate_cb,
+					    user_data);
+	if (err != 0) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+}
+
+static void bt_hfp_ag_active_terminate_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	bt_hfp_ag_unit_call_terminate(ag, user_data);
+}
+
+static void bt_hfp_ag_call_terminate(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+					  bt_hfp_ag_active_terminate_cb, user_data);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+}
+
+struct bt_hfp_ag_call *get_call_with_flag(struct bt_hfp_ag *ag, int bit, bool clear)
+{
+	struct bt_hfp_ag_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		if (clear) {
+			if (atomic_test_and_set_bit(call->flags, bit)) {
+				return call;
+			}
+		} else {
+			if (atomic_test_bit(call->flags, bit)) {
+				return call;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+struct bt_hfp_ag_call *get_call_with_flag_and_state(struct bt_hfp_ag *ag, int bit,
+						    bt_hfp_call_state_t state)
+{
+	struct bt_hfp_ag_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		if ((call->call_state & state) && atomic_test_bit(call->flags, bit)) {
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static int bt_hfp_ag_chup_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag_call *call;
+	int call_count;
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	call_count = get_none_released_calls(ag);
+
+	if (call_count == 1) {
+		bt_hfp_ag_tx_cb_t next_step = NULL;
+
+		call = get_call_with_flag(ag, BT_HFP_AG_CALL_IN_USING, false);
+		if (!call) {
+			return 0;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if (call_state == BT_HFP_CALL_ALERTING) {
+			if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+				next_step = bt_hfp_ag_call_terminate;
+			} else {
+				next_step = bt_hfp_ag_call_reject;
+			}
+		} else if (call_state == BT_HFP_CALL_ACTIVE) {
+			next_step = bt_hfp_ag_unit_call_terminate;
+		}
+		if (next_step) {
+			err = hfp_ag_next_step(ag, next_step, call);
+			return err;
+		}
+
+		return -ENOTSUP;
+	}
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if (call_state == BT_HFP_CALL_ACTIVE) {
+			err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_terminate, call);
+		}
+	}
+	return 0;
+}
+
+static uint8_t bt_hfp_get_call_state(struct bt_hfp_ag_call *call)
+{
+	uint8_t status = 0;
+	struct bt_hfp_ag *ag = call->ag;
+
+	hfp_ag_lock(ag);
+	switch (call->call_state) {
+	case BT_HFP_CALL_TERMINATE:
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+			status = BT_HFP_CLCC_STATUS_INCOMING;
+		} else {
+			status = BT_HFP_CLCC_STATUS_DIALING;
+		}
+		break;
+	case BT_HFP_CALL_OUTGOING:
+		status = BT_HFP_CLCC_STATUS_DIALING;
+		break;
+	case BT_HFP_CALL_INCOMING:
+		status = BT_HFP_CLCC_STATUS_INCOMING;
+		break;
+	case BT_HFP_CALL_ALERTING:
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+			status = BT_HFP_CLCC_STATUS_WAITING;
+		} else {
+			status = BT_HFP_CLCC_STATUS_ALERTING;
+		}
+		break;
+	case BT_HFP_CALL_ACTIVE:
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD)) {
+			status = BT_HFP_CLCC_STATUS_CALL_HELD_HOLD;
+		} else {
+			status = BT_HFP_CLCC_STATUS_ACTIVE;
+		}
+		break;
+	case BT_HFP_CALL_HOLD:
+		status = BT_HFP_CLCC_STATUS_HELD;
+		break;
+	default:
+		break;
+	}
+	hfp_ag_unlock(ag);
+
+	return status;
+}
+
+static int bt_hfp_ag_clcc_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	struct bt_hfp_ag_call *call;
+	uint8_t dir;
+	uint8_t status;
+	uint8_t mode;
+	uint8_t mpty;
+	int active_calls;
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	active_calls = get_active_calls(ag);
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		dir = atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING) ? 1 : 0;
+		status = bt_hfp_get_call_state(call);
+		mode = 0;
+		mpty = (status == BT_HFP_CLCC_STATUS_ACTIVE) && (active_calls > 1) ? 1 : 0;
+		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CLCC:%d,%d,%d,%d,%d,\"%s\",%d\r\n",
+				       index + 1, dir, status, mode, mpty, call->number,
+				       call->type);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+	}
+
+	/* AG shall always send OK response to HF */
+	return 0;
+}
+
+static int bt_hfp_ag_bia_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	uint32_t number;
+	int err;
+	int index = 0;
+	uint32_t indicator;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	hfp_ag_lock(ag);
+	indicator = ag->indicator;
+	hfp_ag_unlock(ag);
+
+	while (buf->len > 0) {
+		err = get_number(buf, &number);
+		if (err == 0) {
+			/* Valid number */
+			if (number) {
+				indicator |= BIT(index);
+			} else {
+				indicator &= ~BIT(index);
+			}
+		}
+
+		if (is_char(buf, ',')) {
+			index++;
+		} else {
+			if (!is_char(buf, '\r')) {
+				return -ENOTSUP;
+			}
+			if (buf->len != 0) {
+				return -ENOTSUP;
+			}
+		}
+	}
+
+	/* Force call, call setup and held call indicators are enabled. */
+	indicator |= BIT(BT_HFP_AG_CALL_IND) | BIT(BT_HFP_AG_CALL_SETUP_IND) |
+		    BIT(BT_HFP_AG_CALL_HELD_IND);
+
+	hfp_ag_lock(ag);
+	ag->indicator = indicator;
+	hfp_ag_unlock(ag);
+
+	return 0;
+}
+
+static void bt_hfp_ag_call_ringing_cb(struct bt_hfp_ag_call *call, bool in_bond)
+{
+	if (bt_ag && bt_ag->ringing) {
+		bt_ag->ringing(call, in_bond);
+	}
+}
+
+static void hfp_ag_sco_connected(struct bt_sco_chan *chan)
+{
+	struct bt_hfp_ag *ag = CONTAINER_OF(chan, struct bt_hfp_ag, sco_chan);
+	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag_call *call;
+
+	call = get_call_with_flag(ag, BT_HFP_AG_CALL_OPEN_SCO, true);
+
+	if (call) {
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+		if (call_state == BT_HFP_CALL_INCOMING) {
+			bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ALERTING);
+			bt_hfp_ag_call_ringing_cb(call, true);
+		}
+	}
+
+	if ((bt_ag) && bt_ag->sco_connected) {
+		bt_ag->sco_connected(ag, chan->sco);
+	}
+}
+
+static void hfp_ag_sco_disconnected(struct bt_sco_chan *chan, uint8_t reason)
+{
+	struct bt_hfp_ag *ag = CONTAINER_OF(chan, struct bt_hfp_ag, sco_chan);
+	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag_call *call;
+
+	call = get_call_with_flag(ag, BT_HFP_AG_CALL_OPEN_SCO, true);
+
+	if ((bt_ag != NULL) && bt_ag->sco_disconnected) {
+		bt_ag->sco_disconnected(chan->sco, reason);
+	}
+
+	if (!call) {
+		return;
+	}
+
+	hfp_ag_lock(ag);
+	call_state = call->call_state;
+	hfp_ag_unlock(ag);
+	if ((call_state == BT_HFP_CALL_INCOMING) || (call_state == BT_HFP_CALL_OUTGOING)) {
+		bt_hfp_ag_call_reject(ag, call);
+	}
+}
+
+static struct bt_conn *bt_hfp_ag_create_sco(struct bt_hfp_ag *ag)
+{
+	struct bt_conn *sco_conn;
+
+	static struct bt_sco_chan_ops ops = {
+		.connected = hfp_ag_sco_connected,
+		.disconnected = hfp_ag_sco_disconnected,
+	};
+
+	LOG_DBG("");
+
+	if (ag->sco_chan.sco == NULL) {
+		ag->sco_chan.ops = &ops;
+
+		/* create SCO connection*/
+		sco_conn = bt_conn_create_sco(&ag->acl_conn->br.dst, &ag->sco_chan);
+		if (sco_conn != NULL) {
+			LOG_DBG("Created sco %p", sco_conn);
+			bt_conn_unref(sco_conn);
+		}
+	} else {
+		sco_conn = ag->sco_chan.sco;
+	}
+
+	return sco_conn;
+}
+
+static int hfp_ag_open_sco(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call)
+{
+	bool create_sco;
+	bt_hfp_call_state_t call_state;
+
+	if (atomic_test_bit(ag->flags, BT_HFP_AG_CREATING_SCO)) {
+		LOG_WRN("SCO connection is creating!");
+		return 0;
+	}
+
+	hfp_ag_lock(ag);
+	create_sco = (ag->sco_chan.sco == NULL) ? true : false;
+	if (create_sco) {
+		atomic_set_bit(ag->flags, BT_HFP_AG_CREATING_SCO);
+	}
+	hfp_ag_unlock(ag);
+
+	if (create_sco) {
+		struct bt_conn *sco_conn = bt_hfp_ag_create_sco(ag);
+
+		atomic_clear_bit(ag->flags, BT_HFP_AG_CREATING_SCO);
+		atomic_clear_bit(ag->flags, BT_HFP_AG_AUDIO_CONN);
+
+		if (sco_conn == NULL) {
+			LOG_ERR("Fail to create sco connection!");
+			return -ENOTCONN;
+		}
+
+		atomic_set_bit_to(ag->flags, BT_HFP_AG_AUDIO_CONN, call == NULL);
+		if (call) {
+			atomic_set_bit(call->flags, BT_HFP_AG_CALL_OPEN_SCO);
+		}
+
+		LOG_DBG("SCO connection created (%p)", sco_conn);
+	} else {
+		if (call) {
+			hfp_ag_lock(ag);
+			call_state = call->call_state;
+			hfp_ag_unlock(ag);
+
+			if (call_state == BT_HFP_CALL_INCOMING) {
+				bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ALERTING);
+				bt_hfp_ag_call_ringing_cb(call, true);
+			}
+		}
+	}
+
+	return 0;
+}
+
+static int bt_hfp_ag_codec_select(struct bt_hfp_ag *ag)
+{
+	int err;
+
+	LOG_DBG("");
+
+	hfp_ag_lock(ag);
+	if (ag->selected_codec_id == 0) {
+		LOG_WRN("Codec is invalid, set default value");
+		ag->selected_codec_id = BT_HFP_AG_CODEC_CVSD;
+	}
+
+	if (!(ag->hf_codec_ids & BIT(ag->selected_codec_id))) {
+		LOG_ERR("Codec is unsupported (codec id %d)", ag->selected_codec_id);
+		hfp_ag_unlock(ag);
+		return -EINVAL;
+	}
+	hfp_ag_unlock(ag);
+
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BCS:%d\r\n", ag->selected_codec_id);
+	if (err != 0) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+	return err;
+}
+
+static int bt_hfp_ag_create_audio_connection(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call)
+{
+	int err;
+	uint32_t hf_codec_ids;
+
+	hfp_ag_lock(ag);
+	hf_codec_ids = ag->hf_codec_ids;
+	hfp_ag_unlock(ag);
+
+	if ((hf_codec_ids != 0) && atomic_test_bit(ag->flags, BT_HFP_AG_CODEC_CHANGED)) {
+		err = bt_hfp_ag_codec_select(ag);
+		atomic_set_bit_to(ag->flags, BT_HFP_AG_CODEC_CONN, err == 0);
+		if (call) {
+			atomic_set_bit_to(call->flags, BT_HFP_AG_CALL_OPEN_SCO, err == 0);
+		}
+	} else {
+		err = hfp_ag_open_sco(ag, call);
+	}
+
+	return err;
+}
+
+static void bt_hfp_ag_audio_connection(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err;
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	err = bt_hfp_ag_create_audio_connection(ag, call);
+	if (err) {
+		bt_hfp_ag_unit_call_terminate(ag, user_data);
+	}
+}
+
+static void bt_hfp_ag_call_setup_none_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err;
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_OUTGOING_3WAY)) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_HELD_IND,
+					      BT_HFP_CALL_HELD_ACTIVE_HELD, bt_hfp_ag_accept_cb,
+					      call);
+		if (err) {
+			bt_hfp_ag_unit_call_terminate(ag, user_data);
+		}
+		return;
+	}
+
+	bt_hfp_ag_audio_connection(ag, user_data);
+}
+
+static void bt_hfp_ag_unit_call_accept(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err;
+
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 1, bt_hfp_ag_accept_cb, user_data);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+				      bt_hfp_ag_call_setup_none_cb, user_data);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+}
+
+static int bt_hfp_ag_ata_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	int call_count;
+	struct bt_hfp_ag_call *call;
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	hfp_ag_lock(ag);
+	call_count = get_none_released_calls(ag);
+	if (call_count != 1) {
+		hfp_ag_unlock(ag);
+		return -ENOTSUP;
+	}
+
+	call = get_call_with_flag(ag, BT_HFP_AG_CALL_IN_USING, false);
+	__ASSERT(call, "Invalid call object");
+
+	if (call->call_state != BT_HFP_CALL_ALERTING) {
+		hfp_ag_unlock(ag);
+		return -ENOTSUP;
+	}
+	hfp_ag_unlock(ag);
+
+	if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+		return -ENOTSUP;
+	}
+
+	err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_accept, call);
+
+	return err;
+}
+
+static int bt_hfp_ag_cops_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t number;
+
+	if (is_char(buf, '=')) {
+		static const uint32_t command_line_prefix[] = {3, 0};
+
+		for (int i = 0; i < ARRAY_SIZE(command_line_prefix); i++) {
+			err = get_number(buf, &number);
+			if (err != 0) {
+				return -ENOTSUP;
+			}
+
+			if (command_line_prefix[i] != number) {
+				return -ENOTSUP;
+			}
+
+			if (!is_char(buf, ',')) {
+				if (!is_char(buf, '\r')) {
+					return -ENOTSUP;
+				}
+			}
+		}
+
+		atomic_set_bit(ag->flags, BT_HFP_AG_COPS_SET);
+		return 0;
+	}
+
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_COPS_SET)) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '?')) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+COPS:%d,%d,\"%s\"\r\n", ag->mode, 0,
+			       ag->operator);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+
+	return err;
+}
+
+static int bt_hfp_ag_bcc_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+#if BT_HFP_AG_FEATURE_CODEC_NEG_ENABLE
+	int err;
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	hfp_ag_lock(ag);
+	if (ag->selected_codec_id && (!(ag->hf_codec_ids & BIT(ag->selected_codec_id)))) {
+		hfp_ag_unlock(ag);
+		return -ENOTSUP;
+	}
+
+	if (ag->sco_chan.sco) {
+		hfp_ag_unlock(ag);
+		return -ECONNREFUSED;
+	}
+	hfp_ag_unlock(ag);
+
+	if (bt_ag && bt_ag->audio_connect_req) {
+		bt_ag->audio_connect_req(ag);
+		return 0;
+	}
+
+	err = hfp_ag_next_step(ag, bt_hfp_ag_audio_connection, NULL);
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* BT_HFP_AG_FEATURE_CODEC_NEG_ENABLE */
+}
+
+static void bt_hfp_ag_unit_codec_conn_setup(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err = hfp_ag_open_sco(ag, user_data);
+
+	if (err) {
+		bt_hfp_ag_call_reject(ag, user_data);
+	}
+}
+
+static int bt_hfp_ag_bcs_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t number;
+	bool codec_conn;
+	struct bt_hfp_ag_call *call;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &number);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_CODEC_CONN)) {
+		return -ESRCH;
+	}
+
+	hfp_ag_lock(ag);
+	if (ag->selected_codec_id != number) {
+		LOG_ERR("Received codec id %d is not aligned with selected %d", number,
+			ag->selected_codec_id);
+		err = -ENOTSUP;
+	} else if (!(ag->hf_codec_ids & BIT(ag->selected_codec_id))) {
+		LOG_ERR("Selected codec id %d is unsupported %d", ag->selected_codec_id,
+			ag->hf_codec_ids);
+		err = -ENOTSUP;
+	}
+	hfp_ag_unlock(ag);
+
+	codec_conn = atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_CODEC_CONN);
+	atomic_clear_bit(ag->flags, BT_HFP_AG_CODEC_CHANGED);
+
+	call = get_call_with_flag(ag, BT_HFP_AG_CALL_OPEN_SCO, false);
+
+	if (err == 0) {
+		if (codec_conn && bt_ag && bt_ag->codec_negotiate) {
+			bt_ag->codec_negotiate(ag, err);
+		}
+		err = hfp_ag_next_step(ag, bt_hfp_ag_unit_codec_conn_setup, call);
+	} else {
+		bt_hfp_call_state_t call_state;
+
+		if (codec_conn && bt_ag && bt_ag->codec_negotiate) {
+			bt_ag->codec_negotiate(ag, err);
+		}
+
+		if (call) {
+			hfp_ag_lock(ag);
+			call_state = call->call_state;
+			hfp_ag_unlock(ag);
+			if (call_state != BT_HFP_CALL_TERMINATE) {
+				(void)hfp_ag_next_step(ag, bt_hfp_ag_unit_call_terminate, call);
+			}
+		}
+	}
+
+	return err;
+}
+
+static void bt_hfp_ag_outgoing_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_OUTGOING);
+
+	if (bt_ag && bt_ag->outgoing) {
+		bt_ag->outgoing(ag, call, call->number);
+	}
+
+	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING) ||
+	    atomic_test_bit(call->flags, BT_HFP_AG_CALL_OUTGOING_3WAY)) {
+		int err;
+
+		err = bt_hfp_ag_create_audio_connection(ag, call);
+		if (err) {
+			bt_hfp_ag_call_reject(ag, user_data);
+		}
+	}
+}
+
+static void bt_hfp_ag_unit_call_outgoing(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+	int err;
+
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_OUTGOING,
+				      bt_hfp_ag_outgoing_cb, call);
+
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+}
+
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+static void bt_hfp_ag_call_held_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+	bt_hfp_call_state_t call_state;
+
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
+
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+
+		if ((call_state == BT_HFP_CALL_ACTIVE) &&
+		    !atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD)) {
+			bt_hfp_ag_set_call_state(call, BT_HFP_CALL_HOLD);
+			if (bt_ag && bt_ag->held) {
+				bt_ag->held(call);
+			}
+		}
+	}
+
+	bt_hfp_ag_unit_call_outgoing(ag, user_data);
+}
+
+static void bt_hfp_ag_unit_call_outgoing_3way(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+	int err;
+	uint8_t old_value;
+
+	atomic_set_bit(call->flags, BT_HFP_AG_CALL_OUTGOING_3WAY);
+
+	hfp_ag_lock(ag);
+	old_value = ag->indicator_value[BT_HFP_AG_CALL_HELD_IND];
+	hfp_ag_unlock(ag);
+	if (old_value == BT_HFP_CALL_HELD_HELD) {
+		LOG_WRN("No active call");
+		bt_hfp_ag_call_held_cb(ag, user_data);
+		return;
+	}
+
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_HELD_IND, BT_HFP_CALL_HELD_HELD,
+				      bt_hfp_ag_call_held_cb, call);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
+}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+
+static int bt_hfp_ag_outgoing_call(struct bt_hfp_ag *ag, const char *number, uint8_t type)
+{
+	int err;
+	size_t len;
+	struct bt_hfp_ag_call *call;
+	int call_count;
+
+	len = strlen(number);
+	if (len == 0) {
+		return -ENOTSUP;
+	}
+
+	if (len > CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN) {
+		return -ENAMETOOLONG;
+	}
+
+	hfp_ag_lock(ag);
+	(void)strcpy(ag->last_number, number);
+	ag->type = type;
+	hfp_ag_unlock(ag);
+
+	call = get_call_from_number(ag, number, type);
+	if (call) {
+		return -EBUSY;
+	}
+
+	call_count = get_none_released_calls(ag);
+
+	if (call_count) {
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+		if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_3WAY_CALL,
+				    BT_HFP_AG_FEATURE_3WAY_CALL)) {
+			return -ENOEXEC;
+		}
+
+		if (!get_active_held_calls(ag)) {
+			LOG_WRN("The first call is not accepted");
+			return -EBUSY;
+		}
+#else
+		return -EBUSY;
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+	}
+
+	call = get_new_call(ag, number, type);
+	if (!call) {
+		LOG_WRN("Cannot allocate a new call object");
+		return -ENOMEM;
+	}
+
+	atomic_clear_bit(call->flags, BT_HFP_AG_CALL_INCOMING);
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_OUTGOING);
+
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+	if (call_count) {
+		err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_outgoing_3way, call);
+		if (err) {
+			free_call(call);
+		}
+		return err;
+	}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+
+	err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_outgoing, call);
+	if (err) {
+		free_call(call);
+	}
+	return err;
+}
+
+static int bt_hfp_ag_atd_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	char *number = NULL;
+	bool is_memory_dial = false;
+
+	if (buf->data[buf->len - 1] != '\r') {
+		return -ENOTSUP;
+	}
+
+	if (is_char(buf, '>')) {
+		is_memory_dial = true;
+	}
+
+	if ((buf->len - 1) > CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN) {
+		return -ENAMETOOLONG;
+	}
+
+	buf->data[buf->len - 1] = '\0';
+
+	if (is_memory_dial) {
+		if (bt_ag && bt_ag->memory_dial) {
+			err = bt_ag->memory_dial(ag, &buf->data[0], &number);
+			if ((err != 0) || (number == NULL)) {
+				return -ENOTSUP;
+			}
+		} else {
+			return -ENOTSUP;
+		}
+	} else {
+		number = &buf->data[0];
+		if (bt_ag && bt_ag->number_call) {
+			err = bt_ag->number_call(ag, &buf->data[0]);
+			if (err) {
+				return err;
+			}
+		} else {
+			return -ENOTSUP;
+		}
+	}
+
+	return bt_hfp_ag_outgoing_call(ag, number, 0);
+}
+
+static int bt_hfp_ag_bldn_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	return bt_hfp_ag_outgoing_call(ag, ag->last_number, ag->type);
+}
+
+static int bt_hfp_ag_clip_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t clip;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &clip);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (clip > 1) {
+		return -ENOTSUP;
+	}
+
+	atomic_set_bit_to(ag->flags, BT_HFP_AG_CLIP_ENABLE, clip == 1);
+
+	return err;
+}
+
+static int bt_hfp_ag_vgm_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t vgm;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &vgm);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (vgm > BT_HFP_HF_VGM_GAIN_MAX) {
+		LOG_ERR("Invalid vgm (%d>%d)", vgm, BT_HFP_HF_VGM_GAIN_MAX);
+		return -ENOTSUP;
+	}
+
+	if (bt_ag && bt_ag->vgm) {
+		bt_ag->vgm(ag, (uint8_t)vgm);
+	}
+	return err;
+}
+
+static int bt_hfp_ag_vgs_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t vgs;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
 
-	if (!is_char(buf, '?')) {
+	err = get_number(buf, &vgs);
+	if (err != 0) {
 		return -ENOTSUP;
 	}
 
@@ -518,97 +2706,401 @@ static int bt_hfp_ag_cind_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
 		return -ENOTSUP;
 	}
 
-	if (!inquiry_status) {
-		err = hfp_ag_send_data(
-			ag, NULL, NULL,
-			"\r\n+CIND:(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%"
-			"d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d)),(\"%s\",(%d%s%d))\r\n",
-			ag_ind[BT_HFP_AG_SERVICE_IND].name, ag_ind[BT_HFP_AG_SERVICE_IND].min,
-			ag_ind[BT_HFP_AG_SERVICE_IND].connector, ag_ind[BT_HFP_AG_SERVICE_IND].max,
-			ag_ind[BT_HFP_AG_CALL_IND].name, ag_ind[BT_HFP_AG_CALL_IND].min,
-			ag_ind[BT_HFP_AG_CALL_IND].connector, ag_ind[BT_HFP_AG_CALL_IND].max,
-			ag_ind[BT_HFP_AG_CALL_SETUP_IND].name, ag_ind[BT_HFP_AG_CALL_SETUP_IND].min,
-			ag_ind[BT_HFP_AG_CALL_SETUP_IND].connector,
-			ag_ind[BT_HFP_AG_CALL_SETUP_IND].max, ag_ind[BT_HFP_AG_CALL_HELD_IND].name,
-			ag_ind[BT_HFP_AG_CALL_HELD_IND].min,
-			ag_ind[BT_HFP_AG_CALL_HELD_IND].connector,
-			ag_ind[BT_HFP_AG_CALL_HELD_IND].max, ag_ind[BT_HFP_AG_SIGNAL_IND].name,
-			ag_ind[BT_HFP_AG_SIGNAL_IND].min, ag_ind[BT_HFP_AG_SIGNAL_IND].connector,
-			ag_ind[BT_HFP_AG_SIGNAL_IND].max, ag_ind[BT_HFP_AG_ROAM_IND].name,
-			ag_ind[BT_HFP_AG_ROAM_IND].min, ag_ind[BT_HFP_AG_ROAM_IND].connector,
-			ag_ind[BT_HFP_AG_ROAM_IND].max, ag_ind[BT_HFP_AG_BATTERY_IND].name,
-			ag_ind[BT_HFP_AG_BATTERY_IND].min, ag_ind[BT_HFP_AG_BATTERY_IND].connector,
-			ag_ind[BT_HFP_AG_BATTERY_IND].max);
-	} else {
-		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CIND:%d,%d,%d,%d,%d,%d,%d\r\n",
-					 ag->indicator_value[BT_HFP_AG_SERVICE_IND],
-					 ag->indicator_value[BT_HFP_AG_CALL_IND],
-					 ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND],
-					 ag->indicator_value[BT_HFP_AG_CALL_HELD_IND],
-					 ag->indicator_value[BT_HFP_AG_SIGNAL_IND],
-					 ag->indicator_value[BT_HFP_AG_ROAM_IND],
-					 ag->indicator_value[BT_HFP_AG_BATTERY_IND]);
+	if (vgs > BT_HFP_HF_VGS_GAIN_MAX) {
+		LOG_ERR("Invalid vgs (%d>%d)", vgs, BT_HFP_HF_VGS_GAIN_MAX);
+		return -ENOTSUP;
 	}
 
+	if (bt_ag && bt_ag->vgs) {
+		bt_ag->vgs(ag, (uint8_t)vgs);
+	}
 	return err;
 }
 
-static void bt_hfp_ag_set_in_band_ring(struct bt_hfp_ag *ag, void *user_data)
+static int bt_hfp_ag_nrec_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
 {
-	bool is_inband_ringtone;
+	int err;
+	uint32_t disable;
 
-	hfp_ag_lock(ag);
-	is_inband_ringtone = (ag->ag_features & BT_HFP_AG_FEATURE_INBAND_RINGTONE) ? true : false;
-	hfp_ag_unlock(ag);
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
 
-	if (is_inband_ringtone) {
-		int err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BSIR:1\r\n");
+	err = get_number(buf, &disable);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
 
-		atomic_set_bit_to(ag->flags, BT_HFP_AG_INBAND_RING, err == 0);
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (!AG_SUPT_FEAT(ag, BT_HFP_AG_FEATURE_ECNR)) {
+		return -ENOTSUP;
+	}
+
+	if (disable) {
+		LOG_ERR("Only support EC NR disable");
+		return -ENOTSUP;
+	}
+
+#if defined(CONFIG_BT_HFP_AG_ECNR)
+	if (bt_ag && bt_ag->ecnr_turn_off) {
+		bt_ag->ecnr_turn_off(ag);
+		return 0;
 	}
+#endif /* CONFIG_BT_HFP_AG_ECNR */
+	return -ENOTSUP;
 }
 
-static int bt_hfp_ag_cmer_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static void btrh_held_call_updated_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ACTIVE);
+}
+
+static void btrh_held_call_setup_updated_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	if (bt_ag && bt_ag->incoming_held) {
+		bt_ag->incoming_held(call);
+	}
+}
+
+static void btrh_held_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err;
+
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 1, btrh_held_call_updated_cb,
+				      user_data);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+		bt_hfp_ag_unit_call_terminate(ag, user_data);
+	}
+
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+				      btrh_held_call_setup_updated_cb, user_data);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+		bt_hfp_ag_unit_call_terminate(ag, user_data);
+	}
+}
+
+static void btrh_accept_cb(struct bt_hfp_ag *ag, void *user_data)
+{
+	int err;
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
+
+	if (bt_ag && bt_ag->accept) {
+		bt_ag->accept(call);
+	}
+
+	err = bt_hfp_ag_create_audio_connection(ag, call);
+	if (err) {
+		bt_hfp_ag_unit_call_terminate(ag, user_data);
+	}
+}
+
+static void btrh_reject_cb(struct bt_hfp_ag *ag, void *user_data)
 {
-	uint32_t number;
 	int err;
-	static const uint32_t command_line_prefix[] = {3, 0, 0};
+
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, bt_hfp_ag_reject_cb, user_data);
+	if (err) {
+		bt_hfp_ag_unit_call_terminate(ag, user_data);
+	}
+}
+
+static int bt_hfp_ag_btrh_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t action;
+	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag_call *call;
+
+	if (is_char(buf, '?')) {
+		call = get_call_with_flag(ag, BT_HFP_AG_CALL_INCOMING_HELD, false);
+		hfp_ag_lock(ag);
+		call_state = call->call_state;
+		hfp_ag_unlock(ag);
+		if (call && (call_state == BT_HFP_CALL_ACTIVE)) {
+			err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BTRH:%d\r\n",
+					       BT_HFP_BTRH_ON_HOLD);
+			if (err) {
+				LOG_ERR("Fail to send err :(%d)", err);
+			}
+			return err;
+		}
+		return 0;
+	}
 
 	if (!is_char(buf, '=')) {
 		return -ENOTSUP;
 	}
 
-	for (int i = 0; i < ARRAY_SIZE(command_line_prefix); i++) {
-		err = get_number(buf, &number);
-		if (err != 0) {
-			return -ENOTSUP;
+	err = get_number(buf, &action);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (action == BT_HFP_BTRH_ON_HOLD) {
+		call = get_call_with_flag_and_state(ag, BT_HFP_AG_CALL_INCOMING,
+						    BT_HFP_CALL_ALERTING | BT_HFP_CALL_INCOMING);
+		if (call) {
+			atomic_set_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD);
+			err = hfp_ag_send_data(ag, btrh_held_cb, call, "\r\n+BTRH:%d\r\n",
+					       BT_HFP_BTRH_ON_HOLD);
+			if (err) {
+				LOG_ERR("Fail to send err :(%d)", err);
+			}
+			return err;
 		}
+	} else if (action == BT_HFP_BTRH_ACCEPTED) {
+		call = get_call_with_flag_and_state(ag, BT_HFP_AG_CALL_INCOMING_HELD,
+						    BT_HFP_CALL_ACTIVE);
+		if (call) {
+			atomic_clear_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD);
+			err = hfp_ag_send_data(ag, btrh_accept_cb, call, "\r\n+BTRH:%d\r\n",
+					       BT_HFP_BTRH_ACCEPTED);
+			if (err) {
+				LOG_ERR("Fail to send err :(%d)", err);
+			}
+			return err;
+		}
+	} else if (action == BT_HFP_BTRH_REJECTED) {
+		call = get_call_with_flag_and_state(ag, BT_HFP_AG_CALL_INCOMING_HELD,
+						    BT_HFP_CALL_ACTIVE);
+		if (call) {
+			atomic_clear_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD);
+			err = hfp_ag_send_data(ag, btrh_reject_cb, call, "\r\n+BTRH:%d\r\n",
+					       BT_HFP_BTRH_REJECTED);
+			if (err) {
+				LOG_ERR("Fail to send err :(%d)", err);
+			}
+			return err;
+		}
+	}
 
-		if (!is_char(buf, ',')) {
-			return -ENOTSUP;
+	return -ENOTSUP;
+}
+
+static int bt_hfp_ag_ccwa_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t value;
+
+	if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_3WAY_CALL, BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		return -ENOEXEC;
+	}
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &value);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (value > 1) {
+		return -ENOTSUP;
+	}
+
+	atomic_set_bit_to(ag->flags, BT_HFP_AG_CCWA_ENABLE, value);
+	return 0;
+}
+
+static void bt_hfp_ag_vr_activate(struct bt_hfp_ag *ag, void *user_data)
+{
+	bool feature;
+
+	feature = BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_ENH_VOICE_RECG,
+				 BT_HFP_AG_FEATURE_ENH_VOICE_RECG);
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG)
+	if (bt_ag && bt_ag->voice_recognition) {
+		bt_ag->voice_recognition(ag, true);
+	} else {
+		(void)bt_hfp_ag_audio_connect(ag, BT_HFP_AG_CODEC_CVSD);
+	}
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG */
+
+	atomic_set_bit_to(ag->flags, BT_HFP_AG_VRE_R2A, !feature);
+
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+	if (atomic_test_bit(ag->flags, BT_HFP_AG_VRE_R2A)) {
+		if (bt_ag && bt_ag->ready_to_accept_audio) {
+			bt_ag->ready_to_accept_audio(ag);
 		}
+	}
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+}
 
-		if (command_line_prefix[i] != number) {
+static void bt_hfp_ag_vr_deactivate(struct bt_hfp_ag *ag, void *user_data)
+{
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+	if (bt_ag && bt_ag->voice_recognition) {
+		bt_ag->voice_recognition(ag, false);
+	}
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+}
+
+static void bt_hfp_ag_vr_ready2accept(struct bt_hfp_ag *ag, void *user_data)
+{
+	atomic_set_bit(ag->flags, BT_HFP_AG_VRE_R2A);
+
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+	if (bt_ag && bt_ag->ready_to_accept_audio) {
+		bt_ag->ready_to_accept_audio(ag);
+	}
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+}
+
+static int bt_hfp_ag_bvra_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t value;
+
+	if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_VOICE_RECG, BT_HFP_AG_FEATURE_VOICE_RECG)) {
+		return -ENOEXEC;
+	}
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &value);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	switch (value) {
+	case BT_HFP_BVRA_DEACTIVATION:
+		if (!atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_VRE_ACTIVATE)) {
+			LOG_WRN("VR is not activated");
+			return -ENOTSUP;
+		}
+		err = hfp_ag_next_step(ag, bt_hfp_ag_vr_deactivate, NULL);
+		break;
+	case BT_HFP_BVRA_ACTIVATION:
+		if (atomic_test_and_set_bit(ag->flags, BT_HFP_AG_VRE_ACTIVATE)) {
+			LOG_WRN("VR has been activated");
+			return -ENOTSUP;
+		}
+		atomic_clear_bit(ag->flags, BT_HFP_AG_VRE_R2A);
+		err = hfp_ag_next_step(ag, bt_hfp_ag_vr_activate, NULL);
+		break;
+	case BT_HFP_BVRA_READY_TO_ACCEPT:
+		if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_ENH_VOICE_RECG,
+				    BT_HFP_AG_FEATURE_ENH_VOICE_RECG)) {
+			LOG_WRN("Enhance voice recognition is not supported");
+			return -ENOEXEC;
+		}
+		if (!atomic_test_bit(ag->flags, BT_HFP_AG_VRE_ACTIVATE)) {
+			LOG_WRN("Voice recognition is not activated");
 			return -ENOTSUP;
 		}
+		err = hfp_ag_next_step(ag, bt_hfp_ag_vr_ready2accept, NULL);
+		break;
+	default:
+		return -ENOTSUP;
 	}
 
-	err = get_number(buf, &number);
+	return err;
+}
+
+static int bt_hfp_ag_binp_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	uint32_t value;
+#if defined(CONFIG_BT_HFP_AG_VOICE_TAG)
+	char *number = NULL;
+#endif /* CONFIG_BT_HFP_AG_VOICE_TAG */
+
+	if (!AG_SUPT_FEAT(ag, BT_HFP_AG_FEATURE_VOICE_TAG)) {
+		return -ENOEXEC;
+	}
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_number(buf, &value);
+	if (err != 0) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (value != 1) {
+		return -ENOTSUP;
+	}
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_TAG)
+	if (bt_ag && bt_ag->request_phone_number) {
+		err = bt_ag->request_phone_number(ag, &number);
+		if (err) {
+			LOG_DBG("Cannot request phone number :(%d)", err);
+			return err;
+		}
+
+		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BINP:\"%s\"\r\n", number);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+		return err;
+	}
+#endif /* CONFIG_BT_HFP_AG_VOICE_TAG */
+
+	return -ENOTSUP;
+}
+
+static int bt_hfp_ag_vts_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
+	char code = 0;
+
+	if (!is_char(buf, '=')) {
+		return -ENOTSUP;
+	}
+
+	err = get_char(buf, &code);
 	if (err != 0) {
 		return -ENOTSUP;
 	}
 
-	if (!is_char(buf, '\r')) {
+	if (!is_char(buf, '\r')) {
+		return -ENOTSUP;
+	}
+
+	if (!IS_VALID_DTMF(code)) {
+		LOG_ERR("Invalid code");
+		return -EINVAL;
+	}
+
+	if (!get_active_calls(ag)) {
+		LOG_ERR("Not valid ongoing call");
 		return -ENOTSUP;
 	}
 
-	if (number == 1) {
-		atomic_set_bit(ag->flags, BT_HFP_AG_CMER_ENABLE);
-		bt_hfp_ag_set_state(ag, BT_HFP_CONNECTED);
-		err = hfp_ag_next_step(ag, bt_hfp_ag_set_in_band_ring, NULL);
-		return err;
-	} else if (number == 0) {
-		atomic_clear_bit(ag->flags, BT_HFP_AG_CMER_ENABLE);
+	if (bt_ag && bt_ag->transmit_dtmf_code) {
+		bt_ag->transmit_dtmf_code(ag, code);
 	} else {
 		return -ENOTSUP;
 	}
@@ -616,129 +3108,53 @@ static int bt_hfp_ag_cmer_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
 	return 0;
 }
 
-static int bt_hfp_ag_chld_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
-{
-	return -EOPNOTSUPP;
-}
-
-static int bt_hfp_ag_bind_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static int send_subscriber_number(struct bt_hfp_ag *ag, char *number,
+		uint8_t type, uint8_t service)
 {
-	uint32_t indicator;
-	uint32_t hf_indicators = 0U;
 	int err;
-	char *data;
-	uint32_t len;
 
-	hfp_ag_lock(ag);
-	if (!((ag->ag_features & BT_HFP_AG_FEATURE_HF_IND) &&
-	      (ag->hf_features & BT_HFP_HF_FEATURE_HF_IND))) {
-		hfp_ag_unlock(ag);
-		return -EOPNOTSUPP;
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CNUM:,\"%s\",%d,,%d\r\n",
+		number, type, service);
+	if (err) {
+		LOG_ERR("Fail to send subscriber number :(%d)", err);
 	}
-	hfp_ag_unlock(ag);
-
-	if (is_char(buf, '?')) {
-		if (!is_char(buf, '\r')) {
-			return -ENOTSUP;
-		}
+	return err;
+}
 
-		hfp_ag_lock(ag);
-		hf_indicators = ag->hf_indicators_of_hf & ag->hf_indicators_of_ag;
-		hfp_ag_unlock(ag);
-		len = (sizeof(hf_indicators) * 8) > HFP_HF_IND_MAX ? HFP_HF_IND_MAX
-								   : (sizeof(hf_indicators) * 8);
-		for (int i = 1; i < len; i++) {
-			if (BIT(i) & hf_indicators) {
-				err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BIND:%d,%d\r\n", i, 1);
-			} else {
-				err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BIND:%d,%d\r\n", i, 0);
-			}
-			if (err < 0) {
-				return err;
-			}
-			if (hf_indicators == 0) {
-				break;
-			}
-		}
-		return 0;
-	}
+static int bt_hfp_ag_cnum_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+{
+	int err;
 
-	if (!is_char(buf, '=')) {
+	if (!is_char(buf, '\r')) {
 		return -ENOTSUP;
 	}
 
-	if (is_char(buf, '?')) {
-		if (!is_char(buf, '\r')) {
-			return -ENOTSUP;
-		}
-
-		data = &ag->buffer[0];
-		*data = '(';
-		data++;
-		hfp_ag_lock(ag);
-		hf_indicators = ag->hf_indicators_of_ag;
-		hfp_ag_unlock(ag);
-		len = (sizeof(hf_indicators) * 8) > HFP_HF_IND_MAX ? HFP_HF_IND_MAX
-								   : (sizeof(hf_indicators) * 8);
-		for (int i = 1; (i < len) && (hf_indicators != 0); i++) {
-			if (BIT(i) & hf_indicators) {
-				int length = snprintk(
-					data, (char *)&ag->buffer[HF_MAX_BUF_LEN - 1] - data - 3,
-					"%d", i);
-				data += length;
-				hf_indicators &= ~BIT(i);
-			}
-			if (hf_indicators != 0) {
-				*data = ',';
-				data++;
-			}
-		}
-		*data = ')';
-		data++;
-		*data = '\r';
-		data++;
-		*data = '\0';
-		data++;
-
-		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BIND:%s\r\n", &ag->buffer[0]);
+	if (bt_ag && bt_ag->subscriber_number) {
+		err = bt_ag->subscriber_number(ag, send_subscriber_number);
 		return err;
 	}
 
-	while (buf->len > 0) {
-		err = get_number(buf, &indicator);
-		if (err != 0) {
-			return -ENOTSUP;
-		}
-
-		if (!is_char(buf, ',')) {
-			if (!is_char(buf, '\r')) {
-				return -ENOTSUP;
-			}
-		}
-
-		if (indicator < (sizeof(hf_indicators) * 8)) {
-			hf_indicators |= BIT(indicator);
-		}
-	}
-
-	hfp_ag_lock(ag);
-	ag->hf_indicators_of_hf = hf_indicators;
-	hfp_ag_unlock(ag);
-
 	return 0;
 }
 
-static int bt_hfp_ag_cmee_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static int bt_hfp_ag_biev_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
 {
-	uint32_t cmee;
-	int err;
+	uint32_t indicator;
+	uint32_t value;
 
 	if (!is_char(buf, '=')) {
 		return -ENOTSUP;
 	}
 
-	err = get_number(buf, &cmee);
-	if (err != 0) {
+	if (get_number(buf, &indicator)) {
+		return -ENOTSUP;
+	}
+
+	if (!is_char(buf, ',')) {
+		return -ENOTSUP;
+	}
+
+	if (get_number(buf, &value)) {
 		return -ENOTSUP;
 	}
 
@@ -746,1096 +3162,1282 @@ static int bt_hfp_ag_cmee_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
 		return -ENOTSUP;
 	}
 
-	if (cmee > 1) {
+	hfp_ag_lock(ag);
+	if (!(ag->hf_indicators_of_ag & BIT(indicator))) {
+		hfp_ag_unlock(ag);
 		return -ENOTSUP;
 	}
+	hfp_ag_unlock(ag);
 
-	atomic_set_bit_to(ag->flags, BT_HFP_AG_CMEE_ENABLE, cmee == 1);
+#if defined(CONFIG_BT_HFP_AG_HF_INDICATORS)
+	if (bt_ag && bt_ag->hf_indicator_value) {
+		bt_ag->hf_indicator_value(ag, indicator, value);
+	}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
 
 	return 0;
 }
 
-static int hfp_ag_update_indicator(struct bt_hfp_ag *ag, enum bt_hfp_ag_indicator index,
-				   uint8_t value, bt_hfp_ag_tx_cb_t cb, void *user_data)
+static struct bt_hfp_ag_at_cmd_handler cmd_handlers[] = {
+	{"AT+BRSF", bt_hfp_ag_brsf_handler}, {"AT+BAC", bt_hfp_ag_bac_handler},
+	{"AT+CIND", bt_hfp_ag_cind_handler}, {"AT+CMER", bt_hfp_ag_cmer_handler},
+	{"AT+CHLD", bt_hfp_ag_chld_handler}, {"AT+BIND", bt_hfp_ag_bind_handler},
+	{"AT+CMEE", bt_hfp_ag_cmee_handler}, {"AT+CHUP", bt_hfp_ag_chup_handler},
+	{"AT+CLCC", bt_hfp_ag_clcc_handler}, {"AT+BIA", bt_hfp_ag_bia_handler},
+	{"ATA", bt_hfp_ag_ata_handler},      {"AT+COPS", bt_hfp_ag_cops_handler},
+	{"AT+BCC", bt_hfp_ag_bcc_handler},   {"AT+BCS", bt_hfp_ag_bcs_handler},
+	{"ATD", bt_hfp_ag_atd_handler},      {"AT+BLDN", bt_hfp_ag_bldn_handler},
+	{"AT+CLIP", bt_hfp_ag_clip_handler}, {"AT+VGM", bt_hfp_ag_vgm_handler},
+	{"AT+VGS", bt_hfp_ag_vgs_handler},   {"AT+NREC", bt_hfp_ag_nrec_handler},
+	{"AT+BTRH", bt_hfp_ag_btrh_handler}, {"AT+CCWA", bt_hfp_ag_ccwa_handler},
+	{"AT+BVRA", bt_hfp_ag_bvra_handler}, {"AT+BINP", bt_hfp_ag_binp_handler},
+	{"AT+VTS", bt_hfp_ag_vts_handler},   {"AT+CNUM", bt_hfp_ag_cnum_handler},
+	{"AT+BIEV", bt_hfp_ag_biev_handler},
+};
+
+static void hfp_ag_connected(struct bt_rfcomm_dlc *dlc)
 {
-	int err;
-	uint8_t old_value;
+	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
 
-	hfp_ag_lock(ag);
-	old_value = ag->indicator_value[index];
-	if (value == old_value) {
-		LOG_ERR("Duplicate value setting, indicator %d, old %d -> new %d", index, old_value,
-			value);
-		hfp_ag_unlock(ag);
-		return -EINVAL;
-	}
+	bt_hfp_ag_set_state(ag, BT_HFP_CONFIG);
 
-	ag->indicator_value[index] = value;
-	hfp_ag_unlock(ag);
+	LOG_DBG("AG %p", ag);
+}
 
-	LOG_DBG("indicator %d, old %d -> new %d", index, old_value, value);
+static void hfp_ag_disconnected(struct bt_rfcomm_dlc *dlc)
+{
+	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
+	sys_snode_t *node;
+	struct bt_ag_tx *tx;
+	struct bt_hfp_ag_call *call;
 
-	err = hfp_ag_send_data(ag, cb, user_data, "\r\n+CIEV:%d,%d\r\n", (uint8_t)index + 1, value);
-	if (err) {
+	k_work_cancel_delayable(&ag->tx_work);
+
+	hfp_ag_lock(ag);
+	node = sys_slist_get(&ag->tx_pending);
+	hfp_ag_unlock(ag);
+	tx = CONTAINER_OF(node, struct bt_ag_tx, node);
+	while (tx) {
+		if (tx->buf && !atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
+			net_buf_unref(tx->buf);
+		}
+		tx->err = -ESHUTDOWN;
+		k_fifo_put(&ag_tx_notify, tx);
 		hfp_ag_lock(ag);
-		ag->indicator_value[index] = old_value;
+		node = sys_slist_get(&ag->tx_pending);
 		hfp_ag_unlock(ag);
-		LOG_ERR("Fail to update indicator %d, current %d", index, old_value);
+		tx = CONTAINER_OF(node, struct bt_ag_tx, node);
 	}
 
-	return err;
-}
+	bt_hfp_ag_set_state(ag, BT_HFP_DISCONNECTED);
 
-static void hfp_ag_close_sco(struct bt_hfp_ag *ag)
-{
-	struct bt_conn *sco;
+	for (size_t index = 0; index < ARRAY_SIZE(ag->calls); index++) {
+		call = &ag->calls[index];
 
-	LOG_DBG("");
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+			continue;
+		}
 
-	hfp_ag_lock(ag);
-	sco = ag->sco_chan.sco;
-	ag->sco_chan.sco = NULL;
-	hfp_ag_unlock(ag);
-	if (sco != NULL) {
-		LOG_DBG("Disconnect sco %p", sco);
-		bt_conn_disconnect(sco, BT_HCI_ERR_LOCALHOST_TERM_CONN);
+		release_call(call);
 	}
-}
 
-static void bt_hfp_ag_reject_cb(struct bt_hfp_ag *ag, void *user_data)
-{
 	hfp_ag_close_sco(ag);
-	bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_TERMINATE);
 
-	if (bt_ag && bt_ag->reject) {
-		bt_ag->reject(ag);
-	}
+	ag->acl_conn = NULL;
+
+	LOG_DBG("AG %p", ag);
 }
 
-static void bt_hfp_ag_call_reject(struct bt_hfp_ag *ag, void *user_data)
+static void hfp_ag_recv(struct bt_rfcomm_dlc *dlc, struct net_buf *buf)
 {
-	int err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
-					    bt_hfp_ag_reject_cb, user_data);
+	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
+	uint8_t *data = buf->data;
+	uint16_t len = buf->len;
+	enum at_cme cme_err;
+	int err = -ENOEXEC;
+
+	LOG_HEXDUMP_DBG(data, len, "Received:");
+
+	for (uint32_t index = 0; index < ARRAY_SIZE(cmd_handlers); index++) {
+		if (strlen(cmd_handlers[index].cmd) > len) {
+			continue;
+		}
+		if (strncmp((char *)data, cmd_handlers[index].cmd,
+				 strlen(cmd_handlers[index].cmd)) != 0) {
+			continue;
+		}
+		if (NULL != cmd_handlers[index].handler) {
+			(void)net_buf_pull(buf, strlen(cmd_handlers[index].cmd));
+			err = cmd_handlers[index].handler(ag, buf);
+			LOG_DBG("AT commander is handled (err %d)", err);
+			break;
+		}
+	}
+
+	if ((err != 0) && atomic_test_bit(ag->flags, BT_HFP_AG_CMEE_ENABLE)) {
+		cme_err = bt_hfp_ag_get_cme_err(err);
+		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CME ERROR:%d\r\n", (uint32_t)cme_err);
+	} else {
+		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n%s\r\n", (err == 0) ? "OK" : "ERROR");
+	}
+
 	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+		LOG_ERR("HFP AG send response err :(%d)", err);
 	}
 }
 
-static void bt_hfp_ag_terminate_cb(struct bt_hfp_ag *ag, void *user_data)
+static void bt_hfp_ag_thread(void *p1, void *p2, void *p3)
 {
-	hfp_ag_close_sco(ag);
-	bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_TERMINATE);
+	struct bt_ag_tx *tx;
+	bt_hfp_ag_tx_cb_t cb;
+	struct bt_hfp_ag *ag;
+	void *user_data;
+	bt_hfp_state_t state;
+	int err;
 
-	if (bt_ag && bt_ag->terminate) {
-		bt_ag->terminate(ag);
-	}
-}
+	while (true) {
+		tx = (struct bt_ag_tx *)k_fifo_get(&ag_tx_notify, K_FOREVER);
+
+		if (tx == NULL) {
+			continue;
+		}
+
+		cb = tx->cb;
+		ag = tx->ag;
+		user_data = tx->user_data;
+		err = tx->err;
+
+		bt_ag_tx_free(tx);
+
+		if (err < 0) {
+			hfp_ag_lock(ag);
+			state = ag->state;
+			hfp_ag_unlock(ag);
+			if ((state != BT_HFP_DISCONNECTED) && (state != BT_HFP_DISCONNECTING)) {
+				bt_hfp_ag_set_state(ag, BT_HFP_DISCONNECTING);
+				bt_rfcomm_dlc_disconnect(&ag->rfcomm_dlc);
+			}
+		}
 
-static void bt_hfp_ag_unit_call_terminate(struct bt_hfp_ag *ag, void *user_data)
-{
-	int err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, bt_hfp_ag_terminate_cb,
-					    user_data);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+		if (cb) {
+			cb(ag, user_data);
+		}
 	}
 }
 
-static int bt_hfp_ag_chup_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static void hfp_ag_sent(struct bt_rfcomm_dlc *dlc, int err)
 {
-	int err;
-	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
+	sys_snode_t *node;
+	struct bt_ag_tx *tx;
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
+	hfp_ag_lock(ag);
+	/* Clear the tx ongoing flag */
+	if (!atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
+		LOG_WRN("tx ongoing flag is not set");
+		hfp_ag_unlock(ag);
+		return;
 	}
 
-	hfp_ag_lock(ag);
-	call_state = ag->call_state;
+	node = sys_slist_get(&ag->tx_pending);
 	hfp_ag_unlock(ag);
-
-	if (call_state == BT_HFP_CALL_ALERTING) {
-		if (!atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
-			return -ENOTSUP;
-		}
-		err = hfp_ag_next_step(ag, bt_hfp_ag_call_reject, NULL);
-	} else if ((call_state == BT_HFP_CALL_ACTIVE) || (call_state == BT_HFP_CALL_HOLD)) {
-		err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_terminate, NULL);
-	} else {
-		return -ENOTSUP;
+	if (!node) {
+		LOG_ERR("No pending tx");
+		return;
 	}
-	return err;
+
+	tx = CONTAINER_OF(node, struct bt_ag_tx, node);
+	LOG_DBG("Completed pending tx %p", tx);
+
+	/* Restart the tx work */
+	k_work_reschedule(&ag->tx_work, K_NO_WAIT);
+
+	tx->err = err;
+	k_fifo_put(&ag_tx_notify, tx);
 }
 
-static uint8_t bt_hfp_get_call_state(struct bt_hfp_ag *ag)
+static const char *bt_ag_get_call_state_string(bt_hfp_call_state_t call_state)
 {
-	uint8_t status = HFP_AG_CLCC_STATUS_INVALID;
+	const char *s;
 
-	hfp_ag_lock(ag);
-	switch (ag->call_state) {
+	switch (call_state) {
 	case BT_HFP_CALL_TERMINATE:
+		s = "terminate";
+		break;
+	case BT_HFP_CALL_ACTIVE:
+		s = "active";
+		break;
+	case BT_HFP_CALL_HOLD:
+		s = "hold";
 		break;
 	case BT_HFP_CALL_OUTGOING:
-		status = HFP_AG_CLCC_STATUS_DIALING;
+		s = "outgoing";
 		break;
 	case BT_HFP_CALL_INCOMING:
-		status = HFP_AG_CLCC_STATUS_INCOMING;
+		s = "incoming";
 		break;
 	case BT_HFP_CALL_ALERTING:
-		if (atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
-			status = HFP_AG_CLCC_STATUS_WAITING;
-		} else {
-			status = HFP_AG_CLCC_STATUS_ALERTING;
-		}
-		break;
-	case BT_HFP_CALL_ACTIVE:
-		status = HFP_AG_CLCC_STATUS_ACTIVE;
-		break;
-	case BT_HFP_CALL_HOLD:
-		status = HFP_AG_CLCC_STATUS_HELD;
+		s = "alerting";
 		break;
 	default:
+		s = "unknown";
 		break;
 	}
-	hfp_ag_unlock(ag);
 
-	return status;
+	return s;
 }
 
-static int bt_hfp_ag_clcc_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static void bt_ag_deferred_work_cb(struct bt_hfp_ag *ag, void *user_data)
 {
 	int err;
-	uint8_t dir;
-	uint8_t status;
-	uint8_t mode;
-	uint8_t mpty;
+	bt_hfp_call_state_t call_state;
+	uint8_t call_setup_ind;
+	uint8_t call_ind;
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
-	}
+	LOG_DBG("");
 
 	hfp_ag_lock(ag);
-	if (ag->call_state == BT_HFP_CALL_TERMINATE) {
-		/* AG shall always send OK response to HF */
-		hfp_ag_unlock(ag);
-		return 0;
-	}
+	call_state = call->call_state;
+	call_setup_ind = ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND];
+	call_ind = ag->indicator_value[BT_HFP_AG_CALL_IND];
 	hfp_ag_unlock(ag);
 
-	dir = atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL) ? 1 : 0;
-	status = bt_hfp_get_call_state(ag);
-	mode = 0;
-	mpty = 0;
-	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CLCC:%d,%d,%d,%d,%d\r\n", 1, dir, status, mode,
-			       mpty);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+	switch (call_state) {
+	case BT_HFP_CALL_TERMINATE:
+		break;
+	case BT_HFP_CALL_ACTIVE:
+		break;
+	case BT_HFP_CALL_HOLD:
+		break;
+	case BT_HFP_CALL_OUTGOING:
+	case BT_HFP_CALL_INCOMING:
+	case BT_HFP_CALL_ALERTING:
+	default:
+		LOG_WRN("Call timeout, status %s", bt_ag_get_call_state_string(call_state));
+
+		if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_OUTGOING_3WAY) ||
+		    atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_3WAY)) {
+			if (!call_setup_ind) {
+				return;
+			}
+
+			err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
+						      BT_HFP_CALL_SETUP_NONE,
+						      bt_hfp_ag_reject_cb, call);
+			if (err) {
+				LOG_ERR("Fail to send indicator");
+				bt_hfp_ag_terminate_cb(ag, call);
+			}
+			return;
+		}
+
+		if (call_setup_ind && call_ind) {
+			err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
+						      BT_HFP_CALL_SETUP_NONE, NULL, NULL);
+			if (err) {
+				LOG_ERR("Fail to send indicator");
+				bt_hfp_ag_terminate_cb(ag, call);
+			} else {
+				err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0,
+							      bt_hfp_ag_terminate_cb, call);
+				if (err) {
+					LOG_ERR("Fail to send indicator");
+					bt_hfp_ag_terminate_cb(ag, call);
+				}
+			}
+		} else if (call_setup_ind) {
+			err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
+						      BT_HFP_CALL_SETUP_NONE, bt_hfp_ag_reject_cb,
+						      call);
+			if (err) {
+				LOG_ERR("Fail to send indicator");
+				bt_hfp_ag_terminate_cb(ag, call);
+			}
+		} else if (call_ind) {
+			err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0,
+						      bt_hfp_ag_terminate_cb, call);
+			if (err) {
+				LOG_ERR("Fail to send indicator");
+				bt_hfp_ag_terminate_cb(ag, call);
+			}
+		}
+		break;
 	}
+}
 
-	/* AG shall always send OK response to HF */
-	return 0;
+static void bt_ag_deferred_work(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_hfp_ag_call *call = CONTAINER_OF(dwork, struct bt_hfp_ag_call, deferred_work);
+	struct bt_hfp_ag *ag = call->ag;
+
+	LOG_DBG("");
+
+	if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+		return;
+	}
+
+	(void)hfp_ag_next_step(ag, bt_ag_deferred_work_cb, call);
 }
 
-static int bt_hfp_ag_bia_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+static void bt_ag_ringing_work_cb(struct bt_hfp_ag *ag, void *user_data)
 {
-	uint32_t number;
 	int err;
-	int index = 0;
-	uint32_t indicator;
+	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
 
-	if (!is_char(buf, '=')) {
-		return -ENOTSUP;
-	}
+	LOG_DBG("");
 
 	hfp_ag_lock(ag);
-	indicator = ag->indicator;
+	call_state = call->call_state;
 	hfp_ag_unlock(ag);
+	if (call_state == BT_HFP_CALL_ALERTING) {
 
-	while (buf->len > 0) {
-		err = get_number(buf, &number);
-		if (err == 0) {
-			/* Valid number */
-			if (number) {
-				indicator |= BIT(index);
-			} else {
-				indicator &= ~BIT(index);
-			}
+		if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+			return;
 		}
 
-		if (is_char(buf, ',')) {
-			index++;
+		k_work_reschedule(&call->ringing_work,
+				  K_SECONDS(CONFIG_BT_HFP_AG_RING_NOTIFY_INTERVAL));
+
+		err = hfp_ag_send_data(ag, NULL, NULL, "\r\nRING\r\n");
+		if (err) {
+			LOG_ERR("Fail to send RING %d", err);
 		} else {
-			if (!is_char(buf, '\r')) {
-				return -ENOTSUP;
-			}
-			if (buf->len != 0) {
-				return -ENOTSUP;
+			if (atomic_test_bit(ag->flags, BT_HFP_AG_CLIP_ENABLE)) {
+				err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CLIP:\"%s\",%d\r\n",
+						       call->number, 0);
+				if (err) {
+					LOG_ERR("Fail to send CLIP %d", err);
+				}
 			}
 		}
 	}
+}
 
-	/* Force call, call setup and held call indicators are enabled. */
-	indicator = BIT(BT_HFP_AG_CALL_IND) | BIT(BT_HFP_AG_CALL_SETUP_IND) |
-		    BIT(BT_HFP_AG_CALL_HELD_IND);
+static void bt_ag_ringing_work(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_hfp_ag_call *call = CONTAINER_OF(dwork, struct bt_hfp_ag_call, ringing_work);
 
-	hfp_ag_lock(ag);
-	ag->indicator = indicator;
-	hfp_ag_unlock(ag);
+	LOG_DBG("");
 
-	return 0;
+	if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_IN_USING)) {
+		return;
+	}
+
+	(void)hfp_ag_next_step(call->ag, bt_ag_ringing_work_cb, call);
 }
 
-static void bt_hfp_ag_accept_cb(struct bt_hfp_ag *ag, void *user_data)
+static K_KERNEL_STACK_MEMBER(ag_thread_stack, CONFIG_BT_HFP_AG_THREAD_STACK_SIZE);
+
+static struct bt_hfp_ag *hfp_ag_create(struct bt_conn *conn)
 {
-	bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_ACTIVE);
+	static struct bt_rfcomm_dlc_ops ops = {
+		.connected = hfp_ag_connected,
+		.disconnected = hfp_ag_disconnected,
+		.recv = hfp_ag_recv,
+		.sent = hfp_ag_sent,
+	};
+	static k_tid_t ag_thread_id;
+	static struct k_thread ag_thread;
+	size_t index;
+	struct bt_hfp_ag *ag;
 
-	if (bt_ag && bt_ag->accept) {
-		bt_ag->accept(ag);
+	LOG_DBG("conn %p", conn);
+
+	if (ag_thread_id == NULL) {
+
+		k_fifo_init(&ag_tx_free);
+		k_fifo_init(&ag_tx_notify);
+
+		for (index = 0; index < ARRAY_SIZE(ag_tx); index++) {
+			k_fifo_put(&ag_tx_free, &ag_tx[index]);
+		}
+
+		ag_thread_id = k_thread_create(
+			&ag_thread, ag_thread_stack, K_KERNEL_STACK_SIZEOF(ag_thread_stack),
+			bt_hfp_ag_thread, NULL, NULL, NULL,
+			K_PRIO_COOP(CONFIG_BT_HFP_AG_THREAD_PRIO), 0, K_NO_WAIT);
+		__ASSERT(ag_thread_id, "Cannot create thread for AG");
+		k_thread_name_set(ag_thread_id, "HFP AG");
+	}
+
+	index = (size_t)bt_conn_index(conn);
+	ag = &bt_hfp_ag_pool[index];
+	if (ag->acl_conn) {
+		LOG_ERR("AG connection (%p) is established", conn);
+		return NULL;
 	}
+
+	(void)memset(ag, 0, sizeof(struct bt_hfp_ag));
+
+	sys_slist_init(&ag->tx_pending);
+
+	k_sem_init(&ag->lock, 1, 1);
+
+	ag->rfcomm_dlc.ops = &ops;
+	ag->rfcomm_dlc.mtu = BT_HFP_MAX_MTU;
+
+	/* Set the supported features*/
+	ag->ag_features = BT_HFP_AG_SUPPORTED_FEATURES;
+
+	/* Support HF indicators */
+	if (IS_ENABLED(CONFIG_BT_HFP_AG_HF_INDICATOR_ENH_SAFETY)) {
+		ag->hf_indicators_of_ag |= BIT(HFP_HF_ENHANCED_SAFETY_IND);
+	}
+
+	if (IS_ENABLED(CONFIG_BT_HFP_AG_HF_INDICATOR_BATTERY)) {
+		ag->hf_indicators_of_ag |= BIT(HFP_HF_BATTERY_LEVEL_IND);
+	}
+
+	ag->hf_indicators = ag->hf_indicators_of_ag;
+
+	/* If supported codec ids cannot be notified, disable codec negotiation. */
+	if (!(bt_ag && bt_ag->codec)) {
+		ag->ag_features &= ~BT_HFP_AG_FEATURE_CODEC_NEG;
+	}
+
+	ag->hf_features = 0;
+	ag->hf_codec_ids = 0;
+
+	ag->acl_conn = conn;
+
+	/* Set AG indicator value */
+	ag->indicator_value[BT_HFP_AG_SERVICE_IND] = 0;
+	ag->indicator_value[BT_HFP_AG_CALL_IND] = 0;
+	ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND] = 0;
+	ag->indicator_value[BT_HFP_AG_CALL_HELD_IND] = 0;
+	ag->indicator_value[BT_HFP_AG_SIGNAL_IND] = 0;
+	ag->indicator_value[BT_HFP_AG_ROAM_IND] = 0;
+	ag->indicator_value[BT_HFP_AG_BATTERY_IND] = 0;
+
+	/* Set AG indicator status */
+	ag->indicator = BIT(BT_HFP_AG_SERVICE_IND) | BIT(BT_HFP_AG_CALL_IND) |
+				BIT(BT_HFP_AG_CALL_SETUP_IND) | BIT(BT_HFP_AG_CALL_HELD_IND) |
+				BIT(BT_HFP_AG_SIGNAL_IND) | BIT(BT_HFP_AG_ROAM_IND) |
+				BIT(BT_HFP_AG_BATTERY_IND);
+
+	/* Set AG operator */
+	memcpy(ag->operator, "UNKNOWN", sizeof("UNKNOWN"));
+
+	/* Set Codec ID*/
+	ag->selected_codec_id = BT_HFP_AG_CODEC_CVSD;
+
+	/* Init delay work */
+	k_work_init_delayable(&ag->tx_work, bt_ag_tx_work);
+
+	return ag;
 }
 
-static void bt_hfp_ag_call_ringing_cb(struct bt_hfp_ag *ag, bool in_bond)
+int bt_hfp_ag_connect(struct bt_conn *conn, struct bt_hfp_ag **ag, uint8_t channel)
 {
-	if (bt_ag && bt_ag->ringing) {
-		bt_ag->ringing(ag, in_bond);
+	struct bt_hfp_ag *new_ag;
+	int err;
+
+	LOG_DBG("");
+
+	if (!conn || !ag || !channel) {
+		return -EINVAL;
+	}
+
+	if (!bt_ag) {
+		return -EFAULT;
+	}
+
+	new_ag = hfp_ag_create(conn);
+	if (!new_ag) {
+		return -ECONNREFUSED;
+	}
+
+	err = bt_rfcomm_dlc_connect(conn, &new_ag->rfcomm_dlc, channel);
+	if (err != 0) {
+		(void)memset(new_ag, 0, sizeof(*new_ag));
+		*ag = NULL;
+	} else {
+		*ag = new_ag;
+		bt_hfp_ag_set_state(*ag, BT_HFP_CONNECTING);
 	}
+
+	return err;
 }
 
-static void hfp_ag_sco_connected(struct bt_sco_chan *chan)
+int bt_hfp_ag_disconnect(struct bt_hfp_ag *ag)
 {
-	struct bt_hfp_ag *ag = CONTAINER_OF(chan, struct bt_hfp_ag, sco_chan);
-	bt_hfp_call_state_t call_state;
+	LOG_DBG("");
 
-	hfp_ag_lock(ag);
-	call_state = ag->call_state;
-	hfp_ag_unlock(ag);
-	if (call_state == BT_HFP_CALL_INCOMING) {
-		bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_ALERTING);
-		bt_hfp_ag_call_ringing_cb(ag, true);
+	if (ag == NULL) {
+		return -EINVAL;
 	}
 
-	if ((bt_ag) && bt_ag->sco_connected) {
-		bt_ag->sco_connected(ag, chan->sco);
-	}
+	bt_hfp_ag_set_state(ag, BT_HFP_DISCONNECTING);
+
+	return bt_rfcomm_dlc_disconnect(&ag->rfcomm_dlc);
 }
 
-static void hfp_ag_sco_disconnected(struct bt_sco_chan *chan, uint8_t reason)
+static int hfp_ag_accept(struct bt_conn *conn, struct bt_rfcomm_server *server,
+			 struct bt_rfcomm_dlc **dlc)
 {
-	struct bt_hfp_ag *ag = CONTAINER_OF(chan, struct bt_hfp_ag, sco_chan);
-	bt_hfp_call_state_t call_state;
+	struct bt_hfp_ag *ag;
 
-	if ((bt_ag) && bt_ag->sco_disconnected) {
-		bt_ag->sco_disconnected(ag);
-	}
+	ag = hfp_ag_create(conn);
 
-	hfp_ag_lock(ag);
-	call_state = ag->call_state;
-	hfp_ag_unlock(ag);
-	if ((call_state == BT_HFP_CALL_INCOMING) || (call_state == BT_HFP_CALL_OUTGOING)) {
-		bt_hfp_ag_call_reject(ag, NULL);
+	if (!ag) {
+		return -ECONNREFUSED;
 	}
+
+	*dlc = &ag->rfcomm_dlc;
+
+	return 0;
 }
 
-static struct bt_conn *bt_hfp_ag_create_sco(struct bt_hfp_ag *ag)
+static int bt_hfp_ag_sco_accept(const struct bt_sco_accept_info *info,
+		struct bt_sco_chan **chan)
 {
-	struct bt_conn *sco_conn;
-
 	static struct bt_sco_chan_ops ops = {
 		.connected = hfp_ag_sco_connected,
 		.disconnected = hfp_ag_sco_disconnected,
 	};
+	size_t index;
+	struct bt_hfp_ag *ag;
 
-	LOG_DBG("");
+	LOG_DBG("conn %p", info->acl);
 
-	if (ag->sco_chan.sco == NULL) {
-		ag->sco_chan.ops = &ops;
+	index = (size_t)bt_conn_index(info->acl);
+	ag = &bt_hfp_ag_pool[index];
+	if (ag->acl_conn != info->acl) {
+		LOG_ERR("ACL %p of AG is unaligned with SCO's %p", ag->acl_conn, info->acl);
+		return -EINVAL;
+	}
 
-		/* create SCO connection*/
-		sco_conn = bt_conn_create_sco(&ag->acl_conn->br.dst, &ag->sco_chan);
-		if (sco_conn != NULL) {
-			LOG_DBG("Created sco %p", sco_conn);
-			bt_conn_unref(sco_conn);
-		}
-	} else {
-		sco_conn = ag->sco_chan.sco;
+	if (ag->sco_chan.sco) {
+		return -ECONNREFUSED;
 	}
 
-	return sco_conn;
+	ag->sco_chan.ops = &ops;
+
+	*chan = &ag->sco_chan;
+
+	return 0;
 }
 
-static int hfp_ag_open_sco(struct bt_hfp_ag *ag)
+static void hfp_ag_init(void)
 {
-	bool create_sco;
+	static struct bt_rfcomm_server chan = {
+		.channel = BT_RFCOMM_CHAN_HFP_AG,
+		.accept = hfp_ag_accept,
+	};
 
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_CREATING_SCO)) {
-		LOG_WRN("SCO connection is creating!");
-		return 0;
-	}
+	bt_rfcomm_server_register(&chan);
 
-	hfp_ag_lock(ag);
-	create_sco = (ag->sco_chan.sco == NULL) ? true : false;
-	if (create_sco) {
-		atomic_set_bit(ag->flags, BT_HFP_AG_CREATING_SCO);
-	}
-	hfp_ag_unlock(ag);
+	static struct bt_sco_server sco_server = {
+		.sec_level = BT_SECURITY_L0,
+		.accept = bt_hfp_ag_sco_accept,
+	};
 
-	if (create_sco) {
-		struct bt_conn *sco_conn = bt_hfp_ag_create_sco(ag);
+	bt_sco_server_register(&sco_server);
 
-		atomic_clear_bit(ag->flags, BT_HFP_AG_CREATING_SCO);
+	bt_sdp_register_service(&hfp_ag_rec);
+}
 
-		if (sco_conn == NULL) {
-			LOG_ERR("Fail to create sco connection!");
-			return -ENOTCONN;
-		}
+int bt_hfp_ag_register(struct bt_hfp_ag_cb *cb)
+{
+	if (!cb) {
+		return -EINVAL;
+	}
 
-		LOG_DBG("SCO connection created (%p)", sco_conn);
+	if (bt_ag) {
+		return -EALREADY;
 	}
 
+	bt_ag = cb;
+
+	hfp_ag_init();
+
 	return 0;
 }
 
-static int bt_hfp_ag_codec_select(struct bt_hfp_ag *ag)
+static void bt_hfp_ag_incoming_cb(struct bt_hfp_ag *ag, void *user_data)
 {
-	int err;
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
 
-	LOG_DBG("");
+	__ASSERT(call, "Invalid call object");
 
-	hfp_ag_lock(ag);
-	if (ag->selected_codec_id == 0) {
-		LOG_ERR("Codec is invalid");
-		hfp_ag_unlock(ag);
-		return -EINVAL;
-	}
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_INCOMING);
 
-	if (!(ag->hf_codec_ids & BIT(ag->selected_codec_id))) {
-		LOG_ERR("Codec is unsupported (codec id %d)", ag->selected_codec_id);
-		hfp_ag_unlock(ag);
-		return -EINVAL;
+	if (bt_ag && bt_ag->incoming) {
+		bt_ag->incoming(ag, call, call->number);
 	}
-	hfp_ag_unlock(ag);
 
-	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BCS:%d\r\n", ag->selected_codec_id);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
+		int err;
+
+		err = bt_hfp_ag_create_audio_connection(ag, call);
+		if (err) {
+			bt_hfp_ag_call_reject(ag, user_data);
+		}
+	} else {
+		bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ALERTING);
+		bt_hfp_ag_call_ringing_cb(call, false);
 	}
-	return err;
 }
 
-static int bt_hfp_ag_create_audio_connection(struct bt_hfp_ag *ag)
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+static void bt_hfp_ag_2nd_incoming_cb(struct bt_hfp_ag *ag, void *user_data)
 {
-	int err;
-	uint32_t hf_codec_ids;
+	struct bt_hfp_ag_call *call;
 
-	hfp_ag_lock(ag);
-	hf_codec_ids = ag->hf_codec_ids;
-	hfp_ag_unlock(ag);
+	call = (struct bt_hfp_ag_call *)user_data;
 
-	if ((hf_codec_ids != 0) && atomic_test_bit(ag->flags, BT_HFP_AG_CODEC_CHANGED)) {
-		atomic_set_bit(ag->flags, BT_HFP_AG_CODEC_CONN);
-		err = bt_hfp_ag_codec_select(ag);
-	} else {
-		err = hfp_ag_open_sco(ag);
+	__ASSERT(call, "Invalid call object");
+
+	if (bt_ag && bt_ag->incoming) {
+		bt_ag->incoming(ag, call, call->number);
 	}
 
-	return err;
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ALERTING);
 }
 
-static void bt_hfp_ag_audio_connection(struct bt_hfp_ag *ag, void *user_data)
+static void bt_hfp_ag_ccwa_cb(struct bt_hfp_ag *ag, void *user_data)
 {
 	int err;
 
-	err = bt_hfp_ag_create_audio_connection(ag);
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_INCOMING,
+				      bt_hfp_ag_2nd_incoming_cb, user_data);
 	if (err) {
-		bt_hfp_ag_unit_call_terminate(ag, user_data);
+		LOG_ERR("Fail to send call setup");
 	}
 }
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
 
-static void bt_hfp_ag_unit_call_accept(struct bt_hfp_ag *ag, void *user_data)
+int bt_hfp_ag_remote_incoming(struct bt_hfp_ag *ag, const char *number)
 {
-	int err;
-
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 1, bt_hfp_ag_accept_cb, user_data);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
-	}
-
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
-					bt_hfp_ag_audio_connection, user_data);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
-	}
-}
+	int err = 0;
+	size_t len;
+	struct bt_hfp_ag_call *call;
+	int call_count;
 
-static int bt_hfp_ag_ata_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
-{
-	int err;
+	LOG_DBG("");
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
+	if (ag == NULL) {
+		return -EINVAL;
 	}
 
 	hfp_ag_lock(ag);
-	if (ag->call_state != BT_HFP_CALL_ALERTING) {
+	if (ag->state != BT_HFP_CONNECTED) {
 		hfp_ag_unlock(ag);
-		return -ENOTSUP;
+		return -ENOTCONN;
 	}
 	hfp_ag_unlock(ag);
 
-	if (!atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
-		return -ENOTSUP;
+	len = strlen(number);
+	if ((len == 0) || (len > CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN)) {
+		return -EINVAL;
 	}
 
-	err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_accept, NULL);
-
-	return err;
-}
-
-static int bt_hfp_ag_cops_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
-{
-	int err;
-	uint32_t number;
-
-	if (is_char(buf, '=')) {
-		static const uint32_t command_line_prefix[] = {3, 0};
-
-		for (int i = 0; i < ARRAY_SIZE(command_line_prefix); i++) {
-			err = get_number(buf, &number);
-			if (err != 0) {
-				return -ENOTSUP;
-			}
+	call = get_call_from_number(ag, number, 0);
+	if (call) {
+		return -EBUSY;
+	}
 
-			if (command_line_prefix[i] != number) {
-				return -ENOTSUP;
-			}
+	call_count = get_none_released_calls(ag);
+	if (call_count) {
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+		if (!BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_3WAY_CALL,
+				    BT_HFP_AG_FEATURE_3WAY_CALL)) {
+			LOG_WRN("3 Way call feature is not supported on both sides");
+			return -ENOEXEC;
+		}
 
-			if (!is_char(buf, ',')) {
-				if (!is_char(buf, '\r')) {
-					return -ENOTSUP;
-				}
-			}
+		if (!atomic_test_bit(ag->flags, BT_HFP_AG_CCWA_ENABLE)) {
+			LOG_WRN("Call waiting notification is not enabled");
+			return -ENOTSUP;
 		}
 
-		atomic_set_bit(ag->flags, BT_HFP_AG_COPS_SET);
-		return 0;
+		if (!get_active_held_calls(ag)) {
+			LOG_WRN("The first call is not accepted");
+			return -EBUSY;
+		}
+#else
+		return -EBUSY;
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
 	}
 
-	if (!atomic_test_bit(ag->flags, BT_HFP_AG_COPS_SET)) {
-		return -ENOTSUP;
+	call = get_new_call(ag, number, 0);
+	if (!call) {
+		LOG_WRN("Cannot allocate a new call object");
+		return -ENOMEM;
 	}
 
-	if (!is_char(buf, '?')) {
-		return -ENOTSUP;
-	}
+	atomic_set_bit(call->flags, BT_HFP_AG_CALL_INCOMING);
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_INCOMING);
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+	if (call_count) {
+		atomic_set_bit(call->flags, BT_HFP_AG_CALL_INCOMING_3WAY);
+		err = hfp_ag_send_data(ag, bt_hfp_ag_ccwa_cb, call, "\r\n+CCWA:\"%s\",%d\r\n",
+				       call->number, call->type);
+		if (err) {
+			LOG_WRN("Fail to send call waiting notification");
+			free_call(call);
+		}
+
+		return err;
 	}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
 
-	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+COPS:%d,%d,\"%s\"\r\n", 0, 0, ag->operator);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_INCOMING,
+				      bt_hfp_ag_incoming_cb, call);
+	if (err) {
+		free_call(call);
 	}
 
 	return err;
 }
 
-static int bt_hfp_ag_bcc_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+int bt_hfp_ag_hold_incoming(struct bt_hfp_ag_call *call)
 {
-	int err;
+	int err = 0;
+	struct bt_hfp_ag *ag;
+	bt_hfp_call_state_t call_state;
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
-	}
+	LOG_DBG("");
 
-	hfp_ag_lock(ag);
-	if ((ag->selected_codec_id == 0) ||
-		(!(ag->hf_codec_ids & BIT(ag->selected_codec_id))) ||
-		(ag->call_state == BT_HFP_CALL_TERMINATE) ||
-		(ag->sco_chan.sco != NULL)) {
-		hfp_ag_unlock(ag);
-		return -ENOTSUP;
+	if (call == NULL) {
+		return -EINVAL;
 	}
-	hfp_ag_unlock(ag);
-
-	err = hfp_ag_next_step(ag, bt_hfp_ag_audio_connection, NULL);
-
-	return 0;
-}
 
-static void bt_hfp_ag_unit_codec_conn_setup(struct bt_hfp_ag *ag, void *user_data)
-{
-	int err = hfp_ag_open_sco(ag);
+	ag = call->ag;
 
-	if (err) {
-		bt_hfp_ag_call_reject(ag, user_data);
+	if (ag == NULL) {
+		return -EINVAL;
 	}
-}
-
-static int bt_hfp_ag_bcs_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
-{
-	int err;
-	uint32_t number;
 
-	if (!is_char(buf, '=')) {
-		return -ENOTSUP;
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
 	}
 
-	err = get_number(buf, &number);
-	if (err != 0) {
-		return -ENOTSUP;
-	}
+	call_state = call->call_state;
+	hfp_ag_unlock(ag);
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
+	if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+		return -EINVAL;
 	}
 
-	if (!atomic_test_bit(ag->flags, BT_HFP_AG_CODEC_CONN)) {
-		return -ESRCH;
+	if ((call_state == BT_HFP_CALL_ALERTING) || (call_state == BT_HFP_CALL_INCOMING)) {
+		atomic_set_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD);
+		err = hfp_ag_send_data(ag, btrh_held_cb, call, "\r\n+BTRH:%d\r\n",
+				       BT_HFP_BTRH_ON_HOLD);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+		return err;
 	}
 
-	hfp_ag_lock(ag);
-	if (ag->selected_codec_id != number) {
-		LOG_ERR("Received codec id %d is not aligned with selected %d",
-				number, ag->selected_codec_id);
-		err = -ENOTSUP;
-	} else if (!(ag->hf_codec_ids & BIT(ag->selected_codec_id))) {
-		LOG_ERR("Selected codec id %d is unsupported %d",
-				ag->selected_codec_id, ag->hf_codec_ids);
-		err = -ENOTSUP;
-	}
-	hfp_ag_unlock(ag);
+	return -EINVAL;
+}
 
-	atomic_clear_bit(ag->flags, BT_HFP_AG_CODEC_CONN);
-	atomic_clear_bit(ag->flags, BT_HFP_AG_CODEC_CHANGED);
+int bt_hfp_ag_reject(struct bt_hfp_ag_call *call)
+{
+	int err = 0;
+	struct bt_hfp_ag *ag;
+	bt_hfp_call_state_t call_state;
 
-	if (err == 0) {
-		err = hfp_ag_next_step(ag, bt_hfp_ag_unit_codec_conn_setup, NULL);
-	} else {
-		bt_hfp_call_state_t call_state;
+	LOG_DBG("");
 
-		hfp_ag_lock(ag);
-		call_state = ag->call_state;
-		hfp_ag_unlock(ag);
-		if (call_state != BT_HFP_CALL_TERMINATE) {
-			(void)hfp_ag_next_step(ag, bt_hfp_ag_unit_call_terminate, NULL);
-		}
+	if (call == NULL) {
+		return -EINVAL;
 	}
 
-	return err;
-}
+	ag = call->ag;
 
-static void bt_hfp_ag_unit_call_outgoing(struct bt_hfp_ag *ag, void *user_data)
-{
-	int err = bt_hfp_ag_outgoing(ag, ag->number);
+	if (ag == NULL) {
+		return -EINVAL;
+	}
 
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
 	}
-}
 
-static int bt_hfp_ag_atd_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
-{
-	int err;
-	char *number = NULL;
-	bool is_memory_dial = false;
-	size_t len;
+	call_state = call->call_state;
+	hfp_ag_unlock(ag);
 
-	if (buf->data[buf->len - 1] != '\r') {
-		return -ENOTSUP;
+	if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+		return -EINVAL;
 	}
 
-	if (is_char(buf, '>')) {
-		is_memory_dial = true;
+	if (!AG_SUPT_FEAT(ag, BT_HFP_AG_FEATURE_REJECT_CALL)) {
+		LOG_ERR("AG has not ability to reject call");
+		return -ENOTSUP;
 	}
 
-	if ((buf->len - 1) > CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN) {
-		return -ENAMETOOLONG;
-	}
+	if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_3WAY)) {
+		if ((call_state == BT_HFP_CALL_ALERTING) || (call_state == BT_HFP_CALL_INCOMING)) {
+			uint8_t call_setup;
 
-	buf->data[buf->len - 1] = '\0';
+			hfp_ag_lock(ag);
+			call_setup = ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND];
+			hfp_ag_unlock(ag);
 
-	if (is_memory_dial) {
-		if (bt_ag && bt_ag->memory_dial) {
-			err = bt_ag->memory_dial(ag, &buf->data[0], &number);
-			if ((err != 0) || (number == NULL)) {
-				return -ENOTSUP;
+			if (call_setup) {
+				err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
+							      BT_HFP_CALL_SETUP_NONE, NULL, NULL);
+				if (err) {
+					return err;
+				}
 			}
-		} else {
-			return -ENOTSUP;
+
+			ag_reject_call(call);
+
+			return 0;
 		}
-	} else {
-		number = &buf->data[0];
 	}
 
-	len = strlen(number);
-	if (len == 0) {
-		return -ENOTSUP;
-	}
+	if ((call_state == BT_HFP_CALL_ALERTING) || (call_state == BT_HFP_CALL_INCOMING)) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+					      bt_hfp_ag_reject_cb, call);
 
-	if (len > CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN) {
-		return -ENAMETOOLONG;
+		return err;
 	}
 
-	hfp_ag_lock(ag);
-	if (ag->call_state != BT_HFP_CALL_TERMINATE) {
-		hfp_ag_unlock(ag);
-		return -EBUSY;
+	if ((call_state == BT_HFP_CALL_ACTIVE) &&
+	    atomic_test_and_clear_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD)) {
+		err = hfp_ag_send_data(ag, btrh_reject_cb, call, "\r\n+BTRH:%d\r\n",
+				       BT_HFP_BTRH_REJECTED);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+		return err;
 	}
 
-	/* Copy number to ag->number including null-character */
-	memcpy(ag->number, number, len + 1);
-	hfp_ag_unlock(ag);
-
-	err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_outgoing, NULL);
-
-	return err;
+	return -EINVAL;
 }
 
-static int bt_hfp_ag_bldn_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
+int bt_hfp_ag_accept(struct bt_hfp_ag_call *call)
 {
-	int err;
+	int err = 0;
+	struct bt_hfp_ag *ag;
+	bt_hfp_call_state_t call_state;
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
+	LOG_DBG("");
+
+	if (call == NULL) {
+		return -EINVAL;
 	}
 
-	hfp_ag_lock(ag);
-	if (strlen(ag->number) == 0) {
-		hfp_ag_unlock(ag);
-		return -ENOSR;
+	ag = call->ag;
+
+	if (ag == NULL) {
+		return -EINVAL;
 	}
 
-	if (ag->call_state != BT_HFP_CALL_TERMINATE) {
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
 		hfp_ag_unlock(ag);
-		return -EBUSY;
+		return -ENOTCONN;
 	}
+
+	call_state = call->call_state;
 	hfp_ag_unlock(ag);
 
-	err = hfp_ag_next_step(ag, bt_hfp_ag_unit_call_outgoing, NULL);
+	if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+		return -EINVAL;
+	}
 
-	return err;
-}
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+	if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_3WAY)) {
+		if ((call_state == BT_HFP_CALL_ALERTING) || (call_state == BT_HFP_CALL_INCOMING)) {
+			return chld_deactivate_calls_and_accept_other_call(ag, false);
+		}
+	}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
 
-static int bt_hfp_ag_clip_handler(struct bt_hfp_ag *ag, struct net_buf *buf)
-{
-	int err;
-	uint32_t clip;
+	if (call_state == BT_HFP_CALL_ALERTING) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 1, bt_hfp_ag_accept_cb, call);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
 
-	err = get_number(buf, &clip);
-	if (err != 0) {
-		return -ENOTSUP;
-	}
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+					      bt_hfp_ag_call_setup_none_cb, call);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
 
-	if (!is_char(buf, '\r')) {
-		return -ENOTSUP;
+		return err;
 	}
 
-	if (clip > 1) {
-		return -ENOTSUP;
+	if (atomic_test_and_clear_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD) &&
+	    (call_state == BT_HFP_CALL_ACTIVE)) {
+		err = hfp_ag_send_data(ag, btrh_accept_cb, call, "\r\n+BTRH:%d\r\n",
+				       BT_HFP_BTRH_ACCEPTED);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+		return err;
 	}
 
-	atomic_set_bit_to(ag->flags, BT_HFP_AG_CLIP_ENABLE, clip == 1);
-
-	return err;
+	return -EINVAL;
 }
 
-static struct bt_hfp_ag_at_cmd_handler cmd_handlers[] = {
-	{"AT+BRSF", bt_hfp_ag_brsf_handler}, {"AT+BAC", bt_hfp_ag_bac_handler},
-	{"AT+CIND", bt_hfp_ag_cind_handler}, {"AT+CMER", bt_hfp_ag_cmer_handler},
-	{"AT+CHLD", bt_hfp_ag_chld_handler}, {"AT+BIND", bt_hfp_ag_bind_handler},
-	{"AT+CMEE", bt_hfp_ag_cmee_handler}, {"AT+CHUP", bt_hfp_ag_chup_handler},
-	{"AT+CLCC", bt_hfp_ag_clcc_handler}, {"AT+BIA", bt_hfp_ag_bia_handler},
-	{"ATA", bt_hfp_ag_ata_handler},      {"AT+COPS", bt_hfp_ag_cops_handler},
-	{"AT+BCC", bt_hfp_ag_bcc_handler},   {"AT+BCS", bt_hfp_ag_bcs_handler},
-	{"ATD", bt_hfp_ag_atd_handler},      {"AT+BLDN", bt_hfp_ag_bldn_handler},
-	{"AT+CLIP", bt_hfp_ag_clip_handler},
-};
-
-static void hfp_ag_connected(struct bt_rfcomm_dlc *dlc)
+int bt_hfp_ag_terminate(struct bt_hfp_ag_call *call)
 {
-	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
+	int err = 0;
+	struct bt_hfp_ag *ag;
+	bt_hfp_call_state_t call_state;
 
-	bt_hfp_ag_set_state(ag, BT_HFP_CONFIG);
+	LOG_DBG("");
 
-	LOG_DBG("AG %p", ag);
-}
+	if (call == NULL) {
+		return -EINVAL;
+	}
 
-static void hfp_ag_disconnected(struct bt_rfcomm_dlc *dlc)
-{
-	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
-	bt_hfp_call_state_t call_state;
-	sys_snode_t *node;
-	struct bt_ag_tx *tx;
+	ag = call->ag;
 
-	k_work_cancel_delayable(&ag->tx_work);
+	if (ag == NULL) {
+		return -EINVAL;
+	}
 
 	hfp_ag_lock(ag);
-	node = sys_slist_get(&ag->tx_pending);
-	hfp_ag_unlock(ag);
-	tx = CONTAINER_OF(node, struct bt_ag_tx, node);
-	while (tx) {
-		if (tx->buf && !atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
-			net_buf_unref(tx->buf);
-		}
-		tx->err = -ESHUTDOWN;
-		k_fifo_put(&ag_tx_notify, tx);
-		hfp_ag_lock(ag);
-		node = sys_slist_get(&ag->tx_pending);
+	if (ag->state != BT_HFP_CONNECTED) {
 		hfp_ag_unlock(ag);
-		tx = CONTAINER_OF(node, struct bt_ag_tx, node);
+		return -ENOTCONN;
 	}
 
-	bt_hfp_ag_set_state(ag, BT_HFP_DISCONNECTED);
-
-	hfp_ag_lock(ag);
-	call_state = ag->call_state;
+	call_state = call->call_state;
 	hfp_ag_unlock(ag);
-	if ((call_state == BT_HFP_CALL_ALERTING) || (call_state == BT_HFP_CALL_ACTIVE) ||
-	    (call_state == BT_HFP_CALL_HOLD)) {
-		bt_hfp_ag_terminate_cb(ag, NULL);
+
+	if (atomic_test_and_clear_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD) &&
+	    atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING) &&
+	    (call_state == BT_HFP_CALL_ACTIVE)) {
+		err = hfp_ag_send_data(ag, btrh_reject_cb, call, "\r\n+BTRH:%d\r\n",
+				       BT_HFP_BTRH_REJECTED);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+		return err;
 	}
 
-	LOG_DBG("AG %p", ag);
+	if ((call_state != BT_HFP_CALL_ACTIVE) && (call_state != BT_HFP_CALL_HOLD)) {
+		return -EINVAL;
+	}
+
+	ag_terminate_call(call);
+
+	return 0;
 }
 
-static void hfp_ag_recv(struct bt_rfcomm_dlc *dlc, struct net_buf *buf)
+int bt_hfp_ag_retrieve(struct bt_hfp_ag_call *call)
 {
-	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
-	uint8_t *data = buf->data;
-	uint16_t len = buf->len;
-	enum at_cme cme_err;
-	int err = -EOPNOTSUPP;
+	struct bt_hfp_ag *ag;
+	bt_hfp_call_state_t call_state;
 
-	LOG_HEXDUMP_DBG(data, len, "Received:");
+	LOG_DBG("");
 
-	for (uint32_t index = 0; index < ARRAY_SIZE(cmd_handlers); index++) {
-		if (strlen(cmd_handlers[index].cmd) > len) {
-			continue;
-		}
-		if (strncmp((char *)data, cmd_handlers[index].cmd,
-				 strlen(cmd_handlers[index].cmd)) != 0) {
-			continue;
-		}
-		if (NULL != cmd_handlers[index].handler) {
-			(void)net_buf_pull(buf, strlen(cmd_handlers[index].cmd));
-			err = cmd_handlers[index].handler(ag, buf);
-			LOG_DBG("AT commander is handled (err %d)", err);
-			break;
-		}
+	if (call == NULL) {
+		return -EINVAL;
 	}
 
-	if ((err != 0) && atomic_test_bit(ag->flags, BT_HFP_AG_CMEE_ENABLE)) {
-		cme_err = bt_hfp_ag_get_cme_err(err);
-		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CME ERROR:%d\r\n", (uint32_t)cme_err);
-	} else {
-		err = hfp_ag_send_data(ag, NULL, NULL, "\r\n%s\r\n", (err == 0) ? "OK" : "ERROR");
+	ag = call->ag;
+
+	if (ag == NULL) {
+		return -EINVAL;
 	}
 
-	if (err != 0) {
-		LOG_ERR("HFP AG send response err :(%d)", err);
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
 	}
-}
 
-static void bt_hfp_ag_thread(void *p1, void *p2, void *p3)
-{
-	struct bt_ag_tx *tx;
-	bt_hfp_ag_tx_cb_t cb;
-	struct bt_hfp_ag *ag;
-	void *user_data;
-	bt_hfp_state_t state;
-	int err;
+	call_state = call->call_state;
+	hfp_ag_unlock(ag);
 
-	while (true) {
-		tx = (struct bt_ag_tx *)k_fifo_get(&ag_tx_notify, K_FOREVER);
+	if (call_state != BT_HFP_CALL_HOLD) {
+		return -EINVAL;
+	}
 
-		if (tx == NULL) {
-			continue;
-		}
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ACTIVE);
 
-		cb = tx->cb;
-		ag = tx->ag;
-		user_data = tx->user_data;
-		err = tx->err;
+	if (bt_ag && bt_ag->retrieve) {
+		bt_ag->retrieve(call);
+	}
 
-		bt_ag_tx_free(tx);
+	ag_notify_call_held_ind(ag, NULL);
 
-		if (err < 0) {
-			hfp_ag_lock(ag);
-			state = ag->state;
-			hfp_ag_unlock(ag);
-			if ((state != BT_HFP_DISCONNECTED) && (state != BT_HFP_DISCONNECTING)) {
-				bt_hfp_ag_set_state(ag, BT_HFP_DISCONNECTING);
-				bt_rfcomm_dlc_disconnect(&ag->rfcomm_dlc);
-			}
-		}
+	return 0;
+}
+
+int bt_hfp_ag_hold(struct bt_hfp_ag_call *call)
+{
+	struct bt_hfp_ag *ag;
+	bt_hfp_call_state_t call_state;
+
+	LOG_DBG("");
 
-		if (cb) {
-			cb(ag, user_data);
-		}
+	if (call == NULL) {
+		return -EINVAL;
 	}
-}
 
-static void hfp_ag_sent(struct bt_rfcomm_dlc *dlc, int err)
-{
-	struct bt_hfp_ag *ag = CONTAINER_OF(dlc, struct bt_hfp_ag, rfcomm_dlc);
-	sys_snode_t *node;
-	struct bt_ag_tx *tx;
+	ag = call->ag;
+
+	if (ag == NULL) {
+		return -EINVAL;
+	}
 
 	hfp_ag_lock(ag);
-	/* Clear the tx ongoing flag */
-	if (!atomic_test_and_clear_bit(ag->flags, BT_HFP_AG_TX_ONGOING)) {
-		LOG_WRN("tx ongoing flag is not set");
+	if (ag->state != BT_HFP_CONNECTED) {
 		hfp_ag_unlock(ag);
-		return;
+		return -ENOTCONN;
 	}
 
-	node = sys_slist_get(&ag->tx_pending);
+	call_state = call->call_state;
 	hfp_ag_unlock(ag);
-	if (!node) {
-		LOG_ERR("No pending tx");
-		return;
+
+	if (call_state != BT_HFP_CALL_ACTIVE) {
+		return -EINVAL;
 	}
 
-	tx = CONTAINER_OF(node, struct bt_ag_tx, node);
-	LOG_ERR("Completed pending tx %p", tx);
+	if ((call_state == BT_HFP_CALL_ACTIVE) &&
+	    (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING_HELD))) {
+		return -EINVAL;
+	}
 
-	/* Restart the tx work */
-	k_work_reschedule(&ag->tx_work, K_NO_WAIT);
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_HOLD);
 
-	tx->err = err;
-	k_fifo_put(&ag_tx_notify, tx);
+	if (bt_ag && bt_ag->held) {
+		bt_ag->held(call);
+	}
+
+	ag_notify_call_held_ind(ag, NULL);
+
+	return 0;
 }
 
-static void bt_ag_deferred_work_cb(struct bt_hfp_ag *ag, void *user_data)
+int bt_hfp_ag_outgoing(struct bt_hfp_ag *ag, const char *number)
 {
-	int err;
-	bt_hfp_call_state_t call_state;
-
 	LOG_DBG("");
 
+	if (ag == NULL) {
+		return -EINVAL;
+	}
+
 	hfp_ag_lock(ag);
-	call_state = ag->call_state;
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
+	}
 	hfp_ag_unlock(ag);
 
-	switch (call_state) {
-	case BT_HFP_CALL_TERMINATE:
-		break;
-	case BT_HFP_CALL_ACTIVE:
-		break;
-	case BT_HFP_CALL_HOLD:
-		break;
-	case BT_HFP_CALL_OUTGOING:
-		__fallthrough;
-	case BT_HFP_CALL_INCOMING:
-		__fallthrough;
-	case BT_HFP_CALL_ALERTING:
-		__fallthrough;
-	default:
-		if (ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND] &&
-		    ag->indicator_value[BT_HFP_AG_CALL_IND]) {
-			err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
-							BT_HFP_CALL_SETUP_NONE, NULL, NULL);
-			if (err) {
-				LOG_ERR("Fail to send indicator");
-				bt_hfp_ag_terminate_cb(ag, NULL);
-			} else {
-				err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0,
-								bt_hfp_ag_terminate_cb, NULL);
-				if (err) {
-					LOG_ERR("Fail to send indicator");
-					bt_hfp_ag_terminate_cb(ag, NULL);
-				}
-			}
-		} else if (ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND]) {
-			err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
-							BT_HFP_CALL_SETUP_NONE, bt_hfp_ag_reject_cb,
-							NULL);
-			if (err) {
-				LOG_ERR("Fail to send indicator");
-				bt_hfp_ag_terminate_cb(ag, NULL);
-			}
-		} else if (ag->indicator_value[BT_HFP_AG_CALL_IND]) {
-			err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0,
-							bt_hfp_ag_terminate_cb, NULL);
-			if (err) {
-				LOG_ERR("Fail to send indicator");
-				bt_hfp_ag_terminate_cb(ag, NULL);
-			}
-		}
-		break;
-	}
+	return bt_hfp_ag_outgoing_call(ag, number, 0);
 }
 
-static void bt_ag_deferred_work(struct k_work *work)
+static void bt_hfp_ag_ringing_cb(struct bt_hfp_ag *ag, void *user_data)
 {
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
-	struct bt_hfp_ag *ag = CONTAINER_OF(dwork, struct bt_hfp_ag, deferred_work);
+	struct bt_hfp_ag_call *call = (struct bt_hfp_ag_call *)user_data;
 
-	(void)hfp_ag_next_step(ag, bt_ag_deferred_work_cb, NULL);
+	bt_hfp_ag_set_call_state(call, BT_HFP_CALL_ALERTING);
+
+	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
+		bt_hfp_ag_call_ringing_cb(call, true);
+	} else {
+		bt_hfp_ag_call_ringing_cb(call, false);
+	}
 }
 
-static void bt_ag_ringing_work_cb(struct bt_hfp_ag *ag, void *user_data)
+int bt_hfp_ag_remote_ringing(struct bt_hfp_ag_call *call)
 {
-	int err;
-	bt_hfp_call_state_t call_state;
+	int err = 0;
+	struct bt_hfp_ag *ag;
 
 	LOG_DBG("");
 
-	hfp_ag_lock(ag);
-	call_state = ag->call_state;
-	hfp_ag_unlock(ag);
-	if (call_state == BT_HFP_CALL_ALERTING) {
+	if (call == NULL) {
+		return -EINVAL;
+	}
 
-		if (!atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
-			return;
-		}
+	ag = call->ag;
 
-		k_work_reschedule(&ag->ringing_work,
-				  K_SECONDS(CONFIG_BT_HFP_AG_RING_NOTIFY_INTERVAL));
+	if (ag == NULL) {
+		return -EINVAL;
+	}
 
-		err = hfp_ag_send_data(ag, NULL, NULL, "\r\nRING\r\n");
-		if (err) {
-			LOG_ERR("Fail to send RING %d", err);
-		} else {
-			if (atomic_test_bit(ag->flags, BT_HFP_AG_CLIP_ENABLE)) {
-				err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+CLIP:\"%s\",%d\r\n",
-							 ag->number, 0);
-				if (err) {
-					LOG_ERR("Fail to send CLIP %d", err);
-				}
-			}
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
+	}
+
+	if (call->call_state != BT_HFP_CALL_OUTGOING) {
+		hfp_ag_unlock(ag);
+		return -EBUSY;
+	}
+
+	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
+		if (ag->sco_chan.sco == NULL) {
+			hfp_ag_unlock(ag);
+			return -ENOTCONN;
 		}
 	}
-}
+	hfp_ag_unlock(ag);
 
-static void bt_ag_ringing_work(struct k_work *work)
-{
-	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
-	struct bt_hfp_ag *ag = CONTAINER_OF(dwork, struct bt_hfp_ag, ringing_work);
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
+				      BT_HFP_CALL_SETUP_REMOTE_ALERTING, bt_hfp_ag_ringing_cb,
+				      call);
 
-	(void)hfp_ag_next_step(ag, bt_ag_ringing_work_cb, NULL);
+	return err;
 }
 
-int bt_hfp_ag_connect(struct bt_conn *conn, struct bt_hfp_ag **ag, uint8_t channel)
+int bt_hfp_ag_remote_reject(struct bt_hfp_ag_call *call)
 {
-	int i;
 	int err;
-
-	static struct bt_rfcomm_dlc_ops ops = {
-		.connected = hfp_ag_connected,
-		.disconnected = hfp_ag_disconnected,
-		.recv = hfp_ag_recv,
-		.sent = hfp_ag_sent,
-	};
+	struct bt_hfp_ag *ag;
 
 	LOG_DBG("");
 
-	if (ag == NULL) {
+	if (call == NULL) {
 		return -EINVAL;
 	}
 
-	*ag = NULL;
+	ag = call->ag;
 
-	if (ag_thread_id == NULL) {
+	if (ag == NULL) {
+		return -EINVAL;
+	}
 
-		k_fifo_init(&ag_tx_free);
-		k_fifo_init(&ag_tx_notify);
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
+	}
 
-		for (i = 0; i < ARRAY_SIZE(ag_tx); i++) {
-			k_fifo_put(&ag_tx_free, &ag_tx[i]);
-		}
+	if ((call->call_state != BT_HFP_CALL_ALERTING) &&
+	    (call->call_state != BT_HFP_CALL_OUTGOING)) {
+		hfp_ag_unlock(ag);
+		return -EINVAL;
+	}
+	hfp_ag_unlock(ag);
 
-		ag_thread_id = k_thread_create(
-			&ag_thread, ag_thread_stack, K_KERNEL_STACK_SIZEOF(ag_thread_stack),
-			bt_hfp_ag_thread, NULL, NULL, NULL,
-			K_PRIO_COOP(CONFIG_BT_HFP_AG_THREAD_PRIO), 0, K_NO_WAIT);
-		if (ag_thread_id == NULL) {
-			return -ENOMEM;
-		}
-		k_thread_name_set(ag_thread_id, "HFP AG");
+	if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+		return -EINVAL;
 	}
 
-	for (i = 0; i < ARRAY_SIZE(bt_hfp_ag_pool); i++) {
-		struct bt_hfp_ag *_ag = &bt_hfp_ag_pool[i];
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+				      bt_hfp_ag_reject_cb, call);
 
-		if (_ag->rfcomm_dlc.session) {
-			continue;
-		}
+	return err;
+}
+
+int bt_hfp_ag_remote_accept(struct bt_hfp_ag_call *call)
+{
+	int err;
+	struct bt_hfp_ag *ag;
 
-		(void)memset(_ag, 0, sizeof(struct bt_hfp_ag));
+	LOG_DBG("");
 
-		sys_slist_init(&_ag->tx_pending);
+	if (call == NULL) {
+		return -EINVAL;
+	}
 
-		k_sem_init(&_ag->lock, 1, 1);
+	ag = call->ag;
 
-		_ag->rfcomm_dlc.ops = &ops;
-		_ag->rfcomm_dlc.mtu = BT_HFP_MAX_MTU;
+	if (ag == NULL) {
+		return -EINVAL;
+	}
 
-		/* Set the supported features*/
-		_ag->ag_features = BT_HFP_AG_SUPPORTED_FEATURES;
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
+	}
 
-		/* If supported codec ids cannot be notified, disable codec negotiation. */
-		if (!(bt_ag && bt_ag->codec)) {
-			_ag->ag_features &= ~BT_HFP_AG_FEATURE_CODEC_NEG;
-		}
+	if (call->call_state != BT_HFP_CALL_ALERTING) {
+		hfp_ag_unlock(ag);
+		return -EINVAL;
+	}
+	hfp_ag_unlock(ag);
 
-		_ag->hf_features = 0;
-		_ag->hf_codec_ids = 0;
+	if (atomic_test_bit(call->flags, BT_HFP_AG_CALL_INCOMING)) {
+		return -EINVAL;
+	}
 
-		_ag->acl_conn = conn;
+	if (!atomic_test_bit(call->flags, BT_HFP_AG_CALL_OUTGOING_3WAY)) {
+		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 1, bt_hfp_ag_accept_cb, call);
+		if (err) {
+			LOG_ERR("Fail to send err :(%d)", err);
+		}
+	}
 
-		/* Set AG indicator value */
-		_ag->indicator_value[BT_HFP_AG_SERVICE_IND] = 0;
-		_ag->indicator_value[BT_HFP_AG_CALL_IND] = 0;
-		_ag->indicator_value[BT_HFP_AG_CALL_SETUP_IND] = 0;
-		_ag->indicator_value[BT_HFP_AG_CALL_HELD_IND] = 0;
-		_ag->indicator_value[BT_HFP_AG_SIGNAL_IND] = 0;
-		_ag->indicator_value[BT_HFP_AG_ROAM_IND] = 0;
-		_ag->indicator_value[BT_HFP_AG_BATTERY_IND] = 0;
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
+				      bt_hfp_ag_call_setup_none_cb, call);
+	if (err) {
+		LOG_ERR("Fail to send err :(%d)", err);
+	}
 
-		/* Set AG indicator status */
-		_ag->indicator = BIT(BT_HFP_AG_SERVICE_IND) | BIT(BT_HFP_AG_CALL_IND) |
-				 BIT(BT_HFP_AG_CALL_SETUP_IND) | BIT(BT_HFP_AG_CALL_HELD_IND) |
-				 BIT(BT_HFP_AG_SIGNAL_IND) | BIT(BT_HFP_AG_ROAM_IND) |
-				 BIT(BT_HFP_AG_BATTERY_IND);
+	return err;
+}
 
-		/* Set AG operator */
-		memcpy(_ag->operator, "UNKNOWN", sizeof("UNKNOWN"));
+int bt_hfp_ag_remote_terminate(struct bt_hfp_ag_call *call)
+{
+	struct bt_hfp_ag *ag;
 
-		/* Set Codec ID*/
-		_ag->selected_codec_id = BT_HFP_AG_CODEC_CVSD;
+	LOG_DBG("");
 
-		/* Init delay work */
-		k_work_init_delayable(&_ag->deferred_work, bt_ag_deferred_work);
+	if (call == NULL) {
+		return -EINVAL;
+	}
 
-		k_work_init_delayable(&_ag->ringing_work, bt_ag_ringing_work);
+	ag = call->ag;
 
-		k_work_init_delayable(&_ag->tx_work, bt_ag_tx_work);
+	if (ag == NULL) {
+		return -EINVAL;
+	}
 
-		atomic_set_bit(_ag->flags, BT_HFP_AG_CODEC_CHANGED);
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
+	}
 
-		*ag = _ag;
+	if ((call->call_state != BT_HFP_CALL_ACTIVE) && (call->call_state != BT_HFP_CALL_HOLD)) {
+		hfp_ag_unlock(ag);
+		return -EINVAL;
 	}
+	hfp_ag_unlock(ag);
 
-	if (*ag == NULL) {
-		return -ENOMEM;
+	ag_terminate_call(call);
+
+	return 0;
+}
+
+int bt_hfp_ag_explicit_call_transfer(struct bt_hfp_ag *ag)
+{
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+	if (ag == NULL) {
+		return -EINVAL;
 	}
 
-	err = bt_rfcomm_dlc_connect(conn, &(*ag)->rfcomm_dlc, channel);
-	if (err != 0) {
-		(void)memset(*ag, 0, sizeof(struct bt_hfp_ag));
-		*ag = NULL;
-	} else {
-		bt_hfp_ag_set_state(*ag, BT_HFP_CONNECTING);
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
 	}
+	hfp_ag_unlock(ag);
 
-	return err;
+	return chld_drop_conversation(ag);
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
 }
 
-int bt_hfp_ag_disconnect(struct bt_hfp_ag *ag)
+int bt_hfp_ag_set_indicator(struct bt_hfp_ag *ag, enum bt_hfp_ag_indicator index, uint8_t value)
 {
 	int err;
-	bt_hfp_call_state_t call_state;
 
 	LOG_DBG("");
 
@@ -1844,70 +4446,62 @@ int bt_hfp_ag_disconnect(struct bt_hfp_ag *ag)
 	}
 
 	hfp_ag_lock(ag);
-	call_state = ag->call_state;
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
+	}
 	hfp_ag_unlock(ag);
 
-	bt_hfp_ag_set_state(ag, BT_HFP_DISCONNECTING);
-
-	if ((call_state == BT_HFP_CALL_ACTIVE) || (call_state == BT_HFP_CALL_HOLD)) {
-		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, bt_hfp_ag_terminate_cb,
-					      NULL);
-		if (err != 0) {
-			LOG_ERR("HFP AG send response err :(%d)", err);
-		}
-		return err;
-	} else if (call_state != BT_HFP_CALL_TERMINATE) {
-		err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
-					      bt_hfp_ag_reject_cb, NULL);
-		if (err != 0) {
-			LOG_ERR("HFP AG send response err :(%d)", err);
+	switch (index) {
+	case BT_HFP_AG_SERVICE_IND:
+	case BT_HFP_AG_SIGNAL_IND:
+	case BT_HFP_AG_ROAM_IND:
+	case BT_HFP_AG_BATTERY_IND:
+		if ((ag_ind[(uint8_t)index].min > value) || (ag_ind[(uint8_t)index].max < value)) {
+			return -EINVAL;
 		}
-		return err;
+		break;
+	case BT_HFP_AG_CALL_IND:
+	case BT_HFP_AG_CALL_SETUP_IND:
+	case BT_HFP_AG_CALL_HELD_IND:
+	default:
+		return -EINVAL;
 	}
 
-	return bt_rfcomm_dlc_disconnect(&ag->rfcomm_dlc);
+	err = hfp_ag_update_indicator(ag, index, value, NULL, NULL);
+
+	return err;
 }
 
-int bt_hfp_ag_register(struct bt_hfp_ag_cb *cb)
+int bt_hfp_ag_set_operator(struct bt_hfp_ag *ag, uint8_t mode, char *name)
 {
-	if (!cb) {
+	int len;
+
+	LOG_DBG("");
+
+	if (ag == NULL) {
 		return -EINVAL;
 	}
 
-	if (bt_ag) {
-		return -EALREADY;
+	hfp_ag_lock(ag);
+	if (ag->state != BT_HFP_CONNECTED) {
+		hfp_ag_unlock(ag);
+		return -ENOTCONN;
 	}
 
-	bt_ag = cb;
+	len = strlen(name);
+	len = MIN(sizeof(ag->operator) - 1, len);
+	memcpy(ag->operator, name, len);
+	ag->operator[len] = '\0';
+	ag->mode = mode;
+	hfp_ag_unlock(ag);
 
 	return 0;
 }
 
-static void bt_hfp_ag_incoming_cb(struct bt_hfp_ag *ag, void *user_data)
-{
-	bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_INCOMING);
-
-	if (bt_ag && bt_ag->incoming) {
-		bt_ag->incoming(ag, ag->number);
-	}
-
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
-		int err;
-
-		err = bt_hfp_ag_create_audio_connection(ag);
-		if (err) {
-			bt_hfp_ag_call_reject(ag, NULL);
-		}
-	} else {
-		bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_ALERTING);
-		bt_hfp_ag_call_ringing_cb(ag, false);
-	}
-}
-
-int bt_hfp_ag_remote_incoming(struct bt_hfp_ag *ag, const char *number)
+int bt_hfp_ag_audio_connect(struct bt_hfp_ag *ag, uint8_t id)
 {
-	int err = 0;
-	size_t len;
+	int err;
 
 	LOG_DBG("");
 
@@ -1921,34 +4515,42 @@ int bt_hfp_ag_remote_incoming(struct bt_hfp_ag *ag, const char *number)
 		return -ENOTCONN;
 	}
 
-	if (ag->call_state != BT_HFP_CALL_TERMINATE) {
+	if (ag->hf_codec_ids) {
+		if (!(ag->hf_codec_ids & BIT(id))) {
+			hfp_ag_unlock(ag);
+			return -EINVAL;
+		}
+	} else {
+		if (id != BT_HFP_AG_CODEC_CVSD) {
+			hfp_ag_unlock(ag);
+			return -ENOTSUP;
+		}
+	}
+
+	if (ag->sco_chan.sco) {
+		LOG_ERR("Audio conenction has been connected");
 		hfp_ag_unlock(ag);
-		return -EBUSY;
+		return -ECONNREFUSED;
 	}
 	hfp_ag_unlock(ag);
 
-	len = strlen(number);
-	if ((len == 0) || (len > CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN)) {
-		return -EINVAL;
+	if (atomic_test_bit(ag->flags, BT_HFP_AG_CODEC_CONN)) {
+		return -EBUSY;
 	}
 
 	hfp_ag_lock(ag);
-	/* Copy number to ag->number including null-character */
-	memcpy(ag->number, number, len + 1);
+	if (ag->selected_codec_id != id) {
+		atomic_set_bit(ag->flags, BT_HFP_AG_CODEC_CHANGED);
+	}
+	ag->selected_codec_id = id;
 	hfp_ag_unlock(ag);
 
-	atomic_set_bit(ag->flags, BT_HFP_AG_INCOMING_CALL);
-
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_INCOMING,
-					bt_hfp_ag_incoming_cb, NULL);
-	if (err != 0) {
-		atomic_clear_bit(ag->flags, BT_HFP_AG_INCOMING_CALL);
-	}
+	err = bt_hfp_ag_create_audio_connection(ag, NULL);
 
 	return err;
 }
 
-int bt_hfp_ag_reject(struct bt_hfp_ag *ag)
+int bt_hfp_ag_vgm(struct bt_hfp_ag *ag, uint8_t vgm)
 {
 	int err;
 
@@ -1958,29 +4560,32 @@ int bt_hfp_ag_reject(struct bt_hfp_ag *ag)
 		return -EINVAL;
 	}
 
+	if (vgm > BT_HFP_HF_VGM_GAIN_MAX) {
+		LOG_ERR("Invalid VGM (%d>%d)", vgm, BT_HFP_HF_VGM_GAIN_MAX);
+		return -EINVAL;
+	}
+
 	hfp_ag_lock(ag);
 	if (ag->state != BT_HFP_CONNECTED) {
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
-
-	if ((ag->call_state != BT_HFP_CALL_ALERTING) && (ag->call_state != BT_HFP_CALL_INCOMING)) {
-		hfp_ag_unlock(ag);
-		return -EINVAL;
-	}
 	hfp_ag_unlock(ag);
 
-	if (!atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
-		return -EINVAL;
+	if (!HF_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_VOLUME)) {
+		LOG_ERR("Remote Audio Volume Control is unsupported");
+		return -ENOTSUP;
 	}
 
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
-					bt_hfp_ag_reject_cb, NULL);
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+VGM=%d\r\n", vgm);
+	if (err) {
+		LOG_ERR("Fail to notify vgm err :(%d)", err);
+	}
 
 	return err;
 }
 
-int bt_hfp_ag_accept(struct bt_hfp_ag *ag)
+int bt_hfp_ag_vgs(struct bt_hfp_ag *ag, uint8_t vgs)
 {
 	int err;
 
@@ -1990,37 +4595,32 @@ int bt_hfp_ag_accept(struct bt_hfp_ag *ag)
 		return -EINVAL;
 	}
 
+	if (vgs > BT_HFP_HF_VGS_GAIN_MAX) {
+		LOG_ERR("Invalid VGM (%d>%d)", vgs, BT_HFP_HF_VGS_GAIN_MAX);
+		return -EINVAL;
+	}
+
 	hfp_ag_lock(ag);
 	if (ag->state != BT_HFP_CONNECTED) {
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
-
-	if (ag->call_state != BT_HFP_CALL_ALERTING) {
-		hfp_ag_unlock(ag);
-		return -EINVAL;
-	}
 	hfp_ag_unlock(ag);
 
-	if (!atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
-		return -EINVAL;
-	}
-
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 1, bt_hfp_ag_accept_cb, NULL);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+	if (!HF_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_VOLUME)) {
+		LOG_ERR("Remote Audio Volume Control is unsupported");
+		return -ENOTSUP;
 	}
 
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
-					bt_hfp_ag_audio_connection, NULL);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+VGS=%d\r\n", vgs);
+	if (err) {
+		LOG_ERR("Fail to notify vgs err :(%d)", err);
 	}
 
 	return err;
 }
 
-int bt_hfp_ag_terminate(struct bt_hfp_ag *ag)
+int bt_hfp_ag_inband_ringtone(struct bt_hfp_ag *ag, bool inband)
 {
 	int err;
 
@@ -2035,40 +4635,24 @@ int bt_hfp_ag_terminate(struct bt_hfp_ag *ag)
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
-
-	if ((ag->call_state != BT_HFP_CALL_ACTIVE) && (ag->call_state != BT_HFP_CALL_HOLD)) {
-		hfp_ag_unlock(ag);
-		return -EINVAL;
-	}
 	hfp_ag_unlock(ag);
 
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, bt_hfp_ag_terminate_cb, NULL);
-
-	return err;
-}
-
-static void bt_hfp_ag_outgoing_cb(struct bt_hfp_ag *ag, void *user_data)
-{
-	bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_OUTGOING);
-
-	if (bt_ag && bt_ag->outgoing) {
-		bt_ag->outgoing(ag, ag->number);
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BSIR=%d\r\n", inband ? 1 : 0);
+	if (err) {
+		LOG_ERR("Fail to set inband ringtone err :(%d)", err);
+		return err;
 	}
 
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
-		int err;
-
-		err = bt_hfp_ag_create_audio_connection(ag);
-		if (err) {
-			bt_hfp_ag_call_reject(ag, NULL);
-		}
-	}
+	atomic_set_bit_to(ag->flags, BT_HFP_AG_INBAND_RING, inband);
+	return 0;
 }
 
-int bt_hfp_ag_outgoing(struct bt_hfp_ag *ag, const char *number)
+int bt_hfp_ag_voice_recognition(struct bt_hfp_ag *ag, bool activate)
 {
-	int err = 0;
-	size_t len;
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG)
+	int err;
+	bool feature;
+	char *bvra;
 
 	LOG_DBG("");
 
@@ -2081,45 +4665,43 @@ int bt_hfp_ag_outgoing(struct bt_hfp_ag *ag, const char *number)
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
-
-	if (ag->call_state != BT_HFP_CALL_TERMINATE) {
-		hfp_ag_unlock(ag);
-		return -EBUSY;
-	}
 	hfp_ag_unlock(ag);
 
-	len = strlen(number);
-	if ((len == 0) || (len > CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN)) {
-		return -EINVAL;
+	if (activate && atomic_test_bit(ag->flags, BT_HFP_AG_VRE_ACTIVATE)) {
+		LOG_WRN("VR has been activated");
+		return -ENOTSUP;
+	} else if (!activate && !atomic_test_bit(ag->flags, BT_HFP_AG_VRE_ACTIVATE)) {
+		LOG_WRN("VR is not activated");
+		return -ENOTSUP;
 	}
 
-	hfp_ag_lock(ag);
-	/* Copy number to ag->number including null-character */
-	memcpy(ag->number, number, len + 1);
-	hfp_ag_unlock(ag);
-
-	atomic_clear_bit(ag->flags, BT_HFP_AG_INCOMING_CALL);
-
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_OUTGOING,
-					bt_hfp_ag_outgoing_cb, NULL);
-
-	return err;
-}
-
-static void bt_hfp_ag_ringing_cb(struct bt_hfp_ag *ag, void *user_data)
-{
-	bt_hfp_ag_set_call_state(ag, BT_HFP_CALL_ALERTING);
-
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
-		bt_hfp_ag_call_ringing_cb(ag, true);
+	feature = BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_ENH_VOICE_RECG,
+				 BT_HFP_AG_FEATURE_ENH_VOICE_RECG);
+	if (!feature) {
+		bvra = "";
 	} else {
-		bt_hfp_ag_call_ringing_cb(ag, false);
+		bvra = ",0";
+	}
+
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BVRA:%d%s\r\n", activate, bvra);
+	if (err) {
+		LOG_ERR("Fail to notify VR activation :(%d)", err);
+		return err;
 	}
+
+	atomic_set_bit_to(ag->flags, BT_HFP_AG_VRE_ACTIVATE, activate);
+	atomic_clear_bit(ag->flags, BT_HFP_AG_VRE_R2A);
+	return 0;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG */
 }
 
-int bt_hfp_ag_remote_ringing(struct bt_hfp_ag *ag)
+int bt_hfp_ag_vre_state(struct bt_hfp_ag *ag, uint8_t state)
 {
-	int err = 0;
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+	int err;
+	bool feature;
 
 	LOG_DBG("");
 
@@ -2132,30 +4714,43 @@ int bt_hfp_ag_remote_ringing(struct bt_hfp_ag *ag)
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
+	hfp_ag_unlock(ag);
 
-	if (ag->call_state != BT_HFP_CALL_OUTGOING) {
-		hfp_ag_unlock(ag);
-		return -EBUSY;
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_VRE_ACTIVATE)) {
+		LOG_WRN("Voice Recognition is not activated");
+		return -EINVAL;
 	}
 
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_INBAND_RING)) {
-		if (ag->sco_chan.sco == NULL) {
-			hfp_ag_unlock(ag);
-			return -ENOTCONN;
-		}
+	feature = BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_ENH_VOICE_RECG,
+				 BT_HFP_AG_FEATURE_ENH_VOICE_RECG);
+	if (!feature) {
+		return -ENOTSUP;
 	}
-	hfp_ag_unlock(ag);
 
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND,
-					BT_HFP_CALL_SETUP_REMOTE_ALERTING, bt_hfp_ag_ringing_cb,
-					NULL);
+	if ((state & BT_HFP_BVRA_STATE_SEND_AUDIO) &&
+		!atomic_test_bit(ag->flags, BT_HFP_AG_VRE_R2A)) {
+		LOG_ERR("HFP HF is not ready to accept audio input");
+		return -EINVAL;
+	}
 
-	return err;
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BVRA:1,%d\r\n", state);
+	if (err) {
+		LOG_ERR("Fail to send state of VRE :(%d)", err);
+		return err;
+	}
+
+	return 0;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
 }
 
-int bt_hfp_ag_remote_reject(struct bt_hfp_ag *ag)
+int bt_hfp_ag_vre_textual_representation(struct bt_hfp_ag *ag, uint8_t state, const char *id,
+					 uint8_t type, uint8_t operation, const char *text)
 {
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG_TEXT)
 	int err;
+	bool feature;
 
 	LOG_DBG("");
 
@@ -2168,24 +4763,45 @@ int bt_hfp_ag_remote_reject(struct bt_hfp_ag *ag)
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
+	hfp_ag_unlock(ag);
 
-	if ((ag->call_state != BT_HFP_CALL_ALERTING) && (ag->call_state != BT_HFP_CALL_OUTGOING)) {
-		hfp_ag_unlock(ag);
+	if (!atomic_test_bit(ag->flags, BT_HFP_AG_VRE_ACTIVATE)) {
+		LOG_WRN("Voice Recognition is not activated");
 		return -EINVAL;
 	}
-	hfp_ag_unlock(ag);
 
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
+	feature = BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_ENH_VOICE_RECG,
+				 BT_HFP_AG_FEATURE_ENH_VOICE_RECG);
+	if (!feature) {
+		return -ENOTSUP;
+	}
+
+	feature = BOTH_SUPT_FEAT(ag, BT_HFP_HF_FEATURE_VOICE_RECG_TEXT,
+				 BT_HFP_AG_FEATURE_VOICE_RECG_TEXT);
+	if (!feature) {
+		return -ENOTSUP;
+	}
+
+	if ((state & BT_HFP_BVRA_STATE_SEND_AUDIO) &&
+		!atomic_test_bit(ag->flags, BT_HFP_AG_VRE_R2A)) {
+		LOG_ERR("HFP HF is not ready to accept audio input");
 		return -EINVAL;
 	}
 
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
-					bt_hfp_ag_reject_cb, NULL);
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BVRA:1,%d,%s,%d,%d,\"%s\"\r\n",
+		state, id, type, operation, text);
+	if (err) {
+		LOG_ERR("Fail to send state of VRE :(%d)", err);
+		return err;
+	}
 
-	return err;
+	return 0;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG_TEXT */
 }
 
-int bt_hfp_ag_remote_accept(struct bt_hfp_ag *ag)
+int bt_hfp_ag_signal_strength(struct bt_hfp_ag *ag, uint8_t strength)
 {
 	int err;
 
@@ -2200,32 +4816,18 @@ int bt_hfp_ag_remote_accept(struct bt_hfp_ag *ag)
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
-
-	if (ag->call_state != BT_HFP_CALL_ALERTING) {
-		hfp_ag_unlock(ag);
-		return -EINVAL;
-	}
 	hfp_ag_unlock(ag);
 
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_INCOMING_CALL)) {
-		return -EINVAL;
-	}
-
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 1, bt_hfp_ag_accept_cb, NULL);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
-	}
-
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_SETUP_IND, BT_HFP_CALL_SETUP_NONE,
-					bt_hfp_ag_audio_connection, NULL);
-	if (err != 0) {
-		LOG_ERR("Fail to send err :(%d)", err);
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_SIGNAL_IND, strength,
+						NULL, NULL);
+	if (err) {
+		LOG_ERR("Fail to set signal strength err :(%d)", err);
 	}
 
 	return err;
 }
 
-int bt_hfp_ag_remote_terminate(struct bt_hfp_ag *ag)
+int bt_hfp_ag_roaming_status(struct bt_hfp_ag *ag, uint8_t status)
 {
 	int err;
 
@@ -2240,19 +4842,18 @@ int bt_hfp_ag_remote_terminate(struct bt_hfp_ag *ag)
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
-
-	if ((ag->call_state != BT_HFP_CALL_ACTIVE) && (ag->call_state != BT_HFP_CALL_HOLD)) {
-		hfp_ag_unlock(ag);
-		return -EINVAL;
-	}
 	hfp_ag_unlock(ag);
 
-	err = hfp_ag_update_indicator(ag, BT_HFP_AG_CALL_IND, 0, bt_hfp_ag_terminate_cb, NULL);
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_ROAM_IND, status,
+						NULL, NULL);
+	if (err) {
+		LOG_ERR("Fail to set roaming status err :(%d)", err);
+	}
 
 	return err;
 }
 
-int bt_hfp_ag_set_indicator(struct bt_hfp_ag *ag, enum bt_hfp_ag_indicator index, uint8_t value)
+int bt_hfp_ag_battery_level(struct bt_hfp_ag *ag, uint8_t level)
 {
 	int err;
 
@@ -2269,36 +4870,18 @@ int bt_hfp_ag_set_indicator(struct bt_hfp_ag *ag, enum bt_hfp_ag_indicator index
 	}
 	hfp_ag_unlock(ag);
 
-	switch (index) {
-	case BT_HFP_AG_SERVICE_IND:
-		__fallthrough;
-	case BT_HFP_AG_SIGNAL_IND:
-		__fallthrough;
-	case BT_HFP_AG_ROAM_IND:
-		__fallthrough;
-	case BT_HFP_AG_BATTERY_IND:
-		if ((ag_ind[(uint8_t)index].min > value) || (ag_ind[(uint8_t)index].max < value)) {
-			return -EINVAL;
-		}
-		break;
-	case BT_HFP_AG_CALL_IND:
-		__fallthrough;
-	case BT_HFP_AG_CALL_SETUP_IND:
-		__fallthrough;
-	case BT_HFP_AG_CALL_HELD_IND:
-		__fallthrough;
-	default:
-		return -EINVAL;
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_BATTERY_IND, level,
+						NULL, NULL);
+	if (err) {
+		LOG_ERR("Fail to set battery level err :(%d)", err);
 	}
 
-	err = hfp_ag_update_indicator(ag, index, value, NULL, NULL);
-
 	return err;
 }
 
-int bt_hfp_ag_set_operator(struct bt_hfp_ag *ag, char *name)
+int bt_hfp_ag_service_availability(struct bt_hfp_ag *ag, bool available)
 {
-	int len;
+	int err;
 
 	LOG_DBG("");
 
@@ -2311,19 +4894,22 @@ int bt_hfp_ag_set_operator(struct bt_hfp_ag *ag, char *name)
 		hfp_ag_unlock(ag);
 		return -ENOTCONN;
 	}
-
-	len = strlen(name);
-	len = MIN(sizeof(ag->operator) - 1, len);
-	memcpy(ag->operator, name, len);
-	ag->operator[len] = '\0';
 	hfp_ag_unlock(ag);
 
-	return 0;
+	err = hfp_ag_update_indicator(ag, BT_HFP_AG_SERVICE_IND,
+		available ? 1 : 0, NULL, NULL);
+	if (err) {
+		LOG_ERR("Fail to set service availability err :(%d)", err);
+	}
+
+	return err;
 }
 
-int bt_hfp_ag_select_codec(struct bt_hfp_ag *ag, uint8_t id)
+int bt_hfp_ag_hf_indicator(struct bt_hfp_ag *ag, enum hfp_ag_hf_indicators indicator, bool enable)
 {
+#if defined(CONFIG_BT_HFP_AG_HF_INDICATORS)
 	int err;
+	uint32_t supported_indicators;
 
 	LOG_DBG("");
 
@@ -2337,23 +4923,30 @@ int bt_hfp_ag_select_codec(struct bt_hfp_ag *ag, uint8_t id)
 		return -ENOTCONN;
 	}
 
-	if (!(ag->hf_codec_ids && BIT(id))) {
-		hfp_ag_unlock(ag);
-		return -ENOTSUP;
-	}
+	supported_indicators = ag->hf_indicators_of_ag & ag->hf_indicators_of_hf;
 	hfp_ag_unlock(ag);
 
-	if (atomic_test_bit(ag->flags, BT_HFP_AG_CODEC_CONN)) {
-		return -EBUSY;
+	if (!(supported_indicators & BIT(indicator))) {
+		LOG_ERR("Unsupported indicator %d", indicator);
+		return -ENOTSUP;
 	}
 
 	hfp_ag_lock(ag);
-	ag->selected_codec_id = id;
+	if (enable) {
+		ag->hf_indicators |= BIT(indicator);
+	} else {
+		ag->hf_indicators &= ~BIT(indicator);
+	}
 	hfp_ag_unlock(ag);
 
-	atomic_set_bit(ag->flags, BT_HFP_AG_CODEC_CHANGED);
-
-	err = bt_hfp_ag_create_audio_connection(ag);
+	err = hfp_ag_send_data(ag, NULL, NULL, "\r\n+BIND:%d,%d\r\n",
+		indicator, enable ? 1  : 0);
+	if (err) {
+		LOG_ERR("Fail to update registration status of indicator:(%d)", err);
+	}
 
 	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
 }
diff --git a/subsys/bluetooth/host/classic/hfp_ag_internal.h b/subsys/bluetooth/host/classic/hfp_ag_internal.h
index 94191140da0a9..fb17595422b7a 100644
--- a/subsys/bluetooth/host/classic/hfp_ag_internal.h
+++ b/subsys/bluetooth/host/classic/hfp_ag_internal.h
@@ -9,31 +9,149 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "hfp_internal.h"
+
+#if defined(CONFIG_BT_HFP_AG_EXT_ERR)
+#define BT_HFP_AG_FEATURE_EXT_ERR_ENABLE BT_HFP_AG_FEATURE_EXT_ERR
+#else
+#define BT_HFP_AG_FEATURE_EXT_ERR_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_EXT_ERR */
+
+#if defined(CONFIG_BT_HFP_AG_CODEC_NEG)
+#define BT_HFP_AG_FEATURE_CODEC_NEG_ENABLE BT_HFP_AG_FEATURE_CODEC_NEG
+#else
+#define BT_HFP_AG_FEATURE_CODEC_NEG_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_CODEC_NEG */
+
+#if defined(CONFIG_BT_HFP_AG_ECNR)
+#define BT_HFP_AG_FEATURE_ECNR_ENABLE BT_HFP_AG_FEATURE_ECNR
+#define BT_HFP_AG_SDP_FEATURE_ECNR_ENABLE BT_HFP_AG_SDP_FEATURE_ECNR
+#else
+#define BT_HFP_AG_FEATURE_ECNR_ENABLE 0
+#define BT_HFP_AG_SDP_FEATURE_ECNR_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_CODEC_NEG */
+
+#if defined(CONFIG_BT_HFP_AG_ECS)
+#define BT_HFP_AG_FEATURE_ECS_ENABLE BT_HFP_AG_FEATURE_ECS
+#else
+#define BT_HFP_AG_FEATURE_ECS_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_ECS*/
+
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+#define BT_HFP_AG_FEATURE_3WAY_CALL_ENABLE BT_HFP_AG_FEATURE_3WAY_CALL
+#define BT_HFP_AG_SDP_FEATURE_3WAY_CALL_ENABLE BT_HFP_AG_SDP_FEATURE_3WAY_CALL
+#else
+#define BT_HFP_AG_FEATURE_3WAY_CALL_ENABLE 0
+#define BT_HFP_AG_SDP_FEATURE_3WAY_CALL_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+
+#if defined(CONFIG_BT_HFP_AG_ECC)
+#define BT_HFP_AG_FEATURE_ECC_ENABLE BT_HFP_AG_FEATURE_ECC
+#else
+#define BT_HFP_AG_FEATURE_ECC_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_ECC */
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG)
+#define BT_HFP_AG_FEATURE_VOICE_RECG_ENABLE BT_HFP_AG_FEATURE_VOICE_RECG
+#define BT_HFP_AG_SDP_FEATURE_VOICE_RECG_ENABLE BT_HFP_AG_SDP_FEATURE_VOICE_RECG
+#else
+#define BT_HFP_AG_FEATURE_VOICE_RECG_ENABLE 0
+#define BT_HFP_AG_SDP_FEATURE_VOICE_RECG_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG */
+
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+#define BT_HFP_AG_FEATURE_ENH_VOICE_RECG_ENABLE BT_HFP_AG_FEATURE_ENH_VOICE_RECG
+#define BT_HFP_AG_SDP_FEATURE_ENH_VOICE_RECG_ENABLE BT_HFP_AG_SDP_FEATURE_ENH_VOICE_RECG
+#else
+#define BT_HFP_AG_FEATURE_ENH_VOICE_RECG_ENABLE 0
+#define BT_HFP_AG_SDP_FEATURE_ENH_VOICE_RECG_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG_TEXT)
+#define BT_HFP_AG_FEATURE_VOICE_RECG_TEXT_ENABLE BT_HFP_AG_FEATURE_VOICE_RECG_TEXT
+#define BT_HFP_AG_SDP_FEATURE_VOICE_RECG_TEXT_ENABLE BT_HFP_AG_SDP_FEATURE_VOICE_RECG_TEXT
+#else
+#define BT_HFP_AG_FEATURE_VOICE_RECG_TEXT_ENABLE 0
+#define BT_HFP_AG_SDP_FEATURE_VOICE_RECG_TEXT_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG_TEXT */
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_TAG)
+#define BT_HFP_AG_FEATURE_VOICE_TAG_ENABLE BT_HFP_AG_FEATURE_VOICE_TAG
+#define BT_HFP_AG_SDP_FEATURE_VOICE_TAG_ENABLE BT_HFP_AG_SDP_FEATURE_VOICE_TAG
+#else
+#define BT_HFP_AG_FEATURE_VOICE_TAG_ENABLE 0
+#define BT_HFP_AG_SDP_FEATURE_VOICE_TAG_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_VOICE_TAG */
+
+#if defined(CONFIG_BT_HFP_AG_HF_INDICATORS)
+#define BT_HFP_AG_FEATURE_HF_IND_ENABLE BT_HFP_AG_FEATURE_HF_IND
+#else
+#define BT_HFP_AG_FEATURE_HF_IND_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+
+#if defined(CONFIG_BT_HFP_AG_REJECT_CALL)
+#define BT_HFP_AG_FEATURE_REJECT_CALL_ENABLE BT_HFP_AG_FEATURE_REJECT_CALL
+#else
+#define BT_HFP_AG_FEATURE_REJECT_CALL_ENABLE 0
+#endif /* CONFIG_BT_HFP_AG_REJECT_CALL */
+
 /* HFP AG Supported features */
-#define BT_HFP_AG_SUPPORTED_FEATURES (BT_HFP_AG_FEATURE_INBAND_RINGTONE | BT_HFP_AG_FEATURE_EXT_ERR)
+#define BT_HFP_AG_SUPPORTED_FEATURES (\
+	BT_HFP_AG_FEATURE_3WAY_CALL_ENABLE | \
+	BT_HFP_AG_FEATURE_INBAND_RINGTONE | \
+	BT_HFP_AG_FEATURE_EXT_ERR_ENABLE | \
+	BT_HFP_AG_FEATURE_CODEC_NEG_ENABLE | \
+	BT_HFP_AG_FEATURE_ECNR_ENABLE | \
+	BT_HFP_AG_FEATURE_ECS_ENABLE | \
+	BT_HFP_AG_FEATURE_ECC_ENABLE | \
+	BT_HFP_AG_FEATURE_VOICE_RECG_ENABLE | \
+	BT_HFP_AG_FEATURE_ENH_VOICE_RECG_ENABLE | \
+	BT_HFP_AG_FEATURE_VOICE_RECG_TEXT_ENABLE | \
+	BT_HFP_AG_FEATURE_VOICE_TAG_ENABLE | \
+	BT_HFP_AG_FEATURE_HF_IND_ENABLE | \
+	BT_HFP_AG_FEATURE_REJECT_CALL_ENABLE)
+
+/* HFP AG Supported features in SDP */
+#define BT_HFP_AG_SDP_SUPPORTED_FEATURES (\
+	BT_HFP_AG_SDP_FEATURE_3WAY_CALL_ENABLE | \
+	BT_HFP_AG_SDP_FEATURE_INBAND_RINGTONE | \
+	BT_HFP_AG_SDP_FEATURE_ECNR_ENABLE | \
+	BT_HFP_AG_SDP_FEATURE_VOICE_RECG_ENABLE | \
+	BT_HFP_AG_SDP_FEATURE_ENH_VOICE_RECG_ENABLE | \
+	BT_HFP_AG_SDP_FEATURE_VOICE_RECG_TEXT_ENABLE | \
+	BT_HFP_AG_SDP_FEATURE_VOICE_TAG_ENABLE)
 
 /* bt_hfp_ag flags: the flags defined here represent HFP AG parameters */
 enum {
 	BT_HFP_AG_CMEE_ENABLE,   /* Extended Audio Gateway Error Result Code */
 	BT_HFP_AG_CMER_ENABLE,   /* Indicator Events Reporting */
 	BT_HFP_AG_CLIP_ENABLE,   /* Calling Line Identification notification */
+	BT_HFP_AG_CCWA_ENABLE,   /* Call Waiting notification */
 	BT_HFP_AG_INBAND_RING,   /* In-band ring */
 	BT_HFP_AG_COPS_SET,      /* Query Operator selection */
-	BT_HFP_AG_INCOMING_CALL, /* Incoming call */
+	BT_HFP_AG_AUDIO_CONN,    /* Audio connection */
 	BT_HFP_AG_CODEC_CONN,    /* Codec connection is ongoing */
 	BT_HFP_AG_CODEC_CHANGED, /* Codec Id Changed */
 	BT_HFP_AG_TX_ONGOING,    /* TX is ongoing */
 	BT_HFP_AG_CREATING_SCO,  /* SCO is creating */
+	BT_HFP_AG_VRE_ACTIVATE,  /* VRE is activated */
+	BT_HFP_AG_VRE_R2A,       /* HF is ready to accept audio */
 
 	/* Total number of flags - must be at the end of the enum */
 	BT_HFP_AG_NUM_FLAGS,
 };
 
-/* HFP HF Indicators */
+/* bt_hfp_ag_call flags: the flags defined here represent HFP AG parameters */
 enum {
-	HFP_HF_ENHANCED_SAFETY_IND = 1, /* Enhanced Safety */
-	HFP_HF_BATTERY_LEVEL_IND = 2,   /* Remaining level of Battery */
-	HFP_HF_IND_MAX
+	BT_HFP_AG_CALL_IN_USING,      /* Object is in using */
+	BT_HFP_AG_CALL_INCOMING,      /* Incoming call */
+	BT_HFP_AG_CALL_INCOMING_HELD, /* Incoming call held */
+	BT_HFP_AG_CALL_OPEN_SCO,      /* Open SCO */
+	BT_HFP_AG_CALL_OUTGOING_3WAY, /* Outgoing 3 way call */
+	BT_HFP_AG_CALL_INCOMING_3WAY, /* Incoming 3 way call */
+
+	/* Total number of flags - must be at the end of the enum */
+	BT_HFP_AG_CALL_NUM_FLAGS,
 };
 
 typedef enum __packed {
@@ -51,21 +169,38 @@ typedef enum __packed {
 
 typedef enum __packed {
 	/** Call terminate */
-	BT_HFP_CALL_TERMINATE,
+	BT_HFP_CALL_TERMINATE = 1,
 	/** Call outgoing */
-	BT_HFP_CALL_OUTGOING,
+	BT_HFP_CALL_OUTGOING = 2,
 	/** Call incoming */
-	BT_HFP_CALL_INCOMING,
+	BT_HFP_CALL_INCOMING = 4,
 	/** Call alerting */
-	BT_HFP_CALL_ALERTING,
+	BT_HFP_CALL_ALERTING = 8,
 	/** Call active */
-	BT_HFP_CALL_ACTIVE,
+	BT_HFP_CALL_ACTIVE = 16,
 	/** Call hold */
-	BT_HFP_CALL_HOLD,
+	BT_HFP_CALL_HOLD = 32,
 } bt_hfp_call_state_t;
 
 #define AT_COPS_OPERATOR_MAX_LEN 16
 
+struct bt_hfp_ag_call {
+	struct bt_hfp_ag *ag;
+
+	char number[CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN + 1];
+	uint8_t type;
+
+	ATOMIC_DEFINE(flags, BT_HFP_AG_CALL_NUM_FLAGS);
+
+	/* HFP Call state */
+	bt_hfp_call_state_t call_state;
+
+	/* Calling Line Identification notification */
+	struct k_work_delayable ringing_work;
+
+	struct k_work_delayable deferred_work;
+};
+
 struct bt_hfp_ag {
 	struct bt_rfcomm_dlc rfcomm_dlc;
 	char buffer[HF_MAX_BUF_LEN];
@@ -84,14 +219,6 @@ struct bt_hfp_ag {
 	/* HFP Connection state */
 	bt_hfp_state_t state;
 
-	/* HFP Call state */
-	bt_hfp_call_state_t call_state;
-
-	/* Delayed work deferred tasks:
-	 * - call status cleanup.
-	 */
-	struct k_work_delayable deferred_work;
-
 	/* AG Indicators */
 	uint8_t indicator_value[BT_HFP_AG_IND_MAX];
 	uint32_t indicator;
@@ -99,42 +226,27 @@ struct bt_hfp_ag {
 	/* HF Indicators */
 	uint32_t hf_indicators_of_ag;
 	uint32_t hf_indicators_of_hf;
-	uint8_t hf_indicator_value[HFP_HF_IND_MAX];
+	uint32_t hf_indicators;
 
 	/* operator */
+	uint8_t mode;
 	char operator[AT_COPS_OPERATOR_MAX_LEN + 1];
 
+	/* calls */
+	struct bt_hfp_ag_call calls[CONFIG_BT_HFP_AG_MAX_CALLS];
+
+	/* last dialing number and type */
+	char last_number[CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN + 1];
+	uint8_t type;
+
 	/* SCO Connection Object */
 	struct bt_sco_chan sco_chan;
 	/* HFP TX pending */
 	sys_slist_t tx_pending;
 
-	/* Dial number or incoming number */
-	char number[CONFIG_BT_HFP_AG_PHONE_NUMBER_MAX_LEN + 1];
-
-	/* Calling Line Identification notification */
-	struct k_work_delayable ringing_work;
-
 	/* Critical locker */
 	struct k_sem lock;
 
 	/* TX work */
 	struct k_work_delayable tx_work;
 };
-
-/* Active */
-#define HFP_AG_CLCC_STATUS_ACTIVE         0
-/* Held */
-#define HFP_AG_CLCC_STATUS_HELD           1
-/* Dialing (outgoing calls only) */
-#define HFP_AG_CLCC_STATUS_DIALING        2
-/* Alerting (outgoing calls only) */
-#define HFP_AG_CLCC_STATUS_ALERTING       3
-/* Incoming (incoming calls only) */
-#define HFP_AG_CLCC_STATUS_INCOMING       4
-/* Waiting (incoming calls only) */
-#define HFP_AG_CLCC_STATUS_WAITING        5
-/* Call held by Response and Hold */
-#define HFP_AG_CLCC_STATUS_CALL_HELD_HOLD 6
-/* Invalid status */
-#define HFP_AG_CLCC_STATUS_INVALID        0xFFU
diff --git a/subsys/bluetooth/host/classic/hfp_hf.c b/subsys/bluetooth/host/classic/hfp_hf.c
index 54d90b876f187..ceeabf0ead97a 100644
--- a/subsys/bluetooth/host/classic/hfp_hf.c
+++ b/subsys/bluetooth/host/classic/hfp_hf.c
@@ -26,7 +26,7 @@
 #include "rfcomm_internal.h"
 #include "at.h"
 #include "sco_internal.h"
-#include "hfp_internal.h"
+#include "hfp_hf_internal.h"
 
 #define LOG_LEVEL CONFIG_BT_HFP_HF_LOG_LEVEL
 #include <zephyr/logging/log.h>
@@ -42,6 +42,29 @@ NET_BUF_POOL_FIXED_DEFINE(hf_pool, CONFIG_BT_MAX_CONN + 1,
 
 static struct bt_hfp_hf bt_hfp_hf_pool[CONFIG_BT_MAX_CONN];
 
+#define HF_ENHANCED_CALL_STATUS_TIMEOUT 50 /* ms */
+
+struct at_callback_set {
+	void *resp;
+	void *finish;
+} __packed;
+
+static inline void make_at_callback_set(void *storage, void *resp, void *finish)
+{
+	((struct at_callback_set *)storage)->resp = resp;
+	((struct at_callback_set *)storage)->finish = finish;
+}
+
+static inline void *at_callback_set_resp(void *storage)
+{
+	return ((struct at_callback_set *)storage)->resp;
+}
+
+static inline void *at_callback_set_finish(void *storage)
+{
+	return ((struct at_callback_set *)storage)->finish;
+}
+
 /* The order should follow the enum hfp_hf_ag_indicators */
 static const struct {
 	char *name;
@@ -119,7 +142,7 @@ static struct bt_sdp_attribute hfp_attrs[] = {
 	/* The values of the “SupportedFeatures” bitmap shall be the same as the
 	 * values of the Bits 0 to 4 of the AT-command AT+BRSF (see Section 5.3).
 	 */
-	BT_SDP_SUPPORTED_FEATURES(BT_HFP_HF_SUPPORTED_FEATURES & 0x1f),
+	BT_SDP_SUPPORTED_FEATURES(BT_HFP_HF_SDP_SUPPORTED_FEATURES),
 };
 
 static struct bt_sdp_record hfp_rec = BT_SDP_RECORD(hfp_attrs);
@@ -136,6 +159,89 @@ void hf_slc_error(struct at_client *hf_at)
 	}
 }
 
+static void hfp_hf_send_failed(struct bt_hfp_hf *hf)
+{
+	int err;
+
+	LOG_ERR("SLC error: disconnecting");
+
+	err = bt_rfcomm_dlc_disconnect(&hf->rfcomm_dlc);
+	if (err) {
+		LOG_ERR("Fail to disconnect: %d", err);
+	}
+}
+
+static void hfp_hf_send_data(struct bt_hfp_hf *hf);
+
+static int hfp_hf_common_finish(struct at_client *at, enum at_result result,
+			  enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(at, struct bt_hfp_hf, at);
+	int err = 0;
+
+	if (result != AT_RESULT_OK) {
+		LOG_WRN("Fail to send AT command (result %d, cme err %d) on %p",
+		    result, cme_err, hf);
+	}
+
+	if (hf->backup_finish) {
+		err = hf->backup_finish(at, result, cme_err);
+		hf->backup_finish = NULL;
+	}
+
+	if (atomic_test_and_clear_bit(hf->flags, BT_HFP_HF_FLAG_TX_ONGOING)) {
+		LOG_DBG("TX is done on %p", hf);
+	} else {
+		LOG_WRN("Tx is not ongoing on %p", hf);
+	}
+
+	hfp_hf_send_data(hf);
+	return err;
+}
+
+static void hfp_hf_send_data(struct bt_hfp_hf *hf)
+{
+	struct net_buf *buf;
+	at_resp_cb_t resp;
+	at_finish_cb_t finish;
+	int err;
+
+	if (atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_RX_ONGOING)) {
+		return;
+	}
+
+	if (atomic_test_and_set_bit(hf->flags, BT_HFP_HF_FLAG_TX_ONGOING)) {
+		return;
+	}
+
+	buf = k_fifo_get(&hf->tx_pending, K_NO_WAIT);
+	if (!buf) {
+		atomic_clear_bit(hf->flags, BT_HFP_HF_FLAG_TX_ONGOING);
+		return;
+	}
+
+	resp = (at_resp_cb_t)at_callback_set_resp(buf->user_data);
+	finish = (at_finish_cb_t)at_callback_set_finish(buf->user_data);
+
+	/*
+	 * Backup the `finish` callback.
+	 * Provide a default finish callback to drive the next sending.
+	 */
+	hf->backup_finish = finish;
+	finish = hfp_hf_common_finish;
+
+	make_at_callback_set(buf->user_data, NULL, NULL);
+	at_register(&hf->at, resp, finish);
+
+	err = bt_rfcomm_dlc_send(&hf->rfcomm_dlc, buf);
+	if (err < 0) {
+		LOG_ERR("Rfcomm send error :(%d)", err);
+		atomic_clear_bit(hf->flags, BT_HFP_HF_FLAG_TX_ONGOING);
+		net_buf_unref(buf);
+		hfp_hf_send_failed(hf);
+	}
+}
+
 int hfp_hf_send_cmd(struct bt_hfp_hf *hf, at_resp_cb_t resp,
 		    at_finish_cb_t finish, const char *format, ...)
 {
@@ -143,15 +249,14 @@ int hfp_hf_send_cmd(struct bt_hfp_hf *hf, at_resp_cb_t resp,
 	va_list vargs;
 	int ret;
 
-	/* register the callbacks */
-	at_register(&hf->at, resp, finish);
-
 	buf = bt_rfcomm_create_pdu(&hf_pool);
 	if (!buf) {
 		LOG_ERR("No Buffers!");
 		return -ENOMEM;
 	}
 
+	make_at_callback_set(buf->user_data, resp, finish);
+
 	va_start(vargs, format);
 	ret = vsnprintk(buf->data, (net_buf_tailroom(buf) - 1), format, vargs);
 	if (ret < 0) {
@@ -165,11 +270,8 @@ int hfp_hf_send_cmd(struct bt_hfp_hf *hf, at_resp_cb_t resp,
 
 	LOG_DBG("HF %p, DLC %p sending buf %p", hf, &hf->rfcomm_dlc, buf);
 
-	ret = bt_rfcomm_dlc_send(&hf->rfcomm_dlc, buf);
-	if (ret < 0) {
-		LOG_ERR("Rfcomm send error :(%d)", ret);
-		return ret;
-	}
+	k_fifo_put(&hf->tx_pending, buf);
+	hfp_hf_send_data(hf);
 
 	return 0;
 }
@@ -295,390 +397,3513 @@ int cind_resp(struct at_client *hf_at, struct net_buf *buf)
 	return 0;
 }
 
-void ag_indicator_handle_values(struct at_client *hf_at, uint32_t index,
-				uint32_t value)
+static void free_call(struct bt_hfp_hf_call *call)
 {
-	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	struct bt_conn *conn = hf->acl;
-
-	LOG_DBG("Index :%u, Value :%u", index, value);
+	memset(call, 0, sizeof(*call));
+}
 
-	if (index >= ARRAY_SIZE(ag_ind)) {
-		LOG_ERR("Max only %zu indicators are supported", ARRAY_SIZE(ag_ind));
-		return;
-	}
+#if defined(CONFIG_BT_HFP_HF_ECS)
+static struct bt_hfp_hf_call *get_call_with_index(struct bt_hfp_hf *hf, uint8_t index)
+{
+	struct bt_hfp_hf_call *call;
 
-	if (value > ag_ind[hf->ind_table[index]].max ||
-	    value < ag_ind[hf->ind_table[index]].min) {
-		LOG_ERR("Indicators out of range - value: %u", value);
-		return;
-	}
+	for (size_t i = 0; i < ARRAY_SIZE(hf->calls); i++) {
+		call = &hf->calls[i];
 
-	switch (hf->ind_table[index]) {
-	case HF_SERVICE_IND:
-		if (bt_hf->service) {
-			bt_hf->service(conn, value);
-		}
-		break;
-	case HF_CALL_IND:
-		if (bt_hf->call) {
-			bt_hf->call(conn, value);
-		}
-		break;
-	case HF_CALL_SETUP_IND:
-		if (bt_hf->call_setup) {
-			bt_hf->call_setup(conn, value);
-		}
-		break;
-	case HF_CALL_HELD_IND:
-		if (bt_hf->call_held) {
-			bt_hf->call_held(conn, value);
-		}
-		break;
-	case HF_SINGNAL_IND:
-		if (bt_hf->signal) {
-			bt_hf->signal(conn, value);
-		}
-		break;
-	case HF_ROAM_IND:
-		if (bt_hf->roam) {
-			bt_hf->roam(conn, value);
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
 		}
-		break;
-	case HF_BATTERY_IND:
-		if (bt_hf->battery) {
-			bt_hf->battery(conn, value);
+
+		if (call->index == index) {
+			return call;
 		}
-		break;
-	default:
-		LOG_ERR("Unknown AG indicator");
-		break;
 	}
+
+	return NULL;
 }
 
-int cind_status_handle(struct at_client *hf_at)
+static struct bt_hfp_hf_call *get_call_without_index(struct bt_hfp_hf *hf)
 {
-	uint32_t index = 0U;
+	struct bt_hfp_hf_call *call;
 
-	while (at_has_next_list(hf_at)) {
-		uint32_t value;
-		int ret;
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
 
-		ret = at_get_number(hf_at, &value);
-		if (ret < 0) {
-			LOG_ERR("could not get the value");
-			return ret;
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
 		}
 
-		ag_indicator_handle_values(hf_at, index, value);
-
-		index++;
+		if (!call->index) {
+			return call;
+		}
 	}
 
-	return 0;
+	return NULL;
 }
+#endif /* CONFIG_BT_HFP_HF_ECS */
 
-int cind_status_resp(struct at_client *hf_at, struct net_buf *buf)
+static void hf_reject_call(struct bt_hfp_hf_call *call)
 {
-	int err;
-
-	err = at_parse_cmd_input(hf_at, buf, "CIND", cind_status_handle,
-				 AT_CMD_TYPE_NORMAL);
-	if (err < 0) {
-		LOG_ERR("Error parsing CMD input");
-		hf_slc_error(hf_at);
+	if (bt_hf->reject) {
+		bt_hf->reject(call);
 	}
+	free_call(call);
+}
 
-	return 0;
+static void hf_terminate_call(struct bt_hfp_hf_call *call)
+{
+	if (bt_hf->terminate) {
+		bt_hf->terminate(call);
+	}
+	free_call(call);
 }
 
-int ciev_handle(struct at_client *hf_at)
+static void clear_call_without_clcc(struct bt_hfp_hf *hf)
 {
-	uint32_t index, value;
-	int ret;
+	struct bt_hfp_hf_call *call;
 
-	ret = at_get_number(hf_at, &index);
-	if (ret < 0) {
-		LOG_ERR("could not get the Index");
-		return ret;
-	}
-	/* The first element of the list shall have 1 */
-	if (!index) {
-		LOG_ERR("Invalid index value '0'");
-		return 0;
-	}
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
 
-	ret = at_get_number(hf_at, &value);
-	if (ret < 0) {
-		LOG_ERR("could not get the value");
-		return ret;
-	}
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
 
-	ag_indicator_handle_values(hf_at, (index - 1), value);
+		if (atomic_test_and_clear_bit(call->flags, BT_HFP_HF_CALL_CLCC)) {
+			continue;
+		}
 
-	return 0;
+		switch (atomic_get(call->state)) {
+		case BT_HFP_HF_CALL_STATE_TERMINATE:
+			break;
+		case BT_HFP_HF_CALL_STATE_OUTGOING:
+		case BT_HFP_HF_CALL_STATE_INCOMING:
+		case BT_HFP_HF_CALL_STATE_ALERTING:
+		case BT_HFP_HF_CALL_STATE_WAITING:
+			hf_reject_call(call);
+			break;
+		case BT_HFP_HF_CALL_STATE_ACTIVE:
+		case BT_HFP_HF_CALL_STATE_HELD:
+			hf_terminate_call(call);
+			break;
+		default:
+			free_call(call);
+			break;
+		}
+	}
 }
 
-int ring_handle(struct at_client *hf_at)
+static int clcc_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	struct bt_conn *conn = hf->acl;
 
-	if (bt_hf->ring_indication) {
-		bt_hf->ring_indication(conn);
+	LOG_DBG("AT+CLCC (result %d) on %p", result, hf);
+
+	if (result == AT_RESULT_OK) {
+		clear_call_without_clcc(hf);
 	}
 
+	atomic_clear_bit(hf->flags, BT_HFP_HF_FLAG_CLCC_PENDING);
+
 	return 0;
 }
 
-static const struct unsolicited {
-	const char *cmd;
-	enum at_cmd_type type;
-	int (*func)(struct at_client *hf_at);
-} handlers[] = {
-	{ "CIEV", AT_CMD_TYPE_UNSOLICITED, ciev_handle },
-	{ "RING", AT_CMD_TYPE_OTHER, ring_handle }
-};
-
-static const struct unsolicited *hfp_hf_unsol_lookup(struct at_client *hf_at)
+static void clear_call_clcc_state(struct bt_hfp_hf *hf)
 {
-	int i;
+	struct bt_hfp_hf_call *call;
 
-	for (i = 0; i < ARRAY_SIZE(handlers); i++) {
-		if (!strncmp(hf_at->buf, handlers[i].cmd,
-			     strlen(handlers[i].cmd))) {
-			return &handlers[i];
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
 		}
-	}
 
-	return NULL;
+		atomic_clear_bit(call->flags, BT_HFP_HF_CALL_CLCC);
+	}
 }
 
-int unsolicited_cb(struct at_client *hf_at, struct net_buf *buf)
+static void hf_query_current_calls(struct bt_hfp_hf *hf)
 {
-	const struct unsolicited *handler;
+	int err;
 
-	handler = hfp_hf_unsol_lookup(hf_at);
-	if (!handler) {
-		LOG_ERR("Unhandled unsolicited response");
-		return -ENOMSG;
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return;
 	}
 
-	if (!at_parse_cmd_input(hf_at, buf, handler->cmd, handler->func,
-				handler->type)) {
-		return 0;
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		return;
 	}
 
-	return -ENOMSG;
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_ECS)) {
+		return;
+	}
+
+	if (!(hf->hf_features & BT_HFP_HF_FEATURE_ECS)) {
+		return;
+	}
+
+	if (atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CLCC_PENDING)) {
+		k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+		return;
+	}
+
+	clear_call_clcc_state(hf);
+
+	err = hfp_hf_send_cmd(hf, NULL, clcc_finish, "AT+CLCC");
+	if (err < 0) {
+		LOG_ERR("Fail to query current calls on %p", hf);
+	}
 }
 
-int cmd_complete(struct at_client *hf_at, enum at_result result,
-	       enum at_cme cme_err)
+static void hf_call_state_update(struct bt_hfp_hf_call *call, int state)
 {
-	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	struct bt_conn *conn = hf->acl;
-	struct bt_hfp_hf_cmd_complete cmd = { 0 };
+	int old_state;
 
-	LOG_DBG("");
+	old_state = atomic_get(call->state);
+	atomic_set(call->state, state);
+
+	LOG_DBG("Call %p state update %d->%d", call, old_state, state);
 
-	switch (result) {
-	case AT_RESULT_OK:
-		cmd.type = HFP_HF_CMD_OK;
+	switch (state) {
+	case BT_HFP_HF_CALL_STATE_TERMINATE:
+		free_call(call);
 		break;
-	case AT_RESULT_ERROR:
-		cmd.type = HFP_HF_CMD_ERROR;
+	case BT_HFP_HF_CALL_STATE_OUTGOING:
 		break;
-	case AT_RESULT_CME_ERROR:
-		cmd.type = HFP_HF_CMD_CME_ERROR;
-		cmd.cme = cme_err;
+	case BT_HFP_HF_CALL_STATE_INCOMING:
 		break;
-	default:
-		LOG_ERR("Unknown error code");
-		cmd.type = HFP_HF_CMD_UNKNOWN_ERROR;
+	case BT_HFP_HF_CALL_STATE_ALERTING:
+		k_work_reschedule(&call->hf->deferred_work,
+				  K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+		break;
+	case BT_HFP_HF_CALL_STATE_WAITING:
+		k_work_reschedule(&call->hf->deferred_work,
+				  K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+		break;
+	case BT_HFP_HF_CALL_STATE_ACTIVE:
+		break;
+	case BT_HFP_HF_CALL_STATE_HELD:
 		break;
 	}
-
-	if (bt_hf->cmd_complete_cb) {
-		bt_hf->cmd_complete_cb(conn, &cmd);
-	}
-
-	return 0;
 }
 
-int cmee_finish(struct at_client *hf_at, enum at_result result,
-		enum at_cme cme_err)
+#if defined(CONFIG_BT_HFP_HF_ECS)
+static void call_state_update(struct bt_hfp_hf_call *call, uint32_t status)
 {
-	if (result != AT_RESULT_OK) {
-		LOG_ERR("SLC Connection ERROR in response");
-		return -EINVAL;
+	switch (status) {
+	case BT_HFP_CLCC_STATUS_ACTIVE:
+		if ((atomic_get(call->state) != BT_HFP_HF_CALL_STATE_ACTIVE) ||
+		    ((atomic_get(call->state) == BT_HFP_HF_CALL_STATE_ACTIVE) &&
+		    atomic_test_and_clear_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD))) {
+			atomic_val_t state;
+
+			state = atomic_get(call->state);
+			hf_call_state_update(call, BT_HFP_HF_CALL_STATE_ACTIVE);
+			if (state == BT_HFP_HF_CALL_STATE_HELD) {
+				if (bt_hf->retrieve) {
+					bt_hf->retrieve(call);
+				}
+			} else {
+				if (bt_hf->accept) {
+					bt_hf->accept(call);
+				}
+			}
+		}
+		break;
+	case BT_HFP_CLCC_STATUS_HELD:
+		if ((atomic_get(call->state) == BT_HFP_HF_CALL_STATE_ACTIVE) &&
+		    !atomic_test_and_clear_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD)) {
+			hf_call_state_update(call, BT_HFP_HF_CALL_STATE_HELD);
+			if (bt_hf->held) {
+				bt_hf->held(call);
+			}
+		}
+		break;
+	case BT_HFP_CLCC_STATUS_DIALING:
+		break;
+	case BT_HFP_CLCC_STATUS_ALERTING:
+		break;
+	case BT_HFP_CLCC_STATUS_INCOMING:
+		break;
+	case BT_HFP_CLCC_STATUS_WAITING:
+		break;
+	case BT_HFP_CLCC_STATUS_CALL_HELD_HOLD:
+		if ((atomic_get(call->state) == BT_HFP_HF_CALL_STATE_INCOMING) ||
+		    (atomic_get(call->state) == BT_HFP_HF_CALL_STATE_WAITING)) {
+			atomic_set_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD);
+			hf_call_state_update(call, BT_HFP_HF_CALL_STATE_ACTIVE);
+			if (bt_hf->incoming_held) {
+				bt_hf->incoming_held(call);
+			}
+		}
+		break;
 	}
-
-	return 0;
 }
 
-static void slc_completed(struct at_client *hf_at)
+static int clcc_handle(struct at_client *hf_at)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	struct bt_conn *conn = hf->acl;
-
-	if (bt_hf->connected) {
-		bt_hf->connected(conn);
+	int err;
+	struct bt_hfp_hf_call *call;
+	uint32_t index;
+	uint32_t dir;
+	uint32_t status;
+	uint32_t mode;
+	uint32_t mpty;
+	char *number = NULL;
+	uint32_t type = 0;
+	bool incoming = false;
+
+	err = at_get_number(hf_at, &index);
+	if (err < 0) {
+		LOG_ERR("Error getting index");
+		return err;
 	}
 
-	if (hfp_hf_send_cmd(hf, NULL, cmee_finish, "AT+CMEE=1") < 0) {
-		LOG_ERR("Error Sending AT+CMEE");
+	call = get_call_with_index(hf, (uint8_t)index);
+	if (!call) {
+		LOG_INF("Valid call with index %d not found", index);
+		call = get_call_without_index(hf);
+		if (!call) {
+			LOG_INF("Not available call");
+			return 0;
+		}
+		call->index = (uint8_t)index;
 	}
-}
 
-int cmer_finish(struct at_client *hf_at, enum at_result result,
-		enum at_cme cme_err)
-{
-	if (result != AT_RESULT_OK) {
-		LOG_ERR("SLC Connection ERROR in response");
-		hf_slc_error(hf_at);
-		return -EINVAL;
-	}
+	atomic_set_bit(call->flags, BT_HFP_HF_CALL_CLCC);
 
-	slc_completed(hf_at);
+	err = at_get_number(hf_at, &dir);
+	if (err < 0) {
+		LOG_ERR("Error getting dir");
+		return err;
+	}
+
+	if (atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING) ||
+		atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING_3WAY)) {
+		incoming = true;
+	}
+
+	if (incoming != !!dir) {
+		LOG_ERR("Call dir of HF is not aligned with AG");
+		return 0;
+	}
+
+	err = at_get_number(hf_at, &status);
+	if (err < 0) {
+		LOG_ERR("Error getting status");
+		return err;
+	}
+
+	err = at_get_number(hf_at, &mode);
+	if (err < 0) {
+		LOG_ERR("Error getting mode");
+		return err;
+	}
+
+	err = at_get_number(hf_at, &mpty);
+	if (err < 0) {
+		LOG_ERR("Error getting mpty");
+		return err;
+	}
+
+	number = at_get_string(hf_at);
+
+	if (number) {
+		(void)at_get_number(hf_at, &type);
+	}
+
+	call_state_update(call, status);
+
+	LOG_DBG("CLCC idx %d dir %d status %d mode %d mpty %d number %s type %d",
+		index, dir, status, mode, mpty, number, type);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_ECS */
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+static int bvra_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	int err;
+	uint32_t activate;
+	uint32_t state;
+	char *id;
+	char text_id[BT_HFP_BVRA_TEXT_ID_MAX_LEN + 1];
+	size_t id_len;
+	uint32_t type;
+	uint32_t operation;
+	char *text;
+
+	err = at_get_number(hf_at, &activate);
+	if (err < 0) {
+		LOG_ERR("Error getting activate");
+		return err;
+	}
+
+	if (activate) {
+		if (!atomic_test_and_set_bit(hf->flags, BT_HFP_HF_FLAG_VRE_ACTIVATE)) {
+			if (bt_hf->voice_recognition) {
+				bt_hf->voice_recognition(hf, true);
+			}
+		}
+	} else {
+		if (atomic_test_and_clear_bit(hf->flags, BT_HFP_HF_FLAG_VRE_ACTIVATE)) {
+			if (bt_hf->voice_recognition) {
+				bt_hf->voice_recognition(hf, false);
+			}
+		}
+	}
+
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+	err = at_get_number(hf_at, &state);
+	if (err < 0) {
+		LOG_INF("Error getting VRE state");
+		return 0;
+	}
+
+	if (bt_hf->vre_state) {
+		bt_hf->vre_state(hf, (uint8_t)state);
+	}
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG_TEXT)
+	id = at_get_raw_string(hf_at, &id_len);
+	if (!id) {
+		LOG_INF("Error getting text ID");
+		return 0;
+	}
+
+	if (id_len > BT_HFP_BVRA_TEXT_ID_MAX_LEN) {
+		LOG_ERR("Invalid text ID length %d", id_len);
+		return -ENOTSUP;
+	}
+
+	strncpy(text_id, id, MIN(id_len, BT_HFP_BVRA_TEXT_ID_MAX_LEN));
+	text_id[MIN(id_len, BT_HFP_BVRA_TEXT_ID_MAX_LEN)] = '\0';
+
+	err = at_get_number(hf_at, &type);
+	if (err < 0) {
+		LOG_INF("Error getting text type");
+		return 0;
+	}
+
+	err = at_get_number(hf_at, &operation);
+	if (err < 0) {
+		LOG_INF("Error getting text operation");
+		return 0;
+	}
+
+	text = at_get_string(hf_at);
+	if (!text) {
+		LOG_INF("Error getting text string");
+		return 0;
+	}
+
+	if (bt_hf->textual_representation) {
+		bt_hf->textual_representation(hf, text_id, (uint8_t)type,
+			(uint8_t)operation, text);
+	}
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG_TEXT */
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+
+static struct bt_hfp_hf_call *get_dialing_call(struct bt_hfp_hf *hf)
+{
+	struct bt_hfp_hf_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		switch (atomic_get(call->state)) {
+		case BT_HFP_HF_CALL_STATE_OUTGOING:
+		case BT_HFP_HF_CALL_STATE_INCOMING:
+		case BT_HFP_HF_CALL_STATE_ALERTING:
+		case BT_HFP_HF_CALL_STATE_WAITING:
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static struct bt_hfp_hf_call *get_call_with_state(struct bt_hfp_hf *hf, int state)
+{
+	struct bt_hfp_hf_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		if (atomic_get(call->state) == state) {
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static struct bt_hfp_hf_call *get_call_with_flag(struct bt_hfp_hf *hf, int flag)
+{
+	struct bt_hfp_hf_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		if (atomic_test_bit(call->flags, flag)) {
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static struct bt_hfp_hf_call *get_call_with_state_and_flag(struct bt_hfp_hf *hf,
+		int state, int flag)
+{
+	struct bt_hfp_hf_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		if ((atomic_get(call->state) == state) &&
+			atomic_test_bit(call->flags, flag)) {
+			return call;
+		}
+	}
+
+	return NULL;
+}
+
+static struct bt_hfp_hf_call *get_using_call(struct bt_hfp_hf *hf)
+{
+	struct bt_hfp_hf_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		return call;
+	}
+
+	return NULL;
+}
+
+static void bt_hf_deferred_work(struct k_work *work)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_hfp_hf *hf = CONTAINER_OF(dwork, struct bt_hfp_hf, deferred_work);
+
+	hf_query_current_calls(hf);
+}
+
+static struct bt_hfp_hf_call *get_new_call(struct bt_hfp_hf *hf)
+{
+	struct bt_hfp_hf_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (atomic_test_and_set_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		call->hf = hf;
+
+		return call;
+	}
+
+	return NULL;
+}
+
+static int get_using_call_count(struct bt_hfp_hf *hf)
+{
+	struct bt_hfp_hf_call *call;
+	int count = 0;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		count++;
+	}
+
+	return count;
+}
+
+static void set_all_calls_held_state(struct bt_hfp_hf *hf, bool held)
+{
+	struct bt_hfp_hf_call *call;
+
+	for (size_t index = 0; index < ARRAY_SIZE(hf->calls); index++) {
+		call = &hf->calls[index];
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+			continue;
+		}
+
+		if (held && (atomic_get(call->state) == BT_HFP_HF_CALL_STATE_ACTIVE)) {
+			hf_call_state_update(call, BT_HFP_HF_CALL_STATE_HELD);
+			if (bt_hf->held) {
+				bt_hf->held(call);
+			}
+		}
+
+		if (!held && (atomic_get(call->state) == BT_HFP_HF_CALL_STATE_HELD)) {
+			hf_call_state_update(call, BT_HFP_HF_CALL_STATE_ACTIVE);
+			if (bt_hf->retrieve) {
+				bt_hf->retrieve(call);
+			}
+		}
+	}
+}
+
+static void ag_indicator_handle_call(struct bt_hfp_hf *hf, uint32_t value)
+{
+	struct bt_hfp_hf_call *call;
+
+	LOG_DBG("call %d", value);
+
+	if (value) {
+		call = get_dialing_call(hf);
+		if (!call) {
+			return;
+		}
+
+		hf_call_state_update(call, BT_HFP_HF_CALL_STATE_ACTIVE);
+
+		if (atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD)) {
+			if (bt_hf->incoming_held) {
+				bt_hf->incoming_held(call);
+			}
+		} else {
+			if (bt_hf->accept) {
+				bt_hf->accept(call);
+			}
+		}
+	} else {
+		do {
+			call = get_using_call(hf);
+			if (!call) {
+				return;
+			}
+
+			switch (atomic_get(call->state)) {
+			case BT_HFP_HF_CALL_STATE_OUTGOING:
+			case BT_HFP_HF_CALL_STATE_INCOMING:
+			case BT_HFP_HF_CALL_STATE_ALERTING:
+			case BT_HFP_HF_CALL_STATE_WAITING:
+				hf_reject_call(call);
+				break;
+			case BT_HFP_HF_CALL_STATE_ACTIVE:
+				if (atomic_test_and_clear_bit(call->flags,
+							      BT_HFP_HF_CALL_INCOMING_HELD)) {
+					hf_reject_call(call);
+					break;
+				}
+				__fallthrough;
+			case BT_HFP_HF_CALL_STATE_HELD:
+				hf_terminate_call(call);
+				break;
+			default:
+				free_call(call);
+				break;
+			}
+		} while (call);
+	}
+}
+
+static void ag_indicator_handle_call_setup(struct bt_hfp_hf *hf, uint32_t value)
+{
+	struct bt_hfp_hf_call *call;
+	int call_count;
+
+	call_count = get_using_call_count(hf);
+
+	LOG_DBG("call setup %d", value);
+
+	switch (value) {
+	case BT_HFP_CALL_SETUP_NONE:
+		if (call_count == 1) {
+			call = get_using_call(hf);
+			if (!call) {
+				break;
+			}
+
+			if ((atomic_get(call->state) == BT_HFP_HF_CALL_STATE_ACTIVE) ||
+				(atomic_get(call->state) == BT_HFP_HF_CALL_STATE_HELD)) {
+				break;
+			}
+
+			hf_reject_call(call);
+		} else {
+			call = get_dialing_call(hf);
+			if (!call) {
+				break;
+			}
+
+			if (atomic_get(call->state) == BT_HFP_HF_CALL_STATE_OUTGOING) {
+				LOG_INF("The outgoing is not alerted");
+				hf_reject_call(call);
+			} else {
+				LOG_INF("Waiting for +CIEV: (callheld = 1)");
+				k_work_reschedule(&hf->deferred_work,
+						  K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+			}
+		}
+		break;
+	case BT_HFP_CALL_SETUP_INCOMING:
+		call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_INCOMING);
+		if (!call) {
+			call = get_new_call(hf);
+			if (!call) {
+				break;
+			}
+			hf_call_state_update(call, BT_HFP_HF_CALL_STATE_INCOMING);
+		}
+
+		if (call_count == 0) {
+			atomic_set_bit(call->flags, BT_HFP_HF_CALL_INCOMING);
+		} else {
+			atomic_set_bit(call->flags, BT_HFP_HF_CALL_INCOMING_3WAY);
+		}
+		if (bt_hf->incoming) {
+			bt_hf->incoming(hf, call);
+		}
+		hf_call_state_update(call, BT_HFP_HF_CALL_STATE_WAITING);
+		break;
+	case BT_HFP_CALL_SETUP_OUTGOING:
+		call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_OUTGOING);
+		if (!call) {
+			call = get_new_call(hf);
+			if (!call) {
+				break;
+			}
+			hf_call_state_update(call, BT_HFP_HF_CALL_STATE_OUTGOING);
+		}
+
+		if (call_count) {
+			atomic_set_bit(call->flags, BT_HFP_HF_CALL_OUTGOING_3WAY);
+		}
+		if (bt_hf->outgoing) {
+			bt_hf->outgoing(hf, call);
+		}
+		break;
+	case BT_HFP_CALL_SETUP_REMOTE_ALERTING:
+		call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_OUTGOING);
+		if (!call) {
+			break;
+		}
+
+		hf_call_state_update(call, BT_HFP_HF_CALL_STATE_ALERTING);
+		if (bt_hf->remote_ringing) {
+			bt_hf->remote_ringing(call);
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+static void ag_indicator_handle_call_held(struct bt_hfp_hf *hf, uint32_t value)
+{
+	struct bt_hfp_hf_call *call;
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
+	LOG_DBG("call setup %d", value);
+
+	switch (value) {
+	case BT_HFP_CALL_HELD_NONE:
+		set_all_calls_held_state(hf, false);
+		break;
+	case BT_HFP_CALL_HELD_ACTIVE_HELD:
+		call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_ALERTING);
+		if (!call) {
+			call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_WAITING);
+			if (!call) {
+				break;
+			}
+		}
+
+		hf_call_state_update(call, BT_HFP_HF_CALL_STATE_ACTIVE);
+		if (bt_hf->accept) {
+			bt_hf->accept(call);
+		}
+		break;
+	case BT_HFP_CALL_HELD_HELD:
+		set_all_calls_held_state(hf, true);
+		break;
+	default:
+		break;
+	}
+}
+
+void ag_indicator_handle_values(struct at_client *hf_at, uint32_t index,
+				uint32_t value)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("Index :%u, Value :%u", index, value);
+
+	if (index >= ARRAY_SIZE(ag_ind)) {
+		LOG_ERR("Max only %zu indicators are supported", ARRAY_SIZE(ag_ind));
+		return;
+	}
+
+	if (value > ag_ind[hf->ind_table[index]].max ||
+	    value < ag_ind[hf->ind_table[index]].min) {
+		LOG_ERR("Indicators out of range - value: %u", value);
+		return;
+	}
+
+	switch (hf->ind_table[index]) {
+	case HF_SERVICE_IND:
+		if (bt_hf->service) {
+			bt_hf->service(hf, value);
+		}
+		break;
+	case HF_CALL_IND:
+		ag_indicator_handle_call(hf, value);
+		break;
+	case HF_CALL_SETUP_IND:
+		ag_indicator_handle_call_setup(hf, value);
+		break;
+	case HF_CALL_HELD_IND:
+		ag_indicator_handle_call_held(hf, value);
+		break;
+	case HF_SIGNAL_IND:
+		if (bt_hf->signal) {
+			bt_hf->signal(hf, value);
+		}
+		break;
+	case HF_ROAM_IND:
+		if (bt_hf->roam) {
+			bt_hf->roam(hf, value);
+		}
+		break;
+	case HF_BATTERY_IND:
+		if (bt_hf->battery) {
+			bt_hf->battery(hf, value);
+		}
+		break;
+	default:
+		LOG_ERR("Unknown AG indicator");
+		break;
+	}
+}
+
+int cind_status_handle(struct at_client *hf_at)
+{
+	uint32_t index = 0U;
+
+	while (at_has_next_list(hf_at)) {
+		uint32_t value;
+		int ret;
+
+		ret = at_get_number(hf_at, &value);
+		if (ret < 0) {
+			LOG_ERR("could not get the value");
+			return ret;
+		}
+
+		ag_indicator_handle_values(hf_at, index, value);
+
+		index++;
+	}
+
+	return 0;
+}
+
+int cind_status_resp(struct at_client *hf_at, struct net_buf *buf)
+{
+	int err;
+
+	err = at_parse_cmd_input(hf_at, buf, "CIND", cind_status_handle,
+				 AT_CMD_TYPE_NORMAL);
+	if (err < 0) {
+		LOG_ERR("Error parsing CMD input");
+		hf_slc_error(hf_at);
+	}
+
+	return 0;
+}
+
+int ciev_handle(struct at_client *hf_at)
+{
+	uint32_t index, value;
+	int ret;
+
+	ret = at_get_number(hf_at, &index);
+	if (ret < 0) {
+		LOG_ERR("could not get the Index");
+		return ret;
+	}
+	/* The first element of the list shall have 1 */
+	if (!index) {
+		LOG_ERR("Invalid index value '0'");
+		return 0;
+	}
+
+	ret = at_get_number(hf_at, &value);
+	if (ret < 0) {
+		LOG_ERR("could not get the value");
+		return ret;
+	}
+
+	ag_indicator_handle_values(hf_at, (index - 1), value);
+
+	return 0;
+}
+
+int ring_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	struct bt_hfp_hf_call *call;
+
+	call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_WAITING);
+	if (!call) {
+		return 0;
+	}
+
+	if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING)) {
+		LOG_WRN("Invalid call dir (outgoing)");
+	}
+
+	if (bt_hf->ring_indication) {
+		bt_hf->ring_indication(call);
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_HFP_HF_CLI)
+int clip_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	char *number;
+	uint32_t type;
+	int err;
+	struct bt_hfp_hf_call *call;
+
+	number = at_get_string(hf_at);
+
+	err = at_get_number(hf_at, &type);
+	if (err) {
+		LOG_WRN("could not get the type");
+	} else {
+		type = 0;
+	}
+
+
+	call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_WAITING);
+	if (!call) {
+		return 0;
+	}
+
+	if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING)) {
+		LOG_WRN("Invalid call dir (outgoing)");
+	}
+
+	if (bt_hf->clip) {
+		bt_hf->clip(call, number, (uint8_t)type);
+	}
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_CLI */
+
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+int vgm_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	uint32_t gain;
+	int err;
+
+	err = at_get_number(hf_at, &gain);
+	if (err) {
+		LOG_ERR("could not get the microphone gain");
+		return err;
+	}
+
+	if (gain > BT_HFP_HF_VGM_GAIN_MAX) {
+		LOG_ERR("Invalid microphone gain (%d > %d)", gain, BT_HFP_HF_VGM_GAIN_MAX);
+		return -EINVAL;
+	}
+
+	if (bt_hf->vgm) {
+		bt_hf->vgm(hf, (uint8_t)gain);
+	}
+
+	return 0;
+}
+
+int vgs_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	uint32_t gain;
+	int err;
+
+	err = at_get_number(hf_at, &gain);
+	if (err) {
+		LOG_ERR("could not get the speaker gain");
+		return err;
+	}
+
+	if (gain > BT_HFP_HF_VGS_GAIN_MAX) {
+		LOG_ERR("Invalid speaker gain (%d > %d)", gain, BT_HFP_HF_VGS_GAIN_MAX);
+		return -EINVAL;
+	}
+
+	if (bt_hf->vgs) {
+		bt_hf->vgs(hf, (uint8_t)gain);
+	}
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+
+int bsir_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	uint32_t inband;
+	int err;
+
+	err = at_get_number(hf_at, &inband);
+	if (err) {
+		LOG_ERR("could not get bsir value");
+		return err;
+	}
+
+	if (inband > 1) {
+		LOG_ERR("Invalid %d bsir value", inband);
+		return -EINVAL;
+	}
+
+	if (bt_hf->inband_ring) {
+		bt_hf->inband_ring(hf, (bool)inband);
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+int bcs_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	uint32_t codec_id;
+	int err;
+
+	err = at_get_number(hf_at, &codec_id);
+	if (err) {
+		LOG_ERR("could not get bcs value");
+		return err;
+	}
+
+	if (!(hf->hf_codec_ids & BIT(codec_id))) {
+		LOG_ERR("Invalid codec id %d", codec_id);
+		err = bt_hfp_hf_set_codecs(hf, hf->hf_codec_ids);
+		return err;
+	}
+
+	atomic_set_bit(hf->flags, BT_HFP_HF_FLAG_CODEC_CONN);
+
+	if (bt_hf->codec_negotiate) {
+		bt_hf->codec_negotiate(hf, codec_id);
+		return 0;
+	}
+
+	err = bt_hfp_hf_select_codec(hf, codec_id);
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+static int btrh_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	uint32_t on_hold;
+	int err;
+	struct bt_hfp_hf_call *call;
+
+	err = at_get_number(hf_at, &on_hold);
+	if (err < 0) {
+		LOG_ERR("Error getting value");
+		return err;
+	}
+
+	if (on_hold == BT_HFP_BTRH_ON_HOLD) {
+		call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_WAITING);
+		if (!call) {
+			return 0;
+		}
+
+		if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING)) {
+			LOG_WRN("Invalid call dir (outgoing)");
+		}
+		atomic_set_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD);
+	} else {
+		call = get_call_with_state_and_flag(hf,
+			BT_HFP_HF_CALL_STATE_ACTIVE, BT_HFP_HF_CALL_INCOMING_HELD);
+		if (!call) {
+			return 0;
+		}
+
+		if (on_hold == BT_HFP_BTRH_ACCEPTED) {
+			atomic_clear_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD);
+			if (bt_hf && bt_hf->accept) {
+				bt_hf->accept(call);
+			}
+		} else if (on_hold == BT_HFP_BTRH_REJECTED) {
+			hf_reject_call(call);
+		} else {
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int ccwa_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	char *number;
+	uint32_t type;
+	int err;
+	struct bt_hfp_hf_call *call;
+
+	number = at_get_string(hf_at);
+
+	err = at_get_number(hf_at, &type);
+	if (err) {
+		LOG_WRN("could not get the type");
+	} else {
+		type = 0;
+	}
+
+	call = get_new_call(hf);
+	if (!call) {
+		LOG_ERR("Not available call object");
+		return 0;
+	}
+
+	hf_call_state_update(call, BT_HFP_HF_CALL_STATE_INCOMING);
+	if (bt_hf->call_waiting) {
+		bt_hf->call_waiting(call, number, (uint8_t)type);
+	}
+
+	return 0;
+}
+
+static struct _chld_feature {
+	const char *name;
+	int value;
+} chld_feature_map[] = {
+	{ "1x", BT_HFP_CALL_RELEASE_SPECIFIED_ACTIVE },
+	{ "2x", BT_HFP_CALL_PRIVATE_CNLTN_MODE },
+	{ "0",  BT_HFP_CHLD_RELEASE_ALL },
+	{ "1",  BT_HFP_CHLD_RELEASE_ACTIVE_ACCEPT_OTHER },
+	{ "2",  BT_HFP_CALL_HOLD_ACTIVE_ACCEPT_OTHER },
+	{ "3",  BT_HFP_CALL_ACTIVE_HELD },
+	{ "4",  BT_HFP_CALL_QUITE },
+};
+
+static int get_chld_feature(const char *name)
+{
+	struct _chld_feature *chld;
+
+	for (size_t index = 0; index < ARRAY_SIZE(chld_feature_map); index++) {
+		chld = &chld_feature_map[index];
+		if (!strncmp(name, chld->name, strlen(chld->name))) {
+			return chld->value;
+		}
+	}
+
+	return -EINVAL;
+}
+
+int chld_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	char *value;
+	uint32_t chld_features = 0;
+	int err;
+
+	/* Parsing Example: CHLD: (0,1,2,3,4) */
+	if (at_open_list(hf_at) < 0) {
+		LOG_ERR("Could not get open list");
+		goto error;
+	}
+
+	while (at_has_next_list(hf_at)) {
+		value = at_get_raw_string(hf_at, NULL);
+		if (!value) {
+			LOG_ERR("Could not get value");
+			goto error;
+		}
+
+		err = get_chld_feature(value);
+		if (err < 0) {
+			LOG_ERR("Cannot parse the value %s", value);
+			goto error;
+		}
+
+		if (NUM_BITS(sizeof(chld_features)) > err) {
+			chld_features |= BIT(err);
+		}
+	}
+
+	if (at_close_list(hf_at) < 0) {
+		LOG_ERR("Could not get close list");
+		goto error;
+	}
+
+	if (!((chld_features & BIT(BT_HFP_CHLD_RELEASE_ACTIVE_ACCEPT_OTHER)) &&
+	    (chld_features & BIT(BT_HFP_CALL_HOLD_ACTIVE_ACCEPT_OTHER)))) {
+		LOG_ERR("AT+CHLD values 1 and 2 should be supported by AG");
+		goto error;
+	}
+
+	hf->chld_features = chld_features;
+
+	return 0;
+
+error:
+	LOG_ERR("Error on AT+CHLD=? response");
+	hf_slc_error(hf_at);
+	return -EINVAL;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+static int cnum_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	int err;
+	char *alpha;
+	char *number;
+	uint32_t type;
+	char *speed;
+	uint32_t service = 4;
+
+	alpha = at_get_raw_string(hf_at, NULL);
+	number = at_get_string(hf_at);
+	if (!number) {
+		LOG_INF("Cannot get number");
+		return -EINVAL;
+	}
+
+	err = at_get_number(hf_at, &type);
+	if (err) {
+		LOG_INF("Cannot get type");
+		return -EINVAL;
+	}
+
+	speed = at_get_raw_string(hf_at, NULL);
+
+	err = at_get_number(hf_at, &service);
+	if (err) {
+		LOG_INF("Cannot get service");
+	}
+
+	if (bt_hf->subscriber_number) {
+		bt_hf->subscriber_number(hf, number, (uint8_t)type, (uint8_t)service);
+	}
+
+	LOG_DBG("CNUM number %s type %d service %d", number, type, service);
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATORS)
+static int bind_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	int err;
+	uint32_t index;
+	uint32_t value;
+	uint32_t ind = 0;
+	uint32_t ind_enable = hf->ind_enable;
+
+	err = at_open_list(hf_at);
+	if (!err) {
+		/* It is a list. */
+		while (at_has_next_list(hf_at)) {
+			err = at_get_number(hf_at, &index);
+			if (err) {
+				LOG_INF("Cannot get indicator");
+				goto failed;
+			}
+
+			ind |= BIT(index);
+		}
+
+		if (at_close_list(hf_at) < 0) {
+			LOG_ERR("Could not get close list");
+			goto failed;
+		}
+
+		hf->ag_ind = ind;
+		return 0;
+	}
+
+	err = at_get_number(hf_at, &index);
+	if (err) {
+		LOG_INF("Cannot get indicator");
+		goto failed;
+	}
+
+	err = at_get_number(hf_at, &value);
+	if (err) {
+		LOG_INF("Cannot get status");
+		goto failed;
+	}
+
+	if (!value) {
+		ind_enable &= ~BIT(index);
+	} else {
+		ind_enable |= BIT(index);
+	}
+
+	hf->ind_enable = ind_enable;
+	return 0;
+
+failed:
+	LOG_ERR("Error on AT+BIND response");
+	hf_slc_error(hf_at);
+	return -EINVAL;
+}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+
+static const struct unsolicited {
+	const char *cmd;
+	enum at_cmd_type type;
+	int (*func)(struct at_client *hf_at);
+} handlers[] = {
+	{ "CIEV", AT_CMD_TYPE_UNSOLICITED, ciev_handle },
+	{ "RING", AT_CMD_TYPE_OTHER, ring_handle },
+#if defined(CONFIG_BT_HFP_HF_CLI)
+	{ "CLIP", AT_CMD_TYPE_UNSOLICITED, clip_handle },
+#endif /* CONFIG_BT_HFP_HF_CLI */
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+	{ "VGM", AT_CMD_TYPE_UNSOLICITED, vgm_handle },
+	{ "VGS", AT_CMD_TYPE_UNSOLICITED, vgs_handle },
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+	{ "BSIR", AT_CMD_TYPE_UNSOLICITED, bsir_handle },
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+	{ "BCS", AT_CMD_TYPE_UNSOLICITED, bcs_handle },
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+	{ "BTRH", AT_CMD_TYPE_UNSOLICITED, btrh_handle },
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	{ "CCWA", AT_CMD_TYPE_UNSOLICITED, ccwa_handle },
+	{ "CHLD", AT_CMD_TYPE_UNSOLICITED, chld_handle },
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+#if defined(CONFIG_BT_HFP_HF_ECS)
+	{ "CLCC", AT_CMD_TYPE_UNSOLICITED, clcc_handle },
+#endif /* CONFIG_BT_HFP_HF_ECS */
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+	{ "BVRA", AT_CMD_TYPE_UNSOLICITED, bvra_handle },
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+	{ "CNUM", AT_CMD_TYPE_UNSOLICITED, cnum_handle },
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATORS)
+	{ "BIND", AT_CMD_TYPE_UNSOLICITED, bind_handle },
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+};
+
+static const struct unsolicited *hfp_hf_unsol_lookup(struct at_client *hf_at)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(handlers); i++) {
+		if (!strncmp(hf_at->buf, handlers[i].cmd,
+			     strlen(handlers[i].cmd))) {
+			return &handlers[i];
+		}
+	}
+
+	return NULL;
+}
+
+int unsolicited_cb(struct at_client *hf_at, struct net_buf *buf)
+{
+	const struct unsolicited *handler;
+
+	handler = hfp_hf_unsol_lookup(hf_at);
+	if (!handler) {
+		LOG_ERR("Unhandled unsolicited response");
+		return -ENOMSG;
+	}
+
+	if (!at_parse_cmd_input(hf_at, buf, handler->cmd, handler->func,
+				handler->type)) {
+		return 0;
+	}
+
+	return -ENOMSG;
+}
+
+static int send_at_cmee(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	if (hf->ag_features & BT_HFP_AG_FEATURE_EXT_ERR) {
+		return hfp_hf_send_cmd(hf, NULL, cb, "AT+CMEE=1");
+	} else {
+		return -ENOTSUP;
+	}
+}
+
+static int at_cmee_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("CMEE set (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+static int send_at_cops(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+COPS=3,0");
+}
+
+static int at_cops_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("COPS set (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_HFP_HF_CLI)
+static int send_at_clip(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+CLIP=1");
+}
+
+static int at_clip_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("CLIP set (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_CLI */
+
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+static int send_at_vgm(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+VGM=%d", hf->vgm);
+}
+
+static int at_vgm_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("VGM set (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+static int send_at_vgs(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+VGS=%d", hf->vgs);
+}
+
+static int at_vgs_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("VGS set (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int send_at_ccwa(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		return -ENOTSUP;
+	}
+
+	if (!(hf->hf_features & BT_HFP_HF_FEATURE_3WAY_CALL)) {
+		return -ENOTSUP;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+CCWA=1");
+}
+
+static int at_ccwa_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("CCWA set (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+typedef int (*at_send_t)(struct bt_hfp_hf *hf, at_finish_cb_t cb);
+
+static struct at_cmd_init
+{
+	at_send_t send;
+	at_finish_cb_t finish;
+	bool disconnect; /* Disconnect if command failed. */
+} cmd_init_list[] = {
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+	{send_at_vgm, at_vgm_finish, false},
+	{send_at_vgs, at_vgs_finish, false},
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+	{send_at_cmee, at_cmee_finish, false},
+	{send_at_cops, at_cops_finish, false},
+#if defined(CONFIG_BT_HFP_HF_CLI)
+	{send_at_clip, at_clip_finish, false},
+#endif /* CONFIG_BT_HFP_HF_CLI */
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	{send_at_ccwa, at_ccwa_finish, false},
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+};
+
+static int at_cmd_init_start(struct bt_hfp_hf *hf);
+
+static int at_cmd_init_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	at_finish_cb_t finish;
+
+	if (result != AT_RESULT_OK) {
+		LOG_WRN("It is ERROR response of AT command %d.", hf->cmd_init_seq);
+	}
+
+	if (ARRAY_SIZE(cmd_init_list) > hf->cmd_init_seq) {
+		finish = cmd_init_list[hf->cmd_init_seq].finish;
+		if (finish) {
+			(void)finish(hf_at, result, cme_err);
+		}
+	} else {
+		LOG_ERR("Invalid indicator (%d>=%d)", hf->cmd_init_seq,
+		    ARRAY_SIZE(cmd_init_list));
+	}
+
+	/* Goto next AT command */
+	hf->cmd_init_seq++;
+	(void)at_cmd_init_start(hf);
+	return 0;
+}
+
+static int at_cmd_init_start(struct bt_hfp_hf *hf)
+{
+	at_send_t send;
+	int err = -EINVAL;
+
+	while (ARRAY_SIZE(cmd_init_list) > hf->cmd_init_seq) {
+		LOG_DBG("Fetch AT command (%d)", hf->cmd_init_seq);
+		send = cmd_init_list[hf->cmd_init_seq].send;
+		if (send) {
+			LOG_DBG("Send AT command");
+			err = send(hf, at_cmd_init_finish);
+		} else {
+			LOG_WRN("Invalid send func of AT command");
+		}
+
+		if (!err) {
+			break;
+		}
+
+		LOG_WRN("AT command sending failed");
+		if (cmd_init_list[hf->cmd_init_seq].disconnect) {
+			hfp_hf_send_failed(hf);
+			break;
+		}
+		/* Goto next AT command */
+		LOG_WRN("Send next AT command");
+		hf->cmd_init_seq++;
+	}
+	return err;
+}
+
+static void slc_completed(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	struct bt_conn *conn = hf->acl;
+
+	if (bt_hf->connected) {
+		bt_hf->connected(conn, hf);
+	}
+
+	atomic_set_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED);
+
+	/* Start with first AT command */
+	hf->cmd_init_seq = 0;
+	if (at_cmd_init_start(hf)) {
+		LOG_ERR("Fail to start AT command initialization");
+	}
+}
+
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATORS)
+static int send_at_bind_status(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+BIND?");
+}
+
+static int send_at_bind_hf_supported(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	char buffer[4];
+	char *bind;
+
+	hf->hf_ind = 0;
+
+	bind = &buffer[0];
+	if (IS_ENABLED(CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY)) {
+		*bind = '0' + HFP_HF_ENHANCED_SAFETY_IND;
+		bind++;
+		*bind = ',';
+		bind++;
+		hf->hf_ind |= BIT(HFP_HF_ENHANCED_SAFETY_IND);
+	}
+
+	if (IS_ENABLED(CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY)) {
+		*bind = '0' + HFP_HF_BATTERY_LEVEL_IND;
+		bind++;
+		*bind = ',';
+		bind++;
+		hf->hf_ind |= BIT(HFP_HF_BATTERY_LEVEL_IND);
+	}
+
+	if (bind <= &buffer[0]) {
+		return -EINVAL;
+	}
+
+	bind--;
+	*bind = '\0';
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+BIND=%s", buffer);
+}
+
+static int send_at_bind_supported(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+BIND=?");
+}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int send_at_chld_supported(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+CHLD=?");
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+static int send_at_cmer(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	at_register_unsolicited(&hf->at, unsolicited_cb);
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+CMER=3,0,0,1");
+}
+
+static int send_at_cind_status(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, cind_status_resp, cb, "AT+CIND?");
+}
+
+static int send_at_cind_supported(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, cind_resp, cb, "AT+CIND=?");
+}
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+static void get_codec_ids(struct bt_hfp_hf *hf, char *buffer, size_t buffer_len)
+{
+	size_t len = 0;
+	uint8_t ids = hf->hf_codec_ids;
+	int index = 0;
+
+	while (ids && (len < (buffer_len-2))) {
+		if (ids & 0x01) {
+			buffer[len++] = index + '0';
+			buffer[len++] = ',';
+		}
+		index++;
+		ids = ids >> 1;
+	}
+
+	if (len > 0) {
+		len--;
+	}
+
+	buffer[len] = '\0';
+}
+
+static int send_at_bac(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	char ids[sizeof(hf->hf_codec_ids)*2*8 + 1];
+
+	get_codec_ids(hf, &ids[0], ARRAY_SIZE(ids));
+	return hfp_hf_send_cmd(hf, NULL, cb, "AT+BAC=%s", ids);
+}
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+static int send_at_brsf(struct bt_hfp_hf *hf, at_finish_cb_t cb)
+{
+	return hfp_hf_send_cmd(hf, brsf_resp, cb, "AT+BRSF=%u", hf->hf_features);
+}
+
+static struct slc_init
+{
+	at_send_t send;
+	bool disconnect; /* Disconnect if command failed. */
+	uint32_t ag_feature_mask; /* AG feature mask */
+} slc_init_list[] = {
+	{send_at_brsf, true, 0},
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+	{send_at_bac, true, BT_HFP_AG_FEATURE_CODEC_NEG},
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+	{send_at_cind_supported, true, 0},
+	{send_at_cind_status, true, 0},
+	{send_at_cmer, true, 0},
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	{send_at_chld_supported, true, BT_HFP_AG_FEATURE_3WAY_CALL},
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATORS)
+	{send_at_bind_hf_supported, true, BT_HFP_AG_FEATURE_HF_IND},
+	{send_at_bind_supported, true, BT_HFP_AG_FEATURE_HF_IND},
+	{send_at_bind_status, true, BT_HFP_AG_FEATURE_HF_IND},
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+};
+
+static int slc_init_start(struct bt_hfp_hf *hf);
+
+static int slc_init_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	if (result != AT_RESULT_OK) {
+		LOG_WRN("It is ERROR response of AT command %d.", hf->cmd_init_seq);
+		if (slc_init_list[hf->cmd_init_seq].disconnect) {
+			hf_slc_error(&hf->at);
+			return 0;
+		}
+	}
+
+	if (ARRAY_SIZE(slc_init_list) <= hf->cmd_init_seq) {
+		LOG_ERR("Invalid indicator (%d>=%d)", hf->cmd_init_seq,
+		    ARRAY_SIZE(slc_init_list));
+	}
+
+	/* Goto next AT command */
+	hf->cmd_init_seq++;
+	(void)slc_init_start(hf);
+	return 0;
+}
+
+static int slc_init_start(struct bt_hfp_hf *hf)
+{
+	at_send_t send;
+	uint32_t feture_mask;
+	int err = -EINVAL;
+
+	while (ARRAY_SIZE(slc_init_list) > hf->cmd_init_seq) {
+		LOG_DBG("Fetch AT command (%d)", hf->cmd_init_seq);
+		feture_mask = slc_init_list[hf->cmd_init_seq].ag_feature_mask;
+		if (feture_mask && (!(feture_mask & hf->ag_features))) {
+			/* The feature is not supported by AG. Skip the step. */
+			LOG_INF("Skip SLC init step %d", hf->cmd_init_seq);
+			hf->cmd_init_seq++;
+			continue;
+		}
+
+		send = slc_init_list[hf->cmd_init_seq].send;
+		if (send) {
+			LOG_DBG("Send AT command");
+			err = send(hf, slc_init_finish);
+		} else {
+			LOG_WRN("Invalid send func of AT command");
+		}
+
+		if (!err) {
+			break;
+		}
+
+		LOG_WRN("AT command sending failed");
+		if (slc_init_list[hf->cmd_init_seq].disconnect) {
+			hfp_hf_send_failed(hf);
+			break;
+		}
+		/* Goto next AT command */
+		LOG_WRN("Send next AT command");
+		hf->cmd_init_seq++;
+	}
+
+	if (ARRAY_SIZE(slc_init_list) <= hf->cmd_init_seq) {
+		slc_completed(&hf->at);
+	}
+
+	return err;
+}
+
+int hf_slc_establish(struct bt_hfp_hf *hf)
+{
+	int err;
+
+	LOG_DBG("");
+
+	hf->cmd_init_seq = 0;
+	err = slc_init_start(hf);
+	if (err < 0) {
+		hf_slc_error(&hf->at);
+		return err;
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_HFP_HF_CLI)
+static int cli_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("CLIP set (result %d) on %p", result, hf);
+
+	/* AT+CLI is done. */
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_CLI */
+
+int bt_hfp_hf_cli(struct bt_hfp_hf *hf, bool enable)
+{
+#if defined(CONFIG_BT_HFP_HF_CLI)
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		LOG_ERR("SLC is not established on %p", hf);
+		return -EINVAL;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, cli_finish, "AT+CLIP=%d", enable ? 1 : 0);
+	if (err < 0) {
+		LOG_ERR("HFP HF CLI set failed on %p", hf);
+	}
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_CLI */
+}
+
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+static int vgm_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("VGM set (result %d) on %p", result, hf);
+
+	/* AT+VGM is done. */
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+
+int bt_hfp_hf_vgm(struct bt_hfp_hf *hf, uint8_t gain)
+{
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (gain > BT_HFP_HF_VGM_GAIN_MAX) {
+		LOG_ERR("Invalid gain %d>%d", gain, BT_HFP_HF_VGM_GAIN_MAX);
+		return -EINVAL;
+	}
+
+	hf->vgm = gain;
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		return 0;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, vgm_finish, "AT+VGM=%d", gain);
+	if (err < 0) {
+		LOG_ERR("HFP HF VGM set failed on %p", hf);
+	}
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+}
+
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+static int vgs_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("VGS set (result %d) on %p", result, hf);
+
+	/* AT+VGS is done. */
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+
+int bt_hfp_hf_vgs(struct bt_hfp_hf *hf, uint8_t gain)
+{
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (gain > BT_HFP_HF_VGM_GAIN_MAX) {
+		LOG_ERR("Invalid gain %d>%d", gain, BT_HFP_HF_VGM_GAIN_MAX);
+		return -EINVAL;
+	}
+
+	hf->vgs = gain;
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		return 0;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, vgs_finish, "AT+VGS=%d", gain);
+	if (err < 0) {
+		LOG_ERR("HFP HF VGS set failed on %p", hf);
+	}
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+}
+
+static int cops_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	uint32_t mode;
+	uint32_t format;
+	char *operator;
+	int err;
+
+	err = at_get_number(hf_at, &mode);
+	if (err < 0) {
+		LOG_ERR("Error getting value");
+		return err;
+	}
+
+	err = at_get_number(hf_at, &format);
+	if (err < 0) {
+		LOG_ERR("Error getting value");
+		return err;
+	}
+
+	operator = at_get_string(hf_at);
+
+	if (bt_hf && bt_hf->operator) {
+		bt_hf->operator(hf, (uint8_t)mode, (uint8_t)format, operator);
+	}
+
+	return 0;
+}
+
+static int cops_resp(struct at_client *hf_at, struct net_buf *buf)
+{
+	int err;
+
+	LOG_DBG("");
+
+	err = at_parse_cmd_input(hf_at, buf, "COPS", cops_handle,
+				 AT_CMD_TYPE_NORMAL);
+	if (err < 0) {
+		LOG_ERR("Cannot parse response of AT+COPS?");
+		return err;
+	}
+
+	return 0;
+}
+
+static int cops_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+COPS? (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+int bt_hfp_hf_get_operator(struct bt_hfp_hf *hf)
+{
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		return 0;
+	}
+
+	err = hfp_hf_send_cmd(hf, cops_resp, cops_finish, "AT+COPS?");
+	if (err < 0) {
+		LOG_ERR("Fail to read the currently selected operator on %p", hf);
+	}
+
+	return err;
+}
+
+static int binp_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	char *number;
+
+	number = at_get_string(hf_at);
+
+	atomic_set_bit(hf->flags, BT_HFP_HF_FLAG_BINP);
+
+	if (bt_hf && bt_hf->request_phone_number) {
+		bt_hf->request_phone_number(hf, number);
+	}
+
+	return 0;
+}
+
+static int binp_resp(struct at_client *hf_at, struct net_buf *buf)
+{
+	int err;
+
+	LOG_DBG("");
+
+	err = at_parse_cmd_input(hf_at, buf, "BINP", binp_handle,
+				 AT_CMD_TYPE_NORMAL);
+	if (err < 0) {
+		LOG_ERR("Cannot parse response of AT+BINP=1");
+		return err;
+	}
+
+	return 0;
+}
+
+static int binp_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BINP=1 (result %d) on %p", result, hf);
+
+	if (!atomic_test_and_clear_bit(hf->flags, BT_HFP_HF_FLAG_BINP)) {
+		if (bt_hf && bt_hf->request_phone_number) {
+			bt_hf->request_phone_number(hf, NULL);
+		}
+	}
+
+	return 0;
+}
+
+int bt_hfp_hf_request_phone_number(struct bt_hfp_hf *hf)
+{
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		return 0;
+	}
+
+	atomic_clear_bit(hf->flags, BT_HFP_HF_FLAG_BINP);
+
+	err = hfp_hf_send_cmd(hf, binp_resp, binp_finish, "AT+BINP=1");
+	if (err < 0) {
+		LOG_ERR("Fail to request phone number to the AG on %p", hf);
+	}
+
+	return err;
+}
+
+static int vts_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+VTS (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+int bt_hfp_hf_transmit_dtmf_code(struct bt_hfp_hf_call *call, char code)
+{
+	struct bt_hfp_hf *hf;
+	int err;
+
+	LOG_DBG("");
+
+	if (!call) {
+		LOG_ERR("Invalid call");
+		return -ENOTCONN;
+	}
+
+	hf = call->hf;
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		LOG_ERR("SLC is not established on %p", hf);
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING) ||
+		(!(!atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD) &&
+		(atomic_get(call->state) == BT_HFP_HF_CALL_STATE_ACTIVE)))) {
+		LOG_ERR("Invalid call status");
+		return -EINVAL;
+	}
+
+	if (!IS_VALID_DTMF(code)) {
+		LOG_ERR("Invalid code");
+		return -EINVAL;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, vts_finish, "AT+VTS=%c", code);
+	if (err < 0) {
+		LOG_ERR("Fail to tramsit DTMF Codes on %p", hf);
+	}
+
+	return err;
+}
+
+static int cnum_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CNUM (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+int bt_hfp_hf_query_subscriber(struct bt_hfp_hf *hf)
+{
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		LOG_ERR("SLC is not established on %p", hf);
+		return -ENOTCONN;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, cnum_finish, "AT+CNUM");
+	if (err < 0) {
+		LOG_ERR("Fail to query subscriber number information on %p", hf);
+	}
+
+	return err;
+}
+
+static int bia_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BIA (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+int bt_hfp_hf_indicator_status(struct bt_hfp_hf *hf, uint8_t status)
+{
+	int err;
+	size_t index;
+	char buffer[HF_MAX_AG_INDICATORS * 2 + 1];
+	char *bia_status;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		LOG_ERR("SLC is not established on %p", hf);
+		return -ENOTCONN;
+	}
+
+	bia_status = &buffer[0];
+	for (index = 0; index < ARRAY_SIZE(hf->ind_table); index++) {
+		if ((hf->ind_table[index] != -1) && (index < NUM_BITS(sizeof(status)))) {
+			if (status & BIT(hf->ind_table[index])) {
+				*bia_status = '1';
+			} else {
+				*bia_status = '0';
+			}
+			bia_status++;
+			*bia_status = ',';
+			bia_status++;
+		} else {
+			break;
+		}
+	}
+
+	if (bia_status <= &buffer[0]) {
+		LOG_ERR("Not found valid AG indicator on %p", hf);
+		return -EINVAL;
+	}
+
+	bia_status--;
+	*bia_status = '\0';
+
+	err = hfp_hf_send_cmd(hf, NULL, bia_finish, "AT+BIA=%s", buffer);
+	if (err < 0) {
+		LOG_ERR("Fail to activated/deactivated AG indicators on %p", hf);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY)
+static int biev_enh_safety_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BIEV (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY */
+
+int bt_hfp_hf_enhanced_safety(struct bt_hfp_hf *hf, bool enable)
+{
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY)
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		LOG_ERR("SLC is not established on %p", hf);
+		return -ENOTCONN;
+	}
+
+	if (!((hf->hf_ind & BIT(HFP_HF_ENHANCED_SAFETY_IND)) &&
+		(hf->ag_ind & BIT(HFP_HF_ENHANCED_SAFETY_IND)))) {
+		LOG_ERR("The indicator is unsupported");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->ind_enable & BIT(HFP_HF_ENHANCED_SAFETY_IND))) {
+		LOG_ERR("The indicator is disabled");
+		return -EINVAL;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, biev_enh_safety_finish, "AT+BIEV=%d,%d",
+		HFP_HF_ENHANCED_SAFETY_IND, enable ? 1 : 0);
+	if (err < 0) {
+		LOG_ERR("Fail to transfer enhanced safety value on %p", hf);
+	}
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY */
+}
+
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY)
+static int biev_battery_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BIEV (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY */
+
+int bt_hfp_hf_battery(struct bt_hfp_hf *hf, uint8_t level)
+{
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY)
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_CONNECTED)) {
+		LOG_ERR("SLC is not established on %p", hf);
+		return -ENOTCONN;
+	}
+
+	if (!((hf->hf_ind & BIT(HFP_HF_BATTERY_LEVEL_IND)) &&
+		(hf->ag_ind & BIT(HFP_HF_BATTERY_LEVEL_IND)))) {
+		LOG_ERR("The indicator is unsupported");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->ind_enable & BIT(HFP_HF_BATTERY_LEVEL_IND))) {
+		LOG_ERR("The indicator is disabled");
+		return -EINVAL;
+	}
+
+	if (!IS_VALID_BATTERY_LEVEL(level)) {
+		LOG_ERR("Invalid battery level %d", level);
+		return -EINVAL;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, biev_battery_finish, "AT+BIEV=%d,%d",
+		HFP_HF_BATTERY_LEVEL_IND, level);
+	if (err < 0) {
+		LOG_ERR("Fail to transfer remaining battery level on %p", hf);
+	}
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY */
+}
+
+static int ata_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("ATA (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+static int btrh_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BTRH (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+int bt_hfp_hf_accept(struct bt_hfp_hf_call *call)
+{
+	int err;
+	struct bt_hfp_hf *hf;
+	int count;
+
+	LOG_DBG("");
+
+	if (!call) {
+		LOG_ERR("Invalid call");
+		return -EINVAL;
+	}
+
+	hf = call->hf;
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+		LOG_ERR("No valid call");
+		return -EINVAL;
+	}
+
+	count = get_using_call_count(call->hf);
+	if (count > 1) {
+		LOG_ERR("Unsupported 3Way call");
+		return -EINVAL;
+	}
+
+	if (atomic_get(call->state) == BT_HFP_HF_CALL_STATE_WAITING) {
+		err = hfp_hf_send_cmd(hf, NULL, ata_finish, "ATA");
+		if (err < 0) {
+			LOG_ERR("Fail to accept the incoming call on %p", hf);
+		}
+		return err;
+	}
+
+	if (atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD) &&
+		(atomic_get(call->state) == BT_HFP_HF_CALL_STATE_ACTIVE)) {
+		err = hfp_hf_send_cmd(hf, NULL, btrh_finish, "AT+BTRH=%d",
+			BT_HFP_BTRH_ACCEPTED);
+		if (err < 0) {
+			LOG_ERR("Fail to accept the held incoming call on %p", hf);
+		}
+		return err;
+	}
+
+	return -EINVAL;
+}
+
+static int chup_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CHUP (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+int bt_hfp_hf_reject(struct bt_hfp_hf_call *call)
+{
+	int err;
+	struct bt_hfp_hf *hf;
+	int count;
+
+	LOG_DBG("");
+
+	if (!call) {
+		LOG_ERR("Invalid call");
+		return -EINVAL;
+	}
+
+	hf = call->hf;
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+		LOG_ERR("No valid call");
+		return -EINVAL;
+	}
+
+	count = get_using_call_count(call->hf);
+	if (count > 1) {
+		LOG_ERR("Unsupported 3Way call");
+		return -EINVAL;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_REJECT_CALL)) {
+		LOG_ERR("AG has not ability to reject call");
+		return -ENOTSUP;
+	}
+
+	if (atomic_get(call->state) == BT_HFP_HF_CALL_STATE_WAITING) {
+		err = hfp_hf_send_cmd(hf, NULL, chup_finish, "AT+CHUP");
+		if (err < 0) {
+			LOG_ERR("Fail to reject the incoming call on %p", hf);
+		}
+		return err;
+	}
+
+	if (atomic_test_bit(call->flags, BT_HFP_HF_CALL_INCOMING_HELD) &&
+		(atomic_get(call->state) == BT_HFP_HF_CALL_STATE_ACTIVE)) {
+		err = hfp_hf_send_cmd(hf, NULL, btrh_finish, "AT+BTRH=%d",
+			BT_HFP_BTRH_REJECTED);
+		if (err < 0) {
+			LOG_ERR("Fail to reject the held incoming call on %p", hf);
+		}
+		return err;
+	}
+
+	return -EINVAL;
+}
+
+int bt_hfp_hf_terminate(struct bt_hfp_hf_call *call)
+{
+	int err;
+	struct bt_hfp_hf *hf;
+	int count;
+
+	LOG_DBG("");
+
+	if (!call) {
+		LOG_ERR("Invalid call");
+		return -EINVAL;
+	}
+
+	hf = call->hf;
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+		LOG_ERR("No valid call");
+		return -EINVAL;
+	}
+
+	count = get_using_call_count(call->hf);
+	if (count > 1) {
+		LOG_ERR("Unsupported 3Way call");
+		return -EINVAL;
+	}
+
+	if (atomic_get(call->state) == BT_HFP_HF_CALL_STATE_HELD) {
+		LOG_ERR("Held call cannot be terminated");
+		return -EINVAL;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, chup_finish, "AT+CHUP");
+	if (err < 0) {
+		LOG_ERR("Fail to terminate the none held call on %p", hf);
+	}
+
+	return err;
+}
+
+int bt_hfp_hf_hold_incoming(struct bt_hfp_hf_call *call)
+{
+	int err;
+	struct bt_hfp_hf *hf;
+	int count;
+
+	LOG_DBG("");
+
+	if (!call) {
+		LOG_ERR("Invalid call");
+		return -EINVAL;
+	}
+
+	hf = call->hf;
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!atomic_test_bit(call->flags, BT_HFP_HF_CALL_IN_USING)) {
+		LOG_ERR("No valid call");
+		return -EINVAL;
+	}
+
+	count = get_using_call_count(call->hf);
+	if (count > 1) {
+		LOG_ERR("Unsupported 3Way call");
+		return -EINVAL;
+	}
+
+	if (!(atomic_get(call->state) == BT_HFP_HF_CALL_STATE_WAITING)) {
+		LOG_ERR("No incoming call setup in progress");
+		return -EINVAL;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, btrh_finish, "AT+BTRH=%d",
+		BT_HFP_BTRH_ON_HOLD);
+	if (err < 0) {
+		LOG_ERR("Fail to hold the incoming call on %p", hf);
+	}
+
+	return err;
+}
+
+static int query_btrh_handle(struct at_client *hf_at)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	int err;
+	struct bt_hfp_hf_call *call;
+	uint32_t value;
+
+	err = at_get_number(hf_at, &value);
+	if (err < 0) {
+		LOG_ERR("Cannot get value");
+		return err;
+	}
+
+	if (value) {
+		LOG_ERR("Only support value 0");
+		return 0;
+	}
+
+	call = get_call_with_flag(hf, BT_HFP_HF_CALL_INCOMING_HELD);
+	if (!call) {
+		LOG_ERR("Held incoming call is not found");
+		return -EINVAL;
+	}
+
+	if (bt_hf->incoming_held) {
+		bt_hf->incoming_held(call);
+	}
+
+	return 0;
+}
+
+static int query_btrh_resp(struct at_client *hf_at, struct net_buf *buf)
+{
+	int err;
+
+	err = at_parse_cmd_input(hf_at, buf, "BTRH", query_btrh_handle,
+				 AT_CMD_TYPE_NORMAL);
+	if (err < 0) {
+		LOG_ERR("Error parsing CMD input");
+		hf_slc_error(hf_at);
+	}
+
+	return 0;
+}
+
+static int query_btrh_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BTRH? (result %d) on %p", result, hf);
+
+	return 0;
+}
+
+int bt_hfp_hf_query_respond_hold_status(struct bt_hfp_hf *hf)
+{
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	err = hfp_hf_send_cmd(hf, query_btrh_resp, query_btrh_finish, "AT+BTRH?");
+	if (err < 0) {
+		LOG_ERR("Fail to query respond and hold status of AG on %p", hf);
+	}
+
+	return err;
+}
+
+static int bt_hfp_ag_get_cme_err(enum at_cme cme_err)
+{
+	int err;
+
+	switch (cme_err) {
+	case CME_ERROR_OPERATION_NOT_SUPPORTED:
+		err = -EOPNOTSUPP;
+		break;
+	case CME_ERROR_AG_FAILURE:
+		err = -EFAULT;
+		break;
+	case CME_ERROR_MEMORY_FAILURE:
+		err = -ENOSR;
+		break;
+	case CME_ERROR_MEMORY_FULL:
+		err = -ENOMEM;
+		break;
+	case CME_ERROR_DIAL_STRING_TO_LONG:
+		err = -ENAMETOOLONG;
+		break;
+	case CME_ERROR_INVALID_INDEX:
+		err = -EINVAL;
+		break;
+	case CME_ERROR_OPERATION_NOT_ALLOWED:
+		err = -ENOTSUP;
+		break;
+	case CME_ERROR_NO_CONNECTION_TO_PHONE:
+		err = -ENOTCONN;
+		break;
+	default:
+		err = -ENOTSUP;
+		break;
+	}
+
+	return err;
+}
+
+static int atd_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	int err;
+	struct bt_hfp_hf_call *call;
+
+	LOG_DBG("ATD (result %d) on %p", result, hf);
+
+	if (result == AT_RESULT_CME_ERROR) {
+		err = bt_hfp_ag_get_cme_err(cme_err);
+	} else if (result == AT_RESULT_ERROR) {
+		err = -ENOTSUP;
+	} else {
+		err = 0;
+	}
+
+	call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_OUTGOING);
+	if (!call) {
+		return -EINVAL;
+	}
+
+	if (err) {
+		free_call(call);
+	}
+
+	if (bt_hf && bt_hf->dialing) {
+		bt_hf->dialing(hf, err);
+	}
+	return 0;
+}
+
+int bt_hfp_hf_number_call(struct bt_hfp_hf *hf, const char *number)
+{
+	struct bt_hfp_hf_call *call;
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	call = get_dialing_call(hf);
+	if (call) {
+		LOG_ERR("There is a call in alerting or waiting");
+		return -EBUSY;
+	}
+
+	call = get_new_call(hf);
+	if (!call) {
+		LOG_ERR("Not available call object");
+		return -ENOMEM;
+	}
+
+	hf_call_state_update(call, BT_HFP_HF_CALL_STATE_OUTGOING);
+
+	err = hfp_hf_send_cmd(hf, NULL, atd_finish, "ATD%s", number);
+	if (err < 0) {
+		LOG_ERR("Fail to start phone number call on %p", hf);
+	}
+
+	return err;
+}
+
+int bt_hfp_hf_memory_dial(struct bt_hfp_hf *hf, const char *location)
+{
+	struct bt_hfp_hf_call *call;
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	call = get_dialing_call(hf);
+	if (call) {
+		LOG_ERR("There is a call in alerting or waiting");
+		return -EBUSY;
+	}
+
+	call = get_new_call(hf);
+	if (!call) {
+		LOG_ERR("Not available call object");
+		return -ENOMEM;
+	}
+
+	hf_call_state_update(call, BT_HFP_HF_CALL_STATE_OUTGOING);
+
+	err = hfp_hf_send_cmd(hf, NULL, atd_finish, "ATD>%s", location);
+	if (err < 0) {
+		LOG_ERR("Fail to last number re-Dial on %p", hf);
+	}
+
+	return err;
+}
+
+static int bldn_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	int err;
+	struct bt_hfp_hf_call *call;
+
+	LOG_DBG("AT+BLDN (result %d) on %p", result, hf);
+
+	if (result == AT_RESULT_CME_ERROR) {
+		err = bt_hfp_ag_get_cme_err(cme_err);
+	} else if (result == AT_RESULT_ERROR) {
+		err = -ENOTSUP;
+	} else {
+		err = 0;
+	}
+
+	call = get_call_with_state(hf, BT_HFP_HF_CALL_STATE_OUTGOING);
+	if (!call) {
+		return -EINVAL;
+	}
+
+	if (err) {
+		free_call(call);
+	}
+
+	if (bt_hf && bt_hf->dialing) {
+		bt_hf->dialing(hf, err);
+	}
+	return 0;
+}
+
+int bt_hfp_hf_redial(struct bt_hfp_hf *hf)
+{
+	struct bt_hfp_hf_call *call;
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	call = get_dialing_call(hf);
+	if (call) {
+		LOG_ERR("There is a call in alerting or waiting");
+		return -EBUSY;
+	}
+
+	call = get_new_call(hf);
+	if (!call) {
+		LOG_ERR("Not available call object");
+		return -ENOMEM;
+	}
+
+	hf_call_state_update(call, BT_HFP_HF_CALL_STATE_OUTGOING);
+
+	err = hfp_hf_send_cmd(hf, NULL, bldn_finish, "AT+BLDN");
+	if (err < 0) {
+		LOG_ERR("Fail to start memory dialing on %p", hf);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+static int bcc_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("BCC (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+int bt_hfp_hf_audio_connect(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+	int err;
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (hf->chan.sco) {
+		LOG_ERR("Audio conenction has been connected");
+		return -ECONNREFUSED;
+	}
+
+	err = hfp_hf_send_cmd(hf, NULL, bcc_finish, "AT+BCC");
+	if (err < 0) {
+		LOG_ERR("Fail to setup audio connection on %p", hf);
+	}
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+}
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+static int bcs_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("BCS (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+int bt_hfp_hf_select_codec(struct bt_hfp_hf *hf, uint8_t codec_id)
+{
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->hf_codec_ids & BIT(codec_id))) {
+		LOG_ERR("Codec ID is unsupported");
+		return -ENOTSUP;
+	}
+
+	if (!atomic_test_and_clear_bit(hf->flags, BT_HFP_HF_FLAG_CODEC_CONN)) {
+		LOG_ERR("Invalid context");
+		return -ESRCH;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, bcs_finish, "AT+BCS=%d", codec_id);
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+}
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+static int bac_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("BAC (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+int bt_hfp_hf_set_codecs(struct bt_hfp_hf *hf, uint8_t codec_ids)
+{
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+	char ids[sizeof(hf->hf_codec_ids)*2*8 + 1];
+
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (codec_ids & BT_HFP_HF_CODEC_CVSD) {
+		LOG_ERR("CVSD should be supported");
+		return -EINVAL;
+	}
+
+	atomic_clear_bit(hf->flags, BT_HFP_HF_FLAG_CODEC_CONN);
+	hf->hf_codec_ids = codec_ids;
+
+	get_codec_ids(hf, &ids[0], ARRAY_SIZE(ids));
+	return hfp_hf_send_cmd(hf, NULL, bac_finish, "AT+BAC=%s", ids);
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+}
+
+#if defined(CONFIG_BT_HFP_HF_ECNR)
+static int nrec_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+	int err;
+
+	LOG_DBG("AT+NREC=0 (result %d) on %p", result, hf);
+
+	if (result == AT_RESULT_CME_ERROR) {
+		err = bt_hfp_ag_get_cme_err(cme_err);
+	} else if (result == AT_RESULT_ERROR) {
+		err = -ENOTSUP;
+	} else {
+		err = 0;
+	}
+
+	if (bt_hf && bt_hf->ecnr_turn_off) {
+		bt_hf->ecnr_turn_off(hf, err);
+	}
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_ECNR */
+
+int bt_hfp_hf_turn_off_ecnr(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_ECNR)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_ECNR)) {
+		LOG_ERR("EC and/or NR functions is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (hf->chan.sco) {
+		LOG_ERR("Audio conenction has been connected");
+		return -EBUSY;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, nrec_finish, "AT+NREC=0");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_ECNR */
+}
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int ccwa_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CCWA (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+int bt_hfp_hf_call_waiting_notify(struct bt_hfp_hf *hf, bool enable)
+{
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, ccwa_finish, "AT+CCWA=%d", enable ? 1 : 0);
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+}
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int chld_release_all_held_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CHLD=0 (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+int bt_hfp_hf_release_all_held(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->chld_features & BIT(BT_HFP_CHLD_RELEASE_ALL))) {
+		LOG_ERR("Releasing all held calls is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, chld_release_all_held_finish, "AT+CHLD=0");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+}
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int chld_set_udub_finish(struct at_client *hf_at, enum at_result result,
+		   enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CHLD=0 (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+int bt_hfp_hf_set_udub(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
 
-	return 0;
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->chld_features & BIT(BT_HFP_CHLD_RELEASE_ALL))) {
+		LOG_ERR("UDUB is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, chld_set_udub_finish, "AT+CHLD=0");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
 }
 
-int cind_status_finish(struct at_client *hf_at, enum at_result result,
-		       enum at_cme cme_err)
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int chld_release_active_accept_other_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	int err;
 
-	if (result != AT_RESULT_OK) {
-		LOG_ERR("SLC Connection ERROR in response");
-		hf_slc_error(hf_at);
-		return -EINVAL;
+	LOG_DBG("AT+CHLD=1 (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+int bt_hfp_hf_release_active_accept_other(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
 	}
 
-	at_register_unsolicited(hf_at, unsolicited_cb);
-	err = hfp_hf_send_cmd(hf, NULL, cmer_finish, "AT+CMER=3,0,0,1");
-	if (err < 0) {
-		hf_slc_error(hf_at);
-		return err;
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
 	}
 
+	return hfp_hf_send_cmd(hf, NULL, chld_release_active_accept_other_finish,
+	    "AT+CHLD=1");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+}
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int chld_hold_active_accept_other_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CHLD=2 (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
 	return 0;
 }
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+int bt_hfp_hf_hold_active_accept_other(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, chld_hold_active_accept_other_finish,
+	    "AT+CHLD=2");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+}
 
-int cind_finish(struct at_client *hf_at, enum at_result result,
-		enum at_cme cme_err)
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int chld_join_conversation_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	int err;
 
-	if (result != AT_RESULT_OK) {
-		LOG_ERR("SLC Connection ERROR in response");
-		hf_slc_error(hf_at);
-		return -EINVAL;
+	LOG_DBG("AT+CHLD=3 (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+int bt_hfp_hf_join_conversation(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
 	}
 
-	err = hfp_hf_send_cmd(hf, cind_status_resp, cind_status_finish,
-			      "AT+CIND?");
-	if (err < 0) {
-		hf_slc_error(hf_at);
-		return err;
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->chld_features & BIT(BT_HFP_CALL_ACTIVE_HELD))) {
+		LOG_ERR("Adding a held call to the conversation is unsupported by AG");
+		return -ENOTSUP;
 	}
 
+	return hfp_hf_send_cmd(hf, NULL, chld_join_conversation_finish,
+	    "AT+CHLD=3");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+}
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int chld_explicit_call_transfer_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CHLD=4 (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
 	return 0;
 }
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+int bt_hfp_hf_explicit_call_transfer(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	LOG_DBG("");
+
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->chld_features & BIT(BT_HFP_CALL_QUITE))) {
+		LOG_ERR("Expliciting Call Transfer is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, chld_explicit_call_transfer_finish,
+	    "AT+CHLD=4");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+}
 
-int brsf_finish(struct at_client *hf_at, enum at_result result,
-		enum at_cme cme_err)
+#if defined(CONFIG_BT_HFP_HF_ECC)
+static int chld_release_specified_call_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	int err;
 
-	if (result != AT_RESULT_OK) {
-		LOG_ERR("SLC Connection ERROR in response");
-		hf_slc_error(hf_at);
-		return -EINVAL;
+	LOG_DBG("AT+CHLD=1<idx> (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_ECC */
+
+int bt_hfp_hf_release_specified_call(struct bt_hfp_hf_call *call)
+{
+#if defined(CONFIG_BT_HFP_HF_ECC)
+	struct bt_hfp_hf *hf;
+
+	LOG_DBG("");
+
+	if (!call) {
+		LOG_ERR("Invalid call");
+		return -ENOTCONN;
 	}
 
-	err = hfp_hf_send_cmd(hf, cind_resp, cind_finish, "AT+CIND=?");
-	if (err < 0) {
-		hf_slc_error(hf_at);
-		return err;
+	hf = call->hf;
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_ECC)) {
+		LOG_ERR("Enhanced Call Control is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->hf_features & BT_HFP_HF_FEATURE_ECC)) {
+		LOG_ERR("Enhanced Call Control is unsupported by HF");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->chld_features & BIT(BT_HFP_CALL_RELEASE_SPECIFIED_ACTIVE))) {
+		LOG_ERR("Releasing a specific active call is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!call->index) {
+		LOG_ERR("Invalid call index");
+		return -EINVAL;
 	}
 
+	return hfp_hf_send_cmd(hf, NULL, chld_release_specified_call_finish,
+	    "AT+CHLD=1%d", call->index);
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_ECC */
+}
+
+#if defined(CONFIG_BT_HFP_HF_ECC)
+static int chld_private_consultation_mode_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+CHLD=2<idx> (result %d) on %p", result, hf);
+
+	k_work_reschedule(&hf->deferred_work, K_MSEC(HF_ENHANCED_CALL_STATUS_TIMEOUT));
+
 	return 0;
 }
+#endif /* CONFIG_BT_HFP_HF_ECC */
 
-int hf_slc_establish(struct bt_hfp_hf *hf)
+int bt_hfp_hf_private_consultation_mode(struct bt_hfp_hf_call *call)
 {
-	int err;
+#if defined(CONFIG_BT_HFP_HF_ECC)
+	struct bt_hfp_hf *hf;
 
 	LOG_DBG("");
 
-	err = hfp_hf_send_cmd(hf, brsf_resp, brsf_finish, "AT+BRSF=%u",
-			      hf->hf_features);
-	if (err < 0) {
-		hf_slc_error(&hf->at);
-		return err;
+	if (!call) {
+		LOG_ERR("Invalid call");
+		return -ENOTCONN;
+	}
+
+	hf = call->hf;
+	if (!hf) {
+		LOG_ERR("No HF connection found");
+		return -ENOTCONN;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_3WAY_CALL)) {
+		LOG_ERR("Three-way calling is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_ECC)) {
+		LOG_ERR("Enhanced Call Control is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->hf_features & BT_HFP_HF_FEATURE_ECC)) {
+		LOG_ERR("Enhanced Call Control is unsupported by HF");
+		return -ENOTSUP;
+	}
+
+	if (!(hf->chld_features & BIT(BT_HFP_CALL_PRIVATE_CNLTN_MODE))) {
+		LOG_ERR("Private Consultation Mode is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!call->index) {
+		LOG_ERR("Invalid call index");
+		return -EINVAL;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, chld_private_consultation_mode_finish,
+			       "AT+CHLD=2%d", call->index);
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_ECC */
+}
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+static int bvra_1_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BVRA=1 (result %d) on %p", result, hf);
+
+	if (result == AT_RESULT_OK) {
+		if (!atomic_test_and_set_bit(hf->flags, BT_HFP_HF_FLAG_VRE_ACTIVATE)) {
+			if (bt_hf->voice_recognition) {
+				bt_hf->voice_recognition(hf, true);
+			}
+		}
 	}
 
 	return 0;
 }
 
-static struct bt_hfp_hf *bt_hfp_hf_lookup_bt_conn(struct bt_conn *conn)
+static int bvra_0_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
 {
-	int i;
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
 
-	for (i = 0; i < ARRAY_SIZE(bt_hfp_hf_pool); i++) {
-		struct bt_hfp_hf *hf = &bt_hfp_hf_pool[i];
+	LOG_DBG("AT+BVRA=0 (result %d) on %p", result, hf);
 
-		if (hf->acl == conn) {
-			return hf;
+	if (atomic_test_and_clear_bit(hf->flags, BT_HFP_HF_FLAG_VRE_ACTIVATE)) {
+		if (bt_hf->voice_recognition) {
+			bt_hf->voice_recognition(hf, false);
 		}
 	}
 
-	return NULL;
+	return 0;
 }
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
 
-int bt_hfp_hf_send_cmd(struct bt_conn *conn, enum bt_hfp_hf_at_cmd cmd)
+int bt_hfp_hf_voice_recognition(struct bt_hfp_hf *hf, bool activate)
 {
-	struct bt_hfp_hf *hf;
-	int err;
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+	at_finish_cb_t finish;
 
 	LOG_DBG("");
 
-	if (!conn) {
-		LOG_ERR("Invalid connection");
+	if (!hf) {
+		LOG_ERR("No HF connection found");
 		return -ENOTCONN;
 	}
 
-	hf = bt_hfp_hf_lookup_bt_conn(conn);
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_VOICE_RECG)) {
+		LOG_ERR("Voice recognition is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (activate) {
+		finish = bvra_1_finish;
+	} else {
+		finish = bvra_0_finish;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, finish, "AT+BVRA=%d",
+		activate ? 1 : 0);
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+}
+
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+static int bvra_2_finish(struct at_client *hf_at,
+		   enum at_result result, enum at_cme cme_err)
+{
+	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
+
+	LOG_DBG("AT+BVRA=2 (result %d) on %p", result, hf);
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
+
+int bt_hfp_hf_ready_to_accept_audio(struct bt_hfp_hf *hf)
+{
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+	LOG_DBG("");
+
 	if (!hf) {
 		LOG_ERR("No HF connection found");
 		return -ENOTCONN;
 	}
 
-	switch (cmd) {
-	case BT_HFP_HF_ATA:
-		err = hfp_hf_send_cmd(hf, NULL, cmd_complete, "ATA");
-		if (err < 0) {
-			LOG_ERR("Failed ATA");
-			return err;
-		}
-		break;
-	case BT_HFP_HF_AT_CHUP:
-		err = hfp_hf_send_cmd(hf, NULL, cmd_complete, "AT+CHUP");
-		if (err < 0) {
-			LOG_ERR("Failed AT+CHUP");
-			return err;
-		}
-		break;
-	default:
-		LOG_ERR("Invalid AT Command");
+	if (!(hf->ag_features & BT_HFP_AG_FEATURE_VOICE_RECG)) {
+		LOG_ERR("Voice recognition is unsupported by AG");
+		return -ENOTSUP;
+	}
+
+	if (!atomic_test_bit(hf->flags, BT_HFP_HF_FLAG_VRE_ACTIVATE)) {
+		LOG_ERR("Voice recognition is not activated");
 		return -EINVAL;
 	}
 
-	return 0;
+	if (!hf->chan.sco) {
+		LOG_ERR("SCO channel is not ready");
+		return -ENOTCONN;
+	}
+
+	return hfp_hf_send_cmd(hf, NULL, bvra_2_finish, "AT+BVRA=2");
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
 }
 
 static void hfp_hf_connected(struct bt_rfcomm_dlc *dlc)
@@ -694,21 +3919,27 @@ static void hfp_hf_connected(struct bt_rfcomm_dlc *dlc)
 static void hfp_hf_disconnected(struct bt_rfcomm_dlc *dlc)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(dlc, struct bt_hfp_hf, rfcomm_dlc);
-	struct bt_conn *conn = hf->acl;
 
 	LOG_DBG("hf disconnected!");
 	if (bt_hf->disconnected) {
-		bt_hf->disconnected(conn);
+		bt_hf->disconnected(hf);
 	}
+
+	k_work_cancel(&hf->work);
+	k_work_cancel_delayable(&hf->deferred_work);
+	hf->acl = NULL;
 }
 
 static void hfp_hf_recv(struct bt_rfcomm_dlc *dlc, struct net_buf *buf)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(dlc, struct bt_hfp_hf, rfcomm_dlc);
 
+	atomic_set_bit(hf->flags, BT_HFP_HF_FLAG_RX_ONGOING);
 	if (at_parse_input(&hf->at, buf) < 0) {
 		LOG_ERR("Parsing failed");
 	}
+	atomic_clear_bit(hf->flags, BT_HFP_HF_FLAG_RX_ONGOING);
+	k_work_submit(&hf->work);
 }
 
 static void hfp_hf_sent(struct bt_rfcomm_dlc *dlc, int err)
@@ -716,55 +3947,83 @@ static void hfp_hf_sent(struct bt_rfcomm_dlc *dlc, int err)
 	LOG_DBG("DLC %p sent cb (err %d)", dlc, err);
 }
 
-static int bt_hfp_hf_accept(struct bt_conn *conn, struct bt_rfcomm_server *server,
-			    struct bt_rfcomm_dlc **dlc)
+static void bt_hf_work(struct k_work *work)
 {
-	int i;
+	struct bt_hfp_hf *hf = CONTAINER_OF(work, struct bt_hfp_hf, work);
+
+	hfp_hf_send_data(hf);
+}
+
+static struct bt_hfp_hf *hfp_hf_create(struct bt_conn *conn)
+{
+	size_t index;
 	static struct bt_rfcomm_dlc_ops ops = {
 		.connected = hfp_hf_connected,
 		.disconnected = hfp_hf_disconnected,
 		.recv = hfp_hf_recv,
 		.sent = hfp_hf_sent,
 	};
+	struct bt_hfp_hf *hf;
 
 	LOG_DBG("conn %p", conn);
 
-	for (i = 0; i < ARRAY_SIZE(bt_hfp_hf_pool); i++) {
-		struct bt_hfp_hf *hf = &bt_hfp_hf_pool[i];
-		int j;
+	index = (size_t)bt_conn_index(conn);
+	hf = &bt_hfp_hf_pool[index];
+	if (hf->acl) {
+		LOG_ERR("HF connection (%p) is established", conn);
+		return NULL;
+	}
 
-		if (hf->rfcomm_dlc.session) {
-			continue;
-		}
+	memset(hf, 0, sizeof(*hf));
 
-		hf->acl = conn;
-		hf->at.buf = hf->hf_buffer;
-		hf->at.buf_max_len = HF_MAX_BUF_LEN;
+	hf->acl = conn;
+	hf->at.buf = hf->hf_buffer;
+	hf->at.buf_max_len = HF_MAX_BUF_LEN;
 
-		hf->rfcomm_dlc.ops = &ops;
-		hf->rfcomm_dlc.mtu = BT_HFP_MAX_MTU;
+	hf->rfcomm_dlc.ops = &ops;
+	hf->rfcomm_dlc.mtu = BT_HFP_MAX_MTU;
 
-		*dlc = &hf->rfcomm_dlc;
+	/* Set the supported features*/
+	hf->hf_features = BT_HFP_HF_SUPPORTED_FEATURES;
 
-		/* Set the supported features*/
-		hf->hf_features = BT_HFP_HF_SUPPORTED_FEATURES;
+	/* Set supported codec ids */
+	hf->hf_codec_ids = BT_HFP_HF_SUPPORTED_CODEC_IDS;
 
-		for (j = 0; j < HF_MAX_AG_INDICATORS; j++) {
-			hf->ind_table[j] = -1;
-		}
+	k_fifo_init(&hf->tx_pending);
 
-		return 0;
+	k_work_init(&hf->work, bt_hf_work);
+
+	k_work_init_delayable(&hf->deferred_work, bt_hf_deferred_work);
+
+	for (index = 0; index < ARRAY_SIZE(hf->ind_table); index++) {
+		hf->ind_table[index] = -1;
+	}
+
+	return hf;
+}
+
+static int hfp_hf_accept(struct bt_conn *conn, struct bt_rfcomm_server *server,
+			 struct bt_rfcomm_dlc **dlc)
+{
+	struct bt_hfp_hf *hf;
+
+	hf = hfp_hf_create(conn);
+
+	if (!hf) {
+		return -ECONNREFUSED;
 	}
 
-	LOG_ERR("Unable to establish HF connection (%p)", conn);
+	*dlc = &hf->rfcomm_dlc;
 
-	return -ENOMEM;
+	return 0;
 }
 
 static void hfp_hf_sco_connected(struct bt_sco_chan *chan)
 {
+	struct bt_hfp_hf *hf = CONTAINER_OF(chan, struct bt_hfp_hf, chan);
+
 	if ((bt_hf != NULL) && (bt_hf->sco_connected)) {
-		bt_hf->sco_connected(chan->sco->sco.acl, chan->sco);
+		bt_hf->sco_connected(hf, chan->sco);
 	}
 }
 
@@ -778,42 +4037,34 @@ static void hfp_hf_sco_disconnected(struct bt_sco_chan *chan, uint8_t reason)
 static int bt_hfp_hf_sco_accept(const struct bt_sco_accept_info *info,
 		      struct bt_sco_chan **chan)
 {
-	int i;
 	static struct bt_sco_chan_ops ops = {
 		.connected = hfp_hf_sco_connected,
 		.disconnected = hfp_hf_sco_disconnected,
 	};
+	size_t index;
+	struct bt_hfp_hf *hf;
 
 	LOG_DBG("conn %p", info->acl);
 
-	for (i = 0; i < ARRAY_SIZE(bt_hfp_hf_pool); i++) {
-		struct bt_hfp_hf *hf = &bt_hfp_hf_pool[i];
-
-		if (NULL == hf->rfcomm_dlc.session) {
-			continue;
-		}
-
-		if (info->acl != hf->rfcomm_dlc.session->br_chan.chan.conn) {
-			continue;
-		}
-
-		hf->chan.ops = &ops;
-
-		*chan = &hf->chan;
-
-		return 0;
+	index = (size_t)bt_conn_index(info->acl);
+	hf = &bt_hfp_hf_pool[index];
+	if (hf->acl != info->acl) {
+		LOG_ERR("ACL %p of HF is unaligned with SCO's %p", hf->acl, info->acl);
+		return -EINVAL;
 	}
 
-	LOG_ERR("Unable to establish HF connection (%p)", info->acl);
+	hf->chan.ops = &ops;
+
+	*chan = &hf->chan;
 
-	return -ENOMEM;
+	return 0;
 }
 
 static void hfp_hf_init(void)
 {
 	static struct bt_rfcomm_server chan = {
 		.channel = BT_RFCOMM_CHAN_HFP_HF,
-		.accept = bt_hfp_hf_accept,
+		.accept = hfp_hf_accept,
 	};
 
 	bt_rfcomm_server_register(&chan);
@@ -844,3 +4095,43 @@ int bt_hfp_hf_register(struct bt_hfp_hf_cb *cb)
 
 	return 0;
 }
+
+int bt_hfp_hf_connect(struct bt_conn *conn, struct bt_hfp_hf **hf, uint8_t channel)
+{
+	struct bt_hfp_hf *new_hf;
+	int err;
+
+	if (!conn || !hf || !channel) {
+		return -EINVAL;
+	}
+
+	if (!bt_hf) {
+		return -EFAULT;
+	}
+
+	new_hf = hfp_hf_create(conn);
+	if (!new_hf) {
+		return -ECONNREFUSED;
+	}
+
+	err = bt_rfcomm_dlc_connect(conn, &new_hf->rfcomm_dlc, channel);
+	if (err != 0) {
+		(void)memset(new_hf, 0, sizeof(*new_hf));
+		*hf = NULL;
+	} else {
+		*hf = new_hf;
+	}
+
+	return err;
+}
+
+int bt_hfp_hf_disconnect(struct bt_hfp_hf *hf)
+{
+	LOG_DBG("");
+
+	if (!hf) {
+		return -EINVAL;
+	}
+
+	return bt_rfcomm_dlc_disconnect(&hf->rfcomm_dlc);
+}
diff --git a/subsys/bluetooth/host/classic/hfp_hf_internal.h b/subsys/bluetooth/host/classic/hfp_hf_internal.h
new file mode 100644
index 0000000000000..caecc60dac9fa
--- /dev/null
+++ b/subsys/bluetooth/host/classic/hfp_hf_internal.h
@@ -0,0 +1,223 @@
+/** @file
+ *  @brief Internal APIs for Bluetooth Handsfree profile handling.
+ */
+
+/*
+ * Copyright (c) 2015-2016 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "hfp_internal.h"
+
+#if defined(CONFIG_BT_HFP_HF_CLI)
+#define BT_HFP_HF_FEATURE_CLI_ENABLE BT_HFP_HF_FEATURE_CLI
+#define BT_HFP_HF_SDP_FEATURE_CLI_ENABLE BT_HFP_HF_SDP_FEATURE_CLI
+#else
+#define BT_HFP_HF_FEATURE_CLI_ENABLE 0
+#define BT_HFP_HF_SDP_FEATURE_CLI_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_CLI */
+
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+#define BT_HFP_HF_FEATURE_VOLUME_ENABLE BT_HFP_HF_FEATURE_VOLUME
+#define BT_HFP_HF_SDP_FEATURE_VOLUME_ENABLE BT_HFP_HF_SDP_FEATURE_VOLUME
+#else
+#define BT_HFP_HF_FEATURE_VOLUME_ENABLE 0
+#define BT_HFP_HF_SDP_FEATURE_VOLUME_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+#define BT_HFP_HF_CODEC_NEG_ENABLE BT_HFP_HF_FEATURE_CODEC_NEG
+#else
+#define BT_HFP_HF_CODEC_NEG_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+#if defined(CONFIG_BT_HFP_HF_ECNR)
+#define BT_HFP_HF_FEATURE_ECNR_ENABLE BT_HFP_HF_FEATURE_ECNR
+#define BT_HFP_HF_SDP_FEATURE_ECNR_ENABLE BT_HFP_HF_SDP_FEATURE_ECNR
+#else
+#define BT_HFP_HF_FEATURE_ECNR_ENABLE 0
+#define BT_HFP_HF_SDP_FEATURE_ECNR_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+#define BT_HFP_HF_FEATURE_3WAY_CALL_ENABLE BT_HFP_HF_FEATURE_3WAY_CALL
+#define BT_HFP_HF_SDP_FEATURE_3WAY_CALL_ENABLE BT_HFP_HF_SDP_FEATURE_3WAY_CALL
+#else
+#define BT_HFP_HF_FEATURE_3WAY_CALL_ENABLE 0
+#define BT_HFP_HF_SDP_FEATURE_3WAY_CALL_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+#if defined(CONFIG_BT_HFP_HF_ECS)
+#define BT_HFP_HF_FEATURE_ECS_ENABLE BT_HFP_HF_FEATURE_ECS
+#else
+#define BT_HFP_HF_FEATURE_ECS_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_ECS */
+
+#if defined(CONFIG_BT_HFP_HF_ECC)
+#define BT_HFP_HF_FEATURE_ECC_ENABLE BT_HFP_HF_FEATURE_ECC
+#else
+#define BT_HFP_HF_FEATURE_ECC_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_ECC */
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+#define BT_HFP_HF_FEATURE_VOICE_RECG_ENABLE BT_HFP_HF_FEATURE_VOICE_RECG
+#define BT_HFP_HF_SDP_FEATURE_VOICE_RECG_ENABLE BT_HFP_HF_SDP_FEATURE_VOICE_RECG
+#else
+#define BT_HFP_HF_FEATURE_VOICE_RECG_ENABLE 0
+#define BT_HFP_HF_SDP_FEATURE_VOICE_RECG_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+#define BT_HFP_HF_FEATURE_ENH_VOICE_RECG_ENABLE BT_HFP_HF_FEATURE_ENH_VOICE_RECG
+#define BT_HFP_HF_SDP_FEATURE_ENH_VOICE_RECG_ENABLE BT_HFP_HF_SDP_FEATURE_ENH_VOICE_RECG
+#else
+#define BT_HFP_HF_FEATURE_ENH_VOICE_RECG_ENABLE 0
+#define BT_HFP_HF_SDP_FEATURE_ENH_VOICE_RECG_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG_TEXT)
+#define BT_HFP_HF_FEATURE_VOICE_RECG_TEXT_ENABLE BT_HFP_HF_FEATURE_VOICE_RECG_TEXT
+#define BT_HFP_HF_SDP_FEATURE_VOICE_RECG_TEXT_ENABLE BT_HFP_HF_SDP_FEATURE_VOICE_RECG_TEXT
+#else
+#define BT_HFP_HF_FEATURE_VOICE_RECG_TEXT_ENABLE 0
+#define BT_HFP_HF_SDP_FEATURE_VOICE_RECG_TEXT_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG_TEXT */
+
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATORS)
+#define BT_HFP_HF_FEATURE_HF_IND_ENABLE BT_HFP_HF_FEATURE_HF_IND
+#else
+#define BT_HFP_HF_FEATURE_HF_IND_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+
+/* HFP HF Supported features */
+#define BT_HFP_HF_SUPPORTED_FEATURES (\
+	BT_HFP_HF_FEATURE_CLI_ENABLE | \
+	BT_HFP_HF_SDP_FEATURE_VOLUME_ENABLE |\
+	BT_HFP_HF_CODEC_NEG_ENABLE | \
+	BT_HFP_HF_FEATURE_ECNR_ENABLE | \
+	BT_HFP_HF_FEATURE_3WAY_CALL_ENABLE | \
+	BT_HFP_HF_FEATURE_ECS_ENABLE | \
+	BT_HFP_HF_FEATURE_ECC_ENABLE | \
+	BT_HFP_HF_FEATURE_VOICE_RECG_ENABLE | \
+	BT_HFP_HF_FEATURE_ENH_VOICE_RECG_ENABLE | \
+	BT_HFP_HF_FEATURE_VOICE_RECG_TEXT_ENABLE | \
+	BT_HFP_HF_FEATURE_HF_IND_ENABLE)
+
+/* HFP HF Supported features in SDP */
+#define BT_HFP_HF_SDP_SUPPORTED_FEATURES (\
+	BT_HFP_HF_SDP_FEATURE_CLI_ENABLE | \
+	BT_HFP_HF_SDP_FEATURE_VOLUME_ENABLE | \
+	BT_HFP_HF_SDP_FEATURE_ECNR_ENABLE | \
+	BT_HFP_HF_SDP_FEATURE_3WAY_CALL_ENABLE | \
+	BT_HFP_HF_SDP_FEATURE_VOICE_RECG_ENABLE | \
+	BT_HFP_HF_SDP_FEATURE_ENH_VOICE_RECG_ENABLE | \
+	BT_HFP_HF_SDP_FEATURE_VOICE_RECG_TEXT_ENABLE)
+
+#define BT_HFP_HF_CODEC_CVSD_MASK BIT(BT_HFP_HF_CODEC_CVSD)
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_MSBC)
+#define BT_HFP_HF_CODEC_MSBC_ENABLE BIT(BT_HFP_HF_CODEC_MSBC)
+#else
+#define BT_HFP_HF_CODEC_MSBC_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_CODEC_MSBC */
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_LC3_SWB)
+#define BT_HFP_HF_CODEC_LC3_SWB_ENABLE BIT(BT_HFP_HF_CODEC_LC3_SWB)
+#else
+#define BT_HFP_HF_CODEC_LC3_SWB_ENABLE 0
+#endif /* CONFIG_BT_HFP_HF_CODEC_LC3_SWB */
+
+/* HFP HF Supported Codec IDs*/
+#define BT_HFP_HF_SUPPORTED_CODEC_IDS \
+	BT_HFP_HF_CODEC_CVSD_MASK | \
+	BT_HFP_HF_CODEC_MSBC_ENABLE | \
+	BT_HFP_HF_CODEC_LC3_SWB_ENABLE
+
+/* bt_hfp_hf flags: the flags defined here represent hfp hf parameters */
+enum {
+	BT_HFP_HF_FLAG_CONNECTED,     /* HFP HF SLC Established */
+	BT_HFP_HF_FLAG_TX_ONGOING,    /* HFP HF TX is ongoing */
+	BT_HFP_HF_FLAG_RX_ONGOING,    /* HFP HF RX is ongoing */
+	BT_HFP_HF_FLAG_CODEC_CONN,    /* HFP HF codec connection setup */
+	BT_HFP_HF_FLAG_CLCC_PENDING,  /* HFP HF CLCC is pending */
+	BT_HFP_HF_FLAG_VRE_ACTIVATE,  /* VRE is activated */
+	BT_HFP_HF_FLAG_BINP,          /* +BINP result code is received */
+	/* Total number of flags - must be at the end of the enum */
+	BT_HFP_HF_NUM_FLAGS,
+};
+
+/* bt_hfp_hf_call flags: the flags defined here represent hfp hf call parameters */
+enum {
+	BT_HFP_HF_CALL_IN_USING,      /* Object is in using */
+	BT_HFP_HF_CALL_CLCC,          /* CLCC report received */
+	BT_HFP_HF_CALL_INCOMING,      /* Incoming call */
+	BT_HFP_HF_CALL_INCOMING_HELD, /* Incoming call held */
+	BT_HFP_HF_CALL_OUTGOING_3WAY, /* Outgoing 3 way call */
+	BT_HFP_HF_CALL_INCOMING_3WAY, /* Incoming 3 way call */
+
+	/* Total number of flags - must be at the end of the enum */
+	BT_HFP_HF_CALL_NUM_FLAGS,
+};
+
+/* bt_hfp_hf_call state: the flags defined here represent hfp hf call state parameters */
+enum {
+	/* Call state flags */
+	BT_HFP_HF_CALL_STATE_TERMINATE, /* Call terminate */
+	BT_HFP_HF_CALL_STATE_OUTGOING,  /* Call outgoing */
+	BT_HFP_HF_CALL_STATE_INCOMING,  /* Call incoming */
+	BT_HFP_HF_CALL_STATE_ALERTING,  /* Call alerting */
+	BT_HFP_HF_CALL_STATE_WAITING,   /* Call waiting */
+	BT_HFP_HF_CALL_STATE_ACTIVE,    /* Call active */
+	BT_HFP_HF_CALL_STATE_HELD,      /* Call held */
+
+	/* Total number of flags - must be at the end of the enum */
+	BT_HFP_HF_CALL_STATE_NUM_FLAGS,
+};
+
+struct bt_hfp_hf_call {
+	struct bt_hfp_hf *hf;
+	uint8_t index;
+
+	ATOMIC_DEFINE(flags, BT_HFP_HF_CALL_NUM_FLAGS);
+	ATOMIC_DEFINE(state, BT_HFP_HF_CALL_STATE_NUM_FLAGS);
+};
+
+struct bt_hfp_hf {
+	struct bt_rfcomm_dlc rfcomm_dlc;
+	/* ACL connection handle */
+	struct bt_conn *acl;
+	/* AT command sending queue */
+	at_finish_cb_t backup_finish;
+	struct k_fifo tx_pending;
+	/* SCO Channel */
+	struct bt_sco_chan chan;
+	char hf_buffer[HF_MAX_BUF_LEN];
+	struct at_client at;
+	uint32_t hf_features;
+	uint32_t ag_features;
+	uint8_t hf_codec_ids;
+	uint8_t vgm;
+	uint8_t vgs;
+	int8_t ind_table[HF_MAX_AG_INDICATORS];
+
+	uint32_t hf_ind;
+	uint32_t ag_ind;
+	uint32_t ind_enable;
+
+	/* AT command initialization indicator */
+	uint8_t cmd_init_seq;
+
+	/* The features supported by AT+CHLD */
+	uint32_t chld_features;
+
+	/* Worker for pending TX */
+	struct k_work work;
+
+	struct k_work_delayable deferred_work;
+
+	/* calls */
+	struct bt_hfp_hf_call calls[CONFIG_BT_HFP_HF_MAX_CALLS];
+
+	ATOMIC_DEFINE(flags, BT_HFP_HF_NUM_FLAGS);
+};
diff --git a/subsys/bluetooth/host/classic/hfp_internal.h b/subsys/bluetooth/host/classic/hfp_internal.h
index 116807187046e..03a85e1a1230f 100644
--- a/subsys/bluetooth/host/classic/hfp_internal.h
+++ b/subsys/bluetooth/host/classic/hfp_internal.h
@@ -41,37 +41,130 @@
 #define BT_HFP_HF_FEATURE_ENH_VOICE_RECG  0x00000400 /* Enhanced Voice Recognition Status */
 #define BT_HFP_HF_FEATURE_VOICE_RECG_TEXT 0x00000800 /* Voice Recognition Text */
 
-/* HFP HF Supported features */
-#define BT_HFP_HF_SUPPORTED_FEATURES (BT_HFP_HF_FEATURE_CLI | BT_HFP_HF_FEATURE_VOLUME)
+/* HFP HF Features in SDP */
+#define BT_HFP_HF_SDP_FEATURE_ECNR            BIT(0) /* EC and/or NR function */
+#define BT_HFP_HF_SDP_FEATURE_3WAY_CALL       BIT(1) /* Three-way calling */
+#define BT_HFP_HF_SDP_FEATURE_CLI             BIT(2) /* CLI presentation */
+#define BT_HFP_HF_SDP_FEATURE_VOICE_RECG      BIT(3) /* Voice recognition */
+#define BT_HFP_HF_SDP_FEATURE_VOLUME          BIT(4) /* Remote volume control */
+#define BT_HFP_HF_SDP_FEATURE_WBS             BIT(5) /* Wide Band Speech */
+#define BT_HFP_HF_SDP_FEATURE_ENH_VOICE_RECG  BIT(6) /* Enhanced Voice Recognition Status */
+#define BT_HFP_HF_SDP_FEATURE_VOICE_RECG_TEXT BIT(7) /* Voice Recognition Text */
+#define BT_HFP_HF_SDP_FEATURE_SUPER_WBS       BIT(7) /* Super Wide Band Speech */
 
+/* HFP AG Features in SDP */
+#define BT_HFP_AG_SDP_FEATURE_3WAY_CALL       BIT(0) /* Three-way calling */
+#define BT_HFP_AG_SDP_FEATURE_ECNR            BIT(1) /* EC and/or NR function */
+#define BT_HFP_AG_SDP_FEATURE_VOICE_RECG      BIT(2) /* Voice recognition */
+#define BT_HFP_AG_SDP_FEATURE_INBAND_RINGTONE BIT(3) /* In-band ring tone capability */
+#define BT_HFP_AG_SDP_FEATURE_VOICE_TAG       BIT(4) /* Attach no. to voice tag */
+#define BT_HFP_AG_SDP_FEATURE_WBS             BIT(5) /* Wide Band Speech */
+#define BT_HFP_AG_SDP_FEATURE_ENH_VOICE_RECG  BIT(6) /* Enhanced Voice Recognition Status */
+#define BT_HFP_AG_SDP_FEATURE_VOICE_RECG_TEXT BIT(7) /* Voice Recognition Text */
+#define BT_HFP_AG_SDP_FEATURE_SUPER_WBS       BIT(8) /* Super Wide Band Speech */
 #define HF_MAX_BUF_LEN       BT_HF_CLIENT_MAX_PDU
 #define HF_MAX_AG_INDICATORS 20
 
-struct bt_hfp_hf {
-	struct bt_rfcomm_dlc rfcomm_dlc;
-	/* ACL connection handle */
-	struct bt_conn *acl;
-	/* SCO Channel */
-	struct bt_sco_chan chan;
-	char hf_buffer[HF_MAX_BUF_LEN];
-	struct at_client at;
-	uint32_t hf_features;
-	uint32_t ag_features;
-	int8_t ind_table[HF_MAX_AG_INDICATORS];
-};
+#define BT_HFP_HF_VGM_GAIN_MAX 15
+#define BT_HFP_HF_VGM_GAIN_MIN 0
 
-enum hfp_hf_ag_indicators {
-	HF_SERVICE_IND,
-	HF_CALL_IND,
-	HF_CALL_SETUP_IND,
-	HF_CALL_HELD_IND,
-	HF_SINGNAL_IND,
-	HF_ROAM_IND,
-	HF_BATTERY_IND
-};
+#define BT_HFP_HF_VGS_GAIN_MAX 15
+#define BT_HFP_HF_VGS_GAIN_MIN 0
 
 /* HFP call setup status */
 #define BT_HFP_CALL_SETUP_NONE            0
 #define BT_HFP_CALL_SETUP_INCOMING        1
 #define BT_HFP_CALL_SETUP_OUTGOING        2
 #define BT_HFP_CALL_SETUP_REMOTE_ALERTING 3
+
+/* HFP incoming call status */
+#define BT_HFP_BTRH_ON_HOLD  0
+#define BT_HFP_BTRH_ACCEPTED 1
+#define BT_HFP_BTRH_REJECTED 2
+
+/* HFP Call held status */
+/* No calls held */
+#define BT_HFP_CALL_HELD_NONE        0
+/* Call is placed on hold or active/held calls swapped
+ * The AG has both an active AND a held call
+ */
+#define BT_HFP_CALL_HELD_ACTIVE_HELD 1
+/* Call on hold, no active call */
+#define BT_HFP_CALL_HELD_HELD        2
+
+/* HFP AT+CHLD command value */
+/* Releases all held calls or sets User Determined User Busy
+ * (UDUB) for a waiting call
+ */
+#define BT_HFP_CHLD_RELEASE_ALL                 0
+/* Releases all active calls (if any exist) and accepts the
+ * other (held or waiting) call.
+ */
+#define BT_HFP_CHLD_RELEASE_ACTIVE_ACCEPT_OTHER 1
+/* Places all active calls (if any exist) on hold and accepts
+ * the other (held or waiting) call
+ */
+#define BT_HFP_CALL_HOLD_ACTIVE_ACCEPT_OTHER    2
+/* Adds a held call to the conversation */
+#define BT_HFP_CALL_ACTIVE_HELD                 3
+/* Connects the two calls and disconnects the subscriber from
+ * both calls (Explicit Call Transfer).
+ * Support for this value and its associated functionality is
+ * optional for the HF.
+ */
+#define BT_HFP_CALL_QUITE	                    4
+/* Release a specific active call */
+#define BT_HFP_CALL_RELEASE_SPECIFIED_ACTIVE    10
+/* Private Consultation Mode
+ * place all parties of a multiparty call on hold with the
+ * exception of the specified call.
+ */
+#define BT_HFP_CALL_PRIVATE_CNLTN_MODE          20
+
+/* Active */
+#define BT_HFP_CLCC_STATUS_ACTIVE         0
+/* Held */
+#define BT_HFP_CLCC_STATUS_HELD           1
+/* Dialing (outgoing calls only) */
+#define BT_HFP_CLCC_STATUS_DIALING        2
+/* Alerting (outgoing calls only) */
+#define BT_HFP_CLCC_STATUS_ALERTING       3
+/* Incoming (incoming calls only) */
+#define BT_HFP_CLCC_STATUS_INCOMING       4
+/* Waiting (incoming calls only) */
+#define BT_HFP_CLCC_STATUS_WAITING        5
+/* Call held by Response and Hold */
+#define BT_HFP_CLCC_STATUS_CALL_HELD_HOLD 6
+
+/* BVRA Value */
+/* BVRA Deactivation */
+#define BT_HFP_BVRA_DEACTIVATION    0
+/* BVRA Activation */
+#define BT_HFP_BVRA_ACTIVATION      1
+/* Ready to accept audio */
+#define BT_HFP_BVRA_READY_TO_ACCEPT 2
+
+/* a maximum of 4 characters in length, but
+ * less than 4 characters in length is valid.
+ */
+#define BT_HFP_BVRA_TEXT_ID_MAX_LEN 4
+
+/* BVRA VRE state */
+/* BVRA VRE state: the AG is ready to accept audio input */
+#define BT_HFP_BVRA_STATE_ACCEPT_INPUT BIT(0)
+/* BVRA VRE state: the AG is sending audio to the HF */
+#define BT_HFP_BVRA_STATE_SEND_AUDIO BIT(1)
+/* BVRA VRE state: the AG is processing the audio input */
+#define BT_HFP_BVRA_STATE_PROCESS_AUDIO BIT(2)
+
+#define IS_VALID_DTMF(c) ((((c) >= '0') && ((c) <= '9')) || \
+	(((c) >= 'A') && ((c) <= 'D')) || ((c) == '#') || ((c) == '*'))
+
+/* HFP HF Indicators */
+enum {
+	HFP_HF_ENHANCED_SAFETY_IND = 1, /* Enhanced Safety */
+	HFP_HF_BATTERY_LEVEL_IND = 2,   /* Remaining level of Battery */
+	HFP_HF_IND_MAX
+};
+
+#define IS_VALID_BATTERY_LEVEL(level) (((level) >= 0) && ((level) <= 100))
diff --git a/subsys/bluetooth/host/classic/keys_br.c b/subsys/bluetooth/host/classic/keys_br.c
index 3c9536fe1121e..2c9c6e32c9888 100644
--- a/subsys/bluetooth/host/classic/keys_br.c
+++ b/subsys/bluetooth/host/classic/keys_br.c
@@ -146,7 +146,7 @@ void bt_keys_link_key_store(struct bt_keys_link_key *link_key)
 	}
 }
 
-void bt_foreach_bond_br(void (*func)(const struct bt_bond_info *info, void *user_data),
+void bt_br_foreach_bond(void (*func)(const struct bt_br_bond_info *info, void *user_data),
 			void *user_data)
 {
 	__ASSERT_NO_MSG(func != NULL);
@@ -155,10 +155,9 @@ void bt_foreach_bond_br(void (*func)(const struct bt_bond_info *info, void *user
 		const struct bt_keys_link_key *key = &key_pool[i];
 
 		if (!bt_addr_eq(&key->addr, BT_ADDR_ANY)) {
-			struct bt_bond_info info;
+			struct bt_br_bond_info info;
 
-			info.addr.type = BT_ADDR_LE_PUBLIC;
-			bt_addr_copy(&info.addr.a, &key->addr);
+			bt_addr_copy(&info.addr, &key->addr);
 			func(&info, user_data);
 		}
 	}
diff --git a/subsys/bluetooth/host/classic/l2cap_br.c b/subsys/bluetooth/host/classic/l2cap_br.c
index d3ce4536fd323..ad5a896b18480 100644
--- a/subsys/bluetooth/host/classic/l2cap_br.c
+++ b/subsys/bluetooth/host/classic/l2cap_br.c
@@ -13,6 +13,7 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/iterable_sections.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/crc.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -21,6 +22,7 @@
 #include "host/buf_view.h"
 #include "host/hci_core.h"
 #include "host/conn_internal.h"
+#include "host/keys.h"
 #include "l2cap_br_internal.h"
 #include "avdtp_internal.h"
 #include "a2dp_internal.h"
@@ -35,6 +37,12 @@ LOG_MODULE_REGISTER(bt_l2cap_br, CONFIG_BT_L2CAP_LOG_LEVEL);
 #define BR_CHAN_RTX(_w) CONTAINER_OF(k_work_delayable_from_work(_w), \
 				     struct bt_l2cap_br_chan, rtx_work)
 
+#define BR_CHAN_RET(_w) CONTAINER_OF(k_work_delayable_from_work(_w), \
+				     struct bt_l2cap_br_chan, ret_work)
+
+#define BR_CHAN_MONITOR(_w) CONTAINER_OF(k_work_delayable_from_work(_w), \
+					 struct bt_l2cap_br_chan, monitor_work)
+
 #define L2CAP_BR_PSM_START	0x0001
 #define L2CAP_BR_PSM_END	0xffff
 #define L2CAP_BR_PSM_DYN_START	0x1000
@@ -50,30 +58,133 @@ LOG_MODULE_REGISTER(bt_l2cap_br, CONFIG_BT_L2CAP_LOG_LEVEL);
 
 #define L2CAP_BR_PSM_SDP	0x0001
 
-#define L2CAP_BR_INFO_TIMEOUT		K_SECONDS(4)
-#define L2CAP_BR_CFG_TIMEOUT		K_SECONDS(4)
-#define L2CAP_BR_DISCONN_TIMEOUT	K_SECONDS(1)
-#define L2CAP_BR_CONN_TIMEOUT		K_SECONDS(40)
+#define L2CAP_BR_S_FRAME_FLAG_MASK 0xffffff00U
+#define L2CAP_BR_S_FRAME_UD_FLAG   0xffffff00
+#define L2CAP_BR_IS_S_FRAME(flag)                                                \
+	((POINTER_TO_UINT(flag) & L2CAP_BR_S_FRAME_FLAG_MASK) == L2CAP_BR_S_FRAME_UD_FLAG)
+
+#define L2CAP_BR_GET_S_BIT(flag) (POINTER_TO_UINT(flag) & ~L2CAP_BR_S_FRAME_FLAG_MASK)
+
+#define L2CAP_BR_S_FRAME_UD_FLAG_SET(s) UINT_TO_POINTER(L2CAP_BR_S_FRAME_UD_FLAG | (s))
+#define L2CAP_BR_S_RR_FRAME             L2CAP_BR_S_FRAME_UD_FLAG_SET(BT_L2CAP_CONTROL_S_RR)
+#define L2CAP_BR_S_REJ_FRAME            L2CAP_BR_S_FRAME_UD_FLAG_SET(BT_L2CAP_CONTROL_S_REJ)
+#define L2CAP_BR_S_RNR_FRAME            L2CAP_BR_S_FRAME_UD_FLAG_SET(BT_L2CAP_CONTROL_S_RNR)
+#define L2CAP_BR_S_SREJ_FRAME           L2CAP_BR_S_FRAME_UD_FLAG_SET(BT_L2CAP_CONTROL_S_SREJ)
+
+#define L2CAP_BR_INFO_TIMEOUT    K_SECONDS(4)
+#define L2CAP_BR_CFG_TIMEOUT     K_SECONDS(4)
+#define L2CAP_BR_DISCONN_TIMEOUT K_SECONDS(1)
+#define L2CAP_BR_CONN_TIMEOUT    K_SECONDS(40)
+
+#define L2CAP_FEAT_FC_MASK           BIT(0)
+#define L2CAP_FEAT_RET_MASK          BIT(1)
+#define L2CAP_FEAT_QOS_MASK          BIT(2)
+#define L2CAP_FEAT_ENH_RET_MASK      BIT(3)
+#define L2CAP_FEAT_STREAM_MASK       BIT(4)
+#define L2CAP_FEAT_FCS_MASK          BIT(5)
+#define L2CAP_FEAT_EXT_FS_MASK       BIT(6)
+#define L2CAP_FEAT_FIXED_CHAN_MASK   BIT(7)
+#define L2CAP_FEAT_EXT_WIN_SIZE_MASK BIT(8)
+#define L2CAP_FEAT_CLS_MASK          BIT(9)
+#define L2CAP_FEAT_ECBFC_MASK        BIT(10)
+
+#if defined(CONFIG_BT_L2CAP_RET)
+#define L2CAP_FEAT_RET_ENABLE_MASK L2CAP_FEAT_RET_MASK
+#else
+#define L2CAP_FEAT_RET_ENABLE_MASK 0
+#endif /* CONFIG_BT_L2CAP_RET */
+
+#if defined(CONFIG_BT_L2CAP_FC)
+#define L2CAP_FEAT_FC_ENABLE_MASK L2CAP_FEAT_FC_MASK
+#else
+#define L2CAP_FEAT_FC_ENABLE_MASK 0
+#endif /* CONFIG_BT_L2CAP_FC */
+
+#if defined(CONFIG_BT_L2CAP_ENH_RET)
+#define L2CAP_FEAT_ENH_RET_ENABLE_MASK L2CAP_FEAT_ENH_RET_MASK
+#else
+#define L2CAP_FEAT_ENH_RET_ENABLE_MASK 0
+#endif /* CONFIG_BT_L2CAP_ENH_RET */
+
+#if defined(CONFIG_BT_L2CAP_STREAM)
+#define L2CAP_FEAT_STREAM_ENABLE_MASK L2CAP_FEAT_STREAM_MASK
+#else
+#define L2CAP_FEAT_STREAM_ENABLE_MASK 0
+#endif /* CONFIG_BT_L2CAP_STREAM */
+
+#if defined(CONFIG_BT_L2CAP_FCS)
+#define L2CAP_FEAT_FCS_ENABLE_MASK L2CAP_FEAT_FCS_MASK
+#else
+#define L2CAP_FEAT_FCS_ENABLE_MASK 0
+#endif /* CONFIG_BT_L2CAP_FCS */
+
+#if defined(CONFIG_BT_L2CAP_EXT_WIN_SIZE)
+#define L2CAP_FEAT_EXT_WIN_SIZE_ENABLE_MASK L2CAP_FEAT_EXT_WIN_SIZE_MASK
+#else
+#define L2CAP_FEAT_EXT_WIN_SIZE_ENABLE_MASK 0
+#endif /* CONFIG_BT_L2CAP_EXT_WIN_SIZE */
 
 /*
  * L2CAP extended feature mask:
  * BR/EDR fixed channel support enabled
  */
-#define L2CAP_FEAT_FIXED_CHAN_MASK	0x00000080
+#define L2CAP_EXTENDED_FEAT_MASK                                                               \
+	(L2CAP_FEAT_FIXED_CHAN_MASK | L2CAP_FEAT_RET_ENABLE_MASK |                             \
+	 L2CAP_FEAT_FC_ENABLE_MASK | L2CAP_FEAT_ENH_RET_ENABLE_MASK |                          \
+	 L2CAP_FEAT_STREAM_ENABLE_MASK | L2CAP_FEAT_FCS_ENABLE_MASK |                          \
+	 L2CAP_FEAT_EXT_WIN_SIZE_ENABLE_MASK)
 
 enum {
 	/* Connection oriented channels flags */
-	L2CAP_FLAG_CONN_LCONF_DONE,	/* local config accepted by remote */
-	L2CAP_FLAG_CONN_RCONF_DONE,	/* remote config accepted by local */
-	L2CAP_FLAG_CONN_ACCEPTOR,	/* getting incoming connection req */
-	L2CAP_FLAG_CONN_PENDING,	/* remote sent pending result in rsp */
+	L2CAP_FLAG_CONN_LCONF_DONE, /* local config accepted by remote */
+	L2CAP_FLAG_CONN_RCONF_DONE, /* remote config accepted by local */
+	L2CAP_FLAG_CONN_ACCEPTOR,   /* getting incoming connection req */
+	L2CAP_FLAG_CONN_PENDING,    /* remote sent pending result in rsp */
 
 	/* Signaling channel flags */
-	L2CAP_FLAG_SIG_INFO_PENDING,	/* retrieving remote l2cap info */
-	L2CAP_FLAG_SIG_INFO_DONE,	/* remote l2cap info is done */
+	L2CAP_FLAG_SIG_INFO_PENDING, /* retrieving remote l2cap info */
+	L2CAP_FLAG_SIG_INFO_DONE,    /* remote l2cap info is done */
 
 	/* fixed channels flags */
-	L2CAP_FLAG_FIXED_CONNECTED,		/* fixed connected */
+	L2CAP_FLAG_FIXED_CONNECTED, /* fixed connected */
+
+	/* Retransmition and flow control flags*/
+	L2CAP_FLAG_RET_TIMER,   /* Retransmission timer is working */
+	L2CAP_FLAG_PDU_RETRANS, /* PDU retransmission */
+
+	/* Receiving S-frame/I-frame flags */
+	L2CAP_FLAG_RECV_FRAME_P,         /* Poll (P) flag of received frame */
+	L2CAP_FLAG_RECV_FRAME_R,         /* Retransmission Disable (R) of received frame */
+	L2CAP_FLAG_RECV_FRAME_R_CHANGED, /* Flag the R flag changed.
+					  * After send received frame with R bit set,
+					  * clear the flag.
+					  */
+
+	/* Sending S-frame/I-frame flags */
+	L2CAP_FLAG_SEND_FRAME_REJ,         /* Report an REJ in received frame */
+	L2CAP_FLAG_SEND_FRAME_REJ_CHANGED, /* Flag the REJ flag changed.
+					    * After send received frame with REJ flag,
+					    * clear the flag.
+					    */
+	L2CAP_FLAG_SEND_FRAME_P,           /* Poll (P) flag */
+	L2CAP_FLAG_SEND_FRAME_P_CHANGED,   /* Poll (P) flag changed */
+	L2CAP_FLAG_SEND_S_FRAME,           /* Need to send S-frame */
+
+	/* Remote State */
+	L2CAP_FLAG_REMOTE_BUSY, /* Remote Busy Flag */
+
+	/* Local State */
+	L2CAP_FLAG_LOCAL_BUSY,         /* Local Busy Flag */
+	L2CAP_FLAG_LOCAL_BUSY_CHANGED, /* Local Busy Flag changed */
+	L2CAP_FLAG_REJ_ACTIONED,       /* REJ Actioned */
+	L2CAP_FLAG_SREJ_ACTIONED,      /* SREJ Actioned */
+	L2CAP_FLAG_RET_I_FRAME,        /* Could Retransmit I-frames */
+	L2CAP_FLAG_NEW_I_FRAME,        /* Could Send Pending I-frames */
+	L2CAP_FLAG_RET_REQ_I_FRAME,    /* Could Retransmit Requested I-frames */
+	L2CAP_FLAG_REQ_SEQ_UPDATED,    /* req_seq has been updated */
+
+	/* Auth failed, disconnect ACL */
+	L2CAP_FLAG_DISCONNECT_ACL,	/* Disconnect ACL */
 };
 
 static sys_slist_t br_servers;
@@ -83,11 +194,27 @@ static sys_slist_t br_servers;
 NET_BUF_POOL_FIXED_DEFINE(br_sig_pool, CONFIG_BT_MAX_CONN,
 			  BT_L2CAP_BUF_SIZE(L2CAP_BR_MIN_MTU), 8, NULL);
 
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static void br_tx_buf_destroy(struct net_buf *buf)
+{
+	net_buf_destroy(buf);
+
+	LOG_DBG("");
+
+	/* Kick the TX processor to send the rest of the frags. */
+	bt_tx_irq_raise();
+}
+
+/* Pool for outgoing BR/EDR signaling packets, min MTU is 48 */
+NET_BUF_POOL_FIXED_DEFINE(br_tx_pool, CONFIG_BT_L2CAP_TX_BUF_COUNT,
+			  BT_L2CAP_BUF_SIZE(CONFIG_BT_L2CAP_MPS), CONFIG_BT_CONN_TX_USER_DATA_SIZE,
+			  br_tx_buf_destroy);
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
 /* BR/EDR L2CAP signalling channel specific context */
 struct bt_l2cap_br {
 	/* The channel this context is associated with */
 	struct bt_l2cap_br_chan	chan;
-	uint8_t			info_ident;
 	/*
 	 * 2.1 CHANNEL IDENTIFIERS in
 	 * BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 3, Part A.
@@ -199,6 +326,11 @@ static void l2cap_br_chan_destroy(struct bt_l2cap_chan *chan)
 		k_work_cancel_delayable(&br_chan->rtx_work);
 	}
 
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	k_work_cancel_delayable(&br_chan->ret_work);
+	k_work_cancel_delayable(&br_chan->monitor_work);
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
 	atomic_clear(BR_CHAN(chan)->flags);
 }
 
@@ -229,30 +361,6 @@ static void l2cap_br_rtx_timeout(struct k_work *work)
 	}
 }
 
-static bool l2cap_br_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
-			      bt_l2cap_chan_destroy_t destroy)
-{
-	struct bt_l2cap_br_chan *ch = l2cap_br_chan_alloc_cid(conn, chan);
-
-	if (!ch) {
-		LOG_DBG("Unable to allocate L2CAP CID");
-		return false;
-	}
-
-	k_fifo_init(&ch->_pdu_tx_queue);
-
-	/* All dynamic channels have the destroy handler which makes sure that
-	 * the RTX work structure is properly released with a cancel sync.
-	 * The fixed signal channel is only removed when disconnected and the
-	 * disconnected handler is always called from the workqueue itself so
-	 * canceling from there should always succeed.
-	 */
-	k_work_init_delayable(&ch->rtx_work, l2cap_br_rtx_timeout);
-	bt_l2cap_chan_add(conn, chan, destroy);
-
-	return true;
-}
-
 static uint8_t l2cap_br_get_ident(void)
 {
 	static uint8_t ident;
@@ -266,6 +374,12 @@ static uint8_t l2cap_br_get_ident(void)
 	return ident;
 }
 
+/* L2CAP channel wants to send a PDU */
+static bool chan_has_data(struct bt_l2cap_br_chan *br_chan)
+{
+	return !sys_slist_is_empty(&br_chan->_pdu_tx_queue);
+}
+
 static void raise_data_ready(struct bt_l2cap_br_chan *br_chan)
 {
 	if (!atomic_set(&br_chan->_pdu_ready_lock, 1)) {
@@ -301,1755 +415,5383 @@ static void cancel_data_ready(struct bt_l2cap_br_chan *br_chan)
 	atomic_set(&br_chan->_pdu_ready_lock, 0);
 }
 
-int bt_l2cap_br_send_cb(struct bt_conn *conn, uint16_t cid, struct net_buf *buf,
-			bt_conn_tx_cb_t cb, void *user_data)
-{
-	struct bt_l2cap_hdr *hdr;
-	struct bt_l2cap_chan *ch = bt_l2cap_br_lookup_tx_cid(conn, cid);
-	struct bt_l2cap_br_chan *br_chan = CONTAINER_OF(ch, struct bt_l2cap_br_chan, chan);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+enum l2cap_br_timer_type {
+	BT_L2CAP_BR_TIMER_RET,
+	BT_L2CAP_BR_TIMER_MONITOR,
+};
 
-	LOG_DBG("chan %p buf %p len %zu", br_chan, buf, buf->len);
+static void l2cap_br_start_timer(struct bt_l2cap_br_chan *br_chan, enum l2cap_br_timer_type type,
+				 bool restart)
+{
+	if (type == BT_L2CAP_BR_TIMER_RET) {
+		if (!atomic_test_and_set_bit(br_chan->flags, L2CAP_FLAG_RET_TIMER)) {
+			k_work_cancel_delayable(&br_chan->monitor_work);
+			k_work_schedule(&br_chan->ret_work, K_MSEC(br_chan->tx.ret_timeout));
+			LOG_DBG("Start ret timer");
+		} else {
+			if (!restart) {
+				return;
+			}
 
-	hdr = net_buf_push(buf, sizeof(*hdr));
-	hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr));
-	hdr->cid = sys_cpu_to_le16(cid);
+			k_work_reschedule(&br_chan->ret_work, K_MSEC(br_chan->tx.ret_timeout));
+			LOG_DBG("Restart ret timer");
+		}
+	} else {
+		if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_RET_TIMER)) {
+			k_work_cancel_delayable(&br_chan->ret_work);
+			k_work_schedule(&br_chan->monitor_work,
+					K_MSEC(br_chan->tx.monitor_timeout));
+			LOG_DBG("Start monitor timer");
+		} else {
+			if (!restart) {
+				return;
+			}
 
-	if (buf->user_data_size < sizeof(struct closure)) {
-		LOG_WRN("not enough room in user_data %d < %d pool %u",
-			buf->user_data_size,
-			CONFIG_BT_CONN_TX_USER_DATA_SIZE,
-			buf->pool_id);
-		return -EINVAL;
+			k_work_reschedule(&br_chan->monitor_work,
+					  K_MSEC(br_chan->tx.monitor_timeout));
+			LOG_DBG("Restart monitor timer");
+		}
 	}
+}
 
-	LOG_DBG("push PDU: cb %p userdata %p", cb, user_data);
+static uint16_t bt_l2cap_br_get_outstanding_count(struct bt_l2cap_br_chan *br_chan)
+{
+	struct bt_l2cap_br_window *tx_win, *next;
+	uint16_t count = 0;
 
-	make_closure(buf->user_data, cb, user_data);
-	k_fifo_put(&br_chan->_pdu_tx_queue, buf);
-	raise_data_ready(br_chan);
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&br_chan->_pdu_outstanding, tx_win, next, node) {
+		count++;
+	}
 
-	return 0;
+	return count;
 }
 
-/* Send the buffer and release it in case of failure.
- * Any other cleanup in failure to send should be handled by the disconnected
- * handler.
- */
-static inline void l2cap_send(struct bt_conn *conn, uint16_t cid,
-			      struct net_buf *buf)
+static struct bt_l2cap_br_window *l2cap_br_find_window(struct bt_l2cap_br_chan *br_chan)
 {
-	if (bt_l2cap_br_send_cb(conn, cid, buf, NULL, NULL)) {
-		net_buf_unref(buf);
+	struct bt_l2cap_br_window *win;
+	uint16_t count;
+
+	count = bt_l2cap_br_get_outstanding_count(br_chan);
+	if (count >= br_chan->tx.max_window) {
+		return NULL;
+	}
+
+	win = k_fifo_get(&br_chan->_free_tx_win, K_NO_WAIT);
+	if (win) {
+		memset(win, 0, sizeof(*win));
 	}
+
+	return win;
 }
 
-static void l2cap_br_chan_send_req(struct bt_l2cap_br_chan *chan,
-				   struct net_buf *buf, k_timeout_t timeout)
+static void l2cap_br_free_window(struct bt_l2cap_br_chan *br_chan,
+				 struct bt_l2cap_br_window *tx_win)
 {
-
-	if (bt_l2cap_br_send_cb(chan->chan.conn, BT_L2CAP_CID_BR_SIG, buf,
-			     NULL, NULL)) {
-		net_buf_unref(buf);
-		return;
+	if (tx_win) {
+		memset(tx_win, 0, sizeof(*tx_win));
+		k_fifo_put(&br_chan->_free_tx_win, tx_win);
 	}
-
-	/* BLUETOOTH SPECIFICATION Version 4.2 [Vol 3, Part A] page 126:
-	 *
-	 * The value of this timer is implementation-dependent but the minimum
-	 * initial value is 1 second and the maximum initial value is 60
-	 * seconds. One RTX timer shall exist for each outstanding signaling
-	 * request, including each Echo Request. The timer disappears on the
-	 * final expiration, when the response is received, or the physical
-	 * link is lost.
-	 */
-	k_work_reschedule(&chan->rtx_work, timeout);
 }
 
-/* L2CAP channel wants to send a PDU */
-static bool chan_has_data(struct bt_l2cap_br_chan *br_chan)
+static uint16_t bt_l2cap_br_update_seq(struct bt_l2cap_br_chan *br_chan, uint16_t seq)
 {
-	return !k_fifo_is_empty(&br_chan->_pdu_tx_queue);
+	if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->tx.extended_control) {
+			seq = seq % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+		} else {
+			seq = seq % BT_L2CAP_CONTROL_SEQ_MAX;
+		}
+	} else if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		   (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+		seq = seq % BT_L2CAP_CONTROL_SEQ_MAX;
+	}
+
+	return seq;
 }
 
-struct net_buf *l2cap_br_data_pull(struct bt_conn *conn,
-				   size_t amount,
-				   size_t *length)
+static struct bt_l2cap_br_window *l2cap_br_find_srej(struct bt_l2cap_br_chan *br_chan)
 {
-	const sys_snode_t *pdu_ready = sys_slist_peek_head(&conn->l2cap_data_ready);
+	struct bt_l2cap_br_window *tx_win, *next;
 
-	if (!pdu_ready) {
-		LOG_DBG("nothing to send on this conn");
-		return NULL;
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&br_chan->_pdu_outstanding, tx_win, next, node) {
+		if (tx_win->srej) {
+			return tx_win;
+		}
 	}
 
-	struct bt_l2cap_br_chan *br_chan = CONTAINER_OF(pdu_ready,
-							struct bt_l2cap_br_chan,
-							_pdu_ready);
+	return NULL;
+}
 
-	/* Leave the PDU buffer in the queue until we have sent all its
-	 * fragments.
-	 */
-	struct net_buf *pdu = k_fifo_peek_head(&br_chan->_pdu_tx_queue);
+static bool bt_l2cap_br_check_req_seq_valid(struct bt_l2cap_br_chan *br_chan, uint16_t req_seq)
+{
+	uint16_t outstanding_frames;
+	uint16_t ack_frames;
+	uint16_t outstanding_count;
+
+	outstanding_frames = (uint16_t)(br_chan->next_tx_seq - br_chan->expected_ack_seq);
+	ack_frames = (uint16_t)(req_seq - br_chan->expected_ack_seq);
+
+	if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->tx.extended_control) {
+			outstanding_frames = outstanding_frames % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+			ack_frames = ack_frames % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+		} else {
+			outstanding_frames = outstanding_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+			ack_frames = ack_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+		}
+	} else if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		   (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+		outstanding_frames = outstanding_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+		ack_frames = ack_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+	}
 
-	__ASSERT(pdu, "signaled ready but no PDUs in the TX queue");
+	outstanding_count = bt_l2cap_br_get_outstanding_count(br_chan);
+	__ASSERT(outstanding_count == outstanding_frames,
+		 "Mismatch between window and seq %zu - %zu", outstanding_count,
+		 outstanding_frames);
 
-	if (bt_buf_has_view(pdu)) {
-		LOG_ERR("already have view on %p", pdu);
-		return NULL;
+	if (ack_frames <= outstanding_frames) {
+		return true;
 	}
 
-	/* We can't interleave ACL fragments from different channels for the
-	 * same ACL conn -> we have to wait until a full L2 PDU is transferred
-	 * before switching channels.
-	 */
-	bool last_frag = amount >= pdu->len;
+	return false;
+}
 
-	if (last_frag) {
-		LOG_DBG("last frag, removing %p", pdu);
-		__maybe_unused struct net_buf *b = k_fifo_get(&br_chan->_pdu_tx_queue, K_NO_WAIT);
+static void l2cap_br_sdu_is_done(struct bt_l2cap_br_chan *br_chan, struct net_buf *sdu, int err)
+{
+	bt_conn_tx_cb_t cb;
 
-		__ASSERT_NO_MSG(b == pdu);
+	__ASSERT(sdu, "Invalid sdu buffer on chan %p", br_chan);
 
-		LOG_DBG("chan %p done", br_chan);
-		lower_data_ready(br_chan);
+	/* The SDU is done */
+	LOG_DBG("SDU is done, removing %p", sdu);
 
-		/* Append channel to list if it still has data */
-		if (chan_has_data(br_chan)) {
-			LOG_DBG("chan %p ready", br_chan);
-			raise_data_ready(br_chan);
-		}
+	if (!sys_slist_find_and_remove(&br_chan->_pdu_tx_queue, &sdu->node)) {
+		LOG_WRN("SDU %p is not found", sdu);
 	}
 
-	*length = pdu->len;
+	cb = closure_cb(sdu->user_data);
+	if (cb) {
+		cb(br_chan->chan.conn, closure_data(sdu->user_data), err);
+	}
 
-	return pdu;
+	/* Remove the pdu */
+	net_buf_unref(sdu);
+
+	LOG_DBG("chan %p done", br_chan);
+
+	/* Append channel to list if it still has data */
+	if (chan_has_data(br_chan)) {
+		LOG_DBG("chan %p ready", br_chan);
+		raise_data_ready(br_chan);
+	}
 }
 
-static void l2cap_br_get_info(struct bt_l2cap_br *l2cap, uint16_t info_type)
+static int bt_l2cap_br_update_req_seq_direct(struct bt_l2cap_br_chan *br_chan, uint16_t req_seq,
+					     bool rej)
 {
-	struct bt_l2cap_info_req *info;
-	struct net_buf *buf;
-	struct bt_l2cap_sig_hdr *hdr;
-
-	LOG_DBG("info type %u", info_type);
+	struct bt_l2cap_br_window *tx_win;
+	struct net_buf *sdu;
+
+	tx_win = (void *)sys_slist_peek_head(&br_chan->_pdu_outstanding);
+	while (tx_win && (tx_win->tx_seq != req_seq)) {
+		sdu = tx_win->sdu;
+		if ((tx_win->sar == BT_L2CAP_CONTROL_SAR_UNSEG) ||
+		    (tx_win->sar == BT_L2CAP_CONTROL_SAR_END)) {
+			l2cap_br_sdu_is_done(br_chan, sdu, 0);
+		}
+		tx_win = (void *)sys_slist_get(&br_chan->_pdu_outstanding);
+		l2cap_br_free_window(br_chan, tx_win);
+		tx_win = (void *)sys_slist_peek_head(&br_chan->_pdu_outstanding);
+	}
+	br_chan->expected_ack_seq = req_seq;
+
+	if (rej) {
+		tx_win = (void *)sys_slist_peek_head(&br_chan->_pdu_outstanding);
+		if (tx_win) {
+			sdu = tx_win->sdu;
+			__ASSERT(sdu, "Invalid sdu buffer on chan %p", br_chan);
+			net_buf_simple_restore(&sdu->b, &tx_win->sdu_state);
+			if ((tx_win->sar == BT_L2CAP_CONTROL_SAR_UNSEG) ||
+			    (tx_win->sar == BT_L2CAP_CONTROL_SAR_START)) {
+				br_chan->_sdu_total_len = 0;
+			} else {
+				br_chan->_sdu_total_len = tx_win->sdu_total_len;
+			}
+			br_chan->next_tx_seq = tx_win->tx_seq;
+		}
 
-	if (atomic_test_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_PENDING)) {
-		return;
+		while (tx_win) {
+			tx_win = (void *)sys_slist_get(&br_chan->_pdu_outstanding);
+			l2cap_br_free_window(br_chan, tx_win);
+			tx_win = (void *)sys_slist_peek_head(&br_chan->_pdu_outstanding);
+			if (tx_win) {
+				sdu = tx_win->sdu;
+				__ASSERT(sdu, "Invalid sdu buffer on chan %p", br_chan);
+				if ((tx_win->sar == BT_L2CAP_CONTROL_SAR_UNSEG) ||
+					(tx_win->sar == BT_L2CAP_CONTROL_SAR_START)) {
+					net_buf_simple_restore(&sdu->b, &tx_win->sdu_state);
+				}
+			}
+		}
 	}
 
-	switch (info_type) {
-	case BT_L2CAP_INFO_FEAT_MASK:
-	case BT_L2CAP_INFO_FIXED_CHAN:
-		break;
-	default:
-		LOG_WRN("Unsupported info type %u", info_type);
-		return;
+	if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R)) {
+		if (bt_l2cap_br_get_outstanding_count(br_chan)) {
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_RET, true);
+		} else {
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, false);
+		}
 	}
 
-	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+	if (chan_has_data(br_chan)) {
+		LOG_DBG("chan %p ready", br_chan);
+		raise_data_ready(br_chan);
+	}
 
-	atomic_set_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_PENDING);
-	l2cap->info_ident = l2cap_br_get_ident();
+	return 0;
+}
 
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_INFO_REQ;
-	hdr->ident = l2cap->info_ident;
-	hdr->len = sys_cpu_to_le16(sizeof(*info));
+static int bt_l2cap_br_update_req_seq(struct bt_l2cap_br_chan *br_chan, uint16_t req_seq, bool rej)
+{
+	int err = 0;
 
-	info = net_buf_add(buf, sizeof(*info));
-	info->type = sys_cpu_to_le16(info_type);
+	if (bt_l2cap_br_check_req_seq_valid(br_chan, req_seq)) {
+		err = bt_l2cap_br_update_req_seq_direct(br_chan, req_seq, rej);
+	} else {
+		LOG_ERR("Invalid req seq %d received on %p", req_seq, br_chan);
+		/* The L2CAP entity shall close the channel as a consequence
+		 * of an ReqSeq Sequence error.
+		 */
+		bt_l2cap_br_chan_disconnect(&br_chan->chan);
+		err = -ESHUTDOWN;
+	}
 
-	l2cap_br_chan_send_req(&l2cap->chan, buf, L2CAP_BR_INFO_TIMEOUT);
+	return err;
 }
 
-static void connect_fixed_channel(struct bt_l2cap_br_chan *chan)
+static int l2cap_br_send_s_frame(struct bt_l2cap_br_chan *br_chan, uint8_t s, k_timeout_t timeout)
 {
-	if (atomic_test_and_set_bit(chan->flags, L2CAP_FLAG_FIXED_CONNECTED)) {
-		return;
+	struct net_buf *buf;
+	int err;
+
+	if (atomic_test_and_set_bit(br_chan->flags, L2CAP_FLAG_SEND_S_FRAME)) {
+		LOG_WRN("S-frame is in pending on %p", br_chan);
 	}
 
-	if (chan->chan.ops && chan->chan.ops->connected) {
-		chan->chan.ops->connected(&chan->chan);
+	if (chan_has_data(br_chan)) {
+		/* There is PDU in pending. No Empty SDU needed to trigger S-frame sending. */
+		raise_data_ready(br_chan);
+		return 0;
 	}
-}
 
-static void connect_optional_fixed_channels(struct bt_l2cap_br *l2cap)
-{
-	/* can be change to loop if more BR/EDR fixed channels are added */
-	if (l2cap->info_fixed_chan & BIT(BT_L2CAP_CID_BR_SMP)) {
-		struct bt_l2cap_chan *chan;
+	buf = bt_l2cap_create_pdu_timeout(&br_tx_pool, 0, timeout);
+	if (!buf) {
+		return -ENOBUFS;
+	}
 
-		chan = bt_l2cap_br_lookup_rx_cid(l2cap->chan.chan.conn,
-						 BT_L2CAP_CID_BR_SMP);
-		if (chan) {
-			connect_fixed_channel(BR_CHAN(chan));
-		}
+	err = bt_l2cap_br_send_cb(br_chan->chan.conn, br_chan->tx.cid, buf, NULL,
+				  L2CAP_BR_S_FRAME_UD_FLAG_SET(s));
+	if (err) {
+		LOG_ERR("Fail to send S-frame %d on %p", err, br_chan);
+		net_buf_unref(buf);
 	}
+
+	return err;
 }
 
-static int l2cap_br_info_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
-			     struct net_buf *buf)
+static void l2cap_br_ret_timeout(struct k_work *work)
 {
-	struct bt_l2cap_info_rsp *rsp;
-	uint16_t type, result;
-	int err = 0;
+	struct bt_l2cap_br_chan *br_chan = BR_CHAN_RET(work);
+	uint16_t expected_ack_seq;
 
-	if (atomic_test_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_DONE)) {
-		return 0;
+	if (!br_chan->chan.conn || br_chan->chan.conn->state != BT_CONN_CONNECTED) {
+		/* ACL connection is broken. */
+		return;
 	}
 
-	if (atomic_test_and_clear_bit(l2cap->chan.flags,
-				      L2CAP_FLAG_SIG_INFO_PENDING)) {
-		/*
-		 * Release RTX timer since got the response & there's pending
-		 * command request.
-		 */
-		k_work_cancel_delayable(&l2cap->chan.rtx_work);
+	if (br_chan->state != BT_L2CAP_CONNECTED) {
+		/* The channel is not connected */
+		return;
 	}
 
-	if (buf->len < sizeof(*rsp)) {
-		LOG_ERR("Too small info rsp packet size");
-		err = -EINVAL;
-		goto done;
+	/* Restart the timer */
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RET_TIMER)) {
+		k_work_schedule(&br_chan->ret_work, K_MSEC(br_chan->tx.ret_timeout));
 	}
 
-	if (ident != l2cap->info_ident) {
-		LOG_WRN("Idents mismatch");
-		err = -EINVAL;
-		goto done;
-	}
+	LOG_DBG("chan %p retransmission timeout", br_chan);
 
-	rsp = net_buf_pull_mem(buf, sizeof(*rsp));
-	result = sys_le16_to_cpu(rsp->result);
-	if (result != BT_L2CAP_INFO_SUCCESS) {
-		LOG_WRN("Result unsuccessful");
-		err = -EINVAL;
-		goto done;
+	if (sys_slist_peek_head(&br_chan->_pdu_outstanding) == NULL) {
+		return;
 	}
 
-	type = sys_le16_to_cpu(rsp->type);
-
-	switch (type) {
-	case BT_L2CAP_INFO_FEAT_MASK:
-		if (buf->len < sizeof(uint32_t)) {
-			LOG_ERR("Invalid remote info feat mask");
-			err = -EINVAL;
-			break;
+	switch (br_chan->tx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		LOG_WRN("Retrans on chan %p", br_chan);
+		atomic_set_bit(br_chan->flags, L2CAP_FLAG_PDU_RETRANS);
+		/* Append channel to list if it still has data */
+		if (chan_has_data(br_chan)) {
+			LOG_DBG("chan %p ready", br_chan);
+			raise_data_ready(br_chan);
 		}
-		l2cap->info_feat_mask = net_buf_pull_le32(buf);
-		LOG_DBG("remote info mask 0x%08x", l2cap->info_feat_mask);
+		break;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		expected_ack_seq = bt_l2cap_br_update_seq(br_chan, br_chan->expected_ack_seq + 1);
 
-		if (!(l2cap->info_feat_mask & L2CAP_FEAT_FIXED_CHAN_MASK)) {
-			break;
-		}
+		LOG_WRN("unacknowledged I-frame with sequence number %d",
+			br_chan->expected_ack_seq);
+		bt_l2cap_br_update_req_seq(br_chan, expected_ack_seq, false);
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		if (!atomic_test_and_set_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+			int err;
 
-		l2cap_br_get_info(l2cap, BT_L2CAP_INFO_FIXED_CHAN);
-		return 0;
-	case BT_L2CAP_INFO_FIXED_CHAN:
-		if (buf->len < sizeof(uint8_t)) {
-			LOG_ERR("Invalid remote info fixed chan");
-			err = -EINVAL;
-			break;
-		}
-		/*
-		 * 2.1 CHANNEL IDENTIFIERS in
-		 * BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 3, Part A.
-		 * The info length of `Fixed channels supported` is 8 octets.
-		 * Then the range of fixed L2CAP CID is 0x0001 ~ 0x0007 both for LE and BR.
-		 * So use one octet buffer to keep the `Fixed channels supported`
-		 * of peer device.
-		 */
-		l2cap->info_fixed_chan = net_buf_pull_u8(buf);
-		LOG_DBG("remote fixed channel mask 0x%02x", l2cap->info_fixed_chan);
+			/* State: XMIT
+			 * Retrans Timer expires Or Local Busy Clears
+			 * Action: send RR(P=1) or RNR(P=1)
+			 */
+			br_chan->retry_count = 1;
 
-		connect_optional_fixed_channels(l2cap);
+			LOG_WRN("Send RR(P=1) on chan %p", br_chan);
+
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, true);
 
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P_CHANGED);
+			err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+			if (err) {
+				bt_l2cap_chan_disconnect(&br_chan->chan);
+			}
+		}
 		break;
 	default:
-		LOG_WRN("type 0x%04x unsupported", type);
-		err = -EINVAL;
+		/* Nothing to do */
 		break;
 	}
-done:
-	atomic_set_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_DONE);
-	l2cap->info_ident = 0U;
-	return err;
 }
 
-static uint8_t get_fixed_channels_mask(void)
+static void l2cap_br_monitor_timeout(struct k_work *work)
 {
-	uint8_t mask = 0U;
+	struct bt_l2cap_br_chan *br_chan = BR_CHAN_MONITOR(work);
 
-	/* this needs to be enhanced if AMP Test Manager support is added */
-	STRUCT_SECTION_FOREACH(bt_l2cap_br_fixed_chan, fchan) {
-		mask |= BIT(fchan->cid);
+	if (!br_chan->chan.conn || br_chan->chan.conn->state != BT_CONN_CONNECTED) {
+		/* ACL connection is broken. */
+		return;
 	}
 
-	return mask;
-}
-
-static int l2cap_br_info_req(struct bt_l2cap_br *l2cap, uint8_t ident,
-			     struct net_buf *buf)
-{
-	struct bt_conn *conn = l2cap->chan.chan.conn;
-	struct bt_l2cap_info_req *req = (void *)buf->data;
-	struct bt_l2cap_info_rsp *rsp;
-	struct net_buf *rsp_buf;
-	struct bt_l2cap_sig_hdr *hdr_info;
-	uint16_t type;
+	if (br_chan->state != BT_L2CAP_CONNECTED) {
+		/* The channel is not connected */
+		return;
+	}
 
-	if (buf->len < sizeof(*req)) {
-		LOG_ERR("Too small info req packet size");
-		return -EINVAL;
+	/* Restart the timer */
+	if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_RET_TIMER)) {
+		k_work_schedule(&br_chan->monitor_work, K_MSEC(br_chan->tx.monitor_timeout));
 	}
 
-	rsp_buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+	LOG_DBG("chan %p monitor timeout", br_chan);
 
-	type = sys_le16_to_cpu(req->type);
-	LOG_DBG("type 0x%04x", type);
+	if (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) {
+		if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P_CHANGED) &&
+		    atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+			/* State: WAIT_F
+			 * Monitor Timer expires
+			 * Action: send RR(P=1) or RNR(P=1)
+			 */
+			int err;
 
-	hdr_info = net_buf_add(rsp_buf, sizeof(*hdr_info));
-	hdr_info->code = BT_L2CAP_INFO_RSP;
-	hdr_info->ident = ident;
+			br_chan->retry_count++;
+			if (br_chan->tx.max_transmit &&
+			    (br_chan->retry_count > br_chan->tx.max_transmit)) {
+				bt_l2cap_chan_disconnect(&br_chan->chan);
+				return;
+			}
 
-	rsp = net_buf_add(rsp_buf, sizeof(*rsp));
+			LOG_WRN("Resend RR(P=1) on chan %p", br_chan);
 
-	switch (type) {
-	case BT_L2CAP_INFO_FEAT_MASK:
-		rsp->type = sys_cpu_to_le16(BT_L2CAP_INFO_FEAT_MASK);
-		rsp->result = sys_cpu_to_le16(BT_L2CAP_INFO_SUCCESS);
-		net_buf_add_le32(rsp_buf, L2CAP_FEAT_FIXED_CHAN_MASK);
-		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp) + sizeof(uint32_t));
-		break;
-	case BT_L2CAP_INFO_FIXED_CHAN:
-		rsp->type = sys_cpu_to_le16(BT_L2CAP_INFO_FIXED_CHAN);
-		rsp->result = sys_cpu_to_le16(BT_L2CAP_INFO_SUCCESS);
-		/* fixed channel mask protocol data is 8 octets wide */
-		(void)memset(net_buf_add(rsp_buf, 8), 0, 8);
-		rsp->data[0] = get_fixed_channels_mask();
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P_CHANGED);
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, true);
 
-		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp) + 8);
-		break;
-	default:
-		rsp->type = req->type;
-		rsp->result = sys_cpu_to_le16(BT_L2CAP_INFO_NOTSUPP);
-		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp));
-		break;
+			err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+			if (err) {
+				bt_l2cap_chan_disconnect(&br_chan->chan);
+			}
+		}
+	} else if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_FC) ||
+		   (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_RET)) {
+		/* Send S-frame with R=0.
+		 * Send S-Frame if there is not any pending I-frame
+		 */
+		int err;
+
+		err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+		if (!err) {
+			atomic_clear_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R);
+		} else {
+			bt_l2cap_chan_disconnect(&br_chan->chan);
+		}
 	}
+}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 
-	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, rsp_buf);
+static bool l2cap_br_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
+			      bt_l2cap_chan_destroy_t destroy)
+{
+	struct bt_l2cap_br_chan *ch = l2cap_br_chan_alloc_cid(conn, chan);
 
-	return 0;
+	if (!ch) {
+		LOG_WRN("Unable to allocate L2CAP CID");
+		return false;
+	}
+
+	sys_slist_init(&ch->_pdu_tx_queue);
+
+	/* All dynamic channels have the destroy handler which makes sure that
+	 * the RTX work structure is properly released with a cancel sync.
+	 * The fixed signal channel is only removed when disconnected and the
+	 * disconnected handler is always called from the workqueue itself so
+	 * canceling from there should always succeed.
+	 */
+	k_work_init_delayable(&ch->rtx_work, l2cap_br_rtx_timeout);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	k_work_init_delayable(&ch->ret_work, l2cap_br_ret_timeout);
+	k_work_init_delayable(&ch->monitor_work, l2cap_br_monitor_timeout);
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+	bt_l2cap_chan_add(conn, chan, destroy);
+
+	return true;
 }
 
-void bt_l2cap_br_connected(struct bt_conn *conn)
+int bt_l2cap_br_send_cb(struct bt_conn *conn, uint16_t cid, struct net_buf *buf,
+			bt_conn_tx_cb_t cb, void *user_data)
 {
-	struct bt_l2cap_chan *chan;
+	struct bt_l2cap_chan *ch = bt_l2cap_br_lookup_tx_cid(conn, cid);
+	struct bt_l2cap_br_chan *br_chan;
+	struct bt_l2cap_hdr *hdr;
 
-	STRUCT_SECTION_FOREACH(bt_l2cap_br_fixed_chan, fchan) {
-		struct bt_l2cap_br_chan *br_chan;
+	if (ch == NULL) {
+		LOG_WRN("CID %d is not found on conn %p", cid, conn);
+		return -ESHUTDOWN;
+	}
 
-		if (!fchan->accept) {
-			continue;
-		}
+	br_chan = CONTAINER_OF(ch, struct bt_l2cap_br_chan, chan);
 
-		if (fchan->accept(conn, &chan) < 0) {
-			continue;
-		}
+	LOG_DBG("chan %p buf %p len %u", br_chan, buf, buf->len);
 
-		br_chan = BR_CHAN(chan);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_BASIC) {
+		hdr = net_buf_push(buf, sizeof(*hdr));
+		hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr));
+		hdr->cid = sys_cpu_to_le16(cid);
+	}
+#else
+	hdr = net_buf_push(buf, sizeof(*hdr));
+	hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr));
+	hdr->cid = sys_cpu_to_le16(cid);
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 
-		br_chan->rx.cid = fchan->cid;
-		br_chan->tx.cid = fchan->cid;
+	if (buf->user_data_size < sizeof(struct closure)) {
+		LOG_WRN("not enough room in user_data %d < %d pool %u",
+			buf->user_data_size,
+			CONFIG_BT_CONN_TX_USER_DATA_SIZE,
+			buf->pool_id);
+		return -EINVAL;
+	}
 
-		if (!l2cap_br_chan_add(conn, chan, NULL)) {
-			return;
-		}
+	LOG_DBG("push PDU: cb %p userdata %p", cb, user_data);
 
-		/*
-		 * other fixed channels will be connected after Information
-		 * Response is received
-		 */
-		if (fchan->cid == BT_L2CAP_CID_BR_SIG) {
-			struct bt_l2cap_br *sig_ch;
+	make_closure(buf->user_data, cb, user_data);
+	sys_slist_append(&br_chan->_pdu_tx_queue, &buf->node);
+	raise_data_ready(br_chan);
 
-			connect_fixed_channel(br_chan);
+	return 0;
+}
 
-			sig_ch = CONTAINER_OF(br_chan, struct bt_l2cap_br, chan);
-			l2cap_br_get_info(sig_ch, BT_L2CAP_INFO_FEAT_MASK);
-		}
+/* Send the buffer and release it in case of failure.
+ * Any other cleanup in failure to send should be handled by the disconnected
+ * handler.
+ */
+static inline void l2cap_send(struct bt_conn *conn, uint16_t cid,
+			      struct net_buf *buf)
+{
+	if (bt_l2cap_br_send_cb(conn, cid, buf, NULL, NULL)) {
+		net_buf_unref(buf);
 	}
 }
 
-void bt_l2cap_br_disconnected(struct bt_conn *conn)
+static void l2cap_br_chan_send_req(struct bt_l2cap_br_chan *chan,
+				   struct net_buf *buf, k_timeout_t timeout)
 {
-	struct bt_l2cap_chan *chan, *next;
 
-	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&conn->channels, chan, next, node) {
-		bt_l2cap_br_chan_del(chan);
+	if (bt_l2cap_br_send_cb(chan->chan.conn, BT_L2CAP_CID_BR_SIG, buf,
+			     NULL, NULL)) {
+		net_buf_unref(buf);
+		return;
 	}
+
+	/* BLUETOOTH SPECIFICATION Version 4.2 [Vol 3, Part A] page 126:
+	 *
+	 * The value of this timer is implementation-dependent but the minimum
+	 * initial value is 1 second and the maximum initial value is 60
+	 * seconds. One RTX timer shall exist for each outstanding signaling
+	 * request, including each Echo Request. The timer disappears on the
+	 * final expiration, when the response is received, or the physical
+	 * link is lost.
+	 */
+	k_work_reschedule(&chan->rtx_work, timeout);
 }
 
-static struct bt_l2cap_server *l2cap_br_server_lookup_psm(uint16_t psm)
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static uint16_t get_pdu_len(struct bt_l2cap_br_chan *br_chan, struct net_buf *buf, bool start_seg)
 {
-	struct bt_l2cap_server *server;
+	uint16_t pdu_len = buf->len;
+	uint16_t actual_mps;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&br_servers, server, node) {
-		if (server->psm == psm) {
-			return server;
-		}
+	if (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_BASIC) {
+		return pdu_len;
 	}
 
-	return NULL;
-}
+	/* MPS is Max PDU Size.
+	 * PDU of I-frame includes the Control, L2CAP SDU Length (when present),
+	 * Information Payload, and frame check sequence (FCS) (when present) fields.
+	 */
+	actual_mps = br_chan->tx.mps - BT_L2CAP_RT_FC_SDU_HDR_SIZE(br_chan) -
+		     BT_L2CAP_RT_FC_SDU_TAIL_SIZE(br_chan);
 
-static void l2cap_br_conf_add_mtu(struct net_buf *buf, const uint16_t mtu)
-{
-	net_buf_add_u8(buf, BT_L2CAP_CONF_OPT_MTU);
-	net_buf_add_u8(buf, sizeof(mtu));
-	net_buf_add_le16(buf, mtu);
-}
+	/* To get the max available space,
+	 * assume SDU field is no present.
+	 */
+	actual_mps += BT_L2CAP_RT_FC_SDU_LEN_SIZE;
 
-static void l2cap_br_conf_add_opt(struct net_buf *buf, const struct bt_l2cap_conf_opt *opt)
-{
-	net_buf_add_u8(buf, opt->type & BT_L2CAP_CONF_MASK);
-	net_buf_add_u8(buf, opt->len);
-	net_buf_add_mem(buf, opt->data, opt->len);
+	if (pdu_len <= actual_mps) {
+		return pdu_len;
+	}
+
+	if (start_seg) {
+		/* The max mps length cannot meet the requirement.
+		 * Deduct the SDU length field for Max length could be used for seg.
+		 */
+		return actual_mps - BT_L2CAP_RT_FC_SDU_LEN_SIZE;
+	}
+
+	return actual_mps;
 }
 
-static void l2cap_br_conf(struct bt_l2cap_chan *chan)
+static int bt_l2cap_br_pack_s_frame_header(struct bt_l2cap_br_chan *br_chan, struct net_buf *buf,
+					   uint8_t s)
 {
-	struct bt_l2cap_sig_hdr *hdr;
-	struct bt_l2cap_conf_req *conf;
-	struct net_buf *buf;
+	struct bt_l2cap_hdr *hdr;
+	uint16_t std_control;
+	uint16_t enh_control;
+	uint32_t ext_control;
+	uint8_t f_bit = 0;
+	uint8_t r_bit = 0;
+	uint8_t p_bit = 0;
+	uint16_t pdu_len;
 
-	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+	pdu_len = BT_L2CAP_RT_FC_SDU_HDR_SIZE(br_chan) + BT_L2CAP_RT_FC_SDU_TAIL_SIZE(br_chan) -
+		  BT_L2CAP_RT_FC_SDU_LEN_SIZE;
 
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_CONF_REQ;
-	hdr->ident = l2cap_br_get_ident();
-	conf = net_buf_add(buf, sizeof(*conf));
-	(void)memset(conf, 0, sizeof(*conf));
+	hdr = net_buf_push(buf, sizeof(*hdr));
 
-	conf->dcid = sys_cpu_to_le16(BR_CHAN(chan)->tx.cid);
-	/*
-	 * Add MTU option if app set non default BR/EDR L2CAP MTU,
-	 * otherwise sent empty configuration data meaning default MTU
-	 * to be used.
-	 */
-	if (BR_CHAN(chan)->rx.mtu != L2CAP_BR_DEFAULT_MTU) {
-		l2cap_br_conf_add_mtu(buf, BR_CHAN(chan)->rx.mtu);
+	hdr->len = sys_cpu_to_le16(pdu_len);
+	hdr->cid = sys_cpu_to_le16(br_chan->tx.cid);
+
+	if (s == BT_L2CAP_CONTROL_S_RR) {
+		if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ_CHANGED) &&
+		    atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ)) {
+			s = BT_L2CAP_CONTROL_S_REJ;
+		}
 	}
 
-	hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr));
+	if (s == BT_L2CAP_CONTROL_S_RR) {
+		if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_P)) {
+			f_bit = 1;
+		} else if (atomic_test_and_clear_bit(br_chan->flags,
+						     L2CAP_FLAG_SEND_FRAME_P_CHANGED) &&
+			   atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+			p_bit = 1;
+		} else if (atomic_test_and_clear_bit(br_chan->flags,
+						     L2CAP_FLAG_LOCAL_BUSY_CHANGED) &&
+			   atomic_test_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY)) {
+			s = BT_L2CAP_CONTROL_S_RNR;
+		}
 
-	/*
-	 * TODO:
-	 * might be needed to start tracking number of configuration iterations
-	 * on both directions
-	 */
-	l2cap_br_chan_send_req(BR_CHAN(chan), buf, L2CAP_BR_CFG_TIMEOUT);
-}
+		if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY)) {
+			s = BT_L2CAP_CONTROL_S_RNR;
+		}
+	}
 
-enum l2cap_br_conn_security_result {
-	L2CAP_CONN_SECURITY_PASSED,
-	L2CAP_CONN_SECURITY_REJECT,
-	L2CAP_CONN_SECURITY_PENDING
-};
-
-/*
- * Security helper against channel connection.
- * Returns L2CAP_CONN_SECURITY_PASSED if:
- * - existing security on link is applicable for requested PSM in connection,
- * - legacy (non SSP) devices connecting with low security requirements,
- * Returns L2CAP_CONN_SECURITY_PENDING if:
- * - channel connection process is on hold since there were valid security
- *   conditions triggering authentication indirectly in subcall.
- * Returns L2CAP_CONN_SECURITY_REJECT if:
- * - bt_conn_set_security API returns < 0.
- */
-
-static enum l2cap_br_conn_security_result
-l2cap_br_conn_security(struct bt_l2cap_chan *chan, const uint16_t psm)
-{
-	int check;
-	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
-
-	/* For SDP PSM there's no need to change existing security on link */
-	if (br_chan->required_sec_level == BT_SECURITY_L0) {
-		return L2CAP_CONN_SECURITY_PASSED;
-	}
-
-	/*
-	 * No link key needed for legacy devices (pre 2.1) and when low security
-	 * level is required.
-	 */
-	if (br_chan->required_sec_level == BT_SECURITY_L1 &&
-	    !BT_FEAT_HOST_SSP(chan->conn->br.features)) {
-		return L2CAP_CONN_SECURITY_PASSED;
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY) &&
+	    (s != BT_L2CAP_CONTROL_S_RNR)) {
+		LOG_WRN("Local is busy and cannot send S-frame on %p", br_chan);
+		return -EINVAL;
 	}
 
-	switch (br_chan->required_sec_level) {
-	case BT_SECURITY_L4:
-	case BT_SECURITY_L3:
-	case BT_SECURITY_L2:
-		break;
-	default:
-		/*
-		 * For non SDP PSM connections GAP's Security Mode 4 requires at
-		 * least unauthenticated link key and enabled encryption if
-		 * remote supports SSP before any L2CAP CoC traffic. So preset
-		 * local to MEDIUM security to trigger it if needed.
-		 */
-		if (BT_FEAT_HOST_SSP(chan->conn->br.features)) {
-			br_chan->required_sec_level = BT_SECURITY_L2;
-		}
-		break;
+	if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R_CHANGED) &&
+	    atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R)) {
+		r_bit = 1;
 	}
 
-	check = bt_conn_set_security(chan->conn, br_chan->required_sec_level);
-
-	/*
-	 * Check case when on existing connection security level already covers
-	 * channel (service) security requirements against link security and
-	 * bt_conn_set_security API returns 0 what implies also there was no
-	 * need to trigger authentication.
-	 */
-	if (check == 0 &&
-	    chan->conn->sec_level >= br_chan->required_sec_level) {
-		return L2CAP_CONN_SECURITY_PASSED;
+	if (br_chan->tx.mode != BT_L2CAP_BR_LINK_MODE_STREAM) {
+		br_chan->req_seq = br_chan->expected_tx_seq;
+	} else {
+		br_chan->req_seq = 0;
 	}
 
-	/*
-	 * If 'check' still holds 0, it means local host just sent HCI
-	 * authentication command to start procedure to increase link security
-	 * since service/profile requires that.
-	 */
-	if (check == 0) {
-		/*
-		 * General Bonding refers to the process of performing bonding
-		 * during connection setup or channel establishment procedures
-		 * as a precursor to accessing a service.
-		 * For current case, it is dedicated bonding.
-		 */
-		atomic_set_bit(chan->conn->flags, BT_CONN_BR_GENERAL_BONDING);
-		return L2CAP_CONN_SECURITY_PENDING;
+	if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->tx.extended_control) {
+			/* Space occupied for extended control field. */
+			ext_control = sys_cpu_to_le32(BT_L2CAP_S_FRAME_EXT_CONTROL_SET(
+				f_bit, br_chan->req_seq, s, p_bit));
+			net_buf_add_le32(buf, ext_control);
+		} else {
+			/* Space occupied for enhanced control field. */
+			enh_control = sys_cpu_to_le16(BT_L2CAP_S_FRAME_ENH_CONTROL_SET(
+				s, p_bit, f_bit, br_chan->req_seq));
+			net_buf_add_le16(buf, enh_control);
+		}
+	} else {
+		/* Space occupied for standard control field. */
+		std_control = sys_cpu_to_le16(
+			BT_L2CAP_S_FRAME_STD_CONTROL_SET(s, r_bit, br_chan->req_seq));
+		net_buf_add_le16(buf, std_control);
 	}
 
-	/*
-	 * For any other values in 'check' it means there was internal
-	 * validation condition forbidding to start authentication at this
-	 * moment.
-	 */
-	return L2CAP_CONN_SECURITY_REJECT;
+	return 0;
 }
 
-static void l2cap_br_send_conn_rsp(struct bt_conn *conn, uint16_t scid,
-				  uint16_t dcid, uint8_t ident, uint16_t result)
+static void bt_l2cap_br_pack_i_frame_header(struct bt_l2cap_br_chan *br_chan, struct net_buf *buf,
+					    uint8_t pdu_len, uint8_t sar, uint8_t tx_seq)
 {
-	struct net_buf *buf;
-	struct bt_l2cap_conn_rsp *rsp;
-	struct bt_l2cap_sig_hdr *hdr;
-
-	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+	struct bt_l2cap_hdr *hdr;
+	uint16_t std_control;
+	uint16_t enh_control;
+	uint32_t ext_control;
+	uint8_t f_bit = 0;
+	uint8_t r_bit = 0;
 
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_CONN_RSP;
-	hdr->ident = ident;
-	hdr->len = sys_cpu_to_le16(sizeof(*rsp));
+	/* HDR space has been reserved */
+	hdr = net_buf_push(buf, sizeof(*hdr));
 
-	rsp = net_buf_add(buf, sizeof(*rsp));
-	rsp->dcid = sys_cpu_to_le16(dcid);
-	rsp->scid = sys_cpu_to_le16(scid);
-	rsp->result = sys_cpu_to_le16(result);
+	hdr->len = sys_cpu_to_le16(pdu_len);
+	hdr->cid = sys_cpu_to_le16(br_chan->tx.cid);
 
-	if (result == BT_L2CAP_BR_PENDING) {
-		rsp->status = sys_cpu_to_le16(BT_L2CAP_CS_AUTHEN_PEND);
-	} else {
-		rsp->status = sys_cpu_to_le16(BT_L2CAP_CS_NO_INFO);
+	if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_P)) {
+		f_bit = 1;
 	}
 
-	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
-}
-
-static int l2cap_br_conn_req_reply(struct bt_l2cap_chan *chan, uint16_t result)
-{
-	/* Send response to connection request only when in acceptor role */
-	if (!atomic_test_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_ACCEPTOR)) {
-		return -ESRCH;
+	if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R_CHANGED) &&
+	    atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R)) {
+		r_bit = 1;
 	}
 
-	l2cap_br_send_conn_rsp(chan->conn, BR_CHAN(chan)->tx.cid,
-			       BR_CHAN(chan)->rx.cid, BR_CHAN(chan)->ident, result);
-	BR_CHAN(chan)->ident = 0U;
+	if (br_chan->tx.mode != BT_L2CAP_BR_LINK_MODE_STREAM) {
+		br_chan->req_seq = br_chan->expected_tx_seq;
+	} else {
+		br_chan->req_seq = 0;
+	}
 
-	return 0;
+	if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->tx.extended_control) {
+			/* Space occupied for extended control field. */
+			ext_control = BT_L2CAP_I_FRAME_EXT_CONTROL_SET(f_bit, tx_seq, sar,
+								       br_chan->req_seq);
+			net_buf_add_le32(buf, ext_control);
+		} else {
+			/* Space occupied for enhanced control field. */
+			enh_control = BT_L2CAP_I_FRAME_ENH_CONTROL_SET(tx_seq, f_bit,
+								       br_chan->req_seq, sar);
+			net_buf_add_le16(buf, enh_control);
+		}
+	} else {
+		/* Space occupied for standard control field. */
+		std_control =
+			BT_L2CAP_I_FRAME_STD_CONTROL_SET(tx_seq, r_bit, br_chan->req_seq, sar);
+		net_buf_add_le16(buf, std_control);
+	}
 }
 
-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-#if defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)
-void bt_l2cap_br_chan_set_state_debug(struct bt_l2cap_chan *chan,
-				   bt_l2cap_chan_state_t state,
-				   const char *func, int line)
+static struct net_buf *l2cap_br_get_next_sdu(struct bt_l2cap_br_chan *br_chan)
 {
-	struct bt_l2cap_br_chan *br_chan;
-
-	br_chan = BR_CHAN(chan);
+	struct net_buf *sdu, *next;
 
-	LOG_DBG("chan %p psm 0x%04x %s -> %s", chan, br_chan->psm,
-		bt_l2cap_chan_state_str(br_chan->state), bt_l2cap_chan_state_str(state));
+	if (br_chan->_pdu_buf) {
+		return br_chan->_pdu_buf;
+	}
 
-	/* check transitions validness */
-	switch (state) {
-	case BT_L2CAP_DISCONNECTED:
-		/* regardless of old state always allows this state */
-		break;
-	case BT_L2CAP_CONNECTING:
-		if (br_chan->state != BT_L2CAP_DISCONNECTED) {
-			LOG_WRN("%s()%d: invalid transition", func, line);
-		}
-		break;
-	case BT_L2CAP_CONFIG:
-		if (br_chan->state != BT_L2CAP_CONNECTING) {
-			LOG_WRN("%s()%d: invalid transition", func, line);
-		}
-		break;
-	case BT_L2CAP_CONNECTED:
-		if (br_chan->state != BT_L2CAP_CONFIG &&
-		    br_chan->state != BT_L2CAP_CONNECTING) {
-			LOG_WRN("%s()%d: invalid transition", func, line);
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&br_chan->_pdu_tx_queue, sdu, next, node) {
+		if (sdu->len) {
+			return sdu;
 		}
-		break;
-	case BT_L2CAP_DISCONNECTING:
-		if (br_chan->state != BT_L2CAP_CONFIG &&
-		    br_chan->state != BT_L2CAP_CONNECTED) {
-			LOG_WRN("%s()%d: invalid transition", func, line);
+
+		if (L2CAP_BR_IS_S_FRAME(closure_data(sdu->user_data))) {
+			return sdu;
 		}
-		break;
-	default:
-		LOG_ERR("%s()%d: unknown (%u) state was set", func, line, state);
-		return;
 	}
 
-	br_chan->state = state;
-}
-#else
-void bt_l2cap_br_chan_set_state(struct bt_l2cap_chan *chan,
-			     bt_l2cap_chan_state_t state)
-{
-	BR_CHAN(chan)->state = state;
+	return NULL;
 }
-#endif /* CONFIG_BT_L2CAP_LOG_LEVEL_DBG */
-#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
 
-void bt_l2cap_br_chan_del(struct bt_l2cap_chan *chan)
+static bool l2cap_br_send_i_frame(struct bt_l2cap_br_chan *br_chan, struct net_buf *sdu)
 {
-	const struct bt_l2cap_chan_ops *ops = chan->ops;
-	struct bt_l2cap_br_chan *br_chan = CONTAINER_OF(chan, struct bt_l2cap_br_chan, chan);
-
-	LOG_DBG("conn %p chan %p", chan->conn, chan);
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R)) {
+		return false;
+	}
 
-	if (!chan->conn) {
-		goto destroy;
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RET_REQ_I_FRAME)) {
+		if (l2cap_br_find_srej(br_chan)) {
+			return true;
+		}
 	}
 
-	cancel_data_ready(br_chan);
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME) &&
+	    (atomic_test_bit(br_chan->flags, L2CAP_FLAG_PDU_RETRANS) ||
+	     atomic_test_bit(br_chan->flags, L2CAP_FLAG_REQ_SEQ_UPDATED))) {
+		return true;
+	}
 
-	/* Remove buffers on the PDU TX queue. */
-	while (chan_has_data(br_chan)) {
-		struct net_buf *buf = k_fifo_get(&br_chan->_pdu_tx_queue, K_NO_WAIT);
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+		return false;
+	}
 
-		net_buf_unref(buf);
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_REMOTE_BUSY)) {
+		return false;
 	}
 
-	if (ops->disconnected) {
-		ops->disconnected(chan);
+	if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME)) {
+		return false;
 	}
 
-	chan->conn = NULL;
+	if (!sdu) {
+		return false;
+	}
 
-destroy:
-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-	/* Reset internal members of common channel */
-	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_DISCONNECTED);
-	BR_CHAN(chan)->psm = 0U;
-#endif
-	if (chan->destroy) {
-		chan->destroy(chan);
+	if (bt_l2cap_br_get_outstanding_count(br_chan) >= br_chan->tx.max_window) {
+		return false;
 	}
 
-	if (ops->released) {
-		ops->released(chan);
+	if (k_fifo_peek_head(&br_chan->_free_tx_win)) {
+		return true;
 	}
+
+	return false;
 }
 
-static void l2cap_br_conn_req(struct bt_l2cap_br *l2cap, uint8_t ident,
-			      struct net_buf *buf)
+static struct net_buf *l2cap_br_ret_fc_data_pull(struct bt_conn *conn, size_t amount,
+						 size_t *length)
 {
-	struct bt_conn *conn = l2cap->chan.chan.conn;
-	struct bt_l2cap_chan *chan;
-	struct bt_l2cap_server *server;
-	struct bt_l2cap_conn_req *req = (void *)buf->data;
-	uint16_t psm, scid, result;
-	struct bt_l2cap_br_chan *br_chan;
+	const sys_snode_t *pdu_ready = sys_slist_peek_head(&conn->l2cap_data_ready);
 
-	if (buf->len < sizeof(*req)) {
-		LOG_ERR("Too small L2CAP conn req packet size");
-		return;
+	if (!pdu_ready) {
+		LOG_DBG("nothing to send on this conn");
+		return NULL;
 	}
 
-	psm = sys_le16_to_cpu(req->psm);
-	scid = sys_le16_to_cpu(req->scid);
-
-	LOG_DBG("psm 0x%02x scid 0x%04x", psm, scid);
+	struct bt_l2cap_br_chan *br_chan =
+		CONTAINER_OF(pdu_ready, struct bt_l2cap_br_chan, _pdu_ready);
 
-	/* Check if there is a server registered */
-	server = l2cap_br_server_lookup_psm(psm);
-	if (!server) {
-		result = BT_L2CAP_BR_ERR_PSM_NOT_SUPP;
-		goto no_chan;
+	if (br_chan->_pdu_buf && bt_buf_has_view(br_chan->_pdu_buf)) {
+		LOG_ERR("already have view on %p", br_chan->_pdu_buf);
+		return NULL;
 	}
 
-	/*
-	 * Report security violation for non SDP channel without encryption when
-	 * remote supports SSP.
+	/* Leave the PDU buffer in the queue until we have sent all its
+	 * fragments.
 	 */
-	if (server->sec_level != BT_SECURITY_L0 &&
-	    BT_FEAT_HOST_SSP(conn->br.features) && !conn->encrypt) {
-		result = BT_L2CAP_BR_ERR_SEC_BLOCK;
-		goto no_chan;
-	}
+	struct net_buf *pdu = l2cap_br_get_next_sdu(br_chan);
+	struct net_buf *send_buf = NULL;
+
+	if (br_chan->_pdu_remaining == 0) {
+		struct bt_l2cap_br_window *tx_win;
+		bool first = true;
+		uint8_t s_bit = BT_L2CAP_CONTROL_S_RR;
+		bool alloc = false;
+
+		if (pdu && !pdu->len && L2CAP_BR_IS_S_FRAME(closure_data(pdu->user_data))) {
+			/* It is a S-frame */
+			s_bit = L2CAP_BR_GET_S_BIT(closure_data(pdu->user_data));
+			alloc = true;
+		}
 
-	if (!L2CAP_BR_CID_IS_DYN(scid)) {
-		result = BT_L2CAP_BR_ERR_INVALID_SCID;
-		goto no_chan;
-	}
+		if ((atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R) &&
+		     atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R_CHANGED)) ||
+		    (atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ) &&
+		     atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ_CHANGED)) ||
+		    (atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P) &&
+		     atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P_CHANGED)) ||
+		    (atomic_test_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY) &&
+		     atomic_test_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY_CHANGED)) ||
+		    atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_S_FRAME)) {
+			alloc = true;
+		}
 
-	chan = bt_l2cap_br_lookup_tx_cid(conn, scid);
-	if (chan) {
-		/*
-		 * we have a chan here but this is due to SCID being already in
-		 * use so it is not channel we are suppose to pass to
-		 * l2cap_br_conn_req_reply as wrong DCID would be used
-		 */
-		result = BT_L2CAP_BR_ERR_SCID_IN_USE;
-		goto no_chan;
-	}
+		if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_P) &&
+		    !l2cap_br_send_i_frame(br_chan, pdu)) {
+			alloc = true;
+		}
 
-	/*
-	 * Request server to accept the new connection and allocate the
-	 * channel. If no free channels available for PSM server reply with
-	 * proper result and quit since chan pointer is uninitialized then.
-	 */
-	if (server->accept(conn, server, &chan) < 0) {
-		result = BT_L2CAP_BR_ERR_NO_RESOURCES;
-		goto no_chan;
-	}
+		if (alloc) {
+			int err;
+
+			/* Send S-Frame with R bit set. */
+			send_buf = bt_l2cap_create_pdu_timeout(&br_tx_pool, 0, K_NO_WAIT);
+			if (send_buf == NULL) {
+				/* No buffer can be used for transmission.
+				 * Waiting for buffer available.
+				 */
+				LOG_WRN("no buf for sending S-frame on %p", br_chan);
+				return NULL;
+			}
 
-	br_chan = BR_CHAN(chan);
-	br_chan->required_sec_level = server->sec_level;
+			err = bt_l2cap_br_pack_s_frame_header(br_chan, send_buf, s_bit);
+			if (err < 0) {
+				net_buf_unref(send_buf);
+				LOG_WRN("Cannot sending S-frame on %p", br_chan);
+				return NULL;
+			}
 
-	l2cap_br_chan_add(conn, chan, l2cap_br_chan_destroy);
-	BR_CHAN(chan)->tx.cid = scid;
-	br_chan->ident = ident;
-	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTING);
-	atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_ACCEPTOR);
+			atomic_clear_bit(br_chan->flags, L2CAP_FLAG_SEND_S_FRAME);
 
-	/* Disable fragmentation of l2cap rx pdu */
-	BR_CHAN(chan)->rx.mtu = MIN(BR_CHAN(chan)->rx.mtu, BT_L2CAP_RX_MTU);
+			if (BT_L2CAP_RT_FC_SDU_TAIL_SIZE(br_chan)) {
+				uint16_t fcs =
+					crc16_reflect(0xa001, 0, send_buf->data, send_buf->len);
 
-	switch (l2cap_br_conn_security(chan, psm)) {
-	case L2CAP_CONN_SECURITY_PENDING:
-		result = BT_L2CAP_BR_PENDING;
-		/* TODO: auth timeout */
-		break;
-	case L2CAP_CONN_SECURITY_PASSED:
-		result = BT_L2CAP_BR_SUCCESS;
-		break;
-	case L2CAP_CONN_SECURITY_REJECT:
-	default:
-		result = BT_L2CAP_BR_ERR_SEC_BLOCK;
-		break;
-	}
-	/* Reply on connection request as acceptor */
-	l2cap_br_conn_req_reply(chan, result);
+				net_buf_add_le16(send_buf, fcs);
+			}
+			br_chan->_pdu_remaining = send_buf->len;
+			br_chan->_pdu_buf = send_buf;
 
-	if (result != BT_L2CAP_BR_SUCCESS) {
-		/* Disconnect link when security rules were violated */
-		if (result == BT_L2CAP_BR_ERR_SEC_BLOCK) {
-			bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
-		} else if (result == BT_L2CAP_BR_PENDING) {
-			/* Recover the ident when conn is pending */
-			br_chan->ident = ident;
+			make_closure(send_buf->user_data, NULL, NULL);
+
+			if (pdu && !pdu->len && L2CAP_BR_IS_S_FRAME(closure_data(pdu->user_data))) {
+				l2cap_br_sdu_is_done(br_chan, pdu, 0);
+			}
+
+			goto done;
 		}
 
-		return;
-	}
+		if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R)) {
+			/* No I-frames shall be transmitted if the last
+			 * RetransmissionDisableBit (R) received is set to one.
+			 */
+			LOG_DBG("Stop to send I-frame on %p", br_chan);
+			lower_data_ready(br_chan);
+			return NULL;
+		}
 
-	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONFIG);
-	l2cap_br_conf(chan);
-	return;
+		if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_REMOTE_BUSY)) {
+			/* RemoteBusy = TRUE, Pending sending data
+			 */
+			LOG_DBG("Remote is busy, cannot send I-frame on %p", br_chan);
+			lower_data_ready(br_chan);
+			return NULL;
+		}
 
-no_chan:
-	l2cap_br_send_conn_rsp(conn, scid, 0, ident, result);
-}
+		/* Found SREJ frame */
+		if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RET_REQ_I_FRAME)) {
+			tx_win = l2cap_br_find_srej(br_chan);
+			if (tx_win) {
+				first = false;
+				goto send_i_frame;
+			}
+		}
 
-static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
-			      uint16_t len, struct net_buf *buf)
-{
-	struct bt_conn *conn = l2cap->chan.chan.conn;
-	struct bt_l2cap_chan *chan;
-	struct bt_l2cap_conf_rsp *rsp = (void *)buf->data;
-	uint16_t flags, scid, result, opt_len;
-	struct bt_l2cap_br_chan *br_chan;
+		/* Retransmission i-Frame. Or, if seq_req has been updated, send next I-frame*/
+		if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME) &&
+		    (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_PDU_RETRANS) ||
+		     atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_REQ_SEQ_UPDATED))) {
+			tx_win = (void *)sys_slist_peek_head(&br_chan->_pdu_outstanding);
+			if (tx_win) {
+				first = false;
+				goto send_i_frame;
+			}
+		}
 
-	if (buf->len < sizeof(*rsp)) {
-		LOG_ERR("Too small L2CAP conf rsp packet size");
-		return;
-	}
+		if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+			/* Cannot send any new I-frames if waiting for F bit.
+			 * New I-frames cannot be sent while in the WAIT_F
+			 * state to prevent the situation where retransmission of
+			 * I-frames could result in the channel being disconnected.
+			 */
+			LOG_DBG("Waiting for F flag, cannot send I-frame on %p", br_chan);
+			lower_data_ready(br_chan);
+			return NULL;
+		}
 
-	flags = sys_le16_to_cpu(rsp->flags);
-	scid = sys_le16_to_cpu(rsp->scid);
-	result = sys_le16_to_cpu(rsp->result);
-	opt_len = len - sizeof(*rsp);
+		/* Cannot send out new I-frame */
+		if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME)) {
+			/* Sending is blocked
+			 */
+			LOG_DBG("Sending is blocked, cannot send I-frame on %p", br_chan);
+			lower_data_ready(br_chan);
+			return NULL;
+		}
 
-	LOG_DBG("scid 0x%04x flags 0x%02x result 0x%02x len %u", scid, flags, result, opt_len);
+		/* Check whether all PDUs have been sent. But not of all are confirmed. */
+		if (!pdu) {
+			/* No pending I-frame needs to be sent
+			 */
+			LOG_DBG("No pending I-frame needs to be sent on %p", br_chan);
+			lower_data_ready(br_chan);
+			return NULL;
+		}
 
-	chan = bt_l2cap_br_lookup_rx_cid(conn, scid);
-	if (!chan) {
-		LOG_ERR("channel mismatch!");
-		return;
-	}
+		tx_win = l2cap_br_find_window(br_chan);
+		if (!tx_win) {
+			/* No more window for sending I-frame PDU.
+			 * Remove the channel from the ready-list, it will be added
+			 * back later when the S-frame PDU has been received.
+			 */
+			LOG_DBG("no more window for sending I-frame on %p", br_chan);
+			lower_data_ready(br_chan);
+			return NULL;
+		}
 
-	br_chan = BR_CHAN(chan);
+send_i_frame:
+		send_buf = bt_l2cap_create_pdu_timeout(&br_tx_pool, 0, K_NO_WAIT);
+		if (send_buf == NULL) {
+			/* No buffer can be used for transmission.
+			 * Waiting for buffer available.
+			 */
+			LOG_WRN("no buf for sending I-frame on %p", br_chan);
+			/* Maybe we can disconnect channel here if retransmission I-frame. */
 
-	/* Release RTX work since got the response */
-	k_work_cancel_delayable(&br_chan->rtx_work);
+			/* Free allocated tx_win. */
+			l2cap_br_free_window(br_chan, tx_win);
+			return NULL;
+		}
 
-	/*
-	 * TODO: handle other results than success and parse response data if
-	 * available
-	 */
-	switch (result) {
-	case BT_L2CAP_CONF_SUCCESS:
-		atomic_set_bit(br_chan->flags, L2CAP_FLAG_CONN_LCONF_DONE);
+		make_closure(send_buf->user_data, NULL, NULL);
 
-		if (br_chan->state == BT_L2CAP_CONFIG &&
-		    atomic_test_bit(br_chan->flags,
-				    L2CAP_FLAG_CONN_RCONF_DONE)) {
-			LOG_DBG("scid 0x%04x rx MTU %u dcid 0x%04x tx MTU %u", br_chan->rx.cid,
-				br_chan->rx.mtu, br_chan->tx.cid, br_chan->tx.mtu);
+		uint16_t pdu_len;
+		uint16_t actual_pdu_len;
+		uint8_t sar;
+		uint16_t fcs;
 
-			bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTED);
-			if (chan->ops && chan->ops->connected) {
-				chan->ops->connected(chan);
+		if (first) {
+			bool last_seg;
+			bool start_seg;
+
+			start_seg = br_chan->_sdu_total_len ? false : true;
+
+			if (start_seg) {
+				br_chan->_sdu_total_len = pdu->len;
+			} else {
+				if (br_chan->_sdu_total_len <= pdu->len) {
+					start_seg = true;
+				}
 			}
-		}
-		break;
-	default:
-		/* currently disconnect channel on non success result */
-		bt_l2cap_chan_disconnect(chan);
-		break;
-	}
-}
 
-static int bt_l2cap_br_allocate_psm(uint16_t *psm)
-{
-	/* DYN_END is UINT16_MAX, so to be able to do a psm <= DYN_END comparison
-	 * we need to use uint32_t as the type.
-	 */
-	static uint32_t allocated_psm = L2CAP_BR_PSM_DYN_START;
+			net_buf_simple_save(&pdu->b, &tx_win->sdu_state);
 
-	if (allocated_psm < L2CAP_BR_PSM_DYN_END) {
-		allocated_psm = allocated_psm + 1;
-	} else {
-		goto failed;
-	}
+			pdu_len = get_pdu_len(br_chan, pdu, start_seg);
 
-	for (; allocated_psm <= L2CAP_BR_PSM_DYN_END; allocated_psm++) {
-		/* Bluetooth Core Specification Version 6.0 | Vol 3, Part A, section 4.2
-		 *
-		 * The PSM field is at least two octets in length. All PSM values shall have
-		 * the least significant bit of the most significant octet equal to 0 and the
-		 * least significant bit of all other octets equal to 1.
-		 */
-		if ((allocated_psm & 0x0101) != 0x0001) {
-			continue;
-		}
+			actual_pdu_len = pdu_len + BT_L2CAP_RT_FC_SDU_HDR_SIZE(br_chan) +
+					 BT_L2CAP_RT_FC_SDU_TAIL_SIZE(br_chan);
 
-		if (l2cap_br_server_lookup_psm((uint16_t)allocated_psm)) {
-			LOG_DBG("PSM 0x%04x has been used", allocated_psm);
-			continue;
-		}
+			last_seg = pdu_len == pdu->len;
 
-		LOG_DBG("Allocated PSM 0x%04x for new server", allocated_psm);
-		*psm = (uint16_t)allocated_psm;
-		return 0;
-	}
+			sar = start_seg ? (last_seg ? BT_L2CAP_CONTROL_SAR_UNSEG
+						    : BT_L2CAP_CONTROL_SAR_START)
+					: (last_seg ? BT_L2CAP_CONTROL_SAR_END
+						    : BT_L2CAP_CONTROL_SAR_CONTI);
+			if (sar == BT_L2CAP_CONTROL_SAR_START) {
+				net_buf_push_le16(pdu, pdu->len);
+				pdu_len += BT_L2CAP_RT_FC_SDU_LEN_SIZE;
+			} else {
+				/* Remove the SDU length from Header */
+				actual_pdu_len -= BT_L2CAP_RT_FC_SDU_LEN_SIZE;
+			}
 
-failed:
-	LOG_WRN("No free dynamic PSMs available");
-	return -EADDRNOTAVAIL;
-}
+			if (net_buf_tailroom(send_buf) < actual_pdu_len) {
+				LOG_ERR("Tailroom of the buffer cannot be filled %zu / %zu",
+					net_buf_tailroom(send_buf), actual_pdu_len);
+				__ASSERT(false, "Tailroom of the buffer cannot be filled %zu / %zu",
+					 net_buf_tailroom(send_buf), actual_pdu_len);
+				net_buf_unref(send_buf);
+				l2cap_br_free_window(br_chan, tx_win);
+				return NULL;
+			}
 
-int bt_l2cap_br_server_register(struct bt_l2cap_server *server)
-{
-	int err;
+			if (br_chan->tx.mode != BT_L2CAP_BR_LINK_MODE_STREAM) {
+				br_chan->req_seq = br_chan->expected_tx_seq;
+			} else {
+				br_chan->req_seq = 0;
+			}
 
-	if (!server->accept) {
-		return -EINVAL;
-	}
+			br_chan->tx_seq = br_chan->next_tx_seq;
+			tx_win->tx_seq = br_chan->tx_seq;
+			tx_win->data = pdu->data;
+			tx_win->len = pdu_len;
+			tx_win->srej = false;
+			tx_win->sar = sar;
+			tx_win->transmit_counter = 1;
+			tx_win->sdu_total_len = br_chan->_sdu_total_len;
+			tx_win->sdu = pdu;
+
+			LOG_DBG("Sending I-frame %u: buf %p chan %p len %zu", tx_win->tx_seq, pdu,
+				br_chan, pdu_len);
+		} else {
+			bool disconnect = false;
+
+			pdu_len = tx_win->len;
+			actual_pdu_len = pdu_len + BT_L2CAP_RT_FC_SDU_HDR_SIZE(br_chan) +
+					 BT_L2CAP_RT_FC_SDU_TAIL_SIZE(br_chan);
+			sar = tx_win->sar;
+			/* Remove the SDU length from Header.
+			 * Do not care SDU length, it has been handled in the first time.
+			 */
+			actual_pdu_len -= BT_L2CAP_RT_FC_SDU_LEN_SIZE;
+
+			tx_win->transmit_counter++;
+			tx_win->srej = false;
+
+			if (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) {
+				if (br_chan->tx.max_transmit &&
+				    (tx_win->transmit_counter > br_chan->tx.max_transmit)) {
+					disconnect = true;
+				}
+			} else {
+				if (tx_win->transmit_counter > br_chan->tx.max_transmit) {
+					disconnect = true;
+				}
+			}
 
-	if (server->sec_level > BT_SECURITY_L4) {
-		return -EINVAL;
-	} else if (server->sec_level == BT_SECURITY_L0 &&
-		   server->psm != L2CAP_BR_PSM_SDP) {
-		server->sec_level = BT_SECURITY_L1;
-	}
+			if (disconnect) {
+				/* If the TransmitCounter is equal to MaxTransmit this channel to
+				 * the peer entity shall be assumed lost. The channel shall move
+				 * to the CLOSED state and appropriate action shall be taken to
+				 * report this to the upper layers.
+				 */
+				bt_l2cap_br_chan_disconnect(&br_chan->chan);
+				net_buf_unref(send_buf);
+				return NULL;
+			}
 
-	if (!server->psm) {
-		err = bt_l2cap_br_allocate_psm(&server->psm);
-		if (err) {
-			return err;
+			LOG_WRN("Retransmission I-frame %u: buf %p chan %p len %zu", tx_win->tx_seq,
+				pdu, br_chan, pdu_len);
 		}
-	} else {
-		/* PSM must be odd and lsb of upper byte must be 0 */
-		if ((server->psm & 0x0101) != 0x0001) {
-			LOG_WRN("PSM must be odd and lsb of upper byte must be 0");
-			return -EINVAL;
+
+		bt_l2cap_br_pack_i_frame_header(br_chan, send_buf, actual_pdu_len, sar,
+						tx_win->tx_seq);
+
+		net_buf_add_mem(send_buf, tx_win->data, pdu_len);
+
+		if (BT_L2CAP_RT_FC_SDU_TAIL_SIZE(br_chan)) {
+			fcs = crc16_reflect(0xa001, 0, send_buf->data, send_buf->len);
+			net_buf_add_le16(send_buf, fcs);
 		}
 
-		/* Check if given PSM is already in use */
-		if (l2cap_br_server_lookup_psm(server->psm)) {
-			LOG_WRN("PSM already registered");
-			return -EADDRINUSE;
+		br_chan->_pdu_remaining = send_buf->len;
+		br_chan->_pdu_buf = send_buf;
+
+		if (first) {
+			br_chan->next_tx_seq =
+				bt_l2cap_br_update_seq(br_chan, br_chan->next_tx_seq + 1);
+
+			net_buf_pull(pdu, pdu_len);
+
+			if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_STREAM) {
+				sys_slist_append(&br_chan->_pdu_outstanding, &tx_win->node);
+			} else {
+				l2cap_br_free_window(br_chan, tx_win);
+
+				if (pdu->len == 0) {
+					l2cap_br_sdu_is_done(br_chan, pdu, 0);
+				}
+			}
 		}
 	}
 
-	LOG_DBG("PSM 0x%04x", server->psm);
-
-	sys_slist_append(&br_servers, &server->node);
+	if (br_chan->_pdu_buf != NULL) {
+		if (bt_l2cap_br_get_outstanding_count(br_chan) == 1) {
+			/* It is the first one */
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_RET, true);
+		} else {
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_RET, false);
+		}
+	}
 
-	return 0;
-}
+done:
+	/* This is used by `conn.c` to figure out if the PDU is done sending. */
+	*length = br_chan->_pdu_remaining;
 
-static void l2cap_br_send_reject(struct bt_conn *conn, uint8_t ident,
-				 uint16_t reason, void *data, uint8_t data_len)
-{
-	struct bt_l2cap_cmd_reject *rej;
-	struct bt_l2cap_sig_hdr *hdr;
 	struct net_buf *buf;
 
-	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+	buf = br_chan->_pdu_buf;
 
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_CMD_REJECT;
-	hdr->ident = ident;
-	hdr->len = sys_cpu_to_le16(sizeof(*rej) + data_len);
+	if (br_chan->_pdu_remaining > amount) {
+		br_chan->_pdu_remaining -= amount;
+	} else {
+		br_chan->_pdu_buf = NULL;
+		br_chan->_pdu_remaining = 0;
+		if (pdu && !pdu->len) {
+			br_chan->_sdu_total_len = 0;
+		}
 
-	rej = net_buf_add(buf, sizeof(*rej));
-	rej->reason = sys_cpu_to_le16(reason);
+		LOG_DBG("done sending PDU");
 
-	/*
-	 * optional data if available must be already in little-endian format
-	 * made by caller.and be compliant with Core 4.2 [Vol 3, Part A, 4.1,
-	 * table 4.4]
-	 */
-	if (data) {
-		net_buf_add_mem(buf, data, data_len);
+		/* Lowering the "request to send" and raising it again allows
+		 * fair scheduling of channels on an ACL link: the channel is
+		 * marked as "ready to send" by adding a reference to it on a
+		 * FIFO on `conn`. Adding it again will send it to the back of
+		 * the queue.
+		 *
+		 * TODO: add a user-controlled QoS function.
+		 */
+		LOG_DBG("chan %p done", br_chan);
+		lower_data_ready(br_chan);
+
+		/* Append channel to list if it still has data */
+		if (chan_has_data(br_chan)) {
+			LOG_DBG("chan %p ready", br_chan);
+			raise_data_ready(br_chan);
+		}
 	}
 
-	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
+	return buf;
 }
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 
-static uint16_t l2cap_br_conf_opt_mtu(struct bt_l2cap_chan *chan,
-				   struct net_buf *buf, size_t len)
+struct net_buf *l2cap_br_data_pull(struct bt_conn *conn, size_t amount, size_t *length)
 {
-	uint16_t mtu, result = BT_L2CAP_CONF_SUCCESS;
-	struct bt_l2cap_conf_opt_mtu *opt_mtu;
+	const sys_snode_t *pdu_ready = sys_slist_peek_head(&conn->l2cap_data_ready);
 
-	/* Core 4.2 [Vol 3, Part A, 5.1] MTU payload length */
-	if (len != sizeof(*opt_mtu)) {
-		LOG_ERR("tx MTU length %zu invalid", len);
-		result = BT_L2CAP_CONF_REJECT;
-		goto done;
+	if (!pdu_ready) {
+		LOG_DBG("nothing to send on this conn");
+		return NULL;
 	}
 
-	opt_mtu = (struct bt_l2cap_conf_opt_mtu *)buf->data;
+	struct bt_l2cap_br_chan *br_chan;
 
-	mtu = sys_le16_to_cpu(opt_mtu->mtu);
-	if (mtu < L2CAP_BR_MIN_MTU) {
-		result = BT_L2CAP_CONF_UNACCEPT;
-		BR_CHAN(chan)->tx.mtu = L2CAP_BR_MIN_MTU;
-		opt_mtu->mtu = sys_cpu_to_le16(L2CAP_BR_MIN_MTU);
-		LOG_DBG("tx MTU %u invalid", mtu);
-		goto done;
+	br_chan = CONTAINER_OF(pdu_ready, struct bt_l2cap_br_chan, _pdu_ready);
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (br_chan->tx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		return l2cap_br_ret_fc_data_pull(conn, amount, length);
 	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 
-	BR_CHAN(chan)->tx.mtu = mtu;
-	LOG_DBG("tx MTU %u", mtu);
-done:
-	return result;
-}
+	/* Leave the PDU buffer in the queue until we have sent all its
+	 * fragments.
+	 */
+	const sys_snode_t *tx_pdu = sys_slist_peek_head(&br_chan->_pdu_tx_queue);
 
-static uint16_t l2cap_br_conf_opt_flush_timeout(struct bt_l2cap_chan *chan,
-						struct net_buf *buf, size_t len)
-{
-	uint16_t result = BT_L2CAP_CONF_SUCCESS;
-	struct bt_l2cap_conf_opt_flush_timeout *opt_to;
+	__ASSERT(tx_pdu, "signaled ready but no PDUs in the TX queue");
 
-	if (len != sizeof(*opt_to)) {
-		LOG_ERR("qos frame length %zu invalid", len);
-		result = BT_L2CAP_CONF_REJECT;
-		goto done;
-	}
+	struct net_buf *pdu = CONTAINER_OF(tx_pdu, struct net_buf, node);
 
-	opt_to = (struct bt_l2cap_conf_opt_flush_timeout *)buf->data;
-
-	LOG_DBG("Flush timeout %u", opt_to->timeout);
+	if (bt_buf_has_view(pdu)) {
+		LOG_ERR("already have view on %p", pdu);
+		return NULL;
+	}
 
-	opt_to->timeout = sys_cpu_to_le16(0xFFFF);
-	result = BT_L2CAP_CONF_UNACCEPT;
-done:
-	return result;
-}
+	/* We can't interleave ACL fragments from different channels for the
+	 * same ACL conn -> we have to wait until a full L2 PDU is transferred
+	 * before switching channels.
+	 */
+	bool last_frag = amount >= pdu->len;
 
-static uint16_t l2cap_br_conf_opt_qos(struct bt_l2cap_chan *chan,
-				      struct net_buf *buf, size_t len)
-{
-	uint16_t result = BT_L2CAP_CONF_SUCCESS;
-	struct bt_l2cap_conf_opt_qos *opt_qos;
+	if (last_frag) {
+		LOG_DBG("last frag, removing %p", pdu);
+		__maybe_unused bool found;
 
-	if (len != sizeof(*opt_qos)) {
-		LOG_ERR("qos frame length %zu invalid", len);
-		result = BT_L2CAP_CONF_REJECT;
-		goto done;
-	}
+		found = sys_slist_find_and_remove(&br_chan->_pdu_tx_queue, &pdu->node);
 
-	opt_qos = (struct bt_l2cap_conf_opt_qos *)buf->data;
+		__ASSERT_NO_MSG(found);
 
-	LOG_DBG("QOS Type %u", opt_qos->service_type);
+		LOG_DBG("chan %p done", br_chan);
+		lower_data_ready(br_chan);
 
-	if (opt_qos->service_type == BT_L2CAP_QOS_TYPE_GUARANTEED) {
-		/* Set to default value */
-		result = BT_L2CAP_CONF_UNACCEPT;
-		opt_qos->flags = 0x00;
-		/* do not care */
-		opt_qos->token_rate = sys_cpu_to_le32(0x00000000);
-		/* no token bucket is needed */
-		opt_qos->token_bucket_size = sys_cpu_to_le32(0x00000000);
-		/* do not care */
-		opt_qos->peak_bandwidth = sys_cpu_to_le32(0x00000000);
-		/* do not care */
-		opt_qos->latency = sys_cpu_to_le32(0xFFFFFFFF);
-		/* do not care */
-		opt_qos->delay_variation = sys_cpu_to_le32(0xFFFFFFFF);
+		/* Append channel to list if it still has data */
+		if (chan_has_data(br_chan)) {
+			LOG_DBG("chan %p ready", br_chan);
+			raise_data_ready(br_chan);
+		}
 	}
 
-done:
-	return result;
+	*length = pdu->len;
+
+	return pdu;
 }
 
-static uint16_t l2cap_br_conf_opt_ret_fc(struct bt_l2cap_chan *chan,
-					 struct net_buf *buf, size_t len)
+static void l2cap_br_get_info(struct bt_l2cap_br *l2cap, uint16_t info_type)
 {
-	uint16_t result = BT_L2CAP_CONF_SUCCESS;
-	struct bt_l2cap_conf_opt_ret_fc *opt_ret_fc;
+	struct bt_l2cap_info_req *info;
+	struct net_buf *buf;
+	struct bt_l2cap_sig_hdr *hdr;
 
-	if (len != sizeof(*opt_ret_fc)) {
-		LOG_ERR("ret_fc frame length %zu invalid", len);
-		result = BT_L2CAP_CONF_REJECT;
-		goto done;
+	LOG_DBG("info type %u", info_type);
+
+	if (atomic_test_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_PENDING)) {
+		return;
 	}
 
-	opt_ret_fc = (struct bt_l2cap_conf_opt_ret_fc *)buf->data;
+	switch (info_type) {
+	case BT_L2CAP_INFO_FEAT_MASK:
+	case BT_L2CAP_INFO_FIXED_CHAN:
+		break;
+	default:
+		LOG_WRN("Unsupported info type %u", info_type);
+		return;
+	}
 
-	LOG_DBG("ret_fc mode %u", opt_ret_fc->mode);
+	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
 
-	if (opt_ret_fc->mode != BT_L2CAP_RET_FC_MODE_BASIC) {
-		/* Set to default value */
-		result = BT_L2CAP_CONF_UNACCEPT;
-		opt_ret_fc->mode = BT_L2CAP_RET_FC_MODE_BASIC;
-	}
+	atomic_set_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_PENDING);
+	l2cap->chan.ident = l2cap_br_get_ident();
 
-done:
-	return result;
+	hdr = net_buf_add(buf, sizeof(*hdr));
+	hdr->code = BT_L2CAP_INFO_REQ;
+	hdr->ident = l2cap->chan.ident;
+	hdr->len = sys_cpu_to_le16(sizeof(*info));
+
+	info = net_buf_add(buf, sizeof(*info));
+	info->type = sys_cpu_to_le16(info_type);
+
+	l2cap_br_chan_send_req(&l2cap->chan, buf, L2CAP_BR_INFO_TIMEOUT);
 }
 
-static uint16_t l2cap_br_conf_opt_fcs(struct bt_l2cap_chan *chan,
-				      struct net_buf *buf, size_t len)
+static void connect_fixed_channel(struct bt_l2cap_br_chan *chan)
 {
-	uint16_t result = BT_L2CAP_CONF_SUCCESS;
-	struct bt_l2cap_conf_opt_fcs *opt_fcs;
-
-	if (len != sizeof(*opt_fcs)) {
-		LOG_ERR("fcs frame length %zu invalid", len);
-		result = BT_L2CAP_CONF_REJECT;
-		goto done;
+	if (atomic_test_and_set_bit(chan->flags, L2CAP_FLAG_FIXED_CONNECTED)) {
+		return;
 	}
 
-	opt_fcs = (struct bt_l2cap_conf_opt_fcs *)buf->data;
+	if (chan->chan.ops && chan->chan.ops->connected) {
+		chan->chan.ops->connected(&chan->chan);
+	}
+}
 
-	LOG_DBG("FCS type %u", opt_fcs->type);
+static void connect_optional_fixed_channels(struct bt_l2cap_br *l2cap)
+{
+	/* can be change to loop if more BR/EDR fixed channels are added */
+	if (l2cap->info_fixed_chan & BIT(BT_L2CAP_CID_BR_SMP)) {
+		struct bt_l2cap_chan *chan;
 
-	if (opt_fcs->type != BT_L2CAP_FCS_TYPE_NO) {
-		/* Set to default value */
-		result = BT_L2CAP_CONF_UNACCEPT;
-		opt_fcs->type = BT_L2CAP_FCS_TYPE_NO;
+		chan = bt_l2cap_br_lookup_rx_cid(l2cap->chan.chan.conn,
+						 BT_L2CAP_CID_BR_SMP);
+		if (chan) {
+			connect_fixed_channel(BR_CHAN(chan));
+		}
 	}
-
-done:
-	return result;
 }
 
-static void l2cap_br_conf_req(struct bt_l2cap_br *l2cap, uint8_t ident,
-			      uint16_t len, struct net_buf *buf)
+static int l2cap_br_info_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
+			     struct net_buf *buf)
 {
-	struct bt_conn *conn = l2cap->chan.chan.conn;
-	struct bt_l2cap_chan *chan;
-	struct bt_l2cap_conf_req *req;
-	struct bt_l2cap_sig_hdr *hdr;
-	struct bt_l2cap_conf_rsp *rsp;
-	struct bt_l2cap_conf_opt *opt = NULL;
-	uint16_t flags, dcid, opt_len, hint, result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_info_rsp *rsp;
+	uint16_t type, result;
+	int err = 0;
 
-	if (buf->len < sizeof(*req)) {
-		LOG_ERR("Too small L2CAP conf req packet size");
-		return;
+	if (atomic_test_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_DONE)) {
+		return 0;
 	}
 
-	req = net_buf_pull_mem(buf, sizeof(*req));
-	flags = sys_le16_to_cpu(req->flags);
-	dcid = sys_le16_to_cpu(req->dcid);
-	opt_len = len - sizeof(*req);
-
-	LOG_DBG("dcid 0x%04x flags 0x%02x len %u", dcid, flags, opt_len);
+	if (atomic_test_and_clear_bit(l2cap->chan.flags,
+				      L2CAP_FLAG_SIG_INFO_PENDING)) {
+		/*
+		 * Release RTX timer since got the response & there's pending
+		 * command request.
+		 */
+		k_work_cancel_delayable(&l2cap->chan.rtx_work);
+	}
 
-	chan = bt_l2cap_br_lookup_rx_cid(conn, dcid);
-	if (!chan) {
-		LOG_ERR("rx channel mismatch!");
-		struct bt_l2cap_cmd_reject_cid_data data = {
-			.scid = req->dcid,
-			.dcid = 0,
-		};
+	if (buf->len < sizeof(*rsp)) {
+		LOG_ERR("Too small info rsp packet size");
+		err = -EINVAL;
+		goto done;
+	}
 
-		l2cap_br_send_reject(conn, ident, BT_L2CAP_REJ_INVALID_CID,
-				     &data, sizeof(data));
-		return;
+	if (ident != l2cap->chan.ident) {
+		LOG_WRN("Idents mismatch");
+		err = -EINVAL;
+		goto done;
 	}
 
-	if (!opt_len) {
-		LOG_DBG("tx default MTU %u", L2CAP_BR_DEFAULT_MTU);
-		BR_CHAN(chan)->tx.mtu = L2CAP_BR_DEFAULT_MTU;
-		goto send_rsp;
+	rsp = net_buf_pull_mem(buf, sizeof(*rsp));
+	result = sys_le16_to_cpu(rsp->result);
+	if (result != BT_L2CAP_INFO_SUCCESS) {
+		LOG_WRN("Result unsuccessful");
+		err = -EINVAL;
+		goto done;
 	}
 
-	while (buf->len >= sizeof(*opt)) {
-		opt = net_buf_pull_mem(buf, sizeof(*opt));
+	type = sys_le16_to_cpu(rsp->type);
 
-		/* make sure opt object can get safe dereference in iteration */
-		if (buf->len < opt->len) {
-			LOG_ERR("Received too short option data");
-			result = BT_L2CAP_CONF_REJECT;
+	switch (type) {
+	case BT_L2CAP_INFO_FEAT_MASK:
+		if (buf->len < sizeof(uint32_t)) {
+			LOG_ERR("Invalid remote info feat mask");
+			err = -EINVAL;
 			break;
 		}
+		l2cap->info_feat_mask = net_buf_pull_le32(buf);
+		LOG_DBG("remote info mask 0x%08x", l2cap->info_feat_mask);
 
-		hint = opt->type & BT_L2CAP_CONF_HINT;
-
-		switch (opt->type & BT_L2CAP_CONF_MASK) {
-		case BT_L2CAP_CONF_OPT_MTU:
-			/* getting MTU modifies buf internals */
-			result = l2cap_br_conf_opt_mtu(chan, buf, opt->len);
-			/*
-			 * MTU is done. For now bailout the loop but later on
-			 * there can be a need to continue checking next options
-			 * that are after MTU value and then goto is not proper
-			 * way out here.
-			 */
-			goto send_rsp;
-		case BT_L2CAP_CONF_OPT_FLUSH_TIMEOUT:
-			result = l2cap_br_conf_opt_flush_timeout(chan, buf, opt->len);
-			if (result != BT_L2CAP_CONF_SUCCESS) {
-				goto send_rsp;
-			}
-			break;
-		case BT_L2CAP_CONF_OPT_QOS:
-			result = l2cap_br_conf_opt_qos(chan, buf, opt->len);
-			if (result != BT_L2CAP_CONF_SUCCESS) {
-				goto send_rsp;
-			}
-			break;
-		case BT_L2CAP_CONF_OPT_RET_FC:
-			result = l2cap_br_conf_opt_ret_fc(chan, buf, opt->len);
-			if (result != BT_L2CAP_CONF_SUCCESS) {
-				goto send_rsp;
-			}
-			break;
-		case BT_L2CAP_CONF_OPT_FCS:
-			result = l2cap_br_conf_opt_fcs(chan, buf, opt->len);
-			if (result != BT_L2CAP_CONF_SUCCESS) {
-				goto send_rsp;
-			}
+		if (!(l2cap->info_feat_mask & L2CAP_FEAT_FIXED_CHAN_MASK)) {
 			break;
-		case BT_L2CAP_CONF_OPT_EXT_FLOW_SPEC:
-			__fallthrough;
-		case BT_L2CAP_CONF_OPT_EXT_WIN_SIZE:
-			result = BT_L2CAP_CONF_REJECT;
-			goto send_rsp;
-		default:
-			if (!hint) {
-				LOG_DBG("option %u not handled", opt->type);
-				result = BT_L2CAP_CONF_UNKNOWN_OPT;
-				goto send_rsp;
-			}
+		}
+
+		l2cap_br_get_info(l2cap, BT_L2CAP_INFO_FIXED_CHAN);
+		return 0;
+	case BT_L2CAP_INFO_FIXED_CHAN:
+		if (buf->len < sizeof(uint8_t)) {
+			LOG_ERR("Invalid remote info fixed chan");
+			err = -EINVAL;
 			break;
 		}
+		/*
+		 * 2.1 CHANNEL IDENTIFIERS in
+		 * BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 3, Part A.
+		 * The info length of `Fixed channels supported` is 8 octets.
+		 * Then the range of fixed L2CAP CID is 0x0001 ~ 0x0007 both for LE and BR.
+		 * So use one octet buffer to keep the `Fixed channels supported`
+		 * of peer device.
+		 */
+		l2cap->info_fixed_chan = net_buf_pull_u8(buf);
+		LOG_DBG("remote fixed channel mask 0x%02x", l2cap->info_fixed_chan);
 
-		/* Update buffer to point at next option */
-		net_buf_pull(buf, opt->len);
-	}
+		connect_optional_fixed_channels(l2cap);
+
+		break;
+	default:
+		LOG_WRN("type 0x%04x unsupported", type);
+		err = -EINVAL;
+		break;
+	}
+done:
+	atomic_set_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_DONE);
+	l2cap->chan.ident = 0U;
+	return err;
+}
+
+static uint8_t get_fixed_channels_mask(void)
+{
+	uint8_t mask = 0U;
+
+	/* this needs to be enhanced if AMP Test Manager support is added */
+	STRUCT_SECTION_FOREACH(bt_l2cap_br_fixed_chan, fchan) {
+		mask |= BIT(fchan->cid);
+	}
+
+	return mask;
+}
+
+static int l2cap_br_info_req(struct bt_l2cap_br *l2cap, uint8_t ident,
+			     struct net_buf *buf)
+{
+	struct bt_conn *conn = l2cap->chan.chan.conn;
+	struct bt_l2cap_info_req *req = (void *)buf->data;
+	struct bt_l2cap_info_rsp *rsp;
+	struct net_buf *rsp_buf;
+	struct bt_l2cap_sig_hdr *hdr_info;
+	uint16_t type;
+
+	if (buf->len < sizeof(*req)) {
+		LOG_ERR("Too small info req packet size");
+		return -EINVAL;
+	}
+
+	rsp_buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+	type = sys_le16_to_cpu(req->type);
+	LOG_DBG("type 0x%04x", type);
+
+	hdr_info = net_buf_add(rsp_buf, sizeof(*hdr_info));
+	hdr_info->code = BT_L2CAP_INFO_RSP;
+	hdr_info->ident = ident;
+
+	rsp = net_buf_add(rsp_buf, sizeof(*rsp));
+
+	switch (type) {
+	case BT_L2CAP_INFO_FEAT_MASK:
+		rsp->type = sys_cpu_to_le16(BT_L2CAP_INFO_FEAT_MASK);
+		rsp->result = sys_cpu_to_le16(BT_L2CAP_INFO_SUCCESS);
+		net_buf_add_le32(rsp_buf, L2CAP_EXTENDED_FEAT_MASK);
+		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp) + sizeof(uint32_t));
+		break;
+	case BT_L2CAP_INFO_FIXED_CHAN:
+		rsp->type = sys_cpu_to_le16(BT_L2CAP_INFO_FIXED_CHAN);
+		rsp->result = sys_cpu_to_le16(BT_L2CAP_INFO_SUCCESS);
+		/* fixed channel mask protocol data is 8 octets wide */
+		(void)memset(net_buf_add(rsp_buf, 8), 0, 8);
+		rsp->data[0] = get_fixed_channels_mask();
+
+		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp) + 8);
+		break;
+	default:
+		rsp->type = req->type;
+		rsp->result = sys_cpu_to_le16(BT_L2CAP_INFO_NOTSUPP);
+		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp));
+		break;
+	}
+
+	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, rsp_buf);
+
+	return 0;
+}
+
+void bt_l2cap_br_connected(struct bt_conn *conn)
+{
+	struct bt_l2cap_chan *chan;
+
+	STRUCT_SECTION_FOREACH(bt_l2cap_br_fixed_chan, fchan) {
+		struct bt_l2cap_br_chan *br_chan;
+
+		if (!fchan->accept) {
+			continue;
+		}
+
+		if (fchan->accept(conn, &chan) < 0) {
+			continue;
+		}
+
+		br_chan = BR_CHAN(chan);
+
+		br_chan->rx.cid = fchan->cid;
+		br_chan->tx.cid = fchan->cid;
+
+		if (!l2cap_br_chan_add(conn, chan, NULL)) {
+			return;
+		}
+
+		/*
+		 * other fixed channels will be connected after Information
+		 * Response is received
+		 */
+		if (fchan->cid == BT_L2CAP_CID_BR_SIG) {
+			struct bt_l2cap_br *sig_ch;
+
+			connect_fixed_channel(br_chan);
+
+			sig_ch = CONTAINER_OF(br_chan, struct bt_l2cap_br, chan);
+			l2cap_br_get_info(sig_ch, BT_L2CAP_INFO_FEAT_MASK);
+		}
+	}
+}
+
+void bt_l2cap_br_disconnected(struct bt_conn *conn)
+{
+	struct bt_l2cap_chan *chan, *next;
+
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&conn->channels, chan, next, node) {
+		bt_l2cap_br_chan_del(chan);
+	}
+}
+
+static struct bt_l2cap_server *l2cap_br_server_lookup_psm(uint16_t psm)
+{
+	struct bt_l2cap_server *server;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&br_servers, server, node) {
+		if (server->psm == psm) {
+			return server;
+		}
+	}
+
+	return NULL;
+}
+
+static void l2cap_br_conf_add_mtu(struct net_buf *buf, const uint16_t mtu)
+{
+	if (net_buf_tailroom(buf) < (sizeof(struct bt_l2cap_conf_opt) + sizeof(mtu))) {
+		LOG_WRN("No tail room for opt mtu");
+		return;
+	}
+	net_buf_add_u8(buf, BT_L2CAP_CONF_OPT_MTU);
+	net_buf_add_u8(buf, sizeof(mtu));
+	net_buf_add_le16(buf, mtu);
+}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static void l2cap_br_conf_add_ret_fc(struct net_buf *buf,
+				     const struct bt_l2cap_conf_opt_ret_fc *ret_fc)
+{
+	if (net_buf_tailroom(buf) < (sizeof(struct bt_l2cap_conf_opt) + sizeof(*ret_fc))) {
+		LOG_WRN("No tail room for opt flash_timeout");
+		return;
+	}
+	net_buf_add_u8(buf, BT_L2CAP_CONF_OPT_RET_FC);
+	net_buf_add_u8(buf, sizeof(*ret_fc));
+	net_buf_add_mem(buf, ret_fc, sizeof(*ret_fc));
+}
+
+static void l2cap_br_conf_add_fcs(struct net_buf *buf, const struct bt_l2cap_conf_opt_fcs *fcs)
+{
+	if (net_buf_tailroom(buf) < (sizeof(struct bt_l2cap_conf_opt) + sizeof(*fcs))) {
+		LOG_WRN("No tail room for opt flash_timeout");
+		return;
+	}
+	net_buf_add_u8(buf, BT_L2CAP_CONF_OPT_FCS);
+	net_buf_add_u8(buf, sizeof(*fcs));
+	net_buf_add_mem(buf, fcs, sizeof(*fcs));
+}
+
+static void
+l2cap_br_conf_add_ext_win_size(struct net_buf *buf,
+			       const struct bt_l2cap_conf_opt_ext_win_size *ext_win_size)
+{
+	if (net_buf_tailroom(buf) < (sizeof(struct bt_l2cap_conf_opt) + sizeof(*ext_win_size))) {
+		LOG_WRN("No tail room for opt flash_timeout");
+		return;
+	}
+	net_buf_add_u8(buf, BT_L2CAP_CONF_OPT_EXT_WIN_SIZE);
+	net_buf_add_u8(buf, sizeof(*ext_win_size));
+	net_buf_add_mem(buf, ext_win_size, sizeof(*ext_win_size));
+}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+static void l2cap_br_conf_add_opt(struct net_buf *buf, const struct bt_l2cap_conf_opt *opt)
+{
+	if (net_buf_tailroom(buf) < (sizeof(*opt) + opt->len)) {
+		LOG_WRN("No tail room for opt flash_timeout");
+		return;
+	}
+
+	net_buf_add_u8(buf, opt->type & BT_L2CAP_CONF_MASK);
+	net_buf_add_u8(buf, opt->len);
+	net_buf_add_mem(buf, opt->data, opt->len);
+}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static int l2cap_br_check_chan_config(struct bt_conn *conn, struct bt_l2cap_br_chan *br_chan)
+{
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+
+	if (!conn) {
+		return -ENOTCONN;
+	}
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		return -EINVAL;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+
+	/* Disable segment/reassemble of l2cap rx pdu */
+	br_chan->rx.mtu = MIN(br_chan->rx.mtu, BT_L2CAP_RX_MTU);
+	br_chan->rx.mps = br_chan->rx.mtu;
+
+	br_chan->tx.mps = CONFIG_BT_L2CAP_MPS;
+	br_chan->tx.mtu = L2CAP_BR_DEFAULT_MTU;
+	/* Set FCS to default value */
+	br_chan->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
+
+	/* Set default value */
+	br_chan->rx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+	br_chan->rx.ret_timeout = CONFIG_BT_L2CAP_BR_RET_TIMEOUT;
+	br_chan->rx.monitor_timeout = CONFIG_BT_L2CAP_BR_MONITOR_TIMEOUT;
+
+	br_chan->tx.extended_control = false;
+	br_chan->tx.optional = false;
+	br_chan->tx.max_transmit = 1;
+	br_chan->tx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+	br_chan->tx.ret_timeout = CONFIG_BT_L2CAP_BR_RET_TIMEOUT;
+	br_chan->tx.monitor_timeout = CONFIG_BT_L2CAP_BR_MONITOR_TIMEOUT;
+
+	/* Set all variables and sequence numbers to zero */
+	br_chan->tx_seq = 0;
+	br_chan->next_tx_seq = 0;
+	br_chan->expected_ack_seq = 0;
+	br_chan->req_seq = 0;
+	br_chan->expected_tx_seq = 0;
+	br_chan->buffer_seq = 0;
+
+	memset(&br_chan->tx_win[0], 0, sizeof(br_chan->tx_win));
+
+	sys_slist_init(&br_chan->_pdu_outstanding);
+	k_fifo_init(&br_chan->_free_tx_win);
+
+	for (int i = 0; i < ARRAY_SIZE(br_chan->tx_win); i++) {
+		k_fifo_put(&br_chan->_free_tx_win, &br_chan->tx_win[i]);
+	}
+
+	switch (br_chan->rx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		break;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_FC) &&
+		    (((br_chan_sig->info_feat_mask & L2CAP_FEAT_FC_MASK) == 0) ||
+		     ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_FC_MASK) == 0))) {
+			if (!br_chan->rx.optional) {
+				LOG_ERR("Invalid mode %u", br_chan->rx.mode);
+				return -ENOTSUP;
+			}
+
+			LOG_WRN("Unsupp mode %u, set basic mode", br_chan->rx.mode);
+			br_chan->rx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+			break;
+		}
+
+		if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_RET) &&
+		    (((br_chan_sig->info_feat_mask & L2CAP_FEAT_RET_MASK) == 0) ||
+		     ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_RET_MASK) == 0))) {
+			if (!br_chan->rx.optional) {
+				LOG_ERR("Invalid mode %u", br_chan->rx.mode);
+				return -ENOTSUP;
+			}
+
+			LOG_WRN("Unsupp mode %u, set basic mode", br_chan->rx.mode);
+			br_chan->rx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+			break;
+		}
+
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_ENH_RET_MASK) != 0) &&
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_ENH_RET_MASK) != 0)) {
+			/* If enhance transmission mode is supported by both side,
+			 * the enhance transmission mode should be used instead of
+			 * transmission or flow control mode.
+			 */
+			br_chan->rx.mode = BT_L2CAP_BR_LINK_MODE_ERET;
+			br_chan->tx.mode = BT_L2CAP_BR_LINK_MODE_ERET;
+		}
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_ENH_RET_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_ENH_RET_MASK) == 0)) {
+			if (!br_chan->rx.optional) {
+				LOG_ERR("Invalid mode %u", br_chan->rx.mode);
+				return -ENOTSUP;
+			}
+
+			LOG_WRN("Unsupp mode %u, set basic mode", br_chan->rx.mode);
+			br_chan->rx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+			break;
+		}
+		break;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_STREAM_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_STREAM_MASK) == 0)) {
+			if (!br_chan->rx.optional) {
+				LOG_ERR("Invalid mode %u", br_chan->rx.mode);
+				return -ENOTSUP;
+			}
+
+			LOG_WRN("Unsupp mode %u, set basic mode", br_chan->rx.mode);
+			br_chan->rx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+			break;
+		}
+		break;
+	default:
+		br_chan->rx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+		br_chan->tx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+		break;
+	}
+
+	atomic_set_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME);
+	atomic_set_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME);
+
+	switch (br_chan->rx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		br_chan->tx.fcs = 0;
+		br_chan->rx.fcs = 0;
+		break;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		if (br_chan->rx.max_window < 1) {
+			br_chan->rx.max_window = 1;
+		} else if (br_chan->rx.max_window > 32) {
+			br_chan->rx.max_window = 32;
+		}
+
+		if (br_chan->rx.max_transmit < 1) {
+			br_chan->rx.max_transmit = 1;
+		}
+
+		br_chan->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
+		br_chan->rx.fcs = BT_L2CAP_BR_FCS_16BIT;
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_EXT_WIN_SIZE_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_EXT_WIN_SIZE_MASK) == 0)) {
+			LOG_WRN("Unsupported extended window size");
+			br_chan->rx.extended_control = false;
+			br_chan->tx.extended_control = false;
+		}
+
+		if (br_chan->rx.max_window < 1) {
+			br_chan->rx.max_window = 1;
+		} else if (br_chan->rx.max_window > 63) {
+			if (br_chan->rx.extended_control) {
+				br_chan->rx.max_window = MIN(br_chan->rx.max_window, 0x3fff);
+			} else {
+				br_chan->rx.max_window = 63;
+			}
+		}
+
+		if (br_chan->rx.max_transmit < 1) {
+			br_chan->rx.max_transmit = 1;
+		}
+
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_FCS_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_FCS_MASK) == 0)) {
+			LOG_WRN("Unsupported FCS option, force to enable FCS");
+			br_chan->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
+			br_chan->rx.fcs = BT_L2CAP_BR_FCS_16BIT;
+		}
+		break;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_EXT_WIN_SIZE_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_EXT_WIN_SIZE_MASK) == 0)) {
+			LOG_WRN("Unsupported extended window size");
+			br_chan->rx.extended_control = false;
+			br_chan->tx.extended_control = false;
+		}
+
+		br_chan->rx.max_transmit = 1;
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_FCS_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_FCS_MASK) == 0)) {
+			LOG_WRN("Unsupported FCS option, force to enable FCS");
+			br_chan->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
+			br_chan->rx.fcs = BT_L2CAP_BR_FCS_16BIT;
+		}
+		break;
+	default:
+		/* Should not have gotten here */
+		break;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+static void l2cap_br_conf(struct bt_l2cap_chan *chan, bool init)
+{
+	struct bt_l2cap_sig_hdr *hdr;
+	struct bt_l2cap_conf_req *conf;
+	struct net_buf *buf;
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (init) {
+		int err;
+
+		err = l2cap_br_check_chan_config(chan->conn, BR_CHAN(chan));
+		if (err) {
+			bt_l2cap_chan_disconnect(chan);
+			return;
+		}
+	}
+#else
+	(void)init;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+	hdr = net_buf_add(buf, sizeof(*hdr));
+	hdr->code = BT_L2CAP_CONF_REQ;
+	hdr->ident = l2cap_br_get_ident();
+	conf = net_buf_add(buf, sizeof(*conf));
+	(void)memset(conf, 0, sizeof(*conf));
+
+	conf->dcid = sys_cpu_to_le16(BR_CHAN(chan)->tx.cid);
+	/* Set the ident for the signaling request */
+	BR_CHAN(chan)->ident = hdr->ident;
+	/*
+	 * Add MTU option if app set non default BR/EDR L2CAP MTU,
+	 * otherwise sent empty configuration data meaning default MTU
+	 * to be used.
+	 */
+	if (BR_CHAN(chan)->rx.mtu != L2CAP_BR_DEFAULT_MTU) {
+		l2cap_br_conf_add_mtu(buf, BR_CHAN(chan)->rx.mtu);
+	}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (BR_CHAN(chan)->rx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		struct bt_l2cap_conf_opt_ret_fc ret_fc;
+		struct bt_l2cap_conf_opt_fcs fcs;
+
+		ret_fc.mode = BR_CHAN(chan)->rx.mode;
+		ret_fc.tx_windows_size = BR_CHAN(chan)->rx.max_window;
+		ret_fc.max_transmit = BR_CHAN(chan)->rx.max_transmit;
+		ret_fc.retransmission_timeout = sys_cpu_to_le16(BR_CHAN(chan)->rx.ret_timeout);
+		ret_fc.monitor_timeout = sys_cpu_to_le16(BR_CHAN(chan)->rx.monitor_timeout);
+		ret_fc.mps = sys_cpu_to_le16(BR_CHAN(chan)->rx.mps);
+		l2cap_br_conf_add_ret_fc(buf, &ret_fc);
+
+		fcs.type = BR_CHAN(chan)->rx.fcs;
+		if (fcs.type == BT_L2CAP_FCS_TYPE_NO) {
+			l2cap_br_conf_add_fcs(buf, &fcs);
+		}
+
+		if (BR_CHAN(chan)->rx.extended_control &&
+		    ((BR_CHAN(chan)->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+		     (BR_CHAN(chan)->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM))) {
+			struct bt_l2cap_conf_opt_ext_win_size ext_win_size;
+
+			if (BR_CHAN(chan)->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM) {
+				ext_win_size.max_windows_size = 0;
+			} else {
+				ext_win_size.max_windows_size =
+					sys_cpu_to_le16(BR_CHAN(chan)->rx.max_window);
+			}
+			l2cap_br_conf_add_ext_win_size(buf, &ext_win_size);
+		}
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr));
+
+	/*
+	 * TODO:
+	 * might be needed to start tracking number of configuration iterations
+	 * on both directions
+	 */
+	l2cap_br_chan_send_req(BR_CHAN(chan), buf, L2CAP_BR_CFG_TIMEOUT);
+}
+
+enum l2cap_br_conn_security_result {
+	L2CAP_CONN_SECURITY_PASSED,
+	L2CAP_CONN_SECURITY_REJECT,
+	L2CAP_CONN_SECURITY_PENDING
+};
+
+/*
+ * Security helper against channel connection.
+ * Returns L2CAP_CONN_SECURITY_PASSED if:
+ * - existing security on link is applicable for requested PSM in connection,
+ * - legacy (non SSP) devices connecting with low security requirements,
+ * Returns L2CAP_CONN_SECURITY_PENDING if:
+ * - channel connection process is on hold since there were valid security
+ *   conditions triggering authentication indirectly in subcall.
+ * Returns L2CAP_CONN_SECURITY_REJECT if:
+ * - bt_conn_set_security API returns < 0,
+ * - Or, the ACL connection has been encrypted, the security level of link key cannot be upgraded,
+ *   and the security level is less than the required security level.
+ */
+
+static enum l2cap_br_conn_security_result
+l2cap_br_conn_security(struct bt_l2cap_chan *chan, const uint16_t psm)
+{
+	int check;
+	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
+
+	/* For SDP PSM there's no need to change existing security on link */
+	if (br_chan->required_sec_level == BT_SECURITY_L0) {
+		return L2CAP_CONN_SECURITY_PASSED;
+	}
+
+	/*
+	 * No link key needed for legacy devices (pre 2.1) and when low security
+	 * level is required.
+	 */
+	if (br_chan->required_sec_level == BT_SECURITY_L1 &&
+	    !BT_FEAT_HOST_SSP(chan->conn->br.features)) {
+		return L2CAP_CONN_SECURITY_PASSED;
+	}
+
+	switch (br_chan->required_sec_level) {
+	case BT_SECURITY_L4:
+	case BT_SECURITY_L3:
+	case BT_SECURITY_L2:
+		break;
+	default:
+		/*
+		 * For non SDP PSM connections GAP's Security Mode 4 requires at
+		 * least unauthenticated link key and enabled encryption if
+		 * remote supports SSP before any L2CAP CoC traffic. So preset
+		 * local to MEDIUM security to trigger it if needed.
+		 */
+		if (BT_FEAT_HOST_SSP(chan->conn->br.features)) {
+			br_chan->required_sec_level = BT_SECURITY_L2;
+		}
+		break;
+	}
+
+	if (chan->conn->sec_level < br_chan->required_sec_level &&
+	    chan->conn->encrypt && chan->conn->br.link_key &&
+	    (chan->conn->br.link_key->flags & BT_LINK_KEY_AUTHENTICATED)) {
+		/*
+		 * If the ACL link has been encrypted and it has a authenticated link key, it means
+		 * the pairing procedure has been done. And the security level of the link key can
+		 * not be upgraded. In this case, if `conn->sec_level` is less than the required
+		 * security level of the L2CAP channel, reject the L2CAP conn request.
+		 */
+		return L2CAP_CONN_SECURITY_REJECT;
+	}
+
+	check = bt_conn_set_security(chan->conn, br_chan->required_sec_level);
+
+	/*
+	 * Check case when on existing connection security level already covers
+	 * channel (service) security requirements against link security and
+	 * bt_conn_set_security API returns 0 what implies also there was no
+	 * need to trigger authentication.
+	 */
+	if (check == 0 &&
+	    chan->conn->sec_level >= br_chan->required_sec_level) {
+		return L2CAP_CONN_SECURITY_PASSED;
+	}
+
+	/*
+	 * If 'check' still holds 0, it means local host just sent HCI
+	 * authentication command to start procedure to increase link security
+	 * since service/profile requires that.
+	 */
+	if (check == 0) {
+		/*
+		 * General Bonding refers to the process of performing bonding
+		 * during connection setup or channel establishment procedures
+		 * as a precursor to accessing a service.
+		 * For current case, it is dedicated bonding.
+		 */
+		atomic_set_bit(chan->conn->flags, BT_CONN_BR_GENERAL_BONDING);
+		return L2CAP_CONN_SECURITY_PENDING;
+	}
+
+	/*
+	 * For any other values in 'check' it means there was internal
+	 * validation condition forbidding to start authentication at this
+	 * moment.
+	 */
+	return L2CAP_CONN_SECURITY_REJECT;
+}
+
+static void l2cap_br_conn_rsp_sent_cb(struct bt_conn *conn, void *user_data, int err)
+{
+	uint16_t scid = POINTER_TO_UINT(user_data);
+	struct bt_l2cap_chan *chan;
+
+	chan = bt_l2cap_br_lookup_tx_cid(conn, scid);
+	if (!chan) {
+		return;
+	}
+
+	/* Check whether the ACL connection needs to be disconnected. */
+	if (atomic_test_and_clear_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_DISCONNECT_ACL)) {
+		bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
+	}
+}
+
+static void l2cap_br_send_conn_rsp(struct bt_conn *conn, uint16_t scid,
+				  uint16_t dcid, uint8_t ident, uint16_t result)
+{
+	struct net_buf *buf;
+	struct bt_l2cap_conn_rsp *rsp;
+	struct bt_l2cap_sig_hdr *hdr;
+
+	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+	hdr = net_buf_add(buf, sizeof(*hdr));
+	hdr->code = BT_L2CAP_CONN_RSP;
+	hdr->ident = ident;
+	hdr->len = sys_cpu_to_le16(sizeof(*rsp));
+
+	rsp = net_buf_add(buf, sizeof(*rsp));
+	rsp->dcid = sys_cpu_to_le16(dcid);
+	rsp->scid = sys_cpu_to_le16(scid);
+	rsp->result = sys_cpu_to_le16(result);
+
+	if (result == BT_L2CAP_BR_PENDING) {
+		rsp->status = sys_cpu_to_le16(BT_L2CAP_CS_AUTHEN_PEND);
+	} else {
+		rsp->status = sys_cpu_to_le16(BT_L2CAP_CS_NO_INFO);
+	}
+
+	if (bt_l2cap_br_send_cb(conn, BT_L2CAP_CID_BR_SIG, buf, l2cap_br_conn_rsp_sent_cb,
+				UINT_TO_POINTER(scid))) {
+		net_buf_unref(buf);
+	}
+}
+
+static int l2cap_br_conn_req_reply(struct bt_l2cap_chan *chan, uint16_t result)
+{
+	/* Send response to connection request only when in acceptor role */
+	if (!atomic_test_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_ACCEPTOR)) {
+		return -ESRCH;
+	}
+
+	l2cap_br_send_conn_rsp(chan->conn, BR_CHAN(chan)->tx.cid,
+			       BR_CHAN(chan)->rx.cid, BR_CHAN(chan)->ident, result);
+	BR_CHAN(chan)->ident = 0U;
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) && defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)
+void bt_l2cap_br_chan_set_state_debug(struct bt_l2cap_chan *chan,
+				   bt_l2cap_chan_state_t state,
+				   const char *func, int line)
+{
+	struct bt_l2cap_br_chan *br_chan;
+
+	br_chan = BR_CHAN(chan);
+
+	LOG_DBG("chan %p psm 0x%04x %s -> %s", chan, br_chan->psm,
+		bt_l2cap_chan_state_str(br_chan->state), bt_l2cap_chan_state_str(state));
+
+	/* check transitions validness */
+	switch (state) {
+	case BT_L2CAP_DISCONNECTED:
+		/* regardless of old state always allows this state */
+		break;
+	case BT_L2CAP_CONNECTING:
+		if (br_chan->state != BT_L2CAP_DISCONNECTED) {
+			LOG_WRN("%s()%d: invalid transition", func, line);
+		}
+		break;
+	case BT_L2CAP_CONFIG:
+		if (br_chan->state != BT_L2CAP_CONNECTING) {
+			LOG_WRN("%s()%d: invalid transition", func, line);
+		}
+		break;
+	case BT_L2CAP_CONNECTED:
+		if (br_chan->state != BT_L2CAP_CONFIG &&
+		    br_chan->state != BT_L2CAP_CONNECTING) {
+			LOG_WRN("%s()%d: invalid transition", func, line);
+		}
+		break;
+	case BT_L2CAP_DISCONNECTING:
+		if (br_chan->state != BT_L2CAP_CONFIG &&
+		    br_chan->state != BT_L2CAP_CONNECTED) {
+			LOG_WRN("%s()%d: invalid transition", func, line);
+		}
+		break;
+	default:
+		LOG_ERR("%s()%d: unknown (%u) state was set", func, line, state);
+		return;
+	}
+
+	br_chan->state = state;
+}
+#else
+void bt_l2cap_br_chan_set_state(struct bt_l2cap_chan *chan,
+			     bt_l2cap_chan_state_t state)
+{
+	BR_CHAN(chan)->state = state;
+}
+#endif /* CONFIG_BT_L2CAP_LOG_LEVEL_DBG && CONFIG_BT_L2CAP_DYNAMIC_CHANNEL*/
+
+void bt_l2cap_br_chan_del(struct bt_l2cap_chan *chan)
+{
+	const struct bt_l2cap_chan_ops *ops = chan->ops;
+	struct bt_l2cap_br_chan *br_chan = CONTAINER_OF(chan, struct bt_l2cap_br_chan, chan);
+
+	LOG_DBG("conn %p chan %p", chan->conn, chan);
+
+	if (!chan->conn) {
+		goto destroy;
+	}
+
+	cancel_data_ready(br_chan);
+
+	/* Remove buffers on the PDU TX queue. */
+	while (chan_has_data(br_chan)) {
+		const sys_snode_t *tx_buf = sys_slist_get(&br_chan->_pdu_tx_queue);
+
+		struct net_buf *buf = CONTAINER_OF(tx_buf, struct net_buf, node);
+
+		net_buf_unref(buf);
+	}
+
+	if (ops->disconnected) {
+		ops->disconnected(chan);
+	}
+
+	chan->conn = NULL;
+
+destroy:
+#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
+	/* Reset internal members of common channel */
+	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_DISCONNECTED);
+	BR_CHAN(chan)->psm = 0U;
+#endif
+	if (chan->destroy) {
+		chan->destroy(chan);
+	}
+
+	if (ops->released) {
+		ops->released(chan);
+	}
+}
+
+static void l2cap_br_conn_req(struct bt_l2cap_br *l2cap, uint8_t ident,
+			      struct net_buf *buf)
+{
+	struct bt_conn *conn = l2cap->chan.chan.conn;
+	struct bt_l2cap_chan *chan;
+	struct bt_l2cap_server *server;
+	struct bt_l2cap_conn_req *req = (void *)buf->data;
+	uint16_t psm, scid, result;
+	struct bt_l2cap_br_chan *br_chan;
+
+	if (buf->len < sizeof(*req)) {
+		LOG_ERR("Too small L2CAP conn req packet size");
+		return;
+	}
+
+	psm = sys_le16_to_cpu(req->psm);
+	scid = sys_le16_to_cpu(req->scid);
+
+	LOG_DBG("psm 0x%02x scid 0x%04x", psm, scid);
+
+	/* Check if there is a server registered */
+	server = l2cap_br_server_lookup_psm(psm);
+	if (!server) {
+		result = BT_L2CAP_BR_ERR_PSM_NOT_SUPP;
+		goto no_chan;
+	}
+
+	/*
+	 * Report security violation for non SDP channel without encryption when
+	 * remote supports SSP.
+	 */
+	if (server->sec_level != BT_SECURITY_L0 &&
+	    BT_FEAT_HOST_SSP(conn->br.features) && !conn->encrypt) {
+		result = BT_L2CAP_BR_ERR_SEC_BLOCK;
+		goto no_chan;
+	}
+
+	if (!L2CAP_BR_CID_IS_DYN(scid)) {
+		result = BT_L2CAP_BR_ERR_INVALID_SCID;
+		goto no_chan;
+	}
+
+	chan = bt_l2cap_br_lookup_tx_cid(conn, scid);
+	if (chan) {
+		/*
+		 * we have a chan here but this is due to SCID being already in
+		 * use so it is not channel we are suppose to pass to
+		 * l2cap_br_conn_req_reply as wrong DCID would be used
+		 */
+		result = BT_L2CAP_BR_ERR_SCID_IN_USE;
+		goto no_chan;
+	}
+
+	/*
+	 * Request server to accept the new connection and allocate the
+	 * channel. If no free channels available for PSM server reply with
+	 * proper result and quit since chan pointer is uninitialized then.
+	 */
+	if (server->accept(conn, server, &chan) < 0) {
+		result = BT_L2CAP_BR_ERR_NO_RESOURCES;
+		goto no_chan;
+	}
+
+	br_chan = BR_CHAN(chan);
+	br_chan->required_sec_level = server->sec_level;
+
+	l2cap_br_chan_add(conn, chan, l2cap_br_chan_destroy);
+	BR_CHAN(chan)->tx.cid = scid;
+	br_chan->ident = ident;
+	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTING);
+	atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_ACCEPTOR);
+
+#if !CONFIG_BT_L2CAP_RET_FC
+	/* Disable fragmentation of l2cap rx pdu */
+	BR_CHAN(chan)->rx.mtu = MIN(BR_CHAN(chan)->rx.mtu, BT_L2CAP_RX_MTU);
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	switch (l2cap_br_conn_security(chan, psm)) {
+	case L2CAP_CONN_SECURITY_PENDING:
+		result = BT_L2CAP_BR_PENDING;
+		/* TODO: auth timeout */
+		break;
+	case L2CAP_CONN_SECURITY_PASSED:
+		result = BT_L2CAP_BR_SUCCESS;
+		break;
+	case L2CAP_CONN_SECURITY_REJECT:
+	default:
+		result = BT_L2CAP_BR_ERR_SEC_BLOCK;
+		/* Set disconnect ACL flag. */
+		atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_DISCONNECT_ACL);
+		break;
+	}
+	/* Reply on connection request as acceptor */
+	l2cap_br_conn_req_reply(chan, result);
+
+	if (result != BT_L2CAP_BR_SUCCESS) {
+		/* Disconnect link when security rules were violated */
+		if (result == BT_L2CAP_BR_ERR_SEC_BLOCK) {
+			/*
+			 * Disconnect the ACL after the packet of response has been sent.
+			 * The `L2CAP_FLAG_DISCONNECT_ACL` is used to flag whether ACL disconnect
+			 * request needs to be sent when the L2CAP conn rsp sent out callback is
+			 * triggered.
+			 */
+		} else if (result == BT_L2CAP_BR_PENDING) {
+			/* Recover the ident when conn is pending */
+			br_chan->ident = ident;
+		}
+
+		return;
+	}
+
+	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONFIG);
+	l2cap_br_conf(chan, true);
+	return;
+
+no_chan:
+	l2cap_br_send_conn_rsp(conn, scid, 0, ident, result);
+}
+
+#define L2CAP_QOS_TOKEN_RATE_DEFAULT        0x00000000
+#define L2CAP_QOS_TOKEN_BUCKET_SIZE_DEFAULT 0x00000000
+#define L2CAP_QOS_PEAK_BANDWIDTH_DEFAULT    0x00000000
+#define L2CAP_QOS_LATENCY_DEFAULT           0xffffffff
+#define L2CAP_QOS_DELAY_DEFAULT             0xffffffff
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static uint16_t l2cap_br_conf_rsp_opt_mtu(struct bt_l2cap_chan *chan, struct net_buf *buf,
+					  size_t len)
+{
+	uint16_t mtu, result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_mtu *opt_mtu;
+
+	/* Core 4.2 [Vol 3, Part A, 5.1] MTU payload length */
+	if (len != sizeof(*opt_mtu)) {
+		LOG_ERR("tx MTU length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_mtu = (struct bt_l2cap_conf_opt_mtu *)buf->data;
+
+	mtu = sys_le16_to_cpu(opt_mtu->mtu);
+	if (mtu < L2CAP_BR_MIN_MTU) {
+		result = BT_L2CAP_CONF_UNACCEPT;
+		opt_mtu->mtu = sys_cpu_to_le16(BR_CHAN(chan)->rx.mtu);
+		LOG_DBG("tx MTU %u invalid", mtu);
+		goto done;
+	}
+
+	if (mtu < BR_CHAN(chan)->rx.mtu) {
+		BR_CHAN(chan)->rx.mtu = mtu;
+	}
+
+	LOG_DBG("rx MTU %u", BR_CHAN(chan)->rx.mtu);
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_opt_flush_timeout(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						    size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_flush_timeout *opt_to;
+
+	if (len != sizeof(*opt_to)) {
+		LOG_ERR("qos frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_to = (struct bt_l2cap_conf_opt_flush_timeout *)buf->data;
+
+	LOG_DBG("Flash timeout %u", opt_to->timeout);
+
+	opt_to->timeout = sys_cpu_to_le32(0xffff);
+	result = BT_L2CAP_CONF_UNACCEPT;
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_opt_qos(struct bt_l2cap_chan *chan, struct net_buf *buf,
+					  size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_qos *opt_qos;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+	if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_QOS_MASK) == 0) ||
+	    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_QOS_MASK) == 0)) {
+		LOG_WRN("Unsupported extended flow spec");
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	if (len != sizeof(*opt_qos)) {
+		LOG_ERR("qos frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_qos = (struct bt_l2cap_conf_opt_qos *)buf->data;
+
+	LOG_DBG("QOS Type %u", opt_qos->service_type);
+
+	if (opt_qos->service_type == BT_L2CAP_QOS_TYPE_GUARANTEED) {
+		result = BT_L2CAP_CONF_UNACCEPT;
+		/* Set to default value */
+		opt_qos->flags = 0x00;
+		/* do not care */
+		opt_qos->token_rate = sys_cpu_to_le32(L2CAP_QOS_TOKEN_RATE_DEFAULT);
+		/* no token bucket is needed */
+		opt_qos->token_bucket_size = sys_cpu_to_le32(L2CAP_QOS_TOKEN_BUCKET_SIZE_DEFAULT);
+		/* do not care */
+		opt_qos->peak_bandwidth = sys_cpu_to_le32(L2CAP_QOS_PEAK_BANDWIDTH_DEFAULT);
+		/* do not care */
+		opt_qos->latency = sys_cpu_to_le32(L2CAP_QOS_LATENCY_DEFAULT);
+		/* do not care */
+		opt_qos->delay_variation = sys_cpu_to_le32(L2CAP_QOS_DELAY_DEFAULT);
+	}
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_opt_ret_fc(struct bt_l2cap_chan *chan, struct net_buf *buf,
+					     size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_UNACCEPT;
+	struct bt_l2cap_conf_opt_ret_fc *opt_ret_fc;
+	struct bt_l2cap_br_chan *br_chan;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+	bool accept = true;
+
+	if (len != sizeof(*opt_ret_fc)) {
+		LOG_ERR("ret_fc frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+
+	opt_ret_fc = (struct bt_l2cap_conf_opt_ret_fc *)buf->data;
+
+	LOG_DBG("ret_fc mode %u", opt_ret_fc->mode);
+
+	br_chan = BR_CHAN(chan);
+
+	if (opt_ret_fc->mode != br_chan->rx.mode) {
+		if (br_chan->rx.optional) {
+			br_chan->rx.mode = opt_ret_fc->mode;
+		} else {
+			opt_ret_fc->mode = br_chan->rx.mode;
+			accept = false;
+		}
+	}
+
+	if (opt_ret_fc->mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		if (sys_le16_to_cpu(opt_ret_fc->mps) < br_chan->rx.mps) {
+			br_chan->rx.mps = sys_le16_to_cpu(opt_ret_fc->mps);
+		} else {
+			opt_ret_fc->mps = sys_cpu_to_le16(br_chan->rx.mps);
+		}
+
+		if ((opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		    (opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+			if ((opt_ret_fc->tx_windows_size < 1) ||
+			    (opt_ret_fc->tx_windows_size > 32)) {
+				opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+				accept = false;
+			}
+
+			if (opt_ret_fc->max_transmit < 1) {
+				opt_ret_fc->max_transmit = 1;
+				accept = false;
+			}
+		}
+
+		if (opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_ERET) {
+			if ((opt_ret_fc->tx_windows_size < 1) ||
+			    (opt_ret_fc->tx_windows_size > 63)) {
+				opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+				accept = false;
+			}
+		}
+
+		opt_ret_fc->retransmission_timeout =
+			sys_cpu_to_le16(CONFIG_BT_L2CAP_BR_RET_TIMEOUT);
+		opt_ret_fc->monitor_timeout = sys_cpu_to_le16(CONFIG_BT_L2CAP_BR_MONITOR_TIMEOUT);
+
+		if (opt_ret_fc->tx_windows_size > CONFIG_BT_L2CAP_MAX_WINDOW_SIZE) {
+			opt_ret_fc->tx_windows_size =
+				sys_cpu_to_le16(CONFIG_BT_L2CAP_MAX_WINDOW_SIZE);
+		}
+
+		if (!accept) {
+			goto done;
+		}
+
+		br_chan->rx.ret_timeout = CONFIG_BT_L2CAP_BR_RET_TIMEOUT;
+		br_chan->rx.monitor_timeout = CONFIG_BT_L2CAP_BR_MONITOR_TIMEOUT;
+		br_chan->rx.max_transmit = opt_ret_fc->max_transmit;
+		br_chan->rx.max_window = sys_le16_to_cpu(opt_ret_fc->tx_windows_size);
+		br_chan->rx.mps = sys_le16_to_cpu(opt_ret_fc->mps);
+	}
+
+	if (!accept) {
+		goto done;
+	}
+
+	result = BT_L2CAP_CONF_SUCCESS;
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_opt_fcs(struct bt_l2cap_chan *chan, struct net_buf *buf,
+					  size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_fcs *opt_fcs;
+	struct bt_l2cap_br_chan *br_chan;
+
+	if (len != sizeof(*opt_fcs)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_fcs = (struct bt_l2cap_conf_opt_fcs *)buf->data;
+
+	LOG_DBG("FCS type %u", opt_fcs->type);
+
+	if ((opt_fcs->type != BT_L2CAP_FCS_TYPE_NO) && (opt_fcs->type != BT_L2CAP_FCS_TYPE_16BIT)) {
+		LOG_ERR("fcs type %u invalid", opt_fcs->type);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan = BR_CHAN(chan);
+
+	switch (br_chan->rx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		LOG_ERR("fcs opt is mandatory in mode %u", br_chan->rx.mode);
+		if (opt_fcs->type != BT_L2CAP_BR_FCS_16BIT) {
+			result = BT_L2CAP_CONF_UNACCEPT;
+			opt_fcs->type = BT_L2CAP_BR_FCS_16BIT;
+			br_chan->rx.fcs = opt_fcs->type;
+			goto done;
+		}
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		br_chan->rx.fcs = opt_fcs->type;
+		break;
+	default:
+		/* Should not have been here */
+		LOG_ERR("Unknown mode %u", br_chan->rx.mode);
+		break;
+	}
+
+done:
+	return result;
+}
+
+#define L2CAP_EXT_FLOW_SPEC_SDU_DEFAULT 0xffff
+#define L2CAP_EXT_FLOW_SPEC_DEFAULT     0xffffffff
+
+static uint16_t l2cap_br_conf_rsp_opt_ext_flow_spec(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						    size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_ext_flow_spec *ext_flow_spec;
+	struct bt_l2cap_br_chan *br_chan;
+
+	if (len != sizeof(*ext_flow_spec)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	ext_flow_spec = (struct bt_l2cap_conf_opt_ext_flow_spec *)buf->data;
+
+	LOG_DBG("Ext Flow Spec %u %u %u %u %u %u", ext_flow_spec->identifier,
+		ext_flow_spec->service_type, ext_flow_spec->sdu,
+		ext_flow_spec->sdu_inter_arrival_time, ext_flow_spec->access_latency,
+		ext_flow_spec->flush_timeout);
+
+	br_chan = BR_CHAN(chan);
+
+	/* Set to default value */
+	result = BT_L2CAP_CONF_UNACCEPT;
+	ext_flow_spec->identifier = 0x01;
+	ext_flow_spec->service_type = 0x01;
+	ext_flow_spec->sdu = sys_cpu_to_le16(L2CAP_EXT_FLOW_SPEC_SDU_DEFAULT);
+	ext_flow_spec->sdu_inter_arrival_time = sys_cpu_to_le32(L2CAP_EXT_FLOW_SPEC_DEFAULT);
+	ext_flow_spec->access_latency = sys_cpu_to_le32(L2CAP_EXT_FLOW_SPEC_DEFAULT);
+	ext_flow_spec->flush_timeout = sys_cpu_to_le32(L2CAP_EXT_FLOW_SPEC_DEFAULT);
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_opt_ext_win_size(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						   size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_ext_win_size *opt_ext_win_size;
+	struct bt_l2cap_br_chan *br_chan;
+	uint16_t win_size;
+
+	if (len != sizeof(*opt_ext_win_size)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_ext_win_size = (struct bt_l2cap_conf_opt_ext_win_size *)buf->data;
+	win_size = sys_le16_to_cpu(opt_ext_win_size->max_windows_size);
+
+	LOG_DBG("EXT Win Size value %u", win_size);
+
+	br_chan = BR_CHAN(chan);
+
+	switch (br_chan->rx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		/* ignore */
+		LOG_WRN("Ignored by mode %u", br_chan->rx.mode);
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		if ((win_size < 1) || (win_size > CONFIG_BT_L2CAP_MAX_WINDOW_SIZE)) {
+			/* Set to default value */
+			opt_ext_win_size->max_windows_size =
+				sys_cpu_to_le16(CONFIG_BT_L2CAP_MAX_WINDOW_SIZE);
+			result = BT_L2CAP_CONF_UNACCEPT;
+			goto done;
+		}
+
+		br_chan->tx.extended_control = true;
+		br_chan->tx.max_window = win_size;
+		break;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		if (win_size) {
+			result = BT_L2CAP_CONF_UNACCEPT;
+			opt_ext_win_size->max_windows_size = 0;
+			goto done;
+		}
+		br_chan->tx.extended_control = true;
+		break;
+	default:
+		/* Should not have been here */
+		LOG_ERR("Unknown mode %u", br_chan->rx.mode);
+		break;
+	}
+
+done:
+	return result;
+}
+
+static int l2cap_br_conf_rsp_opt_check(struct bt_l2cap_chan *chan, uint16_t opt_len,
+				       struct net_buf *buf)
+{
+	struct bt_l2cap_conf_opt *opt = NULL;
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	uint8_t hint;
+
+	if (opt_len > buf->len) {
+		return -EINVAL;
+	}
+
+	while (opt_len >= sizeof(*opt)) {
+		opt = net_buf_pull_mem(buf, sizeof(*opt));
+
+		opt_len -= sizeof(*opt);
+
+		if (opt_len < opt->len) {
+			LOG_ERR("Received too short option data");
+			return -EINVAL;
+		}
+
+		opt_len -= opt->len;
+
+		hint = opt->type & BT_L2CAP_CONF_HINT;
+		if (hint) {
+			return -EINVAL;
+		}
+
+		switch (opt->type & BT_L2CAP_CONF_MASK) {
+		case BT_L2CAP_CONF_OPT_MTU:
+			/* getting MTU modifies buf internals */
+			result = l2cap_br_conf_rsp_opt_mtu(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_FLUSH_TIMEOUT:
+			result = l2cap_br_conf_rsp_opt_flush_timeout(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_QOS:
+			result = l2cap_br_conf_rsp_opt_qos(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_RET_FC:
+			result = l2cap_br_conf_rsp_opt_ret_fc(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_FCS:
+			result = l2cap_br_conf_rsp_opt_fcs(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_EXT_FLOW_SPEC:
+			result = l2cap_br_conf_rsp_opt_ext_flow_spec(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_EXT_WIN_SIZE:
+			result = l2cap_br_conf_rsp_opt_ext_win_size(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		default:
+			result = BT_L2CAP_CONF_UNKNOWN_OPT;
+			goto invalid_opt;
+		}
+		net_buf_pull(buf, opt->len);
+	}
+
+	if (BR_CHAN(chan)->rx.fcs == BT_L2CAP_BR_FCS_16BIT) {
+		/* If local enable FCS, peer also needs to enable it. */
+		BR_CHAN(chan)->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
+	}
+
+	if (BR_CHAN(chan)->rx.extended_control) {
+		/* If peer enables extended control field,
+		 * local also needs to enable it.
+		 */
+		BR_CHAN(chan)->tx.extended_control = true;
+	}
+
+	return 0;
+
+invalid_opt:
+	return -EINVAL;
+}
+
+static uint16_t l2cap_br_conf_rsp_unaccept_opt_mtu(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						   size_t len)
+{
+	uint16_t mtu, result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_mtu *opt_mtu;
+
+	/* Core 4.2 [Vol 3, Part A, 5.1] MTU payload length */
+	if (len != sizeof(*opt_mtu)) {
+		LOG_ERR("tx MTU length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_mtu = (struct bt_l2cap_conf_opt_mtu *)buf->data;
+
+	mtu = sys_le16_to_cpu(opt_mtu->mtu);
+	if (mtu < L2CAP_BR_MIN_MTU) {
+		LOG_DBG("tx MTU %u invalid", mtu);
+		goto done;
+	}
+
+	if (mtu < BR_CHAN(chan)->rx.mtu) {
+		BR_CHAN(chan)->rx.mtu = mtu;
+	}
+
+done:
+	LOG_DBG("rx MTU %u", BR_CHAN(chan)->rx.mtu);
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_unaccept_opt_flush_timeout(struct bt_l2cap_chan *chan,
+							     struct net_buf *buf, size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_flush_timeout *opt_to;
+
+	if (len != sizeof(*opt_to)) {
+		LOG_ERR("qos frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_to = (struct bt_l2cap_conf_opt_flush_timeout *)buf->data;
+
+	LOG_DBG("Flash timeout %u", opt_to->timeout);
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_unaccept_opt_qos(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						   size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_qos *opt_qos;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+	if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_QOS_MASK) == 0) ||
+	    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_QOS_MASK) == 0)) {
+		LOG_WRN("Unsupported extended flow spec");
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	if (len != sizeof(*opt_qos)) {
+		LOG_ERR("qos frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_qos = (struct bt_l2cap_conf_opt_qos *)buf->data;
+
+	LOG_DBG("QOS Type %u", opt_qos->service_type);
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_unaccept_opt_ret_fc(struct bt_l2cap_chan *chan,
+						      struct net_buf *buf, size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_UNACCEPT;
+	struct bt_l2cap_conf_opt_ret_fc *opt_ret_fc;
+	struct bt_l2cap_br_chan *br_chan;
+
+	if (len != sizeof(*opt_ret_fc)) {
+		LOG_ERR("ret_fc frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_ret_fc = (struct bt_l2cap_conf_opt_ret_fc *)buf->data;
+
+	LOG_DBG("ret_fc mode %u", opt_ret_fc->mode);
+
+	br_chan = BR_CHAN(chan);
+
+	if (opt_ret_fc->mode != br_chan->rx.mode) {
+		if (br_chan->rx.optional) {
+			br_chan->rx.mode = opt_ret_fc->mode;
+		} else {
+			goto done;
+		}
+	}
+
+	if (opt_ret_fc->mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		if (sys_le16_to_cpu(opt_ret_fc->mps) > br_chan->rx.mtu) {
+			opt_ret_fc->mps = sys_cpu_to_le16(br_chan->rx.mtu);
+		}
+
+		if ((opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		    (opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+			if ((opt_ret_fc->tx_windows_size < 1) ||
+			    (opt_ret_fc->tx_windows_size > 32)) {
+				opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+			}
+
+			if (opt_ret_fc->max_transmit < 1) {
+				opt_ret_fc->max_transmit = 1;
+			}
+		}
+
+		if (opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_ERET) {
+			if ((opt_ret_fc->tx_windows_size < 1) ||
+			    (opt_ret_fc->tx_windows_size > 63)) {
+				opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+			}
+		}
+
+		opt_ret_fc->retransmission_timeout =
+			sys_cpu_to_le16(CONFIG_BT_L2CAP_BR_RET_TIMEOUT);
+		opt_ret_fc->monitor_timeout = sys_cpu_to_le16(CONFIG_BT_L2CAP_BR_MONITOR_TIMEOUT);
+
+		if (opt_ret_fc->tx_windows_size > CONFIG_BT_L2CAP_MAX_WINDOW_SIZE) {
+			opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+		}
+
+		br_chan->rx.ret_timeout = CONFIG_BT_L2CAP_BR_RET_TIMEOUT;
+		br_chan->rx.monitor_timeout = CONFIG_BT_L2CAP_BR_MONITOR_TIMEOUT;
+		br_chan->rx.max_transmit = opt_ret_fc->max_transmit;
+		br_chan->rx.max_window = opt_ret_fc->tx_windows_size;
+		br_chan->rx.mps = sys_le16_to_cpu(opt_ret_fc->mps);
+	}
+
+	if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_BASIC) {
+		br_chan->tx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+	}
+
+	result = BT_L2CAP_CONF_SUCCESS;
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_unaccept_opt_fcs(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						   size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_fcs *opt_fcs;
+	struct bt_l2cap_br_chan *br_chan;
+
+	if (len != sizeof(*opt_fcs)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_fcs = (struct bt_l2cap_conf_opt_fcs *)buf->data;
+
+	LOG_DBG("FCS type %u", opt_fcs->type);
+
+	if ((opt_fcs->type != BT_L2CAP_FCS_TYPE_NO) && (opt_fcs->type != BT_L2CAP_FCS_TYPE_16BIT)) {
+		LOG_ERR("fcs type %u invalid", opt_fcs->type);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan = BR_CHAN(chan);
+
+	switch (br_chan->rx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		goto done;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		LOG_ERR("fcs opt is mandatory in mode %u", br_chan->rx.mode);
+		br_chan->rx.fcs = BT_L2CAP_BR_FCS_16BIT;
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		br_chan->rx.fcs = opt_fcs->type;
+		break;
+	default:
+		/* Should not have been here */
+		LOG_ERR("Unknown mode %u", br_chan->rx.mode);
+		break;
+	}
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_unaccept_opt_ext_flow_spec(struct bt_l2cap_chan *chan,
+							     struct net_buf *buf, size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_ext_flow_spec *ext_flow_spec;
+
+	if (len != sizeof(*ext_flow_spec)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	ext_flow_spec = (struct bt_l2cap_conf_opt_ext_flow_spec *)buf->data;
+
+	LOG_DBG("Ext Flow Spec %u %u %u %u %u %u", ext_flow_spec->identifier,
+		ext_flow_spec->service_type, ext_flow_spec->sdu,
+		ext_flow_spec->sdu_inter_arrival_time, ext_flow_spec->access_latency,
+		ext_flow_spec->flush_timeout);
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_rsp_unaccept_opt_ext_win_size(struct bt_l2cap_chan *chan,
+							    struct net_buf *buf, size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_ext_win_size *opt_ext_win_size;
+	struct bt_l2cap_br_chan *br_chan;
+	uint16_t win_size;
+
+	if (len != sizeof(*opt_ext_win_size)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_ext_win_size = (struct bt_l2cap_conf_opt_ext_win_size *)buf->data;
+	win_size = sys_le16_to_cpu(opt_ext_win_size->max_windows_size);
+
+	LOG_DBG("EXT Win Size value %u", win_size);
+
+	br_chan = BR_CHAN(chan);
+
+	switch (br_chan->rx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		/* ignore */
+		LOG_WRN("Ignored by mode %u", br_chan->rx.mode);
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		if ((win_size < 1) || (win_size > CONFIG_BT_L2CAP_MAX_WINDOW_SIZE)) {
+			/* Set to default value */
+			br_chan->rx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+		} else {
+			br_chan->rx.max_window = win_size;
+		}
+		break;
+	default:
+		/* Should not have been here */
+		LOG_ERR("Unknown mode %u", br_chan->rx.mode);
+		break;
+	}
+
+done:
+	return result;
+}
+
+static int l2cap_br_conf_rsp_unaccept_opt(struct bt_l2cap_chan *chan, uint16_t opt_len,
+					  struct net_buf *buf)
+{
+	struct bt_l2cap_conf_opt *opt = NULL;
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	uint8_t hint;
+
+	if (opt_len > buf->len) {
+		return -EINVAL;
+	}
+
+	while (opt_len >= sizeof(*opt)) {
+		opt = net_buf_pull_mem(buf, sizeof(*opt));
+
+		opt_len -= sizeof(*opt);
+
+		if (opt_len < opt->len) {
+			LOG_ERR("Received too short option data");
+			return -EINVAL;
+		}
+
+		opt_len -= opt->len;
+
+		hint = opt->type & BT_L2CAP_CONF_HINT;
+		if (hint) {
+			return -EINVAL;
+		}
+
+		switch (opt->type & BT_L2CAP_CONF_MASK) {
+		case BT_L2CAP_CONF_OPT_MTU:
+			/* getting MTU modifies buf internals */
+			result = l2cap_br_conf_rsp_unaccept_opt_mtu(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_FLUSH_TIMEOUT:
+			result = l2cap_br_conf_rsp_unaccept_opt_flush_timeout(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_QOS:
+			result = l2cap_br_conf_rsp_unaccept_opt_qos(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_RET_FC:
+			result = l2cap_br_conf_rsp_unaccept_opt_ret_fc(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_FCS:
+			result = l2cap_br_conf_rsp_unaccept_opt_fcs(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_EXT_FLOW_SPEC:
+			result = l2cap_br_conf_rsp_unaccept_opt_ext_flow_spec(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_EXT_WIN_SIZE:
+			result = l2cap_br_conf_rsp_unaccept_opt_ext_win_size(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto invalid_opt;
+			}
+			break;
+		default:
+			result = BT_L2CAP_CONF_UNKNOWN_OPT;
+			goto invalid_opt;
+		}
+		net_buf_pull(buf, opt->len);
+	}
+
+	if (BR_CHAN(chan)->rx.fcs == BT_L2CAP_BR_FCS_16BIT) {
+		/* If local enable FCS, peer also needs to enable it. */
+		BR_CHAN(chan)->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
+	}
+
+	return 0;
+
+invalid_opt:
+	return -EINVAL;
+}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, uint16_t len,
+			      struct net_buf *buf)
+{
+	struct bt_conn *conn = l2cap->chan.chan.conn;
+	struct bt_l2cap_chan *chan;
+	struct bt_l2cap_conf_rsp *rsp = (void *)buf->data;
+	uint16_t flags, scid, result, opt_len;
+	struct bt_l2cap_br_chan *br_chan;
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	int err;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	if (buf->len < sizeof(*rsp)) {
+		LOG_ERR("Too small L2CAP conf rsp packet size");
+		return;
+	}
+
+	net_buf_pull(buf, sizeof(*rsp));
+
+	flags = sys_le16_to_cpu(rsp->flags);
+	scid = sys_le16_to_cpu(rsp->scid);
+	result = sys_le16_to_cpu(rsp->result);
+	opt_len = len - sizeof(*rsp);
+
+	LOG_DBG("scid 0x%04x flags 0x%02x result 0x%02x len %u", scid, flags, result, opt_len);
+
+	chan = bt_l2cap_br_lookup_rx_cid(conn, scid);
+	if (!chan) {
+		LOG_ERR("channel mismatch!");
+		return;
+	}
+
+	br_chan = BR_CHAN(chan);
+	if (br_chan->ident != ident) {
+		LOG_WRN("ident mismatch (%u != %u)!", br_chan->ident, ident);
+		return;
+	}
+	br_chan->ident = 0;
+
+	/* Release RTX work since got the response */
+	k_work_cancel_delayable(&br_chan->rtx_work);
+
+	/*
+	 * TODO: handle other results than success and parse response data if
+	 * available
+	 */
+	switch (result) {
+	case BT_L2CAP_CONF_SUCCESS:
+		atomic_set_bit(br_chan->flags, L2CAP_FLAG_CONN_LCONF_DONE);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+		err = l2cap_br_conf_rsp_opt_check(chan, opt_len, buf);
+		if (err) {
+			/* currently disconnect channel if opt is invalid */
+			bt_l2cap_chan_disconnect(chan);
+			break;
+		}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+		if (br_chan->state == BT_L2CAP_CONFIG &&
+		    atomic_test_bit(br_chan->flags, L2CAP_FLAG_CONN_RCONF_DONE)) {
+			LOG_DBG("scid 0x%04x rx MTU %u dcid 0x%04x tx MTU %u", br_chan->rx.cid,
+				br_chan->rx.mtu, br_chan->tx.cid, br_chan->tx.mtu);
+
+			bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTED);
+			if (chan->ops && chan->ops->connected) {
+				chan->ops->connected(chan);
+			}
+		}
+		break;
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	case BT_L2CAP_CONF_UNACCEPT:
+		err = l2cap_br_conf_rsp_unaccept_opt(chan, opt_len, buf);
+		if (!err) {
+			l2cap_br_conf(chan, false);
+			break;
+		}
+		__fallthrough;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+	default:
+		/* currently disconnect channel on non success result */
+		bt_l2cap_chan_disconnect(chan);
+		break;
+	}
+}
+
+static int bt_l2cap_br_allocate_psm(uint16_t *psm)
+{
+	/* DYN_END is UINT16_MAX, so to be able to do a psm <= DYN_END comparison
+	 * we need to use uint32_t as the type.
+	 */
+	static uint32_t allocated_psm = L2CAP_BR_PSM_DYN_START;
+
+	if (allocated_psm < L2CAP_BR_PSM_DYN_END) {
+		allocated_psm = allocated_psm + 1;
+	} else {
+		goto failed;
+	}
+
+	for (; allocated_psm <= L2CAP_BR_PSM_DYN_END; allocated_psm++) {
+		/* Bluetooth Core Specification Version 6.0 | Vol 3, Part A, section 4.2
+		 *
+		 * The PSM field is at least two octets in length. All PSM values shall have
+		 * the least significant bit of the most significant octet equal to 0 and the
+		 * least significant bit of all other octets equal to 1.
+		 */
+		if ((allocated_psm & 0x0101) != 0x0001) {
+			continue;
+		}
+
+		if (l2cap_br_server_lookup_psm((uint16_t)allocated_psm)) {
+			LOG_DBG("PSM 0x%04x has been used", allocated_psm);
+			continue;
+		}
+
+		LOG_DBG("Allocated PSM 0x%04x for new server", allocated_psm);
+		*psm = (uint16_t)allocated_psm;
+		return 0;
+	}
+
+failed:
+	LOG_WRN("No free dynamic PSMs available");
+	return -EADDRNOTAVAIL;
+}
+
+bt_security_t bt_l2cap_br_get_max_sec_level(void)
+{
+	struct bt_l2cap_server *server;
+	bt_security_t sec_level = BT_SECURITY_L0;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&br_servers, server, node) {
+		if (sec_level < server->sec_level) {
+			sec_level = server->sec_level;
+		}
+	}
+
+	return sec_level;
+}
+
+int bt_l2cap_br_server_register(struct bt_l2cap_server *server)
+{
+	int err;
+
+	if (!server->accept) {
+		return -EINVAL;
+	}
+
+	if (server->sec_level > BT_SECURITY_L4) {
+		return -EINVAL;
+	} else if (server->sec_level == BT_SECURITY_L0 && server->psm != L2CAP_BR_PSM_SDP) {
+		server->sec_level = BT_SECURITY_L1;
+	}
+
+	if (!server->psm) {
+		err = bt_l2cap_br_allocate_psm(&server->psm);
+		if (err) {
+			return err;
+		}
+	} else {
+		/* PSM must be odd and lsb of upper byte must be 0 */
+		if ((server->psm & 0x0101) != 0x0001) {
+			LOG_WRN("PSM must be odd and lsb of upper byte must be 0");
+			return -EINVAL;
+		}
+
+		/* Check if given PSM is already in use */
+		if (l2cap_br_server_lookup_psm(server->psm)) {
+			LOG_WRN("PSM already registered");
+			return -EADDRINUSE;
+		}
+	}
+
+	LOG_DBG("PSM 0x%04x", server->psm);
+
+	sys_slist_append(&br_servers, &server->node);
+
+	return 0;
+}
+
+static void l2cap_br_send_reject(struct bt_conn *conn, uint8_t ident, uint16_t reason, void *data,
+				 uint8_t data_len)
+{
+	struct bt_l2cap_cmd_reject *rej;
+	struct bt_l2cap_sig_hdr *hdr;
+	struct net_buf *buf;
+
+	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+	hdr = net_buf_add(buf, sizeof(*hdr));
+	hdr->code = BT_L2CAP_CMD_REJECT;
+	hdr->ident = ident;
+	hdr->len = sys_cpu_to_le16(sizeof(*rej) + data_len);
+
+	rej = net_buf_add(buf, sizeof(*rej));
+	rej->reason = sys_cpu_to_le16(reason);
+
+	/*
+	 * optional data if available must be already in little-endian format
+	 * made by caller.and be compliant with Core 4.2 [Vol 3, Part A, 4.1,
+	 * table 4.4]
+	 */
+	if (data) {
+		net_buf_add_mem(buf, data, data_len);
+	}
+
+	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
+}
+
+static uint16_t l2cap_br_conf_opt_mtu(struct bt_l2cap_chan *chan, struct net_buf *buf, size_t len)
+{
+	uint16_t mtu, result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_mtu *opt_mtu;
+
+	/* Core 4.2 [Vol 3, Part A, 5.1] MTU payload length */
+	if (len != sizeof(*opt_mtu)) {
+		LOG_ERR("tx MTU length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_mtu = (struct bt_l2cap_conf_opt_mtu *)buf->data;
+
+	mtu = sys_le16_to_cpu(opt_mtu->mtu);
+	if (mtu < L2CAP_BR_MIN_MTU) {
+		result = BT_L2CAP_CONF_UNACCEPT;
+		BR_CHAN(chan)->tx.mtu = L2CAP_BR_MIN_MTU;
+		opt_mtu->mtu = sys_cpu_to_le16(L2CAP_BR_MIN_MTU);
+		LOG_DBG("tx MTU %u invalid", mtu);
+		goto done;
+	}
+
+	BR_CHAN(chan)->tx.mtu = mtu;
+	LOG_DBG("tx MTU %u", mtu);
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_opt_flush_timeout(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_flush_timeout *opt_to;
+
+	if (len != sizeof(*opt_to)) {
+		LOG_ERR("qos frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_to = (struct bt_l2cap_conf_opt_flush_timeout *)buf->data;
+
+	LOG_DBG("Flush timeout %u", opt_to->timeout);
+
+	opt_to->timeout = sys_cpu_to_le16(0xffff);
+	result = BT_L2CAP_CONF_UNACCEPT;
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_opt_qos(struct bt_l2cap_chan *chan, struct net_buf *buf, size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_qos *opt_qos;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+	if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_QOS_MASK) == 0) ||
+	    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_QOS_MASK) == 0)) {
+		LOG_WRN("Unsupported extended flow spec");
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	if (len != sizeof(*opt_qos)) {
+		LOG_ERR("qos frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_qos = (struct bt_l2cap_conf_opt_qos *)buf->data;
+
+	LOG_DBG("QOS Type %u", opt_qos->service_type);
+
+	if (opt_qos->service_type == BT_L2CAP_QOS_TYPE_GUARANTEED) {
+		result = BT_L2CAP_CONF_UNACCEPT;
+		/* Set to default value */
+		opt_qos->flags = 0x00;
+		/* do not care */
+		opt_qos->token_rate = sys_cpu_to_le32(L2CAP_QOS_TOKEN_RATE_DEFAULT);
+		/* no token bucket is needed */
+		opt_qos->token_bucket_size = sys_cpu_to_le32(L2CAP_QOS_TOKEN_BUCKET_SIZE_DEFAULT);
+		/* do not care */
+		opt_qos->peak_bandwidth = sys_cpu_to_le32(L2CAP_QOS_PEAK_BANDWIDTH_DEFAULT);
+		/* do not care */
+		opt_qos->latency = sys_cpu_to_le32(L2CAP_QOS_LATENCY_DEFAULT);
+		/* do not care */
+		opt_qos->delay_variation = sys_cpu_to_le32(L2CAP_QOS_DELAY_DEFAULT);
+	}
+
+done:
+	return result;
+}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static uint16_t l2cap_br_conf_opt_ret_fc(struct bt_l2cap_chan *chan, struct net_buf *buf,
+					 size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_UNACCEPT;
+	struct bt_l2cap_conf_opt_ret_fc *opt_ret_fc;
+	struct bt_l2cap_br_chan *br_chan;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+	uint16_t retransmission_timeout;
+	uint16_t monitor_timeout;
+	bool accept = true;
+	uint8_t mode;
+
+	if (len != sizeof(*opt_ret_fc)) {
+		LOG_ERR("ret_fc frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+
+	opt_ret_fc = (struct bt_l2cap_conf_opt_ret_fc *)buf->data;
+
+	LOG_DBG("ret_fc mode %u", opt_ret_fc->mode);
+
+	br_chan = BR_CHAN(chan);
+
+	mode = opt_ret_fc->mode;
+
+	switch (opt_ret_fc->mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		break;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_ENH_RET_MASK) != 0) &&
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_ENH_RET_MASK) != 0)) {
+			/* If enhance transmission mode is supported by both side,
+			 * the enhance transmission mode should be used instead of
+			 * transmission or flow control mode.
+			 */
+			mode = BT_L2CAP_BR_LINK_MODE_ERET;
+		} else {
+			if ((opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_FC) &&
+			    (((br_chan_sig->info_feat_mask & L2CAP_FEAT_FC_MASK) == 0) ||
+			     ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_FC_MASK) == 0))) {
+				mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+			}
+
+			if ((opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_RET) &&
+			    (((br_chan_sig->info_feat_mask & L2CAP_FEAT_RET_MASK) == 0) ||
+			     ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_RET_MASK) == 0))) {
+				mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+			}
+		}
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_ENH_RET_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_ENH_RET_MASK) == 0)) {
+			/* If enhance transmission mode is unsupported by any side,
+			 * the transmission mode should be used instead of
+			 * enhance transmission mode.
+			 */
+			if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_RET_MASK) != 0) &&
+			    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_RET_MASK) != 0)) {
+				mode = BT_L2CAP_BR_LINK_MODE_RET;
+			} else if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_FC_MASK) != 0) &&
+				   ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_FC_MASK) != 0)) {
+				mode = BT_L2CAP_BR_LINK_MODE_FC;
+			} else {
+				mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+			}
+		}
+		break;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_STREAM_MASK) == 0) ||
+		    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_STREAM_MASK) == 0)) {
+			/* Unsupported mode */
+			mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+		}
+		break;
+	default:
+		mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+		break;
+	}
+
+	if (!br_chan->rx.optional) {
+		switch (mode) {
+		case BT_L2CAP_BR_LINK_MODE_BASIC:
+			__fallthrough;
+		case BT_L2CAP_BR_LINK_MODE_ERET:
+			__fallthrough;
+		case BT_L2CAP_BR_LINK_MODE_STREAM:
+			/* The tx mode should be same as rx mode */
+			if (mode != br_chan->rx.mode) {
+				mode = br_chan->rx.mode;
+			}
+			break;
+		case BT_L2CAP_BR_LINK_MODE_RET:
+			__fallthrough;
+		case BT_L2CAP_BR_LINK_MODE_FC:
+			/* The tx mode should be aligned with rx mode */
+			if ((br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_RET) &&
+			    (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_FC)) {
+				mode = br_chan->rx.mode;
+			}
+			break;
+		default:
+			break;
+		}
+	} else {
+		if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_BASIC) {
+			mode = br_chan->rx.mode;
+		} else {
+			br_chan->rx.mode = mode;
+		}
+	}
+
+	if (opt_ret_fc->mode != mode) {
+		accept = false;
+		opt_ret_fc->mode = mode;
+	}
+
+	br_chan->tx.mode = mode;
+
+	if (opt_ret_fc->mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		uint16_t mps = CONFIG_BT_L2CAP_MPS;
+
+		if (sys_le16_to_cpu(opt_ret_fc->mps) > br_chan->tx.mtu) {
+			opt_ret_fc->mps = sys_cpu_to_le16(br_chan->tx.mtu);
+			accept = false;
+		}
+
+		if (sys_le16_to_cpu(opt_ret_fc->mps) > mps) {
+			opt_ret_fc->mps = sys_cpu_to_le16(mps);
+		}
+
+		if ((opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		    (opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+			if ((opt_ret_fc->tx_windows_size < 1) ||
+			    (opt_ret_fc->tx_windows_size > 32)) {
+				opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+				accept = false;
+			}
+
+			if (opt_ret_fc->max_transmit < 1) {
+				opt_ret_fc->max_transmit = 1;
+				accept = false;
+			}
+		}
+
+		if (opt_ret_fc->mode == BT_L2CAP_BR_LINK_MODE_ERET) {
+			if ((opt_ret_fc->tx_windows_size < 1) ||
+			    (opt_ret_fc->tx_windows_size > 63)) {
+				opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+				accept = false;
+			}
+		}
+
+		retransmission_timeout = sys_le16_to_cpu(opt_ret_fc->retransmission_timeout);
+
+		monitor_timeout = sys_le16_to_cpu(opt_ret_fc->monitor_timeout);
+		if (monitor_timeout < retransmission_timeout) {
+			monitor_timeout = retransmission_timeout;
+			accept = false;
+		}
+
+		if (opt_ret_fc->tx_windows_size > CONFIG_BT_L2CAP_MAX_WINDOW_SIZE) {
+			opt_ret_fc->tx_windows_size = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+		}
+
+		opt_ret_fc->retransmission_timeout = sys_cpu_to_le16(retransmission_timeout);
+		opt_ret_fc->monitor_timeout = sys_cpu_to_le16(monitor_timeout);
+
+		if (!accept) {
+			goto done;
+		}
+
+		br_chan->tx.ret_timeout = retransmission_timeout;
+		br_chan->tx.monitor_timeout = monitor_timeout;
+		br_chan->tx.max_transmit = opt_ret_fc->max_transmit;
+		br_chan->tx.max_window = opt_ret_fc->tx_windows_size;
+		br_chan->tx.mps = sys_le16_to_cpu(opt_ret_fc->mps);
+	}
+
+	if (!accept) {
+		goto done;
+	}
+
+	result = BT_L2CAP_CONF_SUCCESS;
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_opt_fcs(struct bt_l2cap_chan *chan, struct net_buf *buf, size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_fcs *opt_fcs;
+	struct bt_l2cap_br_chan *br_chan;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+	if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_FCS_MASK) == 0) ||
+	    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_FCS_MASK) == 0)) {
+		LOG_WRN("Unsupported extended flow spec");
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	if (len != sizeof(*opt_fcs)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_fcs = (struct bt_l2cap_conf_opt_fcs *)buf->data;
+
+	LOG_DBG("FCS type %u", opt_fcs->type);
+
+	if ((opt_fcs->type != BT_L2CAP_FCS_TYPE_NO) && (opt_fcs->type != BT_L2CAP_FCS_TYPE_16BIT)) {
+		LOG_ERR("fcs type %u invalid", opt_fcs->type);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan = BR_CHAN(chan);
+
+	switch (br_chan->tx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		LOG_ERR("fcs opt is mandatory in mode %u", br_chan->tx.mode);
+		if (opt_fcs->type != BT_L2CAP_BR_FCS_16BIT) {
+			result = BT_L2CAP_CONF_UNACCEPT;
+			opt_fcs->type = BT_L2CAP_BR_FCS_16BIT;
+			br_chan->tx.fcs = opt_fcs->type;
+			goto done;
+		}
+		br_chan->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		br_chan->tx.fcs = opt_fcs->type;
+		break;
+	default:
+		/* Should not have been here */
+		LOG_ERR("Unknown mode %u", br_chan->tx.mode);
+		break;
+	}
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_opt_ext_flow_spec(struct bt_l2cap_chan *chan, struct net_buf *buf,
+						size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_ext_flow_spec *ext_flow_spec;
+	struct bt_l2cap_br_chan *br_chan;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+	if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_EXT_FS_MASK) == 0) ||
+	    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_EXT_FS_MASK) == 0)) {
+		LOG_WRN("Unsupported extended flow spec");
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	if (len != sizeof(*ext_flow_spec)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	ext_flow_spec = (struct bt_l2cap_conf_opt_ext_flow_spec *)buf->data;
+
+	LOG_DBG("Ext Flow Spec %u %u %u %u %u %u", ext_flow_spec->identifier,
+		ext_flow_spec->service_type, ext_flow_spec->sdu,
+		ext_flow_spec->sdu_inter_arrival_time, ext_flow_spec->access_latency,
+		ext_flow_spec->flush_timeout);
+
+	br_chan = BR_CHAN(chan);
+
+	/* Set to default value */
+	result = BT_L2CAP_CONF_REJECT;
+	ext_flow_spec->identifier = 0x01;
+	ext_flow_spec->service_type = 0x01;
+	ext_flow_spec->sdu = sys_cpu_to_le16(L2CAP_EXT_FLOW_SPEC_SDU_DEFAULT);
+	ext_flow_spec->sdu_inter_arrival_time = sys_cpu_to_le32(L2CAP_EXT_FLOW_SPEC_DEFAULT);
+	ext_flow_spec->access_latency = sys_cpu_to_le32(L2CAP_EXT_FLOW_SPEC_DEFAULT);
+	ext_flow_spec->flush_timeout = sys_cpu_to_le32(L2CAP_EXT_FLOW_SPEC_DEFAULT);
+
+done:
+	return result;
+}
+
+static uint16_t l2cap_br_conf_opt_ext_win_size(struct bt_l2cap_chan *chan, struct net_buf *buf,
+					       size_t len)
+{
+	uint16_t result = BT_L2CAP_CONF_SUCCESS;
+	struct bt_l2cap_conf_opt_ext_win_size *opt_ext_win_size;
+	struct bt_l2cap_br_chan *br_chan;
+	uint16_t win_size;
+	struct bt_l2cap_chan *chan_sig;
+	struct bt_l2cap_br *br_chan_sig;
+
+	chan_sig = bt_l2cap_br_lookup_rx_cid(chan->conn, BT_L2CAP_CID_BR_SIG);
+	if (!chan_sig) {
+		LOG_WRN("Ignoring data for unknown channel ID 0x%04x", BT_L2CAP_CID_BR_SIG);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	br_chan_sig = CONTAINER_OF(chan_sig, struct bt_l2cap_br, chan.chan);
+	if (((br_chan_sig->info_feat_mask & L2CAP_FEAT_EXT_WIN_SIZE_MASK) == 0) ||
+	    ((L2CAP_EXTENDED_FEAT_MASK & L2CAP_FEAT_EXT_WIN_SIZE_MASK) == 0)) {
+		LOG_WRN("Unsupported extended window size");
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	if (len != sizeof(*opt_ext_win_size)) {
+		LOG_ERR("fcs frame length %zu invalid", len);
+		result = BT_L2CAP_CONF_REJECT;
+		goto done;
+	}
+
+	opt_ext_win_size = (struct bt_l2cap_conf_opt_ext_win_size *)buf->data;
+	win_size = sys_le16_to_cpu(opt_ext_win_size->max_windows_size);
+
+	LOG_DBG("EXT Win Size value %u", win_size);
+
+	br_chan = BR_CHAN(chan);
+
+	switch (br_chan->tx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		__fallthrough;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		/* ignore */
+		LOG_WRN("Ignored by mode %u", br_chan->tx.mode);
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		if ((win_size < 1) || (win_size > 0x3fff)) {
+			/* Set to default value */
+			opt_ext_win_size->max_windows_size =
+				sys_cpu_to_le16(CONFIG_BT_L2CAP_MAX_WINDOW_SIZE);
+			result = BT_L2CAP_CONF_UNACCEPT;
+			goto done;
+		}
+		if (win_size > CONFIG_BT_L2CAP_MAX_WINDOW_SIZE) {
+			opt_ext_win_size->max_windows_size =
+				sys_cpu_to_le16(CONFIG_BT_L2CAP_MAX_WINDOW_SIZE);
+		}
+		br_chan->tx.extended_control = true;
+		br_chan->tx.max_window = win_size;
+		break;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		if (win_size) {
+			result = BT_L2CAP_CONF_UNACCEPT;
+			opt_ext_win_size->max_windows_size = 0;
+			goto done;
+		}
+		br_chan->tx.extended_control = true;
+		break;
+	default:
+		/* Should not have been here */
+		LOG_ERR("Unknown mode %u", br_chan->tx.mode);
+		break;
+	}
+
+done:
+	return result;
+}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+static void l2cap_br_conf_req(struct bt_l2cap_br *l2cap, uint8_t ident, uint16_t len,
+			      struct net_buf *buf)
+{
+	struct bt_conn *conn = l2cap->chan.chan.conn;
+	struct bt_l2cap_chan *chan;
+	struct bt_l2cap_conf_req *req;
+	struct bt_l2cap_sig_hdr *hdr;
+	struct bt_l2cap_conf_rsp *rsp;
+	struct bt_l2cap_conf_opt *opt = NULL;
+	uint16_t flags, dcid, opt_len, hint, result = BT_L2CAP_CONF_SUCCESS;
+	struct net_buf *rsp_buf;
+
+	if (buf->len < sizeof(*req)) {
+		LOG_ERR("Too small L2CAP conf req packet size");
+		return;
+	}
+
+	req = net_buf_pull_mem(buf, sizeof(*req));
+	flags = sys_le16_to_cpu(req->flags);
+	dcid = sys_le16_to_cpu(req->dcid);
+	opt_len = len - sizeof(*req);
+
+	LOG_DBG("dcid 0x%04x flags 0x%02x len %u", dcid, flags, opt_len);
+
+	chan = bt_l2cap_br_lookup_rx_cid(conn, dcid);
+	if (!chan) {
+		LOG_ERR("rx channel mismatch!");
+		struct bt_l2cap_cmd_reject_cid_data data = {
+			.scid = req->dcid,
+			.dcid = 0,
+		};
+
+		l2cap_br_send_reject(conn, ident, BT_L2CAP_REJ_INVALID_CID, &data, sizeof(data));
+		return;
+	}
+
+	rsp_buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+	hdr = net_buf_add(rsp_buf, sizeof(*hdr));
+	hdr->code = BT_L2CAP_CONF_RSP;
+	hdr->ident = ident;
+	rsp = net_buf_add(rsp_buf, sizeof(*rsp));
+	(void)memset(rsp, 0, sizeof(*rsp));
+
+	rsp->scid = sys_cpu_to_le16(BR_CHAN(chan)->tx.cid);
+
+	/*
+	 * Core 5.4, Vol 3, Part A, section 4.5.
+	 * When used in the L2CAP_CONFIGURATION_RSP packet,
+	 * the continuation flag shall be set to one if the
+	 * flag is set to one in the Request, except for
+	 * those error conditions more appropriate for an
+	 * L2CAP_COMMAND_REJECT_RSP packet.
+	 */
+	rsp->flags = sys_cpu_to_le16(flags & BT_L2CAP_CONF_FLAGS_MASK);
+
+	if (!opt_len) {
+		LOG_DBG("tx default MTU %u", L2CAP_BR_DEFAULT_MTU);
+		BR_CHAN(chan)->tx.mtu = L2CAP_BR_DEFAULT_MTU;
+		goto send_rsp;
+	}
+
+	while (opt_len >= sizeof(*opt)) {
+		opt = net_buf_pull_mem(buf, sizeof(*opt));
+
+		opt_len -= sizeof(*opt);
+
+		/* make sure opt object can get safe dereference in iteration */
+		if (opt_len < opt->len) {
+			LOG_ERR("Received too short option data");
+			result = BT_L2CAP_CONF_REJECT;
+			break;
+		}
+
+		opt_len -= opt->len;
+
+		hint = opt->type & BT_L2CAP_CONF_HINT;
+
+		switch (opt->type & BT_L2CAP_CONF_MASK) {
+		case BT_L2CAP_CONF_OPT_MTU:
+			/* getting MTU modifies buf internals */
+			result = l2cap_br_conf_opt_mtu(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto send_rsp;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_FLUSH_TIMEOUT:
+			result = l2cap_br_conf_opt_flush_timeout(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto send_rsp;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_QOS:
+			result = l2cap_br_conf_opt_qos(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto send_rsp;
+			}
+			break;
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+		case BT_L2CAP_CONF_OPT_RET_FC:
+			result = l2cap_br_conf_opt_ret_fc(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto send_rsp;
+			} else {
+				l2cap_br_conf_add_opt(rsp_buf, opt);
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_FCS:
+			result = l2cap_br_conf_opt_fcs(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto send_rsp;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_EXT_FLOW_SPEC:
+			result = l2cap_br_conf_opt_ext_flow_spec(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto send_rsp;
+			}
+			break;
+		case BT_L2CAP_CONF_OPT_EXT_WIN_SIZE:
+			result = l2cap_br_conf_opt_ext_win_size(chan, buf, opt->len);
+			if (result != BT_L2CAP_CONF_SUCCESS) {
+				goto send_rsp;
+			} else {
+				l2cap_br_conf_add_opt(rsp_buf, opt);
+			}
+			break;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+		default:
+			if (!hint) {
+				LOG_DBG("option %u not handled", opt->type);
+				result = BT_L2CAP_CONF_UNKNOWN_OPT;
+				goto send_rsp;
+			}
+			break;
+		}
+
+		/* Update buffer to point at next option */
+		net_buf_pull(buf, opt->len);
+	}
 
 send_rsp:
+	rsp->result = sys_cpu_to_le16(result);
+
+	/*
+	 * TODO: If options other than MTU became meaningful then processing
+	 * the options chain need to be modified and taken into account when
+	 * sending back to peer.
+	 */
+	if ((result == BT_L2CAP_CONF_UNKNOWN_OPT) || (result == BT_L2CAP_CONF_UNACCEPT)) {
+		if (opt) {
+			l2cap_br_conf_add_opt(rsp_buf, opt);
+		}
+	}
+
+	hdr->len = sys_cpu_to_le16(rsp_buf->len - sizeof(*hdr));
+
+	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, rsp_buf);
+
+	if (result != BT_L2CAP_CONF_SUCCESS) {
+		return;
+	}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (BR_CHAN(chan)->tx.fcs == BT_L2CAP_BR_FCS_16BIT) {
+		/* If peer enables FCS, local also needs to enable it. */
+		BR_CHAN(chan)->rx.fcs = BT_L2CAP_BR_FCS_16BIT;
+	}
+
+	if (BR_CHAN(chan)->tx.extended_control) {
+		/* If peer enables extended control field,
+		 * local also needs to enable it.
+		 */
+		BR_CHAN(chan)->rx.extended_control = true;
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_RCONF_DONE);
+
+	if (atomic_test_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_LCONF_DONE) &&
+	    BR_CHAN(chan)->state == BT_L2CAP_CONFIG) {
+		LOG_DBG("scid 0x%04x rx MTU %u dcid 0x%04x tx MTU %u", BR_CHAN(chan)->rx.cid,
+			BR_CHAN(chan)->rx.mtu, BR_CHAN(chan)->tx.cid, BR_CHAN(chan)->tx.mtu);
+
+		bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTED);
+		if (chan->ops && chan->ops->connected) {
+			chan->ops->connected(chan);
+		}
+	}
+}
+
+static struct bt_l2cap_br_chan *l2cap_br_remove_tx_cid(struct bt_conn *conn, uint16_t cid)
+{
+	struct bt_l2cap_chan *chan;
+	sys_snode_t *prev = NULL;
+
+	/* Protect fixed channels against accidental removal */
+	if (!L2CAP_BR_CID_IS_DYN(cid)) {
+		return NULL;
+	}
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn->channels, chan, node) {
+		if (BR_CHAN(chan)->tx.cid == cid) {
+			sys_slist_remove(&conn->channels, prev, &chan->node);
+			return BR_CHAN(chan);
+		}
+
+		prev = &chan->node;
+	}
+
+	return NULL;
+}
+
+static void l2cap_br_disconn_req(struct bt_l2cap_br *l2cap, uint8_t ident, struct net_buf *buf)
+{
+	struct bt_conn *conn = l2cap->chan.chan.conn;
+	struct bt_l2cap_br_chan *chan;
+	struct bt_l2cap_disconn_req *req = (void *)buf->data;
+	struct bt_l2cap_disconn_rsp *rsp;
+	struct bt_l2cap_sig_hdr *hdr;
+	uint16_t scid, dcid;
+
+	if (buf->len < sizeof(*req)) {
+		LOG_ERR("Too small disconn req packet size");
+		return;
+	}
+
+	dcid = sys_le16_to_cpu(req->dcid);
+	scid = sys_le16_to_cpu(req->scid);
+
+	LOG_DBG("scid 0x%04x dcid 0x%04x", dcid, scid);
+
+	chan = l2cap_br_remove_tx_cid(conn, scid);
+	if (!chan) {
+		struct bt_l2cap_cmd_reject_cid_data data;
+
+		data.scid = req->scid;
+		data.dcid = req->dcid;
+		l2cap_br_send_reject(conn, ident, BT_L2CAP_REJ_INVALID_CID, &data, sizeof(data));
+		return;
+	}
+
 	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
 
 	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_CONF_RSP;
+	hdr->code = BT_L2CAP_DISCONN_RSP;
 	hdr->ident = ident;
+	hdr->len = sys_cpu_to_le16(sizeof(*rsp));
+
 	rsp = net_buf_add(buf, sizeof(*rsp));
-	(void)memset(rsp, 0, sizeof(*rsp));
+	rsp->dcid = sys_cpu_to_le16(chan->rx.cid);
+	rsp->scid = sys_cpu_to_le16(chan->tx.cid);
+
+	bt_l2cap_br_chan_del(&chan->chan);
+
+	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
+}
+
+static void l2cap_br_connected(struct bt_l2cap_chan *chan)
+{
+	LOG_DBG("ch %p cid 0x%04x", BR_CHAN(chan), BR_CHAN(chan)->rx.cid);
+}
+
+static void l2cap_br_disconnected(struct bt_l2cap_chan *chan)
+{
+	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
+
+	LOG_DBG("ch %p cid 0x%04x", br_chan, br_chan->rx.cid);
+
+	if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_SIG_INFO_PENDING)) {
+		/* Cancel RTX work on signal channel.
+		 * Disconnected callback is always called from system workqueue
+		 * so this should always succeed.
+		 */
+		(void)k_work_cancel_delayable(&br_chan->rtx_work);
+	}
+}
+
+int bt_l2cap_br_chan_disconnect(struct bt_l2cap_chan *chan)
+{
+	struct bt_conn *conn = chan->conn;
+	struct net_buf *buf;
+	struct bt_l2cap_disconn_req *req;
+	struct bt_l2cap_sig_hdr *hdr;
+	struct bt_l2cap_br_chan *br_chan;
+
+	if (!conn) {
+		return -ENOTCONN;
+	}
+
+	br_chan = BR_CHAN(chan);
+
+	if (br_chan->state == BT_L2CAP_DISCONNECTING) {
+		return -EALREADY;
+	}
+
+	LOG_DBG("chan %p scid 0x%04x dcid 0x%04x", chan, br_chan->rx.cid, br_chan->tx.cid);
+
+	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+	hdr = net_buf_add(buf, sizeof(*hdr));
+	hdr->code = BT_L2CAP_DISCONN_REQ;
+	hdr->ident = l2cap_br_get_ident();
+	hdr->len = sys_cpu_to_le16(sizeof(*req));
+
+	req = net_buf_add(buf, sizeof(*req));
+	req->dcid = sys_cpu_to_le16(br_chan->tx.cid);
+	req->scid = sys_cpu_to_le16(br_chan->rx.cid);
+
+	/* Set the ident for the signaling request */
+	br_chan->ident = hdr->ident;
+
+	l2cap_br_chan_send_req(br_chan, buf, L2CAP_BR_DISCONN_TIMEOUT);
+	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_DISCONNECTING);
+
+	return 0;
+}
+
+static void l2cap_br_disconn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, struct net_buf *buf)
+{
+	struct bt_conn *conn = l2cap->chan.chan.conn;
+	struct bt_l2cap_br_chan *chan;
+	struct bt_l2cap_disconn_rsp *rsp = (void *)buf->data;
+	uint16_t dcid, scid;
+
+	if (buf->len < sizeof(*rsp)) {
+		LOG_ERR("Too small disconn rsp packet size");
+		return;
+	}
+
+	dcid = sys_le16_to_cpu(rsp->dcid);
+	scid = sys_le16_to_cpu(rsp->scid);
+
+	LOG_DBG("dcid 0x%04x scid 0x%04x", dcid, scid);
+
+	chan = l2cap_br_remove_tx_cid(conn, dcid);
+	if (!chan) {
+		LOG_WRN("No dcid 0x%04x channel found", dcid);
+		return;
+	}
+
+	if (chan->ident != ident) {
+		LOG_WRN("ident mismatch (%u != %u)!", chan->ident, ident);
+		return;
+	}
+	chan->ident = 0;
+
+	bt_l2cap_br_chan_del(&chan->chan);
+}
+
+int bt_l2cap_br_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan, uint16_t psm)
+{
+	struct net_buf *buf;
+	struct bt_l2cap_sig_hdr *hdr;
+	struct bt_l2cap_conn_req *req;
+	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	int err;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	if (!psm) {
+		return -EINVAL;
+	}
+
+	if (br_chan->psm) {
+		return -EEXIST;
+	}
+
+	/* PSM must be odd and lsb of upper byte must be 0 */
+	if ((psm & 0x0101) != 0x0001) {
+		return -EINVAL;
+	}
+
+	if (br_chan->required_sec_level > BT_SECURITY_L4) {
+		return -EINVAL;
+	} else if (br_chan->required_sec_level == BT_SECURITY_L0 && psm != L2CAP_BR_PSM_SDP) {
+		br_chan->required_sec_level = BT_SECURITY_L1;
+	}
+
+	switch (br_chan->state) {
+	case BT_L2CAP_CONNECTED:
+		/* Already connected */
+		return -EISCONN;
+	case BT_L2CAP_DISCONNECTED:
+		/* Can connect */
+		break;
+	case BT_L2CAP_CONFIG:
+	case BT_L2CAP_DISCONNECTING:
+	default:
+		/* Bad context */
+		return -EBUSY;
+	}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	err = l2cap_br_check_chan_config(conn, br_chan);
+	if (err) {
+		return err;
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	if (!l2cap_br_chan_add(conn, chan, l2cap_br_chan_destroy)) {
+		return -ENOMEM;
+	}
+
+	br_chan->psm = psm;
+	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTING);
+	atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING);
+
+	switch (l2cap_br_conn_security(chan, psm)) {
+	case L2CAP_CONN_SECURITY_PENDING:
+		/*
+		 * Authentication was triggered, wait with sending request on
+		 * connection security changed callback context.
+		 */
+		return 0;
+	case L2CAP_CONN_SECURITY_PASSED:
+		break;
+	case L2CAP_CONN_SECURITY_REJECT:
+	default:
+		l2cap_br_chan_cleanup(chan);
+		return -EIO;
+	}
+
+	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+	hdr = net_buf_add(buf, sizeof(*hdr));
+	hdr->code = BT_L2CAP_CONN_REQ;
+	hdr->ident = l2cap_br_get_ident();
+	hdr->len = sys_cpu_to_le16(sizeof(*req));
+
+	req = net_buf_add(buf, sizeof(*req));
+	req->psm = sys_cpu_to_le16(psm);
+	req->scid = sys_cpu_to_le16(BR_CHAN(chan)->rx.cid);
+
+	/* Set the ident for the signaling request */
+	BR_CHAN(chan)->ident = hdr->ident;
+
+	l2cap_br_chan_send_req(BR_CHAN(chan), buf, L2CAP_BR_CONN_TIMEOUT);
+
+	return 0;
+}
+
+static void l2cap_br_conn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, struct net_buf *buf)
+{
+	struct bt_conn *conn = l2cap->chan.chan.conn;
+	struct bt_l2cap_chan *chan;
+	struct bt_l2cap_conn_rsp *rsp = (void *)buf->data;
+	uint16_t dcid, scid, result, status;
+	struct bt_l2cap_br_chan *br_chan;
+
+	if (buf->len < sizeof(*rsp)) {
+		LOG_ERR("Too small L2CAP conn rsp packet size");
+		return;
+	}
 
-	rsp->result = sys_cpu_to_le16(result);
-	rsp->scid = sys_cpu_to_le16(BR_CHAN(chan)->tx.cid);
+	dcid = sys_le16_to_cpu(rsp->dcid);
+	scid = sys_le16_to_cpu(rsp->scid);
+	result = sys_le16_to_cpu(rsp->result);
+	status = sys_le16_to_cpu(rsp->status);
 
-	/*
-	 * Core 5.4, Vol 3, Part A, section 4.5.
-	 * When used in the L2CAP_CONFIGURATION_RSP packet,
-	 * the continuation flag shall be set to one if the
-	 * flag is set to one in the Request, except for
-	 * those error conditions more appropriate for an
-	 * L2CAP_COMMAND_REJECT_RSP packet.
-	 */
-	rsp->flags = sys_cpu_to_le16(flags & BT_L2CAP_CONF_FLAGS_MASK);
+	LOG_DBG("dcid 0x%04x scid 0x%04x result %u status %u", dcid, scid, result, status);
 
-	/*
-	 * TODO: If options other than MTU became meaningful then processing
-	 * the options chain need to be modified and taken into account when
-	 * sending back to peer.
-	 */
-	if ((result == BT_L2CAP_CONF_UNKNOWN_OPT) || (result == BT_L2CAP_CONF_UNACCEPT)) {
-		if (opt) {
-			l2cap_br_conf_add_opt(buf, opt);
-		}
+	chan = bt_l2cap_br_lookup_rx_cid(conn, scid);
+	if (!chan) {
+		LOG_ERR("No scid 0x%04x channel found", scid);
+		return;
 	}
 
-	hdr->len = sys_cpu_to_le16(buf->len - sizeof(*hdr));
+	br_chan = BR_CHAN(chan);
+	if (br_chan->ident != ident) {
+		LOG_WRN("ident mismatch (%u != %u)!", br_chan->ident, ident);
+		return;
+	}
+	br_chan->ident = 0;
 
-	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
+	/* Release RTX work since got the response */
+	k_work_cancel_delayable(&br_chan->rtx_work);
 
-	if (result != BT_L2CAP_CONF_SUCCESS) {
+	if (br_chan->state != BT_L2CAP_CONNECTING) {
+		LOG_DBG("Invalid channel %p state %s", chan,
+			bt_l2cap_chan_state_str(br_chan->state));
 		return;
 	}
 
-	atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_RCONF_DONE);
+	switch (result) {
+	case BT_L2CAP_BR_SUCCESS:
+		br_chan->ident = 0U;
+		BR_CHAN(chan)->tx.cid = dcid;
+		l2cap_br_conf(chan, true);
+		bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONFIG);
+		atomic_clear_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING);
+		break;
+	case BT_L2CAP_BR_PENDING:
+		k_work_reschedule(&br_chan->rtx_work, L2CAP_BR_CONN_TIMEOUT);
+		break;
+	default:
+		l2cap_br_chan_cleanup(chan);
+		break;
+	}
+}
 
-	if (atomic_test_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_LCONF_DONE) &&
-	    BR_CHAN(chan)->state == BT_L2CAP_CONFIG) {
-		LOG_DBG("scid 0x%04x rx MTU %u dcid 0x%04x tx MTU %u", BR_CHAN(chan)->rx.cid,
-			BR_CHAN(chan)->rx.mtu, BR_CHAN(chan)->tx.cid, BR_CHAN(chan)->tx.mtu);
+int bt_l2cap_br_chan_send_cb(struct bt_l2cap_chan *chan, struct net_buf *buf, bt_conn_tx_cb_t cb,
+			     void *user_data)
+{
+	struct bt_l2cap_br_chan *br_chan;
 
-		bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTED);
-		if (chan->ops && chan->ops->connected) {
-			chan->ops->connected(chan);
-		}
+	if (!buf || !chan) {
+		return -EINVAL;
+	}
+
+	br_chan = BR_CHAN(chan);
+
+	LOG_DBG("chan %p buf %p len %zu", chan, buf, net_buf_frags_len(buf));
+
+	if (!chan->conn || chan->conn->state != BT_CONN_CONNECTED) {
+		return -ENOTCONN;
+	}
+
+	if (atomic_test_bit(chan->status, BT_L2CAP_STATUS_SHUTDOWN)) {
+		return -ESHUTDOWN;
+	}
+
+	if (buf->len > br_chan->tx.mtu) {
+		LOG_ERR("attempt to send %u bytes on %u MTU chan", buf->len, br_chan->tx.mtu);
+		return -EMSGSIZE;
 	}
+
+	return bt_l2cap_br_send_cb(br_chan->chan.conn, br_chan->tx.cid, buf, cb, user_data);
 }
 
-static struct bt_l2cap_br_chan *l2cap_br_remove_tx_cid(struct bt_conn *conn,
-						       uint16_t cid)
+int bt_l2cap_br_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
-	struct bt_l2cap_chan *chan;
-	sys_snode_t *prev = NULL;
+	return bt_l2cap_br_chan_send_cb(chan, buf, NULL, NULL);
+}
 
-	/* Protect fixed channels against accidental removal */
-	if (!L2CAP_BR_CID_IS_DYN(cid)) {
-		return NULL;
-	}
+static struct bt_l2cap_br_chan *bt_l2cap_br_lookup_ident(struct bt_conn *conn, uint8_t ident)
+{
+	struct bt_l2cap_chan *chan;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn->channels, chan, node) {
-		if (BR_CHAN(chan)->tx.cid == cid) {
-			sys_slist_remove(&conn->channels, prev, &chan->node);
+		if (BR_CHAN(chan)->ident == ident) {
 			return BR_CHAN(chan);
 		}
-
-		prev = &chan->node;
 	}
 
 	return NULL;
 }
 
-static void l2cap_br_disconn_req(struct bt_l2cap_br *l2cap, uint8_t ident,
-				 struct net_buf *buf)
+static void l2cap_br_reject_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_br_chan *chan;
-	struct bt_l2cap_disconn_req *req = (void *)buf->data;
-	struct bt_l2cap_disconn_rsp *rsp;
+
+	do {
+		chan = bt_l2cap_br_lookup_ident(conn, ident);
+		if (chan != NULL) {
+			int err = -EINVAL;
+
+			/* Only send disconnect req when the L2CAP channel has been connected. */
+			if ((chan->state == BT_L2CAP_CONFIG) ||
+			    (chan->state == BT_L2CAP_CONNECTED)) {
+				err = bt_l2cap_br_chan_disconnect(&chan->chan);
+			}
+
+			if (err) {
+				/* Fail to send disconnect request. Remove channel directly. */
+				bt_l2cap_chan_remove(conn, &chan->chan);
+				bt_l2cap_br_chan_del(&chan->chan);
+			}
+		}
+	} while (chan != NULL);
+}
+
+static void l2cap_br_sig_handle(struct bt_l2cap_br *l2cap, struct bt_l2cap_sig_hdr *hdr,
+				struct net_buf *buf)
+{
+	uint16_t len;
+	struct net_buf_simple_state state;
+
+	len = sys_le16_to_cpu(hdr->len);
+
+	net_buf_simple_save(&buf->b, &state);
+
+	switch (hdr->code) {
+	case BT_L2CAP_INFO_RSP:
+		l2cap_br_info_rsp(l2cap, hdr->ident, buf);
+		break;
+	case BT_L2CAP_INFO_REQ:
+		l2cap_br_info_req(l2cap, hdr->ident, buf);
+		break;
+	case BT_L2CAP_DISCONN_REQ:
+		l2cap_br_disconn_req(l2cap, hdr->ident, buf);
+		break;
+	case BT_L2CAP_CONN_REQ:
+		l2cap_br_conn_req(l2cap, hdr->ident, buf);
+		break;
+	case BT_L2CAP_CONF_RSP:
+		l2cap_br_conf_rsp(l2cap, hdr->ident, len, buf);
+		break;
+	case BT_L2CAP_CONF_REQ:
+		l2cap_br_conf_req(l2cap, hdr->ident, len, buf);
+		break;
+	case BT_L2CAP_DISCONN_RSP:
+		l2cap_br_disconn_rsp(l2cap, hdr->ident, buf);
+		break;
+	case BT_L2CAP_CONN_RSP:
+		l2cap_br_conn_rsp(l2cap, hdr->ident, buf);
+		break;
+	case BT_L2CAP_CMD_REJECT:
+		l2cap_br_reject_rsp(l2cap, hdr->ident, buf);
+		break;
+	default:
+		LOG_WRN("Unknown/Unsupported L2CAP PDU code 0x%02x", hdr->code);
+		l2cap_br_send_reject(l2cap->chan.chan.conn, hdr->ident, BT_L2CAP_REJ_NOT_UNDERSTOOD,
+				     NULL, 0);
+		break;
+	}
+
+	net_buf_simple_restore(&buf->b, &state);
+	(void)net_buf_pull_mem(buf, len);
+}
+
+static int l2cap_br_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
+{
+	struct bt_l2cap_br *l2cap = CONTAINER_OF(chan, struct bt_l2cap_br, chan.chan);
 	struct bt_l2cap_sig_hdr *hdr;
-	uint16_t scid, dcid;
+	uint16_t len;
 
-	if (buf->len < sizeof(*req)) {
-		LOG_ERR("Too small disconn req packet size");
+	while (buf->len > 0) {
+		if (buf->len < sizeof(*hdr)) {
+			LOG_ERR("Too small L2CAP signaling PDU");
+			return 0;
+		}
+
+		hdr = net_buf_pull_mem(buf, sizeof(*hdr));
+		len = sys_le16_to_cpu(hdr->len);
+
+		LOG_DBG("Signaling code 0x%02x ident %u len %u", hdr->code, hdr->ident, len);
+
+		if (buf->len < len) {
+			LOG_ERR("L2CAP length is short (%u < %u)", buf->len, len);
+			return 0;
+		}
+
+		if (!hdr->ident) {
+			LOG_ERR("Invalid ident value in L2CAP PDU");
+			(void)net_buf_pull_mem(buf, len);
+			continue;
+		}
+
+		l2cap_br_sig_handle(l2cap, hdr, buf);
+	}
+
+	return 0;
+}
+
+static void l2cap_br_conn_pend(struct bt_l2cap_chan *chan, uint8_t status)
+{
+	struct net_buf *buf;
+	struct bt_l2cap_sig_hdr *hdr;
+	struct bt_l2cap_conn_req *req;
+
+	if (BR_CHAN(chan)->state != BT_L2CAP_CONNECTING) {
 		return;
 	}
 
-	dcid = sys_le16_to_cpu(req->dcid);
-	scid = sys_le16_to_cpu(req->scid);
+	LOG_DBG("chan %p status 0x%02x encr 0x%02x", chan, status, chan->conn->encrypt);
 
-	LOG_DBG("scid 0x%04x dcid 0x%04x", dcid, scid);
+	if (status) {
+		/*
+		 * Security procedure status is non-zero so respond with
+		 * security violation only as channel acceptor.
+		 */
+		l2cap_br_conn_req_reply(chan, BT_L2CAP_BR_ERR_SEC_BLOCK);
 
-	chan = l2cap_br_remove_tx_cid(conn, scid);
-	if (!chan) {
-		struct bt_l2cap_cmd_reject_cid_data data;
+		/* Release channel allocated to outgoing connection request */
+		if (atomic_test_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING)) {
+			l2cap_br_chan_cleanup(chan);
+		}
+
+		return;
+	}
+
+	if (!chan->conn->encrypt) {
+		return;
+	}
+
+	/*
+	 * For incoming connection state send confirming outstanding
+	 * response and initiate configuration request.
+	 */
+	if (l2cap_br_conn_req_reply(chan, BT_L2CAP_BR_SUCCESS) == 0) {
+		bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONFIG);
+		/*
+		 * Initialize config request since remote needs to know
+		 * local MTU segmentation.
+		 */
+		l2cap_br_conf(chan, true);
+	} else if (atomic_test_and_clear_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING)) {
+		buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+
+		hdr = net_buf_add(buf, sizeof(*hdr));
+		hdr->code = BT_L2CAP_CONN_REQ;
+		hdr->ident = l2cap_br_get_ident();
+		hdr->len = sys_cpu_to_le16(sizeof(*req));
+
+		req = net_buf_add(buf, sizeof(*req));
+		req->psm = sys_cpu_to_le16(BR_CHAN(chan)->psm);
+		req->scid = sys_cpu_to_le16(BR_CHAN(chan)->rx.cid);
+
+		/* Set the ident for the signaling request */
+		BR_CHAN(chan)->ident = hdr->ident;
+
+		l2cap_br_chan_send_req(BR_CHAN(chan), buf, L2CAP_BR_CONN_TIMEOUT);
+	}
+}
+
+void l2cap_br_encrypt_change(struct bt_conn *conn, uint8_t hci_status)
+{
+	struct bt_l2cap_chan *chan;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&conn->channels, chan, node) {
+		l2cap_br_conn_pend(chan, hci_status);
 
-		data.scid = req->scid;
-		data.dcid = req->dcid;
-		l2cap_br_send_reject(conn, ident, BT_L2CAP_REJ_INVALID_CID,
-				     &data, sizeof(data));
-		return;
+		if (chan->ops && chan->ops->encrypt_change) {
+			chan->ops->encrypt_change(chan, hci_status);
+		}
 	}
+}
 
-	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+static void check_fixed_channel(struct bt_l2cap_chan *chan)
+{
+	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
 
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_DISCONN_RSP;
-	hdr->ident = ident;
-	hdr->len = sys_cpu_to_le16(sizeof(*rsp));
+	if (br_chan->rx.cid < L2CAP_BR_CID_DYN_START) {
+		connect_fixed_channel(br_chan);
+	}
+}
 
-	rsp = net_buf_add(buf, sizeof(*rsp));
-	rsp->dcid = sys_cpu_to_le16(chan->rx.cid);
-	rsp->scid = sys_cpu_to_le16(chan->tx.cid);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static bool bt_l2cap_br_check_tx_seq_out_of_sequence(struct bt_l2cap_br_chan *br_chan,
+						     uint16_t tx_seq)
+{
+	uint16_t outstanding_frames;
+	uint16_t tx_frames;
+
+	outstanding_frames =
+		(br_chan->buffer_seq + br_chan->rx.max_window) - br_chan->expected_tx_seq;
+	tx_frames = (uint16_t)(tx_seq - br_chan->expected_tx_seq);
+
+	if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->tx.extended_control) {
+			outstanding_frames = outstanding_frames % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+			tx_frames = tx_frames % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+		} else {
+			outstanding_frames = outstanding_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+			tx_frames = tx_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+		}
+	} else if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		   (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+		outstanding_frames = outstanding_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+		tx_frames = tx_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+	}
 
-	bt_l2cap_br_chan_del(&chan->chan);
+	if (tx_frames && (tx_frames < outstanding_frames)) {
+		return true;
+	}
 
-	l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
+	return false;
 }
 
-static void l2cap_br_connected(struct bt_l2cap_chan *chan)
+static bool bt_l2cap_br_check_tx_seq_duplicated(struct bt_l2cap_br_chan *br_chan, uint16_t tx_seq)
 {
-	LOG_DBG("ch %p cid 0x%04x", BR_CHAN(chan), BR_CHAN(chan)->rx.cid);
+	uint16_t outstanding_frames;
+	uint16_t tx_frames;
+
+	outstanding_frames = (uint16_t)(br_chan->expected_tx_seq - br_chan->buffer_seq - 1);
+	tx_frames = (uint16_t)(tx_seq - br_chan->buffer_seq);
+
+	if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->tx.extended_control) {
+			outstanding_frames = outstanding_frames % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+			tx_frames = tx_frames % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+		} else {
+			outstanding_frames = outstanding_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+			tx_frames = tx_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+		}
+	} else if ((br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		   (br_chan->tx.mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+		outstanding_frames = outstanding_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+		tx_frames = tx_frames % BT_L2CAP_CONTROL_SEQ_MAX;
+	}
+
+	if (tx_frames <= outstanding_frames) {
+		return true;
+	}
+
+	return false;
 }
 
-static void l2cap_br_disconnected(struct bt_l2cap_chan *chan)
+static void bt_l2cap_br_update_srej(struct bt_l2cap_br_chan *br_chan, uint16_t req_seq)
 {
-	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
-
-	LOG_DBG("ch %p cid 0x%04x", br_chan, br_chan->rx.cid);
+	if (bt_l2cap_br_check_req_seq_valid(br_chan, req_seq)) {
+		struct bt_l2cap_br_window *tx_win, *next;
 
-	if (atomic_test_and_clear_bit(br_chan->flags,
-				      L2CAP_FLAG_SIG_INFO_PENDING)) {
-		/* Cancel RTX work on signal channel.
-		 * Disconnected callback is always called from system workqueue
-		 * so this should always succeed.
+		SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&br_chan->_pdu_outstanding, tx_win, next, node) {
+			if (tx_win->tx_seq == req_seq) {
+				tx_win->srej = true;
+				break;
+			}
+		}
+	} else {
+		LOG_WRN("Invalid req seq %d received on %p", req_seq, br_chan);
+		/* The L2CAP entity shall close the channel as a consequence
+		 * of an ReqSeq Sequence error.
 		 */
-		(void)k_work_cancel_delayable(&br_chan->rtx_work);
+		bt_l2cap_br_chan_disconnect(&br_chan->chan);
+	}
+	/* Append channel to list if it still has data */
+	if (chan_has_data(br_chan)) {
+		LOG_DBG("chan %p ready", br_chan);
+		raise_data_ready(br_chan);
 	}
 }
 
-int bt_l2cap_br_chan_disconnect(struct bt_l2cap_chan *chan)
+static void bt_l2cap_br_update_r(struct bt_l2cap_br_chan *br_chan, uint8_t r)
 {
-	struct bt_conn *conn = chan->conn;
-	struct net_buf *buf;
-	struct bt_l2cap_disconn_req *req;
-	struct bt_l2cap_sig_hdr *hdr;
-	struct bt_l2cap_br_chan *br_chan;
+	int err;
 
-	if (!conn) {
-		return -ENOTCONN;
+	if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_RET) {
+		LOG_DBG("Only Support retransmission mode");
+		return;
 	}
 
-	br_chan = BR_CHAN(chan);
+	if (!r) {
+		if (!atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R)) {
+			/* R bit without any change */
+			return;
+		}
 
-	if (br_chan->state == BT_L2CAP_DISCONNECTING) {
-		return -EALREADY;
-	}
+		/* R bit is changed from 1 -> 0 */
+		atomic_set_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R_CHANGED);
+		if (bt_l2cap_br_get_outstanding_count(br_chan)) {
+			/* If any unacknowledged I-frames have been sent then RetransmissionTimer
+			 * shall be restarted.
+			 */
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_RET, true);
+		} else {
+			/* If the RetransmissionTimer is not running and the MonitorTimer is
+			 * not running, then start the MonitorTimer.
+			 */
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, false);
+		}
+	} else {
+		if (atomic_test_and_set_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R)) {
+			/* R bit without any change */
+			return;
+		}
 
-	LOG_DBG("chan %p scid 0x%04x dcid 0x%04x", chan, br_chan->rx.cid, br_chan->tx.cid);
+		/* R bit is changed from 0 -> 1 */
+		atomic_set_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_R_CHANGED);
+		l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, false);
+	}
 
-	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+	err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+	if (err) {
+		LOG_ERR("Fail to send frame %d on %p", err, br_chan);
+		bt_l2cap_chan_disconnect(&br_chan->chan);
+	}
+}
 
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_DISCONN_REQ;
-	hdr->ident = l2cap_br_get_ident();
-	hdr->len = sys_cpu_to_le16(sizeof(*req));
+static int bt_l2cap_br_update_f(struct bt_l2cap_br_chan *br_chan, uint8_t f)
+{
+	if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM) {
+		/* Ignore f bit if the mode is streaming. */
+		return 0;
+	}
 
-	req = net_buf_add(buf, sizeof(*req));
-	req->dcid = sys_cpu_to_le16(br_chan->tx.cid);
-	req->scid = sys_cpu_to_le16(br_chan->rx.cid);
+	if (f) {
+		if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P_CHANGED)) {
+			if (!atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+				LOG_WRN("Unexpected F flag set on %p", br_chan);
+				return -EINVAL;
+			}
 
-	l2cap_br_chan_send_req(br_chan, buf, L2CAP_BR_DISCONN_TIMEOUT);
-	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_DISCONNECTING);
+			if (bt_l2cap_br_get_outstanding_count(br_chan)) {
+				/* If any unacknowledged I-frames have been sent then
+				 * RetransmissionTimer shall be restarted.
+				 */
+				l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_RET, true);
+			} else {
+				/* If the RetransmissionTimer is not running and the MonitorTimer
+				 * is not running, then start the MonitorTimer.
+				 */
+				l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, false);
+			}
+		}
+		/* Append channel to list if it still has data */
+		if (chan_has_data(br_chan)) {
+			LOG_DBG("chan %p ready", br_chan);
+			raise_data_ready(br_chan);
+		}
+	}
 
 	return 0;
 }
 
-static void l2cap_br_disconn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
-				 struct net_buf *buf)
+static void bt_l2cap_br_ret_fc_s_recv(struct bt_l2cap_br_chan *br_chan, struct net_buf *buf)
 {
-	struct bt_conn *conn = l2cap->chan.chan.conn;
-	struct bt_l2cap_br_chan *chan;
-	struct bt_l2cap_disconn_rsp *rsp = (void *)buf->data;
-	uint16_t dcid, scid;
+	uint16_t control;
+	uint32_t ext_control;
+	uint16_t req_seq;
+	uint8_t r = 0;
+	uint8_t s;
+	uint8_t f = 0;
+	uint8_t p = 0;
+	bool remote_busy = false;
+	int err;
 
-	if (buf->len < sizeof(*rsp)) {
-		LOG_ERR("Too small disconn rsp packet size");
+	if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM) {
+		/* Ignore S-frame if the mode is streaming. */
 		return;
 	}
 
-	dcid = sys_le16_to_cpu(rsp->dcid);
-	scid = sys_le16_to_cpu(rsp->scid);
+	if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->rx.extended_control) {
+			ext_control = net_buf_pull_le32(buf);
+			req_seq = BT_L2CAP_S_FRAME_EXT_CONTROL_GET_REQ_SEQ(ext_control);
+			f = BT_L2CAP_S_FRAME_EXT_CONTROL_GET_F(ext_control);
+			s = BT_L2CAP_S_FRAME_EXT_CONTROL_GET_S(ext_control);
+			p = BT_L2CAP_S_FRAME_EXT_CONTROL_GET_P(ext_control);
+		} else {
+			control = net_buf_pull_le16(buf);
+			req_seq = BT_L2CAP_S_FRAME_ENH_CONTROL_GET_REQ_SEQ(control);
+			f = BT_L2CAP_S_FRAME_ENH_CONTROL_GET_F(control);
+			s = BT_L2CAP_S_FRAME_ENH_CONTROL_GET_S(control);
+			p = BT_L2CAP_S_FRAME_ENH_CONTROL_GET_P(control);
+		}
 
-	LOG_DBG("dcid 0x%04x scid 0x%04x", dcid, scid);
+		err = bt_l2cap_br_update_f(br_chan, f);
+		if (err) {
+			/* Discard the S-frame with invalid f bit */
+			return;
+		}
+	} else {
+		control = net_buf_pull_le16(buf);
+		req_seq = BT_L2CAP_S_FRAME_STD_CONTROL_GET_REQ_SEQ(control);
+		s = BT_L2CAP_S_FRAME_STD_CONTROL_GET_S(control);
+		r = BT_L2CAP_S_FRAME_STD_CONTROL_GET_R(control);
 
-	chan = l2cap_br_remove_tx_cid(conn, dcid);
-	if (!chan) {
-		LOG_WRN("No dcid 0x%04x channel found", dcid);
-		return;
+		bt_l2cap_br_update_r(br_chan, r);
 	}
 
-	bt_l2cap_br_chan_del(&chan->chan);
-}
+	switch (s) {
+	case BT_L2CAP_CONTROL_S_RR:
+		if (p) {
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_P);
+		} else {
+			if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ)) {
+				atomic_set_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME);
+			} else if (f) {
+				atomic_set_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME);
+			}
+		}
 
-int bt_l2cap_br_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
-			     uint16_t psm)
-{
-	struct net_buf *buf;
-	struct bt_l2cap_sig_hdr *hdr;
-	struct bt_l2cap_conn_req *req;
-	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
+		bt_l2cap_br_update_req_seq(br_chan, req_seq, false);
+		remote_busy = atomic_test_bit(br_chan->flags, L2CAP_FLAG_REMOTE_BUSY);
+		atomic_clear_bit(br_chan->flags, L2CAP_FLAG_REMOTE_BUSY);
 
-	if (!psm) {
-		return -EINVAL;
-	}
+		if (f && !atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_REJ_ACTIONED)) {
+			/* Retransmit I-frames */
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME);
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_REQ_SEQ_UPDATED);
+		}
 
-	if (br_chan->psm) {
-		return -EEXIST;
-	}
+		if (p) {
+			/* Send IorRRorRNR(F=1) */
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME);
+			err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+			if (err) {
+				bt_l2cap_br_chan_disconnect(&br_chan->chan);
+			}
 
-	/* PSM must be odd and lsb of upper byte must be 0 */
-	if ((psm & 0x0101) != 0x0001) {
-		return -EINVAL;
-	}
+			if (remote_busy && bt_l2cap_br_get_outstanding_count(br_chan)) {
+				/* Start-RetransTimer */
+				l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_RET, true);
+			}
+		}
+		break;
+	case BT_L2CAP_CONTROL_S_REJ:
+		if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_FC) {
+			/* Unsupported */
+			LOG_DBG("Ignore REJ frame");
+			break;
+		}
 
-	if (br_chan->required_sec_level > BT_SECURITY_L4) {
-		return -EINVAL;
-	} else if (br_chan->required_sec_level == BT_SECURITY_L0 &&
-		   psm != L2CAP_BR_PSM_SDP) {
-		br_chan->required_sec_level = BT_SECURITY_L1;
-	}
+		atomic_clear_bit(br_chan->flags, L2CAP_FLAG_REMOTE_BUSY);
+		atomic_set_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME);
 
-	switch (br_chan->state) {
-	case BT_L2CAP_CONNECTED:
-		/* Already connected */
-		return -EISCONN;
-	case BT_L2CAP_DISCONNECTED:
-		/* Can connect */
-		break;
-	case BT_L2CAP_CONFIG:
-	case BT_L2CAP_DISCONNECTING:
-	default:
-		/* Bad context */
-		return -EBUSY;
-	}
+		if (!f && atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_REJ_ACTIONED);
+		}
 
-	if (!l2cap_br_chan_add(conn, chan, l2cap_br_chan_destroy)) {
-		return -ENOMEM;
-	}
+		if (!f && atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ)) {
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME);
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_REQ_SEQ_UPDATED);
+		}
 
-	br_chan->psm = psm;
-	bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONNECTING);
-	atomic_set_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING);
+		if (f && !atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_REJ_ACTIONED)) {
+			/* Retransmit I-frames */
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME);
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_REQ_SEQ_UPDATED);
+		}
 
-	switch (l2cap_br_conn_security(chan, psm)) {
-	case L2CAP_CONN_SECURITY_PENDING:
-		/*
-		 * Authentication was triggered, wait with sending request on
-		 * connection security changed callback context.
+		bt_l2cap_br_update_req_seq(br_chan, req_seq, true);
+		/* Do not change br_chan->next_tx_seq to req_seq. Because the
+		 * TxSeq are saved in tx_win.
 		 */
-		 return 0;
-	case L2CAP_CONN_SECURITY_PASSED:
 		break;
-	case L2CAP_CONN_SECURITY_REJECT:
-	default:
-		l2cap_br_chan_cleanup(chan);
-		return -EIO;
-	}
+	case BT_L2CAP_CONTROL_S_RNR:
+		if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_ERET) {
+			break;
+		}
 
-	buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+		LOG_WRN("RNR p=%d f=%d on chan %p", p, f, br_chan);
+		if (p) {
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_P);
+		}
 
-	hdr = net_buf_add(buf, sizeof(*hdr));
-	hdr->code = BT_L2CAP_CONN_REQ;
-	hdr->ident = l2cap_br_get_ident();
-	hdr->len = sys_cpu_to_le16(sizeof(*req));
+		atomic_set_bit(br_chan->flags, L2CAP_FLAG_REMOTE_BUSY);
+		bt_l2cap_br_update_req_seq(br_chan, req_seq, false);
 
-	req = net_buf_add(buf, sizeof(*req));
-	req->psm = sys_cpu_to_le16(psm);
-	req->scid = sys_cpu_to_le16(BR_CHAN(chan)->rx.cid);
+		if (!p) {
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, true);
+		}
 
-	l2cap_br_chan_send_req(BR_CHAN(chan), buf, L2CAP_BR_CONN_TIMEOUT);
+		if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ)) {
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, true);
+			atomic_clear_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME);
+		}
 
-	return 0;
-}
+		if (p || atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ)) {
+			/* Send RRorRNR (F=1) or Send RR (F=0) */
+			err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+			if (err) {
+				bt_l2cap_br_chan_disconnect(&br_chan->chan);
+			}
+		}
+		break;
+	case BT_L2CAP_CONTROL_S_SREJ:
+		if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_ERET) {
+			break;
+		}
 
-static void l2cap_br_conn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
-			      struct net_buf *buf)
-{
-	struct bt_conn *conn = l2cap->chan.chan.conn;
-	struct bt_l2cap_chan *chan;
-	struct bt_l2cap_conn_rsp *rsp = (void *)buf->data;
-	uint16_t dcid, scid, result, status;
-	struct bt_l2cap_br_chan *br_chan;
+		bt_l2cap_br_update_srej(br_chan, req_seq);
 
-	if (buf->len < sizeof(*rsp)) {
-		LOG_ERR("Too small L2CAP conn rsp packet size");
-		return;
-	}
+		if (p) {
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RECV_FRAME_P);
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME);
+		}
 
-	dcid = sys_le16_to_cpu(rsp->dcid);
-	scid = sys_le16_to_cpu(rsp->scid);
-	result = sys_le16_to_cpu(rsp->result);
-	status = sys_le16_to_cpu(rsp->status);
+		atomic_clear_bit(br_chan->flags, L2CAP_FLAG_REMOTE_BUSY);
 
-	LOG_DBG("dcid 0x%04x scid 0x%04x result %u status %u", dcid, scid, result, status);
+		if (f) {
+			if (atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_SREJ_ACTIONED) &&
+			    (br_chan->srej_save_req_seq == req_seq)) {
+				/* Clear flag L2CAP_FLAG_SREJ_ACTIONED */
+			} else {
+				/* Retransmit-Requested-I-frame */
+				atomic_set_bit(br_chan->flags, L2CAP_FLAG_RET_REQ_I_FRAME);
+			}
+		} else {
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RET_REQ_I_FRAME);
+			if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+				atomic_set_bit(br_chan->flags, L2CAP_FLAG_SREJ_ACTIONED);
+				br_chan->srej_save_req_seq = req_seq;
+			}
+		}
 
-	chan = bt_l2cap_br_lookup_rx_cid(conn, scid);
-	if (!chan) {
-		LOG_ERR("No scid 0x%04x channel found", scid);
-		return;
+		if (p) {
+			bt_l2cap_br_update_req_seq(br_chan, req_seq, false);
+		}
+		break;
 	}
+}
 
-	br_chan = BR_CHAN(chan);
-
-	/* Release RTX work since got the response */
-	k_work_cancel_delayable(&br_chan->rtx_work);
-
-	if (br_chan->state != BT_L2CAP_CONNECTING) {
-		LOG_DBG("Invalid channel %p state %s", chan,
-			bt_l2cap_chan_state_str(br_chan->state));
-		return;
-	}
+#if defined(CONFIG_BT_L2CAP_SEG_RECV)
+static void bt_l2cap_br_recv_seg_direct(struct bt_l2cap_br_chan *br_chan, struct net_buf *seg,
+					uint8_t sar)
+{
+	uint16_t seg_offset = 0;
+	uint16_t sdu_remaining = 0;
+
+	switch (sar) {
+	case BT_L2CAP_CONTROL_SAR_UNSEG:
+		__fallthrough;
+	case BT_L2CAP_CONTROL_SAR_START:
+		if (sar == BT_L2CAP_CONTROL_SAR_START) {
+			br_chan->_sdu_len = net_buf_pull_le16(seg);
+		} else {
+			br_chan->_sdu_len = seg->len;
+		}
+		br_chan->_sdu_len_done = 0;
 
-	switch (result) {
-	case BT_L2CAP_BR_SUCCESS:
-		br_chan->ident = 0U;
-		BR_CHAN(chan)->tx.cid = dcid;
-		l2cap_br_conf(chan);
-		bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONFIG);
-		atomic_clear_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_PENDING);
-		break;
-	case BT_L2CAP_BR_PENDING:
-		k_work_reschedule(&br_chan->rtx_work, L2CAP_BR_CONN_TIMEOUT);
+		if (br_chan->_sdu_len > br_chan->rx.mtu) {
+			LOG_WRN("SDU exceeds MTU");
+			bt_l2cap_chan_disconnect(&br_chan->chan);
+			return;
+		}
 		break;
-	default:
-		l2cap_br_chan_cleanup(chan);
+	case BT_L2CAP_CONTROL_SAR_END:
+		__fallthrough;
+	case BT_L2CAP_CONTROL_SAR_CONTI:
+		seg_offset = br_chan->_sdu_len_done;
+		sdu_remaining = br_chan->_sdu_len - br_chan->_sdu_len_done;
+
+		br_chan->_sdu_len_done += seg->len;
+
+		if (sar == BT_L2CAP_CONTROL_SAR_END) {
+			if (br_chan->_sdu_len_done < br_chan->_sdu_len) {
+				br_chan->_sdu_len = 0;
+				br_chan->_sdu_len_done = 0;
+				LOG_WRN("Short data packet %u < %u", br_chan->_sdu_len_done,
+					br_chan->_sdu_len);
+				bt_l2cap_chan_disconnect(&br_chan->chan);
+				return;
+			}
+		}
 		break;
 	}
+
+	if (sdu_remaining < seg->len) {
+		br_chan->_sdu_len = 0;
+		br_chan->_sdu_len_done = 0;
+		LOG_WRN("L2CAP RX PDU total exceeds SDU");
+		bt_l2cap_chan_disconnect(&br_chan->chan);
+		return;
+	}
+
+	/* Tail call. */
+	br_chan->chan.ops->seg_recv(&br_chan->chan, br_chan->_sdu_len, seg_offset, &seg->b);
 }
+#endif /* CONFIG_BT_L2CAP_SEG_RECV */
 
-int bt_l2cap_br_chan_send_cb(struct bt_l2cap_chan *chan, struct net_buf *buf, bt_conn_tx_cb_t cb,
-			     void *user_data)
+static struct net_buf *l2cap_br_alloc_frag(k_timeout_t timeout, void *user_data)
 {
-	struct bt_l2cap_br_chan *br_chan;
+	struct bt_l2cap_br_chan *chan = user_data;
+	struct net_buf *frag = NULL;
 
-	if (!buf || !chan) {
-		return -EINVAL;
+	frag = chan->chan.ops->alloc_buf(&chan->chan);
+	if (!frag) {
+		return NULL;
 	}
 
-	br_chan = BR_CHAN(chan);
+	LOG_DBG("frag %p tailroom %zu", frag, net_buf_tailroom(frag));
 
-	LOG_DBG("chan %p buf %p len %zu", chan, buf, net_buf_frags_len(buf));
+	return frag;
+}
 
-	if (!chan->conn || chan->conn->state != BT_CONN_CONNECTED) {
-		return -ENOTCONN;
+static int bt_l2cap_br_recv_seg(struct bt_l2cap_br_chan *br_chan, struct net_buf *seg, uint8_t sar)
+{
+	uint16_t len;
+	struct net_buf *buf;
+
+	LOG_DBG("seg on chan %p with len %zu", br_chan, seg->len);
+
+	if ((sar == BT_L2CAP_CONTROL_SAR_UNSEG) || (sar == BT_L2CAP_CONTROL_SAR_START)) {
+		if (br_chan->_sdu) {
+			LOG_ERR("Last SDU is not done");
+			net_buf_unref(br_chan->_sdu);
+			br_chan->_sdu = NULL;
+			bt_l2cap_chan_disconnect(&br_chan->chan);
+			return -ESHUTDOWN;
+		}
+
+		br_chan->_sdu = br_chan->chan.ops->alloc_buf(&br_chan->chan);
+		if (!br_chan->_sdu) {
+			LOG_WRN("Unable to allocate buffer for SDU");
+			return -ENOBUFS;
+		}
+
+		if (sar == BT_L2CAP_CONTROL_SAR_UNSEG) {
+			br_chan->_sdu_len = seg->len;
+		} else {
+			br_chan->_sdu_len = net_buf_pull_le16(seg);
+		}
 	}
 
-	if (atomic_test_bit(chan->status, BT_L2CAP_STATUS_SHUTDOWN)) {
+	if (!br_chan->_sdu) {
+		LOG_ERR("Insufficient memory for SDU");
+		if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_FC) ||
+		    (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+			return -ENOBUFS;
+		}
+		bt_l2cap_chan_disconnect(&br_chan->chan);
 		return -ESHUTDOWN;
 	}
 
-	if (buf->len > br_chan->tx.mtu) {
-		return -EMSGSIZE;
+	if ((br_chan->_sdu->len + seg->len) > br_chan->_sdu_len) {
+		LOG_ERR("SDU length mismatch");
+		net_buf_unref(br_chan->_sdu);
+		br_chan->_sdu = NULL;
+		bt_l2cap_chan_disconnect(&br_chan->chan);
+		return -ESHUTDOWN;
 	}
 
-	return bt_l2cap_br_send_cb(br_chan->chan.conn, br_chan->tx.cid, buf, cb, user_data);
-}
+	/* Append received segment to SDU */
+	len = net_buf_append_bytes(br_chan->_sdu, seg->len, seg->data, K_NO_WAIT,
+				   l2cap_br_alloc_frag, br_chan);
+	if (len != seg->len) {
+		LOG_ERR("Unable to store SDU");
+		net_buf_unref(br_chan->_sdu);
+		br_chan->_sdu = NULL;
+		bt_l2cap_chan_disconnect(&br_chan->chan);
+		return -ESHUTDOWN;
+	}
 
-int bt_l2cap_br_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf)
-{
-	return bt_l2cap_br_chan_send_cb(chan, buf, NULL, NULL);
-}
+	LOG_DBG("chan %p len %zu / %zu", br_chan, br_chan->_sdu->len, br_chan->_sdu_len);
 
-static void l2cap_br_sig_handle(struct bt_l2cap_br *l2cap, struct bt_l2cap_sig_hdr *hdr,
-				      struct net_buf *buf)
-{
-	uint16_t len;
-	struct net_buf_simple_state state;
+	if ((sar == BT_L2CAP_CONTROL_SAR_UNSEG) || (sar == BT_L2CAP_CONTROL_SAR_END)) {
+		if (br_chan->_sdu->len < br_chan->_sdu_len) {
+			LOG_ERR("SDU length mismatch");
+			net_buf_unref(br_chan->_sdu);
+			br_chan->_sdu = NULL;
+			bt_l2cap_chan_disconnect(&br_chan->chan);
+			return -ESHUTDOWN;
+		}
 
-	len = sys_le16_to_cpu(hdr->len);
+		buf = br_chan->_sdu;
+		br_chan->_sdu = NULL;
+		br_chan->_sdu_len = 0;
 
-	net_buf_simple_save(&buf->b, &state);
+		/* Receiving complete SDU, notify channel and reset SDU buf */
+		int err;
 
-	switch (hdr->code) {
-	case BT_L2CAP_INFO_RSP:
-		l2cap_br_info_rsp(l2cap, hdr->ident, buf);
-		break;
-	case BT_L2CAP_INFO_REQ:
-		l2cap_br_info_req(l2cap, hdr->ident, buf);
-		break;
-	case BT_L2CAP_DISCONN_REQ:
-		l2cap_br_disconn_req(l2cap, hdr->ident, buf);
-		break;
-	case BT_L2CAP_CONN_REQ:
-		l2cap_br_conn_req(l2cap, hdr->ident, buf);
-		break;
-	case BT_L2CAP_CONF_RSP:
-		l2cap_br_conf_rsp(l2cap, hdr->ident, len, buf);
-		break;
-	case BT_L2CAP_CONF_REQ:
-		l2cap_br_conf_req(l2cap, hdr->ident, len, buf);
-		break;
-	case BT_L2CAP_DISCONN_RSP:
-		l2cap_br_disconn_rsp(l2cap, hdr->ident, buf);
-		break;
-	case BT_L2CAP_CONN_RSP:
-		l2cap_br_conn_rsp(l2cap, hdr->ident, buf);
-		break;
-	default:
-		LOG_WRN("Unknown/Unsupported L2CAP PDU code 0x%02x", hdr->code);
-		l2cap_br_send_reject(l2cap->chan.chan.conn, hdr->ident,
-					BT_L2CAP_REJ_NOT_UNDERSTOOD, NULL, 0);
-		break;
+		err = br_chan->chan.ops->recv(&br_chan->chan, buf);
+		if (err < 0) {
+			if (err != -EINPROGRESS) {
+				LOG_ERR("err %d", err);
+				bt_l2cap_chan_disconnect(&br_chan->chan);
+				net_buf_unref(buf);
+				return -ESHUTDOWN;
+			}
+			/* If the buf in progress, it will be freed by upper layer. */
+			return err;
+		}
+
+		net_buf_unref(buf);
 	}
 
-	net_buf_simple_restore(&buf->b, &state);
-	(void)net_buf_pull_mem(buf, len);
+	return 0;
 }
 
-static int l2cap_br_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
+static void bt_l2cap_br_update_expected_tx_seq(struct bt_l2cap_br_chan *br_chan, uint16_t seq)
 {
-	struct bt_l2cap_br *l2cap = CONTAINER_OF(chan, struct bt_l2cap_br, chan.chan);
-	struct bt_l2cap_sig_hdr *hdr;
-	uint16_t len;
+	enum l2cap_br_timer_type type;
 
-	while (buf->len > 0) {
-		if (buf->len < sizeof(*hdr)) {
-			LOG_ERR("Too small L2CAP signaling PDU");
-			return 0;
+	if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM) {
+		/* Ignore expected_tx_seq if the mode is streaming. */
+		return;
+	}
+
+	if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->rx.extended_control) {
+			seq = seq % BT_L2CAP_EXT_CONTROL_SEQ_MAX;
+		} else {
+			seq = seq % BT_L2CAP_CONTROL_SEQ_MAX;
 		}
+	} else if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		   (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_FC)) {
+		seq = seq % BT_L2CAP_CONTROL_SEQ_MAX;
+	}
 
-		hdr = net_buf_pull_mem(buf, sizeof(*hdr));
-		len = sys_le16_to_cpu(hdr->len);
+	/* Restart monitor timer if it is active */
+	if (atomic_test_bit(br_chan->flags, L2CAP_FLAG_RET_TIMER)) {
+		type = BT_L2CAP_BR_TIMER_RET;
+	} else {
+		type = BT_L2CAP_BR_TIMER_MONITOR;
+	}
+	l2cap_br_start_timer(br_chan, type, true);
 
-		LOG_DBG("Signaling code 0x%02x ident %u len %u", hdr->code, hdr->ident, len);
+	/* Currently, buffer seq is unsupported. */
+	br_chan->buffer_seq = br_chan->expected_tx_seq;
 
-		if (buf->len < len) {
-			LOG_ERR("L2CAP length is short (%u < %u)", buf->len, len);
-			return 0;
-		}
+	br_chan->expected_tx_seq = seq;
 
-		if (!hdr->ident) {
-			LOG_ERR("Invalid ident value in L2CAP PDU");
-			(void)net_buf_pull_mem(buf, len);
-			continue;
+	if (chan_has_data(br_chan)) {
+		LOG_DBG("chan %p ready", br_chan);
+		raise_data_ready(br_chan);
+	} else {
+		/* Send S-Frame if there is not any pending I-frame */
+		int err;
+
+		err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+		if (err) {
+			LOG_ERR("Fail to send frame %d on %p", err, br_chan);
+			bt_l2cap_chan_disconnect(&br_chan->chan);
 		}
+	}
+}
 
-		l2cap_br_sig_handle(l2cap, hdr, buf);
+static void bt_l2cap_br_rej_exception(struct bt_l2cap_br_chan *br_chan)
+{
+	int err;
+
+	if (atomic_test_and_set_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ)) {
+		return;
 	}
 
-	return 0;
+	LOG_DBG("Set REJ Exception received flag");
+	atomic_set_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ_CHANGED);
+	err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+	if (err) {
+		LOG_ERR("Fail to send frame %d on %p", err, br_chan);
+		bt_l2cap_chan_disconnect(&br_chan->chan);
+	}
 }
 
-static void l2cap_br_conn_pend(struct bt_l2cap_chan *chan, uint8_t status)
+static void bt_l2cap_br_ret_fc_i_recv(struct bt_l2cap_br_chan *br_chan, struct net_buf *buf)
 {
-	struct net_buf *buf;
-	struct bt_l2cap_sig_hdr *hdr;
-	struct bt_l2cap_conn_req *req;
+	uint16_t control;
+	uint32_t ext_control;
+	uint16_t req_seq;
+	uint16_t tx_seq;
+	uint8_t r = 0;
+	uint8_t sar = 0;
+	uint8_t f = 0;
+	bool discard = false;
+	bool expected_tx_seq = false;
+	int err;
 
-	if (BR_CHAN(chan)->state != BT_L2CAP_CONNECTING) {
-		return;
+	if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->rx.extended_control) {
+			ext_control = net_buf_pull_le32(buf);
+			req_seq = BT_L2CAP_I_FRAME_EXT_CONTROL_GET_REQ_SEQ(ext_control);
+			f = BT_L2CAP_I_FRAME_EXT_CONTROL_GET_F(ext_control);
+			sar = BT_L2CAP_I_FRAME_EXT_CONTROL_GET_SAR(ext_control);
+			tx_seq = BT_L2CAP_I_FRAME_EXT_CONTROL_GET_TX_SEQ(ext_control);
+		} else {
+			control = net_buf_pull_le16(buf);
+			req_seq = BT_L2CAP_I_FRAME_ENH_CONTROL_GET_REQ_SEQ(control);
+			f = BT_L2CAP_I_FRAME_ENH_CONTROL_GET_F(control);
+			sar = BT_L2CAP_I_FRAME_ENH_CONTROL_GET_SAR(control);
+			tx_seq = BT_L2CAP_I_FRAME_ENH_CONTROL_GET_TX_SEQ(control);
+		}
+
+		err = bt_l2cap_br_update_f(br_chan, f);
+		if (err) {
+			/* Invalid F bit. Ignore the I-frame. */
+			return;
+		}
+	} else {
+		control = net_buf_pull_le16(buf);
+		req_seq = BT_L2CAP_I_FRAME_STD_CONTROL_GET_REQ_SEQ(control);
+		sar = BT_L2CAP_I_FRAME_STD_CONTROL_GET_SAR(control);
+		r = BT_L2CAP_I_FRAME_STD_CONTROL_GET_R(control);
+		tx_seq = BT_L2CAP_I_FRAME_STD_CONTROL_GET_TX_SEQ(control);
+		bt_l2cap_br_update_r(br_chan, r);
 	}
 
-	LOG_DBG("chan %p status 0x%02x encr 0x%02x", chan, status, chan->conn->encrypt);
+	if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM) {
+		bt_l2cap_br_update_expected_tx_seq(br_chan, tx_seq + 1);
+		/* Missing report */
+		goto valid_frame;
+	}
 
-	if (status) {
-		/*
-		 * Security procedure status is non-zero so respond with
-		 * security violation only as channel acceptor.
-		 */
-		l2cap_br_conn_req_reply(chan, BT_L2CAP_BR_ERR_SEC_BLOCK);
+	/* The first valid I-frame received after an REJ was sent, with a TxSeq of the
+	 * received I-frame equal to ReqSeq of the REJ, shall clear the REJ Exception
+	 * condition.
+	 */
+	if (br_chan->req_seq == tx_seq) {
+		LOG_DBG("Seq %zu equals to req_seq, clears the REJ exception", tx_seq);
+		atomic_clear_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_REJ);
+	}
 
-		/* Release channel allocated to outgoing connection request */
-		if (atomic_test_bit(BR_CHAN(chan)->flags,
-				    L2CAP_FLAG_CONN_PENDING)) {
-			l2cap_br_chan_cleanup(chan);
+	if (br_chan->expected_tx_seq == tx_seq) {
+		/* Valid TX seq received */
+		LOG_DBG("Valid information received seq %zu", tx_seq);
+		expected_tx_seq = true;
+	} else {
+		if (bt_l2cap_br_check_tx_seq_duplicated(br_chan, tx_seq)) {
+			/*
+			 * The Information field shall be discarded since it has already been
+			 * received.
+			 */
+			discard = true;
+			LOG_DBG("Duplicated Information received %zu", tx_seq);
+		} else if (bt_l2cap_br_check_tx_seq_out_of_sequence(br_chan, tx_seq)) {
+			/* The missing I-frame(s) are considered lost and ExpectedTXSeq is
+			 * set equal to TxSeq+1.
+			 */
+			LOG_DBG("Missing I-frame detected %zu", tx_seq);
+			if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_FC) {
+				expected_tx_seq = true;
+				/* TODO: Missing report */
+			} else {
+				/* A REJ exception is triggered, and an REJ frame with
+				 * ReqSeq equal to ExpectedTxSeq shall be sent to initiate
+				 * recovery. The received I-frame shall be discarded.
+				 */
+				discard = true;
+				LOG_DBG("Set REJ Exception");
+				bt_l2cap_br_rej_exception(br_chan);
+			}
+		} else {
+			/* An invalid TxSeq value is a value that does not meet either of
+			 * the above conditions and TxSeq is not equal to ExpectedTxSeq.
+			 * An I-frame with an invalid TxSeq is likely to have errors in
+			 * the control field and shall be silently discarded.
+			 */
+			return;
 		}
+	}
 
+	err = bt_l2cap_br_update_req_seq(br_chan, req_seq, false);
+	if (err) {
 		return;
 	}
 
-	if (!chan->conn->encrypt) {
+	if (discard) {
 		return;
 	}
 
-	/*
-	 * For incoming connection state send confirming outstanding
-	 * response and initiate configuration request.
-	 */
-	if (l2cap_br_conn_req_reply(chan, BT_L2CAP_BR_SUCCESS) == 0) {
-		bt_l2cap_br_chan_set_state(chan, BT_L2CAP_CONFIG);
-		/*
-		 * Initialize config request since remote needs to know
-		 * local MTU segmentation.
-		 */
-		l2cap_br_conf(chan);
-	} else if (atomic_test_and_clear_bit(BR_CHAN(chan)->flags,
-					     L2CAP_FLAG_CONN_PENDING)) {
-		buf = bt_l2cap_create_pdu(&br_sig_pool, 0);
+	if (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) {
+		if (f && !atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_REJ_ACTIONED)) {
+			/* Retransmit I-frames and Send-Pending-I-frames */
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_NEW_I_FRAME);
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_RET_I_FRAME);
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_REQ_SEQ_UPDATED);
+		}
+	}
 
-		hdr = net_buf_add(buf, sizeof(*hdr));
-		hdr->code = BT_L2CAP_CONN_REQ;
-		hdr->ident = l2cap_br_get_ident();
-		hdr->len = sys_cpu_to_le16(sizeof(*req));
+valid_frame:
+	switch (sar) {
+	case BT_L2CAP_CONTROL_SAR_UNSEG:
+		__fallthrough;
+	case BT_L2CAP_CONTROL_SAR_START:
+		if (buf->len < 2) {
+			LOG_WRN("Invalid SDU length");
+			bt_l2cap_chan_disconnect(&br_chan->chan);
+			return;
+		}
+		break;
+	case BT_L2CAP_CONTROL_SAR_END:
+		__fallthrough;
+	case BT_L2CAP_CONTROL_SAR_CONTI:
+		break;
+	}
 
-		req = net_buf_add(buf, sizeof(*req));
-		req->psm = sys_cpu_to_le16(BR_CHAN(chan)->psm);
-		req->scid = sys_cpu_to_le16(BR_CHAN(chan)->rx.cid);
+	/* Redirect to experimental API. */
+	IF_ENABLED(CONFIG_BT_L2CAP_SEG_RECV, ({
+		if (br_chan->chan.ops->seg_recv) {
+			bt_l2cap_br_recv_seg_direct(br_chan, buf, sar);
+			goto done;
+		}
+	}))
 
-		l2cap_br_chan_send_req(BR_CHAN(chan), buf,
-				       L2CAP_BR_CONN_TIMEOUT);
+	if (br_chan->chan.ops->alloc_buf) {
+		err = bt_l2cap_br_recv_seg(br_chan, buf, sar);
+		if (err != -ENOBUFS) {
+			goto done;
+		}
+
+		if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_RET) ||
+		    (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET)) {
+			expected_tx_seq = false;
+		}
+
+		if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) &&
+		    (!atomic_test_and_set_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY))) {
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY_CHANGED);
+			err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+			if (err) {
+				LOG_ERR("Fail to send frame %d on %p", err, br_chan);
+				bt_l2cap_chan_disconnect(&br_chan->chan);
+			}
+		}
+		goto done;
+	}
+
+	err = br_chan->chan.ops->recv(&br_chan->chan, buf);
+	if (err < 0) {
+		if (err != -EINPROGRESS) {
+			LOG_ERR("err %d", err);
+			bt_l2cap_chan_disconnect(&br_chan->chan);
+		}
+		goto done;
+	}
+
+done:
+	if (expected_tx_seq) {
+		bt_l2cap_br_update_expected_tx_seq(br_chan, tx_seq + 1);
 	}
 }
 
-void l2cap_br_encrypt_change(struct bt_conn *conn, uint8_t hci_status)
+static bool bt_l2cap_br_check_valid_fcs(struct bt_l2cap_br_chan *br_chan, struct net_buf *buf)
 {
-	struct bt_l2cap_chan *chan;
+	if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		if (br_chan->rx.fcs == BT_L2CAP_BR_FCS_16BIT) {
+			uint16_t lfcs;
+			uint16_t cfcs;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn->channels, chan, node) {
-		l2cap_br_conn_pend(chan, hci_status);
+			lfcs = net_buf_remove_le16(buf);
+			cfcs = crc16_reflect(0xa001, 0, &buf->data[0], buf->len);
 
-		if (chan->ops && chan->ops->encrypt_change) {
-			chan->ops->encrypt_change(chan, hci_status);
+			if (lfcs != cfcs) {
+				return false;
+			}
 		}
 	}
+	return true;
 }
 
-static void check_fixed_channel(struct bt_l2cap_chan *chan)
+static uint16_t bt_l2cap_br_get_required_len(struct bt_l2cap_br_chan *br_chan)
 {
-	struct bt_l2cap_br_chan *br_chan = BR_CHAN(chan);
+	uint16_t len = 0;
 
-	if (br_chan->rx.cid < L2CAP_BR_CID_DYN_START) {
-		connect_fixed_channel(br_chan);
+	if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		if (br_chan->rx.fcs == BT_L2CAP_BR_FCS_16BIT) {
+			len += BT_L2CAP_FCS_SIZE;
+		}
+	}
+
+	if (br_chan->rx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		if (br_chan->rx.extended_control) {
+			len += BT_L2CAP_EXT_CONTROL_SIZE;
+		} else {
+			len += BT_L2CAP_STD_CONTROL_SIZE;
+		}
+	}
+
+	return len;
+}
+
+static void bt_l2cap_br_ret_fc_recv(struct bt_l2cap_br_chan *br_chan, struct net_buf *buf)
+{
+	struct bt_l2cap_hdr *hdr;
+	uint16_t control;
+	uint32_t ext_control;
+	uint8_t type;
+	struct net_buf_simple_state state;
+
+	hdr = (struct bt_l2cap_hdr *)buf->data;
+
+	if (bt_l2cap_br_get_required_len(br_chan) > hdr->len) {
+		LOG_WRN("Invalid Pdu len %u > %u", bt_l2cap_br_get_required_len(br_chan), hdr->len);
+		bt_l2cap_chan_disconnect(&br_chan->chan);
+		return;
+	}
+
+	if (buf->len != (hdr->len + sizeof(*hdr))) {
+		LOG_WRN("Invalid frame %zd != %zd with short packet on%p", buf->len,
+			(hdr->len + sizeof(*hdr)), br_chan);
+		/* Discard the frame */
+		return;
+	}
+
+	if (!bt_l2cap_br_check_valid_fcs(br_chan, buf)) {
+		LOG_WRN("Invalid frame with incorrect FCS on %p", br_chan);
+		/* Discard the frame */
+		return;
+	}
+
+	/* Pull L2CAP Header from received frame */
+	net_buf_pull_mem(buf, sizeof(*hdr));
+
+	if (buf->len > br_chan->rx.mps) {
+		LOG_WRN("PDU size > MPS (%u > %u)", buf->len, br_chan->rx.mps);
+		bt_l2cap_chan_disconnect(&br_chan->chan);
+		return;
+	}
+
+	net_buf_simple_save(&buf->b, &state);
+	if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) ||
+	    (br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_STREAM)) {
+		if (br_chan->rx.extended_control) {
+			ext_control = net_buf_pull_le32(buf);
+			type = (uint8_t)BT_L2CAP_S_FRAME_EXT_CONTROL_GET_TYPE(ext_control);
+		} else {
+			control = net_buf_pull_le16(buf);
+			type = (uint8_t)BT_L2CAP_S_FRAME_ENH_CONTROL_GET_TYPE(control);
+		}
+	} else {
+		control = net_buf_pull_le16(buf);
+		type = (uint8_t)BT_L2CAP_S_FRAME_STD_CONTROL_GET_TYPE(control);
+	}
+	net_buf_simple_restore(&buf->b, &state);
+
+	if (type == BT_L2CAP_CONTROL_TYPE_S) {
+		bt_l2cap_br_ret_fc_s_recv(br_chan, buf);
+	} else {
+		bt_l2cap_br_ret_fc_i_recv(br_chan, buf);
 	}
 }
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 
 void bt_l2cap_br_recv(struct bt_conn *conn, struct net_buf *buf)
 {
@@ -2079,10 +5821,60 @@ void bt_l2cap_br_recv(struct bt_conn *conn, struct net_buf *buf)
 	 */
 	check_fixed_channel(chan);
 
-	chan->ops->recv(chan, buf);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (BR_CHAN(chan)->rx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		/* Add back HDR for FCS check */
+		net_buf_push(buf, sizeof(*hdr));
+		bt_l2cap_br_ret_fc_recv(BR_CHAN(chan), buf);
+	} else {
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+		chan->ops->recv(chan, buf);
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 	net_buf_unref(buf);
 }
 
+int bt_l2cap_br_chan_recv_complete(struct bt_l2cap_chan *chan)
+{
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	struct bt_l2cap_br_chan *br_chan;
+	int err = 0;
+
+	br_chan = BR_CHAN(chan);
+
+	LOG_DBG("Receiving completed on %p", br_chan);
+
+	if ((br_chan->rx.mode == BT_L2CAP_BR_LINK_MODE_ERET) &&
+	    atomic_test_and_clear_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY)) {
+
+		if (!atomic_test_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY_CHANGED) &&
+		    !atomic_test_and_set_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P)) {
+			/* State: XMIT
+			 * Local Busy Clears
+			 * Action: send RR(P=1)
+			 */
+			br_chan->retry_count = 1;
+
+			l2cap_br_start_timer(br_chan, BT_L2CAP_BR_TIMER_MONITOR, true);
+
+			atomic_set_bit(br_chan->flags, L2CAP_FLAG_SEND_FRAME_P_CHANGED);
+			err = l2cap_br_send_s_frame(br_chan, BT_L2CAP_CONTROL_S_RR, K_NO_WAIT);
+			if (err) {
+				LOG_ERR("Fail to send frame %d on %p", err, br_chan);
+				bt_l2cap_chan_disconnect(&br_chan->chan);
+			}
+		} else {
+			atomic_clear_bit(br_chan->flags, L2CAP_FLAG_LOCAL_BUSY_CHANGED);
+		}
+	}
+
+	return err;
+#else
+	return -ENOTSUP;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+}
+
 static int l2cap_br_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)
 {
 	int i;
diff --git a/subsys/bluetooth/host/classic/l2cap_br_interface.h b/subsys/bluetooth/host/classic/l2cap_br_interface.h
index fd64ed80102b6..afabe5d1874d3 100644
--- a/subsys/bluetooth/host/classic/l2cap_br_interface.h
+++ b/subsys/bluetooth/host/classic/l2cap_br_interface.h
@@ -70,3 +70,6 @@ struct bt_l2cap_chan *bt_l2cap_br_lookup_tx_cid(struct bt_conn *conn,
 
 /* Get remote supported fixed channels */
 uint8_t bt_l2cap_br_get_remote_fixed_chan(struct bt_conn *conn);
+
+/* L2CAP data receiving complete. */
+int bt_l2cap_br_chan_recv_complete(struct bt_l2cap_chan *chan);
diff --git a/subsys/bluetooth/host/classic/l2cap_br_internal.h b/subsys/bluetooth/host/classic/l2cap_br_internal.h
index 92a760173ede8..90821a3cb2280 100644
--- a/subsys/bluetooth/host/classic/l2cap_br_internal.h
+++ b/subsys/bluetooth/host/classic/l2cap_br_internal.h
@@ -134,11 +134,6 @@ struct bt_l2cap_conf_opt_qos {
 	uint32_t delay_variation;
 } __packed;
 
-#define BT_L2CAP_RET_FC_MODE_BASIC   0x00
-#define BT_L2CAP_RET_FC_MODE_RET     0x01
-#define BT_L2CAP_RET_FC_MODE_FC      0x02
-#define BT_L2CAP_RET_FC_MODE_ENH_RET 0x03
-#define BT_L2CAP_RET_FC_MODE_STREAM  0x04
 struct bt_l2cap_conf_opt_ret_fc {
 	uint8_t mode;
 	uint8_t tx_windows_size;
@@ -154,6 +149,19 @@ struct bt_l2cap_conf_opt_fcs {
 	uint8_t type;
 } __packed;
 
+struct bt_l2cap_conf_opt_ext_flow_spec {
+	uint8_t identifier;
+	uint8_t service_type;
+	uint16_t sdu;
+	uint32_t sdu_inter_arrival_time;
+	uint32_t access_latency;
+	uint32_t flush_timeout;
+} __packed;
+
+struct bt_l2cap_conf_opt_ext_win_size {
+	uint16_t max_windows_size;
+} __packed;
+
 #define BT_L2CAP_DISCONN_REQ            0x06
 struct bt_l2cap_disconn_req {
 	uint16_t dcid;
@@ -185,6 +193,188 @@ struct bt_l2cap_info_rsp {
 	uint8_t  data[0];
 } __packed;
 
+/* I Frame Standard Control Field Format definition */
+#define BT_L2CAP_I_FRAME_STD_CONTROL_GET_TYPE(control)    ((control) & 0x01)
+#define BT_L2CAP_I_FRAME_STD_CONTROL_GET_TX_SEQ(control)  (((control) >> 0x01) & 0x3f)
+#define BT_L2CAP_I_FRAME_STD_CONTROL_GET_R(control)       (((control) >> 0x07) & 0x01)
+#define BT_L2CAP_I_FRAME_STD_CONTROL_GET_REQ_SEQ(control) (((control) >> 0x08) & 0x3f)
+#define BT_L2CAP_I_FRAME_STD_CONTROL_GET_SAR(control)     (((control) >> 0x0e) & 0x03)
+
+#define BT_L2CAP_I_FRAME_STD_CONTROL_SET(tx_seq, r, req_seq, sar)                                  \
+	((((tx_seq) & 0x3f) << 0x01) | (((r) & 0x01) << 0x07) | (((req_seq) & 0x3f) << 0x08) |     \
+	 (((sar) & 0x03) << 0x0e))
+
+/* I Frame Enhanced Control Field Format definition */
+#define BT_L2CAP_I_FRAME_ENH_CONTROL_GET_TYPE(control)    ((control) & 0x01)
+#define BT_L2CAP_I_FRAME_ENH_CONTROL_GET_TX_SEQ(control)  (((control) >> 0x01) & 0x3f)
+#define BT_L2CAP_I_FRAME_ENH_CONTROL_GET_F(control)       (((control) >> 0x07) & 0x01)
+#define BT_L2CAP_I_FRAME_ENH_CONTROL_GET_REQ_SEQ(control) (((control) >> 0x08) & 0x3f)
+#define BT_L2CAP_I_FRAME_ENH_CONTROL_GET_SAR(control)     (((control) >> 0x0e) & 0x03)
+
+#define BT_L2CAP_I_FRAME_ENH_CONTROL_SET(tx_seq, f, req_seq, sar)                                  \
+	((((tx_seq) & 0x3f) << 0x01) | (((f) & 0x01) << 0x07) | (((req_seq) & 0x3f) << 0x08) |     \
+	 (((sar) & 0x03) << 0x0e))
+
+/* I Frame Extended Control Field Format definition */
+#define BT_L2CAP_I_FRAME_EXT_CONTROL_GET_TYPE(control)    ((control) & 0x01)
+#define BT_L2CAP_I_FRAME_EXT_CONTROL_GET_F(control)       (((control) >> 0x01) & 0x01)
+#define BT_L2CAP_I_FRAME_EXT_CONTROL_GET_REQ_SEQ(control) (((control) >> 0x02) & 0x3fff)
+#define BT_L2CAP_I_FRAME_EXT_CONTROL_GET_SAR(control)     (((control) >> 0x10) & 0x03)
+#define BT_L2CAP_I_FRAME_EXT_CONTROL_GET_TX_SEQ(control)  (((control) >> 0x12) & 0x3fff)
+
+#define BT_L2CAP_I_FRAME_EXT_CONTROL_SET(f, tx_seq, sar, req_seq)                                  \
+	((((f) & 0x01) << 0x01) | (((req_seq) & 0x3fff) << 0x02) | (((sar) & 0x03) << 0x10) |      \
+	 (((tx_seq) & 0x3fff) << 0x12))
+
+/* S Frame Standard Control Field Format definition */
+#define BT_L2CAP_S_FRAME_STD_CONTROL_GET_TYPE(control)    ((control) & 0x01)
+#define BT_L2CAP_S_FRAME_STD_CONTROL_GET_S(control)       (((control) >> 0x02) & 0x03)
+#define BT_L2CAP_S_FRAME_STD_CONTROL_GET_R(control)       (((control) >> 0x07) & 0x01)
+#define BT_L2CAP_S_FRAME_STD_CONTROL_GET_REQ_SEQ(control) (((control) >> 0x08) & 0x3f)
+
+#define BT_L2CAP_S_FRAME_STD_CONTROL_SET(s, r, req_seq)                                            \
+	(((1) & 0x01) | (((s) & 0x03) << 0x02) | (((r) & 0x01) << 0x07) |                          \
+	 (((req_seq) & 0x3f) << 0x08))
+
+/* S Frame Enhanced Control Field Format definition */
+#define BT_L2CAP_S_FRAME_ENH_CONTROL_GET_TYPE(control)    ((control) & 0x01)
+#define BT_L2CAP_S_FRAME_ENH_CONTROL_GET_S(control)       (((control) >> 0x02) & 0x03)
+#define BT_L2CAP_S_FRAME_ENH_CONTROL_GET_P(control)       (((control) >> 0x04) & 0x01)
+#define BT_L2CAP_S_FRAME_ENH_CONTROL_GET_F(control)       (((control) >> 0x07) & 0x01)
+#define BT_L2CAP_S_FRAME_ENH_CONTROL_GET_REQ_SEQ(control) (((control) >> 0x08) & 0x3f)
+
+#define BT_L2CAP_S_FRAME_ENH_CONTROL_SET(s, p, f, req_seq)                                         \
+	(((1) & 0x01) | (((s) & 0x03) << 0x02) | (((p) & 0x01) << 0x04) | (((f) & 0x01) << 0x07) | \
+	 (((req_seq) & 0x3f) << 0x08))
+
+/* S Frame Extended Control Field Format definition */
+#define BT_L2CAP_S_FRAME_EXT_CONTROL_GET_TYPE(control)    ((control) & 0x01)
+#define BT_L2CAP_S_FRAME_EXT_CONTROL_GET_F(control)       (((control) >> 0x01) & 0x01)
+#define BT_L2CAP_S_FRAME_EXT_CONTROL_GET_REQ_SEQ(control) (((control) >> 0x02) & 0x3fff)
+#define BT_L2CAP_S_FRAME_EXT_CONTROL_GET_S(control)       (((control) >> 0x10) & 0x03)
+#define BT_L2CAP_S_FRAME_EXT_CONTROL_GET_P(control)       (((control) >> 0x12) & 0x01)
+
+#define BT_L2CAP_S_FRAME_EXT_CONTROL_SET(f, req_seq, s, p)                                         \
+	(((1) & 0x01) | (((f) & 0x01) << 0x01) | (((req_seq) & 0x3fff) << 0x02) |                  \
+	 (((s) & 0x03) << 0x10) | (((p) & 0x01) << 0x12))
+
+#define BT_L2CAP_CONTROL_TYPE_I 0x00
+#define BT_L2CAP_CONTROL_TYPE_S 0x01
+
+#define BT_L2CAP_CONTROL_SEQ_MAX     0x40
+#define BT_L2CAP_EXT_CONTROL_SEQ_MAX 0x4000
+
+#define BT_L2CAP_CONTROL_SAR_UNSEG 0x00
+#define BT_L2CAP_CONTROL_SAR_START 0x01
+#define BT_L2CAP_CONTROL_SAR_END   0x02
+#define BT_L2CAP_CONTROL_SAR_CONTI 0x03
+
+#define BT_L2CAP_CONTROL_S_RR   0x00
+#define BT_L2CAP_CONTROL_S_REJ  0x01
+#define BT_L2CAP_CONTROL_S_RNR  0x02
+#define BT_L2CAP_CONTROL_S_SREJ 0x03
+
+#define BT_L2CAP_RT_FC_SDU_LEN_SIZE 2
+
+#define BT_L2CAP_STD_CONTROL_SIZE 2
+#define BT_L2CAP_ENH_CONTROL_SIZE 2
+#define BT_L2CAP_EXT_CONTROL_SIZE 4
+
+#define BT_L2CAP_FCS_SIZE 2
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+/**
+ *
+ *  @brief Helper to calculate L2CAP SDU header size.
+ *         Useful for creating buffer pools.
+ *
+ *  @param mtu Required BT_L2CAP_*_SDU.
+ *
+ *  @return Header size of the L2CAP channel.
+ */
+static inline size_t bt_l2cap_br_get_ret_fc_hdr_size(struct bt_l2cap_br_chan *chan)
+{
+	if (chan->tx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		if (chan->tx.extended_control) {
+			return BT_L2CAP_EXT_CONTROL_SIZE + BT_L2CAP_RT_FC_SDU_LEN_SIZE;
+		} else {
+			return BT_L2CAP_STD_CONTROL_SIZE + BT_L2CAP_RT_FC_SDU_LEN_SIZE;
+		}
+	}
+
+	return 0;
+}
+
+static inline size_t bt_l2cap_br_get_ret_fc_tail_size(struct bt_l2cap_br_chan *chan)
+{
+	if (chan->tx.mode != BT_L2CAP_BR_LINK_MODE_BASIC) {
+		if (chan->tx.fcs == BT_L2CAP_BR_FCS_16BIT) {
+			return BT_L2CAP_FCS_SIZE;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ *
+ *  @brief Helper to calculate L2CAP SDU header size.
+ *         Useful for creating buffer pools.
+ *
+ *  @param chan the BR channel object point to `struct bt_l2cap_br_chan`.
+ *
+ *  @return Header size of the L2CAP channel.
+ */
+#define BT_L2CAP_RT_FC_SDU_HDR_SIZE(chan) bt_l2cap_br_get_ret_fc_hdr_size(chan)
+
+/**
+ *
+ *  @brief Helper to calculate L2CAP SDU tail size.
+ *         Useful for creating buffer pools.
+ *
+ *  @param chan the BR channel object point to `struct bt_l2cap_br_chan`.
+ *
+ *  @return Header size of the L2CAP channel.
+ */
+#define BT_L2CAP_RT_FC_SDU_TAIL_SIZE(chan) bt_l2cap_br_get_ret_fc_tail_size(chan)
+
+/**
+ *
+ *  @brief Helper to calculate needed buffer size for L2CAP SDUs.
+ *         Useful for creating buffer pools.
+ *
+ *  @param chan the BR channel object point to `struct bt_l2cap_br_chan`.
+ *  @param mtu Required BT_L2CAP_*_SDU.
+ *
+ *  @return Needed buffer size to match the requested L2CAP SDU MTU.
+ */
+#define BT_L2CAP_RT_FC_SDU_BUF_SIZE(chan, mtu)                                                     \
+	(BT_L2CAP_BUF_SIZE(BT_L2CAP_RT_FC_SDU_HDR_SIZE((chan)) + (mtu) +                           \
+			   BT_L2CAP_RT_FC_SDU_TAIL_SIZE((chan))))
+
+/**
+ *
+ *  @brief Helper to calculate needed buffer size for L2CAP SDUs.
+ *         Useful for creating buffer pools.
+ *
+ *  @param mtu Required BT_L2CAP_*_SDU.
+ *
+ *  @return Needed buffer size to match the requested L2CAP SDU MTU.
+ */
+#define BT_L2CAP_RT_FC_MAX_SDU_BUF_SIZE(mtu)                                                       \
+	BT_L2CAP_BUF_SIZE((mtu) + BT_L2CAP_EXT_CONTROL_SIZE + BT_L2CAP_RT_FC_SDU_LEN_SIZE +        \
+			  BT_L2CAP_FCS_SIZE)
+
+/**
+ *  @brief Headroom needed for outgoing L2CAP PDUs if channel in one of
+ *  following mode, including retransmission, flow control, enhance
+ *  retransmission, and streaming.
+ *
+ *  @param chan the BR channel object point to `struct bt_l2cap_br_chan`.
+ */
+#define BT_L2CAP_RET_FC_SDU_CHAN_SEND_RESERVE(chan) (BT_L2CAP_RT_FC_SDU_HDR_SIZE(chan))
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
 #define BR_CHAN(_ch) CONTAINER_OF(_ch, struct bt_l2cap_br_chan, chan)
 
 /* Add channel to the connection */
@@ -217,3 +407,5 @@ struct net_buf *bt_l2cap_create_pdu_timeout(struct net_buf_pool *pool,
 
 #define bt_l2cap_create_pdu(_pool, _reserve) \
 	bt_l2cap_create_pdu_timeout(_pool, _reserve, K_FOREVER)
+
+bt_security_t bt_l2cap_br_get_max_sec_level(void);
diff --git a/subsys/bluetooth/host/classic/rfcomm.c b/subsys/bluetooth/host/classic/rfcomm.c
index 209711930c80d..a360d3f6493ba 100644
--- a/subsys/bluetooth/host/classic/rfcomm.c
+++ b/subsys/bluetooth/host/classic/rfcomm.c
@@ -1545,7 +1545,7 @@ static int rfcomm_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	}
 
 	if (buf->len < (hdr_len + msg_len + sizeof(fcs))) {
-		LOG_ERR("Too small RFCOMM information (%d < %d)", buf->len,
+		LOG_ERR("Too small RFCOMM information (%u < %zu)", buf->len,
 			hdr_len + msg_len + sizeof(fcs));
 		return 0;
 	}
diff --git a/subsys/bluetooth/host/classic/sco.c b/subsys/bluetooth/host/classic/sco.c
index 51433c9090b2a..9157caaf941bc 100644
--- a/subsys/bluetooth/host/classic/sco.c
+++ b/subsys/bluetooth/host/classic/sco.c
@@ -120,11 +120,11 @@ void bt_sco_disconnected(struct bt_conn *sco)
 
 	bt_sco_cleanup_acl(sco);
 
-	chan->sco = NULL;
-
 	if (chan->ops && chan->ops->disconnected) {
 		chan->ops->disconnected(chan, sco->err);
 	}
+
+	chan->sco = NULL;
 }
 
 static uint8_t sco_server_check_security(struct bt_conn *conn)
diff --git a/subsys/bluetooth/host/classic/sdp.c b/subsys/bluetooth/host/classic/sdp.c
index 124ca2e3a4a48..5c10f8b521a32 100644
--- a/subsys/bluetooth/host/classic/sdp.c
+++ b/subsys/bluetooth/host/classic/sdp.c
@@ -92,6 +92,10 @@ struct bt_sdp_client {
 	struct bt_sdp_pdu_cstate             cstate;
 	/* buffer for collecting record data */
 	struct net_buf                      *rec_buf;
+	/* The total length of response */
+	uint32_t                             total_len;
+	/* Received data length */
+	uint32_t                             recv_len;
 };
 
 static struct bt_sdp_client bt_sdp_client_pool[CONFIG_BT_MAX_CONN];
@@ -515,6 +519,8 @@ static uint16_t find_services(struct net_buf *buf,
 			return BT_SDP_INVALID_SYNTAX;
 		}
 
+		uuid_list_size -= data_elem.total_size;
+
 		if (data_elem.data_size == 2U) {
 			u.uuid.type = BT_UUID_TYPE_16;
 			u.u16.val = net_buf_pull_be16(buf);
@@ -530,10 +536,9 @@ static uint16_t find_services(struct net_buf *buf,
 			LOG_WRN("Invalid UUID len %u in service search pattern",
 				data_elem.data_size);
 			net_buf_pull(buf, data_elem.data_size);
+			continue;
 		}
 
-		uuid_list_size -= data_elem.total_size;
-
 		/* Go over the list of services, and look for a service which
 		 * doesn't have this UUID
 		 */
@@ -1003,7 +1008,7 @@ static uint16_t get_att_search_list(struct net_buf *buf, uint32_t *filter,
 
 	while (size) {
 		if (*num_filters >= max_filters) {
-			LOG_WRN("Exceeded maximum array length %u of %p", max_filters, filter);
+			LOG_WRN("Exceeded maximum array length %zu of %p", max_filters, filter);
 			return 0;
 		}
 
@@ -1654,55 +1659,7 @@ static int sdp_client_ssa_search(struct bt_sdp_client *session,
 			   session->tid);
 }
 
-static void sdp_client_params_iterator(struct bt_sdp_client *session);
-
-static int sdp_client_discover(struct bt_sdp_client *session)
-{
-	const struct bt_sdp_discover_params *param;
-	int err;
-
-	/*
-	 * Select proper user params, if session->param is invalid it means
-	 * getting new UUID from top of to be resolved params list. Otherwise
-	 * the context is in a middle of partial SDP PDU responses and cached
-	 * value from context can be used.
-	 */
-	if (!session->param) {
-		param = GET_PARAM(sys_slist_peek_head(&session->reqs));
-	} else {
-		param = session->param;
-	}
-
-	if (!param) {
-		struct bt_l2cap_chan *chan = &session->chan.chan;
-
-		LOG_WRN("No more request, disconnect channel");
-		/* No UUID items, disconnect channel */
-		return bt_l2cap_chan_disconnect(chan);
-	}
-
-	switch (param->type) {
-	case BT_SDP_DISCOVER_SERVICE_SEARCH:
-		err = sdp_client_ss_search(session, param);
-		break;
-	case BT_SDP_DISCOVER_SERVICE_ATTR:
-		err = sdp_client_sa_search(session, param);
-		break;
-	case BT_SDP_DISCOVER_SERVICE_SEARCH_ATTR:
-		err = sdp_client_ssa_search(session, param);
-		break;
-	default:
-		err = -EINVAL;
-		break;
-	}
-
-	if (err) {
-		/* Get next UUID and start resolving it */
-		sdp_client_params_iterator(session);
-	}
-
-	return 0;
-}
+static int sdp_client_discover(struct bt_sdp_client *session);
 
 static void sdp_client_params_iterator(struct bt_sdp_client *session)
 {
@@ -1722,6 +1679,10 @@ static void sdp_client_params_iterator(struct bt_sdp_client *session)
 		session->param = NULL;
 		/* Reset continuation state in current context */
 		(void)memset(&session->cstate, 0, sizeof(session->cstate));
+		/* Clear total length */
+		session->total_len = 0;
+		/* Clear received length */
+		session->recv_len = 0;
 
 		/* Check if there's valid next UUID */
 		if (!sys_slist_is_empty(&session->reqs)) {
@@ -1857,7 +1818,7 @@ static void sdp_client_notify_result(struct bt_sdp_client *session,
 	uint16_t rec_len;
 	uint8_t user_ret;
 
-	if (state == UUID_NOT_RESOLVED) {
+	if ((state == UUID_NOT_RESOLVED) || (session->rec_buf->len == 0U)) {
 		result.resp_buf = NULL;
 		result.next_record_hint = false;
 		session->param->func(conn, &result, session->param);
@@ -1901,6 +1862,56 @@ static void sdp_client_notify_result(struct bt_sdp_client *session,
 	}
 }
 
+static int sdp_client_discover(struct bt_sdp_client *session)
+{
+	const struct bt_sdp_discover_params *param;
+	int err;
+
+	/*
+	 * Select proper user params, if session->param is invalid it means
+	 * getting new UUID from top of to be resolved params list. Otherwise
+	 * the context is in a middle of partial SDP PDU responses and cached
+	 * value from context can be used.
+	 */
+	if (!session->param) {
+		param = GET_PARAM(sys_slist_peek_head(&session->reqs));
+	} else {
+		param = session->param;
+	}
+
+	if (!param) {
+		struct bt_l2cap_chan *chan = &session->chan.chan;
+
+		LOG_WRN("No more request, disconnect channel");
+		/* No UUID items, disconnect channel */
+		return bt_l2cap_chan_disconnect(chan);
+	}
+
+	switch (param->type) {
+	case BT_SDP_DISCOVER_SERVICE_SEARCH:
+		err = sdp_client_ss_search(session, param);
+		break;
+	case BT_SDP_DISCOVER_SERVICE_ATTR:
+		err = sdp_client_sa_search(session, param);
+		break;
+	case BT_SDP_DISCOVER_SERVICE_SEARCH_ATTR:
+		err = sdp_client_ssa_search(session, param);
+		break;
+	default:
+		err = -EINVAL;
+		break;
+	}
+
+	if (err) {
+		/* Notify the result */
+		sdp_client_notify_result(session, UUID_NOT_RESOLVED);
+		/* Get next UUID and start resolving it */
+		sdp_client_params_iterator(session);
+	}
+
+	return 0;
+}
+
 static int sdp_client_receive_ss(struct bt_sdp_client *session, struct net_buf *buf)
 {
 	struct bt_sdp_pdu_cstate *cstate;
@@ -1912,7 +1923,7 @@ static int sdp_client_receive_ss(struct bt_sdp_client *session, struct net_buf *
 	/* Check the buffer len for the total_count field */
 	if (buf->len < sizeof(total_count)) {
 		LOG_ERR("Invalid frame payload length");
-		return 0;
+		return -EINVAL;
 	}
 
 	/* Get total service record count. */
@@ -1921,7 +1932,7 @@ static int sdp_client_receive_ss(struct bt_sdp_client *session, struct net_buf *
 	/* Check the buffer len for the current_count field */
 	if (buf->len < sizeof(current_count)) {
 		LOG_ERR("Invalid frame payload length");
-		return 0;
+		return -EINVAL;
 	}
 
 	/* Get current service record count. */
@@ -1929,19 +1940,19 @@ static int sdp_client_receive_ss(struct bt_sdp_client *session, struct net_buf *
 	/* Check valid of current service record count */
 	if (current_count > total_count) {
 		LOG_ERR("Invalid current service record count");
-		return 0;
+		return -EINVAL;
 	}
 
 	received_count = session->rec_buf->len / SDP_RECORD_HANDLE_SIZE;
 	if ((received_count + current_count) > total_count) {
 		LOG_ERR("Excess data received");
-		return 0;
+		return -EINVAL;
 	}
 
 	record_len = current_count * SDP_RECORD_HANDLE_SIZE;
 	if (record_len >= buf->len) {
 		LOG_ERR("Invalid packet");
-		return 0;
+		return -EINVAL;
 	}
 
 	/* Get PDU continuation state */
@@ -1949,12 +1960,12 @@ static int sdp_client_receive_ss(struct bt_sdp_client *session, struct net_buf *
 
 	if (cstate->length > BT_SDP_MAX_PDU_CSTATE_LEN) {
 		LOG_ERR("Invalid SDP PDU Continuation State length %u", cstate->length);
-		return 0;
+		return -EINVAL;
 	}
 
 	if ((record_len + SDP_CONT_STATE_LEN_SIZE + cstate->length) > buf->len) {
 		LOG_ERR("Invalid payload length");
-		return 0;
+		return -EINVAL;
 	}
 
 	/*
@@ -1963,16 +1974,13 @@ static int sdp_client_receive_ss(struct bt_sdp_client *session, struct net_buf *
 	 * valid and this is the first response frame as well.
 	 */
 	if (!current_count && cstate->length == 0U && session->cstate.length == 0U) {
-		LOG_DBG("Service record handle 0x%x not found", session->param->handle);
-		/* Call user UUID handler */
-		sdp_client_notify_result(session, UUID_NOT_RESOLVED);
-		net_buf_pull(buf, sizeof(cstate->length));
-		goto iterate;
+		LOG_WRN("Service record handle 0x%x not found", session->param->handle);
+		return -EINVAL;
 	}
 
 	if (record_len > net_buf_tailroom(session->rec_buf)) {
 		LOG_WRN("Not enough room for getting records data");
-		goto iterate;
+		return -EINVAL;
 	}
 
 	net_buf_add_mem(session->rec_buf, buf->data, record_len);
@@ -1985,15 +1993,20 @@ static int sdp_client_receive_ss(struct bt_sdp_client *session, struct net_buf *
 
 		net_buf_pull(buf, cstate->length + sizeof(cstate->length));
 
-		/* Request for next portion of attributes data */
-		return sdp_client_discover(session);
+		/*
+		 * Request for next portion of attributes data.
+		 * All failure case are handled internally in the function.
+		 * Ignore the return value.
+		 */
+		(void)sdp_client_discover(session);
+
+		return 0;
 	}
 
 	net_buf_pull(buf, sizeof(cstate->length));
 
 	LOG_DBG("UUID 0x%s resolved", bt_uuid_str(session->param->uuid));
 	sdp_client_notify_result(session, UUID_RESOLVED);
-iterate:
 	/* Get next UUID and start resolving it */
 	sdp_client_params_iterator(session);
 
@@ -2009,7 +2022,7 @@ static int sdp_client_receive_ssa_sa(struct bt_sdp_client *session, struct net_b
 	/* Check the buffer len for the frame_len field */
 	if (buf->len < sizeof(frame_len)) {
 		LOG_ERR("Invalid frame payload length");
-		return 0;
+		return -EINVAL;
 	}
 
 	/* Get number of attributes in this frame. */
@@ -2017,12 +2030,12 @@ static int sdp_client_receive_ssa_sa(struct bt_sdp_client *session, struct net_b
 	/* Check valid buf len for attribute list and cont state */
 	if (buf->len < frame_len + SDP_CONT_STATE_LEN_SIZE) {
 		LOG_ERR("Invalid frame payload length");
-		return 0;
+		return -EINVAL;
 	}
 	/* Check valid range of attributes length */
 	if (frame_len < 2) {
 		LOG_ERR("Invalid attributes data length");
-		return 0;
+		return -EINVAL;
 	}
 
 	/* Get PDU continuation state */
@@ -2030,12 +2043,12 @@ static int sdp_client_receive_ssa_sa(struct bt_sdp_client *session, struct net_b
 
 	if (cstate->length > BT_SDP_MAX_PDU_CSTATE_LEN) {
 		LOG_ERR("Invalid SDP PDU Continuation State length %u", cstate->length);
-		return 0;
+		return -EINVAL;
 	}
 
 	if ((frame_len + SDP_CONT_STATE_LEN_SIZE + cstate->length) > buf->len) {
 		LOG_ERR("Invalid frame payload length");
-		return 0;
+		return -EINVAL;
 	}
 
 	/*
@@ -2044,19 +2057,32 @@ static int sdp_client_receive_ssa_sa(struct bt_sdp_client *session, struct net_b
 	 * valid and this is the first response frame as well.
 	 */
 	if (frame_len == 2U && cstate->length == 0U && session->cstate.length == 0U) {
-		LOG_DBG("Record for UUID 0x%s not found", bt_uuid_str(session->param->uuid));
-		/* Call user UUID handler */
-		sdp_client_notify_result(session, UUID_NOT_RESOLVED);
-		net_buf_pull(buf, frame_len + sizeof(cstate->length));
-		goto iterate;
+		LOG_WRN("Record for UUID 0x%s not found", bt_uuid_str(session->param->uuid));
+		return -EINVAL;
 	}
 
 	/* Get total value of all attributes to be collected */
 	frame_len -= sdp_client_get_total(session, buf, &total);
+	/*
+	 * If total is not 0, there are two valid cases,
+	 * Case 1, the continuation state length is 0, the frame_len should equal total,
+	 * Case 2, the continuation state length is not 0, it means there are more data will be
+	 * received. So the frame_len is less than total.
+	 */
+	if (total && (frame_len > total)) {
+		LOG_ERR("Invalid attribute lists");
+		return -EINVAL;
+	}
+
+	if (session->cstate.length == 0U) {
+		session->total_len = total;
+	}
+
+	session->recv_len += frame_len;
 
-	if (total > net_buf_tailroom(session->rec_buf)) {
+	if (frame_len > net_buf_tailroom(session->rec_buf)) {
 		LOG_WRN("Not enough room for getting records data");
-		goto iterate;
+		return -EINVAL;
 	}
 
 	net_buf_add_mem(session->rec_buf, buf->data, frame_len);
@@ -2069,15 +2095,26 @@ static int sdp_client_receive_ssa_sa(struct bt_sdp_client *session, struct net_b
 
 		net_buf_pull(buf, cstate->length + sizeof(cstate->length));
 
-		/* Request for next portion of attributes data */
-		return sdp_client_discover(session);
+		/*
+		 * Request for next portion of attributes data.
+		 * All failure case are handled internally in the function.
+		 * Ignore the return value.
+		 */
+		(void)sdp_client_discover(session);
+
+		return 0;
+	}
+
+	if (session->total_len && (session->recv_len != session->total_len)) {
+		LOG_WRN("The received len %d is mismatched with total len %d", session->recv_len,
+			session->total_len);
+		return -EINVAL;
 	}
 
 	net_buf_pull(buf, sizeof(cstate->length));
 
 	LOG_DBG("UUID 0x%s resolved", bt_uuid_str(session->param->uuid));
 	sdp_client_notify_result(session, UUID_RESOLVED);
-iterate:
 	/* Get next UUID and start resolving it */
 	sdp_client_params_iterator(session);
 
@@ -2089,6 +2126,7 @@ static int sdp_client_receive(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	struct bt_sdp_client *session = SDP_CLIENT_CHAN(chan);
 	struct bt_sdp_hdr *hdr;
 	uint16_t len, tid;
+	int err = -EINVAL;
 
 	LOG_DBG("session %p buf %p", session, buf);
 
@@ -2113,23 +2151,32 @@ static int sdp_client_receive(struct bt_l2cap_chan *chan, struct net_buf *buf)
 		return 0;
 	}
 
+	if (session->param == NULL) {
+		LOG_WRN("No request in progress");
+		return 0;
+	}
+
 	switch (hdr->op_code) {
 	case BT_SDP_SVC_SEARCH_RSP:
-		return sdp_client_receive_ss(session, buf);
+		err = sdp_client_receive_ss(session, buf);
+		break;
 	case BT_SDP_SVC_ATTR_RSP:
-		__fallthrough;
 	case BT_SDP_SVC_SEARCH_ATTR_RSP:
-		return sdp_client_receive_ssa_sa(session, buf);
+		err = sdp_client_receive_ssa_sa(session, buf);
+		break;
 	case BT_SDP_ERROR_RSP:
 		LOG_INF("Invalid SDP request");
-		sdp_client_notify_result(session, UUID_NOT_RESOLVED);
-		sdp_client_params_iterator(session);
-		return 0;
+		break;
 	default:
 		LOG_DBG("PDU 0x%0x response not handled", hdr->op_code);
 		break;
 	}
 
+	if (err < 0) {
+		sdp_client_notify_result(session, UUID_NOT_RESOLVED);
+		sdp_client_params_iterator(session);
+	}
+
 	return 0;
 }
 
diff --git a/subsys/bluetooth/host/classic/shell/CMakeLists.txt b/subsys/bluetooth/host/classic/shell/CMakeLists.txt
index dbf42a44cb1ac..2732cb2eb6d94 100644
--- a/subsys/bluetooth/host/classic/shell/CMakeLists.txt
+++ b/subsys/bluetooth/host/classic/shell/CMakeLists.txt
@@ -5,3 +5,8 @@ zephyr_library_sources(bredr.c)
 zephyr_library_sources_ifdef(CONFIG_BT_RFCOMM rfcomm.c)
 zephyr_library_sources_ifdef(CONFIG_BT_A2DP a2dp.c)
 zephyr_library_sources_ifdef(CONFIG_BT_AVRCP avrcp.c)
+if(CONFIG_BT_HFP_HF OR CONFIG_BT_HFP_AG)
+  zephyr_library_sources(
+    hfp.c
+    )
+endif()
diff --git a/subsys/bluetooth/host/classic/shell/a2dp.c b/subsys/bluetooth/host/classic/shell/a2dp.c
index 26e2b137a0feb..19e38e35094dc 100644
--- a/subsys/bluetooth/host/classic/shell/a2dp.c
+++ b/subsys/bluetooth/host/classic/shell/a2dp.c
@@ -208,9 +208,9 @@ static void shell_a2dp_print_capabilities(struct bt_a2dp_ep_info *ep_info)
 	codec_type = ep_info->codec_type;
 	codec_ie = ep_info->codec_cap.codec_ie;
 	codec_ie_len = ep_info->codec_cap.len;
-	bt_shell_print("endpoint id: %d, %s, %s:", ep_info->sep_info.id,
-		       (ep_info->sep_info.tsep == BT_AVDTP_SINK) ? "(sink)" : "(source)",
-		       (ep_info->sep_info.inuse) ? "(in use)" : "(idle)");
+	bt_shell_print("endpoint id: %d, %s, %s:", ep_info->sep_info->id,
+		       (ep_info->sep_info->tsep == BT_AVDTP_SINK) ? "(sink)" : "(source)",
+		       (ep_info->sep_info->inuse) ? "(in use)" : "(idle)");
 	if (BT_A2DP_SBC == codec_type) {
 		bt_shell_print("  codec type: SBC");
 
diff --git a/subsys/bluetooth/host/classic/shell/avrcp.c b/subsys/bluetooth/host/classic/shell/avrcp.c
index d427f2e5c75be..4e926646f711c 100644
--- a/subsys/bluetooth/host/classic/shell/avrcp.c
+++ b/subsys/bluetooth/host/classic/shell/avrcp.c
@@ -31,25 +31,60 @@
 
 struct bt_avrcp *default_avrcp;
 static bool avrcp_registered;
+static uint8_t local_tid;
+
+static uint8_t get_next_tid(void)
+{
+	uint8_t ret = local_tid;
+
+	local_tid++;
+	local_tid &= 0x0F;
+
+	return ret;
+}
 
 static void avrcp_connected(struct bt_avrcp *avrcp)
 {
-	default_avrcp = avrcp;
 	bt_shell_print("AVRCP connected");
+	default_avrcp = avrcp;
+	local_tid = 0;
 }
 
 static void avrcp_disconnected(struct bt_avrcp *avrcp)
 {
 	bt_shell_print("AVRCP disconnected");
+	local_tid = 0;
 }
 
-static void avrcp_unit_info_rsp(struct bt_avrcp *avrcp, struct bt_avrcp_unit_info_rsp *rsp)
+static void avrcp_get_cap_rsp(struct bt_avrcp *avrcp, uint8_t tid,
+			      const struct bt_avrcp_get_cap_rsp *rsp)
+{
+	uint8_t i;
+
+	switch (rsp->cap_id) {
+	case BT_AVRCP_CAP_COMPANY_ID:
+		for (i = 0; i < rsp->cap_cnt; i++) {
+			bt_shell_print("Remote CompanyID = 0x%06x",
+				       sys_get_be24(&rsp->cap[BT_AVRCP_COMPANY_ID_SIZE * i]));
+		}
+		break;
+	case BT_AVRCP_CAP_EVENTS_SUPPORTED:
+		for (i = 0; i < rsp->cap_cnt; i++) {
+			bt_shell_print("Remote supported EventID = 0x%02x", rsp->cap[i]);
+		}
+		break;
+	}
+}
+
+static void avrcp_unit_info_rsp(struct bt_avrcp *avrcp, uint8_t tid,
+				struct bt_avrcp_unit_info_rsp *rsp)
 {
 	bt_shell_print("AVRCP unit info received, unit type = 0x%02x, company_id = 0x%06x",
 		       rsp->unit_type, rsp->company_id);
 }
 
-static void avrcp_subunit_info_rsp(struct bt_avrcp *avrcp, struct bt_avrcp_subunit_info_rsp *rsp)
+static void avrcp_subunit_info_rsp(struct bt_avrcp *avrcp, uint8_t tid,
+				   struct bt_avrcp_subunit_info_rsp *rsp)
 {
 	int i;
 
@@ -61,11 +96,28 @@ static void avrcp_subunit_info_rsp(struct bt_avrcp *avrcp, struct bt_avrcp_subun
 	}
 }
 
+static void avrcp_passthrough_rsp(struct bt_avrcp *avrcp, uint8_t tid, bt_avrcp_rsp_t result,
+				  const struct bt_avrcp_passthrough_rsp *rsp)
+{
+	if (result == BT_AVRCP_RSP_ACCEPTED) {
+		bt_shell_print(
+			"AVRCP passthough command accepted, operation id = 0x%02x, state = %d",
+			BT_AVRCP_PASSTHROUGH_GET_OPID(rsp), BT_AVRCP_PASSTHROUGH_GET_STATE(rsp));
+	} else {
+		bt_shell_print("AVRCP passthough command rejected, operation id = 0x%02x, state = "
+			       "%d, response = %d",
+			       BT_AVRCP_PASSTHROUGH_GET_OPID(rsp),
+			       BT_AVRCP_PASSTHROUGH_GET_STATE(rsp), result);
+	}
+}
+
 static struct bt_avrcp_cb avrcp_cb = {
 	.connected = avrcp_connected,
 	.disconnected = avrcp_disconnected,
+	.get_cap_rsp = avrcp_get_cap_rsp,
 	.unit_info_rsp = avrcp_unit_info_rsp,
 	.subunit_info_rsp = avrcp_subunit_info_rsp,
+	.passthrough_rsp = avrcp_passthrough_rsp,
 };
 
 static int register_cb(const struct shell *sh)
@@ -147,7 +199,7 @@ static int cmd_get_unit_info(const struct shell *sh, int32_t argc, char *argv[])
 	}
 
 	if (default_avrcp != NULL) {
-		bt_avrcp_get_unit_info(default_avrcp);
+		bt_avrcp_get_unit_info(default_avrcp, get_next_tid());
 	} else {
 		shell_error(sh, "AVRCP is not connected");
 	}
@@ -164,7 +216,7 @@ static int cmd_get_subunit_info(const struct shell *sh, int32_t argc, char *argv
 	}
 
 	if (default_avrcp != NULL) {
-		bt_avrcp_get_subunit_info(default_avrcp);
+		bt_avrcp_get_subunit_info(default_avrcp, get_next_tid());
 	} else {
 		shell_error(sh, "AVRCP is not connected");
 	}
@@ -172,15 +224,74 @@ static int cmd_get_subunit_info(const struct shell *sh, int32_t argc, char *argv
 	return 0;
 }
 
-SHELL_STATIC_SUBCMD_SET_CREATE(avrcp_cmds,
-			       SHELL_CMD_ARG(register_cb, NULL, "register avrcp callbacks",
-					     cmd_register_cb, 1, 0),
-			       SHELL_CMD_ARG(connect, NULL, "<address>", cmd_connect, 2, 0),
-			       SHELL_CMD_ARG(disconnect, NULL, "<address>", cmd_disconnect, 2, 0),
-			       SHELL_CMD_ARG(get_unit, NULL, "<address>", cmd_get_unit_info, 2, 0),
-			       SHELL_CMD_ARG(get_subunit, NULL, "<address>", cmd_get_subunit_info,
-					     2, 0),
-			       SHELL_SUBCMD_SET_END);
+static int cmd_passthrough(const struct shell *sh, bt_avrcp_opid_t opid, const uint8_t *payload,
+			   uint8_t len)
+{
+	if (!avrcp_registered) {
+		if (register_cb(sh) != 0) {
+			return -ENOEXEC;
+		}
+	}
+
+	if (default_avrcp != NULL) {
+		bt_avrcp_passthrough(default_avrcp, get_next_tid(), opid, BT_AVRCP_BUTTON_PRESSED,
+				     payload, len);
+		bt_avrcp_passthrough(default_avrcp, get_next_tid(), opid, BT_AVRCP_BUTTON_RELEASED,
+				     payload, len);
+	} else {
+		shell_error(sh, "AVRCP is not connected");
+	}
+
+	return 0;
+}
+
+static int cmd_play(const struct shell *sh, int32_t argc, char *argv[])
+{
+	return cmd_passthrough(sh, BT_AVRCP_OPID_PLAY, NULL, 0);
+}
+
+static int cmd_pause(const struct shell *sh, int32_t argc, char *argv[])
+{
+	return cmd_passthrough(sh, BT_AVRCP_OPID_PAUSE, NULL, 0);
+}
+
+static int cmd_get_cap(const struct shell *sh, int32_t argc, char *argv[])
+{
+	const char *cap_id;
+
+	if (!avrcp_registered) {
+		if (register_cb(sh) != 0) {
+			return -ENOEXEC;
+		}
+	}
+
+	if (default_avrcp == NULL) {
+		shell_error(sh, "AVRCP is not connected");
+		return 0;
+	}
+
+	cap_id = argv[1];
+	if (!strcmp(cap_id, "company")) {
+		bt_avrcp_get_cap(default_avrcp, get_next_tid(), BT_AVRCP_CAP_COMPANY_ID);
+	} else if (!strcmp(cap_id, "events")) {
+		bt_avrcp_get_cap(default_avrcp, get_next_tid(), BT_AVRCP_CAP_EVENTS_SUPPORTED);
+	}
+
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(
+	avrcp_cmds,
+	SHELL_CMD_ARG(register_cb, NULL, "register avrcp callbacks", cmd_register_cb, 1, 0),
+	SHELL_CMD_ARG(connect, NULL, "connect AVRCP", cmd_connect, 1, 0),
+	SHELL_CMD_ARG(disconnect, NULL, "disconnect AVRCP", cmd_disconnect, 1, 0),
+	SHELL_CMD_ARG(get_unit, NULL, "get unit info", cmd_get_unit_info, 1, 0),
+	SHELL_CMD_ARG(get_subunit, NULL, "get subunit info", cmd_get_subunit_info, 1, 0),
+	SHELL_CMD_ARG(get_cap, NULL, "get capabilities <cap_id: company or events>", cmd_get_cap, 2,
+		      0),
+	SHELL_CMD_ARG(play, NULL, "request a play at the remote player", cmd_play, 1, 0),
+	SHELL_CMD_ARG(pause, NULL, "request a pause at the remote player", cmd_pause, 1, 0),
+	SHELL_SUBCMD_SET_END);
 
 static int cmd_avrcp(const struct shell *sh, size_t argc, char **argv)
 {
diff --git a/subsys/bluetooth/host/classic/shell/bredr.c b/subsys/bluetooth/host/classic/shell/bredr.c
index 267d4eee9a735..ac7d2ff5f4de2 100644
--- a/subsys/bluetooth/host/classic/shell/bredr.c
+++ b/subsys/bluetooth/host/classic/shell/bredr.c
@@ -37,16 +37,16 @@
 static struct bt_conn *pairing_conn;
 #endif /* CONFIG_BT_CONN */
 
-#define DATA_BREDR_MTU		48
+#define DATA_BREDR_MTU 48
 
-NET_BUF_POOL_FIXED_DEFINE(data_pool, 1, DATA_BREDR_MTU, 8, NULL);
+NET_BUF_POOL_FIXED_DEFINE(data_tx_pool, 1, BT_L2CAP_SDU_BUF_SIZE(DATA_BREDR_MTU),
+			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
+NET_BUF_POOL_FIXED_DEFINE(data_rx_pool, 1, DATA_BREDR_MTU, 8, NULL);
 
-#define SDP_CLIENT_USER_BUF_LEN		512
-NET_BUF_POOL_FIXED_DEFINE(sdp_client_pool, CONFIG_BT_MAX_CONN,
-			  SDP_CLIENT_USER_BUF_LEN, 8, NULL);
+#define SDP_CLIENT_USER_BUF_LEN 512
+NET_BUF_POOL_FIXED_DEFINE(sdp_client_pool, CONFIG_BT_MAX_CONN, SDP_CLIENT_USER_BUF_LEN, 8, NULL);
 
-static int cmd_auth_pincode(const struct shell *sh,
-			    size_t argc, char *argv[])
+static int cmd_auth_pincode(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct bt_conn *conn;
 	uint8_t max = 16U;
@@ -65,8 +65,7 @@ static int cmd_auth_pincode(const struct shell *sh,
 	}
 
 	if (strlen(argv[1]) > max) {
-		shell_print(sh, "PIN code value invalid - enter max %u "
-			    "digits", max);
+		shell_print(sh, "PIN code value invalid - enter max %u digits", max);
 		return -ENOEXEC;
 	}
 
@@ -103,8 +102,8 @@ static int cmd_connect(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-static void br_device_found(const bt_addr_t *addr, int8_t rssi,
-				  const uint8_t cod[3], const uint8_t eir[240])
+static void br_device_found(const bt_addr_t *addr, int8_t rssi, const uint8_t cod[3],
+			    const uint8_t eir[240])
 {
 	char br_addr[BT_ADDR_STR_LEN];
 	char name[239];
@@ -152,16 +151,14 @@ static void br_device_found(const bt_addr_t *addr, int8_t rssi,
 
 static struct bt_br_discovery_result br_discovery_results[5];
 
-static void br_discovery_complete(const struct bt_br_discovery_result *results,
-				  size_t count)
+static void br_discovery_complete(const struct bt_br_discovery_result *results, size_t count)
 {
 	size_t i;
 
 	bt_shell_print("BR/EDR discovery complete");
 
 	for (i = 0; i < count; i++) {
-		br_device_found(&results[i].addr, results[i].rssi,
-				results[i].cod, results[i].eir);
+		br_device_found(&results[i].addr, results[i].rssi, results[i].cod, results[i].eir);
 	}
 }
 
@@ -217,103 +214,441 @@ static int cmd_discovery(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+struct bt_l2cap_br_server {
+	struct bt_l2cap_server server;
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	uint8_t options;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+};
+
+struct l2cap_br_chan {
+	struct bt_l2cap_br_chan chan;
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	struct k_fifo l2cap_recv_fifo;
+	bool hold_credit;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+};
+
 static int l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
+	struct l2cap_br_chan *br_chan = CONTAINER_OF(chan, struct l2cap_br_chan, chan.chan);
+
 	bt_shell_print("Incoming data channel %p len %u", chan, buf->len);
 
+	if (buf->len) {
+		bt_shell_hexdump(buf->data, buf->len);
+	}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (br_chan->hold_credit) {
+		k_fifo_put(&br_chan->l2cap_recv_fifo, buf);
+		return -EINPROGRESS;
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+	(void)br_chan;
+
 	return 0;
 }
 
 static void l2cap_connected(struct bt_l2cap_chan *chan)
 {
+	struct l2cap_br_chan *br_chan = CONTAINER_OF(chan, struct l2cap_br_chan, chan.chan);
+
 	bt_shell_print("Channel %p connected", chan);
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	switch (br_chan->chan.rx.mode) {
+	case BT_L2CAP_BR_LINK_MODE_BASIC:
+		bt_shell_print("It is basic mode");
+		if (br_chan->hold_credit) {
+			br_chan->hold_credit = false;
+			bt_shell_warn("hold_credit is unsupported in basic mode");
+		}
+		break;
+	case BT_L2CAP_BR_LINK_MODE_RET:
+		bt_shell_print("It is retransmission mode");
+		break;
+	case BT_L2CAP_BR_LINK_MODE_FC:
+		bt_shell_print("It is flow control mode");
+		break;
+	case BT_L2CAP_BR_LINK_MODE_ERET:
+		bt_shell_print("It is enhance retransmission mode");
+		break;
+	case BT_L2CAP_BR_LINK_MODE_STREAM:
+		bt_shell_print("It is streaming mode");
+		break;
+	default:
+		bt_shell_error("It is unknown mode");
+		break;
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+	(void)br_chan;
 }
 
 static void l2cap_disconnected(struct bt_l2cap_chan *chan)
 {
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	struct net_buf *buf;
+	struct l2cap_br_chan *br_chan = CONTAINER_OF(chan, struct l2cap_br_chan, chan.chan);
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
 	bt_shell_print("Channel %p disconnected", chan);
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	do {
+		buf = k_fifo_get(&br_chan->l2cap_recv_fifo, K_NO_WAIT);
+		if (buf != NULL) {
+			net_buf_unref(buf);
+		}
+	} while (buf != NULL);
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 }
 
 static struct net_buf *l2cap_alloc_buf(struct bt_l2cap_chan *chan)
 {
 	bt_shell_print("Channel %p requires buffer", chan);
 
-	return net_buf_alloc(&data_pool, K_FOREVER);
+	return net_buf_alloc(&data_rx_pool, K_NO_WAIT);
 }
 
 static const struct bt_l2cap_chan_ops l2cap_ops = {
-	.alloc_buf	= l2cap_alloc_buf,
-	.recv		= l2cap_recv,
-	.connected	= l2cap_connected,
-	.disconnected	= l2cap_disconnected,
+	.alloc_buf = l2cap_alloc_buf,
+	.recv = l2cap_recv,
+	.connected = l2cap_connected,
+	.disconnected = l2cap_disconnected,
 };
 
-static struct bt_l2cap_br_chan l2cap_chan = {
-	.chan.ops	= &l2cap_ops,
-	 /* Set for now min. MTU */
-	.rx.mtu		= 48,
+#define BT_L2CAP_BR_SERVER_OPT_RET           BIT(0)
+#define BT_L2CAP_BR_SERVER_OPT_FC            BIT(1)
+#define BT_L2CAP_BR_SERVER_OPT_ERET          BIT(2)
+#define BT_L2CAP_BR_SERVER_OPT_STREAM        BIT(3)
+#define BT_L2CAP_BR_SERVER_OPT_MODE_OPTIONAL BIT(4)
+#define BT_L2CAP_BR_SERVER_OPT_EXT_WIN_SIZE  BIT(5)
+#define BT_L2CAP_BR_SERVER_OPT_HOLD_CREDIT   BIT(6)
+
+static struct l2cap_br_chan l2cap_chan = {
+	.chan = {
+		.chan.ops = &l2cap_ops,
+		/* Set for now min. MTU */
+		.rx.mtu = DATA_BREDR_MTU,
+	},
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	.l2cap_recv_fifo = Z_FIFO_INITIALIZER(l2cap_chan.l2cap_recv_fifo),
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 };
 
 static int l2cap_accept(struct bt_conn *conn, struct bt_l2cap_server *server,
 			struct bt_l2cap_chan **chan)
 {
+	struct bt_l2cap_br_server *br_server;
+
+	br_server = CONTAINER_OF(server, struct bt_l2cap_br_server, server);
+
 	bt_shell_print("Incoming BR/EDR conn %p", conn);
 
-	if (l2cap_chan.chan.conn) {
+	if (l2cap_chan.chan.chan.conn) {
 		bt_shell_error("No channels available");
 		return -ENOMEM;
 	}
 
-	*chan = &l2cap_chan.chan;
+	*chan = &l2cap_chan.chan.chan;
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (br_server->options & BT_L2CAP_BR_SERVER_OPT_HOLD_CREDIT) {
+		l2cap_chan.hold_credit = true;
+	} else {
+		l2cap_chan.hold_credit = false;
+	}
+
+	if (br_server->options & BT_L2CAP_BR_SERVER_OPT_EXT_WIN_SIZE) {
+		l2cap_chan.chan.rx.extended_control = true;
+	} else {
+		l2cap_chan.chan.rx.extended_control = false;
+	}
+
+	if (br_server->options & BT_L2CAP_BR_SERVER_OPT_MODE_OPTIONAL) {
+		l2cap_chan.chan.rx.optional = true;
+	} else {
+		l2cap_chan.chan.rx.optional = false;
+	}
 
+	l2cap_chan.chan.rx.fcs = BT_L2CAP_BR_FCS_16BIT;
+
+	if (br_server->options & BT_L2CAP_BR_SERVER_OPT_STREAM) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_STREAM;
+		l2cap_chan.chan.rx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+		l2cap_chan.chan.rx.max_transmit = 0;
+	} else if (br_server->options & BT_L2CAP_BR_SERVER_OPT_ERET) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_ERET;
+		l2cap_chan.chan.rx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+		l2cap_chan.chan.rx.max_transmit = 3;
+	} else if (br_server->options & BT_L2CAP_BR_SERVER_OPT_FC) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_FC;
+		l2cap_chan.chan.rx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+		l2cap_chan.chan.rx.max_transmit = 3;
+	} else if (br_server->options & BT_L2CAP_BR_SERVER_OPT_RET) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_RET;
+		l2cap_chan.chan.rx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+		l2cap_chan.chan.rx.max_transmit = 3;
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+	(void)br_server;
 	return 0;
 }
 
-static struct bt_l2cap_server br_server = {
-	.accept = l2cap_accept,
+static struct bt_l2cap_br_server l2cap_server = {
+	.server = {
+		.accept = l2cap_accept,
+	},
 };
 
-static int cmd_l2cap_register(const struct shell *sh,
-			      size_t argc, char *argv[])
+static int cmd_l2cap_register(const struct shell *sh, size_t argc, char *argv[])
 {
-	if (br_server.psm) {
+	if (l2cap_server.server.psm) {
 		shell_print(sh, "Already registered");
 		return -ENOEXEC;
 	}
 
-	br_server.psm = strtoul(argv[1], NULL, 16);
+	l2cap_server.server.psm = strtoul(argv[1], NULL, 16);
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	l2cap_server.options = 0;
+
+	if (!strcmp(argv[2], "none")) {
+		/* Support mode: None */
+	} else if (!strcmp(argv[2], "ret")) {
+		l2cap_server.options |= BT_L2CAP_BR_SERVER_OPT_RET;
+	} else if (!strcmp(argv[2], "fc")) {
+		l2cap_server.options |= BT_L2CAP_BR_SERVER_OPT_FC;
+	} else if (!strcmp(argv[2], "eret")) {
+		l2cap_server.options |= BT_L2CAP_BR_SERVER_OPT_ERET;
+	} else if (!strcmp(argv[2], "stream")) {
+		l2cap_server.options |= BT_L2CAP_BR_SERVER_OPT_STREAM;
+	} else {
+		l2cap_server.server.psm = 0;
+		shell_help(sh);
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	for (size_t index = 3; index < argc; index++) {
+		if (!strcmp(argv[index], "hold_credit")) {
+			l2cap_server.options |= BT_L2CAP_BR_SERVER_OPT_HOLD_CREDIT;
+		} else if (!strcmp(argv[index], "mode_optional")) {
+			l2cap_server.options |= BT_L2CAP_BR_SERVER_OPT_MODE_OPTIONAL;
+		} else if (!strcmp(argv[index], "extended_control")) {
+			l2cap_server.options |= BT_L2CAP_BR_SERVER_OPT_EXT_WIN_SIZE;
+		} else {
+			l2cap_server.server.psm = 0;
+			shell_help(sh);
+			return SHELL_CMD_HELP_PRINTED;
+		}
+	}
+
+	if ((l2cap_server.options & BT_L2CAP_BR_SERVER_OPT_EXT_WIN_SIZE) &&
+	    (!(l2cap_server.options &
+	       (BT_L2CAP_BR_SERVER_OPT_ERET | BT_L2CAP_BR_SERVER_OPT_STREAM)))) {
+		shell_error(sh, "[extended_control] only supports mode eret and stream");
+		l2cap_server.server.psm = 0U;
+		return -ENOEXEC;
+	}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
 
-	if (bt_l2cap_br_server_register(&br_server) < 0) {
+	if (bt_l2cap_br_server_register(&l2cap_server.server) < 0) {
 		shell_error(sh, "Unable to register psm");
-		br_server.psm = 0U;
+		l2cap_server.server.psm = 0U;
 		return -ENOEXEC;
 	}
 
-	shell_print(sh, "L2CAP psm %u registered", br_server.psm);
+	shell_print(sh, "L2CAP psm %u registered", l2cap_server.server.psm);
 
 	return 0;
 }
 
-static int cmd_discoverable(const struct shell *sh,
-			    size_t argc, char *argv[])
+static int cmd_l2cap_connect(const struct shell *sh, size_t argc, char *argv[])
 {
+	uint16_t psm;
+	struct bt_conn_info info;
 	int err;
-	const char *action;
 
-	action = argv[1];
+	if (!default_conn) {
+		shell_error(sh, "Not connected");
+		return -ENOEXEC;
+	}
 
-	if (!strcmp(action, "on")) {
-		err = bt_br_set_discoverable(true);
-	} else if (!strcmp(action, "off")) {
-		err = bt_br_set_discoverable(false);
+	if (l2cap_chan.chan.chan.conn) {
+		bt_shell_error("No channels available");
+		return -ENOMEM;
+	}
+
+	err = bt_conn_get_info(default_conn, &info);
+	if ((err < 0) || (info.type != BT_CONN_TYPE_BR)) {
+		shell_error(sh, "Invalid conn type");
+		return -ENOEXEC;
+	}
+
+	psm = strtoul(argv[1], NULL, 16);
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	if (!strcmp(argv[2], "none")) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_BASIC;
+	} else if (!strcmp(argv[2], "ret")) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_RET;
+		l2cap_chan.chan.rx.max_transmit = 3;
+	} else if (!strcmp(argv[2], "fc")) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_FC;
+		l2cap_chan.chan.rx.max_transmit = 3;
+	} else if (!strcmp(argv[2], "eret")) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_ERET;
+		l2cap_chan.chan.rx.max_transmit = 3;
+	} else if (!strcmp(argv[2], "stream")) {
+		l2cap_chan.chan.rx.mode = BT_L2CAP_BR_LINK_MODE_STREAM;
+		l2cap_chan.chan.rx.max_transmit = 0;
 	} else {
 		shell_help(sh);
 		return SHELL_CMD_HELP_PRINTED;
 	}
 
+	l2cap_chan.hold_credit = false;
+	l2cap_chan.chan.rx.optional = false;
+	l2cap_chan.chan.rx.extended_control = false;
+
+	for (size_t index = 3; index < argc; index++) {
+		if (!strcmp(argv[index], "hold_credit")) {
+			l2cap_chan.hold_credit = true;
+		} else if (!strcmp(argv[index], "mode_optional")) {
+			l2cap_chan.chan.rx.optional = true;
+		} else if (!strcmp(argv[index], "extended_control")) {
+			l2cap_chan.chan.rx.extended_control = true;
+		} else {
+			shell_help(sh);
+			return SHELL_CMD_HELP_PRINTED;
+		}
+	}
+
+	if ((l2cap_chan.chan.rx.extended_control) &&
+	    ((l2cap_chan.chan.rx.mode != BT_L2CAP_BR_LINK_MODE_ERET) &&
+	     (l2cap_chan.chan.rx.mode != BT_L2CAP_BR_LINK_MODE_STREAM))) {
+		shell_error(sh, "[extended_control] only supports mode eret and stream");
+		return -ENOEXEC;
+	}
+
+	if (l2cap_chan.hold_credit && (l2cap_chan.chan.rx.mode == BT_L2CAP_BR_LINK_MODE_BASIC)) {
+		shell_error(sh, "[hold_credit] cannot support basic mode");
+		return -ENOEXEC;
+	}
+
+	l2cap_chan.chan.rx.max_window = CONFIG_BT_L2CAP_MAX_WINDOW_SIZE;
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+	err = bt_l2cap_chan_connect(default_conn, &l2cap_chan.chan.chan, psm);
+	if (err < 0) {
+		shell_error(sh, "Unable to connect to psm %u (err %d)", psm, err);
+	} else {
+		shell_print(sh, "L2CAP connection pending");
+	}
+
+	return err;
+}
+
+static int cmd_l2cap_disconnect(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+
+	err = bt_l2cap_chan_disconnect(&l2cap_chan.chan.chan);
 	if (err) {
-		shell_print(sh, "BR/EDR set/reset discoverable failed "
-			    "(err %d)", err);
+		shell_error(sh, "Unable to disconnect: %u", -err);
+	}
+
+	return err;
+}
+
+static int cmd_l2cap_send(const struct shell *sh, size_t argc, char *argv[])
+{
+	static uint8_t buf_data[DATA_BREDR_MTU];
+	int err, len = DATA_BREDR_MTU, count = 1;
+	struct net_buf *buf;
+
+	if (argc > 1) {
+		count = strtoul(argv[1], NULL, 10);
+	}
+
+	if (argc > 2) {
+		len = strtoul(argv[2], NULL, 10);
+		if (len > DATA_BREDR_MTU) {
+			shell_error(sh, "Length exceeds TX MTU for the channel");
+			return -ENOEXEC;
+		}
+	}
+
+	len = MIN(l2cap_chan.chan.tx.mtu, len);
+
+	while (count--) {
+		shell_print(sh, "Rem %d", count);
+		buf = net_buf_alloc(&data_tx_pool, K_SECONDS(2));
+		if (!buf) {
+			if (l2cap_chan.chan.state != BT_L2CAP_CONNECTED) {
+				shell_error(sh, "Channel disconnected, stopping TX");
+
+				return -EAGAIN;
+			}
+			shell_error(sh, "Allocation timeout, stopping TX");
+
+			return -EAGAIN;
+		}
+		net_buf_reserve(buf, BT_L2CAP_CHAN_SEND_RESERVE);
+		memset(buf_data, count, sizeof(buf_data));
+
+		net_buf_add_mem(buf, buf_data, len);
+		err = bt_l2cap_chan_send(&l2cap_chan.chan.chan, buf);
+		if (err < 0) {
+			shell_error(sh, "Unable to send: %d", -err);
+			net_buf_unref(buf);
+			return -ENOEXEC;
+		}
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+static int cmd_l2cap_credits(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+	struct net_buf *buf;
+
+	buf = k_fifo_get(&l2cap_chan.l2cap_recv_fifo, K_NO_WAIT);
+	if (buf != NULL) {
+		err = bt_l2cap_chan_recv_complete(&l2cap_chan.chan.chan, buf);
+		if (err < 0) {
+			shell_error(sh, "Unable to set recv_complete: %d", -err);
+		}
+	} else {
+		shell_warn(sh, "No pending recv buffer");
+	}
+
+	return 0;
+}
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+
+static int cmd_discoverable(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err = 0;
+	bool enable;
+	bool limited = false;
+
+	enable = shell_strtobool(argv[1], 10, &err);
+	if (err) {
+		shell_help(sh);
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	if (argc > 2 && !strcmp(argv[2], "limited")) {
+		limited = true;
+	}
+
+	err = bt_br_set_discoverable(enable, limited);
+	if (err) {
+		shell_print(sh, "BR/EDR set/reset discoverable failed (err %d)", err);
 		return -ENOEXEC;
 	}
 
@@ -322,8 +657,7 @@ static int cmd_discoverable(const struct shell *sh,
 	return 0;
 }
 
-static int cmd_connectable(const struct shell *sh,
-			   size_t argc, char *argv[])
+static int cmd_connectable(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err;
 	const char *action;
@@ -340,8 +674,7 @@ static int cmd_connectable(const struct shell *sh,
 	}
 
 	if (err) {
-		shell_print(sh, "BR/EDR set/rest connectable failed "
-			    "(err %d)", err);
+		shell_print(sh, "BR/EDR set/rest connectable failed (err %d)", err);
 		return -ENOEXEC;
 	}
 
@@ -369,8 +702,7 @@ static int cmd_oob(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-static uint8_t sdp_hfp_ag_user(struct bt_conn *conn,
-			       struct bt_sdp_client_result *result,
+static uint8_t sdp_hfp_ag_user(struct bt_conn *conn, struct bt_sdp_client_result *result,
 			       const struct bt_sdp_discover_params *params)
 {
 	char addr[BT_ADDR_STR_LEN];
@@ -381,25 +713,22 @@ static uint8_t sdp_hfp_ag_user(struct bt_conn *conn,
 	conn_addr_str(conn, addr, sizeof(addr));
 
 	if (result && result->resp_buf) {
-		bt_shell_print("SDP HFPAG data@%p (len %u) hint %u from"
-			       " remote %s", result->resp_buf,
-			       result->resp_buf->len, result->next_record_hint,
+		bt_shell_print("SDP HFPAG data@%p (len %u) hint %u from remote %s",
+			       result->resp_buf, result->resp_buf->len, result->next_record_hint,
 			       addr);
 
 		/*
 		 * Focus to get BT_SDP_ATTR_PROTO_DESC_LIST attribute item to
 		 * get HFPAG Server Channel Number operating on RFCOMM protocol.
 		 */
-		err = bt_sdp_get_proto_param(result->resp_buf,
-					     BT_SDP_PROTO_RFCOMM, &param);
+		err = bt_sdp_get_proto_param(result->resp_buf, BT_SDP_PROTO_RFCOMM, &param);
 		if (err < 0) {
 			bt_shell_error("Error getting Server CN, err %d", err);
 			goto done;
 		}
 		bt_shell_print("HFPAG Server CN param 0x%04x", param);
 
-		err = bt_sdp_get_profile_version(result->resp_buf,
-						 BT_SDP_HANDSFREE_SVCLASS,
+		err = bt_sdp_get_profile_version(result->resp_buf, BT_SDP_HANDSFREE_SVCLASS,
 						 &version);
 		if (err < 0) {
 			bt_shell_error("Error getting profile version, err %d", err);
@@ -424,8 +753,59 @@ static uint8_t sdp_hfp_ag_user(struct bt_conn *conn,
 	return BT_SDP_DISCOVER_UUID_CONTINUE;
 }
 
-static uint8_t sdp_a2src_user(struct bt_conn *conn,
-			      struct bt_sdp_client_result *result,
+static uint8_t sdp_hfp_hf_user(struct bt_conn *conn,
+			       struct bt_sdp_client_result *result,
+			       const struct bt_sdp_discover_params *params)
+{
+	char addr[BT_ADDR_STR_LEN];
+	uint16_t param, version;
+	uint16_t features;
+	int err;
+
+	conn_addr_str(conn, addr, sizeof(addr));
+
+	if (result && result->resp_buf) {
+		bt_shell_print("SDP HFPHF data@%p (len %u) hint %u from remote %s",
+			       result->resp_buf, result->resp_buf->len, result->next_record_hint,
+			       addr);
+
+		/*
+		 * Focus to get BT_SDP_ATTR_PROTO_DESC_LIST attribute item to
+		 * get HFPHF Server Channel Number operating on RFCOMM protocol.
+		 */
+		err = bt_sdp_get_proto_param(result->resp_buf, BT_SDP_PROTO_RFCOMM, &param);
+		if (err < 0) {
+			bt_shell_error("Error getting Server CN, err %d", err);
+			goto done;
+		}
+		bt_shell_print("HFPHF Server CN param 0x%04x", param);
+
+		err = bt_sdp_get_profile_version(result->resp_buf, BT_SDP_HANDSFREE_SVCLASS,
+						 &version);
+		if (err < 0) {
+			bt_shell_error("Error getting profile version, err %d", err);
+			goto done;
+		}
+		bt_shell_print("HFP version param 0x%04x", version);
+
+		/*
+		 * Focus to get BT_SDP_ATTR_SUPPORTED_FEATURES attribute item to
+		 * get profile Supported Features mask.
+		 */
+		err = bt_sdp_get_features(result->resp_buf, &features);
+		if (err < 0) {
+			bt_shell_error("Error getting HFPHF Features, err %d", err);
+			goto done;
+		}
+		bt_shell_print("HFPHF Supported Features param 0x%04x", features);
+	} else {
+		bt_shell_print("No SDP HFPHF data from remote %s", addr);
+	}
+done:
+	return BT_SDP_DISCOVER_UUID_CONTINUE;
+}
+
+static uint8_t sdp_a2src_user(struct bt_conn *conn, struct bt_sdp_client_result *result,
 			      const struct bt_sdp_discover_params *params)
 {
 	char addr[BT_ADDR_STR_LEN];
@@ -436,17 +816,15 @@ static uint8_t sdp_a2src_user(struct bt_conn *conn,
 	conn_addr_str(conn, addr, sizeof(addr));
 
 	if (result && result->resp_buf) {
-		bt_shell_print("SDP A2SRC data@%p (len %u) hint %u from"
-			       " remote %s", result->resp_buf,
-			       result->resp_buf->len, result->next_record_hint,
+		bt_shell_print("SDP A2SRC data@%p (len %u) hint %u from remote %s",
+			       result->resp_buf, result->resp_buf->len, result->next_record_hint,
 			       addr);
 
 		/*
 		 * Focus to get BT_SDP_ATTR_PROTO_DESC_LIST attribute item to
 		 * get A2SRC Server PSM Number.
 		 */
-		err = bt_sdp_get_proto_param(result->resp_buf,
-					     BT_SDP_PROTO_L2CAP, &param);
+		err = bt_sdp_get_proto_param(result->resp_buf, BT_SDP_PROTO_L2CAP, &param);
 		if (err < 0) {
 			bt_shell_error("A2SRC PSM Number not found, err %d", err);
 			goto done;
@@ -458,8 +836,7 @@ static uint8_t sdp_a2src_user(struct bt_conn *conn,
 		 * Focus to get BT_SDP_ATTR_PROFILE_DESC_LIST attribute item to
 		 * get profile version number.
 		 */
-		err = bt_sdp_get_profile_version(result->resp_buf,
-						 BT_SDP_ADVANCED_AUDIO_SVCLASS,
+		err = bt_sdp_get_profile_version(result->resp_buf, BT_SDP_ADVANCED_AUDIO_SVCLASS,
 						 &version);
 		if (err < 0) {
 			bt_shell_error("A2SRC version not found, err %d", err);
@@ -491,6 +868,13 @@ static struct bt_sdp_discover_params discov_hfpag = {
 	.pool = &sdp_client_pool,
 };
 
+static struct bt_sdp_discover_params discov_hfphf = {
+	.type = BT_SDP_DISCOVER_SERVICE_SEARCH_ATTR,
+	.uuid = BT_UUID_DECLARE_16(BT_SDP_HANDSFREE_SVCLASS),
+	.func = sdp_hfp_hf_user,
+	.pool = &sdp_client_pool,
+};
+
 static struct bt_sdp_discover_params discov_a2src = {
 	.type = BT_SDP_DISCOVER_SERVICE_SEARCH_ATTR,
 	.uuid = BT_UUID_DECLARE_16(BT_SDP_AUDIO_SOURCE_SVCLASS),
@@ -500,8 +884,7 @@ static struct bt_sdp_discover_params discov_a2src = {
 
 static struct bt_sdp_discover_params discov;
 
-static int cmd_sdp_find_record(const struct shell *sh,
-			       size_t argc, char *argv[])
+static int cmd_sdp_find_record(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err;
 	const char *action;
@@ -515,6 +898,8 @@ static int cmd_sdp_find_record(const struct shell *sh,
 
 	if (!strcmp(action, "HFPAG")) {
 		discov = discov_hfpag;
+	} else if (!strcmp(action, "HFPHF")) {
+		discov = discov_hfphf;
 	} else if (!strcmp(action, "A2SRC")) {
 		discov = discov_a2src;
 	} else {
@@ -535,24 +920,60 @@ static int cmd_sdp_find_record(const struct shell *sh,
 	return 0;
 }
 
-#define HELP_NONE "[none]"
-#define HELP_ADDR_LE "<address: XX:XX:XX:XX:XX:XX> <type: (public|random)>"
+static void bond_info(const struct bt_br_bond_info *info, void *user_data)
+{
+	char addr[BT_ADDR_STR_LEN];
+	int *bond_count = user_data;
 
-SHELL_STATIC_SUBCMD_SET_CREATE(br_cmds,
-	SHELL_CMD_ARG(auth-pincode, NULL, "<pincode>", cmd_auth_pincode, 2, 0),
-	SHELL_CMD_ARG(connect, NULL, "<address>", cmd_connect, 2, 0),
-	SHELL_CMD_ARG(discovery, NULL,
-		      "<value: on, off> [length: 1-48] [mode: limited]",
-		      cmd_discovery, 2, 2),
-	SHELL_CMD_ARG(iscan, NULL, "<value: on, off>", cmd_discoverable, 2, 0),
-	SHELL_CMD_ARG(l2cap-register, NULL, "<psm>", cmd_l2cap_register, 2, 0),
-	SHELL_CMD_ARG(oob, NULL, NULL, cmd_oob, 1, 0),
-	SHELL_CMD_ARG(pscan, NULL, "<value: on, off>", cmd_connectable, 2, 0),
-	SHELL_CMD_ARG(sdp-find, NULL, "<HFPAG>", cmd_sdp_find_record, 2, 0),
-	SHELL_SUBCMD_SET_END
-);
+	bt_addr_to_str(&info->addr, addr, sizeof(addr));
+	bt_shell_print("Remote Identity: %s", addr);
+	(*bond_count)++;
+}
 
-static int cmd_br(const struct shell *sh, size_t argc, char **argv)
+static int cmd_bonds(const struct shell *sh, size_t argc, char *argv[])
+{
+	int bond_count = 0;
+
+	shell_print(sh, "Bonded devices:");
+	bt_br_foreach_bond(bond_info, &bond_count);
+	shell_print(sh, "Total %d", bond_count);
+
+	return 0;
+}
+
+static int cmd_clear(const struct shell *sh, size_t argc, char *argv[])
+{
+	bt_addr_t addr;
+	int err;
+
+	if (strcmp(argv[1], "all") == 0) {
+		err = bt_br_unpair(NULL);
+		if (err) {
+			shell_error(sh, "Failed to clear pairings (err %d)", err);
+			return err;
+		}
+
+		shell_print(sh, "Pairings successfully cleared");
+		return 0;
+	}
+
+	err = bt_addr_from_str(argv[1], &addr);
+	if (err) {
+		shell_print(sh, "Invalid address");
+		return err;
+	}
+
+	err = bt_br_unpair(&addr);
+	if (err) {
+		shell_error(sh, "Failed to clear pairing (err %d)", err);
+	} else {
+		shell_print(sh, "Pairing successfully cleared");
+	}
+
+	return err;
+}
+
+static int cmd_default_handler(const struct shell *sh, size_t argc, char **argv)
 {
 	if (argc == 1) {
 		shell_help(sh);
@@ -561,8 +982,50 @@ static int cmd_br(const struct shell *sh, size_t argc, char **argv)
 
 	shell_error(sh, "%s unknown parameter: %s", argv[0], argv[1]);
 
-	return -ENOEXEC;
+	return -EINVAL;
 }
 
-SHELL_CMD_ARG_REGISTER(br, &br_cmds, "Bluetooth BR/EDR shell commands", cmd_br,
-		       1, 1);
+#define HELP_NONE "[none]"
+#define HELP_ADDR "<address: XX:XX:XX:XX:XX:XX>"
+#define HELP_REG                                                      \
+	"<psm> <mode: none, ret, fc, eret, stream> [hold_credit] "    \
+	"[mode_optional] [extended_control]"
+
+#define HELP_CONN                                                     \
+	"<psm> <mode: none, ret, fc, eret, stream> [hold_credit] "    \
+	"[mode_optional] [extended_control]"
+
+SHELL_STATIC_SUBCMD_SET_CREATE(l2cap_cmds,
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	SHELL_CMD_ARG(register, NULL, HELP_REG, cmd_l2cap_register, 3, 3),
+	SHELL_CMD_ARG(connect, NULL, HELP_CONN, cmd_l2cap_connect, 3, 3),
+#else
+	SHELL_CMD_ARG(register, NULL, "<psm>", cmd_l2cap_register, 2, 0),
+	SHELL_CMD_ARG(connect, NULL, "<psm>", cmd_l2cap_connect, 2, 0),
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+	SHELL_CMD_ARG(disconnect, NULL, HELP_NONE, cmd_l2cap_disconnect, 1, 0),
+	SHELL_CMD_ARG(send, NULL, "[number of packets] [length of packet(s)]",
+		      cmd_l2cap_send, 1, 2),
+#if defined(CONFIG_BT_L2CAP_RET_FC)
+	SHELL_CMD_ARG(credits, NULL, HELP_NONE, cmd_l2cap_credits, 1, 0),
+#endif /* CONFIG_BT_L2CAP_RET_FC */
+	SHELL_SUBCMD_SET_END
+);
+
+SHELL_STATIC_SUBCMD_SET_CREATE(br_cmds,
+	SHELL_CMD_ARG(auth-pincode, NULL, "<pincode>", cmd_auth_pincode, 2, 0),
+	SHELL_CMD_ARG(connect, NULL, "<address>", cmd_connect, 2, 0),
+	SHELL_CMD_ARG(bonds, NULL, HELP_NONE, cmd_bonds, 1, 0),
+	SHELL_CMD_ARG(clear, NULL, "[all] ["HELP_ADDR"]", cmd_clear, 2, 0),
+	SHELL_CMD_ARG(discovery, NULL, "<value: on, off> [length: 1-48] [mode: limited]",
+		      cmd_discovery, 2, 2),
+	SHELL_CMD_ARG(iscan, NULL, "<value: on, off> [mode: limited]",
+		      cmd_discoverable, 2, 1),
+	SHELL_CMD(l2cap, &l2cap_cmds, HELP_NONE, cmd_default_handler),
+	SHELL_CMD_ARG(oob, NULL, NULL, cmd_oob, 1, 0),
+	SHELL_CMD_ARG(pscan, NULL, "<value: on, off>", cmd_connectable, 2, 0),
+	SHELL_CMD_ARG(sdp-find, NULL, "<HFPAG, HFPHF>", cmd_sdp_find_record, 2, 0),
+	SHELL_SUBCMD_SET_END
+);
+
+SHELL_CMD_ARG_REGISTER(br, &br_cmds, "Bluetooth BR/EDR shell commands", cmd_default_handler, 1, 1);
diff --git a/subsys/bluetooth/host/classic/shell/hfp.c b/subsys/bluetooth/host/classic/shell/hfp.c
new file mode 100644
index 0000000000000..58cd44451eefb
--- /dev/null
+++ b/subsys/bluetooth/host/classic/shell/hfp.c
@@ -0,0 +1,1948 @@
+/*
+ * Copyright 2024-2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/kernel.h>
+
+#include <zephyr/settings/settings.h>
+
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/classic/hfp_hf.h>
+#include <zephyr/bluetooth/classic/hfp_ag.h>
+
+#include <zephyr/shell/shell.h>
+
+#include "host/shell/bt.h"
+#include "common/bt_shell_private.h"
+
+#define HELP_NONE "[none]"
+
+extern struct bt_conn *default_conn;
+
+#if defined(CONFIG_BT_HFP_HF)
+
+struct bt_conn *hf_conn;
+struct bt_hfp_hf *hfp_hf;
+struct bt_conn *hf_sco_conn;
+static struct bt_hfp_hf_call *hfp_hf_call[CONFIG_BT_HFP_HF_MAX_CALLS];
+
+static void hf_add_a_call(struct bt_hfp_hf_call *call)
+{
+	ARRAY_FOR_EACH(hfp_hf_call, i) {
+		if (!hfp_hf_call[i]) {
+			hfp_hf_call[i] = call;
+			return;
+		}
+	}
+}
+
+static void hf_remove_a_call(struct bt_hfp_hf_call *call)
+{
+	ARRAY_FOR_EACH(hfp_hf_call, i) {
+		if (call == hfp_hf_call[i]) {
+			hfp_hf_call[i] = NULL;
+			return;
+		}
+	}
+}
+
+static void hf_remove_calls(void)
+{
+	ARRAY_FOR_EACH(hfp_hf_call, i) {
+		if (hfp_hf_call[i] != NULL) {
+			hfp_hf_call[i] = NULL;
+		}
+	}
+}
+
+static void hf_connected(struct bt_conn *conn, struct bt_hfp_hf *hf)
+{
+	hf_conn = conn;
+	hfp_hf = hf;
+	bt_shell_print("HF connected");
+}
+
+static void hf_disconnected(struct bt_hfp_hf *hf)
+{
+	hf_conn = NULL;
+	hfp_hf = NULL;
+	hf_remove_calls();
+	bt_shell_print("HF disconnected");
+}
+
+static void hf_sco_connected(struct bt_hfp_hf *hf, struct bt_conn *sco_conn)
+{
+	bt_shell_print("HF SCO connected %p", sco_conn);
+
+	if (hf_sco_conn != NULL) {
+		bt_shell_warn("HF SCO conn %p exists", hf_sco_conn);
+		return;
+	}
+
+	hf_sco_conn = bt_conn_ref(sco_conn);
+}
+
+static void hf_sco_disconnected(struct bt_conn *sco_conn, uint8_t reason)
+{
+	bt_shell_print("HF SCO disconnected %p (reason %u)", sco_conn, reason);
+
+	if (hf_sco_conn == sco_conn) {
+		bt_conn_unref(hf_sco_conn);
+		hf_sco_conn = NULL;
+	} else {
+		bt_shell_warn("Unknown SCO disconnected (%p != %p)", hf_sco_conn, sco_conn);
+	}
+}
+
+void hf_service(struct bt_hfp_hf *hf, uint32_t value)
+{
+	bt_shell_print("HF service %d", value);
+}
+
+void hf_outgoing(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call)
+{
+	hf_add_a_call(call);
+	bt_shell_print("HF call %p outgoing", call);
+}
+
+void hf_remote_ringing(struct bt_hfp_hf_call *call)
+{
+	bt_shell_print("HF remote call %p start ringing", call);
+}
+
+void hf_incoming(struct bt_hfp_hf *hf, struct bt_hfp_hf_call *call)
+{
+	hf_add_a_call(call);
+	bt_shell_print("HF call %p incoming", call);
+}
+
+void hf_incoming_held(struct bt_hfp_hf_call *call)
+{
+	bt_shell_print("HF call %p is held", call);
+}
+
+void hf_accept(struct bt_hfp_hf_call *call)
+{
+	bt_shell_print("HF call %p accepted", call);
+}
+
+void hf_reject(struct bt_hfp_hf_call *call)
+{
+	hf_remove_a_call(call);
+	bt_shell_print("HF call %p rejected", call);
+}
+
+void hf_terminate(struct bt_hfp_hf_call *call)
+{
+	hf_remove_a_call(call);
+	bt_shell_print("HF call %p terminated", call);
+}
+
+void hf_held(struct bt_hfp_hf_call *call)
+{
+	bt_shell_print("hf call %p held", call);
+}
+
+void hf_retrieve(struct bt_hfp_hf_call *call)
+{
+	bt_shell_print("hf call %p retrieve", call);
+}
+
+void hf_signal(struct bt_hfp_hf *hf, uint32_t value)
+{
+	bt_shell_print("HF signal %d", value);
+}
+
+void hf_roam(struct bt_hfp_hf *hf, uint32_t value)
+{
+	bt_shell_print("HF roam %d", value);
+}
+
+void hf_battery(struct bt_hfp_hf *hf, uint32_t value)
+{
+	bt_shell_print("HF battery %d", value);
+}
+
+void hf_ring_indication(struct bt_hfp_hf_call *call)
+{
+	bt_shell_print("HF call %p ring", call);
+}
+
+void hf_dialing(struct bt_hfp_hf *hf, int err)
+{
+	bt_shell_print("HF start dialing call: err %d", err);
+}
+
+#if defined(CONFIG_BT_HFP_HF_CLI)
+void hf_clip(struct bt_hfp_hf_call *call, char *number, uint8_t type)
+{
+	bt_shell_print("HF call %p CLIP %s %d", call, number, type);
+}
+#endif /* CONFIG_BT_HFP_HF_CLI */
+
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+static void hf_vgm(struct bt_hfp_hf *hf, uint8_t gain)
+{
+	bt_shell_print("HF VGM %d", gain);
+}
+
+static void hf_vgs(struct bt_hfp_hf *hf, uint8_t gain)
+{
+	bt_shell_print("HF VGS %d", gain);
+}
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+
+static void hf_inband_ring(struct bt_hfp_hf *hf, bool inband)
+{
+	bt_shell_print("HF ring: %s", inband ? "in-band" : "no in-hand");
+}
+
+static void hf_operator(struct bt_hfp_hf *hf, uint8_t mode, uint8_t format, char *operator)
+{
+	bt_shell_print("HF mode %d, format %d, operator %s", mode, format, operator);
+}
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+static void hf_codec_negotiate(struct bt_hfp_hf *hf, uint8_t id)
+{
+	bt_shell_print("codec negotiation: %d", id);
+}
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+#if defined(CONFIG_BT_HFP_HF_ECNR)
+static void hf_ecnr_turn_off(struct bt_hfp_hf *hf, int err)
+{
+	bt_shell_print("Turn off ECNR: %d", err);
+}
+#endif /* CONFIG_BT_HFP_HF_ECNR */
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static void hf_call_waiting(struct bt_hfp_hf_call *call, char *number, uint8_t type)
+{
+	bt_shell_print("3way call %p waiting. number %s type %d", call, number, type);
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+void hf_voice_recognition(struct bt_hfp_hf *hf, bool activate)
+{
+	bt_shell_print("Voice recognition %s", activate ? "activate" : "deactivate");
+}
+
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+void hf_vre_state(struct bt_hfp_hf *hf, uint8_t state)
+{
+	bt_shell_print("Voice recognition engine state %d", state);
+}
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG_TEXT)
+void hf_textual_representation(struct bt_hfp_hf *hf, char *id, uint8_t type, uint8_t operation,
+			       char *text)
+{
+	bt_shell_print("Text id %s, type %d, operation %d, string %s", id, type, operation, text);
+}
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG_TEXT */
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+
+void hf_request_phone_number(struct bt_hfp_hf *hf, const char *number)
+{
+	if (number) {
+		bt_shell_print("Requested phone number %s", number);
+	} else {
+		bt_shell_print("Failed to request phone number");
+	}
+}
+
+void hf_subscriber_number(struct bt_hfp_hf *hf, const char *number, uint8_t type, uint8_t service)
+{
+	bt_shell_print("Subscriber number %s, type %d, service %d", number, type, service);
+}
+
+static struct bt_hfp_hf_cb hf_cb = {
+	.connected = hf_connected,
+	.disconnected = hf_disconnected,
+	.sco_connected = hf_sco_connected,
+	.sco_disconnected = hf_sco_disconnected,
+	.service = hf_service,
+	.outgoing = hf_outgoing,
+	.remote_ringing = hf_remote_ringing,
+	.incoming = hf_incoming,
+	.incoming_held = hf_incoming_held,
+	.accept = hf_accept,
+	.reject = hf_reject,
+	.terminate = hf_terminate,
+	.held = hf_held,
+	.retrieve = hf_retrieve,
+	.signal = hf_signal,
+	.roam = hf_roam,
+	.battery = hf_battery,
+	.ring_indication = hf_ring_indication,
+	.dialing = hf_dialing,
+#if defined(CONFIG_BT_HFP_HF_CLI)
+	.clip = hf_clip,
+#endif /* CONFIG_BT_HFP_HF_CLI */
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+	.vgm = hf_vgm,
+	.vgs = hf_vgs,
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+	.inband_ring = hf_inband_ring,
+	.operator = hf_operator,
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+	.codec_negotiate = hf_codec_negotiate,
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+#if defined(CONFIG_BT_HFP_HF_ECNR)
+	.ecnr_turn_off = hf_ecnr_turn_off,
+#endif /* CONFIG_BT_HFP_HF_ECNR */
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	.call_waiting = hf_call_waiting,
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+	.voice_recognition = hf_voice_recognition,
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+	.vre_state = hf_vre_state,
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG_TEXT)
+	.textual_representation = hf_textual_representation,
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG_TEXT */
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+	.request_phone_number = hf_request_phone_number,
+	.subscriber_number = hf_subscriber_number,
+};
+
+static int cmd_reg_enable(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_register(&hf_cb);
+	if (err) {
+		shell_error(sh, "Callback register failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_connect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	struct bt_hfp_hf *hf;
+	uint8_t channel;
+
+	channel = atoi(argv[1]);
+
+	err = bt_hfp_hf_connect(default_conn, &hf, channel);
+	if (err) {
+		shell_error(sh, "Connect failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_disconnect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_disconnect(hfp_hf);
+	if (err) {
+		shell_error(sh, "Disconnect failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_sco_disconnect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_conn_disconnect(hf_sco_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+	if (err) {
+		shell_error(sh, "Disconnect failed: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_HF_CLI)
+static int cmd_cli_enable(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action = argv[1];
+	bool enable;
+	int err;
+
+	if (strcmp(action, "enable") == 0) {
+		enable = true;
+	} else if (strcmp(action, "disable") == 0) {
+		enable = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_hf_cli(hfp_hf, enable);
+	if (err) {
+		shell_error(sh, "Fail to send AT+CLIP=%d (err %d)", enable, err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_BT_HFP_HF_CLI */
+
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+static int cmd_vgm_enable(const struct shell *sh, size_t argc, char **argv)
+{
+	uint32_t gain;
+	int err;
+
+	gain = atoi(argv[1]);
+
+	err = bt_hfp_hf_vgm(hfp_hf, gain);
+	if (err) {
+		shell_error(sh, "Fail to send AT+VGM=%d (err %d)", gain, err);
+	}
+
+	return err;
+}
+
+static int cmd_vgs_enable(const struct shell *sh, size_t argc, char **argv)
+{
+	uint32_t gain;
+	int err;
+
+	gain = atoi(argv[1]);
+
+	err = bt_hfp_hf_vgs(hfp_hf, gain);
+	if (err) {
+		shell_error(sh, "Fail to send AT+VGS=%d (err %d)", gain, err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+
+static int cmd_operator(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_get_operator(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to read network operator: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+static int cmd_audio_connect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_audio_connect(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to start audio connection procedure: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_select_codec(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t codec_id;
+
+	codec_id = atoi(argv[1]);
+
+	err = bt_hfp_hf_select_codec(hfp_hf, codec_id);
+	if (err) {
+		shell_error(sh, "Failed to select codec id: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_set_codecs(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t codec_ids;
+
+	codec_ids = atoi(argv[1]);
+
+	err = bt_hfp_hf_set_codecs(hfp_hf, codec_ids);
+	if (err) {
+		shell_error(sh, "Failed to set codecs: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+
+static int cmd_accept(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_hf_call))) || !hfp_hf_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_accept(hfp_hf_call[index]);
+	if (err) {
+		shell_error(sh, "Failed to accept call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_reject(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_hf_call))) || !hfp_hf_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_reject(hfp_hf_call[index]);
+	if (err) {
+		shell_error(sh, "Failed to reject call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_terminate(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_hf_call))) || !hfp_hf_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_terminate(hfp_hf_call[index]);
+	if (err) {
+		shell_error(sh, "Failed to terminate call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_hold_incoming(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_hf_call))) || !hfp_hf_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_hold_incoming(hfp_hf_call[index]);
+	if (err) {
+		shell_error(sh, "Failed to put incoming call on hold: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_query_respond_hold_status(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_query_respond_hold_status(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to query respond and hold status: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_number_call(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_number_call(hfp_hf, argv[1]);
+	if (err) {
+		shell_error(sh, "Failed to start phone number call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_memory_dial(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_memory_dial(hfp_hf, argv[1]);
+	if (err) {
+		shell_error(sh, "Failed to memory dial call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_redial(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_redial(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to redial call: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_HF_ECNR)
+static int cmd_turn_off_ecnr(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_turn_off_ecnr(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to turn off ecnr: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_ECNR */
+
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+static int cmd_call_waiting_notify(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action = argv[1];
+	bool enable;
+	int err;
+
+	action = argv[1];
+
+	if (strcmp(action, "enable") == 0) {
+		enable = true;
+	} else if (strcmp(action, "disable") == 0) {
+		enable = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_hf_call_waiting_notify(hfp_hf, enable);
+	if (err) {
+		shell_error(sh, "Failed to set call waiting notify: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_release_all_held(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_release_all_held(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to release all held: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_set_udub(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_set_udub(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to reject waiting call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_release_active_accept_other(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_release_active_accept_other(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to release active calls and accept other call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_hold_active_accept_other(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_hold_active_accept_other(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to hold all active calls and accept other call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_join_conversation(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_join_conversation(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to join the conversation: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_explicit_call_transfer(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_explicit_call_transfer(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to explicit call transfer: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_release_specified_call(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_hf_call))) || !hfp_hf_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_release_specified_call(hfp_hf_call[index]);
+	if (err) {
+		shell_error(sh, "Failed to release specified call: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_private_consultation_mode(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_hf_call))) || !hfp_hf_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_private_consultation_mode(hfp_hf_call[index]);
+	if (err) {
+		shell_error(sh, "Failed to set private consultation mode: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+static int cmd_voice_recognition(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action;
+	bool activate;
+	int err;
+
+	action = argv[1];
+
+	if (strcmp(action, "activate") == 0) {
+		activate = true;
+	} else if (strcmp(action, "deactivate") == 0) {
+		activate = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_hf_voice_recognition(hfp_hf, activate);
+	if (err) {
+		shell_error(sh, "Failed to set voice recognition: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+static int cmd_ready_to_accept_audio(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_ready_to_accept_audio(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to send ready to accept audio notify: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+
+static int cmd_request_phone_number(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_request_phone_number(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to request phone number: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_transmit_dtmf_code(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_hf_call))) || !hfp_hf_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_transmit_dtmf_code(hfp_hf_call[index], argv[2][0]);
+	if (err) {
+		shell_error(sh, "Failed to transmit DTMF Code: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_query_subscriber(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_hf_query_subscriber(hfp_hf);
+	if (err) {
+		shell_error(sh, "Failed to query subscriber: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_indicator_status(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t status[4];
+	size_t len;
+
+	len = hex2bin(argv[1], strlen(argv[1]), status, sizeof(status));
+	if (len == 0) {
+		shell_error(sh, "Failed to parse status %s", argv[1]);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_hf_indicator_status(hfp_hf, (uint32_t)status[0]);
+	if (err) {
+		shell_error(sh, "Failed to set AG indicator activated/deactivated status: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY)
+static int cmd_enhanced_safety(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action;
+	bool enable;
+	int err;
+
+	action = argv[1];
+
+	if (strcmp(action, "enable") == 0) {
+		enable = true;
+	} else if (strcmp(action, "disable") == 0) {
+		enable = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_hf_enhanced_safety(hfp_hf, enable);
+	if (err) {
+		shell_error(sh, "Failed to transfer enhanced safety status: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY */
+
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY)
+static int cmd_battery(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int level;
+
+	level = atoi(argv[1]);
+
+	err = bt_hfp_hf_battery(hfp_hf, level);
+	if (err) {
+		shell_error(sh, "Failed to transfer battery level: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY */
+
+SHELL_STATIC_SUBCMD_SET_CREATE(hf_cmds,
+	SHELL_CMD_ARG(reg, NULL, HELP_NONE, cmd_reg_enable, 1, 0),
+	SHELL_CMD_ARG(connect, NULL, "<channel>", cmd_connect, 2, 0),
+	SHELL_CMD_ARG(disconnect, NULL, HELP_NONE, cmd_disconnect, 1, 0),
+	SHELL_CMD_ARG(sco_disconnect, NULL, HELP_NONE, cmd_sco_disconnect, 1, 0),
+#if defined(CONFIG_BT_HFP_HF_CLI)
+	SHELL_CMD_ARG(cli, NULL, "<enable/disable>", cmd_cli_enable, 2, 0),
+#endif /* CONFIG_BT_HFP_HF_CLI */
+#if defined(CONFIG_BT_HFP_HF_VOLUME)
+	SHELL_CMD_ARG(vgm, NULL, "<gain>", cmd_vgm_enable, 2, 0),
+	SHELL_CMD_ARG(vgs, NULL, "<gain>", cmd_vgs_enable, 2, 0),
+#endif /* CONFIG_BT_HFP_HF_VOLUME */
+	SHELL_CMD_ARG(operator, NULL, HELP_NONE, cmd_operator, 1, 0),
+#if defined(CONFIG_BT_HFP_HF_CODEC_NEG)
+	SHELL_CMD_ARG(audio_connect, NULL, HELP_NONE, cmd_audio_connect, 1, 0),
+	SHELL_CMD_ARG(select_codec, NULL, "Codec ID", cmd_select_codec, 2, 0),
+	SHELL_CMD_ARG(set_codecs, NULL, "Codec ID Map", cmd_set_codecs, 2, 0),
+#endif /* CONFIG_BT_HFP_HF_CODEC_NEG */
+	SHELL_CMD_ARG(accept, NULL, "<call index>", cmd_accept, 2, 0),
+	SHELL_CMD_ARG(reject, NULL, "<call index>", cmd_reject, 2, 0),
+	SHELL_CMD_ARG(terminate, NULL, "<call index>", cmd_terminate, 2, 0),
+	SHELL_CMD_ARG(hold_incoming, NULL, "<call index>", cmd_hold_incoming, 2, 0),
+	SHELL_CMD_ARG(query_respond_hold_status, NULL, HELP_NONE, cmd_query_respond_hold_status, 1,
+		      0),
+	SHELL_CMD_ARG(number_call, NULL, "<phone number>", cmd_number_call, 2, 0),
+	SHELL_CMD_ARG(memory_dial, NULL, "<memory location>", cmd_memory_dial, 2, 0),
+	SHELL_CMD_ARG(redial, NULL, HELP_NONE, cmd_redial, 1, 0),
+#if defined(CONFIG_BT_HFP_HF_ECNR)
+	SHELL_CMD_ARG(turn_off_ecnr, NULL, HELP_NONE, cmd_turn_off_ecnr, 1, 0),
+#endif /* CONFIG_BT_HFP_HF_ECNR */
+#if defined(CONFIG_BT_HFP_HF_3WAY_CALL)
+	SHELL_CMD_ARG(call_waiting_notify, NULL, "<enable/disable>", cmd_call_waiting_notify, 2, 0),
+	SHELL_CMD_ARG(release_all_held, NULL, HELP_NONE, cmd_release_all_held, 1, 0),
+	SHELL_CMD_ARG(set_udub, NULL, HELP_NONE, cmd_set_udub, 1, 0),
+	SHELL_CMD_ARG(release_active_accept_other, NULL, HELP_NONE, cmd_release_active_accept_other,
+		      1, 0),
+	SHELL_CMD_ARG(hold_active_accept_other, NULL, HELP_NONE, cmd_hold_active_accept_other, 1,
+		      0),
+	SHELL_CMD_ARG(join_conversation, NULL, HELP_NONE, cmd_join_conversation, 1, 0),
+	SHELL_CMD_ARG(explicit_call_transfer, NULL, HELP_NONE, cmd_explicit_call_transfer, 1, 0),
+	SHELL_CMD_ARG(release_specified_call, NULL, "<call index>", cmd_release_specified_call, 2,
+		      0),
+	SHELL_CMD_ARG(private_consultation_mode, NULL, "<call index>",
+		      cmd_private_consultation_mode, 2, 0),
+#endif /* CONFIG_BT_HFP_HF_3WAY_CALL */
+#if defined(CONFIG_BT_HFP_HF_VOICE_RECG)
+	SHELL_CMD_ARG(voice_recognition, NULL, "<activate/deactivate>", cmd_voice_recognition, 2,
+		      0),
+#if defined(CONFIG_BT_HFP_HF_ENH_VOICE_RECG)
+	SHELL_CMD_ARG(ready_to_accept_audio, NULL, HELP_NONE, cmd_ready_to_accept_audio, 1, 0),
+#endif /* CONFIG_BT_HFP_HF_ENH_VOICE_RECG */
+#endif /* CONFIG_BT_HFP_HF_VOICE_RECG */
+	SHELL_CMD_ARG(request_phone_number, NULL, HELP_NONE, cmd_request_phone_number, 1, 0),
+	SHELL_CMD_ARG(transmit_dtmf_code, NULL, "<call index> <code(set 0-9, #,*,A-D)>",
+		      cmd_transmit_dtmf_code, 3, 0),
+	SHELL_CMD_ARG(query_subscriber, NULL, HELP_NONE, cmd_query_subscriber, 1, 0),
+	SHELL_CMD_ARG(indicator_status, NULL, "<Activate/deactivate AG indicators bitmap>",
+		      cmd_indicator_status, 2, 0),
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY)
+	SHELL_CMD_ARG(enhanced_safety, NULL, "<enable/disable>", cmd_enhanced_safety, 2, 0),
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY */
+#if defined(CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY)
+	SHELL_CMD_ARG(battery, NULL, "<level>", cmd_battery, 2, 0),
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY */
+	SHELL_SUBCMD_SET_END
+);
+#endif /* CONFIG_BT_HFP_HF */
+
+#if defined(CONFIG_BT_HFP_AG)
+
+struct bt_hfp_ag *hfp_ag;
+struct bt_conn *hfp_ag_sco_conn;
+static struct bt_hfp_ag_call *hfp_ag_call[CONFIG_BT_HFP_AG_MAX_CALLS];
+
+static void ag_add_a_call(struct bt_hfp_ag_call *call)
+{
+	ARRAY_FOR_EACH(hfp_ag_call, i) {
+		if (!hfp_ag_call[i]) {
+			hfp_ag_call[i] = call;
+			return;
+		}
+	}
+}
+
+static void ag_remove_a_call(struct bt_hfp_ag_call *call)
+{
+	ARRAY_FOR_EACH(hfp_ag_call, i) {
+		if (call == hfp_ag_call[i]) {
+			hfp_ag_call[i] = NULL;
+			return;
+		}
+	}
+}
+
+static void ag_remove_calls(void)
+{
+	ARRAY_FOR_EACH(hfp_ag_call, i) {
+		if (hfp_ag_call[i] != NULL) {
+			hfp_ag_call[i] = NULL;
+		}
+	}
+}
+
+static void ag_connected(struct bt_conn *conn, struct bt_hfp_ag *ag)
+{
+	if (conn != default_conn) {
+		bt_shell_warn("The conn %p is not aligned with ACL conn %p", conn, default_conn);
+	}
+	hfp_ag = ag;
+	bt_shell_print("AG connected");
+}
+
+static void ag_disconnected(struct bt_hfp_ag *ag)
+{
+	ag_remove_calls();
+	bt_shell_print("AG disconnected");
+}
+
+static void ag_sco_connected(struct bt_hfp_ag *ag, struct bt_conn *sco_conn)
+{
+	bt_shell_print("AG SCO connected %p", sco_conn);
+
+	if (hfp_ag_sco_conn != NULL) {
+		bt_shell_warn("AG SCO conn %p exists", hfp_ag_sco_conn);
+		return;
+	}
+
+	hfp_ag_sco_conn = bt_conn_ref(sco_conn);
+}
+
+static void ag_sco_disconnected(struct bt_conn *sco_conn, uint8_t reason)
+{
+	bt_shell_print("AG SCO disconnected %p (reason %u)", sco_conn, reason);
+
+	if (hfp_ag_sco_conn == sco_conn) {
+		bt_conn_unref(hfp_ag_sco_conn);
+		hfp_ag_sco_conn = NULL;
+	} else {
+		bt_shell_warn("Unknown SCO disconnected (%p != %p)", hfp_ag_sco_conn, sco_conn);
+	}
+}
+
+static int ag_memory_dial(struct bt_hfp_ag *ag, const char *location, char **number)
+{
+	static char *phone = "123456789";
+
+	if (strcmp(location, "0")) {
+		return -ENOTSUP;
+	}
+
+	bt_shell_print("AG memory dial");
+
+	*number = phone;
+
+	return 0;
+}
+
+static int ag_number_call(struct bt_hfp_ag *ag, const char *number)
+{
+	static char *phone = "123456789";
+
+	bt_shell_print("AG number call");
+
+	if (strcmp(number, phone)) {
+		return -ENOTSUP;
+	}
+
+	return 0;
+}
+
+static void ag_outgoing(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number)
+{
+	bt_shell_print("AG outgoing call %p, number %s", call, number);
+	ag_add_a_call(call);
+}
+
+static void ag_incoming(struct bt_hfp_ag *ag, struct bt_hfp_ag_call *call, const char *number)
+{
+	bt_shell_print("AG incoming call %p, number %s", call, number);
+	ag_add_a_call(call);
+}
+
+static void ag_incoming_held(struct bt_hfp_ag_call *call)
+{
+	bt_shell_print("AG incoming call %p is held", call);
+}
+
+static void ag_ringing(struct bt_hfp_ag_call *call, bool in_band)
+{
+	bt_shell_print("AG call %p start ringing mode %d", call, in_band);
+}
+
+static void ag_accept(struct bt_hfp_ag_call *call)
+{
+	bt_shell_print("AG call %p accept", call);
+}
+
+static void ag_held(struct bt_hfp_ag_call *call)
+{
+	bt_shell_print("AG call %p held", call);
+}
+
+static void ag_retrieve(struct bt_hfp_ag_call *call)
+{
+	bt_shell_print("AG call %p retrieved", call);
+}
+
+static void ag_reject(struct bt_hfp_ag_call *call)
+{
+	bt_shell_print("AG call %p reject", call);
+	ag_remove_a_call(call);
+}
+
+static void ag_terminate(struct bt_hfp_ag_call *call)
+{
+	bt_shell_print("AG call %p terminate", call);
+	ag_remove_a_call(call);
+}
+
+static void ag_codec(struct bt_hfp_ag *ag, uint32_t ids)
+{
+	bt_shell_print("AG received codec id bit map %x", ids);
+}
+
+void ag_vgm(struct bt_hfp_ag *ag, uint8_t gain)
+{
+	bt_shell_print("AG received vgm %d", gain);
+}
+
+void ag_vgs(struct bt_hfp_ag *ag, uint8_t gain)
+{
+	bt_shell_print("AG received vgs %d", gain);
+}
+
+void ag_codec_negotiate(struct bt_hfp_ag *ag, int err)
+{
+	bt_shell_print("AG codec negotiation result %d", err);
+}
+
+void ag_audio_connect_req(struct bt_hfp_ag *ag)
+{
+	bt_shell_print("Receive audio connect request. "
+		       "Input `hfp ag audio_connect` to start audio connect");
+}
+
+void ag_ecnr_turn_off(struct bt_hfp_ag *ag)
+{
+	bt_shell_print("encr is disabled");
+}
+
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+void ag_explicit_call_transfer(struct bt_hfp_ag *ag)
+{
+	bt_shell_print("explicit call transfer");
+}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG)
+void ag_voice_recognition(struct bt_hfp_ag *ag, bool activate)
+{
+	bt_shell_print("AG Voice recognition %s", activate ? "activate" : "deactivate");
+}
+
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+void ag_ready_to_accept_audio(struct bt_hfp_ag *ag)
+{
+	bt_shell_print("hf is ready to accept audio");
+}
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG */
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_TAG)
+int ag_request_phone_number(struct bt_hfp_ag *ag, char **number)
+{
+	static bool valid_number;
+
+	if (valid_number && number) {
+		valid_number = false;
+		*number = "123456789";
+		return 0;
+	}
+
+	valid_number = true;
+	return -EINVAL;
+}
+#endif /* CONFIG_BT_HFP_AG_VOICE_TAG */
+
+void ag_transmit_dtmf_code(struct bt_hfp_ag *ag, char code)
+{
+	bt_shell_print("DTMF code is %c", code);
+}
+
+struct {
+	char *number;
+	uint8_t type;
+	uint8_t service;
+} ag_subscriber_number_info[] = {
+	{
+		.number = "12345678",
+		.type = 128,
+		.service = 4,
+	},
+	{
+		.number = "87654321",
+		.type = 128,
+		.service = 4,
+	},
+};
+
+static bool subscriber;
+
+int ag_subscriber_number(struct bt_hfp_ag *ag, bt_hfp_ag_query_subscriber_func_t func)
+{
+	int err;
+
+	if (subscriber && func) {
+		for (size_t index = 0; index < ARRAY_SIZE(ag_subscriber_number_info); index++) {
+			err = func(ag, ag_subscriber_number_info[index].number,
+				   ag_subscriber_number_info[index].type,
+				   ag_subscriber_number_info[index].service);
+			if (err < 0) {
+				break;
+			}
+		}
+	}
+	return 0;
+}
+
+void ag_hf_indicator_value(struct bt_hfp_ag *ag, enum hfp_ag_hf_indicators indicator,
+			   uint32_t value)
+{
+	bt_shell_print("indicator %d value %d", indicator, value);
+}
+
+static struct bt_hfp_ag_cb ag_cb = {
+	.connected = ag_connected,
+	.disconnected = ag_disconnected,
+	.sco_connected = ag_sco_connected,
+	.sco_disconnected = ag_sco_disconnected,
+	.memory_dial = ag_memory_dial,
+	.number_call = ag_number_call,
+	.outgoing = ag_outgoing,
+	.incoming = ag_incoming,
+	.incoming_held = ag_incoming_held,
+	.ringing = ag_ringing,
+	.accept = ag_accept,
+	.held = ag_held,
+	.retrieve = ag_retrieve,
+	.reject = ag_reject,
+	.terminate = ag_terminate,
+	.codec = ag_codec,
+	.codec_negotiate = ag_codec_negotiate,
+	.audio_connect_req = ag_audio_connect_req,
+	.vgm = ag_vgm,
+	.vgs = ag_vgs,
+#if defined(CONFIG_BT_HFP_AG_ECNR)
+	.ecnr_turn_off = ag_ecnr_turn_off,
+#endif /* CONFIG_BT_HFP_AG_ECNR */
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+	.explicit_call_transfer = ag_explicit_call_transfer,
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG)
+	.voice_recognition = ag_voice_recognition,
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+	.ready_to_accept_audio = ag_ready_to_accept_audio,
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG */
+#if defined(CONFIG_BT_HFP_AG_VOICE_TAG)
+	.request_phone_number = ag_request_phone_number,
+#endif /* CONFIG_BT_HFP_AG_VOICE_TAG */
+	.transmit_dtmf_code = ag_transmit_dtmf_code,
+	.subscriber_number = ag_subscriber_number,
+	.hf_indicator_value = ag_hf_indicator_value,
+};
+
+static int cmd_ag_reg_enable(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_ag_register(&ag_cb);
+	if (err) {
+		shell_error(sh, "Callback register failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_connect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	struct bt_hfp_ag *ag;
+	uint8_t channel;
+
+	channel = atoi(argv[1]);
+
+	err = bt_hfp_ag_connect(default_conn, &ag, channel);
+	if (err) {
+		shell_error(sh, "Connect failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_disconnect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_ag_disconnect(hfp_ag);
+	if (err) {
+		shell_error(sh, "Disconnect failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_sco_disconnect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_conn_disconnect(hfp_ag_sco_conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+	if (err) {
+		shell_error(sh, "Disconnect failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_remote_incoming(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_ag_remote_incoming(hfp_ag, argv[1]);
+	if (err) {
+		shell_error(sh, "Set remote incoming failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_hold_incoming(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_hold_incoming(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set remote incoming failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_remote_reject(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_remote_reject(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set remote reject failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_remote_accept(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_remote_accept(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set remote accept failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_remote_terminate(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_remote_terminate(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set remote terminate failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_remote_ringing(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_remote_ringing(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set remote ringing failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_outgoing(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_ag_outgoing(hfp_ag, argv[1]);
+	if (err) {
+		shell_error(sh, "Set outgoing failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_reject(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_reject(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set reject failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_accept(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_accept(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set accept failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_hold(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_hold(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set hold failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_retrieve(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_retrieve(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set retrieve failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_terminate(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int index;
+
+	index = atoi(argv[1]);
+	if ((index >= ((int)ARRAY_SIZE(hfp_ag_call))) || !hfp_ag_call[index]) {
+		shell_error(sh, "Invalid call index: %d", index);
+		return -EINVAL;
+	}
+
+	err = bt_hfp_ag_terminate(hfp_ag_call[index]);
+	if (err) {
+		shell_error(sh, "Set terminate failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_vgm(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t vgm;
+
+	vgm = atoi(argv[1]);
+
+	err = bt_hfp_ag_vgm(hfp_ag, vgm);
+	if (err) {
+		shell_error(sh, "Set microphone gain failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_vgs(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t vgs;
+
+	vgs = atoi(argv[1]);
+
+	err = bt_hfp_ag_vgs(hfp_ag, vgs);
+	if (err) {
+		shell_error(sh, "Set speaker gain failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_operator(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t mode;
+
+	mode = atoi(argv[1]);
+
+	err = bt_hfp_ag_set_operator(hfp_ag, mode, argv[2]);
+	if (err) {
+		shell_error(sh, "Set network operator failed: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_AG_CODEC_NEG)
+static int cmd_ag_audio_connect(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t id;
+
+	id = atoi(argv[1]);
+
+	err = bt_hfp_ag_audio_connect(hfp_ag, id);
+	if (err) {
+		shell_error(sh, "Start audio connection procedure failed: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_AG_CODEC_NEG */
+
+static int cmd_ag_inband_ringtone(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action;
+	bool enable;
+	int err;
+
+	action = argv[1];
+
+	if (strcmp(action, "enable") == 0) {
+		enable = true;
+	} else if (strcmp(action, "disable") == 0) {
+		enable = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_ag_inband_ringtone(hfp_ag, (bool)enable);
+	if (err) {
+		shell_error(sh, "Set inband ringtone failed: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+static int cmd_ag_explicit_call_transfer(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+
+	err = bt_hfp_ag_explicit_call_transfer(hfp_ag);
+	if (err) {
+		shell_error(sh, "Explicit call transfer failed: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG)
+static int cmd_ag_voice_recognition(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action;
+	bool enable;
+	int err;
+
+	action = argv[1];
+
+	if (strcmp(action, "activate") == 0) {
+		enable = true;
+	} else if (strcmp(action, "deactivate") == 0) {
+		enable = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_ag_voice_recognition(hfp_ag, enable);
+	if (err) {
+		shell_error(sh, "Set voice recognition failed: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+static int cmd_ag_vre_state(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action;
+	uint8_t state = 0;
+	int err;
+
+	action = argv[1];
+
+	for (size_t index = 0; index < strlen(action); index++) {
+		switch (action[index]) {
+		case 'R':
+			state |= BIT(0);
+			break;
+		case 'S':
+			state |= BIT(1);
+			break;
+		case 'P':
+			state |= BIT(2);
+			break;
+		}
+	}
+
+	err = bt_hfp_ag_vre_state(hfp_ag, state);
+	if (err) {
+		shell_error(sh, "Set voice recognition engine state failed: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG_TEXT)
+static int cmd_ag_vre_text(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action;
+	uint8_t state = 0;
+	const char *id;
+	uint8_t type;
+	uint8_t operation;
+	const char *text;
+	int err;
+
+	action = argv[1];
+	id = argv[2];
+	type = (uint8_t)atoi(argv[3]);
+	operation = (uint8_t)atoi(argv[4]);
+	text = argv[5];
+
+	for (size_t index = 0; index < strlen(action); index++) {
+		switch (action[index]) {
+		case 'R':
+			state |= BIT(0);
+			break;
+		case 'S':
+			state |= BIT(1);
+			break;
+		case 'P':
+			state |= BIT(2);
+			break;
+		}
+	}
+
+	err = bt_hfp_ag_vre_textual_representation(hfp_ag, state, id, type, operation, text);
+	if (err) {
+		shell_error(sh, "Set voice recognition engine textual representation failed: %d",
+			    err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG_TEXT */
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG */
+
+static int cmd_ag_subscriber(const struct shell *sh, size_t argc, char **argv)
+{
+	const char *action;
+
+	action = argv[1];
+
+	if (strcmp(action, "empty") == 0) {
+		subscriber = false;
+	} else if (strcmp(action, "notempty") == 0) {
+		subscriber = true;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int cmd_ag_signal_strength(const struct shell *sh, size_t argc, char **argv)
+{
+	uint8_t strength;
+	int err;
+
+	strength = (uint8_t)atoi(argv[1]);
+
+	err = bt_hfp_ag_signal_strength(hfp_ag, strength);
+	if (err) {
+		shell_error(sh, "Set signal strength failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_roaming_status(const struct shell *sh, size_t argc, char **argv)
+{
+	uint8_t status;
+	int err;
+
+	status = (uint8_t)atoi(argv[1]);
+
+	err = bt_hfp_ag_roaming_status(hfp_ag, status);
+	if (err) {
+		shell_error(sh, "Set roaming status failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_battery_level(const struct shell *sh, size_t argc, char **argv)
+{
+	uint8_t level;
+	int err;
+
+	level = (uint8_t)atoi(argv[1]);
+
+	err = bt_hfp_ag_battery_level(hfp_ag, level);
+	if (err) {
+		shell_error(sh, "Set battery level failed: %d", err);
+	}
+
+	return err;
+}
+
+static int cmd_ag_service_availability(const struct shell *sh, size_t argc, char **argv)
+{
+	bool available;
+	const char *action;
+	int err;
+
+	action = argv[1];
+
+	if (strcmp(action, "yes") == 0) {
+		available = true;
+	} else if (strcmp(action, "no") == 0) {
+		available = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_ag_service_availability(hfp_ag, available);
+	if (err) {
+		shell_error(sh, "Set service availability failed: %d", err);
+	}
+
+	return err;
+}
+
+#if defined(CONFIG_BT_HFP_AG_HF_INDICATORS)
+static int cmd_ag_hf_indicator(const struct shell *sh, size_t argc, char **argv)
+{
+	bool enable;
+	const char *action;
+	int err;
+	size_t indicator;
+
+	indicator = atoi(argv[1]);
+	action = argv[2];
+
+	if (strcmp(action, "enable") == 0) {
+		enable = true;
+	} else if (strcmp(action, "disable") == 0) {
+		enable = false;
+	} else {
+		shell_error(sh, "Invalid option.");
+		return -ENOEXEC;
+	}
+
+	err = bt_hfp_ag_hf_indicator(hfp_ag, indicator, enable);
+	if (err) {
+		shell_error(sh, "Activate/deactivate HF indicator failed: %d", err);
+	}
+
+	return err;
+}
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+
+#define HELP_AG_TEXTUAL_REPRESENTATION          \
+	"<[R-ready][S-send][P-processing]> "        \
+	"<id> <type> <operation> <text string>"
+
+SHELL_STATIC_SUBCMD_SET_CREATE(ag_cmds,
+	SHELL_CMD_ARG(reg, NULL, HELP_NONE, cmd_ag_reg_enable, 1, 0),
+	SHELL_CMD_ARG(connect, NULL, "<channel>", cmd_ag_connect, 2, 0),
+	SHELL_CMD_ARG(disconnect, NULL, HELP_NONE, cmd_ag_disconnect, 1, 0),
+	SHELL_CMD_ARG(sco_disconnect, NULL, HELP_NONE, cmd_ag_sco_disconnect, 1, 0),
+	SHELL_CMD_ARG(remote_incoming, NULL, "<number>", cmd_ag_remote_incoming, 2, 0),
+	SHELL_CMD_ARG(hold_incoming, NULL, "<number>", cmd_ag_hold_incoming, 2, 0),
+	SHELL_CMD_ARG(remote_reject, NULL, "<call index>", cmd_ag_remote_reject, 2, 0),
+	SHELL_CMD_ARG(remote_accept, NULL, "<call index>", cmd_ag_remote_accept, 2, 0),
+	SHELL_CMD_ARG(remote_terminate, NULL, "<call index>", cmd_ag_remote_terminate, 2, 0),
+	SHELL_CMD_ARG(remote_ringing, NULL, "<call index>", cmd_ag_remote_ringing, 2, 0),
+	SHELL_CMD_ARG(outgoing, NULL, "<number>", cmd_ag_outgoing, 2, 0),
+	SHELL_CMD_ARG(reject, NULL, "<call index>", cmd_ag_reject, 2, 0),
+	SHELL_CMD_ARG(accept, NULL, "<call index>", cmd_ag_accept, 2, 0),
+	SHELL_CMD_ARG(hold, NULL, "<call index>", cmd_ag_hold, 2, 0),
+	SHELL_CMD_ARG(retrieve, NULL, "<call index>", cmd_ag_retrieve, 2, 0),
+	SHELL_CMD_ARG(terminate, NULL, "<call index>", cmd_ag_terminate, 2, 0),
+	SHELL_CMD_ARG(vgm, NULL, "<gain>", cmd_ag_vgm, 2, 0),
+	SHELL_CMD_ARG(vgs, NULL, "<gain>", cmd_ag_vgs, 2, 0),
+	SHELL_CMD_ARG(operator, NULL, "<mode> <operator>", cmd_ag_operator, 3, 0),
+#if defined(CONFIG_BT_HFP_AG_CODEC_NEG)
+	SHELL_CMD_ARG(audio_connect, NULL, "<codec id>", cmd_ag_audio_connect, 2, 0),
+#endif /* CONFIG_BT_HFP_AG_CODEC_NEG */
+	SHELL_CMD_ARG(inband_ringtone, NULL, "<enable/disable>", cmd_ag_inband_ringtone, 2, 0),
+#if defined(CONFIG_BT_HFP_AG_3WAY_CALL)
+	SHELL_CMD_ARG(explicit_call_transfer, NULL, HELP_NONE, cmd_ag_explicit_call_transfer, 1, 0),
+#endif /* CONFIG_BT_HFP_AG_3WAY_CALL */
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG)
+	SHELL_CMD_ARG(voice_recognition, NULL, "<activate/deactivate>", cmd_ag_voice_recognition, 2,
+		      0),
+#if defined(CONFIG_BT_HFP_AG_ENH_VOICE_RECG)
+	SHELL_CMD_ARG(vre_state, NULL, "<[R-ready][S-send][P-processing]>", cmd_ag_vre_state, 2, 0),
+#endif /* CONFIG_BT_HFP_AG_ENH_VOICE_RECG */
+#if defined(CONFIG_BT_HFP_AG_VOICE_RECG_TEXT)
+	SHELL_CMD_ARG(vre_text, NULL, HELP_AG_TEXTUAL_REPRESENTATION, cmd_ag_vre_text, 6, 0),
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG_TEXT */
+#endif /* CONFIG_BT_HFP_AG_VOICE_RECG */
+	SHELL_CMD_ARG(subscriber, NULL, "<empty/notempty>", cmd_ag_subscriber, 2, 0),
+	SHELL_CMD_ARG(signal_strength, NULL, "<signal strength>", cmd_ag_signal_strength, 2, 0),
+	SHELL_CMD_ARG(roaming_status, NULL, "<roaming status>", cmd_ag_roaming_status, 2, 0),
+	SHELL_CMD_ARG(battery_level, NULL, "<battery level>", cmd_ag_battery_level, 2, 0),
+	SHELL_CMD_ARG(service_availability, NULL, "<yes/no>", cmd_ag_service_availability, 2, 0),
+#if defined(CONFIG_BT_HFP_AG_HF_INDICATORS)
+	SHELL_CMD_ARG(hf_indicator, NULL, "<indicator> <enable/disable>", cmd_ag_hf_indicator, 3,
+		      0),
+#endif /* CONFIG_BT_HFP_HF_HF_INDICATORS */
+	SHELL_SUBCMD_SET_END
+);
+#endif /* CONFIG_BT_HFP_AG */
+
+static int cmd_default(const struct shell *sh, size_t argc, char **argv)
+{
+	if (argc == 1) {
+		shell_help(sh);
+		/* sh returns 1 when help is printed */
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	shell_error(sh, "%s unknown parameter: %s", argv[0], argv[1]);
+
+	return -ENOEXEC;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(hfp_cmds,
+#if defined(CONFIG_BT_HFP_HF)
+	SHELL_CMD(hf, &hf_cmds, "HFP HF shell commands", cmd_default),
+#endif /* CONFIG_BT_HFP_HF */
+#if defined(CONFIG_BT_HFP_AG)
+	SHELL_CMD(ag, &ag_cmds, "HFP AG shell commands", cmd_default),
+#endif /* CONFIG_BT_HFP_AG */
+	SHELL_SUBCMD_SET_END
+);
+
+SHELL_CMD_ARG_REGISTER(hfp, &hfp_cmds, "Bluetooth HFP shell commands", cmd_default, 1, 1);
diff --git a/subsys/bluetooth/host/classic/ssp.c b/subsys/bluetooth/host/classic/ssp.c
index 6884b731027bb..7875eda6ab9d3 100644
--- a/subsys/bluetooth/host/classic/ssp.c
+++ b/subsys/bluetooth/host/classic/ssp.c
@@ -21,6 +21,7 @@
 
 #include "host/hci_core.h"
 #include "host/conn_internal.h"
+#include "l2cap_br_internal.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
 #include <zephyr/logging/log.h>
@@ -161,11 +162,20 @@ static uint8_t ssp_pair_method(const struct bt_conn *conn)
 
 static uint8_t ssp_get_auth(const struct bt_conn *conn)
 {
+	bt_security_t max_sec_level;
+	uint8_t mitm = 0;
+
+	/* Check if the MITM is required by service */
+	max_sec_level = bt_l2cap_br_get_max_sec_level();
+	if ((max_sec_level > BT_SECURITY_L2) && (ssp_pair_method(conn) > JUST_WORKS)) {
+		mitm = BT_MITM;
+	}
+
 	/* Validate no bond auth request, and if valid use it. */
 	if ((conn->br.remote_auth == BT_HCI_NO_BONDING) ||
 	    ((conn->br.remote_auth == BT_HCI_NO_BONDING_MITM) &&
 	     (ssp_pair_method(conn) > JUST_WORKS))) {
-		return conn->br.remote_auth;
+		return conn->br.remote_auth | mitm;
 	}
 
 	/* Local & remote have enough IO capabilities to get MITM protection. */
@@ -676,21 +686,13 @@ void bt_hci_io_capa_req(struct net_buf *buf)
 
 		err = bt_auth->pairing_accept(conn, NULL);
 		if (err != BT_SECURITY_ERR_SUCCESS) {
-			io_capa_neg_reply(&evt->bdaddr,
-					  BT_HCI_ERR_PAIRING_NOT_ALLOWED);
+			io_capa_neg_reply(&evt->bdaddr, BT_HCI_ERR_PAIRING_NOT_ALLOWED);
+			bt_conn_unref(conn);
 			return;
 		}
 	}
 #endif
 
-	resp_buf = bt_hci_cmd_create(BT_HCI_OP_IO_CAPABILITY_REPLY,
-				     sizeof(*cp));
-	if (!resp_buf) {
-		LOG_ERR("Out of command buffers");
-		bt_conn_unref(conn);
-		return;
-	}
-
 	/*
 	 * Set authentication requirements when acting as pairing initiator to
 	 * 'dedicated bond' with MITM protection set if local IO capa
@@ -718,6 +720,25 @@ void bt_hci_io_capa_req(struct net_buf *buf)
 		}
 	} else {
 		auth = ssp_get_auth(conn);
+
+		/*
+		 * Core v6.0, Vol 3, Part C, Section 4.3.1 Non-bondable mode
+		 * When a Bluetooth device is in non-bondable mode it shall not accept a
+		 * pairing request that results in bonding. Devices in non-bondable mode
+		 * may accept connections that do not request or require bonding.
+		 *
+		 * If the peer supports bonding mode, but the local is in non-bondable
+		 * mode, it will send a negative response with error code
+		 * `BT_HCI_ERR_PAIRING_NOT_ALLOWED`.
+		 */
+		if (!atomic_test_bit(conn->flags, BT_CONN_BR_BONDABLE) &&
+		    (conn->br.remote_auth > BT_HCI_NO_BONDING_MITM)) {
+			LOG_WRN("Invalid remote bonding requirements");
+			io_capa_neg_reply(&evt->bdaddr,
+					  BT_HCI_ERR_PAIRING_NOT_ALLOWED);
+			bt_conn_unref(conn);
+			return;
+		}
 	}
 
 	if (!atomic_test_bit(conn->flags, BT_CONN_BR_BONDABLE)) {
@@ -725,6 +746,13 @@ void bt_hci_io_capa_req(struct net_buf *buf)
 		auth = BT_HCI_SET_NO_BONDING(auth);
 	}
 
+	resp_buf = bt_hci_cmd_create(BT_HCI_OP_IO_CAPABILITY_REPLY, sizeof(*cp));
+	if (!resp_buf) {
+		LOG_ERR("Out of command buffers");
+		bt_conn_unref(conn);
+		return;
+	}
+
 	cp = net_buf_add(resp_buf, sizeof(*cp));
 	bt_addr_copy(&cp->bdaddr, &evt->bdaddr);
 	cp->capability = get_io_capa();
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index a781c7efa6c94..f75147d6e53cc 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -6,11 +6,29 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-#include <zephyr/kernel.h>
-#include <string.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/direction.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/irq.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
@@ -20,35 +38,29 @@
 #include <zephyr/sys/slist.h>
 #include <zephyr/debug/stack.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/direction.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/hci_vs.h>
-#include <zephyr/bluetooth/att.h>
-
+#include "addr_internal.h"
+#include "adv.h"
+#include "att_internal.h"
+#include "buf_view.h"
+#include "classic/conn_br_internal.h"
+#include "classic/sco_internal.h"
+#include "classic/ssp.h"
 #include "common/assert.h"
 #include "common/bt_str.h"
-
-#include "buf_view.h"
-#include "addr_internal.h"
+#include "conn_internal.h"
+#include "direction_internal.h"
 #include "hci_core.h"
 #include "id.h"
-#include "adv.h"
-#include "scan.h"
-#include "conn_internal.h"
-#include "l2cap_internal.h"
+#include "iso_internal.h"
 #include "keys.h"
+#include "l2cap_internal.h"
+#include "scan.h"
 #include "smp.h"
-#include "classic/ssp.h"
-#include "att_internal.h"
-#include "iso_internal.h"
-#include "direction_internal.h"
-#include "classic/sco_internal.h"
 
 #define LOG_LEVEL CONFIG_BT_CONN_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_conn);
 
 K_FIFO_DEFINE(free_tx);
@@ -111,8 +123,6 @@ static sys_slist_t conn_cbs = SYS_SLIST_STATIC_INIT(&conn_cbs);
 static struct bt_conn_tx conn_tx[CONFIG_BT_CONN_TX_MAX];
 
 #if defined(CONFIG_BT_CLASSIC)
-static int bt_hci_connect_br_cancel(struct bt_conn *conn);
-
 static struct bt_conn sco_conns[CONFIG_BT_MAX_SCO_CONN];
 #endif /* CONFIG_BT_CLASSIC */
 #endif /* CONFIG_BT_CONN */
@@ -1883,6 +1893,9 @@ int bt_conn_disconnect(struct bt_conn *conn, uint8_t reason)
 #if defined(CONFIG_BT_CLASSIC)
 		else if (conn->type == BT_CONN_TYPE_BR) {
 			return bt_hci_connect_br_cancel(conn);
+		} else if (conn->type == BT_CONN_TYPE_SCO) {
+			/* There is no HCI cmd to cancel SCO connecting from spec */
+			return -EPROTONOSUPPORT;
 		}
 #endif /* CONFIG_BT_CLASSIC */
 		else {
@@ -2297,68 +2310,11 @@ static struct bt_conn *acl_conn_new(void)
 }
 
 #if defined(CONFIG_BT_CLASSIC)
-void bt_sco_cleanup(struct bt_conn *sco_conn)
-{
-	bt_sco_cleanup_acl(sco_conn);
-	bt_conn_unref(sco_conn);
-}
-
 static struct bt_conn *sco_conn_new(void)
 {
 	return bt_conn_new(sco_conns, ARRAY_SIZE(sco_conns));
 }
 
-struct bt_conn *bt_conn_create_br(const bt_addr_t *peer,
-				  const struct bt_br_conn_param *param)
-{
-	struct bt_hci_cp_connect *cp;
-	struct bt_conn *conn;
-	struct net_buf *buf;
-
-	conn = bt_conn_lookup_addr_br(peer);
-	if (conn) {
-		switch (conn->state) {
-		case BT_CONN_INITIATING:
-		case BT_CONN_CONNECTED:
-			return conn;
-		default:
-			bt_conn_unref(conn);
-			return NULL;
-		}
-	}
-
-	conn = bt_conn_add_br(peer);
-	if (!conn) {
-		return NULL;
-	}
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_CONNECT, sizeof(*cp));
-	if (!buf) {
-		bt_conn_unref(conn);
-		return NULL;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-
-	(void)memset(cp, 0, sizeof(*cp));
-
-	memcpy(&cp->bdaddr, peer, sizeof(cp->bdaddr));
-	cp->packet_type = sys_cpu_to_le16(0xcc18); /* DM1 DH1 DM3 DH5 DM5 DH5 */
-	cp->pscan_rep_mode = 0x02; /* R2 */
-	cp->allow_role_switch = param->allow_role_switch ? 0x01 : 0x00;
-	cp->clock_offset = 0x0000; /* TODO used cached clock offset */
-
-	if (bt_hci_cmd_send_sync(BT_HCI_OP_CONNECT, buf, NULL) < 0) {
-		bt_conn_unref(conn);
-		return NULL;
-	}
-
-	bt_conn_set_state(conn, BT_CONN_INITIATING);
-	conn->role = BT_CONN_ROLE_CENTRAL;
-
-	return conn;
-}
-
 struct bt_conn *bt_conn_lookup_addr_sco(const bt_addr_t *peer)
 {
 	int i;
@@ -2390,6 +2346,11 @@ struct bt_conn *bt_conn_lookup_addr_br(const bt_addr_t *peer)
 {
 	int i;
 
+	if (peer == NULL) {
+		LOG_DBG("Invalid peer address");
+		return NULL;
+	}
+
 	for (i = 0; i < ARRAY_SIZE(acl_conns); i++) {
 		struct bt_conn *conn = bt_conn_ref(&acl_conns[i]);
 
@@ -2461,36 +2422,6 @@ struct bt_conn *bt_conn_add_br(const bt_addr_t *peer)
 
 	return conn;
 }
-
-static int bt_hci_connect_br_cancel(struct bt_conn *conn)
-{
-	struct bt_hci_cp_connect_cancel *cp;
-	struct bt_hci_rp_connect_cancel *rp;
-	struct net_buf *buf, *rsp;
-	int err;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_CONNECT_CANCEL, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	memcpy(&cp->bdaddr, &conn->br.dst, sizeof(cp->bdaddr));
-
-	err = bt_hci_cmd_send_sync(BT_HCI_OP_CONNECT_CANCEL, buf, &rsp);
-	if (err) {
-		return err;
-	}
-
-	rp = (void *)rsp->data;
-
-	err = rp->status ? -EIO : 0;
-
-	net_buf_unref(rsp);
-
-	return err;
-}
-
 #endif /* CONFIG_BT_CLASSIC */
 
 #if defined(CONFIG_BT_SMP)
@@ -2978,7 +2909,9 @@ int bt_conn_get_info(const struct bt_conn *conn, struct bt_conn_info *info)
 #if defined(CONFIG_BT_ISO)
 	case BT_CONN_TYPE_ISO:
 		if (IS_ENABLED(CONFIG_BT_ISO_UNICAST) &&
-		    conn->iso.info.type == BT_ISO_CHAN_TYPE_CONNECTED && conn->iso.acl != NULL) {
+		    (conn->iso.info.type == BT_ISO_CHAN_TYPE_CENTRAL ||
+		     conn->iso.info.type == BT_ISO_CHAN_TYPE_PERIPHERAL) &&
+		    conn->iso.acl != NULL) {
 			info->le.dst = &conn->iso.acl->le.dst;
 			info->le.src = &bt_dev.id_addr[conn->iso.acl->id];
 		} else {
@@ -3003,8 +2936,7 @@ bool bt_conn_is_type(const struct bt_conn *conn, enum bt_conn_type type)
 	return (conn->type & type) != 0;
 }
 
-int bt_conn_get_remote_info(struct bt_conn *conn,
-			    struct bt_conn_remote_info *remote_info)
+int bt_conn_get_remote_info(const struct bt_conn *conn, struct bt_conn_remote_info *remote_info)
 {
 	if (!bt_conn_is_type(conn, BT_CONN_TYPE_LE | BT_CONN_TYPE_BR)) {
 		LOG_DBG("Invalid connection type: %u for %p", conn->type, conn);
@@ -3400,53 +3332,56 @@ int bt_conn_le_subrate_request(struct bt_conn *conn,
 #endif /* CONFIG_BT_SUBRATING */
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-void notify_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities params)
+void notify_remote_cs_capabilities(struct bt_conn *conn, uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_remote_capabilities_available) {
-			callback->le_cs_remote_capabilities_available(conn, &params);
+		if (callback->le_cs_read_remote_capabilities_complete) {
+			callback->le_cs_read_remote_capabilities_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_remote_capabilities_available) {
-			cb->le_cs_remote_capabilities_available(conn, &params);
+		if (cb->le_cs_read_remote_capabilities_complete) {
+			cb->le_cs_read_remote_capabilities_complete(conn, status, params);
 		}
 	}
 }
 
-void notify_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table params)
+void notify_remote_cs_fae_table(struct bt_conn *conn, uint8_t status,
+				struct bt_conn_le_cs_fae_table *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_remote_fae_table_available) {
-			callback->le_cs_remote_fae_table_available(conn, &params);
+		if (callback->le_cs_read_remote_fae_table_complete) {
+			callback->le_cs_read_remote_fae_table_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_remote_fae_table_available) {
-			cb->le_cs_remote_fae_table_available(conn, &params);
+		if (cb->le_cs_read_remote_fae_table_complete) {
+			cb->le_cs_read_remote_fae_table_complete(conn, status, params);
 		}
 	}
 }
 
-void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params)
+void notify_cs_config_created(struct bt_conn *conn, uint8_t status,
+			      struct bt_conn_le_cs_config *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_config_created) {
-			callback->le_cs_config_created(conn, params);
+		if (callback->le_cs_config_complete) {
+			callback->le_cs_config_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_config_created) {
-			cb->le_cs_config_created(conn, params);
+		if (cb->le_cs_config_complete) {
+			cb->le_cs_config_complete(conn, status, params);
 		}
 	}
 }
@@ -3468,37 +3403,37 @@ void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id)
 	}
 }
 
-void notify_cs_security_enable_available(struct bt_conn *conn)
+void notify_cs_security_enable_available(struct bt_conn *conn, uint8_t status)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_security_enabled) {
-			callback->le_cs_security_enabled(conn);
+		if (callback->le_cs_security_enable_complete) {
+			callback->le_cs_security_enable_complete(conn, status);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_security_enabled) {
-			cb->le_cs_security_enabled(conn);
+		if (cb->le_cs_security_enable_complete) {
+			cb->le_cs_security_enable_complete(conn, status);
 		}
 	}
 }
 
-void notify_cs_procedure_enable_available(struct bt_conn *conn,
+void notify_cs_procedure_enable_available(struct bt_conn *conn, uint8_t status,
 					  struct bt_conn_le_cs_procedure_enable_complete *params)
 {
 	struct bt_conn_cb *callback;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->le_cs_procedure_enabled) {
-			callback->le_cs_procedure_enabled(conn, params);
+		if (callback->le_cs_procedure_enable_complete) {
+			callback->le_cs_procedure_enable_complete(conn, status, params);
 		}
 	}
 
 	STRUCT_SECTION_FOREACH(bt_conn_cb, cb) {
-		if (cb->le_cs_procedure_enabled) {
-			cb->le_cs_procedure_enabled(conn, params);
+		if (cb->le_cs_procedure_enable_complete) {
+			cb->le_cs_procedure_enable_complete(conn, status, params);
 		}
 	}
 }
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index cd4eb2b8045d4..eddd2eb2c72d4 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -9,7 +9,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 
 typedef enum __packed {
 	BT_CONN_DISCONNECTED,         /* Disconnected, conn is completely down */
@@ -423,9 +436,6 @@ void bt_sco_cleanup(struct bt_conn *sco_conn);
 /* Look up an existing sco connection by BT address */
 struct bt_conn *bt_conn_lookup_addr_sco(const bt_addr_t *peer);
 
-/* Look up an existing connection by BT address */
-struct bt_conn *bt_conn_lookup_addr_br(const bt_addr_t *peer);
-
 void bt_conn_disconnect_all(uint8_t id);
 
 /* Allocate new connection object */
@@ -498,20 +508,25 @@ void notify_subrate_change(struct bt_conn *conn,
 			   struct bt_conn_le_subrate_changed params);
 
 void notify_remote_cs_capabilities(struct bt_conn *conn,
-			   struct bt_conn_le_cs_capabilities params);
+				   uint8_t status,
+				   struct bt_conn_le_cs_capabilities *params);
 
 void notify_remote_cs_fae_table(struct bt_conn *conn,
-			   struct bt_conn_le_cs_fae_table params);
+				uint8_t status,
+				struct bt_conn_le_cs_fae_table *params);
 
-void notify_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *params);
+void notify_cs_config_created(struct bt_conn *conn,
+			      uint8_t status,
+			      struct bt_conn_le_cs_config *params);
 
 void notify_cs_config_removed(struct bt_conn *conn, uint8_t config_id);
 
 void notify_cs_subevent_result(struct bt_conn *conn, struct bt_conn_le_cs_subevent_result *result);
 
-void notify_cs_security_enable_available(struct bt_conn *conn);
+void notify_cs_security_enable_available(struct bt_conn *conn, uint8_t status);
 
 void notify_cs_procedure_enable_available(struct bt_conn *conn,
+					  uint8_t status,
 					  struct bt_conn_le_cs_procedure_enable_complete *params);
 
 #if defined(CONFIG_BT_SMP)
diff --git a/subsys/bluetooth/host/crypto_psa.c b/subsys/bluetooth/host/crypto_psa.c
index f71584c649cff..2586da08f178f 100644
--- a/subsys/bluetooth/host/crypto_psa.c
+++ b/subsys/bluetooth/host/crypto_psa.c
@@ -5,26 +5,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <string.h>
 #include <errno.h>
+#include <stdint.h>
+#include <string.h>
 
-#include <zephyr/kernel.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/check.h>
-
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/crypto.h>
-
-#include "psa/crypto.h"
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
+#include <psa/crypto.h>
+#include <psa/crypto_struct.h>
+#include <psa/crypto_types.h>
+#include <psa/crypto_values.h>
 
 #include "common/bt_str.h"
-
 #include "hci_core.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_host_crypto);
 
 int bt_crypto_init(void)
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index da2480739d1ce..da0d372602317 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -5,16 +5,28 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-#include <zephyr/sys/byteorder.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/cs.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "conn_internal.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_cs);
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
@@ -22,6 +34,11 @@ LOG_MODULE_REGISTER(bt_cs);
 static struct bt_le_cs_test_cb cs_test_callbacks;
 #endif
 
+#define A1 (0)
+#define A2 (1)
+#define A3 (2)
+#define A4 (3)
+
 struct reassembly_buf_meta_data {
 	uint16_t conn_handle;
 };
@@ -305,7 +322,6 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Read Remote Supported Capabilities failed (status 0x%02X)", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
@@ -314,95 +330,106 @@ void bt_hci_le_cs_read_remote_supported_capabilities_complete(struct net_buf *bu
 		return;
 	}
 
-	remote_cs_capabilities.num_config_supported = evt->num_config_supported;
-	remote_cs_capabilities.max_consecutive_procedures_supported =
-		sys_le16_to_cpu(evt->max_consecutive_procedures_supported);
-	remote_cs_capabilities.num_antennas_supported = evt->num_antennas_supported;
-	remote_cs_capabilities.max_antenna_paths_supported = evt->max_antenna_paths_supported;
-
-	remote_cs_capabilities.initiator_supported =
-		evt->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
-	remote_cs_capabilities.reflector_supported =
-		evt->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
-	remote_cs_capabilities.mode_3_supported =
-		evt->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
-
-	remote_cs_capabilities.rtt_aa_only_n = evt->rtt_aa_only_n;
-	remote_cs_capabilities.rtt_sounding_n = evt->rtt_sounding_n;
-	remote_cs_capabilities.rtt_random_payload_n = evt->rtt_random_payload_n;
-
-	if (evt->rtt_aa_only_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_aa_only_precision =
-				BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		remote_cs_capabilities.num_config_supported = evt->num_config_supported;
+		remote_cs_capabilities.max_consecutive_procedures_supported =
+			sys_le16_to_cpu(evt->max_consecutive_procedures_supported);
+		remote_cs_capabilities.num_antennas_supported = evt->num_antennas_supported;
+		remote_cs_capabilities.max_antenna_paths_supported =
+			evt->max_antenna_paths_supported;
+
+		remote_cs_capabilities.initiator_supported =
+			evt->roles_supported & BT_HCI_LE_CS_INITIATOR_ROLE_MASK;
+		remote_cs_capabilities.reflector_supported =
+			evt->roles_supported & BT_HCI_LE_CS_REFLECTOR_ROLE_MASK;
+		remote_cs_capabilities.mode_3_supported =
+			evt->modes_supported & BT_HCI_LE_CS_MODES_SUPPORTED_MODE_3_MASK;
+
+		remote_cs_capabilities.rtt_aa_only_n = evt->rtt_aa_only_n;
+		remote_cs_capabilities.rtt_sounding_n = evt->rtt_sounding_n;
+		remote_cs_capabilities.rtt_random_payload_n = evt->rtt_random_payload_n;
+
+		if (evt->rtt_aa_only_n) {
+			if (evt->rtt_capability & BT_HCI_LE_CS_RTT_AA_ONLY_N_10NS_MASK) {
+				remote_cs_capabilities.rtt_aa_only_precision =
+					BT_CONN_LE_CS_RTT_AA_ONLY_10NS;
+			} else {
+				remote_cs_capabilities.rtt_aa_only_precision =
+					BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
+			}
 		} else {
 			remote_cs_capabilities.rtt_aa_only_precision =
-				BT_CONN_LE_CS_RTT_AA_ONLY_150NS;
+				BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
 		}
-	} else {
-		remote_cs_capabilities.rtt_aa_only_precision = BT_CONN_LE_CS_RTT_AA_ONLY_NOT_SUPP;
-	}
 
-	if (evt->rtt_sounding_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_sounding_precision =
-				BT_CONN_LE_CS_RTT_SOUNDING_10NS;
+		if (evt->rtt_sounding_n) {
+			if (evt->rtt_capability & BT_HCI_LE_CS_RTT_SOUNDING_N_10NS_MASK) {
+				remote_cs_capabilities.rtt_sounding_precision =
+					BT_CONN_LE_CS_RTT_SOUNDING_10NS;
+			} else {
+				remote_cs_capabilities.rtt_sounding_precision =
+					BT_CONN_LE_CS_RTT_SOUNDING_150NS;
+			}
 		} else {
 			remote_cs_capabilities.rtt_sounding_precision =
-				BT_CONN_LE_CS_RTT_SOUNDING_150NS;
+				BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
 		}
-	} else {
-		remote_cs_capabilities.rtt_sounding_precision = BT_CONN_LE_CS_RTT_SOUNDING_NOT_SUPP;
-	}
 
-	if (evt->rtt_random_payload_n) {
-		if (evt->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
-			remote_cs_capabilities.rtt_random_payload_precision =
-				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
+		if (evt->rtt_random_payload_n) {
+			if (evt->rtt_capability & BT_HCI_LE_CS_RTT_RANDOM_PAYLOAD_N_10NS_MASK) {
+				remote_cs_capabilities.rtt_random_payload_precision =
+					BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_10NS;
+			} else {
+				remote_cs_capabilities.rtt_random_payload_precision =
+					BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
+			}
 		} else {
 			remote_cs_capabilities.rtt_random_payload_precision =
-				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_150NS;
+				BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
 		}
-	} else {
-		remote_cs_capabilities.rtt_random_payload_precision =
-			BT_CONN_LE_CS_RTT_RANDOM_PAYLOAD_NOT_SUPP;
-	}
 
-	remote_cs_capabilities.phase_based_nadm_sounding_supported =
-		sys_le16_to_cpu(evt->nadm_sounding_capability) &
-		BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
+		remote_cs_capabilities.phase_based_nadm_sounding_supported =
+			sys_le16_to_cpu(evt->nadm_sounding_capability) &
+			BT_HCI_LE_CS_NADM_SOUNDING_CAPABILITY_PHASE_BASED_MASK;
 
-	remote_cs_capabilities.phase_based_nadm_random_supported =
-		sys_le16_to_cpu(evt->nadm_random_capability) &
-		BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
+		remote_cs_capabilities.phase_based_nadm_random_supported =
+			sys_le16_to_cpu(evt->nadm_random_capability) &
+			BT_HCI_LE_CS_NADM_RANDOM_CAPABILITY_PHASE_BASED_MASK;
 
-	remote_cs_capabilities.cs_sync_2m_phy_supported =
-		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
+		remote_cs_capabilities.cs_sync_2m_phy_supported =
+			evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_MASK;
 
-	remote_cs_capabilities.cs_sync_2m_2bt_phy_supported =
-		evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
+		remote_cs_capabilities.cs_sync_2m_2bt_phy_supported =
+			evt->cs_sync_phys_supported & BT_HCI_LE_CS_SYNC_PHYS_2M_2BT_MASK;
 
-	remote_cs_capabilities.cs_without_fae_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
+		remote_cs_capabilities.cs_without_fae_supported =
+			sys_le16_to_cpu(evt->subfeatures_supported) &
+			BT_HCI_LE_CS_SUBFEATURE_NO_TX_FAE_MASK;
 
-	remote_cs_capabilities.chsel_alg_3c_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
+		remote_cs_capabilities.chsel_alg_3c_supported =
+			sys_le16_to_cpu(evt->subfeatures_supported) &
+			BT_HCI_LE_CS_SUBFEATURE_CHSEL_ALG_3C_MASK;
 
-	remote_cs_capabilities.pbr_from_rtt_sounding_seq_supported =
-		sys_le16_to_cpu(evt->subfeatures_supported) &
-		BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
+		remote_cs_capabilities.pbr_from_rtt_sounding_seq_supported =
+			sys_le16_to_cpu(evt->subfeatures_supported) &
+			BT_HCI_LE_CS_SUBFEATURE_PBR_FROM_RTT_SOUNDING_SEQ_MASK;
 
-	remote_cs_capabilities.t_ip1_times_supported = sys_le16_to_cpu(evt->t_ip1_times_supported);
-	remote_cs_capabilities.t_ip2_times_supported = sys_le16_to_cpu(evt->t_ip2_times_supported);
-	remote_cs_capabilities.t_fcs_times_supported = sys_le16_to_cpu(evt->t_fcs_times_supported);
-	remote_cs_capabilities.t_pm_times_supported = sys_le16_to_cpu(evt->t_pm_times_supported);
+		remote_cs_capabilities.t_ip1_times_supported =
+			sys_le16_to_cpu(evt->t_ip1_times_supported);
+		remote_cs_capabilities.t_ip2_times_supported =
+			sys_le16_to_cpu(evt->t_ip2_times_supported);
+		remote_cs_capabilities.t_fcs_times_supported =
+			sys_le16_to_cpu(evt->t_fcs_times_supported);
+		remote_cs_capabilities.t_pm_times_supported =
+			sys_le16_to_cpu(evt->t_pm_times_supported);
 
-	remote_cs_capabilities.t_sw_time = evt->t_sw_time_supported;
-	remote_cs_capabilities.tx_snr_capability = evt->tx_snr_capability;
+		remote_cs_capabilities.t_sw_time = evt->t_sw_time_supported;
+		remote_cs_capabilities.tx_snr_capability = evt->tx_snr_capability;
 
-	notify_remote_cs_capabilities(conn, remote_cs_capabilities);
+		notify_remote_cs_capabilities(conn, BT_HCI_ERR_SUCCESS, &remote_cs_capabilities);
+	} else {
+		notify_remote_cs_capabilities(conn, evt->status, NULL);
+	}
 
 	bt_conn_unref(conn);
 }
@@ -465,7 +492,6 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Read Remote FAE Table failed with status 0x%02X", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->conn_handle), BT_CONN_TYPE_LE);
@@ -474,8 +500,13 @@ void bt_hci_le_cs_read_remote_fae_table_complete(struct net_buf *buf)
 		return;
 	}
 
-	fae_table.remote_fae_table = evt->remote_fae_table;
-	notify_remote_cs_fae_table(conn, fae_table);
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		fae_table.remote_fae_table = evt->remote_fae_table;
+
+		notify_remote_cs_fae_table(conn, BT_HCI_ERR_SUCCESS, &fae_table);
+	} else {
+		notify_remote_cs_fae_table(conn, evt->status, NULL);
+	}
 
 	bt_conn_unref(conn);
 }
@@ -805,7 +836,6 @@ void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("CS Config failed (status 0x%02X)", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
@@ -814,33 +844,38 @@ void bt_hci_le_cs_config_complete_event(struct net_buf *buf)
 		return;
 	}
 
-	if (evt->action == BT_HCI_LE_CS_CONFIG_ACTION_REMOVED) {
-		notify_cs_config_removed(conn, evt->config_id);
-		bt_conn_unref(conn);
-		return;
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		if (evt->action == BT_HCI_LE_CS_CONFIG_ACTION_REMOVED) {
+			notify_cs_config_removed(conn, evt->config_id);
+			bt_conn_unref(conn);
+			return;
+		}
+
+		config.id = evt->config_id;
+		config.main_mode_type = evt->main_mode_type;
+		config.sub_mode_type = evt->sub_mode_type;
+		config.min_main_mode_steps = evt->min_main_mode_steps;
+		config.max_main_mode_steps = evt->max_main_mode_steps;
+		config.main_mode_repetition = evt->main_mode_repetition;
+		config.mode_0_steps = evt->mode_0_steps;
+		config.role = evt->role;
+		config.rtt_type = evt->rtt_type;
+		config.cs_sync_phy = evt->cs_sync_phy;
+		config.channel_map_repetition = evt->channel_map_repetition;
+		config.channel_selection_type = evt->channel_selection_type;
+		config.ch3c_shape = evt->ch3c_shape;
+		config.ch3c_jump = evt->ch3c_jump;
+		config.t_ip1_time_us = evt->t_ip1_time;
+		config.t_ip2_time_us = evt->t_ip2_time;
+		config.t_fcs_time_us = evt->t_fcs_time;
+		config.t_pm_time_us = evt->t_pm_time;
+		memcpy(config.channel_map, evt->channel_map, ARRAY_SIZE(config.channel_map));
+
+		notify_cs_config_created(conn, BT_HCI_ERR_SUCCESS, &config);
+	} else {
+		notify_cs_config_created(conn, evt->status, NULL);
 	}
 
-	config.id = evt->config_id;
-	config.main_mode_type = evt->main_mode_type;
-	config.sub_mode_type = evt->sub_mode_type;
-	config.min_main_mode_steps = evt->min_main_mode_steps;
-	config.max_main_mode_steps = evt->max_main_mode_steps;
-	config.main_mode_repetition = evt->main_mode_repetition;
-	config.mode_0_steps = evt->mode_0_steps;
-	config.role = evt->role;
-	config.rtt_type = evt->rtt_type;
-	config.cs_sync_phy = evt->cs_sync_phy;
-	config.channel_map_repetition = evt->channel_map_repetition;
-	config.channel_selection_type = evt->channel_selection_type;
-	config.ch3c_shape = evt->ch3c_shape;
-	config.ch3c_jump = evt->ch3c_jump;
-	config.t_ip1_time_us = evt->t_ip1_time;
-	config.t_ip2_time_us = evt->t_ip2_time;
-	config.t_fcs_time_us = evt->t_fcs_time;
-	config.t_pm_time_us = evt->t_pm_time;
-	memcpy(config.channel_map, evt->channel_map, ARRAY_SIZE(config.channel_map));
-
-	notify_cs_config_created(conn, &config);
 	bt_conn_unref(conn);
 }
 
@@ -1203,7 +1238,6 @@ void bt_hci_le_cs_security_enable_complete(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Security Enable failed with status 0x%02X", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
@@ -1212,7 +1246,7 @@ void bt_hci_le_cs_security_enable_complete(struct net_buf *buf)
 		return;
 	}
 
-	notify_cs_security_enable_available(conn);
+	notify_cs_security_enable_available(conn, evt->status);
 
 	bt_conn_unref(conn);
 }
@@ -1232,7 +1266,6 @@ void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf)
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	if (evt->status) {
 		LOG_WRN("Procedure Enable failed with status 0x%02X", evt->status);
-		return;
 	}
 
 	conn = bt_conn_lookup_handle(sys_le16_to_cpu(evt->handle), BT_CONN_TYPE_LE);
@@ -1250,19 +1283,23 @@ void bt_hci_le_cs_procedure_enable_complete(struct net_buf *buf)
 		}
 	}
 
-	params.config_id = evt->config_id;
-	params.state = evt->state;
-	params.tone_antenna_config_selection = evt->tone_antenna_config_selection;
-	params.selected_tx_power = evt->selected_tx_power;
-	params.subevent_len = sys_get_le24(evt->subevent_len);
-	params.subevents_per_event = evt->subevents_per_event;
-	params.subevent_interval = sys_le16_to_cpu(evt->subevent_interval);
-	params.event_interval = sys_le16_to_cpu(evt->event_interval);
-	params.procedure_interval = sys_le16_to_cpu(evt->procedure_interval);
-	params.procedure_count = sys_le16_to_cpu(evt->procedure_count);
-	params.max_procedure_len = sys_le16_to_cpu(evt->max_procedure_len);
-
-	notify_cs_procedure_enable_available(conn, &params);
+	if (evt->status == BT_HCI_ERR_SUCCESS) {
+		params.config_id = evt->config_id;
+		params.state = evt->state;
+		params.tone_antenna_config_selection = evt->tone_antenna_config_selection;
+		params.selected_tx_power = evt->selected_tx_power;
+		params.subevent_len = sys_get_le24(evt->subevent_len);
+		params.subevents_per_event = evt->subevents_per_event;
+		params.subevent_interval = sys_le16_to_cpu(evt->subevent_interval);
+		params.event_interval = sys_le16_to_cpu(evt->event_interval);
+		params.procedure_interval = sys_le16_to_cpu(evt->procedure_interval);
+		params.procedure_count = sys_le16_to_cpu(evt->procedure_count);
+		params.max_procedure_len = sys_le16_to_cpu(evt->max_procedure_len);
+
+		notify_cs_procedure_enable_available(conn, BT_HCI_ERR_SUCCESS, &params);
+	} else {
+		notify_cs_procedure_enable_available(conn, evt->status, NULL);
+	}
 
 	bt_conn_unref(conn);
 }
@@ -1344,4 +1381,99 @@ void bt_le_cs_step_data_parse(struct net_buf_simple *step_data_buf,
 	}
 }
 
+/* Bluetooth Core Specification 6.0, Table 4.13, Antenna Path Permutation for N_AP=2.
+ * The last element corresponds to extension slot
+ */
+static const uint8_t antenna_path_lut_n_ap_2[2][3] = {
+	{A1, A2, A2},
+	{A2, A1, A1},
+};
+
+/* Bluetooth Core Specification 6.0, Table 4.14, Antenna Path Permutation for N_AP=3.
+ * The last element corresponds to extension slot
+ */
+static const uint8_t antenna_path_lut_n_ap_3[6][4] = {
+	{A1, A2, A3, A3},
+	{A2, A1, A3, A3},
+	{A1, A3, A2, A2},
+	{A3, A1, A2, A2},
+	{A3, A2, A1, A1},
+	{A2, A3, A1, A1},
+};
+
+/* Bluetooth Core Specification 6.0, Table 4.15, Antenna Path Permutation for N_AP=4.
+ * The last element corresponds to extension slot
+ */
+static const uint8_t antenna_path_lut_n_ap_4[24][5] = {
+	{A1, A2, A3, A4, A4},
+	{A2, A1, A3, A4, A4},
+	{A1, A3, A2, A4, A4},
+	{A3, A1, A2, A4, A4},
+	{A3, A2, A1, A4, A4},
+	{A2, A3, A1, A4, A4},
+	{A1, A2, A4, A3, A3},
+	{A2, A1, A4, A3, A3},
+	{A1, A4, A2, A3, A3},
+	{A4, A1, A2, A3, A3},
+	{A4, A2, A1, A3, A3},
+	{A2, A4, A1, A3, A3},
+	{A1, A4, A3, A2, A2},
+	{A4, A1, A3, A2, A2},
+	{A1, A3, A4, A2, A2},
+	{A3, A1, A4, A2, A2},
+	{A3, A4, A1, A2, A2},
+	{A4, A3, A1, A2, A2},
+	{A4, A2, A3, A1, A1},
+	{A2, A4, A3, A1, A1},
+	{A4, A3, A2, A1, A1},
+	{A3, A4, A2, A1, A1},
+	{A3, A2, A4, A1, A1},
+	{A2, A3, A4, A1, A1},
+};
+
+int bt_le_cs_get_antenna_path(uint8_t n_ap,
+			      uint8_t antenna_path_permutation_index,
+			      uint8_t tone_index)
+{
+	switch (n_ap) {
+	case 1:
+	{
+		uint8_t antenna_path_permutations = 1;
+		uint8_t num_tones = n_ap + 1; /* one additional tone extension slot */
+
+		if (antenna_path_permutation_index >= antenna_path_permutations ||
+		    tone_index >= num_tones) {
+			return -EINVAL;
+		}
+		return A1;
+	}
+	case 2:
+	{
+		if (antenna_path_permutation_index >= ARRAY_SIZE(antenna_path_lut_n_ap_2) ||
+		    tone_index >= ARRAY_SIZE(antenna_path_lut_n_ap_2[0])) {
+			return -EINVAL;
+		}
+		return antenna_path_lut_n_ap_2[antenna_path_permutation_index][tone_index];
+	}
+	case 3:
+	{
+		if (antenna_path_permutation_index >= ARRAY_SIZE(antenna_path_lut_n_ap_3) ||
+		    tone_index >= ARRAY_SIZE(antenna_path_lut_n_ap_3[0])) {
+			return -EINVAL;
+		}
+		return antenna_path_lut_n_ap_3[antenna_path_permutation_index][tone_index];
+	}
+	case 4:
+	{
+		if (antenna_path_permutation_index >= ARRAY_SIZE(antenna_path_lut_n_ap_4) ||
+		    tone_index >= ARRAY_SIZE(antenna_path_lut_n_ap_4[0])) {
+			return -EINVAL;
+		}
+		return antenna_path_lut_n_ap_4[antenna_path_permutation_index][tone_index];
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
 #endif /* CONFIG_BT_CHANNEL_SOUNDING */
diff --git a/subsys/bluetooth/host/data.c b/subsys/bluetooth/host/data.c
index 4afd9aad0a78b..20c49fc6c418e 100644
--- a/subsys/bluetooth/host/data.c
+++ b/subsys/bluetooth/host/data.c
@@ -4,13 +4,18 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
-#include <zephyr/sys/check.h>
-
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/check.h>
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_data);
 
 void bt_data_parse(struct net_buf_simple *ad,
diff --git a/subsys/bluetooth/host/direction.c b/subsys/bluetooth/host/direction.c
index a2dee2561ce02..a59cbdada37aa 100644
--- a/subsys/bluetooth/host/direction.c
+++ b/subsys/bluetooth/host/direction.c
@@ -3,25 +3,30 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
+#include <stdbool.h>
 #include <stdint.h>
-#include <assert.h>
-#include <zephyr/sys/check.h>
-#include <zephyr/sys/byteorder.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/direction.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/hci_vs.h>
-#include <zephyr/bluetooth/direction.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
 #include "hci_core.h"
-#include "scan.h"
 #include "conn_internal.h"
 #include "direction_internal.h"
 
-#include <zephyr/logging/log.h>
-
 LOG_MODULE_REGISTER(bt_df, CONFIG_BT_DF_LOG_LEVEL);
 
 /* @brief Antenna information for LE Direction Finding */
@@ -182,9 +187,9 @@ static int hci_df_read_ant_info(uint8_t *switch_sample_rates,
 
 	rp = (void *)rsp->data;
 
-	LOG_DBG("DF: sw. sampl rates: %x ant num: %u , max sw. pattern len: %u,"
-	       "max CTE len %d", rp->switch_sample_rates, rp->num_ant,
-	       rp->max_switch_pattern_len, rp->max_cte_len);
+	LOG_DBG("DF: sw. sample rates: %x ant num: %u , max sw. pattern len: %u,"
+		"max CTE len %d",
+		rp->switch_sample_rates, rp->num_ant, rp->max_switch_pattern_len, rp->max_cte_len);
 
 	*switch_sample_rates = rp->switch_sample_rates;
 	*num_ant = rp->num_ant;
diff --git a/subsys/bluetooth/host/direction_internal.h b/subsys/bluetooth/host/direction_internal.h
index 30284f402d475..2a6303ff4c3ed 100644
--- a/subsys/bluetooth/host/direction_internal.h
+++ b/subsys/bluetooth/host/direction_internal.h
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/direction.h>
+#include <zephyr/net_buf.h>
+
 /* Performs initialization of Direction Finding in Host */
 int le_df_init(void);
 
diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index 6efc4f2baa9e0..87b9fb1cb5d7b 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -5,20 +5,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 #include <zephyr/bluetooth/hci.h>
-
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util_macro.h>
 #include <psa/crypto.h>
+#include <psa/crypto_struct.h>
+#include <psa/crypto_types.h>
+#include <psa/crypto_values.h>
 
 #include "long_wq.h"
 #include "ecc.h"
 #include "hci_core.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_ecc);
 
 static uint8_t pub_key[BT_PUB_KEY_LEN];
@@ -265,7 +277,7 @@ int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&pub_key_cb_slist, cb, node) {
 		if (cb == new_cb) {
-			LOG_WRN("Callback already registered");
+			LOG_DBG("Callback already registered");
 			return -EALREADY;
 		}
 	}
diff --git a/subsys/bluetooth/host/ecc.h b/subsys/bluetooth/host/ecc.h
index a586609784754..8feb3823a6a58 100644
--- a/subsys/bluetooth/host/ecc.h
+++ b/subsys/bluetooth/host/ecc.h
@@ -6,6 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/sys/slist.h>
+
 /** Key size used in Bluetooth's ECC domain. */
 #define BT_ECC_KEY_SIZE            32
 /** Length of a Bluetooth ECC public key coordinate. */
@@ -46,7 +51,7 @@ bool bt_pub_key_is_debug(uint8_t *cmp_pub_key);
 
 /*  @brief Check if public key is valid.
  *
- *  Verify that the public key is valid, e.g. that its coordinates lie on the eliptic curve.
+ *  Verify that the public key is valid, e.g. that its coordinates lie on the elliptic curve.
  *
  *  @param key The public key to validate.
  *
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index 59005877efa7b..3092801554a16 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -7,46 +7,57 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "sys/types.h"
+#include <errno.h>
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 #include <zephyr/kernel.h>
-#include <string.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stdlib.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/__assert.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/iterable_sections.h>
+#include <zephyr/sys/slist.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/check.h>
-
-#include <zephyr/settings/settings.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 
 #if defined(CONFIG_BT_GATT_CACHING)
-#include "psa/crypto.h"
+#include <psa/crypto.h>
+#include <psa/crypto_struct.h>
+#include <psa/crypto_types.h>
+#include <psa/crypto_values.h>
 #endif /* CONFIG_BT_GATT_CACHING */
 
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/uuid.h>
-#include <zephyr/bluetooth/gatt.h>
-
+#include "att_internal.h"
+#include "conn_internal.h"
 #include "common/bt_str.h"
-
+#include "gatt_internal.h"
 #include "hci_core.h"
-#include "conn_internal.h"
 #include "keys.h"
+#include "long_wq.h"
 #include "l2cap_internal.h"
-#include "att_internal.h"
-#include "smp.h"
 #include "settings.h"
-#include "gatt_internal.h"
-#include "long_wq.h"
+#include "smp.h"
 
 #define LOG_LEVEL CONFIG_BT_GATT_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_gatt);
 
 #define SC_TIMEOUT	K_MSEC(10)
@@ -384,7 +395,7 @@ static int bt_gatt_clear_sc(uint8_t id, const bt_addr_le_t *addr)
 
 static void sc_clear(struct bt_conn *conn)
 {
-	if (bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	if (bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		int err;
 
 		err = bt_gatt_clear_sc(conn->id, &conn->le.dst);
@@ -466,8 +477,7 @@ static void sc_save(uint8_t id, bt_addr_le_t *peer, uint16_t start, uint16_t end
 	modified = update_range(&cfg->data.start, &cfg->data.end, start, end);
 
 done:
-	if (IS_ENABLED(CONFIG_BT_SETTINGS) &&
-	    modified && bt_addr_le_is_bonded(cfg->id, &cfg->peer)) {
+	if (IS_ENABLED(CONFIG_BT_SETTINGS) && modified && bt_le_bond_exists(cfg->id, &cfg->peer)) {
 		sc_store(cfg);
 	}
 }
@@ -487,9 +497,8 @@ static ssize_t sc_ccc_cfg_write(struct bt_conn *conn,
 	return sizeof(value);
 }
 
-static struct _bt_gatt_ccc sc_ccc = BT_GATT_CCC_INITIALIZER(NULL,
-							    sc_ccc_cfg_write,
-							    NULL);
+static struct bt_gatt_ccc_managed_user_data sc_ccc =
+	BT_GATT_CCC_MANAGED_USER_DATA_INIT(NULL, sc_ccc_cfg_write, NULL);
 
 /* Do not shuffle the values in this enum, they are used as bit offsets when
  * saving the CF flags to NVS (i.e. NVS persists between FW upgrades).
@@ -720,7 +729,7 @@ static int db_hash_setup(struct gen_hash_state *state, uint8_t *key)
 		LOG_ERR("Unable to import the key for AES CMAC %d", ret);
 		return -EIO;
 	}
-	state->operation = psa_mac_operation_init();
+	memset(&state->operation, 0, sizeof(state->operation));
 
 	ret = psa_mac_sign_setup(&(state->operation), state->key, PSA_ALG_CMAC);
 	if (ret != PSA_SUCCESS) {
@@ -1030,7 +1039,7 @@ static void remove_cf_cfg(struct bt_conn *conn)
 	 * trusted relationship the characteristic value shall be set to the
 	 * default value at each connection.
 	 */
-	if (!bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	if (!bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		clear_cf_cfg(cfg);
 	} else {
 		/* Update address in case it has changed */
@@ -1119,7 +1128,7 @@ struct addr_match {
 static uint8_t convert_to_id_on_match(const struct bt_gatt_attr *attr,
 				      uint16_t handle, void *user_data)
 {
-	struct _bt_gatt_ccc *ccc;
+	struct bt_gatt_ccc_managed_user_data *ccc;
 	struct addr_match *match = user_data;
 
 	if (!is_host_managed_ccc(attr)) {
@@ -1148,7 +1157,7 @@ static void bt_gatt_identity_resolved(struct bt_conn *conn, const bt_addr_le_t *
 		.private_addr = private_addr,
 		.id_addr      = id_addr
 	};
-	bool is_bonded = bt_addr_le_is_bonded(conn->id, &conn->le.dst);
+	bool is_bonded = bt_le_bond_exists(conn->id, &conn->le.dst);
 
 	bt_gatt_foreach_attr(0x0001, 0xffff, convert_to_id_on_match, &user_data);
 
@@ -1448,7 +1457,7 @@ static struct ds_peer *gatt_delayed_store_alloc(uint8_t id,
 static void gatt_delayed_store_enqueue(uint8_t id, const bt_addr_le_t *peer_addr,
 				       enum delayed_store_flags flag)
 {
-	bool bonded = bt_addr_le_is_bonded(id, peer_addr);
+	bool bonded = bt_le_bond_exists(id, peer_addr);
 	struct ds_peer *el = gatt_delayed_store_find(id, peer_addr);
 
 	if (bonded) {
@@ -1483,7 +1492,7 @@ static void gatt_store_ccc_cf(uint8_t id, const bt_addr_le_t *peer_addr)
 {
 	struct ds_peer *el = gatt_delayed_store_find(id, peer_addr);
 
-	if (bt_addr_le_is_bonded(id, peer_addr)) {
+	if (bt_le_bond_exists(id, peer_addr)) {
 		if (!IS_ENABLED(CONFIG_BT_SETTINGS_CCC_STORE_ON_WRITE) ||
 		    (IS_ENABLED(CONFIG_BT_SETTINGS_CCC_STORE_ON_WRITE) && el &&
 		     atomic_test_and_clear_bit(el->flags, DELAYED_STORE_CCC))) {
@@ -1645,7 +1654,7 @@ static void db_changed(void)
 #endif
 }
 
-static void gatt_unregister_ccc(struct _bt_gatt_ccc *ccc)
+static void gatt_unregister_ccc(struct bt_gatt_ccc_managed_user_data *ccc)
 {
 	ccc->value = 0;
 
@@ -1671,7 +1680,7 @@ static void gatt_unregister_ccc(struct _bt_gatt_ccc *ccc)
 			}
 
 			if (IS_ENABLED(CONFIG_BT_SETTINGS) && store &&
-			    bt_addr_le_is_bonded(cfg->id, &cfg->peer)) {
+			    bt_le_bond_exists(cfg->id, &cfg->peer)) {
 				bt_gatt_store_ccc(cfg->id, &cfg->peer);
 			}
 
@@ -2128,7 +2137,7 @@ struct bt_gatt_attr *bt_gatt_attr_next(const struct bt_gatt_attr *attr)
 }
 
 static struct bt_gatt_ccc_cfg *find_ccc_cfg(const struct bt_conn *conn,
-					    struct _bt_gatt_ccc *ccc)
+					    struct bt_gatt_ccc_managed_user_data *ccc)
 {
 	for (size_t i = 0; i < ARRAY_SIZE(ccc->cfg); i++) {
 		struct bt_gatt_ccc_cfg *cfg = &ccc->cfg[i];
@@ -2150,7 +2159,7 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
 			      uint16_t len, uint16_t offset)
 {
-	struct _bt_gatt_ccc *ccc = attr->user_data;
+	struct bt_gatt_ccc_managed_user_data *ccc = attr->user_data;
 	const struct bt_gatt_ccc_cfg *cfg;
 	uint16_t value;
 
@@ -2167,7 +2176,7 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
 }
 
 static void gatt_ccc_changed(const struct bt_gatt_attr *attr,
-			     struct _bt_gatt_ccc *ccc)
+			     struct bt_gatt_ccc_managed_user_data *ccc)
 {
 	int i;
 	uint16_t value = 0x0000;
@@ -2201,7 +2210,7 @@ ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, const void *buf,
 			       uint16_t len, uint16_t offset, uint8_t flags)
 {
-	struct _bt_gatt_ccc *ccc = attr->user_data;
+	struct bt_gatt_ccc_managed_user_data *ccc = attr->user_data;
 	struct bt_gatt_ccc_cfg *cfg;
 	bool value_changed;
 	uint16_t value;
@@ -2733,7 +2742,7 @@ static uint8_t notify_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 			 void *user_data)
 {
 	struct notify_data *data = user_data;
-	struct _bt_gatt_ccc *ccc;
+	struct bt_gatt_ccc_managed_user_data *ccc;
 	size_t i;
 
 	if (!is_host_managed_ccc(attr)) {
@@ -3322,7 +3331,7 @@ static uint8_t update_ccc(const struct bt_gatt_attr *attr, uint16_t handle,
 {
 	struct conn_data *data = user_data;
 	struct bt_conn *conn = data->conn;
-	struct _bt_gatt_ccc *ccc;
+	struct bt_gatt_ccc_managed_user_data *ccc;
 	size_t i;
 	uint8_t err;
 
@@ -3384,7 +3393,7 @@ static uint8_t disconnected_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 			       void *user_data)
 {
 	struct bt_conn *conn = user_data;
-	struct _bt_gatt_ccc *ccc;
+	struct bt_gatt_ccc_managed_user_data *ccc;
 	bool value_used;
 	size_t i;
 
@@ -3424,7 +3433,7 @@ static uint8_t disconnected_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 			}
 		} else {
 			/* Clear value if not paired */
-			if (!bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+			if (!bt_le_bond_exists(conn->id, &conn->le.dst)) {
 				if (ccc == &sc_ccc) {
 					sc_clear(conn);
 				}
@@ -3472,7 +3481,7 @@ bool bt_gatt_is_subscribed(struct bt_conn *conn,
 			LOG_ERR("Read method not set");
 			return false;
 		}
-		/* The charactestic properties is the first byte of the attribute value */
+		/* The characterstic properties is the first byte of the attribute value */
 		len = attr->read(NULL, attr, &properties, sizeof(properties), 0);
 		if (len < 0) {
 			LOG_ERR("Failed to read attribute %p (err %zd)", attr, len);
@@ -3740,9 +3749,8 @@ static void remove_subscriptions(struct bt_conn *conn)
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&sub->list, params, tmp, node) {
 		atomic_clear_bit(params->flags, BT_GATT_SUBSCRIBE_FLAG_SENT);
 
-		if (!bt_addr_le_is_bonded(conn->id, &conn->le.dst) ||
-		    (atomic_test_bit(params->flags,
-				     BT_GATT_SUBSCRIBE_FLAG_VOLATILE))) {
+		if (!bt_le_bond_exists(conn->id, &conn->le.dst) ||
+		    (atomic_test_bit(params->flags, BT_GATT_SUBSCRIBE_FLAG_VOLATILE))) {
 			/* Remove subscription */
 			params->value = 0U;
 			gatt_sub_remove(conn, sub, prev, params);
@@ -5261,10 +5269,18 @@ static int gatt_prepare_write(struct bt_conn *conn,
 			      struct bt_gatt_write_params *params)
 {
 	uint16_t len, req_len;
+	uint16_t mtu = bt_att_get_mtu(conn);
 
 	req_len = sizeof(struct bt_att_prepare_write_req);
 
-	len = bt_att_get_mtu(conn) - req_len - 1;
+	/** MTU size is bigger than the ATT_PREPARE_WRITE_REQ header (5 bytes),
+	 * unless there's no connection.
+	 */
+	if (mtu == 0) {
+		return -ENOTCONN;
+	}
+
+	len = mtu - req_len - 1;
 	len = MIN(params->length, len);
 	len += req_len;
 
@@ -5667,7 +5683,7 @@ static void add_subscriptions(struct bt_conn *conn)
 	struct gatt_sub *sub;
 	struct bt_gatt_subscribe_params *params;
 
-	if (!bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	if (!bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		return;
 	}
 
@@ -5718,7 +5734,7 @@ static struct bt_gatt_exchange_params gatt_exchange_params = {
 #define CCC_STORE_MAX 0
 #endif /* defined(CONFIG_BT_SETTINGS_CCC_STORE_MAX) */
 
-static struct bt_gatt_ccc_cfg *ccc_find_cfg(struct _bt_gatt_ccc *ccc,
+static struct bt_gatt_ccc_cfg *ccc_find_cfg(struct bt_gatt_ccc_managed_user_data *ccc,
 					    const bt_addr_le_t *addr,
 					    uint8_t id)
 {
@@ -5743,7 +5759,7 @@ struct ccc_load {
 	size_t count;
 };
 
-static void ccc_clear(struct _bt_gatt_ccc *ccc,
+static void ccc_clear(struct bt_gatt_ccc_managed_user_data *ccc,
 		      const bt_addr_le_t *addr,
 		      uint8_t id)
 {
@@ -5762,7 +5778,7 @@ static uint8_t ccc_load(const struct bt_gatt_attr *attr, uint16_t handle,
 			void *user_data)
 {
 	struct ccc_load *load = user_data;
-	struct _bt_gatt_ccc *ccc;
+	struct bt_gatt_ccc_managed_user_data *ccc;
 	struct bt_gatt_ccc_cfg *cfg;
 
 	if (!is_host_managed_ccc(attr)) {
@@ -5882,6 +5898,7 @@ static int ccc_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 	return 0;
 }
 
+#ifdef CONFIG_BT_SETTINGS
 static int ccc_set_cb(const char *name, size_t len_rd, settings_read_cb read_cb,
 		      void *cb_arg)
 {
@@ -5894,6 +5911,7 @@ static int ccc_set_cb(const char *name, size_t len_rd, settings_read_cb read_cb,
 }
 
 BT_SETTINGS_DEFINE(ccc, "ccc", ccc_set_cb, NULL);
+#endif /* CONFIG_BT_SETTINGS */
 
 static int ccc_set_direct(const char *key, size_t len, settings_read_cb read_cb,
 			  void *cb_arg, void *param)
@@ -5925,7 +5943,7 @@ void bt_gatt_connected(struct bt_conn *conn)
 
 	/* Load CCC settings from backend if bonded */
 	if (IS_ENABLED(CONFIG_BT_SETTINGS_CCC_LAZY_LOADING) &&
-	    bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	    bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		char key[BT_SETTINGS_KEY_MAX];
 
 		if (conn->id) {
@@ -6099,7 +6117,7 @@ static uint8_t ccc_save(const struct bt_gatt_attr *attr, uint16_t handle,
 			void *user_data)
 {
 	struct ccc_save *save = user_data;
-	struct _bt_gatt_ccc *ccc;
+	struct bt_gatt_ccc_managed_user_data *ccc;
 	struct bt_gatt_ccc_cfg *cfg;
 
 	if (!is_host_managed_ccc(attr)) {
@@ -6382,7 +6400,7 @@ static uint8_t remove_peer_from_attr(const struct bt_gatt_attr *attr,
 				     uint16_t handle, void *user_data)
 {
 	const struct addr_with_id *addr_with_id = user_data;
-	struct _bt_gatt_ccc *ccc;
+	struct bt_gatt_ccc_managed_user_data *ccc;
 	struct bt_gatt_ccc_cfg *cfg;
 
 	if (!is_host_managed_ccc(attr)) {
@@ -6513,7 +6531,7 @@ void bt_gatt_disconnected(struct bt_conn *conn)
 
 	/* Make sure to clear the CCC entry when using lazy loading */
 	if (IS_ENABLED(CONFIG_BT_SETTINGS_CCC_LAZY_LOADING) &&
-	    bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
+	    bt_le_bond_exists(conn->id, &conn->le.dst)) {
 		struct addr_with_id addr_with_id = {
 			.addr = &conn->le.dst,
 			.id = conn->id,
diff --git a/subsys/bluetooth/host/gatt_internal.h b/subsys/bluetooth/host/gatt_internal.h
index 718ce95a5d7a6..6e3daa56ff7bf 100644
--- a/subsys/bluetooth/host/gatt_internal.h
+++ b/subsys/bluetooth/host/gatt_internal.h
@@ -8,6 +8,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
+
 #define BT_GATT_CENTRAL_ADDR_RES_NOT_SUPP	0
 #define BT_GATT_CENTRAL_ADDR_RES_SUPP		1
 
diff --git a/subsys/bluetooth/host/hci_common.c b/subsys/bluetooth/host/hci_common.c
index 1f382075d05f0..bac2a21da6621 100644
--- a/subsys/bluetooth/host/hci_common.c
+++ b/subsys/bluetooth/host/hci_common.c
@@ -4,9 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
 #include <stdint.h>
-#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/drivers/bluetooth.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/byteorder.h>
+
 #include "common/assert.h"
 
 struct net_buf *bt_hci_evt_create(uint8_t evt, uint8_t len)
@@ -33,7 +40,17 @@ struct net_buf *bt_hci_cmd_complete_create(uint16_t op, uint8_t plen)
 	buf = bt_hci_evt_create(BT_HCI_EVT_CMD_COMPLETE, sizeof(*cc) + plen);
 
 	cc = net_buf_add(buf, sizeof(*cc));
+
+	/* The Num_HCI_Command_Packets parameter allows the Controller to
+	 * indicate the number of HCI command packets the Host can send to the
+	 * Controller. If the Controller requires the Host to stop sending
+	 * commands, Num_HCI_Command_Packets will be set to zero.
+	 *
+	 * NOTE: Zephyr Controller (and may be other Controllers) do not support
+	 *       higher Number of HCI Command packets than 1.
+	 */
 	cc->ncmd = 1U;
+
 	cc->opcode = sys_cpu_to_le16(op);
 
 	return buf;
@@ -48,7 +65,17 @@ struct net_buf *bt_hci_cmd_status_create(uint16_t op, uint8_t status)
 
 	cs = net_buf_add(buf, sizeof(*cs));
 	cs->status = status;
+
+	/* The Num_HCI_Command_Packets parameter allows the Controller to
+	 * indicate the number of HCI command packets the Host can send to the
+	 * Controller. If the Controller requires the Host to stop sending
+	 * commands, Num_HCI_Command_Packets will be set to zero.
+	 *
+	 * NOTE: Zephyr Controller (and may be other Controllers) do not support
+	 *       higher Number of HCI Command packets than 1.
+	 */
 	cs->ncmd = 1U;
+
 	cs->opcode = sys_cpu_to_le16(op);
 
 	return buf;
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index f4f9284cdcc53..45be1425f4667 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -1,58 +1,70 @@
 /* hci_core.c - HCI core Bluetooth handling */
 
 /*
- * Copyright (c) 2017-2021 Nordic Semiconductor ASA
+ * Copyright (c) 2017-2025 Nordic Semiconductor ASA
  * Copyright (c) 2015-2016 Intel Corporation
+ * Copyright 2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/direction.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/testing.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/bluetooth.h>
 #include <zephyr/kernel.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
+#include <zephyr/kernel/thread.h>
+#include <zephyr/kernel/thread_stack.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/net_buf.h>
+#include <zephyr/settings/settings.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/check.h>
 #include <zephyr/sys/util_macro.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/debug/stack.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
 
-#include <zephyr/settings/settings.h>
-
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/l2cap.h>
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/hci_vs.h>
-#include <zephyr/bluetooth/testing.h>
-#include <zephyr/drivers/bluetooth.h>
-
+#include "addr_internal.h"
+#include "adv.h"
+#include "common/hci_common_internal.h"
 #include "common/bt_str.h"
-#include "common/assert.h"
-
 #include "common/rpa.h"
-#include "keys.h"
-#include "monitor.h"
-#include "hci_core.h"
+#include "common/assert.h"
+#include "conn_internal.h"
+#include "crypto.h"
 #include "ecc.h"
+#include "gatt_internal.h"
+#include "hci_core.h"
 #include "id.h"
-#include "adv.h"
-#include "scan.h"
-
-#include "addr_internal.h"
-#include "conn_internal.h"
 #include "iso_internal.h"
+#include "keys.h"
 #include "l2cap_internal.h"
-#include "gatt_internal.h"
-#include "smp.h"
-#include "crypto.h"
+#include "monitor.h"
+#include "scan.h"
 #include "settings.h"
+#include "smp.h"
 
 #if defined(CONFIG_BT_CLASSIC)
 #include "classic/br.h"
@@ -63,7 +75,6 @@
 #endif /* CONFIG_BT_DF */
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_hci_core);
 
 #if DT_HAS_CHOSEN(zephyr_bt_hci)
@@ -126,7 +137,7 @@ struct cmd_data {
 	struct k_sem *sync;
 };
 
-static struct cmd_data cmd_data[CONFIG_BT_BUF_CMD_TX_COUNT];
+static struct cmd_data cmd_data[BT_BUF_CMD_TX_COUNT];
 
 #define cmd(buf) (&cmd_data[net_buf_id(buf)])
 #define acl(buf) ((struct acl_data *)net_buf_user_data(buf))
@@ -156,7 +167,7 @@ void bt_hci_cmd_state_set_init(struct net_buf *buf,
  * command complete or command status.
  */
 #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT,
 			  CMD_BUF_SIZE, sizeof(struct bt_buf_data), NULL);
 
 struct event_handler {
@@ -563,7 +574,7 @@ static void hci_num_completed_packets(struct net_buf *buf)
 	int i;
 
 	if (sizeof(*evt) + sizeof(evt->h[0]) * evt->num_handles > buf->len) {
-		LOG_ERR("evt num_handles (=%u) too large (%u > %u)",
+		LOG_ERR("evt num_handles (=%u) too large (%zu > %u)",
 			evt->num_handles,
 			sizeof(*evt) + sizeof(evt->h[0]) * evt->num_handles,
 			buf->len);
@@ -1009,7 +1020,7 @@ static void hci_disconn_complete(struct net_buf *buf)
 		 * If only for one connection session bond was set, clear keys
 		 * database row for this connection.
 		 */
-		if (conn->type == BT_CONN_TYPE_BR &&
+		if (conn->type == BT_CONN_TYPE_BR && conn->br.link_key != NULL &&
 		    atomic_test_and_clear_bit(conn->flags, BT_CONN_BR_NOBOND)) {
 			bt_keys_link_key_clear(conn->br.link_key);
 		}
@@ -2001,7 +2012,7 @@ static int set_flow_control(void)
 	hbs = net_buf_add(buf, sizeof(*hbs));
 	(void)memset(hbs, 0, sizeof(*hbs));
 	hbs->acl_mtu = sys_cpu_to_le16(CONFIG_BT_BUF_ACL_RX_SIZE);
-	hbs->acl_pkts = sys_cpu_to_le16(BT_BUF_ACL_RX_COUNT);
+	hbs->acl_pkts = sys_cpu_to_le16(BT_BUF_HCI_ACL_RX_COUNT);
 
 	err = bt_hci_cmd_send_sync(BT_HCI_OP_HOST_BUFFER_SIZE, buf, NULL);
 	if (err) {
@@ -2037,13 +2048,6 @@ static void unpair(uint8_t id, const bt_addr_le_t *addr)
 		bt_conn_unref(conn);
 	}
 
-	if (IS_ENABLED(CONFIG_BT_CLASSIC)) {
-		/* LE Public may indicate BR/EDR as well */
-		if (addr->type == BT_ADDR_LE_PUBLIC) {
-			bt_keys_link_key_clear_addr(&addr->a);
-		}
-	}
-
 	if (IS_ENABLED(CONFIG_BT_SMP)) {
 		if (!keys) {
 			keys = bt_keys_find_addr(id, addr);
@@ -2268,6 +2272,17 @@ static void hci_encrypt_key_refresh_complete(struct net_buf *buf)
 			bt_conn_unref(conn);
 			return;
 		}
+
+		if (IS_ENABLED(CONFIG_BT_SMP)) {
+			/*
+			 * Start SMP over BR/EDR if we are pairing and are
+			 * central on the link
+			 */
+			if (atomic_test_bit(conn->flags, BT_CONN_BR_PAIRED) &&
+			    conn->role == BT_CONN_ROLE_CENTRAL) {
+				bt_smp_br_send_pairing_req(conn);
+			}
+		}
 	}
 #endif /* CONFIG_BT_CLASSIC */
 
@@ -2387,17 +2402,10 @@ static void le_ltk_request(struct net_buf *buf)
 }
 #endif /* CONFIG_BT_SMP */
 
-static void hci_reset_complete(struct net_buf *buf)
+static void hci_reset_complete(void)
 {
-	uint8_t status = buf->data[0];
 	atomic_t flags;
 
-	LOG_DBG("status 0x%02x %s", status, bt_hci_err_to_str(status));
-
-	if (status) {
-		return;
-	}
-
 	if (IS_ENABLED(CONFIG_BT_OBSERVER)) {
 		bt_scan_reset();
 	}
@@ -3253,12 +3261,12 @@ static int common_init(void)
 
 	if (!drv_quirk_no_reset()) {
 		/* Send HCI_RESET */
-		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, &rsp);
+		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
 		if (err) {
 			return err;
 		}
-		hci_reset_complete(rsp);
-		net_buf_unref(rsp);
+
+		hci_reset_complete();
 	}
 
 	/* Read Local Supported Features */
@@ -3683,6 +3691,15 @@ static int le_init(void)
 		}
 	}
 
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
+	    IS_ENABLED(CONFIG_BT_OBSERVER) &&
+	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
+		err = le_set_host_feature(BT_LE_FEAT_BIT_ADV_CODING_SEL_HOST, 1);
+		if (err) {
+			return err;
+		}
+	}
+
 	return  le_set_event_mask();
 }
 
@@ -4373,6 +4390,18 @@ int bt_disable(void)
 	disconnected_handles_reset();
 #endif /* CONFIG_BT_CONN */
 
+	/* Reset the Controller */
+	if (!drv_quirk_no_reset()) {
+
+		err = bt_hci_cmd_send_sync(BT_HCI_OP_RESET, NULL, NULL);
+		if (err) {
+			LOG_ERR("Failed to reset BLE controller");
+			return err;
+		}
+
+		hci_reset_complete();
+	}
+
 	err = bt_hci_close(bt_dev.hci);
 	if (err == -ENOSYS) {
 		atomic_clear_bit(bt_dev.flags, BT_DEV_DISABLE);
@@ -4500,7 +4529,30 @@ int bt_set_appearance(uint16_t appearance)
 }
 #endif
 
-bool bt_addr_le_is_bonded(uint8_t id, const bt_addr_le_t *addr)
+int bt_le_get_local_features(struct bt_le_local_features *remote_info)
+{
+	if (remote_info == NULL) {
+		return -EINVAL;
+	}
+
+	if (!atomic_test_bit(bt_dev.flags, BT_DEV_READY)) {
+		return -EAGAIN;
+	}
+
+	memcpy(remote_info->features, bt_dev.le.features, sizeof(remote_info->features));
+	remote_info->states = bt_dev.le.states;
+	remote_info->acl_mtu = COND_CODE_1(CONFIG_BT_CONN, (bt_dev.le.acl_mtu), (0));
+	remote_info->acl_pkts = COND_CODE_1(CONFIG_BT_CONN, (bt_dev.le.acl_pkts.limit), (0));
+	remote_info->iso_mtu = COND_CODE_1(CONFIG_BT_ISO, (bt_dev.le.iso_mtu), (0));
+	remote_info->iso_pkts = COND_CODE_1(CONFIG_BT_ISO, (bt_dev.le.iso_limit), (0));
+	remote_info->rl_size = COND_CODE_1(CONFIG_BT_SMP, (bt_dev.le.rl_size), (0));
+	remote_info->max_adv_data_len =
+		COND_CODE_1(CONFIG_BT_BROADCASTER, (bt_dev.le.max_adv_data_len), (0));
+
+	return 0;
+}
+
+bool bt_le_bond_exists(uint8_t id, const bt_addr_le_t *addr)
 {
 	if (IS_ENABLED(CONFIG_BT_SMP)) {
 		struct bt_keys *keys = bt_keys_find_addr(id, addr);
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index e501ae1d5fe3a..226353f96e61a 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -1,13 +1,25 @@
 /* hci_core.h - Bluetooth HCI core access */
 
 /*
- * Copyright (c) 2021 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  * Copyright (c) 2015-2016 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util_macro.h>
 
 /* LL connection parameters */
 #define LE_CONN_LATENCY		0x0000
@@ -74,6 +86,7 @@ enum {
 	BT_DEV_ISCAN,
 	BT_DEV_PSCAN,
 	BT_DEV_INQUIRY,
+	BT_DEV_LIMITED_DISCOVERABLE_MODE,
 #endif /* CONFIG_BT_CLASSIC */
 
 	/* Total number of flags - must be at the end of the enum */
@@ -82,7 +95,8 @@ enum {
 
 /* Flags which should not be cleared upon HCI_Reset */
 #define BT_DEV_PERSISTENT_FLAGS (BIT(BT_DEV_ENABLE) | \
-				 BIT(BT_DEV_PRESET_ID))
+				 BIT(BT_DEV_PRESET_ID) | \
+				 BIT(BT_DEV_DISABLE))
 
 #if defined(CONFIG_BT_EXT_ADV_LEGACY_SUPPORT)
 /* Check the feature bit for extended or legacy advertising commands */
@@ -271,7 +285,7 @@ struct bt_le_per_adv_sync {
 
 struct bt_dev_le {
 	/* LE features */
-	uint8_t			features[8];
+	uint8_t features[BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE];
 	/* LE states */
 	uint64_t			states;
 
@@ -477,7 +491,6 @@ int bt_le_create_conn_cancel(void);
 int bt_le_create_conn_synced(const struct bt_conn *conn, const struct bt_le_ext_adv *adv,
 			     uint8_t subevent);
 
-bool bt_addr_le_is_bonded(uint8_t id, const bt_addr_le_t *addr);
 const bt_addr_le_t *bt_lookup_id_addr(uint8_t id, const bt_addr_le_t *addr);
 
 int bt_send(struct net_buf *buf);
diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c
index 3e9131511568c..fde25bbc62f86 100644
--- a/subsys/bluetooth/host/hci_raw.c
+++ b/subsys/bluetooth/host/hci_raw.c
@@ -7,23 +7,33 @@
  */
 
 #include <errno.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/devicetree.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
-#include <zephyr/drivers/bluetooth.h>
 #include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_raw.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/bluetooth.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 
-#include <zephyr/bluetooth/hci.h>
-
-#include "monitor.h"
+#include "common/hci_common_internal.h"
 #include "hci_raw_internal.h"
+#include "monitor.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_hci_raw);
 
 static struct k_fifo *raw_rx;
@@ -48,7 +58,7 @@ static void hci_rx_buf_destroy(struct net_buf *buf)
 
 NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, BT_BUF_RX_COUNT, BT_BUF_RX_SIZE, sizeof(struct bt_buf_data),
 			  hci_rx_buf_destroy);
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT,
 			  BT_BUF_CMD_SIZE(CONFIG_BT_BUF_CMD_TX_SIZE),
 			  sizeof(struct bt_buf_data), NULL);
 NET_BUF_POOL_FIXED_DEFINE(hci_acl_pool, CONFIG_BT_BUF_ACL_TX_COUNT,
diff --git a/subsys/bluetooth/host/id.c b/subsys/bluetooth/host/id.c
index 31b49bbc1b909..926175f8b33b0 100644
--- a/subsys/bluetooth/host/id.c
+++ b/subsys/bluetooth/host/id.c
@@ -7,36 +7,41 @@
 
 #include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/buf.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/crypto.h>
+#include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/settings/settings.h>
+#include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
-
-#include <zephyr/bluetooth/addr.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci_vs.h>
-#include <zephyr/bluetooth/buf.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/toolchain.h>
 
-#include "hci_core.h"
-#include "id.h"
-#include "scan.h"
 #include "adv.h"
-#include "smp.h"
+#include "common/bt_str.h"
+#include "common/rpa.h"
 #include "conn_internal.h"
+#include "hci_core.h"
+#include "id.h"
 #include "keys.h"
-#include "common/rpa.h"
-
+#include "scan.h"
 #include "settings.h"
-
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/sys/util_macro.h>
-#include <zephyr/toolchain.h>
-
-#include "common/bt_str.h"
+#include "smp.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
 #include <zephyr/logging/log.h>
@@ -267,7 +272,7 @@ static void adv_rpa_clear_data(struct bt_le_ext_adv *adv, void *data)
 		atomic_clear_bit(adv->flags, BT_ADV_RPA_VALID);
 		bt_addr_copy(&bt_dev.rpa[adv->id], BT_ADDR_NONE);
 	} else {
-		LOG_WRN("Adv sets rpa expired cb with id %d returns false\n", adv->id);
+		LOG_WRN("Adv sets rpa expired cb with id %d returns false", adv->id);
 	}
 }
 #endif
@@ -286,6 +291,9 @@ static void le_rpa_invalidate(void)
 			return;
 		}
 		bool rpa_expired_data[bt_dev.id_count];
+		for (uint8_t i = 0; i < bt_dev.id_count; i++) {
+			rpa_expired_data[i] = true;
+		}
 
 		bt_le_ext_adv_foreach(adv_rpa_invalidate, &rpa_expired_data);
 #if defined(CONFIG_BT_RPA_SHARING)
@@ -918,7 +926,7 @@ static void pending_id_update(struct bt_keys *keys, void *data)
 	}
 }
 
-static void bt_id_pending_keys_update_set(struct bt_keys *keys, uint8_t flag)
+void bt_id_pending_keys_update_set(struct bt_keys *keys, uint8_t flag)
 {
 	atomic_set_bit(bt_dev.flags, BT_DEV_ID_PENDING);
 	keys->state |= flag;
diff --git a/subsys/bluetooth/host/id.h b/subsys/bluetooth/host/id.h
index 55a25d9340087..8824d3bb496b4 100644
--- a/subsys/bluetooth/host/id.h
+++ b/subsys/bluetooth/host/id.h
@@ -4,12 +4,25 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys_clock.h>
+
+#include "keys.h"
 
 #define RPA_TIMEOUT_MS(_rpa_timeout) (_rpa_timeout * MSEC_PER_SEC)
 
 static inline bool bt_id_rpa_is_new(void)
 {
 #if defined(CONFIG_BT_PRIVACY)
+	/* TODO: To get bt_dev we should include "hci_core.h" but that gives redefinitions
+	 * Should we have an API to get the rpa_update value?
+	 */
 	uint32_t remaining_ms = k_ticks_to_ms_floor32(
 		k_work_delayable_remaining_get(&bt_dev.rpa_update));
 	/* RPA is considered new if there is less than half a second since the
@@ -44,4 +57,6 @@ int bt_id_set_private_addr(uint8_t id);
 
 void bt_id_pending_keys_update(void);
 
+void bt_id_pending_keys_update_set(struct bt_keys *keys, uint8_t flag);
+
 void bt_id_adv_limited_stopped(struct bt_le_ext_adv *adv);
diff --git a/subsys/bluetooth/host/iso.c b/subsys/bluetooth/host/iso.c
index 973a9c61f7647..0500eb5cc72d1 100644
--- a/subsys/bluetooth/host/iso.c
+++ b/subsys/bluetooth/host/iso.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2020 Intel Corporation
- * Copyright (c) 2021-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -77,7 +77,6 @@ struct bt_conn iso_conns[CONFIG_BT_ISO_MAX_CHAN];
 struct bt_iso_cig cigs[CONFIG_BT_ISO_MAX_CIG];
 
 static struct bt_iso_cig *get_cig(const struct bt_iso_chan *iso_chan);
-static void bt_iso_remove_data_path(struct bt_conn *iso);
 static int hci_le_create_cis(const struct bt_iso_connect_param *param, size_t count);
 
 #endif /* CONFIG_BT_ISO_CENTRAL */
@@ -197,15 +196,6 @@ static int hci_le_setup_iso_data_path(const struct bt_conn *iso, uint8_t dir,
 	uint8_t *cc;
 	int err;
 
-	__ASSERT(dir == BT_HCI_DATAPATH_DIR_HOST_TO_CTLR || dir == BT_HCI_DATAPATH_DIR_CTLR_TO_HOST,
-		 "invalid ISO data path dir: %u", dir);
-
-	if ((path->cc == NULL && path->cc_len != 0)) {
-		LOG_DBG("Invalid ISO data path CC: %p %u", path->cc, path->cc_len);
-
-		return -EINVAL;
-	}
-
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SETUP_ISO_PATH, sizeof(*cp) + path->cc_len);
 	if (!buf) {
 		return -ENOBUFS;
@@ -249,103 +239,197 @@ static void bt_iso_chan_add(struct bt_conn *iso, struct bt_iso_chan *chan)
 	LOG_DBG("iso %p chan %p", iso, chan);
 }
 
-static int bt_iso_setup_data_path(struct bt_iso_chan *chan)
+static int validate_iso_setup_data_path_parms(const struct bt_iso_chan *chan, uint8_t dir,
+					      const struct bt_iso_chan_path *path)
 {
-	int err;
-	struct bt_iso_chan_path default_hci_path = {.pid = BT_ISO_DATA_PATH_HCI,
-						    .format = BT_HCI_CODING_FORMAT_TRANSPARENT,
-						    .cc_len = 0x00};
-	struct bt_iso_chan_path *out_path = NULL;
-	struct bt_iso_chan_path *in_path = NULL;
-	struct bt_iso_chan_io_qos *tx_qos;
-	struct bt_iso_chan_io_qos *rx_qos;
 	struct bt_conn *iso;
-	uint8_t dir;
+
+	CHECKIF(chan == NULL) {
+		LOG_DBG("chan is NULL");
+
+		return -EINVAL;
+	}
+
+	CHECKIF(path == NULL) {
+		LOG_DBG("path is NULL");
+
+		return -EINVAL;
+	}
+
+	CHECKIF(dir != BT_HCI_DATAPATH_DIR_HOST_TO_CTLR &&
+		dir != BT_HCI_DATAPATH_DIR_CTLR_TO_HOST) {
+		LOG_DBG("Invalid dir: %u", dir);
+
+		return -EINVAL;
+	}
 
 	iso = chan->iso;
+	if (iso == NULL) {
+		LOG_DBG("chan %p not associated with a CIS/BIS handle", chan);
 
-	tx_qos = chan->qos->tx;
-	rx_qos = chan->qos->rx;
+		return -ENODEV;
+	}
 
-	/* The following code sets the in and out paths for ISO data.
-	 * If the application provides a path for a direction (tx/rx) we use
-	 * that, otherwise we simply fall back to HCI.
-	 *
-	 * If the direction is not set (by whether tx_qos or rx_qos is NULL),
-	 * then we fallback to the HCI path object, but we disable the direction
-	 * in the controller.
-	 */
+	if (!iso->iso.info.can_recv && dir == BT_HCI_DATAPATH_DIR_CTLR_TO_HOST) {
+		LOG_DBG("Invalid dir %u for chan %p that cannot receive data", dir, chan);
 
-	if (tx_qos != NULL && iso->iso.info.can_send) {
-		if (tx_qos->path != NULL) { /* Use application path */
-			in_path = tx_qos->path;
-		} else { /* else fallback to HCI path */
-			in_path = &default_hci_path;
-		}
+		return -EINVAL;
 	}
 
-	if (rx_qos != NULL && iso->iso.info.can_recv) {
-		if (rx_qos->path != NULL) { /* Use application path */
-			out_path = rx_qos->path;
-		} else { /* else fallback to HCI path */
-			out_path = &default_hci_path;
-		}
+	if (!iso->iso.info.can_send && dir == BT_HCI_DATAPATH_DIR_HOST_TO_CTLR) {
+		LOG_DBG("Invalid dir %u for chan %p that cannot send data", dir, chan);
+
+		return -EINVAL;
 	}
 
-	__ASSERT(in_path || out_path, "At least one path shall be shell: in %p out %p", in_path,
-		 out_path);
+	CHECKIF(path->pid != BT_ISO_DATA_PATH_HCI &&
+		!IN_RANGE(path->pid, BT_ISO_DATA_PATH_VS_ID_MIN, BT_ISO_DATA_PATH_VS_ID_MAX)) {
+		LOG_DBG("Invalid pid %u", path->pid);
 
-	if (IS_ENABLED(CONFIG_BT_ISO_BROADCASTER) &&
-	    iso->iso.info.type == BT_ISO_CHAN_TYPE_BROADCASTER && in_path) {
-		dir = BT_HCI_DATAPATH_DIR_HOST_TO_CTLR;
-		err = hci_le_setup_iso_data_path(iso, dir, in_path);
-		if (err != 0) {
-			LOG_DBG("Failed to set broadcaster data path: %d", err);
-		}
+		return -EINVAL;
+	}
+
+	CHECKIF(path->format > BT_HCI_CODING_FORMAT_G729A &&
+		path->format != BT_HCI_CODING_FORMAT_VS) {
+		LOG_DBG("Invalid format %u", path->format);
+
+		return -EINVAL;
+	}
+
+	CHECKIF(path->delay > BT_ISO_CONTROLLER_DELAY_MAX) {
+		LOG_DBG("Invalid delay: %u", path->delay);
+
+		return -EINVAL;
+	}
 
+	CHECKIF(path->cc_len > 0U && path->cc == NULL) {
+		LOG_DBG("No CC provided for CC length %u", path->cc_len);
+
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+int bt_iso_setup_data_path(const struct bt_iso_chan *chan, uint8_t dir,
+			   const struct bt_iso_chan_path *path)
+{
+	int err;
+
+	err = validate_iso_setup_data_path_parms(chan, dir, path);
+	if (err != 0) {
 		return err;
-	} else if (IS_ENABLED(CONFIG_BT_ISO_SYNC_RECEIVER) &&
-		   iso->iso.info.type == BT_ISO_CHAN_TYPE_SYNC_RECEIVER && out_path) {
-		dir = BT_HCI_DATAPATH_DIR_CTLR_TO_HOST;
-		err = hci_le_setup_iso_data_path(iso, dir, out_path);
-		if (err != 0) {
-			LOG_DBG("Failed to set sync receiver data path: %d", err);
+	}
+
+	err = hci_le_setup_iso_data_path(chan->iso, dir, path);
+	if (err != 0) {
+		LOG_DBG("Failed to set data path: %d", err);
+
+		/* Return known possible errors */
+		if (err == -ENOBUFS || err == -EIO || err == -EACCES) {
+			return err;
 		}
 
+		LOG_DBG("Unknown error from hci_le_setup_iso_data_path: %d", err);
+
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
+static int hci_le_remove_iso_data_path(struct bt_conn *iso, uint8_t dir)
+{
+	struct bt_hci_cp_le_remove_iso_path *cp;
+	struct bt_hci_rp_le_remove_iso_path *rp;
+	struct net_buf *buf, *rsp;
+	int err;
+
+	buf = bt_hci_cmd_create(BT_HCI_OP_LE_REMOVE_ISO_PATH, sizeof(*cp));
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(iso->handle);
+	/* The path_dir is a bitfield and it's technically possible to do BIT(0) | BIT(1) but for
+	 * simplicity our API only supports removing a single ISO data path at a time.
+	 * We can convert from BT_HCI_DATAPATH_DIR_HOST_TO_CTLR and BT_HCI_DATAPATH_DIR_CTLR_TO_HOST
+	 * to the proper values just by using `BIT`
+	 */
+	cp->path_dir = BIT(dir);
+
+	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_REMOVE_ISO_PATH, buf, &rsp);
+	if (err) {
 		return err;
-	} else if (IS_ENABLED(CONFIG_BT_ISO_UNICAST) &&
-		   iso->iso.info.type == BT_ISO_CHAN_TYPE_CONNECTED) {
-		if (in_path != NULL) {
-			/* Enable TX */
-			dir = BT_HCI_DATAPATH_DIR_HOST_TO_CTLR;
-			err = hci_le_setup_iso_data_path(iso, dir, in_path);
-			if (err) {
-				LOG_DBG("Failed to setup host-to-ctrl path: %d", err);
-				return err;
-			}
-		}
+	}
 
-		if (out_path != NULL) {
-			/* Enable RX */
-			dir = BT_HCI_DATAPATH_DIR_CTLR_TO_HOST;
-			err = hci_le_setup_iso_data_path(iso, dir, out_path);
-			if (err) {
-				LOG_DBG("Failed to setup ctlr-to-host path: %d", err);
-				return err;
-			}
-		}
+	rp = (void *)rsp->data;
+	if (rp->status || (sys_le16_to_cpu(rp->handle) != iso->handle)) {
+		err = -EIO;
+	}
+
+	net_buf_unref(rsp);
+
+	return err;
+}
+
+static int validate_iso_remove_data_path(const struct bt_iso_chan *chan, uint8_t dir)
+{
+	struct bt_conn *iso;
+
+	CHECKIF(chan == NULL) {
+		LOG_DBG("chan is NULL");
 
-		return 0;
-	} else {
-		__ASSERT(false, "Invalid iso.info.type: %u", iso->iso.info.type);
 		return -EINVAL;
 	}
+
+	CHECKIF(dir != BT_HCI_DATAPATH_DIR_HOST_TO_CTLR &&
+		dir != BT_HCI_DATAPATH_DIR_CTLR_TO_HOST) {
+		LOG_DBG("Invalid dir: %u", dir);
+
+		return -EINVAL;
+	}
+
+	iso = chan->iso;
+	if (iso == NULL) {
+		LOG_DBG("chan %p not associated with a CIS/BIS handle", chan);
+
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+int bt_iso_remove_data_path(const struct bt_iso_chan *chan, uint8_t dir)
+{
+	int err;
+
+	err = validate_iso_remove_data_path(chan, dir);
+	if (err != 0) {
+		return err;
+	}
+
+	err = hci_le_remove_iso_data_path(chan->iso, dir);
+	if (err != 0) {
+		LOG_DBG("Failed to remove data path: %d", err);
+
+		/* Return known possible errors */
+		if (err == -ENOBUFS || err == -EIO || err == -EACCES) {
+			return err;
+		}
+
+		LOG_DBG("Unknown error from hci_le_remove_iso_data_path: %d", err);
+
+		return -ENOEXEC;
+	}
+
+	return 0;
 }
 
 void bt_iso_connected(struct bt_conn *iso)
 {
 	struct bt_iso_chan *chan;
-	int err;
 
 	if (iso == NULL || iso->type != BT_CONN_TYPE_ISO) {
 		LOG_DBG("Invalid parameters: iso %p iso->type %u", iso, iso ? iso->type : 0);
@@ -360,32 +444,6 @@ void bt_iso_connected(struct bt_conn *iso)
 		return;
 	}
 
-	err = bt_iso_setup_data_path(chan);
-	if (err != 0) {
-		if (false) {
-
-#if defined(CONFIG_BT_ISO_BROADCAST)
-		} else if (iso->iso.info.type == BT_ISO_CHAN_TYPE_BROADCASTER ||
-			   iso->iso.info.type == BT_ISO_CHAN_TYPE_SYNC_RECEIVER) {
-			struct bt_iso_big *big;
-
-			big = lookup_big_by_handle(iso->iso.big_handle);
-
-			err = bt_iso_big_terminate(big);
-			if (err != 0) {
-				LOG_ERR("Could not terminate BIG: %d", err);
-			}
-#endif /* CONFIG_BT_ISO_BROADCAST */
-
-		} else if (IS_ENABLED(CONFIG_BT_ISO_UNICAST) &&
-			   iso->iso.info.type == BT_ISO_CHAN_TYPE_CONNECTED) {
-			bt_conn_disconnect(iso, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
-		} else {
-			__ASSERT(false, "Invalid iso.info.type: %u", iso->iso.info.type);
-		}
-		return;
-	}
-
 	bt_iso_chan_set_state(chan, BT_ISO_STATE_CONNECTED);
 
 	if (chan->ops->connected) {
@@ -395,6 +453,7 @@ void bt_iso_connected(struct bt_conn *iso)
 
 static void bt_iso_chan_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 {
+	const uint8_t conn_type = chan->iso->iso.info.type;
 	LOG_DBG("%p, reason 0x%02x", chan, reason);
 
 	__ASSERT(chan->iso != NULL, "NULL conn for iso chan %p", chan);
@@ -402,23 +461,26 @@ static void bt_iso_chan_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 	bt_iso_chan_set_state(chan, BT_ISO_STATE_DISCONNECTED);
 	bt_conn_set_state(chan->iso, BT_CONN_DISCONNECT_COMPLETE);
 
+	/* Calling disconnected before final cleanup allows users to use bt_iso_chan_get_info in
+	 * the callback and to be more similar to the ACL disconnected callback. This also means
+	 * that the channel cannot be reused or memset in the callback
+	 */
+	if (chan->ops->disconnected) {
+		chan->ops->disconnected(chan, reason);
+	}
+
 	/* The peripheral does not have the concept of a CIG, so once a CIS
 	 * disconnects it is completely freed by unref'ing it
 	 */
 	if (IS_ENABLED(CONFIG_BT_ISO_UNICAST) &&
-	    chan->iso->iso.info.type == BT_ISO_CHAN_TYPE_CONNECTED) {
+	    (conn_type == BT_ISO_CHAN_TYPE_CENTRAL || conn_type == BT_ISO_CHAN_TYPE_PERIPHERAL)) {
 		bt_iso_cleanup_acl(chan->iso);
 
-		if (chan->iso->role == BT_HCI_ROLE_PERIPHERAL) {
+		if (conn_type == BT_ISO_CHAN_TYPE_PERIPHERAL) {
 			bt_conn_unref(chan->iso);
 			chan->iso = NULL;
 #if defined(CONFIG_BT_ISO_CENTRAL)
 		} else {
-			/* ISO data paths are automatically removed when the
-			 * peripheral disconnects, so we only need to
-			 * move it for the central
-			 */
-			bt_iso_remove_data_path(chan->iso);
 			bool is_chan_connected;
 			struct bt_iso_cig *cig;
 			struct bt_iso_chan *cis_chan;
@@ -442,10 +504,6 @@ static void bt_iso_chan_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 #endif /* CONFIG_BT_ISO_CENTRAL */
 		}
 	}
-
-	if (chan->ops->disconnected) {
-		chan->ops->disconnected(chan, reason);
-	}
 }
 
 void bt_iso_disconnected(struct bt_conn *iso)
@@ -910,7 +968,7 @@ int bt_iso_chan_send_ts(struct bt_iso_chan *chan, struct net_buf *buf, uint16_t
 	BT_ISO_DATA_DBG("chan %p len %zu", chan, net_buf_frags_len(buf));
 
 	hdr = net_buf_push(buf, sizeof(*hdr));
-	hdr->ts = ts;
+	hdr->ts = sys_cpu_to_le32(ts);
 	hdr->sdu.sn = sys_cpu_to_le16(seq_num);
 	hdr->sdu.slen = sys_cpu_to_le16(
 		bt_iso_pkt_len_pack(net_buf_frags_len(buf) - sizeof(*hdr), BT_ISO_DATA_VALID));
@@ -1131,7 +1189,7 @@ static void store_cis_info(const struct bt_hci_evt_le_cis_established *evt, stru
 			tx->sdu = sys_le16_to_cpu(evt->p_max_pdu);
 		}
 
-		iso_conn->info.type = BT_ISO_CHAN_TYPE_CONNECTED;
+		iso_conn->info.type = BT_ISO_CHAN_TYPE_PERIPHERAL;
 	} else {
 		/* values are already set for central - Verify */
 		if (tx != NULL && tx->phy != c_phy) {
@@ -1548,7 +1606,7 @@ void hci_le_cis_req(struct net_buf *buf)
 		return;
 	}
 
-	iso->iso.info.type = BT_ISO_CHAN_TYPE_CONNECTED;
+	iso->iso.info.type = BT_ISO_CHAN_TYPE_PERIPHERAL;
 	iso->iso.cig_id = evt->cig_id;
 	iso->iso.cis_id = evt->cis_id;
 
@@ -1591,80 +1649,6 @@ static struct bt_conn *bt_conn_add_iso(struct bt_conn *acl)
 #endif /* CONFIG_BT_ISO_PERIPHERAL */
 
 #if defined(CONFIG_BT_ISO_CENTRAL)
-static int hci_le_remove_iso_data_path(struct bt_conn *iso, uint8_t dir)
-{
-	struct bt_hci_cp_le_remove_iso_path *cp;
-	struct bt_hci_rp_le_remove_iso_path *rp;
-	struct net_buf *buf, *rsp;
-	int err;
-
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_REMOVE_ISO_PATH, sizeof(*cp));
-	if (!buf) {
-		return -ENOBUFS;
-	}
-
-	cp = net_buf_add(buf, sizeof(*cp));
-	cp->handle = sys_cpu_to_le16(iso->handle);
-	cp->path_dir = dir;
-
-	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_REMOVE_ISO_PATH, buf, &rsp);
-	if (err) {
-		return err;
-	}
-
-	rp = (void *)rsp->data;
-	if (rp->status || (sys_le16_to_cpu(rp->handle) != iso->handle)) {
-		err = -EIO;
-	}
-
-	net_buf_unref(rsp);
-
-	return err;
-}
-
-static void bt_iso_remove_data_path(struct bt_conn *iso)
-{
-	enum bt_iso_chan_type type = iso->iso.info.type;
-
-	LOG_DBG("%p", iso);
-
-	/* TODO: Removing the ISO data path is never used for broadcast:
-	 * Remove the following broadcast implementation?
-	 */
-	if ((IS_ENABLED(CONFIG_BT_ISO_BROADCASTER) && type == BT_ISO_CHAN_TYPE_BROADCASTER) ||
-	    (IS_ENABLED(CONFIG_BT_ISO_SYNC_RECEIVER) && type == BT_ISO_CHAN_TYPE_SYNC_RECEIVER)) {
-		struct bt_iso_chan *chan;
-		struct bt_iso_chan_io_qos *tx_qos;
-		uint8_t dir;
-
-		chan = iso_chan(iso);
-		if (chan == NULL) {
-			return;
-		}
-
-		tx_qos = chan->qos->tx;
-
-		/* Only remove one data path for BIS as per the spec */
-		if (tx_qos) {
-			dir = BIT(BT_HCI_DATAPATH_DIR_HOST_TO_CTLR);
-		} else {
-			dir = BIT(BT_HCI_DATAPATH_DIR_CTLR_TO_HOST);
-		}
-
-		(void)hci_le_remove_iso_data_path(iso, dir);
-	} else if (IS_ENABLED(CONFIG_BT_ISO_UNICAST) && type == BT_ISO_CHAN_TYPE_CONNECTED) {
-		/* Remove both directions for CIS*/
-
-		/* TODO: Check which has been setup first to avoid removing
-		 * data paths that are not setup
-		 */
-		(void)hci_le_remove_iso_data_path(iso, BIT(BT_HCI_DATAPATH_DIR_HOST_TO_CTLR));
-		(void)hci_le_remove_iso_data_path(iso, BIT(BT_HCI_DATAPATH_DIR_CTLR_TO_HOST));
-	} else {
-		__ASSERT(false, "Invalid iso.type: %u", type);
-	}
-}
-
 static bool valid_chan_qos(const struct bt_iso_chan_qos *qos, bool advanced)
 {
 #if defined(CONFIG_BT_ISO_TEST_PARAMS)
@@ -1984,7 +1968,7 @@ static int cig_init_cis(struct bt_iso_cig *cig, const struct bt_iso_cig_param *p
 			iso_conn = &cis->iso->iso;
 
 			iso_conn->cig_id = cig->id;
-			iso_conn->info.type = BT_ISO_CHAN_TYPE_CONNECTED;
+			iso_conn->info.type = BT_ISO_CHAN_TYPE_CENTRAL;
 			iso_conn->cis_id = cig->num_cis++;
 
 			bt_iso_chan_add(cis->iso, cis);
@@ -2553,7 +2537,8 @@ static bool iso_chans_connecting(void)
 		const struct bt_conn *iso = &iso_conns[i];
 		const struct bt_iso_chan *iso_chan;
 
-		if (iso == NULL || iso->iso.info.type != BT_ISO_CHAN_TYPE_CONNECTED) {
+		if (iso == NULL || !(iso->iso.info.type == BT_ISO_CHAN_TYPE_CENTRAL ||
+				     iso->iso.info.type == BT_ISO_CHAN_TYPE_PERIPHERAL)) {
 			continue;
 		}
 
diff --git a/subsys/bluetooth/host/keys.c b/subsys/bluetooth/host/keys.c
index 6740d43b1cd08..6341fc1e58e84 100644
--- a/subsys/bluetooth/host/keys.c
+++ b/subsys/bluetooth/host/keys.c
@@ -5,33 +5,38 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-#include <zephyr/kernel.h>
-#include <string.h>
+#include <errno.h>
+#include <stdbool.h>
 #include <stdlib.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/byteorder.h>
-
-#include <zephyr/settings/settings.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "common/bt_str.h"
-
 #include "common/rpa.h"
 #include "conn_internal.h"
 #include "gatt_internal.h"
 #include "hci_core.h"
-#include "smp.h"
-#include "settings.h"
+#include "id.h"
 #include "keys.h"
+#include "settings.h"
+#include "smp.h"
+#include "sys/types.h"
 
 #define LOG_LEVEL CONFIG_BT_KEYS_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_keys);
 
 static struct bt_keys key_pool[CONFIG_BT_MAX_PAIRED];
@@ -174,10 +179,6 @@ void bt_foreach_bond(uint8_t id, void (*func)(const struct bt_bond_info *info,
 			func(&info, user_data);
 		}
 	}
-
-	if (IS_ENABLED(CONFIG_BT_CLASSIC)) {
-		bt_foreach_bond_br(func, user_data);
-	}
 }
 
 void bt_keys_foreach_type(enum bt_keys_type type, void (*func)(struct bt_keys *keys, void *data),
@@ -435,11 +436,19 @@ static int keys_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 	return 0;
 }
 
+static void add_id_cb(struct k_work *work)
+{
+	bt_id_pending_keys_update();
+}
+
+static K_WORK_DEFINE(add_id_work, add_id_cb);
+
 static void id_add(struct bt_keys *keys, void *user_data)
 {
 	__ASSERT_NO_MSG(keys != NULL);
 
-	bt_id_add(keys);
+	bt_id_pending_keys_update_set(keys, BT_KEYS_ID_PENDING_ADD);
+	k_work_submit(&add_id_work);
 }
 
 static int keys_commit(void)
diff --git a/subsys/bluetooth/host/keys.h b/subsys/bluetooth/host/keys.h
index c1da17fb48812..b53635ce2c566 100644
--- a/subsys/bluetooth/host/keys.h
+++ b/subsys/bluetooth/host/keys.h
@@ -9,83 +9,89 @@
 #ifndef ZEPHYR_SUBSYS_BLUETOOTH_HOST_KEYS_H_
 #define ZEPHYR_SUBSYS_BLUETOOTH_HOST_KEYS_H_
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
 
 /** @cond INTERNAL_HIDDEN */
 
 enum bt_keys_type {
-	BT_KEYS_PERIPH_LTK     = BIT(0),
-	BT_KEYS_IRK            = BIT(1),
-	BT_KEYS_LTK            = BIT(2),
-	BT_KEYS_LOCAL_CSRK     = BIT(3),
-	BT_KEYS_REMOTE_CSRK    = BIT(4),
-	BT_KEYS_LTK_P256       = BIT(5),
-
-	BT_KEYS_ALL            = (BT_KEYS_PERIPH_LTK | BT_KEYS_IRK |
-				  BT_KEYS_LTK | BT_KEYS_LOCAL_CSRK |
-				  BT_KEYS_REMOTE_CSRK | BT_KEYS_LTK_P256),
+	BT_KEYS_PERIPH_LTK = BIT(0),
+	BT_KEYS_IRK = BIT(1),
+	BT_KEYS_LTK = BIT(2),
+	BT_KEYS_LOCAL_CSRK = BIT(3),
+	BT_KEYS_REMOTE_CSRK = BIT(4),
+	BT_KEYS_LTK_P256 = BIT(5),
+
+	BT_KEYS_ALL = (BT_KEYS_PERIPH_LTK | BT_KEYS_IRK | BT_KEYS_LTK | BT_KEYS_LOCAL_CSRK |
+		       BT_KEYS_REMOTE_CSRK | BT_KEYS_LTK_P256),
 };
 
 enum {
-	BT_KEYS_ID_PENDING_ADD  = BIT(0),
-	BT_KEYS_ID_PENDING_DEL  = BIT(1),
-	BT_KEYS_ID_ADDED        = BIT(2),
+	BT_KEYS_ID_PENDING_ADD = BIT(0),
+	BT_KEYS_ID_PENDING_DEL = BIT(1),
+	BT_KEYS_ID_ADDED = BIT(2),
 };
 
 enum {
-	BT_KEYS_AUTHENTICATED   = BIT(0),
-	BT_KEYS_DEBUG           = BIT(1),
+	BT_KEYS_AUTHENTICATED = BIT(0),
+	BT_KEYS_DEBUG = BIT(1),
 	/* Bit 2 and 3 might accidentally exist in old stored keys */
-	BT_KEYS_SC              = BIT(4),
-	BT_KEYS_OOB             = BIT(5),
+	BT_KEYS_SC = BIT(4),
+	BT_KEYS_OOB = BIT(5),
 };
 
 struct bt_ltk {
-	uint8_t                    rand[8];
-	uint8_t                    ediv[2];
-	uint8_t                    val[16];
+	uint8_t rand[8];
+	uint8_t ediv[2];
+	uint8_t val[16];
 };
 
 struct bt_irk {
-	uint8_t                    val[16];
+	uint8_t val[16];
 	/* Cache for `bt_keys_find_irk`. Not reliable as "current RPA"! */
-	bt_addr_t               rpa;
+	bt_addr_t rpa;
 };
 
 static inline bool bt_irk_eq(struct bt_irk const *a, struct bt_irk const *b)
 {
-	return (memcmp(a->val, b->val, sizeof(a->val)) == 0);
+	return util_memeq(a->val, b->val, sizeof(a->val));
 }
 
 struct bt_csrk {
-	uint8_t                    val[16];
-	uint32_t                   cnt;
+	uint8_t val[16];
+	uint32_t cnt;
 };
 
 struct bt_keys {
-	uint8_t                    id;
-	bt_addr_le_t            addr;
-	uint8_t                    state;
-	uint8_t                    storage_start[0] __aligned(sizeof(void *));
-	uint8_t                    enc_size;
-	uint8_t                    flags;
-	uint16_t                   keys;
-	struct bt_ltk           ltk;
-	struct bt_irk           irk;
+	uint8_t id;
+	bt_addr_le_t addr;
+	uint8_t state;
+	uint8_t storage_start[0] __aligned(sizeof(void *));
+	uint8_t enc_size;
+	uint8_t flags;
+	uint16_t keys;
+	struct bt_ltk ltk;
+	struct bt_irk irk;
 #if defined(CONFIG_BT_SIGNING)
-	struct bt_csrk          local_csrk;
-	struct bt_csrk          remote_csrk;
+	struct bt_csrk local_csrk;
+	struct bt_csrk remote_csrk;
 #endif /* BT_SIGNING */
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
-	struct bt_ltk           periph_ltk;
+	struct bt_ltk periph_ltk;
 #endif /* CONFIG_BT_SMP_SC_PAIR_ONLY */
 #if (defined(CONFIG_BT_KEYS_OVERWRITE_OLDEST))
-	uint32_t                   aging_counter;
+	uint32_t aging_counter;
 #endif /* CONFIG_BT_KEYS_OVERWRITE_OLDEST */
 };
 
-#define BT_KEYS_STORAGE_LEN     (sizeof(struct bt_keys) - \
-				 offsetof(struct bt_keys, storage_start))
+#define BT_KEYS_STORAGE_LEN (sizeof(struct bt_keys) - offsetof(struct bt_keys, storage_start))
 
 /** Clears all keys.
  *
@@ -204,30 +210,28 @@ static inline int bt_keys_store(struct bt_keys *keys)
 #endif
 
 enum {
-	BT_LINK_KEY_AUTHENTICATED  = BIT(0),
-	BT_LINK_KEY_DEBUG          = BIT(1),
-	BT_LINK_KEY_SC             = BIT(2),
+	BT_LINK_KEY_AUTHENTICATED = BIT(0),
+	BT_LINK_KEY_DEBUG = BIT(1),
+	BT_LINK_KEY_SC = BIT(2),
 };
 
 struct bt_keys_link_key {
-	bt_addr_t               addr;
-	uint8_t                 storage_start[0]  __aligned(sizeof(void *));
-	uint8_t                 flags;
-	uint8_t                 val[16];
+	bt_addr_t addr;
+	uint8_t storage_start[0] __aligned(sizeof(void *));
+	uint8_t flags;
+	uint8_t val[16];
 #if (defined(CONFIG_BT_KEYS_OVERWRITE_OLDEST))
-	uint32_t                aging_counter;
+	uint32_t aging_counter;
 #endif /* CONFIG_BT_KEYS_OVERWRITE_OLDEST */
 };
-#define BT_KEYS_LINK_KEY_STORAGE_LEN     (sizeof(struct bt_keys_link_key) - \
-	offsetof(struct bt_keys_link_key, storage_start))
+#define BT_KEYS_LINK_KEY_STORAGE_LEN                                                               \
+	(sizeof(struct bt_keys_link_key) - offsetof(struct bt_keys_link_key, storage_start))
 
 struct bt_keys_link_key *bt_keys_get_link_key(const bt_addr_t *addr);
 struct bt_keys_link_key *bt_keys_find_link_key(const bt_addr_t *addr);
 void bt_keys_link_key_clear(struct bt_keys_link_key *link_key);
 void bt_keys_link_key_clear_addr(const bt_addr_t *addr);
 void bt_keys_link_key_store(struct bt_keys_link_key *link_key);
-void bt_foreach_bond_br(void (*func)(const struct bt_bond_info *info, void *user_data),
-			void *user_data);
 
 /* This function is used to signal that the key has been used for paring */
 /* It updates the aging counter and saves it to flash if configuration option */
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 03b68592d5c0f..c1ee3ecc2cfba 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -6,33 +6,39 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/kernel.h>
-#include <string.h>
-#include <errno.h>
+
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/check.h>
 #include <zephyr/sys/iterable_sections.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/math_extras.h>
+#include <zephyr/sys/slist.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/net_buf.h>
-
-#include <zephyr/bluetooth/hci.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/l2cap.h>
-
-#define LOG_DBG_ENABLED IS_ENABLED(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 
 #include "buf_view.h"
 #include "hci_core.h"
 #include "conn_internal.h"
 #include "l2cap_internal.h"
-#include "keys.h"
 
-#include <zephyr/logging/log.h>
+#define LOG_DBG_ENABLED IS_ENABLED(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)
 LOG_MODULE_REGISTER(bt_l2cap, CONFIG_BT_L2CAP_LOG_LEVEL);
 
 #define LE_CHAN_RTX(_w) CONTAINER_OF(k_work_delayable_from_work(_w), \
@@ -674,6 +680,11 @@ struct net_buf *bt_l2cap_create_pdu_timeout(struct net_buf_pool *pool,
 					    size_t reserve,
 					    k_timeout_t timeout)
 {
+	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
+	    k_current_get() == k_work_queue_thread_get(&k_sys_work_q)) {
+		timeout = K_NO_WAIT;
+	}
+
 	return bt_conn_create_pdu_timeout(pool,
 					  sizeof(struct bt_l2cap_hdr) + reserve,
 					  timeout);
@@ -2412,6 +2423,10 @@ int bt_l2cap_chan_recv_complete(struct bt_l2cap_chan *chan, struct net_buf *buf)
 		return -ENOTCONN;
 	}
 
+	if (IS_ENABLED(CONFIG_BT_CLASSIC) && conn->type == BT_CONN_TYPE_BR) {
+		return bt_l2cap_br_chan_recv_complete(chan);
+	}
+
 	if (conn->type != BT_CONN_TYPE_LE) {
 		return -ENOTSUP;
 	}
@@ -2445,7 +2460,7 @@ static void l2cap_chan_le_recv_sdu(struct bt_l2cap_le_chan *chan,
 {
 	int err;
 
-	LOG_DBG("chan %p len %zu", chan, buf->len);
+	LOG_DBG("chan %p len %u", chan, buf->len);
 
 	__ASSERT_NO_MSG(bt_l2cap_chan_get_state(&chan->chan) == BT_L2CAP_CONNECTED);
 	__ASSERT_NO_MSG(atomic_get(&chan->rx.credits) == 0);
@@ -2487,7 +2502,7 @@ static void l2cap_chan_le_recv_seg(struct bt_l2cap_le_chan *chan,
 	/* Store received segments in user_data */
 	memcpy(net_buf_user_data(chan->_sdu), &seg, sizeof(seg));
 
-	LOG_DBG("chan %p seg %d len %zu", chan, seg, buf->len);
+	LOG_DBG("chan %p seg %d len %u", chan, seg, buf->len);
 
 	/* Append received segment to SDU */
 	len = net_buf_append_bytes(chan->_sdu, buf->len, buf->data, K_NO_WAIT,
@@ -3283,7 +3298,7 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf)
 		return -EINVAL;
 	}
 
-	LOG_DBG("chan %p buf %p len %zu", chan, buf, buf->len);
+	LOG_DBG("chan %p buf %p len %u", chan, buf, buf->len);
 
 	if (buf->ref != 1) {
 		LOG_WRN("Expecting 1 ref, got %d", buf->ref);
diff --git a/subsys/bluetooth/host/l2cap_internal.h b/subsys/bluetooth/host/l2cap_internal.h
index 60f614b7caa5c..07bd428334aeb 100644
--- a/subsys/bluetooth/host/l2cap_internal.h
+++ b/subsys/bluetooth/host/l2cap_internal.h
@@ -7,10 +7,19 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/iterable_sections.h>
+#include <zephyr/sys_clock.h>
+
 #include "host/classic/l2cap_br_interface.h"
+/* TODO: we should include conn_internal.h for bt_conn_tx_cb_t but that causes redefinitions */
 
 enum l2cap_conn_list_action {
 	BT_L2CAP_CHAN_LOOKUP,
diff --git a/subsys/bluetooth/host/long_wq.c b/subsys/bluetooth/host/long_wq.c
index b7b6e3dc03b13..06f89ce71fc26 100644
--- a/subsys/bluetooth/host/long_wq.c
+++ b/subsys/bluetooth/host/long_wq.c
@@ -5,8 +5,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <zephyr/autoconf.h>
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel/thread_stack.h>
+#include <zephyr/sys_clock.h>
 
 K_THREAD_STACK_DEFINE(bt_lw_stack_area, CONFIG_BT_LONG_WQ_STACK_SIZE);
 static struct k_work_q bt_long_wq;
diff --git a/subsys/bluetooth/host/long_wq.h b/subsys/bluetooth/host/long_wq.h
index 714aa0af355c1..905048735bf3d 100644
--- a/subsys/bluetooth/host/long_wq.h
+++ b/subsys/bluetooth/host/long_wq.h
@@ -6,6 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
+
 int bt_long_wq_schedule(struct k_work_delayable *dwork, k_timeout_t timeout);
 int bt_long_wq_reschedule(struct k_work_delayable *dwork, k_timeout_t timeout);
 int bt_long_wq_submit(struct k_work *dwork);
diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c
index 10f18c3435d77..77f116caab58e 100644
--- a/subsys/bluetooth/host/monitor.c
+++ b/subsys/bluetooth/host/monitor.c
@@ -8,24 +8,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/types.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
-#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/buf.h>
 #include <zephyr/device.h>
-#include <zephyr/init.h>
 #include <zephyr/drivers/uart_pipe.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/printk-hooks.h>
-#include <zephyr/sys/libc-hooks.h>
-#include <zephyr/drivers/uart.h>
-
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
 #include <zephyr/logging/log_output.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
-
-#include <zephyr/bluetooth/buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/atomic_types.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk-hooks.h>
+#include <zephyr/sys/libc-hooks.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "monitor.h"
 
diff --git a/subsys/bluetooth/host/monitor.h b/subsys/bluetooth/host/monitor.h
index e5a6422bfd8d4..873f51348aa43 100644
--- a/subsys/bluetooth/host/monitor.h
+++ b/subsys/bluetooth/host/monitor.h
@@ -7,8 +7,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <stdint.h>
 
-#if defined(CONFIG_BT_MONITOR)
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/net_buf.h>
 
 #define BT_MONITOR_NEW_INDEX    0
 #define BT_MONITOR_DEL_INDEX    1
@@ -95,6 +97,8 @@ static inline uint8_t bt_monitor_opcode(struct net_buf *buf)
 	}
 }
 
+/* TODO: Remove guard and replace with IS_ENABLED(CONFIG_BT_MONITOR) */
+#if defined(CONFIG_BT_MONITOR)
 void bt_monitor_send(uint16_t opcode, const void *data, size_t len);
 
 void bt_monitor_new_index(uint8_t type, uint8_t bus, const bt_addr_t *addr,
diff --git a/subsys/bluetooth/host/scan.c b/subsys/bluetooth/host/scan.c
index 05ad120fb38c4..7094ebd664de1 100644
--- a/subsys/bluetooth/host/scan.c
+++ b/subsys/bluetooth/host/scan.c
@@ -4,31 +4,42 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <sys/types.h>
+#include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/sys/atomic.h>
-#include <zephyr/kernel.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/check.h>
-
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/bluetooth/direction.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
+
+#include <sys/types.h>
 
 #include "addr_internal.h"
-#include "hci_core.h"
+#include "common/bt_str.h"
 #include "conn_internal.h"
 #include "direction_internal.h"
+#include "hci_core.h"
 #include "id.h"
-
-#include "common/bt_str.h"
 #include "scan.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
@@ -741,6 +752,28 @@ static uint8_t get_adv_type(uint8_t evt_type)
 	}
 }
 
+/* Convert Extended adv report PHY to GAP PHY */
+static uint8_t get_ext_adv_coding_sel_phy(uint8_t hci_phy)
+{
+	/* Converts from Extended adv report PHY to BT_GAP_LE_PHY_*
+	 * When Advertising Coding Selection (Host Support) is enabled
+	 * the controller will return the advertising coding scheme which
+	 * can be S=2 or S=8 data coding.
+	 */
+	switch (hci_phy) {
+	case BT_HCI_LE_ADV_EVT_PHY_1M:
+		return BT_GAP_LE_PHY_1M;
+	case BT_HCI_LE_ADV_EVT_PHY_2M:
+		return BT_GAP_LE_PHY_2M;
+	case BT_HCI_LE_ADV_EVT_PHY_CODED_S8:
+		return BT_GAP_LE_PHY_CODED_S8;
+	case BT_HCI_LE_ADV_EVT_PHY_CODED_S2:
+		return BT_GAP_LE_PHY_CODED_S2;
+	default:
+		return 0;
+	}
+}
+
 /* Convert extended adv report evt_type field to adv props */
 static uint16_t get_adv_props_extended(uint16_t evt_type)
 {
@@ -755,8 +788,15 @@ static uint16_t get_adv_props_extended(uint16_t evt_type)
 static void create_ext_adv_info(struct bt_hci_evt_le_ext_advertising_info const *const evt,
 				struct bt_le_scan_recv_info *const scan_info)
 {
-	scan_info->primary_phy = bt_get_phy(evt->prim_phy);
-	scan_info->secondary_phy = bt_get_phy(evt->sec_phy);
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV_CODING_SELECTION) &&
+	    BT_FEAT_LE_ADV_CODING_SEL(bt_dev.le.features)) {
+		scan_info->primary_phy = get_ext_adv_coding_sel_phy(evt->prim_phy);
+		scan_info->secondary_phy = get_ext_adv_coding_sel_phy(evt->sec_phy);
+	} else {
+		scan_info->primary_phy = bt_get_phy(evt->prim_phy);
+		scan_info->secondary_phy = bt_get_phy(evt->sec_phy);
+	}
+
 	scan_info->tx_power = evt->tx_power;
 	scan_info->rssi = evt->rssi;
 	scan_info->sid = evt->sid;
@@ -879,7 +919,7 @@ void bt_hci_le_adv_ext_report(struct net_buf *buf)
 		}
 
 		if (evt->length + ext_scan_buf.len > ext_scan_buf.size) {
-			/* The report does not fit in the reassemby buffer
+			/* The report does not fit in the reassembly buffer
 			 * Discard this and future reports from the advertiser.
 			 */
 			reassembling_advertiser.state = FRAG_ADV_DISCARDING;
@@ -1390,7 +1430,7 @@ void bt_hci_le_per_adv_sync_lost(struct net_buf *buf)
 	per_adv_sync = bt_hci_per_adv_sync_lookup_handle(sys_le16_to_cpu(evt->handle));
 
 	if (!per_adv_sync) {
-		LOG_ERR("Unknown handle 0x%04Xfor periodic adv sync lost",
+		LOG_ERR("Unknown handle 0x%04X for periodic adv sync lost",
 			sys_le16_to_cpu(evt->handle));
 		return;
 	}
diff --git a/subsys/bluetooth/host/scan.h b/subsys/bluetooth/host/scan.h
index 85e1e4f828b71..6f9c094bc43ea 100644
--- a/subsys/bluetooth/host/scan.h
+++ b/subsys/bluetooth/host/scan.h
@@ -8,10 +8,12 @@
 #ifndef SUBSYS_BLUETOOTH_HOST_SCAN_H_
 #define SUBSYS_BLUETOOTH_HOST_SCAN_H_
 
+#include <stdbool.h>
 #include <stdint.h>
 
-#include <zephyr/sys/atomic.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/sys/atomic.h>
 
 /**
  * Reasons why a scanner can be running.
diff --git a/subsys/bluetooth/host/settings.c b/subsys/bluetooth/host/settings.c
index 1718bc653d408..84b4f1eb4b6a8 100644
--- a/subsys/bluetooth/host/settings.c
+++ b/subsys/bluetooth/host/settings.c
@@ -5,19 +5,28 @@
  */
 
 #include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
-#include <zephyr/kernel.h>
-#include <zephyr/settings/settings.h>
-#include <common/bt_settings_commit.h>
-
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
 
+#include "common/bt_settings_commit.h"
 #include "common/bt_str.h"
-
 #include "hci_core.h"
 #include "settings.h"
+#include "sys/types.h"
 
 #define LOG_LEVEL CONFIG_BT_SETTINGS_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/subsys/bluetooth/host/settings.h b/subsys/bluetooth/host/settings.h
index cf5618b378db5..526d850f70ab6 100644
--- a/subsys/bluetooth/host/settings.h
+++ b/subsys/bluetooth/host/settings.h
@@ -8,9 +8,8 @@
 #include <stdint.h>
 
 #include <zephyr/bluetooth/addr.h>
-
 #include <zephyr/settings/settings.h>
-#include <common/bt_settings_commit.h>
+#include "common/bt_settings_commit.h"
 
 /* Max settings key length (with all components) */
 #define BT_SETTINGS_KEY_MAX 36
diff --git a/subsys/bluetooth/host/shell/bt.c b/subsys/bluetooth/host/shell/bt.c
index 65ba281a79ec7..a2ee453b2ea75 100644
--- a/subsys/bluetooth/host/shell/bt.c
+++ b/subsys/bluetooth/host/shell/bt.c
@@ -12,33 +12,46 @@
  */
 
 #include <errno.h>
-#include <zephyr/types.h>
-#include <ctype.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <zephyr/sys/printk.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/sys/util_macro.h>
-#include <zephyr/kernel.h>
+#include <sys/types.h>
 
-#include <zephyr/settings/settings.h>
-
-#include <zephyr/bluetooth/hci.h>
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/classic/rfcomm.h>
 #include <zephyr/bluetooth/classic/sdp.h>
-#include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/ead.h>
-
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/settings/settings.h>
 #include <zephyr/shell/shell.h>
-#include "common/bt_shell_private.h"
+#include <zephyr/shell/shell_string_conv.h>
+#include <zephyr/shell/shell_types.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/types.h>
 
 #include "audio/shell/audio.h"
+#include "common/bt_shell_private.h"
+#if defined(CONFIG_BT_LL_SW_SPLIT)
 #include "controller/ll_sw/shell/ll.h"
+#endif /* CONFIG_BT_LL_SW_SPLIT */
 #include "host/shell/bt.h"
 #include "mesh/shell/hci.h"
 
@@ -358,7 +371,8 @@ static void print_data_set(uint8_t set_value_len,
 
 static bool data_verbose_cb(struct bt_data *data, void *user_data)
 {
-	bt_shell_fprintf_info("%*sType 0x%02x: ", strlen(scan_response_label), "", data->type);
+	bt_shell_fprintf_info("%*sType 0x%02x: ",
+			      (int)strlen(scan_response_label), "", data->type);
 
 	switch (data->type) {
 	case BT_DATA_UUID16_SOME:
@@ -569,10 +583,10 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, struct net_buf_si
 
 	if (scan_verbose_output) {
 		bt_shell_info("%*s[SCAN DATA START - %s]",
-			      strlen(scan_response_label), "",
+			      (int)strlen(scan_response_label), "",
 			      scan_response_type_txt(info->adv_type));
 		bt_data_parse(&buf_copy, data_verbose_cb, NULL);
-		bt_shell_info("%*s[SCAN DATA END]", strlen(scan_response_label), "");
+		bt_shell_info("%*s[SCAN DATA END]", (int)strlen(scan_response_label), "");
 	}
 
 #if defined(CONFIG_BT_CENTRAL)
@@ -984,8 +998,15 @@ void subrate_changed(struct bt_conn *conn,
 #endif
 
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-void print_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_capabilities *params)
+void print_remote_cs_capabilities(struct bt_conn *conn,
+				  uint8_t status,
+				  struct bt_conn_le_cs_capabilities *params)
 {
+	if (status != BT_HCI_ERR_SUCCESS) {
+		bt_shell_print("Read Remote CS Capabilities failed (HCI status 0x%02x)", status);
+		return;
+	}
+
 	bt_shell_print(
 		"Received remote channel sounding capabilities:\n"
 		"- Num CS configurations: %d\n"
@@ -1047,14 +1068,28 @@ void print_remote_cs_capabilities(struct bt_conn *conn, struct bt_conn_le_cs_cap
 		params->tx_snr_capability);
 }
 
-void print_remote_cs_fae_table(struct bt_conn *conn, struct bt_conn_le_cs_fae_table *params)
+void print_remote_cs_fae_table(struct bt_conn *conn,
+			       uint8_t status,
+			       struct bt_conn_le_cs_fae_table *params)
 {
+	if (status != BT_HCI_ERR_SUCCESS) {
+		bt_shell_print("Read Remote CS FAE Table failed (HCI status 0x%02x)", status);
+		return;
+	}
+
 	bt_shell_print("Received FAE Table: ");
 	bt_shell_hexdump(params->remote_fae_table, 72);
 }
 
-static void le_cs_config_created(struct bt_conn *conn, struct bt_conn_le_cs_config *config)
+static void le_cs_config_created(struct bt_conn *conn,
+				 uint8_t status,
+				 struct bt_conn_le_cs_config *config)
 {
+	if (status != BT_HCI_ERR_SUCCESS) {
+		bt_shell_print("Create CS Config failed (HCI status 0x%02x)", status);
+		return;
+	}
+
 	const char *mode_str[5] = {"Unused", "1 (RTT)", "2 (PBR)", "3 (RTT + PBR)", "Invalid"};
 	const char *role_str[3] = {"Initiator", "Reflector", "Invalid"};
 	const char *rtt_type_str[8] = {"AA only",        "32-bit sounding", "96-bit sounding",
@@ -1142,9 +1177,9 @@ static struct bt_conn_cb conn_callbacks = {
 	.subrate_changed = subrate_changed,
 #endif
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
-	.le_cs_remote_capabilities_available = print_remote_cs_capabilities,
-	.le_cs_remote_fae_table_available = print_remote_cs_fae_table,
-	.le_cs_config_created = le_cs_config_created,
+	.le_cs_read_remote_capabilities_complete = print_remote_cs_capabilities,
+	.le_cs_read_remote_fae_table_complete = print_remote_cs_fae_table,
+	.le_cs_config_complete = le_cs_config_created,
 	.le_cs_config_removed = le_cs_config_removed,
 #endif
 };
@@ -1496,7 +1531,7 @@ static int cmd_id_reset(const struct shell *sh, size_t argc, char *argv[])
 	int err;
 
 	if (argc < 2) {
-		shell_error(sh, "Identity identifier not specified");
+		shell_error(sh, "Identity handle not specified");
 		return -ENOEXEC;
 	}
 
@@ -1530,7 +1565,7 @@ static int cmd_id_delete(const struct shell *sh, size_t argc, char *argv[])
 	int err;
 
 	if (argc < 2) {
-		shell_error(sh, "Identity identifier not specified");
+		shell_error(sh, "Identity handle not specified");
 		return -ENOEXEC;
 	}
 
@@ -1932,7 +1967,7 @@ static ssize_t ad_init(struct bt_data *data_array, const size_t data_array_size,
 		csis_ad_len = csis_ad_data_add(&data_array[ad_len],
 					       data_array_size - ad_len, discoverable);
 		if (csis_ad_len < 0) {
-			bt_shell_error("Failed to add CSIS data (err %d)", csis_ad_len);
+			bt_shell_error("Failed to add CSIS data (err %zd)", csis_ad_len);
 			return ad_len;
 		}
 
@@ -3238,11 +3273,18 @@ static int cmd_subrate_request(const struct shell *sh, size_t argc, char *argv[]
 #if defined(CONFIG_BT_CENTRAL)
 static int bt_do_connect_le(int *ercd, size_t argc, char *argv[])
 {
+	struct bt_le_conn_param conn_param;
 	int err;
 	bt_addr_le_t addr;
 	struct bt_conn *conn = NULL;
 	uint32_t options = 0;
 
+	if (IS_ENABLED(CONFIG_BT_BAP_UNICAST) || IS_ENABLED(CONFIG_BT_BAP_BROADCAST_ASSISTANT)) {
+		conn_param = *BT_BAP_CONN_PARAM_RELAXED;
+	} else {
+		conn_param = *BT_LE_CONN_PARAM_DEFAULT;
+	}
+
 	*ercd = 0;
 
 	/* When no arguments are specified, connect to the last scanned device. */
@@ -3279,7 +3321,7 @@ static int bt_do_connect_le(int *ercd, size_t argc, char *argv[])
 					BT_GAP_SCAN_FAST_INTERVAL,
 					BT_GAP_SCAN_FAST_INTERVAL);
 
-	err = bt_conn_le_create(&addr, create_params, BT_LE_CONN_PARAM_DEFAULT, &conn);
+	err = bt_conn_le_create(&addr, create_params, &conn_param, &conn);
 	if (err) {
 		*ercd = err;
 		return -ENOEXEC;
@@ -3763,13 +3805,8 @@ static int cmd_clear(const struct shell *sh, size_t argc, char *argv[])
 	}
 
 	if (argc < 3) {
-#if defined(CONFIG_BT_CLASSIC)
-		addr.type = BT_ADDR_LE_PUBLIC;
-		err = bt_addr_from_str(argv[1], &addr.a);
-#else
 		shell_print(sh, "Both address and address type needed");
 		return -ENOEXEC;
-#endif
 	} else {
 		err = bt_addr_le_from_str(argv[1], argv[2], &addr);
 	}
@@ -4106,8 +4143,23 @@ static void auth_pairing_oob_data_request(struct bt_conn *conn,
 static void auth_pairing_complete(struct bt_conn *conn, bool bonded)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
+	struct bt_conn_info info;
 
-	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
+	if (bt_conn_get_info(conn, &info) < 0) {
+		return;
+	}
+
+	switch (info.type) {
+	case BT_CONN_TYPE_LE:
+		bt_addr_le_to_str(info.le.dst, addr, sizeof(addr));
+		break;
+	case BT_CONN_TYPE_BR:
+		bt_addr_to_str(info.br.dst, addr, sizeof(addr));
+		break;
+	default:
+		bt_shell_print("Unrecognized conn type: %d", info.type);
+		return;
+	}
 
 	bt_shell_print("%s with %s", bonded ? "Bonded" : "Paired", addr);
 }
@@ -4115,8 +4167,23 @@ static void auth_pairing_complete(struct bt_conn *conn, bool bonded)
 static void auth_pairing_failed(struct bt_conn *conn, enum bt_security_err err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
+	struct bt_conn_info info;
 
-	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
+	if (bt_conn_get_info(conn, &info) < 0) {
+		return;
+	}
+
+	switch (info.type) {
+	case BT_CONN_TYPE_LE:
+		bt_addr_le_to_str(info.le.dst, addr, sizeof(addr));
+		break;
+	case BT_CONN_TYPE_BR:
+		bt_addr_to_str(info.br.dst, addr, sizeof(addr));
+		break;
+	default:
+		bt_shell_print("Unrecognized conn type: %d", info.type);
+		return;
+	}
 
 	bt_shell_print("Pairing failed with %s reason: %s (%d)", addr, security_err_str(err), err);
 }
@@ -4176,6 +4243,16 @@ void bond_deleted(uint8_t id, const bt_addr_le_t *peer)
 	bt_shell_print("Bond deleted for %s, id %u", addr, id);
 }
 
+#if defined(CONFIG_BT_CLASSIC)
+static void br_bond_deleted(const bt_addr_t *peer)
+{
+	char addr[BT_ADDR_STR_LEN];
+
+	bt_addr_to_str(peer, addr, sizeof(addr));
+	bt_shell_print("Classic bond deleted for %s", addr);
+}
+#endif /* CONFIG_BT_CLASSIC */
+
 static struct bt_conn_auth_cb auth_cb_display = {
 	.passkey_display = auth_passkey_display,
 #if defined(CONFIG_BT_PASSKEY_KEYPRESS)
@@ -4276,6 +4353,9 @@ static struct bt_conn_auth_info_cb auth_info_cb = {
 	.pairing_failed = auth_pairing_failed,
 	.pairing_complete = auth_pairing_complete,
 	.bond_deleted = bond_deleted,
+#if defined(CONFIG_BT_CLASSIC)
+	.br_bond_deleted = br_bond_deleted,
+#endif /* CONFIG_BT_CLASSIC */
 };
 
 static int cmd_auth(const struct shell *sh, size_t argc, char *argv[])
diff --git a/subsys/bluetooth/host/shell/bt.h b/subsys/bluetooth/host/shell/bt.h
index 12332d1b21cc3..ca612d2e95ef6 100644
--- a/subsys/bluetooth/host/shell/bt.h
+++ b/subsys/bluetooth/host/shell/bt.h
@@ -12,8 +12,12 @@
 
 #ifndef __BT_H
 #define __BT_H
+#include <stddef.h>
+#include <stdint.h>
 
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/net_buf.h>
 #include <sys/types.h>
 
 extern struct bt_conn *default_conn;
diff --git a/subsys/bluetooth/host/shell/cs.c b/subsys/bluetooth/host/shell/cs.c
index ee9c417902799..964eff9c65c95 100644
--- a/subsys/bluetooth/host/shell/cs.c
+++ b/subsys/bluetooth/host/shell/cs.c
@@ -9,23 +9,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <zephyr/kernel.h>
-#include <zephyr/shell/shell.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/util.h>
+#include <string.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/bluetooth/cs.h>
-#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_string_conv.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include "host/shell/bt.h"
 #include "common/bt_shell_private.h"
+#include "host/shell/bt.h"
 
 static int check_cs_sync_antenna_selection_input(uint16_t input)
 {
@@ -137,6 +140,7 @@ static int cmd_read_remote_fae_table(const struct shell *sh, size_t argc, char *
 	return 0;
 }
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 static bool process_step_data(struct bt_le_cs_subevent_step *step, void *user_data)
 {
 	bt_shell_print("Subevent results contained step data: ");
@@ -220,7 +224,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.t_fcs_time = 120;
 	params.t_pm_time = 20;
 	params.t_sw_time = 0;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
 	params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 	params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 	params.drbg_nonce = 0x1234;
@@ -254,6 +258,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 
 	return 0;
 }
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 static int cmd_remove_config(const struct shell *sh, size_t argc, char *argv[])
 {
@@ -430,6 +435,7 @@ static int cmd_create_config(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 static int cmd_cs_stop_test(const struct shell *sh, size_t argc, char *argv[])
 {
 	int err = 0;
@@ -442,6 +448,7 @@ static int cmd_cs_stop_test(const struct shell *sh, size_t argc, char *argv[])
 
 	return 0;
 }
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 
 static int cmd_read_local_supported_capabilities(const struct shell *sh, size_t argc, char *argv[])
 {
@@ -638,7 +645,7 @@ static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, cha
 	params.max_procedure_count = 1;
 	params.min_subevent_len = 5000;
 	params.max_subevent_len = 4000000;
-	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
+	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
 	params.phy = 0x01;
 	params.tx_power_delta = 0x80;
 	params.preferred_peer_antenna = 1;
@@ -702,9 +709,11 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		" <CS_SYNC antenna selection: 0x01 - 0x04, 0xFE, 0xFF> <Max TX power: -127 - 20>",
 		cmd_set_default_settings, 5, 0),
 	SHELL_CMD_ARG(read_remote_fae_table, NULL, "<None>", cmd_read_remote_fae_table, 1, 0),
+#if defined(CONFIG_BT_CHANNEL_SOUNDING_TEST)
 	SHELL_CMD_ARG(start_simple_cs_test, NULL, "<Role selection (initiator, reflector): 0, 1>",
 		      cmd_cs_test_simple, 2, 0),
 	SHELL_CMD_ARG(stop_cs_test, NULL, "<None>", cmd_cs_stop_test, 1, 0),
+#endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
 	SHELL_CMD_ARG(
 		create_config, NULL,
 		"<id> <context: local-only, local-remote> <role: initiator, reflector> "
diff --git a/subsys/bluetooth/host/shell/gatt.c b/subsys/bluetooth/host/shell/gatt.c
index 35543a0e285a9..30919f0966b37 100644
--- a/subsys/bluetooth/host/shell/gatt.c
+++ b/subsys/bluetooth/host/shell/gatt.c
@@ -10,24 +10,28 @@
  */
 
 #include <errno.h>
-#include <zephyr/types.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr/shell/shell_string_conv.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/util.h>
-#include <zephyr/kernel.h>
 
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_string_conv.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys/util.h>
+#include <sys/types.h>
 
-#include "host/shell/bt.h"
 #include "common/bt_shell_private.h"
+#include "host/shell/bt.h"
 
 #if defined(CONFIG_BT_GATT_CLIENT) || defined(CONFIG_BT_GATT_DYNAMIC_DB)
 extern uint8_t selected_id;
@@ -740,7 +744,7 @@ static int cmd_show_db(const struct shell *sh, size_t argc, char *argv[])
 	total_len = stats.svc_count * sizeof(struct bt_gatt_service);
 	total_len += stats.chrc_count * sizeof(struct bt_gatt_chrc);
 	total_len += stats.attr_count * sizeof(struct bt_gatt_attr);
-	total_len += stats.ccc_count * sizeof(struct _bt_gatt_ccc);
+	total_len += stats.ccc_count * sizeof(struct bt_gatt_ccc_managed_user_data);
 
 	shell_print(sh, "=================================================");
 	shell_print(sh, "Total: %u services %u attributes (%zu bytes)",
@@ -1013,7 +1017,7 @@ static void notify_cb(struct bt_conn *conn, void *user_data)
 {
 	const struct shell *sh = user_data;
 
-	shell_print(sh, "Nofication sent to conn %p", conn);
+	shell_print(sh, "Notification sent to conn %p", conn);
 }
 static int cmd_notify_mult(const struct shell *sh, size_t argc, char *argv[])
 {
diff --git a/subsys/bluetooth/host/shell/iso.c b/subsys/bluetooth/host/shell/iso.c
index 9113859b71350..cc2adda15cd5b 100644
--- a/subsys/bluetooth/host/shell/iso.c
+++ b/subsys/bluetooth/host/shell/iso.c
@@ -5,23 +5,30 @@
 
 /*
  * Copyright (c) 2020 Intel Corporation
- * Copyright (c) 2021 Nordic Semiconductor ASA
+ * Copyright (c) 2021-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
+#include <errno.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <ctype.h>
-#include <zephyr/kernel.h>
-#include <zephyr/shell/shell.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/util.h>
+#include <string.h>
 
+#include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_string_conv.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "host/shell/bt.h"
 #include "common/bt_shell_private.h"
@@ -85,6 +92,10 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
 	struct bt_iso_info iso_info;
 	int err;
 
@@ -92,12 +103,13 @@ static void iso_connected(struct bt_iso_chan *chan)
 
 	err = bt_iso_chan_get_info(chan, &iso_info);
 	if (err != 0) {
-		printk("Failed to get ISO info: %d", err);
+		bt_shell_error("Failed to get ISO info: %d", err);
 		return;
 	}
 
 #if defined(CONFIG_BT_ISO_TX)
-	if (iso_info.type == BT_ISO_CHAN_TYPE_CONNECTED) {
+	if (iso_info.type == BT_ISO_CHAN_TYPE_CENTRAL ||
+	    iso_info.type == BT_ISO_CHAN_TYPE_PERIPHERAL) {
 		cis_sn_last = 0U;
 		cis_sn_last_updated_ticks = k_uptime_ticks();
 	} else {
@@ -105,12 +117,47 @@ static void iso_connected(struct bt_iso_chan *chan)
 		bis_sn_last_updated_ticks = k_uptime_ticks();
 	}
 #endif /* CONFIG_BT_ISO_TX */
+
+	if (iso_info.can_recv) {
+		err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+		if (err != 0) {
+			bt_shell_error("Failed to setup ISO RX data path: %d", err);
+		}
+	}
+
+	if (iso_info.can_send) {
+		err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+		if (err != 0) {
+			bt_shell_error("Failed to setup ISO TX data path: %d", err);
+		}
+	}
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 {
-	bt_shell_print("ISO Channel %p disconnected with reason 0x%02x",
-		       chan, reason);
+	struct bt_iso_info iso_info;
+	int err;
+
+	bt_shell_print("ISO Channel %p disconnected with reason 0x%02x", chan, reason);
+
+	err = bt_iso_chan_get_info(chan, &iso_info);
+	if (err != 0) {
+		bt_shell_error("Failed to get ISO info: %d", err);
+	} else if (iso_info.type == BT_ISO_CHAN_TYPE_CENTRAL) {
+		if (iso_info.can_recv) {
+			err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST);
+			if (err != 0) {
+				bt_shell_error("Failed to remove ISO RX data path: %d", err);
+			}
+		}
+
+		if (iso_info.can_send) {
+			err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR);
+			if (err != 0) {
+				bt_shell_error("Failed to remove ISO TX data path: %d", err);
+			}
+		}
+	}
 }
 
 static struct bt_iso_chan_ops iso_ops = {
diff --git a/subsys/bluetooth/host/shell/l2cap.c b/subsys/bluetooth/host/shell/l2cap.c
index 07fc465163c8a..e01a1c940e7cf 100644
--- a/subsys/bluetooth/host/shell/l2cap.c
+++ b/subsys/bluetooth/host/shell/l2cap.c
@@ -11,26 +11,30 @@
  */
 
 #include <errno.h>
-#include <zephyr/types.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/kernel.h>
-
-#include <zephyr/settings/settings.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/classic/rfcomm.h>
 #include <zephyr/bluetooth/classic/sdp.h>
-
+#include <zephyr/net_buf.h>
+#include <zephyr/settings/settings.h>
 #include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_string_conv.h>
+#include <zephyr/sys/atomic_types.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys/util.h>
 
-#include "host/shell/bt.h"
 #include "common/bt_shell_private.h"
+#include "host/shell/bt.h"
 
 #define CREDITS			10
 #define DATA_MTU		(23 * CREDITS)
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index 133ca08851e2f..7138d4faac596 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -11,13 +11,19 @@
  */
 
 #include <errno.h>
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/crypto.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/debug/stack.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net_buf.h>
@@ -25,17 +31,18 @@
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
+#include <zephyr/sys/slist.h>
 #include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
 
-
+#include "conn_internal.h"
 #include "common/bt_str.h"
-
 #include "crypto/bt_crypto.h"
-
-#include "hci_core.h"
 #include "ecc.h"
+#include "hci_core.h"
 #include "keys.h"
-#include "conn_internal.h"
 #include "l2cap_internal.h"
 #include "smp.h"
 
@@ -262,6 +269,9 @@ struct bt_smp_br {
 	/* Remote key distribution */
 	uint8_t			remote_dist;
 
+	/* Local keys have been distributed */
+	uint8_t			local_distributed;
+
 	/* Encryption Key Size used for connection */
 	uint8_t 			enc_key_size;
 
@@ -284,7 +294,19 @@ static bool sc_oobd_present;
 static bool legacy_oobd_present;
 static bool sc_supported;
 static const uint8_t *sc_public_key;
-static K_SEM_DEFINE(sc_local_pkey_ready, 0, 1);
+
+static void bt_smp_pkey_ready(const uint8_t *pkey);
+static struct {
+	struct k_mutex lock;
+	struct k_condvar condvar;
+	struct bt_pub_key_cb cb;
+} pub_key_gen = {
+	.lock = Z_MUTEX_INITIALIZER(pub_key_gen.lock),
+	.condvar = Z_CONDVAR_INITIALIZER(pub_key_gen.condvar),
+	.cb = {
+		.func = bt_smp_pkey_ready,
+	},
+};
 
 /* Pointer to internal data is used to mark that callbacks of given SMP channel are not initialized.
  * Value of NULL represents no authentication capabilities and cannot be used for that purpose.
@@ -737,6 +759,47 @@ static void smp_sign_info_sent(struct bt_conn *conn, void *user_data, int err)
 #endif /* CONFIG_BT_SIGNING */
 
 #if defined(CONFIG_BT_CLASSIC)
+static bool ltk_derive_link_key_allowed(struct bt_smp *smp)
+{
+	struct bt_conn *conn;
+	struct bt_keys_link_key *link_key;
+	struct bt_keys *keys;
+
+	if (!smp->chan.chan.conn) {
+		return false;
+	}
+
+	conn = smp->chan.chan.conn;
+	keys = conn->le.keys;
+	if (keys == NULL) {
+		return false;
+	}
+
+	/* Check whether it is has been bonded */
+	link_key = bt_keys_find_link_key(&conn->le.dst.a);
+	if (link_key == NULL) {
+		return true;
+	}
+
+	if (link_key->flags & BT_LINK_KEY_DEBUG) {
+		LOG_DBG("Debug LK can be overwrote");
+		return true;
+	}
+
+	if ((link_key->flags & BT_LINK_KEY_AUTHENTICATED) &&
+	    ((keys->flags & BT_KEYS_AUTHENTICATED) == 0)) {
+		LOG_DBG("Stronger LK (MITM) cannot be overwrote by weaker LTK");
+		return false;
+	}
+
+	if ((link_key->flags & BT_LINK_KEY_SC) && ((keys->flags & BT_KEYS_SC) == 0)) {
+		LOG_DBG("Stronger LK (SC) cannot be overwrote by weaker LTK");
+		return false;
+	}
+
+	return true;
+}
+
 static void sc_derive_link_key(struct bt_smp *smp)
 {
 	/* constants as specified in Core Spec Vol.3 Part H 2.4.2.4 */
@@ -749,6 +812,17 @@ static void sc_derive_link_key(struct bt_smp *smp)
 
 	/* TODO handle errors? */
 
+	if (!ltk_derive_link_key_allowed(smp)) {
+		LOG_DBG("LK cannot be derived by LTK");
+		return;
+	}
+
+	/* Remove the bonding information */
+	link_key = bt_keys_find_link_key(&conn->le.dst.a);
+	if (link_key != NULL) {
+		bt_keys_link_key_clear(link_key);
+	}
+
 	/*
 	 * At this point remote device identity is known so we can use
 	 * destination address here
@@ -783,22 +857,38 @@ static void sc_derive_link_key(struct bt_smp *smp)
 		bt_keys_link_key_clear(link_key);
 	}
 
-	link_key->flags |= BT_LINK_KEY_SC;
+	if (conn->le.keys->flags & BT_KEYS_SC) {
+		link_key->flags |= BT_LINK_KEY_SC;
+	} else {
+		link_key->flags &= ~BT_LINK_KEY_SC;
+	}
 
 	if (conn->le.keys->flags & BT_KEYS_AUTHENTICATED) {
 		link_key->flags |= BT_LINK_KEY_AUTHENTICATED;
 	} else {
 		link_key->flags &= ~BT_LINK_KEY_AUTHENTICATED;
 	}
+
+	if (atomic_test_bit(smp->flags, SMP_FLAG_BOND)) {
+		/* Store the link key */
+		bt_keys_link_key_store(link_key);
+	}
 }
 
 static void smp_br_reset(struct bt_smp_br *smp)
 {
+	bool br_smp_connected;
+
+	br_smp_connected = atomic_test_bit(smp->flags, SMP_FLAG_BR_CONNECTED);
+
 	/* Clear flags first in case canceling of timeout fails. The SMP context
 	 * shall be marked as timed out in that case.
 	 */
 	atomic_set(smp->flags, 0);
 
+	/* Set back the status of the flag SMP_FLAG_BR_CONNECTED. */
+	atomic_set_bit_to(smp->flags, SMP_FLAG_BR_CONNECTED, br_smp_connected);
+
 	/* If canceling fails the timeout handler will set the timeout flag and
 	 * mark the it as timed out. No new pairing procedures shall be started
 	 * on this connection if that happens.
@@ -810,6 +900,29 @@ static void smp_br_reset(struct bt_smp_br *smp)
 	atomic_set_bit(smp->allowed_cmds, BT_SMP_CMD_PAIRING_REQ);
 }
 
+static void smp_br_id_add_replace(struct bt_keys *keys)
+{
+	struct bt_keys *conflict;
+
+	/* Check whether key has been added to resolving list. */
+	if (keys->state & BT_KEYS_ID_ADDED) {
+		bt_id_del(keys);
+	}
+
+	conflict = bt_id_find_conflict(keys);
+	if (conflict != NULL) {
+		int err;
+
+		LOG_DBG("Un-pairing old conflicting bond and finalizing new.");
+
+		err = bt_unpair(conflict->id, &conflict->addr);
+		__ASSERT_NO_MSG(!err);
+	}
+
+	__ASSERT_NO_MSG(!bt_id_find_conflict(keys));
+	bt_id_add(keys);
+}
+
 static void smp_pairing_br_complete(struct bt_smp_br *smp, uint8_t status)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
@@ -840,9 +953,13 @@ static void smp_pairing_br_complete(struct bt_smp_br *smp, uint8_t status)
 			}
 		}
 	} else {
-		bool bond_flag = atomic_test_bit(smp->flags, SMP_FLAG_BOND);
+		bool bond_flag = !atomic_test_bit(conn->flags, BT_CONN_BR_NOBOND);
 		struct bt_conn_auth_info_cb *listener, *next;
 
+		if (keys) {
+			smp_br_id_add_replace(keys);
+		}
+
 		if (bond_flag && keys) {
 			bt_keys_store(keys);
 		}
@@ -922,11 +1039,18 @@ static void bt_smp_br_disconnected(struct bt_l2cap_chan *chan)
 
 static void smp_br_init(struct bt_smp_br *smp)
 {
+	bool br_smp_connected;
+
+	br_smp_connected = atomic_test_bit(smp->flags, SMP_FLAG_BR_CONNECTED);
+
 	/* Initialize SMP context excluding L2CAP channel context and anything
 	 * else declared after.
 	 */
 	(void)memset(smp, 0, offsetof(struct bt_smp_br, chan));
 
+	/* Set back the status of the flag SMP_FLAG_BR_CONNECTED. */
+	atomic_set_bit_to(smp->flags, SMP_FLAG_BR_CONNECTED, br_smp_connected);
+
 	atomic_set_bit(smp->allowed_cmds, BT_SMP_CMD_PAIRING_FAIL);
 }
 
@@ -946,7 +1070,8 @@ static void smp_br_derive_ltk(struct bt_smp_br *smp)
 		return;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_SMP_FORCE_BREDR) && conn->encrypt != 0x02) {
+	if (IS_ENABLED(CONFIG_BT_SMP_FORCE_BREDR) &&
+	    conn->encrypt != BT_HCI_ENCRYPTION_ON_BR_AES_CCM) {
 		LOG_WRN("Using P192 Link Key for P256 LTK derivation");
 	}
 
@@ -957,6 +1082,12 @@ static void smp_br_derive_ltk(struct bt_smp_br *smp)
 	bt_addr_copy(&addr.a, &conn->br.dst);
 	addr.type = BT_ADDR_LE_PUBLIC;
 
+	keys = bt_keys_find_addr(conn->id, &addr);
+	if (keys != NULL) {
+		LOG_DBG("Clear the current keys for %s", bt_addr_le_str(&addr));
+		bt_keys_clear(keys);
+	}
+
 	keys = bt_keys_get_type(BT_KEYS_LTK_P256, conn->id, &addr);
 	if (!keys) {
 		LOG_ERR("Unable to get keys for %s", bt_addr_le_str(&addr));
@@ -999,6 +1130,12 @@ static void smp_br_derive_ltk(struct bt_smp_br *smp)
 		keys->flags &= ~BT_KEYS_AUTHENTICATED;
 	}
 
+	if (conn->encrypt == BT_HCI_ENCRYPTION_ON_BR_AES_CCM) {
+		keys->flags |= BT_KEYS_SC;
+	} else {
+		keys->flags &= ~BT_KEYS_SC;
+	}
+
 	LOG_DBG("LTK derived from LinkKey");
 }
 
@@ -1054,12 +1191,13 @@ static void smp_br_distribute_keys(struct bt_smp_br *smp)
 	}
 
 #if defined(CONFIG_BT_PRIVACY)
-	if (smp->local_dist & BT_SMP_DIST_ID_KEY) {
+	if ((smp->local_dist & BT_SMP_DIST_ID_KEY) &&
+	    ((smp->local_distributed & BT_SMP_DIST_ID_KEY) == 0)) {
 		struct bt_smp_ident_info *id_info;
 		struct bt_smp_ident_addr_info *id_addr_info;
 		struct net_buf *buf;
 
-		smp->local_dist &= ~BT_SMP_DIST_ID_KEY;
+		smp->local_distributed |= BT_SMP_DIST_ID_KEY;
 
 		buf = smp_br_create_pdu(smp, BT_SMP_CMD_IDENT_INFO,
 					sizeof(*id_info));
@@ -1088,11 +1226,12 @@ static void smp_br_distribute_keys(struct bt_smp_br *smp)
 #endif /* CONFIG_BT_PRIVACY */
 
 #if defined(CONFIG_BT_SIGNING)
-	if (smp->local_dist & BT_SMP_DIST_SIGN) {
+	if ((smp->local_dist & BT_SMP_DIST_SIGN) &&
+	    ((smp->local_distributed & BT_SMP_DIST_SIGN) == 0)) {
 		struct bt_smp_signing_info *info;
 		struct net_buf *buf;
 
-		smp->local_dist &= ~BT_SMP_DIST_SIGN;
+		smp->local_distributed |= BT_SMP_DIST_SIGN;
 
 		buf = smp_br_create_pdu(smp, BT_SMP_CMD_SIGNING_INFO,
 					sizeof(*info));
@@ -1121,12 +1260,42 @@ static void smp_br_distribute_keys(struct bt_smp_br *smp)
 
 static bool smp_br_pairing_allowed(struct bt_smp_br *smp)
 {
-	if (smp->chan.chan.conn->encrypt == 0x02) {
+	bt_addr_le_t addr;
+	struct bt_conn *conn;
+	struct bt_keys_link_key *key;
+	bool le_bonded;
+
+	if (!smp->chan.chan.conn) {
+		return false;
+	}
+
+	conn = smp->chan.chan.conn;
+
+	addr.type = BT_ADDR_LE_PUBLIC;
+	bt_addr_copy(&addr.a, &conn->br.dst);
+	le_bonded = bt_le_bond_exists(BT_ID_DEFAULT, &addr);
+
+	key = bt_keys_find_link_key(&conn->br.dst);
+	if (!key) {
+		return false;
+	}
+
+	/**
+	 * Core v6.0, Vol 3, Part C, 14.1 Cross-transport key derivation
+	 *
+	 * If an LE LTK already exists and the BR/EDR link key is weaker in either strength
+	 * or MITM protection, then neither device shall generate an LE LTK using cross-transport
+	 * key derivation from a BR/EDR link key.
+	 */
+	if (le_bonded && !(key->flags & BT_LINK_KEY_AUTHENTICATED)) {
+		return false;
+	}
+
+	if (conn->encrypt == BT_HCI_ENCRYPTION_ON_BR_AES_CCM) {
 		return true;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_SMP_FORCE_BREDR) &&
-	    smp->chan.chan.conn->encrypt == 0x01) {
+	if (IS_ENABLED(CONFIG_BT_SMP_FORCE_BREDR) && conn->encrypt == BT_HCI_ENCRYPTION_ON_BR_E0) {
 		LOG_WRN("Allowing BR/EDR SMP with P-192 key");
 		return true;
 	}
@@ -4228,7 +4397,7 @@ static uint8_t smp_public_key_periph(struct bt_smp *smp)
 
 	if (!atomic_test_bit(smp->flags, SMP_FLAG_SC_DEBUG_KEY) &&
 	    memcmp(smp->pkey, sc_public_key, BT_PUB_KEY_COORD_LEN) == 0) {
-		/* Deny public key with identitcal X coordinate unless it is the
+		/* Deny public key with identical X coordinate unless it is the
 		 * debug public key.
 		 */
 		LOG_WRN("Remote public key rejected");
@@ -4314,7 +4483,7 @@ static uint8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf)
 	    smp->chan.chan.conn->role == BT_HCI_ROLE_CENTRAL) {
 		if (!atomic_test_bit(smp->flags, SMP_FLAG_SC_DEBUG_KEY) &&
 		    memcmp(smp->pkey, sc_public_key, BT_PUB_KEY_COORD_LEN) == 0) {
-			/* Deny public key with identitcal X coordinate unless
+			/* Deny public key with identical X coordinate unless
 			 * it is the debug public key.
 			 */
 			LOG_WRN("Remote public key rejected");
@@ -4627,6 +4796,21 @@ static int bt_smp_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	return 0;
 }
 
+static void pub_key_ready_notify(void)
+{
+	int err;
+
+	ARG_UNUSED(err);
+
+	err = k_mutex_lock(&pub_key_gen.lock, K_FOREVER);
+	__ASSERT_NO_MSG(err == 0);
+
+	(void)k_condvar_broadcast(&pub_key_gen.condvar);
+
+	err = k_mutex_unlock(&pub_key_gen.lock);
+	__ASSERT_NO_MSG(err == 0);
+}
+
 static void bt_smp_pkey_ready(const uint8_t *pkey)
 {
 	int i;
@@ -4635,13 +4819,13 @@ static void bt_smp_pkey_ready(const uint8_t *pkey)
 
 	sc_public_key = pkey;
 
+	pub_key_ready_notify();
+
 	if (!pkey) {
 		LOG_WRN("Public key not available");
 		return;
 	}
 
-	k_sem_give(&sc_local_pkey_ready);
-
 	for (i = 0; i < ARRAY_SIZE(bt_smp_pool); i++) {
 		struct bt_smp *smp = &bt_smp_pool[i];
 		uint8_t err;
@@ -5668,10 +5852,42 @@ int bt_smp_le_oob_generate_sc_data(struct bt_le_oob_sc_data *le_sc_oob)
 	}
 
 	if (!sc_public_key) {
-		err = k_sem_take(&sc_local_pkey_ready, K_FOREVER);
+		/* Public key request has not been finished yet, or finished, but generation failed.
+		 * Retrying.
+		 */
+		err = k_mutex_lock(&pub_key_gen.lock, K_FOREVER);
+		__ASSERT_NO_MSG(err == 0);
+
+		err = bt_pub_key_gen(&pub_key_gen.cb);
+		if (err && err != -EALREADY) {
+			LOG_WRN("Public key re-generation request failed (%d)", err);
+
+			int mutex_err;
+
+			mutex_err = k_mutex_unlock(&pub_key_gen.lock);
+			__ASSERT_NO_MSG(mutex_err == 0);
+
+			return err;
+		}
+
+		/* 30 seconds is an arbitrary number. Increase if fails earlier on certain
+		 * platforms.
+		 */
+		err = k_condvar_wait(&pub_key_gen.condvar,
+				     &pub_key_gen.lock,
+				     K_SECONDS(30));
 		if (err) {
+			LOG_WRN("Public key generation timeout");
 			return err;
 		}
+
+		err = k_mutex_unlock(&pub_key_gen.lock);
+		__ASSERT_NO_MSG(err == 0);
+
+		/* Public key has been re-requested but generation failed. */
+		if (!sc_public_key) {
+			return -EAGAIN;
+		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_OOB_DATA_FIXED)) {
@@ -6082,10 +6298,6 @@ BT_L2CAP_BR_CHANNEL_DEFINE(smp_br_fixed_chan, BT_L2CAP_CID_BR_SMP,
 
 int bt_smp_init(void)
 {
-	static struct bt_pub_key_cb pub_key_cb = {
-		.func           = bt_smp_pkey_ready,
-	};
-
 	sc_supported = le_sc_supported();
 	if (IS_ENABLED(CONFIG_BT_SMP_SC_PAIR_ONLY) && !sc_supported) {
 		LOG_ERR("SC Pair Only Mode selected but LE SC not supported");
@@ -6100,7 +6312,7 @@ int bt_smp_init(void)
 	LOG_DBG("LE SC %s", sc_supported ? "enabled" : "disabled");
 
 	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
-		bt_pub_key_gen(&pub_key_cb);
+		bt_pub_key_gen(&pub_key_gen.cb);
 	}
 
 	return smp_self_test();
diff --git a/subsys/bluetooth/host/smp.h b/subsys/bluetooth/host/smp.h
index 51969aaadfb0e..9bc7e29ff859b 100644
--- a/subsys/bluetooth/host/smp.h
+++ b/subsys/bluetooth/host/smp.h
@@ -9,6 +9,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/toolchain.h>
+
 struct bt_smp_hdr {
 	uint8_t  code;
 } __packed;
diff --git a/subsys/bluetooth/host/smp_null.c b/subsys/bluetooth/host/smp_null.c
index 77774e999347c..0ff20b4a16d64 100644
--- a/subsys/bluetooth/host/smp_null.c
+++ b/subsys/bluetooth/host/smp_null.c
@@ -9,22 +9,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
 #include <errno.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/util.h>
+#include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
-#include "hci_core.h"
 #include "conn_internal.h"
+#include "hci_core.h"
 #include "l2cap_internal.h"
 #include "smp.h"
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_smp);
 
 static struct bt_l2cap_le_chan bt_smp_pool[CONFIG_BT_MAX_CONN];
diff --git a/subsys/bluetooth/host/uuid.c b/subsys/bluetooth/host/uuid.c
index 9995487db59b8..2d48f2a2a9f68 100644
--- a/subsys/bluetooth/host/uuid.c
+++ b/subsys/bluetooth/host/uuid.c
@@ -6,12 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <string.h>
 #include <errno.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/sys/printk.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 
 #include <zephyr/bluetooth/uuid.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
 #define UUID_16_BASE_OFFSET 12
 
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 49cc16fa7b60d..b876e88dae69f 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -126,10 +126,12 @@ config BT_MESH_WORKQ_SYS
 	  refer to BT_MESH_ADV_STACK_SIZE for the recommended minimum.
 
 	  When this option is enabled and the mesh tries to send a message,
-	  and the host ran out the HCI command buffers controlled by
-	  CONFIG_BT_BUF_CMD_TX_COUNT, the host returns -ENOBUFS immediately
-	  and the mesh drops the message transmission. To mitigate this
-	  issue, make sure to have sufficient number of HCI command buffers.
+	  and the host ran out of the HCI command buffers controlled by
+	  CONFIG_BT_BUF_CMD_TX_COUNT, the system work queue will be blocked
+	  until an HCI command buffer has been freed. This may cause a deadlock
+	  where the host cannot use the system workqueue to free the buffer
+	  that the mesh is waiting for. To mitigate this issue, make sure to
+	  have a sufficient number of HCI command buffers.
 	  When this option is enabled, the latency of sending mesh messages
 	  will be affected by other users on the system work queue, resulting in
 	  reduced reliability for sending mesh messages.
@@ -1531,22 +1533,6 @@ config BT_MESH_USES_TFM_PSA
 
 endchoice
 
-if BT_MESH_USES_MBEDTLS_PSA || BT_MESH_USES_TFM_PSA
-
-config BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET
-	int "Offset of Bluetooth Mesh key id range regarding PSA_KEY_ID_USER_MIN"
-	default 0
-	help
-	  The PSA specification mandates to set key identifiers for keys
-	  with persistent lifetime. The users of the PSA API is responsible
-	  (Bluetooth Mesh is user of PSA API) to provide correct and unique identifiers.
-	  The Bluetooth Mesh identifier range should be between PSA_KEY_ID_USER_MIN and
-	  PSA_KEY_ID_USER_MAX. Bluetooth Mesh requires two ids for each subnetwork, two ids
-	  for each application key, and two ids for the device key and device key candidate.
-	  It should consider the Mesh Configuration Database instances if database enabled.
-
-endif # BT_MESH_USES_MBEDTLS_PSA || BT_MESH_USES_TFM_PSA
-
 menu "Beacons"
 
 config BT_MESH_BEACON_ENABLED
diff --git a/subsys/bluetooth/mesh/access.c b/subsys/bluetooth/mesh/access.c
index 2f3b93ef4412e..1dfbf92431609 100644
--- a/subsys/bluetooth/mesh/access.c
+++ b/subsys/bluetooth/mesh/access.c
@@ -1830,8 +1830,8 @@ int bt_mesh_model_correspond(const struct bt_mesh_model *corresponding_mod,
 
 	MOD_REL_LIST_FOR_EACH(i) {
 		if (mod_rel_list[i].type < RELATION_TYPE_EXT &&
-		    mod_rel_list[i].type > cor_id) {
-			cor_id = mod_rel_list[i].type;
+		    mod_rel_list[i].type >= cor_id) {
+			cor_id = mod_rel_list[i].type + 1;
 		}
 
 		if ((IS_MOD_BASE(base_mod, i, base_offset) ||
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index d92749acac87a..7641ba33224a8 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -317,12 +317,17 @@ static void start_proxy_sol_or_proxy_adv(struct bt_mesh_ext_adv *ext_adv)
 		}
 	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER) &&
-	    !atomic_test_and_set_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
-		if (bt_mesh_adv_gatt_send()) {
-			atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY);
+	if (IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER)) {
+		if (stop_proxy_adv(ext_adv)) {
 			return;
 		}
+
+		if (!atomic_test_and_set_bit(ext_adv->flags, ADV_FLAG_PROXY)) {
+			if (bt_mesh_adv_gatt_send()) {
+				atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY);
+				return;
+			}
+		}
 	}
 }
 
diff --git a/subsys/bluetooth/mesh/blob_cli.c b/subsys/bluetooth/mesh/blob_cli.c
index 40d3d37a6c002..f5aae195476fd 100644
--- a/subsys/bluetooth/mesh/blob_cli.c
+++ b/subsys/bluetooth/mesh/blob_cli.c
@@ -1086,7 +1086,7 @@ static void progress_checked(struct bt_mesh_blob_cli *cli)
 
 	cli->state = BT_MESH_BLOB_CLI_STATE_NONE;
 
-	if (cli->cb && cli->cb->end) {
+	if (cli->cb && cli->cb->xfer_progress_complete) {
 		cli->cb->xfer_progress_complete(cli);
 	}
 }
diff --git a/subsys/bluetooth/mesh/cfg_srv.c b/subsys/bluetooth/mesh/cfg_srv.c
index 5ffb4c303c8b9..48ac63760c227 100644
--- a/subsys/bluetooth/mesh/cfg_srv.c
+++ b/subsys/bluetooth/mesh/cfg_srv.c
@@ -1429,6 +1429,7 @@ static int mod_sub_va_add(const struct bt_mesh_model *model,
 		/* Tried to add existing subscription */
 		status = STATUS_SUCCESS;
 		(void)bt_mesh_va_del(va->uuid);
+		sub_addr = va->addr;
 		goto send_status;
 	}
 
diff --git a/subsys/bluetooth/mesh/crypto_psa.c b/subsys/bluetooth/mesh/crypto_psa.c
index 7267f064bc8e4..8d95ed912ec19 100644
--- a/subsys/bluetooth/mesh/crypto_psa.c
+++ b/subsys/bluetooth/mesh/crypto_psa.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 
 #include <zephyr/bluetooth/mesh.h>
+#include <zephyr/psa/key_ids.h>
 #include <zephyr/sys/check.h>
 
 #define LOG_LEVEL CONFIG_BT_MESH_CRYPTO_LOG_LEVEL
@@ -26,13 +27,13 @@ LOG_MODULE_REGISTER(bt_mesh_crypto_psa);
 #else
 #define BT_MESH_CDB_KEY_ID_RANGE_SIZE  0
 #endif
-#define BT_MESH_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
-		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 2 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
-#define BT_MESH_PSA_KEY_ID_USER_MIN (PSA_KEY_ID_USER_MIN + \
-		CONFIG_BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET)
 
-BUILD_ASSERT(BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE <= PSA_KEY_ID_USER_MAX,
-	     "Bluetooth Mesh PSA key id range overlaps maximum allowed boundary.");
+#define BT_MESH_PSA_KEY_ID_MIN ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_BEGIN
+
+#define BT_MESH_PSA_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
+		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 2 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
+BUILD_ASSERT(BT_MESH_PSA_KEY_ID_RANGE_SIZE <= ZEPHYR_PSA_BT_MESH_KEY_ID_RANGE_SIZE,
+	"PSA key ID range exceeds officially allocated range.");
 
 BUILD_ASSERT(PSA_MAC_LENGTH(PSA_KEY_TYPE_AES, 128, PSA_ALG_CMAC) == 16,
 	"MAC length should be 16 bytes for 128-bits key for CMAC-AES");
@@ -46,7 +47,7 @@ static struct {
 	uint8_t public_key_be[PUB_KEY_SIZE + 1];
 } dh_pair;
 
-static ATOMIC_DEFINE(pst_keys, BT_MESH_KEY_ID_RANGE_SIZE);
+static ATOMIC_DEFINE(pst_keys, BT_MESH_PSA_KEY_ID_RANGE_SIZE);
 
 int bt_mesh_crypto_init(void)
 {
@@ -352,34 +353,34 @@ int bt_mesh_dhkey_gen(const uint8_t *pub_key, const uint8_t *priv_key, uint8_t *
 	return err;
 }
 
-__weak psa_key_id_t bt_mesh_user_keyid_alloc(void)
+static psa_key_id_t keyid_alloc(void)
 {
-	for (int i = 0; i < BT_MESH_KEY_ID_RANGE_SIZE; i++) {
+	for (int i = 0; i < BT_MESH_PSA_KEY_ID_RANGE_SIZE; i++) {
 		if (!atomic_test_bit(pst_keys, i)) {
 			atomic_set_bit(pst_keys, i);
-			return BT_MESH_PSA_KEY_ID_USER_MIN + i;
+			return BT_MESH_PSA_KEY_ID_MIN + i;
 		}
 	}
 
 	return PSA_KEY_ID_NULL;
 }
 
-__weak int bt_mesh_user_keyid_free(psa_key_id_t key_id)
+static int keyid_free(psa_key_id_t key_id)
 {
-	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_USER_MIN,
-			BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_clear_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_USER_MIN);
+	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
+			BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
+		atomic_clear_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_MIN);
 		return 0;
 	}
 
 	return -EIO;
 }
 
-__weak void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
+static void keyid_assign(psa_key_id_t key_id)
 {
-	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_USER_MIN,
-				BT_MESH_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_set_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_USER_MIN);
+	if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
+				BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
+		atomic_set_bit(pst_keys, key_id - BT_MESH_PSA_KEY_ID_MIN);
 	}
 }
 
@@ -411,7 +412,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 		break;
 	case BT_MESH_KEY_TYPE_NET:
 		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			key_id = bt_mesh_user_keyid_alloc();
+			key_id = keyid_alloc();
 
 			if (key_id == PSA_KEY_ID_NULL) {
 				return -ENOMEM;
@@ -427,7 +428,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 	case BT_MESH_KEY_TYPE_APP:
 	case BT_MESH_KEY_TYPE_DEV:
 		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			key_id = bt_mesh_user_keyid_alloc();
+			key_id = keyid_alloc();
 
 			if (key_id == PSA_KEY_ID_NULL) {
 				return -ENOMEM;
@@ -455,7 +456,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
 		status == PSA_ERROR_ALREADY_EXISTS ? -EALREADY : -EIO;
 
 	if (err && key_id != PSA_KEY_ID_NULL) {
-		bt_mesh_user_keyid_free(key_id);
+		keyid_free(key_id);
 	}
 
 	psa_reset_key_attributes(&key_attributes);
@@ -482,7 +483,7 @@ void bt_mesh_key_assign(struct bt_mesh_key *dst, const struct bt_mesh_key *src)
 {
 	memcpy(dst, src, sizeof(struct bt_mesh_key));
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		bt_mesh_user_keyid_assign(dst->key);
+		keyid_assign(dst->key);
 	}
 }
 
@@ -493,7 +494,7 @@ int bt_mesh_key_destroy(const struct bt_mesh_key *key)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		return bt_mesh_user_keyid_free(key->key);
+		return keyid_free(key->key);
 	}
 
 	return 0;
diff --git a/subsys/bluetooth/mesh/main.c b/subsys/bluetooth/mesh/main.c
index c9b6a283c08e4..16e66532058d0 100644
--- a/subsys/bluetooth/mesh/main.c
+++ b/subsys/bluetooth/mesh/main.c
@@ -62,7 +62,7 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 	LOG_INF("Primary Element: 0x%04x", addr);
 	LOG_DBG("net_idx 0x%04x flags 0x%02x iv_index 0x%04x", net_idx, flags, iv_index);
 
-	if (atomic_test_and_set_bit(bt_mesh.flags, BT_MESH_VALID)) {
+	if (atomic_test_bit(bt_mesh.flags, BT_MESH_VALID)) {
 		return -EALREADY;
 	}
 
@@ -74,14 +74,12 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 		comp = bt_mesh_comp_get();
 		if (comp == NULL) {
 			LOG_ERR("Failed to get node composition");
-			atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
 			return -EINVAL;
 		}
 
 		subnet = bt_mesh_cdb_subnet_get(net_idx);
 		if (!subnet) {
 			LOG_ERR("No subnet with idx %d", net_idx);
-			atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
 			return -ENOENT;
 		}
 
@@ -90,7 +88,6 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 					      comp->elem_count, net_idx);
 		if (node == NULL) {
 			LOG_ERR("Failed to allocate database node");
-			atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
 			return -ENOMEM;
 		}
 
@@ -108,9 +105,8 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 						    net_key);
 		if (err) {
 			LOG_ERR("Failed to import cdb network key");
-			goto end;
+			goto error_exit;
 		}
-		bt_mesh_cdb_subnet_store(subnet);
 
 		addr = node->addr;
 		bt_mesh_cdb_iv_update(iv_index, BT_MESH_IV_UPDATE(flags));
@@ -118,32 +114,34 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 		err = bt_mesh_cdb_node_key_import(node, dev_key);
 		if (err) {
 			LOG_ERR("Failed to import cdb device key");
-			goto end;
-		}
-
-		if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-			bt_mesh_cdb_node_store(node);
+			goto error_exit;
 		}
 	}
 
 	err = bt_mesh_key_import(BT_MESH_KEY_TYPE_DEV, dev_key, &mesh_dev_key);
 	if (err) {
 		LOG_ERR("Failed to import device key");
-		goto end;
+		goto error_exit;
 	}
 	is_dev_key_valid = true;
 
 	err = bt_mesh_key_import(BT_MESH_KEY_TYPE_NET, net_key, &mesh_net_key);
 	if (err) {
 		LOG_ERR("Failed to import network key");
-		goto end;
+		goto error_exit;
 	}
 	is_net_key_valid = true;
 
 	err = bt_mesh_net_create(net_idx, flags, &mesh_net_key, iv_index);
 	if (err) {
-		atomic_clear_bit(bt_mesh.flags, BT_MESH_VALID);
-		goto end;
+		LOG_ERR("Failed to create network");
+		goto error_exit;
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_CDB) &&
+	    atomic_test_bit(bt_mesh_cdb.flags, BT_MESH_CDB_VALID)) {
+		bt_mesh_cdb_subnet_store(subnet);
+		bt_mesh_cdb_node_store(node);
 	}
 
 	bt_mesh_net_settings_commit();
@@ -163,18 +161,21 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
 		bt_mesh_net_store();
 	}
 
+	atomic_set_bit(bt_mesh.flags, BT_MESH_VALID);
 	bt_mesh_start();
 
-end:
-	if (err && node != NULL && IS_ENABLED(CONFIG_BT_MESH_CDB)) {
-		bt_mesh_cdb_node_del(node, true);
+	return 0;
+
+error_exit:
+	if (node != NULL && IS_ENABLED(CONFIG_BT_MESH_CDB)) {
+		bt_mesh_cdb_node_del(node, false);
 	}
 
-	if (err && is_dev_key_valid) {
+	if (is_dev_key_valid) {
 		bt_mesh_key_destroy(&mesh_dev_key);
 	}
 
-	if (err && is_net_key_valid) {
+	if (is_net_key_valid) {
 		bt_mesh_key_destroy(&mesh_net_key);
 	}
 
@@ -236,6 +237,8 @@ void bt_mesh_dev_key_cand_remove(void)
 	}
 
 	LOG_DBG("");
+	bt_mesh_key_destroy(&bt_mesh.dev_key_cand);
+	memset(&bt_mesh.dev_key_cand, 0, sizeof(struct bt_mesh_key));
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
 		bt_mesh_net_dev_key_cand_store();
@@ -397,6 +400,10 @@ void bt_mesh_reset(void)
 	bt_mesh_key_destroy(&bt_mesh.dev_key);
 	memset(&bt_mesh.dev_key, 0, sizeof(bt_mesh.dev_key));
 
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV)) {
+		bt_mesh_dev_key_cand_remove();
+	}
+
 	bt_mesh_beacon_disable();
 
 	bt_mesh_comp_unprovision();
diff --git a/subsys/bluetooth/mesh/pb_adv.c b/subsys/bluetooth/mesh/pb_adv.c
index 86f20497704f3..c6b3f77816548 100644
--- a/subsys/bluetooth/mesh/pb_adv.c
+++ b/subsys/bluetooth/mesh/pb_adv.c
@@ -482,14 +482,16 @@ static void gen_prov_cont(struct prov_rx *rx, struct net_buf_simple *buf)
 {
 	uint8_t seg = CONT_SEG_INDEX(rx->gpc);
 
-	if (link.tx.adv[0]) {
-		LOG_DBG("Ongoing tx transaction has not been completed yet");
-		return;
-	}
-
 	LOG_DBG("len %u, seg_index %u", buf->len, seg);
 
+	/* When link.rx.seg is zero for a valid link.rx.id, this means that transaction
+	 * has already been received. The other device probably missed the Transaction
+	 * Acknowledgment PDU, so we need to resend it regardless of the active transmission.
+	 */
 	if (!link.rx.seg && link.rx.id == rx->xact_id) {
+		/* Send ack if another ack is NOT pending for transmission. Otherwise, skip sending
+		 * this ack for now.
+		 */
 		if (!ack_pending()) {
 			LOG_DBG("Resending ack");
 			gen_prov_ack_send(rx->xact_id);
@@ -498,6 +500,11 @@ static void gen_prov_cont(struct prov_rx *rx, struct net_buf_simple *buf)
 		return;
 	}
 
+	if (link.tx.adv[0]) {
+		LOG_DBG("Ongoing tx transaction has not been completed yet");
+		return;
+	}
+
 	if (!link.rx.seg &&
 	    next_transaction_id(link.rx.id) == rx->xact_id) {
 		LOG_DBG("Start segment lost");
@@ -575,21 +582,28 @@ static void gen_prov_start(struct prov_rx *rx, struct net_buf_simple *buf)
 {
 	uint8_t seg = SEG_NVAL;
 
+	/* When link.rx.seg is zero for a valid link.rx.id, this means that transaction
+	 * has already been received. The other device probably missed the Transaction
+	 * Acknowledgment PDU, so we need to resend it regardless of the active transmission.
+	 */
+	if (rx->xact_id == link.rx.id && !link.rx.seg) {
+		/* Send ack if another ack is NOT pending for transmission. Otherwise, skip sending
+		 * this ack for now.
+		 */
+		if (!ack_pending()) {
+			LOG_DBG("Resending ack");
+			gen_prov_ack_send(rx->xact_id);
+		}
+
+		return;
+	}
+
 	if (link.tx.adv[0]) {
 		LOG_DBG("Ongoing tx transaction has not been completed yet");
 		return;
 	}
 
 	if (rx->xact_id == link.rx.id) {
-		if (!link.rx.seg) {
-			if (!ack_pending()) {
-				LOG_DBG("Resending ack");
-				gen_prov_ack_send(rx->xact_id);
-			}
-
-			return;
-		}
-
 		if (!(link.rx.seg & BIT(0))) {
 			LOG_DBG("Ignoring duplicate segment");
 			return;
@@ -1057,6 +1071,12 @@ static int prov_link_accept(const struct prov_bearer_cb *cb, void *cb_data)
 	return 0;
 }
 
+static void prov_link_cancel(void)
+{
+	bt_mesh_beacon_disable();
+	bt_mesh_scan_disable();
+}
+
 static void prov_link_close(enum prov_bearer_link_status status)
 {
 	int err;
@@ -1095,6 +1115,7 @@ const struct prov_bearer bt_mesh_pb_adv = {
 	.type = BT_MESH_PROV_ADV,
 	.link_open = prov_link_open,
 	.link_accept = prov_link_accept,
+	.link_cancel = prov_link_cancel,
 	.link_close = prov_link_close,
 	.send = prov_send_adv,
 	.clear_tx = prov_clear_tx,
diff --git a/subsys/bluetooth/mesh/pb_gatt.c b/subsys/bluetooth/mesh/pb_gatt.c
index 849914f4b5f2d..44b77f53f3e70 100644
--- a/subsys/bluetooth/mesh/pb_gatt.c
+++ b/subsys/bluetooth/mesh/pb_gatt.c
@@ -198,6 +198,11 @@ static int link_accept(const struct prov_bearer_cb *cb, void *cb_data)
 
 	return 0;
 }
+
+static void link_cancel(void)
+{
+	(void)bt_mesh_pb_gatt_srv_disable();
+}
 #endif
 
 static void buf_send_end(struct bt_conn *conn, void *user_data)
@@ -246,6 +251,7 @@ const struct prov_bearer bt_mesh_pb_gatt = {
 #endif
 #if defined(CONFIG_BT_MESH_PB_GATT)
 	.link_accept = link_accept,
+	.link_cancel = link_cancel,
 #endif
 	.send = buf_send,
 	.clear_tx = clear_tx,
diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.c b/subsys/bluetooth/mesh/pb_gatt_srv.c
index 67ba1c634080a..1b48c910932d6 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.c
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.c
@@ -149,8 +149,8 @@ static ssize_t prov_ccc_write(struct bt_conn *conn,
 }
 
 /* Mesh Provisioning Service Declaration */
-static struct _bt_gatt_ccc prov_ccc =
-	BT_GATT_CCC_INITIALIZER(prov_ccc_changed, prov_ccc_write, NULL);
+static struct bt_gatt_ccc_managed_user_data prov_ccc =
+	BT_GATT_CCC_MANAGED_USER_DATA_INIT(prov_ccc_changed, prov_ccc_write, NULL);
 
 static struct bt_gatt_attr prov_attrs[] = {
 	BT_GATT_PRIMARY_SERVICE(BT_UUID_MESH_PROV),
diff --git a/subsys/bluetooth/mesh/prov_bearer.h b/subsys/bluetooth/mesh/prov_bearer.h
index 45885226dcd50..fd6aa89e34e21 100644
--- a/subsys/bluetooth/mesh/prov_bearer.h
+++ b/subsys/bluetooth/mesh/prov_bearer.h
@@ -76,6 +76,12 @@ struct prov_bearer {
 	 */
 	int (*link_accept)(const struct prov_bearer_cb *cb, void *cb_data);
 
+	/** @brief Disable link establishment as a provisionee.
+	 *
+	 *  Stops accepting link open messages and sending unprovisioned beacons.
+	 */
+	void (*link_cancel)(void);
+
 	/** @brief Send a packet on an established link.
 	 *
 	 *  @param buf     Payload buffer. Requires @ref
diff --git a/subsys/bluetooth/mesh/provisionee.c b/subsys/bluetooth/mesh/provisionee.c
index 76581727455a2..59cc20fbd5a52 100644
--- a/subsys/bluetooth/mesh/provisionee.c
+++ b/subsys/bluetooth/mesh/provisionee.c
@@ -468,12 +468,24 @@ static void prov_confirm(const uint8_t *data)
 	send_confirm();
 }
 
-static inline bool is_pb_gatt(void)
+static bool is_pb_gatt(void)
 {
 	return bt_mesh_prov_link.bearer &&
 	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_GATT;
 }
 
+static bool is_pb_adv(void)
+{
+	return bt_mesh_prov_link.bearer &&
+	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_ADV;
+}
+
+static bool is_pb_remote(void)
+{
+	return bt_mesh_prov_link.bearer &&
+	       bt_mesh_prov_link.bearer->type == BT_MESH_PROV_REMOTE;
+}
+
 static bool refresh_is_valid(const uint8_t *netkey, uint16_t net_idx,
 			     uint32_t iv_index)
 {
@@ -641,6 +653,8 @@ static void local_input_complete(void)
 	}
 }
 
+static bt_mesh_prov_bearer_t active_bearers;
+
 static void prov_link_closed(enum prov_bearer_link_status status)
 {
 	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) &&
@@ -657,6 +671,28 @@ static void prov_link_closed(enum prov_bearer_link_status status)
 	}
 
 	bt_mesh_prov_reset_state();
+
+	/* Restore provisioning bearers stopped in prov_link_opened. If the device was provisioned,
+	 * only re-enable the PB-Remote bearer.
+	 */
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && !is_pb_remote() &&
+	    (active_bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
+
+	if (bt_mesh_is_provisioned()) {
+		return;
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && !is_pb_gatt() &&
+	    (active_bearers & BT_MESH_PROV_GATT)) {
+		bt_mesh_pb_gatt.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) && !is_pb_adv() &&
+	    (active_bearers & BT_MESH_PROV_ADV)) {
+		bt_mesh_pb_adv.link_accept(bt_mesh_prov_bearer_cb_get(), NULL);
+	}
 }
 
 static void prov_link_opened(void)
@@ -665,6 +701,22 @@ static void prov_link_opened(void)
 	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && bt_mesh_is_provisioned()) {
 		atomic_set_bit(bt_mesh_prov_link.flags, REPROVISION);
 	}
+
+	/* Stop other provisioning bearers for the duration of the prov link. */
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && is_pb_adv() &&
+	    (active_bearers & BT_MESH_PROV_GATT)) {
+		bt_mesh_pb_gatt.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) && is_pb_gatt() &&
+	    (active_bearers & BT_MESH_PROV_ADV)) {
+		bt_mesh_pb_adv.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) && !is_pb_remote() &&
+	    (active_bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_cancel();
+	}
 }
 
 static const struct bt_mesh_prov_role role_device = {
@@ -717,6 +769,7 @@ int bt_mesh_prov_enable(bt_mesh_prov_bearer_t bearers)
 
 role_init:
 	bt_mesh_prov_link.role = &role_device;
+	active_bearers |= bearers;
 
 	return 0;
 }
@@ -733,14 +786,20 @@ int bt_mesh_prov_disable(bt_mesh_prov_bearer_t bearers)
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) &&
 	    (bearers & BT_MESH_PROV_ADV)) {
-		bt_mesh_beacon_disable();
-		bt_mesh_scan_disable();
+		bt_mesh_pb_adv.link_cancel();
 	}
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) &&
 	    (bearers & BT_MESH_PROV_GATT)) {
-		(void)bt_mesh_pb_gatt_srv_disable();
+		bt_mesh_pb_gatt.link_cancel();
+	}
+
+	if (IS_ENABLED(CONFIG_BT_MESH_RPR_SRV) &&
+	    (bearers & BT_MESH_PROV_REMOTE)) {
+		pb_remote_srv.link_cancel();
 	}
 
+	active_bearers &= ~bearers;
+
 	return 0;
 }
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index 8863a5ce52f96..5f40fe0e7d390 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -897,10 +897,13 @@ static void subnet_evt(struct bt_mesh_subnet *sub, enum bt_mesh_key_evt evt)
 		if (sub == beacon_sub) {
 			beacon_sub = NULL;
 		}
+
+		bt_mesh_proxy_identity_stop(sub);
 	} else {
 		bt_mesh_proxy_beacon_send(sub);
-		bt_mesh_adv_gatt_update();
 	}
+
+	bt_mesh_adv_gatt_update();
 }
 
 BT_MESH_SUBNET_CB_DEFINE(gatt_services) = {
@@ -934,8 +937,8 @@ static ssize_t proxy_ccc_write(struct bt_conn *conn,
 }
 
 /* Mesh Proxy Service Declaration */
-static struct _bt_gatt_ccc proxy_ccc =
-	BT_GATT_CCC_INITIALIZER(proxy_ccc_changed, proxy_ccc_write, NULL);
+static struct bt_gatt_ccc_managed_user_data proxy_ccc =
+	BT_GATT_CCC_MANAGED_USER_DATA_INIT(proxy_ccc_changed, proxy_ccc_write, NULL);
 
 static struct bt_gatt_attr proxy_attrs[] = {
 	BT_GATT_PRIMARY_SERVICE(BT_UUID_MESH_PROXY),
@@ -983,6 +986,8 @@ int bt_mesh_proxy_gatt_enable(void)
 		}
 	}
 
+	bt_mesh_adv_gatt_update();
+
 	return 0;
 }
 
diff --git a/subsys/bluetooth/mesh/rpr_srv.c b/subsys/bluetooth/mesh/rpr_srv.c
index ed8d87f3c0464..96d94bae15ac5 100644
--- a/subsys/bluetooth/mesh/rpr_srv.c
+++ b/subsys/bluetooth/mesh/rpr_srv.c
@@ -1359,6 +1359,12 @@ static int node_refresh_link_accept(const struct prov_bearer_cb *cb,
 	return 0;
 }
 
+static void node_refresh_link_cancel(void)
+{
+	srv.refresh.cb = NULL;
+	srv.refresh.cb_data = NULL;
+}
+
 static void node_refresh_tx_complete(int err, void *cb_data)
 {
 	if (err) {
@@ -1408,6 +1414,7 @@ const struct prov_bearer pb_remote_srv = {
 	.type = BT_MESH_PROV_REMOTE,
 
 	.link_accept = node_refresh_link_accept,
+	.link_cancel = node_refresh_link_cancel,
 	.send = node_refresh_buf_send,
 	.clear_tx = node_refresh_clear_tx,
 };
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index f02672e6d6685..d746baf12585c 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -104,10 +104,6 @@ static int mesh_commit(void)
 		return 0;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
-		(void)bt_mesh_pb_gatt_srv_disable();
-	}
-
 	bt_mesh_net_settings_commit();
 	bt_mesh_model_settings_commit();
 
diff --git a/subsys/bluetooth/mesh/shell/cfg.c b/subsys/bluetooth/mesh/shell/cfg.c
index 016a67ff2be83..c6292d679e099 100644
--- a/subsys/bluetooth/mesh/shell/cfg.c
+++ b/subsys/bluetooth/mesh/shell/cfg.c
@@ -1561,7 +1561,7 @@ static int mod_pub_set(const struct shell *sh, uint16_t addr, bool is_va, uint16
 		return -EINVAL;
 	}
 
-	pub.period = (steps << 2) + res_step;
+	pub.period = steps + (res_step << 6);
 	count = shell_strtoul(argv[6], 0, &err);
 	if (count > 7) {
 		shell_print(sh, "Invalid retransmit count");
diff --git a/subsys/bluetooth/services/Kconfig.dis b/subsys/bluetooth/services/Kconfig.dis
index e1056a250d14f..6a15853903dbc 100644
--- a/subsys/bluetooth/services/Kconfig.dis
+++ b/subsys/bluetooth/services/Kconfig.dis
@@ -23,17 +23,57 @@ config BT_DIS_STR_MAX
 	  Bluetooth DIS string storage size. Storage can be up to 248 bytes
 	  long (excluding NULL termination).
 
-config BT_DIS_MODEL
-	string "Model name"
+config BT_DIS_MODEL_NUMBER
+	bool "Model number characteristic"
+	depends on !BT_DIS_MODEL_DEPRECATED_USED
+	default y
+	help
+	  Enable model number characteristic in Device Information Service.
+
+config BT_DIS_MODEL_NUMBER_STR
+	string "Model number"
+	depends on BT_DIS_MODEL_NUMBER
 	default SOC
+	help
+	  Configure model number string that can be read with the model number characteristic
+	  in Device Information Service.
+
+config BT_DIS_MODEL
+	string "Model name [DEPRECATED]"
 	help
 	  The device model inside Device Information Service.
+	  This option is deprecated. Use BT_DIS_MODEL_NUMBER and BT_DIS_MODEL_NUMBER_STR instead.
 
-config BT_DIS_MANUF
+config BT_DIS_MODEL_DEPRECATED_USED
+	bool
+	default y if BT_DIS_MODEL != ""
+	select DEPRECATED
+
+config BT_DIS_MANUF_NAME
+	bool "Manufacturer name characteristic"
+	depends on !BT_DIS_MANUF_DEPRECATED_USED
+	default y
+	help
+	  Enable manufacturer name characteristic in Device Information Service.
+
+config BT_DIS_MANUF_NAME_STR
 	string "Manufacturer name"
+	depends on BT_DIS_MANUF_NAME
 	default "Manufacturer"
+	help
+	  Configure manufacturer name string that can be read with the manufacturer name
+	  characteristic in Device Information Service.
+
+config BT_DIS_MANUF
+	string "Manufacturer name [DEPRECATED]"
 	help
 	  The device manufacturer inside Device Information Service.
+	  This option is deprecated. Use BT_DIS_MANUF_NAME and BT_DIS_MANUF_NAME_STR instead.
+
+config BT_DIS_MANUF_DEPRECATED_USED
+	bool
+	default y if BT_DIS_MANUF != ""
+	select DEPRECATED
 
 config BT_DIS_PNP
 	bool "PnP_ID characteristic"
diff --git a/subsys/bluetooth/services/dis.c b/subsys/bluetooth/services/dis.c
index 27676600b1782..f3fdccf100e78 100644
--- a/subsys/bluetooth/services/dis.c
+++ b/subsys/bluetooth/services/dis.c
@@ -58,10 +58,20 @@ static uint8_t dis_system_id[8] = {BT_BYTES_LIST_LE40((uint64_t)CONFIG_BT_DIS_SY
 #endif
 
 #if defined(CONFIG_BT_DIS_SETTINGS)
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER)
+BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MODEL_NUMBER_STR) <= CONFIG_BT_DIS_STR_MAX + 1);
+static uint8_t dis_model[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MODEL_NUMBER_STR;
+#elif defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MODEL) <= CONFIG_BT_DIS_STR_MAX + 1);
-BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MANUF) <= CONFIG_BT_DIS_STR_MAX + 1);
 static uint8_t dis_model[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MODEL;
+#endif
+#if defined(CONFIG_BT_DIS_MANUF_NAME)
+BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MANUF_NAME_STR) <= CONFIG_BT_DIS_STR_MAX + 1);
+static uint8_t dis_manuf[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MANUF_NAME_STR;
+#elif defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
+BUILD_ASSERT(sizeof(CONFIG_BT_DIS_MANUF) <= CONFIG_BT_DIS_STR_MAX + 1);
 static uint8_t dis_manuf[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_MANUF;
+#endif
 #if defined(CONFIG_BT_DIS_SERIAL_NUMBER)
 BUILD_ASSERT(sizeof(CONFIG_BT_DIS_SERIAL_NUMBER_STR) <= CONFIG_BT_DIS_STR_MAX + 1);
 static uint8_t dis_serial_number[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_SERIAL_NUMBER_STR;
@@ -114,8 +124,16 @@ static uint8_t dis_ieee_rcdl[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_IEEE_RCD
 
 #else /* CONFIG_BT_DIS_SETTINGS */
 
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER)
+#define BT_DIS_MODEL_REF             CONFIG_BT_DIS_MODEL_NUMBER_STR
+#elif defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 #define BT_DIS_MODEL_REF             CONFIG_BT_DIS_MODEL
+#endif
+#if defined(CONFIG_BT_DIS_MANUF_NAME)
+#define BT_DIS_MANUF_REF             CONFIG_BT_DIS_MANUF_NAME_STR
+#elif defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
 #define BT_DIS_MANUF_REF             CONFIG_BT_DIS_MANUF
+#endif
 #define BT_DIS_SERIAL_NUMBER_STR_REF CONFIG_BT_DIS_SERIAL_NUMBER_STR
 #define BT_DIS_FW_REV_STR_REF        CONFIG_BT_DIS_FW_REV_STR
 #define BT_DIS_HW_REV_STR_REF        CONFIG_BT_DIS_HW_REV_STR
@@ -128,12 +146,20 @@ static uint8_t dis_ieee_rcdl[CONFIG_BT_DIS_STR_MAX + 1] = CONFIG_BT_DIS_IEEE_RCD
 
 #endif /* CONFIG_BT_DIS_SETTINGS */
 
+#define BT_DIS_READ_STR_USED \
+	(CONFIG_BT_DIS_MODEL_NUMBER || CONFIG_BT_DIS_MODEL_DEPRECATED_USED || \
+	 CONFIG_BT_DIS_MANUF_NAME || CONFIG_BT_DIS_MANUF_DEPRECATED_USED || \
+	 CONFIG_BT_DIS_SERIAL_NUMBER || CONFIG_BT_DIS_FW_REV || CONFIG_BT_DIS_HW_REV || \
+	 CONFIG_BT_DIS_SW_REV || CONFIG_BT_DIS_IEEE_RCDL)
+
+#if BT_DIS_READ_STR_USED
 static ssize_t read_str(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
 			uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, attr->user_data,
 				 strlen(attr->user_data));
 }
+#endif
 
 #if CONFIG_BT_DIS_PNP
 static ssize_t read_pnp_id(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
@@ -153,7 +179,7 @@ static ssize_t read_system_id(struct bt_conn *conn, const struct bt_gatt_attr *a
 #endif
 
 #if CONFIG_BT_DIS_UDI
-#define DIS_STR_SIZE(x)           ((x[0]) != '\0' ? strlen(x) + sizeof('\0') : 0)
+#define DIS_STR_SIZE(x)           ((x[0]) != '\0' ? strlen(x) + 1 : 0)
 #define BT_DIS_UDI_FLAG_LABEL     (!!BT_DIS_UDI_LABEL_STR_REF[0])
 #define BT_DIS_UDI_FLAG_DI        (!!BT_DIS_UDI_DI_STR_REF[0])
 #define BT_DIS_UDI_FLAG_ISSUER    (!!BT_DIS_UDI_ISSUER_STR_REF[0])
@@ -170,7 +196,7 @@ static void read_udi_subval(const char *str, uint16_t val_len, char *buf, uint16
 			    uint16_t *index, uint16_t len, uint16_t offset)
 {
 	/* String should not be with included null-terminator if empty */
-	if (val_len == sizeof('\0')) {
+	if (val_len == sizeof("")) {
 		return;
 	}
 
@@ -226,10 +252,16 @@ static ssize_t read_udi(struct bt_conn *conn, const struct bt_gatt_attr *attr, v
 BT_GATT_SERVICE_DEFINE(
 	dis_svc, BT_GATT_PRIMARY_SERVICE(BT_UUID_DIS),
 
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER) || defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 	BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_CHRC_READ, BT_GATT_PERM_READ,
 			       read_str, NULL, BT_DIS_MODEL_REF),
+#endif
+
+#if defined(CONFIG_BT_DIS_MANUF_NAME) || defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
 	BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_CHRC_READ, BT_GATT_PERM_READ,
 			       read_str, NULL, BT_DIS_MANUF_REF),
+#endif
+
 #if CONFIG_BT_DIS_PNP
 	BT_GATT_CHARACTERISTIC(BT_UUID_DIS_PNP_ID, BT_GATT_CHRC_READ, BT_GATT_PERM_READ,
 			       read_pnp_id, NULL, &dis_pnp_id),
@@ -309,7 +341,10 @@ static int dis_set(const char *name, size_t len_rd, settings_read_cb read_cb, vo
 	int nlen;
 	const char *next;
 
+	ARG_UNUSED(len);
+
 	nlen = settings_name_next(name, &next);
+#if defined(CONFIG_BT_DIS_MANUF_NAME) || defined(CONFIG_BT_DIS_MANUF_DEPRECATED_USED)
 	if (!strncmp(name, "manuf", nlen)) {
 		len = read_cb(store, &dis_manuf, sizeof(dis_manuf) - 1);
 		if (len < 0) {
@@ -321,6 +356,8 @@ static int dis_set(const char *name, size_t len_rd, settings_read_cb read_cb, vo
 		}
 		return 0;
 	}
+#endif
+#if defined(CONFIG_BT_DIS_MODEL_NUMBER) || defined(CONFIG_BT_DIS_MODEL_DEPRECATED_USED)
 	if (!strncmp(name, "model", nlen)) {
 		len = read_cb(store, &dis_model, sizeof(dis_model) - 1);
 		if (len < 0) {
@@ -332,6 +369,7 @@ static int dis_set(const char *name, size_t len_rd, settings_read_cb read_cb, vo
 		}
 		return 0;
 	}
+#endif
 #if defined(CONFIG_BT_DIS_SERIAL_NUMBER)
 	if (!strncmp(name, "serial", nlen)) {
 		len = read_cb(store, &dis_serial_number, sizeof(dis_serial_number) - 1);
diff --git a/subsys/bluetooth/services/ots/ots_internal.h b/subsys/bluetooth/services/ots/ots_internal.h
index af1cafb025188..77ca60d9db540 100644
--- a/subsys/bluetooth/services/ots/ots_internal.h
+++ b/subsys/bluetooth/services/ots/ots_internal.h
@@ -120,7 +120,7 @@ struct bt_gatt_ots_object {
 struct bt_gatt_ots_indicate {
 	struct bt_gatt_indicate_params params;
 	struct bt_gatt_attr attr;
-	struct _bt_gatt_ccc ccc;
+	struct bt_gatt_ccc_managed_user_data ccc;
 	bool is_enabled;
 	struct k_work work;
 	uint8_t res[OACP_OLCP_RES_MAX_SIZE];
diff --git a/subsys/bluetooth/services/ots/ots_oacp.c b/subsys/bluetooth/services/ots/ots_oacp.c
index 3d6b3cf560a76..bf88b27882f35 100644
--- a/subsys/bluetooth/services/ots/ots_oacp.c
+++ b/subsys/bluetooth/services/ots/ots_oacp.c
@@ -728,7 +728,7 @@ void bt_gatt_ots_oacp_cfg_changed(const struct bt_gatt_attr *attr,
 				      uint16_t value)
 {
 	struct bt_gatt_ots_indicate *oacp_ind =
-	    CONTAINER_OF((struct _bt_gatt_ccc *) attr->user_data,
+	    CONTAINER_OF((struct bt_gatt_ccc_managed_user_data *) attr->user_data,
 			 struct bt_gatt_ots_indicate, ccc);
 
 	LOG_DBG("Object Action Control Point CCCD value: 0x%04X", value);
diff --git a/subsys/bluetooth/services/ots/ots_olcp.c b/subsys/bluetooth/services/ots/ots_olcp.c
index 7a7efb56435d4..4673b567e0211 100644
--- a/subsys/bluetooth/services/ots/ots_olcp.c
+++ b/subsys/bluetooth/services/ots/ots_olcp.c
@@ -311,7 +311,7 @@ void bt_gatt_ots_olcp_cfg_changed(const struct bt_gatt_attr *attr,
 				      uint16_t value)
 {
 	struct bt_gatt_ots_indicate *olcp_ind =
-	    CONTAINER_OF((struct _bt_gatt_ccc *) attr->user_data,
+	    CONTAINER_OF((struct bt_gatt_ccc_managed_user_data *) attr->user_data,
 			 struct bt_gatt_ots_indicate, ccc);
 
 	LOG_DBG("Object List Control Point CCCD value: 0x%04X", value);
diff --git a/subsys/dap/CMakeLists.txt b/subsys/dap/CMakeLists.txt
index c021d24071176..6ece4319c3510 100644
--- a/subsys/dap/CMakeLists.txt
+++ b/subsys/dap/CMakeLists.txt
@@ -5,3 +5,5 @@ zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 zephyr_library()
 zephyr_library_sources(cmsis_dap.c)
+
+zephyr_library_sources_ifdef(CONFIG_DAP_BACKEND_USB dap_backend_usb.c)
diff --git a/subsys/dap/Kconfig b/subsys/dap/Kconfig
index cfa50bf80ea99..a9417c55c7a3b 100644
--- a/subsys/dap/Kconfig
+++ b/subsys/dap/Kconfig
@@ -17,13 +17,6 @@ config CMSIS_DAP_PACKET_COUNT
 	help
 	  Maximum packet buffers for request and response data.
 
-config CMSIS_DAP_PACKET_SIZE
-	int "Maximum packet size for request and response data."
-	default 64
-	range 64 512
-	help
-	  Maximum packet size for request and response data.
-
 config CMSIS_DAP_PROBE_VENDOR
 	string "Probe vendor"
 	default "Zephyr"
@@ -48,6 +41,12 @@ config CMSIS_DAP_DEVICE_NAME
 	string "Target device name"
 	default ""
 
+config DAP_BACKEND_USB
+	bool "USB backend"
+	depends on USB_DEVICE_STACK_NEXT
+	help
+	  DAP USB backend using bulk endpoints.
+
 module = DAP
 module-str = dap
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/dap/cmsis_dap.c b/subsys/dap/cmsis_dap.c
index 4148346e15f5f..cd68f634a5671 100644
--- a/subsys/dap/cmsis_dap.c
+++ b/subsys/dap/cmsis_dap.c
@@ -47,23 +47,25 @@ struct dap_context {
 
 static struct dap_context dap_ctx[1];
 
+#define CMSIS_DAP_PACKET_MIN_SIZE 64
+
 BUILD_ASSERT(sizeof(CONFIG_CMSIS_DAP_PROBE_VENDOR) <=
-	     MIN(CONFIG_CMSIS_DAP_PACKET_SIZE - 2, UINT8_MAX - 2),
+	     MIN(CMSIS_DAP_PACKET_MIN_SIZE - 2, UINT8_MAX - 2),
 	     "PROBE_VENDOR string is too long.");
 BUILD_ASSERT(sizeof(CONFIG_CMSIS_DAP_PROBE_NAME) <=
-	     MIN(CONFIG_CMSIS_DAP_PACKET_SIZE - 2, UINT8_MAX - 2),
+	     MIN(CMSIS_DAP_PACKET_MIN_SIZE - 2, UINT8_MAX - 2),
 	     "PROBE_NAME string is too long.");
 BUILD_ASSERT(sizeof(CONFIG_CMSIS_DAP_BOARD_VENDOR) <=
-	     MIN(CONFIG_CMSIS_DAP_PACKET_SIZE - 2, UINT8_MAX - 2),
+	     MIN(CMSIS_DAP_PACKET_MIN_SIZE - 2, UINT8_MAX - 2),
 	     "BOARD_VENDOR string is too long.");
 BUILD_ASSERT(sizeof(CONFIG_CMSIS_DAP_BOARD_NAME) <=
-	     MIN(CONFIG_CMSIS_DAP_PACKET_SIZE - 2, UINT8_MAX - 2),
+	     MIN(CMSIS_DAP_PACKET_MIN_SIZE - 2, UINT8_MAX - 2),
 	     "BOARD_NAME string is too long.");
 BUILD_ASSERT(sizeof(CONFIG_CMSIS_DAP_DEVICE_VENDOR) <=
-	     MIN(CONFIG_CMSIS_DAP_PACKET_SIZE - 2, UINT8_MAX - 2),
+	     MIN(CMSIS_DAP_PACKET_MIN_SIZE - 2, UINT8_MAX - 2),
 	     "DEVICE_VENDOR string is too long.");
 BUILD_ASSERT(sizeof(CONFIG_CMSIS_DAP_DEVICE_NAME) <=
-	     MIN(CONFIG_CMSIS_DAP_PACKET_SIZE - 2, UINT8_MAX - 2),
+	     MIN(CMSIS_DAP_PACKET_MIN_SIZE - 2, UINT8_MAX - 2),
 	     "DEVICE_NAME string is too long.");
 
 /* Get DAP Information */
@@ -1037,6 +1039,12 @@ uint32_t dap_execute_cmd(const uint8_t *request,
 	return dap_process_cmd(&dap_ctx[0], request, response);
 }
 
+void dap_update_pkt_size(const uint16_t pkt_size)
+{
+	dap_ctx[0].pkt_size = pkt_size;
+	LOG_INF("New packet size %u", dap_ctx[0].pkt_size);
+}
+
 int dap_setup(const struct device *const dev)
 {
 	dap_ctx[0].swdp_dev = (void *)dev;
@@ -1047,7 +1055,7 @@ int dap_setup(const struct device *const dev)
 	}
 
 	/* Default settings */
-	dap_ctx[0].pkt_size = CONFIG_CMSIS_DAP_PACKET_SIZE;
+	dap_ctx[0].pkt_size = CMSIS_DAP_PACKET_MIN_SIZE;
 	dap_ctx[0].debug_port = 0U;
 	dap_ctx[0].transfer.idle_cycles = 0U;
 	dap_ctx[0].transfer.retry_count = 100U;
diff --git a/subsys/dap/cmsis_dap.h b/subsys/dap/cmsis_dap.h
index d8869e2160a90..9474358287594 100644
--- a/subsys/dap/cmsis_dap.h
+++ b/subsys/dap/cmsis_dap.h
@@ -132,5 +132,6 @@
 /* Keep it internal until an other interface has been implemented. */
 int dap_setup(const struct device *const dev);
 uint32_t dap_execute_cmd(const uint8_t *request, uint8_t *response);
+void dap_update_pkt_size(const uint16_t pkt_size);
 
 #endif	/* ZEPHYR_INCLUDE_CMSIS_DAP_H_ */
diff --git a/subsys/dap/dap_backend_usb.c b/subsys/dap/dap_backend_usb.c
new file mode 100644
index 0000000000000..5986e3a1e2cda
--- /dev/null
+++ b/subsys/dap/dap_backend_usb.c
@@ -0,0 +1,305 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/usb/usbd.h>
+#include <zephyr/drivers/usb/udc.h>
+#include <zephyr/sys/byteorder.h>
+
+#include "cmsis_dap.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(dap_usb, CONFIG_DAP_LOG_LEVEL);
+
+/*
+ * This file implements CMSIS DAP USB backend function using bulk endpoints.
+ */
+
+static uint8_t response_buf[512];
+
+NET_BUF_POOL_FIXED_DEFINE(dap_func_pool,
+			  1, 0, sizeof(struct udc_buf_info), NULL);
+
+UDC_STATIC_BUF_DEFINE(dap_func_buf, 512);
+
+struct dap_func_desc {
+	struct usb_if_descriptor if0;
+	struct usb_ep_descriptor if0_out_ep;
+	struct usb_ep_descriptor if0_in_ep;
+	struct usb_ep_descriptor if0_hs_out_ep;
+	struct usb_ep_descriptor if0_hs_in_ep;
+	struct usb_desc_header nil_desc;
+};
+
+#define SAMPLE_FUNCTION_ENABLED		0
+
+struct dap_func_data {
+	struct dap_func_desc *const desc;
+	const struct usb_desc_header **const fs_desc;
+	const struct usb_desc_header **const hs_desc;
+	struct usbd_desc_node *const iface_str_desc_nd;
+	atomic_t state;
+};
+
+static uint8_t dap_func_get_bulk_out(struct usbd_class_data *const c_data)
+{
+	struct dap_func_data *data = usbd_class_get_private(c_data);
+	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
+	struct dap_func_desc *desc = data->desc;
+
+	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+		return desc->if0_hs_out_ep.bEndpointAddress;
+	}
+
+	return desc->if0_out_ep.bEndpointAddress;
+}
+
+static uint8_t dap_func_get_bulk_in(struct usbd_class_data *const c_data)
+{
+	struct dap_func_data *data = usbd_class_get_private(c_data);
+	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
+	struct dap_func_desc *desc = data->desc;
+
+	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+		return desc->if0_hs_in_ep.bEndpointAddress;
+	}
+
+	return desc->if0_in_ep.bEndpointAddress;
+}
+
+static int dap_func_request_handler(struct usbd_class_data *c_data,
+				  struct net_buf *buf, int err)
+{
+	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
+	struct dap_func_data *data = usbd_class_get_private(c_data);
+	struct udc_buf_info *bi = NULL;
+
+	bi = (struct udc_buf_info *)net_buf_user_data(buf);
+	LOG_DBG("Transfer finished %p -> ep 0x%02x, len %u, err %d",
+		(void *)c_data, bi->ep, buf->len, err);
+
+	if (atomic_test_bit(&data->state, SAMPLE_FUNCTION_ENABLED) && err == 0) {
+		uint8_t ep = bi->ep;
+		size_t len;
+
+		memset(bi, 0, sizeof(struct udc_buf_info));
+		if (ep == dap_func_get_bulk_in(c_data)) {
+			bi->ep = dap_func_get_bulk_out(c_data);
+			net_buf_reset(buf);
+		} else {
+			bi->ep = dap_func_get_bulk_in(c_data);
+
+			len = dap_execute_cmd(buf->data, response_buf);
+			net_buf_reset(buf);
+			LOG_DBG("response length %u, starting with [0x%02X, 0x%02X]",
+				len, response_buf[0], response_buf[1]);
+			net_buf_add_mem(buf, response_buf, MIN(len, net_buf_tailroom(buf)));
+		}
+
+		if (usbd_ep_enqueue(c_data, buf)) {
+			LOG_ERR("Failed to enqueue buffer");
+			usbd_ep_buf_free(uds_ctx, buf);
+		}
+	} else {
+		LOG_ERR("Function is disabled or transfer failed");
+		usbd_ep_buf_free(uds_ctx, buf);
+	}
+
+	return 0;
+}
+
+static void *dap_func_get_desc(struct usbd_class_data *const c_data,
+			     const enum usbd_speed speed)
+{
+	struct dap_func_data *data = usbd_class_get_private(c_data);
+
+	if (speed == USBD_SPEED_HS) {
+		return data->hs_desc;
+	}
+
+	return data->fs_desc;
+}
+
+struct net_buf *dap_func_buf_alloc(struct usbd_class_data *const c_data,
+				const uint8_t ep)
+{
+	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
+	struct net_buf *buf = NULL;
+	struct udc_buf_info *bi;
+	size_t size;
+
+	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+		size = 512U;
+	} else {
+		size = 64U;
+	}
+
+	buf = net_buf_alloc_with_data(&dap_func_pool, dap_func_buf, size, K_NO_WAIT);
+	net_buf_reset(buf);
+	if (!buf) {
+		return NULL;
+	}
+
+	bi = udc_get_buf_info(buf);
+	memset(bi, 0, sizeof(struct udc_buf_info));
+	bi->ep = ep;
+
+	return buf;
+}
+
+static void dap_func_enable(struct usbd_class_data *const c_data)
+{
+	struct dap_func_data *data = usbd_class_get_private(c_data);
+	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
+	struct net_buf *buf;
+
+	LOG_INF("Configuration enabled");
+
+	if (!atomic_test_and_set_bit(&data->state, SAMPLE_FUNCTION_ENABLED)) {
+		if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+			dap_update_pkt_size(512);
+		} else {
+			dap_update_pkt_size(64);
+		}
+
+		buf = dap_func_buf_alloc(c_data, dap_func_get_bulk_out(c_data));
+		if (buf == NULL) {
+			LOG_ERR("Failed to allocate buffer");
+			return;
+		}
+
+		if (usbd_ep_enqueue(c_data, buf)) {
+			LOG_ERR("Failed to enqueue buffer");
+			usbd_ep_buf_free(uds_ctx, buf);
+		}
+	}
+}
+
+static void dap_func_disable(struct usbd_class_data *const c_data)
+{
+	struct dap_func_data *data = usbd_class_get_private(c_data);
+
+	atomic_clear_bit(&data->state, SAMPLE_FUNCTION_ENABLED);
+	LOG_INF("Configuration disabled");
+}
+
+static int dap_func_init(struct usbd_class_data *c_data)
+{
+	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
+	struct dap_func_data *data = usbd_class_get_private(c_data);
+	struct dap_func_desc *desc = data->desc;
+
+	LOG_DBG("Init class instance %p", (void *)c_data);
+
+	if (usbd_add_descriptor(uds_ctx, data->iface_str_desc_nd)) {
+		LOG_ERR("Failed to add interface string descriptor");
+	} else {
+		desc->if0.iInterface = usbd_str_desc_get_idx(data->iface_str_desc_nd);
+	}
+
+	return 0;
+}
+
+struct usbd_class_api dap_func_api = {
+	.request = dap_func_request_handler,
+	.get_desc = dap_func_get_desc,
+	.enable = dap_func_enable,
+	.disable = dap_func_disable,
+	.init = dap_func_init,
+};
+
+#define DAP_FUNC_DESCRIPTOR_DEFINE(n, _)					\
+static struct dap_func_desc dap_func_desc_##n = {				\
+	/* Interface descriptor 0 */						\
+	.if0 = {								\
+		.bLength = sizeof(struct usb_if_descriptor),			\
+		.bDescriptorType = USB_DESC_INTERFACE,				\
+		.bInterfaceNumber = 0,						\
+		.bAlternateSetting = 0,						\
+		.bNumEndpoints = 2,						\
+		.bInterfaceClass = USB_BCC_VENDOR,				\
+		.bInterfaceSubClass = 0,					\
+		.bInterfaceProtocol = 0,					\
+		.iInterface = 0,						\
+	},									\
+										\
+	/* Endpoint OUT */							\
+	.if0_out_ep = {								\
+		.bLength = sizeof(struct usb_ep_descriptor),			\
+		.bDescriptorType = USB_DESC_ENDPOINT,				\
+		.bEndpointAddress = 0x01,					\
+		.bmAttributes = USB_EP_TYPE_BULK,				\
+		.wMaxPacketSize = sys_cpu_to_le16(64U),				\
+		.bInterval = 0x00,						\
+	},									\
+										\
+	/* Endpoint IN */							\
+	.if0_in_ep = {								\
+		.bLength = sizeof(struct usb_ep_descriptor),			\
+		.bDescriptorType = USB_DESC_ENDPOINT,				\
+		.bEndpointAddress = 0x81,					\
+		.bmAttributes = USB_EP_TYPE_BULK,				\
+		.wMaxPacketSize = sys_cpu_to_le16(64U),				\
+		.bInterval = 0x00,						\
+	},									\
+										\
+	/* High-speed Endpoint OUT */						\
+	.if0_hs_out_ep = {							\
+		.bLength = sizeof(struct usb_ep_descriptor),			\
+		.bDescriptorType = USB_DESC_ENDPOINT,				\
+		.bEndpointAddress = 0x01,					\
+		.bmAttributes = USB_EP_TYPE_BULK,				\
+		.wMaxPacketSize = sys_cpu_to_le16(512),				\
+		.bInterval = 0x00,						\
+	},									\
+										\
+	/* High-speed Endpoint IN */						\
+	.if0_hs_in_ep = {							\
+		.bLength = sizeof(struct usb_ep_descriptor),			\
+		.bDescriptorType = USB_DESC_ENDPOINT,				\
+		.bEndpointAddress = 0x81,					\
+		.bmAttributes = USB_EP_TYPE_BULK,				\
+		.wMaxPacketSize = sys_cpu_to_le16(512),				\
+		.bInterval = 0x00,						\
+	},									\
+										\
+	/* Termination descriptor */						\
+	.nil_desc = {								\
+		.bLength = 0,							\
+		.bDescriptorType = 0,						\
+	},									\
+};										\
+										\
+const static struct usb_desc_header *dap_func_fs_desc_##n[] = {			\
+	(struct usb_desc_header *) &dap_func_desc_##n.if0,			\
+	(struct usb_desc_header *) &dap_func_desc_##n.if0_out_ep,		\
+	(struct usb_desc_header *) &dap_func_desc_##n.if0_in_ep,		\
+	(struct usb_desc_header *) &dap_func_desc_##n.nil_desc,			\
+};										\
+										\
+const static struct usb_desc_header *dap_func_hs_desc_##n[] = {			\
+	(struct usb_desc_header *) &dap_func_desc_##n.if0,			\
+	(struct usb_desc_header *) &dap_func_desc_##n.if0_hs_out_ep,		\
+	(struct usb_desc_header *) &dap_func_desc_##n.if0_hs_in_ep,		\
+	(struct usb_desc_header *) &dap_func_desc_##n.nil_desc,			\
+};
+
+
+#define DAP_FUNC_FUNCTION_DATA_DEFINE(n, _)					\
+	USBD_DESC_STRING_DEFINE(iface_str_desc_nd_##n,				\
+				"CMSIS-DAP v2",					\
+				USBD_DUT_STRING_INTERFACE);			\
+										\
+	static struct dap_func_data dap_func_data_##n = {			\
+		.desc = &dap_func_desc_##n,					\
+		.fs_desc = dap_func_fs_desc_##n,				\
+		.hs_desc = dap_func_hs_desc_##n,				\
+		.iface_str_desc_nd = &iface_str_desc_nd_##n,			\
+	};									\
+										\
+	USBD_DEFINE_CLASS(dap_func_##n, &dap_func_api, &dap_func_data_##n, NULL);
+
+LISTIFY(1, DAP_FUNC_DESCRIPTOR_DEFINE, ())
+LISTIFY(1, DAP_FUNC_FUNCTION_DATA_DEFINE, ())
diff --git a/subsys/debug/CMakeLists.txt b/subsys/debug/CMakeLists.txt
index 183305f843002..2e99f5a648e0e 100644
--- a/subsys/debug/CMakeLists.txt
+++ b/subsys/debug/CMakeLists.txt
@@ -10,9 +10,9 @@ zephyr_sources_ifdef(
   asan_hacks.c
   )
 
-zephyr_sources_ifdef(
+add_subdirectory_ifdef(
   CONFIG_THREAD_ANALYZER
-  thread_analyzer.c
+  thread_analyzer
   )
 
 add_subdirectory_ifdef(
@@ -39,3 +39,8 @@ zephyr_sources_ifdef(
   CONFIG_CS_TRACE_DEFMT
   coresight/cs_trace_defmt.c
 )
+
+zephyr_sources_ifdef(
+  CONFIG_CPU_LOAD
+  cpu_load.c
+  )
diff --git a/subsys/debug/Kconfig b/subsys/debug/Kconfig
index eaa8805641447..6ee215c16f565 100644
--- a/subsys/debug/Kconfig
+++ b/subsys/debug/Kconfig
@@ -6,105 +6,7 @@
 
 menu "System Monitoring Options"
 
-menuconfig THREAD_ANALYZER
-	bool "Thread analyzer"
-	depends on !ARCH_POSIX
-	select INIT_STACKS
-	select THREAD_MONITOR
-	select THREAD_STACK_INFO
-	select THREAD_RUNTIME_STATS
-	help
-	  Enable thread analyzer functionality and all the required modules.
-	  This module may be used to debug thread configuration issues, e.g.
-	  stack size configuration to find stack overflow or to find stacks
-	  which may be optimized.
-
-if THREAD_ANALYZER
-module = THREAD_ANALYZER
-module-str = thread analyzer
-source "subsys/logging/Kconfig.template.log_config"
-
-choice
-	prompt "Thread analysis print mode"
-	default THREAD_ANALYZER_USE_PRINTK
-
-config THREAD_ANALYZER_USE_LOG
-	bool "Use logger output"
-	select LOG
-	help
-	  Use logger output to print thread information.
-
-config THREAD_ANALYZER_USE_PRINTK
-	bool "Use printk function"
-	help
-	  Use kernel printk function to print thread information.
-
-endchoice
-
-config THREAD_ANALYZER_ISR_STACK_USAGE
-	bool "Analyze interrupt stacks usage"
-	default y
-
-config THREAD_ANALYZER_PRIV_STACK_USAGE
-	bool "Analyze privileged stacks usage"
-	depends on USERSPACE
-	depends on ARCH_HAS_THREAD_PRIV_STACK_SPACE_GET
-	help
-	  Print privileged stack usage for user threads.
-
-config THREAD_ANALYZER_RUN_UNLOCKED
-	bool "Run analysis with interrupts unlocked"
-	default y
-	help
-	  The thread analysis takes quite a long time.
-	  Every thread it finds is analyzed word by word to find any that
-	  does not match the magic number.
-	  Normally while thread are analyzed the k_thread_foreach function
-	  is used.
-	  While this is a safe run from the thread list perspective it may lock
-	  the interrupts for a long time - long enough to disconnect when
-	  Bluetooth communication is used.
-	  Setting this flag will force thread analyzer to use
-	  the k_thread_foreach_unlocked function.
-	  This will allow the interrupts to be processed while the thread is
-	  analyzed.
-	  For the limitation of such configuration see the k_thread_foreach
-	  documentation.
-
-config THREAD_ANALYZER_AUTO
-	bool "Run periodic thread analysis in a thread"
-	help
-	  Run the thread analyzer automatically, without the need to add
-	  any code to the application.
-	  Thread analysis would be called periodically.
-
-if THREAD_ANALYZER_AUTO
-
-config THREAD_ANALYZER_AUTO_SEPARATE_CORES
-	bool "Run thread analyzer separately on each core"
-	default y if KERNEL_COHERENCE
-	depends on SCHED_CPU_MASK
-	help
-	  Run the thread analyzer auto thread on each core and report
-	  cores separately. This feature is needed for platforms running
-	  on cache-incoherent architectures.
-
-config THREAD_ANALYZER_AUTO_INTERVAL
-	int "Thread analysis interval"
-	default 60
-	range 5 3600
-	help
-	  The time in seconds to call thread analyzer periodic printing function.
-
-config THREAD_ANALYZER_AUTO_STACK_SIZE
-	int "Stack size for the periodic thread analysis thread"
-	default 2048 if THREAD_ANALYZER_USE_LOG && LOG_MODE_IMMEDIATE && NO_OPTIMIZATIONS
-	default 1024
-
-endif # THREAD_ANALYZER_AUTO
-
-endif # THREAD_ANALYZER
-
+source "subsys/debug/thread_analyzer/Kconfig"
 
 endmenu
 
@@ -431,3 +333,31 @@ config CS_TRACE_DEFMT
 	help
 	  Module is decoding data which is formatted using Coresight
 	  Trace Formatter, e.g. when data is put into ETR (Embedded Trace Router).
+
+config CPU_LOAD
+	select TRACING
+	depends on CPU_CORTEX_M || RISCV
+	depends on !SMP
+	bool "CPU load measurement"
+
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CPU_LOAD_COUNTER := zephyr,cpu-load-counter
+
+config CPU_LOAD_USE_COUNTER
+	bool "Use counter"
+	depends on $(dt_chosen_enabled,$(DT_CHOSEN_Z_CPU_LOAD_COUNTER))
+	default y
+	select COUNTER
+	help
+	  Use counter for tracking CPU idle time.
+
+config CPU_LOAD_LOG_PERIODICALLY
+	int "Report period (in milliseconds)"
+	depends on LOG
+	default 0
+	help
+	  Specifies how often CPU load shall be logged. 0 means that there is no logging.
+
+module = CPU_LOAD
+module-str = cpu_load
+source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/debug/coredump/CMakeLists.txt b/subsys/debug/coredump/CMakeLists.txt
index b1219f91dff8d..8e5b0769da82e 100644
--- a/subsys/debug/coredump/CMakeLists.txt
+++ b/subsys/debug/coredump/CMakeLists.txt
@@ -28,6 +28,16 @@ zephyr_library_sources_ifdef(
   coredump_backend_intel_adsp_mem_window.c
   )
 
+zephyr_library_sources_ifdef(
+  CONFIG_DEBUG_COREDUMP_SHELL
+  coredump_shell.c
+  )
+
+zephyr_library_sources_ifdef(
+  CONFIG_DEBUG_COREDUMP_BACKEND_IN_MEMORY
+  coredump_backend_in_memory.c
+  )
+
   # @Intent: Set XTENSA_TOOLCHAIN_VARIANT macro required for Xtensa coredump
 if(CONFIG_XTENSA)
   if(${ZEPHYR_TOOLCHAIN_VARIANT} STREQUAL "zephyr")
diff --git a/subsys/debug/coredump/Kconfig b/subsys/debug/coredump/Kconfig
index ad46d7d80b839..fdab036182010 100644
--- a/subsys/debug/coredump/Kconfig
+++ b/subsys/debug/coredump/Kconfig
@@ -28,6 +28,17 @@ config DEBUG_COREDUMP_BACKEND_FLASH_PARTITION
 	  Core dump is saved to a flash partition with DTS alias
 	  "coredump-partition".
 
+config DEBUG_COREDUMP_BACKEND_IN_MEMORY
+	bool "Use memory to store the coredump"
+	help
+	  Core dump (or part of it) is saved in a dedicated area in
+	  memory. Such memory is protected at boot time so it could be
+	  read after a warm reboot. This is obviously NOT a valid solution
+	  when a full hardware reboot cycle occurs (on/off etc..) where
+	  the RAM will most likely loose its data.
+	  See DEBUG_COREDUMP_BACKEND_IN_MEMORY_SIZE on how much space to
+	  reserve.
+
 config DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW
 	bool "Use memory window for coredump on Intel ADSP"
 	depends on DT_HAS_INTEL_ADSP_MEM_WINDOW_ENABLED
@@ -118,4 +129,19 @@ config DEBUG_COREDUMP_DUMP_THREAD_PRIV_STACK
 	  Say n to conserve space on coredump backend or if you will never
 	  need to look into the privilege stacks.
 
+config DEBUG_COREDUMP_BACKEND_IN_MEMORY_SIZE
+	int "In-memory coredump size"
+	default 128
+	depends on DEBUG_COREDUMP_BACKEND_IN_MEMORY
+	help
+	  Sets the dedicated memory area where a coredump can be stored
+	  and accessed after a warm reboot. It has to be able to hold at
+	  least the info dumped by arch_coredump_info_dump().
+	  Extra memory region will silently be ignored if there isn't
+	  enough space.
+
+module = DEBUG_COREDUMP
+module-str = coredump
+source "subsys/logging/Kconfig.template.log_config"
+
 endif # DEBUG_COREDUMP
diff --git a/subsys/debug/coredump/coredump_backend_flash_partition.c b/subsys/debug/coredump/coredump_backend_flash_partition.c
index ad929d3d74234..46b93d3ca2b9c 100644
--- a/subsys/debug/coredump/coredump_backend_flash_partition.c
+++ b/subsys/debug/coredump/coredump_backend_flash_partition.c
@@ -16,7 +16,7 @@
 #include "coredump_internal.h"
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(coredump, CONFIG_KERNEL_LOG_LEVEL);
+LOG_MODULE_REGISTER(coredump, CONFIG_DEBUG_COREDUMP_LOG_LEVEL);
 
 /**
  * @file
@@ -630,306 +630,4 @@ struct coredump_backend_api coredump_backend_flash_partition = {
 	.cmd = coredump_flash_backend_cmd,
 };
 
-#ifdef CONFIG_DEBUG_COREDUMP_SHELL
-#include <zephyr/shell/shell.h>
-
-/* Length of buffer of printable size */
-#define PRINT_BUF_SZ		64
-
-/* Length of buffer of printable size plus null character */
-#define PRINT_BUF_SZ_RAW	(PRINT_BUF_SZ + 1)
-
-/* Print buffer */
-static char print_buf[PRINT_BUF_SZ_RAW];
-static off_t print_buf_ptr;
-
-/**
- * @brief Shell command to get backend error.
- *
- * @param sh shell instance
- * @param argc (not used)
- * @param argv (not used)
- * @return 0
- */
-static int cmd_coredump_error_get(const struct shell *sh,
-				  size_t argc, char **argv)
-{
-	ARG_UNUSED(argc);
-	ARG_UNUSED(argv);
-
-	if (backend_ctx.error == 0) {
-		shell_print(sh, "No error.");
-	} else {
-		shell_print(sh, "Error: %d", backend_ctx.error);
-	}
-
-	return 0;
-}
-
-/**
- * @brief Shell command to clear backend error.
- *
- * @param sh shell instance
- * @param argc (not used)
- * @param argv (not used)
- * @return 0
- */
-static int cmd_coredump_error_clear(const struct shell *sh,
-				    size_t argc, char **argv)
-{
-	backend_ctx.error = 0;
-
-	shell_print(sh, "Error cleared.");
-
-	return 0;
-}
-
-/**
- * @brief Shell command to see if there is a stored coredump in flash.
- *
- * @param sh shell instance
- * @param argc (not used)
- * @param argv (not used)
- * @return 0
- */
-static int cmd_coredump_has_stored_dump(const struct shell *sh,
-					size_t argc, char **argv)
-{
-	int ret;
-
-	ARG_UNUSED(argc);
-	ARG_UNUSED(argv);
-
-	ret = coredump_flash_backend_query(COREDUMP_QUERY_HAS_STORED_DUMP,
-					   NULL);
-
-	if (ret == 1) {
-		shell_print(sh, "Stored coredump found.");
-	} else if (ret == 0) {
-		shell_print(sh, "Stored coredump NOT found.");
-	} else {
-		shell_print(sh, "Failed to perform query: %d", ret);
-	}
-
-	return 0;
-}
-
-/**
- * @brief Shell command to verify if the stored coredump is valid.
- *
- * @param sh shell instance
- * @param argc (not used)
- * @param argv (not used)
- * @return 0
- */
-static int cmd_coredump_verify_stored_dump(const struct shell *sh,
-					   size_t argc, char **argv)
-{
-	int ret;
-
-	ARG_UNUSED(argc);
-	ARG_UNUSED(argv);
-
-	ret = coredump_flash_backend_cmd(COREDUMP_CMD_VERIFY_STORED_DUMP,
-					 NULL);
-
-	if (ret == 1) {
-		shell_print(sh, "Stored coredump verified.");
-	} else if (ret == 0) {
-		shell_print(sh, "Stored coredump verification failed "
-				   "or there is no stored coredump.");
-	} else {
-		shell_print(sh, "Failed to perform verify command: %d",
-			    ret);
-	}
-
-	return 0;
-}
-
-/**
- * @brief Flush the print buffer to shell.
- *
- * This prints what is in the print buffer to the shell.
- *
- * @param sh shell instance.
- */
-static void flush_print_buf(const struct shell *sh)
-{
-	shell_print(sh, "%s%s", COREDUMP_PREFIX_STR, print_buf);
-	print_buf_ptr = 0;
-	(void)memset(print_buf, 0, sizeof(print_buf));
-}
-
-/**
- * @brief Callback to print stored coredump to shell
- *
- * This converts the binary data in @p buf to hexadecimal digits
- * which can be printed to the shell.
- *
- * @param arg shell instance
- * @param buf binary data buffer
- * @param len number of bytes in buffer to be printed
- * @return 0 if no issues; -EINVAL if error converting data
- */
-static int cb_print_stored_dump(void *arg, uint8_t *buf, size_t len)
-{
-	int ret = 0;
-	size_t i = 0;
-	size_t remaining = len;
-	const struct shell *sh = (const struct shell *)arg;
-
-	if (len == 0) {
-		/* Flush print buffer */
-		flush_print_buf(sh);
-
-		goto out;
-	}
-
-	/* Do checksum for process_stored_dump() */
-	cb_calc_buf_checksum(arg, buf, len);
-
-	while (remaining > 0) {
-		if (hex2char(buf[i] >> 4, &print_buf[print_buf_ptr]) < 0) {
-			ret = -EINVAL;
-			break;
-		}
-		print_buf_ptr++;
-
-		if (hex2char(buf[i] & 0xf, &print_buf[print_buf_ptr]) < 0) {
-			ret = -EINVAL;
-			break;
-		}
-		print_buf_ptr++;
-
-		remaining--;
-		i++;
-
-		if (print_buf_ptr == PRINT_BUF_SZ) {
-			flush_print_buf(sh);
-		}
-	}
-
-out:
-	return ret;
-}
-
-/**
- * @brief Shell command to print stored coredump data to shell
- *
- * @param sh shell instance
- * @param argc (not used)
- * @param argv (not used)
- * @return 0
- */
-static int cmd_coredump_print_stored_dump(const struct shell *sh,
-					  size_t argc, char **argv)
-{
-	int ret;
-
-	ARG_UNUSED(argc);
-	ARG_UNUSED(argv);
-
-	/* Verify first to see if stored dump is valid */
-	ret = coredump_flash_backend_cmd(COREDUMP_CMD_VERIFY_STORED_DUMP,
-					 NULL);
-
-	if (ret == 0) {
-		shell_print(sh, "Stored coredump verification failed "
-				   "or there is no stored coredump.");
-		goto out;
-	} else if (ret != 1) {
-		shell_print(sh, "Failed to perform verify command: %d",
-			    ret);
-		goto out;
-	}
-
-	/* If valid, start printing to shell */
-	print_buf_ptr = 0;
-	(void)memset(print_buf, 0, sizeof(print_buf));
-
-	shell_print(sh, "%s%s", COREDUMP_PREFIX_STR, COREDUMP_BEGIN_STR);
-
-	ret = process_stored_dump(cb_print_stored_dump, (void *)sh);
-	if (print_buf_ptr != 0) {
-		shell_print(sh, "%s%s", COREDUMP_PREFIX_STR, print_buf);
-	}
-
-	if (backend_ctx.error != 0) {
-		shell_print(sh, "%s%s", COREDUMP_PREFIX_STR,
-			    COREDUMP_ERROR_STR);
-	}
-
-	shell_print(sh, "%s%s", COREDUMP_PREFIX_STR, COREDUMP_END_STR);
-
-	if (ret == 1) {
-		shell_print(sh, "Stored coredump printed.");
-	} else if (ret == 0) {
-		shell_print(sh, "Stored coredump verification failed "
-				   "or there is no stored coredump.");
-	} else {
-		shell_print(sh, "Failed to print: %d", ret);
-	}
-
-out:
-	return 0;
-}
-
-/**
- * @brief Shell command to erase stored coredump.
- *
- * @param sh shell instance
- * @param argc (not used)
- * @param argv (not used)
- * @return 0
- */
-static int cmd_coredump_erase_stored_dump(const struct shell *sh,
-					  size_t argc, char **argv)
-{
-	int ret;
-
-	ARG_UNUSED(argc);
-	ARG_UNUSED(argv);
-
-	ret = coredump_flash_backend_cmd(COREDUMP_CMD_ERASE_STORED_DUMP,
-					 NULL);
-
-	if (ret == 0) {
-		shell_print(sh, "Stored coredump erased.");
-	} else {
-		shell_print(sh, "Failed to perform erase command: %d", ret);
-	}
-
-	return 0;
-}
-
-SHELL_STATIC_SUBCMD_SET_CREATE(sub_coredump_error,
-	SHELL_CMD(clear, NULL, "Clear Coredump error",
-		  cmd_coredump_error_clear),
-	SHELL_CMD(get, NULL, "Get Coredump error", cmd_coredump_error_get),
-	SHELL_SUBCMD_SET_END /* Array terminated. */
-);
-
-SHELL_STATIC_SUBCMD_SET_CREATE(sub_coredump,
-	SHELL_CMD(error, &sub_coredump_error,
-		  "Get/clear backend error.", NULL),
-	SHELL_CMD(erase, NULL,
-		  "Erase stored coredump",
-		  cmd_coredump_erase_stored_dump),
-	SHELL_CMD(find, NULL,
-		  "Query if there is a stored coredump",
-		  cmd_coredump_has_stored_dump),
-	SHELL_CMD(print, NULL,
-		  "Print stored coredump to shell",
-		  cmd_coredump_print_stored_dump),
-	SHELL_CMD(verify, NULL,
-		  "Verify stored coredump",
-		  cmd_coredump_verify_stored_dump),
-	SHELL_SUBCMD_SET_END /* Array terminated. */
-);
-
-SHELL_CMD_REGISTER(coredump, &sub_coredump,
-		   "Coredump commands (flash partition backend)", NULL);
-
-#endif /* CONFIG_DEBUG_COREDUMP_SHELL */
-
 #endif /* FIXED_PARTITION_EXISTS(coredump_partition) */
diff --git a/subsys/debug/coredump/coredump_backend_in_memory.c b/subsys/debug/coredump/coredump_backend_in_memory.c
new file mode 100644
index 0000000000000..84a8d0d2a1fae
--- /dev/null
+++ b/subsys/debug/coredump/coredump_backend_in_memory.c
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2025 Bang & Olufsen.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <string.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/debug/coredump.h>
+
+#include "coredump_internal.h"
+
+LOG_MODULE_REGISTER(coredump, CONFIG_DEBUG_COREDUMP_LOG_LEVEL);
+
+#define IN_MEMORY_CANARY_SIZE 4
+#define IN_MEMORY_COREDUMP_SIZE_RECORD sizeof(size_t)
+
+/**
+ * In-memory coredump space is arranged that way:
+ * CANARY+ Recorded coredump size + Coredump + Left space (if any) + CANARY
+ */
+#define IN_MEMORY_SPACE CONFIG_DEBUG_COREDUMP_BACKEND_IN_MEMORY_SIZE + \
+	(IN_MEMORY_CANARY_SIZE * 2) + IN_MEMORY_COREDUMP_SIZE_RECORD
+#define IN_MEMORY_START IN_MEMORY_CANARY_SIZE + IN_MEMORY_COREDUMP_SIZE_RECORD
+#define IN_MEMORY_END IN_MEMORY_SPACE - IN_MEMORY_CANARY_SIZE
+
+static const uint8_t in_memory_canary[IN_MEMORY_CANARY_SIZE] = {
+	0xDE, 0xB0, 0xDE, 0xB0
+};
+
+static uint8_t __noinit_named(_in_memory_coredump)
+	__aligned(4) in_memory_coredump[IN_MEMORY_SPACE];
+
+static size_t *coredump_size =
+	(size_t *)&in_memory_coredump[IN_MEMORY_CANARY_SIZE];
+static uint8_t *cur_ptr;
+
+
+static inline void in_memory_invalidate(void)
+{
+	memset(in_memory_coredump, 0, IN_MEMORY_CANARY_SIZE);
+	memset(&in_memory_coredump[IN_MEMORY_END], 0, IN_MEMORY_CANARY_SIZE);
+	*coredump_size = 0;
+	cur_ptr = NULL;
+}
+static inline void in_memory_erase(void)
+{
+	LOG_DBG("Erasing in-memory coredump\n");
+
+	in_memory_invalidate();
+}
+
+static int in_memory_is_valid(void)
+{
+	if (!memcmp(in_memory_coredump,
+		    in_memory_canary, IN_MEMORY_CANARY_SIZE) &&
+	    !memcmp(&in_memory_coredump[IN_MEMORY_END],
+		    in_memory_canary, IN_MEMORY_CANARY_SIZE)) {
+		return 1;
+	}
+
+	return 0;
+}
+
+static int in_memory_copy_to(struct coredump_cmd_copy_arg *copy_arg)
+{
+	LOG_DBG("Copy to: %p offset: %lu length: %lu",
+		(void *)copy_arg->buffer, copy_arg->offset,
+		(unsigned long)copy_arg->length);
+
+	if (copy_arg->buffer == NULL ||
+	    copy_arg->offset >= IN_MEMORY_END ||
+	    (copy_arg->length + copy_arg->offset) >= IN_MEMORY_END) {
+		return -EINVAL;
+	}
+
+	if (in_memory_is_valid() == 0) {
+		return -EIO;
+	}
+
+	memcpy(copy_arg->buffer,
+	       &in_memory_coredump[IN_MEMORY_START + copy_arg->offset],
+	       copy_arg->length);
+
+	return 0;
+}
+
+static void coredump_in_memory_backend_start(void)
+{
+	in_memory_erase();
+
+	LOG_ERR(COREDUMP_PREFIX_STR "LOCATION %p", (void *)in_memory_coredump);
+
+	memcpy(in_memory_coredump, in_memory_canary, IN_MEMORY_CANARY_SIZE);
+	cur_ptr = &in_memory_coredump[IN_MEMORY_START];
+
+	*coredump_size = 0;
+
+	while (LOG_PROCESS()) {
+		;
+	}
+
+	LOG_PANIC();
+	LOG_ERR(COREDUMP_PREFIX_STR COREDUMP_BEGIN_STR);
+}
+
+static void coredump_in_memory_backend_end(void)
+{
+	memcpy(&in_memory_coredump[IN_MEMORY_END],
+	       in_memory_canary, IN_MEMORY_CANARY_SIZE);
+
+	*coredump_size = cur_ptr - &in_memory_coredump[IN_MEMORY_START];
+
+	LOG_ERR(COREDUMP_PREFIX_STR COREDUMP_END_STR);
+}
+
+static void coredump_in_memory_backend_buffer_output(uint8_t *buf,
+						     size_t buflen)
+{
+	int space;
+
+	LOG_DBG("Output buffer size %lu", (unsigned long)buflen);
+
+	if (cur_ptr == &in_memory_coredump[IN_MEMORY_END]) {
+		/* Once full, we silently ignore the request */
+		return;
+	}
+
+	space = &in_memory_coredump[IN_MEMORY_END] - cur_ptr;
+	if (buflen < space) {
+		space = buflen;
+	}
+
+	memcpy(cur_ptr, buf, space);
+	cur_ptr += space;
+}
+
+static int coredump_in_memory_backend_query(enum coredump_query_id query_id,
+					    void *arg)
+{
+	switch (query_id) {
+	case COREDUMP_QUERY_GET_ERROR:
+		break;
+	case COREDUMP_QUERY_HAS_STORED_DUMP:
+		return in_memory_is_valid();
+	case COREDUMP_QUERY_GET_STORED_DUMP_SIZE:
+		if (in_memory_is_valid() == 1) {
+			return *coredump_size;
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int coredump_in_memory_backend_cmd(enum coredump_cmd_id cmd_id,
+					  void *arg)
+{
+	switch (cmd_id) {
+	case COREDUMP_CMD_CLEAR_ERROR:
+		break;
+	case COREDUMP_CMD_VERIFY_STORED_DUMP:
+		return in_memory_is_valid();
+	case COREDUMP_CMD_ERASE_STORED_DUMP:
+		in_memory_erase();
+		break;
+	case COREDUMP_CMD_COPY_STORED_DUMP:
+		if (arg == NULL) {
+			return -EINVAL;
+		}
+		return in_memory_copy_to((struct coredump_cmd_copy_arg *)arg);
+	case COREDUMP_CMD_INVALIDATE_STORED_DUMP:
+		in_memory_invalidate();
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+struct coredump_backend_api coredump_backend_in_memory = {
+	.start = coredump_in_memory_backend_start,
+	.end = coredump_in_memory_backend_end,
+	.buffer_output = coredump_in_memory_backend_buffer_output,
+	.query = coredump_in_memory_backend_query,
+	.cmd = coredump_in_memory_backend_cmd,
+};
diff --git a/subsys/debug/coredump/coredump_backend_intel_adsp_mem_window.c b/subsys/debug/coredump/coredump_backend_intel_adsp_mem_window.c
index 06f1e5a8f6a90..201a2e8a2a439 100644
--- a/subsys/debug/coredump/coredump_backend_intel_adsp_mem_window.c
+++ b/subsys/debug/coredump/coredump_backend_intel_adsp_mem_window.c
@@ -14,7 +14,8 @@
 #include <zephyr/logging/log_ctrl.h>
 #include <adsp_memory.h>
 #include <adsp_debug_window.h>
-LOG_MODULE_REGISTER(coredump_error, CONFIG_KERNEL_LOG_LEVEL);
+
+LOG_MODULE_REGISTER(coredump, CONFIG_DEBUG_COREDUMP_LOG_LEVEL);
 
 static int error;
 static uint32_t mem_wptr;
diff --git a/subsys/debug/coredump/coredump_backend_logging.c b/subsys/debug/coredump/coredump_backend_logging.c
index f646d5fe7fab3..c64dcfc68be7a 100644
--- a/subsys/debug/coredump/coredump_backend_logging.c
+++ b/subsys/debug/coredump/coredump_backend_logging.c
@@ -12,7 +12,8 @@
 
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_ctrl.h>
-LOG_MODULE_REGISTER(coredump, CONFIG_KERNEL_LOG_LEVEL);
+
+LOG_MODULE_REGISTER(coredump, CONFIG_DEBUG_COREDUMP_LOG_LEVEL);
 
 /* Length of buffer of printable size */
 #define LOG_BUF_SZ		64
@@ -125,50 +126,3 @@ struct coredump_backend_api coredump_backend_logging = {
 	.query = coredump_logging_backend_query,
 	.cmd = coredump_logging_backend_cmd,
 };
-
-
-#ifdef CONFIG_DEBUG_COREDUMP_SHELL
-#include <zephyr/shell/shell.h>
-
-static int cmd_coredump_error_get(const struct shell *sh,
-				  size_t argc, char **argv)
-{
-	ARG_UNUSED(argc);
-	ARG_UNUSED(argv);
-
-	if (error == 0) {
-		shell_print(sh, "No error.");
-	} else {
-		shell_print(sh, "Error: %d", error);
-	}
-
-	return 0;
-}
-
-static int cmd_coredump_error_clear(const struct shell *sh,
-				    size_t argc, char **argv)
-{
-	error = 0;
-
-	shell_print(sh, "Error cleared.");
-
-	return 0;
-}
-
-SHELL_STATIC_SUBCMD_SET_CREATE(sub_coredump_error,
-	SHELL_CMD(get, NULL, "Get Coredump error", cmd_coredump_error_get),
-	SHELL_CMD(clear, NULL, "Clear Coredump error",
-		  cmd_coredump_error_clear),
-	SHELL_SUBCMD_SET_END /* Array terminated. */
-);
-
-SHELL_STATIC_SUBCMD_SET_CREATE(sub_coredump,
-	SHELL_CMD(error, &sub_coredump_error,
-		  "Get/clear backend error.", NULL),
-	SHELL_SUBCMD_SET_END /* Array terminated. */
-);
-
-SHELL_CMD_REGISTER(coredump, &sub_coredump,
-		   "Coredump commands (logging backend)", NULL);
-
-#endif /* CONFIG_DEBUG_COREDUMP_SHELL */
diff --git a/subsys/debug/coredump/coredump_core.c b/subsys/debug/coredump/coredump_core.c
index 8b17c6d26b0b4..12fa0fa8dfdb2 100644
--- a/subsys/debug/coredump/coredump_core.c
+++ b/subsys/debug/coredump/coredump_core.c
@@ -24,6 +24,10 @@ static struct coredump_backend_api
 extern struct coredump_backend_api coredump_backend_intel_adsp_mem_window;
 static struct coredump_backend_api
 	*backend_api = &coredump_backend_intel_adsp_mem_window;
+#elif defined(CONFIG_DEBUG_COREDUMP_BACKEND_IN_MEMORY)
+extern struct coredump_backend_api coredump_backend_in_memory;
+static struct coredump_backend_api
+	*backend_api = &coredump_backend_in_memory;
 #elif defined(CONFIG_DEBUG_COREDUMP_BACKEND_OTHER)
 extern struct coredump_backend_api coredump_backend_other;
 static struct coredump_backend_api
diff --git a/subsys/debug/coredump/coredump_shell.c b/subsys/debug/coredump/coredump_shell.c
new file mode 100644
index 0000000000000..731162aa27cfa
--- /dev/null
+++ b/subsys/debug/coredump/coredump_shell.c
@@ -0,0 +1,626 @@
+/*
+ * Copyright (c) 2020 Intel Corporation.
+ * Copyright (c) 2025 Bang & Olufsen A/S, Denmark
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
+
+#include <zephyr/debug/coredump.h>
+
+#if defined(CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING)
+#define COREDUMP_BACKEND_STR "logging"
+#elif defined(CONFIG_DEBUG_COREDUMP_BACKEND_FLASH_PARTITION)
+#define COREDUMP_BACKEND_STR "flash partition"
+#elif defined(CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW)
+#define COREDUMP_BACKEND_STR "ADSP memory window"
+#elif defined(CONFIG_DEBUG_COREDUMP_BACKEND_IN_MEMORY)
+#define COREDUMP_BACKEND_STR "In memory - volatile -"
+#elif defined(CONFIG_DEBUG_COREDUMP_BACKEND_OTHER)
+#define COREDUMP_BACKEND_STR "other"
+#else
+#error "Need to select a coredump backend"
+#endif
+
+/* Length of buffer of printable size */
+#define PRINT_BUF_SZ		64
+/* Length of copy buffer */
+#define COPY_BUF_SZ		128
+
+/* Length of buffer of printable size plus null character */
+#define PRINT_BUF_SZ_RAW	(PRINT_BUF_SZ + 1)
+
+/* Print buffer */
+static char print_buf[PRINT_BUF_SZ_RAW];
+static off_t print_buf_ptr;
+
+/**
+ * Since enum coredump_tgt_code is sequential and starting from 0,
+ * let's just have an array
+ */
+static const char * const coredump_target_code2str[] = {
+	"Unknown",
+	"x86",
+	"x86_64",
+	"ARM Cortex-m",
+	"Risc V",
+	"Xtensa",
+	"ARM64"
+};
+
+/**
+ * @brief Shell command to get backend error.
+ *
+ * @param sh shell instance
+ * @param argc (not used)
+ * @param argv (not used)
+ * @return 0
+ */
+static int cmd_coredump_error_get(const struct shell *sh,
+				  size_t argc, char **argv)
+{
+	int ret;
+
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	ret = coredump_query(COREDUMP_QUERY_GET_ERROR, NULL);
+	if (ret == 0) {
+		shell_print(sh, "No error.");
+	} else if (ret == -ENOTSUP) {
+		shell_print(sh, "Unsupported query from the backend");
+	} else {
+		shell_print(sh, "Error: %d", ret);
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Shell command to clear backend error.
+ *
+ * @param sh shell instance
+ * @param argc (not used)
+ * @param argv (not used)
+ * @return 0
+ */
+static int cmd_coredump_error_clear(const struct shell *sh,
+				    size_t argc, char **argv)
+{
+	int ret;
+
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	ret = coredump_cmd(COREDUMP_CMD_CLEAR_ERROR, NULL);
+	if (ret == 0) {
+		shell_print(sh, "Error cleared.");
+	} else if (ret == -ENOTSUP) {
+		shell_print(sh, "Unsupported command from the backend");
+	} else {
+		shell_print(sh, "Failed to clear the error: %d", ret);
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Shell command to see if there is a stored coredump in flash.
+ *
+ * @param sh shell instance
+ * @param argc (not used)
+ * @param argv (not used)
+ * @return 0
+ */
+static int cmd_coredump_has_stored_dump(const struct shell *sh,
+					size_t argc, char **argv)
+{
+	int ret;
+
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	ret = coredump_query(COREDUMP_QUERY_HAS_STORED_DUMP, NULL);
+	if (ret == 1) {
+		shell_print(sh, "Stored coredump found.");
+	} else if (ret == 0) {
+		shell_print(sh, "Stored coredump NOT found.");
+	} else if (ret == -ENOTSUP) {
+		shell_print(sh, "Unsupported query from the backend");
+	} else {
+		shell_print(sh, "Failed to perform query: %d", ret);
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Shell command to verify if the stored coredump is valid.
+ *
+ * @param sh shell instance
+ * @param argc (not used)
+ * @param argv (not used)
+ * @return 0
+ */
+static int cmd_coredump_verify_stored_dump(const struct shell *sh,
+					   size_t argc, char **argv)
+{
+	int ret;
+
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	ret = coredump_cmd(COREDUMP_CMD_VERIFY_STORED_DUMP, NULL);
+	if (ret == 1) {
+		shell_print(sh, "Stored coredump verified.");
+	} else if (ret == 0) {
+		shell_print(sh, "Stored coredump verification failed "
+			    "or there is no stored coredump.");
+	} else if (ret == -ENOTSUP) {
+		shell_print(sh, "Unsupported command from the backend");
+	} else {
+		shell_print(sh, "Failed to perform verify command: %d", ret);
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Flush the print buffer to shell.
+ *
+ * This prints what is in the print buffer to the shell.
+ *
+ * @param sh shell instance.
+ */
+static void flush_print_buf(const struct shell *sh)
+{
+	shell_print(sh, "%s%s", COREDUMP_PREFIX_STR, print_buf);
+	print_buf_ptr = 0;
+	(void)memset(print_buf, 0, sizeof(print_buf));
+}
+
+/**
+ * @brief Helper to print Zephyr coredump header to shell
+ *
+ * @param sh shell instance
+ * @param buf pointer to header
+ * @return size of data processed, -EINVAL if error converting data
+ */
+static int print_coredump_hdr(const struct shell *sh, uint8_t *buf)
+{
+	struct coredump_hdr_t *hdr = (struct coredump_hdr_t *)buf;
+
+	if (memcmp(hdr->id, "ZE", sizeof(char)*2) != 0) {
+		shell_print(sh, "Not a Zephyr coredump header");
+		return -EINVAL;
+	}
+
+	shell_print(sh, "**** Zephyr Coredump ****");
+	shell_print(sh, "\tVersion %u", hdr->hdr_version);
+	shell_print(sh, "\tTarget: %s",
+		    coredump_target_code2str[sys_le16_to_cpu(
+				    hdr->tgt_code)]);
+	shell_print(sh, "\tPointer size: %u",
+		    (uint16_t)BIT(hdr->ptr_size_bits));
+	shell_print(sh, "\tFlag: %u", hdr->flag);
+	shell_print(sh, "\tReason: %u", sys_le16_to_cpu(hdr->reason));
+
+	return sizeof(struct coredump_hdr_t);
+}
+
+/**
+ * @brief Helper to print stored coredump data to shell
+ *
+ * This converts the binary data in @p buf to hexadecimal digits
+ * which can be printed to the shell.
+ *
+ * @param sh shell instance
+ * @param buf binary data buffer
+ * @param len number of bytes in buffer to be printed
+ * @return 0 if no issues; -EINVAL if error converting data
+ */
+static int print_stored_dump(const struct shell *sh, uint8_t *buf, size_t len)
+{
+	int ret = 0;
+	size_t i = 0;
+	size_t remaining = len;
+
+	if (len == 0) {
+		/* Flush print buffer */
+		flush_print_buf(sh);
+		goto out;
+	}
+
+	while (remaining > 0) {
+		if (hex2char(buf[i] >> 4, &print_buf[print_buf_ptr]) < 0) {
+			ret = -EINVAL;
+			break;
+		}
+		print_buf_ptr++;
+
+		if (hex2char(buf[i] & 0xf, &print_buf[print_buf_ptr]) < 0) {
+			ret = -EINVAL;
+			break;
+		}
+		print_buf_ptr++;
+
+		remaining--;
+		i++;
+
+		if (print_buf_ptr == PRINT_BUF_SZ) {
+			flush_print_buf(sh);
+		}
+	}
+
+out:
+	return ret;
+}
+
+/**
+ * @brief Print raw data to shell in hexadecimal (prefixed)
+ *
+ * @param sh Shell instance
+ * @param copy A pointer on the coredump copy current context
+ * @param size Size of the data to recover/print
+ * @param error A boolean indicating so query coredump error at the end
+ * @return 0 on success, -EINVAL otherwise
+ */
+static int print_raw_data(const struct shell *sh,
+			  struct coredump_cmd_copy_arg *copy,
+			  int size, bool error)
+{
+	int ret;
+
+	copy->length = COPY_BUF_SZ;
+
+	print_buf_ptr = 0;
+	(void)memset(print_buf, 0, sizeof(print_buf));
+
+	shell_print(sh, "%s%s", COREDUMP_PREFIX_STR, COREDUMP_BEGIN_STR);
+
+	while (size > 0) {
+		if (size < COPY_BUF_SZ) {
+			copy->length = size;
+		}
+
+		ret = coredump_cmd(COREDUMP_CMD_COPY_STORED_DUMP, copy);
+		if (ret != 0) {
+			return -EINVAL;
+		}
+
+		ret = print_stored_dump(sh, copy->buffer, copy->length);
+		if (ret != 0) {
+			return -EINVAL;
+		}
+
+		if (print_buf_ptr != 0) {
+			shell_print(sh, "%s%s", COREDUMP_PREFIX_STR, print_buf);
+		}
+
+		copy->offset += copy->length;
+		size -= copy->length;
+	}
+
+	if (error && coredump_query(COREDUMP_QUERY_GET_ERROR, NULL) != 0) {
+		shell_print(sh, "%s%s", COREDUMP_PREFIX_STR,
+			    COREDUMP_ERROR_STR);
+	}
+
+	shell_print(sh, "%s%s\n", COREDUMP_PREFIX_STR, COREDUMP_END_STR);
+
+	return 0;
+}
+
+/**
+ * @brief Helper parsing and pretty-printing the coredump
+ *
+ * @param sh shell instance
+ * @param coredump_header Pointer to a boolean indicating zephyr coredump
+ *        got parsed/printed aleardy header
+ * @param copy A pointer on the coredump copy context
+ * @param left_size How much of the coredump has not been parsed/printed yet
+ * @return 0 if all has been processed, a positive value indicating the amount
+ *        that the function call has processed, a negative errno otherwise
+ */
+static int parse_and_print_coredump(const struct shell *sh,
+				    bool *coredump_header,
+				    struct coredump_cmd_copy_arg *copy,
+				    size_t left_size)
+{
+	int processed_size = 0;
+	int data_size = 0;
+	int ret;
+
+	if (!*coredump_header) {
+		copy->length = sizeof(struct coredump_hdr_t);
+	} else {
+		/* thread header is of same size, but memory header */
+		copy->length = sizeof(struct coredump_arch_hdr_t);
+	}
+
+	if (copy->length > left_size) {
+		return -ENOMEM;
+	}
+
+	ret = coredump_cmd(COREDUMP_CMD_COPY_STORED_DUMP, copy);
+	if (ret != 0) {
+		return ret;
+	}
+
+	if (!*coredump_header) {
+		ret = print_coredump_hdr(sh, copy->buffer);
+		shell_print(sh, "\tSize of the coredump: %lu\n",
+			    (unsigned long)left_size);
+
+		*coredump_header = true;
+
+		goto hdr_done;
+	}
+
+	/* hdr id */
+	switch (copy->buffer[0]) {
+	case COREDUMP_ARCH_HDR_ID: {
+		struct coredump_arch_hdr_t *hdr =
+			(struct coredump_arch_hdr_t *)copy->buffer;
+
+		shell_print(sh, "-> Arch coredump header found");
+		shell_print(sh, "\tVersion %u", hdr->hdr_version);
+		shell_print(sh, "\tSize %u", hdr->num_bytes);
+
+		data_size = hdr->num_bytes;
+		break;
+	}
+	case THREADS_META_HDR_ID: {
+		struct coredump_threads_meta_hdr_t *hdr =
+			(struct coredump_threads_meta_hdr_t *)copy->buffer;
+
+		shell_print(sh, "-> Thread coredump header found");
+		shell_print(sh, "\tVersion %u", hdr->hdr_version);
+		shell_print(sh, "\tSize %u", hdr->num_bytes);
+
+		data_size = hdr->num_bytes;
+		break;
+	}
+	case COREDUMP_MEM_HDR_ID: {
+		struct coredump_mem_hdr_t *hdr;
+
+		copy->length = sizeof(struct coredump_mem_hdr_t);
+		if (copy->length > left_size) {
+			return -ENOMEM;
+		}
+
+		ret = coredump_cmd(COREDUMP_CMD_COPY_STORED_DUMP, copy);
+		if (ret != 0) {
+			return -ENOMEM;
+		}
+
+		hdr = (struct coredump_mem_hdr_t *)copy->buffer;
+
+		if (sizeof(uintptr_t) == 8) {
+			hdr->start = sys_le64_to_cpu(hdr->start);
+			hdr->end = sys_le64_to_cpu(hdr->end);
+		} else {
+			hdr->start = sys_le32_to_cpu(hdr->start);
+			hdr->end = sys_le32_to_cpu(hdr->end);
+		}
+
+		data_size = hdr->end - hdr->start;
+
+		shell_print(sh, "-> Memory coredump header found");
+		shell_print(sh, "\tVersion %u", hdr->hdr_version);
+		shell_print(sh, "\tSize %u", data_size);
+		shell_print(sh, "\tStarts at %p ends at %p",
+			    (void *)hdr->start, (void *)hdr->end);
+		break;
+	}
+	default:
+		return -EINVAL;
+	}
+
+	if (data_size > left_size) {
+		return -ENOMEM;
+	}
+
+hdr_done:
+	copy->offset += copy->length;
+	processed_size += copy->length + data_size;
+
+	if (data_size == 0) {
+		goto out;
+	}
+
+	shell_print(sh, "Data:");
+
+	ret = print_raw_data(sh, copy, data_size, false);
+	if (ret !=  0) {
+		return ret;
+	}
+out:
+	return processed_size;
+}
+
+
+/**
+ * @brief Print out the coredump in a human-readable way
+ *
+ * @param sh Shell instance
+ * @param size Size of the coredump
+ * @return 0
+ */
+static int pretty_print_coredump(const struct shell *sh, int size)
+{
+	uint8_t rbuf[COPY_BUF_SZ];
+	struct coredump_cmd_copy_arg copy = {
+		.offset = 0,
+		.buffer = rbuf,
+	};
+	bool cdump_hdr = false;
+	int ret;
+
+	while (size > 0) {
+		ret = parse_and_print_coredump(sh, &cdump_hdr, &copy, size);
+		if (ret < 0) {
+			goto error;
+		}
+
+		if (ret == 0) {
+			break;
+		}
+
+		size -= ret;
+	}
+
+	shell_print(sh, "Stored coredump printed");
+
+	goto out;
+error:
+	if (ret == -ENOTSUP) {
+		shell_print(sh, "Unsupported command from the backend");
+	} else {
+		shell_print(sh, "Error while retrieving/parsing coredump: %d", ret);
+	}
+out:
+	return 0;
+}
+
+/**
+ * @brief Print out the coredump fully in hexadecimal
+ *
+ * @param sh Shell instance
+ * @param size Size of the coredump
+ * @return 0
+ */
+static int hex_print_coredump(const struct shell *sh, int size)
+{
+	uint8_t rbuf[COPY_BUF_SZ];
+	struct coredump_cmd_copy_arg copy = {
+		.offset = 0,
+		.buffer = rbuf,
+	};
+	int ret;
+
+	ret = print_raw_data(sh, &copy, size, true);
+	if (ret == 0) {
+		shell_print(sh, "Stored coredump printed.");
+	} else {
+		shell_print(sh, "Failed to print: %d", ret);
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Shell command to print stored coredump data to shell
+ *
+ * @param sh Shell instance
+ * @param argc Number of elements in argv
+ * @param argv Parsed arguments
+ * @return 0
+ */
+static int cmd_coredump_print_stored_dump(const struct shell *sh,
+					  size_t argc, char **argv)
+{
+	int size;
+	int ret;
+
+	if (argc > 2) {
+		shell_print(sh, "Too many options");
+		return 0;
+	}
+
+	if (argv[1] != NULL) {
+		if (strncmp(argv[1], "pretty", 6) != 0) {
+			shell_print(sh, "Unknown option: %s", argv[1]);
+			return 0;
+		}
+	}
+
+	/* Verify first to see if stored dump is valid */
+	ret = coredump_cmd(COREDUMP_CMD_VERIFY_STORED_DUMP, NULL);
+	if (ret == 0) {
+		shell_print(sh, "Stored coredump verification failed "
+			    "or there is no stored coredump.");
+		return 0;
+	} else if (ret == -ENOTSUP) {
+		shell_print(sh, "Unsupported command from the backend");
+		return 0;
+	} else if (ret != 1) {
+		shell_print(sh, "Failed to perform verify command: %d", ret);
+		return 0;
+	}
+
+	size = coredump_query(COREDUMP_QUERY_GET_STORED_DUMP_SIZE, NULL);
+	if (size <= 0) {
+		shell_print(sh, "Invalid coredump size: %d", size);
+		return 0;
+	}
+
+	if (argv[1] != NULL) {
+		pretty_print_coredump(sh, size);
+	} else {
+		hex_print_coredump(sh, size);
+	}
+
+	return 0;
+}
+
+/**
+ * @brief Shell command to erase stored coredump.
+ *
+ * @param sh shell instance
+ * @param argc (not used)
+ * @param argv (not used)
+ * @return 0
+ */
+static int cmd_coredump_erase_stored_dump(const struct shell *sh,
+					  size_t argc, char **argv)
+{
+	int ret;
+
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	ret = coredump_cmd(COREDUMP_CMD_ERASE_STORED_DUMP, NULL);
+	if (ret == 0) {
+		shell_print(sh, "Stored coredump erased.");
+	} else if (ret == -ENOTSUP) {
+		shell_print(sh, "Unsupported command from the backend");
+	} else {
+		shell_print(sh, "Failed to perform erase command: %d", ret);
+	}
+
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sub_coredump_error,
+	SHELL_CMD(clear, NULL, "Clear Coredump error",
+		  cmd_coredump_error_clear),
+	SHELL_CMD(get, NULL, "Get Coredump error", cmd_coredump_error_get),
+	SHELL_SUBCMD_SET_END /* Array terminated. */
+);
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sub_coredump,
+	SHELL_CMD(error, &sub_coredump_error,
+		  "Get/clear backend error.", NULL),
+	SHELL_CMD(erase, NULL,
+		  "Erase stored coredump",
+		  cmd_coredump_erase_stored_dump),
+	SHELL_CMD(find, NULL,
+		  "Query if there is a stored coredump",
+		  cmd_coredump_has_stored_dump),
+	SHELL_CMD(print, NULL,
+		  "Print stored coredump to shell "
+		  "(use option 'pretty' to get human readable output)",
+		  cmd_coredump_print_stored_dump),
+	SHELL_CMD(verify, NULL,
+		  "Verify stored coredump",
+		  cmd_coredump_verify_stored_dump),
+	SHELL_SUBCMD_SET_END /* Array terminated. */
+);
+
+SHELL_CMD_REGISTER(coredump, &sub_coredump,
+		   "Coredump commands (" COREDUMP_BACKEND_STR " backend)",
+		   NULL);
diff --git a/subsys/debug/cpu_load.c b/subsys/debug/cpu_load.c
new file mode 100644
index 0000000000000..0754d673b77dc
--- /dev/null
+++ b/subsys/debug/cpu_load.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/debug/cpu_load.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(cpu_load, CONFIG_CPU_LOAD_LOG_LEVEL);
+
+BUILD_ASSERT(!IS_ENABLED(CONFIG_CPU_LOAD_USE_COUNTER) || DT_HAS_CHOSEN(zephyr_cpu_load_counter));
+
+#ifndef CONFIG_CPU_LOAD_LOG_PERIODICALLY
+#define CONFIG_CPU_LOAD_LOG_PERIODICALLY 0
+#endif
+
+static const struct device *counter = COND_CODE_1(CONFIG_CPU_LOAD_USE_COUNTER,
+				(DEVICE_DT_GET(DT_CHOSEN(zephyr_cpu_load_counter))), (NULL));
+static uint32_t enter_ts;
+static uint32_t cyc_start;
+static uint32_t ticks_idle;
+
+static struct k_work_delayable cpu_load_log;
+
+void cpu_load_log_control(bool enable)
+{
+	if (CONFIG_CPU_LOAD_LOG_PERIODICALLY == 0) {
+		return;
+	}
+
+	if (enable) {
+		(void)cpu_load_get(true);
+		k_work_schedule(&cpu_load_log, K_MSEC(CONFIG_CPU_LOAD_LOG_PERIODICALLY));
+	} else {
+		k_work_cancel_delayable(&cpu_load_log);
+	}
+}
+
+#if CONFIG_CPU_LOAD_USE_COUNTER || CONFIG_CPU_LOAD_LOG_PERIODICALLY
+static void cpu_load_log_fn(struct k_work *work)
+{
+	int load = cpu_load_get(true);
+	uint32_t percent = load / 10;
+	uint32_t fraction = load % 10;
+
+	LOG_INF("Load:%d.%03d%%", percent, fraction);
+	cpu_load_log_control(true);
+}
+
+static int cpu_load_init(void)
+{
+	if (IS_ENABLED(CONFIG_CPU_LOAD_USE_COUNTER)) {
+		int err = counter_start(counter);
+
+		(void)err;
+		__ASSERT_NO_MSG(err == 0);
+	}
+
+	if (CONFIG_CPU_LOAD_LOG_PERIODICALLY > 0) {
+		k_work_init_delayable(&cpu_load_log, cpu_load_log_fn);
+		return k_work_schedule(&cpu_load_log, K_MSEC(CONFIG_CPU_LOAD_LOG_PERIODICALLY));
+	}
+
+	return 0;
+}
+
+SYS_INIT(cpu_load_init, POST_KERNEL, 0);
+#endif
+
+void cpu_load_on_enter_idle(void)
+{
+	if (IS_ENABLED(CONFIG_CPU_LOAD_USE_COUNTER)) {
+		counter_get_value(counter, &enter_ts);
+		return;
+	}
+
+	enter_ts = k_cycle_get_32();
+}
+
+void cpu_load_on_exit_idle(void)
+{
+	uint32_t now;
+
+	if (IS_ENABLED(CONFIG_CPU_LOAD_USE_COUNTER)) {
+		counter_get_value(counter, &now);
+	} else {
+		now = k_cycle_get_32();
+	}
+
+	ticks_idle += now - enter_ts;
+}
+
+int cpu_load_get(bool reset)
+{
+	uint32_t idle_us;
+	uint32_t total = k_cycle_get_32() - cyc_start;
+	uint32_t total_us = (uint32_t)k_cyc_to_us_floor32(total);
+	uint32_t res;
+	uint32_t active_us;
+
+	if (IS_ENABLED(CONFIG_CPU_LOAD_USE_COUNTER)) {
+		idle_us = counter_ticks_to_us(counter, ticks_idle);
+	} else {
+		idle_us = k_cyc_to_us_floor32(ticks_idle);
+	}
+
+	idle_us = MIN(idle_us, total_us);
+	active_us = total_us - idle_us;
+
+	res = ((1000 * active_us) / total_us);
+
+	if (reset) {
+		cyc_start = k_cycle_get_32();
+		ticks_idle = 0;
+	}
+
+	return res;
+}
diff --git a/subsys/debug/gdbstub/gdbstub.c b/subsys/debug/gdbstub/gdbstub.c
index bb07d0575e5d4..82e06521a6e7e 100644
--- a/subsys/debug/gdbstub/gdbstub.c
+++ b/subsys/debug/gdbstub/gdbstub.c
@@ -55,12 +55,6 @@ __weak const size_t gdb_mem_num_regions;
  * @return Pointer to the memory region description if found.
  *         NULL if not found.
  */
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-/* Required due to gdb_mem_region_array having a default size of zero. */
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
-
 static inline const
 struct gdb_mem_region *find_memory_region(const uintptr_t addr, const size_t len)
 {
@@ -82,10 +76,6 @@ struct gdb_mem_region *find_memory_region(const uintptr_t addr, const size_t len
 	return ret;
 }
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
 bool gdb_mem_can_read(const uintptr_t addr, const size_t len, uint8_t *align)
 {
 	bool ret = false;
diff --git a/subsys/debug/thread_analyzer/CMakeLists.txt b/subsys/debug/thread_analyzer/CMakeLists.txt
new file mode 100644
index 0000000000000..982f6b8a969e4
--- /dev/null
+++ b/subsys/debug/thread_analyzer/CMakeLists.txt
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_sources(
+  thread_analyzer.c
+  )
diff --git a/subsys/debug/thread_analyzer/Kconfig b/subsys/debug/thread_analyzer/Kconfig
new file mode 100644
index 0000000000000..d0828a3b64239
--- /dev/null
+++ b/subsys/debug/thread_analyzer/Kconfig
@@ -0,0 +1,116 @@
+# Thread analyzer configuration options
+
+# Copyright (c) 2015 Wind River Systems, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+menuconfig THREAD_ANALYZER
+	bool "Thread analyzer"
+	depends on !ARCH_POSIX
+	select INIT_STACKS
+	select THREAD_MONITOR
+	select THREAD_STACK_INFO
+	select THREAD_RUNTIME_STATS
+	help
+	  Enable thread analyzer functionality and all the required modules.
+	  This module may be used to debug thread configuration issues, e.g.
+	  stack size configuration to find stack overflow or to find stacks
+	  which may be optimized.
+
+if THREAD_ANALYZER
+module = THREAD_ANALYZER
+module-str = thread analyzer
+source "subsys/logging/Kconfig.template.log_config"
+
+choice
+	prompt "Thread analysis print mode"
+	default THREAD_ANALYZER_USE_PRINTK
+
+config THREAD_ANALYZER_USE_LOG
+	bool "Use logger output"
+	select LOG
+	help
+	  Use logger output to print thread information.
+
+config THREAD_ANALYZER_USE_PRINTK
+	bool "Use printk function"
+	help
+	  Use kernel printk function to print thread information.
+
+endchoice
+
+config THREAD_ANALYZER_ISR_STACK_USAGE
+	bool "Analyze interrupt stacks usage"
+	default y
+
+config THREAD_ANALYZER_PRIV_STACK_USAGE
+	bool "Analyze privileged stacks usage"
+	depends on USERSPACE
+	depends on ARCH_HAS_THREAD_PRIV_STACK_SPACE_GET
+	help
+	  Print privileged stack usage for user threads.
+
+config THREAD_ANALYZER_RUN_UNLOCKED
+	bool "Run analysis with interrupts unlocked"
+	default y
+	help
+	  The thread analysis takes quite a long time.
+	  Every thread it finds is analyzed word by word to find any that
+	  does not match the magic number.
+	  Normally while thread are analyzed the k_thread_foreach function
+	  is used.
+	  While this is a safe run from the thread list perspective it may lock
+	  the interrupts for a long time - long enough to disconnect when
+	  Bluetooth communication is used.
+	  Setting this flag will force thread analyzer to use
+	  the k_thread_foreach_unlocked function.
+	  This will allow the interrupts to be processed while the thread is
+	  analyzed.
+	  For the limitation of such configuration see the k_thread_foreach
+	  documentation.
+
+config THREAD_ANALYZER_AUTO
+	bool "Run periodic thread analysis in a thread"
+	help
+	  Run the thread analyzer automatically, without the need to add
+	  any code to the application.
+	  Thread analysis would be called periodically.
+
+if THREAD_ANALYZER_AUTO
+
+config THREAD_ANALYZER_AUTO_SEPARATE_CORES
+	bool "Run thread analyzer separately on each core"
+	default y if KERNEL_COHERENCE
+	depends on SCHED_CPU_MASK
+	help
+	  Run the thread analyzer auto thread on each core and report
+	  cores separately. This feature is needed for platforms running
+	  on cache-incoherent architectures.
+
+config THREAD_ANALYZER_AUTO_INTERVAL
+	int "Thread analysis interval"
+	default 60
+	range 5 3600
+	help
+	  The time in seconds to call thread analyzer periodic printing function.
+
+config THREAD_ANALYZER_AUTO_STACK_SIZE
+	int "Stack size for the periodic thread analysis thread"
+	default 2048 if THREAD_ANALYZER_USE_LOG && LOG_MODE_IMMEDIATE && NO_OPTIMIZATIONS
+	default 1024
+
+config THREAD_ANALYZER_AUTO_THREAD_PRIORITY_OVERRIDE
+	bool "Override default thread analysis thread priority"
+	help
+	  Option to change the default value of thread analysis thread priority.
+
+if THREAD_ANALYZER_AUTO_THREAD_PRIORITY_OVERRIDE
+config THREAD_ANALYZER_AUTO_THREAD_PRIORITY
+	int "Thread analysis thread priority"
+	default 0
+	help
+	  Set thread priority of the thread analysis
+endif # THREAD_ANALYZER_AUTO_THREAD_PRIORITY_OVERRIDE
+
+endif # THREAD_ANALYZER_AUTO
+
+endif # THREAD_ANALYZER
diff --git a/subsys/debug/thread_analyzer.c b/subsys/debug/thread_analyzer/thread_analyzer.c
similarity index 95%
rename from subsys/debug/thread_analyzer.c
rename to subsys/debug/thread_analyzer/thread_analyzer.c
index 2839977639427..a35d9a386c413 100644
--- a/subsys/debug/thread_analyzer.c
+++ b/subsys/debug/thread_analyzer/thread_analyzer.c
@@ -9,15 +9,23 @@
  */
 
 #include <zephyr/kernel.h>
+/* For z_stack_space_get() */
 #include <kernel_internal.h>
 #include <zephyr/debug/thread_analyzer.h>
 #include <zephyr/debug/stack.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
+#include <zephyr/init.h>
 
 LOG_MODULE_REGISTER(thread_analyzer, CONFIG_THREAD_ANALYZER_LOG_LEVEL);
 
+#if CONFIG_THREAD_ANALYZER_AUTO_THREAD_PRIORITY_OVERRIDE
+#define AUTO_THREAD_PRIO CONFIG_THREAD_ANALYZER_AUTO_THREAD_PRIORITY
+#else
+#define AUTO_THREAD_PRIO K_LOWEST_APPLICATION_THREAD_PRIO
+#endif
+
 #if defined(CONFIG_THREAD_ANALYZER_USE_PRINTK)
 #define THREAD_ANALYZER_PRINT(...) printk(__VA_ARGS__)
 #define THREAD_ANALYZER_FMT(str)   str "\n"
@@ -106,8 +114,6 @@ static void thread_analyze_cb(const struct k_thread *cthread, void *user_data)
 	int err;
 	int ret;
 
-
-
 	name = k_thread_name_get((k_tid_t)thread);
 	if (!name || name[0] == '\0') {
 		name = hexname;
@@ -264,8 +270,8 @@ static int thread_analyzer_init(void)
 		tid = k_thread_create(&analyzer_thread[i], analyzer_thread_stacks[i],
 				      CONFIG_THREAD_ANALYZER_AUTO_STACK_SIZE,
 				      thread_analyzer_auto,
-				      (void *) (uint32_t) i, NULL, NULL,
-				      K_LOWEST_APPLICATION_THREAD_PRIO, 0, K_FOREVER);
+				      (void *) (uintptr_t) i, NULL, NULL,
+				      AUTO_THREAD_PRIO, 0, K_FOREVER);
 		if (!tid) {
 			LOG_ERR("k_thread_create() failed for core %u", i);
 			continue;
@@ -297,7 +303,7 @@ K_THREAD_DEFINE(thread_analyzer,
 		CONFIG_THREAD_ANALYZER_AUTO_STACK_SIZE,
 		thread_analyzer_auto,
 		NULL, NULL, NULL,
-		K_LOWEST_APPLICATION_THREAD_PRIO,
+		AUTO_THREAD_PRIO,
 		0, 0);
 
 #endif /* CONFIG_THREAD_ANALYZER_AUTO_SEPARATE_CORES */
diff --git a/subsys/fb/Kconfig b/subsys/fb/Kconfig
index 00be2ab08c088..6e4cf8b668a69 100644
--- a/subsys/fb/Kconfig
+++ b/subsys/fb/Kconfig
@@ -23,14 +23,6 @@ config CHARACTER_FRAMEBUFFER_SHELL
 	  Activate shell module that provides Framebuffer commands to the
 	  console.
 
-config CHARACTER_FRAMEBUFFER_SHELL_DRIVER_NAME
-	string
-	default "SSD16XX" if SSD16XX
-	default "SSD1306" if SSD1306
-	depends on CHARACTER_FRAMEBUFFER_SHELL
-	help
-	  Character Framebuffer Display Driver Name
-
 module = CFB
 module-str = cfb
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/fb/cfb.c b/subsys/fb/cfb.c
index c87a33c1b07b0..24cb8d3cc8d5b 100644
--- a/subsys/fb/cfb.c
+++ b/subsys/fb/cfb.c
@@ -75,10 +75,14 @@ static inline uint8_t *get_glyph_ptr(const struct cfb_font *fptr, uint8_t c)
 }
 
 static inline uint8_t get_glyph_byte(uint8_t *glyph_ptr, const struct cfb_font *fptr,
-				     uint8_t x, uint8_t y)
+				     uint8_t x, uint8_t y, bool vtiled)
 {
 	if (fptr->caps & CFB_FONT_MONO_VPACKED) {
-		return glyph_ptr[x * (fptr->height / 8U) + y];
+		if (vtiled) {
+			return glyph_ptr[x * (fptr->height / 8U) + y];
+		} else {
+			return glyph_ptr[(x * fptr->height + y) / 8];
+		}
 	} else if (fptr->caps & CFB_FONT_MONO_HPACKED) {
 		return glyph_ptr[y * (fptr->width) + x];
 	}
@@ -140,10 +144,11 @@ static uint8_t draw_char_vtmono(const struct char_framebuffer *fb,
 				 * So, we process assume that nothing is drawn above.
 				 */
 				byte = 0;
-				next_byte = get_glyph_byte(glyph_ptr, fptr, g_x, g_y / 8);
+				next_byte = get_glyph_byte(glyph_ptr, fptr, g_x, g_y / 8, true);
 			} else {
-				byte = get_glyph_byte(glyph_ptr, fptr, g_x, g_y / 8);
-				next_byte = get_glyph_byte(glyph_ptr, fptr, g_x, (g_y + 8) / 8);
+				byte = get_glyph_byte(glyph_ptr, fptr, g_x, g_y / 8, true);
+				next_byte =
+					get_glyph_byte(glyph_ptr, fptr, g_x, (g_y + 8) / 8, true);
 			}
 
 			if (font_is_msbfirst) {
@@ -209,6 +214,62 @@ static uint8_t draw_char_vtmono(const struct char_framebuffer *fb,
 	return fptr->width;
 }
 
+/*
+ * Draw the monochrome character in the monochrome tiled framebuffer,
+ * a byte is interpreted as 8 pixels ordered horizontally among each other.
+ */
+static uint8_t draw_char_htmono(const struct char_framebuffer *fb,
+				uint8_t c, uint16_t x, uint16_t y,
+				bool draw_bg)
+{
+	const struct cfb_font *fptr = &(fb->fonts[fb->font_idx]);
+	const bool font_is_msbfirst = (fptr->caps & CFB_FONT_MSB_FIRST) != 0;
+	const bool display_is_msbfirst = (fb->screen_info & SCREEN_INFO_MONO_MSB_FIRST) != 0;
+	uint8_t *glyph_ptr;
+
+	if (c < fptr->first_char || c > fptr->last_char) {
+		c = ' ';
+	}
+
+	glyph_ptr = get_glyph_ptr(fptr, c);
+	if (!glyph_ptr) {
+		return 0;
+	}
+
+	for (size_t g_y = 0; g_y < fptr->height; g_y++) {
+		const int16_t fb_y = y + g_y;
+
+		for (size_t g_x = 0; g_x < fptr->width; g_x++) {
+			const int16_t fb_x = x + g_x;
+			const size_t fb_pixel_index = fb_y * fb->x_res + fb_x;
+			const size_t fb_byte_index = fb_pixel_index / 8;
+			uint8_t byte;
+			uint8_t pixel_value;
+
+			if (fb_x < 0 || fb->x_res <= fb_x || fb_y < 0 || fb->y_res <= fb_y) {
+				g_y++;
+				continue;
+			}
+
+			byte = get_glyph_byte(glyph_ptr, fptr, g_x, g_y, false);
+			if (font_is_msbfirst) {
+				byte = byte_reverse(byte);
+			}
+			pixel_value = byte & BIT(g_y % 8);
+
+			if (pixel_value) {
+				if (display_is_msbfirst) {
+					fb->buf[fb_byte_index] |= BIT(7 - (fb_x % 8));
+				} else {
+					fb->buf[fb_byte_index] |= BIT(fb_x % 8);
+				}
+			}
+		}
+	}
+
+	return fptr->width;
+}
+
 static inline void draw_point(struct char_framebuffer *fb, int16_t x, int16_t y)
 {
 	const bool need_reverse = ((fb->screen_info & SCREEN_INFO_MONO_MSB_FIRST) != 0);
@@ -277,21 +338,20 @@ static int draw_text(const struct device *dev, const char *const str, int16_t x,
 		return -EINVAL;
 	}
 
-	if ((fb->screen_info & SCREEN_INFO_MONO_VTILED)) {
-		const size_t len = strlen(str);
+	const size_t len = strlen(str);
 
-		for (size_t i = 0; i < len; i++) {
-			if ((x + fptr->width > fb->x_res) && wrap) {
-				x = 0U;
-				y += fptr->height;
-			}
+	for (size_t i = 0; i < len; i++) {
+		if ((x + fptr->width > fb->x_res) && wrap) {
+			x = 0U;
+			y += fptr->height;
+		}
+		if (fb->screen_info & SCREEN_INFO_MONO_VTILED) {
 			x += fb->kerning + draw_char_vtmono(fb, str[i], x, y, wrap);
+		} else {
+			x += fb->kerning + draw_char_htmono(fb, str[i], x, y, wrap);
 		}
-		return 0;
 	}
-
-	LOG_ERR("Unsupported framebuffer configuration");
-	return -EINVAL;
+	return 0;
 }
 
 int cfb_draw_point(const struct device *dev, const struct cfb_position *pos)
@@ -477,7 +537,7 @@ int cfb_framebuffer_finalize(const struct device *dev)
 		.pitch = fb->x_res,
 	};
 
-	if (!(fb->pixel_format & PIXEL_FORMAT_MONO10) != !(fb->inverted)) {
+	if ((fb->pixel_format == PIXEL_FORMAT_MONO10) == fb->inverted) {
 		cfb_invert(fb);
 		err = api->write(dev, 0, 0, &desc, fb->buf);
 		cfb_invert(fb);
@@ -493,7 +553,7 @@ int cfb_get_display_parameter(const struct device *dev,
 	const struct char_framebuffer *fb = &char_fb;
 
 	switch (param) {
-	case CFB_DISPLAY_HEIGH:
+	case CFB_DISPLAY_HEIGHT:
 		return fb->y_res;
 	case CFB_DISPLAY_WIDTH:
 		return fb->x_res;
diff --git a/subsys/fb/cfb_shell.c b/subsys/fb/cfb_shell.c
index 571c4dc3c582b..7d63c10b89398 100644
--- a/subsys/fb/cfb_shell.c
+++ b/subsys/fb/cfb_shell.c
@@ -18,7 +18,7 @@
 #define HELP_NONE "[none]"
 #define HELP_INIT "call \"cfb init\" first"
 #define HELP_PRINT "<col: pos> <row: pos> \"<text>\""
-#define HELP_DRAW_POINT "<x> <y0>"
+#define HELP_DRAW_POINT "<x> <y>"
 #define HELP_DRAW_LINE "<x0> <y0> <x1> <y1>"
 #define HELP_DRAW_RECT "<x0> <y0> <x1> <y1>"
 #define HELP_INVERT "[<x> <y> <width> <height>]"
@@ -282,7 +282,7 @@ static int cmd_set_font(const struct shell *sh, size_t argc, char *argv[])
 		return err;
 	}
 
-	shell_print(sh, "Font idx=%d height=%d widht=%d set", idx, height,
+	shell_print(sh, "Font idx=%d height=%d width=%d set", idx, height,
 		    width);
 
 	return err;
@@ -396,8 +396,8 @@ static int cmd_get_param_height(const struct shell *sh, size_t argc,
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
 
-	shell_print(sh, "param: %s=%d", param_name[CFB_DISPLAY_HEIGH],
-		    cfb_get_display_parameter(dev, CFB_DISPLAY_HEIGH));
+	shell_print(sh, "param: %s=%d", param_name[CFB_DISPLAY_HEIGHT],
+		    cfb_get_display_parameter(dev, CFB_DISPLAY_HEIGHT));
 
 	return 0;
 }
diff --git a/subsys/fs/CMakeLists.txt b/subsys/fs/CMakeLists.txt
index 15f97649a13d5..48df605ae013a 100644
--- a/subsys/fs/CMakeLists.txt
+++ b/subsys/fs/CMakeLists.txt
@@ -36,9 +36,12 @@ if(CONFIG_FUSE_FS_ACCESS)
   zephyr_include_directories(${FUSE_INCLUDE_DIRS})
   if (CONFIG_NATIVE_LIBRARY)
     target_link_options(native_simulator INTERFACE "-l${FUSE_LIBRARIES}")
+    target_sources(native_simulator INTERFACE fuse_fs_access_bottom.c)
+    target_compile_options(native_simulator INTERFACE "-D_FILE_OFFSET_BITS=64")
   else()
     zephyr_link_libraries(${FUSE_LIBRARIES})
+    zephyr_library_sources(fuse_fs_access_bottom.c)
+    zephyr_library_compile_definitions(_FILE_OFFSET_BITS=64)
   endif()
-  zephyr_library_compile_definitions(_FILE_OFFSET_BITS=64)
   zephyr_library_sources(fuse_fs_access.c)
 endif()
diff --git a/subsys/fs/Kconfig b/subsys/fs/Kconfig
index bf6933f13aa26..4dde4b27100d9 100644
--- a/subsys/fs/Kconfig
+++ b/subsys/fs/Kconfig
@@ -95,6 +95,7 @@ config FILE_SYSTEM_MKFS
 config FUSE_FS_ACCESS
 	bool "FUSE based access to file system partitions"
 	depends on ARCH_POSIX
+	select NATIVE_USE_NSI_ERRNO
 	help
 	  Expose file system partitions to the host system through FUSE.
 
diff --git a/subsys/fs/Kconfig.fatfs b/subsys/fs/Kconfig.fatfs
index e91cd71c7dd73..ee0ec6ab4f20d 100644
--- a/subsys/fs/Kconfig.fatfs
+++ b/subsys/fs/Kconfig.fatfs
@@ -277,6 +277,36 @@ config FS_FATFS_MULTI_PARTITION
 	  physical drive number and only an FAT volume found on the physical drive
 	  will be mounted.
 
+config FS_FATFS_CUSTOM_MOUNT_POINT_COUNT
+	int "Count of custom mount points"
+	default 0
+	range 0 10
+	help
+	  This option has to be used in combination with FS_FATFS_CUSTOM_MOUNT_POINTS.
+	  It specifies how many custom mount points are defined in the custom mount
+	  point string.
+
+config FS_FATFS_CUSTOM_MOUNT_POINTS
+	string "Support for custom mountpoints when using fatfs"
+	help
+	   This option allows to specify custom mount points where fatfs filesystems
+	   can be mounted. The option has to be defined as a comma separated list
+	   with no whitespaces and no trailing commas.
+	   Example: "RAM,SD,SD2,NAND".
+	   It is also necessary to define the count of mount points specified in the
+	   list with the option FS_FATFS_CUSTOM_MOUNT_POINT_COUNT.
+	   If this option is active no mount points not defined within the list can
+	   be used for mounting fatfs filesystems anymore.
+	depends on FS_FATFS_CUSTOM_MOUNT_POINT_COUNT > 0
+
+DT_COMPAT_ZEPHYR_FSTAB_FATFS := zephyr,fstab,fatfs
+config FS_FATFS_FSTAB_AUTOMOUNT
+	bool "Support for fstab auto-mounting"
+	depends on $(dt_compat_enabled,$(DT_COMPAT_ZEPHYR_FSTAB_FATFS))
+	help
+	  This option enables fatfs support for the devicetree fstab auto-mounting
+	  functionality.
+
 endmenu
 
 endif # FAT_FILESYSTEM_ELM
diff --git a/subsys/fs/fat_fs.c b/subsys/fs/fat_fs.c
index 20367a811a3d0..016c23ac9cbbd 100644
--- a/subsys/fs/fat_fs.c
+++ b/subsys/fs/fat_fs.c
@@ -557,10 +557,82 @@ static const struct fs_file_system_t fatfs_fs = {
 #endif
 };
 
+#define DT_DRV_COMPAT zephyr_fstab_fatfs
+
+#define DEFINE_FS(inst)                                                                            \
+	BUILD_ASSERT(DT_INST_PROP(inst, disk_access), "FATFS needs disk-access");                  \
+	BUILD_ASSERT(!DT_INST_PROP(inst, read_only),                                               \
+		     "READ_ONLY not supported for individual instances see FS_FATFS_READ_ONLY");   \
+	BUILD_ASSERT(!DT_INST_PROP(inst, no_format),                                               \
+		     "NO_FORMAT not supported for individual instanzes FS_FATFS_MKFS");            \
+	static FATFS fs_data_##inst;                                                               \
+	struct fs_mount_t FS_FSTAB_ENTRY(DT_DRV_INST(inst)) = {                                    \
+		.type = FS_FATFS,                                                                  \
+		.mnt_point = DT_INST_PROP(inst, mount_point),                                      \
+		.fs_data = &fs_data_##inst,                                                        \
+		.storage_dev = NULL,                                                               \
+		.flags = FSTAB_ENTRY_DT_MOUNT_FLAGS(DT_DRV_INST(inst)),                            \
+	};
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_FS);
+
+#ifdef CONFIG_FS_FATFS_FSTAB_AUTOMOUNT
+#define REFERENCE_MOUNT(inst) (&FS_FSTAB_ENTRY(DT_DRV_INST(inst))),
+
+static void automount_if_enabled(struct fs_mount_t *mountp)
+{
+	int ret = 0;
+
+	if ((mountp->flags & FS_MOUNT_FLAG_AUTOMOUNT) != 0) {
+		ret = fs_mount(mountp);
+		if (ret < 0) {
+			LOG_ERR("Error mounting filesystem: at %s: %d", mountp->mnt_point, ret);
+		} else {
+			LOG_DBG("FATFS Filesystem \"%s\" initialized", mountp->mnt_point);
+		}
+	}
+}
+#endif /* CONFIG_FS_FATFS_FSTAB_AUTOMOUNT */
+
+#if CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT
+const char *VolumeStr[CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT];
+#endif /* CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT */
+
 static int fatfs_init(void)
 {
+#if CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT
+	static char mount_points[] = CONFIG_FS_FATFS_CUSTOM_MOUNT_POINTS;
+	int mount_point_count = 0;
+
+	VolumeStr[0] = mount_points;
+	for (int i = 0; i < ARRAY_SIZE(mount_points) - 1; i++) {
+		if (mount_points[i] == ',') {
+			mount_points[i] = 0;
+			mount_point_count++;
+			if (mount_point_count >= ARRAY_SIZE(VolumeStr)) {
+				LOG_ERR("Mount point count not sufficient for defined mount "
+					"points.");
+				return -1;
+			}
+			VolumeStr[mount_point_count] = &mount_points[i + 1];
+		}
+	}
+#endif /* CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT */
+	int rc = fs_register(FS_FATFS, &fatfs_fs);
+
+#ifdef CONFIG_FS_FATFS_FSTAB_AUTOMOUNT
+	if (rc == 0) {
+		struct fs_mount_t *partitions[] = {DT_INST_FOREACH_STATUS_OKAY(REFERENCE_MOUNT)};
+
+		for (size_t i = 0; i < ARRAY_SIZE(partitions); i++) {
+			struct fs_mount_t *mpi = partitions[i];
+
+			automount_if_enabled(mpi);
+		}
+	}
+#endif /* CONFIG_FS_FATFS_FSTAB_AUTOMOUNT */
 
-	return fs_register(FS_FATFS, &fatfs_fs);
+	return rc;
 }
 
 SYS_INIT(fatfs_init, POST_KERNEL, CONFIG_FILE_SYSTEM_INIT_PRIORITY);
diff --git a/subsys/fs/fs.c b/subsys/fs/fs.c
index d9117f6d08546..5df0c13236b3d 100644
--- a/subsys/fs/fs.c
+++ b/subsys/fs/fs.c
@@ -16,10 +16,8 @@
 #include <zephyr/fs/fs_sys.h>
 #include <zephyr/sys/check.h>
 
-
-#define LOG_LEVEL CONFIG_FS_LOG_LEVEL
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(fs);
+LOG_MODULE_REGISTER(fs, CONFIG_FS_LOG_LEVEL);
 
 /* list of mounted file systems */
 static sys_dlist_t fs_mnt_list = SYS_DLIST_STATIC_INIT(&fs_mnt_list);
diff --git a/subsys/fs/fuse_fs_access.c b/subsys/fs/fuse_fs_access.c
index 9ecc2eddb4b11..e4c26511c6464 100644
--- a/subsys/fs/fuse_fs_access.c
+++ b/subsys/fs/fuse_fs_access.c
@@ -1,46 +1,24 @@
 /*
  * Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define FUSE_USE_VERSION 26
-
-#undef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 700
-
-#include <fuse.h>
-#include <libgen.h>
-#include <linux/limits.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
 #include <zephyr/kernel.h>
 #include <zephyr/fs/fs.h>
+#include <nsi_errno.h>
 
 #include "cmdline.h"
 #include "soc.h"
 
-#define S_IRWX_DIR (0775)
-#define S_IRW_FILE (0664)
+#include "fuse_fs_access_bottom.h"
 
 #define NUMBER_OF_OPEN_FILES 128
-#define INVALID_FILE_HANDLE (NUMBER_OF_OPEN_FILES + 1)
-
-#define DIR_END '\0'
 
 static struct fs_file_t files[NUMBER_OF_OPEN_FILES];
 static uint8_t file_handles[NUMBER_OF_OPEN_FILES];
 
-static pthread_t fuse_thread;
-
 static const char default_fuse_mountpoint[] = "flash";
 
 static const char *fuse_mountpoint;
@@ -66,427 +44,221 @@ static void release_file_handle(size_t handle)
 	}
 }
 
-static bool is_mount_point(const char *path)
-{
-	char dir_path[PATH_MAX];
-	size_t len;
-
-	len = strlen(path);
-	if (len >=  sizeof(dir_path)) {
-		return false;
-	}
-
-	memcpy(dir_path, path, len);
-	dir_path[len] = '\0';
-	return strcmp(dirname(dir_path), "/") == 0;
-}
-
-static int fuse_fs_access_getattr(const char *path, struct stat *stat)
+static int ffa_stat_top(const char *path, struct ffa_dirent *entry_bottom)
 {
 	struct fs_dirent entry;
 	int err;
 
-	stat->st_dev = 0;
-	stat->st_ino = 0;
-	stat->st_nlink = 0;
-	stat->st_uid = getuid();
-	stat->st_gid = getgid();
-	stat->st_rdev = 0;
-	stat->st_blksize = 0;
-	stat->st_blocks = 0;
-	stat->st_atime = 0;
-	stat->st_mtime = 0;
-	stat->st_ctime = 0;
-
-	if ((strcmp(path, "/") == 0) || is_mount_point(path)) {
-		if (strstr(path, "/.") != NULL) {
-			return -ENOENT;
-		}
-		stat->st_mode = S_IFDIR | S_IRWX_DIR;
-		stat->st_size = 0;
-		return 0;
-	}
-
 	err = fs_stat(path, &entry);
+
 	if (err != 0) {
-		return err;
+		return nsi_errno_to_mid(-err);
 	}
 
+	entry_bottom->size = entry.size;
+
 	if (entry.type == FS_DIR_ENTRY_DIR) {
-		stat->st_mode = S_IFDIR | S_IRWX_DIR;
-		stat->st_size = 0;
+		entry_bottom->is_directory = true;
 	} else {
-		stat->st_mode = S_IFREG | S_IRW_FILE;
-		stat->st_size = entry.size;
+		entry_bottom->is_directory = false;
 	}
 
 	return 0;
 }
 
-static int fuse_fs_access_readmount(void *buf, fuse_fill_dir_t filler)
+static int ffa_readmount_top(int *mnt_nbr, const char **mnt_name)
 {
-	int mnt_nbr = 0;
-	const char *mnt_name;
-	struct stat stat;
-	int err;
+	int err = fs_readmount(mnt_nbr, mnt_name);
 
-	stat.st_dev = 0;
-	stat.st_ino = 0;
-	stat.st_nlink = 0;
-	stat.st_uid = getuid();
-	stat.st_gid = getgid();
-	stat.st_rdev = 0;
-	stat.st_atime = 0;
-	stat.st_mtime = 0;
-	stat.st_ctime = 0;
-	stat.st_mode = S_IFDIR | S_IRWX_DIR;
-	stat.st_size = 0;
-	stat.st_blksize = 0;
-	stat.st_blocks = 0;
-
-	filler(buf, ".", &stat, 0);
-	filler(buf, "..", NULL, 0);
-
-	do {
-		err = fs_readmount(&mnt_nbr, &mnt_name);
-		if (err < 0) {
-			break;
-		}
+	return nsi_errno_to_mid(-err);
+}
 
-		filler(buf, &mnt_name[1], &stat, 0);
+/* Status shared between readdir_* calls */
+static struct {
+	struct fs_dir_t dir;
+	struct fs_dirent entry;
+} readdir_status;
 
-	} while (true);
+static int ffa_readdir_start(const char *path)
+{
+	int err;
 
-	if (err == -ENOENT) {
-		err = 0;
-	}
+	fs_dir_t_init(&readdir_status.dir);
+	err = fs_opendir(&readdir_status.dir, path);
 
-	return err;
+	return nsi_errno_to_mid(-err);
 }
 
-static int fuse_fs_access_readdir(const char *path, void *buf,
-			      fuse_fill_dir_t filler, off_t off,
-			      struct fuse_file_info *fi)
+static int ffa_readdir_read_next(struct ffa_dirent *entry_bottom)
 {
-	struct fs_dir_t dir;
-	struct fs_dirent entry;
 	int err;
-	struct stat stat;
 
-	ARG_UNUSED(off);
-	ARG_UNUSED(fi);
+	err = fs_readdir(&readdir_status.dir, &readdir_status.entry);
 
-	if (strcmp(path, "/") == 0) {
-		return fuse_fs_access_readmount(buf, filler);
+	if (err) {
+		return nsi_errno_to_mid(-err);
 	}
+	entry_bottom->name = readdir_status.entry.name;
+	entry_bottom->size = readdir_status.entry.size;
 
-	fs_dir_t_init(&dir);
-
-	if (is_mount_point(path)) {
-		/* File system API expects trailing slash for a mount point
-		 * directory but FUSE strips the trailing slashes from
-		 * directory names so add it back.
-		 */
-		char mount_path[PATH_MAX] = {0};
-		size_t len = strlen(path);
-
-		if (len >= (PATH_MAX - 2)) {
-			return -ENOMEM;
-		}
-
-		memcpy(mount_path, path, len);
-		mount_path[len] = '/';
-		err = fs_opendir(&dir, mount_path);
+	if (readdir_status.entry.type == FS_DIR_ENTRY_DIR) {
+		entry_bottom->is_directory = true;
 	} else {
-		err = fs_opendir(&dir, path);
+		entry_bottom->is_directory = false;
 	}
 
-	if (err) {
-		return -ENOEXEC;
-	}
-
-	stat.st_dev = 0;
-	stat.st_ino = 0;
-	stat.st_nlink = 0;
-	stat.st_uid = getuid();
-	stat.st_gid = getgid();
-	stat.st_rdev = 0;
-	stat.st_atime = 0;
-	stat.st_mtime = 0;
-	stat.st_ctime = 0;
-	stat.st_mode = S_IFDIR | S_IRWX_DIR;
-	stat.st_size = 0;
-	stat.st_blksize = 0;
-	stat.st_blocks = 0;
-
-	filler(buf, ".", &stat, 0);
-	filler(buf, "..", &stat, 0);
-
-	do {
-		err = fs_readdir(&dir, &entry);
-		if (err) {
-			break;
-		}
-
-		if (entry.name[0] == DIR_END) {
-			break;
-		}
-
-		if (entry.type == FS_DIR_ENTRY_DIR) {
-			stat.st_mode = S_IFDIR | S_IRWX_DIR;
-			stat.st_size = 0;
-		} else {
-			stat.st_mode = S_IFREG | S_IRW_FILE;
-			stat.st_size = entry.size;
-		}
-
-		if (filler(buf, entry.name, &stat, 0)) {
-			break;
-		}
-
-	} while (1);
-
-	fs_closedir(&dir);
-
-	return err;
+	return 0;
+}
 
+static void ffa_readdir_end(void)
+{
+	(void)fs_closedir(&readdir_status.dir);
 }
 
-static int fuse_fs_access_create(const char *path, mode_t mode,
-			     struct fuse_file_info *fi)
+static int ffa_create_top(const char *path, uint64_t *fh)
 {
 	int err;
 	ssize_t handle;
 
-	ARG_UNUSED(mode);
-
-	if (is_mount_point(path)) {
-		return -ENOENT;
-	}
-
 	handle = get_new_file_handle();
 	if (handle < 0) {
-		return handle;
+		return nsi_errno_to_mid(-handle);
 	}
 
-	fi->fh = handle;
+	*fh = handle;
 
 	err = fs_open(&files[handle], path, FS_O_CREATE | FS_O_WRITE);
 	if (err != 0) {
 		release_file_handle(handle);
-		fi->fh = INVALID_FILE_HANDLE;
-		return err;
+		*fh = INVALID_FILE_HANDLE;
+		return nsi_errno_to_mid(-err);
 	}
 
 	return 0;
 }
 
-static int fuse_fs_access_open(const char *path, struct fuse_file_info *fi)
-{
-	return fuse_fs_access_create(path, 0, fi);
-}
-
-static int fuse_fs_access_release(const char *path, struct fuse_file_info *fi)
+static int ffa_release_top(uint64_t fh)
 {
-	ARG_UNUSED(path);
-
-	if (fi->fh == INVALID_FILE_HANDLE) {
-		return -EINVAL;
-	}
-
-	fs_close(&files[fi->fh]);
+	fs_close(&files[fh]);
 
-	release_file_handle(fi->fh);
+	release_file_handle(fh);
 
 	return 0;
 }
 
-static int fuse_fs_access_read(const char *path, char *buf, size_t size,
-		off_t off, struct fuse_file_info *fi)
+static int ffa_read_top(uint64_t fh, char *buf, size_t size, off_t off)
 {
 	int err;
 
-	ARG_UNUSED(path);
+	err = fs_seek(&files[fh], off, FS_SEEK_SET);
 
-	if (fi->fh == INVALID_FILE_HANDLE) {
-		return -EINVAL;
+	if (err == 0) {
+		err = fs_read(&files[fh], buf, size);
 	}
 
-	err = fs_seek(&files[fi->fh], off, FS_SEEK_SET);
-	if (err != 0) {
-		return err;
-	}
-
-	err = fs_read(&files[fi->fh], buf, size);
-
-	return err;
+	return nsi_errno_to_mid(-err);
 }
 
-static int fuse_fs_access_write(const char *path, const char *buf, size_t size,
-		off_t off, struct fuse_file_info *fi)
+static int ffa_write_top(uint64_t fh, const char *buf, size_t size, off_t off)
 {
 	int err;
 
-	ARG_UNUSED(path);
+	err = fs_seek(&files[fh], off, FS_SEEK_SET);
 
-	if (fi->fh == INVALID_FILE_HANDLE) {
-		return -EINVAL;
+	if (err == 0) {
+		err = fs_write(&files[fh], buf, size);
 	}
 
-	err = fs_seek(&files[fi->fh], off, FS_SEEK_SET);
-	if (err != 0) {
-		return err;
-	}
-
-	err = fs_write(&files[fi->fh], buf, size);
-
-	return err;
+	return nsi_errno_to_mid(-err);
 }
 
-static int fuse_fs_access_ftruncate(const char *path, off_t size,
-				struct fuse_file_info *fi)
+static int ffa_ftruncate_top(uint64_t fh, off_t size)
 {
-	int err;
-
-	ARG_UNUSED(path);
-
-	if (fi->fh == INVALID_FILE_HANDLE) {
-		return -EINVAL;
-	}
+	int err = fs_truncate(&files[fh], size);
 
-	err = fs_truncate(&files[fi->fh], size);
-
-	return err;
+	return nsi_errno_to_mid(-err);
 }
 
-static int fuse_fs_access_truncate(const char *path, off_t size)
+static int ffa_truncate_top(const char *path, off_t size)
 {
 	int err;
 	static struct fs_file_t file;
 
 	err = fs_open(&file, path, FS_O_CREATE | FS_O_WRITE);
 	if (err != 0) {
-		return err;
+		return nsi_errno_to_mid(-err);
 	}
 
 	err = fs_truncate(&file, size);
 	if (err != 0) {
 		fs_close(&file);
-		return err;
+	} else {
+		err = fs_close(&file);
 	}
 
-	err = fs_close(&file);
-
-	return err;
-}
-
-static int fuse_fs_access_mkdir(const char *path, mode_t mode)
-{
-	ARG_UNUSED(mode);
-
-	return fs_mkdir(path);
+	return nsi_errno_to_mid(-err);
 }
 
-static int fuse_fs_access_rmdir(const char *path)
+static int ffa_mkdir_top(const char *path)
 {
-	return fs_unlink(path);
-}
+	int err = fs_mkdir(path);
 
-static int fuse_fs_access_unlink(const char *path)
-{
-	return fs_unlink(path);
-}
-
-static int fuse_fs_access_statfs(const char *path, struct statvfs *buf)
-{
-	ARG_UNUSED(path);
-	ARG_UNUSED(buf);
-	return 0;
+	return nsi_errno_to_mid(-err);
 }
 
-static int fuse_fs_access_utimens(const char *path, const struct timespec tv[2])
+static int ffa_unlink_top(const char *path)
 {
-	/* dummy */
-	ARG_UNUSED(path);
-	ARG_UNUSED(tv);
+	int err = fs_unlink(path);
 
-	return 0;
+	return nsi_errno_to_mid(-err);
 }
 
-
-static struct fuse_operations fuse_fs_access_oper = {
-	.getattr = fuse_fs_access_getattr,
-	.readlink = NULL,
-	.getdir = NULL,
-	.mknod = NULL,
-	.mkdir = fuse_fs_access_mkdir,
-	.unlink = fuse_fs_access_unlink,
-	.rmdir = fuse_fs_access_rmdir,
-	.symlink = NULL,
-	.rename = NULL,
-	.link = NULL,
-	.chmod = NULL,
-	.chown = NULL,
-	.truncate = fuse_fs_access_truncate,
-	.utime = NULL,
-	.open = fuse_fs_access_open,
-	.read = fuse_fs_access_read,
-	.write = fuse_fs_access_write,
-	.statfs = fuse_fs_access_statfs,
-	.flush = NULL,
-	.release = fuse_fs_access_release,
-	.fsync = NULL,
-	.setxattr = NULL,
-	.getxattr = NULL,
-	.listxattr = NULL,
-	.removexattr = NULL,
-	.opendir  = NULL,
-	.readdir = fuse_fs_access_readdir,
-	.releasedir = NULL,
-	.fsyncdir = NULL,
-	.init = NULL,
-	.destroy = NULL,
-	.access = NULL,
-	.create = fuse_fs_access_create,
-	.ftruncate = fuse_fs_access_ftruncate,
-	.fgetattr = NULL,
-	.lock = NULL,
-	.utimens = fuse_fs_access_utimens,
-	.bmap = NULL,
-	.flag_nullpath_ok = 0,
-	.flag_nopath = 0,
-	.flag_utime_omit_ok = 0,
-	.flag_reserved = 0,
-	.ioctl = NULL,
-	.poll = NULL,
-	.write_buf = NULL,
-	.read_buf = NULL,
-	.flock = NULL,
-	.fallocate = NULL,
+struct ffa_op_callbacks op_callbacks = {
+	.readdir_start = ffa_readdir_start,
+	.readdir_read_next = ffa_readdir_read_next,
+	.readdir_end = ffa_readdir_end,
+	.stat = ffa_stat_top,
+	.readmount = ffa_readmount_top,
+	.mkdir = ffa_mkdir_top,
+	.create = ffa_create_top,
+	.release = ffa_release_top,
+	.read = ffa_read_top,
+	.write = ffa_write_top,
+	.ftruncate = ffa_ftruncate_top,
+	.truncate = ffa_truncate_top,
+	.unlink = ffa_unlink_top,
+	.rmdir = ffa_unlink_top,
 };
 
-static void *fuse_fs_access_main(void *arg)
+static void fuse_top_dispath_thread(void *arg1, void *arg2, void *arg3)
 {
-	ARG_UNUSED(arg);
-
-	char *argv[] = {
-		"",
-		"-f",
-		"-s",
-		(char *) fuse_mountpoint
-	};
-	int argc = ARRAY_SIZE(argv);
+	ARG_UNUSED(arg1);
+	ARG_UNUSED(arg2);
+	ARG_UNUSED(arg3);
 
-	posix_print_trace("Mounting flash at %s/\n", fuse_mountpoint);
-	fuse_main(argc, argv, &fuse_fs_access_oper, NULL);
+#define COOLDOWN_TIME 10
+	int cooldown_count = 0;
 
-	pthread_exit(0);
+	while (true) {
+		if (ffa_is_op_pended()) {
+			ffa_run_pending_op();
+			cooldown_count = COOLDOWN_TIME;
+		} else {
+			if (cooldown_count > 0) {
+				k_sleep(K_MSEC(1));
+				cooldown_count--;
+			} else {
+				k_sleep(K_MSEC(20));
+			}
+		}
+	}
 }
 
+K_THREAD_DEFINE(fuse_op_handler, CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE,
+		fuse_top_dispath_thread, NULL, NULL, NULL, 100, 0, 0);
+
 static void fuse_fs_access_init(void)
 {
-	int err;
-	struct stat st;
 	size_t i = 0;
 
 	while (i < ARRAY_SIZE(files)) {
@@ -498,44 +270,16 @@ static void fuse_fs_access_init(void)
 		fuse_mountpoint = default_fuse_mountpoint;
 	}
 
-	if (stat(fuse_mountpoint, &st) < 0) {
-		if (mkdir(fuse_mountpoint, 0700) < 0) {
-			posix_print_error_and_exit("Failed to create"
-				" directory for flash mount point (%s): %s\n",
-				fuse_mountpoint, strerror(errno));
-		}
-	} else if (!S_ISDIR(st.st_mode)) {
-		posix_print_error_and_exit("%s is not a directory\n",
-					   fuse_mountpoint);
-
-	}
-
-	err = pthread_create(&fuse_thread, NULL, fuse_fs_access_main, NULL);
-	if (err < 0) {
-		posix_print_error_and_exit(
-					"Failed to create thread for "
-					"fuse_fs_access_main\n");
-	}
+	ffsa_init_bottom(fuse_mountpoint, &op_callbacks);
 }
 
-static void fuse_fs_access_exit(void)
+static void fuse_fs_access_cleanup(void)
 {
-	char *full_cmd;
-	const char cmd[] = "fusermount -uz ";
-
 	if (fuse_mountpoint == NULL) {
 		return;
 	}
 
-	full_cmd = malloc(strlen(cmd) + strlen(fuse_mountpoint) + 1);
-
-	sprintf(full_cmd, "%s%s", cmd, fuse_mountpoint);
-	if (system(full_cmd) < -1) {
-		printf("Failed to unmount fuse mount point\n");
-	}
-	free(full_cmd);
-
-	pthread_join(fuse_thread, NULL);
+	ffsa_cleanup_bottom(fuse_mountpoint);
 }
 
 static void fuse_fs_access_options(void)
@@ -558,4 +302,4 @@ static void fuse_fs_access_options(void)
 
 NATIVE_TASK(fuse_fs_access_options, PRE_BOOT_1, 1);
 NATIVE_TASK(fuse_fs_access_init, PRE_BOOT_2, 1);
-NATIVE_TASK(fuse_fs_access_exit, ON_EXIT, 1);
+NATIVE_TASK(fuse_fs_access_cleanup, ON_EXIT, 1);
diff --git a/subsys/fs/fuse_fs_access_bottom.c b/subsys/fs/fuse_fs_access_bottom.c
new file mode 100644
index 0000000000000..e3d3cd8b96e53
--- /dev/null
+++ b/subsys/fs/fuse_fs_access_bottom.c
@@ -0,0 +1,642 @@
+/*
+ * Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define FUSE_USE_VERSION 26
+
+#undef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 700
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <fuse.h>
+#include <libgen.h>
+#include <linux/limits.h>
+#include <unistd.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <nsi_tracing.h>
+#include <nsi_utils.h>
+#include <nsi_errno.h>
+#include "fuse_fs_access_bottom.h"
+
+
+#define S_IRWX_DIR (0775)
+#define S_IRW_FILE (0664)
+
+#define DIR_END '\0'
+
+static pthread_t fuse_thread;
+static struct ffa_op_callbacks *op_callbacks;
+
+/* Pending operation the bottom/fuse thread is queuing into the Zephyr thread */
+struct {
+	int op;        /* One of OP_**/
+	void *args;    /* Pointer to arguments structure, one of op_args_* or a simple argument */
+	int ret;       /* Return from the operation */
+	bool pending;  /* Is there a pending operation */
+	sem_t op_done; /* semaphore to signal the job is done */
+} op_queue;
+
+#define OP_STAT              offsetof(struct ffa_op_callbacks, stat)
+#define OP_READMOUNT         offsetof(struct ffa_op_callbacks, readmount)
+#define OP_READDIR_START     offsetof(struct ffa_op_callbacks, readdir_start)
+#define OP_READDIR_READ_NEXT offsetof(struct ffa_op_callbacks, readdir_read_next)
+#define OP_READDIR_END       offsetof(struct ffa_op_callbacks, readdir_end)
+#define OP_MKDIR             offsetof(struct ffa_op_callbacks, mkdir)
+#define OP_CREATE            offsetof(struct ffa_op_callbacks, create)
+#define OP_RELEASE           offsetof(struct ffa_op_callbacks, release)
+#define OP_READ              offsetof(struct ffa_op_callbacks, read)
+#define OP_WRITE             offsetof(struct ffa_op_callbacks, write)
+#define OP_FTRUNCATE         offsetof(struct ffa_op_callbacks, ftruncate)
+#define OP_TRUNCATE          offsetof(struct ffa_op_callbacks, truncate)
+#define OP_UNLINK            offsetof(struct ffa_op_callbacks, unlink)
+#define OP_RMDIR             offsetof(struct ffa_op_callbacks, rmdir)
+
+struct op_args_truncate {
+	const char *path;
+	off_t size;
+};
+struct op_args_ftruncate {
+	uint64_t fh;
+	off_t size;
+};
+struct op_args_readwrite {
+	uint64_t fh;
+	char *buf;
+	off_t size;
+	off_t off;
+};
+struct op_args_create {
+	const char *path;
+	uint64_t *fh_p;
+};
+struct op_args_readmount {
+	int *mnt_nbr_p;
+	const char **mnt_name_p;
+};
+struct op_args_stat {
+	const char *path;
+	struct ffa_dirent *entry_p;
+};
+
+static inline int queue_op(int op, void *args)
+{
+	op_queue.op = op;
+	op_queue.args = args;
+	op_queue.pending = true;
+
+	sem_wait(&op_queue.op_done);
+
+	return op_queue.ret;
+}
+
+bool ffa_is_op_pended(void)
+{
+	return op_queue.pending;
+}
+
+void ffa_run_pending_op(void)
+{
+	switch ((intptr_t)op_queue.op) {
+	case OP_RMDIR:
+		op_queue.ret = op_callbacks->rmdir((const char *)op_queue.args);
+		break;
+	case OP_UNLINK:
+		op_queue.ret = op_callbacks->unlink((const char *)op_queue.args);
+		break;
+	case OP_TRUNCATE: {
+		struct op_args_truncate *args = op_queue.args;
+
+		op_queue.ret = op_callbacks->truncate(args->path, args->size);
+		break;
+	}
+	case OP_FTRUNCATE: {
+		struct op_args_ftruncate *args = op_queue.args;
+
+		op_queue.ret = op_callbacks->ftruncate(args->fh, args->size);
+		break;
+	}
+	case OP_WRITE: {
+		struct op_args_readwrite *args = op_queue.args;
+
+		op_queue.ret = op_callbacks->write(args->fh, args->buf, args->size, args->off);
+		break;
+	}
+	case OP_READ: {
+		struct op_args_readwrite *args = op_queue.args;
+
+		op_queue.ret = op_callbacks->read(args->fh, args->buf, args->size, args->off);
+		break;
+	}
+	case OP_RELEASE:
+		op_queue.ret = op_callbacks->release(*(uint64_t *)op_queue.args);
+		break;
+	case OP_CREATE: {
+		struct op_args_create *args = op_queue.args;
+
+		op_queue.ret = op_callbacks->create(args->path, args->fh_p);
+		break;
+	}
+	case OP_MKDIR:
+		op_queue.ret = op_callbacks->mkdir((const char *)op_queue.args);
+		break;
+	case OP_READDIR_END:
+		op_callbacks->readdir_end();
+		break;
+	case OP_READDIR_READ_NEXT:
+		op_queue.ret = op_callbacks->readdir_read_next((struct ffa_dirent *)op_queue.args);
+		break;
+	case OP_READDIR_START:
+		op_queue.ret = op_callbacks->readdir_start((const char *)op_queue.args);
+		break;
+	case OP_READMOUNT: {
+		struct op_args_readmount *args = op_queue.args;
+
+		op_queue.ret = op_callbacks->readmount(args->mnt_nbr_p, args->mnt_name_p);
+		break;
+	}
+	case OP_STAT: {
+		struct op_args_stat *args = op_queue.args;
+
+		op_queue.ret = op_callbacks->stat(args->path, args->entry_p);
+		break;
+	}
+	default:
+		nsi_print_error_and_exit("Programming error, unknown queued operation\n");
+		break;
+	}
+	op_queue.pending = false;
+	sem_post(&op_queue.op_done);
+}
+
+static bool is_mount_point(const char *path)
+{
+	char dir_path[PATH_MAX];
+	size_t len;
+
+	len = strlen(path);
+	if (len >= sizeof(dir_path)) {
+		return false;
+	}
+
+	memcpy(dir_path, path, len);
+	dir_path[len] = '\0';
+	return strcmp(dirname(dir_path), "/") == 0;
+}
+
+static int fuse_fs_access_getattr(const char *path, struct stat *st)
+{
+	struct ffa_dirent entry;
+	int err;
+
+	st->st_dev = 0;
+	st->st_ino = 0;
+	st->st_nlink = 0;
+	st->st_uid = getuid();
+	st->st_gid = getgid();
+	st->st_rdev = 0;
+	st->st_blksize = 0;
+	st->st_blocks = 0;
+	st->st_atime = 0;
+	st->st_mtime = 0;
+	st->st_ctime = 0;
+
+	if ((strcmp(path, "/") == 0) || is_mount_point(path)) {
+		if (strstr(path, "/.") != NULL) {
+			return -ENOENT;
+		}
+		st->st_mode = S_IFDIR | S_IRWX_DIR;
+		st->st_size = 0;
+		return 0;
+	}
+
+	struct op_args_stat args;
+
+	args.path = path;
+	args.entry_p = &entry;
+
+	err = queue_op(OP_STAT, (void *)&args);
+
+	if (err != 0) {
+		return -nsi_errno_from_mid(err);
+	}
+
+	if (entry.is_directory) {
+		st->st_mode = S_IFDIR | S_IRWX_DIR;
+		st->st_size = 0;
+	} else {
+		st->st_mode = S_IFREG | S_IRW_FILE;
+		st->st_size = entry.size;
+	}
+
+	return 0;
+}
+
+static int fuse_fs_access_readmount(void *buf, fuse_fill_dir_t filler)
+{
+	int mnt_nbr = 0;
+	const char *mnt_name;
+	struct stat st;
+	int err;
+
+	st.st_dev = 0;
+	st.st_ino = 0;
+	st.st_nlink = 0;
+	st.st_uid = getuid();
+	st.st_gid = getgid();
+	st.st_rdev = 0;
+	st.st_atime = 0;
+	st.st_mtime = 0;
+	st.st_ctime = 0;
+	st.st_mode = S_IFDIR | S_IRWX_DIR;
+	st.st_size = 0;
+	st.st_blksize = 0;
+	st.st_blocks = 0;
+
+	filler(buf, ".", &st, 0);
+	filler(buf, "..", NULL, 0);
+
+	do {
+		struct op_args_readmount args;
+
+		args.mnt_nbr_p = &mnt_nbr;
+		args.mnt_name_p = &mnt_name;
+
+		err = queue_op(OP_READMOUNT, (void *)&args);
+		err = -nsi_errno_from_mid(err);
+
+		if (err < 0) {
+			break;
+		}
+
+		filler(buf, &mnt_name[1], &st, 0);
+
+	} while (true);
+
+	if (err == -ENOENT) {
+		err = 0;
+	}
+
+	return err;
+}
+
+static int fuse_fs_access_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t off,
+				  struct fuse_file_info *fi)
+{
+	NSI_ARG_UNUSED(off);
+	NSI_ARG_UNUSED(fi);
+
+	struct ffa_dirent entry;
+	int err;
+	struct stat st;
+
+	if (strcmp(path, "/") == 0) {
+		err = fuse_fs_access_readmount(buf, filler);
+		return -nsi_errno_from_mid(err);
+	}
+
+	if (is_mount_point(path)) {
+		/* File system API expects trailing slash for a mount point
+		 * directory but FUSE strips the trailing slashes from
+		 * directory names so add it back.
+		 */
+		char mount_path[PATH_MAX] = {0};
+		size_t len = strlen(path);
+
+		if (len >= (PATH_MAX - 2)) {
+			return -ENOMEM;
+		}
+
+		memcpy(mount_path, path, len);
+		mount_path[len] = '/';
+		err = queue_op(OP_READDIR_START, (void *)mount_path);
+	} else {
+		err = queue_op(OP_READDIR_START, (void *)path);
+	}
+
+	if (err) {
+		return -ENOEXEC;
+	}
+
+	st.st_dev = 0;
+	st.st_ino = 0;
+	st.st_nlink = 0;
+	st.st_uid = getuid();
+	st.st_gid = getgid();
+	st.st_rdev = 0;
+	st.st_atime = 0;
+	st.st_mtime = 0;
+	st.st_ctime = 0;
+	st.st_mode = S_IFDIR | S_IRWX_DIR;
+	st.st_size = 0;
+	st.st_blksize = 0;
+	st.st_blocks = 0;
+
+	filler(buf, ".", &st, 0);
+	filler(buf, "..", &st, 0);
+
+	do {
+		err = queue_op(OP_READDIR_READ_NEXT, (void *)&entry);
+		if (err) {
+			break;
+		}
+
+		if (entry.name[0] == DIR_END) {
+			break;
+		}
+
+		if (entry.is_directory) {
+			st.st_mode = S_IFDIR | S_IRWX_DIR;
+			st.st_size = 0;
+		} else {
+			st.st_mode = S_IFREG | S_IRW_FILE;
+			st.st_size = entry.size;
+		}
+
+		if (filler(buf, entry.name, &st, 0)) {
+			break;
+		}
+	} while (1);
+
+	queue_op(OP_READDIR_END, NULL);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_mkdir(const char *path, mode_t mode)
+{
+	NSI_ARG_UNUSED(mode);
+
+	int err = queue_op(OP_MKDIR, (void *)path);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_create(const char *path, mode_t mode, struct fuse_file_info *fi)
+{
+	int err;
+	struct op_args_create args;
+
+	NSI_ARG_UNUSED(mode);
+
+	if (is_mount_point(path)) {
+		return -ENOENT;
+	}
+
+	args.path = path;
+	args.fh_p = &fi->fh;
+
+	err = queue_op(OP_CREATE, (void *)&args);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_open(const char *path, struct fuse_file_info *fi)
+{
+	int err = fuse_fs_access_create(path, 0, fi);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_release(const char *path, struct fuse_file_info *fi)
+{
+	NSI_ARG_UNUSED(path);
+
+	if (fi->fh == INVALID_FILE_HANDLE) {
+		return -EINVAL;
+	}
+
+	(void)queue_op(OP_RELEASE, (void *)&fi->fh);
+
+	return 0;
+}
+
+static int fuse_fs_access_read(const char *path, char *buf, size_t size, off_t off,
+			       struct fuse_file_info *fi)
+{
+	int err;
+	struct op_args_readwrite args;
+
+	NSI_ARG_UNUSED(path);
+
+	if (fi->fh == INVALID_FILE_HANDLE) {
+		return -EINVAL;
+	}
+
+	args.fh = fi->fh;
+	args.buf = buf;
+	args.size = size;
+	args.off = off;
+
+	err = queue_op(OP_READ, (void *)&args);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_write(const char *path, const char *buf, size_t size, off_t off,
+				struct fuse_file_info *fi)
+{
+	int err;
+	struct op_args_readwrite args;
+
+	NSI_ARG_UNUSED(path);
+
+	if (fi->fh == INVALID_FILE_HANDLE) {
+		return -EINVAL;
+	}
+
+	args.fh = fi->fh;
+	args.buf = (char *)buf;
+	args.size = size;
+	args.off = off;
+
+	err = queue_op(OP_WRITE, (void *)&args);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_ftruncate(const char *path, off_t size, struct fuse_file_info *fi)
+{
+	struct op_args_ftruncate args;
+	int err;
+
+	NSI_ARG_UNUSED(path);
+
+	if (fi->fh == INVALID_FILE_HANDLE) {
+		return -EINVAL;
+	}
+
+	args.fh = fi->fh;
+	args.size = size;
+
+	err = queue_op(OP_FTRUNCATE, (void *)&args);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_truncate(const char *path, off_t size)
+{
+	struct op_args_truncate args;
+	int err;
+
+	args.path = path;
+	args.size = size;
+
+	err = queue_op(OP_TRUNCATE, (void *)&args);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_rmdir(const char *path)
+{
+	int err = queue_op(OP_RMDIR, (void *)path);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_unlink(const char *path)
+{
+	int err = queue_op(OP_UNLINK, (void *)path);
+
+	return -nsi_errno_from_mid(err);
+}
+
+static int fuse_fs_access_statfs(const char *path, struct statvfs *buf)
+{
+	NSI_ARG_UNUSED(path);
+	NSI_ARG_UNUSED(buf);
+	return 0;
+}
+
+static int fuse_fs_access_utimens(const char *path, const struct timespec tv[2])
+{
+	/* dummy */
+	NSI_ARG_UNUSED(path);
+	NSI_ARG_UNUSED(tv);
+	return 0;
+}
+
+static struct fuse_operations fuse_fs_access_oper = {
+	.getattr = fuse_fs_access_getattr,
+	.readlink = NULL,
+	.getdir = NULL,
+	.mknod = NULL,
+	.mkdir = fuse_fs_access_mkdir,
+	.unlink = fuse_fs_access_unlink,
+	.rmdir = fuse_fs_access_rmdir,
+	.symlink = NULL,
+	.rename = NULL,
+	.link = NULL,
+	.chmod = NULL,
+	.chown = NULL,
+	.truncate = fuse_fs_access_truncate,
+	.utime = NULL,
+	.open = fuse_fs_access_open,
+	.read = fuse_fs_access_read,
+	.write = fuse_fs_access_write,
+	.statfs = fuse_fs_access_statfs,
+	.flush = NULL,
+	.release = fuse_fs_access_release,
+	.fsync = NULL,
+	.setxattr = NULL,
+	.getxattr = NULL,
+	.listxattr = NULL,
+	.removexattr = NULL,
+	.opendir = NULL,
+	.readdir = fuse_fs_access_readdir,
+	.releasedir = NULL,
+	.fsyncdir = NULL,
+	.init = NULL,
+	.destroy = NULL,
+	.access = NULL,
+	.create = fuse_fs_access_create,
+	.ftruncate = fuse_fs_access_ftruncate,
+	.fgetattr = NULL,
+	.lock = NULL,
+	.utimens = fuse_fs_access_utimens,
+	.bmap = NULL,
+	.flag_nullpath_ok = 0,
+	.flag_nopath = 0,
+	.flag_utime_omit_ok = 0,
+	.flag_reserved = 0,
+	.ioctl = NULL,
+	.poll = NULL,
+	.write_buf = NULL,
+	.read_buf = NULL,
+	.flock = NULL,
+	.fallocate = NULL,
+};
+
+static void *ffsa_main(void *fuse_mountpoint)
+{
+	char *argv[] = {
+		"",
+		"-f",
+		"-s",
+		(char *)fuse_mountpoint
+	};
+	int argc = NSI_ARRAY_SIZE(argv);
+
+	nsi_print_trace("FUSE mounting flash in host %s/\n", (char *)fuse_mountpoint);
+
+	fuse_main(argc, argv, &fuse_fs_access_oper, NULL);
+
+	pthread_exit(0);
+	return NULL;
+}
+
+void ffsa_init_bottom(const char *fuse_mountpoint, struct ffa_op_callbacks *op_cbs)
+{
+	struct stat st;
+	int err;
+
+	op_callbacks = op_cbs;
+
+	if (stat(fuse_mountpoint, &st) < 0) {
+		if (mkdir(fuse_mountpoint, 0700) < 0) {
+			nsi_print_error_and_exit("Failed to create directory for flash mount point "
+						 "(%s): %s\n",
+						 fuse_mountpoint, strerror(errno));
+		}
+	} else if (!S_ISDIR(st.st_mode)) {
+		nsi_print_error_and_exit("%s is not a directory\n", fuse_mountpoint);
+	}
+
+	err = pthread_create(&fuse_thread, NULL, ffsa_main, (void *)fuse_mountpoint);
+	if (err < 0) {
+		nsi_print_error_and_exit("Failed to create thread for fuse_fs_access_main\n");
+	}
+
+	err = sem_init(&op_queue.op_done, 0, 0);
+	if (err) {
+		nsi_print_error_and_exit("Failed to initialize semaphore\n");
+	}
+}
+
+void ffsa_cleanup_bottom(const char *fuse_mountpoint)
+{
+	char *full_cmd;
+	static const char cmd[] = "fusermount -uz ";
+
+	full_cmd = malloc(strlen(cmd) + strlen(fuse_mountpoint) + 1);
+
+	sprintf(full_cmd, "%s%s", cmd, fuse_mountpoint);
+	if (system(full_cmd) < -1) {
+		nsi_print_trace("Failed to unmount fuse mount point\n");
+	}
+	free(full_cmd);
+
+	pthread_join(fuse_thread, NULL);
+}
diff --git a/subsys/fs/fuse_fs_access_bottom.h b/subsys/fs/fuse_fs_access_bottom.h
new file mode 100644
index 0000000000000..93d198c09ea30
--- /dev/null
+++ b/subsys/fs/fuse_fs_access_bottom.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef SUBSYS_FS_FUSE_FS_ACCESS_BOTTOM_H
+#define SUBSYS_FS_FUSE_FS_ACCESS_BOTTOM_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define INVALID_FILE_HANDLE (INT32_MAX)
+
+struct ffa_dirent {
+	bool is_directory;
+	char *name;
+	size_t size;
+};
+
+struct ffa_op_callbacks {
+	int (*stat)(const char *path, struct ffa_dirent *entry);
+	int (*readmount)(int *mnt_nbr, const char **mnt_name);
+	int (*readdir_start)(const char *path);
+	int (*readdir_read_next)(struct ffa_dirent *entry);
+	void (*readdir_end)(void);
+	int (*mkdir)(const char *path);
+	int (*create)(const char *path, uint64_t *fh);
+	int (*release)(uint64_t fh);
+	int (*read)(uint64_t fh, char *buf, size_t size, off_t off);
+	int (*write)(uint64_t fh, const char *buf, size_t size, off_t off);
+	int (*ftruncate)(uint64_t fh, off_t size);
+	int (*truncate)(const char *path, off_t size);
+	int (*unlink)(const char *path);
+	int (*rmdir)(const char *path);
+};
+
+void ffsa_init_bottom(const char *fuse_mountpoint, struct ffa_op_callbacks *op_cbs);
+void ffsa_cleanup_bottom(const char *fuse_mountpoint);
+
+bool ffa_is_op_pended(void);
+void ffa_run_pending_op(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SUBSYS_FS_FUSE_FS_ACCESS_BOTTOM_H */
diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig
index 208be140f2219..48915c2f048ea 100644
--- a/subsys/fs/nvs/Kconfig
+++ b/subsys/fs/nvs/Kconfig
@@ -6,8 +6,8 @@
 config NVS
 	bool "Non-volatile Storage"
 	depends on FLASH
+	depends on FLASH_PAGE_LAYOUT
 	select CRC
-	select FLASH_PAGE_LAYOUT
 	help
 	  Enable support of Non-volatile Storage.
 
diff --git a/subsys/fs/shell.c b/subsys/fs/shell.c
index c8bb36cb348fb..5ef7b16d4fc78 100644
--- a/subsys/fs/shell.c
+++ b/subsys/fs/shell.c
@@ -17,14 +17,14 @@
 #include <inttypes.h>
 #include <limits.h>
 
-#define STORAGE_PARTITION	storage_partition
-#define STORAGE_PARTITION_ID	FIXED_PARTITION_ID(STORAGE_PARTITION)
+#define STORAGE_PARTITION    storage_partition
+#define STORAGE_PARTITION_ID FIXED_PARTITION_ID(STORAGE_PARTITION)
 
 #ifdef CONFIG_FILE_SYSTEM_SHELL_MOUNT_COMMAND
 /* FAT */
 #ifdef CONFIG_FAT_FILESYSTEM_ELM
 #include <ff.h>
-#define FATFS_MNTP      "/RAM:"
+#define FATFS_MNTP "/RAM:"
 /* FatFs work area */
 FATFS fat_fs;
 /* mounting info */
@@ -77,11 +77,11 @@ static struct fs_mount_t littlefs_mnt = {
 
 #define BUF_CNT 64
 
-#define MAX_PATH_LEN 128
+#define MAX_PATH_LEN     128
 #define MAX_FILENAME_LEN 128
-#define MAX_INPUT_LEN 20
+#define MAX_INPUT_LEN    20
 
-#define SHELL_FS    "fs"
+#define SHELL_FS "fs"
 
 /* Maintenance guarantees this begins with '/' and is NUL-terminated. */
 static char cwd[MAX_PATH_LEN] = "/";
@@ -143,14 +143,14 @@ static int cmd_cd(const struct shell *sh, size_t argc, char **argv)
 	create_abs_path(argv[1], path, sizeof(path));
 
 	err = fs_stat(path, &entry);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "%s doesn't exist", path);
-		return -ENOEXEC;
+		return -ENOENT;
 	}
 
 	if (entry.type != FS_DIR_ENTRY_DIR) {
 		shell_error(sh, "%s is not a directory", path);
-		return -ENOEXEC;
+		return -ENOTDIR;
 	}
 
 	strncpy(cwd, path, sizeof(cwd));
@@ -175,16 +175,16 @@ static int cmd_ls(const struct shell *sh, size_t argc, char **argv)
 	fs_dir_t_init(&dir);
 
 	err = fs_opendir(&dir, path);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Unable to open %s (err %d)", path, err);
-		return -ENOEXEC;
+		return -EIO;
 	}
 
 	while (1) {
 		struct fs_dirent entry;
 
 		err = fs_readdir(&dir, &entry);
-		if (err) {
+		if (err != 0) {
 			shell_error(sh, "Unable to read directory");
 			break;
 		}
@@ -194,8 +194,7 @@ static int cmd_ls(const struct shell *sh, size_t argc, char **argv)
 			break;
 		}
 
-		shell_print(sh, "%s%s", entry.name,
-			      (entry.type == FS_DIR_ENTRY_DIR) ? "/" : "");
+		shell_print(sh, "%s%s", entry.name, (entry.type == FS_DIR_ENTRY_DIR) ? "/" : "");
 	}
 
 	fs_closedir(&dir);
@@ -227,15 +226,15 @@ static int cmd_trunc(const struct shell *sh, size_t argc, char **argv)
 
 	fs_file_t_init(&file);
 	err = fs_open(&file, path, FS_O_WRITE);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to open %s (%d)", path, err);
-		return -ENOEXEC;;
+		return -EIO;
 	}
 
 	err = fs_truncate(&file, length);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to truncate %s (%d)", path, err);
-		err = -ENOEXEC;
+		err = -EIO;
 	}
 
 	fs_close(&file);
@@ -251,9 +250,9 @@ static int cmd_mkdir(const struct shell *sh, size_t argc, char **argv)
 	create_abs_path(argv[1], path, sizeof(path));
 
 	err = fs_mkdir(path);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Error creating dir[%d]", err);
-		err = -ENOEXEC;
+		err = -EIO;
 	}
 
 	return err;
@@ -267,9 +266,9 @@ static int cmd_rm(const struct shell *sh, size_t argc, char **argv)
 	create_abs_path(argv[1], path, sizeof(path));
 
 	err = fs_unlink(path);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to remove %s (%d)", path, err);
-		err = -ENOEXEC;
+		err = -EIO;
 	}
 
 	return err;
@@ -294,14 +293,14 @@ static int cmd_cp(const struct shell *sh, size_t argc, char **argv)
 	fs_file_t_init(&file_dst);
 
 	err = fs_open(&file_src, path_src, FS_O_READ);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to open %s (%d)", path_src, err);
 		err = -EIO;
 		goto exit;
 	}
 
 	err = fs_open(&file_dst, path_dst, FS_O_CREATE | FS_O_TRUNC | FS_O_WRITE);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to open %s (%d)", path_dst, err);
 		err = -EIO;
 		goto close_src;
@@ -333,14 +332,14 @@ static int cmd_cp(const struct shell *sh, size_t argc, char **argv)
 
 close:
 	close_err = fs_close(&file_dst);
-	if (close_err) {
+	if (close_err != 0) {
 		shell_error(sh, "Failed to close %s", path_dst);
 		err = -EIO;
 	}
 
 close_src:
 	close_err = fs_close(&file_src);
-	if (close_err) {
+	if (close_err != 0) {
 		shell_error(sh, "Failed to close %s", path_src);
 		err = -EIO;
 	}
@@ -376,38 +375,36 @@ static int cmd_read(const struct shell *sh, size_t argc, char **argv)
 	}
 
 	err = fs_stat(path, &dirent);
-	if (err) {
-		shell_error(sh, "Failed to obtain file %s (err: %d)",
-			    path, err);
-		return -ENOEXEC;
+	if (err != 0) {
+		shell_error(sh, "Failed to obtain file %s (err: %d)", path, err);
+		return -EIO;
 	}
 
 	if (dirent.type != FS_DIR_ENTRY_FILE) {
 		shell_error(sh, "Not a file %s", path);
-		return -ENOEXEC;
+		return -EIO;
 	}
 
 	shell_print(sh, "File size: %zd", dirent.size);
 
 	fs_file_t_init(&file);
 	err = fs_open(&file, path, FS_O_READ);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to open %s (%d)", path, err);
-		return -ENOEXEC;
+		return -EIO;
 	}
 
 	if (offset > 0) {
 		err = fs_seek(&file, offset, FS_SEEK_SET);
-		if (err) {
-			shell_error(sh, "Failed to seek %s (%d)",
-				    path, err);
+		if (err != 0) {
+			shell_error(sh, "Failed to seek %s (%d)", path, err);
 			fs_close(&file);
-			return -ENOEXEC;
+			return -EIO;
 		}
 	}
 
+	ssize_t read = 0;
 	while (count > 0) {
-		ssize_t read;
 		uint8_t buf[16];
 		int i;
 
@@ -425,11 +422,11 @@ static int cmd_read(const struct shell *sh, size_t argc, char **argv)
 			shell_fprintf(sh, SHELL_NORMAL, "   ");
 		}
 		i = sizeof(buf) - i;
-		shell_fprintf(sh, SHELL_NORMAL, "%*c", i*3, ' ');
+		shell_fprintf(sh, SHELL_NORMAL, "%*c", i * 3, ' ');
 
 		for (i = 0; i < read; i++) {
-			shell_fprintf(sh, SHELL_NORMAL, "%c", buf[i] < 32 ||
-				      buf[i] > 127 ? '.' : buf[i]);
+			shell_fprintf(sh, SHELL_NORMAL, "%c",
+				      buf[i] < 32 || buf[i] > 127 ? '.' : buf[i]);
 		}
 
 		shell_print(sh, "");
@@ -438,6 +435,10 @@ static int cmd_read(const struct shell *sh, size_t argc, char **argv)
 		count -= read;
 	}
 
+	if (read < 0) {
+		shell_error(sh, "Failed to read from file %s (err: %zd)", path, read);
+	}
+
 	fs_close(&file);
 
 	return 0;
@@ -459,8 +460,7 @@ static int cmd_cat(const struct shell *sh, size_t argc, char **argv)
 
 		err = fs_stat(path, &dirent);
 		if (err < 0) {
-			shell_error(sh, "Failed to obtain file %s (err: %d)",
-					path, err);
+			shell_error(sh, "Failed to obtain file %s (err: %d)", path, err);
 			continue;
 		}
 
@@ -487,8 +487,7 @@ static int cmd_cat(const struct shell *sh, size_t argc, char **argv)
 		}
 
 		if (read < 0) {
-			shell_error(sh, "Failed to read from file %s (err: %zd)",
-				path, read);
+			shell_error(sh, "Failed to read from file %s (err: %zd)", path, read);
 		}
 
 		fs_close(&file);
@@ -508,11 +507,10 @@ static int cmd_statvfs(const struct shell *sh, size_t argc, char **argv)
 	err = fs_statvfs(path, &stat);
 	if (err < 0) {
 		shell_error(sh, "Failed to statvfs %s (%d)", path, err);
-		return -ENOEXEC;
+		return -EIO;
 	}
 
-	shell_fprintf(sh, SHELL_NORMAL,
-		      "bsize %lu, frsize %lu, blocks %lu, bfree %lu\n",
+	shell_fprintf(sh, SHELL_NORMAL, "bsize %lu, frsize %lu, blocks %lu, bfree %lu\n",
 		      stat.f_bsize, stat.f_frsize, stat.f_blocks, stat.f_bfree);
 
 	return 0;
@@ -533,7 +531,7 @@ static int cmd_write(const struct shell *sh, size_t argc, char **argv)
 	if (!strcmp(argv[2], "-o")) {
 		if (argc < 4) {
 			shell_error(sh, "Missing argument");
-			return -ENOEXEC;
+			return -EINVAL;
 		}
 
 		offset = strtol(argv[3], NULL, 0);
@@ -545,9 +543,9 @@ static int cmd_write(const struct shell *sh, size_t argc, char **argv)
 
 	fs_file_t_init(&file);
 	err = fs_open(&file, path, FS_O_CREATE | FS_O_WRITE);
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to open %s (%d)", path, err);
-		return -ENOEXEC;
+		return -EIO;
 	}
 
 	if (offset < 0) {
@@ -555,10 +553,10 @@ static int cmd_write(const struct shell *sh, size_t argc, char **argv)
 	} else {
 		err = fs_seek(&file, offset, FS_SEEK_SET);
 	}
-	if (err) {
+	if (err != 0) {
 		shell_error(sh, "Failed to seek %s (%d)", path, err);
 		fs_close(&file);
-		return -ENOEXEC;
+		return -EIO;
 	}
 
 	buf_len = 0U;
@@ -568,10 +566,9 @@ static int cmd_write(const struct shell *sh, size_t argc, char **argv)
 		if ((buf_len == BUF_CNT) || (arg_offset == argc)) {
 			err = fs_write(&file, buf, buf_len);
 			if (err < 0) {
-				shell_error(sh, "Failed to write %s (%d)",
-					      path, err);
+				shell_error(sh, "Failed to write %s (%d)", path, err);
 				fs_close(&file);
-				return -ENOEXEC;
+				return -EIO;
 			}
 
 			buf_len = 0U;
@@ -584,7 +581,7 @@ static int cmd_write(const struct shell *sh, size_t argc, char **argv)
 }
 
 #ifdef CONFIG_FILE_SYSTEM_SHELL_TEST_COMMANDS
-const static uint8_t speed_types[][4] = { "B", "KiB", "MiB", "GiB" };
+const static uint8_t speed_types[][4] = {"B", "KiB", "MiB", "GiB"};
 const static uint32_t speed_divisor = 1024;
 
 static void file_size_output(const struct shell *sh, double size)
@@ -596,8 +593,7 @@ static void file_size_output(const struct shell *sh, double size)
 		++speed_index;
 	}
 
-	shell_print(sh, "File size: %.1f%s",
-		    size, speed_types[speed_index]);
+	shell_print(sh, "File size: %.1f%s", size, speed_types[speed_index]);
 }
 
 static void speed_output(const struct shell *sh, uint64_t total_time, double loops, double size)
@@ -615,8 +611,8 @@ static void speed_output(const struct shell *sh, uint64_t total_time, double loo
 		++speed_index;
 	}
 
-	shell_print(sh, "Total: %llums, Per loop: ~%.0fms, Speed: ~%.1f%sps",
-		    total_time, time_per_loop, throughput, speed_types[speed_index]);
+	shell_print(sh, "Total: %llums, Per loop: ~%.0fms, Speed: ~%.1f%sps", total_time,
+		    time_per_loop, throughput, speed_types[speed_index]);
 }
 
 static int cmd_read_test(const struct shell *sh, size_t argc, char **argv)
@@ -668,9 +664,9 @@ static int cmd_read_test(const struct shell *sh, size_t argc, char **argv)
 
 		fs_file_t_init(&file);
 		err = fs_open(&file, path, FS_O_READ);
-		if (err) {
+		if (err != 0) {
 			shell_error(sh, "Failed to open %s (%d)", path, err);
-			return -ENOEXEC;
+			return -EIO;
 		}
 
 		/* Read data in chunk by chunk until the full size has been read */
@@ -678,27 +674,26 @@ static int cmd_read_test(const struct shell *sh, size_t argc, char **argv)
 		while (1) {
 			err = fs_read(&file, random_data, sizeof(random_data));
 			if (err < 0) {
-				shell_error(sh, "Failed to write %s (%d)",
-					      path, err);
+				shell_error(sh, "Failed to read %s (%d)", path, err);
 				fs_close(&file);
-				return -ENOEXEC;
+				return -EIO;
 			}
 
 			i += err;
 
-			if (err < sizeof(random_data)) {
+			if (err == 0) {
 				/* Read finished */
 				break;
 			}
 		}
 
-		/* Ensure file contents is fully written then close file */
+		/* Ensure file contents is fully read then close file */
 		fs_close(&file);
 
 		if (i != size) {
-			shell_error(sh, "File read error, expected %d bytes but only read %d",
-				    size, i);
-			return -EINVAL;
+			shell_error(sh, "File read error, expected %d bytes but only read %d", size,
+				    i);
+			return -EIO;
 		}
 
 		++loops;
@@ -757,9 +752,9 @@ static int cmd_erase_write_test(const struct shell *sh, size_t argc, char **argv
 
 		fs_file_t_init(&file);
 		err = fs_open(&file, path, FS_O_CREATE | FS_O_WRITE);
-		if (err) {
+		if (err != 0) {
 			shell_error(sh, "Failed to open %s (%d)", path, err);
-			return -ENOEXEC;
+			return -EIO;
 		}
 
 		/* Truncate the file size to 0 (if supported, erase if not) */
@@ -769,20 +764,20 @@ static int cmd_erase_write_test(const struct shell *sh, size_t argc, char **argv
 			fs_close(&file);
 
 			err = fs_unlink(path);
-			if (err) {
+			if (err != 0) {
 				shell_error(sh, "Failed to delete %s (%d)", path, err);
-				return -ENOEXEC;
+				return -EIO;
 			}
 
 			err = fs_open(&file, path, FS_O_CREATE | FS_O_WRITE);
-			if (err) {
+			if (err != 0) {
 				shell_error(sh, "Failed to open %s (%d)", path, err);
-				return -ENOEXEC;
+				return -EIO;
 			}
-		} else if (err) {
+		} else if (err != 0) {
 			shell_error(sh, "Failed to truncate %s (%d)", path, err);
 			fs_close(&file);
-			return -ENOEXEC;
+			return -EIO;
 		}
 
 		/* Write data out chunk by chunk until the full size has been written */
@@ -796,10 +791,9 @@ static int cmd_erase_write_test(const struct shell *sh, size_t argc, char **argv
 
 			err = fs_write(&file, random_data, write_size);
 			if (err < 0) {
-				shell_error(sh, "Failed to write %s (%d)",
-					      path, err);
+				shell_error(sh, "Failed to write %s (%d)", path, err);
 				fs_close(&file);
-				return -ENOEXEC;
+				return -EIO;
 			}
 
 			i += write_size;
@@ -828,7 +822,7 @@ static char *mntpt_prepare(char *mntpt)
 	char *cpy_mntpt;
 
 	cpy_mntpt = k_malloc(strlen(mntpt) + 1);
-	if (cpy_mntpt) {
+	if (cpy_mntpt != NULL) {
 		strcpy(cpy_mntpt, mntpt);
 	}
 	return cpy_mntpt;
@@ -841,24 +835,21 @@ static int cmd_mount_fat(const struct shell *sh, size_t argc, char **argv)
 	int res;
 
 	mntpt = mntpt_prepare(argv[1]);
-	if (!mntpt) {
-		shell_error(sh,
-			    "Failed to allocate  buffer for mount point");
-		return -ENOEXEC;
+	if (mntpt == NULL) {
+		shell_error(sh, "Failed to allocate buffer for mount point");
+		return -EIO;
 	}
 
 	fatfs_mnt.mnt_point = (const char *)mntpt;
 	res = fs_mount(&fatfs_mnt);
 	if (res != 0) {
-		shell_error(sh,
-			"Error mounting FAT fs. Error Code [%d]", res);
+		shell_error(sh, "Error mounting FAT fs. Error Code [%d]", res);
 		k_free((void *)fatfs_mnt.mnt_point);
 		fatfs_mnt.mnt_point = NULL;
-		return -ENOEXEC;
+		return -EIO;
 	}
 
-	shell_print(sh, "Successfully mounted fat fs:%s",
-			fatfs_mnt.mnt_point);
+	shell_print(sh, "Successfully mounted fat fs:%s", fatfs_mnt.mnt_point);
 
 	return 0;
 }
@@ -873,9 +864,9 @@ static int cmd_mount_littlefs(const struct shell *sh, size_t argc, char **argv)
 
 	char *mntpt = mntpt_prepare(argv[1]);
 
-	if (!mntpt) {
+	if (mntpt == NULL) {
 		shell_error(sh, "Failed to allocate mount point");
-		return -ENOEXEC; /* ?!? */
+		return -EIO;
 	}
 
 	littlefs_mnt.mnt_point = mntpt;
@@ -886,7 +877,7 @@ static int cmd_mount_littlefs(const struct shell *sh, size_t argc, char **argv)
 		shell_error(sh, "Error mounting as littlefs: %d", rc);
 		k_free((void *)littlefs_mnt.mnt_point);
 		littlefs_mnt.mnt_point = NULL;
-		return -ENOEXEC;
+		return -EIO;
 	}
 
 	return rc;
@@ -929,10 +920,8 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_fs,
 	SHELL_CMD_ARG(trunc, NULL, "Truncate file", cmd_trunc, 2, 255),
 	SHELL_CMD_ARG(write, NULL, "Write file", cmd_write, 3, 255),
 #ifdef CONFIG_FILE_SYSTEM_SHELL_TEST_COMMANDS
-	SHELL_CMD_ARG(read_test, NULL, "Read file test",
-		      cmd_read_test, 2, 2),
-	SHELL_CMD_ARG(erase_write_test, NULL, "Erase/write file test",
-		      cmd_erase_write_test, 3, 3),
+	SHELL_CMD_ARG(read_test, NULL, "Read file test", cmd_read_test, 2, 2),
+	SHELL_CMD_ARG(erase_write_test, NULL, "Erase/write file test", cmd_erase_write_test, 3, 3),
 #endif
 	SHELL_SUBCMD_SET_END
 );
diff --git a/subsys/fs/zms/CMakeLists.txt b/subsys/fs/zms/CMakeLists.txt
index b6db8a3f57fa9..91e4651c3f662 100644
--- a/subsys/fs/zms/CMakeLists.txt
+++ b/subsys/fs/zms/CMakeLists.txt
@@ -1,3 +1,3 @@
-#SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(zms.c)
diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
index 781da81bf0a2c..aed3a398f2d31 100644
--- a/subsys/fs/zms/Kconfig
+++ b/subsys/fs/zms/Kconfig
@@ -1,14 +1,17 @@
-#Copyright (c) 2024 BayLibre SAS
+# Copyright (c) 2018 Laczen
+# Copyright (c) 2024 BayLibre SAS
 
-#SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: Apache-2.0
 
-#Zephyr Memory Storage ZMS
+# Zephyr Memory Storage ZMS
 
 config ZMS
 	bool "Zephyr Memory Storage"
 	select CRC
 	help
-	  Enable support of Zephyr Memory Storage.
+	  Enable Zephyr Memory Storage, which is a key-value storage system designed to work with
+	  all types of non-volatile storage technologies.
+	  It supports classical on-chip NOR flash as well as new technologies like RRAM and MRAM.
 
 if ZMS
 
@@ -20,19 +23,16 @@ config ZMS_LOOKUP_CACHE
 	  table entry (ATE) for all ZMS IDs that fall into that cache position.
 
 config ZMS_LOOKUP_CACHE_SIZE
-	int "ZMS Storage lookup cache size"
+	int "ZMS lookup cache size"
 	default 128
 	range 1 65536
 	depends on ZMS_LOOKUP_CACHE
 	help
-	  Number of entries in ZMS lookup cache.
-	  It is recommended that it should be a power of 2.
-	  Every additional entry in cache will add 8 bytes in RAM
+	  Number of entries in the ZMS lookup cache.
+	  Every additional entry in cache will use 8 bytes of RAM.
 
 config ZMS_DATA_CRC
-	bool "ZMS DATA CRC"
-	help
-	  Enables DATA CRC
+	bool "ZMS data CRC"
 
 config ZMS_CUSTOMIZE_BLOCK_SIZE
 	bool "Customize the size of the buffer used internally for reads and writes"
@@ -40,8 +40,8 @@ config ZMS_CUSTOMIZE_BLOCK_SIZE
 	  ZMS uses an internal buffer to read/write and compare stored data.
 	  Increasing the size of this buffer should be done carefully in order to not
 	  overflow the stack.
-	  Increasing this buffer means as well that ZMS could work with storage devices
-	  that have larger write-block-size which decreases ZMS performance
+	  Increasing it makes ZMS able to work with storage devices
+	  that have a larger `write-block-size` (which decreases the performance of ZMS).
 
 config ZMS_CUSTOM_BLOCK_SIZE
 	int "ZMS internal buffer size"
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
index 0e5ca1e5f3bd3..95cfc788b0908 100644
--- a/subsys/fs/zms/zms.c
+++ b/subsys/fs/zms/zms.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2024 BayLibre SAS
+/* Copyright (c) 2018 Laczen
+ * Copyright (c) 2024 BayLibre SAS
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -722,6 +723,40 @@ static int zms_add_gc_done_ate(struct zms_fs *fs)
 	return zms_flash_ate_wrt(fs, &gc_done_ate);
 }
 
+/* This function verifies that the cycle_cnt of the close ATE will not be equal
+ * to the cycle_cnt of the empty ATE after incrementing it.
+ * This is possible only in these extreme conditions:
+ * 1- A Garbage collection operation is interrupted due to a power cut
+ * 2- When rebooting, the sector is erased (cycle_cnt incremented)
+ * 3- Garbage collection restarts again and got interrupted again by a power cut
+ * 4- Steps [2..3] occurred 255 times in a row
+ * At this point the sector that we should erase becomes closed.
+ */
+static inline int zms_verify_and_increment_cycle_cnt(struct zms_fs *fs, uint64_t addr,
+						     uint8_t *cycle_cnt)
+{
+	int rc;
+	uint64_t close_addr;
+	struct zms_ate close_ate;
+
+	close_addr = zms_close_ate_addr(fs, addr);
+	/* Read the second ate in the sector to get the close ATE */
+	rc = zms_flash_ate_rd(fs, close_addr, &close_ate);
+	if (rc < 0) {
+		return rc;
+	}
+
+	*cycle_cnt = (*cycle_cnt + 1) % BIT(8);
+	/* Verify that the close cycle_cnt is not equal to the incremented value.
+	 * If they are equal increment it again.
+	 */
+	if (close_ate.cycle_cnt == *cycle_cnt) {
+		*cycle_cnt = (*cycle_cnt + 1) % BIT(8);
+	}
+
+	return 0;
+}
+
 static int zms_add_empty_ate(struct zms_fs *fs, uint64_t addr)
 {
 	struct zms_ate empty_ate;
@@ -747,8 +782,12 @@ static int zms_add_empty_ate(struct zms_fs *fs, uint64_t addr)
 		return rc;
 	}
 
-	/* increase cycle counter */
-	empty_ate.cycle_cnt = (cycle_cnt + 1) % BIT(8);
+	/* Increase cycle counter */
+	rc = zms_verify_and_increment_cycle_cnt(fs, addr, &cycle_cnt);
+	if (rc < 0) {
+		return rc;
+	}
+	empty_ate.cycle_cnt = cycle_cnt;
 	zms_ate_crc8_update(&empty_ate);
 
 	/* Adding empty ate to this sector changes fs->ate_wra value
@@ -1101,7 +1140,7 @@ static int zms_init(struct zms_fs *fs)
 				/* Let's check that we support this ZMS version */
 				if (ZMS_GET_VERSION(empty_ate.metadata) != ZMS_DEFAULT_VERSION) {
 					LOG_ERR("ZMS Version is not supported");
-					rc = -ENOEXEC;
+					rc = -EPROTONOSUPPORT;
 					goto end;
 				}
 			}
@@ -1125,7 +1164,7 @@ static int zms_init(struct zms_fs *fs)
 	}
 	/* all sectors are closed, and zms magic number not found. This is not a zms fs */
 	if ((closed_sectors == fs->sector_count) && !zms_magic_exist) {
-		rc = -EDEADLK;
+		rc = -ENOTSUP;
 		goto end;
 	}
 	/* TODO: add a recovery mechanism here if the ZMS magic number exist but all
@@ -1157,7 +1196,7 @@ static int zms_init(struct zms_fs *fs)
 				/* Let's check the version */
 				if (ZMS_GET_VERSION(empty_ate.metadata) != ZMS_DEFAULT_VERSION) {
 					LOG_ERR("ZMS Version is not supported");
-					rc = -ENOEXEC;
+					rc = -EPROTONOSUPPORT;
 					goto end;
 				}
 			}
@@ -1258,6 +1297,7 @@ static int zms_init(struct zms_fs *fs)
 			}
 
 			if (zms_gc_done_ate_valid(fs, &gc_done_ate)) {
+				gc_done_marker = true;
 				break;
 			}
 			addr += fs->ate_size;
@@ -1364,6 +1404,7 @@ int zms_mount(struct zms_fs *fs)
 	if (fs->sector_size < ZMS_MIN_ATE_NUM * fs->ate_size) {
 		LOG_ERR("Invalid sector size, should be at least %zu",
 			ZMS_MIN_ATE_NUM * fs->ate_size);
+		return -EINVAL;
 	}
 
 	/* check the number of sectors, it should be at least 2 */
diff --git a/subsys/fs/zms/zms_priv.h b/subsys/fs/zms/zms_priv.h
index 428ff6babca86..84f77296f4f3e 100644
--- a/subsys/fs/zms/zms_priv.h
+++ b/subsys/fs/zms/zms_priv.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2024 BayLibre SAS
+/* Copyright (c) 2018 Laczen
+ * Copyright (c) 2024 BayLibre SAS
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -8,15 +9,11 @@
 #ifndef __ZMS_PRIV_H_
 #define __ZMS_PRIV_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
- * MASKS AND SHIFT FOR ADDRESSES
- * an address in zms is an uint64_t where:
- *   high 4 bytes represent the sector number
- *   low 4 bytes represent the offset in a sector
+ * MASKS AND SHIFT FOR ADDRESSES.
+ * An address in zms is an uint64_t where:
+ * - high 4 bytes represent the sector number
+ * - low 4 bytes represent the offset in a sector
  */
 #define ADDR_SECT_MASK   GENMASK64(63, 32)
 #define ADDR_SECT_SHIFT  32
@@ -44,34 +41,40 @@ extern "C" {
 #define ZMS_INVALID_SECTOR_NUM -1
 #define ZMS_DATA_IN_ATE_SIZE   8
 
+/**
+ * @ingroup zms_data_structures
+ * ZMS Allocation Table Entry (ATE) structure
+ */
 struct zms_ate {
-	uint8_t crc8;      /* crc8 check of the entry */
-	uint8_t cycle_cnt; /* cycle counter for non erasable devices */
-	uint16_t len;      /* data len within sector */
-	uint32_t id;       /* data id */
+	/** crc8 check of the entry */
+	uint8_t crc8;
+	/** cycle counter for non erasable devices */
+	uint8_t cycle_cnt;
+	/** data len within sector */
+	uint16_t len;
+	/** data id */
+	uint32_t id;
 	union {
-		uint8_t data[8]; /* used to store small size data */
+		/** data field used to store small sized data */
+		uint8_t data[8];
 		struct {
-			uint32_t offset; /* data offset within sector */
+			/** data offset within sector */
+			uint32_t offset;
 			union {
-				uint32_t data_crc; /*
-						    * crc for data: The data CRC is checked only
-						    * when the whole data of the element is read.
-						    * The data CRC is not checked for a partial
-						    * read, as it is computed for the complete
-						    * set of data.
-						    */
-				uint32_t metadata; /*
-						    * Used to store metadata information
-						    * such as storage version.
-						    */
+				/**
+				 * crc for data: The data CRC is checked only when the whole data
+				 * of the element is read.
+				 * The data CRC is not checked for a partial read, as it is computed
+				 * for the complete set of data.
+				 */
+				uint32_t data_crc;
+				/**
+				 * Used to store metadata information such as storage version.
+				 */
+				uint32_t metadata;
 			};
 		};
 	};
 } __packed;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __ZMS_PRIV_H_ */
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 7e985aa76deb0..46ecfe1233ffe 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -1087,7 +1087,6 @@ static int register_ept(const struct device *instance, void **token,
 	struct ept_data *ept = NULL;
 	bool matching_state;
 	int ept_index;
-	int r = 0;
 
 	/* Try to find endpoint to rebound */
 	for (ept_index = 0; ept_index < NUM_EPT; ept_index++) {
@@ -1134,7 +1133,7 @@ static int register_ept(const struct device *instance, void **token,
 	ept_bound_process(dev_data);
 #endif
 
-	return r;
+	return 0;
 }
 
 /**
@@ -1237,8 +1236,13 @@ static int hold_rx_buffer(const struct device *instance, void *token, void *data
 static int release_rx_buffer(const struct device *instance, void *token, void *data)
 {
 	struct backend_data *dev_data = instance->data;
+	int r;
 
-	return send_release(dev_data, (uint8_t *)data, MSG_RELEASE_DATA, 0);
+	r = send_release(dev_data, (uint8_t *)data, MSG_RELEASE_DATA, 0);
+	if (r < 0) {
+		return r;
+	}
+	return 0;
 }
 
 /**
@@ -1408,11 +1412,11 @@ const static struct ipc_service_backend backend_ops = {
 	PBUF_DEFINE(tx_icbmsg_pb_##i,							\
 			GET_MEM_ADDR_INST(i, tx),					\
 			GET_ICMSG_SIZE_INST(i, tx, rx),					\
-			GET_CACHE_ALIGNMENT(i));					\
+			GET_CACHE_ALIGNMENT(i), 0, 0);					\
 	PBUF_DEFINE(rx_icbmsg_pb_##i,							\
 			GET_MEM_ADDR_INST(i, rx),					\
 			GET_ICMSG_SIZE_INST(i, rx, tx),					\
-			GET_CACHE_ALIGNMENT(i));					\
+			GET_CACHE_ALIGNMENT(i), 0, 0);					\
 	static struct backend_data backend_data_##i = {					\
 		.control_data = {							\
 			.tx_pb = &tx_icbmsg_pb_##i,					\
@@ -1424,6 +1428,7 @@ const static struct ipc_service_backend backend_ops = {
 		.control_config = {							\
 			.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),			\
 			.mbox_rx = MBOX_DT_SPEC_INST_GET(i, rx),			\
+			.unbound_mode = ICMSG_UNBOUND_MODE_DISABLE,			\
 		},									\
 		.tx = {									\
 			.blocks_ptr = (uint8_t *)GET_BLOCKS_ADDR_INST(i, tx, rx),	\
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg.c b/subsys/ipc/ipc_service/backends/ipc_icmsg.c
index 40cc06b8a6ff9..77b118633ea55 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icmsg.c
@@ -54,33 +54,52 @@ static int backend_init(const struct device *instance)
 	return 0;
 }
 
-#define DEFINE_BACKEND_DEVICE(i)					\
-	static const struct icmsg_config_t backend_config_##i = {	\
-		.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),		\
-		.mbox_rx = MBOX_DT_SPEC_INST_GET(i, rx),		\
-	};								\
-									\
-	PBUF_DEFINE(tx_pb_##i,						\
-			DT_REG_ADDR(DT_INST_PHANDLE(i, tx_region)),	\
-			DT_REG_SIZE(DT_INST_PHANDLE(i, tx_region)),	\
-			DT_INST_PROP_OR(i, dcache_alignment, 0));	\
-	PBUF_DEFINE(rx_pb_##i,						\
-			DT_REG_ADDR(DT_INST_PHANDLE(i, rx_region)),	\
-			DT_REG_SIZE(DT_INST_PHANDLE(i, rx_region)),	\
-			DT_INST_PROP_OR(i, dcache_alignment, 0));	\
-									\
-	static struct icmsg_data_t backend_data_##i = {			\
-		.tx_pb = &tx_pb_##i,					\
-		.rx_pb = &rx_pb_##i,					\
-	};								\
-									\
-	DEVICE_DT_INST_DEFINE(i,					\
-			 &backend_init,					\
-			 NULL,						\
-			 &backend_data_##i,				\
-			 &backend_config_##i,				\
-			 POST_KERNEL,					\
-			 CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,	\
+#define UNBOUND_MODE(i) CONCAT(ICMSG_UNBOUND_MODE_, DT_INST_STRING_UPPER_TOKEN(i, unbound))
+
+#define DEFINE_BACKEND_DEVICE(i)						\
+	static const struct icmsg_config_t backend_config_##i = {		\
+		.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),			\
+		.mbox_rx = MBOX_DT_SPEC_INST_GET(i, rx),			\
+		.unbound_mode = UNBOUND_MODE(i),				\
+	};									\
+										\
+	PBUF_DEFINE(tx_pb_##i,							\
+			DT_REG_ADDR(DT_INST_PHANDLE(i, tx_region)),		\
+			DT_REG_SIZE(DT_INST_PHANDLE(i, tx_region)),		\
+			DT_INST_PROP_OR(i, dcache_alignment, 0),		\
+			UNBOUND_MODE(i) != ICMSG_UNBOUND_MODE_DISABLE,		\
+			UNBOUND_MODE(i) == ICMSG_UNBOUND_MODE_DETECT);		\
+	PBUF_DEFINE(rx_pb_##i,							\
+			DT_REG_ADDR(DT_INST_PHANDLE(i, rx_region)),		\
+			DT_REG_SIZE(DT_INST_PHANDLE(i, rx_region)),		\
+			DT_INST_PROP_OR(i, dcache_alignment, 0),		\
+			UNBOUND_MODE(i) != ICMSG_UNBOUND_MODE_DISABLE,		\
+			UNBOUND_MODE(i) == ICMSG_UNBOUND_MODE_DETECT);		\
+										\
+	BUILD_ASSERT(UNBOUND_MODE(i) != ICMSG_UNBOUND_MODE_DISABLE ||		\
+		IS_ENABLED(CONFIG_IPC_SERVICE_ICMSG_UNBOUND_DISABLED_ALLOWED),	\
+		"Unbound mode \"disabled\" is was forbidden in Kconfig.");	\
+										\
+	BUILD_ASSERT(UNBOUND_MODE(i) != ICMSG_UNBOUND_MODE_ENABLE ||		\
+		IS_ENABLED(CONFIG_IPC_SERVICE_ICMSG_UNBOUND_ENABLED_ALLOWED),	\
+		"Unbound mode \"enabled\" is was forbidden in Kconfig.");	\
+										\
+	BUILD_ASSERT(UNBOUND_MODE(i) != ICMSG_UNBOUND_MODE_DETECT ||		\
+		IS_ENABLED(CONFIG_IPC_SERVICE_ICMSG_UNBOUND_DETECT_ALLOWED),	\
+		"Unbound mode \"detect\" is was forbidden in Kconfig.");	\
+										\
+	static struct icmsg_data_t backend_data_##i = {				\
+		.tx_pb = &tx_pb_##i,						\
+		.rx_pb = &rx_pb_##i,						\
+	};									\
+										\
+	DEVICE_DT_INST_DEFINE(i,						\
+			 &backend_init,						\
+			 NULL,							\
+			 &backend_data_##i,					\
+			 &backend_config_##i,					\
+			 POST_KERNEL,						\
+			 CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,		\
 			 &backend_ops);
 
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_BACKEND_DEVICE)
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg_me_follower.c b/subsys/ipc/ipc_service/backends/ipc_icmsg_me_follower.c
index cc374b31f57d6..bf682cd51e18c 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icmsg_me_follower.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icmsg_me_follower.c
@@ -280,16 +280,17 @@ static int backend_init(const struct device *instance)
 	static const struct icmsg_config_t backend_config_##i = {		\
 		.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),			\
 		.mbox_rx = MBOX_DT_SPEC_INST_GET(i, rx),			\
+		.unbound_mode = ICMSG_UNBOUND_MODE_DISABLE,			\
 	};									\
 										\
 	PBUF_DEFINE(tx_pb_##i,							\
 			DT_REG_ADDR(DT_INST_PHANDLE(i, tx_region)),		\
 			DT_REG_SIZE(DT_INST_PHANDLE(i, tx_region)),		\
-			DT_INST_PROP_OR(i, dcache_alignment, 0));		\
+			DT_INST_PROP_OR(i, dcache_alignment, 0), 0, 0);		\
 	PBUF_DEFINE(rx_pb_##i,							\
 			DT_REG_ADDR(DT_INST_PHANDLE(i, rx_region)),		\
 			DT_REG_SIZE(DT_INST_PHANDLE(i, rx_region)),		\
-			DT_INST_PROP_OR(i, dcache_alignment, 0));		\
+			DT_INST_PROP_OR(i, dcache_alignment, 0), 0, 0);		\
 										\
 	static struct backend_data_t backend_data_##i = {			\
 		.icmsg_me_data = {						\
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg_me_initiator.c b/subsys/ipc/ipc_service/backends/ipc_icmsg_me_initiator.c
index 28170f909ece4..f2064a9dc0f27 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icmsg_me_initiator.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icmsg_me_initiator.c
@@ -186,16 +186,17 @@ static int backend_init(const struct device *instance)
 	static const struct icmsg_config_t backend_config_##i = {		\
 		.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),			\
 		.mbox_rx = MBOX_DT_SPEC_INST_GET(i, rx),			\
+		.unbound_mode = ICMSG_UNBOUND_MODE_DISABLE,			\
 	};									\
 										\
 	PBUF_DEFINE(tx_pb_##i,							\
 			DT_REG_ADDR(DT_INST_PHANDLE(i, tx_region)),		\
 			DT_REG_SIZE(DT_INST_PHANDLE(i, tx_region)),		\
-			DT_INST_PROP_OR(i, dcache_alignment, 0));		\
+			DT_INST_PROP_OR(i, dcache_alignment, 0), 0, 0);		\
 	PBUF_DEFINE(rx_pb_##i,							\
 			DT_REG_ADDR(DT_INST_PHANDLE(i, rx_region)),		\
 			DT_REG_SIZE(DT_INST_PHANDLE(i, rx_region)),		\
-			DT_INST_PROP_OR(i, dcache_alignment, 0));		\
+			DT_INST_PROP_OR(i, dcache_alignment, 0), 0, 0);		\
 										\
 	static struct backend_data_t backend_data_##i = {			\
 		.icmsg_me_data = {						\
diff --git a/subsys/ipc/ipc_service/lib/Kconfig.icmsg b/subsys/ipc/ipc_service/lib/Kconfig.icmsg
index bc15d9a599934..6bbc79d4fa2ab 100644
--- a/subsys/ipc/ipc_service/lib/Kconfig.icmsg
+++ b/subsys/ipc/ipc_service/lib/Kconfig.icmsg
@@ -21,14 +21,6 @@ config IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS
 	  Maximum time to wait, in milliseconds, for access to send data with
 	  backends basing on icmsg library. This time should be relatively low.
 
-config IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS
-	int "Bond notification timeout in miliseconds"
-	range 1 100
-	default 1
-	help
-	  Time to wait for remote bonding notification before the
-	  notification is repeated.
-
 config IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE
 	bool "Use dedicated workqueue"
 	depends on MULTITHREADING
@@ -68,6 +60,33 @@ config IPC_SERVICE_BACKEND_ICMSG_WQ_PRIORITY
 
 endif
 
+config IPC_SERVICE_ICMSG_UNBOUND_ENABLED_ALLOWED
+	bool "Instance is allowed to set unbound to enabled"
+	default y
+	help
+	  Controls whether the "enabled" value of the "unbound"
+	  property is allowed to be set in any of the ICMsg instances. You
+	  can set this option to "n", if you want to reduce code size and
+	  no instance of ICMsg is using unbound functionality.
+
+config IPC_SERVICE_ICMSG_UNBOUND_DISABLED_ALLOWED
+	bool "Instance is allowed to set unbound to disabled"
+	default y
+	help
+	  Controls whether the "disabled" value of the "unbound"
+	  property is allowed to be set in any of the ICMsg instances. You
+	  can set this option to "n", if you want to reduce code size and
+	  all instances of ICMsg are using unbound functionality.
+
+config IPC_SERVICE_ICMSG_UNBOUND_DETECT_ALLOWED
+	bool "Instance is allowed to set unbound to detect"
+	default y
+	help
+	  Controls whether the "detect" value of the "unbound"
+	  property is allowed to be set in any of the ICMsg instances. You
+	  can set this option to "n", if you want to reduce code size and
+	  all instances of ICMsg are using unbound detection functionality.
+
 # The Icmsg library in its simplicity requires the system workqueue to execute
 # at a cooperative priority.
 config SYSTEM_WORKQUEUE_PRIORITY
diff --git a/subsys/ipc/ipc_service/lib/icmsg.c b/subsys/ipc/ipc_service/lib/icmsg.c
index f574e71ec1478..500ca20cde641 100644
--- a/subsys/ipc/ipc_service/lib/icmsg.c
+++ b/subsys/ipc/ipc_service/lib/icmsg.c
@@ -12,7 +12,39 @@
 #include <zephyr/ipc/pbuf.h>
 #include <zephyr/init.h>
 
-#define BOND_NOTIFY_REPEAT_TO	K_MSEC(CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS)
+
+#define UNBOUND_DISABLED IS_ENABLED(CONFIG_IPC_SERVICE_ICMSG_UNBOUND_DISABLED_ALLOWED)
+#define UNBOUND_ENABLED IS_ENABLED(CONFIG_IPC_SERVICE_ICMSG_UNBOUND_ENABLED_ALLOWED)
+#define UNBOUND_DETECT IS_ENABLED(CONFIG_IPC_SERVICE_ICMSG_UNBOUND_DETECT_ALLOWED)
+
+/** Get local session id request from RX handshake word.
+ */
+#define LOCAL_SID_REQ_FROM_RX(rx_handshake) ((rx_handshake) & 0xFFFF)
+
+/** Get remote session id request from TX handshake word.
+ */
+#define REMOTE_SID_REQ_FROM_TX(tx_handshake) ((tx_handshake) & 0xFFFF)
+
+/** Get local session id acknowledge from TX handshake word.
+ */
+#define LOCAL_SID_ACK_FROM_TX(tx_handshake) ((tx_handshake) >> 16)
+
+/** Create RX handshake word from local session id request
+ * and remote session id acknowledge.
+ */
+#define MAKE_RX_HANDSHAKE(local_sid_req, remote_sid_ack) \
+	((local_sid_req) | ((remote_sid_ack) << 16))
+
+/** Create TX handshake word from remote session id request
+ * and local session id acknowledge.
+ */
+#define MAKE_TX_HANDSHAKE(remote_sid_req, local_sid_ack) \
+	((remote_sid_req) | ((local_sid_ack) << 16))
+
+/** Special session id indicating that peers are disconnected.
+ */
+#define SID_DISCONNECTED 0
+
 #define SHMEM_ACCESS_TO		K_MSEC(CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS)
 
 static const uint8_t magic[] = {0x45, 0x6d, 0x31, 0x6c, 0x31, 0x4b,
@@ -23,13 +55,10 @@ static const uint8_t magic[] = {0x45, 0x6d, 0x31, 0x6c, 0x31, 0x4b,
 static K_THREAD_STACK_DEFINE(icmsg_stack, CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE);
 static struct k_work_q icmsg_workq;
 static struct k_work_q *const workq = &icmsg_workq;
-#else
+#else /* defined(CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE) */
 static struct k_work_q *const workq = &k_sys_work_q;
-#endif
-static void mbox_callback_process(struct k_work *item);
-#else
-static void mbox_callback_process(struct icmsg_data_t *dev_data);
-#endif
+#endif /* defined(CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE) */
+#endif /* def CONFIG_MULTITHREADING */
 
 static int mbox_deinit(const struct icmsg_config_t *conf,
 		       struct icmsg_data_t *dev_data)
@@ -48,76 +77,33 @@ static int mbox_deinit(const struct icmsg_config_t *conf,
 
 #ifdef CONFIG_MULTITHREADING
 	(void)k_work_cancel(&dev_data->mbox_work);
-	(void)k_work_cancel_delayable(&dev_data->notify_work);
 #endif
 
 	return 0;
 }
 
-static bool is_endpoint_ready(struct icmsg_data_t *dev_data)
+static bool is_endpoint_ready(atomic_t state)
 {
-	return atomic_get(&dev_data->state) == ICMSG_STATE_READY;
+	return state >= MIN(ICMSG_STATE_CONNECTED_SID_DISABLED, ICMSG_STATE_CONNECTED_SID_ENABLED);
 }
 
-#ifdef CONFIG_MULTITHREADING
-static void notify_process(struct k_work *item)
+static inline int reserve_tx_buffer_if_unused(struct icmsg_data_t *dev_data)
 {
-	struct k_work_delayable *dwork = k_work_delayable_from_work(item);
-	struct icmsg_data_t *dev_data =
-		CONTAINER_OF(dwork, struct icmsg_data_t, notify_work);
-
-	(void)mbox_send_dt(&dev_data->cfg->mbox_tx, NULL);
-
-	atomic_t state = atomic_get(&dev_data->state);
-
-	if (state != ICMSG_STATE_READY) {
-		int ret;
-
-		ret = k_work_reschedule_for_queue(workq, dwork, BOND_NOTIFY_REPEAT_TO);
-		__ASSERT_NO_MSG(ret >= 0);
-		(void)ret;
-	}
-}
-#else
-static void notify_process(struct icmsg_data_t *dev_data)
-{
-	(void)mbox_send_dt(&dev_data->cfg->mbox_tx, NULL);
-#if defined(CONFIG_SYS_CLOCK_EXISTS)
-	int64_t start = k_uptime_get();
-#endif
-
-	while (false == is_endpoint_ready(dev_data)) {
-		mbox_callback_process(dev_data);
-
-#if defined(CONFIG_SYS_CLOCK_EXISTS)
-		if ((k_uptime_get() - start) > CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS) {
-#endif
-			(void)mbox_send_dt(&dev_data->cfg->mbox_tx, NULL);
-#if defined(CONFIG_SYS_CLOCK_EXISTS)
-			start = k_uptime_get();
-		};
-#endif
-	}
-}
-#endif
-
 #ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
-static int reserve_tx_buffer_if_unused(struct icmsg_data_t *dev_data)
-{
-	int ret = k_mutex_lock(&dev_data->tx_lock, SHMEM_ACCESS_TO);
-
-	if (ret < 0) {
-		return ret;
-	}
-
+	return k_mutex_lock(&dev_data->tx_lock, SHMEM_ACCESS_TO);
+#else
 	return 0;
+#endif
 }
 
-static int release_tx_buffer(struct icmsg_data_t *dev_data)
+static inline int release_tx_buffer(struct icmsg_data_t *dev_data)
 {
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
 	return k_mutex_unlock(&dev_data->tx_lock);
-}
+#else
+	return 0;
 #endif
+}
 
 static uint32_t data_available(struct icmsg_data_t *dev_data)
 {
@@ -135,103 +121,242 @@ static void submit_mbox_work(struct icmsg_data_t *dev_data)
 	}
 }
 
-static void submit_work_if_buffer_free(struct icmsg_data_t *dev_data)
-{
-	submit_mbox_work(dev_data);
-}
+#endif
 
-static void submit_work_if_buffer_free_and_data_available(
-		struct icmsg_data_t *dev_data)
+static int initialize_tx_with_sid_disabled(struct icmsg_data_t *dev_data)
 {
-	if (!data_available(dev_data)) {
-		return;
+	int ret;
+
+	ret = pbuf_tx_init(dev_data->tx_pb);
+
+	if (ret < 0) {
+		__ASSERT(false, "Incorrect Tx configuration");
+		return ret;
 	}
 
-	submit_mbox_work(dev_data);
-}
-#else
-static void submit_if_buffer_free(struct icmsg_data_t *dev_data)
-{
-	mbox_callback_process(dev_data);
-}
+	ret = pbuf_write(dev_data->tx_pb, magic, sizeof(magic));
 
-static void submit_if_buffer_free_and_data_available(
-		struct icmsg_data_t *dev_data)
-{
+	if (ret < 0) {
+		__ASSERT_NO_MSG(false);
+		return ret;
+	}
 
-	if (!data_available(dev_data)) {
-		return;
+	if (ret < (int)sizeof(magic)) {
+		__ASSERT_NO_MSG(ret == sizeof(magic));
+		return -EINVAL;
 	}
 
-	mbox_callback_process(dev_data);
+	return 0;
 }
-#endif
 
-#ifdef CONFIG_MULTITHREADING
-static void mbox_callback_process(struct k_work *item)
-#else
-static void mbox_callback_process(struct icmsg_data_t *dev_data)
-#endif
+static bool callback_process(struct icmsg_data_t *dev_data)
 {
-#ifdef CONFIG_MULTITHREADING
-	struct icmsg_data_t *dev_data = CONTAINER_OF(item, struct icmsg_data_t, mbox_work);
-#endif
+	int ret;
 	uint8_t rx_buffer[CONFIG_PBUF_RX_READ_BUF_SIZE] __aligned(4);
-
+	uint32_t len = 0;
+	uint32_t len_available;
+	bool rerun = false;
+	bool notify_remote = false;
 	atomic_t state = atomic_get(&dev_data->state);
 
-	uint32_t len = data_available(dev_data);
-
-	if (len == 0) {
-		/* Unlikely, no data in buffer. */
-		return;
+	switch (state) {
+
+#if UNBOUND_DETECT
+	case ICMSG_STATE_INITIALIZING_SID_DETECT: {
+		/* Initialization with detection of remote session awareness */
+		volatile char *magic_buf;
+		uint16_t magic_len;
+
+		ret = pbuf_get_initial_buf(dev_data->rx_pb, &magic_buf, &magic_len);
+
+		if (ret == 0 && magic_len == sizeof(magic) &&
+		    memcmp((void *)magic_buf, magic, sizeof(magic)) == 0) {
+			/* Remote initialized in session-unaware mode, so we do old way of
+			 * initialization.
+			 */
+			ret = initialize_tx_with_sid_disabled(dev_data);
+			if (ret < 0) {
+				if (dev_data->cb->error) {
+					dev_data->cb->error("Incorrect Tx configuration",
+							    dev_data->ctx);
+				}
+				__ASSERT(false, "Incorrect Tx configuration");
+				atomic_set(&dev_data->state, ICMSG_STATE_OFF);
+				return false;
+			}
+			/* We got magic data, so we can handle it later. */
+			notify_remote = true;
+			rerun = true;
+			atomic_set(&dev_data->state, ICMSG_STATE_INITIALIZING_SID_DISABLED);
+			break;
+		}
+		/* If remote did not initialize the RX in session-unaware mode, we can try
+		 * with session-aware initialization.
+		 */
+		__fallthrough;
 	}
+#endif /* UNBOUND_DETECT */
+
+#if UNBOUND_ENABLED || UNBOUND_DETECT
+	case ICMSG_STATE_INITIALIZING_SID_ENABLED: {
+		uint32_t tx_handshake = pbuf_handshake_read(dev_data->tx_pb);
+		uint32_t remote_sid_req = REMOTE_SID_REQ_FROM_TX(tx_handshake);
+		uint32_t local_sid_ack = LOCAL_SID_ACK_FROM_TX(tx_handshake);
+
+		if (remote_sid_req != dev_data->remote_sid && remote_sid_req != SID_DISCONNECTED) {
+			/* We can now initialize TX, since we know that remote, during receiving,
+			 * will first read FIFO indexes and later, it will check if session has
+			 * changed before using indexes to receive the message. Additionally,
+			 * we know that remote after session request change will no try to receive
+			 * more data.
+			 */
+			ret = pbuf_tx_init(dev_data->tx_pb);
+			if (ret < 0) {
+				if (dev_data->cb->error) {
+					dev_data->cb->error("Incorrect Tx configuration",
+						dev_data->ctx);
+				}
+				__ASSERT(false, "Incorrect Tx configuration");
+				atomic_set(&dev_data->state, ICMSG_STATE_DISCONNECTED);
+				return false;
+			}
+			/* Acknowledge the remote session. */
+			dev_data->remote_sid = remote_sid_req;
+			pbuf_handshake_write(dev_data->rx_pb,
+				MAKE_RX_HANDSHAKE(dev_data->local_sid, dev_data->remote_sid));
+			notify_remote = true;
+		}
 
-	__ASSERT_NO_MSG(len <= sizeof(rx_buffer));
+		if (local_sid_ack == dev_data->local_sid &&
+		    dev_data->remote_sid != SID_DISCONNECTED) {
+			/* We send acknowledge to remote, receive acknowledge from remote,
+			 * so we are ready.
+			 */
+			atomic_set(&dev_data->state, ICMSG_STATE_CONNECTED_SID_ENABLED);
+
+			if (dev_data->cb->bound) {
+				dev_data->cb->bound(dev_data->ctx);
+			}
+			/* Re-run this handler, because remote may already send something. */
+			rerun = true;
+			notify_remote = true;
+		}
 
-	if (sizeof(rx_buffer) < len) {
-		return;
+		break;
 	}
+#endif /* UNBOUND_ENABLED || UNBOUND_DETECT */
 
-	len = pbuf_read(dev_data->rx_pb, rx_buffer, sizeof(rx_buffer));
+#if UNBOUND_ENABLED || UNBOUND_DETECT
+	case ICMSG_STATE_CONNECTED_SID_ENABLED:
+#endif
+#if UNBOUND_DISABLED || UNBOUND_DETECT
+	case ICMSG_STATE_CONNECTED_SID_DISABLED:
+#endif
+#if UNBOUND_DISABLED
+	case ICMSG_STATE_INITIALIZING_SID_DISABLED:
+#endif
+
+		len_available = data_available(dev_data);
 
-	if (state == ICMSG_STATE_READY) {
-		if (dev_data->cb->received) {
-			dev_data->cb->received(rx_buffer, len, dev_data->ctx);
+		if (len_available > 0 && sizeof(rx_buffer) >= len_available) {
+			len = pbuf_read(dev_data->rx_pb, rx_buffer, sizeof(rx_buffer));
+		}
+
+		if (state == ICMSG_STATE_CONNECTED_SID_ENABLED &&
+		    (UNBOUND_ENABLED || UNBOUND_DETECT)) {
+			/* The incoming message is valid only if remote session is as expected,
+			 * so we need to check remote session now.
+			 */
+			uint32_t remote_sid_req = REMOTE_SID_REQ_FROM_TX(
+				pbuf_handshake_read(dev_data->tx_pb));
+
+			if (remote_sid_req != dev_data->remote_sid) {
+				atomic_set(&dev_data->state, ICMSG_STATE_DISCONNECTED);
+				if (dev_data->cb->unbound) {
+					dev_data->cb->unbound(dev_data->ctx);
+				}
+				return false;
+			}
+		}
+
+		if (len_available == 0) {
+			/* Unlikely, no data in buffer. */
+			return false;
 		}
-	} else {
-		__ASSERT_NO_MSG(state == ICMSG_STATE_BUSY);
 
-		/* Allow magic number longer than sizeof(magic) for future protocol version. */
-		bool endpoint_invalid = (len < sizeof(magic) ||
-					memcmp(magic, rx_buffer, sizeof(magic)));
+		__ASSERT_NO_MSG(len_available <= sizeof(rx_buffer));
 
-		if (endpoint_invalid) {
-			__ASSERT_NO_MSG(false);
-			return;
+		if (sizeof(rx_buffer) < len_available) {
+			return false;
 		}
 
-		if (dev_data->cb->bound) {
-			dev_data->cb->bound(dev_data->ctx);
+		if (state != ICMSG_STATE_INITIALIZING_SID_DISABLED || !UNBOUND_DISABLED) {
+			if (dev_data->cb->received) {
+				dev_data->cb->received(rx_buffer, len, dev_data->ctx);
+			}
+		} else {
+			/* Allow magic number longer than sizeof(magic) for future protocol
+			 * version.
+			 */
+			bool endpoint_invalid = (len < sizeof(magic) ||
+						memcmp(magic, rx_buffer, sizeof(magic)));
+
+			if (endpoint_invalid) {
+				__ASSERT_NO_MSG(false);
+				return false;
+			}
+
+			if (dev_data->cb->bound) {
+				dev_data->cb->bound(dev_data->ctx);
+			}
+
+			atomic_set(&dev_data->state, ICMSG_STATE_CONNECTED_SID_DISABLED);
+			notify_remote = true;
 		}
 
-		atomic_set(&dev_data->state, ICMSG_STATE_READY);
+		rerun = (data_available(dev_data) > 0);
+		break;
+
+	case ICMSG_STATE_OFF:
+	case ICMSG_STATE_DISCONNECTED:
+	default:
+		/* Nothing to do in this state. */
+		return false;
 	}
+
+	if (notify_remote) {
+		(void)mbox_send_dt(&dev_data->cfg->mbox_tx, NULL);
+	}
+
+	return rerun;
+}
+
 #ifdef CONFIG_MULTITHREADING
-	submit_work_if_buffer_free_and_data_available(dev_data);
-#else
-	submit_if_buffer_free_and_data_available(dev_data);
-#endif
+static void workq_callback_process(struct k_work *item)
+{
+	bool rerun;
+	struct icmsg_data_t *dev_data = CONTAINER_OF(item, struct icmsg_data_t, mbox_work);
+
+	rerun = callback_process(dev_data);
+	if (rerun) {
+		submit_mbox_work(dev_data);
+	}
 }
+#endif /* def CONFIG_MULTITHREADING */
 
 static void mbox_callback(const struct device *instance, uint32_t channel,
 			  void *user_data, struct mbox_msg *msg_data)
 {
+	bool rerun;
 	struct icmsg_data_t *dev_data = user_data;
+
 #ifdef CONFIG_MULTITHREADING
-	submit_work_if_buffer_free(dev_data);
+	ARG_UNUSED(rerun);
+	submit_mbox_work(dev_data);
 #else
-	submit_if_buffer_free(dev_data);
+	do {
+		rerun = callback_process(dev_data);
+	} while (rerun);
 #endif
 }
 
@@ -241,8 +366,7 @@ static int mbox_init(const struct icmsg_config_t *conf,
 	int err;
 
 #ifdef CONFIG_MULTITHREADING
-	k_work_init(&dev_data->mbox_work, mbox_callback_process);
-	k_work_init_delayable(&dev_data->notify_work, notify_process);
+	k_work_init(&dev_data->mbox_work, workq_callback_process);
 #endif
 
 	err = mbox_register_callback_dt(&conf->mbox_rx, mbox_callback, dev_data);
@@ -257,9 +381,27 @@ int icmsg_open(const struct icmsg_config_t *conf,
 	       struct icmsg_data_t *dev_data,
 	       const struct ipc_service_cb *cb, void *ctx)
 {
-	if (!atomic_cas(&dev_data->state, ICMSG_STATE_OFF, ICMSG_STATE_BUSY)) {
-		/* Already opened. */
-		return -EALREADY;
+	int ret;
+	enum icmsg_state old_state;
+
+	__ASSERT(conf->unbound_mode != ICMSG_UNBOUND_MODE_DISABLE || UNBOUND_DISABLED,
+		 "Unbound mode \"disabled\" is was forbidden in Kconfig.");
+	__ASSERT(conf->unbound_mode != ICMSG_UNBOUND_MODE_ENABLE || UNBOUND_ENABLED,
+		 "Unbound mode \"enabled\" is was forbidden in Kconfig.");
+	__ASSERT(conf->unbound_mode != ICMSG_UNBOUND_MODE_DETECT || UNBOUND_DETECT,
+		 "Unbound mode \"detect\" is was forbidden in Kconfig.");
+
+	if (conf->unbound_mode == ICMSG_UNBOUND_MODE_DISABLE ||
+	    !(UNBOUND_ENABLED || UNBOUND_DETECT)) {
+		if (!atomic_cas(&dev_data->state, ICMSG_STATE_OFF,
+				ICMSG_STATE_INITIALIZING_SID_DISABLED)) {
+			/* Already opened. */
+			return -EALREADY;
+		}
+		old_state = ICMSG_STATE_OFF;
+	} else {
+		/* Unbound mode has the same values as ICMSG_STATE_INITIALIZING_* */
+		old_state = atomic_set(&dev_data->state, conf->unbound_mode);
 	}
 
 	dev_data->cb = cb;
@@ -270,60 +412,82 @@ int icmsg_open(const struct icmsg_config_t *conf,
 	k_mutex_init(&dev_data->tx_lock);
 #endif
 
-	int ret = pbuf_tx_init(dev_data->tx_pb);
-
-	if (ret < 0) {
-		__ASSERT(false, "Incorrect Tx configuration");
-		return ret;
-	}
-
 	ret = pbuf_rx_init(dev_data->rx_pb);
 
 	if (ret < 0) {
 		__ASSERT(false, "Incorrect Rx configuration");
-		return ret;
+		goto cleanup_and_exit;
 	}
 
-	ret = pbuf_write(dev_data->tx_pb, magic, sizeof(magic));
-
-	if (ret < 0) {
-		__ASSERT_NO_MSG(false);
-		return ret;
+	if (conf->unbound_mode != ICMSG_UNBOUND_MODE_DISABLE &&
+	    (UNBOUND_ENABLED || UNBOUND_DETECT)) {
+		/* Increment local session id without conflicts with forbidden values. */
+		uint32_t local_sid_ack =
+			LOCAL_SID_ACK_FROM_TX(pbuf_handshake_read(dev_data->tx_pb));
+		dev_data->local_sid =
+			LOCAL_SID_REQ_FROM_RX(pbuf_handshake_read(dev_data->tx_pb));
+		dev_data->remote_sid = SID_DISCONNECTED;
+		do {
+			dev_data->local_sid = (dev_data->local_sid + 1) & 0xFFFF;
+		} while (dev_data->local_sid == local_sid_ack ||
+			 dev_data->local_sid == SID_DISCONNECTED);
+		/* Write local session id request without remote acknowledge */
+		pbuf_handshake_write(dev_data->rx_pb,
+			MAKE_RX_HANDSHAKE(dev_data->local_sid, SID_DISCONNECTED));
+	} else if (UNBOUND_DISABLED) {
+		ret = initialize_tx_with_sid_disabled(dev_data);
 	}
 
-	if (ret < (int)sizeof(magic)) {
-		__ASSERT_NO_MSG(ret == sizeof(magic));
-		return ret;
+	if (old_state == ICMSG_STATE_OFF && (UNBOUND_ENABLED || UNBOUND_DETECT)) {
+		/* Initialize mbox only if we are doing first-time open (not re-open
+		 * after unbound)
+		 */
+		ret = mbox_init(conf, dev_data);
+		if (ret) {
+			goto cleanup_and_exit;
+		}
 	}
 
-	ret = mbox_init(conf, dev_data);
-	if (ret) {
-		return ret;
-	}
-#ifdef CONFIG_MULTITHREADING
-	ret = k_work_schedule_for_queue(workq, &dev_data->notify_work, K_NO_WAIT);
+	/* We need to send a notification to remote, it may not be delivered
+	 * since it may be uninitialized yet, but when it finishes the initialization
+	 * we get a notification from it. We need to send this notification in callback
+	 * again to make sure that it arrived.
+	 */
+	ret = mbox_send_dt(&conf->mbox_tx, NULL);
+
 	if (ret < 0) {
-		return ret;
+		__ASSERT(false, "Cannot send mbox notification");
+		goto cleanup_and_exit;
 	}
-#else
-	notify_process(dev_data);
-#endif
-	return 0;
+
+	return ret;
+
+cleanup_and_exit:
+	atomic_set(&dev_data->state, ICMSG_STATE_OFF);
+	return ret;
 }
 
 int icmsg_close(const struct icmsg_config_t *conf,
 		struct icmsg_data_t *dev_data)
 {
-	int ret;
+	int ret = 0;
+	enum icmsg_state old_state;
 
-	ret = mbox_deinit(conf, dev_data);
-	if (ret) {
-		return ret;
+	if (conf->unbound_mode != ICMSG_UNBOUND_MODE_DISABLE &&
+	    (UNBOUND_ENABLED || UNBOUND_DETECT)) {
+		pbuf_handshake_write(dev_data->rx_pb,
+			MAKE_RX_HANDSHAKE(SID_DISCONNECTED, SID_DISCONNECTED));
 	}
 
-	atomic_set(&dev_data->state, ICMSG_STATE_OFF);
+	(void)mbox_send_dt(&conf->mbox_tx, NULL);
 
-	return 0;
+	old_state = atomic_set(&dev_data->state, ICMSG_STATE_OFF);
+
+	if (old_state != ICMSG_STATE_OFF) {
+		ret = mbox_deinit(conf, dev_data);
+	}
+
+	return ret;
 }
 
 int icmsg_send(const struct icmsg_config_t *conf,
@@ -332,13 +496,15 @@ int icmsg_send(const struct icmsg_config_t *conf,
 {
 	int ret;
 	int write_ret;
-#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
 	int release_ret;
-#endif
 	int sent_bytes;
+	uint32_t state = atomic_get(&dev_data->state);
 
-	if (!is_endpoint_ready(dev_data)) {
-		return -EBUSY;
+	if (!is_endpoint_ready(state)) {
+		/* If instance was disconnected on the remote side, some threads may still
+		 * don't know it yet and still may try to send messages.
+		 */
+		return (state == ICMSG_STATE_DISCONNECTED) ? len : -EBUSY;
 	}
 
 	/* Empty message is not allowed */
@@ -346,19 +512,15 @@ int icmsg_send(const struct icmsg_config_t *conf,
 		return -ENODATA;
 	}
 
-#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
 	ret = reserve_tx_buffer_if_unused(dev_data);
 	if (ret < 0) {
 		return -ENOBUFS;
 	}
-#endif
 
 	write_ret = pbuf_write(dev_data->tx_pb, msg, len);
 
-#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
 	release_ret = release_tx_buffer(dev_data);
 	__ASSERT_NO_MSG(!release_ret);
-#endif
 
 	if (write_ret < 0) {
 		return write_ret;
diff --git a/subsys/ipc/ipc_service/lib/pbuf.c b/subsys/ipc/ipc_service/lib/pbuf.c
index d96b6106cf8fb..d45c86bcd517f 100644
--- a/subsys/ipc/ipc_service/lib/pbuf.c
+++ b/subsys/ipc/ipc_service/lib/pbuf.c
@@ -38,6 +38,7 @@ static int validate_cfg(const struct pbuf_cfg *cfg)
 	/* Validate pointer alignment. */
 	if (!IS_PTR_ALIGNED_BYTES(cfg->rd_idx_loc, MAX(cfg->dcache_alignment, _PBUF_IDX_SIZE)) ||
 	    !IS_PTR_ALIGNED_BYTES(cfg->wr_idx_loc, MAX(cfg->dcache_alignment, _PBUF_IDX_SIZE)) ||
+	    !IS_PTR_ALIGNED_BYTES(cfg->handshake_loc, _PBUF_IDX_SIZE) ||
 	    !IS_PTR_ALIGNED_BYTES(cfg->data_loc, _PBUF_IDX_SIZE)) {
 		return -EINVAL;
 	}
@@ -49,6 +50,8 @@ static int validate_cfg(const struct pbuf_cfg *cfg)
 
 	/* Validate pointer values. */
 	if (!(cfg->rd_idx_loc < cfg->wr_idx_loc) ||
+	    (cfg->handshake_loc && !(cfg->rd_idx_loc < cfg->handshake_loc)) ||
+	    !(cfg->handshake_loc < cfg->wr_idx_loc) ||
 	    !((uint8_t *)cfg->wr_idx_loc < cfg->data_loc) ||
 	    !(((uint8_t *)cfg->rd_idx_loc + MAX(_PBUF_IDX_SIZE, cfg->dcache_alignment)) ==
 	    (uint8_t *)cfg->wr_idx_loc)) {
@@ -176,6 +179,44 @@ int pbuf_write(struct pbuf *pb, const char *data, uint16_t len)
 	return len;
 }
 
+int pbuf_get_initial_buf(struct pbuf *pb, volatile char **buf, uint16_t *len)
+{
+	uint32_t wr_idx;
+	uint16_t plen;
+
+	if (pb == NULL || pb->data.rd_idx != 0) {
+		/* Incorrect call. */
+		return -EINVAL;
+	}
+
+	sys_cache_data_invd_range((void *)(pb->cfg->wr_idx_loc), sizeof(*(pb->cfg->wr_idx_loc)));
+	__sync_synchronize();
+
+	wr_idx = *(pb->cfg->wr_idx_loc);
+	if (wr_idx >= pb->cfg->len || wr_idx > 0xFFFF || wr_idx == 0) {
+		/* Wrong index - probably pbuf was not initialized or message was not send yet. */
+		return -EINVAL;
+	}
+
+	sys_cache_data_invd_range((void *)(pb->cfg->data_loc), PBUF_PACKET_LEN_SZ);
+	__sync_synchronize();
+
+	plen = sys_get_be16(&pb->cfg->data_loc[0]);
+
+	if (plen + 4 > wr_idx) {
+		/* Wrong length - probably pbuf was not initialized or message was not send yet. */
+		return -EINVAL;
+	}
+
+	*buf = &pb->cfg->data_loc[PBUF_PACKET_LEN_SZ];
+	*len = plen;
+
+	sys_cache_data_invd_range((void *)*buf, plen);
+	__sync_synchronize();
+
+	return 0;
+}
+
 int pbuf_read(struct pbuf *pb, char *buf, uint16_t len)
 {
 	if (pb == NULL) {
@@ -253,3 +294,23 @@ int pbuf_read(struct pbuf *pb, char *buf, uint16_t len)
 
 	return len;
 }
+
+uint32_t pbuf_handshake_read(struct pbuf *pb)
+{
+	volatile uint32_t *ptr = pb->cfg->handshake_loc;
+
+	__ASSERT_NO_MSG(ptr);
+	sys_cache_data_invd_range((void *)ptr, sizeof(*ptr));
+	__sync_synchronize();
+	return *ptr;
+}
+
+void pbuf_handshake_write(struct pbuf *pb, uint32_t value)
+{
+	volatile uint32_t *ptr = pb->cfg->handshake_loc;
+
+	__ASSERT_NO_MSG(ptr);
+	*ptr = value;
+	__sync_synchronize();
+	sys_cache_data_flush_range((void *)ptr, sizeof(*ptr));
+}
diff --git a/subsys/llext/Kconfig b/subsys/llext/Kconfig
index 0125901825168..2b0baa0c5e741 100644
--- a/subsys/llext/Kconfig
+++ b/subsys/llext/Kconfig
@@ -126,23 +126,57 @@ source "subsys/logging/Kconfig.template.log_config"
 
 endif
 
-menu "Linkable loadable Extension Development Kit (EDK)"
+menuconfig LLEXT_EDK
+	bool "Linkable loadable Extension Development Kit (EDK)"
+	default y if LLEXT
+	help
+	  Enable the generation of an Extension Development Kit (EDK) for the
+	  Linkable Loadable Extension subsystem. The EDK is an archive that
+	  contains the necessary files and build settings to build extensions
+	  for Zephyr without the need to have the full Zephyr source tree.
+
+if LLEXT_EDK
 
 config LLEXT_EDK_NAME
 	string "Name for llext EDK (Extension Development Kit)"
 	default "llext-edk"
 	help
-	  Name will be used when generating the EDK file, as <name>.tar.xz.
+	  <name> will be used when generating the EDK file; the appropriate
+	  extension will be appended depending on the chosen output format.
 	  It will also be used, normalized, as the prefix for the variable
 	  stating EDK location, used on generated Makefile.cflags. For
 	  instance, the default name, "llext-edk", becomes LLEXT_EDK_INSTALL_DIR.
 
+choice LLEXT_EDK_FORMAT
+prompt "EDK compression and output format"
+default LLEXT_EDK_FORMAT_TAR_XZ
+
+config LLEXT_EDK_FORMAT_TAR_XZ
+	bool ".tar.xz"
+	help
+	  Use GNU tar with XZ compression for the EDK file. Highest compression
+	  ratio, slower choice.
+
+config LLEXT_EDK_FORMAT_TAR_ZSTD
+	bool ".tar.Z"
+	help
+	  Use GNU tar with Zstd compression for the EDK file. Way faster than
+	  XZ, but still with a high compression ratio.
+
+config LLEXT_EDK_FORMAT_ZIP
+	bool ".zip"
+	help
+	  Use Zip format and compression for the EDK file. This is the most
+	  portable option, but it may not compress as well as XZ or Zstd.
+
+endchoice
+
 config LLEXT_EDK_USERSPACE_ONLY
-	bool "Only generate the Userpace codepath on syscall stubs for the EDK"
+	bool "Only generate the Userspace codepath on syscall stubs for the EDK"
 	help
 	  Syscall stubs can contain code that verifies if running code is at user
 	  or kernel space and route the call accordingly. If the EDK is expected
 	  to be used by userspace only extensions, this option will make EDK stubs
 	  not contain the routing code, and only generate the userspace one.
 
-endmenu
+endif
diff --git a/subsys/llext/llext.c b/subsys/llext/llext.c
index 020a8b7b8038f..83148025b771a 100644
--- a/subsys/llext/llext.c
+++ b/subsys/llext/llext.c
@@ -23,32 +23,36 @@ static sys_slist_t _llext_list = SYS_SLIST_STATIC_INIT(&_llext_list);
 
 static struct k_mutex llext_lock = Z_MUTEX_INITIALIZER(llext_lock);
 
-int llext_get_section_header(struct llext_loader *ldr, struct llext *ext, const char *search_name,
-			     elf_shdr_t *shdr)
+int llext_section_shndx(const struct llext_loader *ldr, const struct llext *ext,
+			const char *sect_name)
 {
-	const elf_shdr_t *tmp;
 	unsigned int i;
 
-	for (i = 0, tmp = ext->sect_hdrs;
-	     i < ext->sect_cnt;
-	     i++, tmp++) {
-		const char *name = llext_peek(ldr,
-					      ldr->sects[LLEXT_MEM_SHSTRTAB].sh_offset +
-					      tmp->sh_name);
-
-		if (!name) {
-			return -ENOTSUP;
-		}
+	for (i = 1; i < ext->sect_cnt; i++) {
+		const char *name = llext_section_name(ldr, ext, ext->sect_hdrs + i);
 
-		if (!strcmp(name, search_name)) {
-			*shdr = *tmp;
-			return 0;
+		if (!strcmp(name, sect_name)) {
+			return i;
 		}
 	}
 
 	return -ENOENT;
 }
 
+int llext_get_section_header(struct llext_loader *ldr, struct llext *ext, const char *search_name,
+			     elf_shdr_t *shdr)
+{
+	int ret;
+
+	ret = llext_section_shndx(ldr, ext, search_name);
+	if (ret < 0) {
+		return ret;
+	}
+
+	*shdr = ext->sect_hdrs[ret];
+	return 0;
+}
+
 ssize_t llext_find_section(struct llext_loader *ldr, const char *search_name)
 {
 	elf_shdr_t *shdr;
@@ -91,7 +95,7 @@ struct llext *llext_by_name(const char *name)
 	     node = sys_slist_peek_next(node)) {
 		struct llext *ext = CONTAINER_OF(node, struct llext, _llext_list);
 
-		if (strncmp(ext->name, name, sizeof(ext->name)) == 0) {
+		if (strncmp(ext->name, name, LLEXT_MAX_NAME_LEN) == 0) {
 			k_mutex_unlock(&llext_lock);
 			return ext;
 		}
@@ -189,8 +193,9 @@ int llext_load(struct llext_loader *ldr, const char *name, struct llext **ext,
 		goto out;
 	}
 
-	strncpy((*ext)->name, name, sizeof((*ext)->name));
-	(*ext)->name[sizeof((*ext)->name) - 1] = '\0';
+	/* The (*ext)->name array is LLEXT_MAX_NAME_LEN + 1 bytes long */
+	strncpy((*ext)->name, name, LLEXT_MAX_NAME_LEN);
+	(*ext)->name[LLEXT_MAX_NAME_LEN] = '\0';
 	(*ext)->use_count++;
 
 	sys_slist_append(&_llext_list, &(*ext)->_llext_list);
diff --git a/subsys/llext/llext_link.c b/subsys/llext/llext_link.c
index a0a4414117fa1..5d37172c08e7a 100644
--- a/subsys/llext/llext_link.c
+++ b/subsys/llext/llext_link.c
@@ -26,8 +26,8 @@ LOG_MODULE_DECLARE(llext, CONFIG_LLEXT_LOG_LEVEL);
 #define SYM_NAME_OR_SLID(name, slid) name
 #endif
 
-__weak int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc,
-			     uintptr_t sym_base_addr, const char *sym_name, uintptr_t load_bias)
+__weak int arch_elf_relocate(struct llext_loader *ldr, struct llext *ext, elf_rela_t *rel,
+			     const elf_shdr_t *shdr)
 {
 	return -ENOTSUP;
 }
@@ -142,6 +142,92 @@ static const void *llext_find_extension_sym(const char *sym_name, struct llext *
 	return se.addr;
 }
 
+/*
+ * Read the symbol entry corresponding to a relocation from the binary.
+ */
+int llext_read_symbol(struct llext_loader *ldr, struct llext *ext, const elf_rela_t *rel,
+		      elf_sym_t *sym)
+{
+	int ret;
+
+	ret = llext_seek(ldr, ldr->sects[LLEXT_MEM_SYMTAB].sh_offset
+		+ ELF_R_SYM(rel->r_info) * sizeof(elf_sym_t));
+	if (ret != 0) {
+		return ret;
+	}
+
+	ret = llext_read(ldr, sym, sizeof(elf_sym_t));
+
+	return ret;
+}
+
+/*
+ * Determine address of a symbol.
+ */
+int llext_lookup_symbol(struct llext_loader *ldr, struct llext *ext, uintptr_t *link_addr,
+			const elf_rela_t *rel, const elf_sym_t *sym, const char *name,
+			const elf_shdr_t *shdr)
+{
+	if (ELF_R_SYM(rel->r_info) == 0) {
+		/*
+		 * no symbol
+		 * example:  R_ARM_V4BX relocation, R_ARM_RELATIVE
+		 */
+		*link_addr = 0;
+	} else if (sym->st_shndx == SHN_UNDEF) {
+		/* If symbol is undefined, then we need to look it up */
+		*link_addr = (uintptr_t)llext_find_sym(NULL, SYM_NAME_OR_SLID(name, sym->st_value));
+
+		if (*link_addr == 0) {
+			/* Try loaded tables */
+			struct llext *dep;
+
+			*link_addr = (uintptr_t)llext_find_extension_sym(name, &dep);
+			if (*link_addr) {
+				llext_dependency_add(ext, dep);
+			}
+		}
+
+		if (*link_addr == 0) {
+			LOG_ERR("Undefined symbol with no entry in "
+				"symbol table %s, offset %zd, link section %d",
+				name, (size_t)rel->r_offset, shdr->sh_link);
+			return -ENODATA;
+		}
+
+		LOG_INF("found symbol %s at %#lx", name, *link_addr);
+	} else if (sym->st_shndx == SHN_ABS) {
+		/* Absolute symbol */
+		*link_addr = sym->st_value;
+	} else if ((sym->st_shndx < ldr->hdr.e_shnum) &&
+		   !IN_RANGE(sym->st_shndx, SHN_LORESERVE, SHN_HIRESERVE)) {
+		/* This check rejects all relocations whose target symbol has a section index higher
+		 * than the maximum possible in this ELF file, or belongs in the reserved range:
+		 * they will be caught by the `else` below and cause an error to be returned. This
+		 * aborts the LLEXT's loading and prevents execution of improperly relocated code,
+		 * which is dangerous.
+		 *
+		 * Note that the unsupported SHN_COMMON section is rejected as part of this check.
+		 * Also note that SHN_ABS would be rejected as well, but we want to handle it
+		 * properly: for this reason, this check must come AFTER handling the case where the
+		 * symbol's section index is SHN_ABS!
+		 *
+		 *
+		 * For regular symbols, the link address is obtained by adding st_value to the start
+		 * address of the section in which the target symbol resides.
+		 */
+		*link_addr =
+			(uintptr_t)llext_loaded_sect_ptr(ldr, ext, sym->st_shndx) + sym->st_value;
+	} else {
+		LOG_ERR("cannot apply relocation: "
+			"target symbol has unexpected section index %d (%#x)",
+			sym->st_shndx, sym->st_shndx);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
 static void llext_link_plt(struct llext_loader *ldr, struct llext *ext, elf_shdr_t *shdr,
 			   const struct llext_load_param *ldr_parm, elf_shdr_t *tgt)
 {
@@ -153,7 +239,7 @@ static void llext_link_plt(struct llext_loader *ldr, struct llext *ext, elf_shdr
 	uint8_t *text = ext->mem[LLEXT_MEM_TEXT];
 
 	LOG_DBG("Found %p in PLT %u size %zu cnt %u text %p",
-		(void *)llext_string(ldr, ext, LLEXT_MEM_SHSTRTAB, shdr->sh_name),
+		(void *)llext_section_name(ldr, ext, shdr),
 		shdr->sh_type, (size_t)shdr->sh_entsize, sh_cnt, (void *)text);
 
 	const elf_shdr_t *sym_shdr = ldr->sects + LLEXT_MEM_SYMTAB;
@@ -203,7 +289,7 @@ static void llext_link_plt(struct llext_loader *ldr, struct llext *ext, elf_shdr
 			continue;
 		}
 
-		const char *name = llext_string(ldr, ext, LLEXT_MEM_STRTAB, sym.st_name);
+		const char *name = llext_symbol_name(ldr, ext, &sym);
 
 		/*
 		 * Both r_offset and sh_addr are addresses for which the extension
@@ -213,9 +299,14 @@ static void llext_link_plt(struct llext_loader *ldr, struct llext *ext, elf_shdr
 		 * beginning of the .text section in the ELF file can be
 		 * applied to the memory location of mem[LLEXT_MEM_TEXT].
 		 *
-		 * This is valid only when CONFIG_LLEXT_STORAGE_WRITABLE=y
-		 * and peek() is usable on the source ELF file.
+		 * This is valid only for LLEXT_STORAGE_WRITABLE loaders
+		 * since the buffer will be directly modified.
 		 */
+		if (ldr->storage != LLEXT_STORAGE_WRITABLE) {
+			LOG_ERR("PLT: cannot link read-only ELF file");
+			continue;
+		}
+
 		uint8_t *rel_addr = (uint8_t *)ext->mem[LLEXT_MEM_TEXT] -
 			ldr->sects[LLEXT_MEM_TEXT].sh_offset;
 
@@ -281,7 +372,6 @@ int llext_link(struct llext_loader *ldr, struct llext *ext, const struct llext_l
 {
 	uintptr_t sect_base = 0;
 	elf_rela_t rel;
-	elf_sym_t sym;
 	elf_word rel_cnt = 0;
 	const char *name;
 	int i, ret;
@@ -326,7 +416,7 @@ int llext_link(struct llext_loader *ldr, struct llext *ext, const struct llext_l
 
 		rel_cnt = shdr->sh_size / shdr->sh_entsize;
 
-		name = llext_string(ldr, ext, LLEXT_MEM_SHSTRTAB, shdr->sh_name);
+		name = llext_section_name(ldr, ext, shdr);
 
 		/*
 		 * FIXME: The Xtensa port is currently using a different way of
@@ -368,7 +458,7 @@ int llext_link(struct llext_loader *ldr, struct llext *ext, const struct llext_l
 			return -ENOEXEC;
 		}
 
-		sect_base = (uintptr_t)llext_loaded_sect_ptr(ldr, ext, shdr->sh_info);
+		sect_base = (uintptr_t) llext_loaded_sect_ptr(ldr, ext, shdr->sh_info);
 
 		for (int j = 0; j < rel_cnt; j++) {
 			/* get each relocation entry */
@@ -382,99 +472,46 @@ int llext_link(struct llext_loader *ldr, struct llext *ext, const struct llext_l
 				return ret;
 			}
 
-			/* get corresponding symbol */
-			ret = llext_seek(ldr, ldr->sects[LLEXT_MEM_SYMTAB].sh_offset
-				    + ELF_R_SYM(rel.r_info) * sizeof(elf_sym_t));
-			if (ret != 0) {
-				return ret;
-			}
-
-			ret = llext_read(ldr, &sym, sizeof(elf_sym_t));
-			if (ret != 0) {
-				return ret;
-			}
-
-			name = llext_string(ldr, ext, LLEXT_MEM_STRTAB, sym.st_name);
-
-			LOG_DBG("relocation %d:%d info 0x%zx (type %zd, sym %zd) offset %zd "
-				"sym_name %s sym_type %d sym_bind %d sym_ndx %d",
-				i, j, (size_t)rel.r_info, (size_t)ELF_R_TYPE(rel.r_info),
-				(size_t)ELF_R_SYM(rel.r_info), (size_t)rel.r_offset,
-				name, ELF_ST_TYPE(sym.st_info),
-				ELF_ST_BIND(sym.st_info), sym.st_shndx);
+#ifdef CONFIG_LLEXT_LOG_LEVEL
+			if (CONFIG_LLEXT_LOG_LEVEL >= LOG_LEVEL_INF) {
+				uintptr_t link_addr;
+				uintptr_t op_loc =
+					llext_get_reloc_instruction_location(ldr, ext,
+									     shdr->sh_info,
+									     &rel);
+				elf_sym_t sym;
 
-			uintptr_t link_addr, op_loc;
+				ret = llext_read_symbol(ldr, ext, &rel, &sym);
 
-			op_loc = sect_base + rel.r_offset;
+				if (ret != 0) {
+					return ret;
+				}
 
-			if (ELF_R_SYM(rel.r_info) == 0) {
-				/* no symbol ex: R_ARM_V4BX relocation, R_ARM_RELATIVE  */
-				link_addr = 0;
-			} else if (sym.st_shndx == SHN_UNDEF) {
-				/* If symbol is undefined, then we need to look it up */
-				link_addr = (uintptr_t)llext_find_sym(NULL,
-					SYM_NAME_OR_SLID(name, sym.st_value));
+				name = llext_symbol_name(ldr, ext, &sym);
 
-				if (link_addr == 0) {
-					/* Try loaded tables */
-					struct llext *dep;
+				ret = llext_lookup_symbol(ldr, ext, &link_addr, &rel, &sym, name,
+							  shdr);
 
-					link_addr = (uintptr_t)llext_find_extension_sym(name, &dep);
-					if (link_addr) {
-						llext_dependency_add(ext, dep);
-					}
+				if (ret != 0) {
+					LOG_ERR("Could not find symbol %s!", name);
+					return ret;
 				}
 
-				if (link_addr == 0) {
-					LOG_ERR("Undefined symbol with no entry in "
-						"symbol table %s, offset %zd, link section %d",
-						name, (size_t)rel.r_offset, shdr->sh_link);
-					return -ENODATA;
-				}
+				LOG_DBG("relocation %d:%d info %#zx (type %zd, sym %zd) offset %zd"
+					" sym_name %s sym_type %d sym_bind %d sym_ndx %d",
+					i, j, (size_t)rel.r_info, (size_t)ELF_R_TYPE(rel.r_info),
+					(size_t)ELF_R_SYM(rel.r_info), (size_t)rel.r_offset,
+					name, ELF_ST_TYPE(sym.st_info),
+					ELF_ST_BIND(sym.st_info), sym.st_shndx);
 
-				LOG_INF("found symbol %s at 0x%lx", name, link_addr);
-			} else if (sym.st_shndx == SHN_ABS) {
-				/* Absolute symbol */
-				link_addr = sym.st_value;
-			} else if ((sym.st_shndx < ldr->hdr.e_shnum) &&
-				!IN_RANGE(sym.st_shndx, SHN_LORESERVE, SHN_HIRESERVE)) {
-				/* This check rejects all relocations whose target symbol
-				 * has a section index higher than the maximum possible
-				 * in this ELF file, or belongs in the reserved range:
-				 * they will be caught by the `else` below and cause an
-				 * error to be returned. This aborts the LLEXT's loading
-				 * and prevents execution of improperly relocated code,
-				 * which is dangerous.
-				 *
-				 * Note that the unsupported SHN_COMMON section is rejected
-				 * as part of this check. Also note that SHN_ABS would be
-				 * rejected as well, but we want to handle it properly:
-				 * for this reason, this check must come AFTER handling
-				 * the case where the symbol's section index is SHN_ABS!
-				 *
-				 *
-				 * For regular symbols, the link address is obtained by
-				 * adding st_value to the start address of the section
-				 * in which the target symbol resides.
-				 */
-				link_addr = (uintptr_t)llext_loaded_sect_ptr(ldr, ext,
-									     sym.st_shndx)
-					    + sym.st_value;
-			} else {
-				LOG_ERR("rela section %d, entry %d: cannot apply relocation: "
-					"target symbol has unexpected section index %d (0x%X)",
-					i, j, sym.st_shndx, sym.st_shndx);
-				return -ENOEXEC;
+				LOG_INF("writing relocation type %d at %#lx with symbol %s (%#lx)",
+					(int)ELF_R_TYPE(rel.r_info), op_loc, name, link_addr);
 			}
+#endif /* CONFIG_LLEXT_LOG_LEVEL */
 
-			LOG_INF("writing relocation symbol %s type %zd sym %zd at addr 0x%lx "
-				"addr 0x%lx",
-				name, (size_t)ELF_R_TYPE(rel.r_info), (size_t)ELF_R_SYM(rel.r_info),
-				op_loc, link_addr);
 
 			/* relocation */
-			ret = arch_elf_relocate(&rel, op_loc, link_addr, name,
-					     (uintptr_t)ext->mem[LLEXT_MEM_TEXT]);
+			ret = arch_elf_relocate(ldr, ext, &rel, shdr);
 			if (ret != 0) {
 				return ret;
 			}
diff --git a/subsys/llext/llext_load.c b/subsys/llext/llext_load.c
index 68ce4a3f404ab..c4c0b26c35eb1 100644
--- a/subsys/llext/llext_load.c
+++ b/subsys/llext/llext_load.c
@@ -112,6 +112,7 @@ static int llext_load_elf_data(struct llext_loader *ldr, struct llext *ext)
 		LOG_ERR("Failed to allocate section map, size %zu", sect_map_sz);
 		return -ENOMEM;
 	}
+	ext->alloc_size += sect_map_sz;
 	for (int i = 0; i < ext->sect_cnt; i++) {
 		ldr->sect_map[i].mem_idx = LLEXT_MEM_COUNT;
 		ldr->sect_map[i].offset = 0;
@@ -161,14 +162,15 @@ static int llext_find_tables(struct llext_loader *ldr, struct llext *ext)
 	for (i = 0, table_cnt = 0; i < ext->sect_cnt && table_cnt < 3; ++i) {
 		elf_shdr_t *shdr = ext->sect_hdrs + i;
 
-		LOG_DBG("section %d at 0x%zx: name %d, type %d, flags 0x%zx, "
-			"addr 0x%zx, size %zd, link %d, info %d",
+		LOG_DBG("section %d at %#zx: name %d, type %d, flags %#zx, "
+			"addr %#zx, align %#zx, size %zd, link %d, info %d",
 			i,
 			(size_t)shdr->sh_offset,
 			shdr->sh_name,
 			shdr->sh_type,
 			(size_t)shdr->sh_flags,
 			(size_t)shdr->sh_addr,
+			(size_t)shdr->sh_addralign,
 			(size_t)shdr->sh_size,
 			shdr->sh_link,
 			shdr->sh_info);
@@ -208,9 +210,22 @@ static int llext_find_tables(struct llext_loader *ldr, struct llext *ext)
 	return 0;
 }
 
+/* First (bottom) and last (top) entries of a region, inclusive, for a specific field. */
+#define REGION_BOT(reg, field) (size_t)(reg->field + reg->sh_info)
+#define REGION_TOP(reg, field) (size_t)(reg->field + reg->sh_size - 1)
+
+/* Check if two regions x and y have any overlap on a given field. Any shared value counts. */
+#define REGIONS_OVERLAP_ON(x, y, f) \
+	((REGION_BOT(x, f) <= REGION_BOT(y, f) && REGION_TOP(x, f) >= REGION_BOT(y, f)) || \
+	 (REGION_BOT(y, f) <= REGION_BOT(x, f) && REGION_TOP(y, f) >= REGION_BOT(x, f)))
+
 /*
- * Maps the ELF sections into regions according to their usage flags,
- * calculating ldr->sects and ldr->sect_map.
+ * Loops through all defined ELF sections and collapses those with similar
+ * usage flags into LLEXT "regions", taking alignment constraints into account.
+ * Checks the generated regions for overlaps and calculates the offset of each
+ * section within its region.
+ *
+ * This information is stored in the ldr->sects and ldr->sect_map arrays.
  */
 static int llext_map_sections(struct llext_loader *ldr, struct llext *ext,
 			      const struct llext_load_param *ldr_parm)
@@ -221,7 +236,7 @@ static int llext_map_sections(struct llext_loader *ldr, struct llext *ext,
 	for (i = 0; i < ext->sect_cnt; ++i) {
 		elf_shdr_t *shdr = ext->sect_hdrs + i;
 
-		name = llext_string(ldr, ext, LLEXT_MEM_SHSTRTAB, shdr->sh_name);
+		name = llext_section_name(ldr, ext, shdr);
 
 		if (ldr->sect_map[i].mem_idx != LLEXT_MEM_COUNT) {
 			LOG_DBG("section %d name %s already mapped to region %d",
@@ -290,9 +305,11 @@ static int llext_map_sections(struct llext_loader *ldr, struct llext *ext,
 		elf_shdr_t *region = ldr->sects + mem_idx;
 
 		/*
-		 * ELF objects can have sections for memory regions, detached from
-		 * other sections of the same type. E.g. executable sections that will be
-		 * placed in slower memory. Don't merge such sections into main regions
+		 * Some applications may require specific ELF sections to not
+		 * be included in their default memory regions; e.g. the ELF
+		 * file may contain executable sections that are designed to be
+		 * placed in slower memory. Don't merge such sections into main
+		 * regions.
 		 */
 		if (ldr_parm->section_detached && ldr_parm->section_detached(shdr)) {
 			continue;
@@ -303,65 +320,109 @@ static int llext_map_sections(struct llext_loader *ldr, struct llext *ext,
 			 * region descriptor.
 			 */
 			memcpy(region, shdr, sizeof(*region));
-		} else {
-			/* Make sure this section is compatible with the region */
-			if ((shdr->sh_flags & SHF_BASIC_TYPE_MASK) !=
-			    (region->sh_flags & SHF_BASIC_TYPE_MASK)) {
-				LOG_ERR("Unsupported section flags %#x / %#x for %s (region %d)",
-					(uint32_t)shdr->sh_flags, (uint32_t)region->sh_flags,
+			continue;
+		}
+
+		/* Make sure this section is compatible with the existing region */
+		if ((shdr->sh_flags & SHF_BASIC_TYPE_MASK) !=
+		    (region->sh_flags & SHF_BASIC_TYPE_MASK)) {
+			LOG_ERR("Unsupported section flags %#x / %#x for %s (region %d)",
+				(uint32_t)shdr->sh_flags, (uint32_t)region->sh_flags,
+				name, mem_idx);
+			return -ENOEXEC;
+		}
+
+		/* Check if this region type is extendable */
+		switch (mem_idx) {
+		case LLEXT_MEM_BSS:
+			/* SHT_NOBITS sections cannot be merged properly:
+			 * as they use no space in the file, the logic
+			 * below does not work; they must be treated as
+			 * independent entities.
+			 */
+			LOG_ERR("Multiple SHT_NOBITS sections are not supported");
+			return -ENOTSUP;
+		case LLEXT_MEM_PREINIT:
+		case LLEXT_MEM_INIT:
+		case LLEXT_MEM_FINI:
+			/* These regions are not extendable and must be
+			 * referenced at most once in the ELF file.
+			 */
+			LOG_ERR("Region %d redefined", mem_idx);
+			return -ENOEXEC;
+		default:
+			break;
+		}
+
+		if (ldr->hdr.e_type == ET_DYN) {
+			/* In shared objects, sh_addr is the VMA.
+			 * Before merging this section in the region,
+			 * make sure the delta in VMAs matches that of
+			 * file offsets.
+			 */
+			if (shdr->sh_addr - region->sh_addr !=
+			    shdr->sh_offset - region->sh_offset) {
+				LOG_ERR("Incompatible section addresses for %s (region %d)",
 					name, mem_idx);
 				return -ENOEXEC;
 			}
+		}
 
-			/* Check if this region type is extendable */
-			switch (mem_idx) {
-			case LLEXT_MEM_BSS:
-				/* SHT_NOBITS sections cannot be merged properly:
-				 * as they use no space in the file, the logic
-				 * below does not work; they must be treated as
-				 * independent entities.
-				 */
-				LOG_ERR("Multiple SHT_NOBITS sections are not supported");
-				return -ENOTSUP;
-			case LLEXT_MEM_PREINIT:
-			case LLEXT_MEM_INIT:
-			case LLEXT_MEM_FINI:
-				/* These regions are not extendable and must be
-				 * referenced at most once in the ELF file.
-				 */
-				LOG_ERR("Region %d redefined", mem_idx);
-				return -ENOEXEC;
-			default:
-				break;
-			}
+		/*
+		 * Extend the current region to include the new section
+		 * (overlaps are detected later)
+		 */
+		size_t address = MIN(region->sh_addr, shdr->sh_addr);
+		size_t bot_ofs = MIN(region->sh_offset, shdr->sh_offset);
+		size_t top_ofs = MAX(region->sh_offset + region->sh_size,
+				     shdr->sh_offset + shdr->sh_size);
+		size_t addralign = MAX(region->sh_addralign, shdr->sh_addralign);
 
-			if (ldr->hdr.e_type == ET_DYN) {
-				/* In shared objects, sh_addr is the VMA.
-				 * Before merging this section in the region,
-				 * make sure the delta in VMAs matches that of
-				 * file offsets.
-				 */
-				if (shdr->sh_addr - region->sh_addr !=
-				    shdr->sh_offset - region->sh_offset) {
-					LOG_ERR("Incompatible section addresses "
-						"for %s (region %d)", name, mem_idx);
-					return -ENOEXEC;
-				}
+		region->sh_addr = address;
+		region->sh_offset = bot_ofs;
+		region->sh_size = top_ofs - bot_ofs;
+		region->sh_addralign = addralign;
+	}
+
+	/*
+	 * Make sure each of the mapped sections satisfies its alignment
+	 * requirement when placed in the region.
+	 *
+	 * The ELF standard already guarantees that each section's offset in
+	 * the file satisfies its own alignment, and since only powers of 2 can
+	 * be specified, a solution satisfying the largest alignment will also
+	 * work for any smaller one. Aligning the ELF region to the largest
+	 * requirement among the contained sections will then guarantee that
+	 * all are properly aligned.
+	 *
+	 * However, adjusting the region's start address will make the region
+	 * appear larger than it actually is, and might even make it overlap
+	 * with others. To allow for further precise adjustments, the length of
+	 * the calculated pre-padding area is stored in the 'sh_info' field of
+	 * the region descriptor, which is not used on any SHF_ALLOC section.
+	 */
+	for (i = 0; i < LLEXT_MEM_COUNT; i++) {
+		elf_shdr_t *region = ldr->sects + i;
+
+		if (region->sh_type == SHT_NULL || region->sh_size == 0) {
+			/* Skip empty regions */
+			continue;
+		}
+
+		size_t prepad = region->sh_offset & (region->sh_addralign - 1);
+
+		if (ldr->hdr.e_type == ET_DYN) {
+			/* Only shared files populate sh_addr fields */
+			if (prepad > region->sh_addr) {
+				LOG_ERR("Bad section alignment in region %d", i);
+				return -ENOEXEC;
 			}
 
-			/*
-			 * Extend the current region to include the new section
-			 * (overlaps are detected later)
-			 */
-			size_t address = MIN(region->sh_addr, shdr->sh_addr);
-			size_t bot_ofs = MIN(region->sh_offset, shdr->sh_offset);
-			size_t top_ofs = MAX(region->sh_offset + region->sh_size,
-					     shdr->sh_offset + shdr->sh_size);
-
-			region->sh_addr = address;
-			region->sh_offset = bot_ofs;
-			region->sh_size = top_ofs - bot_ofs;
+			region->sh_addr -= prepad;
 		}
+		region->sh_offset -= prepad;
+		region->sh_size += prepad;
+		region->sh_info = prepad;
 	}
 
 	/*
@@ -402,14 +463,11 @@ static int llext_map_sections(struct llext_loader *ldr, struct llext *ext,
 				/*
 				 * Test regions that have VMA ranges for overlaps
 				 */
-				if ((x->sh_addr <= y->sh_addr &&
-				     x->sh_addr + x->sh_size > y->sh_addr) ||
-				    (y->sh_addr <= x->sh_addr &&
-				     y->sh_addr + y->sh_size > x->sh_addr)) {
-					LOG_ERR("Region %d VMA range (0x%zx +%zd) "
-						"overlaps with %d (0x%zx +%zd)",
-						i, (size_t)x->sh_addr, (size_t)x->sh_size,
-						j, (size_t)y->sh_addr, (size_t)y->sh_size);
+				if (REGIONS_OVERLAP_ON(x, y, sh_addr)) {
+					LOG_ERR("Region %d VMA range (%#zx-%#zx) "
+						"overlaps with %d (%#zx-%#zx)",
+						i, REGION_BOT(x, sh_addr), REGION_TOP(x, sh_addr),
+						j, REGION_BOT(y, sh_addr), REGION_TOP(y, sh_addr));
 					return -ENOEXEC;
 				}
 			}
@@ -423,14 +481,11 @@ static int llext_map_sections(struct llext_loader *ldr, struct llext *ext,
 				continue;
 			}
 
-			if ((x->sh_offset <= y->sh_offset &&
-			     x->sh_offset + x->sh_size > y->sh_offset) ||
-			    (y->sh_offset <= x->sh_offset &&
-			     y->sh_offset + y->sh_size > x->sh_offset)) {
-				LOG_ERR("Region %d ELF file range (0x%zx +%zd) "
-					"overlaps with %d (0x%zx +%zd)",
-					i, (size_t)x->sh_offset, (size_t)x->sh_size,
-					j, (size_t)y->sh_offset, (size_t)y->sh_size);
+			if (REGIONS_OVERLAP_ON(x, y, sh_offset)) {
+				LOG_ERR("Region %d ELF file range (%#zx-%#zx) "
+					"overlaps with %d (%#zx-%#zx)",
+					i, REGION_BOT(x, sh_offset), REGION_TOP(x, sh_offset),
+					j, REGION_BOT(y, sh_offset), REGION_TOP(y, sh_offset));
 				return -ENOEXEC;
 			}
 		}
@@ -439,11 +494,20 @@ static int llext_map_sections(struct llext_loader *ldr, struct llext *ext,
 	/*
 	 * Calculate each ELF section's offset inside its memory region. This
 	 * is done as a separate pass so the final regions are already defined.
+	 * Also mark the regions that include relocation targets.
 	 */
 	for (i = 0; i < ext->sect_cnt; ++i) {
 		elf_shdr_t *shdr = ext->sect_hdrs + i;
 		enum llext_mem mem_idx = ldr->sect_map[i].mem_idx;
 
+		if (shdr->sh_type == SHT_REL || shdr->sh_type == SHT_RELA) {
+			enum llext_mem target_region = ldr->sect_map[shdr->sh_info].mem_idx;
+
+			if (target_region != LLEXT_MEM_COUNT) {
+				ldr->sects[target_region].sh_flags |= SHF_LLEXT_HAS_RELOCS;
+			}
+		}
+
 		if (mem_idx != LLEXT_MEM_COUNT) {
 			ldr->sect_map[i].offset = shdr->sh_offset - ldr->sects[mem_idx].sh_offset;
 		}
@@ -487,7 +551,7 @@ static int llext_count_export_syms(struct llext_loader *ldr, struct llext *ext)
 		uint32_t stb = ELF_ST_BIND(sym.st_info);
 		uint32_t sect = sym.st_shndx;
 
-		name = llext_string(ldr, ext, LLEXT_MEM_STRTAB, sym.st_name);
+		name = llext_symbol_name(ldr, ext, &sym);
 
 		if ((stt == STT_FUNC || stt == STT_OBJECT) && stb == STB_GLOBAL) {
 			LOG_DBG("function symbol %d, name %s, type tag %d, bind %d, sect %d",
@@ -553,7 +617,7 @@ static int llext_export_symbols(struct llext_loader *ldr, struct llext *ext,
 		 */
 		const char *name = NULL;
 
-		if (ldr_parm && ldr_parm->pre_located) {
+		if (ldr_parm->pre_located) {
 			ssize_t name_offset = llext_file_offset(ldr, (uintptr_t)sym->name);
 
 			if (name_offset > 0) {
@@ -607,7 +671,7 @@ static int llext_copy_symbols(struct llext_loader *ldr, struct llext *ext,
 
 		if ((stt == STT_FUNC || stt == STT_OBJECT) &&
 		    stb == STB_GLOBAL && shndx != SHN_UNDEF) {
-			const char *name = llext_string(ldr, ext, LLEXT_MEM_STRTAB, sym.st_name);
+			const char *name = llext_symbol_name(ldr, ext, &sym);
 
 			__ASSERT(j <= sym_tab->sym_cnt, "Miscalculated symbol number %u\n", j);
 
@@ -699,7 +763,7 @@ int do_llext_load(struct llext_loader *ldr, struct llext *ext,
 	}
 
 	LOG_DBG("Allocate and copy strings...");
-	ret = llext_copy_strings(ldr, ext);
+	ret = llext_copy_strings(ldr, ext, ldr_parm);
 	if (ret != 0) {
 		LOG_ERR("Failed to copy ELF string sections, ret %d", ret);
 		goto out;
@@ -755,16 +819,19 @@ int do_llext_load(struct llext_loader *ldr, struct llext *ext,
 		goto out;
 	}
 
-	llext_adjust_mmu_permissions(ext);
+	if (!ldr_parm->pre_located) {
+		llext_adjust_mmu_permissions(ext);
+	}
 
 out:
 	/*
-	 * Free resources only used during loading. Note that this exploits
-	 * the fact that freeing a NULL pointer has no effect.
+	 * Free resources only used during loading, unless explicitly requested.
+	 * Note that this exploits the fact that freeing a NULL pointer has no effect.
 	 */
 
-	llext_free(ldr->sect_map);
-	ldr->sect_map = NULL;
+	if (ret != 0 || !ldr_parm->keep_section_info) {
+		llext_free_inspection_data(ldr, ext);
+	}
 
 	/* Until proper inter-llext linking is implemented, the symbol table is
 	 * not useful outside of the loading process; keep it only if debugging
@@ -788,11 +855,22 @@ int do_llext_load(struct llext_loader *ldr, struct llext *ext,
 		ext->exp_tab.sym_cnt = 0;
 		ext->exp_tab.syms = NULL;
 	} else {
-		LOG_DBG("loaded module, .text at %p, .rodata at %p", ext->mem[LLEXT_MEM_TEXT],
-			ext->mem[LLEXT_MEM_RODATA]);
+		LOG_DBG("Loaded llext: %zu bytes in heap, .text at %p, .rodata at %p",
+			ext->alloc_size, ext->mem[LLEXT_MEM_TEXT], ext->mem[LLEXT_MEM_RODATA]);
 	}
 
 	llext_finalize(ldr);
 
 	return ret;
 }
+
+int llext_free_inspection_data(struct llext_loader *ldr, struct llext *ext)
+{
+	if (ldr->sect_map) {
+		ext->alloc_size -= ext->sect_cnt * sizeof(ldr->sect_map[0]);
+		llext_free(ldr->sect_map);
+		ldr->sect_map = NULL;
+	}
+
+	return 0;
+}
diff --git a/subsys/llext/llext_mem.c b/subsys/llext/llext_mem.c
index 156b363d19ae9..34599bcddacc8 100644
--- a/subsys/llext/llext_mem.c
+++ b/subsys/llext/llext_mem.c
@@ -55,33 +55,77 @@ static void llext_init_mem_part(struct llext *ext, enum llext_mem mem_idx,
 	}
 #endif
 
-	LOG_DBG("region %d: start 0x%zx, size %zd", mem_idx, (size_t)start, len);
+	LOG_DBG("region %d: start %#zx, size %zd", mem_idx, (size_t)start, len);
 }
 
-static int llext_copy_section(struct llext_loader *ldr, struct llext *ext,
+static int llext_copy_region(struct llext_loader *ldr, struct llext *ext,
 			      enum llext_mem mem_idx, const struct llext_load_param *ldr_parm)
 {
 	int ret;
+	elf_shdr_t *region = ldr->sects + mem_idx;
+	uintptr_t region_alloc = region->sh_size;
+	uintptr_t region_align = region->sh_addralign;
 
-	if (!ldr->sects[mem_idx].sh_size) {
+	if (!region_alloc) {
 		return 0;
 	}
-	ext->mem_size[mem_idx] = ldr->sects[mem_idx].sh_size;
+	ext->mem_size[mem_idx] = region_alloc;
 
-	if (IS_ENABLED(CONFIG_LLEXT_STORAGE_WRITABLE)) {
-		if (ldr->sects[mem_idx].sh_type != SHT_NOBITS) {
-			/* Directly use data from the ELF buffer if peek() is supported */
-			ext->mem[mem_idx] = llext_peek(ldr, ldr->sects[mem_idx].sh_offset);
+	/*
+	 * Calculate the minimum region size and alignment that can satisfy
+	 * MMU/MPU requirements. This only applies to regions that contain
+	 * program-accessible data (not to string tables, for example).
+	 */
+	if (region->sh_flags & SHF_ALLOC) {
+		if (IS_ENABLED(CONFIG_ARM_MPU)) {
+			/* On ARM with an MPU, regions must be sized and
+			 * aligned to the same power of two (larger than 32).
+			 */
+			uintptr_t block_sz = MAX(MAX(region_alloc, region_align), LLEXT_PAGE_SIZE);
+
+			block_sz = 1 << LOG2CEIL(block_sz); /* align to next power of two */
+			region_alloc = block_sz;
+			region_align = block_sz;
+		} else if (IS_ENABLED(CONFIG_MMU)) {
+			/* MMU targets map memory in page-sized chunks. Round
+			 * the region to multiples of those.
+			 */
+			region_alloc = ROUND_UP(region_alloc, LLEXT_PAGE_SIZE);
+			region_align = MAX(region_align, LLEXT_PAGE_SIZE);
+		}
+	}
+
+	if (ldr->storage == LLEXT_STORAGE_WRITABLE ||           /* writable storage         */
+	    (ldr->storage == LLEXT_STORAGE_PERSISTENT &&        /* || persistent storage    */
+	     !(region->sh_flags & SHF_WRITE) &&                 /*    && read-only region   */
+	     !(region->sh_flags & SHF_LLEXT_HAS_RELOCS))) {     /*    && no relocs to apply */
+		/*
+		 * Try to reuse data areas from the ELF buffer, if possible.
+		 * If any of the following tests fail, a normal allocation
+		 * will be attempted.
+		 */
+		if (region->sh_type != SHT_NOBITS) {
+			/* Region has data in the file, check if peek() is supported */
+			ext->mem[mem_idx] = llext_peek(ldr, region->sh_offset);
 			if (ext->mem[mem_idx]) {
-				llext_init_mem_part(ext, mem_idx, (uintptr_t)ext->mem[mem_idx],
-						    ldr->sects[mem_idx].sh_size);
-				ext->mem_on_heap[mem_idx] = false;
-				return 0;
+				if (IS_ALIGNED(ext->mem[mem_idx], region_align) ||
+				    ldr_parm->pre_located) {
+					/* Map this region directly to the ELF buffer */
+					llext_init_mem_part(ext, mem_idx,
+							    (uintptr_t)ext->mem[mem_idx],
+							    region_alloc);
+					ext->mem_on_heap[mem_idx] = false;
+					return 0;
+				}
+
+				LOG_WRN("Cannot peek region %d: %p not aligned to %#zx",
+					mem_idx, ext->mem[mem_idx], (size_t)region_align);
 			}
-		} else if (ldr_parm && ldr_parm->pre_located) {
+		} else if (ldr_parm->pre_located) {
 			/*
-			 * ldr_parm cannot be NULL here with the current flow, but
-			 * we add a check to make it future-proof
+			 * In pre-located files all regions, including BSS,
+			 * are placed by the user with a linker script. No
+			 * additional memory allocation is needed here.
 			 */
 			ext->mem[mem_idx] = NULL;
 			ext->mem_on_heap[mem_idx] = false;
@@ -89,45 +133,51 @@ static int llext_copy_section(struct llext_loader *ldr, struct llext *ext,
 		}
 	}
 
-	if (ldr_parm && ldr_parm->pre_located) {
+	if (ldr_parm->pre_located) {
+		/*
+		 * The ELF file is supposed to be pre-located, but some
+		 * regions are not accessible or not in the correct place.
+		 */
 		return -EFAULT;
 	}
 
-	/* On ARM with an MPU a pow(2, N)*32 sized and aligned region is needed,
-	 * otherwise its typically an mmu page (sized and aligned memory region)
-	 * we are after that we can assign memory permission bits on.
-	 */
-#ifndef CONFIG_ARM_MPU
-	const uintptr_t sect_alloc = ROUND_UP(ldr->sects[mem_idx].sh_size, LLEXT_PAGE_SIZE);
-	const uintptr_t sect_align = LLEXT_PAGE_SIZE;
-#else
-	uintptr_t sect_alloc = LLEXT_PAGE_SIZE;
-
-	while (sect_alloc < ldr->sects[mem_idx].sh_size) {
-		sect_alloc *= 2;
-	}
-	uintptr_t sect_align = sect_alloc;
-#endif
-
-	ext->mem[mem_idx] = llext_aligned_alloc(sect_align, sect_alloc);
+	/* Allocate a suitably aligned area for the region. */
+	ext->mem[mem_idx] = llext_aligned_alloc(region_align, region_alloc);
 	if (!ext->mem[mem_idx]) {
+		LOG_ERR("Failed allocating %zd bytes %zd-aligned for region %d",
+			(size_t)region_alloc, (size_t)region_align, mem_idx);
 		return -ENOMEM;
 	}
 
-	ext->alloc_size += sect_alloc;
+	ext->alloc_size += region_alloc;
 
 	llext_init_mem_part(ext, mem_idx, (uintptr_t)ext->mem[mem_idx],
-		sect_alloc);
+		region_alloc);
 
-	if (ldr->sects[mem_idx].sh_type == SHT_NOBITS) {
-		memset(ext->mem[mem_idx], 0, ldr->sects[mem_idx].sh_size);
+	if (region->sh_type == SHT_NOBITS) {
+		memset(ext->mem[mem_idx], 0, region->sh_size);
 	} else {
-		ret = llext_seek(ldr, ldr->sects[mem_idx].sh_offset);
+		uintptr_t base = (uintptr_t)ext->mem[mem_idx];
+		size_t offset = region->sh_offset;
+		size_t length = region->sh_size;
+
+		if (region->sh_flags & SHF_ALLOC) {
+			/* zero out any prepad bytes, not part of the data area */
+			size_t prepad = region->sh_info;
+
+			memset((void *)base, 0, prepad);
+			base += prepad;
+			offset += prepad;
+			length -= prepad;
+		}
+
+		/* actual data area without prepad bytes */
+		ret = llext_seek(ldr, offset);
 		if (ret != 0) {
 			goto err;
 		}
 
-		ret = llext_read(ldr, ext->mem[mem_idx], ldr->sects[mem_idx].sh_size);
+		ret = llext_read(ldr, (void *)base, length);
 		if (ret != 0) {
 			goto err;
 		}
@@ -143,12 +193,13 @@ static int llext_copy_section(struct llext_loader *ldr, struct llext *ext,
 	return ret;
 }
 
-int llext_copy_strings(struct llext_loader *ldr, struct llext *ext)
+int llext_copy_strings(struct llext_loader *ldr, struct llext *ext,
+		       const struct llext_load_param *ldr_parm)
 {
-	int ret = llext_copy_section(ldr, ext, LLEXT_MEM_SHSTRTAB, NULL);
+	int ret = llext_copy_region(ldr, ext, LLEXT_MEM_SHSTRTAB, ldr_parm);
 
 	if (!ret) {
-		ret = llext_copy_section(ldr, ext, LLEXT_MEM_STRTAB, NULL);
+		ret = llext_copy_region(ldr, ext, LLEXT_MEM_STRTAB, ldr_parm);
 	}
 
 	return ret;
@@ -163,7 +214,7 @@ int llext_copy_regions(struct llext_loader *ldr, struct llext *ext,
 			continue;
 		}
 
-		int ret = llext_copy_section(ldr, ext, mem_idx, ldr_parm);
+		int ret = llext_copy_region(ldr, ext, mem_idx, ldr_parm);
 
 		if (ret < 0) {
 			return ret;
@@ -175,12 +226,11 @@ int llext_copy_regions(struct llext_loader *ldr, struct llext *ext,
 		for (int i = 0; i < ext->sect_cnt; ++i) {
 			elf_shdr_t *shdr = ext->sect_hdrs + i;
 			enum llext_mem mem_idx = ldr->sect_map[i].mem_idx;
-			const char *name = llext_string(ldr, ext, LLEXT_MEM_SHSTRTAB,
-							shdr->sh_name);
+			const char *name = llext_section_name(ldr, ext, shdr);
 
 			/* only show sections mapped to program memory */
 			if (mem_idx < LLEXT_MEM_EXPORT) {
-				LOG_DBG("-s %s 0x%zx", name,
+				LOG_DBG("-s %s %#zx", name,
 					(size_t)ext->mem[mem_idx] + ldr->sect_map[i].offset);
 			}
 		}
@@ -220,6 +270,8 @@ void llext_adjust_mmu_permissions(struct llext *ext)
 		sys_cache_data_flush_range(addr, size);
 		k_mem_update_flags(addr, size, flags);
 	}
+
+	ext->mmu_permissions_set = true;
 #endif
 }
 
@@ -227,8 +279,9 @@ void llext_free_regions(struct llext *ext)
 {
 	for (int i = 0; i < LLEXT_MEM_COUNT; i++) {
 #ifdef CONFIG_MMU
-		if (ext->mem_size[i] != 0) {
-			/* restore default RAM permissions */
+		if (ext->mmu_permissions_set && ext->mem_size[i] != 0 &&
+		    (i == LLEXT_MEM_TEXT || i == LLEXT_MEM_RODATA)) {
+			/* restore default RAM permissions of changed regions */
 			k_mem_update_flags(ext->mem[i],
 					   ROUND_UP(ext->mem_size[i], LLEXT_PAGE_SIZE),
 					   K_MEM_PERM_RW);
diff --git a/subsys/llext/llext_priv.h b/subsys/llext/llext_priv.h
index cf96da165d2a5..3a5bbc96abdc9 100644
--- a/subsys/llext/llext_priv.h
+++ b/subsys/llext/llext_priv.h
@@ -9,17 +9,14 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/llext/llext.h>
-
-struct llext_elf_sect_map {
-	enum llext_mem mem_idx;
-	size_t offset;
-};
+#include <zephyr/llext/llext_internal.h>
 
 /*
  * Memory management (llext_mem.c)
  */
 
-int llext_copy_strings(struct llext_loader *ldr, struct llext *ext);
+int llext_copy_strings(struct llext_loader *ldr, struct llext *ext,
+		       const struct llext_load_param *ldr_parm);
 int llext_copy_regions(struct llext_loader *ldr, struct llext *ext,
 		       const struct llext_load_param *ldr_parm);
 void llext_free_regions(struct llext *ext);
@@ -53,12 +50,6 @@ static inline void llext_free(void *ptr)
 int do_llext_load(struct llext_loader *ldr, struct llext *ext,
 		  const struct llext_load_param *ldr_parm);
 
-static inline const char *llext_string(struct llext_loader *ldr, struct llext *ext,
-				       enum llext_mem mem_idx, unsigned int idx)
-{
-	return (char *)ext->mem[mem_idx] + idx;
-}
-
 /*
  * Relocation (llext_link.c)
  */
diff --git a/subsys/llext/shell.c b/subsys/llext/shell.c
index 67e4035a09e42..00fcda1fde449 100644
--- a/subsys/llext/shell.c
+++ b/subsys/llext/shell.c
@@ -128,18 +128,20 @@ static uint8_t llext_buf[CONFIG_LLEXT_SHELL_MAX_SIZE] __aligned(Z_KERNEL_STACK_O
 
 static int cmd_llext_load_hex(const struct shell *sh, size_t argc, char *argv[])
 {
-	char name[16];
-	size_t hex_len = strnlen(argv[2], CONFIG_LLEXT_SHELL_MAX_SIZE*2+1);
-	size_t bin_len = hex_len/2;
+	char *name = argv[1];
+	size_t hex_len = strlen(argv[2]);
 
-	if (bin_len > CONFIG_LLEXT_SHELL_MAX_SIZE) {
+	if (strlen(name) > LLEXT_MAX_NAME_LEN) {
+		shell_print(sh, "Extension name too long, max %d chars\n", LLEXT_MAX_NAME_LEN);
+		return -EINVAL;
+	}
+
+	if (hex_len > CONFIG_LLEXT_SHELL_MAX_SIZE*2) {
 		shell_print(sh, "Extension %d bytes too large to load, max %d bytes\n", hex_len/2,
 			    CONFIG_LLEXT_SHELL_MAX_SIZE);
 		return -ENOMEM;
 	}
 
-	strncpy(name, argv[1], sizeof(name));
-
 	size_t llext_buf_len = hex2bin(argv[2], hex_len, llext_buf, CONFIG_LLEXT_SHELL_MAX_SIZE);
 	struct llext_buf_loader buf_loader = LLEXT_BUF_LOADER(llext_buf, llext_buf_len);
 	struct llext_loader *ldr = &buf_loader.loader;
diff --git a/subsys/logging/Kconfig.misc b/subsys/logging/Kconfig.misc
index a9c90526e140a..0dd3afb40adb9 100644
--- a/subsys/logging/Kconfig.misc
+++ b/subsys/logging/Kconfig.misc
@@ -19,6 +19,7 @@ config LOG_TEST_CLEAR_MESSAGE_SPACE
 config LOG_USE_VLA
 	bool "Using variable length arrays"
 	default y if !MISRA_SANE
+	depends on TOOLCHAIN_SUPPORTS_VLA_IN_STATEMENTS
 	help
 	  Using VLA slightly decreases stack usage in some cases it may not be
 	  supported. Note that VLA are used for arrays which size is resolved at
diff --git a/subsys/logging/Kconfig.mode b/subsys/logging/Kconfig.mode
index b573aa5990625..4e1fd2495b19c 100644
--- a/subsys/logging/Kconfig.mode
+++ b/subsys/logging/Kconfig.mode
@@ -74,3 +74,15 @@ config LOG_DEFAULT_MINIMAL
 config LOG_MULTIDOMAIN
 	bool "Multi-domain logger"
 	select LOG_TIMESTAMP_64BIT
+
+if LOG_MODE_DEFERRED
+
+config LOG_FLUSH_SLEEP_US
+	int "Sleep time when flushing the log queue, microseconds"
+	range 100 100000
+	default 10000
+	help
+	  In deferred logging mode this is the time, used in
+	  log_flush() on each sleep iteration in microseconds.
+
+endif # LOG_MODE_DEFERRED
diff --git a/subsys/logging/backends/Kconfig.rtt b/subsys/logging/backends/Kconfig.rtt
index e275f9b18f200..d1fc0617141b5 100644
--- a/subsys/logging/backends/Kconfig.rtt
+++ b/subsys/logging/backends/Kconfig.rtt
@@ -4,7 +4,7 @@
 config LOG_BACKEND_RTT
 	bool "Segger J-Link RTT backend"
 	depends on USE_SEGGER_RTT
-	default y if !SHELL_BACKEND_RTT
+	default y if !SHELL_LOG_BACKEND
 	select SEGGER_RTT_CUSTOM_LOCKING
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
diff --git a/subsys/logging/backends/Kconfig.xtensa_sim b/subsys/logging/backends/Kconfig.xtensa_sim
index 6b81914cf2dee..e3c35b83da61c 100644
--- a/subsys/logging/backends/Kconfig.xtensa_sim
+++ b/subsys/logging/backends/Kconfig.xtensa_sim
@@ -3,7 +3,7 @@
 
 config LOG_BACKEND_XTENSA_SIM
 	bool "Xtensa simulator backend"
-	depends on SOC_XTENSA_SAMPLE_CONTROLLER || SOC_XTENSA_DC233C || SOC_FAMILY_INTEL_ADSP
+	depends on SIMULATOR_XTENSA
 	default y if SOC_XTENSA_SAMPLE_CONTROLLER || SOC_XTENSA_DC233C
 	select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
 	help
diff --git a/subsys/logging/backends/log_backend_fs.c b/subsys/logging/backends/log_backend_fs.c
index 8be917466b69d..b15c2c0fa0356 100644
--- a/subsys/logging/backends/log_backend_fs.c
+++ b/subsys/logging/backends/log_backend_fs.c
@@ -458,7 +458,7 @@ static void dropped(const struct log_backend *const backend, uint32_t cnt)
 static void process(const struct log_backend *const backend,
 		union log_msg_generic *msg)
 {
-	uint32_t flags = log_backend_std_get_flags();
+	uint32_t flags = log_backend_std_get_flags() & ~LOG_OUTPUT_FLAG_COLORS;
 
 	log_format_func_t log_output_func = log_format_func_t_get(log_format_current);
 
diff --git a/subsys/logging/backends/log_backend_rtt.c b/subsys/logging/backends/log_backend_rtt.c
index 43ebbbfcbab89..d78e530621c5c 100644
--- a/subsys/logging/backends/log_backend_rtt.c
+++ b/subsys/logging/backends/log_backend_rtt.c
@@ -32,6 +32,10 @@
 #define CONFIG_LOG_BACKEND_RTT_RETRY_CNT 10
 #endif
 
+#if defined(CONFIG_LOG_BACKEND_RTT_OUTPUT_DICTIONARY)
+static const uint8_t LOG_HEX_SEP[10] = "##ZLOGV1##";
+#endif
+
 #define DROP_MAX 99
 
 #define DROP_MSG "messages dropped:    \r\n"
@@ -247,12 +251,34 @@ static int data_out_overwrite_mode(uint8_t *data, size_t length, void *ctx)
 	return length;
 }
 
-LOG_OUTPUT_DEFINE(log_output_rtt,
-		  IS_ENABLED(CONFIG_LOG_BACKEND_RTT_MODE_BLOCK) ?
-		  data_out_block_mode :
-		  IS_ENABLED(CONFIG_LOG_BACKEND_RTT_MODE_OVERWRITE) ?
-		  data_out_overwrite_mode : data_out_drop_mode,
-		  char_buf, sizeof(char_buf));
+static const log_output_func_t logging_func =
+	IS_ENABLED(CONFIG_LOG_BACKEND_RTT_MODE_BLOCK)       ? data_out_block_mode
+	: IS_ENABLED(CONFIG_LOG_BACKEND_RTT_MODE_OVERWRITE) ? data_out_overwrite_mode
+							    : data_out_drop_mode;
+
+static int data_out(uint8_t *data, size_t length, void *ctx)
+{
+#if defined(CONFIG_LOG_BACKEND_RTT_OUTPUT_DICTIONARY)
+	for (size_t i = 0; i < length; i++) {
+		char c[2];
+		uint8_t x[2];
+
+		/* upper 8-bit */
+		x[0] = data[i] >> 4;
+		(void)hex2char(x[0], &c[0]);
+
+		/* lower 8-bit */
+		x[1] = data[i] & 0x0FU;
+		(void)hex2char(x[1], &c[1]);
+		logging_func(c, sizeof(c), ctx);
+	}
+	return length;
+#endif
+
+	return logging_func(data, length, ctx);
+}
+
+LOG_OUTPUT_DEFINE(log_output_rtt, data_out, char_buf, sizeof(char_buf));
 
 static void log_backend_rtt_cfg(void)
 {
@@ -267,6 +293,10 @@ static void log_backend_rtt_init(struct log_backend const *const backend)
 		log_backend_rtt_cfg();
 	}
 
+#if defined(CONFIG_LOG_BACKEND_RTT_OUTPUT_DICTIONARY)
+	logging_func((uint8_t *)LOG_HEX_SEP, sizeof(LOG_HEX_SEP), NULL);
+#endif
+
 	host_present = true;
 	line_pos = line_buf;
 }
diff --git a/subsys/logging/frontends/log_frontend_stmesp.c b/subsys/logging/frontends/log_frontend_stmesp.c
index 4c6dd93dfe738..0ede3cb48906d 100644
--- a/subsys/logging/frontends/log_frontend_stmesp.c
+++ b/subsys/logging/frontends/log_frontend_stmesp.c
@@ -581,7 +581,8 @@ void log_frontend_panic(void)
 
 void log_frontend_init(void)
 {
-#if defined(CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID) && !defined(CONFIG_NRF_ETR)
+#if	defined(CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID) && !defined(CONFIG_NRF_ETR) && \
+	!defined(CONFIG_LOG_MSG_APPEND_RO_STRING_LOC)
 	/* Send location of section with constant source data. It is used by the
 	 * application core to retrieve source names of log messages coming from
 	 * coprocessors (FLPR and PPR).
@@ -589,10 +590,13 @@ void log_frontend_init(void)
 	TYPE_SECTION_START_EXTERN(struct log_source_const_data, log_const);
 	STMESP_Type *stm_esp;
 	uintptr_t log_const_start;
+	uintptr_t log_str_start;
 
 	(void)stmesp_get_port(CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID, &stm_esp);
 	log_const_start = (uintptr_t)TYPE_SECTION_START(log_const);
+	log_str_start = (uintptr_t)TYPE_SECTION_START(log_stmesp_ptr);
 	STM_D32(stm_esp, log_const_start, false, true);
+	STM_D32(stm_esp, log_str_start, false, true);
 #endif
 }
 
diff --git a/subsys/logging/frontends/log_frontend_stmesp_demux.c b/subsys/logging/frontends/log_frontend_stmesp_demux.c
index e46dadc652f28..3f922b7417cf4 100644
--- a/subsys/logging/frontends/log_frontend_stmesp_demux.c
+++ b/subsys/logging/frontends/log_frontend_stmesp_demux.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/logging/log_frontend_stmesp_demux.h>
+#include <zephyr/logging/log_frontend_stmesp.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/mpsc_pbuf.h>
 #include <zephyr/sys/__assert.h>
@@ -43,9 +44,25 @@ struct log_frontend_stmesp_demux_active_entry {
 	int off;
 };
 
-struct log_frontend_stmesp_coop_sources {
+/* Coprocessors (FLPR, PPR) sends location where APP can find strings and logging
+ * source names utilizing the fact that APP has access to FLPR/PPR memory if it is
+ * an owner of that coprocessor. During the initialization FLPR/PPR sends 2 DMTS32
+ * to the specific channel. First word is an address where logging source constant
+ * data section is located and second is where a section with addresses to constant
+ * strings used for logging is located.
+ */
+struct log_frontend_stmesp_coproc_sources {
 	uint32_t m_id;
-	const struct log_source_const_data *log_const;
+	uint32_t data_cnt;
+	union {
+		struct {
+			const struct log_source_const_data *log_const;
+			uintptr_t *log_str_section;
+		} data;
+		struct {
+			uintptr_t data[2];
+		} raw_data;
+	};
 };
 
 struct log_frontend_stmesp_demux {
@@ -72,7 +89,7 @@ struct log_frontend_stmesp_demux {
 
 	uint32_t dropped;
 
-	struct log_frontend_stmesp_coop_sources coop_sources[2];
+	struct log_frontend_stmesp_coproc_sources coproc_sources[2];
 };
 
 struct log_frontend_stmesp_entry_source_pair {
@@ -404,10 +421,33 @@ const char *log_frontend_stmesp_demux_sname_get(uint32_t m_id, uint16_t s_id)
 
 	if (demux.m_ids[m_id] == APP_M_ID) {
 		return log_source_name_get(0, s_id);
-	} else if (m_id == demux.coop_sources[0].m_id) {
-		return demux.coop_sources[0].log_const[s_id].name;
-	} else if (m_id == demux.coop_sources[1].m_id) {
-		return demux.coop_sources[1].log_const[s_id].name;
+	} else if (m_id == demux.coproc_sources[0].m_id) {
+		return demux.coproc_sources[0].data.log_const[s_id].name;
+	} else if (m_id == demux.coproc_sources[1].m_id) {
+		return demux.coproc_sources[1].data.log_const[s_id].name;
+	}
+
+	return "unknown";
+}
+
+const char *log_frontend_stmesp_demux_str_get(uint32_t m_id, uint16_t s_id)
+{
+	if (!IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG)) {
+		return "";
+	}
+
+	uintptr_t *log_str_start = NULL;
+
+	if (demux.m_ids[m_id] == APP_M_ID) {
+		log_str_start = (uintptr_t *)TYPE_SECTION_START(log_stmesp_ptr);
+	} else if (m_id == demux.coproc_sources[0].m_id) {
+		log_str_start = demux.coproc_sources[0].data.log_str_section;
+	} else if (m_id == demux.coproc_sources[1].m_id) {
+		log_str_start = demux.coproc_sources[1].data.log_str_section;
+	}
+
+	if (log_str_start) {
+		return (const char *)log_str_start[s_id];
 	}
 
 	return "unknown";
@@ -439,15 +479,16 @@ int log_frontend_stmesp_demux_packet_start(uint32_t *data, uint64_t *ts)
 
 	if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_TURBO_LOG) &&
 	    (ch == CONFIG_LOG_FRONTEND_STPESP_TURBO_SOURCE_PORT_ID)) {
-		if (demux.m_ids[m] == FLPR_M_ID) {
-			demux.coop_sources[0].m_id = m;
-			demux.coop_sources[0].log_const =
-				(const struct log_source_const_data *)(uintptr_t)*data;
-		} else if (demux.m_ids[m] == PPR_M_ID) {
-			demux.coop_sources[1].m_id = m;
-			demux.coop_sources[1].log_const =
-				(const struct log_source_const_data *)(uintptr_t)*data;
+		struct log_frontend_stmesp_coproc_sources *src =
+			&demux.coproc_sources[demux.m_ids[m] == FLPR_M_ID ? 0 : 1];
+
+		if (src->data_cnt >= 2) {
+			/* Unexpected packet. */
+			return -EINVAL;
 		}
+
+		src->m_id = m;
+		src->raw_data.data[src->data_cnt++] = (uintptr_t)*data;
 		return 0;
 	}
 
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
index f5fb7c59101e6..c406d0afc4180 100644
--- a/subsys/logging/log_core.c
+++ b/subsys/logging/log_core.c
@@ -288,6 +288,14 @@ void log_core_init(void)
 	if (IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) {
 		z_log_runtime_filters_init();
 	}
+
+	STRUCT_SECTION_FOREACH(log_backend, backend) {
+		uint32_t id;
+		/* As first slot in filtering mask is reserved, backend ID has offset.*/
+		id = LOG_FILTER_FIRST_BACKEND_SLOT_IDX;
+		id += backend - log_backend_get(0);
+		log_backend_id_set(backend, id);
+	}
 }
 
 static uint32_t activate_foreach_backend(uint32_t mask)
@@ -331,12 +339,6 @@ static uint32_t z_log_init(bool blocking, bool can_sleep)
 	int backend_index = 0;
 
 	STRUCT_SECTION_FOREACH(log_backend, backend) {
-		uint32_t id;
-		/* As first slot in filtering mask is reserved, backend ID has offset.*/
-		id = LOG_FILTER_FIRST_BACKEND_SLOT_IDX;
-		id += backend - log_backend_get(0);
-		log_backend_id_set(backend, id);
-
 		/* Activate autostart backends */
 		if (backend->autostart) {
 			log_backend_init(backend);
@@ -1003,7 +1005,8 @@ void log_flush(void)
 {
 	if (IS_ENABLED(CONFIG_LOG_PROCESS_THREAD)) {
 		while (atomic_get(&buffered_cnt)) {
-			k_sleep(K_MSEC(10));
+			log_thread_trigger();
+			k_sleep(K_USEC(CONFIG_LOG_FLUSH_SLEEP_US));
 		}
 	} else {
 		while (LOG_PROCESS()) {
diff --git a/subsys/lorawan/lorawan.c b/subsys/lorawan/lorawan.c
index 0f3c777feceff..5a55281d08623 100644
--- a/subsys/lorawan/lorawan.c
+++ b/subsys/lorawan/lorawan.c
@@ -93,6 +93,7 @@ static enum lorawan_channels_mask_size region_channels_mask_size =
 
 static lorawan_battery_level_cb_t battery_level_cb;
 static lorawan_dr_changed_cb_t dr_changed_cb;
+static lorawan_link_check_ans_cb_t link_check_cb;
 
 /* implementation required by the soft-se (software secure element) */
 void BoardGetUniqueId(uint8_t *id)
@@ -213,8 +214,10 @@ static void mlme_confirm_handler(MlmeConfirm_t *mlme_confirm)
 		LOG_INF("Joined network! DevAddr: %08x", mib_req.Param.DevAddr);
 		break;
 	case MLME_LINK_CHECK:
-		/* Not implemented */
-		LOG_INF("Link check not implemented yet!");
+		if (link_check_cb != NULL) {
+			link_check_cb(mlme_confirm->DemodMargin, mlme_confirm->NbGateways);
+		}
+		LOG_INF("Link check done");
 		break;
 	case MLME_DEVICE_TIME:
 		LOG_INF("DevTimeReq done");
@@ -399,6 +402,27 @@ int lorawan_set_region(enum lorawan_region region)
 	return 0;
 }
 
+int lorawan_request_link_check(bool force_request)
+{
+	int ret = 0;
+	LoRaMacStatus_t status;
+	MlmeReq_t mlme_req;
+
+	mlme_req.Type = MLME_LINK_CHECK;
+	status = LoRaMacMlmeRequest(&mlme_req);
+	if (status != LORAMAC_STATUS_OK) {
+		LOG_ERR("LinkCheckReq failed: %s", lorawan_status2str(status));
+		ret = lorawan_status2errno(status);
+		return ret;
+	}
+
+	if (force_request) {
+		ret = lorawan_send(0U, "", 0U, LORAWAN_MSG_UNCONFIRMED);
+	}
+
+	return ret;
+}
+
 int lorawan_request_device_time(bool force_request)
 {
 	int ret = 0;
@@ -732,6 +756,11 @@ void lorawan_register_dr_changed_callback(lorawan_dr_changed_cb_t cb)
 	dr_changed_cb = cb;
 }
 
+void lorawan_register_link_check_ans_callback(lorawan_link_check_ans_cb_t cb)
+{
+	link_check_cb = cb;
+}
+
 int lorawan_start(void)
 {
 	LoRaMacStatus_t status;
diff --git a/subsys/lorawan/services/frag_transport.c b/subsys/lorawan/services/frag_transport.c
index 5bb180bb161f8..2ee4c86e40f40 100644
--- a/subsys/lorawan/services/frag_transport.c
+++ b/subsys/lorawan/services/frag_transport.c
@@ -101,6 +101,9 @@ static struct frag_transport_context ctx;
 /* Callback for notification of finished firmware transfer */
 static void (*finished_cb)(void);
 
+/* Callback to handle descriptor field */
+static transport_descriptor_cb descriptor_cb;
+
 static void frag_transport_package_callback(uint8_t port, uint8_t flags, int16_t rssi, int8_t snr,
 					    uint8_t len, const uint8_t *rx_buf)
 {
@@ -207,7 +210,14 @@ static void frag_transport_package_callback(uint8_t port, uint8_t flags, int16_t
 			}
 #endif
 
-			/* Descriptor not used: Ignore Wrong Descriptor error */
+			if (descriptor_cb != NULL) {
+				int rc = descriptor_cb(ctx.descriptor);
+
+				if (rc < 0) {
+					/* Wrong Descriptor */
+					status |= BIT(3);
+				}
+			}
 
 			if ((status & 0x1F) == 0) {
 #ifdef CONFIG_LORAWAN_FRAG_TRANSPORT_DECODER_SEMTECH
@@ -314,6 +324,11 @@ static void frag_transport_package_callback(uint8_t port, uint8_t flags, int16_t
 	}
 }
 
+void lorawan_frag_transport_register_descriptor_callback(transport_descriptor_cb cb)
+{
+	descriptor_cb = cb;
+}
+
 static struct lorawan_downlink_cb downlink_cb = {
 	.port = (uint8_t)LORAWAN_PORT_FRAG_TRANSPORT,
 	.cb = frag_transport_package_callback,
diff --git a/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_uart.c b/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_uart.c
index 6f9e5fcabd3e9..fb7e4eec86ea2 100644
--- a/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_uart.c
+++ b/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_uart.c
@@ -123,12 +123,11 @@ static void rx_timeout(struct k_work *work)
 	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
 	struct ec_host_cmd_uart_ctx *hc_uart =
 		CONTAINER_OF(dwork, struct ec_host_cmd_uart_ctx, timeout_work);
-	int res;
 
 	LOG_ERR("Request error in state: %s", state_name[hc_uart->state]);
 
-	res = uart_rx_disable(hc_uart->uart_dev);
-	res = uart_rx_enable(hc_uart->uart_dev, hc_uart->rx_ctx->buf, hc_uart->rx_buf_size, 0);
+	uart_rx_disable(hc_uart->uart_dev);
+	uart_rx_enable(hc_uart->uart_dev, hc_uart->rx_ctx->buf, hc_uart->rx_buf_size, 0);
 
 	hc_uart->state = UART_HOST_CMD_READY_TO_RX;
 }
diff --git a/subsys/mgmt/hawkbit/Kconfig b/subsys/mgmt/hawkbit/Kconfig
index abc83b3ff0a94..936581152036a 100644
--- a/subsys/mgmt/hawkbit/Kconfig
+++ b/subsys/mgmt/hawkbit/Kconfig
@@ -19,7 +19,6 @@ menuconfig HAWKBIT
 	select MPU_ALLOW_FLASH_WRITE
 	select IMG_ENABLE_IMAGE_CHECK
 	select IMG_ERASE_PROGRESSIVELY
-	imply HWINFO if !HAWKBIT_CUSTOM_DEVICE_ID
 	help
 	  hawkBit is a domain independent back-end framework for polling out
 	  software updates to constrained edge devices as well as more powerful
@@ -113,12 +112,21 @@ config HAWKBIT_STATUS_BUFFER_SIZE
 	  json strings, that are sent to the hawkBit server. It might
 	  be increased if the custom attributes are used extensively.
 
+choice HAWKBIT_DEVICE_ID_SOURCE
+	prompt "Source of the Hawkbit device ID"
+
+config HAWKBIT_HWINFO_DEVICE_ID
+	bool "Device ID through HWINFO module"
+	depends on HWINFO
+
 config HAWKBIT_CUSTOM_DEVICE_ID
 	bool "Custom device id through callback function"
 	help
 	  Be able to customize the device id during runtime to a custom value,
 	  by configuring the callback function. See `hawkbit_set_device_identity_cb`
 
+endchoice
+
 config HAWKBIT_DEVICE_ID_MAX_LENGTH
 	int "Maximum length of the device id"
 	depends on HAWKBIT_CUSTOM_DEVICE_ID
diff --git a/subsys/mgmt/hawkbit/hawkbit_device.c b/subsys/mgmt/hawkbit/hawkbit_device.c
index 2d39c845a3e68..c574316667a52 100644
--- a/subsys/mgmt/hawkbit/hawkbit_device.c
+++ b/subsys/mgmt/hawkbit/hawkbit_device.c
@@ -19,7 +19,7 @@ bool hawkbit_get_device_identity(char *id, int id_max_len)
 
 static bool hawkbit_get_device_identity_default(char *id, int id_max_len)
 {
-#ifdef CONFIG_HWINFO
+#ifdef CONFIG_HAWKBIT_HWINFO_DEVICE_ID
 	uint8_t hwinfo_id[DEVICE_ID_BIN_MAX_SIZE];
 	ssize_t length;
 
@@ -32,12 +32,12 @@ static bool hawkbit_get_device_identity_default(char *id, int id_max_len)
 	length = bin2hex(hwinfo_id, (size_t)length, id, id_max_len);
 
 	return length > 0;
-#else /* CONFIG_HWINFO */
+#else /* CONFIG_HAWKBIT_HWINFO_DEVICE_ID */
 	ARG_UNUSED(id);
 	ARG_UNUSED(id_max_len);
 
 	return false;
-#endif /* CONFIG_HWINFO */
+#endif /* CONFIG_HAWKBIT_HWINFO_DEVICE_ID */
 }
 
 #ifdef CONFIG_HAWKBIT_CUSTOM_DEVICE_ID
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
index d0d80531c1173..0a006370ceaa9 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
@@ -85,6 +85,7 @@ config MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_IMAGE_ANY
 if !MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
 config MCUMGR_GRP_IMG_ALLOW_ERASE_PENDING
 	bool "Allow to erase pending slot"
+	default y
 	help
 	  Allows erasing secondary slot which is marked for test or confirmed; this allows
 	  erasing slots that have been set for next boot but the device has not
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c
index 63900f4250c4e..3c9223a54e163 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c
@@ -563,6 +563,7 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 	if (req->off == SIZE_MAX) {
 		/* Request did not include an `off` field. */
 		IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action, img_mgmt_err_str_hdr_malformed);
+		LOG_DBG("Request did not include an `off` field");
 		return IMG_MGMT_ERR_INVALID_OFFSET;
 	}
 
@@ -588,12 +589,15 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 		if (req->img_data.len < sizeof(struct image_header)) {
 			/*  Image header is the first thing in the image */
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action, img_mgmt_err_str_hdr_malformed);
+			LOG_DBG("Image data too short: %u < %u", req->img_data.len,
+				sizeof(struct image_header));
 			return IMG_MGMT_ERR_INVALID_IMAGE_HEADER;
 		}
 
 		if (req->size == SIZE_MAX) {
 			/* Request did not include a `len` field. */
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action, img_mgmt_err_str_hdr_malformed);
+			LOG_DBG("Request did not include a `len` field");
 			return IMG_MGMT_ERR_INVALID_LENGTH;
 		}
 
@@ -602,10 +606,12 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 		hdr = (struct image_header *)req->img_data.value;
 		if (hdr->ih_magic != IMAGE_MAGIC) {
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action, img_mgmt_err_str_magic_mismatch);
+			LOG_DBG("Magic mismatch: %08X != %08X", hdr->ih_magic, IMAGE_MAGIC);
 			return IMG_MGMT_ERR_INVALID_IMAGE_HEADER_MAGIC;
 		}
 
 		if (req->data_sha.len > IMG_MGMT_DATA_SHA_LEN) {
+			LOG_DBG("Invalid hash length: %u", req->data_sha.len);
 			return IMG_MGMT_ERR_INVALID_HASH;
 		}
 
@@ -625,8 +631,9 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 
 		action->area_id = img_mgmt_get_unused_slot_area_id(req->image);
 		if (action->area_id < 0) {
-			/* No slot where to upload! */
+			/* No slot available to upload to */
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action, img_mgmt_err_str_no_slot);
+			LOG_DBG("No slot available to upload to");
 			return IMG_MGMT_ERR_NO_FREE_SLOT;
 		}
 
@@ -643,7 +650,8 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action,
 				img_mgmt_err_str_image_too_large);
 			flash_area_close(fa);
-			LOG_ERR("Upload too large for slot: %u > %u", req->size, fa->fa_size);
+			LOG_DBG("Upload too large for slot: %u > %u", req->size,
+				fa->fa_size);
 			return IMG_MGMT_ERR_INVALID_IMAGE_TOO_LARGE;
 		}
 
@@ -695,7 +703,7 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action,
 				img_mgmt_err_str_image_too_large);
 			flash_area_close(fa);
-			LOG_ERR("Upload too large for slot (with end offset): %u > %u", req->size,
+			LOG_DBG("Upload too large for slot (with end offset): %u > %u", req->size,
 				(fa->fa_size - CONFIG_MCUBOOT_UPDATE_FOOTER_SIZE));
 			return IMG_MGMT_ERR_INVALID_IMAGE_TOO_LARGE;
 		}
@@ -710,7 +718,7 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action,
 				img_mgmt_err_str_image_too_large);
 			flash_area_close(fa);
-			LOG_ERR("Upload too large for slot (with max image size): %u > %u",
+			LOG_DBG("Upload too large for slot (with max image size): %u > %u",
 				req->size, max_image_size);
 			return IMG_MGMT_ERR_INVALID_IMAGE_TOO_LARGE;
 		}
@@ -722,6 +730,8 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 				IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action,
 					img_mgmt_err_str_image_bad_flash_addr);
 				flash_area_close(fa);
+				LOG_DBG("Invalid flash address: %08X, expected: %08X",
+					hdr->ih_load_addr, (int)fa->fa_off);
 				return IMG_MGMT_ERR_INVALID_FLASH_ADDRESS;
 			}
 		}
@@ -735,12 +745,18 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 			 */
 			rc = img_mgmt_my_version(&cur_ver);
 			if (rc != 0) {
+				LOG_DBG("Version get failed: %d", rc);
 				return IMG_MGMT_ERR_VERSION_GET_FAILED;
 			}
 
 			if (img_mgmt_vercmp(&cur_ver, &hdr->ih_ver) >= 0) {
 				IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action,
 					img_mgmt_err_str_downgrade);
+				LOG_DBG("Downgrade: %d.%d.%d.%d, expected: %d.%d.%d.%d",
+					cur_ver.iv_major, cur_ver.iv_minor, cur_ver.iv_revision,
+					cur_ver.iv_build_num, hdr->ih_ver.iv_major,
+					hdr->ih_ver.iv_minor, hdr->ih_ver.iv_revision,
+					hdr->ih_ver.iv_build_num);
 				return IMG_MGMT_ERR_CURRENT_VERSION_IS_NEWER;
 			}
 		}
@@ -748,6 +764,7 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 #ifndef CONFIG_IMG_ERASE_PROGRESSIVELY
 		rc = img_mgmt_flash_check_empty(action->area_id);
 		if (rc < 0) {
+			LOG_DBG("Flash check empty failed: %d", rc);
 			return rc;
 		}
 
@@ -763,6 +780,8 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 			 * Invalid offset. Drop the data, and respond with the offset we're
 			 * expecting data for.
 			 */
+			LOG_DBG("Invalid offset: %08x, expected: %08x", req->off,
+				g_img_mgmt_state.off);
 			return IMG_MGMT_ERR_OK;
 		}
 
@@ -771,6 +790,8 @@ int img_mgmt_upload_inspect(const struct img_mgmt_upload_req *req,
 			 * of the image that the client originally sent
 			 */
 			IMG_MGMT_UPLOAD_ACTION_SET_RC_RSN(action, img_mgmt_err_str_data_overrun);
+			LOG_DBG("Data overrun: %u + %u > %llu", req->off, req->img_data.len,
+				action->size);
 			return IMG_MGMT_ERR_INVALID_IMAGE_DATA_OVERRUN;
 		}
 	}
@@ -789,6 +810,7 @@ int img_mgmt_erased_val(int slot, uint8_t *erased_val)
 	int area_id = img_mgmt_flash_area_id(slot);
 
 	if (area_id < 0) {
+		LOG_DBG("Invalid slot: %d", area_id);
 		return IMG_MGMT_ERR_INVALID_SLOT;
 	}
 
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h b/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
index 71dfda7c19311..21f9f272a6337 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/include/os_mgmt_processor.h
@@ -103,6 +103,8 @@ extern "C" {
 #else
 #define PROCESSOR_NAME "cortex-r52"
 #endif
+#elif defined(CONFIG_CPU_CORTEX_A7)
+#define PROCESSOR_NAME "cortex-a7"
 #elif defined(CONFIG_CPU_CORTEX_A9)
 #define PROCESSOR_NAME "cortex-a9"
 #endif
diff --git a/subsys/mgmt/mcumgr/smp/src/smp.c b/subsys/mgmt/mcumgr/smp/src/smp.c
index 693a26f4d1fd6..0da3815907d1d 100644
--- a/subsys/mgmt/mcumgr/smp/src/smp.c
+++ b/subsys/mgmt/mcumgr/smp/src/smp.c
@@ -310,9 +310,15 @@ static int smp_handle_single_req(struct smp_streamer *streamer, const struct smp
 	}
 #endif
 
-	smp_make_rsp_hdr(req_hdr, &rsp_hdr,
-			 zsp->payload_mut - nbw->nb->data - MGMT_HDR_SIZE);
-	nbw->nb->len = zsp->payload_mut - nbw->nb->data;
+#if defined(CONFIG_MCUMGR_MGMT_CUSTOM_PAYLOAD)
+	if (!mgmt_find_group(req_hdr->nh_group)->custom_payload) {
+#endif
+		nbw->nb->len = zsp->payload_mut - nbw->nb->data;
+#if defined(CONFIG_MCUMGR_MGMT_CUSTOM_PAYLOAD)
+	}
+#endif
+
+	smp_make_rsp_hdr(req_hdr, &rsp_hdr, (nbw->nb->len - MGMT_HDR_SIZE));
 	smp_write_hdr(streamer, &rsp_hdr);
 
 	return 0;
diff --git a/subsys/mgmt/mcumgr/transport/src/smp_lorawan.c b/subsys/mgmt/mcumgr/transport/src/smp_lorawan.c
index e6d330d01bbdf..b073626add464 100644
--- a/subsys/mgmt/mcumgr/transport/src/smp_lorawan.c
+++ b/subsys/mgmt/mcumgr/transport/src/smp_lorawan.c
@@ -249,10 +249,6 @@ static void smp_lorawan_start(void)
 		LOG_ERR("Failed to init LoRaWAN MCUmgr SMP transport: %d", rc);
 	}
 
-#ifdef CONFIG_MCUMGR_TRANSPORT_LORAWAN_REASSEMBLY
-	smp_reassembly_init(&smp_lorawan_transport);
-#endif
-
 #ifdef CONFIG_MCUMGR_TRANSPORT_LORAWAN_POLL_FOR_DATA
 	k_thread_create(&smp_lorawan_thread, smp_lorawan_stack,
 			K_KERNEL_STACK_SIZEOF(smp_lorawan_stack),
diff --git a/subsys/modem/Kconfig b/subsys/modem/Kconfig
index 90a4ded36e723..211c5fa084f11 100644
--- a/subsys/modem/Kconfig
+++ b/subsys/modem/Kconfig
@@ -29,10 +29,34 @@ config MODEM_CMUX
 
 if MODEM_CMUX
 
+config MODEM_CMUX_DEFAULT_MTU_127
+	bool
+	default y if (DT_HAS_QUECTEL_BG95_ENABLED || DT_HAS_QUECTEL_EG25_G_ENABLED || \
+		      DT_HAS_SIMCOM_SIM7080_ENABLED || DT_HAS_U_BLOX_SARA_R4_ENABLED || \
+		      DT_HAS_U_BLOX_SARA_R5_ENABLED || DT_HAS_SWIR_HL7800_ENABLED || \
+		      DT_HAS_TELIT_ME910G1_ENABLED || DT_HAS_TELIT_ME310G1_ENABLED || \
+		      DT_HAS_SQN_GM02S_ENABLED)
+	help
+	  Use the default MTU size of 127 bytes for the CMUX module on certain modems.
+	  This must match the AT+CMUX commands in the modem_cellular driver.
+
+config MODEM_CMUX_MTU
+	int "CMUX MTU size in bytes"
+	range 16 1500
+	default 127 if MODEM_CMUX_DEFAULT_MTU_127
+	default 31
+	help
+	  Maximum Transmission Unit (MTU) size for the CMUX module.
+	  Linux ldattach defaults to 127 bytes, 3GPP TS 27.010 to 31.
+
 config MODEM_CMUX_WORK_BUFFER_SIZE
 	int "CMUX module work buffer size in bytes"
-	range 16 1500
-	default 64
+	range 23 1507
+	default 134 if MODEM_CMUX_DEFAULT_MTU_127
+	default 38
+	help
+	  Size of the work buffer used by the CMUX module.
+	  Recommended size is MODEM_CMUX_MTU + 7 (CMUX header size).
 
 module = MODEM_CMUX
 module-str = modem_cmux
diff --git a/subsys/modem/modem_cmux.c b/subsys/modem/modem_cmux.c
index 7a78b06a8f346..48498f5b72c05 100644
--- a/subsys/modem/modem_cmux.c
+++ b/subsys/modem/modem_cmux.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(modem_cmux, CONFIG_MODEM_CMUX_LOG_LEVEL);
 #define MODEM_CMUX_EA				(0x01)
 #define MODEM_CMUX_CR				(0x02)
 #define MODEM_CMUX_PF				(0x10)
-#define MODEM_CMUX_FRAME_SIZE_MAX		(0x08)
+#define MODEM_CMUX_FRAME_SIZE_MAX		(0x07)
 #define MODEM_CMUX_DATA_SIZE_MIN		(0x08)
 #define MODEM_CMUX_DATA_FRAME_SIZE_MIN		(MODEM_CMUX_FRAME_SIZE_MAX + \
 						 MODEM_CMUX_DATA_SIZE_MIN)
@@ -274,6 +274,7 @@ static uint16_t modem_cmux_transmit_frame(struct modem_cmux *cmux,
 
 	space = ring_buf_space_get(&cmux->transmit_rb) - MODEM_CMUX_FRAME_SIZE_MAX;
 	data_len = MIN(space, frame->data_len);
+	data_len = MIN(data_len, CONFIG_MODEM_CMUX_MTU);
 
 	/* SOF */
 	buf[0] = 0xF9;
@@ -358,15 +359,15 @@ static int16_t modem_cmux_transmit_data_frame(struct modem_cmux *cmux,
 	space = ring_buf_space_get(&cmux->transmit_rb);
 
 	/*
-	 * Two command frames are reserved for command channel, and we shall prefer
+	 * One command frame is reserved for command channel, and we shall prefer
 	 * waiting for more than MODEM_CMUX_DATA_FRAME_SIZE_MIN bytes available in the
 	 * transmit buffer rather than transmitting a few bytes at a time. This avoids
 	 * excessive wrapping overhead, since transmitting a single byte will require 8
 	 * bytes of wrapping.
 	 */
-	if (space < ((MODEM_CMUX_CMD_FRAME_SIZE_MAX * 2) + MODEM_CMUX_DATA_FRAME_SIZE_MIN)) {
+	if (space < (MODEM_CMUX_CMD_FRAME_SIZE_MAX + MODEM_CMUX_DATA_FRAME_SIZE_MIN)) {
 		k_mutex_unlock(&cmux->transmit_rb_lock);
-		return -ENOMEM;
+		return 0;
 	}
 
 	modem_cmux_log_transmit_frame(frame);
@@ -797,6 +798,12 @@ static void modem_cmux_process_received_byte(struct modem_cmux *cmux, uint8_t by
 			break;
 		}
 
+		if (cmux->frame.data_len > CONFIG_MODEM_CMUX_MTU) {
+			LOG_ERR("Too large frame");
+			cmux->receive_state = MODEM_CMUX_RECEIVE_STATE_DROP;
+			break;
+		}
+
 		/* Check if no data field */
 		if (cmux->frame.data_len == 0) {
 			/* Await FCS */
@@ -816,6 +823,12 @@ static void modem_cmux_process_received_byte(struct modem_cmux *cmux, uint8_t by
 		/* Get last 8 bits of data length */
 		cmux->frame.data_len |= ((uint16_t)byte) << 7;
 
+		if (cmux->frame.data_len > CONFIG_MODEM_CMUX_MTU) {
+			LOG_ERR("Too large frame");
+			cmux->receive_state = MODEM_CMUX_RECEIVE_STATE_DROP;
+			break;
+		}
+
 		if (cmux->frame.data_len > cmux->receive_buf_size) {
 			LOG_ERR("Indicated frame data length %u exceeds receive buffer size %u",
 				cmux->frame.data_len, cmux->receive_buf_size);
@@ -1239,9 +1252,11 @@ void modem_cmux_init(struct modem_cmux *cmux, const struct modem_cmux_config *co
 	__ASSERT_NO_MSG(cmux != NULL);
 	__ASSERT_NO_MSG(config != NULL);
 	__ASSERT_NO_MSG(config->receive_buf != NULL);
-	__ASSERT_NO_MSG(config->receive_buf_size >= 126);
+	__ASSERT_NO_MSG(config->receive_buf_size >=
+			(CONFIG_MODEM_CMUX_MTU + MODEM_CMUX_FRAME_SIZE_MAX));
 	__ASSERT_NO_MSG(config->transmit_buf != NULL);
-	__ASSERT_NO_MSG(config->transmit_buf_size >= 148);
+	__ASSERT_NO_MSG(config->transmit_buf_size >=
+			(CONFIG_MODEM_CMUX_MTU + MODEM_CMUX_FRAME_SIZE_MAX));
 
 	memset(cmux, 0x00, sizeof(*cmux));
 	cmux->callback = config->callback;
diff --git a/subsys/net/ip/6lo.c b/subsys/net/ip/6lo.c
index 5d951fb3f8f8d..6a0dfa6675869 100644
--- a/subsys/net/ip/6lo.c
+++ b/subsys/net/ip/6lo.c
@@ -365,8 +365,6 @@ static uint8_t *compress_nh(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
 static uint8_t *compress_sa(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
 			 uint8_t *inline_ptr, uint16_t *iphc)
 {
-	NET_ASSERT(net_pkt_lladdr_src(pkt)->addr);
-
 	/* Address is fully elided */
 	if (net_ipv6_addr_based_on_ll((struct in6_addr *)ipv6->src,
 				      net_pkt_lladdr_src(pkt))) {
@@ -411,8 +409,6 @@ static uint8_t *compress_sa_ctx(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
 			     struct net_pkt *pkt, uint16_t *iphc,
 			     struct net_6lo_context *src)
 {
-	NET_ASSERT(net_pkt_lladdr_src(pkt)->addr);
-
 	NET_DBG("SAC_1 src address context based");
 	*iphc |= NET_6LO_IPHC_SAC_1;
 
@@ -510,8 +506,6 @@ static uint8_t *compress_da_mcast(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr
 static uint8_t *compress_da(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
 			 uint8_t *inline_ptr, uint16_t *iphc)
 {
-	NET_ASSERT(net_pkt_lladdr_dst(pkt)->addr);
-
 	/* Address is fully elided */
 	if (net_ipv6_addr_based_on_ll((struct in6_addr *)ipv6->dst,
 				      net_pkt_lladdr_dst(pkt))) {
diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index 84fcdf3f7a507..e822e881881bb 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -268,6 +268,11 @@ config NET_SHELL_PKT_ALLOC_SUPPORTED
 	default y
 	depends on NET_SHELL_SHOW_DISABLED_COMMANDS || NET_DEBUG_NET_PKT_ALLOC
 
+config NET_SHELL_PKT_FILTER_SUPPORTED
+	bool "Network packet filter related configuration"
+	default y
+	depends on NET_SHELL_SHOW_DISABLED_COMMANDS || NET_PKT_FILTER
+
 config NET_SHELL_PMTU_SUPPORTED
 	bool "PMTU config"
 	default y
@@ -662,6 +667,12 @@ config NET_MAX_CONN
 	  The value depends on your network needs. The value
 	  should include both UDP and TCP connections.
 
+config NET_CONN_PACKET_CLONE_TIMEOUT
+	int "Timeout value in milliseconds for cloning a packet"
+	default 100
+	help
+	  Maximum wait time when cloning a packet for a network connection.
+
 config NET_MAX_CONTEXTS
 	int "Number of network contexts to allocate"
 	default 6
diff --git a/subsys/net/ip/Kconfig.ipv4 b/subsys/net/ip/Kconfig.ipv4
index e6f3976948d25..842a02edd7b5e 100644
--- a/subsys/net/ip/Kconfig.ipv4
+++ b/subsys/net/ip/Kconfig.ipv4
@@ -42,6 +42,14 @@ config NET_IPV4_DEFAULT_NETMASK
 
 if NET_NATIVE_IPV4
 
+config NET_IPV4_MTU
+	int "Initial IPv4 MTU value"
+	default 576
+	range 576 1500
+	help
+	  The value should normally be 576 which is the minimum IPv4 packet
+	  size that implementations need to support without fragmentation.
+
 config NET_INITIAL_TTL
 	int "Initial IPv4 time to live value for unicast packets"
 	default 64
@@ -65,6 +73,13 @@ config NET_INITIAL_MCAST_TTL
 	  don't leave the local network unless the application explicitly
 	  requests it.
 
+config NET_INITIAL_IPV4_MCAST_LOOP
+	bool "Control whether the socket sees multicast packets sent by itself"
+	default y
+	help
+	Assign initial value to IPV4_MULTICAST_LOOP in socket options,
+	if not set by the user using setsockopt().
+
 config NET_IF_MCAST_IPV4_SOURCE_COUNT
 	int "Max number of IPv4 sources per mcast address to be included or excluded"
 	default 1
diff --git a/subsys/net/ip/Kconfig.ipv6 b/subsys/net/ip/Kconfig.ipv6
index 7ee65cc9375c0..017061b974a27 100644
--- a/subsys/net/ip/Kconfig.ipv6
+++ b/subsys/net/ip/Kconfig.ipv6
@@ -1,6 +1,7 @@
 # IPv6 Options
 
 # Copyright (c) 2016 Intel Corporation.
+# Copyright (c) 2025 Aerlync Labs Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig NET_IPV6
@@ -81,6 +82,13 @@ config NET_INITIAL_MCAST_HOP_LIMIT
 	  don't leave the local network unless the application explicitly
 	  requests it.
 
+config NET_INITIAL_IPV6_MCAST_LOOP
+	bool "Control whether the socket sees multicast packets sent by itself"
+	default y
+	help
+	  Assign initial value to IPV6_MULTICAST_LOOP in socket options,
+	  if not set by the user using setsockopt().
+
 config NET_IPV6_MAX_NEIGHBORS
 	int "How many IPv6 neighbors are supported"
 	default 8
diff --git a/subsys/net/ip/Kconfig.stats b/subsys/net/ip/Kconfig.stats
index 48d4246c49e75..e7ed8dfaa28b7 100644
--- a/subsys/net/ip/Kconfig.stats
+++ b/subsys/net/ip/Kconfig.stats
@@ -114,6 +114,13 @@ config NET_STATISTICS_DNS
 	help
 	  Keep track of DNS related statistics
 
+config NET_STATISTICS_PKT_FILTER
+	bool "Network packet filter statistics"
+	depends on NET_PKT_FILTER
+	default y
+	help
+	  Keep track of network packet filter related statistics
+
 config NET_STATISTICS_PPP
 	bool "Point-to-point (PPP) statistics"
 	depends on NET_L2_PPP
@@ -162,4 +169,11 @@ config NET_STATISTICS_VIA_PROMETHEUS
 	  Enable this option to expose the network statistics
 	  to Prometheus monitoring system.
 
+config NET_STATISTICS_VPN
+	bool "VPN statistics"
+	depends on NET_VPN
+	default y
+	help
+	  Keep track of VPN related statistics
+
 endif # NET_STATISTICS
diff --git a/subsys/net/ip/connection.c b/subsys/net/ip/connection.c
index d105da2e943ea..00696ec065d2d 100644
--- a/subsys/net/ip/connection.c
+++ b/subsys/net/ip/connection.c
@@ -33,9 +33,6 @@ LOG_MODULE_REGISTER(net_conn, CONFIG_NET_CONN_LOG_LEVEL);
 #include "connection.h"
 #include "net_stats.h"
 
-/** How long to wait for when cloning multicast packet */
-#define CLONE_TIMEOUT K_MSEC(100)
-
 /** Is this connection used or not */
 #define NET_CONN_IN_USE			BIT(0)
 
@@ -325,7 +322,7 @@ static int net_conn_change_remote(struct net_conn *conn,
 	return 0;
 }
 
-int net_conn_register(uint16_t proto, uint8_t family,
+int net_conn_register(uint16_t proto, enum net_sock_type type, uint8_t family,
 		      const struct sockaddr *remote_addr,
 		      const struct sockaddr *local_addr,
 		      uint16_t remote_port,
@@ -408,6 +405,7 @@ int net_conn_register(uint16_t proto, uint8_t family,
 
 	conn->flags = flags;
 	conn->proto = proto;
+	conn->type = type;
 	conn->family = family;
 	conn->context = context;
 
@@ -617,7 +615,7 @@ static enum net_verdict conn_raw_socket(struct net_pkt *pkt,
 	NET_DBG("[%p] raw match found cb %p ud %p", conn, conn->cb,
 		conn->user_data);
 
-	raw_pkt = net_pkt_clone(pkt, CLONE_TIMEOUT);
+	raw_pkt = net_pkt_clone(pkt, K_MSEC(CONFIG_NET_CONN_PACKET_CLONE_TIMEOUT));
 	if (!raw_pkt) {
 		net_stats_update_per_proto_drop(pkt_iface, proto);
 		NET_WARN("pkt cloning failed, pkt %p dropped", pkt);
@@ -634,6 +632,38 @@ static enum net_verdict conn_raw_socket(struct net_pkt *pkt,
 	return NET_OK;
 }
 
+#if defined(CONFIG_NET_SOCKETS_INET_RAW)
+static void conn_raw_ip_socket(struct net_pkt *pkt, struct net_conn *conn)
+{
+	struct net_pkt *raw_pkt;
+	struct net_pkt_cursor cur;
+
+	net_pkt_cursor_backup(pkt, &cur);
+	net_pkt_cursor_init(pkt);
+
+	NET_DBG("[%p] raw IP match found cb %p ud %p", conn, conn->cb,
+		conn->user_data);
+
+	raw_pkt = net_pkt_clone(pkt, K_MSEC(CONFIG_NET_CONN_PACKET_CLONE_TIMEOUT));
+	if (raw_pkt == NULL) {
+		goto out;
+	}
+
+	if (conn->cb(conn, raw_pkt, NULL, NULL, conn->user_data) == NET_DROP) {
+		net_pkt_unref(raw_pkt);
+	}
+
+out:
+	net_pkt_cursor_restore(pkt, &cur);
+}
+#else
+static void conn_raw_ip_socket(struct net_pkt *pkt, struct net_conn *conn)
+{
+	ARG_UNUSED(pkt);
+	ARG_UNUSED(conn);
+}
+#endif /* defined(CONFIG_NET_SOCKETS_INET_RAW) */
+
 enum net_verdict net_conn_input(struct net_pkt *pkt,
 				union net_ip_header *ip_hdr,
 				uint8_t proto,
@@ -642,14 +672,18 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 	struct net_if *pkt_iface = net_pkt_iface(pkt);
 	uint8_t pkt_family = net_pkt_family(pkt);
 	uint16_t src_port = 0U, dst_port = 0U;
+	bool raw_ip_pkt = false;
 
 	if (!net_pkt_filter_local_in_recv_ok(pkt)) {
 		/* drop the packet */
+		net_stats_update_filter_rx_local_drop(net_pkt_iface(pkt));
 		return NET_DROP;
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IP) && (pkt_family == AF_INET || pkt_family == AF_INET6)) {
-		if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) {
+		if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && proto_hdr == NULL) {
+			raw_ip_pkt = true;
+		} else if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) {
 			src_port = proto_hdr->udp->src_port;
 			dst_port = proto_hdr->udp->dst_port;
 		} else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) {
@@ -659,12 +693,13 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 			src_port = proto_hdr->tcp->src_port;
 			dst_port = proto_hdr->tcp->dst_port;
 		}
-		if (!conn_are_endpoints_valid(pkt, pkt_family, ip_hdr, src_port, dst_port)) {
+		if (!raw_ip_pkt && !conn_are_endpoints_valid(pkt, pkt_family, ip_hdr,
+							     src_port, dst_port)) {
 			NET_DBG("Dropping invalid src/dst end-points packet");
 			return NET_DROP;
 		}
 	} else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && pkt_family == AF_PACKET) {
-		if (proto != ETH_P_ALL && proto != IPPROTO_RAW) {
+		if (proto != ETH_P_ALL) {
 			return NET_DROP;
 		}
 	} else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && pkt_family == AF_CAN) {
@@ -692,7 +727,7 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 	net_conn_cb_t cb = NULL;
 	void *user_data = NULL;
 
-	if (IS_ENABLED(CONFIG_NET_IP)) {
+	if (IS_ENABLED(CONFIG_NET_IP) && !raw_ip_pkt) {
 		/* If we receive a packet with multicast destination address, we might
 		 * need to deliver the packet to multiple recipients.
 		 */
@@ -735,7 +770,7 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 
 			if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) {
 				if (!(conn->family == AF_INET6 && pkt_family == AF_INET &&
-				      !conn->v6only)) {
+				      !conn->v6only && conn->type != SOCK_RAW)) {
 					continue;
 				}
 			} else {
@@ -745,17 +780,26 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 			/* We might have a match for v4-to-v6 mapping, check more */
 		}
 
+		if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && raw_ip_pkt &&
+		    conn->type != SOCK_RAW) {
+			continue;
+		}
+
 		/* Is the candidate connection matching the packet's protocol within the family? */
 		if (conn->proto != proto) {
 			/* For packet socket data, the proto is set to ETH_P_ALL
-			 * or IPPROTO_RAW but the listener might have a specific
-			 * protocol set. This is ok and let the packet pass this
-			 * check in this case.
+			 * but the listener might have a specific protocol set.
+			 * This is ok and let the packet pass this check in this
+			 * case.
 			 */
 			if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && pkt_family == AF_PACKET) {
-				if (proto != ETH_P_ALL && proto != IPPROTO_RAW) {
+				if (conn->proto == 0 || proto != ETH_P_ALL) {
 					continue; /* wrong protocol */
 				}
+			} else if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && raw_ip_pkt) {
+				if (conn->proto != IPPROTO_IP) {
+					continue;
+				}
 			} else {
 				continue; /* wrong protocol */
 			}
@@ -770,17 +814,15 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 			 * targets AF_PACKET sockets.
 			 *
 			 * All AF_PACKET connections will receive the packet if
-			 * their socket type and - in case of IPPROTO - protocol
-			 * also matches.
+			 * their socket type and protocol also matches.
 			 */
-			if (proto == ETH_P_ALL) {
-				/* We shall continue with ETH_P_ALL to IPPROTO_RAW: */
+			if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET_DGRAM) &&
+			    (proto == ETH_P_ALL) && !net_pkt_is_l2_processed(pkt)) {
+				/* We shall continue with ETH_P_ALL to AF_PACKET/SOCK_DGRAM: */
 				raw_pkt_continue = true;
 			}
 
-			/* With IPPROTO_RAW deliver only if protocol match: */
-			if ((proto == ETH_P_ALL && conn->proto != IPPROTO_RAW) ||
-			    conn->proto == proto) {
+			if (proto == ETH_P_ALL) {
 				enum net_verdict ret = conn_raw_socket(pkt, conn, proto);
 
 				if (ret == NET_DROP) {
@@ -792,6 +834,15 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 
 				continue; /* packet was consumed */
 			}
+		} else if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && raw_ip_pkt) {
+			if ((conn->flags & NET_CONN_LOCAL_ADDR_SET) &&
+			    !conn_addr_cmp(pkt, ip_hdr, &conn->local_addr, false)) {
+				continue; /* wrong local address */
+			}
+
+			conn_raw_ip_socket(pkt, conn);
+
+			continue;
 		} else if ((IS_ENABLED(CONFIG_NET_UDP) || IS_ENABLED(CONFIG_NET_TCP)) &&
 			   (conn_family == AF_INET || conn_family == AF_INET6 ||
 			    conn_family == AF_UNSPEC)) {
@@ -857,7 +908,8 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 				NET_DBG("[%p] mcast match found cb %p ud %p", conn, conn->cb,
 					conn->user_data);
 
-				mcast_pkt = net_pkt_clone(pkt, CLONE_TIMEOUT);
+				mcast_pkt = net_pkt_clone(
+					pkt, K_MSEC(CONFIG_NET_CONN_PACKET_CLONE_TIMEOUT));
 				if (!mcast_pkt) {
 					k_mutex_unlock(&conn_lock);
 					goto drop;
@@ -903,6 +955,11 @@ enum net_verdict net_conn_input(struct net_pkt *pkt,
 		}
 	}
 
+	if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && raw_ip_pkt) {
+		/* Raw IP packets are passed further in the stack regardless. */
+		return NET_CONTINUE;
+	}
+
 	if (IS_ENABLED(CONFIG_NET_IP) && is_mcast_pkt && mcast_pkt_delivered) {
 		/* As one or more multicast packets
 		 * have already been delivered in the loop above,
diff --git a/subsys/net/ip/connection.h b/subsys/net/ip/connection.h
index 32280f51cae7d..f8e6ab472ca14 100644
--- a/subsys/net/ip/connection.h
+++ b/subsys/net/ip/connection.h
@@ -74,6 +74,9 @@ struct net_conn {
 	/** Connection protocol */
 	uint16_t proto;
 
+	/** Connection type */
+	enum net_sock_type type;
+
 	/** Protocol family */
 	uint8_t family;
 
@@ -90,6 +93,7 @@ struct net_conn {
  *
  * @param proto Protocol for the connection (depends on the protocol
  *              family, e.g. UDP/TCP in the case of AF_INET/AF_INET6)
+ * @param type Connection type (SOCK_STREAM/DGRAM/RAW)
  * @param family Protocol family (AF_*)
  * @param remote_addr Remote address of the connection end point.
  * @param local_addr Local address of the connection end point.
@@ -103,7 +107,7 @@ struct net_conn {
  * @return Return 0 if the registration succeed, <0 otherwise.
  */
 #if defined(CONFIG_NET_NATIVE)
-int net_conn_register(uint16_t proto, uint8_t family,
+int net_conn_register(uint16_t proto, enum net_sock_type type, uint8_t family,
 		      const struct sockaddr *remote_addr,
 		      const struct sockaddr *local_addr,
 		      uint16_t remote_port,
@@ -113,7 +117,8 @@ int net_conn_register(uint16_t proto, uint8_t family,
 		      void *user_data,
 		      struct net_conn_handle **handle);
 #else
-static inline int net_conn_register(uint16_t proto, uint8_t family,
+static inline int net_conn_register(uint16_t proto, enum net_sock_type type,
+				    uint8_t family,
 				    const struct sockaddr *remote_addr,
 				    const struct sockaddr *local_addr,
 				    uint16_t remote_port,
diff --git a/subsys/net/ip/icmp.c b/subsys/net/ip/icmp.c
index e8553726271ef..12d2f02291283 100644
--- a/subsys/net/ip/icmp.c
+++ b/subsys/net/ip/icmp.c
@@ -207,7 +207,7 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx,
 	ctx->user_data = user_data;
 	ctx->iface = iface;
 
-	if (net_send_data(pkt) >= 0) {
+	if (net_try_send_data(pkt, K_NO_WAIT) >= 0) {
 		net_stats_update_icmp_sent(iface);
 		return 0;
 	}
@@ -330,7 +330,7 @@ static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx,
 	ctx->user_data = user_data;
 	ctx->iface = iface;
 
-	if (net_send_data(pkt) >= 0) {
+	if (net_try_send_data(pkt, K_NO_WAIT) >= 0) {
 		net_stats_update_icmp_sent(iface);
 		return 0;
 	}
diff --git a/subsys/net/ip/icmpv4.c b/subsys/net/ip/icmpv4.c
index cc25e572dd4cf..ed0784a5c8df5 100644
--- a/subsys/net/ip/icmpv4.c
+++ b/subsys/net/ip/icmpv4.c
@@ -493,7 +493,7 @@ static int icmpv4_handle_echo_request(struct net_icmp_ctx *ctx,
 		net_sprint_ipv4_addr(src),
 		net_sprint_ipv4_addr(&ip_hdr->src));
 
-	if (net_send_data(reply) < 0) {
+	if (net_try_send_data(reply, K_NO_WAIT) < 0) {
 		goto drop;
 	}
 
@@ -580,15 +580,16 @@ int net_icmpv4_send_error(struct net_pkt *orig, uint8_t type, uint8_t code)
 	net_pkt_cursor_init(pkt);
 	net_ipv4_finalize(pkt, IPPROTO_ICMP);
 
-	net_pkt_lladdr_dst(pkt)->addr = net_pkt_lladdr_src(orig)->addr;
-	net_pkt_lladdr_dst(pkt)->len = net_pkt_lladdr_src(orig)->len;
+	net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+			 net_pkt_lladdr_src(orig)->addr,
+			 net_pkt_lladdr_src(orig)->len);
 
 	NET_DBG("Sending ICMPv4 Error Message type %d code %d from %s to %s",
 		type, code,
 		net_sprint_ipv4_addr(&ip_hdr->dst),
 		net_sprint_ipv4_addr(&ip_hdr->src));
 
-	if (net_send_data(pkt) >= 0) {
+	if (net_try_send_data(pkt, K_NO_WAIT) >= 0) {
 		net_stats_update_icmp_sent(net_pkt_iface(orig));
 		return 0;
 	}
diff --git a/subsys/net/ip/icmpv6.c b/subsys/net/ip/icmpv6.c
index 048521e1c12be..4efdbdcf550ab 100644
--- a/subsys/net/ip/icmpv6.c
+++ b/subsys/net/ip/icmpv6.c
@@ -145,8 +145,8 @@ static int icmpv6_handle_echo_request(struct net_icmp_ctx *ctx,
 	 * that it is set properly using a value from neighbor cache.
 	 * Same for source as it points to original pkt ll src address.
 	 */
-	net_pkt_lladdr_dst(reply)->addr = NULL;
-	net_pkt_lladdr_src(reply)->addr = NULL;
+	(void)net_linkaddr_clear(net_pkt_lladdr_dst(reply));
+	(void)net_linkaddr_clear(net_pkt_lladdr_src(reply));
 
 	net_pkt_set_ip_dscp(reply, net_pkt_ip_dscp(pkt));
 	net_pkt_set_ip_ecn(reply, net_pkt_ip_ecn(pkt));
@@ -169,7 +169,7 @@ static int icmpv6_handle_echo_request(struct net_icmp_ctx *ctx,
 		net_sprint_ipv6_addr(src),
 		net_sprint_ipv6_addr(&ip_hdr->src));
 
-	if (net_send_data(reply) < 0) {
+	if (net_try_send_data(reply, K_NO_WAIT) < 0) {
 		goto drop;
 	}
 
@@ -264,7 +264,8 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code,
 		goto drop;
 	}
 
-	net_pkt_lladdr_dst(pkt)->addr = pkt->buffer->data;
+	memcpy(net_pkt_lladdr_dst(pkt)->addr, pkt->buffer->data,
+	       net_pkt_lladdr_dst(orig)->len);
 
 	ret = net_pkt_write(pkt, net_pkt_lladdr_dst(orig)->addr,
 			    net_pkt_lladdr_dst(orig)->len);
@@ -275,7 +276,8 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code,
 
 	net_buf_pull_mem(pkt->buffer, net_pkt_lladdr_dst(orig)->len);
 
-	net_pkt_lladdr_src(pkt)->addr = pkt->buffer->data;
+	memcpy(net_pkt_lladdr_src(pkt)->addr, pkt->buffer->data,
+	       net_pkt_lladdr_src(orig)->len);
 
 	net_buf_pull_mem(pkt->buffer, net_pkt_lladdr_src(orig)->len);
 
@@ -319,7 +321,7 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code,
 		net_sprint_ipv6_addr(src),
 		net_sprint_ipv6_addr(&ip_hdr->src));
 
-	if (net_send_data(pkt) >= 0) {
+	if (net_try_send_data(pkt, K_NO_WAIT) >= 0) {
 		net_stats_update_icmp_sent(net_pkt_iface(pkt));
 		return 0;
 	}
diff --git a/subsys/net/ip/ipv4.c b/subsys/net/ip/ipv4.c
index b96cb10b8f081..0add73288bb42 100644
--- a/subsys/net/ip/ipv4.c
+++ b/subsys/net/ip/ipv4.c
@@ -343,6 +343,7 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt, bool is_loopback)
 
 	if (!net_pkt_filter_ip_recv_ok(pkt)) {
 		/* drop the packet */
+		net_stats_update_filter_rx_ipv4_drop(net_pkt_iface(pkt));
 		return NET_DROP;
 	}
 
@@ -383,6 +384,14 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt, bool is_loopback)
 		net_sprint_ipv4_addr(&hdr->src),
 		net_sprint_ipv4_addr(&hdr->dst));
 
+	ip.ipv4 = hdr;
+
+	if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW)) {
+		if (net_conn_input(pkt, &ip, hdr->proto, NULL) == NET_DROP) {
+			goto drop;
+		}
+	}
+
 	switch (hdr->proto) {
 	case IPPROTO_ICMP:
 		verdict = net_icmpv4_input(pkt, hdr);
@@ -440,8 +449,6 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt, bool is_loopback)
 		goto drop;
 	}
 
-	ip.ipv4 = hdr;
-
 	verdict = net_conn_input(pkt, &ip, hdr->proto, &proto_hdr);
 	if (verdict != NET_DROP) {
 		return verdict;
diff --git a/subsys/net/ip/ipv4.h b/subsys/net/ip/ipv4.h
index e70fae3ff1f7c..120bb0b20b220 100644
--- a/subsys/net/ip/ipv4.h
+++ b/subsys/net/ip/ipv4.h
@@ -25,6 +25,26 @@
 #define NET_IPV4_DSCP_OFFSET 2
 #define NET_IPV4_ECN_MASK 0x03
 
+/* IPv4 DiffServ code points (DSCP) for Assured Forwarding (AF) group.
+ * See https://tools.ietf.org/html/rfc2597
+ *     https://en.wikipedia.org/wiki/Differentiated_services
+ */
+/* Drop probability low */
+#define NET_IPV4_DSCP_AF11 10 /* 001010 */ /* Class 1 */
+#define NET_IPV4_DSCP_AF21 18 /* 010010 */ /* Class 2 */
+#define NET_IPV4_DSCP_AF31 26 /* 011010 */ /* Class 3 */
+#define NET_IPV4_DSCP_AF41 34 /* 100010 */ /* Class 4 */
+/* Drop probability medium */
+#define NET_IPV4_DSCP_AF12 12 /* 001100 */ /* Class 1 */
+#define NET_IPV4_DSCP_AF22 20 /* 010100 */ /* Class 2 */
+#define NET_IPV4_DSCP_AF32 28 /* 011100 */ /* Class 3 */
+#define NET_IPV4_DSCP_AF42 36 /* 100100 */ /* Class 4 */
+/* Drop probability high */
+#define NET_IPV4_DSCP_AF13 14 /* 001110 */ /* Class 1 */
+#define NET_IPV4_DSCP_AF23 22 /* 010110 */ /* Class 2 */
+#define NET_IPV4_DSCP_AF33 30 /* 011110 */ /* Class 3 */
+#define NET_IPV4_DSCP_AF43 38 /* 100110 */ /* Class 4 */
+
 /* IPv4 Options */
 #define NET_IPV4_OPTS_EO   0   /* End of Options */
 #define NET_IPV4_OPTS_NOP  1   /* No operation */
diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c
index 5d08c3a84cb3e..7690ce388842d 100644
--- a/subsys/net/ip/ipv6.c
+++ b/subsys/net/ip/ipv6.c
@@ -584,6 +584,7 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt, bool is_loopback)
 	if (!net_pkt_filter_ip_recv_ok(pkt)) {
 		/* drop the packet */
 		NET_DBG("DROP: pkt filter");
+		net_stats_update_filter_rx_ipv6_drop(net_pkt_iface(pkt));
 		return NET_DROP;
 	}
 
@@ -762,6 +763,14 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt, bool is_loopback)
 
 	net_pkt_set_ipv6_ext_len(pkt, ext_len);
 
+	ip.ipv6 = hdr;
+
+	if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW)) {
+		if (net_conn_input(pkt, &ip, current_hdr, NULL) == NET_DROP) {
+			goto drop;
+		}
+	}
+
 	switch (current_hdr) {
 	case IPPROTO_ICMPV6:
 		verdict = net_icmpv6_input(pkt, hdr);
@@ -816,8 +825,6 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt, bool is_loopback)
 		return verdict;
 	}
 
-	ip.ipv6 = hdr;
-
 	verdict = net_conn_input(pkt, &ip, current_hdr, &proto_hdr);
 
 	NET_DBG("%s verdict %s", "Connection", net_verdict2str(verdict));
diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h
index 68115f818c26e..2420de6db9060 100644
--- a/subsys/net/ip/ipv6.h
+++ b/subsys/net/ip/ipv6.h
@@ -641,7 +641,7 @@ static inline int net_ipv6_pe_init(struct net_if *iface)
 #endif /* CONFIG_NET_IPV6_PE */
 
 typedef void (*net_ipv6_pe_filter_cb_t)(struct in6_addr *prefix,
-					bool is_blacklist,
+					bool is_denylist,
 					void *user_data);
 
 /**
diff --git a/subsys/net/ip/ipv6_nbr.c b/subsys/net/ip/ipv6_nbr.c
index b3a3347f3b2a7..b64a73ed53789 100644
--- a/subsys/net/ip/ipv6_nbr.c
+++ b/subsys/net/ip/ipv6_nbr.c
@@ -443,7 +443,7 @@ static struct net_nbr *nbr_new(struct net_if *iface,
 }
 
 static void dbg_update_neighbor_lladdr(const struct net_linkaddr *new_lladdr,
-				       const struct net_linkaddr_storage *old_lladdr,
+				       const struct net_linkaddr *old_lladdr,
 				       const struct in6_addr *addr)
 {
 	char out[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
@@ -458,14 +458,15 @@ static void dbg_update_neighbor_lladdr(const struct net_linkaddr *new_lladdr,
 }
 
 static void dbg_update_neighbor_lladdr_raw(uint8_t *new_lladdr,
-				       struct net_linkaddr_storage *old_lladdr,
-				       struct in6_addr *addr)
+					   struct net_linkaddr *old_lladdr,
+					   struct in6_addr *addr)
 {
 	struct net_linkaddr lladdr = {
 		.len = old_lladdr->len,
-		.addr = new_lladdr,
 	};
 
+	memcpy(lladdr.addr, new_lladdr, lladdr.len);
+
 	dbg_update_neighbor_lladdr(&lladdr, old_lladdr, addr);
 }
 
@@ -603,14 +604,14 @@ struct net_nbr *net_ipv6_nbr_add(struct net_if *iface,
 	if (lladdr && net_nbr_link(nbr, iface, lladdr) == -EALREADY &&
 	    net_ipv6_nbr_data(nbr)->state != NET_IPV6_NBR_STATE_STATIC) {
 		/* Update the lladdr if the node was already known */
-		struct net_linkaddr_storage *cached_lladdr;
+		struct net_linkaddr *cached_lladdr;
 
 		cached_lladdr = net_nbr_get_lladdr(nbr->idx);
 
 		if (memcmp(cached_lladdr->addr, lladdr->addr, lladdr->len)) {
 			dbg_update_neighbor_lladdr(lladdr, cached_lladdr, addr);
 
-			net_linkaddr_set(cached_lladdr, lladdr->addr,
+			net_linkaddr_set(cached_lladdr, (uint8_t *)lladdr->addr,
 					 lladdr->len);
 
 			ipv6_nbr_set_state(nbr, NET_IPV6_NBR_STATE_STALE);
@@ -846,7 +847,7 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt)
 	 * contain public IPv6 address information so in that case we should
 	 * not enter this branch.
 	 */
-	if ((net_pkt_lladdr_dst(pkt)->addr &&
+	if ((net_pkt_lladdr_dst(pkt)->len > 0 &&
 	     ((IS_ENABLED(CONFIG_NET_ROUTING) &&
 	      (net_ipv6_is_ll_addr((struct in6_addr *)ip_hdr->dst) ||
 	       net_if_ipv6_addr_onlink(NULL, (struct in6_addr *)ip_hdr->dst) ||
@@ -940,12 +941,12 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt)
 		"-");
 
 	if (nbr && nbr->idx != NET_NBR_LLADDR_UNKNOWN) {
-		struct net_linkaddr_storage *lladdr;
+		struct net_linkaddr *lladdr;
 
 		lladdr = net_nbr_get_lladdr(nbr->idx);
 
-		net_pkt_lladdr_dst(pkt)->addr = lladdr->addr;
-		net_pkt_lladdr_dst(pkt)->len = lladdr->len;
+		(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt), lladdr->addr,
+				       lladdr->len);
 
 		NET_DBG("Neighbor %p addr %s", nbr,
 			net_sprint_ll_addr(lladdr->addr, lladdr->len));
@@ -1070,20 +1071,21 @@ static inline bool set_llao(struct net_pkt *pkt,
 
 static bool read_llao(struct net_pkt *pkt,
 		      uint8_t len,
-		      struct net_linkaddr_storage *llstorage)
+		      struct net_linkaddr *lladdr)
 {
 	uint8_t padding;
 
-	llstorage->len = NET_LINK_ADDR_MAX_LENGTH;
-	if (net_pkt_lladdr_src(pkt)->len < llstorage->len) {
-		llstorage->len = net_pkt_lladdr_src(pkt)->len;
+	lladdr->len = NET_LINK_ADDR_MAX_LENGTH;
+
+	if (net_pkt_lladdr_src(pkt)->len < lladdr->len) {
+		lladdr->len = net_pkt_lladdr_src(pkt)->len;
 	}
 
-	if (net_pkt_read(pkt, llstorage->addr, llstorage->len)) {
+	if (net_pkt_read(pkt, lladdr->addr, lladdr->len)) {
 		return false;
 	}
 
-	padding = len * 8U - 2 - llstorage->len;
+	padding = len * 8U - 2 - lladdr->len;
 	if (padding) {
 		if (net_pkt_skip(pkt, padding)) {
 			return false;
@@ -1210,7 +1212,6 @@ static int handle_ns_input(struct net_icmp_ctx *ctx,
 	const struct in6_addr *na_src;
 	const struct in6_addr *na_dst;
 	struct in6_addr *tgt;
-	struct net_linkaddr_storage src_lladdr_s;
 	struct net_linkaddr src_lladdr;
 
 	src_lladdr.len = 0;
@@ -1260,14 +1261,11 @@ static int handle_ns_input(struct net_icmp_ctx *ctx,
 				goto drop;
 			}
 
-			if (!read_llao(pkt, nd_opt_hdr->len, &src_lladdr_s)) {
+			if (!read_llao(pkt, nd_opt_hdr->len, &src_lladdr)) {
 				NET_ERR("DROP: failed to read LLAO");
 				goto drop;
 			}
 
-			src_lladdr.len = src_lladdr_s.len;
-			src_lladdr.addr = src_lladdr_s.addr;
-
 			break;
 		default:
 			NET_DBG("Unknown ND option 0x%x", nd_opt_hdr->type);
@@ -1431,7 +1429,7 @@ static int handle_ns_input(struct net_icmp_ctx *ctx,
 	}
 
 send_na:
-	if (src_lladdr.len) {
+	if (src_lladdr.len > 0) {
 		if (!net_ipv6_nbr_add(net_pkt_iface(pkt),
 				      (struct in6_addr *)ip_hdr->src,
 				      &src_lladdr, false,
@@ -1577,7 +1575,7 @@ static void ipv6_nd_reachable_timeout(struct k_work *work)
 					data->ns_count);
 
 				ret = net_ipv6_send_ns(nbr->iface, NULL, NULL,
-						       NULL, &data->addr,
+						       &data->addr, &data->addr,
 						       false);
 				if (ret < 0) {
 					NET_DBG("Cannot send NS (%d)", ret);
@@ -1639,9 +1637,9 @@ static inline bool handle_na_neighbor(struct net_pkt *pkt,
 				      struct net_icmpv6_na_hdr *na_hdr,
 				      uint16_t tllao_offset)
 {
-	struct net_linkaddr_storage lladdr = { 0 };
+	struct net_linkaddr lladdr = { 0 };
 	bool lladdr_changed = false;
-	struct net_linkaddr_storage *cached_lladdr;
+	struct net_linkaddr *cached_lladdr;
 	struct net_pkt *pending;
 	struct net_nbr *nbr;
 
@@ -1680,8 +1678,7 @@ static inline bool handle_na_neighbor(struct net_pkt *pkt,
 			goto err;
 		}
 
-		nbr_lladdr.len = lladdr.len;
-		nbr_lladdr.addr = lladdr.addr;
+		(void)net_linkaddr_set(&nbr_lladdr, lladdr.addr, lladdr.len);
 
 		if (net_nbr_link(nbr, net_pkt_iface(pkt), &nbr_lladdr)) {
 			nbr_free(nbr);
@@ -1755,7 +1752,7 @@ static inline bool handle_na_neighbor(struct net_pkt *pkt,
 
 	if (na_hdr->flags & NET_ICMPV6_NA_FLAG_OVERRIDE ||
 	    (!(na_hdr->flags & NET_ICMPV6_NA_FLAG_OVERRIDE) &&
-	     tllao_offset && !lladdr_changed)) {
+	     !lladdr_changed)) {
 
 		if (lladdr_changed) {
 			dbg_update_neighbor_lladdr_raw(
@@ -2161,15 +2158,11 @@ int net_ipv6_start_rs(struct net_if *iface)
 static inline struct net_nbr *handle_ra_neighbor(struct net_pkt *pkt, uint8_t len)
 {
 	struct net_linkaddr lladdr;
-	struct net_linkaddr_storage llstorage;
 
-	if (!read_llao(pkt, len, &llstorage)) {
+	if (!read_llao(pkt, len, &lladdr)) {
 		return NULL;
 	}
 
-	lladdr.len = llstorage.len;
-	lladdr.addr = llstorage.addr;
-
 	return net_ipv6_nbr_add(net_pkt_iface(pkt),
 				(struct in6_addr *)NET_IPV6_HDR(pkt)->src,
 				&lladdr, true,
@@ -2598,12 +2591,6 @@ static int handle_ra_input(struct net_icmp_ctx *ctx,
 	nd_opt_hdr = (struct net_icmpv6_nd_opt_hdr *)
 				net_pkt_get_data(pkt, &nd_access);
 
-	/* Add neighbor cache entry using link local address, regardless of link layer address
-	 * presence in Router Advertisement.
-	 */
-	nbr = net_ipv6_nbr_add(net_pkt_iface(pkt), (struct in6_addr *)NET_IPV6_HDR(pkt)->src, NULL,
-				true, NET_IPV6_NBR_STATE_INCOMPLETE);
-
 	while (nd_opt_hdr) {
 		net_pkt_acknowledge_data(pkt, &nd_access);
 
@@ -2704,6 +2691,15 @@ static int handle_ra_input(struct net_icmp_ctx *ctx,
 					net_pkt_get_data(pkt, &nd_access);
 	}
 
+	if (nbr == NULL) {
+		/* Add neighbor cache entry using link local address, regardless
+		 * of link layer address presence in Router Advertisement.
+		 */
+		nbr = net_ipv6_nbr_add(net_pkt_iface(pkt),
+				       (struct in6_addr *)NET_IPV6_HDR(pkt)->src,
+				       NULL, true, NET_IPV6_NBR_STATE_INCOMPLETE);
+	}
+
 	router = net_if_ipv6_router_lookup(net_pkt_iface(pkt),
 					   (struct in6_addr *)ip_hdr->src);
 	if (router) {
diff --git a/subsys/net/ip/nbr.c b/subsys/net/ip/nbr.c
index 8cf42862d0da2..f9d9f68f882ce 100644
--- a/subsys/net/ip/nbr.c
+++ b/subsys/net/ip/nbr.c
@@ -122,7 +122,8 @@ int net_nbr_link(struct net_nbr *nbr, struct net_if *iface,
 	net_neighbor_lladdr[avail].ref++;
 	nbr->idx = avail;
 
-	net_linkaddr_set(&net_neighbor_lladdr[avail].lladdr, lladdr->addr,
+	net_linkaddr_set(&net_neighbor_lladdr[avail].lladdr,
+			 (uint8_t *)lladdr->addr,
 			 lladdr->len);
 	net_neighbor_lladdr[avail].lladdr.len = lladdr->len;
 	net_neighbor_lladdr[avail].lladdr.type = lladdr->type;
@@ -176,7 +177,7 @@ struct net_nbr *net_nbr_lookup(struct net_nbr_table *table,
 	return NULL;
 }
 
-struct net_linkaddr_storage *net_nbr_get_lladdr(uint8_t idx)
+struct net_linkaddr *net_nbr_get_lladdr(uint8_t idx)
 {
 	NET_ASSERT(idx < CONFIG_NET_IPV6_MAX_NEIGHBORS,
 		   "idx %d >= max %d", idx,
@@ -191,10 +192,10 @@ void net_nbr_clear_table(struct net_nbr_table *table)
 
 	for (i = 0; i < table->nbr_count; i++) {
 		struct net_nbr *nbr = get_nbr(table->nbr, i);
-		struct net_linkaddr lladdr = {
-			.addr = net_neighbor_lladdr[i].lladdr.addr,
-			.len = net_neighbor_lladdr[i].lladdr.len
-		};
+		struct net_linkaddr lladdr;
+
+		(void)net_linkaddr_set(&lladdr, net_neighbor_lladdr[i].lladdr.addr,
+				       net_neighbor_lladdr[i].lladdr.len);
 
 		net_nbr_unlink(nbr, &lladdr);
 	}
diff --git a/subsys/net/ip/nbr.h b/subsys/net/ip/nbr.h
index bab4249acba02..92e672b3ac6a3 100644
--- a/subsys/net/ip/nbr.h
+++ b/subsys/net/ip/nbr.h
@@ -28,7 +28,7 @@ extern "C" {
  */
 struct net_nbr_lladdr {
 	/** Link layer address */
-	struct net_linkaddr_storage lladdr;
+	struct net_linkaddr lladdr;
 
 	/** Reference count. */
 	uint8_t ref;
@@ -177,9 +177,9 @@ int net_nbr_unlink(struct net_nbr *nbr, struct net_linkaddr *lladdr);
  * @return Pointer to link layer address storage, NULL if not found
  */
 #if defined(CONFIG_NET_NATIVE)
-struct net_linkaddr_storage *net_nbr_get_lladdr(uint8_t idx);
+struct net_linkaddr *net_nbr_get_lladdr(uint8_t idx);
 #else
-static inline struct net_linkaddr_storage *net_nbr_get_lladdr(uint8_t idx)
+static inline struct net_linkaddr *net_nbr_get_lladdr(uint8_t idx)
 {
 	ARG_UNUSED(idx);
 
diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c
index 1edbea992ab32..0890a22764c6a 100644
--- a/subsys/net/ip/net_context.c
+++ b/subsys/net/ip/net_context.c
@@ -7,6 +7,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  * Copyright (c) 2021 Nordic Semiconductor
+ * Copyright (c) 2025 Aerlync Labs Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -465,6 +466,10 @@ static int net_context_check(sa_family_t family, enum net_sock_type type,
 			}
 			break;
 		case SOCK_RAW:
+			if (!IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW)) {
+				NET_DBG("RAW IP sockets disabled.");
+				return -EPROTONOSUPPORT;
+			}
 			break;
 		default:
 			NET_DBG("Unknown context type.");
@@ -565,6 +570,10 @@ int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto,
 #if defined(CONFIG_NET_IPV4_MAPPING_TO_IPV6)
 		/* By default IPv4 and IPv6 are in different port spaces */
 		contexts[i].options.ipv6_v6only = true;
+#endif
+#if defined(CONFIG_NET_IPV4)
+		contexts[i].options.ipv4_mcast_loop =
+			IS_ENABLED(CONFIG_NET_INITIAL_IPV4_MCAST_LOOP);
 #endif
 		if (IS_ENABLED(CONFIG_NET_IP)) {
 			(void)memset(&contexts[i].remote, 0, sizeof(struct sockaddr));
@@ -583,6 +592,10 @@ int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto,
 
 				contexts[i].ipv6_hop_limit = INITIAL_HOP_LIMIT;
 				contexts[i].ipv6_mcast_hop_limit = INITIAL_MCAST_HOP_LIMIT;
+#if defined(CONFIG_NET_IPV6)
+				contexts[i].options.ipv6_mcast_loop =
+					IS_ENABLED(CONFIG_NET_INITIAL_IPV6_MCAST_LOOP);
+#endif
 			}
 			if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) {
 				struct sockaddr_in *addr = (struct sockaddr_in *)&contexts[i].local;
@@ -724,9 +737,9 @@ static int bind_default(struct net_context *context)
 		addr6.sin6_family = AF_INET6;
 		memcpy(&addr6.sin6_addr, net_ipv6_unspecified_address(),
 		       sizeof(addr6.sin6_addr));
-		addr6.sin6_port =
-			find_available_port(context,
-					    (struct sockaddr *)&addr6);
+		addr6.sin6_port = net_context_get_type(context) == SOCK_RAW ?
+			0 : find_available_port(context,
+						(struct sockaddr *)&addr6);
 
 		return net_context_bind(context, (struct sockaddr *)&addr6,
 					sizeof(addr6));
@@ -741,9 +754,9 @@ static int bind_default(struct net_context *context)
 
 		addr4.sin_family = AF_INET;
 		addr4.sin_addr.s_addr = INADDR_ANY;
-		addr4.sin_port =
-			find_available_port(context,
-					    (struct sockaddr *)&addr4);
+		addr4.sin_port = net_context_get_type(context) == SOCK_RAW ?
+			0 : find_available_port(context,
+						(struct sockaddr *)&addr4);
 
 		return net_context_bind(context, (struct sockaddr *)&addr4,
 					sizeof(addr4));
@@ -751,14 +764,19 @@ static int bind_default(struct net_context *context)
 
 	if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && family == AF_PACKET) {
 		struct sockaddr_ll ll_addr;
+		struct net_if *iface = net_context_get_iface(context);
 
 		if (net_sll_ptr(&context->local)->sll_addr) {
 			return 0;
 		}
 
+		if (iface == NULL) {
+			iface = net_if_get_default();
+		}
+
 		ll_addr.sll_family = AF_PACKET;
 		ll_addr.sll_protocol = htons(ETH_P_ALL);
-		ll_addr.sll_ifindex = net_if_get_by_iface(net_if_get_default());
+		ll_addr.sll_ifindex = net_if_get_by_iface(iface);
 
 		return net_context_bind(context, (struct sockaddr *)&ll_addr,
 					sizeof(ll_addr));
@@ -1244,7 +1262,7 @@ int net_context_create_ipv4_new(struct net_context *context,
 						  (struct in_addr *)dst);
 		/* If src address is still unspecified, do not create pkt */
 		if (net_ipv4_is_addr_unspecified(src)) {
-			NET_DBG("DROP: src addr is unspecified");
+			NET_WARN("DROP: src addr is unspecified");
 			return -EINVAL;
 		}
 	}
@@ -1778,6 +1796,19 @@ static int get_context_mcast_ttl(struct net_context *context,
 #endif
 }
 
+static int get_context_ipv4_mcast_loop(struct net_context *context,
+				  void *value, size_t *len)
+{
+#if defined(CONFIG_NET_IPV4)
+	return get_bool_option(context->options.ipv4_mcast_loop, value, len);
+#else
+	ARG_UNUSED(context);
+	ARG_UNUSED(value);
+	ARG_UNUSED(len);
+	return -ENOTSUP;
+#endif
+}
+
 static int get_context_mcast_hop_limit(struct net_context *context,
 				       void *value, size_t *len)
 {
@@ -2033,6 +2064,20 @@ static int get_context_local_port_range(struct net_context *context,
 #endif
 }
 
+static int get_context_ipv6_mcast_loop(struct net_context *context,
+				       void *value, size_t *len)
+{
+#if defined(CONFIG_NET_IPV6)
+	return get_bool_option(context->options.ipv6_mcast_loop, value, len);
+#else
+	ARG_UNUSED(context);
+	ARG_UNUSED(value);
+	ARG_UNUSED(len);
+
+	return -ENOTSUP;
+#endif
+}
+
 /* If buf is not NULL, then use it. Otherwise read the data to be written
  * to net_pkt from msghdr.
  */
@@ -2128,6 +2173,57 @@ static int context_setup_udp_packet(struct net_context *context,
 	return 0;
 }
 
+static int context_setup_raw_ip_packet(sa_family_t family,
+				       struct net_pkt *pkt,
+				       const void *buf,
+				       size_t len,
+				       const struct msghdr *msg)
+{
+	int ret;
+
+	ret = context_write_data(pkt, buf, len, msg);
+	if (ret < 0) {
+		return ret;
+	}
+
+	if (family == AF_INET) {
+		NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access,
+						      struct net_ipv4_hdr);
+		struct net_ipv4_hdr *ipv4_hdr;
+		uint8_t hdr_len;
+
+		net_pkt_cursor_init(pkt);
+		net_pkt_set_overwrite(pkt, true);
+
+		ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(pkt, &ipv4_access);
+		if (ipv4_hdr == NULL) {
+			return -ENOBUFS;
+		}
+
+		net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv4_hdr));
+
+		hdr_len = (ipv4_hdr->vhl & 0x0F) * 4;
+		if (hdr_len > sizeof(struct net_ipv4_hdr)) {
+			net_pkt_set_ipv4_opts_len(
+				pkt, hdr_len - sizeof(struct net_ipv4_hdr));
+		}
+
+		if (net_if_need_calc_tx_checksum(net_pkt_iface(pkt),
+						 NET_IF_CHECKSUM_IPV4_HEADER)) {
+			ipv4_hdr->chksum = 0;
+			ipv4_hdr->chksum = net_calc_chksum_ipv4(pkt);
+			net_pkt_set_data(pkt, &ipv4_access);
+		}
+
+		net_pkt_set_ll_proto_type(pkt, ETH_P_IP);
+	} else {
+		net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr));
+		net_pkt_set_ll_proto_type(pkt, ETH_P_IPV6);
+	}
+
+	return 0;
+}
+
 static void context_finalize_packet(struct net_context *context,
 				    sa_family_t family,
 				    struct net_pkt *pkt)
@@ -2396,6 +2492,8 @@ static int context_sendto(struct net_context *context,
 					ll_addr->sll_ifindex);
 				return -EDESTADDRREQ;
 			}
+
+			net_context_set_iface(context, iface);
 		}
 
 		if (net_context_get_type(context) == SOCK_DGRAM) {
@@ -2486,7 +2584,8 @@ static int context_sendto(struct net_context *context,
 	tmp_len = net_pkt_available_payload_buffer(
 				pkt, net_context_get_proto(context));
 	if (tmp_len < len) {
-		if (net_context_get_type(context) == SOCK_DGRAM) {
+		if (net_context_get_type(context) == SOCK_DGRAM ||
+		    net_context_get_type(context) == SOCK_RAW) {
 			NET_ERR("Available payload buffer (%zu) is not enough for requested DGRAM (%zu)",
 				tmp_len, len);
 			ret = -ENOMEM;
@@ -2534,6 +2633,16 @@ static int context_sendto(struct net_context *context,
 			ret = net_offload_send(net_context_get_iface(context),
 					       pkt, cb, timeout, user_data);
 		}
+	} else if (((IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) ||
+		    (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6)) &&
+		   IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) &&
+		   net_context_get_type(context) == SOCK_RAW) {
+		ret = context_setup_raw_ip_packet(family, pkt, buf, len, msghdr);
+		if (ret < 0) {
+			goto fail;
+		}
+
+		ret = net_try_send_data(pkt, timeout);
 	} else if (IS_ENABLED(CONFIG_NET_UDP) &&
 	    net_context_get_proto(context) == IPPROTO_UDP) {
 		ret = context_setup_udp_packet(context, family, pkt, buf, len, msghdr,
@@ -2544,7 +2653,7 @@ static int context_sendto(struct net_context *context,
 
 		context_finalize_packet(context, family, pkt);
 
-		ret = net_send_data(pkt);
+		ret = net_try_send_data(pkt, timeout);
 	} else if (IS_ENABLED(CONFIG_NET_TCP) &&
 		   net_context_get_proto(context) == IPPROTO_TCP) {
 
@@ -2564,53 +2673,25 @@ static int context_sendto(struct net_context *context,
 
 		net_pkt_cursor_init(pkt);
 
-		if (net_context_get_proto(context) == IPPROTO_RAW) {
-			char type = (NET_IPV6_HDR(pkt)->vtc & 0xf0);
-			struct sockaddr_ll *ll_addr;
-
-			/* Set the family to pkt if detected */
-			switch (type) {
-			case 0x60:
-				net_pkt_set_family(pkt, AF_INET6);
-				net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IPV6);
-				break;
-			case 0x40:
-				net_pkt_set_family(pkt, AF_INET);
-				net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IP);
-				break;
-			default:
-				/* Not IP traffic, let it go forward as it is */
-				ll_addr = (struct sockaddr_ll *)dst_addr;
-
-				net_pkt_set_ll_proto_type(pkt,
-							  ntohs(ll_addr->sll_protocol));
-				break;
-			}
-
-			/* Pass to L2: */
-			ret = net_send_data(pkt);
-		} else {
-			struct sockaddr_ll_ptr *ll_src_addr;
-			struct sockaddr_ll *ll_dst_addr;
+		struct sockaddr_ll_ptr *ll_src_addr;
+		struct sockaddr_ll *ll_dst_addr;
 
-			/* The destination address is set in remote for this
-			 * socket type.
-			 */
-			ll_dst_addr = (struct sockaddr_ll *)&context->remote;
-			ll_src_addr = (struct sockaddr_ll_ptr *)&context->local;
+		/* The destination address is set in remote for this
+		 * socket type.
+		 */
+		ll_dst_addr = (struct sockaddr_ll *)&context->remote;
+		ll_src_addr = (struct sockaddr_ll_ptr *)&context->local;
 
-			net_pkt_lladdr_dst(pkt)->addr = ll_dst_addr->sll_addr;
-			net_pkt_lladdr_dst(pkt)->len =
-						sizeof(struct net_eth_addr);
-			net_pkt_lladdr_src(pkt)->addr = ll_src_addr->sll_addr;
-			net_pkt_lladdr_src(pkt)->len =
-						sizeof(struct net_eth_addr);
+		(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+				       ll_dst_addr->sll_addr,
+				       sizeof(struct net_eth_addr));
+		(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+				       ll_src_addr->sll_addr,
+				       sizeof(struct net_eth_addr));
 
-			net_pkt_set_ll_proto_type(pkt,
-						  ntohs(ll_dst_addr->sll_protocol));
+		net_pkt_set_ll_proto_type(pkt, ntohs(ll_dst_addr->sll_protocol));
 
-			net_if_queue_tx(net_pkt_iface(pkt), pkt);
-		}
+		net_if_try_queue_tx(net_pkt_iface(pkt), pkt, timeout);
 	} else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == AF_CAN &&
 		   net_context_get_proto(context) == CAN_RAW) {
 		ret = context_write_data(pkt, buf, len, msghdr);
@@ -2620,7 +2701,7 @@ static int context_sendto(struct net_context *context,
 
 		net_pkt_cursor_init(pkt);
 
-		ret = net_send_data(pkt);
+		ret = net_try_send_data(pkt, timeout);
 	} else {
 		NET_DBG("Unknown protocol while sending packet: %d",
 		net_context_get_proto(context));
@@ -2640,6 +2721,75 @@ static int context_sendto(struct net_context *context,
 	return ret;
 }
 
+static void raw_inet_set_remote(struct net_context *context, const void *buf,
+				size_t len)
+{
+	struct net_if *iface;
+
+	if (net_context_get_family(context) == AF_INET) {
+		struct sockaddr_in *remote =
+			(struct sockaddr_in *)&context->remote;
+		const struct net_ipv4_hdr *iphdr = buf;
+
+		if (len < sizeof(struct net_ipv4_hdr)) {
+			return;
+		}
+
+		if (!net_ipv4_is_addr_unspecified(
+				&net_sin(&context->remote)->sin_addr)) {
+			goto out;
+		}
+
+		remote->sin_family = AF_INET;
+		remote->sin_port = 0;
+		memcpy(&remote->sin_addr, iphdr->dst, sizeof(remote->sin_addr));
+
+		if (net_context_is_bound_to_iface(context)) {
+			goto out;
+		}
+
+		iface = net_if_ipv4_select_src_iface(&remote->sin_addr);
+		if (iface == NULL) {
+			goto out;
+		}
+
+		net_context_set_iface(context, iface);
+	} else if (net_context_get_family(context) == AF_INET6) {
+		struct sockaddr_in6 *remote =
+			(struct sockaddr_in6 *)&context->remote;
+		const struct net_ipv6_hdr *iphdr = buf;
+
+		if (len < sizeof(struct net_ipv6_hdr)) {
+			return;
+		}
+
+		if (!net_ipv6_is_addr_unspecified(
+				&net_sin6(&context->remote)->sin6_addr)) {
+			goto out;
+		}
+
+		remote->sin6_family = AF_INET6;
+		remote->sin6_port = 0;
+		memcpy(&remote->sin6_addr, iphdr->dst, sizeof(remote->sin6_addr));
+
+		if (net_context_is_bound_to_iface(context)) {
+			goto out;
+		}
+
+		iface = net_if_ipv6_select_src_iface(&remote->sin6_addr);
+		if (iface == NULL) {
+			goto out;
+		}
+
+		net_context_set_iface(context, iface);
+	} else {
+		return;
+	}
+
+out:
+	context->flags |= NET_CONTEXT_REMOTE_ADDR_SET;
+}
+
 int net_context_send(struct net_context *context,
 		     const void *buf,
 		     size_t len,
@@ -2647,23 +2797,28 @@ int net_context_send(struct net_context *context,
 		     k_timeout_t timeout,
 		     void *user_data)
 {
+	bool dst_check = true;
 	socklen_t addrlen;
 	int ret = 0;
 
 	k_mutex_lock(&context->lock, K_FOREVER);
 
-	if (!(context->flags & NET_CONTEXT_REMOTE_ADDR_SET) ||
-	    !net_sin(&context->remote)->sin_port) {
-		ret = -EDESTADDRREQ;
-		goto unlock;
-	}
-
 	if (IS_ENABLED(CONFIG_NET_IPV6) &&
 	    net_context_get_family(context) == AF_INET6) {
 		addrlen = sizeof(struct sockaddr_in6);
+		if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) &&
+		    net_context_get_type(context) == SOCK_RAW) {
+			raw_inet_set_remote(context, buf, len);
+			dst_check = false;
+		}
 	} else if (IS_ENABLED(CONFIG_NET_IPV4) &&
 		   net_context_get_family(context) == AF_INET) {
 		addrlen = sizeof(struct sockaddr_in);
+		if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) &&
+		    net_context_get_type(context) == SOCK_RAW) {
+			raw_inet_set_remote(context, buf, len);
+			dst_check = false;
+		}
 	} else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) &&
 		   net_context_get_family(context) == AF_PACKET) {
 		ret = -EOPNOTSUPP;
@@ -2675,6 +2830,14 @@ int net_context_send(struct net_context *context,
 		addrlen = 0;
 	}
 
+	if (dst_check) {
+		if (!(context->flags & NET_CONTEXT_REMOTE_ADDR_SET) ||
+		    net_sin(&context->remote)->sin_port == 0) {
+			ret = -EDESTADDRREQ;
+			goto unlock;
+		}
+	}
+
 	ret = context_sendto(context, buf, len, &context->remote,
 			     addrlen, cb, timeout, user_data, false);
 unlock:
@@ -2770,11 +2933,11 @@ enum net_verdict net_context_packet_received(struct net_conn *conn,
 	return verdict;
 }
 
-#if defined(CONFIG_NET_NATIVE_UDP)
-static int recv_udp(struct net_context *context,
-		    net_context_recv_cb_t cb,
-		    k_timeout_t timeout,
-		    void *user_data)
+#if defined(CONFIG_NET_NATIVE_IP)
+static int recv_dgram(struct net_context *context,
+		      net_context_recv_cb_t cb,
+		      k_timeout_t timeout,
+		      void *user_data)
 {
 	struct sockaddr local_addr = {
 		.sa_family = net_context_get_family(context),
@@ -2837,6 +3000,7 @@ static int recv_udp(struct net_context *context,
 	context->recv_cb = cb;
 
 	ret = net_conn_register(net_context_get_proto(context),
+				net_context_get_type(context),
 				net_context_get_family(context),
 				context->flags & NET_CONTEXT_REMOTE_ADDR_SET ?
 							&context->remote : NULL,
@@ -2851,7 +3015,7 @@ static int recv_udp(struct net_context *context,
 	return ret;
 }
 #else
-#define recv_udp(...) 0
+#define recv_dgram(...) 0
 #endif /* CONFIG_NET_NATIVE_UDP */
 
 static enum net_verdict net_context_raw_packet_received(
@@ -2922,6 +3086,7 @@ static int recv_raw(struct net_context *context,
 	context->recv_cb = cb;
 
 	ret = net_conn_register(net_context_get_proto(context),
+				net_context_get_type(context),
 				net_context_get_family(context),
 				NULL, local_addr, 0, 0,
 				context,
@@ -2937,7 +3102,9 @@ int net_context_recv(struct net_context *context,
 		     k_timeout_t timeout,
 		     void *user_data)
 {
+	int family;
 	int ret;
+
 	NET_ASSERT(context);
 
 	if (!net_context_is_used(context)) {
@@ -2954,15 +3121,22 @@ int net_context_recv(struct net_context *context,
 		goto unlock;
 	}
 
-	if (IS_ENABLED(CONFIG_NET_UDP) &&
-	    net_context_get_proto(context) == IPPROTO_UDP) {
-		ret = recv_udp(context, cb, timeout, user_data);
+	family = net_context_get_family(context);
+
+	if (((IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) ||
+	     (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6)) &&
+	    IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) &&
+	    net_context_get_type(context) == SOCK_RAW) {
+		ret = recv_dgram(context, cb, timeout, user_data);
+	} else if (IS_ENABLED(CONFIG_NET_UDP) &&
+		   net_context_get_proto(context) == IPPROTO_UDP) {
+		ret = recv_dgram(context, cb, timeout, user_data);
 	} else if (IS_ENABLED(CONFIG_NET_TCP) &&
 		   net_context_get_proto(context) == IPPROTO_TCP) {
 		ret = net_tcp_recv(context, cb, user_data);
 	} else {
 		if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) &&
-		    net_context_get_family(context) == AF_PACKET) {
+		    family == AF_PACKET) {
 			struct sockaddr_ll addr;
 
 			addr.sll_family = AF_PACKET;
@@ -2980,7 +3154,7 @@ int net_context_recv(struct net_context *context,
 			ret = recv_raw(context, cb, timeout,
 				       (struct sockaddr *)&addr, user_data);
 		} else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) &&
-			   net_context_get_family(context) == AF_CAN) {
+			   family == AF_CAN) {
 			struct sockaddr_can local_addr = {
 				.can_family = AF_CAN,
 			};
@@ -3274,6 +3448,20 @@ static int set_context_mcast_ttl(struct net_context *context,
 #endif
 }
 
+static int set_context_ipv4_mcast_loop(struct net_context *context,
+				       const void *value, size_t len)
+{
+#if defined(CONFIG_NET_IPV4)
+	return set_bool_option(&context->options.ipv4_mcast_loop, value, len);
+#else
+	ARG_UNUSED(context);
+	ARG_UNUSED(value);
+	ARG_UNUSED(len);
+
+	return -ENOTSUP;
+#endif
+}
+
 static int set_context_mcast_hop_limit(struct net_context *context,
 				       const void *value, size_t len)
 {
@@ -3329,6 +3517,20 @@ static int set_context_unicast_hop_limit(struct net_context *context,
 #endif
 }
 
+static int set_context_ipv6_mcast_loop(struct net_context *context,
+				       const void *value, size_t len)
+{
+#if defined(CONFIG_NET_IPV6)
+	return set_bool_option(&context->options.ipv6_mcast_loop, value, len);
+#else
+	ARG_UNUSED(context);
+	ARG_UNUSED(value);
+	ARG_UNUSED(len);
+
+	return -ENOTSUP;
+#endif
+}
+
 static int set_context_reuseaddr(struct net_context *context,
 				 const void *value, size_t len)
 {
@@ -3652,6 +3854,12 @@ int net_context_set_option(struct net_context *context,
 	case NET_OPT_LOCAL_PORT_RANGE:
 		ret = set_context_local_port_range(context, value, len);
 		break;
+	case NET_OPT_IPV6_MCAST_LOOP:
+		ret = set_context_ipv6_mcast_loop(context, value, len);
+		break;
+	case NET_OPT_IPV4_MCAST_LOOP:
+		ret = set_context_ipv4_mcast_loop(context, value, len);
+		break;
 	}
 
 	k_mutex_unlock(&context->lock);
@@ -3737,6 +3945,12 @@ int net_context_get_option(struct net_context *context,
 	case NET_OPT_LOCAL_PORT_RANGE:
 		ret = get_context_local_port_range(context, value, len);
 		break;
+	case NET_OPT_IPV6_MCAST_LOOP:
+		ret = get_context_ipv6_mcast_loop(context, value, len);
+		break;
+	case NET_OPT_IPV4_MCAST_LOOP:
+		ret = get_context_ipv4_mcast_loop(context, value, len);
+		break;
 	}
 
 	k_mutex_unlock(&context->lock);
diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c
index 4c22e10f35a25..97b6bd95f1779 100644
--- a/subsys/net/ip/net_core.c
+++ b/subsys/net/ip/net_core.c
@@ -7,6 +7,7 @@
 
 /*
  * Copyright (c) 2016 Intel Corporation
+ * Copyright (c) 2025 Aerlync Labs Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -126,13 +127,6 @@ static inline enum net_verdict process_data(struct net_pkt *pkt,
 
 	if (IS_ENABLED(CONFIG_NET_IP) && (family == AF_INET || family == AF_INET6 ||
 					  family == AF_UNSPEC || family == AF_PACKET)) {
-		/* L2 processed, now we can pass IPPROTO_RAW to packet socket:
-		 */
-		ret = net_packet_socket_input(pkt, IPPROTO_RAW);
-		if (ret != NET_CONTINUE) {
-			return ret;
-		}
-
 		/* IP version and header length. */
 		uint8_t vtc_vhl = NET_IPV6_HDR(pkt)->vtc & 0xf0;
 
@@ -215,7 +209,8 @@ static inline int check_ip(struct net_pkt *pkt)
 	family = net_pkt_family(pkt);
 	ret = 0;
 
-	if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) {
+	if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6 &&
+	    net_pkt_ll_proto_type(pkt) == NET_ETH_PTYPE_IPV6) {
 		/* Drop IPv6 packet if hop limit is 0 */
 		if (NET_IPV6_HDR(pkt)->hop_limit == 0) {
 			NET_DBG("DROP: IPv6 hop limit");
@@ -288,7 +283,8 @@ static inline int check_ip(struct net_pkt *pkt)
 			goto drop;
 		}
 
-	} else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) {
+	} else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET &&
+		   net_pkt_ll_proto_type(pkt) == NET_ETH_PTYPE_IP) {
 		/* Drop IPv4 packet if ttl is 0 */
 		if (NET_IPV4_HDR(pkt)->ttl == 0) {
 			NET_DBG("DROP: IPv4 ttl");
@@ -363,8 +359,35 @@ static inline int check_ip(struct net_pkt *pkt)
 	return ret;
 }
 
-/* Called when data needs to be sent to network */
-int net_send_data(struct net_pkt *pkt)
+#if defined(CONFIG_NET_IPV4) || defined(CONFIG_NET_IPV6)
+static inline bool process_multicast(struct net_pkt *pkt)
+{
+	struct net_context *ctx = net_pkt_context(pkt);
+	sa_family_t family = net_pkt_family(pkt);
+
+	if (ctx == NULL) {
+		return false;
+	}
+
+#if defined(CONFIG_NET_IPV4)
+	if (family == AF_INET) {
+		const struct in_addr *dst = (const struct in_addr *)&NET_IPV4_HDR(pkt)->dst;
+
+		return net_ipv4_is_addr_mcast(dst) && net_context_get_ipv4_mcast_loop(ctx);
+	}
+#endif
+#if defined(CONFIG_NET_IPV6)
+	if (family == AF_INET6) {
+		const struct in6_addr *dst = (const struct in6_addr *)&NET_IPV6_HDR(pkt)->dst;
+
+		return net_ipv6_is_addr_mcast(dst) && net_context_get_ipv6_mcast_loop(ctx);
+	}
+#endif
+	return false;
+}
+#endif
+
+int net_try_send_data(struct net_pkt *pkt, k_timeout_t timeout)
 {
 	int status;
 	int ret;
@@ -392,6 +415,7 @@ int net_send_data(struct net_pkt *pkt)
 		 * we just silently drop the packet by returning 0.
 		 */
 		if (status == -ENOMSG) {
+			net_pkt_unref(pkt);
 			ret = 0;
 			goto err;
 		}
@@ -407,7 +431,36 @@ int net_send_data(struct net_pkt *pkt)
 		goto err;
 	}
 
-	if (net_if_send_data(net_pkt_iface(pkt), pkt) == NET_DROP) {
+#if defined(CONFIG_NET_IPV4) || defined(CONFIG_NET_IPV6)
+	if (process_multicast(pkt)) {
+		struct net_pkt *clone = net_pkt_clone(pkt, K_NO_WAIT);
+
+		if (clone != NULL) {
+			net_pkt_set_iface(clone, net_pkt_iface(pkt));
+			if (net_recv_data(net_pkt_iface(clone), clone) < 0) {
+				if (IS_ENABLED(CONFIG_NET_STATISTICS)) {
+					switch (net_pkt_family(pkt)) {
+#if defined(CONFIG_NET_IPV4)
+					case AF_INET:
+						net_stats_update_ipv4_sent(net_pkt_iface(pkt));
+						break;
+#endif
+#if defined(CONFIG_NET_IPV6)
+					case AF_INET6:
+						net_stats_update_ipv6_sent(net_pkt_iface(pkt));
+						break;
+#endif
+					}
+				}
+				net_pkt_unref(clone);
+			}
+		} else {
+			NET_DBG("Failed to clone multicast packet");
+		}
+	}
+#endif
+
+	if (net_if_try_send_data(net_pkt_iface(pkt), pkt, timeout) == NET_DROP) {
 		ret = -EIO;
 		goto err;
 	}
@@ -530,7 +583,10 @@ int net_recv_data(struct net_if *iface, struct net_pkt *pkt)
 	net_pkt_set_iface(pkt, iface);
 
 	if (!net_pkt_filter_recv_ok(pkt)) {
-		/* silently drop the packet */
+		/* Silently drop the packet, but update the statistics in order
+		 * to be able to monitor filter activity.
+		 */
+		net_stats_update_filter_rx_drop(net_pkt_iface(pkt));
 		net_pkt_unref(pkt);
 	} else {
 		net_queue_rx(iface, pkt);
@@ -570,9 +626,10 @@ static inline void l3_init(void)
 #else /* CONFIG_NET_NATIVE */
 #define l3_init(...)
 #define net_post_init(...)
-int net_send_data(struct net_pkt *pkt)
+int net_try_send_data(struct net_pkt *pkt, k_timeout_t timeout)
 {
 	ARG_UNUSED(pkt);
+	ARG_UNUSED(timeout);
 
 	return -ENOTSUP;
 }
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 53f89a7d10525..4c91f7b172118 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -215,10 +215,7 @@ static void update_txtime_stats_detail(struct net_pkt *pkt,
 
 static bool net_if_tx(struct net_if *iface, struct net_pkt *pkt)
 {
-	struct net_linkaddr ll_dst = {
-		.addr = NULL
-	};
-	struct net_linkaddr_storage ll_dst_storage;
+	struct net_linkaddr ll_dst = { 0 };
 	struct net_context *context;
 	uint32_t create_time;
 	int status;
@@ -239,12 +236,10 @@ static bool net_if_tx(struct net_if *iface, struct net_pkt *pkt)
 	 * case packet is freed before callback is called.
 	 */
 	if (!sys_slist_is_empty(&link_callbacks)) {
-		if (net_linkaddr_set(&ll_dst_storage,
+		if (net_linkaddr_set(&ll_dst,
 				     net_pkt_lladdr_dst(pkt)->addr,
-				     net_pkt_lladdr_dst(pkt)->len) == 0) {
-			ll_dst.addr = ll_dst_storage.addr;
-			ll_dst.len = ll_dst_storage.len;
-			ll_dst.type = net_pkt_lladdr_dst(pkt)->type;
+				     net_pkt_lladdr_dst(pkt)->len) < 0) {
+			return false;
 		}
 	}
 
@@ -320,7 +315,7 @@ static bool net_if_tx(struct net_if *iface, struct net_pkt *pkt)
 		net_context_send_cb(context, status);
 	}
 
-	if (ll_dst.addr) {
+	if (ll_dst.len > 0) {
 		net_if_call_link_cb(iface, &ll_dst, status);
 	}
 
@@ -342,10 +337,13 @@ void net_process_tx_packet(struct net_pkt *pkt)
 #endif
 }
 
-void net_if_queue_tx(struct net_if *iface, struct net_pkt *pkt)
+void net_if_try_queue_tx(struct net_if *iface, struct net_pkt *pkt, k_timeout_t timeout)
 {
 	if (!net_pkt_filter_send_ok(pkt)) {
-		/* silently drop the packet */
+		/* Silently drop the packet, but update the statistics in order
+		 * to be able to monitor filter activity.
+		 */
+		net_stats_update_filter_tx_drop(net_pkt_iface(pkt));
 		net_pkt_unref(pkt);
 		return;
 	}
@@ -368,7 +366,7 @@ void net_if_queue_tx(struct net_if *iface, struct net_pkt *pkt)
 
 		net_if_tx(net_pkt_iface(pkt), pkt);
 	} else {
-		if (net_tc_submit_to_tx_queue(tc, pkt) != NET_OK) {
+		if (net_tc_try_submit_to_tx_queue(tc, pkt, timeout) != NET_OK) {
 			goto drop;
 		}
 #if defined(CONFIG_NET_POWER_MANAGEMENT)
@@ -451,7 +449,8 @@ static inline void init_iface(struct net_if *iface)
 }
 
 #if defined(CONFIG_NET_NATIVE)
-enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
+enum net_verdict net_if_try_send_data(struct net_if *iface, struct net_pkt *pkt,
+				      k_timeout_t timeout)
 {
 	const struct net_l2 *l2;
 	struct net_context *context = net_pkt_context(pkt);
@@ -494,9 +493,10 @@ enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
 	 * https://github.com/zephyrproject-rtos/zephyr/issues/3111
 	 */
 	if (!net_if_flag_is_set(iface, NET_IF_POINTOPOINT) &&
-	    !net_pkt_lladdr_src(pkt)->addr) {
-		net_pkt_lladdr_src(pkt)->addr = net_pkt_lladdr_if(pkt)->addr;
-		net_pkt_lladdr_src(pkt)->len = net_pkt_lladdr_if(pkt)->len;
+	    net_pkt_lladdr_src(pkt)->len == 0) {
+		(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+				       net_pkt_lladdr_if(pkt)->addr,
+				       net_pkt_lladdr_if(pkt)->len);
 	}
 
 #if defined(CONFIG_NET_LOOPBACK)
@@ -508,10 +508,10 @@ enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
 	}
 #endif
 
-	/* Bypass the IP stack with SOCK_RAW/IPPROTO_RAW sockets */
-	if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) &&
-	    context && net_context_get_type(context) == SOCK_RAW &&
-	    net_context_get_proto(context) == IPPROTO_RAW) {
+	/* Bypass the IP stack with AF_INET(6)/SOCK_RAW */
+	if (context && net_context_get_type(context) == SOCK_RAW &&
+	    (net_context_get_family(context) == AF_INET ||
+	     net_context_get_family(context) == AF_INET6)) {
 		goto done;
 	}
 
@@ -545,12 +545,12 @@ enum net_verdict net_if_send_data(struct net_if *iface, struct net_pkt *pkt)
 			net_context_send_cb(context, status);
 		}
 
-		if (dst->addr) {
+		if (dst->len > 0) {
 			net_if_call_link_cb(iface, dst, status);
 		}
 	} else if (verdict == NET_OK) {
 		/* Packet is ready to be sent by L2, let's queue */
-		net_if_queue_tx(iface, pkt);
+		net_if_try_queue_tx(iface, pkt, timeout);
 	}
 
 	return verdict;
@@ -1298,21 +1298,25 @@ void net_if_ipv6_start_dad(struct net_if *iface,
 
 		ifaddr->dad_count = 1U;
 
-		if (!net_ipv6_start_dad(iface, ifaddr)) {
-			ifaddr->dad_start = k_uptime_get_32();
-			ifaddr->ifindex = net_if_get_by_iface(iface);
+		if (net_ipv6_start_dad(iface, ifaddr) != 0) {
+			NET_ERR("Interface %p failed to send DAD query for %s",
+				iface,
+				net_sprint_ipv6_addr(&ifaddr->address.in6_addr));
+		}
 
-			k_mutex_lock(&lock, K_FOREVER);
-			sys_slist_find_and_remove(&active_dad_timers,
-						  &ifaddr->dad_node);
-			sys_slist_append(&active_dad_timers, &ifaddr->dad_node);
-			k_mutex_unlock(&lock);
+		ifaddr->dad_start = k_uptime_get_32();
+		ifaddr->ifindex = net_if_get_by_iface(iface);
 
-			/* FUTURE: use schedule, not reschedule. */
-			if (!k_work_delayable_remaining_get(&dad_timer)) {
-				k_work_reschedule(&dad_timer,
-						  K_MSEC(DAD_TIMEOUT));
-			}
+		k_mutex_lock(&lock, K_FOREVER);
+		sys_slist_find_and_remove(&active_dad_timers,
+					  &ifaddr->dad_node);
+		sys_slist_append(&active_dad_timers, &ifaddr->dad_node);
+		k_mutex_unlock(&lock);
+
+		/* FUTURE: use schedule, not reschedule. */
+		if (!k_work_delayable_remaining_get(&dad_timer)) {
+			k_work_reschedule(&dad_timer,
+					  K_MSEC(DAD_TIMEOUT));
 		}
 	} else {
 		NET_DBG("Interface %p is down, starting DAD for %s later.",
@@ -1323,8 +1327,9 @@ void net_if_ipv6_start_dad(struct net_if *iface,
 
 void net_if_start_dad(struct net_if *iface)
 {
-	struct net_if_addr *ifaddr;
+	struct net_if_addr *ifaddr, *next;
 	struct net_if_ipv6 *ipv6;
+	sys_slist_t dad_needed;
 	struct in6_addr addr = { };
 	int ret;
 
@@ -1374,6 +1379,8 @@ void net_if_start_dad(struct net_if *iface)
 	/* Start DAD for all the addresses that were added earlier when
 	 * the interface was down.
 	 */
+	sys_slist_init(&dad_needed);
+
 	ARRAY_FOR_EACH(ipv6->unicast, i) {
 		if (!ipv6->unicast[i].is_used ||
 		    ipv6->unicast[i].address.family != AF_INET6 ||
@@ -1383,9 +1390,21 @@ void net_if_start_dad(struct net_if *iface)
 			continue;
 		}
 
-		net_if_ipv6_start_dad(iface, &ipv6->unicast[i]);
+		sys_slist_prepend(&dad_needed, &ipv6->unicast[i].dad_need_node);
+	}
+
+	net_if_unlock(iface);
+
+	/* Start DAD for all the addresses without holding the iface lock
+	 * to avoid any possible mutex deadlock issues.
+	 */
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&dad_needed,
+					  ifaddr, next, dad_need_node) {
+		net_if_ipv6_start_dad(iface, ifaddr);
 	}
 
+	return;
+
 out:
 	net_if_unlock(iface);
 }
@@ -1433,7 +1452,10 @@ void net_if_ipv6_dad_failed(struct net_if *iface, const struct in6_addr *addr)
 	net_if_ipv6_addr_rm(iface, addr);
 
 	if (IS_ENABLED(CONFIG_NET_IPV6_PE) && iface->pe_enabled) {
+		net_if_unlock(iface);
+
 		net_ipv6_pe_start(iface, addr, timeout, preferred_lifetime);
+		return;
 	}
 
 out:
@@ -1447,12 +1469,7 @@ static inline void iface_ipv6_dad_init(void)
 }
 
 #else
-static inline void net_if_ipv6_start_dad(struct net_if *iface,
-					 struct net_if_addr *ifaddr)
-{
-	ifaddr->addr_state = NET_ADDR_PREFERRED;
-}
-
+#define net_if_ipv6_start_dad(...)
 #define iface_ipv6_dad_init(...)
 #endif /* CONFIG_NET_IPV6_DAD */
 
@@ -1537,6 +1554,8 @@ void net_if_start_rs(struct net_if *iface)
 		goto out;
 	}
 
+	net_if_unlock(iface);
+
 	NET_DBG("Starting ND/RS for iface %p", iface);
 
 	if (!net_ipv6_start_rs(iface)) {
@@ -1552,6 +1571,7 @@ void net_if_start_rs(struct net_if *iface)
 		}
 	}
 
+	return;
 out:
 	net_if_unlock(iface);
 }
@@ -1616,7 +1636,9 @@ void net_if_nbr_reachability_hint(struct net_if *iface, const struct in6_addr *i
  */
 static void rejoin_ipv6_mcast_groups(struct net_if *iface)
 {
+	struct net_if_mcast_addr *ifaddr, *next;
 	struct net_if_ipv6 *ipv6;
+	sys_slist_t rejoin_needed;
 
 	net_if_lock(iface);
 
@@ -1638,27 +1660,41 @@ static void rejoin_ipv6_mcast_groups(struct net_if *iface)
 		join_mcast_nodes(iface, &ipv6->unicast[i].address.in6_addr);
 	}
 
+	sys_slist_init(&rejoin_needed);
+
 	/* Rejoin any mcast address present on the interface, but marked as not joined. */
 	ARRAY_FOR_EACH(ipv6->mcast, i) {
-		int ret;
-
 		if (!ipv6->mcast[i].is_used ||
 		    net_if_ipv6_maddr_is_joined(&ipv6->mcast[i])) {
 			continue;
 		}
 
-		ret = net_ipv6_mld_join(iface, &ipv6->mcast[i].address.in6_addr);
+		sys_slist_prepend(&rejoin_needed, &ipv6->mcast[i].rejoin_node);
+	}
+
+	net_if_unlock(iface);
+
+	/* Start DAD for all the addresses without holding the iface lock
+	 * to avoid any possible mutex deadlock issues.
+	 */
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&rejoin_needed,
+					  ifaddr, next, rejoin_node) {
+		int ret;
+
+		ret = net_ipv6_mld_join(iface, &ifaddr->address.in6_addr);
 		if (ret < 0) {
 			NET_ERR("Cannot join mcast address %s for %d (%d)",
-				net_sprint_ipv6_addr(&ipv6->mcast[i].address.in6_addr),
+				net_sprint_ipv6_addr(&ifaddr->address.in6_addr),
 				net_if_get_by_iface(iface), ret);
 		} else {
 			NET_DBG("Rejoined mcast address %s for %d",
-				net_sprint_ipv6_addr(&ipv6->mcast[i].address.in6_addr),
+				net_sprint_ipv6_addr(&ifaddr->address.in6_addr),
 				net_if_get_by_iface(iface));
 		}
 	}
 
+	return;
+
 out:
 	net_if_unlock(iface);
 }
@@ -1775,11 +1811,7 @@ static void address_start_timer(struct net_if_addr *ifaddr, uint32_t vlifetime)
 }
 #else /* CONFIG_NET_NATIVE_IPV6 */
 #define address_start_timer(...)
-static inline void net_if_ipv6_start_dad(struct net_if *iface,
-					 struct net_if_addr *ifaddr)
-{
-	ifaddr->addr_state = NET_ADDR_PREFERRED;
-}
+#define net_if_ipv6_start_dad(...)
 #define join_mcast_nodes(...)
 #endif /* CONFIG_NET_NATIVE_IPV6 */
 
@@ -1959,6 +1991,7 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,
 {
 	struct net_if_addr *ifaddr = NULL;
 	struct net_if_ipv6 *ipv6;
+	bool do_dad = false;
 
 	net_if_lock(iface);
 
@@ -1995,23 +2028,12 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,
 			net_sprint_ipv6_addr(addr),
 			net_addr_type2str(addr_type));
 
-		if (!(l2_flags_get(iface) & NET_L2_POINT_TO_POINT) &&
+		if (IS_ENABLED(CONFIG_NET_IPV6_DAD) &&
+		    !(l2_flags_get(iface) & NET_L2_POINT_TO_POINT) &&
 		    !net_ipv6_is_addr_loopback(addr) &&
 		    !net_if_flag_is_set(iface, NET_IF_IPV6_NO_ND)) {
-			/* RFC 4862 5.4.2
-			 * Before sending a Neighbor Solicitation, an interface
-			 * MUST join the all-nodes multicast address and the
-			 * solicited-node multicast address of the tentative
-			 * address.
-			 */
-			/* The allnodes multicast group is only joined once as
-			 * net_ipv6_mld_join() checks if we have already
-			 * joined.
-			 */
-			join_mcast_nodes(iface,
-					 &ipv6->unicast[i].address.in6_addr);
-
-			net_if_ipv6_start_dad(iface, &ipv6->unicast[i]);
+			/* The groups are joined without locks held */
+			do_dad = true;
 		} else {
 			/* If DAD is not done for point-to-point links, then
 			 * the address is usable immediately.
@@ -2025,9 +2047,29 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,
 			sizeof(struct in6_addr));
 
 		ifaddr = &ipv6->unicast[i];
-		goto out;
+		break;
+	}
+
+	net_if_unlock(iface);
+
+	if (ifaddr != NULL && do_dad) {
+		/* RFC 4862 5.4.2
+		 * Before sending a Neighbor Solicitation, an interface
+		 * MUST join the all-nodes multicast address and the
+		 * solicited-node multicast address of the tentative
+		 * address.
+		 */
+		/* The allnodes multicast group is only joined once as
+		 * net_ipv6_mld_join() checks if we have already
+		 * joined.
+		 */
+		join_mcast_nodes(iface, &ifaddr->address.in6_addr);
+
+		net_if_ipv6_start_dad(iface, ifaddr);
 	}
 
+	return ifaddr;
+
 out:
 	net_if_unlock(iface);
 
@@ -3091,6 +3133,29 @@ static struct in6_addr *net_if_ipv6_get_best_match(struct net_if *iface,
 			continue;
 		}
 
+		/* This is a dirty hack until we have proper IPv6 routing.
+		 * Without this the IPv6 packets might go to VPN interface for
+		 * subnets that are not on the same subnet as the VPN interface
+		 * which typically is not desired.
+		 * TODO: Implement IPv6 routing support and remove this hack.
+		 */
+		if (IS_ENABLED(CONFIG_NET_VPN)) {
+			/* For the VPN interface, we need to check if
+			 * address matches exactly the address of the interface.
+			 */
+			if (net_if_l2(iface) == &NET_L2_GET_NAME(VIRTUAL) &&
+			    net_virtual_get_iface_capabilities(iface) == VIRTUAL_INTERFACE_VPN) {
+				/* FIXME: Do not hard code the prefix length */
+				if (!net_ipv6_is_prefix(
+					    (const uint8_t *)&ipv6->unicast[i].address.in6_addr,
+					    (const uint8_t *)dst,
+					    64)) {
+					/* Skip this address as it is no match */
+					continue;
+				}
+			}
+		}
+
 		len = get_diff_ipv6(dst, &ipv6->unicast[i].address.in6_addr);
 		if (len >= prefix_len) {
 			len = prefix_len;
@@ -3236,7 +3301,8 @@ const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *dst_iface,
 						IPV6_PREFER_SRC_PUBTMP_DEFAULT);
 }
 
-struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst)
+struct net_if *net_if_ipv6_select_src_iface_addr(const struct in6_addr *dst,
+						 const struct in6_addr **src_addr)
 {
 	struct net_if *iface = NULL;
 	const struct in6_addr *src;
@@ -3246,6 +3312,10 @@ struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst)
 		net_if_ipv6_addr_lookup(src, &iface);
 	}
 
+	if (src_addr != NULL) {
+		*src_addr = src;
+	}
+
 	if (iface == NULL) {
 		iface = net_if_get_default();
 	}
@@ -3253,6 +3323,11 @@ struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst)
 	return iface;
 }
 
+struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst)
+{
+	return net_if_ipv6_select_src_iface_addr(dst, NULL);
+}
+
 #if defined(CONFIG_NET_NATIVE_IPV6)
 
 uint32_t net_if_ipv6_calc_reachable_time(struct net_if_ipv6 *ipv6)
@@ -3561,7 +3636,8 @@ bool net_if_ipv4_is_addr_bcast(struct net_if *iface,
 	return ret;
 }
 
-struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst)
+struct net_if *net_if_ipv4_select_src_iface_addr(const struct in_addr *dst,
+						 const struct in_addr **src_addr)
 {
 	struct net_if *selected = NULL;
 	const struct in_addr *src;
@@ -3575,9 +3651,18 @@ struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst)
 		selected = net_if_get_default();
 	}
 
+	if (src_addr != NULL) {
+		*src_addr = src;
+	}
+
 	return selected;
 }
 
+struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst)
+{
+	return net_if_ipv4_select_src_iface_addr(dst, NULL);
+}
+
 static uint8_t get_diff_ipv4(const struct in_addr *src,
 			  const struct in_addr *dst)
 {
@@ -3620,6 +3705,29 @@ static struct in_addr *net_if_ipv4_get_best_match(struct net_if *iface,
 			continue;
 		}
 
+		/* This is a dirty hack until we have proper IPv4 routing.
+		 * Without this the IPv4 packets might go to VPN interface for
+		 * subnets that are not on the same subnet as the VPN interface
+		 * which typically is not desired.
+		 * TODO: Implement IPv4 routing support and remove this hack.
+		 */
+		if (IS_ENABLED(CONFIG_NET_VPN)) {
+			/* For the VPN interface, we need to check if
+			 * address matches exactly the address of the interface.
+			 */
+			if (net_if_l2(iface) == &NET_L2_GET_NAME(VIRTUAL) &&
+			    net_virtual_get_iface_capabilities(iface) == VIRTUAL_INTERFACE_VPN) {
+				subnet.s_addr = ipv4->unicast[i].ipv4.address.in_addr.s_addr &
+					ipv4->unicast[i].netmask.s_addr;
+
+				if (subnet.s_addr !=
+				    (dst->s_addr & ipv4->unicast[i].netmask.s_addr)) {
+					/* Skip this address as it is no match */
+					continue;
+				}
+			}
+		}
+
 		subnet.s_addr = ipv4->unicast[i].ipv4.address.in_addr.s_addr &
 				ipv4->unicast[i].netmask.s_addr;
 		len = get_diff_ipv4(dst, &subnet);
@@ -4260,7 +4368,9 @@ void net_if_ipv4_start_acd(struct net_if *iface, struct net_if_addr *ifaddr)
 
 void net_if_start_acd(struct net_if *iface)
 {
+	struct net_if_addr *ifaddr, *next;
 	struct net_if_ipv4 *ipv4;
+	sys_slist_t acd_needed;
 	int ret;
 
 	net_if_lock(iface);
@@ -4282,6 +4392,11 @@ void net_if_start_acd(struct net_if *iface)
 
 	ipv4->conflict_cnt = 0;
 
+	/* Start ACD for all the addresses that were added earlier when
+	 * the interface was down.
+	 */
+	sys_slist_init(&acd_needed);
+
 	/* Start ACD for all the addresses that were added earlier when
 	 * the interface was down.
 	 */
@@ -4293,20 +4408,26 @@ void net_if_start_acd(struct net_if *iface)
 			continue;
 		}
 
-		net_if_ipv4_start_acd(iface, &ipv4->unicast[i].ipv4);
+		sys_slist_prepend(&acd_needed, &ipv4->unicast[i].ipv4.acd_need_node);
+	}
+
+	net_if_unlock(iface);
+
+	/* Start ACD for all the addresses without holding the iface lock
+	 * to avoid any possible mutex deadlock issues.
+	 */
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&acd_needed,
+					  ifaddr, next, acd_need_node) {
+		net_if_ipv4_start_acd(iface, ifaddr);
 	}
 
+	return;
+
 out:
 	net_if_unlock(iface);
 }
 #else
-void net_if_ipv4_start_acd(struct net_if *iface, struct net_if_addr *ifaddr)
-{
-	ARG_UNUSED(iface);
-
-	ifaddr->addr_state = NET_ADDR_PREFERRED;
-}
-
+#define net_if_ipv4_start_acd(...)
 #define net_if_start_acd(...)
 #endif /* CONFIG_NET_IPV4_ACD */
 
@@ -4387,9 +4508,11 @@ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface,
 			net_sprint_ipv4_addr(addr),
 			net_addr_type2str(addr_type));
 
-		if (!(l2_flags_get(iface) & NET_L2_POINT_TO_POINT) &&
+		if (IS_ENABLED(CONFIG_NET_IPV4_ACD) &&
+		    !(l2_flags_get(iface) & NET_L2_POINT_TO_POINT) &&
 		    !net_ipv4_is_addr_loopback(addr)) {
-			net_if_ipv4_start_acd(iface, ifaddr);
+			/* ACD is started after the lock is released. */
+			;
 		} else {
 			ifaddr->addr_state = NET_ADDR_PREFERRED;
 		}
@@ -4399,7 +4522,12 @@ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface,
 		net_mgmt_event_notify_with_info(NET_EVENT_IPV4_ADDR_ADD, iface,
 						&ifaddr->address.in_addr,
 						sizeof(struct in_addr));
-		goto out;
+
+		net_if_unlock(iface);
+
+		net_if_ipv4_start_acd(iface, ifaddr);
+
+		return ifaddr;
 	}
 
 out:
@@ -4879,7 +5007,9 @@ static void iface_ipv4_start(struct net_if *iface)
  */
 static void rejoin_ipv4_mcast_groups(struct net_if *iface)
 {
+	struct net_if_mcast_addr *ifaddr, *next;
 	struct net_if_ipv4 *ipv4;
+	sys_slist_t rejoin_needed;
 
 	net_if_lock(iface);
 
@@ -4891,27 +5021,37 @@ static void rejoin_ipv4_mcast_groups(struct net_if *iface)
 		goto out;
 	}
 
+	sys_slist_init(&rejoin_needed);
+
 	/* Rejoin any mcast address present on the interface, but marked as not joined. */
 	ARRAY_FOR_EACH(ipv4->mcast, i) {
-		int ret;
-
 		if (!ipv4->mcast[i].is_used ||
 		    net_if_ipv4_maddr_is_joined(&ipv4->mcast[i])) {
 			continue;
 		}
 
-		ret = net_ipv4_igmp_join(iface, &ipv4->mcast[i].address.in_addr, NULL);
+		sys_slist_prepend(&rejoin_needed, &ipv4->mcast[i].rejoin_node);
+	}
+
+	net_if_unlock(iface);
+
+	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&rejoin_needed, ifaddr, next, rejoin_node) {
+		int ret;
+
+		ret = net_ipv4_igmp_join(iface, &ifaddr->address.in_addr, NULL);
 		if (ret < 0) {
 			NET_ERR("Cannot join mcast address %s for %d (%d)",
-				net_sprint_ipv4_addr(&ipv4->mcast[i].address.in_addr),
+				net_sprint_ipv4_addr(&ifaddr->address.in_addr),
 				net_if_get_by_iface(iface), ret);
 		} else {
 			NET_DBG("Rejoined mcast address %s for %d",
-				net_sprint_ipv4_addr(&ipv4->mcast[i].address.in_addr),
+				net_sprint_ipv4_addr(&ifaddr->address.in_addr),
 				net_if_get_by_iface(iface));
 		}
 	}
 
+	return;
+
 out:
 	net_if_unlock(iface);
 }
@@ -5127,8 +5267,13 @@ static void remove_ipv6_ifaddr(struct net_if *iface,
 #if defined(CONFIG_NET_IPV6_DAD)
 	if (!net_if_flag_is_set(iface, NET_IF_IPV6_NO_ND)) {
 		k_mutex_lock(&lock, K_FOREVER);
-		sys_slist_find_and_remove(&active_dad_timers,
-					  &ifaddr->dad_node);
+		if (sys_slist_find_and_remove(&active_dad_timers,
+					      &ifaddr->dad_node)) {
+			/* Addreess with active DAD timer would still have
+			 * stale entry in the neighbor cache.
+			 */
+			net_ipv6_nbr_rm(iface, &ifaddr->address.in6_addr);
+		}
 		k_mutex_unlock(&lock);
 	}
 #endif
diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c
index 6aa0ca91a105d..21a28e2d66ec5 100644
--- a/subsys/net/ip/net_pkt.c
+++ b/subsys/net/ip/net_pkt.c
@@ -2007,49 +2007,6 @@ int net_pkt_copy(struct net_pkt *pkt_dst,
 	return 0;
 }
 
-static int32_t net_pkt_find_offset(struct net_pkt *pkt, uint8_t *ptr)
-{
-	struct net_buf *buf;
-	uint32_t ret = -EINVAL;
-	uint16_t offset;
-
-	if (!ptr || !pkt || !pkt->buffer) {
-		return ret;
-	}
-
-	offset = 0U;
-	buf = pkt->buffer;
-
-	while (buf) {
-		if (buf->data <= ptr && ptr < (buf->data + buf->len)) {
-			ret = offset + (ptr - buf->data);
-			break;
-		}
-		offset += buf->len;
-		buf = buf->frags;
-	}
-
-	return ret;
-}
-
-static void clone_pkt_lladdr(struct net_pkt *pkt, struct net_pkt *clone_pkt,
-			     struct net_linkaddr *lladdr)
-{
-	int32_t ll_addr_offset;
-
-	if (!lladdr->addr) {
-		return;
-	}
-
-	ll_addr_offset = net_pkt_find_offset(pkt, lladdr->addr);
-
-	if (ll_addr_offset >= 0) {
-		net_pkt_cursor_init(clone_pkt);
-		net_pkt_skip(clone_pkt, ll_addr_offset);
-		lladdr->addr = net_pkt_cursor_get_pos(clone_pkt);
-	}
-}
-
 #if defined(NET_PKT_HAS_CONTROL_BLOCK)
 static inline void clone_pkt_cb(struct net_pkt *pkt, struct net_pkt *clone_pkt)
 {
@@ -2101,17 +2058,6 @@ static void clone_pkt_attributes(struct net_pkt *pkt, struct net_pkt *clone_pkt)
 		       sizeof(struct net_linkaddr));
 		memcpy(net_pkt_lladdr_dst(clone_pkt), net_pkt_lladdr_dst(pkt),
 		       sizeof(struct net_linkaddr));
-		/* The link header pointers are usable as-is if we
-		 * shallow-copied the buffer even if they point
-		 * into the fragment memory of the buffer,
-		 * otherwise we have to set the ll address pointer
-		 * relative to the new buffer to avoid dangling
-		 * pointers into the source packet.
-		 */
-		if (pkt->buffer != clone_pkt->buffer) {
-			clone_pkt_lladdr(pkt, clone_pkt, net_pkt_lladdr_src(clone_pkt));
-			clone_pkt_lladdr(pkt, clone_pkt, net_pkt_lladdr_dst(clone_pkt));
-		}
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) {
diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h
index ee71d2bb75ec0..4ed66f386a814 100644
--- a/subsys/net/ip/net_private.h
+++ b/subsys/net/ip/net_private.h
@@ -203,7 +203,8 @@ static inline enum net_verdict net_ipv6_input(struct net_pkt *pkt,
 static inline void net_tc_tx_init(void) { }
 static inline void net_tc_rx_init(void) { }
 #endif
-extern enum net_verdict net_tc_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt);
+enum net_verdict net_tc_try_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt,
+					       k_timeout_t timeout);
 extern enum net_verdict net_tc_submit_to_rx_queue(uint8_t tc, struct net_pkt *pkt);
 extern enum net_verdict net_promisc_mode_input(struct net_pkt *pkt);
 
@@ -300,7 +301,9 @@ enum net_verdict net_context_packet_received(struct net_conn *conn,
 					     void *user_data);
 
 #if defined(CONFIG_NET_IPV4)
-extern uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt);
+uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt);
+#else
+#define net_calc_chksum_ipv4(...) 0U
 #endif /* CONFIG_NET_IPV4 */
 
 #if defined(CONFIG_NET_IPV4_IGMP)
diff --git a/subsys/net/ip/net_stats.h b/subsys/net/ip/net_stats.h
index 6a7a3cdbd93f0..17b3f0d8c7f44 100644
--- a/subsys/net/ip/net_stats.h
+++ b/subsys/net/ip/net_stats.h
@@ -59,12 +59,56 @@ static inline void net_stats_update_bytes_sent(struct net_if *iface,
 {
 	UPDATE_STAT(iface, stats.bytes.sent += bytes);
 }
+
+#if defined(CONFIG_NET_STATISTICS_PKT_FILTER)
+static inline void net_stats_update_filter_rx_drop(struct net_if *iface)
+{
+	UPDATE_STAT(iface, stats.pkt_filter.rx.drop++);
+}
+
+static inline void net_stats_update_filter_tx_drop(struct net_if *iface)
+{
+	UPDATE_STAT(iface, stats.pkt_filter.tx.drop++);
+}
+
+static inline void net_stats_update_filter_rx_ipv4_drop(struct net_if *iface)
+{
+#if defined(CONFIG_NET_PKT_FILTER_IPV4_HOOK)
+	UPDATE_STAT(iface, stats.pkt_filter.rx.ipv4_drop++);
+#endif
+}
+
+static inline void net_stats_update_filter_rx_ipv6_drop(struct net_if *iface)
+{
+#if defined(CONFIG_NET_PKT_FILTER_IPV6_HOOK)
+	UPDATE_STAT(iface, stats.pkt_filter.rx.ipv6_drop++);
+#endif
+}
+
+static inline void net_stats_update_filter_rx_local_drop(struct net_if *iface)
+{
+#if defined(CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK)
+	UPDATE_STAT(iface, stats.pkt_filter.rx.local_drop++);
+#endif
+}
+#else /* CONFIG_NET_STATISTICS_PKT_FILTER */
+#define net_stats_update_filter_rx_drop(iface)
+#define net_stats_update_filter_tx_drop(iface)
+#define net_stats_update_filter_rx_ipv4_drop(iface)
+#define net_stats_update_filter_rx_ipv6_drop(iface)
+#define net_stats_update_filter_rx_local_drop(iface)
+#endif /* CONFIG_NET_STATISTICS_PKT_FILTER */
 #else
 #define net_stats_update_processing_error(iface)
 #define net_stats_update_ip_errors_protoerr(iface)
 #define net_stats_update_ip_errors_vhlerr(iface)
 #define net_stats_update_bytes_recv(iface, bytes)
 #define net_stats_update_bytes_sent(iface, bytes)
+#define net_stats_update_filter_rx_drop(iface)
+#define net_stats_update_filter_tx_drop(iface)
+#define net_stats_update_filter_rx_ipv4_drop(iface)
+#define net_stats_update_filter_rx_ipv6_drop(iface)
+#define net_stats_update_filter_rx_local_drop(iface)
 #endif /* CONFIG_NET_STATISTICS */
 
 #if defined(CONFIG_NET_STATISTICS_IPV6) && defined(CONFIG_NET_NATIVE_IPV6)
diff --git a/subsys/net/ip/net_tc.c b/subsys/net/ip/net_tc.c
index 276fd01ff8bc8..15a928ffcd3ee 100644
--- a/subsys/net/ip/net_tc.c
+++ b/subsys/net/ip/net_tc.c
@@ -40,6 +40,9 @@ BUILD_ASSERT(NET_TC_TX_SLOTS > 0,
 		"CONFIG_NET_TC_TX_COUNT or disable CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO");
 #endif
 
+#if NET_TC_RX_EFFECTIVE_COUNT > 1
+#define NET_TC_RETRY_CNT 1
+#endif
 /* Template for thread name. The "xx" is either "TX" denoting transmit thread,
  * or "RX" denoting receive thread. The "q[y]" denotes the traffic class queue
  * where y indicates the traffic class id. The value of y can be from 0 to 7.
@@ -62,13 +65,14 @@ static struct net_traffic_class tx_classes[NET_TC_TX_COUNT];
 static struct net_traffic_class rx_classes[NET_TC_RX_COUNT];
 #endif
 
-enum net_verdict net_tc_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt)
+enum net_verdict net_tc_try_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt,
+					       k_timeout_t timeout)
 {
 #if NET_TC_TX_COUNT > 0
 	net_pkt_set_tx_stats_tick(pkt, k_cycle_get_32());
 
 #if NET_TC_TX_EFFECTIVE_COUNT > 1
-	if (k_sem_take(&tx_classes[tc].fifo_slot, K_NO_WAIT) != 0) {
+	if (k_sem_take(&tx_classes[tc].fifo_slot, timeout) != 0) {
 		return NET_DROP;
 	}
 #endif
@@ -85,11 +89,22 @@ enum net_verdict net_tc_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt)
 enum net_verdict net_tc_submit_to_rx_queue(uint8_t tc, struct net_pkt *pkt)
 {
 #if NET_TC_RX_COUNT > 0
+#if NET_TC_RX_EFFECTIVE_COUNT > 1
+	uint8_t retry_cnt = NET_TC_RETRY_CNT;
+#endif
 	net_pkt_set_rx_stats_tick(pkt, k_cycle_get_32());
 
 #if NET_TC_RX_EFFECTIVE_COUNT > 1
-	if (k_sem_take(&rx_classes[tc].fifo_slot, K_NO_WAIT) != 0) {
-		return NET_DROP;
+	while (k_sem_take(&rx_classes[tc].fifo_slot, K_NO_WAIT) != 0) {
+		if (k_is_in_isr() || retry_cnt == 0) {
+			return NET_DROP;
+		}
+
+		retry_cnt--;
+		/* Let thread with same priority run,
+		 * try to reduce dropping packets
+		 */
+		k_yield();
 	}
 #endif
 
diff --git a/subsys/net/ip/route.c b/subsys/net/ip/route.c
index f26f84948a866..4f646b3d37b46 100644
--- a/subsys/net/ip/route.c
+++ b/subsys/net/ip/route.c
@@ -328,7 +328,7 @@ struct net_route_entry *net_route_add(struct net_if *iface,
 				      uint32_t lifetime,
 				      uint8_t preference)
 {
-	struct net_linkaddr_storage *nexthop_lladdr;
+	struct net_linkaddr *nexthop_lladdr;
 	struct net_nbr *nbr, *nbr_nexthop, *tmp;
 	struct net_route_nexthop *nexthop_route;
 	struct net_route_entry *route = NULL;
@@ -403,7 +403,7 @@ struct net_route_entry *net_route_add(struct net_if *iface,
 
 		if (CONFIG_NET_ROUTE_LOG_LEVEL >= LOG_LEVEL_DBG) {
 			struct in6_addr *in6_addr_tmp;
-			struct net_linkaddr_storage *llstorage;
+			struct net_linkaddr *llstorage;
 
 			in6_addr_tmp = net_route_get_nexthop(route);
 			nbr = net_ipv6_nbr_lookup(iface, in6_addr_tmp);
@@ -1031,7 +1031,7 @@ static bool is_ll_addr_supported(struct net_if *iface)
 
 int net_route_packet(struct net_pkt *pkt, struct in6_addr *nexthop)
 {
-	struct net_linkaddr_storage *lladdr = NULL;
+	struct net_linkaddr *lladdr = NULL;
 	struct net_nbr *nbr;
 	int err;
 
@@ -1055,7 +1055,7 @@ int net_route_packet(struct net_pkt *pkt, struct in6_addr *nexthop)
 			goto error;
 		}
 
-		if (!net_pkt_lladdr_src(pkt)->addr) {
+		if (net_pkt_lladdr_src(pkt)->len == 0) {
 			NET_DBG("Link layer source address not set");
 			err = -EINVAL;
 			goto error;
@@ -1079,15 +1079,12 @@ int net_route_packet(struct net_pkt *pkt, struct in6_addr *nexthop)
 	 * destination address to be the nexthop recipient.
 	 */
 	if (is_ll_addr_supported(net_pkt_iface(pkt))) {
-		net_pkt_lladdr_src(pkt)->addr = net_pkt_lladdr_if(pkt)->addr;
-		net_pkt_lladdr_src(pkt)->type = net_pkt_lladdr_if(pkt)->type;
-		net_pkt_lladdr_src(pkt)->len = net_pkt_lladdr_if(pkt)->len;
+		(void)net_linkaddr_copy(net_pkt_lladdr_src(pkt),
+					net_pkt_lladdr_if(pkt));
 	}
 
 	if (lladdr) {
-		net_pkt_lladdr_dst(pkt)->addr = lladdr->addr;
-		net_pkt_lladdr_dst(pkt)->type = lladdr->type;
-		net_pkt_lladdr_dst(pkt)->len = lladdr->len;
+		(void)net_linkaddr_copy(net_pkt_lladdr_dst(pkt), lladdr);
 	}
 
 	net_pkt_set_iface(pkt, nbr->iface);
@@ -1113,7 +1110,9 @@ int net_route_packet_if(struct net_pkt *pkt, struct net_if *iface)
 
 	/* Set source LL address if only if relevant */
 	if (is_ll_addr_supported(iface)) {
-		net_pkt_lladdr_src(pkt)->addr = net_pkt_lladdr_if(pkt)->addr;
+		memcpy(net_pkt_lladdr_src(pkt)->addr,
+		       net_pkt_lladdr_if(pkt)->addr,
+		       net_pkt_lladdr_if(pkt)->len);
 		net_pkt_lladdr_src(pkt)->type = net_pkt_lladdr_if(pkt)->type;
 		net_pkt_lladdr_src(pkt)->len = net_pkt_lladdr_if(pkt)->len;
 	}
diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c
index 67cd8d9d38390..89c0fa6fde074 100644
--- a/subsys/net/ip/tcp.c
+++ b/subsys/net/ip/tcp.c
@@ -2483,7 +2483,7 @@ static struct tcp *tcp_conn_new(struct net_pkt *pkt)
 		net_sprint_addr(context->remote.sa_family,
 				(const void *)&net_sin(&context->remote)->sin_addr));
 
-	ret = net_conn_register(IPPROTO_TCP, af,
+	ret = net_conn_register(IPPROTO_TCP, SOCK_STREAM, af,
 				&context->remote, &local_addr,
 				ntohs(conn->dst.sin.sin_port),/* local port */
 				ntohs(conn->src.sin.sin_port),/* remote port */
@@ -2854,6 +2854,7 @@ static enum net_verdict tcp_in(struct tcp *conn, struct net_pkt *pkt)
 		net_stats_update_tcp_seg_rst(net_pkt_iface(pkt));
 		do_close = true;
 		close_status = -ECONNRESET;
+		conn->rst_received = true;
 
 		/* If we receive RST and ACK for the sent SYN, it means
 		 * that there is no socket listening the port we are trying
@@ -3921,6 +3922,7 @@ int net_tcp_connect(struct net_context *context,
 	net_context_set_state(context, NET_CONTEXT_CONNECTING);
 
 	ret = net_conn_register(net_context_get_proto(context),
+				net_context_get_type(context),
 				net_context_get_family(context),
 				remote_addr, local_addr,
 				ntohs(remote_port), ntohs(local_port),
@@ -3952,7 +3954,11 @@ int net_tcp_connect(struct net_context *context,
 
 	if (!IS_ENABLED(CONFIG_NET_TEST_PROTOCOL)) {
 		if (conn->state == TCP_UNUSED || conn->state == TCP_CLOSED) {
-			ret = -ENOTCONN;
+			if (conn->rst_received) {
+				ret = -ECONNREFUSED;
+			} else {
+				ret = -ENOTCONN;
+			}
 			goto out_unref;
 		} else if ((K_TIMEOUT_EQ(timeout, K_NO_WAIT)) &&
 			   conn->state != TCP_ESTABLISHED) {
@@ -3965,7 +3971,11 @@ int net_tcp_connect(struct net_context *context,
 				tcp_conn_close(conn, -ETIMEDOUT);
 			}
 
-			ret = -ETIMEDOUT;
+			if (conn->rst_received) {
+				ret = -ECONNREFUSED;
+			} else {
+				ret = -ETIMEDOUT;
+			}
 			goto out_unref;
 		}
 		conn->in_connect = false;
@@ -4054,6 +4064,7 @@ int net_tcp_accept(struct net_context *context, net_tcp_accept_cb_t cb,
 	net_conn_unregister(context->conn_handler);
 
 	return net_conn_register(net_context_get_proto(context),
+				 net_context_get_type(context),
 				 local_addr.sa_family,
 				 context->flags & NET_CONTEXT_REMOTE_ADDR_SET ?
 				 &context->remote : NULL,
@@ -4354,13 +4365,15 @@ enum net_verdict tp_input(struct net_conn *net_conn,
 	return verdict;
 }
 
-static void test_cb_register(sa_family_t family, uint8_t proto, uint16_t remote_port,
+static void test_cb_register(sa_family_t family, enum net_sock_type type,
+			     uint8_t proto, uint16_t remote_port,
 			     uint16_t local_port, net_conn_cb_t cb)
 {
 	struct net_conn_handle *conn_handle = NULL;
 	const struct sockaddr addr = { .sa_family = family, };
 
 	int ret = net_conn_register(proto,
+				    type,
 				    family,
 				    &addr,	/* remote address */
 				    &addr,	/* local address */
@@ -4623,10 +4636,10 @@ void net_tcp_init(void)
 	int rto;
 #if defined(CONFIG_NET_TEST_PROTOCOL)
 	/* Register inputs for TTCN-3 based TCP sanity check */
-	test_cb_register(AF_INET,  IPPROTO_TCP, 4242, 4242, tcp_input);
-	test_cb_register(AF_INET6, IPPROTO_TCP, 4242, 4242, tcp_input);
-	test_cb_register(AF_INET,  IPPROTO_UDP, 4242, 4242, tp_input);
-	test_cb_register(AF_INET6, IPPROTO_UDP, 4242, 4242, tp_input);
+	test_cb_register(AF_INET,  SOCK_STREAM, IPPROTO_TCP, 4242, 4242, tcp_input);
+	test_cb_register(AF_INET6, SOCK_STREAM, IPPROTO_TCP, 4242, 4242, tcp_input);
+	test_cb_register(AF_INET,  SOCK_DGRAM, IPPROTO_UDP, 4242, 4242, tp_input);
+	test_cb_register(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, 4242, 4242, tp_input);
 
 	tcp_recv_cb = tp_tcp_recv_cb;
 #endif
diff --git a/subsys/net/ip/tcp_private.h b/subsys/net/ip/tcp_private.h
index e9e41df99f73a..a0ab02332e34a 100644
--- a/subsys/net/ip/tcp_private.h
+++ b/subsys/net/ip/tcp_private.h
@@ -338,6 +338,7 @@ struct tcp { /* TCP connection */
 #endif /* CONFIG_NET_TCP_KEEPALIVE */
 	bool tcp_nodelay : 1;
 	bool addr_ref_done : 1;
+	bool rst_received : 1;
 };
 
 #define _flags(_fl, _op, _mask, _cond)					\
diff --git a/subsys/net/ip/udp.c b/subsys/net/ip/udp.c
index 3ff428cd8a44a..e2214bbe47029 100644
--- a/subsys/net/ip/udp.c
+++ b/subsys/net/ip/udp.c
@@ -137,9 +137,9 @@ int net_udp_register(uint8_t family,
 		     void *user_data,
 		     struct net_conn_handle **handle)
 {
-	return net_conn_register(IPPROTO_UDP, family, remote_addr, local_addr,
-				 remote_port, local_port, context, cb,
-				 user_data, handle);
+	return net_conn_register(IPPROTO_UDP, SOCK_DGRAM, family, remote_addr,
+				 local_addr, remote_port, local_port, context,
+				 cb, user_data, handle);
 }
 
 int net_udp_unregister(struct net_conn_handle *handle)
diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c
index b113ad9af8217..3e4d76e296840 100644
--- a/subsys/net/ip/utils.c
+++ b/subsys/net/ip/utils.c
@@ -971,6 +971,162 @@ bool net_ipaddr_parse(const char *str, size_t str_len, struct sockaddr *addr)
 	return false;
 }
 
+const char *net_ipaddr_parse_mask(const char *str, size_t str_len,
+				  struct sockaddr *addr, uint8_t *mask_len)
+{
+	const char *next = NULL, *mask_ptr = NULL;
+	int parsed_mask_len = -1;
+	bool ret = false;
+
+	if (str == NULL || str_len == 0 || addr == NULL || mask_len == NULL) {
+		return NULL;
+	}
+
+	if (*str == '\0') {
+		return NULL;
+	}
+
+	for (int i = 0; i < str_len; i++) {
+		if (str[i] == ',' || str[i] == ' ') {
+			next = str + i + 1;
+			str_len = next - str - 1;
+			break;
+		}
+
+		if (str[i] == '/') {
+			mask_ptr = str + i;
+		}
+	}
+
+	if (mask_ptr != NULL) {
+		char *endptr;
+
+		parsed_mask_len = strtoul(mask_ptr + 1, &endptr, 10);
+		if (*endptr != '\0') {
+			if (next == NULL) {
+				return NULL;
+			}
+		}
+
+		str_len = mask_ptr - str;
+		*mask_len = (uint8_t)parsed_mask_len;
+	}
+
+#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_IPV6)
+	ret = parse_ipv4(str, str_len, addr, false);
+	if (!ret) {
+		ret = parse_ipv6(str, str_len, addr, false);
+	}
+#elif defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_IPV6)
+	ret = parse_ipv4(str, str_len, addr, false);
+
+#elif defined(CONFIG_NET_IPV6) && !defined(CONFIG_NET_IPV4)
+	ret = parse_ipv6(str, str_len, addr, false);
+#endif
+
+	if (!ret) {
+		return NULL;
+	}
+
+	if (parsed_mask_len < 0) {
+		if (addr->sa_family == AF_INET) {
+			*mask_len = 32;
+		} else if (addr->sa_family == AF_INET6) {
+			*mask_len = 128;
+		}
+	}
+
+	if (next != NULL) {
+		return next;
+	}
+
+	return "";
+}
+
+int net_mask_len_to_netmask(sa_family_t family, uint8_t mask_len, struct sockaddr *mask)
+{
+	if (family == AF_INET) {
+		struct in_addr *addr4 = &net_sin(mask)->sin_addr;
+		struct sockaddr_in *mask4 = (struct sockaddr_in *)mask;
+
+		if (mask_len > 32) {
+			return -ERANGE;
+		}
+
+		memset(mask4, 0, sizeof(struct sockaddr_in));
+
+		mask4->sin_family = AF_INET;
+		mask4->sin_port = 0;
+		addr4->s_addr = htonl(UINT32_MAX << (32 - mask_len));
+
+	} else if (family == AF_INET6) {
+		struct in6_addr *addr6 = &net_sin6(mask)->sin6_addr;
+		struct sockaddr_in6 *mask6 = (struct sockaddr_in6 *)mask;
+		uint32_t mask_val[4] = { 0 };
+
+		if (mask_len > 128) {
+			return -ERANGE;
+		}
+
+		memset(mask6, 0, sizeof(struct sockaddr_in6));
+
+		mask6->sin6_family = AF_INET6;
+		mask6->sin6_port = 0;
+
+		for (int i = 0; i < 4; i++) {
+			int bits = mask_len - i * 32;
+
+			if (bits >= 32) {
+				mask_val[i] = UINT32_MAX;
+			} else if (bits > 0) {
+				mask_val[i] = htonl(UINT32_MAX << (32 - bits));
+			}
+		}
+
+		memcpy(addr6->s6_addr32, mask_val, sizeof(mask_val));
+	} else {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+int net_netmask_to_mask_len(sa_family_t family, struct sockaddr *mask, uint8_t *mask_len)
+{
+	int zerobits = 0;
+	int maxlen;
+	uint8_t n;
+
+	if (mask_len == NULL || mask == NULL) {
+		return -EINVAL;
+	}
+
+	if (family != AF_INET && family != AF_INET6) {
+		return -EINVAL;
+	}
+
+	maxlen = family == AF_INET ? sizeof(struct in_addr) :
+				     sizeof(struct in6_addr);
+
+	for (int i = maxlen - 1; i >= 0; i--) {
+		n = net_sin6(mask)->sin6_addr.s6_addr[i];
+
+		for (int j = 0; j < 8; j++) {
+			if ((n & 0x1) == 0) {
+				zerobits++;
+			} else {
+				break;
+			}
+
+			n = n >> 1;
+		}
+	}
+
+	*mask_len = maxlen * 8 - zerobits;
+
+	return 0;
+}
+
 int net_port_set_default(struct sockaddr *addr, uint16_t default_port)
 {
 	if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET &&
diff --git a/subsys/net/l2/CMakeLists.txt b/subsys/net/l2/CMakeLists.txt
index db3160a7ef029..1fd4cc7880cbf 100644
--- a/subsys/net/l2/CMakeLists.txt
+++ b/subsys/net/l2/CMakeLists.txt
@@ -24,7 +24,7 @@ if(CONFIG_NET_L2_IEEE802154)
   add_subdirectory(ieee802154)
 endif()
 
-if(CONFIG_NET_L2_OPENTHREAD)
+if(CONFIG_NET_L2_OPENTHREAD_IMPLEMENTATION_ZEPHYR)
   add_subdirectory(openthread)
 endif()
 
diff --git a/subsys/net/l2/canbus/canbus_raw.c b/subsys/net/l2/canbus/canbus_raw.c
index 2bd7d605b25c4..8bdf1aa36506b 100644
--- a/subsys/net/l2/canbus/canbus_raw.c
+++ b/subsys/net/l2/canbus/canbus_raw.c
@@ -16,10 +16,10 @@ LOG_MODULE_REGISTER(net_l2_canbus, LOG_LEVEL_NONE);
 static inline enum net_verdict canbus_recv(struct net_if *iface,
 					   struct net_pkt *pkt)
 {
-	net_pkt_lladdr_src(pkt)->addr = NULL;
+	memset(net_pkt_lladdr_src(pkt)->addr, 0, sizeof(net_pkt_lladdr_src(pkt)->addr));
 	net_pkt_lladdr_src(pkt)->len = 0U;
 	net_pkt_lladdr_src(pkt)->type = NET_LINK_CANBUS_RAW;
-	net_pkt_lladdr_dst(pkt)->addr = NULL;
+	memset(net_pkt_lladdr_dst(pkt)->addr, 0, sizeof(net_pkt_lladdr_dst(pkt)->addr));
 	net_pkt_lladdr_dst(pkt)->len = 0U;
 	net_pkt_lladdr_dst(pkt)->type = NET_LINK_CANBUS_RAW;
 
diff --git a/subsys/net/l2/dummy/CMakeLists.txt b/subsys/net/l2/dummy/CMakeLists.txt
index 48f5841f9a84a..f9e0b184c9fb6 100644
--- a/subsys/net/l2/dummy/CMakeLists.txt
+++ b/subsys/net/l2/dummy/CMakeLists.txt
@@ -5,6 +5,8 @@ zephyr_library_compile_definitions_ifdef(
   CONFIG_NEWLIB_LIBC __LINUX_ERRNO_EXTENSIONS__
   )
 
+zephyr_library_include_directories(. ${ZEPHYR_BASE}/subsys/net/ip)
+
 zephyr_library_sources_ifdef(CONFIG_NET_L2_DUMMY    dummy.c)
 
 if(CONFIG_NET_PSEUDO_IFACE)
diff --git a/subsys/net/l2/dummy/dummy.c b/subsys/net/l2/dummy/dummy.c
index 37ac492a1a18b..0b73ba6967aa8 100644
--- a/subsys/net/l2/dummy/dummy.c
+++ b/subsys/net/l2/dummy/dummy.c
@@ -14,6 +14,8 @@ LOG_MODULE_REGISTER(net_l2_dummy, LOG_LEVEL_NONE);
 
 #include <zephyr/net/dummy.h>
 
+#include "net_stats.h"
+
 static inline enum net_verdict dummy_recv(struct net_if *iface,
 					  struct net_pkt *pkt)
 {
@@ -41,7 +43,14 @@ static inline int dummy_send(struct net_if *iface, struct net_pkt *pkt)
 
 	ret = net_l2_send(api->send, net_if_get_device(iface), iface, pkt);
 	if (!ret) {
-		ret = net_pkt_get_len(pkt);
+		size_t pkt_len = net_pkt_get_len(pkt);
+
+		if (IS_ENABLED(CONFIG_NET_STATISTICS)) {
+			NET_DBG("Sending pkt %p len %zu", pkt, pkt_len);
+			net_stats_update_bytes_sent(iface, pkt_len);
+		}
+
+		ret = (int)pkt_len;
 		net_pkt_unref(pkt);
 	}
 
diff --git a/subsys/net/l2/ethernet/arp.c b/subsys/net/l2/ethernet/arp.c
index 8a9e2a3173326..51be4da7dd4df 100644
--- a/subsys/net/l2/ethernet/arp.c
+++ b/subsys/net/l2/ethernet/arp.c
@@ -306,19 +306,20 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface,
 
 		net_ipaddr_copy(&entry->ip, next_addr);
 
-		net_pkt_lladdr_src(pkt)->addr =
-			(uint8_t *)net_if_get_link_addr(entry->iface)->addr;
+		(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+				       net_if_get_link_addr(entry->iface)->addr,
+				       sizeof(struct net_eth_addr));
 
 		arp_entry_register_pending(entry);
 	} else {
-		net_pkt_lladdr_src(pkt)->addr =
-			(uint8_t *)net_if_get_link_addr(iface)->addr;
+		(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+				       net_if_get_link_addr(iface)->addr,
+				       sizeof(struct net_eth_addr));
 	}
 
-	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
-
-	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)net_eth_broadcast_addr();
-	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+			       (const uint8_t *)net_eth_broadcast_addr(),
+			       sizeof(struct net_eth_addr));
 
 	hdr->hwtype = htons(NET_ARP_HTYPE_ETH);
 	hdr->protocol = htons(NET_ETH_PTYPE_IP);
@@ -456,12 +457,12 @@ struct net_pkt *net_arp_prepare(struct net_pkt *pkt,
 
 	k_mutex_unlock(&arp_mutex);
 
-	net_pkt_lladdr_src(pkt)->addr =
-		(uint8_t *)net_if_get_link_addr(entry->iface)->addr;
-	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+			       net_if_get_link_addr(entry->iface)->addr,
+			       sizeof(struct net_eth_addr));
 
-	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&entry->eth;
-	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+			       (const uint8_t *)&entry->eth, sizeof(struct net_eth_addr));
 
 	NET_DBG("ARP using ll %s for IP %s",
 		net_sprint_ll_addr(net_pkt_lladdr_dst(pkt)->addr,
@@ -523,15 +524,20 @@ static void arp_gratuitous_send(struct net_if *iface,
 	net_ipv4_addr_copy_raw(hdr->dst_ipaddr, (uint8_t *)ipaddr);
 	net_ipv4_addr_copy_raw(hdr->src_ipaddr, (uint8_t *)ipaddr);
 
-	net_pkt_lladdr_src(pkt)->addr = net_if_get_link_addr(iface)->addr;
-	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+			       net_if_get_link_addr(iface)->addr,
+			       sizeof(struct net_eth_addr));
 
-	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)net_eth_broadcast_addr();
-	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+			       (uint8_t *)net_eth_broadcast_addr(),
+			       sizeof(struct net_eth_addr));
 
 	NET_DBG("Sending gratuitous ARP pkt %p", pkt);
 
-	if (net_if_send_data(iface, pkt) == NET_DROP) {
+	/* send without timeout, so we do not risk being blocked by tx when
+	 * being flooded
+	 */
+	if (net_if_try_send_data(iface, pkt, K_NO_WAIT) == NET_DROP) {
 		net_pkt_unref(pkt);
 	}
 }
@@ -690,9 +696,9 @@ void net_arp_update(struct net_if *iface,
 		pkt = k_fifo_get(&entry->pending_queue, K_FOREVER);
 
 		/* Set the dst in the pending packet */
-		net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
-		net_pkt_lladdr_dst(pkt)->addr =
-			(uint8_t *) &NET_ETH_HDR(pkt)->dst.addr;
+		(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+				       (const uint8_t *)&NET_ETH_HDR(pkt)->dst.addr,
+				       sizeof(struct net_eth_addr));
 
 		NET_DBG("iface %d (%p) dst %s pending %p frag %p ptype 0x%04x",
 			net_if_get_by_iface(iface), iface,
@@ -718,7 +724,6 @@ void net_arp_update(struct net_if *iface,
 
 static inline struct net_pkt *arp_prepare_reply(struct net_if *iface,
 						struct net_pkt *req,
-						struct net_eth_hdr *eth_query,
 						struct net_eth_addr *dst_addr)
 {
 	struct net_arp_hdr *hdr, *query;
@@ -753,11 +758,13 @@ static inline struct net_pkt *arp_prepare_reply(struct net_if *iface,
 	net_ipv4_addr_copy_raw(hdr->dst_ipaddr, query->src_ipaddr);
 	net_ipv4_addr_copy_raw(hdr->src_ipaddr, query->dst_ipaddr);
 
-	net_pkt_lladdr_src(pkt)->addr = net_if_get_link_addr(iface)->addr;
-	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+			       net_if_get_link_addr(iface)->addr,
+			       sizeof(struct net_eth_addr));
 
-	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&hdr->dst_hwaddr.addr;
-	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+			       (uint8_t *)&hdr->dst_hwaddr.addr,
+			       sizeof(struct net_eth_addr));
 
 	net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_ARP);
 	net_pkt_set_family(pkt, AF_INET);
@@ -780,18 +787,17 @@ static bool arp_hdr_check(struct net_arp_hdr *arp_hdr)
 }
 
 enum net_verdict net_arp_input(struct net_pkt *pkt,
-			       struct net_eth_hdr *eth_hdr)
+			       struct net_eth_addr *src,
+			       struct net_eth_addr *dst)
 {
 	struct net_eth_addr *dst_hw_addr;
 	struct net_arp_hdr *arp_hdr;
 	struct net_pkt *reply;
 	struct in_addr *addr;
 
-	if (net_pkt_get_len(pkt) < (sizeof(struct net_arp_hdr) -
-				    (net_pkt_ip_data(pkt) - (uint8_t *)eth_hdr))) {
-		NET_DBG("Invalid ARP header (len %zu, min %zu bytes) %p",
-			net_pkt_get_len(pkt), sizeof(struct net_arp_hdr) -
-			(net_pkt_ip_data(pkt) - (uint8_t *)eth_hdr), pkt);
+	if (net_pkt_get_len(pkt) < sizeof(struct net_arp_hdr)) {
+		NET_DBG("DROP: Too short ARP msg (%zu bytes, min %zu bytes)",
+			net_pkt_get_len(pkt), sizeof(struct net_arp_hdr));
 		return NET_DROP;
 	}
 
@@ -812,7 +818,7 @@ enum net_verdict net_arp_input(struct net_pkt *pkt,
 		}
 
 		if (IS_ENABLED(CONFIG_NET_ARP_GRATUITOUS)) {
-			if (net_eth_is_addr_broadcast(&eth_hdr->dst) &&
+			if (net_eth_is_addr_broadcast(dst) &&
 			    (net_eth_is_addr_broadcast(&arp_hdr->dst_hwaddr) ||
 			     net_eth_is_addr_all_zeroes(&arp_hdr->dst_hwaddr)) &&
 			    net_ipv4_addr_cmp_raw(arp_hdr->dst_ipaddr,
@@ -831,7 +837,7 @@ enum net_verdict net_arp_input(struct net_pkt *pkt,
 		/* Discard ARP request if Ethernet address is broadcast
 		 * and Source IP address is Multicast address.
 		 */
-		if (memcmp(&eth_hdr->dst, net_eth_broadcast_addr(),
+		if (memcmp(dst, net_eth_broadcast_addr(),
 			   sizeof(struct net_eth_addr)) == 0 &&
 		    net_ipv4_is_addr_mcast((struct in_addr *)arp_hdr->src_ipaddr)) {
 			NET_DBG("DROP: eth addr is bcast, src addr is mcast");
@@ -870,14 +876,13 @@ enum net_verdict net_arp_input(struct net_pkt *pkt,
 
 			dst_hw_addr = &arp_hdr->src_hwaddr;
 		} else {
-			dst_hw_addr = &eth_hdr->src;
+			dst_hw_addr = src;
 		}
 
 		/* Send reply */
-		reply = arp_prepare_reply(net_pkt_iface(pkt), pkt, eth_hdr,
-					  dst_hw_addr);
+		reply = arp_prepare_reply(net_pkt_iface(pkt), pkt, dst_hw_addr);
 		if (reply) {
-			net_if_queue_tx(net_pkt_iface(reply), reply);
+			net_if_try_queue_tx(net_pkt_iface(reply), reply, K_NO_WAIT);
 		} else {
 			NET_DBG("Cannot send ARP reply");
 		}
@@ -1022,15 +1027,13 @@ static enum net_verdict arp_recv(struct net_if *iface,
 				 uint16_t ptype,
 				 struct net_pkt *pkt)
 {
-	struct net_eth_hdr *hdr = NET_ETH_HDR(pkt);
-
 	ARG_UNUSED(iface);
 	ARG_UNUSED(ptype);
 
 	net_pkt_set_family(pkt, AF_INET);
 
 	NET_DBG("ARP packet from %s received",
-		net_sprint_ll_addr((uint8_t *)hdr->src.addr,
+		net_sprint_ll_addr(net_pkt_lladdr_src(pkt)->addr,
 				   sizeof(struct net_eth_addr)));
 
 	if (IS_ENABLED(CONFIG_NET_IPV4_ACD) &&
@@ -1038,7 +1041,9 @@ static enum net_verdict arp_recv(struct net_if *iface,
 		return NET_DROP;
 	}
 
-	return net_arp_input(pkt, hdr);
+	return net_arp_input(pkt,
+			     (struct net_eth_addr *)net_pkt_lladdr_src(pkt)->addr,
+			     (struct net_eth_addr *)net_pkt_lladdr_dst(pkt)->addr);
 }
 
 ETH_NET_L3_REGISTER(ARP, NET_ETH_PTYPE_ARP, arp_recv);
diff --git a/subsys/net/l2/ethernet/arp.h b/subsys/net/l2/ethernet/arp.h
index 46589cbc1f72b..da899ccb91120 100644
--- a/subsys/net/l2/ethernet/arp.h
+++ b/subsys/net/l2/ethernet/arp.h
@@ -47,7 +47,8 @@ struct net_pkt *net_arp_prepare(struct net_pkt *pkt,
 				struct in_addr *request_ip,
 				struct in_addr *current_ip);
 enum net_verdict net_arp_input(struct net_pkt *pkt,
-			       struct net_eth_hdr *eth_hdr);
+			       struct net_eth_addr *src,
+			       struct net_eth_addr *dst);
 
 int net_arp_clear_pending(struct net_if *iface,
 				struct in_addr *dst);
diff --git a/subsys/net/l2/ethernet/bridge.c b/subsys/net/l2/ethernet/bridge.c
index 4b883643c3a3f..11384a857d922 100644
--- a/subsys/net/l2/ethernet/bridge.c
+++ b/subsys/net/l2/ethernet/bridge.c
@@ -140,7 +140,7 @@ int eth_bridge_iface_add(struct net_if *br, struct net_if *iface)
 		 * we do not need host promiscuous working when testing
 		 * bridging using native-sim.
 		 */
-		if (!IS_ENABLED(CONFIG_ETH_NATIVE_POSIX)) {
+		if (!IS_ENABLED(CONFIG_ETH_NATIVE_TAP)) {
 			NET_DBG("iface %d promiscuous mode failed: %d",
 				net_if_get_by_iface(iface), ret);
 			eth_bridge_iface_remove(br, iface);
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index c7fd6d148ff00..a3c25df215326 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -122,6 +122,14 @@ static inline void ethernet_update_length(struct net_if *iface,
 					  struct net_pkt *pkt)
 {
 	uint16_t len;
+#ifdef CONFIG_NET_VLAN
+	const uint16_t min_len =
+		NET_ETH_MINIMAL_FRAME_SIZE - (net_pkt_vlan_tag(pkt) != NET_VLAN_TAG_UNSPEC
+						      ? sizeof(struct net_eth_vlan_hdr)
+						      : sizeof(struct net_eth_hdr));
+#else
+	const uint16_t min_len = NET_ETH_MINIMAL_FRAME_SIZE - sizeof(struct net_eth_hdr);
+#endif
 
 	/* Let's check IP payload's length. If it's smaller than 46 bytes,
 	 * i.e. smaller than minimal Ethernet frame size minus ethernet
@@ -131,11 +139,13 @@ static inline void ethernet_update_length(struct net_if *iface,
 
 	if (net_pkt_family(pkt) == AF_INET) {
 		len = ntohs(NET_IPV4_HDR(pkt)->len);
-	} else {
+	} else if (net_pkt_family(pkt) == AF_INET6) {
 		len = ntohs(NET_IPV6_HDR(pkt)->len) + NET_IPV6H_LEN;
+	} else {
+		return;
 	}
 
-	if (len < NET_ETH_MINIMAL_FRAME_SIZE - sizeof(struct net_eth_hdr)) {
+	if (len < min_len) {
 		struct net_buf *frag;
 
 		for (frag = pkt->frags; frag; frag = frag->frags) {
@@ -171,6 +181,7 @@ static inline bool eth_is_vlan_tag_stripped(struct net_if *iface)
 	return (net_eth_get_hw_capabilities(iface) & ETHERNET_HW_VLAN_TAG_STRIP);
 }
 
+#if defined(CONFIG_NET_IPV4) || defined(CONFIG_NET_IPV6)
 /* Drop packet if it has broadcast destination MAC address but the IP
  * address is not multicast or broadcast address. See RFC 1122 ch 3.3.6
  */
@@ -191,6 +202,7 @@ enum net_verdict ethernet_check_ipv4_bcast_addr(struct net_pkt *pkt,
 
 	return NET_OK;
 }
+#endif
 
 #if defined(CONFIG_NET_NATIVE_IP) && !defined(CONFIG_NET_RAW_MODE)
 static void ethernet_mcast_monitor_cb(struct net_if *iface, const struct net_addr *addr,
@@ -329,15 +341,13 @@ static enum net_verdict ethernet_recv(struct net_if *iface,
 	}
 
 	/* Set the pointers to ll src and dst addresses */
-	lladdr = net_pkt_lladdr_src(pkt);
-	lladdr->addr = hdr->src.addr;
-	lladdr->len = sizeof(struct net_eth_addr);
-	lladdr->type = NET_LINK_ETHERNET;
+	(void)net_linkaddr_create(net_pkt_lladdr_src(pkt), hdr->src.addr,
+				  sizeof(struct net_eth_addr), NET_LINK_ETHERNET);
+
+	(void)net_linkaddr_create(net_pkt_lladdr_dst(pkt), hdr->dst.addr,
+				  sizeof(struct net_eth_addr), NET_LINK_ETHERNET);
 
 	lladdr = net_pkt_lladdr_dst(pkt);
-	lladdr->addr = hdr->dst.addr;
-	lladdr->len = sizeof(struct net_eth_addr);
-	lladdr->type = NET_LINK_ETHERNET;
 
 	net_pkt_set_ll_proto_type(pkt, type);
 	dst_broadcast = net_eth_is_addr_broadcast((struct net_eth_addr *)lladdr->addr);
@@ -750,9 +760,10 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt)
 	 * temporarily it's a broadcast one. When filling the header,
 	 * it might detect this should be multicast and act accordingly.
 	 */
-	if (!net_pkt_lladdr_dst(pkt)->addr) {
-		net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)broadcast_eth_addr.addr;
-		net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
+	if (net_pkt_lladdr_dst(pkt)->len == 0) {
+		(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+				       broadcast_eth_addr.addr,
+				       sizeof(struct net_eth_addr));
 	}
 
 	/* Then set the ethernet header. Note that the iface parameter tells
diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c
index 67eb3296fbd58..e22b10c515d7c 100644
--- a/subsys/net/l2/ethernet/gptp/gptp.c
+++ b/subsys/net/l2/ethernet/gptp/gptp.c
@@ -586,7 +586,7 @@ static void gptp_thread(void *p1, void *p2, void *p3)
 
 static void gptp_add_port(struct net_if *iface, void *user_data)
 {
-	int *num_ports = user_data;
+	uint8_t *num_ports = user_data;
 	const struct device *clk;
 
 	if (*num_ports >= CONFIG_NET_GPTP_NUM_PORTS) {
diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.c b/subsys/net/l2/ethernet/gptp/gptp_messages.c
index 7fc5c75b73fdc..079940b3ff194 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_messages.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_messages.c
@@ -172,11 +172,12 @@ static struct net_pkt *setup_gptp_frame(struct net_if *iface,
 	net_pkt_set_ptp(pkt, true);
 	net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_PTP);
 
-	net_pkt_lladdr_src(pkt)->addr = net_if_get_link_addr(iface)->addr;
-	net_pkt_lladdr_src(pkt)->len = net_if_get_link_addr(iface)->len;
+	(void)net_linkaddr_copy(net_pkt_lladdr_src(pkt),
+				net_if_get_link_addr(iface));
 
-	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&gptp_multicast_eth_addr;
-	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+			       (uint8_t *)&gptp_multicast_eth_addr,
+			       sizeof(struct net_eth_addr));
 
 	return pkt;
 }
diff --git a/subsys/net/l2/ethernet/lldp/lldp.c b/subsys/net/l2/ethernet/lldp/lldp.c
index da179f728236b..2895691d6f0a2 100644
--- a/subsys/net/l2/ethernet/lldp/lldp.c
+++ b/subsys/net/l2/ethernet/lldp/lldp.c
@@ -142,12 +142,17 @@ static int lldp_send(struct ethernet_lldp *lldp)
 		}
 	}
 
-	net_pkt_lladdr_src(pkt)->addr = net_if_get_link_addr(lldp->iface)->addr;
-	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
-	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)lldp_multicast_eth_addr.addr;
-	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_copy(net_pkt_lladdr_src(pkt),
+				net_if_get_link_addr(lldp->iface));
 
-	if (net_if_send_data(lldp->iface, pkt) == NET_DROP) {
+	(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+			       (uint8_t *)lldp_multicast_eth_addr.addr,
+			       sizeof(struct net_eth_addr));
+
+	/* send without timeout, so we do not risk being blocked by tx when
+	 * being flooded
+	 */
+	if (net_if_try_send_data(lldp->iface, pkt, K_NO_WAIT) == NET_DROP) {
 		net_pkt_unref(pkt);
 		ret = -EIO;
 	}
diff --git a/subsys/net/l2/ieee802154/ieee802154.c b/subsys/net/l2/ieee802154/ieee802154.c
index 9f34c4701bee2..4302f1f09fa11 100644
--- a/subsys/net/l2/ieee802154/ieee802154.c
+++ b/subsys/net/l2/ieee802154/ieee802154.c
@@ -251,24 +251,27 @@ static inline void swap_and_set_pkt_ll_addr(struct net_linkaddr *addr, bool has_
 					    enum ieee802154_addressing_mode mode,
 					    struct ieee802154_address_field *ll)
 {
-	addr->type = NET_LINK_IEEE802154;
-
 	switch (mode) {
 	case IEEE802154_ADDR_MODE_EXTENDED:
-		addr->len = IEEE802154_EXT_ADDR_LENGTH;
-		addr->addr = has_pan_id ? ll->plain.addr.ext_addr : ll->comp.addr.ext_addr;
+		(void)net_linkaddr_create(
+			addr,
+			has_pan_id ? ll->plain.addr.ext_addr : ll->comp.addr.ext_addr,
+			IEEE802154_EXT_ADDR_LENGTH,
+			NET_LINK_IEEE802154);
 		break;
 
 	case IEEE802154_ADDR_MODE_SHORT:
-		addr->len = IEEE802154_SHORT_ADDR_LENGTH;
-		addr->addr = (uint8_t *)(has_pan_id ? &ll->plain.addr.short_addr
-						    : &ll->comp.addr.short_addr);
+		(void)net_linkaddr_create(
+			addr,
+			(const uint8_t *)(has_pan_id ?
+					  &ll->plain.addr.short_addr : &ll->comp.addr.short_addr),
+			IEEE802154_SHORT_ADDR_LENGTH,
+			NET_LINK_IEEE802154);
 		break;
 
 	case IEEE802154_ADDR_MODE_NONE:
 	default:
-		addr->len = 0U;
-		addr->addr = NULL;
+		(void)net_linkaddr_clear(addr);
 	}
 
 	/* The net stack expects big endian link layer addresses for POSIX compliance
@@ -504,10 +507,13 @@ static int ieee802154_send(struct net_if *iface, struct net_pkt *pkt)
 			struct sockaddr_ll_ptr *src_addr =
 				(struct sockaddr_ll_ptr *)&context->local;
 
-			net_pkt_lladdr_dst(pkt)->addr = dst_addr->sll_addr;
-			net_pkt_lladdr_dst(pkt)->len = dst_addr->sll_halen;
-			net_pkt_lladdr_src(pkt)->addr = src_addr->sll_addr;
-			net_pkt_lladdr_src(pkt)->len = src_addr->sll_halen;
+			(void)net_linkaddr_set(net_pkt_lladdr_dst(pkt),
+					       dst_addr->sll_addr,
+					       dst_addr->sll_halen);
+
+			(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+					       src_addr->sll_addr,
+					       src_addr->sll_halen);
 		} else {
 			return -EINVAL;
 		}
diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.c b/subsys/net/l2/ieee802154/ieee802154_frame.c
index b2ef53a99572c..73be90d048ac8 100644
--- a/subsys/net/l2/ieee802154/ieee802154_frame.c
+++ b/subsys/net/l2/ieee802154/ieee802154_frame.c
@@ -449,7 +449,7 @@ void ieee802154_compute_header_and_authtag_len(struct net_if *iface, struct net_
 					       uint8_t *authtag_len)
 {
 	uint8_t hdr_len = sizeof(struct ieee802154_fcf_seq), tag_len = 0;
-	bool broadcast = !dst->addr;
+	bool broadcast = (dst->len == 0);
 
 	/* PAN ID */
 	hdr_len += IEEE802154_PAN_ID_LENGTH;
@@ -458,7 +458,7 @@ void ieee802154_compute_header_and_authtag_len(struct net_if *iface, struct net_
 	hdr_len += broadcast ? IEEE802154_SHORT_ADDR_LENGTH : dst->len;
 
 	/* Source Address - see data_addr_to_fs_settings() */
-	hdr_len += src->addr ? src->len : dst->len;
+	hdr_len += (src->len > 0) ? src->len : dst->len;
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 	struct ieee802154_security_ctx *sec_ctx;
@@ -539,7 +539,7 @@ static inline struct ieee802154_fcf_seq *generate_fcf_grounds(uint8_t **p_buf, b
 static inline enum ieee802154_addressing_mode get_dst_addr_mode(struct net_linkaddr *dst,
 								bool *broadcast)
 {
-	if (!dst->addr) {
+	if (dst->len == 0) {
 		NET_DBG("Broadcast destination");
 		*broadcast = true;
 		return IEEE802154_ADDR_MODE_SHORT;
@@ -688,7 +688,7 @@ bool ieee802154_create_data_frame(struct ieee802154_context *ctx, struct net_lin
 
 	params.dst.pan_id = ctx->pan_id;
 	params.pan_id = ctx->pan_id;
-	if (src->addr && src->len == IEEE802154_SHORT_ADDR_LENGTH) {
+	if (src->len == IEEE802154_SHORT_ADDR_LENGTH) {
 		params.short_addr = ntohs(*(uint16_t *)(src->addr));
 		if (ctx->short_addr != params.short_addr) {
 			goto out;
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index bf022741f5698..23b907cf2b616 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -2,16 +2,16 @@
 
 # Copyright (c) 2018 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
-config OPENTHREAD_SECURITY_INTERNAL
-	bool
-	help
-	  OpenThread setting to signal that OpenThread security settings, such
-	  as the OPENTHREAD_MBEDTLS setting will be controlled through other
-	  Kconfig dependencies and should not be user configurable.
-
 menuconfig NET_L2_OPENTHREAD
 	bool "OpenThread L2"
 	depends on NETWORKING
+
+choice NET_L2_OPENTHREAD_IMPLEMENTATION
+	prompt "OpenThread L2 implementation"
+	depends on NET_L2_OPENTHREAD
+
+config NET_L2_OPENTHREAD_IMPLEMENTATION_ZEPHYR
+	bool "Zephyr's OpenThread L2 implementation"
 	select NET_L2_PHY_IEEE802154
 	select OPENTHREAD
 
@@ -28,13 +28,17 @@ menuconfig NET_L2_OPENTHREAD
 	imply NET_UDP
 	imply NET_IPV6
 	imply NET_CONFIG_NEED_IPV6
+	help
+	  Use Zephyr's implementation of the OpenThread L2.
+
+endchoice # NET_L2_OPENTHREAD_IMPLEMENTATION
 
-if NET_L2_OPENTHREAD
+if NET_L2_OPENTHREAD_IMPLEMENTATION_ZEPHYR
 
 choice OPENTHREAD_IMPLEMENTATION
 	prompt "OpenThread origin selection"
 	help
-	  Select OpenThread to use for build. Custom OpenThread implementations
+	  Select OpenThread stack to use for build. Custom OpenThread implementations
 	  can be added to the application Kconfig.
 
 config OPENTHREAD_SOURCES
@@ -63,7 +67,7 @@ menuconfig OPENTHREAD_DEBUG
 	help
 	  This option enables logging support for OpenThread.
 
-choice
+choice OPENTHREAD_LOG_LEVEL_CHOICE
 	prompt "OpenThread stack log level"
 	depends on OPENTHREAD_DEBUG
 	help
@@ -79,7 +83,7 @@ config OPENTHREAD_LOG_LEVEL_INFO
 	bool "Informational"
 config OPENTHREAD_LOG_LEVEL_DEBG
 	bool "Debug"
-endchoice
+endchoice # OPENTHREAD_LOG_LEVEL_CHOICE
 
 config OPENTHREAD_LOG_LEVEL
 	int
@@ -169,7 +173,6 @@ config MBEDTLS_PROMPTLESS
 choice OPENTHREAD_SECURITY
 	prompt "OpenThread security"
 	default OPENTHREAD_MBEDTLS_CHOICE
-	depends on !OPENTHREAD_SECURITY_INTERNAL
 
 config CUSTOM_OPENTHREAD_SECURITY
 	bool "Custom"
@@ -232,7 +235,7 @@ config OPENTHREAD_COPROCESSOR
 
 if OPENTHREAD_COPROCESSOR
 
-choice
+choice OPENTHREAD_COPROCESSOR_CHOICE
 	prompt "OpenThread Co-Processor type"
 	help
 	  This option selects Thread network co-processor type
@@ -241,7 +244,7 @@ config OPENTHREAD_COPROCESSOR_NCP
 	bool "NCP - Network Co-Processor"
 config OPENTHREAD_COPROCESSOR_RCP
 	bool "RCP - Radio Co-Processor"
-endchoice
+endchoice # OPENTHREAD_COPROCESSOR_CHOICE
 
 config OPENTHREAD_COPROCESSOR_UART_RING_BUFFER_SIZE
 	int "Set Co-Processor UART ring buffer size"
@@ -350,4 +353,14 @@ config OPENTHREAD_PLATFORM_KEYS_EXPORTABLE_ENABLE
 	help
 	  Enable the creation of exportable MAC keys in the OpenThread Key Manager.
 
-endif # NET_L2_OPENTHREAD
+config OPENTHREAD_INTERFACE_EARLY_UP
+	bool "Make OpenThread interface ready as soon as Thread is enabled"
+	help
+	  When enabled, OpenThread interface will be marked ready (operational
+	  UP) as soon as Thread has been enabled. This means the interface will
+	  be ready to transmit application packets during the Mesh Link
+	  Establishment phase.
+	  Otherwise, OpenThread interface will be marked operational UP only
+	  after the device joins a Thread network.
+
+endif # NET_L2_OPENTHREAD_IMPLEMENTATION_ZEPHYR
diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index 61fe1d5c3bc39..c82dfdea2d2fd 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -187,12 +187,20 @@ static void ot_state_changed_handler(uint32_t flags, void *context)
 {
 	struct openthread_state_changed_cb *entry, *next;
 	struct openthread_context *ot_context = context;
+	bool is_up = otIp6IsEnabled(ot_context->instance);
 
-	NET_INFO("State changed! Flags: 0x%08" PRIx32 " Current role: %s",
+	NET_INFO("State changed! Flags: 0x%08" PRIx32 " Current role: %s Ip6: %s",
 		flags,
-		otThreadDeviceRoleToString(otThreadGetDeviceRole(ot_context->instance))
-		);
+		otThreadDeviceRoleToString(otThreadGetDeviceRole(ot_context->instance)),
+		(is_up ? "up" : "down"));
 
+#if defined(CONFIG_OPENTHREAD_INTERFACE_EARLY_UP)
+	if (is_up) {
+		net_if_dormant_off(ot_context->iface);
+	} else {
+		net_if_dormant_on(ot_context->iface);
+	}
+#else
 	if (flags & OT_CHANGED_THREAD_ROLE) {
 		switch (otThreadGetDeviceRole(ot_context->instance)) {
 		case OT_DEVICE_ROLE_CHILD:
@@ -208,6 +216,7 @@ static void ot_state_changed_handler(uint32_t flags, void *context)
 			break;
 		}
 	}
+#endif
 
 	if (flags & OT_CHANGED_IP6_ADDRESS_REMOVED) {
 		NET_DBG("Ipv6 address removed");
@@ -329,7 +338,11 @@ static void ot_joiner_start_handler(otError error, void *context)
 	switch (error) {
 	case OT_ERROR_NONE:
 		NET_INFO("Join success");
-		otThreadSetEnabled(ot_context->instance, true);
+		error = otThreadSetEnabled(ot_context->instance, true);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to start the OpenThread network [%d]", error);
+		}
+
 		break;
 	default:
 		NET_ERR("Join failed [%d]", error);
@@ -430,7 +443,11 @@ int openthread_start(struct openthread_context *ot_context)
 		goto exit;
 	}
 
-	otIp6SetEnabled(ot_context->instance, true);
+	error = otIp6SetEnabled(ot_context->instance, true);
+	if (error != OT_ERROR_NONE) {
+		NET_ERR("Failed to set %s [%d]", "IPv6 support", error);
+		goto exit;
+	}
 
 	/* Sleepy End Device specific configuration. */
 	if (IS_ENABLED(CONFIG_OPENTHREAD_MTD_SED)) {
@@ -441,8 +458,17 @@ int openthread_start(struct openthread_context *ot_context)
 		 */
 		ot_mode.mRxOnWhenIdle = false;
 
-		otThreadSetLinkMode(ot_context->instance, ot_mode);
-		otLinkSetPollPeriod(ot_context->instance, OT_POLL_PERIOD);
+		error = otThreadSetLinkMode(ot_context->instance, ot_mode);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "link mode", error);
+			goto exit;
+		}
+
+		error = otLinkSetPollPeriod(ot_context->instance, OT_POLL_PERIOD);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "poll period", error);
+			goto exit;
+		}
 	}
 
 	/* Configure Child Supervision and MLE Child timeouts. */
@@ -477,16 +503,39 @@ int openthread_start(struct openthread_context *ot_context)
 		otExtendedPanId xpanid;
 		otNetworkKey    networkKey;
 
-		otThreadSetNetworkName(ot_instance, OT_NETWORK_NAME);
-		otLinkSetChannel(ot_instance, OT_CHANNEL);
-		otLinkSetPanId(ot_instance, OT_PANID);
+		error = otThreadSetNetworkName(ot_instance, OT_NETWORK_NAME);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "network name", error);
+			goto exit;
+		}
+
+		error = otLinkSetChannel(ot_instance, OT_CHANNEL);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "channel", error);
+			goto exit;
+		}
+
+		error = otLinkSetPanId(ot_instance, OT_PANID);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "PAN ID", error);
+			goto exit;
+		}
+
 		net_bytes_from_str(xpanid.m8, 8, (char *)OT_XPANID);
-		otThreadSetExtendedPanId(ot_instance, &xpanid);
+		error = otThreadSetExtendedPanId(ot_instance, &xpanid);
+		if (error != OT_ERROR_NONE) {
+			NET_ERR("Failed to set %s [%d]", "ext PAN ID", error);
+			goto exit;
+		}
 
 		if (strlen(OT_NETWORKKEY)) {
 			net_bytes_from_str(networkKey.m8, OT_NETWORK_KEY_SIZE,
 					   (char *)OT_NETWORKKEY);
-			otThreadSetNetworkKey(ot_instance, &networkKey);
+			error = otThreadSetNetworkKey(ot_instance, &networkKey);
+			if (error != OT_ERROR_NONE) {
+				NET_ERR("Failed to set %s [%d]", "network key", error);
+				goto exit;
+			}
 		}
 	}
 
@@ -533,7 +582,7 @@ static int openthread_init(struct net_if *iface)
 		.name = "openthread",
 		.no_yield = true,
 	};
-	otError err;
+	otError err = OT_ERROR_NONE;
 
 	NET_DBG("openthread_init");
 
@@ -556,7 +605,11 @@ static int openthread_init(struct net_if *iface)
 	}
 
 	if (IS_ENABLED(CONFIG_OPENTHREAD_COPROCESSOR)) {
-		otPlatUartEnable();
+		err = otPlatUartEnable();
+		if (err != OT_ERROR_NONE) {
+			NET_ERR("Failed to enable UART: [%d]", err);
+		}
+
 		otNcpHdlcInit(ot_context->instance, ncp_hdlc_send);
 	} else {
 		otIp6SetReceiveFilterEnabled(ot_context->instance, true);
@@ -604,7 +657,7 @@ static int openthread_init(struct net_if *iface)
 
 	(void)k_work_submit_to_queue(&ot_context->work_q, &ot_context->api_work);
 
-	return 0;
+	return (err == OT_ERROR_NONE) ? 0 : -EIO;
 }
 
 void ieee802154_init(struct net_if *iface)
diff --git a/subsys/net/l2/openthread/openthread_utils.c b/subsys/net/l2/openthread/openthread_utils.c
index 2e78da6b7aad8..f9b518725b7b8 100644
--- a/subsys/net/l2/openthread/openthread_utils.c
+++ b/subsys/net/l2/openthread/openthread_utils.c
@@ -14,6 +14,7 @@ LOG_MODULE_DECLARE(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 #include <openthread/ip6.h>
 #include <openthread/thread.h>
 
+#include "net_private.h"
 #include "openthread_utils.h"
 
 #define ALOC16_MASK 0xfc
@@ -167,6 +168,7 @@ void add_ipv6_addr_to_ot(struct openthread_context *context,
 	struct otNetifAddress addr = { 0 };
 	struct net_if_ipv6 *ipv6;
 	struct net_if_addr *if_addr = NULL;
+	otError error;
 	int i;
 
 	/* IPv6 struct should've already been allocated when we get an
@@ -214,14 +216,14 @@ void add_ipv6_addr_to_ot(struct openthread_context *context,
 	}
 
 	openthread_api_mutex_lock(context);
-	otIp6AddUnicastAddress(context->instance, &addr);
+	error = otIp6AddUnicastAddress(context->instance, &addr);
 	openthread_api_mutex_unlock(context);
 
-	if (CONFIG_OPENTHREAD_L2_LOG_LEVEL == LOG_LEVEL_DBG) {
-		char buf[NET_IPV6_ADDR_LEN];
-
-		NET_DBG("Added %s",
-			net_addr_ntop(AF_INET6, &addr.mAddress, buf, sizeof(buf)));
+	if (error != OT_ERROR_NONE) {
+		NET_ERR("Failed to add IPv6 unicast address %s [%d]",
+			net_sprint_ipv6_addr(addr6), error);
+	} else {
+		NET_DBG("Added %s", net_sprint_ipv6_addr(addr6));
 	}
 }
 
@@ -229,18 +231,19 @@ void add_ipv6_maddr_to_ot(struct openthread_context *context,
 			  const struct in6_addr *addr6)
 {
 	struct otIp6Address addr;
+	otError error;
 
 	memcpy(&addr, addr6, sizeof(addr));
 
 	openthread_api_mutex_lock(context);
-	otIp6SubscribeMulticastAddress(context->instance, &addr);
+	error = otIp6SubscribeMulticastAddress(context->instance, &addr);
 	openthread_api_mutex_unlock(context);
 
-	if (CONFIG_OPENTHREAD_L2_LOG_LEVEL == LOG_LEVEL_DBG) {
-		char buf[NET_IPV6_ADDR_LEN];
-
-		NET_DBG("Added multicast %s",
-			net_addr_ntop(AF_INET6, &addr, buf, sizeof(buf)));
+	if (error != OT_ERROR_NONE) {
+		NET_ERR("Failed to add IPv6 multicast address %s [%d]",
+			net_sprint_ipv6_addr(addr6), error);
+	} else {
+		NET_DBG("Added %s", net_sprint_ipv6_addr(addr6));
 	}
 }
 
diff --git a/subsys/net/l2/ppp/ipv6cp.c b/subsys/net/l2/ppp/ipv6cp.c
index e18e54b393d73..b1e81775f9493 100644
--- a/subsys/net/l2/ppp/ipv6cp.c
+++ b/subsys/net/l2/ppp/ipv6cp.c
@@ -261,11 +261,9 @@ static void ipv6cp_up(struct ppp_fsm *fsm)
 	/* Add peer to neighbor table */
 	setup_iid_address(ctx->ipv6cp.peer_options.iid, &peer_addr);
 
-	peer_lladdr.addr = ctx->ipv6cp.peer_options.iid;
-	peer_lladdr.len = sizeof(ctx->ipv6cp.peer_options.iid);
-
-	/* TODO: What should be the type? */
-	peer_lladdr.type = NET_LINK_DUMMY;
+	(void)net_linkaddr_create(&peer_lladdr, ctx->ipv6cp.peer_options.iid,
+				  sizeof(ctx->ipv6cp.peer_options.iid),
+				  NET_LINK_DUMMY);
 
 	nbr = net_ipv6_nbr_add(ctx->iface, &peer_addr, &peer_lladdr,
 			       false, NET_IPV6_NBR_STATE_STATIC);
@@ -317,11 +315,9 @@ static void ipv6cp_down(struct ppp_fsm *fsm)
 	/* Remove peer from neighbor table */
 	setup_iid_address(ctx->ipv6cp.peer_options.iid, &peer_addr);
 
-	peer_lladdr.addr = ctx->ipv6cp.peer_options.iid;
-	peer_lladdr.len = sizeof(ctx->ipv6cp.peer_options.iid);
-
-	/* TODO: What should be the type? */
-	peer_lladdr.type = NET_LINK_DUMMY;
+	(void)net_linkaddr_create(&peer_lladdr, ctx->ipv6cp.peer_options.iid,
+				  sizeof(ctx->ipv6cp.peer_options.iid),
+				  NET_LINK_DUMMY);
 
 	ret = net_ipv6_nbr_rm(ctx->iface, &peer_addr);
 	if (!ret) {
diff --git a/subsys/net/l2/ppp/ppp_l2.c b/subsys/net/l2/ppp/ppp_l2.c
index bfe28738f7945..b9edd2629cec0 100644
--- a/subsys/net/l2/ppp/ppp_l2.c
+++ b/subsys/net/l2/ppp/ppp_l2.c
@@ -8,6 +8,7 @@
 LOG_MODULE_REGISTER(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
 #include <stdlib.h>
+#include <zephyr/net/ethernet.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/net_l2.h>
 #include <zephyr/net/net_if.h>
@@ -180,6 +181,24 @@ static int ppp_send(struct net_if *iface, struct net_pkt *pkt)
 		return -ENETDOWN;
 	}
 
+	/* PPP drivers only support IP packet types, therefore in order to be
+	 * able to use AF_PACKET family sockets with PPP, we need to translate
+	 * L2 proto type to packet family.
+	 */
+	if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) &&
+	    net_pkt_family(pkt) == AF_PACKET) {
+		switch (net_pkt_ll_proto_type(pkt)) {
+		case ETH_P_IP:
+			net_pkt_set_family(pkt, AF_INET);
+			break;
+		case ETH_P_IPV6:
+			net_pkt_set_family(pkt, AF_INET6);
+			break;
+		default:
+			return -EPROTONOSUPPORT;
+		}
+	}
+
 	ret = net_l2_send(api->send, net_if_get_device(iface), iface, pkt);
 	if (!ret) {
 		ret = net_pkt_get_len(pkt);
diff --git a/subsys/net/l2/virtual/virtual.c b/subsys/net/l2/virtual/virtual.c
index ef58a99a5fa8e..83c5ec8876175 100644
--- a/subsys/net/l2/virtual/virtual.c
+++ b/subsys/net/l2/virtual/virtual.c
@@ -25,6 +25,7 @@ static enum net_verdict virtual_recv(struct net_if *iface,
 {
 	struct virtual_interface_context *ctx, *tmp;
 	const struct virtual_interface_api *api;
+	struct net_if *filtered_iface = NULL;
 	enum net_verdict verdict;
 	sys_slist_t *interfaces;
 
@@ -46,6 +47,28 @@ static enum net_verdict virtual_recv(struct net_if *iface,
 			continue;
 		}
 
+		if (IS_ENABLED(CONFIG_NET_PKT_FILTER)) {
+			struct net_if *tmp_iface;
+
+			tmp_iface = net_pkt_iface(pkt);
+			net_pkt_set_iface(pkt, ctx->virtual_iface);
+
+			if (!net_pkt_filter_recv_ok(pkt)) {
+				/* We cannot update the statistics here because
+				 * the interface might not be the correct one for
+				 * the packet. We would know that only after the
+				 * call to api->recv() which is too late. So mark
+				 * the interface as filtered and continue and
+				 * update the filter statistics out of the loop.
+				 */
+				net_pkt_set_iface(pkt, tmp_iface);
+				filtered_iface = tmp_iface;
+				continue;
+			}
+
+			net_pkt_set_iface(pkt, tmp_iface);
+		}
+
 		verdict = api->recv(ctx->virtual_iface, pkt);
 		if (verdict == NET_CONTINUE) {
 			continue;
@@ -69,8 +92,53 @@ static enum net_verdict virtual_recv(struct net_if *iface,
 		return verdict;
 	}
 
+	if (IS_ENABLED(CONFIG_NET_PKT_FILTER) && filtered_iface != NULL) {
+		/* We need to update the statistics for the filtered iface here.
+		 */
+		net_stats_update_filter_rx_drop(filtered_iface);
+		goto silent_drop;
+	}
+
+	/* If there are no virtual interfaces attached, then pass the packet
+	 * to the actual virtual network interface.
+	 */
+	api = net_if_get_device(iface)->api;
+	if (!api || api->recv == NULL) {
+		goto drop;
+	}
+
+	if (!net_if_is_up(iface)) {
+		NET_DBG("Interface %d is down.", net_if_get_by_iface(iface));
+		goto silent_drop;
+	}
+
+	if (!net_pkt_filter_recv_ok(pkt)) {
+		net_stats_update_filter_rx_drop(iface);
+		goto silent_drop;
+	}
+
+	verdict = api->recv(iface, pkt);
+
+	if (IS_ENABLED(CONFIG_NET_STATISTICS)) {
+		size_t pkt_len;
+
+		pkt_len = net_pkt_get_len(pkt);
+
+		NET_DBG("Received pkt %p len %zu", pkt, pkt_len);
+
+		net_stats_update_bytes_recv(iface, pkt_len);
+	}
+
+	if (verdict == NET_DROP) {
+		net_stats_update_processing_error(iface);
+	}
+
+	return verdict;
+
+drop:
 	NET_DBG("No handler, dropping pkt %p len %zu", pkt, net_pkt_get_len(pkt));
 
+silent_drop:
 	return NET_DROP;
 }
 
@@ -186,7 +254,8 @@ static void random_linkaddr(uint8_t *linkaddr, size_t len)
 {
 	sys_rand_get(linkaddr, len);
 
-	linkaddr[0] |= 0x02; /* force LAA bit */
+	linkaddr[0] |= 0x02;  /* force LAA bit */
+	linkaddr[0] &= ~0x01; /* clear multicast bit */
 }
 
 int net_virtual_interface_attach(struct net_if *virtual_iface,
@@ -362,8 +431,8 @@ void net_virtual_set_name(struct net_if *iface, const char *name)
 
 	ctx = net_if_l2_data(iface);
 
-	strncpy(ctx->name, name, CONFIG_NET_L2_VIRTUAL_MAX_NAME_LEN);
-	ctx->name[CONFIG_NET_L2_VIRTUAL_MAX_NAME_LEN - 1] = '\0';
+	strncpy(ctx->name, name, ARRAY_SIZE(ctx->name) - 1);
+	ctx->name[ARRAY_SIZE(ctx->name) - 1] = '\0';
 }
 
 enum net_l2_flags net_virtual_set_flags(struct net_if *iface,
diff --git a/subsys/net/l2/virtual/virtual_mgmt.c b/subsys/net/l2/virtual/virtual_mgmt.c
index b0a8d62a04dad..1210fc59083e1 100644
--- a/subsys/net/l2/virtual/virtual_mgmt.c
+++ b/subsys/net/l2/virtual/virtual_mgmt.c
@@ -61,6 +61,15 @@ static int virtual_interface_set_config(uint32_t mgmt_request,
 		memcpy(&config.link_types, &params->link_types,
 		       sizeof(config.link_types));
 		type = VIRTUAL_INTERFACE_CONFIG_TYPE_LINK_TYPE;
+
+	} else if (mgmt_request == NET_REQUEST_VIRTUAL_INTERFACE_SET_PRIVATE_KEY) {
+		if (net_if_is_up(iface)) {
+			return -EACCES;
+		}
+
+		config.private_key.len = params->private_key.len;
+		config.private_key.data = params->private_key.data;
+		type = VIRTUAL_INTERFACE_CONFIG_TYPE_PRIVATE_KEY;
 	} else {
 		return -EINVAL;
 	}
@@ -77,6 +86,9 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_MTU,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_LINK_TYPE,
 				  virtual_interface_set_config);
 
+NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_PRIVATE_KEY,
+				  virtual_interface_set_config);
+
 static int virtual_interface_get_config(uint32_t mgmt_request,
 					struct net_if *iface,
 					void *data, size_t len)
@@ -133,6 +145,19 @@ static int virtual_interface_get_config(uint32_t mgmt_request,
 
 		memcpy(&params->link_types, &config.link_types,
 		       sizeof(params->link_types));
+
+	} else if (mgmt_request == NET_REQUEST_VIRTUAL_INTERFACE_GET_PUBLIC_KEY) {
+		type = VIRTUAL_INTERFACE_CONFIG_TYPE_PUBLIC_KEY;
+
+		ret = api->get_config(iface, type, &config);
+		if (ret) {
+			return ret;
+		}
+
+		params->public_key.len = config.public_key.len;
+		memcpy(&params->public_key.data, &config.public_key.data,
+		       MIN(sizeof(params->public_key.data),
+			   params->public_key.len));
 	} else {
 		return -EINVAL;
 	}
@@ -148,3 +173,6 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_MTU,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_LINK_TYPE,
 				  virtual_interface_get_config);
+
+NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_PUBLIC_KEY,
+				  virtual_interface_get_config);
diff --git a/subsys/net/l2/wifi/CMakeLists.txt b/subsys/net/l2/wifi/CMakeLists.txt
index 560f7b301bec7..e1e9606bfd2a6 100644
--- a/subsys/net/l2/wifi/CMakeLists.txt
+++ b/subsys/net/l2/wifi/CMakeLists.txt
@@ -27,59 +27,37 @@ if(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE AND CONFIG_NET_L2_WIFI_SHELL)
   # Wi-Fi Enterprise test certificates handling
   set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
   set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
+  if(NOT DEFINED WIFI_TEST_CERTS_DIR)
+    set(WIFI_TEST_CERTS_DIR ${ZEPHYR_BASE}/samples/net/wifi/test_certs/rsa3k)
+  endif()
   # Create output directory for test certs
   file(MAKE_DIRECTORY ${gen_dir})
 
   # convert .pem files to array data at build time
   zephyr_include_directories(${gen_inc_dir})
 
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client.pem
-      ${gen_dir}/client.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key.pem
-      ${gen_dir}/client-key.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca.pem
-      ${gen_dir}/ca.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client2.pem
-      ${gen_dir}/client2.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/client-key2.pem
-      ${gen_dir}/client-key2.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/ca2.pem
-      ${gen_dir}/ca2.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/server.pem
-      ${gen_dir}/server.pem.inc
-      )
-
-  generate_inc_file_for_target(
-      app
-      ${ZEPHYR_BASE}/samples/net/wifi/test_certs/server-key.pem
-      ${gen_dir}/server-key.pem.inc
+  foreach(cert_file IN ITEMS
+      ${WIFI_TEST_CERTS_DIR}/client.pem
+      ${WIFI_TEST_CERTS_DIR}/client-key.pem
+      ${WIFI_TEST_CERTS_DIR}/ca.pem
+      ${WIFI_TEST_CERTS_DIR}/client2.pem
+      ${WIFI_TEST_CERTS_DIR}/client-key2.pem
+      ${WIFI_TEST_CERTS_DIR}/ca2.pem
+      ${WIFI_TEST_CERTS_DIR}/server.pem
+      ${WIFI_TEST_CERTS_DIR}/server-key.pem
       )
+    if(EXISTS ${cert_file})
+      get_filename_component(cert_name ${cert_file} NAME)
+      generate_inc_file_for_target(
+          app
+          ${cert_file}
+          ${gen_dir}/${cert_name}.inc
+          )
+    else()
+      get_filename_component(cert_name ${cert_file} NAME)
+      file(WRITE ${gen_dir}/${cert_name}.inc "// Empty file generated because ${cert_file} does not exist\n")
+    endif()
+  endforeach()
 
   # Add explicit dependency on app target for ZEPHYR_CURRENT_LIBRARY, so these
   # headers are generated at the correct point in the build
diff --git a/subsys/net/l2/wifi/Kconfig b/subsys/net/l2/wifi/Kconfig
index 78f98497c73d7..a2e029a592be5 100644
--- a/subsys/net/l2/wifi/Kconfig
+++ b/subsys/net/l2/wifi/Kconfig
@@ -125,3 +125,27 @@ config WIFI_ENT_IDENTITY_MAX_USERS
 	default 8
 	help
 	  This option defines the maximum number of identity users allowed connection.
+
+if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+
+config WIFI_SHELL_RUNTIME_CERTIFICATES
+	bool "Provide Wi-Fi enterprise security certificates at run-time"
+	select TLS_CREDENTIALS
+	select TLS_CREDENTIALS_SHELL
+	select BASE64
+	help
+	  This option enables providing Wi-Fi enterprise security certificates at run-time.
+	  Uses the TLS credentials subsystem to store and manage the certificates.
+
+if WIFI_SHELL_RUNTIME_CERTIFICATES
+
+config HEAP_MEM_POOL_ADD_SIZE_WIFI_CERT
+	int "Wi-Fi enterprise security certificates memory pool size"
+	# STA - 6 certs and each assume 1500 bytes
+	default 12000
+	help
+	  The size of the memory pool used by the Wi-Fi enterprise security certificates.
+
+endif # WIFI_SHELL_RUNTIME_CERTIFICATES
+
+endif # WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 7ea0541598bff..95ff6b45f0cb5 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -333,6 +333,24 @@ const char *wifi_ps_exit_strategy_txt(enum wifi_ps_exit_strategy ps_exit_strateg
 	}
 }
 
+const char *wifi_conn_status_txt(enum wifi_conn_status status)
+{
+	switch (status) {
+	case WIFI_STATUS_CONN_SUCCESS:
+		return "Connection successful";
+	case WIFI_STATUS_CONN_FAIL:
+		return "Connection failed";
+	case WIFI_STATUS_CONN_WRONG_PASSWORD:
+		return "Wrong password";
+	case WIFI_STATUS_CONN_TIMEOUT:
+		return "Connection timeout";
+	case WIFI_STATUS_CONN_AP_NOT_FOUND:
+		return "AP not found";
+	default:
+		return "UNKNOWN";
+	}
+}
+
 static const struct wifi_mgmt_ops *const get_wifi_api(struct net_if *iface)
 {
 	const struct device *dev = net_if_get_device(iface);
@@ -377,26 +395,52 @@ static int wifi_connect(uint32_t mgmt_request, struct net_if *iface,
 	}
 	NET_DBG("ch %u sec %u", params->channel, params->security);
 
-	if ((params->security > WIFI_SECURITY_TYPE_MAX) ||
-	    (params->ssid_length > WIFI_SSID_MAX_LEN) ||
-	    (params->ssid_length == 0U) ||
-	    ((params->security == WIFI_SECURITY_TYPE_PSK ||
-		  params->security == WIFI_SECURITY_TYPE_WPA_PSK ||
-		  params->security == WIFI_SECURITY_TYPE_PSK_SHA256 ||
-		  params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) &&
-	     ((params->psk_length < 8) || (params->psk_length > 64) ||
-	      (params->psk_length == 0U) || !params->psk)) ||
-	    ((params->security == WIFI_SECURITY_TYPE_SAE_HNP ||
-		  params->security == WIFI_SECURITY_TYPE_SAE_H2E ||
-		  params->security == WIFI_SECURITY_TYPE_SAE_AUTO) &&
-	      ((params->psk_length == 0U) || !params->psk) &&
-		  ((params->sae_password_length == 0U) || !params->sae_password)) ||
-	    ((params->channel != WIFI_CHANNEL_ANY) &&
-	     (params->channel > WIFI_CHANNEL_MAX)) ||
-	    !params->ssid) {
+	if (params->channel > WIFI_CHANNEL_MAX && params->channel != WIFI_CHANNEL_ANY) {
+		return -EINVAL;
+	}
+
+	if (!params->ssid) {
+		return -EINVAL;
+	}
+
+	if (params->ssid_length <= 0 || params->ssid_length > WIFI_SSID_MAX_LEN) {
+		return -EINVAL;
+	}
+
+	if (params->psk_length && (params->psk_length < 8 || params->psk_length > 64)) {
+		return -EINVAL;
+	}
+
+	if (params->sae_password_length &&
+	    (params->sae_password_length < 8 || params->sae_password_length > 64)) {
+		return -EINVAL;
+	}
+
+	if (params->security > WIFI_SECURITY_TYPE_MAX) {
 		return -EINVAL;
 	}
 
+	switch (params->security) {
+	case WIFI_SECURITY_TYPE_PSK:
+	case WIFI_SECURITY_TYPE_WPA_PSK:
+	case WIFI_SECURITY_TYPE_PSK_SHA256:
+	case WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL:
+		if (!params->psk_length || !params->psk) {
+			return -EINVAL;
+		}
+		break;
+	case WIFI_SECURITY_TYPE_SAE_HNP:
+	case WIFI_SECURITY_TYPE_SAE_H2E:
+	case WIFI_SECURITY_TYPE_SAE_AUTO:
+		if ((!params->psk_length || !params->psk) &&
+		    (!params->sae_password_length || !params->sae_password)) {
+			return -EINVAL;
+		}
+		break;
+	default:
+		break;
+	}
+
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_ROAMING
 	memset(&roaming_params, 0x0, sizeof(roaming_params));
 	roaming_params.is_11r_used = params->ft_used;
@@ -1184,7 +1228,6 @@ static int wifi_get_version(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_VERSION, wifi_get_version);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 static int wifi_btm_query(uint32_t mgmt_request, struct net_if *iface, void *data, size_t len)
 {
 	const struct device *dev = net_if_get_device(iface);
@@ -1208,7 +1251,6 @@ static int wifi_btm_query(uint32_t mgmt_request, struct net_if *iface, void *dat
 }
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_BTM_QUERY, wifi_btm_query);
-#endif
 
 static int wifi_get_connection_params(uint32_t mgmt_request, struct net_if *iface,
 			void *data, size_t len)
@@ -1444,6 +1486,9 @@ static int __stored_creds_to_params(struct wifi_credentials_personal *creds,
 {
 	char *ssid = NULL;
 	char *psk = NULL;
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	char *key_passwd = NULL;
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 	int ret;
 
 	/* SSID */
@@ -1489,6 +1534,29 @@ static int __stored_creds_to_params(struct wifi_credentials_personal *creds,
 	/* Defaults */
 	params->security = creds->header.type;
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	if (params->security == WIFI_SECURITY_TYPE_EAP_TLS) {
+		if (creds->header.key_passwd_length > 0) {
+			key_passwd = (char *)k_malloc(creds->header.key_passwd_length + 1);
+			if (!key_passwd) {
+				LOG_ERR("Failed to allocate memory for key_passwd\n");
+				ret = -ENOMEM;
+				goto err_out;
+			}
+			memset(key_passwd, 0, creds->header.key_passwd_length + 1);
+			ret = snprintf(key_passwd, creds->header.key_passwd_length + 1, "%s",
+				       creds->header.key_passwd);
+			if (ret > creds->header.key_passwd_length) {
+				LOG_ERR("key_passwd string truncated\n");
+				ret = -EINVAL;
+				goto err_out;
+			}
+			params->key_passwd = key_passwd;
+			params->key_passwd_length = creds->header.key_passwd_length;
+		}
+	}
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
+
 	/* If channel is set to 0 we default to ANY. 0 is not a valid Wi-Fi channel. */
 	params->channel = (creds->header.channel != 0) ? creds->header.channel : WIFI_CHANNEL_ANY;
 	params->timeout = (creds->header.timeout != 0)
@@ -1529,6 +1597,13 @@ static int __stored_creds_to_params(struct wifi_credentials_personal *creds,
 		psk = NULL;
 	}
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	if (key_passwd) {
+		k_free(key_passwd);
+		key_passwd = NULL;
+	}
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
+
 	return ret;
 }
 
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index ae9d2a7336cfc..7713988594eaa 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -30,7 +30,29 @@ LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 
 #include "net_shell_private.h"
 #include <math.h>
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+#if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
+	defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+#include <zephyr/net/tls_credentials.h>
+enum wifi_enterprise_cert_sec_tags {
+	WIFI_CERT_CA_SEC_TAG = 0x1020001,
+	WIFI_CERT_CLIENT_KEY_SEC_TAG,
+	WIFI_CERT_SERVER_KEY_SEC_TAG,
+	WIFI_CERT_CLIENT_SEC_TAG,
+	WIFI_CERT_SERVER_SEC_TAG,
+	/* Phase 2 */
+	WIFI_CERT_CA_P2_SEC_TAG,
+	WIFI_CERT_CLIENT_KEY_P2_SEC_TAG,
+	WIFI_CERT_CLIENT_P2_SEC_TAG,
+};
+
+struct wifi_cert_data {
+	enum tls_credential_type type;
+	uint32_t sec_tag;
+	uint8_t **data;
+	size_t *len;
+};
+#else
 static const char ca_cert_test[] = {
 	#include <wifi_enterprise_test_certs/ca.pem.inc>
 	'\0'
@@ -67,7 +89,8 @@ static const char server_key_test[] = {
 	#include <wifi_enterprise_test_certs/server-key.pem.inc>
 	'\0'
 };
-#endif
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 
 #define WIFI_SHELL_MODULE "wifi"
 
@@ -105,6 +128,12 @@ static struct {
 		};
 		uint8_t all;
 	};
+#if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
+	defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	struct wifi_enterprise_creds_params enterprise_creds_params;
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 } context;
 
 static struct net_mgmt_event_callback wifi_shell_mgmt_cb;
@@ -121,27 +150,212 @@ static struct wifi_ap_sta_node sta_list[CONFIG_WIFI_SHELL_MAX_AP_STA];
 
 #if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
 	defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
-static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface)
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+static int process_certificates(struct wifi_cert_data *certs, size_t cert_count)
 {
-	struct wifi_enterprise_creds_params params = {0};
+	for (size_t i = 0; i < cert_count; i++) {
+		int err;
+		size_t len = 0;
+		uint8_t *cert_tmp;
+
+		err = tls_credential_get(certs[i].sec_tag, certs[i].type, NULL, &len);
+		if (err != -EFBIG) {
+			LOG_ERR("Failed to get credential tag: %d length, err: %d",
+				certs[i].sec_tag, err);
+			return err;
+		}
+
+		cert_tmp = k_malloc(len);
+		if (!cert_tmp) {
+			LOG_ERR("Failed to allocate memory for credential tag: %d",
+				certs[i].sec_tag);
+			return -ENOMEM;
+		}
+
+		err = tls_credential_get(certs[i].sec_tag, certs[i].type, cert_tmp, &len);
+		if (err) {
+			LOG_ERR("Failed to get credential tag: %d", certs[i].sec_tag);
+			k_free(cert_tmp);
+			return err;
+		}
+
+		*certs[i].data = cert_tmp;
+		*certs[i].len = len;
+	}
+
+	return 0;
+}
+
+static void set_enterprise_creds_params(struct wifi_enterprise_creds_params *params,
+					bool is_ap)
+{
+	struct wifi_cert_data certs_common[] = {
+		{
+			.type = TLS_CREDENTIAL_CA_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CA_SEC_TAG,
+			.data = &params->ca_cert,
+			.len = &params->ca_cert_len,
+		},
+	};
+
+	struct wifi_cert_data certs_sta[] = {
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_CLIENT_KEY_SEC_TAG,
+			.data = &params->client_key,
+			.len = &params->client_key_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CLIENT_SEC_TAG,
+			.data = &params->client_cert,
+			.len = &params->client_cert_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_CA_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CA_P2_SEC_TAG,
+			.data = &params->ca_cert2,
+			.len = &params->ca_cert2_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_CLIENT_KEY_P2_SEC_TAG,
+			.data = &params->client_key2,
+			.len = &params->client_key2_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CLIENT_P2_SEC_TAG,
+			.data = &params->client_cert2,
+			.len = &params->client_cert2_len,
+		},
+	};
+
+	struct wifi_cert_data certs_ap[] = {
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_SERVER_SEC_TAG,
+			.data = &params->server_cert,
+			.len = &params->server_cert_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_SERVER_KEY_SEC_TAG,
+			.data = &params->server_key,
+			.len = &params->server_key_len,
+		},
+	};
+
+	memset(params, 0, sizeof(*params));
+
+	/* Process common certificates */
+	if (process_certificates(certs_common, ARRAY_SIZE(certs_common)) != 0) {
+		goto cleanup;
+	}
+
+	/* Process STA-specific certificates */
+	if (!is_ap) {
+		if (process_certificates(certs_sta, ARRAY_SIZE(certs_sta)) != 0) {
+			goto cleanup;
+		}
+	}
+
+	/* Process AP-specific certificates if is_ap is true */
+	if (is_ap) {
+		if (process_certificates(certs_ap, ARRAY_SIZE(certs_ap)) != 0) {
+			goto cleanup;
+		}
+	}
 
-	params.ca_cert = (uint8_t *)ca_cert_test;
-	params.ca_cert_len = ARRAY_SIZE(ca_cert_test);
-	params.client_cert = (uint8_t *)client_cert_test;
-	params.client_cert_len = ARRAY_SIZE(client_cert_test);
-	params.client_key = (uint8_t *)client_key_test;
-	params.client_key_len = ARRAY_SIZE(client_key_test);
-	params.ca_cert2 = (uint8_t *)ca_cert2_test;
-	params.ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
-	params.client_cert2 = (uint8_t *)client_cert2_test;
-	params.client_cert2_len = ARRAY_SIZE(client_cert2_test);
-	params.client_key2 = (uint8_t *)client_key2_test;
-	params.client_key2_len = ARRAY_SIZE(client_key2_test);
-	params.server_cert = (uint8_t *)server_cert_test;
-	params.server_cert_len = ARRAY_SIZE(server_cert_test);
-	params.server_key = (uint8_t *)server_key_test;
-	params.server_key_len = ARRAY_SIZE(server_key_test);
+	memcpy(&context.enterprise_creds_params, params, sizeof(*params));
+	return;
 
+cleanup:
+	for (size_t i = 0; i < ARRAY_SIZE(certs_common); i++) {
+		if (certs_common[i].data) {
+			k_free(*certs_common[i].data);
+		}
+	}
+
+	if (!is_ap) {
+		for (size_t i = 0; i < ARRAY_SIZE(certs_sta); i++) {
+			if (certs_sta[i].data) {
+				k_free(*certs_sta[i].data);
+			}
+		}
+	}
+
+	if (is_ap) {
+		for (size_t i = 0; i < ARRAY_SIZE(certs_ap); i++) {
+			if (certs_ap[i].data) {
+				k_free(*certs_ap[i].data);
+			}
+		}
+	}
+}
+
+static void clear_enterprise_creds_params(struct wifi_enterprise_creds_params *params)
+{
+	size_t i;
+
+	if (!params) {
+		return;
+	}
+
+	const uint8_t *certs[] = {
+		params->ca_cert,
+		params->client_cert,
+		params->client_key,
+		params->server_cert,
+		params->server_key,
+		params->ca_cert2,
+		params->client_cert2,
+		params->client_key2,
+	};
+
+	for (i = 0; i < ARRAY_SIZE(certs); i++) {
+		k_free((void *)certs[i]);
+	}
+	memset(params, 0, sizeof(*params));
+}
+#else
+static void set_enterprise_creds_params(struct wifi_enterprise_creds_params *params,
+										bool is_ap)
+{
+		params->ca_cert = (uint8_t *)ca_cert_test;
+		params->ca_cert_len = ARRAY_SIZE(ca_cert_test);
+
+		if (!is_ap) {
+			params->client_cert = (uint8_t *)client_cert_test;
+			params->client_cert_len = ARRAY_SIZE(client_cert_test);
+			params->client_key = (uint8_t *)client_key_test;
+			params->client_key_len = ARRAY_SIZE(client_key_test);
+			params->ca_cert2 = (uint8_t *)ca_cert2_test;
+			params->ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
+			params->client_cert2 = (uint8_t *)client_cert2_test;
+			params->client_cert2_len = ARRAY_SIZE(client_cert2_test);
+			params->client_key2 = (uint8_t *)client_key2_test;
+			params->client_key2_len = ARRAY_SIZE(client_key2_test);
+
+			return;
+		}
+
+		params->server_cert = (uint8_t *)server_cert_test;
+		params->server_cert_len = ARRAY_SIZE(server_cert_test);
+		params->server_key = (uint8_t *)server_key_test;
+		params->server_key_len = ARRAY_SIZE(server_key_test);
+}
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
+static int wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface,
+				    bool is_ap)
+{
+	struct wifi_enterprise_creds_params params = {0};
+
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	clear_enterprise_creds_params(&context.enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+	set_enterprise_creds_params(&params, is_ap);
 	if (net_mgmt(NET_REQUEST_WIFI_ENTERPRISE_CREDS, iface, &params, sizeof(params))) {
 		PR_WARNING("Set enterprise credentials failed\n");
 		return -1;
@@ -208,7 +422,8 @@ static void handle_wifi_scan_result(struct net_mgmt_event_callback *cb)
 	   entry->rssi,
 	   ((entry->wpa3_ent_type) ?
 		wifi_wpa3_enterprise_txt(entry->wpa3_ent_type)
-		 : wifi_security_txt(entry->security)),
+		 : (entry->security == WIFI_SECURITY_TYPE_EAP ? "WPA2 Enterprise"
+		 : wifi_security_txt(entry->security))),
 	   ((entry->mac_length) ?
 		   net_sprint_ll_addr_buf(entry->mac, WIFI_MAC_ADDR_LEN,
 					  mac_string_buf,
@@ -312,9 +527,20 @@ static void handle_wifi_connect_result(struct net_mgmt_event_callback *cb)
 	const struct wifi_status *status =
 		(const struct wifi_status *) cb->info;
 	const struct shell *sh = context.sh;
+	int st = status->status;
+
+	if (st) {
+		if (st < 0) {
+			/* Errno values are negative, try to map to
+			 * wifi status values.
+			 */
+			if (st == -ETIMEDOUT) {
+				st = WIFI_STATUS_CONN_TIMEOUT;
+			}
+		}
 
-	if (status->status) {
-		PR_WARNING("Connection request failed (%d)\n", status->status);
+		PR_WARNING("Connection request failed (%s/%d)\n",
+			   wifi_conn_status_txt(st), st);
 	} else {
 		PR("Connected\n");
 	}
@@ -707,7 +933,7 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 			break;
 		case 'b':
 			if (iface_mode == WIFI_MODE_INFRA ||
-				iface_mode == WIFI_MODE_AP) {
+			    iface_mode == WIFI_MODE_AP) {
 				switch (atoi(state->optarg)) {
 				case 2:
 					params->band = WIFI_FREQ_BAND_2_4_GHZ;
@@ -718,6 +944,13 @@ static int __wifi_args_to_params(const struct shell *sh, size_t argc, char *argv
 				case 6:
 					params->band = WIFI_FREQ_BAND_6_GHZ;
 					break;
+				case 0:
+					/* Allow default value when connecting */
+					if (iface_mode == WIFI_MODE_INFRA) {
+						params->band = WIFI_FREQ_BAND_UNKNOWN;
+						break;
+					}
+					__fallthrough;
 				default:
 					PR_ERROR("Invalid band: %d\n", atoi(state->optarg));
 					return -EINVAL;
@@ -948,7 +1181,7 @@ static int cmd_wifi_connect(const struct shell *sh, size_t argc,
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
-		cmd_wifi_set_enterprise_creds(sh, iface);
+		wifi_set_enterprise_creds(sh, iface, 0);
 	}
 #endif
 
@@ -990,6 +1223,11 @@ static int cmd_wifi_disconnect(const struct shell *sh, size_t argc,
 		PR("Disconnect requested\n");
 	}
 
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	/* Clear the certificates */
+	clear_enterprise_creds_params(&context.enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
 	return 0;
 }
 
@@ -1953,14 +2191,14 @@ static int cmd_wifi_ap_enable(const struct shell *sh, size_t argc,
 		return -ENOEXEC;
 	}
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
 	/* Load the enterprise credentials if needed */
 	if (cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
 	    cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
-		cmd_wifi_set_enterprise_creds(sh, iface);
+		wifi_set_enterprise_creds(sh, iface, 1);
 	}
 #endif
 
@@ -1991,6 +2229,12 @@ static int cmd_wifi_ap_disable(const struct shell *sh, size_t argc,
 	}
 
 	PR("AP mode disable requested\n");
+
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	/* Clear the certificates */
+	clear_enterprise_creds_params(&context.enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
 	return 0;
 }
 
@@ -2298,7 +2542,6 @@ static int cmd_wifi_listen_interval(const struct shell *sh, size_t argc, char *a
 	return 0;
 }
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 static int cmd_wifi_btm_query(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_wifi_sta();
@@ -2323,7 +2566,6 @@ static int cmd_wifi_btm_query(const struct shell *sh, size_t argc, char *argv[])
 
 	return 0;
 }
-#endif
 
 static int cmd_wifi_wps_pbc(const struct shell *sh, size_t argc, char *argv[])
 {
@@ -3652,12 +3894,10 @@ SHELL_SUBCMD_ADD((wifi), 11k_neighbor_request, NULL,
 		 cmd_wifi_11k_neighbor_request,
 		 1, 2);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 SHELL_SUBCMD_ADD((wifi), 11v_btm_query, NULL,
 		 "<query_reason: The reason code for a BSS transition management query>.\n",
 		 cmd_wifi_btm_query,
 		 2, 0);
-#endif
 
 SHELL_SUBCMD_ADD((wifi), channel, NULL,
 		 "wifi channel setting\n"
diff --git a/subsys/net/l2/wifi/wifi_utils.c b/subsys/net/l2/wifi/wifi_utils.c
index 69df08916dbe7..d90d6ab4264d4 100644
--- a/subsys/net/l2/wifi/wifi_utils.c
+++ b/subsys/net/l2/wifi/wifi_utils.c
@@ -175,6 +175,10 @@ static int wifi_utils_get_all_chans_in_range(uint8_t chan_start,
 			}
 
 			if (start) {
+				if (idx > WIFI_MGMT_SCAN_CHAN_MAX_MANUAL) {
+					*chan_idx = idx;
+					break;
+				}
 				band_chan[idx].band = band_idx;
 				band_chan[idx].channel = valid_5g_chans_20mhz[i];
 				idx++;
diff --git a/subsys/net/lib/Kconfig b/subsys/net/lib/Kconfig
index ab7aa98373d0a..e530877125afa 100644
--- a/subsys/net/lib/Kconfig
+++ b/subsys/net/lib/Kconfig
@@ -53,4 +53,12 @@ source "subsys/net/lib/prometheus/Kconfig"
 
 source "subsys/net/lib/wifi_credentials/Kconfig"
 
+# Hidden option for VPN usage. Can be selected by the application
+# to setup VPN enablers in the network stack.
+config NET_VPN
+	bool
+	help
+	  Setup VPN enablers in the network stack. Meant to
+	  be enabled by the VPN implementation.
+
 endmenu
diff --git a/subsys/net/lib/capture/cooked.c b/subsys/net/lib/capture/cooked.c
index a076abc0ff2ba..b4f44034138e3 100644
--- a/subsys/net/lib/capture/cooked.c
+++ b/subsys/net/lib/capture/cooked.c
@@ -446,10 +446,10 @@ void net_capture_data(struct net_capture_cooked *ctx,
 	 */
 	net_pkt_set_ll_proto_type(pkt, ptype);
 
-	net_pkt_lladdr_src(pkt)->addr = NULL;
+	memset(net_pkt_lladdr_src(pkt)->addr, 0, sizeof(net_pkt_lladdr_src(pkt)->addr));
 	net_pkt_lladdr_src(pkt)->len = 0U;
 	net_pkt_lladdr_src(pkt)->type = NET_LINK_DUMMY;
-	net_pkt_lladdr_dst(pkt)->addr = NULL;
+	memset(net_pkt_lladdr_dst(pkt)->addr, 0, sizeof(net_pkt_lladdr_dst(pkt)->addr));
 	net_pkt_lladdr_dst(pkt)->len = 0U;
 	net_pkt_lladdr_dst(pkt)->type = NET_LINK_DUMMY;
 
diff --git a/subsys/net/lib/coap/Kconfig b/subsys/net/lib/coap/Kconfig
index a4a75108cdcca..3dce7fd1fa479 100644
--- a/subsys/net/lib/coap/Kconfig
+++ b/subsys/net/lib/coap/Kconfig
@@ -166,7 +166,8 @@ config COAP_SERVER
 	bool "CoAP server support [EXPERIMENTAL]"
 	select EXPERIMENTAL
 	select NET_SOCKETS
-	select NET_SOCKETPAIR
+	select ZVFS
+	select ZVFS_EVENTFD
 	help
 	  This option enables the API for CoAP-services to register resources.
 
diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c
index fe868fb2a8fa5..67fd8af91c1fe 100644
--- a/subsys/net/lib/coap/coap_client.c
+++ b/subsys/net/lib/coap/coap_client.c
@@ -995,7 +995,15 @@ static int handle_response(struct coap_client *client, const struct coap_packet
 		report_callback_error(internal_req, ret);
 	}
 	if (!internal_req->is_observe) {
-		release_internal_request(internal_req);
+		if (response_type == COAP_TYPE_ACK) {
+			/* This is piggybacked ACK,
+			 * no need to wait for lifetime to expire, all data is already transferred
+			 * and acknowledged
+			 */
+			reset_internal_request(internal_req);
+		} else {
+			release_internal_request(internal_req);
+		}
 	}
 	return ret;
 }
@@ -1013,14 +1021,12 @@ static void cancel_requests_with(struct coap_client *client, int error)
 			 * request was cancelled anyway.
 			 */
 			report_callback_error(&client->requests[i], error);
-			release_internal_request(&client->requests[i]);
 		}
-		/* If our socket has failed, clear all requests, even completed ones,
-		 * so that our handle_poll() does not poll() anymore for this socket.
+
+		/* Clear all requests, even completed ones, so that our
+		 * handle_poll() does not poll() anymore for this socket.
 		 */
-		if (error == -EIO) {
-			reset_internal_request(&client->requests[i]);
-		}
+		reset_internal_request(&client->requests[i]);
 	}
 	k_mutex_unlock(&client->lock);
 
@@ -1123,6 +1129,20 @@ struct coap_client_option coap_client_option_initial_block2(void)
 	return block2;
 }
 
+bool coap_client_has_ongoing_exchange(struct coap_client *client)
+{
+	if (client == NULL) {
+		LOG_ERR("Invalid (NULL) Client");
+		return false;
+	}
+
+	return has_ongoing_exchange(client);
+}
+
+#define COAP_CLIENT_THREAD_PRIORITY CLAMP(CONFIG_COAP_CLIENT_THREAD_PRIORITY, \
+					  K_HIGHEST_APPLICATION_THREAD_PRIO, \
+					  K_LOWEST_APPLICATION_THREAD_PRIO)
+
 K_THREAD_DEFINE(coap_client_recv_thread, CONFIG_COAP_CLIENT_STACK_SIZE,
 		coap_client_recv, NULL, NULL, NULL,
-		CONFIG_COAP_CLIENT_THREAD_PRIORITY, 0, 0);
+		COAP_CLIENT_THREAD_PRIORITY, 0, 0);
diff --git a/subsys/net/lib/coap/coap_server.c b/subsys/net/lib/coap/coap_server.c
index 0234268901ddb..45fdb7c9825da 100644
--- a/subsys/net/lib/coap/coap_server.c
+++ b/subsys/net/lib/coap/coap_server.c
@@ -16,7 +16,8 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #include <zephyr/net/coap_link_format.h>
 #include <zephyr/net/coap_mgmt.h>
 #include <zephyr/net/coap_service.h>
-#include <zephyr/posix/fcntl.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/zvfs/eventfd.h>
 
 #if defined(CONFIG_NET_TC_THREAD_COOPERATIVE)
 /* Lowest priority cooperative thread */
@@ -38,7 +39,7 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 BUILD_ASSERT(CONFIG_ZVFS_POLL_MAX > 0, "CONFIG_ZVFS_POLL_MAX can't be 0");
 
 static K_MUTEX_DEFINE(lock);
-static int control_socks[2];
+static int control_sock;
 
 #if defined(CONFIG_COAP_SERVER_PENDING_ALLOCATOR_STATIC)
 K_MEM_SLAB_DEFINE_STATIC(pending_data, CONFIG_COAP_SERVER_MESSAGE_SIZE,
@@ -370,7 +371,7 @@ static int coap_server_poll_timeout(void)
 
 static void coap_server_update_services(void)
 {
-	if (zsock_send(control_socks[1], &(char){0}, 1, 0) < 0) {
+	if (zvfs_eventfd_write(control_sock, 1)) {
 		LOG_ERR("Failed to notify server thread (%d)", errno);
 	}
 }
@@ -468,7 +469,7 @@ int coap_service_start(const struct coap_service *service)
 		goto end;
 	}
 
-	ret = zsock_fcntl(service->data->sock_fd, F_SETFL, O_NONBLOCK);
+	ret = zsock_fcntl(service->data->sock_fd, ZVFS_F_SETFL, ZVFS_O_NONBLOCK);
 	if (ret < 0) {
 		ret = -errno;
 		goto close;
@@ -763,25 +764,12 @@ static void coap_server_thread(void *p1, void *p2, void *p3)
 	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
-	/* Create a socket pair to wake zsock_poll */
-	ret = zsock_socketpair(AF_UNIX, SOCK_STREAM, 0, control_socks);
-	if (ret < 0) {
-		LOG_ERR("Failed to create socket pair (%d)", ret);
+	control_sock = zvfs_eventfd(0, ZVFS_EFD_NONBLOCK);
+	if (control_sock < 0) {
+		LOG_ERR("Failed to create event fd (%d)", -errno);
 		return;
 	}
 
-	for (int i = 0; i < 2; ++i) {
-		ret = zsock_fcntl(control_socks[i], F_SETFL, O_NONBLOCK);
-
-		if (ret < 0) {
-			zsock_close(control_socks[0]);
-			zsock_close(control_socks[1]);
-
-			LOG_ERR("Failed to set socket pair [%d] non-blocking (%d)", i, ret);
-			return;
-		}
-	}
-
 	COAP_SERVICE_FOREACH(svc) {
 		if (svc->flags & COAP_SERVICE_AUTOSTART) {
 			ret = coap_service_start(svc);
@@ -810,9 +798,9 @@ static void coap_server_thread(void *p1, void *p2, void *p3)
 			sock_nfds++;
 		}
 
-		/* Add socket pair FD to allow wake up */
+		/* Add event FD to allow wake up */
 		if (sock_nfds < MAX_POLL_FD) {
-			sock_fds[sock_nfds].fd = control_socks[0];
+			sock_fds[sock_nfds].fd = control_sock;
 			sock_fds[sock_nfds].events = ZSOCK_POLLIN;
 			sock_fds[sock_nfds].revents = 0;
 			sock_nfds++;
@@ -828,11 +816,11 @@ static void coap_server_thread(void *p1, void *p2, void *p3)
 
 		for (int i = 0; i < sock_nfds; ++i) {
 			/* Check the wake up event */
-			if (sock_fds[i].fd == control_socks[0] &&
+			if (sock_fds[i].fd == control_sock &&
 			    sock_fds[i].revents & ZSOCK_POLLIN) {
-				char tmp;
+				zvfs_eventfd_t tmp;
 
-				zsock_recv(sock_fds[i].fd, &tmp, 1, 0);
+				zvfs_eventfd_read(sock_fds[i].fd, &tmp);
 				continue;
 			}
 
diff --git a/subsys/net/lib/dhcpv4/Kconfig b/subsys/net/lib/dhcpv4/Kconfig
index 17564997b5554..52dcfc099b561 100644
--- a/subsys/net/lib/dhcpv4/Kconfig
+++ b/subsys/net/lib/dhcpv4/Kconfig
@@ -22,7 +22,6 @@ source "subsys/net/Kconfig.template.log_config.net"
 
 config NET_DHCPV4_INITIAL_DELAY_MAX
 	int "Maximum time out for initial discover request"
-	depends on NET_DHCPV4
 	default 10
 	range 2 10
 	help
@@ -31,7 +30,6 @@ config NET_DHCPV4_INITIAL_DELAY_MAX
 
 config NET_DHCPV4_OPTION_CALLBACKS
 	bool "Option callbacks"
-	depends on NET_DHCPV4
 	help
 	  If set, custom callbacks for arbitrary DHCP options
 	  can be added. These can be used to support otherwise
@@ -39,7 +37,7 @@ config NET_DHCPV4_OPTION_CALLBACKS
 
 config NET_DHCPV4_MAX_REQUESTED_OPTIONS
 	int "Maximum number of requested options"
-	depends on NET_DHCPV4 && NET_DHCPV4_OPTION_CALLBACKS
+	depends on NET_DHCPV4_OPTION_CALLBACKS
 	default 10
 	range 3 $(UINT8_MAX)
 	help
@@ -49,7 +47,6 @@ config NET_DHCPV4_MAX_REQUESTED_OPTIONS
 
 config NET_DHCPV4_OPTION_CALLBACKS_VENDOR_SPECIFIC
 	bool "Encapsulated vendor specific option callbacks"
-	depends on NET_DHCPV4
 	select NET_DHCPV4_OPTION_CALLBACKS
 	help
 	  If set, custom callbacks for encapsulated vendor-specific
@@ -57,7 +54,6 @@ config NET_DHCPV4_OPTION_CALLBACKS_VENDOR_SPECIFIC
 
 config NET_DHCPV4_ACCEPT_UNICAST
 	bool "Accept unicast DHCPv4 traffic"
-	depends on NET_DHCPV4
 	default y
 	help
 	  If set, the network stack will accept unicast DHCPv4 responses from
@@ -65,7 +61,6 @@ config NET_DHCPV4_ACCEPT_UNICAST
 
 config NET_DHCPV4_VENDOR_CLASS_IDENTIFIER
 	bool "Send vendor class identifier in DHCPv4 request"
-	depends on NET_DHCPV4
 	help
 	  If set, the network stack will include the specified string in the
 	  DHCPv4 vendor class identifier option in the DHCPv4 request.
@@ -94,6 +89,13 @@ config NET_DHCPV4_OPTION_DNS_ADDRESS
 	  If this option is set, then the DNS server can be set from the
 	  DHCPv4 option.
 
+config NET_DHCPV4_OPTION_PRINT_IGNORED
+	bool "Print information about ignored options"
+	help
+	  If this option is set, then we print information about options that we
+	  received and ignored. If this is not set, then we print these as unknown
+	  options.
+
 endif # NET_DHCPV4
 
 config NET_DHCPV4_SERVER
diff --git a/subsys/net/lib/dhcpv4/dhcpv4.c b/subsys/net/lib/dhcpv4/dhcpv4.c
index 5a6529f1a0896..2ffb1e96e4da3 100644
--- a/subsys/net/lib/dhcpv4/dhcpv4.c
+++ b/subsys/net/lib/dhcpv4/dhcpv4.c
@@ -21,6 +21,7 @@ LOG_MODULE_REGISTER(net_dhcpv4, CONFIG_NET_DHCPV4_LOG_LEVEL);
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/hostname.h>
 #include "net_private.h"
 
 #include <zephyr/net/udp.h>
@@ -1053,6 +1054,64 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt,
 
 			break;
 		}
+
+#if defined(CONFIG_NET_DHCPV4_OPTION_PRINT_IGNORED)
+		case DHCPV4_OPTIONS_BROADCAST: {
+			struct in_addr bcast;
+
+			/* Broadcast address option may present 1 address */
+			if (length != 4) {
+				NET_ERR("options_broadcast, bad length");
+				return false;
+			}
+
+			if (net_pkt_read(pkt, bcast.s4_addr, 4)) {
+				NET_ERR("options_broadcast, short packet");
+				return false;
+			}
+
+			NET_DBG("options_broadcast: %s (ignored)",
+				net_sprint_ipv4_addr(&bcast));
+			break;
+		}
+		case DHCPV4_OPTIONS_HOST_NAME: {
+			char hostname[NET_HOSTNAME_SIZE] = { 0 };
+
+			if (length < 1) {
+				NET_ERR("options_host_name, bad length");
+				return false;
+			}
+
+			if (net_pkt_read(pkt, hostname, MIN(length,
+							    sizeof(hostname) - 1))) {
+				NET_ERR("options_host_name, short packet");
+				return false;
+			}
+
+			NET_DBG("options_host_name: %s (ignored%s)", hostname,
+				(length > sizeof(hostname) - 1) ? " and truncated" : "");
+			break;
+		}
+		case DHCPV4_OPTIONS_DOMAIN_NAME: {
+			char domain_name[NET_HOSTNAME_SIZE] = { 0 };
+
+			if (length < 1) {
+				NET_ERR("options_domain_name, bad length");
+				return false;
+			}
+
+			if (net_pkt_read(pkt, domain_name, MIN(length,
+							       sizeof(domain_name) - 1))) {
+				NET_ERR("options_domain_name, short packet");
+				return false;
+			}
+
+			NET_DBG("options_domain_name: %s (ignored%s)", domain_name,
+				(length > sizeof(domain_name) - 1) ? " and truncated" : "");
+			break;
+		}
+#endif /* CONFIG_NET_DHCPV4_OPTION_PRINT_IGNORED */
+
 #if defined(CONFIG_NET_DHCPV4_OPTION_DNS_ADDRESS)
 #define MAX_DNS_SERVERS CONFIG_DNS_RESOLVER_MAX_SERVERS
 		case DHCPV4_OPTIONS_DNS_SERVER: {
@@ -1555,6 +1614,11 @@ static void dhcpv4_iface_event_handler(struct net_mgmt_event_callback *cb,
 {
 	sys_snode_t *node = NULL;
 
+	if (mgmt_event != NET_EVENT_IF_UP &&
+	    mgmt_event != NET_EVENT_IF_DOWN) {
+		return;
+	}
+
 	k_mutex_lock(&lock, K_FOREVER);
 
 	SYS_SLIST_FOR_EACH_NODE(&dhcpv4_ifaces, node) {
@@ -1602,6 +1666,16 @@ static void dhcpv4_acd_event_handler(struct net_mgmt_event_callback *cb,
 	sys_snode_t *node = NULL;
 	struct in_addr *addr;
 
+	if (mgmt_event != NET_EVENT_IPV4_ACD_FAILED &&
+	    mgmt_event != NET_EVENT_IPV4_ACD_CONFLICT) {
+		return;
+	}
+
+	if (cb->info_length != sizeof(struct in_addr)) {
+		return;
+	}
+
+	addr = (struct in_addr *)cb->info;
 
 	k_mutex_lock(&lock, K_FOREVER);
 
@@ -1615,17 +1689,6 @@ static void dhcpv4_acd_event_handler(struct net_mgmt_event_callback *cb,
 		goto out;
 	}
 
-	if (mgmt_event != NET_EVENT_IPV4_ACD_FAILED &&
-	    mgmt_event != NET_EVENT_IPV4_ACD_CONFLICT) {
-		goto out;
-	}
-
-	if (cb->info_length != sizeof(struct in_addr)) {
-		goto out;
-	}
-
-	addr = (struct in_addr *)cb->info;
-
 	if (!net_ipv4_addr_cmp(&iface->config.dhcpv4.requested_ip, addr)) {
 		goto out;
 	}
diff --git a/subsys/net/lib/dhcpv4/dhcpv4_internal.h b/subsys/net/lib/dhcpv4/dhcpv4_internal.h
index 350e16946bebe..e4c7305a5994b 100644
--- a/subsys/net/lib/dhcpv4/dhcpv4_internal.h
+++ b/subsys/net/lib/dhcpv4/dhcpv4_internal.h
@@ -56,6 +56,8 @@ struct dhcp_msg {
 #define DHCPV4_OPTIONS_DNS_SERVER	6
 #define DHCPV4_OPTIONS_LOG_SERVER	7
 #define DHCPV4_OPTIONS_HOST_NAME	12
+#define DHCPV4_OPTIONS_DOMAIN_NAME	15
+#define DHCPV4_OPTIONS_BROADCAST	28
 #define DHCPV4_OPTIONS_NTP_SERVER	42
 #define DHCPV4_OPTIONS_VENDOR_SPECIFIC	43
 #define DHCPV4_OPTIONS_REQ_IPADDR	50
diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c
index a3b11a594c9c7..a296adcb69882 100644
--- a/subsys/net/lib/dns/dispatcher.c
+++ b/subsys/net/lib/dns/dispatcher.c
@@ -190,7 +190,7 @@ void dns_dispatcher_svc_handler(struct net_socket_service_event *pev)
 
 	ret = recv_data(pev);
 	if (ret < 0 && ret != DNS_EAI_ALLDONE && ret != -ENOENT) {
-		NET_ERR("DNS recv error (%d)", ret);
+		NET_DBG("DNS recv error (%d)", ret);
 	}
 }
 
diff --git a/subsys/net/lib/dns/dns_pack.c b/subsys/net/lib/dns/dns_pack.c
index 53d8b7c221bef..a1efc20f81ad6 100644
--- a/subsys/net/lib/dns/dns_pack.c
+++ b/subsys/net/lib/dns/dns_pack.c
@@ -5,6 +5,8 @@
  */
 
 #include <string.h>
+#include <zephyr/sys/bitarray.h>
+#include <zephyr/net/dns_resolve.h>
 #include <zephyr/net_buf.h>
 
 #include "dns_pack.h"
@@ -367,10 +369,11 @@ int dns_unpack_response_query(struct dns_msg_t *dns_msg)
 int dns_copy_qname(uint8_t *buf, uint16_t *len, uint16_t size,
 		   struct dns_msg_t *dns_msg, uint16_t pos)
 {
+	SYS_BITARRAY_DEFINE(visited, DNS_RESOLVER_MAX_BUF_SIZE);
 	uint16_t msg_size = dns_msg->msg_size;
 	uint8_t *msg = dns_msg->msg;
 	uint16_t lb_size;
-	int rc = -EINVAL;
+	int rc = -EINVAL, ret, prev;
 
 	*len = 0U;
 
@@ -383,7 +386,7 @@ int dns_copy_qname(uint8_t *buf, uint16_t *len, uint16_t size,
 		lb_size = msg[pos];
 
 		/* pointer */
-		if (lb_size > DNS_LABEL_MAX_SIZE) {
+		if ((lb_size & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
 			uint8_t mask = DNS_LABEL_MAX_SIZE;
 
 			if (pos + 1 >= msg_size) {
@@ -394,7 +397,21 @@ int dns_copy_qname(uint8_t *buf, uint16_t *len, uint16_t size,
 			/* See: RFC 1035, 4.1.4. Message compression */
 			pos = ((msg[pos] & mask) << 8) + msg[pos + 1];
 
+			ret = sys_bitarray_test_and_set_bit(&visited, pos, &prev);
+			if (ret < 0) {
+				rc = -EINVAL;
+				break;
+			}
+
+			if (prev) {
+				rc = -ELOOP;
+				break;
+			}
+
 			continue;
+		} else if (lb_size & NS_CMPRSFLGS) {
+			rc = -EINVAL;
+			break;
 		}
 
 		/* validate that the label (i.e. size + elements),
@@ -484,7 +501,7 @@ static int dns_unpack_name(const uint8_t *msg, int maxlen, const uint8_t *src,
 	}
 
 	while ((val = *curr_src++)) {
-		if (val & NS_CMPRSFLGS) {
+		if ((val & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
 			/* Follow pointer */
 			int pos;
 
@@ -592,6 +609,7 @@ int dns_unpack_query(struct dns_msg_t *dns_msg, struct net_buf *buf,
 		&& query_type != DNS_RR_TYPE_PTR
 		&& query_type != DNS_RR_TYPE_SRV
 		&& query_type != DNS_RR_TYPE_TXT
+		&& query_type != DNS_RR_TYPE_HTTPS
 		&& query_type != DNS_RR_TYPE_ANY) {
 		return -EINVAL;
 	}
diff --git a/subsys/net/lib/dns/dns_pack.h b/subsys/net/lib/dns/dns_pack.h
index 58041ed6e03cf..07ad7bc6723a7 100644
--- a/subsys/net/lib/dns/dns_pack.h
+++ b/subsys/net/lib/dns/dns_pack.h
@@ -93,6 +93,7 @@ enum dns_rr_type {
 	DNS_RR_TYPE_TXT = 16,		/* TXT   */
 	DNS_RR_TYPE_AAAA = 28,		/* IPv6  */
 	DNS_RR_TYPE_SRV = 33,		/* SRV   */
+	DNS_RR_TYPE_HTTPS = 65,		/* HTTPS */
 	DNS_RR_TYPE_ANY = 0xff,		/* ANY (all records)   */
 };
 
diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c
index e40ba9a3fb180..29f1c657ae1e5 100644
--- a/subsys/net/lib/dns/mdns_responder.c
+++ b/subsys/net/lib/dns/mdns_responder.c
@@ -8,6 +8,7 @@
  * Copyright (c) 2017 Intel Corporation
  * Copyright (c) 2020 Friedt Professional Engineering Services, Inc
  * Copyright (c) 2024 Nordic Semiconductor ASA
+ * Copyright (c) 2025 SynchronicIT BV
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -43,12 +44,8 @@ LOG_MODULE_REGISTER(net_mdns_responder, CONFIG_MDNS_RESPONDER_LOG_LEVEL);
  * address-family-specific variants being of differing sizes. Let's not
  * mess with code (which looks correct), just silence the compiler.
  */
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wunknown-warning-option"
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#pragma GCC diagnostic ignored "-Wstringop-overread"
-#endif
+TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_ARRAY_BOUNDS);
+TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_STRINGOP_OVERREAD);
 
 extern void dns_dispatcher_svc_handler(struct net_socket_service_event *pev);
 
@@ -110,6 +107,7 @@ static size_t external_records_count;
 
 #ifndef CONFIG_NET_TEST
 static int setup_dst_addr(int sock, sa_family_t family,
+			  struct sockaddr *src, socklen_t src_len,
 			  struct sockaddr *dst, socklen_t *dst_len);
 #endif /* CONFIG_NET_TEST */
 
@@ -194,25 +192,36 @@ static int set_ttl_hop_limit(int sock, int level, int option, int new_limit)
 }
 
 int setup_dst_addr(int sock, sa_family_t family,
+		   struct sockaddr *src, socklen_t src_len,
 		   struct sockaddr *dst, socklen_t *dst_len)
 {
 	int ret;
 
 	if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) {
-		create_ipv4_addr(net_sin(dst));
-		*dst_len = sizeof(struct sockaddr_in);
+		if ((src != NULL) && (net_sin(src)->sin_port != htons(MDNS_LISTEN_PORT))) {
+			memcpy(dst, src, src_len);
+			*dst_len = src_len;
+		} else {
+			create_ipv4_addr(net_sin(dst));
+			*dst_len = sizeof(struct sockaddr_in);
 
-		ret = set_ttl_hop_limit(sock, IPPROTO_IP, IP_MULTICAST_TTL, 255);
-		if (ret < 0) {
-			NET_DBG("Cannot set %s multicast %s (%d)", "IPv4", "TTL", ret);
+			ret = set_ttl_hop_limit(sock, IPPROTO_IP, IP_MULTICAST_TTL, 255);
+			if (ret < 0) {
+				NET_DBG("Cannot set %s multicast %s (%d)", "IPv4", "TTL", ret);
+			}
 		}
 	} else if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) {
-		create_ipv6_addr(net_sin6(dst));
-		*dst_len = sizeof(struct sockaddr_in6);
+		if ((src != NULL) && (net_sin6(src)->sin6_port != htons(MDNS_LISTEN_PORT))) {
+			memcpy(dst, src, src_len);
+			*dst_len = src_len;
+		} else {
+			create_ipv6_addr(net_sin6(dst));
+			*dst_len = sizeof(struct sockaddr_in6);
 
-		ret = set_ttl_hop_limit(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, 255);
-		if (ret < 0) {
-			NET_DBG("Cannot set %s multicast %s (%d)", "IPv6", "hoplimit", ret);
+			ret = set_ttl_hop_limit(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, 255);
+			if (ret < 0) {
+				NET_DBG("Cannot set %s multicast %s (%d)", "IPv6", "hoplimit", ret);
+			}
 		}
 	} else {
 		return -EPFNOSUPPORT;
@@ -228,7 +237,6 @@ static int get_socket(sa_family_t family)
 	ret = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP);
 	if (ret < 0) {
 		ret = -errno;
-		NET_DBG("Cannot get socket (%d)", ret);
 	}
 
 	return ret;
@@ -346,7 +354,7 @@ static int send_response(int sock,
 	COND_CODE_1(IS_ENABLED(CONFIG_NET_IPV6),
 		    (struct sockaddr_in6), (struct sockaddr_in)) dst;
 
-	ret = setup_dst_addr(sock, family, (struct sockaddr *)&dst, &dst_len);
+	ret = setup_dst_addr(sock, family, src_addr, addrlen, (struct sockaddr *)&dst, &dst_len);
 	if (ret < 0) {
 		NET_DBG("unable to set up the response address");
 		return ret;
@@ -456,7 +464,7 @@ static void send_sd_response(int sock,
 	label[2] = proto_buf;
 	label[3] = domain_buf;
 
-	ret = setup_dst_addr(sock, family, (struct sockaddr *)&dst, &dst_len);
+	ret = setup_dst_addr(sock, family, src_addr, addrlen, (struct sockaddr *)&dst, &dst_len);
 	if (ret < 0) {
 		NET_DBG("unable to set up the response address");
 		return;
@@ -608,12 +616,15 @@ static int dns_read(int sock,
 
 	queries = ret;
 
-	NET_DBG("Received %d %s from %s", queries,
+	NET_DBG("Received %d %s from %s:%u", queries,
 		queries > 1 ? "queries" : "query",
 		net_sprint_addr(family,
 				family == AF_INET ?
 				(const void *)&net_sin(src_addr)->sin_addr :
-				(const void *)&net_sin6(src_addr)->sin6_addr));
+				(const void *)&net_sin6(src_addr)->sin6_addr),
+				ntohs(family == AF_INET ?
+				net_sin(src_addr)->sin_port :
+				net_sin6(src_addr)->sin6_port));
 
 	do {
 		enum dns_rr_type qtype;
@@ -1332,9 +1343,9 @@ static int init_listener(void)
 
 		v6 = get_socket(AF_INET6);
 		if (v6 < 0) {
-			NET_ERR("Cannot get %s socket (%d %s interfaces). Max sockets is %d",
+			NET_ERR("Cannot get %s socket (%d %s interfaces). Max sockets is %d (%d)",
 				"IPv6", MAX_IPV6_IFACE_COUNT,
-				"IPv6", CONFIG_NET_MAX_CONTEXTS);
+				"IPv6", CONFIG_NET_MAX_CONTEXTS, v6);
 			continue;
 		}
 
@@ -1352,7 +1363,8 @@ static int init_listener(void)
 				ifindex, ret);
 		} else {
 			memset(&if_req, 0, sizeof(if_req));
-			strncpy(if_req.ifr_name, name, sizeof(if_req.ifr_name) - 1);
+			memcpy(if_req.ifr_name, name,
+			       MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1));
 
 			ret = zsock_setsockopt(v6, SOL_SOCKET, SO_BINDTODEVICE,
 					       &if_req, sizeof(if_req));
@@ -1428,9 +1440,9 @@ static int init_listener(void)
 
 		v4 = get_socket(AF_INET);
 		if (v4 < 0) {
-			NET_ERR("Cannot get %s socket (%d %s interfaces). Max sockets is %d",
+			NET_ERR("Cannot get %s socket (%d %s interfaces). Max sockets is %d (%d)",
 				"IPv4", MAX_IPV4_IFACE_COUNT,
-				"IPv4", CONFIG_NET_MAX_CONTEXTS);
+				"IPv4", CONFIG_NET_MAX_CONTEXTS, v4);
 			continue;
 		}
 
@@ -1448,7 +1460,8 @@ static int init_listener(void)
 				ifindex, ret);
 		} else {
 			memset(&if_req, 0, sizeof(if_req));
-			strncpy(if_req.ifr_name, name, sizeof(if_req.ifr_name) - 1);
+			memcpy(if_req.ifr_name, name,
+			       MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1));
 
 			ret = zsock_setsockopt(v4, SOL_SOCKET, SO_BINDTODEVICE,
 					       &if_req, sizeof(if_req));
@@ -1525,7 +1538,7 @@ static int send_unsolicited_response(struct net_if *iface,
 	COND_CODE_1(IS_ENABLED(CONFIG_NET_IPV6),
 		    (struct sockaddr_in6), (struct sockaddr_in)) dst;
 
-	ret = setup_dst_addr(sock, family, (struct sockaddr *)&dst, &dst_len);
+	ret = setup_dst_addr(sock, family, NULL, 0, (struct sockaddr *)&dst, &dst_len);
 	if (ret < 0) {
 		NET_DBG("unable to set up the response address");
 		return ret;
diff --git a/subsys/net/lib/dns/resolve.c b/subsys/net/lib/dns/resolve.c
index 1c80dbf99e26c..813b7cd8f6c49 100644
--- a/subsys/net/lib/dns/resolve.c
+++ b/subsys/net/lib/dns/resolve.c
@@ -25,6 +25,8 @@ LOG_MODULE_REGISTER(net_dns_resolve, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/igmp.h>
+#include <zephyr/net/mld.h>
 #include <zephyr/net/dns_resolve.h>
 #include <zephyr/net/socket_service.h>
 #include "../../ip/net_private.h"
@@ -148,6 +150,34 @@ static bool server_is_llmnr(sa_family_t family, struct sockaddr *addr)
 	return false;
 }
 
+static void join_ipv4_mcast_group(struct net_if *iface, void *user_data)
+{
+	struct sockaddr *addr = user_data;
+	int ret;
+
+	ret = net_ipv4_igmp_join(iface, &net_sin(addr)->sin_addr, NULL);
+	if (ret < 0 && ret != -EALREADY) {
+		NET_DBG("Cannot join %s mDNS group (%d)", "IPv4", ret);
+	} else {
+		NET_DBG("Joined %s mDNS group %s", "IPv4",
+			net_sprint_ipv4_addr(&net_sin(addr)->sin_addr));
+	}
+}
+
+static void join_ipv6_mcast_group(struct net_if *iface, void *user_data)
+{
+	struct sockaddr *addr = user_data;
+	int ret;
+
+	ret = net_ipv6_mld_join(iface, &net_sin6(addr)->sin6_addr);
+	if (ret < 0 && ret != -EALREADY) {
+		NET_DBG("Cannot join %s mDNS group (%d)", "IPv6", ret);
+	} else {
+		NET_DBG("Joined %s mDNS group %s", "IPv6",
+			net_sprint_ipv6_addr(&net_sin6(addr)->sin6_addr));
+	}
+}
+
 static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx)
 {
 	struct sockaddr *addr = &ctx->servers[idx].dns_server;
@@ -180,6 +210,26 @@ static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx)
 				net_sin(addr)->sin_port = htons(53);
 			}
 		}
+
+		/* Join the mDNS multicast group if responder is not enabled,
+		 * because it will join the group itself.
+		 */
+		if (!IS_ENABLED(CONFIG_MDNS_RESPONDER) && ctx->servers[idx].is_mdns) {
+			struct in_addr mcast_addr = { { { 224, 0, 0, 251 } } };
+
+			if (net_sin(addr)->sin_addr.s_addr == mcast_addr.s_addr) {
+				struct net_if *iface;
+
+				iface = net_if_get_by_index(ctx->servers[idx].if_index);
+				if (iface == NULL) {
+					/* Join all interfaces */
+					net_if_foreach(join_ipv4_mcast_group, addr);
+				} else {
+					/* Join specific interface */
+					join_ipv4_mcast_group(iface, addr);
+				}
+			}
+		}
 	} else {
 		ctx->servers[idx].is_mdns = server_is_mdns(AF_INET6, addr);
 		if (!ctx->servers[idx].is_mdns) {
@@ -198,6 +248,25 @@ static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx)
 				net_sin6(addr)->sin6_port = htons(53);
 			}
 		}
+
+		if (!IS_ENABLED(CONFIG_MDNS_RESPONDER) && ctx->servers[idx].is_mdns) {
+			struct in6_addr mcast_addr = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0,
+						0, 0, 0, 0, 0, 0, 0, 0xfb } } };
+
+			if (memcmp(&net_sin6(addr)->sin6_addr, &mcast_addr,
+				   sizeof(struct in6_addr)) == 0) {
+				struct net_if *iface;
+
+				iface = net_if_get_by_index(ctx->servers[idx].if_index);
+				if (iface == NULL) {
+					/* Join all interfaces */
+					net_if_foreach(join_ipv6_mcast_group, addr);
+				} else {
+					/* Join specific interface */
+					join_ipv6_mcast_group(iface, addr);
+				}
+			}
+		}
 	}
 }
 
diff --git a/subsys/net/lib/http/CMakeLists.txt b/subsys/net/lib/http/CMakeLists.txt
index f049b42d103cc..0d8382ea8b160 100644
--- a/subsys/net/lib/http/CMakeLists.txt
+++ b/subsys/net/lib/http/CMakeLists.txt
@@ -16,6 +16,7 @@ zephyr_library_sources_ifdef(CONFIG_HTTP_SERVER http_server_core.c
 						http_server_http2.c
 						http_hpack.c
 						http_huffman.c)
+zephyr_library_sources_ifdef(CONFIG_HTTP_SERVER_COMPRESSION http_compression.c)
 if(CONFIG_HTTP_SERVER AND CONFIG_WEBSOCKET)
   zephyr_library_sources(http_server_ws.c)
   zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
diff --git a/subsys/net/lib/http/Kconfig b/subsys/net/lib/http/Kconfig
index a706f9cbe4c08..a83bb722fe656 100644
--- a/subsys/net/lib/http/Kconfig
+++ b/subsys/net/lib/http/Kconfig
@@ -29,7 +29,7 @@ config HTTP_CLIENT
 	help
 	  HTTP client API
 
-config HTTP_SERVER
+menuconfig HTTP_SERVER
 	bool "HTTP Server [EXPERIMENTAL]"
 	select HTTP_PARSER
 	select HTTP_PARSER_URL
@@ -163,7 +163,8 @@ config HTTP_SERVER_WEBSOCKET
 
 config HTTP_SERVER_RESOURCE_WILDCARD
 	bool "Allow wildcard matching of resources"
-	select FNMATCH
+	# The POSIX_C_LIB_EXT will get fnmatch() support
+	select POSIX_C_LIB_EXT
 	help
 	  Allow user to specify wildcards when setting up resource strings.
 	  This means that instead of specifying multiple resources with exact
@@ -201,6 +202,21 @@ config WEBSOCKET_CONSOLE
 	help
 	  Hidden option that is enabled only when all the necessary options
 	  needed by websocket console are set.
+
+config HTTP_SERVER_COMPRESSION
+	bool "Compression support in HTTP fileserver"
+	help
+	  If enabled, the fileserver will parse the accept-encoding header
+	  from the client and extract the supported compression methods.
+	  Afterwards it will try to serve the first compressed file available
+	  by using the file ending as compression indicator in this order:
+	    1. brotli   -> .br
+	    2. gzip     -> .gz
+	    3. zstd     -> .zst
+	    4. compress -> .lzw
+	    5. deflate  -> .zz
+	    6. File without compression
+
 endif
 
 # Hidden option to avoid having multiple individual options that are ORed together
diff --git a/subsys/net/lib/http/headers/server_internal.h b/subsys/net/lib/http/headers/server_internal.h
index fe8fe37816d4d..1cbd04b0d387d 100644
--- a/subsys/net/lib/http/headers/server_internal.h
+++ b/subsys/net/lib/http/headers/server_internal.h
@@ -36,20 +36,28 @@ int enter_http1_request(struct http_client_ctx *client);
 int enter_http2_request(struct http_client_ctx *client);
 int enter_http_done_state(struct http_client_ctx *client);
 
+/* HTTP Compression handling */
+#define HTTP_COMPRESSION_MAX_STRING_LEN 8
+void http_compression_parse_accept_encoding(const char *accept_encoding, size_t len,
+					    uint8_t *supported_compression);
+const char *http_compression_text(enum http_compression compression);
+int http_compression_from_text(enum http_compression *compression, const char *text);
+bool compression_value_is_valid(enum http_compression compression);
+
 /* Others */
 struct http_resource_detail *get_resource_detail(const struct http_service_desc *service,
 						 const char *path, int *len, bool is_ws);
 int http_server_sendall(struct http_client_ctx *client, const void *buf, size_t len);
 void http_server_get_content_type_from_extension(char *url, char *content_type,
 						 size_t content_type_size);
-int http_server_find_file(char *fname, size_t fname_size, size_t *file_size, bool *gzipped);
+int http_server_find_file(char *fname, size_t fname_size, size_t *file_size,
+			  uint8_t supported_compression, enum http_compression *chosen_compression);
 void http_client_timer_restart(struct http_client_ctx *client);
 bool http_response_is_final(struct http_response_ctx *rsp, enum http_data_status status);
 bool http_response_is_provided(struct http_response_ctx *rsp);
 
 /* TODO Could be static, but currently used in tests. */
-int parse_http_frame_header(struct http_client_ctx *client, const uint8_t *buffer,
-			    size_t buflen);
+int parse_http_frame_header(struct http_client_ctx *client, const uint8_t *buffer, size_t buflen);
 const char *get_frame_type_name(enum http2_frame_type type);
 
 void populate_request_ctx(struct http_request_ctx *req_ctx, uint8_t *data, size_t len,
diff --git a/subsys/net/lib/http/http_client.c b/subsys/net/lib/http/http_client.c
index f97a1707a12d7..c95e970ea1e20 100644
--- a/subsys/net/lib/http/http_client.c
+++ b/subsys/net/lib/http/http_client.c
@@ -502,8 +502,16 @@ static int http_wait_data(int sock, struct http_request *req, const k_timepoint_
 			ret = -errno;
 			goto error;
 		}
-		if (fds[0].revents & (ZSOCK_POLLERR | ZSOCK_POLLNVAL)) {
-			ret = -errno;
+
+		if (fds[0].revents & ZSOCK_POLLERR) {
+			int sock_err;
+			socklen_t optlen = sizeof(sock_err);
+
+			(void)zsock_getsockopt(sock, SOL_SOCKET, SO_ERROR, &sock_err, &optlen);
+			ret = -sock_err;
+			goto error;
+		} else if (fds[0].revents & ZSOCK_POLLNVAL) {
+			ret = -EBADF;
 			goto error;
 		} else if (fds[0].revents & ZSOCK_POLLHUP) {
 			/* Connection closed */
diff --git a/subsys/net/lib/http/http_compression.c b/subsys/net/lib/http/http_compression.c
new file mode 100644
index 0000000000000..d41d4ad7233c2
--- /dev/null
+++ b/subsys/net/lib/http/http_compression.c
@@ -0,0 +1,133 @@
+/** @file
+ * @brief HTTP compression handling functions
+ *
+ * Helper functions to handle compression formats
+ */
+
+/*
+ * Copyright (c) 2025 Endress+Hauser
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdbool.h>
+#include <string.h>
+#include <strings.h>
+
+#include <zephyr/net/http/server.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+
+#include "headers/server_internal.h"
+
+static int http_compression_match(enum http_compression *compression, const char *text,
+				  enum http_compression expected);
+
+void http_compression_parse_accept_encoding(const char *accept_encoding, size_t len,
+					    uint8_t *supported_compression)
+{
+	enum http_compression detected_compression;
+	char strbuf[HTTP_COMPRESSION_MAX_STRING_LEN + 1] = {0};
+	const char *start = accept_encoding;
+	const char *end = NULL;
+	bool priority_string = false;
+
+	*supported_compression = HTTP_NONE;
+	for (size_t i = 0; i < len; i++) {
+		if (accept_encoding[i] == 0) {
+			break;
+		} else if (accept_encoding[i] == ' ') {
+			start = &accept_encoding[i + 1];
+			continue;
+		} else if (accept_encoding[i] == ';') {
+			end = &accept_encoding[i];
+			priority_string = true;
+		} else if (accept_encoding[i] == ',') {
+			if (!priority_string) {
+				end = &accept_encoding[i];
+			}
+			priority_string = false;
+		} else if (i + 1 == len) {
+			end = &accept_encoding[i + 1];
+		}
+
+		if (end == NULL) {
+			continue;
+		}
+
+		if (end - start > HTTP_COMPRESSION_MAX_STRING_LEN) {
+			end = NULL;
+			start = end + 1;
+			continue;
+		}
+
+		memcpy(strbuf, start, end - start);
+		strbuf[end - start] = 0;
+
+		if (http_compression_from_text(&detected_compression, strbuf) == 0) {
+			WRITE_BIT(*supported_compression, detected_compression, true);
+		}
+
+		end = NULL;
+		start = end + 1;
+	}
+}
+
+const char *http_compression_text(enum http_compression compression)
+{
+	switch (compression) {
+	case HTTP_NONE:
+		return "";
+	case HTTP_GZIP:
+		return "gzip";
+	case HTTP_COMPRESS:
+		return "compress";
+	case HTTP_DEFLATE:
+		return "deflate";
+	case HTTP_BR:
+		return "br";
+	case HTTP_ZSTD:
+		return "zstd";
+	}
+	return "";
+}
+
+int http_compression_from_text(enum http_compression *compression, const char *text)
+{
+	__ASSERT_NO_MSG(compression);
+	__ASSERT_NO_MSG(text);
+
+	for (enum http_compression i = 0; compression_value_is_valid(i); ++i) {
+		if (http_compression_match(compression, text, i) == 0) {
+			return 0;
+		}
+	}
+	return 1;
+}
+
+bool compression_value_is_valid(enum http_compression compression)
+{
+	switch (compression) {
+	case HTTP_NONE:
+	case HTTP_GZIP:
+	case HTTP_COMPRESS:
+	case HTTP_DEFLATE:
+	case HTTP_BR:
+	case HTTP_ZSTD:
+		return true;
+	}
+	return false;
+}
+
+static int http_compression_match(enum http_compression *compression, const char *text,
+				  enum http_compression expected)
+{
+	__ASSERT_NO_MSG(compression);
+	__ASSERT_NO_MSG(text);
+
+	if (strcasecmp(http_compression_text(expected), text) == 0) {
+		*compression = expected;
+		return 0;
+	} else {
+		return 1;
+	}
+}
diff --git a/subsys/net/lib/http/http_server_core.c b/subsys/net/lib/http/http_server_core.c
index 52f4a5249a83a..98f651c20b3de 100644
--- a/subsys/net/lib/http/http_server_core.c
+++ b/subsys/net/lib/http/http_server_core.c
@@ -22,6 +22,7 @@
 #include <zephyr/net/tls_credentials.h>
 #include <zephyr/posix/sys/eventfd.h>
 #include <zephyr/posix/fnmatch.h>
+#include <zephyr/sys/util_macro.h>
 
 LOG_MODULE_REGISTER(net_http_server, CONFIG_NET_HTTP_SERVER_LOG_LEVEL);
 
@@ -43,7 +44,6 @@ LOG_MODULE_REGISTER(net_http_server, CONFIG_NET_HTTP_SERVER_LOG_LEVEL);
 #define HTTP_SERVER_SOCK_COUNT (1 + HTTP_SERVER_MAX_SERVICES + HTTP_SERVER_MAX_CLIENTS)
 
 struct http_server_ctx {
-	int num_clients;
 	int listen_fds; /* max value of 1 + MAX_SERVICES */
 
 	/* First pollfd is eventfd that can be used to stop the server,
@@ -227,7 +227,8 @@ int http_server_init(struct http_server_ctx *ctx)
 			*svc->port = ntohs(addr.addr4->sin_port);
 		}
 
-		if (zsock_listen(fd, HTTP_SERVER_MAX_CLIENTS) < 0) {
+		svc->data->num_clients = 0;
+		if (zsock_listen(fd, svc->backlog) < 0) {
 			LOG_ERR("listen: %d", errno);
 			failed++;
 			zsock_close(fd);
@@ -251,7 +252,6 @@ int http_server_init(struct http_server_ctx *ctx)
 	}
 
 	ctx->listen_fds = count;
-	ctx->num_clients = 0;
 
 	return 0;
 }
@@ -355,8 +355,14 @@ void http_server_release_client(struct http_client_ctx *client)
 	k_work_cancel_delayable_sync(&client->inactivity_timer, &sync);
 	client_release_resources(client);
 
-	server_ctx.num_clients--;
+	client->service->data->num_clients--;
 
+	for (i = 0; i < server_ctx.listen_fds; i++) {
+		if (server_ctx.fds[i].fd == *client->service->fd) {
+			server_ctx.fds[i].events = ZSOCK_POLLIN;
+			break;
+		}
+	}
 	for (i = server_ctx.listen_fds; i < ARRAY_SIZE(server_ctx.fds); i++) {
 		if (server_ctx.fds[i].fd == client->fd) {
 			server_ctx.fds[i].fd = INVALID_SOCK;
@@ -612,6 +618,14 @@ static int http_server_run(struct http_server_ctx *ctx)
 
 			/* First check if we have something to accept */
 			if (i < ctx->listen_fds) {
+				service = lookup_service(ctx->fds[i].fd);
+				__ASSERT(NULL != service, "fd not associated with a service");
+
+				if (service->data->num_clients >= service->concurrent) {
+					ctx->fds[i].events = 0;
+					continue;
+				}
+
 				new_socket = accept_new_client(ctx->fds[i].fd);
 				if (new_socket < 0) {
 					ret = -errno;
@@ -619,9 +633,6 @@ static int http_server_run(struct http_server_ctx *ctx)
 					continue;
 				}
 
-				service = lookup_service(ctx->fds[i].fd);
-				__ASSERT(NULL != service, "fd not associated with a service");
-
 				found_slot = false;
 
 				for (j = ctx->listen_fds; j < ARRAY_SIZE(ctx->fds); j++) {
@@ -633,7 +644,7 @@ static int http_server_run(struct http_server_ctx *ctx)
 					ctx->fds[j].events = ZSOCK_POLLIN;
 					ctx->fds[j].revents = 0;
 
-					ctx->num_clients++;
+					service->data->num_clients++;
 
 					LOG_DBG("Init client #%d", j - ctx->listen_fds);
 
@@ -762,7 +773,7 @@ struct http_resource_detail *get_resource_detail(const struct http_service_desc
 
 			ret = fnmatch(resource->resource, path, (FNM_PATHNAME | FNM_LEADING_DIR));
 			if (ret == 0) {
-				*path_len = strlen(resource->resource);
+				*path_len = path_len_without_query(path);
 				return resource->detail;
 			}
 		}
@@ -785,26 +796,65 @@ struct http_resource_detail *get_resource_detail(const struct http_service_desc
 	return NULL;
 }
 
-int http_server_find_file(char *fname, size_t fname_size, size_t *file_size, bool *gzipped)
+int http_server_find_file(char *fname, size_t fname_size, size_t *file_size,
+			  uint8_t supported_compression, enum http_compression *chosen_compression)
 {
 	struct fs_dirent dirent;
 	size_t len;
 	int ret;
 
-	ret = fs_stat(fname, &dirent);
-	if (ret < 0) {
-		len = strlen(fname);
-		snprintk(fname + len, fname_size - len, ".gz");
-		ret = fs_stat(fname, &dirent);
-		*gzipped = (ret == 0);
+	len = strlen(fname);
+	if (IS_ENABLED(CONFIG_HTTP_SERVER_COMPRESSION)) {
+		*chosen_compression = HTTP_NONE;
+		if (IS_BIT_SET(supported_compression, HTTP_BR)) {
+			snprintk(fname + len, fname_size - len, ".br");
+			ret = fs_stat(fname, &dirent);
+			if (ret == 0) {
+				*chosen_compression = HTTP_BR;
+				goto return_filename;
+			}
+		}
+		if (IS_BIT_SET(supported_compression, HTTP_GZIP)) {
+			snprintk(fname + len, fname_size - len, ".gz");
+			ret = fs_stat(fname, &dirent);
+			if (ret == 0) {
+				*chosen_compression = HTTP_GZIP;
+				goto return_filename;
+			}
+		}
+		if (IS_BIT_SET(supported_compression, HTTP_ZSTD)) {
+			snprintk(fname + len, fname_size - len, ".zst");
+			ret = fs_stat(fname, &dirent);
+			if (ret == 0) {
+				*chosen_compression = HTTP_ZSTD;
+				goto return_filename;
+			}
+		}
+		if (IS_BIT_SET(supported_compression, HTTP_COMPRESS)) {
+			snprintk(fname + len, fname_size - len, ".lzw");
+			ret = fs_stat(fname, &dirent);
+			if (ret == 0) {
+				*chosen_compression = HTTP_COMPRESS;
+				goto return_filename;
+			}
+		}
+		if (IS_BIT_SET(supported_compression, HTTP_DEFLATE)) {
+			snprintk(fname + len, fname_size - len, ".zz");
+			ret = fs_stat(fname, &dirent);
+			if (ret == 0) {
+				*chosen_compression = HTTP_DEFLATE;
+				goto return_filename;
+			}
+		}
 	}
-
-	if (ret == 0) {
-		*file_size = dirent.size;
-		return ret;
+	ret = fs_stat(fname, &dirent);
+	if (ret != 0) {
+		return -ENOENT;
 	}
 
-	return -ENOENT;
+return_filename:
+	*file_size = dirent.size;
+	return ret;
 }
 
 void http_server_get_content_type_from_extension(char *url, char *content_type,
diff --git a/subsys/net/lib/http/http_server_http1.c b/subsys/net/lib/http/http_server_http1.c
index 4474b1773276b..399ea8b8efdf2 100644
--- a/subsys/net/lib/http/http_server_http1.c
+++ b/subsys/net/lib/http/http_server_http1.c
@@ -19,6 +19,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/http/service.h>
+#include <zephyr/net/http/server.h>
 
 LOG_MODULE_DECLARE(net_http_server, CONFIG_NET_HTTP_SERVER_LOG_LEVEL);
 
@@ -468,13 +469,26 @@ static int dynamic_post_put_req(struct http_resource_detail_dynamic *dynamic_det
 int handle_http1_static_fs_resource(struct http_resource_detail_static_fs *static_fs_detail,
 				    struct http_client_ctx *client)
 {
-#define RESPONSE_TEMPLATE_STATIC_FS				\
-	"HTTP/1.1 200 OK\r\n"					\
-	"Content-Length: %zd\r\n"				\
-	"Content-Type: %s%s\r\n\r\n"
-#define CONTENT_ENCODING_GZIP "\r\nContent-Encoding: gzip"
-
-	bool gzipped = false;
+#define RESPONSE_TEMPLATE_STATIC_FS                                                                \
+	"HTTP/1.1 200 OK\r\n"                                                                      \
+	"Content-Length: %zd\r\n"                                                                  \
+	"Content-Type: %s%s%s\r\n\r\n"
+#define CONTENT_ENCODING_HEADER "\r\nContent-Encoding: "
+/* Add couple of bytes to response template size to have space
+ * for the content type and encoding
+ */
+#define STATIC_FS_RESPONSE_BASE_SIZE                                                               \
+	sizeof(RESPONSE_TEMPLATE_STATIC_FS) + HTTP_SERVER_MAX_CONTENT_TYPE_LEN +                   \
+		sizeof("Content-Length: 01234567890123456789\r\n")
+#define CONTENT_ENCODING_HEADER_SIZE                                                               \
+	sizeof(CONTENT_ENCODING_HEADER) + HTTP_COMPRESSION_MAX_STRING_LEN + sizeof("\r\n")
+#define STATIC_FS_RESPONSE_SIZE                                                                    \
+	COND_CODE_1(                                                                               \
+		IS_ENABLED(CONFIG_HTTP_SERVER_COMPRESSION),                                        \
+		(STATIC_FS_RESPONSE_BASE_SIZE + CONTENT_ENCODING_HEADER_SIZE),                     \
+		(STATIC_FS_RESPONSE_BASE_SIZE))
+
+	enum http_compression chosen_compression = 0;
 	int len;
 	int remaining;
 	int ret;
@@ -482,12 +496,7 @@ int handle_http1_static_fs_resource(struct http_resource_detail_static_fs *stati
 	struct fs_file_t file;
 	char fname[HTTP_SERVER_MAX_URL_LENGTH];
 	char content_type[HTTP_SERVER_MAX_CONTENT_TYPE_LEN] = "text/html";
-	/* Add couple of bytes to response template size to have space
-	 * for the content type and encoding
-	 */
-	char http_response[sizeof(RESPONSE_TEMPLATE_STATIC_FS) + HTTP_SERVER_MAX_CONTENT_TYPE_LEN +
-			   sizeof("Content-Length: 01234567890123456789\r\n") +
-			   sizeof(CONTENT_ENCODING_GZIP)];
+	char http_response[STATIC_FS_RESPONSE_SIZE];
 
 	if (client->method != HTTP_GET) {
 		return send_http1_405(client);
@@ -506,7 +515,12 @@ int handle_http1_static_fs_resource(struct http_resource_detail_static_fs *stati
 	}
 
 	/* open file, if it exists */
-	ret = http_server_find_file(fname, sizeof(fname), &file_size, &gzipped);
+#ifdef CONFIG_HTTP_SERVER_COMPRESSION
+	ret = http_server_find_file(fname, sizeof(fname), &file_size, client->supported_compression,
+			    &chosen_compression);
+#else
+	ret = http_server_find_file(fname, sizeof(fname), &file_size, 0, NULL);
+#endif /* CONFIG_HTTP_SERVER_COMPRESSION */
 	if (ret < 0) {
 		LOG_ERR("fs_stat %s: %d", fname, ret);
 		return send_http1_404(client);
@@ -523,8 +537,15 @@ int handle_http1_static_fs_resource(struct http_resource_detail_static_fs *stati
 	LOG_DBG("found %s, file size: %zu", fname, file_size);
 
 	/* send HTTP header */
-	len = snprintk(http_response, sizeof(http_response), RESPONSE_TEMPLATE_STATIC_FS,
-		       file_size, content_type, gzipped ? CONTENT_ENCODING_GZIP : "");
+	if (IS_ENABLED(CONFIG_HTTP_SERVER_COMPRESSION) &&
+	    http_compression_text(chosen_compression)[0] != 0) {
+		len = snprintk(http_response, sizeof(http_response), RESPONSE_TEMPLATE_STATIC_FS,
+			       file_size, content_type, CONTENT_ENCODING_HEADER,
+			       http_compression_text(chosen_compression));
+	} else {
+		len = snprintk(http_response, sizeof(http_response), RESPONSE_TEMPLATE_STATIC_FS,
+			       file_size, content_type, "", "");
+	}
 	ret = http_server_sendall(client, http_response, len);
 	if (ret < 0) {
 		goto close;
@@ -657,7 +678,7 @@ static void check_user_request_headers(struct http_header_capture_ctx *ctx, cons
 				break;
 			}
 
-			strcpy(dest, header->name);
+			memcpy(dest, header->name, header_len + 1);
 
 			ctx->headers[ctx->count].name = dest;
 			ctx->cursor += (header_len + 1);
@@ -698,6 +719,11 @@ static int on_header_field(struct http_parser *parser, const char *at,
 			} else if (strcasecmp(ctx->header_buffer, "Sec-WebSocket-Key") == 0) {
 				ctx->websocket_sec_key_next = true;
 			}
+#ifdef CONFIG_HTTP_SERVER_COMPRESSION
+			else if (strcasecmp(ctx->header_buffer, "Accept-Encoding") == 0) {
+				ctx->accept_encoding_next = true;
+			}
+#endif /* CONFIG_HTTP_SERVER_COMPRESSION */
 
 			ctx->header_buffer[0] = '\0';
 		}
@@ -730,7 +756,7 @@ static void populate_user_request_header(struct http_header_capture_ctx *ctx, co
 	}
 
 	dest = &ctx->buffer[ctx->cursor];
-	strcpy(dest, buf);
+	memcpy(dest, buf, value_len + 1);
 	ctx->cursor += (value_len + 1);
 
 	ctx->headers[ctx->count].value = dest;
@@ -783,6 +809,13 @@ static int on_header_value(struct http_parser *parser,
 #endif
 				ctx->websocket_sec_key_next = false;
 			}
+#ifdef CONFIG_HTTP_SERVER_COMPRESSION
+			if (ctx->accept_encoding_next) {
+				http_compression_parse_accept_encoding(ctx->header_buffer, offset,
+								       &ctx->supported_compression);
+				ctx->accept_encoding_next = false;
+			}
+#endif /* CONFIG_HTTP_SERVER_COMPRESSION */
 
 			ctx->header_buffer[0] = '\0';
 		}
diff --git a/subsys/net/lib/http/http_server_http2.c b/subsys/net/lib/http/http_server_http2.c
index 090fd53b1e03b..fad55b6265e39 100644
--- a/subsys/net/lib/http/http_server_http2.c
+++ b/subsys/net/lib/http/http_server_http2.c
@@ -17,6 +17,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/http/service.h>
+#include <zephyr/net/http/server.h>
 
 LOG_MODULE_DECLARE(net_http_server, CONFIG_NET_HTTP_SERVER_LOG_LEVEL);
 
@@ -449,6 +450,7 @@ static int handle_http2_static_resource(
 	return ret;
 }
 
+#if defined(CONFIG_FILE_SYSTEM)
 static int handle_http2_static_fs_resource(struct http_resource_detail_static_fs *static_fs_detail,
 					   struct http2_frame *frame,
 					   struct http_client_ctx *client)
@@ -464,7 +466,7 @@ static int handle_http2_static_fs_resource(struct http_resource_detail_static_fs
 		.path_len = static_fs_detail->common.path_len,
 		.type = static_fs_detail->common.type,
 	};
-	bool gzipped;
+	enum http_compression chosen_compression = 0;
 	int len;
 	int remaining;
 	char tmp[64];
@@ -490,7 +492,12 @@ static int handle_http2_static_fs_resource(struct http_resource_detail_static_fs
 	}
 
 	/* open file, if it exists */
-	ret = http_server_find_file(fname, sizeof(fname), &client->data_len, &gzipped);
+#ifdef CONFIG_HTTP_SERVER_COMPRESSION
+	ret = http_server_find_file(fname, sizeof(fname), &client->data_len,
+					client->supported_compression, &chosen_compression);
+#else
+	ret = http_server_find_file(fname, sizeof(fname), &client->data_len, 0, NULL);
+#endif /* CONFIG_HTTP_SERVER_COMPRESSION */
 	if (ret < 0) {
 		LOG_ERR("fs_stat %s: %d", fname, ret);
 
@@ -511,8 +518,8 @@ static int handle_http2_static_fs_resource(struct http_resource_detail_static_fs
 	}
 
 	/* send headers */
-	if (gzipped) {
-		res_detail.content_encoding = "gzip";
+	if (IS_ENABLED(CONFIG_HTTP_SERVER_COMPRESSION)) {
+		res_detail.content_encoding = http_compression_text(chosen_compression);
 	}
 	ret = send_headers_frame(client, HTTP_200_OK, frame->stream_identifier, &res_detail, 0,
 				 NULL, 0);
@@ -547,6 +554,7 @@ static int handle_http2_static_fs_resource(struct http_resource_detail_static_fs
 
 	return ret;
 }
+#endif /* CONFIG_FILE_SYSTEM */
 
 static int http2_dynamic_response(struct http_client_ctx *client, struct http2_frame *frame,
 				  struct http_response_ctx *rsp, enum http_data_status data_status,
@@ -1094,12 +1102,14 @@ int handle_http1_to_http2_upgrade(struct http_client_ctx *client)
 			if (ret < 0) {
 				goto error;
 			}
+#if defined(CONFIG_FILE_SYSTEM)
 		} else if (detail->type == HTTP_RESOURCE_TYPE_STATIC_FS) {
 			ret = handle_http2_static_fs_resource(
 				(struct http_resource_detail_static_fs *)detail, frame, client);
 			if (ret < 0) {
 				goto error;
 			}
+#endif
 		} else if (detail->type == HTTP_RESOURCE_TYPE_DYNAMIC) {
 			ret = handle_http2_dynamic_resource(
 				(struct http_resource_detail_dynamic *)detail,
@@ -1387,7 +1397,15 @@ static int process_header(struct http_client_ctx *client,
 		}
 
 		client->content_len = (size_t)len;
-	} else {
+	}
+#ifdef CONFIG_HTTP_SERVER_COMPRESSION
+	else if (header->name_len == (sizeof("accept-encoding") - 1) &&
+		 memcmp(header->name, "accept-encoding", header->name_len) == 0) {
+		http_compression_parse_accept_encoding(header->value, header->value_len,
+						       &client->supported_compression);
+	}
+#endif /* CONFIG_HTTP_SERVER_COMPRESSION */
+	else {
 		/* Just ignore for now. */
 		LOG_DBG("Ignoring field %.*s", (int)header->name_len, header->name);
 	}
@@ -1594,12 +1612,14 @@ int handle_http_frame_headers(struct http_client_ctx *client)
 			if (ret < 0) {
 				goto error;
 			}
+#if defined(CONFIG_FILE_SYSTEM)
 		} else if (detail->type == HTTP_RESOURCE_TYPE_STATIC_FS) {
 			ret = handle_http2_static_fs_resource(
 				(struct http_resource_detail_static_fs *)detail, frame, client);
 			if (ret < 0) {
 				goto error;
 			}
+#endif
 		} else if (detail->type == HTTP_RESOURCE_TYPE_DYNAMIC) {
 			ret = handle_http2_dynamic_resource(
 				(struct http_resource_detail_dynamic *)detail,
diff --git a/subsys/net/lib/lwm2m/Kconfig b/subsys/net/lib/lwm2m/Kconfig
index 3878e906691ab..206b6d4c38037 100644
--- a/subsys/net/lib/lwm2m/Kconfig
+++ b/subsys/net/lib/lwm2m/Kconfig
@@ -273,25 +273,25 @@ config LWM2M_ENGINE_MAX_MESSAGES
 
 config LWM2M_COAP_BLOCK_SIZE
 	int "LWM2M CoAP block-wise transfer size"
-	default 256
+	default 512
 	range 64 1024
 	help
 	  CoAP block size used by LwM2M when performing block-wise
 	  transfers. Possible values: 64, 128, 256, 512 and 1024.
-
-config LWM2M_ENGINE_MESSAGE_HEADER_SIZE
-	int "Room for CoAP header data"
-	default 48
-	range 24 128
-	help
-	  Extra room allocated to handle CoAP header data
+	  When adjusting the value, ensure that LWM2M_COAP_MAX_MSG_SIZE is large enough
+	  to fit all CoAP headers and full block size.
 
 config LWM2M_COAP_MAX_MSG_SIZE
 	int "LWM2M CoAP maximum message size"
-	default LWM2M_COAP_BLOCK_SIZE
-	help
-	  CoAP message size used by LWM2M. Minimum is the block size used
-	  in blockwise transfers.
+	default 1232 if !LWM2M_DTLS_SUPPORT
+	default 1195 if LWM2M_DTLS_SUPPORT && !LWM2M_DTLS_CID
+	default 1187 if LWM2M_DTLS_SUPPORT && LWM2M_DTLS_CID
+	help
+	  CoAP message size used by LWM2M. Default is the maximum
+	  packet size for IPv6 network (MTU(1280)-IPv6(40)-UDP(8)-DTLS(29..53)).
+	  If the network has a smaller MTU, this value should be adjusted accordingly.
+	  If CoAP block-wise transfer is enabled, this value should be larger than
+	  the block size and estimated CoAP header sizes.
 
 config LWM2M_ENGINE_VALIDATION_BUFFER_SIZE
 	int "Size of the validation buffer for the incoming data"
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 70ca2f52f74d0..26c0585b3ad10 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -922,7 +922,7 @@ static void delete_tls_credentials(sec_tag_t tag)
 {
 	tls_credential_delete(tag, TLS_CREDENTIAL_PSK_ID);
 	tls_credential_delete(tag, TLS_CREDENTIAL_PSK);
-	tls_credential_delete(tag, TLS_CREDENTIAL_SERVER_CERTIFICATE);
+	tls_credential_delete(tag, TLS_CREDENTIAL_PUBLIC_CERTIFICATE);
 	tls_credential_delete(tag, TLS_CREDENTIAL_PRIVATE_KEY);
 	tls_credential_delete(tag, TLS_CREDENTIAL_CA_CERTIFICATE);
 }
@@ -1003,7 +1003,7 @@ static int lwm2m_load_x509_credentials(struct lwm2m_ctx *ctx)
 
 	delete_tls_credentials(ctx->tls_tag);
 
-	ret = load_tls_type(ctx, 3, TLS_CREDENTIAL_SERVER_CERTIFICATE);
+	ret = load_tls_type(ctx, 3, TLS_CREDENTIAL_PUBLIC_CERTIFICATE);
 	if (ret < 0) {
 		return ret;
 	}
diff --git a/subsys/net/lib/lwm2m/lwm2m_message_handling.c b/subsys/net/lib/lwm2m/lwm2m_message_handling.c
index f56d7d5eef0c0..1725661fe17d6 100644
--- a/subsys/net/lib/lwm2m/lwm2m_message_handling.c
+++ b/subsys/net/lib/lwm2m/lwm2m_message_handling.c
@@ -383,6 +383,7 @@ STATIC int build_msg_block_for_send(struct lwm2m_message *msg, uint16_t block_nu
 	ret = buf_append(CPKT_BUF_WRITE(&msg->cpkt),
 			 complete_payload + (block_num * block_size_bytes), payload_size);
 	if (ret < 0) {
+		LOG_ERR("CoAP message size overflow");
 		return ret;
 	}
 
@@ -392,19 +393,16 @@ STATIC int build_msg_block_for_send(struct lwm2m_message *msg, uint16_t block_nu
 STATIC int prepare_msg_for_send(struct lwm2m_message *msg)
 {
 	int ret;
-	uint16_t len;
-	const uint8_t *payload;
-
 	/* save the big buffer for later use (splitting blocks) */
 	msg->body_encode_buffer = msg->cpkt;
 
 	/* set the default (small) buffer for sending blocks */
 	msg->cpkt.data = msg->msg_data;
 	msg->cpkt.offset = 0;
-	msg->cpkt.max_len = MAX_PACKET_SIZE;
+	msg->cpkt.max_len = sizeof(msg->msg_data);
 
-	payload = coap_packet_get_payload(&msg->body_encode_buffer, &len);
-	if (len <= CONFIG_LWM2M_COAP_MAX_MSG_SIZE) {
+	/* Can we fit a whole message into one frame */
+	if (msg->body_encode_buffer.offset <= msg->cpkt.max_len) {
 
 		/* copy the packet */
 		ret = buf_append(CPKT_BUF_WRITE(&msg->cpkt), msg->body_encode_buffer.data,
@@ -422,6 +420,9 @@ STATIC int prepare_msg_for_send(struct lwm2m_message *msg)
 
 		NET_ASSERT(msg->out.block_ctx == NULL, "Expecting to have no context to release");
 	} else {
+		uint16_t len;
+		const uint8_t *payload = coap_packet_get_payload(&msg->body_encode_buffer, &len);
+
 		/* Before splitting the content, append Etag option to protect the integrity of
 		 * the payload.
 		 */
@@ -461,6 +462,9 @@ void lwm2m_engine_context_close(struct lwm2m_ctx *client_ctx)
 
 	for (i = 0, msg = messages; i < ARRAY_SIZE(messages); i++, msg++) {
 		if (msg->ctx == client_ctx) {
+			if (msg->send_status_cb) {
+				msg->send_status_cb(LWM2M_SEND_STATUS_FAILURE);
+			}
 			lwm2m_reset_message(msg, true);
 		}
 	}
@@ -1403,9 +1407,7 @@ static int lwm2m_read_cached_data(struct lwm2m_message *msg,
 		read_info = &msg->cache_info->read_info[msg->cache_info->entry_size];
 		/* Store original timeseries ring buffer get states for failure handling */
 		read_info->cache_data = cached_data;
-		read_info->original_get_base = cached_data->rb.get_base;
-		read_info->original_get_head = cached_data->rb.get_head;
-		read_info->original_get_tail = cached_data->rb.get_tail;
+		read_info->original_rb_get = cached_data->rb.get;
 		msg->cache_info->entry_size++;
 		if (msg->cache_info->entry_limit) {
 			length = MIN(length, msg->cache_info->entry_limit);
@@ -3079,12 +3081,8 @@ static bool lwm2m_timeseries_data_rebuild(struct lwm2m_message *msg, int error_c
 
 	/* Put Ring buffer back to original */
 	for (int i = 0; i < cache_temp->entry_size; i++) {
-		cache_temp->read_info[i].cache_data->rb.get_head =
-			cache_temp->read_info[i].original_get_head;
-		cache_temp->read_info[i].cache_data->rb.get_tail =
-			cache_temp->read_info[i].original_get_tail;
-		cache_temp->read_info[i].cache_data->rb.get_base =
-			cache_temp->read_info[i].original_get_base;
+		cache_temp->read_info[i].cache_data->rb.get =
+			cache_temp->read_info[i].original_rb_get;
 	}
 
 	if (cache_temp->entry_limit) {
@@ -3501,7 +3499,6 @@ static void do_send_timeout_cb(struct lwm2m_message *msg)
 	LOG_WRN("Send Timeout");
 	lwm2m_rd_client_timeout(msg->ctx);
 }
-#endif
 
 #if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
 static bool init_next_pending_timeseries_data(struct lwm2m_cache_read_info *cache_temp,
@@ -3535,7 +3532,8 @@ static bool init_next_pending_timeseries_data(struct lwm2m_cache_read_info *cach
 	cache_temp->entry_limit = 0;
 	return true;
 }
-#endif
+#endif /* CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT */
+#endif /* CONFIG_LWM2M_VERSION_1_1 */
 
 int lwm2m_send_cb(struct lwm2m_ctx *ctx, const struct lwm2m_obj_path path_list[],
 			 uint8_t path_list_size, lwm2m_send_cb_t reply_cb)
diff --git a/subsys/net/lib/lwm2m/lwm2m_object.h b/subsys/net/lib/lwm2m/lwm2m_object.h
index e8a9d71825efd..79a63f43ce869 100644
--- a/subsys/net/lib/lwm2m/lwm2m_object.h
+++ b/subsys/net/lib/lwm2m/lwm2m_object.h
@@ -131,15 +131,12 @@
 
 BUILD_ASSERT(CONFIG_LWM2M_COAP_BLOCK_SIZE <= CONFIG_LWM2M_COAP_MAX_MSG_SIZE,
 	     "CoAP block size can't exceed maximum message size");
-
-#define MAX_PACKET_SIZE		(CONFIG_LWM2M_COAP_MAX_MSG_SIZE + \
-				 CONFIG_LWM2M_ENGINE_MESSAGE_HEADER_SIZE)
-
-#if defined(CONFIG_LWM2M_COAP_BLOCK_TRANSFER)
-BUILD_ASSERT(CONFIG_LWM2M_COAP_ENCODE_BUFFER_SIZE >
-		     (CONFIG_LWM2M_COAP_BLOCK_SIZE + CONFIG_LWM2M_ENGINE_MESSAGE_HEADER_SIZE),
-	     "The buffer for serializing message needs to be bigger than a message with one block");
-#endif
+BUILD_ASSERT(CONFIG_LWM2M_COAP_BLOCK_SIZE == 64 ||
+	     CONFIG_LWM2M_COAP_BLOCK_SIZE == 128 ||
+	     CONFIG_LWM2M_COAP_BLOCK_SIZE == 256 ||
+	     CONFIG_LWM2M_COAP_BLOCK_SIZE == 512 ||
+	     CONFIG_LWM2M_COAP_BLOCK_SIZE == 1024,
+	     "CoAP block must be 64, 128, 256, 512 or 1024");
 
 /* buffer util macros */
 #define CPKT_BUF_WRITE(cpkt)	(cpkt)->data, &(cpkt)->offset, (cpkt)->max_len
@@ -494,7 +491,7 @@ struct lwm2m_message {
 	struct coap_packet cpkt;
 
 	/** Buffer data related outgoing message */
-	uint8_t msg_data[MAX_PACKET_SIZE];
+	uint8_t msg_data[CONFIG_LWM2M_COAP_MAX_MSG_SIZE];
 
 #if defined(CONFIG_LWM2M_COAP_BLOCK_TRANSFER)
 	/** Buffer data containing complete message */
diff --git a/subsys/net/lib/lwm2m/lwm2m_rd_client.c b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
index df111288553b8..8054340281fa9 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rd_client.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
@@ -838,10 +838,14 @@ static void sm_do_bootstrap_reg(void)
 void engine_bootstrap_finish(void)
 {
 	LOG_INF("Bootstrap data transfer done!");
-	/* Delay the state transition, so engine have some time to send ACK
-	 * before we close the socket
+	/* Transition only if the client is bootstrapping, otherwise retransmissions of bootstrap
+	 * finish may restart an already registered client.
+	 * Delay the state transition, so engine have some time to send ACK before we close the
+	 * socket.
 	 */
-	set_sm_state_delayed(ENGINE_BOOTSTRAP_TRANS_DONE, DELAY_BEFORE_CLOSING);
+	if (get_sm_state() == ENGINE_BOOTSTRAP_REG_DONE) {
+		set_sm_state_delayed(ENGINE_BOOTSTRAP_TRANS_DONE, DELAY_BEFORE_CLOSING);
+	}
 }
 
 static int sm_bootstrap_trans_done(void)
diff --git a/subsys/net/lib/lwm2m/lwm2m_registry.c b/subsys/net/lib/lwm2m/lwm2m_registry.c
index 372b57264c3f2..5f94e4bbd97e5 100644
--- a/subsys/net/lib/lwm2m/lwm2m_registry.c
+++ b/subsys/net/lib/lwm2m/lwm2m_registry.c
@@ -1723,13 +1723,11 @@ size_t lwm2m_cache_size(const struct lwm2m_time_series_resource *cache_entry)
 #if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
 	uint32_t bytes_available;
 
-	/* ring_buf_is_empty() takes non-const pointer but still does not modify */
-	if (ring_buf_is_empty((struct ring_buf *) &cache_entry->rb)) {
+	if (ring_buf_is_empty(&cache_entry->rb)) {
 		return 0;
 	}
 
-	/* ring_buf_size_get() takes non-const pointer but still does not modify */
-	bytes_available = ring_buf_size_get((struct ring_buf *) &cache_entry->rb);
+	bytes_available = ring_buf_size_get(&cache_entry->rb);
 
 	return (bytes_available / sizeof(struct lwm2m_time_series_elem));
 #else
diff --git a/subsys/net/lib/lwm2m/lwm2m_registry.h b/subsys/net/lib/lwm2m/lwm2m_registry.h
index 3489c0c3fc85a..6c876551bf552 100644
--- a/subsys/net/lib/lwm2m/lwm2m_registry.h
+++ b/subsys/net/lib/lwm2m/lwm2m_registry.h
@@ -219,9 +219,7 @@ struct lwm2m_time_series_resource {
 
 struct lwm2m_cache_read_entry {
 	struct lwm2m_time_series_resource *cache_data;
-	int32_t original_get_head;
-	int32_t original_get_tail;
-	int32_t original_get_base;
+	struct ring_buf_index original_rb_get;
 };
 
 struct lwm2m_cache_read_info {
diff --git a/subsys/net/lib/mqtt/Kconfig b/subsys/net/lib/mqtt/Kconfig
index 11e59b527e992..6257e0d2b0699 100644
--- a/subsys/net/lib/mqtt/Kconfig
+++ b/subsys/net/lib/mqtt/Kconfig
@@ -17,6 +17,29 @@ module-str=Log level for MQTT
 module-help=Enables mqtt debug messages.
 source "subsys/net/Kconfig.template.log_config.net"
 
+choice MQTT_VERSION_SUPPORT
+	prompt "Maximum MQTT protocol version supported"
+	default MQTT_VERSION_3_1_1
+	help
+	  Maximum MQTT protocol version supported by the library.
+
+config MQTT_VERSION_3_1_1
+	bool "Support up to version 3.1.1 of the MQTT protocol"
+	help
+	  The MQTT version 3.1.1 will be the default library choice. Applications
+	  will still be able to choose to use an older MQTT protocol version
+	  with respective runtime MQTT client configuration.
+
+config MQTT_VERSION_5_0
+	bool "Support up to version 5.0 of the MQTT protocol [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  The MQTT version 5.0 will be the default library choice. Applications
+	  will still be able to choose to use an older MQTT protocol version
+	  with respective runtime MQTT client configuration.
+
+endchoice
+
 config MQTT_KEEPALIVE
 	int "Maximum number of clients Keep alive time for MQTT (in seconds)"
 	default 60
@@ -58,4 +81,39 @@ config MQTT_CLEAN_SESSION
 	  the client. Setting this flag to 0 allows the client to create a
 	  persistent session.
 
+#if MQTT_VERSION_5_0
+
+config MQTT_USER_PROPERTIES_MAX
+	int "Maximum number of user properties in a packet"
+	default 1
+	range 1 $(UINT16_MAX)
+	help
+	  Maximum number of user properties that the client can include in a
+	  packet or parse on input.
+
+config MQTT_SUBSCRIPTION_ID_PROPERTIES_MAX
+	int "Maximum number of Subscription ID properties in a Publish packet"
+	default 1
+	range 1 32
+	help
+	  Maximum number of Subscription ID properties that the client can
+	  parse when processing Publish message.
+
+config MQTT_TOPIC_ALIAS_MAX
+	int "Maximum number of supported topic aliases"
+	default 5
+	range 0 $(UINT16_MAX)
+	help
+	  Maximum number of supported topic aliases used in PUBLISH packets.
+	  If set to 0, topic aliasing is disabled.
+
+config MQTT_TOPIC_ALIAS_STRING_MAX
+	int "The longest topic name that can be aliased"
+	default 64
+	range 8 $(UINT16_MAX)
+	help
+	  Specifies a size of a buffer for storing aliased topics.
+
+#endif # MQTT_VERSION_5_0
+
 endif # MQTT_LIB
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index 1b8d31280ba15..3af78b13f015c 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -46,8 +46,7 @@ void event_notify(struct mqtt_client *client, const struct mqtt_evt *evt)
 	}
 }
 
-static void client_disconnect(struct mqtt_client *client, int result,
-			      bool notify)
+void mqtt_client_disconnect(struct mqtt_client *client, int result, bool notify)
 {
 	int err_code;
 
@@ -105,10 +104,62 @@ static int client_connect(struct mqtt_client *client)
 	return 0;
 
 error:
-	client_disconnect(client, err_code, false);
+	mqtt_client_disconnect(client, err_code, false);
 	return err_code;
 }
 
+static int client_write(struct mqtt_client *client, const uint8_t *data,
+			uint32_t datalen);
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static void disconnect_5_0_notify(struct mqtt_client *client, int err)
+{
+	struct mqtt_disconnect_param param = { };
+	struct buf_ctx packet;
+
+	/* Parser might've set custom failure reason, in such case skip generic
+	 * mapping from errno to reason code.
+	 */
+	if (client->internal.disconnect_reason != MQTT_DISCONNECT_NORMAL) {
+		param.reason_code = client->internal.disconnect_reason;
+	} else {
+		switch (err) {
+		case ECONNREFUSED:
+		case ENOTCONN:
+			/* Connection rejected/closed, skip disconnect. */
+			return;
+		case EINVAL:
+			param.reason_code = MQTT_DISCONNECT_MALFORMED_PACKET;
+			break;
+		case EBADMSG:
+			param.reason_code = MQTT_DISCONNECT_PROTOCOL_ERROR;
+			break;
+		case ENOMEM:
+			param.reason_code = MQTT_DISCONNECT_PACKET_TOO_LARGE;
+			break;
+		default:
+			param.reason_code = MQTT_DISCONNECT_UNSPECIFIED_ERROR;
+			break;
+		}
+	}
+
+	tx_buf_init(client, &packet);
+
+	if (disconnect_encode(client, &param, &packet) < 0) {
+		return;
+	}
+
+	(void)client_write(client, packet.cur, packet.end - packet.cur);
+}
+#else
+static void disconnect_5_0_notify(struct mqtt_client *client, int err)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(err);
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+
 static int client_read(struct mqtt_client *client)
 {
 	int err_code;
@@ -119,7 +170,12 @@ static int client_read(struct mqtt_client *client)
 
 	err_code = mqtt_handle_rx(client);
 	if (err_code < 0) {
-		client_disconnect(client, err_code, true);
+		if (mqtt_is_version_5_0(client)) {
+			/* Best effort send, if it fails just shut the connection. */
+			disconnect_5_0_notify(client, -err_code);
+		}
+
+		mqtt_client_disconnect(client, err_code, true);
 	}
 
 	return err_code;
@@ -136,7 +192,7 @@ static int client_write(struct mqtt_client *client, const uint8_t *data,
 	if (err_code < 0) {
 		NET_ERR("Transport write failed, err_code = %d, "
 			 "closing connection", err_code);
-		client_disconnect(client, err_code, true);
+		mqtt_client_disconnect(client, err_code, true);
 		return err_code;
 	}
 
@@ -157,7 +213,7 @@ static int client_write_msg(struct mqtt_client *client,
 	if (err_code < 0) {
 		NET_ERR("Transport write failed, err_code = %d, "
 			 "closing connection", err_code);
-		client_disconnect(client, err_code, true);
+		mqtt_client_disconnect(client, err_code, true);
 		return err_code;
 	}
 
@@ -176,7 +232,8 @@ void mqtt_client_init(struct mqtt_client *client)
 	MQTT_STATE_INIT(client);
 	mqtt_mutex_init(client);
 
-	client->protocol_version = MQTT_VERSION_3_1_1;
+	client->protocol_version = IS_ENABLED(CONFIG_MQTT_VERSION_5_0) ?
+				   MQTT_VERSION_5_0 : MQTT_VERSION_3_1_1;
 	client->clean_session = MQTT_CLEAN_SESSION;
 	client->keepalive = MQTT_KEEPALIVE;
 }
@@ -261,7 +318,7 @@ int mqtt_publish(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_encode(param, &packet);
+	err_code = publish_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -308,7 +365,7 @@ int mqtt_publish_qos1_ack(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_ack_encode(param, &packet);
+	err_code = publish_ack_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -345,7 +402,7 @@ int mqtt_publish_qos2_receive(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_receive_encode(param, &packet);
+	err_code = publish_receive_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -382,7 +439,7 @@ int mqtt_publish_qos2_release(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_release_encode(param, &packet);
+	err_code = publish_release_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -419,7 +476,7 @@ int mqtt_publish_qos2_complete(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = publish_complete_encode(param, &packet);
+	err_code = publish_complete_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -438,7 +495,8 @@ int mqtt_publish_qos2_complete(struct mqtt_client *client,
 	return err_code;
 }
 
-int mqtt_disconnect(struct mqtt_client *client)
+int mqtt_disconnect(struct mqtt_client *client,
+		    const struct mqtt_disconnect_param *param)
 {
 	int err_code;
 	struct buf_ctx packet;
@@ -454,7 +512,7 @@ int mqtt_disconnect(struct mqtt_client *client)
 		goto error;
 	}
 
-	err_code = disconnect_encode(&packet);
+	err_code = disconnect_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -464,7 +522,7 @@ int mqtt_disconnect(struct mqtt_client *client)
 		goto error;
 	}
 
-	client_disconnect(client, 0, true);
+	mqtt_client_disconnect(client, 0, true);
 
 error:
 	mqtt_mutex_unlock(client);
@@ -494,7 +552,7 @@ int mqtt_subscribe(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = subscribe_encode(param, &packet);
+	err_code = subscribe_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -528,7 +586,7 @@ int mqtt_unsubscribe(struct mqtt_client *client,
 		goto error;
 	}
 
-	err_code = unsubscribe_encode(param, &packet);
+	err_code = unsubscribe_encode(client, param, &packet);
 	if (err_code < 0) {
 		goto error;
 	}
@@ -576,6 +634,58 @@ int mqtt_ping(struct mqtt_client *client)
 	return err_code;
 }
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int verify_auth_state(const struct mqtt_client *client)
+{
+	/* Enhanced authentication is only allowed when connecting at MQTT
+	 * level (before CONNACK is received).
+	 */
+	if (MQTT_HAS_STATE(client, MQTT_STATE_TCP_CONNECTED) &&
+	    !MQTT_HAS_STATE(client, MQTT_STATE_CONNECTED)) {
+		return 0;
+	}
+
+	/* Return generic protocol error */
+	return -EPROTO;
+}
+
+int mqtt_auth(struct mqtt_client *client, const struct mqtt_auth_param *param)
+{
+	int err_code;
+	struct buf_ctx packet;
+
+	NULL_PARAM_CHECK(client);
+	NULL_PARAM_CHECK(param);
+
+	mqtt_mutex_lock(client);
+
+	if (!mqtt_is_version_5_0(client)) {
+		NET_ERR("Auth packet only supported in MQTT 5.0");
+		err_code = -ENOTSUP;
+		goto error;
+	}
+
+	tx_buf_init(client, &packet);
+
+	err_code = verify_auth_state(client);
+	if (err_code < 0) {
+		goto error;
+	}
+
+	err_code = auth_encode(param, &packet);
+	if (err_code < 0) {
+		goto error;
+	}
+
+	err_code = client_write(client, packet.cur, packet.end - packet.cur);
+
+error:
+	mqtt_mutex_unlock(client);
+
+	return err_code;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 int mqtt_abort(struct mqtt_client *client)
 {
 	NULL_PARAM_CHECK(client);
@@ -583,7 +693,7 @@ int mqtt_abort(struct mqtt_client *client)
 	mqtt_mutex_lock(client);
 
 	if (client->internal.state != MQTT_STATE_IDLE) {
-		client_disconnect(client, -ECONNABORTED, true);
+		mqtt_client_disconnect(client, -ECONNABORTED, true);
 	}
 
 	mqtt_mutex_unlock(client);
@@ -685,7 +795,7 @@ static int read_publish_payload(struct mqtt_client *client, void *buffer,
 			ret = -ENOTCONN;
 		}
 
-		client_disconnect(client, ret, true);
+		mqtt_client_disconnect(client, ret, true);
 		goto exit;
 	}
 
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 678546b2f111e..2670ff7bc9946 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -119,7 +119,8 @@ static int unpack_utf8_str(struct buf_ctx *buf, struct mqtt_utf8 *str)
 }
 
 /**
- * @brief Unpacks binary string from the buffer from the offset requested.
+ * @brief Unpacks binary string from the buffer from the offset requested with
+ *        the length provided.
  *
  * @param[in] length Binary string length.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
@@ -130,8 +131,8 @@ static int unpack_utf8_str(struct buf_ctx *buf, struct mqtt_utf8 *str)
  * @retval 0 if the procedure is successful.
  * @retval -EINVAL if the buffer would be exceeded during the read
  */
-static int unpack_data(uint32_t length, struct buf_ctx *buf,
-		       struct mqtt_binstr *str)
+static int unpack_raw_data(uint32_t length, struct buf_ctx *buf,
+			   struct mqtt_binstr *str)
 {
 	NET_DBG(">> cur:%p, end:%p", (void *)buf->cur, (void *)buf->end);
 
@@ -154,23 +155,12 @@ static int unpack_data(uint32_t length, struct buf_ctx *buf,
 	return 0;
 }
 
-/**@brief Decode MQTT Packet Length in the MQTT fixed header.
- *
- * @param[inout] buf A pointer to the buf_ctx structure containing current
- *                   buffer position.
- * @param[out] length Length of variable header and payload in the
- *                              MQTT message.
- *
- * @retval 0 if the procedure is successful.
- * @retval -EINVAL if the length decoding would use more that 4 bytes.
- * @retval -EAGAIN if the buffer would be exceeded during the read.
- */
-static int packet_length_decode(struct buf_ctx *buf, uint32_t *length)
+int unpack_variable_int(struct buf_ctx *buf, uint32_t *val)
 {
 	uint8_t shift = 0U;
-	uint8_t bytes = 0U;
+	int bytes = 0;
 
-	*length = 0U;
+	*val = 0U;
 	do {
 		if (bytes >= MQTT_MAX_LENGTH_BYTES) {
 			return -EINVAL;
@@ -180,19 +170,19 @@ static int packet_length_decode(struct buf_ctx *buf, uint32_t *length)
 			return -EAGAIN;
 		}
 
-		*length += ((uint32_t)*(buf->cur) & MQTT_LENGTH_VALUE_MASK)
+		*val += ((uint32_t)*(buf->cur) & MQTT_LENGTH_VALUE_MASK)
 								<< shift;
 		shift += MQTT_LENGTH_SHIFT;
 		bytes++;
 	} while ((*(buf->cur++) & MQTT_LENGTH_CONTINUATION_BIT) != 0U);
 
-	if (*length > MQTT_MAX_PAYLOAD_SIZE) {
+	if (*val > MQTT_MAX_PAYLOAD_SIZE) {
 		return -EINVAL;
 	}
 
-	NET_DBG("length:0x%08x", *length);
+	NET_DBG("variable int:0x%08x", *val);
 
-	return 0;
+	return bytes;
 }
 
 int fixed_header_decode(struct buf_ctx *buf, uint8_t *type_and_flags,
@@ -205,8 +195,473 @@ int fixed_header_decode(struct buf_ctx *buf, uint8_t *type_and_flags,
 		return err_code;
 	}
 
-	return packet_length_decode(buf, length);
+	err_code = unpack_variable_int(buf, length);
+	if (err_code < 0) {
+		return err_code;
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**
+ * @brief Unpacks unsigned 32 bit value from the buffer from the offset
+ *        requested.
+ *
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] val Memory where the value is to be unpacked.
+ *
+ * @retval 0 if the procedure is successful.
+ * @retval -EINVAL if the buffer would be exceeded during the read
+ */
+static int unpack_uint32(struct buf_ctx *buf, uint32_t *val)
+{
+	uint8_t *cur = buf->cur;
+	uint8_t *end = buf->end;
+
+	NET_DBG(">> cur:%p, end:%p", (void *)cur, (void *)end);
+
+	if ((end - cur) < sizeof(uint32_t)) {
+		return -EINVAL;
+	}
+
+	*val = sys_get_be32(cur);
+	buf->cur = (cur + sizeof(uint32_t));
+
+	NET_DBG("<< val:%08x", *val);
+
+	return 0;
+}
+
+/**
+ * @brief Unpacks binary string from the buffer from the offset requested.
+ *        Binary string length is decoded from the first two bytes of the buffer.
+ *
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] bin Pointer to a binary string that will hold the binary string
+ *                 location in the buffer.
+ *
+ * @retval 0 if the procedure is successful.
+ * @retval -EINVAL if the buffer would be exceeded during the read
+ */
+static int unpack_binary_data(struct buf_ctx *buf, struct mqtt_binstr *bin)
+{
+	uint16_t len;
+	int err;
+
+	NET_DBG(">> cur:%p, end:%p", (void *)buf->cur, (void *)buf->end);
+
+	err = unpack_uint16(buf, &len);
+	if (err != 0) {
+		return err;
+	}
+
+	if ((buf->end - buf->cur) < len) {
+		return -EINVAL;
+	}
+
+	bin->len = len;
+	/* Zero length binary strings are permitted. */
+	if (len > 0) {
+		bin->data = buf->cur;
+		buf->cur += len;
+	} else {
+		bin->data = NULL;
+	}
+
+	NET_DBG("<< bin len:%08x", GET_BINSTR_BUFFER_SIZE(bin));
+
+	return 0;
+}
+
+struct property_decoder {
+	void *data;
+	bool *found;
+	uint8_t type;
+};
+
+int decode_uint32_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint32_t *value = prop->data;
+
+	if (*remaining_len < sizeof(uint32_t)) {
+		return -EINVAL;
+	}
+
+	if (unpack_uint32(buf, value) < 0) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= sizeof(uint32_t);
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_uint16_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint16_t *value = prop->data;
+
+	if (*remaining_len < sizeof(uint16_t)) {
+		return -EINVAL;
+	}
+
+	if (unpack_uint16(buf, value) < 0) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= sizeof(uint16_t);
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_uint8_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint8_t *value = prop->data;
+
+	if (*remaining_len < sizeof(uint8_t)) {
+		return -EINVAL;
+	}
+
+	if (unpack_uint8(buf, value) < 0) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= sizeof(uint8_t);
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_string_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	struct mqtt_utf8 *str = prop->data;
+
+	if (unpack_utf8_str(buf, str) < 0) {
+		return -EINVAL;
+	}
+
+	if (*remaining_len < sizeof(uint16_t) + str->size) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= sizeof(uint16_t) + str->size;
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_binary_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	struct mqtt_binstr *bin = prop->data;
+
+	if (unpack_binary_data(buf, bin) < 0) {
+		return -EINVAL;
+	}
+
+	if (*remaining_len < sizeof(uint16_t) + bin->len) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= sizeof(uint16_t) + bin->len;
+	*prop->found = true;
+
+	return 0;
+}
+
+int decode_user_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	struct mqtt_utf8_pair *user_prop = prop->data;
+	struct mqtt_utf8_pair *chosen = NULL;
+	struct mqtt_utf8_pair temp = { 0 };
+	size_t prop_len;
+
+	if (unpack_utf8_str(buf, &temp.name) < 0) {
+		return -EINVAL;
+	}
+
+	if (unpack_utf8_str(buf, &temp.value) < 0) {
+		return -EINVAL;
+	}
+
+	prop_len = (2 * sizeof(uint16_t)) + temp.name.size + temp.value.size;
+	if (*remaining_len < prop_len) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= prop_len;
+	*prop->found = true;
+
+	for (int i = 0; i < CONFIG_MQTT_USER_PROPERTIES_MAX; i++) {
+		if (user_prop[i].name.utf8 == NULL) {
+			chosen = &user_prop[i];
+			break;
+		}
+	}
+
+	if (chosen == NULL) {
+		NET_DBG("Cannot parse all user properties, ignore excess");
+	} else {
+		memcpy(chosen, &temp, sizeof(struct mqtt_utf8_pair));
+	}
+
+	return 0;
+}
+
+int decode_sub_id_property(struct property_decoder *prop,
+			   uint32_t *remaining_len,
+			   struct buf_ctx *buf)
+{
+	uint32_t *sub_id_array = prop->data;
+	uint32_t *chosen = NULL;
+	uint32_t value;
+	int bytes;
+
+	bytes = unpack_variable_int(buf, &value);
+	if (bytes < 0) {
+		return -EINVAL;
+	}
+
+	if (*remaining_len < bytes) {
+		return -EINVAL;
+	}
+
+	*remaining_len -= bytes;
+	*prop->found = true;
+
+	for (int i = 0; i < CONFIG_MQTT_SUBSCRIPTION_ID_PROPERTIES_MAX; i++) {
+		if (sub_id_array[i] == 0) {
+			chosen = &sub_id_array[i];
+			break;
+		}
+	}
+
+	if (chosen == NULL) {
+		NET_DBG("Cannot parse all subscription id properties, ignore excess");
+	} else {
+		*chosen = value;
+	}
+
+	return 0;
+}
+
+static int properties_decode(struct property_decoder *prop, uint8_t cnt,
+			     struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int bytes;
+	int err;
+
+	bytes = unpack_variable_int(buf, &properties_len);
+	if (bytes < 0) {
+		return -EINVAL;
+	}
+
+	bytes += (int)properties_len;
+
+	while (properties_len > 0) {
+		struct property_decoder *current_prop = NULL;
+		uint8_t type;
+
+		/* Decode property type */
+		err = unpack_uint8(buf, &type);
+		if (err < 0) {
+			return -EINVAL;
+		}
+
+		properties_len--;
+
+		/* Search if the property is supported in the provided property
+		 * array.
+		 */
+		for (int i = 0; i < cnt; i++) {
+			if (type == prop[i].type) {
+				current_prop = &prop[i];
+			}
+		}
+
+		if (current_prop == NULL) {
+			NET_DBG("Unsupported property %u", type);
+			return -EBADMSG;
+		}
+
+		/* Decode property value. */
+		switch (type) {
+		case MQTT_PROP_SESSION_EXPIRY_INTERVAL:
+		case MQTT_PROP_MAXIMUM_PACKET_SIZE:
+		case MQTT_PROP_MESSAGE_EXPIRY_INTERVAL:
+			err = decode_uint32_property(current_prop,
+						     &properties_len, buf);
+			break;
+		case MQTT_PROP_RECEIVE_MAXIMUM:
+		case MQTT_PROP_TOPIC_ALIAS_MAXIMUM:
+		case MQTT_PROP_SERVER_KEEP_ALIVE:
+		case MQTT_PROP_TOPIC_ALIAS:
+			err = decode_uint16_property(current_prop,
+						     &properties_len, buf);
+			break;
+		case MQTT_PROP_MAXIMUM_QOS:
+		case MQTT_PROP_RETAIN_AVAILABLE:
+		case MQTT_PROP_WILDCARD_SUBSCRIPTION_AVAILABLE:
+		case MQTT_PROP_SUBSCRIPTION_IDENTIFIER_AVAILABLE:
+		case MQTT_PROP_SHARED_SUBSCRIPTION_AVAILABLE:
+		case MQTT_PROP_PAYLOAD_FORMAT_INDICATOR:
+			err = decode_uint8_property(current_prop,
+						    &properties_len, buf);
+			break;
+		case MQTT_PROP_ASSIGNED_CLIENT_IDENTIFIER:
+		case MQTT_PROP_REASON_STRING:
+		case MQTT_PROP_RESPONSE_INFORMATION:
+		case MQTT_PROP_SERVER_REFERENCE:
+		case MQTT_PROP_AUTHENTICATION_METHOD:
+		case MQTT_PROP_RESPONSE_TOPIC:
+		case MQTT_PROP_CONTENT_TYPE:
+			err = decode_string_property(current_prop,
+						     &properties_len, buf);
+			break;
+		case MQTT_PROP_USER_PROPERTY:
+			err = decode_user_property(current_prop,
+						   &properties_len, buf);
+			break;
+		case MQTT_PROP_AUTHENTICATION_DATA:
+		case MQTT_PROP_CORRELATION_DATA:
+			err = decode_binary_property(current_prop,
+						     &properties_len, buf);
+			break;
+		case MQTT_PROP_SUBSCRIPTION_IDENTIFIER:
+			err = decode_sub_id_property(current_prop,
+						     &properties_len, buf);
+			break;
+		default:
+			err = -ENOTSUP;
+		}
+
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return bytes;
+}
+
+static int connack_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_connack_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.session_expiry_interval,
+			&param->prop.rx.has_session_expiry_interval,
+			MQTT_PROP_SESSION_EXPIRY_INTERVAL
+		},
+		{
+			&param->prop.receive_maximum,
+			&param->prop.rx.has_receive_maximum,
+			MQTT_PROP_RECEIVE_MAXIMUM
+		},
+		{
+			&param->prop.maximum_qos,
+			&param->prop.rx.has_maximum_qos,
+			MQTT_PROP_MAXIMUM_QOS
+		},
+		{
+			&param->prop.retain_available,
+			&param->prop.rx.has_retain_available,
+			MQTT_PROP_RETAIN_AVAILABLE
+		},
+		{
+			&param->prop.maximum_packet_size,
+			&param->prop.rx.has_maximum_packet_size,
+			MQTT_PROP_MAXIMUM_PACKET_SIZE
+		},
+		{
+			&param->prop.assigned_client_id,
+			&param->prop.rx.has_assigned_client_id,
+			MQTT_PROP_ASSIGNED_CLIENT_IDENTIFIER
+		},
+		{
+			&param->prop.topic_alias_maximum,
+			&param->prop.rx.has_topic_alias_maximum,
+			MQTT_PROP_TOPIC_ALIAS_MAXIMUM
+		},
+		{
+			&param->prop.reason_string,
+			&param->prop.rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		},
+		{
+			&param->prop.wildcard_sub_available,
+			&param->prop.rx.has_wildcard_sub_available,
+			MQTT_PROP_WILDCARD_SUBSCRIPTION_AVAILABLE
+		},
+		{
+			&param->prop.subscription_ids_available,
+			&param->prop.rx.has_subscription_ids_available,
+			MQTT_PROP_SUBSCRIPTION_IDENTIFIER_AVAILABLE
+		},
+		{
+			&param->prop.shared_sub_available,
+			&param->prop.rx.has_shared_sub_available,
+			MQTT_PROP_SHARED_SUBSCRIPTION_AVAILABLE
+		},
+		{
+			&param->prop.server_keep_alive,
+			&param->prop.rx.has_server_keep_alive,
+			MQTT_PROP_SERVER_KEEP_ALIVE
+		},
+		{
+			&param->prop.response_information,
+			&param->prop.rx.has_response_information,
+			MQTT_PROP_RESPONSE_INFORMATION
+		},
+		{
+			&param->prop.server_reference,
+			&param->prop.rx.has_server_reference,
+			MQTT_PROP_SERVER_REFERENCE
+		},
+		{
+			&param->prop.auth_method,
+			&param->prop.rx.has_auth_method,
+			MQTT_PROP_AUTHENTICATION_METHOD
+		},
+		{
+			&param->prop.auth_data,
+			&param->prop.rx.has_auth_data,
+			MQTT_PROP_AUTHENTICATION_DATA
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+#else
+static int connack_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_connack_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
 }
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 
 int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 		       struct mqtt_connack_param *param)
@@ -224,20 +679,150 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 		return err_code;
 	}
 
-	if (client->protocol_version == MQTT_VERSION_3_1_1) {
-		param->session_present_flag =
-			flags & MQTT_CONNACK_FLAG_SESSION_PRESENT;
+	param->return_code = ret_code;
+
+	if (client->protocol_version == MQTT_VERSION_3_1_0) {
+		goto out;
+	}
+
+	param->session_present_flag = flags & MQTT_CONNACK_FLAG_SESSION_PRESENT;
+	NET_DBG("[CID %p]: session_present_flag: %d", client,
+		param->session_present_flag);
+
+	if (mqtt_is_version_5_0(client)) {
+		err_code = connack_properties_decode(buf, param);
+		if (err_code < 0) {
+			return err_code;
+		}
+	}
+
+out:
+	return 0;
+}
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int publish_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_publish_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.payload_format_indicator,
+			&param->prop.rx.has_payload_format_indicator,
+			MQTT_PROP_PAYLOAD_FORMAT_INDICATOR
+		},
+		{
+			&param->prop.message_expiry_interval,
+			&param->prop.rx.has_message_expiry_interval,
+			MQTT_PROP_MESSAGE_EXPIRY_INTERVAL
+		},
+		{
+			&param->prop.topic_alias,
+			&param->prop.rx.has_topic_alias,
+			MQTT_PROP_TOPIC_ALIAS
+		},
+		{
+			&param->prop.response_topic,
+			&param->prop.rx.has_response_topic,
+			MQTT_PROP_RESPONSE_TOPIC
+		},
+		{
+			&param->prop.correlation_data,
+			&param->prop.rx.has_correlation_data,
+			MQTT_PROP_CORRELATION_DATA
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		},
+		{
+			&param->prop.subscription_identifier,
+			&param->prop.rx.has_subscription_identifier,
+			MQTT_PROP_SUBSCRIPTION_IDENTIFIER
+		},
+		{
+			&param->prop.content_type,
+			&param->prop.rx.has_content_type,
+			MQTT_PROP_CONTENT_TYPE
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+
+static int publish_topic_alias_check(struct mqtt_client *client,
+				     struct mqtt_publish_param *param)
+{
+	uint16_t alias = param->prop.topic_alias;
+	struct mqtt_utf8 *topic_str = &param->message.topic.topic;
+	struct mqtt_topic_alias *topic_alias;
+
+	/* Topic alias must not exceed configured CONFIG_MQTT_TOPIC_ALIAS_MAX */
+	if (alias > CONFIG_MQTT_TOPIC_ALIAS_MAX) {
+		set_disconnect_reason(client, MQTT_DISCONNECT_TOPIC_ALIAS_INVALID);
+		return -EBADMSG;
+	}
+
+	if (topic_str->size == 0) {
+		/* In case there's no topic, topic alias must be set */
+		if (alias == 0) {
+			return -EBADMSG;
+		}
+
+		/* Topic alias number corresponds to the aliases array index. */
+		topic_alias = &client->internal.topic_aliases[alias - 1];
 
-		NET_DBG("[CID %p]: session_present_flag: %d", client,
-			 param->session_present_flag);
+		/* In case topic alias has not been configured yet, report an error. */
+		if (topic_alias->topic_size == 0) {
+			return -EBADMSG;
+		}
+
+		topic_str->utf8 = topic_alias->topic_buf;
+		topic_str->size = topic_alias->topic_size;
+
+		return 0;
 	}
 
-	param->return_code = (enum mqtt_conn_return_code)ret_code;
+	/* If topic is present and topic alias is set, configure the alias locally. */
+	if (alias > 0) {
+		topic_alias = &client->internal.topic_aliases[alias - 1];
+
+		if (topic_str->size > ARRAY_SIZE(topic_alias->topic_buf)) {
+			NET_ERR("Topic too long (%d bytes) to store, increase "
+				"CONFIG_MQTT_TOPIC_ALIAS_STRING_MAX",
+				topic_str->size);
+			set_disconnect_reason(client, MQTT_DISCONNECT_IMPL_SPECIFIC_ERROR);
+			return -ENOMEM;
+		}
+
+		memcpy(topic_alias->topic_buf, topic_str->utf8, topic_str->size);
+		topic_alias->topic_size = topic_str->size;
+	}
 
 	return 0;
 }
+#else
+static int publish_properties_decode(struct buf_ctx *buf,
+				     struct mqtt_publish_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+
+static int publish_topic_alias_check(struct mqtt_client *client,
+				     struct mqtt_publish_param *param)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(param);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 
-int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
+int publish_decode(struct mqtt_client *client, uint8_t flags,
+		   uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param)
 {
 	int err_code;
@@ -263,6 +848,21 @@ int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
 		var_header_length += sizeof(uint16_t);
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = publish_properties_decode(buf, param);
+		if (err_code < 0) {
+			return err_code;
+		}
+
+		/* Add parsed properties length */
+		var_header_length += err_code;
+
+		err_code = publish_topic_alias_check(client, param);
+		if (err_code < 0) {
+			return err_code;
+		}
+	}
+
 	if (var_length < var_header_length) {
 		NET_ERR("Corrupted PUBLISH message, header length (%u) larger "
 			 "than total length (%u)", var_header_length,
@@ -276,28 +876,153 @@ int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
 	return 0;
 }
 
-int publish_ack_decode(struct buf_ctx *buf, struct mqtt_puback_param *param)
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int common_ack_properties_decode(struct buf_ctx *buf,
+					struct mqtt_common_ack_properties *prop)
+{
+	struct property_decoder prop_dec[] = {
+		{
+			&prop->reason_string,
+			&prop->rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&prop->user_prop,
+			&prop->rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		}
+	};
+
+	return properties_decode(prop_dec, ARRAY_SIZE(prop_dec), buf);
+}
+#else
+static int common_ack_properties_decode(struct buf_ctx *buf,
+					struct mqtt_common_ack_properties *prop)
+{
+	ARG_UNUSED(prop);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+static int common_pub_ack_decode(struct buf_ctx *buf, uint16_t *message_id,
+				 uint8_t *reason_code,
+				 struct mqtt_common_ack_properties *prop)
+{
+	size_t remaining_len;
+	int err;
+
+	err = unpack_uint16(buf, message_id);
+	if (err < 0) {
+		return err;
+	}
+
+	remaining_len = buf->end - buf->cur;
+
+	/* For MQTT < 5.0 properties are NULL. */
+	if (prop != NULL && reason_code != NULL) {
+		if (remaining_len > 0) {
+			err = unpack_uint8(buf, reason_code);
+			if (err < 0) {
+				return err;
+			}
+		}
+
+		if (remaining_len > 1) {
+			err = common_ack_properties_decode(buf, prop);
+			if (err < 0) {
+				return err;
+			}
+		}
+	}
+
+	return 0;
+}
+
+int publish_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		       struct mqtt_puback_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
 }
 
-int publish_receive_decode(struct buf_ctx *buf, struct mqtt_pubrec_param *param)
+int publish_receive_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+			   struct mqtt_pubrec_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
 }
 
-int publish_release_decode(struct buf_ctx *buf, struct mqtt_pubrel_param *param)
+int publish_release_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+			   struct mqtt_pubrel_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
 }
 
-int publish_complete_decode(struct buf_ctx *buf,
+int publish_complete_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			    struct mqtt_pubcomp_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t *reason_code = NULL;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = &param->reason_code;
+	}
+#endif
+
+	return common_pub_ack_decode(buf, &param->message_id, reason_code, prop);
+}
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int suback_properties_decode(struct buf_ctx *buf,
+				    struct mqtt_suback_param *param)
+{
+	return common_ack_properties_decode(buf, &param->prop);
 }
+#else
+static int suback_properties_decode(struct buf_ctx *buf,
+				    struct mqtt_suback_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
 
-int subscribe_ack_decode(struct buf_ctx *buf, struct mqtt_suback_param *param)
+int subscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+			 struct mqtt_suback_param *param)
 {
 	int err_code;
 
@@ -306,11 +1031,178 @@ int subscribe_ack_decode(struct buf_ctx *buf, struct mqtt_suback_param *param)
 		return err_code;
 	}
 
-	return unpack_data(buf->end - buf->cur, buf, &param->return_codes);
+	if (mqtt_is_version_5_0(client)) {
+		err_code = suback_properties_decode(buf, param);
+		if (err_code < 0) {
+			return err_code;
+		}
+	}
+
+	return unpack_raw_data(buf->end - buf->cur, buf, &param->return_codes);
 }
 
-int unsubscribe_ack_decode(struct buf_ctx *buf,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int unsuback_5_0_decode(struct buf_ctx *buf,
+			       struct mqtt_unsuback_param *param)
+{
+	int err;
+
+	err = common_ack_properties_decode(buf, &param->prop);
+	if (err < 0) {
+		return err;
+	}
+
+	return unpack_raw_data(buf->end - buf->cur, buf, &param->reason_codes);
+}
+#else
+static int unsuback_5_0_decode(struct buf_ctx *buf,
+			       struct mqtt_unsuback_param *param)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int unsubscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_unsuback_param *param)
 {
-	return unpack_uint16(buf, &param->message_id);
+	int err;
+
+	err = unpack_uint16(buf, &param->message_id);
+	if (err < 0) {
+		return 0;
+	}
+
+	if (mqtt_is_version_5_0(client)) {
+		return unsuback_5_0_decode(buf, param);
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static int disconnect_properties_decode(struct buf_ctx *buf,
+					struct mqtt_disconnect_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.session_expiry_interval,
+			&param->prop.rx.has_session_expiry_interval,
+			MQTT_PROP_SESSION_EXPIRY_INTERVAL
+		},
+		{
+			&param->prop.reason_string,
+			&param->prop.rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		},
+		{
+			&param->prop.server_reference,
+			&param->prop.rx.has_server_reference,
+			MQTT_PROP_SERVER_REFERENCE
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+
+int disconnect_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		      struct mqtt_disconnect_param *param)
+{
+
+	size_t remaining_len;
+	uint8_t reason_code;
+	int err;
+
+	if (!mqtt_is_version_5_0(client)) {
+		return -ENOTSUP;
+	}
+
+	remaining_len = buf->end - buf->cur;
+
+	if (remaining_len > 0) {
+		err = unpack_uint8(buf, &reason_code);
+		if (err < 0) {
+			return err;
+		}
+
+		param->reason_code = reason_code;
+	}
+
+	if (remaining_len > 1) {
+		err = disconnect_properties_decode(buf, param);
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+static int auth_properties_decode(struct buf_ctx *buf,
+				  struct mqtt_auth_param *param)
+{
+	struct property_decoder prop[] = {
+		{
+			&param->prop.auth_method,
+			&param->prop.rx.has_auth_method,
+			MQTT_PROP_AUTHENTICATION_METHOD
+		},
+		{
+			&param->prop.auth_data,
+			&param->prop.rx.has_auth_data,
+			MQTT_PROP_AUTHENTICATION_DATA
+		},
+		{
+			&param->prop.reason_string,
+			&param->prop.rx.has_reason_string,
+			MQTT_PROP_REASON_STRING
+		},
+		{
+			&param->prop.user_prop,
+			&param->prop.rx.has_user_prop,
+			MQTT_PROP_USER_PROPERTY
+		}
+	};
+
+	return properties_decode(prop, ARRAY_SIZE(prop), buf);
+}
+
+int auth_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		struct mqtt_auth_param *param)
+{
+	size_t remaining_len;
+	uint8_t reason_code;
+	int err;
+
+	if (!mqtt_is_version_5_0(client)) {
+		return -ENOTSUP;
+	}
+
+	remaining_len = buf->end - buf->cur;
+
+	if (remaining_len > 0) {
+		err = unpack_uint8(buf, &reason_code);
+		if (err < 0) {
+			return err;
+		}
+
+		param->reason_code = reason_code;
+	}
+
+	if (remaining_len > 1) {
+		err = auth_properties_decode(buf, param);
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return 0;
 }
+#endif /* CONFIG_MQTT_VERSION_5_0 */
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 7297e8226ff5a..4d43e3d03977b 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(net_mqtt_enc, CONFIG_MQTT_LOG_LEVEL);
 static const struct mqtt_utf8 mqtt_3_1_0_proto_desc =
 	MQTT_UTF8_LITERAL("MQIsdp");
 
-static const struct mqtt_utf8 mqtt_3_1_1_proto_desc =
+static const struct mqtt_utf8 mqtt_proto_desc =
 	MQTT_UTF8_LITERAL("MQTT");
 
 /** Never changing ping request, needed for Keep Alive. */
@@ -28,7 +28,7 @@ static const uint8_t ping_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
 };
 
 /** Never changing disconnect request. */
-static const uint8_t disc_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
+static const uint8_t empty_disc_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
 	MQTT_PKT_TYPE_DISCONNECT,
 	0x00
 };
@@ -118,10 +118,9 @@ static int pack_utf8_str(const struct mqtt_utf8 *str, struct buf_ctx *buf)
 }
 
 /**
- * @brief Computes and encodes length for the MQTT fixed header.
+ * @brief Computes and encodes variable length integer.
  *
- * @note The remaining length is not packed as a fixed unsigned 32 bit integer.
- *       Instead it is packed on algorithm below:
+ * @note The variable length integer is based on algorithm below:
  *
  * @code
  * do
@@ -135,36 +134,40 @@ static int pack_utf8_str(const struct mqtt_utf8 *str, struct buf_ctx *buf)
  *       while ( X > 0 )
  * @endcode
  *
- * @param[in] length Length of variable header and payload in the MQTT message.
+ * @param[in] value Integer value to encode.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position. May be NULL (in this case function will
  *                   only calculate number of bytes needed).
  *
- * @return Number of bytes needed to encode length value.
+ * @return Number of bytes needed to encode integer or a negative error code.
  */
-static uint8_t packet_length_encode(uint32_t length, struct buf_ctx *buf)
+static int pack_variable_int(uint32_t value, struct buf_ctx *buf)
 {
-	uint8_t encoded_bytes = 0U;
+	int encoded_bytes = 0U;
 
-	NET_DBG(">> length:0x%08x cur:%p, end:%p", length,
+	NET_DBG(">> value:0x%08x cur:%p, end:%p", value,
 		 (buf == NULL) ? 0 : (void *)buf->cur, (buf == NULL) ? 0 : (void *)buf->end);
 
 	do {
 		encoded_bytes++;
 
 		if (buf != NULL) {
-			*(buf->cur) = length & MQTT_LENGTH_VALUE_MASK;
+			if (buf->cur >= buf->end) {
+				return -ENOMEM;
+			}
+
+			*(buf->cur) = value & MQTT_LENGTH_VALUE_MASK;
 		}
 
-		length >>= MQTT_LENGTH_SHIFT;
+		value >>= MQTT_LENGTH_SHIFT;
 
 		if (buf != NULL) {
-			if (length > 0) {
+			if (value > 0) {
 				*(buf->cur) |= MQTT_LENGTH_CONTINUATION_BIT;
 			}
 			buf->cur++;
 		}
-	} while (length > 0);
+	} while (value > 0);
 
 	return encoded_bytes;
 }
@@ -202,7 +205,7 @@ static uint32_t mqtt_encode_fixed_header(uint8_t message_type, uint8_t *start,
 
 	NET_DBG("<< msg type:0x%02x length:0x%08x", message_type, length);
 
-	fixed_header_length = packet_length_encode(length, NULL);
+	fixed_header_length = pack_variable_int(length, NULL);
 	fixed_header_length += sizeof(uint8_t);
 
 	NET_DBG("Fixed header length = %02x", fixed_header_length);
@@ -211,7 +214,7 @@ static uint32_t mqtt_encode_fixed_header(uint8_t message_type, uint8_t *start,
 	buf->cur = start - fixed_header_length;
 
 	(void)pack_uint8(message_type, buf);
-	(void)packet_length_encode(length, buf);
+	(void)pack_variable_int(length, buf);
 
 	/* Set the cur pointer back at the start of the frame,
 	 * and end pointer to the end of the frame.
@@ -239,65 +242,505 @@ static int zero_len_str_encode(struct buf_ctx *buf)
 	return pack_uint16(0x0000, buf);
 }
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
 /**
- * @brief Encodes and sends messages that contain only message id in
- *        the variable header.
+ * @brief Packs unsigned 32 bit value to the buffer at the offset requested.
  *
- * @param[in] message_type Message type and reserved bit fields.
- * @param[in] message_id Message id to be encoded in the variable header.
- * @param[inout] buf_ctx Pointer to the buffer context structure,
- *                       containing buffer for the encoded message.
+ * @param[in] val Value to be packed.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
  *
- * @retval 0 or an error code indicating a reason for failure.
+ * @retval 0 if the procedure is successful.
+ * @retval -ENOMEM if there is no place in the buffer to store the value.
  */
-static int mqtt_message_id_only_enc(uint8_t message_type, uint16_t message_id,
-				    struct buf_ctx *buf)
+static int pack_uint32(uint32_t val, struct buf_ctx *buf)
 {
-	int err_code;
-	uint8_t *start;
+	uint8_t *cur = buf->cur;
+	uint8_t *end = buf->end;
 
-	/* Message id zero is not permitted by spec. */
-	if (message_id == 0U) {
-		return -EINVAL;
+	if ((end - cur) < sizeof(uint32_t)) {
+		return -ENOMEM;
 	}
 
-	/* Reserve space for fixed header. */
-	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
-	start = buf->cur;
+	/* Pack value. */
+	sys_put_be32(val, cur);
+	buf->cur = (cur + sizeof(uint32_t));
 
-	err_code = pack_uint16(message_id, buf);
-	if (err_code != 0) {
-		return err_code;
+	return 0;
+}
+
+/**
+ * @brief Packs binary data to the buffer at the offset requested.
+ *
+ * @param[in] bin Binary data and its length to be packed.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ *
+ * @retval 0 if the procedure is successful.
+ * @retval -ENOMEM if there is no place in the buffer to store the data.
+ */
+static int pack_bin_data(const struct mqtt_binstr *bin, struct buf_ctx *buf)
+{
+	if ((buf->end - buf->cur) < GET_BINSTR_BUFFER_SIZE(bin)) {
+		return -ENOMEM;
 	}
 
-	return mqtt_encode_fixed_header(message_type, start, buf);
+	/* Pack length followed by binary data. */
+	(void)pack_uint16(bin->len, buf);
+
+	memcpy(buf->cur, bin->data, bin->len);
+	buf->cur += bin->len;
+
+	return 0;
+}
+
+static uint8_t get_uint8_property_default(uint8_t prop)
+{
+	if (prop == MQTT_PROP_REQUEST_PROBLEM_INFORMATION) {
+		return 1;
+	}
+
+	return 0;
+}
+
+static size_t uint8_property_length(uint8_t prop, uint8_t value)
+{
+	uint8_t prop_default = get_uint8_property_default(prop);
+
+	if (value == prop_default) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + sizeof(uint8_t);
+}
+
+static int encode_uint8_property(uint8_t prop, uint8_t value, struct buf_ctx *buf)
+{
+	uint8_t prop_default = get_uint8_property_default(prop);
+	int err;
+
+	if (value == prop_default) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_uint8(value, buf);
+}
+
+static size_t uint16_property_length(uint16_t value)
+{
+	if (value == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + sizeof(uint16_t);
+}
+
+static int encode_uint16_property(uint8_t prop, uint16_t value,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (value == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_uint16(value, buf);
+}
+
+static size_t uint32_property_length(uint32_t value)
+{
+	if (value == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + sizeof(uint32_t);
+}
+
+static int encode_uint32_property(uint8_t prop, uint32_t value,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (value == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_uint32(value, buf);
+}
+
+static size_t var_int_property_length(uint32_t value)
+{
+	if (value == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + (size_t)pack_variable_int(value, NULL);
+}
+
+static int encode_var_int_property(uint8_t prop, uint32_t value,
+				   struct buf_ctx *buf)
+{
+	int err;
+
+	if (value == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_variable_int(value, buf);
+}
+
+static size_t string_property_length(const struct mqtt_utf8 *str)
+{
+	if (str->size == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + GET_UT8STR_BUFFER_SIZE(str);
+}
+
+static int encode_string_property(uint8_t prop, const struct mqtt_utf8 *str,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (str->size == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_utf8_str(str, buf);
+}
+
+static size_t string_pair_property_length(const struct mqtt_utf8 *name,
+					  const struct mqtt_utf8 *value)
+{
+	if ((name->size == 0) || (value->size == 0)) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + GET_UT8STR_BUFFER_SIZE(name) +
+	       GET_UT8STR_BUFFER_SIZE(value);
+}
+
+static int encode_string_pair_property(uint8_t prop, const struct mqtt_utf8 *name,
+				       const struct mqtt_utf8 *value,
+				       struct buf_ctx *buf)
+{
+	int err;
+
+	if ((name->size == 0) || (value->size == 0)) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = pack_utf8_str(name, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_utf8_str(value, buf);
+}
+
+static size_t binary_property_length(const struct mqtt_binstr *bin)
+{
+	if (bin->len == 0) {
+		return 0;
+	}
+
+	return sizeof(uint8_t) + GET_BINSTR_BUFFER_SIZE(bin);
+}
+
+static int encode_binary_property(uint8_t prop, const struct mqtt_binstr *bin,
+				  struct buf_ctx *buf)
+{
+	int err;
+
+	if (bin->len == 0) {
+		return 0;
+	}
+
+	err = pack_uint8(prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return pack_bin_data(bin, buf);
+}
+
+static size_t user_properties_length(const struct mqtt_utf8_pair *user_props)
+{
+	size_t total_len = 0;
+	size_t len;
+
+	for (int i = 0; i < CONFIG_MQTT_USER_PROPERTIES_MAX; i++) {
+		len = string_pair_property_length(&user_props[i].name,
+						  &user_props[i].value);
+		if (len == 0) {
+			break;
+		}
+
+		total_len += len;
+	}
+
+	return total_len;
+}
+
+static int encode_user_properties(const struct mqtt_utf8_pair *user_props,
+				  struct buf_ctx *buf)
+{
+	size_t len;
+	int err;
+
+	for (int i = 0; i < CONFIG_MQTT_USER_PROPERTIES_MAX; i++) {
+		len = string_pair_property_length(&user_props[i].name,
+						  &user_props[i].value);
+
+		if (len == 0) {
+			break;
+		}
+
+		err = encode_string_pair_property(MQTT_PROP_USER_PROPERTY,
+						  &user_props[i].name,
+						  &user_props[i].value, buf);
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+static uint32_t connect_properties_length(const struct mqtt_client *client)
+{
+	return uint32_property_length(client->prop.session_expiry_interval) +
+	       uint16_property_length(client->prop.receive_maximum) +
+	       uint32_property_length(client->prop.maximum_packet_size) +
+	       uint16_property_length(CONFIG_MQTT_TOPIC_ALIAS_MAX) +
+	       uint8_property_length(MQTT_PROP_REQUEST_RESPONSE_INFORMATION,
+				     client->prop.request_response_info ? 1U : 0U) +
+	       uint8_property_length(MQTT_PROP_REQUEST_PROBLEM_INFORMATION,
+				     client->prop.request_problem_info ? 1U : 0U) +
+	       user_properties_length(client->prop.user_prop) +
+	       string_property_length(&client->prop.auth_method) +
+	       binary_property_length(&client->prop.auth_data);
+}
+
+static int connect_properties_encode(const struct mqtt_client *client,
+				     struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = connect_properties_length(client);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_SESSION_EXPIRY_INTERVAL,
+				     client->prop.session_expiry_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint16_property(MQTT_PROP_RECEIVE_MAXIMUM,
+				     client->prop.receive_maximum, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_MAXIMUM_PACKET_SIZE,
+				     client->prop.maximum_packet_size, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint16_property(MQTT_PROP_TOPIC_ALIAS_MAXIMUM,
+				     CONFIG_MQTT_TOPIC_ALIAS_MAX, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_REQUEST_RESPONSE_INFORMATION,
+				    client->prop.request_response_info ? 1U : 0U,
+				    buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_REQUEST_PROBLEM_INFORMATION,
+				    client->prop.request_problem_info ? 1U : 0U,
+				    buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(client->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_AUTHENTICATION_METHOD,
+				     &client->prop.auth_method, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_AUTHENTICATION_DATA,
+				     &client->prop.auth_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+static uint32_t will_properties_length(const struct mqtt_client *client)
+{
+	return uint32_property_length(client->will_prop.will_delay_interval) +
+	       uint8_property_length(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				     client->will_prop.payload_format_indicator) +
+	       uint32_property_length(client->will_prop.message_expiry_interval) +
+	       string_property_length(&client->will_prop.content_type) +
+	       string_property_length(&client->will_prop.response_topic) +
+	       binary_property_length(&client->will_prop.correlation_data) +
+	       user_properties_length(client->will_prop.user_prop);
 }
 
+static int will_properties_encode(const struct mqtt_client *client,
+				  struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = will_properties_length(client);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_WILL_DELAY_INTERVAL,
+				     client->will_prop.will_delay_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				    client->will_prop.payload_format_indicator,
+				    buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_MESSAGE_EXPIRY_INTERVAL,
+				     client->will_prop.message_expiry_interval,
+				     buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_CONTENT_TYPE,
+				     &client->will_prop.content_type, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_RESPONSE_TOPIC,
+				     &client->will_prop.response_topic, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_CORRELATION_DATA,
+				     &client->will_prop.correlation_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(client->will_prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+#else
+static int connect_properties_encode(const struct mqtt_client *client,
+				     struct buf_ctx *buf)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+
+static int will_properties_encode(const struct mqtt_client *client,
+				  struct buf_ctx *buf)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 int connect_request_encode(const struct mqtt_client *client,
 			   struct buf_ctx *buf)
 {
 	uint8_t connect_flags = client->clean_session << 1;
 	const uint8_t message_type =
 			MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_CONNECT, 0, 0, 0);
-	const struct mqtt_utf8 *mqtt_proto_desc;
+	const struct mqtt_utf8 *proto_desc;
 	uint8_t *connect_flags_pos;
 	int err_code;
 	uint8_t *start;
 
-	if (client->protocol_version == MQTT_VERSION_3_1_1) {
-		mqtt_proto_desc = &mqtt_3_1_1_proto_desc;
+	if (client->protocol_version == MQTT_VERSION_3_1_0) {
+		proto_desc = &mqtt_3_1_0_proto_desc;
 	} else {
-		mqtt_proto_desc = &mqtt_3_1_0_proto_desc;
+		/* MQTT 3.1.1 and newer share the same protocol prefix. */
+		proto_desc = &mqtt_proto_desc;
 	}
 
 	/* Reserve space for fixed header. */
 	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
 	start = buf->cur;
 
-	NET_HEXDUMP_DBG(mqtt_proto_desc->utf8, mqtt_proto_desc->size,
+	NET_HEXDUMP_DBG(proto_desc->utf8, proto_desc->size,
 			 "Encoding Protocol Description.");
 
-	err_code = pack_utf8_str(mqtt_proto_desc, buf);
+	err_code = pack_utf8_str(proto_desc, buf);
 	if (err_code != 0) {
 		return err_code;
 	}
@@ -324,6 +767,14 @@ int connect_request_encode(const struct mqtt_client *client,
 		return err_code;
 	}
 
+	/* Properties (MQTT 5.0 only) */
+	if (mqtt_is_version_5_0(client)) {
+		err_code = connect_properties_encode(client, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	NET_HEXDUMP_DBG(client->client_id.utf8, client->client_id.size,
 			 "Encoding Client Id.");
 	err_code = pack_utf8_str(&client->client_id, buf);
@@ -338,6 +789,14 @@ int connect_request_encode(const struct mqtt_client *client,
 		connect_flags |= ((client->will_topic->qos & 0x03) << 3);
 		connect_flags |= client->will_retain << 5;
 
+		/* Will properties (MQTT 5.0 only) */
+		if (mqtt_is_version_5_0(client)) {
+			err_code = will_properties_encode(client, buf);
+			if (err_code != 0) {
+				return err_code;
+			}
+		}
+
 		NET_HEXDUMP_DBG(client->will_topic->topic.utf8,
 				 client->will_topic->topic.size,
 				 "Encoding Will Topic.");
@@ -395,7 +854,92 @@ int connect_request_encode(const struct mqtt_client *client,
 	return mqtt_encode_fixed_header(message_type, start, buf);
 }
 
-int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf)
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t publish_properties_length(const struct mqtt_publish_param *param)
+{
+	return uint8_property_length(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				     param->prop.payload_format_indicator) +
+	       uint32_property_length(param->prop.message_expiry_interval) +
+	       uint16_property_length(param->prop.topic_alias) +
+	       string_property_length(&param->prop.response_topic) +
+	       binary_property_length(&param->prop.correlation_data) +
+	       user_properties_length(param->prop.user_prop) +
+	       /* Client does not include Subscription Identifier in any case. */
+	       string_property_length(&param->prop.content_type);
+}
+
+static int publish_properties_encode(const struct mqtt_publish_param *param,
+				     struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = publish_properties_length(param);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint8_property(MQTT_PROP_PAYLOAD_FORMAT_INDICATOR,
+				    param->prop.payload_format_indicator, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_MESSAGE_EXPIRY_INTERVAL,
+				     param->prop.message_expiry_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint16_property(MQTT_PROP_TOPIC_ALIAS,
+				     param->prop.topic_alias, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_RESPONSE_TOPIC,
+				     &param->prop.response_topic, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_CORRELATION_DATA,
+				     &param->prop.correlation_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	/* Client does not include Subscription Identifier in any case. */
+
+	err = encode_string_property(MQTT_PROP_CONTENT_TYPE,
+				     &param->prop.content_type, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int publish_properties_encode(const struct mqtt_publish_param *param,
+				     struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int publish_encode(const struct mqtt_client *client,
+		   const struct mqtt_publish_param *param,
+		   struct buf_ctx *buf)
 {
 	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
 			MQTT_PKT_TYPE_PUBLISH, param->dup_flag,
@@ -424,6 +968,13 @@ int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf)
 		}
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = publish_properties_encode(param, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	/* Do not copy payload. We move the buffer pointer to ensure that
 	 * message length in fixed header is encoded correctly.
 	 */
@@ -439,58 +990,366 @@ int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf)
 	return 0;
 }
 
-int publish_ack_encode(const struct mqtt_puback_param *param,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t common_ack_properties_length(
+	const struct mqtt_common_ack_properties *prop)
+{
+	return user_properties_length(prop->user_prop) +
+	       string_property_length(&prop->reason_string);
+}
+
+static int common_ack_properties_encode(
+	const struct mqtt_common_ack_properties *prop,
+	struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = common_ack_properties_length(prop);
+	/* Properties length can be omitted if equal to 0. */
+	if (properties_len == 0) {
+		return 0;
+	}
+
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(prop->user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_REASON_STRING,
+				     &prop->reason_string, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else /* CONFIG_MQTT_VERSION_5_0 */
+static uint32_t common_ack_properties_length(
+	const struct mqtt_common_ack_properties *prop)
+{
+	return 0;
+}
+
+static int common_ack_properties_encode(
+	const struct mqtt_common_ack_properties *prop,
+	struct buf_ctx *buf)
+{
+	ARG_UNUSED(prop);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+static int common_ack_encode(
+	uint8_t message_type, uint16_t message_id,  uint8_t reason_code,
+	const struct mqtt_common_ack_properties *prop,
+	struct buf_ctx *buf)
+{
+	int err_code;
+	uint8_t *start;
+
+	/* Message id zero is not permitted by spec. */
+	if (message_id == 0U) {
+		return -EINVAL;
+	}
+
+	/* Reserve space for fixed header. */
+	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
+	start = buf->cur;
+
+	err_code = pack_uint16(message_id, buf);
+	if (err_code != 0) {
+		return err_code;
+	}
+
+	/* For MQTT < 5.0 properties are NULL. */
+	if (prop != NULL) {
+		/* The Reason Code and Property Length can be omitted if the
+		 * Reason Code is 0x00 (Success) and there are no Properties.
+		 */
+		if (common_ack_properties_length(prop) == 0 &&
+		    reason_code == 0) {
+			goto out;
+		}
+
+		err_code = pack_uint8(reason_code, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+
+		err_code = common_ack_properties_encode(prop, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
+out:
+	return mqtt_encode_fixed_header(message_type, start, buf);
+}
+
+int publish_ack_encode(const struct mqtt_client *client,
+		       const struct mqtt_puback_param *param,
 		       struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBACK, 0, 0, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
+
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
-int publish_receive_encode(const struct mqtt_pubrec_param *param,
+int publish_receive_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrec_param *param,
 			   struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBREC, 0, 0, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
-int publish_release_encode(const struct mqtt_pubrel_param *param,
+int publish_release_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrel_param *param,
 			   struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBREL, 0, 1, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
+
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
-int publish_complete_encode(const struct mqtt_pubcomp_param *param,
+int publish_complete_encode(const struct mqtt_client *client,
+			    const struct mqtt_pubcomp_param *param,
 			    struct buf_ctx *buf)
 {
 	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBCOMP, 0, 0, 0);
+	const struct mqtt_common_ack_properties *prop = NULL;
+	uint8_t reason_code = 0;
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	if (mqtt_is_version_5_0(client)) {
+		prop = &param->prop;
+		reason_code = param->reason_code;
+	}
+#endif
 
-	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
+	return common_ack_encode(message_type, param->message_id,
+				 reason_code, prop, buf);
 }
 
-int disconnect_encode(struct buf_ctx *buf)
+static int empty_disconnect_encode(struct buf_ctx *buf)
 {
 	uint8_t *cur = buf->cur;
 	uint8_t *end = buf->end;
 
-	if ((end - cur) < sizeof(disc_packet)) {
+	if ((end - cur) < sizeof(empty_disc_packet)) {
 		return -ENOMEM;
 	}
 
-	memcpy(cur, disc_packet, sizeof(disc_packet));
-	buf->end = (cur + sizeof(disc_packet));
+	memcpy(cur, empty_disc_packet, sizeof(empty_disc_packet));
+	buf->end = (cur + sizeof(empty_disc_packet));
+
+	return 0;
+}
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t disconnect_properties_length(const struct mqtt_disconnect_param *param)
+{
+	return uint32_property_length(param->prop.session_expiry_interval) +
+	       string_property_length(&param->prop.reason_string) +
+	       user_properties_length(param->prop.user_prop) +
+	       string_property_length(&param->prop.server_reference);
+}
+
+static int disconnect_properties_encode(const struct mqtt_disconnect_param *param,
+					struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = disconnect_properties_length(param);
+	/* Disconnect properties length can be omitted if equal to 0. */
+	if (properties_len == 0) {
+		return 0;
+	}
+
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_uint32_property(MQTT_PROP_SESSION_EXPIRY_INTERVAL,
+				     param->prop.session_expiry_interval, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_REASON_STRING,
+				     &param->prop.reason_string, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_SERVER_REFERENCE,
+				     &param->prop.server_reference, buf);
+	if (err < 0) {
+		return err;
+	}
 
 	return 0;
 }
 
-int subscribe_encode(const struct mqtt_subscription_list *param,
+static int disconnect_5_0_encode(const struct mqtt_disconnect_param *param,
+				 struct buf_ctx *buf)
+{
+	const uint8_t message_type =
+		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_DISCONNECT, 0, 0, 0);
+	uint8_t *start;
+	int err;
+
+	/* The Reason Code and Property Length can be omitted if the Reason Code
+	 * is 0x00 (Normal disconnecton) and there are no Properties.
+	 */
+	if ((param->reason_code == MQTT_DISCONNECT_NORMAL) &&
+	    (disconnect_properties_length(param) == 0U)) {
+		return empty_disconnect_encode(buf);
+	}
+
+	/* Reserve space for fixed header. */
+	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
+	start = buf->cur;
+
+	err = pack_uint8(param->reason_code, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = disconnect_properties_encode(param, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	err = mqtt_encode_fixed_header(message_type, start, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int disconnect_5_0_encode(const struct mqtt_disconnect_param *param,
+				 struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int disconnect_encode(const struct mqtt_client *client,
+		      const struct mqtt_disconnect_param *param,
+		      struct buf_ctx *buf)
+{
+	if (!mqtt_is_version_5_0(client) || param == NULL) {
+		return empty_disconnect_encode(buf);
+	}
+
+	return disconnect_5_0_encode(param, buf);
+}
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t subscribe_properties_length(
+			const struct mqtt_subscription_list *param)
+{
+	return var_int_property_length(param->prop.subscription_identifier) +
+	       user_properties_length(param->prop.user_prop);
+}
+
+static int subscribe_properties_encode(const struct mqtt_subscription_list *param,
+				       struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = subscribe_properties_length(param);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_var_int_property(MQTT_PROP_SUBSCRIPTION_IDENTIFIER,
+				      param->prop.subscription_identifier,
+				      buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int subscribe_properties_encode(const struct mqtt_subscription_list *param,
+				       struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int subscribe_encode(const struct mqtt_client *client,
+		     const struct mqtt_subscription_list *param,
 		     struct buf_ctx *buf)
 {
 	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
@@ -512,6 +1371,13 @@ int subscribe_encode(const struct mqtt_subscription_list *param,
 		return err_code;
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = subscribe_properties_encode(param, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	for (i = 0; i < param->list_count; i++) {
 		err_code = pack_utf8_str(&param->list[i].topic, buf);
 		if (err_code != 0) {
@@ -527,7 +1393,46 @@ int subscribe_encode(const struct mqtt_subscription_list *param,
 	return mqtt_encode_fixed_header(message_type, start, buf);
 }
 
-int unsubscribe_encode(const struct mqtt_subscription_list *param,
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t unsubscribe_properties_length(
+			const struct mqtt_subscription_list *param)
+{
+	return user_properties_length(param->prop.user_prop);
+}
+
+static int unsubscribe_properties_encode(
+		const struct mqtt_subscription_list *param, struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = unsubscribe_properties_length(param);
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+#else
+static int unsubscribe_properties_encode(
+		const struct mqtt_subscription_list *param, struct buf_ctx *buf)
+{
+	ARG_UNUSED(param);
+	ARG_UNUSED(buf);
+
+	return -ENOTSUP;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+int unsubscribe_encode(const struct mqtt_client *client,
+		       const struct mqtt_subscription_list *param,
 		       struct buf_ctx *buf)
 {
 	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
@@ -544,6 +1449,13 @@ int unsubscribe_encode(const struct mqtt_subscription_list *param,
 		return err_code;
 	}
 
+	if (mqtt_is_version_5_0(client)) {
+		err_code = unsubscribe_properties_encode(param, buf);
+		if (err_code != 0) {
+			return err_code;
+		}
+	}
+
 	for (i = 0; i < param->list_count; i++) {
 		err_code = pack_utf8_str(&param->list[i].topic, buf);
 		if (err_code != 0) {
@@ -568,3 +1480,109 @@ int ping_request_encode(struct buf_ctx *buf)
 
 	return 0;
 }
+
+#if defined(CONFIG_MQTT_VERSION_5_0)
+static uint32_t auth_properties_length(const struct mqtt_auth_param *param)
+{
+	return string_property_length(&param->prop.auth_method) +
+	       binary_property_length(&param->prop.auth_data) +
+	       string_property_length(&param->prop.reason_string) +
+	       user_properties_length(param->prop.user_prop);
+}
+
+static int auth_properties_encode(const struct mqtt_auth_param *param,
+				  struct buf_ctx *buf)
+{
+	uint32_t properties_len;
+	int err;
+
+	/* Precalculate total properties length */
+	properties_len = auth_properties_length(param);
+	if (properties_len == 0) {
+		return 0;
+	}
+
+	err = pack_variable_int(properties_len, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_AUTHENTICATION_METHOD,
+				     &param->prop.auth_method, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_binary_property(MQTT_PROP_AUTHENTICATION_DATA,
+				     &param->prop.auth_data, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_string_property(MQTT_PROP_REASON_STRING,
+				     &param->prop.reason_string, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = encode_user_properties(param->prop.user_prop, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	return 0;
+}
+
+static int empty_auth_encode(struct buf_ctx *buf)
+{
+	const uint8_t empty_auth_packet[] = {
+		MQTT_PKT_TYPE_AUTH,
+		0x00
+	};
+	uint8_t *cur = buf->cur;
+	uint8_t *end = buf->end;
+
+	if ((end - cur) < sizeof(empty_auth_packet)) {
+		return -ENOMEM;
+	}
+
+	memcpy(cur, empty_auth_packet, sizeof(empty_auth_packet));
+	buf->end = (cur + sizeof(empty_auth_packet));
+
+	return 0;
+}
+
+int auth_encode(const struct mqtt_auth_param *param, struct buf_ctx *buf)
+{
+	const uint8_t message_type =
+		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_AUTH, 0, 0, 0);
+	uint8_t *start;
+	int err;
+
+	/* Reserve space for fixed header. */
+	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
+	start = buf->cur;
+
+	if ((param->reason_code == MQTT_AUTH_SUCCESS) &&
+	    (auth_properties_length(param) == 0U)) {
+		return empty_auth_encode(buf);
+	}
+
+	err = pack_uint8(param->reason_code, buf);
+	if (err < 0) {
+		return err;
+	}
+
+	err = auth_properties_encode(param, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	err = mqtt_encode_fixed_header(message_type, start, buf);
+	if (err != 0) {
+		return err;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index e64bac87f4bab..a065712fe5f8c 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -54,6 +54,36 @@ extern "C" {
 #define MQTT_PKT_TYPE_PINGREQ     0xC0
 #define MQTT_PKT_TYPE_PINGRSP     0xD0
 #define MQTT_PKT_TYPE_DISCONNECT  0xE0
+#define MQTT_PKT_TYPE_AUTH        0xF0
+
+/**@brief MQTT Property Types. */
+#define MQTT_PROP_PAYLOAD_FORMAT_INDICATOR          0x01
+#define MQTT_PROP_MESSAGE_EXPIRY_INTERVAL           0x02
+#define MQTT_PROP_CONTENT_TYPE                      0x03
+#define MQTT_PROP_RESPONSE_TOPIC                    0x08
+#define MQTT_PROP_CORRELATION_DATA                  0x09
+#define MQTT_PROP_SUBSCRIPTION_IDENTIFIER           0x0B
+#define MQTT_PROP_SESSION_EXPIRY_INTERVAL           0x11
+#define MQTT_PROP_ASSIGNED_CLIENT_IDENTIFIER        0x12
+#define MQTT_PROP_SERVER_KEEP_ALIVE                 0x13
+#define MQTT_PROP_AUTHENTICATION_METHOD             0x15
+#define MQTT_PROP_AUTHENTICATION_DATA               0x16
+#define MQTT_PROP_REQUEST_PROBLEM_INFORMATION       0x17
+#define MQTT_PROP_WILL_DELAY_INTERVAL               0x18
+#define MQTT_PROP_REQUEST_RESPONSE_INFORMATION      0x19
+#define MQTT_PROP_RESPONSE_INFORMATION              0x1A
+#define MQTT_PROP_SERVER_REFERENCE                  0x1C
+#define MQTT_PROP_REASON_STRING                     0x1F
+#define MQTT_PROP_RECEIVE_MAXIMUM                   0x21
+#define MQTT_PROP_TOPIC_ALIAS_MAXIMUM               0x22
+#define MQTT_PROP_TOPIC_ALIAS                       0x23
+#define MQTT_PROP_MAXIMUM_QOS                       0x24
+#define MQTT_PROP_RETAIN_AVAILABLE                  0x25
+#define MQTT_PROP_USER_PROPERTY                     0x26
+#define MQTT_PROP_MAXIMUM_PACKET_SIZE               0x27
+#define MQTT_PROP_WILDCARD_SUBSCRIPTION_AVAILABLE   0x28
+#define MQTT_PROP_SUBSCRIPTION_IDENTIFIER_AVAILABLE 0x29
+#define MQTT_PROP_SHARED_SUBSCRIPTION_AVAILABLE     0x2A
 
 /**@brief Masks for MQTT header flags. */
 #define MQTT_HEADER_DUP_MASK     0x08
@@ -76,7 +106,7 @@ extern "C" {
 #define GET_UT8STR_BUFFER_SIZE(STR) (sizeof(uint16_t) + (STR)->size)
 
 /**@brief Computes total size needed to pack a binary stream. */
-#define GET_BINSTR_BUFFER_SIZE(STR) ((STR)->len)
+#define GET_BINSTR_BUFFER_SIZE(STR) (sizeof(uint16_t) + (STR)->len)
 
 /**@brief Sets MQTT Client's state with one indicated in 'STATE'. */
 #define MQTT_SET_STATE(CLIENT, STATE) ((CLIENT)->internal.state |= (STATE))
@@ -147,6 +177,12 @@ enum mqtt_state {
 	MQTT_STATE_CONNECTED            = 0x00000004,
 };
 
+static inline int mqtt_is_version_5_0(const struct mqtt_client *client)
+{
+	return (IS_ENABLED(CONFIG_MQTT_VERSION_5_0) &&
+		client->protocol_version == MQTT_VERSION_5_0);
+}
+
 /**@brief Notify application about MQTT event.
  *
  * @param[in] client Identifies the client for which event occurred.
@@ -162,6 +198,16 @@ void event_notify(struct mqtt_client *client, const struct mqtt_evt *evt);
  */
 int mqtt_handle_rx(struct mqtt_client *client);
 
+/**@brief Disconnect MQTT client.
+ *
+ * @param[in] client Identifies the client which disconnects.
+ * @param[in] result Disconnect reason.
+ * @param[in] notify Whether to notify the app or not.
+
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+void mqtt_client_disconnect(struct mqtt_client *client, int result, bool notify);
+
 /**@brief Constructs/encodes Connect packet.
  *
  * @param[in] client Identifies the client for which the procedure is requested.
@@ -189,7 +235,9 @@ int connect_request_encode(const struct mqtt_client *client,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf);
+int publish_encode(const struct mqtt_client *client,
+		   const struct mqtt_publish_param *param,
+		   struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Ack packet.
  *
@@ -201,7 +249,8 @@ int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf);
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_ack_encode(const struct mqtt_puback_param *param,
+int publish_ack_encode(const struct mqtt_client *client,
+		       const struct mqtt_puback_param *param,
 		       struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Receive packet.
@@ -214,7 +263,8 @@ int publish_ack_encode(const struct mqtt_puback_param *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_receive_encode(const struct mqtt_pubrec_param *param,
+int publish_receive_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrec_param *param,
 			   struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Release packet.
@@ -227,7 +277,8 @@ int publish_receive_encode(const struct mqtt_pubrec_param *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_release_encode(const struct mqtt_pubrel_param *param,
+int publish_release_encode(const struct mqtt_client *client,
+			   const struct mqtt_pubrel_param *param,
 			   struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Publish Complete packet.
@@ -240,7 +291,8 @@ int publish_release_encode(const struct mqtt_pubrel_param *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_complete_encode(const struct mqtt_pubcomp_param *param,
+int publish_complete_encode(const struct mqtt_client *client,
+			    const struct mqtt_pubcomp_param *param,
 			    struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Disconnect packet.
@@ -252,7 +304,9 @@ int publish_complete_encode(const struct mqtt_pubcomp_param *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int disconnect_encode(struct buf_ctx *buf);
+int disconnect_encode(const struct mqtt_client *client,
+		      const struct mqtt_disconnect_param *param,
+		      struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Subscribe packet.
  *
@@ -264,7 +318,8 @@ int disconnect_encode(struct buf_ctx *buf);
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int subscribe_encode(const struct mqtt_subscription_list *param,
+int subscribe_encode(const struct mqtt_client *client,
+		     const struct mqtt_subscription_list *param,
 		     struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Unsubscribe packet.
@@ -277,7 +332,8 @@ int subscribe_encode(const struct mqtt_subscription_list *param,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int unsubscribe_encode(const struct mqtt_subscription_list *param,
+int unsubscribe_encode(const struct mqtt_client *client,
+		       const struct mqtt_subscription_list *param,
 		       struct buf_ctx *buf);
 
 /**@brief Constructs/encodes Ping Request packet.
@@ -291,6 +347,20 @@ int unsubscribe_encode(const struct mqtt_subscription_list *param,
  */
 int ping_request_encode(struct buf_ctx *buf);
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**@brief Constructs/encodes Authenticate packet.
+ *
+ * @param[in] param Authenticate message parameters.
+ * @param[inout] buf_ctx Pointer to the buffer context structure,
+ *                       containing buffer for the encoded message.
+ *                       As output points to the beginning and end of
+ *                       the frame.
+ *
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+int auth_encode(const struct mqtt_auth_param *param, struct buf_ctx *buf);
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
 /**@brief Decode MQTT Packet Type and Length in the MQTT fixed header.
  *
  * @param[inout] buf A pointer to the buf_ctx structure containing current
@@ -317,6 +387,7 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 
 /**@brief Decode MQTT Publish packet.
  *
+ * @param[inout] MQTT client for which packet is decoded.
  * @param[in] flags Byte containing message type and flags.
  * @param[in] var_length Length of the variable part of the message.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
@@ -325,74 +396,144 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
+int publish_decode(struct mqtt_client *client, uint8_t flags,
+		   uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param);
 
 /**@brief Decode MQTT Publish Ack packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Ack parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_ack_decode(struct buf_ctx *buf, struct mqtt_puback_param *param);
+int publish_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		       struct mqtt_puback_param *param);
 
 /**@brief Decode MQTT Publish Receive packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Receive parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_receive_decode(struct buf_ctx *buf,
+int publish_receive_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_pubrec_param *param);
 
 /**@brief Decode MQTT Publish Release packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Release parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_release_decode(struct buf_ctx *buf,
+int publish_release_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_pubrel_param *param);
 
 /**@brief Decode MQTT Publish Complete packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Publish Complete parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_complete_decode(struct buf_ctx *buf,
+int publish_complete_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			    struct mqtt_pubcomp_param *param);
 
 /**@brief Decode MQTT Subscribe packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Subscribe parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int subscribe_ack_decode(struct buf_ctx *buf,
+int subscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			 struct mqtt_suback_param *param);
 
 /**@brief Decode MQTT Unsubscribe packet.
  *
+ * @param[in] MQTT client for which packet is decoded.
  * @param[inout] buf A pointer to the buf_ctx structure containing current
  *                   buffer position.
  * @param[out] param Pointer to buffer for decoded Unsubscribe parameters.
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int unsubscribe_ack_decode(struct buf_ctx *buf,
+int unsubscribe_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 			   struct mqtt_unsuback_param *param);
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+/**@brief Decode MQTT Disconnect packet.
+ *
+ * @param[in] MQTT client for which packet is decoded.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] param Pointer to buffer for decoded Disconnect parameters.
+ *
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+int disconnect_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		      struct mqtt_disconnect_param *param);
+
+/**@brief Decode MQTT Auth packet.
+ *
+ * @param[in] MQTT client for which packet is decoded.
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] param Pointer to buffer for decoded Auth parameters.
+ *
+ * @return 0 if the procedure is successful, an error code otherwise.
+ */
+int auth_decode(const struct mqtt_client *client, struct buf_ctx *buf,
+		struct mqtt_auth_param *param);
+
+/**@brief Set MQTT 5.0 disconnect reason.
+ *
+ * Packet parser can use this function to set a custom disconnect reason code,
+ * if not set, the client will use the default mapping between errno values and
+ * reason codes.
+ *
+ * @param[inout] MQTT client.
+ * @param[in] reason MQTT 5.0 disconnect reason code.
+ */
+static inline void set_disconnect_reason(struct mqtt_client *client,
+					 enum mqtt_disconnect_reason_code reason)
+{
+	client->internal.disconnect_reason = reason;
+}
+#else
+static inline void set_disconnect_reason(struct mqtt_client *client,
+					 enum mqtt_disconnect_reason_code reason)
+{
+	ARG_UNUSED(client);
+	ARG_UNUSED(reason);
+}
+#endif /* CONFIG_MQTT_VERSION_5_0 */
+
+/**
+ * @brief Unpacks variable length integer from the buffer from the offset
+ *        requested.
+ *
+ * @param[inout] buf A pointer to the buf_ctx structure containing current
+ *                   buffer position.
+ * @param[out] val Memory where the value is to be unpacked.
+ *
+ * @retval Number of bytes parsed if the procedure is successful.
+ * @retval -EINVAL if the length decoding would use more that 4 bytes.
+ * @retval -EAGAIN if the buffer would be exceeded during the read.
+ */
+int unpack_variable_int(struct buf_ctx *buf, uint32_t *val);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index 27fa2410d2c7f..057bccce9cb1f 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -23,7 +23,7 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 {
 	int err_code = 0;
 	bool notify_event = true;
-	struct mqtt_evt evt;
+	struct mqtt_evt evt = { 0 };
 
 	/* Success by default, overwritten in special cases. */
 	evt.result = 0;
@@ -38,6 +38,9 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 			NET_DBG("[CID %p]: return_code: %d", client,
 				 evt.param.connack.return_code);
 
+			/* For MQTT 5.0 this is still valid as MQTT_CONNACK_SUCCESS
+			 * is encoded as 0 as well.
+			 */
 			if (evt.param.connack.return_code ==
 						MQTT_CONNECTION_ACCEPTED) {
 				/* Set state. */
@@ -57,8 +60,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBLISH", client);
 
 		evt.type = MQTT_EVT_PUBLISH;
-		err_code = publish_decode(type_and_flags, var_length, buf,
-					  &evt.param.publish);
+		err_code = publish_decode(client, type_and_flags, var_length,
+					  buf, &evt.param.publish);
 		evt.result = err_code;
 
 		client->internal.remaining_payload =
@@ -75,7 +78,7 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBACK!", client);
 
 		evt.type = MQTT_EVT_PUBACK;
-		err_code = publish_ack_decode(buf, &evt.param.puback);
+		err_code = publish_ack_decode(client, buf, &evt.param.puback);
 		evt.result = err_code;
 		break;
 
@@ -83,7 +86,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBREC!", client);
 
 		evt.type = MQTT_EVT_PUBREC;
-		err_code = publish_receive_decode(buf, &evt.param.pubrec);
+		err_code = publish_receive_decode(client, buf,
+						  &evt.param.pubrec);
 		evt.result = err_code;
 		break;
 
@@ -91,7 +95,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBREL!", client);
 
 		evt.type = MQTT_EVT_PUBREL;
-		err_code = publish_release_decode(buf, &evt.param.pubrel);
+		err_code = publish_release_decode(client, buf,
+						  &evt.param.pubrel);
 		evt.result = err_code;
 		break;
 
@@ -99,7 +104,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_PUBCOMP!", client);
 
 		evt.type = MQTT_EVT_PUBCOMP;
-		err_code = publish_complete_decode(buf, &evt.param.pubcomp);
+		err_code = publish_complete_decode(client, buf,
+						   &evt.param.pubcomp);
 		evt.result = err_code;
 		break;
 
@@ -107,7 +113,7 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_SUBACK!", client);
 
 		evt.type = MQTT_EVT_SUBACK;
-		err_code = subscribe_ack_decode(buf, &evt.param.suback);
+		err_code = subscribe_ack_decode(client, buf, &evt.param.suback);
 		evt.result = err_code;
 		break;
 
@@ -115,7 +121,8 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		NET_DBG("[CID %p]: Received MQTT_PKT_TYPE_UNSUBACK!", client);
 
 		evt.type = MQTT_EVT_UNSUBACK;
-		err_code = unsubscribe_ack_decode(buf, &evt.param.unsuback);
+		err_code = unsubscribe_ack_decode(client, buf,
+						  &evt.param.unsuback);
 		evt.result = err_code;
 		break;
 
@@ -132,6 +139,35 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 		evt.type = MQTT_EVT_PINGRESP;
 		break;
 
+#if defined(CONFIG_MQTT_VERSION_5_0)
+	case MQTT_PKT_TYPE_DISCONNECT:
+		evt.type = MQTT_EVT_DISCONNECT;
+		err_code = disconnect_decode(client, buf, &evt.param.disconnect);
+		if (err_code == 0) {
+			evt.result = evt.param.disconnect.reason_code;
+			/* Don't notify yet, the code below will handle this. */
+			mqtt_client_disconnect(client, evt.result, false);
+		} else {
+			/* Again, don't notify yet, error handling code will
+			 * disconnect and report error.
+			 */
+			notify_event = false;
+		}
+
+		break;
+
+	case MQTT_PKT_TYPE_AUTH:
+		evt.type = MQTT_EVT_AUTH;
+		err_code = auth_decode(client, buf, &evt.param.auth);
+		if (err_code == 0) {
+			evt.result = evt.param.auth.reason_code;
+		} else {
+			notify_event = false;
+		}
+
+		break;
+#endif
+
 	default:
 		/* Nothing to notify. */
 		notify_event = false;
@@ -218,7 +254,42 @@ static int mqtt_read_publish_var_header(struct mqtt_client *client,
 		variable_header_length += sizeof(uint16_t);
 	}
 
-	/* Now we can read the whole header. */
+	if (mqtt_is_version_5_0(client)) {
+		struct buf_ctx backup;
+		uint8_t var_len = 1;
+		uint32_t prop_len = 0;
+
+		while (true) {
+			err_code = mqtt_read_message_chunk(
+				client, buf, variable_header_length + var_len);
+			if (err_code < 0) {
+				return err_code;
+			}
+
+			backup = *buf;
+			buf->cur += variable_header_length;
+
+			/* Try to decode variable integer, in case integer is
+			 * not complete, read more bytes from the stream and retry.
+			 */
+			err_code = unpack_variable_int(buf, &prop_len);
+			if (err_code >= 0) {
+				break;
+			}
+
+			if (err_code != -EAGAIN) {
+				return err_code;
+			}
+
+			/* Try again. */
+			var_len++;
+			*buf = backup;
+		}
+
+		*buf = backup;
+		variable_header_length += var_len + prop_len;
+	}
+
 	err_code = mqtt_read_message_chunk(client, buf,
 					   variable_header_length);
 	if (err_code < 0) {
diff --git a/subsys/net/lib/ptp/clock.c b/subsys/net/lib/ptp/clock.c
index f599ca90605e4..e808275dbe403 100644
--- a/subsys/net/lib/ptp/clock.c
+++ b/subsys/net/lib/ptp/clock.c
@@ -509,7 +509,7 @@ int ptp_clock_management_msg_process(struct ptp_port *port, struct ptp_msg *msg)
 void ptp_clock_synchronize(uint64_t ingress, uint64_t egress)
 {
 	int64_t offset;
-	uint64_t delay = ptp_clk.current_ds.mean_delay >> 16;
+	int64_t delay = ptp_clk.current_ds.mean_delay >> 16;
 
 	ptp_clk.timestamp.t1 = egress;
 	ptp_clk.timestamp.t2 = ingress;
@@ -518,7 +518,7 @@ void ptp_clock_synchronize(uint64_t ingress, uint64_t egress)
 		return;
 	}
 
-	offset = ptp_clk.timestamp.t2 - ptp_clk.timestamp.t1 - delay;
+	offset = (int64_t)(ptp_clk.timestamp.t2 - ptp_clk.timestamp.t1) - delay;
 
 	/* If diff is too big, ptp_clk needs to be set first. */
 	if ((offset > (int64_t)NSEC_PER_SEC) || (offset < -(int64_t)NSEC_PER_SEC)) {
@@ -559,8 +559,9 @@ void ptp_clock_delay(uint64_t egress, uint64_t ingress)
 	ptp_clk.timestamp.t3 = egress;
 	ptp_clk.timestamp.t4 = ingress;
 
-	delay = ((ptp_clk.timestamp.t2 - ptp_clk.timestamp.t3) +
-		 (ptp_clk.timestamp.t4 - ptp_clk.timestamp.t1)) / 2;
+	delay = ((int64_t)(ptp_clk.timestamp.t2 - ptp_clk.timestamp.t3) +
+		 (int64_t)(ptp_clk.timestamp.t4 - ptp_clk.timestamp.t1)) /
+		2LL;
 
 	LOG_DBG("Delay %lldns", delay);
 	ptp_clk.current_ds.mean_delay = clock_ns_to_timeinterval(delay);
diff --git a/subsys/net/lib/shell/CMakeLists.txt b/subsys/net/lib/shell/CMakeLists.txt
index 02e9dde5e283c..db06c84d8bb65 100644
--- a/subsys/net/lib/shell/CMakeLists.txt
+++ b/subsys/net/lib/shell/CMakeLists.txt
@@ -24,6 +24,7 @@ zephyr_library_sources(mem.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SHELL_IPV6_SUPPORTED nbr.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SHELL_IP_SUPPORTED ping.c)
 zephyr_library_sources(pkt.c)
+zephyr_library_sources_ifdef(CONFIG_NET_SHELL_PKT_FILTER_SUPPORTED filter.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SHELL_PMTU_SUPPORTED pmtu.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SHELL_PPP_SUPPORTED ppp.c)
 zephyr_library_sources_ifdef(CONFIG_NET_SHELL_POWER_MANAGEMENT_SUPPORTED resume.c)
diff --git a/subsys/net/lib/shell/conn.c b/subsys/net/lib/shell/conn.c
index 24b528537bd38..ca32074a4ef34 100644
--- a/subsys/net/lib/shell/conn.c
+++ b/subsys/net/lib/shell/conn.c
@@ -51,7 +51,6 @@ static void context_cb(struct net_context *context, void *user_data)
 }
 #endif /* CONFIG_NET_OFFLOAD || CONFIG_NET_NATIVE */
 
-#if CONFIG_NET_CONN_LOG_LEVEL >= LOG_LEVEL_DBG
 static void conn_handler_cb(struct net_conn *conn, void *user_data)
 {
 #if defined(CONFIG_NET_IPV6) && !defined(CONFIG_NET_IPV4)
@@ -95,14 +94,13 @@ static void conn_handler_cb(struct net_conn *conn, void *user_data)
 			 conn->local_addr.sa_family);
 	}
 
-	PR("[%2d] %p %p\t%s\t%16s\t%16s\n",
+	PR("[%2d] %p %p  %s\t%16s\t%16s\n",
 	   (*count) + 1, conn, conn->cb,
 	   net_proto2str(conn->local_addr.sa_family, conn->proto),
 	   addr_local, addr_remote);
 
 	(*count)++;
 }
-#endif /* CONFIG_NET_CONN_LOG_LEVEL >= LOG_LEVEL_DBG */
 
 #if CONFIG_NET_TCP_LOG_LEVEL >= LOG_LEVEL_DBG
 struct tcp_detail_info {
@@ -227,8 +225,7 @@ static int cmd_net_conn(const struct shell *sh, size_t argc, char *argv[])
 		PR("No connections\n");
 	}
 
-#if CONFIG_NET_CONN_LOG_LEVEL >= LOG_LEVEL_DBG
-	PR("\n     Handler    Callback  \tProto\tLocal           \tRemote\n");
+	PR("\n     Handler    Callback  Proto            Local                  Remote\n");
 
 	count = 0;
 
@@ -237,7 +234,6 @@ static int cmd_net_conn(const struct shell *sh, size_t argc, char *argv[])
 	if (count == 0) {
 		PR("No connection handlers found.\n");
 	}
-#endif
 
 #if defined(CONFIG_NET_TCP)
 	PR("\nTCP        Context   Src port Dst port   "
diff --git a/subsys/net/lib/shell/events.c b/subsys/net/lib/shell/events.c
index df53290e34cbf..c61922f073d39 100644
--- a/subsys/net/lib/shell/events.c
+++ b/subsys/net/lib/shell/events.c
@@ -481,6 +481,22 @@ static char *get_l4_desc(struct event_msg *msg,
 		*desc = "Capture";
 		*desc2 = "stopped";
 		break;
+	case NET_EVENT_VPN_PEER_ADD:
+		*desc = "VPN peer";
+		*desc2 = "add";
+		break;
+	case NET_EVENT_VPN_PEER_DEL:
+		*desc = "VPN peer";
+		*desc2 = "del";
+		break;
+	case NET_EVENT_VPN_CONNECTED:
+		*desc = "VPN";
+		*desc2 = "connected";
+		break;
+	case NET_EVENT_VPN_DISCONNECTED:
+		*desc = "VPN";
+		*desc2 = "disconnected";
+		break;
 	}
 
 	return info;
@@ -491,7 +507,7 @@ static char *get_l4_desc(struct event_msg *msg,
  */
 static void event_mon_handler(const struct shell *sh, void *p2, void *p3)
 {
-	char extra_info[NET_IPV6_ADDR_LEN];
+	char extra_info[NET_IPV6_ADDR_LEN + sizeof("id 0123456789 ")];
 	struct event_msg msg;
 
 	ARG_UNUSED(p2);
@@ -535,15 +551,15 @@ static void event_mon_handler(const struct shell *sh, void *p2, void *p3)
 		if (layer == NET_MGMT_LAYER_L2) {
 			layer_str = "L2";
 			info = get_l2_desc(&msg, &desc, &desc2,
-					   extra_info, NET_IPV6_ADDR_LEN);
+					   extra_info, sizeof(extra_info));
 		} else if (layer == NET_MGMT_LAYER_L3) {
 			layer_str = "L3";
 			info = get_l3_desc(&msg, &desc, &desc2,
-					   extra_info, NET_IPV6_ADDR_LEN);
+					   extra_info, sizeof(extra_info));
 		} else if (layer == NET_MGMT_LAYER_L4) {
 			layer_str = "L4";
 			info = get_l4_desc(&msg, &desc, &desc2,
-					   extra_info, NET_IPV6_ADDR_LEN);
+					   extra_info, sizeof(extra_info));
 		}
 
 		if (desc == unknown_event_str) {
diff --git a/subsys/net/lib/shell/filter.c b/subsys/net/lib/shell/filter.c
new file mode 100644
index 0000000000000..59de20f588ae1
--- /dev/null
+++ b/subsys/net/lib/shell/filter.c
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(net_shell);
+
+#include <zephyr/net/net_pkt_filter.h>
+
+#include "net_shell_private.h"
+
+
+#if defined(CONFIG_NET_PKT_FILTER)
+static const char *rule_type2str(enum npf_rule_type type)
+{
+	switch (type) {
+	case NPF_RULE_TYPE_SEND:
+		return "send";
+	case NPF_RULE_TYPE_RECV:
+		return "recv";
+	case NPF_RULE_TYPE_LOCAL_IN_RECV:
+		return "local recv";
+	case NPF_RULE_TYPE_IPV4_RECV:
+		return "IPv4 recv";
+	case NPF_RULE_TYPE_IPV6_RECV:
+		return "IPv6 recv";
+	case NPF_RULE_TYPE_UNKNOWN:
+		__fallthrough;
+	default:
+		break;
+	}
+
+	return "<UNKNOWN>";
+}
+
+static const char *verdict2str(enum net_verdict verdict)
+{
+	switch (verdict) {
+	case NET_OK:
+		return "OK";
+	case NET_DROP:
+		return "DROP";
+	case NET_CONTINUE:
+		return "CONTINUE";
+	default:
+		break;
+	}
+
+	return "<UNK>";
+}
+
+static void rule_cb(struct npf_rule *rule, enum npf_rule_type type, void *user_data)
+{
+	struct net_shell_user_data *data = user_data;
+	const struct shell *sh = data->sh;
+	int *count = data->user_data;
+
+	PR("[%2d]  %-10s  %-7s  %-5d",
+	   (*count) + 1, rule_type2str(type), verdict2str(rule->result), rule->nb_tests);
+
+	for (int i = 0; i < rule->nb_tests; i++) {
+		/* Allocate room for storing two full IPv4/6 addresses */
+#define MAX_BUF_LEN ((IS_ENABLED(CONFIG_NET_IPV6) ?		\
+		      INET6_ADDRSTRLEN : INET_ADDRSTRLEN) * 2)
+		char buf[MAX_BUF_LEN] = { 0 };
+		struct npf_test *test;
+		const char *str;
+
+		test = rule->tests[i];
+
+		str = npf_test_get_str(test, buf, sizeof(buf) - 1);
+		PR("%s%s%s", str, buf[0] != '\0' ? buf : "",
+		   i == rule->nb_tests - 1 ? "" : ",");
+	}
+
+	PR("\n");
+	(*count)++;
+}
+#endif /* CONFIG_NET_PKT_FILTER */
+
+static int cmd_net_filter(const struct shell *sh, size_t argc, char *argv[])
+{
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+#if defined(CONFIG_NET_PKT_FILTER)
+	struct net_shell_user_data user_data;
+	int count = 0;
+
+	PR("Rule  %-10s  Verdict  Tests \n", "Type");
+
+	user_data.sh = sh;
+	user_data.user_data = &count;
+
+	npf_rules_foreach(rule_cb, &user_data);
+
+	if (count == 0) {
+		PR("No network packet filter rules\n");
+	}
+#else
+	PR_INFO("Set %s to enable %s support.\n",
+		"CONFIG_NET_PKT_FILTER",
+		"packet filter information");
+
+#endif /* CONFIG_NET_PKT_FILTER */
+
+	return 0;
+}
+
+
+SHELL_SUBCMD_ADD((net), filter, NULL, "Print information about network packet filters.",
+		 cmd_net_filter, 1, 0);
diff --git a/subsys/net/lib/shell/iface.c b/subsys/net/lib/shell/iface.c
index 16604bbe9ac3e..8661a21beb690 100644
--- a/subsys/net/lib/shell/iface.c
+++ b/subsys/net/lib/shell/iface.c
@@ -10,6 +10,8 @@
 #include <strings.h>
 LOG_MODULE_DECLARE(net_shell);
 
+#include <zephyr/sys/base64.h>
+
 #if defined(CONFIG_NET_L2_ETHERNET)
 #include <zephyr/net/ethernet.h>
 #endif
@@ -18,6 +20,7 @@ LOG_MODULE_DECLARE(net_shell);
 #endif
 #if defined(CONFIG_NET_L2_VIRTUAL)
 #include <zephyr/net/virtual.h>
+#include <zephyr/net/virtual_mgmt.h>
 #endif
 #if defined(CONFIG_ETH_PHY_DRIVER)
 #include <zephyr/net/phy.h>
@@ -156,6 +159,9 @@ static void iface_cb(struct net_if *iface, void *user_data)
 {
 	struct net_shell_user_data *data = user_data;
 	const struct shell *sh = data->sh;
+	int ret;
+
+	ARG_UNUSED(ret); /* could be unused depending on config */
 
 #if defined(CONFIG_NET_NATIVE_IPV6)
 	struct net_if_ipv6_prefix *prefix;
@@ -173,7 +179,6 @@ static void iface_cb(struct net_if *iface, void *user_data)
 #endif
 #if defined(CONFIG_NET_L2_ETHERNET_MGMT)
 	struct ethernet_req_params params;
-	int ret;
 #endif
 	const char *extra;
 #if defined(CONFIG_NET_IP) || defined(CONFIG_NET_L2_ETHERNET_MGMT)
@@ -257,11 +262,42 @@ static void iface_cb(struct net_if *iface, void *user_data)
 			   orig_iface);
 		}
 	}
+
+	if (IS_ENABLED(CONFIG_NET_VPN) &&
+	    net_if_l2(iface) == &NET_L2_GET_NAME(VIRTUAL)) {
+		if (net_virtual_get_iface_capabilities(iface) & VIRTUAL_INTERFACE_VPN) {
+			struct virtual_interface_req_params vparams = { 0 };
+			char public_key[NET_VIRTUAL_MAX_PUBLIC_KEY_LEN * 2];
+			size_t olen;
+
+			ret = net_mgmt(NET_REQUEST_VIRTUAL_INTERFACE_GET_PUBLIC_KEY,
+				       iface, &vparams, sizeof(vparams));
+			if (ret < 0) {
+				PR_WARNING("Cannot get VPN public key (%d)\n", ret);
+			} else {
+				bool all_zeros = true;
+
+				for (int i = 0;
+				     all_zeros && i < NET_VIRTUAL_MAX_PUBLIC_KEY_LEN; i++) {
+					all_zeros = (vparams.public_key.data[i] == 0);
+				}
+
+				if (all_zeros) {
+					PR("Public key: <not set>\n");
+				} else {
+					(void)base64_encode(public_key, sizeof(public_key),
+							    &olen, vparams.public_key.data,
+							    vparams.public_key.len);
+
+					PR("Public key: %s\n", public_key);
+				}
+			}
+		}
+	}
 #endif /* CONFIG_NET_L2_VIRTUAL */
 
 	net_if_lock(iface);
-	if (net_if_get_link_addr(iface) &&
-	    net_if_get_link_addr(iface)->addr) {
+	if (net_if_get_link_addr(iface)->len > 0) {
 		PR("Link addr : %s\n",
 		   net_sprint_ll_addr(net_if_get_link_addr(iface)->addr,
 				      net_if_get_link_addr(iface)->len));
@@ -279,6 +315,20 @@ static void iface_cb(struct net_if *iface, void *user_data)
 	   net_if_is_admin_up(iface) ? "UP" : "DOWN",
 	   net_if_is_carrier_ok(iface) ? "ON" : "OFF");
 
+#if defined(CONFIG_NET_IF_LOG_LEVEL_DBG)
+	/* Print low level details only if debug is enabled */
+	if (IS_ENABLED(CONFIG_NET_IPV4) && net_if_flag_is_set(iface, NET_IF_IPV4)) {
+		PR("IPv4 TTL             : %d\n", net_if_ipv4_get_ttl(iface));
+		PR("IPv4 mcast TTL       : %d\n", net_if_ipv4_get_mcast_ttl(iface));
+	}
+
+	if (IS_ENABLED(CONFIG_NET_IPV6) && net_if_flag_is_set(iface, NET_IF_IPV6)) {
+		PR("IPv6 hop limit       : %d\n", net_if_ipv6_get_hop_limit(iface));
+		PR("IPv6 mcast hop limit : %d\n",
+		   net_if_ipv6_get_mcast_hop_limit(iface));
+	}
+#endif /* CONFIG_NET_IF_LOG_LEVEL_DBG */
+
 #if defined(CONFIG_NET_L2_ETHERNET_MGMT)
 	if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET)) {
 		count = 0;
@@ -453,20 +503,22 @@ static void iface_cb(struct net_if *iface, void *user_data)
 
 #if defined(CONFIG_NET_DHCPV6)
 	if (net_if_flag_is_set(iface, NET_IF_IPV6)) {
-		PR("DHCPv6 renewal time (T1) : %llu ms\n",
-		   iface->config.dhcpv6.t1);
-		PR("DHCPv6 rebind time (T2)  : %llu ms\n",
-		   iface->config.dhcpv6.t2);
-		PR("DHCPv6 expire time       : %llu ms\n",
-		   iface->config.dhcpv6.expire);
-		if (iface->config.dhcpv6.params.request_addr) {
-			PR("DHCPv6 address           : %s\n",
-			   net_sprint_ipv6_addr(&iface->config.dhcpv6.addr));
-		}
+		if (iface->config.dhcpv6.state != NET_DHCPV6_DISABLED) {
+			PR("DHCPv6 renewal time (T1) : %llu ms\n",
+			   iface->config.dhcpv6.t1);
+			PR("DHCPv6 rebind time (T2)  : %llu ms\n",
+			   iface->config.dhcpv6.t2);
+			PR("DHCPv6 expire time       : %llu ms\n",
+			   iface->config.dhcpv6.expire);
+			if (iface->config.dhcpv6.params.request_addr) {
+				PR("DHCPv6 address           : %s\n",
+				   net_sprint_ipv6_addr(&iface->config.dhcpv6.addr));
+			}
 
-		if (iface->config.dhcpv6.params.request_prefix) {
-			PR("DHCPv6 prefix            : %s\n",
-			   net_sprint_ipv6_addr(&iface->config.dhcpv6.prefix));
+			if (iface->config.dhcpv6.params.request_prefix) {
+				PR("DHCPv6 prefix            : %s\n",
+				   net_sprint_ipv6_addr(&iface->config.dhcpv6.prefix));
+			}
 		}
 
 		PR("DHCPv6 state             : %s\n",
@@ -551,18 +603,23 @@ static void iface_cb(struct net_if *iface, void *user_data)
 
 #if defined(CONFIG_NET_DHCPV4)
 	if (net_if_flag_is_set(iface, NET_IF_IPV4)) {
-		PR("DHCPv4 lease time : %u\n",
-		   iface->config.dhcpv4.lease_time);
-		PR("DHCPv4 renew time : %u\n",
-		   iface->config.dhcpv4.renewal_time);
-		PR("DHCPv4 server     : %s\n",
-		   net_sprint_ipv4_addr(&iface->config.dhcpv4.server_id));
-		PR("DHCPv4 requested  : %s\n",
-		   net_sprint_ipv4_addr(&iface->config.dhcpv4.requested_ip));
+		if (iface->config.dhcpv4.state != NET_DHCPV4_DISABLED) {
+			PR("DHCPv4 lease time : %u\n",
+			   iface->config.dhcpv4.lease_time);
+			PR("DHCPv4 renew time : %u\n",
+			   iface->config.dhcpv4.renewal_time);
+			PR("DHCPv4 server     : %s\n",
+			   net_sprint_ipv4_addr(&iface->config.dhcpv4.server_id));
+			PR("DHCPv4 requested  : %s\n",
+			   net_sprint_ipv4_addr(&iface->config.dhcpv4.requested_ip));
+			PR("DHCPv4 state      : %s\n",
+			   net_dhcpv4_state_name(iface->config.dhcpv4.state));
+			PR("DHCPv4 attempts   : %d\n",
+			   iface->config.dhcpv4.attempts);
+		}
+
 		PR("DHCPv4 state      : %s\n",
 		   net_dhcpv4_state_name(iface->config.dhcpv4.state));
-		PR("DHCPv4 attempts   : %d\n",
-		   iface->config.dhcpv4.attempts);
 	}
 #endif /* CONFIG_NET_DHCPV4 */
 }
@@ -711,8 +768,10 @@ static int cmd_net_iface(const struct shell *sh, size_t argc, char *argv[])
 	}
 
 #if defined(CONFIG_NET_HOSTNAME_ENABLE)
-	PR("Hostname: %s\n\n", net_hostname_get());
+	PR("Hostname: %s\n", net_hostname_get());
 #endif
+	PR("Default interface: %d\n\n",
+	   net_if_get_by_iface(net_if_get_default()));
 
 	user_data.sh = sh;
 	user_data.user_data = iface;
@@ -722,6 +781,42 @@ static int cmd_net_iface(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
+static int cmd_net_default_iface(const struct shell *sh, size_t argc, char *argv[])
+{
+	struct net_if *iface = NULL;
+	int idx;
+
+	if (argc < 2) {
+		iface = net_if_get_default();
+		if (!iface) {
+			PR_WARNING("No default interface\n");
+			return -ENOEXEC;
+		}
+
+		idx = net_if_get_by_iface(iface);
+		PR("Default interface: %d\n", idx);
+	} else {
+		int new_idx;
+
+		idx = get_iface_idx(sh, argv[1]);
+		if (idx < 0) {
+			return -ENOEXEC;
+		}
+
+		net_if_set_default(net_if_get_by_index(idx));
+
+		new_idx = net_if_get_by_iface(net_if_get_default());
+		if (new_idx != idx) {
+			PR_WARNING("Failed to set default interface to %d\n", idx);
+			return -ENOEXEC;
+		}
+
+		PR("Default interface: %d\n", new_idx);
+	}
+
+	return 0;
+}
+
 #if defined(CONFIG_NET_SHELL_DYN_CMD_COMPLETION)
 
 #include "iface_dynamic.h"
@@ -743,6 +838,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(net_cmd_iface,
 	SHELL_CMD(set_mac, IFACE_DYN_CMD,
 		  "'net iface set_mac <index> <MAC>' sets MAC address for the network interface.",
 		  cmd_net_set_mac),
+	SHELL_CMD(default, IFACE_DYN_CMD,
+		  "'net iface default [<index>]' displays or sets the default network interface.",
+		  cmd_net_default_iface),
 	SHELL_SUBCMD_SET_END
 );
 
diff --git a/subsys/net/lib/shell/route.c b/subsys/net/lib/shell/route.c
index 9e84860b1e2cb..f690beafd9881 100644
--- a/subsys/net/lib/shell/route.c
+++ b/subsys/net/lib/shell/route.c
@@ -32,7 +32,7 @@ static void route_cb(struct net_route_entry *entry, void *user_data)
 	count = 0;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&entry->nexthop, nexthop_route, node) {
-		struct net_linkaddr_storage *lladdr;
+		struct net_linkaddr *lladdr;
 		char remaining_str[sizeof("01234567890 sec")];
 		uint32_t remaining;
 
diff --git a/subsys/net/lib/shell/stats.c b/subsys/net/lib/shell/stats.c
index cda7d9401e953..64256bc7473a3 100644
--- a/subsys/net/lib/shell/stats.c
+++ b/subsys/net/lib/shell/stats.c
@@ -559,6 +559,21 @@ static void net_shell_print_statistics(struct net_if *iface, void *user_data)
 	   GET_STAT(iface, dns.sent),
 	   GET_STAT(iface, dns.drop));
 #endif /* CONFIG_NET_STATISTICS_DNS */
+#if defined(CONFIG_NET_STATISTICS_PKT_FILTER)
+	PR("Filter drop rx %d"
+	   IF_ENABLED(CONFIG_NET_PKT_FILTER_IPV4_HOOK, ("\tIPv4\t%d"))
+	   IF_ENABLED(CONFIG_NET_PKT_FILTER_IPV6_HOOK, ("\tIPv6\t%d"))
+	   IF_ENABLED(CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK, ("\tlocal\t%d"))
+	   "\ttx\t%d\n",
+	   GET_STAT(iface, pkt_filter.rx.drop),
+	   IF_ENABLED(CONFIG_NET_PKT_FILTER_IPV4_HOOK,
+		      (GET_STAT(iface, pkt_filter.rx.ipv4_drop),))
+	   IF_ENABLED(CONFIG_NET_PKT_FILTER_IPV6_HOOK,
+		      (GET_STAT(iface, pkt_filter.rx.ipv6_drop),))
+	   IF_ENABLED(CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK,
+		      (GET_STAT(iface, pkt_filter.rx.local_drop),))
+	   GET_STAT(iface, pkt_filter.tx.drop));
+#endif /* CONFIG_NET_STATISTICS_DNS */
 
 	PR("Bytes received %u\n", GET_STAT(iface, bytes.received));
 	PR("Bytes sent     %u\n", GET_STAT(iface, bytes.sent));
diff --git a/subsys/net/lib/sntp/sntp.c b/subsys/net/lib/sntp/sntp.c
index f7ac8cd566944..c6be0b80ae377 100644
--- a/subsys/net/lib/sntp/sntp.c
+++ b/subsys/net/lib/sntp/sntp.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2017 Linaro Limited
  * Copyright (c) 2019 Intel Corporation
+ * Copyright (c) 2024 Embeint Inc
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -181,16 +182,11 @@ int sntp_init(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len)
 	return 0;
 }
 
-int sntp_query(struct sntp_ctx *ctx, uint32_t timeout, struct sntp_time *ts)
+static int sntp_query_send(struct sntp_ctx *ctx)
 {
 	struct sntp_pkt tx_pkt = { 0 };
-	int ret = 0;
 	int64_t ts_us = 0;
 
-	if (!ctx || !ts) {
-		return -EFAULT;
-	}
-
 	/* prepare request pkt */
 	tx_pkt.li = 0;
 	tx_pkt.vn = SNTP_VERSION_NUMBER;
@@ -201,7 +197,18 @@ int sntp_query(struct sntp_ctx *ctx, uint32_t timeout, struct sntp_time *ts)
 	tx_pkt.tx_tm_s = htonl(ctx->expected_orig_ts.seconds);
 	tx_pkt.tx_tm_f = htonl(ctx->expected_orig_ts.fraction);
 
-	ret = zsock_send(ctx->sock.fd, (uint8_t *)&tx_pkt, sizeof(tx_pkt), 0);
+	return zsock_send(ctx->sock.fd, (uint8_t *)&tx_pkt, sizeof(tx_pkt), 0);
+}
+
+int sntp_query(struct sntp_ctx *ctx, uint32_t timeout, struct sntp_time *ts)
+{
+	int ret = 0;
+
+	if (!ctx || !ts) {
+		return -EFAULT;
+	}
+
+	ret = sntp_query_send(ctx);
 	if (ret < 0) {
 		NET_ERR("Failed to send over UDP socket %d", ret);
 		return ret;
@@ -248,3 +255,76 @@ void sntp_close(struct sntp_ctx *ctx)
 		(void)zsock_close(ctx->sock.fd);
 	}
 }
+
+#ifdef CONFIG_NET_SOCKETS_SERVICE
+
+int sntp_init_async(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len,
+		    const struct net_socket_service_desc *service)
+{
+	int ret;
+
+	/* Validate service pointer */
+	if (service == NULL) {
+		return -EFAULT;
+	}
+	/* Standard init */
+	ret = sntp_init(ctx, addr, addr_len);
+	if (ret < 0) {
+		return ret;
+	}
+	/* Attach socket to socket service */
+	ret = net_socket_service_register(service, ctx->sock.fds, ctx->sock.nfds, ctx);
+	if (ret < 0) {
+		NET_ERR("Failed to register socket %d", ret);
+		/* Cleanup init on register failure*/
+		sntp_close(ctx);
+	}
+	return ret;
+}
+
+int sntp_send_async(struct sntp_ctx *ctx)
+{
+	int ret = 0;
+
+	if (!ctx) {
+		return -EFAULT;
+	}
+
+	ret = sntp_query_send(ctx);
+	if (ret < 0) {
+		NET_ERR("Failed to send over UDP socket %d", ret);
+		return ret;
+	}
+	return 0;
+}
+
+int sntp_read_async(struct net_socket_service_event *event, struct sntp_time *ts)
+{
+	struct sntp_ctx *ctx = event->user_data;
+	struct sntp_pkt buf = {0};
+	int rcvd;
+
+	rcvd = zsock_recv(ctx->sock.fd, (uint8_t *)&buf, sizeof(buf), 0);
+	if (rcvd < 0) {
+		return -errno;
+	}
+
+	if (rcvd != sizeof(struct sntp_pkt)) {
+		return -EMSGSIZE;
+	}
+
+	return parse_response((uint8_t *)&buf, sizeof(buf), &ctx->expected_orig_ts, ts);
+}
+
+void sntp_close_async(const struct net_socket_service_desc *service)
+{
+	struct sntp_ctx *ctx = service->pev->user_data;
+	/* Detach socket from socket service */
+	net_socket_service_unregister(service);
+	/* CLose the socket */
+	if (ctx) {
+		(void)zsock_close(ctx->sock.fd);
+	}
+}
+
+#endif /* CONFIG_NET_SOCKETS_SERVICE */
diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
index 3f24cbc233f23..7da719d7b366a 100644
--- a/subsys/net/lib/sockets/Kconfig
+++ b/subsys/net/lib/sockets/Kconfig
@@ -306,6 +306,13 @@ config NET_SOCKETS_PACKET_DGRAM
 	  on the information in the sockaddr_ll destination address before
 	  they are queued.
 
+config NET_SOCKETS_INET_RAW
+	bool "AF_INET/AF_INET6 and SOCK_RAW sockets support"
+	depends on NET_NATIVE_IP
+	help
+	  Support SOCK_RAW socket type for AF_INET/AF_INET6 sockets. This allows
+	  to receive raw IP datagrams before further processing takes place.
+
 config NET_SOCKETS_CAN
 	bool "Socket CAN support [EXPERIMENTAL]"
 	select NET_L2_CANBUS_RAW
@@ -337,7 +344,7 @@ config NET_SOCKETPAIR_BUFFER_SIZE
 	help
 	  Buffer size for socketpair(2)
 
-choice
+choice NET_SOCKETPAIR_ALLOCATION_STRATEGY
 	prompt "Memory management for socketpair"
 	default NET_SOCKETPAIR_HEAP if KERNEL_MEM_POOL
 
@@ -353,7 +360,8 @@ if NET_SOCKETPAIR_STATIC
 
 config NET_SOCKETPAIR_MAX
 	int "How many socketpairs to pre-allocate"
-	default 6 if WIFI_NM_WPA_SUPPLICANT
+	default 6 if WIFI_NM_HOSTAPD_AP
+	default 4 if WIFI_NM_WPA_SUPPLICANT
 	default 1
 
 endif # NET_SOCKETPAIR_STATIC
diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c
index 503d4464e3bcc..34d8eabbb318c 100644
--- a/subsys/net/lib/sockets/sockets_inet.c
+++ b/subsys/net/lib/sockets/sockets_inet.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2017 Linaro Limited
  * Copyright (c) 2021 Nordic Semiconductor
  * Copyright (c) 2023 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2025 Aerlync Labs Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -35,6 +36,10 @@ LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include "../../ip/tcp_internal.h"
 #include "../../ip/net_private.h"
 
+#if defined(CONFIG_NET_SOCKETS_INET_RAW)
+BUILD_ASSERT(IPPROTO_IP == 0, "Wildcard IPPROTO_IP must equal 0.");
+#endif
+
 const struct socket_op_vtable sock_fd_op_vtable;
 
 static void zsock_received_cb(struct net_context *ctx,
@@ -313,11 +318,12 @@ int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr,
 		return -1;
 	}
 
-	/* For DGRAM socket, we expect to receive packets after call to
+	/* For DGRAM or RAW socket, we expect to receive packets after call to
 	 * bind(), but for STREAM socket, next expected operation is
 	 * listen(), which doesn't work if recv callback is set.
 	 */
-	if (net_context_get_type(ctx) == SOCK_DGRAM) {
+	if (net_context_get_type(ctx) == SOCK_DGRAM ||
+	    net_context_get_type(ctx) == SOCK_RAW) {
 		ret = net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
 				       ctx->user_data);
 		if (ret < 0) {
@@ -344,6 +350,11 @@ int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr,
 	net_context_connect_cb_t cb = NULL;
 	int ret;
 
+	if (net_context_get_type(ctx) == SOCK_RAW) {
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+
 #if defined(CONFIG_SOCKS)
 	if (net_context_is_proxy_enabled(ctx)) {
 		ret = net_socks5_connect(ctx, addr, addrlen);
@@ -419,6 +430,11 @@ int zsock_listen_ctx(struct net_context *ctx, int backlog)
 {
 	int ret;
 
+	if (net_context_get_type(ctx) == SOCK_RAW) {
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+
 	ret = net_context_listen(ctx, backlog);
 	if (ret < 0) {
 		errno = -ret;
@@ -441,6 +457,11 @@ int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr,
 	struct net_pkt *last_pkt;
 	int fd, ret;
 
+	if (net_context_get_type(parent) == SOCK_RAW) {
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+
 	if (!sock_is_nonblock(parent)) {
 		k_timeout_t timeout = K_FOREVER;
 
@@ -694,14 +715,16 @@ ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg,
 	return status;
 }
 
-static int sock_get_pkt_src_addr(struct net_pkt *pkt,
-				 enum net_ip_protocol proto,
+static int sock_get_pkt_src_addr(struct net_context *ctx,
+				 struct net_pkt *pkt,
 				 struct sockaddr *addr,
 				 socklen_t addrlen)
 {
 	int ret = 0;
 	struct net_pkt_cursor backup;
 	uint16_t *port;
+	enum net_ip_protocol proto = net_context_get_proto(ctx);
+	enum net_sock_type type = net_context_get_type(ctx);
 
 	if (!addr || !pkt) {
 		return -EINVAL;
@@ -787,6 +810,8 @@ static int sock_get_pkt_src_addr(struct net_pkt *pkt,
 		}
 
 		*port = tcp_hdr->src_port;
+	} else if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && type == SOCK_RAW) {
+		*port = 0;
 	} else {
 		ret = -ENOTSUP;
 	}
@@ -1117,8 +1142,7 @@ static ssize_t zsock_recv_dgram(struct net_context *ctx,
 		} else {
 			int ret;
 
-			ret = sock_get_pkt_src_addr(pkt, net_context_get_proto(ctx),
-						   src_addr, *addrlen);
+			ret = sock_get_pkt_src_addr(ctx, pkt, src_addr, *addrlen);
 			if (ret < 0) {
 				errno = -ret;
 				NET_DBG("sock_get_pkt_src_addr %d", ret);
@@ -1459,7 +1483,7 @@ ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len,
 		return 0;
 	}
 
-	if (sock_type == SOCK_DGRAM) {
+	if (sock_type == SOCK_DGRAM || sock_type == SOCK_RAW) {
 		return zsock_recv_dgram(ctx, NULL, buf, max_len, flags, src_addr, addrlen);
 	} else if (sock_type == SOCK_STREAM) {
 		return zsock_recv_stream(ctx, NULL, buf, max_len, flags);
@@ -1492,7 +1516,7 @@ ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg,
 		max_len += msg->msg_iov[i].iov_len;
 	}
 
-	if (sock_type == SOCK_DGRAM) {
+	if (sock_type == SOCK_DGRAM || sock_type == SOCK_RAW) {
 		return zsock_recv_dgram(ctx, msg, NULL, max_len, flags,
 					msg->msg_name, &msg->msg_namelen);
 	} else if (sock_type == SOCK_STREAM) {
@@ -1564,7 +1588,9 @@ static int zsock_poll_update_ctx(struct net_context *ctx,
 	ARG_UNUSED(ctx);
 
 	if (pfd->events & ZSOCK_POLLIN) {
-		if ((*pev)->state != K_POLL_STATE_NOT_READY || sock_is_eof(ctx)) {
+		if (((*pev)->state != K_POLL_STATE_NOT_READY &&
+		     (*pev)->state != K_POLL_STATE_CANCELLED) ||
+		    sock_is_eof(ctx)) {
 			pfd->revents |= ZSOCK_POLLIN;
 		}
 		(*pev)++;
@@ -1971,6 +1997,18 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname,
 			}
 
 			break;
+#if defined(CONFIG_NET_IPV4)
+		case IP_MULTICAST_LOOP:
+			ret = net_context_get_option(ctx,
+						     NET_OPT_IPV4_MCAST_LOOP,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+#endif
 		}
 
 		break;
@@ -2078,6 +2116,18 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname,
 			}
 
 			return 0;
+
+		case IPV6_MULTICAST_LOOP:
+			ret = net_context_get_option(ctx,
+						     NET_OPT_IPV6_MCAST_LOOP,
+						     optval, optlen);
+			if (ret < 0) {
+				errno = -ret;
+				return -1;
+			}
+
+			return 0;
+
 		}
 
 		break;
@@ -2589,6 +2639,18 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname,
 			}
 
 			break;
+#if defined(CONFIG_NET_IPV4)
+		case IP_MULTICAST_LOOP:
+			ret = net_context_set_option(ctx,
+						     NET_OPT_IPV4_MCAST_LOOP,
+						     optval, optlen);
+			if (ret < 0) {
+				errno  = -ret;
+				return -1;
+			}
+
+			return 0;
+#endif
 		}
 
 		break;
@@ -2720,6 +2782,17 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname,
 			}
 
 			break;
+
+		case IPV6_MULTICAST_LOOP:
+			ret = net_context_set_option(ctx,
+						     NET_OPT_IPV6_MCAST_LOOP,
+						     optval, optlen);
+			if (ret < 0) {
+				errno = -ret;
+				return -1;
+			}
+
+			return 0;
 		}
 
 		break;
@@ -2734,6 +2807,11 @@ int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
 {
 	socklen_t newlen = 0;
 
+	if (net_context_get_type(ctx) == SOCK_RAW) {
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+
 	if (addr == NULL || addrlen == NULL) {
 		errno = EINVAL;
 		return -1;
diff --git a/subsys/net/lib/sockets/sockets_packet.c b/subsys/net/lib/sockets/sockets_packet.c
index ec2d7e1853932..508520c430d64 100644
--- a/subsys/net/lib/sockets/sockets_packet.c
+++ b/subsys/net/lib/sockets/sockets_packet.c
@@ -51,11 +51,7 @@ static int zpacket_socket(int family, int type, int proto)
 		return -1;
 	}
 
-	if (proto == 0) {
-		if (type == SOCK_RAW) {
-			proto = IPPROTO_RAW;
-		}
-	} else {
+	if (proto != 0) {
 		/* For example in Linux, the protocol parameter can be given
 		 * as htons(ETH_P_ALL) to receive all the network packets.
 		 * So convert the proto field back to host byte order so that
@@ -148,7 +144,7 @@ static void zpacket_set_eth_pkttype(struct net_if *iface,
 				    struct sockaddr_ll *addr,
 				    struct net_linkaddr *lladdr)
 {
-	if (lladdr == NULL || lladdr->addr == NULL) {
+	if (lladdr == NULL || lladdr->len == 0) {
 		return;
 	}
 
@@ -187,7 +183,7 @@ static void zpacket_set_source_addr(struct net_context *ctx,
 		memcpy(addr.sll_addr, pkt->lladdr_src.addr,
 		       MIN(sizeof(addr.sll_addr), pkt->lladdr_src.len));
 
-		addr.sll_protocol = net_pkt_ll_proto_type(pkt);
+		addr.sll_protocol = htons(net_pkt_ll_proto_type(pkt));
 
 		if (net_if_get_link_addr(iface)->type == NET_LINK_ETHERNET) {
 			addr.sll_hatype = ARPHRD_ETHER;
@@ -216,12 +212,12 @@ static void zpacket_set_source_addr(struct net_context *ctx,
 		memcpy(addr.sll_addr, hdr->src.addr,
 		       sizeof(struct net_eth_addr));
 
-		addr.sll_protocol = ntohs(hdr->type);
+		addr.sll_protocol = hdr->type;
 		addr.sll_hatype = ARPHRD_ETHER;
 
-		dst_addr.addr = hdr->dst.addr;
-		dst_addr.len = sizeof(struct net_eth_addr);
-		dst_addr.type = NET_LINK_ETHERNET;
+		(void)net_linkaddr_create(&dst_addr, hdr->dst.addr,
+					  sizeof(struct net_eth_addr),
+					  NET_LINK_ETHERNET);
 
 		zpacket_set_eth_pkttype(iface, &addr, &dst_addr);
 		net_pkt_cursor_restore(pkt, &cur);
@@ -238,6 +234,7 @@ ssize_t zpacket_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
 			   int flags, const struct sockaddr *dest_addr,
 			   socklen_t addrlen)
 {
+	const struct sockaddr_ll *ll_addr = (const struct sockaddr_ll *)dest_addr;
 	k_timeout_t timeout = K_FOREVER;
 	int status;
 
@@ -252,6 +249,21 @@ ssize_t zpacket_sendto_ctx(struct net_context *ctx, const void *buf, size_t len,
 		net_context_get_option(ctx, NET_OPT_SNDTIMEO, &timeout, NULL);
 	}
 
+	/* If no interface was set on the context yet, use the one provided in
+	 * the destination address for default binding, unless 0 (any interface)
+	 * was set, in that case let the stack choose the default.
+	 */
+	if (net_context_get_iface(ctx) == NULL && ll_addr->sll_ifindex != 0) {
+		struct net_if *iface = net_if_get_by_index(ll_addr->sll_ifindex);
+
+		if (iface == NULL) {
+			errno = EDESTADDRREQ;
+			return -1;
+		}
+
+		net_context_set_iface(ctx, iface);
+	}
+
 	/* Register the callback before sending in order to receive the response
 	 * from the peer.
 	 */
@@ -490,13 +502,13 @@ static bool packet_is_supported(int family, int type, int proto)
 	switch (type) {
 	case SOCK_RAW:
 		proto = ntohs(proto);
-		return proto == ETH_P_ALL
+		return proto == 0
+		  || proto == ETH_P_ALL
 		  || proto == ETH_P_ECAT
-		  || proto == ETH_P_IEEE802154
-		  || proto == IPPROTO_RAW;
+		  || proto == ETH_P_IEEE802154;
 
 	case SOCK_DGRAM:
-		return proto > 0;
+		return true;
 
 	default:
 		return false;
diff --git a/subsys/net/lib/sockets/sockets_service.c b/subsys/net/lib/sockets/sockets_service.c
index 1e0e79eb7d779..aac226f64f74e 100644
--- a/subsys/net/lib/sockets/sockets_service.c
+++ b/subsys/net/lib/sockets/sockets_service.c
@@ -71,9 +71,9 @@ int z_impl_net_socket_service_register(const struct net_socket_service_desc *svc
 		goto out;
 	}
 
-	if (fds == NULL) {
-		cleanup_svc_events(svc);
-	} else {
+	cleanup_svc_events(svc);
+
+	if (fds != NULL) {
 		if (len > svc->pev_len) {
 			NET_DBG("Too many file descriptors, "
 				"max is %d for service %p",
diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c
index b28f8aa8be934..5b29c3077e8f8 100644
--- a/subsys/net/lib/sockets/sockets_tls.c
+++ b/subsys/net/lib/sockets/sockets_tls.c
@@ -1078,7 +1078,7 @@ static int tls_set_credential(struct tls_context *tls,
 	case TLS_CREDENTIAL_CA_CERTIFICATE:
 		return tls_add_ca_certificate(tls, cred);
 
-	case TLS_CREDENTIAL_SERVER_CERTIFICATE:
+	case TLS_CREDENTIAL_PUBLIC_CERTIFICATE:
 		return tls_add_own_cert(tls, cred);
 
 	case TLS_CREDENTIAL_PRIVATE_KEY:
@@ -1133,7 +1133,7 @@ static int tls_mbedtls_set_credentials(struct tls_context *tls)
 
 			if (cred->type == TLS_CREDENTIAL_CA_CERTIFICATE) {
 				ca_cert_present = true;
-			} else if (cred->type == TLS_CREDENTIAL_SERVER_CERTIFICATE) {
+			} else if (cred->type == TLS_CREDENTIAL_PUBLIC_CERTIFICATE) {
 				own_cert_present = true;
 			}
 		}
diff --git a/subsys/net/lib/tls_credentials/Kconfig.shell b/subsys/net/lib/tls_credentials/Kconfig.shell
index 3e20f6e771740..79adf1187a98f 100644
--- a/subsys/net/lib/tls_credentials/Kconfig.shell
+++ b/subsys/net/lib/tls_credentials/Kconfig.shell
@@ -32,4 +32,14 @@ config TLS_CREDENTIALS_SHELL_DIGEST_BUF_SIZE
 
 	   Also used to print error messages if digest generation fails.
 
+if TLS_CREDENTIALS_BACKEND_VOLATILE
+
+config HEAP_MEM_POOL_ADD_SIZE_TLS_CRED_SHELL
+	int "TLS credentials shell memory pool size"
+	# default 4 certs and each assume 1500 bytes
+	default 6000
+	help
+	  The size of the memory pool used by the TLS credentials shell.
+endif # TLS_CREDENTIALS_BACKEND_VOLATILE
+
 endif # TLS_CREDENTIALS_SHELL
diff --git a/subsys/net/lib/tls_credentials/tls_credentials_shell.c b/subsys/net/lib/tls_credentials/tls_credentials_shell.c
index d72d6c1605f64..8ab9d4a705297 100644
--- a/subsys/net/lib/tls_credentials/tls_credentials_shell.c
+++ b/subsys/net/lib/tls_credentials/tls_credentials_shell.c
@@ -40,12 +40,12 @@ static const struct cred_type_string type_strings[] = {
 	{"CA_CERT",		TLS_CREDENTIAL_CA_CERTIFICATE},
 	{"CA",			TLS_CREDENTIAL_CA_CERTIFICATE},
 
-	{"SERVER_CERT",		TLS_CREDENTIAL_SERVER_CERTIFICATE},
-	{"CLIENT_CERT",		TLS_CREDENTIAL_SERVER_CERTIFICATE},
-	{"SELF_CERT",		TLS_CREDENTIAL_SERVER_CERTIFICATE},
-	{"SELF",		TLS_CREDENTIAL_SERVER_CERTIFICATE},
-	{"CLIENT",		TLS_CREDENTIAL_SERVER_CERTIFICATE},
-	{"SERV",		TLS_CREDENTIAL_SERVER_CERTIFICATE},
+	{"SERVER_CERT",		TLS_CREDENTIAL_PUBLIC_CERTIFICATE},
+	{"CLIENT_CERT",		TLS_CREDENTIAL_PUBLIC_CERTIFICATE},
+	{"SELF_CERT",		TLS_CREDENTIAL_PUBLIC_CERTIFICATE},
+	{"SELF",		TLS_CREDENTIAL_PUBLIC_CERTIFICATE},
+	{"CLIENT",		TLS_CREDENTIAL_PUBLIC_CERTIFICATE},
+	{"SERV",		TLS_CREDENTIAL_PUBLIC_CERTIFICATE},
 
 	{"PRIVATE_KEY",		TLS_CREDENTIAL_PRIVATE_KEY},
 	{"PK",			TLS_CREDENTIAL_PRIVATE_KEY},
@@ -564,8 +564,8 @@ static int tls_cred_cmd_del(const struct shell *sh, size_t argc, char *argv[])
 	ref_slot = cred->buf != NULL ? find_ref_slot(cred->buf) : -1;
 	if (ref_slot >= 0) {
 		/* This was a credential we copied to heap. Clear and free it. */
-		memset((void *)cred_buf, 0, cred->len);
-		k_free((void *)cred_buf);
+		memset(&cred_refs[ref_slot], 0, cred->len);
+		k_free((void *)cred_refs[ref_slot]);
 		cred->buf = NULL;
 
 		/* Clear the reference slot so it can be used again. */
diff --git a/subsys/net/lib/tls_credentials/tls_credentials_trusted.c b/subsys/net/lib/tls_credentials/tls_credentials_trusted.c
index 1a99ad0844194..6b46b0b7680f0 100644
--- a/subsys/net/lib/tls_credentials/tls_credentials_trusted.c
+++ b/subsys/net/lib/tls_credentials/tls_credentials_trusted.c
@@ -401,6 +401,7 @@ int tls_credential_get(sec_tag_t tag, enum tls_credential_type type,
 
 	if (info.size > *credlen) {
 		ret = -EFBIG;
+		*credlen = info.size;
 		goto cleanup;
 	}
 
diff --git a/subsys/net/lib/websocket/websocket.c b/subsys/net/lib/websocket/websocket.c
index 12eddd04f4b20..5e35c981f49d5 100644
--- a/subsys/net/lib/websocket/websocket.c
+++ b/subsys/net/lib/websocket/websocket.c
@@ -421,7 +421,7 @@ static int websocket_interal_disconnect(struct websocket_context *ctx)
 	NET_DBG("[%p] Disconnecting", ctx);
 
 	ret = websocket_send_msg(ctx->sock, NULL, 0, WEBSOCKET_OPCODE_CLOSE,
-				 true, true, SYS_FOREVER_MS);
+				 ctx->is_client, true, SYS_FOREVER_MS);
 	if (ret < 0) {
 		NET_DBG("[%p] Failed to send close message (err %d).", ctx, ret);
 	}
diff --git a/subsys/net/lib/wifi_credentials/CMakeLists.txt b/subsys/net/lib/wifi_credentials/CMakeLists.txt
index bb8222bd818e1..532d7a5a628fe 100644
--- a/subsys/net/lib/wifi_credentials/CMakeLists.txt
+++ b/subsys/net/lib/wifi_credentials/CMakeLists.txt
@@ -34,3 +34,43 @@ if(WIFI_CREDENTIALS_STATIC_SSID)
 		"Static Wi-Fi configuration is used, please remove before deployment!"
 	)
 endif()
+
+if(DEFINED CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE AND NOT DEFINED CONFIG_NET_L2_WIFI_SHELL)
+  # Wi-Fi Enterprise test certificates handling
+  set(gen_inc_dir ${ZEPHYR_BINARY_DIR}/misc/generated)
+  set(gen_dir ${gen_inc_dir}/wifi_enterprise_test_certs)
+  if(NOT DEFINED WIFI_TEST_CERTS_DIR)
+    set(WIFI_TEST_CERTS_DIR ${ZEPHYR_BASE}/samples/net/wifi/test_certs/rsa3k)
+  endif()
+  # Create output directory for test certs
+  file(MAKE_DIRECTORY ${gen_dir})
+
+  # convert .pem files to array data at build time
+  zephyr_include_directories(${gen_inc_dir})
+
+  foreach(cert_file IN ITEMS
+      ${WIFI_TEST_CERTS_DIR}/client.pem
+      ${WIFI_TEST_CERTS_DIR}/client-key.pem
+      ${WIFI_TEST_CERTS_DIR}/ca.pem
+      ${WIFI_TEST_CERTS_DIR}/client2.pem
+      ${WIFI_TEST_CERTS_DIR}/client-key2.pem
+      ${WIFI_TEST_CERTS_DIR}/ca2.pem
+      )
+
+  if(EXISTS ${cert_file})
+      get_filename_component(cert_name ${cert_file} NAME)
+      generate_inc_file_for_target(
+          app
+          ${cert_file}
+          ${gen_dir}/${cert_name}.inc
+          )
+    else()
+      get_filename_component(cert_name ${cert_file} NAME)
+      file(WRITE ${gen_dir}/${cert_name}.inc "// Empty file generated because ${cert_file} does not exist\n")
+    endif()
+  endforeach()
+
+  # Add explicit dependency on app target for ZEPHYR_CURRENT_LIBRARY, so these
+  # headers are generated at the correct point in the build
+  add_dependencies(${ZEPHYR_CURRENT_LIBRARY} app)
+endif()
diff --git a/subsys/net/lib/wifi_credentials/Kconfig b/subsys/net/lib/wifi_credentials/Kconfig
index 3cfe87c29f28a..f50e210b080a4 100644
--- a/subsys/net/lib/wifi_credentials/Kconfig
+++ b/subsys/net/lib/wifi_credentials/Kconfig
@@ -57,6 +57,8 @@ config WIFI_CREDENTIALS_SHELL
 	bool "Shell commands to manage Wi-Fi credentials"
 	default y
 	depends on SHELL
+	select SHELL_GETOPT
+	select GETOPT_LONG
 	depends on !WIFI_CREDENTIALS_BACKEND_NONE
 
 config WIFI_CREDENTIALS_CONNECT_STORED
@@ -75,18 +77,6 @@ endif # WIFI_CREDENTIALS_CONNECT_STORED
 
 endif # WIFI_CREDENTIALS
 
-if WIFI_CREDENTIALS_BACKEND_PSA
-
-config WIFI_CREDENTIALS_BACKEND_PSA_OFFSET
-	int "PSA_KEY_ID range offset"
-	default 0
-	help
-	  The PSA specification mandates to set key identifiers for keys
-	  with persistent lifetime. The users of the PSA API are responsible (WIFI credentials
-	  management is user of PSA API) to provide correct and unique identifiers.
-
-endif # WIFI_CREDENTIALS_BACKEND_PSA
-
 config WIFI_CREDENTIALS_STATIC
 	bool "Static Wi-Fi network configuration"
 
diff --git a/subsys/net/lib/wifi_credentials/wifi_credentials.c b/subsys/net/lib/wifi_credentials/wifi_credentials.c
index a91ea8dd5428a..d7db5593e31b2 100644
--- a/subsys/net/lib/wifi_credentials/wifi_credentials.c
+++ b/subsys/net/lib/wifi_credentials/wifi_credentials.c
@@ -132,11 +132,7 @@ int wifi_credentials_get_by_ssid_personal_struct(const char *ssid, size_t ssid_l
 		goto exit;
 	}
 
-	if (buf->header.type != WIFI_SECURITY_TYPE_NONE &&
-	    buf->header.type != WIFI_SECURITY_TYPE_PSK &&
-	    buf->header.type != WIFI_SECURITY_TYPE_PSK_SHA256 &&
-	    buf->header.type != WIFI_SECURITY_TYPE_SAE &&
-	    buf->header.type != WIFI_SECURITY_TYPE_WPA_PSK) {
+	if (buf->header.type < 0 || buf->header.type > WIFI_SECURITY_TYPE_MAX) {
 		LOG_ERR("Requested WiFi credentials entry is corrupted");
 		ret = -EPROTO;
 		goto exit;
diff --git a/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c b/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c
index bf82ee725775b..7ec3ae1056def 100644
--- a/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c
+++ b/subsys/net/lib/wifi_credentials/wifi_credentials_backend_psa.c
@@ -6,18 +6,15 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/psa/key_ids.h>
 #include "psa/crypto.h"
 
 #include "wifi_credentials_internal.h"
 
 LOG_MODULE_REGISTER(wifi_credentials_backend, CONFIG_WIFI_CREDENTIALS_LOG_LEVEL);
 
-#define WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN                                               \
-	(PSA_KEY_ID_USER_MIN + CONFIG_WIFI_CREDENTIALS_BACKEND_PSA_OFFSET)
-
-BUILD_ASSERT((WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN + CONFIG_WIFI_CREDENTIALS_MAX_ENTRIES) <=
-		     PSA_KEY_ID_USER_MAX,
-	     "WIFI credentials management PSA key id range exceeds PSA_KEY_ID_USER_MAX.");
+BUILD_ASSERT(CONFIG_WIFI_CREDENTIALS_MAX_ENTRIES <= ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_SIZE,
+	     "Wi-Fi credentials management PSA key ID range exceeds officially allocated range.");
 
 int wifi_credentials_backend_init(void)
 {
@@ -26,7 +23,7 @@ int wifi_credentials_backend_init(void)
 
 	for (size_t i = 0; i < CONFIG_WIFI_CREDENTIALS_MAX_ENTRIES; ++i) {
 		size_t length_read = 0;
-		size_t key_id = i + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+		size_t key_id = i + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 
 		ret = psa_export_key(key_id, buf, ARRAY_SIZE(buf), &length_read);
 		if (ret == PSA_SUCCESS && length_read == ENTRY_MAX_LEN) {
@@ -46,7 +43,7 @@ int wifi_credentials_store_entry(size_t idx, const void *buf, size_t buf_len)
 	psa_key_attributes_t key_attributes = {0};
 	psa_key_id_t key_id;
 
-	psa_set_key_id(&key_attributes, idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN);
+	psa_set_key_id(&key_attributes, idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN);
 	psa_set_key_usage_flags(&key_attributes, PSA_KEY_USAGE_EXPORT);
 	psa_set_key_lifetime(&key_attributes, PSA_KEY_LIFETIME_PERSISTENT);
 	psa_set_key_algorithm(&key_attributes, PSA_ALG_NONE);
@@ -67,7 +64,7 @@ int wifi_credentials_store_entry(size_t idx, const void *buf, size_t buf_len)
 
 int wifi_credentials_delete_entry(size_t idx)
 {
-	psa_status_t ret = psa_destroy_key(idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN);
+	psa_status_t ret = psa_destroy_key(idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN);
 
 	if (ret != PSA_SUCCESS) {
 		LOG_ERR("psa_destroy_key failed, err: %d", ret);
@@ -80,7 +77,7 @@ int wifi_credentials_delete_entry(size_t idx)
 int wifi_credentials_load_entry(size_t idx, void *buf, size_t buf_len)
 {
 	size_t length_read = 0;
-	size_t key_id = idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+	size_t key_id = idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 	psa_status_t ret;
 
 	ret = psa_export_key(key_id, buf, buf_len, &length_read);
diff --git a/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c b/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
index c9652ba390cb5..4a51de48e1216 100644
--- a/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
+++ b/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
@@ -15,14 +15,72 @@
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/wifi_mgmt.h>
+#include <zephyr/net/wifi_utils.h>
 #include <zephyr/net/net_event.h>
 #include <zephyr/net/net_l2.h>
 #include <zephyr/net/ethernet.h>
 
 #include <zephyr/net/wifi_credentials.h>
 
+#define MAX_BANDS_STR_LEN 64
 #define MACSTR "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+static const char ca_cert_test[] = {
+	#include <wifi_enterprise_test_certs/ca.pem.inc>
+	'\0'
+};
+
+static const char client_cert_test[] = {
+	#include <wifi_enterprise_test_certs/client.pem.inc>
+	'\0'
+};
+
+static const char client_key_test[] = {
+	#include <wifi_enterprise_test_certs/client-key.pem.inc>
+	'\0'
+};
+
+static const char ca_cert2_test[] = {
+	#include <wifi_enterprise_test_certs/ca2.pem.inc>
+	'\0'};
+
+static const char client_cert2_test[] = {
+	#include <wifi_enterprise_test_certs/client2.pem.inc>
+	'\0'};
+
+static const char client_key2_test[] = {
+	#include <wifi_enterprise_test_certs/client-key2.pem.inc>
+	'\0'};
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
+
+#if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface)
+{
+	struct wifi_enterprise_creds_params params = {0};
+
+	params.ca_cert = (uint8_t *)ca_cert_test;
+	params.ca_cert_len = ARRAY_SIZE(ca_cert_test);
+	params.client_cert = (uint8_t *)client_cert_test;
+	params.client_cert_len = ARRAY_SIZE(client_cert_test);
+	params.client_key = (uint8_t *)client_key_test;
+	params.client_key_len = ARRAY_SIZE(client_key_test);
+	params.ca_cert2 = (uint8_t *)ca_cert2_test;
+	params.ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
+	params.client_cert2 = (uint8_t *)client_cert2_test;
+	params.client_cert2_len = ARRAY_SIZE(client_cert2_test);
+	params.client_key2 = (uint8_t *)client_key2_test;
+	params.client_key2_len = ARRAY_SIZE(client_key2_test);
+
+	if (net_mgmt(NET_REQUEST_WIFI_ENTERPRISE_CREDS, iface, &params, sizeof(params))) {
+		shell_warn(sh, "Set enterprise credentials failed\n");
+		return -1;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
+
 static void print_network_info(void *cb_arg, const char *ssid, size_t ssid_len)
 {
 	int ret = 0;
@@ -51,6 +109,23 @@ static void print_network_info(void *cb_arg, const char *ssid, size_t ssid_len)
 			      creds.password, creds.password_len);
 	}
 
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	if (creds.header.type == WIFI_SECURITY_TYPE_EAP_TLS) {
+		if (creds.header.key_passwd_length > 0) {
+			shell_fprintf(sh, SHELL_VT100_COLOR_DEFAULT,
+				      ", key_passwd: \"%.*s\", key_passwd_len: %d",
+				      creds.header.key_passwd_length, creds.header.key_passwd,
+				      creds.header.key_passwd_length);
+		}
+		if (creds.header.aid_length > 0) {
+			shell_fprintf(sh, SHELL_VT100_COLOR_DEFAULT,
+				      ", anon_id: \"%.*s\", anon_id_len: %d",
+				      creds.header.aid_length, creds.header.anon_id,
+				      creds.header.aid_length);
+		}
+	}
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
+
 	if (creds.header.flags & WIFI_CREDENTIALS_FLAG_BSSID) {
 		shell_fprintf(sh, SHELL_VT100_COLOR_DEFAULT, ", bssid: " MACSTR,
 			      creds.header.bssid[0], creds.header.bssid[1], creds.header.bssid[2],
@@ -88,189 +163,202 @@ static void print_network_info(void *cb_arg, const char *ssid, size_t ssid_len)
 	shell_fprintf(sh, SHELL_VT100_COLOR_DEFAULT, "\n");
 }
 
-static enum wifi_security_type parse_sec_type(const char *s)
-{
-	if (strcmp("OPEN", s) == 0) {
-		return WIFI_SECURITY_TYPE_NONE;
-	}
-
-	if (strcmp("WPA2-PSK", s) == 0) {
-		return WIFI_SECURITY_TYPE_PSK;
-	}
-
-	if (strcmp("WPA2-PSK-SHA256", s) == 0) {
-		return WIFI_SECURITY_TYPE_PSK_SHA256;
-	}
-
-	if (strcmp("WPA3-SAE", s) == 0) {
-		return WIFI_SECURITY_TYPE_SAE;
-	}
-
-	if (strcmp("WPA-PSK", s) == 0) {
-		return WIFI_SECURITY_TYPE_WPA_PSK;
-	}
-
-	return WIFI_SECURITY_TYPE_UNKNOWN;
-}
-
-static enum wifi_frequency_bands parse_band(const char *s)
-{
-	if (strcmp("2.4GHz", s) == 0) {
-		return WIFI_FREQ_BAND_2_4_GHZ;
-	}
-
-	if (strcmp("5GHz", s) == 0) {
-		return WIFI_FREQ_BAND_5_GHZ;
-	}
-
-	if (strcmp("6GHz", s) == 0) {
-		return WIFI_FREQ_BAND_6_GHZ;
-	}
-
-	return WIFI_FREQ_BAND_UNKNOWN;
-}
-
 static int cmd_add_network(const struct shell *sh, size_t argc, char *argv[])
 {
-	int ret;
-
-	if (argc < 3) {
-		goto help;
-	}
-
-	if (strnlen(argv[1], WIFI_SSID_MAX_LEN + 1) > WIFI_SSID_MAX_LEN) {
-		shell_error(sh, "SSID too long");
-		goto help;
-	}
-
-	struct wifi_credentials_personal creds = {
-		.header.ssid_len = strlen(argv[1]),
-		.header.type = parse_sec_type(argv[2]),
-	};
-
-	memcpy(creds.header.ssid, argv[1], creds.header.ssid_len);
-
-	if (creds.header.type == WIFI_SECURITY_TYPE_UNKNOWN) {
-		shell_error(sh, "Cannot parse security type");
-		goto help;
-	}
-
-	size_t arg_idx = 3;
-
-	if (creds.header.type == WIFI_SECURITY_TYPE_PSK ||
-	    creds.header.type == WIFI_SECURITY_TYPE_PSK_SHA256 ||
-	    creds.header.type == WIFI_SECURITY_TYPE_SAE ||
-	    creds.header.type == WIFI_SECURITY_TYPE_WPA_PSK) {
-		/* parse passphrase */
-		if (argc < 4) {
-			shell_error(sh, "Missing password");
-			goto help;
-		}
-		creds.password_len = strlen(argv[3]);
-		if (creds.password_len < WIFI_PSK_MIN_LEN) {
-			shell_error(sh, "Passphrase should be minimum %d characters",
-				    WIFI_PSK_MIN_LEN);
-			goto help;
-		}
-		if ((creds.password_len > CONFIG_WIFI_CREDENTIALS_SAE_PASSWORD_LENGTH &&
-		     creds.header.type == WIFI_SECURITY_TYPE_SAE) ||
-		    (creds.password_len > WIFI_PSK_MAX_LEN &&
-		     creds.header.type != WIFI_SECURITY_TYPE_SAE)) {
-			shell_error(sh, "Password is too long for this security type");
-			goto help;
-		}
-		memcpy(creds.password, argv[3], creds.password_len);
-		++arg_idx;
-	}
+	int opt;
+	int opt_index = 0;
+	struct getopt_state *state;
+	static const struct option long_options[] = {
+		{"ssid", required_argument, 0, 's'},	 {"passphrase", required_argument, 0, 'p'},
+		{"key-mgmt", required_argument, 0, 'k'}, {"ieee-80211w", required_argument, 0, 'w'},
+		{"bssid", required_argument, 0, 'm'},	 {"band", required_argument, 0, 'b'},
+		{"channel", required_argument, 0, 'c'},	 {"timeout", required_argument, 0, 't'},
+		{"identity", required_argument, 0, 'a'}, {"key-passwd", required_argument, 0, 'K'},
+		{"help", no_argument, 0, 'h'},		 {0, 0, 0, 0}};
+	char *endptr;
+	bool secure_connection = false;
+	uint8_t band;
+	struct wifi_credentials_personal creds = {0};
 
-	if (arg_idx < argc) {
-		/* look for bssid */
-		ret = sscanf(argv[arg_idx], MACSTR, &creds.header.bssid[0], &creds.header.bssid[1],
-			     &creds.header.bssid[2], &creds.header.bssid[3], &creds.header.bssid[4],
-			     &creds.header.bssid[5]);
-		if (ret == 6) {
+	const uint8_t all_bands[] = {WIFI_FREQ_BAND_2_4_GHZ, WIFI_FREQ_BAND_5_GHZ,
+				     WIFI_FREQ_BAND_6_GHZ};
+	bool found = false;
+	char bands_str[MAX_BANDS_STR_LEN] = {0};
+	size_t offset = 0;
+	long channel;
+	long mfp = WIFI_MFP_OPTIONAL;
+
+	while ((opt = getopt_long(argc, argv, "s:p:k:w:b:c:m:t:a:K:h", long_options, &opt_index)) !=
+	       -1) {
+		state = getopt_state_get();
+		switch (opt) {
+		case 's':
+			creds.header.ssid_len = strlen(state->optarg);
+			if (creds.header.ssid_len > WIFI_SSID_MAX_LEN) {
+				shell_warn(sh, "SSID too long (max %d characters)\n",
+					   WIFI_SSID_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.header.ssid, state->optarg, creds.header.ssid_len);
+			break;
+		case 'k':
+			creds.header.type = atoi(state->optarg);
+			if (creds.header.type) {
+				secure_connection = true;
+			}
+			break;
+		case 'p':
+			creds.password_len = strlen(state->optarg);
+			if (creds.password_len < WIFI_PSK_MIN_LEN) {
+				shell_warn(sh, "Passphrase should be minimum %d characters\n",
+					   WIFI_PSK_MIN_LEN);
+				return -EINVAL;
+			}
+			if (creds.password_len > WIFI_PSK_MAX_LEN) {
+				shell_warn(sh, "Passphrase too long (max %d characters)\n",
+					   WIFI_PSK_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.password, state->optarg, creds.password_len);
+			break;
+		case 'c':
+			channel = strtol(state->optarg, &endptr, 10);
+			if (*endptr != '\0') {
+				shell_error(sh, "Invalid channel: %s\n", state->optarg);
+				return -EINVAL;
+			}
+
+			for (band = 0; band < ARRAY_SIZE(all_bands); band++) {
+				offset += snprintf(bands_str + offset, sizeof(bands_str) - offset,
+						   "%s%s", band ? "," : "",
+						   wifi_band_txt(all_bands[band]));
+				if (offset >= sizeof(bands_str)) {
+					shell_error(sh,
+						    "Failed to parse channel: %ld: "
+						    "band string too long\n",
+						    channel);
+					return -EINVAL;
+				}
+
+				if (wifi_utils_validate_chan(all_bands[band], channel)) {
+					found = true;
+					break;
+				}
+			}
+
+			if (!found) {
+				shell_error(sh, "Invalid channel: %ld, checked bands: %s\n",
+					    channel, bands_str);
+				return -EINVAL;
+			}
+
+			creds.header.channel = channel;
+			break;
+		case 'b':
+			switch (atoi(state->optarg)) {
+			case 2:
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_2_4GHz;
+				break;
+			case 5:
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_5GHz;
+				break;
+			case 6:
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_6GHz;
+				break;
+			default:
+				shell_error(sh, "Invalid band: %d\n", atoi(state->optarg));
+				return -EINVAL;
+			}
+			break;
+		case 'w':
+			if (creds.header.type == WIFI_SECURITY_TYPE_NONE ||
+			    creds.header.type == WIFI_SECURITY_TYPE_WPA_PSK) {
+				shell_error(sh, "MFP not supported for security type %s",
+					    wifi_security_txt(creds.header.type));
+				return -ENOTSUP;
+			}
+			mfp = strtol(state->optarg, &endptr, 10);
+			if (*endptr != '\0') {
+				shell_error(sh, "Invalid IEEE 802.11w value: %s", state->optarg);
+				return -EINVAL;
+			}
+			if (mfp == WIFI_MFP_DISABLE) {
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_DISABLED;
+			} else if (mfp == WIFI_MFP_REQUIRED) {
+				creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_REQUIRED;
+			} else if (mfp > 2) {
+				shell_error(sh, "Invalid IEEE 802.11w value: %s",
+					    state->optarg);
+				return -EINVAL;
+			}
+			break;
+		case 'm':
+			if (net_bytes_from_str(creds.header.bssid, sizeof(creds.header.bssid),
+					       state->optarg) < 0) {
+				shell_warn(sh, "Invalid MAC address\n");
+				return -EINVAL;
+			}
 			creds.header.flags |= WIFI_CREDENTIALS_FLAG_BSSID;
-			++arg_idx;
+			break;
+		case 'a':
+			creds.header.aid_length = strlen(state->optarg);
+			if (creds.header.aid_length > WIFI_ENT_IDENTITY_MAX_LEN) {
+				shell_warn(sh, "anon_id too long (max %d characters)\n",
+					   WIFI_ENT_IDENTITY_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.header.anon_id, state->optarg, creds.header.aid_length);
+			creds.header.flags |= WIFI_CREDENTIALS_FLAG_ANONYMOUS_IDENTITY;
+			break;
+		case 'K':
+			creds.header.key_passwd_length = strlen(state->optarg);
+			if (creds.header.key_passwd_length > WIFI_ENT_PSWD_MAX_LEN) {
+				shell_warn(sh, "key_passwd too long (max %d characters)\n",
+					   WIFI_ENT_PSWD_MAX_LEN);
+				return -EINVAL;
+			}
+			memcpy(creds.header.key_passwd, state->optarg,
+			       creds.header.key_passwd_length);
+			creds.header.flags |= WIFI_CREDENTIALS_FLAG_KEY_PASSWORD;
+			break;
+		case 'h':
+			shell_help(sh);
+			return -ENOEXEC;
+		default:
+			shell_error(sh, "Invalid option %c\n", state->optopt);
+			return -EINVAL;
 		}
 	}
-
-	if (arg_idx < argc) {
-		/* look for band */
-		enum wifi_frequency_bands band = parse_band(argv[arg_idx]);
-
-		if (band == WIFI_FREQ_BAND_2_4_GHZ) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_2_4GHz;
-			++arg_idx;
-		}
-		if (band == WIFI_FREQ_BAND_5_GHZ) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_5GHz;
-			++arg_idx;
-		}
+	if (creds.password_len > 0 && !secure_connection) {
+		shell_warn(sh, "Passphrase provided without security configuration\n");
 	}
 
-	if (arg_idx < argc) {
-		/* look for channel */
-		char *end;
-
-		creds.header.channel = strtol(argv[arg_idx], &end, 10);
-		if (*end == '\0') {
-			++arg_idx;
-		}
-	}
-
-	if (arg_idx < argc) {
-		/* look for favorite flag */
-		if (strncmp("favorite", argv[arg_idx], strlen("favorite")) == 0) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_FAVORITE;
-			++arg_idx;
-		}
-	}
-
-	if (arg_idx < argc) {
-		/* look for mfp_disabled flag */
-		if (strncmp("mfp_disabled", argv[arg_idx], strlen("mfp_disabled")) == 0) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_DISABLED;
-			++arg_idx;
-		} else if (strncmp("mfp_required", argv[arg_idx], strlen("mfp_required")) == 0) {
-			creds.header.flags |= WIFI_CREDENTIALS_FLAG_MFP_REQUIRED;
-			++arg_idx;
-		}
+	if (creds.header.ssid_len == 0) {
+		shell_error(sh, "SSID not provided\n");
+		shell_help(sh);
+		return -EINVAL;
 	}
 
-	if (arg_idx < argc) {
-		/* look for timeout */
-		char *end;
-
-		creds.header.timeout = strtol(argv[arg_idx], &end, 10);
-		if (*end == '\0') {
-			++arg_idx;
-		}
-	}
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	struct net_if *iface = net_if_get_first_by_type(&NET_L2_GET_NAME(ETHERNET));
 
-	if (arg_idx != argc) {
-		for (size_t i = arg_idx; i < argc; ++i) {
-			shell_warn(sh, "Unparsed arg: [%s]", argv[i]);
-		}
+	/* Load the enterprise credentials if needed */
+	if (creds.header.type == WIFI_SECURITY_TYPE_EAP_TLS ||
+	    creds.header.type == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||
+	    creds.header.type == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
+	    creds.header.type == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
+	    creds.header.type == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
+		cmd_wifi_set_enterprise_creds(sh, iface);
 	}
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 
 	return wifi_credentials_set_personal_struct(&creds);
-help:
-	shell_print(sh, "Usage: wifi_cred add \"network name\""
-			" {OPEN, WPA2-PSK, WPA2-PSK-SHA256, WPA3-SAE, WPA-PSK}"
-			" [psk/password]"
-			" [bssid]"
-			" [{2.4GHz, 5GHz}]"
-			" [channel]"
-			" [favorite]"
-			" [mfp_disabled|mfp_required]"
-			" [timeout]");
-	return -EINVAL;
 }
 
 static int cmd_delete_network(const struct shell *sh, size_t argc, char *argv[])
 {
 	if (argc != 2) {
-		shell_print(sh, "Usage: wifi_cred delete \"network name\"");
+		shell_print(sh, "Usage: wifi cred delete \"network name\"");
 		return -EINVAL;
 	}
 
@@ -309,8 +397,35 @@ static int cmd_auto_connect(const struct shell *sh, size_t argc, char *argv[])
 
 SHELL_STATIC_SUBCMD_SET_CREATE(sub_wifi_cred,
 	SHELL_CMD_ARG(add, NULL,
-		      "Add network to storage.\n",
-		      cmd_add_network, 0, 0),
+		      "Add network to storage.\n"
+		      "<-s --ssid \"<SSID>\">: SSID.\n"
+		      "[-c --channel]: Channel that needs to be scanned for connection. 0:any channel.\n"
+		      "[-b, --band] 0: any band (2:2.4GHz, 5:5GHz, 6:6GHz]\n"
+		      "[-p, --passphrase]: Passphrase (valid only for secure SSIDs)\n"
+		      "[-k, --key-mgmt]: Key Management type (valid only for secure SSIDs)\n"
+		      "0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE-HNP, 4:SAE-H2E, 5:SAE-AUTO, 6:WAPI,"
+		      " 7:EAP-TLS, 8:WEP, 9: WPA-PSK, 10: WPA-Auto-Personal, 11: DPP\n"
+		      "12: EAP-PEAP-MSCHAPv2, 13: EAP-PEAP-GTC, 14: EAP-TTLS-MSCHAPv2,\n"
+		      "15: EAP-PEAP-TLS, 20: SAE-EXT-KEY\n"
+		      "[-w, --ieee-80211w]: MFP (optional: needs security type to be specified)\n"
+		      ": 0:Disable, 1:Optional, 2:Required.\n"
+		      "[-m, --bssid]: MAC address of the AP (BSSID).\n"
+		      "[-t, --timeout]: Timeout for the connection attempt (in seconds).\n"
+		      "[-a, --anon-id]: Anonymous identity for enterprise mode.\n"
+		      "[-K, --key1-pwd for eap phase1 or --key2-pwd for eap phase2]:\n"
+		      "Private key passwd for enterprise mode. Default no password for private key.\n"
+		      "[-S, --wpa3-enterprise]: WPA3 enterprise mode:\n"
+		      "Default 0: Not WPA3 enterprise mode.\n"
+		      "1:Suite-b mode, 2:Suite-b-192-bit mode, 3:WPA3-enterprise-only mode.\n"
+		      "[-T, --TLS-cipher]: 0:TLS-NONE, 1:TLS-ECC-P384, 2:TLS-RSA-3K.\n"
+		      "[-V, --eap-version]: 0 or 1. Default 1: eap version 1.\n"
+		      "[-I, --eap-id1]: Client Identity. Default no eap identity.\n"
+		      "[-P, --eap-pwd1]: Client Password.\n"
+		      "Default no password for eap user.\n"
+		      "[-R, --ieee-80211r]: Use IEEE80211R fast BSS transition connect."
+		      "[-h, --help]: Print out the help for the add network command.\n",
+		      cmd_add_network,
+		      2, 12),
 	SHELL_CMD_ARG(delete, NULL,
 		      "Delete network from storage.\n",
 		      cmd_delete_network,
diff --git a/subsys/net/lib/zperf/zperf_shell.c b/subsys/net/lib/zperf/zperf_shell.c
index 97d9e1e914084..f3f2257f7cc86 100644
--- a/subsys/net/lib/zperf/zperf_shell.c
+++ b/subsys/net/lib/zperf/zperf_shell.c
@@ -842,6 +842,7 @@ static int shell_cmd_upload(const struct shell *sh, size_t argc,
 	int start = 0;
 	size_t opt_cnt = 0;
 	int ret;
+	int seconds;
 
 	param.options.priority = -1;
 	is_udp = proto == IPPROTO_UDP;
@@ -909,7 +910,7 @@ static int shell_cmd_upload(const struct shell *sh, size_t argc,
 			break;
 
 		case 'i':
-			int seconds = parse_arg(&i, argc, argv);
+			seconds = parse_arg(&i, argc, argv);
 
 			if (is_udp) {
 				shell_fprintf(sh, SHELL_WARNING,
@@ -1076,6 +1077,7 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc,
 	bool async = false;
 	int start = 0;
 	size_t opt_cnt = 0;
+	int seconds;
 
 	is_udp = proto == IPPROTO_UDP;
 
@@ -1142,7 +1144,7 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc,
 			break;
 
 		case 'i':
-			int seconds = parse_arg(&i, argc, argv);
+			seconds = parse_arg(&i, argc, argv);
 
 			if (is_udp) {
 				shell_fprintf(sh, SHELL_WARNING,
diff --git a/subsys/net/lib/zperf/zperf_udp_receiver.c b/subsys/net/lib/zperf/zperf_udp_receiver.c
index c29fb022f255d..62ce71da724ae 100644
--- a/subsys/net/lib/zperf/zperf_udp_receiver.c
+++ b/subsys/net/lib/zperf/zperf_udp_receiver.c
@@ -315,7 +315,7 @@ static void udp_receiver_cleanup(void)
 static int udp_recv_data(struct net_socket_service_event *pev)
 {
 	static uint8_t buf[UDP_RECEIVER_BUF_SIZE];
-	int ret = 0;
+	int ret = 1;
 	int family, sock_error;
 	struct sockaddr addr;
 	socklen_t optlen = sizeof(int);
@@ -341,19 +341,25 @@ static int udp_recv_data(struct net_socket_service_event *pev)
 		return 0;
 	}
 
-	ret = zsock_recvfrom(pev->event.fd, buf, sizeof(buf), 0,
-			     &addr, &addrlen);
-	if (ret < 0) {
-		ret = -errno;
-		(void)zsock_getsockopt(pev->event.fd, SOL_SOCKET,
-				       SO_DOMAIN, &family, &optlen);
-		NET_ERR("recv failed on IPv%d socket (%d)",
-			family == AF_INET ? 4 : 6, -ret);
-		goto error;
-	}
+	while (ret > 0) {
+		ret = zsock_recvfrom(pev->event.fd, buf, sizeof(buf), ZSOCK_MSG_DONTWAIT,
+				     &addr, &addrlen);
+		if ((ret < 0) && (errno == EAGAIN)) {
+			ret = 0;
+			break;
+		}
 
-	udp_received(pev->event.fd, &addr, buf, ret);
+		if (ret < 0) {
+			ret = -errno;
+			(void)zsock_getsockopt(pev->event.fd, SOL_SOCKET,
+					       SO_DOMAIN, &family, &optlen);
+			NET_ERR("recv failed on IPv%d socket (%d)",
+				family == AF_INET ? 4 : 6, -ret);
+			goto error;
+		}
 
+		udp_received(pev->event.fd, &addr, buf, ret);
+	}
 	return ret;
 
 error:
diff --git a/subsys/net/pkt_filter/CMakeLists.txt b/subsys/net/pkt_filter/CMakeLists.txt
index 6147f1ab1252d..d8fd06af74a3a 100644
--- a/subsys/net/pkt_filter/CMakeLists.txt
+++ b/subsys/net/pkt_filter/CMakeLists.txt
@@ -5,5 +5,6 @@ if(CONFIG_NET_PKT_FILTER)
 zephyr_library()
 zephyr_library_sources(base.c)
 zephyr_library_sources_ifdef(CONFIG_NET_L2_ETHERNET ethernet.c)
+zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/net/ip)
 
 endif()
diff --git a/subsys/net/pkt_filter/base.c b/subsys/net/pkt_filter/base.c
index bb2eb9f085ba7..289a55e9d604e 100644
--- a/subsys/net/pkt_filter/base.c
+++ b/subsys/net/pkt_filter/base.c
@@ -49,6 +49,7 @@ struct npf_rule_list npf_ipv6_recv_rules = {
 /*
  * Helper function
  */
+#if defined(CONFIG_NET_PKT_FILTER_IPV4_HOOK) || defined(CONFIG_NET_PKT_FILTER_IPV6_HOOK)
 static struct npf_rule_list *get_ip_rules(uint8_t pf)
 {
 	switch (pf) {
@@ -68,7 +69,7 @@ static struct npf_rule_list *get_ip_rules(uint8_t pf)
 
 	return NULL;
 }
-
+#endif /* CONFIG_NET_PKT_FILTER_IPV4_HOOK || CONFIG_NET_PKT_FILTER_IPV6_HOOK */
 /*
  * Rule application
  */
@@ -86,7 +87,9 @@ static bool apply_tests(struct npf_rule *rule, struct net_pkt *pkt)
 	for (i = 0; i < rule->nb_tests; i++) {
 		test = rule->tests[i];
 		result = test->fn(test, pkt);
-		NET_DBG("test %p result %d", test, result);
+		NET_DBG("test %s (%p) result %d",
+			COND_CODE_1(NPF_TEST_ENABLE_NAME, (test->name), ("")),
+			test, result);
 		if (result == false) {
 			return false;
 		}
@@ -239,6 +242,10 @@ bool npf_iface_match(struct npf_test *test, struct net_pkt *pkt)
 	struct npf_test_iface *test_iface =
 			CONTAINER_OF(test, struct npf_test_iface, test);
 
+	NET_DBG("iface %d pkt %d",
+		net_if_get_by_iface(test_iface->iface),
+		net_if_get_by_iface(net_pkt_iface(pkt)));
+
 	return test_iface->iface == net_pkt_iface(pkt);
 }
 
@@ -252,6 +259,10 @@ bool npf_orig_iface_match(struct npf_test *test, struct net_pkt *pkt)
 	struct npf_test_iface *test_iface =
 			CONTAINER_OF(test, struct npf_test_iface, test);
 
+	NET_DBG("orig iface %d pkt %d",
+		net_if_get_by_iface(test_iface->iface),
+		net_if_get_by_iface(net_pkt_orig_iface(pkt)));
+
 	return test_iface->iface == net_pkt_orig_iface(pkt);
 }
 
@@ -266,6 +277,9 @@ bool npf_size_inbounds(struct npf_test *test, struct net_pkt *pkt)
 			CONTAINER_OF(test, struct npf_test_size_bounds, test);
 	size_t pkt_size = net_pkt_get_len(pkt);
 
+	NET_DBG("pkt_size %zu min %zu max %zu",
+		pkt_size, bounds->min, bounds->max);
+
 	return pkt_size >= bounds->min && pkt_size <= bounds->max;
 }
 
@@ -297,3 +311,156 @@ bool npf_ip_src_addr_unmatch(struct npf_test *test, struct net_pkt *pkt)
 {
 	return !npf_ip_src_addr_match(test, pkt);
 }
+
+static void rules_cb(struct npf_rule_list *rules, enum npf_rule_type type,
+		     npf_rule_cb_t cb, void *user_data)
+{
+	struct npf_rule *rule;
+
+	SYS_SLIST_FOR_EACH_CONTAINER(&rules->rule_head, rule, node) {
+		cb(rule, type, user_data);
+	}
+}
+
+void npf_rules_foreach(npf_rule_cb_t cb, void *user_data)
+{
+	rules_cb(&npf_send_rules, NPF_RULE_TYPE_SEND, cb, user_data);
+	rules_cb(&npf_recv_rules, NPF_RULE_TYPE_RECV, cb, user_data);
+
+#ifdef CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK
+	rules_cb(&npf_local_in_recv_rules, NPF_RULE_TYPE_LOCAL_IN_RECV, cb, user_data);
+#endif /* CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK */
+
+#ifdef CONFIG_NET_PKT_FILTER_IPV4_HOOK
+	rules_cb(&npf_ipv4_recv_rules, NPF_RULE_TYPE_IPV4_RECV, cb, user_data);
+#endif /* CONFIG_NET_PKT_FILTER_IPV4_HOOK */
+
+#ifdef CONFIG_NET_PKT_FILTER_IPV6_HOOK
+	rules_cb(&npf_ipv6_recv_rules, NPF_RULE_TYPE_IPV6_RECV, cb, user_data);
+#endif /* CONFIG_NET_PKT_FILTER_IPV6_HOOK */
+}
+
+#include "net_private.h" /* for net_sprint_addr() */
+
+const char *npf_test_get_str(struct npf_test *test, char *buf, size_t len)
+{
+#if defined(CONFIG_NET_SHELL_PKT_FILTER_SUPPORTED)
+	if (test->type == NPF_TEST_TYPE_IFACE_MATCH ||
+	    test->type == NPF_TEST_TYPE_IFACE_UNMATCH ||
+	    test->type == NPF_TEST_TYPE_ORIG_IFACE_MATCH ||
+	    test->type == NPF_TEST_TYPE_ORIG_IFACE_UNMATCH) {
+		struct npf_test_iface *test_iface =
+			CONTAINER_OF(test, struct npf_test_iface, test);
+
+		snprintk(buf, len, "[%d]", net_if_get_by_iface(test_iface->iface));
+
+	} else if (test->type == NPF_TEST_TYPE_SIZE_BOUNDS ||
+		   test->type == NPF_TEST_TYPE_SIZE_MIN ||
+		   test->type == NPF_TEST_TYPE_SIZE_MAX) {
+		struct npf_test_size_bounds *bounds =
+			CONTAINER_OF(test, struct npf_test_size_bounds, test);
+
+		if (test->type == NPF_TEST_TYPE_SIZE_MIN ||
+		    test->type == NPF_TEST_TYPE_SIZE_MAX) {
+			snprintk(buf, len, "[%zu]",
+				 test->type == NPF_TEST_TYPE_SIZE_MIN ?
+				 bounds->min :  bounds->max);
+		} else {
+			snprintk(buf, len, "[%zu-%zu]", bounds->min, bounds->max);
+		}
+
+	} else if (test->type == NPF_TEST_TYPE_IP_SRC_ADDR_ALLOWLIST ||
+		   test->type == NPF_TEST_TYPE_IP_SRC_ADDR_BLOCKLIST) {
+		struct npf_test_ip *test_ip =
+			CONTAINER_OF(test, struct npf_test_ip, test);
+		int pos = 1;
+
+		if (len < 2) {
+			goto out;
+		}
+
+		if (test_ip->ipaddr_num == 0) {
+			snprintk(buf, len, "[]");
+			goto out;
+		}
+
+		buf[0] = '[';
+
+		for (uint32_t i = 0; i < test_ip->ipaddr_num; i++) {
+			if (IS_ENABLED(CONFIG_NET_IPV4) &&
+			    test_ip->addr_family == AF_INET) {
+				struct in_addr *addr =
+					&((struct in_addr *)test_ip->ipaddr)[i];
+
+				pos += snprintk(buf + pos, len - pos,
+						"%s%s", pos > 1 ? "," : "",
+						net_sprint_ipv4_addr(addr));
+
+			} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
+				   test_ip->addr_family == AF_INET6) {
+				struct in6_addr *addr =
+					&((struct in6_addr *)test_ip->ipaddr)[i];
+
+				pos += snprintk(buf + pos, len - pos,
+						"%s%s", pos > 1 ? "," : "",
+						net_sprint_ipv6_addr(addr));
+			}
+		}
+
+		if (pos >= len) {
+			goto out;
+		}
+
+		buf[pos] = ']';
+
+	} else if (test->type == NPF_TEST_TYPE_ETH_SRC_ADDR_MATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_SRC_ADDR_UNMATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_DST_ADDR_MATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_DST_ADDR_UNMATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_SRC_ADDR_MASK_MATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_DST_ADDR_MASK_MATCH) {
+		struct npf_test_eth_addr *test_eth =
+			CONTAINER_OF(test, struct npf_test_eth_addr, test);
+		int pos = 1;
+
+		if (len < 2) {
+			goto out;
+		}
+
+		if (test_eth->nb_addresses == 0) {
+			snprintk(buf, len, "[]");
+			goto out;
+		}
+
+		buf[0] = '[';
+
+		for (uint32_t i = 0; i < test_eth->nb_addresses; i++) {
+			pos += snprintk(buf + pos, len - pos,
+					"%s%s", pos > 1 ? "," : "",
+					net_sprint_ll_addr(
+						(const uint8_t *)(&test_eth->addresses[i]),
+						NET_ETH_ADDR_LEN));
+		}
+
+		if (pos >= len) {
+			goto out;
+		}
+
+		buf[pos] = ']';
+
+	} else if (test->type == NPF_TEST_TYPE_ETH_TYPE_MATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_TYPE_UNMATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_VLAN_TYPE_MATCH ||
+		   test->type == NPF_TEST_TYPE_ETH_VLAN_TYPE_UNMATCH) {
+		struct npf_test_eth_type *test_eth =
+			CONTAINER_OF(test, struct npf_test_eth_type, test);
+
+		snprintk(buf, len, "[0x%04x]", ntohs(test_eth->type));
+	}
+
+out:
+	return test->name;
+#else
+	return "<UNKNOWN>";
+#endif
+}
diff --git a/subsys/net/pkt_filter/ethernet.c b/subsys/net/pkt_filter/ethernet.c
index 9dddd899885fd..22ddd939dcfea 100644
--- a/subsys/net/pkt_filter/ethernet.c
+++ b/subsys/net/pkt_filter/ethernet.c
@@ -72,6 +72,10 @@ bool npf_eth_type_match(struct npf_test *test, struct net_pkt *pkt)
 	struct net_eth_hdr *eth_hdr = NET_ETH_HDR(pkt);
 
 	/* note: type_match->type is assumed to be in network order already */
+	NET_DBG("proto type 0x%04x pkt 0x%04x",
+		ntohs(test_eth_type->type),
+		ntohs(eth_hdr->type));
+
 	return eth_hdr->type == test_eth_type->type;
 }
 
@@ -79,3 +83,23 @@ bool npf_eth_type_unmatch(struct npf_test *test, struct net_pkt *pkt)
 {
 	return !npf_eth_type_match(test, pkt);
 }
+
+bool npf_eth_vlan_type_match(struct npf_test *test, struct net_pkt *pkt)
+{
+	struct npf_test_eth_type *test_eth_type =
+			CONTAINER_OF(test, struct npf_test_eth_type, test);
+	struct net_eth_vlan_hdr *eth_hdr =
+		(struct net_eth_vlan_hdr *)NET_ETH_HDR(pkt);
+
+	/* note: type_match->type is assumed to be in network order already */
+	NET_DBG("proto type 0x%04x pkt 0x%04x",
+		ntohs(test_eth_type->type),
+		ntohs(eth_hdr->type));
+
+	return eth_hdr->type == test_eth_type->type;
+}
+
+bool npf_eth_vlan_type_unmatch(struct npf_test *test, struct net_pkt *pkt)
+{
+	return !npf_eth_vlan_type_match(test, pkt);
+}
diff --git a/subsys/pm/Kconfig b/subsys/pm/Kconfig
index 6c097321c47fa..19078d02b8158 100644
--- a/subsys/pm/Kconfig
+++ b/subsys/pm/Kconfig
@@ -53,6 +53,26 @@ config PM_NEED_ALL_DEVICES_IDLE
 	  When this option is enabled, check that no devices are busy before
 	  entering into system low power mode.
 
+choice PM_PREWAKEUP_CONV_MODE
+	prompt "Pre-wakeup microseconds to ticks conversion method"
+	default PM_PREWAKEUP_CONV_MODE_NEAR
+	help
+	  Exit latency for each power state is given in microseconds. It is converted
+	  to ticks and system clock is set to wake up the core earlier before scheduled
+	  wake up. This option specifies rounding that is used when converting exit
+	  latency from microseconds to system ticks.
+
+config PM_PREWAKEUP_CONV_MODE_NEAR
+	bool "Nearest"
+
+config PM_PREWAKEUP_CONV_MODE_CEIL
+	bool "Round up"
+
+config PM_PREWAKEUP_CONV_MODE_FLOOR
+	bool "Round down"
+
+endchoice
+
 endif # PM
 
 config PM_DEVICE
diff --git a/subsys/pm/device.c b/subsys/pm/device.c
index 518e20a8630dd..a1a7e92ee9258 100644
--- a/subsys/pm/device.c
+++ b/subsys/pm/device.c
@@ -361,10 +361,13 @@ int pm_device_driver_init(const struct device *dev,
 	struct pm_device_base *pm = dev->pm_base;
 	int rc;
 
+	/* Device is currently in the OFF state */
+	if (pm) {
+		pm->state = PM_DEVICE_STATE_OFF;
+	}
+
 	/* Work only needs to be performed if the device is powered */
 	if (!pm_device_is_powered(dev)) {
-		/* Start in off mode */
-		pm_device_init_off(dev);
 		return 0;
 	}
 
@@ -380,16 +383,21 @@ int pm_device_driver_init(const struct device *dev,
 		return action_cb(dev, PM_DEVICE_ACTION_RESUME);
 	}
 
+	/* Device is currently in the SUSPENDED state */
+	pm->state = PM_DEVICE_STATE_SUSPENDED;
+
 	/* If device will have PM device runtime enabled */
 	if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) &&
 	    atomic_test_bit(&pm->flags, PM_DEVICE_FLAG_RUNTIME_AUTO)) {
-		/* Init into suspend mode.
-		 * This saves a SUSPENDED->ACTIVE->SUSPENDED cycle.
-		 */
-		pm_device_init_suspended(dev);
 		return 0;
 	}
 
 	/* Startup into active mode */
-	return action_cb(dev, PM_DEVICE_ACTION_RESUME);
+	rc = action_cb(dev, PM_DEVICE_ACTION_RESUME);
+
+	/* Device is now in the ACTIVE state */
+	pm->state = PM_DEVICE_STATE_ACTIVE;
+
+	/* Return the PM_DEVICE_ACTION_RESUME result */
+	return rc;
 }
diff --git a/subsys/pm/pm.c b/subsys/pm/pm.c
index e674c9ae2bc42..1baad192fbf9b 100644
--- a/subsys/pm/pm.c
+++ b/subsys/pm/pm.c
@@ -26,19 +26,15 @@ LOG_MODULE_REGISTER(pm, CONFIG_PM_LOG_LEVEL);
 static ATOMIC_DEFINE(z_post_ops_required, CONFIG_MP_MAX_NUM_CPUS);
 static sys_slist_t pm_notifiers = SYS_SLIST_STATIC_INIT(&pm_notifiers);
 
-/*
- * Properly initialize cpu power states. Do not make assumptions that
- * ACTIVE_STATE is 0
- */
-#define CPU_PM_STATE_INIT(_, __)		\
-	{ .state = PM_STATE_ACTIVE }
-static struct pm_state_info z_cpus_pm_state[] = {
-	LISTIFY(CONFIG_MP_MAX_NUM_CPUS, CPU_PM_STATE_INIT, (,))
-};
+/* Convert exit-latency-us to ticks using specified method. */
+#define EXIT_LATENCY_US_TO_TICKS(us)						    \
+	IS_ENABLED(CONFIG_PM_PREWAKEUP_CONV_MODE_NEAR) ? k_us_to_ticks_near32(us) : \
+	IS_ENABLED(CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL) ? k_us_to_ticks_ceil32(us) : \
+		k_us_to_ticks_floor32(us)
 
-static struct pm_state_info z_cpus_pm_forced_state[] = {
-	LISTIFY(CONFIG_MP_MAX_NUM_CPUS, CPU_PM_STATE_INIT, (,))
-};
+/* State pointers which are set to NULL indicate ACTIVE state. */
+static const struct pm_state_info *z_cpus_pm_state[CONFIG_MP_MAX_NUM_CPUS];
+static const struct pm_state_info *z_cpus_pm_forced_state[CONFIG_MP_MAX_NUM_CPUS];
 
 static struct k_spinlock pm_forced_state_lock;
 static struct k_spinlock pm_notifier_lock;
@@ -62,7 +58,7 @@ static inline void pm_state_notify(bool entering_state)
 		}
 
 		if (callback) {
-			callback(z_cpus_pm_state[_current_cpu->id].state);
+			callback(z_cpus_pm_state[CPU_ID]->state);
 		}
 	}
 	k_spin_unlock(&pm_notifier_lock, pm_notifier_key);
@@ -93,7 +89,7 @@ static inline int32_t ticks_expiring_sooner(int32_t ticks1, int32_t ticks2)
 
 void pm_system_resume(void)
 {
-	uint8_t id = _current_cpu->id;
+	uint8_t id = CPU_ID;
 
 	/*
 	 * This notification is called from the ISR of the event
@@ -110,19 +106,19 @@ void pm_system_resume(void)
 	if (atomic_test_and_clear_bit(z_post_ops_required, id)) {
 #ifdef CONFIG_PM_DEVICE_SYSTEM_MANAGED
 		if (atomic_add(&_cpus_active, 1) == 0) {
-			if ((z_cpus_pm_state[id].state != PM_STATE_RUNTIME_IDLE) &&
-					!z_cpus_pm_state[id].pm_device_disabled) {
+			if ((z_cpus_pm_state[id]->state != PM_STATE_RUNTIME_IDLE) &&
+					!z_cpus_pm_state[id]->pm_device_disabled) {
 				pm_resume_devices();
 			}
 		}
 #endif
-		pm_state_exit_post_ops(z_cpus_pm_state[id].state, z_cpus_pm_state[id].substate_id);
+		pm_state_exit_post_ops(z_cpus_pm_state[id]->state,
+				       z_cpus_pm_state[id]->substate_id);
 		pm_state_notify(false);
 #ifdef CONFIG_SYS_CLOCK_EXISTS
 		sys_clock_idle_exit();
 #endif /* CONFIG_SYS_CLOCK_EXISTS */
-		z_cpus_pm_state[id] = (struct pm_state_info){PM_STATE_ACTIVE, 0, false,
-			0, 0};
+		z_cpus_pm_state[id] = NULL;
 	}
 }
 
@@ -133,8 +129,10 @@ bool pm_state_force(uint8_t cpu, const struct pm_state_info *info)
 	__ASSERT(info->state < PM_STATE_COUNT,
 		 "Invalid power state %d!", info->state);
 
+	info = pm_state_get(cpu, info->state, info->substate_id);
+
 	key = k_spin_lock(&pm_forced_state_lock);
-	z_cpus_pm_forced_state[cpu] = *info;
+	z_cpus_pm_forced_state[cpu] = info;
 	k_spin_unlock(&pm_forced_state_lock, key);
 
 	return true;
@@ -142,9 +140,10 @@ bool pm_state_force(uint8_t cpu, const struct pm_state_info *info)
 
 bool pm_system_suspend(int32_t kernel_ticks)
 {
-	uint8_t id = _current_cpu->id;
+	uint8_t id = CPU_ID;
 	k_spinlock_key_t key;
 	int32_t ticks, events_ticks;
+	uint32_t exit_latency_ticks;
 
 	SYS_PORT_TRACING_FUNC_ENTER(pm, system_suspend, kernel_ticks);
 
@@ -156,54 +155,43 @@ bool pm_system_suspend(int32_t kernel_ticks)
 	ticks = ticks_expiring_sooner(kernel_ticks, events_ticks);
 
 	key = k_spin_lock(&pm_forced_state_lock);
-	if (z_cpus_pm_forced_state[id].state != PM_STATE_ACTIVE) {
+	if (z_cpus_pm_forced_state[id] != NULL) {
 		z_cpus_pm_state[id] = z_cpus_pm_forced_state[id];
-		z_cpus_pm_forced_state[id].state = PM_STATE_ACTIVE;
+		z_cpus_pm_forced_state[id] = NULL;
 	} else {
-		const struct pm_state_info *info;
-
-		info = pm_policy_next_state(id, ticks);
-		if (info != NULL) {
-			z_cpus_pm_state[id] = *info;
-		} else {
-			z_cpus_pm_state[id].state = PM_STATE_ACTIVE;
-		}
+		z_cpus_pm_state[id] = pm_policy_next_state(id, ticks);
 	}
 	k_spin_unlock(&pm_forced_state_lock, key);
 
-	if (z_cpus_pm_state[id].state == PM_STATE_ACTIVE) {
+	if (z_cpus_pm_state[id] == NULL) {
 		LOG_DBG("No PM operations done.");
-		SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
-				   z_cpus_pm_state[id].state);
+		SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks, PM_STATE_ACTIVE);
 		return false;
 	}
 
 #ifdef CONFIG_PM_DEVICE_SYSTEM_MANAGED
 	if (atomic_sub(&_cpus_active, 1) == 1) {
-		if ((z_cpus_pm_state[id].state != PM_STATE_RUNTIME_IDLE) &&
-		    !z_cpus_pm_state[id].pm_device_disabled) {
+		if ((z_cpus_pm_state[id]->state != PM_STATE_RUNTIME_IDLE) &&
+		    !z_cpus_pm_state[id]->pm_device_disabled) {
 			if (!pm_suspend_devices()) {
 				pm_resume_devices();
-				z_cpus_pm_state[id].state = PM_STATE_ACTIVE;
+				z_cpus_pm_state[id] = NULL;
 				(void)atomic_add(&_cpus_active, 1);
 				SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
-							   z_cpus_pm_state[id].state);
+							   PM_STATE_ACTIVE);
 				return false;
 			}
 		}
 	}
 #endif
 
-	if ((z_cpus_pm_state[id].exit_latency_us != 0) &&
-	    (ticks != K_TICKS_FOREVER)) {
+	exit_latency_ticks = EXIT_LATENCY_US_TO_TICKS(z_cpus_pm_state[id]->exit_latency_us);
+	if ((exit_latency_ticks > 0) && (ticks != K_TICKS_FOREVER)) {
 		/*
 		 * We need to set the timer to interrupt a little bit early to
 		 * accommodate the time required by the CPU to fully wake up.
 		 */
-		sys_clock_set_timeout(ticks -
-		     k_us_to_ticks_ceil32(
-			     z_cpus_pm_state[id].exit_latency_us),
-				     true);
+		sys_clock_set_timeout(ticks - exit_latency_ticks, true);
 	}
 
 	/*
@@ -220,15 +208,16 @@ bool pm_system_suspend(int32_t kernel_ticks)
 	/* Enter power state */
 	pm_state_notify(true);
 	atomic_set_bit(z_post_ops_required, id);
-	pm_state_set(z_cpus_pm_state[id].state, z_cpus_pm_state[id].substate_id);
+	pm_state_set(z_cpus_pm_state[id]->state, z_cpus_pm_state[id]->substate_id);
 	pm_stats_stop();
 
 	/* Wake up sequence starts here */
-	pm_stats_update(z_cpus_pm_state[id].state);
+	pm_stats_update(z_cpus_pm_state[id]->state);
 	pm_system_resume();
 	k_sched_unlock();
 	SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
-				   z_cpus_pm_state[id].state);
+				   z_cpus_pm_state[id] ?
+				   z_cpus_pm_state[id]->state : PM_STATE_ACTIVE);
 
 	return true;
 }
@@ -257,5 +246,9 @@ int pm_notifier_unregister(struct pm_notifier *notifier)
 
 const struct pm_state_info *pm_state_next_get(uint8_t cpu)
 {
-	return &z_cpus_pm_state[cpu];
+	static const struct pm_state_info active = {
+		.state = PM_STATE_ACTIVE
+	};
+
+	return z_cpus_pm_state[cpu] ? z_cpus_pm_state[cpu] : &active;
 }
diff --git a/subsys/pm/pm_stats.c b/subsys/pm/pm_stats.c
index 4c1c00f339569..c937fdde722b3 100644
--- a/subsys/pm/pm_stats.c
+++ b/subsys/pm/pm_stats.c
@@ -53,17 +53,17 @@ SYS_INIT(pm_stats_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 void pm_stats_start(void)
 {
-	time_start[_current_cpu->id] = k_cycle_get_32();
+	time_start[CPU_ID] = k_cycle_get_32();
 }
 
 void pm_stats_stop(void)
 {
-	time_stop[_current_cpu->id] = k_cycle_get_32();
+	time_stop[CPU_ID] = k_cycle_get_32();
 }
 
 void pm_stats_update(enum pm_state state)
 {
-	uint8_t cpu = _current_cpu->id;
+	uint8_t cpu = CPU_ID;
 	uint32_t time_total = time_stop[cpu] - time_start[cpu];
 
 	STATS_INC(stats[cpu][state], state_count);
diff --git a/subsys/pm/state.c b/subsys/pm/state.c
index 297d28a37680b..3cf2888d33963 100644
--- a/subsys/pm/state.c
+++ b/subsys/pm/state.c
@@ -66,3 +66,18 @@ uint8_t pm_state_cpu_get_all(uint8_t cpu, const struct pm_state_info **states)
 
 	return states_per_cpu[cpu];
 }
+
+const struct pm_state_info *pm_state_get(uint8_t cpu, enum pm_state state, uint8_t substate_id)
+{
+	__ASSERT_NO_MSG(cpu < ARRAY_SIZE(cpus_states));
+	const struct pm_state_info *states = cpus_states[cpu];
+	uint8_t cnt = states_per_cpu[cpu];
+
+	for (uint8_t i = 0; i < cnt; i++) {
+		if ((states[i].state == state) && (states[i].substate_id == substate_id)) {
+			return &states[i];
+		}
+	}
+
+	return NULL;
+}
diff --git a/subsys/portability/cmsis_rtos_v2/Kconfig b/subsys/portability/cmsis_rtos_v2/Kconfig
index 0701204803643..968daeae55be2 100644
--- a/subsys/portability/cmsis_rtos_v2/Kconfig
+++ b/subsys/portability/cmsis_rtos_v2/Kconfig
@@ -16,23 +16,20 @@ config CMSIS_RTOS_V2
 
 if CMSIS_RTOS_V2
 config CMSIS_V2_THREAD_MAX_COUNT
-	int "Maximum thread count in CMSIS RTOS V2 application"
+	int "Maximum thread count in CMSIS RTOS V2 application with dynamic control blocks"
 	default 15
 	range 0 $(UINT8_MAX)
 	help
-	  Mention max number of threads in CMSIS RTOS V2 compliant application.
-	  There's a limitation on the number of threads due to memory
-	  related constraints.
+	  Max number of threads in CMSIS RTOS V2 application that can be created with
+	  dynamically allocated control block.
 
 config CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT
-	int "Maximum dynamic thread count in CMSIS RTOS V2 application"
+	int "Maximum thread count in CMSIS RTOS V2 application with dynamic stack"
 	default 0
 	range 0 $(UINT8_MAX)
 	help
-	  Mention max number of dynamic threads in CMSIS RTOS V2 compliant
-	  application. There's a limitation on the number of threads due to memory
-	  related constraints. Dynamic threads are a subset of all other CMSIS
-	  threads i.e. they also count towards that maximum too.
+	  Max number of threads in CMSIS RTOS V2 application that can be created with
+	  dynamically allocated stack.
 
 config CMSIS_V2_THREAD_MAX_STACK_SIZE
 	int "Max stack size threads can be allocated in CMSIS RTOS V2 application"
@@ -49,32 +46,36 @@ config CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE
 	  Mention dynamic stack size threads are allocated in CMSIS RTOS V2 application.
 
 config CMSIS_V2_TIMER_MAX_COUNT
-	int "Maximum timer count in CMSIS RTOS V2 application"
+	int "Maximum dynamically-allocated timers in CMSIS RTOS V2 application"
 	default 5
 	range 0 $(UINT8_MAX)
 	help
-	  Mention maximum number of timers in CMSIS RTOS V2 compliant application.
+	  Mention maximum number of timers in CMSIS RTOS V2 compliant application that can
+	  be created with dynamically allocated control block.
 
 config CMSIS_V2_MUTEX_MAX_COUNT
-	int "Maximum mutex count in CMSIS RTOS V2 application"
+	int "Maximum dynamically-allocated mutexes in CMSIS RTOS V2 application"
 	default 5
 	range 0 $(UINT8_MAX)
 	help
-	  Mention max number of mutexes in CMSIS RTOS V2 compliant application.
+	  Mention max number of mutexes in CMSIS RTOS V2 compliant application that can
+	  be created with dynamically allocated control block.
 
 config CMSIS_V2_SEMAPHORE_MAX_COUNT
-	int "Maximum semaphore count in CMSIS RTOS V2 application"
+	int "Maximum dynamically-allocated semaphores in CMSIS RTOS V2 application"
 	default 5
 	range 0 $(UINT8_MAX)
 	help
-	  Mention max number of semaphores in CMSIS RTOS V2 compliant application.
+	  Mention max number of semaphores in CMSIS RTOS V2 compliant application that can
+	  be created with dynamically allocated control block.
 
 config CMSIS_V2_MEM_SLAB_MAX_COUNT
-	int "Maximum mem slab count in CMSIS RTOS V2 application"
+	int "Maximum dynamically-allocated mempools in CMSIS RTOS V2 application"
 	default 5
 	range 0 $(UINT8_MAX)
 	help
-	  Mention maximum number of memory slabs in CMSIS RTOS V2 compliant application.
+	  Mention maximum number of memory slabs in CMSIS RTOS V2 compliant application that can
+	  be created with dynamically allocated control block.
 
 config CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE
 	int "Maximum dynamic mem slab/pool size in CMSIS RTOS V2 application"
@@ -83,11 +84,12 @@ config CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE
 	  Mention maximum dynamic size of memory slabs/pools in CMSIS RTOS V2 compliant application.
 
 config CMSIS_V2_MSGQ_MAX_COUNT
-	int "Maximum message queue count in CMSIS RTOS V2 application"
+	int "Maximum dynamically-allocated message queues in CMSIS RTOS V2 application"
 	default 5
 	range 0 $(UINT8_MAX)
 	help
-	  Mention maximum number of message queues in CMSIS RTOS V2 compliant application.
+	  Mention maximum number of message queues in CMSIS RTOS V2 compliant application that can
+	  be created with dynamically allocated control block.
 
 config CMSIS_V2_MSGQ_MAX_DYNAMIC_SIZE
 	int "Maximum dynamic message queue size in CMSIS RTOS V2 application"
@@ -96,9 +98,10 @@ config CMSIS_V2_MSGQ_MAX_DYNAMIC_SIZE
 	  Mention maximum dynamic size of message queues in CMSIS RTOS V2 compliant application.
 
 config CMSIS_V2_EVT_FLAGS_MAX_COUNT
-	int "Maximum event flags count in CMSIS RTOS V2 application"
+	int "Maximum dynamically-allocated event flags count in CMSIS RTOS V2 application"
 	default 5
 	range 0 $(UINT8_MAX)
 	help
-	  Mention maximum number of event flags in CMSIS RTOS V2 compliant application.
+	  Mention maximum number of event flags in CMSIS RTOS V2 compliant application that can
+	  be created with dynamically allocated control block.
 endif
diff --git a/subsys/portability/cmsis_rtos_v2/event_flags.c b/subsys/portability/cmsis_rtos_v2/event_flags.c
index cd91c69a4a264..5e2daeb06af88 100644
--- a/subsys/portability/cmsis_rtos_v2/event_flags.c
+++ b/subsys/portability/cmsis_rtos_v2/event_flags.c
@@ -5,10 +5,10 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/portability/cmsis_types.h>
 #include <string.h>
-#include "wrapper.h"
 
-K_MEM_SLAB_DEFINE(cv2_event_flags_slab, sizeof(struct cv2_event_flags),
+K_MEM_SLAB_DEFINE(cmsis_rtos_event_cb_slab, sizeof(struct cmsis_rtos_event_cb),
 		  CONFIG_CMSIS_V2_EVT_FLAGS_MAX_COUNT, 4);
 
 static const osEventFlagsAttr_t init_event_flags_attrs = {
@@ -18,14 +18,14 @@ static const osEventFlagsAttr_t init_event_flags_attrs = {
 	.cb_size = 0,
 };
 
-#define DONT_CARE        (0)
+#define DONT_CARE (0)
 
 /**
  * @brief Create and Initialize an Event Flags object.
  */
 osEventFlagsId_t osEventFlagsNew(const osEventFlagsAttr_t *attr)
 {
-	struct cv2_event_flags *events;
+	struct cmsis_rtos_event_cb *events;
 
 	if (k_is_in_isr()) {
 		return NULL;
@@ -35,24 +35,22 @@ osEventFlagsId_t osEventFlagsNew(const osEventFlagsAttr_t *attr)
 		attr = &init_event_flags_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_event_flags_slab, (void **)&events, K_MSEC(100))
-		== 0) {
-		memset(events, 0, sizeof(struct cv2_event_flags));
-	} else {
+	if (attr->cb_mem != NULL) {
+		__ASSERT(attr->cb_size == sizeof(struct cmsis_rtos_event_cb), "Invalid cb_size\n");
+		events = (struct cmsis_rtos_event_cb *)attr->cb_mem;
+	} else if (k_mem_slab_alloc(&cmsis_rtos_event_cb_slab, (void **)&events, K_MSEC(100)) !=
+		   0) {
 		return NULL;
 	}
+	memset(events, 0, sizeof(struct cmsis_rtos_event_cb));
+	events->is_cb_dynamic_allocation = attr->cb_mem == NULL;
 
 	k_poll_signal_init(&events->poll_signal);
-	k_poll_event_init(&events->poll_event, K_POLL_TYPE_SIGNAL,
-			  K_POLL_MODE_NOTIFY_ONLY, &events->poll_signal);
+	k_poll_event_init(&events->poll_event, K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY,
+			  &events->poll_signal);
 	events->signal_results = 0U;
 
-	if (attr->name == NULL) {
-		strncpy(events->name, init_event_flags_attrs.name,
-			sizeof(events->name) - 1);
-	} else {
-		strncpy(events->name, attr->name, sizeof(events->name) - 1);
-	}
+	events->name = (attr->name == NULL) ? init_event_flags_attrs.name : attr->name;
 
 	return (osEventFlagsId_t)events;
 }
@@ -62,7 +60,7 @@ osEventFlagsId_t osEventFlagsNew(const osEventFlagsAttr_t *attr)
  */
 uint32_t osEventFlagsSet(osEventFlagsId_t ef_id, uint32_t flags)
 {
-	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
+	struct cmsis_rtos_event_cb *events = (struct cmsis_rtos_event_cb *)ef_id;
 	unsigned int key;
 
 	if ((ef_id == NULL) || (flags & osFlagsError)) {
@@ -83,7 +81,7 @@ uint32_t osEventFlagsSet(osEventFlagsId_t ef_id, uint32_t flags)
  */
 uint32_t osEventFlagsClear(osEventFlagsId_t ef_id, uint32_t flags)
 {
-	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
+	struct cmsis_rtos_event_cb *events = (struct cmsis_rtos_event_cb *)ef_id;
 	unsigned int key;
 	uint32_t sig;
 
@@ -102,10 +100,10 @@ uint32_t osEventFlagsClear(osEventFlagsId_t ef_id, uint32_t flags)
 /**
  * @brief Wait for one or more Event Flags to become signaled.
  */
-uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags,
-			  uint32_t options, uint32_t timeout)
+uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags, uint32_t options,
+			  uint32_t timeout)
 {
-	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
+	struct cmsis_rtos_event_cb *events = (struct cmsis_rtos_event_cb *)ef_id;
 	int retval, key;
 	uint32_t sig;
 	k_timeout_t poll_timeout;
@@ -173,12 +171,11 @@ uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags,
 			 * adjust the timeout value accordingly based on
 			 * the time that has already elapsed.
 			 */
-			ticks_elapsed =
-				(uint64_t)k_uptime_ticks() - time_stamp_start;
+			ticks_elapsed = (uint64_t)k_uptime_ticks() - time_stamp_start;
 
 			if (ticks_elapsed < (uint64_t)timeout) {
-				poll_timeout = Z_TIMEOUT_TICKS((k_ticks_t)(
-					timeout - (uint32_t)ticks_elapsed));
+				poll_timeout = Z_TIMEOUT_TICKS(
+					(k_ticks_t)(timeout - (uint32_t)ticks_elapsed));
 			} else {
 				return osFlagsErrorTimeout;
 			}
@@ -198,8 +195,7 @@ uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags,
 		 */
 		__ASSERT(events->poll_event.state == K_POLL_STATE_SIGNALED,
 			 "event state not signalled!");
-		__ASSERT(events->poll_event.signal->signaled == 1U,
-			 "event signaled is not 1");
+		__ASSERT(events->poll_event.signal->signaled == 1U, "event signaled is not 1");
 	}
 
 	return sig;
@@ -207,16 +203,16 @@ uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags,
 
 /**
  * @brief Get name of an Event Flags object.
+ * This function may be called from Interrupt Service Routines.
  */
 const char *osEventFlagsGetName(osEventFlagsId_t ef_id)
 {
-	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
+	struct cmsis_rtos_event_cb *events = (struct cmsis_rtos_event_cb *)ef_id;
 
-	if (!k_is_in_isr() && (ef_id != NULL)) {
-		return events->name;
-	} else {
+	if (events == NULL) {
 		return NULL;
 	}
+	return events->name;
 }
 
 /**
@@ -224,7 +220,7 @@ const char *osEventFlagsGetName(osEventFlagsId_t ef_id)
  */
 uint32_t osEventFlagsGet(osEventFlagsId_t ef_id)
 {
-	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
+	struct cmsis_rtos_event_cb *events = (struct cmsis_rtos_event_cb *)ef_id;
 
 	if (ef_id == NULL) {
 		return 0;
@@ -238,7 +234,7 @@ uint32_t osEventFlagsGet(osEventFlagsId_t ef_id)
  */
 osStatus_t osEventFlagsDelete(osEventFlagsId_t ef_id)
 {
-	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
+	struct cmsis_rtos_event_cb *events = (struct cmsis_rtos_event_cb *)ef_id;
 
 	if (ef_id == NULL) {
 		return osErrorResource;
@@ -251,8 +247,8 @@ osStatus_t osEventFlagsDelete(osEventFlagsId_t ef_id)
 	/* The status code "osErrorParameter" (the value of the parameter
 	 * ef_id is incorrect) is not supported in Zephyr.
 	 */
-
-	k_mem_slab_free(&cv2_event_flags_slab, (void *)events);
-
+	if (events->is_cb_dynamic_allocation) {
+		k_mem_slab_free(&cmsis_rtos_event_cb_slab, (void *)events);
+	}
 	return osOK;
 }
diff --git a/subsys/portability/cmsis_rtos_v2/kernel.c b/subsys/portability/cmsis_rtos_v2/kernel.c
index 519be96023ddb..9f19e89e69fc9 100644
--- a/subsys/portability/cmsis_rtos_v2/kernel.c
+++ b/subsys/portability/cmsis_rtos_v2/kernel.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
 
 extern uint32_t sys_clock_tick_get_32(void);
 
@@ -24,8 +24,7 @@ osStatus_t osKernelGetInfo(osVersion_t *version, char *id_buf, uint32_t id_size)
 	}
 
 	if ((id_buf != NULL) && (version != NULL)) {
-		snprintf(id_buf, id_size,
-			 "Zephyr V%2"PRIu32".%2"PRIu32".%2"PRIu32,
+		snprintf(id_buf, id_size, "Zephyr V%2" PRIu32 ".%2" PRIu32 ".%2" PRIu32,
 			 SYS_KERNEL_VER_MAJOR(version->kernel),
 			 SYS_KERNEL_VER_MINOR(version->kernel),
 			 SYS_KERNEL_VER_PATCHLEVEL(version->kernel));
@@ -78,9 +77,9 @@ int32_t osKernelRestoreLock(int32_t lock)
 	}
 
 	if (lock < 0) {
-		return 1;       /* locked */
+		return 1; /* locked */
 	} else {
-		return 0;       /* not locked */
+		return 0; /* not locked */
 	}
 }
 
diff --git a/subsys/portability/cmsis_rtos_v2/mempool.c b/subsys/portability/cmsis_rtos_v2/mempool.c
index a5a0891975376..002a6660e96ba 100644
--- a/subsys/portability/cmsis_rtos_v2/mempool.c
+++ b/subsys/portability/cmsis_rtos_v2/mempool.c
@@ -5,12 +5,13 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/portability/cmsis_types.h>
 #include <string.h>
 #include "wrapper.h"
 
-#define TIME_OUT_TICKS  10
+#define TIME_OUT_TICKS 10
 
-K_MEM_SLAB_DEFINE(cv2_mem_slab, sizeof(struct cv2_mslab),
+K_MEM_SLAB_DEFINE(cv2_mem_slab, sizeof(struct cmsis_rtos_mempool_cb),
 		  CONFIG_CMSIS_V2_MEM_SLAB_MAX_COUNT, 4);
 
 static const osMemoryPoolAttr_t init_mslab_attrs = {
@@ -28,10 +29,9 @@ static const osMemoryPoolAttr_t init_mslab_attrs = {
 osMemoryPoolId_t osMemoryPoolNew(uint32_t block_count, uint32_t block_size,
 				 const osMemoryPoolAttr_t *attr)
 {
-	struct cv2_mslab *mslab;
+	struct cmsis_rtos_mempool_cb *mslab;
 
-	BUILD_ASSERT(K_HEAP_MEM_POOL_SIZE >=
-		     CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE,
+	BUILD_ASSERT(K_HEAP_MEM_POOL_SIZE >= CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE,
 		     "heap must be configured to be at least the max dynamic size");
 
 	if (k_is_in_isr()) {
@@ -46,20 +46,25 @@ osMemoryPoolId_t osMemoryPoolNew(uint32_t block_count, uint32_t block_size,
 		attr = &init_mslab_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_mem_slab, (void **)&mslab, K_MSEC(100)) == 0) {
-		(void)memset(mslab, 0, sizeof(struct cv2_mslab));
-	} else {
+	if (attr->cb_mem != NULL) {
+		__ASSERT(attr->cb_size == sizeof(struct cmsis_rtos_mempool_cb),
+			 "Invalid cb_size\n");
+		mslab = (struct cmsis_rtos_mempool_cb *)attr->cb_mem;
+	} else if (k_mem_slab_alloc(&cv2_mem_slab, (void **)&mslab, K_MSEC(100)) != 0) {
 		return NULL;
 	}
+	(void)memset(mslab, 0, sizeof(struct cmsis_rtos_mempool_cb));
+	mslab->is_cb_dynamic_allocation = attr->cb_mem == NULL;
 
 	if (attr->mp_mem == NULL) {
-		__ASSERT((block_count * block_size) <=
-			 CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE,
+		__ASSERT((block_count * block_size) <= CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE,
 			 "memory slab/pool size exceeds dynamic maximum");
 
 		mslab->pool = k_calloc(block_count, block_size);
 		if (mslab->pool == NULL) {
-			k_mem_slab_free(&cv2_mem_slab, (void *)mslab);
+			if (mslab->is_cb_dynamic_allocation) {
+				k_mem_slab_free(&cv2_mem_slab, (void *)mslab);
+			}
 			return NULL;
 		}
 		mslab->is_dynamic_allocation = TRUE;
@@ -69,21 +74,17 @@ osMemoryPoolId_t osMemoryPoolNew(uint32_t block_count, uint32_t block_size,
 	}
 
 	int rc = k_mem_slab_init(&mslab->z_mslab, mslab->pool, block_size, block_count);
-
 	if (rc != 0) {
-		k_mem_slab_free(&cv2_mem_slab, (void *)mslab);
+		if (mslab->is_cb_dynamic_allocation) {
+			k_mem_slab_free(&cv2_mem_slab, (void *)mslab);
+		}
 		if (attr->mp_mem == NULL) {
 			k_free(mslab->pool);
 		}
 		return NULL;
 	}
 
-	if (attr->name == NULL) {
-		strncpy(mslab->name, init_mslab_attrs.name,
-			sizeof(mslab->name) - 1);
-	} else {
-		strncpy(mslab->name, attr->name, sizeof(mslab->name) - 1);
-	}
+	mslab->name = (attr->name == NULL) ? init_mslab_attrs.name : attr->name;
 
 	return (osMemoryPoolId_t)mslab;
 }
@@ -93,7 +94,7 @@ osMemoryPoolId_t osMemoryPoolNew(uint32_t block_count, uint32_t block_size,
  */
 void *osMemoryPoolAlloc(osMemoryPoolId_t mp_id, uint32_t timeout)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 	int retval;
 	void *ptr;
 
@@ -107,17 +108,14 @@ void *osMemoryPoolAlloc(osMemoryPoolId_t mp_id, uint32_t timeout)
 	}
 
 	if (timeout == 0U) {
-		retval = k_mem_slab_alloc(
-			(struct k_mem_slab *)(&mslab->z_mslab),
-			(void **)&ptr, K_NO_WAIT);
+		retval = k_mem_slab_alloc((struct k_mem_slab *)(&mslab->z_mslab), (void **)&ptr,
+					  K_NO_WAIT);
 	} else if (timeout == osWaitForever) {
-		retval = k_mem_slab_alloc(
-			(struct k_mem_slab *)(&mslab->z_mslab),
-			(void **)&ptr, K_FOREVER);
+		retval = k_mem_slab_alloc((struct k_mem_slab *)(&mslab->z_mslab), (void **)&ptr,
+					  K_FOREVER);
 	} else {
-		retval = k_mem_slab_alloc(
-			(struct k_mem_slab *)(&mslab->z_mslab),
-			(void **)&ptr, K_TICKS(timeout));
+		retval = k_mem_slab_alloc((struct k_mem_slab *)(&mslab->z_mslab), (void **)&ptr,
+					  K_TICKS(timeout));
 	}
 
 	if (retval == 0) {
@@ -132,7 +130,7 @@ void *osMemoryPoolAlloc(osMemoryPoolId_t mp_id, uint32_t timeout)
  */
 osStatus_t osMemoryPoolFree(osMemoryPoolId_t mp_id, void *block)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 
 	if (mslab == NULL) {
 		return osErrorParameter;
@@ -142,24 +140,24 @@ osStatus_t osMemoryPoolFree(osMemoryPoolId_t mp_id, void *block)
 	 *       osErrorResource: the memory pool specified by parameter mp_id
 	 *       is in an invalid memory pool state.
 	 */
-
-	k_mem_slab_free((struct k_mem_slab *)(&mslab->z_mslab), (void *)block);
-
+	if (mslab->is_cb_dynamic_allocation) {
+		k_mem_slab_free((struct k_mem_slab *)(&mslab->z_mslab), (void *)block);
+	}
 	return osOK;
 }
 
 /**
  * @brief Get name of a Memory Pool object.
+ * This function may be called from Interrupt Service Routines.
  */
 const char *osMemoryPoolGetName(osMemoryPoolId_t mp_id)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 
-	if (!k_is_in_isr() && (mslab != NULL)) {
-		return mslab->name;
-	} else {
+	if (mslab == NULL) {
 		return NULL;
 	}
+	return mslab->name;
 }
 
 /**
@@ -167,7 +165,7 @@ const char *osMemoryPoolGetName(osMemoryPoolId_t mp_id)
  */
 uint32_t osMemoryPoolGetCapacity(osMemoryPoolId_t mp_id)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 
 	if (mslab == NULL) {
 		return 0;
@@ -181,7 +179,7 @@ uint32_t osMemoryPoolGetCapacity(osMemoryPoolId_t mp_id)
  */
 uint32_t osMemoryPoolGetBlockSize(osMemoryPoolId_t mp_id)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 
 	if (mslab == NULL) {
 		return 0;
@@ -195,7 +193,7 @@ uint32_t osMemoryPoolGetBlockSize(osMemoryPoolId_t mp_id)
  */
 uint32_t osMemoryPoolGetCount(osMemoryPoolId_t mp_id)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 
 	if (mslab == NULL) {
 		return 0;
@@ -209,7 +207,7 @@ uint32_t osMemoryPoolGetCount(osMemoryPoolId_t mp_id)
  */
 uint32_t osMemoryPoolGetSpace(osMemoryPoolId_t mp_id)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 
 	if (mslab == NULL) {
 		return 0;
@@ -223,7 +221,7 @@ uint32_t osMemoryPoolGetSpace(osMemoryPoolId_t mp_id)
  */
 osStatus_t osMemoryPoolDelete(osMemoryPoolId_t mp_id)
 {
-	struct cv2_mslab *mslab = (struct cv2_mslab *)mp_id;
+	struct cmsis_rtos_mempool_cb *mslab = (struct cmsis_rtos_mempool_cb *)mp_id;
 
 	if (mslab == NULL) {
 		return osErrorParameter;
@@ -241,7 +239,8 @@ osStatus_t osMemoryPoolDelete(osMemoryPoolId_t mp_id)
 	if (mslab->is_dynamic_allocation) {
 		k_free(mslab->pool);
 	}
-	k_mem_slab_free(&cv2_mem_slab, (void *)mslab);
-
+	if (mslab->is_cb_dynamic_allocation) {
+		k_mem_slab_free(&cv2_mem_slab, (void *)mslab);
+	}
 	return osOK;
 }
diff --git a/subsys/portability/cmsis_rtos_v2/msgq.c b/subsys/portability/cmsis_rtos_v2/msgq.c
index af8c910c189b6..83c111bc65135 100644
--- a/subsys/portability/cmsis_rtos_v2/msgq.c
+++ b/subsys/portability/cmsis_rtos_v2/msgq.c
@@ -5,10 +5,11 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/portability/cmsis_types.h>
 #include <string.h>
 #include "wrapper.h"
 
-K_MEM_SLAB_DEFINE(cv2_msgq_slab, sizeof(struct cv2_msgq),
+K_MEM_SLAB_DEFINE(cmsis_rtos_msgq_cb_slab, sizeof(struct cmsis_rtos_msgq_cb),
 		  CONFIG_CMSIS_V2_MSGQ_MAX_COUNT, 4);
 
 static const osMessageQueueAttr_t init_msgq_attrs = {
@@ -26,10 +27,9 @@ static const osMessageQueueAttr_t init_msgq_attrs = {
 osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size,
 				     const osMessageQueueAttr_t *attr)
 {
-	struct cv2_msgq *msgq;
+	struct cmsis_rtos_msgq_cb *msgq;
 
-	BUILD_ASSERT(K_HEAP_MEM_POOL_SIZE >=
-		     CONFIG_CMSIS_V2_MSGQ_MAX_DYNAMIC_SIZE,
+	BUILD_ASSERT(K_HEAP_MEM_POOL_SIZE >= CONFIG_CMSIS_V2_MSGQ_MAX_DYNAMIC_SIZE,
 		     "heap must be configured to be at least the max dynamic size");
 
 	if (k_is_in_isr()) {
@@ -44,26 +44,32 @@ osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size,
 		attr = &init_msgq_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_msgq_slab, (void **)&msgq, K_MSEC(100)) == 0) {
-		(void)memset(msgq, 0, sizeof(struct cv2_msgq));
-	} else {
+	if (attr->cb_mem != NULL) {
+		__ASSERT(attr->cb_size == sizeof(struct cmsis_rtos_msgq_cb), "Invalid cb_size\n");
+		msgq = (struct cmsis_rtos_msgq_cb *)attr->cb_mem;
+	} else if (k_mem_slab_alloc(&cmsis_rtos_msgq_cb_slab, (void **)&msgq, K_MSEC(100)) != 0) {
 		return NULL;
 	}
+	(void)memset(msgq, 0, sizeof(struct cmsis_rtos_msgq_cb));
+	msgq->is_cb_dynamic_allocation = attr->cb_mem == NULL;
 
 	if (attr->mq_mem == NULL) {
-		__ASSERT((msg_count * msg_size) <=
-			 CONFIG_CMSIS_V2_MSGQ_MAX_DYNAMIC_SIZE,
+		__ASSERT((msg_count * msg_size) <= CONFIG_CMSIS_V2_MSGQ_MAX_DYNAMIC_SIZE,
 			 "message queue size exceeds dynamic maximum");
 
 #if (K_HEAP_MEM_POOL_SIZE > 0)
 		msgq->pool = k_calloc(msg_count, msg_size);
 		if (msgq->pool == NULL) {
-			k_mem_slab_free(&cv2_msgq_slab, (void *)msgq);
+			if (msgq->is_cb_dynamic_allocation) {
+				k_mem_slab_free(&cmsis_rtos_msgq_cb_slab, (void *)msgq);
+			}
 			return NULL;
 		}
 		msgq->is_dynamic_allocation = TRUE;
 #else
-		k_mem_slab_free(&cv2_msgq_slab, (void *)msgq);
+		if (msgq->is_cb_dynamic_allocation) {
+			k_mem_slab_free(&cmsis_rtos_msgq_cb_slab, (void *)msgq);
+		}
 		return NULL;
 #endif
 	} else {
@@ -73,12 +79,7 @@ osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size,
 
 	k_msgq_init(&msgq->z_msgq, msgq->pool, msg_size, msg_count);
 
-	if (attr->name == NULL) {
-		strncpy(msgq->name, init_msgq_attrs.name,
-			sizeof(msgq->name) - 1);
-	} else {
-		strncpy(msgq->name, attr->name, sizeof(msgq->name) - 1);
-	}
+	msgq->name = (attr->name == NULL) ? init_msgq_attrs.name : attr->name;
 
 	return (osMessageQueueId_t)(msgq);
 }
@@ -86,10 +87,10 @@ osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size,
 /**
  * @brief Put a message to a Queue.
  */
-osStatus_t osMessageQueuePut(osMessageQueueId_t msgq_id, const void *msg_ptr,
-			     uint8_t msg_prio, uint32_t timeout)
+osStatus_t osMessageQueuePut(osMessageQueueId_t msgq_id, const void *msg_ptr, uint8_t msg_prio,
+			     uint32_t timeout)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 	int retval;
 
 	ARG_UNUSED(msg_prio);
@@ -108,8 +109,7 @@ osStatus_t osMessageQueuePut(osMessageQueueId_t msgq_id, const void *msg_ptr,
 	} else if (timeout == osWaitForever) {
 		retval = k_msgq_put(&msgq->z_msgq, (void *)msg_ptr, K_FOREVER);
 	} else {
-		retval = k_msgq_put(&msgq->z_msgq, (void *)msg_ptr,
-				    K_TICKS(timeout));
+		retval = k_msgq_put(&msgq->z_msgq, (void *)msg_ptr, K_TICKS(timeout));
 	}
 
 	if (retval == 0) {
@@ -124,10 +124,10 @@ osStatus_t osMessageQueuePut(osMessageQueueId_t msgq_id, const void *msg_ptr,
 /**
  * @brief Get a message or Wait for a Message from a Queue.
  */
-osStatus_t osMessageQueueGet(osMessageQueueId_t msgq_id, void *msg_ptr,
-			     uint8_t *msg_prio, uint32_t timeout)
+osStatus_t osMessageQueueGet(osMessageQueueId_t msgq_id, void *msg_ptr, uint8_t *msg_prio,
+			     uint32_t timeout)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 	int retval;
 
 	ARG_UNUSED(msg_prio);
@@ -146,8 +146,7 @@ osStatus_t osMessageQueueGet(osMessageQueueId_t msgq_id, void *msg_ptr,
 	} else if (timeout == osWaitForever) {
 		retval = k_msgq_get(&msgq->z_msgq, msg_ptr, K_FOREVER);
 	} else {
-		retval = k_msgq_get(&msgq->z_msgq, msg_ptr,
-				    K_TICKS(timeout));
+		retval = k_msgq_get(&msgq->z_msgq, msg_ptr, K_TICKS(timeout));
 	}
 
 	if (retval == 0) {
@@ -166,7 +165,7 @@ osStatus_t osMessageQueueGet(osMessageQueueId_t msgq_id, void *msg_ptr,
  */
 uint32_t osMessageQueueGetCapacity(osMessageQueueId_t msgq_id)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 
 	if (msgq == NULL) {
 		return 0;
@@ -180,7 +179,7 @@ uint32_t osMessageQueueGetCapacity(osMessageQueueId_t msgq_id)
  */
 uint32_t osMessageQueueGetMsgSize(osMessageQueueId_t msgq_id)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 
 	if (msgq == NULL) {
 		return 0;
@@ -194,7 +193,7 @@ uint32_t osMessageQueueGetMsgSize(osMessageQueueId_t msgq_id)
  */
 uint32_t osMessageQueueGetCount(osMessageQueueId_t msgq_id)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 
 	if (msgq == NULL) {
 		return 0;
@@ -208,7 +207,7 @@ uint32_t osMessageQueueGetCount(osMessageQueueId_t msgq_id)
  */
 uint32_t osMessageQueueGetSpace(osMessageQueueId_t msgq_id)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 
 	if (msgq == NULL) {
 		return 0;
@@ -219,16 +218,16 @@ uint32_t osMessageQueueGetSpace(osMessageQueueId_t msgq_id)
 
 /**
  * @brief Get name of a Message Queue object.
+ * This function may be called from Interrupt Service Routines.
  */
 const char *osMessageQueueGetName(osMessageQueueId_t msgq_id)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 
-	if (!k_is_in_isr() && (msgq_id != NULL)) {
-		return msgq->name;
-	} else {
+	if (msgq == NULL) {
 		return NULL;
 	}
+	return msgq->name;
 }
 
 /**
@@ -236,7 +235,7 @@ const char *osMessageQueueGetName(osMessageQueueId_t msgq_id)
  */
 osStatus_t osMessageQueueReset(osMessageQueueId_t msgq_id)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 
 	if (msgq == NULL) {
 		return osErrorParameter;
@@ -261,7 +260,7 @@ osStatus_t osMessageQueueReset(osMessageQueueId_t msgq_id)
  */
 osStatus_t osMessageQueueDelete(osMessageQueueId_t msgq_id)
 {
-	struct cv2_msgq *msgq = (struct cv2_msgq *)msgq_id;
+	struct cmsis_rtos_msgq_cb *msgq = (struct cmsis_rtos_msgq_cb *)msgq_id;
 
 	if (msgq == NULL) {
 		return osErrorParameter;
@@ -279,7 +278,8 @@ osStatus_t osMessageQueueDelete(osMessageQueueId_t msgq_id)
 	if (msgq->is_dynamic_allocation) {
 		k_free(msgq->pool);
 	}
-	k_mem_slab_free(&cv2_msgq_slab, (void *)msgq);
-
+	if (msgq->is_cb_dynamic_allocation) {
+		k_mem_slab_free(&cmsis_rtos_msgq_cb_slab, (void *)msgq);
+	}
 	return osOK;
 }
diff --git a/subsys/portability/cmsis_rtos_v2/mutex.c b/subsys/portability/cmsis_rtos_v2/mutex.c
index d942f20e1bd58..59408e542bb0e 100644
--- a/subsys/portability/cmsis_rtos_v2/mutex.c
+++ b/subsys/portability/cmsis_rtos_v2/mutex.c
@@ -5,10 +5,11 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/portability/cmsis_types.h>
 #include <string.h>
 #include "wrapper.h"
 
-K_MEM_SLAB_DEFINE(cv2_mutex_slab, sizeof(struct cv2_mutex),
+K_MEM_SLAB_DEFINE(cmsis_rtos_mutex_cb_slab, sizeof(struct cmsis_rtos_mutex_cb),
 		  CONFIG_CMSIS_V2_MUTEX_MAX_COUNT, 4);
 
 static const osMutexAttr_t init_mutex_attrs = {
@@ -23,7 +24,7 @@ static const osMutexAttr_t init_mutex_attrs = {
  */
 osMutexId_t osMutexNew(const osMutexAttr_t *attr)
 {
-	struct cv2_mutex *mutex;
+	struct cmsis_rtos_mutex_cb *mutex;
 
 	if (k_is_in_isr()) {
 		return NULL;
@@ -36,24 +37,21 @@ osMutexId_t osMutexNew(const osMutexAttr_t *attr)
 	__ASSERT(attr->attr_bits & osMutexPrioInherit,
 		 "Zephyr supports osMutexPrioInherit by default. Do not unselect it\n");
 
-	__ASSERT(!(attr->attr_bits & osMutexRobust),
-		 "Zephyr does not support osMutexRobust.\n");
+	__ASSERT(!(attr->attr_bits & osMutexRobust), "Zephyr does not support osMutexRobust.\n");
 
-	if (k_mem_slab_alloc(&cv2_mutex_slab, (void **)&mutex, K_MSEC(100)) == 0) {
-		memset(mutex, 0, sizeof(struct cv2_mutex));
-	} else {
+	if (attr->cb_mem != NULL) {
+		__ASSERT(attr->cb_size == sizeof(struct cmsis_rtos_mutex_cb), "Invalid cb_size\n");
+		mutex = (struct cmsis_rtos_mutex_cb *)attr->cb_mem;
+	} else if (k_mem_slab_alloc(&cmsis_rtos_mutex_cb_slab, (void **)&mutex, K_MSEC(100)) != 0) {
 		return NULL;
 	}
+	memset(mutex, 0, sizeof(struct cmsis_rtos_mutex_cb));
+	mutex->is_cb_dynamic_allocation = attr->cb_mem == NULL;
 
 	k_mutex_init(&mutex->z_mutex);
 	mutex->state = attr->attr_bits;
 
-	if (attr->name == NULL) {
-		strncpy(mutex->name, init_mutex_attrs.name,
-			sizeof(mutex->name) - 1);
-	} else {
-		strncpy(mutex->name, attr->name, sizeof(mutex->name) - 1);
-	}
+	mutex->name = (attr->name == NULL) ? init_mutex_attrs.name : attr->name;
 
 	return (osMutexId_t)mutex;
 }
@@ -63,7 +61,7 @@ osMutexId_t osMutexNew(const osMutexAttr_t *attr)
  */
 osStatus_t osMutexAcquire(osMutexId_t mutex_id, uint32_t timeout)
 {
-	struct cv2_mutex *mutex = (struct cv2_mutex *) mutex_id;
+	struct cmsis_rtos_mutex_cb *mutex = (struct cmsis_rtos_mutex_cb *)mutex_id;
 	int status;
 
 	if (mutex_id == NULL) {
@@ -79,8 +77,7 @@ osStatus_t osMutexAcquire(osMutexId_t mutex_id, uint32_t timeout)
 	} else if (timeout == 0U) {
 		status = k_mutex_lock(&mutex->z_mutex, K_NO_WAIT);
 	} else {
-		status = k_mutex_lock(&mutex->z_mutex,
-				      K_TICKS(timeout));
+		status = k_mutex_lock(&mutex->z_mutex, K_TICKS(timeout));
 	}
 
 	if (timeout != 0 && (status == -EAGAIN || status == -EBUSY)) {
@@ -97,7 +94,7 @@ osStatus_t osMutexAcquire(osMutexId_t mutex_id, uint32_t timeout)
  */
 osStatus_t osMutexRelease(osMutexId_t mutex_id)
 {
-	struct cv2_mutex *mutex = (struct cv2_mutex *) mutex_id;
+	struct cmsis_rtos_mutex_cb *mutex = (struct cmsis_rtos_mutex_cb *)mutex_id;
 
 	if (mutex_id == NULL) {
 		return osErrorParameter;
@@ -119,7 +116,7 @@ osStatus_t osMutexRelease(osMutexId_t mutex_id)
  */
 osStatus_t osMutexDelete(osMutexId_t mutex_id)
 {
-	struct cv2_mutex *mutex = (struct cv2_mutex *)mutex_id;
+	struct cmsis_rtos_mutex_cb *mutex = (struct cmsis_rtos_mutex_cb *)mutex_id;
 
 	if (mutex_id == NULL) {
 		return osErrorParameter;
@@ -132,16 +129,16 @@ osStatus_t osMutexDelete(osMutexId_t mutex_id)
 	/* The status code "osErrorResource" (mutex specified by parameter
 	 * mutex_id is in an invalid mutex state) is not supported in Zephyr.
 	 */
-
-	k_mem_slab_free(&cv2_mutex_slab, (void *)mutex);
+	if (mutex->is_cb_dynamic_allocation) {
+		k_mem_slab_free(&cmsis_rtos_mutex_cb_slab, (void *)mutex);
+	}
 
 	return osOK;
 }
 
-
 osThreadId_t osMutexGetOwner(osMutexId_t mutex_id)
 {
-	struct cv2_mutex *mutex = (struct cv2_mutex *)mutex_id;
+	struct cmsis_rtos_mutex_cb *mutex = (struct cmsis_rtos_mutex_cb *)mutex_id;
 
 	if (k_is_in_isr() || (mutex == NULL)) {
 		return NULL;
@@ -155,13 +152,16 @@ osThreadId_t osMutexGetOwner(osMutexId_t mutex_id)
 	return get_cmsis_thread_id(mutex->z_mutex.owner);
 }
 
+/**
+ * @brief Get name of a mutex.
+ * This function may be called from Interrupt Service Routines.
+ */
 const char *osMutexGetName(osMutexId_t mutex_id)
 {
-	struct cv2_mutex *mutex = (struct cv2_mutex *)mutex_id;
+	struct cmsis_rtos_mutex_cb *mutex = (struct cmsis_rtos_mutex_cb *)mutex_id;
 
-	if (k_is_in_isr() || (mutex == NULL)) {
+	if (mutex == NULL) {
 		return NULL;
 	}
-
 	return mutex->name;
 }
diff --git a/subsys/portability/cmsis_rtos_v2/semaphore.c b/subsys/portability/cmsis_rtos_v2/semaphore.c
index 6a006d1259b86..19705cc92557d 100644
--- a/subsys/portability/cmsis_rtos_v2/semaphore.c
+++ b/subsys/portability/cmsis_rtos_v2/semaphore.c
@@ -5,10 +5,10 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/portability/cmsis_types.h>
 #include <string.h>
-#include "wrapper.h"
 
-K_MEM_SLAB_DEFINE(cv2_semaphore_slab, sizeof(struct cv2_sem),
+K_MEM_SLAB_DEFINE(cmsis_rtos_semaphore_cb_slab, sizeof(struct cmsis_rtos_semaphore_cb),
 		  CONFIG_CMSIS_V2_SEMAPHORE_MAX_COUNT, 4);
 
 static const osSemaphoreAttr_t init_sema_attrs = {
@@ -24,7 +24,7 @@ static const osSemaphoreAttr_t init_sema_attrs = {
 osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count,
 			       const osSemaphoreAttr_t *attr)
 {
-	struct cv2_sem *semaphore;
+	struct cmsis_rtos_semaphore_cb *semaphore;
 
 	if (k_is_in_isr()) {
 		return NULL;
@@ -34,22 +34,20 @@ osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count,
 		attr = &init_sema_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_semaphore_slab,
-			     (void **)&semaphore, K_MSEC(100)) == 0) {
-		(void)memset(semaphore, 0, sizeof(struct cv2_sem));
-	} else {
+	if (attr->cb_mem != NULL) {
+		__ASSERT(attr->cb_size == sizeof(struct cmsis_rtos_semaphore_cb),
+			 "Invalid cb_size\n");
+		semaphore = (struct cmsis_rtos_semaphore_cb *)attr->cb_mem;
+	} else if (k_mem_slab_alloc(&cmsis_rtos_semaphore_cb_slab, (void **)&semaphore,
+				    K_MSEC(100)) != 0) {
 		return NULL;
 	}
+	(void)memset(semaphore, 0, sizeof(struct cmsis_rtos_semaphore_cb));
+	semaphore->is_cb_dynamic_allocation = attr->cb_mem == NULL;
 
 	k_sem_init(&semaphore->z_semaphore, initial_count, max_count);
 
-	if (attr->name == NULL) {
-		strncpy(semaphore->name, init_sema_attrs.name,
-			sizeof(semaphore->name) - 1);
-	} else {
-		strncpy(semaphore->name, attr->name,
-			sizeof(semaphore->name) - 1);
-	}
+	semaphore->name = (attr->name == NULL) ? init_sema_attrs.name : attr->name;
 
 	return (osSemaphoreId_t)semaphore;
 }
@@ -59,7 +57,7 @@ osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count,
  */
 osStatus_t osSemaphoreAcquire(osSemaphoreId_t semaphore_id, uint32_t timeout)
 {
-	struct cv2_sem *semaphore = (struct cv2_sem *) semaphore_id;
+	struct cmsis_rtos_semaphore_cb *semaphore = (struct cmsis_rtos_semaphore_cb *)semaphore_id;
 	int status;
 
 	if (semaphore_id == NULL) {
@@ -76,8 +74,7 @@ osStatus_t osSemaphoreAcquire(osSemaphoreId_t semaphore_id, uint32_t timeout)
 	} else if (timeout == 0U) {
 		status = k_sem_take(&semaphore->z_semaphore, K_NO_WAIT);
 	} else {
-		status = k_sem_take(&semaphore->z_semaphore,
-				    K_TICKS(timeout));
+		status = k_sem_take(&semaphore->z_semaphore, K_TICKS(timeout));
 	}
 
 	if (status == -EBUSY) {
@@ -91,7 +88,7 @@ osStatus_t osSemaphoreAcquire(osSemaphoreId_t semaphore_id, uint32_t timeout)
 
 uint32_t osSemaphoreGetCount(osSemaphoreId_t semaphore_id)
 {
-	struct cv2_sem *semaphore = (struct cv2_sem *)semaphore_id;
+	struct cmsis_rtos_semaphore_cb *semaphore = (struct cmsis_rtos_semaphore_cb *)semaphore_id;
 
 	if (semaphore_id == NULL) {
 		return 0;
@@ -105,15 +102,14 @@ uint32_t osSemaphoreGetCount(osSemaphoreId_t semaphore_id)
  */
 osStatus_t osSemaphoreRelease(osSemaphoreId_t semaphore_id)
 {
-	struct cv2_sem *semaphore = (struct cv2_sem *) semaphore_id;
+	struct cmsis_rtos_semaphore_cb *semaphore = (struct cmsis_rtos_semaphore_cb *)semaphore_id;
 
 	if (semaphore_id == NULL) {
 		return osErrorParameter;
 	}
 
 	/* All tokens have already been released */
-	if (k_sem_count_get(&semaphore->z_semaphore) ==
-	    semaphore->z_semaphore.limit) {
+	if (k_sem_count_get(&semaphore->z_semaphore) == semaphore->z_semaphore.limit) {
 		return osErrorResource;
 	}
 
@@ -127,7 +123,7 @@ osStatus_t osSemaphoreRelease(osSemaphoreId_t semaphore_id)
  */
 osStatus_t osSemaphoreDelete(osSemaphoreId_t semaphore_id)
 {
-	struct cv2_sem *semaphore = (struct cv2_sem *)semaphore_id;
+	struct cmsis_rtos_semaphore_cb *semaphore = (struct cmsis_rtos_semaphore_cb *)semaphore_id;
 
 	if (semaphore_id == NULL) {
 		return osErrorParameter;
@@ -141,19 +137,23 @@ osStatus_t osSemaphoreDelete(osSemaphoreId_t semaphore_id)
 	 * parameter semaphore_id is in an invalid semaphore state) is not
 	 * supported in Zephyr.
 	 */
-
-	k_mem_slab_free(&cv2_semaphore_slab, (void *)semaphore);
+	if (semaphore->is_cb_dynamic_allocation) {
+		k_mem_slab_free(&cmsis_rtos_semaphore_cb_slab, (void *)semaphore);
+	}
 
 	return osOK;
 }
 
+/**
+ * @brief Get name of a semaphore.
+ * This function may be called from Interrupt Service Routines.
+ */
 const char *osSemaphoreGetName(osSemaphoreId_t semaphore_id)
 {
-	struct cv2_sem *semaphore = (struct cv2_sem *)semaphore_id;
+	struct cmsis_rtos_semaphore_cb *semaphore = (struct cmsis_rtos_semaphore_cb *)semaphore_id;
 
-	if (!k_is_in_isr() && (semaphore_id != NULL)) {
-		return semaphore->name;
-	} else {
+	if (semaphore == NULL) {
 		return NULL;
 	}
+	return semaphore->name;
 }
diff --git a/subsys/portability/cmsis_rtos_v2/thread.c b/subsys/portability/cmsis_rtos_v2/thread.c
index 9cbc702b5fc0f..cecb2d234f379 100644
--- a/subsys/portability/cmsis_rtos_v2/thread.c
+++ b/subsys/portability/cmsis_rtos_v2/thread.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/debug/stack.h>
+#include <zephyr/portability/cmsis_types.h>
 #include "wrapper.h"
 
 static const osThreadAttr_t init_thread_attrs = {
@@ -25,13 +26,16 @@ static const osThreadAttr_t init_thread_attrs = {
 };
 
 static sys_dlist_t thread_list;
-static struct cv2_thread cv2_thread_pool[CONFIG_CMSIS_V2_THREAD_MAX_COUNT];
-static atomic_t thread_num;
-static atomic_t thread_num_dynamic;
 
+static atomic_t num_dynamic_cb;
+#if CONFIG_CMSIS_V2_THREAD_MAX_COUNT != 0
+static struct cmsis_rtos_thread_cb cmsis_rtos_thread_cb_pool[CONFIG_CMSIS_V2_THREAD_MAX_COUNT];
+#endif
+
+static atomic_t num_dynamic_stack;
 #if CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT != 0
-static K_THREAD_STACK_ARRAY_DEFINE(cv2_thread_stack_pool,		     \
-				   CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT, \
+static K_THREAD_STACK_ARRAY_DEFINE(cmsis_rtos_thread_stack_pool,
+				   CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT,
 				   CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE);
 #endif
 
@@ -54,22 +58,17 @@ static inline uint32_t cmsis_to_zephyr_priority(uint32_t c_prio)
 
 static void zephyr_thread_wrapper(void *arg1, void *arg2, void *arg3)
 {
-	struct cv2_thread *tid = arg2;
-	void * (*fun_ptr)(void *) = arg3;
-
+	osThreadFunc_t fun_ptr = arg3;
 	fun_ptr(arg1);
-
-	tid->has_joined = TRUE;
-	k_sem_give(&tid->join_guard);
 }
 
 void *is_cmsis_rtos_v2_thread(void *thread_id)
 {
 	sys_dnode_t *pnode;
-	struct cv2_thread *itr;
+	struct cmsis_rtos_thread_cb *itr;
 
 	SYS_DLIST_FOR_EACH_NODE(&thread_list, pnode) {
-		itr = CONTAINER_OF(pnode, struct cv2_thread, node);
+		itr = CONTAINER_OF(pnode, struct cmsis_rtos_thread_cb, node);
 
 		if ((void *)itr == thread_id) {
 			return itr;
@@ -82,11 +81,11 @@ void *is_cmsis_rtos_v2_thread(void *thread_id)
 osThreadId_t get_cmsis_thread_id(k_tid_t tid)
 {
 	sys_dnode_t *pnode;
-	struct cv2_thread *itr;
+	struct cmsis_rtos_thread_cb *itr;
 
 	if (tid != NULL) {
 		SYS_DLIST_FOR_EACH_NODE(&thread_list, pnode) {
-			itr = CONTAINER_OF(pnode, struct cv2_thread, node);
+			itr = CONTAINER_OF(pnode, struct cmsis_rtos_thread_cb, node);
 
 			if (&itr->z_thread == tid) {
 				return (osThreadId_t)itr;
@@ -100,25 +99,19 @@ osThreadId_t get_cmsis_thread_id(k_tid_t tid)
 /**
  * @brief Create a thread and add it to Active Threads.
  */
-osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg,
-			 const osThreadAttr_t *attr)
+osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg, const osThreadAttr_t *attr)
 {
 	int32_t prio;
 	osPriority_t cv2_prio;
-	struct cv2_thread *tid;
+	struct cmsis_rtos_thread_cb *tid;
 	static uint32_t one_time;
 	void *stack;
 	size_t stack_size;
-	uint32_t this_thread_num;
 
 	if (k_is_in_isr()) {
 		return NULL;
 	}
 
-	if (thread_num >= CONFIG_CMSIS_V2_THREAD_MAX_COUNT) {
-		return NULL;
-	}
-
 	if (attr == NULL) {
 		attr = &init_thread_attrs;
 	}
@@ -129,50 +122,51 @@ osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg,
 		cv2_prio = attr->priority;
 	}
 
-	if ((attr->stack_mem == NULL) && (thread_num_dynamic >=
-					  CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT)) {
+	if (attr->cb_mem == NULL && num_dynamic_cb >= CONFIG_CMSIS_V2_THREAD_MAX_COUNT) {
+		return NULL;
+	}
+
+	if (attr->stack_mem == NULL &&
+	    num_dynamic_stack >= CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT) {
 		return NULL;
 	}
 
 	BUILD_ASSERT(osPriorityISR <= CONFIG_NUM_PREEMPT_PRIORITIES,
 		     "Configure NUM_PREEMPT_PRIORITIES to at least osPriorityISR");
 
-	BUILD_ASSERT(CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT <=
-		     CONFIG_CMSIS_V2_THREAD_MAX_COUNT,
-		     "Number of dynamic threads cannot exceed max number of threads.");
-
 	BUILD_ASSERT(CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE <=
-		     CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE,
+			     CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE,
 		     "Default dynamic thread stack size cannot exceed max stack size");
 
-	__ASSERT(attr->stack_size <= CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE,
-		 "invalid stack size\n");
+	__ASSERT(attr->stack_size <= CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE, "invalid stack size\n");
 
-	__ASSERT((cv2_prio >= osPriorityIdle) && (cv2_prio <= osPriorityISR),
-		 "invalid priority\n");
+	__ASSERT((cv2_prio >= osPriorityIdle) && (cv2_prio <= osPriorityISR), "invalid priority\n");
 
-	if (attr->stack_mem != NULL) {
-		if (attr->stack_size == 0) {
-			return NULL;
-		}
+	if (attr->stack_mem != NULL && attr->stack_size == 0) {
+		return NULL;
 	}
 
-	prio = cmsis_to_zephyr_priority(cv2_prio);
-
-	this_thread_num = atomic_inc((atomic_t *)&thread_num);
+#if CONFIG_CMSIS_V2_THREAD_MAX_COUNT != 0
+	if (attr->cb_mem == NULL) {
+		uint32_t this_dynamic_cb;
+		this_dynamic_cb = atomic_inc(&num_dynamic_cb);
+		tid = &cmsis_rtos_thread_cb_pool[this_dynamic_cb];
+	} else
+#endif
+	{
+		tid = (struct cmsis_rtos_thread_cb *)attr->cb_mem;
+	}
 
-	tid = &cv2_thread_pool[this_thread_num];
 	tid->attr_bits = attr->attr_bits;
 
 #if CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT != 0
 	if (attr->stack_mem == NULL) {
-		uint32_t this_thread_num_dynamic;
+		uint32_t this_dynamic_stack;
 		__ASSERT(CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE > 0,
 			 "dynamic stack size must be configured to be non-zero\n");
-		this_thread_num_dynamic =
-			atomic_inc((atomic_t *)&thread_num_dynamic);
+		this_dynamic_stack = atomic_inc(&num_dynamic_stack);
 		stack_size = CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE;
-		stack = cv2_thread_stack_pool[this_thread_num_dynamic];
+		stack = cmsis_rtos_thread_stack_pool[this_dynamic_stack];
 	} else
 #endif
 	{
@@ -181,8 +175,8 @@ osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg,
 	}
 
 	k_poll_signal_init(&tid->poll_signal);
-	k_poll_event_init(&tid->poll_event, K_POLL_TYPE_SIGNAL,
-			  K_POLL_MODE_NOTIFY_ONLY, &tid->poll_signal);
+	k_poll_event_init(&tid->poll_event, K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY,
+			  &tid->poll_signal);
 	tid->signal_results = 0U;
 
 	/* TODO: Do this somewhere only once */
@@ -193,48 +187,29 @@ osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg,
 
 	sys_dlist_append(&thread_list, &tid->node);
 
-	k_sem_init(&tid->join_guard, 0, 1);
-	tid->has_joined = FALSE;
-
-	(void)k_thread_create(&tid->z_thread,
-			      stack, stack_size,
-			      zephyr_thread_wrapper,
-			      (void *)arg, tid, threadfunc,
-			      prio, 0, K_NO_WAIT);
+	prio = cmsis_to_zephyr_priority(cv2_prio);
 
-	if (attr->name == NULL) {
-		strncpy(tid->name, init_thread_attrs.name,
-			sizeof(tid->name) - 1);
-	} else {
-		strncpy(tid->name, attr->name, sizeof(tid->name) - 1);
-	}
+	(void)k_thread_create(&tid->z_thread, stack, stack_size, zephyr_thread_wrapper, (void *)arg,
+			      NULL, threadfunc, prio, 0, K_NO_WAIT);
 
-	k_thread_name_set(&tid->z_thread, tid->name);
+	const char *name = (attr->name == NULL) ? init_thread_attrs.name : attr->name;
+	k_thread_name_set(&tid->z_thread, name);
 
 	return (osThreadId_t)tid;
 }
 
 /**
  * @brief Get name of a thread.
+ * This function may be called from Interrupt Service Routines.
  */
 const char *osThreadGetName(osThreadId_t thread_id)
 {
-	const char *name = NULL;
-
-	if (k_is_in_isr() || (thread_id == NULL)) {
-		name = NULL;
-	} else {
-		if (is_cmsis_rtos_v2_thread(thread_id) == NULL) {
-			name = NULL;
-		} else {
-			struct cv2_thread *tid =
-				(struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
-			name = k_thread_name_get(&tid->z_thread);
-		}
+	if (tid == NULL) {
+		return NULL;
 	}
-
-	return name;
+	return k_thread_name_get(&tid->z_thread);
 }
 
 /**
@@ -252,11 +227,10 @@ osThreadId_t osThreadGetId(void)
  */
 osPriority_t osThreadGetPriority(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 	uint32_t priority;
 
-	if (k_is_in_isr() || (tid == NULL) ||
-	    (is_cmsis_rtos_v2_thread(tid) == NULL) ||
+	if (k_is_in_isr() || (tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL) ||
 	    (_is_thread_cmsis_inactive(&tid->z_thread))) {
 		return osPriorityError;
 	}
@@ -270,7 +244,7 @@ osPriority_t osThreadGetPriority(osThreadId_t thread_id)
  */
 osStatus_t osThreadSetPriority(osThreadId_t thread_id, osPriority_t priority)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
 	if ((tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL) ||
 	    (priority <= osPriorityNone) || (priority > osPriorityISR)) {
@@ -285,8 +259,7 @@ osStatus_t osThreadSetPriority(osThreadId_t thread_id, osPriority_t priority)
 		return osErrorResource;
 	}
 
-	k_thread_priority_set((k_tid_t)&tid->z_thread,
-			      cmsis_to_zephyr_priority(priority));
+	k_thread_priority_set((k_tid_t)&tid->z_thread, cmsis_to_zephyr_priority(priority));
 
 	return osOK;
 }
@@ -296,11 +269,10 @@ osStatus_t osThreadSetPriority(osThreadId_t thread_id, osPriority_t priority)
  */
 osThreadState_t osThreadGetState(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 	osThreadState_t state;
 
-	if (k_is_in_isr() || (tid == NULL) ||
-	    (is_cmsis_rtos_v2_thread(tid) == NULL)) {
+	if (k_is_in_isr() || (tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL)) {
 		return osThreadError;
 	}
 
@@ -349,7 +321,7 @@ osStatus_t osThreadYield(void)
  */
 uint32_t osThreadGetStackSize(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
 	__ASSERT(tid, "");
 	__ASSERT(is_cmsis_rtos_v2_thread(tid), "");
@@ -364,7 +336,7 @@ uint32_t osThreadGetStackSize(osThreadId_t thread_id)
  */
 uint32_t osThreadGetStackSpace(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 	size_t unused;
 	int ret;
 
@@ -385,7 +357,7 @@ uint32_t osThreadGetStackSpace(osThreadId_t thread_id)
  */
 osStatus_t osThreadSuspend(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
 	if ((tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL)) {
 		return osErrorParameter;
@@ -409,7 +381,7 @@ osStatus_t osThreadSuspend(osThreadId_t thread_id)
  */
 osStatus_t osThreadResume(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
 	if ((tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL)) {
 		return osErrorParameter;
@@ -434,7 +406,7 @@ osStatus_t osThreadResume(osThreadId_t thread_id)
  */
 osStatus_t osThreadDetach(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
 	if ((tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL)) {
 		return osErrorParameter;
@@ -453,8 +425,6 @@ osStatus_t osThreadDetach(osThreadId_t thread_id)
 
 	tid->attr_bits = osThreadDetached;
 
-	k_sem_give(&tid->join_guard);
-
 	return osOK;
 }
 
@@ -463,8 +433,8 @@ osStatus_t osThreadDetach(osThreadId_t thread_id)
  */
 osStatus_t osThreadJoin(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
-	osStatus_t status = osError;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
+	int ret = 0;
 
 	if ((tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL)) {
 		return osErrorParameter;
@@ -482,21 +452,8 @@ osStatus_t osThreadJoin(osThreadId_t thread_id)
 		return osErrorResource;
 	}
 
-	if (!tid->has_joined) {
-		if (k_sem_take(&tid->join_guard, K_FOREVER) != 0) {
-			__ASSERT(0, "Failed to take from join guard.");
-		}
-
-		k_sem_give(&tid->join_guard);
-	}
-
-	if (tid->has_joined && (tid->attr_bits == osThreadJoinable)) {
-		status = osOK;
-	} else {
-		status = osErrorResource;
-	}
-
-	return status;
+	ret = k_thread_join(&tid->z_thread, K_FOREVER);
+	return (ret == 0) ? osOK : osErrorResource;
 }
 
 /**
@@ -504,13 +461,11 @@ osStatus_t osThreadJoin(osThreadId_t thread_id)
  */
 __NO_RETURN void osThreadExit(void)
 {
-	struct cv2_thread *tid;
+	struct cmsis_rtos_thread_cb *tid;
 
 	__ASSERT(!k_is_in_isr(), "");
 	tid = osThreadGetId();
 
-	k_sem_give(&tid->join_guard);
-
 	k_thread_abort((k_tid_t)&tid->z_thread);
 
 	CODE_UNREACHABLE;
@@ -521,7 +476,7 @@ __NO_RETURN void osThreadExit(void)
  */
 osStatus_t osThreadTerminate(osThreadId_t thread_id)
 {
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
 	if ((tid == NULL) || (is_cmsis_rtos_v2_thread(tid) == NULL)) {
 		return osErrorParameter;
@@ -535,13 +490,10 @@ osStatus_t osThreadTerminate(osThreadId_t thread_id)
 		return osErrorResource;
 	}
 
-	k_sem_give(&tid->join_guard);
-
 	k_thread_abort((k_tid_t)&tid->z_thread);
 	return osOK;
 }
 
-
 /**
  * @brief Get number of active threads.
  */
diff --git a/subsys/portability/cmsis_rtos_v2/thread_flags.c b/subsys/portability/cmsis_rtos_v2/thread_flags.c
index 2ef8cea513c8c..3018bd8224f9a 100644
--- a/subsys/portability/cmsis_rtos_v2/thread_flags.c
+++ b/subsys/portability/cmsis_rtos_v2/thread_flags.c
@@ -5,9 +5,10 @@
  */
 
 #include <zephyr/kernel_structs.h>
+#include <zephyr/portability/cmsis_types.h>
 #include "wrapper.h"
 
-#define DONT_CARE               (0)
+#define DONT_CARE (0)
 
 /**
  * @brief Set the specified Thread Flags of a thread.
@@ -15,10 +16,10 @@
 uint32_t osThreadFlagsSet(osThreadId_t thread_id, uint32_t flags)
 {
 	unsigned int key;
-	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
+	struct cmsis_rtos_thread_cb *tid = (struct cmsis_rtos_thread_cb *)thread_id;
 
-	if ((thread_id == NULL) || (is_cmsis_rtos_v2_thread(thread_id) == NULL)
-	    || (flags & 0x80000000)) {
+	if ((thread_id == NULL) || (is_cmsis_rtos_v2_thread(thread_id) == NULL) ||
+	    (flags & 0x80000000)) {
 		return osFlagsErrorParameter;
 	}
 
@@ -36,13 +37,13 @@ uint32_t osThreadFlagsSet(osThreadId_t thread_id, uint32_t flags)
  */
 uint32_t osThreadFlagsGet(void)
 {
-	struct cv2_thread *tid;
+	struct cmsis_rtos_thread_cb *tid;
 
 	if (k_is_in_isr()) {
 		return 0;
 	}
 
-	tid = (struct cv2_thread *)osThreadGetId();
+	tid = (struct cmsis_rtos_thread_cb *)osThreadGetId();
 	if (tid == NULL) {
 		return 0;
 	} else {
@@ -55,7 +56,7 @@ uint32_t osThreadFlagsGet(void)
  */
 uint32_t osThreadFlagsClear(uint32_t flags)
 {
-	struct cv2_thread *tid;
+	struct cmsis_rtos_thread_cb *tid;
 	int sig, key;
 
 	if (k_is_in_isr()) {
@@ -66,7 +67,7 @@ uint32_t osThreadFlagsClear(uint32_t flags)
 		return osFlagsErrorParameter;
 	}
 
-	tid = (struct cv2_thread *)osThreadGetId();
+	tid = (struct cmsis_rtos_thread_cb *)osThreadGetId();
 	if (tid == NULL) {
 		return osFlagsErrorUnknown;
 	}
@@ -85,7 +86,7 @@ uint32_t osThreadFlagsClear(uint32_t flags)
  */
 uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 {
-	struct cv2_thread *tid;
+	struct cmsis_rtos_thread_cb *tid;
 	int retval, key;
 	uint32_t sig;
 	uint32_t time_delta_ms, timeout_ms = k_ticks_to_ms_floor64(timeout);
@@ -99,7 +100,7 @@ uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 		return osFlagsErrorParameter;
 	}
 
-	tid = (struct cv2_thread *)osThreadGetId();
+	tid = (struct cmsis_rtos_thread_cb *)osThreadGetId();
 	if (tid == NULL) {
 		return osFlagsErrorUnknown;
 	}
@@ -108,6 +109,24 @@ uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 
 		time_stamp_start = (uint64_t)k_cycle_get_32();
 
+		sig = tid->signal_results & flags;
+
+		if (options & osFlagsWaitAll) {
+			/* Check if all events we are waiting on have
+			 * been signalled
+			 */
+			if (sig == flags) {
+				break;
+			}
+		} else {
+			/* Check if any events we are waiting on have
+			 * been signalled
+			 */
+			if (sig != 0) {
+				break;
+			}
+		}
+
 		switch (timeout) {
 		case 0:
 			retval = k_poll(&tid->poll_event, 1, K_NO_WAIT);
@@ -116,8 +135,7 @@ uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 			retval = k_poll(&tid->poll_event, 1, K_FOREVER);
 			break;
 		default:
-			retval = k_poll(&tid->poll_event, 1,
-					K_MSEC(timeout_ms));
+			retval = k_poll(&tid->poll_event, 1, K_MSEC(timeout_ms));
 			break;
 		}
 
@@ -132,49 +150,33 @@ uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 
 		__ASSERT(tid->poll_event.state == K_POLL_STATE_SIGNALED,
 			 "event state not signalled!");
-		__ASSERT(tid->poll_event.signal->signaled == 1U,
-			 "event signaled is not 1");
+		__ASSERT(tid->poll_event.signal->signaled == 1U, "event signaled is not 1");
 
 		/* Reset the states to facilitate the next trigger */
 		tid->poll_event.signal->signaled = 0U;
 		tid->poll_event.state = K_POLL_STATE_NOT_READY;
 
-		if (options & osFlagsWaitAll) {
-			/* Check if all events we are waiting on have
-			 * been signalled
-			 */
-			if ((tid->signal_results & flags) == flags) {
-				break;
-			}
+		/* If we need to wait on more signals, we need to
+		 * adjust the timeout value accordingly based on
+		 * the time that has already elapsed.
+		 */
+		hwclk_cycles_delta = (uint64_t)k_cycle_get_32() - time_stamp_start;
 
-			/* If we need to wait on more signals, we need to
-			 * adjust the timeout value accordingly based on
-			 * the time that has already elapsed.
-			 */
-			hwclk_cycles_delta =
-				(uint64_t)k_cycle_get_32() - time_stamp_start;
-
-			time_delta_ns =
-				(uint32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
+		time_delta_ns = (uint32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
 
-			time_delta_ms = (uint32_t)time_delta_ns / NSEC_PER_MSEC;
+		time_delta_ms = (uint32_t)time_delta_ns / NSEC_PER_MSEC;
 
-			if (timeout_ms > time_delta_ms) {
-				timeout_ms -= time_delta_ms;
-			} else {
-				timeout_ms = 0U;
-			}
+		if (timeout_ms > time_delta_ms) {
+			timeout_ms -= time_delta_ms;
 		} else {
-			break;
+			timeout_ms = 0U;
 		}
 	}
 
-	sig = tid->signal_results;
 	if (!(options & osFlagsNoClear)) {
-
 		/* Clear signal flags as the thread is ready now */
 		key = irq_lock();
-		tid->signal_results &= ~(flags);
+		tid->signal_results &= ~(sig);
 		irq_unlock(key);
 	}
 
diff --git a/subsys/portability/cmsis_rtos_v2/timer.c b/subsys/portability/cmsis_rtos_v2/timer.c
index abdb1e7bc6d96..981917d5b28ab 100644
--- a/subsys/portability/cmsis_rtos_v2/timer.c
+++ b/subsys/portability/cmsis_rtos_v2/timer.c
@@ -5,15 +5,15 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/portability/cmsis_types.h>
 #include <string.h>
-#include "wrapper.h"
 
-#define ACTIVE 1
+#define ACTIVE     1
 #define NOT_ACTIVE 0
 
 static void zephyr_timer_wrapper(struct k_timer *timer);
 
-K_MEM_SLAB_DEFINE(cv2_timer_slab, sizeof(struct cv2_timer),
+K_MEM_SLAB_DEFINE(cmsis_rtos_timer_cb_slab, sizeof(struct cmsis_rtos_timer_cb),
 		  CONFIG_CMSIS_V2_TIMER_MAX_COUNT, 4);
 
 static const osTimerAttr_t init_timer_attrs = {
@@ -25,19 +25,19 @@ static const osTimerAttr_t init_timer_attrs = {
 
 static void zephyr_timer_wrapper(struct k_timer *timer)
 {
-	struct cv2_timer *cm_timer;
+	struct cmsis_rtos_timer_cb *cm_timer;
 
-	cm_timer = CONTAINER_OF(timer, struct cv2_timer, z_timer);
+	cm_timer = CONTAINER_OF(timer, struct cmsis_rtos_timer_cb, z_timer);
 	(cm_timer->callback_function)(cm_timer->arg);
 }
 
 /**
  * @brief Create a Timer
  */
-osTimerId_t osTimerNew(osTimerFunc_t func, osTimerType_t type,
-		       void *argument, const osTimerAttr_t *attr)
+osTimerId_t osTimerNew(osTimerFunc_t func, osTimerType_t type, void *argument,
+		       const osTimerAttr_t *attr)
 {
-	struct cv2_timer *timer;
+	struct cmsis_rtos_timer_cb *timer;
 
 	if (type != osTimerOnce && type != osTimerPeriodic) {
 		return NULL;
@@ -51,11 +51,14 @@ osTimerId_t osTimerNew(osTimerFunc_t func, osTimerType_t type,
 		attr = &init_timer_attrs;
 	}
 
-	if (k_mem_slab_alloc(&cv2_timer_slab, (void **)&timer, K_MSEC(100)) == 0) {
-		(void)memset(timer, 0, sizeof(struct cv2_timer));
-	} else {
+	if (attr->cb_mem != NULL) {
+		__ASSERT(attr->cb_size == sizeof(struct cmsis_rtos_timer_cb), "Invalid cb_size\n");
+		timer = (struct cmsis_rtos_timer_cb *)attr->cb_mem;
+	} else if (k_mem_slab_alloc(&cmsis_rtos_timer_cb_slab, (void **)&timer, K_MSEC(100)) != 0) {
 		return NULL;
 	}
+	(void)memset(timer, 0, sizeof(struct cmsis_rtos_timer_cb));
+	timer->is_cb_dynamic_allocation = attr->cb_mem == NULL;
 
 	timer->callback_function = func;
 	timer->arg = argument;
@@ -64,12 +67,7 @@ osTimerId_t osTimerNew(osTimerFunc_t func, osTimerType_t type,
 
 	k_timer_init(&timer->z_timer, zephyr_timer_wrapper, NULL);
 
-	if (attr->name == NULL) {
-		strncpy(timer->name, init_timer_attrs.name,
-			sizeof(timer->name) - 1);
-	} else {
-		strncpy(timer->name, attr->name, sizeof(timer->name) - 1);
-	}
+	timer->name = (attr->name == NULL) ? init_timer_attrs.name : attr->name;
 
 	return (osTimerId_t)timer;
 }
@@ -79,7 +77,7 @@ osTimerId_t osTimerNew(osTimerFunc_t func, osTimerType_t type,
  */
 osStatus_t osTimerStart(osTimerId_t timer_id, uint32_t ticks)
 {
-	struct cv2_timer *timer = (struct cv2_timer *)timer_id;
+	struct cmsis_rtos_timer_cb *timer = (struct cmsis_rtos_timer_cb *)timer_id;
 
 	if (timer == NULL) {
 		return osErrorParameter;
@@ -92,8 +90,7 @@ osStatus_t osTimerStart(osTimerId_t timer_id, uint32_t ticks)
 	if (timer->type == osTimerOnce) {
 		k_timer_start(&timer->z_timer, K_TICKS(ticks), K_NO_WAIT);
 	} else if (timer->type == osTimerPeriodic) {
-		k_timer_start(&timer->z_timer,
-			      K_TICKS(ticks), K_TICKS(ticks));
+		k_timer_start(&timer->z_timer, K_TICKS(ticks), K_TICKS(ticks));
 	}
 
 	timer->status = ACTIVE;
@@ -105,7 +102,7 @@ osStatus_t osTimerStart(osTimerId_t timer_id, uint32_t ticks)
  */
 osStatus_t osTimerStop(osTimerId_t timer_id)
 {
-	struct cv2_timer *timer = (struct cv2_timer *)timer_id;
+	struct cmsis_rtos_timer_cb *timer = (struct cmsis_rtos_timer_cb *)timer_id;
 
 	if (timer == NULL) {
 		return osErrorParameter;
@@ -129,7 +126,7 @@ osStatus_t osTimerStop(osTimerId_t timer_id)
  */
 osStatus_t osTimerDelete(osTimerId_t timer_id)
 {
-	struct cv2_timer *timer = (struct cv2_timer *) timer_id;
+	struct cmsis_rtos_timer_cb *timer = (struct cmsis_rtos_timer_cb *)timer_id;
 
 	if (timer == NULL) {
 		return osErrorParameter;
@@ -144,21 +141,23 @@ osStatus_t osTimerDelete(osTimerId_t timer_id)
 		timer->status = NOT_ACTIVE;
 	}
 
-	k_mem_slab_free(&cv2_timer_slab, (void *)timer);
+	if (timer->is_cb_dynamic_allocation) {
+		k_mem_slab_free(&cmsis_rtos_timer_cb_slab, (void *)timer);
+	}
 	return osOK;
 }
 
 /**
  * @brief Get name of a timer.
+ * This function may be called from Interrupt Service Routines.
  */
 const char *osTimerGetName(osTimerId_t timer_id)
 {
-	struct cv2_timer *timer = (struct cv2_timer *)timer_id;
+	struct cmsis_rtos_timer_cb *timer = (struct cmsis_rtos_timer_cb *)timer_id;
 
-	if (k_is_in_isr() || (timer == NULL)) {
+	if (timer == NULL) {
 		return NULL;
 	}
-
 	return timer->name;
 }
 
@@ -167,7 +166,7 @@ const char *osTimerGetName(osTimerId_t timer_id)
  */
 uint32_t osTimerIsRunning(osTimerId_t timer_id)
 {
-	struct cv2_timer *timer = (struct cv2_timer *)timer_id;
+	struct cmsis_rtos_timer_cb *timer = (struct cmsis_rtos_timer_cb *)timer_id;
 
 	if (k_is_in_isr() || (timer == NULL)) {
 		return 0;
diff --git a/subsys/portability/cmsis_rtos_v2/wrapper.h b/subsys/portability/cmsis_rtos_v2/wrapper.h
index 41e9e42f2431f..0d3f6e33722fa 100644
--- a/subsys/portability/cmsis_rtos_v2/wrapper.h
+++ b/subsys/portability/cmsis_rtos_v2/wrapper.h
@@ -8,68 +8,16 @@
 #define __WRAPPER_H__
 
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
+#include <zephyr/portability/cmsis_os2.h>
 
 #ifndef TRUE
-#define TRUE    1
+#define TRUE 1
 #endif
 #ifndef FALSE
-#define FALSE   0
+#define FALSE 0
 #endif
 
-struct cv2_thread {
-	sys_dnode_t node;
-	struct k_thread z_thread;
-	struct k_poll_signal poll_signal;
-	struct k_poll_event poll_event;
-	uint32_t signal_results;
-	char name[16];
-	uint32_t attr_bits;
-	struct k_sem join_guard;
-	char has_joined;
-};
-
-struct cv2_timer {
-	struct k_timer z_timer;
-	osTimerType_t type;
-	uint32_t status;
-	char name[16];
-	void (*callback_function)(void *argument);
-	void *arg;
-};
-
-struct cv2_mutex {
-	struct k_mutex z_mutex;
-	char name[16];
-	uint32_t state;
-};
-
-struct cv2_sem {
-	struct k_sem z_semaphore;
-	char name[16];
-};
-
-struct cv2_mslab {
-	struct k_mem_slab z_mslab;
-	void *pool;
-	char is_dynamic_allocation;
-	char name[16];
-};
-
-struct cv2_msgq {
-	struct k_msgq z_msgq;
-	void *pool;
-	char is_dynamic_allocation;
-	char name[16];
-};
-
-struct cv2_event_flags {
-	struct k_poll_signal poll_signal;
-	struct k_poll_event poll_event;
-	uint32_t signal_results;
-	char name[16];
-};
-
 extern osThreadId_t get_cmsis_thread_id(k_tid_t tid);
 extern void *is_cmsis_rtos_v2_thread(void *thread_id);
 
diff --git a/subsys/random/random_ctr_drbg.c b/subsys/random/random_ctr_drbg.c
index 697c29da58b88..25f563e304048 100644
--- a/subsys/random/random_ctr_drbg.c
+++ b/subsys/random/random_ctr_drbg.c
@@ -24,7 +24,7 @@
 static const struct device *entropy_dev;
 static const unsigned char drbg_seed[] = CONFIG_CS_CTR_DRBG_PERSONALIZATION;
 static bool ctr_initialised;
-static struct k_mutex ctr_lock;
+static K_MUTEX_DEFINE(ctr_lock);
 
 static mbedtls_ctr_drbg_context ctr_ctx;
 
diff --git a/subsys/rtio/Kconfig.workq b/subsys/rtio/Kconfig.workq
index af85220415692..de9106c91eb8b 100644
--- a/subsys/rtio/Kconfig.workq
+++ b/subsys/rtio/Kconfig.workq
@@ -4,6 +4,7 @@
 config RTIO_WORKQ
 	bool "RTIO Work-queues service to process Sync operations"
 	select SCHED_DEADLINE
+	select P4WQ_INIT_STAGE_EARLY
 	select RTIO_CONSUME_SEM
 	help
 	  Enable RTIO Work-queues to allow processing synchronous operations
@@ -21,6 +22,7 @@ config RTIO_WORKQ_STACK_SIZE
 
 config RTIO_WORKQ_THREADS_POOL
 	int "Number of threads to use for processing work-items"
+	default 2 if SPI_RTIO || I2C_RTIO || I3C_RTIO
 	default 1
 
 config RTIO_WORKQ_POOL_ITEMS
diff --git a/subsys/rtio/rtio_executor.c b/subsys/rtio/rtio_executor.c
index 49347b34f54dc..e4ad8fe516af9 100644
--- a/subsys/rtio/rtio_executor.c
+++ b/subsys/rtio/rtio_executor.c
@@ -84,6 +84,10 @@ void rtio_executor_submit(struct rtio *r)
 				    "Expected chained or transaction flag, not both");
 #endif
 			node = mpsc_pop(&iodev_sqe->r->sq);
+
+			__ASSERT(node != NULL,
+				    "Expected a valid submission in the queue while in a transaction or chain");
+
 			next = CONTAINER_OF(node, struct rtio_iodev_sqe, q);
 
 			/* If the current submission was cancelled before submit,
diff --git a/subsys/sd/mmc.c b/subsys/sd/mmc.c
index 8ea0b5746d78e..02216d3700a5d 100644
--- a/subsys/sd/mmc.c
+++ b/subsys/sd/mmc.c
@@ -111,16 +111,6 @@ int mmc_card_init(struct sd_card *card)
 		return -EINVAL;
 	}
 
-	/* Probe to see if card is an MMC card */
-	ret = mmc_send_op_cond(card, ocr_arg);
-	if (ret) {
-		return ret;
-	}
-	/* Card is MMC card if no error
-	 * (Only MMC protocol supports CMD1)
-	 */
-	card->type = CARD_MMC;
-
 	/* Set OCR Arguments */
 	if (card->host_props.host_caps.vol_180_support) {
 		ocr_arg |= MMC_OCR_VDD170_195FLAG;
@@ -137,7 +127,7 @@ int mmc_card_init(struct sd_card *card)
 	/* CMD1 */
 	ret = mmc_send_op_cond(card, ocr_arg);
 	if (ret) {
-		LOG_ERR("Failed to query card OCR");
+		LOG_DBG("Failed to query card OCR");
 		return ret;
 	}
 
@@ -221,9 +211,11 @@ static int mmc_send_op_cond(struct sd_card *card, int ocr)
 			/* OCR failed */
 			return ret;
 		}
-		if (ocr == 0) {
-			/* Just probing */
-			return 0;
+		if (retries == 0) {
+			/* Card is MMC card if no error
+			 * (Only MMC protocol supports CMD1)
+			 */
+			card->type = CARD_MMC;
 		}
 		sd_delay(10);
 	}
diff --git a/subsys/sd/sd.c b/subsys/sd/sd.c
index 02190397966f2..d8c28914380f7 100644
--- a/subsys/sd/sd.c
+++ b/subsys/sd/sd.c
@@ -215,7 +215,7 @@ static int sd_command_init(struct sd_card *card)
 	if (!sdmmc_card_init(card)) {
 		return 0;
 	}
-#endif /* CONFIG_SDIO_STACK */
+#endif /* CONFIG_SDMMC_STACK */
 #ifdef CONFIG_MMC_STACK
 	ret = sd_idle(card);
 	if (ret) {
diff --git a/subsys/secure_storage/CMakeLists.txt b/subsys/secure_storage/CMakeLists.txt
index a15c1b24f441d..ef1e59364d159 100644
--- a/subsys/secure_storage/CMakeLists.txt
+++ b/subsys/secure_storage/CMakeLists.txt
@@ -12,10 +12,10 @@ zephyr_include_directories(
 
 # Make the secure_storage headers available to the application only when it's implementing the relevant APIs.
 function(make_available header)
-  if (NOT header STREQUAL "common.h")
+  if(NOT header STREQUAL "common.h")
     make_available(common.h)
   endif()
-  if ((header MATCHES "^its") AND NOT (header STREQUAL "its/common.h"))
+  if((header MATCHES "^its") AND NOT (header STREQUAL "its/common.h"))
     make_available(its/common.h)
   endif()
   configure_file(include/internal/zephyr/secure_storage/${header}
@@ -23,26 +23,30 @@ function(make_available header)
                  COPYONLY)
 endfunction()
 
-if (CONFIG_SECURE_STORAGE_ITS_IMPLEMENTATION_CUSTOM)
+if(CONFIG_SECURE_STORAGE_ITS_IMPLEMENTATION_CUSTOM)
   make_available(its.h)
 endif()
 
-if (CONFIG_SECURE_STORAGE_PS_IMPLEMENTATION_CUSTOM)
+if(CONFIG_SECURE_STORAGE_PS_IMPLEMENTATION_CUSTOM)
   make_available(ps.h)
 endif()
 
-if (CONFIG_SECURE_STORAGE_ITS_TRANSFORM_IMPLEMENTATION_CUSTOM
+if(CONFIG_SECURE_STORAGE_ITS_TRANSFORM_IMPLEMENTATION_CUSTOM
     OR (CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_CUSTOM
         AND CONFIG_SECURE_STORAGE_ITS_TRANSFORM_MODULE))
   make_available(its/transform.h)
 endif()
 
-if (CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_CUSTOM)
+if(CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_CUSTOM)
   make_available(its/store.h)
 endif()
 
-if (CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_SCHEME_CUSTOM
+if(CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_SCHEME_CUSTOM
  OR CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_KEY_PROVIDER_CUSTOM
  OR CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_NONCE_PROVIDER_CUSTOM)
   make_available(its/transform/aead_get.h)
 endif()
+
+if(CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_CUSTOM)
+  make_available(its/store/settings_get.h)
+endif()
diff --git a/subsys/secure_storage/Kconfig b/subsys/secure_storage/Kconfig
index 11e78a7dbd2ce..3fe8eb0f76a79 100644
--- a/subsys/secure_storage/Kconfig
+++ b/subsys/secure_storage/Kconfig
@@ -4,6 +4,7 @@
 menuconfig SECURE_STORAGE
 	bool "Secure storage subsystem"
 	depends on !BUILD_WITH_TFM
+	select MBEDTLS_PSA_CRYPTO_STORAGE_C if MBEDTLS_PSA_CRYPTO_C
 	select EXPERIMENTAL
 	help
 	  The secure storage subsystem provides an implementation of the PSA Secure Storage API
@@ -65,7 +66,6 @@ endif
 
 menuconfig SECURE_STORAGE_ITS_STORE_MODULE
 	bool "ITS store module"
-	imply FLASH # for FLASH_HAS_DRIVER_ENABLED
 	help
 	  The module that handles the storage/retrieval of the ITS data to/from NVM.
 	  Zephyr's ITS implementation calls into it.
diff --git a/subsys/secure_storage/Kconfig.its_store b/subsys/secure_storage/Kconfig.its_store
index 05ebf72ca8f64..ccd15b968a7ca 100644
--- a/subsys/secure_storage/Kconfig.its_store
+++ b/subsys/secure_storage/Kconfig.its_store
@@ -14,7 +14,7 @@ config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS
 	depends on FLASH_HAS_DRIVER_ENABLED \
 	 && $(dt_path_enabled,$(DT_ITS_PARTITION)) \
 	 && $(dt_node_has_compat,$(dt_node_parent,$(DT_ITS_PARTITION)),fixed-partitions)
-	select ZMS
+	depends on ZMS
 	help
 	  This implementation of the ITS store module makes direct use of ZMS for storage.
 	  It needs a `secure_storage_its_partition` devicetree chosen property that points
@@ -31,9 +31,7 @@ config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
 	     && $(dt_node_has_compat,$(dt_node_parent,$(DT_SETTINGS_PARTITIION)),fixed-partitions))\
 	  || ($(dt_path_enabled,$(DT_STORAGE_PARTITION)) \
 	      && $(dt_node_has_compat,$(dt_node_parent,$(DT_STORAGE_PARTITION)),fixed-partitions)))
-	imply FLASH_MAP
-	imply NVS
-	select SETTINGS
+	depends on SETTINGS
 
 config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
 	bool "No ITS store module implementation"
@@ -62,8 +60,25 @@ endif # SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS
 
 if SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
 
+config SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_CUSTOM
+	bool "Custom naming scheme for the stored settings"
+	help
+	  This allows to use custom names for the settings that the implementation uses
+	  instead of the default naming scheme.
+	  When enabling this, implement the secure_storage_its_store_settings_get_name()
+	  function declared in <zephyr/secure_storage/its/store/settings_get.h>
+	  and set CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_MAX_LEN appropriately.
+	  The header file is made available when this Kconfig option is enabled.
+
 config SECURE_STORAGE_ITS_STORE_SETTINGS_PREFIX
 	string "Subtree in which to store the settings, with a trailing slash. Can be empty."
 	default "its/"
+	depends on !SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_CUSTOM
+
+config SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_MAX_LEN
+	int "Maximum setting name length"
+	range 2 64
+	default 22 if !SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_CUSTOM
+	default 0
 
 endif # SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
diff --git a/subsys/secure_storage/include/internal/zephyr/secure_storage/its/store/settings_get.h b/subsys/secure_storage/include/internal/zephyr/secure_storage/its/store/settings_get.h
new file mode 100644
index 0000000000000..028cc35e26fcb
--- /dev/null
+++ b/subsys/secure_storage/include/internal/zephyr/secure_storage/its/store/settings_get.h
@@ -0,0 +1,29 @@
+/* Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef SECURE_STORAGE_ITS_STORE_SETTINGS_GET_H
+#define SECURE_STORAGE_ITS_STORE_SETTINGS_GET_H
+
+/** @file zephyr/secure_storage/its/store/settings_get.h The settings ITS store module API.
+ *
+ * The functions declared in this header allow customization
+ * of the settings implementation of the ITS store module.
+ * They are not meant to be called directly other than by the settings ITS store module.
+ * This header file may and must be included when providing a custom implementation of one
+ * or more of these functions (@kconfig{CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_*_CUSTOM}).
+ */
+#include <zephyr/secure_storage/its/common.h>
+
+enum { SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE
+	= CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_MAX_LEN + 1 };
+
+/** @brief Returns the setting name to use for an ITS entry.
+ *
+ * @param[in]  uid  The UID of the ITS entry for which the setting name is used.
+ * @param[out] name The setting name.
+ */
+void secure_storage_its_store_settings_get_name(
+	secure_storage_its_uid_t uid,
+	char name[static SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE]);
+
+#endif
diff --git a/subsys/secure_storage/include/internal/zephyr/secure_storage/its/transform/aead_get.h b/subsys/secure_storage/include/internal/zephyr/secure_storage/its/transform/aead_get.h
index 071c74c029e62..0172c15b1d513 100644
--- a/subsys/secure_storage/include/internal/zephyr/secure_storage/its/transform/aead_get.h
+++ b/subsys/secure_storage/include/internal/zephyr/secure_storage/its/transform/aead_get.h
@@ -9,7 +9,7 @@
  * The functions declared in this header allow customization
  * of the AEAD implementation of the ITS transform module.
  * They are not meant to be called directly other than by the AEAD ITS transform module.
- * This header may be included when providing a custom implementation of one
+ * This header file may and must be included when providing a custom implementation of one
  * or more of these functions (@kconfig{CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_*_CUSTOM}).
  */
 #include <zephyr/secure_storage/its/common.h>
@@ -24,7 +24,7 @@ void secure_storage_its_transform_aead_get_scheme(psa_key_type_t *key_type, psa_
 
 /** @brief Returns the encryption key to use for an ITS entry's AEAD operations.
  *
- * @param[in]  uid The UID of the ITS entry for whom the returned key is used.
+ * @param[in]  uid The UID of the ITS entry for which the key is used.
  * @param[out] key The encryption key.
  *
  * @return `PSA_SUCCESS` on success, anything else on failure.
diff --git a/subsys/secure_storage/src/its/CMakeLists.txt b/subsys/secure_storage/src/its/CMakeLists.txt
index ddb0a0265cef4..f8d31f1dfed12 100644
--- a/subsys/secure_storage/src/its/CMakeLists.txt
+++ b/subsys/secure_storage/src/its/CMakeLists.txt
@@ -8,8 +8,8 @@ zephyr_library_sources_ifdef(CONFIG_SECURE_STORAGE_ITS_TRANSFORM_IMPLEMENTATION_
   transform/aead.c
   transform/aead_get.c
 )
-if (NOT CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_NO_INSECURE_KEY_WARNING)
-  if (CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_KEY_PROVIDER_DEVICE_ID_HASH)
+if(NOT CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_NO_INSECURE_KEY_WARNING)
+  if(CONFIG_SECURE_STORAGE_ITS_TRANSFORM_AEAD_KEY_PROVIDER_DEVICE_ID_HASH)
     message(WARNING "
       The PSA ITS encryption key provider in use generates keys by hashing the device ID
       retrieved through the HW info API. This is not necessarily secure as the device ID may be
@@ -30,7 +30,7 @@ zephyr_library_sources_ifdef(CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS
 zephyr_library_sources_ifdef(CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
   store/settings.c
 )
-if (CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE)
+if(CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE)
   message(ERROR "
     The secure storage ITS module is enabled but has no implementation.
     (CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE)
diff --git a/subsys/secure_storage/src/its/store/settings.c b/subsys/secure_storage/src/its/store/settings.c
index e9725761201a1..f13ed497ae500 100644
--- a/subsys/secure_storage/src/its/store/settings.c
+++ b/subsys/secure_storage/src/its/store/settings.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/secure_storage/its/store.h>
+#include <zephyr/secure_storage/its/store/settings_get.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/settings/settings.h>
@@ -26,26 +27,37 @@ static int init_settings_subsys(void)
 }
 SYS_INIT(init_settings_subsys, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
 
-enum { NAME_BUF_SIZE = sizeof(CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_PREFIX) - 1
-		       + 2 * (sizeof(secure_storage_its_uid_t) + 1) };
-BUILD_ASSERT(NAME_BUF_SIZE <= SETTINGS_MAX_NAME_LEN + 1);
+BUILD_ASSERT(CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_MAX_LEN <= SETTINGS_MAX_NAME_LEN);
 
-static void make_name(secure_storage_its_uid_t uid, char name[static NAME_BUF_SIZE])
+#ifndef CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_CUSTOM
+
+BUILD_ASSERT(CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_MAX_LEN ==
+	     sizeof(CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_PREFIX) - 1
+	     + 1 + 1 /* caller ID + '/' */
+	     + 2 * sizeof(psa_storage_uid_t) /* hex UID */);
+
+void secure_storage_its_store_settings_get_name(
+	secure_storage_its_uid_t uid,
+	char name[static SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE])
 {
 	int ret;
 
-	ret = snprintf(name, NAME_BUF_SIZE, CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_PREFIX
-		       "%x/%llx", uid.caller_id, (unsigned long long)uid.uid);
-	__ASSERT_NO_MSG(ret > 0 && ret < NAME_BUF_SIZE);
+	ret = snprintf(name, SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE,
+		       CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_PREFIX "%x/%llx",
+		       uid.caller_id, (unsigned long long)uid.uid);
+	__ASSERT_NO_MSG(ret > 0 && ret < SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE);
 }
 
+#endif /* !CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_CUSTOM */
+
 psa_status_t secure_storage_its_store_set(secure_storage_its_uid_t uid,
 					  size_t data_length, const void *data)
 {
 	int ret;
-	char name[NAME_BUF_SIZE];
+	char name[SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE];
+
+	secure_storage_its_store_settings_get_name(uid, name);
 
-	make_name(uid, name);
 	ret = settings_save_one(name, data, data_length);
 	LOG_DBG("%s %s with %zu bytes. (%d)",
 		(ret == 0) ? "Saved" : "Failed to save", name, data_length, ret);
@@ -81,10 +93,10 @@ psa_status_t secure_storage_its_store_get(secure_storage_its_uid_t uid, size_t d
 					  void *data, size_t *data_length)
 {
 	psa_status_t ret;
-	char name[NAME_BUF_SIZE];
+	char name[SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE];
 	struct load_params load_params = {.data_size = data_size, .data = data, .ret = -ENOENT};
 
-	make_name(uid, name);
+	secure_storage_its_store_settings_get_name(uid, name);
 
 	settings_load_subtree_direct(name, load_direct_setting, &load_params);
 	if (load_params.ret > 0) {
@@ -103,9 +115,10 @@ psa_status_t secure_storage_its_store_get(secure_storage_its_uid_t uid, size_t d
 psa_status_t secure_storage_its_store_remove(secure_storage_its_uid_t uid)
 {
 	int ret;
-	char name[NAME_BUF_SIZE];
+	char name[SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE];
+
+	secure_storage_its_store_settings_get_name(uid, name);
 
-	make_name(uid, name);
 	ret = settings_delete(name);
 
 	LOG_DBG("%s %s. (%d)", ret ? "Failed to delete" : "Deleted", name, ret);
diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig
index bc015cde9c7d4..a59b618759e04 100644
--- a/subsys/settings/Kconfig
+++ b/subsys/settings/Kconfig
@@ -32,6 +32,7 @@ config SETTINGS_ENCODE_LEN
 
 choice SETTINGS_BACKEND
 	prompt "Storage back-end"
+	default SETTINGS_ZMS if ZMS
 	default SETTINGS_NVS if NVS
 	default SETTINGS_FCB if FCB
 	default SETTINGS_FILE if FILE_SYSTEM
@@ -39,6 +40,13 @@ choice SETTINGS_BACKEND
 	help
 	  Storage back-end to be used by the settings subsystem.
 
+config SETTINGS_ZMS
+	bool "ZMS (Zephyr Memory Storage)"
+	depends on ZMS
+	select SYS_HASH_FUNC32
+	help
+	  Use ZMS as settings storage backend.
+
 config SETTINGS_FCB
 	bool "FCB"
 	depends on FCB
@@ -132,6 +140,37 @@ config SETTINGS_NVS_SECTOR_COUNT
 	help
 	  Number of sectors used for the NVS settings area
 
+config SETTINGS_ZMS_SECTOR_SIZE_MULT
+	int "Sector size of the ZMS settings area"
+	default 1
+	depends on SETTINGS_ZMS
+	help
+	  The sector size to use for the ZMS settings area as a multiple of
+	  FLASH_ERASE_BLOCK_SIZE.
+
+config SETTINGS_ZMS_CUSTOM_SECTOR_COUNT
+	bool "Customize the sector count of the ZMS settings partition"
+	depends on SETTINGS_ZMS
+	help
+	  The number of sectors used by default is the maximum value that can
+	  fit in the settings storage partition.
+	  Enabling this config allows to customize the number of used sectors.
+
+config SETTINGS_ZMS_SECTOR_COUNT
+	int "Sector count of the ZMS settings area"
+	default 8
+	depends on SETTINGS_ZMS && SETTINGS_ZMS_CUSTOM_SECTOR_COUNT
+	help
+	  Number of sectors used for the ZMS settings area
+
+config SETTINGS_ZMS_MAX_COLLISIONS_BITS
+	int "number of bits reserved to handle collisions between hash numbers"
+	default 4
+	depends on SETTINGS_ZMS
+	help
+	  The maximum number of hash collisions needs to be well sized depending
+	  on the data that is going to be stored in ZMS and its hash values
+
 config SETTINGS_SHELL
 	bool "Settings shell"
 	depends on SHELL
diff --git a/subsys/settings/include/settings/settings_zms.h b/subsys/settings/include/settings/settings_zms.h
new file mode 100644
index 0000000000000..9b9939815c225
--- /dev/null
+++ b/subsys/settings/include/settings/settings_zms.h
@@ -0,0 +1,88 @@
+/* Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __SETTINGS_ZMS_H_
+#define __SETTINGS_ZMS_H_
+
+#include <zephyr/fs/zms.h>
+#include <zephyr/settings/settings.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* In the ZMS backend, each setting is stored in two ZMS entries:
+ *	1. setting's name
+ *	2. setting's value
+ *
+ * The ZMS entry ID for the setting's value is determined implicitly based on
+ * the ID of the ZMS entry for the setting's name, once that is found. The
+ * difference between name and value ID is constant and equal to
+ * ZMS_NAME_ID_OFFSET.
+ *
+ * Setting's name is hashed into 29 bits minus hash_collisions_bits.
+ * The 2 MSB_bits have always the same value 10, the LL_bit for the name's hash is 0
+ * and the hash_collisions_bits is configurable through CONFIG_SETTINGS_ZMS_MAX_COLLISIONS_BITS.
+ * The resulted 32 bits is the ZMS_ID of the Setting's name.
+ * If we detect a collision between ZMS_IDs we increment the value within hash_collision_bits
+ * until we find a free ZMS_ID.
+ * Separately, we store a linked list using the Setting's name ZMS_ID but setting the lsb to 1.
+ *
+ * The linked list is used to maintain a relation between all ZMS_IDs. This is necessary to load
+ * all settings at initialization.
+ * The linked list contains at least a header followed by multiple linked list elements that
+ * we can refer to as LL_x (where x is the order of that element in that list).
+ * This is a representation of the Linked List that is stored in the storage.
+ * LL_header <--> LL_0 <--> LL_1 <--> LL_2.
+ * The "next_hash" pointer of each LL element refers to the next element in the linked list.
+ * The "previous_hash" pointer is referring the previous element in the linked list.
+ *
+ * The bit representation of the 32 bits ZMS_ID is the following:
+ * --------------------------------------------------------------
+ * | MSB_bits | hash (truncated) | hash_collision_bits | LL_bit |
+ * --------------------------------------------------------------
+ * Where:
+ * MSB_bits (2 bits width) : = 10 for Name IDs
+ *			     = 11 for Data IDs
+ * hash (29 bits - hash_collision_bits) : truncated hash obtained from sys_hash32
+ * hash_collision_bits (configurable width) : used to handle hash collisions
+ * LL_bit : = 0 when this is a name's ZMS_ID
+ *	    = 1 when this is the linked list ZMS_ID corresponding to the name
+ *
+ * if a settings element is deleted it won't be found.
+ */
+
+#define ZMS_LL_HEAD_HASH_ID 0x80000000
+#define ZMS_DATA_ID_OFFSET  0x40000000
+#define ZMS_HASH_MASK       GENMASK(29, CONFIG_SETTINGS_ZMS_MAX_COLLISIONS_BITS + 1)
+#define ZMS_COLLISIONS_MASK GENMASK(CONFIG_SETTINGS_ZMS_MAX_COLLISIONS_BITS, 1)
+#define ZMS_HASH_TOTAL_MASK GENMASK(29, 1)
+#define ZMS_MAX_COLLISIONS  (BIT(CONFIG_SETTINGS_ZMS_MAX_COLLISIONS_BITS) - 1)
+
+/* some useful macros */
+#define ZMS_NAME_ID_FROM_LL_NODE(x) (x & ~BIT(0))
+#define ZMS_UPDATE_COLLISION_NUM(x, y)                                                             \
+	((x & ~ZMS_COLLISIONS_MASK) | ((y << 1) & ZMS_COLLISIONS_MASK))
+#define ZMS_COLLISION_NUM(x) ((x & ZMS_COLLISIONS_MASK) >> 1)
+
+struct settings_zms {
+	struct settings_store cf_store;
+	struct zms_fs cf_zms;
+	const struct device *flash_dev;
+	uint32_t last_hash_id;
+	uint32_t second_to_last_hash_id;
+	uint8_t hash_collision_num;
+};
+
+struct settings_hash_linked_list {
+	uint32_t previous_hash;
+	uint32_t next_hash;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SETTINGS_ZMS_H_ */
diff --git a/subsys/settings/src/CMakeLists.txt b/subsys/settings/src/CMakeLists.txt
index d4ec6e761426f..4aa797fbb3503 100644
--- a/subsys/settings/src/CMakeLists.txt
+++ b/subsys/settings/src/CMakeLists.txt
@@ -13,3 +13,4 @@ zephyr_sources_ifdef(CONFIG_SETTINGS_FCB settings_fcb.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NVS settings_nvs.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_NONE settings_none.c)
 zephyr_sources_ifdef(CONFIG_SETTINGS_SHELL settings_shell.c)
+zephyr_sources_ifdef(CONFIG_SETTINGS_ZMS settings_zms.c)
diff --git a/subsys/settings/src/settings_shell.c b/subsys/settings/src/settings_shell.c
index bef6b23c2b596..18bd9efb160ad 100644
--- a/subsys/settings/src/settings_shell.c
+++ b/subsys/settings/src/settings_shell.c
@@ -9,6 +9,7 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/toolchain.h>
 
+#include <ctype.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -51,6 +52,7 @@ static int cmd_list(const struct shell *shell_ptr, size_t argc, char *argv[])
 
 	if (err) {
 		shell_error(shell_ptr, "Failed to load settings: %d", err);
+		err = -ENOEXEC;
 	}
 
 	return err;
@@ -74,6 +76,7 @@ static int settings_read_callback(const char *key,
 				  void            *param)
 {
 	uint8_t buffer[SETTINGS_MAX_VAL_LEN];
+	ssize_t i;
 	ssize_t num_read_bytes = MIN(len, SETTINGS_MAX_VAL_LEN);
 	struct settings_read_callback_params *params = param;
 
@@ -100,11 +103,13 @@ static int settings_read_callback(const char *key,
 		shell_hexdump(params->shell_ptr, buffer, num_read_bytes);
 		break;
 	case SETTINGS_VALUE_STRING:
-		if (buffer[num_read_bytes - 1] != '\0') {
-			shell_error(params->shell_ptr, "Value is not a string");
-			return 0;
+		for (i = 0; i < num_read_bytes; i++) {
+			if (!isprint(buffer[i])) {
+				shell_error(params->shell_ptr, "Value is not a string");
+				return 0;
+			}
 		}
-		shell_print(params->shell_ptr, "%s", buffer);
+		shell_print(params->shell_ptr, "%.*s", (int)num_read_bytes, buffer);
 		break;
 	}
 
@@ -138,7 +143,7 @@ static int cmd_read(const struct shell *shell_ptr, size_t argc, char *argv[])
 		err = settings_parse_type(argv[1], &value_type);
 		if (err) {
 			shell_error(shell_ptr, "Invalid type: %s", argv[1]);
-			return err;
+			return -EINVAL;
 		}
 	}
 
@@ -152,9 +157,10 @@ static int cmd_read(const struct shell *shell_ptr, size_t argc, char *argv[])
 
 	if (err) {
 		shell_error(shell_ptr, "Failed to load setting: %d", err);
+		err = -ENOEXEC;
 	} else if (!params.value_found) {
-		err = -ENOENT;
 		shell_error(shell_ptr, "Setting not found");
+		err = -ENOEXEC;
 	}
 
 	return err;
@@ -164,42 +170,39 @@ static int cmd_write(const struct shell *shell_ptr, size_t argc, char *argv[])
 {
 	int err;
 	uint8_t buffer[CONFIG_SHELL_CMD_BUFF_SIZE / 2];
-	size_t buffer_len = 0;
+	const void *value;
+	size_t value_len = 0;
 	enum settings_value_types value_type = SETTINGS_VALUE_HEX;
 
 	if (argc > 3) {
 		err = settings_parse_type(argv[1], &value_type);
 		if (err) {
 			shell_error(shell_ptr, "Invalid type: %s", argv[1]);
-			return err;
+			return -EINVAL;
 		}
 	}
 
 	switch (value_type) {
 	case SETTINGS_VALUE_HEX:
-		buffer_len = hex2bin(argv[argc - 1], strlen(argv[argc - 1]),
-			buffer, sizeof(buffer));
+		value = buffer;
+		value_len = hex2bin(argv[argc - 1], strlen(argv[argc - 1]), buffer, sizeof(buffer));
 		break;
 	case SETTINGS_VALUE_STRING:
-		buffer_len = strlen(argv[argc - 1]) + 1;
-		if (buffer_len > sizeof(buffer)) {
-			shell_error(shell_ptr, "%s is bigger than shell's buffer", argv[argc - 1]);
-			return -EINVAL;
-		}
-
-		memcpy(buffer, argv[argc - 1], buffer_len);
+		value = argv[argc - 1];
+		value_len = strlen(argv[argc - 1]);
 		break;
 	}
 
-	if (buffer_len == 0) {
+	if (value_len == 0) {
 		shell_error(shell_ptr, "Failed to parse value");
 		return -EINVAL;
 	}
 
-	err = settings_save_one(argv[argc - 2], buffer, buffer_len);
+	err = settings_save_one(argv[argc - 2], value, value_len);
 
 	if (err) {
 		shell_error(shell_ptr, "Failed to write setting: %d", err);
+		err = -ENOEXEC;
 	}
 
 	return err;
@@ -213,6 +216,7 @@ static int cmd_delete(const struct shell *shell_ptr, size_t argc, char *argv[])
 
 	if (err) {
 		shell_error(shell_ptr, "Failed to delete setting: %d", err);
+		err = -ENOEXEC;
 	}
 
 	return err;
@@ -237,13 +241,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(settings_cmds,
 		"Delete a specific setting\n"
 		"Usage: settings delete <name>",
 		cmd_delete, 2, 0),
-	SHELL_SUBCMD_SET_END);
-
-static int cmd_settings(const struct shell *shell_ptr, size_t argc, char **argv)
-{
-	shell_error(shell_ptr, "%s unknown parameter: %s", argv[0], argv[1]);
-	return -EINVAL;
-}
+	SHELL_SUBCMD_SET_END /* Array terminated. */
+);
 
-SHELL_CMD_ARG_REGISTER(settings, &settings_cmds, "Settings shell commands",
-		       cmd_settings, 2, 0);
+SHELL_CMD_REGISTER(settings, &settings_cmds, "Settings commands", NULL);
diff --git a/subsys/settings/src/settings_zms.c b/subsys/settings/src/settings_zms.c
new file mode 100644
index 0000000000000..9d588bc588d91
--- /dev/null
+++ b/subsys/settings/src/settings_zms.c
@@ -0,0 +1,476 @@
+/* Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <string.h>
+
+#include "settings/settings_zms.h"
+#include "settings_priv.h"
+
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/hash_function.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
+
+#if DT_HAS_CHOSEN(zephyr_settings_partition)
+#define SETTINGS_PARTITION DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_settings_partition))
+#else
+#define SETTINGS_PARTITION FIXED_PARTITION_ID(storage_partition)
+#endif
+
+struct settings_zms_read_fn_arg {
+	struct zms_fs *fs;
+	uint32_t id;
+};
+
+static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg);
+static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
+			     size_t val_len);
+static void *settings_zms_storage_get(struct settings_store *cs);
+static int settings_zms_get_last_hash_ids(struct settings_zms *cf);
+
+static struct settings_store_itf settings_zms_itf = {.csi_load = settings_zms_load,
+						     .csi_save = settings_zms_save,
+						     .csi_storage_get = settings_zms_storage_get};
+
+static ssize_t settings_zms_read_fn(void *back_end, void *data, size_t len)
+{
+	struct settings_zms_read_fn_arg *rd_fn_arg;
+
+	rd_fn_arg = (struct settings_zms_read_fn_arg *)back_end;
+
+	return zms_read(rd_fn_arg->fs, rd_fn_arg->id, data, len);
+}
+
+static int settings_zms_src(struct settings_zms *cf)
+{
+	cf->cf_store.cs_itf = &settings_zms_itf;
+	settings_src_register(&cf->cf_store);
+
+	return 0;
+}
+
+static int settings_zms_dst(struct settings_zms *cf)
+{
+	cf->cf_store.cs_itf = &settings_zms_itf;
+	settings_dst_register(&cf->cf_store);
+
+	return 0;
+}
+
+static int settings_zms_unlink_ll_node(struct settings_zms *cf, uint32_t name_hash)
+{
+	int rc = 0;
+	struct settings_hash_linked_list settings_element;
+	struct settings_hash_linked_list settings_update_element;
+
+	/* let's update the linked list */
+	rc = zms_read(&cf->cf_zms, name_hash | 1, &settings_element,
+		      sizeof(struct settings_hash_linked_list));
+	if (rc < 0) {
+		return rc;
+	}
+	/* update the next element */
+	if (settings_element.next_hash) {
+		rc = zms_read(&cf->cf_zms, settings_element.next_hash, &settings_update_element,
+			      sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+		settings_update_element.previous_hash = settings_element.previous_hash;
+		rc = zms_write(&cf->cf_zms, settings_element.next_hash, &settings_update_element,
+			       sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+		if (!settings_update_element.next_hash) {
+			/* update second_to_last_hash_id */
+			cf->second_to_last_hash_id = settings_element.previous_hash;
+		}
+	} else {
+		/* we are deleting the last element of the linked list
+		 * let's update the last_hash_id.
+		 */
+		cf->last_hash_id = settings_element.previous_hash;
+	}
+	/* update the previous element */
+	if (settings_element.previous_hash) {
+		rc = zms_read(&cf->cf_zms, settings_element.previous_hash, &settings_update_element,
+			      sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+		if (!settings_element.next_hash) {
+			/* we are deleting the last element of the linked list,
+			 * let's update the second_to_last_hash_id
+			 */
+			cf->second_to_last_hash_id = settings_update_element.previous_hash;
+		}
+		settings_update_element.next_hash = settings_element.next_hash;
+		rc = zms_write(&cf->cf_zms, settings_element.previous_hash,
+			       &settings_update_element, sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	return rc;
+}
+
+static int settings_zms_delete(struct settings_zms *cf, uint32_t name_hash)
+{
+	int rc = 0;
+
+	rc = zms_delete(&cf->cf_zms, name_hash);
+	if (rc >= 0) {
+		rc = zms_delete(&cf->cf_zms, name_hash + ZMS_DATA_ID_OFFSET);
+	}
+	if (rc < 0) {
+		return rc;
+	}
+
+	rc = settings_zms_unlink_ll_node(cf, name_hash);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* Now delete the current linked list element */
+	rc = zms_delete(&cf->cf_zms, name_hash | 1);
+	if (rc < 0) {
+		return rc;
+	}
+
+	return rc;
+}
+
+static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg)
+{
+	int ret = 0;
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	struct settings_zms_read_fn_arg read_fn_arg;
+	struct settings_hash_linked_list settings_element;
+	char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	ssize_t rc1;
+	ssize_t rc2;
+	uint32_t ll_hash_id;
+
+	ret = zms_read(&cf->cf_zms, ZMS_LL_HEAD_HASH_ID, &settings_element,
+		       sizeof(struct settings_hash_linked_list));
+	if (ret < 0) {
+		return ret;
+	}
+	ll_hash_id = settings_element.next_hash;
+
+	while (ll_hash_id) {
+
+		/* In the ZMS backend, each setting item is stored in two ZMS
+		 * entries one for the setting's name and one with the
+		 * setting's value.
+		 */
+		rc1 = zms_read(&cf->cf_zms, ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id), &name,
+			       sizeof(name) - 1);
+		/* get the length of data and verify that it exists */
+		rc2 = zms_get_data_length(&cf->cf_zms, ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id) +
+							       ZMS_DATA_ID_OFFSET);
+
+		if ((rc1 <= 0) || (rc2 <= 0)) {
+			/* Settings item is not stored correctly in the ZMS.
+			 * ZMS entry for its name or value is either missing
+			 * or deleted. Clean dirty entries to make space for
+			 * future settings item.
+			 */
+			ret = settings_zms_delete(cf, ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id));
+			if (ret < 0) {
+				return ret;
+			}
+			continue;
+		}
+
+		/* Found a name, this might not include a trailing \0 */
+		name[rc1] = '\0';
+		read_fn_arg.fs = &cf->cf_zms;
+		read_fn_arg.id = ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id) + ZMS_DATA_ID_OFFSET;
+
+		ret = settings_call_set_handler(name, rc2, settings_zms_read_fn, &read_fn_arg,
+						(void *)arg);
+		if (ret) {
+			break;
+		}
+
+		/* update next ll_hash_id */
+		ret = zms_read(&cf->cf_zms, ll_hash_id, &settings_element,
+			       sizeof(struct settings_hash_linked_list));
+		if (ret < 0) {
+			return ret;
+		}
+		ll_hash_id = settings_element.next_hash;
+	}
+
+	return ret;
+}
+
+static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
+			     size_t val_len)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	struct settings_hash_linked_list settings_element;
+	char rdname[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	uint32_t name_hash;
+	uint32_t collision_num = 0;
+	bool delete;
+	bool write_name;
+	bool hash_collision;
+	int rc = 0;
+	int first_available_hash_index = -1;
+
+	if (!name) {
+		return -EINVAL;
+	}
+
+	/* Find out if we are doing a delete */
+	delete = ((value == NULL) || (val_len == 0));
+
+	name_hash = sys_hash32(name, strlen(name)) & ZMS_HASH_MASK;
+	/* MSB is always 1 */
+	name_hash |= BIT(31);
+
+	/* Let's find out if there are hash collisions in the storage */
+	write_name = true;
+	hash_collision = true;
+
+	for (int i = 0; i <= cf->hash_collision_num; i++) {
+		rc = zms_read(&cf->cf_zms, name_hash + i * LSB_GET(ZMS_COLLISIONS_MASK), &rdname,
+			      sizeof(rdname));
+		if (rc == -ENOENT) {
+			if (first_available_hash_index < 0) {
+				first_available_hash_index = i;
+			}
+			continue;
+		} else if (rc < 0) {
+			/* error while reading */
+			return rc;
+		}
+		/* Settings entry exist, let's verify if this is the same
+		 * name
+		 */
+		rdname[rc] = '\0';
+		if (!strcmp(name, rdname)) {
+			/* Hash exist and the names are equal, we should
+			 * not write the names again.
+			 */
+			write_name = false;
+			name_hash += i * LSB_GET(ZMS_COLLISIONS_MASK);
+			goto no_hash_collision;
+		}
+		/* At this step a Hash collision exists and names are different.
+		 * If we are in the middle of the loop, we should continue checking
+		 * all other possible hash collisions.
+		 * If we reach the end of the loop, either we should select the first
+		 * free hash value otherwise we increment it to the next free value and
+		 * update hash_collision_num
+		 */
+		collision_num++;
+	}
+
+	if (collision_num <= cf->hash_collision_num) {
+		/* At this step there is a free hash found */
+		name_hash = ZMS_UPDATE_COLLISION_NUM(name_hash, first_available_hash_index);
+		goto no_hash_collision;
+	} else if (collision_num > cf->hash_collision_num) {
+		/* We must create a new hash based on incremented collision_num */
+		if (collision_num > ZMS_MAX_COLLISIONS) {
+			/* At this step there is no more space to store hash values */
+			LOG_ERR("Maximum hash collisions reached");
+			return -ENOSPC;
+		}
+		cf->hash_collision_num = collision_num;
+		name_hash = ZMS_UPDATE_COLLISION_NUM(name_hash, collision_num);
+	}
+
+no_hash_collision:
+	if (delete) {
+		if (write_name) {
+			/* hash doesn't exist, do not write anything here */
+			return 0;
+		}
+
+		rc = settings_zms_delete(cf, name_hash);
+		return rc;
+	}
+
+	/* write the value */
+	rc = zms_write(&cf->cf_zms, name_hash + ZMS_DATA_ID_OFFSET, value, val_len);
+	if (rc < 0) {
+		return rc;
+	}
+
+	/* write the name if required */
+	if (write_name) {
+		rc = zms_write(&cf->cf_zms, name_hash, name, strlen(name));
+		if (rc < 0) {
+			return rc;
+		}
+		/* write linked list structure element */
+		settings_element.next_hash = 0;
+		/* Verify first that the linked list last element is not broken.
+		 * Settings subsystem uses ID that starts from ZMS_LL_HEAD_HASH_ID.
+		 */
+		if (cf->last_hash_id < ZMS_LL_HEAD_HASH_ID) {
+			LOG_WRN("Linked list for hashes is broken, Trying to recover");
+			rc = settings_zms_get_last_hash_ids(cf);
+			if (rc < 0) {
+				return rc;
+			}
+		}
+		settings_element.previous_hash = cf->last_hash_id;
+		rc = zms_write(&cf->cf_zms, name_hash | 1, &settings_element,
+			       sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+		/* Now update the previous linked list element */
+		settings_element.next_hash = name_hash | 1;
+		settings_element.previous_hash = cf->second_to_last_hash_id;
+		rc = zms_write(&cf->cf_zms, cf->last_hash_id, &settings_element,
+			       sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+		cf->second_to_last_hash_id = cf->last_hash_id;
+		cf->last_hash_id = name_hash | 1;
+	}
+
+	return 0;
+}
+
+static int settings_zms_get_last_hash_ids(struct settings_zms *cf)
+{
+	struct settings_hash_linked_list settings_element;
+	uint32_t ll_last_hash_id = ZMS_LL_HEAD_HASH_ID;
+	int rc = 0;
+
+	cf->hash_collision_num = 0;
+	do {
+		rc = zms_read(&cf->cf_zms, ll_last_hash_id, &settings_element,
+			      sizeof(settings_element));
+		if (rc == -ENOENT) {
+			/* header doesn't exist or linked list broken, reinitialize the header */
+			const struct settings_hash_linked_list settings_element = {
+				.previous_hash = 0, .next_hash = 0};
+			rc = zms_write(&cf->cf_zms, ZMS_LL_HEAD_HASH_ID, &settings_element,
+				       sizeof(struct settings_hash_linked_list));
+			if (rc < 0) {
+				return rc;
+			}
+			cf->last_hash_id = ZMS_LL_HEAD_HASH_ID;
+			cf->second_to_last_hash_id = 0;
+			return 0;
+		} else if (rc < 0) {
+			return rc;
+		}
+
+		/* increment hash collision number if necessary */
+		if (ZMS_COLLISION_NUM(ll_last_hash_id) > cf->hash_collision_num) {
+			cf->hash_collision_num = ZMS_COLLISION_NUM(ll_last_hash_id);
+		}
+		cf->last_hash_id = ll_last_hash_id;
+		cf->second_to_last_hash_id = settings_element.previous_hash;
+		ll_last_hash_id = settings_element.next_hash;
+	} while (settings_element.next_hash);
+
+	return 0;
+}
+
+/* Initialize the zms backend. */
+static int settings_zms_backend_init(struct settings_zms *cf)
+{
+	int rc;
+
+	cf->cf_zms.flash_device = cf->flash_dev;
+	if (cf->cf_zms.flash_device == NULL) {
+		return -ENODEV;
+	}
+
+	rc = zms_mount(&cf->cf_zms);
+	if (rc) {
+		return rc;
+	}
+
+	cf->hash_collision_num = 0;
+
+	rc = settings_zms_get_last_hash_ids(cf);
+
+	LOG_DBG("ZMS backend initialized");
+	return rc;
+}
+
+int settings_backend_init(void)
+{
+	static struct settings_zms default_settings_zms;
+	int rc;
+	uint32_t cnt = 0;
+	size_t zms_sector_size;
+	const struct flash_area *fa;
+	struct flash_sector hw_flash_sector;
+	uint32_t sector_cnt = 1;
+
+	rc = flash_area_open(SETTINGS_PARTITION, &fa);
+	if (rc) {
+		return rc;
+	}
+
+	rc = flash_area_get_sectors(SETTINGS_PARTITION, &sector_cnt, &hw_flash_sector);
+	if (rc != 0 && rc != -ENOMEM) {
+		return rc;
+	}
+
+	zms_sector_size = CONFIG_SETTINGS_ZMS_SECTOR_SIZE_MULT * hw_flash_sector.fs_size;
+
+	if (zms_sector_size > UINT32_MAX) {
+		return -EDOM;
+	}
+
+#if defined(CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT)
+	size_t zms_size = 0;
+
+	while (cnt < CONFIG_SETTINGS_ZMS_SECTOR_COUNT) {
+		zms_size += zms_sector_size;
+		if (zms_size > fa->fa_size) {
+			break;
+		}
+		cnt++;
+	}
+#else
+	cnt = fa->fa_size / zms_sector_size;
+#endif
+	/* initialize the zms file system structure using the page_info */
+	default_settings_zms.cf_zms.sector_size = zms_sector_size;
+	default_settings_zms.cf_zms.sector_count = cnt;
+	default_settings_zms.cf_zms.offset = fa->fa_off;
+	default_settings_zms.flash_dev = fa->fa_dev;
+
+	rc = settings_zms_backend_init(&default_settings_zms);
+	if (rc) {
+		return rc;
+	}
+
+	rc = settings_zms_src(&default_settings_zms);
+
+	if (rc) {
+		return rc;
+	}
+
+	rc = settings_zms_dst(&default_settings_zms);
+
+	return rc;
+}
+
+static void *settings_zms_storage_get(struct settings_store *cs)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+
+	return &cf->cf_zms;
+}
diff --git a/subsys/shell/Kconfig b/subsys/shell/Kconfig
index 41b20cad5a513..bfa3a8f49b044 100644
--- a/subsys/shell/Kconfig
+++ b/subsys/shell/Kconfig
@@ -115,6 +115,7 @@ config SHELL_DEFAULT_TERMINAL_HEIGHT
 config SHELL_ARGC_MAX
 	int "Maximum arguments in shell command"
 	range 3 $(UINT8_MAX)
+	default 30 if NET_L2_WIFI_SHELL
 	default 20
 	help
 	  Maximum number of arguments that can build a command.
diff --git a/subsys/shell/backends/shell_mqtt.c b/subsys/shell/backends/shell_mqtt.c
index 9b474436fd4e3..28bd39f4b0de1 100644
--- a/subsys/shell/backends/shell_mqtt.c
+++ b/subsys/shell/backends/shell_mqtt.c
@@ -65,16 +65,6 @@ static inline void sh_mqtt_context_unlock(void)
 	(void)k_mutex_unlock(&sh_mqtt->lock);
 }
 
-static void sh_mqtt_rx_rb_flush(void)
-{
-	uint8_t c;
-	uint32_t size = ring_buf_size_get(&sh_mqtt->rx_rb);
-
-	while (size > 0) {
-		size = ring_buf_get(&sh_mqtt->rx_rb, &c, 1U);
-	}
-}
-
 bool __weak shell_mqtt_get_devid(char *id, int id_max_len)
 {
 	uint8_t hwinfo_id[DEVICE_ID_BIN_MAX_SIZE];
@@ -91,19 +81,19 @@ bool __weak shell_mqtt_get_devid(char *id, int id_max_len)
 	return length > 0;
 }
 
-static void prepare_fds(void)
+static void prepare_fds(struct shell_mqtt *sh)
 {
-	if (sh_mqtt->mqtt_cli.transport.type == MQTT_TRANSPORT_NON_SECURE) {
-		sh_mqtt->fds[0].fd = sh_mqtt->mqtt_cli.transport.tcp.sock;
+	if (sh->mqtt_cli.transport.type == MQTT_TRANSPORT_NON_SECURE) {
+		sh->fds[0].fd = sh->mqtt_cli.transport.tcp.sock;
 	}
 
-	sh_mqtt->fds[0].events = ZSOCK_POLLIN;
-	sh_mqtt->nfds = 1;
+	sh->fds[0].events = ZSOCK_POLLIN;
+	sh->nfds = 1;
 }
 
-static void clear_fds(void)
+static void clear_fds(struct shell_mqtt *sh)
 {
-	sh_mqtt->nfds = 0;
+	sh->nfds = 0;
 }
 
 /*
@@ -113,12 +103,12 @@ static void clear_fds(void)
  * descriptors have been selected. Upon failure, poll() shall return -1 and set errno to indicate
  * the error.
  */
-static int wait(int timeout)
+static int wait(struct shell_mqtt *sh, int timeout)
 {
 	int rc = 0;
 
-	if (sh_mqtt->nfds > 0) {
-		rc = zsock_poll(sh_mqtt->fds, sh_mqtt->nfds, timeout);
+	if (sh->nfds > 0) {
+		rc = zsock_poll(sh->fds, sh->nfds, timeout);
 		if (rc < 0) {
 			LOG_ERR("poll error: %d", errno);
 		}
@@ -128,19 +118,19 @@ static int wait(int timeout)
 }
 
 /* Query IP address for the broker URL */
-static int get_mqtt_broker_addrinfo(void)
+static int get_mqtt_broker_addrinfo(struct shell_mqtt *sh)
 {
 	int rc;
 	struct zsock_addrinfo hints = { .ai_family = AF_INET,
 					.ai_socktype = SOCK_STREAM,
 					.ai_protocol = 0 };
 
-	if (sh_mqtt->haddr != NULL) {
-		zsock_freeaddrinfo(sh_mqtt->haddr);
+	if (sh->haddr != NULL) {
+		zsock_freeaddrinfo(sh->haddr);
 	}
 
 	rc = zsock_getaddrinfo(CONFIG_SHELL_MQTT_SERVER_ADDR,
-			       STRINGIFY(CONFIG_SHELL_MQTT_SERVER_PORT), &hints, &sh_mqtt->haddr);
+			       STRINGIFY(CONFIG_SHELL_MQTT_SERVER_PORT), &hints, &sh->haddr);
 	if (rc == 0) {
 		LOG_INF("DNS%s resolved for %s:%d", "", CONFIG_SHELL_MQTT_SERVER_ADDR,
 			CONFIG_SHELL_MQTT_SERVER_PORT);
@@ -155,7 +145,7 @@ static int get_mqtt_broker_addrinfo(void)
 }
 
 /* Close MQTT connection properly and cleanup socket */
-static void sh_mqtt_close_and_cleanup(void)
+static void sh_mqtt_close_and_cleanup(struct shell_mqtt *sh)
 {
 	/* Initialize to negative value so that the mqtt_abort case can run */
 	int rc = -1;
@@ -164,9 +154,9 @@ static void sh_mqtt_close_and_cleanup(void)
 	 * disconnection packet to the broker, it will invoke
 	 * mqtt_evt_handler:MQTT_EVT_DISCONNECT if success
 	 */
-	if ((sh_mqtt->network_state == SHELL_MQTT_NETWORK_CONNECTED) &&
-	    (sh_mqtt->transport_state == SHELL_MQTT_TRANSPORT_CONNECTED)) {
-		rc = mqtt_disconnect(&sh_mqtt->mqtt_cli);
+	if ((sh->network_state == SHELL_MQTT_NETWORK_CONNECTED) &&
+	    (sh->transport_state == SHELL_MQTT_TRANSPORT_CONNECTED)) {
+		rc = mqtt_disconnect(&sh->mqtt_cli, NULL);
 	}
 
 	/* If network/mqtt disconnected, or mqtt_disconnect failed, do mqtt_abort */
@@ -175,24 +165,24 @@ static void sh_mqtt_close_and_cleanup(void)
 		 * makes sure that the MQTT connection is aborted locally and will
 		 * always invoke mqtt_evt_handler:MQTT_EVT_DISCONNECT
 		 */
-		(void)mqtt_abort(&sh_mqtt->mqtt_cli);
+		(void)mqtt_abort(&sh->mqtt_cli);
 	}
 
 	/* Cleanup socket */
-	clear_fds();
+	clear_fds(sh);
 }
 
-static void broker_init(void)
+static void broker_init(struct shell_mqtt *sh)
 {
-	struct sockaddr_in *broker4 = (struct sockaddr_in *)&sh_mqtt->broker;
+	struct sockaddr_in *broker4 = (struct sockaddr_in *)&sh->broker;
 
 	broker4->sin_family = AF_INET;
 	broker4->sin_port = htons(CONFIG_SHELL_MQTT_SERVER_PORT);
 
-	net_ipaddr_copy(&broker4->sin_addr, &net_sin(sh_mqtt->haddr->ai_addr)->sin_addr);
+	net_ipaddr_copy(&broker4->sin_addr, &net_sin(sh->haddr->ai_addr)->sin_addr);
 }
 
-static void client_init(void)
+static void client_init(struct shell_mqtt *sh)
 {
 	static struct mqtt_utf8 password;
 	static struct mqtt_utf8 username;
@@ -202,36 +192,37 @@ static void client_init(void)
 	username.utf8 = (uint8_t *)MQTT_USERNAME;
 	username.size = strlen(MQTT_USERNAME);
 
-	mqtt_client_init(&sh_mqtt->mqtt_cli);
+	mqtt_client_init(&sh->mqtt_cli);
 
 	/* MQTT client configuration */
-	sh_mqtt->mqtt_cli.broker = &sh_mqtt->broker;
-	sh_mqtt->mqtt_cli.evt_cb = mqtt_evt_handler;
-	sh_mqtt->mqtt_cli.client_id.utf8 = (uint8_t *)sh_mqtt->device_id;
-	sh_mqtt->mqtt_cli.client_id.size = strlen(sh_mqtt->device_id);
-	sh_mqtt->mqtt_cli.password = &password;
-	sh_mqtt->mqtt_cli.user_name = &username;
-	sh_mqtt->mqtt_cli.protocol_version = MQTT_VERSION_3_1_1;
+	sh->mqtt_cli.broker = &sh->broker;
+	sh->mqtt_cli.evt_cb = mqtt_evt_handler;
+	sh->mqtt_cli.client_id.utf8 = (uint8_t *)sh->device_id;
+	sh->mqtt_cli.client_id.size = strlen(sh->device_id);
+	sh->mqtt_cli.password = &password;
+	sh->mqtt_cli.user_name = &username;
+	sh->mqtt_cli.protocol_version = MQTT_VERSION_3_1_1;
 
 	/* MQTT buffers configuration */
-	sh_mqtt->mqtt_cli.rx_buf = sh_mqtt->buf.rx;
-	sh_mqtt->mqtt_cli.rx_buf_size = sizeof(sh_mqtt->buf.rx);
-	sh_mqtt->mqtt_cli.tx_buf = sh_mqtt->buf.tx;
-	sh_mqtt->mqtt_cli.tx_buf_size = sizeof(sh_mqtt->buf.tx);
+	sh->mqtt_cli.rx_buf = sh->buf.rx;
+	sh->mqtt_cli.rx_buf_size = sizeof(sh->buf.rx);
+	sh->mqtt_cli.tx_buf = sh->buf.tx;
+	sh->mqtt_cli.tx_buf_size = sizeof(sh->buf.tx);
 
 	/* MQTT transport configuration */
-	sh_mqtt->mqtt_cli.transport.type = MQTT_TRANSPORT_NON_SECURE;
+	sh->mqtt_cli.transport.type = MQTT_TRANSPORT_NON_SECURE;
 }
 
 /* Work routine to process MQTT packet and keep alive MQTT connection */
 static void sh_mqtt_process_handler(struct k_work *work)
 {
 	ARG_UNUSED(work);
+	struct shell_mqtt *sh = sh_mqtt;
 	int rc;
 	int64_t remaining = LISTEN_TIMEOUT_MS;
 	int64_t start_time = k_uptime_get();
 
-	if (sh_mqtt->network_state != SHELL_MQTT_NETWORK_CONNECTED) {
+	if (sh->network_state != SHELL_MQTT_NETWORK_CONNECTED) {
 		LOG_DBG("%s_work while %s", "process", "network disconnected");
 		return;
 	}
@@ -243,26 +234,26 @@ static void sh_mqtt_process_handler(struct k_work *work)
 		return;
 	}
 
-	if (sh_mqtt->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
+	if (sh->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
 		LOG_DBG("MQTT %s", "not connected");
 		goto process_error;
 	}
 
-	if (sh_mqtt->subscribe_state != SHELL_MQTT_SUBSCRIBED) {
+	if (sh->subscribe_state != SHELL_MQTT_SUBSCRIBED) {
 		LOG_DBG("%s_work while %s", "process", "MQTT not subscribed");
 		goto process_error;
 	}
 
 	LOG_DBG("MQTT %s", "Processing");
 	/* Listen to the port for a duration defined by LISTEN_TIMEOUT_MS */
-	while ((remaining > 0) && (sh_mqtt->network_state == SHELL_MQTT_NETWORK_CONNECTED) &&
-	       (sh_mqtt->transport_state == SHELL_MQTT_TRANSPORT_CONNECTED) &&
-	       (sh_mqtt->subscribe_state == SHELL_MQTT_SUBSCRIBED)) {
+	while ((remaining > 0) && (sh->network_state == SHELL_MQTT_NETWORK_CONNECTED) &&
+	       (sh->transport_state == SHELL_MQTT_TRANSPORT_CONNECTED) &&
+	       (sh->subscribe_state == SHELL_MQTT_SUBSCRIBED)) {
 		LOG_DBG("Listening to socket");
-		rc = wait(remaining);
+		rc = wait(sh, remaining);
 		if (rc > 0) {
 			LOG_DBG("Process socket for MQTT packet");
-			rc = mqtt_input(&sh_mqtt->mqtt_cli);
+			rc = mqtt_input(&sh->mqtt_cli);
 			if (rc != 0) {
 				LOG_ERR("%s error: %d", "processed: mqtt_input", rc);
 				goto process_error;
@@ -272,7 +263,7 @@ static void sh_mqtt_process_handler(struct k_work *work)
 		}
 
 		LOG_DBG("MQTT %s", "Keepalive");
-		rc = mqtt_live(&sh_mqtt->mqtt_cli);
+		rc = mqtt_live(&sh->mqtt_cli);
 		if ((rc != 0) && (rc != -EAGAIN)) {
 			LOG_ERR("%s error: %d", "mqtt_live", rc);
 			goto process_error;
@@ -283,30 +274,32 @@ static void sh_mqtt_process_handler(struct k_work *work)
 
 	/* Reschedule the process work */
 	LOG_DBG("Scheduling %s work", "process");
-	(void)sh_mqtt_work_reschedule(&sh_mqtt->process_dwork, K_SECONDS(2));
+	(void)sh_mqtt_work_reschedule(&sh->process_dwork, K_SECONDS(2));
 	sh_mqtt_context_unlock();
 	return;
 
 process_error:
 	LOG_DBG("%s: close MQTT, cleanup socket & reconnect", "connect");
-	sh_mqtt_close_and_cleanup();
-	(void)sh_mqtt_work_reschedule(&sh_mqtt->connect_dwork, K_SECONDS(1));
+	sh_mqtt_close_and_cleanup(sh);
+	(void)sh_mqtt_work_reschedule(&sh->connect_dwork, K_SECONDS(1));
 	sh_mqtt_context_unlock();
 }
 
 static void sh_mqtt_subscribe_handler(struct k_work *work)
 {
 	ARG_UNUSED(work);
+	struct shell_mqtt *sh = sh_mqtt;
+
 	/* Subscribe config information */
-	struct mqtt_topic subs_topic = { .topic = { .utf8 = sh_mqtt->sub_topic,
-						    .size = strlen(sh_mqtt->sub_topic) },
+	struct mqtt_topic subs_topic = { .topic = { .utf8 = sh->sub_topic,
+						    .size = strlen(sh->sub_topic) },
 					 .qos = MQTT_QOS_1_AT_LEAST_ONCE };
 	const struct mqtt_subscription_list subs_list = { .list = &subs_topic,
 							  .list_count = 1U,
 							  .message_id = 1U };
 	int rc;
 
-	if (sh_mqtt->network_state != SHELL_MQTT_NETWORK_CONNECTED) {
+	if (sh->network_state != SHELL_MQTT_NETWORK_CONNECTED) {
 		LOG_DBG("%s_work while %s", "subscribe", "network disconnected");
 		return;
 	}
@@ -318,19 +311,19 @@ static void sh_mqtt_subscribe_handler(struct k_work *work)
 		return;
 	}
 
-	if (sh_mqtt->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
+	if (sh->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
 		LOG_DBG("%s_work while %s", "subscribe", "transport disconnected");
 		goto subscribe_error;
 	}
 
-	rc = mqtt_subscribe(&sh_mqtt->mqtt_cli, &subs_list);
+	rc = mqtt_subscribe(&sh->mqtt_cli, &subs_list);
 	if (rc == 0) {
 		/* Wait for mqtt's connack */
 		LOG_DBG("Listening to socket");
-		rc = wait(CONNECT_TIMEOUT_MS);
+		rc = wait(sh, CONNECT_TIMEOUT_MS);
 		if (rc > 0) {
 			LOG_DBG("Process socket for MQTT packet");
-			rc = mqtt_input(&sh_mqtt->mqtt_cli);
+			rc = mqtt_input(&sh->mqtt_cli);
 			if (rc != 0) {
 				LOG_ERR("%s error: %d", "subscribe: mqtt_input", rc);
 				goto subscribe_error;
@@ -340,24 +333,24 @@ static void sh_mqtt_subscribe_handler(struct k_work *work)
 		}
 
 		/* No suback, fail */
-		if (sh_mqtt->subscribe_state != SHELL_MQTT_SUBSCRIBED) {
+		if (sh->subscribe_state != SHELL_MQTT_SUBSCRIBED) {
 			goto subscribe_error;
 		}
 
 		LOG_DBG("Scheduling MQTT process work");
-		(void)sh_mqtt_work_reschedule(&sh_mqtt->process_dwork, PROCESS_INTERVAL);
+		(void)sh_mqtt_work_reschedule(&sh->process_dwork, PROCESS_INTERVAL);
 		sh_mqtt_context_unlock();
 
-		LOG_INF("Logs will be published to: %s", sh_mqtt->pub_topic);
-		LOG_INF("Subscribing shell cmds from: %s", sh_mqtt->sub_topic);
+		LOG_INF("Logs will be published to: %s", sh->pub_topic);
+		LOG_INF("Subscribing shell cmds from: %s", sh->sub_topic);
 
 		return;
 	}
 
 subscribe_error:
 	LOG_DBG("%s: close MQTT, cleanup socket & reconnect", "subscribe");
-	sh_mqtt_close_and_cleanup();
-	(void)sh_mqtt_work_reschedule(&sh_mqtt->connect_dwork, K_SECONDS(2));
+	sh_mqtt_close_and_cleanup(sh);
+	(void)sh_mqtt_work_reschedule(&sh->connect_dwork, K_SECONDS(2));
 	sh_mqtt_context_unlock();
 }
 
@@ -365,9 +358,10 @@ static void sh_mqtt_subscribe_handler(struct k_work *work)
 static void sh_mqtt_connect_handler(struct k_work *work)
 {
 	ARG_UNUSED(work);
+	struct shell_mqtt *sh = sh_mqtt;
 	int rc;
 
-	if (sh_mqtt->network_state != SHELL_MQTT_NETWORK_CONNECTED) {
+	if (sh->network_state != SHELL_MQTT_NETWORK_CONNECTED) {
 		LOG_DBG("%s_work while %s", "connect", "network disconnected");
 		return;
 	}
@@ -379,7 +373,7 @@ static void sh_mqtt_connect_handler(struct k_work *work)
 		return;
 	}
 
-	if (sh_mqtt->transport_state == SHELL_MQTT_TRANSPORT_CONNECTED) {
+	if (sh->transport_state == SHELL_MQTT_TRANSPORT_CONNECTED) {
 		__ASSERT(0, "MQTT shouldn't be already connected");
 		LOG_ERR("MQTT shouldn't be already connected");
 		goto connect_error;
@@ -387,20 +381,20 @@ static void sh_mqtt_connect_handler(struct k_work *work)
 
 	/* Resolve the broker URL */
 	LOG_DBG("Resolving DNS");
-	rc = get_mqtt_broker_addrinfo();
+	rc = get_mqtt_broker_addrinfo(sh);
 	if (rc != 0) {
-		(void)sh_mqtt_work_reschedule(&sh_mqtt->connect_dwork, K_SECONDS(1));
+		(void)sh_mqtt_work_reschedule(&sh->connect_dwork, K_SECONDS(1));
 		sh_mqtt_context_unlock();
 		return;
 	}
 
 	LOG_DBG("Initializing MQTT client");
-	broker_init();
-	client_init();
+	broker_init(sh);
+	client_init(sh);
 
 	/* Try to connect to mqtt */
 	LOG_DBG("Connecting to MQTT broker");
-	rc = mqtt_connect(&sh_mqtt->mqtt_cli);
+	rc = mqtt_connect(&sh->mqtt_cli);
 	if (rc != 0) {
 		LOG_ERR("%s error: %d", "mqtt_connect", rc);
 		goto connect_error;
@@ -408,14 +402,14 @@ static void sh_mqtt_connect_handler(struct k_work *work)
 
 	/* Prepare port config */
 	LOG_DBG("Preparing socket");
-	prepare_fds();
+	prepare_fds(sh);
 
 	/* Wait for mqtt's connack */
 	LOG_DBG("Listening to socket");
-	rc = wait(CONNECT_TIMEOUT_MS);
+	rc = wait(sh, CONNECT_TIMEOUT_MS);
 	if (rc > 0) {
 		LOG_DBG("Process socket for MQTT packet");
-		rc = mqtt_input(&sh_mqtt->mqtt_cli);
+		rc = mqtt_input(&sh->mqtt_cli);
 		if (rc != 0) {
 			LOG_ERR("%s error: %d", "connect: mqtt_input", rc);
 			goto connect_error;
@@ -425,37 +419,37 @@ static void sh_mqtt_connect_handler(struct k_work *work)
 	}
 
 	/* No connack, fail */
-	if (sh_mqtt->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
+	if (sh->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
 		goto connect_error;
 	}
 
 	LOG_DBG("Scheduling %s work", "subscribe");
-	(void)sh_mqtt_work_reschedule(&sh_mqtt->subscribe_dwork, K_SECONDS(2));
+	(void)sh_mqtt_work_reschedule(&sh->subscribe_dwork, K_SECONDS(2));
 	sh_mqtt_context_unlock();
 	return;
 
 connect_error:
 	LOG_DBG("%s: close MQTT, cleanup socket & reconnect", "connect");
-	sh_mqtt_close_and_cleanup();
-	(void)sh_mqtt_work_reschedule(&sh_mqtt->connect_dwork, K_SECONDS(2));
+	sh_mqtt_close_and_cleanup(sh);
+	(void)sh_mqtt_work_reschedule(&sh->connect_dwork, K_SECONDS(2));
 	sh_mqtt_context_unlock();
 }
 
-static int sh_mqtt_publish(uint8_t *data, uint32_t len)
+static int sh_mqtt_publish(struct shell_mqtt *sh, uint8_t *data, uint32_t len)
 {
-	sh_mqtt->pub_data.message.payload.data = data;
-	sh_mqtt->pub_data.message.payload.len = len;
-	sh_mqtt->pub_data.message_id++;
+	sh->pub_data.message.payload.data = data;
+	sh->pub_data.message.payload.len = len;
+	sh->pub_data.message_id++;
 
-	return mqtt_publish(&sh_mqtt->mqtt_cli, &sh_mqtt->pub_data);
+	return mqtt_publish(&sh->mqtt_cli, &sh->pub_data);
 }
 
-static int sh_mqtt_publish_tx_buf(bool is_work)
+static int sh_mqtt_publish_tx_buf(struct shell_mqtt *sh, bool is_work)
 {
 	int rc;
 
-	rc = sh_mqtt_publish(&sh_mqtt->tx_buf.buf[0], sh_mqtt->tx_buf.len);
-	memset(&sh_mqtt->tx_buf, 0, sizeof(sh_mqtt->tx_buf));
+	rc = sh_mqtt_publish(sh, &sh->tx_buf.buf[0], sh->tx_buf.len);
+	memset(&sh->tx_buf, 0, sizeof(sh->tx_buf));
 	if (rc != 0) {
 		LOG_ERR("MQTT publish error: %d", rc);
 		return rc;
@@ -472,39 +466,41 @@ static int sh_mqtt_publish_tx_buf(bool is_work)
 static void sh_mqtt_publish_handler(struct k_work *work)
 {
 	ARG_UNUSED(work);
+	struct shell_mqtt *sh = sh_mqtt;
 	int rc;
 
 	(void)sh_mqtt_context_lock(K_FOREVER);
 
-	rc = sh_mqtt_publish_tx_buf(true);
+	rc = sh_mqtt_publish_tx_buf(sh, true);
 	if (rc != 0) {
 		LOG_DBG("%s: close MQTT, cleanup socket & reconnect", "publish");
-		sh_mqtt_close_and_cleanup();
-		(void)sh_mqtt_work_reschedule(&sh_mqtt->connect_dwork, K_SECONDS(2));
+		sh_mqtt_close_and_cleanup(sh);
+		(void)sh_mqtt_work_reschedule(&sh->connect_dwork, K_SECONDS(2));
 	}
 
 	sh_mqtt_context_unlock();
 }
 
-static void cancel_dworks_and_cleanup(void)
+static void cancel_dworks_and_cleanup(struct shell_mqtt *sh)
 {
-	(void)k_work_cancel_delayable(&sh_mqtt->connect_dwork);
-	(void)k_work_cancel_delayable(&sh_mqtt->subscribe_dwork);
-	(void)k_work_cancel_delayable(&sh_mqtt->process_dwork);
-	(void)k_work_cancel_delayable(&sh_mqtt->publish_dwork);
-	sh_mqtt_close_and_cleanup();
+	(void)k_work_cancel_delayable(&sh->connect_dwork);
+	(void)k_work_cancel_delayable(&sh->subscribe_dwork);
+	(void)k_work_cancel_delayable(&sh->process_dwork);
+	(void)k_work_cancel_delayable(&sh->publish_dwork);
+	sh_mqtt_close_and_cleanup(sh);
 }
 
 static void net_disconnect_handler(struct k_work *work)
 {
 	ARG_UNUSED(work);
+	struct shell_mqtt *sh = sh_mqtt;
 
 	LOG_WRN("Network %s", "disconnected");
-	sh_mqtt->network_state = SHELL_MQTT_NETWORK_DISCONNECTED;
+	sh->network_state = SHELL_MQTT_NETWORK_DISCONNECTED;
 
 	/* Stop all possible work */
 	(void)sh_mqtt_context_lock(K_FOREVER);
-	cancel_dworks_and_cleanup();
+	cancel_dworks_and_cleanup(sh);
 	sh_mqtt_context_unlock();
 	/* If the transport was requested, the connect work will be rescheduled
 	 * when internet is connected again
@@ -515,51 +511,55 @@ static void net_disconnect_handler(struct k_work *work)
 static void network_evt_handler(struct net_mgmt_event_callback *cb, uint32_t mgmt_event,
 				struct net_if *iface)
 {
+	struct shell_mqtt *sh = sh_mqtt;
+
 	if ((mgmt_event == NET_EVENT_L4_CONNECTED) &&
-	    (sh_mqtt->network_state == SHELL_MQTT_NETWORK_DISCONNECTED)) {
+	    (sh->network_state == SHELL_MQTT_NETWORK_DISCONNECTED)) {
 		LOG_WRN("Network %s", "connected");
-		sh_mqtt->network_state = SHELL_MQTT_NETWORK_CONNECTED;
-		(void)sh_mqtt_work_reschedule(&sh_mqtt->connect_dwork, K_SECONDS(1));
+		sh->network_state = SHELL_MQTT_NETWORK_CONNECTED;
+		(void)sh_mqtt_work_reschedule(&sh->connect_dwork, K_SECONDS(1));
 	} else if ((mgmt_event == NET_EVENT_L4_DISCONNECTED) &&
-		   (sh_mqtt->network_state == SHELL_MQTT_NETWORK_CONNECTED)) {
-		(void)sh_mqtt_work_submit(&sh_mqtt->net_disconnected_work);
+		   (sh->network_state == SHELL_MQTT_NETWORK_CONNECTED)) {
+		(void)sh_mqtt_work_submit(&sh->net_disconnected_work);
 	}
 }
 
 static void mqtt_evt_handler(struct mqtt_client *const client, const struct mqtt_evt *evt)
 {
+	struct shell_mqtt *sh = sh_mqtt;
+
 	switch (evt->type) {
 	case MQTT_EVT_CONNACK:
 		if (evt->result != 0) {
-			sh_mqtt->transport_state = SHELL_MQTT_TRANSPORT_DISCONNECTED;
+			sh->transport_state = SHELL_MQTT_TRANSPORT_DISCONNECTED;
 			LOG_ERR("MQTT %s %d", "connect failed", evt->result);
 			break;
 		}
 
-		sh_mqtt->transport_state = SHELL_MQTT_TRANSPORT_CONNECTED;
+		sh->transport_state = SHELL_MQTT_TRANSPORT_CONNECTED;
 		LOG_WRN("MQTT %s", "client connected!");
-
 		break;
+
 	case MQTT_EVT_SUBACK:
 		if (evt->result != 0) {
 			LOG_ERR("MQTT subscribe: %s", "error");
-			sh_mqtt->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
+			sh->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
 			break;
 		}
 
 		LOG_WRN("MQTT subscribe: %s", "ok");
-		sh_mqtt->subscribe_state = SHELL_MQTT_SUBSCRIBED;
+		sh->subscribe_state = SHELL_MQTT_SUBSCRIBED;
 		break;
 
 	case MQTT_EVT_UNSUBACK:
 		LOG_DBG("UNSUBACK packet id: %u", evt->param.suback.message_id);
-		sh_mqtt->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
+		sh->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
 		break;
 
 	case MQTT_EVT_DISCONNECT:
 		LOG_WRN("MQTT disconnected: %d", evt->result);
-		sh_mqtt->transport_state = SHELL_MQTT_TRANSPORT_DISCONNECTED;
-		sh_mqtt->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
+		sh->transport_state = SHELL_MQTT_TRANSPORT_DISCONNECTED;
+		sh->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
 		break;
 
 	case MQTT_EVT_PUBLISH: {
@@ -583,25 +583,24 @@ static void mqtt_evt_handler(struct mqtt_client *const client, const struct mqtt
 
 		while (payload_left > 0) {
 			/* Attempt to claim `payload_left` bytes of buffer in rb */
-			size = (size_t)ring_buf_put_claim(&sh_mqtt->rx_rb, &sh_mqtt->rx_rb_ptr,
+			size = (size_t)ring_buf_put_claim(&sh->rx_rb, &sh->rx_rb_ptr,
 							  payload_left);
 			/* Read `size` bytes of payload from mqtt */
-			rc = mqtt_read_publish_payload_blocking(client, sh_mqtt->rx_rb_ptr, size);
+			rc = mqtt_read_publish_payload_blocking(client, sh->rx_rb_ptr, size);
 
 			/* errno value, return */
 			if (rc < 0) {
-				(void)ring_buf_put_finish(&sh_mqtt->rx_rb, 0U);
-				sh_mqtt_rx_rb_flush();
+				ring_buf_reset(&sh->rx_rb);
 				return;
 			}
 
 			size = (size_t)rc;
 			/* Indicate that `size` bytes of payload has been written into rb */
-			(void)ring_buf_put_finish(&sh_mqtt->rx_rb, size);
+			(void)ring_buf_put_finish(&sh->rx_rb, size);
 			/* Update `payload_left` */
 			payload_left -= size;
 			/* Tells the shell that we have new data for it */
-			sh_mqtt->shell_handler(SHELL_TRANSPORT_EVT_RX_RDY, sh_mqtt->shell_context);
+			sh->shell_handler(SHELL_TRANSPORT_EVT_RX_RDY, sh->shell_context);
 			/* Arbitrary sleep for the shell to do its thing */
 			(void)k_msleep(100);
 		}
@@ -609,16 +608,16 @@ static void mqtt_evt_handler(struct mqtt_client *const client, const struct mqtt
 		/* Shell won't execute the cmds without \r\n */
 		while (true) {
 			/* Check if rb's free space is enough to fit in \r\n */
-			size = ring_buf_space_get(&sh_mqtt->rx_rb);
+			size = ring_buf_space_get(&sh->rx_rb);
 			if (size >= sizeof("\r\n")) {
-				(void)ring_buf_put(&sh_mqtt->rx_rb, "\r\n", sizeof("\r\n"));
+				(void)ring_buf_put(&sh->rx_rb, "\r\n", sizeof("\r\n"));
 				break;
 			}
 			/* Arbitrary sleep for the shell to do its thing */
 			(void)k_msleep(100);
 		}
 
-		sh_mqtt->shell_handler(SHELL_TRANSPORT_EVT_RX_RDY, sh_mqtt->shell_context);
+		sh->shell_handler(SHELL_TRANSPORT_EVT_RX_RDY, sh->shell_context);
 		break;
 	}
 
@@ -645,52 +644,53 @@ static int init(const struct shell_transport *transport, const void *config,
 		shell_transport_handler_t evt_handler, void *context)
 {
 	sh_mqtt = (struct shell_mqtt *)transport->ctx;
+	struct shell_mqtt *sh = sh_mqtt;
 
-	(void)memset(sh_mqtt, 0, sizeof(struct shell_mqtt));
+	(void)memset(sh, 0, sizeof(struct shell_mqtt));
 
-	(void)k_mutex_init(&sh_mqtt->lock);
+	(void)k_mutex_init(&sh->lock);
 
-	if (!shell_mqtt_get_devid(sh_mqtt->device_id, DEVICE_ID_HEX_MAX_SIZE)) {
+	if (!shell_mqtt_get_devid(sh->device_id, DEVICE_ID_HEX_MAX_SIZE)) {
 		LOG_ERR("Unable to get device identity, using dummy value");
-		(void)snprintf(sh_mqtt->device_id, sizeof("dummy"), "dummy");
+		(void)snprintf(sh->device_id, sizeof("dummy"), "dummy");
 	}
 
-	LOG_DBG("Client ID is %s", sh_mqtt->device_id);
+	LOG_DBG("Client ID is %s", sh->device_id);
 
-	(void)snprintf(sh_mqtt->pub_topic, SH_MQTT_TOPIC_MAX_SIZE, "%s_tx", sh_mqtt->device_id);
-	(void)snprintf(sh_mqtt->sub_topic, SH_MQTT_TOPIC_MAX_SIZE, "%s_rx", sh_mqtt->device_id);
+	(void)snprintf(sh->pub_topic, SH_MQTT_TOPIC_MAX_SIZE, "%s_tx", sh->device_id);
+	(void)snprintf(sh->sub_topic, SH_MQTT_TOPIC_MAX_SIZE, "%s_rx", sh->device_id);
 
-	ring_buf_init(&sh_mqtt->rx_rb, RX_RB_SIZE, sh_mqtt->rx_rb_buf);
+	ring_buf_init(&sh->rx_rb, RX_RB_SIZE, sh->rx_rb_buf);
 
 	LOG_DBG("Initializing shell MQTT backend");
 
-	sh_mqtt->shell_handler = evt_handler;
-	sh_mqtt->shell_context = context;
+	sh->shell_handler = evt_handler;
+	sh->shell_context = context;
 
-	sh_mqtt->pub_data.message.topic.qos = MQTT_QOS_0_AT_MOST_ONCE;
-	sh_mqtt->pub_data.message.topic.topic.utf8 = (uint8_t *)sh_mqtt->pub_topic;
-	sh_mqtt->pub_data.message.topic.topic.size =
-		strlen(sh_mqtt->pub_data.message.topic.topic.utf8);
-	sh_mqtt->pub_data.dup_flag = 0U;
-	sh_mqtt->pub_data.retain_flag = 0U;
+	sh->pub_data.message.topic.qos = MQTT_QOS_0_AT_MOST_ONCE;
+	sh->pub_data.message.topic.topic.utf8 = (uint8_t *)sh->pub_topic;
+	sh->pub_data.message.topic.topic.size =
+		strlen(sh->pub_data.message.topic.topic.utf8);
+	sh->pub_data.dup_flag = 0U;
+	sh->pub_data.retain_flag = 0U;
 
 	/* Initialize the work queue */
-	k_work_queue_init(&sh_mqtt->workq);
-	k_work_queue_start(&sh_mqtt->workq, sh_mqtt_workq_stack,
+	k_work_queue_init(&sh->workq);
+	k_work_queue_start(&sh->workq, sh_mqtt_workq_stack,
 			   K_KERNEL_STACK_SIZEOF(sh_mqtt_workq_stack), K_PRIO_COOP(7), NULL);
-	(void)k_thread_name_set(&sh_mqtt->workq.thread, "sh_mqtt_workq");
-	k_work_init(&sh_mqtt->net_disconnected_work, net_disconnect_handler);
-	k_work_init_delayable(&sh_mqtt->connect_dwork, sh_mqtt_connect_handler);
-	k_work_init_delayable(&sh_mqtt->subscribe_dwork, sh_mqtt_subscribe_handler);
-	k_work_init_delayable(&sh_mqtt->process_dwork, sh_mqtt_process_handler);
-	k_work_init_delayable(&sh_mqtt->publish_dwork, sh_mqtt_publish_handler);
+	(void)k_thread_name_set(&sh->workq.thread, "sh_mqtt_workq");
+	k_work_init(&sh->net_disconnected_work, net_disconnect_handler);
+	k_work_init_delayable(&sh->connect_dwork, sh_mqtt_connect_handler);
+	k_work_init_delayable(&sh->subscribe_dwork, sh_mqtt_subscribe_handler);
+	k_work_init_delayable(&sh->process_dwork, sh_mqtt_process_handler);
+	k_work_init_delayable(&sh->publish_dwork, sh_mqtt_publish_handler);
 
 	LOG_DBG("Initializing listener for network");
-	net_mgmt_init_event_callback(&sh_mqtt->mgmt_cb, network_evt_handler, NET_EVENT_MASK);
+	net_mgmt_init_event_callback(&sh->mgmt_cb, network_evt_handler, NET_EVENT_MASK);
 
-	sh_mqtt->network_state = SHELL_MQTT_NETWORK_DISCONNECTED;
-	sh_mqtt->transport_state = SHELL_MQTT_TRANSPORT_DISCONNECTED;
-	sh_mqtt->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
+	sh->network_state = SHELL_MQTT_NETWORK_DISCONNECTED;
+	sh->transport_state = SHELL_MQTT_TRANSPORT_DISCONNECTED;
+	sh->subscribe_state = SHELL_MQTT_NOT_SUBSCRIBED;
 
 	return 0;
 }
@@ -698,9 +698,10 @@ static int init(const struct shell_transport *transport, const void *config,
 static int uninit(const struct shell_transport *transport)
 {
 	ARG_UNUSED(transport);
+	struct shell_mqtt *sh = sh_mqtt;
 
 	/* Not initialized yet */
-	if (sh_mqtt == NULL) {
+	if (sh == NULL) {
 		return -ENODEV;
 	}
 
@@ -711,14 +712,15 @@ static int enable(const struct shell_transport *transport, bool blocking)
 {
 	ARG_UNUSED(transport);
 	ARG_UNUSED(blocking);
+	struct shell_mqtt *sh = sh_mqtt;
 
 	/* Not initialized yet */
-	if (sh_mqtt == NULL) {
+	if (sh == NULL) {
 		return -ENODEV;
 	}
 
 	/* Listen for network connection status */
-	net_mgmt_add_event_callback(&sh_mqtt->mgmt_cb);
+	net_mgmt_add_event_callback(&sh->mgmt_cb);
 	conn_mgr_mon_resend_status();
 
 	return 0;
@@ -728,6 +730,7 @@ static int write_data(const struct shell_transport *transport, const void *data,
 		      size_t *cnt)
 {
 	ARG_UNUSED(transport);
+	struct shell_mqtt *sh = sh_mqtt;
 	int rc = 0;
 	struct k_work_sync ws;
 	size_t copy_len;
@@ -735,33 +738,33 @@ static int write_data(const struct shell_transport *transport, const void *data,
 	*cnt = 0;
 
 	/* Not initialized yet */
-	if (sh_mqtt == NULL) {
+	if (sh == NULL) {
 		return -ENODEV;
 	}
 
 	/* Not connected to broker */
-	if (sh_mqtt->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
+	if (sh->transport_state != SHELL_MQTT_TRANSPORT_CONNECTED) {
 		goto out;
 	}
 
-	(void)k_work_cancel_delayable_sync(&sh_mqtt->publish_dwork, &ws);
+	(void)k_work_cancel_delayable_sync(&sh->publish_dwork, &ws);
 
 	do {
-		if ((sh_mqtt->tx_buf.len + length - *cnt) > TX_BUF_SIZE) {
-			copy_len = TX_BUF_SIZE - sh_mqtt->tx_buf.len;
+		if ((sh->tx_buf.len + length - *cnt) > TX_BUF_SIZE) {
+			copy_len = TX_BUF_SIZE - sh->tx_buf.len;
 		} else {
 			copy_len = length - *cnt;
 		}
 
-		memcpy(sh_mqtt->tx_buf.buf + sh_mqtt->tx_buf.len, (uint8_t *)data + *cnt, copy_len);
-		sh_mqtt->tx_buf.len += copy_len;
+		memcpy(sh->tx_buf.buf + sh->tx_buf.len, (uint8_t *)data + *cnt, copy_len);
+		sh->tx_buf.len += copy_len;
 
 		/* Send the data immediately if the buffer is full */
-		if (sh_mqtt->tx_buf.len == TX_BUF_SIZE) {
-			rc = sh_mqtt_publish_tx_buf(false);
+		if (sh->tx_buf.len == TX_BUF_SIZE) {
+			rc = sh_mqtt_publish_tx_buf(sh, false);
 			if (rc != 0) {
-				sh_mqtt_close_and_cleanup();
-				(void)sh_mqtt_work_reschedule(&sh_mqtt->connect_dwork,
+				sh_mqtt_close_and_cleanup(sh);
+				(void)sh_mqtt_work_reschedule(&sh->connect_dwork,
 							      K_SECONDS(2));
 				*cnt = length;
 				return rc;
@@ -771,12 +774,12 @@ static int write_data(const struct shell_transport *transport, const void *data,
 		*cnt += copy_len;
 	} while (*cnt < length);
 
-	if (sh_mqtt->tx_buf.len > 0) {
-		(void)sh_mqtt_work_reschedule(&sh_mqtt->publish_dwork, MQTT_SEND_DELAY_MS);
+	if (sh->tx_buf.len > 0) {
+		(void)sh_mqtt_work_reschedule(&sh->publish_dwork, MQTT_SEND_DELAY_MS);
 	}
 
 	/* Inform shell that it is ready for next TX */
-	sh_mqtt->shell_handler(SHELL_TRANSPORT_EVT_TX_RDY, sh_mqtt->shell_context);
+	sh->shell_handler(SHELL_TRANSPORT_EVT_TX_RDY, sh->shell_context);
 
 out:
 	/* We will always assume that we sent everything */
@@ -788,23 +791,24 @@ static int read_data(const struct shell_transport *transport, void *data, size_t
 		     size_t *cnt)
 {
 	ARG_UNUSED(transport);
+	struct shell_mqtt *sh = sh_mqtt;
 
 	/* Not initialized yet */
-	if (sh_mqtt == NULL) {
+	if (sh == NULL) {
 		return -ENODEV;
 	}
 
 	/* Not subscribed yet */
-	if (sh_mqtt->subscribe_state != SHELL_MQTT_SUBSCRIBED) {
+	if (sh->subscribe_state != SHELL_MQTT_SUBSCRIBED) {
 		*cnt = 0;
 		return 0;
 	}
 
-	*cnt = ring_buf_get(&sh_mqtt->rx_rb, data, length);
+	*cnt = ring_buf_get(&sh->rx_rb, data, length);
 
 	/* Inform the shell if there are still data in the rb */
-	if (ring_buf_size_get(&sh_mqtt->rx_rb) > 0) {
-		sh_mqtt->shell_handler(SHELL_TRANSPORT_EVT_RX_RDY, sh_mqtt->shell_context);
+	if (ring_buf_size_get(&sh->rx_rb) > 0) {
+		sh->shell_handler(SHELL_TRANSPORT_EVT_RX_RDY, sh->shell_context);
 	}
 
 	return 0;
diff --git a/subsys/shell/modules/kernel_service/CMakeLists.txt b/subsys/shell/modules/kernel_service/CMakeLists.txt
index 0bc582df690ae..7ec9280701c64 100644
--- a/subsys/shell/modules/kernel_service/CMakeLists.txt
+++ b/subsys/shell/modules/kernel_service/CMakeLists.txt
@@ -18,4 +18,6 @@ zephyr_sources_ifdef(CONFIG_LOG_RUNTIME_FILTERING log-level.c)
 
 zephyr_sources_ifdef(CONFIG_REBOOT reboot.c)
 
+zephyr_sources_ifdef(CONFIG_KERNEL_SHELL_PANIC_CMD panic.c)
+
 add_subdirectory_ifdef(CONFIG_KERNEL_THREAD_SHELL thread)
diff --git a/subsys/shell/modules/kernel_service/Kconfig b/subsys/shell/modules/kernel_service/Kconfig
index f0c276796991a..ba95fdf6fa413 100644
--- a/subsys/shell/modules/kernel_service/Kconfig
+++ b/subsys/shell/modules/kernel_service/Kconfig
@@ -29,4 +29,11 @@ config KERNEL_SHELL_REBOOT_DELAY
 
 rsource "thread/Kconfig"
 
+config KERNEL_SHELL_PANIC_CMD
+	bool "Add a panic command"
+	help
+	  Whether a fatal error handler is installed or not, it may come in
+	  handy to have a way to generate a kernel panic as if something had
+	  crashed, but reliably through the shell.
+
 endif # KERNEL_SHELL
diff --git a/subsys/shell/modules/kernel_service/panic.c b/subsys/shell/modules/kernel_service/panic.c
new file mode 100644
index 0000000000000..1fb66bdcbe112
--- /dev/null
+++ b/subsys/shell/modules/kernel_service/panic.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Bang & Olufsen
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "kernel_shell.h"
+
+#include <zephyr/sys/reboot.h>
+
+static int cmd_kernel_panic(const struct shell *sh,
+			    size_t argc, char **argv)
+{
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	k_panic();
+
+	return 0;
+}
+
+KERNEL_CMD_ADD(panic, NULL, "Please, panic now!", cmd_kernel_panic);
diff --git a/subsys/shell/shell.c b/subsys/shell/shell.c
index 8ce5f9c3afb8e..dd2682862183f 100644
--- a/subsys/shell/shell.c
+++ b/subsys/shell/shell.c
@@ -975,7 +975,11 @@ static void state_collect(const struct shell *sh)
 		shell_bypass_cb_t bypass = sh->ctx->bypass;
 
 		if (bypass) {
+#if defined(CONFIG_SHELL_BACKEND_RTT) && defined(CONFIG_SEGGER_RTT_BUFFER_SIZE_DOWN)
+			uint8_t buf[CONFIG_SEGGER_RTT_BUFFER_SIZE_DOWN];
+#else
 			uint8_t buf[16];
+#endif
 
 			(void)sh->iface->api->read(sh->iface, buf,
 							sizeof(buf), &count);
@@ -1155,9 +1159,9 @@ static void state_collect(const struct shell *sh)
 			receive_state_change(sh, SHELL_RECEIVE_DEFAULT);
 			break;
 		}
-	}
 
-	z_transport_buffer_flush(sh);
+		z_transport_buffer_flush(sh);
+	}
 }
 
 static void transport_evt_handler(enum shell_transport_evt evt_type, void *ctx)
diff --git a/subsys/storage/flash_map/flash_map.c b/subsys/storage/flash_map/flash_map.c
index 7b66825c4427a..d5b7b20bb0c87 100644
--- a/subsys/storage/flash_map/flash_map.c
+++ b/subsys/storage/flash_map/flash_map.c
@@ -82,6 +82,20 @@ int flash_area_erase(const struct flash_area *fa, off_t off, size_t len)
 	return flash_erase(fa->fa_dev, fa->fa_off + off, len);
 }
 
+int flash_area_copy(const struct flash_area *src_fa, off_t src_off,
+		    const struct flash_area *dst_fa, off_t dst_off,
+		    off_t len, uint8_t *buf, size_t buf_size)
+{
+	if (!(is_in_flash_area_bounds(src_fa, src_off, len) &&
+	      is_in_flash_area_bounds(dst_fa, dst_off, len))) {
+		return -EINVAL;
+	}
+
+	return flash_copy(src_fa->fa_dev, src_fa->fa_off + src_off,
+			  dst_fa->fa_dev, dst_fa->fa_off + dst_off, len, buf,
+			  buf_size);
+}
+
 int flash_area_flatten(const struct flash_area *fa, off_t off, size_t len)
 {
 	if (!is_in_flash_area_bounds(fa, off, len)) {
diff --git a/subsys/task_wdt/Kconfig b/subsys/task_wdt/Kconfig
index b78894a0b3bef..92198a90e6e74 100644
--- a/subsys/task_wdt/Kconfig
+++ b/subsys/task_wdt/Kconfig
@@ -58,6 +58,16 @@ config TASK_WDT_HW_FALLBACK_DELAY
 	  kernel timer. This is especially important if the hardware watchdog
 	  is clocked by an inaccurate low-speed RC oscillator.
 
+config TASK_WDT_HW_FALLBACK_PAUSE_IN_SLEEP
+	bool "Pause the hardware watchdog in system sleep"
+	depends on TASK_WDT_HW_FALLBACK
+	help
+	  Configure the hardware watchdog to automatically pause when the
+	  system reaches a sleep power state. When the system is resumed, the
+	  watchdog is also automatically resumed.
+	  Note that this feature is supported only by a subset of hardware
+	  watchdogs.
+
 config TASK_WDT_SHELL
 	bool "Task watchdog shell utilities"
 	depends on SHELL
diff --git a/subsys/task_wdt/task_wdt.c b/subsys/task_wdt/task_wdt.c
index 361acc0e156e8..243012198fe88 100644
--- a/subsys/task_wdt/task_wdt.c
+++ b/subsys/task_wdt/task_wdt.c
@@ -44,6 +44,9 @@ static struct k_spinlock channels_lock;
 /* timer used for watchdog handling */
 static struct k_timer timer;
 
+/* Tell whether the Task Watchdog has been fully initialized. */
+static bool task_wdt_initialized;
+
 #ifdef CONFIG_TASK_WDT_HW_FALLBACK
 /* pointer to the hardware watchdog used as a fallback */
 static const struct device *hw_wdt_dev;
@@ -149,6 +152,8 @@ int task_wdt_init(const struct device *hw_wdt)
 	k_timer_init(&timer, task_wdt_trigger, NULL);
 	schedule_next_timeout(sys_clock_tick_get());
 
+	task_wdt_initialized = true;
+
 	return 0;
 }
 
@@ -179,7 +184,11 @@ int task_wdt_add(uint32_t reload_period, task_wdt_callback_t callback,
 			if (!hw_wdt_started && hw_wdt_dev) {
 				/* also start fallback hw wdt */
 				wdt_setup(hw_wdt_dev,
-					WDT_OPT_PAUSE_HALTED_BY_DBG);
+					WDT_OPT_PAUSE_HALTED_BY_DBG
+#ifdef CONFIG_TASK_WDT_HW_FALLBACK_PAUSE_IN_SLEEP
+					| WDT_OPT_PAUSE_IN_SLEEP
+#endif
+				);
 				hw_wdt_started = true;
 			}
 #endif
@@ -242,3 +251,68 @@ int task_wdt_feed(int channel_id)
 
 	return 0;
 }
+
+void task_wdt_suspend(void)
+{
+	k_spinlock_key_t key;
+
+	/*
+	 * Allow the function to be called from a custom PM policy callback, even when
+	 * the Task Watchdog was not initialized yet.
+	 */
+	if (!task_wdt_initialized) {
+		return;
+	}
+
+	/*
+	 * Prevent all task watchdog channels from triggering.
+	 * Protect the timer access with the spinlock to avoid the timer being started
+	 * concurrently by a call to schedule_next_timeout().
+	 */
+	key = k_spin_lock(&channels_lock);
+	k_timer_stop(&timer);
+	k_spin_unlock(&channels_lock, key);
+
+#ifdef CONFIG_TASK_WDT_HW_FALLBACK
+	/*
+	 * Give a whole hardware watchdog timer period of time to the application to put
+	 * the system in a suspend mode that will pause the hardware watchdog.
+	 */
+	if (hw_wdt_started) {
+		wdt_feed(hw_wdt_dev, hw_wdt_channel);
+	}
+#endif
+}
+
+void task_wdt_resume(void)
+{
+	k_spinlock_key_t key;
+	int64_t current_ticks;
+
+	/*
+	 * Allow the function to be called from a custom PM policy callback, even when
+	 * the Task Watchdog was not initialized yet.
+	 */
+	if (!task_wdt_initialized) {
+		return;
+	}
+
+	key = k_spin_lock(&channels_lock);
+
+	/*
+	 * Feed all enabled channels, so the application threads have time to resume
+	 * feeding the channels by themselves.
+	 */
+	current_ticks = sys_clock_tick_get();
+	for (size_t id = 0; id < ARRAY_SIZE(channels); id++) {
+		if (channels[id].reload_period != 0) {
+			channels[id].timeout_abs_ticks = current_ticks +
+				k_ms_to_ticks_ceil64(channels[id].reload_period);
+		}
+	}
+
+	/* Restart the Task Watchdog timer */
+	schedule_next_timeout(current_ticks);
+
+	k_spin_unlock(&channels_lock, key);
+}
diff --git a/subsys/testsuite/arch/Kconfig.v1 b/subsys/testsuite/arch/Kconfig.v1
deleted file mode 100644
index 28d4b43df0bbd..0000000000000
--- a/subsys/testsuite/arch/Kconfig.v1
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-rsource "unit_testing/Kconfig"
diff --git a/subsys/testsuite/include/zephyr/interrupt_util.h b/subsys/testsuite/include/zephyr/interrupt_util.h
index a3653618d9701..6bb9168c33c19 100644
--- a/subsys/testsuite/include/zephyr/interrupt_util.h
+++ b/subsys/testsuite/include/zephyr/interrupt_util.h
@@ -7,8 +7,6 @@
 #ifndef INTERRUPT_UTIL_H_
 #define INTERRUPT_UTIL_H_
 
-#define MS_TO_US(ms)  (ms * USEC_PER_MSEC)
-
 #if defined(CONFIG_CPU_CORTEX_M)
 #include <cmsis_core.h>
 
@@ -166,7 +164,7 @@ static inline void trigger_irq(int irq)
 }
 
 #elif defined(CONFIG_RISCV)
-#if defined(CONFIG_NUCLEI_ECLIC) || defined(CONFIG_NRFX_CLIC)
+#if defined(CONFIG_CLIC) || defined(CONFIG_NRFX_CLIC)
 void riscv_clic_irq_set_pending(uint32_t irq);
 static inline void trigger_irq(int irq)
 {
diff --git a/subsys/testsuite/include/zephyr/test_toolchain.h b/subsys/testsuite/include/zephyr/test_toolchain.h
new file mode 100644
index 0000000000000..5ae731890bb93
--- /dev/null
+++ b/subsys/testsuite/include/zephyr/test_toolchain.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2025 Google, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_H_
+#define ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_H_
+
+#include <zephyr/toolchain.h>
+
+#if defined(__llvm__) || (defined(_LINKER) && defined(__LLD_LINKER_CMD__))
+#include <zephyr/test_toolchain/llvm.h>
+#elif defined(__GNUC__) || (defined(_LINKER) && defined(__GCC_LINKER_CMD__))
+#include <zephyr/test_toolchain/gcc.h>
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_ALLOC_SIZE_LARGER_THAN
+ * @brief Toolchain-specific warning for allocations larger than a given size.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_ALLOC_SIZE_LARGER_THAN
+#define TOOLCHAIN_WARNING_ALLOC_SIZE_LARGER_THAN
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_DANGLING_POINTER
+ * @brief Toolchain-specific warning for dangling pointers.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_DANGLING_POINTER
+#define TOOLCHAIN_WARNING_DANGLING_POINTER
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_FORMAT_TRUNCATION
+ * @brief Toolchain-specific warning for format truncation.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_FORMAT_TRUNCATION
+#define TOOLCHAIN_WARNING_FORMAT_TRUNCATION
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_INFINITE_RECURSION
+ * @brief Toolchain-specific warning for infinite recursion.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_INFINITE_RECURSION
+#define TOOLCHAIN_WARNING_INFINITE_RECURSION
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_INTEGER_OVERFLOW
+ * @brief Toolchain-specific warning for integer overflow.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_INTEGER_OVERFLOW
+#define TOOLCHAIN_WARNING_INTEGER_OVERFLOW
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_OVERFLOW
+ * @brief Toolchain-specific warning for integer overflow.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_OVERFLOW
+#define TOOLCHAIN_WARNING_OVERFLOW
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_PRAGMAS
+ * @brief Toolchain-specific warning for unknown pragmas.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_PRAGMAS
+#define TOOLCHAIN_WARNING_PRAGMAS
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_SIZEOF_ARRAY_DECAY
+ * @brief Toolchain-specific warning for sizeof array decay.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_SIZEOF_ARRAY_DECAY
+#define TOOLCHAIN_WARNING_SIZEOF_ARRAY_DECAY
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_STRINGOP_OVERFLOW
+ * @brief Toolchain-specific warning for stringop overflow.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_STRINGOP_OVERFLOW
+#define TOOLCHAIN_WARNING_STRINGOP_OVERFLOW
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_STRINGOP_TRUNCATION
+ * @brief Toolchain-specific warning for stringop truncation.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_STRINGOP_TRUNCATION
+#define TOOLCHAIN_WARNING_STRINGOP_TRUNCATION
+#endif
+
+/**
+ * @def TOOLCHAIN_WARNING_UNUSED_FUNCTION
+ * @brief Toolchain-specific warning for unused function.
+ *
+ * Use this as an argument to the @ref TOOLCHAIN_DISABLE_WARNING and
+ * @ref TOOLCHAIN_ENABLE_WARNING family of macros.
+ */
+#ifndef TOOLCHAIN_WARNING_UNUSED_FUNCTION
+#define TOOLCHAIN_WARNING_UNUSED_FUNCTION
+#endif
+
+#endif
diff --git a/subsys/testsuite/include/zephyr/test_toolchain/gcc.h b/subsys/testsuite/include/zephyr/test_toolchain/gcc.h
new file mode 100644
index 0000000000000..4323ac7b49724
--- /dev/null
+++ b/subsys/testsuite/include/zephyr/test_toolchain/gcc.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 Google, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_GCC_H_
+#define ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_GCC_H_
+
+#ifndef ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_H_
+#error "Please do not include test toolchain-specific headers directly, \
+use <zephyr/test_toolchain.h> instead"
+#endif
+
+#define TOOLCHAIN_WARNING_DANGLING_POINTER   "-Wdangling-pointer"
+#define TOOLCHAIN_WARNING_FORMAT_TRUNCATION  "-Wformat-truncation"
+#define TOOLCHAIN_WARNING_INFINITE_RECURSION "-Winfinite-recursion"
+#define TOOLCHAIN_WARNING_OVERFLOW           "-Woverflow"
+#define TOOLCHAIN_WARNING_PRAGMAS            "-Wpragmas"
+#define TOOLCHAIN_WARNING_UNUSED_FUNCTION    "-Wunused-function"
+
+/* GCC-specific warnings that aren't in clang. */
+#if defined(__GNUC__) && !defined(__clang__)
+#define TOOLCHAIN_WARNING_ALLOC_SIZE_LARGER_THAN "-Walloc-size-larger-than="
+#define TOOLCHAIN_WARNING_STRINGOP_OVERFLOW      "-Wstringop-overflow"
+#define TOOLCHAIN_WARNING_STRINGOP_TRUNCATION    "-Wstringop-truncation"
+#endif
+
+#endif
diff --git a/subsys/testsuite/include/zephyr/test_toolchain/llvm.h b/subsys/testsuite/include/zephyr/test_toolchain/llvm.h
new file mode 100644
index 0000000000000..3dd26015851c6
--- /dev/null
+++ b/subsys/testsuite/include/zephyr/test_toolchain/llvm.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Google, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_LLVM_H_
+#define ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_LLVM_H_
+
+#ifndef ZEPHYR_TESTSUITE_INCLUDE_TEST_TOOLCHAIN_H_
+#error "Please do not include test toolchain-specific headers directly, \
+use <zephyr/test_toolchain.h> instead"
+#endif
+
+#include <zephyr/test_toolchain/gcc.h>
+
+#define TOOLCHAIN_WARNING_INTEGER_OVERFLOW "-Winteger-overflow"
+
+#endif
diff --git a/subsys/testsuite/ztest/Kconfig b/subsys/testsuite/ztest/Kconfig
index 02eb742dcf1ba..df7cda1f8565c 100644
--- a/subsys/testsuite/ztest/Kconfig
+++ b/subsys/testsuite/ztest/Kconfig
@@ -101,6 +101,7 @@ config ZTEST_ASSERT_HOOK
 
 config ZTEST_NO_YIELD
 	bool "Do not yield to the idle thread after tests complete"
+	default y if PM
 	help
 	  When the tests complete, do not yield to the idle thread and instead
 	  spin in a loop. This is useful for low power mode tests, where
@@ -207,7 +208,6 @@ config ZTEST_VERBOSE_SUMMARY
 
 config ZTEST_FAIL_ON_ASSUME
 	bool "Fail the test run when an assumption fails"
-	default y
 	help
 	  When enabled, the test binary will fail at the end if an assumption failed. This means
 	  that while tests will still be marked as skipped on failed zassume calls, the final test
diff --git a/subsys/testsuite/ztest/src/ztest.c b/subsys/testsuite/ztest/src/ztest.c
index f6f39d53e7ef5..60af1dd34531b 100644
--- a/subsys/testsuite/ztest/src/ztest.c
+++ b/subsys/testsuite/ztest/src/ztest.c
@@ -393,8 +393,10 @@ void ztest_skip_failed_assumption(void)
 {
 	if (IS_ENABLED(CONFIG_ZTEST_FAIL_ON_ASSUME)) {
 		current_test_failed_assumption = true;
+		ztest_test_fail();
+	} else {
+		ztest_test_skip();
 	}
-	ztest_test_skip();
 }
 
 #ifndef KERNEL
diff --git a/subsys/tracing/CMakeLists.txt b/subsys/tracing/CMakeLists.txt
index 98c0939c98211..2ee3ac518e573 100644
--- a/subsys/tracing/CMakeLists.txt
+++ b/subsys/tracing/CMakeLists.txt
@@ -48,11 +48,9 @@ zephyr_sources_ifdef(
 
 endif()
 
-if(NOT CONFIG_PERCEPIO_TRACERECORDER AND NOT CONFIG_TRACING_CTF
-  AND NOT CONFIG_SEGGER_SYSTEMVIEW AND NOT CONFIG_TRACING_TEST
-  AND NOT CONFIG_TRACING_USER)
-  zephyr_sources(tracing_none.c)
-endif()
+zephyr_sources(
+  tracing_none.c
+  )
 
 zephyr_sources_ifdef(
   CONFIG_TRACING_OBJECT_TRACKING
diff --git a/subsys/tracing/ctf/ctf_top.c b/subsys/tracing/ctf/ctf_top.c
index e65acfa8a96f2..7acb422f3ef6d 100644
--- a/subsys/tracing/ctf/ctf_top.c
+++ b/subsys/tracing/ctf/ctf_top.c
@@ -13,6 +13,7 @@
 #include <zephyr/net/socket_poll.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
+#include <zephyr/debug/cpu_load.h>
 
 static void _get_thread_name(struct k_thread *thread,
 			     ctf_bounded_string_t *name)
@@ -189,6 +190,16 @@ void sys_trace_isr_exit_to_scheduler(void)
 void sys_trace_idle(void)
 {
 	ctf_top_idle();
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_enter_idle();
+	}
+}
+
+void sys_trace_idle_exit(void)
+{
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_exit_idle();
+	}
 }
 
 /* Semaphore */
diff --git a/subsys/tracing/ctf/tracing_ctf.h b/subsys/tracing/ctf/tracing_ctf.h
index 8380e51111686..c1d8b65bd6b30 100644
--- a/subsys/tracing/ctf/tracing_ctf.h
+++ b/subsys/tracing/ctf/tracing_ctf.h
@@ -311,7 +311,7 @@ extern "C" {
 
 #define sys_port_trace_k_heap_init(heap)
 #define sys_port_trace_k_heap_aligned_alloc_enter(heap, timeout)
-#define sys_port_trace_k_heap_aligned_alloc_blocking(heap, timeout)
+#define sys_port_trace_k_heap_alloc_helper_blocking(heap, timeout)
 #define sys_port_trace_k_heap_aligned_alloc_exit(heap, timeout, ret)
 #define sys_port_trace_k_heap_alloc_enter(heap, timeout)
 #define sys_port_trace_k_heap_alloc_exit(heap, timeout, ret)
@@ -368,6 +368,7 @@ extern "C" {
 #define sys_trace_sys_init_exit(...)
 
 void sys_trace_idle(void);
+void sys_trace_idle_exit(void);
 void sys_trace_isr_enter(void);
 void sys_trace_isr_exit(void);
 
diff --git a/subsys/tracing/sysview/sysview.c b/subsys/tracing/sysview/sysview.c
index 6ca72464bbdf3..660181e967e0f 100644
--- a/subsys/tracing/sysview/sysview.c
+++ b/subsys/tracing/sysview/sysview.c
@@ -6,6 +6,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/init.h>
+#include <zephyr/debug/cpu_load.h>
 #include <ksched.h>
 
 #include <SEGGER_SYSVIEW.h>
@@ -64,6 +65,17 @@ void sys_trace_isr_exit_to_scheduler(void)
 void sys_trace_idle(void)
 {
 	SEGGER_SYSVIEW_OnIdle();
+
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_enter_idle();
+	}
+}
+
+void sys_trace_idle_exit(void)
+{
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_exit_idle();
+	}
 }
 
 void sys_trace_named_event(const char *name, uint32_t arg0, uint32_t arg1)
diff --git a/subsys/tracing/sysview/tracing_sysview.h b/subsys/tracing/sysview/tracing_sysview.h
index 324db73a81db2..d13ab42dd8de6 100644
--- a/subsys/tracing/sysview/tracing_sysview.h
+++ b/subsys/tracing/sysview/tracing_sysview.h
@@ -573,7 +573,7 @@ void sys_trace_thread_info(struct k_thread *thread);
 	SEGGER_SYSVIEW_RecordU32x2(TID_HEAP_ALIGNED_ALLOC, (uint32_t)(uintptr_t)heap,              \
 				   (uint32_t)timeout.ticks)
 
-#define sys_port_trace_k_heap_aligned_alloc_blocking(heap, timeout)
+#define sys_port_trace_k_heap_alloc_helper_blocking(heap, timeout)
 
 #define sys_port_trace_k_heap_aligned_alloc_exit(heap, timeout, ret)                               \
 	SEGGER_SYSVIEW_RecordEndCallU32(TID_HEAP_ALIGNED_ALLOC, (uint32_t)ret)
@@ -655,6 +655,7 @@ void sys_trace_thread_info(struct k_thread *thread);
 	SEGGER_SYSVIEW_RecordEndCall(TID_SYSCALL)
 
 void sys_trace_idle(void);
+void sys_trace_idle_exit(void);
 
 void sys_trace_k_thread_create(struct k_thread *new_thread, size_t stack_size, int prio);
 void sys_trace_k_thread_user_mode_enter(k_thread_entry_t entry, void *p1, void *p2, void *p3);
diff --git a/subsys/tracing/test/tracing_string_format_test.c b/subsys/tracing/test/tracing_string_format_test.c
index ddfd7bc70c1f5..8a53e0bcdb81f 100644
--- a/subsys/tracing/test/tracing_string_format_test.c
+++ b/subsys/tracing/test/tracing_string_format_test.c
@@ -204,6 +204,11 @@ void sys_trace_idle(void)
 	TRACING_STRING("%s\n", __func__);
 }
 
+void sys_trace_idle_exit(void)
+{
+	TRACING_STRING("%s\n", __func__);
+}
+
 void sys_trace_k_condvar_broadcast_enter(struct k_condvar *condvar)
 {
 	TRACING_STRING("%s: %p\n", __func__, condvar);
@@ -376,7 +381,7 @@ void sys_trace_k_heap_realloc_exit(struct k_heap *h, void *ptr, size_t bytes, k_
 	TRACING_STRING("%s: %p\n", __func__, h);
 }
 
-void sys_trace_k_heap_aligned_alloc_blocking(struct k_heap *h, size_t bytes, k_timeout_t timeout)
+void sys_trace_k_heap_alloc_helper_blocking(struct k_heap *h, size_t bytes, k_timeout_t timeout)
 {
 	TRACING_STRING("%s: %p\n", __func__, h);
 }
diff --git a/subsys/tracing/test/tracing_test.h b/subsys/tracing/test/tracing_test.h
index f2fcf3e4b38eb..a6208337e382b 100644
--- a/subsys/tracing/test/tracing_test.h
+++ b/subsys/tracing/test/tracing_test.h
@@ -388,8 +388,8 @@
 #define sys_port_trace_k_heap_init(h) sys_trace_k_heap_init(h, mem, bytes)
 #define sys_port_trace_k_heap_aligned_alloc_enter(h, timeout)                                      \
 	sys_trace_k_heap_aligned_alloc_enter(h, bytes, timeout)
-#define sys_port_trace_k_heap_aligned_alloc_blocking(h, timeout)                                   \
-	sys_trace_k_heap_aligned_alloc_blocking(h, bytes, timeout)
+#define sys_port_trace_k_heap_alloc_helper_blocking(h, timeout)                                   \
+	sys_trace_k_heap_alloc_helper_blocking(h, bytes, timeout)
 #define sys_port_trace_k_heap_aligned_alloc_exit(h, timeout, ret)                                  \
 	sys_trace_k_heap_aligned_alloc_exit(h, bytes, timeout, ret)
 #define sys_port_trace_k_heap_alloc_enter(h, timeout)                                              \
@@ -480,6 +480,7 @@
 #define sys_port_trace_pm_device_runtime_disable_exit(dev, ret)
 
 void sys_trace_idle(void);
+void sys_trace_idle_exit(void);
 void sys_trace_isr_enter(void);
 void sys_trace_isr_exit(void);
 
@@ -696,7 +697,7 @@ void sys_trace_k_heap_calloc_enter(struct k_heap *h, size_t num, size_t size, k_
 void sys_trace_k_heap_calloc_exit(struct k_heap *h, size_t num, size_t size, k_timeout_t timeout,
 				  void *ret);
 void sys_trace_k_heap_aligned_alloc_enter(struct k_heap *h, size_t bytes, k_timeout_t timeout);
-void sys_trace_k_heap_aligned_alloc_blocking(struct k_heap *h, size_t bytes, k_timeout_t timeout);
+void sys_trace_k_heap_alloc_helper_blocking(struct k_heap *h, size_t bytes, k_timeout_t timeout);
 void sys_trace_k_heap_aligned_alloc_exit(struct k_heap *h, size_t bytes, k_timeout_t timeout,
 					 void *ret);
 void sys_trace_k_heap_free(struct k_heap *h, void *mem);
diff --git a/subsys/tracing/tracing_none.c b/subsys/tracing/tracing_none.c
index b630e506dfa3e..84b4d6549e176 100644
--- a/subsys/tracing/tracing_none.c
+++ b/subsys/tracing/tracing_none.c
@@ -3,12 +3,25 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <zephyr/tracing/tracing.h>
+#include <zephyr/debug/cpu_load.h>
 
+__weak void sys_trace_isr_enter(void) {}
 
-void sys_trace_isr_enter(void) {}
+__weak void sys_trace_isr_exit(void) {}
 
-void sys_trace_isr_exit(void) {}
+__weak void sys_trace_isr_exit_to_scheduler(void) {}
 
-void sys_trace_isr_exit_to_scheduler(void) {}
+__weak void sys_trace_idle(void)
+{
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_enter_idle();
+	}
+}
 
-void sys_trace_idle(void) {}
+__weak void sys_trace_idle_exit(void)
+{
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_exit_idle();
+	}
+}
diff --git a/subsys/tracing/user/tracing_user.c b/subsys/tracing/user/tracing_user.c
index 2453a3e9aad27..ff5b945482f1e 100644
--- a/subsys/tracing/user/tracing_user.c
+++ b/subsys/tracing/user/tracing_user.c
@@ -7,6 +7,7 @@
 
 #include <tracing_user.h>
 #include <zephyr/kernel.h>
+#include <zephyr/debug/cpu_load.h>
 #include <zephyr/init.h>
 
 void __weak sys_trace_thread_create_user(struct k_thread *thread) {}
@@ -143,6 +144,17 @@ void sys_trace_isr_exit(void)
 void sys_trace_idle(void)
 {
 	sys_trace_idle_user();
+
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_enter_idle();
+	}
+}
+
+void sys_trace_idle_exit(void)
+{
+	if (IS_ENABLED(CONFIG_CPU_LOAD)) {
+		cpu_load_on_exit_idle();
+	}
 }
 
 void sys_trace_sys_init_enter(const struct init_entry *entry, int level)
diff --git a/subsys/tracing/user/tracing_user.h b/subsys/tracing/user/tracing_user.h
index f604d6b0423e3..9d1fd6f8c7b9f 100644
--- a/subsys/tracing/user/tracing_user.h
+++ b/subsys/tracing/user/tracing_user.h
@@ -46,6 +46,7 @@ void sys_trace_thread_pend(struct k_thread *thread);
 void sys_trace_isr_enter(void);
 void sys_trace_isr_exit(void);
 void sys_trace_idle(void);
+void sys_trace_idle_exit(void);
 void sys_trace_sys_init_enter(const struct init_entry *entry, int level);
 void sys_trace_sys_init_exit(const struct init_entry *entry, int level, int result);
 
@@ -351,7 +352,7 @@ void sys_trace_gpio_fire_callback_user(const struct device *port, struct gpio_ca
 
 #define sys_port_trace_k_heap_init(heap)
 #define sys_port_trace_k_heap_aligned_alloc_enter(heap, timeout)
-#define sys_port_trace_k_heap_aligned_alloc_blocking(heap, timeout)
+#define sys_port_trace_k_heap_alloc_helper_blocking(heap, timeout)
 #define sys_port_trace_k_heap_aligned_alloc_exit(heap, timeout, ret)
 #define sys_port_trace_k_heap_alloc_enter(heap, timeout)
 #define sys_port_trace_k_heap_alloc_exit(heap, timeout, ret)
diff --git a/subsys/usb/device_next/Kconfig b/subsys/usb/device_next/Kconfig
index 52ce9d990858e..68ae7559845c3 100644
--- a/subsys/usb/device_next/Kconfig
+++ b/subsys/usb/device_next/Kconfig
@@ -16,6 +16,26 @@ module = USBD
 module-str = usbd
 source "subsys/logging/Kconfig.template.log_config"
 
+choice USBD_MAX_SPEED_CHOICE
+	prompt "Max supported connection speed"
+	default USBD_MAX_SPEED_HIGH if UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
+	default USBD_MAX_SPEED_FULL
+
+config USBD_MAX_SPEED_HIGH
+	bool "High-Speed"
+	depends on UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
+
+config USBD_MAX_SPEED_FULL
+	bool "Full-Speed"
+	depends on !UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED
+
+endchoice
+
+config USBD_MAX_SPEED
+	int
+	default 0 if USBD_MAX_SPEED_FULL
+	default 1 if USBD_MAX_SPEED_HIGH
+
 config USBD_SHELL
 	bool "USB device shell"
 	depends on SHELL
diff --git a/subsys/usb/device_next/app/cdc_acm_serial.c b/subsys/usb/device_next/app/cdc_acm_serial.c
index 9402722c6b0d8..6f8e64b3c8cfc 100644
--- a/subsys/usb/device_next/app/cdc_acm_serial.c
+++ b/subsys/usb/device_next/app/cdc_acm_serial.c
@@ -27,7 +27,7 @@ USBD_DEVICE_DEFINE(cdc_acm_serial,
 USBD_DESC_LANG_DEFINE(cdc_acm_serial_lang);
 USBD_DESC_MANUFACTURER_DEFINE(cdc_acm_serial_mfr, CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING);
 USBD_DESC_PRODUCT_DEFINE(cdc_acm_serial_product, CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING);
-USBD_DESC_SERIAL_NUMBER_DEFINE(cdc_acm_serial_sn);
+IF_ENABLED(CONFIG_HWINFO, (USBD_DESC_SERIAL_NUMBER_DEFINE(cdc_acm_serial_sn)));
 
 USBD_DESC_CONFIG_DEFINE(fs_cfg_desc, "FS Configuration");
 USBD_DESC_CONFIG_DEFINE(hs_cfg_desc, "HS Configuration");
@@ -95,7 +95,9 @@ static int cdc_acm_serial_init_device(void)
 		return err;
 	}
 
-	err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_sn);
+	IF_ENABLED(CONFIG_HWINFO, (
+		err = usbd_add_descriptor(&cdc_acm_serial, &cdc_acm_serial_sn);
+	))
 	if (err) {
 		LOG_ERR("Failed to initialize SN descriptor (%d)", err);
 		return err;
diff --git a/subsys/usb/device_next/class/bt_hci.c b/subsys/usb/device_next/class/bt_hci.c
index a7aed6378c623..150ef9569c205 100644
--- a/subsys/usb/device_next/class/bt_hci.c
+++ b/subsys/usb/device_next/class/bt_hci.c
@@ -68,13 +68,13 @@ static K_FIFO_DEFINE(bt_hci_tx_queue);
 
 /*
  * Transfers through three endpoints proceed in a synchronous manner,
- * with maximum packet size of high speed bulk endpoint.
+ * with maximum packet size of max supported speed bulk endpoint.
  *
  * REVISE: global (bulk, interrupt, iso) specific pools would be more
  * RAM usage efficient.
  */
 UDC_BUF_POOL_DEFINE(bt_hci_ep_pool,
-		    3, 512,
+		    3, USBD_MAX_BULK_MPS,
 		    sizeof(struct udc_buf_info), NULL);
 /* HCI RX/TX threads */
 static K_KERNEL_STACK_DEFINE(rx_thread_stack, CONFIG_BT_HCI_TX_STACK_SIZE);
@@ -138,7 +138,8 @@ static uint8_t bt_hci_get_bulk_in(struct usbd_class_data *const c_data)
 	struct bt_hci_data *data = usbd_class_get_private(c_data);
 	struct usbd_bt_hci_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_in_ep.bEndpointAddress;
 	}
 
@@ -151,7 +152,8 @@ static uint8_t bt_hci_get_bulk_out(struct usbd_class_data *const c_data)
 	struct bt_hci_data *data = usbd_class_get_private(c_data);
 	struct usbd_bt_hci_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_out_ep.bEndpointAddress;
 	}
 
@@ -449,7 +451,7 @@ static void *bt_hci_get_desc(struct usbd_class_data *const c_data,
 {
 	struct bt_hci_data *data = usbd_class_get_private(c_data);
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return data->hs_desc;
 	}
 
diff --git a/subsys/usb/device_next/class/loopback.c b/subsys/usb/device_next/class/loopback.c
index 47f23d6e735db..85896cd549e21 100644
--- a/subsys/usb/device_next/class/loopback.c
+++ b/subsys/usb/device_next/class/loopback.c
@@ -157,49 +157,42 @@ static int lb_request_handler(struct usbd_class_data *const c_data,
 {
 	struct udc_buf_info *bi = (struct udc_buf_info *)net_buf_user_data(buf);
 	struct lb_data *data = usbd_class_get_private(c_data);
-
-	LOG_DBG("Transfer finished %s -> ep 0x%02x, len %u, err %d",
-		c_data->name, bi->ep, buf->len, err);
+	const size_t len = buf->len;
+	const uint8_t ep = bi->ep;
+	int ret = 0;
 
 	if (bi->ep == lb_get_bulk_out(c_data)) {
 		atomic_clear_bit(&data->state, LB_FUNCTION_OUT_ENGAGED);
+		if (err == 0) {
+			memcpy(lb_buf, buf->data, MIN(sizeof(lb_buf), buf->len));
+		}
 	}
 
 	if (bi->ep == lb_get_bulk_in(c_data)) {
 		atomic_clear_bit(&data->state, LB_FUNCTION_IN_ENGAGED);
 	}
 
-	if (err) {
-		if (err == -ECONNABORTED) {
-			LOG_INF("request ep 0x%02x, len %u cancelled",
-				bi->ep, buf->len);
-		} else {
-			LOG_ERR("request ep 0x%02x, len %u failed",
-				bi->ep, buf->len);
-		}
-
-		net_buf_unref(buf);
-
-		return err;
+	net_buf_unref(buf);
+	if (err == -ECONNABORTED) {
+		LOG_INF("Transfer ep 0x%02x, len %u cancelled", ep, len);
+	} else if (err != 0) {
+		LOG_ERR("Transfer ep 0x%02x, len %u failed", ep, len);
+		ret = err;
+	} else {
+		LOG_DBG("Transfer ep 0x%02x, len %u finished", ep, len);
 	}
 
-	if (bi->ep == lb_get_bulk_out(c_data)) {
-		memcpy(lb_buf, buf->data, MIN(sizeof(lb_buf), buf->len));
-		net_buf_unref(buf);
-		if (!atomic_test_bit(&data->state, LB_FUNCTION_BULK_MANUAL)) {
+	if (!atomic_test_bit(&data->state, LB_FUNCTION_BULK_MANUAL)) {
+		if (ep == lb_get_bulk_out(c_data)) {
 			lb_submit_bulk_out(c_data);
 		}
-	}
 
-	if (bi->ep == lb_get_bulk_in(c_data)) {
-		bi->ep = lb_get_bulk_out(c_data);
-		net_buf_unref(buf);
-		if (!atomic_test_bit(&data->state, LB_FUNCTION_BULK_MANUAL)) {
+		if (ep == lb_get_bulk_in(c_data)) {
 			lb_submit_bulk_in(c_data);
 		}
 	}
 
-	return 0;
+	return ret;
 }
 
 static void lb_update(struct usbd_class_data *c_data,
@@ -261,7 +254,7 @@ static void *lb_get_desc(struct usbd_class_data *const c_data,
 {
 	struct lb_data *data = usbd_class_get_private(c_data);
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return data->hs_desc;
 	}
 
diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
index 456d4d9319895..d3fef3b83b0f3 100644
--- a/subsys/usb/device_next/class/usbd_cdc_acm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -36,7 +36,7 @@ LOG_MODULE_REGISTER(usbd_cdc_acm, CONFIG_USBD_CDC_ACM_LOG_LEVEL);
 
 UDC_BUF_POOL_DEFINE(cdc_acm_ep_pool,
 		    DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) * 2,
-		    512, sizeof(struct udc_buf_info), NULL);
+		    USBD_MAX_BULK_MPS, sizeof(struct udc_buf_info), NULL);
 
 #define CDC_ACM_DEFAULT_LINECODING	{sys_cpu_to_le32(115200), 0, 0, 8}
 #define CDC_ACM_DEFAULT_INT_EP_MPS	16
@@ -171,7 +171,8 @@ static uint8_t cdc_acm_get_int_in(struct usbd_class_data *const c_data)
 	const struct cdc_acm_uart_config *cfg = dev->config;
 	struct usbd_cdc_acm_desc *desc = cfg->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_int_ep.bEndpointAddress;
 	}
 
@@ -185,7 +186,8 @@ static uint8_t cdc_acm_get_bulk_in(struct usbd_class_data *const c_data)
 	const struct cdc_acm_uart_config *cfg = dev->config;
 	struct usbd_cdc_acm_desc *desc = cfg->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if1_hs_in_ep.bEndpointAddress;
 	}
 
@@ -199,7 +201,8 @@ static uint8_t cdc_acm_get_bulk_out(struct usbd_class_data *const c_data)
 	const struct cdc_acm_uart_config *cfg = dev->config;
 	struct usbd_cdc_acm_desc *desc = cfg->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if1_hs_out_ep.bEndpointAddress;
 	}
 
@@ -210,7 +213,8 @@ static size_t cdc_acm_get_bulk_mps(struct usbd_class_data *const c_data)
 {
 	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return 512U;
 	}
 
@@ -243,6 +247,10 @@ static int usbd_cdc_acm_request(struct usbd_class_data *const c_data,
 			atomic_clear_bit(&data->state, CDC_ACM_TX_FIFO_BUSY);
 		}
 
+		if (bi->ep == cdc_acm_get_int_in(c_data)) {
+			k_sem_reset(&data->notif_sem);
+		}
+
 		goto ep_request_error;
 	}
 
@@ -346,7 +354,7 @@ static void *usbd_cdc_acm_get_desc(struct usbd_class_data *const c_data,
 	const struct device *dev = usbd_class_get_private(c_data);
 	const struct cdc_acm_uart_config *cfg = dev->config;
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return cfg->hs_desc;
 	}
 
@@ -502,7 +510,7 @@ static int usbd_cdc_acm_init(struct usbd_class_data *const c_data)
 	desc->if0_union.bControlInterface = desc->if0.bInterfaceNumber;
 	desc->if0_union.bSubordinateInterface0 = desc->if1.bInterfaceNumber;
 
-	if (cfg->if_desc_data != NULL) {
+	if (cfg->if_desc_data != NULL && desc->if0.iInterface == 0) {
 		if (usbd_add_descriptor(uds_ctx, cfg->if_desc_data)) {
 			LOG_ERR("Failed to add interface string descriptor");
 		} else {
@@ -554,7 +562,9 @@ static inline int cdc_acm_send_notification(const struct device *dev,
 		return ret;
 	}
 
-	k_sem_take(&data->notif_sem, K_FOREVER);
+	if (k_sem_take(&data->notif_sem, K_FOREVER) == -EAGAIN) {
+		return -ECANCELED;
+	}
 
 	return ret;
 }
diff --git a/subsys/usb/device_next/class/usbd_cdc_ecm.c b/subsys/usb/device_next/class/usbd_cdc_ecm.c
index e43f38bed6425..55aa2798a6471 100644
--- a/subsys/usb/device_next/class/usbd_cdc_ecm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_ecm.c
@@ -106,7 +106,8 @@ static uint8_t cdc_ecm_get_int_in(struct usbd_class_data *const c_data)
 	struct cdc_ecm_eth_data *data = dev->data;
 	struct usbd_cdc_ecm_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_int_ep.bEndpointAddress;
 	}
 
@@ -120,7 +121,8 @@ static uint8_t cdc_ecm_get_bulk_in(struct usbd_class_data *const c_data)
 	struct cdc_ecm_eth_data *data = dev->data;
 	struct usbd_cdc_ecm_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if1_1_hs_in_ep.bEndpointAddress;
 	}
 
@@ -131,7 +133,8 @@ static uint16_t cdc_ecm_get_bulk_in_mps(struct usbd_class_data *const c_data)
 {
 	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return 512U;
 	}
 
@@ -145,7 +148,8 @@ static uint8_t cdc_ecm_get_bulk_out(struct usbd_class_data *const c_data)
 	struct cdc_ecm_eth_data *data = dev->data;
 	struct usbd_cdc_ecm_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if1_1_hs_out_ep.bEndpointAddress;
 	}
 
@@ -475,7 +479,7 @@ static void *usbd_cdc_ecm_get_desc(struct usbd_class_data *const c_data,
 	const struct device *dev = usbd_class_get_private(c_data);
 	struct cdc_ecm_eth_data *const data = dev->data;
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return data->hs_desc;
 	}
 
diff --git a/subsys/usb/device_next/class/usbd_cdc_ncm.c b/subsys/usb/device_next/class/usbd_cdc_ncm.c
index a7ffb5f23f74d..c92754f72f839 100644
--- a/subsys/usb/device_next/class/usbd_cdc_ncm.c
+++ b/subsys/usb/device_next/class/usbd_cdc_ncm.c
@@ -249,7 +249,8 @@ static uint8_t cdc_ncm_get_int_in(struct usbd_class_data *const c_data)
 	struct cdc_ncm_eth_data *data = dev->data;
 	struct usbd_cdc_ncm_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_int_ep.bEndpointAddress;
 	}
 
@@ -263,7 +264,8 @@ static uint8_t cdc_ncm_get_bulk_in(struct usbd_class_data *const c_data)
 	struct cdc_ncm_eth_data *data = dev->data;
 	struct usbd_cdc_ncm_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if1_1_hs_in_ep.bEndpointAddress;
 	}
 
@@ -274,7 +276,8 @@ static uint16_t cdc_ncm_get_bulk_in_mps(struct usbd_class_data *const c_data)
 {
 	struct usbd_context *uds_ctx = usbd_class_get_ctx(c_data);
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return 512U;
 	}
 
@@ -288,7 +291,8 @@ static uint8_t cdc_ncm_get_bulk_out(struct usbd_class_data *const c_data)
 	struct cdc_ncm_eth_data *data = dev->data;
 	struct usbd_cdc_ncm_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if1_1_hs_out_ep.bEndpointAddress;
 	}
 
@@ -1009,7 +1013,7 @@ static void *usbd_cdc_ncm_get_desc(struct usbd_class_data *const c_data,
 	const struct device *dev = usbd_class_get_private(c_data);
 	struct cdc_ncm_eth_data *const data = dev->data;
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return data->hs_desc;
 	}
 
diff --git a/subsys/usb/device_next/class/usbd_hid.c b/subsys/usb/device_next/class/usbd_hid.c
index a3672148fd3d5..fd10eba3c8506 100644
--- a/subsys/usb/device_next/class/usbd_hid.c
+++ b/subsys/usb/device_next/class/usbd_hid.c
@@ -479,7 +479,7 @@ static void *usbd_hid_get_desc(struct usbd_class_data *const c_data,
 	const struct device *dev = usbd_class_get_private(c_data);
 	const struct hid_device_config *dcfg = dev->config;
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return dcfg->hs_desc;
 	}
 
diff --git a/subsys/usb/device_next/class/usbd_midi2.c b/subsys/usb/device_next/class/usbd_midi2.c
index 20d66590b5fae..1afab63b4d92f 100644
--- a/subsys/usb/device_next/class/usbd_midi2.c
+++ b/subsys/usb/device_next/class/usbd_midi2.c
@@ -344,7 +344,11 @@ static void *usbd_midi_class_get_desc(struct usbd_class_data *const class_data,
 
 	LOG_DBG("Get descriptors for %s", dev->name);
 
-	return (speed == USBD_SPEED_HS) ? config->hs_descs : config->fs_descs;
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
+		return config->hs_descs;
+	}
+
+	return config->fs_descs;
 }
 
 
@@ -382,7 +386,8 @@ static uint8_t usbd_midi_get_bulk_in(struct usbd_class_data *const class_data)
 	const struct device *dev = usbd_class_get_private(class_data);
 	const struct usbd_midi_config *cfg = dev->config;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return cfg->desc->if1_1_in_ep_hs.bEndpointAddress;
 	}
 
@@ -395,7 +400,8 @@ static uint8_t usbd_midi_get_bulk_out(struct usbd_class_data *const class_data)
 	const struct device *dev = usbd_class_get_private(class_data);
 	const struct usbd_midi_config *cfg = dev->config;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return cfg->desc->if1_1_out_ep_hs.bEndpointAddress;
 	}
 
diff --git a/subsys/usb/device_next/class/usbd_msc.c b/subsys/usb/device_next/class/usbd_msc.c
index 6f8b7c4622634..07d5d09347f6a 100644
--- a/subsys/usb/device_next/class/usbd_msc.c
+++ b/subsys/usb/device_next/class/usbd_msc.c
@@ -61,7 +61,7 @@ struct CSW {
 #define MSC_NUM_INSTANCES CONFIG_USBD_MSC_INSTANCES_COUNT
 
 /* Can be 64 if device is not High-Speed capable */
-#define MSC_BUF_SIZE 512
+#define MSC_BUF_SIZE USBD_MAX_BULK_MPS
 
 UDC_BUF_POOL_DEFINE(msc_ep_pool,
 		    MSC_NUM_INSTANCES * 2, MSC_BUF_SIZE,
@@ -149,7 +149,8 @@ static uint8_t msc_get_bulk_in(struct usbd_class_data *const c_data)
 	struct msc_bot_ctx *ctx = usbd_class_get_private(c_data);
 	struct msc_bot_desc *desc = ctx->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_in_ep.bEndpointAddress;
 	}
 
@@ -162,7 +163,8 @@ static uint8_t msc_get_bulk_out(struct usbd_class_data *const c_data)
 	struct msc_bot_ctx *ctx = usbd_class_get_private(c_data);
 	struct msc_bot_desc *desc = ctx->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_out_ep.bEndpointAddress;
 	}
 
@@ -755,7 +757,7 @@ static void *msc_bot_get_desc(struct usbd_class_data *const c_data,
 {
 	struct msc_bot_ctx *ctx = usbd_class_get_private(c_data);
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return ctx->hs_desc;
 	}
 
diff --git a/subsys/usb/device_next/class/usbd_uac2.c b/subsys/usb/device_next/class/usbd_uac2.c
index 77bfde9c47222..2e55a9a017afc 100644
--- a/subsys/usb/device_next/class/usbd_uac2.c
+++ b/subsys/usb/device_next/class/usbd_uac2.c
@@ -890,7 +890,7 @@ static void *uac2_get_desc(struct usbd_class_data *const c_data,
 	struct device *dev = usbd_class_get_private(c_data);
 	const struct uac2_cfg *cfg = dev->config;
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return cfg->hs_descriptors;
 	}
 
diff --git a/subsys/usb/device_next/usbd_ch9.c b/subsys/usb/device_next/usbd_ch9.c
index 00f8074187bc5..827206af7c377 100644
--- a/subsys/usb/device_next/usbd_ch9.c
+++ b/subsys/usb/device_next/usbd_ch9.c
@@ -426,6 +426,8 @@ static int sreq_get_status(struct usbd_context *const uds_ctx,
 
 		response = uds_ctx->status.rwup ?
 			   USB_GET_STATUS_REMOTE_WAKEUP : 0;
+		response |= uds_ctx->status.self_powered ?
+			    USB_GET_STATUS_SELF_POWERED : 0;
 		break;
 	case USB_REQTYPE_RECIPIENT_ENDPOINT:
 		response = usbd_ep_is_halted(uds_ctx, ep) ? BIT(0) : 0;
@@ -470,9 +472,11 @@ static int sreq_get_desc_cfg(struct usbd_context *const uds_ctx,
 
 	/*
 	 * If the other-speed-configuration-descriptor is requested and the
-	 * controller does not support high speed, respond with an error.
+	 * controller (or stack) does not support high speed, respond with
+	 * an error.
 	 */
-	if (other_cfg && usbd_caps_speed(uds_ctx) != USBD_SPEED_HS) {
+	if (other_cfg && !(USBD_SUPPORTS_HIGH_SPEED &&
+	    (usbd_caps_speed(uds_ctx) == USBD_SPEED_HS))) {
 		errno = -ENOTSUP;
 		return 0;
 	}
@@ -689,7 +693,8 @@ static int sreq_get_dev_qualifier(struct usbd_context *const uds_ctx,
 	 * If the Device Qualifier descriptor is requested and the controller
 	 * does not support high speed, respond with an error.
 	 */
-	if (usbd_caps_speed(uds_ctx) != USBD_SPEED_HS) {
+	if (!USBD_SUPPORTS_HIGH_SPEED ||
+	    usbd_caps_speed(uds_ctx) != USBD_SPEED_HS) {
 		errno = -ENOTSUP;
 		return 0;
 	}
diff --git a/subsys/usb/device_next/usbd_class.c b/subsys/usb/device_next/usbd_class.c
index eeb2cfa5a20a3..48f3d6d72681c 100644
--- a/subsys/usb/device_next/usbd_class.c
+++ b/subsys/usb/device_next/usbd_class.c
@@ -215,7 +215,7 @@ usbd_class_node_get(const char *name, const enum usbd_speed speed)
 				return c_nd;
 			}
 		}
-	} else if (speed == USBD_SPEED_HS) {
+	} else if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		STRUCT_SECTION_FOREACH_ALTERNATE(usbd_class_hs,
 						 usbd_class_node, c_nd) {
 			if (strcmp(name, c_nd->c_data->name) == 0) {
@@ -358,7 +358,7 @@ int usbd_register_all_classes(struct usbd_context *const uds_ctx,
 {
 	int ret;
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		STRUCT_SECTION_FOREACH_ALTERNATE(usbd_class_hs, usbd_class_node, c_nd) {
 			if (blocklist != NULL && is_blocklisted(c_nd, blocklist)) {
 				continue;
@@ -430,8 +430,8 @@ int usbd_unregister_class(struct usbd_context *const uds_ctx,
 	/* TODO: The use of atomic here does not make this code thread safe.
 	 * The atomic should be changed to something else.
 	 */
-	if (speed == USBD_SPEED_HS) {
-		STRUCT_SECTION_FOREACH_ALTERNATE(usbd_class_fs,
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
+		STRUCT_SECTION_FOREACH_ALTERNATE(usbd_class_hs,
 						 usbd_class_node, i) {
 			if ((i->c_data == c_nd->c_data) &&
 			    atomic_test_bit(&i->state, USBD_CCTX_REGISTERED)) {
@@ -440,7 +440,7 @@ int usbd_unregister_class(struct usbd_context *const uds_ctx,
 			}
 		}
 	} else {
-		STRUCT_SECTION_FOREACH_ALTERNATE(usbd_class_hs,
+		STRUCT_SECTION_FOREACH_ALTERNATE(usbd_class_fs,
 						 usbd_class_node, i) {
 			if ((i->c_data == c_nd->c_data) &&
 			    atomic_test_bit(&i->state, USBD_CCTX_REGISTERED)) {
@@ -470,7 +470,7 @@ int usbd_unregister_all_classes(struct usbd_context *const uds_ctx,
 {
 	int ret;
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		STRUCT_SECTION_FOREACH_ALTERNATE(usbd_class_hs, usbd_class_node, c_nd) {
 			ret = usbd_unregister_class(uds_ctx, c_nd->c_data->name,
 						    speed, cfg);
diff --git a/subsys/usb/device_next/usbd_config.c b/subsys/usb/device_next/usbd_config.c
index 9d8627028a99b..8a589722e25d7 100644
--- a/subsys/usb/device_next/usbd_config.c
+++ b/subsys/usb/device_next/usbd_config.c
@@ -266,6 +266,12 @@ int usbd_add_configuration(struct usbd_context *const uds_ctx,
 		goto add_configuration_exit;
 	}
 
+	if (speed == USBD_SPEED_HS && !USBD_SUPPORTS_HIGH_SPEED) {
+		LOG_ERR("Stack was compiled without High-Speed support");
+		ret = -ENOTSUP;
+		goto add_configuration_exit;
+	}
+
 	if (speed == USBD_SPEED_HS &&
 	    usbd_caps_speed(uds_ctx) == USBD_SPEED_FS) {
 		LOG_ERR("Controller doesn't support HS");
diff --git a/subsys/usb/device_next/usbd_core.c b/subsys/usb/device_next/usbd_core.c
index 64c0a0ab654cd..9f24530fc2c2c 100644
--- a/subsys/usb/device_next/usbd_core.c
+++ b/subsys/usb/device_next/usbd_core.c
@@ -228,12 +228,14 @@ int usbd_device_shutdown_core(struct usbd_context *const uds_ctx)
 	struct usbd_config_node *cfg_nd;
 	int ret;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&uds_ctx->hs_configs, cfg_nd, node) {
-		uint8_t cfg_value = usbd_config_get_value(cfg_nd);
-
-		ret = usbd_class_remove_all(uds_ctx, USBD_SPEED_HS, cfg_value);
-		if (ret) {
-			LOG_ERR("Failed to cleanup registered classes, %d", ret);
+	if (USBD_SUPPORTS_HIGH_SPEED) {
+		SYS_SLIST_FOR_EACH_CONTAINER(&uds_ctx->hs_configs, cfg_nd, node) {
+			uint8_t cfg_value = usbd_config_get_value(cfg_nd);
+
+			ret = usbd_class_remove_all(uds_ctx, USBD_SPEED_HS, cfg_value);
+			if (ret) {
+				LOG_ERR("Failed to cleanup registered classes, %d", ret);
+			}
 		}
 	}
 
diff --git a/subsys/usb/device_next/usbd_device.c b/subsys/usb/device_next/usbd_device.c
index e43fdfc3df235..489497ee926e8 100644
--- a/subsys/usb/device_next/usbd_device.c
+++ b/subsys/usb/device_next/usbd_device.c
@@ -197,6 +197,13 @@ int usbd_wakeup_request(struct usbd_context *const uds_ctx)
 	return ret;
 }
 
+void usbd_self_powered(struct usbd_context *uds_ctx, const bool status)
+{
+	usbd_device_lock(uds_ctx);
+	uds_ctx->status.self_powered = status;
+	usbd_device_unlock(uds_ctx);
+}
+
 bool usbd_is_suspended(struct usbd_context *uds_ctx)
 {
 	return uds_ctx->status.suspended;
diff --git a/subsys/usb/device_next/usbd_device.h b/subsys/usb/device_next/usbd_device.h
index e2f0d98ab8b4e..8d29a19e6a9d9 100644
--- a/subsys/usb/device_next/usbd_device.h
+++ b/subsys/usb/device_next/usbd_device.h
@@ -45,7 +45,7 @@ static inline uint8_t usbd_get_num_configs(const struct usbd_context *const uds_
 
 	if (speed == USBD_SPEED_FS) {
 		desc = uds_ctx->fs_desc;
-	} else if (speed == USBD_SPEED_HS) {
+	} else if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		desc = uds_ctx->hs_desc;
 	} else {
 		return 0;
@@ -70,7 +70,7 @@ static inline void usbd_set_num_configs(struct usbd_context *const uds_ctx,
 
 	if (speed == USBD_SPEED_FS) {
 		desc = uds_ctx->fs_desc;
-	} else if (speed == USBD_SPEED_HS) {
+	} else if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		desc = uds_ctx->hs_desc;
 	} else {
 		return;
diff --git a/subsys/usb/device_next/usbd_init.c b/subsys/usb/device_next/usbd_init.c
index fc31c8a211a93..021fc8f2fca5a 100644
--- a/subsys/usb/device_next/usbd_init.c
+++ b/subsys/usb/device_next/usbd_init.c
@@ -281,18 +281,20 @@ int usbd_init_configurations(struct usbd_context *const uds_ctx)
 
 	usbd_init_update_fs_mps0(uds_ctx);
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&uds_ctx->hs_configs, cfg_nd, node) {
-		int ret;
+	if (USBD_SUPPORTS_HIGH_SPEED) {
+		SYS_SLIST_FOR_EACH_CONTAINER(&uds_ctx->hs_configs, cfg_nd, node) {
+			int ret;
 
-		ret = init_configuration(uds_ctx, USBD_SPEED_HS, cfg_nd);
-		if (ret) {
-			LOG_ERR("Failed to init HS configuration %u",
-				usbd_config_get_value(cfg_nd));
-			return ret;
-		}
+			ret = init_configuration(uds_ctx, USBD_SPEED_HS, cfg_nd);
+			if (ret) {
+				LOG_ERR("Failed to init HS configuration %u",
+					usbd_config_get_value(cfg_nd));
+				return ret;
+			}
 
-		LOG_INF("HS bNumConfigurations %u",
-			usbd_get_num_configs(uds_ctx, USBD_SPEED_HS));
+			LOG_INF("HS bNumConfigurations %u",
+				usbd_get_num_configs(uds_ctx, USBD_SPEED_HS));
+		}
 	}
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&uds_ctx->fs_configs, cfg_nd, node) {
diff --git a/subsys/usb/device_next/usbd_interface.c b/subsys/usb/device_next/usbd_interface.c
index c5d817acef194..9e94b9eb66106 100644
--- a/subsys/usb/device_next/usbd_interface.c
+++ b/subsys/usb/device_next/usbd_interface.c
@@ -184,9 +184,10 @@ int usbd_interface_set(struct usbd_context *const uds_ctx,
 	}
 
 	LOG_INF("Set Interfaces %u, alternate %u -> %u", iface, cur_alt, alt);
-	if (alt == cur_alt) {
-		return 0;
-	}
+	/*
+	 * Disable/enable endpoints even if the new alternate is the same as
+	 * the current one, forcing the endpoint to reset to defaults.
+	 */
 
 	/* Test if interface or interface alternate exist */
 	ret = usbd_interface_modify(uds_ctx, class, EP_OP_TEST, iface, alt);
diff --git a/subsys/usb/device_next/usbd_shell.c b/subsys/usb/device_next/usbd_shell.c
index 758094c7407f3..4597143e78b96 100644
--- a/subsys/usb/device_next/usbd_shell.c
+++ b/subsys/usb/device_next/usbd_shell.c
@@ -43,7 +43,7 @@ static struct usbd_shell_speed {
 USBD_DESC_LANG_DEFINE(lang);
 USBD_DESC_MANUFACTURER_DEFINE(mfr, "ZEPHYR");
 USBD_DESC_PRODUCT_DEFINE(product, "Zephyr USBD foobaz");
-USBD_DESC_SERIAL_NUMBER_DEFINE(sn);
+IF_ENABLED(CONFIG_HWINFO, (USBD_DESC_SERIAL_NUMBER_DEFINE(sn)));
 
 /* Default device descriptors and context used in the shell. */
 USBD_DEVICE_DEFINE(sh_uds_ctx, DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),
@@ -117,7 +117,9 @@ static int cmd_usbd_default_strings(const struct shell *sh,
 	err = usbd_add_descriptor(my_uds_ctx, &lang);
 	err |= usbd_add_descriptor(my_uds_ctx, &mfr);
 	err |= usbd_add_descriptor(my_uds_ctx, &product);
-	err |= usbd_add_descriptor(my_uds_ctx, &sn);
+	IF_ENABLED(CONFIG_HWINFO, (
+		err |= usbd_add_descriptor(my_uds_ctx, &sn);
+	))
 
 	if (err) {
 		shell_error(sh, "dev: Failed to add default string descriptors, %d", err);
@@ -145,7 +147,8 @@ static int register_classes(const struct shell *sh)
 		shell_print(sh, "dev: register FS %s", c_nd->c_data->name);
 	}
 
-	if (usbd_caps_speed(my_uds_ctx) != USBD_SPEED_HS) {
+	if (!USBD_SUPPORTS_HIGH_SPEED ||
+	    usbd_caps_speed(my_uds_ctx) != USBD_SPEED_HS) {
 		return 0;
 	}
 
diff --git a/subsys/usb/host/usbh_ch9.c b/subsys/usb/host/usbh_ch9.c
index 5091947b791c7..29b01ea162475 100644
--- a/subsys/usb/host/usbh_ch9.c
+++ b/subsys/usb/host/usbh_ch9.c
@@ -247,6 +247,30 @@ int usbh_req_clear_sfs_rwup(struct usb_device *const udev)
 			      NULL);
 }
 
+int usbh_req_set_sfs_halt(struct usb_device *const udev, const uint8_t ep)
+{
+	const uint8_t bmRequestType = USB_REQTYPE_RECIPIENT_ENDPOINT;
+	const uint8_t bRequest = USB_SREQ_SET_FEATURE;
+	const uint16_t wValue = USB_SFS_ENDPOINT_HALT;
+	const uint16_t wIndex = ep;
+
+	return usbh_req_setup(udev,
+			      bmRequestType, bRequest, wValue, wIndex, 0,
+			      NULL);
+}
+
+int usbh_req_clear_sfs_halt(struct usb_device *const udev, const uint8_t ep)
+{
+	const uint8_t bmRequestType = USB_REQTYPE_RECIPIENT_ENDPOINT;
+	const uint8_t bRequest = USB_SREQ_CLEAR_FEATURE;
+	const uint16_t wValue = USB_SFS_ENDPOINT_HALT;
+	const uint16_t wIndex = ep;
+
+	return usbh_req_setup(udev,
+			      bmRequestType, bRequest, wValue, wIndex, 0,
+			      NULL);
+}
+
 int usbh_req_set_hcfs_ppwr(struct usb_device *const udev,
 			   const uint8_t port)
 {
diff --git a/subsys/usb/host/usbh_ch9.h b/subsys/usb/host/usbh_ch9.h
index ff7f49bc96ba0..9e585c8dab60a 100644
--- a/subsys/usb/host/usbh_ch9.h
+++ b/subsys/usb/host/usbh_ch9.h
@@ -52,6 +52,10 @@ int usbh_req_set_sfs_rwup(struct usb_device *const udev);
 
 int usbh_req_clear_sfs_rwup(struct usb_device *const udev);
 
+int usbh_req_set_sfs_halt(struct usb_device *const udev, const uint8_t ep);
+
+int usbh_req_clear_sfs_halt(struct usb_device *const udev, const uint8_t ep);
+
 int usbh_req_set_hcfs_ppwr(const struct usb_device *udev,
 			   const uint8_t port);
 
diff --git a/subsys/usb/host/usbh_device.c b/subsys/usb/host/usbh_device.c
index 9248bdb008ea8..13a2a81ccd2c1 100644
--- a/subsys/usb/host/usbh_device.c
+++ b/subsys/usb/host/usbh_device.c
@@ -58,6 +58,19 @@ struct usb_device *usbh_device_get_any(struct usbh_contex *const uhs_ctx)
 	return udev;
 }
 
+struct usb_device *usbh_device_get(struct usbh_contex *const uhs_ctx, const uint8_t addr)
+{
+	struct usb_device *udev;
+
+	SYS_DLIST_FOR_EACH_CONTAINER(&uhs_ctx->udevs, udev, node) {
+		if (addr == udev->addr) {
+			return udev;
+		}
+	}
+
+	return NULL;
+}
+
 static int validate_device_mps0(const struct usb_device *const udev)
 {
 	const uint8_t mps0 = udev->dev_desc.bMaxPacketSize0;
diff --git a/subsys/usb/host/usbh_device.h b/subsys/usb/host/usbh_device.h
index ec50e3fe94df0..19613bda3bfa4 100644
--- a/subsys/usb/host/usbh_device.h
+++ b/subsys/usb/host/usbh_device.h
@@ -22,6 +22,8 @@ typedef int (*usbh_udev_cb_t)(struct usb_device *const udev,
  */
 struct usb_device *usbh_device_get_any(struct usbh_contex *const ctx);
 
+struct usb_device *usbh_device_get(struct usbh_contex *const uhs_ctx, const uint8_t addr);
+
 /* Allocate/free USB device */
 struct usb_device *usbh_device_alloc(struct usbh_contex *const uhs_ctx);
 void usbh_device_free(struct usb_device *const udev);
diff --git a/subsys/usb/host/usbh_shell.c b/subsys/usb/host/usbh_shell.c
index c151daa27b2ff..2832e644d081c 100644
--- a/subsys/usb/host/usbh_shell.c
+++ b/subsys/usb/host/usbh_shell.c
@@ -22,7 +22,6 @@ LOG_MODULE_REGISTER(usbh_shell, CONFIG_USBH_LOG_LEVEL);
 #define FOOBAZ_VREQ_IN		0x5c
 
 USBH_CONTROLLER_DEFINE(uhs_ctx, DEVICE_DT_GET(DT_NODELABEL(zephyr_uhc0)));
-static struct usb_device *udev;
 static uint8_t vreq_test_buf[1024];
 
 static void print_dev_desc(const struct shell *sh,
@@ -78,14 +77,23 @@ static int bulk_req_cb(struct usb_device *const dev, struct uhc_transfer *const
 
 static int cmd_bulk(const struct shell *sh, size_t argc, char **argv)
 {
+	static struct usb_device *udev;
 	struct uhc_transfer *xfer;
 	struct net_buf *buf;
+	uint8_t addr;
 	uint8_t ep;
 	size_t len;
 	int ret;
 
-	ep = strtol(argv[1], NULL, 16);
-	len = MIN(sizeof(vreq_test_buf), strtol(argv[2], NULL, 10));
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	ep = strtol(argv[2], NULL, 16);
+	len = MIN(sizeof(vreq_test_buf), strtol(argv[3], NULL, 10));
 
 	xfer = usbh_xfer_alloc(udev, ep, bulk_req_cb, NULL);
 	if (!xfer) {
@@ -135,12 +143,21 @@ static int cmd_vendor_in(const struct shell *sh,
 	const uint8_t bmRequestType = (USB_REQTYPE_DIR_TO_HOST << 7) |
 				      (USB_REQTYPE_TYPE_VENDOR << 5);
 	const uint8_t bRequest = FOOBAZ_VREQ_IN;
+	static struct usb_device *udev;
 	const uint16_t wValue = 0x0000;
 	struct net_buf *buf;
 	uint16_t wLength;
+	uint8_t addr;
 	int ret;
 
-	wLength = MIN(sizeof(vreq_test_buf), strtol(argv[1], NULL, 10));
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	wLength = MIN(sizeof(vreq_test_buf), strtol(argv[2], NULL, 10));
 	buf = usbh_xfer_buf_alloc(udev, wLength);
 	if (!buf) {
 		shell_print(sh, "host: Failed to allocate buffer");
@@ -163,12 +180,21 @@ static int cmd_vendor_out(const struct shell *sh,
 	const uint8_t bmRequestType = (USB_REQTYPE_DIR_TO_DEVICE << 7) |
 				      (USB_REQTYPE_TYPE_VENDOR << 5);
 	const uint8_t bRequest = FOOBAZ_VREQ_OUT;
+	static struct usb_device *udev;
 	const uint16_t wValue = 0x0000;
 	struct net_buf *buf;
 	uint16_t wLength;
+	uint8_t addr;
 	int ret;
 
-	wLength = MIN(sizeof(vreq_test_buf), strtol(argv[1], NULL, 10));
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	wLength = MIN(sizeof(vreq_test_buf), strtol(argv[2], NULL, 10));
 	buf = usbh_xfer_buf_alloc(udev, wLength);
 	if (!buf) {
 		shell_print(sh, "host: Failed to allocate buffer");
@@ -186,8 +212,18 @@ static int cmd_desc_device(const struct shell *sh,
 			   size_t argc, char **argv)
 {
 	struct usb_device_descriptor desc;
+	static struct usb_device *udev;
+	uint8_t addr;
 	int err;
 
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	shell_error(sh, "host: USB device with address %u", addr);
 	err = usbh_req_desc_dev(udev, sizeof(desc), &desc);
 	if (err) {
 		shell_print(sh, "host: Failed to request device descriptor");
@@ -202,10 +238,19 @@ static int cmd_desc_config(const struct shell *sh,
 			   size_t argc, char **argv)
 {
 	struct usb_cfg_descriptor desc;
+	static struct usb_device *udev;
+	uint8_t addr;
 	uint8_t cfg;
 	int err;
 
-	cfg = strtol(argv[1], NULL, 10);
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	cfg = strtol(argv[2], NULL, 10);
 
 	err = usbh_req_desc_cfg(udev, cfg, sizeof(desc), &desc);
 	if (err) {
@@ -221,13 +266,22 @@ static int cmd_desc_string(const struct shell *sh,
 			   size_t argc, char **argv)
 {
 	const uint8_t type = USB_DESC_STRING;
+	static struct usb_device *udev;
 	struct net_buf *buf;
+	uint8_t addr;
 	uint8_t id;
 	uint8_t idx;
 	int err;
 
-	id = strtol(argv[1], NULL, 10);
-	idx = strtol(argv[2], NULL, 10);
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	id = strtol(argv[2], NULL, 10);
+	idx = strtol(argv[3], NULL, 10);
 
 	buf = usbh_xfer_buf_alloc(udev, 128);
 	if (!buf) {
@@ -246,16 +300,52 @@ static int cmd_desc_string(const struct shell *sh,
 	return err;
 }
 
+static int cmd_feature_clear_halt(const struct shell *sh,
+				  size_t argc, char **argv)
+{
+	static struct usb_device *udev;
+	uint8_t addr;
+	uint8_t ep;
+	int err;
+
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	ep = strtol(argv[2], NULL, 16);
+
+	err = usbh_req_clear_sfs_halt(udev, ep);
+	if (err) {
+		shell_error(sh, "host: Failed to clear halt feature");
+	} else {
+		shell_print(sh, "host: Device 0x%02x, ep 0x%02x halt feature cleared",
+			    udev->addr, ep);
+	}
+
+	return err;
+}
+
 static int cmd_feature_set_halt(const struct shell *sh,
 				size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t addr;
 	uint8_t ep;
 	int err;
 
-	ep = strtol(argv[1], NULL, 16);
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	ep = strtol(argv[2], NULL, 16);
 
-	/* TODO: add usbh_req_set_sfs_halt(&uhs_ctx, NULL, 0); */
-	err = usbh_req_set_sfs_rwup(udev);
+	err = usbh_req_set_sfs_halt(udev, ep);
 	if (err) {
 		shell_error(sh, "host: Failed to set halt feature");
 	} else {
@@ -269,8 +359,17 @@ static int cmd_feature_set_halt(const struct shell *sh,
 static int cmd_feature_clear_rwup(const struct shell *sh,
 				  size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t addr;
 	int err;
 
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
 	err = usbh_req_clear_sfs_rwup(udev);
 	if (err) {
 		shell_error(sh, "host: Failed to clear rwup feature");
@@ -284,8 +383,17 @@ static int cmd_feature_clear_rwup(const struct shell *sh,
 static int cmd_feature_set_rwup(const struct shell *sh,
 				size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t addr;
 	int err;
 
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
 	err = usbh_req_set_sfs_rwup(udev);
 	if (err) {
 		shell_error(sh, "host: Failed to set rwup feature");
@@ -299,10 +407,19 @@ static int cmd_feature_set_rwup(const struct shell *sh,
 static int cmd_feature_set_ppwr(const struct shell *sh,
 				size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t addr;
 	uint8_t port;
 	int err;
 
-	port = strtol(argv[1], NULL, 10);
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	port = strtol(argv[2], NULL, 10);
 
 	err = usbh_req_set_hcfs_ppwr(udev, port);
 	if (err) {
@@ -318,10 +435,19 @@ static int cmd_feature_set_ppwr(const struct shell *sh,
 static int cmd_feature_set_prst(const struct shell *sh,
 				size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t addr;
 	uint8_t port;
 	int err;
 
-	port = strtol(argv[1], NULL, 10);
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	port = strtol(argv[2], NULL, 10);
 
 	err = usbh_req_set_hcfs_prst(udev, port);
 	if (err) {
@@ -337,10 +463,19 @@ static int cmd_feature_set_prst(const struct shell *sh,
 static int cmd_config_set(const struct shell *sh,
 			  size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t addr;
 	uint8_t cfg;
 	int err;
 
-	cfg = strtol(argv[1], NULL, 10);
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	cfg = strtol(argv[2], NULL, 10);
 
 	err = usbh_req_set_cfg(udev, cfg);
 	if (err) {
@@ -356,9 +491,18 @@ static int cmd_config_set(const struct shell *sh,
 static int cmd_config_get(const struct shell *sh,
 			  size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t addr;
 	uint8_t cfg;
 	int err;
 
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
 	err = usbh_req_get_cfg(udev, &cfg);
 	if (err) {
 		shell_error(sh, "host: Failed to set configuration");
@@ -373,12 +517,21 @@ static int cmd_config_get(const struct shell *sh,
 static int cmd_device_interface(const struct shell *sh,
 				size_t argc, char **argv)
 {
+	static struct usb_device *udev;
 	uint8_t iface;
+	uint8_t addr;
 	uint8_t alt;
 	int err;
 
-	iface = strtol(argv[1], NULL, 10);
-	alt = strtol(argv[2], NULL, 10);
+	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	iface = strtol(argv[2], NULL, 10);
+	alt = strtol(argv[3], NULL, 10);
 
 	err = usbh_req_set_alt(udev, iface, alt);
 	if (err) {
@@ -394,21 +547,42 @@ static int cmd_device_interface(const struct shell *sh,
 static int cmd_device_address(const struct shell *sh,
 			      size_t argc, char **argv)
 {
+	static struct usb_device *udev;
+	uint8_t new_addr;
 	uint8_t addr;
 	int err;
 
 	addr = strtol(argv[1], NULL, 10);
+	udev = usbh_device_get(&uhs_ctx, addr);
+	if (udev == NULL) {
+		shell_error(sh, "host: No USB device with address %u", addr);
+		return -ENOMEM;
+	}
+
+	new_addr = strtol(argv[2], NULL, 10);
 
-	err = usbh_req_set_address(udev, addr);
+	err = usbh_req_set_address(udev, new_addr);
 	if (err) {
 		shell_error(sh, "host: Failed to set address");
 	} else {
-		shell_print(sh, "host: New device address is 0x%02x", addr);
+		shell_print(sh, "host: New device address is %u", new_addr);
 	}
 
 	return err;
 }
 
+static int cmd_device_list(const struct shell *sh,
+			   size_t argc, char **argv)
+{
+	struct usb_device *udev;
+
+	SYS_DLIST_FOR_EACH_CONTAINER(&uhs_ctx.udevs, udev, node) {
+		shell_print(sh, "%u", udev->addr);
+	}
+
+	return 0;
+}
+
 static int cmd_bus_suspend(const struct shell *sh,
 			   size_t argc, char **argv)
 {
@@ -469,8 +643,6 @@ static int cmd_usbh_init(const struct shell *sh,
 {
 	int err;
 
-	udev = usbh_device_get_any(&uhs_ctx);
-
 	err = usbh_init(&uhs_ctx);
 	if (err == -EALREADY) {
 		shell_error(sh, "host: USB host already initialized");
@@ -514,62 +686,64 @@ static int cmd_usbh_disable(const struct shell *sh,
 }
 
 SHELL_STATIC_SUBCMD_SET_CREATE(desc_cmds,
-	SHELL_CMD_ARG(device, NULL, NULL,
-		      cmd_desc_device, 1, 0),
-	SHELL_CMD_ARG(configuration, NULL, "<index>",
-		      cmd_desc_config, 2, 0),
-	SHELL_CMD_ARG(string, NULL, "<id> <index>",
-		      cmd_desc_string, 3, 0),
+	SHELL_CMD_ARG(device, NULL, "<addr>",
+		      cmd_desc_device, 2, 0),
+	SHELL_CMD_ARG(configuration, NULL, "<addr> <index>",
+		      cmd_desc_config, 3, 0),
+	SHELL_CMD_ARG(string, NULL, "<addr> <id> <index>",
+		      cmd_desc_string, 4, 0),
 	SHELL_SUBCMD_SET_END
 );
 
 SHELL_STATIC_SUBCMD_SET_CREATE(feature_set_cmds,
-	SHELL_CMD_ARG(rwup, NULL, NULL,
-		      cmd_feature_set_rwup, 1, 0),
-	SHELL_CMD_ARG(ppwr, NULL, "<port>",
-		      cmd_feature_set_ppwr, 2, 0),
-	SHELL_CMD_ARG(prst, NULL, "<port>",
-		      cmd_feature_set_prst, 2, 0),
-	SHELL_CMD_ARG(halt, NULL, "<endpoint>",
-		      cmd_feature_set_halt, 2, 0),
+	SHELL_CMD_ARG(rwup, NULL, "<addr>",
+		      cmd_feature_set_rwup, 2, 0),
+	SHELL_CMD_ARG(ppwr, NULL, "<addr> <port>",
+		      cmd_feature_set_ppwr, 3, 0),
+	SHELL_CMD_ARG(prst, NULL, "<addr> <port>",
+		      cmd_feature_set_prst, 3, 0),
+	SHELL_CMD_ARG(halt, NULL, "<addr> <endpoint>",
+		      cmd_feature_set_halt, 3, 0),
 	SHELL_SUBCMD_SET_END
 );
 
 SHELL_STATIC_SUBCMD_SET_CREATE(feature_clear_cmds,
-	SHELL_CMD_ARG(rwup, NULL, NULL,
-		      cmd_feature_clear_rwup, 1, 0),
-	SHELL_CMD_ARG(halt, NULL, "<endpoint>",
-		      cmd_feature_set_halt, 2, 0),
+	SHELL_CMD_ARG(rwup, NULL, "<addr>",
+		      cmd_feature_clear_rwup, 2, 0),
+	SHELL_CMD_ARG(halt, NULL, "<addr> <endpoint>",
+		      cmd_feature_clear_halt, 3, 0),
 	SHELL_SUBCMD_SET_END
 );
 
 SHELL_STATIC_SUBCMD_SET_CREATE(config_cmds,
-	SHELL_CMD_ARG(get, NULL, NULL,
-		      cmd_config_get, 1, 0),
-	SHELL_CMD_ARG(set, NULL, "<configuration>",
-		      cmd_config_set, 2, 0),
+	SHELL_CMD_ARG(get, NULL, "<addr>",
+		      cmd_config_get, 2, 0),
+	SHELL_CMD_ARG(set, NULL, "<addr> <configuration>",
+		      cmd_config_set, 3, 0),
 	SHELL_SUBCMD_SET_END
 );
 
 SHELL_STATIC_SUBCMD_SET_CREATE(device_cmds,
-	SHELL_CMD_ARG(address, NULL, "<address>",
-		      cmd_device_address, 2, 0),
+	SHELL_CMD_ARG(list, NULL, NULL,
+		      cmd_device_list, 1, 0),
+	SHELL_CMD_ARG(address, NULL, "<address> <new address>",
+		      cmd_device_address, 3, 0),
 	SHELL_CMD_ARG(config, &config_cmds, "get|set configuration",
-		      NULL, 1, 0),
-	SHELL_CMD_ARG(interface, NULL, "<interface> <alternate>",
-		      cmd_device_interface, 3, 0),
+		      NULL, 2, 0),
+	SHELL_CMD_ARG(interface, NULL, "<address> <interface> <alternate>",
+		      cmd_device_interface, 4, 0),
 	SHELL_CMD_ARG(descriptor, &desc_cmds, "descriptor request",
-		      NULL, 1, 0),
+		      NULL, 2, 0),
 	SHELL_CMD_ARG(feature-set, &feature_set_cmds, "feature selector",
-		      NULL, 1, 0),
+		      NULL, 2, 0),
 	SHELL_CMD_ARG(feature-clear, &feature_clear_cmds, "feature selector",
-		      NULL, 1, 0),
-	SHELL_CMD_ARG(vendor_in, NULL, "<length>",
-		      cmd_vendor_in, 2, 0),
-	SHELL_CMD_ARG(vendor_out, NULL, "<length>",
-		      cmd_vendor_out, 2, 0),
-	SHELL_CMD_ARG(bulk, NULL, "<endpoint> <length>",
-		      cmd_bulk, 3, 0),
+		      NULL, 2, 0),
+	SHELL_CMD_ARG(vendor_in, NULL, "<address> <length>",
+		      cmd_vendor_in, 3, 0),
+	SHELL_CMD_ARG(vendor_out, NULL, "<address> <length>",
+		      cmd_vendor_out, 3, 0),
+	SHELL_CMD_ARG(bulk, NULL, "<address> <endpoint> <length>",
+		      cmd_bulk, 4, 0),
 	SHELL_SUBCMD_SET_END
 );
 
diff --git a/subsys/zbus/zbus_runtime_observers.c b/subsys/zbus/zbus_runtime_observers.c
index 56c7cbb45301b..41c00c9aae7fd 100644
--- a/subsys/zbus/zbus_runtime_observers.c
+++ b/subsys/zbus/zbus_runtime_observers.c
@@ -9,7 +9,7 @@
 LOG_MODULE_DECLARE(zbus, CONFIG_ZBUS_LOG_LEVEL);
 
 int zbus_chan_add_obs(const struct zbus_channel *chan, const struct zbus_observer *obs,
-		      k_timeout_t timeout)
+		      struct zbus_observer_node *node, k_timeout_t timeout)
 {
 	int err;
 	struct zbus_observer_node *obs_nd, *tmp;
@@ -18,6 +18,7 @@ int zbus_chan_add_obs(const struct zbus_channel *chan, const struct zbus_observe
 	_ZBUS_ASSERT(!k_is_in_isr(), "ISR blocked");
 	_ZBUS_ASSERT(chan != NULL, "chan is required");
 	_ZBUS_ASSERT(obs != NULL, "obs is required");
+	_ZBUS_ASSERT(node != NULL, "node is required");
 
 	err = k_sem_take(&chan->data->sem, timeout);
 	if (err) {
@@ -46,19 +47,9 @@ int zbus_chan_add_obs(const struct zbus_channel *chan, const struct zbus_observe
 		}
 	}
 
-	struct zbus_observer_node *new_obs_nd = k_malloc(sizeof(struct zbus_observer_node));
+	node->obs = obs;
 
-	if (new_obs_nd == NULL) {
-		LOG_ERR("Could not allocate observer node the heap is full!");
-
-		k_sem_give(&chan->data->sem);
-
-		return -ENOMEM;
-	}
-
-	new_obs_nd->obs = obs;
-
-	sys_slist_append(&chan->data->observers, &new_obs_nd->node);
+	sys_slist_append(&chan->data->observers, &node->node);
 
 	k_sem_give(&chan->data->sem);
 
@@ -85,8 +76,6 @@ int zbus_chan_rm_obs(const struct zbus_channel *chan, const struct zbus_observer
 		if (obs_nd->obs == obs) {
 			sys_slist_remove(&chan->data->observers, &prev_obs_nd->node, &obs_nd->node);
 
-			k_free(obs_nd);
-
 			k_sem_give(&chan->data->sem);
 
 			return 0;
diff --git a/tests/application_development/code_relocation/CMakeLists.txt b/tests/application_development/code_relocation/CMakeLists.txt
index 60350a6e2a51e..c58b9522e1efc 100644
--- a/tests/application_development/code_relocation/CMakeLists.txt
+++ b/tests/application_development/code_relocation/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 # Code relocation feature
 zephyr_code_relocate(FILES src/test_file1.c ${SRAM2_PHDR} LOCATION SRAM2)
 
-zephyr_code_relocate(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/test_file2.c ${RAM_PHDR} LOCATION RAM)
+zephyr_code_relocate(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/test_file2.c ${RAM_PHDR} LOCATION RAM FILTER ".*sram")
 
 # Add custom library that we can relocate code for
 add_subdirectory(test_lib)
diff --git a/tests/application_development/code_relocation/src/test_file1.c b/tests/application_development/code_relocation/src/test_file1.c
index 1e1cbafb54f96..426f0ac56e6d6 100644
--- a/tests/application_development/code_relocation/src/test_file1.c
+++ b/tests/application_development/code_relocation/src/test_file1.c
@@ -23,12 +23,15 @@ __in_section(rodata, sram2, var) const uint32_t var_sram2_rodata = 100U;
 __in_section(custom_section, static, var) uint32_t var_custom_data = 1U;
 
 extern void function_in_sram(int32_t value);
+extern void function_not_relocated(int32_t value);
 void function_in_custom_section(void);
 
 #define HAS_SRAM2_DATA_SECTION (CONFIG_ARM)
 
 ZTEST(code_relocation, test_function_in_sram2)
 {
+	extern uintptr_t __ram_text_reloc_start;
+	extern uintptr_t __ram_text_reloc_end;
 	extern uintptr_t __sram2_text_reloc_start;
 	extern uintptr_t __sram2_text_reloc_end;
 	extern uintptr_t __sram2_data_reloc_start;
@@ -64,7 +67,20 @@ ZTEST(code_relocation, test_function_in_sram2)
 		"var_sram2_bss not in sram2_bss region");
 
 	/* Print values from sram */
+	printk("Address of function_in_sram %p\n", &function_in_sram);
+	zassert_between_inclusive((uintptr_t)&function_in_sram,
+		(uintptr_t)&__ram_text_reloc_start,
+		(uintptr_t)&__ram_text_reloc_end,
+		"function_in_sram is not in ram region");
 	function_in_sram(var_sram2_data);
+
+	/* Print values from non-relocated function */
+	printk("Address of function_not_relocated %p\n", &function_not_relocated);
+	zassert_between_inclusive((uintptr_t)&function_not_relocated,
+		(uintptr_t)&__text_region_start,
+		(uintptr_t)&__text_region_end,
+		"function_not_relocated is not in flash region");
+	function_not_relocated(var_sram2_data);
 	/* Call library function */
 	relocated_library();
 
diff --git a/tests/application_development/code_relocation/src/test_file2.c b/tests/application_development/code_relocation/src/test_file2.c
index d8b56730d39e5..9deccc3a42f9b 100644
--- a/tests/application_development/code_relocation/src/test_file2.c
+++ b/tests/application_development/code_relocation/src/test_file2.c
@@ -19,3 +19,14 @@ void function_in_sram(int32_t value)
 	printk("Address of memcpy %p\n\n", &memcpy);
 	zassert_mem_equal(src, dst, 8, "memcpy compare error");
 }
+
+void function_not_relocated(int32_t value)
+{
+	char src[8] = "data\n";
+	char dst[8];
+
+	printk("Hello World! %s\n", CONFIG_BOARD);
+	memcpy(dst, src, 8);
+	printk("Address of memcpy %p\n\n", &memcpy);
+	zassert_mem_equal(src, dst, 8, "memcpy compare error");
+}
diff --git a/tests/application_development/code_relocation/testcase.yaml b/tests/application_development/code_relocation/testcase.yaml
index 4ed3b9210e53a..99ca2107abf35 100644
--- a/tests/application_development/code_relocation/testcase.yaml
+++ b/tests/application_development/code_relocation/testcase.yaml
@@ -1,7 +1,7 @@
 common:
   tags: linker
 tests:
-  application_development.code_relocation:
+  buildsystem.app_dev.code_relocation:
     filter: not CONFIG_CPU_HAS_NXP_SYSMPU and CONFIG_MINIMAL_LIBC and
             dt_chosen_enabled("zephyr,itcm")
     arch_allow: arm
@@ -9,14 +9,14 @@ tests:
       - CONFIG_RELOCATE_TO_ITCM=y
     platform_allow:
       - mimxrt1060_evk/mimxrt1062/qspi
-  application_development.code_relocation_kinetis:
+  buildsystem.app_dev.code_relocation_kinetis:
     filter: CONFIG_CPU_HAS_NXP_SYSMPU
     arch_allow: arm
     extra_configs:
       - CONFIG_MPU_ALLOW_FLASH_WRITE=y
     platform_allow:
       - frdm_k64f
-  application_development.code_relocation.no_itcm:
+  buildsystem.app_dev.code_relocation.no_itcm:
     filter: not CONFIG_CPU_HAS_NXP_SYSMPU and not dt_chosen_enabled("zephyr,itcm")
     arch_allow: arm
     extra_sections:
@@ -31,11 +31,11 @@ tests:
       - sam_e70_xplained/same70q21
     integration_platforms:
       - qemu_cortex_m3
-  application_development.code_relocation.riscv:
+  buildsystem.app_dev.code_relocation.riscv:
     extra_args: CONF_FILE="prj_riscv.conf"
     platform_allow:
       - qemu_riscv32
       - qemu_riscv64
-  application_development.code_relocation.xtensa:
+  buildsystem.app_dev.code_relocation.xtensa:
     extra_args: CONF_FILE="prj_xtensa.conf"
     platform_allow: qemu_xtensa/dc233c
diff --git a/tests/application_development/software_bill_of_materials/testcase.yaml b/tests/application_development/software_bill_of_materials/testcase.yaml
index 75a2247ce5112..8436b69fdbe97 100644
--- a/tests/application_development/software_bill_of_materials/testcase.yaml
+++ b/tests/application_development/software_bill_of_materials/testcase.yaml
@@ -5,4 +5,4 @@ common:
     - native_sim
   harness: ctest
 tests:
-  sbom.spdx: {}
+  buildsystem.sbom.spdx: {}
diff --git a/tests/arch/arm/arm_custom_interrupt/testcase.yaml b/tests/arch/arm/arm_custom_interrupt/testcase.yaml
index d20f87e17ae11..d4caae91d58ce 100644
--- a/tests/arch/arm/arm_custom_interrupt/testcase.yaml
+++ b/tests/arch/arm/arm_custom_interrupt/testcase.yaml
@@ -8,3 +8,6 @@ common:
 tests:
   arch.arm.custom_interrupt:
     filter: not CONFIG_TRUSTED_EXECUTION_NONSECURE
+    platform_exclude:
+      - imx95_evk/mimx9596/m7
+      - imx95_evk/mimx9596/m7/ddr
diff --git a/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c b/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
index d7b4b509f1721..5ad830dabcbd4 100644
--- a/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
+++ b/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
@@ -25,8 +25,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *pEsf)
 	}
 
 	if (reason != expected_reason) {
-		printk("Wrong crash type got %d expected %d\n", reason,
-			expected_reason);
+		printk("Wrong crash type got %d expected %d\n", reason, expected_reason);
 		k_fatal_halt(reason);
 	}
 
@@ -39,8 +38,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *pEsf)
 		 * inside the current runtime error
 		 */
 		expected_reason = K_ERR_KERNEL_PANIC;
-		__ASSERT(0,
-		"Assert occurring inside kernel panic");
+		__ASSERT(0, "Assert occurring inside kernel panic");
 	}
 
 	expected_reason = -1;
diff --git a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
index 425816c5c9869..dce39ede938ab 100644
--- a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
+++ b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
@@ -19,7 +19,7 @@ static volatile uint32_t expected_msp;
 static K_THREAD_STACK_DEFINE(esf_collection_stack, 2048);
 static struct k_thread esf_collection_thread;
 #define MAIN_PRIORITY 7
-#define PRIORITY 5
+#define PRIORITY      5
 
 /**
  * Validates that pEsf matches state from set_regs_with_known_pattern()
@@ -28,11 +28,8 @@ static int check_esf_matches_expectations(const struct arch_esf *pEsf)
 {
 	const uint16_t expected_fault_instruction = 0xde5a; /* udf #90 */
 	const bool caller_regs_match_expected =
-		(pEsf->basic.r0 == 0) &&
-		(pEsf->basic.r1 == 1) &&
-		(pEsf->basic.r2 == 2) &&
-		(pEsf->basic.r3 == 3) &&
-		(pEsf->basic.lr == 15) &&
+		(pEsf->basic.r0 == 0) && (pEsf->basic.r1 == 1) && (pEsf->basic.r2 == 2) &&
+		(pEsf->basic.r3 == 3) && (pEsf->basic.lr == 15) &&
 		(*(uint16_t *)pEsf->basic.pc == expected_fault_instruction);
 	if (!caller_regs_match_expected) {
 		printk("__basic_sf member of ESF is incorrect\n");
@@ -42,14 +39,10 @@ static int check_esf_matches_expectations(const struct arch_esf *pEsf)
 #if defined(CONFIG_EXTRA_EXCEPTION_INFO)
 	const struct _callee_saved *callee_regs = pEsf->extra_info.callee;
 	const bool callee_regs_match_expected =
-		(callee_regs->v1 /* r4 */ == 4) &&
-		(callee_regs->v2 /* r5 */ == 5) &&
-		(callee_regs->v3 /* r6 */ == 6) &&
-		(callee_regs->v4 /* r7 */ == 7) &&
-		(callee_regs->v5 /* r8 */ == 8) &&
-		(callee_regs->v6 /* r9 */ == 9) &&
-		(callee_regs->v7 /* r10 */ == 10) &&
-		(callee_regs->v8 /* r11 */ == 11);
+		(callee_regs->v1 /* r4 */ == 4) && (callee_regs->v2 /* r5 */ == 5) &&
+		(callee_regs->v3 /* r6 */ == 6) && (callee_regs->v4 /* r7 */ == 7) &&
+		(callee_regs->v5 /* r8 */ == 8) && (callee_regs->v6 /* r9 */ == 9) &&
+		(callee_regs->v7 /* r10 */ == 10) && (callee_regs->v8 /* r11 */ == 11);
 	if (!callee_regs_match_expected) {
 		printk("_callee_saved_t member of ESF is incorrect\n");
 		return -1;
@@ -62,10 +55,8 @@ static int check_esf_matches_expectations(const struct arch_esf *pEsf)
 	 */
 	const uint32_t exc_bits_set_mask = 0xff00000C;
 
-	if ((pEsf->extra_info.exc_return & exc_bits_set_mask) !=
-		exc_bits_set_mask) {
-		printk("Incorrect EXC_RETURN of 0x%08x",
-			pEsf->extra_info.exc_return);
+	if ((pEsf->extra_info.exc_return & exc_bits_set_mask) != exc_bits_set_mask) {
+		printk("Incorrect EXC_RETURN of 0x%08x", pEsf->extra_info.exc_return);
 		return -1;
 	}
 
@@ -73,15 +64,13 @@ static int check_esf_matches_expectations(const struct arch_esf *pEsf)
 	 * to the xpsr. (the xpsr value in the copy used for pEsf
 	 * is overwritten in fault.c)
 	 */
-	if (memcmp((void *)callee_regs->psp, pEsf,
-		offsetof(struct arch_esf, basic.xpsr)) != 0) {
+	if (memcmp((void *)callee_regs->psp, pEsf, offsetof(struct arch_esf, basic.xpsr)) != 0) {
 		printk("psp does not match __basic_sf provided\n");
 		return -1;
 	}
 
 	if (pEsf->extra_info.msp != expected_msp) {
-		printk("MSP is 0x%08x but should be 0x%08x",
-			pEsf->extra_info.msp, expected_msp);
+		printk("MSP is 0x%08x but should be 0x%08x", pEsf->extra_info.msp, expected_msp);
 		return -1;
 	}
 #endif /* CONFIG_EXTRA_EXCEPTION_INFO */
@@ -98,8 +87,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *pEsf)
 	}
 
 	if (reason != expected_reason) {
-		printk("Wrong crash type got %d expected %d\n", reason,
-			expected_reason);
+		printk("Wrong crash type got %d expected %d\n", reason, expected_reason);
 		k_fatal_halt(reason);
 	}
 
@@ -131,29 +119,27 @@ void set_regs_with_known_pattern(void *p1, void *p2, void *p3)
 	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
-	__asm__ volatile(
-		"mov r1, #1\n"
-		"mov r2, #2\n"
-		"mov r3, #3\n"
-		"mov r4, #4\n"
-		"mov r5, #5\n"
-		"mov r6, #6\n"
-		"mov r7, #7\n"
-		"mov r0, #8\n"
-		"mov r8, r0\n"
-		"add r0, r0, #1\n"
-		"mov r9, r0\n"
-		"add r0, r0, #1\n"
-		"mov r10, r0\n"
-		"add r0, r0, #1\n"
-		"mov r11, r0\n"
-		"add r0, r0, #1\n"
-		"mov r12, r0\n"
-		"add r0, r0, #3\n"
-		"mov lr, r0\n"
-		"mov r0, #0\n"
-		"udf #90\n"
-	);
+	__asm__ volatile("mov r1, #1\n"
+			 "mov r2, #2\n"
+			 "mov r3, #3\n"
+			 "mov r4, #4\n"
+			 "mov r5, #5\n"
+			 "mov r6, #6\n"
+			 "mov r7, #7\n"
+			 "mov r0, #8\n"
+			 "mov r8, r0\n"
+			 "add r0, r0, #1\n"
+			 "mov r9, r0\n"
+			 "add r0, r0, #1\n"
+			 "mov r10, r0\n"
+			 "add r0, r0, #1\n"
+			 "mov r11, r0\n"
+			 "add r0, r0, #1\n"
+			 "mov r12, r0\n"
+			 "add r0, r0, #3\n"
+			 "mov lr, r0\n"
+			 "mov r0, #0\n"
+			 "udf #90\n");
 }
 
 ZTEST(arm_interrupt, test_arm_esf_collection)
@@ -181,23 +167,19 @@ ZTEST(arm_interrupt, test_arm_esf_collection)
 
 	TC_PRINT("Testing ESF Reporting\n");
 	k_thread_create(&esf_collection_thread, esf_collection_stack,
-			K_THREAD_STACK_SIZEOF(esf_collection_stack),
-			set_regs_with_known_pattern,
-			NULL, NULL, NULL, K_PRIO_COOP(PRIORITY), 0,
-			K_NO_WAIT);
+			K_THREAD_STACK_SIZEOF(esf_collection_stack), set_regs_with_known_pattern,
+			NULL, NULL, NULL, K_PRIO_COOP(PRIORITY), 0, K_NO_WAIT);
 
 	test_validation_rv = esf_validation_rv;
 
-	zassert_not_equal(test_validation_rv, TC_FAIL,
-		"ESF fault collection failed");
+	zassert_not_equal(test_validation_rv, TC_FAIL, "ESF fault collection failed");
 }
 
 void arm_isr_handler(const void *args)
 {
 	ARG_UNUSED(args);
 
-#if defined(CONFIG_CPU_CORTEX_M) && defined(CONFIG_FPU) && \
-	defined(CONFIG_FPU_SHARING)
+#if defined(CONFIG_CPU_CORTEX_M) && defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	/* Clear Floating Point Status and Control Register (FPSCR),
 	 * to prevent from having the interrupt line set to pending again,
 	 * in case FPU IRQ is selected by the test as "Available IRQ line"
@@ -235,8 +217,7 @@ void arm_isr_handler(const void *args)
 		 */
 		int reason = expected_reason;
 
-		zassert_equal(reason, -1,
-			"expected_reason has not been reset (%d)\n", reason);
+		zassert_equal(reason, -1, "expected_reason has not been reset (%d)\n", reason);
 #endif
 	}
 }
@@ -284,8 +265,7 @@ ZTEST(arm_interrupt, test_arm_interrupt)
 		}
 	}
 
-	zassert_true(i >= 0,
-		"No available IRQ line to use in the test\n");
+	zassert_true(i >= 0, "No available IRQ line to use in the test\n");
 
 	TC_PRINT("Available IRQ line: %u\n", i);
 
@@ -304,14 +284,10 @@ ZTEST(arm_interrupt, test_arm_interrupt)
 	 * expected reason variable is reset.
 	 */
 	reason = expected_reason;
-	zassert_equal(reason, -1,
-		"expected_reason has not been reset (%d)\n", reason);
+	zassert_equal(reason, -1, "expected_reason has not been reset (%d)\n", reason);
 	NVIC_DisableIRQ(i);
 
-	arch_irq_connect_dynamic(i, 0 /* highest priority */,
-		arm_isr_handler,
-		NULL,
-		0);
+	arch_irq_connect_dynamic(i, 0 /* highest priority */, arm_isr_handler, NULL, 0);
 
 	NVIC_ClearPendingIRQ(i);
 	NVIC_EnableIRQ(i);
@@ -355,17 +331,14 @@ ZTEST(arm_interrupt, test_arm_interrupt)
 	 * entry will make PSP descend below the limit and into the MPU guard
 	 * section (or beyond the address pointed by PSPLIM in ARMv8-M MCUs).
 	 */
-#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) && \
-	defined(CONFIG_MPU_STACK_GUARD)
+#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) && defined(CONFIG_MPU_STACK_GUARD)
 #define FPU_STACK_EXTRA_SIZE 0x48
 	/* If an FP context is present, we should not set the PSP
 	 * too close to the end of the stack, because stacking of
 	 * the ESF might corrupt kernel memory, making it not
 	 * possible to continue the test execution.
 	 */
-	uint32_t fp_extra_size =
-		(__get_CONTROL() & CONTROL_FPCA_Msk) ?
-			FPU_STACK_EXTRA_SIZE : 0;
+	uint32_t fp_extra_size = (__get_CONTROL() & CONTROL_FPCA_Msk) ? FPU_STACK_EXTRA_SIZE : 0;
 	__set_PSP(_current->stack_info.start + 0x10 + fp_extra_size);
 #else
 	__set_PSP(_current->stack_info.start + 0x10);
@@ -420,8 +393,7 @@ static inline void z_vrfy_test_arm_user_interrupt_syscall(void)
 ZTEST_USER(arm_interrupt, test_arm_user_interrupt)
 {
 	/* Test thread executing in user mode */
-	zassert_true(arch_is_user_context(),
-		"Test thread not running in user mode\n");
+	zassert_true(arch_is_user_context(), "Test thread not running in user mode\n");
 
 	/* Attempt to lock IRQs in user mode */
 	irq_lock();
@@ -476,12 +448,10 @@ ZTEST(arm_interrupt, test_arm_null_pointer_exception)
 
 	expected_reason = K_ERR_CPU_EXCEPTION;
 
-	printk("Reading a null pointer value: 0x%0x\n",
-		test_struct_null_pointer->val[1]);
+	printk("Reading a null pointer value: 0x%0x\n", test_struct_null_pointer->val[1]);
 
 	reason = expected_reason;
-	zassert_equal(reason, -1,
-		"expected_reason has not been reset (%d)\n", reason);
+	zassert_equal(reason, -1, "expected_reason has not been reset (%d)\n", reason);
 }
 #pragma GCC pop_options
 
diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c
index 4d46851faef0b..ce5043d882f48 100644
--- a/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c
+++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c
@@ -41,10 +41,8 @@ ZTEST(arm_irq_advanced_features, test_arm_dynamic_direct_interrupts)
 	irq_disable(DIRECT_ISR_OFFSET);
 
 	/* Attach the ISR handler at run time. */
-	irq_connect_dynamic(DIRECT_ISR_OFFSET, 0 /* highest priority */,
-		arm_direct_isr_handler_0,
-		NULL,
-		0);
+	irq_connect_dynamic(DIRECT_ISR_OFFSET, 0 /* highest priority */, arm_direct_isr_handler_0,
+			    NULL, 0);
 
 	/* Enable and pend the interrupt */
 	irq_enable(DIRECT_ISR_OFFSET);
@@ -65,10 +63,8 @@ ZTEST(arm_irq_advanced_features, test_arm_dynamic_direct_interrupts)
 	irq_disable(DIRECT_ISR_OFFSET);
 
 	/* Attach an alternative ISR handler at run-time. */
-	irq_connect_dynamic(DIRECT_ISR_OFFSET, 0 /* highest priority */,
-		arm_direct_isr_handler_1,
-		NULL,
-		0);
+	irq_connect_dynamic(DIRECT_ISR_OFFSET, 0 /* highest priority */, arm_direct_isr_handler_1,
+			    NULL, 0);
 
 	/* Enable and pend the interrupt */
 	irq_enable(DIRECT_ISR_OFFSET);
diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c
index 802385fa0e530..f1d005b47c591 100644
--- a/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c
+++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c
@@ -8,11 +8,9 @@
 #include <zephyr/arch/cpu.h>
 #include <cmsis_core.h>
 
-#if defined(CONFIG_ARM_SECURE_FIRMWARE) && \
-	defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+#if defined(CONFIG_ARM_SECURE_FIRMWARE) && defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 
-extern irq_target_state_t irq_target_state_set(unsigned int irq,
-	irq_target_state_t target_state);
+extern irq_target_state_t irq_target_state_set(unsigned int irq, irq_target_state_t target_state);
 extern int irq_target_state_is_secure(unsigned int irq);
 
 ZTEST(arm_irq_advanced_features, test_arm_irq_target_state)
@@ -54,39 +52,29 @@ ZTEST(arm_irq_advanced_features, test_arm_irq_target_state)
 		}
 	}
 
-	zassert_true(i >= 0,
-		"No available IRQ line to configure as zero-latency\n");
+	zassert_true(i >= 0, "No available IRQ line to configure as zero-latency\n");
 
 	TC_PRINT("Available IRQ line: %u\n", i);
 
 	/* Set the available IRQ line to Secure and check the result. */
-	irq_target_state_t result_state =
-		irq_target_state_set(i, IRQ_TARGET_STATE_SECURE);
+	irq_target_state_t result_state = irq_target_state_set(i, IRQ_TARGET_STATE_SECURE);
 
-	zassert_equal(result_state, IRQ_TARGET_STATE_SECURE,
-		"Target state not set to Secure\n");
+	zassert_equal(result_state, IRQ_TARGET_STATE_SECURE, "Target state not set to Secure\n");
 
-	zassert_equal(irq_target_state_is_secure(i), 1,
-		"Target state not set to Secure\n");
+	zassert_equal(irq_target_state_is_secure(i), 1, "Target state not set to Secure\n");
 
 	/* Set the available IRQ line to Secure and check the result. */
-	result_state =
-		irq_target_state_set(i, IRQ_TARGET_STATE_NON_SECURE);
+	result_state = irq_target_state_set(i, IRQ_TARGET_STATE_NON_SECURE);
 
 	zassert_equal(result_state, IRQ_TARGET_STATE_NON_SECURE,
-		"Target state not set to Secure\n");
-	zassert_equal(irq_target_state_is_secure(i), 0,
-		"Target state not set to Non-Secure\n");
+		      "Target state not set to Secure\n");
+	zassert_equal(irq_target_state_is_secure(i), 0, "Target state not set to Non-Secure\n");
 
-	result_state =
-		irq_target_state_set(i, IRQ_TARGET_STATE_SECURE);
+	result_state = irq_target_state_set(i, IRQ_TARGET_STATE_SECURE);
 
-	zassert_equal(result_state, IRQ_TARGET_STATE_SECURE,
-		"Target state not set to Secure\n");
-
-	zassert_equal(irq_target_state_is_secure(i), 1,
-		"Target state not set to Secure\n");
+	zassert_equal(result_state, IRQ_TARGET_STATE_SECURE, "Target state not set to Secure\n");
 
+	zassert_equal(irq_target_state_is_secure(i), 1, "Target state not set to Secure\n");
 }
 #else
 ZTEST(arm_irq_advanced_features, test_arm_irq_target_state)
diff --git a/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c
index 67adbc7e9c2a3..c3e8b5f574e40 100644
--- a/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c
+++ b/tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c
@@ -70,17 +70,14 @@ ZTEST(arm_irq_advanced_features, test_arm_zero_latency_irqs)
 		}
 	}
 
-	zassert_true(i >= 0,
-		"No available IRQ line to configure as zero-latency\n");
+	zassert_true(i >= 0, "No available IRQ line to configure as zero-latency\n");
 
 	TC_PRINT("Available IRQ line: %u\n", i);
 
 	/* Configure the available IRQ line as zero-latency. */
 
-	arch_irq_connect_dynamic(i, 0 /* Unused */,
-		arm_zero_latency_isr_handler,
-		NULL,
-		IRQ_ZERO_LATENCY);
+	arch_irq_connect_dynamic(i, 0 /* Unused */, arm_zero_latency_isr_handler, NULL,
+				 IRQ_ZERO_LATENCY);
 
 	NVIC_ClearPendingIRQ(i);
 	NVIC_EnableIRQ(i);
diff --git a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
index fe99dbd4b0f89..43b13c9eecf9b 100644
--- a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
+++ b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
@@ -9,7 +9,6 @@
 #include <cmsis_core.h>
 #include <zephyr/linker/sections.h>
 
-
 /*
  * Offset (starting from the beginning of the vector table)
  * of the location where the ISRs will be manually installed.
@@ -83,7 +82,6 @@ void isr2(void)
  * @{
  */
 
-
 /**
  * @brief Test installation of ISRs directly in the vector table
  *
@@ -106,13 +104,12 @@ ZTEST(vector_table, test_arm_irq_vector_table)
 		k_sem_init(&sem[ii], 0, K_SEM_MAX_LIMIT);
 	}
 
-	zassert_true((k_sem_take(&sem[0], K_NO_WAIT) ||
-		      k_sem_take(&sem[1], K_NO_WAIT) ||
-		      k_sem_take(&sem[2], K_NO_WAIT)), NULL);
+	zassert_true((k_sem_take(&sem[0], K_NO_WAIT) || k_sem_take(&sem[1], K_NO_WAIT) ||
+		      k_sem_take(&sem[2], K_NO_WAIT)),
+		     NULL);
 
 	for (int ii = 0; ii < 3; ii++) {
-#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) || \
-	defined(CONFIG_SOC_TI_LM3S6965_QEMU)
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) || defined(CONFIG_SOC_TI_LM3S6965_QEMU)
 		/* the QEMU does not simulate the
 		 * STIR register: this is a workaround
 		 */
@@ -122,10 +119,18 @@ ZTEST(vector_table, test_arm_irq_vector_table)
 #endif
 	}
 
-	zassert_false((k_sem_take(&sem[0], K_NO_WAIT) ||
-		       k_sem_take(&sem[1], K_NO_WAIT) ||
-		       k_sem_take(&sem[2], K_NO_WAIT)), NULL);
-
+	/*
+	 * It is recommended to have a DSB followed by ISB while
+	 * enabling interrupts using NVIC. Also without this, the
+	 * test fails in scenarios where CONFIG_ROMSTART_RELOCATION_ROM is
+	 * enabled e.g. MPS3 Corstone310.
+	 */
+	__DSB(); /* Ensure write to NVIC completes before continuing */
+	__ISB(); /* Ensure that IRQ is executed */
+
+	zassert_false((k_sem_take(&sem[0], K_NO_WAIT) || k_sem_take(&sem[1], K_NO_WAIT) ||
+		       k_sem_take(&sem[2], K_NO_WAIT)),
+		      NULL);
 }
 
 typedef void (*vth)(void); /* Vector Table Handler */
@@ -143,26 +148,26 @@ typedef void (*vth)(void); /* Vector Table Handler */
  */
 void nrfx_power_clock_irq_handler(void);
 #if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
-#define POWER_CLOCK_IRQ_NUM	POWER_CLOCK_IRQn
+#define POWER_CLOCK_IRQ_NUM POWER_CLOCK_IRQn
 #elif defined(CONFIG_SOC_SERIES_NRF54HX) || defined(CONFIG_SOC_SERIES_NRF92X)
-#define POWER_CLOCK_IRQ_NUM	-1 /* not needed */
+#define POWER_CLOCK_IRQ_NUM -1 /* not needed */
 #else
-#define POWER_CLOCK_IRQ_NUM	CLOCK_POWER_IRQn
+#define POWER_CLOCK_IRQ_NUM CLOCK_POWER_IRQn
 #endif
 
 #if defined(CONFIG_BOARD_QEMU_CORTEX_M0)
 void timer0_nrf_isr(void);
-#define TIMER_IRQ_HANDLER	timer0_nrf_isr
-#define TIMER_IRQ_NUM		TIMER0_IRQn
-#elif defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_SERIES_NRF54HX) || \
+#define TIMER_IRQ_HANDLER timer0_nrf_isr
+#define TIMER_IRQ_NUM     TIMER0_IRQn
+#elif defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_SERIES_NRF54HX) ||                  \
 	defined(CONFIG_SOC_SERIES_NRF92X)
 void nrfx_grtc_irq_handler(void);
-#define TIMER_IRQ_HANDLER	nrfx_grtc_irq_handler
-#define TIMER_IRQ_NUM		GRTC_0_IRQn
+#define TIMER_IRQ_HANDLER nrfx_grtc_irq_handler
+#define TIMER_IRQ_NUM     GRTC_0_IRQn
 #else
 void rtc_nrf_isr(void);
-#define TIMER_IRQ_HANDLER	rtc_nrf_isr
-#define TIMER_IRQ_NUM		RTC1_IRQn
+#define TIMER_IRQ_HANDLER rtc_nrf_isr
+#define TIMER_IRQ_NUM     RTC1_IRQn
 #endif
 
 #define IRQ_VECTOR_TABLE_SIZE (MAX(POWER_CLOCK_IRQ_NUM, MAX(TIMER_IRQ_NUM, _ISR_OFFSET + 2)) + 1)
@@ -172,7 +177,9 @@ vth __irq_vector_table _irq_vector_table[IRQ_VECTOR_TABLE_SIZE] = {
 	[POWER_CLOCK_IRQ_NUM] = nrfx_power_clock_irq_handler,
 #endif
 	[TIMER_IRQ_NUM] = TIMER_IRQ_HANDLER,
-	[_ISR_OFFSET] = isr0, isr1, isr2,
+	[_ISR_OFFSET] = isr0,
+	isr1,
+	isr2,
 };
 #elif defined(CONFIG_SOC_SERIES_CC13X2_CC26X2) || defined(CONFIG_SOC_SERIES_CC13X2X7_CC26X2X7)
 /* TI CC13x2/CC26x2 based platforms also employ a Hardware RTC peripheral
@@ -181,13 +188,13 @@ vth __irq_vector_table _irq_vector_table[IRQ_VECTOR_TABLE_SIZE] = {
  * the custom vector table to handle the timer "tick" interrupts.
  */
 extern void rtc_isr(void);
-vth __irq_vector_table _irq_vector_table[] = {
-	isr0, isr1, isr2, 0,
-	rtc_isr
-};
-#elif (defined(CONFIG_SOC_SERIES_IMXRT6XX) || defined(CONFIG_SOC_SERIES_IMXRT5XX) ||	\
-	defined(CONFIG_SOC_SERIES_RW6XX)) && \
-	defined(CONFIG_MCUX_OS_TIMER)
+vth __irq_vector_table _irq_vector_table[] = {isr0, isr1, isr2, 0, rtc_isr};
+
+/* clang-format off */
+#elif (defined(CONFIG_SOC_SERIES_IMXRT6XX) || defined(CONFIG_SOC_SERIES_IMXRT5XX) ||               \
+	defined(CONFIG_SOC_SERIES_RW6XX)) && defined(CONFIG_MCUX_OS_TIMER)
+/* clang-format on */
+
 /* MXRT685 employs a OS Event timer to implement the Kernel system
  * timer, instead of the ARM Cortex-M SysTick. Therefore, a pointer to
  * the timer ISR needs to be added in the custom vector table to handle
@@ -196,10 +203,8 @@ vth __irq_vector_table _irq_vector_table[] = {
 extern void mcux_lpc_ostick_isr(void);
 vth __irq_vector_table _irq_vector_table[] = {
 	isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	mcux_lpc_ostick_isr
-};
-#elif (defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT11XX)) && \
+	0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, mcux_lpc_ostick_isr};
+#elif (defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT11XX)) &&            \
 	defined(CONFIG_MCUX_GPT_TIMER)
 /** MXRT parts employ a GPT timer peripheral to implement the Kernel system
  * timer, instead of the ARM Cortex-M Systick. Thereforce, a pointer to the
@@ -208,12 +213,15 @@ vth __irq_vector_table _irq_vector_table[] = {
  */
 extern void mcux_imx_gpt_isr(void);
 #if defined(CONFIG_SOC_MIMXRT1011)
+/* clang-format off */
 /* RT1011 GPT timer interrupt is at offset 30 */
 vth __irq_vector_table _irq_vector_table[] = {
 	isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, mcux_imx_gpt_isr
 };
+/* clang-format on */
 #elif defined(CONFIG_SOC_SERIES_IMXRT10XX)
+/* clang-format off */
 /* RT10xx GPT timer interrupt is at offset 100 */
 vth __irq_vector_table _irq_vector_table[] = {
 	isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -222,23 +230,21 @@ vth __irq_vector_table _irq_vector_table[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, mcux_imx_gpt_isr
 };
+/* clang-format on */
 #elif defined(CONFIG_SOC_SERIES_IMXRT11XX)
 /* RT11xx GPT timer interrupt is at offset 119 */
 vth __irq_vector_table _irq_vector_table[] = {
-	isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	mcux_imx_gpt_isr
-};
+	isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, mcux_imx_gpt_isr};
 #else
 #error "GPT timer enabled, but no known SOC selected. ISR table needs rework"
 #endif
 #else
-vth __irq_vector_table _irq_vector_table[] = {
-	isr0, isr1, isr2
-};
+vth __irq_vector_table _irq_vector_table[] = {isr0, isr1, isr2};
 #endif /* CONFIG_SOC_FAMILY_NORDIC_NRF */
 
 /**
diff --git a/tests/arch/arm/arm_irq_vector_table/src/main.c b/tests/arch/arm/arm_irq_vector_table/src/main.c
index ccb750f51ccad..9b7d622d3797d 100644
--- a/tests/arch/arm/arm_irq_vector_table/src/main.c
+++ b/tests/arch/arm/arm_irq_vector_table/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #if !defined(CONFIG_CPU_CORTEX_M)
-  #error project can only run on Cortex-M
+#error project can only run on Cortex-M
 #endif
 
 #include <zephyr/ztest.h>
diff --git a/tests/arch/arm/arm_irq_vector_table/testcase.yaml b/tests/arch/arm/arm_irq_vector_table/testcase.yaml
index fda52833a82cc..0e320ee4626d7 100644
--- a/tests/arch/arm/arm_irq_vector_table/testcase.yaml
+++ b/tests/arch/arm/arm_irq_vector_table/testcase.yaml
@@ -11,3 +11,5 @@ tests:
             not CONFIG_GEN_ISR_TABLES
     platform_exclude:
       - mr_canhubk3
+      - imx95_evk/mimx9596/m7
+      - imx95_evk/mimx9596/m7/ddr
diff --git a/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c b/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c
index 8a145884b747b..7953635e69f7a 100644
--- a/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c
+++ b/tests/arch/arm/arm_irq_zero_latency_levels/src/main.c
@@ -9,21 +9,14 @@
 #include <cmsis_core.h>
 #include <zephyr/sys/barrier.h>
 
-
 #define EXECUTION_TRACE_LENGTH 6
 
-#define IRQ_A_PRIO  1   /* lower priority */
-#define IRQ_B_PRIO  0   /* higher priority */
-
-
-#define CHECK_STEP(pos, val) zassert_equal(	\
-	execution_trace[pos],			\
-	val,					\
-	"Expected %s for step %d but got %s",	\
-	execution_step_str(val),		\
-	pos,					\
-	execution_step_str(execution_trace[pos]))
+#define IRQ_A_PRIO 1 /* lower priority */
+#define IRQ_B_PRIO 0 /* higher priority */
 
+#define CHECK_STEP(pos, val)                                                                       \
+	zassert_equal(execution_trace[pos], val, "Expected %s for step %d but got %s",             \
+		      execution_step_str(val), pos, execution_step_str(execution_trace[pos]))
 
 enum execution_step {
 	STEP_MAIN_BEGIN,
@@ -69,17 +62,13 @@ static const char *execution_step_str(enum execution_step s)
 	return res;
 }
 
-
 static void execution_trace_add(enum execution_step s)
 {
-	__ASSERT(execution_trace_pos < EXECUTION_TRACE_LENGTH,
-		 "Execution trace overflow");
+	__ASSERT(execution_trace_pos < EXECUTION_TRACE_LENGTH, "Execution trace overflow");
 	execution_trace[execution_trace_pos] = s;
 	execution_trace_pos++;
 }
 
-
-
 void isr_a_handler(const void *args)
 {
 	ARG_UNUSED(args);
@@ -93,7 +82,6 @@ void isr_a_handler(const void *args)
 	execution_trace_add(STEP_ISR_A_END);
 }
 
-
 void isr_b_handler(const void *args)
 {
 	ARG_UNUSED(args);
@@ -101,7 +89,6 @@ void isr_b_handler(const void *args)
 	execution_trace_add(STEP_ISR_B_END);
 }
 
-
 static int find_unused_irq(int start)
 {
 	int i;
@@ -141,8 +128,7 @@ static int find_unused_irq(int start)
 		}
 	}
 
-	zassert_true(i >= 0,
-		     "No available IRQ line to configure as zero-latency\n");
+	zassert_true(i >= 0, "No available IRQ line to configure as zero-latency\n");
 
 	TC_PRINT("Available IRQ line: %u\n", i);
 	return i;
@@ -165,14 +151,12 @@ ZTEST(arm_irq_zero_latency_levels, test_arm_zero_latency_levels)
 	irq_b = find_unused_irq(irq_a);
 
 	/* Configure IRQ A as zero-latency interrupt with prio 1 */
-	arch_irq_connect_dynamic(irq_a, IRQ_A_PRIO, isr_a_handler,
-				 NULL, IRQ_ZERO_LATENCY);
+	arch_irq_connect_dynamic(irq_a, IRQ_A_PRIO, isr_a_handler, NULL, IRQ_ZERO_LATENCY);
 	NVIC_ClearPendingIRQ(irq_a);
 	NVIC_EnableIRQ(irq_a);
 
 	/* Configure irq_b as zero-latency interrupt with prio 0 */
-	arch_irq_connect_dynamic(irq_b, IRQ_B_PRIO, isr_b_handler,
-				 NULL, IRQ_ZERO_LATENCY);
+	arch_irq_connect_dynamic(irq_b, IRQ_B_PRIO, isr_b_handler, NULL, IRQ_ZERO_LATENCY);
 	NVIC_ClearPendingIRQ(irq_b);
 	NVIC_EnableIRQ(irq_b);
 
diff --git a/tests/arch/arm/arm_mpu_pxn/CMakeLists.txt b/tests/arch/arm/arm_mpu_pxn/CMakeLists.txt
new file mode 100644
index 0000000000000..4eb11b09f2048
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(arm_mpu_pxn)
+
+target_sources(app PRIVATE src/main.c)
+zephyr_linker_sources_ifdef(CONFIG_SOC_MPS3_CORSTONE300 RAM_SECTIONS mps3_corstone300.ld)
+zephyr_linker_sources_ifdef(CONFIG_SOC_MPS3_CORSTONE310 RAM_SECTIONS mps3_corstone310.ld)
diff --git a/tests/arch/arm/arm_mpu_pxn/mps3_corstone300.ld b/tests/arch/arm/arm_mpu_pxn/mps3_corstone300.ld
new file mode 100644
index 0000000000000..b4c676183a176
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/mps3_corstone300.ld
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+SECTION_DATA_PROLOGUE(.customramfunc, , )
+{
+	*(.customramfunc) * (".customramfunc.*")
+}
+GROUP_DATA_LINK_IN(SRAM, SRAM)
diff --git a/tests/arch/arm/arm_mpu_pxn/mps3_corstone300_an547.overlay b/tests/arch/arm/arm_mpu_pxn/mps3_corstone300_an547.overlay
new file mode 100644
index 0000000000000..7c5a2c5767778
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/mps3_corstone300_an547.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/memory-attr/memory-attr.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
+
+/ {
+	sram: sram@11000000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x11000000 DT_SIZE_M(1)>;
+		zephyr,memory-region = "SRAM";
+		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_PXN) )>;
+	};
+};
diff --git a/tests/arch/arm/arm_mpu_pxn/mps3_corstone300_fvp.overlay b/tests/arch/arm/arm_mpu_pxn/mps3_corstone300_fvp.overlay
new file mode 100644
index 0000000000000..7c5a2c5767778
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/mps3_corstone300_fvp.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/memory-attr/memory-attr.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
+
+/ {
+	sram: sram@11000000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x11000000 DT_SIZE_M(1)>;
+		zephyr,memory-region = "SRAM";
+		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_PXN) )>;
+	};
+};
diff --git a/tests/arch/arm/arm_mpu_pxn/mps3_corstone310.ld b/tests/arch/arm/arm_mpu_pxn/mps3_corstone310.ld
new file mode 100644
index 0000000000000..945f0f0cc6ff8
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/mps3_corstone310.ld
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+SECTION_DATA_PROLOGUE(.customramfunc, , )
+{
+	*(.customramfunc) * (".customramfunc.*")
+}
+GROUP_DATA_LINK_IN(DTCM, DTCM)
diff --git a/tests/arch/arm/arm_mpu_pxn/mps3_corstone310_fvp.overlay b/tests/arch/arm/arm_mpu_pxn/mps3_corstone310_fvp.overlay
new file mode 100644
index 0000000000000..cb51331990fa4
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/mps3_corstone310_fvp.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/memory-attr/memory-attr.h>
+#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
+
+
+/ {
+	dtcm: dtcm@30000000 {
+		compatible = "zephyr,memory-region";
+		reg = <0x30000000 DT_SIZE_K(32)>;
+		zephyr,memory-region = "DTCM";
+		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_PXN) )>;
+	};
+};
diff --git a/tests/arch/arm/arm_mpu_pxn/prj.conf b/tests/arch/arm/arm_mpu_pxn/prj.conf
new file mode 100644
index 0000000000000..12883f869d753
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_ZTEST=y
+CONFIG_ZTEST_FATAL_HOOK=y
diff --git a/tests/arch/arm/arm_mpu_pxn/src/main.c b/tests/arch/arm/arm_mpu_pxn/src/main.c
new file mode 100644
index 0000000000000..690a0018ab177
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/src/main.c
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+#include <zephyr/ztest.h>
+#include <zephyr/ztest_error_hook.h>
+
+#define __customramfunc                                                                            \
+	__attribute__((noinline)) __attribute__((long_call, section(".customramfunc")))
+
+/**
+ * @brief Simple func to verify PXN via DT config since code with
+ *        __customramfunc falls in an MPU region with PXN set
+ *
+ */
+__customramfunc bool custom_ram_func(void)
+{
+	return true;
+}
+
+/**
+ * @brief This is a simple solution to execute a code with and without PXN set
+ *        because code that falls in `__ramfunc` section has PXN attr set if
+ *        built with CONFIG_USERSPACE and unset otherwise.
+ */
+__ramfunc bool ram_function(void)
+{
+	return true;
+}
+
+#ifdef CONFIG_USERSPACE
+/**
+ * @brief Verify that MPU region with PXN attribute set can be executed from
+ *        unprivileged mode.
+ */
+ZTEST_USER(arm_mpu_pxn, test_arm_mpu_pxn_static_config_user)
+{
+	volatile bool ramfunc_called = false;
+	/*
+	 * With CONFIG_USERSPACE
+	 *  - this func is called in unprivileged mode
+	 *  - and __ramfunc falls in an MPU region which has PXN attribute set
+	 *
+	 * Calling ram_function shouldn't result in an exception.
+	 * This confirms that ram_function though part of a region with PXN attribute set,
+	 * can be called from an unprivileged code.
+	 */
+	ramfunc_called = ram_function();
+	zassert_true(true == ramfunc_called,
+		     "Executing code in __ramfunc failed in unprivileged mode.");
+}
+#endif
+
+/**
+ * @brief Verify that region marked with PXN attribute via DT can be executed
+ *        from unprivileged mode but cannot be executed from privileged mode.
+ */
+ZTEST_USER(arm_mpu_pxn, test_arm_mpu_pxn_dt)
+{
+	volatile bool ramfunc_called = false;
+#ifndef CONFIG_USERSPACE
+	/*
+	 * It is expected that calling ram_function() should result in an exception
+	 * because with CONFIG_USERSPACE, ram_function falls in region with
+	 * PXN attribute set.
+	 */
+	ztest_set_fault_valid(true);
+#endif
+
+	ramfunc_called = custom_ram_func();
+
+#ifdef CONFIG_USERSPACE
+	zassert_true(1 == ramfunc_called,
+		     "Executing code in __customramfunc failed in unprivileged mode.");
+#else
+	/*
+	 * If calling ram_function didn't result in an MPU fault then,
+	 * PXN isn't working as expected so, fail the test.
+	 */
+	ztest_test_fail();
+#endif
+}
+
+/**
+ * @brief This func is always called in privileged mode so, verify that:
+ *        - region marked with PXN attribute
+ *          cannot be executed from privileged mode
+ *        - and same region when marked without PXN attribute
+ *          can be executed from privileged mode
+ */
+ZTEST(arm_mpu_pxn, test_arm_mpu_pxn_static_config)
+{
+	volatile bool ramfunc_called = false;
+#ifdef CONFIG_USERSPACE
+	/*
+	 * It is expected that calling ram_function() should result in an exception
+	 * because with CONFIG_USERSPACE, ram_function falls in region with
+	 * PXN attribute set.
+	 */
+	ztest_set_fault_valid(true);
+#endif
+	ramfunc_called = ram_function();
+
+#ifdef CONFIG_USERSPACE
+	/*
+	 * If calling ram_function didn't result in an MPU fault then,
+	 * PXN isn't working as expected so, fail the test.
+	 */
+	ztest_test_fail();
+#else
+	zassert_true(1 == ramfunc_called, "Executing code in __ramfunc failed in privileged mode.");
+#endif
+}
+
+ZTEST_SUITE(arm_mpu_pxn, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/arch/arm/arm_mpu_pxn/testcase.yaml b/tests/arch/arm/arm_mpu_pxn/testcase.yaml
new file mode 100644
index 0000000000000..c6b11b32160ae
--- /dev/null
+++ b/tests/arch/arm/arm_mpu_pxn/testcase.yaml
@@ -0,0 +1,19 @@
+common:
+  filter: CONFIG_ARM_MPU_PXN
+  tags:
+    - arm
+    - mpu
+  platform_allow:
+    - mps3/corstone300/an547
+    - mps3/corstone300/fvp
+    - mps3/corstone310/fvp
+tests:
+  # To verify that region marked with PXN attribute can be executed from unprivileged code
+  # and cannot be executed from privileged code
+  arch.arm.pxn_with_userspace:
+    extra_configs:
+      - CONFIG_USERSPACE=y
+  # To verify that region marked *without* PXN attribute can be executed from privileged code
+  arch.arm.pxn_without_userspace:
+    extra_configs:
+      - CONFIG_USERSPACE=n
diff --git a/tests/arch/arm/arm_no_multithreading/src/main.c b/tests/arch/arm/arm_no_multithreading/src/main.c
index c9e4cdd02f329..ae2bb66d468d0 100644
--- a/tests/arch/arm/arm_no_multithreading/src/main.c
+++ b/tests/arch/arm/arm_no_multithreading/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/sys/barrier.h>
 
 #if !defined(CONFIG_CPU_CORTEX_M)
-  #error test can only run on Cortex-M MCUs
+#error test can only run on Cortex-M MCUs
 #endif
 
 #if defined(CONFIG_ARMV8_1_M_MAINLINE)
@@ -19,9 +19,9 @@
  * For ARMv8.1-M, the FPSCR[18:16] LTPSIZE field may always read 0b010 if MVE
  * is not implemented, so mask it when validating the value of the FPSCR.
  */
-#define FPSCR_MASK		(~FPU_FPDSCR_LTPSIZE_Msk)
+#define FPSCR_MASK (~FPU_FPDSCR_LTPSIZE_Msk)
 #else
-#define FPSCR_MASK		(0xffffffffU)
+#define FPSCR_MASK (0xffffffffU)
 #endif
 
 K_THREAD_STACK_DECLARE(z_main_stack, CONFIG_MAIN_STACK_SIZE);
@@ -46,8 +46,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *pEsf)
 	}
 
 	if (reason != expected_reason) {
-		printk("Wrong crash type got %d expected %d\n", reason,
-			expected_reason);
+		printk("Wrong crash type got %d expected %d\n", reason, expected_reason);
 		k_fatal_halt(reason);
 	}
 
@@ -61,29 +60,22 @@ void test_main(void)
 	uint32_t psp = (uint32_t)__get_PSP();
 	uint32_t main_stack_base = (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
 	uint32_t main_stack_top = (uint32_t)(K_THREAD_STACK_BUFFER(z_main_stack) +
-		K_THREAD_STACK_SIZEOF(z_main_stack));
+					     K_THREAD_STACK_SIZEOF(z_main_stack));
 
-	__ASSERT(
-		(psp >= main_stack_base) && (psp <= main_stack_top),
-			"PSP out of bounds: 0x%x (0x%x - 0x%x)",
-			psp, main_stack_base, main_stack_top);
+	__ASSERT((psp >= main_stack_base) && (psp <= main_stack_top),
+		 "PSP out of bounds: 0x%x (0x%x - 0x%x)", psp, main_stack_base, main_stack_top);
 
 #if defined(CONFIG_FPU)
-	__ASSERT((__get_FPSCR() & FPSCR_MASK) == 0,
-		"FPSCR not zero (0x%x)", __get_FPSCR());
+	__ASSERT((__get_FPSCR() & FPSCR_MASK) == 0, "FPSCR not zero (0x%x)", __get_FPSCR());
 #endif
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 	uint32_t psplim = (uint32_t)__get_PSPLIM();
-	__ASSERT(
-		(psplim == main_stack_base),
-			"PSPLIM not set to main stack base: (0x%x)",
-			psplim);
+	__ASSERT((psplim == main_stack_base), "PSPLIM not set to main stack base: (0x%x)", psplim);
 #endif
 
 	int key = arch_irq_lock();
-	__ASSERT(arch_irq_unlocked(key),
-		"IRQs locked in main()");
+	__ASSERT(arch_irq_unlocked(key), "IRQs locked in main()");
 
 	arch_irq_unlock(key);
 
@@ -136,10 +128,7 @@ void test_main(void)
 
 		printk("Available IRQ line: %u\n", i);
 
-		arch_irq_connect_dynamic(i, 0 /* highest priority */,
-			arm_isr_handler,
-			NULL,
-			0);
+		arch_irq_connect_dynamic(i, 0 /* highest priority */, arm_isr_handler, NULL, 0);
 
 		NVIC_EnableIRQ(i);
 
diff --git a/tests/arch/arm/arm_no_multithreading/testcase.yaml b/tests/arch/arm/arm_no_multithreading/testcase.yaml
index 3aa62846e810e..8561bab624636 100644
--- a/tests/arch/arm/arm_no_multithreading/testcase.yaml
+++ b/tests/arch/arm/arm_no_multithreading/testcase.yaml
@@ -14,5 +14,6 @@ tests:
       - nrf52840dk/nrf52840
       - nrf9160dk/nrf9160
       - nrf51dk/nrf51822
+      - xg29_rb4412a
     integration_platforms:
       - qemu_cortex_m0
diff --git a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
index 87e4237d96136..3d9c913dc8b1e 100644
--- a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
+++ b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
@@ -35,7 +35,6 @@ static void nmi_test_isr(void)
  * @{
  */
 
-
 /**
  * @brief test the behavior of CONFIG_RUNTIME_NMI at run time
  *
diff --git a/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c b/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c
index be400746d92f7..8f5728abee074 100644
--- a/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c
+++ b/tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c
@@ -24,15 +24,12 @@ ZTEST(arm_sw_vector_relay, test_arm_sw_vector_relay)
 	 * entries for MSP and ResetHandler) point to the relay handling
 	 * function.
 	 */
-	const uint32_t *vector_relay_table_addr_val =
-		(uint32_t *)(vector_relay_table_addr);
+	const uint32_t *vector_relay_table_addr_val = (uint32_t *)(vector_relay_table_addr);
 
 	for (int i = 2; i < 16 + CONFIG_NUM_IRQS; i++) {
-		zassert_true(vector_relay_table_addr_val[i] ==
-			vector_relay_handler_func,
-			"vector relay table not pointing to the relay handler: 0x%x, 0x%x\n",
-			vector_relay_table_addr_val[i],
-			vector_relay_handler_func);
+		zassert_true(vector_relay_table_addr_val[i] == vector_relay_handler_func,
+			     "vector relay table not pointing to the relay handler: 0x%x, 0x%x\n",
+			     vector_relay_table_addr_val[i], vector_relay_handler_func);
 	}
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_VTOR)
@@ -45,25 +42,23 @@ ZTEST(arm_sw_vector_relay, test_arm_sw_vector_relay)
 	 */
 	uint32_t mask = MAX(128, Z_POW2_CEIL(4 * (16 + CONFIG_NUM_IRQS))) - 1;
 
-	zassert_true(((vector_table_addr) & mask) == 0,
-		"vector table not properly aligned: 0x%x\n",
-		vector_table_addr);
-	zassert_true(((vector_relay_table_addr) & mask) == 0,
-		"vector relay table not properly aligned: 0x%x\n",
-		vector_relay_table_addr);
+	zassert_true(((vector_table_addr)&mask) == 0, "vector table not properly aligned: 0x%x\n",
+		     vector_table_addr);
+	zassert_true(((vector_relay_table_addr)&mask) == 0,
+		     "vector relay table not properly aligned: 0x%x\n", vector_relay_table_addr);
 
 	/* Verify that the VTOR points to the real vector table,
 	 * NOT the table that contains the forwarding function.
 	 */
 	zassert_true(SCB->VTOR == (uint32_t)_vector_start,
-		"VTOR not pointing to the real vector table\n");
+		     "VTOR not pointing to the real vector table\n");
 #else
 	/* If VTOR is not present then we already need to forward interrupts
 	 * before loading any child chain-loadable image.
 	 */
 	zassert_true(_vector_table_pointer == (uint32_t)_vector_start,
-		"vector table pointer not pointing to vector start, 0x%x, 0x%x\n",
-		_vector_table_pointer, _vector_start);
+		     "vector table pointer not pointing to vector start, 0x%x, 0x%x\n",
+		     _vector_table_pointer, _vector_start);
 #endif
 }
 /**
diff --git a/tests/arch/arm/arm_sw_vector_relay/src/main.c b/tests/arch/arm/arm_sw_vector_relay/src/main.c
index 4cbaadb8e71d3..c5adca252df86 100644
--- a/tests/arch/arm/arm_sw_vector_relay/src/main.c
+++ b/tests/arch/arm/arm_sw_vector_relay/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #if !defined(CONFIG_CPU_CORTEX_M)
-  #error test can only run on Cortex-M MCUs
+#error test can only run on Cortex-M MCUs
 #endif
 
 #include <zephyr/ztest.h>
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
index 075b36126a155..42a25f7dc2866 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
@@ -12,15 +12,14 @@
 #include <offsets_short_arch.h>
 #include <ksched.h>
 
-#if !defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && \
-	!defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+#if !defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 #error "Unsupported architecture"
 #endif
 
 #if defined(CONFIG_USERSPACE)
 
 #define PRIORITY 0
-#define DB_VAL 0xDEADBEEF
+#define DB_VAL   0xDEADBEEF
 
 static struct k_thread user_thread;
 static K_THREAD_STACK_DEFINE(user_thread_stack, 1024);
@@ -39,22 +38,20 @@ void z_impl_test_arm_user_syscall(void)
 	 * - MSPLIM register still guards the interrupt stack
 	 */
 	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) == 0,
-	"mode variable not set to PRIV mode in system call\n");
+		     "mode variable not set to PRIV mode in system call\n");
 
-	zassert_false(arch_is_user_context(),
-	"arch_is_user_context() indicates nPRIV\n");
+	zassert_false(arch_is_user_context(), "arch_is_user_context() indicates nPRIV\n");
 
 	zassert_true(
 		((__get_PSP() >= _current->arch.priv_stack_start) &&
-		(__get_PSP() < (_current->arch.priv_stack_start +
-			CONFIG_PRIVILEGED_STACK_SIZE))),
-	"Process SP outside thread privileged stack limits\n");
+		 (__get_PSP() < (_current->arch.priv_stack_start + CONFIG_PRIVILEGED_STACK_SIZE))),
+		"Process SP outside thread privileged stack limits\n");
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 	zassert_true(__get_PSPLIM() == _current->arch.priv_stack_start,
-	"PSPLIM not guarding the thread's privileged stack\n");
+		     "PSPLIM not guarding the thread's privileged stack\n");
 	zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
-	"MSPLIM not guarding the interrupt stack\n");
+		     "MSPLIM not guarding the interrupt stack\n");
 #endif
 }
 
@@ -64,7 +61,6 @@ static inline void z_vrfy_test_arm_user_syscall(void)
 }
 #include <zephyr/syscalls/test_arm_user_syscall_mrsh.c>
 
-
 void arm_isr_handler(const void *args)
 {
 	ARG_UNUSED(args);
@@ -79,16 +75,13 @@ void arm_isr_handler(const void *args)
 	 */
 
 	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) != 0,
-	"mode variable not set to nPRIV mode for user thread\n");
+		     "mode variable not set to nPRIV mode for user thread\n");
 
-	zassert_false(arch_is_user_context(),
-	"arch_is_user_context() indicates nPRIV in ISR\n");
+	zassert_false(arch_is_user_context(), "arch_is_user_context() indicates nPRIV in ISR\n");
 
-	zassert_true(
-		((__get_PSP() >= _current->stack_info.start) &&
-		(__get_PSP() < (_current->stack_info.start +
-			_current->stack_info.size))),
-	"Process SP outside thread stack limits\n");
+	zassert_true(((__get_PSP() >= _current->stack_info.start) &&
+		      (__get_PSP() < (_current->stack_info.start + _current->stack_info.size))),
+		     "Process SP outside thread stack limits\n");
 
 	static int first_call = 1;
 
@@ -106,10 +99,9 @@ void arm_isr_handler(const void *args)
 		/* Second ISR run occurs after thread context-switch.
 		 * We expect PSPLIM to be clear at this point.
 		 */
-		zassert_true(__get_PSPLIM() == 0,
-		"PSPLIM not clear\n");
+		zassert_true(__get_PSPLIM() == 0, "PSPLIM not clear\n");
 		zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
-		"MSPLIM not guarding the interrupt stack\n");
+			     "MSPLIM not guarding the interrupt stack\n");
 #endif
 		NVIC_DisableIRQ((uint32_t)args);
 	}
@@ -166,22 +158,19 @@ ZTEST(arm_thread_swap, test_arm_syscalls)
 	 * - MSPLIM register guards the interrupt stack
 	 */
 	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) == 0,
-	"mode variable not set to PRIV mode for supervisor thread\n");
+		     "mode variable not set to PRIV mode for supervisor thread\n");
 
-	zassert_false(arch_is_user_context(),
-	"arch_is_user_context() indicates nPRIV\n");
+	zassert_false(arch_is_user_context(), "arch_is_user_context() indicates nPRIV\n");
 
-	zassert_true(
-		((__get_PSP() >= _current->stack_info.start) &&
-		(__get_PSP() < (_current->stack_info.start +
-			_current->stack_info.size))),
-	"Process SP outside thread stack limits\n");
+	zassert_true(((__get_PSP() >= _current->stack_info.start) &&
+		      (__get_PSP() < (_current->stack_info.start + _current->stack_info.size))),
+		     "Process SP outside thread stack limits\n");
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 	zassert_true(__get_PSPLIM() == _current->stack_info.start,
-	"PSPLIM not guarding the default stack\n");
+		     "PSPLIM not guarding the default stack\n");
 	zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
-	"MSPLIM not guarding the interrupt stack\n");
+		     "MSPLIM not guarding the interrupt stack\n");
 #endif
 
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
@@ -207,15 +196,11 @@ ZTEST(arm_thread_swap, test_arm_syscalls)
 		}
 	}
 
-	zassert_true(i >= 0,
-		 "No available IRQ line to use in the test\n");
+	zassert_true(i >= 0, "No available IRQ line to use in the test\n");
 
 	TC_PRINT("Available IRQ line: %u\n", i);
 
-	arch_irq_connect_dynamic(i, 0 /* highest priority */,
-		arm_isr_handler,
-		(uint32_t *)i,
-		0);
+	arch_irq_connect_dynamic(i, 0 /* highest priority */, arm_isr_handler, (uint32_t *)i, 0);
 
 	NVIC_ClearPendingIRQ(i);
 	NVIC_EnableIRQ(i);
@@ -225,19 +210,15 @@ ZTEST(arm_thread_swap, test_arm_syscalls)
 	 * i.e. to allow the inspection of the thread state
 	 * while running in user mode.
 	 */
-	 SCB->CCR |= SCB_CCR_USERSETMPEND_Msk;
+	SCB->CCR |= SCB_CCR_USERSETMPEND_Msk;
 #endif /* CONFIG_ARMV7_M_ARMV8_M_MAINLINE*/
 
 	/* Create and switch to a user thread, passing
 	 * as argument the IRQ line to used in the test.
 	 */
-	k_thread_create(&user_thread,
-		user_thread_stack,
-		K_THREAD_STACK_SIZEOF(user_thread_stack),
-		user_thread_entry,
-		(uint32_t *)i, NULL, NULL,
-		K_PRIO_COOP(PRIORITY), K_USER,
-		K_NO_WAIT);
+	k_thread_create(&user_thread, user_thread_stack, K_THREAD_STACK_SIZEOF(user_thread_stack),
+			user_thread_entry, (uint32_t *)i, NULL, NULL, K_PRIO_COOP(PRIORITY), K_USER,
+			K_NO_WAIT);
 }
 
 void z_impl_test_arm_cpu_write_reg(void)
@@ -254,12 +235,10 @@ void z_impl_test_arm_cpu_write_reg(void)
 	 * after returning from the system call
 	 */
 	TC_PRINT("Writing 0xDEADBEEF values into registers\n");
-	__asm__ volatile (
-		"ldr r0, =0xDEADBEEF;\n\t"
-		"ldr r1, =0xDEADBEEF;\n\t"
-		"ldr r2, =0xDEADBEEF;\n\t"
-		"ldr r3, =0xDEADBEEF;\n\t"
-		);
+	__asm__ volatile("ldr r0, =0xDEADBEEF;\n\t"
+			 "ldr r1, =0xDEADBEEF;\n\t"
+			 "ldr r2, =0xDEADBEEF;\n\t"
+			 "ldr r3, =0xDEADBEEF;\n\t");
 	TC_PRINT("Exit from system call\n");
 }
 
@@ -286,15 +265,15 @@ ZTEST_USER(arm_thread_swap, test_syscall_cpu_scrubs_regs)
 
 	test_arm_cpu_write_reg();
 
-	__asm__ volatile ("mov %0, r0" : "=r"(arm_reg_val[0]));
-	__asm__ volatile ("mov %0, r1" : "=r"(arm_reg_val[1]));
-	__asm__ volatile ("mov %0, r2" : "=r"(arm_reg_val[2]));
-	__asm__ volatile ("mov %0, r3" : "=r"(arm_reg_val[3]));
+	__asm__ volatile("mov %0, r0" : "=r"(arm_reg_val[0]));
+	__asm__ volatile("mov %0, r1" : "=r"(arm_reg_val[1]));
+	__asm__ volatile("mov %0, r2" : "=r"(arm_reg_val[2]));
+	__asm__ volatile("mov %0, r3" : "=r"(arm_reg_val[3]));
 
 	for (int i = 0; i < 4; i++) {
 		zassert_not_equal(arm_reg_val[i], DB_VAL,
-				"register value is 0xDEADBEEF, "
-				"not scrubbed after system call.");
+				  "register value is 0xDEADBEEF, "
+				  "not scrubbed after system call.");
 	}
 }
 #else
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
index a617abe06802f..7572982a775e5 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c
@@ -12,19 +12,18 @@
 #include <offsets_short_arch.h>
 #include <ksched.h>
 
-#if !defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && \
-	!defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+#if !defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 #error "Unsupported architecture"
 #endif
 
-#define PRIORITY 0
+#define PRIORITY           0
 #define BASEPRI_MODIFIED_1 0x20
 #define BASEPRI_MODIFIED_2 0x40
 #define SWAP_RETVAL        0x1234
 
 #ifndef EXC_RETURN_FTYPE
 /* bit [4] allocate stack for floating-point context: 0=done 1=skipped  */
-#define EXC_RETURN_FTYPE           (0x00000010UL)
+#define EXC_RETURN_FTYPE (0x00000010UL)
 #endif
 
 #if defined(CONFIG_ARMV8_1_M_MAINLINE)
@@ -32,9 +31,9 @@
  * For ARMv8.1-M, the FPSCR[18:16] LTPSIZE field may always read 0b010 if MVE
  * is not implemented, so mask it when validating the value of the FPSCR.
  */
-#define FPSCR_MASK		(~FPU_FPDSCR_LTPSIZE_Msk)
+#define FPSCR_MASK (~FPU_FPDSCR_LTPSIZE_Msk)
 #else
-#define FPSCR_MASK		(0xffffffffU)
+#define FPSCR_MASK (0xffffffffU)
 #endif
 
 extern void z_move_thread_to_end_of_prio_q(struct k_thread *thread);
@@ -53,75 +52,54 @@ int ztest_swap_return_val;
 /* Arbitrary values for the callee-saved registers,
  * enforced in the beginning of the test.
  */
-const _callee_saved_t ztest_thread_callee_saved_regs_init = {
-	.v1 = 0x12345678, .v2 = 0x23456789, .v3 = 0x3456789a, .v4 = 0x456789ab,
-	.v5 = 0x56789abc, .v6 = 0x6789abcd, .v7 = 0x789abcde, .v8 = 0x89abcdef
-};
+const _callee_saved_t ztest_thread_callee_saved_regs_init = {.v1 = 0x12345678,
+							     .v2 = 0x23456789,
+							     .v3 = 0x3456789a,
+							     .v4 = 0x456789ab,
+							     .v5 = 0x56789abc,
+							     .v6 = 0x6789abcd,
+							     .v7 = 0x789abcde,
+							     .v8 = 0x89abcdef};
 
 static void load_callee_saved_regs(const _callee_saved_t *regs)
 {
 	/* Load the callee-saved registers with given values */
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
-	__asm__ volatile (
-		"mov r1, r7;\n\t"
-		"mov r0, %0;\n\t"
-		"add r0, #16;\n\t"
-		"ldmia r0!, {r4-r7};\n\t"
-		"mov r8, r4;\n\t"
-		"mov r9, r5;\n\t"
-		"mov r10, r6;\n\t"
-		"mov r11, r7;\n\t"
-		"sub r0, #32;\n\t"
-		"ldmia r0!, {r4-r7};\n\t"
-		"mov r7, r1;\n\t"
-		: /* no output */
-		: "r" (regs)
-		: "memory", "r1", "r0"
-	);
+	__asm__ volatile("mov r1, r7;\n\t"
+			 "mov r0, %0;\n\t"
+			 "add r0, #16;\n\t"
+			 "ldmia r0!, {r4-r7};\n\t"
+			 "mov r8, r4;\n\t"
+			 "mov r9, r5;\n\t"
+			 "mov r10, r6;\n\t"
+			 "mov r11, r7;\n\t"
+			 "sub r0, #32;\n\t"
+			 "ldmia r0!, {r4-r7};\n\t"
+			 "mov r7, r1;\n\t"
+			 : /* no output */
+			 : "r"(regs)
+			 : "memory", "r1", "r0");
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__asm__ volatile (
-		"mov r1, r7;\n\t"
-		"ldmia %0, {v1-v8};\n\t"
-		"mov r7, r1;\n\t"
-		: /* no output */
-		: "r" (regs)
-		: "memory", "r1"
-	);
+	__asm__ volatile("mov r1, r7;\n\t"
+			 "ldmia %0, {v1-v8};\n\t"
+			 "mov r7, r1;\n\t"
+			 : /* no output */
+			 : "r"(regs)
+			 : "memory", "r1");
 #endif
 	barrier_dsync_fence_full();
 }
 
-static void verify_callee_saved(const _callee_saved_t *src,
-		const _callee_saved_t *dst)
+static void verify_callee_saved(const _callee_saved_t *src, const _callee_saved_t *dst)
 {
 	/* Verify callee-saved registers are as expected */
-	zassert_true((src->v1 == dst->v1)
-			&& (src->v2 == dst->v2)
-			&& (src->v3 == dst->v3)
-			&& (src->v4 == dst->v4)
-			&& (src->v5 == dst->v5)
-			&& (src->v6 == dst->v6)
-			&& (src->v7 == dst->v7)
-			&& (src->v8 == dst->v8),
-		" got: 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n"
-		" expected:  0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n",
-		src->v1,
-		src->v2,
-		src->v3,
-		src->v4,
-		src->v5,
-		src->v6,
-		src->v7,
-		src->v8,
-		dst->v1,
-		dst->v2,
-		dst->v3,
-		dst->v4,
-		dst->v5,
-		dst->v6,
-		dst->v7,
-		dst->v8
-	);
+	zassert_true((src->v1 == dst->v1) && (src->v2 == dst->v2) && (src->v3 == dst->v3) &&
+			     (src->v4 == dst->v4) && (src->v5 == dst->v5) && (src->v6 == dst->v6) &&
+			     (src->v7 == dst->v7) && (src->v8 == dst->v8),
+		     " got: 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n"
+		     " expected:  0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n",
+		     src->v1, src->v2, src->v3, src->v4, src->v5, src->v6, src->v7, src->v8,
+		     dst->v1, dst->v2, dst->v3, dst->v4, dst->v5, dst->v6, dst->v7, dst->v8);
 }
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
@@ -131,85 +109,57 @@ static void verify_callee_saved(const _callee_saved_t *src,
 
 /* Arbitrary values for the floating-point callee-saved registers */
 struct _preempt_float ztest_thread_fp_callee_saved_regs = {
-	.s16 = 0x11111111, .s17 = 0x22222222,
-	.s18 = 0x33333333, .s19 = 0x44444444,
-	.s20 = 0x55555555, .s21 = 0x66666666,
-	.s22 = 0x77777777, .s23 = 0x88888888,
-	.s24 = 0x99999999, .s25 = 0xaaaaaaaa,
-	.s26 = 0xbbbbbbbb, .s27 = 0xcccccccc,
-	.s28 = 0xdddddddd, .s29 = 0xeeeeeeee,
-	.s30 = 0xffffffff, .s31 = 0x00000000,
+	.s16 = 0x11111111,
+	.s17 = 0x22222222,
+	.s18 = 0x33333333,
+	.s19 = 0x44444444,
+	.s20 = 0x55555555,
+	.s21 = 0x66666666,
+	.s22 = 0x77777777,
+	.s23 = 0x88888888,
+	.s24 = 0x99999999,
+	.s25 = 0xaaaaaaaa,
+	.s26 = 0xbbbbbbbb,
+	.s27 = 0xcccccccc,
+	.s28 = 0xdddddddd,
+	.s29 = 0xeeeeeeee,
+	.s30 = 0xffffffff,
+	.s31 = 0x00000000,
 };
 
-static void load_fp_callee_saved_regs(
-	const volatile struct _preempt_float *regs)
+static void load_fp_callee_saved_regs(const volatile struct _preempt_float *regs)
 {
-	__asm__ volatile (
-		"vldmia %0, {s16-s31};\n\t"
-		:
-		: "r" (regs)
-		: "memory"
-		);
+	__asm__ volatile("vldmia %0, {s16-s31};\n\t" : : "r"(regs) : "memory");
 	barrier_dsync_fence_full();
 }
 
 static void verify_fp_callee_saved(const struct _preempt_float *src,
-		const struct _preempt_float *dst)
+				   const struct _preempt_float *dst)
 {
 	/* Verify FP callee-saved registers are as expected */
-	zassert_true((src->s16 == dst->s16)
-			&& (src->s17 == dst->s17)
-			&& (src->s18 == dst->s18)
-			&& (src->s19 == dst->s19)
-			&& (src->s20 == dst->s20)
-			&& (src->s21 == dst->s21)
-			&& (src->s22 == dst->s22)
-			&& (src->s23 == dst->s23)
-			&& (src->s24 == dst->s24)
-			&& (src->s25 == dst->s25)
-			&& (src->s26 == dst->s26)
-			&& (src->s27 == dst->s27)
-			&& (src->s28 == dst->s28)
-			&& (src->s29 == dst->s29)
-			&& (src->s30 == dst->s30)
-			&& (src->s31 == dst->s31),
-		" got: 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x"
-		" 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n"
-		" expected:  0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x"
-		" 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n",
-		(double)src->s16,
-		(double)src->s17,
-		(double)src->s18,
-		(double)src->s19,
-		(double)src->s20,
-		(double)src->s21,
-		(double)src->s22,
-		(double)src->s23,
-		(double)src->s24,
-		(double)src->s25,
-		(double)src->s26,
-		(double)src->s27,
-		(double)src->s28,
-		(double)src->s29,
-		(double)src->s30,
-		(double)src->s31,
-		(double)dst->s16,
-		(double)dst->s17,
-		(double)dst->s18,
-		(double)dst->s19,
-		(double)dst->s20,
-		(double)dst->s21,
-		(double)dst->s22,
-		(double)dst->s23,
-		(double)dst->s24,
-		(double)dst->s25,
-		(double)dst->s26,
-		(double)dst->s27,
-		(double)dst->s28,
-		(double)dst->s29,
-		(double)dst->s30,
-		(double)dst->s31
-	);
+	/* clang-format off */
+	zassert_true((src->s16 == dst->s16) &&
+		     (src->s17 == dst->s17) && (src->s18 == dst->s18) &&
+		     (src->s19 == dst->s19) && (src->s20 == dst->s20) &&
+		     (src->s21 == dst->s21) && (src->s22 == dst->s22) &&
+		     (src->s23 == dst->s23) && (src->s24 == dst->s24) &&
+		     (src->s25 == dst->s25) && (src->s26 == dst->s26) &&
+		     (src->s27 == dst->s27) && (src->s28 == dst->s28) &&
+		     (src->s29 == dst->s29) && (src->s30 == dst->s30) &&
+		     (src->s31 == dst->s31),
+		     " got: 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x"
+		     " 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n"
+		     " expected:  0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x"
+		     " 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n",
+		     (double)src->s16, (double)src->s17, (double)src->s18, (double)src->s19,
+		     (double)src->s20, (double)src->s21, (double)src->s22, (double)src->s23,
+		     (double)src->s24, (double)src->s25, (double)src->s26, (double)src->s27,
+		     (double)src->s28, (double)src->s29, (double)src->s30, (double)src->s31,
+		     (double)dst->s16, (double)dst->s17, (double)dst->s18, (double)dst->s19,
+		     (double)dst->s20, (double)dst->s21, (double)dst->s22, (double)dst->s23,
+		     (double)dst->s24, (double)dst->s25, (double)dst->s26, (double)dst->s27,
+		     (double)dst->s28, (double)dst->s29, (double)dst->s30, (double)dst->s31);
+	/* clang-format on */
 }
 
 #else
@@ -226,91 +176,85 @@ static void alt_thread_entry(void *p1, void *p2, void *p3)
 	int init_flag, post_flag;
 
 	/* Lock interrupts to make sure we get preempted only when
-	 * it is required by the test */
+	 * it is required by the test
+	 */
 	(void)irq_lock();
 
 	init_flag = switch_flag;
 	zassert_true(init_flag == false,
-		"Alternative thread: switch flag not false on thread entry\n");
+		     "Alternative thread: switch flag not false on thread entry\n");
 
 	/* Set switch flag */
 	switch_flag = true;
 
 #if defined(CONFIG_NO_OPTIMIZATIONS)
 	zassert_true(p_ztest_thread->arch.basepri == 0,
-		"ztest thread basepri not preserved in swap-out\n");
+		     "ztest thread basepri not preserved in swap-out\n");
 #else
 	/* Verify that the main test thread has the correct value
 	 * for state variable thread.arch.basepri (set before swap).
 	 */
 	zassert_true(p_ztest_thread->arch.basepri == BASEPRI_MODIFIED_1,
-		"ztest thread basepri not preserved in swap-out\n");
+		     "ztest thread basepri not preserved in swap-out\n");
 
 	/* Verify original swap return value (set by arch_swap() */
 	zassert_true(p_ztest_thread->arch.swap_return_value == -EAGAIN,
-		"ztest thread swap-return-value not preserved in swap-out\n");
+		     "ztest thread swap-return-value not preserved in swap-out\n");
 #endif
 
 	/* Verify that the main test thread (ztest) has stored the callee-saved
 	 * registers properly in its corresponding callee-saved container.
 	 */
-	verify_callee_saved(
-		(const _callee_saved_t *)&p_ztest_thread->callee_saved,
-		&ztest_thread_callee_saved_regs_container);
+	verify_callee_saved((const _callee_saved_t *)&p_ztest_thread->callee_saved,
+			    &ztest_thread_callee_saved_regs_container);
 
 	/* Zero the container of the callee-saved registers, to validate,
 	 * later, that it is populated properly.
 	 */
-	memset(&ztest_thread_callee_saved_regs_container,
-		0, sizeof(_callee_saved_t));
+	memset(&ztest_thread_callee_saved_regs_container, 0, sizeof(_callee_saved_t));
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 
 	/*  Verify that the _current_ (alt) thread is initialized with FPCA cleared. */
 	zassert_true((__get_CONTROL() & CONTROL_FPCA_Msk) == 0,
-		"CONTROL.FPCA is not cleared at initialization: 0x%x\n",
-		__get_CONTROL());
+		     "CONTROL.FPCA is not cleared at initialization: 0x%x\n", __get_CONTROL());
 
 	/* Verify that the _current_ (alt) thread is
 	 * initialized with EXC_RETURN.Ftype set
 	 */
 	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
-		"Alt thread FPCA flag not clear at initialization\n");
+		     "Alt thread FPCA flag not clear at initialization\n");
 #if defined(CONFIG_MPU_STACK_GUARD)
 	/* Alt thread is created with K_FP_REGS set, so we
 	 * expect lazy stacking and long guard to be enabled.
 	 */
-	zassert_true((_current->arch.mode &
-		Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0,
-		"Alt thread MPU GUAR DFLOAT flag not set at initialization\n");
+	zassert_true((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0,
+		     "Alt thread MPU GUAR DFLOAT flag not set at initialization\n");
 	zassert_true((_current->base.user_options & K_FP_REGS) != 0,
-		"Alt thread K_FP_REGS not set at initialization\n");
+		     "Alt thread K_FP_REGS not set at initialization\n");
 	zassert_true((FPU->FPCCR & FPU_FPCCR_LSPEN_Msk) != 0,
-		"Lazy FP Stacking not set at initialization\n");
+		     "Lazy FP Stacking not set at initialization\n");
 #endif
 
-
 	/* Verify that the _current_ (alt) thread is initialized with FPSCR cleared. */
 	zassert_true((__get_FPSCR() & FPSCR_MASK) == 0,
-		"(Alt thread) FPSCR is not cleared at initialization: 0x%x\n", __get_FPSCR());
+		     "(Alt thread) FPSCR is not cleared at initialization: 0x%x\n", __get_FPSCR());
 
 	zassert_true((p_ztest_thread->arch.mode_exc_return & EXC_RETURN_FTYPE) == 0,
-		"ztest thread mode Ftype flag not updated at swap-out: 0x%0x\n",
-		p_ztest_thread->arch.mode);
+		     "ztest thread mode Ftype flag not updated at swap-out: 0x%0x\n",
+		     p_ztest_thread->arch.mode);
 
 	/* Verify that the main test thread (ztest) has stored the FP
 	 *  callee-saved registers properly in its corresponding FP
 	 *  callee-saved container.
 	 */
-	verify_fp_callee_saved((const struct _preempt_float *)
-		&p_ztest_thread->arch.preempt_float,
-		&ztest_thread_fp_callee_saved_regs);
+	verify_fp_callee_saved((const struct _preempt_float *)&p_ztest_thread->arch.preempt_float,
+			       &ztest_thread_fp_callee_saved_regs);
 
 	/* Zero the container of the FP callee-saved registers, to validate,
 	 * later, that it is populated properly.
 	 */
-	memset(&ztest_thread_fp_callee_saved_regs,
-		0, sizeof(ztest_thread_fp_callee_saved_regs));
+	memset(&ztest_thread_fp_callee_saved_regs, 0, sizeof(ztest_thread_fp_callee_saved_regs));
 
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 
@@ -336,7 +280,7 @@ static void alt_thread_entry(void *p1, void *p2, void *p3)
 	 * Note: preserve r7 register (frame pointer).
 	 */
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
-	__asm__ volatile (
+	__asm__ volatile(
 		/* Stash r4-r11 in stack, they will be restored much later in
 		 * another inline asm -- that should be reworked since stack
 		 * must be balanced when we leave any inline asm. We could
@@ -373,21 +317,18 @@ static void alt_thread_entry(void *p1, void *p2, void *p3)
 		"pop {r0, r7};\n\t"
 
 		: /* no output */
-		: "r" (&ztest_thread_callee_saved_regs_container)
-		: "memory", "r0", "r2", "r3"
-	);
+		: "r"(&ztest_thread_callee_saved_regs_container)
+		: "memory", "r0", "r2", "r3");
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__asm__ volatile (
-		"push {v1-v8};\n\t"
-		"push {r0, r1};\n\t"
-		"mov r0, r7;\n\t"
-		"ldmia %0, {v1-v8};\n\t"
-		"mov r7, r0;\n\t"
-		"pop {r0, r1};\n\t"
-		: /* no output */
-		: "r" (&ztest_thread_callee_saved_regs_container)
-		: "memory", "r0"
-	);
+	__asm__ volatile("push {v1-v8};\n\t"
+			 "push {r0, r1};\n\t"
+			 "mov r0, r7;\n\t"
+			 "ldmia %0, {v1-v8};\n\t"
+			 "mov r7, r0;\n\t"
+			 "pop {r0, r1};\n\t"
+			 : /* no output */
+			 : "r"(&ztest_thread_callee_saved_regs_container)
+			 : "memory", "r0");
 #endif
 
 	/* Manually trigger a context-switch, to swap-out
@@ -399,20 +340,17 @@ static void alt_thread_entry(void *p1, void *p2, void *p3)
 
 	/* Restore stacked callee-saved registers */
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
-	__asm__ volatile (
-		"pop {r4, r5, r6, r7};\n\t"
-		"mov r8, r4;\n\t"
-		"mov r9, r5;\n\t"
-		"mov r10, r6;\n\t"
-		"mov r11, r7;\n\t"
-		"pop {r4, r5, r6, r7};\n\t"
-		: : :
-	);
+	__asm__ volatile("pop {r4, r5, r6, r7};\n\t"
+			 "mov r8, r4;\n\t"
+			 "mov r9, r5;\n\t"
+			 "mov r10, r6;\n\t"
+			 "mov r11, r7;\n\t"
+			 "pop {r4, r5, r6, r7};\n\t"
+			 :
+			 :
+			 :);
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__asm__ volatile (
-		"pop {v1-v8};\n\t"
-		: : :
-	);
+	__asm__ volatile("pop {v1-v8};\n\t" : : :);
 #endif
 
 	/* Verify that the main test thread has managed to resume, before
@@ -422,7 +360,7 @@ static void alt_thread_entry(void *p1, void *p2, void *p3)
 	 */
 	post_flag = switch_flag;
 	zassert_true(post_flag == false,
-		"Alternative thread: switch flag not false on thread exit\n");
+		     "Alternative thread: switch flag not false on thread exit\n");
 }
 
 #if !defined(CONFIG_NO_OPTIMIZATIONS)
@@ -462,90 +400,77 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 
 	/* Confirm initial conditions before starting the test. */
 	test_flag = switch_flag;
-	zassert_true(test_flag == false,
-		"Switch flag not initialized properly\n");
+	zassert_true(test_flag == false, "Switch flag not initialized properly\n");
 	zassert_true(_current->arch.basepri == 0,
-		"Thread BASEPRI flag not clear at thread start\n");
+		     "Thread BASEPRI flag not clear at thread start\n");
 	/* Verify, also, that the interrupts are unlocked. */
 #if defined(CONFIG_CPU_CORTEX_M_HAS_BASEPRI)
-	zassert_true(__get_BASEPRI() == 0,
-		"initial BASEPRI not zero\n");
+	zassert_true(__get_BASEPRI() == 0, "initial BASEPRI not zero\n");
 #else
 	/* For Cortex-M Baseline architecture, we verify that
 	 * the interrupt lock is disabled.
 	 */
-	 zassert_true(__get_PRIMASK() == 0,
-	 "initial PRIMASK not zero\n");
+	zassert_true(__get_PRIMASK() == 0, "initial PRIMASK not zero\n");
 #endif /* CONFIG_CPU_CORTEX_M_HAS_BASEPRI */
 
 #if defined(CONFIG_USERSPACE)
 	/* The main test thread is set to run in privilege mode */
 	zassert_false((arch_is_user_context()),
-		"Main test thread does not start in privilege mode\n");
+		      "Main test thread does not start in privilege mode\n");
 
 	/* Assert that the mode status variable indicates privilege mode */
 	zassert_true((_current->arch.mode & CONTROL_nPRIV_Msk) == 0,
-		"Thread nPRIV flag not clear for supervisor thread: 0x%0x\n",
-		_current->arch.mode);
+		     "Thread nPRIV flag not clear for supervisor thread: 0x%0x\n",
+		     _current->arch.mode);
 #endif /* CONFIG_USERSPACE */
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	/* The main test thread is not (yet) actively using the FP registers */
 	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
-		"Thread Ftype flag not set at initialization 0x%0x\n",
-		_current->arch.mode);
+		     "Thread Ftype flag not set at initialization 0x%0x\n", _current->arch.mode);
 
 	/* Verify that the main test thread is initialized with FPCA cleared. */
 	zassert_true((__get_CONTROL() & CONTROL_FPCA_Msk) == 0,
-		"CONTROL.FPCA is not cleared at initialization: 0x%x\n",
-		__get_CONTROL());
+		     "CONTROL.FPCA is not cleared at initialization: 0x%x\n", __get_CONTROL());
 	/* Verify that the main test thread is initialized with FPSCR cleared. */
 	zassert_true((__get_FPSCR() & FPSCR_MASK) == 0,
-		"FPSCR is not cleared at initialization: 0x%x\n", __get_FPSCR());
+		     "FPSCR is not cleared at initialization: 0x%x\n", __get_FPSCR());
 
 	/* Clear the thread's floating-point callee-saved registers' container.
 	 * The container will, later, be populated by the swap mechanism.
 	 */
-	memset(&_current->arch.preempt_float, 0,
-		sizeof(struct _preempt_float));
+	memset(&_current->arch.preempt_float, 0, sizeof(struct _preempt_float));
 
 	/* Randomize the FP callee-saved registers at test initialization */
 	load_fp_callee_saved_regs(&ztest_thread_fp_callee_saved_regs);
 
 	/* Modify bit-0 of the FPSCR - will be checked again upon swap-in. */
-	zassert_true((__get_FPSCR() & 0x1) == 0,
-		"FPSCR bit-0 has been set before testing it\n");
+	zassert_true((__get_FPSCR() & 0x1) == 0, "FPSCR bit-0 has been set before testing it\n");
 	__set_FPSCR(__get_FPSCR() | 0x1);
 
 	/* The main test thread is using the FP registers, but the .mode
 	 * flag is not updated until the next context switch.
 	 */
 	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) != 0,
-		"Thread Ftype flag not set at initialization\n");
+		     "Thread Ftype flag not set at initialization\n");
 #if defined(CONFIG_MPU_STACK_GUARD)
-	zassert_true((_current->arch.mode &
-		Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) == 0,
-		"Thread MPU GUAR DFLOAT flag not clear at initialization\n");
+	zassert_true((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) == 0,
+		     "Thread MPU GUAR DFLOAT flag not clear at initialization\n");
 	zassert_true((_current->base.user_options & K_FP_REGS) == 0,
-		"Thread K_FP_REGS not clear at initialization\n");
+		     "Thread K_FP_REGS not clear at initialization\n");
 	zassert_true((FPU->FPCCR & FPU_FPCCR_LSPEN_Msk) == 0,
-		"Lazy FP Stacking not clear at initialization\n");
+		     "Lazy FP Stacking not clear at initialization\n");
 #endif
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 
 	/* Create an alternative (supervisor) testing thread */
-	k_thread_create(&alt_thread,
-		alt_thread_stack,
-		K_THREAD_STACK_SIZEOF(alt_thread_stack),
-		alt_thread_entry,
-		NULL, NULL, NULL,
-		K_PRIO_COOP(PRIORITY), ALT_THREAD_OPTIONS,
-		K_NO_WAIT);
+	k_thread_create(&alt_thread, alt_thread_stack, K_THREAD_STACK_SIZEOF(alt_thread_stack),
+			alt_thread_entry, NULL, NULL, NULL, K_PRIO_COOP(PRIORITY),
+			ALT_THREAD_OPTIONS, K_NO_WAIT);
 
 	/* Verify context-switch has not occurred. */
 	test_flag = switch_flag;
-	zassert_true(test_flag == false,
-		"Switch flag incremented when it should not have\n");
+	zassert_true(test_flag == false, "Switch flag incremented when it should not have\n");
 
 	/* Prepare to force a context switch to the alternative thread,
 	 * by manually adding the current thread to the end of the queue,
@@ -565,8 +490,7 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 
 	/* Verify context-switch has not occurred yet. */
 	test_flag = switch_flag;
-	zassert_true(test_flag == false,
-		"Switch flag incremented by unexpected context-switch.\n");
+	zassert_true(test_flag == false, "Switch flag incremented by unexpected context-switch.\n");
 
 	/* Store the callee-saved registers to some global memory
 	 * accessible to the alternative testing thread. That
@@ -575,27 +499,24 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 * registers' container.
 	 */
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
-	__asm__ volatile (
-		"push {r0, r1, r2, r3};\n\t"
-		"mov r1, %0;\n\t"
-		"stmia r1!, {r4-r7};\n\t"
-		"mov r2, r8;\n\t"
-		"mov r3, r9;\n\t"
-		"stmia r1!, {r2-r3};\n\t"
-		"mov r2, r10;\n\t"
-		"mov r3, r11;\n\t"
-		"stmia r1!, {r2-r3};\n\t"
-		"pop {r0, r1, r2, r3};\n\t"
-		:	: "r" (&ztest_thread_callee_saved_regs_container)
-		: "memory"
-	);
- #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__asm__ volatile (
-		"stmia %0, {v1-v8};\n\t"
-		:
-		: "r" (&ztest_thread_callee_saved_regs_container)
-		: "memory"
-	);
+	__asm__ volatile("push {r0, r1, r2, r3};\n\t"
+			 "mov r1, %0;\n\t"
+			 "stmia r1!, {r4-r7};\n\t"
+			 "mov r2, r8;\n\t"
+			 "mov r3, r9;\n\t"
+			 "stmia r1!, {r2-r3};\n\t"
+			 "mov r2, r10;\n\t"
+			 "mov r3, r11;\n\t"
+			 "stmia r1!, {r2-r3};\n\t"
+			 "pop {r0, r1, r2, r3};\n\t"
+			 :
+			 : "r"(&ztest_thread_callee_saved_regs_container)
+			 : "memory");
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	__asm__ volatile("stmia %0, {v1-v8};\n\t"
+			 :
+			 : "r"(&ztest_thread_callee_saved_regs_container)
+			 : "memory");
 #endif
 
 	/* Manually trigger a context-switch to swap-out the current thread.
@@ -608,7 +529,7 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	irq_unlock(0);
 	/* The thread is now swapped-back in. */
 
-#else/* CONFIG_NO_OPTIMIZATIONS */
+#else /* CONFIG_NO_OPTIMIZATIONS */
 
 	/* Fake a different irq_unlock key when performing swap.
 	 * This will be verified by the alternative test thread.
@@ -622,27 +543,24 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 
 	/* Dump callee-saved registers to memory. */
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
-	__asm__ volatile (
-		"push {r0, r1, r2, r3};\n\t"
-		"mov r1, %0;\n\t"
-		"stmia r1!, {r4-r7};\n\t"
-		"mov r2, r8;\n\t"
-		"mov r3, r9;\n\t"
-		"stmia r1!, {r2-r3};\n\t"
-		"mov r2, r10;\n\t"
-		"mov r3, r11;\n\t"
-		"stmia r1!, {r2-r3};\n\t"
-		"pop {r0, r1, r2, r3};\n\t"
-		:	: "r" (&ztest_thread_callee_saved_regs_container)
-		: "memory"
-	);
- #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__asm__ volatile (
-		"stmia %0, {v1-v8};\n\t"
-		:
-		: "r" (&ztest_thread_callee_saved_regs_container)
-		: "memory"
-	);
+	__asm__ volatile("push {r0, r1, r2, r3};\n\t"
+			 "mov r1, %0;\n\t"
+			 "stmia r1!, {r4-r7};\n\t"
+			 "mov r2, r8;\n\t"
+			 "mov r3, r9;\n\t"
+			 "stmia r1!, {r2-r3};\n\t"
+			 "mov r2, r10;\n\t"
+			 "mov r3, r11;\n\t"
+			 "stmia r1!, {r2-r3};\n\t"
+			 "pop {r0, r1, r2, r3};\n\t"
+			 :
+			 : "r"(&ztest_thread_callee_saved_regs_container)
+			 : "memory");
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	__asm__ volatile("stmia %0, {v1-v8};\n\t"
+			 :
+			 : "r"(&ztest_thread_callee_saved_regs_container)
+			 : "memory");
 #endif
 
 #if !defined(CONFIG_NO_OPTIMIZATIONS)
@@ -652,38 +570,30 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 * used, as base register in the Store Multiple instruction.
 	 * We also enforce write-back to suppress assembler warning.
 	 */
-	__asm__ volatile (
-		"push {r0, r1, r2, r3, r4, r5, r6, r7};\n\t"
-		"stm %0!, {%1};\n\t"
-		"pop {r0, r1, r2, r3, r4, r5, r6, r7};\n\t"
-		:
-		: "r" (&ztest_swap_return_val), "r" (swap_return_val)
-		: "memory"
-	);
+	__asm__ volatile("push {r0, r1, r2, r3, r4, r5, r6, r7};\n\t"
+			 "stm %0!, {%1};\n\t"
+			 "pop {r0, r1, r2, r3, r4, r5, r6, r7};\n\t"
+			 :
+			 : "r"(&ztest_swap_return_val), "r"(swap_return_val)
+			 : "memory");
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__asm__ volatile (
-		"stm %0, {%1};\n\t"
-		:
-		: "r" (&ztest_swap_return_val), "r" (swap_return_val)
-		: "memory"
-	);
+	__asm__ volatile("stm %0, {%1};\n\t"
+			 :
+			 : "r"(&ztest_swap_return_val), "r"(swap_return_val)
+			 : "memory");
 #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
 #endif
 
-
 	/* After swap-back, verify that the callee-saved registers loaded,
 	 * look exactly as what is located in the respective callee-saved
 	 * container of the thread.
 	 */
-	verify_callee_saved(
-		&ztest_thread_callee_saved_regs_container,
-		&_current->callee_saved);
+	verify_callee_saved(&ztest_thread_callee_saved_regs_container, &_current->callee_saved);
 
 	/* Verify context-switch did occur. */
 	test_flag = switch_flag;
-	zassert_true(test_flag == true,
-		"Switch flag not incremented as expected %u\n",
-		switch_flag);
+	zassert_true(test_flag == true, "Switch flag not incremented as expected %u\n",
+		     switch_flag);
 	/* Clear the switch flag to signal that the main test thread
 	 * has been successfully swapped-in, as expected by the test.
 	 */
@@ -694,71 +604,63 @@ ZTEST(arm_thread_swap, test_arm_thread_swap)
 	 * is now switched back in.
 	 */
 	zassert_true(_current->arch.basepri == 0,
-		"arch.basepri value not in accordance with the update\n");
+		     "arch.basepri value not in accordance with the update\n");
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_BASEPRI)
 	/* Verify that the BASEPRI register is updated during the last
 	 * swap-in of the thread.
 	 */
 	zassert_true(__get_BASEPRI() == BASEPRI_MODIFIED_2,
-		"BASEPRI not in accordance with the update: 0x%0x\n",
-		__get_BASEPRI());
+		     "BASEPRI not in accordance with the update: 0x%0x\n", __get_BASEPRI());
 #else
 	/* For Cortex-M Baseline architecture, we verify that
 	 * the interrupt lock is enabled.
 	 */
-	 zassert_true(__get_PRIMASK() != 0,
-	 "PRIMASK not in accordance with the update: 0x%0x\n",
-	 __get_PRIMASK());
+	zassert_true(__get_PRIMASK() != 0, "PRIMASK not in accordance with the update: 0x%0x\n",
+		     __get_PRIMASK());
 #endif /* CONFIG_CPU_CORTEX_M_HAS_BASEPRI */
 
 #if !defined(CONFIG_NO_OPTIMIZATIONS)
 	/* The thread is now swapped-back in. */
 	zassert_equal(_current->arch.swap_return_value, SWAP_RETVAL,
-		"Swap value not set as expected: 0x%x (0x%x)\n",
-		_current->arch.swap_return_value, SWAP_RETVAL);
+		      "Swap value not set as expected: 0x%x (0x%x)\n",
+		      _current->arch.swap_return_value, SWAP_RETVAL);
 	zassert_equal(_current->arch.swap_return_value, ztest_swap_return_val,
-		"Swap value not returned as expected 0x%x (0x%x)\n",
-		_current->arch.swap_return_value, ztest_swap_return_val);
+		      "Swap value not returned as expected 0x%x (0x%x)\n",
+		      _current->arch.swap_return_value, ztest_swap_return_val);
 #endif
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	/* Dump callee-saved registers to memory. */
-	__asm__ volatile (
-		"vstmia %0, {s16-s31};\n\t"
-		:
-		: "r" (&ztest_thread_fp_callee_saved_regs)
-		: "memory"
-	);
+	__asm__ volatile("vstmia %0, {s16-s31};\n\t"
+			 :
+			 : "r"(&ztest_thread_fp_callee_saved_regs)
+			 : "memory");
 
 	/* After swap-back, verify that the FP callee-saved registers loaded,
 	 * look exactly as what is located in the respective FP callee-saved
 	 * container of the thread.
 	 */
-	verify_fp_callee_saved(
-		&ztest_thread_fp_callee_saved_regs,
-		&_current->arch.preempt_float);
+	verify_fp_callee_saved(&ztest_thread_fp_callee_saved_regs, &_current->arch.preempt_float);
 
 	/* Verify that the main test thread restored the FPSCR bit-0. */
-	zassert_true((__get_FPSCR() & 0x1) == 0x1,
-		"FPSCR bit-0 not restored at swap: 0x%x\n", __get_FPSCR());
+	zassert_true((__get_FPSCR() & 0x1) == 0x1, "FPSCR bit-0 not restored at swap: 0x%x\n",
+		     __get_FPSCR());
 
 	/* The main test thread is using the FP registers, and the .mode
 	 * flag and MPU GUARD flag are now updated.
 	 */
 	zassert_true((_current->arch.mode_exc_return & EXC_RETURN_FTYPE) == 0,
-		"Thread Ftype flag not cleared after main returned back\n");
+		     "Thread Ftype flag not cleared after main returned back\n");
 #if defined(CONFIG_MPU_STACK_GUARD)
-	zassert_true((_current->arch.mode &
-		Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0,
-		"Thread MPU GUARD FLOAT flag not set\n");
+	zassert_true((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0,
+		     "Thread MPU GUARD FLOAT flag not set\n");
 	zassert_true((_current->base.user_options & K_FP_REGS) != 0,
-		"Thread K_FPREGS not set after main returned back\n");
+		     "Thread K_FPREGS not set after main returned back\n");
 	zassert_true((FPU->FPCCR & FPU_FPCCR_LSPEN_Msk) != 0,
-		"Lazy FP Stacking not set after main returned back\n");
+		     "Lazy FP Stacking not set after main returned back\n");
 #endif
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
-
 }
 /**
  * @}
diff --git a/tests/arch/arm/arm_thread_swap_tz/src/main.c b/tests/arch/arm/arm_thread_swap_tz/src/main.c
index ebb18fafded61..86cfd5333178b 100644
--- a/tests/arch/arm/arm_thread_swap_tz/src/main.c
+++ b/tests/arch/arm/arm_thread_swap_tz/src/main.c
@@ -10,7 +10,7 @@
 
 #ifndef EXC_RETURN_S
 /* bit [6] stack used to push registers: 0=Non-secure 1=Secure */
-#define EXC_RETURN_S               (0x00000040UL)
+#define EXC_RETURN_S (0x00000040UL)
 #endif
 
 #define HASH_LEN 32
@@ -27,8 +27,8 @@ static void do_hash(char *hash)
 	size_t len;
 
 	/* Calculate correct hash. */
-	psa_status_t status = psa_hash_compute(PSA_ALG_SHA_256, dummy_string,
-			sizeof(dummy_string), hash, HASH_LEN, &len);
+	psa_status_t status = psa_hash_compute(PSA_ALG_SHA_256, dummy_string, sizeof(dummy_string),
+					       hash, HASH_LEN, &len);
 
 	zassert_equal(PSA_SUCCESS, status, "psa_hash_compute_fail: %d\n", status);
 	zassert_equal(HASH_LEN, len, "hash length not correct\n");
@@ -39,12 +39,12 @@ static void work_func(struct k_work *work)
 #ifdef CONFIG_ARM_NONSECURE_PREEMPTIBLE_SECURE_CALLS
 	/* Check that the main thread was executing in secure mode. */
 	zassert_true(main_thread->arch.mode_exc_return & EXC_RETURN_S,
-		"EXC_RETURN not secure: 0x%x\n", main_thread->arch.mode_exc_return);
+		     "EXC_RETURN not secure: 0x%x\n", main_thread->arch.mode_exc_return);
 
 #else
 	/* Check that the main thread was executing in nonsecure mode. */
 	zassert_false(main_thread->arch.mode_exc_return & EXC_RETURN_S,
-		"EXC_RETURN not nonsecure: 0x%x\n", main_thread->arch.mode_exc_return);
+		      "EXC_RETURN not nonsecure: 0x%x\n", main_thread->arch.mode_exc_return);
 #endif
 
 	work_done = true;
@@ -54,27 +54,23 @@ static void work_func(struct k_work *work)
 	 */
 #ifdef CONFIG_CPU_HAS_FPU
 	uint32_t clobber_val[16] = {
-		0xdeadbee0, 0xdeadbee1, 0xdeadbee2, 0xdeadbee3,
-		0xdeadbee4, 0xdeadbee5, 0xdeadbee6, 0xdeadbee7,
-		0xdeadbee8, 0xdeadbee9, 0xdeadbeea, 0xdeadbeeb,
+		0xdeadbee0, 0xdeadbee1, 0xdeadbee2, 0xdeadbee3, 0xdeadbee4, 0xdeadbee5,
+		0xdeadbee6, 0xdeadbee7, 0xdeadbee8, 0xdeadbee9, 0xdeadbeea, 0xdeadbeeb,
 		0xdeadbeec, 0xdeadbeed, 0xdeadbeee, 0xdeadbeef,
 	};
 
-	__asm__ volatile(
-		"vldmia %0, {s0-s15}\n"
-		"vldmia %0, {s16-s31}\n"
-		:: "r" (clobber_val) :
-	);
+	__asm__ volatile("vldmia %0, {s0-s15}\n"
+			 "vldmia %0, {s16-s31}\n" ::"r"(clobber_val)
+			 :);
 #endif /* CONFIG_CPU_HAS_FPU */
 
 	/* Call a secure service here as well, to test the added complexity of
 	 * calling secure services from two threads.
 	 */
-	psa_status_t status = psa_hash_compare(PSA_ALG_SHA_256, dummy_string,
-			sizeof(dummy_string), dummy_digest_correct, HASH_LEN);
+	psa_status_t status = psa_hash_compare(PSA_ALG_SHA_256, dummy_string, sizeof(dummy_string),
+					       dummy_digest_correct, HASH_LEN);
 
 	zassert_equal(PSA_SUCCESS, status, "psa_hash_compare failed\n");
-
 }
 
 ZTEST(thread_swap_tz, test_thread_swap_tz)
@@ -108,25 +104,22 @@ ZTEST(thread_swap_tz, test_thread_swap_tz)
 	 */
 #ifdef CONFIG_CPU_HAS_FPU
 	uint32_t test_val0[16] = {
-		0x1a2b3c40, 0x1a2b3c41, 0x1a2b3c42, 0x1a2b3c43,
-		0x1a2b3c44, 0x1a2b3c45, 0x1a2b3c46, 0x1a2b3c47,
-		0x1a2b3c48, 0x1a2b3c49, 0x1a2b3c4a, 0x1a2b3c4b,
+		0x1a2b3c40, 0x1a2b3c41, 0x1a2b3c42, 0x1a2b3c43, 0x1a2b3c44, 0x1a2b3c45,
+		0x1a2b3c46, 0x1a2b3c47, 0x1a2b3c48, 0x1a2b3c49, 0x1a2b3c4a, 0x1a2b3c4b,
 		0x1a2b3c4c, 0x1a2b3c4d, 0x1a2b3c4e, 0x1a2b3c4f,
 	};
 	uint32_t test_val1[16] = {
-		0x2b3c4d50, 0x2b3c4d51, 0x2b3c4d52, 0x2b3c4d53,
-		0x2b3c4d54, 0x2b3c4d55, 0x2b3c4d56, 0x2b3c4d57,
-		0x2b3c4d58, 0x2b3c4d59, 0x2b3c4d5a, 0x2b3c4d5b,
+		0x2b3c4d50, 0x2b3c4d51, 0x2b3c4d52, 0x2b3c4d53, 0x2b3c4d54, 0x2b3c4d55,
+		0x2b3c4d56, 0x2b3c4d57, 0x2b3c4d58, 0x2b3c4d59, 0x2b3c4d5a, 0x2b3c4d5b,
 		0x2b3c4d5c, 0x2b3c4d5d, 0x2b3c4d5e, 0x2b3c4d5f,
 	};
 	uint32_t test_val_res0[16];
 	uint32_t test_val_res1[16];
 
-	__asm__ volatile(
-		"vldmia %0, {s0-s15}\n"
-		"vldmia %1, {s16-s31}\n"
-		:: "r" (test_val0), "r" (test_val1) :
-	);
+	__asm__ volatile("vldmia %0, {s0-s15}\n"
+			 "vldmia %1, {s16-s31}\n" ::"r"(test_val0),
+			 "r"(test_val1)
+			 :);
 
 #endif /* CONFIG_CPU_HAS_FPU */
 
@@ -135,11 +128,10 @@ ZTEST(thread_swap_tz, test_thread_swap_tz)
 	zassert_true(work_done, "Interrupting work never happened\n");
 
 #ifdef CONFIG_CPU_HAS_FPU
-	__asm__ volatile(
-		"vstmia %0, {s0-s15}\n"
-		"vstmia %1, {s16-s31}\n"
-		:: "r" (test_val_res0), "r" (test_val_res1) :
-	);
+	__asm__ volatile("vstmia %0, {s0-s15}\n"
+			 "vstmia %1, {s16-s31}\n" ::"r"(test_val_res0),
+			 "r"(test_val_res1)
+			 :);
 
 	zassert_mem_equal(dummy_digest, dummy_digest_correct, HASH_LEN, NULL);
 	zassert_mem_equal(test_val0, test_val_res0, sizeof(test_val0), NULL);
diff --git a/tests/arch/arm/arm_tz_wrap_func/src/main.c b/tests/arch/arm/arm_tz_wrap_func/src/main.c
index 407873f906b70..c100dfcd2f084 100644
--- a/tests/arch/arm/arm_tz_wrap_func/src/main.c
+++ b/tests/arch/arm/arm_tz_wrap_func/src/main.c
@@ -33,7 +33,6 @@ void reset_mocks(void)
 	foo1_arg4 = 0;
 }
 
-
 void preface(void)
 {
 	zassert_true(expect_preface, "%s unexpectedly called", __func__);
@@ -42,12 +41,10 @@ void preface(void)
 	expect_foo1 = true;
 }
 
-
 uint32_t foo1(uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4)
 {
 	zassert_true(expect_foo1, "%s unexpectedly called", __func__);
-	zassert_equal(arg1, foo1_arg1, "Was 0x%"PRIx32", expected 0x%"PRIx32,
-		arg1, foo1_arg1);
+	zassert_equal(arg1, foo1_arg1, "Was 0x%" PRIx32 ", expected 0x%" PRIx32, arg1, foo1_arg1);
 	zassert_equal(arg2, foo1_arg2);
 	zassert_equal(arg3, foo1_arg3);
 	zassert_equal(arg4, foo1_arg4);
@@ -57,7 +54,6 @@ uint32_t foo1(uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4)
 	return foo1_retval;
 }
 
-
 void postface(void)
 {
 	zassert_true(expect_postface, "%s unexpectedly called", __func__);
@@ -65,14 +61,12 @@ void postface(void)
 	postface_called = true;
 }
 
-
-uint32_t __attribute__((naked)) wrap_foo1(uint32_t arg1, uint32_t arg2,
-				uint32_t arg3, uint32_t arg4)
+uint32_t __attribute__((naked)) wrap_foo1(uint32_t arg1, uint32_t arg2, uint32_t arg3,
+					  uint32_t arg4)
 {
 	__TZ_WRAP_FUNC(preface, foo1, postface);
 }
 
-
 ZTEST(tz_wrap_func, test_tz_wrap_func)
 {
 	reset_mocks();
@@ -86,8 +80,7 @@ ZTEST(tz_wrap_func, test_tz_wrap_func)
 	msp1 = __get_MSP();
 	psp1 = __get_PSP();
 
-	zassert_equal(foo1_retval,
-		wrap_foo1(foo1_arg1, foo1_arg2, foo1_arg3, foo1_arg4), NULL);
+	zassert_equal(foo1_retval, wrap_foo1(foo1_arg1, foo1_arg2, foo1_arg3, foo1_arg4), NULL);
 
 	zassert_equal(msp1, __get_MSP());
 	zassert_equal(psp1, __get_PSP());
diff --git a/tests/arch/arm64/arm64_high_addresses/testcase.yaml b/tests/arch/arm64/arm64_high_addresses/testcase.yaml
index 738a5311f6d33..9b09f9745a61c 100644
--- a/tests/arch/arm64/arm64_high_addresses/testcase.yaml
+++ b/tests/arch/arm64/arm64_high_addresses/testcase.yaml
@@ -1,5 +1,7 @@
 common:
   arch_allow: arm64
+  platform_exclude:
+    - rza3ul_smarc
   tags:
     - arm
     - userspace
diff --git a/tests/arch/common/ramfunc/testcase.yaml b/tests/arch/common/ramfunc/testcase.yaml
index 3fba2d8619756..89c221511b536 100644
--- a/tests/arch/common/ramfunc/testcase.yaml
+++ b/tests/arch/common/ramfunc/testcase.yaml
@@ -1,6 +1,6 @@
 tests:
   arch.common.ramfunc:
-    filter: CONFIG_ARCH_HAS_RAMFUNC_SUPPORT
+    filter: CONFIG_ARCH_HAS_RAMFUNC_SUPPORT and not CONFIG_ARM_MPU_PXN
     tags:
       - arm
       - userspace
diff --git a/tests/arch/x86/cpu_scrubs_regs/testcase.yaml b/tests/arch/x86/cpu_scrubs_regs/testcase.yaml
index 4da93fa327ea0..ff52bdcc89c6d 100644
--- a/tests/arch/x86/cpu_scrubs_regs/testcase.yaml
+++ b/tests/arch/x86/cpu_scrubs_regs/testcase.yaml
@@ -8,3 +8,5 @@ tests:
       - userspace
       - scrub
       - registers
+    integration_platforms:
+      - qemu_x86
diff --git a/tests/arch/x86/info/src/timer.c b/tests/arch/x86/info/src/timer.c
index 85d4a72215c50..aa28ba12a7c5f 100644
--- a/tests/arch/x86/info/src/timer.c
+++ b/tests/arch/x86/info/src/timer.c
@@ -44,7 +44,7 @@ void timer(void)
 	printk("TIMER: unknown");
 #endif
 
-	printk(", configured frequency = %dHz\n",
+	printk(", configured frequency = %uHz\n",
 		sys_clock_hw_cycles_per_sec());
 
 #if defined(CONFIG_COUNTER_CMOS)
diff --git a/tests/benchmarks/ipi_metric/CMakeLists.txt b/tests/benchmarks/ipi_metric/CMakeLists.txt
new file mode 100644
index 0000000000000..6e39c1899d961
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/CMakeLists.txt
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(ipi_metric)
+
+#FILE(GLOB app_sources src/*.c)
+#target_sources(app PRIVATE ${app_sources})
+target_sources_ifdef(
+  CONFIG_IPI_METRIC_PREEMPTIVE
+  app
+  PRIVATE
+  src/ipi_metric_preemptive.c
+  )
+target_sources_ifdef(
+  CONFIG_IPI_METRIC_PRIMITIVE_BROADCAST
+  app
+  PRIVATE
+  src/ipi_metric_primitive.c
+  )
+target_sources_ifdef(
+  CONFIG_IPI_METRIC_PRIMITIVE_DIRECTED
+  app
+  PRIVATE
+  src/ipi_metric_primitive.c
+  )
diff --git a/tests/benchmarks/ipi_metric/Kconfig b/tests/benchmarks/ipi_metric/Kconfig
new file mode 100644
index 0000000000000..b605e59c26893
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/Kconfig
@@ -0,0 +1,37 @@
+# Copyright (c) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "IPI-Metric RTOS Test Suite"
+
+choice IPI_METRIC_TEST
+	prompt "Select an IPI-Metric test to execute"
+	default IPI_METRIC_PREEMPTIVE
+	help
+	  The IPI-Metric benchmark suite has a single CPU in an SMP system
+	  dedicated to generating IPIs under varying conditions while the
+	  remaining CPUs perform their "work" and process IPIs. These tests
+	  track the amount of "work" and the number of IPIs processed
+	  during 30 second time intervals.
+
+config IPI_METRIC_PREEMPTIVE
+	bool "IPIs are generated due threads preempting one another"
+	help
+	  The CPU generating the IPIs does so as a byproduct of resuming and
+	  suspending a series of preemptible threads.
+
+config IPI_METRIC_PRIMITIVE_BROADCAST
+	bool "IPIs are generated using primitive arch_sched_broadcast_ipi()"
+	help
+	  The CPU generating the IPIs does so by directly calling
+	  arch_sched_broadcast_ipi() to broadcast them to all CPUs.
+
+config IPI_METRIC_PRIMITIVE_DIRECTED
+	bool "IPIs are generated using primitive arch_sched_directed_ipi()"
+	depends on ARCH_HAS_DIRECTED_IPIS
+	help
+	  The CPU generating the IPIs does so by directly calling
+	  arch_sched_directed_ipi() to direct them to a single CPU.
+
+endchoice
+
+source "Kconfig.zephyr"
diff --git a/tests/benchmarks/ipi_metric/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf b/tests/benchmarks/ipi_metric/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
new file mode 100644
index 0000000000000..f0ee34b467edd
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2022 Carlo Caione <ccaione@baylibre.com>
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MP_MAX_NUM_CPUS=4
diff --git a/tests/benchmarks/ipi_metric/boards/qemu_cortex_a53_qemu_cortex_a53_smp.overlay b/tests/benchmarks/ipi_metric/boards/qemu_cortex_a53_qemu_cortex_a53_smp.overlay
new file mode 100644
index 0000000000000..5bb497069dd8f
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/boards/qemu_cortex_a53_qemu_cortex_a53_smp.overlay
@@ -0,0 +1,19 @@
+/* Copyright 2022 Carlo Caione <ccaione@baylibre.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	cpus {
+		cpu@2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			reg = <2>;
+		};
+
+		cpu@3 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			reg = <3>;
+		};
+	};
+};
diff --git a/tests/benchmarks/ipi_metric/boards/qemu_x86_64.conf b/tests/benchmarks/ipi_metric/boards/qemu_x86_64.conf
new file mode 100644
index 0000000000000..797559f4fd3fa
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/boards/qemu_x86_64.conf
@@ -0,0 +1 @@
+CONFIG_MP_MAX_NUM_CPUS=4
diff --git a/tests/benchmarks/ipi_metric/boards/qemu_x86_64.overlay b/tests/benchmarks/ipi_metric/boards/qemu_x86_64.overlay
new file mode 100644
index 0000000000000..7af73b4e4051d
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/boards/qemu_x86_64.overlay
@@ -0,0 +1,15 @@
+/ {
+	cpus {
+		cpu@2 {
+			device_type = "cpu";
+			compatible = "intel,x86_64";
+			reg = <2>;
+		};
+
+		cpu@3 {
+			device_type = "cpu";
+			compatible = "intel,x86_64";
+			reg = <3>;
+		};
+	};
+};
diff --git a/tests/benchmarks/ipi_metric/prj.conf b/tests/benchmarks/ipi_metric/prj.conf
new file mode 100644
index 0000000000000..a96be86ca339f
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/prj.conf
@@ -0,0 +1,31 @@
+# Default base configuration file
+
+# Use a tickless kernel to minimize the number of timer interrupts
+CONFIG_TICKLESS_KERNEL=y
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
+
+# Optimize for speed
+CONFIG_SPEED_OPTIMIZATIONS=y
+
+# Disable time slicing
+CONFIG_TIMESLICING=n
+
+# Disabling hardware stack protection can greatly
+# improve system performance.
+CONFIG_HW_STACK_PROTECTION=n
+
+# Picolibc is faster than Zephyr's minimal libc memcpy
+CONFIG_PICOLIBC_SPEED_OPTIMIZATIONS=y
+CONFIG_PICOLIBC_USE_MODULE=y
+
+# Disable Thread Local Storage for better context switching times
+CONFIG_THREAD_LOCAL_STORAGE=n
+
+# Disable memory slab pointer validation
+CONFIG_MEM_SLAB_POINTER_VALIDATE=n
+
+# Allow for the number of scheduling IPIs to be tracked
+CONFIG_TRACE_SCHED_IPI=y
+
+# Enable smarter delivery of scheduling IPIs
+CONFIG_IPI_OPTIMIZE=y
diff --git a/tests/benchmarks/ipi_metric/src/ipi_metric_preemptive.c b/tests/benchmarks/ipi_metric/src/ipi_metric_preemptive.c
new file mode 100644
index 0000000000000..791f6f9961100
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/src/ipi_metric_preemptive.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2023,2024 Intel Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#if CONFIG_MP_MAX_NUM_CPUS == 1
+#error "Test requires a system with more than 1 CPU"
+#endif
+
+#define IPI_TEST_INTERVAL_DURATION 30
+
+#define NUM_WORK_THREADS (CONFIG_MP_MAX_NUM_CPUS - 1)
+#define WORK_STACK_SIZE  4096
+
+#define NUM_PREEMPTIVE_THREADS 5
+#define PREEMPTIVE_STACK_SIZE 4096
+
+static K_THREAD_STACK_ARRAY_DEFINE(work_stack, NUM_WORK_THREADS, WORK_STACK_SIZE);
+static K_THREAD_STACK_ARRAY_DEFINE(preemptive_stack, NUM_PREEMPTIVE_THREADS, PREEMPTIVE_STACK_SIZE);
+
+static struct k_thread work_thread[NUM_WORK_THREADS];
+static unsigned long work_array[NUM_WORK_THREADS][1024];
+static volatile unsigned long work_counter[NUM_WORK_THREADS];
+
+static struct k_thread preemptive_thread[NUM_PREEMPTIVE_THREADS];
+static unsigned int preemptive_counter[NUM_PREEMPTIVE_THREADS];
+
+static atomic_t ipi_counter;
+
+void z_trace_sched_ipi(void)
+{
+	atomic_inc(&ipi_counter);
+}
+
+void work_entry(void *p1, void *p2, void *p3)
+{
+	unsigned int index = POINTER_TO_UINT(p1);
+	unsigned long *array = p2;
+	unsigned long counter;
+
+	while (1) {
+		for (unsigned int i = 0; i < 1024; i++) {
+			counter = work_counter[index]++;
+
+			array[i] = (array[i] + counter) ^ array[i];
+		}
+	}
+}
+
+void preemptive_entry(void *p1, void *p2, void *p3)
+{
+	unsigned int index = POINTER_TO_UINT(p1);
+
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+
+	struct k_thread *suspend = NULL;
+	struct k_thread *resume = NULL;
+
+	if (index != (NUM_PREEMPTIVE_THREADS - 1)) {
+		resume = &preemptive_thread[index + 1];
+	}
+
+	if (index != 0) {
+		suspend = k_current_get();
+	}
+
+	while (1) {
+		if (resume != NULL) {
+			k_thread_resume(resume);
+		}
+
+		preemptive_counter[index]++;
+
+		if (suspend != NULL) {
+			k_thread_suspend(suspend);
+		}
+	}
+}
+
+void report(void)
+{
+	unsigned int elapsed_time = IPI_TEST_INTERVAL_DURATION;
+	unsigned long total_preempt;
+	unsigned long total_work;
+	unsigned long last_work_counter[NUM_WORK_THREADS] = {};
+	unsigned long last_preempt[NUM_PREEMPTIVE_THREADS] = {};
+	unsigned long tmp_work_counter[NUM_WORK_THREADS] = {};
+	unsigned long tmp_preempt[NUM_PREEMPTIVE_THREADS] = {};
+	unsigned int i;
+	unsigned int tmp_ipi_counter;
+
+	atomic_set(&ipi_counter, 0);
+
+	while (1) {
+		k_sleep(K_SECONDS(IPI_TEST_INTERVAL_DURATION));
+
+		/*
+		 * Get local copies of the counters to minimize
+		 * the impacts of delays from printf().
+		 */
+
+		total_work = 0;
+		for (i = 0; i < NUM_WORK_THREADS; i++) {
+			tmp_work_counter[i] = work_counter[i];
+			total_work += (tmp_work_counter[i] - last_work_counter[i]);
+		}
+
+		/* Sum the preemptive counters. */
+		total_preempt = 0;
+		for (i = 0; i < NUM_PREEMPTIVE_THREADS; i++) {
+			tmp_preempt[i] = preemptive_counter[i];
+			total_preempt += (tmp_preempt[i] - last_preempt[i]);
+		}
+
+		tmp_ipi_counter = (unsigned int)atomic_set(&ipi_counter, 0);
+
+		printf("**** IPI-Metric Basic Scheduling Test **** Elapsed Time: %u\n",
+		       elapsed_time);
+
+		printf("  Preemptive Counter Total: %lu\n", total_preempt);
+		for (i = 0; i < NUM_PREEMPTIVE_THREADS; i++) {
+			printf("    - Counter #%u: %lu\n",
+			       i, tmp_preempt[i] - last_preempt[i]);
+			last_preempt[i] = tmp_preempt[i];
+		}
+
+		printf("  IPI Count: %u\n", tmp_ipi_counter);
+
+		printf("  Total Work: %lu\n", total_work);
+
+		for (i = 0; i < NUM_WORK_THREADS; i++) {
+			printf("    - Work Counter #%u: %lu\n",
+			       i, tmp_work_counter[i] - last_work_counter[i]);
+			last_work_counter[i] = tmp_work_counter[i];
+		}
+
+		elapsed_time += IPI_TEST_INTERVAL_DURATION;
+	}
+}
+
+int main(void)
+{
+	unsigned int i;
+
+	for (i = 0; i < NUM_WORK_THREADS; i++) {
+		k_thread_create(&work_thread[i], work_stack[i],
+				WORK_STACK_SIZE, work_entry,
+				UINT_TO_POINTER(i), work_array[i], NULL,
+				-1, 0, K_NO_WAIT);
+	}
+
+	/*
+	 * Create the preemptive threads and switch them to
+	 * the suspended state.
+	 */
+
+	for (i = 0; i < NUM_PREEMPTIVE_THREADS; i++) {
+		k_thread_create(&preemptive_thread[i], preemptive_stack[i],
+				PREEMPTIVE_STACK_SIZE, preemptive_entry,
+				UINT_TO_POINTER(i), NULL, NULL,
+				10 - i, 0, K_FOREVER);
+		k_thread_suspend(&preemptive_thread[i]);
+		k_wakeup(&preemptive_thread[i]);
+	}
+
+	k_thread_resume(&preemptive_thread[0]);
+
+	report();
+}
diff --git a/tests/benchmarks/ipi_metric/src/ipi_metric_primitive.c b/tests/benchmarks/ipi_metric/src/ipi_metric_primitive.c
new file mode 100644
index 0000000000000..871fea91f2bef
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/src/ipi_metric_primitive.c
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2025 Intel Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+#if CONFIG_MP_MAX_NUM_CPUS <= 1
+#error "Test requires a system with more than 1 CPU"
+#endif
+
+#define IPI_TEST_INTERVAL_DURATION 30
+
+#define NUM_WORK_THREADS (CONFIG_MP_MAX_NUM_CPUS - 1)
+#define WORK_STACK_SIZE  4096
+
+#define PRIMITIVE_STACK_SIZE 4096
+
+static K_THREAD_STACK_ARRAY_DEFINE(work_stack, NUM_WORK_THREADS, WORK_STACK_SIZE);
+static K_THREAD_STACK_DEFINE(primitive_stack, PRIMITIVE_STACK_SIZE);
+
+static struct k_thread work_thread[NUM_WORK_THREADS];
+static unsigned long work_array[NUM_WORK_THREADS][1024];
+static volatile unsigned long work_counter[NUM_WORK_THREADS];
+
+static struct k_thread primitive_thread;
+static volatile unsigned long primitives_issued;
+
+static atomic_t ipi_cpu_bitmap;
+
+void z_trace_sched_ipi(void)
+{
+	atomic_or(&ipi_cpu_bitmap, BIT(_current_cpu->id));
+}
+
+void work_entry(void *p1, void *p2, void *p3)
+{
+	unsigned int index = POINTER_TO_UINT(p1);
+	unsigned long *array = p2;
+	unsigned long counter;
+
+	while (1) {
+		for (unsigned int i = 0; i < 1024; i++) {
+			counter = work_counter[index]++;
+
+			array[i] = (array[i] + counter) ^ array[i];
+		}
+	}
+}
+
+void primitive_entry(void *p1, void *p2, void *p3)
+{
+	unsigned int desired_ipi_set;
+	unsigned int value;
+	int key;
+
+	ARG_UNUSED(p1);
+	ARG_UNUSED(p2);
+	ARG_UNUSED(p3);
+
+	/*
+	 * All other CPUs are executing cooperative threads and are not
+	 * expected to switch in a new thread. Select a CPU targeted for IPIs.
+	 */
+
+#ifdef CONFIG_IPI_METRIC_PRIMITIVE_DIRECTED
+	key = arch_irq_lock();
+	desired_ipi_set = (_current_cpu->id == 0) ? BIT(1) : BIT(0);
+	arch_irq_unlock(key);
+#else
+	desired_ipi_set = (1 << arch_num_cpus()) - 1;
+	key = arch_irq_lock();
+	desired_ipi_set ^= BIT(_current_cpu->id);
+	arch_irq_unlock(key);
+#endif
+
+	while (1) {
+		atomic_set(&ipi_cpu_bitmap, 0);
+#ifdef CONFIG_IPI_METRIC_PRIMITIVE_DIRECTED
+		arch_sched_directed_ipi(desired_ipi_set);
+#else
+		arch_sched_broadcast_ipi();
+#endif
+
+		primitives_issued++;
+
+		/*
+		 * Loop until all the expected CPUs have flagged that they
+		 * have processed the schedule IPI from above.
+		 */
+
+		while (1) {
+			value = (unsigned int)atomic_get(&ipi_cpu_bitmap);
+
+			/*
+			 * Note: z_trace_sched_ipi(), which is used to track
+			 * which CPUs processed an IPI, is not just called as a
+			 * result of the primitives arch_sched_directed_ipi()
+			 * or arch_sched_broadcast_ipi() above. Schedule IPIs
+			 * will also be sent when ticks are announced such as
+			 * when the k_sleep() in report() expires and this
+			 * benchmark can not control which CPUs will receive
+			 * those IPIs. To account for this, a mask is applied.
+			 */
+			if ((value & desired_ipi_set) == desired_ipi_set) {
+				break;
+			}
+
+			key = arch_irq_lock();
+			arch_spin_relax();
+			arch_irq_unlock(key);
+		}
+	}
+}
+
+void report(void)
+{
+	unsigned int elapsed_time = IPI_TEST_INTERVAL_DURATION;
+	unsigned int i;
+	unsigned long total;
+	unsigned long counter[NUM_WORK_THREADS];
+	unsigned long last_counter[NUM_WORK_THREADS] = {};
+	unsigned long last_issued = 0;
+	unsigned long interval_issued;
+
+	while (1) {
+		k_sleep(K_SECONDS(IPI_TEST_INTERVAL_DURATION));
+
+		total = 0;
+
+		for (i = 0; i < NUM_WORK_THREADS; i++) {
+			counter[i] = work_counter[i] - last_counter[i];
+			total += counter[i];
+			last_counter[i] = work_counter[i];
+		}
+
+		interval_issued = primitives_issued - last_issued;
+
+		printf("**** IPI-Metric %s IPI Test **** Elapsed Time: %u\n",
+		       IS_ENABLED(CONFIG_IPI_METRIC_PRIMITIVE_DIRECTED) ?
+		       "Directed" : "Broadcast", elapsed_time);
+
+		printf("  Schedule IPIs Issued: %lu\n", interval_issued);
+		last_issued = primitives_issued;
+
+		printf("  Total Work: %lu\n", total);
+		for (i = 0; i < NUM_WORK_THREADS; i++) {
+			printf("   - Work Counter #%u: %lu\n",
+			       i, counter[i]);
+		}
+
+		elapsed_time += IPI_TEST_INTERVAL_DURATION;
+	}
+}
+
+int main(void)
+{
+	unsigned int i;
+
+	for (i = 0; i < NUM_WORK_THREADS; i++) {
+		k_thread_create(&work_thread[i], work_stack[i],
+				WORK_STACK_SIZE, work_entry,
+				UINT_TO_POINTER(i), work_array[i], NULL,
+				-1, 0, K_NO_WAIT);
+	}
+
+	/* Create the primitive thread. */
+
+	k_thread_create(&primitive_thread, primitive_stack,
+			PRIMITIVE_STACK_SIZE, primitive_entry,
+			UINT_TO_POINTER(i), NULL, NULL,
+			10, 0, K_NO_WAIT);
+
+	report();
+}
diff --git a/tests/benchmarks/ipi_metric/testcase.yaml b/tests/benchmarks/ipi_metric/testcase.yaml
new file mode 100644
index 0000000000000..38d1511dbdd2c
--- /dev/null
+++ b/tests/benchmarks/ipi_metric/testcase.yaml
@@ -0,0 +1,106 @@
+common:
+  platform_key:
+    - arch
+  tags:
+    - kernel
+    - benchmark
+  # Native platforms excluded as they are not relevant: These benchmarks run some kernel primitives
+  # in a loop during a predefined time counting how many times they execute. But in the POSIX arch,
+  # time does not pass while the CPU executes. So the benchmark just appears as if hung.
+  arch_exclude:
+    - posix
+  # some slow qemu_* excluded
+  platform_exclude:
+    - qemu_malta/qemu_malta
+    - qemu_malta/qemu_malta/be
+    - qemu_nios2
+  integration_platforms:
+    - qemu_x86_64
+    - qemu_cortex_a53/qemu_cortex_a53/smp
+  timeout: 300
+  filter: CONFIG_SMP and CONFIG_MP_MAX_NUM_CPUS > 1
+  harness: console
+
+tests:
+  benchmark.ipi_metric.preemptive.broadcast:
+    extra_configs:
+      - CONFIG_IPI_METRIC_PREEMPTIVE=y
+      - CONFIG_IPI_OPTIMIZE=n
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        # Collect at least 3 measurements for each benchmark:
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Preemptive Counter Total:[ ]*[0-9]+(.*)"
+        - "(.*)IPI Count:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Preemptive Counter Total:[ ]*[0-9]+(.*)"
+        - "(.*)IPI Count:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Preemptive Counter Total:[ ]*[0-9]+(.*)"
+        - "(.*)IPI Count:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+
+  benchmark.ipi_metric.preemptive.optimize:
+    extra_configs:
+      - CONFIG_IPI_METRIC_PREEMPTIVE=y
+      - CONFIG_IPI_OPTIMIZE=y
+    filter: ARCH_HAS_DIRECTED_IPIS
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        # Collect at least 3 measurements for each benchmark:
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Preemptive Counter Total:[ ]*[0-9]+(.*)"
+        - "(.*)IPI Count:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Preemptive Counter Total:[ ]*[0-9]+(.*)"
+        - "(.*)IPI Count:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Preemptive Counter Total:[ ]*[0-9]+(.*)"
+        - "(.*)IPI Count:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+
+  benchmark.ipi_metric.primitive.broadcast:
+    extra_configs:
+      - CONFIG_IPI_METRIC_PRIMITIVE_BROADCAST=y
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        # Collect at least 3 measurements for each benchmark:
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Schedule IPIs Issued:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Schedule IPIs Issued:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Schedule IPIs Issued:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+
+
+  benchmark.ipi_metric.primitive.directed:
+    extra_configs:
+      - CONFIG_IPI_METRIC_PRIMITIVE_DIRECTED=y
+    filter: ARCH_HAS_DIRECTED_IPIS
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        # Collect at least 3 measurements for each benchmark:
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Schedule IPIs Issued:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Schedule IPIs Issued:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
+        - "(.*) IPI-Metric(.+) Elapsed Time:[ ]*[0-9]+(.*)"
+        - "(.*)Schedule IPIs Issued:[ ]*[0-9]+(.*)"
+        - "(.*)Total Work:[ ]*[0-9]+(.*)"
diff --git a/tests/benchmarks/latency_measure/README.rst b/tests/benchmarks/latency_measure/README.rst
index d665794dbf11a..623adbf997629 100644
--- a/tests/benchmarks/latency_measure/README.rst
+++ b/tests/benchmarks/latency_measure/README.rst
@@ -73,7 +73,7 @@ Sample output of the benchmark using the defaults::
         fifo.get.free.immediate.kernel           - Free when getting data from FIFO (no ctx switch)   :     560 cycles ,     4666 ns :
         fifo.get.blocking.k_to_k                 - Get data from FIFO (w/ ctx switch)                 :     510 cycles ,     4257 ns :
         fifo.put.wake+ctx.k_to_k                 - Add data to FIFO (w/ ctx switch)                   :     590 cycles ,     4923 ns :
-        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx siwtch)   :     510 cycles ,     4250 ns :
+        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx switch)   :     510 cycles ,     4250 ns :
         fifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to FIFO (w/ ctx switch)       :     585 cycles ,     4875 ns :
         lifo.put.immediate.kernel                - Add data to LIFO (no ctx switch)                   :     214 cycles ,     1791 ns :
         lifo.get.immediate.kernel                - Get data from LIFO (no ctx switch)                 :     120 cycles ,     1008 ns :
@@ -82,7 +82,7 @@ Sample output of the benchmark using the defaults::
         lifo.get.blocking.k_to_k                 - Get data from LIFO (w/ ctx switch)                 :     502 cycles ,     4191 ns :
         lifo.put.wake+ctx.k_to_k                 - Add data to LIFO (w/ ctx switch)                   :     585 cycles ,     4875 ns :
         lifo.get.free.blocking.k_to_k            - Free when getting data from LIFO (w/ ctx switch)   :     513 cycles ,     4275 ns :
-        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx siwtch)       :     585 cycles ,     4881 ns :
+        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx switch)       :     585 cycles ,     4881 ns :
         events.post.immediate.kernel             - Post events (nothing wakes)                        :     225 cycles ,     1875 ns :
         events.set.immediate.kernel              - Set events (nothing wakes)                         :     230 cycles ,     1923 ns :
         events.wait.immediate.kernel             - Wait for any events (no ctx switch)                :     120 cycles ,     1000 ns :
@@ -126,7 +126,7 @@ Sample output of the benchmark with stack canaries enabled::
         fifo.get.free.immediate.kernel           - Free when getting data from FIFO (no ctx switch)   :    1230 cycles ,    10250 ns :
         fifo.get.blocking.k_to_k                 - Get data from FIFO (w/ ctx switch)                 :     868 cycles ,     7241 ns :
         fifo.put.wake+ctx.k_to_k                 - Add data to FIFO (w/ ctx switch)                   :     991 cycles ,     8259 ns :
-        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx siwtch)   :     879 cycles ,     7325 ns :
+        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx switch)   :     879 cycles ,     7325 ns :
         fifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to FIFO (w/ ctx switch)       :     990 cycles ,     8250 ns :
         lifo.put.immediate.kernel                - Add data to LIFO (no ctx switch)                   :     429 cycles ,     3582 ns :
         lifo.get.immediate.kernel                - Get data from LIFO (no ctx switch)                 :     320 cycles ,     2674 ns :
@@ -135,7 +135,7 @@ Sample output of the benchmark with stack canaries enabled::
         lifo.get.blocking.k_to_k                 - Get data from LIFO (w/ ctx switch)                 :     863 cycles ,     7199 ns :
         lifo.put.wake+ctx.k_to_k                 - Add data to LIFO (w/ ctx switch)                   :     985 cycles ,     8208 ns :
         lifo.get.free.blocking.k_to_k            - Free when getting data from LIFO (w/ ctx switch)   :     879 cycles ,     7325 ns :
-        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx siwtch)       :     985 cycles ,     8208 ns :
+        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx switch)       :     985 cycles ,     8208 ns :
         events.post.immediate.kernel             - Post events (nothing wakes)                        :     420 cycles ,     3501 ns :
         events.set.immediate.kernel              - Set events (nothing wakes)                         :     420 cycles ,     3501 ns :
         events.wait.immediate.kernel             - Wait for any events (no ctx switch)                :     280 cycles ,     2334 ns :
@@ -183,7 +183,7 @@ Sample output of the benchmark with object core enabled::
         fifo.get.free.immediate.kernel           - Free when getting data from FIFO (no ctx switch)   :     565 cycles ,     4708 ns :
         fifo.get.blocking.k_to_k                 - Get data from FIFO (w/ ctx switch)                 :     947 cycles ,     7899 ns :
         fifo.put.wake+ctx.k_to_k                 - Add data to FIFO (w/ ctx switch)                   :    1015 cycles ,     8458 ns :
-        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx siwtch)   :     950 cycles ,     7923 ns :
+        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx switch)   :     950 cycles ,     7923 ns :
         fifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to FIFO (w/ ctx switch)       :    1010 cycles ,     8416 ns :
         lifo.put.immediate.kernel                - Add data to LIFO (no ctx switch)                   :     226 cycles ,     1891 ns :
         lifo.get.immediate.kernel                - Get data from LIFO (no ctx switch)                 :     123 cycles ,     1033 ns :
@@ -192,7 +192,7 @@ Sample output of the benchmark with object core enabled::
         lifo.get.blocking.k_to_k                 - Get data from LIFO (w/ ctx switch)                 :     951 cycles ,     7932 ns :
         lifo.put.wake+ctx.k_to_k                 - Add data to LIFO (w/ ctx switch)                   :    1010 cycles ,     8416 ns :
         lifo.get.free.blocking.k_to_k            - Free when getting data from LIFO (w/ ctx switch)   :     959 cycles ,     7991 ns :
-        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx siwtch)       :    1010 cycles ,     8422 ns :
+        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx switch)       :    1010 cycles ,     8422 ns :
         events.post.immediate.kernel             - Post events (nothing wakes)                        :     210 cycles ,     1750 ns :
         events.set.immediate.kernel              - Set events (nothing wakes)                         :     230 cycles ,     1917 ns :
         events.wait.immediate.kernel             - Wait for any events (no ctx switch)                :     120 cycles ,     1000 ns :
@@ -265,13 +265,13 @@ Sample output of the benchmark with userspace enabled::
         fifo.get.free.immediate.user             - Free when getting data from FIFO (no ctx switch)   :    1440 cycles ,    12000 ns :
         fifo.get.blocking.k_to_k                 - Get data from FIFO (w/ ctx switch)                 :    1209 cycles ,    10082 ns :
         fifo.put.wake+ctx.k_to_k                 - Add data to FIFO (w/ ctx switch)                   :    1230 cycles ,    10250 ns :
-        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx siwtch)   :    1210 cycles ,    10083 ns :
+        fifo.get.free.blocking.k_to_k            - Free when getting data from FIFO (w/ ctx switch)   :    1210 cycles ,    10083 ns :
         fifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to FIFO (w/ ctx switch)       :    1260 cycles ,    10500 ns :
-        fifo.get.free.blocking.u_to_k            - Free when getting data from FIFO (w/ ctx siwtch)   :    1745 cycles ,    14547 ns :
+        fifo.get.free.blocking.u_to_k            - Free when getting data from FIFO (w/ ctx switch)   :    1745 cycles ,    14547 ns :
         fifo.put.alloc.wake+ctx.k_to_u           - Allocate to add data to FIFO (w/ ctx switch)       :    1600 cycles ,    13333 ns :
-        fifo.get.free.blocking.k_to_u            - Free when getting data from FIFO (w/ ctx siwtch)   :    1550 cycles ,    12922 ns :
+        fifo.get.free.blocking.k_to_u            - Free when getting data from FIFO (w/ ctx switch)   :    1550 cycles ,    12922 ns :
         fifo.put.alloc.wake+ctx.u_to_k           - Allocate to add data to FIFO (w/ ctx switch)       :    1795 cycles ,    14958 ns :
-        fifo.get.free.blocking.u_to_u            - Free when getting data from FIFO (w/ ctx siwtch)   :    2084 cycles ,    17374 ns :
+        fifo.get.free.blocking.u_to_u            - Free when getting data from FIFO (w/ ctx switch)   :    2084 cycles ,    17374 ns :
         fifo.put.alloc.wake+ctx.u_to_u           - Allocate to add data to FIFO (w/ ctx switch)       :    2135 cycles ,    17791 ns :
         lifo.put.immediate.kernel                - Add data to LIFO (no ctx switch)                   :     234 cycles ,     1957 ns :
         lifo.get.immediate.kernel                - Get data from LIFO (no ctx switch)                 :     189 cycles ,     1582 ns :
@@ -282,13 +282,13 @@ Sample output of the benchmark with userspace enabled::
         lifo.get.blocking.k_to_k                 - Get data from LIFO (w/ ctx switch)                 :    1219 cycles ,    10166 ns :
         lifo.put.wake+ctx.k_to_k                 - Add data to LIFO (w/ ctx switch)                   :    1230 cycles ,    10250 ns :
         lifo.get.free.blocking.k_to_k            - Free when getting data from LIFO (w/ ctx switch)   :    1210 cycles ,    10083 ns :
-        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx siwtch)       :    1260 cycles ,    10500 ns :
+        lifo.put.alloc.wake+ctx.k_to_k           - Allocate to add data to LIFO (w/ ctx switch)       :    1260 cycles ,    10500 ns :
         lifo.get.free.blocking.u_to_k            - Free when getting data from LIFO (w/ ctx switch)   :    1744 cycles ,    14541 ns :
-        lifo.put.alloc.wake+ctx.k_to_u           - Allocate to add data to LIFO (w/ ctx siwtch)       :    1595 cycles ,    13291 ns :
+        lifo.put.alloc.wake+ctx.k_to_u           - Allocate to add data to LIFO (w/ ctx switch)       :    1595 cycles ,    13291 ns :
         lifo.get.free.blocking.k_to_u            - Free when getting data from LIFO (w/ ctx switch)   :    1544 cycles ,    12874 ns :
-        lifo.put.alloc.wake+ctx.u_to_k           - Allocate to add data to LIFO (w/ ctx siwtch)       :    1795 cycles ,    14958 ns :
+        lifo.put.alloc.wake+ctx.u_to_k           - Allocate to add data to LIFO (w/ ctx switch)       :    1795 cycles ,    14958 ns :
         lifo.get.free.blocking.u_to_u            - Free when getting data from LIFO (w/ ctx switch)   :    2080 cycles ,    17339 ns :
-        lifo.put.alloc.wake+ctx.u_to_u           - Allocate to add data to LIFO (w/ ctx siwtch)       :    2130 cycles ,    17750 ns :
+        lifo.put.alloc.wake+ctx.u_to_u           - Allocate to add data to LIFO (w/ ctx switch)       :    2130 cycles ,    17750 ns :
         events.post.immediate.kernel             - Post events (nothing wakes)                        :     285 cycles ,     2375 ns :
         events.set.immediate.kernel              - Set events (nothing wakes)                         :     290 cycles ,     2417 ns :
         events.wait.immediate.kernel             - Wait for any events (no ctx switch)                :     235 cycles ,     1958 ns :
diff --git a/tests/benchmarks/latency_measure/src/fifo.c b/tests/benchmarks/latency_measure/src/fifo.c
index 6dd8ffc182482..482fe1a0b2399 100644
--- a/tests/benchmarks/latency_measure/src/fifo.c
+++ b/tests/benchmarks/latency_measure/src/fifo.c
@@ -323,7 +323,7 @@ int fifo_blocking_ops(uint32_t num_iterations, uint32_t start_options,
 		 alt_options & K_USER ? "u" : "k",
 		 start_options & K_USER ? "u" : "k");
 	snprintf(description, sizeof(description),
-		 "%-40s - Free when getting data from FIFO (w/ ctx siwtch)", tag);
+		 "%-40s - Free when getting data from FIFO (w/ ctx switch)", tag);
 
 	cycles = timestamp.cycles;
 	PRINT_STATS_AVG(description, (uint32_t)cycles,
diff --git a/tests/benchmarks/latency_measure/src/lifo.c b/tests/benchmarks/latency_measure/src/lifo.c
index 2de1ba8168188..259ee168a8daf 100644
--- a/tests/benchmarks/latency_measure/src/lifo.c
+++ b/tests/benchmarks/latency_measure/src/lifo.c
@@ -335,7 +335,7 @@ int lifo_blocking_ops(uint32_t num_iterations, uint32_t start_options,
 		 start_options & K_USER ? "u" : "k",
 		 alt_options & K_USER ? "u" : "k");
 	snprintf(description, sizeof(description),
-		 "%-40s - Allocate to add data to LIFO (w/ ctx siwtch)", tag);
+		 "%-40s - Allocate to add data to LIFO (w/ ctx switch)", tag);
 	cycles = timestamp.cycles;
 	PRINT_STATS_AVG(description, (uint32_t)cycles,
 			num_iterations, false, "");
diff --git a/tests/benchmarks/sched/prj.conf b/tests/benchmarks/sched/prj.conf
index c7a5efd8f43ba..521a1806ebf20 100644
--- a/tests/benchmarks/sched/prj.conf
+++ b/tests/benchmarks/sched/prj.conf
@@ -2,7 +2,7 @@ CONFIG_TEST=y
 CONFIG_NUM_PREEMPT_PRIORITIES=8
 CONFIG_NUM_COOP_PRIORITIES=8
 
-# Switch these between DUMB/SCALABLE (and SCHED_MULTIQ) to measure
+# Switch these between SIMPLE/SCALABLE (and SCHED_MULTIQ) to measure
 # different backends
-CONFIG_SCHED_DUMB=y
-CONFIG_WAITQ_DUMB=y
+CONFIG_SCHED_SIMPLE=y
+CONFIG_WAITQ_SIMPLE=y
diff --git a/tests/benchmarks/sched/src/main.c b/tests/benchmarks/sched/src/main.c
index e40b6a1afd095..19a5df866a0d7 100644
--- a/tests/benchmarks/sched/src/main.c
+++ b/tests/benchmarks/sched/src/main.c
@@ -169,7 +169,7 @@ int main(void)
 		}
 
 		/* For reference, an unmodified HEAD on qemu_x86 with
-		 * !USERSPACE and SCHED_DUMB and using -icount
+		 * !USERSPACE and SCHED_SIMPLE and using -icount
 		 * shift=0,sleep=off,align=off, I get results of:
 		 *
 		 * unpend 132 ready 257 switch 278 pend 321 tot 988 (avg 900)
diff --git a/tests/benchmarks/sched_queues/README.rst b/tests/benchmarks/sched_queues/README.rst
index a4c13f6eafe06..8b816931bf0f5 100644
--- a/tests/benchmarks/sched_queues/README.rst
+++ b/tests/benchmarks/sched_queues/README.rst
@@ -2,7 +2,7 @@ Scheduling Queue Measurements
 #############################
 
 A Zephyr application developer may choose between three different scheduling
-algorithms: dumb, scalable and multiq. These different algorithms have
+algorithms: simple, scalable and multiq. These different algorithms have
 different performance characteristics that vary as the
 number of ready threads increases. This benchmark can be used to help
 determine which scheduling algorithm may best suit the developer's application.
diff --git a/tests/benchmarks/sched_queues/src/main.c b/tests/benchmarks/sched_queues/src/main.c
index c3ff9f3dd2990..b71b65e7c3375 100644
--- a/tests/benchmarks/sched_queues/src/main.c
+++ b/tests/benchmarks/sched_queues/src/main.c
@@ -239,7 +239,7 @@ int main(void)
 	freq = timing_freq_get_mhz();
 
 	printk("Time Measurements for %s sched queues\n",
-	       IS_ENABLED(CONFIG_SCHED_DUMB) ? "dumb" :
+	       IS_ENABLED(CONFIG_SCHED_SIMPLE) ? "simple" :
 	       IS_ENABLED(CONFIG_SCHED_SCALABLE) ? "scalable" : "multiq");
 	printk("Timing results: Clock frequency: %u MHz\n", freq);
 
diff --git a/tests/benchmarks/sched_queues/testcase.yaml b/tests/benchmarks/sched_queues/testcase.yaml
index 495c7be192884..e60bcb1fef2d2 100644
--- a/tests/benchmarks/sched_queues/testcase.yaml
+++ b/tests/benchmarks/sched_queues/testcase.yaml
@@ -21,9 +21,9 @@ common:
     - CONFIG_BENCHMARK_RECORDING=y
 
 tests:
-  benchmark.sched_queues.dumb:
+  benchmark.sched_queues.simple:
     extra_configs:
-      - CONFIG_SCHED_DUMB=y
+      - CONFIG_SCHED_SIMPLE=y
 
   benchmark.sched_queues.scalable:
     extra_configs:
diff --git a/tests/benchmarks/sys_kernel/prj.conf b/tests/benchmarks/sys_kernel/prj.conf
index b1a432d2f6682..8b72155fbacd8 100644
--- a/tests/benchmarks/sys_kernel/prj.conf
+++ b/tests/benchmarks/sys_kernel/prj.conf
@@ -15,3 +15,9 @@ CONFIG_HW_STACK_PROTECTION=n
 
 # Can only run under 1 CPU
 CONFIG_MP_MAX_NUM_CPUS=1
+
+# for the k_malloc() test
+CONFIG_KERNEL_MEM_POOL=y
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_SYS_HEAP_VALIDATE=n
+CONFIG_SYS_HEAP_RUNTIME_STATS=n
diff --git a/tests/benchmarks/sys_kernel/src/malloc.c b/tests/benchmarks/sys_kernel/src/malloc.c
new file mode 100644
index 0000000000000..0c827e00e1bd4
--- /dev/null
+++ b/tests/benchmarks/sys_kernel/src/malloc.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025 BayLibre SAS
+ *   *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "syskernel.h"
+
+static void *malloc_array[NUMBER_OF_LOOPS];
+
+static void do_malloc(int loops)
+{
+	int i;
+
+	for (i = 0; i < loops; i++) {
+		malloc_array[i] = k_malloc(1);
+	}
+}
+
+static void do_free(int loops)
+{
+	int i;
+
+	for (i = 0; i < loops; i++) {
+		k_free(malloc_array[i]);
+	}
+}
+
+int malloc_test(void)
+{
+	uint32_t t;
+	int return_value = 0;
+
+	fprintf(output_file, sz_test_case_fmt,
+		"malloc #1");
+	fprintf(output_file, sz_description,
+		"\n\tk_malloc");
+	printf(sz_test_start_fmt);
+
+	t = BENCH_START();
+	do_malloc(number_of_loops);
+	t = TIME_STAMP_DELTA_GET(t);
+
+	return_value += check_result(number_of_loops, t);
+
+	fprintf(output_file, sz_test_case_fmt,
+		"malloc #2");
+	fprintf(output_file, sz_description,
+		"\n\tk_free");
+	printf(sz_test_start_fmt);
+
+	t = BENCH_START();
+	do_free(number_of_loops);
+	t = TIME_STAMP_DELTA_GET(t);
+
+	return_value += check_result(number_of_loops, t);
+
+	return return_value;
+}
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.c b/tests/benchmarks/sys_kernel/src/syskernel.c
index 19d2e84ca3cdf..a3b80a463e56f 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.c
+++ b/tests/benchmarks/sys_kernel/src/syskernel.c
@@ -161,11 +161,12 @@ int main(void)
 		test_result += lifo_test();
 		test_result += fifo_test();
 		test_result += stack_test();
+		test_result += malloc_test();
 		test_result += mem_slab_test();
 
 		if (test_result) {
-			/* sema/lifo/fifo/stack/mem_slab account for 14 tests in total */
-			if (test_result == 14) {
+			/* sema/lifo/fifo/stack/malloc/mem_slab account for 16 tests in total */
+			if (test_result == 16) {
 				fprintf(output_file, sz_module_result_fmt,
 					sz_success);
 			} else {
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.h b/tests/benchmarks/sys_kernel/src/syskernel.h
index 69fb03309337d..f12c2ea21d733 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.h
+++ b/tests/benchmarks/sys_kernel/src/syskernel.h
@@ -56,6 +56,7 @@ int sema_test(void);
 int lifo_test(void);
 int fifo_test(void);
 int stack_test(void);
+int malloc_test(void);
 int mem_slab_test(void);
 void begin_test(void);
 
diff --git a/tests/benchmarks/thread_metric/Kconfig b/tests/benchmarks/thread_metric/Kconfig
index 37ecca6cd0e5e..72ebc3042dfbf 100644
--- a/tests/benchmarks/thread_metric/Kconfig
+++ b/tests/benchmarks/thread_metric/Kconfig
@@ -3,8 +3,6 @@
 
 mainmenu "Eclipse ThreadX Thread-Metric RTOS Test Suite"
 
-source "Kconfig.zephyr"
-
 choice TM_TEST
 	prompt "Select a Thread-Metric test to execute"
 	default TM_PREEMPTIVE
@@ -81,3 +79,5 @@ config TM_SYNCHRONIZATION
 	  is reported every 30 seconds.
 
 endchoice
+
+source "Kconfig.zephyr"
diff --git a/tests/benchmarks/thread_metric/src/tm_cooperative_scheduling_test.c b/tests/benchmarks/thread_metric/src/tm_cooperative_scheduling_test.c
index 179c30f85da6e..7bac7aac182a0 100644
--- a/tests/benchmarks/thread_metric/src/tm_cooperative_scheduling_test.c
+++ b/tests/benchmarks/thread_metric/src/tm_cooperative_scheduling_test.c
@@ -80,13 +80,14 @@ int main(void)
 
 void tm_cooperative_scheduling_initialize(void)
 {
-
-	/* Create all 5 threads at priority 3.  */
-	tm_thread_create(0, 3, tm_cooperative_thread_0_entry);
-	tm_thread_create(1, 3, tm_cooperative_thread_1_entry);
-	tm_thread_create(2, 3, tm_cooperative_thread_2_entry);
-	tm_thread_create(3, 3, tm_cooperative_thread_3_entry);
-	tm_thread_create(4, 3, tm_cooperative_thread_4_entry);
+	int prio = CONFIG_MAIN_THREAD_PRIORITY;
+
+	/* Create all 5 threads at the same priority as the main thread.  */
+	tm_thread_create(0, prio, tm_cooperative_thread_0_entry);
+	tm_thread_create(1, prio, tm_cooperative_thread_1_entry);
+	tm_thread_create(2, prio, tm_cooperative_thread_2_entry);
+	tm_thread_create(3, prio, tm_cooperative_thread_3_entry);
+	tm_thread_create(4, prio, tm_cooperative_thread_4_entry);
 
 	/* Resume all 5 threads.  */
 	tm_thread_resume(0);
diff --git a/tests/benchmarks/wait_queues/README.rst b/tests/benchmarks/wait_queues/README.rst
index b10e505f37b2c..b1eb4dfa35a1d 100644
--- a/tests/benchmarks/wait_queues/README.rst
+++ b/tests/benchmarks/wait_queues/README.rst
@@ -2,7 +2,7 @@ Wait Queue Measurements
 #######################
 
 A Zehpyr application developer may choose between two different wait queue
-implementations: dumb and scalable. These two queue implementations perform
+implementations: simple and scalable. These two queue implementations perform
 differently under different loads. This benchmark can be used to showcase how
 the performance of these two implementations vary under varying conditions.
 
diff --git a/tests/benchmarks/wait_queues/src/main.c b/tests/benchmarks/wait_queues/src/main.c
index e7146e81e8142..759acc1789bf1 100644
--- a/tests/benchmarks/wait_queues/src/main.c
+++ b/tests/benchmarks/wait_queues/src/main.c
@@ -228,7 +228,7 @@ int main(void)
 	freq = timing_freq_get_mhz();
 
 	printk("Time Measurements for %s wait queues\n",
-	       IS_ENABLED(CONFIG_WAITQ_DUMB) ? "dumb" : "scalable");
+	       IS_ENABLED(CONFIG_WAITQ_SIMPLE) ? "simple" : "scalable");
 	printk("Timing results: Clock frequency: %u MHz\n", freq);
 
 	z_waitq_init(&wait_q);
diff --git a/tests/benchmarks/wait_queues/testcase.yaml b/tests/benchmarks/wait_queues/testcase.yaml
index d0c4189d4617f..54abc350b5f8b 100644
--- a/tests/benchmarks/wait_queues/testcase.yaml
+++ b/tests/benchmarks/wait_queues/testcase.yaml
@@ -20,9 +20,9 @@ common:
     - CONFIG_BENCHMARK_RECORDING=y
 
 tests:
-  benchmark.wait_queues.dumb:
+  benchmark.wait_queues.simple:
     extra_configs:
-      - CONFIG_WAITQ_DUMB=y
+      - CONFIG_WAITQ_SIMPLE=y
 
   benchmark.wait_queues.scalable:
     extra_configs:
diff --git a/tests/bluetooth/audio/ascs/prj.conf b/tests/bluetooth/audio/ascs/prj.conf
index 84b05139ed069..5b6276dfccaf2 100644
--- a/tests/bluetooth/audio/ascs/prj.conf
+++ b/tests/bluetooth/audio/ascs/prj.conf
@@ -6,7 +6,6 @@ CONFIG_BT_MAX_CONN=1
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_ISO_MAX_CHAN=1
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_AUDIO=y
 CONFIG_BT_ASCS=y
diff --git a/tests/bluetooth/audio/ccp_call_control_client/src/main.c b/tests/bluetooth/audio/ccp_call_control_client/src/main.c
index 34b569d935934..c23d6ed592bb4 100644
--- a/tests/bluetooth/audio/ccp_call_control_client/src/main.c
+++ b/tests/bluetooth/audio/ccp_call_control_client/src/main.c
@@ -210,3 +210,27 @@ static ZTEST_F(ccp_call_control_client_test_suite,
 	err = bt_ccp_call_control_client_discover(&fixture->conn, NULL);
 	zassert_equal(-EINVAL, err, "Unexpected return value %d", err);
 }
+
+static ZTEST_F(ccp_call_control_client_test_suite, test_ccp_call_control_client_get_bearers)
+{
+	struct bt_ccp_call_control_client_bearers bearers;
+	int err;
+
+	err = bt_ccp_call_control_client_register_cb(&mock_ccp_call_control_client_cb);
+	zassert_equal(0, err, "Unexpected return value %d", err);
+
+	err = bt_ccp_call_control_client_discover(&fixture->conn, &fixture->client);
+	zassert_equal(0, err, "Unexpected return value %d", err);
+
+	err = bt_ccp_call_control_client_get_bearers(fixture->client, &bearers);
+	zassert_equal(0, err, "Unexpected return value %d", err);
+
+#if defined(CONFIG_BT_TBS_CLIENT_GTBS)
+	zassert_not_null(bearers.gtbs_bearer);
+#endif /* CONFIG_BT_TBS_CLIENT_GTBS */
+
+#if defined(CONFIG_BT_TBS_CLIENT_TBS)
+	zassert_equal(CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES, bearers.tbs_count);
+	zassert_not_null(bearers.tbs_bearers);
+#endif /* CONFIG_BT_TBS_CLIENT_TBS */
+}
diff --git a/tests/bluetooth/audio/codec/prj.conf b/tests/bluetooth/audio/codec/prj.conf
index ec00ae96a30fd..a2358bde70595 100644
--- a/tests/bluetooth/audio/codec/prj.conf
+++ b/tests/bluetooth/audio/codec/prj.conf
@@ -5,7 +5,6 @@ CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_ISO_PERIPHERAL=y
 CONFIG_BT_AUDIO=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_ASCS=y
diff --git a/tests/bluetooth/audio/mocks/include/hci_core.h b/tests/bluetooth/audio/mocks/include/hci_core.h
index e5e1afdb2c8c9..a1e42572f8f05 100644
--- a/tests/bluetooth/audio/mocks/include/hci_core.h
+++ b/tests/bluetooth/audio/mocks/include/hci_core.h
@@ -12,5 +12,5 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/fff.h>
 
-bool bt_addr_le_is_bonded(uint8_t id, const bt_addr_le_t *addr);
+bool bt_le_bond_exists(uint8_t id, const bt_addr_le_t *addr);
 #endif /* MOCKS_HCI_CORE_H_ */
diff --git a/tests/bluetooth/audio/mocks/src/hci_core.c b/tests/bluetooth/audio/mocks/src/hci_core.c
index 7433d77ff2658..35c0f70e77eea 100644
--- a/tests/bluetooth/audio/mocks/src/hci_core.c
+++ b/tests/bluetooth/audio/mocks/src/hci_core.c
@@ -9,7 +9,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/fff.h>
 
-bool bt_addr_le_is_bonded(uint8_t id, const bt_addr_le_t *addr)
+bool bt_le_bond_exists(uint8_t id, const bt_addr_le_t *addr)
 {
 	return true;
 }
diff --git a/tests/bluetooth/audio/mocks/src/iso.c b/tests/bluetooth/audio/mocks/src/iso.c
index cd00681d96713..ac4e58314c108 100644
--- a/tests/bluetooth/audio/mocks/src/iso.c
+++ b/tests/bluetooth/audio/mocks/src/iso.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 Codecoup
- * Copyright (c) 2024 Nordic Semiconductor ASA
+ * Copyright (c) 2024-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -82,6 +82,17 @@ void mock_bt_iso_cleanup(void)
 
 }
 
+int bt_iso_setup_data_path(const struct bt_iso_chan *chan, uint8_t dir,
+			   const struct bt_iso_chan_path *path)
+{
+	return 0;
+}
+
+int bt_iso_remove_data_path(const struct bt_iso_chan *chan, uint8_t dir)
+{
+	return 0;
+}
+
 void mock_bt_iso_connected(struct bt_conn *iso)
 {
 	struct bt_iso_chan *chan = iso->chan;
diff --git a/tests/bluetooth/audio/mocks/src/kernel.c b/tests/bluetooth/audio/mocks/src/kernel.c
index f755eb18ff50c..1ee2e8d775919 100644
--- a/tests/bluetooth/audio/mocks/src/kernel.c
+++ b/tests/bluetooth/audio/mocks/src/kernel.c
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2022 Nordic Semiconductor ASA
+ * Copyright (c) 2022-2025 Nordic Semiconductor ASA
  * Copyright (c) 2023 Codecoup
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -133,6 +134,40 @@ int32_t k_sleep(k_timeout_t timeout)
 
 	return 0;
 }
+static bool mutex_locked;
+
+int k_mutex_init(struct k_mutex *mutex)
+{
+	mutex_locked = false;
+
+	return 0;
+}
+
+int k_mutex_lock(struct k_mutex *mutex, k_timeout_t timeout)
+{
+	if (mutex_locked) {
+		if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
+			return -EBUSY;
+		} else {
+			return -EAGAIN;
+		}
+	}
+
+	mutex_locked = true;
+
+	return 0;
+}
+
+int k_mutex_unlock(struct k_mutex *mutex)
+{
+	if (!mutex_locked) {
+		return -EINVAL;
+	}
+
+	mutex_locked = false;
+
+	return 0;
+}
 
 void mock_kernel_init(void)
 {
diff --git a/tests/bluetooth/classic/sdp_c/CMakeLists.txt b/tests/bluetooth/classic/sdp_c/CMakeLists.txt
new file mode 100644
index 0000000000000..89de0b86386a9
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+set(NO_QEMU_SERIAL_BT_SERVER 1)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(bluetooth)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/bluetooth/classic/sdp_c/README.rst b/tests/bluetooth/classic/sdp_c/README.rst
new file mode 100644
index 0000000000000..d40d0919d8baa
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/README.rst
@@ -0,0 +1,74 @@
+.. _bluetooth_classic_sdp_clinet_tests:
+
+Bluetooth Classic SDP Client Tests
+##################################
+
+Overview
+********
+
+This test suite uses ``bumble`` for testing Bluetooth Classic communication between a host
+PC (running :ref:`Twister <twister_script>`) and a device under test (DUT) running Zephyr.
+
+Prerequisites
+*************
+
+The test suite has the following prerequisites:
+
+* The ``bumble`` library installed on the host PC.
+The Bluetooth Classic controller on PC side is required. Refer to getting started of `bumble`_
+for details.
+
+The HCI transport for ``bumble`` can be configured as follows:
+
+* A specific configuration context can be provided along with the ``usb_hci`` fixture separated by
+  a ``:`` (i.e. specify fixture ``usb_hci:usb:0`` to use the ``usb:0`` as hci transport for
+  ``bumble``).
+* The configuration context can be overridden using the `hci transport`_ can be provided using the
+  ``--hci-transport`` test suite argument (i.e. run ``twister`` with the
+  ``--pytest-args=--hci-transport=usb:0`` argument to use the ``usb:0`` as hci transport for
+  ``bumble``).
+
+Building and Running
+********************
+
+Running on mimxrt1170_evk@B/mimxrt1176/cm7
+==========================================
+
+Running the test suite on :ref:`mimxrt1170_evk` relies on configuration of ``bumble``.
+
+On the host PC, a HCI transport needs to be required. Refer to `bumble platforms`_ page of
+``bumble`` for details.
+
+For example, on windows, a PTS dongle is used. After `WinUSB driver`_ has been installed,
+the HCI transport would be USB transport interface ``usb:<index>``.
+
+If the HCI transport is ``usb:0`` and debug console port is ``COM4``, the test suite can be
+launched using Twister:
+
+.. code-block:: shell
+
+   west twister -v -p mimxrt1170_evk@B/mimxrt1176/cm7 --device-testing --device-serial COM4 -T tests/bluetooth/classic/sdp_c -O sdp_c --force-platform --west-flash --west-runner=jlink -X usb_hci:usb:0
+
+Running on Hardware
+===================
+
+Running the test suite on hardware requires a HCI transport connected to the host PC.
+
+The test suite can be launched using Twister. Below is an example for running on the
+:zephyr:board:`mimxrt1170_evk@B/mimxrt1176/cm7`:
+
+.. code-block:: shell
+
+   west twister -v -p mimxrt1170_evk@B/mimxrt1176/cm7 --device-testing --device-serial COM4 -T tests/bluetooth/classic/sdp_c -O sdp_c --force-platform --west-flash --west-runner=jlink -X usb_hci:usb:0
+
+.. _bumble:
+   https://google.github.io/bumble/getting_started.html
+
+.. _hci transport:
+   https://google.github.io/bumble/transports/index.html
+
+.. _bumble platforms:
+   https://google.github.io/bumble/platforms/index.html
+
+.. _WinUSB driver:
+   https://google.github.io/bumble/platforms/windows.html
diff --git a/tests/bluetooth/classic/sdp_c/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/bluetooth/classic/sdp_c/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
new file mode 100644
index 0000000000000..289b5a597386c
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
@@ -0,0 +1,10 @@
+#select NXP NW612 Chipset
+CONFIG_BT_NXP_NW612=y
+
+CONFIG_BT_SETTINGS=n
+CONFIG_FLASH=n
+CONFIG_FLASH_MAP=n
+CONFIG_NVS=n
+CONFIG_SETTINGS=n
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bluetooth/classic/sdp_c/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/bluetooth/classic/sdp_c/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
new file mode 100644
index 0000000000000..96ef63ad60b2e
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,sram = &dtcm;
+	};
+};
diff --git a/tests/bluetooth/classic/sdp_c/prj.conf b/tests/bluetooth/classic/sdp_c/prj.conf
new file mode 100644
index 0000000000000..c202e90f9aaef
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/prj.conf
@@ -0,0 +1,12 @@
+CONFIG_BT=y
+CONFIG_BT_CLASSIC=y
+CONFIG_BT_SHELL=y
+CONFIG_LOG=y
+CONFIG_ZTEST=y
+
+CONFIG_BT_RFCOMM=y
+
+CONFIG_BT_DEVICE_NAME="sdp_client"
+
+CONFIG_BT_CREATE_CONN_TIMEOUT=30
+CONFIG_BT_PAGE_TIMEOUT=0xFFFF
diff --git a/tests/bluetooth/classic/sdp_c/pytest/conftest.py b/tests/bluetooth/classic/sdp_c/pytest/conftest.py
new file mode 100644
index 0000000000000..aae74a19cfe50
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/pytest/conftest.py
@@ -0,0 +1,57 @@
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+import re
+
+import pytest
+from twister_harness import DeviceAdapter, Shell
+
+logger = logging.getLogger(__name__)
+
+
+def pytest_addoption(parser) -> None:
+    """Add local parser options to pytest."""
+    parser.addoption('--hci-transport', default=None, help='Configuration HCI transport for bumble')
+
+
+@pytest.fixture(name='initialize', scope='session')
+def fixture_initialize(request, shell: Shell, dut: DeviceAdapter):
+    """Session initializtion"""
+    # Get HCI transport for bumble
+    hci = request.config.getoption('--hci-transport')
+
+    if hci is None:
+        for fixture in dut.device_config.fixtures:
+            if fixture.startswith('usb_hci:'):
+                hci = fixture.split(sep=':', maxsplit=1)[1]
+                break
+
+    assert hci is not None
+
+    lines = shell.exec_command("bt init")
+    lines = dut.readlines_until("Bluetooth initialized")
+    regex = r'Identity: *(?P<bd_addr>(.*?):(.*?):(.*?):(.*?):(.*?):(.*?)*\((.*?)\))'
+    bd_addr = None
+    for line in lines:
+        logger.info(f"Shell log {line}")
+        m = re.search(regex, line)
+        if m:
+            bd_addr = m.group('bd_addr')
+
+    if bd_addr is None:
+        logger.error('Fail to get IUT BD address')
+        raise AssertionError
+
+    lines = shell.exec_command("br pscan on")
+    lines = shell.exec_command("br iscan on")
+    logger.info('initialized')
+    return hci, bd_addr
+
+
+@pytest.fixture
+def sdp_client_dut(initialize):
+    logger.info('Start running testcase')
+    yield initialize
+    logger.info('Done')
diff --git a/tests/bluetooth/classic/sdp_c/pytest/test_sdp.py b/tests/bluetooth/classic/sdp_c/pytest/test_sdp.py
new file mode 100644
index 0000000000000..a81a394a0d286
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/pytest/test_sdp.py
@@ -0,0 +1,968 @@
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import asyncio
+import logging
+import sys
+
+from bumble.core import (
+    BT_ADVANCED_AUDIO_DISTRIBUTION_SERVICE,
+    BT_AUDIO_SINK_SERVICE,
+    BT_AUDIO_SOURCE_SERVICE,
+    BT_AV_REMOTE_CONTROL_CONTROLLER_SERVICE,
+    BT_AV_REMOTE_CONTROL_SERVICE,
+    BT_AV_REMOTE_CONTROL_TARGET_SERVICE,
+    BT_AVCTP_PROTOCOL_ID,
+    BT_AVDTP_PROTOCOL_ID,
+    BT_BR_EDR_TRANSPORT,
+    BT_GENERIC_AUDIO_SERVICE,
+    BT_HANDSFREE_SERVICE,
+    BT_L2CAP_PROTOCOL_ID,
+    BT_RFCOMM_PROTOCOL_ID,
+)
+from bumble.device import Device
+from bumble.hci import Address, HCI_Write_Page_Timeout_Command
+from bumble.sdp import (
+    SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+    SDP_BROWSE_GROUP_LIST_ATTRIBUTE_ID,
+    SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+    SDP_PUBLIC_BROWSE_ROOT,
+    SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
+    SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
+    SDP_SUPPORTED_FEATURES_ATTRIBUTE_ID,
+    DataElement,
+    ServiceAttribute,
+)
+from bumble.snoop import BtSnooper
+from bumble.transport import open_transport_or_link
+from twister_harness import DeviceAdapter, Shell
+
+logger = logging.getLogger(__name__)
+
+AVDTP_PSM = 0x0019
+AVDTP_VERSION = 0x0100
+
+SDP_SERVICE_RECORDS_A2DP = {
+    0x00010001: [
+        ServiceAttribute(
+            SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_32(0x00010001),
+        ),
+        ServiceAttribute(
+            SDP_BROWSE_GROUP_LIST_ATTRIBUTE_ID,
+            DataElement.sequence([DataElement.uuid(SDP_PUBLIC_BROWSE_ROOT)]),
+        ),
+        ServiceAttribute(
+            SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
+            DataElement.sequence([DataElement.uuid(BT_AUDIO_SOURCE_SERVICE)]),
+        ),
+        ServiceAttribute(
+            SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_L2CAP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVDTP_PSM),
+                        ]
+                    ),
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_AVDTP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVDTP_VERSION),
+                        ]
+                    ),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_ADVANCED_AUDIO_DISTRIBUTION_SERVICE),
+                            DataElement.unsigned_integer_16(AVDTP_VERSION),
+                        ]
+                    )
+                ]
+            ),
+        ),
+    ]
+}
+
+RFCOMM_CHANNEL = 1
+HFP_VERSION = 0x0108
+HFP_FEATURES = 0x00
+
+SDP_SERVICE_RECORDS_HFP = {
+    0x00010002: [
+        ServiceAttribute(
+            SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_32(0x00010002),
+        ),
+        ServiceAttribute(
+            SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.uuid(BT_HANDSFREE_SERVICE),
+                    DataElement.uuid(BT_GENERIC_AUDIO_SERVICE),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence([DataElement.uuid(BT_L2CAP_PROTOCOL_ID)]),
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_RFCOMM_PROTOCOL_ID),
+                            DataElement.unsigned_integer_8(RFCOMM_CHANNEL),
+                        ]
+                    ),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_HANDSFREE_SERVICE),
+                            DataElement.unsigned_integer_16(HFP_VERSION),
+                        ]
+                    )
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_SUPPORTED_FEATURES_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_16(HFP_FEATURES),
+        ),
+    ]
+}
+
+SDP_SERVICE_ONE_RECORD = SDP_SERVICE_RECORDS_A2DP
+
+AVCTP_PSM = 0x0017
+AVCTP_VERSION = 0x0104
+AVRCP_VERSION = 0x0106
+AVRCP_TARGET_FEATURE = 0
+
+SDP_SERVICE_RECORDS_AVRCP_TARGET = {
+    0x00010003: [
+        ServiceAttribute(
+            SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_32(0x00010003),
+        ),
+        ServiceAttribute(
+            SDP_BROWSE_GROUP_LIST_ATTRIBUTE_ID,
+            DataElement.sequence([DataElement.uuid(SDP_PUBLIC_BROWSE_ROOT)]),
+        ),
+        ServiceAttribute(
+            SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.uuid(BT_AV_REMOTE_CONTROL_TARGET_SERVICE),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_L2CAP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVCTP_PSM),
+                        ]
+                    ),
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_AVCTP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVCTP_VERSION),
+                        ]
+                    ),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_AV_REMOTE_CONTROL_SERVICE),
+                            DataElement.unsigned_integer_16(AVRCP_VERSION),
+                        ]
+                    ),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_SUPPORTED_FEATURES_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_16(AVRCP_TARGET_FEATURE),
+        ),
+    ]
+}
+
+AVRCP_CONTROLLER_FEATURE = 0
+
+SDP_SERVICE_RECORDS_AVRCP_CONTROLLER = {
+    0x00010004: [
+        ServiceAttribute(
+            SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_32(0x00010004),
+        ),
+        ServiceAttribute(
+            SDP_BROWSE_GROUP_LIST_ATTRIBUTE_ID,
+            DataElement.sequence([DataElement.uuid(SDP_PUBLIC_BROWSE_ROOT)]),
+        ),
+        ServiceAttribute(
+            SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.uuid(BT_AV_REMOTE_CONTROL_SERVICE),
+                    DataElement.uuid(BT_AV_REMOTE_CONTROL_CONTROLLER_SERVICE),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_L2CAP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVCTP_PSM),
+                        ]
+                    ),
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_AVCTP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVCTP_VERSION),
+                        ]
+                    ),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_AV_REMOTE_CONTROL_SERVICE),
+                            DataElement.unsigned_integer_16(AVRCP_VERSION),
+                        ]
+                    ),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_SUPPORTED_FEATURES_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_16(AVRCP_CONTROLLER_FEATURE),
+        ),
+    ]
+}
+
+SDP_SERVICE_RECORDS_A2DP_SINK = {
+    0x00010005: [
+        ServiceAttribute(
+            SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
+            DataElement.unsigned_integer_32(0x00010005),
+        ),
+        ServiceAttribute(
+            SDP_BROWSE_GROUP_LIST_ATTRIBUTE_ID,
+            DataElement.sequence([DataElement.uuid(SDP_PUBLIC_BROWSE_ROOT)]),
+        ),
+        ServiceAttribute(
+            SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
+            DataElement.sequence([DataElement.uuid(BT_AUDIO_SINK_SERVICE)]),
+        ),
+        ServiceAttribute(
+            SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_L2CAP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVDTP_PSM),
+                        ]
+                    ),
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_AVDTP_PROTOCOL_ID),
+                            DataElement.unsigned_integer_16(AVDTP_VERSION),
+                        ]
+                    ),
+                ]
+            ),
+        ),
+        ServiceAttribute(
+            SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
+            DataElement.sequence(
+                [
+                    DataElement.sequence(
+                        [
+                            DataElement.uuid(BT_ADVANCED_AUDIO_DISTRIBUTION_SERVICE),
+                            DataElement.unsigned_integer_16(AVDTP_VERSION),
+                        ]
+                    )
+                ]
+            ),
+        ),
+    ]
+}
+
+
+async def wait_for_shell_response(dut, message):
+    found = False
+    lines = []
+    try:
+        while found is False:
+            read_lines = dut.readlines()
+            for line in read_lines:
+                logger.info(f'{str(line)}')
+                if message in line:
+                    found = True
+                    break
+            lines = lines + read_lines
+            await asyncio.sleep(1)
+    except Exception as e:
+        logger.error(f'{e}!', exc_info=True)
+        raise e
+    return found, lines
+
+
+async def device_power_on(device) -> None:
+    while True:
+        try:
+            await device.power_on()
+            break
+        except Exception:
+            continue
+
+
+async def sdp_ssa_discover_no_record(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        # No SDP Record
+        # device.sdp_service_records = SDP_SERVICE_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ssa_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "No SDP Record")
+            logger.info(f'{lines}')
+            assert found is True
+
+
+async def sdp_ssa_discover_one_record(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_ONE_RECORD
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ssa_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "PROTOCOL:" in line and "L2CAP" in line.split(':')[1]:
+                    assert int(line.split(':')[2]) == AVDTP_PSM
+                    found = True
+
+            logger.info(f'Rsp: PROTOCOL: L2CAP: {AVDTP_PSM} is found? {found}')
+            assert found is True
+
+            version = BT_ADVANCED_AUDIO_DISTRIBUTION_SERVICE.to_hex_str()
+
+            found = False
+            for line in lines:
+                if "VERSION:" in line:
+                    # logger.info(f"{version}")
+                    assert int(line.split(':')[1], base=16) == int(version, base=16)
+                    assert int(line.split(':')[2]) == AVDTP_VERSION
+                    found = True
+
+            logger.info(f'Rsp: VER: {version}: {AVDTP_VERSION} is found? {found}')
+            assert found is True
+
+
+SDP_SERVICE_TWO_RECORDS = {**SDP_SERVICE_RECORDS_A2DP, **SDP_SERVICE_RECORDS_HFP}
+
+
+async def sdp_ssa_discover_two_records(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_TWO_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ssa_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "PROTOCOL:" in line and "RFCOMM" in line.split(':')[1]:
+                    assert int(line.split(':')[2]) == RFCOMM_CHANNEL
+                    found = True
+
+            logger.info(f'Rsp: PROTOCOL: RFCOMM: {RFCOMM_CHANNEL} is found? {found}')
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "VERSION:" in line and int(line.split(':')[1], base=16) == int(
+                    BT_HANDSFREE_SERVICE.to_hex_str(), base=16
+                ):
+                    assert int(line.split(':')[2]) == HFP_VERSION
+                    found = True
+
+            logger.info(
+                f'Rsp: VER: {BT_HANDSFREE_SERVICE.to_hex_str()}: {HFP_VERSION} is found? {found}'
+            )
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "FEATURE:" in line:
+                    assert int(line.split(':')[1], base=16) == HFP_FEATURES
+                    found = True
+
+            logger.info(f'Rsp: FEATURE: {HFP_FEATURES} is found? {found}')
+            assert found is True
+
+
+SDP_SERVICE_MULTIPLE_RECORDS = {
+    **SDP_SERVICE_RECORDS_A2DP,
+    **SDP_SERVICE_RECORDS_HFP,
+    **SDP_SERVICE_RECORDS_AVRCP_TARGET,
+}
+
+
+async def sdp_ssa_discover_multiple_records(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_MULTIPLE_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ssa_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            logger.info(f'{lines}')
+            assert found is True
+
+
+async def sdp_ss_discover_no_record(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        # No SDP Record
+        # device.sdp_service_records = SDP_SERVICE_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ss_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "No SDP Record")
+            logger.info(f'{lines}')
+            assert found is True
+
+
+async def sdp_ss_discover_one_record(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_ONE_RECORD
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ss_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            logger.info(f'{lines}')
+            assert found is True
+
+            count = 0
+            for line in lines:
+                if "RAW:" in line and device.sdp_service_records.get(
+                    int(line.split(':')[1], base=16)
+                ):
+                    count = count + 1
+
+            logger.info(f'Rsp: Service Record Handle count is {count}')
+            assert count == 1
+
+
+async def sdp_ss_discover_two_records(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_TWO_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ss_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            logger.info(f'{lines}')
+            assert found is True
+
+            count = 0
+            for line in lines:
+                if "RAW:" in line and device.sdp_service_records.get(
+                    int(line.split(':')[1], base=16)
+                ):
+                    count = count + 1
+
+            logger.info(f'Rsp: Service Record Handle count is {count}')
+            assert count == 2
+
+
+async def sdp_ss_discover_multiple_records(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_MULTIPLE_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command(f"sdp_client ss_discovery {BT_L2CAP_PROTOCOL_ID.to_hex_str()}")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            logger.info(f'{lines}')
+            assert found is True
+
+            count = 0
+            for line in lines:
+                if "RAW:" in line and device.sdp_service_records.get(
+                    int(line.split(':')[1], base=16)
+                ):
+                    count = count + 1
+
+            logger.info(f'Rsp: Service Record Handle count is {count}')
+            assert count == 3
+
+
+async def sdp_sa_discover_no_record(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        # No SDP Record
+        # device.sdp_service_records = SDP_SERVICE_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command("sdp_client sa_discovery 00010001")
+            found, lines = await wait_for_shell_response(dut, "No SDP Record")
+            logger.info(f'{lines}')
+            assert found is True
+
+
+async def sdp_sa_discover_one_record(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_ONE_RECORD
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command("sdp_client sa_discovery 00010001")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "PROTOCOL:" in line and "L2CAP" in line.split(':')[1]:
+                    assert int(line.split(':')[2]) == AVDTP_PSM
+                    found = True
+
+            logger.info(f'Rsp: PROTOCOL: L2CAP: {AVDTP_PSM} is found? {found}')
+            assert found is True
+
+            version = BT_ADVANCED_AUDIO_DISTRIBUTION_SERVICE.to_hex_str()
+
+            found = False
+            for line in lines:
+                if "VERSION:" in line:
+                    # logger.info(f"{version}")
+                    assert int(line.split(':')[1], base=16) == int(version, base=16)
+                    assert int(line.split(':')[2]) == AVDTP_VERSION
+                    found = True
+
+            logger.info(f'Rsp: VER: {version}: {AVDTP_VERSION} is found? {found}')
+            assert found is True
+
+
+async def sdp_sa_discover_two_records(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_TWO_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command("sdp_client sa_discovery 00010002")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "PROTOCOL:" in line and "RFCOMM" in line.split(':')[1]:
+                    assert int(line.split(':')[2]) == RFCOMM_CHANNEL
+                    found = True
+
+            logger.info(f'Rsp: PROTOCOL: RFCOMM: {RFCOMM_CHANNEL} is found? {found}')
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "VERSION:" in line and int(line.split(':')[1], base=16) == int(
+                    BT_HANDSFREE_SERVICE.to_hex_str(), base=16
+                ):
+                    assert int(line.split(':')[2]) == HFP_VERSION
+                    found = True
+
+            logger.info(
+                f'Rsp: VER: {BT_HANDSFREE_SERVICE.to_hex_str()}: {HFP_VERSION} is found? {found}'
+            )
+            assert found is True
+
+            found = False
+            for line in lines:
+                if "FEATURE:" in line:
+                    assert int(line.split(':')[1], base=16) == HFP_FEATURES
+                    found = True
+
+            logger.info(f'Rsp: FEATURE: {HFP_FEATURES} is found? {found}')
+            assert found is True
+
+
+async def sdp_sa_discover_multiple_records(hci_port, shell, dut, address) -> None:
+    logger.info('<<< SDP Discovery ...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        device.sdp_service_records = SDP_SERVICE_MULTIPLE_RECORDS
+        with open(f"bumble_hci_{sys._getframe().f_code.co_name}.log", "wb") as snoop_file:
+            device.host.snooper = BtSnooper(snoop_file)
+            await device_power_on(device)
+            await device.send_command(HCI_Write_Page_Timeout_Command(page_timeout=0xFFFF))
+
+            target_address = address.split(" ")[0]
+            logger.info(f'=== Connecting to {target_address}...')
+            try:
+                connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+                logger.info(f'=== Connected to {connection.peer_address}!')
+            except Exception as e:
+                logger.error(f'Fail to connect to {target_address}!')
+                raise e
+
+            # Discover SDP Record
+            shell.exec_command("sdp_client sa_discovery 00010003")
+            found, lines = await wait_for_shell_response(dut, "SDP Discovery Done")
+            logger.info(f'{lines}')
+            assert found is True
+
+
+class TestSdpServer:
+    def test_sdp_ssa_discover_no_record(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. No SDP record registered."""
+        logger.info(f'test_sdp_ssa_discover_no_record {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ssa_discover_no_record(hci, shell, dut, iut_address))
+
+    def test_sdp_ssa_discover_one_record(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. One SDP record registered."""
+        logger.info(f'test_sdp_ssa_discover_one_record {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ssa_discover_one_record(hci, shell, dut, iut_address))
+
+    def test_sdp_ssa_discover_two_records(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. Two SDP record registered."""
+        logger.info(f'test_sdp_ssa_discover_two_records {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ssa_discover_two_records(hci, shell, dut, iut_address))
+
+    def test_sdp_ssa_discover_multiple_records(
+        self, shell: Shell, dut: DeviceAdapter, sdp_client_dut
+    ):
+        """Test case to request SDP records. Multiple SDP record registered."""
+        logger.info(f'test_sdp_ssa_discover_multiple_records {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ssa_discover_multiple_records(hci, shell, dut, iut_address))
+
+    def test_sdp_ss_discover_no_record(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. No SDP record registered."""
+        logger.info(f'test_sdp_ss_discover_no_record {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ss_discover_no_record(hci, shell, dut, iut_address))
+
+    def test_sdp_ss_discover_one_record(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. One SDP record registered."""
+        logger.info(f'test_sdp_ss_discover_one_record {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ss_discover_one_record(hci, shell, dut, iut_address))
+
+    def test_sdp_ss_discover_two_records(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. Two SDP record registered."""
+        logger.info(f'test_sdp_ss_discover_two_records {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ss_discover_two_records(hci, shell, dut, iut_address))
+
+    def test_sdp_ss_discover_multiple_records(
+        self, shell: Shell, dut: DeviceAdapter, sdp_client_dut
+    ):
+        """Test case to request SDP records. Multiple SDP record registered."""
+        logger.info(f'test_sdp_ss_discover_multiple_records {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_ss_discover_multiple_records(hci, shell, dut, iut_address))
+
+    def test_sdp_sa_discover_no_record(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. No SDP record registered."""
+        logger.info(f'test_sdp_sa_discover_no_record {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_sa_discover_no_record(hci, shell, dut, iut_address))
+
+    def test_sdp_sa_discover_one_record(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. One SDP record registered."""
+        logger.info(f'test_sdp_sa_discover_one_record {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_sa_discover_one_record(hci, shell, dut, iut_address))
+
+    def test_sdp_sa_discover_two_records(self, shell: Shell, dut: DeviceAdapter, sdp_client_dut):
+        """Test case to request SDP records. Two SDP record registered."""
+        logger.info(f'test_sdp_sa_discover_two_records {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_sa_discover_two_records(hci, shell, dut, iut_address))
+
+    def test_sdp_sa_discover_multiple_records(
+        self, shell: Shell, dut: DeviceAdapter, sdp_client_dut
+    ):
+        """Test case to request SDP records. Multiple SDP record registered."""
+        logger.info(f'test_sdp_sa_discover_multiple_records {sdp_client_dut}')
+        hci, iut_address = sdp_client_dut
+        asyncio.run(sdp_sa_discover_multiple_records(hci, shell, dut, iut_address))
diff --git a/tests/bluetooth/classic/sdp_c/src/sdp_client.c b/tests/bluetooth/classic/sdp_c/src/sdp_client.c
new file mode 100644
index 0000000000000..0621b61b86a17
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/src/sdp_client.c
@@ -0,0 +1,303 @@
+/* sdp_client.c - Bluetooth classic SDP client smoke test */
+
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdlib.h>
+
+#include <errno.h>
+#include <zephyr/types.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/classic/rfcomm.h>
+#include <zephyr/bluetooth/classic/sdp.h>
+
+#include <zephyr/shell/shell.h>
+
+extern struct bt_conn *default_conn;
+
+static struct bt_sdp_discover_params sdp_discover;
+static union {
+	struct bt_uuid_16 u16;
+	struct bt_uuid_32 u32;
+	struct bt_uuid_128 u128;
+} sdp_discover_uuid;
+
+const uint16_t svclass_list[] = {
+	BT_SDP_SDP_SERVER_SVCLASS,
+	BT_SDP_BROWSE_GRP_DESC_SVCLASS,
+	BT_SDP_PUBLIC_BROWSE_GROUP,
+	BT_SDP_SERIAL_PORT_SVCLASS,
+	BT_SDP_LAN_ACCESS_SVCLASS,
+	BT_SDP_DIALUP_NET_SVCLASS,
+	BT_SDP_IRMC_SYNC_SVCLASS,
+	BT_SDP_OBEX_OBJPUSH_SVCLASS,
+	BT_SDP_OBEX_FILETRANS_SVCLASS,
+	BT_SDP_IRMC_SYNC_CMD_SVCLASS,
+	BT_SDP_HEADSET_SVCLASS,
+	BT_SDP_CORDLESS_TELEPHONY_SVCLASS,
+	BT_SDP_AUDIO_SOURCE_SVCLASS,
+	BT_SDP_AUDIO_SINK_SVCLASS,
+	BT_SDP_AV_REMOTE_TARGET_SVCLASS,
+	BT_SDP_ADVANCED_AUDIO_SVCLASS,
+	BT_SDP_AV_REMOTE_SVCLASS,
+	BT_SDP_AV_REMOTE_CONTROLLER_SVCLASS,
+	BT_SDP_INTERCOM_SVCLASS,
+	BT_SDP_FAX_SVCLASS,
+	BT_SDP_HEADSET_AGW_SVCLASS,
+	BT_SDP_WAP_SVCLASS,
+	BT_SDP_WAP_CLIENT_SVCLASS,
+	BT_SDP_PANU_SVCLASS,
+	BT_SDP_NAP_SVCLASS,
+	BT_SDP_GN_SVCLASS,
+	BT_SDP_DIRECT_PRINTING_SVCLASS,
+	BT_SDP_REFERENCE_PRINTING_SVCLASS,
+	BT_SDP_IMAGING_SVCLASS,
+	BT_SDP_IMAGING_RESPONDER_SVCLASS,
+	BT_SDP_IMAGING_ARCHIVE_SVCLASS,
+	BT_SDP_IMAGING_REFOBJS_SVCLASS,
+	BT_SDP_HANDSFREE_SVCLASS,
+	BT_SDP_HANDSFREE_AGW_SVCLASS,
+	BT_SDP_DIRECT_PRT_REFOBJS_SVCLASS,
+	BT_SDP_REFLECTED_UI_SVCLASS,
+	BT_SDP_BASIC_PRINTING_SVCLASS,
+	BT_SDP_PRINTING_STATUS_SVCLASS,
+	BT_SDP_HID_SVCLASS,
+	BT_SDP_HCR_SVCLASS,
+	BT_SDP_HCR_PRINT_SVCLASS,
+	BT_SDP_HCR_SCAN_SVCLASS,
+	BT_SDP_CIP_SVCLASS,
+	BT_SDP_VIDEO_CONF_GW_SVCLASS,
+	BT_SDP_UDI_MT_SVCLASS,
+	BT_SDP_UDI_TA_SVCLASS,
+	BT_SDP_AV_SVCLASS,
+	BT_SDP_SAP_SVCLASS,
+	BT_SDP_PBAP_PCE_SVCLASS,
+	BT_SDP_PBAP_PSE_SVCLASS,
+	BT_SDP_PBAP_SVCLASS,
+	BT_SDP_MAP_MSE_SVCLASS,
+	BT_SDP_MAP_MCE_SVCLASS,
+	BT_SDP_MAP_SVCLASS,
+	BT_SDP_GNSS_SVCLASS,
+	BT_SDP_GNSS_SERVER_SVCLASS,
+	BT_SDP_MPS_SC_SVCLASS,
+	BT_SDP_MPS_SVCLASS,
+	BT_SDP_PNP_INFO_SVCLASS,
+	BT_SDP_GENERIC_NETWORKING_SVCLASS,
+	BT_SDP_GENERIC_FILETRANS_SVCLASS,
+	BT_SDP_GENERIC_AUDIO_SVCLASS,
+	BT_SDP_GENERIC_TELEPHONY_SVCLASS,
+	BT_SDP_UPNP_SVCLASS,
+	BT_SDP_UPNP_IP_SVCLASS,
+	BT_SDP_UPNP_PAN_SVCLASS,
+	BT_SDP_UPNP_LAP_SVCLASS,
+	BT_SDP_UPNP_L2CAP_SVCLASS,
+	BT_SDP_VIDEO_SOURCE_SVCLASS,
+	BT_SDP_VIDEO_SINK_SVCLASS,
+	BT_SDP_VIDEO_DISTRIBUTION_SVCLASS,
+	BT_SDP_HDP_SVCLASS,
+	BT_SDP_HDP_SOURCE_SVCLASS,
+	BT_SDP_HDP_SINK_SVCLASS,
+	BT_SDP_GENERIC_ACCESS_SVCLASS,
+	BT_SDP_GENERIC_ATTRIB_SVCLASS,
+	BT_SDP_APPLE_AGENT_SVCLASS,
+};
+
+#define SDP_CLIENT_USER_BUF_LEN 4096
+NET_BUF_POOL_FIXED_DEFINE(sdp_client_pool, 1, SDP_CLIENT_USER_BUF_LEN,
+			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
+
+static bool sdp_record_found;
+
+static uint8_t sdp_discover_func(struct bt_conn *conn, struct bt_sdp_client_result *result,
+				 const struct bt_sdp_discover_params *params)
+{
+	int err;
+	uint16_t param;
+
+	if ((result == NULL) || (result->resp_buf == NULL) || (result->resp_buf->len == 0)) {
+		if (sdp_record_found) {
+			sdp_record_found = false;
+			printk("SDP Discovery Done\n");
+		} else {
+			printk("No SDP Record\n");
+		}
+		return BT_SDP_DISCOVER_UUID_STOP;
+	}
+
+	sdp_record_found = true;
+
+	printk("SDP Rsp Data:\n");
+	err = bt_sdp_get_proto_param(result->resp_buf, BT_SDP_PROTO_L2CAP, &param);
+	if (!err) {
+		printk("    PROTOCOL: L2CAP: %d\n", param);
+	}
+	err = bt_sdp_get_proto_param(result->resp_buf, BT_SDP_PROTO_RFCOMM, &param);
+	if (!err) {
+		printk("    PROTOCOL: RFCOMM: %d\n", param);
+	}
+	for (size_t i = 0; i < ARRAY_SIZE(svclass_list); i++) {
+		err = bt_sdp_get_profile_version(result->resp_buf, svclass_list[i], &param);
+		if (!err) {
+			printk("    VERSION: %04X: %d\n", svclass_list[i], param);
+		}
+	}
+	err = bt_sdp_get_features(result->resp_buf, &param);
+	if (!err) {
+		printk("    FEATURE: %04X\n", param);
+	}
+	printk("    RAW:");
+	for (uint16_t i = 0; i < result->resp_buf->len; i++) {
+		printk("%02X", result->resp_buf->data[i]);
+	}
+	printk("\n");
+
+	if (!result->next_record_hint) {
+		sdp_record_found = false;
+		printk("SDP Discovery Done\n");
+	}
+
+	return BT_SDP_DISCOVER_UUID_CONTINUE;
+}
+
+static int cmd_ssa_discovery(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+	size_t len;
+
+	len = strlen(argv[1]);
+
+	if (len == (BT_UUID_SIZE_16 * 2)) {
+		uint16_t val;
+
+		sdp_discover_uuid.u16.uuid.type = BT_UUID_TYPE_16;
+		hex2bin(argv[1], len, (uint8_t *)&val, sizeof(val));
+		sdp_discover_uuid.u16.val = sys_be16_to_cpu(val);
+		sdp_discover.uuid = &sdp_discover_uuid.u16.uuid;
+	} else if (len == (BT_UUID_SIZE_32 * 2)) {
+		uint32_t val;
+
+		sdp_discover_uuid.u32.uuid.type = BT_UUID_TYPE_32;
+		hex2bin(argv[1], len, (uint8_t *)&val, sizeof(val));
+		sdp_discover_uuid.u32.val = sys_be32_to_cpu(val);
+		sdp_discover.uuid = &sdp_discover_uuid.u32.uuid;
+	} else if (len == (BT_UUID_SIZE_128 * 2)) {
+		sdp_discover_uuid.u128.uuid.type = BT_UUID_TYPE_128;
+		hex2bin(argv[1], len, &sdp_discover_uuid.u128.val[0],
+			sizeof(sdp_discover_uuid.u128.val));
+		sdp_discover.uuid = &sdp_discover_uuid.u128.uuid;
+	} else {
+		shell_error(sh, "Invalid UUID");
+		return -ENOEXEC;
+	}
+
+	sdp_discover.func = sdp_discover_func;
+	sdp_discover.pool = &sdp_client_pool;
+	sdp_discover.type = BT_SDP_DISCOVER_SERVICE_SEARCH_ATTR;
+
+	err = bt_sdp_discover(default_conn, &sdp_discover);
+	if (err) {
+		shell_error(sh, "Fail to start SDP Discovery (err %d)", err);
+		return err;
+	}
+	return 0;
+}
+
+static int cmd_ss_discovery(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+	size_t len;
+
+	len = strlen(argv[1]);
+
+	if (len == (BT_UUID_SIZE_16 * 2)) {
+		uint16_t val;
+
+		sdp_discover_uuid.u16.uuid.type = BT_UUID_TYPE_16;
+		hex2bin(argv[1], len, (uint8_t *)&val, sizeof(val));
+		sdp_discover_uuid.u16.val = sys_be16_to_cpu(val);
+		sdp_discover.uuid = &sdp_discover_uuid.u16.uuid;
+	} else if (len == (BT_UUID_SIZE_32 * 2)) {
+		uint32_t val;
+
+		sdp_discover_uuid.u32.uuid.type = BT_UUID_TYPE_32;
+		hex2bin(argv[1], len, (uint8_t *)&val, sizeof(val));
+		sdp_discover_uuid.u32.val = sys_be32_to_cpu(val);
+		sdp_discover.uuid = &sdp_discover_uuid.u32.uuid;
+	} else if (len == (BT_UUID_SIZE_128 * 2)) {
+		sdp_discover_uuid.u128.uuid.type = BT_UUID_TYPE_128;
+		hex2bin(argv[1], len, &sdp_discover_uuid.u128.val[0],
+			sizeof(sdp_discover_uuid.u128.val));
+		sdp_discover.uuid = &sdp_discover_uuid.u128.uuid;
+	} else {
+		shell_error(sh, "Invalid UUID");
+		return -ENOEXEC;
+	}
+
+	sdp_discover.func = sdp_discover_func;
+	sdp_discover.pool = &sdp_client_pool;
+	sdp_discover.type = BT_SDP_DISCOVER_SERVICE_SEARCH;
+
+	err = bt_sdp_discover(default_conn, &sdp_discover);
+	if (err) {
+		shell_error(sh, "Fail to start SDP Discovery (err %d)", err);
+		return err;
+	}
+	return 0;
+}
+
+static int cmd_sa_discovery(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+	size_t len;
+	uint32_t handle;
+
+	len = strlen(argv[1]);
+
+	if (len == (sizeof(handle) * 2)) {
+		hex2bin(argv[1], len, (uint8_t *)&handle, sizeof(handle));
+		sdp_discover.handle = sys_be32_to_cpu(handle);
+	} else {
+		shell_error(sh, "Invalid UUID");
+		return -ENOEXEC;
+	}
+
+	sdp_discover.func = sdp_discover_func;
+	sdp_discover.pool = &sdp_client_pool;
+	sdp_discover.type = BT_SDP_DISCOVER_SERVICE_ATTR;
+
+	err = bt_sdp_discover(default_conn, &sdp_discover);
+	if (err) {
+		shell_error(sh, "Fail to start SDP Discovery (err %d)", err);
+		return err;
+	}
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sdp_client_cmds,
+	SHELL_CMD_ARG(ss_discovery, NULL, "<UUID>", cmd_ss_discovery, 2, 0),
+	SHELL_CMD_ARG(sa_discovery, NULL, "<Service Record Handle>", cmd_sa_discovery, 2, 0),
+	SHELL_CMD_ARG(ssa_discovery, NULL, "<UUID>", cmd_ssa_discovery, 2, 0),
+	SHELL_SUBCMD_SET_END
+);
+
+static int cmd_default_handler(const struct shell *sh, size_t argc, char **argv)
+{
+	if (argc == 1) {
+		shell_help(sh);
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	shell_error(sh, "%s unknown parameter: %s", argv[0], argv[1]);
+
+	return -EINVAL;
+}
+
+SHELL_CMD_REGISTER(sdp_client, &sdp_client_cmds, "Bluetooth classic SDP client shell commands",
+		   cmd_default_handler);
diff --git a/tests/bluetooth/classic/sdp_c/testcase.yaml b/tests/bluetooth/classic/sdp_c/testcase.yaml
new file mode 100644
index 0000000000000..0eae8a22ea6fe
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_c/testcase.yaml
@@ -0,0 +1,15 @@
+tests:
+  bluetooth.classic.sdp.client:
+    platform_allow:
+      - native_sim
+      - mimxrt1170_evk@B/mimxrt1176/cm7
+    integration_platforms:
+      - native_sim
+    tags:
+      - bluetooth
+      - sdp
+    harness: pytest
+    harness_config:
+      pytest_dut_scope: session
+      fixture: usb_hci
+    timeout: 180
diff --git a/tests/bluetooth/classic/sdp_s/CMakeLists.txt b/tests/bluetooth/classic/sdp_s/CMakeLists.txt
new file mode 100644
index 0000000000000..89de0b86386a9
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+set(NO_QEMU_SERIAL_BT_SERVER 1)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(bluetooth)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/bluetooth/classic/sdp_s/README.rst b/tests/bluetooth/classic/sdp_s/README.rst
new file mode 100644
index 0000000000000..946e6e43c44c8
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/README.rst
@@ -0,0 +1,74 @@
+.. _bluetooth_classic_sdp_server_tests:
+
+Bluetooth Classic SDP Server Tests
+##################################
+
+Overview
+********
+
+This test suite uses ``bumble`` for testing Bluetooth Classic communication between a host
+PC (running :ref:`Twister <twister_script>`) and a device under test (DUT) running Zephyr.
+
+Prerequisites
+*************
+
+The test suite has the following prerequisites:
+
+* The ``bumble`` library installed on the host PC.
+The Bluetooth Classic controller on PC side is required. Refer to getting started of `bumble`_
+for details.
+
+The HCI transport for ``bumble`` can be configured as follows:
+
+* A specific configuration context can be provided along with the ``usb_hci`` fixture separated by
+  a ``:`` (i.e. specify fixture ``usb_hci:usb:0`` to use the ``usb:0`` as hci transport for
+  ``bumble``).
+* The configuration context can be overridden using the `hci transport`_ can be provided using the
+  ``--hci-transport`` test suite argument (i.e. run ``twister`` with the
+  ``--pytest-args=--hci-transport=usb:0`` argument to use the ``usb:0`` as hci transport for
+  ``bumble``).
+
+Building and Running
+********************
+
+Running on mimxrt1170_evk@B/mimxrt1176/cm7
+==========================================
+
+Running the test suite on :ref:`mimxrt1170_evk` relies on configuration of ``bumble``.
+
+On the host PC, a HCI transport needs to be required. Refer to `bumble platforms`_ page of
+``bumble`` for details.
+
+For example, on windows, a PTS dongle is used. After `WinUSB driver`_ has been installed,
+the HCI transport would be USB transport interface ``usb:<index>``.
+
+If the HCI transport is ``usb:0`` and debug console port is ``COM4``, the test suite can be
+launched using Twister:
+
+.. code-block:: shell
+
+   west twister -v -p mimxrt1170_evk@B/mimxrt1176/cm7 --device-testing --device-serial COM4 -T tests/bluetooth/classic/sdp_s -O sdp_s --force-platform --west-flash --west-runner=jlink -X usb_hci:usb:0
+
+Running on Hardware
+===================
+
+Running the test suite on hardware requires a HCI transport connected to the host PC.
+
+The test suite can be launched using Twister. Below is an example for running on the
+:zephyr:board:`mimxrt1170_evk@B/mimxrt1176/cm7`:
+
+.. code-block:: shell
+
+   west twister -v -p mimxrt1170_evk@B/mimxrt1176/cm7 --device-testing --device-serial COM4 -T tests/bluetooth/classic/sdp_s -O sdp_s --force-platform --west-flash --west-runner=jlink -X usb_hci:usb:0
+
+.. _bumble:
+   https://google.github.io/bumble/getting_started.html
+
+.. _hci transport:
+   https://google.github.io/bumble/transports/index.html
+
+.. _bumble platforms:
+   https://google.github.io/bumble/platforms/index.html
+
+.. _WinUSB driver:
+   https://google.github.io/bumble/platforms/windows.html
diff --git a/tests/bluetooth/classic/sdp_s/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/bluetooth/classic/sdp_s/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
new file mode 100644
index 0000000000000..289b5a597386c
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
@@ -0,0 +1,10 @@
+#select NXP NW612 Chipset
+CONFIG_BT_NXP_NW612=y
+
+CONFIG_BT_SETTINGS=n
+CONFIG_FLASH=n
+CONFIG_FLASH_MAP=n
+CONFIG_NVS=n
+CONFIG_SETTINGS=n
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bluetooth/classic/sdp_s/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/bluetooth/classic/sdp_s/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
new file mode 100644
index 0000000000000..96ef63ad60b2e
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,sram = &dtcm;
+	};
+};
diff --git a/tests/bluetooth/classic/sdp_s/prj.conf b/tests/bluetooth/classic/sdp_s/prj.conf
new file mode 100644
index 0000000000000..ac6e0e30df1d7
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/prj.conf
@@ -0,0 +1,9 @@
+CONFIG_BT=y
+CONFIG_BT_CLASSIC=y
+CONFIG_BT_SHELL=y
+CONFIG_LOG=y
+CONFIG_ZTEST=y
+
+CONFIG_BT_RFCOMM=y
+
+CONFIG_BT_DEVICE_NAME="sdp_server"
diff --git a/tests/bluetooth/classic/sdp_s/pytest/conftest.py b/tests/bluetooth/classic/sdp_s/pytest/conftest.py
new file mode 100644
index 0000000000000..6b15e12ed3464
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/pytest/conftest.py
@@ -0,0 +1,57 @@
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+import re
+
+import pytest
+from twister_harness import DeviceAdapter, Shell
+
+logger = logging.getLogger(__name__)
+
+
+def pytest_addoption(parser) -> None:
+    """Add local parser options to pytest."""
+    parser.addoption('--hci-transport', default=None, help='Configuration HCI transport for bumble')
+
+
+@pytest.fixture(name='initialize', scope='session')
+def fixture_initialize(request, shell: Shell, dut: DeviceAdapter):
+    """Session initializtion"""
+    # Get HCI transport for bumble
+    hci = request.config.getoption('--hci-transport')
+
+    if hci is None:
+        for fixture in dut.device_config.fixtures:
+            if fixture.startswith('usb_hci:'):
+                hci = fixture.split(sep=':', maxsplit=1)[1]
+                break
+
+    assert hci is not None
+
+    lines = shell.exec_command("bt init")
+    lines = dut.readlines_until("Bluetooth initialized")
+    regex = r'Identity: *(?P<bd_addr>(.*?):(.*?):(.*?):(.*?):(.*?):(.*?)*\((.*?)\))'
+    bd_addr = None
+    for line in lines:
+        logger.info(f"Shell log {line}")
+        m = re.search(regex, line)
+        if m:
+            bd_addr = m.group('bd_addr')
+
+    if bd_addr is None:
+        logger.error('Fail to get IUT BD address')
+        raise AssertionError
+
+    lines = shell.exec_command("br pscan on")
+    lines = shell.exec_command("br iscan on")
+    logger.info('initialized')
+    return hci, bd_addr
+
+
+@pytest.fixture
+def sdp_server_dut(initialize):
+    logger.info('Start running testcase')
+    yield initialize
+    logger.info('Done')
diff --git a/tests/bluetooth/classic/sdp_s/pytest/test_sdp.py b/tests/bluetooth/classic/sdp_s/pytest/test_sdp.py
new file mode 100644
index 0000000000000..92ed24eaef6e6
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/pytest/test_sdp.py
@@ -0,0 +1,289 @@
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import asyncio
+import logging
+
+from bumble.core import (
+    BT_BR_EDR_TRANSPORT,
+    BT_L2CAP_PROTOCOL_ID,
+    BT_OBEX_PROTOCOL_ID,
+    CommandTimeoutError,
+    DeviceClass,
+)
+from bumble.device import Device
+from bumble.hci import Address
+from bumble.sdp import SDP_ALL_ATTRIBUTES_RANGE, SDP_PUBLIC_BROWSE_ROOT
+from bumble.sdp import Client as SDP_Client
+from bumble.transport import open_transport_or_link
+from twister_harness import DeviceAdapter, Shell
+
+logger = logging.getLogger(__name__)
+
+
+async def device_power_on(device) -> None:
+    while True:
+        try:
+            await device.power_on()
+            break
+        except Exception:
+            continue
+
+
+class discovery_listener(Device.Listener):
+    def __init__(self, address: str, event, **kwargs):
+        self._address = address
+        self._event = event
+        super().__init__(**kwargs)
+
+    def on_inquiry_result(self, address, class_of_device, data, rssi):
+        (
+            service_classes,
+            major_device_class,
+            minor_device_class,
+        ) = DeviceClass.split_class_of_device(class_of_device)
+        if self._address:
+            _address = self._address.split(" ")
+            if _address[0] in str(address):
+                logger.info('Target device is found')
+                self._event.set()
+        separator = '\n  '
+        logger.info(f'>>> {address}:')
+        logger.info(f'  Device Class (raw): {class_of_device:06X}')
+        major_class_name = DeviceClass.major_device_class_name(major_device_class)
+        logger.info('  Device Major Class: ' f'{major_class_name}')
+        minor_class_name = DeviceClass.minor_device_class_name(
+            major_device_class, minor_device_class
+        )
+        logger.info('  Device Minor Class: ' f'{minor_class_name}')
+        logger.info(
+            '  Device Services: ' f'{", ".join(DeviceClass.service_class_labels(service_classes))}'
+        )
+        logger.info(f'  RSSI: {rssi}')
+        if data.ad_structures:
+            logger.info(f'  {data.to_string(separator)}')
+
+
+async def start_discovery(hci_port, address) -> None:
+    logger.info('<<< Start discovery...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        event = asyncio.Event()
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.listener = discovery_listener(address, event)
+        await device_power_on(device)
+
+        logger.info('Starting discovery')
+        await device.start_discovery()
+        await event.wait()
+
+
+async def br_connect(hci_port, shell, address) -> None:
+    logger.info('<<< connect...')
+    async with await open_transport_or_link(hci_port) as hci_transport:
+        device = Device.with_hci(
+            'Bumble',
+            Address('F0:F1:F2:F3:F4:F5'),
+            hci_transport.source,
+            hci_transport.sink,
+        )
+        device.classic_enabled = True
+        device.le_enabled = False
+        await device_power_on(device)
+
+        target_address = address.split(" ")[0]
+        logger.info(f'=== Connecting to {target_address}...')
+        try:
+            connection = await device.connect(target_address, transport=BT_BR_EDR_TRANSPORT)
+            logger.info(f'=== Connected to {connection.peer_address}!')
+        except CommandTimeoutError as e:
+            logger.info('!!! Connection timed out')
+            raise e
+
+        # Connect to the SDP Server
+        sdp_client = SDP_Client(connection)
+        await sdp_client.connect()
+
+        # List all services in the root browse group
+        logger.info("<<< 1 List all services in the root browse group")
+        service_record_handles = await sdp_client.search_services([SDP_PUBLIC_BROWSE_ROOT])
+        logger.info(f'SERVICES: {service_record_handles}')
+
+        # For each service in the root browse group, get all its attributes
+        assert len(service_record_handles) == 0
+        for service_record_handle in service_record_handles:
+            attributes = await sdp_client.get_attributes(
+                service_record_handle, [SDP_ALL_ATTRIBUTES_RANGE]
+            )
+            logger.info(f'SERVICE {service_record_handle:04X} attributes:')
+            for attribute in attributes:
+                logger.info(f'  {attribute}')
+
+        # Install SDP Record 0
+        shell.exec_command("sdp_server register_sdp 0")
+
+        # List all services in the root browse group
+        logger.info("<<< 2 List all services in the root browse group")
+        service_record_handles = await sdp_client.search_services([SDP_PUBLIC_BROWSE_ROOT])
+        logger.info(f'SERVICES: {service_record_handles}')
+
+        # For each service in the root browse group, get all its attributes
+        assert len(service_record_handles) != 0
+        for service_record_handle in service_record_handles:
+            attributes = await sdp_client.get_attributes(
+                service_record_handle, [SDP_ALL_ATTRIBUTES_RANGE]
+            )
+            logger.info(f'SERVICE {service_record_handle:04X} attributes:')
+            for attribute in attributes:
+                logger.info(f'  {attribute}')
+
+        logger.info("<<< 3 List all attributes with L2CAP protocol")
+        search_result = await sdp_client.search_attributes(
+            [BT_L2CAP_PROTOCOL_ID], [SDP_ALL_ATTRIBUTES_RANGE]
+        )
+        assert len(search_result) != 0
+        logger.info('SEARCH RESULTS:')
+        for attribute_list in search_result:
+            logger.info('SERVICE:')
+            logger.info('  ' + '\n  '.join([attribute.to_string() for attribute in attribute_list]))
+
+        logger.info("<<< 4 List all attributes with OBEX protocol")
+        search_result = await sdp_client.search_attributes(
+            [BT_OBEX_PROTOCOL_ID], [SDP_ALL_ATTRIBUTES_RANGE]
+        )
+        logger.info(f'SEARCH RESULTS:{search_result}')
+        assert len(search_result) == 0
+
+        logger.info("<<< 5 List all attributes with L2CAP protocol (0x1000~0xFFFF)")
+        search_result = await sdp_client.search_attributes(
+            [BT_L2CAP_PROTOCOL_ID], [(0x1000, 0xFFFF)]
+        )
+        logger.info(f'SEARCH RESULTS:{search_result}')
+        assert len(search_result) == 0
+
+        # Install SDP Record 1
+        shell.exec_command("sdp_server register_sdp 1")
+
+        # List all services with L2CAP
+        logger.info("<<< 6 List all services with L2CAP protocol")
+        service_record_handles = await sdp_client.search_services([BT_L2CAP_PROTOCOL_ID])
+        logger.info(f'SERVICES: {service_record_handles}')
+
+        assert len(service_record_handles) != 0
+        # For each service in the root browse group, get all its attributes
+        for service_record_handle in service_record_handles:
+            attributes = await sdp_client.get_attributes(
+                service_record_handle, [SDP_ALL_ATTRIBUTES_RANGE]
+            )
+            logger.info(f'SERVICE {service_record_handle:04X} attributes:')
+            for attribute in attributes:
+                logger.info(f'  {attribute}')
+
+        # Install SDP Record 2
+        shell.exec_command("sdp_server register_sdp 2")
+
+        # List all services with L2CAP
+        logger.info("<<< 7 List all services with L2CAP protocol")
+        service_record_handles = await sdp_client.search_services([BT_L2CAP_PROTOCOL_ID])
+        logger.info(f'SERVICES: {service_record_handles}')
+
+        assert len(service_record_handles) != 0
+        # For each service in the root browse group, get all its attributes
+        for service_record_handle in service_record_handles:
+            attributes = await sdp_client.get_attributes(
+                service_record_handle, [SDP_ALL_ATTRIBUTES_RANGE]
+            )
+            logger.info(f'SERVICE {service_record_handle:04X} attributes:')
+            for attribute in attributes:
+                logger.info(f'  {attribute}')
+
+        # Install SDP Record all
+        shell.exec_command("sdp_server register_sdp_all")
+
+        # List all services with L2CAP
+        logger.info("<<< 8 List all services with L2CAP protocol")
+        service_record_handles = await sdp_client.search_services([BT_L2CAP_PROTOCOL_ID])
+        logger.info(f'SERVICES: {service_record_handles}')
+
+        assert len(service_record_handles) != 0
+        # For each service in the root browse group, get all its attributes
+        for service_record_handle in service_record_handles:
+            attributes = await sdp_client.get_attributes(
+                service_record_handle, [SDP_ALL_ATTRIBUTES_RANGE]
+            )
+            logger.info(f'SERVICE {service_record_handle:04X} attributes:')
+            for attribute in attributes:
+                logger.info(f'  {attribute}')
+
+        logger.info("<<< 9 List all attributes with L2CAP protocol")
+        search_result = await sdp_client.search_attributes(
+            [BT_L2CAP_PROTOCOL_ID], [SDP_ALL_ATTRIBUTES_RANGE]
+        )
+        assert len(search_result) != 0
+        logger.info('SEARCH RESULTS:')
+        for attribute_list in search_result:
+            logger.info('SERVICE:')
+            logger.info('  ' + '\n  '.join([attribute.to_string() for attribute in attribute_list]))
+
+        # Install SDP large Record
+        shell.exec_command("sdp_server register_sdp_large")
+
+        logger.info("<<< 10 List all services with L2CAP protocol")
+        service_record_handles = await sdp_client.search_services([BT_L2CAP_PROTOCOL_ID])
+        logger.info(f'SERVICES: {service_record_handles}')
+
+        assert len(service_record_handles) != 0
+        # For each service in the root browse group, get all its attributes
+        for service_record_handle in service_record_handles:
+            attributes = await sdp_client.get_attributes(
+                service_record_handle, [SDP_ALL_ATTRIBUTES_RANGE]
+            )
+            logger.info(f'SERVICE {service_record_handle:04X} attributes:')
+            service_name_found = False
+            for attribute in attributes:
+                logger.info(f'  {attribute}')
+                if attribute.id == 0x100:
+                    service_name_found = True
+            if service_record_handle == service_record_handles[-1]:
+                assert service_name_found is False
+
+        # Install SDP large Record
+        shell.exec_command("sdp_server register_sdp_large_valid")
+
+        logger.info("<<< 11 List all services with L2CAP protocol with valid service name")
+        service_record_handles = await sdp_client.search_services([BT_L2CAP_PROTOCOL_ID])
+        logger.info(f'SERVICES: {service_record_handles}')
+
+        assert len(service_record_handles) != 0
+        # For each service in the root browse group, get all its attributes
+        for service_record_handle in service_record_handles:
+            attributes = await sdp_client.get_attributes(
+                service_record_handle, [SDP_ALL_ATTRIBUTES_RANGE]
+            )
+            logger.info(f'SERVICE {service_record_handle:04X} attributes:')
+            service_name_found = False
+            for attribute in attributes:
+                logger.info(f'  {attribute}')
+                if attribute.id == 0x100:
+                    service_name_found = True
+            if service_record_handle == service_record_handles[-1]:
+                assert service_name_found is True
+
+
+class TestSdpServer:
+    def test_discovery_device(self, sdp_server_dut):
+        """Test case to discover IUT"""
+        logger.info(f'test_discovery_device {sdp_server_dut}')
+        hci, iut_address = sdp_server_dut
+        asyncio.run(start_discovery(hci, iut_address))
+
+    def test_sdp_discover(self, shell: Shell, dut: DeviceAdapter, sdp_server_dut):
+        """Test case to request SDP records"""
+        logger.info(f'test_sdp_discover {sdp_server_dut}')
+        hci, iut_address = sdp_server_dut
+        asyncio.run(br_connect(hci, shell, iut_address))
diff --git a/tests/bluetooth/classic/sdp_s/src/sdp_server.c b/tests/bluetooth/classic/sdp_s/src/sdp_server.c
new file mode 100644
index 0000000000000..557ae207e1805
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/src/sdp_server.c
@@ -0,0 +1,320 @@
+/* sdp_server.c - Bluetooth classic SDP server smoke test */
+
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdlib.h>
+
+#include <errno.h>
+#include <zephyr/types.h>
+#include <zephyr/kernel.h>
+
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/classic/rfcomm.h>
+#include <zephyr/bluetooth/classic/sdp.h>
+
+#include <zephyr/shell/shell.h>
+
+static struct bt_sdp_attribute spp_attrs_large[] = {
+	BT_SDP_NEW_SERVICE,
+	BT_SDP_LIST(
+		BT_SDP_ATTR_SVCLASS_ID_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 3),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+			BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS)
+		},
+		)
+	),
+	BT_SDP_LIST(
+		BT_SDP_ATTR_PROTO_DESC_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 12),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 3),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_L2CAP)
+			},
+			)
+		},
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 5),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_RFCOMM)
+			},
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UINT8),
+				BT_SDP_ARRAY_8(BT_RFCOMM_CHAN_SPP)
+			},
+			)
+		},
+		)
+	),
+	BT_SDP_LIST(
+		BT_SDP_ATTR_PROFILE_DESC_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 8),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 6),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS)
+			},
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UINT16),
+				BT_SDP_ARRAY_16(0x0102)
+			},
+			)
+		},
+		)
+	),
+	BT_SDP_SERVICE_NAME("==================================================="
+			    "==================================================="
+			    "large_sdp_record"
+			    "==================================================="
+			    "==================================================="),
+};
+
+static struct bt_sdp_record spp_rec_large = BT_SDP_RECORD(spp_attrs_large);
+
+static struct bt_sdp_attribute spp_attrs_large_valid[] = {
+	BT_SDP_NEW_SERVICE,
+	BT_SDP_LIST(
+		BT_SDP_ATTR_SVCLASS_ID_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 3),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+			BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS)
+		},
+		)
+	),
+	BT_SDP_LIST(
+		BT_SDP_ATTR_PROTO_DESC_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 12),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 3),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_L2CAP)
+			},
+			)
+		},
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 5),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_RFCOMM)
+			},
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UINT8),
+				BT_SDP_ARRAY_8(BT_RFCOMM_CHAN_SPP)
+			},
+			)
+		},
+		)
+	),
+	BT_SDP_LIST(
+		BT_SDP_ATTR_PROFILE_DESC_LIST,
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 8),
+		BT_SDP_DATA_ELEM_LIST(
+		{
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 6),
+			BT_SDP_DATA_ELEM_LIST(
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16),
+				BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS)
+			},
+			{
+				BT_SDP_TYPE_SIZE(BT_SDP_UINT16),
+				BT_SDP_ARRAY_16(0x0102)
+			},
+			)
+		},
+		)
+	),
+	BT_SDP_SERVICE_NAME("====================================="
+			    "====================================="
+			    "large_sdp_record"
+			    "====================================="
+			    "====================================="),
+};
+
+static struct bt_sdp_record spp_rec_large_valid = BT_SDP_RECORD(spp_attrs_large_valid);
+
+#define MAX_SDP_RECORD_COUNT 8
+
+#define _SDP_ATTRS_DEFINE(index, sdp_attrs_name) \
+static struct bt_sdp_attribute sdp_attrs_name##index[] = { \
+	BT_SDP_NEW_SERVICE, \
+	BT_SDP_LIST( \
+		BT_SDP_ATTR_SVCLASS_ID_LIST, \
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 3), \
+		BT_SDP_DATA_ELEM_LIST( \
+		{ \
+			BT_SDP_TYPE_SIZE(BT_SDP_UUID16), \
+			BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS) \
+		}, \
+		) \
+	), \
+	BT_SDP_LIST( \
+		BT_SDP_ATTR_PROTO_DESC_LIST, \
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 12), \
+		BT_SDP_DATA_ELEM_LIST( \
+		{ \
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 3), \
+			BT_SDP_DATA_ELEM_LIST( \
+			{ \
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16), \
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_L2CAP) \
+			}, \
+			) \
+		}, \
+		{ \
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 5), \
+			BT_SDP_DATA_ELEM_LIST( \
+			{ \
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16), \
+				BT_SDP_ARRAY_16(BT_SDP_PROTO_RFCOMM) \
+			}, \
+			{ \
+				BT_SDP_TYPE_SIZE(BT_SDP_UINT8), \
+				BT_SDP_ARRAY_8(BT_RFCOMM_CHAN_SPP + index + 1) \
+			}, \
+			) \
+		}, \
+		) \
+	), \
+	BT_SDP_LIST( \
+		BT_SDP_ATTR_PROFILE_DESC_LIST, \
+		BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 8), \
+		BT_SDP_DATA_ELEM_LIST( \
+		{ \
+			BT_SDP_TYPE_SIZE_VAR(BT_SDP_SEQ8, 6), \
+			BT_SDP_DATA_ELEM_LIST( \
+			{ \
+				BT_SDP_TYPE_SIZE(BT_SDP_UUID16), \
+				BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS) \
+			}, \
+			{ \
+				BT_SDP_TYPE_SIZE(BT_SDP_UINT16), \
+				BT_SDP_ARRAY_16(0x0102) \
+			}, \
+			) \
+		}, \
+		) \
+	), \
+	BT_SDP_SERVICE_NAME("Serial Port"), \
+}
+
+#define SDP_ATTRS_DEFINE(index, ...) _SDP_ATTRS_DEFINE(index, ##__VA_ARGS__)
+
+LISTIFY(MAX_SDP_RECORD_COUNT, SDP_ATTRS_DEFINE, (;), spp_attrs);
+
+#define _SDP_REC_DEFINE(index, sdp_attrs_name) BT_SDP_RECORD(sdp_attrs_name##index)
+#define SDP_REC_DEFINE(index, ...)             _SDP_REC_DEFINE(index, ##__VA_ARGS__)
+
+static struct bt_sdp_record spp_rec[MAX_SDP_RECORD_COUNT] = {
+	LISTIFY(MAX_SDP_RECORD_COUNT, SDP_REC_DEFINE, (,), spp_attrs),
+};
+
+static bool sdp_rec_reg[MAX_SDP_RECORD_COUNT];
+
+static int cmd_register_sdp(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+	uint8_t index;
+
+	index = strtoul(argv[1], NULL, 16);
+	if (sdp_rec_reg[index]) {
+		shell_error(sh, "The SDP record %d has been installed", index);
+	}
+
+	err = bt_sdp_register_service(&spp_rec[index]);
+	if (err) {
+		shell_error(sh, "Register SDP record failed (err %d)", err);
+	} else {
+		sdp_rec_reg[index] = true;
+	}
+	return err;
+}
+
+static int cmd_register_sdp_all(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+
+	sh = sh;
+
+	for (size_t i = 0; i < ARRAY_SIZE(spp_rec); i++) {
+		if (!sdp_rec_reg[i]) {
+			err = bt_sdp_register_service(&spp_rec[i]);
+			if (err) {
+				shell_error(sh, "Register SDP record failed (err %d)", err);
+			} else {
+				sdp_rec_reg[i] = true;
+			}
+		}
+	}
+	return 0;
+}
+
+static int cmd_register_sdp_large(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+
+	sh = sh;
+
+	err = bt_sdp_register_service(&spp_rec_large);
+	if (err) {
+		shell_error(sh, "Register SDP large record failed (err %d)", err);
+	}
+	return 0;
+}
+
+static int cmd_register_sdp_large_valid(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+
+	sh = sh;
+
+	err = bt_sdp_register_service(&spp_rec_large_valid);
+	if (err) {
+		shell_error(sh, "Register SDP large record failed (err %d)", err);
+	}
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sdp_server_cmds,
+	SHELL_CMD_ARG(register_sdp, NULL, "<SDP Record Index>", cmd_register_sdp, 2, 0),
+	SHELL_CMD_ARG(register_sdp_all, NULL, "", cmd_register_sdp_all, 1, 0),
+	SHELL_CMD_ARG(register_sdp_large, NULL, "", cmd_register_sdp_large, 1, 0),
+	SHELL_CMD_ARG(register_sdp_large_valid, NULL, "", cmd_register_sdp_large_valid, 1, 0),
+	SHELL_SUBCMD_SET_END
+);
+
+static int cmd_default_handler(const struct shell *sh, size_t argc, char **argv)
+{
+	if (argc == 1) {
+		shell_help(sh);
+		return SHELL_CMD_HELP_PRINTED;
+	}
+
+	shell_error(sh, "%s unknown parameter: %s", argv[0], argv[1]);
+
+	return -EINVAL;
+}
+
+SHELL_CMD_REGISTER(sdp_server, &sdp_server_cmds, "Bluetooth classic SDP server shell commands",
+		   cmd_default_handler);
diff --git a/tests/bluetooth/classic/sdp_s/testcase.yaml b/tests/bluetooth/classic/sdp_s/testcase.yaml
new file mode 100644
index 0000000000000..92feaccd68654
--- /dev/null
+++ b/tests/bluetooth/classic/sdp_s/testcase.yaml
@@ -0,0 +1,15 @@
+tests:
+  bluetooth.classic.sdp.server:
+    platform_allow:
+      - native_sim
+      - mimxrt1170_evk@B/mimxrt1176/cm7
+    integration_platforms:
+      - native_sim
+    tags:
+      - bluetooth
+      - sdp
+    harness: pytest
+    harness_config:
+      pytest_dut_scope: session
+      fixture: usb_hci
+    timeout: 60
diff --git a/tests/bluetooth/common/testlib/include/testlib/addr.h b/tests/bluetooth/common/testlib/include/testlib/addr.h
index 90802e50fb5de..94f14c6a8e5db 100644
--- a/tests/bluetooth/common/testlib/include/testlib/addr.h
+++ b/tests/bluetooth/common/testlib/include/testlib/addr.h
@@ -6,7 +6,6 @@
 #define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADDR_H_
 
 #include <stdint.h>
-
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/byteorder.h>
 
diff --git a/tests/bluetooth/common/testlib/include/testlib/att_read.h b/tests/bluetooth/common/testlib/include/testlib/att_read.h
index 4e9034d9876bc..a970ff6d0b876 100644
--- a/tests/bluetooth/common/testlib/include/testlib/att_read.h
+++ b/tests/bluetooth/common/testlib/include/testlib/att_read.h
@@ -6,7 +6,11 @@
 #define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ATT_READ_H_
 
 #include <stdint.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/net_buf.h>
 
 /** Perform a single ATT_READ_BY_TYPE_REQ. */
 int bt_testlib_att_read_by_type_sync(struct net_buf_simple *result_data, uint16_t *result_size,
diff --git a/tests/bluetooth/common/testlib/include/testlib/att_write.h b/tests/bluetooth/common/testlib/include/testlib/att_write.h
index 0cfd03e88b6ad..0bf0185c88cc1 100644
--- a/tests/bluetooth/common/testlib/include/testlib/att_write.h
+++ b/tests/bluetooth/common/testlib/include/testlib/att_write.h
@@ -6,6 +6,8 @@
 #define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ATT_WRITE_H_
 
 #include <stdint.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gatt.h>
 
 int bt_testlib_att_write(struct bt_conn *conn, enum bt_att_chan_opt bearer, uint16_t handle,
diff --git a/tests/bluetooth/common/testlib/include/testlib/conn.h b/tests/bluetooth/common/testlib/include/testlib/conn.h
index e3ca711532f73..686b32bfbf84e 100644
--- a/tests/bluetooth/common/testlib/include/testlib/conn.h
+++ b/tests/bluetooth/common/testlib/include/testlib/conn.h
@@ -5,6 +5,8 @@
 #ifndef ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_CONN_H_
 #define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_CONN_H_
 
+#include <stdint.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/conn.h>
 
 /**
diff --git a/tests/bluetooth/common/testlib/include/testlib/log_utils.h b/tests/bluetooth/common/testlib/include/testlib/log_utils.h
index 66cd2c0a2f75a..18296b028ecda 100644
--- a/tests/bluetooth/common/testlib/include/testlib/log_utils.h
+++ b/tests/bluetooth/common/testlib/include/testlib/log_utils.h
@@ -5,8 +5,13 @@
 #ifndef ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_LOG_UTILS_H_
 #define ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_LOG_UTILS_H_
 
+#include <stddef.h>
+#include <stdint.h>
+#include <zephyr/autoconf.h>
+#include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util_macro.h>
 
 static inline void bt_testlib_log_level_set(char *module, uint32_t new_level)
 {
diff --git a/tests/bluetooth/common/testlib/src/adv.c b/tests/bluetooth/common/testlib/src/adv.c
index d02d599084640..7713b97b1a8dd 100644
--- a/tests/bluetooth/common/testlib/src/adv.c
+++ b/tests/bluetooth/common/testlib/src/adv.c
@@ -2,15 +2,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
-#include <zephyr/kernel.h>
 #include <zephyr/sys/__assert.h>
 
 struct bt_testlib_adv_ctx {
diff --git a/tests/bluetooth/common/testlib/src/att.c b/tests/bluetooth/common/testlib/src/att.c
index 01c9a5b774c81..341967aa17fc4 100644
--- a/tests/bluetooth/common/testlib/src/att.c
+++ b/tests/bluetooth/common/testlib/src/att.c
@@ -4,14 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-
+#include <stddef.h>
+#include <stdint.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/att.h>
-
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
 
 LOG_MODULE_REGISTER(bt_testlib_att, LOG_LEVEL_DBG);
 
diff --git a/tests/bluetooth/common/testlib/src/att_read.c b/tests/bluetooth/common/testlib/src/att_read.c
index 8da82ce19b878..6be5a2161caf7 100644
--- a/tests/bluetooth/common/testlib/src/att_read.c
+++ b/tests/bluetooth/common/testlib/src/att_read.c
@@ -3,17 +3,21 @@
  */
 
 #include <stdint.h>
+#include <testlib/att_read.h>
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
-#include <zephyr/sys/__assert.h>
-
-#include <testlib/att_read.h>
+#include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys/util.h>
 
 LOG_MODULE_REGISTER(bt_testlib_att_read, LOG_LEVEL_DBG);
 
diff --git a/tests/bluetooth/common/testlib/src/att_write.c b/tests/bluetooth/common/testlib/src/att_write.c
index 8da01ea233ab6..ca469b6b9fccb 100644
--- a/tests/bluetooth/common/testlib/src/att_write.c
+++ b/tests/bluetooth/common/testlib/src/att_write.c
@@ -3,16 +3,18 @@
  */
 
 #include <stdint.h>
+#include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_testlib_att_write, LOG_LEVEL_DBG);
 
 struct bt_testlib_att_write_closure {
diff --git a/tests/bluetooth/common/testlib/src/conn_ref.c b/tests/bluetooth/common/testlib/src/conn_ref.c
index eebea95547ec5..db6d13f2a8407 100644
--- a/tests/bluetooth/common/testlib/src/conn_ref.c
+++ b/tests/bluetooth/common/testlib/src/conn_ref.c
@@ -3,12 +3,12 @@
  */
 
 #include <stddef.h>
-
+#include <stdint.h>
+#include <testlib/conn.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/sys/__assert.h>
 #include <zephyr/sys/atomic_builtin.h>
 
-#include <testlib/conn.h>
-
 /**
  * @file
  * @brief Reified connection reference counting.
diff --git a/tests/bluetooth/common/testlib/src/conn_wait.c b/tests/bluetooth/common/testlib/src/conn_wait.c
index de1c72779c019..b9eab76ce06aa 100644
--- a/tests/bluetooth/common/testlib/src/conn_wait.c
+++ b/tests/bluetooth/common/testlib/src/conn_wait.c
@@ -2,21 +2,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
 #include <stdint.h>
+#include <testlib/conn.h>
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-#include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
-#include <zephyr/kernel.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/util_macro.h>
 
-#include <testlib/conn.h>
-
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_testlib_conn_wait, LOG_LEVEL_DBG);
 
 static K_MUTEX_DEFINE(conn_wait_mutex);
diff --git a/tests/bluetooth/common/testlib/src/connect.c b/tests/bluetooth/common/testlib/src/connect.c
index 9e181a574e3e7..7e221654345d4 100644
--- a/tests/bluetooth/common/testlib/src/connect.c
+++ b/tests/bluetooth/common/testlib/src/connect.c
@@ -2,12 +2,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
+#include <stddef.h>
 #include <stdint.h>
+#include <testlib/conn.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/kernel.h>
+#include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log.h>
-
-#include <testlib/conn.h>
+#include <zephyr/sys/__assert.h>
 
 LOG_MODULE_REGISTER(bt_testlib_connect, LOG_LEVEL_INF);
 
diff --git a/tests/bluetooth/common/testlib/src/disconnect.c b/tests/bluetooth/common/testlib/src/disconnect.c
index 877494c5a5e98..896feb90b33a0 100644
--- a/tests/bluetooth/common/testlib/src/disconnect.c
+++ b/tests/bluetooth/common/testlib/src/disconnect.c
@@ -2,14 +2,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/sys/__assert.h"
 #include <stdint.h>
+#include <testlib/conn.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-
-#include <testlib/conn.h>
-
+#include <zephyr/sys/__assert.h>
 
 int bt_testlib_disconnect(struct bt_conn **connp, uint8_t reason)
 {
diff --git a/tests/bluetooth/common/testlib/src/scan.c b/tests/bluetooth/common/testlib/src/scan.c
index a06ce5d3bf7e7..0dd3dcc161fd1 100644
--- a/tests/bluetooth/common/testlib/src/scan.c
+++ b/tests/bluetooth/common/testlib/src/scan.c
@@ -2,13 +2,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
 #include <stdint.h>
+#include <string.h>
+#include <testlib/scan.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/kernel.h>
-#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log.h>
-
-#include <testlib/scan.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 
 LOG_MODULE_REGISTER(bt_testlib_scan, LOG_LEVEL_INF);
 
diff --git a/tests/bluetooth/common/testlib/src/security.c b/tests/bluetooth/common/testlib/src/security.c
index a229cf5487c7a..0d5fc02e15634 100644
--- a/tests/bluetooth/common/testlib/src/security.c
+++ b/tests/bluetooth/common/testlib/src/security.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stddef.h>
 #include <stdint.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
@@ -9,8 +10,9 @@
 #include <zephyr/bluetooth/l2cap.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
-#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
 
 LOG_MODULE_REGISTER(bt_testlib_security, LOG_LEVEL_INF);
 
diff --git a/tests/bluetooth/controller/ctrl_cis_create/src/main.c b/tests/bluetooth/controller/ctrl_cis_create/src/main.c
index ba892586c6078..4e9820fb46a72 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/src/main.c
+++ b/tests/bluetooth/controller/ctrl_cis_create/src/main.c
@@ -47,6 +47,10 @@ DEFINE_FFF_GLOBALS;
 #include "helper_pdu.h"
 #include "helper_util.h"
 
+#include <zephyr/bluetooth/iso.h>
+
+#define SUB_INTERVAL_MIN 400
+
 static struct ll_conn conn;
 
 static struct ll_conn_iso_group cig_mock = { 0 };
@@ -84,11 +88,11 @@ static struct pdu_data_llctrl_cis_req remote_cis_req = {
 	.p_ft             =   1,
 	.iso_interval     =   6,
 	.conn_event_count =   12,
-	.c_sdu_interval   =   { 0, 0, 0},
-	.p_sdu_interval   =   { 0, 0, 0},
-	.sub_interval     =   { 0, 0, 0},
-	.cis_offset_min   =   { 0, 0, 0},
-	.cis_offset_max   =   { 0, 0, 0}
+	.c_sdu_interval   =   { 0, 0x02, 0}, /* 512 us */
+	.p_sdu_interval   =   { 0, 0x02, 0}, /* 512 us */
+	.sub_interval     =   { 0x90, 0x01, 0x00}, /* 400 us */
+	.cis_offset_min   =   { 0, 0x02, 0}, /* 512 us */
+	.cis_offset_max   =   { 0, 0x02, 0}  /* 512 us */
 };
 
 static struct pdu_data_llctrl_cis_ind remote_cis_ind = {
@@ -127,7 +131,7 @@ static struct pdu_data_llctrl_cis_ind local_cis_ind = {
 	.cig_sync_delay = { 0, 0, 0},
 	.cis_offset = { 0, 0, 0},
 	.cis_sync_delay = { 0, 0, 0},
-	.conn_event_count = 13
+	.conn_event_count = 0
 };
 
 #define ERROR_CODE 0x17
@@ -169,8 +173,8 @@ ZTEST(cis_create, test_cc_create_periph_rem_host_accept)
 		.cis_id = 0x02
 	};
 	struct pdu_data_llctrl_cis_rsp local_cis_rsp = {
-		.cis_offset_max = { 0, 0, 0},
-		.cis_offset_min = { 0, 0, 0},
+		.cis_offset_max = { 0, 0x02, 0},
+		.cis_offset_min = { 0, 0x02, 0},
 		.conn_event_count = 12
 	};
 	struct node_rx_conn_iso_estab cis_estab = {
@@ -196,7 +200,7 @@ ZTEST(cis_create, test_cc_create_periph_rem_host_accept)
 	/* Done */
 	event_done(&conn);
 
-	/* There should be excactly one host notification */
+	/* There should be exactly one host notification */
 	ut_rx_node(NODE_CIS_REQUEST, &ntf, &cis_req);
 	ut_rx_q_is_empty();
 
@@ -264,7 +268,7 @@ ZTEST(cis_create, test_cc_create_periph_rem_host_accept)
 	/* Prepare */
 	event_prepare(&conn);
 
-	/* There should be excactly one host notification */
+	/* There should be exactly one host notification */
 	ut_rx_node(NODE_CIS_ESTABLISHED, &ntf, &cis_estab);
 	ut_rx_q_is_empty();
 
@@ -328,7 +332,7 @@ ZTEST(cis_create, test_cc_create_periph_rem_host_reject)
 	/* Done */
 	event_done(&conn);
 
-	/* There should be excactly one host notification */
+	/* There should be exactly one host notification */
 	ut_rx_node(NODE_CIS_REQUEST, &ntf, &cis_req);
 	ut_rx_q_is_empty();
 
@@ -409,7 +413,7 @@ ZTEST(cis_create, test_cc_create_periph_rem_host_accept_to)
 	/* Done */
 	event_done(&conn);
 
-	/* There should be excactly one host notification */
+	/* There should be exactly one host notification */
 	ut_rx_node(NODE_CIS_REQUEST, &ntf, &cis_req);
 	ut_rx_q_is_empty();
 
@@ -435,7 +439,7 @@ ZTEST(cis_create, test_cc_create_periph_rem_host_accept_to)
 	/* Done */
 	event_done(&conn);
 
-	/* There should be excactly one host notification */
+	/* There should be exactly one host notification */
 	ut_rx_node(NODE_CIS_ESTABLISHED, &ntf, &cis_estab);
 	ut_rx_q_is_empty();
 
@@ -525,6 +529,196 @@ ZTEST(cis_create, test_cc_create_periph_rem_invalid_phy)
 		      "Free CTX buffers %d", llcp_ctx_buffers_free());
 }
 
+static void rx_remote_cis_req_invalid_param(struct pdu_data_llctrl_cis_req *req)
+{
+	struct node_tx *tx;
+	struct pdu_data_llctrl_reject_ext_ind local_reject = {
+		.error_code = BT_HCI_ERR_INVALID_LL_PARAM,
+		.reject_opcode = PDU_DATA_LLCTRL_TYPE_CIS_REQ
+	};
+
+	test_setup(&conn);
+
+	/* Role */
+	test_set_role(&conn, BT_HCI_ROLE_PERIPHERAL);
+
+	/* Connect */
+	ull_cp_state_set(&conn, ULL_CP_CONNECTED);
+
+	/* Prepare */
+	event_prepare(&conn);
+
+	/* Rx */
+	lt_tx(LL_CIS_REQ, &conn, req);
+
+	/* Done */
+	event_done(&conn);
+
+	/* Prepare */
+	event_prepare(&conn);
+
+	/* Tx Queue should have one LL Control PDU */
+	lt_rx(LL_REJECT_EXT_IND, &conn, &tx, &local_reject);
+	lt_rx_q_is_empty(&conn);
+
+	/* Done */
+	event_done(&conn);
+
+	zassert_equal(llcp_ctx_buffers_free(), test_ctx_buffers_cnt(),
+		      "Free CTX buffers %d", llcp_ctx_buffers_free());
+}
+
+/*
+ * Central-initiated CIS Create procedure.
+ * Central requests CIS w. invalid param, peripheral Host rejects.
+ *
+ * +-----+          +-------+                       +-----+
+ * | UT  |          | LL_S  |                       | LT  |
+ * +-----+          +-------+                       +-----+
+ *    |                 |                               |
+ *    |                 |   LL_CIS_REQ  (invalid param) |
+ *    |                 |<------------------------------|
+ *    |                 |                               |
+ *    |                 |                               |
+ *    |                 |                               |
+ *    |                 |                               |
+ *    |                 |                               |
+ *    |                 |                               |
+ *    |                 | LL_REJECT_EXT_IND             |
+ *    |                 |------------------------------>|
+ *    |                 |                               |
+ */
+ZTEST(cis_create, test_cc_create_periph_rem_invalid_param)
+{
+	struct pdu_data_llctrl_cis_req remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with c_sdu_interval < 255 */
+	sys_put_le24(BT_HCI_ISO_SDU_INTERVAL_MIN-1, remote_cis_req_invalid_param.c_sdu_interval);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with p_sdu_interval < 255 */
+	sys_put_le24(BT_HCI_ISO_SDU_INTERVAL_MIN-1, remote_cis_req_invalid_param.p_sdu_interval);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with c_max_pdu > 251 */
+	remote_cis_req_invalid_param.c_max_pdu = sys_cpu_to_le16(BT_ISO_PDU_MAX + 1);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with p_max_pdu > 251 */
+	remote_cis_req_invalid_param.p_max_pdu = sys_cpu_to_le16(BT_ISO_PDU_MAX + 1);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with nse == 0 */
+	remote_cis_req_invalid_param.nse = 0;
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with nse > 31 */
+	remote_cis_req_invalid_param.nse = BT_ISO_NSE_MAX + 1;
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with sub_interval > 0 && nse == 1 */
+	remote_cis_req_invalid_param.nse = 1;
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with sub_interval < 400 && nse > 1 */
+	sys_put_le24(SUB_INTERVAL_MIN - 1, remote_cis_req_invalid_param.sub_interval);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with sub_interval >= iso_interval */
+	sys_put_le24(sys_le16_to_cpu(remote_cis_req_invalid_param.iso_interval) * CONN_INT_UNIT_US,
+				     remote_cis_req_invalid_param.sub_interval);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+
+	/* Rx with c_bn == 0 && c_max_pdu > 0 */
+	remote_cis_req_invalid_param.c_bn = 0;
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with p_bn == 0 && p_max_pdu > 0 */
+	remote_cis_req_invalid_param.p_bn = 0;
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with c_ft == 0 */
+	remote_cis_req_invalid_param.c_ft = 0;
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with p_ft == 0 */
+	remote_cis_req_invalid_param.p_ft = 0;
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with iso_interval < 4 */
+	remote_cis_req_invalid_param.iso_interval = sys_cpu_to_le16(BT_HCI_ISO_INTERVAL_MIN - 1);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with iso_interval > 3200 */
+	remote_cis_req_invalid_param.iso_interval = sys_cpu_to_le16(BT_HCI_ISO_INTERVAL_MAX + 1);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with cis_offset_min < 500 */
+	sys_put_le24(PDU_CIS_OFFSET_MIN_US - 1, remote_cis_req_invalid_param.cis_offset_min);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with cis_offset_max < cis_offset_min */
+	sys_put_le24(0x01FF, remote_cis_req_invalid_param.cis_offset_max);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+
+	/* Restore to valid params */
+	remote_cis_req_invalid_param = remote_cis_req;
+
+	/* Rx with cis_offset_max >= conn_interval */
+	sys_put_le24(conn.lll.interval * CONN_INT_UNIT_US,
+		     remote_cis_req_invalid_param.cis_offset_max);
+	rx_remote_cis_req_invalid_param(&remote_cis_req_invalid_param);
+}
+
 /*
  * Central-initiated CIS Create procedure.
  * Host requests CIS, LL replies with 'remote feature unsupported'
@@ -579,7 +773,7 @@ ZTEST(cis_create, test_cc_create_central_rem_unsupported)
 	/* Prepare */
 	event_prepare(&conn);
 
-	/* There should be excactly one host notification
+	/* There should be exactly one host notification
 	 * with status BT_HCI_ERR_UNSUPP_REMOTE_FEATURE
 	 */
 	ut_rx_node(NODE_CIS_ESTABLISHED, &ntf, &cis_estab);
@@ -737,7 +931,7 @@ ZTEST(cis_create, test_cc_create_central_rem_accept)
 	/* Prepare */
 	event_prepare(&conn);
 
-	/* There should be excactly one host notification */
+	/* There should be exactly one host notification */
 	ut_rx_node(NODE_CIS_ESTABLISHED, &ntf, &cis_estab);
 	ut_rx_q_is_empty();
 
@@ -846,7 +1040,7 @@ ZTEST(cis_create, test_cc_create_central_rem_reject)
 	/* Prepare */
 	event_prepare(&conn);
 
-	/* There should be excactly one host notification */
+	/* There should be exactly one host notification */
 	ut_rx_node(NODE_CIS_ESTABLISHED, &ntf, &cis_estab);
 	ut_rx_q_is_empty();
 
diff --git a/tests/bluetooth/gatt/src/main.c b/tests/bluetooth/gatt/src/main.c
index d17e8e8b79345..7acf9eb7a56a5 100644
--- a/tests/bluetooth/gatt/src/main.c
+++ b/tests/bluetooth/gatt/src/main.c
@@ -39,6 +39,11 @@ static void test1_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t valu
 	nfy_enabled = (value == BT_GATT_CCC_NOTIFY) ? 1 : 0;
 }
 
+static ssize_t test1_ccc_cfg_write_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr, uint16_t value)
+{
+	return sizeof(value);
+}
+
 static ssize_t read_test(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 			void *buf, uint16_t len, uint16_t offset)
 {
@@ -507,3 +512,25 @@ ZTEST(test_gatt, test_bt_gatt_err_to_str)
 		zassert_not_null(bt_gatt_err_to_str(-i), ": %d", i);
 	}
 }
+
+ZTEST(test_gatt, test_gatt_ccc_write_cb)
+{
+	struct bt_gatt_attr test_write_cb_attrs[] = {
+		/* Vendor Primary Service Declaration */
+		BT_GATT_PRIMARY_SERVICE(&test1_uuid),
+
+		BT_GATT_CHARACTERISTIC(&test1_nfy_uuid.uuid,
+				       BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_NONE,
+				       NULL, NULL, &nfy_enabled),
+		BT_GATT_CCC_WITH_WRITE_CB(test1_ccc_cfg_changed,
+			test1_ccc_cfg_write_cb,
+			BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT),
+	};
+
+	struct bt_gatt_service test_write_cb_svc = BT_GATT_SERVICE(test_write_cb_attrs);
+
+	zassert_false(bt_gatt_service_register(&test_write_cb_svc),
+		     "Test service registration failed");
+	zassert_false(bt_gatt_service_unregister(&test_write_cb_svc),
+		     "Test service1 unregister failed");
+}
diff --git a/tests/bluetooth/hci_codecs_info/src/main.c b/tests/bluetooth/hci_codecs_info/src/main.c
index 8f63e3782a8d7..1d2937a21e7de 100644
--- a/tests/bluetooth/hci_codecs_info/src/main.c
+++ b/tests/bluetooth/hci_codecs_info/src/main.c
@@ -208,6 +208,8 @@ ZTEST(test_hci_codecs_info, test_read_codec_capabilities)
 	ptr = &rp->capabilities[0];
 	zassert_mem_equal(ptr, codec_capabilities, sizeof(codec_capabilities),
 			  0, "Reading codec capabilities content failed");
+
+	net_buf_unref(rsp);
 }
 
 #define READ_DELAY_CODING_FMT 0xff
@@ -290,4 +292,6 @@ ZTEST(test_hci_codecs_info, test_read_ctlr_delay)
 		      "Reading controller min delay failed");
 	zassert_equal(sys_get_le24(rp->max_ctlr_delay), MAX_CTLR_DELAY,
 		      "Reading controller max delay failed");
+
+	net_buf_unref(rsp);
 }
diff --git a/tests/bluetooth/host/cs/mocks/conn.c b/tests/bluetooth/host/cs/mocks/conn.c
index 910a06e3ce351..c0bfd06944d30 100644
--- a/tests/bluetooth/host/cs/mocks/conn.c
+++ b/tests/bluetooth/host/cs/mocks/conn.c
@@ -11,12 +11,14 @@
 DEFINE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
 DEFINE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
 DEFINE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
-		      struct bt_conn_le_cs_capabilities);
-DEFINE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *, struct bt_conn_le_cs_fae_table);
-DEFINE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
+		      uint8_t, struct bt_conn_le_cs_capabilities *);
+DEFINE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *,
+		      uint8_t, struct bt_conn_le_cs_fae_table *);
+DEFINE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *,
+		      uint8_t, struct bt_conn_le_cs_config *);
 DEFINE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
 DEFINE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
 		      struct bt_conn_le_cs_subevent_result *);
-DEFINE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
+DEFINE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *, uint8_t);
 DEFINE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
-		      struct bt_conn_le_cs_procedure_enable_complete *);
+		      uint8_t, struct bt_conn_le_cs_procedure_enable_complete *);
diff --git a/tests/bluetooth/host/cs/mocks/conn.h b/tests/bluetooth/host/cs/mocks/conn.h
index 70aa9bdfd267a..10d8bccd603d7 100644
--- a/tests/bluetooth/host/cs/mocks/conn.h
+++ b/tests/bluetooth/host/cs/mocks/conn.h
@@ -25,13 +25,14 @@
 DECLARE_FAKE_VOID_FUNC(bt_conn_unref, struct bt_conn *);
 DECLARE_FAKE_VALUE_FUNC(struct bt_conn *, bt_conn_lookup_handle, uint16_t, enum bt_conn_type);
 DECLARE_FAKE_VOID_FUNC(notify_remote_cs_capabilities, struct bt_conn *,
-		       struct bt_conn_le_cs_capabilities);
+		       uint8_t, struct bt_conn_le_cs_capabilities *);
 DECLARE_FAKE_VOID_FUNC(notify_remote_cs_fae_table, struct bt_conn *,
-		       struct bt_conn_le_cs_fae_table);
-DECLARE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *, struct bt_conn_le_cs_config *);
+		       uint8_t, struct bt_conn_le_cs_fae_table *);
+DECLARE_FAKE_VOID_FUNC(notify_cs_config_created, struct bt_conn *,
+		       uint8_t, struct bt_conn_le_cs_config *);
 DECLARE_FAKE_VOID_FUNC(notify_cs_config_removed, struct bt_conn *, uint8_t);
 DECLARE_FAKE_VOID_FUNC(notify_cs_subevent_result, struct bt_conn *,
 		       struct bt_conn_le_cs_subevent_result *);
-DECLARE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *);
+DECLARE_FAKE_VOID_FUNC(notify_cs_security_enable_available, struct bt_conn *, uint8_t);
 DECLARE_FAKE_VOID_FUNC(notify_cs_procedure_enable_available, struct bt_conn *,
-		       struct bt_conn_le_cs_procedure_enable_complete *);
+		       uint8_t, struct bt_conn_le_cs_procedure_enable_complete *);
diff --git a/tests/bluetooth/host/keys/mocks/id.c b/tests/bluetooth/host/keys/mocks/id.c
index e72e6677f2a9f..e48adefb9fb6e 100644
--- a/tests/bluetooth/host/keys/mocks/id.c
+++ b/tests/bluetooth/host/keys/mocks/id.c
@@ -8,3 +8,6 @@
 #include "mocks/id.h"
 
 DEFINE_FAKE_VOID_FUNC(bt_id_del, struct bt_keys *);
+DEFINE_FAKE_VOID_FUNC(bt_id_pending_keys_update);
+DEFINE_FAKE_VOID_FUNC(bt_id_pending_keys_update_set, struct bt_keys *, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);
diff --git a/tests/bluetooth/host/keys/mocks/id.h b/tests/bluetooth/host/keys/mocks/id.h
index 2c3f8e97d8240..3efe45384f7d9 100644
--- a/tests/bluetooth/host/keys/mocks/id.h
+++ b/tests/bluetooth/host/keys/mocks/id.h
@@ -10,7 +10,13 @@
 #include <host/keys.h>
 
 /* List of fakes used by this unit tester */
-#define ID_FFF_FAKES_LIST(FAKE)        \
-		FAKE(bt_id_del)                \
+#define ID_FFF_FAKES_LIST(FAKE)                     \
+		FAKE(bt_id_del)                     \
+		FAKE(bt_id_pending_keys_update)     \
+		FAKE(bt_id_pending_keys_update_set) \
+		FAKE(k_work_submit)
 
 DECLARE_FAKE_VOID_FUNC(bt_id_del, struct bt_keys *);
+DECLARE_FAKE_VOID_FUNC(bt_id_pending_keys_update);
+DECLARE_FAKE_VOID_FUNC(bt_id_pending_keys_update_set, struct bt_keys *, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);
diff --git a/tests/bluetooth/qualification/.gitattributes b/tests/bluetooth/qualification/.gitattributes
new file mode 100644
index 0000000000000..c8553d3077bb1
--- /dev/null
+++ b/tests/bluetooth/qualification/.gitattributes
@@ -0,0 +1,6 @@
+# Files generated by Bluetooth Qualification Workspace.
+# Those are XML that don't follow Zephyr style guidance but shall
+# not be modified since otherwise BT SIG tools are not able to
+# import them. Just treat them as binaries.
+*.pts binary
+*.bqw binary
diff --git a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw
index 907363f610ff0..d8e817e9faa18 100644
--- a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw
+++ b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Qualification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DN="Q332723" DesignName="Zephyr Host" PathType="NewDesignNoDns" TCRL="85" xmlns="http://qualification.bluetooth.com">
+<Qualification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DN="Q347313" DesignName="Zephyr Host" PathType="NewDesignNoDns" TCRL="86" xmlns="http://qualification.bluetooth.com">
   <References />
   <Products>
-    <Product Name="Zephyr Host" Description="host" Model="main" Website="" PublishDate="2024-11-26T00:00:00" />
+    <Product Name="Zephyr Host" Description="host" Model="main" Website="" PublishDate="2025-02-28T00:00:00" />
   </Products>
   <Layers>
     <Layer Layer="GAP">
@@ -15,6 +15,7 @@
         <Feature>GAP 14a/1</Feature>
         <Feature>GAP 14a/13</Feature>
         <Feature>GAP 8a/19</Feature>
+        <Feature>GAP 20A/1</Feature>
         <Feature>GAP 27c/1</Feature>
         <Feature>GAP 35/11</Feature>
         <Feature>GAP 25/13b</Feature>
@@ -36,13 +37,6 @@
         <Feature>GAP 20A/15</Feature>
         <Feature>GAP 20A/3</Feature>
         <Feature>GAP 21/9</Feature>
-        <Feature>GAP 22/2</Feature>
-        <Feature>GAP 24/2</Feature>
-        <Feature>GAP 25/4</Feature>
-        <Feature>GAP 25/9</Feature>
-        <Feature>GAP 11b/3</Feature>
-        <Feature>GAP 37c/2</Feature>
-        <Feature>GAP 37/7</Feature>
         <Feature>GAP 17b/2</Feature>
         <Feature>GAP 30a/5</Feature>
         <Feature>GAP 17/5</Feature>
@@ -61,6 +55,141 @@
         <Feature>GAP 12/1</Feature>
         <Feature>GAP 13/1</Feature>
         <Feature>GAP 17/2</Feature>
+        <Feature>GAP 20A/14</Feature>
+        <Feature>GAP 21/10</Feature>
+        <Feature>GAP 21/2</Feature>
+        <Feature>GAP 22/1</Feature>
+        <Feature>GAP 22/3</Feature>
+        <Feature>GAP 24/4</Feature>
+        <Feature>GAP 27/2</Feature>
+        <Feature>GAP 31/10</Feature>
+        <Feature>GAP 32/1</Feature>
+        <Feature>GAP 32/2</Feature>
+        <Feature>GAP 35/2</Feature>
+        <Feature>GAP 37/1</Feature>
+        <Feature>GAP 5/4</Feature>
+        <Feature>GAP 8a/1</Feature>
+        <Feature>GAP 8a/4</Feature>
+        <Feature>GAP 22/2</Feature>
+        <Feature>GAP 24/2</Feature>
+        <Feature>GAP 25/4</Feature>
+        <Feature>GAP 25/9</Feature>
+        <Feature>GAP 27/6</Feature>
+        <Feature>GAP 27a/2</Feature>
+        <Feature>GAP 29/4</Feature>
+        <Feature>GAP 30/1</Feature>
+        <Feature>GAP 31/4</Feature>
+        <Feature>GAP 33/1</Feature>
+        <Feature>GAP 33/5</Feature>
+        <Feature>GAP 34/3</Feature>
+        <Feature>GAP 35/3</Feature>
+        <Feature>GAP 35/5</Feature>
+        <Feature>GAP 35/8</Feature>
+        <Feature>GAP 36/2</Feature>
+        <Feature>GAP 36/5</Feature>
+        <Feature>GAP 5/3</Feature>
+        <Feature>GAP 8a/2</Feature>
+        <Feature>GAP 8a/9</Feature>
+        <Feature>GAP 10/2</Feature>
+        <Feature>GAP 33/8</Feature>
+        <Feature>GAP 37c/3</Feature>
+        <Feature>GAP 37/6</Feature>
+        <Feature>GAP 35/15</Feature>
+        <Feature>GAP 14a/17</Feature>
+        <Feature>GAP 11/4</Feature>
+        <Feature>GAP 37b/9</Feature>
+        <Feature>GAP 37c/1</Feature>
+        <Feature>GAP 17b/4</Feature>
+        <Feature>GAP 11b/4</Feature>
+        <Feature>GAP 37b/3</Feature>
+        <Feature>GAP 30a/15</Feature>
+        <Feature>GAP 11b/2</Feature>
+        <Feature>GAP 14a/15</Feature>
+        <Feature>GAP 20A/19</Feature>
+        <Feature>GAP 30a/16</Feature>
+        <Feature>GAP 14a/10</Feature>
+        <Feature>GAP 27b/8</Feature>
+        <Feature>GAP 27b/3</Feature>
+        <Feature>GAP 27b/6</Feature>
+        <Feature>GAP 25/11</Feature>
+        <Feature>GAP 11/1</Feature>
+        <Feature>GAP 20/2</Feature>
+        <Feature>GAP 20A/4</Feature>
+        <Feature>GAP 21/6</Feature>
+        <Feature>GAP 21/8</Feature>
+        <Feature>GAP 23/4</Feature>
+        <Feature>GAP 25/3</Feature>
+        <Feature>GAP 25/8</Feature>
+        <Feature>GAP 31/11</Feature>
+        <Feature>GAP 31/2</Feature>
+        <Feature>GAP 31/5</Feature>
+        <Feature>GAP 33/6</Feature>
+        <Feature>GAP 35/7</Feature>
+        <Feature>GAP 37/2</Feature>
+        <Feature>GAP 37a/3</Feature>
+        <Feature>GAP 7/2</Feature>
+        <Feature>GAP 8/2</Feature>
+        <Feature>GAP 20/7</Feature>
+        <Feature>GAP 20A/11</Feature>
+        <Feature>GAP 20A/13</Feature>
+        <Feature>GAP 20A/16</Feature>
+        <Feature>GAP 20A/2</Feature>
+        <Feature>GAP 20A/9</Feature>
+        <Feature>GAP 21/7</Feature>
+        <Feature>GAP 23/1</Feature>
+        <Feature>GAP 23/5</Feature>
+        <Feature>GAP 27/1</Feature>
+        <Feature>GAP 27/9</Feature>
+        <Feature>GAP 28/1</Feature>
+        <Feature>GAP 30/2</Feature>
+        <Feature>GAP 31/1</Feature>
+        <Feature>GAP 31/6</Feature>
+        <Feature>GAP 31/9</Feature>
+        <Feature>GAP 8a/10</Feature>
+        <Feature>GAP 8a/13</Feature>
+        <Feature>GAP 8a/17</Feature>
+        <Feature>GAP 8a/3</Feature>
+        <Feature>GAP 8a/8</Feature>
+        <Feature>GAP 33/7</Feature>
+        <Feature>GAP 8a/14a</Feature>
+        <Feature>GAP 14a/16</Feature>
+        <Feature>GAP 27b/2</Feature>
+        <Feature>GAP 14a/19</Feature>
+        <Feature>GAP 35/13b</Feature>
+        <Feature>GAP 17b/3</Feature>
+        <Feature>GAP 25/13</Feature>
+        <Feature>GAP 14a/2</Feature>
+        <Feature>GAP 27/9a</Feature>
+        <Feature>GAP 35/13a</Feature>
+        <Feature>GAP 30a/11</Feature>
+        <Feature>GAP 30a/14a</Feature>
+        <Feature>GAP 37b/5</Feature>
+        <Feature>GAP 14a/8</Feature>
+        <Feature>GAP 14a/12</Feature>
+        <Feature>GAP 10/1</Feature>
+        <Feature>GAP 14/1</Feature>
+        <Feature>GAP 20A/6</Feature>
+        <Feature>GAP 21/1</Feature>
+        <Feature>GAP 21/11</Feature>
+        <Feature>GAP 21/4</Feature>
+        <Feature>GAP 22/4</Feature>
+        <Feature>GAP 24/1</Feature>
+        <Feature>GAP 24/3</Feature>
+        <Feature>GAP 25/10</Feature>
+        <Feature>GAP 26/1</Feature>
+        <Feature>GAP 26/2</Feature>
+        <Feature>GAP 26/4</Feature>
+        <Feature>GAP 29/3</Feature>
+        <Feature>GAP 31/8</Feature>
+        <Feature>GAP 32/3</Feature>
+        <Feature>GAP 33/2</Feature>
+        <Feature>GAP 34/2</Feature>
+        <Feature>GAP 5/2</Feature>
+        <Feature>GAP 8/3</Feature>
+        <Feature>GAP 8a/5</Feature>
+        <Feature>GAP 10/5</Feature>
+        <Feature>GAP 11b/1</Feature>
+        <Feature>GAP 16/3</Feature>
         <Feature>GAP 37/3a</Feature>
         <Feature>GAP 25/12</Feature>
         <Feature>GAP 30a/19</Feature>
@@ -144,61 +273,9 @@
         <Feature>GAP 10/3</Feature>
         <Feature>GAP 23/7</Feature>
         <Feature>GAP 7/3</Feature>
-        <Feature>GAP 37c/3</Feature>
-        <Feature>GAP 37/6</Feature>
-        <Feature>GAP 35/15</Feature>
-        <Feature>GAP 14a/17</Feature>
-        <Feature>GAP 11/4</Feature>
-        <Feature>GAP 37b/9</Feature>
-        <Feature>GAP 37c/1</Feature>
-        <Feature>GAP 17b/4</Feature>
-        <Feature>GAP 11b/4</Feature>
-        <Feature>GAP 37b/3</Feature>
-        <Feature>GAP 30a/15</Feature>
-        <Feature>GAP 11b/2</Feature>
-        <Feature>GAP 14a/15</Feature>
-        <Feature>GAP 20A/19</Feature>
-        <Feature>GAP 30a/16</Feature>
-        <Feature>GAP 14a/10</Feature>
-        <Feature>GAP 27b/8</Feature>
-        <Feature>GAP 27b/3</Feature>
-        <Feature>GAP 27b/6</Feature>
-        <Feature>GAP 25/11</Feature>
-        <Feature>GAP 11/1</Feature>
-        <Feature>GAP 20/2</Feature>
-        <Feature>GAP 20A/4</Feature>
-        <Feature>GAP 21/6</Feature>
-        <Feature>GAP 21/8</Feature>
-        <Feature>GAP 23/4</Feature>
-        <Feature>GAP 25/3</Feature>
-        <Feature>GAP 25/8</Feature>
-        <Feature>GAP 31/11</Feature>
-        <Feature>GAP 31/2</Feature>
-        <Feature>GAP 31/5</Feature>
-        <Feature>GAP 33/6</Feature>
-        <Feature>GAP 35/7</Feature>
-        <Feature>GAP 37/2</Feature>
-        <Feature>GAP 37a/3</Feature>
-        <Feature>GAP 7/2</Feature>
-        <Feature>GAP 8/2</Feature>
-        <Feature>GAP 27/6</Feature>
-        <Feature>GAP 27a/2</Feature>
-        <Feature>GAP 29/4</Feature>
-        <Feature>GAP 30/1</Feature>
-        <Feature>GAP 31/4</Feature>
-        <Feature>GAP 33/1</Feature>
-        <Feature>GAP 33/5</Feature>
-        <Feature>GAP 34/3</Feature>
-        <Feature>GAP 35/3</Feature>
-        <Feature>GAP 35/5</Feature>
-        <Feature>GAP 35/8</Feature>
-        <Feature>GAP 36/2</Feature>
-        <Feature>GAP 36/5</Feature>
-        <Feature>GAP 5/3</Feature>
-        <Feature>GAP 8a/2</Feature>
-        <Feature>GAP 8a/9</Feature>
-        <Feature>GAP 10/2</Feature>
-        <Feature>GAP 33/8</Feature>
+        <Feature>GAP 11b/3</Feature>
+        <Feature>GAP 37c/2</Feature>
+        <Feature>GAP 37/7</Feature>
         <Feature>GAP 37a/5</Feature>
         <Feature>GAP 20A/14a</Feature>
         <Feature>GAP 37b/2</Feature>
@@ -232,118 +309,92 @@
         <Feature>GAP 10/4</Feature>
         <Feature>GAP 16/2</Feature>
         <Feature>GAP 16/4</Feature>
-        <Feature>GAP 8a/14a</Feature>
-        <Feature>GAP 14a/16</Feature>
-        <Feature>GAP 27b/2</Feature>
-        <Feature>GAP 14a/19</Feature>
-        <Feature>GAP 35/13b</Feature>
-        <Feature>GAP 17b/3</Feature>
-        <Feature>GAP 25/13</Feature>
-        <Feature>GAP 14a/2</Feature>
-        <Feature>GAP 27/9a</Feature>
-        <Feature>GAP 35/13a</Feature>
-        <Feature>GAP 30a/11</Feature>
-        <Feature>GAP 30a/14a</Feature>
-        <Feature>GAP 37b/5</Feature>
-        <Feature>GAP 14a/8</Feature>
-        <Feature>GAP 14a/12</Feature>
-        <Feature>GAP 10/1</Feature>
-        <Feature>GAP 14/1</Feature>
-        <Feature>GAP 20A/6</Feature>
-        <Feature>GAP 21/1</Feature>
-        <Feature>GAP 21/11</Feature>
-        <Feature>GAP 21/4</Feature>
-        <Feature>GAP 22/4</Feature>
-        <Feature>GAP 24/1</Feature>
-        <Feature>GAP 24/3</Feature>
-        <Feature>GAP 25/10</Feature>
-        <Feature>GAP 26/1</Feature>
-        <Feature>GAP 26/2</Feature>
-        <Feature>GAP 26/4</Feature>
-        <Feature>GAP 29/3</Feature>
-        <Feature>GAP 31/8</Feature>
-        <Feature>GAP 32/3</Feature>
-        <Feature>GAP 33/2</Feature>
-        <Feature>GAP 34/2</Feature>
-        <Feature>GAP 5/2</Feature>
-        <Feature>GAP 8/3</Feature>
-        <Feature>GAP 8a/5</Feature>
-        <Feature>GAP 10/5</Feature>
-        <Feature>GAP 11b/1</Feature>
-        <Feature>GAP 16/3</Feature>
-        <Feature>GAP 20/7</Feature>
-        <Feature>GAP 20A/11</Feature>
-        <Feature>GAP 20A/13</Feature>
-        <Feature>GAP 20A/16</Feature>
-        <Feature>GAP 20A/2</Feature>
-        <Feature>GAP 20A/9</Feature>
-        <Feature>GAP 21/7</Feature>
-        <Feature>GAP 23/1</Feature>
-        <Feature>GAP 23/5</Feature>
-        <Feature>GAP 27/1</Feature>
-        <Feature>GAP 27/9</Feature>
-        <Feature>GAP 28/1</Feature>
-        <Feature>GAP 30/2</Feature>
-        <Feature>GAP 31/1</Feature>
-        <Feature>GAP 31/6</Feature>
-        <Feature>GAP 31/9</Feature>
-        <Feature>GAP 8a/10</Feature>
-        <Feature>GAP 8a/13</Feature>
-        <Feature>GAP 8a/17</Feature>
-        <Feature>GAP 8a/3</Feature>
-        <Feature>GAP 8a/8</Feature>
-        <Feature>GAP 33/7</Feature>
-        <Feature>GAP 20A/1</Feature>
-        <Feature>GAP 20A/14</Feature>
-        <Feature>GAP 21/10</Feature>
-        <Feature>GAP 21/2</Feature>
-        <Feature>GAP 22/1</Feature>
-        <Feature>GAP 22/3</Feature>
-        <Feature>GAP 24/4</Feature>
-        <Feature>GAP 27/2</Feature>
-        <Feature>GAP 31/10</Feature>
-        <Feature>GAP 32/1</Feature>
-        <Feature>GAP 32/2</Feature>
-        <Feature>GAP 35/2</Feature>
-        <Feature>GAP 37/1</Feature>
-        <Feature>GAP 5/4</Feature>
-        <Feature>GAP 8a/1</Feature>
-        <Feature>GAP 8a/4</Feature>
       </Features>
     </Layer>
     <Layer Layer="L2CAP">
       <Features>
-        <Feature>L2CAP 2/49</Feature>
-        <Feature>L2CAP 2/45a</Feature>
-        <Feature>L2CAP 1/6</Feature>
-        <Feature>L2CAP 3/16</Feature>
-        <Feature>L2CAP 0/2</Feature>
-        <Feature>L2CAP 4/3</Feature>
-        <Feature>L2CAP 1/5</Feature>
         <Feature>L2CAP 2/48b</Feature>
         <Feature>L2CAP 4/2</Feature>
         <Feature>L2CAP 2/41</Feature>
         <Feature>L2CAP 2/46</Feature>
         <Feature>L2CAP 3/1</Feature>
+        <Feature>L2CAP 2/45a</Feature>
+        <Feature>L2CAP 1/6</Feature>
+        <Feature>L2CAP 1/3</Feature>
         <Feature>L2CAP 4/1</Feature>
         <Feature>L2CAP 2/43</Feature>
         <Feature>L2CAP 3/12</Feature>
         <Feature>L2CAP 1/4</Feature>
         <Feature>L2CAP 2/48</Feature>
+        <Feature>L2CAP 3/16</Feature>
+        <Feature>L2CAP 0/2</Feature>
+        <Feature>L2CAP 2/49</Feature>
+        <Feature>L2CAP 4/3</Feature>
+        <Feature>L2CAP 1/5</Feature>
         <Feature>L2CAP 2/40</Feature>
         <Feature>L2CAP 2/42</Feature>
         <Feature>L2CAP 2/47</Feature>
-        <Feature>L2CAP 1/3</Feature>
-      </Features>
-    </Layer>
-    <Layer Layer="IOP">
-      <Features>
-        <Feature>IOP 1/1</Feature>
-        <Feature>IOP 2/2</Feature>
       </Features>
     </Layer>
     <Layer Layer="GATT">
       <Features>
+        <Feature>GATT 8/8</Feature>
+        <Feature>GATT 10/5</Feature>
+        <Feature>GATT 9/6</Feature>
+        <Feature>GATT 9/5</Feature>
+        <Feature>GATT 3/1</Feature>
+        <Feature>GATT 3/7</Feature>
+        <Feature>GATT 4/14</Feature>
+        <Feature>GATT 4/25</Feature>
+        <Feature>GATT 4/8</Feature>
+        <Feature>GATT 7/7</Feature>
+        <Feature>GATT 10/6</Feature>
+        <Feature>GATT 10/1</Feature>
+        <Feature>GATT 9/4</Feature>
+        <Feature>GATT 10/3</Feature>
+        <Feature>GATT 4a/2</Feature>
+        <Feature>GATT 10/4</Feature>
+        <Feature>GATT 3/25</Feature>
+        <Feature>GATT 3/6</Feature>
+        <Feature>GATT 4/17</Feature>
+        <Feature>GATT 4/19</Feature>
+        <Feature>GATT 4/4</Feature>
+        <Feature>GATT 10/11</Feature>
+        <Feature>GATT 2/3a</Feature>
+        <Feature>GATT 9/2</Feature>
+        <Feature>GATT 3a/2</Feature>
+        <Feature>GATT 2/4</Feature>
+        <Feature>GATT 9/1</Feature>
+        <Feature>GATT 4/30</Feature>
+        <Feature>GATT 4/31</Feature>
+        <Feature>GATT 2/2</Feature>
+        <Feature>GATT 3/15</Feature>
+        <Feature>GATT 3/4</Feature>
+        <Feature>GATT 3/9</Feature>
+        <Feature>GATT 4/1</Feature>
+        <Feature>GATT 4/13</Feature>
+        <Feature>GATT 4/18</Feature>
+        <Feature>GATT 4/3</Feature>
+        <Feature>GATT 7/3</Feature>
+        <Feature>GATT 4a/1</Feature>
+        <Feature>GATT 1/1</Feature>
+        <Feature>GATT 3/29</Feature>
+        <Feature>GATT 3/21</Feature>
+        <Feature>GATT 3/22</Feature>
+        <Feature>GATT 3/23</Feature>
+        <Feature>GATT 3/5</Feature>
+        <Feature>GATT 4/10</Feature>
+        <Feature>GATT 4/15</Feature>
+        <Feature>GATT 4/7</Feature>
+        <Feature>GATT 9/10</Feature>
+        <Feature>GATT 3a/1</Feature>
+        <Feature>GATT 9/12</Feature>
+        <Feature>GATT 1a/1</Feature>
+        <Feature>GATT 1a/3</Feature>
+        <Feature>GATT 4/11</Feature>
+        <Feature>GATT 4/12</Feature>
+        <Feature>GATT 4/9</Feature>
+        <Feature>GATT 7/2</Feature>
         <Feature>GATT 9/15</Feature>
         <Feature>GATT 2/5</Feature>
         <Feature>GATT 9/11</Feature>
@@ -374,34 +425,6 @@
         <Feature>GATT 4/20</Feature>
         <Feature>GATT 4/23</Feature>
         <Feature>GATT 4/26</Feature>
-        <Feature>GATT 10/11</Feature>
-        <Feature>GATT 2/3a</Feature>
-        <Feature>GATT 9/2</Feature>
-        <Feature>GATT 3a/2</Feature>
-        <Feature>GATT 2/4</Feature>
-        <Feature>GATT 9/1</Feature>
-        <Feature>GATT 4/30</Feature>
-        <Feature>GATT 4/31</Feature>
-        <Feature>GATT 2/2</Feature>
-        <Feature>GATT 3/15</Feature>
-        <Feature>GATT 3/4</Feature>
-        <Feature>GATT 3/9</Feature>
-        <Feature>GATT 4/1</Feature>
-        <Feature>GATT 4/13</Feature>
-        <Feature>GATT 4/18</Feature>
-        <Feature>GATT 4/3</Feature>
-        <Feature>GATT 7/3</Feature>
-        <Feature>GATT 10/6</Feature>
-        <Feature>GATT 10/1</Feature>
-        <Feature>GATT 9/4</Feature>
-        <Feature>GATT 10/3</Feature>
-        <Feature>GATT 4a/2</Feature>
-        <Feature>GATT 10/4</Feature>
-        <Feature>GATT 3/25</Feature>
-        <Feature>GATT 3/6</Feature>
-        <Feature>GATT 4/17</Feature>
-        <Feature>GATT 4/19</Feature>
-        <Feature>GATT 4/4</Feature>
         <Feature>GATT 10/7</Feature>
         <Feature>GATT 10/12</Feature>
         <Feature>GATT 9/8</Feature>
@@ -417,82 +440,51 @@
         <Feature>GATT 4/22</Feature>
         <Feature>GATT 7/4</Feature>
         <Feature>GATT 7/6</Feature>
-        <Feature>GATT 9/10</Feature>
-        <Feature>GATT 3a/1</Feature>
-        <Feature>GATT 9/12</Feature>
-        <Feature>GATT 1a/1</Feature>
-        <Feature>GATT 1a/3</Feature>
-        <Feature>GATT 4/11</Feature>
-        <Feature>GATT 4/12</Feature>
-        <Feature>GATT 4/9</Feature>
-        <Feature>GATT 7/2</Feature>
-        <Feature>GATT 4a/1</Feature>
-        <Feature>GATT 1/1</Feature>
-        <Feature>GATT 3/29</Feature>
-        <Feature>GATT 3/21</Feature>
-        <Feature>GATT 3/22</Feature>
-        <Feature>GATT 3/23</Feature>
-        <Feature>GATT 3/5</Feature>
-        <Feature>GATT 4/10</Feature>
-        <Feature>GATT 4/15</Feature>
-        <Feature>GATT 4/7</Feature>
-        <Feature>GATT 8/8</Feature>
-        <Feature>GATT 10/5</Feature>
-        <Feature>GATT 9/6</Feature>
-        <Feature>GATT 9/5</Feature>
-        <Feature>GATT 3/1</Feature>
-        <Feature>GATT 3/7</Feature>
-        <Feature>GATT 4/14</Feature>
-        <Feature>GATT 4/25</Feature>
-        <Feature>GATT 4/8</Feature>
-        <Feature>GATT 7/7</Feature>
       </Features>
     </Layer>
     <Layer Layer="SM">
       <Features>
-        <Feature>SM 7b/2</Feature>
-        <Feature>SM 3/1</Feature>
-        <Feature>SM 5/2</Feature>
-        <Feature>SM 7b/3</Feature>
-        <Feature>SM 7a/3</Feature>
-        <Feature>SM 7b/1</Feature>
-        <Feature>SM 4/3</Feature>
-        <Feature>SM 1/2</Feature>
-        <Feature>SM 4/1</Feature>
-        <Feature>SM 5/3</Feature>
-        <Feature>SM 6/1</Feature>
         <Feature>SM 7a/1</Feature>
         <Feature>SM 2/3</Feature>
         <Feature>SM 2/5</Feature>
         <Feature>SM 4/2</Feature>
         <Feature>SM 1/1</Feature>
         <Feature>SM 2/1</Feature>
+        <Feature>SM 7b/3</Feature>
+        <Feature>SM 7a/3</Feature>
         <Feature>SM 7a/2</Feature>
         <Feature>SM 2/2</Feature>
         <Feature>SM 5/1</Feature>
         <Feature>SM 5/4</Feature>
         <Feature>SM 6/2</Feature>
+        <Feature>SM 7b/2</Feature>
+        <Feature>SM 3/1</Feature>
+        <Feature>SM 5/2</Feature>
+        <Feature>SM 7b/1</Feature>
+        <Feature>SM 4/3</Feature>
+        <Feature>SM 1/2</Feature>
+        <Feature>SM 4/1</Feature>
+        <Feature>SM 5/3</Feature>
+        <Feature>SM 6/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="ATT">
       <Features>
-        <Feature>ATT 7/3</Feature>
-        <Feature>ATT 4/32</Feature>
-        <Feature>ATT 2/2</Feature>
-        <Feature>ATT 3/11</Feature>
-        <Feature>ATT 3/14</Feature>
-        <Feature>ATT 3/17</Feature>
-        <Feature>ATT 3/7</Feature>
-        <Feature>ATT 4/19</Feature>
-        <Feature>ATT 4/3</Feature>
-        <Feature>ATT 4/6</Feature>
-        <Feature>ATT 4/9</Feature>
         <Feature>ATT 6/1</Feature>
         <Feature>ATT 3/12</Feature>
         <Feature>ATT 3/15</Feature>
         <Feature>ATT 3/18</Feature>
         <Feature>ATT 4/10</Feature>
         <Feature>ATT 4/20</Feature>
+        <Feature>ATT 7/1</Feature>
+        <Feature>ATT 3/30</Feature>
+        <Feature>ATT 3/32</Feature>
+        <Feature>ATT 4/12</Feature>
+        <Feature>ATT 4/22</Feature>
+        <Feature>ATT 4/24</Feature>
+        <Feature>ATT 4/27</Feature>
+        <Feature>ATT 4/7</Feature>
+        <Feature>ATT 4/8</Feature>
         <Feature>ATT 1/2</Feature>
         <Feature>ATT 3/1</Feature>
         <Feature>ATT 3/13</Feature>
@@ -507,20 +499,17 @@
         <Feature>ATT 4/21</Feature>
         <Feature>ATT 4/25</Feature>
         <Feature>ATT 4/28</Feature>
-        <Feature>ATT 1/1</Feature>
-        <Feature>ATT 4/31</Feature>
-        <Feature>ATT 3/26</Feature>
-        <Feature>ATT 4/1</Feature>
-        <Feature>ATT 4/13</Feature>
-        <Feature>ATT 7/1</Feature>
-        <Feature>ATT 3/30</Feature>
-        <Feature>ATT 3/32</Feature>
-        <Feature>ATT 4/12</Feature>
-        <Feature>ATT 4/22</Feature>
-        <Feature>ATT 4/24</Feature>
-        <Feature>ATT 4/27</Feature>
-        <Feature>ATT 4/7</Feature>
-        <Feature>ATT 4/8</Feature>
+        <Feature>ATT 7/3</Feature>
+        <Feature>ATT 4/32</Feature>
+        <Feature>ATT 2/2</Feature>
+        <Feature>ATT 3/11</Feature>
+        <Feature>ATT 3/14</Feature>
+        <Feature>ATT 3/17</Feature>
+        <Feature>ATT 3/7</Feature>
+        <Feature>ATT 4/19</Feature>
+        <Feature>ATT 4/3</Feature>
+        <Feature>ATT 4/6</Feature>
+        <Feature>ATT 4/9</Feature>
         <Feature>ATT 7/2</Feature>
         <Feature>ATT 3/23</Feature>
         <Feature>ATT 3/8</Feature>
@@ -529,8 +518,6 @@
         <Feature>ATT 4/23</Feature>
         <Feature>ATT 4/4</Feature>
         <Feature>ATT 4/5</Feature>
-        <Feature>ATT 3/10</Feature>
-        <Feature>ATT 3/16</Feature>
         <Feature>ATT 2/3a</Feature>
         <Feature>ATT 3/31</Feature>
         <Feature>ATT 4/33</Feature>
@@ -546,71 +533,91 @@
         <Feature>ATT 4/16</Feature>
         <Feature>ATT 4/2</Feature>
         <Feature>ATT 4/26</Feature>
+        <Feature>ATT 1/1</Feature>
+        <Feature>ATT 4/31</Feature>
+        <Feature>ATT 3/26</Feature>
+        <Feature>ATT 4/1</Feature>
+        <Feature>ATT 4/13</Feature>
+        <Feature>ATT 3/10</Feature>
+        <Feature>ATT 3/16</Feature>
       </Features>
     </Layer>
     <Layer Layer="DIS">
       <Features>
         <Feature>DIS 3/3</Feature>
         <Feature>DIS 2/7</Feature>
-        <Feature>DIS 2/4</Feature>
-        <Feature>DIS 2/6</Feature>
         <Feature>DIS 2/11</Feature>
-        <Feature>DIS 2/3</Feature>
-        <Feature>DIS 2/5</Feature>
         <Feature>DIS 5/1</Feature>
         <Feature>DIS 0/2</Feature>
         <Feature>DIS 2/1</Feature>
         <Feature>DIS 1/2</Feature>
         <Feature>DIS 2/2</Feature>
+        <Feature>DIS 2/3</Feature>
+        <Feature>DIS 2/5</Feature>
+        <Feature>DIS 2/4</Feature>
+        <Feature>DIS 2/6</Feature>
       </Features>
     </Layer>
     <Layer Layer="IAS">
       <Features>
-        <Feature>IAS 0/1</Feature>
-        <Feature>IAS 2/1</Feature>
-        <Feature>IAS 2/4</Feature>
-        <Feature>IAS 3/1</Feature>
         <Feature>IAS 3/2</Feature>
         <Feature>IAS 1/2</Feature>
+        <Feature>IAS 3/1</Feature>
         <Feature>IAS 2/2</Feature>
         <Feature>IAS 2/3</Feature>
+        <Feature>IAS 0/1</Feature>
+        <Feature>IAS 2/1</Feature>
+        <Feature>IAS 2/4</Feature>
       </Features>
     </Layer>
     <Layer Layer="HRS">
       <Features>
-        <Feature>HRS 2/2</Feature>
+        <Feature>HRS 3/4</Feature>
+        <Feature>HRS 3/6</Feature>
+        <Feature>HRS 2/1</Feature>
         <Feature>HRS 0/1</Feature>
         <Feature>HRS 3/2</Feature>
         <Feature>HRS 3/5</Feature>
-        <Feature>HRS 3/6</Feature>
-        <Feature>HRS 2/1</Feature>
+        <Feature>HRS 2/2</Feature>
         <Feature>HRS 1/2</Feature>
-        <Feature>HRS 3/4</Feature>
       </Features>
     </Layer>
     <Layer Layer="BAS">
       <Features>
-        <Feature>BAS 0/2</Feature>
-        <Feature>BAS 2/3</Feature>
         <Feature>BAS 4/1</Feature>
+        <Feature>BAS 3/5</Feature>
         <Feature>BAS 4/2</Feature>
         <Feature>BAS 1/2</Feature>
-        <Feature>BAS 3/5</Feature>
+        <Feature>BAS 0/2</Feature>
+        <Feature>BAS 2/3</Feature>
         <Feature>BAS 3/3</Feature>
         <Feature>BAS 2/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="OTS">
       <Features>
-        <Feature>OTS 8/8</Feature>
-        <Feature>OTS 5/9</Feature>
-        <Feature>OTS 6/3</Feature>
-        <Feature>OTS 7/1</Feature>
+        <Feature>OTS 8/6</Feature>
+        <Feature>OTS 4/13</Feature>
+        <Feature>OTS 4/15</Feature>
+        <Feature>OTS 6/1</Feature>
+        <Feature>OTS 8/3</Feature>
+        <Feature>OTS 3/2</Feature>
+        <Feature>OTS 4/12</Feature>
+        <Feature>OTS 4/4</Feature>
+        <Feature>OTS 4/5</Feature>
+        <Feature>OTS 5/2</Feature>
+        <Feature>OTS 8/1</Feature>
+        <Feature>OTS 4/1</Feature>
+        <Feature>OTS 5/5</Feature>
         <Feature>OTS 4/16</Feature>
         <Feature>OTS 4/2</Feature>
         <Feature>OTS 4/20</Feature>
         <Feature>OTS 4/3</Feature>
         <Feature>OTS 5/1</Feature>
+        <Feature>OTS 8/8</Feature>
+        <Feature>OTS 5/9</Feature>
+        <Feature>OTS 6/3</Feature>
+        <Feature>OTS 7/1</Feature>
         <Feature>OTS 0/1</Feature>
         <Feature>OTS 8/7</Feature>
         <Feature>OTS 8/4</Feature>
@@ -624,64 +631,16 @@
         <Feature>OTS 6/2</Feature>
         <Feature>OTS 6/4</Feature>
         <Feature>OTS 6/5</Feature>
-        <Feature>OTS 8/6</Feature>
-        <Feature>OTS 4/13</Feature>
-        <Feature>OTS 4/15</Feature>
-        <Feature>OTS 6/1</Feature>
-        <Feature>OTS 8/1</Feature>
-        <Feature>OTS 4/1</Feature>
-        <Feature>OTS 5/5</Feature>
-        <Feature>OTS 8/3</Feature>
-        <Feature>OTS 3/2</Feature>
-        <Feature>OTS 4/12</Feature>
-        <Feature>OTS 4/4</Feature>
-        <Feature>OTS 4/5</Feature>
-        <Feature>OTS 5/2</Feature>
       </Features>
     </Layer>
     <Layer Layer="OTP">
       <Features>
-        <Feature>OTP 9/13</Feature>
-        <Feature>OTP 9/6</Feature>
-        <Feature>OTP 6/7</Feature>
-        <Feature>OTP 6/9</Feature>
-        <Feature>OTP 8/19</Feature>
-        <Feature>OTP 9/18</Feature>
-        <Feature>OTP 3/2</Feature>
-        <Feature>OTP 6/1</Feature>
-        <Feature>OTP 6/13</Feature>
-        <Feature>OTP 7/16</Feature>
-        <Feature>OTP 8/18</Feature>
         <Feature>OTP 9/12</Feature>
-        <Feature>OTP 9/10</Feature>
-        <Feature>OTP 2/1</Feature>
-        <Feature>OTP 6/11</Feature>
-        <Feature>OTP 7/15</Feature>
-        <Feature>OTP 7/17</Feature>
-        <Feature>OTP 9/5</Feature>
-        <Feature>OTP 9/8</Feature>
-        <Feature>OTP 7/18</Feature>
-        <Feature>OTP 8/1</Feature>
-        <Feature>OTP 9/4</Feature>
-        <Feature>OTP 9/9</Feature>
-        <Feature>OTP 2/2</Feature>
-        <Feature>OTP 5/1</Feature>
-        <Feature>OTP 7/12</Feature>
-        <Feature>OTP 7/6</Feature>
         <Feature>OTP 6/10</Feature>
         <Feature>OTP 6/12</Feature>
         <Feature>OTP 7/1</Feature>
         <Feature>OTP 7/20</Feature>
         <Feature>OTP 7/7</Feature>
-        <Feature>OTP 10/1</Feature>
-        <Feature>OTP 9/14</Feature>
-        <Feature>OTP 9/16</Feature>
-        <Feature>OTP 9/1</Feature>
-        <Feature>OTP 4/1</Feature>
-        <Feature>OTP 6/14</Feature>
-        <Feature>OTP 6/2</Feature>
-        <Feature>OTP 7/2</Feature>
-        <Feature>OTP 8/17</Feature>
         <Feature>OTP 9/11</Feature>
         <Feature>OTP 9/15</Feature>
         <Feature>OTP 9/3</Feature>
@@ -692,19 +651,57 @@
         <Feature>OTP 7/3</Feature>
         <Feature>OTP 8/2</Feature>
         <Feature>OTP 8/30</Feature>
+        <Feature>OTP 10/1</Feature>
+        <Feature>OTP 9/14</Feature>
+        <Feature>OTP 9/16</Feature>
+        <Feature>OTP 9/1</Feature>
+        <Feature>OTP 4/1</Feature>
+        <Feature>OTP 6/14</Feature>
+        <Feature>OTP 6/2</Feature>
+        <Feature>OTP 7/2</Feature>
+        <Feature>OTP 8/17</Feature>
+        <Feature>OTP 9/18</Feature>
+        <Feature>OTP 3/2</Feature>
+        <Feature>OTP 6/1</Feature>
+        <Feature>OTP 6/13</Feature>
+        <Feature>OTP 7/16</Feature>
+        <Feature>OTP 8/18</Feature>
+        <Feature>OTP 9/13</Feature>
+        <Feature>OTP 9/6</Feature>
+        <Feature>OTP 6/7</Feature>
+        <Feature>OTP 6/9</Feature>
+        <Feature>OTP 8/19</Feature>
+        <Feature>OTP 9/5</Feature>
+        <Feature>OTP 9/8</Feature>
+        <Feature>OTP 7/18</Feature>
+        <Feature>OTP 8/1</Feature>
+        <Feature>OTP 9/4</Feature>
+        <Feature>OTP 9/9</Feature>
+        <Feature>OTP 2/2</Feature>
+        <Feature>OTP 5/1</Feature>
+        <Feature>OTP 7/12</Feature>
+        <Feature>OTP 7/6</Feature>
+        <Feature>OTP 9/10</Feature>
+        <Feature>OTP 2/1</Feature>
+        <Feature>OTP 6/11</Feature>
+        <Feature>OTP 7/15</Feature>
+        <Feature>OTP 7/17</Feature>
       </Features>
     </Layer>
     <Layer Layer="MESH">
       <Features>
-        <Feature>MESH 11/15</Feature>
-        <Feature>MESH 2/2</Feature>
-        <Feature>MESH 12/3</Feature>
-        <Feature>MESH 12/6</Feature>
-        <Feature>MESH 4/3</Feature>
-        <Feature>MESH 4/8</Feature>
-        <Feature>MESH 5/4</Feature>
-        <Feature>MESH 18/11</Feature>
-        <Feature>MESH 21/2</Feature>
+        <Feature>MESH 11/23</Feature>
+        <Feature>MESH 12/12</Feature>
+        <Feature>MESH 18/12</Feature>
+        <Feature>MESH 1a/2</Feature>
+        <Feature>MESH 11/14</Feature>
+        <Feature>MESH 4/13</Feature>
+        <Feature>MESH 11/6</Feature>
+        <Feature>MESH 14/1</Feature>
+        <Feature>MESH 4/11</Feature>
+        <Feature>MESH 7/4</Feature>
+        <Feature>MESH 18/2</Feature>
+        <Feature>MESH 18/6</Feature>
         <Feature>MESH 11/24</Feature>
         <Feature>MESH 11/16</Feature>
         <Feature>MESH 11/7</Feature>
@@ -719,9 +716,30 @@
         <Feature>MESH 5/1</Feature>
         <Feature>MESH 5/2</Feature>
         <Feature>MESH 6/2</Feature>
-        <Feature>MESH 18/5</Feature>
-        <Feature>MESH 18/8</Feature>
-        <Feature>MESH 20/1</Feature>
+        <Feature>MESH 11/11</Feature>
+        <Feature>MESH 4/14</Feature>
+        <Feature>MESH 12/8</Feature>
+        <Feature>MESH 18/13</Feature>
+        <Feature>MESH 2/1</Feature>
+        <Feature>MESH 10/4</Feature>
+        <Feature>MESH 15/4</Feature>
+        <Feature>MESH 15/5</Feature>
+        <Feature>MESH 16/5</Feature>
+        <Feature>MESH 4/7</Feature>
+        <Feature>MESH 7/3</Feature>
+        <Feature>MESH 19/1</Feature>
+        <Feature>MESH 4/17</Feature>
+        <Feature>MESH 10/1</Feature>
+        <Feature>MESH 13/1</Feature>
+        <Feature>MESH 14/4</Feature>
+        <Feature>MESH 16/4</Feature>
+        <Feature>MESH 3/1</Feature>
+        <Feature>MESH 7/1</Feature>
+        <Feature>MESH 18/1</Feature>
+        <Feature>MESH 18/9</Feature>
+        <Feature>MESH 20/2</Feature>
+        <Feature>MESH 21/1</Feature>
+        <Feature>MESH 21/4</Feature>
         <Feature>MESH 11/20</Feature>
         <Feature>MESH 10/5</Feature>
         <Feature>MESH 2/3</Feature>
@@ -752,36 +770,18 @@
         <Feature>MESH 18/7</Feature>
         <Feature>MESH 20/4</Feature>
         <Feature>MESH 21/3</Feature>
-        <Feature>MESH 11/23</Feature>
-        <Feature>MESH 12/12</Feature>
-        <Feature>MESH 18/12</Feature>
-        <Feature>MESH 1a/2</Feature>
-        <Feature>MESH 11/14</Feature>
-        <Feature>MESH 4/13</Feature>
-        <Feature>MESH 11/6</Feature>
-        <Feature>MESH 14/1</Feature>
-        <Feature>MESH 4/11</Feature>
-        <Feature>MESH 7/4</Feature>
-        <Feature>MESH 18/2</Feature>
-        <Feature>MESH 18/6</Feature>
-        <Feature>MESH 4/17</Feature>
-        <Feature>MESH 10/1</Feature>
-        <Feature>MESH 13/1</Feature>
-        <Feature>MESH 14/4</Feature>
-        <Feature>MESH 16/4</Feature>
-        <Feature>MESH 3/1</Feature>
-        <Feature>MESH 7/1</Feature>
-        <Feature>MESH 18/1</Feature>
-        <Feature>MESH 18/9</Feature>
-        <Feature>MESH 20/2</Feature>
-        <Feature>MESH 21/1</Feature>
-        <Feature>MESH 21/4</Feature>
-        <Feature>MESH 11/22</Feature>
-        <Feature>MESH 11/1</Feature>
-        <Feature>MESH 11/4</Feature>
-        <Feature>MESH 12/1</Feature>
-        <Feature>MESH 15/1</Feature>
-        <Feature>MESH 20/3</Feature>
+        <Feature>MESH 18/5</Feature>
+        <Feature>MESH 18/8</Feature>
+        <Feature>MESH 20/1</Feature>
+        <Feature>MESH 11/15</Feature>
+        <Feature>MESH 2/2</Feature>
+        <Feature>MESH 12/3</Feature>
+        <Feature>MESH 12/6</Feature>
+        <Feature>MESH 4/3</Feature>
+        <Feature>MESH 4/8</Feature>
+        <Feature>MESH 5/4</Feature>
+        <Feature>MESH 18/11</Feature>
+        <Feature>MESH 21/2</Feature>
         <Feature>MESH 11/12</Feature>
         <Feature>MESH 4/15</Feature>
         <Feature>MESH 11/18</Feature>
@@ -800,91 +800,95 @@
         <Feature>MESH 18/10</Feature>
         <Feature>MESH 18/3</Feature>
         <Feature>MESH 20/5</Feature>
-        <Feature>MESH 11/11</Feature>
-        <Feature>MESH 4/14</Feature>
-        <Feature>MESH 12/8</Feature>
-        <Feature>MESH 18/13</Feature>
-        <Feature>MESH 2/1</Feature>
-        <Feature>MESH 10/4</Feature>
-        <Feature>MESH 15/4</Feature>
-        <Feature>MESH 15/5</Feature>
-        <Feature>MESH 16/5</Feature>
-        <Feature>MESH 4/7</Feature>
-        <Feature>MESH 7/3</Feature>
-        <Feature>MESH 19/1</Feature>
+        <Feature>MESH 11/22</Feature>
+        <Feature>MESH 11/1</Feature>
+        <Feature>MESH 11/4</Feature>
+        <Feature>MESH 12/1</Feature>
+        <Feature>MESH 15/1</Feature>
+        <Feature>MESH 20/3</Feature>
       </Features>
     </Layer>
     <Layer Layer="LC3">
       <Features>
-        <Feature>LC3 4/2</Feature>
-        <Feature>LC3 2/2</Feature>
-        <Feature>LC3 3/6</Feature>
-        <Feature>LC3 5/5</Feature>
-        <Feature>LC3 2/3</Feature>
-        <Feature>LC3 4/1</Feature>
-        <Feature>LC3 5/4</Feature>
-        <Feature>LC3 1/1</Feature>
         <Feature>LC3 2/1</Feature>
         <Feature>LC3 3/3</Feature>
         <Feature>LC3 5/3</Feature>
         <Feature>LC3 3/5</Feature>
+        <Feature>LC3 3/6</Feature>
+        <Feature>LC3 5/5</Feature>
         <Feature>LC3 6/1</Feature>
         <Feature>LC3 5/1</Feature>
+        <Feature>LC3 2/3</Feature>
+        <Feature>LC3 4/1</Feature>
+        <Feature>LC3 4/2</Feature>
+        <Feature>LC3 2/2</Feature>
+        <Feature>LC3 5/4</Feature>
+        <Feature>LC3 1/1</Feature>
+        <Feature>LC3 5/6</Feature>
+        <Feature>LC3 5/2</Feature>
         <Feature>LC3 6/2</Feature>
         <Feature>LC3 3/1</Feature>
         <Feature>LC3 3/4</Feature>
         <Feature>LC3 0/1</Feature>
         <Feature>LC3 3/2</Feature>
-        <Feature>LC3 5/6</Feature>
-        <Feature>LC3 5/2</Feature>
       </Features>
     </Layer>
     <Layer Layer="AICS">
       <Features>
-        <Feature>AICS 4/1</Feature>
-        <Feature>AICS 4/2</Feature>
         <Feature>AICS 4/3</Feature>
         <Feature>AICS 2/4</Feature>
         <Feature>AICS 3/3</Feature>
         <Feature>AICS 3/1</Feature>
         <Feature>AICS 0/1</Feature>
-        <Feature>AICS 3/4</Feature>
-        <Feature>AICS 2/3</Feature>
-        <Feature>AICS 2/5</Feature>
+        <Feature>AICS 4/1</Feature>
+        <Feature>AICS 4/2</Feature>
         <Feature>AICS 2/2</Feature>
         <Feature>AICS 2/6</Feature>
         <Feature>AICS 2/7</Feature>
-        <Feature>AICS 3/5</Feature>
-        <Feature>AICS 3/2</Feature>
-        <Feature>AICS 2/8</Feature>
         <Feature>AICS 4/4</Feature>
+        <Feature>AICS 0a/1</Feature>
         <Feature>AICS 2/1</Feature>
         <Feature>AICS 4/6</Feature>
         <Feature>AICS 1/2</Feature>
+        <Feature>AICS 3/4</Feature>
+        <Feature>AICS 2/3</Feature>
+        <Feature>AICS 2/5</Feature>
+        <Feature>AICS 3/5</Feature>
+        <Feature>AICS 3/2</Feature>
+        <Feature>AICS 2/8</Feature>
       </Features>
     </Layer>
     <Layer Layer="VOCS">
       <Features>
-        <Feature>VOCS 3/2</Feature>
-        <Feature>VOCS 3/6</Feature>
-        <Feature>VOCS 2/4</Feature>
+        <Feature>VOCS 0/1</Feature>
+        <Feature>VOCS 1/2</Feature>
+        <Feature>VOCS 2/3</Feature>
+        <Feature>VOCS 2/1</Feature>
+        <Feature>VOCS 2/6</Feature>
+        <Feature>VOCS 2/8</Feature>
+        <Feature>VOCS 3/2</Feature>
+        <Feature>VOCS 3/6</Feature>
+        <Feature>VOCS 0a/1</Feature>
+        <Feature>VOCS 2/4</Feature>
         <Feature>VOCS 2/7</Feature>
         <Feature>VOCS 3/1</Feature>
         <Feature>VOCS 2/2</Feature>
         <Feature>VOCS 3/4</Feature>
         <Feature>VOCS 2/5</Feature>
         <Feature>VOCS 3/3</Feature>
-        <Feature>VOCS 1/2</Feature>
-        <Feature>VOCS 2/3</Feature>
-        <Feature>VOCS 2/1</Feature>
-        <Feature>VOCS 2/6</Feature>
-        <Feature>VOCS 2/8</Feature>
-        <Feature>VOCS 0/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="VCS">
       <Features>
+        <Feature>VCS 0/1</Feature>
+        <Feature>VCS 3/5</Feature>
+        <Feature>VCS 4/6</Feature>
+        <Feature>VCS 4/2</Feature>
+        <Feature>VCS 3/3</Feature>
+        <Feature>VCS 1/2</Feature>
+        <Feature>VCS 2/3</Feature>
         <Feature>VCS 4/4</Feature>
+        <Feature>VCS 0a/1</Feature>
         <Feature>VCS 3/6</Feature>
         <Feature>VCS 2/1</Feature>
         <Feature>VCS 2/4</Feature>
@@ -892,25 +896,44 @@
         <Feature>VCS 4/3</Feature>
         <Feature>VCS 3/2</Feature>
         <Feature>VCS 3/1</Feature>
-        <Feature>VCS 0/1</Feature>
-        <Feature>VCS 3/5</Feature>
-        <Feature>VCS 4/6</Feature>
         <Feature>VCS 3/7</Feature>
         <Feature>VCS 3/4</Feature>
         <Feature>VCS 4/1</Feature>
-        <Feature>VCS 3/3</Feature>
-        <Feature>VCS 1/2</Feature>
-        <Feature>VCS 2/3</Feature>
-        <Feature>VCS 4/2</Feature>
       </Features>
     </Layer>
     <Layer Layer="VCP">
       <Features>
+        <Feature>VCP 17/5</Feature>
+        <Feature>VCP 16/11</Feature>
+        <Feature>VCP 18/7</Feature>
+        <Feature>VCP 16/2</Feature>
+        <Feature>VCP 14/8</Feature>
+        <Feature>VCP 16/5</Feature>
+        <Feature>VCP 17/3</Feature>
+        <Feature>VCP 17/8</Feature>
+        <Feature>VCP 17/1</Feature>
+        <Feature>VCP 3/1</Feature>
+        <Feature>VCP 12/8</Feature>
+        <Feature>VCP 16/10</Feature>
+        <Feature>VCP 11/2</Feature>
+        <Feature>VCP 18/3</Feature>
+        <Feature>VCP 14/3</Feature>
+        <Feature>VCP 15/4</Feature>
+        <Feature>VCP 12/7</Feature>
+        <Feature>VCP 6/2</Feature>
+        <Feature>VCP 12/5</Feature>
+        <Feature>VCP 15/5</Feature>
+        <Feature>VCP 16/4</Feature>
+        <Feature>VCP 12/2</Feature>
         <Feature>VCP 14/2</Feature>
         <Feature>VCP 8/1</Feature>
         <Feature>VCP 10/3</Feature>
         <Feature>VCP 12/9</Feature>
         <Feature>VCP 16/13</Feature>
+        <Feature>VCP 15/2</Feature>
+        <Feature>VCP 16/7</Feature>
+        <Feature>VCP 14/5</Feature>
+        <Feature>VCP 14/9</Feature>
         <Feature>VCP 5/4</Feature>
         <Feature>VCP 12/10</Feature>
         <Feature>VCP 17/4</Feature>
@@ -918,16 +941,6 @@
         <Feature>VCP 2/2</Feature>
         <Feature>VCP 16/8</Feature>
         <Feature>VCP 10/2</Feature>
-        <Feature>VCP 13/2</Feature>
-        <Feature>VCP 16/3</Feature>
-        <Feature>VCP 10/1</Feature>
-        <Feature>VCP 6/3</Feature>
-        <Feature>VCP 17/9</Feature>
-        <Feature>VCP 12/12</Feature>
-        <Feature>VCP 12/1</Feature>
-        <Feature>VCP 12/6</Feature>
-        <Feature>VCP 13/3</Feature>
-        <Feature>VCP 16/6</Feature>
         <Feature>VCP 15/1</Feature>
         <Feature>VCP 18/14</Feature>
         <Feature>VCP 5/1</Feature>
@@ -939,6 +952,16 @@
         <Feature>VCP 16/14</Feature>
         <Feature>VCP 16/1</Feature>
         <Feature>VCP 18/4</Feature>
+        <Feature>VCP 13/2</Feature>
+        <Feature>VCP 16/3</Feature>
+        <Feature>VCP 10/1</Feature>
+        <Feature>VCP 6/3</Feature>
+        <Feature>VCP 17/9</Feature>
+        <Feature>VCP 12/12</Feature>
+        <Feature>VCP 12/1</Feature>
+        <Feature>VCP 12/6</Feature>
+        <Feature>VCP 13/3</Feature>
+        <Feature>VCP 16/6</Feature>
         <Feature>VCP 14/7</Feature>
         <Feature>VCP 6/8</Feature>
         <Feature>VCP 17/6</Feature>
@@ -967,48 +990,52 @@
         <Feature>VCP 18/12</Feature>
         <Feature>VCP 17/2</Feature>
         <Feature>VCP 6/13</Feature>
-        <Feature>VCP 17/5</Feature>
-        <Feature>VCP 16/11</Feature>
-        <Feature>VCP 18/7</Feature>
-        <Feature>VCP 16/2</Feature>
-        <Feature>VCP 14/8</Feature>
-        <Feature>VCP 16/5</Feature>
-        <Feature>VCP 17/3</Feature>
-        <Feature>VCP 17/8</Feature>
-        <Feature>VCP 17/1</Feature>
-        <Feature>VCP 3/1</Feature>
-        <Feature>VCP 12/8</Feature>
-        <Feature>VCP 16/10</Feature>
-        <Feature>VCP 11/2</Feature>
-        <Feature>VCP 18/3</Feature>
-        <Feature>VCP 14/3</Feature>
-        <Feature>VCP 15/4</Feature>
-        <Feature>VCP 12/7</Feature>
-        <Feature>VCP 6/2</Feature>
-        <Feature>VCP 12/5</Feature>
-        <Feature>VCP 15/5</Feature>
-        <Feature>VCP 16/4</Feature>
-        <Feature>VCP 12/2</Feature>
-        <Feature>VCP 14/9</Feature>
-        <Feature>VCP 15/2</Feature>
-        <Feature>VCP 16/7</Feature>
-        <Feature>VCP 14/5</Feature>
       </Features>
     </Layer>
     <Layer Layer="MICS">
       <Features>
-        <Feature>MICS 3/2</Feature>
+        <Feature>MICS 2/1</Feature>
+        <Feature>MICS 3/3</Feature>
+        <Feature>MICS 3/1</Feature>
         <Feature>MICS 0/1</Feature>
         <Feature>MICS 3/4</Feature>
+        <Feature>MICS 3/2</Feature>
         <Feature>MICS 3/6</Feature>
         <Feature>MICS 1/2</Feature>
-        <Feature>MICS 3/1</Feature>
-        <Feature>MICS 2/1</Feature>
-        <Feature>MICS 3/3</Feature>
       </Features>
     </Layer>
     <Layer Layer="MICP">
       <Features>
+        <Feature>MICP 15/5</Feature>
+        <Feature>MICP 6/6</Feature>
+        <Feature>MICP 6/13</Feature>
+        <Feature>MICP 13/3</Feature>
+        <Feature>MICP 6/4</Feature>
+        <Feature>MICP 14/2</Feature>
+        <Feature>MICP 14/13</Feature>
+        <Feature>MICP 15/2</Feature>
+        <Feature>MICP 15/7</Feature>
+        <Feature>MICP 6/8</Feature>
+        <Feature>MICP 6/2</Feature>
+        <Feature>MICP 14/3</Feature>
+        <Feature>MICP 16/4</Feature>
+        <Feature>MICP 13/5</Feature>
+        <Feature>MICP 5/2</Feature>
+        <Feature>MICP 16/3</Feature>
+        <Feature>MICP 15/8</Feature>
+        <Feature>MICP 16/5</Feature>
+        <Feature>MICP 14/11</Feature>
+        <Feature>MICP 15/1</Feature>
+        <Feature>MICP 14/7</Feature>
+        <Feature>MICP 6/5</Feature>
+        <Feature>MICP 12/1</Feature>
+        <Feature>MICP 13/2</Feature>
+        <Feature>MICP 16/6</Feature>
+        <Feature>MICP 15/3</Feature>
+        <Feature>MICP 14/14</Feature>
+        <Feature>MICP 3/1</Feature>
+        <Feature>MICP 16/14</Feature>
+        <Feature>MICP 14/12</Feature>
         <Feature>MICP 6/14</Feature>
         <Feature>MICP 1/1</Feature>
         <Feature>MICP 14/10</Feature>
@@ -1020,30 +1047,8 @@
         <Feature>MICP 16/1</Feature>
         <Feature>MICP 13/1</Feature>
         <Feature>MICP 10/2</Feature>
-        <Feature>MICP 6/5</Feature>
-        <Feature>MICP 12/1</Feature>
-        <Feature>MICP 13/2</Feature>
-        <Feature>MICP 16/3</Feature>
-        <Feature>MICP 15/8</Feature>
-        <Feature>MICP 16/5</Feature>
-        <Feature>MICP 14/11</Feature>
-        <Feature>MICP 15/1</Feature>
-        <Feature>MICP 14/7</Feature>
-        <Feature>MICP 3/1</Feature>
-        <Feature>MICP 16/14</Feature>
-        <Feature>MICP 14/12</Feature>
-        <Feature>MICP 15/5</Feature>
-        <Feature>MICP 6/6</Feature>
-        <Feature>MICP 6/13</Feature>
-        <Feature>MICP 13/3</Feature>
-        <Feature>MICP 6/4</Feature>
         <Feature>MICP 8/1</Feature>
         <Feature>MICP 16/13</Feature>
-        <Feature>MICP 14/9</Feature>
-        <Feature>MICP 14/5</Feature>
-        <Feature>MICP 16/7</Feature>
-        <Feature>MICP 6/1</Feature>
-        <Feature>MICP 15/10</Feature>
         <Feature>MICP 13/6</Feature>
         <Feature>MICP 14/6</Feature>
         <Feature>MICP 13/4</Feature>
@@ -1056,41 +1061,35 @@
         <Feature>MICP 12/2</Feature>
         <Feature>MICP 14/1</Feature>
         <Feature>MICP 14/4</Feature>
-        <Feature>MICP 16/6</Feature>
-        <Feature>MICP 15/3</Feature>
-        <Feature>MICP 14/14</Feature>
-        <Feature>MICP 14/2</Feature>
-        <Feature>MICP 14/13</Feature>
-        <Feature>MICP 15/2</Feature>
-        <Feature>MICP 15/7</Feature>
-        <Feature>MICP 6/8</Feature>
-        <Feature>MICP 6/2</Feature>
-        <Feature>MICP 14/3</Feature>
-        <Feature>MICP 16/4</Feature>
-        <Feature>MICP 13/5</Feature>
-        <Feature>MICP 5/2</Feature>
+        <Feature>MICP 14/9</Feature>
+        <Feature>MICP 14/5</Feature>
+        <Feature>MICP 16/7</Feature>
+        <Feature>MICP 6/1</Feature>
+        <Feature>MICP 15/10</Feature>
       </Features>
     </Layer>
     <Layer Layer="MCS">
       <Features>
-        <Feature>MCS 22/7</Feature>
-        <Feature>MCS 22/24</Feature>
-        <Feature>MCS 23/20</Feature>
-        <Feature>MCS 25/3</Feature>
-        <Feature>MCS 23/14</Feature>
-        <Feature>MCS 23/19</Feature>
-        <Feature>MCS 23/4</Feature>
-        <Feature>MCS 23/3</Feature>
-        <Feature>MCS 22/3</Feature>
-        <Feature>MCS 20/1</Feature>
-        <Feature>MCS 22/23</Feature>
-        <Feature>MCS 22/17</Feature>
-        <Feature>MCS 23/13</Feature>
-        <Feature>MCS 21/2</Feature>
         <Feature>MCS 22/12</Feature>
         <Feature>MCS 23/9</Feature>
         <Feature>MCS 22/21</Feature>
+        <Feature>MCS 20a/1</Feature>
         <Feature>MCS 24/3</Feature>
+        <Feature>MCS 23/19</Feature>
+        <Feature>MCS 23/4</Feature>
+        <Feature>MCS 23/3</Feature>
+        <Feature>MCS 25/6</Feature>
+        <Feature>MCS 22/15</Feature>
+        <Feature>MCS 23/15</Feature>
+        <Feature>MCS 22/22</Feature>
+        <Feature>MCS 22/1</Feature>
+        <Feature>MCS 23/5</Feature>
+        <Feature>MCS 23/16</Feature>
+        <Feature>MCS 22/16</Feature>
+        <Feature>MCS 22/2</Feature>
+        <Feature>MCS 25/1</Feature>
+        <Feature>MCS 0b/2</Feature>
+        <Feature>MCS 23/18</Feature>
         <Feature>MCS 23/11</Feature>
         <Feature>MCS 23/17</Feature>
         <Feature>MCS 22/6</Feature>
@@ -1099,6 +1098,27 @@
         <Feature>MCS 22/18</Feature>
         <Feature>MCS 23/2</Feature>
         <Feature>MCS 22/4</Feature>
+        <Feature>MCS 22/3</Feature>
+        <Feature>MCS 20/1</Feature>
+        <Feature>MCS 22/23</Feature>
+        <Feature>MCS 22/17</Feature>
+        <Feature>MCS 23/13</Feature>
+        <Feature>MCS 21/2</Feature>
+        <Feature>MCS 22/7</Feature>
+        <Feature>MCS 22/24</Feature>
+        <Feature>MCS 23/20</Feature>
+        <Feature>MCS 25/3</Feature>
+        <Feature>MCS 23/14</Feature>
+        <Feature>MCS 23/21</Feature>
+        <Feature>MCS 22/26</Feature>
+        <Feature>MCS 22/11</Feature>
+        <Feature>MCS 23/8</Feature>
+        <Feature>MCS 23/12</Feature>
+        <Feature>MCS 23/6</Feature>
+        <Feature>MCS 24/4</Feature>
+        <Feature>MCS 22/9</Feature>
+        <Feature>MCS 22/8</Feature>
+        <Feature>MCS 22/14</Feature>
         <Feature>MCS 23/7</Feature>
         <Feature>MCS 24/1</Feature>
         <Feature>MCS 22/19</Feature>
@@ -1110,43 +1130,19 @@
         <Feature>MCS 22/13</Feature>
         <Feature>MCS 25/2</Feature>
         <Feature>MCS 22/25</Feature>
-        <Feature>MCS 23/21</Feature>
-        <Feature>MCS 22/26</Feature>
-        <Feature>MCS 22/11</Feature>
-        <Feature>MCS 23/8</Feature>
-        <Feature>MCS 23/12</Feature>
-        <Feature>MCS 23/6</Feature>
-        <Feature>MCS 24/4</Feature>
-        <Feature>MCS 22/9</Feature>
-        <Feature>MCS 22/8</Feature>
-        <Feature>MCS 22/14</Feature>
-        <Feature>MCS 25/6</Feature>
-        <Feature>MCS 22/15</Feature>
-        <Feature>MCS 23/15</Feature>
-        <Feature>MCS 22/22</Feature>
-        <Feature>MCS 22/1</Feature>
-        <Feature>MCS 23/5</Feature>
-        <Feature>MCS 23/16</Feature>
-        <Feature>MCS 22/16</Feature>
-        <Feature>MCS 22/2</Feature>
-        <Feature>MCS 25/1</Feature>
-        <Feature>MCS 0b/2</Feature>
-        <Feature>MCS 23/18</Feature>
       </Features>
     </Layer>
     <Layer Layer="MCP">
       <Features>
-        <Feature>MCP 16/4</Feature>
-        <Feature>MCP 6/5</Feature>
-        <Feature>MCP 18/4</Feature>
-        <Feature>MCP 18/3</Feature>
-        <Feature>MCP 6/13</Feature>
-        <Feature>MCP 16/10</Feature>
-        <Feature>MCP 17/20</Feature>
-        <Feature>MCP 17/15</Feature>
-        <Feature>MCP 16/2</Feature>
-        <Feature>MCP 10/1</Feature>
-        <Feature>MCP 16/15</Feature>
+        <Feature>MCP 21/1</Feature>
+        <Feature>MCP 2/2</Feature>
+        <Feature>MCP 17/7</Feature>
+        <Feature>MCP 3/1</Feature>
+        <Feature>MCP 17/4</Feature>
+        <Feature>MCP 17/3</Feature>
+        <Feature>MCP 16/9</Feature>
+        <Feature>MCP 6/14</Feature>
+        <Feature>MCP 13/2</Feature>
         <Feature>MCP 18/5</Feature>
         <Feature>MCP 5/4</Feature>
         <Feature>MCP 16/12</Feature>
@@ -1160,24 +1156,15 @@
         <Feature>MCP 5/3</Feature>
         <Feature>MCP 17/16</Feature>
         <Feature>MCP 16/18</Feature>
-        <Feature>MCP 16/19</Feature>
-        <Feature>MCP 21/3</Feature>
-        <Feature>MCP 8/1</Feature>
-        <Feature>MCP 17/17</Feature>
-        <Feature>MCP 17/18</Feature>
-        <Feature>MCP 16/6</Feature>
-        <Feature>MCP 10/2</Feature>
-        <Feature>MCP 6/4</Feature>
-        <Feature>MCP 1/2</Feature>
-        <Feature>MCP 21/1</Feature>
-        <Feature>MCP 2/2</Feature>
-        <Feature>MCP 17/7</Feature>
-        <Feature>MCP 3/1</Feature>
-        <Feature>MCP 17/4</Feature>
-        <Feature>MCP 17/3</Feature>
-        <Feature>MCP 16/9</Feature>
-        <Feature>MCP 6/14</Feature>
-        <Feature>MCP 13/2</Feature>
+        <Feature>MCP 17/13</Feature>
+        <Feature>MCP 17/19</Feature>
+        <Feature>MCP 17/1</Feature>
+        <Feature>MCP 6/6</Feature>
+        <Feature>MCP 17/11</Feature>
+        <Feature>MCP 17/9</Feature>
+        <Feature>MCP 17/14</Feature>
+        <Feature>MCP 16/20</Feature>
+        <Feature>MCP 1/1</Feature>
         <Feature>MCP 9/2</Feature>
         <Feature>MCP 21/2</Feature>
         <Feature>MCP 20/1</Feature>
@@ -1190,14 +1177,26 @@
         <Feature>MCP 16/5</Feature>
         <Feature>MCP 13/3</Feature>
         <Feature>MCP 18/8</Feature>
-        <Feature>MCP 18/2</Feature>
-        <Feature>MCP 16/22</Feature>
-        <Feature>MCP 6/2</Feature>
-        <Feature>MCP 18/7</Feature>
-        <Feature>MCP 17/12</Feature>
-        <Feature>MCP 16/14</Feature>
-        <Feature>MCP 16/13</Feature>
-        <Feature>MCP 17/8</Feature>
+        <Feature>MCP 16/19</Feature>
+        <Feature>MCP 21/3</Feature>
+        <Feature>MCP 8/1</Feature>
+        <Feature>MCP 17/17</Feature>
+        <Feature>MCP 17/18</Feature>
+        <Feature>MCP 16/6</Feature>
+        <Feature>MCP 10/2</Feature>
+        <Feature>MCP 6/4</Feature>
+        <Feature>MCP 1/2</Feature>
+        <Feature>MCP 16/4</Feature>
+        <Feature>MCP 6/5</Feature>
+        <Feature>MCP 18/4</Feature>
+        <Feature>MCP 18/3</Feature>
+        <Feature>MCP 6/13</Feature>
+        <Feature>MCP 16/10</Feature>
+        <Feature>MCP 17/20</Feature>
+        <Feature>MCP 17/15</Feature>
+        <Feature>MCP 16/2</Feature>
+        <Feature>MCP 10/1</Feature>
+        <Feature>MCP 16/15</Feature>
         <Feature>MCP 6/3</Feature>
         <Feature>MCP 16/8</Feature>
         <Feature>MCP 11/1</Feature>
@@ -1207,29 +1206,33 @@
         <Feature>MCP 18/14</Feature>
         <Feature>MCP 16/16</Feature>
         <Feature>MCP 5/2</Feature>
-        <Feature>MCP 17/13</Feature>
-        <Feature>MCP 17/19</Feature>
-        <Feature>MCP 17/1</Feature>
-        <Feature>MCP 6/6</Feature>
-        <Feature>MCP 17/11</Feature>
-        <Feature>MCP 17/9</Feature>
-        <Feature>MCP 17/14</Feature>
-        <Feature>MCP 16/20</Feature>
-        <Feature>MCP 1/1</Feature>
+        <Feature>MCP 18/2</Feature>
+        <Feature>MCP 16/22</Feature>
+        <Feature>MCP 6/2</Feature>
+        <Feature>MCP 18/7</Feature>
+        <Feature>MCP 17/12</Feature>
+        <Feature>MCP 16/14</Feature>
+        <Feature>MCP 16/13</Feature>
+        <Feature>MCP 17/8</Feature>
       </Features>
     </Layer>
     <Layer Layer="TBS">
       <Features>
-        <Feature>TBS 22/3</Feature>
-        <Feature>TBS 2/13</Feature>
-        <Feature>TBS 4/5</Feature>
-        <Feature>TBS 24/3</Feature>
-        <Feature>TBS 22/12</Feature>
-        <Feature>TBS 22/14</Feature>
-        <Feature>TBS 2/25</Feature>
-        <Feature>TBS 2/10</Feature>
-        <Feature>TBS 22/22</Feature>
-        <Feature>TBS 2/8</Feature>
+        <Feature>TBS 3/1</Feature>
+        <Feature>TBS 22/17</Feature>
+        <Feature>TBS 22/15</Feature>
+        <Feature>TBS 2/16</Feature>
+        <Feature>TBS 3/2</Feature>
+        <Feature>TBS 3/6</Feature>
+        <Feature>TBS 22/13</Feature>
+        <Feature>TBS 2/3</Feature>
+        <Feature>TBS 22/16</Feature>
+        <Feature>TBS 2/17</Feature>
+        <Feature>TBS 4/4</Feature>
+        <Feature>TBS 2/20</Feature>
+        <Feature>TBS 4/3</Feature>
+        <Feature>TBS 23/2</Feature>
+        <Feature>TBS 0b/1</Feature>
         <Feature>TBS 2/15</Feature>
         <Feature>TBS 23/1</Feature>
         <Feature>TBS 20/1</Feature>
@@ -1242,6 +1245,26 @@
         <Feature>TBS 3/5</Feature>
         <Feature>TBS 22/20</Feature>
         <Feature>TBS 24/5</Feature>
+        <Feature>TBS 2/7</Feature>
+        <Feature>TBS 23/6</Feature>
+        <Feature>TBS 2/19</Feature>
+        <Feature>TBS 22/18</Feature>
+        <Feature>TBS 22/25</Feature>
+        <Feature>TBS 22/21</Feature>
+        <Feature>TBS 2/24</Feature>
+        <Feature>TBS 22/23</Feature>
+        <Feature>TBS 24/4</Feature>
+        <Feature>TBS 22/9</Feature>
+        <Feature>TBS 22/3</Feature>
+        <Feature>TBS 2/13</Feature>
+        <Feature>TBS 4/5</Feature>
+        <Feature>TBS 24/3</Feature>
+        <Feature>TBS 22/12</Feature>
+        <Feature>TBS 22/14</Feature>
+        <Feature>TBS 2/25</Feature>
+        <Feature>TBS 2/10</Feature>
+        <Feature>TBS 22/22</Feature>
+        <Feature>TBS 2/8</Feature>
         <Feature>TBS 22/7</Feature>
         <Feature>TBS 22/24</Feature>
         <Feature>TBS 2/2</Feature>
@@ -1275,60 +1298,10 @@
         <Feature>TBS 1/2</Feature>
         <Feature>TBS 24/7</Feature>
         <Feature>TBS 22/11</Feature>
-        <Feature>TBS 3/1</Feature>
-        <Feature>TBS 22/17</Feature>
-        <Feature>TBS 22/15</Feature>
-        <Feature>TBS 2/16</Feature>
-        <Feature>TBS 3/2</Feature>
-        <Feature>TBS 3/6</Feature>
-        <Feature>TBS 22/13</Feature>
-        <Feature>TBS 2/3</Feature>
-        <Feature>TBS 22/16</Feature>
-        <Feature>TBS 2/17</Feature>
-        <Feature>TBS 4/4</Feature>
-        <Feature>TBS 2/20</Feature>
-        <Feature>TBS 4/3</Feature>
-        <Feature>TBS 23/2</Feature>
-        <Feature>TBS 0b/1</Feature>
-        <Feature>TBS 2/7</Feature>
-        <Feature>TBS 23/6</Feature>
-        <Feature>TBS 2/19</Feature>
-        <Feature>TBS 22/18</Feature>
-        <Feature>TBS 22/25</Feature>
-        <Feature>TBS 22/21</Feature>
-        <Feature>TBS 2/24</Feature>
-        <Feature>TBS 22/23</Feature>
-        <Feature>TBS 24/4</Feature>
-        <Feature>TBS 22/9</Feature>
       </Features>
     </Layer>
     <Layer Layer="CCP">
       <Features>
-        <Feature>CCP 14/10</Feature>
-        <Feature>CCP 13/15</Feature>
-        <Feature>CCP 14/2</Feature>
-        <Feature>CCP 5/2</Feature>
-        <Feature>CCP 15/6</Feature>
-        <Feature>CCP 11/8</Feature>
-        <Feature>CCP 14/9</Feature>
-        <Feature>CCP 11/15</Feature>
-        <Feature>CCP 13/12</Feature>
-        <Feature>CCP 11/1</Feature>
-        <Feature>CCP 1/1</Feature>
-        <Feature>CCP 6/1</Feature>
-        <Feature>CCP 13/7</Feature>
-        <Feature>CCP 6/5</Feature>
-        <Feature>CCP 12/1</Feature>
-        <Feature>CCP 12/13</Feature>
-        <Feature>CCP 12/17</Feature>
-        <Feature>CCP 11/2</Feature>
-        <Feature>CCP 6/6</Feature>
-        <Feature>CCP 14/13</Feature>
-        <Feature>CCP 5/3</Feature>
-        <Feature>CCP 13/6</Feature>
-        <Feature>CCP 13/2</Feature>
-        <Feature>CCP 14/15</Feature>
-        <Feature>CCP 14/12</Feature>
         <Feature>CCP 14/7</Feature>
         <Feature>CCP 14/20</Feature>
         <Feature>CCP 12/5</Feature>
@@ -1345,6 +1318,15 @@
         <Feature>CCP 15/4</Feature>
         <Feature>CCP 2/2</Feature>
         <Feature>CCP 11/16</Feature>
+        <Feature>CCP 14/8</Feature>
+        <Feature>CCP 6/2</Feature>
+        <Feature>CCP 14/3</Feature>
+        <Feature>CCP 12/3</Feature>
+        <Feature>CCP 12/19</Feature>
+        <Feature>CCP 14/14</Feature>
+        <Feature>CCP 13/11</Feature>
+        <Feature>CCP 12/20</Feature>
+        <Feature>CCP 11/6</Feature>
         <Feature>CCP 6/4</Feature>
         <Feature>CCP 14/18</Feature>
         <Feature>CCP 15/5</Feature>
@@ -1359,28 +1341,6 @@
         <Feature>CCP 15/8</Feature>
         <Feature>CCP 14/1</Feature>
         <Feature>CCP 11/13</Feature>
-        <Feature>CCP 14/8</Feature>
-        <Feature>CCP 6/2</Feature>
-        <Feature>CCP 14/3</Feature>
-        <Feature>CCP 12/3</Feature>
-        <Feature>CCP 12/19</Feature>
-        <Feature>CCP 14/14</Feature>
-        <Feature>CCP 13/11</Feature>
-        <Feature>CCP 12/20</Feature>
-        <Feature>CCP 11/6</Feature>
-        <Feature>CCP 12/7</Feature>
-        <Feature>CCP 12/11</Feature>
-        <Feature>CCP 15/3</Feature>
-        <Feature>CCP 10/2</Feature>
-        <Feature>CCP 12/8</Feature>
-        <Feature>CCP 12/22</Feature>
-        <Feature>CCP 14/16</Feature>
-        <Feature>CCP 12/4</Feature>
-        <Feature>CCP 12/15</Feature>
-        <Feature>CCP 14/17</Feature>
-        <Feature>CCP 11/7</Feature>
-        <Feature>CCP 13/4</Feature>
-        <Feature>CCP 8/1</Feature>
         <Feature>CCP 13/14</Feature>
         <Feature>CCP 11/9</Feature>
         <Feature>CCP 12/21</Feature>
@@ -1393,6 +1353,21 @@
         <Feature>CCP 11/12</Feature>
         <Feature>CCP 11/3</Feature>
         <Feature>CCP 13/1</Feature>
+        <Feature>CCP 14/10</Feature>
+        <Feature>CCP 13/15</Feature>
+        <Feature>CCP 14/2</Feature>
+        <Feature>CCP 5/2</Feature>
+        <Feature>CCP 15/6</Feature>
+        <Feature>CCP 11/8</Feature>
+        <Feature>CCP 14/9</Feature>
+        <Feature>CCP 11/15</Feature>
+        <Feature>CCP 13/12</Feature>
+        <Feature>CCP 11/1</Feature>
+        <Feature>CCP 1/1</Feature>
+        <Feature>CCP 6/1</Feature>
+        <Feature>CCP 13/7</Feature>
+        <Feature>CCP 6/5</Feature>
+        <Feature>CCP 12/1</Feature>
         <Feature>CCP 12/6</Feature>
         <Feature>CCP 13/5</Feature>
         <Feature>CCP 13/10</Feature>
@@ -1407,6 +1382,29 @@
         <Feature>CCP 11/10</Feature>
         <Feature>CCP 13/9</Feature>
         <Feature>CCP 14/5</Feature>
+        <Feature>CCP 12/13</Feature>
+        <Feature>CCP 12/17</Feature>
+        <Feature>CCP 11/2</Feature>
+        <Feature>CCP 6/6</Feature>
+        <Feature>CCP 14/13</Feature>
+        <Feature>CCP 5/3</Feature>
+        <Feature>CCP 13/6</Feature>
+        <Feature>CCP 13/2</Feature>
+        <Feature>CCP 14/15</Feature>
+        <Feature>CCP 14/12</Feature>
+        <Feature>CCP 12/7</Feature>
+        <Feature>CCP 12/11</Feature>
+        <Feature>CCP 15/3</Feature>
+        <Feature>CCP 10/2</Feature>
+        <Feature>CCP 12/8</Feature>
+        <Feature>CCP 12/22</Feature>
+        <Feature>CCP 14/16</Feature>
+        <Feature>CCP 12/4</Feature>
+        <Feature>CCP 12/15</Feature>
+        <Feature>CCP 14/17</Feature>
+        <Feature>CCP 11/7</Feature>
+        <Feature>CCP 13/4</Feature>
+        <Feature>CCP 8/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="CSIS">
@@ -1417,21 +1415,19 @@
         <Feature>CSIS 2/6</Feature>
         <Feature>CSIS 0a/2</Feature>
         <Feature>CSIS 3/1</Feature>
-        <Feature>CSIS 2/4</Feature>
         <Feature>CSIS 1/2</Feature>
         <Feature>CSIS 3/3</Feature>
-        <Feature>CSIS 3/4</Feature>
-        <Feature>CSIS 3/2</Feature>
         <Feature>CSIS 2/5</Feature>
         <Feature>CSIS 2/3</Feature>
-      </Features>
-    </Layer>
+        <Feature>CSIS 5/1</Feature>
+        <Feature>CSIS 3/4</Feature>
+        <Feature>CSIS 0/1</Feature>
+        <Feature>CSIS 3/2</Feature>
+        <Feature>CSIS 2/4</Feature>
+      </Features>
+    </Layer>
     <Layer Layer="CSIP">
       <Features>
-        <Feature>CSIP 3/1</Feature>
-        <Feature>CSIP 8/1</Feature>
-        <Feature>CSIP 13/1</Feature>
-        <Feature>CSIP 6/6</Feature>
         <Feature>CSIP 12/5</Feature>
         <Feature>CSIP 14/16</Feature>
         <Feature>CSIP 12/1</Feature>
@@ -1439,31 +1435,34 @@
         <Feature>CSIP 6/4</Feature>
         <Feature>CSIP 11/1</Feature>
         <Feature>CSIP 11/4</Feature>
-        <Feature>CSIP 6/3</Feature>
-        <Feature>CSIP 13/5</Feature>
-        <Feature>CSIP 14/8</Feature>
-        <Feature>CSIP 13/2</Feature>
-        <Feature>CSIP 13/7</Feature>
         <Feature>CSIP 13/10</Feature>
         <Feature>CSIP 5/1</Feature>
         <Feature>CSIP 4/2</Feature>
         <Feature>CSIP 9/2</Feature>
         <Feature>CSIP 14/4</Feature>
-        <Feature>CSIP 12/2</Feature>
-        <Feature>CSIP 6/15</Feature>
-        <Feature>CSIP 6/9</Feature>
-        <Feature>CSIP 6/1</Feature>
-        <Feature>CSIP 5/5</Feature>
-        <Feature>CSIP 6/16</Feature>
-        <Feature>CSIP 6/8</Feature>
+        <Feature>CSIP 6/3</Feature>
+        <Feature>CSIP 13/5</Feature>
+        <Feature>CSIP 14/8</Feature>
+        <Feature>CSIP 13/2</Feature>
         <Feature>CSIP 14/2</Feature>
         <Feature>CSIP 13/6</Feature>
         <Feature>CSIP 5/2</Feature>
         <Feature>CSIP 14/15</Feature>
+        <Feature>CSIP 8/1</Feature>
         <Feature>CSIP 14/7</Feature>
         <Feature>CSIP 14/5</Feature>
         <Feature>CSIP 13/9</Feature>
         <Feature>CSIP 13/4</Feature>
+        <Feature>CSIP 13/1</Feature>
+        <Feature>CSIP 6/6</Feature>
+        <Feature>CSIP 14/6</Feature>
+        <Feature>CSIP 12/4</Feature>
+        <Feature>CSIP 1/1</Feature>
+        <Feature>CSIP 6/7</Feature>
+        <Feature>CSIP 1/2</Feature>
+        <Feature>CSIP 11/2</Feature>
+        <Feature>CSIP 13/7</Feature>
+        <Feature>CSIP 14/3</Feature>
         <Feature>CSIP 13/11</Feature>
         <Feature>CSIP 2/2</Feature>
         <Feature>CSIP 14/9</Feature>
@@ -1471,26 +1470,41 @@
         <Feature>CSIP 6/2</Feature>
         <Feature>CSIP 13/8</Feature>
         <Feature>CSIP 10/1</Feature>
+        <Feature>CSIP 13/12</Feature>
         <Feature>CSIP 12/3</Feature>
         <Feature>CSIP 13/3</Feature>
-        <Feature>CSIP 14/6</Feature>
-        <Feature>CSIP 12/4</Feature>
-        <Feature>CSIP 1/1</Feature>
-        <Feature>CSIP 6/7</Feature>
-        <Feature>CSIP 1/2</Feature>
-        <Feature>CSIP 11/2</Feature>
-        <Feature>CSIP 14/3</Feature>
+        <Feature>CSIP 3/1</Feature>
+        <Feature>CSIP 12/2</Feature>
+        <Feature>CSIP 6/15</Feature>
+        <Feature>CSIP 6/9</Feature>
+        <Feature>CSIP 6/1</Feature>
+        <Feature>CSIP 5/5</Feature>
+        <Feature>CSIP 6/16</Feature>
+        <Feature>CSIP 6/8</Feature>
       </Features>
     </Layer>
     <Layer Layer="PACS">
       <Features>
-        <Feature>PACS 4/4</Feature>
-        <Feature>PACS 3/2</Feature>
+        <Feature>PACS 4/9</Feature>
+        <Feature>PACS 4/10</Feature>
+        <Feature>PACS 6/4</Feature>
+        <Feature>PACS 6/3</Feature>
+        <Feature>PACS 4/6</Feature>
+        <Feature>PACS 4/2</Feature>
+        <Feature>PACS 3/3</Feature>
+        <Feature>PACS 6/1</Feature>
+        <Feature>PACS 4/8</Feature>
+        <Feature>PACS 6/7</Feature>
+        <Feature>PACS 3/6</Feature>
         <Feature>PACS 4/12</Feature>
+        <Feature>PACS 0/1</Feature>
         <Feature>PACS 6/2</Feature>
         <Feature>PACS 3/5</Feature>
         <Feature>PACS 4/16</Feature>
         <Feature>PACS 6/5</Feature>
+        <Feature>PACS 5/1</Feature>
+        <Feature>PACS 4/4</Feature>
+        <Feature>PACS 3/2</Feature>
         <Feature>PACS 4/15</Feature>
         <Feature>PACS 4/1</Feature>
         <Feature>PACS 4/13</Feature>
@@ -1503,144 +1517,71 @@
         <Feature>PACS 4/3</Feature>
         <Feature>PACS 3/1</Feature>
         <Feature>PACS 4/14</Feature>
-        <Feature>PACS 4/9</Feature>
-        <Feature>PACS 4/10</Feature>
-        <Feature>PACS 6/4</Feature>
-        <Feature>PACS 4/8</Feature>
-        <Feature>PACS 6/7</Feature>
-        <Feature>PACS 3/6</Feature>
-        <Feature>PACS 6/3</Feature>
-        <Feature>PACS 4/6</Feature>
-        <Feature>PACS 4/2</Feature>
-        <Feature>PACS 3/3</Feature>
-        <Feature>PACS 6/1</Feature>
-        <Feature>PACS 5/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="ASCS">
       <Features>
-        <Feature>ASCS 9/3</Feature>
-        <Feature>ASCS 7/1</Feature>
-        <Feature>ASCS 0/1</Feature>
         <Feature>ASCS 9/2</Feature>
         <Feature>ASCS 9/9</Feature>
         <Feature>ASCS 3/1</Feature>
         <Feature>ASCS 5/1</Feature>
         <Feature>ASCS 9/4</Feature>
-        <Feature>ASCS 5/3</Feature>
-        <Feature>ASCS 6/6</Feature>
-        <Feature>ASCS 5/2</Feature>
-        <Feature>ASCS 6/7</Feature>
-        <Feature>ASCS 7/4</Feature>
-        <Feature>ASCS 9/7</Feature>
-        <Feature>ASCS 9/1</Feature>
-        <Feature>ASCS 8/2</Feature>
         <Feature>ASCS 6/2</Feature>
         <Feature>ASCS 8/1</Feature>
         <Feature>ASCS 6/1</Feature>
         <Feature>ASCS 6/9</Feature>
         <Feature>ASCS 4/1</Feature>
+        <Feature>ASCS 5/3</Feature>
+        <Feature>ASCS 6/6</Feature>
+        <Feature>ASCS 5/2</Feature>
+        <Feature>ASCS 9/3</Feature>
+        <Feature>ASCS 7/1</Feature>
+        <Feature>ASCS 0/1</Feature>
         <Feature>ASCS 6/3</Feature>
         <Feature>ASCS 7/2</Feature>
         <Feature>ASCS 6/8</Feature>
+        <Feature>ASCS 1/1</Feature>
+        <Feature>ASCS 9/6</Feature>
+        <Feature>ASCS 6/4</Feature>
+        <Feature>ASCS 6/7</Feature>
+        <Feature>ASCS 7/4</Feature>
+        <Feature>ASCS 9/7</Feature>
+        <Feature>ASCS 9/1</Feature>
+        <Feature>ASCS 8/2</Feature>
         <Feature>ASCS 7/3</Feature>
         <Feature>ASCS 9/5</Feature>
         <Feature>ASCS 7/5</Feature>
         <Feature>ASCS 6/5</Feature>
         <Feature>ASCS 2/2</Feature>
-        <Feature>ASCS 9/6</Feature>
-        <Feature>ASCS 6/4</Feature>
       </Features>
     </Layer>
     <Layer Layer="BASS">
       <Features>
-        <Feature>BASS 5/1</Feature>
-        <Feature>BASS 4/5</Feature>
-        <Feature>BASS 5/2</Feature>
-        <Feature>BASS 5/6</Feature>
-        <Feature>BASS 3/5</Feature>
-        <Feature>BASS 4/1</Feature>
-        <Feature>BASS 3/2</Feature>
         <Feature>BASS 3/4</Feature>
         <Feature>BASS 2/2</Feature>
         <Feature>BASS 4/4</Feature>
+        <Feature>BASS 3/2a</Feature>
+        <Feature>BASS 5/3</Feature>
+        <Feature>BASS 1/1</Feature>
         <Feature>BASS 5/5</Feature>
         <Feature>BASS 5/4</Feature>
-        <Feature>BASS 5/3</Feature>
-        <Feature>BASS 5/8</Feature>
         <Feature>BASS 4/6</Feature>
         <Feature>BASS 4/2</Feature>
         <Feature>BASS 0/1</Feature>
         <Feature>BASS 3/1</Feature>
+        <Feature>BASS 5/1</Feature>
+        <Feature>BASS 4/5</Feature>
         <Feature>BASS 4/3</Feature>
+        <Feature>BASS 5/2</Feature>
+        <Feature>BASS 5/6</Feature>
+        <Feature>BASS 3/5</Feature>
+        <Feature>BASS 4/1</Feature>
+        <Feature>BASS 3/2</Feature>
+        <Feature>BASS 5/8</Feature>
       </Features>
     </Layer>
     <Layer Layer="BAP">
       <Features>
-        <Feature>BAP 4/1</Feature>
-        <Feature>BAP 26/1</Feature>
-        <Feature>BAP 49/1</Feature>
-        <Feature>BAP 62/1</Feature>
-        <Feature>BAP 77/1</Feature>
-        <Feature>BAP 83/1</Feature>
-        <Feature>BAP 44/13</Feature>
-        <Feature>BAP 10/1</Feature>
-        <Feature>BAP 89/13</Feature>
-        <Feature>BAP 68/11</Feature>
-        <Feature>BAP 9a/6</Feature>
-        <Feature>BAP 21/9</Feature>
-        <Feature>BAP 88/3</Feature>
-        <Feature>BAP 1/4</Feature>
-        <Feature>BAP 51/4</Feature>
-        <Feature>BAP 7/7</Feature>
-        <Feature>BAP 21/12</Feature>
-        <Feature>BAP 40/2</Feature>
-        <Feature>BAP 73/9</Feature>
-        <Feature>BAP 21/8</Feature>
-        <Feature>BAP 29/1</Feature>
-        <Feature>BAP 21/11</Feature>
-        <Feature>BAP 36/6</Feature>
-        <Feature>BAP 60/1</Feature>
-        <Feature>BAP 39/7</Feature>
-        <Feature>BAP 76/3</Feature>
-        <Feature>BAP 21/4</Feature>
-        <Feature>BAP 92/7</Feature>
-        <Feature>BAP 16/6</Feature>
-        <Feature>BAP 36/11</Feature>
-        <Feature>BAP 45/9</Feature>
-        <Feature>BAP 55/1</Feature>
-        <Feature>BAP 16/16</Feature>
-        <Feature>BAP 44/10</Feature>
-        <Feature>BAP 55/15</Feature>
-        <Feature>BAP 65/3</Feature>
-        <Feature>BAP 76/4</Feature>
-        <Feature>BAP 39/13</Feature>
-        <Feature>BAP 16/7</Feature>
-        <Feature>BAP 37/4</Feature>
-        <Feature>BAP 22/3</Feature>
-        <Feature>BAP 59/1</Feature>
-        <Feature>BAP 92/3</Feature>
-        <Feature>BAP 59/10</Feature>
-        <Feature>BAP 80/10</Feature>
-        <Feature>BAP 34/5</Feature>
-        <Feature>BAP 60/2</Feature>
-        <Feature>BAP 37/11</Feature>
-        <Feature>BAP 59/8</Feature>
-        <Feature>BAP 12/14</Feature>
-        <Feature>BAP 23/4</Feature>
-        <Feature>BAP 38/14</Feature>
-        <Feature>BAP 68/17</Feature>
-        <Feature>BAP 40/12</Feature>
-        <Feature>BAP 74/11</Feature>
-        <Feature>BAP 14/7</Feature>
-        <Feature>BAP 73/4</Feature>
-        <Feature>BAP 45/10</Feature>
-        <Feature>BAP 17/15</Feature>
-        <Feature>BAP 38/16</Feature>
-        <Feature>BAP 36/4</Feature>
-        <Feature>BAP 76/1</Feature>
-        <Feature>BAP 71/1</Feature>
-        <Feature>BAP 95/5</Feature>
         <Feature>BAP 70/11</Feature>
         <Feature>BAP 14/11</Feature>
         <Feature>BAP 54/4</Feature>
@@ -1700,6 +1641,65 @@
         <Feature>BAP 13/11</Feature>
         <Feature>BAP 23/5</Feature>
         <Feature>BAP 65/1</Feature>
+        <Feature>BAP 66/2</Feature>
+        <Feature>BAP 89/2</Feature>
+        <Feature>BAP 38/9</Feature>
+        <Feature>BAP 38/4</Feature>
+        <Feature>BAP 69/11</Feature>
+        <Feature>BAP 39/4</Feature>
+        <Feature>BAP 32/5</Feature>
+        <Feature>BAP 14/8</Feature>
+        <Feature>BAP 56/14</Feature>
+        <Feature>BAP 54/11</Feature>
+        <Feature>BAP 11/1</Feature>
+        <Feature>BAP 69/9</Feature>
+        <Feature>BAP 41/8</Feature>
+        <Feature>BAP 56/10</Feature>
+        <Feature>BAP 63/3</Feature>
+        <Feature>BAP 74/4</Feature>
+        <Feature>BAP 46/9</Feature>
+        <Feature>BAP 22/2</Feature>
+        <Feature>BAP 25/3</Feature>
+        <Feature>BAP 80/1</Feature>
+        <Feature>BAP 38/13</Feature>
+        <Feature>BAP 12/9</Feature>
+        <Feature>BAP 16/4</Feature>
+        <Feature>BAP 13/7</Feature>
+        <Feature>BAP 62/1</Feature>
+        <Feature>BAP 68/8</Feature>
+        <Feature>BAP 40/4</Feature>
+        <Feature>BAP 9/6</Feature>
+        <Feature>BAP 37/17</Feature>
+        <Feature>BAP 56/2</Feature>
+        <Feature>BAP 17/5</Feature>
+        <Feature>BAP 80/5</Feature>
+        <Feature>BAP 70/6</Feature>
+        <Feature>BAP 17/13</Feature>
+        <Feature>BAP 67/3</Feature>
+        <Feature>BAP 20/11</Feature>
+        <Feature>BAP 32/6</Feature>
+        <Feature>BAP 90/20</Feature>
+        <Feature>BAP 23/1</Feature>
+        <Feature>BAP 84/3</Feature>
+        <Feature>BAP 73/5</Feature>
+        <Feature>BAP 28/4</Feature>
+        <Feature>BAP 20/2</Feature>
+        <Feature>BAP 55/2</Feature>
+        <Feature>BAP 76/2</Feature>
+        <Feature>BAP 20/3</Feature>
+        <Feature>BAP 7/1</Feature>
+        <Feature>BAP 13/1</Feature>
+        <Feature>BAP 9a/3</Feature>
+        <Feature>BAP 33a/2</Feature>
+        <Feature>BAP 32/2</Feature>
+        <Feature>BAP 13/13</Feature>
+        <Feature>BAP 37/13</Feature>
+        <Feature>BAP 35/2</Feature>
+        <Feature>BAP 13/14</Feature>
+        <Feature>BAP 13/12</Feature>
+        <Feature>BAP 59/4</Feature>
+        <Feature>BAP 94/2</Feature>
+        <Feature>BAP 54/5</Feature>
         <Feature>BAP 38/5</Feature>
         <Feature>BAP 38/11</Feature>
         <Feature>BAP 22/8</Feature>
@@ -1755,123 +1755,64 @@
         <Feature>BAP 23/19</Feature>
         <Feature>BAP 14/6</Feature>
         <Feature>BAP 12/15</Feature>
-        <Feature>BAP 7/8</Feature>
-        <Feature>BAP 93/4</Feature>
-        <Feature>BAP 14/13</Feature>
-        <Feature>BAP 23/10</Feature>
-        <Feature>BAP 10/5</Feature>
-        <Feature>BAP 69/16</Feature>
-        <Feature>BAP 14/10</Feature>
-        <Feature>BAP 39/10</Feature>
-        <Feature>BAP 37/1</Feature>
-        <Feature>BAP 17/12</Feature>
-        <Feature>BAP 55/5</Feature>
-        <Feature>BAP 46/6</Feature>
-        <Feature>BAP 30/3</Feature>
-        <Feature>BAP 36/12</Feature>
-        <Feature>BAP 36/17</Feature>
-        <Feature>BAP 16/14</Feature>
-        <Feature>BAP 51/1</Feature>
-        <Feature>BAP 56/1</Feature>
-        <Feature>BAP 44/8</Feature>
-        <Feature>BAP 22/4</Feature>
-        <Feature>BAP 32/7</Feature>
-        <Feature>BAP 31/5</Feature>
-        <Feature>BAP 58/3</Feature>
-        <Feature>BAP 41/4</Feature>
-        <Feature>BAP 9/1</Feature>
-        <Feature>BAP 9/3</Feature>
-        <Feature>BAP 33/6</Feature>
-        <Feature>BAP 15/2</Feature>
-        <Feature>BAP 52/1</Feature>
-        <Feature>BAP 56/6</Feature>
-        <Feature>BAP 12/5</Feature>
-        <Feature>BAP 12/11</Feature>
-        <Feature>BAP 56/16</Feature>
-        <Feature>BAP 14/2</Feature>
-        <Feature>BAP 13/2</Feature>
-        <Feature>BAP 15/14</Feature>
-        <Feature>BAP 54/13</Feature>
-        <Feature>BAP 37/9</Feature>
-        <Feature>BAP 36/2</Feature>
-        <Feature>BAP 92/5</Feature>
-        <Feature>BAP 32/9</Feature>
-        <Feature>BAP 54/7</Feature>
-        <Feature>BAP 40/8</Feature>
-        <Feature>BAP 86/1</Feature>
-        <Feature>BAP 41/6</Feature>
-        <Feature>BAP 9a/4</Feature>
-        <Feature>BAP 53/2</Feature>
-        <Feature>BAP 80/13</Feature>
-        <Feature>BAP 56/8</Feature>
-        <Feature>BAP 93/3</Feature>
-        <Feature>BAP 80/6</Feature>
-        <Feature>BAP 41/1</Feature>
-        <Feature>BAP 20/7</Feature>
-        <Feature>BAP 33a/3</Feature>
-        <Feature>BAP 14/4</Feature>
-        <Feature>BAP 27/5</Feature>
-        <Feature>BAP 34/3</Feature>
-        <Feature>BAP 51/5</Feature>
-        <Feature>BAP 7/5</Feature>
-        <Feature>BAP 66/2</Feature>
-        <Feature>BAP 89/2</Feature>
-        <Feature>BAP 38/9</Feature>
-        <Feature>BAP 38/4</Feature>
-        <Feature>BAP 69/11</Feature>
-        <Feature>BAP 39/4</Feature>
-        <Feature>BAP 32/5</Feature>
-        <Feature>BAP 14/8</Feature>
-        <Feature>BAP 56/14</Feature>
-        <Feature>BAP 54/11</Feature>
-        <Feature>BAP 11/1</Feature>
-        <Feature>BAP 69/9</Feature>
-        <Feature>BAP 41/8</Feature>
-        <Feature>BAP 56/10</Feature>
-        <Feature>BAP 63/3</Feature>
-        <Feature>BAP 74/4</Feature>
-        <Feature>BAP 46/9</Feature>
-        <Feature>BAP 22/2</Feature>
-        <Feature>BAP 25/3</Feature>
-        <Feature>BAP 80/1</Feature>
-        <Feature>BAP 38/13</Feature>
-        <Feature>BAP 12/9</Feature>
-        <Feature>BAP 16/4</Feature>
-        <Feature>BAP 13/7</Feature>
-        <Feature>BAP 68/8</Feature>
-        <Feature>BAP 40/4</Feature>
-        <Feature>BAP 9/6</Feature>
-        <Feature>BAP 37/17</Feature>
-        <Feature>BAP 56/2</Feature>
-        <Feature>BAP 17/5</Feature>
-        <Feature>BAP 80/5</Feature>
-        <Feature>BAP 70/6</Feature>
-        <Feature>BAP 17/13</Feature>
-        <Feature>BAP 67/3</Feature>
-        <Feature>BAP 5/3</Feature>
-        <Feature>BAP 20/11</Feature>
-        <Feature>BAP 32/6</Feature>
-        <Feature>BAP 90/20</Feature>
-        <Feature>BAP 23/1</Feature>
-        <Feature>BAP 84/3</Feature>
-        <Feature>BAP 73/5</Feature>
-        <Feature>BAP 28/4</Feature>
-        <Feature>BAP 20/2</Feature>
-        <Feature>BAP 55/2</Feature>
-        <Feature>BAP 76/2</Feature>
-        <Feature>BAP 20/3</Feature>
-        <Feature>BAP 7/1</Feature>
-        <Feature>BAP 13/1</Feature>
-        <Feature>BAP 9a/3</Feature>
-        <Feature>BAP 33a/2</Feature>
-        <Feature>BAP 32/2</Feature>
-        <Feature>BAP 13/13</Feature>
-        <Feature>BAP 37/13</Feature>
-        <Feature>BAP 35/2</Feature>
-        <Feature>BAP 13/14</Feature>
-        <Feature>BAP 13/12</Feature>
-        <Feature>BAP 59/4</Feature>
-        <Feature>BAP 94/2</Feature>
+        <Feature>BAP 44/13</Feature>
+        <Feature>BAP 10/1</Feature>
+        <Feature>BAP 89/13</Feature>
+        <Feature>BAP 68/11</Feature>
+        <Feature>BAP 9a/6</Feature>
+        <Feature>BAP 21/9</Feature>
+        <Feature>BAP 88/3</Feature>
+        <Feature>BAP 1/4</Feature>
+        <Feature>BAP 51/4</Feature>
+        <Feature>BAP 7/7</Feature>
+        <Feature>BAP 21/12</Feature>
+        <Feature>BAP 40/2</Feature>
+        <Feature>BAP 73/9</Feature>
+        <Feature>BAP 21/8</Feature>
+        <Feature>BAP 29/1</Feature>
+        <Feature>BAP 21/11</Feature>
+        <Feature>BAP 36/6</Feature>
+        <Feature>BAP 60/1</Feature>
+        <Feature>BAP 39/7</Feature>
+        <Feature>BAP 76/3</Feature>
+        <Feature>BAP 21/4</Feature>
+        <Feature>BAP 92/7</Feature>
+        <Feature>BAP 16/6</Feature>
+        <Feature>BAP 36/11</Feature>
+        <Feature>BAP 45/9</Feature>
+        <Feature>BAP 55/1</Feature>
+        <Feature>BAP 16/16</Feature>
+        <Feature>BAP 44/10</Feature>
+        <Feature>BAP 55/15</Feature>
+        <Feature>BAP 65/3</Feature>
+        <Feature>BAP 76/4</Feature>
+        <Feature>BAP 39/13</Feature>
+        <Feature>BAP 16/7</Feature>
+        <Feature>BAP 37/4</Feature>
+        <Feature>BAP 22/3</Feature>
+        <Feature>BAP 59/1</Feature>
+        <Feature>BAP 92/3</Feature>
+        <Feature>BAP 59/10</Feature>
+        <Feature>BAP 80/10</Feature>
+        <Feature>BAP 34/5</Feature>
+        <Feature>BAP 60/2</Feature>
+        <Feature>BAP 37/11</Feature>
+        <Feature>BAP 59/8</Feature>
+        <Feature>BAP 12/14</Feature>
+        <Feature>BAP 23/4</Feature>
+        <Feature>BAP 38/14</Feature>
+        <Feature>BAP 68/17</Feature>
+        <Feature>BAP 40/12</Feature>
+        <Feature>BAP 74/11</Feature>
+        <Feature>BAP 14/7</Feature>
+        <Feature>BAP 73/4</Feature>
+        <Feature>BAP 45/10</Feature>
+        <Feature>BAP 17/15</Feature>
+        <Feature>BAP 38/16</Feature>
+        <Feature>BAP 36/4</Feature>
+        <Feature>BAP 76/1</Feature>
+        <Feature>BAP 71/1</Feature>
+        <Feature>BAP 95/5</Feature>
         <Feature>BAP 33a/7</Feature>
         <Feature>BAP 68/6</Feature>
         <Feature>BAP 32/1</Feature>
@@ -1882,6 +1823,7 @@
         <Feature>BAP 15/13</Feature>
         <Feature>BAP 41/13</Feature>
         <Feature>BAP 37/7</Feature>
+        <Feature>BAP 77/1</Feature>
         <Feature>BAP 41/16</Feature>
         <Feature>BAP 69/13</Feature>
         <Feature>BAP 21/7</Feature>
@@ -1895,7 +1837,6 @@
         <Feature>BAP 22/9</Feature>
         <Feature>BAP 88/5</Feature>
         <Feature>BAP 16/5</Feature>
-        <Feature>BAP 27/4</Feature>
         <Feature>BAP 38/7</Feature>
         <Feature>BAP 39/14</Feature>
         <Feature>BAP 40/1</Feature>
@@ -1903,253 +1844,33 @@
         <Feature>BAP 74/3</Feature>
         <Feature>BAP 69/4</Feature>
         <Feature>BAP 69/14</Feature>
+        <Feature>BAP 26/1</Feature>
         <Feature>BAP 61/5</Feature>
         <Feature>BAP 74/23</Feature>
         <Feature>BAP 9a/1</Feature>
-        <Feature>BAP 22/12</Feature>
-        <Feature>BAP 41/11</Feature>
-        <Feature>BAP 72/1</Feature>
-        <Feature>BAP 12/3</Feature>
-        <Feature>BAP 34/2</Feature>
-        <Feature>BAP 65/4</Feature>
-        <Feature>BAP 31/1</Feature>
-        <Feature>BAP 1/2</Feature>
-        <Feature>BAP 65/2</Feature>
-        <Feature>BAP 21/6</Feature>
-        <Feature>BAP 16/10</Feature>
-        <Feature>BAP 46/3</Feature>
-        <Feature>BAP 14/5</Feature>
-        <Feature>BAP 85/4</Feature>
-        <Feature>BAP 36/14</Feature>
-        <Feature>BAP 8/1</Feature>
-        <Feature>BAP 33/2</Feature>
-        <Feature>BAP 69/7</Feature>
-        <Feature>BAP 57/1</Feature>
-        <Feature>BAP 68/3</Feature>
-        <Feature>BAP 70/3</Feature>
-        <Feature>BAP 61/6</Feature>
-        <Feature>BAP 36/7</Feature>
-        <Feature>BAP 53/1</Feature>
-        <Feature>BAP 54/12</Feature>
-        <Feature>BAP 89/5</Feature>
-        <Feature>BAP 46/2</Feature>
-        <Feature>BAP 55/6</Feature>
-        <Feature>BAP 90/21</Feature>
-        <Feature>BAP 51/7</Feature>
-        <Feature>BAP 14/15</Feature>
-        <Feature>BAP 1/5</Feature>
-        <Feature>BAP 36/1</Feature>
-        <Feature>BAP 25/2</Feature>
-        <Feature>BAP 50/2</Feature>
-        <Feature>BAP 7/10</Feature>
-        <Feature>BAP 45/2</Feature>
-        <Feature>BAP 12/16</Feature>
-        <Feature>BAP 41/3</Feature>
-        <Feature>BAP 17/2</Feature>
-        <Feature>BAP 6/4</Feature>
-        <Feature>BAP 87/2</Feature>
-        <Feature>BAP 90/16</Feature>
-        <Feature>BAP 69/10</Feature>
-        <Feature>BAP 56/5</Feature>
-        <Feature>BAP 16/3</Feature>
-        <Feature>BAP 17/9</Feature>
-        <Feature>BAP 8/2</Feature>
-        <Feature>BAP 15/8</Feature>
-        <Feature>BAP 11/3</Feature>
-        <Feature>BAP 87/1</Feature>
-        <Feature>BAP 70/12</Feature>
-        <Feature>BAP 36/8</Feature>
-        <Feature>BAP 14/9</Feature>
-        <Feature>BAP 45/11</Feature>
-        <Feature>BAP 74/6</Feature>
-        <Feature>BAP 33/1</Feature>
-        <Feature>BAP 69/15</Feature>
-        <Feature>BAP 36/13</Feature>
-        <Feature>BAP 89/1</Feature>
-        <Feature>BAP 48/1</Feature>
-        <Feature>BAP 55/12</Feature>
-        <Feature>BAP 9/8</Feature>
-        <Feature>BAP 12/17</Feature>
-        <Feature>BAP 28/2</Feature>
-        <Feature>BAP 13/10</Feature>
-        <Feature>BAP 16/9</Feature>
-        <Feature>BAP 37/16</Feature>
-        <Feature>BAP 39/11</Feature>
-        <Feature>BAP 80/15</Feature>
-        <Feature>BAP 48/2</Feature>
-        <Feature>BAP 44/7</Feature>
-        <Feature>BAP 15/16</Feature>
-        <Feature>BAP 54/9</Feature>
-        <Feature>BAP 58/2</Feature>
-        <Feature>BAP 6/2</Feature>
-        <Feature>BAP 46/14</Feature>
-        <Feature>BAP 95/1</Feature>
-        <Feature>BAP 88/6</Feature>
-        <Feature>BAP 68/13</Feature>
-        <Feature>BAP 90/5</Feature>
-        <Feature>BAP 92/1</Feature>
-        <Feature>BAP 70/16</Feature>
-        <Feature>BAP 73/8</Feature>
-        <Feature>BAP 80/16</Feature>
-        <Feature>BAP 68/2</Feature>
-        <Feature>BAP 21/10</Feature>
-        <Feature>BAP 90/3</Feature>
-        <Feature>BAP 89/8</Feature>
-        <Feature>BAP 45/12</Feature>
-        <Feature>BAP 52/2</Feature>
-        <Feature>BAP 70/15</Feature>
-        <Feature>BAP 19/1</Feature>
-        <Feature>BAP 59/5</Feature>
-        <Feature>BAP 70/2</Feature>
-        <Feature>BAP 44/15</Feature>
-        <Feature>BAP 72/2</Feature>
-        <Feature>BAP 14/12</Feature>
-        <Feature>BAP 73/11</Feature>
-        <Feature>BAP 54/6</Feature>
-        <Feature>BAP 10/3</Feature>
-        <Feature>BAP 45/14</Feature>
-        <Feature>BAP 80/22</Feature>
-        <Feature>BAP 54/8</Feature>
-        <Feature>BAP 31/7</Feature>
-        <Feature>BAP 88/1</Feature>
-        <Feature>BAP 36/9</Feature>
-        <Feature>BAP 17/7</Feature>
-        <Feature>BAP 22/6</Feature>
-        <Feature>BAP 68/4</Feature>
-        <Feature>BAP 67/1</Feature>
-        <Feature>BAP 38/12</Feature>
-        <Feature>BAP 70/4</Feature>
-        <Feature>BAP 58/1</Feature>
-        <Feature>BAP 73/1</Feature>
-        <Feature>BAP 82/3</Feature>
-        <Feature>BAP 55/7</Feature>
-        <Feature>BAP 51/6</Feature>
-        <Feature>BAP 17/4</Feature>
-        <Feature>BAP 18/1</Feature>
-        <Feature>BAP 46/5</Feature>
-        <Feature>BAP 13/6</Feature>
-        <Feature>BAP 25/1</Feature>
-        <Feature>BAP 93/1</Feature>
-        <Feature>BAP 96/1</Feature>
-        <Feature>BAP 48/3</Feature>
-        <Feature>BAP 40/16</Feature>
-        <Feature>BAP 33/7</Feature>
-        <Feature>BAP 56/12</Feature>
-        <Feature>BAP 92/2</Feature>
-        <Feature>BAP 60/3</Feature>
-        <Feature>BAP 70/1</Feature>
-        <Feature>BAP 38/2</Feature>
-        <Feature>BAP 16/11</Feature>
-        <Feature>BAP 80/7</Feature>
-        <Feature>BAP 86/2</Feature>
-        <Feature>BAP 82/4</Feature>
-        <Feature>BAP 14/3</Feature>
-        <Feature>BAP 70/7</Feature>
-        <Feature>BAP 68/10</Feature>
-        <Feature>BAP 69/1</Feature>
-        <Feature>BAP 45/5</Feature>
-        <Feature>BAP 68/15</Feature>
-        <Feature>BAP 1/1</Feature>
-        <Feature>BAP 39/8</Feature>
-        <Feature>BAP 41/15</Feature>
-        <Feature>BAP 44/2</Feature>
-        <Feature>BAP 40/7</Feature>
-        <Feature>BAP 36/3</Feature>
-        <Feature>BAP 89/6</Feature>
-        <Feature>BAP 39/15</Feature>
-        <Feature>BAP 39/1</Feature>
-        <Feature>BAP 46/15</Feature>
-        <Feature>BAP 17/14</Feature>
-        <Feature>BAP 41/7</Feature>
-        <Feature>BAP 54/5</Feature>
-        <Feature>BAP 13/17</Feature>
-        <Feature>BAP 61/4</Feature>
-        <Feature>BAP 41/10</Feature>
-        <Feature>BAP 56/3</Feature>
-        <Feature>BAP 15/6</Feature>
-        <Feature>BAP 17/16</Feature>
-        <Feature>BAP 3/1</Feature>
-        <Feature>BAP 15/7</Feature>
-        <Feature>BAP 56/15</Feature>
-        <Feature>BAP 9a/5</Feature>
-        <Feature>BAP 14/14</Feature>
-        <Feature>BAP 37/8</Feature>
-        <Feature>BAP 41/5</Feature>
-        <Feature>BAP 68/9</Feature>
-        <Feature>BAP 16/2</Feature>
-        <Feature>BAP 89/4</Feature>
-        <Feature>BAP 59/7</Feature>
-        <Feature>BAP 36/15</Feature>
-        <Feature>BAP 22/10</Feature>
-        <Feature>BAP 56/13</Feature>
-        <Feature>BAP 12/8</Feature>
-        <Feature>BAP 33/5</Feature>
-        <Feature>BAP 15/10</Feature>
-        <Feature>BAP 68/1</Feature>
-        <Feature>BAP 59/11</Feature>
-        <Feature>BAP 74/7</Feature>
-        <Feature>BAP 40/11</Feature>
-        <Feature>BAP 45/1</Feature>
-        <Feature>BAP 68/12</Feature>
-        <Feature>BAP 69/6</Feature>
-        <Feature>BAP 54/10</Feature>
-        <Feature>BAP 23/2</Feature>
-        <Feature>BAP 9a/7</Feature>
-        <Feature>BAP 38/1</Feature>
-        <Feature>BAP 5/4</Feature>
-        <Feature>BAP 55/13</Feature>
-        <Feature>BAP 13/3</Feature>
-        <Feature>BAP 42/1</Feature>
-        <Feature>BAP 9/5</Feature>
-        <Feature>BAP 31/4</Feature>
-        <Feature>BAP 38/15</Feature>
-        <Feature>BAP 13/4</Feature>
-        <Feature>BAP 41/2</Feature>
-        <Feature>BAP 40/3</Feature>
-        <Feature>BAP 69/3</Feature>
-        <Feature>BAP 61/2</Feature>
-        <Feature>BAP 17/3</Feature>
-        <Feature>BAP 13/9</Feature>
-        <Feature>BAP 15/1</Feature>
-        <Feature>BAP 38/10</Feature>
-        <Feature>BAP 10/4</Feature>
-        <Feature>BAP 9a/8</Feature>
-        <Feature>BAP 70/13</Feature>
-        <Feature>BAP 67/2</Feature>
-        <Feature>BAP 59/2</Feature>
-        <Feature>BAP 55/9</Feature>
-        <Feature>BAP 74/1</Feature>
-        <Feature>BAP 20/8</Feature>
-        <Feature>BAP 16/1</Feature>
-        <Feature>BAP 7/6</Feature>
-        <Feature>BAP 20/6</Feature>
-        <Feature>BAP 95/6</Feature>
-        <Feature>BAP 21/5</Feature>
-        <Feature>BAP 90/11</Feature>
-        <Feature>BAP 37/3</Feature>
-        <Feature>BAP 73/10</Feature>
-        <Feature>BAP 74/10</Feature>
-        <Feature>BAP 21/3</Feature>
-        <Feature>BAP 38/3</Feature>
-        <Feature>BAP 51/3</Feature>
-        <Feature>BAP 40/13</Feature>
-        <Feature>BAP 68/16</Feature>
-        <Feature>BAP 15/9</Feature>
-        <Feature>BAP 14/1</Feature>
-        <Feature>BAP 10/2</Feature>
-        <Feature>BAP 36/16</Feature>
-        <Feature>BAP 40/10</Feature>
-        <Feature>BAP 44/3</Feature>
-        <Feature>BAP 90/8</Feature>
-        <Feature>BAP 55/3</Feature>
-        <Feature>BAP 90/7</Feature>
-        <Feature>BAP 17/11</Feature>
-        <Feature>BAP 35/1</Feature>
-        <Feature>BAP 56/4</Feature>
-        <Feature>BAP 70/14</Feature>
-        <Feature>BAP 44/6</Feature>
-        <Feature>BAP 9/7</Feature>
-        <Feature>BAP 29/2</Feature>
+        <Feature>BAP 22/12</Feature>
+        <Feature>BAP 41/11</Feature>
+        <Feature>BAP 72/1</Feature>
+        <Feature>BAP 12/3</Feature>
+        <Feature>BAP 34/2</Feature>
+        <Feature>BAP 65/4</Feature>
+        <Feature>BAP 31/1</Feature>
+        <Feature>BAP 1/2</Feature>
+        <Feature>BAP 65/2</Feature>
+        <Feature>BAP 21/6</Feature>
+        <Feature>BAP 16/10</Feature>
+        <Feature>BAP 46/3</Feature>
+        <Feature>BAP 14/5</Feature>
+        <Feature>BAP 85/4</Feature>
+        <Feature>BAP 36/14</Feature>
+        <Feature>BAP 83/1</Feature>
+        <Feature>BAP 8/1</Feature>
+        <Feature>BAP 33/2</Feature>
+        <Feature>BAP 69/7</Feature>
+        <Feature>BAP 57/1</Feature>
+        <Feature>BAP 68/3</Feature>
+        <Feature>BAP 70/3</Feature>
+        <Feature>BAP 61/6</Feature>
         <Feature>BAP 23/6</Feature>
         <Feature>BAP 17/8</Feature>
         <Feature>BAP 13/15</Feature>
@@ -2203,6 +1924,107 @@
         <Feature>BAP 68/14</Feature>
         <Feature>BAP 33a/6</Feature>
         <Feature>BAP 34/1</Feature>
+        <Feature>BAP 13/17</Feature>
+        <Feature>BAP 61/4</Feature>
+        <Feature>BAP 41/10</Feature>
+        <Feature>BAP 56/3</Feature>
+        <Feature>BAP 15/6</Feature>
+        <Feature>BAP 17/16</Feature>
+        <Feature>BAP 3/1</Feature>
+        <Feature>BAP 15/7</Feature>
+        <Feature>BAP 56/15</Feature>
+        <Feature>BAP 9a/5</Feature>
+        <Feature>BAP 14/14</Feature>
+        <Feature>BAP 37/8</Feature>
+        <Feature>BAP 41/5</Feature>
+        <Feature>BAP 68/9</Feature>
+        <Feature>BAP 16/2</Feature>
+        <Feature>BAP 89/4</Feature>
+        <Feature>BAP 40/3</Feature>
+        <Feature>BAP 69/3</Feature>
+        <Feature>BAP 61/2</Feature>
+        <Feature>BAP 17/3</Feature>
+        <Feature>BAP 13/9</Feature>
+        <Feature>BAP 15/1</Feature>
+        <Feature>BAP 38/10</Feature>
+        <Feature>BAP 10/4</Feature>
+        <Feature>BAP 9a/8</Feature>
+        <Feature>BAP 70/13</Feature>
+        <Feature>BAP 67/2</Feature>
+        <Feature>BAP 59/2</Feature>
+        <Feature>BAP 55/9</Feature>
+        <Feature>BAP 59/7</Feature>
+        <Feature>BAP 36/15</Feature>
+        <Feature>BAP 22/10</Feature>
+        <Feature>BAP 56/13</Feature>
+        <Feature>BAP 12/8</Feature>
+        <Feature>BAP 33/5</Feature>
+        <Feature>BAP 15/10</Feature>
+        <Feature>BAP 68/1</Feature>
+        <Feature>BAP 59/11</Feature>
+        <Feature>BAP 74/7</Feature>
+        <Feature>BAP 40/11</Feature>
+        <Feature>BAP 45/1</Feature>
+        <Feature>BAP 68/12</Feature>
+        <Feature>BAP 69/6</Feature>
+        <Feature>BAP 54/10</Feature>
+        <Feature>BAP 23/2</Feature>
+        <Feature>BAP 9a/7</Feature>
+        <Feature>BAP 38/1</Feature>
+        <Feature>BAP 5/4</Feature>
+        <Feature>BAP 55/13</Feature>
+        <Feature>BAP 13/3</Feature>
+        <Feature>BAP 42/1</Feature>
+        <Feature>BAP 9/5</Feature>
+        <Feature>BAP 31/4</Feature>
+        <Feature>BAP 38/15</Feature>
+        <Feature>BAP 13/4</Feature>
+        <Feature>BAP 41/2</Feature>
+        <Feature>BAP 17/11</Feature>
+        <Feature>BAP 35/1</Feature>
+        <Feature>BAP 56/4</Feature>
+        <Feature>BAP 49/1</Feature>
+        <Feature>BAP 70/14</Feature>
+        <Feature>BAP 44/6</Feature>
+        <Feature>BAP 9/7</Feature>
+        <Feature>BAP 29/2</Feature>
+        <Feature>BAP 80/16</Feature>
+        <Feature>BAP 68/2</Feature>
+        <Feature>BAP 21/10</Feature>
+        <Feature>BAP 90/3</Feature>
+        <Feature>BAP 89/8</Feature>
+        <Feature>BAP 45/12</Feature>
+        <Feature>BAP 52/2</Feature>
+        <Feature>BAP 70/15</Feature>
+        <Feature>BAP 19/1</Feature>
+        <Feature>BAP 59/5</Feature>
+        <Feature>BAP 70/2</Feature>
+        <Feature>BAP 44/15</Feature>
+        <Feature>BAP 72/2</Feature>
+        <Feature>BAP 14/12</Feature>
+        <Feature>BAP 73/11</Feature>
+        <Feature>BAP 54/6</Feature>
+        <Feature>BAP 10/3</Feature>
+        <Feature>BAP 45/14</Feature>
+        <Feature>BAP 80/22</Feature>
+        <Feature>BAP 54/8</Feature>
+        <Feature>BAP 31/7</Feature>
+        <Feature>BAP 88/1</Feature>
+        <Feature>BAP 36/9</Feature>
+        <Feature>BAP 17/7</Feature>
+        <Feature>BAP 22/6</Feature>
+        <Feature>BAP 68/4</Feature>
+        <Feature>BAP 67/1</Feature>
+        <Feature>BAP 38/12</Feature>
+        <Feature>BAP 4/1</Feature>
+        <Feature>BAP 70/4</Feature>
+        <Feature>BAP 58/1</Feature>
+        <Feature>BAP 73/1</Feature>
+        <Feature>BAP 82/3</Feature>
+        <Feature>BAP 55/7</Feature>
+        <Feature>BAP 51/6</Feature>
+        <Feature>BAP 17/4</Feature>
+        <Feature>BAP 18/1</Feature>
         <Feature>BAP 54/15</Feature>
         <Feature>BAP 16/12</Feature>
         <Feature>BAP 92/4</Feature>
@@ -2238,6 +2060,187 @@
         <Feature>BAP 70/10</Feature>
         <Feature>BAP 79/2</Feature>
         <Feature>BAP 56/7</Feature>
+        <Feature>BAP 7/8</Feature>
+        <Feature>BAP 93/4</Feature>
+        <Feature>BAP 14/13</Feature>
+        <Feature>BAP 23/10</Feature>
+        <Feature>BAP 10/5</Feature>
+        <Feature>BAP 69/16</Feature>
+        <Feature>BAP 14/10</Feature>
+        <Feature>BAP 39/10</Feature>
+        <Feature>BAP 37/1</Feature>
+        <Feature>BAP 17/12</Feature>
+        <Feature>BAP 55/5</Feature>
+        <Feature>BAP 46/6</Feature>
+        <Feature>BAP 30/3</Feature>
+        <Feature>BAP 36/12</Feature>
+        <Feature>BAP 36/17</Feature>
+        <Feature>BAP 16/14</Feature>
+        <Feature>BAP 51/1</Feature>
+        <Feature>BAP 56/1</Feature>
+        <Feature>BAP 44/8</Feature>
+        <Feature>BAP 22/4</Feature>
+        <Feature>BAP 32/7</Feature>
+        <Feature>BAP 31/5</Feature>
+        <Feature>BAP 58/3</Feature>
+        <Feature>BAP 41/4</Feature>
+        <Feature>BAP 9/1</Feature>
+        <Feature>BAP 9/3</Feature>
+        <Feature>BAP 33/6</Feature>
+        <Feature>BAP 15/2</Feature>
+        <Feature>BAP 52/1</Feature>
+        <Feature>BAP 56/6</Feature>
+        <Feature>BAP 12/5</Feature>
+        <Feature>BAP 12/11</Feature>
+        <Feature>BAP 56/16</Feature>
+        <Feature>BAP 14/2</Feature>
+        <Feature>BAP 13/2</Feature>
+        <Feature>BAP 15/14</Feature>
+        <Feature>BAP 54/13</Feature>
+        <Feature>BAP 37/9</Feature>
+        <Feature>BAP 36/2</Feature>
+        <Feature>BAP 92/5</Feature>
+        <Feature>BAP 32/9</Feature>
+        <Feature>BAP 54/7</Feature>
+        <Feature>BAP 40/8</Feature>
+        <Feature>BAP 86/1</Feature>
+        <Feature>BAP 41/6</Feature>
+        <Feature>BAP 9a/4</Feature>
+        <Feature>BAP 53/2</Feature>
+        <Feature>BAP 80/13</Feature>
+        <Feature>BAP 56/8</Feature>
+        <Feature>BAP 93/3</Feature>
+        <Feature>BAP 80/6</Feature>
+        <Feature>BAP 41/1</Feature>
+        <Feature>BAP 20/7</Feature>
+        <Feature>BAP 33a/3</Feature>
+        <Feature>BAP 14/4</Feature>
+        <Feature>BAP 27/5</Feature>
+        <Feature>BAP 34/3</Feature>
+        <Feature>BAP 51/5</Feature>
+        <Feature>BAP 7/5</Feature>
+        <Feature>BAP 46/5</Feature>
+        <Feature>BAP 13/6</Feature>
+        <Feature>BAP 25/1</Feature>
+        <Feature>BAP 93/1</Feature>
+        <Feature>BAP 96/1</Feature>
+        <Feature>BAP 48/3</Feature>
+        <Feature>BAP 40/16</Feature>
+        <Feature>BAP 33/7</Feature>
+        <Feature>BAP 56/12</Feature>
+        <Feature>BAP 92/2</Feature>
+        <Feature>BAP 60/3</Feature>
+        <Feature>BAP 70/1</Feature>
+        <Feature>BAP 38/2</Feature>
+        <Feature>BAP 16/11</Feature>
+        <Feature>BAP 80/7</Feature>
+        <Feature>BAP 86/2</Feature>
+        <Feature>BAP 82/4</Feature>
+        <Feature>BAP 14/3</Feature>
+        <Feature>BAP 70/7</Feature>
+        <Feature>BAP 68/10</Feature>
+        <Feature>BAP 69/1</Feature>
+        <Feature>BAP 45/5</Feature>
+        <Feature>BAP 68/15</Feature>
+        <Feature>BAP 1/1</Feature>
+        <Feature>BAP 39/8</Feature>
+        <Feature>BAP 41/15</Feature>
+        <Feature>BAP 44/2</Feature>
+        <Feature>BAP 40/7</Feature>
+        <Feature>BAP 36/3</Feature>
+        <Feature>BAP 89/6</Feature>
+        <Feature>BAP 39/15</Feature>
+        <Feature>BAP 39/1</Feature>
+        <Feature>BAP 46/15</Feature>
+        <Feature>BAP 17/14</Feature>
+        <Feature>BAP 41/7</Feature>
+        <Feature>BAP 36/7</Feature>
+        <Feature>BAP 53/1</Feature>
+        <Feature>BAP 54/12</Feature>
+        <Feature>BAP 89/5</Feature>
+        <Feature>BAP 46/2</Feature>
+        <Feature>BAP 55/6</Feature>
+        <Feature>BAP 90/21</Feature>
+        <Feature>BAP 51/7</Feature>
+        <Feature>BAP 14/15</Feature>
+        <Feature>BAP 1/5</Feature>
+        <Feature>BAP 36/1</Feature>
+        <Feature>BAP 25/2</Feature>
+        <Feature>BAP 50/2</Feature>
+        <Feature>BAP 7/10</Feature>
+        <Feature>BAP 45/2</Feature>
+        <Feature>BAP 12/16</Feature>
+        <Feature>BAP 41/3</Feature>
+        <Feature>BAP 17/2</Feature>
+        <Feature>BAP 6/4</Feature>
+        <Feature>BAP 87/2</Feature>
+        <Feature>BAP 90/16</Feature>
+        <Feature>BAP 69/10</Feature>
+        <Feature>BAP 56/5</Feature>
+        <Feature>BAP 16/3</Feature>
+        <Feature>BAP 17/9</Feature>
+        <Feature>BAP 8/2</Feature>
+        <Feature>BAP 15/8</Feature>
+        <Feature>BAP 11/3</Feature>
+        <Feature>BAP 87/1</Feature>
+        <Feature>BAP 70/12</Feature>
+        <Feature>BAP 36/8</Feature>
+        <Feature>BAP 14/9</Feature>
+        <Feature>BAP 45/11</Feature>
+        <Feature>BAP 74/6</Feature>
+        <Feature>BAP 33/1</Feature>
+        <Feature>BAP 69/15</Feature>
+        <Feature>BAP 36/13</Feature>
+        <Feature>BAP 89/1</Feature>
+        <Feature>BAP 48/1</Feature>
+        <Feature>BAP 55/12</Feature>
+        <Feature>BAP 9/8</Feature>
+        <Feature>BAP 12/17</Feature>
+        <Feature>BAP 28/2</Feature>
+        <Feature>BAP 13/10</Feature>
+        <Feature>BAP 16/9</Feature>
+        <Feature>BAP 37/16</Feature>
+        <Feature>BAP 39/11</Feature>
+        <Feature>BAP 80/15</Feature>
+        <Feature>BAP 48/2</Feature>
+        <Feature>BAP 44/7</Feature>
+        <Feature>BAP 15/16</Feature>
+        <Feature>BAP 54/9</Feature>
+        <Feature>BAP 58/2</Feature>
+        <Feature>BAP 6/2</Feature>
+        <Feature>BAP 46/14</Feature>
+        <Feature>BAP 95/1</Feature>
+        <Feature>BAP 88/6</Feature>
+        <Feature>BAP 68/13</Feature>
+        <Feature>BAP 90/5</Feature>
+        <Feature>BAP 92/1</Feature>
+        <Feature>BAP 70/16</Feature>
+        <Feature>BAP 73/8</Feature>
+        <Feature>BAP 74/1</Feature>
+        <Feature>BAP 20/8</Feature>
+        <Feature>BAP 16/1</Feature>
+        <Feature>BAP 7/6</Feature>
+        <Feature>BAP 20/6</Feature>
+        <Feature>BAP 95/6</Feature>
+        <Feature>BAP 21/5</Feature>
+        <Feature>BAP 90/11</Feature>
+        <Feature>BAP 37/3</Feature>
+        <Feature>BAP 73/10</Feature>
+        <Feature>BAP 74/10</Feature>
+        <Feature>BAP 21/3</Feature>
+        <Feature>BAP 38/3</Feature>
+        <Feature>BAP 51/3</Feature>
+        <Feature>BAP 40/13</Feature>
+        <Feature>BAP 68/16</Feature>
+        <Feature>BAP 15/9</Feature>
+        <Feature>BAP 14/1</Feature>
+        <Feature>BAP 10/2</Feature>
+        <Feature>BAP 36/16</Feature>
+        <Feature>BAP 40/10</Feature>
+        <Feature>BAP 44/3</Feature>
+        <Feature>BAP 90/8</Feature>
+        <Feature>BAP 55/3</Feature>
+        <Feature>BAP 90/7</Feature>
       </Features>
     </Layer>
     <Layer Layer="CAS">
@@ -2250,35 +2253,6 @@
     </Layer>
     <Layer Layer="CAP">
       <Features>
-        <Feature>CAP 26/5</Feature>
-        <Feature>CAP 20/3</Feature>
-        <Feature>CAP 11/5</Feature>
-        <Feature>CAP 26/7</Feature>
-        <Feature>CAP 22/4</Feature>
-        <Feature>CAP 16/4</Feature>
-        <Feature>CAP 6/8</Feature>
-        <Feature>CAP 20/9</Feature>
-        <Feature>CAP 20/6</Feature>
-        <Feature>CAP 7/5</Feature>
-        <Feature>CAP 17/1</Feature>
-        <Feature>CAP 18/2</Feature>
-        <Feature>CAP 6/1</Feature>
-        <Feature>CAP 6/7</Feature>
-        <Feature>CAP 7/6</Feature>
-        <Feature>CAP 22/8</Feature>
-        <Feature>CAP 13/1</Feature>
-        <Feature>CAP 32/1</Feature>
-        <Feature>CAP 31/3</Feature>
-        <Feature>CAP 31/1</Feature>
-        <Feature>CAP 22/9</Feature>
-        <Feature>CAP 11/2</Feature>
-        <Feature>CAP 28/6</Feature>
-        <Feature>CAP 6/3</Feature>
-        <Feature>CAP 22/10</Feature>
-        <Feature>CAP 21/1</Feature>
-        <Feature>CAP 27/4</Feature>
-        <Feature>CAP 11/12</Feature>
-        <Feature>CAP 16/3</Feature>
         <Feature>CAP 16/5</Feature>
         <Feature>CAP 1/3</Feature>
         <Feature>CAP 26/4</Feature>
@@ -2289,6 +2263,18 @@
         <Feature>CAP 16/1</Feature>
         <Feature>CAP 22/3</Feature>
         <Feature>CAP 19/4</Feature>
+        <Feature>CAP 22/1</Feature>
+        <Feature>CAP 26/6</Feature>
+        <Feature>CAP 28/8</Feature>
+        <Feature>CAP 20/2</Feature>
+        <Feature>CAP 13/2</Feature>
+        <Feature>CAP 6/6</Feature>
+        <Feature>CAP 15/1</Feature>
+        <Feature>CAP 6/5</Feature>
+        <Feature>CAP 6a/1</Feature>
+        <Feature>CAP 20/4</Feature>
+        <Feature>CAP 22/6</Feature>
+        <Feature>CAP 11/1</Feature>
         <Feature>CAP 28/11</Feature>
         <Feature>CAP 7/1</Feature>
         <Feature>CAP 19/1</Feature>
@@ -2296,6 +2282,7 @@
         <Feature>CAP 21/3</Feature>
         <Feature>CAP 24/1</Feature>
         <Feature>CAP 18/1</Feature>
+        <Feature>CAP 25/1</Feature>
         <Feature>CAP 1/2</Feature>
         <Feature>CAP 22/11</Feature>
         <Feature>CAP 33/1</Feature>
@@ -2309,30 +2296,6 @@
         <Feature>CAP 7/7</Feature>
         <Feature>CAP 11/9</Feature>
         <Feature>CAP 6/2</Feature>
-        <Feature>CAP 22/1</Feature>
-        <Feature>CAP 26/6</Feature>
-        <Feature>CAP 28/8</Feature>
-        <Feature>CAP 20/2</Feature>
-        <Feature>CAP 13/2</Feature>
-        <Feature>CAP 6/6</Feature>
-        <Feature>CAP 6/5</Feature>
-        <Feature>CAP 6a/1</Feature>
-        <Feature>CAP 20/4</Feature>
-        <Feature>CAP 22/6</Feature>
-        <Feature>CAP 11/1</Feature>
-        <Feature>CAP 11/11</Feature>
-        <Feature>CAP 1/1</Feature>
-        <Feature>CAP 12/1</Feature>
-        <Feature>CAP 4/1</Feature>
-        <Feature>CAP 28/9</Feature>
-        <Feature>CAP 7/8</Feature>
-        <Feature>CAP 6/4</Feature>
-        <Feature>CAP 3/1</Feature>
-        <Feature>CAP 20/1</Feature>
-        <Feature>CAP 28/7</Feature>
-        <Feature>CAP 11/3</Feature>
-        <Feature>CAP 22/5</Feature>
-        <Feature>CAP 27/5</Feature>
         <Feature>CAP 2/2</Feature>
         <Feature>CAP 16/2</Feature>
         <Feature>CAP 19/2</Feature>
@@ -2344,6 +2307,17 @@
         <Feature>CAP 16/6</Feature>
         <Feature>CAP 28/10</Feature>
         <Feature>CAP 11/4</Feature>
+        <Feature>CAP 26/5</Feature>
+        <Feature>CAP 20/3</Feature>
+        <Feature>CAP 11/5</Feature>
+        <Feature>CAP 26/7</Feature>
+        <Feature>CAP 22/4</Feature>
+        <Feature>CAP 5/1</Feature>
+        <Feature>CAP 16/4</Feature>
+        <Feature>CAP 6/8</Feature>
+        <Feature>CAP 20/6</Feature>
+        <Feature>CAP 7/5</Feature>
+        <Feature>CAP 17/1</Feature>
         <Feature>CAP 8/3</Feature>
         <Feature>CAP 31/4</Feature>
         <Feature>CAP 17/2</Feature>
@@ -2359,62 +2333,112 @@
         <Feature>CAP 7/2</Feature>
         <Feature>CAP 8/1</Feature>
         <Feature>CAP 8/4</Feature>
+        <Feature>CAP 18/2</Feature>
+        <Feature>CAP 6/1</Feature>
+        <Feature>CAP 6/7</Feature>
+        <Feature>CAP 7/6</Feature>
+        <Feature>CAP 22/8</Feature>
+        <Feature>CAP 13/1</Feature>
+        <Feature>CAP 32/1</Feature>
+        <Feature>CAP 31/3</Feature>
+        <Feature>CAP 31/1</Feature>
+        <Feature>CAP 22/9</Feature>
+        <Feature>CAP 11/2</Feature>
+        <Feature>CAP 28/6</Feature>
+        <Feature>CAP 6/3</Feature>
+        <Feature>CAP 22/10</Feature>
+        <Feature>CAP 21/1</Feature>
+        <Feature>CAP 27/4</Feature>
+        <Feature>CAP 11/12</Feature>
+        <Feature>CAP 16/3</Feature>
+        <Feature>CAP 11/11</Feature>
+        <Feature>CAP 1/1</Feature>
+        <Feature>CAP 12/1</Feature>
+        <Feature>CAP 4/1</Feature>
+        <Feature>CAP 28/9</Feature>
+        <Feature>CAP 7/8</Feature>
+        <Feature>CAP 6/4</Feature>
+        <Feature>CAP 3/1</Feature>
+        <Feature>CAP 20/1</Feature>
+        <Feature>CAP 28/7</Feature>
+        <Feature>CAP 11/3</Feature>
+        <Feature>CAP 22/5</Feature>
+        <Feature>CAP 27/5</Feature>
       </Features>
     </Layer>
     <Layer Layer="HAS">
       <Features>
-        <Feature>HAS 4/7</Feature>
-        <Feature>HAS 2/2</Feature>
-        <Feature>HAS 3/4</Feature>
-        <Feature>HAS 3/9</Feature>
-        <Feature>HAS 3/13</Feature>
-        <Feature>HAS 3/8</Feature>
-        <Feature>HAS 3/3</Feature>
+        <Feature>HAS 4/8</Feature>
+        <Feature>HAS 4/3</Feature>
+        <Feature>HAS 3/7</Feature>
+        <Feature>HAS 3/11</Feature>
+        <Feature>HAS 3/2</Feature>
         <Feature>HAS 4/2</Feature>
         <Feature>HAS 5/5</Feature>
         <Feature>HAS 3/6</Feature>
         <Feature>HAS 0/1</Feature>
+        <Feature>HAS 4/10</Feature>
+        <Feature>HAS 3/12</Feature>
+        <Feature>HAS 3/5</Feature>
+        <Feature>HAS 4/5</Feature>
+        <Feature>HAS 3/1</Feature>
+        <Feature>HAS 3/14</Feature>
         <Feature>HAS 4/4</Feature>
+        <Feature>HAS 1/1</Feature>
         <Feature>HAS 4/9</Feature>
         <Feature>HAS 3/1a</Feature>
+        <Feature>HAS 4/7</Feature>
+        <Feature>HAS 2/2</Feature>
+        <Feature>HAS 3/4</Feature>
+        <Feature>HAS 3/9</Feature>
+        <Feature>HAS 3/13</Feature>
+        <Feature>HAS 3/8</Feature>
+        <Feature>HAS 3/3</Feature>
         <Feature>HAS 5/4</Feature>
         <Feature>HAS 5/1</Feature>
         <Feature>HAS 4/1</Feature>
         <Feature>HAS 5/6</Feature>
         <Feature>HAS 3/10</Feature>
-        <Feature>HAS 4/8</Feature>
-        <Feature>HAS 4/3</Feature>
-        <Feature>HAS 3/7</Feature>
-        <Feature>HAS 3/11</Feature>
-        <Feature>HAS 3/2</Feature>
-        <Feature>HAS 3/14</Feature>
         <Feature>HAS 5/2</Feature>
         <Feature>HAS 5/3</Feature>
         <Feature>HAS 4/6</Feature>
-        <Feature>HAS 4/10</Feature>
-        <Feature>HAS 3/12</Feature>
-        <Feature>HAS 3/5</Feature>
-        <Feature>HAS 4/5</Feature>
-        <Feature>HAS 3/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="HAP">
       <Features>
-        <Feature>HAP 13/6</Feature>
-        <Feature>HAP 18/1</Feature>
-        <Feature>HAP 1/1</Feature>
-        <Feature>HAP 19/2</Feature>
+        <Feature>HAP 12/3</Feature>
+        <Feature>HAP 24/3</Feature>
+        <Feature>HAP 19/1</Feature>
+        <Feature>HAP 24/4</Feature>
+        <Feature>HAP 14/1</Feature>
+        <Feature>HAP 26/1</Feature>
+        <Feature>HAP 16/1</Feature>
+        <Feature>HAP 24/1</Feature>
+        <Feature>HAP 2/2</Feature>
         <Feature>HAP 12/7</Feature>
         <Feature>HAP 13/7</Feature>
         <Feature>HAP 12/6</Feature>
+        <Feature>HAP 11/1</Feature>
         <Feature>HAP 46/1</Feature>
+        <Feature>HAP 12/5</Feature>
+        <Feature>HAP 14/3</Feature>
+        <Feature>HAP 13/2</Feature>
+        <Feature>HAP 16/2</Feature>
+        <Feature>HAP 13/3</Feature>
+        <Feature>HAP 12/4</Feature>
         <Feature>HAP 10/1</Feature>
         <Feature>HAP 92/1</Feature>
         <Feature>HAP 51/1</Feature>
         <Feature>HAP 43/2</Feature>
         <Feature>HAP 40/1</Feature>
+        <Feature>HAP 91/1</Feature>
         <Feature>HAP 17/1</Feature>
         <Feature>HAP 43/1</Feature>
+        <Feature>HAP 41/1</Feature>
+        <Feature>HAP 13/6</Feature>
+        <Feature>HAP 18/1</Feature>
+        <Feature>HAP 1/1</Feature>
+        <Feature>HAP 19/2</Feature>
         <Feature>HAP 50/1</Feature>
         <Feature>HAP 24/5</Feature>
         <Feature>HAP 13/4</Feature>
@@ -2427,56 +2451,72 @@
         <Feature>HAP 12/2</Feature>
         <Feature>HAP 12/1</Feature>
         <Feature>HAP 1/4</Feature>
-        <Feature>HAP 26/1</Feature>
-        <Feature>HAP 16/1</Feature>
-        <Feature>HAP 24/1</Feature>
-        <Feature>HAP 2/2</Feature>
-        <Feature>HAP 12/5</Feature>
-        <Feature>HAP 14/3</Feature>
-        <Feature>HAP 13/2</Feature>
-        <Feature>HAP 16/2</Feature>
-        <Feature>HAP 13/3</Feature>
-        <Feature>HAP 12/4</Feature>
         <Feature>HAP 24/2</Feature>
         <Feature>HAP 13/1</Feature>
         <Feature>HAP 43/4</Feature>
         <Feature>HAP 24/6</Feature>
         <Feature>HAP 13/5</Feature>
-        <Feature>HAP 12/3</Feature>
-        <Feature>HAP 24/3</Feature>
-        <Feature>HAP 19/1</Feature>
-        <Feature>HAP 24/4</Feature>
-        <Feature>HAP 14/1</Feature>
       </Features>
-    </Layer>
-    <Layer Layer="TMAP">
-      <Features>
-        <Feature>TMAP 95/5</Feature>
-        <Feature>TMAP 114/4</Feature>
-        <Feature>TMAP 57/3</Feature>
-        <Feature>TMAP 79/2</Feature>
-        <Feature>TMAP 116/4</Feature>
-        <Feature>TMAP 78/1</Feature>
-        <Feature>TMAP 55/3</Feature>
-        <Feature>TMAP 113/1</Feature>
-        <Feature>TMAP 98/3</Feature>
-        <Feature>TMAP 17/6</Feature>
-        <Feature>TMAP 115/5</Feature>
-        <Feature>TMAP 55/5</Feature>
-        <Feature>TMAP 116/7</Feature>
-        <Feature>TMAP 76/6</Feature>
-        <Feature>TMAP 110/1</Feature>
-        <Feature>TMAP 14/1</Feature>
-        <Feature>TMAP 16/1</Feature>
-        <Feature>TMAP 56/7</Feature>
-        <Feature>TMAP 54/3</Feature>
-        <Feature>TMAP 117/1</Feature>
-        <Feature>TMAP 78/2</Feature>
-        <Feature>TMAP 56/10</Feature>
-        <Feature>TMAP 96/14</Feature>
-        <Feature>TMAP 3/1</Feature>
-        <Feature>TMAP 100/1</Feature>
-        <Feature>TMAP 76/1</Feature>
+    </Layer>
+    <Layer Layer="TMAP">
+      <Features>
+        <Feature>TMAP 79/1</Feature>
+        <Feature>TMAP 116/5</Feature>
+        <Feature>TMAP 96/12</Feature>
+        <Feature>TMAP 94/1</Feature>
+        <Feature>TMAP 116/1</Feature>
+        <Feature>TMAP 1/4</Feature>
+        <Feature>TMAP 97/1</Feature>
+        <Feature>TMAP 15/4</Feature>
+        <Feature>TMAP 115/1</Feature>
+        <Feature>TMAP 56/6</Feature>
+        <Feature>TMAP 78/3</Feature>
+        <Feature>TMAP 56/4</Feature>
+        <Feature>TMAP 116/15</Feature>
+        <Feature>TMAP 74/3</Feature>
+        <Feature>TMAP 14/6</Feature>
+        <Feature>TMAP 54/1</Feature>
+        <Feature>TMAP 76/2</Feature>
+        <Feature>TMAP 156/1</Feature>
+        <Feature>TMAP 96/3</Feature>
+        <Feature>TMAP 114/3</Feature>
+        <Feature>TMAP 16/2</Feature>
+        <Feature>TMAP 116/14</Feature>
+        <Feature>TMAP 56/15</Feature>
+        <Feature>TMAP 92/2</Feature>
+        <Feature>TMAP 99/1</Feature>
+        <Feature>TMAP 17/4</Feature>
+        <Feature>TMAP 56/2</Feature>
+        <Feature>TMAP 74/1</Feature>
+        <Feature>TMAP 151/5</Feature>
+        <Feature>TMAP 151/4</Feature>
+        <Feature>TMAP 94/5</Feature>
+        <Feature>TMAP 94/2</Feature>
+        <Feature>TMAP 116/12</Feature>
+        <Feature>TMAP 95/3</Feature>
+        <Feature>TMAP 95/8</Feature>
+        <Feature>TMAP 2/2</Feature>
+        <Feature>TMAP 112/1</Feature>
+        <Feature>TMAP 54/2</Feature>
+        <Feature>TMAP 100/2</Feature>
+        <Feature>TMAP 75/1</Feature>
+        <Feature>TMAP 56/3</Feature>
+        <Feature>TMAP 94/4</Feature>
+        <Feature>TMAP 12/1</Feature>
+        <Feature>TMAP 116/16</Feature>
+        <Feature>TMAP 95/2</Feature>
+        <Feature>TMAP 12/3</Feature>
+        <Feature>TMAP 73/1</Feature>
+        <Feature>TMAP 152/1</Feature>
+        <Feature>TMAP 74/5</Feature>
+        <Feature>TMAP 18/1</Feature>
+        <Feature>TMAP 96/4</Feature>
+        <Feature>TMAP 56/11</Feature>
+        <Feature>TMAP 94/3</Feature>
+        <Feature>TMAP 75/6</Feature>
+        <Feature>TMAP 74/4</Feature>
+        <Feature>TMAP 2/2a</Feature>
+        <Feature>TMAP 151/2</Feature>
         <Feature>TMAP 95/7</Feature>
         <Feature>TMAP 76/3</Feature>
         <Feature>TMAP 1/2</Feature>
@@ -2499,13 +2539,60 @@
         <Feature>TMAP 115/8</Feature>
         <Feature>TMAP 96/9</Feature>
         <Feature>TMAP 115/7</Feature>
+        <Feature>TMAP 74/8</Feature>
         <Feature>TMAP 96/5</Feature>
         <Feature>TMAP 17/3</Feature>
-        <Feature>TMAP 55/2</Feature>
-        <Feature>TMAP 16/4</Feature>
-        <Feature>TMAP 95/6</Feature>
-        <Feature>TMAP 74/6</Feature>
+        <Feature>TMAP 52/2</Feature>
+        <Feature>TMAP 1/7</Feature>
+        <Feature>TMAP 56/12</Feature>
+        <Feature>TMAP 153/6</Feature>
+        <Feature>TMAP 56/1</Feature>
+        <Feature>TMAP 56/5</Feature>
+        <Feature>TMAP 118/2</Feature>
+        <Feature>TMAP 16/5</Feature>
+        <Feature>TMAP 150/1</Feature>
+        <Feature>TMAP 116/13</Feature>
+        <Feature>TMAP 116/6</Feature>
+        <Feature>TMAP 153/5</Feature>
+        <Feature>TMAP 19/3</Feature>
+        <Feature>TMAP 57/1</Feature>
+        <Feature>TMAP 19/2</Feature>
+        <Feature>TMAP 151/6</Feature>
+        <Feature>TMAP 91/1</Feature>
+        <Feature>TMAP 116/2</Feature>
+        <Feature>TMAP 55/8</Feature>
+        <Feature>TMAP 97/2</Feature>
+        <Feature>TMAP 96/6</Feature>
+        <Feature>TMAP 51/1</Feature>
+        <Feature>TMAP 1/5</Feature>
+        <Feature>TMAP 115/2</Feature>
+        <Feature>TMAP 115/6</Feature>
+        <Feature>TMAP 114/2</Feature>
+        <Feature>TMAP 121/1</Feature>
+        <Feature>TMAP 112/2</Feature>
+        <Feature>TMAP 55/1</Feature>
+        <Feature>TMAP 95/5</Feature>
+        <Feature>TMAP 114/4</Feature>
+        <Feature>TMAP 57/3</Feature>
+        <Feature>TMAP 79/2</Feature>
+        <Feature>TMAP 116/4</Feature>
+        <Feature>TMAP 78/1</Feature>
+        <Feature>TMAP 55/3</Feature>
+        <Feature>TMAP 113/1</Feature>
+        <Feature>TMAP 98/3</Feature>
+        <Feature>TMAP 17/6</Feature>
+        <Feature>TMAP 115/5</Feature>
+        <Feature>TMAP 55/5</Feature>
+        <Feature>TMAP 116/7</Feature>
+        <Feature>TMAP 76/6</Feature>
+        <Feature>TMAP 110/1</Feature>
+        <Feature>TMAP 14/1</Feature>
+        <Feature>TMAP 16/1</Feature>
+        <Feature>TMAP 56/7</Feature>
+        <Feature>TMAP 54/3</Feature>
+        <Feature>TMAP 117/1</Feature>
         <Feature>TMAP 96/15</Feature>
+        <Feature>TMAP 114/5</Feature>
         <Feature>TMAP 76/5</Feature>
         <Feature>TMAP 99/2</Feature>
         <Feature>TMAP 96/7</Feature>
@@ -2517,6 +2604,7 @@
         <Feature>TMAP 118/3</Feature>
         <Feature>TMAP 17/5</Feature>
         <Feature>TMAP 96/1</Feature>
+        <Feature>TMAP 11/1</Feature>
         <Feature>TMAP 75/2</Feature>
         <Feature>TMAP 14/2</Feature>
         <Feature>TMAP 15/3</Feature>
@@ -2528,10 +2616,21 @@
         <Feature>TMAP 56/8</Feature>
         <Feature>TMAP 50/1</Feature>
         <Feature>TMAP 14/4</Feature>
+        <Feature>TMAP 78/2</Feature>
+        <Feature>TMAP 56/10</Feature>
+        <Feature>TMAP 96/14</Feature>
+        <Feature>TMAP 3/1</Feature>
+        <Feature>TMAP 100/1</Feature>
+        <Feature>TMAP 76/1</Feature>
+        <Feature>TMAP 55/2</Feature>
+        <Feature>TMAP 16/4</Feature>
+        <Feature>TMAP 95/6</Feature>
+        <Feature>TMAP 74/6</Feature>
         <Feature>TMAP 18/2</Feature>
         <Feature>TMAP 56/14</Feature>
         <Feature>TMAP 1/1</Feature>
         <Feature>TMAP 115/3</Feature>
+        <Feature>TMAP 54/5</Feature>
         <Feature>TMAP 1/8</Feature>
         <Feature>TMAP 116/11</Feature>
         <Feature>TMAP 70/1</Feature>
@@ -2551,6 +2650,7 @@
         <Feature>TMAP 98/1</Feature>
         <Feature>TMAP 153/2</Feature>
         <Feature>TMAP 92/1</Feature>
+        <Feature>TMAP 111/1</Feature>
         <Feature>TMAP 57/2</Feature>
         <Feature>TMAP 19/1</Feature>
         <Feature>TMAP 96/16</Feature>
@@ -2560,8 +2660,12 @@
         <Feature>TMAP 10/1</Feature>
         <Feature>TMAP 153/1</Feature>
         <Feature>TMAP 17/7</Feature>
+        <Feature>TMAP 94/6</Feature>
+        <Feature>TMAP 71/1</Feature>
+        <Feature>TMAP 14/8</Feature>
         <Feature>TMAP 151/1</Feature>
         <Feature>TMAP 115/4</Feature>
+        <Feature>TMAP 74/7</Feature>
         <Feature>TMAP 131/1</Feature>
         <Feature>TMAP 154/1</Feature>
         <Feature>TMAP 118/1</Feature>
@@ -2576,124 +2680,10 @@
         <Feature>TMAP 96/11</Feature>
         <Feature>TMAP 12/2</Feature>
         <Feature>TMAP 55/7</Feature>
-        <Feature>TMAP 79/1</Feature>
-        <Feature>TMAP 116/5</Feature>
-        <Feature>TMAP 96/12</Feature>
-        <Feature>TMAP 94/1</Feature>
-        <Feature>TMAP 116/1</Feature>
-        <Feature>TMAP 1/4</Feature>
-        <Feature>TMAP 97/1</Feature>
-        <Feature>TMAP 15/4</Feature>
-        <Feature>TMAP 115/1</Feature>
-        <Feature>TMAP 56/6</Feature>
-        <Feature>TMAP 78/3</Feature>
-        <Feature>TMAP 56/4</Feature>
-        <Feature>TMAP 116/15</Feature>
-        <Feature>TMAP 74/3</Feature>
-        <Feature>TMAP 14/6</Feature>
-        <Feature>TMAP 54/1</Feature>
-        <Feature>TMAP 76/2</Feature>
-        <Feature>TMAP 156/1</Feature>
-        <Feature>TMAP 96/3</Feature>
-        <Feature>TMAP 114/3</Feature>
-        <Feature>TMAP 16/2</Feature>
-        <Feature>TMAP 116/14</Feature>
-        <Feature>TMAP 56/15</Feature>
-        <Feature>TMAP 92/2</Feature>
-        <Feature>TMAP 99/1</Feature>
-        <Feature>TMAP 17/4</Feature>
-        <Feature>TMAP 56/2</Feature>
-        <Feature>TMAP 74/1</Feature>
-        <Feature>TMAP 151/5</Feature>
-        <Feature>TMAP 151/4</Feature>
-        <Feature>TMAP 94/5</Feature>
-        <Feature>TMAP 94/2</Feature>
-        <Feature>TMAP 116/12</Feature>
-        <Feature>TMAP 95/3</Feature>
-        <Feature>TMAP 95/8</Feature>
-        <Feature>TMAP 2/2</Feature>
-        <Feature>TMAP 112/1</Feature>
-        <Feature>TMAP 54/2</Feature>
-        <Feature>TMAP 100/2</Feature>
-        <Feature>TMAP 75/1</Feature>
-        <Feature>TMAP 56/3</Feature>
-        <Feature>TMAP 94/4</Feature>
-        <Feature>TMAP 12/1</Feature>
-        <Feature>TMAP 116/16</Feature>
-        <Feature>TMAP 95/2</Feature>
-        <Feature>TMAP 12/3</Feature>
-        <Feature>TMAP 73/1</Feature>
-        <Feature>TMAP 152/1</Feature>
-        <Feature>TMAP 74/5</Feature>
-        <Feature>TMAP 18/1</Feature>
-        <Feature>TMAP 96/4</Feature>
-        <Feature>TMAP 56/11</Feature>
-        <Feature>TMAP 94/3</Feature>
-        <Feature>TMAP 75/6</Feature>
-        <Feature>TMAP 74/4</Feature>
-        <Feature>TMAP 151/2</Feature>
-        <Feature>TMAP 52/2</Feature>
-        <Feature>TMAP 1/7</Feature>
-        <Feature>TMAP 56/12</Feature>
-        <Feature>TMAP 153/6</Feature>
-        <Feature>TMAP 56/1</Feature>
-        <Feature>TMAP 56/5</Feature>
-        <Feature>TMAP 118/2</Feature>
-        <Feature>TMAP 16/5</Feature>
-        <Feature>TMAP 150/1</Feature>
-        <Feature>TMAP 116/13</Feature>
-        <Feature>TMAP 116/6</Feature>
-        <Feature>TMAP 153/5</Feature>
-        <Feature>TMAP 19/3</Feature>
-        <Feature>TMAP 57/1</Feature>
-        <Feature>TMAP 19/2</Feature>
-        <Feature>TMAP 151/6</Feature>
-        <Feature>TMAP 116/2</Feature>
-        <Feature>TMAP 55/8</Feature>
-        <Feature>TMAP 97/2</Feature>
-        <Feature>TMAP 96/6</Feature>
-        <Feature>TMAP 1/5</Feature>
-        <Feature>TMAP 115/2</Feature>
-        <Feature>TMAP 115/6</Feature>
-        <Feature>TMAP 114/2</Feature>
-        <Feature>TMAP 121/1</Feature>
-        <Feature>TMAP 112/2</Feature>
-        <Feature>TMAP 55/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="PBP">
       <Features>
-        <Feature>PBP 10/1</Feature>
-        <Feature>PBP 8/9</Feature>
-        <Feature>PBP 12/2</Feature>
-        <Feature>PBP 14/11</Feature>
-        <Feature>PBP 6/6</Feature>
-        <Feature>PBP 8/10</Feature>
-        <Feature>PBP 11/2</Feature>
-        <Feature>PBP 13/2</Feature>
-        <Feature>PBP 2/2</Feature>
-        <Feature>PBP 8/8</Feature>
-        <Feature>PBP 6/1</Feature>
-        <Feature>PBP 8/3</Feature>
-        <Feature>PBP 6/8</Feature>
-        <Feature>PBP 6/4</Feature>
-        <Feature>PBP 7/2</Feature>
-        <Feature>PBP 6/7</Feature>
-        <Feature>PBP 7/1</Feature>
-        <Feature>PBP 14/7</Feature>
-        <Feature>PBP 13/4</Feature>
-        <Feature>PBP 14/4</Feature>
-        <Feature>PBP 5/2</Feature>
-        <Feature>PBP 14/9</Feature>
-        <Feature>PBP 13/1</Feature>
-        <Feature>PBP 6/2</Feature>
-        <Feature>PBP 9/1</Feature>
-        <Feature>PBP 3/1</Feature>
-        <Feature>PBP 14/10</Feature>
-        <Feature>PBP 12/1</Feature>
-        <Feature>PBP 1/1</Feature>
-        <Feature>PBP 14/12</Feature>
-        <Feature>PBP 14/5</Feature>
         <Feature>PBP 7/4</Feature>
         <Feature>PBP 8/7</Feature>
         <Feature>PBP 8/6</Feature>
@@ -2704,6 +2694,13 @@
         <Feature>PBP 5/1</Feature>
         <Feature>PBP 8/12</Feature>
         <Feature>PBP 4/1</Feature>
+        <Feature>PBP 8/10</Feature>
+        <Feature>PBP 11/2</Feature>
+        <Feature>PBP 13/2</Feature>
+        <Feature>PBP 2/2</Feature>
+        <Feature>PBP 8/8</Feature>
+        <Feature>PBP 6/1</Feature>
+        <Feature>PBP 8/3</Feature>
         <Feature>PBP 8/5</Feature>
         <Feature>PBP 11/1</Feature>
         <Feature>PBP 8/2</Feature>
@@ -2716,17 +2713,41 @@
         <Feature>PBP 6/3</Feature>
         <Feature>PBP 14/8</Feature>
         <Feature>PBP 1/2</Feature>
+        <Feature>PBP 8/9</Feature>
+        <Feature>PBP 12/2</Feature>
+        <Feature>PBP 14/11</Feature>
+        <Feature>PBP 6/6</Feature>
+        <Feature>PBP 6/8</Feature>
+        <Feature>PBP 6/4</Feature>
+        <Feature>PBP 7/2</Feature>
+        <Feature>PBP 6/7</Feature>
+        <Feature>PBP 7/1</Feature>
+        <Feature>PBP 14/7</Feature>
+        <Feature>PBP 13/4</Feature>
+        <Feature>PBP 14/4</Feature>
+        <Feature>PBP 5/2</Feature>
+        <Feature>PBP 14/9</Feature>
+        <Feature>PBP 13/1</Feature>
+        <Feature>PBP 6/2</Feature>
+        <Feature>PBP 9/1</Feature>
+        <Feature>PBP 3/1</Feature>
+        <Feature>PBP 14/10</Feature>
+        <Feature>PBP 12/1</Feature>
+        <Feature>PBP 1/1</Feature>
+        <Feature>PBP 10/1</Feature>
+        <Feature>PBP 14/12</Feature>
+        <Feature>PBP 14/5</Feature>
       </Features>
     </Layer>
     <Layer Layer="MBT">
       <Features>
-        <Feature>MBT 0/1</Feature>
         <Feature>MBT 10/1</Feature>
         <Feature>MBT 10/2</Feature>
+        <Feature>MBT 3/1</Feature>
         <Feature>MBT 20/1</Feature>
         <Feature>MBT 3/2</Feature>
+        <Feature>MBT 0/1</Feature>
         <Feature>MBT 20/2</Feature>
-        <Feature>MBT 3/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="DFU">
@@ -2737,57 +2758,61 @@
         <Feature>DFU 10/1</Feature>
         <Feature>DFU 3/1</Feature>
         <Feature>DFU 21/1</Feature>
+        <Feature>DFU 22/1</Feature>
         <Feature>DFU 3/3</Feature>
         <Feature>DFU 11/1</Feature>
         <Feature>DFU 0/1</Feature>
         <Feature>DFU 20/1</Feature>
         <Feature>DFU 11/2</Feature>
         <Feature>DFU 21/2</Feature>
-        <Feature>DFU 22/1</Feature>
       </Features>
     </Layer>
     <Layer Layer="GMAP">
       <Features>
-        <Feature>GMAP 102/1</Feature>
-        <Feature>GMAP 77/1</Feature>
-        <Feature>GMAP 20/59</Feature>
-        <Feature>GMAP 40/43</Feature>
-        <Feature>GMAP 20/12</Feature>
-        <Feature>GMAP 104/2</Feature>
-        <Feature>GMAP 36/5</Feature>
-        <Feature>GMAP 14/11</Feature>
-        <Feature>GMAP 40/70</Feature>
-        <Feature>GMAP 104/1</Feature>
-        <Feature>GMAP 20/44</Feature>
-        <Feature>GMAP 34/2</Feature>
-        <Feature>GMAP 38/4</Feature>
-        <Feature>GMAP 40/9</Feature>
-        <Feature>GMAP 40/10</Feature>
-        <Feature>GMAP 20/33</Feature>
-        <Feature>GMAP 20/29</Feature>
-        <Feature>GMAP 79/6</Feature>
-        <Feature>GMAP 40/58</Feature>
-        <Feature>GMAP 36/1</Feature>
-        <Feature>GMAP 16/5</Feature>
-        <Feature>GMAP 14/9</Feature>
-        <Feature>GMAP 20/32</Feature>
-        <Feature>GMAP 34/5</Feature>
-        <Feature>GMAP 90/1</Feature>
-        <Feature>GMAP 32/1</Feature>
-        <Feature>GMAP 105/3</Feature>
-        <Feature>GMAP 103/3</Feature>
-        <Feature>GMAP 100/1</Feature>
-        <Feature>GMAP 20/5</Feature>
-        <Feature>GMAP 93/6</Feature>
-        <Feature>GMAP 40/22</Feature>
-        <Feature>GMAP 1/3</Feature>
-        <Feature>GMAP 77/3</Feature>
-        <Feature>GMAP 70/1</Feature>
-        <Feature>GMAP 20/62</Feature>
-        <Feature>GMAP 20/28</Feature>
-        <Feature>GMAP 56/3</Feature>
-        <Feature>GMAP 54/4</Feature>
-        <Feature>GMAP 78/3</Feature>
+        <Feature>GMAP 20/63</Feature>
+        <Feature>GMAP 20/80</Feature>
+        <Feature>GMAP 16/2</Feature>
+        <Feature>GMAP 40/62</Feature>
+        <Feature>GMAP 40/42</Feature>
+        <Feature>GMAP 20/1</Feature>
+        <Feature>GMAP 35/12</Feature>
+        <Feature>GMAP 14/12</Feature>
+        <Feature>GMAP 37/1</Feature>
+        <Feature>GMAP 40/68</Feature>
+        <Feature>GMAP 40/51</Feature>
+        <Feature>GMAP 102/2</Feature>
+        <Feature>GMAP 59/2</Feature>
+        <Feature>GMAP 1/6</Feature>
+        <Feature>GMAP 18/4</Feature>
+        <Feature>GMAP 1/1</Feature>
+        <Feature>GMAP 40/24</Feature>
+        <Feature>GMAP 18/5</Feature>
+        <Feature>GMAP 40/59</Feature>
+        <Feature>GMAP 59/7</Feature>
+        <Feature>GMAP 20/58</Feature>
+        <Feature>GMAP 17/4</Feature>
+        <Feature>GMAP 72/2</Feature>
+        <Feature>GMAP 102/5</Feature>
+        <Feature>GMAP 40/16</Feature>
+        <Feature>GMAP 57/2</Feature>
+        <Feature>GMAP 40/53</Feature>
+        <Feature>GMAP 40/40</Feature>
+        <Feature>GMAP 20/35</Feature>
+        <Feature>GMAP 20/49</Feature>
+        <Feature>GMAP 32/6</Feature>
+        <Feature>GMAP 20/101</Feature>
+        <Feature>GMAP 40/64</Feature>
+        <Feature>GMAP 40/45</Feature>
+        <Feature>GMAP 20/99</Feature>
+        <Feature>GMAP 108/1</Feature>
+        <Feature>GMAP 36/4</Feature>
+        <Feature>GMAP 2/2</Feature>
+        <Feature>GMAP 40/5</Feature>
+        <Feature>GMAP 20/102</Feature>
+        <Feature>GMAP 59/4</Feature>
+        <Feature>GMAP 20/94</Feature>
+        <Feature>GMAP 20/93</Feature>
+        <Feature>GMAP 59/3</Feature>
         <Feature>GMAP 79/2</Feature>
         <Feature>GMAP 38/5</Feature>
         <Feature>GMAP 58/2</Feature>
@@ -2830,122 +2855,23 @@
         <Feature>GMAP 20/104</Feature>
         <Feature>GMAP 37/3</Feature>
         <Feature>GMAP 40/37</Feature>
-        <Feature>GMAP 20/69</Feature>
-        <Feature>GMAP 40/48</Feature>
-        <Feature>GMAP 40/28</Feature>
-        <Feature>GMAP 20/34</Feature>
-        <Feature>GMAP 20/2</Feature>
-        <Feature>GMAP 20/106</Feature>
-        <Feature>GMAP 35/3</Feature>
-        <Feature>GMAP 20/112</Feature>
-        <Feature>GMAP 20/113</Feature>
-        <Feature>GMAP 79/5</Feature>
-        <Feature>GMAP 52/1</Feature>
-        <Feature>GMAP 102/3</Feature>
-        <Feature>GMAP 20/6</Feature>
-        <Feature>GMAP 22/1</Feature>
-        <Feature>GMAP 16/4</Feature>
-        <Feature>GMAP 20/100</Feature>
-        <Feature>GMAP 50/1</Feature>
-        <Feature>GMAP 40/41</Feature>
-        <Feature>GMAP 20/3</Feature>
-        <Feature>GMAP 20/23</Feature>
-        <Feature>GMAP 17/3</Feature>
-        <Feature>GMAP 20/18</Feature>
-        <Feature>GMAP 79/7</Feature>
-        <Feature>GMAP 35/11</Feature>
-        <Feature>GMAP 20/65</Feature>
-        <Feature>GMAP 75/2</Feature>
-        <Feature>GMAP 38/1</Feature>
-        <Feature>GMAP 94/1</Feature>
-        <Feature>GMAP 92/4</Feature>
-        <Feature>GMAP 40/60</Feature>
-        <Feature>GMAP 105/2</Feature>
-        <Feature>GMAP 103/2</Feature>
-        <Feature>GMAP 17/2</Feature>
-        <Feature>GMAP 20/107</Feature>
-        <Feature>GMAP 20/77</Feature>
-        <Feature>GMAP 74/2</Feature>
-        <Feature>GMAP 20/37</Feature>
-        <Feature>GMAP 18/1</Feature>
-        <Feature>GMAP 79/10</Feature>
-        <Feature>GMAP 20/92</Feature>
-        <Feature>GMAP 20/19</Feature>
-        <Feature>GMAP 20/95</Feature>
-        <Feature>GMAP 40/71</Feature>
-        <Feature>GMAP 40/55</Feature>
-        <Feature>GMAP 20/67</Feature>
-        <Feature>GMAP 32/5</Feature>
-        <Feature>GMAP 20/13</Feature>
-        <Feature>GMAP 42/1</Feature>
-        <Feature>GMAP 62/1</Feature>
-        <Feature>GMAP 32/7</Feature>
-        <Feature>GMAP 74/1</Feature>
-        <Feature>GMAP 20/25</Feature>
-        <Feature>GMAP 77/2</Feature>
-        <Feature>GMAP 20/109</Feature>
-        <Feature>GMAP 20/97</Feature>
-        <Feature>GMAP 35/9</Feature>
-        <Feature>GMAP 40/20</Feature>
-        <Feature>GMAP 40/35</Feature>
-        <Feature>GMAP 40/49</Feature>
-        <Feature>GMAP 40/69</Feature>
-        <Feature>GMAP 39/1</Feature>
-        <Feature>GMAP 20/105</Feature>
-        <Feature>GMAP 40/61</Feature>
-        <Feature>GMAP 54/1</Feature>
-        <Feature>GMAP 82/1</Feature>
-        <Feature>GMAP 20/60</Feature>
-        <Feature>GMAP 40/66</Feature>
-        <Feature>GMAP 20/108</Feature>
-        <Feature>GMAP 57/1</Feature>
-        <Feature>GMAP 20/20</Feature>
-        <Feature>GMAP 81/1</Feature>
-        <Feature>GMAP 12/1</Feature>
-        <Feature>GMAP 17/6</Feature>
-        <Feature>GMAP 20/51</Feature>
-        <Feature>GMAP 40/54</Feature>
-        <Feature>GMAP 79/15</Feature>
-        <Feature>GMAP 73/1</Feature>
-        <Feature>GMAP 36/6</Feature>
-        <Feature>GMAP 92/2</Feature>
-        <Feature>GMAP 20/74</Feature>
-        <Feature>GMAP 34/1</Feature>
-        <Feature>GMAP 79/11</Feature>
-        <Feature>GMAP 17/1</Feature>
-        <Feature>GMAP 20/70</Feature>
-        <Feature>GMAP 40/2</Feature>
-        <Feature>GMAP 20/81</Feature>
-        <Feature>GMAP 55/1</Feature>
-        <Feature>GMAP 19/3</Feature>
-        <Feature>GMAP 40/29</Feature>
-        <Feature>GMAP 40/56</Feature>
-        <Feature>GMAP 79/1</Feature>
-        <Feature>GMAP 32/3</Feature>
-        <Feature>GMAP 20/85</Feature>
-        <Feature>GMAP 107/2</Feature>
-        <Feature>GMAP 57/3</Feature>
-        <Feature>GMAP 40/3</Feature>
-        <Feature>GMAP 20/43</Feature>
-        <Feature>GMAP 92/1</Feature>
-        <Feature>GMAP 20/56</Feature>
-        <Feature>GMAP 56/2</Feature>
-        <Feature>GMAP 41/1</Feature>
-        <Feature>GMAP 38/2</Feature>
-        <Feature>GMAP 79/14</Feature>
-        <Feature>GMAP 20/110</Feature>
-        <Feature>GMAP 40/1</Feature>
-        <Feature>GMAP 14/7</Feature>
-        <Feature>GMAP 40/65</Feature>
-        <Feature>GMAP 59/1</Feature>
-        <Feature>GMAP 40/50</Feature>
-        <Feature>GMAP 40/67</Feature>
-        <Feature>GMAP 20/50</Feature>
-        <Feature>GMAP 40/34</Feature>
-        <Feature>GMAP 40/63</Feature>
-        <Feature>GMAP 38/3</Feature>
-        <Feature>GMAP 33/1</Feature>
-        <Feature>GMAP 20/39</Feature>
+        <Feature>GMAP 20/32</Feature>
+        <Feature>GMAP 34/5</Feature>
+        <Feature>GMAP 90/1</Feature>
+        <Feature>GMAP 32/1</Feature>
+        <Feature>GMAP 105/3</Feature>
+        <Feature>GMAP 103/3</Feature>
+        <Feature>GMAP 100/1</Feature>
+        <Feature>GMAP 20/5</Feature>
+        <Feature>GMAP 93/6</Feature>
+        <Feature>GMAP 40/22</Feature>
+        <Feature>GMAP 1/3</Feature>
+        <Feature>GMAP 77/3</Feature>
+        <Feature>GMAP 70/1</Feature>
+        <Feature>GMAP 20/62</Feature>
+        <Feature>GMAP 20/28</Feature>
+        <Feature>GMAP 56/3</Feature>
+        <Feature>GMAP 54/4</Feature>
         <Feature>GMAP 14/4</Feature>
         <Feature>GMAP 20/82</Feature>
         <Feature>GMAP 20/24</Feature>
@@ -2989,6 +2915,155 @@
         <Feature>GMAP 20/88</Feature>
         <Feature>GMAP 20/22</Feature>
         <Feature>GMAP 76/4</Feature>
+        <Feature>GMAP 32/3</Feature>
+        <Feature>GMAP 20/85</Feature>
+        <Feature>GMAP 107/2</Feature>
+        <Feature>GMAP 57/3</Feature>
+        <Feature>GMAP 40/3</Feature>
+        <Feature>GMAP 20/43</Feature>
+        <Feature>GMAP 92/1</Feature>
+        <Feature>GMAP 20/56</Feature>
+        <Feature>GMAP 56/2</Feature>
+        <Feature>GMAP 41/1</Feature>
+        <Feature>GMAP 38/2</Feature>
+        <Feature>GMAP 79/14</Feature>
+        <Feature>GMAP 20/110</Feature>
+        <Feature>GMAP 40/1</Feature>
+        <Feature>GMAP 14/7</Feature>
+        <Feature>GMAP 40/65</Feature>
+        <Feature>GMAP 59/1</Feature>
+        <Feature>GMAP 40/50</Feature>
+        <Feature>GMAP 40/67</Feature>
+        <Feature>GMAP 20/50</Feature>
+        <Feature>GMAP 40/34</Feature>
+        <Feature>GMAP 40/63</Feature>
+        <Feature>GMAP 38/3</Feature>
+        <Feature>GMAP 33/1</Feature>
+        <Feature>GMAP 20/39</Feature>
+        <Feature>GMAP 40/52</Feature>
+        <Feature>GMAP 20/98</Feature>
+        <Feature>GMAP 16/6</Feature>
+        <Feature>GMAP 19/1</Feature>
+        <Feature>GMAP 105/5</Feature>
+        <Feature>GMAP 18/3</Feature>
+        <Feature>GMAP 20/61</Feature>
+        <Feature>GMAP 12/2</Feature>
+        <Feature>GMAP 40/25</Feature>
+        <Feature>GMAP 93/5</Feature>
+        <Feature>GMAP 77/4</Feature>
+        <Feature>GMAP 35/10</Feature>
+        <Feature>GMAP 40/72</Feature>
+        <Feature>GMAP 20/10</Feature>
+        <Feature>GMAP 13/1</Feature>
+        <Feature>GMAP 20/26</Feature>
+        <Feature>GMAP 93/1</Feature>
+        <Feature>GMAP 35/7</Feature>
+        <Feature>GMAP 102/1</Feature>
+        <Feature>GMAP 77/1</Feature>
+        <Feature>GMAP 20/59</Feature>
+        <Feature>GMAP 40/43</Feature>
+        <Feature>GMAP 20/12</Feature>
+        <Feature>GMAP 104/2</Feature>
+        <Feature>GMAP 36/5</Feature>
+        <Feature>GMAP 14/11</Feature>
+        <Feature>GMAP 40/70</Feature>
+        <Feature>GMAP 104/1</Feature>
+        <Feature>GMAP 20/44</Feature>
+        <Feature>GMAP 34/2</Feature>
+        <Feature>GMAP 38/4</Feature>
+        <Feature>GMAP 40/9</Feature>
+        <Feature>GMAP 78/3</Feature>
+        <Feature>GMAP 20/108</Feature>
+        <Feature>GMAP 57/1</Feature>
+        <Feature>GMAP 20/20</Feature>
+        <Feature>GMAP 81/1</Feature>
+        <Feature>GMAP 12/1</Feature>
+        <Feature>GMAP 17/6</Feature>
+        <Feature>GMAP 20/51</Feature>
+        <Feature>GMAP 40/54</Feature>
+        <Feature>GMAP 79/15</Feature>
+        <Feature>GMAP 73/1</Feature>
+        <Feature>GMAP 36/6</Feature>
+        <Feature>GMAP 92/2</Feature>
+        <Feature>GMAP 20/74</Feature>
+        <Feature>GMAP 34/1</Feature>
+        <Feature>GMAP 79/11</Feature>
+        <Feature>GMAP 17/1</Feature>
+        <Feature>GMAP 20/70</Feature>
+        <Feature>GMAP 40/2</Feature>
+        <Feature>GMAP 20/81</Feature>
+        <Feature>GMAP 55/1</Feature>
+        <Feature>GMAP 19/3</Feature>
+        <Feature>GMAP 40/29</Feature>
+        <Feature>GMAP 40/56</Feature>
+        <Feature>GMAP 79/1</Feature>
+        <Feature>GMAP 59/11</Feature>
+        <Feature>GMAP 20/16</Feature>
+        <Feature>GMAP 20/78</Feature>
+        <Feature>GMAP 35/2</Feature>
+        <Feature>GMAP 34/4</Feature>
+        <Feature>GMAP 20/64</Feature>
+        <Feature>GMAP 20/57</Feature>
+        <Feature>GMAP 20/111</Feature>
+        <Feature>GMAP 59/5</Feature>
+        <Feature>GMAP 38/6</Feature>
+        <Feature>GMAP 105/7</Feature>
+        <Feature>GMAP 20/31</Feature>
+        <Feature>GMAP 20/103</Feature>
+        <Feature>GMAP 14/1</Feature>
+        <Feature>GMAP 59/9</Feature>
+        <Feature>GMAP 14/6</Feature>
+        <Feature>GMAP 12/3</Feature>
+        <Feature>GMAP 35/1</Feature>
+        <Feature>GMAP 79/8</Feature>
+        <Feature>GMAP 20/79</Feature>
+        <Feature>GMAP 20/69</Feature>
+        <Feature>GMAP 40/48</Feature>
+        <Feature>GMAP 40/28</Feature>
+        <Feature>GMAP 40/10</Feature>
+        <Feature>GMAP 20/34</Feature>
+        <Feature>GMAP 20/2</Feature>
+        <Feature>GMAP 20/106</Feature>
+        <Feature>GMAP 35/3</Feature>
+        <Feature>GMAP 20/112</Feature>
+        <Feature>GMAP 20/113</Feature>
+        <Feature>GMAP 79/5</Feature>
+        <Feature>GMAP 52/1</Feature>
+        <Feature>GMAP 102/3</Feature>
+        <Feature>GMAP 20/6</Feature>
+        <Feature>GMAP 22/1</Feature>
+        <Feature>GMAP 16/4</Feature>
+        <Feature>GMAP 20/100</Feature>
+        <Feature>GMAP 50/1</Feature>
+        <Feature>GMAP 40/41</Feature>
+        <Feature>GMAP 20/3</Feature>
+        <Feature>GMAP 20/23</Feature>
+        <Feature>GMAP 17/3</Feature>
+        <Feature>GMAP 20/18</Feature>
+        <Feature>GMAP 79/7</Feature>
+        <Feature>GMAP 35/11</Feature>
+        <Feature>GMAP 20/65</Feature>
+        <Feature>GMAP 75/2</Feature>
+        <Feature>GMAP 38/1</Feature>
+        <Feature>GMAP 94/1</Feature>
+        <Feature>GMAP 92/4</Feature>
+        <Feature>GMAP 40/60</Feature>
+        <Feature>GMAP 105/2</Feature>
+        <Feature>GMAP 103/2</Feature>
+        <Feature>GMAP 17/2</Feature>
+        <Feature>GMAP 20/107</Feature>
+        <Feature>GMAP 20/77</Feature>
+        <Feature>GMAP 74/2</Feature>
+        <Feature>GMAP 20/37</Feature>
+        <Feature>GMAP 18/1</Feature>
+        <Feature>GMAP 79/10</Feature>
+        <Feature>GMAP 20/33</Feature>
+        <Feature>GMAP 20/29</Feature>
+        <Feature>GMAP 79/6</Feature>
+        <Feature>GMAP 40/58</Feature>
+        <Feature>GMAP 36/1</Feature>
+        <Feature>GMAP 16/5</Feature>
+        <Feature>GMAP 14/9</Feature>
         <Feature>GMAP 40/21</Feature>
         <Feature>GMAP 14/3</Feature>
         <Feature>GMAP 93/7</Feature>
@@ -3037,44 +3112,34 @@
         <Feature>GMAP 74/4</Feature>
         <Feature>GMAP 92/3</Feature>
         <Feature>GMAP 20/72</Feature>
-        <Feature>GMAP 40/52</Feature>
-        <Feature>GMAP 20/98</Feature>
-        <Feature>GMAP 16/6</Feature>
-        <Feature>GMAP 19/1</Feature>
-        <Feature>GMAP 105/5</Feature>
-        <Feature>GMAP 18/3</Feature>
-        <Feature>GMAP 20/61</Feature>
-        <Feature>GMAP 12/2</Feature>
-        <Feature>GMAP 40/25</Feature>
-        <Feature>GMAP 93/5</Feature>
-        <Feature>GMAP 77/4</Feature>
-        <Feature>GMAP 35/10</Feature>
-        <Feature>GMAP 40/72</Feature>
-        <Feature>GMAP 20/10</Feature>
-        <Feature>GMAP 13/1</Feature>
-        <Feature>GMAP 20/26</Feature>
-        <Feature>GMAP 93/1</Feature>
-        <Feature>GMAP 35/7</Feature>
-        <Feature>GMAP 59/11</Feature>
-        <Feature>GMAP 20/16</Feature>
-        <Feature>GMAP 20/78</Feature>
-        <Feature>GMAP 35/2</Feature>
-        <Feature>GMAP 34/4</Feature>
-        <Feature>GMAP 20/64</Feature>
-        <Feature>GMAP 20/57</Feature>
-        <Feature>GMAP 20/111</Feature>
-        <Feature>GMAP 59/5</Feature>
-        <Feature>GMAP 38/6</Feature>
-        <Feature>GMAP 105/7</Feature>
-        <Feature>GMAP 20/31</Feature>
-        <Feature>GMAP 20/103</Feature>
-        <Feature>GMAP 14/1</Feature>
-        <Feature>GMAP 59/9</Feature>
-        <Feature>GMAP 14/6</Feature>
-        <Feature>GMAP 12/3</Feature>
-        <Feature>GMAP 35/1</Feature>
-        <Feature>GMAP 79/8</Feature>
-        <Feature>GMAP 20/79</Feature>
+        <Feature>GMAP 20/92</Feature>
+        <Feature>GMAP 20/19</Feature>
+        <Feature>GMAP 20/95</Feature>
+        <Feature>GMAP 40/71</Feature>
+        <Feature>GMAP 40/55</Feature>
+        <Feature>GMAP 20/67</Feature>
+        <Feature>GMAP 32/5</Feature>
+        <Feature>GMAP 20/13</Feature>
+        <Feature>GMAP 42/1</Feature>
+        <Feature>GMAP 62/1</Feature>
+        <Feature>GMAP 32/7</Feature>
+        <Feature>GMAP 74/1</Feature>
+        <Feature>GMAP 20/25</Feature>
+        <Feature>GMAP 77/2</Feature>
+        <Feature>GMAP 20/109</Feature>
+        <Feature>GMAP 20/97</Feature>
+        <Feature>GMAP 35/9</Feature>
+        <Feature>GMAP 40/20</Feature>
+        <Feature>GMAP 40/35</Feature>
+        <Feature>GMAP 40/49</Feature>
+        <Feature>GMAP 40/69</Feature>
+        <Feature>GMAP 39/1</Feature>
+        <Feature>GMAP 20/105</Feature>
+        <Feature>GMAP 40/61</Feature>
+        <Feature>GMAP 54/1</Feature>
+        <Feature>GMAP 82/1</Feature>
+        <Feature>GMAP 20/60</Feature>
+        <Feature>GMAP 40/66</Feature>
         <Feature>GMAP 40/31</Feature>
         <Feature>GMAP 20/87</Feature>
         <Feature>GMAP 16/1</Feature>
@@ -3093,75 +3158,31 @@
         <Feature>GMAP 104/3</Feature>
         <Feature>GMAP 20/83</Feature>
         <Feature>GMAP 17/5</Feature>
-        <Feature>GMAP 20/63</Feature>
-        <Feature>GMAP 20/80</Feature>
-        <Feature>GMAP 16/2</Feature>
-        <Feature>GMAP 40/62</Feature>
-        <Feature>GMAP 40/42</Feature>
-        <Feature>GMAP 20/1</Feature>
-        <Feature>GMAP 35/12</Feature>
-        <Feature>GMAP 14/12</Feature>
-        <Feature>GMAP 37/1</Feature>
-        <Feature>GMAP 40/68</Feature>
-        <Feature>GMAP 40/51</Feature>
-        <Feature>GMAP 102/2</Feature>
-        <Feature>GMAP 59/2</Feature>
-        <Feature>GMAP 1/6</Feature>
-        <Feature>GMAP 18/4</Feature>
-        <Feature>GMAP 1/1</Feature>
-        <Feature>GMAP 40/24</Feature>
-        <Feature>GMAP 18/5</Feature>
-        <Feature>GMAP 40/59</Feature>
-        <Feature>GMAP 59/7</Feature>
-        <Feature>GMAP 20/58</Feature>
-        <Feature>GMAP 17/4</Feature>
-        <Feature>GMAP 72/2</Feature>
-        <Feature>GMAP 102/5</Feature>
-        <Feature>GMAP 40/16</Feature>
-        <Feature>GMAP 57/2</Feature>
-        <Feature>GMAP 40/53</Feature>
-        <Feature>GMAP 40/40</Feature>
-        <Feature>GMAP 20/35</Feature>
-        <Feature>GMAP 20/49</Feature>
-        <Feature>GMAP 32/6</Feature>
-        <Feature>GMAP 20/101</Feature>
-        <Feature>GMAP 40/64</Feature>
-        <Feature>GMAP 40/45</Feature>
-        <Feature>GMAP 20/99</Feature>
-        <Feature>GMAP 108/1</Feature>
-        <Feature>GMAP 36/4</Feature>
-        <Feature>GMAP 2/2</Feature>
-        <Feature>GMAP 40/5</Feature>
-        <Feature>GMAP 20/102</Feature>
-        <Feature>GMAP 59/4</Feature>
-        <Feature>GMAP 20/94</Feature>
-        <Feature>GMAP 20/93</Feature>
-        <Feature>GMAP 59/3</Feature>
       </Features>
     </Layer>
     <Layer Layer="CORE">
       <Features>
-        <Feature>CORE 11/2</Feature>
-        <Feature>CORE 11/1</Feature>
-        <Feature>CORE 2a/60</Feature>
-        <Feature>CORE 12/1</Feature>
-        <Feature>CORE 2a/53</Feature>
-        <Feature>CORE 31/2</Feature>
         <Feature>CORE 11/6</Feature>
         <Feature>CORE 20a/1</Feature>
         <Feature>CORE 2b/60</Feature>
         <Feature>CORE 20/4</Feature>
         <Feature>CORE 2a/50</Feature>
+        <Feature>CORE 12/3</Feature>
         <Feature>CORE 2/60</Feature>
         <Feature>CORE 2/1</Feature>
-        <Feature>CORE 12/3</Feature>
+        <Feature>CORE 40/2</Feature>
+        <Feature>CORE 11/3</Feature>
+        <Feature>CORE 11/2</Feature>
+        <Feature>CORE 11/1</Feature>
+        <Feature>CORE 2a/60</Feature>
+        <Feature>CORE 12/1</Feature>
+        <Feature>CORE 2a/53</Feature>
+        <Feature>CORE 31/2</Feature>
         <Feature>CORE 2a/54</Feature>
         <Feature>CORE 2a/51</Feature>
         <Feature>CORE 41/2</Feature>
         <Feature>CORE 11/5</Feature>
         <Feature>CORE 2a/52</Feature>
-        <Feature>CORE 40/2</Feature>
-        <Feature>CORE 11/3</Feature>
       </Features>
     </Layer>
     <Layer Layer="UHCI">
@@ -3169,5 +3190,30 @@
         <Feature>UHCI 0/60</Feature>
       </Features>
     </Layer>
+    <Layer Layer="IOPT">
+      <Features>
+        <Feature>IOPT 2/45b</Feature>
+        <Feature>IOPT 2/42b</Feature>
+        <Feature>IOPT 2/12b</Feature>
+        <Feature>IOPT 2/63b</Feature>
+        <Feature>IOPT 2/19b</Feature>
+        <Feature>IOPT 2/28b</Feature>
+        <Feature>IOPT 2/16b</Feature>
+        <Feature>IOPT 2/33b</Feature>
+        <Feature>IOPT 2/30b</Feature>
+        <Feature>IOPT 2/55b</Feature>
+        <Feature>IOPT 2/2b</Feature>
+        <Feature>IOPT 2/6b</Feature>
+        <Feature>IOPT 2a/2</Feature>
+        <Feature>IOPT 2/29b</Feature>
+        <Feature>IOPT 2/44b</Feature>
+        <Feature>IOPT 2/35b</Feature>
+        <Feature>IOPT 2/58b</Feature>
+        <Feature>IOPT 2/7b</Feature>
+        <Feature>IOPT 2/59b</Feature>
+        <Feature>IOPT 2/5b</Feature>
+        <Feature>IOPT 2/53b</Feature>
+      </Features>
+    </Layer>
   </Layers>
-</Qualification>
+</Qualification>
\ No newline at end of file
diff --git a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts
index fc1a5cfa981e4..6752f19cfc4d5 100644
--- a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts
+++ b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
-  <qdid>332723</qdid>
+  <qdid>347313</qdid>
   <name>Zephyr Host</name>
   <pics>
     <profile>
@@ -1301,17 +1301,6 @@
         <row>48</row>
       </item>
     </profile>
-    <profile>
-      <name>IOP</name>
-      <item>
-        <table>1</table>
-        <row>1</row>
-      </item>
-      <item>
-        <table>2</table>
-        <row>2</row>
-      </item>
-    </profile>
     <profile>
       <name>GATT</name>
       <item>
@@ -3195,6 +3184,10 @@
         <table>3</table>
         <row>2</row>
       </item>
+      <item>
+        <table>0a</table>
+        <row>1</row>
+      </item>
       <item>
         <table>4</table>
         <row>3</row>
@@ -3258,6 +3251,10 @@
         <table>1</table>
         <row>2</row>
       </item>
+      <item>
+        <table>0a</table>
+        <row>1</row>
+      </item>
       <item>
         <table>2</table>
         <row>4</row>
@@ -3329,6 +3326,10 @@
         <table>4</table>
         <row>4</row>
       </item>
+      <item>
+        <table>0a</table>
+        <row>1</row>
+      </item>
       <item>
         <table>0</table>
         <row>1</row>
@@ -4197,6 +4198,10 @@
         <table>23</table>
         <row>3</row>
       </item>
+      <item>
+        <table>20a</table>
+        <row>1</row>
+      </item>
       <item>
         <table>22</table>
         <row>4</row>
@@ -5313,6 +5318,10 @@
         <table>2</table>
         <row>2</row>
       </item>
+      <item>
+        <table>5</table>
+        <row>1</row>
+      </item>
       <item>
         <table>2</table>
         <row>4</row>
@@ -5500,6 +5509,10 @@
         <table>10</table>
         <row>1</row>
       </item>
+      <item>
+        <table>13</table>
+        <row>12</row>
+      </item>
       <item>
         <table>1</table>
         <row>2</row>
@@ -5810,6 +5823,10 @@
         <table>0</table>
         <row>1</row>
       </item>
+      <item>
+        <table>1</table>
+        <row>1</row>
+      </item>
       <item>
         <table>9</table>
         <row>4</row>
@@ -5853,6 +5870,10 @@
         <table>4</table>
         <row>2</row>
       </item>
+      <item>
+        <table>3</table>
+        <row>2a</row>
+      </item>
       <item>
         <table>0</table>
         <row>1</row>
@@ -5905,6 +5926,10 @@
         <table>3</table>
         <row>2</row>
       </item>
+      <item>
+        <table>1</table>
+        <row>1</row>
+      </item>
       <item>
         <table>4</table>
         <row>3</row>
@@ -6996,10 +7021,6 @@
         <table>92</table>
         <row>3</row>
       </item>
-      <item>
-        <table>27</table>
-        <row>4</row>
-      </item>
       <item>
         <table>54</table>
         <row>3</row>
@@ -7148,10 +7169,6 @@
         <table>59</table>
         <row>8</row>
       </item>
-      <item>
-        <table>5</table>
-        <row>3</row>
-      </item>
       <item>
         <table>39</table>
         <row>5</row>
@@ -8798,6 +8815,14 @@
         <table>8</table>
         <row>2</row>
       </item>
+      <item>
+        <table>5</table>
+        <row>1</row>
+      </item>
+      <item>
+        <table>25</table>
+        <row>1</row>
+      </item>
       <item>
         <table>31</table>
         <row>1</row>
@@ -8906,6 +8931,10 @@
         <table>31</table>
         <row>2</row>
       </item>
+      <item>
+        <table>15</table>
+        <row>1</row>
+      </item>
       <item>
         <table>6</table>
         <row>5</row>
@@ -8946,10 +8975,6 @@
         <table>8</table>
         <row>4</row>
       </item>
-      <item>
-        <table>20</table>
-        <row>9</row>
-      </item>
       <item>
         <table>22</table>
         <row>6</row>
@@ -9109,6 +9134,10 @@
         <table>5</table>
         <row>5</row>
       </item>
+      <item>
+        <table>1</table>
+        <row>1</row>
+      </item>
       <item>
         <table>3</table>
         <row>6</row>
@@ -9240,6 +9269,10 @@
         <table>13</table>
         <row>2</row>
       </item>
+      <item>
+        <table>91</table>
+        <row>1</row>
+      </item>
       <item>
         <table>13</table>
         <row>1</row>
@@ -9308,6 +9341,10 @@
         <table>24</table>
         <row>6</row>
       </item>
+      <item>
+        <table>11</table>
+        <row>1</row>
+      </item>
       <item>
         <table>14</table>
         <row>1</row>
@@ -9336,6 +9373,10 @@
         <table>2</table>
         <row>2</row>
       </item>
+      <item>
+        <table>41</table>
+        <row>1</row>
+      </item>
       <item>
         <table>46</table>
         <row>1</row>
@@ -9439,6 +9480,10 @@
         <table>116</table>
         <row>4</row>
       </item>
+      <item>
+        <table>54</table>
+        <row>5</row>
+      </item>
       <item>
         <table>116</table>
         <row>5</row>
@@ -9471,6 +9516,10 @@
         <table>118</table>
         <row>2</row>
       </item>
+      <item>
+        <table>114</table>
+        <row>5</row>
+      </item>
       <item>
         <table>76</table>
         <row>5</row>
@@ -9651,6 +9700,10 @@
         <table>151</table>
         <row>6</row>
       </item>
+      <item>
+        <table>91</table>
+        <row>1</row>
+      </item>
       <item>
         <table>56</table>
         <row>6</row>
@@ -9719,6 +9772,10 @@
         <table>75</table>
         <row>1</row>
       </item>
+      <item>
+        <table>94</table>
+        <row>6</row>
+      </item>
       <item>
         <table>114</table>
         <row>1</row>
@@ -9727,6 +9784,10 @@
         <table>55</table>
         <row>8</row>
       </item>
+      <item>
+        <table>71</table>
+        <row>1</row>
+      </item>
       <item>
         <table>14</table>
         <row>1</row>
@@ -9739,6 +9800,10 @@
         <table>56</table>
         <row>3</row>
       </item>
+      <item>
+        <table>14</table>
+        <row>8</row>
+      </item>
       <item>
         <table>75</table>
         <row>4</row>
@@ -9819,6 +9884,10 @@
         <table>53</table>
         <row>1</row>
       </item>
+      <item>
+        <table>74</table>
+        <row>7</row>
+      </item>
       <item>
         <table>117</table>
         <row>1</row>
@@ -9851,6 +9920,10 @@
         <table>120</table>
         <row>1</row>
       </item>
+      <item>
+        <table>51</table>
+        <row>1</row>
+      </item>
       <item>
         <table>152</table>
         <row>1</row>
@@ -9879,6 +9952,10 @@
         <table>96</table>
         <row>1</row>
       </item>
+      <item>
+        <table>11</table>
+        <row>1</row>
+      </item>
       <item>
         <table>96</table>
         <row>3</row>
@@ -10063,6 +10140,10 @@
         <table>96</table>
         <row>11</row>
       </item>
+      <item>
+        <table>74</table>
+        <row>8</row>
+      </item>
       <item>
         <table>100</table>
         <row>1</row>
@@ -10099,6 +10180,10 @@
         <table>74</table>
         <row>4</row>
       </item>
+      <item>
+        <table>2</table>
+        <row>2a</row>
+      </item>
       <item>
         <table>119</table>
         <row>2</row>
@@ -10175,6 +10260,10 @@
         <table>74</table>
         <row>6</row>
       </item>
+      <item>
+        <table>111</table>
+        <row>1</row>
+      </item>
       <item>
         <table>14</table>
         <row>4</row>
@@ -10326,6 +10415,10 @@
         <table>6</table>
         <row>3</row>
       </item>
+      <item>
+        <table>10</table>
+        <row>1</row>
+      </item>
       <item>
         <table>6</table>
         <row>1</row>
@@ -12130,5 +12223,92 @@
         <row>60</row>
       </item>
     </profile>
+    <profile>
+      <name>IOPT</name>
+      <item>
+        <table>2</table>
+        <row>16b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>30b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>2b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>7b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>55b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>45b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>59b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>5b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>6b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>42b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>53b</row>
+      </item>
+      <item>
+        <table>2a</table>
+        <row>2</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>29b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>63b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>19b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>12b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>33b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>28b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>58b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>44b</row>
+      </item>
+      <item>
+        <table>2</table>
+        <row>35b</row>
+      </item>
+    </profile>
   </pics>
 </project>
diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf
index f3db71ce56e5a..e73d21ea1da19 100644
--- a/tests/bluetooth/shell/audio.conf
+++ b/tests/bluetooth/shell/audio.conf
@@ -17,7 +17,6 @@ CONFIG_BT_ISO_SYNC_RECEIVER=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PRIVACY=y
 CONFIG_BT_GATT_CLIENT=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
 CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
@@ -41,7 +40,6 @@ CONFIG_BT_KEYS_OVERWRITE_OLDEST=y
 CONFIG_BT_L2CAP_TX_MTU=128
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
-
 CONFIG_BT_SETTINGS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
@@ -54,6 +52,13 @@ CONFIG_BT_AUTO_DATA_LEN_UPDATE=y
 CONFIG_BT_USER_PHY_UPDATE=y
 CONFIG_BT_AUTO_PHY_UPDATE=y
 
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
+
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER=y
 
@@ -112,6 +117,8 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1
 
 # Coordinated Set Identification
 CONFIG_BT_CSIP_SET_MEMBER=y
+CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE=y
+CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE=y
 CONFIG_BT_CSIP_SET_COORDINATOR=y
 CONFIG_BT_CSIP_SET_COORDINATOR_MAX_CSIS_INSTANCES=2
 
diff --git a/tests/bluetooth/shell/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/bluetooth/shell/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
new file mode 100644
index 0000000000000..c214409ea689b
--- /dev/null
+++ b/tests/bluetooth/shell/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
@@ -0,0 +1,30 @@
+#select NXP NW612 Chipset
+CONFIG_BT_NXP_NW612=y
+#Enable entropy generator
+CONFIG_ENTROPY_GENERATOR=y
+
+CONFIG_BT_HFP_HF_CODEC_NEG=y
+CONFIG_BT_HFP_AG_CODEC_NEG=y
+
+CONFIG_BT_HFP_HF_ECNR=y
+CONFIG_BT_HFP_AG_ECNR=y
+
+CONFIG_BT_HFP_HF_3WAY_CALL=y
+CONFIG_BT_HFP_AG_3WAY_CALL=y
+
+CONFIG_BT_HFP_HF_VOICE_RECG_TEXT=y
+CONFIG_BT_HFP_AG_VOICE_RECG_TEXT=y
+
+CONFIG_BT_HFP_AG_VOICE_TAG=y
+
+CONFIG_BT_HFP_HF_HF_INDICATOR_ENH_SAFETY=y
+CONFIG_BT_HFP_HF_HF_INDICATOR_BATTERY=y
+
+CONFIG_BT_HFP_AG_HF_INDICATOR_ENH_SAFETY=y
+CONFIG_BT_HFP_AG_HF_INDICATOR_BATTERY=y
+
+CONFIG_BT_SETTINGS=n
+CONFIG_FLASH=n
+CONFIG_FLASH_MAP=n
+CONFIG_NVS=n
+CONFIG_SETTINGS=n
diff --git a/tests/bluetooth/shell/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/bluetooth/shell/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
new file mode 100644
index 0000000000000..0198087c363d5
--- /dev/null
+++ b/tests/bluetooth/shell/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,sram = &dtcm;
+		zephyr,shell-uart = &lpuart1;
+	};
+};
diff --git a/tests/bluetooth/shell/prj_br.conf b/tests/bluetooth/shell/prj_br.conf
index 45d3806473fff..427fc3ec158d7 100644
--- a/tests/bluetooth/shell/prj_br.conf
+++ b/tests/bluetooth/shell/prj_br.conf
@@ -17,3 +17,13 @@ CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_HRS=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_DEVICE_NAME="test shell"
+CONFIG_BT_L2CAP_RET=y
+CONFIG_BT_L2CAP_FC=y
+CONFIG_BT_L2CAP_ENH_RET=y
+CONFIG_BT_L2CAP_STREAM=y
+CONFIG_BT_L2CAP_FCS=y
+CONFIG_BT_L2CAP_EXT_WIN_SIZE=y
+CONFIG_BT_L2CAP_MAX_WINDOW_SIZE=5
+
+CONFIG_BT_HFP_HF=y
+CONFIG_BT_HFP_AG=y
diff --git a/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.conf b/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.conf
index 9d3dedf1f703e..1598132000d4b 100644
--- a/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.conf
+++ b/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.conf
@@ -1,5 +1,4 @@
-CONFIG_NATIVE_UART_0_ON_OWN_PTY=y
-CONFIG_UART_NATIVE_WAIT_PTS_READY_ENABLE=y
+CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
 CONFIG_SHELL_CMD_BUFF_SIZE=8192
 CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=8192
 CONFIG_LOG_PRINTK=n
diff --git a/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.overlay b/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.overlay
index 2cb696aea3ef8..db86ee4eb9a2e 100644
--- a/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.overlay
+++ b/tests/bluetooth/shell/snippets/xterm-native-shell/xterm-native-shell.overlay
@@ -10,7 +10,7 @@
 
 &uart1 {
 	status = "okay";
-	compatible = "zephyr,native-posix-uart";
+	compatible = "zephyr,native-pty-uart";
 	/delete-property/ pinctrl-0;
 	/delete-property/ pinctrl-1;
 	/delete-property/ pinctrl-names;
@@ -23,7 +23,7 @@
 
 &uart0 {
 	status = "okay";
-	compatible = "zephyr,native-posix-uart";
+	compatible = "zephyr,native-pty-uart";
 	/delete-property/ pinctrl-0;
 	/delete-property/ pinctrl-1;
 	/delete-property/ pinctrl-names;
diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
index 2d45c4a18a875..812aee24eeb3e 100644
--- a/tests/bluetooth/shell/testcase.yaml
+++ b/tests/bluetooth/shell/testcase.yaml
@@ -7,7 +7,7 @@ common:
 tests:
   bluetooth.shell.main:
     extra_configs:
-      - CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+      - CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
     platform_allow:
       - qemu_x86
       - native_sim
@@ -55,7 +55,7 @@ tests:
     min_flash: 350
   bluetooth.shell.shell_br:
     extra_configs:
-      - CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+      - CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
     extra_args: CONF_FILE="prj_br.conf"
     platform_allow:
       - qemu_cortex_m3
diff --git a/tests/bluetooth/smp/testcase.yaml b/tests/bluetooth/smp/testcase.yaml
index d55503ba615a3..003f42178595a 100644
--- a/tests/bluetooth/smp/testcase.yaml
+++ b/tests/bluetooth/smp/testcase.yaml
@@ -3,8 +3,6 @@ tests:
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE="test.overlay"
     platform_allow:
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
       - qemu_x86
diff --git a/tests/bluetooth/tester/Kconfig.sysbuild b/tests/bluetooth/tester/Kconfig.sysbuild
index 5256fa48d8823..69e4d5a97fbef 100644
--- a/tests/bluetooth/tester/Kconfig.sysbuild
+++ b/tests/bluetooth/tester/Kconfig.sysbuild
@@ -7,6 +7,7 @@ config NET_CORE_BOARD
 	string
 	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
 	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
 
 config NET_CORE_IMAGE_HCI_IPC
 	bool "HCI IPC image on network core"
diff --git a/tests/bluetooth/tester/boards/native_sim.conf b/tests/bluetooth/tester/boards/native_sim.conf
index 30abfdbc3d9f1..9781be36b6917 100644
--- a/tests/bluetooth/tester/boards/native_sim.conf
+++ b/tests/bluetooth/tester/boards/native_sim.conf
@@ -1,3 +1,3 @@
 CONFIG_UART_PIPE=n
 CONFIG_SERIAL=y
-CONFIG_UART_NATIVE_POSIX=y
+CONFIG_UART_NATIVE_PTY=y
diff --git a/tests/bluetooth/tester/boards/nrf52_bsim.conf b/tests/bluetooth/tester/boards/nrf52_bsim.conf
new file mode 100644
index 0000000000000..b2e5b8763c871
--- /dev/null
+++ b/tests/bluetooth/tester/boards/nrf52_bsim.conf
@@ -0,0 +1,15 @@
+# CONFIG_TEST enforces minimal logging, which we don't want
+CONFIG_TEST=n
+
+CONFIG_ASSERT=y
+CONFIG_THREAD_NAME=y
+
+CONFIG_LOG=y
+CONFIG_LOG_BACKEND_SHOW_COLOR=y
+CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
+CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
+
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_BTTESTER_LOG_LEVEL_DBG=y
+
+CONFIG_UART_PIPE=n
diff --git a/tests/bluetooth/tester/boards/nrf52_bsim.overlay b/tests/bluetooth/tester/boards/nrf52_bsim.overlay
new file mode 100644
index 0000000000000..e7c4c36ff5b56
--- /dev/null
+++ b/tests/bluetooth/tester/boards/nrf52_bsim.overlay
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&uart0 {
+	hw-flow-control;
+};
diff --git a/tests/bluetooth/tester/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/bluetooth/tester/boards/nrf5340bsim_nrf5340_cpuapp.conf
new file mode 100644
index 0000000000000..4acb10d28549c
--- /dev/null
+++ b/tests/bluetooth/tester/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -0,0 +1,18 @@
+# CONFIG_TEST enforces minimal logging, which we don't want
+CONFIG_TEST=n
+
+CONFIG_ASSERT=y
+CONFIG_THREAD_NAME=y
+
+CONFIG_LOG=y
+CONFIG_LOG_BACKEND_SHOW_COLOR=y
+CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
+CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
+
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_BTTESTER_LOG_LEVEL_DBG=y
+
+CONFIG_UART_PIPE=n
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+CONFIG_SERIAL=y
diff --git a/tests/bluetooth/tester/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/bluetooth/tester/boards/nrf5340bsim_nrf5340_cpuapp.overlay
new file mode 100644
index 0000000000000..d43a9a1673975
--- /dev/null
+++ b/tests/bluetooth/tester/boards/nrf5340bsim_nrf5340_cpuapp.overlay
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	hw-flow-control;
+};
diff --git a/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
index 5bb1c4d82846e..b6a71cd1e6d24 100644
--- a/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
+++ b/tests/bluetooth/tester/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -22,3 +22,5 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_BTTESTER_LOG_LEVEL_DBG=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
+
+CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE=3072
diff --git a/tests/bluetooth/tester/boards/ophelia4ev_nrf54l15_cpuapp.conf b/tests/bluetooth/tester/boards/ophelia4ev_nrf54l15_cpuapp.conf
new file mode 100644
index 0000000000000..b6a71cd1e6d24
--- /dev/null
+++ b/tests/bluetooth/tester/boards/ophelia4ev_nrf54l15_cpuapp.conf
@@ -0,0 +1,26 @@
+# CONFIG_TEST enforces minimal logging, which we don't want
+CONFIG_TEST=n
+
+CONFIG_ASSERT=y
+# Enable the option below to measure stack usage
+#CONFIG_INIT_STACKS=y
+CONFIG_THREAD_NAME=y
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_LOG=y
+CONFIG_LOG_BUFFER_SIZE=4096
+CONFIG_RTT_CONSOLE=y
+CONFIG_LOG_BACKEND_RTT=y
+CONFIG_LOG_BACKEND_RTT_MODE_DROP=y
+CONFIG_LOG_BACKEND_RTT_MESSAGE_SIZE=256
+CONFIG_USE_SEGGER_RTT=y
+CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
+CONFIG_LOG_BACKEND_SHOW_COLOR=n
+CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
+
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_BTTESTER_LOG_LEVEL_DBG=y
+
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE=3072
diff --git a/tests/bluetooth/tester/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/bluetooth/tester/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..979fa6cc5df38
--- /dev/null
+++ b/tests/bluetooth/tester/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+/ {
+	chosen {
+		zephyr,uart-pipe = &uart20;
+	};
+};
+
+&uart20 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <115200>;
+	status = "okay";
+	hw-flow-control;
+};
diff --git a/tests/bluetooth/tester/boards/panb511evb_nrf54l15_cpuapp.conf b/tests/bluetooth/tester/boards/panb511evb_nrf54l15_cpuapp.conf
new file mode 100644
index 0000000000000..5bb1c4d82846e
--- /dev/null
+++ b/tests/bluetooth/tester/boards/panb511evb_nrf54l15_cpuapp.conf
@@ -0,0 +1,24 @@
+# CONFIG_TEST enforces minimal logging, which we don't want
+CONFIG_TEST=n
+
+CONFIG_ASSERT=y
+# Enable the option below to measure stack usage
+#CONFIG_INIT_STACKS=y
+CONFIG_THREAD_NAME=y
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_LOG=y
+CONFIG_LOG_BUFFER_SIZE=4096
+CONFIG_RTT_CONSOLE=y
+CONFIG_LOG_BACKEND_RTT=y
+CONFIG_LOG_BACKEND_RTT_MODE_DROP=y
+CONFIG_LOG_BACKEND_RTT_MESSAGE_SIZE=256
+CONFIG_USE_SEGGER_RTT=y
+CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
+CONFIG_LOG_BACKEND_SHOW_COLOR=n
+CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
+
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_BTTESTER_LOG_LEVEL_DBG=y
+
+CONFIG_UART_INTERRUPT_DRIVEN=y
diff --git a/tests/bluetooth/tester/boards/panb511evb_nrf54l15_cpuapp.overlay b/tests/bluetooth/tester/boards/panb511evb_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..a179dd8306fec
--- /dev/null
+++ b/tests/bluetooth/tester/boards/panb511evb_nrf54l15_cpuapp.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Panasonic Industrial Devices Europe GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,uart-pipe = &uart30;
+	};
+};
+
+&uart30 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <115200>;
+	status = "okay";
+	hw-flow-control;
+};
diff --git a/tests/bluetooth/tester/hci_ipc_cpunet.conf b/tests/bluetooth/tester/hci_ipc_cpunet.conf
index 58876f4c0025c..e14b9815424c4 100644
--- a/tests/bluetooth/tester/hci_ipc_cpunet.conf
+++ b/tests/bluetooth/tester/hci_ipc_cpunet.conf
@@ -6,3 +6,12 @@ CONFIG_BT_MAX_CONN=3
 # PTS tests specific tweaks
 CONFIG_BT_CTLR_PERIPHERAL_ISO_EARLY_CIG_START=y
 CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
+
+CONFIG_BT_ISO_MAX_BIG=2
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+
+CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
+CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
+
+CONFIG_BT_CTLR_ISOAL_SOURCES=4
+CONFIG_BT_CTLR_ISO_TX_BUFFERS=8
diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf
index e9f47c83b7f8f..4b18c651be275 100644
--- a/tests/bluetooth/tester/overlay-le-audio.conf
+++ b/tests/bluetooth/tester/overlay-le-audio.conf
@@ -1,8 +1,13 @@
 CONFIG_BT_AUDIO=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_GATT_CLIENT=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
 CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
@@ -12,6 +17,7 @@ CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_PER_ADV_SYNC=y
 CONFIG_BT_ISO_SYNC_RECEIVER=y
 CONFIG_BT_EXT_ADV=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_BAP_UNICAST_CLIENT=y
 CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT=2
@@ -49,10 +55,12 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1
 
 # Broadcast Source
 CONFIG_BT_BAP_BROADCAST_SOURCE=y
+CONFIG_BT_BAP_BROADCAST_SRC_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=2
 CONFIG_BT_ISO_TX_BUF_COUNT=4
 CONFIG_BT_BAP_BROADCAST_ASSISTANT=y
+CONFIG_BT_ISO_MAX_BIG=2
 
 # Broadcast Sink
 CONFIG_BT_BAP_SCAN_DELEGATOR=y
diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index 1377d93639a1e..04e6c074e2145 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -2,7 +2,6 @@
 # PSA key slots; in order to make sure there is always
 # enough key slots allocating 32 slots.
 CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
-CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE=3072
 
 CONFIG_BT_MESH=y
 CONFIG_BT_MESH_RELAY=y
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_bap.h b/tests/bluetooth/tester/src/audio/btp/btp_bap.h
index 002ef1d5d65e0..a11299f32e541 100644
--- a/tests/bluetooth/tester/src/audio/btp/btp_bap.h
+++ b/tests/bluetooth/tester/src/audio/btp/btp_bap.h
@@ -176,6 +176,27 @@ struct btp_bap_send_past_cmd {
 	uint8_t src_id;
 } __packed;
 
+#define BTP_BAP_BROADCAST_SOURCE_SETUP_V2	0x19
+struct btp_bap_broadcast_source_setup_v2_cmd {
+	uint8_t broadcast_id[BT_AUDIO_BROADCAST_ID_SIZE];
+	uint8_t streams_per_subgroup;
+	uint8_t subgroups;
+	uint8_t sdu_interval[3];
+	uint8_t framing;
+	uint16_t max_sdu;
+	uint8_t retransmission_num;
+	uint16_t max_transport_latency;
+	uint8_t presentation_delay[3];
+	uint8_t coding_format;
+	uint16_t vid;
+	uint16_t cid;
+	uint8_t cc_ltvs_len;
+	uint8_t cc_ltvs[];
+} __packed;
+struct btp_bap_broadcast_source_setup_v2_rp {
+	uint32_t gap_settings;
+} __packed;
+
 /* BAP events */
 #define BTP_BAP_EV_DISCOVERY_COMPLETED		0x80
 struct btp_bap_discovery_completed_ev {
@@ -195,7 +216,7 @@ struct btp_bap_codec_cap_found_ev {
 } __packed;
 
 #define BTP_BAP_EV_ASE_FOUND			0x82
-struct btp_ascs_ase_found_ev {
+struct btp_bap_ase_found_ev {
 	bt_addr_le_t address;
 	uint8_t dir;
 	uint8_t ase_id;
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_pbp.h b/tests/bluetooth/tester/src/audio/btp/btp_pbp.h
index 614d25e829665..ccb0e866efa87 100644
--- a/tests/bluetooth/tester/src/audio/btp/btp_pbp.h
+++ b/tests/bluetooth/tester/src/audio/btp/btp_pbp.h
@@ -34,8 +34,8 @@ struct btp_pbp_broadcast_scan_start_cmd {
 struct btp_pbp_broadcast_scan_stop_cmd {
 } __packed;
 
-#define BTP_PBP_EV_PUBLIC_BROADCAST_ANOUNCEMENT_FOUND 0x80
-struct btp_pbp_ev_public_broadcast_anouncement_found_rp {
+#define BTP_PBP_EV_PUBLIC_BROADCAST_ANNOUNCEMENT_FOUND 0x80
+struct btp_pbp_ev_public_broadcast_announcement_found_ev {
 	bt_addr_le_t address;
 	uint8_t broadcast_id[BT_AUDIO_BROADCAST_ID_SIZE];
 	uint8_t advertiser_sid;
diff --git a/tests/bluetooth/tester/src/audio/btp_aics.c b/tests/bluetooth/tester/src/audio/btp_aics.c
index e3a1ad106df33..a2834399f155f 100644
--- a/tests/bluetooth/tester/src/audio/btp_aics.c
+++ b/tests/bluetooth/tester/src/audio/btp_aics.c
@@ -39,28 +39,8 @@ static uint8_t aics_supported_commands(const void *cmd, uint16_t cmd_len, void *
 {
 	struct btp_aics_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_AICS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_AICS_SET_GAIN);
-	tester_set_bit(rp->data, BTP_AICS_MUTE);
-	tester_set_bit(rp->data, BTP_AICS_UNMUTE);
-	tester_set_bit(rp->data, BTP_AICS_MAN_GAIN_SET);
-	tester_set_bit(rp->data, BTP_AICS_AUTO_GAIN_SET);
-	tester_set_bit(rp->data, BTP_AICS_SET_MAN_GAIN_ONLY);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_AICS_SET_AUTO_GAIN_ONLY);
-	tester_set_bit(rp->data, BTP_AICS_AUDIO_DESCRIPTION_SET);
-	tester_set_bit(rp->data, BTP_AICS_MUTE_DISABLE);
-	tester_set_bit(rp->data, BTP_AICS_GAIN_SETTING_PROP_GET);
-	tester_set_bit(rp->data, BTP_AICS_TYPE_GET);
-	tester_set_bit(rp->data, BTP_AICS_STATUS_GET);
-	tester_set_bit(rp->data, BTP_AICS_STATE_GET);
-
-	/* octet 2 */
-	tester_set_bit(rp->data, BTP_AICS_DESCRIPTION_GET);
-
-	*rsp_len = sizeof(*rp) + 2;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_AICS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_bap.c b/tests/bluetooth/tester/src/audio/btp_bap.c
index 1ad1e427d0e88..53043abf6ece8 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap.c
@@ -65,10 +65,8 @@ static uint8_t btp_ascs_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_ascs_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_ASCS_READ_SUPPORTED_COMMANDS);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_ASCS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -196,14 +194,8 @@ static uint8_t pacs_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_pacs_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_PACS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_PACS_UPDATE_CHARACTERISTIC);
-	tester_set_bit(rp->data, BTP_PACS_SET_LOCATION);
-	tester_set_bit(rp->data, BTP_PACS_SET_AVAILABLE_CONTEXTS);
-	tester_set_bit(rp->data, BTP_PACS_SET_SUPPORTED_CONTEXTS);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_PACS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -330,10 +322,8 @@ static uint8_t btp_bap_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_bap_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_BAP_READ_SUPPORTED_COMMANDS);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_BAP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -369,12 +359,17 @@ static const struct btp_handler bap_handlers[] = {
 		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
 		.func = btp_bap_audio_stream_send,
 	},
-#if defined(CONFIG_BT_BAP_BROADCAST_SINK) || defined(CONFIG_BT_BAP_BROADCAST_SINK)
+#if defined(CONFIG_BT_BAP_BROADCAST_SOURCE) || defined(CONFIG_BT_BAP_BROADCAST_SINK)
 	{
 		.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP,
 		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
 		.func = btp_bap_broadcast_source_setup,
 	},
+	{
+		.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP_V2,
+		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
+		.func = btp_bap_broadcast_source_setup_v2,
+	},
 	{
 		.opcode = BTP_BAP_BROADCAST_SOURCE_RELEASE,
 		.expect_len = sizeof(struct btp_bap_broadcast_source_release_cmd),
@@ -475,7 +470,7 @@ static const struct btp_handler bap_handlers[] = {
 		.expect_len = sizeof(struct btp_bap_send_past_cmd),
 		.func = btp_bap_broadcast_assistant_send_past,
 	},
-#endif /* CONFIG_BT_BAP_BROADCAST_SINK || CONFIG_BT_BAP_BROADCAST_SINK */
+#endif /* CONFIG_BT_BAP_BROADCAST_SOURCE || CONFIG_BT_BAP_BROADCAST_SINK */
 };
 
 uint8_t tester_init_pacs(void)
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
index 29105d66ae8c5..805da88bcbad3 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
@@ -16,6 +16,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/ring_buffer.h>
 #include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/gap.h>
 
 #include "bap_endpoint.h"
@@ -24,13 +25,13 @@
 #define LOG_MODULE_NAME bttester_bap_broadcast
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #include "btp/btp.h"
-#include "btp_bap_audio_stream.h"
 #include "btp_bap_broadcast.h"
 
-static K_SEM_DEFINE(sem_stream_stopped, 0U, CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT);
+static K_SEM_DEFINE(sem_stream_stopped, 0U,
+		    (CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT * CONFIG_BT_BAP_BROADCAST_SRC_COUNT));
 
 static struct btp_bap_broadcast_remote_source remote_broadcast_sources[1];
-static struct btp_bap_broadcast_local_source local_source;
+static struct btp_bap_broadcast_local_source local_sources[CONFIG_BT_BAP_BROADCAST_SRC_COUNT];
 /* Only one PA sync supported for now. */
 static struct btp_bap_broadcast_remote_source *broadcast_source_to_sync;
 /* A mask for the maximum BIS we can sync to. +1 since the BIS indexes start from 1. */
@@ -52,12 +53,72 @@ static inline struct bt_bap_stream *stream_broadcast_to_bap(struct btp_bap_broad
 	return &stream->audio_stream.cap_stream.bap_stream;
 }
 
-struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_get(uint8_t source_id)
+uint8_t btp_bap_broadcast_local_source_idx_get(struct btp_bap_broadcast_local_source *source)
 {
-	/* Only one local broadcast source supported for now */
-	(void) source_id;
+	return ARRAY_INDEX(local_sources, source);
+}
+
+struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_allocate(
+	uint32_t broadcast_id)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (local_sources[i].broadcast_id == broadcast_id) {
+			LOG_ERR("Local source already allocated for broadcast id %d", broadcast_id);
+
+			return NULL;
+		}
+	}
+
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (!local_sources[i].allocated) {
+			local_sources[i].allocated = true;
+			local_sources[i].source_id = i;
+			local_sources[i].broadcast_id = broadcast_id;
+
+			return &local_sources[i];
+		}
+	}
+
+	return NULL;
+}
+
+static int btp_bap_broadcast_local_source_free(struct btp_bap_broadcast_local_source *source)
+{
+	if (source == NULL) {
+		return -EINVAL;
+	}
+
+	memset(source, 0, sizeof(*source));
+
+	return 0;
+}
 
-	return &local_source;
+struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_from_src_id_get(
+	uint32_t source_id)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (local_sources[i].source_id == source_id) {
+			return &local_sources[i];
+		}
+	}
+
+	LOG_ERR("No local source found with source id %u", source_id);
+
+	return NULL;
+}
+
+static struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_from_brcst_id_get(
+	uint32_t broadcast_id)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(local_sources); i++) {
+		if (local_sources[i].broadcast_id == broadcast_id) {
+			return &local_sources[i];
+		}
+	}
+
+	LOG_ERR("No local source found with broadcast id 0x%06X", broadcast_id);
+
+	return NULL;
 }
 
 static struct btp_bap_broadcast_remote_source *remote_broadcaster_alloc(void)
@@ -191,7 +252,7 @@ static void stream_recv(struct bt_bap_stream *stream,
 		LOG_DBG("Incoming audio on stream %p len %u flags 0x%02X seq_num %u and ts %u",
 			stream, buf->len, info->flags, info->seq_num, info->ts);
 
-		if ((info->flags & BT_ISO_FLAGS_VALID) == 0) {
+		if ((info->flags & BT_ISO_FLAGS_VALID) != 0) {
 			b_stream->already_sent = true;
 			broadcaster = &remote_broadcast_sources[b_stream->source_id];
 			send_bis_stream_received_ev(&broadcaster->address,
@@ -282,15 +343,14 @@ static int setup_broadcast_source(uint8_t streams_per_subgroup,	uint8_t subgroup
 	create_param.encryption = false;
 	create_param.packing = BT_ISO_PACKING_SEQUENTIAL;
 
-	LOG_DBG("Creating broadcast source with %zu subgroups with %zu streams",
-		subgroups, subgroups * streams_per_subgroup);
+	LOG_DBG("Creating broadcast source (%u) with %zu subgroups with %zu streams",
+		source->source_id, subgroups, subgroups * streams_per_subgroup);
 
 	if (source->bap_broadcast == NULL) {
 		err = bt_bap_broadcast_source_create(&create_param,
 						     &source->bap_broadcast);
 		if (err != 0) {
 			LOG_DBG("Unable to create broadcast source: %d", err);
-
 			return err;
 		}
 	} else {
@@ -298,7 +358,6 @@ static int setup_broadcast_source(uint8_t streams_per_subgroup,	uint8_t subgroup
 						       &create_param);
 		if (err != 0) {
 			LOG_DBG("Unable to reconfig broadcast source: %d", err);
-
 			return err;
 		}
 	}
@@ -308,6 +367,120 @@ static int setup_broadcast_source(uint8_t streams_per_subgroup,	uint8_t subgroup
 
 uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 				       void *rsp, uint16_t *rsp_len)
+{
+	struct bt_le_per_adv_param per_adv_param = *BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW;
+	struct bt_le_adv_param ext_adv_param = *BT_BAP_ADV_PARAM_BROADCAST_SLOW;
+	int err;
+	struct bt_audio_codec_cfg codec_cfg;
+	const struct btp_bap_broadcast_source_setup_cmd *cp = cmd;
+	struct btp_bap_broadcast_source_setup_rp *rp = rsp;
+	uint32_t broadcast_id;
+
+	err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
+	if (err != 0) {
+		LOG_DBG("Failed to generate broadcast id: %d", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	struct btp_bap_broadcast_local_source *source;
+
+	uint32_t gap_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
+				BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+
+	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
+	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
+
+	/* Broadcast Audio Streaming Endpoint advertising data */
+	struct bt_data base_ad[2];
+	struct bt_data *per_ad;
+
+	LOG_DBG("");
+
+	/* Zephyr Controller works best while Extended Advertising interval is a multiple
+	 * of the ISO Interval minus 10 ms (max. advertising random delay). This is
+	 * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
+	 * Broadcast ISO radio events.
+	 */
+	ext_adv_param.interval_min -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+	ext_adv_param.interval_max -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+
+	memset(&codec_cfg, 0, sizeof(codec_cfg));
+	codec_cfg.id = cp->coding_format;
+	codec_cfg.vid = cp->vid;
+	codec_cfg.cid = cp->cid;
+	codec_cfg.data_len = cp->cc_ltvs_len;
+	memcpy(codec_cfg.data, cp->cc_ltvs, cp->cc_ltvs_len);
+
+	source = btp_bap_broadcast_local_source_allocate(broadcast_id);
+	if (source == NULL) {
+		LOG_DBG("No more free local source items");
+		return BTP_STATUS_FAILED;
+	}
+
+	source->qos.phy = BT_BAP_QOS_CFG_2M;
+	source->qos.framing = cp->framing;
+	source->qos.rtn = cp->retransmission_num;
+	source->qos.latency = sys_le16_to_cpu(cp->max_transport_latency);
+	source->qos.interval = sys_get_le24(cp->sdu_interval);
+	source->qos.pd = sys_get_le24(cp->presentation_delay);
+	source->qos.sdu = sys_le16_to_cpu(cp->max_sdu);
+
+	source->stream_count = cp->subgroups * cp->streams_per_subgroup;
+
+	err = setup_broadcast_source(cp->streams_per_subgroup, cp->subgroups, source, &codec_cfg);
+	if (err != 0) {
+		LOG_DBG("Unable to setup broadcast source: %d", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	/* Setup extended advertising data */
+	net_buf_simple_add_le16(&ad_buf, BT_UUID_BROADCAST_AUDIO_VAL);
+	net_buf_simple_add_le24(&ad_buf, broadcast_id);
+	base_ad[0].type = BT_DATA_SVC_DATA16;
+	base_ad[0].data_len = ad_buf.len;
+	base_ad[0].data = ad_buf.data;
+	base_ad[1].type = BT_DATA_NAME_COMPLETE;
+	base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
+	base_ad[1].data = CONFIG_BT_DEVICE_NAME;
+
+	err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY,
+					     base_ad, ARRAY_SIZE(base_ad), NULL, 0, &gap_settings,
+					     &source->ext_adv);
+	if (err != 0) {
+		LOG_DBG("Failed to create extended advertising instance: %d", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	err = tester_gap_padv_configure(source->ext_adv, &per_adv_param);
+	if (err != 0) {
+		LOG_DBG("Failed to configure periodic advertising: %d", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	err = bt_bap_broadcast_source_get_base(source->bap_broadcast, &base_buf);
+	if (err != 0) {
+		LOG_DBG("Failed to get encoded BASE: %d\n", err);
+		return BTP_STATUS_FAILED;
+	}
+
+	per_ad = &source->per_adv_local;
+	per_ad->type = BT_DATA_SVC_DATA16;
+	per_ad->data_len = base_buf.len;
+	per_ad->data = base_buf.data;
+	err = tester_gap_padv_set_data(source->ext_adv, per_ad, 1);
+	if (err != 0) {
+		return BTP_STATUS_FAILED;
+	}
+
+	rp->gap_settings = gap_settings;
+	sys_put_le24(broadcast_id, rp->broadcast_id);
+	*rsp_len = sizeof(*rp) + 1;
+
+	return BTP_STATUS_SUCCESS;
+}
+
+uint8_t btp_bap_broadcast_source_setup_v2(const void *cmd, uint16_t cmd_len,
+					  void *rsp, uint16_t *rsp_len)
 {
 	struct bt_le_per_adv_param per_adv_param =
 		*BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(150),
@@ -322,12 +495,17 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 				 BT_GAP_MS_TO_ADV_INTERVAL(140), NULL);
 	int err;
 	struct bt_audio_codec_cfg codec_cfg;
-	const struct btp_bap_broadcast_source_setup_cmd *cp = cmd;
-	struct btp_bap_broadcast_source_setup_rp *rp = rsp;
-	uint32_t broadcast_id;
+	const struct btp_bap_broadcast_source_setup_v2_cmd *cp = cmd;
+	struct btp_bap_broadcast_source_setup_v2_rp *rp = rsp;
+
+	if ((cmd_len < sizeof(*cp)) ||
+	    (cmd_len != sizeof(*cp) + cp->cc_ltvs_len)) {
+		return BTP_STATUS_FAILED;
+	}
 
-	/* Only one local source/BIG supported for now */
-	struct btp_bap_broadcast_local_source *source = &local_source;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+
+	struct btp_bap_broadcast_local_source *source;
 
 	uint32_t gap_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
 				BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
@@ -337,7 +515,7 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 
 	/* Broadcast Audio Streaming Endpoint advertising data */
 	struct bt_data base_ad[2];
-	struct bt_data per_ad;
+	struct bt_data *per_ad;
 
 	LOG_DBG("");
 
@@ -348,6 +526,12 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	codec_cfg.data_len = cp->cc_ltvs_len;
 	memcpy(codec_cfg.data, cp->cc_ltvs, cp->cc_ltvs_len);
 
+	source = btp_bap_broadcast_local_source_allocate(broadcast_id);
+	if (source == NULL) {
+		LOG_DBG("No more free local source items");
+		return BTP_STATUS_FAILED;
+	}
+
 	source->qos.phy = BT_BAP_QOS_CFG_2M;
 	source->qos.framing = cp->framing;
 	source->qos.rtn = cp->retransmission_num;
@@ -361,14 +545,6 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	err = setup_broadcast_source(cp->streams_per_subgroup, cp->subgroups, source, &codec_cfg);
 	if (err != 0) {
 		LOG_DBG("Unable to setup broadcast source: %d", err);
-
-		return BTP_STATUS_FAILED;
-	}
-
-	err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
-	if (err) {
-		LOG_DBG("Unable to generate broadcast ID: %d\n", err);
-
 		return BTP_STATUS_FAILED;
 	}
 
@@ -381,38 +557,38 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	base_ad[1].type = BT_DATA_NAME_COMPLETE;
 	base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
 	base_ad[1].data = CONFIG_BT_DEVICE_NAME;
-	err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY, base_ad, 2,
-					     NULL, 0, &gap_settings);
+
+	err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY,
+					     base_ad, ARRAY_SIZE(base_ad), NULL, 0, &gap_settings,
+					     &source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Failed to create extended advertising instance: %d", err);
-
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_padv_configure(&per_adv_param);
+	err = tester_gap_padv_configure(source->ext_adv, &per_adv_param);
 	if (err != 0) {
 		LOG_DBG("Failed to configure periodic advertising: %d", err);
-
 		return BTP_STATUS_FAILED;
 	}
 
 	err = bt_bap_broadcast_source_get_base(source->bap_broadcast, &base_buf);
 	if (err != 0) {
-		LOG_DBG("Failed to get encoded BASE: %d\n", err);
-
+		LOG_DBG("Failed to get encoded BASE: %d", err);
 		return BTP_STATUS_FAILED;
 	}
 
-	per_ad.type = BT_DATA_SVC_DATA16;
-	per_ad.data_len = base_buf.len;
-	per_ad.data = base_buf.data;
-	err = tester_gap_padv_set_data(&per_ad, 1);
+	per_ad = &source->per_adv_local;
+	per_ad->type = BT_DATA_SVC_DATA16;
+	per_ad->data_len = base_buf.len;
+	per_ad->data = base_buf.data;
+	err = tester_gap_padv_set_data(source->ext_adv, per_ad, 1);
 	if (err != 0) {
+		LOG_DBG("Failed to set periodic advertising data: %d", err);
 		return BTP_STATUS_FAILED;
 	}
 
 	rp->gap_settings = gap_settings;
-	sys_put_le24(broadcast_id, rp->broadcast_id);
 	*rsp_len = sizeof(*rp) + 1;
 
 	return BTP_STATUS_SUCCESS;
@@ -422,7 +598,14 @@ uint8_t btp_bap_broadcast_source_release(const void *cmd, uint16_t cmd_len,
 					 void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct btp_bap_broadcast_local_source *source = &local_source;
+	const struct btp_bap_broadcast_source_release_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
@@ -433,7 +616,7 @@ uint8_t btp_bap_broadcast_source_release(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-	memset(source, 0, sizeof(*source));
+	btp_bap_broadcast_local_source_free(source);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -442,20 +625,27 @@ uint8_t btp_bap_broadcast_adv_start(const void *cmd, uint16_t cmd_len,
 				    void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+	const struct btp_bap_broadcast_adv_start_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_start_ext_adv();
+	err = tester_gap_start_ext_adv(source->ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_padv_start();
+	err = tester_gap_padv_start(source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Unable to start periodic advertising: %d", err);
 
@@ -469,15 +659,23 @@ uint8_t btp_bap_broadcast_adv_stop(const void *cmd, uint16_t cmd_len,
 				   void *rsp, uint16_t *rsp_len)
 {
 	int err;
+	const struct btp_bap_broadcast_adv_stop_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	err = tester_gap_padv_stop();
+	err = tester_gap_padv_stop(source->ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_stop_ext_adv();
+	err = tester_gap_stop_ext_adv(source->ext_adv);
 
 	return BTP_STATUS_VAL(err);
 }
@@ -486,16 +684,22 @@ uint8_t btp_bap_broadcast_source_start(const void *cmd, uint16_t cmd_len,
 				       void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct btp_bap_broadcast_local_source *source = &local_source;
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+	const struct btp_bap_broadcast_source_start_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = bt_bap_broadcast_source_start(source->bap_broadcast, ext_adv);
+	err = bt_bap_broadcast_source_start(source->bap_broadcast, source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Unable to start broadcast source: %d", err);
 
@@ -509,7 +713,14 @@ uint8_t btp_bap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 				      void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct btp_bap_broadcast_local_source *source = &local_source;
+	const struct btp_bap_broadcast_source_stop_cmd *cp = cmd;
+	uint32_t broadcast_id = sys_get_le24(cp->broadcast_id);
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_brcst_id_get(broadcast_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
index acb49bee8649e..7bf1967bed751 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
+++ b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
@@ -8,6 +8,8 @@
 
 #include <zephyr/bluetooth/audio/cap.h>
 
+#include "btp_bap_audio_stream.h"
+
 struct btp_bap_broadcast_stream {
 	struct btp_bap_audio_stream audio_stream;
 	struct bt_audio_codec_cfg codec_cfg;
@@ -41,11 +43,15 @@ struct btp_bap_broadcast_remote_source {
 };
 
 struct btp_bap_broadcast_local_source {
+	bool allocated;
+	uint8_t source_id;
+	struct bt_le_ext_adv *ext_adv;
 	uint32_t broadcast_id;
 	struct bt_bap_qos_cfg qos;
 	struct btp_bap_broadcast_stream streams[CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
 	struct bt_audio_codec_cfg subgroup_codec_cfg[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
 	uint8_t stream_count;
+	struct bt_data per_adv_local;
 	/* Only for BTP BAP commands */
 	struct bt_bap_broadcast_source *bap_broadcast;
 	/* Only for BTP CAP commands */
@@ -53,12 +59,16 @@ struct btp_bap_broadcast_local_source {
 };
 
 int btp_bap_broadcast_init(void);
-struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_get(uint8_t source_id);
+struct btp_bap_broadcast_local_source *btp_bap_broadcast_local_source_from_src_id_get(
+	uint32_t source_id);
+uint8_t btp_bap_broadcast_local_source_idx_get(struct btp_bap_broadcast_local_source *source);
 struct btp_bap_broadcast_stream *btp_bap_broadcast_stream_alloc(
 	struct btp_bap_broadcast_local_source *source);
 
 uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 				       void *rsp, uint16_t *rsp_len);
+uint8_t btp_bap_broadcast_source_setup_v2(const void *cmd, uint16_t cmd_len,
+					  void *rsp, uint16_t *rsp_len);
 uint8_t btp_bap_broadcast_source_release(const void *cmd, uint16_t cmd_len,
 					 void *rsp, uint16_t *rsp_len);
 uint8_t btp_bap_broadcast_adv_start(const void *cmd, uint16_t cmd_len,
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_unicast.c b/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
index 2df4e72ca85ba..ec1e6899ee7d3 100644
--- a/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
+++ b/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
@@ -258,7 +258,7 @@ static void btp_send_pac_codec_found_ev(struct bt_conn *conn,
 static void btp_send_ase_found_ev(struct bt_conn *conn, struct bt_bap_ep *ep)
 {
 	struct bt_bap_ep_info info;
-	struct btp_ascs_ase_found_ev ev;
+	struct btp_bap_ase_found_ev ev;
 
 	bt_addr_le_copy(&ev.address, bt_conn_get_dst(conn));
 
@@ -715,7 +715,7 @@ static void stream_recv(struct bt_bap_stream *stream,
 		LOG_DBG("Incoming audio on stream %p len %u flags 0x%02X seq_num %u and ts %u",
 			stream, buf->len, info->flags, info->seq_num, info->ts);
 
-		if ((info->flags & BT_ISO_FLAGS_VALID) == 0) {
+		if ((info->flags & BT_ISO_FLAGS_VALID) != 0) {
 			u_stream->already_sent = true;
 			send_stream_received_ev(stream->conn, stream->ep, buf->len, buf->data);
 		}
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
index e0356aae09702..bb28da9c13b23 100644
--- a/tests/bluetooth/tester/src/audio/btp_cap.c
+++ b/tests/bluetooth/tester/src/audio/btp_cap.c
@@ -22,6 +22,20 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
 static struct btp_bap_unicast_group *u_group;
 
+static K_SEM_DEFINE(source_stopped_sem, 0U, CONFIG_BT_BAP_BROADCAST_SRC_COUNT);
+
+struct cap_initiator_broadcast_params {
+	struct bt_cap_initiator_broadcast_subgroup_param
+		cap_subgroup_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
+	struct bt_cap_initiator_broadcast_stream_param
+		cap_stream_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT]
+				 [CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
+};
+
+static struct cap_initiator_broadcast_params
+	cap_broadcast_params[CONFIG_BT_BAP_BROADCAST_SRC_COUNT];
+
+
 extern struct bt_csip_set_coordinator_set_member *btp_csip_set_members[CONFIG_BT_MAX_CONN];
 
 static struct bt_bap_stream *stream_unicast_to_bap(struct btp_bap_unicast_stream *stream)
@@ -139,11 +153,19 @@ static void unicast_stop_complete_cb(int err, struct bt_conn *conn)
 					       BTP_CAP_UNICAST_START_STATUS_SUCCESS);
 }
 
+static void broadcast_stopped_cb(struct bt_cap_broadcast_source *source, uint8_t reason)
+{
+	LOG_DBG("");
+
+	k_sem_give(&source_stopped_sem);
+}
+
 static struct bt_cap_initiator_cb cap_cb = {
 	.unicast_discovery_complete = cap_discovery_complete_cb,
 	.unicast_start_complete = unicast_start_complete_cb,
 	.unicast_update_complete = unicast_update_complete_cb,
 	.unicast_stop_complete = unicast_stop_complete_cb,
+	.broadcast_stopped = broadcast_stopped_cb,
 };
 
 static uint8_t btp_cap_supported_commands(const void *cmd, uint16_t cmd_len,
@@ -151,11 +173,8 @@ static uint8_t btp_cap_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_cap_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_CAP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_CAP_DISCOVER);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CAP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -450,12 +469,6 @@ static uint8_t btp_cap_unicast_audio_stop(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-static struct bt_cap_initiator_broadcast_subgroup_param
-	cap_subgroup_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT];
-static struct bt_cap_initiator_broadcast_stream_param
-	cap_stream_params[CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT]
-		     [CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
-
 static uint8_t btp_cap_broadcast_source_setup_stream(const void *cmd, uint16_t cmd_len,
 						     void *rsp, uint16_t *rsp_len)
 {
@@ -463,7 +476,12 @@ static uint8_t btp_cap_broadcast_source_setup_stream(const void *cmd, uint16_t c
 	struct btp_bap_broadcast_stream *stream;
 	const struct btp_cap_broadcast_source_setup_stream_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
 	struct bt_audio_codec_cfg *codec_cfg;
 
 	stream = btp_bap_broadcast_stream_alloc(source);
@@ -500,15 +518,29 @@ static uint8_t btp_cap_broadcast_source_setup_subgroup(const void *cmd, uint16_t
 	struct bt_audio_codec_cfg *codec_cfg;
 	const struct btp_cap_broadcast_source_setup_subgroup_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
-	if (cp->subgroup_id >= sizeof(cap_subgroup_params)) {
+	if (source == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	cap_subgroup_params[cp->subgroup_id].codec_cfg =
-		&source->subgroup_codec_cfg[cp->subgroup_id];
-	codec_cfg = cap_subgroup_params[cp->subgroup_id].codec_cfg;
+	if (cp->subgroup_id >= ARRAY_SIZE(cap_broadcast_params[0].cap_subgroup_params)) {
+		return BTP_STATUS_FAILED;
+	}
+
+	uint8_t idx = btp_bap_broadcast_local_source_idx_get(source);
+
+	if (idx >= ARRAY_SIZE(cap_broadcast_params)) {
+		return BTP_STATUS_FAILED;
+	}
+
+	struct bt_cap_initiator_broadcast_subgroup_param *subgroup_param =
+		&cap_broadcast_params[idx].cap_subgroup_params[cp->subgroup_id];
+
+	subgroup_param->codec_cfg = &source->subgroup_codec_cfg[cp->subgroup_id];
+
+	codec_cfg = subgroup_param->codec_cfg;
+
 	memset(codec_cfg, 0, sizeof(*codec_cfg));
 	codec_cfg->id = cp->coding_format;
 	codec_cfg->vid = cp->vid;
@@ -540,7 +572,7 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 	struct bt_data per_ad;
 
 	/* A more specialized adv instance may already have been created by another btp module */
-	if (tester_gap_ext_adv_get() == NULL) {
+	if (source->ext_adv == NULL) {
 		struct bt_le_adv_param param = *BT_LE_EXT_ADV_NCONN;
 		struct bt_data base_ad[2];
 
@@ -557,16 +589,17 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 		base_ad[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
 		base_ad[1].data = CONFIG_BT_DEVICE_NAME;
 
-		err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, base_ad,
-						     2, NULL, 0, gap_settings);
+		err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY,
+						     base_ad, 2, NULL, 0, gap_settings,
+						     &source->ext_adv);
 		if (err != 0) {
 			LOG_DBG("Failed to create extended advertising instance: %d", err);
-
 			return -EINVAL;
 		}
 	}
 
-	err = tester_gap_padv_configure(BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2,
+	err = tester_gap_padv_configure(source->ext_adv,
+					BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2,
 							    BT_GAP_PER_ADV_FAST_INT_MAX_2,
 							    BT_LE_PER_ADV_OPT_NONE));
 	if (err != 0) {
@@ -585,7 +618,7 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 	per_ad.type = BT_DATA_SVC_DATA16;
 	per_ad.data_len = base_buf.len;
 	per_ad.data = base_buf.data;
-	err = tester_gap_padv_set_data(&per_ad, 1);
+	err = tester_gap_padv_set_data(source->ext_adv, &per_ad, 1);
 	if (err != 0) {
 		return -EINVAL;
 	}
@@ -602,7 +635,15 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	const struct btp_cap_broadcast_source_setup_cmd *cp = cmd;
 	struct btp_cap_broadcast_source_setup_rp *rp = rsp;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
+	struct cap_initiator_broadcast_params *cap_params =
+		&cap_broadcast_params[cp->source_id];
+
 	struct bt_bap_qos_cfg *qos = &source->qos;
 
 	LOG_DBG("");
@@ -612,7 +653,6 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	for (size_t i = 0; i < ARRAY_SIZE(source->streams); i++) {
 		struct btp_bap_broadcast_stream *stream = &source->streams[i];
 		struct bt_cap_initiator_broadcast_stream_param *stream_param;
-		struct bt_cap_initiator_broadcast_subgroup_param *subgroup_param;
 		uint8_t bis_id;
 
 		if (!stream->in_use) {
@@ -620,9 +660,9 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 			break;
 		}
 
-		subgroup_param = &cap_subgroup_params[stream->subgroup_id];
-		bis_id = subgroup_param->stream_count++;
-		stream_param = &cap_stream_params[stream->subgroup_id][bis_id];
+		bis_id = cap_params->cap_subgroup_params[stream->subgroup_id].stream_count++;
+		stream_param = &cap_params->cap_stream_params[stream->subgroup_id][bis_id];
+
 		stream_param->stream = stream_broadcast_to_cap(stream);
 
 		if (cp->flags & BTP_CAP_BROADCAST_SOURCE_SETUP_FLAG_SUBGROUP_CODEC) {
@@ -634,13 +674,13 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 		}
 	}
 
-	for (size_t i = 0; i < ARRAY_SIZE(cap_subgroup_params); i++) {
-		if (cap_subgroup_params[i].stream_count == 0) {
+	for (size_t i = 0; i < ARRAY_SIZE(cap_params->cap_subgroup_params); i++) {
+		if (cap_params->cap_subgroup_params[i].stream_count == 0) {
 			/* No gaps allowed */
 			break;
 		}
 
-		cap_subgroup_params[i].stream_params = cap_stream_params[i];
+		cap_params->cap_subgroup_params[i].stream_params = cap_params->cap_stream_params[i];
 		create_param.subgroup_count++;
 	}
 
@@ -657,14 +697,14 @@ static uint8_t btp_cap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	qos->interval = sys_get_le24(cp->sdu_interval);
 	qos->pd = sys_get_le24(cp->presentation_delay);
 
-	create_param.subgroup_params = cap_subgroup_params;
+	create_param.subgroup_params = cap_params->cap_subgroup_params;
 	create_param.qos = qos;
 	create_param.packing = BT_ISO_PACKING_SEQUENTIAL;
 	create_param.encryption = cp->flags & BTP_CAP_BROADCAST_SOURCE_SETUP_FLAG_ENCRYPTION;
 	memcpy(create_param.broadcast_code, cp->broadcast_code, sizeof(cp->broadcast_code));
 
 	err = bt_cap_initiator_broadcast_audio_create(&create_param, &source->cap_broadcast);
-	memset(cap_subgroup_params, 0, sizeof(cap_subgroup_params));
+	memset(&cap_params->cap_subgroup_params, 0, sizeof(cap_params->cap_subgroup_params));
 	memset(&create_param, 0, sizeof(create_param));
 	if (err != 0) {
 		LOG_ERR("Failed to create audio source: %d", err);
@@ -690,7 +730,7 @@ static uint8_t btp_cap_broadcast_source_release(const void *cmd, uint16_t cmd_le
 	int err;
 	const struct btp_cap_broadcast_source_release_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
 	LOG_DBG("");
 
@@ -715,20 +755,24 @@ static uint8_t btp_cap_broadcast_adv_start(const void *cmd, uint16_t cmd_len,
 					   void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+	const struct btp_cap_broadcast_adv_start_cmd *cp = cmd;
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
-	LOG_DBG("");
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_start_ext_adv();
+	err = tester_gap_start_ext_adv(source->ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_padv_start();
+	err = tester_gap_padv_start(source->ext_adv);
 	if (err != 0) {
 		LOG_DBG("Unable to start periodic advertising: %d", err);
 
@@ -742,10 +786,18 @@ static uint8_t btp_cap_broadcast_adv_stop(const void *cmd, uint16_t cmd_len,
 					  void *rsp, uint16_t *rsp_len)
 {
 	int err;
+	const struct btp_cap_broadcast_adv_stop_cmd *cp = cmd;
 
 	LOG_DBG("");
 
-	err = tester_gap_padv_stop();
+	struct btp_bap_broadcast_local_source *source =
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
+	err = tester_gap_padv_stop(source->ext_adv);
 	if (err == -ESRCH) {
 		/* Ext adv hasn't been created yet */
 		return BTP_STATUS_SUCCESS;
@@ -754,7 +806,7 @@ static uint8_t btp_cap_broadcast_adv_stop(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
-	err = tester_gap_stop_ext_adv();
+	err = tester_gap_stop_ext_adv(source->ext_adv);
 
 	return BTP_STATUS_VAL(err);
 }
@@ -765,16 +817,19 @@ static uint8_t btp_cap_broadcast_source_start(const void *cmd, uint16_t cmd_len,
 	int err;
 	const struct btp_cap_broadcast_source_start_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
-	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get();
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
 
 	LOG_DBG("");
 
-	if (ext_adv == NULL) {
+	if (source->ext_adv == NULL) {
 		return BTP_STATUS_FAILED;
 	}
 
-	err = bt_cap_initiator_broadcast_audio_start(source->cap_broadcast, ext_adv);
+	err = bt_cap_initiator_broadcast_audio_start(source->cap_broadcast, source->ext_adv);
 	if (err != 0) {
 		LOG_ERR("Failed to start audio source: %d", err);
 
@@ -790,7 +845,7 @@ static uint8_t btp_cap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 	int err;
 	const struct btp_cap_broadcast_source_stop_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
 
 	/* If no source has been started yet, there is nothing to stop */
 	if (source == NULL || source->cap_broadcast == NULL) {
@@ -804,6 +859,14 @@ static uint8_t btp_cap_broadcast_source_stop(const void *cmd, uint16_t cmd_len,
 		return BTP_STATUS_FAILED;
 	}
 
+	/* Make sure source is stopped before proceeding */
+	err = k_sem_take(&source_stopped_sem, K_SECONDS(1));
+	if (err) {
+		LOG_ERR("Semaphore timed out: %d", err);
+
+		return BTP_STATUS_FAILED;
+	}
+
 	return BTP_STATUS_SUCCESS;
 }
 
@@ -814,7 +877,12 @@ static uint8_t btp_cap_broadcast_source_update(const void *cmd, uint16_t cmd_len
 	struct bt_data per_ad;
 	const struct btp_cap_broadcast_source_update_cmd *cp = cmd;
 	struct btp_bap_broadcast_local_source *source =
-		btp_bap_broadcast_local_source_get(cp->source_id);
+		btp_bap_broadcast_local_source_from_src_id_get(cp->source_id);
+
+	if (source == NULL) {
+		return BTP_STATUS_FAILED;
+	}
+
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 
 	LOG_DBG("");
@@ -841,7 +909,7 @@ static uint8_t btp_cap_broadcast_source_update(const void *cmd, uint16_t cmd_len
 	per_ad.type = BT_DATA_SVC_DATA16;
 	per_ad.data_len = base_buf.len;
 	per_ad.data = base_buf.data;
-	err = tester_gap_padv_set_data(&per_ad, 1);
+	err = tester_gap_padv_set_data(source->ext_adv, &per_ad, 1);
 	if (err != 0) {
 		return -EINVAL;
 	}
diff --git a/tests/bluetooth/tester/src/audio/btp_cas.c b/tests/bluetooth/tester/src/audio/btp_cas.c
index 78e3a8f287828..fc05527d585ef 100644
--- a/tests/bluetooth/tester/src/audio/btp_cas.c
+++ b/tests/bluetooth/tester/src/audio/btp_cas.c
@@ -22,12 +22,8 @@ static uint8_t cas_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_cas_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_CAS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_CAS_SET_MEMBER_LOCK);
-	tester_set_bit(rp->data, BTP_CAS_GET_MEMBER_RSI);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CAS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_ccp.c b/tests/bluetooth/tester/src/audio/btp_ccp.c
index ac1965ab3a961..eaedee150fe77 100644
--- a/tests/bluetooth/tester/src/audio/btp_ccp.c
+++ b/tests/bluetooth/tester/src/audio/btp_ccp.c
@@ -28,38 +28,8 @@ static uint8_t ccp_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_ccp_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_CCP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_CCP_DISCOVER_TBS);
-	tester_set_bit(rp->data, BTP_CCP_ACCEPT_CALL);
-	tester_set_bit(rp->data, BTP_CCP_TERMINATE_CALL);
-	tester_set_bit(rp->data, BTP_CCP_ORIGINATE_CALL);
-	tester_set_bit(rp->data, BTP_CCP_READ_CALL_STATE);
-	tester_set_bit(rp->data, BTP_CCP_READ_BEARER_NAME);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_CCP_READ_BEARER_UCI);
-	tester_set_bit(rp->data, BTP_CCP_READ_BEARER_TECH);
-	tester_set_bit(rp->data, BTP_CCP_READ_URI_LIST);
-	tester_set_bit(rp->data, BTP_CCP_READ_SIGNAL_STRENGTH);
-	tester_set_bit(rp->data, BTP_CCP_READ_SIGNAL_INTERVAL);
-	tester_set_bit(rp->data, BTP_CCP_READ_CURRENT_CALLS);
-	tester_set_bit(rp->data, BTP_CCP_READ_CCID);
-
-	/* octet 2 */
-	tester_set_bit(rp->data, BTP_CCP_READ_CALL_URI);
-	tester_set_bit(rp->data, BTP_CCP_READ_STATUS_FLAGS);
-	tester_set_bit(rp->data, BTP_CCP_READ_OPTIONAL_OPCODES);
-	tester_set_bit(rp->data, BTP_CCP_READ_FRIENDLY_NAME);
-	tester_set_bit(rp->data, BTP_CCP_READ_REMOTE_URI);
-	tester_set_bit(rp->data, BTP_CCP_SET_SIGNAL_INTERVAL);
-	tester_set_bit(rp->data, BTP_CCP_HOLD_CALL);
-
-	/* octet 3 */
-	tester_set_bit(rp->data, BTP_CCP_RETRIEVE_CALL);
-	tester_set_bit(rp->data, BTP_CCP_JOIN_CALLS);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CCP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -886,21 +856,8 @@ static uint8_t tbs_supported_commands(const void *cmd, uint16_t cmd_len, void *r
 {
 	struct btp_tbs_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_TBS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_TBS_REMOTE_INCOMING);
-	tester_set_bit(rp->data, BTP_TBS_HOLD);
-	tester_set_bit(rp->data, BTP_TBS_SET_BEARER_NAME);
-	tester_set_bit(rp->data, BTP_TBS_SET_TECHNOLOGY);
-	tester_set_bit(rp->data, BTP_TBS_SET_URI_SCHEME);
-	tester_set_bit(rp->data, BTP_TBS_SET_STATUS_FLAGS);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_TBS_REMOTE_HOLD);
-	tester_set_bit(rp->data, BTP_TBS_ORIGINATE);
-	tester_set_bit(rp->data, BTP_TBS_SET_SIGNAL_STRENGTH);
-
-	*rsp_len = sizeof(*rp) + 2;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_TBS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_csip.c b/tests/bluetooth/tester/src/audio/btp_csip.c
index f7068e13b2144..e798d2c6e38eb 100644
--- a/tests/bluetooth/tester/src/audio/btp_csip.c
+++ b/tests/bluetooth/tester/src/audio/btp_csip.c
@@ -23,14 +23,8 @@ static uint8_t btp_csip_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_csip_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_CSIP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_CSIP_DISCOVER);
-	tester_set_bit(rp->data, BTP_CSIP_START_ORDERED_ACCESS);
-	tester_set_bit(rp->data, BTP_CSIP_SET_COORDINATOR_LOCK);
-	tester_set_bit(rp->data, BTP_CSIP_SET_COORDINATOR_RELEASE);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CSIP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_csis.c b/tests/bluetooth/tester/src/audio/btp_csis.c
index 8c8d09eaea775..b13154c24c30d 100644
--- a/tests/bluetooth/tester/src/audio/btp_csis.c
+++ b/tests/bluetooth/tester/src/audio/btp_csis.c
@@ -24,13 +24,8 @@ static uint8_t csis_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_csis_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_CSIS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_CSIS_SET_MEMBER_LOCK);
-	tester_set_bit(rp->data, BTP_CSIS_GET_MEMBER_RSI);
-	tester_set_bit(rp->data, BTP_CSIS_ENC_SIRK_TYPE);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CSIS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_hap.c b/tests/bluetooth/tester/src/audio/btp_hap.c
index 88dba7e8fbbb6..628058816dae4 100644
--- a/tests/bluetooth/tester/src/audio/btp_hap.c
+++ b/tests/bluetooth/tester/src/audio/btp_hap.c
@@ -23,15 +23,8 @@ static uint8_t read_supported_commands(const void *cmd, uint16_t cmd_len, void *
 {
 	struct btp_hap_read_supported_commands_rp *rp = rsp;
 
-	tester_set_bit(rp->data, BTP_HAP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_HAP_HA_INIT);
-	tester_set_bit(rp->data, BTP_HAP_HAUC_INIT);
-	tester_set_bit(rp->data, BTP_HAP_IAC_INIT);
-	tester_set_bit(rp->data, BTP_HAP_IAC_DISCOVER);
-	tester_set_bit(rp->data, BTP_HAP_IAC_SET_ALERT);
-	tester_set_bit(rp->data, BTP_HAP_HAUC_DISCOVER);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_HAP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_has.c b/tests/bluetooth/tester/src/audio/btp_has.c
index d90a635377a13..1ffd71536eeaf 100644
--- a/tests/bluetooth/tester/src/audio/btp_has.c
+++ b/tests/bluetooth/tester/src/audio/btp_has.c
@@ -21,14 +21,8 @@ static uint8_t has_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_has_read_supported_commands_rp *rp = rsp;
 
-	tester_set_bit(rp->data, BTP_HAS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_HAS_SET_ACTIVE_INDEX);
-	tester_set_bit(rp->data, BTP_HAS_SET_PRESET_NAME);
-	tester_set_bit(rp->data, BTP_HAS_REMOVE_PRESET);
-	tester_set_bit(rp->data, BTP_HAS_ADD_PRESET);
-	tester_set_bit(rp->data, BTP_HAS_SET_PROPERTIES);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_HAS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_mcp.c b/tests/bluetooth/tester/src/audio/btp_mcp.c
index a31a5be30a6fd..22c709c427ce0 100644
--- a/tests/bluetooth/tester/src/audio/btp_mcp.c
+++ b/tests/bluetooth/tester/src/audio/btp_mcp.c
@@ -662,40 +662,8 @@ static uint8_t mcp_supported_commands(const void *cmd, uint16_t cmd_len, void *r
 {
 	struct btp_mcp_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_MCP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_MCP_DISCOVER);
-	tester_set_bit(rp->data, BTP_MCP_TRACK_DURATION_READ);
-	tester_set_bit(rp->data, BTP_MCP_TRACK_POSITION_READ);
-	tester_set_bit(rp->data, BTP_MCP_TRACK_POSITION_SET);
-	tester_set_bit(rp->data, BTP_MCP_PLAYBACK_SPEED_READ);
-	tester_set_bit(rp->data, BTP_MCP_PLAYBACK_SPEED_SET);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_MCP_SEEKING_SPEED_READ);
-	tester_set_bit(rp->data, BTP_MCP_ICON_OBJ_ID_READ);
-	tester_set_bit(rp->data, BTP_MCP_NEXT_TRACK_OBJ_ID_READ);
-	tester_set_bit(rp->data, BTP_MCP_NEXT_TRACK_OBJ_ID_SET);
-	tester_set_bit(rp->data, BTP_MCP_PARENT_GROUP_OBJ_ID_READ);
-	tester_set_bit(rp->data, BTP_MCP_CURRENT_GROUP_OBJ_ID_READ);
-	tester_set_bit(rp->data, BTP_MCP_CURRENT_GROUP_OBJ_ID_SET);
-
-	/* octet 2 */
-	tester_set_bit(rp->data, BTP_MCP_PLAYING_ORDER_READ);
-	tester_set_bit(rp->data, BTP_MCP_PLAYING_ORDER_SET);
-	tester_set_bit(rp->data, BTP_MCP_PLAYING_ORDERS_SUPPORTED_READ);
-	tester_set_bit(rp->data, BTP_MCP_MEDIA_STATE_READ);
-	tester_set_bit(rp->data, BTP_MCP_OPCODES_SUPPORTED_READ);
-	tester_set_bit(rp->data, BTP_MCP_CONTENT_CONTROL_ID_READ);
-	tester_set_bit(rp->data, BTP_MCP_SEGMENTS_OBJ_ID_READ);
-
-	/* octet 3 */
-	tester_set_bit(rp->data, BTP_MCP_CURRENT_TRACK_OBJ_ID_READ);
-	tester_set_bit(rp->data, BTP_MCP_CURRENT_TRACK_OBJ_ID_SET);
-	tester_set_bit(rp->data, BTP_MCP_CMD_SEND);
-	tester_set_bit(rp->data, BTP_MCP_CMD_SEARCH);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_MCP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -1462,15 +1430,8 @@ static uint8_t mcs_supported_commands(const void *cmd, uint16_t cmd_len, void *r
 {
 	struct btp_mcs_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_MCS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_MCS_CMD_SEND);
-	tester_set_bit(rp->data, BTP_MCS_CURRENT_TRACK_OBJ_ID_GET);
-	tester_set_bit(rp->data, BTP_MCS_NEXT_TRACK_OBJ_ID_GET);
-	tester_set_bit(rp->data, BTP_MCS_INACTIVE_STATE_SET);
-	tester_set_bit(rp->data, BTP_MCS_PARENT_GROUP_SET);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_GMCS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_micp.c b/tests/bluetooth/tester/src/audio/btp_micp.c
index 4ead39ca179f7..ced87ac58228d 100644
--- a/tests/bluetooth/tester/src/audio/btp_micp.c
+++ b/tests/bluetooth/tester/src/audio/btp_micp.c
@@ -99,7 +99,6 @@ static void micp_mic_ctlr_mute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr, int
 	struct bt_conn *conn;
 
 	bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn);
-	btp_send_micp_mute_state_ev(conn, err, mute_state);
 
 	LOG_DBG("MICP Mute Written cb (%d))", err);
 }
@@ -109,7 +108,6 @@ static void micp_mic_ctlr_unmute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr, i
 	struct bt_conn *conn;
 
 	bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn);
-	btp_send_micp_mute_state_ev(conn, err, mute_state);
 
 	LOG_DBG("MICP Mute Unwritten cb (%d))", err);
 }
@@ -163,13 +161,8 @@ static uint8_t micp_supported_commands(const void *cmd, uint16_t cmd_len, void *
 {
 	struct btp_micp_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_MICP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_MICP_CTLR_DISCOVER);
-	tester_set_bit(rp->data, BTP_MICP_CTLR_MUTE_READ);
-	tester_set_bit(rp->data, BTP_MICP_CTLR_MUTE);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_MICP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -276,14 +269,8 @@ static uint8_t mics_supported_commands(const void *cmd, uint16_t cmd_len, void *
 {
 	struct btp_mics_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_MICS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_MICS_DEV_MUTE_DISABLE);
-	tester_set_bit(rp->data, BTP_MICS_DEV_MUTE_READ);
-	tester_set_bit(rp->data, BTP_MICS_DEV_MUTE);
-	tester_set_bit(rp->data, BTP_MICS_DEV_UNMUTE);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_MICS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_pbp.c b/tests/bluetooth/tester/src/audio/btp_pbp.c
index d3acfcbd80762..6fca9a6dc87af 100644
--- a/tests/bluetooth/tester/src/audio/btp_pbp.c
+++ b/tests/bluetooth/tester/src/audio/btp_pbp.c
@@ -10,11 +10,14 @@
 
 #include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/pbp.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
 #define LOG_MODULE_NAME bttester_pbp
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
+#include "btp_bap_broadcast.h"
+
 #define PBP_EXT_ADV_METADATA_LEN_MAX 128
 
 static uint8_t pbp_features_cached;
@@ -42,7 +45,7 @@ static bool scan_get_data(struct bt_data *data, void *user_data)
 	uint32_t broadcast_id;
 	uint8_t *metadata;
 	struct bt_uuid_16 adv_uuid;
-	struct btp_pbp_ev_public_broadcast_anouncement_found_rp *ev = user_data;
+	struct btp_pbp_ev_public_broadcast_announcement_found_ev *ev = user_data;
 
 	switch (data->type) {
 	case BT_DATA_BROADCAST_NAME:
@@ -86,7 +89,7 @@ static void pbp_scan_recv(const struct bt_le_scan_recv_info *info, struct net_bu
 	net_buf_simple_clone(ad, &ad_copy);
 	bt_data_parse(&ad_copy, scan_get_broadcast_name_len, &broadcast_name_len);
 
-	struct btp_pbp_ev_public_broadcast_anouncement_found_rp *ev_ptr;
+	struct btp_pbp_ev_public_broadcast_announcement_found_ev *ev_ptr;
 
 	tester_rsp_buffer_lock();
 	tester_rsp_buffer_allocate(sizeof(*ev_ptr) + broadcast_name_len, (uint8_t **)&ev_ptr);
@@ -102,7 +105,7 @@ static void pbp_scan_recv(const struct bt_le_scan_recv_info *info, struct net_bu
 
 	if (sys_get_le24(ev_ptr->broadcast_id) != BT_BAP_INVALID_BROADCAST_ID &&
 	    ev_ptr->pba_features != 0U && ev_ptr->broadcast_name_len > 0) {
-		tester_event(BTP_SERVICE_ID_PBP, BTP_PBP_EV_PUBLIC_BROADCAST_ANOUNCEMENT_FOUND,
+		tester_event(BTP_SERVICE_ID_PBP, BTP_PBP_EV_PUBLIC_BROADCAST_ANNOUNCEMENT_FOUND,
 			     ev_ptr, sizeof(*ev_ptr) + broadcast_name_len);
 	}
 
@@ -119,13 +122,8 @@ static uint8_t pbp_read_supported_commands(const void *cmd, uint16_t cmd_len, vo
 {
 	struct btp_pbp_read_supported_commands_rp *rp = rsp;
 
-	tester_set_bit(rp->data, BTP_PBP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_PBP_SET_PUBLIC_BROADCAST_ANNOUNCEMENT);
-	tester_set_bit(rp->data, BTP_PBP_SET_BROADCAST_NAME);
-	tester_set_bit(rp->data, BTP_PBP_BROADCAST_SCAN_START);
-	tester_set_bit(rp->data, BTP_PBP_BROADCAST_SCAN_STOP);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_PBP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -165,13 +163,30 @@ static int pbp_broadcast_source_adv_setup(void)
 	ext_ad[2].data_len = pba_buf.len;
 	ext_ad[2].data = pba_buf.data;
 
-	err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, ext_ad,
-					     ARRAY_SIZE(ext_ad), NULL, 0, &gap_settings);
-	if (err) {
-		LOG_ERR("Could not set up extended advertisement: %d", err);
-		return -EINVAL;
+	struct btp_bap_broadcast_local_source *source;
+
+	source = btp_bap_broadcast_local_source_from_src_id_get(0);
+
+	if (source->ext_adv == NULL) {
+		err = tester_gap_create_adv_instance(&param, BTP_GAP_ADDR_TYPE_IDENTITY, ext_ad,
+						     ARRAY_SIZE(ext_ad), NULL, 0, &gap_settings,
+						     &source->ext_adv);
+		if (err != 0) {
+			LOG_ERR("Could not set up extended advertisement: %d", err);
+			return -EINVAL;
+		}
+	} else {
+		err = bt_le_ext_adv_set_data(source->ext_adv, ext_ad, ARRAY_SIZE(ext_ad), NULL, 0);
+
+		if (err != 0) {
+			LOG_ERR("Could not set extended advertisement data: %d", err);
+			return -EINVAL;
+		}
 	}
 
+	source->broadcast_id = broadcast_id;
+	source->allocated = true;
+
 	return 0;
 }
 
diff --git a/tests/bluetooth/tester/src/audio/btp_tmap.c b/tests/bluetooth/tester/src/audio/btp_tmap.c
index 765b945c4a810..1011eac2ac6b3 100644
--- a/tests/bluetooth/tester/src/audio/btp_tmap.c
+++ b/tests/bluetooth/tester/src/audio/btp_tmap.c
@@ -19,10 +19,8 @@ static uint8_t read_supported_commands(const void *cmd, uint16_t cmd_len, void *
 {
 	struct btp_tmap_read_supported_commands_rp *rp = rsp;
 
-	tester_set_bit(rp->data, BTP_TMAP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_TMAP_DISCOVER);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_TMAP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/audio/btp_vcp.c b/tests/bluetooth/tester/src/audio/btp_vcp.c
index b6b3c51753418..e31e5edac21ee 100644
--- a/tests/bluetooth/tester/src/audio/btp_vcp.c
+++ b/tests/bluetooth/tester/src/audio/btp_vcp.c
@@ -68,15 +68,8 @@ static uint8_t vcs_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_vcs_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_VCS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_VCS_SET_VOL);
-	tester_set_bit(rp->data, BTP_VCS_VOL_UP);
-	tester_set_bit(rp->data, BTP_VCS_VOL_DOWN);
-	tester_set_bit(rp->data, BTP_VCS_MUTE);
-	tester_set_bit(rp->data, BTP_VCS_UNMUTE);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_VCS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -198,15 +191,8 @@ static uint8_t vocs_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_vocs_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_VOCS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_VOCS_UPDATE_LOC);
-	tester_set_bit(rp->data, BTP_VOCS_UPDATE_DESC);
-	tester_set_bit(rp->data, BTP_VOCS_STATE_GET);
-	tester_set_bit(rp->data, BTP_VOCS_LOCATION_GET);
-	tester_set_bit(rp->data, BTP_VOCS_OFFSET_STATE_SET);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_VOCS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -623,22 +609,8 @@ static uint8_t vcp_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_vcp_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_VCP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_DISCOVER);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_STATE_READ);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_FLAGS_READ);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_VOL_DOWN);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_VOL_UP);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_UNMUTE_VOL_DOWN);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_UNMUTE_VOL_UP);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_SET_VOL);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_UNMUTE);
-	tester_set_bit(rp->data, BTP_VCP_VOL_CTLR_MUTE);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_VCP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/btp.c b/tests/bluetooth/tester/src/btp.c
index 3951ea0aee1bb..169b8c9e5024d 100644
--- a/tests/bluetooth/tester/src/btp.c
+++ b/tests/bluetooth/tester/src/btp.c
@@ -276,6 +276,7 @@ void tester_rsp_buffer_allocate(size_t len, uint8_t **data)
 	*data = net_buf_simple_add(rsp_buf, len);
 }
 
+K_MUTEX_DEFINE(uart_mutex);
 static void tester_send_with_index(uint8_t service, uint8_t opcode, uint8_t index,
 				   const uint8_t *data, size_t len)
 {
@@ -286,10 +287,12 @@ static void tester_send_with_index(uint8_t service, uint8_t opcode, uint8_t inde
 	msg.index = index;
 	msg.len = sys_cpu_to_le16(len);
 
+	k_mutex_lock(&uart_mutex, K_FOREVER);
 	uart_send((uint8_t *)&msg, sizeof(msg));
 	if (data && len) {
 		uart_send(data, len);
 	}
+	k_mutex_unlock(&uart_mutex);
 }
 
 static void tester_rsp_with_index(uint8_t service, uint8_t opcode, uint8_t index,
@@ -353,3 +356,23 @@ void tester_rsp(uint8_t service, uint8_t opcode, uint8_t status)
 	(void)memset(cmd, 0, sizeof(*cmd));
 	k_fifo_put(&avail_queue, cmd);
 }
+
+uint16_t tester_supported_commands(uint8_t service, uint8_t *cmds)
+{
+	uint8_t opcode_max = 0;
+
+	__ASSERT_NO_MSG(service <= BTP_SERVICE_ID_MAX);
+
+	for (size_t i = 0; i < service_handler[service].num; i++) {
+		const struct btp_handler *handler = &service_handler[service].handlers[i];
+
+		tester_set_bit(cmds, handler->opcode);
+
+		if (handler->opcode > opcode_max) {
+			opcode_max = handler->opcode;
+		}
+	}
+
+	/* bytes used to store supported commands bitmask */
+	return (opcode_max / 8) + 1;
+}
diff --git a/tests/bluetooth/tester/src/btp/btp.h b/tests/bluetooth/tester/src/btp/btp.h
index 06dc078839894..469a878dc25e0 100644
--- a/tests/bluetooth/tester/src/btp/btp.h
+++ b/tests/bluetooth/tester/src/btp/btp.h
@@ -7,6 +7,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef TESTS_BLUETOOTH_TESTER_SRC_BTP_
+#define TESTS_BLUETOOTH_TESTER_SRC_BTP_
+
 #include <zephyr/sys/util.h>
 #include <zephyr/bluetooth/addr.h>
 
@@ -87,6 +90,8 @@
 
 #define BTP_STATUS_VAL(err) (err) ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS
 
+#define BTP_EVENT_OPCODE 0x80
+
 /* TODO indicate delay response, should be removed when all commands are
  * converted to cmd+status+ev pattern
  */
@@ -104,3 +109,5 @@ struct btp_hdr {
 struct btp_status {
 	uint8_t code;
 } __packed;
+
+#endif /* TESTS_BLUETOOTH_TESTER_SRC_BTP_ */
diff --git a/tests/bluetooth/tester/src/btp/btp_gap.h b/tests/bluetooth/tester/src/btp/btp_gap.h
index fd7826aab0fb1..b9df0f0913671 100644
--- a/tests/bluetooth/tester/src/btp/btp_gap.h
+++ b/tests/bluetooth/tester/src/btp/btp_gap.h
@@ -319,6 +319,11 @@ struct btp_gap_padv_sync_transfer_recv_cmd {
 	uint8_t flags;
 } __packed;
 
+#define BTP_GAP_SET_RPA_TIMEOUT                 0x30
+struct btp_gap_set_rpa_timeout_cmd {
+	uint16_t rpa_timeout;
+} __packed;
+
 /* events */
 #define BTP_GAP_EV_NEW_SETTINGS			0x80
 struct btp_gap_new_settings_ev {
@@ -448,17 +453,19 @@ struct bt_le_per_adv_param;
 struct bt_le_per_adv_sync_param;
 struct bt_le_adv_param;
 struct bt_data;
-struct bt_le_ext_adv *tester_gap_ext_adv_get(void);
+struct bt_le_ext_adv *tester_gap_ext_adv_get(uint8_t ext_adv_idx);
 struct bt_le_per_adv_sync *tester_gap_padv_get(void);
 int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_addr_type,
 				   const struct bt_data *ad, size_t ad_len,
-				   const struct bt_data *sd, size_t sd_len, uint32_t *settings);
-int tester_gap_stop_ext_adv(void);
-int tester_gap_start_ext_adv(void);
-int tester_gap_padv_configure(const struct bt_le_per_adv_param *param);
-int tester_gap_padv_set_data(struct bt_data *per_ad, uint8_t ad_len);
-int tester_gap_padv_start(void);
-int tester_gap_padv_stop(void);
+				   const struct bt_data *sd, size_t sd_len,
+				   uint32_t *settings, struct bt_le_ext_adv **ext_adv);
+int tester_gap_stop_ext_adv(struct bt_le_ext_adv *ext_adv);
+int tester_gap_start_ext_adv(struct bt_le_ext_adv *ext_adv);
+int tester_gap_padv_configure(struct bt_le_ext_adv *ext_adv,
+			      const struct bt_le_per_adv_param *param);
+int tester_gap_padv_set_data(struct bt_le_ext_adv *ext_adv, struct bt_data *per_ad, uint8_t ad_len);
+int tester_gap_padv_start(struct bt_le_ext_adv *ext_adv);
+int tester_gap_padv_stop(struct bt_le_ext_adv *ext_adv);
 int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params);
 int tester_gap_padv_stop_sync(void);
 #endif /* defined(CONFIG_BT_EXT_ADV) */
diff --git a/tests/bluetooth/tester/src/btp/btp_mesh.h b/tests/bluetooth/tester/src/btp/btp_mesh.h
index 17f49e4927ed0..6a8e54f9f141e 100644
--- a/tests/bluetooth/tester/src/btp/btp_mesh.h
+++ b/tests/bluetooth/tester/src/btp/btp_mesh.h
@@ -1060,6 +1060,9 @@ struct btp_priv_node_id_set_cmd {
 } __packed;
 
 #define BTP_MESH_PROXY_PRIVATE_IDENTITY		0x72
+struct btp_proxy_priv_identity_cmd {
+	uint8_t enabled;
+} __packed;
 
 #define BTP_MESH_OD_PRIV_PROXY_GET		0x73
 struct btp_od_priv_proxy_get_cmd {
diff --git a/tests/bluetooth/tester/src/btp/bttester.h b/tests/bluetooth/tester/src/btp/bttester.h
index c43725a0aaf34..e0bb268cf1bb2 100644
--- a/tests/bluetooth/tester/src/btp/bttester.h
+++ b/tests/bluetooth/tester/src/btp/bttester.h
@@ -53,6 +53,8 @@ void tester_register_command_handlers(uint8_t service,
 				      const struct btp_handler *handlers,
 				      size_t num);
 
+uint16_t tester_supported_commands(uint8_t service, uint8_t *cmds);
+
 uint8_t tester_init_gatt(void);
 uint8_t tester_unregister_gatt(void);
 
diff --git a/tests/bluetooth/tester/src/btp_core.c b/tests/bluetooth/tester/src/btp_core.c
index 2da735f44ec72..ddc8db2958b87 100644
--- a/tests/bluetooth/tester/src/btp_core.c
+++ b/tests/bluetooth/tester/src/btp_core.c
@@ -35,12 +35,8 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_core_read_supported_commands_rp *rp = rsp;
 
-	tester_set_bit(rp->data, BTP_CORE_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_CORE_READ_SUPPORTED_SERVICES);
-	tester_set_bit(rp->data, BTP_CORE_REGISTER_SERVICE);
-	tester_set_bit(rp->data, BTP_CORE_UNREGISTER_SERVICE);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_CORE, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index b344f76d19ab1..440be8d3d888d 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -7,9 +7,11 @@
  */
 #include <stdint.h>
 
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/gap.h>
 #include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util_macro.h>
 #include <zephyr/types.h>
 #include <string.h>
 
@@ -45,10 +47,8 @@ static uint8_t oob_legacy_tk[16] = { 0 };
 
 static bool filter_list_in_use;
 
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 static struct bt_le_oob oob_sc_local = { 0 };
 static struct bt_le_oob oob_sc_remote = { 0 };
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
 
 /* connection parameters for rejection test */
 #define REJECT_INTERVAL_MIN 0x0C80
@@ -56,23 +56,11 @@ static struct bt_le_oob oob_sc_remote = { 0 };
 #define REJECT_LATENCY 0x0000
 #define REJECT_SUPERVISION_TIMEOUT 0x0C80
 
-#if defined(CONFIG_BT_PRIVACY)
 static struct {
 	bt_addr_le_t addr;
 	bool supported;
 } cars[CONFIG_BT_MAX_PAIRED];
 
-static uint8_t read_car_cb(struct bt_conn *conn, uint8_t err,
-			  struct bt_gatt_read_params *params, const void *data,
-			  uint16_t length);
-
-static struct bt_gatt_read_params read_car_params = {
-		.func = read_car_cb,
-		.by_uuid.uuid = BT_UUID_CENTRAL_ADDR_RES,
-		.by_uuid.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE,
-		.by_uuid.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE,
-};
-
 static uint8_t read_car_cb(struct bt_conn *conn, uint8_t err,
 			  struct bt_gatt_read_params *params, const void *data,
 			  uint16_t length)
@@ -100,7 +88,13 @@ static uint8_t read_car_cb(struct bt_conn *conn, uint8_t err,
 
 	return BT_GATT_ITER_STOP;
 }
-#endif
+
+static struct bt_gatt_read_params read_car_params = {
+	.func = read_car_cb,
+	.by_uuid.uuid = BT_UUID_CENTRAL_ADDR_RES,
+	.by_uuid.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE,
+	.by_uuid.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE,
+};
 
 static void le_connected(struct bt_conn *conn, uint8_t err)
 {
@@ -239,44 +233,8 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_gap_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_GAP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_GAP_READ_CONTROLLER_INDEX_LIST);
-	tester_set_bit(rp->data, BTP_GAP_READ_CONTROLLER_INFO);
-	tester_set_bit(rp->data, BTP_GAP_SET_POWERED);
-	tester_set_bit(rp->data, BTP_GAP_SET_CONNECTABLE);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_GAP_SET_DISCOVERABLE);
-	tester_set_bit(rp->data, BTP_GAP_SET_BONDABLE);
-	tester_set_bit(rp->data, BTP_GAP_START_ADVERTISING);
-	tester_set_bit(rp->data, BTP_GAP_STOP_ADVERTISING);
-	tester_set_bit(rp->data, BTP_GAP_START_DISCOVERY);
-	tester_set_bit(rp->data, BTP_GAP_STOP_DISCOVERY);
-	tester_set_bit(rp->data, BTP_GAP_CONNECT);
-	tester_set_bit(rp->data, BTP_GAP_DISCONNECT);
-
-	/* octet 2 */
-	tester_set_bit(rp->data, BTP_GAP_SET_IO_CAP);
-	tester_set_bit(rp->data, BTP_GAP_PAIR);
-	tester_set_bit(rp->data, BTP_GAP_PASSKEY_ENTRY);
-	tester_set_bit(rp->data, BTP_GAP_PASSKEY_CONFIRM);
-	tester_set_bit(rp->data, BTP_GAP_START_DIRECTED_ADV);
-	tester_set_bit(rp->data, BTP_GAP_CONN_PARAM_UPDATE);
-
-	/* octet 3 */
-	tester_set_bit(rp->data, BTP_GAP_OOB_LEGACY_SET_DATA);
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
-	tester_set_bit(rp->data, BTP_GAP_OOB_SC_GET_LOCAL_DATA);
-	tester_set_bit(rp->data, BTP_GAP_OOB_SC_SET_REMOTE_DATA);
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
-	tester_set_bit(rp->data, BTP_GAP_SET_MITM);
-	tester_set_bit(rp->data, BTP_GAP_SET_FILTER_LIST);
-#if defined(CONFIG_BT_EXT_ADV)
-	tester_set_bit(rp->data, BTP_GAP_SET_EXTENDED_ADVERTISING);
-#endif
-
-	*rsp_len = sizeof(*rp) + 4;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_GAP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -308,19 +266,19 @@ static uint8_t controller_info(const void *cmd, uint16_t cmd_len,
 	/*
 	 * Re-use the oob data read here in get_oob_sc_local_data()
 	 */
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
-	oob_sc_local = oob_local;
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
+	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+		oob_sc_local = oob_local;
+	}
 
 	/*
 	 * If privacy is used, the device uses random type address, otherwise
 	 * static random or public type address is used.
 	 */
-#if !defined(CONFIG_BT_PRIVACY)
-	if (oob_local.addr.type == BT_ADDR_LE_RANDOM) {
-		atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_STATIC_ADDRESS);
+	if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
+		if (oob_local.addr.type == BT_ADDR_LE_RANDOM) {
+			atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_STATIC_ADDRESS);
+		}
 	}
-#endif /* CONFIG_BT_PRIVACY */
 
 	supported_settings = BIT(BTP_GAP_SETTINGS_POWERED);
 	supported_settings |= BIT(BTP_GAP_SETTINGS_CONNECTABLE);
@@ -339,9 +297,12 @@ static uint8_t controller_info(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 static const char *oob_config_str(int oob_config)
 {
+	if (!IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+		return "no";
+	}
+
 	switch (oob_config) {
 	case BT_CONN_OOB_LOCAL_ONLY:
 		return "Local";
@@ -354,7 +315,6 @@ static const char *oob_config_str(int oob_config)
 		return "no";
 	}
 }
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
 
 static void oob_data_request(struct bt_conn *conn,
 			     struct bt_conn_oob_info *oob_info)
@@ -371,9 +331,13 @@ static void oob_data_request(struct bt_conn *conn,
 	bt_addr_le_to_str(info.le.dst, addr, sizeof(addr));
 
 	switch (oob_info->type) {
-#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 	case BT_CONN_OOB_LE_SC:
 	{
+		if (IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
+			LOG_ERR("OOB LE SC not supported");
+			break;
+		}
+
 		LOG_DBG("Set %s OOB SC data for %s, ",
 			oob_config_str(oob_info->lesc.oob_config),
 			addr);
@@ -411,10 +375,13 @@ static void oob_data_request(struct bt_conn *conn,
 
 		break;
 	}
-#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
 
-#if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
 	case BT_CONN_OOB_LE_LEGACY:
+		if (IS_ENABLED(CONFIG_BT_SMP_SC_PAIR_ONLY)) {
+			LOG_ERR("OOB LE Legacy not supported");
+			break;
+		}
+
 		LOG_DBG("Legacy OOB TK requested from remote %s", addr);
 
 		err = bt_le_oob_set_legacy_tk(conn, oob_legacy_tk);
@@ -423,7 +390,6 @@ static void oob_data_request(struct bt_conn *conn,
 		}
 
 		break;
-#endif /* !defined(CONFIG_BT_SMP_SC_PAIR_ONLY) */
 	default:
 		LOG_ERR("Unhandled OOB type %d", oob_info->type);
 		break;
@@ -521,22 +487,57 @@ static struct bt_data ad[10] = {
 };
 static struct bt_data sd[10];
 
-#if defined(CONFIG_BT_EXT_ADV)
-static struct bt_le_ext_adv *ext_adv;
+#if CONFIG_BT_EXT_ADV
+static struct bt_le_ext_adv *ext_adv_sets[CONFIG_BT_EXT_ADV_MAX_ADV_SET];
+#else
+static struct bt_le_ext_adv *ext_adv_sets[1];
+#endif
 
-struct bt_le_ext_adv *tester_gap_ext_adv_get(void)
+struct bt_le_ext_adv *tester_gap_ext_adv_get(uint8_t ext_adv_idx)
 {
-	return ext_adv;
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return NULL;
+	}
+
+	if (ext_adv_idx >= ARRAY_SIZE(ext_adv_sets)) {
+		LOG_ERR("Invalid ext_adv_id: %d", ext_adv_idx);
+		return NULL;
+	}
+
+	return ext_adv_sets[ext_adv_idx];
+}
+
+static int tester_gap_ext_adv_idx_free_get(void)
+{
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return -ENOTSUP;
+	}
+
+	for (int i = 0; i < ARRAY_SIZE(ext_adv_sets); i++) {
+		if (ext_adv_sets[i] == NULL) {
+			return i;
+		}
+	}
+
+	return -ENOMEM;
 }
 
-int tester_gap_start_ext_adv(void)
+int tester_gap_start_ext_adv(struct bt_le_ext_adv *ext_adv)
 {
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
+	if (ext_adv == NULL) {
+		LOG_ERR("Invalid ext_adv");
+		return -EINVAL;
+	}
+
 	err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
 	if (err != 0) {
 		LOG_ERR("Failed to start advertising");
-
 		return -EINVAL;
 	}
 
@@ -545,10 +546,19 @@ int tester_gap_start_ext_adv(void)
 	return 0;
 }
 
-int tester_gap_stop_ext_adv(void)
+int tester_gap_stop_ext_adv(struct bt_le_ext_adv *ext_adv)
 {
+	if (!IS_ENABLED(CONFIG_BT_EXT_ADV)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
+	if (ext_adv == NULL) {
+		LOG_ERR("Invalid ext_adv");
+		return -EINVAL;
+	}
+
 	err = bt_le_ext_adv_stop(ext_adv);
 	if (err != 0) {
 		LOG_ERR("Failed to stop advertising");
@@ -560,7 +570,6 @@ int tester_gap_stop_ext_adv(void)
 
 	return 0;
 }
-#endif /* defined(CONFIG_BT_EXT_ADV) */
 
 static uint8_t set_discoverable(const void *cmd, uint16_t cmd_len,
 			       void *rsp, uint16_t *rsp_len)
@@ -614,10 +623,10 @@ static uint8_t set_bondable(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_addr_type,
-				   const struct bt_data *ad, size_t ad_len,
-				   const struct bt_data *sd, size_t sd_len,
-				   uint32_t *settings)
+int tester_gap_create_adv_instance(struct bt_le_adv_param *param,
+				   uint8_t own_addr_type, const struct bt_data *ad, size_t ad_len,
+				   const struct bt_data *sd, size_t sd_len, uint32_t *settings,
+				   struct bt_le_ext_adv **ext_adv)
 {
 	int err = 0;
 
@@ -641,47 +650,67 @@ int tester_gap_create_adv_instance(struct bt_le_adv_param *param, uint8_t own_ad
 	case BTP_GAP_ADDR_TYPE_IDENTITY:
 		param->options |= BT_LE_ADV_OPT_USE_IDENTITY;
 		break;
-#if defined(CONFIG_BT_PRIVACY)
 	case BTP_GAP_ADDR_TYPE_RESOLVABLE_PRIVATE:
+		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
+			return -EINVAL;
+		}
+
 		/* RPA usage is controlled via privacy settings */
 		if (!atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY)) {
 			return -EINVAL;
 		}
 		break;
 	case BTP_GAP_ADDR_TYPE_NON_RESOLVABLE_PRIVATE:
+		if (!IS_ENABLED(CONFIG_BT_PRIVACY)) {
+			return -EINVAL;
+		}
+
 		/* NRPA is used only for non-connectable advertising */
 		if (atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_CONNECTABLE)) {
 			return -EINVAL;
 		}
 		break;
-#endif
 	default:
 		return -EINVAL;
 	}
 
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV) && atomic_test_bit(&current_settings,
 	    BTP_GAP_SETTINGS_EXTENDED_ADVERTISING)) {
+
 		param->options |= BT_LE_ADV_OPT_EXT_ADV;
-		if (ext_adv != NULL) {
-			err = bt_le_ext_adv_stop(ext_adv);
+		if (*ext_adv) {
+			err = bt_le_ext_adv_stop(*ext_adv);
 			if (err != 0) {
 				return err;
 			}
 
-			err = bt_le_ext_adv_delete(ext_adv);
+			err = bt_le_ext_adv_delete(*ext_adv);
 			if (err != 0) {
 				return err;
 			}
 
-			ext_adv = NULL;
+			*ext_adv = NULL;
 		}
 
-		err = bt_le_ext_adv_create(param, NULL, &ext_adv);
+		int index = tester_gap_ext_adv_idx_free_get();
+
+		if (index < 0) {
+			LOG_ERR("No free ext_adv index");
+			return -ENOMEM;
+		}
+
+		/* Set the set_id to be matching the index of the ext_adv set */
+		param->sid = index;
+
+		err = bt_le_ext_adv_create(param, NULL, &ext_adv_sets[index]);
 		if (err != 0) {
 			return BTP_STATUS_FAILED;
 		}
 
-		err = bt_le_ext_adv_set_data(ext_adv, ad, ad_len, sd_len ? sd : NULL, sd_len);
+		err = bt_le_ext_adv_set_data(ext_adv_sets[index], ad, ad_len, sd_len ?
+					     sd : NULL, sd_len);
+
+		*ext_adv = ext_adv_sets[index];
 	}
 
 	return err;
@@ -740,17 +769,17 @@ static uint8_t start_advertising(const void *cmd, uint16_t cmd_len,
 		i += sd[sd_len].data_len;
 	}
 
-	err = tester_gap_create_adv_instance(&param, own_addr_type, ad, adv_len, sd, sd_len, NULL);
+	struct bt_le_ext_adv *ext_adv = NULL;
+
+	err = tester_gap_create_adv_instance(&param, own_addr_type, ad, adv_len, sd,
+					     sd_len, NULL, &ext_adv);
 	if (err != 0) {
 		return BTP_STATUS_FAILED;
 	}
 
-#if defined(CONFIG_BT_EXT_ADV)
-	if (atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING)) {
+	if (IS_ENABLED(CONFIG_BT_EXT_ADV) &&
+	    atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING)) {
 		err = bt_le_ext_adv_start(ext_adv, BT_LE_EXT_ADV_START_DEFAULT);
-#else
-	if (0) {
-#endif
 	} else {
 		err = bt_le_adv_start(&param, ad, adv_len, sd_len ? sd : NULL, sd_len);
 	}
@@ -785,8 +814,7 @@ static uint8_t start_directed_advertising(const void *cmd, uint16_t cmd_len,
 		adv_param.interval_min = BT_GAP_ADV_FAST_INT_MIN_2;
 	}
 
-	if (options & BTP_GAP_START_DIRECTED_ADV_PEER_RPA) {
-#if defined(CONFIG_BT_PRIVACY)
+	if (IS_ENABLED(CONFIG_BT_PRIVACY) && (options & BTP_GAP_START_DIRECTED_ADV_PEER_RPA)) {
 		/* check if peer supports Central Address Resolution */
 		for (int i = 0; i < CONFIG_BT_MAX_PAIRED; i++) {
 			if (bt_addr_le_eq(&cp->address, &cars[i].addr)) {
@@ -795,7 +823,6 @@ static uint8_t start_directed_advertising(const void *cmd, uint16_t cmd_len,
 				}
 			}
 		}
-#endif
 	}
 
 	if (bt_le_adv_start(&adv_param, NULL, 0, NULL, 0) < 0) {
@@ -998,20 +1025,21 @@ static uint8_t stop_discovery(const void *cmd, uint16_t cmd_len,
 static uint8_t connect(const void *cmd, uint16_t cmd_len,
 		       void *rsp, uint16_t *rsp_len)
 {
-	/* The conn interval is set to 60ms (0x30). This is to better support test cases where we
-	 * need to connect to multiple peripherals (up to 3). The connection interval should also be
-	 * a multiple of 30ms, as that is ideal to support both 7.5ms and 10ms ISO intervals
-	 */
-	const uint16_t interval = BT_GAP_MS_TO_CONN_INTERVAL(60U);
-	const struct bt_le_conn_param *conn_param =
-		BT_LE_CONN_PARAM(interval, interval, 0U, BT_GAP_MS_TO_CONN_TIMEOUT(4000U));
+	struct bt_le_conn_param conn_param;
+
+	if (IS_ENABLED(CONFIG_BT_BAP_UNICAST) || IS_ENABLED(CONFIG_BT_BAP_BROADCAST_ASSISTANT)) {
+		conn_param = *BT_BAP_CONN_PARAM_RELAXED;
+	} else {
+		conn_param = *BT_LE_CONN_PARAM_DEFAULT;
+	}
+
 	const struct btp_gap_connect_cmd *cp = cmd;
 	int err;
 
 	if (!bt_addr_le_eq(&cp->address, BT_ADDR_LE_ANY)) {
 		struct bt_conn *conn = NULL;
 
-		err = bt_conn_le_create(&cp->address, BT_CONN_LE_CREATE_CONN, conn_param, &conn);
+		err = bt_conn_le_create(&cp->address, BT_CONN_LE_CREATE_CONN, &conn_param, &conn);
 		if (err) {
 			LOG_ERR("Failed to create connection (%d)", err);
 			return BTP_STATUS_FAILED;
@@ -1019,7 +1047,7 @@ static uint8_t connect(const void *cmd, uint16_t cmd_len,
 
 		bt_conn_unref(conn);
 	} else {
-		err = bt_conn_le_create_auto(BT_CONN_LE_CREATE_CONN, conn_param);
+		err = bt_conn_le_create_auto(BT_CONN_LE_CREATE_CONN, &conn_param);
 		if (err) {
 			LOG_ERR("Failed to create auto connection (%d)", err);
 			return BTP_STATUS_FAILED;
@@ -1097,7 +1125,7 @@ enum bt_security_err auth_pairing_accept(struct bt_conn *conn,
 	struct btp_gap_bond_lost_ev ev;
 	const bt_addr_le_t *addr = bt_conn_get_dst(conn);
 
-	if (!bt_addr_le_is_bonded(BT_ID_DEFAULT, addr)) {
+	if (!bt_le_bond_exists(BT_ID_DEFAULT, addr)) {
 		return BT_SECURITY_ERR_SUCCESS;
 	}
 
@@ -1126,12 +1154,10 @@ void auth_pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
 
 static void auth_pairing_complete(struct bt_conn *conn, bool bonded)
 {
-#if defined(CONFIG_BT_PRIVACY)
-	/* Read peer's Central Address Resolution if bonded */
-	if (bonded) {
+	if (IS_ENABLED(CONFIG_BT_PRIVACY) && bonded) {
+		/* Read peer's Central Address Resolution if bonded */
 		bt_gatt_read(conn, &read_car_params);
 	}
-#endif
 }
 
 static struct bt_conn_auth_info_cb auth_info_cb = {
@@ -1375,8 +1401,9 @@ static uint8_t set_filter_list(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len,
-					void *rsp, uint16_t *rsp_len)
+#if defined(CONFIG_BT_EXT_ADV)
+static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len, void *rsp,
+					uint16_t *rsp_len)
 {
 	const struct btp_gap_set_extended_advertising_cmd *cp = cmd;
 	struct btp_gap_set_extended_advertising_rp *rp = rsp;
@@ -1384,11 +1411,9 @@ static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len,
 	LOG_DBG("ext adv settings: %u", cp->settings);
 
 	if (cp->settings != 0) {
-		atomic_set_bit(&current_settings,
-			       BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+		atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
 	} else {
-		atomic_clear_bit(&current_settings,
-				 BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+		atomic_clear_bit(&current_settings, BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
 	}
 
 	rp->current_settings = sys_cpu_to_le32(current_settings);
@@ -1396,13 +1421,16 @@ static uint8_t set_extended_advertising(const void *cmd, uint16_t cmd_len,
 	*rsp_len = sizeof(*rp);
 	return BTP_STATUS_SUCCESS;
 }
+#endif /* defined(CONFIG_BT_EXT_ADV) */
 
-#if defined(CONFIG_BT_PER_ADV)
-static struct bt_data padv[10];
 static struct bt_le_per_adv_sync *pa_sync;
 
 struct bt_le_per_adv_sync *tester_gap_padv_get(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV)) {
+		return NULL;
+	}
+
 	return pa_sync;
 }
 
@@ -1447,7 +1475,11 @@ static struct bt_le_per_adv_sync_cb pa_sync_cb = {
 	.term = pa_sync_terminated_cb,
 };
 
-int tester_gap_padv_configure(const struct bt_le_per_adv_param *param)
+#if defined(CONFIG_BT_PER_ADV)
+static struct bt_data padv[10];
+
+int tester_gap_padv_configure(struct bt_le_ext_adv *ext_adv,
+			      const struct bt_le_per_adv_param *param)
 {
 	int err;
 	struct bt_le_adv_param ext_adv_param =
@@ -1456,8 +1488,9 @@ int tester_gap_padv_configure(const struct bt_le_per_adv_param *param)
 	if (ext_adv == NULL) {
 		current_settings = BIT(BTP_GAP_SETTINGS_DISCOVERABLE) |
 				   BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
-		err = tester_gap_create_adv_instance(&ext_adv_param, BTP_GAP_ADDR_TYPE_IDENTITY, ad,
-						     1, NULL, 0, NULL);
+		err = tester_gap_create_adv_instance(&ext_adv_param,
+						     BTP_GAP_ADDR_TYPE_IDENTITY, ad, 1, NULL, 0,
+						     NULL, &ext_adv);
 		if (err != 0) {
 			return -EINVAL;
 		}
@@ -1486,9 +1519,11 @@ static uint8_t padv_configure(const void *cmd, uint16_t cmd_len,
 		options |= BT_LE_PER_ADV_OPT_USE_TX_POWER;
 	}
 
-	err = tester_gap_padv_configure(BT_LE_PER_ADV_PARAM(sys_le16_to_cpu(cp->interval_min),
-							    sys_le16_to_cpu(cp->interval_max),
-							    options));
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
+
+	err = tester_gap_padv_configure(ext_adv,
+					BT_LE_PER_ADV_PARAM(sys_le16_to_cpu(cp->interval_min),
+					sys_le16_to_cpu(cp->interval_max), options));
 	if (err) {
 		return BTP_STATUS_FAILED;
 	}
@@ -1500,7 +1535,7 @@ static uint8_t padv_configure(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_padv_start(void)
+int tester_gap_padv_start(struct bt_le_ext_adv *ext_adv)
 {
 	int err;
 
@@ -1509,7 +1544,7 @@ int tester_gap_padv_start(void)
 	}
 
 	if (!atomic_test_bit(&current_settings, BTP_GAP_SETTINGS_ADVERTISING)) {
-		err = tester_gap_start_ext_adv();
+		err = tester_gap_start_ext_adv(ext_adv);
 		if (err != 0) {
 			return -EINVAL;
 		}
@@ -1530,7 +1565,9 @@ static uint8_t padv_start(const void *cmd, uint16_t cmd_len,
 	int err;
 	struct btp_gap_padv_start_rp *rp = rsp;
 
-	err = tester_gap_padv_start();
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
+
+	err = tester_gap_padv_start(ext_adv);
 
 	if (err) {
 		return BTP_STATUS_FAILED;
@@ -1543,7 +1580,7 @@ static uint8_t padv_start(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_padv_stop(void)
+int tester_gap_padv_stop(struct bt_le_ext_adv *ext_adv)
 {
 	int err;
 
@@ -1566,8 +1603,9 @@ static uint8_t padv_stop(const void *cmd, uint16_t cmd_len,
 {
 	int err;
 	struct btp_gap_padv_stop_rp *rp = rsp;
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
 
-	err = tester_gap_padv_stop();
+	err = tester_gap_padv_stop(ext_adv);
 
 	if (err) {
 		return BTP_STATUS_FAILED;
@@ -1580,7 +1618,7 @@ static uint8_t padv_stop(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
-int tester_gap_padv_set_data(struct bt_data *per_ad, uint8_t ad_len)
+int tester_gap_padv_set_data(struct bt_le_ext_adv *ext_adv, struct bt_data *per_ad, uint8_t ad_len)
 {
 	int err;
 
@@ -1601,9 +1639,10 @@ static uint8_t padv_set_data(const void *cmd, uint16_t cmd_len,
 			     void *rsp, uint16_t *rsp_len)
 {
 	int err;
-	uint8_t padv_len = 0U;
 	const struct btp_gap_padv_set_data_cmd *cp = cmd;
 
+	uint8_t padv_len = 0U;
+
 	for (uint8_t i = 0; i < cp->data_len; padv_len++) {
 		if (padv_len >= ARRAY_SIZE(padv)) {
 			LOG_ERR("padv[] Out of memory");
@@ -1616,13 +1655,20 @@ static uint8_t padv_set_data(const void *cmd, uint16_t cmd_len,
 		i += padv[padv_len].data_len;
 	}
 
-	err = tester_gap_padv_set_data(padv, padv_len);
+	struct bt_le_ext_adv *ext_adv = tester_gap_ext_adv_get(0);
+
+	err = tester_gap_padv_set_data(ext_adv, padv, padv_len);
 
 	return BTP_STATUS_VAL(err);
 }
+#endif /* defined(CONFIG_BT_PER_ADV) */
 
 int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	if (pa_sync != NULL) {
@@ -1640,6 +1686,10 @@ int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params)
 
 int tester_gap_padv_stop_sync(void)
 {
+	if (!IS_ENABLED(CONFIG_BT_PER_ADV_SYNC)) {
+		return -ENOTSUP;
+	}
+
 	int err;
 
 	if (pa_sync == NULL) {
@@ -1654,6 +1704,7 @@ int tester_gap_padv_stop_sync(void)
 	return err;
 }
 
+#if defined(CONFIG_BT_PER_ADV)
 static uint8_t padv_create_sync(const void *cmd, uint16_t cmd_len,
 				void *rsp, uint16_t *rsp_len)
 {
@@ -1679,40 +1730,24 @@ static uint8_t padv_create_sync(const void *cmd, uint16_t cmd_len,
 
 	return BTP_STATUS_VAL(err);
 }
+#endif /* defined(CONFIG_BT_PER_ADV) */
 
-static uint8_t padv_sync_transfer_set_info(const void *cmd, uint16_t cmd_len,
-					   void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_set_info_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
-
-static uint8_t padv_sync_transfer_start(const void *cmd, uint16_t cmd_len,
-					void *rsp, uint16_t *rsp_len)
+#if defined(CONFIG_BT_RPA_TIMEOUT_DYNAMIC)
+static uint8_t set_rpa_timeout(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
-	const struct btp_gap_padv_sync_transfer_start_cmd *cp = cmd;
-	(void)cp;
-
-	/* TODO */
-
-	return BTP_STATUS_FAILED;
-}
+	const struct btp_gap_set_rpa_timeout_cmd *cp = cmd;
+	int err;
 
-static uint8_t padv_sync_transfer_recv(const void *cmd, uint16_t cmd_len,
-				       void *rsp, uint16_t *rsp_len)
-{
-	const struct btp_gap_padv_sync_transfer_recv_cmd *cp = cmd;
-	(void)cp;
+	err = bt_le_set_rpa_timeout(sys_le16_to_cpu(cp->rpa_timeout));
 
-	/* TODO */
+	if (err != 0) {
+		LOG_DBG("Failed to set RPA timeout: %d", err);
+		return BTP_STATUS_FAILED;
+	}
 
-	return BTP_STATUS_FAILED;
+	return BTP_STATUS_SUCCESS;
 }
-#endif /* defined(CONFIG_BT_PER_ADV) */
+#endif /* defined(CONFIG_BT_RPA_TIMEOUT_DYNAMIC) */
 
 static const struct btp_handler handlers[] = {
 	{
@@ -1876,23 +1911,15 @@ static const struct btp_handler handlers[] = {
 		.expect_len = sizeof(struct btp_gap_padv_create_sync_cmd),
 		.func = padv_create_sync,
 	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_SET_INFO,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_set_info_cmd),
-		.func = padv_sync_transfer_set_info,
-	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_START,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_start_cmd),
-		.func = padv_sync_transfer_start,
-	},
-	{
-		.opcode = BTP_GAP_PADV_SYNC_TRANSFER_RECV,
-		.expect_len = sizeof(struct btp_gap_padv_sync_transfer_recv_cmd),
-		.func = padv_sync_transfer_recv,
-	},
 #endif /* defined(CONFIG_BT_PER_ADV) */
 #endif /* defined(CONFIG_BT_EXT_ADV) */
+#if defined(CONFIG_BT_RPA_TIMEOUT_DYNAMIC)
+	{
+		.opcode = BTP_GAP_SET_RPA_TIMEOUT,
+		.expect_len = sizeof(struct btp_gap_set_rpa_timeout_cmd),
+		.func = set_rpa_timeout,
+	},
+#endif /* defined(CONFIG_BT_RPA_TIMEOUT_DYNAMIC) */
 };
 
 uint8_t tester_init_gap(void)
@@ -1917,16 +1944,16 @@ uint8_t tester_init_gap(void)
 	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_CONNECTABLE);
 	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_BONDABLE);
 	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_LE);
-#if defined(CONFIG_BT_PRIVACY)
-	atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY);
-#endif /* CONFIG_BT_PRIVACY */
+	if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
+		atomic_set_bit(&current_settings, BTP_GAP_SETTINGS_PRIVACY);
+	}
 
 	bt_conn_cb_register(&conn_callbacks);
 	bt_conn_auth_info_cb_register(&auth_info_cb);
 
-#if defined(CONFIG_BT_PER_ADV)
-	bt_le_per_adv_sync_cb_register(&pa_sync_cb);
-#endif /* defined(CONFIG_BT_PER_ADV) */
+	if (IS_ENABLED(CONFIG_BT_PER_ADV)) {
+		bt_le_per_adv_sync_cb_register(&pa_sync_cb);
+	}
 
 	tester_register_command_handlers(BTP_SERVICE_ID_GAP, handlers,
 					 ARRAY_SIZE(handlers));
diff --git a/tests/bluetooth/tester/src/btp_gatt.c b/tests/bluetooth/tester/src/btp_gatt.c
index ee4f1b3cbd976..c12a4021397c0 100644
--- a/tests/bluetooth/tester/src/btp_gatt.c
+++ b/tests/bluetooth/tester/src/btp_gatt.c
@@ -222,48 +222,8 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_gatt_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_GATT_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_GATT_ADD_SERVICE);
-	tester_set_bit(rp->data, BTP_GATT_ADD_CHARACTERISTIC);
-	tester_set_bit(rp->data, BTP_GATT_ADD_DESCRIPTOR);
-	tester_set_bit(rp->data, BTP_GATT_ADD_INCLUDED_SERVICE);
-	tester_set_bit(rp->data, BTP_GATT_SET_VALUE);
-	tester_set_bit(rp->data, BTP_GATT_START_SERVER);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_GATT_SET_ENC_KEY_SIZE);
-	tester_set_bit(rp->data, BTP_GATT_EXCHANGE_MTU);
-	tester_set_bit(rp->data, BTP_GATT_DISC_ALL_PRIM);
-	tester_set_bit(rp->data, BTP_GATT_DISC_PRIM_UUID);
-	tester_set_bit(rp->data, BTP_GATT_FIND_INCLUDED);
-	tester_set_bit(rp->data, BTP_GATT_DISC_ALL_CHRC);
-	tester_set_bit(rp->data, BTP_GATT_DISC_CHRC_UUID);
-
-	/* octet 2 */
-	tester_set_bit(rp->data, BTP_GATT_DISC_ALL_DESC);
-	tester_set_bit(rp->data, BTP_GATT_READ);
-	tester_set_bit(rp->data, BTP_GATT_READ_LONG);
-	tester_set_bit(rp->data, BTP_GATT_READ_MULTIPLE);
-	tester_set_bit(rp->data, BTP_GATT_WRITE_WITHOUT_RSP);
-	tester_set_bit(rp->data, BTP_GATT_SIGNED_WRITE_WITHOUT_RSP);
-	tester_set_bit(rp->data, BTP_GATT_WRITE);
-
-	/* octet 3 */
-	tester_set_bit(rp->data, BTP_GATT_WRITE_LONG);
-	tester_set_bit(rp->data, BTP_GATT_CFG_NOTIFY);
-	tester_set_bit(rp->data, BTP_GATT_CFG_INDICATE);
-	tester_set_bit(rp->data, BTP_GATT_GET_ATTRIBUTES);
-	tester_set_bit(rp->data, BTP_GATT_GET_ATTRIBUTE_VALUE);
-	tester_set_bit(rp->data, BTP_GATT_CHANGE_DB);
-	tester_set_bit(rp->data, BTP_GATT_EATT_CONNECT);
-
-	/* octet 4 */
-	tester_set_bit(rp->data, BTP_GATT_READ_MULTIPLE_VAR);
-	tester_set_bit(rp->data, BTP_GATT_NOTIFY_MULTIPLE);
-
-
-	*rsp_len = sizeof(*rp) + 5;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_GATT, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/btp_l2cap.c b/tests/bluetooth/tester/src/btp_l2cap.c
index 288215aee5d23..e4c28d28ad32d 100644
--- a/tests/bluetooth/tester/src/btp_l2cap.c
+++ b/tests/bluetooth/tester/src/btp_l2cap.c
@@ -604,22 +604,8 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_l2cap_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_L2CAP_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_L2CAP_CONNECT);
-	tester_set_bit(rp->data, BTP_L2CAP_DISCONNECT);
-	tester_set_bit(rp->data, BTP_L2CAP_SEND_DATA);
-	tester_set_bit(rp->data, BTP_L2CAP_LISTEN);
-#if defined(CONFIG_BT_L2CAP_ECRED)
-	tester_set_bit(rp->data, BTP_L2CAP_RECONFIGURE);
-#endif
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_L2CAP_CREDITS);
-#if defined(CONFIG_BT_EATT)
-	tester_set_bit(rp->data, BTP_L2CAP_DISCONNECT_EATT_CHANS);
-#endif
-
-	*rsp_len = sizeof(*rp) + 2;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_L2CAP, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/btp_mesh.c b/tests/bluetooth/tester/src/btp_mesh.c
index acc97d5dda7c5..826b11241686f 100644
--- a/tests/bluetooth/tester/src/btp_mesh.c
+++ b/tests/bluetooth/tester/src/btp_mesh.c
@@ -473,104 +473,8 @@ static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_mesh_read_supported_commands_rp *rp = rsp;
 
-	/* octet 0 */
-	tester_set_bit(rp->data, BTP_MESH_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_MESH_CONFIG_PROVISIONING);
-	tester_set_bit(rp->data, BTP_MESH_PROVISION_NODE);
-	tester_set_bit(rp->data, BTP_MESH_INIT);
-	tester_set_bit(rp->data, BTP_MESH_RESET);
-	tester_set_bit(rp->data, BTP_MESH_INPUT_NUMBER);
-	tester_set_bit(rp->data, BTP_MESH_INPUT_STRING);
-
-	/* octet 1 */
-	tester_set_bit(rp->data, BTP_MESH_IVU_TEST_MODE);
-	tester_set_bit(rp->data, BTP_MESH_IVU_TOGGLE_STATE);
-	tester_set_bit(rp->data, BTP_MESH_NET_SEND);
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_GENERATE_FAULTS);
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_CLEAR_FAULTS);
-	tester_set_bit(rp->data, BTP_MESH_LPN);
-	tester_set_bit(rp->data, BTP_MESH_LPN_POLL);
-	tester_set_bit(rp->data, BTP_MESH_MODEL_SEND);
-
-	/* octet 2 */
-#if defined(CONFIG_BT_TESTING)
-	tester_set_bit(rp->data, BTP_MESH_LPN_SUBSCRIBE);
-	tester_set_bit(rp->data, BTP_MESH_LPN_UNSUBSCRIBE);
-	tester_set_bit(rp->data, BTP_MESH_RPL_CLEAR);
-#endif /* CONFIG_BT_TESTING */
-	tester_set_bit(rp->data, BTP_MESH_PROXY_IDENTITY);
-	tester_set_bit(rp->data, BTP_MESH_COMP_DATA_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_BEACON_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_BEACON_SET);
-
-	/* octet 3 */
-	tester_set_bit(rp->data, BTP_MESH_CFG_DEFAULT_TTL_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_DEFAULT_TTL_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_GATT_PROXY_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_GATT_PROXY_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_FRIEND_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_FRIEND_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_RELAY_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_RELAY_SET);
-
-	/* octet 4 */
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_PUB_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_PUB_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_ADD);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_DEL);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NETKEY_ADD);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NETKEY_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NETKEY_DEL);
-	tester_set_bit(rp->data, BTP_MESH_CFG_APPKEY_ADD);
-
-	/* octet 5 */
-	tester_set_bit(rp->data, BTP_MESH_CFG_APPKEY_DEL);
-	tester_set_bit(rp->data, BTP_MESH_CFG_APPKEY_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_APP_BIND);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_APP_UNBIND);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_APP_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_APP_VND_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_HEARTBEAT_PUB_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_HEARTBEAT_PUB_GET);
-
-	/* octet 6 */
-	tester_set_bit(rp->data, BTP_MESH_CFG_HEARTBEAT_SUB_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_HEARTBEAT_SUB_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NET_TRANS_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NET_TRANS_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_OVW);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_DEL_ALL);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_GET_VND);
-
-	/* octet 7 */
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_VA_ADD);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_VA_DEL);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_SUB_VA_OVW);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NETKEY_UPDATE);
-	tester_set_bit(rp->data, BTP_MESH_CFG_APPKEY_UPDATE);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NODE_IDT_SET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NODE_IDT_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_NODE_RESET);
-
-	/* octet 8 */
-	tester_set_bit(rp->data, BTP_MESH_CFG_LPN_TIMEOUT_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_MODEL_APP_BIND_VND);
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_FAULT_GET);
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_FAULT_CLEAR);
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_PERIOD_GET);
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_PERIOD_SET);
-
-	/* octet 9 */
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_ATTENTION_GET);
-	tester_set_bit(rp->data, BTP_MESH_HEALTH_ATTENTION_SET);
-	tester_set_bit(rp->data, BTP_MESH_PROVISION_ADV);
-	tester_set_bit(rp->data, BTP_MESH_CFG_KRP_GET);
-	tester_set_bit(rp->data, BTP_MESH_CFG_KRP_SET);
-	tester_set_bit(rp->data, BTP_MESH_VA_ADD);
-	tester_set_bit(rp->data, BTP_MESH_VA_DEL);
-
-	*rsp_len = sizeof(*rp) + 10;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_MESH, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -899,20 +803,40 @@ static uint8_t priv_node_id_set(const void *cmd, uint16_t cmd_len,
 
 	return BTP_STATUS_SUCCESS;
 }
+#endif
 
+#ifdef CONFIG_BT_MESH_PRIV_BEACON_SRV
 static uint8_t proxy_private_identity_enable(const void *cmd, uint16_t cmd_len,
 					     void *rsp, uint16_t *rsp_len)
 {
+	const struct btp_proxy_priv_identity_cmd *cp = cmd;
+	uint16_t net_idx[CONFIG_BT_MESH_SUBNET_COUNT];
+	enum bt_mesh_feat_state priv_node_id = BT_MESH_FEATURE_DISABLED;
+	ssize_t count;
 	int err;
 
 	LOG_DBG("");
 
-	err = bt_mesh_proxy_private_identity_enable();
-	if (err) {
-		LOG_ERR("Failed to enable proxy private identity (err %d)", err);
+	count = bt_mesh_subnets_get(net_idx, ARRAY_SIZE(net_idx), 0);
+
+	if (count <= 0) {
+		LOG_ERR("No subnet (err:%i)", count);
 		return BTP_STATUS_FAILED;
 	}
 
+	if (cp->enabled) {
+		priv_node_id = BT_MESH_FEATURE_ENABLED;
+	}
+
+	for (int i = 0; i < count; i++) {
+		err = bt_mesh_subnet_priv_node_id_set(net_idx[i], priv_node_id);
+		if (err) {
+			LOG_ERR("Failed to %s proxy private identity for net idx:%x (err %d)",
+				cp->enabled ? "enable" : "disable", net_idx[i], err);
+			return BTP_STATUS_FAILED;
+		}
+	}
+
 	return BTP_STATUS_SUCCESS;
 }
 #endif
@@ -5251,8 +5175,10 @@ static const struct btp_handler handlers[] = {
 	{.opcode = BTP_MESH_PRIV_NODE_ID_SET,
 	 .expect_len = sizeof(struct btp_priv_node_id_set_cmd),
 	 .func = priv_node_id_set},
+#endif
+#ifdef CONFIG_BT_MESH_PRIV_BEACON_SRV
 	{.opcode = BTP_MESH_PROXY_PRIVATE_IDENTITY,
-	 .expect_len = 0,
+	 .expect_len = sizeof(struct btp_proxy_priv_identity_cmd),
 	 .func = proxy_private_identity_enable},
 #endif
 #if defined(CONFIG_BT_MESH_OD_PRIV_PROXY_CLI)
diff --git a/tests/bluetooth/tester/src/btp_ots.c b/tests/bluetooth/tester/src/btp_ots.c
index defea7d2fed6b..8138b2cb7d909 100644
--- a/tests/bluetooth/tester/src/btp_ots.c
+++ b/tests/bluetooth/tester/src/btp_ots.c
@@ -42,10 +42,8 @@ static uint8_t ots_supported_commands(const void *cmd, uint16_t cmd_len,
 {
 	struct btp_ots_read_supported_commands_rp *rp = rsp;
 
-	tester_set_bit(rp->data, BTP_OTS_READ_SUPPORTED_COMMANDS);
-	tester_set_bit(rp->data, BTP_OTS_REGISTER_OBJECT);
-
-	*rsp_len = sizeof(*rp) + 1;
+	*rsp_len = tester_supported_commands(BTP_SERVICE_ID_OTS, rp->data);
+	*rsp_len += sizeof(*rp);
 
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index b9946b9d610b3..8b17c9734eee6 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -1,3 +1,7 @@
+common:
+  build_only: true
+  tags: bluetooth
+
 tests:
   bluetooth.general.tester:
     build_only: true
@@ -7,6 +11,12 @@ tests:
       - nrf52840dk/nrf52840
     tags: bluetooth
     harness: bluetooth
+  bluetooth.general.tester_bsim:
+    platform_allow:
+      - nrf52_bsim/native
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bluetooth_tester_prj_conf
   bluetooth.general.tester.nxp:
     # Disabling monolithic since CI environment doesn't use blobs
     build_only: true
@@ -30,6 +40,16 @@ tests:
       - EXTRA_CONF_FILE="hci_ipc.conf"
     tags: bluetooth
     sysbuild: true
+  bluetooth.general.tester_hci_ipc_bsim:
+    platform_allow:
+      - nrf5340bsim/nrf5340/cpuapp
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bluetooth_tester_prj_conf
+    extra_args:
+      # Build config used by AutoPTS for nRF53
+      - EXTRA_CONF_FILE="hci_ipc.conf"
+    sysbuild: true
   bluetooth.general.tester_le_audio:
     build_only: true
     platform_allow:
@@ -54,3 +74,13 @@ tests:
     extra_args: EXTRA_CONF_FILE="overlay-mesh.conf"
     tags: bluetooth
     harness: bluetooth
+  bluetooth.general.tester.legacy_adv:
+    build_only: true
+    platform_allow:
+      - qemu_x86
+      - native_sim
+      - nrf52840dk/nrf52840
+    extra_configs:
+      - CONFIG_BT_EXT_ADV=n
+    tags: bluetooth
+    harness: bluetooth
diff --git a/tests/boards/espressif/rtc_clk/README.rst b/tests/boards/espressif/rtc_clk/README.rst
index 8cd4853517e4f..48db070183c2e 100644
--- a/tests/boards/espressif/rtc_clk/README.rst
+++ b/tests/boards/espressif/rtc_clk/README.rst
@@ -14,7 +14,7 @@ Supported Boards
 ****************
 - esp32_devkitc_wrover/esp32/procpu
 - esp32c3_devkitm
-- esp32c6_devkitc
+- esp32c6_devkitc/esp32c6/hpcore
 - esp32s2_saola
 - esp32s3_devkitm/esp32s3/procpu
 
diff --git a/tests/boards/espressif/rtc_clk/testcase.yaml b/tests/boards/espressif/rtc_clk/testcase.yaml
index 5d0cb264b1c8d..2a13a3728f92c 100644
--- a/tests/boards/espressif/rtc_clk/testcase.yaml
+++ b/tests/boards/espressif/rtc_clk/testcase.yaml
@@ -1,19 +1,19 @@
 common:
   integration_platforms:
-    - esp32c6_devkitc
+    - esp32c6_devkitc/esp32c6/hpcore
 tests:
   boards.esp32.rtc_clk:
     platform_allow:
       - esp32_devkitc_wrover/esp32/procpu
       - esp32c3_devkitm
-      - esp32c6_devkitc
+      - esp32c6_devkitc/esp32c6/hpcore
       - esp32s2_saola
       - esp32s3_devkitm/esp32s3/procpu
   boards.esp32.rtc_clk.xtal:
     platform_allow:
       - esp32_devkitc_wrover/esp32/procpu
       - esp32c3_devkitm
-      - esp32c6_devkitc
+      - esp32c6_devkitc/esp32c6/hpcore
       - esp32s2_saola
       - esp32s3_devkitm/esp32s3/procpu
     harness_config:
diff --git a/tests/boards/espressif/wifi/socs/esp32c6.overlay b/tests/boards/espressif/wifi/socs/esp32c6.overlay
deleted file mode 100644
index 872f2dfe2eaba..0000000000000
--- a/tests/boards/espressif/wifi/socs/esp32c6.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&wifi {
-	status = "okay";
-};
diff --git a/samples/net/wifi/shell/socs/esp32c6.overlay b/tests/boards/espressif/wifi/socs/esp32c6_hpcore.overlay
similarity index 100%
rename from samples/net/wifi/shell/socs/esp32c6.overlay
rename to tests/boards/espressif/wifi/socs/esp32c6_hpcore.overlay
diff --git a/tests/boards/intel_adsp/ssp/prj.conf b/tests/boards/intel_adsp/ssp/prj.conf
index 1cb2bd509d0a9..ce2420c87f5b2 100644
--- a/tests/boards/intel_adsp/ssp/prj.conf
+++ b/tests/boards/intel_adsp/ssp/prj.conf
@@ -5,3 +5,4 @@ CONFIG_HEAP_MEM_POOL_SIZE=512
 CONFIG_PM=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
+CONFIG_TEST_LOGGING_DEFAULTS=n
diff --git a/tests/boards/intel_adsp/ssp/src/main.c b/tests/boards/intel_adsp/ssp/src/main.c
index 4b0b8f09bd0fb..3069a5c416075 100644
--- a/tests/boards/intel_adsp/ssp/src/main.c
+++ b/tests/boards/intel_adsp/ssp/src/main.c
@@ -260,88 +260,67 @@ ZTEST(adsp_ssp, test_adsp_ssp_transfer)
 	const struct dai_properties *props;
 	static int chan_id_rx;
 	static int chan_id;
+	int status;
 
 	props = dai_get_properties(dev_dai_ssp, DAI_DIR_TX, 0);
-	if (!props) {
-		TC_PRINT("Cannot get dai tx properties\n");
-		return;
-	}
+	zassert_not_null(props, "Cannot get dai tx properties\n");
 
-	if (config_output_dma(props, &chan_id)) {
-		TC_PRINT("ERROR: config tx dma (%d)\n", chan_id);
-		return;
-	}
+	status = config_output_dma(props, &chan_id);
+	zassert_equal(status, 0, "ERROR: config tx dma (%d)\n", chan_id);
 
 	TC_PRINT("Configuring the dma tx transfer on channel %d\n", chan_id);
 
-	if (dma_config(dev_dma_dw, chan_id, &dma_cfg)) {
-		TC_PRINT("ERROR: dma tx config (%d)\n", chan_id);
-		return;
-	}
+	status = dma_config(dev_dma_dw, chan_id, &dma_cfg);
+	zassert_equal(status, 0, "ERROR: dma tx config (%d)\n", chan_id);
 
 	props = dai_get_properties(dev_dai_ssp, DAI_DIR_RX, 0);
-	if (!props) {
-		TC_PRINT("Cannot get dai rx properties\n");
-		return;
-	}
+	zassert_not_null(props, "Cannot get dai rx properties\n");
 
-	if (config_input_dma(props, &chan_id_rx)) {
-		TC_PRINT("ERROR: config rx dma (%d)\n", chan_id);
-		return;
-	}
+	status = config_input_dma(props, &chan_id_rx);
+	zassert_equal(status, 0, "ERROR: config rx dma (%d)\n", chan_id);
 
 	TC_PRINT("Configuring the dma rx transfer on channel %d\n", chan_id_rx);
 
-	if (dma_config(dev_dma_dw, chan_id_rx, &dma_cfg_rx)) {
-		TC_PRINT("ERROR: transfer config (%d)\n", chan_id_rx);
-		return;
-	}
+	status = dma_config(dev_dma_dw, chan_id_rx, &dma_cfg_rx);
+	zassert_equal(status, 0, "ERROR: transfer config (%d)\n", chan_id_rx);
 
 	TC_PRINT("Starting the transfer on channels %d and %d and waiting completion\n", chan_id,
 		 chan_id_rx);
 
-	if (dai_trigger(dev_dai_ssp, DAI_DIR_RX, DAI_TRIGGER_PRE_START)) {
-		TC_PRINT("ERROR: dai rx pre start\n");
-		return;
-	}
+	status = dai_trigger(dev_dai_ssp, DAI_DIR_RX, DAI_TRIGGER_PRE_START);
+	zassert_equal(status, 0, "ERROR: dai rx pre start\n");
 
-	if (dai_trigger(dev_dai_ssp, DAI_DIR_TX, DAI_TRIGGER_PRE_START)) {
-		TC_PRINT("ERROR: dai tx pre start\n");
-		return;
-	}
+	status = dai_trigger(dev_dai_ssp, DAI_DIR_TX, DAI_TRIGGER_PRE_START);
+	zassert_equal(status, 0, "ERROR: dai tx pre start\n");
 
-	if (dma_start(dev_dma_dw, chan_id_rx)) {
-		TC_PRINT("ERROR: dma rx transfer start (%d)\n", chan_id);
-		return;
-	}
+	status = dma_start(dev_dma_dw, chan_id_rx);
+	zassert_equal(status, 0, "ERROR: dma rx transfer start (%d)\n", chan_id);
+	status = dma_start(dev_dma_dw, chan_id);
+	zassert_equal(status, 0, "ERROR: dma tx transfer start (%d)\n", chan_id);
 
-	if (dma_start(dev_dma_dw, chan_id)) {
-		TC_PRINT("ERROR: dma tx transfer start (%d)\n", chan_id);
-		return;
-	}
+	status = dai_trigger(dev_dai_ssp, DAI_DIR_RX, DAI_TRIGGER_START);
+	zassert_equal(status, 0, "ERROR: rx dai start\n");
 
-	if (dai_trigger(dev_dai_ssp, DAI_DIR_RX, DAI_TRIGGER_START)) {
-		TC_PRINT("ERROR: rx dai start\n");
-		return;
-	}
+	status = dai_trigger(dev_dai_ssp, DAI_DIR_TX, DAI_TRIGGER_START);
+	zassert_equal(status, 0, "ERROR: tx dai start\n");
 
-	if (dai_trigger(dev_dai_ssp, DAI_DIR_TX, DAI_TRIGGER_START)) {
-		TC_PRINT("ERROR: tx dai start\n");
-		return;
-	}
+	status = k_sem_take(&xfer_sem, K_MSEC(1000));
+	zassert_equal(status, 0, "Timed out waiting for xfers\n");
 
+	status = dma_stop(dev_dma_dw, chan_id_rx);
+	zassert_equal(status, 0, "ERROR: rx dma stop");
 
-	if (k_sem_take(&xfer_sem, K_MSEC(1000)) != 0) {
-		TC_PRINT("timed out waiting for xfers\n");
-		return;
-	}
+	status = dma_stop(dev_dma_dw, chan_id);
+	zassert_equal(status, 0, "ERROR: rx dma stop");
+
+	status = dai_trigger(dev_dai_ssp, DAI_DIR_RX, DAI_TRIGGER_STOP);
+	zassert_equal(status, 0, "ERROR: rx dai stop");
 
-	dma_stop(dev_dma_dw, chan_id_rx);
-	dma_stop(dev_dma_dw, chan_id);
-	dai_trigger(dev_dai_ssp, DAI_DIR_RX, DAI_TRIGGER_STOP);
-	dai_trigger(dev_dai_ssp, DAI_DIR_TX, DAI_TRIGGER_STOP);
+	status = dai_trigger(dev_dai_ssp, DAI_DIR_TX, DAI_TRIGGER_STOP);
+	zassert_equal(status, 0, "ERROR: tx dai stop");
 
-	check_transmission();
+	status = check_transmission();
+	zassert_equal(status, TC_PASS, "Error detected in transmission");
 }
 
 ZTEST(adsp_ssp, test_adsp_ssp_config_set)
diff --git a/tests/boards/mec15xxevb_assy6853/qspi/boards/mec15xxevb_assy6853.overlay b/tests/boards/mec15xxevb_assy6853/qspi/boards/mec15xxevb_assy6853.overlay
index 2fdb18486061f..d85b70f4f7a80 100644
--- a/tests/boards/mec15xxevb_assy6853/qspi/boards/mec15xxevb_assy6853.overlay
+++ b/tests/boards/mec15xxevb_assy6853/qspi/boards/mec15xxevb_assy6853.overlay
@@ -6,8 +6,8 @@
 
 &spi0 {
 	status = "okay";
-	port_sel = <0>;
-	chip_select = <0>;
+	port-sel = <0>;
+	chip-select = <0>;
 	lines = <4>;
 
 	pinctrl-0 = < &shd_cs0_n_gpio055
diff --git a/tests/boards/mec15xxevb_assy6853/qspi/src/main.c b/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
index 22c17ec0eb5ed..1c8e34b4a2a05 100644
--- a/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
+++ b/tests/boards/mec15xxevb_assy6853/qspi/src/main.c
@@ -670,7 +670,7 @@ void *spi_single_setup(void)
 	spi_single_init();
 
 	/* The writing test goes
-	 * first berfore testing
+	 * first before testing
 	 * the reading.
 	 */
 	test_spi_single_write();
@@ -683,7 +683,7 @@ void *spi_quad_setup(void)
 	spi_dual_init();
 
 	/* The writing test goes
-	 * first berfore testing
+	 * first before testing
 	 * the reading.
 	 */
 	test_spi_quad_write();
diff --git a/tests/boards/mec172xevb_assy6906/qspi/src/main.c b/tests/boards/mec172xevb_assy6906/qspi/src/main.c
index feac946c46ef8..94437b93335d5 100644
--- a/tests/boards/mec172xevb_assy6906/qspi/src/main.c
+++ b/tests/boards/mec172xevb_assy6906/qspi/src/main.c
@@ -630,7 +630,7 @@ void *spi_single_setup(void)
 	spi_single_init();
 
 	/* The writing test goes
-	 * first berfore testing
+	 * first before testing
 	 * the reading.
 	 */
 	test_spi_single_write();
@@ -643,7 +643,7 @@ void *spi_quad_setup(void)
 	spi_dual_init();
 
 	/* The writing test goes
-	 * first berfore testing
+	 * first before testing
 	 * the reading.
 	 */
 	test_spi_quad_write();
diff --git a/tests/boards/native_sim/cpu_wait/src/main.c b/tests/boards/native_sim/cpu_wait/src/main.c
index 622b7579ef1cd..5d7e2abf86e72 100644
--- a/tests/boards/native_sim/cpu_wait/src/main.c
+++ b/tests/boards/native_sim/cpu_wait/src/main.c
@@ -102,7 +102,7 @@ static void thread_entry(void *p1, void *p2, void *p3)
  * takes time during this test thread waits
  *
  * Note: This test relies on the exact timing of the ticks.
- * For native_posix it works, with a tick of 10ms. In general this test will
+ * For native_sim it works, with a tick of 10ms. In general this test will
  * probably give problems if the tick time is not a relatively even number
  * of microseconds
  */
@@ -214,8 +214,8 @@ static void np_timer_isr_test_replacement(const void *arg)
  */
 ZTEST(native_cpu_hold, test_cpu_hold_with_interrupts)
 {
-#if defined(CONFIG_BOARD_NATIVE_POSIX) || defined(CONFIG_BOARD_NATIVE_SIM)
-	/* So far we only have a test for native_posix.
+#if defined(CONFIG_BOARD_NATIVE_SIM)
+	/* So far we only have a test for native_sim.
 	 * As the test hooks into an interrupt to cause an extra delay
 	 * this is very platform specific
 	 */
@@ -287,7 +287,7 @@ ZTEST(native_cpu_hold, test_cpu_hold_with_interrupts)
 			PRIu64"-"PRIu64"!="PRIu32"\n",
 			time2, time1, ONE_TICK_TIME);
 
-#endif /* defined(CONFIG_BOARD_NATIVE_POSIX) */
+#endif /* defined(CONFIG_BOARD_NATIVE_SIM) */
 }
 
 ZTEST_SUITE(native_cpu_hold, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/boards/native_sim/cpu_wait/testcase.yaml b/tests/boards/native_sim/cpu_wait/testcase.yaml
index aeec84197eff4..6d6588511058a 100644
--- a/tests/boards/native_sim/cpu_wait/testcase.yaml
+++ b/tests/boards/native_sim/cpu_wait/testcase.yaml
@@ -2,8 +2,6 @@
 tests:
   boards.native_sim.cpu_wait:
     platform_allow:
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
     integration_platforms:
diff --git a/tests/boards/native_sim/rtc/prj.conf b/tests/boards/native_sim/rtc/prj.conf
index 686b5a9dee36d..2efaae4297d89 100644
--- a/tests/boards/native_sim/rtc/prj.conf
+++ b/tests/boards/native_sim/rtc/prj.conf
@@ -1,2 +1,2 @@
-CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
+CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
 CONFIG_ZTEST=y
diff --git a/tests/boards/native_sim/rtc/src/main.c b/tests/boards/native_sim/rtc/src/main.c
index 3cb783202dea0..261778148682b 100644
--- a/tests/boards/native_sim/rtc/src/main.c
+++ b/tests/boards/native_sim/rtc/src/main.c
@@ -12,7 +12,8 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "timer_model.h"
+#include <nsi_hw_scheduler.h>
+#include <nsi_timer_model.h>
 #include "native_rtc.h"
 
 #include <stdio.h>
@@ -39,11 +40,11 @@ static char *us_time_to_str(char *dest, uint64_t time)
 }
 
 #define WAIT_TIME 250 /* ms */
-#define TOLERANCE 20 /* ms Tolerance in native_posix time after WAIT_TIME */
+#define TOLERANCE 20  /* ms Tolerance in native_sim time after WAIT_TIME */
 #define TICK_MS (1000ul / CONFIG_SYS_CLOCK_TICKS_PER_SEC)
 
 /**
- * @brief Test native_posix real time control
+ * @brief Test native_sim real time control
  */
 ZTEST(native_realtime, test_realtime)
 {
@@ -141,7 +142,7 @@ ZTEST(native_realtime, test_realtime)
 }
 
 /**
- * @brief Test native_posix RTC offset functionality
+ * @brief Test native_sim RTC offset functionality
  */
 ZTEST(native_realtime,  test_rtc_offset)
 {
diff --git a/tests/boards/native_sim/rtc/testcase.yaml b/tests/boards/native_sim/rtc/testcase.yaml
index 1b3da5135b246..db26ded54cec8 100644
--- a/tests/boards/native_sim/rtc/testcase.yaml
+++ b/tests/boards/native_sim/rtc/testcase.yaml
@@ -1,9 +1,7 @@
-# Test of the native_posix real timeness and RTC model
+# Test of the native_sim real timeness and RTC model
 tests:
   boards.native.rtc:
     platform_allow:
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
     integration_platforms:
diff --git a/tests/boards/neorv32/build_all/CMakeLists.txt b/tests/boards/neorv32/build_all/CMakeLists.txt
new file mode 100644
index 0000000000000..583805f63fa3d
--- /dev/null
+++ b/tests/boards/neorv32/build_all/CMakeLists.txt
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(build_all_neorv32)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/neorv32/build_all/app.overlay b/tests/boards/neorv32/build_all/app.overlay
new file mode 100644
index 0000000000000..c55c48a3dd5fc
--- /dev/null
+++ b/tests/boards/neorv32/build_all/app.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&gpio {
+	status = "okay";
+	ngpios = <32>;
+};
+
+&trng {
+	status = "okay";
+};
+
+&uart0 {
+	status = "okay";
+	current-speed = <19200>;
+};
+
+&uart1 {
+	status = "okay";
+	current-speed = <115200>;
+};
diff --git a/tests/boards/neorv32/build_all/prj.conf b/tests/boards/neorv32/build_all/prj.conf
new file mode 100644
index 0000000000000..4708f7d579d11
--- /dev/null
+++ b/tests/boards/neorv32/build_all/prj.conf
@@ -0,0 +1,9 @@
+CONFIG_TEST=y
+CONFIG_TEST_USERSPACE=y
+
+CONFIG_GPIO=y
+CONFIG_ENTROPY_GENERATOR=y
+
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_UART_USE_RUNTIME_CONFIGURE=y
diff --git a/tests/boards/neorv32/build_all/src/main.c b/tests/boards/neorv32/build_all/src/main.c
new file mode 100644
index 0000000000000..1c30472d36af5
--- /dev/null
+++ b/tests/boards/neorv32/build_all/src/main.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+int main(void)
+{
+	return 0;
+}
diff --git a/tests/boards/neorv32/build_all/testcase.yaml b/tests/boards/neorv32/build_all/testcase.yaml
new file mode 100644
index 0000000000000..b8b49fc51e361
--- /dev/null
+++ b/tests/boards/neorv32/build_all/testcase.yaml
@@ -0,0 +1,11 @@
+tests:
+  boards.neorv32.build_all:
+    build_only: true
+    tags:
+      - drivers
+      - entropy
+      - gpio
+      - uart
+    platform_allow: neorv32/neorv32/minimalboot
+    integration_platforms:
+      - neorv32/neorv32/minimalboot
diff --git a/tests/boards/nrf/hwinfo/reset_cause/prj.conf b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
index edd86844963a8..7acdbdd1740a9 100644
--- a/tests/boards/nrf/hwinfo/reset_cause/prj.conf
+++ b/tests/boards/nrf/hwinfo/reset_cause/prj.conf
@@ -5,3 +5,4 @@ CONFIG_REBOOT=y
 
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y
+CONFIG_ASSERT=y
diff --git a/tests/boards/nrf/hwinfo/reset_cause/src/main.c b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
index 1e07f679114c0..150a77da7d971 100644
--- a/tests/boards/nrf/hwinfo/reset_cause/src/main.c
+++ b/tests/boards/nrf/hwinfo/reset_cause/src/main.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 
 #include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
 LOG_MODULE_REGISTER(resetreason, LOG_LEVEL_INF);
 
 static const struct device *const my_wdt_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
@@ -22,13 +23,15 @@ volatile uint32_t machine_state __attribute__((section(NOINIT_SECTION)));
 volatile uint32_t supported __attribute__((section(NOINIT_SECTION)));
 volatile uint32_t wdt_status __attribute__((section(NOINIT_SECTION)));
 volatile uint32_t reboot_status __attribute__((section(NOINIT_SECTION)));
+volatile uint32_t cpu_lockup_status __attribute__((section(NOINIT_SECTION)));
 
 /* Value used to indicate that the watchdog has fired. */
 #define WDT_HAS_FIRED (0x12345678U)
 #define REBOOT_WAS_DONE (0x87654321U)
+#define CPU_LOCKUP_WAS_DONE (0x19283746U)
 
 /* Highest value in the switch statement in the main() */
-#define LAST_STATE (2)
+#define LAST_STATE (3)
 
 static void wdt_int_cb(const struct device *wdt_dev, int channel_id)
 {
@@ -236,7 +239,7 @@ void test_reset_software(uint32_t cause)
 		if (reboot_status != REBOOT_WAS_DONE) {
 			/* If software reset hasn't happen yet, do it. */
 			reboot_status = REBOOT_WAS_DONE;
-			LOG_INF("Test RESET_SOFTWARE - Rebooting");
+			LOG_INF("Test RESET_SOFTWARE");
 
 			/* Flush cache as reboot may invalidate all lines. */
 			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
@@ -316,6 +319,49 @@ void test_reset_watchdog(uint32_t cause)
 	}
 }
 
+void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *pEsf)
+{
+	LOG_INF("%s(%d)", __func__, reason);
+	LOG_PANIC();
+
+	/* Assert inside Assert handler - shall result in reset due to cpu lockup. */
+	__ASSERT(0, "Intentionally failed assert inside kernel panic");
+}
+
+void test_reset_cpu_lockup(uint32_t cause)
+{
+	/* Check that reset cause from cpu lockup is detected. */
+	if (supported & RESET_CPU_LOCKUP) {
+		if (cpu_lockup_status != CPU_LOCKUP_WAS_DONE) {
+			/* If reset due to cpu lockup hasn't happen yet, do it. */
+			cpu_lockup_status = CPU_LOCKUP_WAS_DONE;
+			LOG_INF("Test RESET_CPU_LOCKUP");
+
+			/* Flush cache as reboot may invalidate all lines. */
+			sys_cache_data_flush_range((void *) &machine_state, sizeof(machine_state));
+			sys_cache_data_flush_range((void *) &cpu_lockup_status,
+				sizeof(cpu_lockup_status));
+			__ASSERT(0, "Intentionally failed assertion");
+		} else {
+			/* Reset due to CPU Lockup was done */
+			LOG_INF("TEST that RESET_CPU_LOCKUP was detected");
+			if (cause & RESET_CPU_LOCKUP) {
+				LOG_INF("PASS: RESET_CPU_LOCKUP detected");
+				print_bar();
+				/* Check RESET_SOFTWARE can be cleared */
+				test_clear_reset_cause();
+			} else {
+				LOG_ERR("FAIL: RESET_CPU_LOCKUP not set");
+				print_bar();
+			}
+			/* Cleanup */
+			cpu_lockup_status = 0;
+			sys_cache_data_flush_range((void *) &cpu_lockup_status,
+				sizeof(cpu_lockup_status));
+		}
+	}
+}
+
 int main(void)
 {
 	uint32_t cause;
@@ -327,6 +373,9 @@ int main(void)
 	if (reboot_status == REBOOT_WAS_DONE) {
 		LOG_INF("This boot is due to expected software reset");
 	}
+	if (cpu_lockup_status == CPU_LOCKUP_WAS_DONE) {
+		LOG_INF("This boot is due to expected cpu lockup reset");
+	}
 	print_bar();
 
 	/* Test relies on REST_PIN to correctly start. */
@@ -340,12 +389,14 @@ int main(void)
 		machine_state = 0;
 		reboot_status = 0;
 		wdt_status = 0;
+		cpu_lockup_status = 0;
 	}
 
 	while (machine_state <= LAST_STATE) {
 		LOG_DBG("machine_state = %u", machine_state);
 		LOG_DBG("reboot_status = %u", reboot_status);
 		LOG_DBG("wdt_status = %u", wdt_status);
+		LOG_DBG("cpu_lockup_status = %u", cpu_lockup_status);
 
 		switch (machine_state) {
 		case 0: /* Print (an store) which reset causes are supported. */
@@ -358,6 +409,9 @@ int main(void)
 		case 2: /* Test RESET_WATCHDOG. */
 			test_reset_watchdog(cause);
 			machine_state++;
+		case 3: /* Test CPU_LOCKUP. */
+			test_reset_cpu_lockup(cause);
+			machine_state++;
 		}
 	}
 
diff --git a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
index 0ec999ee713b5..8837f999bdb1e 100644
--- a/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
+++ b/tests/boards/nrf/hwinfo/reset_cause/testcase.yaml
@@ -20,14 +20,19 @@ tests:
         - "RESET_DEBUG is supported"
         - "RESET_LOW_POWER_WAKE is supported"
         - "RESET_CPU_LOCKUP is supported"
-        - "Rebooting"
         - "HW Info reset reason test on"
+        - "This boot is due to expected software reset"
         - "PASS: RESET_SOFTWARE detected"
         - "PASS: reset causes were cleared"
         - "Watchdog shall fire"
         - "HW Info reset reason test on"
+        - "This boot is due to expected watchdog reset"
         - "PASS: RESET_WATCHDOG detected"
         - "PASS: reset causes were cleared"
+        - "HW Info reset reason test on"
+        - "This boot is due to expected cpu lockup reset"
+        - "PASS: RESET_CPU_LOCKUP detected"
+        - "PASS: reset causes were cleared"
         - "All tests done"
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/boards/nrf/nrf70/bustest/CMakeLists.txt b/tests/boards/nrf/nrf70/bustest/CMakeLists.txt
index 741d622b11948..10acadb3fcc5c 100644
--- a/tests/boards/nrf/nrf70/bustest/CMakeLists.txt
+++ b/tests/boards/nrf/nrf70/bustest/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # Copyright (c) 2024 Nordic Semiconductor ASA
 #
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 
 cmake_minimum_required(VERSION 3.20.0)
diff --git a/tests/boards/nrf/nrf70/bustest/testcase.yaml b/tests/boards/nrf/nrf70/bustest/testcase.yaml
index fa520202bec31..af5ee1934ca8a 100644
--- a/tests/boards/nrf/nrf70/bustest/testcase.yaml
+++ b/tests/boards/nrf/nrf70/bustest/testcase.yaml
@@ -4,14 +4,14 @@ common:
     - drivers
     - wifi
 tests:
-  nrf_wifi.bustest.nrf7002:
+  boards.nrf_wifi.bustest.nrf7002:
     sysbuild: true
     build_only: true
     integration_platforms:
       - nrf7002dk/nrf5340/cpuapp
     platform_allow: nrf7002dk/nrf5340/cpuapp
 
-  nrf_wifi.bustest.nrf7002ek:
+  boards.nrf.nrf_wifi.bustest.nrf7002ek:
     sysbuild: true
     build_only: true
     extra_args: SHIELD=nrf7002ek
diff --git a/tests/subsys/nrfs/CMakeLists.txt b/tests/boards/nrf/nrfs/CMakeLists.txt
similarity index 100%
rename from tests/subsys/nrfs/CMakeLists.txt
rename to tests/boards/nrf/nrfs/CMakeLists.txt
diff --git a/tests/subsys/nrfs/Kconfig.sysbuild b/tests/boards/nrf/nrfs/Kconfig.sysbuild
similarity index 100%
rename from tests/subsys/nrfs/Kconfig.sysbuild
rename to tests/boards/nrf/nrfs/Kconfig.sysbuild
diff --git a/tests/subsys/nrfs/README.txt b/tests/boards/nrf/nrfs/README.txt
similarity index 77%
rename from tests/subsys/nrfs/README.txt
rename to tests/boards/nrf/nrfs/README.txt
index 45888e61c3cf1..a2ebb8e11fa1d 100644
--- a/tests/subsys/nrfs/README.txt
+++ b/tests/boards/nrf/nrfs/README.txt
@@ -3,5 +3,5 @@ NRFS services request handling performance.
 
 These reaquest are propagated over IPC.
 
-MRAM latency serivice and Temperature service
+MRAM latency service and Temperature service
 are used as benchmarks.
diff --git a/tests/subsys/nrfs/prj.conf b/tests/boards/nrf/nrfs/prj.conf
similarity index 100%
rename from tests/subsys/nrfs/prj.conf
rename to tests/boards/nrf/nrfs/prj.conf
diff --git a/tests/subsys/nrfs/remote/CMakeLists.txt b/tests/boards/nrf/nrfs/remote/CMakeLists.txt
similarity index 100%
rename from tests/subsys/nrfs/remote/CMakeLists.txt
rename to tests/boards/nrf/nrfs/remote/CMakeLists.txt
diff --git a/tests/subsys/nrfs/remote/prj.conf b/tests/boards/nrf/nrfs/remote/prj.conf
similarity index 100%
rename from tests/subsys/nrfs/remote/prj.conf
rename to tests/boards/nrf/nrfs/remote/prj.conf
diff --git a/tests/subsys/nrfs/src/main.c b/tests/boards/nrf/nrfs/src/main.c
similarity index 100%
rename from tests/subsys/nrfs/src/main.c
rename to tests/boards/nrf/nrfs/src/main.c
diff --git a/tests/subsys/nrfs/sysbuild.cmake b/tests/boards/nrf/nrfs/sysbuild.cmake
similarity index 100%
rename from tests/subsys/nrfs/sysbuild.cmake
rename to tests/boards/nrf/nrfs/sysbuild.cmake
diff --git a/tests/boards/nrf/nrfs/testcase.yaml b/tests/boards/nrf/nrfs/testcase.yaml
new file mode 100644
index 0000000000000..315c3cf7f375c
--- /dev/null
+++ b/tests/boards/nrf/nrfs/testcase.yaml
@@ -0,0 +1,14 @@
+common:
+  platform_allow:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54h20dk/nrf54h20/cpurad
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54h20dk/nrf54h20/cpurad
+  tags:
+    - nrfs
+  harness: ztest
+  sysbuild: true
+
+tests:
+  boards.nrf.nrfs.stress_test: {}
diff --git a/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_common.dtsi b/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_common.dtsi
new file mode 100644
index 0000000000000..f7810df33c04e
--- /dev/null
+++ b/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_common.dtsi
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		qdec0 = &qdec20;
+		qenca = &phase_a;
+		qencb = &phase_b;
+	};
+
+	encoder-emulate {
+		compatible = "gpio-leds";
+		phase_a: phase_a {
+			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+		};
+		phase_b: phase_b {
+			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&pinctrl {
+	qdec_pinctrl: qdec_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
+				<NRF_PSEL(QDEC_B, 1, 10)>;
+		};
+	};
+
+	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
+		group1 {
+			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
+				<NRF_PSEL(QDEC_B, 1, 10)>;
+			low-power-enable;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&qdec20 {
+	status = "okay";
+	pinctrl-0 = <&qdec_pinctrl>;
+	pinctrl-1 = <&qdec_sleep_pinctrl>;
+	pinctrl-names = "default", "sleep";
+	steps = <127>;
+	led-pre = <500>;
+	zephyr,pm-device-runtime-auto;
+};
diff --git a/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index 3fa426569b8b2..a16bac11f177e 100644
--- a/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -3,51 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
-	aliases {
-		qdec0 = &qdec20;
-		qenca = &phase_a;
-		qencb = &phase_b;
-	};
-
-	encoder-emulate {
-		compatible = "gpio-leds";
-		phase_a: phase_a {
-			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-		};
-		phase_b: phase_b {
-			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&pinctrl {
-	qdec_pinctrl: qdec_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
-				<NRF_PSEL(QDEC_B, 1, 10)>;
-		};
-	};
-
-	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
-		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 8)>,
-				<NRF_PSEL(QDEC_B, 1, 10)>;
-			low-power-enable;
-		};
-	};
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&qdec20 {
-	status = "okay";
-	pinctrl-0 = <&qdec_pinctrl>;
-	pinctrl-1 = <&qdec_sleep_pinctrl>;
-	pinctrl-names = "default", "sleep";
-	steps = <127>;
-	led-pre = <500>;
-	zephyr,pm-device-runtime-auto;
-};
+#include "nrf54l20pdk_nrf54l20_common.dtsi"
diff --git a/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 0000000000000..638d63e5c544f
--- /dev/null
+++ b/tests/boards/nrf/qdec/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,6 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l20pdk_nrf54l20_common.dtsi"
diff --git a/tests/boards/nrf/qdec/testcase.yaml b/tests/boards/nrf/qdec/testcase.yaml
index 26cfd9901a50d..1518a86660fcf 100644
--- a/tests/boards/nrf/qdec/testcase.yaml
+++ b/tests/boards/nrf/qdec/testcase.yaml
@@ -2,15 +2,17 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
+    - nrf54h20dk/nrf54h20/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
     - nrf54l15dk/nrf54l15/cpuflpr
-    - nrf54h20dk/nrf54h20/cpuapp
+    - nrf54l20pdk/nrf54l20/cpuapp
+    - nrf54l20pdk/nrf54l20/cpuflpr
   integration_platforms:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
+    - nrf54h20dk/nrf54h20/cpuapp
     - nrf54l15dk/nrf54l15/cpuapp
     - nrf54l15dk/nrf54l15/cpuflpr
-    - nrf54h20dk/nrf54h20/cpuapp
   harness: ztest
   harness_config:
     fixture: gpio_loopback
diff --git a/tests/boards/silabs/dma/block_append/CMakeLists.txt b/tests/boards/silabs/dma/block_append/CMakeLists.txt
new file mode 100644
index 0000000000000..354f0cfea7f5e
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(block_append)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/silabs/dma/block_append/Kconfig b/tests/boards/silabs/dma/block_append/Kconfig
new file mode 100644
index 0000000000000..4386a78b295ee
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Silicon Laboratories Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "DMA block append Test"
+
+source "Kconfig.zephyr"
+
+config DMA_BA_XFER_SIZE
+	int "Number of bytes to transfer"
+	default 4096
diff --git a/tests/boards/silabs/dma/block_append/boards/slwrb4180a.overlay b/tests/boards/silabs/dma/block_append/boards/slwrb4180a.overlay
new file mode 100644
index 0000000000000..a6fb1d7e0945b
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/boards/slwrb4180a.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dma0 = &dma0;
+	};
+};
+
+&dma0 {
+	status = "okay";
+};
diff --git a/tests/boards/silabs/dma/block_append/boards/xg29_rb4412a.overlay b/tests/boards/silabs/dma/block_append/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..a6fb1d7e0945b
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/boards/xg29_rb4412a.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dma0 = &dma0;
+	};
+};
+
+&dma0 {
+	status = "okay";
+};
diff --git a/tests/boards/silabs/dma/block_append/prj.conf b/tests/boards/silabs/dma/block_append/prj.conf
new file mode 100644
index 0000000000000..40e966292771c
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/prj.conf
@@ -0,0 +1,4 @@
+CONFIG_ZTEST=y
+CONFIG_DMA=y
+CONFIG_LOG=y
+CONFIG_DMA_LOG_LEVEL_INF=y
diff --git a/tests/boards/silabs/dma/block_append/src/main.c b/tests/boards/silabs/dma/block_append/src/main.c
new file mode 100644
index 0000000000000..458dca0dc8eb7
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/src/main.c
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+ZTEST_SUITE(dma_m2m_ba, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/boards/silabs/dma/block_append/src/test_dma_ba.c b/tests/boards/silabs/dma/block_append/src/test_dma_ba.c
new file mode 100644
index 0000000000000..3c3acb39b8bf3
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/src/test_dma_ba.c
@@ -0,0 +1,464 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Verify zephyr dma memory to memory transfer with block append during a transfer
+ * @details
+ * - 4 tests:
+ *   -# restart_transfer test: Check that the function silabs ldma append block function restart
+ *      the transfer if we append a block after the transfer is done.
+ *   -# restart_in_isr test: Check that is a transfer is done during the append, the next dma isr
+ *      will restart the transfer with the right append block.
+ *   -# stress_in_isr test: Check that we can append the next block immediately after a
+ *      DMA_STATUS_BLOCK callback.
+ *   -# loopstress test: Check that we can continuously append block and check that the function
+ *      return an error if we append a transfer that already has an append block
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/dma/dma_silabs_ldma.h>
+#include <zephyr/ztest.h>
+
+#define BLOCK_SIZE 4
+
+/* this src memory shall be in RAM to support using as a DMA source pointer.*/
+static __aligned(32) uint8_t tx_data[CONFIG_DMA_BA_XFER_SIZE];
+static __aligned(32) uint8_t rx_data[CONFIG_DMA_BA_XFER_SIZE];
+
+K_SEM_DEFINE(xfer_sem, 0, 1);
+
+static struct dma_config dma_cfg = {0};
+static struct dma_block_config dma_block_cfg;
+static uint32_t rx_idx;
+static uint32_t tx_idx;
+
+static void dma_ba_callback_restart(const struct device *dma_dev, void *user_data, uint32_t channel,
+				    int status)
+{
+	if (status < 0) {
+		TC_PRINT("callback status %d\n", status);
+	} else {
+		TC_PRINT("giving xfer_sem\n");
+		k_sem_give(&xfer_sem);
+	}
+}
+
+static int test_ba_restart_transfer(void)
+{
+	const struct device *dma;
+	static int chan_id;
+
+	TC_PRINT("Preparing DMA Controller\n");
+
+	memset(tx_data, 0, sizeof(tx_data));
+
+	for (int i = 0; i < CONFIG_DMA_BA_XFER_SIZE; i++) {
+		tx_data[i] = i;
+	}
+
+	memset(rx_data, 0, sizeof(rx_data));
+
+	dma = DEVICE_DT_GET(DT_ALIAS(dma0));
+	if (!device_is_ready(dma)) {
+		TC_PRINT("dma controller device is not ready\n");
+		return TC_FAIL;
+	}
+
+	dma_cfg.channel_direction = MEMORY_TO_MEMORY;
+	dma_cfg.source_data_size = 1U;
+	dma_cfg.dest_data_size = 1U;
+	dma_cfg.source_burst_length = 1U;
+	dma_cfg.dest_burst_length = 1U;
+	dma_cfg.user_data = NULL;
+	dma_cfg.dma_callback = dma_ba_callback_restart;
+	dma_cfg.head_block = &dma_block_cfg;
+	dma_cfg.complete_callback_en = true; /* per block completion */
+
+	chan_id = dma_request_channel(dma, NULL);
+	if (chan_id < 0) {
+		return TC_FAIL;
+	}
+
+	memset(&dma_block_cfg, 0, sizeof(dma_block_cfg));
+	dma_block_cfg.block_size = CONFIG_DMA_BA_XFER_SIZE / 2;
+	dma_block_cfg.source_address = (uint32_t)(tx_data);
+	dma_block_cfg.dest_address = (uint32_t)(rx_data);
+	TC_PRINT("block_size %d, source addr %x, dest addr %x\n", CONFIG_DMA_BA_XFER_SIZE,
+		 dma_block_cfg.source_address, dma_block_cfg.dest_address);
+
+	if (dma_config(dma, chan_id, &dma_cfg)) {
+		TC_PRINT("ERROR: transfer config (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Starting the transfer on channel %d\n", chan_id);
+
+	if (dma_start(dma, chan_id)) {
+		TC_PRINT("ERROR: transfer start (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	/* Be sure that the DMA transfer is done */
+	k_busy_wait(1000 * 100); /* busy wait for 100 ms*/
+
+	/* Append a next block on the channel that is already done*/
+	dma_block_cfg.source_address = (uint32_t)(tx_data) + CONFIG_DMA_BA_XFER_SIZE / 2;
+	dma_block_cfg.dest_address = (uint32_t)(rx_data) + CONFIG_DMA_BA_XFER_SIZE / 2;
+
+	dma_cfg.head_block = &dma_block_cfg;
+	silabs_ldma_append_block(dma, chan_id, &dma_cfg);
+
+	if (k_sem_take(&xfer_sem, K_MSEC(1000)) != 0) {
+		TC_PRINT("Timed out waiting for xfers\n");
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Verify RX buffer should contain the full TX buffer string.\n");
+
+	if (memcmp(tx_data, rx_data, CONFIG_DMA_BA_XFER_SIZE)) {
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Finished: DMA block append restart transfer\n");
+	return TC_PASS;
+}
+
+static int test_ba_restart_in_isr(void)
+{
+	const struct device *dma;
+	static int chan_id;
+	unsigned int key;
+
+	TC_PRINT("Preparing DMA Controller\n");
+
+	memset(tx_data, 0, sizeof(tx_data));
+
+	for (int i = 0; i < CONFIG_DMA_BA_XFER_SIZE; i++) {
+		tx_data[i] = i;
+	}
+
+	memset(rx_data, 0, sizeof(rx_data));
+
+	dma = DEVICE_DT_GET(DT_ALIAS(dma0));
+	if (!device_is_ready(dma)) {
+		TC_PRINT("dma controller device is not ready\n");
+		return TC_FAIL;
+	}
+
+	dma_cfg.channel_direction = MEMORY_TO_MEMORY;
+	dma_cfg.source_data_size = 1U;
+	dma_cfg.dest_data_size = 1U;
+	dma_cfg.source_burst_length = 1U;
+	dma_cfg.dest_burst_length = 1U;
+	dma_cfg.user_data = NULL;
+	dma_cfg.dma_callback = dma_ba_callback_restart;
+	dma_cfg.head_block = &dma_block_cfg;
+	dma_cfg.complete_callback_en = true; /* per block completion */
+
+	chan_id = dma_request_channel(dma, NULL);
+	if (chan_id < 0) {
+		return TC_FAIL;
+	}
+
+	memset(&dma_block_cfg, 0, sizeof(dma_block_cfg));
+	dma_block_cfg.block_size = CONFIG_DMA_BA_XFER_SIZE / 2;
+	dma_block_cfg.source_address = (uint32_t)(tx_data);
+	dma_block_cfg.dest_address = (uint32_t)(rx_data);
+	TC_PRINT("block_size %d, source addr %x, dest addr %x\n", CONFIG_DMA_BA_XFER_SIZE,
+		 dma_block_cfg.source_address, dma_block_cfg.dest_address);
+
+	if (dma_config(dma, chan_id, &dma_cfg)) {
+		TC_PRINT("ERROR: transfer config (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Starting the transfer on channel %d and waiting completion\n", chan_id);
+
+	/* Lock IRQ in order to not triger the DMA isr */
+	key = irq_lock();
+	if (dma_start(dma, chan_id)) {
+		TC_PRINT("ERROR: transfer start (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	/* Be sure that the DMA transfer is done */
+	k_busy_wait(1000 * 100); /* busy wait for 100 ms*/
+
+	/* Remove the done flag of the dma channel to simulate an append while a transfer is
+	 * ongoing
+	 */
+	sys_clear_bit((mem_addr_t)&LDMA->CHDONE, chan_id);
+
+	/* Append a next block on the channel that is already done*/
+	dma_block_cfg.source_address = (uint32_t)(tx_data) + CONFIG_DMA_BA_XFER_SIZE / 2;
+	dma_block_cfg.dest_address = (uint32_t)(rx_data) + CONFIG_DMA_BA_XFER_SIZE / 2;
+
+	dma_cfg.head_block = &dma_block_cfg;
+	silabs_ldma_append_block(dma, chan_id, &dma_cfg);
+
+	/* Set the chdone bit to simulate that the DMA transfer was finished while appending a
+	 * block
+	 */
+	sys_set_bit((mem_addr_t)&LDMA->CHDONE, chan_id);
+
+	/* Check if the isr in dma driver will correctly restart the DMA engine with the new block
+	 * that was append
+	 */
+	irq_unlock(key);
+
+	if (k_sem_take(&xfer_sem, K_MSEC(1000)) != 0) {
+		TC_PRINT("Timed out waiting for xfers\n");
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Verify RX buffer should contain the full TX buffer string.\n");
+
+	if (memcmp(tx_data, rx_data, CONFIG_DMA_BA_XFER_SIZE)) {
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Finished: DMA block append restart in isr\n");
+	return TC_PASS;
+}
+
+static void dma_ba_callback_stress_in_isr(const struct device *dma_dev, void *user_data,
+					  uint32_t channel, int status)
+{
+	struct dma_config *dma_cfg = (struct dma_config *)user_data;
+
+	if (status < 0) {
+		TC_PRINT("callback status %d\n", status);
+	} else {
+		if (rx_idx <= CONFIG_DMA_BA_XFER_SIZE - BLOCK_SIZE) {
+			dma_block_cfg.source_address = (uint32_t)(tx_data + tx_idx);
+			dma_block_cfg.dest_address = (uint32_t)(rx_data + rx_idx);
+			rx_idx += BLOCK_SIZE;
+			tx_idx += BLOCK_SIZE;
+			if (silabs_ldma_append_block(dma_dev, channel, dma_cfg)) {
+				TC_PRINT("append block failed\n");
+			}
+		} else {
+			TC_PRINT("giving xfer_sem\n");
+			k_sem_give(&xfer_sem);
+		}
+	}
+}
+
+static int test_ba_stress_in_isr(void)
+{
+	const struct device *dma;
+	static int chan_id;
+	unsigned int key;
+
+	TC_PRINT("Preparing DMA Controller\n");
+
+	memset(tx_data, 0, sizeof(tx_data));
+
+	rx_idx = 0;
+	tx_idx = 0;
+
+	for (int i = 0; i < CONFIG_DMA_BA_XFER_SIZE; i++) {
+		tx_data[i] = i;
+	}
+
+	memset(rx_data, 0, sizeof(rx_data));
+
+	dma = DEVICE_DT_GET(DT_ALIAS(dma0));
+	if (!device_is_ready(dma)) {
+		return TC_FAIL;
+	}
+
+	dma_cfg.channel_direction = MEMORY_TO_MEMORY;
+	dma_cfg.source_data_size = 1U;
+	dma_cfg.dest_data_size = 1U;
+	dma_cfg.source_burst_length = 1U;
+	dma_cfg.dest_burst_length = 1U;
+	dma_cfg.user_data = &dma_cfg;
+	dma_cfg.dma_callback = dma_ba_callback_stress_in_isr;
+	dma_cfg.head_block = &dma_block_cfg;
+	dma_cfg.complete_callback_en = true; /* per block completion */
+
+	chan_id = dma_request_channel(dma, NULL);
+	if (chan_id < 0) {
+		return TC_FAIL;
+	}
+
+	memset(&dma_block_cfg, 0, sizeof(dma_block_cfg));
+
+	/* Configure the first transfer block*/
+	dma_block_cfg.block_size = BLOCK_SIZE;
+	dma_block_cfg.source_address = (uint32_t)(tx_data + tx_idx);
+	dma_block_cfg.dest_address = (uint32_t)(rx_data + rx_idx);
+	rx_idx += BLOCK_SIZE;
+	tx_idx += BLOCK_SIZE;
+
+	TC_PRINT("dma block %d block_size %d, source addr %x, dest addr %x\n", 0, BLOCK_SIZE,
+		 dma_block_cfg.source_address, dma_block_cfg.dest_address);
+
+	if (dma_config(dma, chan_id, &dma_cfg)) {
+		TC_PRINT("ERROR: transfer config (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Starting the transfer on channel %d and waiting completion\n", chan_id);
+
+	/* Lock IRQ in order to not triger the DMA isr */
+	key = irq_lock();
+	if (dma_start(dma, chan_id)) {
+		TC_PRINT("ERROR: transfer start (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	/* Append a new block on the channel */
+	dma_block_cfg.source_address = (uint32_t)(tx_data + tx_idx);
+	dma_block_cfg.dest_address = (uint32_t)(rx_data + rx_idx);
+	rx_idx += BLOCK_SIZE;
+	tx_idx += BLOCK_SIZE;
+	silabs_ldma_append_block(dma, chan_id, &dma_cfg);
+
+	irq_unlock(key);
+
+	/* All the next blocks will be append in the isr */
+
+	if (k_sem_take(&xfer_sem, K_MSEC(1000)) != 0) {
+		TC_PRINT("Timed out waiting for xfers\n");
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Verify RX buffer should contain the full TX buffer string.\n");
+
+	if (memcmp(tx_data, rx_data, CONFIG_DMA_BA_XFER_SIZE)) {
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Finished: DMA block append stress in isr\n");
+	return TC_PASS;
+}
+
+static void dma_ba_callback_loopstress(const struct device *dma_dev, void *user_data,
+				       uint32_t channel, int status)
+{
+	if (status < 0) {
+		TC_PRINT("callback status %d\n", status);
+	} else {
+		if (rx_idx == CONFIG_DMA_BA_XFER_SIZE) {
+			TC_PRINT("giving xfer_sem\n");
+			k_sem_give(&xfer_sem);
+		}
+	}
+}
+
+static int test_ba_loopstress(void)
+{
+	const struct device *dma;
+	static int chan_id;
+
+	TC_PRINT("Preparing DMA Controller\n");
+
+	memset(tx_data, 0, sizeof(tx_data));
+
+	rx_idx = 0;
+	tx_idx = 0;
+
+	for (int i = 0; i < CONFIG_DMA_BA_XFER_SIZE; i++) {
+		tx_data[i] = i;
+	}
+
+	memset(rx_data, 0, sizeof(rx_data));
+
+	dma = DEVICE_DT_GET(DT_ALIAS(dma0));
+	if (!device_is_ready(dma)) {
+		TC_PRINT("dma controller device is not ready\n");
+		return TC_FAIL;
+	}
+
+	dma_cfg.channel_direction = MEMORY_TO_MEMORY;
+	dma_cfg.source_data_size = 1U;
+	dma_cfg.dest_data_size = 1U;
+	dma_cfg.source_burst_length = 1U;
+	dma_cfg.dest_burst_length = 1U;
+	dma_cfg.user_data = &dma_cfg;
+	dma_cfg.dma_callback = dma_ba_callback_loopstress;
+	dma_cfg.head_block = &dma_block_cfg;
+	dma_cfg.complete_callback_en = true; /* per block completion */
+
+	chan_id = dma_request_channel(dma, NULL);
+	if (chan_id < 0) {
+		return TC_FAIL;
+	}
+
+	memset(&dma_block_cfg, 0, sizeof(dma_block_cfg));
+
+	/* Setting the first DMA transfer block */
+	dma_block_cfg.block_size = BLOCK_SIZE;
+	dma_block_cfg.source_address = (uint32_t)(tx_data + tx_idx);
+	dma_block_cfg.dest_address = (uint32_t)(rx_data + rx_idx);
+	rx_idx += BLOCK_SIZE;
+	tx_idx += BLOCK_SIZE;
+
+	TC_PRINT("dma block %d block_size %d, source addr %x, dest addr %x\n", 0, BLOCK_SIZE,
+		 dma_block_cfg.source_address, dma_block_cfg.dest_address);
+
+	if (dma_config(dma, chan_id, &dma_cfg)) {
+		TC_PRINT("ERROR: transfer config (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Starting the transfer on channel %d and waiting completion\n", chan_id);
+
+	if (dma_start(dma, chan_id)) {
+		TC_PRINT("ERROR: transfer start (%d)\n", chan_id);
+		return TC_FAIL;
+	}
+
+	/* Append new blocks on the channel */
+	while (rx_idx <= CONFIG_DMA_BA_XFER_SIZE - BLOCK_SIZE) {
+		dma_block_cfg.source_address = (uint32_t)(tx_data + tx_idx);
+		dma_block_cfg.dest_address = (uint32_t)(rx_data + rx_idx);
+
+		if (!silabs_ldma_append_block(dma, chan_id, &dma_cfg)) {
+			rx_idx += BLOCK_SIZE;
+			tx_idx += BLOCK_SIZE;
+		}
+	}
+
+	if (k_sem_take(&xfer_sem, K_MSEC(1000)) != 0) {
+		TC_PRINT("Timed out waiting for xfers\n");
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Verify RX buffer should contain the full TX buffer string.\n");
+
+	if (memcmp(tx_data, rx_data, CONFIG_DMA_BA_XFER_SIZE)) {
+		return TC_FAIL;
+	}
+
+	TC_PRINT("Finished: DMA block append loopstress\n");
+	return TC_PASS;
+}
+
+/* export test cases */
+ZTEST(dma_m2m_ba, test_dma_m2m_ba_restart_transfer)
+{
+	zassert_true((test_ba_restart_transfer() == TC_PASS));
+}
+
+ZTEST(dma_m2m_ba, test_dma_m2m_ba_restart_in_isr)
+{
+	zassert_true((test_ba_restart_in_isr() == TC_PASS));
+}
+
+ZTEST(dma_m2m_ba, test_dma_m2m_stress_in_isr)
+{
+	zassert_true((test_ba_stress_in_isr() == TC_PASS));
+}
+
+ZTEST(dma_m2m_ba, test_dma_m2m_loopstress)
+{
+	zassert_true((test_ba_loopstress() == TC_PASS));
+}
diff --git a/tests/boards/silabs/dma/block_append/testcase.yaml b/tests/boards/silabs/dma/block_append/testcase.yaml
new file mode 100644
index 0000000000000..fef775b94fa85
--- /dev/null
+++ b/tests/boards/silabs/dma/block_append/testcase.yaml
@@ -0,0 +1,10 @@
+tests:
+  boards.silabs.dma.block_append:
+    depends_on: dma
+    tags:
+      - drivers
+      - dma
+    platform_allow:
+      - slwrb4180a
+      - xg29_rb4412a
+    filter: dt_alias_exists("dma0")
diff --git a/tests/boot/mcuboot_recovery_retention/sysbuild.cmake b/tests/boot/mcuboot_recovery_retention/sysbuild.cmake
index 6000a6416e7e9..6207fe8e58c65 100644
--- a/tests/boot/mcuboot_recovery_retention/sysbuild.cmake
+++ b/tests/boot/mcuboot_recovery_retention/sysbuild.cmake
@@ -1,9 +1,9 @@
 set(mcuboot_EXTRA_ZEPHYR_MODULES "${CMAKE_CURRENT_LIST_DIR}/test_module" CACHE INTERNAL "test_module directory")
 
-if(DEFINED mcuboot_TARGET_OVERLAY_CONFIG)
-  list(APPEND mcuboot_OVERLAY_CONFIG "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_OVERLAY_CONFIG}")
-  list(REMOVE_DUPLICATES mcuboot_OVERLAY_CONFIG)
-  set(mcuboot_OVERLAY_CONFIG "${mcuboot_OVERLAY_CONFIG}" CACHE INTERNAL "")
+if(DEFINED mcuboot_TARGET_EXTRA_CONF_FILE)
+  list(APPEND mcuboot_EXTRA_CONF_FILE "${CMAKE_CURRENT_LIST_DIR}/sysbuild/mcuboot/${mcuboot_TARGET_EXTRA_CONF_FILE}")
+  list(REMOVE_DUPLICATES mcuboot_EXTRA_CONF_FILE)
+  set(mcuboot_EXTRA_CONF_FILE "${mcuboot_EXTRA_CONF_FILE}" CACHE INTERNAL "")
 endif()
 
 if(DEFINED mcuboot_TARGET_DTC_OVERLAY_FILE)
diff --git a/tests/boot/mcuboot_recovery_retention/testcase.yaml b/tests/boot/mcuboot_recovery_retention/testcase.yaml
index 0bb7e62e706e2..9a68b6a708204 100644
--- a/tests/boot/mcuboot_recovery_retention/testcase.yaml
+++ b/tests/boot/mcuboot_recovery_retention/testcase.yaml
@@ -30,7 +30,7 @@ tests:
     extra_args:
       - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
       - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
-      - mcuboot_TARGET_OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf"
+      - mcuboot_TARGET_EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf"
       - mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay"
     tags:
       - mcuboot
diff --git a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf
index a8dcadfbca645..26718f348a3ad 100644
--- a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf
+++ b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf
@@ -71,7 +71,6 @@ CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_CONN_ISO_GROUPS=1
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=2
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=2
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
@@ -79,6 +78,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=18
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=4095
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=4
diff --git a/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf b/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf
index 4679eedd1e0bf..869d43f5fbc4a 100644
--- a/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf
+++ b/tests/bsim/bluetooth/audio/overlay-nrf5340_cpunet_iso-bt_ll_sw_split.conf
@@ -5,6 +5,7 @@
 CONFIG_BT_ISO_TX_BUF_COUNT=18
 
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=18
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=4095
 
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
index fe5f431846115..e643df8d5c948 100644
--- a/tests/bsim/bluetooth/audio/prj.conf
+++ b/tests/bsim/bluetooth/audio/prj.conf
@@ -19,7 +19,6 @@ CONFIG_BT_MAX_PAIRED=3
 CONFIG_BT_EXT_ADV_MAX_ADV_SET=3
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_GATT_CLIENT=y
-CONFIG_BT_GATT_CACHING=y
 CONFIG_BT_GATT_DYNAMIC_DB=y
 CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
 CONFIG_BT_GATT_AUTO_UPDATE_MTU=y
@@ -55,6 +54,11 @@ CONFIG_BT_ISO_RX_MTU=310
 CONFIG_BT_ISO_RX_BUF_COUNT=4
 
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
+# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=50
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=70
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 # Needed for Periodic Advertising Sync Transfer
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER=y
@@ -84,7 +88,8 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=2
 # Coordinated Set Identification
 CONFIG_BT_CSIP_SET_MEMBER=y
 CONFIG_BT_CSIP_SET_MEMBER_TEST_SAMPLE_DATA=y
-CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE=y
+CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE=y
+CONFIG_BT_CSIP_SET_MEMBER_SIZE_NOTIFIABLE=y
 CONFIG_BT_CSIP_SET_COORDINATOR=y
 CONFIG_BT_CSIP_SET_COORDINATOR_TEST_SAMPLE_DATA=y
 
diff --git a/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c b/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c
index 68894d7a3206c..fb1da4e690490 100644
--- a/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c
@@ -7,6 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/byteorder.h>
 #include <zephyr/bluetooth/gap.h>
@@ -29,8 +30,7 @@ static void test_main(void)
 	struct bt_le_ext_adv *adv;
 	struct bt_data ad[2] = {
 		BT_DATA_BYTES(BT_DATA_FLAGS, BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR),
-		BT_DATA_BYTES(BT_DATA_SVC_DATA16,
-			      BT_UUID_16_ENCODE(BT_UUID_BROADCAST_AUDIO_VAL),
+		BT_DATA_BYTES(BT_DATA_SVC_DATA16, BT_UUID_16_ENCODE(BT_UUID_BROADCAST_AUDIO_VAL),
 			      BT_BYTES_LIST_LE24(broadcast_id)),
 	};
 
@@ -42,19 +42,7 @@ static void test_main(void)
 
 	printk("Bluetooth initialized\n");
 
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, &adv);
-	if (err) {
-		FAIL("Failed to create advertising set (err %d)\n", err);
-		return;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(adv, BT_LE_PER_ADV_DEFAULT);
-	if (err) {
-		FAIL("Failed to set periodic advertising parameters (err %d)\n", err);
-		return;
-	}
+	setup_broadcast_adv(&adv);
 
 	/* Set adv data */
 	err = bt_le_ext_adv_set_data(adv, ad, ARRAY_SIZE(ad), NULL, 0);
diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
index 430ab7f950a4b..bb8f44c5b90b0 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
@@ -27,6 +28,7 @@
 #include "common.h"
 #include "bap_common.h"
 #include "bstests.h"
+#include "syscalls/kernel.h"
 
 #ifdef CONFIG_BT_BAP_BROADCAST_ASSISTANT
 
@@ -517,9 +519,12 @@ static void test_bass_mod_source(uint32_t bis_sync)
 		FAIL("Could not modify source (err %d)\n", err);
 		return;
 	}
-	printk("Source modified, waiting for server to PA sync\n");
 
-	WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+	if (recv_state.pa_sync_state == BT_BAP_PA_STATE_NOT_SYNCED) {
+		printk("Source modified, waiting for server to PA sync\n");
+
+		WAIT_FOR_AND_CLEAR_FLAG(flag_recv_state_updated);
+	}
 
 	if (recv_state.pa_sync_state == BT_BAP_PA_STATE_INFO_REQ) {
 		/* Wait for PAST to finish and then a new receive state */
@@ -579,10 +584,13 @@ static void test_bass_mod_source(uint32_t bis_sync)
 				FAIL("Unexpected BIS sync value: %u", remote_bis_sync);
 				return;
 			}
-		} else if (remote_bis_sync != subgroup.bis_sync) {
-			FAIL("Unexpected BIS sync value: %u != %u\n", remote_bis_sync,
-			     subgroup.bis_sync);
-			return;
+		} else {
+			WAIT_FOR_FLAG(flag_recv_state_updated_with_bis_sync);
+			if (remote_bis_sync != subgroup.bis_sync) {
+				FAIL("Unexpected BIS sync value: %u != %u\n", remote_bis_sync,
+				     subgroup.bis_sync);
+				return;
+			}
 		}
 	}
 
@@ -659,12 +667,17 @@ static void test_bass_broadcast_code(const uint8_t broadcast_code[BT_ISO_BROADCA
 
 	printk("Adding broadcast code\n");
 	UNSET_FLAG(flag_write_complete);
-	err = bt_bap_broadcast_assistant_set_broadcast_code(default_conn, recv_state.src_id,
-							    broadcast_code);
-	if (err != 0) {
-		FAIL("Could not add broadcast code (err %d)\n", err);
-		return;
-	}
+
+	do {
+		err = bt_bap_broadcast_assistant_set_broadcast_code(default_conn, recv_state.src_id,
+								    broadcast_code);
+		if (err == -EBUSY) {
+			k_sleep(BAP_RETRY_WAIT);
+		} else if (err != 0) {
+			FAIL("Could not add broadcast code (err %d)\n", err);
+			return;
+		}
+	} while (err == -EBUSY);
 
 	WAIT_FOR_FLAG(flag_write_complete);
 	printk("Broadcast code added\n");
diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
index 8f87eef4528b9..be580e02ea61c 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
@@ -569,6 +569,7 @@ static void stream_started_cb(struct bt_bap_stream *stream)
 
 	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
 	test_stream->rx_cnt = 0U;
+	test_stream->valid_rx_cnt = 0U;
 
 	err = bt_bap_ep_get_info(stream->ep, &info);
 	if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c b/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c
index 4880271aa537c..792161bdadb7f 100644
--- a/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c
@@ -336,30 +336,14 @@ static void test_broadcast_source_get_base(struct bt_bap_broadcast_source *sourc
 static int setup_extended_adv(struct bt_bap_broadcast_source *source, struct bt_le_ext_adv **adv)
 {
 	/* Broadcast Audio Streaming Endpoint advertising data */
-	NET_BUF_SIMPLE_DEFINE(ad_buf,
-			      BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
-	struct bt_le_adv_param adv_param = BT_LE_ADV_PARAM_INIT(
-		BT_LE_ADV_OPT_EXT_ADV, 0x80, 0x80, NULL);
+	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 	struct bt_data ext_ad;
 	struct bt_data per_ad;
 	uint32_t broadcast_id;
 	int err;
 
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(&adv_param, NULL, adv);
-	if (err != 0) {
-		printk("Unable to create extended advertising set: %d\n", err);
-		return err;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
-	if (err) {
-		printk("Failed to set periodic advertising parameters: %d\n",
-		       err);
-		return err;
-	}
+	setup_broadcast_adv(adv);
 
 	err = bt_rand(&broadcast_id, BT_AUDIO_BROADCAST_ID_SIZE);
 	if (err) {
diff --git a/tests/bsim/bluetooth/audio/src/bap_common.h b/tests/bsim/bluetooth/audio/src/bap_common.h
index 01316dcf3e262..ccb862be2061e 100644
--- a/tests/bsim/bluetooth/audio/src/bap_common.h
+++ b/tests/bsim/bluetooth/audio/src/bap_common.h
@@ -18,6 +18,9 @@
 #include <zephyr/bluetooth/audio/bap_lc3_preset.h>
 #include <zephyr/bluetooth/audio/cap.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/kernel.h>
+
+#include "common.h"
 
 #define LONG_META 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, \
 		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, \
@@ -45,8 +48,11 @@
 #define INCORRECT_BROADCAST_CODE                                                                   \
 	((uint8_t[]){0xDE, 0xAD, 0xBE, 0xEF, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, \
 		     0xdd, 0xee, 0xff})
+
+#define BAP_RETRY_WAIT K_MSEC(100)
+
 struct unicast_stream {
-	struct bt_cap_stream stream;
+	struct audio_test_stream stream;
 	struct bt_audio_codec_cfg codec_cfg;
 	struct bt_bap_qos_cfg qos;
 };
diff --git a/tests/bsim/bluetooth/audio/src/bap_stream_rx.c b/tests/bsim/bluetooth/audio/src/bap_stream_rx.c
index 8259e12f3676e..be79b007ecac5 100644
--- a/tests/bsim/bluetooth/audio/src/bap_stream_rx.c
+++ b/tests/bsim/bluetooth/audio/src/bap_stream_rx.c
@@ -20,8 +20,9 @@ static void log_stream_rx(struct bt_bap_stream *stream, const struct bt_iso_recv
 {
 	struct audio_test_stream *test_stream = audio_test_stream_from_bap_stream(stream);
 
-	LOG_INF("[%zu]: Incoming audio on stream %p len %u, flags 0x%02X, seq_num %u and ts %u",
-		test_stream->rx_cnt, stream, buf->len, info->flags, info->seq_num, info->ts);
+	LOG_INF("[%zu|%zu]: Incoming audio on stream %p len %u, flags 0x%02X, seq_num %u and ts %u",
+		test_stream->valid_rx_cnt, test_stream->rx_cnt, stream, buf->len, info->flags,
+		info->seq_num, info->ts);
 }
 
 void bap_stream_rx_recv_cb(struct bt_bap_stream *stream, const struct bt_iso_recv_info *info,
@@ -29,47 +30,68 @@ void bap_stream_rx_recv_cb(struct bt_bap_stream *stream, const struct bt_iso_rec
 {
 	struct audio_test_stream *test_stream = audio_test_stream_from_bap_stream(stream);
 
+	test_stream->rx_cnt++;
+	if ((info->flags & BT_ISO_FLAGS_VALID) != 0) {
+		if (memcmp(buf->data, mock_iso_data, buf->len) == 0) {
+			test_stream->valid_rx_cnt++;
+
+			if (test_stream->valid_rx_cnt >= MIN_SEND_COUNT) {
+				/* We set the flag is just one stream has received the expected */
+				SET_FLAG(flag_audio_received);
+			}
+		} else {
+			log_stream_rx(stream, info, buf);
+			FAIL("Unexpected data received\n");
+		}
+	}
+
 	if ((test_stream->rx_cnt % 50U) == 0U) {
 		log_stream_rx(stream, info, buf);
 	}
 
-	if (test_stream->rx_cnt > 0U && info->ts == test_stream->last_info.ts) {
+	if (info->ts == test_stream->last_info.ts) {
 		log_stream_rx(stream, info, buf);
-		FAIL("Duplicated timestamp received: %u\n", test_stream->last_info.ts);
-		return;
+		if (test_stream->valid_rx_cnt > 1U) {
+			FAIL("Duplicated timestamp received: %u\n", test_stream->last_info.ts);
+		}
 	}
 
-	if (test_stream->rx_cnt > 0U && info->seq_num == test_stream->last_info.seq_num) {
+	if (info->seq_num == test_stream->last_info.seq_num) {
 		log_stream_rx(stream, info, buf);
-		FAIL("Duplicated PSN received: %u\n", test_stream->last_info.seq_num);
-		return;
+		if (test_stream->valid_rx_cnt > 1U) {
+			FAIL("Duplicated PSN received: %u\n", test_stream->last_info.seq_num);
+		}
 	}
 
 	if (info->flags & BT_ISO_FLAGS_ERROR) {
 		/* Fail the test if we have not received what we expected */
-		if (!TEST_FLAG(flag_audio_received)) {
-			log_stream_rx(stream, info, buf);
+		log_stream_rx(stream, info, buf);
+		if (test_stream->valid_rx_cnt > 1U && !TEST_FLAG(flag_audio_received)) {
 			FAIL("ISO receive error\n");
 		}
-
-		return;
 	}
 
 	if (info->flags & BT_ISO_FLAGS_LOST) {
 		log_stream_rx(stream, info, buf);
-		FAIL("ISO receive lost\n");
-		return;
+		if (test_stream->valid_rx_cnt > 1U) {
+			FAIL("ISO receive lost\n");
+		}
 	}
+}
 
-	if (memcmp(buf->data, mock_iso_data, buf->len) == 0) {
-		test_stream->rx_cnt++;
+bool bap_stream_rx_can_recv(const struct bt_bap_stream *stream)
+{
+	struct bt_bap_ep_info info;
+	int err;
 
-		if (test_stream->rx_cnt >= MIN_SEND_COUNT) {
-			/* We set the flag is just one stream has received the expected */
-			SET_FLAG(flag_audio_received);
-		}
-	} else {
-		log_stream_rx(stream, info, buf);
-		FAIL("Unexpected data received\n");
+	if (stream == NULL || stream->ep == NULL) {
+		return false;
+	}
+
+	err = bt_bap_ep_get_info(stream->ep, &info);
+	if (err != 0) {
+		return false;
 	}
+
+	return info.can_recv;
 }
diff --git a/tests/bsim/bluetooth/audio/src/bap_stream_rx.h b/tests/bsim/bluetooth/audio/src/bap_stream_rx.h
index d24b679a448b5..5db4c1e009cdd 100644
--- a/tests/bsim/bluetooth/audio/src/bap_stream_rx.h
+++ b/tests/bsim/bluetooth/audio/src/bap_stream_rx.h
@@ -10,3 +10,12 @@
 
 void bap_stream_rx_recv_cb(struct bt_bap_stream *stream, const struct bt_iso_recv_info *info,
 			   struct net_buf *buf);
+
+/**
+ * @brief Test if the provided stream has been configured for RX
+ *
+ * @param bap_stream The stream to test for RX support
+ *
+ * @returns true if it has been configured for RX, and false if not
+ */
+bool bap_stream_rx_can_recv(const struct bt_bap_stream *stream);
diff --git a/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c b/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c
index 6563185249efa..a00dff69e4b50 100644
--- a/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c
@@ -37,8 +37,6 @@
 
 #if defined(CONFIG_BT_BAP_UNICAST_CLIENT)
 
-#define BAP_STREAM_RETRY_WAIT K_MSEC(100)
-
 extern enum bst_result_t bst_result;
 
 static struct audio_test_stream test_streams[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT];
@@ -426,7 +424,7 @@ static bool parse_ascs_ad_data(struct bt_data *data, void *user_data)
 		return false;
 	}
 
-	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err) {
 		FAIL("Could not connect to peer: %d", err);
@@ -582,7 +580,7 @@ static int codec_configure_stream(struct bt_bap_stream *stream, struct bt_bap_ep
 
 		err = bt_bap_stream_config(default_conn, stream, ep, codec_cfg);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not configure stream %p: %d\n", stream, err);
 			return err;
@@ -632,7 +630,7 @@ static void qos_configure_streams(struct bt_bap_unicast_group *unicast_group,
 	do {
 		err = bt_bap_stream_qos(default_conn, unicast_group);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Unable to QoS configure streams: %d\n", err);
 			return;
@@ -653,7 +651,7 @@ static int enable_stream(struct bt_bap_stream *stream)
 	do {
 		err = bt_bap_stream_enable(stream, NULL, 0);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not enable stream %p: %d\n", stream, err);
 			return err;
@@ -692,7 +690,7 @@ static int metadata_update_stream(struct bt_bap_stream *stream)
 	do {
 		err = bt_bap_stream_metadata(stream, new_meta, ARRAY_SIZE(new_meta));
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not metadata update stream %p: %d\n", stream, err);
 			return err;
@@ -786,7 +784,7 @@ static int start_stream(struct bt_bap_stream *stream)
 	do {
 		err = bt_bap_stream_start(stream);
 		if (err == -EBUSY) {
-			k_sleep(BAP_STREAM_RETRY_WAIT);
+			k_sleep(BAP_RETRY_WAIT);
 		} else if (err != 0) {
 			FAIL("Could not start stream %p: %d\n", stream, err);
 			return err;
@@ -851,7 +849,7 @@ static void disable_streams(size_t stream_cnt)
 			err = bt_bap_stream_disable(
 				bap_stream_from_audio_test_stream(&test_streams[i]));
 			if (err == -EBUSY) {
-				k_sleep(BAP_STREAM_RETRY_WAIT);
+				k_sleep(BAP_RETRY_WAIT);
 			} else if (err != 0) {
 				FAIL("Could not disable stream: %d\n", err);
 				return;
@@ -885,7 +883,7 @@ static void stop_streams(size_t stream_cnt)
 		do {
 			err = bt_bap_stream_stop(source_stream);
 			if (err == -EBUSY) {
-				k_sleep(BAP_STREAM_RETRY_WAIT);
+				k_sleep(BAP_RETRY_WAIT);
 			} else if (err != 0) {
 				FAIL("Could not stop stream: %d\n", err);
 				return;
@@ -911,7 +909,7 @@ static void release_streams(size_t stream_cnt)
 			err = bt_bap_stream_release(
 				bap_stream_from_audio_test_stream(&test_streams[i]));
 			if (err == -EBUSY) {
-				k_sleep(BAP_STREAM_RETRY_WAIT);
+				k_sleep(BAP_RETRY_WAIT);
 			} else if (err != 0) {
 				FAIL("Could not release stream: %d\n", err);
 				return;
diff --git a/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c b/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c
index d2415b6c8070f..980915d21b8c3 100644
--- a/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c
+++ b/tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c
@@ -471,6 +471,29 @@ static void init(void)
 	setup_connectable_adv(&ext_adv);
 }
 
+static void deinit(void)
+{
+	int err;
+
+	err = bt_bap_unicast_server_unregister_cb(&unicast_server_cb);
+	if (err != 0) {
+		FAIL("Failed to unregister unicast server callbacks (err %d)\n", err);
+		return;
+	}
+
+	err = bt_bap_unicast_server_unregister();
+	if (err != 0) {
+		FAIL("Failed to unregister unicast server (err %d)\n", err);
+		return;
+	}
+
+	err = bt_pacs_unregister();
+	if (err != 0) {
+		FAIL("Failed to unregister PACS (err %d)\n", err);
+		return;
+	}
+}
+
 static void test_main(void)
 {
 	init();
@@ -484,6 +507,8 @@ static void test_main(void)
 	WAIT_FOR_FLAG(flag_stream_started);
 	transceive_test_streams();
 	WAIT_FOR_UNSET_FLAG(flag_connected);
+
+	deinit();
 	PASS("Unicast server passed\n");
 }
 
@@ -540,6 +565,8 @@ static void test_main_acl_disconnect(void)
 	/* The client will reconnect */
 	WAIT_FOR_UNSET_FLAG(flag_connected);
 	WAIT_FOR_FLAG(flag_connected);
+
+	deinit();
 	PASS("Unicast server ACL disconnect  passed\n");
 }
 
diff --git a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
index cc9a50aa6cb98..d21b5c0184325 100644
--- a/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
@@ -35,24 +35,16 @@
 #include <zephyr/sys/util_macro.h>
 
 #include "bap_stream_rx.h"
+#include "bap_stream_tx.h"
 #include "bstests.h"
 #include "common.h"
 #include "bap_common.h"
 
 #if defined(CONFIG_BT_CAP_ACCEPTOR)
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- */
-#define BT_LE_EXT_ADV_CONN_CUSTOM \
-		BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_CONN, \
-				BT_GAP_MS_TO_ADV_INTERVAL(140), \
-				BT_GAP_MS_TO_ADV_INTERVAL(140), \
-				NULL)
-
 extern enum bst_result_t bst_result;
 
+#define CAP_INITIATOR_DEV_ID 0 /* CAP initiator shall be ID 0 for these tests */
+
 CREATE_FLAG(flag_broadcaster_found);
 CREATE_FLAG(flag_broadcast_code);
 CREATE_FLAG(flag_base_received);
@@ -70,6 +62,7 @@ static bt_addr_le_t broadcaster_addr;
 static struct bt_le_per_adv_sync *pa_sync;
 static uint32_t broadcaster_broadcast_id;
 static struct audio_test_stream broadcast_sink_streams[CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT];
+static bool expect_rx;
 
 static const struct bt_bap_qos_cfg_pref unicast_qos_pref =
 	BT_BAP_QOS_CFG_PREF(true, BT_GAP_LE_PHY_2M, 0u, 60u, 20000u, 40000u, 20000u, 40000u);
@@ -83,8 +76,8 @@ static uint32_t bis_index_bitfield;
 
 #define UNICAST_CHANNEL_COUNT_1 BIT(0)
 
-static struct bt_cap_stream unicast_streams[CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT +
-					    CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT];
+static struct audio_test_stream
+	unicast_streams[CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT + CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT];
 
 static bool subgroup_data_func_cb(struct bt_data *data, void *user_data)
 {
@@ -286,6 +279,7 @@ static void started_cb(struct bt_bap_stream *stream)
 
 	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
 	test_stream->rx_cnt = 0U;
+	test_stream->valid_rx_cnt = 0U;
 	test_stream->seq_num = 0U;
 	test_stream->tx_cnt = 0U;
 
@@ -330,8 +324,52 @@ static void unicast_stream_enabled_cb(struct bt_bap_stream *stream)
 	}
 }
 
+static void unicast_stream_started(struct bt_bap_stream *stream)
+{
+	struct audio_test_stream *test_stream = audio_test_stream_from_bap_stream(stream);
+
+	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
+	test_stream->rx_cnt = 0U;
+	test_stream->valid_rx_cnt = 0U;
+	test_stream->seq_num = 0U;
+	test_stream->tx_cnt = 0U;
+
+	printk("Started stream %p\n", stream);
+
+	if (bap_stream_tx_can_send(stream)) {
+		int err;
+
+		err = bap_stream_tx_register(stream);
+		if (err != 0) {
+			FAIL("Failed to register stream %p for TX: %d\n", stream, err);
+			return;
+		}
+	} else if (bap_stream_rx_can_recv(stream)) {
+		expect_rx = true;
+	}
+}
+
+static void unicast_stream_stopped(struct bt_bap_stream *stream, uint8_t reason)
+{
+	printk("Stopped stream %p with reason 0x%02X\n", stream, reason);
+
+	if (bap_stream_tx_can_send(stream)) {
+		int err;
+
+		err = bap_stream_tx_unregister(stream);
+		if (err != 0) {
+			FAIL("Failed to unregister stream %p for TX: %d\n", stream, err);
+			return;
+		}
+	}
+}
+
 static struct bt_bap_stream_ops unicast_stream_ops = {
 	.enabled = unicast_stream_enabled_cb,
+	.started = unicast_stream_started,
+	.stopped = unicast_stream_stopped,
+	.sent = bap_stream_tx_sent_cb,
+	.recv = bap_stream_rx_recv_cb,
 };
 
 static int pa_sync_req_cb(struct bt_conn *conn,
@@ -415,7 +453,8 @@ static struct bt_csip_set_member_svc_inst *csip_set_member;
 static struct bt_bap_stream *unicast_stream_alloc(void)
 {
 	for (size_t i = 0; i < ARRAY_SIZE(unicast_streams); i++) {
-		struct bt_bap_stream *stream = &unicast_streams[i].bap_stream;
+		struct bt_bap_stream *stream =
+			bap_stream_from_audio_test_stream(&unicast_streams[i]);
 
 		if (!stream->conn) {
 			return stream;
@@ -671,6 +710,7 @@ static void init(void)
 	}
 
 	printk("Bluetooth initialized\n");
+	bap_stream_tx_init();
 
 	err = bt_pacs_register(&pacs_param);
 	if (err) {
@@ -722,7 +762,9 @@ static void init(void)
 		}
 
 		for (size_t i = 0U; i < ARRAY_SIZE(unicast_streams); i++) {
-			bt_cap_stream_ops_register(&unicast_streams[i], &unicast_stream_ops);
+			bt_cap_stream_ops_register(
+				cap_stream_from_audio_test_stream(&unicast_streams[i]),
+				&unicast_stream_ops);
 		}
 	}
 
@@ -838,6 +880,13 @@ static void init(void)
 	}
 }
 
+static void wait_for_data(void)
+{
+	printk("Waiting for data\n");
+	WAIT_FOR_FLAG(flag_audio_received);
+	printk("Data received\n");
+}
+
 static void test_cap_acceptor_unicast(void)
 {
 	init();
@@ -846,10 +895,17 @@ static void test_cap_acceptor_unicast(void)
 
 	auto_start_sink_streams = true;
 
-	/* TODO: wait for audio stream to pass */
-
 	WAIT_FOR_FLAG(flag_connected);
 
+	/* Wait until initiator is done starting streams */
+	backchannel_sync_wait(CAP_INITIATOR_DEV_ID);
+
+	if (expect_rx) {
+		wait_for_data();
+	}
+	/* let initiator know we have received what we wanted */
+	backchannel_sync_send(CAP_INITIATOR_DEV_ID);
+
 	PASS("CAP acceptor unicast passed\n");
 }
 
@@ -861,8 +917,6 @@ static void test_cap_acceptor_unicast_timeout(void)
 
 	auto_start_sink_streams = false; /* Cause unicast_audio_start timeout */
 
-	/* TODO: wait for audio stream to pass */
-
 	WAIT_FOR_FLAG(flag_connected);
 
 	PASS("CAP acceptor unicast passed\n");
@@ -958,13 +1012,6 @@ static void create_and_sync_sink(struct bt_bap_stream *bap_streams[], size_t *st
 	}
 }
 
-static void sink_wait_for_data(void)
-{
-	printk("Waiting for data\n");
-	WAIT_FOR_FLAG(flag_audio_received);
-	backchannel_sync_send_all(); /* let other devices know we have received what we wanted */
-}
-
 static void wait_for_broadcast_code(void)
 {
 	printk("Waiting for broadcast code\n");
@@ -997,7 +1044,33 @@ static void test_cap_acceptor_broadcast(void)
 
 	create_and_sync_sink(bap_streams, &stream_count);
 
-	sink_wait_for_data();
+	wait_for_data();
+	/* let other devices know we have received what we wanted */
+	backchannel_sync_send_all();
+
+	wait_for_streams_stop(stream_count);
+
+	PASS("CAP acceptor broadcast passed\n");
+}
+
+static void test_cap_acceptor_broadcast_update(void)
+{
+	static struct bt_bap_stream *bap_streams[ARRAY_SIZE(broadcast_sink_streams)];
+	size_t stream_count;
+
+	init();
+
+	pa_sync_to_broadcaster();
+
+	create_and_sync_sink(bap_streams, &stream_count);
+
+	wait_for_data();
+
+	printk("Waiting for metadata update");
+	WAIT_FOR_FLAG(flag_base_metadata_updated);
+	backchannel_sync_send_all(); /* let other devices know we have received metadata */
+	/* let other devices know we have received what we wanted */
+	backchannel_sync_send_all();
 
 	wait_for_streams_stop(stream_count);
 
@@ -1022,7 +1095,9 @@ static void test_cap_acceptor_broadcast_reception(void)
 	create_and_sync_sink(bap_streams, &stream_count);
 
 	wait_for_broadcast_code();
-	sink_wait_for_data();
+	wait_for_data();
+	/* let other devices know we have received what we wanted */
+	backchannel_sync_send_all();
 
 	/* when flag_bis_sync_requested is unset the bis_sync for all subgroups were set to 0 */
 	WAIT_FOR_UNSET_FLAG(flag_bis_sync_requested);
@@ -1073,6 +1148,12 @@ static const struct bst_test_instance test_cap_acceptor[] = {
 		.test_tick_f = test_tick,
 		.test_main_f = test_cap_acceptor_broadcast,
 	},
+	{
+		.test_id = "cap_acceptor_broadcast_update",
+		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
+		.test_main_f = test_cap_acceptor_broadcast_update,
+	},
 	{
 		.test_id = "cap_acceptor_broadcast_reception",
 		.test_pre_init_f = test_init,
diff --git a/tests/bsim/bluetooth/audio/src/cap_commander_test.c b/tests/bsim/bluetooth/audio/src/cap_commander_test.c
index 2fb1ff2009780..b4c6d8c167cf2 100644
--- a/tests/bsim/bluetooth/audio/src/cap_commander_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_commander_test.c
@@ -586,9 +586,7 @@ static bool check_audio_support_and_connect_cb(struct bt_data *data, void *user_
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM(BT_GAP_INIT_CONN_INT_MIN, BT_GAP_INIT_CONN_INT_MIN,
-						 0, BT_GAP_MS_TO_CONN_TIMEOUT(4000)),
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&connected_conns[connected_conn_cnt]);
 	if (err != 0) {
 		FAIL("Could not connect to peer: %d", err);
diff --git a/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c
index e2cc727a44d50..c84fc83742ff2 100644
--- a/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2022-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -37,19 +37,6 @@
 #if defined(CONFIG_BT_CAP_INITIATOR) && defined(CONFIG_BT_BAP_BROADCAST_SOURCE)
 CREATE_FLAG(flag_source_started);
 
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- */
-#define BT_LE_EXT_ADV_CUSTOM                                                                       \
-	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(140),                     \
-			BT_GAP_MS_TO_ADV_INTERVAL(140), NULL)
-
-#define BT_LE_PER_ADV_CUSTOM                                                                       \
-	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(150),                                    \
-			    BT_GAP_MS_TO_PER_ADV_INTERVAL(150), BT_LE_PER_ADV_OPT_NONE)
-
 #define BROADCAST_STREMT_CNT    CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT
 #define CAP_AC_MAX_STREAM       2
 #define LOCATION                (BT_AUDIO_LOCATION_FRONT_LEFT | BT_AUDIO_LOCATION_FRONT_RIGHT)
@@ -215,25 +202,6 @@ static void init(void)
 	}
 }
 
-static void setup_extended_adv(struct bt_le_ext_adv **adv)
-{
-	int err;
-
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CUSTOM, NULL, adv);
-	if (err != 0) {
-		FAIL("Unable to create extended advertising set: %d\n", err);
-		return;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_CUSTOM);
-	if (err) {
-		FAIL("Failed to set periodic advertising parameters: %d\n", err);
-		return;
-	}
-}
-
 static void setup_extended_adv_data(struct bt_cap_broadcast_source *source,
 				    struct bt_le_ext_adv *adv)
 {
@@ -654,12 +622,10 @@ static void test_main_cap_initiator_broadcast(void)
 
 	init();
 
-	setup_extended_adv(&adv);
+	setup_broadcast_adv(&adv);
 
-	test_broadcast_audio_create_inval();
 	test_broadcast_audio_create(&broadcast_source);
 
-	test_broadcast_audio_start_inval(broadcast_source, adv);
 	test_broadcast_audio_start(broadcast_source, adv);
 
 	setup_extended_adv_data(broadcast_source, adv);
@@ -674,17 +640,57 @@ static void test_main_cap_initiator_broadcast(void)
 
 	WAIT_FOR_FLAG(flag_source_started);
 
-	/* Wait for other devices to have received what they wanted */
+	/* Wait for other devices to have received the data they wanted */
 	backchannel_sync_wait_any();
 
+	test_broadcast_audio_tx_sync();
+
+	test_broadcast_audio_stop(broadcast_source);
+
+	test_broadcast_audio_delete(broadcast_source);
+	broadcast_source = NULL;
+
+	stop_and_delete_extended_adv(adv);
+	adv = NULL;
+
+	PASS("CAP initiator broadcast passed\n");
+}
+
+static void test_main_cap_initiator_broadcast_inval(void)
+{
+	struct bt_cap_broadcast_source *broadcast_source;
+	struct bt_le_ext_adv *adv;
+
+	(void)memset(broadcast_source_streams, 0, sizeof(broadcast_source_streams));
+
+	init();
+
+	setup_broadcast_adv(&adv);
+
+	test_broadcast_audio_create_inval();
+	test_broadcast_audio_create(&broadcast_source);
+
+	test_broadcast_audio_start_inval(broadcast_source, adv);
+	test_broadcast_audio_start(broadcast_source, adv);
+
+	setup_extended_adv_data(broadcast_source, adv);
+
+	start_extended_adv(adv);
+
+	/* Wait for all to be started */
+	printk("Waiting for broadcast_streams to be started\n");
+	for (size_t i = 0U; i < stream_count; i++) {
+		k_sem_take(&sem_broadcast_stream_started, K_FOREVER);
+	}
+
+	WAIT_FOR_FLAG(flag_source_started);
+
 	test_broadcast_audio_update_inval(broadcast_source);
 	test_broadcast_audio_update(broadcast_source);
 
 	/* Keeping running for a little while */
 	k_sleep(K_SECONDS(5));
 
-	test_broadcast_audio_tx_sync();
-
 	test_broadcast_audio_stop_inval();
 	test_broadcast_audio_stop(broadcast_source);
 
@@ -695,6 +701,54 @@ static void test_main_cap_initiator_broadcast(void)
 	stop_and_delete_extended_adv(adv);
 	adv = NULL;
 
+	PASS("CAP initiator broadcast inval passed\n");
+}
+
+static void test_main_cap_initiator_broadcast_update(void)
+{
+	struct bt_cap_broadcast_source *broadcast_source;
+	struct bt_le_ext_adv *adv;
+
+	(void)memset(broadcast_source_streams, 0, sizeof(broadcast_source_streams));
+
+	init();
+
+	setup_broadcast_adv(&adv);
+
+	test_broadcast_audio_create(&broadcast_source);
+
+	test_broadcast_audio_start(broadcast_source, adv);
+
+	setup_extended_adv_data(broadcast_source, adv);
+
+	start_extended_adv(adv);
+
+	/* Wait for all to be started */
+	printk("Waiting for broadcast_streams to be started\n");
+	for (size_t i = 0U; i < stream_count; i++) {
+		k_sem_take(&sem_broadcast_stream_started, K_FOREVER);
+	}
+
+	WAIT_FOR_FLAG(flag_source_started);
+
+	/* Wait for other devices to have received the data they wanted */
+	backchannel_sync_wait_any();
+
+	test_broadcast_audio_update(broadcast_source);
+
+	/* Wait for other devices to have received the update */
+	backchannel_sync_wait_any();
+
+	test_broadcast_audio_tx_sync();
+
+	test_broadcast_audio_stop(broadcast_source);
+
+	test_broadcast_audio_delete(broadcast_source);
+	broadcast_source = NULL;
+
+	stop_and_delete_extended_adv(adv);
+	adv = NULL;
+
 	PASS("CAP initiator broadcast passed\n");
 }
 
@@ -744,7 +798,7 @@ static int test_cap_initiator_ac(const struct cap_initiator_ac_param *param)
 	create_param.qos = &qos;
 
 	init();
-	setup_extended_adv(&adv);
+	setup_broadcast_adv(&adv);
 
 	err = bt_cap_initiator_broadcast_audio_create(&create_param, &broadcast_source);
 	if (err != 0) {
@@ -861,6 +915,18 @@ static const struct bst_test_instance test_cap_initiator_broadcast[] = {
 		.test_tick_f = test_tick,
 		.test_main_f = test_main_cap_initiator_broadcast,
 	},
+	{
+		.test_id = "cap_initiator_broadcast_inval",
+		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
+		.test_main_f = test_main_cap_initiator_broadcast_inval,
+	},
+	{
+		.test_id = "cap_initiator_broadcast_update",
+		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
+		.test_main_f = test_main_cap_initiator_broadcast_update,
+	},
 	{
 		.test_id = "cap_initiator_ac_12",
 		.test_pre_init_f = test_init,
diff --git a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
index 1c6b44e80bab8..d3e415ac39674 100644
--- a/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
+++ b/tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Nordic Semiconductor ASA
+ * Copyright (c) 2022-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -34,6 +34,8 @@
 #include <zephyr/sys/util_macro.h>
 #include <zephyr/sys_clock.h>
 
+#include "bap_stream_tx.h"
+#include "bap_stream_rx.h"
 #include "bstests.h"
 #include "common.h"
 #include "bap_common.h"
@@ -67,8 +69,9 @@ extern enum bst_result_t bst_result;
 static struct bt_bap_lc3_preset unicast_preset_16_2_1 = BT_BAP_LC3_UNICAST_PRESET_16_2_1(
 	BT_AUDIO_LOCATION_FRONT_LEFT, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED);
 
-static struct bt_cap_stream unicast_client_sink_streams[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT];
-static struct bt_cap_stream
+static struct audio_test_stream
+	unicast_client_sink_streams[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT];
+static struct audio_test_stream
 	unicast_client_source_streams[CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT];
 static struct bt_bap_ep
 	*unicast_sink_eps[CONFIG_BT_MAX_CONN][CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT];
@@ -163,7 +166,25 @@ static void unicast_stream_enabled(struct bt_bap_stream *stream)
 
 static void unicast_stream_started(struct bt_bap_stream *stream)
 {
+	struct audio_test_stream *test_stream = audio_test_stream_from_bap_stream(stream);
+
+	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
+	test_stream->rx_cnt = 0U;
+	test_stream->valid_rx_cnt = 0U;
+	test_stream->seq_num = 0U;
+	test_stream->tx_cnt = 0U;
+
 	printk("Started stream %p\n", stream);
+
+	if (bap_stream_tx_can_send(stream)) {
+		int err;
+
+		err = bap_stream_tx_register(stream);
+		if (err != 0) {
+			FAIL("Failed to register stream %p for TX: %d\n", stream, err);
+			return;
+		}
+	}
 }
 
 static void unicast_stream_metadata_updated(struct bt_bap_stream *stream)
@@ -179,6 +200,16 @@ static void unicast_stream_disabled(struct bt_bap_stream *stream)
 static void unicast_stream_stopped(struct bt_bap_stream *stream, uint8_t reason)
 {
 	printk("Stopped stream %p with reason 0x%02X\n", stream, reason);
+
+	if (bap_stream_tx_can_send(stream)) {
+		int err;
+
+		err = bap_stream_tx_unregister(stream);
+		if (err != 0) {
+			FAIL("Failed to unregister stream %p for TX: %d\n", stream, err);
+			return;
+		}
+	}
 }
 
 static void unicast_stream_released(struct bt_bap_stream *stream)
@@ -207,6 +238,8 @@ static struct bt_bap_stream_ops unicast_stream_ops = {
 	.disabled = unicast_stream_disabled,
 	.stopped = unicast_stream_stopped,
 	.released = unicast_stream_released,
+	.sent = bap_stream_tx_sent_cb,
+	.recv = bap_stream_rx_recv_cb,
 };
 
 static void cap_discovery_complete_cb(struct bt_conn *conn, int err,
@@ -402,9 +435,7 @@ static bool check_audio_support_and_connect_cb(struct bt_data *data, void *user_
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM(BT_GAP_INIT_CONN_INT_MIN, BT_GAP_INIT_CONN_INT_MIN,
-						 0, BT_GAP_MS_TO_CONN_TIMEOUT(4000)),
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&connected_conns[connected_conn_cnt]);
 	if (err != 0) {
 		FAIL("Could not connect to peer: %d", err);
@@ -445,6 +476,9 @@ static void init(void)
 		return;
 	}
 
+	printk("Bluetooth initialized\n");
+	bap_stream_tx_init();
+
 	bt_gatt_cb_register(&gatt_callbacks);
 	err = bt_le_scan_cb_register(&scan_callbacks);
 	if (err != 0) {
@@ -465,15 +499,21 @@ static void init(void)
 	}
 
 	for (size_t i = 0; i < ARRAY_SIZE(unicast_client_sink_streams); i++) {
-		bt_cap_stream_ops_register(&unicast_client_sink_streams[i], &unicast_stream_ops);
+		bt_cap_stream_ops_register(
+			cap_stream_from_audio_test_stream(&unicast_client_sink_streams[i]),
+			&unicast_stream_ops);
 	}
 
 	for (size_t i = 0; i < ARRAY_SIZE(unicast_client_source_streams); i++) {
-		bt_cap_stream_ops_register(&unicast_client_source_streams[i], &unicast_stream_ops);
+		bt_cap_stream_ops_register(
+			cap_stream_from_audio_test_stream(&unicast_client_source_streams[i]),
+			&unicast_stream_ops);
 	}
 
 	for (size_t i = 0; i < ARRAY_SIZE(unicast_streams); i++) {
-		bt_cap_stream_ops_register(&unicast_streams[i].stream, &unicast_stream_ops);
+		bt_cap_stream_ops_register(
+			cap_stream_from_audio_test_stream(&unicast_streams[i].stream),
+			&unicast_stream_ops);
 	}
 }
 
@@ -585,9 +625,11 @@ static void unicast_group_create(struct bt_bap_unicast_group **out_unicast_group
 	int err;
 
 	group_sink_stream_params.qos = &unicast_preset_16_2_1.qos;
-	group_sink_stream_params.stream = &unicast_client_sink_streams[0].bap_stream;
+	group_sink_stream_params.stream =
+		bap_stream_from_audio_test_stream(&unicast_client_sink_streams[0]);
 	group_source_stream_params.qos = &unicast_preset_16_2_1.qos;
-	group_source_stream_params.stream = &unicast_client_source_streams[0].bap_stream;
+	group_source_stream_params.stream =
+		bap_stream_from_audio_test_stream(&unicast_client_source_streams[0]);
 	pair_params.tx_param = &group_sink_stream_params;
 	pair_params.rx_param = &group_source_stream_params;
 
@@ -612,12 +654,13 @@ static void unicast_audio_start(struct bt_bap_unicast_group *unicast_group, bool
 	param.count = ARRAY_SIZE(stream_param);
 	param.stream_params = stream_param;
 	stream_param[0].member.member = default_conn;
-	stream_param[0].stream = &unicast_client_sink_streams[0];
+	stream_param[0].stream = cap_stream_from_audio_test_stream(&unicast_client_sink_streams[0]);
 	stream_param[0].ep = unicast_sink_eps[bt_conn_index(default_conn)][0];
 	stream_param[0].codec_cfg = &unicast_preset_16_2_1.codec_cfg;
 
 	stream_param[1].member.member = default_conn;
-	stream_param[1].stream = &unicast_client_source_streams[0];
+	stream_param[1].stream =
+		cap_stream_from_audio_test_stream(&unicast_client_source_streams[0]);
 	stream_param[1].ep = unicast_source_eps[bt_conn_index(default_conn)][0];
 	stream_param[1].codec_cfg = &unicast_preset_16_2_1.codec_cfg;
 
@@ -631,6 +674,8 @@ static void unicast_audio_start(struct bt_bap_unicast_group *unicast_group, bool
 
 	if (wait) {
 		WAIT_FOR_FLAG(flag_started);
+		/* let other devices know we have started what we wanted */
+		backchannel_sync_send_all();
 	}
 }
 
@@ -643,7 +688,8 @@ static void unicast_audio_update_inval(void)
 	struct bt_cap_unicast_audio_update_param param = {0};
 	int err;
 
-	stream_params[0].stream = &unicast_client_sink_streams[0];
+	stream_params[0].stream =
+		cap_stream_from_audio_test_stream(&unicast_client_sink_streams[0]);
 	stream_params[0].meta = unicast_preset_16_2_1.codec_cfg.meta;
 	stream_params[0].meta_len = unicast_preset_16_2_1.codec_cfg.meta_len;
 	param.count = ARRAY_SIZE(stream_params);
@@ -690,11 +736,13 @@ static void unicast_audio_update(void)
 	};
 	int err;
 
-	stream_params[0].stream = &unicast_client_sink_streams[0];
+	stream_params[0].stream =
+		cap_stream_from_audio_test_stream(&unicast_client_sink_streams[0]);
 	stream_params[0].meta = new_meta;
 	stream_params[0].meta_len = ARRAY_SIZE(new_meta);
 
-	stream_params[1].stream = &unicast_client_source_streams[0];
+	stream_params[1].stream =
+		cap_stream_from_audio_test_stream(&unicast_client_source_streams[0]);
 	stream_params[1].meta = new_meta;
 	stream_params[1].meta_len = ARRAY_SIZE(new_meta);
 
@@ -711,7 +759,6 @@ static void unicast_audio_update(void)
 	}
 
 	WAIT_FOR_FLAG(flag_updated);
-	printk("READ LONG META\n");
 }
 
 static void unicast_audio_stop(struct bt_bap_unicast_group *unicast_group)
@@ -826,15 +873,30 @@ static void test_main_cap_initiator_unicast(void)
 
 	for (size_t i = 0U; i < iterations; i++) {
 		printk("\nRunning iteration i=%zu\n\n", i);
+
 		unicast_group_create(&unicast_group);
 
 		for (size_t j = 0U; j < iterations; j++) {
 			printk("\nRunning iteration j=%zu\n\n", i);
 
+			UNSET_FLAG(flag_audio_received);
+
 			unicast_audio_start(unicast_group, true);
 
 			unicast_audio_update();
 
+			printk("Waiting for data\n");
+			WAIT_FOR_FLAG(flag_audio_received);
+
+			/* Due to how the backchannel sync is implemented for LE Audio we cannot
+			 * easily tell the remote (CAP acceptor) how many times to wait for data,
+			 * and thus we only await one sync message from it from the first iteration
+			 */
+			if (i == 0 && j == 0) {
+				/* Wait until acceptors have received expected data */
+				backchannel_sync_wait_all();
+			}
+
 			unicast_audio_stop(unicast_group);
 		}
 
@@ -868,6 +930,13 @@ static void test_main_cap_initiator_unicast_inval(void)
 	unicast_audio_update_inval();
 	unicast_audio_update();
 
+	printk("Waiting for data\n");
+	WAIT_FOR_FLAG(flag_audio_received);
+	printk("Data received\n");
+
+	/* Wait until acceptors have received expected data */
+	backchannel_sync_wait_all();
+
 	unicast_audio_stop(unicast_group);
 
 	unicast_group_delete_inval();
@@ -971,6 +1040,13 @@ static void test_cap_initiator_unicast_ase_error(void)
 	/* Without invalid metadata type, start should pass */
 	unicast_audio_start(unicast_group, true);
 
+	printk("Waiting for data\n");
+	WAIT_FOR_FLAG(flag_audio_received);
+	printk("Data received\n");
+
+	/* Wait until acceptors have received expected data */
+	backchannel_sync_wait_all();
+
 	unicast_audio_stop(unicast_group);
 
 	unicast_group_delete(unicast_group);
@@ -1022,11 +1098,13 @@ static int cap_initiator_ac_create_unicast_group(const struct cap_initiator_ac_p
 	 */
 	for (size_t i = 0U; i < snk_cnt; i++) {
 		snk_group_stream_params[i].qos = snk_qos[i];
-		snk_group_stream_params[i].stream = &snk_uni_streams[i]->stream.bap_stream;
+		snk_group_stream_params[i].stream =
+			bap_stream_from_audio_test_stream(&snk_uni_streams[i]->stream);
 	}
 	for (size_t i = 0U; i < src_cnt; i++) {
 		src_group_stream_params[i].qos = src_qos[i];
-		src_group_stream_params[i].stream = &src_uni_streams[i]->stream.bap_stream;
+		src_group_stream_params[i].stream =
+			bap_stream_from_audio_test_stream(&src_uni_streams[i]->stream);
 	}
 
 	for (size_t i = 0U; i < param->conn_cnt; i++) {
@@ -1121,12 +1199,12 @@ static int cap_initiator_ac_cap_unicast_start(const struct cap_initiator_ac_para
 	 * preset so that we can modify them (e.g. update the metadata)
 	 */
 	for (size_t i = 0U; i < snk_cnt; i++) {
-		snk_cap_streams[i] = &snk_uni_streams[i]->stream;
+		snk_cap_streams[i] = cap_stream_from_audio_test_stream(&snk_uni_streams[i]->stream);
 		snk_codec_cfgs[i] = &snk_uni_streams[i]->codec_cfg;
 	}
 
 	for (size_t i = 0U; i < src_cnt; i++) {
-		src_cap_streams[i] = &src_uni_streams[i]->stream;
+		src_cap_streams[i] = cap_stream_from_audio_test_stream(&src_uni_streams[i]->stream);
 		src_codec_cfgs[i] = &src_uni_streams[i]->codec_cfg;
 	}
 
@@ -1291,6 +1369,7 @@ static int cap_initiator_ac_unicast(const struct cap_initiator_ac_param *param,
 	}
 
 	WAIT_FOR_FLAG(flag_started);
+	backchannel_sync_send_all(); /* let other devices know we have started what we wanted */
 
 	return 0;
 }
@@ -1298,6 +1377,8 @@ static int cap_initiator_ac_unicast(const struct cap_initiator_ac_param *param,
 static void test_cap_initiator_ac(const struct cap_initiator_ac_param *param)
 {
 	struct bt_bap_unicast_group *unicast_group;
+	bool expect_tx = false;
+	bool expect_rx = false;
 
 	printk("Running test for %s with Sink Preset %s and Source Preset %s\n", param->name,
 	       param->snk_named_preset != NULL ? param->snk_named_preset->name : "None",
@@ -1337,15 +1418,27 @@ static void test_cap_initiator_ac(const struct cap_initiator_ac_param *param)
 
 		if (param->snk_cnt[i] > 0U) {
 			discover_sink(connected_conns[i]);
+			expect_tx = true;
 		}
 
 		if (param->src_cnt[i] > 0U) {
 			discover_source(connected_conns[i]);
+			expect_rx = true;
 		}
 	}
 
 	cap_initiator_ac_unicast(param, &unicast_group);
 
+	if (expect_tx) {
+		/* Wait until acceptors have received expected data */
+		backchannel_sync_wait_all();
+	}
+
+	if (expect_rx) {
+		printk("Waiting for data\n");
+		WAIT_FOR_FLAG(flag_audio_received);
+	}
+
 	unicast_audio_stop(unicast_group);
 
 	unicast_group_delete(unicast_group);
diff --git a/tests/bsim/bluetooth/audio/src/common.c b/tests/bsim/bluetooth/audio/src/common.c
index 085a57700cc76..2c23a0836241a 100644
--- a/tests/bsim/bluetooth/audio/src/common.c
+++ b/tests/bsim/bluetooth/audio/src/common.c
@@ -107,7 +107,7 @@ static void device_found(const struct bt_le_scan_recv_info *info, struct net_buf
 		return;
 	}
 
-	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err) {
 		FAIL("Could not connect to peer: %d", err);
@@ -186,12 +186,13 @@ BT_CONN_CB_DEFINE(conn_callbacks) = {
 	.security_changed = security_changed_cb,
 };
 
+
 void setup_connectable_adv(struct bt_le_ext_adv **ext_adv)
 {
 	int err;
 
 	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, ext_adv);
+	err = bt_le_ext_adv_create(BT_BAP_ADV_PARAM_CONN_QUICK, NULL, ext_adv);
 	if (err != 0) {
 		FAIL("Unable to create extended advertising set: %d\n", err);
 		return;
@@ -218,6 +219,34 @@ void setup_connectable_adv(struct bt_le_ext_adv **ext_adv)
 	printk("Advertising started\n");
 }
 
+void setup_broadcast_adv(struct bt_le_ext_adv **adv)
+{
+	struct bt_le_adv_param ext_adv_param = *BT_BAP_ADV_PARAM_BROADCAST_SLOW;
+	int err;
+
+	/* Zephyr Controller works best while Extended Advertising interval is a multiple
+	 * of the ISO Interval minus 10 ms (max. advertising random delay). This is
+	 * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
+	 * Broadcast ISO radio events.
+	 */
+	ext_adv_param.interval_min -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+	ext_adv_param.interval_max -= BT_GAP_MS_TO_ADV_INTERVAL(10U);
+
+	/* Create a non-connectable advertising set */
+	err = bt_le_ext_adv_create(&ext_adv_param, NULL, adv);
+	if (err != 0) {
+		FAIL("Unable to create extended advertising set: %d\n", err);
+		return;
+	}
+
+	/* Set periodic advertising parameters */
+	err = bt_le_per_adv_set_param(*adv, BT_BAP_PER_ADV_PARAM_BROADCAST_SLOW);
+	if (err) {
+		FAIL("Failed to set periodic advertising parameters: %d\n", err);
+		return;
+	}
+}
+
 void test_tick(bs_time_t HW_device_time)
 {
 	if (bst_result != Passed) {
@@ -328,10 +357,8 @@ static void setup_backchannels(void)
 	uint *channels;
 
 	for (int32_t i = 0; i < dev_cnt; i++) {
-		if (i != self) { /* skip ourselves*/
-			backchannel_nums[chan_cnt] = get_chan_num((uint16_t)i);
-			device_numbers[chan_cnt++] = i;
-		}
+		backchannel_nums[chan_cnt] = get_chan_num((uint16_t)i);
+		device_numbers[chan_cnt++] = i;
 	}
 
 	channels = bs_open_back_channel(self, device_numbers, backchannel_nums, chan_cnt);
diff --git a/tests/bsim/bluetooth/audio/src/common.h b/tests/bsim/bluetooth/audio/src/common.h
index dff8597ae4886..6ba2106a6c9a8 100644
--- a/tests/bsim/bluetooth/audio/src/common.h
+++ b/tests/bsim/bluetooth/audio/src/common.h
@@ -139,6 +139,7 @@ extern uint8_t csip_rsi[BT_CSIP_RSI_SIZE];
 
 void disconnected(struct bt_conn *conn, uint8_t reason);
 void setup_connectable_adv(struct bt_le_ext_adv **ext_adv);
+void setup_broadcast_adv(struct bt_le_ext_adv **adv);
 void test_tick(bs_time_t HW_device_time);
 void test_init(void);
 uint16_t get_dev_cnt(void);
@@ -160,6 +161,7 @@ struct audio_test_stream {
 
 	struct bt_iso_recv_info last_info;
 	size_t rx_cnt;
+	size_t valid_rx_cnt;
 };
 
 static inline struct bt_cap_stream *cap_stream_from_bap_stream(struct bt_bap_stream *bap_stream)
diff --git a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
index fc07b2e681e4c..294002ec30746 100644
--- a/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_set_coordinator_test.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/csip.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -39,6 +40,7 @@ static volatile bool ordered_access_locked;
 static volatile bool ordered_access_unlocked;
 static const struct bt_csip_set_coordinator_csis_inst *primary_inst;
 CREATE_FLAG(flag_sirk_changed);
+CREATE_FLAG(flag_size_changed);
 
 static uint8_t connected_member_count;
 static uint8_t members_found;
@@ -138,6 +140,14 @@ static void csip_sirk_changed_cb(struct bt_csip_set_coordinator_csis_inst *inst)
 	SET_FLAG(flag_sirk_changed);
 }
 
+static void csip_size_changed_cb(struct bt_conn *conn,
+				 const struct bt_csip_set_coordinator_csis_inst *inst)
+{
+	printk("Inst %p size changed: %u\n", inst, inst->info.set_size);
+
+	SET_FLAG(flag_size_changed);
+}
+
 static void csip_set_coordinator_ordered_access_cb(
 	const struct bt_csip_set_coordinator_set_info *set_info, int err,
 	bool locked,  struct bt_csip_set_coordinator_set_member *member)
@@ -159,6 +169,7 @@ static struct bt_csip_set_coordinator_cb cbs = {
 	.discover = csip_discover_cb,
 	.lock_changed = csip_lock_changed_cb,
 	.sirk_changed = csip_sirk_changed_cb,
+	.size_changed = csip_size_changed_cb,
 	.ordered_access = csip_set_coordinator_ordered_access_cb,
 };
 
@@ -328,8 +339,8 @@ static void connect_set(void)
 	}
 
 	bt_addr_le_to_str(&addr_found[0], addr, sizeof(addr));
-	err = bt_conn_le_create(&addr_found[0], BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT, &conns[0]);
+	err = bt_conn_le_create(&addr_found[0], BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
+				&conns[0]);
 	if (err != 0) {
 		FAIL("Failed to connect to %s: %d\n", err);
 
@@ -513,6 +524,24 @@ static void test_new_sirk(void)
 	PASS("All members disconnected\n");
 }
 
+static void test_new_size_and_rank(void)
+{
+	init();
+	connect_set();
+
+	backchannel_sync_send_all();
+	backchannel_sync_wait_all();
+
+	/* We won't get a new rank in a notification. For this test we only verify that we get a new
+	 * size
+	 */
+	WAIT_FOR_FLAG(flag_size_changed);
+
+	disconnect_set();
+
+	PASS("All members disconnected\n");
+}
+
 static void test_args(int argc, char *argv[])
 {
 	for (int argn = 0; argn < argc; argn++) {
@@ -545,6 +574,13 @@ static const struct bst_test_instance test_connect[] = {
 		.test_main_f = test_new_sirk,
 		.test_args_f = test_args,
 	},
+	{
+		.test_id = "csip_set_coordinator_new_size_and_rank",
+		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
+		.test_main_f = test_new_size_and_rank,
+		.test_args_f = test_args,
+	},
 	BSTEST_END_MARKER,
 };
 
diff --git a/tests/bsim/bluetooth/audio/src/csip_set_member_test.c b/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
index e09f96060f4e7..faa7dbdaff52b 100644
--- a/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
+++ b/tests/bsim/bluetooth/audio/src/csip_set_member_test.c
@@ -24,12 +24,10 @@ extern enum bst_result_t bst_result;
 static volatile bool g_locked;
 static uint8_t sirk_read_req_rsp = BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT;
 struct bt_csip_set_member_register_param param = {
-	.set_size = 3,
-	.rank = 1,
 	.lockable = true,
 	/* Using the CSIS test sample SIRK */
-	.sirk = { 0xcd, 0xcc, 0x72, 0xdd, 0x86, 0x8c, 0xcd, 0xce,
-		  0x22, 0xfd, 0xa1, 0x21, 0x09, 0x7d, 0x7d, 0x45 },
+	.sirk = {0xcd, 0xcc, 0x72, 0xdd, 0x86, 0x8c, 0xcd, 0xce, 0x22, 0xfd, 0xa1, 0x21, 0x09, 0x7d,
+		 0x7d, 0x45},
 };
 
 static void csip_lock_changed_cb(struct bt_conn *conn,
@@ -108,6 +106,56 @@ static void test_sirk(void)
 	printk("New SIRK correctly set and retrieved\n");
 }
 
+static void update_set_size_and_rank(void)
+{
+	struct bt_csip_set_member_set_info info;
+	uint8_t old_set_size;
+	uint8_t old_rank;
+	uint8_t new_set_size;
+	uint8_t new_rank;
+	int err;
+
+	err = bt_csip_set_member_get_info(svc_inst, &info);
+	if (err != 0) {
+		FAIL("Failed to get SIRK: %d\n", err);
+		return;
+	}
+
+	/* Simulate a new device being added as rank 1 to the set, making the set size increase by 1
+	 * and this device's rank increase by 1
+	 */
+	old_set_size = info.set_size;
+	old_rank = info.rank;
+	new_set_size = old_set_size + 1U;
+	new_rank = old_rank + 1U;
+
+	printk("Setting new SIRK\n");
+	err = bt_csip_set_member_set_size_and_rank(svc_inst, new_set_size, new_rank);
+	if (err != 0) {
+		FAIL("Failed to set new size and rank: %d\n", err);
+		return;
+	}
+
+	printk("Getting new SIRK\n");
+	err = bt_csip_set_member_get_info(svc_inst, &info);
+	if (err != 0) {
+		FAIL("Failed to get SIRK: %d\n", err);
+		return;
+	}
+
+	if (info.set_size != new_set_size) {
+		FAIL("Unexpected set size %u != %u\n", info.set_size, new_set_size);
+		return;
+	}
+
+	if (info.rank != new_rank) {
+		FAIL("Unexpected rank %u != %u\n", info.rank, new_rank);
+		return;
+	}
+
+	printk("New size correctly set and retrieved\n");
+}
+
 static void test_main(void)
 {
 	int err;
@@ -210,6 +258,36 @@ static void test_new_sirk(void)
 	PASS("CSIP Set member passed: Client successfully disconnected\n");
 }
 
+static void test_new_set_size_and_rank(void)
+{
+	int err;
+
+	err = bt_enable(bt_ready);
+
+	if (err != 0) {
+		FAIL("Bluetooth init failed (err %d)\n", err);
+		return;
+	}
+
+	WAIT_FOR_FLAG(flag_connected);
+
+	backchannel_sync_send_all();
+	backchannel_sync_wait_all();
+
+	update_set_size_and_rank();
+
+	WAIT_FOR_UNSET_FLAG(flag_connected);
+
+	err = bt_csip_set_member_unregister(svc_inst);
+	if (err != 0) {
+		FAIL("Could not unregister CSIP (err %d)\n", err);
+		return;
+	}
+	svc_inst = NULL;
+
+	PASS("CSIP Set member passed: Client successfully disconnected\n");
+}
+
 static void test_args(int argc, char *argv[])
 {
 	for (size_t argn = 0; argn < argc; argn++) {
@@ -267,6 +345,13 @@ static const struct bst_test_instance test_connect[] = {
 		.test_main_f = test_new_sirk,
 		.test_args_f = test_args,
 	},
+	{
+		.test_id = "csip_set_member_new_size_and_rank",
+		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
+		.test_main_f = test_new_set_size_and_rank,
+		.test_args_f = test_args,
+	},
 	BSTEST_END_MARKER,
 };
 
diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
index 744930b76d3c0..c1d608058712b 100644
--- a/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
+++ b/tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024 Nordic Semiconductor ASA
+ * Copyright (c) 2023-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -36,23 +36,12 @@
 #include <zephyr/toolchain.h>
 
 #include "bap_stream_tx.h"
+#include "bap_stream_rx.h"
 #include "bstests.h"
 #include "common.h"
 #include "bap_common.h"
 
 #if defined(CONFIG_BT_GMAP)
-/* Zephyr Controller works best while Extended Advertising interval to be a multiple
- * of the ISO Interval minus 10 ms (max. advertising random delay). This is
- * required to place the AUX_ADV_IND PDUs in a non-overlapping interval with the
- * Broadcast ISO radio events.
- */
-#define BT_LE_EXT_ADV_CUSTOM                                                                       \
-	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_MS_TO_ADV_INTERVAL(80),                      \
-			BT_GAP_MS_TO_ADV_INTERVAL(80), NULL)
-
-#define BT_LE_PER_ADV_CUSTOM                                                                       \
-	BT_LE_PER_ADV_PARAM(BT_GAP_MS_TO_PER_ADV_INTERVAL(90), BT_GAP_MS_TO_PER_ADV_INTERVAL(90),  \
-			    BT_LE_PER_ADV_OPT_NONE)
 
 #define UNICAST_SINK_SUPPORTED (CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0)
 #define UNICAST_SRC_SUPPORTED  (CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT > 0)
@@ -191,6 +180,14 @@ static void stream_enabled_cb(struct bt_bap_stream *stream)
 
 static void stream_started_cb(struct bt_bap_stream *stream)
 {
+	struct audio_test_stream *test_stream = audio_test_stream_from_bap_stream(stream);
+
+	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
+	test_stream->rx_cnt = 0U;
+	test_stream->valid_rx_cnt = 0U;
+	test_stream->seq_num = 0U;
+	test_stream->tx_cnt = 0U;
+
 	printk("Started stream %p\n", stream);
 
 	if (bap_stream_tx_can_send(stream)) {
@@ -248,6 +245,7 @@ static struct bt_bap_stream_ops stream_ops = {
 	.stopped = stream_stopped_cb,
 	.released = stream_released_cb,
 	.sent = bap_stream_tx_sent_cb,
+	.recv = bap_stream_rx_recv_cb,
 };
 
 static void cap_discovery_complete_cb(struct bt_conn *conn, int err,
@@ -509,7 +507,8 @@ static void init(void)
 	}
 
 	for (size_t i = 0; i < ARRAY_SIZE(unicast_streams); i++) {
-		bt_cap_stream_ops_register(&unicast_streams[i].stream, &stream_ops);
+		bt_cap_stream_ops_register(
+			cap_stream_from_audio_test_stream(&unicast_streams[i].stream), &stream_ops);
 	}
 
 	for (size_t i = 0; i < ARRAY_SIZE(broadcast_streams); i++) {
@@ -633,11 +632,13 @@ static int gmap_unicast_ac_create_unicast_group(const struct gmap_unicast_ac_par
 	 */
 	for (size_t i = 0U; i < snk_cnt; i++) {
 		snk_group_stream_params[i].qos = &snk_uni_streams[i]->qos;
-		snk_group_stream_params[i].stream = &snk_uni_streams[i]->stream.bap_stream;
+		snk_group_stream_params[i].stream =
+			bap_stream_from_audio_test_stream(&snk_uni_streams[i]->stream);
 	}
 	for (size_t i = 0U; i < src_cnt; i++) {
 		src_group_stream_params[i].qos = &src_uni_streams[i]->qos;
-		src_group_stream_params[i].stream = &src_uni_streams[i]->stream.bap_stream;
+		src_group_stream_params[i].stream =
+			bap_stream_from_audio_test_stream(&src_uni_streams[i]->stream);
 	}
 
 	for (size_t i = 0U; i < param->conn_cnt; i++) {
@@ -731,12 +732,12 @@ static int gmap_ac_cap_unicast_start(const struct gmap_unicast_ac_param *param,
 	 * preset so that we can modify them (e.g. update the metadata)
 	 */
 	for (size_t i = 0U; i < snk_cnt; i++) {
-		snk_cap_streams[i] = &snk_uni_streams[i]->stream;
+		snk_cap_streams[i] = cap_stream_from_audio_test_stream(&snk_uni_streams[i]->stream);
 		snk_codec_cfgs[i] = &snk_uni_streams[i]->codec_cfg;
 	}
 
 	for (size_t i = 0U; i < src_cnt; i++) {
-		src_cap_streams[i] = &src_uni_streams[i]->stream;
+		src_cap_streams[i] = cap_stream_from_audio_test_stream(&src_uni_streams[i]->stream);
 		src_codec_cfgs[i] = &src_uni_streams[i]->codec_cfg;
 	}
 
@@ -893,6 +894,9 @@ static int gmap_ac_unicast(const struct gmap_unicast_ac_param *param,
 
 	WAIT_FOR_FLAG(flag_started);
 
+	/* let other devices know we have started what we wanted */
+	backchannel_sync_send_all();
+
 	return 0;
 }
 
@@ -934,6 +938,8 @@ static void unicast_group_delete(struct bt_bap_unicast_group *unicast_group)
 static void test_gmap_ugg_unicast_ac(const struct gmap_unicast_ac_param *param)
 {
 	struct bt_bap_unicast_group *unicast_group;
+	bool expect_tx = false;
+	bool expect_rx = false;
 
 	printk("Running test for %s with Sink Preset %s and Source Preset %s\n", param->name,
 	       param->snk_named_preset != NULL ? param->snk_named_preset->name : "None",
@@ -968,10 +974,12 @@ static void test_gmap_ugg_unicast_ac(const struct gmap_unicast_ac_param *param)
 
 		if (param->snk_cnt[i] > 0U) {
 			discover_sink(connected_conns[i]);
+			expect_tx = true;
 		}
 
 		if (param->src_cnt[i] > 0U) {
 			discover_source(connected_conns[i]);
+			expect_rx = true;
 		}
 
 		discover_gmas(connected_conns[i]);
@@ -980,6 +988,16 @@ static void test_gmap_ugg_unicast_ac(const struct gmap_unicast_ac_param *param)
 
 	gmap_ac_unicast(param, &unicast_group);
 
+	if (expect_tx) {
+		/* Wait until acceptors have received expected data */
+		backchannel_sync_wait_all();
+	}
+
+	if (expect_rx) {
+		printk("Waiting for data\n");
+		WAIT_FOR_FLAG(flag_audio_received);
+	}
+
 	unicast_audio_stop(unicast_group);
 
 	unicast_group_delete(unicast_group);
@@ -1002,25 +1020,6 @@ static void test_gmap_ugg_unicast_ac(const struct gmap_unicast_ac_param *param)
 	     param->src_named_preset != NULL ? param->src_named_preset->name : "None");
 }
 
-static void setup_extended_adv(struct bt_le_ext_adv **adv)
-{
-	int err;
-
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CUSTOM, NULL, adv);
-	if (err != 0) {
-		FAIL("Unable to create extended advertising set: %d\n", err);
-		return;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_CUSTOM);
-	if (err) {
-		FAIL("Failed to set periodic advertising parameters: %d\n", err);
-		return;
-	}
-}
-
 static void setup_extended_adv_data(struct bt_cap_broadcast_source *source,
 				    struct bt_le_ext_adv *adv)
 {
@@ -1207,7 +1206,7 @@ static int test_gmap_ugg_broadcast_ac(const struct gmap_broadcast_ac_param *para
 	create_param.qos = &qos;
 
 	init();
-	setup_extended_adv(&adv);
+	setup_broadcast_adv(&adv);
 
 	err = bt_cap_initiator_broadcast_audio_create(&create_param, &broadcast_source);
 	if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c b/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c
index 214dcb90bbecf..5507639cf3f40 100644
--- a/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c
+++ b/tests/bsim/bluetooth/audio/src/gmap_ugt_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Nordic Semiconductor ASA
+ * Copyright (c) 2023-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -26,6 +26,8 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/util_macro.h>
 
+#include "bap_stream_rx.h"
+#include "bap_stream_tx.h"
 #include "bstests.h"
 #include "common.h"
 #include "bap_common.h"
@@ -35,6 +37,7 @@ extern enum bst_result_t bst_result;
 
 #define CONTEXT  (BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED | BT_AUDIO_CONTEXT_TYPE_GAME)
 #define LOCATION (BT_AUDIO_LOCATION_FRONT_LEFT | BT_AUDIO_LOCATION_FRONT_RIGHT)
+#define GMAP_UGG_DEV_ID 0 /* GMAP UGG shall be ID 0 for these tests */
 
 static uint8_t csis_rank = 1;
 
@@ -47,8 +50,9 @@ static const struct bt_bap_qos_cfg_pref unicast_qos_pref =
 
 #define UNICAST_CHANNEL_COUNT_1 BIT(0)
 
-static struct bt_cap_stream
+static struct audio_test_stream
 	unicast_streams[CONFIG_BT_ASCS_MAX_ASE_SNK_COUNT + CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT];
+static bool expect_rx;
 
 CREATE_FLAG(flag_unicast_stream_started);
 CREATE_FLAG(flag_gmap_discovered);
@@ -79,13 +83,52 @@ static void unicast_stream_enabled_cb(struct bt_bap_stream *stream)
 
 static void unicast_stream_started_cb(struct bt_bap_stream *stream)
 {
-	printk("Started: stream %p\n", stream);
+	struct audio_test_stream *test_stream = audio_test_stream_from_bap_stream(stream);
+
+	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
+	test_stream->rx_cnt = 0U;
+	test_stream->valid_rx_cnt = 0U;
+	test_stream->seq_num = 0U;
+	test_stream->tx_cnt = 0U;
+
+	printk("Started stream %p\n", stream);
+
+	if (bap_stream_tx_can_send(stream)) {
+		int err;
+
+		err = bap_stream_tx_register(stream);
+		if (err != 0) {
+			FAIL("Failed to register stream %p for TX: %d\n", stream, err);
+			return;
+		}
+	} else if (bap_stream_rx_can_recv(stream)) {
+		expect_rx = true;
+	}
+
 	SET_FLAG(flag_unicast_stream_started);
 }
 
+static void unicast_stream_stopped(struct bt_bap_stream *stream, uint8_t reason)
+{
+	printk("Stopped stream %p with reason 0x%02X\n", stream, reason);
+
+	if (bap_stream_tx_can_send(stream)) {
+		int err;
+
+		err = bap_stream_tx_unregister(stream);
+		if (err != 0) {
+			FAIL("Failed to unregister stream %p for TX: %d\n", stream, err);
+			return;
+		}
+	}
+}
+
 static struct bt_bap_stream_ops unicast_stream_ops = {
 	.enabled = unicast_stream_enabled_cb,
 	.started = unicast_stream_started_cb,
+	.stopped = unicast_stream_stopped,
+	.sent = bap_stream_tx_sent_cb,
+	.recv = bap_stream_rx_recv_cb,
 };
 
 static struct bt_csip_set_member_svc_inst *csip_set_member;
@@ -93,7 +136,8 @@ static struct bt_csip_set_member_svc_inst *csip_set_member;
 static struct bt_bap_stream *unicast_stream_alloc(void)
 {
 	for (size_t i = 0; i < ARRAY_SIZE(unicast_streams); i++) {
-		struct bt_bap_stream *stream = &unicast_streams[i].bap_stream;
+		struct bt_bap_stream *stream =
+			bap_stream_from_audio_test_stream(&unicast_streams[i]);
 
 		if (!stream->conn) {
 			return stream;
@@ -349,6 +393,17 @@ static void discover_gmas(struct bt_conn *conn)
 	WAIT_FOR_FLAG(flag_gmap_discovered);
 }
 
+static void wait_for_data(void)
+{
+	if (expect_rx) {
+		printk("Waiting for data\n");
+		WAIT_FOR_FLAG(flag_audio_received);
+		printk("Data received\n");
+	}
+	/* let initiator know we have received what we wanted */
+	backchannel_sync_send(GMAP_UGG_DEV_ID);
+}
+
 static void test_main(void)
 {
 	/* TODO: Register all GMAP codec capabilities */
@@ -386,6 +441,7 @@ static void test_main(void)
 	}
 
 	printk("Bluetooth initialized\n");
+	bap_stream_tx_init();
 
 	err = bt_pacs_register(&pacs_param);
 	if (err) {
@@ -439,7 +495,8 @@ static void test_main(void)
 	}
 
 	for (size_t i = 0U; i < ARRAY_SIZE(unicast_streams); i++) {
-		bt_cap_stream_ops_register(&unicast_streams[i], &unicast_stream_ops);
+		bt_cap_stream_ops_register(cap_stream_from_audio_test_stream(&unicast_streams[i]),
+					   &unicast_stream_ops);
 	}
 
 	set_supported_contexts();
@@ -467,6 +524,11 @@ static void test_main(void)
 	discover_gmas(default_conn);
 	discover_gmas(default_conn); /* test that we can discover twice */
 
+	/* Wait until the UGG is done starting streams */
+	backchannel_sync_wait(GMAP_UGG_DEV_ID);
+
+	wait_for_data();
+
 	WAIT_FOR_FLAG(flag_disconnected);
 
 	PASS("GMAP UGT passed\n");
diff --git a/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_sink_test.c b/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_sink_test.c
index 72d0a82587423..c96e3fa8604b2 100644
--- a/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_sink_test.c
+++ b/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_sink_test.c
@@ -99,6 +99,7 @@ static void started_cb(struct bt_bap_stream *stream)
 
 	memset(&test_stream->last_info, 0, sizeof(test_stream->last_info));
 	test_stream->rx_cnt = 0U;
+	test_stream->valid_rx_cnt = 0U;
 
 	printk("Stream %p started\n", stream);
 }
diff --git a/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c b/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c
index 4d010c60d9297..eb2e789f24a36 100644
--- a/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c
+++ b/tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c
@@ -198,29 +198,6 @@ static int start_extended_adv(struct bt_le_ext_adv *adv)
 	return 0;
 }
 
-static int setup_extended_adv(struct bt_le_ext_adv **adv)
-{
-	int err;
-
-	/* Create a non-connectable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
-	if (err != 0) {
-		printk("Unable to create extended advertising set: %d\n", err);
-
-		return err;
-	}
-
-	/* Set periodic advertising parameters */
-	err = bt_le_per_adv_set_param(*adv, BT_LE_PER_ADV_DEFAULT);
-	if (err) {
-		printk("Failed to set periodic advertising parameters: %d\n", err);
-
-		return err;
-	}
-
-	return 0;
-}
-
 static int stop_extended_adv(struct bt_le_ext_adv *adv)
 {
 	int err;
@@ -292,11 +269,7 @@ static void test_main(void)
 		k_sem_reset(&sem_started);
 		k_sem_reset(&sem_stopped);
 
-		err = setup_extended_adv(&adv);
-		if (err != 0) {
-			printk("Unable to setup extended advertiser: %d\n", err);
-			FAIL("Public Broadcast source failed\n");
-		}
+		setup_broadcast_adv(&adv);
 
 		err = bt_cap_initiator_broadcast_audio_create(&create_param, &broadcast_source);
 		if (err != 0) {
diff --git a/tests/bsim/bluetooth/audio/src/tbs_test.c b/tests/bsim/bluetooth/audio/src/tbs_test.c
index ea96241db136c..e56f27a50fee7 100644
--- a/tests/bsim/bluetooth/audio/src/tbs_test.c
+++ b/tests/bsim/bluetooth/audio/src/tbs_test.c
@@ -194,7 +194,7 @@ static int test_answer_terminate(void)
 	printk("Answering call\n");
 	err = bt_tbs_remote_answer(g_call_index);
 	if (err != BT_TBS_RESULT_CODE_SUCCESS) {
-		FAIL("Could not accept call: %d\n", err);
+		FAIL("Could not remote answer: %d\n", err);
 		return err;
 	}
 
@@ -223,7 +223,7 @@ static int test_hold_retrieve(void)
 
 	err = bt_tbs_remote_answer(g_call_index);
 	if (err != BT_TBS_RESULT_CODE_SUCCESS) {
-		FAIL("Could not accept call: %d\n", err);
+		FAIL("Could not remote answer: %d\n", err);
 		return err;
 	}
 
diff --git a/tests/bsim/bluetooth/audio/src/tmap_client_test.c b/tests/bsim/bluetooth/audio/src/tmap_client_test.c
index 8332d5345805e..572abc9f01976 100644
--- a/tests/bsim/bluetooth/audio/src/tmap_client_test.c
+++ b/tests/bsim/bluetooth/audio/src/tmap_client_test.c
@@ -10,6 +10,7 @@
 #include <stddef.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/tmap.h>
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -87,8 +88,7 @@ static bool check_audio_support_and_connect(struct bt_data *data, void *user_dat
 		return false;
 	}
 
-	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
-				BT_LE_CONN_PARAM_DEFAULT,
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_BAP_CONN_PARAM_RELAXED,
 				&default_conn);
 	if (err != 0) {
 		printk("Create conn to failed (%u)\n", err);
diff --git a/tests/bsim/bluetooth/audio/src/tmap_server_test.c b/tests/bsim/bluetooth/audio/src/tmap_server_test.c
index 37da420194211..afb031ce16702 100644
--- a/tests/bsim/bluetooth/audio/src/tmap_server_test.c
+++ b/tests/bsim/bluetooth/audio/src/tmap_server_test.c
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/tmap.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gap.h>
diff --git a/tests/bsim/bluetooth/audio/test_scripts/_cap.sh b/tests/bsim/bluetooth/audio/test_scripts/_cap.sh
index c4e3ddec197df..9370a52d68170 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/_cap.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/_cap.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2022-2023 Nordic Semiconductor ASA
+# Copyright (c) 2022-2025 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -8,28 +8,5 @@ dir_path=$(dirname "$0")
 
 set -e # Exit on error
 
-$dir_path/cap_unicast_inval.sh
-
-$dir_path/cap_unicast.sh
-
-$dir_path/cap_broadcast.sh
-$dir_path/cap_broadcast_ac_12.sh
-$dir_path/cap_broadcast_ac_13.sh
-$dir_path/cap_broadcast_ac_14.sh
-
-$dir_path/cap_unicast_ac_1.sh
-$dir_path/cap_unicast_ac_2.sh
-$dir_path/cap_unicast_ac_3.sh
-$dir_path/cap_unicast_ac_4.sh
-$dir_path/cap_unicast_ac_5.sh
-$dir_path/cap_unicast_ac_6_i.sh
-$dir_path/cap_unicast_ac_6_ii.sh
-$dir_path/cap_unicast_ac_7_i.sh
-$dir_path/cap_unicast_ac_7_ii.sh
-$dir_path/cap_unicast_ac_8_i.sh
-$dir_path/cap_unicast_ac_8_ii.sh
-$dir_path/cap_unicast_ac_9_i.sh
-$dir_path/cap_unicast_ac_9_ii.sh
-$dir_path/cap_unicast_ac_10.sh
-$dir_path/cap_unicast_ac_11_i.sh
-$dir_path/cap_unicast_ac_11_ii.sh
+$dir_path/_cap_broadcast.sh
+$dir_path/_cap_unicast.sh
diff --git a/tests/bsim/bluetooth/audio/test_scripts/_cap_broadcast.sh b/tests/bsim/bluetooth/audio/test_scripts/_cap_broadcast.sh
new file mode 100755
index 0000000000000..f8478cdc5113c
--- /dev/null
+++ b/tests/bsim/bluetooth/audio/test_scripts/_cap_broadcast.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+dir_path=$(dirname "$0")
+
+set -e # Exit on error
+
+# Run all cap_broadcast* tests
+for file in "$dir_path"/cap_broadcast*.sh; do
+    if [ -f "$file" ]; then
+        echo "Running $file"
+        $file
+    fi
+done
diff --git a/tests/bsim/bluetooth/audio/test_scripts/_cap_unicast.sh b/tests/bsim/bluetooth/audio/test_scripts/_cap_unicast.sh
new file mode 100755
index 0000000000000..1f1f63b37e878
--- /dev/null
+++ b/tests/bsim/bluetooth/audio/test_scripts/_cap_unicast.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+dir_path=$(dirname "$0")
+
+set -e # Exit on error
+
+# Run all cap_unicast* tests
+for file in "$dir_path"/cap_unicast*.sh; do
+    if [ -f "$file" ]; then
+        echo "Running $file"
+        $file
+    fi
+done
diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
index 4b2bc395429db..45bbba49f3f5c 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh
@@ -25,7 +25,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 \
   -testid=broadcast_source -RealEncryption=1 -rs=69 -D=3 \
-  -start_offset=5e3 -argstest subgroup_cnt 1 streams_per_subgroup_cnt 2
+  -start_offset=2e3 -argstest subgroup_cnt 1 streams_per_subgroup_cnt 2
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -D=3 -sim_length=60e6 $@
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_inval.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_inval.sh
new file mode 100755
index 0000000000000..f177df9657a0b
--- /dev/null
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_inval.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+SIMULATION_ID="cap_broadcast_inval"
+VERBOSITY_LEVEL=2
+EXECUTE_TIMEOUT=120
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+cd ${BSIM_OUT_PATH}/bin
+
+printf "\n\n======== Running CAP broadcast inval test =========\n\n"
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=cap_initiator_broadcast_inval \
+  -RealEncryption=1 -rs=46 -D=1
+
+# Simulation time should be larger than the WAIT_TIME in common.h
+Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
+  -D=1 -sim_length=60e6 $@
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_reception.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_reception.sh
index 43834d3eb1a1a..b909cf4ce4c66 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_reception.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_reception.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2024 Nordic Semiconductor ASA
+# Copyright (c) 2024-2025 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_update.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_update.sh
new file mode 100755
index 0000000000000..a7900beaff6af
--- /dev/null
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast_update.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+SIMULATION_ID="cap_broadcast_update"
+VERBOSITY_LEVEL=2
+EXECUTE_TIMEOUT=120
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+cd ${BSIM_OUT_PATH}/bin
+
+printf "\n\n======== Running CAP broadcast update test =========\n\n"
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=cap_initiator_broadcast_update \
+  -RealEncryption=1 -rs=46 -D=2
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=cap_acceptor_broadcast_update \
+  -RealEncryption=1 -rs=23 -D=2
+
+# Simulation time should be larger than the WAIT_TIME in common.h
+Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
+  -D=2 -sim_length=60e6 $@
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_1.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_1.sh
index e09ac9e5d3a65..bb2740e989f22 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_1.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_1.sh
@@ -40,8 +40,12 @@ Execute_AC_1 24_1_1
 Execute_AC_1 24_2_1
 Execute_AC_1 32_1_1
 Execute_AC_1 32_2_1
-Execute_AC_1 441_1_1
-Execute_AC_1 441_2_1
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_1 441_1_1
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_1 441_2_1
 Execute_AC_1 48_1_1
 Execute_AC_1 48_2_1
 Execute_AC_1 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_10.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_10.sh
index 7a50f10cca58c..23ca3df3e2d06 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_10.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_10.sh
@@ -40,8 +40,12 @@ Execute_AC_10 24_1_1
 Execute_AC_10 24_2_1
 Execute_AC_10 32_1_1
 Execute_AC_10 32_2_1
-Execute_AC_10 441_1_1
-Execute_AC_10 441_2_1
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_10 441_1_1
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_10 441_2_1
 Execute_AC_10 48_1_1
 Execute_AC_10 48_2_1
 Execute_AC_10 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_i.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_i.sh
index e74192f47ec8d..05062f85d713a 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_i.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_i.sh
@@ -40,8 +40,14 @@ Execute_AC_11_I 24_1_1 24_1_1
 Execute_AC_11_I 24_2_1 24_2_1
 Execute_AC_11_I 32_1_1 32_1_1
 Execute_AC_11_I 32_2_1 32_2_1
-# Execute_AC_11_I 441_1_1 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_11_I 441_2_1 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_11_I 441_1_1 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_11_I 441_2_1 441_2_1
 Execute_AC_11_I 48_1_1 48_1_1
 Execute_AC_11_I 48_2_1 48_2_1
 Execute_AC_11_I 48_3_1 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_ii.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_ii.sh
index 2280172b4ae80..a868878fd5a38 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_ii.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_11_ii.sh
@@ -44,8 +44,14 @@ Execute_AC_11_II 24_1_1 24_1_1
 Execute_AC_11_II 24_2_1 24_2_1
 Execute_AC_11_II 32_1_1 32_1_1
 Execute_AC_11_II 32_2_1 32_2_1
-# Execute_AC_11_II 441_1_1 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_11_II 441_2_1 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_11_II 441_1_1 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_11_II 441_2_1 441_2_1
 Execute_AC_11_II 48_1_1 48_1_1
 Execute_AC_11_II 48_2_1 48_2_1
 Execute_AC_11_II 48_3_1 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_2.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_2.sh
index 0987accc4b20b..649f971b65993 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_2.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_2.sh
@@ -41,8 +41,12 @@ Execute_AC_2 24_1_1
 Execute_AC_2 24_2_1
 Execute_AC_2 32_1_1
 Execute_AC_2 32_2_1
-Execute_AC_2 441_1_1
-Execute_AC_2 441_2_1
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_2 441_1_1
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_2 441_2_1
 Execute_AC_2 48_1_1
 Execute_AC_2 48_2_1
 Execute_AC_2 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_3.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_3.sh
index 79e8a39d18629..cd495debf3ebd 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_3.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_3.sh
@@ -41,9 +41,16 @@ Execute_AC_3 24_1_1 24_1_1
 Execute_AC_3 24_2_1 24_2_1
 Execute_AC_3 32_1_1 32_1_1
 Execute_AC_3 32_2_1 32_2_1
-Execute_AC_3 441_1_1 441_1_1
-Execute_AC_3 441_2_1 441_2_1
-Execute_AC_3 48_1_1 48_1_1
+# No sent callback on peripheral and no RX on peripheral
+# https://github.com/zephyrproject-rtos/zephyr/issues/83585
+# Execute_AC_3 441_1_1 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_3 441_2_1 441_2_1
+# No sent callback on peripheral and no RX on peripheral
+# https://github.com/zephyrproject-rtos/zephyr/issues/83585
+# Execute_AC_3 48_1_1 48_1_1
 Execute_AC_3 48_2_1 48_2_1
 Execute_AC_3 48_3_1 48_3_1
 Execute_AC_3 48_4_1 48_4_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_4.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_4.sh
index b24a16f39a233..ecbadc6b818f1 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_4.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_4.sh
@@ -38,8 +38,14 @@ Execute_AC_4 24_1_1
 Execute_AC_4 24_2_1
 Execute_AC_4 32_1_1
 Execute_AC_4 32_2_1
-Execute_AC_4 441_1_1
-Execute_AC_4 441_2_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_4 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_4 441_2_1
 Execute_AC_4 48_1_1
 Execute_AC_4 48_2_1
 Execute_AC_4 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_5.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_5.sh
index d42716febf871..e3fda276abc55 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_5.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_5.sh
@@ -39,8 +39,13 @@ Execute_AC_5 24_1_1 24_1_1
 Execute_AC_5 24_2_1 24_2_1
 Execute_AC_5 32_1_1 32_1_1
 Execute_AC_5 32_2_1 32_2_1
-# Execute_AC_5 441_1_1 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_5 441_2_1 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_5 441_1_1 441_1_1
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_5 441_2_1 441_2_1
 Execute_AC_5 48_1_1 48_1_1
 Execute_AC_5 48_2_1 48_2_1
 Execute_AC_5 48_3_1 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_i.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_i.sh
index 344ebb0448b79..84f3e6fccf660 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_i.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_i.sh
@@ -38,8 +38,13 @@ Execute_AC_6_I 24_1_1
 Execute_AC_6_I 24_2_1
 Execute_AC_6_I 32_1_1
 Execute_AC_6_I 32_2_1
-# Execute_AC_6_I 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_6_I 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# bap_stream_rx.c:66): ISO receive lost
+# https://github.com/zephyrproject-rtos/zephyr/issues/84303
+# Execute_AC_6_I 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_6_I 441_2_1
 Execute_AC_6_I 48_1_1
 Execute_AC_6_I 48_2_1
 Execute_AC_6_I 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_ii.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_ii.sh
index e04df69690891..ce2a3be114965 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_ii.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_6_ii.sh
@@ -44,8 +44,14 @@ Execute_AC_6_II 24_1_1
 Execute_AC_6_II 24_2_1
 Execute_AC_6_II 32_1_1
 Execute_AC_6_II 32_2_1
-# Execute_AC_6_II 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_6_II 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_6_II 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_6_II 441_2_1
 Execute_AC_6_II 48_1_1
 Execute_AC_6_II 48_2_1
 Execute_AC_6_II 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_i.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_i.sh
index 3eebbc3421f96..55ba49c8520ee 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_i.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_i.sh
@@ -40,9 +40,16 @@ Execute_AC_7_I 24_1_1 24_1_1
 Execute_AC_7_I 24_2_1 24_2_1
 Execute_AC_7_I 32_1_1 32_1_1
 Execute_AC_7_I 32_2_1 32_2_1
-Execute_AC_7_I 441_1_1 441_1_1
-Execute_AC_7_I 441_2_1 441_2_1
-Execute_AC_7_I 48_1_1 48_1_1
+# No sent callback on peripheral and no RX on peripheral
+# https://github.com/zephyrproject-rtos/zephyr/issues/83585
+# Execute_AC_7_I 441_1_1 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_7_I 441_2_1 441_2_1
+# No sent callback on peripheral and no RX on peripheral
+# https://github.com/zephyrproject-rtos/zephyr/issues/83585
+# Execute_AC_7_I 48_1_1 48_1_1
 Execute_AC_7_I 48_2_1 48_2_1
 Execute_AC_7_I 48_3_1 48_3_1
 Execute_AC_7_I 48_4_1 48_4_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_ii.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_ii.sh
index ce6c9abdf89f8..62a805047956b 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_ii.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_7_ii.sh
@@ -44,8 +44,14 @@ Execute_AC_7_II 24_1_1 24_1_1
 Execute_AC_7_II 24_2_1 24_2_1
 Execute_AC_7_II 32_1_1 32_1_1
 Execute_AC_7_II 32_2_1 32_2_1
-# Execute_AC_7_II 441_1_1 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_7_II 441_2_1 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_7_II 441_1_1 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_7_II 441_2_1 441_2_1
 Execute_AC_7_II 48_1_1 48_1_1
 Execute_AC_7_II 48_2_1 48_2_1
 Execute_AC_7_II 48_3_1 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_i.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_i.sh
index 7b1e7d6848101..453da880bf55a 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_i.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_i.sh
@@ -40,8 +40,14 @@ Execute_AC_8_I 24_1_1 24_1_1
 Execute_AC_8_I 24_2_1 24_2_1
 Execute_AC_8_I 32_1_1 32_1_1
 Execute_AC_8_I 32_2_1 32_2_1
-# Execute_AC_8_I 441_1_1 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_8_I 441_2_1 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_8_I 441_1_1 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_8_I 441_2_1 441_2_1
 Execute_AC_8_I 48_1_1 48_1_1
 Execute_AC_8_I 48_2_1 48_2_1
 Execute_AC_8_I 48_3_1 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_ii.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_ii.sh
index 25e07a6c1495b..af4b218f63e1c 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_ii.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_8_ii.sh
@@ -44,8 +44,14 @@ Execute_AC_8_II 24_1_1 24_1_1
 Execute_AC_8_II 24_2_1 24_2_1
 Execute_AC_8_II 32_1_1 32_1_1
 Execute_AC_8_II 32_2_1 32_2_1
-# Execute_AC_8_II 441_1_1 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_8_II 441_2_1 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_8_II 441_1_1 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_8_II 441_2_1 441_2_1
 Execute_AC_8_II 48_1_1 48_1_1
 Execute_AC_8_II 48_2_1 48_2_1
 Execute_AC_8_II 48_3_1 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_i.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_i.sh
index 1a00f55e43307..1756ac5a23a20 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_i.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_i.sh
@@ -40,8 +40,14 @@ Execute_AC_9_I 24_1_1
 Execute_AC_9_I 24_2_1
 Execute_AC_9_I 32_1_1
 Execute_AC_9_I 32_2_1
-# Execute_AC_9_I 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_9_I 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_9_I 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_9_I 441_2_1
 Execute_AC_9_I 48_1_1
 Execute_AC_9_I 48_2_1
 Execute_AC_9_I 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_ii.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_ii.sh
index 207d81f663e74..717c5c50e5c4d 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_ii.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ac_9_ii.sh
@@ -44,8 +44,14 @@ Execute_AC_9_II 24_1_1
 Execute_AC_9_II 24_2_1
 Execute_AC_9_II 32_1_1
 Execute_AC_9_II 32_2_1
-# Execute_AC_9_II 441_1_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
-# Execute_AC_9_II 441_2_1 # ASSERTION FAIL [iso_interval_us >= cig->c_sdu_interval]
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_9_II 441_1_1
+# ASSERTION FAIL [err == ((isoal_status_t) 0x00)] @
+# zephyr/subsys/bluetooth/controller/hci/hci_driver.c:489
+# https://github.com/zephyrproject-rtos/zephyr/issues/83586
+# Execute_AC_9_II 441_2_1
 Execute_AC_9_II 48_1_1
 Execute_AC_9_II 48_2_1
 Execute_AC_9_II 48_3_1
diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh
index e45fb8a27a8ce..5f912c47de54e 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh
@@ -12,7 +12,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 cd ${BSIM_OUT_PATH}/bin
 
-printf "\n\n======== Running CAP unicast test =========\n\n"
+printf "\n\n======== Running CAP unicast inval test =========\n\n"
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=cap_initiator_unicast_inval \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip.sh b/tests/bsim/bluetooth/audio/test_scripts/csip.sh
index dc64d43751648..99c88c6eb11a5 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
index 7c38e405eac0e..b4898ee8958ed 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_enc \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
index d02329b3c7510..f151a37e93314 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_release \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
index 8502c80278981..b5e98a0b147f2 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh
@@ -22,15 +22,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member_new_sirk \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_new_size_and_rank.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_new_size_and_rank.sh
new file mode 100755
index 0000000000000..3488018cc09bb
--- /dev/null
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_new_size_and_rank.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# CSIP test where a set coordinator connects a set members and then waits for a set size
+# notification
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+VERBOSITY_LEVEL=2
+EXECUTE_TIMEOUT=20
+
+cd ${BSIM_OUT_PATH}/bin
+
+SIMULATION_ID="csip_new_size"
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=csip_set_coordinator_new_size_and_rank \
+  -RealEncryption=1 -rs=10 -D=2
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
+  -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member_new_size_and_rank \
+  -RealEncryption=1 -rs=20 -D=2 -argstest rank 1 size 1
+
+# Simulation time should be larger than the WAIT_TIME in common.h
+Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
+  -D=2 -sim_length=20e6 $@
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
index 5a3a807cd0a8e..453409cb5740b 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh
@@ -21,15 +21,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 not-lockable
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 1 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 not-lockable
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 2 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 not-lockable
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 3 not-lockable
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
index 61b2cac707aae..bb82e2a0a4142 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh
@@ -21,15 +21,15 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=csip_set_member \
-  -RealEncryption=1 -rs=20 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=20 -D=4 -argstest rank 0 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=2 -testid=csip_set_member \
-  -RealEncryption=1 -rs=30 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=30 -D=4 -argstest rank 0 size 3 not-lockable
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 0 not-lockable
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 0 size 3 not-lockable
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
index dea6ac9874d6f..75a71bc3a41d8 100755
--- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
+++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh
@@ -29,7 +29,7 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_prj_conf \
   -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csip_set_member \
-  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3s size 0
+  -RealEncryption=1 -rs=40 -D=4 -argstest rank 3 size 0
 
 # Simulation time should be larger than the WAIT_TIME in common.h
 Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
diff --git a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/CMakeLists.txt b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/CMakeLists.txt
index c30094a9c8391..f7ab4892ae67a 100644
--- a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/CMakeLists.txt
+++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/CMakeLists.txt
@@ -9,8 +9,12 @@ set(bap_broadcast_sink_path ${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink)
 
 target_sources(app PRIVATE
   ${bap_broadcast_sink_path}/src/main.c
+  ${bap_broadcast_sink_path}/src/stream_rx.c
 )
 
+zephyr_sources_ifdef(CONFIG_LIBLC3 ${bap_broadcast_sink_path}/src/lc3.c)
+zephyr_sources_ifdef(CONFIG_USB_DEVICE_AUDIO ${bap_broadcast_sink_path}/src/usb.c)
+
 target_sources(app PRIVATE
 	src/broadcast_sink_test.c
 	src/test_main.c
diff --git a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/compile.sh b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/compile.sh
index 8ed8895934ad1..f4cf7e1c4380e 100755
--- a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/compile.sh
+++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/compile.sh
@@ -10,13 +10,20 @@ set -ue
 source ${ZEPHYR_BASE}/tests/bsim/compile.source
 
 if [ "${BOARD_TS}" == "nrf5340bsim_nrf5340_cpuapp" ]; then
-  app=samples/bluetooth/bap_broadcast_source sysbuild=1 compile
+  app=samples/bluetooth/bap_broadcast_source conf_overlay=overlay-sequential.conf \
+    sysbuild=1 compile
+  app=samples/bluetooth/bap_broadcast_source conf_overlay=overlay-interleaved.conf \
+    sysbuild=1 compile
   app=tests/bsim/bluetooth/audio_samples/bap_broadcast_sink sysbuild=1 \
     conf_file=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/prj.conf \
     exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
 else
-  app=samples/bluetooth/bap_broadcast_source conf_overlay=overlay-bt_ll_sw_split.conf \
-    exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
+  app=samples/bluetooth/bap_broadcast_source \
+    conf_overlay='overlay-bt_ll_sw_split.conf;overlay-sequential.conf' \
+    exe_name=bs_${BOARD_TS}_${app}_prj_conf_overlay-sequential_conf sysbuild=1 compile
+  app=samples/bluetooth/bap_broadcast_source \
+    conf_overlay='overlay-bt_ll_sw_split.conf;overlay-interleaved.conf' \
+    exe_name=bs_${BOARD_TS}_${app}_prj_conf_overlay-interleaved_conf sysbuild=1 compile
   app=tests/bsim/bluetooth/audio_samples/bap_broadcast_sink \
     conf_file=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/prj.conf \
     conf_overlay=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/overlay-bt_ll_sw_split.conf \
diff --git a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio.sh b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio.sh
deleted file mode 100755
index bb7230ca53efc..0000000000000
--- a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Simple selfchecking test for the broadcast audio sink/source samples,
-# It relies on the bs_tests hooks to register a test timer callback, which after a deadline
-# will check how many audio packets the broadcast audio sink has received, and if over a threshold
-# it considers the test passed
-
-simulation_id="broadcast_audio_samples_test"
-verbosity_level=2
-
-source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
-
-EXECUTE_TIMEOUT=200
-
-cd ${BSIM_OUT_PATH}/bin
-
-Execute ./bs_${BOARD_TS}_samples_bluetooth_bap_broadcast_source_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=1
-
-Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_bap_broadcast_sink_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=1 \
-  -testid=bap_broadcast_sink
-
-Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=120e6 $@
-
-wait_for_background_jobs #Wait for all programs in background and return != 0 if any fails
diff --git a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio_interleaved.sh b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio_interleaved.sh
new file mode 100755
index 0000000000000..ef2589321e75d
--- /dev/null
+++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio_interleaved.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Simple selfchecking test for the broadcast audio sink/source samples,
+# It relies on the bs_tests hooks to register a test timer callback, which after a deadline
+# will check how many audio packets the broadcast audio sink has received, and if over a threshold
+# it considers the test passed
+
+simulation_id="samples_bluetooth_bap_broadcast_source_interleaved_test"
+verbosity_level=2
+EXECUTE_TIMEOUT=200
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute ./bs_${BOARD_TS}_samples_bluetooth_bap_broadcast_source_prj_conf_overlay-interleaved_conf \
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=1
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_bap_broadcast_sink_prj_conf \
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=1 \
+  -testid=bap_broadcast_sink
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
+  -D=2 -sim_length=120e6 $@
+
+wait_for_background_jobs #Wait for all programs in background and return != 0 if any fails
diff --git a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio_sequential.sh b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio_sequential.sh
new file mode 100755
index 0000000000000..91b0889817fa9
--- /dev/null
+++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio_sequential.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Simple selfchecking test for the broadcast audio sink/source samples,
+# It relies on the bs_tests hooks to register a test timer callback, which after a deadline
+# will check how many audio packets the broadcast audio sink has received, and if over a threshold
+# it considers the test passed
+
+simulation_id="samples_bluetooth_bap_broadcast_source_sequential_test"
+verbosity_level=2
+EXECUTE_TIMEOUT=200
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute ./bs_${BOARD_TS}_samples_bluetooth_bap_broadcast_source_prj_conf_overlay-sequential_conf \
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=1
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_bap_broadcast_sink_prj_conf \
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=1 \
+  -testid=bap_broadcast_sink
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
+  -D=2 -sim_length=120e6 $@
+
+wait_for_background_jobs #Wait for all programs in background and return != 0 if any fails
diff --git a/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c
index 603fd10f02471..ef743e9b9f9c5 100644
--- a/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c
+++ b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c
@@ -12,7 +12,7 @@
 #include "bs_utils.h"
 #include "bstests.h"
 
-#define WAIT_TIME 10 /* Seconds */
+#define WAIT_TIME 20 /* Seconds */
 
 #define PASS_THRESHOLD 100 /* Audio packets */
 
diff --git a/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh b/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh
index 00dc5c4bdb66e..8943a9605ad37 100755
--- a/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh
+++ b/tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh
@@ -12,10 +12,15 @@ export BOARD="${BOARD:-nrf5340bsim/nrf5340/cpuapp}"
 
 source ${ZEPHYR_BASE}/tests/bsim/compile.source
 
+${ZEPHYR_BASE}/tests/bsim/bluetooth/host/compile.sh
+${ZEPHYR_BASE}/tests/bsim/bluetooth/tester/compile.sh
+
 app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_privacy.conf sysbuild=1  compile
 app=tests/bsim/bluetooth/ll/throughput sysbuild=1 compile
 app=tests/bsim/bluetooth/ll/multiple_id sysbuild=1 compile
-app=tests/bsim/bluetooth/ll/bis sysbuild=1 compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-sequential.conf sysbuild=1 compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-interleaved.conf sysbuild=1 compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-ticker_expire_info.conf sysbuild=1 compile
 app=tests/bsim/bluetooth/ll/cis conf_overlay=overlay-acl_group.conf sysbuild=1 compile
 
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/samples/compile.sh
diff --git a/tests/bsim/bluetooth/compile.nrf54l15bsim_nrf54l15_cpuapp.sh b/tests/bsim/bluetooth/compile.nrf54l15bsim_nrf54l15_cpuapp.sh
index a17d9bf86773b..e0524dbbdeaa6 100755
--- a/tests/bsim/bluetooth/compile.nrf54l15bsim_nrf54l15_cpuapp.sh
+++ b/tests/bsim/bluetooth/compile.nrf54l15bsim_nrf54l15_cpuapp.sh
@@ -15,6 +15,9 @@ source ${ZEPHYR_BASE}/tests/bsim/compile.source
 
 app=tests/bsim/bluetooth/ll/throughput compile
 app=tests/bsim/bluetooth/ll/multiple_id compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-sequential.conf compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-interleaved.conf  compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-ticker_expire_info.conf compile
 
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/samples/compile.sh
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/audio/compile.sh
diff --git a/tests/bsim/bluetooth/compile.sh b/tests/bsim/bluetooth/compile.sh
index 76525a816135d..f8e62a7fb63fd 100755
--- a/tests/bsim/bluetooth/compile.sh
+++ b/tests/bsim/bluetooth/compile.sh
@@ -24,5 +24,6 @@ ${ZEPHYR_BASE}/tests/bsim/bluetooth/samples/compile.sh
 if [ ${BOARD} == "nrf52_bsim/native" ]; then
 	${ZEPHYR_BASE}/tests/bsim/bluetooth/hci_uart/compile.sh
 fi
+${ZEPHYR_BASE}/tests/bsim/bluetooth/tester/compile.sh
 
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
index 2938bf9846f23..9f4399a8b2dd3 100644
--- a/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
+++ b/tests/bsim/bluetooth/host/adv/periodic/src/per_adv_sync.c
@@ -149,7 +149,7 @@ static void recv_cb(struct bt_le_per_adv_sync *recv_sync,
 	}
 
 	bt_addr_le_to_str(info->addr, le_addr, sizeof(le_addr));
-	printk("PER_ADV_SYNC[%u]: [DEVICE]: %s advertisment received\n",
+	printk("PER_ADV_SYNC[%u]: [DEVICE]: %s advertisement received\n",
 	       bt_le_per_adv_sync_get_index(recv_sync), le_addr);
 
 	while (buf->len > 0) {
@@ -355,7 +355,7 @@ static void main_per_adv_long_data_sync(void)
 
 	create_pa_sync(&sync);
 
-	printk("Waiting to receive periodic advertisment...\n");
+	printk("Waiting to receive periodic advertisement...\n");
 	WAIT_FOR_FLAG(flag_per_adv_recv);
 
 	printk("Waiting for periodic sync lost...\n");
diff --git a/tests/bsim/bluetooth/host/att/pipeline/tester/prj.conf b/tests/bsim/bluetooth/host/att/pipeline/tester/prj.conf
index a5ca6cf0f629f..16c2caa091c53 100644
--- a/tests/bsim/bluetooth/host/att/pipeline/tester/prj.conf
+++ b/tests/bsim/bluetooth/host/att/pipeline/tester/prj.conf
@@ -5,11 +5,9 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=1
 
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_ACL_TX_COUNT=20
+CONFIG_BT_BUF_EVT_RX_COUNT=21
 
-CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 
diff --git a/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c b/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c
index 3f49e7e43cd38..ad2cfee2f4633 100644
--- a/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/att/pipeline/tester/src/main.c
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/hci_raw.h>
 #include <zephyr/bluetooth/hci_types.h>
 
+#include "common/hci_common_internal.h"
 #include "common/bt_str.h"
 
 #include "host/conn_internal.h"
@@ -55,7 +56,7 @@ static att_handler_t att_handlers[LAST_SUPPORTED_ATT_OPCODE];
 static K_FIFO_DEFINE(rx_queue);
 
 #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT,
 			  CMD_BUF_SIZE, 8, NULL);
 
 static K_SEM_DEFINE(cmd_sem, 1, 1);
diff --git a/tests/bsim/bluetooth/host/att/sequential/tester/prj.conf b/tests/bsim/bluetooth/host/att/sequential/tester/prj.conf
index 5217040a11737..e8ba462aeea87 100644
--- a/tests/bsim/bluetooth/host/att/sequential/tester/prj.conf
+++ b/tests/bsim/bluetooth/host/att/sequential/tester/prj.conf
@@ -5,8 +5,6 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=1
 
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
diff --git a/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c b/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c
index 4cd981d615b0f..fc3477072c156 100644
--- a/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/att/sequential/tester/src/main.c
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/hci_raw.h>
 #include <zephyr/bluetooth/hci_types.h>
 
+#include "common/hci_common_internal.h"
 #include "common/bt_str.h"
 
 #include "host/conn_internal.h"
@@ -50,7 +51,7 @@ static uint16_t server_write_handle;
 static K_FIFO_DEFINE(rx_queue);
 
 #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT,
 			  CMD_BUF_SIZE, 8, NULL);
 
 static K_SEM_DEFINE(cmd_sem, 1, 1);
diff --git a/tests/bsim/bluetooth/host/central/src/main.c b/tests/bsim/bluetooth/host/central/src/main.c
index 4969a9bb43791..dd12fd91a5bda 100644
--- a/tests/bsim/bluetooth/host/central/src/main.c
+++ b/tests/bsim/bluetooth/host/central/src/main.c
@@ -9,6 +9,9 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/hci.h>
 
+/* Include hci_common_internal for the purpose of checking HCI Command counts. */
+#include "common/hci_common_internal.h"
+
 /* Include conn_internal for the purpose of checking reference counts. */
 #include "host/conn_internal.h"
 
@@ -63,7 +66,7 @@ static void test_central_connect_timeout_with_timeout(uint32_t timeout_ms, bool
 		.window_coded = 0,
 		.timeout = timeout_ms / 10,
 	};
-	struct net_buf *bufs[CONFIG_BT_BUF_CMD_TX_COUNT];
+	struct net_buf *bufs[BT_BUF_CMD_TX_COUNT];
 
 	k_sem_reset(&sem_failed_to_connect);
 
@@ -74,7 +77,7 @@ static void test_central_connect_timeout_with_timeout(uint32_t timeout_ms, bool
 
 	if (stack_load) {
 		/* Claim all the buffers so that the stack cannot handle the timeout */
-		for (int i = 0; i < CONFIG_BT_BUF_CMD_TX_COUNT; i++) {
+		for (int i = 0; i < BT_BUF_CMD_TX_COUNT; i++) {
 			bufs[i] = bt_hci_cmd_create(BT_HCI_LE_ADV_ENABLE, 0);
 			TEST_ASSERT(bufs[i] != NULL, "Failed to claim all command buffers");
 		}
@@ -82,7 +85,7 @@ static void test_central_connect_timeout_with_timeout(uint32_t timeout_ms, bool
 		err = k_sem_take(&sem_failed_to_connect, K_MSEC(expected_conn_timeout_ms + 50));
 		TEST_ASSERT(err == -EAGAIN, "Callback ran with no buffers available", err);
 		/* Release all the buffers back to the stack */
-		for (int i = 0; i < CONFIG_BT_BUF_CMD_TX_COUNT; i++) {
+		for (int i = 0; i < BT_BUF_CMD_TX_COUNT; i++) {
 			net_buf_unref(bufs[i]);
 		}
 	}
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
index 664a65ca30db8..471e93cbdac45 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/central.c
@@ -41,6 +41,7 @@ static struct bt_conn *default_conn;
 
 static struct bt_conn_cb central_cb;
 
+DEFINE_FLAG_STATIC(gatt_subscribed_rejected_flag);
 DEFINE_FLAG_STATIC(gatt_subscribed_flag);
 
 static uint8_t notify_cb(struct bt_conn *conn, struct bt_gatt_subscribe_params *params,
@@ -69,6 +70,9 @@ static uint8_t notify_cb(struct bt_conn *conn, struct bt_gatt_subscribe_params *
 static void subscribe_cb(struct bt_conn *conn, uint8_t err, struct bt_gatt_subscribe_params *params)
 {
 	if (err) {
+		if (err == BT_ATT_ERR_WRITE_NOT_PERMITTED) {
+			SET_FLAG(gatt_subscribed_rejected_flag);
+		}
 		return;
 	}
 
@@ -81,6 +85,7 @@ static void ccc_subscribe(void)
 {
 	int err;
 
+	UNSET_FLAG(gatt_subscribed_rejected_flag);
 	UNSET_FLAG(gatt_subscribed_flag);
 
 	subscribe_params.notify = notify_cb;
@@ -94,6 +99,13 @@ static void ccc_subscribe(void)
 		TEST_FAIL("Failed to subscribe (att err %d)", err);
 	}
 
+	WAIT_FOR_FLAG(gatt_subscribed_rejected_flag);
+
+	err = bt_gatt_subscribe(default_conn, &subscribe_params);
+	if (err) {
+		TEST_FAIL("Failed to subscribe (att err %d)", err);
+	}
+
 	WAIT_FOR_FLAG(gatt_subscribed_flag);
 }
 
diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
index fe12cb3c0e260..f2f6da4e32826 100644
--- a/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/gatt/ccc_store/src/peripheral.c
@@ -41,6 +41,8 @@ static struct bt_conn *default_conn;
 
 static struct bt_conn_cb peripheral_cb;
 
+static bool notif_write_allowed;
+
 static void ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	ARG_UNUSED(attr);
@@ -52,10 +54,24 @@ static void ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 	SET_FLAG(ccc_cfg_changed_flag);
 }
 
+static ssize_t ccc_cfg_write_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr, uint16_t value)
+{
+	if (notif_write_allowed) {
+		LOG_INF("CCC Write Request accepted.");
+		return sizeof(value);
+	} else {
+		LOG_INF("CCC Write Request rejected.");
+		notif_write_allowed = true;
+		return BT_GATT_ERR(BT_ATT_ERR_WRITE_NOT_PERMITTED);
+	}
+}
+
 BT_GATT_SERVICE_DEFINE(dummy_svc, BT_GATT_PRIMARY_SERVICE(&dummy_service),
 		       BT_GATT_CHARACTERISTIC(&notify_characteristic_uuid.uuid, BT_GATT_CHRC_NOTIFY,
 					      BT_GATT_PERM_NONE, NULL, NULL, NULL),
-		       BT_GATT_CCC(ccc_cfg_changed, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE));
+		       BT_GATT_CCC_WITH_WRITE_CB(ccc_cfg_changed, ccc_cfg_write_cb,
+						 BT_GATT_PERM_READ | BT_GATT_PERM_WRITE)
+);
 
 static void create_adv(struct bt_le_ext_adv **adv)
 {
diff --git a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
index a754f08649fc5..e4b609aba4214 100644
--- a/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
+++ b/tests/bsim/bluetooth/host/gatt/general/src/gatt_client_test.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/kernel.h>
 
+#include <zephyr/sys/byteorder.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
@@ -363,6 +364,7 @@ static void gatt_read(uint16_t handle, uint8_t expect_att_err)
 
 static void test_main(void)
 {
+	struct bt_le_local_features local_features;
 	int err;
 
 	bt_conn_cb_register(&conn_callbacks);
@@ -372,6 +374,13 @@ static void test_main(void)
 		TEST_FAIL("Bluetooth discover failed (err %d)", err);
 	}
 
+	err = bt_le_get_local_features(&local_features);
+	TEST_ASSERT(err == 0, "Failed to get local features");
+	TEST_ASSERT(local_features.acl_mtu > 0U, "Invalid ACL MTU");
+	TEST_ASSERT(local_features.acl_pkts > 0U, "Invalid ACL packet count");
+	TEST_ASSERT(sys_get_le64(local_features.features) > 0U, "Invalid features");
+	TEST_ASSERT(local_features.states > 0U, "Invalid states");
+
 	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
 	if (err != 0) {
 		TEST_FAIL("Scanning failed to start (err %d)", err);
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/CMakeLists.txt b/tests/bsim/bluetooth/host/gatt/notify_stress/CMakeLists.txt
new file mode 100644
index 0000000000000..b279e8c143965
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/CMakeLists.txt
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(bsim_test_gatt)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources} )
+
+zephyr_include_directories(
+  ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
+  ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
+  )
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/Kconfig.sysbuild b/tests/bsim/bluetooth/host/gatt/notify_stress/Kconfig.sysbuild
new file mode 100644
index 0000000000000..79d8f9919609c
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/Kconfig.sysbuild
@@ -0,0 +1,14 @@
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config NET_CORE_BOARD
+	string
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
+
+config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
+	int
+	# Let's pass the test arguments to the application MCU test
+	# otherwise by default they would have gone to the net core.
+	default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/nrf5340_cpunet-bt_ll_sw_split.conf b/tests/bsim/bluetooth/host/gatt/notify_stress/nrf5340_cpunet-bt_ll_sw_split.conf
new file mode 100644
index 0000000000000..853adc082dac9
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/nrf5340_cpunet-bt_ll_sw_split.conf
@@ -0,0 +1,30 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=4096
+CONFIG_CBPRINTF_REDUCED_INTEGRAL=y
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_MAX_CONN=1
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=70
+CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
+CONFIG_BT_CTLR_RX_BUFFERS=10
+
+CONFIG_BT_BUF_CMD_TX_SIZE=65
+CONFIG_BT_BUF_EVT_RX_SIZE=68
+CONFIG_BT_BUF_EVT_RX_COUNT=17
+CONFIG_BT_BUF_ACL_TX_COUNT=16
+CONFIG_BT_BUF_ACL_TX_SIZE=70
+CONFIG_BT_BUF_ACL_RX_SIZE=70
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/prj.conf b/tests/bsim/bluetooth/host/gatt/notify_stress/prj.conf
new file mode 100644
index 0000000000000..5e04334eecc4c
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/prj.conf
@@ -0,0 +1,35 @@
+CONFIG_BT=y
+CONFIG_BT_DEVICE_NAME="GATT tester"
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_GATT_CLIENT=y
+
+CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y
+
+CONFIG_BT_SMP=y
+CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+CONFIG_BT_L2CAP_ECRED=y
+CONFIG_BT_EATT=y
+
+CONFIG_BT_AUTO_PHY_UPDATE=n
+CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
+
+CONFIG_ASSERT=y
+CONFIG_BT_TESTING=y
+CONFIG_LOG=y
+
+# Maximum possible EATT channels are used to parallelize notifications as much as possible,
+# increasing traffic towards Central.
+CONFIG_BT_EATT_MAX=16
+
+# This is aligned with CONFIG_BT_EATT_MAX to utilize all EATT channels
+CONFIG_BT_BUF_ACL_TX_COUNT=16
+
+# Aligned with characteristic size
+CONFIG_BT_BUF_ACL_RX_SIZE=70
+CONFIG_BT_BUF_ACL_TX_SIZE=70
+
+CONFIG_BT_BUF_EVT_RX_COUNT=17
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
+
+CONFIG_BT_BUF_CMD_TX_COUNT=2
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/src/common.h b/tests/bsim/bluetooth/host/gatt/notify_stress/src/common.h
new file mode 100644
index 0000000000000..4258969f4dae3
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/src/common.h
@@ -0,0 +1,21 @@
+/**
+ * Common macros used by both sides of the test
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/toolchain.h>
+
+#define CHRC_SIZE 60
+
+#define TEST_SERVICE_UUID                                                                          \
+	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,      \
+			    0x07, 0x08, 0x09, 0x00, 0x00)
+
+#define TEST_CHRC_UUID                                                                             \
+	BT_UUID_DECLARE_128(0x01, 0x23, 0x45, 0x67, 0x89, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,      \
+			    0x07, 0x08, 0x09, 0xFF, 0x11)
+
+#define NOTIFICATION_COUNT 30
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/src/gatt_client_test.c b/tests/bsim/bluetooth/host/gatt/notify_stress/src/gatt_client_test.c
new file mode 100644
index 0000000000000..bd866ec254d11
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/src/gatt_client_test.c
@@ -0,0 +1,317 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "common.h"
+
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_is_encrypted);
+DEFINE_FLAG_STATIC(flag_discover_complete);
+DEFINE_FLAG_STATIC(flag_long_subscribed);
+
+static struct bt_conn *g_conn;
+static uint16_t long_chrc_handle;
+static const struct bt_uuid *test_svc_uuid = TEST_SERVICE_UUID;
+
+static void connected(struct bt_conn *conn, uint8_t err)
+{
+	char addr[BT_ADDR_LE_STR_LEN];
+
+	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
+
+	if (err != 0) {
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
+		return;
+	}
+
+	printk("Connected to %s\n", addr);
+
+	SET_FLAG(flag_is_connected);
+}
+
+static void disconnected(struct bt_conn *conn, uint8_t reason)
+{
+	char addr[BT_ADDR_LE_STR_LEN];
+
+	if (conn != g_conn) {
+		return;
+	}
+
+	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
+
+	printk("Disconnected: %s (reason 0x%02x)\n", addr, reason);
+
+	bt_conn_unref(g_conn);
+
+	g_conn = NULL;
+	UNSET_FLAG(flag_is_connected);
+}
+
+void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_security_err err)
+{
+	if (err) {
+		TEST_FAIL("Encryption failure (%d)", err);
+	} else if (level < BT_SECURITY_L2) {
+		TEST_FAIL("Insufficient sec level (%d)", level);
+	} else {
+		SET_FLAG(flag_is_encrypted);
+	}
+}
+
+BT_CONN_CB_DEFINE(conn_callbacks) = {
+	.connected = connected,
+	.disconnected = disconnected,
+	.security_changed = security_changed,
+};
+
+void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type, struct net_buf_simple *ad)
+{
+	char addr_str[BT_ADDR_LE_STR_LEN];
+	int err;
+
+	if (g_conn != NULL) {
+		return;
+	}
+
+	/* We're only interested in connectable events */
+	if (type != BT_HCI_ADV_IND && type != BT_HCI_ADV_DIRECT_IND) {
+		return;
+	}
+
+	bt_addr_le_to_str(addr, addr_str, sizeof(addr_str));
+	printk("Device found: %s (RSSI %d)\n", addr_str, rssi);
+
+	printk("Stopping scan\n");
+	err = bt_le_scan_stop();
+	if (err != 0) {
+		TEST_FAIL("Could not stop scan: %d");
+		return;
+	}
+
+	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT, &g_conn);
+	if (err != 0) {
+		TEST_FAIL("Could not connect to peer: %d", err);
+	}
+}
+
+static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *attr,
+			     struct bt_gatt_discover_params *params)
+{
+	int err;
+
+	if (attr == NULL) {
+		if (long_chrc_handle == 0) {
+			TEST_FAIL("Did not discover long_chrc (%x)", long_chrc_handle);
+		}
+
+		(void)memset(params, 0, sizeof(*params));
+
+		SET_FLAG(flag_discover_complete);
+
+		return BT_GATT_ITER_STOP;
+	}
+
+	printk("[ATTRIBUTE] handle %u\n", attr->handle);
+
+	if (params->type == BT_GATT_DISCOVER_PRIMARY &&
+	    bt_uuid_cmp(params->uuid, TEST_SERVICE_UUID) == 0) {
+		printk("Found test service\n");
+		params->uuid = NULL;
+		params->start_handle = attr->handle + 1;
+		params->type = BT_GATT_DISCOVER_CHARACTERISTIC;
+
+		err = bt_gatt_discover(conn, params);
+		if (err != 0) {
+			TEST_FAIL("Discover failed (err %d)", err);
+		}
+
+		return BT_GATT_ITER_STOP;
+	} else if (params->type == BT_GATT_DISCOVER_CHARACTERISTIC) {
+		const struct bt_gatt_chrc *chrc = (struct bt_gatt_chrc *)attr->user_data;
+
+		if (bt_uuid_cmp(chrc->uuid, TEST_CHRC_UUID) == 0) {
+			printk("Found long_chrc\n");
+			long_chrc_handle = chrc->value_handle;
+		}
+	}
+
+	return BT_GATT_ITER_CONTINUE;
+}
+
+static void gatt_discover(enum bt_att_chan_opt opt)
+{
+	static struct bt_gatt_discover_params discover_params;
+	int err;
+
+	printk("Discovering services and characteristics\n");
+
+	discover_params.uuid = test_svc_uuid;
+	discover_params.func = discover_func;
+	discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE;
+	discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE;
+	discover_params.type = BT_GATT_DISCOVER_PRIMARY;
+	discover_params.chan_opt = opt;
+
+	err = bt_gatt_discover(g_conn, &discover_params);
+	if (err != 0) {
+		TEST_FAIL("Discover failed(err %d)", err);
+	}
+
+	WAIT_FOR_FLAG(flag_discover_complete);
+	printk("Discover complete\n");
+}
+
+static void test_long_subscribed(struct bt_conn *conn, uint8_t err,
+				 struct bt_gatt_subscribe_params *params)
+{
+	if (err) {
+		TEST_FAIL("Subscribe failed (err %d)", err);
+	}
+
+	SET_FLAG(flag_long_subscribed);
+
+	if (!params) {
+		printk("params NULL\n");
+		return;
+	}
+
+	if (params->value_handle == long_chrc_handle) {
+		printk("Subscribed to long characteristic\n");
+	} else {
+		TEST_FAIL("Unknown handle %d", params->value_handle);
+	}
+}
+
+static volatile size_t num_notifications;
+uint8_t test_notify(struct bt_conn *conn, struct bt_gatt_subscribe_params *params, const void *data,
+		    uint16_t length)
+{
+	printk("Received notification #%u with length %d\n", num_notifications++, length);
+
+	/* This causes ACL data drop in HCI IPC driver. */
+	k_sleep(K_MSEC(1000));
+
+	return BT_GATT_ITER_CONTINUE;
+}
+
+static struct bt_gatt_discover_params disc_params_long;
+static struct bt_gatt_subscribe_params sub_params_long = {
+	.notify = test_notify,
+	.subscribe = test_long_subscribed,
+	.ccc_handle = BT_GATT_AUTO_DISCOVER_CCC_HANDLE,
+	.disc_params = &disc_params_long,
+	.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE,
+	.value = BT_GATT_CCC_NOTIFY,
+};
+
+static void gatt_subscribe_long(enum bt_att_chan_opt opt)
+{
+	int err;
+
+	UNSET_FLAG(flag_long_subscribed);
+	sub_params_long.value_handle = long_chrc_handle;
+	sub_params_long.chan_opt = opt;
+	err = bt_gatt_subscribe(g_conn, &sub_params_long);
+	if (err < 0) {
+		TEST_FAIL("Failed to subscribe");
+	} else {
+		printk("Subscribe request sent\n");
+	}
+}
+
+static void gatt_unsubscribe_long(enum bt_att_chan_opt opt)
+{
+	int err;
+
+	UNSET_FLAG(flag_long_subscribed);
+	sub_params_long.value_handle = long_chrc_handle;
+	sub_params_long.chan_opt = opt;
+	err = bt_gatt_unsubscribe(g_conn, &sub_params_long);
+	if (err < 0) {
+		TEST_FAIL("Failed to unsubscribe");
+	} else {
+		printk("Unsubscribe request sent\n");
+	}
+}
+
+static void setup(void)
+{
+	int err;
+
+	err = bt_enable(NULL);
+	if (err != 0) {
+		TEST_FAIL("Bluetooth discover failed (err %d)", err);
+	}
+
+	err = bt_le_scan_start(BT_LE_SCAN_PASSIVE, device_found);
+	if (err != 0) {
+		TEST_FAIL("Scanning failed to start (err %d)", err);
+	}
+
+	printk("Scanning successfully started\n");
+
+	WAIT_FOR_FLAG(flag_is_connected);
+
+	err = bt_conn_set_security(g_conn, BT_SECURITY_L2);
+	if (err) {
+		TEST_FAIL("Starting encryption procedure failed (%d)", err);
+	}
+
+	WAIT_FOR_FLAG(flag_is_encrypted);
+
+	while (bt_eatt_count(g_conn) < CONFIG_BT_EATT_MAX) {
+		k_sleep(K_MSEC(10));
+	}
+
+	printk("EATT connected\n");
+}
+
+static void test_main_client(void)
+{
+	setup();
+
+	gatt_discover(BT_ATT_CHAN_OPT_ENHANCED_ONLY);
+	gatt_subscribe_long(BT_ATT_CHAN_OPT_ENHANCED_ONLY);
+	WAIT_FOR_FLAG(flag_long_subscribed);
+
+	printk("Subscribed\n");
+
+	while (num_notifications < NOTIFICATION_COUNT) {
+		k_sleep(K_MSEC(100));
+	}
+
+	gatt_unsubscribe_long(BT_ATT_CHAN_OPT_ENHANCED_ONLY);
+	WAIT_FOR_FLAG(flag_long_subscribed);
+
+	printk("Unsubscribed\n");
+
+	TEST_PASS("GATT client Passed");
+}
+
+static const struct bst_test_instance test_vcs[] = {
+	{
+		.test_id = "gatt_client_enhanced_notif_stress",
+		.test_main_f = test_main_client,
+	},
+	BSTEST_END_MARKER,
+};
+
+struct bst_test_list *test_gatt_client_install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, test_vcs);
+}
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/src/gatt_server_test.c b/tests/bsim/bluetooth/host/gatt/notify_stress/src/gatt_server_test.c
new file mode 100644
index 0000000000000..cde37821c3304
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/src/gatt_server_test.c
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stddef.h>
+#include <errno.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/types.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "common.h"
+
+extern enum bst_result_t bst_result;
+
+DEFINE_FLAG_STATIC(flag_is_connected);
+DEFINE_FLAG_STATIC(flag_subscribe);
+
+static struct bt_conn *g_conn;
+
+#define ARRAY_ITEM(i, _) i
+const uint8_t chrc_data[] = { LISTIFY(CHRC_SIZE, ARRAY_ITEM, (,)) }; /* 1, 2, 3 ... */
+
+static void connected(struct bt_conn *conn, uint8_t err)
+{
+	char addr[BT_ADDR_LE_STR_LEN];
+
+	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
+
+	if (err != 0) {
+		TEST_FAIL("Failed to connect to %s (%u)", addr, err);
+		return;
+	}
+
+	printk("Connected to %s\n", addr);
+
+	g_conn = bt_conn_ref(conn);
+	SET_FLAG(flag_is_connected);
+}
+
+static void disconnected(struct bt_conn *conn, uint8_t reason)
+{
+	char addr[BT_ADDR_LE_STR_LEN];
+
+	if (conn != g_conn) {
+		return;
+	}
+
+	bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
+
+	printk("Disconnected: %s (reason 0x%02x)\n", addr, reason);
+
+	bt_conn_unref(g_conn);
+
+	g_conn = NULL;
+	UNSET_FLAG(flag_is_connected);
+}
+
+BT_CONN_CB_DEFINE(conn_callbacks) = {
+	.connected = connected,
+	.disconnected = disconnected,
+};
+
+static ssize_t read_test_chrc(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf,
+				   uint16_t len, uint16_t offset)
+{
+	printk("Read char\n");
+	return bt_gatt_attr_read(conn, attr, buf, len, offset, (void *)chrc_data,
+				 sizeof(chrc_data));
+}
+
+static void subscribe(const struct bt_gatt_attr *attr, uint16_t value)
+{
+	const bool notif_enabled = (value == BT_GATT_CCC_NOTIFY);
+
+	if (notif_enabled) {
+		SET_FLAG(flag_subscribe);
+	}
+
+	printk("Notifications %s\n", notif_enabled ? "enabled" : "disabled");
+}
+
+BT_GATT_SERVICE_DEFINE(test_svc, BT_GATT_PRIMARY_SERVICE(TEST_SERVICE_UUID),
+		       BT_GATT_CHARACTERISTIC(TEST_CHRC_UUID,
+					      BT_GATT_CHRC_NOTIFY | BT_GATT_CHRC_READ,
+					      BT_GATT_PERM_READ, read_test_chrc, NULL, NULL),
+		       BT_GATT_CCC(subscribe, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE));
+
+static volatile size_t num_notifications_sent;
+
+static void notification_sent(struct bt_conn *conn, void *user_data)
+{
+	size_t *length = user_data;
+
+	printk("Sent notification #%u with length %d\n", num_notifications_sent++, *length);
+}
+
+static void notify(void)
+{
+	static size_t length = CHRC_SIZE;
+	static struct bt_gatt_notify_params params = {
+		.attr = &attr_test_svc[1],
+		.data = chrc_data,
+		.len = CHRC_SIZE,
+		.func = notification_sent,
+		.user_data = &length,
+		.uuid = NULL,
+		.chan_opt = BT_ATT_CHAN_OPT_ENHANCED_ONLY,
+	};
+	int err;
+
+	do {
+		err = bt_gatt_notify_cb(g_conn, &params);
+
+		if (err == -ENOMEM) {
+			/* The delay is needed to schedule other threads, but keep it as short as
+			 * possible.
+			 */
+			k_sleep(K_MSEC(1));
+		} else if (err) {
+			TEST_FAIL("Notify failed (err %d)", err);
+		}
+	} while (err);
+}
+
+static void setup(void)
+{
+	int err;
+	const struct bt_data ad[] = {
+		BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
+	};
+
+	err = bt_enable(NULL);
+	if (err != 0) {
+		TEST_FAIL("Bluetooth init failed (err %d)", err);
+		return;
+	}
+
+	printk("Bluetooth initialized\n");
+
+	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, ad, ARRAY_SIZE(ad), NULL, 0);
+	if (err != 0) {
+		TEST_FAIL("Advertising failed to start (err %d)", err);
+		return;
+	}
+
+	printk("Advertising successfully started\n");
+
+	WAIT_FOR_FLAG(flag_is_connected);
+
+	while (bt_eatt_count(g_conn) < CONFIG_BT_EATT_MAX) {
+		k_sleep(K_MSEC(100));
+	}
+	printk("EATT connected\n");
+
+	WAIT_FOR_FLAG(flag_subscribe);
+}
+
+static void test_main_server(void)
+{
+	setup();
+
+	for (int i = 0; i < NOTIFICATION_COUNT; i++) {
+		notify();
+	}
+
+	while (num_notifications_sent < NOTIFICATION_COUNT) {
+		k_sleep(K_MSEC(100));
+	}
+
+	TEST_PASS("GATT server passed");
+}
+
+static const struct bst_test_instance test_gatt_server[] = {
+	{
+		.test_id = "gatt_server_enhanced_notif_stress",
+		.test_main_f = test_main_server,
+	},
+	BSTEST_END_MARKER,
+};
+
+struct bst_test_list *test_gatt_server_install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, test_gatt_server);
+}
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/src/main.c b/tests/bsim/bluetooth/host/gatt/notify_stress/src/main.c
new file mode 100644
index 0000000000000..14ee71fd4d24a
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/src/main.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "bstests.h"
+
+extern struct bst_test_list *test_gatt_server_install(struct bst_test_list *tests);
+extern struct bst_test_list *test_gatt_client_install(struct bst_test_list *tests);
+
+bst_test_install_t test_installers[] = {
+	test_gatt_server_install,
+	test_gatt_client_install,
+	NULL
+};
+
+int main(void)
+{
+	bst_main();
+	return 0;
+}
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/sysbuild.cmake b/tests/bsim/bluetooth/host/gatt/notify_stress/sysbuild.cmake
new file mode 100644
index 0000000000000..2ef52ac6f6120
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/sysbuild.cmake
@@ -0,0 +1,19 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
+	set(NET_APP hci_ipc)
+	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
+
+	ExternalZephyrProject_Add(
+		APPLICATION ${NET_APP}
+		SOURCE_DIR  ${NET_APP_SRC_DIR}
+		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
+	)
+
+	set(${NET_APP}_CONF_FILE ${APP_DIR}/nrf5340_cpunet-bt_ll_sw_split.conf CACHE INTERNAL "")
+
+	native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP})
+	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
+endif()
+native_simulator_set_final_executable(${DEFAULT_IMAGE})
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/gatt/notify_stress/test_scripts/run_test.sh
new file mode 100755
index 0000000000000..489bea278afd6
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/test_scripts/run_test.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Test purpose:
+#
+# Verify that the Central can receive 30 notifications from the Peripheral over all available EATT
+# channels.
+#
+# Note: The number of notifications and the size of the characteristic are chosen empirically.
+#
+# This test is designed to stress HCI driver to guarantee that no data is dropped between Host and
+# Controller. Specifically, the HCI IPC driver that tends to drop data when the Host is not able to
+# process it fast enough. The test is guaranteed to fail with Controller to Host HCI data flow
+# control being disabled.
+#
+# Test Setup:
+#
+# - Devices: Central and Peripheral
+# - Characteristic Length: Peripheral exposes a long characteristic (greater than 23 bytes).
+# - Connection: Central connects to Peripheral.
+# - Notification subscription: Central subscribes to notificaitons from the Peripheral.
+# - EATT Usage: EATT is enabled, and the maximum possible EATT channels are established to
+#   parallelize notifications as much as possible, increasing traffic towards Central.
+#
+# Test Steps:
+#
+# 1. The Peripheral sends 30 notifications to the Central over all available EATT channels.
+# 2. Upon receiving a notification, the Central holds the received notification callback for 1
+#    second before releasing it.
+# 3. The test passes if all 30 notifications are successfully sent by the Peripheral and received
+#    by the Central.
+
+set -eu
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+EXECUTE_TIMEOUT=150
+
+verbosity_level=2
+simulation_id="gatt_notify_enhanced_stress"
+server_id="gatt_server_enhanced_notif_stress"
+client_id="gatt_client_enhanced_notif_stress"
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_stress_prj_conf \
+    -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -RealEncryption=1
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_stress_prj_conf \
+    -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} -RealEncryption=1
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} -D=2 -sim_length=70e6 $@
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/host/gatt/notify_stress/testcase.yaml b/tests/bsim/bluetooth/host/gatt/notify_stress/testcase.yaml
new file mode 100644
index 0000000000000..ead6f5effdd89
--- /dev/null
+++ b/tests/bsim/bluetooth/host/gatt/notify_stress/testcase.yaml
@@ -0,0 +1,12 @@
+tests:
+  bluetooth.host.gatt.notify_stress:
+    build_only: true
+    sysbuild: true
+    tags:
+      - bluetooth
+    platform_allow:
+      - nrf52_bsim/native
+      - nrf5340bsim/nrf5340/cpuapp
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_host_gatt_notify_stress_prj_conf
diff --git a/tests/bsim/bluetooth/host/iso/bis/prj.conf b/tests/bsim/bluetooth/host/iso/bis/prj.conf
index 15eed7dd67617..3a75725289378 100644
--- a/tests/bsim/bluetooth/host/iso/bis/prj.conf
+++ b/tests/bsim/bluetooth/host/iso/bis/prj.conf
@@ -23,6 +23,7 @@ CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
 CONFIG_BT_CTLR_SYNC_ISO=y
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=4
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=208
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=200
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=4
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 CONFIG_BT_CTLR_ISOAL_SINKS=4
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c b/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
index d18bc30505316..cabb51697be98 100644
--- a/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
+++ b/tests/bsim/bluetooth/host/iso/bis/src/bis_broadcaster.c
@@ -1,15 +1,29 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor
+ * Copyright (c) 2024-2025 Nordic Semiconductor
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys_clock.h>
 
 #include "babblekit/flags.h"
 #include "babblekit/sync.h"
 #include "babblekit/testcase.h"
+#include "bstests.h"
 
 LOG_MODULE_REGISTER(bis_broadcaster, LOG_LEVEL_INF);
 
@@ -86,6 +100,12 @@ static void send_data_cb(struct k_work *work)
 
 static void iso_connected_cb(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	LOG_INF("ISO Channel %p connected", chan);
 
 	if (chan == default_chan) {
@@ -93,6 +113,9 @@ static void iso_connected_cb(struct bt_iso_chan *chan)
 
 		SET_FLAG(flag_iso_connected);
 	}
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+	TEST_ASSERT(err == 0, "Failed to set ISO data path: %d", err);
 }
 
 static void iso_disconnected_cb(struct bt_iso_chan *chan, uint8_t reason)
@@ -127,7 +150,6 @@ static void init(void)
 		.sdu = CONFIG_BT_ISO_TX_MTU,
 		.phy = BT_GAP_LE_PHY_2M,
 		.rtn = 1,
-		.path = NULL,
 	};
 	static struct bt_iso_chan_qos iso_qos = {
 		.tx = &iso_tx,
diff --git a/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c b/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
index 5f80abdd1c1d5..aea23723ff01d 100644
--- a/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
+++ b/tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor
+ * Copyright (c) 2024-2025 Nordic Semiconductor
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
@@ -82,9 +83,18 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	LOG_INF("ISO Channel %p connected", chan);
 
 	SET_FLAG(flag_iso_connected);
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+	TEST_ASSERT(err == 0, "Failed to setup ISO RX data path: %d\n", err);
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
diff --git a/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt b/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt
index a0328bc68707f..346345967c55f 100644
--- a/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt
+++ b/tests/bsim/bluetooth/host/iso/cis/CMakeLists.txt
@@ -3,7 +3,10 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(bsim_test_l2cap_send_on_connect)
+project(bsim_test_iso_cis)
+
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
 
 target_sources(app PRIVATE
   src/common.c
@@ -18,7 +21,6 @@ zephyr_include_directories(
   )
 
 add_subdirectory(${ZEPHYR_BASE}/tests/bluetooth/common/testlib testlib)
-add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
 
 target_link_libraries(app PRIVATE
   testlib
diff --git a/tests/bsim/bluetooth/host/iso/cis/prj.conf b/tests/bsim/bluetooth/host/iso/cis/prj.conf
index bfdeab2c4e835..4ad0a0fd319ae 100644
--- a/tests/bsim/bluetooth/host/iso/cis/prj.conf
+++ b/tests/bsim/bluetooth/host/iso/cis/prj.conf
@@ -21,6 +21,7 @@ CONFIG_BT_ISO_LOG_LEVEL_DBG=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=208
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=200
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=4
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
 CONFIG_BT_CTLR_ISOAL_SINKS=2
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c b/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
index f67afe3d39942..dc7d46100a9eb 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
+++ b/tests/bsim/bluetooth/host/iso/cis/src/cis_central.c
@@ -1,16 +1,30 @@
 /*
- * Copyright (c) 2023 Nordic Semiconductor
+ * Copyright (c) 2023-2025 Nordic Semiconductor
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "babblekit/testcase.h"
-#include "babblekit/flags.h"
-#include "common.h"
+#include <stddef.h>
+#include <stdint.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
+
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "bstests.h"
+#include "common.h"
 
 #define ENQUEUE_COUNT 2
 
@@ -104,6 +118,12 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	printk("ISO Channel %p connected\n", chan);
 
 	seq_num = 0U;
@@ -115,10 +135,15 @@ static void iso_connected(struct bt_iso_chan *chan)
 
 		SET_FLAG(flag_iso_connected);
 	}
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+	TEST_ASSERT(err == 0, "Failed to set ISO data path: %d", err);
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 {
+	int err;
+
 	printk("ISO Channel %p disconnected (reason 0x%02x)\n", chan, reason);
 
 	if (chan == default_chan) {
@@ -126,6 +151,9 @@ static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 
 		UNSET_FLAG(flag_iso_connected);
 	}
+
+	err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR);
+	TEST_ASSERT(err == 0, "Failed to remove ISO data path: %d", err);
 }
 
 static void sdu_sent_cb(struct bt_iso_chan *chan)
@@ -156,7 +184,6 @@ static void init(void)
 		.sdu = CONFIG_BT_ISO_TX_MTU,
 		.phy = BT_GAP_LE_PHY_2M,
 		.rtn = 1,
-		.path = NULL,
 	};
 	static struct bt_iso_chan_qos iso_qos = {
 		.tx = &iso_tx,
diff --git a/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c b/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
index ef0ede7b08171..96b8865c1f4ee 100644
--- a/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
+++ b/tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c
@@ -1,21 +1,31 @@
 /*
- * Copyright (c) 2023 Nordic Semiconductor
+ * Copyright (c) 2023-2025 Nordic Semiconductor
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <errno.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 
-#include "babblekit/testcase.h"
-#include "babblekit/flags.h"
-#include "common.h"
-
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
 #include <testlib/conn.h>
 
+#include "babblekit/testcase.h"
+#include "babblekit/flags.h"
+#include "bstests.h"
+#include "common.h"
+
 extern enum bst_result_t bst_result;
 
 DEFINE_FLAG_STATIC(flag_data_received);
@@ -74,7 +84,16 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
 	printk("ISO Channel %p connected\n", chan);
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+	TEST_ASSERT(err == 0, "Failed to set ISO data path: %d", err);
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
@@ -101,7 +120,6 @@ static void init(void)
 {
 	static struct bt_iso_chan_io_qos iso_rx = {
 		.sdu = CONFIG_BT_ISO_TX_MTU,
-		.path = NULL,
 	};
 	static struct bt_iso_server iso_server = {
 #if defined(CONFIG_BT_SMP)
diff --git a/tests/bsim/bluetooth/host/iso/frag/prj.conf b/tests/bsim/bluetooth/host/iso/frag/prj.conf
index 827ce27ea2cee..ef978548977ec 100644
--- a/tests/bsim/bluetooth/host/iso/frag/prj.conf
+++ b/tests/bsim/bluetooth/host/iso/frag/prj.conf
@@ -17,3 +17,4 @@ CONFIG_BT_ISO_LOG_LEVEL_DBG=y
 # Controller ISO configs
 CONFIG_BT_CTLR_ADV_ISO=y
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=20
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=12
diff --git a/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c b/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c
index cdc9d68aceeea..7688bb822d2c9 100644
--- a/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c
+++ b/tests/bsim/bluetooth/host/iso/frag/src/broadcaster.c
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor
+ * Copyright (c) 2024-2025 Nordic Semiconductor
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/iso.h>
@@ -58,6 +59,15 @@ static int send_data(struct bt_iso_chan *chan, bool ts)
 
 static void iso_connected_cb(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+	TEST_ASSERT(err == 0, "Unable to setup ISO TX path: %d", err);
+
 	LOG_INF("ISO Channel %p connected", chan);
 
 	SET_FLAG(iso_connected);
@@ -155,7 +165,6 @@ static void init(void)
 		.sdu = CONFIG_BT_ISO_TX_MTU,
 		.phy = BT_GAP_LE_PHY_2M,
 		.rtn = 1,
-		.path = NULL,
 	};
 	static struct bt_iso_chan_qos iso_qos = {
 		.tx = &iso_tx,
diff --git a/tests/bsim/bluetooth/host/iso/frag_2/prj.conf b/tests/bsim/bluetooth/host/iso/frag_2/prj.conf
index 4ae63917a5d2a..5a7c5e2d33eca 100644
--- a/tests/bsim/bluetooth/host/iso/frag_2/prj.conf
+++ b/tests/bsim/bluetooth/host/iso/frag_2/prj.conf
@@ -22,6 +22,7 @@ CONFIG_BT_ISO_RX_MTU=100
 # Controller ISO configs
 CONFIG_BT_CTLR_ADV_ISO=y
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=10
 
 # Controller Extended Advertising configs
diff --git a/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c b/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c
index c5491a5520fb4..1850adcdd11c5 100644
--- a/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c
+++ b/tests/bsim/bluetooth/host/iso/frag_2/src/broadcaster.c
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor
+ * Copyright (c) 2024-2025 Nordic Semiconductor
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/iso.h>
@@ -57,6 +58,15 @@ static int send_data(struct bt_iso_chan *chan)
 
 static void iso_connected_cb(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	int err;
+
+	err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+	TEST_ASSERT(err == 0, "Unable to setup ISO TX path: %d", err);
+
 	LOG_INF("ISO Channel %p connected", chan);
 
 	SET_FLAG(iso_connected);
@@ -152,7 +162,6 @@ static struct bt_iso_chan_io_qos iso_tx = {
 	.sdu = CONFIG_BT_ISO_TX_MTU,
 	.phy = BT_GAP_LE_PHY_2M,
 	.rtn = 1,
-	.path = NULL,
 };
 static struct bt_iso_chan_qos iso_qos = {
 	.tx = &iso_tx,
diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
index d913264f7003f..0ec3db7fd21d9 100644
--- a/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
+++ b/tests/bsim/bluetooth/host/l2cap/reassembly/dut/prj.conf
@@ -24,9 +24,28 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_AUTO_DATA_LEN_UPDATE=n
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
+# HCI Controller to Host data flow control across active connections
+CONFIG_BT_MAX_CONN=1
+
 # Since the test's purpose is to test for leaks in the ACL
 # RX buffer pool, it is a good idea to constrain said buffer
 # pool.
-CONFIG_BT_MAX_CONN=1
-CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4
-CONFIG_BT_BUF_EVT_RX_COUNT=6
+
+# Simultaneous connection receiving one Rx buffer each plus one additional for
+# L2CAP recombination, if any, across these active connections.
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
+
+# Minimum EVT Rx buffers permitting reception of events (Number of Completed Packets or
+# disconnection complete etc.) while ACL RX buffers are busy
+CONFIG_BT_BUF_EVT_RX_COUNT=4
+
+# Minimum ACL TX buffers to ensure continuous transmission without skipping connection intervals
+CONFIG_BT_BUF_ACL_TX_COUNT=3
+
+# Minimum HCI Command TX buffers
+CONFIG_BT_BUF_CMD_TX_COUNT=1
+
+# If we don't define this, it will inherit
+# CONFIG_BT_BUF_ACL_TX_COUNT and fail a build assert that
+# expects >= 3.
+CONFIG_BT_L2CAP_TX_BUF_COUNT=3
diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/peer/prj.conf b/tests/bsim/bluetooth/host/l2cap/reassembly/peer/prj.conf
index b9f5e34727bae..f3493edb4efc8 100644
--- a/tests/bsim/bluetooth/host/l2cap/reassembly/peer/prj.conf
+++ b/tests/bsim/bluetooth/host/l2cap/reassembly/peer/prj.conf
@@ -3,17 +3,18 @@ CONFIG_ASSERT=y
 
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
+
 CONFIG_BT_MAX_CONN=1
 
-CONFIG_BT_BUF_CMD_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_COUNT=20
+CONFIG_BT_BUF_EVT_RX_COUNT=21
 
-CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 
 # Allow whole L2CAP PDUs to fit on-air
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_ACL_RX_SIZE=251
+
 CONFIG_BT_DATA_LEN_UPDATE=y
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
diff --git a/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c b/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c
index dd9d0e77fb883..9311802658c28 100644
--- a/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c
+++ b/tests/bsim/bluetooth/host/l2cap/reassembly/peer/src/peer.c
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/hci_raw.h>
 #include <zephyr/bluetooth/hci_types.h>
 
+#include "common/hci_common_internal.h"
 #include "common/bt_str.h"
 
 #include "host/conn_internal.h"
@@ -45,7 +46,7 @@ DEFINE_FLAG(is_connected);
 static K_FIFO_DEFINE(rx_queue);
 
 #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT,
 			  CMD_BUF_SIZE, 8, NULL);
 
 #define MAX_CMD_COUNT 1
diff --git a/tests/bsim/bluetooth/host/l2cap/split/tester/prj.conf b/tests/bsim/bluetooth/host/l2cap/split/tester/prj.conf
index be8487976cc40..068f8c0c064e8 100644
--- a/tests/bsim/bluetooth/host/l2cap/split/tester/prj.conf
+++ b/tests/bsim/bluetooth/host/l2cap/split/tester/prj.conf
@@ -5,8 +5,6 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=1
 
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
diff --git a/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c b/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c
index af3467948bcf2..1f53f254adf7a 100644
--- a/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/l2cap/split/tester/src/main.c
@@ -16,6 +16,7 @@
 #include <zephyr/bluetooth/hci_raw.h>
 #include <zephyr/bluetooth/hci_types.h>
 
+#include "common/hci_common_internal.h"
 #include "common/bt_str.h"
 
 #include "host/conn_internal.h"
@@ -36,7 +37,7 @@ DEFINE_FLAG_STATIC(flag_data_length_updated);
 static K_FIFO_DEFINE(rx_queue);
 
 #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT,
 			  CMD_BUF_SIZE, 8, NULL);
 
 static K_SEM_DEFINE(cmd_sem, 1, 1);
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/tester/prj.conf b/tests/bsim/bluetooth/host/misc/disconnect/tester/prj.conf
index 5217040a11737..e8ba462aeea87 100644
--- a/tests/bsim/bluetooth/host/misc/disconnect/tester/prj.conf
+++ b/tests/bsim/bluetooth/host/misc/disconnect/tester/prj.conf
@@ -5,8 +5,6 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=1
 
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
diff --git a/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c b/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c
index 48923faa98057..64ef9676d0b08 100644
--- a/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/disconnect/tester/src/main.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/__assert.h>
 
@@ -16,6 +17,7 @@
 #include <zephyr/bluetooth/hci_raw.h>
 #include <zephyr/bluetooth/hci_types.h>
 
+#include "common/hci_common_internal.h"
 #include "common/bt_str.h"
 
 #include "host/conn_internal.h"
@@ -47,7 +49,7 @@ DEFINE_FLAG_STATIC(flag_data_length_updated);
 static K_FIFO_DEFINE(rx_queue);
 
 #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT,
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT,
 			  CMD_BUF_SIZE, 8, NULL);
 
 static K_SEM_DEFINE(cmd_sem, 1, 1);
@@ -190,8 +192,7 @@ static void handle_att_write(struct net_buf *buf)
 
 	static uint8_t ccc_write[2] = {0x03, 0x00};
 
-	TEST_ASSERT(buf->len == 2, "unexpected write length: %d", buf->len);
-	TEST_ASSERT(memcmp(buf->data, ccc_write, sizeof(ccc_write)) == 0, "bad data");
+	TEST_ASSERT(util_eq(buf->data, buf->len, ccc_write, sizeof(ccc_write)), "bad data\n");
 
 	send_write_rsp();
 }
diff --git a/tests/bsim/bluetooth/host/misc/hfc/Kconfig.sysbuild b/tests/bsim/bluetooth/host/misc/hfc/Kconfig.sysbuild
new file mode 100644
index 0000000000000..79d8f9919609c
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc/Kconfig.sysbuild
@@ -0,0 +1,14 @@
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config NET_CORE_BOARD
+	string
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
+
+config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
+	int
+	# Let's pass the test arguments to the application MCU test
+	# otherwise by default they would have gone to the net core.
+	default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
diff --git a/tests/bsim/bluetooth/host/misc/hfc/nrf5340_cpunet-bt_ll_sw_split.conf b/tests/bsim/bluetooth/host/misc/hfc/nrf5340_cpunet-bt_ll_sw_split.conf
new file mode 100644
index 0000000000000..8af16f7c1bb30
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc/nrf5340_cpunet-bt_ll_sw_split.conf
@@ -0,0 +1,21 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=4096
+CONFIG_CBPRINTF_REDUCED_INTEGRAL=y
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_MAX_CONN=1
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=4
+CONFIG_BT_BUF_ACL_TX_COUNT=3
diff --git a/tests/bsim/bluetooth/host/misc/hfc/prj.conf b/tests/bsim/bluetooth/host/misc/hfc/prj.conf
index ee7548781910c..d8854bb3c6926 100644
--- a/tests/bsim/bluetooth/host/misc/hfc/prj.conf
+++ b/tests/bsim/bluetooth/host/misc/hfc/prj.conf
@@ -16,7 +16,23 @@ CONFIG_ASSERT=y
 CONFIG_BT_TESTING=y
 CONFIG_LOG=y
 
-CONFIG_BT_MAX_CONN=3
+# HCI Controller to Host data flow control across active connections
+CONFIG_BT_MAX_CONN=1
+
+# Simultaneous connection receiving one Rx buffer each plus one additional for
+# L2CAP recombination, if any, across these active connections.
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
+
+# Minimum EVT Rx buffers permitting reception of events (Number of Completed Packets or
+# disconnection complete etc.) while ACL RX buffers are busy
+CONFIG_BT_BUF_EVT_RX_COUNT=4
+
+# Minimum ACL TX buffers to ensure continuous transmission without skipping connection intervals
+CONFIG_BT_BUF_ACL_TX_COUNT=3
+
+# Minimum HCI Command TX buffers
+CONFIG_BT_BUF_CMD_TX_COUNT=1
+
 CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
 # CONFIG_BT_CONN_LOG_LEVEL_DBG=y
 
diff --git a/tests/bsim/bluetooth/host/misc/hfc/src/main.c b/tests/bsim/bluetooth/host/misc/hfc/src/main.c
index 1cb5f32091b47..47ce23dbcf4c8 100644
--- a/tests/bsim/bluetooth/host/misc/hfc/src/main.c
+++ b/tests/bsim/bluetooth/host/misc/hfc/src/main.c
@@ -376,10 +376,11 @@ static void entrypoint_peer(void)
 
 	tx = 0;
 	while (true) {
+		UNSET_FLAG(is_subscribed);
+
 		conn = connect_as_peripheral();
 
 		LOG_INF("wait until DUT subscribes");
-		UNSET_FLAG(is_subscribed);
 		WAIT_FOR_FLAG(is_subscribed);
 
 		LOG_INF("send notifications");
diff --git a/tests/bsim/bluetooth/host/misc/hfc/sysbuild.cmake b/tests/bsim/bluetooth/host/misc/hfc/sysbuild.cmake
new file mode 100644
index 0000000000000..38b24316936a6
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc/sysbuild.cmake
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
+	set(NET_APP hci_ipc)
+	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
+
+	ExternalZephyrProject_Add(
+		APPLICATION ${NET_APP}
+		SOURCE_DIR  ${NET_APP_SRC_DIR}
+		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
+	)
+
+	set(${NET_APP}_CONF_FILE ${APP_DIR}/nrf5340_cpunet-bt_ll_sw_split.conf CACHE INTERNAL "")
+
+	native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP})
+	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
+endif()
+
+native_simulator_set_final_executable(${DEFAULT_IMAGE})
diff --git a/tests/bsim/bluetooth/host/misc/hfc/testcase.yaml b/tests/bsim/bluetooth/host/misc/hfc/testcase.yaml
index b8d24f8d18f26..b584f78ef24a7 100644
--- a/tests/bsim/bluetooth/host/misc/hfc/testcase.yaml
+++ b/tests/bsim/bluetooth/host/misc/hfc/testcase.yaml
@@ -1,10 +1,12 @@
 tests:
   bluetooth.host.mics.hfc:
     build_only: true
+    sysbuild: true
     tags:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
+      - nrf5340bsim/nrf5340/cpuapp
     harness: bsim
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_host_misc_hfc_prj_conf
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/Kconfig.sysbuild b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/Kconfig.sysbuild
new file mode 100644
index 0000000000000..79d8f9919609c
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/Kconfig.sysbuild
@@ -0,0 +1,14 @@
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config NET_CORE_BOARD
+	string
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
+
+config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
+	int
+	# Let's pass the test arguments to the application MCU test
+	# otherwise by default they would have gone to the net core.
+	default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/nrf5340_cpunet-bt_ll_sw_split.conf b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/nrf5340_cpunet-bt_ll_sw_split.conf
new file mode 100644
index 0000000000000..5f45c3c885674
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/nrf5340_cpunet-bt_ll_sw_split.conf
@@ -0,0 +1,24 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_CBPRINTF_REDUCED_INTEGRAL=y
+
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
+CONFIG_LTO=y
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_MAX_CONN=3
+
+# Host features
+CONFIG_BT_EXT_ADV=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/sysbuild.cmake b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/sysbuild.cmake
new file mode 100644
index 0000000000000..38b24316936a6
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/sysbuild.cmake
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
+	set(NET_APP hci_ipc)
+	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
+
+	ExternalZephyrProject_Add(
+		APPLICATION ${NET_APP}
+		SOURCE_DIR  ${NET_APP_SRC_DIR}
+		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
+	)
+
+	set(${NET_APP}_CONF_FILE ${APP_DIR}/nrf5340_cpunet-bt_ll_sw_split.conf CACHE INTERNAL "")
+
+	native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP})
+	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
+endif()
+
+native_simulator_set_final_executable(${DEFAULT_IMAGE})
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/testcase.yaml b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/testcase.yaml
index 2cb24db1258aa..2cefbebb87b4d 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/testcase.yaml
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/dut/testcase.yaml
@@ -1,10 +1,12 @@
 tests:
   bluetooth.host.misc.hfc_multilink.dut:
     build_only: true
+    sysbuild: true
     tags:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
+      - nrf5340bsim/nrf5340/cpuapp
     harness: bsim
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_host_misc_hfc_multilink_dut_prj_conf
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/Kconfig.sysbuild b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/Kconfig.sysbuild
new file mode 100644
index 0000000000000..79d8f9919609c
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/Kconfig.sysbuild
@@ -0,0 +1,14 @@
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config NET_CORE_BOARD
+	string
+	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
+
+config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
+	int
+	# Let's pass the test arguments to the application MCU test
+	# otherwise by default they would have gone to the net core.
+	default 0 if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/nrf5340_cpunet-bt_ll_sw_split.conf b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/nrf5340_cpunet-bt_ll_sw_split.conf
new file mode 100644
index 0000000000000..6f0462852d5eb
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/nrf5340_cpunet-bt_ll_sw_split.conf
@@ -0,0 +1,28 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_CBPRINTF_REDUCED_INTEGRAL=y
+
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
+CONFIG_LTO=y
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_MAX_CONN=1
+
+# Host features
+CONFIG_BT_EXT_ADV=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/prj.conf b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/prj.conf
index a4d8875e92cbd..44e2b46cb1de1 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/prj.conf
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/prj.conf
@@ -5,8 +5,6 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=1
 
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/src/tester.c b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/src/tester.c
index b5054cfdc3f00..9e7f4c19d005c 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/src/tester.c
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/src/tester.c
@@ -17,6 +17,7 @@
 #include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/gap.h>
 
+#include "common/hci_common_internal.h"
 #include "common/bt_str.h"
 
 #include "host/conn_internal.h"
@@ -38,7 +39,7 @@ DEFINE_FLAG(flag_l2cap_connected);
 static K_FIFO_DEFINE(rx_queue);
 
 #define CMD_BUF_SIZE MAX(BT_BUF_EVT_RX_SIZE, BT_BUF_CMD_TX_SIZE)
-NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, CONFIG_BT_BUF_CMD_TX_COUNT, CMD_BUF_SIZE, 8, NULL);
+NET_BUF_POOL_FIXED_DEFINE(hci_cmd_pool, BT_BUF_CMD_TX_COUNT, CMD_BUF_SIZE, 8, NULL);
 
 static K_SEM_DEFINE(cmd_sem, 1, 1);
 static struct k_sem acl_pkts;
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/sysbuild.cmake b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/sysbuild.cmake
new file mode 100644
index 0000000000000..38b24316936a6
--- /dev/null
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/sysbuild.cmake
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
+	set(NET_APP hci_ipc)
+	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
+
+	ExternalZephyrProject_Add(
+		APPLICATION ${NET_APP}
+		SOURCE_DIR  ${NET_APP_SRC_DIR}
+		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
+	)
+
+	set(${NET_APP}_CONF_FILE ${APP_DIR}/nrf5340_cpunet-bt_ll_sw_split.conf CACHE INTERNAL "")
+
+	native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP})
+	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
+endif()
+
+native_simulator_set_final_executable(${DEFAULT_IMAGE})
diff --git a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/testcase.yaml b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/testcase.yaml
index b9dd7b87913e3..a62076ecfdc8b 100644
--- a/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/testcase.yaml
+++ b/tests/bsim/bluetooth/host/misc/hfc_multilink/tester/testcase.yaml
@@ -1,10 +1,12 @@
 tests:
   bluetooth.host.misc.hfc_multilink.tester:
     build_only: true
+    sysbuild: true
     tags:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
+      - nrf5340bsim/nrf5340/cpuapp
     harness: bsim
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_host_misc_hfc_multilink_tester_prj_conf
diff --git a/tests/bsim/bluetooth/ll/bis/Kconfig b/tests/bsim/bluetooth/ll/bis/Kconfig
index 3e7fd07e43055..4d5df8144f559 100644
--- a/tests/bsim/bluetooth/ll/bis/Kconfig
+++ b/tests/bsim/bluetooth/ll/bis/Kconfig
@@ -1,4 +1,4 @@
-# Copyright 2024 Nordic Semiconductor ASA
+# Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
 config TEST_LL_INTERFACE
@@ -6,6 +6,13 @@ config TEST_LL_INTERFACE
 	help
 	  Test Broadcast ISO using internal LL interface.
 
+config TEST_ISO_PACKING_INTERLEAVED
+	bool "Test ISO interleaved packing"
+	help
+	  Test ISO interleaved packing. Note, this tests with single BIS to
+	  ensure that using sequential or interleaved packing to create the BIS
+	  still is valid when creating single BIS in a BIG.
+
 menu "Zephyr Kernel"
 source "Kconfig.zephyr"
 endmenu
diff --git a/tests/bsim/bluetooth/ll/bis/overlay-interleaved.conf b/tests/bsim/bluetooth/ll/bis/overlay-interleaved.conf
new file mode 100644
index 0000000000000..f0856d67fce96
--- /dev/null
+++ b/tests/bsim/bluetooth/ll/bis/overlay-interleaved.conf
@@ -0,0 +1,2 @@
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
+CONFIG_TEST_ISO_PACKING_INTERLEAVED=y
diff --git a/tests/bsim/bluetooth/ll/bis/overlay-sequential.conf b/tests/bsim/bluetooth/ll/bis/overlay-sequential.conf
new file mode 100644
index 0000000000000..a301763277ac2
--- /dev/null
+++ b/tests/bsim/bluetooth/ll/bis/overlay-sequential.conf
@@ -0,0 +1 @@
+CONFIG_TEST_ISO_PACKING_INTERLEAVED=n
diff --git a/tests/bsim/bluetooth/ll/bis/prj.conf b/tests/bsim/bluetooth/ll/bis/prj.conf
index 48d07dfc695b7..21239521a5643 100644
--- a/tests/bsim/bluetooth/ll/bis/prj.conf
+++ b/tests/bsim/bluetooth/ll/bis/prj.conf
@@ -17,6 +17,7 @@ CONFIG_BT_CTLR_SYNC_ISO=y
 
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=2
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=247
 CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251
 
diff --git a/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf b/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf
index 4bf1977799384..59bb4623195b3 100644
--- a/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf
+++ b/tests/bsim/bluetooth/ll/bis/prj_vs_dp.conf
@@ -16,6 +16,7 @@ CONFIG_BT_CTLR_ADV_ISO=y
 CONFIG_BT_CTLR_SYNC_ISO=y
 
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251
 
diff --git a/tests/bsim/bluetooth/ll/bis/src/test_bis.c b/tests/bsim/bluetooth/ll/bis/src/test_bis.c
index 3b2b1a001c25c..97c44e78e5359 100644
--- a/tests/bsim/bluetooth/ll/bis/src/test_bis.c
+++ b/tests/bsim/bluetooth/ll/bis/src/test_bis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Nordic Semiconductor ASA
+ * Copyright (c) 2020-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,6 +12,7 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 
 #include "subsys/bluetooth/host/hci_core.h"
@@ -71,14 +72,12 @@ static struct bt_iso_chan_ops iso_ops = {
 	.recv		= iso_recv,
 };
 
-static struct bt_iso_chan_path iso_path_rx = {
-	.pid = BT_HCI_DATAPATH_ID_HCI
-};
-
 static struct bt_iso_chan_qos bis_iso_qos;
 static struct bt_iso_chan_io_qos iso_tx_qos;
-static struct bt_iso_chan_io_qos iso_rx_qos = {
-	.path = &iso_path_rx
+static struct bt_iso_chan_io_qos iso_rx_qos;
+static struct bt_iso_chan_path hci_path = {
+	.pid = BT_HCI_DATAPATH_ID_HCI,
+	.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
 };
 
 static struct bt_iso_chan bis_iso_chan = {
@@ -149,7 +148,14 @@ bool ll_data_path_sink_create(uint16_t handle, struct ll_iso_datapath *datapath,
 }
 #endif /* CONFIG_BT_CTLR_ISO_VENDOR_DATA_PATH */
 
-#define BUF_ALLOC_TIMEOUT_MS (30) /* milliseconds */
+/* Have timeout unit sufficient to wait for all enqueued SDU to be transmitted.
+ * We retry allocation by yielding out of the system work queue to mitigate
+ * deadlock.
+ */
+#define BUF_ALLOC_TIMEOUT_MS       (10)   /* milliseconds */
+#define BUF_ALLOC_RETRY_TIMEOUT_US (1000) /* microseconds */
+#define BUF_ALLOC_RETRY_COUNT      (10U)
+
 NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_ISO_TX_BUF_COUNT,
 			  BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
 			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
@@ -162,6 +168,7 @@ static void iso_send(struct k_work *work)
 {
 	static uint8_t iso_data[CONFIG_BT_ISO_TX_MTU];
 	static bool data_initialized;
+	static uint8_t retry_yield_wq;
 	struct net_buf *buf;
 	size_t iso_data_len;
 	int ret;
@@ -176,10 +183,22 @@ static void iso_send(struct k_work *work)
 
 	buf = net_buf_alloc(&tx_pool, K_MSEC(BUF_ALLOC_TIMEOUT_MS));
 	if (!buf) {
-		FAIL("Data buffer allocate timeout on channel\n");
+		/* Blocking in system work qeueue causes deadlock, hence yield
+		 * and try getting the buffer again.
+		 */
+		if (retry_yield_wq) {
+			retry_yield_wq--;
+
+			k_work_schedule(&iso_send_work, K_USEC(BUF_ALLOC_RETRY_TIMEOUT_US));
+		} else {
+			FAIL("Data buffer allocate timeout on channel\n");
+		}
+
 		return;
 	}
 
+	retry_yield_wq = BUF_ALLOC_RETRY_COUNT;
+
 	net_buf_reserve(buf, BT_ISO_CHAN_SEND_RESERVE);
 	sys_put_le16(seq_num, iso_data);
 	iso_data_len = MAX(sizeof(seq_num), ((seq_num % CONFIG_BT_ISO_TX_MTU) + 1));
@@ -193,7 +212,17 @@ static void iso_send(struct k_work *work)
 		return;
 	}
 
-	k_work_schedule(&iso_send_work, K_USEC(9970));
+	/* Ideally we can wait 10 ms to enqueue next SDU, but to mitigate clock
+	 * drift between OS clock and Bluetooth Sleep Clock, lets send/enqueue
+	 * early towards the Controller so that the SDU is not considered stale
+	 * by the Controller.
+	 *
+	 * As we use `net_buf_alloc()` which will indirectly wait for Number of
+	 * Completed Packet event processing in the Host leading to availability
+	 * of next buffer, sending early will eventually get sync-ed with the
+	 * interval at which the Controller is sending the SDU on-air.
+	 */
+	k_work_schedule(&iso_send_work, K_USEC(9900));
 }
 #endif /* !CONFIG_TEST_LL_INTERFACE */
 
@@ -319,7 +348,9 @@ static void create_big(struct bt_le_ext_adv *adv, struct bt_iso_big **big)
 	big_create_param.encryption = false;
 	big_create_param.interval = 10000; /* us */
 	big_create_param.latency = 10; /* milliseconds */
-	big_create_param.packing = 0; /* 0 - sequential; 1 - interleaved */
+	big_create_param.packing = (IS_ENABLED(CONFIG_TEST_ISO_PACKING_INTERLEAVED) ?
+				    BT_ISO_PACKING_INTERLEAVED :
+				    BT_ISO_PACKING_SEQUENTIAL);
 	big_create_param.framing = 0; /* 0 - unframed; 1 - framed */
 	iso_tx_qos.sdu = CONFIG_BT_ISO_TX_MTU; /* bytes */
 	iso_tx_qos.rtn = 2;
@@ -579,10 +610,34 @@ static void iso_recv(struct bt_iso_chan *chan,
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	struct bt_iso_info iso_info;
+	int err;
+
 	printk("ISO Channel %p connected\n", chan);
 
 	seq_num = 0U;
 	is_iso_connected = true;
+
+	err = bt_iso_chan_get_info(chan, &iso_info);
+	if (err != 0) {
+		FAIL("Failed to get ISO info: %d\n", err);
+	} else {
+		if (iso_info.can_recv) {
+			err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST,
+						     &hci_path);
+			if (err != 0) {
+				FAIL("Failed to setup ISO RX data path: %d\n", err);
+			}
+		}
+
+		if (iso_info.can_send) {
+			err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR,
+						     &hci_path);
+			if (err != 0) {
+				FAIL("Failed to setup ISO TX data path: %d\n", err);
+			}
+		}
+	}
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
@@ -846,6 +901,7 @@ static void test_iso_recv_main(void)
 	k_sleep(K_MSEC(5000));
 
 	printk("Terminating BIG Sync...");
+
 	struct node_rx_pdu *node_rx = NULL;
 
 	err = ll_big_sync_terminate(big_handle, (void **)&node_rx);
@@ -908,7 +964,7 @@ static void test_iso_recv_main(void)
 	big_param.mse = 1;
 	big_param.sync_timeout = 100; /* 1000 ms */
 	big_param.encryption = false;
-	iso_path_rx.pid = BT_HCI_DATAPATH_ID_HCI;
+	hci_path.pid = BT_HCI_DATAPATH_ID_HCI;
 	memset(big_param.bcode, 0, sizeof(big_param.bcode));
 	err = bt_iso_big_sync(sync, &big_param, &big);
 	if (err) {
@@ -1128,7 +1184,7 @@ static void test_iso_recv_vs_dp_main(void)
 	is_iso_connected = false;
 	is_iso_disconnected = 0U;
 	is_iso_vs_emitted = false;
-	iso_path_rx.pid = BT_HCI_DATAPATH_ID_VS;
+	hci_path.pid = BT_HCI_DATAPATH_ID_VS;
 
 	err = bt_iso_big_sync(sync, &big_param, &big);
 	if (err) {
diff --git a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh
deleted file mode 100755
index 97f8f4636c68d..0000000000000
--- a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2020 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
-
-# Basic ISO broadcast test: a broadcaster transmits a BIS and a receiver listens
-# to the BIS.
-simulation_id="broadcast_iso"
-verbosity_level=2
-EXECUTE_TIMEOUT=120
-
-cd ${BSIM_OUT_PATH}/bin
-
-Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=receive
-
-Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=broadcast
-
-Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=30e6 $@
-
-wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_interleaved.sh b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_interleaved.sh
new file mode 100755
index 0000000000000..23acb10590236
--- /dev/null
+++ b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_interleaved.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Copyright 2020-2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+# Basic ISO broadcast test: a broadcaster transmits a BIS and a receiver listens
+# to the BIS.
+simulation_id="broadcast_iso_interleaved"
+verbosity_level=2
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf_overlay-interleaved_conf \
+  -v=${verbosity_level} -s=${simulation_id} -RealEncryption=1 -d=0 -testid=receive
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf_overlay-interleaved_conf \
+  -v=${verbosity_level} -s=${simulation_id} -RealEncryption=1 -d=1 -testid=broadcast
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
+  -D=2 -sim_length=30e6 $@
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_sequential.sh b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_sequential.sh
new file mode 100755
index 0000000000000..82ddcd9392b71
--- /dev/null
+++ b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_sequential.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Copyright 2020 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+# Basic ISO broadcast test: a broadcaster transmits a BIS and a receiver listens
+# to the BIS.
+simulation_id="broadcast_iso_sequential"
+verbosity_level=2
+EXECUTE_TIMEOUT=120
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf_overlay-sequential_conf \
+  -v=${verbosity_level} -s=${simulation_id} -RealEncryption=1 -d=0 -testid=receive
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf_overlay-sequential_conf \
+  -v=${verbosity_level} -s=${simulation_id} -RealEncryption=1 -d=1 -testid=broadcast
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
+  -D=2 -sim_length=30e6 $@
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_vs_dp.sh b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_vs_dp.sh
index e0c4ab5e1b324..92b32a555624e 100755
--- a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_vs_dp.sh
+++ b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_vs_dp.sh
@@ -12,10 +12,10 @@ verbosity_level=2
 cd ${BSIM_OUT_PATH}/bin
 
 Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_vs_dp_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=receive_vs_dp
+  -v=${verbosity_level} -s=${simulation_id} -RealEncryption=1 -d=0 -testid=receive_vs_dp
 
-Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf \
-  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=broadcast
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf_overlay-sequential_conf \
+  -v=${verbosity_level} -s=${simulation_id} -RealEncryption=1 -d=1 -testid=broadcast
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
   -D=2 -sim_length=30e6 $@
diff --git a/tests/bsim/bluetooth/ll/cis/prj.conf b/tests/bsim/bluetooth/ll/cis/prj.conf
index ebc9296a650be..7d703c9481dc7 100644
--- a/tests/bsim/bluetooth/ll/cis/prj.conf
+++ b/tests/bsim/bluetooth/ll/cis/prj.conf
@@ -30,7 +30,6 @@ CONFIG_LOG=y
 CONFIG_BT_LL_SW_SPLIT=y
 CONFIG_BT_CTLR_CENTRAL_ISO=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=9
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=9
@@ -39,6 +38,7 @@ CONFIG_BT_CTLR_ISOAL_SINKS=9
 
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=18
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_ISO_RX_BUFFERS=1
 
 CONFIG_BT_CTLR_PHY_CODED=n
diff --git a/tests/bsim/bluetooth/ll/cis/src/main.c b/tests/bsim/bluetooth/ll/cis/src/main.c
index a3a8b0c91697c..d835052be5fc7 100644
--- a/tests/bsim/bluetooth/ll/cis/src/main.c
+++ b/tests/bsim/bluetooth/ll/cis/src/main.c
@@ -1,7 +1,7 @@
 /* main.c - Application main entry point */
 
 /*
- * Copyright (c) 2023 Nordic Semiconductor ASA
+ * Copyright (c) 2023-2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -13,6 +13,7 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci_types.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/util.h>
@@ -312,16 +313,65 @@ void iso_sent(struct bt_iso_chan *chan)
 
 static void iso_connected(struct bt_iso_chan *chan)
 {
+	const struct bt_iso_chan_path hci_path = {
+		.pid = BT_ISO_DATA_PATH_HCI,
+		.format = BT_HCI_CODING_FORMAT_TRANSPARENT,
+	};
+	struct bt_iso_info iso_info;
+	int err;
+
+	err = bt_iso_chan_get_info(chan, &iso_info);
+	if (err != 0) {
+		FAIL("Failed to get ISO info: %d\n", err);
+		return;
+	}
+
 	printk("ISO Channel %p connected\n", chan);
 
 	k_sem_give(&sem_iso_conn);
+
+	if (iso_info.can_recv) {
+		err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path);
+		if (err != 0) {
+			FAIL("Failed to setup ISO RX data path: %d\n", err);
+		}
+	}
+
+	if (iso_info.can_send) {
+		err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path);
+		if (err != 0) {
+			FAIL("Failed to setup ISO TX data path: %d\n", err);
+		}
+	}
 }
 
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 {
+	struct bt_iso_info iso_info;
+	int err;
+
 	printk("ISO Channel %p disconnected (reason 0x%02x)\n", chan, reason);
 
 	k_sem_give(&sem_iso_disc);
+
+	err = bt_iso_chan_get_info(chan, &iso_info);
+	if (err != 0) {
+		FAIL("Failed to get ISO info: %d\n", err);
+	} else if (iso_info.type == BT_ISO_CHAN_TYPE_CENTRAL) {
+		if (iso_info.can_recv) {
+			err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST);
+			if (err != 0) {
+				FAIL("Failed to remove ISO RX data path: %d\n", err);
+			}
+		}
+
+		if (iso_info.can_send) {
+			err = bt_iso_remove_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR);
+			if (err != 0) {
+				FAIL("Failed to remove ISO TX data path: %d\n", err);
+			}
+		}
+	}
 }
 
 static struct bt_iso_chan_ops iso_ops = {
@@ -358,7 +408,6 @@ static void test_cis_central(void)
 	for (int i = 0; i < CONFIG_BT_ISO_MAX_CHAN; i++) {
 		iso_tx[i].sdu = CONFIG_BT_ISO_TX_MTU;
 		iso_tx[i].phy = BT_GAP_LE_PHY_2M;
-		iso_tx[i].path = NULL;
 		if (IS_ENABLED(CONFIG_TEST_FT_SKIP_SUBEVENTS)) {
 			iso_tx[i].rtn = 2U;
 		} else {
@@ -374,7 +423,6 @@ static void test_cis_central(void)
 
 		iso_rx[i].sdu = CONFIG_BT_ISO_RX_MTU;
 		iso_rx[i].phy = BT_GAP_LE_PHY_2M;
-		iso_rx[i].path = NULL;
 		if (IS_ENABLED(CONFIG_TEST_FT_SKIP_SUBEVENTS)) {
 			iso_rx[i].rtn = 2U;
 		} else {
@@ -658,7 +706,6 @@ static void test_cis_peripheral(void)
 	for (int i = 0; i < CONFIG_BT_ISO_MAX_CHAN; i++) {
 		iso_tx_p[i].sdu = CONFIG_BT_ISO_TX_MTU;
 		iso_tx_p[i].phy = BT_GAP_LE_PHY_2M;
-		iso_tx_p[i].path = NULL;
 		if (IS_ENABLED(CONFIG_TEST_FT_SKIP_SUBEVENTS)) {
 			iso_tx_p[i].rtn = 2U;
 		} else {
diff --git a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf
index c43da5523ff9e..c9beb293fe35c 100644
--- a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf
+++ b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf
@@ -15,12 +15,7 @@ CONFIG_BT_CENTRAL=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_MAX_CONN=4
 
-# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
-# Host number of completed commands does not follow normal flow control.
-CONFIG_BT_BUF_CMD_TX_COUNT=10
-
 CONFIG_BT_BUF_EVT_RX_COUNT=16
-
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251
@@ -99,7 +94,6 @@ CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2
 # ISO Connection Oriented
 CONFIG_BT_CTLR_CENTRAL_ISO=y
 CONFIG_BT_CTLR_PERIPHERAL_ISO=y
-CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_CONN_ISO_STREAMS=4
 CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=4
@@ -107,6 +101,7 @@ CONFIG_BT_CTLR_CONN_ISO_STREAMS_PER_GROUP=4
 # ISO Transmissions
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=18
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
+CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 
 # ISO Receptions
diff --git a/tests/bsim/bluetooth/ll/compile.sh b/tests/bsim/bluetooth/ll/compile.sh
index 6eae34b67a848..87b1f3006addf 100755
--- a/tests/bsim/bluetooth/ll/compile.sh
+++ b/tests/bsim/bluetooth/ll/compile.sh
@@ -24,7 +24,8 @@ app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_privacy.conf compile
 app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_low_lat.conf compile
 app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_single_timer.conf compile
 
-app=tests/bsim/bluetooth/ll/bis compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-sequential.conf compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-interleaved.conf  compile
 app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-ll_interface.conf compile
 app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-ticker_expire_info.conf compile
 app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-scan_aux_use_chains.conf compile
diff --git a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h
index 01e82571ebd08..d836a9c89e751 100644
--- a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h
+++ b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/gatt_macs.h
@@ -138,7 +138,7 @@ extern "C" {
  *
  *  Helper macro to declare a Managed CCC attribute.
  *
- *  @param _ccc    CCC attribute user data, shall point to a _bt_gatt_ccc.
+ *  @param _ccc    CCC attribute user data, shall point to a bt_gatt_ccc_managed_user_data.
  *  @param _perm   CCC access permissions.
  *  @param _handle Descriptor attribute handle.
  */
@@ -161,7 +161,7 @@ extern "C" {
  *         BT_GATT_PERM_READ | BT_GATT_PERM_WRITE, \
  *         bt_gatt_attr_read_ccc, \
  *         bt_gatt_attr_write_ccc, \
- *         (&(struct _bt_gatt_ccc) { \
+ *         (&(struct bt_gatt_ccc_managed_user_data) { \
  *             .cfg = _cfg, \
  *             .cfg_len = ARRAY_SIZE(_cfg), \
  *             .cfg_changed = _cfg_changed \
@@ -177,10 +177,10 @@ extern "C" {
  *  @param _cfg_changed Configuration changed callback.
  *  @param _handle      Descriptor attribute handle.
  */
-#define BT_GATT_H_CCC(_cfg, _cfg_changed, _handle) \
-		BT_GATT_H_MANAGED((&(struct _bt_gatt_ccc) \
-			BT_GATT_CCC_INITIALIZER(_cfg_changed, NULL, NULL)),\
-			BT_GATT_PERM_READ | BT_GATT_PERM_WRITE, _handle)
+#define BT_GATT_H_CCC(_cfg, _cfg_changed, _handle)                                                 \
+	BT_GATT_H_MANAGED((&(struct bt_gatt_ccc_managed_user_data)                                 \
+				   BT_GATT_CCC_MANAGED_USER_DATA_INIT(_cfg_changed, NULL, NULL)),  \
+			  BT_GATT_PERM_READ | BT_GATT_PERM_WRITE, _handle)
 
 /**
  *  @brief Characteristic Extended Properties Declaration Macro.
diff --git a/tests/bsim/bluetooth/ll/throughput/prj.conf b/tests/bsim/bluetooth/ll/throughput/prj.conf
index d0356a37234be..e8848bbf25dbd 100644
--- a/tests/bsim/bluetooth/ll/throughput/prj.conf
+++ b/tests/bsim/bluetooth/ll/throughput/prj.conf
@@ -36,7 +36,7 @@ CONFIG_BT_BUF_ACL_TX_COUNT=3
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 
 # BT HCI ACL RX Data Buffers
-CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=0
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 
 # Maximum LL ACL PDU length
diff --git a/tests/bsim/bluetooth/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt
index 7271af88810f6..76a8a04179579 100644
--- a/tests/bsim/bluetooth/mesh/CMakeLists.txt
+++ b/tests/bsim/bluetooth/mesh/CMakeLists.txt
@@ -26,12 +26,6 @@ if(CONFIG_SETTINGS)
   src/test_brg.c
 )
 
-if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
- target_sources(app PRIVATE
-  src/distribute_keyid.c
- )
-endif()
-
 if(CONFIG_BT_MESH_GATT_PROXY AND CONFIG_BT_MESH_PROXY_SOLICITATION)
  target_sources(app PRIVATE
   src/test_proxy_sol.c
diff --git a/tests/bsim/bluetooth/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh
index 15a809378791c..ae4b98f19b675 100755
--- a/tests/bsim/bluetooth/mesh/compile.sh
+++ b/tests/bsim/bluetooth/mesh/compile.sh
@@ -18,7 +18,8 @@ app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_psa.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_workq_sys.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_multi_adv_sets.conf compile
-app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
+app=tests/bsim/bluetooth/mesh \
+  conf_overlay="overlay_pst.conf;overlay_ss.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_workq_sys.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
@@ -27,7 +28,7 @@ app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_gatt.conf"
 app=tests/bsim/bluetooth/mesh \
   conf_overlay="overlay_gatt.conf;overlay_multi_adv_sets.conf" compile
 app=tests/bsim/bluetooth/mesh \
-  conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_psa.conf" compile
+  conf_overlay="overlay_pst.conf;overlay_ss.conf;overlay_gatt.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh \
   conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_workq_sys.conf" compile
 wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/mesh/overlay_psa.conf b/tests/bsim/bluetooth/mesh/overlay_psa.conf
index a1c61e095e720..97629adc43f73 100644
--- a/tests/bsim/bluetooth/mesh/overlay_psa.conf
+++ b/tests/bsim/bluetooth/mesh/overlay_psa.conf
@@ -1,8 +1,5 @@
 # Increase the number of key slots in PSA Crypto core
 CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=64
 
-# Increase the number of key slots in PSA Crypto core
-CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=64
-
 # Enable mbedTLS PSA as a crypto backend
 CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/bsim/bluetooth/mesh/overlay_pst.conf b/tests/bsim/bluetooth/mesh/overlay_pst.conf
index 52856866819d2..37b9f2b996927 100644
--- a/tests/bsim/bluetooth/mesh/overlay_pst.conf
+++ b/tests/bsim/bluetooth/mesh/overlay_pst.conf
@@ -3,7 +3,6 @@ CONFIG_BT_SETTINGS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
-CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_MESH_GATT_PROXY=y
diff --git a/tests/bsim/bluetooth/mesh/overlay_ss.conf b/tests/bsim/bluetooth/mesh/overlay_ss.conf
new file mode 100644
index 0000000000000..8ac2b4c327f21
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/overlay_ss.conf
@@ -0,0 +1 @@
+CONFIG_SECURE_STORAGE=y
diff --git a/tests/bsim/bluetooth/mesh/prj.conf b/tests/bsim/bluetooth/mesh/prj.conf
index 522a49e2d11b4..593a7f0166835 100644
--- a/tests/bsim/bluetooth/mesh/prj.conf
+++ b/tests/bsim/bluetooth/mesh/prj.conf
@@ -74,4 +74,5 @@ CONFIG_BT_TESTING=y
 # Needed for RPR tests due to huge amount of retransmitted messages
 CONFIG_BT_MESH_MSG_CACHE_SIZE=64
 
-CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=64
+# Enable tinycrypt as a crypto backend
+CONFIG_BT_MESH_USES_TINYCRYPT=y
diff --git a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c b/tests/bsim/bluetooth/mesh/src/distribute_keyid.c
deleted file mode 100644
index 8bfb0f6ced1d1..0000000000000
--- a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <errno.h>
-#include <zephyr/bluetooth/mesh.h>
-#include "argparse.h"
-#include "mesh/crypto.h"
-
-#define LOG_MODULE_NAME distribute_keys
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(LOG_MODULE_NAME);
-
-/* Mesh requires to keep in persistent memory network keys (2 keys per subnetwork),
- * application keys (2 real keys per 1 configured) and device key + device key candidate.
- */
-#if defined CONFIG_BT_MESH_CDB
-#define BT_MESH_CDB_KEY_ID_RANGE_SIZE (2 * SUBNET_COUNT + \
-		2 * APP_KEY_COUNT + NODE_COUNT)
-#else
-#define BT_MESH_CDB_KEY_ID_RANGE_SIZE  0
-#endif
-#define BT_MESH_KEY_ID_RANGE_SIZE (2 * CONFIG_BT_MESH_SUBNET_COUNT + \
-		2 * CONFIG_BT_MESH_APP_KEY_COUNT + 1 + BT_MESH_CDB_KEY_ID_RANGE_SIZE)
-#define BT_MESH_PSA_KEY_ID_USER_MIN (PSA_KEY_ID_USER_MIN + \
-		CONFIG_BT_MESH_PSA_KEY_ID_USER_MIN_OFFSET)
-#define BT_MESH_TEST_PSA_KEY_ID_USER_MIN (BT_MESH_PSA_KEY_ID_USER_MIN + \
-		BT_MESH_KEY_ID_RANGE_SIZE * get_device_nbr())
-
-static ATOMIC_DEFINE(pst_keys, BT_MESH_KEY_ID_RANGE_SIZE);
-
-psa_key_id_t bt_mesh_user_keyid_alloc(void)
-{
-	for (int i = 0; i < BT_MESH_KEY_ID_RANGE_SIZE; i++) {
-		if (!atomic_test_bit(pst_keys, i)) {
-			atomic_set_bit(pst_keys, i);
-
-			LOG_INF("key id %d is allocated", BT_MESH_TEST_PSA_KEY_ID_USER_MIN + i);
-
-			return BT_MESH_TEST_PSA_KEY_ID_USER_MIN + i;
-		}
-	}
-
-	return PSA_KEY_ID_NULL;
-}
-
-int bt_mesh_user_keyid_free(psa_key_id_t key_id)
-{
-	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_USER_MIN,
-			BT_MESH_TEST_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_clear_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_USER_MIN);
-
-		LOG_INF("key id %d is freed", key_id);
-
-		return 0;
-	}
-
-	return -EIO;
-}
-
-void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
-{
-	if (IN_RANGE(key_id, BT_MESH_TEST_PSA_KEY_ID_USER_MIN,
-			BT_MESH_TEST_PSA_KEY_ID_USER_MIN + BT_MESH_KEY_ID_RANGE_SIZE - 1)) {
-		atomic_set_bit(pst_keys, key_id - BT_MESH_TEST_PSA_KEY_ID_USER_MIN);
-		LOG_INF("key id %d is assigned", key_id);
-	} else {
-		LOG_WRN("key id %d is out of the reserved id range", key_id);
-	}
-}
diff --git a/tests/bsim/bluetooth/mesh/src/test_beacon.c b/tests/bsim/bluetooth/mesh/src/test_beacon.c
index e4b77fcbb75b7..9766b4341269e 100644
--- a/tests/bsim/bluetooth/mesh/src/test_beacon.c
+++ b/tests/bsim/bluetooth/mesh/src/test_beacon.c
@@ -1766,7 +1766,7 @@ static void test_tx_priv_node_id(void)
 	/* Wait for Node ID advertising to end */
 	k_sleep(K_SECONDS(65));
 
-	/* Check that advertisment has stopped */
+	/* Check that advertisement has stopped */
 	ASSERT_OK_MSG(bt_mesh_subnet_priv_node_id_get(TEST_NET_IDX1, &state),
 		      "Failed to get private node ID");
 	ASSERT_EQUAL(state, BT_MESH_NODE_IDENTITY_STOPPED);
@@ -1796,7 +1796,7 @@ static void test_rx_priv_node_id(void)
 
 	uint64_t last_pp_random = beacon.pp_random;
 
-	/* Wait for first node ID advertisment to finish, then scan for
+	/* Wait for first node ID advertisement to finish, then scan for
 	 * second node ID and verify that random field has changed
 	 */
 
@@ -2098,7 +2098,7 @@ static void test_rx_priv_multi_net_id(void)
 			if (beacon.pp_hash ==
 			    proxy_adv_hash_calc(net_ctx[i].net, beacon.pp_random, NULL, true)) {
 				if (old_idx == 0xff) {
-					/* Received first Net ID advertisment */
+					/* Received first Net ID advertisement */
 					old_idx = i;
 					net_ctx[i].start = k_uptime_get();
 					net_ctx[i].recv_cnt++;
diff --git a/tests/bsim/bluetooth/mesh/src/test_brg.c b/tests/bsim/bluetooth/mesh/src/test_brg.c
index a3ee45c36c00c..5a2392d37d1db 100644
--- a/tests/bsim/bluetooth/mesh/src/test_brg.c
+++ b/tests/bsim/bluetooth/mesh/src/test_brg.c
@@ -246,22 +246,26 @@ static void bridge_entry_remove(uint16_t src, uint16_t dst, uint16_t net_idx1, u
 static void tester_bridge_configure(void)
 {
 	uint8_t status;
-	int err;
 
 	LOG_INF("Configuring bridge...");
 
+	ASSERT_OK(
+		bt_mesh_cfg_cli_net_transmit_set(0, BRIDGE_ADDR, BT_MESH_TRANSMIT(2, 20), &status));
+	if (status != BT_MESH_TRANSMIT(2, 20)) {
+		FAIL("Net transmit set failed (status %u)", status);
+	}
+
 	for (int i = 0; i < remote_nodes; i++) {
-		err = bt_mesh_cfg_cli_net_key_add(0, BRIDGE_ADDR, i + 1, subnet_keys[i], &status);
-		if (err || status) {
-			FAIL("NetKey add failed (err %d, status %u)", err, status);
-			return;
+		ASSERT_OK(bt_mesh_cfg_cli_net_key_add(0, BRIDGE_ADDR, i + 1, subnet_keys[i],
+						      &status));
+		if (status) {
+			FAIL("NetKey add failed (status %u)", status);
 		}
 	}
 
 	ASSERT_OK(bt_mesh_brg_cfg_cli_set(0, BRIDGE_ADDR, BT_MESH_BRG_CFG_ENABLED, &status));
 	if (status != BT_MESH_BRG_CFG_ENABLED) {
 		FAIL("Subnet bridge set failed (status %u)", status);
-		return;
 	}
 
 	/* Disable Relay feature to avoid interference in the test. */
@@ -271,7 +275,6 @@ static void tester_bridge_configure(void)
 					    BT_MESH_TRANSMIT(2, 20), &status, &transmit));
 	if (status) {
 		FAIL("Relay set failed (status %u)", status);
-		return;
 	}
 
 	LOG_INF("Bridge configured");
diff --git a/tests/bsim/bluetooth/mesh/src/test_cdp1.c b/tests/bsim/bluetooth/mesh/src/test_cdp1.c
index 35befdea95b17..fd9e9c9f35e77 100644
--- a/tests/bsim/bluetooth/mesh/src/test_cdp1.c
+++ b/tests/bsim/bluetooth/mesh/src/test_cdp1.c
@@ -197,7 +197,7 @@ static const struct bt_mesh_comp_p1_model_item test_p1_mod2 = {
 	.cor_present = 1,
 	.format = 0,
 	.ext_item_cnt = 1,
-	.cor_id = 0,
+	.cor_id = 1,
 };
 
 static const struct bt_mesh_comp_p1_model_item test_p1_mod3 = {
@@ -211,7 +211,7 @@ static const struct bt_mesh_comp_p1_model_item test_p1_mod4 = {
 	.cor_present = 1,
 	.format = 0,
 	.ext_item_cnt = 0,
-	.cor_id = 0,
+	.cor_id = 1,
 };
 
 static const struct bt_mesh_comp_p1_model_item test_p1_mod5 = {
diff --git a/tests/bsim/bluetooth/mesh/src/test_provision.c b/tests/bsim/bluetooth/mesh/src/test_provision.c
index 126b63f6b811f..67cccfd93164e 100644
--- a/tests/bsim/bluetooth/mesh/src/test_provision.c
+++ b/tests/bsim/bluetooth/mesh/src/test_provision.c
@@ -15,6 +15,10 @@
 
 #if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA
 #include <psa/crypto.h>
+#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
+#include <tinycrypt/constants.h>
+#include <tinycrypt/ecc.h>
+#include <tinycrypt/ecc_dh.h>
 #else
 #error "Unknown crypto library has been chosen"
 #endif
@@ -38,6 +42,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define WAIT_TIME 120 /*seconds*/
 #define IS_RPR_PRESENT  (CONFIG_BT_MESH_RPR_SRV && CONFIG_BT_MESH_RPR_CLI)
 #define IMPOSTER_MODEL_ID 0xe000
+/* Rough estimate of the time it should take the provisionee to stop sending unprov beacons. */
+#define PROV_DELTA_THRESH_MS 100
 
 enum test_flags {
 	IS_PROVISIONER,
@@ -97,6 +103,7 @@ static uint32_t link_close_timestamp;
 
 /* Set prov_bearer to non-zero invalid value. */
 static bt_mesh_prov_bearer_t prov_bearer = 0xF8;
+static bt_mesh_prov_bearer_t prov_to_use;
 
 static void test_args_parse(int argc, char *argv[])
 {
@@ -104,10 +111,18 @@ static void test_args_parse(int argc, char *argv[])
 		{
 			.dest = &prov_bearer,
 			.type = 'i',
-			.name = "{invalid, PB-ADV, PB-GATT}",
-			.option = "prov-brearer",
+			.name = "{invalid, PB-ADV, PB-GATT, (PB-ADV | PB-GATT)}",
+			.option = "prov-bearer",
 			.descript = "Provisioning bearer that is to be used."
 		},
+		{
+			.dest = &prov_to_use,
+			.type = 'i',
+			.name = "{PB-ADV, PB-GATT}",
+			.option = "prov-to-use",
+			.descript = "Provisioning bearer that is to be used in the case that "
+				    "multiple provisioning bearers are enabled in prov_bearer."
+		},
 	};
 
 	bs_args_parse_all_cmd_line(argc, argv, args_struct);
@@ -275,6 +290,42 @@ static void test_terminate(void)
 	}
 }
 
+static uint64_t prov_started_time_ms;
+static uint8_t prov_uuid[16];
+
+static void provision(uint8_t uuid[16], bt_mesh_prov_bearer_t bearer)
+{
+	int err;
+
+	switch (bearer) {
+	case BT_MESH_PROV_ADV:
+		err = bt_mesh_provision_adv(uuid, 0, prov_addr, 0);
+		break;
+	case BT_MESH_PROV_GATT:
+		err = bt_mesh_provision_gatt(uuid, 0, prov_addr, 0);
+		break;
+	default:
+		err = -ENOTSUP;
+	}
+
+	if (!err) {
+		LOG_INF("Provisioning over %s started.",
+			bearer == BT_MESH_PROV_ADV ? "PB-ADV" : "PB-GATT");
+		prov_started_time_ms = k_uptime_get();
+		memcpy(prov_uuid, uuid, 16);
+	}
+}
+
+static void provisionee_beacon_check(uint8_t uuid[16], bt_mesh_prov_bearer_t bearer)
+{
+	if (memcmp(uuid, prov_uuid, 16) == 0) {
+		ASSERT_FALSE_MSG((prov_started_time_ms &&
+				  (k_uptime_delta(&prov_started_time_ms) > PROV_DELTA_THRESH_MS)),
+				 "Received %s beacon from provisionee after provisioning started.",
+				 bearer == BT_MESH_PROV_ADV ? "PB-ADV" : "PB-GATT");
+	}
+}
+
 static void unprovisioned_beacon(uint8_t uuid[16],
 				 bt_mesh_prov_oob_info_t oob_info,
 				 uint32_t *uri_hash)
@@ -286,7 +337,12 @@ static void unprovisioned_beacon(uint8_t uuid[16],
 	if (uuid_to_provision && memcmp(uuid, uuid_to_provision, 16)) {
 		return;
 	}
-	bt_mesh_provision_adv(uuid, 0, prov_addr, 0);
+
+	provisionee_beacon_check(uuid, BT_MESH_PROV_ADV);
+
+	if (!prov_to_use || prov_to_use == BT_MESH_PROV_ADV) {
+		provision(uuid, BT_MESH_PROV_ADV);
+	}
 }
 
 static void unprovisioned_beacon_gatt(uint8_t uuid[16], bt_mesh_prov_oob_info_t oob_info)
@@ -299,7 +355,11 @@ static void unprovisioned_beacon_gatt(uint8_t uuid[16], bt_mesh_prov_oob_info_t
 		return;
 	}
 
-	bt_mesh_provision_gatt(uuid, 0, prov_addr, 0);
+	provisionee_beacon_check(uuid, BT_MESH_PROV_GATT);
+
+	if (!prov_to_use || prov_to_use == BT_MESH_PROV_GATT) {
+		provision(uuid, BT_MESH_PROV_GATT);
+	}
 }
 
 static void prov_complete(uint16_t net_idx, uint16_t addr)
@@ -324,6 +384,8 @@ static void prov_node_added(uint16_t net_idx, uint8_t uuid[16], uint16_t addr,
 {
 	LOG_INF("Device 0x%04x provisioned", prov_addr);
 	current_dev_addr = prov_addr++;
+	prov_started_time_ms = 0;
+	memset(prov_uuid, 0, 16);
 	k_sem_give(&prov_sem);
 }
 
@@ -340,6 +402,7 @@ static void prov_reset(void)
 
 static bt_mesh_input_action_t gact;
 static uint8_t gsize;
+static bool oob_wait_unprov_int;
 static int input(bt_mesh_input_action_t act, uint8_t size)
 {
 	/* The test system requests the input OOB data earlier than
@@ -350,7 +413,9 @@ static int input(bt_mesh_input_action_t act, uint8_t size)
 	gact = act;
 	gsize = size;
 
-	k_work_reschedule(&oob_timer, K_SECONDS(1));
+	k_work_reschedule(&oob_timer, oob_wait_unprov_int
+					      ? K_SECONDS(CONFIG_BT_MESH_UNPROV_BEACON_INT + 1)
+					      : K_SECONDS(1));
 
 	return 0;
 }
@@ -462,6 +527,7 @@ static void oob_auth_set(int test_step)
 	prov.input_actions = oob_auth_test_vector[test_step].input_actions;
 }
 
+#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA
 static void generate_oob_key_pair(void)
 {
 	psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
@@ -496,6 +562,12 @@ static void generate_oob_key_pair(void)
 
 	memcpy(public_key_be, public_key_repr + 1, 64);
 }
+#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
+static void generate_oob_key_pair(void)
+{
+	ASSERT_TRUE(uECC_make_key(public_key_be, private_key_be, uECC_secp256r1()));
+}
+#endif
 
 static void oob_device(bool use_oob_pk)
 {
@@ -734,6 +806,49 @@ static void test_provisioner_oob_auth_no_oob_public_key(void)
 	PASS();
 }
 
+static void test_provisioner_pb_cancel(void)
+{
+	k_sem_init(&prov_sem, 0, 1);
+
+	bt_mesh_device_setup(&prov, &comp);
+
+	ASSERT_OK(bt_mesh_cdb_create(test_net_key));
+
+	ASSERT_OK(bt_mesh_provision(test_net_key, 0, 0, 0, 0x0001, dev_key));
+
+	prov.static_val = 0;
+	prov.static_val_len = 0;
+	prov.output_size = 0;
+	prov.output_actions = 0;
+	prov.input_size = 8;
+	prov.input_actions = BT_MESH_ENTER_NUMBER;
+
+	ASSERT_OK(k_sem_take(&prov_sem, K_SECONDS(20)));
+
+	PASS();
+}
+
+static void test_device_pb_cancel(void)
+{
+	oob_wait_unprov_int = true;
+	k_sem_init(&prov_sem, 0, 1);
+
+	bt_mesh_device_setup(&prov, &comp);
+
+	prov.static_val = 0;
+	prov.static_val_len = 0;
+	prov.output_size = 0;
+	prov.output_actions = 0;
+	prov.input_size = 8;
+	prov.input_actions = BT_MESH_ENTER_NUMBER;
+
+	ASSERT_OK(bt_mesh_prov_enable(prov_bearer));
+
+	ASSERT_OK(k_sem_take(&prov_sem, K_SECONDS(20)));
+
+	PASS();
+}
+
 /** @brief Verify that the provisioner can provision multiple devices in a row
  */
 static void test_provisioner_multi(void)
@@ -1798,6 +1913,7 @@ static const struct bst_test_instance test_connect[] = {
 	TEST_CASE_WBACKCHANNEL(device, oob_public_key,
 			       "Device: provisioning use oob public key"),
 	TEST_CASE(device, reprovision, "Device: provisioning, reprovision"),
+	TEST_CASE_WBACKCHANNEL(device, pb_cancel, "Device: provisioning, cancel prov bearers."),
 #if IS_RPR_PRESENT
 	TEST_CASE(device, pb_remote_server_unproved,
 		  "Device: used for remote provisioning, starts unprovisioned"),
@@ -1828,6 +1944,8 @@ static const struct bst_test_instance test_connect[] = {
 	TEST_CASE(
 		provisioner, reprovision,
 		"Provisioner: provisioning, resetting and reprovisioning multiple times."),
+	TEST_CASE_WBACKCHANNEL(
+		provisioner, pb_cancel, "Provisioner: provisioning, cancel prov bearers."),
 #if IS_RPR_PRESENT
 	TEST_CASE(provisioner, pb_remote_client_reprovision,
 		  "Provisioner: pb-remote provisioning, resetting and reprov-ing multiple times."),
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh
index 9973a82dc49a7..fec08a751ce21 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh
@@ -36,27 +36,27 @@ RunTestFlash blob_recover_phase \
    blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
 
 # The same test but with PSA crypto
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash blob_recover_phase_psa \
    blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash blob_recover_phase_psa \
    blob_cli_stop blob_srv_stop -- -argstest expected-phase=2
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash blob_recover_phase_psa \
    blob_cli_stop blob_srv_stop -- -argstest expected-phase=3
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash blob_recover_phase_psa \
    blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
 
 # Test reaching suspended state and continuation after reboot on new procedure.
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash blob_recover_phase_psa \
    blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=5
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash blob_recover_phase_psa \
    blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/bridge/brg_persistent_storage.sh b/tests/bsim/bluetooth/mesh/tests_scripts/bridge/brg_persistent_storage.sh
index 7e22f42589b4b..311d590b47aa9 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/bridge/brg_persistent_storage.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/bridge/brg_persistent_storage.sh
@@ -21,10 +21,10 @@ RunTestFlash mesh_brg_persistence \
 	brg_tester_persistence brg_bridge_simple
 
 # The same test but with PSA crypto
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_brg_persistence_psa \
 	brg_tester_persistence -flash_erase brg_bridge_simple -flash_erase
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_brg_persistence_psa \
 	brg_tester_persistence brg_bridge_simple
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh
index 4f87fb10fef71..83414d4df13ef 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh
@@ -16,7 +16,7 @@ RunTest dfu_all_tgts_lost_on_apply \
 	dfu_target_fail_on_apply \
 	-- -argstest targets=3
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_all_tgts_lost_on_apply_psa \
 	dfu_cli_all_targets_lost_on_apply \
 	dfu_target_fail_on_apply \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh
index 572445e47791b..75c6b9bcde793 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh
@@ -16,7 +16,7 @@ RunTest dfu_all_tgts_lost_on_caps_get \
 	dfu_target_fail_on_caps_get \
 	-- -argstest targets=3
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_all_tgts_lost_on_caps_get_psa \
 	dfu_cli_all_targets_lost_on_caps_get \
 	dfu_target_fail_on_caps_get \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh
index e4fbe146dcd5a..2d170d46296c6 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh
@@ -16,7 +16,7 @@ RunTest dfu_all_tgts_lost_on_metadata \
 	dfu_target_fail_on_metadata \
 	-- -argstest targets=3
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_all_tgts_lost_on_metadata_psa \
 	dfu_cli_all_targets_lost_on_metadata \
 	dfu_target_fail_on_metadata \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh
index 7b96161eccd69..915298223f492 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh
@@ -16,7 +16,7 @@ RunTest dfu_all_tgts_lost_on_update_get \
 	dfu_target_fail_on_update_get \
 	-- -argstest targets=3
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_all_tgts_lost_on_update_get_psa \
 	dfu_cli_all_targets_lost_on_update_get \
 	dfu_target_fail_on_update_get \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh
index 5daedaca71d47..f287288d1d4e4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh
@@ -16,7 +16,7 @@ RunTest dfu_all_tgts_lost_on_verify \
 	dfu_target_fail_on_verify \
 	-- -argstest targets=3
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_all_tgts_lost_on_verify_psa \
 	dfu_cli_all_targets_lost_on_verify \
 	dfu_target_fail_on_verify \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh
index 2ff4a696639f0..881fda52b0962 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh
@@ -15,7 +15,7 @@ RunTest dfu_persistency \
 	dfu_target_fail_on_apply \
 	dfu_target_fail_on_nothing
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_persistency_psa \
 	dfu_cli_fail_on_persistency \
 	dfu_target_fail_on_metadata \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh
index 5c00349f24e69..017d5984c3def 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh
@@ -7,5 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 overlay=overlay_pst_conf
 RunTest dfu_self_update dfu_dist_dfu_self_update -- -argstest targets=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_self_update_psa dfu_dist_dfu_self_update -- -argstest targets=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh
index 42087f1ad13cc..081c4e00a11f1 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh
@@ -8,6 +8,6 @@ overlay=overlay_pst_conf
 RunTest dfu_self_update_no_change \
     dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_self_update_no_change_psa \
     dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh
index 1c5ff82d8fb5b..cf0864ef60c82 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh
@@ -9,6 +9,6 @@ overlay=overlay_pst_conf
 RunTest dfu_mixed dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
 	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_mixed_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
 	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh
index 3382e458b2ed0..28598fe4789c9 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh
@@ -10,7 +10,7 @@ RunTest dfu_mixed_fail dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_chan
 	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \
 	fail-confirm=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_mixed_fail_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
 	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \
 	fail-confirm=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh
index 587908c649710..4f6f4b2349f10 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh
@@ -20,7 +20,7 @@ RunTestFlash dfu_slot dfu_dist_dfu_slot_delete_all
 
 RunTestFlash dfu_slot dfu_dist_dfu_slot_check_delete_all -flash_rm
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_slot_psa dfu_dist_dfu_slot_create -flash_erase
 
 RunTestFlash dfu_slot_psa dfu_dist_dfu_slot_create_recover
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh
index abce47dba1314..2aadd6b14b02e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh
@@ -8,5 +8,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 overlay=overlay_pst_conf
 RunTest dfu_slot_idempotency dfu_dist_dfu_slot_idempotency
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_slot_idempotency_psa dfu_dist_dfu_slot_idempotency
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh
index 0ce234116b25d..ee0eec53d4f4a 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh
@@ -8,5 +8,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 overlay=overlay_pst_conf
 RunTest dfu_slot_reservation dfu_dist_dfu_slot_reservation
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest dfu_slot_reservation_psa dfu_dist_dfu_slot_reservation
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery.sh
index 62a30c2e816dd..61b98becbcab4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery.sh
@@ -40,28 +40,28 @@ RunTestFlash dfu_dist_recover_phase \
   -- -argstest recover=1 expected-phase=8
 
 # The same test but with PSA crypto
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_dist_recover_phase_psa \
   dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
   -- -argstest recover=0 expected-phase=2
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_dist_recover_phase_psa \
   dfu_cli_stop dfu_target_dfu_stop \
   -- -argstest recover=1 expected-phase=3
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_dist_recover_phase_psa \
   dfu_cli_stop dfu_target_dfu_stop \
   -- -argstest recover=1 expected-phase=4
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_dist_recover_phase_psa \
   dfu_cli_stop dfu_target_dfu_stop \
   -- -argstest recover=1 expected-phase=6
 
 # Use phase `BT_MESH_DFU_PHASE_APPLY_SUCCESS` as marker to bring whole procedure to an end
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_dist_recover_phase_psa \
   dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
   -- -argstest recover=1 expected-phase=8
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery_verify_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery_verify_fail.sh
index c43d94e80cc62..81d56754f2b03 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery_verify_fail.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_recovery_verify_fail.sh
@@ -21,12 +21,12 @@ RunTestFlash dfu_dist_recover_verify_fail \
   -- -argstest recover=1 expected-phase=6
 
 # The same test but with PSA crypto
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_dist_recover_verify_fail_psa \
   dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
   -- -argstest recover=0 expected-phase=5
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash dfu_dist_recover_verify_fail_psa \
   dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
   -- -argstest recover=1 expected-phase=6
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh
index dcaba598a57ef..e4c2385779ff7 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh
@@ -9,20 +9,20 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
 RunTest mesh_lcd_test_comp0_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=0
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp0_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=0
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh
index 004a5224961c6..22f17d606ed9a 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh
@@ -10,14 +10,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
@@ -25,7 +25,7 @@ RunTest mesh_lcd_test_comp0_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=0 comp-changed-mode=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp0_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=0 comp-changed-mode=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh
index f88db1b7391cb..7ce0be77bb6ef 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh
@@ -9,20 +9,20 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
 RunTest mesh_lcd_test_comp128_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=128
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp128_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=128
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh
index 084125c79a400..75d3558ca6082 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh
@@ -10,14 +10,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
@@ -25,7 +25,7 @@ RunTest mesh_lcd_test_comp128_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=128 comp-changed-mode=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp128_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=128 comp-changed-mode=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh
index ab46d32048fea..46915d73f7400 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh
@@ -9,20 +9,20 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
 RunTest mesh_lcd_test_comp129_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=129
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp129_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=129
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh
index 179c052e0efee..c77288d7de181 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh
@@ -10,14 +10,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
@@ -25,7 +25,7 @@ RunTest mesh_lcd_test_comp129_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=129 comp-changed-mode=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp129_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=129 comp-changed-mode=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh
index eb25353581b51..65f754564bf26 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh
@@ -9,20 +9,20 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
 RunTest mesh_lcd_test_comp130_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=130
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp130_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=130
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh
index a667f53abc8a9..42a2fe4346d7e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh
@@ -10,14 +10,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
@@ -25,7 +25,7 @@ RunTest mesh_lcd_test_comp130_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=130 comp-changed-mode=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp130_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=130 comp-changed-mode=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh
index 06312cf558ba5..6a897e1051d1d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh
@@ -9,20 +9,20 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
 RunTest mesh_lcd_test_comp1_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp1_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh
index 61f19ea3dcc22..5ef6b22a43db2 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh
@@ -10,14 +10,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
@@ -25,7 +25,7 @@ RunTest mesh_lcd_test_comp1_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=1 comp-changed-mode=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp1_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=1 comp-changed-mode=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh
index 3da45434ee109..ac7de27b62937 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh
@@ -9,20 +9,20 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
 RunTest mesh_lcd_test_comp2_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=2
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp2_data_split \
 	lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=2
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh
index 8ad929f1374c8..19c0961da7d02 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh
@@ -10,14 +10,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 #
 # Test procedure:
 # 0. Provisioning and setup. Server and client has same comp data.
-# 1. Client requests a sample exceeding the maximum avaialble payload from the
+# 1. Client requests a sample exceeding the maximum available payload from the
 #    server's composition data.
 # 2. Client fetch its local comp data.
 # 3. When server status arrive, remove status field data and compare received
 #    comp data with corresponding bytes in local comp data.
 # 4. Client requests the next sample from server's composition data.
 # 5. When server status arrive, remove status field data and compare received
-#    comp data with correspending bytes in local comp data.
+#    comp data with corresponding bytes in local comp data.
 # 6. Client merges the two samples and checks that the collected data is
 #    correctly merged, continuous, and matches its local comp data.
 overlay=overlay_pst_conf
@@ -25,7 +25,7 @@ RunTest mesh_lcd_test_comp2_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=2 comp-changed-mode=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_comp2_data_split_dfu \
 	lcd_srv_comp_data_status_respond \
 	lcd_cli_split_comp_data_request -- -argstest page=2 comp-changed-mode=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh
index 71a692fa22c2b..ada62f65c2beb 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh
@@ -18,6 +18,6 @@ overlay=overlay_pst_conf
 RunTest mesh_lcd_test_max_access_payload \
 	lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_max_access_payload_psa \
 	lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh
index ef0f571252627..ca95095f150d6 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh
@@ -19,6 +19,6 @@ overlay=overlay_pst_conf
 RunTest mesh_lcd_test_max_metadata_access_payload \
 	lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_max_metadata_access_payload_psa \
 	lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh
index 5003c5789b450..09d332eef7985 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh
@@ -22,6 +22,6 @@ overlay=overlay_pst_conf
 RunTest mesh_lcd_test_split_metadata \
 	lcd_cli_split_metadata_request lcd_srv_metadata_status_respond
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_lcd_test_split_metadata_psa \
 	lcd_cli_split_metadata_request lcd_srv_metadata_status_respond
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh
index cf9ec54faecf5..c7c97e598e0ab 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh
@@ -31,25 +31,25 @@ overlay=overlay_pst_conf
 RunTestFlash mesh_pst_access_data_check persistence_access_data_load -flash_rm \
 	-- -argstest access-cfg=not-configured
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_save -flash_erase
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_load \
 	-- -argstest access-cfg=configured
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_access_data_check_psa persistence_access_sub_overwrite \
 	-- -argstest access-cfg=configured
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_load \
 	-- -argstest access-cfg=new-subs
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_remove \
 	-- -argstest access-cfg=new-subs
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_load -flash_rm \
 	-- -argstest access-cfg=not-configured
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh
index f9655ef7462d6..2fb7179d536e8 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh
@@ -24,18 +24,18 @@ overlay=overlay_pst_conf
 RunTestFlash mesh_pst_cfg_check persistence_cfg_load -flash_rm \
     -- -argstest stack-cfg=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_save -flash_erase \
     -- -argstest stack-cfg=0
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_load -flash_rm \
     -- -argstest stack-cfg=0
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_save -flash_erase \
     -- -argstest stack-cfg=1
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_load -flash_rm \
     -- -argstest stack-cfg=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh
index 8dc7baa3e9de7..e0fc41b87ada1 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh
@@ -16,8 +16,8 @@ RunTestFlash mesh_pst_prov_data_check persistence_provisioning_data_save -flash_
 overlay=overlay_pst_conf
 RunTestFlash mesh_pst_prov_data_check persistence_provisioning_data_load -flash_rm
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_prov_data_check_psa persistence_provisioning_data_save -flash_erase
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_pst_prov_data_check_psa persistence_provisioning_data_load -flash_rm
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh
index 511c04f766f52..acf59f41845ae 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh
@@ -20,12 +20,12 @@ RunTest mesh_pst_repr persistence_reprovisioning_device \
 	-flash=../results/mesh_pst_repr/flash.bin -flash_rm \
 	persistence_reprovisioning_provisioner
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_pst_repr_psa persistence_reprovisioning_device \
     -flash=../results/mesh_pst_repr_psa/flash.bin -flash_erase \
 	persistence_reprovisioning_provisioner
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_pst_repr_psa persistence_reprovisioning_device \
 	-flash=../results/mesh_pst_repr_psa/flash.bin -flash_rm \
 	persistence_reprovisioning_provisioner
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh
index a431cdd9f6b8f..5aaf636073aa2 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh
@@ -4,12 +4,12 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
-# Test Private Net ID advertisment
+# Test Private Net ID advertisement
 #
 # Test procedure:
 # 0. TX device disables GATT proxy and enables Private GATT proxy.
-# 1. RX device enables scanner and scans for Net ID advertisments.
-# 2. RX device scans for a single Net ID advertisment and stores
+# 1. RX device enables scanner and scans for Net ID advertisements.
+# 2. RX device scans for a single Net ID advertisement and stores
 #    the random field of that message.
 # 3. RX device waits for 10 minutes.
 # 4. RX device scans for a another Private Net ID advertisement and compares
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh
index cffb5adbeb049..249eba4449a21 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh
@@ -4,7 +4,7 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
-# Test Private Net ID advertisment with multiple networks
+# Test Private Net ID advertisement with multiple networks
 #
 # Test procedure:
 # 0. TX device disables GATT proxy, adds a second network to the device
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh
index 2557c9c150613..c4d5ea29165cd 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh
@@ -4,12 +4,12 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
-# Test Private Node ID advertisment
+# Test Private Node ID advertisement
 #
 # Test procedure:
 # 0. TX device disables GATT proxy and enables the Private Node
 #    Identity state for the network. Then it waits for the
-#    advertisment to complete.
+#    advertisement to complete.
 # 1. RX device enables scanner and scans for Private Node ID advertisements.
 # 2. RX device scans for a single Private Node ID advertisement and stores
 #    the random field of that message. Then it waits for the
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_cancel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_cancel.sh
new file mode 100755
index 0000000000000..df2723a227027
--- /dev/null
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_cancel.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Copyright 2025 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# Test that PB-ADV and PB-GATT unprovisioned beacons are cancelled when a provisioning link is
+# opened.
+# Test procedure:
+# 1. The provisioner self-provisions and starts scanning for unprovisioned devices.
+# 2. The provisionee enables both the PB-ADV and PB-GATT bearers.
+# 3. The provisioner finds the unprovisioned device and provisions it with OOB authentication.
+#    The OOB authentication is delayed by CONFIG_BT_MESH_UNPROV_BEACON_INT + 1 seconds to ensure
+#    that the provisioner has time observe that PB-ADV and PB-GATT beacons are cancelled.
+# 4. The provisioning procedure completes.
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_cancel_adv \
+	prov_provisioner_pb_cancel \
+	prov_device_pb_cancel \
+	-- -argstest prov-bearer=3 prov-to-use=1
+
+overlay=overlay_gatt_conf_overlay_psa_conf
+RunTest mesh_prov_pb_cancel_gatt \
+	prov_provisioner_pb_cancel \
+	prov_device_pb_cancel \
+	-- -argstest prov-bearer=3 prov-to-use=2
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
index 815df506d5fb3..536e15b9dc44b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
@@ -16,7 +16,7 @@ RunTest mesh_prov_pb_remote_parallel \
 	prov_device_pb_remote_server_unproved \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_parallel_psa \
@@ -24,4 +24,4 @@ RunTest mesh_prov_pb_remote_parallel_psa \
 	prov_device_pb_remote_server_unproved \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh
index 2bba5147d8f3b..a7d7255155ab5 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh
@@ -53,21 +53,21 @@ RunTestFlash mesh_prov_pst_pb_remote_ncrp \
 
 # The same test but with PSA crypto
 # Step 1
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
 	prov_provisioner_pb_remote_client_ncrp_provision -flash_erase \
 	prov_device_pb_remote_server_unproved -flash_erase \
 	prov_device_pb_remote_server_ncrp_prepare -flash_erase
 
 # Step 2
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
 	prov_provisioner_pb_remote_client_ncrp \
 	prov_device_pb_remote_server_proved \
 	prov_device_pb_remote_server_ncrp
 
 # Step 3
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
 	prov_provisioner_pb_remote_client_ncrp_second_time -flash_rm \
 	prov_device_pb_remote_server_proved -flash_rm \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
index 1e5da310bd3fb..e2a9827295512 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
@@ -16,11 +16,11 @@ RunTest mesh_prov_pb_remote_reprovision \
 	prov_provisioner_pb_remote_client_reprovision \
 	prov_device_pb_remote_server_unproved \
 	prov_device_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_reprovision_psa \
 	prov_provisioner_pb_remote_client_reprovision \
 	prov_device_pb_remote_server_unproved \
 	prov_device_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
index b332b1987adf9..74d2b3fff8bba 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
@@ -27,10 +27,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_remote_provisioning_timeout \
 	prov_provisioner_pb_remote_client_provision_timeout \
 	prov_device_pb_remote_server_unproved_unresponsive \
-	prov_device_unresponsive -- -argstest prov-brearer=1
+	prov_device_unresponsive -- -argstest prov-bearer=1
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_remote_provisioning_timeout_psa \
 	prov_provisioner_pb_remote_client_provision_timeout \
 	prov_device_pb_remote_server_unproved_unresponsive \
-	prov_device_unresponsive -- -argstest prov-brearer=1
+	prov_device_unresponsive -- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
index bed577add241e..f6ac20c38f04a 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_multi.sh
@@ -12,7 +12,7 @@ RunTest mesh_prov_pb_adv_multi \
 	prov_device_no_oob \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_multi \
@@ -20,7 +20,7 @@ RunTest mesh_prov_pb_gatt_multi \
 	prov_device_no_oob \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_multi_psa \
@@ -28,4 +28,4 @@ RunTest mesh_prov_pb_adv_multi_psa \
 	prov_device_no_oob \
 	prov_device_no_oob \
 	prov_device_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
index 4f633b91c2c0c..c5e4c8d1649d1 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_no_oob.sh
@@ -7,16 +7,16 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_adv_on_oob \
 	prov_device_no_oob \
 	prov_provisioner_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_on_oob \
 	prov_device_no_oob \
 	prov_provisioner_no_oob \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_on_oob_psa \
 	prov_device_no_oob \
 	prov_provisioner_no_oob \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
index e53c6b5f2546f..342433a6db96e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ib_pk.sh
@@ -7,14 +7,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test provisioning with OOB authentication and with inband public key
 RunTest mesh_prov_pb_adv_oob_auth \
 	prov_device_oob_auth prov_provisioner_oob_auth \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_oob_auth \
 	prov_device_oob_auth prov_provisioner_oob_auth \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_oob_auth_psa \
 	prov_device_oob_auth prov_provisioner_oob_auth \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
index 7ac6b5f4d758c..ea746e75e9934 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_ignore_oob_pk.sh
@@ -8,14 +8,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # but provisioner doesn't have OOB public key
 RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk \
 	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_device_w_oob_pk_prvnr_wt_pk \
 	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_psa \
 	prov_device_oob_public_key prov_provisioner_oob_auth_no_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
index 90375f81a5047..78b9a25d99a82 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_oob_auth_oob_pk.sh
@@ -7,14 +7,14 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test provisioning with OOB authentication and with OOB public key
 RunTest mesh_prov_pb_adv_oob_public_key \
 	prov_device_oob_public_key prov_provisioner_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_oob_public_key \
 	prov_device_oob_public_key prov_provisioner_oob_public_key \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_oob_public_key_psa \
 	prov_device_oob_public_key prov_provisioner_oob_public_key \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
index 0143ef20c4563..d629f631f4d0a 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/prov_reprovision.sh
@@ -7,16 +7,16 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_prov_pb_adv_repr \
 	prov_device_reprovision \
 	prov_provisioner_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
 
 overlay=overlay_gatt_conf_overlay_psa_conf
 RunTest mesh_prov_pb_gatt_repr \
 	prov_device_reprovision \
 	prov_provisioner_reprovision \
-	-- -argstest prov-brearer=2
+	-- -argstest prov-bearer=2
 
 overlay=overlay_psa_conf
 RunTest mesh_prov_pb_adv_repr_psa \
 	prov_device_reprovision \
 	prov_provisioner_reprovision \
-	-- -argstest prov-brearer=1
+	-- -argstest prov-bearer=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_beacon_rcvd.sh b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_beacon_rcvd.sh
index fb4cc54c7e05d..f169884aa0d50 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_beacon_rcvd.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_beacon_rcvd.sh
@@ -13,7 +13,7 @@ RunTest proxy_sol_beacon_rcvd \
 	proxy_sol_tester_beacon_rcvd \
 	proxy_sol_iut_beacon_send
 
-overlay="overlay_pst_conf_overlay_gatt_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_gatt_conf_overlay_psa_conf"
 RunTest proxy_sol_beacon_rcvd_psa \
 	proxy_sol_tester_beacon_rcvd \
 	proxy_sol_iut_beacon_send
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
index 02f7c93325416..6aa0c0f0a5813 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/proxy_sol/sol_replay.sh
@@ -44,13 +44,13 @@ RunTest mesh_srpl_replay_attack_workq \
 	proxy_sol_iut_power_replay_attack \
 	-flash=../results/mesh_srpl_replay_attack/flash.bin -flash_rm
 
-overlay="overlay_pst_conf_overlay_gatt_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_gatt_conf_overlay_psa_conf"
 RunTest mesh_srpl_replay_attack_psa \
 	proxy_sol_tester_immediate_replay_attack \
 	proxy_sol_iut_immediate_replay_attack \
 	-flash=../results/mesh_srpl_replay_attack_psa/flash.bin -flash_erase
 
-overlay="overlay_pst_conf_overlay_gatt_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_gatt_conf_overlay_psa_conf"
 RunTest mesh_srpl_replay_attack_psa \
 	proxy_sol_tester_power_replay_attack \
 	proxy_sol_iut_power_replay_attack \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh
index d09e014bd0e20..bba7a4e257111 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh
@@ -14,12 +14,12 @@ RunTest mesh_replay_attack \
     rpc_tx_power_replay_attack \
     rpc_rx_power_replay_attack -flash=../results/mesh_replay_attack/flash.bin -flash_rm
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_replay_attack_psa \
     rpc_tx_immediate_replay_attack \
     rpc_rx_immediate_replay_attack -flash=../results/mesh_replay_attack_psa/flash.bin -flash_erase
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_replay_attack_psa \
     rpc_tx_power_replay_attack \
     rpc_rx_power_replay_attack -flash=../results/mesh_replay_attack_psa/flash.bin -flash_rm
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh
index 7212b567a24ac..69cfc47d677d6 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh
@@ -21,11 +21,11 @@ overlay=overlay_pst_conf
 RunTest mesh_replay_fragmentation \
     rpc_rx_reboot_after_defrag -flash=../results/mesh_replay_fragmentation/flash.bin -flash_rm
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_replay_fragmentation_psa \
     rpc_rx_rpl_frag -flash=../results/mesh_replay_fragmentation_psa/flash.bin -flash_erase \
     rpc_tx_rpl_frag
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTest mesh_replay_fragmentation_psa \
     rpc_rx_reboot_after_defrag -flash=../results/mesh_replay_fragmentation_psa/flash.bin -flash_rm
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh
index 0e67d5ab4d56b..71cf45d08c3b7 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh
@@ -12,6 +12,6 @@ overlay=overlay_pst_conf
 RunTestFlash sar_persistence sar_srv_cfg_store -flash_erase
 RunTestFlash sar_persistence sar_srv_cfg_restore -flash_rm
 
-overlay="overlay_pst_conf_overlay_psa_conf"
+overlay="overlay_pst_conf_overlay_ss_conf_overlay_psa_conf"
 RunTestFlash sar_persistence_psa sar_srv_cfg_store -flash_erase
 RunTestFlash sar_persistence_psa sar_srv_cfg_restore -flash_rm
diff --git a/tests/bsim/bluetooth/tester/CMakeLists.txt b/tests/bsim/bluetooth/tester/CMakeLists.txt
new file mode 100644
index 0000000000000..136e98e5f998d
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/CMakeLists.txt
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(tester_bsim)
+
+# This contains babblesim-specific helpers, e.g. device synchronization.
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
+zephyr_include_directories(
+  ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
+  ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
+  )
+
+zephyr_include_directories(
+  src/
+  ${ZEPHYR_BASE}/tests/bluetooth/tester/src
+  ${ZEPHYR_BASE}/tests/bluetooth/tester/src/btp
+  ${ZEPHYR_BASE}/tests/bluetooth/tester/src/audio/btp
+)
+
+target_sources(app PRIVATE
+  src/bsim_btp.c
+  src/test_main.c
+  src/host/gap_central.c
+  src/host/gap_peripheral.c
+)
diff --git a/tests/bsim/bluetooth/tester/Kconfig b/tests/bsim/bluetooth/tester/Kconfig
new file mode 100644
index 0000000000000..5b863af7a3e3b
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/Kconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+module = BSIM_BTTESTER
+module-str = bsim_bttester
+source "subsys/logging/Kconfig.template.log_config"
+
+source "Kconfig.zephyr"
diff --git a/tests/bsim/bluetooth/tester/boards/nrf52_bsim.overlay b/tests/bsim/bluetooth/tester/boards/nrf52_bsim.overlay
new file mode 100644
index 0000000000000..e7c4c36ff5b56
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/boards/nrf52_bsim.overlay
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&uart0 {
+	hw-flow-control;
+};
diff --git a/tests/bsim/bluetooth/tester/compile.sh b/tests/bsim/bluetooth/tester/compile.sh
new file mode 100755
index 0000000000000..1e6f5725df03a
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/compile.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Compile all the applications needed by the bsim tests in these subfolders
+
+#set -x #uncomment this line for debugging
+set -ue
+
+source ${ZEPHYR_BASE}/tests/bsim/compile.source
+
+: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root directory}"
+
+# We only want to build the tests/bsim/bluetooth/tester/ application for the nrf52_bsim/native board
+# as we do not gain anything from running this application for the nrf5340bsim_nrf5340_cpuapp and
+# it is not worth the added complexity to run it with anything but nrf52_bsim/native
+west twister -T ${ZEPHYR_BASE}/tests/bsim/bluetooth/tester/
+
+west twister -p ${BOARD} -T ${ZEPHYR_BASE}/tests/bluetooth/tester/
+
+wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/tester/prj.conf b/tests/bsim/bluetooth/tester/prj.conf
new file mode 100644
index 0000000000000..63f141f4d395d
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/prj.conf
@@ -0,0 +1,14 @@
+CONFIG_ASSERT=y
+CONFIG_THREAD_NAME=y
+
+# Should not be necessary, but the bluetooth/buf.h header file require Bluetooth to be enabled, and
+# the header file is being included by some of the BTP header files
+CONFIG_BT=y
+
+CONFIG_UART_PIPE=n
+CONFIG_SERIAL=y
+
+CONFIG_LOG=y
+CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
+CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
+CONFIG_BSIM_BTTESTER_LOG_LEVEL_DBG=y
diff --git a/tests/bsim/bluetooth/tester/src/bsim_btp.c b/tests/bsim/bluetooth/tester/src/bsim_btp.c
new file mode 100644
index 0000000000000..947dbb0fdf88f
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/src/bsim_btp.c
@@ -0,0 +1,1949 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdint.h>
+#include <stddef.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/audio/tbs.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys_clock.h>
+
+#include "babblekit/testcase.h"
+
+#include "btp/btp.h"
+
+LOG_MODULE_REGISTER(bsim_btp, CONFIG_BSIM_BTTESTER_LOG_LEVEL);
+
+K_FIFO_DEFINE(btp_rsp_fifo);
+NET_BUF_POOL_FIXED_DEFINE(btp_rsp_pool, 1, BTP_MTU, 0, NULL);
+K_FIFO_DEFINE(btp_evt_fifo);
+NET_BUF_POOL_FIXED_DEFINE(btp_evt_pool, 100, BTP_MTU, 0, NULL);
+
+static const struct device *const dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+
+static bool is_valid_core_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_CORE_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_CORE_READ_SUPPORTED_SERVICES:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_CORE_REGISTER_SERVICE:
+		return buf_simple->len == 0U;
+	case BTP_CORE_UNREGISTER_SERVICE:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_CORE_EV_IUT_READY:
+		return buf_simple->len == 0U;
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_gap_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_GAP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_GAP_READ_CONTROLLER_INDEX_LIST:
+		if (hdr->len >= sizeof(struct btp_gap_read_controller_index_list_rp)) {
+			const struct btp_gap_read_controller_index_list_rp *rp =
+				net_buf_simple_pull_mem(
+					buf_simple,
+					sizeof(struct btp_gap_read_controller_index_list_rp));
+
+			return rp->num == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_GAP_READ_CONTROLLER_INFO:
+		return buf_simple->len == sizeof(struct btp_gap_read_controller_info_rp);
+	case BTP_GAP_RESET:
+		return buf_simple->len == sizeof(struct btp_gap_reset_rp);
+	case BTP_GAP_SET_POWERED:
+		return buf_simple->len == sizeof(struct btp_gap_set_powered_rp);
+	case BTP_GAP_SET_CONNECTABLE:
+		return buf_simple->len == sizeof(struct btp_gap_set_connectable_rp);
+	case BTP_GAP_SET_FAST_CONNECTABLE:
+		return buf_simple->len == sizeof(struct btp_gap_set_fast_connectable_rp);
+	case BTP_GAP_SET_DISCOVERABLE:
+		return buf_simple->len == sizeof(struct btp_gap_set_discoverable_rp);
+	case BTP_GAP_SET_BONDABLE:
+		return buf_simple->len == sizeof(struct btp_gap_set_bondable_rp);
+	case BTP_GAP_START_ADVERTISING:
+		return buf_simple->len == sizeof(struct btp_gap_start_advertising_rp);
+	case BTP_GAP_STOP_ADVERTISING:
+		return buf_simple->len == sizeof(struct btp_gap_stop_advertising_rp);
+	case BTP_GAP_START_DISCOVERY:
+		return buf_simple->len == 0U;
+	case BTP_GAP_STOP_DISCOVERY:
+		return buf_simple->len == 0U;
+	case BTP_GAP_CONNECT:
+		return buf_simple->len == 0U;
+	case BTP_GAP_DISCONNECT:
+		return buf_simple->len == 0U;
+	case BTP_GAP_SET_IO_CAP:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PAIR:
+		return buf_simple->len == 0U;
+	case BTP_GAP_UNPAIR:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PASSKEY_ENTRY:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PASSKEY_CONFIRM:
+		return buf_simple->len == 0U;
+	case BTP_GAP_START_DIRECTED_ADV:
+		return buf_simple->len == sizeof(struct btp_gap_start_directed_adv_rp);
+	case BTP_GAP_CONN_PARAM_UPDATE:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PAIRING_CONSENT:
+		return buf_simple->len == 0U;
+	case BTP_GAP_OOB_LEGACY_SET_DATA:
+		return buf_simple->len == 0U;
+	case BTP_GAP_OOB_SC_GET_LOCAL_DATA:
+		return buf_simple->len == sizeof(struct btp_gap_oob_sc_get_local_data_rp);
+	case BTP_GAP_OOB_SC_SET_REMOTE_DATA:
+		return buf_simple->len == 0U;
+	case BTP_GAP_SET_MITM:
+		return buf_simple->len == 0U;
+	case BTP_GAP_SET_FILTER_LIST:
+		return buf_simple->len == 0U;
+	case BTP_GAP_SET_EXTENDED_ADVERTISING:
+		return buf_simple->len == sizeof(struct btp_gap_set_extended_advertising_rp);
+	case BTP_GAP_PADV_CONFIGURE:
+		return buf_simple->len == sizeof(struct btp_gap_padv_start_rp);
+	case BTP_GAP_PADV_STOP:
+		return buf_simple->len == sizeof(struct btp_gap_padv_stop_rp);
+	case BTP_GAP_PADV_SET_DATA:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PADV_CREATE_SYNC:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PADV_SYNC_TRANSFER_SET_INFO:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PADV_SYNC_TRANSFER_START:
+		return buf_simple->len == 0U;
+	case BTP_GAP_PADV_SYNC_TRANSFER_RECV:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_GAP_EV_NEW_SETTINGS:
+		return buf_simple->len == sizeof(struct btp_gap_new_settings_ev);
+	case BTP_GAP_EV_DEVICE_FOUND:
+		if (hdr->len >= sizeof(struct btp_gap_device_found_ev)) {
+			const struct btp_gap_device_found_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gap_device_found_ev));
+
+			return ev->eir_data_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_GAP_EV_DEVICE_CONNECTED:
+		return buf_simple->len == sizeof(struct btp_gap_device_connected_ev);
+	case BTP_GAP_EV_DEVICE_DISCONNECTED:
+		return buf_simple->len == sizeof(struct btp_gap_device_disconnected_ev);
+	case BTP_GAP_EV_PASSKEY_DISPLAY:
+		return buf_simple->len == sizeof(struct btp_gap_passkey_display_ev);
+	case BTP_GAP_EV_PASSKEY_ENTRY_REQ:
+		return buf_simple->len == sizeof(struct btp_gap_passkey_entry_req_ev);
+	case BTP_GAP_EV_PASSKEY_CONFIRM_REQ:
+		return buf_simple->len == sizeof(struct btp_gap_passkey_confirm_req_ev);
+	case BTP_GAP_EV_IDENTITY_RESOLVED:
+		return buf_simple->len == sizeof(struct btp_gap_identity_resolved_ev);
+	case BTP_GAP_EV_CONN_PARAM_UPDATE:
+		return buf_simple->len == sizeof(struct btp_gap_conn_param_update_ev);
+	case BTP_GAP_EV_SEC_LEVEL_CHANGED:
+		return buf_simple->len == sizeof(struct btp_gap_sec_level_changed_ev);
+	case BTP_GAP_EV_PAIRING_CONSENT_REQ:
+		return buf_simple->len == sizeof(struct btp_gap_pairing_consent_req_ev);
+	case BTP_GAP_EV_BOND_LOST:
+		return buf_simple->len == sizeof(struct btp_gap_bond_lost_ev);
+	case BTP_GAP_EV_PAIRING_FAILED:
+		return buf_simple->len == sizeof(struct btp_gap_bond_pairing_failed_ev);
+	case BTP_GAP_EV_PERIODIC_SYNC_ESTABLISHED:
+		return buf_simple->len == sizeof(struct btp_gap_ev_periodic_sync_established_ev);
+	case BTP_GAP_EV_PERIODIC_SYNC_LOST:
+		return buf_simple->len == sizeof(struct btp_gap_ev_periodic_sync_lost_ev);
+	case BTP_GAP_EV_PERIODIC_REPORT:
+		if (hdr->len >= sizeof(struct btp_gap_ev_periodic_report_ev)) {
+			const struct btp_gap_ev_periodic_report_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gap_ev_periodic_report_ev));
+
+			return ev->data_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_GAP_EV_PERIODIC_TRANSFER_RECEIVED:
+		if (hdr->len >= sizeof(struct btp_gap_ev_periodic_transfer_received_ev)) {
+			const struct btp_gap_ev_periodic_transfer_received_ev *ev =
+				net_buf_simple_pull_mem(
+					buf_simple,
+					sizeof(struct btp_gap_ev_periodic_transfer_received_ev));
+
+			return ev->data_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_gatt_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_GATT_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_GATT_ADD_SERVICE:
+		return buf_simple->len == sizeof(struct btp_gatt_add_service_rp);
+	case BTP_GATT_ADD_CHARACTERISTIC:
+		return buf_simple->len == sizeof(struct btp_gatt_add_characteristic_rp);
+	case BTP_GATT_ADD_DESCRIPTOR:
+		return buf_simple->len == sizeof(struct btp_gatt_add_descriptor_rp);
+	case BTP_GATT_ADD_INCLUDED_SERVICE:
+		return buf_simple->len == sizeof(struct btp_gatt_add_included_service_rp);
+	case BTP_GATT_SET_VALUE:
+		return buf_simple->len == 0U;
+	case BTP_GATT_START_SERVER:
+		return buf_simple->len == sizeof(struct btp_gatt_start_server_rp);
+	case BTP_GATT_RESET_SERVER:
+		return buf_simple->len == 0U;
+	case BTP_GATT_SET_ENC_KEY_SIZE:
+		return buf_simple->len == 0U;
+	case BTP_GATT_EXCHANGE_MTU:
+		return buf_simple->len == 0U;
+	case BTP_GATT_DISC_ALL_PRIM:
+		if (hdr->len >= sizeof(struct btp_gatt_disc_all_prim_rp)) {
+			const struct btp_gatt_disc_all_prim_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_disc_all_prim_rp));
+
+			for (uint8_t i = 0U; i < rp->services_count; i++) {
+				const struct btp_gatt_service *svc;
+
+				if (buf_simple->len < sizeof(*svc)) {
+					return false;
+				}
+
+				svc = net_buf_simple_pull_mem(buf_simple, sizeof(*svc));
+				if (buf_simple->len < svc->uuid_length) {
+					return false;
+				}
+			}
+
+			return buf_simple->len == 0U;
+		} else {
+			return false;
+		}
+	case BTP_GATT_DISC_PRIM_UUID:
+		if (hdr->len >= sizeof(struct btp_gatt_disc_prim_rp)) {
+			const struct btp_gatt_disc_prim_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_disc_prim_rp));
+
+			for (uint8_t i = 0U; i < rp->services_count; i++) {
+				const struct btp_gatt_service *svc;
+
+				if (buf_simple->len < sizeof(*svc)) {
+					return false;
+				}
+
+				svc = net_buf_simple_pull_mem(buf_simple, sizeof(*svc));
+				if (buf_simple->len < svc->uuid_length) {
+					return false;
+				}
+			}
+
+			return buf_simple->len == 0U;
+		} else {
+			return false;
+		}
+	case BTP_GATT_FIND_INCLUDED:
+		if (hdr->len >= sizeof(struct btp_gatt_find_included_rp)) {
+			const struct btp_gatt_find_included_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_find_included_rp));
+
+			for (uint8_t i = 0U; i < rp->services_count; i++) {
+				const struct btp_gatt_included *incl;
+
+				if (buf_simple->len < sizeof(*incl)) {
+					return false;
+				}
+
+				incl = net_buf_simple_pull_mem(buf_simple, sizeof(*incl));
+				if (buf_simple->len < incl->service.uuid_length) {
+					return false;
+				}
+			}
+
+			return buf_simple->len == 0U;
+		} else {
+			return false;
+		}
+	case BTP_GATT_DISC_ALL_CHRC:
+		if (hdr->len >= sizeof(struct btp_gatt_disc_chrc_rp)) {
+			const struct btp_gatt_disc_chrc_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_disc_chrc_rp));
+
+			for (uint8_t i = 0U; i < rp->characteristics_count; i++) {
+				const struct btp_gatt_characteristic *chrc;
+
+				if (buf_simple->len < sizeof(*chrc)) {
+					return false;
+				}
+
+				chrc = net_buf_simple_pull_mem(buf_simple, sizeof(*chrc));
+				if (buf_simple->len < chrc->uuid_length) {
+					return false;
+				}
+			}
+
+			return buf_simple->len == 0U;
+		} else {
+			return false;
+		}
+	case BTP_GATT_DISC_ALL_DESC:
+		if (hdr->len >= sizeof(struct btp_gatt_disc_all_desc_rp)) {
+			const struct btp_gatt_disc_all_desc_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_disc_all_desc_rp));
+
+			for (uint8_t i = 0U; i < rp->descriptors_count; i++) {
+				const struct btp_gatt_descriptor *desc;
+
+				if (buf_simple->len < sizeof(*desc)) {
+					return false;
+				}
+
+				desc = net_buf_simple_pull_mem(buf_simple, sizeof(*desc));
+				if (buf_simple->len < desc->uuid_length) {
+					return false;
+				}
+			}
+
+			return buf_simple->len == 0U;
+		} else {
+			return false;
+		}
+	case BTP_GATT_READ:
+		if (hdr->len >= sizeof(struct btp_gatt_read_rp)) {
+			const struct btp_gatt_read_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_read_rp));
+
+			return buf_simple->len == rp->data_length;
+		} else {
+			return false;
+		}
+	case BTP_GATT_READ_UUID:
+		if (hdr->len >= sizeof(struct btp_gatt_read_uuid_rp)) {
+			const struct btp_gatt_read_uuid_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_read_uuid_rp));
+
+			for (uint8_t i = 0U; i < rp->values_count; i++) {
+				const struct btp_gatt_char_value *value;
+
+				if (buf_simple->len < sizeof(*value)) {
+					return false;
+				}
+
+				value = net_buf_simple_pull_mem(buf_simple, sizeof(*value));
+				if (buf_simple->len < value->data_len) {
+					return false;
+				}
+			}
+
+			return buf_simple->len == 0U;
+		} else {
+			return false;
+		}
+	case BTP_GATT_READ_LONG:
+		if (hdr->len >= sizeof(struct btp_gatt_read_long_rp)) {
+			const struct btp_gatt_read_long_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_read_long_rp));
+
+			return buf_simple->len == rp->data_length;
+		} else {
+			return false;
+		}
+	case BTP_GATT_READ_MULTIPLE:
+		if (hdr->len >= sizeof(struct btp_gatt_read_multiple_rp)) {
+			const struct btp_gatt_read_multiple_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_read_multiple_rp));
+
+			return buf_simple->len == rp->data_length;
+		} else {
+			return false;
+		}
+	case BTP_GATT_WRITE_WITHOUT_RSP:
+		return buf_simple->len == 0U;
+	case BTP_GATT_SIGNED_WRITE_WITHOUT_RSP:
+		return buf_simple->len == 0U;
+	case BTP_GATT_WRITE:
+		return buf_simple->len == sizeof(struct btp_gatt_write_rp);
+	case BTP_GATT_WRITE_LONG:
+		return buf_simple->len == sizeof(struct btp_gatt_write_long_rp);
+	case BTP_GATT_RELIABLE_WRITE:
+		return buf_simple->len == sizeof(struct btp_gatt_reliable_write_rp);
+	case BTP_GATT_GET_ATTRIBUTES:
+		if (hdr->len >= sizeof(struct btp_gatt_get_attributes_rp)) {
+			const struct btp_gatt_get_attributes_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_get_attributes_rp));
+
+			return buf_simple->len == rp->attrs_count;
+		} else {
+			return false;
+		}
+	case BTP_GATT_GET_ATTRIBUTE_VALUE:
+		if (hdr->len >= sizeof(struct btp_gatt_get_attribute_value_rp)) {
+			const struct btp_gatt_get_attribute_value_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_get_attribute_value_rp));
+
+			return buf_simple->len == rp->value_length;
+		} else {
+			return false;
+		}
+	case BTP_GATT_CHANGE_DB:
+		return buf_simple->len == 0U;
+	case BTP_GATT_EATT_CONNECT:
+		return buf_simple->len == 0U;
+	case BTP_GATT_READ_MULTIPLE_VAR:
+		if (hdr->len >= sizeof(struct btp_gatt_read_multiple_var_rp)) {
+			const struct btp_gatt_read_multiple_var_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_read_multiple_var_rp));
+
+			return buf_simple->len == rp->data_length;
+		} else {
+			return false;
+		}
+	case BTP_GATT_NOTIFY_MULTIPLE:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_GATT_EV_NOTIFICATION:
+		if (hdr->len >= sizeof(struct btp_gatt_notification_ev)) {
+			const struct btp_gatt_notification_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_notification_ev));
+
+			return ev->data_length == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_GATT_EV_ATTR_VALUE_CHANGED:
+		if (hdr->len >= sizeof(struct btp_gatt_attr_value_changed_ev)) {
+			const struct btp_gatt_attr_value_changed_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_attr_value_changed_ev));
+
+			return ev->data_length == buf_simple->len;
+		} else {
+			return false;
+		}
+
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_l2cap_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_L2CAP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_L2CAP_CONNECT:
+		if (hdr->len >= sizeof(struct btp_l2cap_connect_rp)) {
+			const struct btp_l2cap_connect_rp *rp = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_l2cap_connect_rp));
+
+			return rp->num == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_L2CAP_DISCONNECT:
+		return buf_simple->len == 0U;
+	case BTP_L2CAP_SEND_DATA:
+		return buf_simple->len == 0U;
+	case BTP_L2CAP_LISTEN:
+		return buf_simple->len == 0U;
+	case BTP_L2CAP_ACCEPT_CONNECTION:
+		return buf_simple->len == 0U;
+	case BTP_L2CAP_RECONFIGURE:
+		return buf_simple->len == 0U;
+	case BTP_L2CAP_CREDITS:
+		return buf_simple->len == 0U;
+	case BTP_L2CAP_DISCONNECT_EATT_CHANS:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_L2CAP_EV_CONNECTION_REQ:
+		return buf_simple->len == sizeof(struct btp_l2cap_connection_req_ev);
+	case BTP_L2CAP_EV_CONNECTED:
+		return buf_simple->len == sizeof(struct btp_l2cap_connected_ev);
+	case BTP_L2CAP_EV_DISCONNECTED:
+		return buf_simple->len == sizeof(struct btp_l2cap_disconnected_ev);
+	case BTP_L2CAP_EV_DATA_RECEIVED:
+		if (hdr->len >= sizeof(struct btp_gatt_attr_value_changed_ev)) {
+			const struct btp_gatt_attr_value_changed_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_gatt_attr_value_changed_ev));
+
+			return ev->data_length == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_L2CAP_EV_RECONFIGURED:
+		return buf_simple->len == sizeof(struct btp_l2cap_reconfigured_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_mesh_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_MESH_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_MESH_CONFIG_PROVISIONING:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PROVISION_NODE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_INIT:
+		return buf_simple->len == 0U;
+	case BTP_MESH_INPUT_STRING:
+		return buf_simple->len == 0U;
+	case BTP_MESH_IVU_TEST_MODE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_IVU_TOGGLE_STATE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_NET_SEND:
+		return buf_simple->len == 0U;
+	case BTP_MESH_HEALTH_GENERATE_FAULTS:
+		if (hdr->len >= sizeof(struct btp_mesh_health_generate_faults_rp)) {
+			const struct btp_mesh_health_generate_faults_rp *rp =
+				net_buf_simple_pull_mem(
+					buf_simple,
+					sizeof(struct btp_mesh_health_generate_faults_rp));
+
+			return (rp->cur_faults_count + rp->reg_faults_count) == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_MESH_HEALTH_CLEAR_FAULTS:
+		return buf_simple->len == 0U;
+	case BTP_MESH_LPN:
+		return buf_simple->len == 0U;
+	case BTP_MESH_LPN_POLL:
+		return buf_simple->len == 0U;
+	case BTP_MESH_MODEL_SEND:
+		return buf_simple->len == 0U;
+	case BTP_MESH_LPN_SUBSCRIBE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_LPN_UNSUBSCRIBE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPL_CLEAR:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PROXY_IDENTITY:
+		return buf_simple->len == 0U;
+	case BTP_MESH_COMP_DATA_GET:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_MESH_CFG_BEACON_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_beacon_get_rp);
+	case BTP_MESH_CFG_BEACON_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_beacon_set_rp);
+	case BTP_MESH_CFG_DEFAULT_TTL_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_default_ttl_get_rp);
+	case BTP_MESH_CFG_DEFAULT_TTL_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_default_ttl_set_rp);
+	case BTP_MESH_CFG_GATT_PROXY_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_gatt_proxy_get_rp);
+	case BTP_MESH_CFG_GATT_PROXY_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_gatt_proxy_set_rp);
+	case BTP_MESH_CFG_FRIEND_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_friend_get_rp);
+	case BTP_MESH_CFG_FRIEND_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_friend_set_rp);
+	case BTP_MESH_CFG_RELAY_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_relay_get_rp);
+	case BTP_MESH_CFG_RELAY_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_relay_set_rp);
+	case BTP_MESH_CFG_MODEL_PUB_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_pub_get_rp);
+	case BTP_MESH_CFG_MODEL_PUB_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_pub_set_rp);
+	case BTP_MESH_CFG_MODEL_SUB_ADD:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_add_rp);
+	case BTP_MESH_CFG_MODEL_SUB_DEL:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_del_rp);
+	case BTP_MESH_CFG_NETKEY_ADD:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_netkey_add_rp);
+	case BTP_MESH_CFG_NETKEY_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_netkey_get_rp);
+	case BTP_MESH_CFG_NETKEY_DEL:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_netkey_del_rp);
+	case BTP_MESH_CFG_APPKEY_ADD:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_appkey_add_rp);
+	case BTP_MESH_CFG_APPKEY_DEL:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_appkey_del_rp);
+	case BTP_MESH_CFG_APPKEY_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_appkey_get_rp);
+	case BTP_MESH_CFG_MODEL_APP_BIND:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_app_bind_rp);
+	case BTP_MESH_CFG_MODEL_APP_UNBIND:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_app_unbind_rp);
+	case BTP_MESH_CFG_MODEL_APP_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_app_get_rp);
+	case BTP_MESH_CFG_MODEL_APP_VND_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_app_vnd_get_rp);
+	case BTP_MESH_CFG_HEARTBEAT_PUB_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_heartbeat_pub_set_rp);
+	case BTP_MESH_CFG_HEARTBEAT_PUB_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_heartbeat_pub_get_rp);
+	case BTP_MESH_CFG_HEARTBEAT_SUB_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_heartbeat_sub_set_rp);
+	case BTP_MESH_CFG_HEARTBEAT_SUB_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_heartbeat_sub_get_rp);
+	case BTP_MESH_CFG_NET_TRANS_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_net_trans_get_rp);
+	case BTP_MESH_CFG_NET_TRANS_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_net_trans_set_rp);
+	case BTP_MESH_CFG_MODEL_SUB_OVW:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_ovw_rp);
+	case BTP_MESH_CFG_MODEL_SUB_DEL_ALL:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_del_all_rp);
+	case BTP_MESH_CFG_MODEL_SUB_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_get_rp);
+	case BTP_MESH_CFG_MODEL_SUB_GET_VND:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_get_vnd_rp);
+	case BTP_MESH_CFG_MODEL_SUB_VA_ADD:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_va_add_rp);
+	case BTP_MESH_CFG_MODEL_SUB_VA_DEL:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_va_del_rp);
+	case BTP_MESH_CFG_MODEL_SUB_VA_OVW:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_sub_va_ovw_rp);
+	case BTP_MESH_CFG_NETKEY_UPDATE:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_netkey_update_rp);
+	case BTP_MESH_CFG_APPKEY_UPDATE:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_appkey_update_rp);
+	case BTP_MESH_CFG_NODE_IDT_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_node_idt_set_rp);
+	case BTP_MESH_CFG_NODE_IDT_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_node_idt_get_rp);
+	case BTP_MESH_CFG_NODE_RESET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_node_reset_rp);
+	case BTP_MESH_CFG_LPN_TIMEOUT_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_lpn_timeout_rp);
+	case BTP_MESH_CFG_MODEL_PUB_VA_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_pub_va_set_rp);
+	case BTP_MESH_CFG_MODEL_APP_BIND_VND:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_model_app_bind_vnd_rp);
+	case BTP_MESH_HEALTH_FAULT_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_HEALTH_FAULT_CLEAR:
+		return buf_simple->len == sizeof(struct btp_mesh_health_fault_clear_rp);
+	case BTP_MESH_HEALTH_FAULT_TEST:
+		return buf_simple->len == sizeof(struct btp_mesh_health_fault_test_rp);
+	case BTP_MESH_HEALTH_PERIOD_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_HEALTH_PERIOD_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_health_period_set_rp);
+	case BTP_MESH_HEALTH_ATTENTION_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_HEALTH_ATTENTION_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_health_attention_set_rp);
+	case BTP_MESH_PROVISION_ADV:
+		return buf_simple->len == 0U;
+	case BTP_MESH_CFG_KRP_GET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_krp_get_rp);
+	case BTP_MESH_CFG_KRP_SET:
+		return buf_simple->len == sizeof(struct btp_mesh_cfg_krp_set_rp);
+	case BTP_MESH_VA_ADD:
+		return buf_simple->len == sizeof(struct btp_mesh_va_add_rp);
+	case BTP_MESH_PROXY_CONNECT:
+		return buf_simple->len == 0U;
+	case BTP_MESH_SAR_TRANSMITTER_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_SAR_TRANSMITTER_SET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_SAR_RECEIVER_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_SAR_RECEIVER_SET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_LARGE_COMP_DATA_GET:
+		return true /* variable length */;
+	case BTP_MESH_MODELS_METADATA_GET:
+		return true /* variable length */;
+	case BTP_MESH_OPCODES_AGGREGATOR_INIT:
+		return buf_simple->len == 0U;
+	case BTP_MESH_OPCODES_AGGREGATOR_SEND:
+		return buf_simple->len == 0U;
+	case BTP_MESH_COMP_CHANGE_PREPARE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_SCAN_START:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_EXT_SCAN_START:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_SCAN_CAPS_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_SCAN_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_SCAN_STOP:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_LINK_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_LINK_CLOSE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_PROV_REMOTE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_RPR_REPROV_REMOTE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_SUBNET_BRIDGE_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_SUBNET_BRIDGE_SET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_BRIDGING_TABLE_ADD:
+		return buf_simple->len == 0U;
+	case BTP_MESH_BRIDGING_TABLE_REMOVE:
+		return buf_simple->len == 0U;
+	case BTP_MESH_BRIDGED_SUBNETS_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_BRIDGING_TABLE_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_BRIDGING_TABLE_SIZE_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PRIV_BEACON_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PRIV_BEACON_SET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PRIV_GATT_PROXY_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PRIV_GATT_PROXY_SET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PRIV_NODE_ID_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PRIV_NODE_ID_SET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PROXY_PRIVATE_IDENTITY:
+		return buf_simple->len == 0U;
+	case BTP_MESH_OD_PRIV_PROXY_GET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_OD_PRIV_PROXY_SET:
+		return buf_simple->len == 0U;
+	case BTP_MESH_SRPL_CLEAR:
+		return buf_simple->len == 0U;
+	case BTP_MESH_PROXY_SOLICIT:
+		return buf_simple->len == 0U;
+	case BTP_MESH_START:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_MESH_EV_OUT_NUMBER_ACTION:
+		return buf_simple->len == sizeof(struct btp_mesh_out_number_action_ev);
+	case BTP_MESH_EV_OUT_STRING_ACTION:
+		if (hdr->len >= sizeof(struct btp_mesh_out_string_action_ev)) {
+			const struct btp_mesh_out_string_action_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_mesh_out_string_action_ev));
+
+			return ev->string_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_MESH_EV_IN_ACTION:
+		return buf_simple->len == sizeof(struct btp_mesh_in_action_ev);
+	case BTP_MESH_EV_PROVISIONED:
+		return buf_simple->len == 0U;
+	case BTP_MESH_EV_PROV_LINK_OPEN:
+		return buf_simple->len == sizeof(struct btp_mesh_prov_link_open_ev);
+	case BTP_MESH_EV_NET_RECV:
+		if (hdr->len >= sizeof(struct btp_mesh_net_recv_ev)) {
+			const struct btp_mesh_net_recv_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_mesh_net_recv_ev));
+
+			return ev->payload_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_MESH_EV_INVALID_BEARER:
+		return buf_simple->len == sizeof(struct btp_mesh_invalid_bearer_ev);
+	case BTP_MESH_EV_INCOMP_TIMER_EXP:
+		return buf_simple->len == 0U;
+	case BTP_MESH_EV_FRND_ESTABLISHED:
+		return buf_simple->len == sizeof(struct btp_mesh_frnd_established_ev);
+	case BTP_MESH_EV_FRND_TERMINATED:
+		return buf_simple->len == sizeof(struct btp_mesh_frnd_terminated_ev);
+	case BTP_MESH_EV_LPN_ESTABLISHED:
+		return buf_simple->len == sizeof(struct btp_mesh_lpn_established_ev);
+	case BTP_MESH_EV_LPN_TERMINATED:
+		return buf_simple->len == sizeof(struct btp_mesh_lpn_terminated_ev);
+	case BTP_MESH_EV_LPN_POLLED:
+		return buf_simple->len == sizeof(struct btp_mesh_lpn_polled_ev);
+	case BTP_MESH_EV_PROV_NODE_ADDED:
+		return buf_simple->len == sizeof(struct btp_mesh_prov_node_added_ev);
+	case BTP_MESH_EV_MODEL_RECV:
+		return buf_simple->len == sizeof(struct btp_mesh_model_recv_ev);
+	case MESH_EV_BLOB_LOST_TARGET:
+		return buf_simple->len == 0U;
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_mesh_mdl_packet_len(const struct btp_hdr *hdr,
+					 struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	case BTP_MMDL_DFU_INFO_GET:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_BLOB_INFO_GET:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_DFU_UPDATE_METADATA_CHECK:
+		return buf_simple->len == sizeof(struct btp_mmdl_dfu_metadata_check_rp);
+	case BTP_MMDL_DFU_FIRMWARE_UPDATE_GET:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_DFU_FIRMWARE_UPDATE_CANCEL:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_DFU_FIRMWARE_UPDATE_START:
+		return buf_simple->len == sizeof(struct btp_mmdl_dfu_firmware_update_rp);
+	case BTP_MMDL_BLOB_TRANSFER_START:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_BLOB_TRANSFER_CANCEL:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_BLOB_TRANSFER_GET:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_BLOB_SRV_CANCEL:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_DFU_FIRMWARE_UPDATE_APPLY:
+		return buf_simple->len == 0U;
+	case BTP_MMDL_DFU_SRV_APPLY:
+		return buf_simple->len == 0U;
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_vcs_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_VCS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_VCS_SET_VOL:
+		return buf_simple->len == 0U;
+	case BTP_VCS_VOL_UP:
+		return buf_simple->len == 0U;
+	case BTP_VCS_VOL_DOWN:
+		return buf_simple->len == 0U;
+	case BTP_VCS_MUTE:
+		return buf_simple->len == 0U;
+	case BTP_VCS_UNMUTE:
+		return buf_simple->len == 0U;
+
+	/* no events */
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_ias_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* no responses */
+
+	/* events */
+	case BTP_IAS_EV_OUT_ALERT_ACTION:
+		return buf_simple->len == sizeof(struct btp_ias_alert_action_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_aics_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_AICS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_AICS_SET_GAIN:
+		return buf_simple->len == 0U;
+	case BTP_AICS_MUTE:
+		return buf_simple->len == 0U;
+	case BTP_AICS_UNMUTE:
+		return buf_simple->len == 0U;
+	case BTP_AICS_MAN_GAIN_SET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_AUTO_GAIN_SET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_SET_MAN_GAIN_ONLY:
+		return buf_simple->len == 0U;
+	case BTP_AICS_SET_AUTO_GAIN_ONLY:
+		return buf_simple->len == 0U;
+	case BTP_AICS_AUDIO_DESCRIPTION_SET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_MUTE_DISABLE:
+		return buf_simple->len == 0U;
+	case BTP_AICS_GAIN_SETTING_PROP_GET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_TYPE_GET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_STATUS_GET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_STATE_GET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_DESCRIPTION_GET:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_AICS_STATE_EV:
+		return buf_simple->len == sizeof(struct btp_aics_state_ev);
+	case BTP_GAIN_SETTING_PROPERTIES_EV:
+		return buf_simple->len == sizeof(struct btp_gain_setting_properties_ev);
+	case BTP_AICS_INPUT_TYPE_EV:
+		return buf_simple->len == sizeof(struct btp_aics_input_type_ev);
+	case BTP_AICS_DESCRIPTION_EV:
+		if (hdr->len >= sizeof(struct btp_aics_description_ev)) {
+			const struct btp_aics_description_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_aics_description_ev));
+
+			return ev->data_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_AICS_PROCEDURE_EV:
+		return buf_simple->len == sizeof(struct btp_aics_procedure_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_vocs_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_VOCS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_VOCS_UPDATE_LOC:
+		return buf_simple->len == 0U;
+	case BTP_VOCS_UPDATE_DESC:
+		return buf_simple->len == 0U;
+	case BTP_VOCS_STATE_GET:
+		return buf_simple->len == 0U;
+	case BTP_AICS_DESCRIPTION_GET:
+		return buf_simple->len == 0U;
+	case BTP_VOCS_LOCATION_GET:
+		return buf_simple->len == 0U;
+	case BTP_VOCS_OFFSET_STATE_SET:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_VOCS_OFFSET_STATE_EV:
+		return buf_simple->len == sizeof(struct btp_vocs_offset_state_ev);
+	case BTP_VOCS_AUDIO_LOCATION_EV:
+		return buf_simple->len == sizeof(struct btp_vocs_audio_location_ev);
+	case BTP_VOCS_PROCEDURE_EV:
+		return buf_simple->len == sizeof(struct btp_vocs_procedure_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_pacs_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_PACS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_PACS_UPDATE_CHARACTERISTIC:
+		return buf_simple->len == 0U;
+	case BTP_PACS_SET_LOCATION:
+		return buf_simple->len == 0U;
+	case BTP_PACS_SET_AVAILABLE_CONTEXTS:
+		return buf_simple->len == 0U;
+	case BTP_PACS_SET_SUPPORTED_CONTEXTS:
+
+	/* No events */
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_ascs_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_ASCS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_ASCS_CONFIGURE_CODEC:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_CONFIGURE_QOS:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_ENABLE:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_RECEIVER_START_READY:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_RECEIVER_STOP_READY:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_DISABLE:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_RELEASE:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_UPDATE_METADATA:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_ADD_ASE_TO_CIS:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_PRECONFIGURE_QOS:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_ASCS_EV_OPERATION_COMPLETED:
+		return buf_simple->len == sizeof(struct btp_ascs_operation_completed_ev);
+	case BTP_ASCS_EV_CHARACTERISTIC_SUBSCRIBED:
+		return buf_simple->len == 0U;
+	case BTP_ASCS_EV_ASE_STATE_CHANGED:
+		return buf_simple->len == sizeof(struct btp_ascs_ase_state_changed_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_bap_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_BAP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_BAP_DISCOVER:
+		return buf_simple->len == 0U;
+	case BTP_BAP_SEND:
+		return buf_simple->len == sizeof(struct btp_bap_send_rp);
+	case BTP_BAP_BROADCAST_SOURCE_SETUP:
+		return buf_simple->len == sizeof(struct btp_bap_broadcast_source_setup_rp);
+	case BTP_BAP_BROADCAST_SOURCE_RELEASE:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_ADV_START:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_ADV_STOP:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SOURCE_START:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SOURCE_STOP:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SINK_SETUP:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SINK_RELEASE:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SCAN_START:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SCAN_STOP:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SINK_SYNC:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SINK_STOP:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_SINK_BIS_SYNC:
+		return buf_simple->len == 0U;
+	case BTP_BAP_DISCOVER_SCAN_DELEGATORS:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_ASSISTANT_SCAN_START:
+		return buf_simple->len == 0U;
+	case BTP_BAP_BROADCAST_ASSISTANT_SCAN_STOP:
+		return buf_simple->len == 0U;
+	case BTP_BAP_ADD_BROADCAST_SRC:
+		return buf_simple->len == 0U;
+	case BTP_BAP_REMOVE_BROADCAST_SRC:
+		return buf_simple->len == 0U;
+	case BTP_BAP_MODIFY_BROADCAST_SRC:
+		return buf_simple->len == 0U;
+	case BTP_BAP_SET_BROADCAST_CODE:
+		return buf_simple->len == 0U;
+	case BTP_BAP_SEND_PAST:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_BAP_EV_DISCOVERY_COMPLETED:
+		return buf_simple->len == sizeof(struct btp_bap_discovery_completed_ev);
+	case BTP_BAP_EV_CODEC_CAP_FOUND:
+		return buf_simple->len == sizeof(struct btp_bap_codec_cap_found_ev);
+	case BTP_BAP_EV_ASE_FOUND:
+		return buf_simple->len == sizeof(struct btp_bap_ase_found_ev);
+	case BTP_BAP_EV_STREAM_RECEIVED:
+		if (hdr->len >= sizeof(struct btp_bap_stream_received_ev)) {
+			const struct btp_bap_stream_received_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_bap_stream_received_ev));
+
+			return ev->data_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_BAP_EV_BAA_FOUND:
+		return buf_simple->len == sizeof(struct btp_bap_baa_found_ev);
+	case BTP_BAP_EV_BIS_FOUND:
+		if (hdr->len >= sizeof(struct btp_bap_bis_found_ev)) {
+			const struct btp_bap_bis_found_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_bap_bis_found_ev));
+
+			return ev->cc_ltvs_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_BAP_EV_BIS_STREAM_RECEIVED:
+		if (hdr->len >= sizeof(struct btp_bap_stream_received_ev)) {
+			const struct btp_bap_bis_stream_received_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_bap_bis_stream_received_ev));
+
+			return ev->data_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_BAP_EV_SCAN_DELEGATOR_FOUND:
+		return buf_simple->len == sizeof(struct btp_bap_scan_delegator_found_ev);
+	case BTP_BAP_EV_BROADCAST_RECEIVE_STATE:
+		if (hdr->len >= sizeof(struct btp_bap_broadcast_receive_state_ev)) {
+			const struct btp_bap_broadcast_receive_state_ev *ev =
+				net_buf_simple_pull_mem(
+					buf_simple,
+					sizeof(struct btp_bap_broadcast_receive_state_ev));
+
+			for (uint8_t i = 0U; i < ev->num_subgroups; i++) {
+				/* Each subgroup consists of 4 octets of BIS sync, 1 octets
+				 * of metadata length, and then the metadata
+				 */
+				uint8_t metadata_len;
+				uint32_t bis_sync;
+
+				if (buf_simple->len <= (sizeof(bis_sync) + sizeof(metadata_len))) {
+					return false;
+				}
+
+				(void)net_buf_simple_pull_le32(buf_simple);
+				metadata_len = net_buf_simple_pull_u8(buf_simple);
+				if (buf_simple->len < metadata_len) {
+					return false;
+				}
+				(void)net_buf_simple_pull_mem(buf_simple, metadata_len);
+			}
+
+			return buf_simple->len == 0U;
+		} else {
+			return false;
+		}
+	case BTP_BAP_EV_PA_SYNC_REQ:
+		return buf_simple->len == sizeof(struct btp_bap_pa_sync_req_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_has_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_HAS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_HAS_SET_ACTIVE_INDEX:
+		return buf_simple->len == 0U;
+	case BTP_HAS_SET_PRESET_NAME:
+		return buf_simple->len == 0U;
+	case BTP_HAS_REMOVE_PRESET:
+		return buf_simple->len == 0U;
+	case BTP_HAS_ADD_PRESET:
+		return buf_simple->len == 0U;
+	case BTP_HAS_SET_PROPERTIES:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_HAS_EV_OPERATION_COMPLETED:
+		return buf_simple->len == sizeof(struct btp_has_operation_completed_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_micp_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_MICP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_MICP_CTLR_DISCOVER:
+		return buf_simple->len == 0U;
+	case BTP_MICP_CTLR_MUTE_READ:
+		return buf_simple->len == 0U;
+	case BTP_MICP_CTLR_MUTE:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_MICP_DISCOVERED_EV:
+		return buf_simple->len == sizeof(struct btp_micp_discovered_ev);
+	case BTP_MICP_MUTE_STATE_EV:
+		return buf_simple->len == sizeof(struct btp_micp_mute_state_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_csis_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_CSIS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_CSIS_SET_MEMBER_LOCK:
+		return buf_simple->len == 0U;
+	case BTP_CSIS_GET_MEMBER_RSI:
+		return buf_simple->len == sizeof(struct btp_csis_get_member_rsi_rp);
+	case BTP_CSIS_ENC_SIRK_TYPE:
+		return buf_simple->len == 0U;
+
+	/* No events */
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_mics_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_MICS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_MICS_DEV_MUTE_DISABLE:
+		return buf_simple->len == 0U;
+	case BTP_MICS_DEV_MUTE_READ:
+		return buf_simple->len == 0U;
+	case BTP_MICS_DEV_MUTE:
+		return buf_simple->len == 0U;
+	case BTP_MICS_DEV_UNMUTE:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_MICS_MUTE_STATE_EV:
+		return buf_simple->len == sizeof(struct btp_mics_mute_state_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_ccp_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_CCP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_CCP_DISCOVER_TBS:
+		return buf_simple->len == 0U;
+	case BTP_CCP_ACCEPT_CALL:
+		return buf_simple->len == 0U;
+	case BTP_CCP_TERMINATE_CALL:
+		return buf_simple->len == 0U;
+	case BTP_CCP_ORIGINATE_CALL:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_CALL_STATE:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_BEARER_NAME:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_BEARER_UCI:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_BEARER_TECH:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_URI_LIST:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_SIGNAL_STRENGTH:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_SIGNAL_INTERVAL:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_CURRENT_CALLS:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_CCID:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_CALL_URI:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_STATUS_FLAGS:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_OPTIONAL_OPCODES:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_FRIENDLY_NAME:
+		return buf_simple->len == 0U;
+	case BTP_CCP_READ_REMOTE_URI:
+		return buf_simple->len == 0U;
+	case BTP_CCP_SET_SIGNAL_INTERVAL:
+		return buf_simple->len == 0U;
+	case BTP_CCP_HOLD_CALL:
+		return buf_simple->len == 0U;
+	case BTP_CCP_RETRIEVE_CALL:
+		return buf_simple->len == 0U;
+	case BTP_CCP_JOIN_CALLS:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_CCP_EV_DISCOVERED:
+		return buf_simple->len == sizeof(struct btp_ccp_discovered_ev);
+	case BTP_CCP_EV_CALL_STATES:
+		if (hdr->len >= sizeof(struct btp_ccp_call_states_ev)) {
+			const struct btp_ccp_call_states_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_ccp_call_states_ev));
+
+			return (ev->call_count * sizeof(struct bt_tbs_client_call_state)) ==
+			       buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_CCP_EV_CHRC_HANDLES:
+		return buf_simple->len == sizeof(struct btp_ccp_chrc_handles_ev);
+	case BTP_CCP_EV_CHRC_VAL:
+		return buf_simple->len == sizeof(struct btp_ccp_chrc_val_ev);
+	case BTP_CCP_EV_CHRC_STR:
+		if (hdr->len >= sizeof(struct btp_ccp_chrc_str_ev)) {
+			const struct btp_ccp_chrc_str_ev *ev = net_buf_simple_pull_mem(
+				buf_simple, sizeof(struct btp_ccp_chrc_str_ev));
+
+			return ev->data_len == buf_simple->len;
+		} else {
+			return false;
+		}
+	case BTP_CCP_EV_CP:
+		return buf_simple->len == sizeof(struct btp_ccp_cp_ev);
+	case BTP_CCP_EV_CURRENT_CALLS:
+		return buf_simple->len == sizeof(struct btp_ccp_current_calls_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_vcp_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_VCP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_VCP_VOL_CTLR_DISCOVER:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_STATE_READ:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_FLAGS_READ:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_VOL_DOWN:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_VOL_UP:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_UNMUTE_VOL_DOWN:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_UNMUTE_VOL_UP:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_SET_VOL:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_UNMUTE:
+		return buf_simple->len == 0U;
+	case BTP_VCP_VOL_CTLR_MUTE:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_VCP_DISCOVERED_EV:
+		return buf_simple->len == sizeof(struct btp_vcp_discovered_ev);
+	case BTP_VCP_STATE_EV:
+		return buf_simple->len == sizeof(struct btp_vcp_state_ev);
+	case BTP_VCP_FLAGS_EV:
+		return buf_simple->len == sizeof(struct btp_vcp_volume_flags_ev);
+	case BTP_VCP_PROCEDURE_EV:
+		return buf_simple->len == sizeof(struct btp_vcp_procedure_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_cas_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_CAS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_CAS_SET_MEMBER_LOCK:
+		return buf_simple->len == 0U;
+	case BTP_CAS_GET_MEMBER_RSI:
+		return buf_simple->len == sizeof(struct btp_cas_get_member_rsi_rp);
+
+	/* No events */
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_mcp_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_MCP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_MCP_DISCOVER:
+		return buf_simple->len == 0U;
+	case BTP_MCP_TRACK_DURATION_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_TRACK_POSITION_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_TRACK_POSITION_SET:
+		return buf_simple->len == 0U;
+	case BTP_MCP_PLAYBACK_SPEED_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_PLAYBACK_SPEED_SET:
+		return buf_simple->len == 0U;
+	case BTP_MCP_SEEKING_SPEED_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_ICON_OBJ_ID_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_NEXT_TRACK_OBJ_ID_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_NEXT_TRACK_OBJ_ID_SET:
+		return buf_simple->len == 0U;
+	case BTP_MCP_PARENT_GROUP_OBJ_ID_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_CURRENT_GROUP_OBJ_ID_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_CURRENT_GROUP_OBJ_ID_SET:
+		return buf_simple->len == 0U;
+	case BTP_MCP_PLAYING_ORDER_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_PLAYING_ORDER_SET:
+		return buf_simple->len == 0U;
+	case BTP_MCP_PLAYING_ORDERS_SUPPORTED_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_MEDIA_STATE_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_OPCODES_SUPPORTED_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_CONTENT_CONTROL_ID_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_SEGMENTS_OBJ_ID_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_CURRENT_TRACK_OBJ_ID_READ:
+		return buf_simple->len == 0U;
+	case BTP_MCP_CURRENT_TRACK_OBJ_ID_SET:
+		return buf_simple->len == 0U;
+	case BTP_MCP_CMD_SEND:
+		return buf_simple->len == 0U;
+	case BTP_MCP_CMD_SEARCH:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_MCP_DISCOVERED_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_discovered_ev);
+	case BTP_MCP_TRACK_DURATION_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_track_duration_ev);
+	case BTP_MCP_TRACK_POSITION_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_track_position_ev);
+	case BTP_MCP_PLAYBACK_SPEED_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_playback_speed_ev);
+	case BTP_MCP_SEEKING_SPEED_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_seeking_speed_ev);
+	case BTP_MCP_ICON_OBJ_ID_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_icon_obj_id_ev);
+	case BTP_MCP_NEXT_TRACK_OBJ_ID_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_next_track_obj_id_ev);
+	case BTP_MCP_PARENT_GROUP_OBJ_ID_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_parent_group_obj_id_ev);
+	case BTP_MCP_CURRENT_GROUP_OBJ_ID_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_current_group_obj_id_ev);
+	case BTP_MCP_PLAYING_ORDER_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_playing_order_ev);
+	case BTP_MCP_PLAYING_ORDERS_SUPPORTED_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_playing_orders_supported_ev);
+	case BTP_MCP_MEDIA_STATE_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_media_state_ev);
+	case BTP_MCP_OPCODES_SUPPORTED_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_opcodes_supported_ev);
+	case BTP_MCP_CONTENT_CONTROL_ID_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_content_control_id_ev);
+	case BTP_MCP_SEGMENTS_OBJ_ID_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_segments_obj_id_ev);
+	case BTP_MCP_CURRENT_TRACK_OBJ_ID_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_current_track_obj_id_ev);
+	case BTP_MCP_MEDIA_CP_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_media_cp_ev);
+	case BTP_MCP_SEARCH_CP_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_search_cp_ev);
+	case BTP_MCP_NTF_EV:
+		return buf_simple->len == sizeof(struct btp_mcp_cmd_ntf_ev);
+	case BTP_SCP_NTF_EV:
+		return buf_simple->len == sizeof(struct btp_scp_cmd_ntf_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_gmcs_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* No responses */
+	/* No events */
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_hap_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_HAP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_HAP_HA_INIT:
+		return buf_simple->len == 0U;
+	case BTP_HAP_HARC_INIT:
+		return buf_simple->len == 0U;
+	case BTP_HAP_HAUC_INIT:
+		return buf_simple->len == 0U;
+	case BTP_HAP_IAC_INIT:
+		return buf_simple->len == 0U;
+	case BTP_HAP_IAC_DISCOVER:
+		return buf_simple->len == 0U;
+	case BTP_HAP_IAC_SET_ALERT:
+		return buf_simple->len == 0U;
+	case BTP_HAP_HAUC_DISCOVER:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BT_HAP_EV_IAC_DISCOVERY_COMPLETE:
+		return buf_simple->len == sizeof(struct btp_hap_iac_discovery_complete_ev);
+	case BT_HAP_EV_HAUC_DISCOVERY_COMPLETE:
+		return buf_simple->len == sizeof(struct btp_hap_hauc_discovery_complete_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_csip_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_CSIP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_CSIP_DISCOVER:
+		return buf_simple->len == 0U;
+	case BTP_CSIP_START_ORDERED_ACCESS:
+		return buf_simple->len == 0U;
+	case BTP_CSIP_SET_COORDINATOR_LOCK:
+		return buf_simple->len == 0U;
+	case BTP_CSIP_SET_COORDINATOR_RELEASE:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_CSIP_DISCOVERED_EV:
+		return buf_simple->len == sizeof(struct btp_csip_discovered_ev);
+	case BTP_CSIP_SIRK_EV:
+		return buf_simple->len == sizeof(struct btp_csip_sirk_ev);
+	case BTP_CSIP_LOCK_EV:
+		return buf_simple->len == sizeof(struct btp_csip_lock_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_cap_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_CAP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_CAP_DISCOVER:
+		return buf_simple->len == 0U;
+	case BTP_CAP_UNICAST_SETUP_ASE:
+		return buf_simple->len == 0U;
+	case BTP_CAP_UNICAST_AUDIO_START:
+		return buf_simple->len == 0U;
+	case BTP_CAP_UNICAST_AUDIO_UPDATE:
+		return buf_simple->len == 0U;
+	case BTP_CAP_UNICAST_AUDIO_STOP:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_SOURCE_SETUP_STREAM:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_SOURCE_SETUP_SUBGROUP:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_SOURCE_SETUP:
+		return buf_simple->len == sizeof(struct btp_cap_broadcast_source_setup_rp);
+	case BTP_CAP_BROADCAST_SOURCE_RELEASE:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_ADV_START:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_ADV_STOP:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_SOURCE_START:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_SOURCE_STOP:
+		return buf_simple->len == 0U;
+	case BTP_CAP_BROADCAST_SOURCE_UPDATE:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_CAP_EV_DISCOVERY_COMPLETED:
+		return buf_simple->len == sizeof(struct btp_cap_discovery_completed_ev);
+	case BTP_CAP_EV_UNICAST_START_COMPLETED:
+		return buf_simple->len == sizeof(struct btp_cap_unicast_start_completed_ev);
+	case BTP_CAP_EV_UNICAST_STOP_COMPLETED:
+		return buf_simple->len == sizeof(struct btp_cap_unicast_stop_completed_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_tbs_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_TBS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_TBS_REMOTE_INCOMING:
+		return buf_simple->len == 0U;
+	case BTP_TBS_HOLD:
+		return buf_simple->len == 0U;
+	case BTP_TBS_SET_BEARER_NAME:
+		return buf_simple->len == 0U;
+	case BTP_TBS_SET_TECHNOLOGY:
+		return buf_simple->len == 0U;
+	case BTP_TBS_SET_URI_SCHEME:
+		return buf_simple->len == 0U;
+	case BTP_TBS_SET_STATUS_FLAGS:
+		return buf_simple->len == 0U;
+	case BTP_TBS_REMOTE_HOLD:
+		return buf_simple->len == 0U;
+	case BTP_TBS_ORIGINATE:
+		return buf_simple->len == 0U;
+	case BTP_TBS_SET_SIGNAL_STRENGTH:
+		return buf_simple->len == 0U;
+
+	/* No events */
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_tmap_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_TMAP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_TMAP_DISCOVER:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BT_TMAP_EV_DISCOVERY_COMPLETE:
+		return buf_simple->len == sizeof(struct btp_tmap_discovery_complete_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_ots_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_OTS_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_OTS_REGISTER_OBJECT:
+		return buf_simple->len == sizeof(struct btp_ots_register_object_rp);
+
+	/* No events */
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+static bool is_valid_pbp_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
+{
+	switch (hdr->opcode) {
+	/* responses */
+	case BTP_PBP_READ_SUPPORTED_COMMANDS:
+		return buf_simple->len > 0U; /* variable length */
+	case BTP_PBP_SET_PUBLIC_BROADCAST_ANNOUNCEMENT:
+		return buf_simple->len == 0U;
+	case BTP_PBP_SET_BROADCAST_NAME:
+		return buf_simple->len == 0U;
+	case BTP_PBP_BROADCAST_SCAN_START:
+		return buf_simple->len == 0U;
+	case BTP_PBP_BROADCAST_SCAN_STOP:
+		return buf_simple->len == 0U;
+
+	/* events */
+	case BTP_PBP_EV_PUBLIC_BROADCAST_ANNOUNCEMENT_FOUND:
+		return buf_simple->len ==
+		       sizeof(struct btp_pbp_ev_public_broadcast_announcement_found_ev);
+	default:
+		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
+		return false;
+	}
+}
+
+/**
+ * Tests whether the incoming packet from @p buf is valid in terms of packet length
+ *
+ * It verifies responses and events, but not commands
+ */
+static bool is_valid_packet_len(uint8_t buf[], size_t len)
+{
+	struct net_buf_simple buf_simple;
+	const struct btp_hdr *hdr;
+
+	TEST_ASSERT(buf != NULL);
+	LOG_HEXDUMP_DBG(buf, len, "evt");
+
+	/* Make a simple copy of the data so we can pull the data without affecting the original */
+	net_buf_simple_init_with_data(&buf_simple, buf, len);
+	TEST_ASSERT(buf_simple.len >= sizeof(*hdr));
+
+	hdr = net_buf_simple_pull_mem(&buf_simple, sizeof(*hdr));
+
+	/* For all events it shall be true that after getting the header, the header len field and
+	 * the remaining buffer length shall be the same
+	 */
+	if (hdr->len != buf_simple.len) {
+		return false;
+	}
+
+	switch (hdr->service) {
+	case BTP_SERVICE_ID_CORE:
+		return is_valid_core_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_GAP:
+		return is_valid_gap_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_GATT:
+		return is_valid_gatt_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_L2CAP:
+		return is_valid_l2cap_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_MESH:
+		return is_valid_mesh_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_MESH_MDL:
+		return is_valid_mesh_mdl_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_GATT_CLIENT:
+		break; /* Not implemented in Zephyr */
+	case BTP_SERVICE_GATT_SERVER:
+		break; /* Not implemented in Zephyr */
+	case BTP_SERVICE_ID_VCS:
+		return is_valid_vcs_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_IAS:
+		return is_valid_ias_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_AICS:
+		return is_valid_aics_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_VOCS:
+		return is_valid_vocs_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_PACS:
+		return is_valid_pacs_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_ASCS:
+		return is_valid_ascs_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_BAP:
+		return is_valid_bap_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_HAS:
+		return is_valid_has_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_MICP:
+		return is_valid_micp_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_CSIS:
+		return is_valid_csis_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_MICS:
+		return is_valid_mics_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_CCP:
+		return is_valid_ccp_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_VCP:
+		return is_valid_vcp_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_CAS:
+		return is_valid_cas_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_MCP:
+		return is_valid_mcp_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_GMCS:
+		return is_valid_gmcs_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_HAP:
+		return is_valid_hap_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_CSIP:
+		return is_valid_csip_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_CAP:
+		return is_valid_cap_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_TBS:
+		return is_valid_tbs_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_TMAP:
+		return is_valid_tmap_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_OTS:
+		return is_valid_ots_packet_len(hdr, &buf_simple);
+	case BTP_SERVICE_ID_PBP:
+		return is_valid_pbp_packet_len(hdr, &buf_simple);
+	}
+
+	LOG_ERR("Unhandled service 0x%02x", hdr->service);
+	return false;
+}
+
+void bsim_btp_wait_for_evt(uint8_t service, uint8_t opcode, struct net_buf **out_buf)
+{
+	LOG_DBG("Waiting for evt with service 0x%02X and opcode 0x%02X", service, opcode);
+
+	while (true) {
+		const struct btp_hdr *hdr;
+		struct net_buf *buf;
+
+		buf = k_fifo_get(&btp_evt_fifo, K_FOREVER);
+		TEST_ASSERT(buf != NULL);
+
+		hdr = net_buf_pull_mem(buf, sizeof(struct btp_hdr));
+
+		/* TODO: Verify length of event based on the service and opcode */
+		if (hdr->service == service && hdr->opcode == opcode) {
+			if (out_buf != NULL) {
+				/* If the caller provides an out_buf, they are responsible
+				 * for unref'ing it
+				 */
+				*out_buf = net_buf_ref(buf);
+			}
+
+			net_buf_unref(buf);
+
+			LOG_DBG("Got evt with service 0x%02X and opcode 0x%02X", service, opcode);
+
+			return;
+		}
+
+		net_buf_unref(buf);
+	}
+}
+
+static bool recv_cb(uint8_t buf[], size_t buf_len)
+{
+	struct btp_hdr *hdr = (void *)buf;
+	uint16_t len;
+
+	if (buf_len < sizeof(*hdr)) {
+		return false;
+	}
+
+	len = sys_le16_to_cpu(hdr->len);
+	TEST_ASSERT(len <= BTP_MTU - sizeof(*hdr), "Invalid packet length %zu", len);
+
+	if (buf_len < sizeof(*hdr) + len) {
+		return false;
+	}
+
+	TEST_ASSERT(is_valid_packet_len(buf, buf_len),
+		    "Header len %u does not match expected packet length for "
+		    "service 0x%02X and opcode 0x%02X",
+		    hdr->len, hdr->service, hdr->opcode);
+
+	if (hdr->opcode < BTP_EVENT_OPCODE) {
+		struct net_buf *net_buf = net_buf_alloc(&btp_rsp_pool, K_NO_WAIT);
+
+		TEST_ASSERT(buf != NULL);
+
+		net_buf_add_mem(net_buf, buf, buf_len);
+		k_fifo_put(&btp_rsp_fifo, net_buf);
+	} else {
+		struct net_buf *net_buf = net_buf_alloc(&btp_evt_pool, K_NO_WAIT);
+
+		if (net_buf == NULL) {
+			/* Discard the oldest event */
+			net_buf = k_fifo_get(&btp_evt_fifo, K_NO_WAIT);
+			TEST_ASSERT(net_buf != NULL);
+			net_buf_unref(net_buf);
+
+			net_buf = net_buf_alloc(&btp_evt_pool, K_NO_WAIT);
+			TEST_ASSERT(net_buf != NULL);
+		}
+
+		net_buf_add_mem(net_buf, buf, buf_len);
+		k_fifo_put(&btp_evt_fifo, net_buf);
+	}
+
+	buf = NULL;
+
+	return true;
+}
+
+static void timer_expiry_cb(struct k_timer *timer)
+{
+	static uint8_t uart_recv_buf[BTP_MTU];
+	static size_t len;
+
+	while (uart_poll_in(dev, &uart_recv_buf[len]) == 0) {
+		TEST_ASSERT(len < ARRAY_SIZE(uart_recv_buf));
+		len++;
+		if (recv_cb(uart_recv_buf, len)) {
+			len = 0;
+		}
+	}
+}
+
+K_TIMER_DEFINE(timer, timer_expiry_cb, NULL);
+
+/* Uart Poll */
+void bsim_btp_uart_init(void)
+{
+	TEST_ASSERT(device_is_ready(dev));
+
+	k_timer_start(&timer, K_MSEC(10), K_MSEC(10));
+}
+
+static void wait_for_response(const struct btp_hdr *cmd_hdr)
+{
+	const struct btp_hdr *rsp_hdr;
+	struct net_buf *buf;
+
+	buf = k_fifo_get(&btp_rsp_fifo, K_SECONDS(1));
+	TEST_ASSERT(buf != NULL);
+
+	rsp_hdr = (struct btp_hdr *)buf->data;
+	TEST_ASSERT(rsp_hdr->len <= BTP_MTU, "len %u > %d", rsp_hdr->len, BTP_MTU);
+
+	LOG_DBG("rsp service 0x%02X and opcode 0x%02X len %u", cmd_hdr->service, cmd_hdr->opcode,
+		rsp_hdr->len);
+
+	TEST_ASSERT(rsp_hdr->service == cmd_hdr->service && rsp_hdr->opcode == cmd_hdr->opcode);
+
+	net_buf_unref(buf);
+}
+
+/* BTP communication is inspired from `uart_pipe_rx` to achieve a similar API */
+void bsim_btp_send_to_tester(const uint8_t *data, size_t len)
+{
+	const struct btp_hdr *cmd_hdr;
+
+	TEST_ASSERT(data != NULL);
+	TEST_ASSERT(len <= BTP_MTU, "len %zu > %d", len, BTP_MTU);
+	TEST_ASSERT(len >= sizeof(*cmd_hdr), "len %zu <= %zu", len, sizeof(*cmd_hdr));
+
+	cmd_hdr = (const struct btp_hdr *)data;
+	LOG_DBG("cmd service 0x%02X and opcode 0x%02X", cmd_hdr->service, cmd_hdr->opcode);
+
+	for (size_t i = 0U; i < len; i++) {
+		uart_poll_out(dev, data[i]);
+	}
+
+	wait_for_response(cmd_hdr);
+}
diff --git a/tests/bsim/bluetooth/tester/src/bsim_btp.h b/tests/bsim/bluetooth/tester/src/bsim_btp.h
new file mode 100644
index 0000000000000..faad454eb3d75
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/src/bsim_btp.h
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdint.h>
+#include <string.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/net_buf.h>
+
+#include "babblekit/testcase.h"
+
+#include "btp/btp.h"
+
+void bsim_btp_uart_init(void);
+void bsim_btp_send_to_tester(const uint8_t *data, size_t len);
+void bsim_btp_wait_for_evt(uint8_t service, uint8_t opcode, struct net_buf **out_buf);
+
+static inline void bsim_btp_core_register(uint8_t id)
+{
+	struct btp_core_register_service_cmd *cmd;
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_CORE;
+	cmd_hdr->opcode = BTP_CORE_REGISTER_SERVICE;
+	cmd_hdr->index = BTP_INDEX_NONE;
+	cmd = net_buf_simple_add(&cmd_buffer, sizeof(*cmd));
+	cmd->id = id;
+
+	cmd_hdr->len = cmd_buffer.len - sizeof(*cmd_hdr);
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
+static inline void bsim_btp_gap_set_discoverable(uint8_t discoverable)
+{
+	struct btp_gap_set_discoverable_cmd *cmd;
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_GAP;
+	cmd_hdr->opcode = BTP_GAP_SET_DISCOVERABLE;
+	cmd_hdr->index = BTP_INDEX;
+	cmd = net_buf_simple_add(&cmd_buffer, sizeof(*cmd));
+	cmd->discoverable = discoverable;
+
+	cmd_hdr->len = cmd_buffer.len - sizeof(*cmd_hdr);
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
+static inline void bsim_btp_gap_start_advertising(uint8_t adv_data_len, uint8_t scan_rsp_len,
+						  const uint8_t adv_sr_data[],
+						  uint8_t own_addr_type)
+{
+	struct btp_gap_start_advertising_cmd *cmd;
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_GAP;
+	cmd_hdr->opcode = BTP_GAP_START_ADVERTISING;
+	cmd_hdr->index = BTP_INDEX;
+	cmd = net_buf_simple_add(&cmd_buffer, sizeof(*cmd));
+	cmd->adv_data_len = adv_data_len;
+	cmd->scan_rsp_len = scan_rsp_len;
+	if (adv_data_len > 0U) {
+		net_buf_simple_add_mem(&cmd_buffer, adv_sr_data, adv_data_len);
+	}
+	if (scan_rsp_len > 0U) {
+		net_buf_simple_add_mem(&cmd_buffer, adv_sr_data, scan_rsp_len);
+	}
+	net_buf_simple_add_le32(&cmd_buffer, 0xFFFF); /* unused in Zephyr */
+	net_buf_simple_add_u8(&cmd_buffer, own_addr_type);
+
+	cmd_hdr->len = cmd_buffer.len - sizeof(*cmd_hdr);
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
+static inline void bsim_btp_gap_start_discovery(uint8_t flags)
+{
+	struct btp_gap_start_discovery_cmd *cmd;
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_GAP;
+	cmd_hdr->opcode = BTP_GAP_START_DISCOVERY;
+	cmd_hdr->index = BTP_INDEX;
+	cmd = net_buf_simple_add(&cmd_buffer, sizeof(*cmd));
+	cmd->flags = flags;
+
+	cmd_hdr->len = cmd_buffer.len - sizeof(*cmd_hdr);
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
+static inline void bsim_btp_gap_stop_discovery(void)
+{
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_GAP;
+	cmd_hdr->opcode = BTP_GAP_STOP_DISCOVERY;
+	cmd_hdr->index = BTP_INDEX;
+	cmd_hdr->len = cmd_buffer.len - sizeof(*cmd_hdr);
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
+static inline void bsim_btp_wait_for_gap_device_found(bt_addr_le_t *address)
+{
+	struct btp_gap_device_found_ev *ev;
+	struct net_buf *buf;
+
+	bsim_btp_wait_for_evt(BTP_SERVICE_ID_GAP, BTP_GAP_EV_DEVICE_FOUND, &buf);
+	ev = net_buf_pull_mem(buf, sizeof(*ev));
+	if (address != NULL) {
+		bt_addr_le_copy(address, &ev->address);
+	}
+
+	net_buf_unref(buf);
+}
+
+static inline void bsim_btp_gap_connect(const bt_addr_le_t *address, uint8_t own_addr_type)
+{
+	struct btp_gap_connect_cmd *cmd;
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_GAP;
+	cmd_hdr->opcode = BTP_GAP_CONNECT;
+	cmd_hdr->index = BTP_INDEX;
+	cmd = net_buf_simple_add(&cmd_buffer, sizeof(*cmd));
+	bt_addr_le_copy(&cmd->address, address);
+	cmd->own_addr_type = own_addr_type;
+
+	cmd_hdr->len = cmd_buffer.len - sizeof(*cmd_hdr);
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
+static inline void bsim_btp_wait_for_gap_device_connected(bt_addr_le_t *address)
+{
+	struct btp_gap_device_connected_ev *ev;
+	struct net_buf *buf;
+
+	bsim_btp_wait_for_evt(BTP_SERVICE_ID_GAP, BTP_GAP_EV_DEVICE_CONNECTED, &buf);
+	ev = net_buf_pull_mem(buf, sizeof(*ev));
+	if (address != NULL) {
+		bt_addr_le_copy(address, &ev->address);
+	}
+
+	net_buf_unref(buf);
+}
+
+static inline void bsim_btp_gap_disconnect(const bt_addr_le_t *address)
+{
+	struct btp_gap_disconnect_cmd *cmd;
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_GAP;
+	cmd_hdr->opcode = BTP_GAP_DISCONNECT;
+	cmd_hdr->index = BTP_INDEX;
+	cmd = net_buf_simple_add(&cmd_buffer, sizeof(*cmd));
+	bt_addr_le_copy(&cmd->address, address);
+
+	cmd_hdr->len = cmd_buffer.len - sizeof(*cmd_hdr);
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
+static inline void bsim_btp_wait_for_gap_device_disconnected(bt_addr_le_t *address)
+{
+	struct btp_gap_device_disconnected_ev *ev;
+	struct net_buf *buf;
+
+	bsim_btp_wait_for_evt(BTP_SERVICE_ID_GAP, BTP_GAP_EV_DEVICE_DISCONNECTED, &buf);
+	ev = net_buf_pull_mem(buf, sizeof(*ev));
+	if (address != NULL) {
+		bt_addr_le_copy(address, &ev->address);
+	}
+
+	net_buf_unref(buf);
+}
diff --git a/tests/bsim/bluetooth/tester/src/host/gap_central.c b/tests/bsim/bluetooth/tester/src/host/gap_central.c
new file mode 100644
index 0000000000000..1365a081731da
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/src/host/gap_central.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stddef.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/util_macro.h>
+
+#include "babblekit/testcase.h"
+#include "bstests.h"
+
+#include "btp/btp.h"
+#include "bsim_btp.h"
+
+LOG_MODULE_REGISTER(bsim_gap_central, CONFIG_BSIM_BTTESTER_LOG_LEVEL);
+
+static void test_gap_central(void)
+{
+	char addr_str[BT_ADDR_LE_STR_LEN];
+	bt_addr_le_t remote_addr;
+	bt_addr_le_t ev_addr;
+
+	bsim_btp_uart_init();
+
+	bsim_btp_wait_for_evt(BTP_SERVICE_ID_CORE, BTP_CORE_EV_IUT_READY, NULL);
+
+	bsim_btp_core_register(BTP_SERVICE_ID_GAP);
+	bsim_btp_gap_start_discovery(BTP_GAP_DISCOVERY_FLAG_LE);
+	bsim_btp_wait_for_gap_device_found(&remote_addr);
+	bt_addr_le_to_str(&remote_addr, addr_str, sizeof(addr_str));
+	LOG_INF("Found remote device %s", addr_str);
+
+	bsim_btp_gap_stop_discovery();
+	bsim_btp_gap_connect(&remote_addr, BTP_GAP_ADDR_TYPE_IDENTITY);
+	bsim_btp_wait_for_gap_device_connected(&ev_addr);
+	TEST_ASSERT(bt_addr_le_eq(&remote_addr, &ev_addr));
+	LOG_INF("Device %s connected", addr_str);
+
+	/* Keep alive for a little while */
+	k_sleep(K_SECONDS(10));
+
+	bsim_btp_gap_disconnect(&remote_addr);
+	bsim_btp_wait_for_gap_device_disconnected(&ev_addr);
+	TEST_ASSERT(bt_addr_le_eq(&remote_addr, &ev_addr));
+	LOG_INF("Device %s disconnected", addr_str);
+
+	TEST_PASS("PASSED\n");
+}
+
+static const struct bst_test_instance test_sample[] = {
+	{
+		.test_id = "gap_central",
+		.test_descr = "Smoketest for the GAP central BT Tester behavior",
+		.test_main_f = test_gap_central,
+	},
+	BSTEST_END_MARKER,
+};
+
+struct bst_test_list *test_gap_central_install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, test_sample);
+}
diff --git a/tests/bsim/bluetooth/tester/src/host/gap_peripheral.c b/tests/bsim/bluetooth/tester/src/host/gap_peripheral.c
new file mode 100644
index 0000000000000..daa45eb80f8d1
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/src/host/gap_peripheral.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stddef.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util_macro.h>
+
+#include "babblekit/testcase.h"
+#include "bstests.h"
+
+#include "btp/btp.h"
+#include "bsim_btp.h"
+
+LOG_MODULE_REGISTER(bsim_gap_peripheral, CONFIG_BSIM_BTTESTER_LOG_LEVEL);
+
+static void test_gap_peripheral(void)
+{
+	char addr_str[BT_ADDR_LE_STR_LEN];
+	bt_addr_le_t remote_addr;
+	bt_addr_le_t ev_addr;
+
+	bsim_btp_uart_init();
+
+	bsim_btp_wait_for_evt(BTP_SERVICE_ID_CORE, BTP_CORE_EV_IUT_READY, NULL);
+
+	bsim_btp_core_register(BTP_SERVICE_ID_GAP);
+	bsim_btp_gap_set_discoverable(BTP_GAP_GENERAL_DISCOVERABLE);
+	bsim_btp_gap_start_advertising(0U, 0U, NULL, BT_HCI_OWN_ADDR_PUBLIC);
+
+	bsim_btp_wait_for_gap_device_connected(&remote_addr);
+	bt_addr_le_to_str(&remote_addr, addr_str, sizeof(addr_str));
+	LOG_INF("Device %s connected", addr_str);
+
+	bsim_btp_wait_for_gap_device_disconnected(&ev_addr);
+	TEST_ASSERT(bt_addr_le_eq(&remote_addr, &ev_addr));
+	LOG_INF("Device %s disconnected", addr_str);
+
+	TEST_PASS("PASSED\n");
+}
+
+static const struct bst_test_instance test_sample[] = {
+	{
+		.test_id = "gap_peripheral",
+		.test_descr = "Smoketest for the GAP peripheral BT Tester behavior",
+		.test_main_f = test_gap_peripheral,
+	},
+	BSTEST_END_MARKER,
+};
+
+struct bst_test_list *test_gap_peripheral_install(struct bst_test_list *tests)
+{
+	return bst_add_tests(tests, test_sample);
+}
diff --git a/tests/bsim/bluetooth/tester/src/test_main.c b/tests/bsim/bluetooth/tester/src/test_main.c
new file mode 100644
index 0000000000000..12328aebd4f89
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/src/test_main.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stddef.h>
+
+#include "bstests.h"
+
+extern struct bst_test_list *test_gap_central_install(struct bst_test_list *tests);
+extern struct bst_test_list *test_gap_peripheral_install(struct bst_test_list *tests);
+
+bst_test_install_t test_installers[] = {
+	test_gap_central_install,
+	test_gap_peripheral_install,
+	NULL,
+};
+
+int main(void)
+{
+	bst_main();
+	return 0;
+}
diff --git a/tests/bsim/bluetooth/tester/testcase.yaml b/tests/bsim/bluetooth/tester/testcase.yaml
new file mode 100644
index 0000000000000..7adcd6a45fa08
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/testcase.yaml
@@ -0,0 +1,10 @@
+tests:
+  bluetooth.tester_bsim:
+    build_only: true
+    tags:
+      - bluetooth
+    harness: bsim
+    harness_config:
+      bsim_exe_name: tests_bsim_bluetooth_tester_prj_conf
+    platform_allow:
+      - nrf52_bsim/native
diff --git a/tests/bsim/bluetooth/tester/tests_scripts/gap.sh b/tests/bsim/bluetooth/tester/tests_scripts/gap.sh
new file mode 100755
index 0000000000000..2809ad67b2dbc
--- /dev/null
+++ b/tests/bsim/bluetooth/tester/tests_scripts/gap.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# Copyright 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Smoketest for GAP BTP commands with the BT tester
+
+simulation_id="tester_gap"
+verbosity_level=2
+EXECUTE_TIMEOUT=100
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+cd ${BSIM_OUT_PATH}/bin
+
+UART_DIR=/tmp/bs_${USER}/${simulation_id}/
+UART_PER=${UART_DIR}/peripheral
+UART_CEN=${UART_DIR}/central
+
+# Central BT Tester
+Execute ./bs_${BOARD_TS}_tests_bluetooth_tester_prj_conf \
+  -v=${verbosity_level} -s=${simulation_id} -rs=10 -d=0 -RealEncryption=1 \
+  -uart0_fifob_rxfile=${UART_CEN}.tx -uart0_fifob_txfile=${UART_CEN}.rx
+
+# Central Upper Tester
+Execute ./bs_nrf52_bsim_native_tests_bsim_bluetooth_tester_prj_conf \
+  -v=${verbosity_level} -s=${simulation_id} -rs=21 -d=10 -RealEncryption=1 -testid=gap_central \
+  -nosim -uart0_fifob_rxfile=${UART_CEN}.rx -uart0_fifob_txfile=${UART_CEN}.tx
+
+# Peripheral BT Tester
+Execute ./bs_${BOARD_TS}_tests_bluetooth_tester_prj_conf \
+  -v=${verbosity_level} -s=${simulation_id} -rs=32 -d=1 -RealEncryption=1 \
+  -uart0_fifob_rxfile=${UART_PER}.tx -uart0_fifob_txfile=${UART_PER}.rx
+
+# Peripheral Upper Tester
+Execute ./bs_nrf52_bsim_native_tests_bsim_bluetooth_tester_prj_conf \
+  -v=${verbosity_level} -s=${simulation_id} -rs=43 -d=11 -RealEncryption=1 -testid=gap_peripheral \
+  -nosim -uart0_fifob_rxfile=${UART_PER}.rx -uart0_fifob_txfile=${UART_PER}.tx
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} -D=2 -sim_length=20e6 $@
+
+wait_for_background_jobs # Wait for all programs in background and return != 0 if any fails
diff --git a/tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt b/tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt
index 539015d142809..6b2ac3ff03a92 100644
--- a/tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt
+++ b/tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt
@@ -3,7 +3,13 @@
 tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_encrypted_split_privacy.sh
 tests/bsim/bluetooth/ll/throughput/
 tests/bsim/bluetooth/ll/multiple_id/
-tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh
+tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_interleaved.sh
+tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_sequential.sh
+tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_ticker_expire_info.sh
 tests/bsim/bluetooth/samples/central_hr_peripheral_hr/
 tests/bsim/bluetooth/audio_samples/
 tests/bsim/bluetooth/audio/
+tests/bsim/bluetooth/host/gatt/notify_stress/
+tests/bsim/bluetooth/host/misc/hfc/
+tests/bsim/bluetooth/host/misc/hfc_multilink/
+tests/bsim/bluetooth/tester/
diff --git a/tests/bsim/bluetooth/tests.nrf54l15bsim_nrf54l15_cpuapp.txt b/tests/bsim/bluetooth/tests.nrf54l15bsim_nrf54l15_cpuapp.txt
index 1df18c98a4372..d5dee727d5e92 100644
--- a/tests/bsim/bluetooth/tests.nrf54l15bsim_nrf54l15_cpuapp.txt
+++ b/tests/bsim/bluetooth/tests.nrf54l15bsim_nrf54l15_cpuapp.txt
@@ -2,6 +2,9 @@
 # This file is used in CI to select which tests are run
 tests/bsim/bluetooth/ll/throughput/
 tests/bsim/bluetooth/ll/multiple_id/
+tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_interleaved.sh
+tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_sequential.sh
+tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_ticker_expire_info.sh
 tests/bsim/bluetooth/samples/central_hr_peripheral_hr/
 tests/bsim/bluetooth/audio_samples/
 tests/bsim/bluetooth/audio/
diff --git a/tests/bsim/ci.uart.sh b/tests/bsim/ci.uart.sh
index 70d296d23dfa1..35f39b0c62ac9 100755
--- a/tests/bsim/ci.uart.sh
+++ b/tests/bsim/ci.uart.sh
@@ -20,9 +20,4 @@ ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-log
 echo " nRF54L15:"
 ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \
   -p nrf54l15bsim/nrf54l15/cpuapp --fixture gpio_loopback \
-  -- -uart2_loopback
-
-echo "UART: Multi device tests"
-WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh
-RESULTS_FILE=${ZEPHYR_BASE}/bsim_out/bsim_results.uart.52.xml \
-SEARCH_PATH=tests/bsim/drivers/uart/ tests/bsim/run_parallel.sh
+  -- -uart0_loopback -uart2_loopback
diff --git a/tests/bsim/run_parallel.sh b/tests/bsim/run_parallel.sh
index 01eb4bd6aa529..6ddb994a81d19 100755
--- a/tests/bsim/run_parallel.sh
+++ b/tests/bsim/run_parallel.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 # Copyright 2018 Oticon A/S
 # SPDX-License-Identifier: Apache-2.0
+set -eo pipefail
 
 start=$SECONDS
 
@@ -51,7 +52,8 @@ elif [ -n "${TESTS_LIST}" ]; then
 	all_cases=${TESTS_LIST}
 else
 	SEARCH_PATH="${SEARCH_PATH:-.}"
-	all_cases=`find ${SEARCH_PATH} -name "*.sh" | grep -Ev "${sh_filter}"`
+	all_cases=`find ${SEARCH_PATH} -name "*.sh" | grep -Ev "${sh_filter}"` \
+	          || (echo "No tests found"; exit 1)
 	#we dont run ourselves
 fi
 
@@ -98,6 +100,7 @@ if [ `command -v parallel` ]; then
     ' ::: $all_cases >> $tmp_res_file ; err=$?
   fi
 else #fallback in case parallel is not installed
+  set +e
   for case in $all_cases; do
     echo "<testcase name=\"$case\" time=\"0\">" >> $tmp_res_file
     $case $@ &> $i.log
diff --git a/tests/bsim/sh_common.source b/tests/bsim/sh_common.source
index b727b933e1ae9..5231e99f4d320 100644
--- a/tests/bsim/sh_common.source
+++ b/tests/bsim/sh_common.source
@@ -13,7 +13,7 @@ BOARD="${BOARD:-nrf52_bsim/native}"
 BOARD_TS="${BOARD//\//_}"
 
 function run_in_background(){
-  $@ & _process_ids="$_process_ids $!"
+  "$@" & _process_ids="$_process_ids $!"
 }
 
 function wait_for_background_jobs(){
@@ -46,7 +46,7 @@ function Execute() {
   EXECUTE_TIMEOUT="${EXECUTE_TIMEOUT:-30}"
 
   check_program_exists $1
-  run_in_background timeout --kill-after=5 -v ${EXECUTE_TIMEOUT} $@
+  run_in_background timeout --kill-after=5 -v ${EXECUTE_TIMEOUT} "$@"
 }
 
 function _guess_test_relpath(){
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2-pinctrl.dtsi b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2-pinctrl.dtsi
new file mode 100644
index 0000000000000..da259040e9754
--- /dev/null
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2-pinctrl.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pinctrl/arm-mps2-pinctrl.h>
+
+&pinctrl {
+	/omit-if-no-ref/  uart3_default: uart3_default {
+		group1 {
+			pinmux = <UART3_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART3_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	 /omit-if-no-ref/ uart4_default: uart4_default {
+		 group1 {
+			 pinmux = <UART4_TXD_EXP>;
+		};
+
+		group2 {
+			pinmux = <UART4_RXD_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi0_default: spi0_default {
+		group1 {
+			pinmux = <SPI3_SCK_EXP>, <SPI3_SS_EXP>,
+				  <SPI3_MOSI_EXP>;
+		};
+		group2 {
+			pinmux = <SPI3_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ spi1_default: spi1_default {
+		group1 {
+			pinmux = <SPI4_SCK_EXP>, <SPI4_SS_EXP>,
+				 <SPI4_MOSI_EXP>;
+		};
+		group2 {
+			pinmux = <SPI4_MISO_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon0_default: sbcon0_default {
+		group1 {
+			pinmux = <SBCON2_SCL_EXP>, <SBCON2_SDA_EXP>;
+			input-enable;
+		};
+	};
+
+	/omit-if-no-ref/ sbcon1_default: sbcon1_default {
+		group1 {
+			pinmux = <SBCON3_SCL_EXP>, <SBCON3_SDA_EXP>;
+			input-enable;
+		};
+	};
+};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
index 5b1959ff5fe38..b96f1144982a1 100644
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521-common.dtsi
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Linaro Limited
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -112,6 +113,8 @@ uart3: uart@203000 {
 	interrupt-names = "tx", "rx";
 	clocks = <&sysclk>;
 	current-speed = <115200>;
+	pinctrl-0 = <&uart3_default>;
+	pinctrl-names = "default";
 };
 
 uart4: uart@204000 {
@@ -121,6 +124,8 @@ uart4: uart@204000 {
 	interrupt-names = "tx", "rx";
 	clocks = <&sysclk>;
 	current-speed = <115200>;
+	pinctrl-0 = <&uart4_default>;
+	pinctrl-names = "default";
 };
 
 i2c_touch: i2c@207000 {
@@ -145,6 +150,8 @@ i2c_shield0: i2c@20c000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x20c000 0x1000>;
+	pinctrl-0 = <&sbcon0_default>;
+	pinctrl-names = "default";
 };
 
 i2c_shield1: i2c@20d000 {
@@ -153,10 +160,12 @@ i2c_shield1: i2c@20d000 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	reg = <0x20d000 0x1000>;
+	pinctrl-0 = <&sbcon1_default>;
+	pinctrl-names = "default";
 };
 
 gpio_led0: mps2_fpgaio@302000 {
-	compatible = "arm,mps2-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x302000 0x4>;
 	gpio-controller;
@@ -165,16 +174,17 @@ gpio_led0: mps2_fpgaio@302000 {
 };
 
 gpio_button: mps2_fpgaio@302008 {
-	compatible = "arm,mps2-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x302008 0x4>;
 	gpio-controller;
 	#gpio-cells = <1>;
 	ngpios = <2>;
+	direction-input;
 };
 
 gpio_misc: mps2_fpgaio@30204c {
-	compatible = "arm,mps2-fpgaio-gpio";
+	compatible = "arm,mmio32-gpio";
 
 	reg = <0x30204c 0x4>;
 	gpio-controller;
@@ -189,3 +199,8 @@ eth0: eth@2000000 {
 	reg = <0x2000000 0x100000>;
 	interrupts = <48 3>;
 };
+
+pinctrl: pinctrl {
+	compatible = "arm,mps2-pinctrl";
+	status = "okay";
+};
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
index 2bb956645cafa..532384377da5e 100644
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/mps2_an521_cputest.dts
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2019 Linaro Limited
+ * Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -128,3 +129,5 @@
 &uart1 {
 	status = "okay";
 };
+
+#include "mps2-pinctrl.dtsi"
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
index 652c7605f60e3..d12737469d2e6 100644
--- a/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/native/native_sim_extend/native_sim_native_one.dts
@@ -52,7 +52,7 @@
 		#size-cells = <0>;
 
 		cpu0: cpu@0 {
-			compatible = "zephyr,native-posix-cpu";
+			compatible = "zephyr,native-sim-cpu";
 			reg = <0>;
 		};
 	};
@@ -135,7 +135,7 @@
 
 	uart0: uart {
 		status = "okay";
-		compatible = "zephyr,native-posix-uart";
+		compatible = "zephyr,native-pty-uart";
 		/* Dummy current-speed entry to comply with serial
 		 * DTS binding
 		 */
@@ -144,7 +144,7 @@
 
 	uart1: uart_1 {
 		status = "okay";
-		compatible = "zephyr,native-posix-uart";
+		compatible = "zephyr,native-pty-uart";
 		/* Dummy current-speed entry to comply with serial
 		 * DTS binding
 		 */
@@ -153,12 +153,12 @@
 
 	rng: rng {
 		status = "okay";
-		compatible = "zephyr,native-posix-rng";
+		compatible = "zephyr,native-sim-rng";
 	};
 
 	counter0: counter {
 		status = "okay";
-		compatible = "zephyr,native-posix-counter";
+		compatible = "zephyr,native-sim-counter";
 	};
 
 	gpio0: gpio@800 {
diff --git a/tests/cmake/hwm/board_extend/testcase.yaml b/tests/cmake/hwm/board_extend/testcase.yaml
index aae39ce6b2c41..53cfe6a613951 100644
--- a/tests/cmake/hwm/board_extend/testcase.yaml
+++ b/tests/cmake/hwm/board_extend/testcase.yaml
@@ -2,7 +2,7 @@ common:
   tags:
     - cmake
 tests:
-  cmake.board.extend_one:
+  buildsystem.cmake.board.extend_one:
     extra_args:
       # Twister can only lookup known board roots.
       # Thus platform above is set to native_sim, while at this location
@@ -15,7 +15,7 @@ tests:
     integration_platforms:
       - native_sim
       - native_sim/native/64
-  cmake.board.extend_two:
+  buildsystem.cmake.board.extend_two:
     extra_args:
       - CACHED_BOARD=native_sim/native/64/two
     platform_allow:
@@ -24,7 +24,7 @@ tests:
     integration_platforms:
       - native_sim
       - native_sim/native/64
-  cmake.soc.extend_cputest:
+  buildsystem.cmake.soc.extend_cputest:
     extra_args:
       - CACHED_BOARD=mps2/an521/cputest
     platform_allow:
diff --git a/tests/cmake/yaml/CMakeLists.txt b/tests/cmake/yaml/CMakeLists.txt
index 23e1d55322a1f..43f93a28b15ca 100644
--- a/tests/cmake/yaml/CMakeLists.txt
+++ b/tests/cmake/yaml/CMakeLists.txt
@@ -242,6 +242,46 @@ function(test_setting_list_strings)
   endforeach()
 endfunction()
 
+function(test_setting_list_escaped_strings)
+  yaml_create(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+              NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+  )
+
+  set(new_value "back\\slash" "dou\"ble" "sin'gle" "co:lon" "win:\\path")
+  yaml_set(NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+           KEY cmake test set key-list-string LIST ${new_value}
+  )
+
+  yaml_save(NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create)
+
+  # Read-back the yaml and verify the value.
+  yaml_load(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
+            NAME ${CMAKE_CURRENT_FUNCTION}_readback
+  )
+
+  yaml_length(readback NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set key-list-string)
+
+  test_assert(TEST 5 EQUAL ${readback}
+              COMMENT "readback yaml list length does not match original."
+  )
+
+  yaml_get(readback NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set key-list-string)
+
+  foreach(a e IN ZIP_LISTS readback new_value)
+    # cmake_parse_arguments() breaks horribly when given strings that include
+    # escapes, making it impossible to use test_assert() here. Or, for that
+    # matter, even trying to print them in message(). Thanks, CMake!
+    if("${e}" STREQUAL "${a}")
+      message("${CMAKE_CURRENT_FUNCTION}(): Passed")
+    else()
+      message(FATAL_ERROR
+        "${CMAKE_CURRENT_FUNCTION}(): Failed\n"
+        "Test: list values mismatch."
+      )
+    endif()
+  endforeach()
+endfunction()
+
 function(test_append_list_strings)
   yaml_create(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
               NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
@@ -475,7 +515,7 @@ function(test_setting_map_list_entry_commas)
     test_assert(TEST "${readback_name}" STREQUAL "${new_entry_name_${index}}"
                 COMMENT "list values mismatch."
     )
-    test_assert(TEST "'${readback_str}'" STREQUAL "${new_entry_str_${index}}"
+    test_assert(TEST "${readback_str}" STREQUAL "${new_entry_str_${index}}"
                 COMMENT "list values mismatch."
     )
   endforeach()
@@ -653,6 +693,51 @@ function(test_verify_genexes)
   endforeach()
 endfunction()
 
+function(test_setting_escaped_genexes)
+  set(file ${CMAKE_BINARY_DIR}/test_setting_escaped_genexes.yaml)
+  yaml_create(FILE ${file}
+              NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+  )
+
+  set_property(TARGET app PROPERTY escaped_list
+               "back\\slash" "dou\"ble" "sin'gle" "co:lon" "win:\\path")
+  yaml_set(NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
+           KEY cmake test set key-list-string-genex
+           GENEX LIST "$<TARGET_PROPERTY:app,escaped_list>"
+  )
+
+  yaml_save(NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create)
+endfunction()
+
+function(test_verify_escaped_genexes)
+  set(file ${CMAKE_BINARY_DIR}/test_setting_escaped_genexes.yaml)
+  yaml_load(FILE ${file}
+      NAME ${CMAKE_CURRENT_FUNCTION}_readback
+  )
+
+  set(expected "back\\slash" "dou\"ble" "sin'gle" "co:lon" "win:\\path")
+  list(LENGTH expected exp_len)
+
+  yaml_get(readback NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set key-list-string-genex)
+  yaml_length(act_len NAME ${CMAKE_CURRENT_FUNCTION}_readback KEY cmake test set key-list-string-genex)
+
+  test_assert(TEST ${exp_len} EQUAL ${act_len}
+              COMMENT "yaml list length does not match expectation."
+  )
+
+  foreach(a e IN ZIP_LISTS readback expected)
+    # See comment in test_setting_list_escaped_strings() for why test_assert() is not used here.
+    if("${e}" STREQUAL "${a}")
+      message("${CMAKE_CURRENT_FUNCTION}(): Passed")
+    else()
+      message(FATAL_ERROR
+        "${CMAKE_CURRENT_FUNCTION}(): Failed\n"
+        "Test: key-list-string-genex list values mismatch."
+      )
+    endif()
+  endforeach()
+endfunction()
+
 function(test_set_remove_int)
   yaml_create(FILE ${CMAKE_BINARY_DIR}/${CMAKE_CURRENT_FUNCTION}_test_create.yaml
               NAME ${CMAKE_CURRENT_FUNCTION}_yaml-create
@@ -728,6 +813,7 @@ test_save_new_file()
 test_setting_int()
 test_setting_string()
 test_setting_list_strings()
+test_setting_list_escaped_strings()
 test_setting_list_int()
 test_setting_map_list_entry()
 test_setting_map_list_entry_windows()
@@ -749,6 +835,7 @@ test_fail_missing_filename()
 if(NOT CMAKE_SCRIPT_MODE_FILE)
   # create a file containing genexes
   test_setting_genexes()
+  test_setting_escaped_genexes()
 
   # Spawn a new CMake instance to re-run the whole test suite in script mode
   # and verify the genex values once the associated target is built.
@@ -756,6 +843,7 @@ if(NOT CMAKE_SCRIPT_MODE_FILE)
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_LIST_FILE}
   )
 else()
-  # verify the contents of the created genex file
+  # verify the contents of the created genex files
   test_verify_genexes()
+  test_verify_escaped_genexes()
 endif()
diff --git a/tests/drivers/adc/adc_accuracy_test/Kconfig b/tests/drivers/adc/adc_accuracy_test/Kconfig
index 736638af20276..cc9e640a25728 100644
--- a/tests/drivers/adc/adc_accuracy_test/Kconfig
+++ b/tests/drivers/adc/adc_accuracy_test/Kconfig
@@ -1,4 +1,5 @@
 # Copyright (c) 2023 Intel Corporation
+# Copyright (c) 2025 Renesas Electronics Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -11,6 +12,7 @@ ZEPHYR_USER := zephyr,user
 
 config DAC_SOURCE_TEST
 	bool
+	select DAC
 	default y if $(dt_node_has_prop,/$(ZEPHYR_USER),dac)
 
 config REFERENCE_VOLTAGE_TEST
@@ -20,3 +22,12 @@ config REFERENCE_VOLTAGE_TEST
 config NUMBER_OF_PASSES
 	int "Number of passes"
 	default 5
+
+if DAC_SOURCE_TEST
+
+config DAC_BUFFER_NOT_SUPPORTED
+	bool "DAC on board/SoC does not support output buffer mode"
+	help
+	  If this config is selected, the test will run with no output buffer enabled
+
+endif # DAC_SOURCE_TEST
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4e2.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4e2.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4e2.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4e2.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4l1.conf b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4l1.conf
new file mode 100644
index 0000000000000..c62973e5d9c43
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4l1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORTED=y
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4l1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4l1.overlay
new file mode 100644
index 0000000000000..33657ece6cb64
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4l1.overlay
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 1>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
+	};
+};
+
+&adc0{
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m1.conf b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m1.conf
new file mode 100644
index 0000000000000..c62973e5d9c43
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORTED=y
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..fb66167f36bde
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m1.overlay
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
+	};
+};
+
+&adc0{
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m2.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m2.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m2.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m2.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m3.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m3.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m3.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4m3.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4w1.conf b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4w1.conf
new file mode 100644
index 0000000000000..c62973e5d9c43
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4w1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORTED=y
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4w1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4w1.overlay
index 9d3c36bdf9805..a202ba4d2c56d 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4w1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra4w1.overlay
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 4>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6e2.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6e2.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6e2.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6e2.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m1.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m1.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m2.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m2.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m2.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m2.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m3.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m3.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m3.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m3.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m4.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m4.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m4.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m4.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m5.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m5.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m5.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra6m5.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8d1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8d1.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8d1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8d1.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ek_ra8m1.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra4e1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra4e1.overlay
index 442a7020b7fdc..fb66167f36bde 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra4e1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra4e1.overlay
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference_mv = <3300>;
-		expected_accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e1.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e1.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e2.overlay b/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e2.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e2.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/fpb_ra6e2.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/frdm_k64f.conf b/tests/drivers/adc/adc_accuracy_test/boards/frdm_k64f.conf
deleted file mode 100644
index 5ddebe8a96e44..0000000000000
--- a/tests/drivers/adc/adc_accuracy_test/boards/frdm_k64f.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DAC=y
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/mck_ra8t1.overlay b/tests/drivers/adc/adc_accuracy_test/boards/mck_ra8t1.overlay
index 1de81f3600d68..f3269f1c97020 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/mck_ra8t1.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/mck_ra8t1.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Renesas Electronics Corporation
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,8 +7,9 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 0>;
-		reference-mv = <3300>;
-		expected-accuracy = <32>;
+		dac = <&dac0>;
+		dac-channel-id = <0>;
+		dac-resolution = <12>;
 	};
 };
 
@@ -23,6 +24,5 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,resolution = <12>;
-		zephyr,vref-mv = <3300>;
 	};
 };
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_accuracy_test/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..19f2b090d1476
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>;
+		reference-mv = <1800>;
+		expected-accuracy = <64>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1_2";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <14>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/xg24_dk2601b.overlay b/tests/drivers/adc/adc_accuracy_test/boards/xg24_dk2601b.overlay
index e2b7bfce92925..dd3463aecde28 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/xg24_dk2601b.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/xg24_dk2601b.overlay
@@ -9,8 +9,8 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 4>;
-		reference_mv = <(3300 / 4)>;
-		expected_accuracy = <32>;
+		reference-mv = <(3300 / 4)>;
+		expected-accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/xg24_rb4187c.overlay b/tests/drivers/adc/adc_accuracy_test/boards/xg24_rb4187c.overlay
new file mode 100644
index 0000000000000..ba5d7bd1d39f9
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/xg24_rb4187c.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "dt-bindings/adc/silabs-adc.h"
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 4>;
+		reference-mv = <(3300 / 4)>;
+		expected-accuracy = <32>;
+	};
+};
+
+&adc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	channel@4 {
+		reg = <4>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_AVDD>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/xg27_dk2602a.overlay b/tests/drivers/adc/adc_accuracy_test/boards/xg27_dk2602a.overlay
index e2b7bfce92925..dd3463aecde28 100644
--- a/tests/drivers/adc/adc_accuracy_test/boards/xg27_dk2602a.overlay
+++ b/tests/drivers/adc/adc_accuracy_test/boards/xg27_dk2602a.overlay
@@ -9,8 +9,8 @@
 / {
 	zephyr,user {
 		io-channels = <&adc0 4>;
-		reference_mv = <(3300 / 4)>;
-		expected_accuracy = <32>;
+		reference-mv = <(3300 / 4)>;
+		expected-accuracy = <32>;
 	};
 };
 
diff --git a/tests/drivers/adc/adc_accuracy_test/boards/xg29_rb4412a.overlay b/tests/drivers/adc/adc_accuracy_test/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..0cde575193a3b
--- /dev/null
+++ b/tests/drivers/adc/adc_accuracy_test/boards/xg29_rb4412a.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "dt-bindings/adc/silabs-adc.h"
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 4>;
+		reference-mv = <(3300 / 4)>;
+		expected-accuracy = <32>;
+	};
+};
+
+&adc0{
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@4 {
+		reg = <4>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_AVDD>;
+	};
+};
diff --git a/tests/drivers/adc/adc_accuracy_test/src/dac_source.c b/tests/drivers/adc/adc_accuracy_test/src/dac_source.c
index 34a857fb011d2..23b832a66ed3f 100644
--- a/tests/drivers/adc/adc_accuracy_test/src/dac_source.c
+++ b/tests/drivers/adc/adc_accuracy_test/src/dac_source.c
@@ -18,7 +18,7 @@ extern const struct adc_dt_spec *get_adc_channel(void);
 static const struct dac_channel_cfg dac_ch_cfg = {
 	.channel_id = DT_PROP(DT_PATH(zephyr_user), dac_channel_id),
 	.resolution = DT_PROP(DT_PATH(zephyr_user), dac_resolution),
-	.buffered = true
+	.buffered = !IS_ENABLED(CONFIG_DAC_BUFFER_NOT_SUPPORTED),
 };
 
 static const struct device *init_dac(void)
diff --git a/tests/drivers/adc/adc_accuracy_test/testcase.yaml b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
index 26cbf064d7252..51a4cd53e2a44 100644
--- a/tests/drivers/adc/adc_accuracy_test/testcase.yaml
+++ b/tests/drivers/adc/adc_accuracy_test/testcase.yaml
@@ -23,6 +23,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - ek_ra8d1
       - mck_ra8t1
       - ek_ra6e2
@@ -38,6 +39,8 @@ tests:
       - ek_ra4m3
       - ek_ra4w1
       - xg24_dk2601b
+      - xg24_rb4187c
       - xg27_dk2602a
+      - xg29_rb4412a
     integration_platforms:
       - frdm_kl25z
diff --git a/tests/drivers/adc/adc_api/Kconfig b/tests/drivers/adc/adc_api/Kconfig
index 5807a1c155f06..f4748c6d3805e 100644
--- a/tests/drivers/adc/adc_api/Kconfig
+++ b/tests/drivers/adc/adc_api/Kconfig
@@ -10,3 +10,6 @@ source "Kconfig.zephyr"
 config ADC_API_SAMPLE_INTERVAL_US
 	int "Interval between repeatead samples in us"
 	default 0
+
+config ADC_32_BITS_DATA
+	bool "ADC data is 32-bits long"
diff --git a/tests/drivers/adc/adc_api/boards/arduino_due.overlay b/tests/drivers/adc/adc_api/boards/arduino_due.overlay
new file mode 100644
index 0000000000000..b14564e89402c
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/arduino_due.overlay
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 Centro de Inovacao EDGE
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>, <&adc0 1>;
+	};
+};
+
+&adc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	pinctrl-0 = <&adc0_default>;
+	pinctrl-names = "default";
+
+	prescaler = <9>;
+	startup-time = <64>;
+	settling-time = <3>;
+	tracking-time = <2>;
+
+	/* External ADC(+) */
+	channel@6 { // Connector A1
+		reg = <6>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <6>;
+		zephyr,vref-mv = <3300>;
+	};
+	channel@7 { // Connector A0
+		reg = <7>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <7>;
+		zephyr,vref-mv = <3300>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/arduino_uno_r4.overlay b/tests/drivers/adc/adc_api/boards/arduino_uno_r4.overlay
new file mode 100644
index 0000000000000..2b60a305553f9
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/arduino_uno_r4.overlay
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>, <&adc0 1>;
+	};
+};
+
+&adc0 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <5000>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/cyw920829m2evk_02.overlay b/tests/drivers/adc/adc_api/boards/cyw920829m2evk_02.overlay
index 34180e2239c8c..2eb9d63228684 100644
--- a/tests/drivers/adc/adc_api/boards/cyw920829m2evk_02.overlay
+++ b/tests/drivers/adc/adc_api/boards/cyw920829m2evk_02.overlay
@@ -23,7 +23,7 @@
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 1)>;
 		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,resolution = <12>;
+		zephyr,resolution = <16>;
 		zephyr,input-positive = <4>;   /* P3.4 */
 	};
 
@@ -32,7 +32,7 @@
 		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 1)>;
 		zephyr,gain = "ADC_GAIN_1";
 		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,resolution = <12>;
+		zephyr,resolution = <16>;
 		zephyr,input-positive = <5>;   /* P3.5 */
 	};
 };
diff --git a/tests/drivers/adc/adc_api/boards/ek_ra4l1.overlay b/tests/drivers/adc/adc_api/boards/ek_ra4l1.overlay
new file mode 100644
index 0000000000000..cc25530b5843b
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/ek_ra4l1.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 1>, <&adc0 2>;
+	};
+};
+
+&adc0 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <3300>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <3300>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/ek_ra4m1.overlay b/tests/drivers/adc/adc_api/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..9aab1db0db5d2
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/ek_ra4m1.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>, <&adc0 2>;
+	};
+};
+
+&adc0 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <3300>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <3300>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
rename to tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
diff --git a/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
deleted file mode 100644
index d93c8c47c4370..0000000000000
--- a/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) 2023 Benjamin Björnsson <benjamin.bjornsson@gmail.com>
- */
-
-#include <zephyr/dt-bindings/adc/mcux-lpadc.h>
-
-/ {
-	zephyr,user {
-		io-channels = <&lpadc0 0>, <&lpadc0 1>;
-	};
-};
-
-&lpadc0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_EXTERNAL0";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-		zephyr,input-positive = <MCUX_LPADC_CH0A>;
-	};
-
-	channel@1 {
-		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_EXTERNAL0";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <12>;
-		zephyr,input-positive = <MCUX_LPADC_CH1A>;
-	};
-};
diff --git a/tests/drivers/adc/adc_api/boards/mimxrt700_evk_mimxrt798s_cm33_cpu0.overlay b/tests/drivers/adc/adc_api/boards/mimxrt700_evk_mimxrt798s_cm33_cpu0.overlay
new file mode 100644
index 0000000000000..34514a08b0f00
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/mimxrt700_evk_mimxrt798s_cm33_cpu0.overlay
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2025 NXP
+ */
+
+#include <zephyr/dt-bindings/adc/mcux-lpadc.h>
+
+/ {
+	zephyr,user {
+		io-channels = <&lpadc0 0>, <&lpadc0 1>;
+	};
+};
+
+&lpadc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <MCUX_LPADC_CH0A>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <MCUX_LPADC_CH1A>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/mimxrt700_evk_mimxrt798s_cm33_cpu1.overlay b/tests/drivers/adc/adc_api/boards/mimxrt700_evk_mimxrt798s_cm33_cpu1.overlay
new file mode 100644
index 0000000000000..34514a08b0f00
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/mimxrt700_evk_mimxrt798s_cm33_cpu1.overlay
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2025 NXP
+ */
+
+#include <zephyr/dt-bindings/adc/mcux-lpadc.h>
+
+/ {
+	zephyr,user {
+		io-channels = <&lpadc0 0>, <&lpadc0 1>;
+	};
+};
+
+&lpadc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <MCUX_LPADC_CH0A>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <MCUX_LPADC_CH1A>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/native_posix.overlay b/tests/drivers/adc/adc_api/boards/native_posix.overlay
deleted file mode 100644
index d4959cf991c6f..0000000000000
--- a/tests/drivers/adc/adc_api/boards/native_posix.overlay
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	zephyr,user {
-		io-channels = <&adc0 0>, <&adc0 1>;
-	};
-};
-
-&adc0 {
-	ref-internal-mv = <3300>;
-	ref-external1-mv = <5000>;
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@0 {
-		reg = <0>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <10>;
-	};
-
-	channel@1 {
-		reg = <1>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
-		zephyr,resolution = <10>;
-	};
-};
diff --git a/tests/drivers/adc/adc_api/boards/native_posix_64.overlay b/tests/drivers/adc/adc_api/boards/native_posix_64.overlay
deleted file mode 100644
index 6b622000bdf53..0000000000000
--- a/tests/drivers/adc/adc_api/boards/native_posix_64.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "native_posix.overlay"
diff --git a/tests/drivers/adc/adc_api/boards/native_sim.overlay b/tests/drivers/adc/adc_api/boards/native_sim.overlay
index 6b622000bdf53..d4959cf991c6f 100644
--- a/tests/drivers/adc/adc_api/boards/native_sim.overlay
+++ b/tests/drivers/adc/adc_api/boards/native_sim.overlay
@@ -1,7 +1,34 @@
 /*
- * Copyright 2023 Nordic Semiconductor ASA
+ * Copyright 2021 Google LLC
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "native_posix.overlay"
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>, <&adc0 1>;
+	};
+};
+
+&adc0 {
+	ref-internal-mv = <3300>;
+	ref-external1-mv = <5000>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <10>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/native_sim_64.overlay b/tests/drivers/adc/adc_api/boards/native_sim_64.overlay
index 6b622000bdf53..44f044981eb37 100644
--- a/tests/drivers/adc/adc_api/boards/native_sim_64.overlay
+++ b/tests/drivers/adc/adc_api/boards/native_sim_64.overlay
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "native_posix.overlay"
+#include "native_sim.overlay"
diff --git a/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
new file mode 100644
index 0000000000000..0e01ff40bb9e8
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_common.dtsi"
diff --git a/tests/drivers/adc/adc_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..e1ca1190b33ad
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>;
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1_4";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <10>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/nucleo_f439zi.overlay b/tests/drivers/adc/adc_api/boards/nucleo_f439zi.overlay
new file mode 100644
index 0000000000000..ed807ca3ca610
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nucleo_f439zi.overlay
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) Benjamin Björnsson <benjamin.bjornsson@gmail.com>
+ */
+
+/ {
+	zephyr,user {
+		/* adjust channel number according to pinmux in board.dts */
+		io-channels = <&adc1 0>, <&adc1 3>;
+	};
+};
+
+&adc1 {
+	dmas = <&dma2 0 0 (STM32_DMA_PERIPH_RX | STM32_DMA_MEM_16BITS |
+		STM32_DMA_PERIPH_16BITS) STM32_DMA_FIFO_FULL>;
+	dma-names = "dma";
+
+	pinctrl-0 = <&adc1_in0_pa0 &adc1_in3_pa3>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@3 {
+		reg = <3>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+};
+
+&dma2 {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_api/boards/nucleo_n657x0_q_sb.conf b/tests/drivers/adc/adc_api/boards/nucleo_n657x0_q_sb.conf
new file mode 100644
index 0000000000000..22b66784845b2
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nucleo_n657x0_q_sb.conf
@@ -0,0 +1,3 @@
+# USERSPACE not functional on N6 yet
+CONFIG_TEST_USERSPACE=n
+CONFIG_ADC_32_BITS_DATA=y
diff --git a/tests/drivers/adc/adc_api/boards/nucleo_n657x0_q_sb.overlay b/tests/drivers/adc/adc_api/boards/nucleo_n657x0_q_sb.overlay
new file mode 100644
index 0000000000000..a009c76274492
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nucleo_n657x0_q_sb.overlay
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 STMicroelectronics
+ */
+
+/ {
+	zephyr,user {
+		/* adjust channel number according to pinmux in board.dts */
+		io-channels = <&adc1 10>, <&adc1 11>;
+	};
+};
+
+&adc1 {
+	dmas = <&gpdma1 0 7 (STM32_DMA_PERIPH_RX | STM32_DMA_MEM_32BITS | STM32_DMA_PERIPH_32BITS)>;
+	dma-names = "gpdma";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@a {
+		reg = <10>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@b {
+		reg = <11>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+};
+
+&gpdma1 {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_api/boards/nucleo_wba52cg.overlay b/tests/drivers/adc/adc_api/boards/nucleo_wba52cg.overlay
deleted file mode 100644
index e5dc2af539ff3..0000000000000
--- a/tests/drivers/adc/adc_api/boards/nucleo_wba52cg.overlay
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright (c) Benjamin Björnsson <benjamin.bjornsson@gmail.com>
- */
-
-/ {
-	zephyr,user {
-		/* adjust channel number according to pinmux in board.dts */
-		io-channels = <&adc4 7>, <&adc4 8>;
-	};
-};
-
-&adc4 {
-	dmas = <&gpdma1 0 0 (STM32_DMA_PERIPH_RX | STM32_DMA_MEM_16BITS | STM32_DMA_PERIPH_16BITS)>;
-	dma-names = "gpdma";
-
-	pinctrl-0 = <&adc4_in7_pa2 &adc4_in8_pa1>;
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	channel@7 {
-		reg = <7>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
-		zephyr,resolution = <12>;
-	};
-
-	channel@8 {
-		reg = <8>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_INTERNAL";
-		/* Use a different acquisition time for test purposes */
-		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_TICKS, 80)>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&gpdma1 {
-	status = "okay";
-};
diff --git a/tests/drivers/adc/adc_api/boards/nucleo_wba65ri.overlay b/tests/drivers/adc/adc_api/boards/nucleo_wba65ri.overlay
new file mode 100644
index 0000000000000..4a6e6546c487e
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/nucleo_wba65ri.overlay
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 STMicroelectronics
+ */
+
+/ {
+	zephyr,user {
+		/* adjust channel number according to pinmux in board.dts */
+		io-channels = <&adc4 7>, <&adc4 8>;
+	};
+};
+
+&adc4 {
+	pinctrl-0 = <&adc4_in7_pa2 &adc4_in8_pa1>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@7 {
+		reg = <7>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@8 {
+		reg = <8>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..ab90118d232db
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1> , <&adc 2>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN1>;
+		zephyr,resolution = <10>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1_4";
+		zephyr,reference = "ADC_REF_EXTERNAL0";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,input-positive = <NRF_SAADC_AIN4>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_2_3";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 10)>;
+		zephyr,input-positive = <NRF_SAADC_AIN2>;
+		zephyr,resolution = <10>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/pico2_spe_rp2350a_m33.overlay b/tests/drivers/adc/adc_api/boards/pico2_spe_rp2350a_m33.overlay
new file mode 100644
index 0000000000000..0c45b6f60364a
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/pico2_spe_rp2350a_m33.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 KWS Computersysteme Gmbh
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Pico2-SPE is compatible with the Pico-SPE , so reuse. */
+#include "rpi_pico.overlay"
+
+&adc {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_api/boards/pico_plus2_rp2350b_m33.overlay b/tests/drivers/adc/adc_api/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..1de395543efae
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 TOKITA Hiroshi
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1>;
+	};
+};
+
+&adc {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/pico_spe.overlay b/tests/drivers/adc/adc_api/boards/pico_spe.overlay
new file mode 100644
index 0000000000000..a2a8bc205dd1c
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/pico_spe.overlay
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 KWS Computersysteme Gmbh
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 1>;
+	};
+};
+
+&adc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/tests/drivers/adc/adc_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..1d80e7ce4219a
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+/ {
+	zephyr,user {
+		io-channels = <&adc 0>, <&adc 2>;
+	};
+};
+
+&adc {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <1800>;
+	};
+
+	channel@2 {
+		reg = <2>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,resolution = <12>;
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,vref-mv = <1800>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/stm32n6570_dk_sb.conf b/tests/drivers/adc/adc_api/boards/stm32n6570_dk_sb.conf
new file mode 100644
index 0000000000000..22b66784845b2
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/stm32n6570_dk_sb.conf
@@ -0,0 +1,3 @@
+# USERSPACE not functional on N6 yet
+CONFIG_TEST_USERSPACE=n
+CONFIG_ADC_32_BITS_DATA=y
diff --git a/tests/drivers/adc/adc_api/boards/stm32n6570_dk_sb.overlay b/tests/drivers/adc/adc_api/boards/stm32n6570_dk_sb.overlay
new file mode 100644
index 0000000000000..a009c76274492
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/stm32n6570_dk_sb.overlay
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 STMicroelectronics
+ */
+
+/ {
+	zephyr,user {
+		/* adjust channel number according to pinmux in board.dts */
+		io-channels = <&adc1 10>, <&adc1 11>;
+	};
+};
+
+&adc1 {
+	dmas = <&gpdma1 0 7 (STM32_DMA_PERIPH_RX | STM32_DMA_MEM_32BITS | STM32_DMA_PERIPH_32BITS)>;
+	dma-names = "gpdma";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@a {
+		reg = <10>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+
+	channel@b {
+		reg = <11>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_MAX>;
+		zephyr,resolution = <12>;
+	};
+};
+
+&gpdma1 {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_api/boards/w5500_evb_pico2_rp2350a_m33.overlay b/tests/drivers/adc/adc_api/boards/w5500_evb_pico2_rp2350a_m33.overlay
new file mode 100644
index 0000000000000..fb0ecaac606ab
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/w5500_evb_pico2_rp2350a_m33.overlay
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 TOKITA Hiroshi
+ */
+
+/* W5500 EVB Pico2 can work the same configuration as W5500 EVB Pico */
+#include "w5500_evb_pico.overlay"
+
+&adc {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_api/boards/xg24_rb4187c.overlay b/tests/drivers/adc/adc_api/boards/xg24_rb4187c.overlay
new file mode 100644
index 0000000000000..b164be5e20e75
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/xg24_rb4187c.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "dt-bindings/adc/silabs-adc.h"
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>, <&adc0 1>;
+	};
+};
+
+&adc0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_IOVDD>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_GND>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/boards/xg29_rb4412a.overlay b/tests/drivers/adc/adc_api/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..76f95bb2ae849
--- /dev/null
+++ b/tests/drivers/adc/adc_api/boards/xg29_rb4412a.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "dt-bindings/adc/silabs-adc.h"
+
+/ {
+	zephyr,user {
+		io-channels = <&adc0 0>, <&adc0 1>;
+	};
+};
+
+&adc0 {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	channel@0 {
+		reg = <0>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_IOVDD>;
+	};
+
+	channel@1 {
+		reg = <1>;
+		zephyr,gain = "ADC_GAIN_1";
+		zephyr,reference = "ADC_REF_INTERNAL";
+		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+		zephyr,resolution = <12>;
+		zephyr,input-positive = <IADC_INPUT_VBAT>;
+	};
+};
diff --git a/tests/drivers/adc/adc_api/socs/esp32c6.conf b/tests/drivers/adc/adc_api/socs/esp32c6_hpcore.conf
similarity index 100%
rename from tests/drivers/adc/adc_api/socs/esp32c6.conf
rename to tests/drivers/adc/adc_api/socs/esp32c6_hpcore.conf
diff --git a/tests/drivers/adc/adc_api/socs/esp32c6.overlay b/tests/drivers/adc/adc_api/socs/esp32c6_hpcore.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/socs/esp32c6.overlay
rename to tests/drivers/adc/adc_api/socs/esp32c6_hpcore.overlay
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index e7d1958cd5a2b..49af36dc0d4c5 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -12,6 +12,13 @@
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
+#if CONFIG_ADC_32_BITS_DATA
+typedef int32_t adc_data_size_t;
+#define INVALID_ADC_VALUE INT_MIN
+#else
+typedef int16_t adc_data_size_t;
+#endif
+
 /* Invalid value that is not supposed to be written by the driver. It is used
  * to mark the sample buffer entries as empty. If needed, it can be overridden
  * for a particular board by providing a specific definition above.
@@ -28,9 +35,9 @@
 
 #define BUFFER_SIZE  6
 #ifdef CONFIG_TEST_USERSPACE
-static ZTEST_BMEM int16_t m_sample_buffer[BUFFER_SIZE];
+static ZTEST_BMEM adc_data_size_t m_sample_buffer[BUFFER_SIZE];
 #else
-static __aligned(32) int16_t m_sample_buffer[BUFFER_SIZE] __NOCACHE;
+static __aligned(32) adc_data_size_t m_sample_buffer[BUFFER_SIZE] __NOCACHE;
 #endif
 
 #define DT_SPEC_AND_COMMA(node_id, prop, idx) ADC_DT_SPEC_GET_BY_IDX(node_id, idx),
@@ -102,9 +109,13 @@ static void check_samples(int expected_count)
 
 	TC_PRINT("Samples read: ");
 	for (i = 0; i < BUFFER_SIZE; i++) {
-		int16_t sample_value = m_sample_buffer[i];
+		adc_data_size_t sample_value = m_sample_buffer[i];
 
+#if CONFIG_ADC_32_BITS_DATA
+		TC_PRINT("0x%08x ", sample_value);
+#else
 		TC_PRINT("0x%04hx ", sample_value);
+#endif
 		if (i < expected_count) {
 			zassert_not_equal(INVALID_ADC_VALUE, sample_value,
 				"[%u] should be filled", i);
diff --git a/tests/drivers/adc/adc_api/testcase.yaml b/tests/drivers/adc/adc_api/testcase.yaml
index b66fcf2dee3cb..fc0e398ab0f07 100644
--- a/tests/drivers/adc/adc_api/testcase.yaml
+++ b/tests/drivers/adc/adc_api/testcase.yaml
@@ -9,6 +9,9 @@ tests:
     min_flash: 40
     platform_exclude:
       - nucleo_u031r8
+      - panb511evb/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l10/cpuapp/ns
   drivers.adc.b_u585i_iot02a_adc4:
     extra_args:
       - DTC_OVERLAY_FILE="boards/b_u585i_iot02a_adc4.overlay"
@@ -34,6 +37,7 @@ tests:
       - nucleo_f207zg
       - nucleo_f401re
       - nucleo_f429zi
+      - nucleo_f439zi
       - nucleo_f746zg
       - nucleo_g071rb
       - nucleo_g474re
@@ -44,7 +48,8 @@ tests:
       - nucleo_u083rc
       - nucleo_u575zi_q
       - nucleo_wb55rg
-      - nucleo_wba52cg
+      - nucleo_wba55cg
+      - nucleo_wba65ri
       - nucleo_wl55jc
       - stm32f3_disco
       - stm32h573i_dk
diff --git a/tests/drivers/adc/adc_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/adc/adc_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..c50279ce8f649
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ */
+
+/ {
+	aliases {
+		adc = &adc;
+	};
+};
+
+&adc {
+	status = "okay";
+};
diff --git a/tests/drivers/adc/adc_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/adc/adc_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..b44fc6070ac01
--- /dev/null
+++ b/tests/drivers/adc/adc_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ */
+
+/ {
+	aliases {
+		adc = &adc;
+	};
+};
diff --git a/tests/drivers/adc/adc_error_cases/testcase.yaml b/tests/drivers/adc/adc_error_cases/testcase.yaml
index fd3da953eb236..e5c0225b28c0a 100644
--- a/tests/drivers/adc/adc_error_cases/testcase.yaml
+++ b/tests/drivers/adc/adc_error_cases/testcase.yaml
@@ -9,4 +9,6 @@ tests:
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/tests/drivers/audio/dmic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/audio/dmic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..a77b6baf38fc1
--- /dev/null
+++ b/tests/drivers/audio/dmic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dmic-dev = &pdm20;
+	};
+};
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 12)>,
+				<NRF_PSEL(PDM_DIN, 1, 13)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};
diff --git a/tests/drivers/audio/dmic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/audio/dmic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..440ef9828ae87
--- /dev/null
+++ b/tests/drivers/audio/dmic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dmic-dev = &pdm20;
+	};
+};
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 10)>,
+				<NRF_PSEL(PDM_DIN, 1, 11)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};
diff --git a/tests/drivers/audio/dmic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/audio/dmic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..182a089b3d56e
--- /dev/null
+++ b/tests/drivers/audio/dmic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dmic-dev = &pdm20;
+	};
+};
+
+&pinctrl {
+	pdm20_default_alt: pdm20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(PDM_CLK, 1, 12)>,
+				<NRF_PSEL(PDM_DIN, 1, 13)>;
+		};
+	};
+};
+
+dmic_dev: &pdm20 {
+	status = "okay";
+	pinctrl-0 = <&pdm20_default_alt>;
+	pinctrl-names = "default";
+	clock-source = "PCLK32M";
+};
diff --git a/tests/drivers/audio/dmic_api/src/main.c b/tests/drivers/audio/dmic_api/src/main.c
index 488490e219ce5..7f697e4539bcd 100644
--- a/tests/drivers/audio/dmic_api/src/main.c
+++ b/tests/drivers/audio/dmic_api/src/main.c
@@ -21,14 +21,21 @@ static const struct device *dmic_dev = DEVICE_DT_GET(DT_ALIAS(dmic_dev));
 #define BYTES_PER_SAMPLE sizeof(int16_t)
 #define SLAB_ALIGN 4
 #define MAX_SAMPLE_RATE  48000
+#elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pdm)
+#define PDM_CHANNELS 2
+#define SAMPLE_BIT_WIDTH 16
+#define BYTES_PER_SAMPLE sizeof(int16_t)
+#define SLAB_ALIGN 4
+#define MAX_SAMPLE_RATE  48000
+#else
+#error "Unsupported DMIC device"
+#endif
+
 /* Milliseconds to wait for a block to be read. */
 #define READ_TIMEOUT 1000
 /* Size of a block for 100 ms of audio data. */
 #define BLOCK_SIZE(_sample_rate, _number_of_channels) \
 	(BYTES_PER_SAMPLE * (_sample_rate / 10) * _number_of_channels)
-#else
-#error "Unsupported DMIC device"
-#endif
 
 /* Driver will allocate blocks from this slab to receive audio data into them.
  * Application, after getting a given block from the driver and processing its
diff --git a/tests/drivers/build_all/adc/boards/native_sim.overlay b/tests/drivers/build_all/adc/boards/native_sim.overlay
index ae6b5a7f56b0a..1c54bf4898ff2 100644
--- a/tests/drivers/build_all/adc/boards/native_sim.overlay
+++ b/tests/drivers/build_all/adc/boards/native_sim.overlay
@@ -379,6 +379,13 @@
 				#io-channel-cells = <1>;
 				active-device = <1>;
 			};
+
+			test_spi_ad4130: ad41304@19 {
+				compatible = "adi,ad4130-adc";
+				reg = <0x19>;
+				spi-max-frequency = <0>;
+				#io-channel-cells = <1>;
+			};
 		};
 	};
 };
diff --git a/tests/drivers/build_all/adc/testcase.yaml b/tests/drivers/build_all/adc/testcase.yaml
index c9fa5a8ec6557..a0c7dda13262f 100644
--- a/tests/drivers/build_all/adc/testcase.yaml
+++ b/tests/drivers/build_all/adc/testcase.yaml
@@ -33,6 +33,8 @@ tests:
     platform_allow: same54_xpro
   drivers.adc.sam.afec.build:
     platform_allow: sam_e70_xplained/same70q21
+  drivers.adc.silabs.build:
+    platform_allow: xg29_rb4412a
   drivers.adc.stm32.build:
     platform_allow: disco_l475_iot1
   drivers.adc.xec.build:
diff --git a/tests/drivers/build_all/can/boards/native_posix.overlay b/tests/drivers/build_all/can/boards/native_posix.overlay
deleted file mode 100644
index 84e4247ccc81d..0000000000000
--- a/tests/drivers/build_all/can/boards/native_posix.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 Vestas Wind Systems A/S
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "native_sim.overlay"
diff --git a/tests/drivers/build_all/charger/i2c.dtsi b/tests/drivers/build_all/charger/i2c.dtsi
index 24616e928d1da..c10271a17ed05 100644
--- a/tests/drivers/build_all/charger/i2c.dtsi
+++ b/tests/drivers/build_all/charger/i2c.dtsi
@@ -46,3 +46,23 @@ sbs-charger@3 {
 	compatible = "sbs,sbs-charger";
 	reg = <0x3>;
 };
+
+bq257130@4 {
+	compatible = "ti,bq25713";
+	reg = <0x4>;
+	constant-charge-current-max-microamp = <1000000>;
+	constant-charge-voltage-max-microvolt = <3800000>;
+	system-voltage-min-threshold-microvolt = <3328000>;
+};
+
+axp2101@5 {
+	compatible = "x-powers,axp2101";
+	reg = <0x5>;
+
+	charger {
+		compatible = "x-powers,axp2101-charger";
+		constant-charge-current-max-microamp = <300000>;
+		constant-charge-voltage-max-microvolt = <4200000>;
+		charge-term-current-microamp = <100000>;
+	};
+};
diff --git a/tests/drivers/build_all/comparator/testcase.yaml b/tests/drivers/build_all/comparator/testcase.yaml
index 45c2398922211..298dcc8841076 100644
--- a/tests/drivers/build_all/comparator/testcase.yaml
+++ b/tests/drivers/build_all/comparator/testcase.yaml
@@ -27,6 +27,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
     integration_platforms:
       - nrf52dk/nrf52810
@@ -44,6 +45,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
     integration_platforms:
       - nrf52dk/nrf52810
@@ -61,6 +63,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
     integration_platforms:
       - nrf52dk/nrf52810
@@ -74,10 +77,12 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
   drivers.build_all.comparator.nrf_lpcomp.int_ref:
     extra_args:
       - DTC_OVERLAY_FILE="nrf_lpcomp/int_ref.overlay"
@@ -88,6 +93,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf9280pdk/nrf9280/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/tests/drivers/build_all/dac/app.overlay b/tests/drivers/build_all/dac/app.overlay
index 04e8d9a0290cd..48148055ef2cd 100644
--- a/tests/drivers/build_all/dac/app.overlay
+++ b/tests/drivers/build_all/dac/app.overlay
@@ -302,6 +302,14 @@
 					status = "okay";
 				};
 			};
+
+			test_spi_dac161s997: dac161s997@12 {
+				compatible = "ti,dac161s997";
+				reg = <0x12>;
+				spi-max-frequency = <0>;
+				#io-channel-cells = <1>;
+				errb-gpios = <&test_gpio 0 0>;
+			};
 		};
 	};
 };
diff --git a/tests/drivers/build_all/display/app.overlay b/tests/drivers/build_all/display/app.overlay
index 61122101ce1c8..15f9389685c75 100644
--- a/tests/drivers/build_all/display/app.overlay
+++ b/tests/drivers/build_all/display/app.overlay
@@ -249,6 +249,32 @@
 				height = <1280>;
 				pixel-format = <0>;
 			};
+
+			test_st7701: st7701@5 {
+				compatible = "sitronix,st7701";
+				reg = <0x5>;
+				height = <800>;
+				width = <480>;
+				data-lanes = <2>;
+				pixel-format = <0>;
+				rotation = <0>;
+				pvgamctrl = [00 10 0E 02 03 0E 07 02 07 0A 12 27 37 00 0D 0E 10];
+				nvgamctrl = [00 10 0E 03 03 0F 06 02 08 0A 13 26 36 00 0D 0E 10];
+
+				display-timings {
+					compatible = "zephyr,panel-timing";
+					hsync-active = <1>;
+					vsync-active = <0>;
+					de-active = <0>;
+					pixelclk-active = <0>;
+					hback-porch = <40>;
+					hsync-len = <32>;
+					hfront-porch = <8>;
+					vback-porch = <6>;
+					vsync-len = <8>;
+					vfront-porch = <9>;
+				};
+			};
 		};
 
 		test_spi: spi@33334444 {
@@ -361,6 +387,15 @@
 				com-invdir;
 				prechargep = <0x22>;
 			};
+			test_st7567: st7567@2 {
+				compatible = "sitronix,st7567";
+				reg = <0x2>;
+				width = <128>;
+				height = <64>;
+				column-offset = <0>;
+				line-offset = <0>;
+				regulation-ratio = <7>;
+			};
 		};
 	};
 };
diff --git a/tests/drivers/build_all/eeprom/app.overlay b/tests/drivers/build_all/eeprom/app.overlay
index d294de38e6a36..999a0e859d8b3 100644
--- a/tests/drivers/build_all/eeprom/app.overlay
+++ b/tests/drivers/build_all/eeprom/app.overlay
@@ -55,15 +55,15 @@
 				/* read-only; */
 			};
 
-			test_i2c_tmp116: tmp116@2 {
+			test_i2c_tmp11x: tmp11x@2 {
 				status = "okay";
-				compatible = "ti,tmp116";
+				compatible = "ti,tmp11x";
 				reg = <0x2>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 
-				test_tmp116_eeprom: ti_tmp116_eeprom@0 {
-					compatible = "ti,tmp116-eeprom";
+				test_tmp11x_eeprom: ti_tmp11x_eeprom@0 {
+					compatible = "ti,tmp11x-eeprom";
 					reg = <0x0>;
 					read-only;
 				};
diff --git a/tests/drivers/build_all/ethernet/app.overlay b/tests/drivers/build_all/ethernet/app.overlay
index e74cb985a0fcc..c766cb184bf92 100644
--- a/tests/drivers/build_all/ethernet/app.overlay
+++ b/tests/drivers/build_all/ethernet/app.overlay
@@ -79,6 +79,23 @@
 					compatible = "adi,adin2111-phy";
 					status = "okay";
 				};
+				ethernet-phy@7 {
+					reg = <0x7>;
+					compatible = "davicom,dm8806-phy";
+					status = "okay";
+					reg-switch = <8>;
+					reset-gpios = <&test_gpio 0 0>;
+					int-gpios = <&test_gpio 0 0>;
+					davicom,interface-type = "rmii";
+				};
+
+				ethernet-phy@8 {
+					reg = <0x8>;
+					compatible = "ti,dp83867";
+					status = "okay";
+					reset-gpios = <&test_gpio 0 0>;
+					int-gpios = <&test_gpio 0 0>;
+				};
 			};
 		};
 	};
diff --git a/tests/drivers/build_all/gpio/app.overlay b/tests/drivers/build_all/gpio/app.overlay
index 0251b1970771a..ccb794dd8477c 100644
--- a/tests/drivers/build_all/gpio/app.overlay
+++ b/tests/drivers/build_all/gpio/app.overlay
@@ -596,11 +596,27 @@
 				latch-gpios = <&test_gpio 0 0>;
 			};
 
-			test_spi_max22017: max22017_mfd@b {
-				compatible = "adi,max22017";
+			test_spi_max22199: max22199@b {
+				compatible = "adi,max22199-gpio";
 				status = "okay";
 				reg = <0x0b>;
 				spi-max-frequency = <0>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				max22190-mode = <1>;
+				filter-fbps = <0 0 0 0  0 0 0 0>;
+				filter-delays = <50 100 400 800 1600 3200 12800 20000>;
+				drdy-gpios = <&test_gpio 0 0>;
+				fault-gpios = <&test_gpio 0 0>;
+				latch-gpios = <&test_gpio 0 0>;
+			};
+
+			test_spi_max22017: max22017_mfd@c {
+				compatible = "adi,max22017";
+				status = "okay";
+				reg = <0x0c>;
+				spi-max-frequency = <0>;
 
 				max22017_gpio0: max22017_gpio {
 					compatible = "adi,max22017-gpio";
@@ -610,6 +626,39 @@
 					#gpio-cells = <2>;
 				};
 			};
+
+			test_max14915: max14915@d {
+				compatible = "adi,max14915-gpio";
+				status = "okay";
+				reg = <0x0d>;
+				spi-max-frequency = <0>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				crc-en;
+				spi-addr = <0>;
+				drdy-gpios = <&test_gpio 0 0>;
+				fault-gpios = <&test_gpio 0 0>;
+				sync-gpios = <&test_gpio 0 0>;
+				en-gpios = <&test_gpio 0 0>;
+			};
+
+			test_spi_max14917: max14917@d {
+				compatible = "adi,max14917-gpio";
+				status = "okay";
+				reg = <0x0d>;
+				spi-max-frequency = <0>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				ngpios = <8>;
+				vddok-gpios = <&test_gpio 0 0>;
+				ready-gpios = <&test_gpio 0 0>;
+				comerr-gpios = <&test_gpio 0 0>;
+				fault-gpios = <&test_gpio 0 0>;
+				en-gpios = <&test_gpio 0 0>;
+				sync-gpios = <&test_gpio 0 0>;
+				crcen-gpios = <&test_gpio 0 0>;
+			};
 		};
 	};
 };
diff --git a/tests/drivers/build_all/i3c/boards/qemu_cortex_m3.overlay b/tests/drivers/build_all/i3c/boards/qemu_cortex_m3.overlay
index 43c6d81d4035b..f3508335ec562 100644
--- a/tests/drivers/build_all/i3c/boards/qemu_cortex_m3.overlay
+++ b/tests/drivers/build_all/i3c/boards/qemu_cortex_m3.overlay
@@ -5,6 +5,12 @@
  */
 
 / {
+	test_fixed_clk: test-fixed-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <200000000>;
+		#clock-cells = <0>;
+	};
+
 	i3c0: i3c@88888888 {
 		compatible = "cdns,i3c";
 		#address-cells = <3>;
@@ -16,4 +22,16 @@
 		i3c-scl-hz = <12500000>;
 		i2c-scl-hz = <400000>;
 	};
+
+	i3c1: i3c@cccccccc {
+		compatible = "snps,designware-i3c";
+		#address-cells = <3>;
+		#size-cells = <0>;
+		reg = <0xcccccccc 0x400>;
+		interrupt-parent = <&nvic>;
+		interrupts = <8 1>;
+		clocks = <&test_fixed_clk>;
+		i3c-scl-hz = <12500000>;
+		i2c-scl-hz = <400000>;
+	};
 };
diff --git a/tests/drivers/build_all/i3c/prj.conf b/tests/drivers/build_all/i3c/prj.conf
index cf064b0a058d6..07d3ab3637a69 100644
--- a/tests/drivers/build_all/i3c/prj.conf
+++ b/tests/drivers/build_all/i3c/prj.conf
@@ -3,4 +3,5 @@ CONFIG_TEST_USERSPACE=y
 CONFIG_I3C=y
 CONFIG_SHELL=y
 CONFIG_I3C_SHELL=y
-CONFIG_I3C_RTIO=y
+CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_FIXED_RATE_CLOCK=y
diff --git a/tests/drivers/build_all/i3c/testcase.yaml b/tests/drivers/build_all/i3c/testcase.yaml
index 4c4ed78c84046..7885e2cd46146 100644
--- a/tests/drivers/build_all/i3c/testcase.yaml
+++ b/tests/drivers/build_all/i3c/testcase.yaml
@@ -4,8 +4,18 @@ common:
     - drivers
     - i3c
 tests:
-  drivers.i3c.build:
+  drivers.i3c.build.dual_role:
     # will cover drivers without in-tree boards
     platform_allow: qemu_cortex_m3
-    tags: i3c_cdns
-    extra_args: "CONFIG_I3C=y"
+    tags: i3c_cdns i3c_dw
+    extra_args: "CONFIG_I3C_DUAL_ROLE=y CONFIG_I3C_RTIO=y"
+  drivers.i3c.build.controller_role_only:
+    # will cover drivers without in-tree boards
+    platform_allow: qemu_cortex_m3
+    tags: i3c_cdns i3c_dw
+    extra_args: "CONFIG_I3C_CONTROLLER_ROLE_ONLY=y CONFIG_I3C_RTIO=y"
+  drivers.i3c.build.target_role_only:
+    # will cover drivers without in-tree boards
+    platform_allow: qemu_cortex_m3
+    tags: i3c_cdns i3c_dw
+    extra_args: "CONFIG_I3C_TARGET_ROLE_ONLY=y"
diff --git a/tests/drivers/build_all/input/it82xx2_evb.overlay b/tests/drivers/build_all/input/it82xx2_evb.overlay
index f7e4329b310f9..7dee5a7df23ad 100644
--- a/tests/drivers/build_all/input/it82xx2_evb.overlay
+++ b/tests/drivers/build_all/input/it82xx2_evb.overlay
@@ -25,8 +25,4 @@
 	kso-mapping = <0 1 20 3 4 5 6 17 18 16 15 11 12>;
 	row-size = <8>;
 	col-size = <13>;
-
-	kscan_input: kscan-input {
-		compatible = "zephyr,kscan-input";
-	};
 };
diff --git a/tests/drivers/build_all/input/testcase.yaml b/tests/drivers/build_all/input/testcase.yaml
index 4f4e3d7969043..ea64f324fbb4e 100644
--- a/tests/drivers/build_all/input/testcase.yaml
+++ b/tests/drivers/build_all/input/testcase.yaml
@@ -4,7 +4,6 @@ common:
     - input
   build_only: true
   platform_allow:
-    - native_posix
     - native_sim
 tests:
   drivers.input.default: {}
diff --git a/tests/drivers/build_all/mfd/app.overlay b/tests/drivers/build_all/mfd/app.overlay
index 5f4ae6e8a8e42..92e4cd79c003f 100644
--- a/tests/drivers/build_all/mfd/app.overlay
+++ b/tests/drivers/build_all/mfd/app.overlay
@@ -40,5 +40,37 @@
 				};
 			};
 		};
+
+		test_gpio: gpio@deadbeef {
+			compatible = "vnd,gpio";
+			gpio-controller;
+			reg = <0xdeadbeef 0x1000>;
+			#gpio-cells = <0x2>;
+			status = "okay";
+		};
+
+		test_spi: spi@33334444 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "vnd,spi";
+			reg = <0x33334444 0x1000>;
+			status = "okay";
+			clock-frequency = <2000000>;
+
+			/* one entry for every spi devices */
+			cs-gpios = <&test_gpio 0 0>;
+
+			test_spi_maxq10xx@0 {
+				compatible = "adi,maxq10xx";
+				reg = <0x0>;
+				status = "okay";
+				spi-max-frequency = <0>;
+
+				test_spi_maxq10xx_trng: trng {
+					compatible = "adi,maxq10xx-trng";
+					status = "okay";
+				};
+			};
+		};
 	};
 };
diff --git a/tests/drivers/build_all/mfd/prj.conf b/tests/drivers/build_all/mfd/prj.conf
index 3862bfcbf6d76..78155e5638e64 100644
--- a/tests/drivers/build_all/mfd/prj.conf
+++ b/tests/drivers/build_all/mfd/prj.conf
@@ -2,5 +2,8 @@ CONFIG_TEST=y
 CONFIG_GPIO=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_I2C=y
+CONFIG_SPI=y
+CONFIG_MFD=y
+CONFIG_ENTROPY_GENERATOR=y
 CONFIG_SERIAL=y
 CONFIG_UART_USE_RUNTIME_CONFIGURE=y
diff --git a/tests/drivers/build_all/regulator/i2c.dtsi b/tests/drivers/build_all/regulator/i2c.dtsi
index 489476e69cabb..ea81c2c3886fe 100644
--- a/tests/drivers/build_all/regulator/i2c.dtsi
+++ b/tests/drivers/build_all/regulator/i2c.dtsi
@@ -76,6 +76,30 @@ axp192@4 {
 	};
 };
 
+axp2101@7 {
+	compatible = "x-powers,axp2101";
+	reg = <0x7>;
+
+	regulators {
+		compatible = "x-powers,axp2101-regulator";
+
+		DCDC1 {};
+		DCDC2 {};
+		DCDC3 {};
+		DCDC4 {};
+		DCDC5 {};
+		ALDO1 {};
+		ALDO2 {};
+		ALDO3 {};
+		ALDO4 {};
+		BLDO1 {};
+		BLDO2 {};
+		CPUSLDO {};
+		DLDO1 {};
+		DLDO2 {};
+	};
+};
+
 max20335@5 {
 	compatible = "maxim,max20335";
 	reg = <0x5>;
diff --git a/tests/drivers/build_all/rtc/i2c_devices.overlay b/tests/drivers/build_all/rtc/i2c_devices.overlay
index c20e60ab43a64..1c2758f9f8f6c 100644
--- a/tests/drivers/build_all/rtc/i2c_devices.overlay
+++ b/tests/drivers/build_all/rtc/i2c_devices.overlay
@@ -90,6 +90,14 @@
 				reg = <0x8>;
 				irq-gpios = <&test_gpio 0 0>;
 			};
+
+			test_ds1337: ds1337@9 {
+				compatible = "maxim,ds1337";
+				status = "okay";
+				reg = <0x9>;
+				int-gpios = <&test_gpio 0 0>;
+				sqw-frequency = <4096>;
+			};
 		};
 	};
 };
diff --git a/tests/drivers/build_all/sensor/app.overlay b/tests/drivers/build_all/sensor/app.overlay
index d4e195a8c812a..5e5b3ef382b3e 100644
--- a/tests/drivers/build_all/sensor/app.overlay
+++ b/tests/drivers/build_all/sensor/app.overlay
@@ -147,8 +147,11 @@
 				   <&test_gpio 0 0>,
 				   <&test_gpio 0 0>,
 				   <&test_gpio 0 0>,
-				   <&test_gpio 0 0>;	/* 0x30 */
-
+				   <&test_gpio 0 0>,	/* 0x30 */
+				   <&test_gpio 0 0>,
+				   <&test_gpio 0 0>,
+				   <&test_gpio 0 0>,
+				   <&test_gpio 0 0>;	/* 0x34 */
 			#include "spi.dtsi"
 		};
 
diff --git a/tests/drivers/build_all/sensor/i2c.dtsi b/tests/drivers/build_all/sensor/i2c.dtsi
index f9f4e3cddf1fb..9203c24dda692 100644
--- a/tests/drivers/build_all/sensor/i2c.dtsi
+++ b/tests/drivers/build_all/sensor/i2c.dtsi
@@ -24,7 +24,8 @@
 #include <zephyr/dt-bindings/sensor/stts22h.h>
 #include <zephyr/dt-bindings/sensor/ina226.h>
 #include <zephyr/dt-bindings/sensor/apds9253.h>
-#include <zephyr/dt-bindings/sensor/tmp116.h>
+#include <zephyr/dt-bindings/sensor/tmp11x.h>
+#include <zephyr/dt-bindings/sensor/tmp114.h>
 
 /****************************************
  * PLEASE KEEP REG ADDRESSES SEQUENTIAL *
@@ -177,9 +178,10 @@ test_i2c_ms5607: ms5607@17 {
 	reg = <0x17>;
 };
 
-test_i2c_ms5837: ms5837@18 {
-	compatible = "meas,ms5837";
+test_i2c_ms5837_02ba: ms5837@18 {
+	compatible = "meas,ms5837-02ba";
 	reg = <0x18>;
+	status = "okay";
 };
 
 test_i2c_jc42: jc42@19 {
@@ -476,11 +478,11 @@ test_i2c_tmp112: tmp112@46 {
 	reg = <0x46>;
 };
 
-test_i2c_tmp116: tmp116@47 {
-	compatible = "ti,tmp116";
+test_i2c_tmp11x: tmp11x@47 {
+	compatible = "ti,tmp11x";
 	reg = <0x47>;
-	odr = <TMP116_DT_ODR_125_MS>;
-	oversampling = <TMP116_DT_OVERSAMPLING_32>;
+	odr = <TMP11X_DT_ODR_125_MS>;
+	oversampling = <TMP11X_DT_OVERSAMPLING_32>;
 };
 
 test_i2c_bq274xx: bq27xx@48 {
@@ -820,7 +822,7 @@ test_i2c_mc3419: mc3419@75 {
 };
 
 test_i2c_ltrf216a0: ltrf216a@76 {
-	compatible = "ltr,f216a";
+	compatible = "liteon,ltrf216a";
 	reg = <0x76>;
 };
 
@@ -1029,6 +1031,7 @@ test_i2c_nct75: test_i2c_nct75@8c {
 test_i2c_tmp114: tmp114@8d {
 	compatible = "ti,tmp114";
 	reg = <0x8d>;
+	odr = <TMP114_DT_ODR_250_MS>;
 };
 
 test_i2c_ina226: ina226@8e {
@@ -1244,3 +1247,40 @@ test_i2c_tmp435: tmp435@a9 {
 	resistance-correction;
 	beta-compensation = <0x0f>;
 };
+
+test_i2c_xbr818: xbr818@aa {
+	compatible = "phosense,xbr818";
+	reg = <0xaa>;
+	int-gpios = <&test_gpio 0 0>;
+	i2c-en-gpios = <&test_gpio 0 0>;
+};
+
+test_i2c_veml6031: veml6031@ab {
+	compatible = "vishay,veml6031";
+	reg = <0xab>;
+};
+
+test_i2c_bmm350: bmm350@ac {
+	compatible = "bosch,bmm350";
+	reg = <0xac>;
+	drdy-gpios = <&test_gpio 0 0>;
+};
+
+test_i2c_ltr329: ltr329@ad {
+	compatible = "liteon,ltr329";
+	reg = <0xad>;
+};
+
+test_i2c_ms5837_30ba: ms5837@ae {
+	compatible = "meas,ms5837-30ba";
+	reg = <0xae>;
+	status = "okay";
+};
+
+test_i2c_icp201xx: icp201xx@af {
+	compatible = "invensense,icp201xx";
+	reg = <0xaf>;
+	int-gpios = <&test_gpio 0 0>;
+	op-mode = "mode0";
+	drive-strength = "current_12mA_1_8V";
+};
diff --git a/tests/drivers/build_all/sensor/i3c.dtsi b/tests/drivers/build_all/sensor/i3c.dtsi
index 3b3a89d8ccae5..ba4f50f704493 100644
--- a/tests/drivers/build_all/sensor/i3c.dtsi
+++ b/tests/drivers/build_all/sensor/i3c.dtsi
@@ -48,3 +48,15 @@ test_i3c_lsm6dsv16x: lsm6dsv16x@500000803E0000004 {
 	gyro-range = <LSM6DSV16X_DT_FS_2000DPS>;
 	gyro-odr = <LSM6DSV16X_DT_ODR_AT_60Hz>;
 };
+
+test_i3c_lsm6dsv32x: lsm6dsv32x@600000803E0000004 {
+	compatible = "st,lsm6dsv32x";
+	reg = <0x6 0x00000803 0xE0000004>;
+	assigned-address = <0x6>;
+	int1-gpios = <&test_gpio 0 0>;
+	int2-gpios = <&test_gpio 0 0>;
+	accel-range = <LSM6DSV32X_DT_FS_8G>;
+	accel-odr = <LSM6DSV16X_DT_ODR_AT_60Hz>;
+	gyro-range = <LSM6DSV16X_DT_FS_2000DPS>;
+	gyro-odr = <LSM6DSV16X_DT_ODR_AT_60Hz>;
+};
diff --git a/tests/drivers/build_all/sensor/prj.conf b/tests/drivers/build_all/sensor/prj.conf
index 3283fba0a0111..b1f8af3cf9e57 100644
--- a/tests/drivers/build_all/sensor/prj.conf
+++ b/tests/drivers/build_all/sensor/prj.conf
@@ -1,21 +1,23 @@
-CONFIG_TEST=y
-CONFIG_TEST_USERSPACE=y
-CONFIG_LOG=y
-CONFIG_SENSOR_LOG_LEVEL_DBG=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+# zephyr-keep-sorted-start
 CONFIG_ADC=y
 CONFIG_DAC=y
+CONFIG_DHT20_CRC=y
+CONFIG_EMUL=y
+CONFIG_FUEL_GAUGE=y
 CONFIG_GPIO=y
 CONFIG_I2C=y
 CONFIG_I3C=y
+CONFIG_ICM42605_TRIGGER_NONE=y
+CONFIG_LOG=y
+CONFIG_MFD=y
 CONFIG_PWM=y
 CONFIG_PWM_CAPTURE=y
+CONFIG_SENSOR=y
+CONFIG_SENSOR_LOG_LEVEL_DBG=y
 CONFIG_SERIAL=y
 CONFIG_SPI=y
-CONFIG_MFD=y
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+CONFIG_TEST=y
+CONFIG_TEST_USERSPACE=y
 CONFIG_W1=y
-CONFIG_SENSOR=y
-CONFIG_FUEL_GAUGE=y
-CONFIG_ICM42605_TRIGGER_NONE=y
-CONFIG_EMUL=y
-CONFIG_DHT20_CRC=y
+# zephyr-keep-sorted-stop
diff --git a/tests/drivers/build_all/sensor/sensors_die_temp.conf b/tests/drivers/build_all/sensor/sensors_die_temp.conf
index e2e793990433e..426a32a17a711 100644
--- a/tests/drivers/build_all/sensor/sensors_die_temp.conf
+++ b/tests/drivers/build_all/sensor/sensors_die_temp.conf
@@ -1,10 +1,12 @@
-CONFIG_ISM330DHCX_ENABLE_TEMP=y
+# zephyr-keep-sorted-start
 CONFIG_IIS2ICLX_ENABLE_TEMP=y
-CONFIG_LSM6DS0_ENABLE_TEMP=y
-CONFIG_LSM6DSV16X_ENABLE_TEMP=y
-CONFIG_LSM6DSO_ENABLE_TEMP=y
+CONFIG_ISM330DHCX_ENABLE_TEMP=y
 CONFIG_LIS2DE12_ENABLE_TEMP=y
 CONFIG_LIS2DS12_ENABLE_TEMP=y
 CONFIG_LIS2DUX12_ENABLE_TEMP=y
-CONFIG_LSM6DSO16IS_ENABLE_TEMP=y
+CONFIG_LSM6DS0_ENABLE_TEMP=y
 CONFIG_LSM6DSL_ENABLE_TEMP=y
+CONFIG_LSM6DSO16IS_ENABLE_TEMP=y
+CONFIG_LSM6DSO_ENABLE_TEMP=y
+CONFIG_LSM6DSV16X_ENABLE_TEMP=y
+# zephyr-keep-sorted-stop
diff --git a/tests/drivers/build_all/sensor/sensors_no_default.conf b/tests/drivers/build_all/sensor/sensors_no_default.conf
index 185e2b2fda18e..c866c8c0bd26d 100644
--- a/tests/drivers/build_all/sensor/sensors_no_default.conf
+++ b/tests/drivers/build_all/sensor/sensors_no_default.conf
@@ -1,3 +1,4 @@
+# zephyr-keep-sorted-start
 CONFIG_BMC150_MAGN_TRIGGER=y
 CONFIG_BMC150_MAGN_TRIGGER_DRDY=y
 CONFIG_BMM150_TRIGGER_DIRECT=y
@@ -9,3 +10,4 @@ CONFIG_LSM9DS0_GYRO_TRIGGER_DRDY=y
 CONFIG_TMAG5170_TRIGGER_DIRECT=y
 CONFIG_VL53L1X_INTERRUPT_MODE=n
 CONFIG_VL53L1X_XSHUT=n
+# zephyr-keep-sorted-stop
diff --git a/tests/drivers/build_all/sensor/sensors_shub.conf b/tests/drivers/build_all/sensor/sensors_shub.conf
index f06a4fcaa4725..df5e48184a28f 100644
--- a/tests/drivers/build_all/sensor/sensors_shub.conf
+++ b/tests/drivers/build_all/sensor/sensors_shub.conf
@@ -1,28 +1,25 @@
-CONFIG_IIS2ICLX_SENSORHUB=y
+# zephyr-keep-sorted-start
+CONFIG_IIS2ICLX_EXT_HTS221=y
 CONFIG_IIS2ICLX_EXT_LIS2MDL=y
 CONFIG_IIS2ICLX_EXT_LPS22HB=y
-CONFIG_IIS2ICLX_EXT_HTS221=y
-
-CONFIG_ISM330DHCX_SENSORHUB=y
+CONFIG_IIS2ICLX_SENSORHUB=y
+CONFIG_ISM330DHCX_EXT_HTS221=y
 CONFIG_ISM330DHCX_EXT_LIS2MDL=y
 CONFIG_ISM330DHCX_EXT_LPS22HB=y
-CONFIG_ISM330DHCX_EXT_HTS221=y
-
-CONFIG_LSM6DSL_SENSORHUB=y
+CONFIG_ISM330DHCX_SENSORHUB=y
 CONFIG_LSM6DSL_EXT0_LIS2MDL=y
 CONFIG_LSM6DSL_EXT0_LPS22HB=y
-
-CONFIG_LSM6DSO_SENSORHUB=y
-CONFIG_LSM6DSO_EXT_LIS2MDL=y
-CONFIG_LSM6DSO_EXT_LPS22HB=y
-CONFIG_LSM6DSO_EXT_HTS221=y
-
-CONFIG_LSM6DSO16IS_SENSORHUB=y
+CONFIG_LSM6DSL_SENSORHUB=y
+CONFIG_LSM6DSO16IS_EXT_HTS221=y
 CONFIG_LSM6DSO16IS_EXT_LIS2MDL=y
 CONFIG_LSM6DSO16IS_EXT_LPS22HB=y
-CONFIG_LSM6DSO16IS_EXT_HTS221=y
-
-CONFIG_LSM6DSV16X_SENSORHUB=y
+CONFIG_LSM6DSO16IS_SENSORHUB=y
+CONFIG_LSM6DSO_EXT_HTS221=y
+CONFIG_LSM6DSO_EXT_LIS2MDL=y
+CONFIG_LSM6DSO_EXT_LPS22HB=y
+CONFIG_LSM6DSO_SENSORHUB=y
+CONFIG_LSM6DSV16X_EXT_HTS221=y
 CONFIG_LSM6DSV16X_EXT_LIS2MDL=y
 CONFIG_LSM6DSV16X_EXT_LPS22HB=y
-CONFIG_LSM6DSV16X_EXT_HTS221=y
+CONFIG_LSM6DSV16X_SENSORHUB=y
+# zephyr-keep-sorted-stop
diff --git a/tests/drivers/build_all/sensor/sensors_trigger_global.conf b/tests/drivers/build_all/sensor/sensors_trigger_global.conf
index 86b89e93c12eb..8feaf9bf476bb 100644
--- a/tests/drivers/build_all/sensor/sensors_trigger_global.conf
+++ b/tests/drivers/build_all/sensor/sensors_trigger_global.conf
@@ -1,3 +1,4 @@
+# zephyr-keep-sorted-start
 CONFIG_ADT7310_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ADT7420_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ADXL362_TRIGGER_GLOBAL_THREAD=y
@@ -18,14 +19,16 @@ CONFIG_CCS811_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ENS160_TRIGGER_GLOBAL_THREAD=y
 CONFIG_FDC2X1X_TRIGGER_GLOBAL_THREAD=y
 CONFIG_FXAS21002_TRIGGER_GLOBAL_THREAD=y
-CONFIG_FXOS8700_TRIGGER_GLOBAL_THREAD=y
 CONFIG_FXLS8974_TRIGGER_GLOBAL_THREAD=y
+CONFIG_FXOS8700_TRIGGER_GLOBAL_THREAD=y
 CONFIG_GROW_R502A_TRIGGER_GLOBAL_THREAD=y
 CONFIG_HMC5883L_TRIGGER_GLOBAL_THREAD=y
 CONFIG_HTS221_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ICM42605_TRIGGER_GLOBAL_THREAD=y
-CONFIG_ICM42X70_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ICM42688_TRIGGER_GLOBAL_THREAD=y
+CONFIG_ICM42X70_TRIGGER_GLOBAL_THREAD=y
+CONFIG_ICM45686_TRIGGER_GLOBAL_THREAD=y
+CONFIG_ICP201XX_TRIGGER_GLOBAL_THREAD=y
 CONFIG_IIS2DH_TRIGGER_GLOBAL_THREAD=y
 CONFIG_IIS2DLPC_TRIGGER_GLOBAL_THREAD=y
 CONFIG_IIS2ICLX_TRIGGER_GLOBAL_THREAD=y
@@ -35,8 +38,8 @@ CONFIG_IIS3DHHC_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ISL29035_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ISM330DHCX_TRIGGER_GLOBAL_THREAD=y
 CONFIG_JC42_TRIGGER_GLOBAL_THREAD=y
-CONFIG_LIS2DH_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LIS2DE12_TRIGGER_GLOBAL_THREAD=y
+CONFIG_LIS2DH_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LIS2DS12_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LIS2DU12_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LIS2DUX12_TRIGGER_GLOBAL_THREAD=y
@@ -44,14 +47,15 @@ CONFIG_LIS2DW12_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LIS2MDL_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LIS3MDL_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LM75_TRIGGER_GLOBAL_THREAD=y
-CONFIG_LPS2XDF_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LPS22HH_TRIGGER_GLOBAL_THREAD=y
+CONFIG_LPS2XDF_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LSM6DSL_TRIGGER_GLOBAL_THREAD=y
-CONFIG_LSM6DSO_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LSM6DSO16IS_TRIGGER_GLOBAL_THREAD=y
+CONFIG_LSM6DSO_TRIGGER_GLOBAL_THREAD=y
 CONFIG_LSM6DSV16X_TRIGGER_GLOBAL_THREAD=y
 CONFIG_MPU6050_TRIGGER_GLOBAL_THREAD=y
 CONFIG_MPU9250_TRIGGER_GLOBAL_THREAD=y
+CONFIG_OPT3001_TRIGGER_GLOBAL_THREAD=y
 CONFIG_SHT3XD_TRIGGER_GLOBAL_THREAD=y
 CONFIG_SM351LT_TRIGGER_GLOBAL_THREAD=y
 CONFIG_STTS22H_TRIGGER_GLOBAL_THREAD=y
@@ -67,3 +71,4 @@ CONFIG_VCNL36825T_TRIGGER_GLOBAL_THREAD=y
 CONFIG_VCNL4040_TRIGGER_GLOBAL_THREAD=y
 CONFIG_WSEN_PADS_2511020213301_TRIGGER_GLOBAL_THREAD=y
 CONFIG_WSEN_TIDS_2521020222501_TRIGGER_GLOBAL_THREAD=y
+# zephyr-keep-sorted-stop
diff --git a/tests/drivers/build_all/sensor/sensors_trigger_none.conf b/tests/drivers/build_all/sensor/sensors_trigger_none.conf
index bc23289ae4345..8f83e40be61f8 100644
--- a/tests/drivers/build_all/sensor/sensors_trigger_none.conf
+++ b/tests/drivers/build_all/sensor/sensors_trigger_none.conf
@@ -1,3 +1,4 @@
+# zephyr-keep-sorted-start
 CONFIG_ADT7310_TRIGGER_NONE=y
 CONFIG_ADT7420_TRIGGER_NONE=y
 CONFIG_ADXL362_TRIGGER_NONE=y
@@ -12,20 +13,23 @@ CONFIG_BMI08X_GYRO_TRIGGER_NONE=y
 CONFIG_BMI160_TRIGGER_NONE=y
 CONFIG_BMI270_TRIGGER_NONE=y
 CONFIG_BMM150_TRIGGER_NONE=y
+CONFIG_BMM350_TRIGGER_NONE=y
 CONFIG_BMP388_TRIGGER_NONE=y
 CONFIG_BQ274XX_TRIGGER_NONE=y
 CONFIG_CCS811_TRIGGER_NONE=y
 CONFIG_ENS160_TRIGGER_NONE=y
 CONFIG_FDC2X1X_TRIGGER_NONE=y
 CONFIG_FXAS21002_TRIGGER_NONE=y
-CONFIG_FXOS8700_TRIGGER_NONE=y
 CONFIG_FXLS8974_TRIGGER_NONE=y
+CONFIG_FXOS8700_TRIGGER_NONE=y
 CONFIG_GROW_R502A_TRIGGER_NONE=y
 CONFIG_HMC5883L_TRIGGER_NONE=y
 CONFIG_HTS221_TRIGGER_NONE=y
 CONFIG_ICM42605_TRIGGER_NONE=y
-CONFIG_ICM42X70_TRIGGER_NONE=y
 CONFIG_ICM42688_TRIGGER_NONE=y
+CONFIG_ICM42X70_TRIGGER_NONE=y
+CONFIG_ICM45686_TRIGGER_NONE=y
+CONFIG_ICP201XX_TRIGGER_NONE=y
 CONFIG_IIS2DH_TRIGGER_NONE=y
 CONFIG_IIS2DLPC_TRIGGER_NONE=y
 CONFIG_IIS2ICLX_TRIGGER_NONE=y
@@ -35,8 +39,8 @@ CONFIG_IIS3DHHC_TRIGGER_NONE=y
 CONFIG_ISL29035_TRIGGER_NONE=y
 CONFIG_ISM330DHCX_TRIGGER_NONE=y
 CONFIG_JC42_TRIGGER_NONE=y
-CONFIG_LIS2DH_TRIGGER_NONE=y
 CONFIG_LIS2DE12_TRIGGER_NONE=y
+CONFIG_LIS2DH_TRIGGER_NONE=y
 CONFIG_LIS2DS12_TRIGGER_NONE=y
 CONFIG_LIS2DU12_TRIGGER_NONE=y
 CONFIG_LIS2DUX12_TRIGGER_NONE=y
@@ -44,15 +48,16 @@ CONFIG_LIS2DW12_TRIGGER_NONE=y
 CONFIG_LIS2MDL_TRIGGER_NONE=y
 CONFIG_LIS3MDL_TRIGGER_NONE=y
 CONFIG_LM75_TRIGGER_NONE=y
-CONFIG_LPS2XDF_TRIGGER_NONE=y
 CONFIG_LPS22HH_TRIGGER_NONE=y
+CONFIG_LPS2XDF_TRIGGER_NONE=y
 CONFIG_LSM6DSL_TRIGGER_NONE=y
-CONFIG_LSM6DSO_TRIGGER_NONE=y
 CONFIG_LSM6DSO16IS_TRIGGER_NONE=y
+CONFIG_LSM6DSO_TRIGGER_NONE=y
 CONFIG_LSM6DSV16X_TRIGGER_NONE=y
 CONFIG_MC3419_TRIGGER_NONE=y
 CONFIG_MPU6050_TRIGGER_NONE=y
 CONFIG_MPU9250_TRIGGER_NONE=y
+CONFIG_OPT3001_TRIGGER_NONE=y
 CONFIG_SHT3XD_TRIGGER_NONE=y
 CONFIG_SM351LT_TRIGGER_NONE=y
 CONFIG_STTS22H_TRIGGER_NONE=y
@@ -68,3 +73,4 @@ CONFIG_VCNL36825T_TRIGGER_NONE=y
 CONFIG_VCNL4040_TRIGGER_NONE=y
 CONFIG_WSEN_PADS_2511020213301_TRIGGER_NONE=y
 CONFIG_WSEN_TIDS_2521020222501_TRIGGER_NONE=y
+# zephyr-keep-sorted-stop
diff --git a/tests/drivers/build_all/sensor/sensors_trigger_own.conf b/tests/drivers/build_all/sensor/sensors_trigger_own.conf
index 7192dd15a39d0..51d3d4aac6587 100644
--- a/tests/drivers/build_all/sensor/sensors_trigger_own.conf
+++ b/tests/drivers/build_all/sensor/sensors_trigger_own.conf
@@ -1,3 +1,4 @@
+# zephyr-keep-sorted-start
 CONFIG_ADT7310_TRIGGER_OWN_THREAD=y
 CONFIG_ADT7420_TRIGGER_OWN_THREAD=y
 CONFIG_ADXL362_TRIGGER_OWN_THREAD=y
@@ -11,19 +12,22 @@ CONFIG_BMI08X_GYRO_TRIGGER_OWN_THREAD=y
 CONFIG_BMI160_TRIGGER_OWN_THREAD=y
 CONFIG_BMI270_TRIGGER_OWN_THREAD=y
 CONFIG_BMM150_TRIGGER_OWN_THREAD=y
+CONFIG_BMM350_TRIGGER_OWN_THREAD=y
 CONFIG_BMP388_TRIGGER_OWN_THREAD=y
 CONFIG_BQ274XX_TRIGGER_OWN_THREAD=y
 CONFIG_CCS811_TRIGGER_OWN_THREAD=y
 CONFIG_ENS160_TRIGGER_OWN_THREAD=y
 CONFIG_FDC2X1X_TRIGGER_OWN_THREAD=y
 CONFIG_FXAS21002_TRIGGER_OWN_THREAD=y
-CONFIG_FXOS8700_TRIGGER_OWN_THREAD=y
 CONFIG_FXLS8974_TRIGGER_OWN_THREAD=y
+CONFIG_FXOS8700_TRIGGER_OWN_THREAD=y
 CONFIG_GROW_R502A_TRIGGER_OWN_THREAD=y
 CONFIG_HMC5883L_TRIGGER_OWN_THREAD=y
 CONFIG_HTS221_TRIGGER_OWN_THREAD=y
-CONFIG_ICM42X70_TRIGGER_OWN_THREAD=y
 CONFIG_ICM42688_TRIGGER_OWN_THREAD=y
+CONFIG_ICM42X70_TRIGGER_OWN_THREAD=y
+CONFIG_ICM45686_TRIGGER_OWN_THREAD=y
+CONFIG_ICP201XX_TRIGGER_OWN_THREAD=y
 CONFIG_IIS2DH_TRIGGER_OWN_THREAD=y
 CONFIG_IIS2DLPC_TRIGGER_OWN_THREAD=y
 CONFIG_IIS2ICLX_TRIGGER_OWN_THREAD=y
@@ -33,23 +37,24 @@ CONFIG_IIS3DHHC_TRIGGER_OWN_THREAD=y
 CONFIG_ISL29035_TRIGGER_OWN_THREAD=y
 CONFIG_ISM330DHCX_TRIGGER_OWN_THREAD=y
 CONFIG_JC42_TRIGGER_OWN_THREAD=y
-CONFIG_LIS2DH_TRIGGER_OWN_THREAD=y
 CONFIG_LIS2DE12_TRIGGER_OWN_THREAD=y
+CONFIG_LIS2DH_TRIGGER_OWN_THREAD=y
 CONFIG_LIS2DS12_TRIGGER_OWN_THREAD=y
 CONFIG_LIS2DU12_TRIGGER_OWN_THREAD=y
 CONFIG_LIS2DUX12_TRIGGER_OWN_THREAD=y
 CONFIG_LIS2DW12_TRIGGER_OWN_THREAD=y
 CONFIG_LIS2MDL_TRIGGER_OWN_THREAD=y
 CONFIG_LIS3MDL_TRIGGER_OWN_THREAD=y
-CONFIG_LPS2XDF_TRIGGER_OWN_THREAD=y
 CONFIG_LPS22HH_TRIGGER_OWN_THREAD=y
+CONFIG_LPS2XDF_TRIGGER_OWN_THREAD=y
 CONFIG_LSM6DSL_TRIGGER_OWN_THREAD=y
-CONFIG_LSM6DSO_TRIGGER_OWN_THREAD=y
 CONFIG_LSM6DSO16IS_TRIGGER_OWN_THREAD=y
+CONFIG_LSM6DSO_TRIGGER_OWN_THREAD=y
 CONFIG_LSM6DSV16X_TRIGGER_OWN_THREAD=y
 CONFIG_MC3419_TRIGGER_OWN_THREAD=y
 CONFIG_MPU6050_TRIGGER_OWN_THREAD=y
 CONFIG_MPU9250_TRIGGER_OWN_THREAD=y
+CONFIG_OPT3001_TRIGGER_OWN_THREAD=y
 CONFIG_SHT3XD_TRIGGER_OWN_THREAD=y
 CONFIG_SM351LT_TRIGGER_OWN_THREAD=y
 CONFIG_STTS22H_TRIGGER_OWN_THREAD=y
@@ -64,3 +69,4 @@ CONFIG_VCNL36825T_TRIGGER_OWN_THREAD=y
 CONFIG_VCNL4040_TRIGGER_OWN_THREAD=y
 CONFIG_WSEN_PADS_2511020213301_TRIGGER_OWN_THREAD=y
 CONFIG_WSEN_TIDS_2521020222501_TRIGGER_OWN_THREAD=y
+# zephyr-keep-sorted-stop
diff --git a/tests/drivers/build_all/sensor/spi.dtsi b/tests/drivers/build_all/sensor/spi.dtsi
index 6f48188a2411c..b3d9760f501ab 100644
--- a/tests/drivers/build_all/sensor/spi.dtsi
+++ b/tests/drivers/build_all/sensor/spi.dtsi
@@ -399,3 +399,33 @@ test_spi_ilps22qs: ilps22qs@30 {
 	spi-max-frequency = <0>;
 	status = "okay";
 };
+
+test_spi_icm45686:icm45686@31 {
+	compatible = "invensense,icm45686";
+	reg = <0x31>;
+	spi-max-frequency = <0>;
+	int-gpios = <&test_gpio 0 0>;
+};
+
+paa3905: paa3905@32 {
+	compatible = "pixart,paa3905";
+	spi-max-frequency = <0>;
+	reg = <0x32>;
+	int-gpios = <&test_gpio 0 0>;
+};
+
+test_spi_pat9136: pat9136@33 {
+	compatible = "pixart,pat9136";
+	reg = <0x33>;
+	spi-max-frequency = <0>;
+	int-gpios = <&test_gpio 0 0>;
+};
+
+test_spi_icp201xx: icp201xx@34 {
+	compatible = "invensense,icp201xx";
+	reg = <0x34>;
+	spi-max-frequency = <0>;
+	int-gpios = <&test_gpio 0 0>;
+	op-mode = "mode0";
+	drive-strength = "current_12mA_1_8V";
+};
diff --git a/tests/drivers/build_all/sensor/testcase.yaml b/tests/drivers/build_all/sensor/testcase.yaml
index 3e5a0e3b5c3ea..1786d809d7252 100644
--- a/tests/drivers/build_all/sensor/testcase.yaml
+++ b/tests/drivers/build_all/sensor/testcase.yaml
@@ -8,27 +8,27 @@ common:
     - native_sim
   build_only: true
 tests:
-  sensors.build.sensorhub:
+  drivers.sensor.sensorhub.build:
     extra_args: EXTRA_CONF_FILE=sensors_shub.conf;sensors_die_temp.conf
-  sensors.build.trigger.own:
+  drivers.sensor.trigger.own.build:
     extra_args: EXTRA_CONF_FILE=sensors_trigger_own.conf;sensors_die_temp.conf
-  sensors.build.trigger.global:
+  drivers.sensor.trigger.global.build:
     extra_args: EXTRA_CONF_FILE=sensors_trigger_global.conf;sensors_die_temp.conf
-  sensors.build.trigger.none:
+  drivers.sensor.trigger.none.build:
     extra_args: EXTRA_CONF_FILE=sensors_trigger_none.conf;sensors_die_temp.conf
-  sensors.build.no_default:
+  drivers.sensor.no_default.build:
     extra_args: EXTRA_CONF_FILE=sensors_no_default.conf
-  sensors.build:
+  drivers.sensor.build:
     tags: sensors
     extra_args: EXTRA_CONF_FILE=sensors_die_temp.conf
     extra_configs:
       - CONFIG_UART_INTERRUPT_DRIVEN=y
-  sensors.build.pm:
+  drivers.sensor.pm.build:
     extra_configs:
       - CONFIG_PM=y
       - CONFIG_PM_DEVICE=y
       - CONFIG_UART_INTERRUPT_DRIVEN=y
-  sensors.generic_test:
+  drivers.sensor.generic_test:
     build_only: false
     extra_configs:
       - CONFIG_GENERIC_SENSOR_TEST=y
diff --git a/tests/drivers/build_all/spi/CMakeLists.txt b/tests/drivers/build_all/spi/CMakeLists.txt
new file mode 100644
index 0000000000000..518596a02f780
--- /dev/null
+++ b/tests/drivers/build_all/spi/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(build_all)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/build_all/spi/boards/qemu_cortex_m3.overlay b/tests/drivers/build_all/spi/boards/qemu_cortex_m3.overlay
new file mode 100644
index 0000000000000..f042d906c7d3a
--- /dev/null
+++ b/tests/drivers/build_all/spi/boards/qemu_cortex_m3.overlay
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2025 Meta Platforms
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	spi0: spi@88888888 {
+		compatible = "cdns,spi";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x88888888 0x400>;
+		interrupt-parent = <&nvic>;
+		interrupts = <4 1>;
+		fifo-width = <8>;
+		rx-fifo-depth = <256>;
+		tx-fifo-depth = <256>;
+		clock-frequency = <100000000>;
+	};
+};
diff --git a/tests/drivers/build_all/spi/prj.conf b/tests/drivers/build_all/spi/prj.conf
new file mode 100644
index 0000000000000..65c23a395a305
--- /dev/null
+++ b/tests/drivers/build_all/spi/prj.conf
@@ -0,0 +1,5 @@
+CONFIG_TEST=y
+CONFIG_TEST_USERSPACE=y
+CONFIG_SPI=y
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_CDNS=y
diff --git a/tests/drivers/build_all/spi/src/main.c b/tests/drivers/build_all/spi/src/main.c
new file mode 100644
index 0000000000000..079f0098c6ceb
--- /dev/null
+++ b/tests/drivers/build_all/spi/src/main.c
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Meta Platforms
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+int main(void)
+{
+	return 0;
+}
diff --git a/tests/drivers/build_all/spi/testcase.yaml b/tests/drivers/build_all/spi/testcase.yaml
new file mode 100644
index 0000000000000..5b275c69f1c2a
--- /dev/null
+++ b/tests/drivers/build_all/spi/testcase.yaml
@@ -0,0 +1,11 @@
+common:
+  build_only: true
+  tags:
+    - drivers
+    - spi
+tests:
+  drivers.spi.build:
+    # will cover drivers without in-tree boards
+    platform_allow: qemu_cortex_m3
+    tags: spi_cdns
+    extra_args: "CONFIG_SPI=y"
diff --git a/tests/drivers/build_all/stepper/gpio.dtsi b/tests/drivers/build_all/stepper/gpio.dtsi
index 3c159afaee776..b5151a3149cc4 100644
--- a/tests/drivers/build_all/stepper/gpio.dtsi
+++ b/tests/drivers/build_all/stepper/gpio.dtsi
@@ -3,17 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-test_gpio_stepper: test_gpio_stepper {
-	compatible = "zephyr,gpio-stepper";
-	status = "okay";
-	micro-step-res = <1>;
-	gpios = <&test_gpio 0 0>,
-		<&test_gpio 0 0>,
-		<&test_gpio 0 0>,
-		<&test_gpio 0 0>;
-};
+/****************************************
+ *  PLEASE KEEP ALPHABETICALLY SORTED   *
+ ***************************************/
 
-test_tmc2209: tmc2209_motor {
+adi_tmc2209: adi_tmc2209 {
 	compatible = "adi,tmc2209";
 	status = "okay";
 	micro-step-res = <1>;
@@ -25,9 +19,22 @@ test_tmc2209: tmc2209_motor {
 	counter = <&counter0>;
 };
 
-drv8424: drv8424 {
+allegro_a4979: allegro_a4979 {
 	status = "okay";
-	compatible = "ti,drv8424";
+	compatible = "allegro,a4979";
+	micro-step-res = <1>;
+	reset-gpios = <&test_gpio 0 0>;
+	dir-gpios = <&test_gpio 0 0>;
+	step-gpios = <&test_gpio 0 0>;
+	en-gpios = <&test_gpio 0 0>;
+	m0-gpios = <&test_gpio 0 0>;
+	m1-gpios = <&test_gpio 0 0>;
+	counter = <&counter0>;
+};
+
+ti_drv84xx: ti_drv84xx {
+	status = "okay";
+	compatible = "ti,drv84xx";
 
 	dir-gpios = <&test_gpio 0 0>;
 	step-gpios = <&test_gpio 0 0>;
@@ -37,3 +44,13 @@ drv8424: drv8424 {
 	m1-gpios = <&test_gpio 0 0>;
 	counter = <&counter0>;
 };
+
+zephyr_gpio_stepper: zephyr_gpio_stepper {
+	compatible = "zephyr,gpio-stepper";
+	status = "okay";
+	micro-step-res = <1>;
+	gpios = <&test_gpio 0 0>,
+		<&test_gpio 0 0>,
+		<&test_gpio 0 0>,
+		<&test_gpio 0 0>;
+};
diff --git a/tests/drivers/build_all/stepper/spi.dtsi b/tests/drivers/build_all/stepper/spi.dtsi
index f02da0c8e616d..98f80ceb94459 100644
--- a/tests/drivers/build_all/stepper/spi.dtsi
+++ b/tests/drivers/build_all/stepper/spi.dtsi
@@ -6,7 +6,7 @@
  * PLEASE KEEP REG ADDRESSES SEQUENTIAL *
  ***************************************/
 
-test_spi_tmc50xx: tmc50xx@0 {
+adi_tmc50xx: adi_tmc50xx@0 {
 	compatible = "adi,tmc50xx";
 	reg = <0x0>;
 	spi-max-frequency = <0>;
diff --git a/tests/drivers/can/api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf b/tests/drivers/can/api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..9fb2581d7f4a2
--- /dev/null
+++ b/tests/drivers/can/api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
@@ -0,0 +1 @@
+CONFIG_TEST_USERSPACE=n
diff --git a/tests/drivers/can/api/boards/stm32n6570_dk_stm32n657xx_sb.conf b/tests/drivers/can/api/boards/stm32n6570_dk_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..9fb2581d7f4a2
--- /dev/null
+++ b/tests/drivers/can/api/boards/stm32n6570_dk_stm32n657xx_sb.conf
@@ -0,0 +1 @@
+CONFIG_TEST_USERSPACE=n
diff --git a/tests/drivers/can/host/testcase.yaml b/tests/drivers/can/host/testcase.yaml
index 9c5ed9a1e376c..a056cf6fdd736 100644
--- a/tests/drivers/can/host/testcase.yaml
+++ b/tests/drivers/can/host/testcase.yaml
@@ -11,7 +11,7 @@ tests:
       pytest_dut_scope: session
       fixture: can
     extra_configs:
-      - arch:posix:CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+      - arch:posix:CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
     integration_platforms:
       - native_sim
       - native_sim/native/64
diff --git a/tests/drivers/can/timing/boards/native_posix.conf b/tests/drivers/can/timing/boards/native_posix.conf
deleted file mode 100644
index 7b071f3a54f51..0000000000000
--- a/tests/drivers/can/timing/boards/native_posix.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEST_ALL_BITRATES=y
diff --git a/tests/drivers/can/timing/boards/native_posix_native_64.conf b/tests/drivers/can/timing/boards/native_posix_native_64.conf
deleted file mode 100644
index 7b071f3a54f51..0000000000000
--- a/tests/drivers/can/timing/boards/native_posix_native_64.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEST_ALL_BITRATES=y
diff --git a/tests/drivers/can/timing/boards/nucleo_n657x0_q_stm32n657xx_sb.conf b/tests/drivers/can/timing/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..e0f23afd0cb96
--- /dev/null
+++ b/tests/drivers/can/timing/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
@@ -0,0 +1,2 @@
+CONFIG_TEST_ALL_BITRATES=y
+CONFIG_TEST_USERSPACE=n
diff --git a/tests/drivers/can/timing/boards/stm32n6570_dk_stm32n657xx_sb.conf b/tests/drivers/can/timing/boards/stm32n6570_dk_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..e0f23afd0cb96
--- /dev/null
+++ b/tests/drivers/can/timing/boards/stm32n6570_dk_stm32n657xx_sb.conf
@@ -0,0 +1,2 @@
+CONFIG_TEST_ALL_BITRATES=y
+CONFIG_TEST_USERSPACE=n
diff --git a/tests/drivers/clock_control/clock_control_api/testcase.yaml b/tests/drivers/clock_control/clock_control_api/testcase.yaml
index 1b10b912b4cad..972dcc1a1aa77 100644
--- a/tests/drivers/clock_control/clock_control_api/testcase.yaml
+++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml
@@ -25,6 +25,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
   drivers.clock.clock_control_nrf5_lfclk_rc:
@@ -35,6 +36,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_args: CONF_FILE="nrf_lfclk_rc.conf"
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
index 963618c6f23eb..756a92a98e3ed 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_clock_calibration/testcase.yaml
@@ -10,5 +10,6 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
diff --git a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
index cad39c3625f2c..eeb034a8ec0ca 100644
--- a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
@@ -16,6 +16,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_SYSTEM_CLOCK_WAIT_FOR_STABILITY=y
       - CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
@@ -33,6 +34,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_SYSTEM_CLOCK_WAIT_FOR_AVAILABILITY=y
       - CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
@@ -48,6 +50,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340dk/nrf5340/cpunet
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -64,6 +67,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -80,6 +84,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -96,6 +101,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -112,6 +118,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -128,6 +135,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
@@ -144,6 +152,7 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
     extra_configs:
diff --git a/tests/drivers/clock_control/onoff/testcase.yaml b/tests/drivers/clock_control/onoff/testcase.yaml
index 74d8a7f84d837..f24dce72a7a24 100644
--- a/tests/drivers/clock_control/onoff/testcase.yaml
+++ b/tests/drivers/clock_control/onoff/testcase.yaml
@@ -11,5 +11,6 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf9160dk/nrf9160
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf51dk/nrf51822
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/CMakeLists.txt b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/CMakeLists.txt
new file mode 100644
index 0000000000000..b4763ae3d880b
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/CMakeLists.txt
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(stm32_clock_configuration_n6)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/clear_clocks.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/clear_clocks.overlay
new file mode 100644
index 0000000000000..744eb46c2ff3c
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/clear_clocks.overlay
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Warning: This overlay clears clocks back to a state equivalent to what could
+ * be found in stm32n6.dtsi
+ */
+
+&clk_hse {
+	status = "disabled";
+	/delete-property/ clock-frequency;
+	/delete-property/ hse-bypass;
+};
+
+&clk_hsi {
+	status = "disabled";
+	/delete-property/ hsi-div;
+};
+
+&clk_lse {
+	status = "disabled";
+};
+
+&ic1 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&ic2 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&ic6 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&ic11 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&pll1 {
+	status = "disabled";
+	/delete-property/ div-m;
+	/delete-property/ mul-n;
+	/delete-property/ div-p1;
+	/delete-property/ div-p2;
+	/delete-property/ clocks;
+};
+
+&rcc {
+	/delete-property/ clocks;
+	/delete-property/ clock-frequency;
+	/delete-property/ ahb-prescaler;
+	/delete-property/ apb1-prescaler;
+	/delete-property/ apb2-prescaler;
+	/delete-property/ apb4-prescaler;
+	/delete-property/ apb5-prescaler;
+	/delete-property/ timg-prescaler;
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/hse_48.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/hse_48.overlay
new file mode 100644
index 0000000000000..d91d0a35248af
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/hse_48.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hse {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(48)>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSE CPU_SEL(2)>;
+	clock-frequency = <DT_FREQ_M(48)>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSE PER_SEL(2)>;
+};
+
+&rcc {
+	clocks = <&clk_hse>;
+	clock-frequency = <DT_FREQ_M(48)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/hsi_64.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/hsi_64.overlay
new file mode 100644
index 0000000000000..c30a4e58e1709
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/hsi_64.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hsi {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(64)>;
+	hsi-div = <1>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI CPU_SEL(0)>;
+	clock-frequency = <DT_FREQ_M(64)>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI PER_SEL(0)>;
+};
+
+&rcc {
+	clocks = <&clk_hsi>;
+	clock-frequency = <DT_FREQ_M(64)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hse_200.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hse_200.overlay
new file mode 100644
index 0000000000000..7f654621ddf98
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hse_200.overlay
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hse {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(48)>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_IC1 CPU_SEL(3)>;
+	clock-frequency = <DT_FREQ_M(200)>;
+};
+
+&ic1 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic2 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&ic6 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic11 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI PER_SEL(0)>;
+};
+
+&pll1 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <12>;
+	mul-n = <75>;
+	div-p1 = <1>;
+	div-p2 = <1>;
+};
+
+&rcc {
+	/* ic2, ic6 & ic11 must all be enabled to set ic2 as SYSCLK */
+	clocks = <&ic2>;
+	clock-frequency = <DT_FREQ_M(200)>;
+	ahb-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hse_600_400.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hse_600_400.overlay
new file mode 100644
index 0000000000000..68b1c82dcea94
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hse_600_400.overlay
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hse {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(48)>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_IC1 CPU_SEL(3)>;
+	clock-frequency = <DT_FREQ_M(600)>;
+};
+
+&ic1 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <1>;
+};
+
+&ic2 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&ic6 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic11 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSE PER_SEL(2)>;
+};
+
+&pll1 {
+	status = "okay";
+	clocks = <&clk_hse>;
+	div-m = <4>;
+	mul-n = <50>;
+	div-p1 = <1>;
+	div-p2 = <1>;
+};
+
+&rcc {
+	/* ic2, ic6 & ic11 must all be enabled to set ic2 as SYSCLK */
+	clocks = <&ic2>;
+	clock-frequency = <DT_FREQ_M(400)>;
+	ahb-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hsi_600_400.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hsi_600_400.overlay
new file mode 100644
index 0000000000000..11532796aca36
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/boards/pll_hsi_600_400.overlay
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hsi {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(64)>;
+	hsi-div = <1>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI CPU_SEL(0)>;
+	clock-frequency = <DT_FREQ_M(64)>;
+};
+
+&ic1 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic2 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&ic6 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic11 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI PER_SEL(0)>;
+};
+
+&pll1 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <4>;
+	mul-n = <75>;
+	div-p1 = <1>;
+	div-p2 = <1>;
+};
+
+&rcc {
+	/* ic2, ic6 & ic11 must all be enabled to set ic2 as SYSCLK */
+	clocks = <&ic2>;
+	clock-frequency = <DT_FREQ_M(400)>;
+	ahb-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/prj.conf b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/prj.conf
new file mode 100644
index 0000000000000..9467c2926896d
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/prj.conf
@@ -0,0 +1 @@
+CONFIG_ZTEST=y
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/src/test_stm32_clock_configuration.c
new file mode 100644
index 0000000000000..914a54e88c832
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/src/test_stm32_clock_configuration.c
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/ztest.h>
+
+ZTEST(stm32n6_clock_core_config, test_cpuclk_freq)
+{
+	uint32_t cpuclk_freq = HAL_RCC_GetCpuClockFreq();
+
+	zassert_equal(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, cpuclk_freq,
+		      "Expected cpuclk_freq: %d. Actual cupclk_freq: %d",
+		      CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, cpuclk_freq);
+}
+
+ZTEST(stm32n6_clock_core_config, test_cpuclk_src)
+{
+	int cpu_clk_src = __HAL_RCC_GET_CPUCLK_SOURCE();
+
+#if IS_ENABLED(STM32_CPUCLK_SRC_HSI)
+	zassert_equal(RCC_CPUCLKSOURCE_STATUS_HSI, cpu_clk_src,
+		      "Expected sysclk src: HSI (0x%x). Actual: 0x%x",
+		      RCC_CPUCLKSOURCE_STATUS_HSI, cpu_clk_src);
+#elif IS_ENABLED(STM32_CPUCLK_SRC_MSI)
+	zassert_equal(RCC_CPUCLKSOURCE_STATUS_MSI, cpu_clk_src,
+		      "Expected sysclk src: MSI (0x%x). Actual: 0x%x",
+		      RCC_CPUCLKSOURCE_STATUS_MSI, cpu_clk_src);
+#elif IS_ENABLED(STM32_CPUCLK_SRC_HSE)
+	zassert_equal(RCC_CPUCLKSOURCE_STATUS_HSE, cpu_clk_src,
+		      "Expected sysclk src: HSE (0x%x). Actual: 0x%x",
+		      RCC_CPUCLKSOURCE_STATUS_HSE, cpu_clk_src);
+#elif IS_ENABLED(STM32_CPUCLK_SRC_IC1)
+	zassert_equal(RCC_CPUCLKSOURCE_STATUS_IC1, cpu_clk_src,
+		      "Expected cpuclk src: IC1 (0x%x). Actual: 0x%x",
+		      RCC_CPUCLKSOURCE_STATUS_IC1, cpu_clk_src);
+#else
+	/* Case not expected */
+	zassert_true(IS_ENABLED(STM32_CPUCLK_SRC_HSI) ||
+		     IS_ENABLED(STM32_CPUCLK_SRC_MSI) ||
+		     IS_ENABLED(STM32_CPUCLK_SRC_HSE) ||
+		     IS_ENABLED(STM32_CPUCLK_SRC_IC1),
+		      "Not expected. cpu_clk_src: %d\n", cpu_clk_src);
+#endif
+}
+
+ZTEST(stm32n6_clock_core_config, test_sysclk_src)
+{
+	int sys_clk_src = __HAL_RCC_GET_SYSCLK_SOURCE();
+
+#if IS_ENABLED(STM32_SYSCLK_SRC_HSI)
+	zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src,
+			"Expected sysclk src: HSI (0x%x). Actual: 0x%x",
+			RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src);
+#elif IS_ENABLED(STM32_SYSCLK_SRC_MSI)
+	zassert_equal(RCC_SYSCLKSOURCE_STATUS_MSI, sys_clk_src,
+			"Expected sysclk src: MSI (0x%x). Actual: 0x%x",
+			RCC_SYSCLKSOURCE_STATUS_MSI, sys_clk_src);
+#elif IS_ENABLED(STM32_SYSCLK_SRC_HSE)
+	zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src,
+			"Expected sysclk src: HSE (0x%x). Actual: 0x%x",
+			RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src);
+#elif IS_ENABLED(STM32_SYSCLK_SRC_IC2)
+	zassert_equal(RCC_SYSCLKSOURCE_STATUS_IC2_IC6_IC11, sys_clk_src,
+			"Expected sysclk src: IC2 (0x%x). Actual: 0x%x",
+			RCC_SYSCLKSOURCE_STATUS_IC2_IC6_IC11, sys_clk_src);
+#else
+	/* Case not expected */
+	zassert_true(IS_ENABLED(STM32_SYSCLK_SRC_HSI) ||
+		     IS_ENABLED(STM32_SYSCLK_SRC_MSI) ||
+		     IS_ENABLED(STM32_SYSCLK_SRC_HSE) ||
+		     IS_ENABLED(STM32_SYSCLK_SRC_IC2)),
+		     "Not expected. sys_clk_src: %d\n", sys_clk_src);
+#endif
+}
+
+#if IS_ENABLED(STM32_PLL_ENABLED)
+ZTEST(stm32n6_clock_core_config, test_pll_src)
+{
+	uint32_t pll_src = __HAL_RCC_GET_PLL1_OSCSOURCE();
+
+#if STM32_PLL_SRC_HSI
+	zassert_equal(RCC_PLLSOURCE_HSI, pll_src,
+			"Expected PLL src: HSI. Actual PLL src: %d",
+			pll_src);
+#elif STM32_PLL_SRC_MSI
+	zassert_equal(RCC_PLLSOURCE_MSI, pll_src,
+			"Expected PLL src: MSI. Actual PLL src: %d",
+			pll_src);
+#elif STM32_PLL_SRC_HSE
+	zassert_equal(RCC_PLLSOURCE_HSE, pll_src,
+			"Expected PLL src: HSE. Actual PLL src: %d",
+			pll_src);
+#else
+	zassert_equal(RCC_PLLSOURCE_NONE, pll_src,
+			"Expected PLL src: None. Actual PLL src: %d",
+			pll_src);
+#endif
+}
+#endif /* STM32_PLL_ENABLED */
+
+#if IS_ENABLED(STM32_HSE_ENABLED)
+ZTEST(stm32n6_clock_core_config, test_hse_css)
+{
+	/* there is no function to read CSS status, so read directly from the SoC register */
+	bool css_enabled = (READ_BIT(RCC->HSECFGR, RCC_HSECFGR_HSECSSON) == 1U);
+
+	if (IS_ENABLED(STM32_HSE_CSS)) {
+		zassert_true(css_enabled, "HSE CSS is not enabled");
+	} else {
+		zassert_false(css_enabled, "HSE CSS unexpectedly enabled");
+	}
+}
+#endif /* STM32_HSE_ENABLED */
+
+#if IS_ENABLED(STM32_LSE_ENABLED)
+ZTEST(stm32n6_clock_core_config, test_lse_css)
+{
+	/* there is no function to read CSS status, so read directly from the SoC register */
+	bool css_enabled = (READ_BIT(RCC->LSECFGR, RCC_LSECFGR_LSECSSON) == 1U);
+
+	if (IS_ENABLED(STM32_LSE_CSS)) {
+		zassert_true(css_enabled, "LSE CSS is not enabled");
+	} else {
+		zassert_false(css_enabled, "LSE CSS unexpectedly enabled");
+	}
+}
+#endif /* STM32_LSE_ENABLED */
+
+#if IS_ENABLED(STM32_CKPER_ENABLED)
+ZTEST(stm32n6_clock_core_config, test_perclk_config)
+{
+	uint32_t perclk_dt_domain_clk, perclk_actual_domain_clk;
+
+	perclk_dt_domain_clk = DT_CLOCKS_CELL_BY_IDX(DT_NODELABEL(perck), 0, bus);
+	perclk_actual_domain_clk = __HAL_RCC_GET_CLKP_SOURCE();
+
+	switch (perclk_dt_domain_clk) {
+	case STM32_SRC_HSI:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_HSI,
+			"Expected PERCK src: HSI (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_HSI, perclk_actual_domain_clk);
+		break;
+	case STM32_SRC_MSI:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_MSI,
+			"Expected PERCK src: MSI (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_MSI, perclk_actual_domain_clk);
+		break;
+	case STM32_SRC_HSE:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_HSE,
+			"Expected PERCK src: HSE (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_HSE, perclk_actual_domain_clk);
+		break;
+	case STM32_SRC_IC19:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_IC19,
+			"Expected PERCK src: IC19 (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_IC19, perclk_actual_domain_clk);
+		break;
+	case STM32_SRC_IC5:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_IC5,
+			"Expected PERCK src: IC5 (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_IC5, perclk_actual_domain_clk);
+		break;
+	case STM32_SRC_IC10:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_IC10,
+			"Expected PERCK src: IC10 (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_IC10, perclk_actual_domain_clk);
+		break;
+	case STM32_SRC_IC15:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_IC15,
+			"Expected PERCK src: IC15 (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_IC15, perclk_actual_domain_clk);
+		break;
+	case STM32_SRC_IC20:
+		zassert_equal(perclk_actual_domain_clk, RCC_CLKPCLKSOURCE_IC20,
+			"Expected PERCK src: IC20 (0x%x). Actual: 0x%x",
+			RCC_CLKPCLKSOURCE_IC20, perclk_actual_domain_clk);
+		break;
+	default:
+		zassert_true(0, "Unexpected PERCK domain_clk src (0x%x)",
+			perclk_dt_domain_clk);
+		break;
+	}
+}
+#endif /* STM32_CKPER_ENABLED */
+
+ZTEST_SUITE(stm32n6_clock_core_config, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/testcase.yaml b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/testcase.yaml
new file mode 100644
index 0000000000000..40b087cb2d3e3
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_core/testcase.yaml
@@ -0,0 +1,22 @@
+common:
+  timeout: 5
+  platform_allow:
+    - stm32n6570_dk/stm32n657xx/sb
+    - nucleo_n657x0_q/stm32n657xx/sb
+  integration_platforms:
+    - stm32n6570_dk/stm32n657xx/sb
+tests:
+  drivers.clock.stm32_clock_configuration.n6.hsi_64:
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/hsi_64.overlay"
+  drivers.clock.stm32_clock_configuration.n6.cpu_pll_hsi_600_sysclk_pll_hsi_400:
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/pll_hsi_600_400.overlay"
+  # HSE test on boards that have a HSE: stm32n6570_dk
+  drivers.clock.stm32_clock_configuration.n6.hse_48:
+    platform_allow: stm32n6570_dk/stm32n657xx/sb
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/hse_48.overlay"
+  drivers.clock.stm32_clock_configuration.n6.cpu_pll_hse_600_sysclk_pll_hse_400:
+    platform_allow: stm32n6570_dk/stm32n657xx/sb
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/pll_hse_600_400.overlay"
+  drivers.clock.stm32_clock_configuration.n6.cpu_pll_hse_200_sysclk_pll_hse_200:
+    platform_allow: stm32n6570_dk/stm32n657xx/sb
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/pll_hse_200.overlay"
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/CMakeLists.txt b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/CMakeLists.txt
new file mode 100644
index 0000000000000..9e3918a61a4b0
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/CMakeLists.txt
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(stm32_clock_configuration_n6_devices)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/clear_clocks.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/clear_clocks.overlay
new file mode 100644
index 0000000000000..9a24375278e76
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/clear_clocks.overlay
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Clocks clean up config
+ * Aim is to avoid conflict with specific default board configuration
+ */
+
+&clk_hse {
+	status = "disabled";
+	/delete-property/ clock-frequency;
+	/delete-property/ hse-bypass;
+};
+
+&clk_hsi {
+	status = "disabled";
+	/delete-property/ hsi-div;
+};
+
+&clk_lse {
+	status = "disabled";
+};
+
+&ic1 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&ic2 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&ic6 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&ic11 {
+	status = "disabled";
+	/delete-property/ pll-src;
+	/delete-property/ ic-div;
+};
+
+&pll1 {
+	status = "disabled";
+	/delete-property/ div-m;
+	/delete-property/ mul-n;
+	/delete-property/ div-p1;
+	/delete-property/ div-p2;
+	/delete-property/ clocks;
+};
+
+&rcc {
+	/delete-property/ clocks;
+	/delete-property/ clock-frequency;
+	/delete-property/ ahb-prescaler;
+	/delete-property/ apb1-prescaler;
+	/delete-property/ apb2-prescaler;
+	/delete-property/ apb4-prescaler;
+	/delete-property/ apb5-prescaler;
+	/delete-property/ timg-prescaler;
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_hsi.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_hsi.overlay
new file mode 100644
index 0000000000000..ae65099a46816
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_hsi.overlay
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Core and device clock set up
+ *
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hsi {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(64)>;
+	hsi-div = <1>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_IC1 CPU_SEL(3)>;
+	clock-frequency = <DT_FREQ_M(150)>;
+};
+
+&ic1 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <4>;
+};
+
+&ic2 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&ic6 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic11 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI PER_SEL(0)>;
+};
+
+&pll1 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <4>;
+	mul-n = <75>;
+	div-p1 = <2>;
+	div-p2 = <1>;
+};
+
+&rcc {
+	/* ic2, ic6 & ic11 must all be enabled to set ic2 as SYSCLK */
+	clocks = <&ic2>;
+	clock-frequency = <DT_FREQ_M(400)>;
+	ahb-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
+
+&i2c1 {
+	clocks = <&rcc STM32_CLOCK(APB1, 21)>, <&rcc STM32_SRC_HSI_DIV I2C1_SEL(5)>;
+	status = "disabled";
+};
+
+&adc1 {
+	clocks = <&rcc STM32_CLOCK(AHB1, 5)>, <&rcc STM32_SRC_HSI_DIV ADC12_SEL(5)>;
+	status = "disabled";
+};
+
+&spi5 {
+	clocks = <&rcc STM32_CLOCK(APB2, 20)>, <&rcc STM32_SRC_HSI_DIV SPI5_SEL(5)>;
+	status = "disabled";
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_icx.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_icx.overlay
new file mode 100644
index 0000000000000..884fb63bb936e
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_icx.overlay
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Core and device clock set up
+ *
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hsi {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(64)>;
+	hsi-div = <1>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_IC1 CPU_SEL(3)>;
+	clock-frequency = <DT_FREQ_M(600)>;
+};
+
+&ic1 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic2 {
+	status = "okay";
+	pll-src = <2>;
+	ic-div = <3>;
+};
+
+&ic6 {
+	status = "okay";
+	pll-src = <3>;
+	ic-div = <5>;
+};
+
+&ic8 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <10>;
+};
+
+&ic9 {
+	status = "okay";
+	pll-src = <2>;
+	ic-div = <16>;
+};
+
+&ic10 {
+	status = "okay";
+	pll-src = <3>;
+	ic-div = <5>;
+};
+
+&ic11 {
+	status = "okay";
+	pll-src = <4>;
+	ic-div = <3>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI PER_SEL(0)>;
+};
+
+&pll1 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <4>;
+	mul-n = <75>;
+	div-p1 = <1>;
+	div-p2 = <1>;
+};
+
+&pll2 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <8>;
+	mul-n = <300>;
+	div-p1 = <1>;
+	div-p2 = <2>;
+};
+
+&pll3 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <2>;
+	mul-n = <75>;
+	div-p1 = <2>;
+	div-p2 = <5>;
+};
+
+&pll4 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <4>;
+	mul-n = <300>;
+	div-p1 = <1>;
+	div-p2 = <3>;
+};
+
+&rcc {
+	/* ic2, ic6 & ic11 must all be enabled to set ic2 as SYSCLK */
+	clocks = <&ic2>;
+	clock-frequency = <DT_FREQ_M(400)>;
+	ahb-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
+
+&i2c1 {
+	clocks = <&rcc STM32_CLOCK(APB1, 21)>, <&rcc STM32_SRC_IC10 I2C1_SEL(2)>;
+	status = "okay";
+};
+
+&adc1 {
+	clocks = <&rcc STM32_CLOCK(AHB1, 5)>, <&rcc STM32_SRC_IC8 ADC12_SEL(3)>;
+	status = "okay";
+};
+
+&spi5 {
+	clocks = <&rcc STM32_CLOCK(APB2, 20)>, <&rcc STM32_SRC_IC9 SPI5_SEL(2)>;
+	status = "okay";
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_perclk.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_perclk.overlay
new file mode 100644
index 0000000000000..8c834b26e2407
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_perclk.overlay
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Core and device clock set up
+ *
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hsi {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(64)>;
+	hsi-div = <1>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_IC1 CPU_SEL(3)>;
+	clock-frequency = <DT_FREQ_M(600)>;
+};
+
+&ic1 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic2 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&ic6 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic11 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI PER_SEL(0)>;
+};
+
+&pll1 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <4>;
+	mul-n = <75>;
+	div-p1 = <1>;
+	div-p2 = <1>;
+};
+
+&rcc {
+	/* ic2, ic6 & ic11 must all be enabled to set ic2 as SYSCLK */
+	clocks = <&ic2>;
+	clock-frequency = <DT_FREQ_M(400)>;
+	ahb-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+};
+
+&i2c1 {
+	clocks = <&rcc STM32_CLOCK(APB1, 21)>, <&rcc STM32_SRC_CKPER I2C1_SEL(1)>;
+	status = "okay";
+};
+
+&adc1 {
+	clocks = <&rcc STM32_CLOCK(AHB1, 5)>, <&rcc STM32_SRC_CKPER ADC12_SEL(1)>;
+	status = "okay";
+};
+
+&spi5 {
+	clocks = <&rcc STM32_CLOCK(APB2, 20)>, <&rcc STM32_SRC_CKPER SPI5_SEL(1)>;
+	status = "okay";
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_timg.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_timg.overlay
new file mode 100644
index 0000000000000..58e94b9e54554
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/boards/devices_on_timg.overlay
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Core and device clock set up
+ *
+ * Warning: This overlay performs configuration from clean sheet.
+ * It is assumed that it is applied after clear_clocks.overlay file.
+ */
+
+&clk_hsi {
+	status = "okay";
+	clock-frequency = <DT_FREQ_M(64)>;
+	hsi-div = <1>;
+};
+
+&cpusw {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_IC1 CPU_SEL(3)>;
+	clock-frequency = <DT_FREQ_M(600)>;
+};
+
+&ic1 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic2 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&ic6 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <2>;
+};
+
+&ic11 {
+	status = "okay";
+	pll-src = <1>;
+	ic-div = <3>;
+};
+
+&perck {
+	status = "okay";
+	clocks = <&rcc STM32_SRC_HSI PER_SEL(0)>;
+};
+
+&pll1 {
+	status = "okay";
+	clocks = <&clk_hsi>;
+	div-m = <4>;
+	mul-n = <75>;
+	div-p1 = <1>;
+	div-p2 = <1>;
+};
+
+&rcc {
+	/* ic2, ic6 & ic11 must all be enabled to set ic2 as SYSCLK */
+	clocks = <&ic2>;
+	clock-frequency = <DT_FREQ_M(400)>;
+	ahb-prescaler = <2>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+	apb4-prescaler = <1>;
+	apb5-prescaler = <1>;
+	timg-prescaler = <4>;
+};
+
+&i2c1 {
+	clocks = <&rcc STM32_CLOCK(APB1, 21)>, <&rcc STM32_SRC_CKPER I2C1_SEL(1)>;
+	status = "okay";
+};
+
+&adc1 {
+	clocks = <&rcc STM32_CLOCK(AHB1, 5)>, <&rcc STM32_SRC_TIMG ADC12_SEL(7)>;
+	status = "okay";
+};
+
+&spi5 {
+	clocks = <&rcc STM32_CLOCK(APB2, 20)>, <&rcc STM32_SRC_CKPER SPI5_SEL(1)>;
+	status = "okay";
+};
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/prj.conf b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/prj.conf
new file mode 100644
index 0000000000000..9467c2926896d
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/prj.conf
@@ -0,0 +1 @@
+CONFIG_ZTEST=y
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration.c
new file mode 100644
index 0000000000000..751430357980b
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/ztest.h>
+
+/* Not device related, but keep it to ensure core clock config is correct */
+ZTEST(stm32n6_devices_clocks, test_cpuclk_freq)
+{
+	uint32_t cpuclk_freq = HAL_RCC_GetCpuClockFreq();
+
+	zassert_equal(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, cpuclk_freq,
+		      "Expected cpuclk_freq: %d. Actual cupclk_freq: %d",
+		      CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, cpuclk_freq);
+}
+
+ZTEST_SUITE(stm32n6_devices_clocks, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_adc.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_adc.c
new file mode 100644
index 0000000000000..dee9f82369256
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_adc.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/ztest.h>
+
+ZTEST(stm32n6_devices_clocks, test_adc_clk_config)
+{
+	static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(DT_NODELABEL(adc1));
+
+	uint32_t dev_dt_clk_freq, dev_actual_clk_freq, dev_actual_clk_src;
+	enum clock_control_status status;
+	int r;
+
+	status = clock_control_get_status(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					  (clock_control_subsys_t)&pclken[0]);
+	zassert_true((status == CLOCK_CONTROL_STATUS_OFF),
+		     "ADC1 gating clock should be off initially");
+
+	/* Test clock_on(gating clock) */
+	r = clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+				(clock_control_subsys_t) &pclken[0]);
+	zassert_true((r == 0), "Could not enable ADC1 gating clock");
+
+	/* Check via HAL as well as via get_status API */
+	zassert_true(__HAL_RCC_ADC12_IS_CLK_ENABLED(), "[HAL] ADC1 gating clock should be on");
+
+	status = clock_control_get_status(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					  (clock_control_subsys_t)&pclken[0]);
+	zassert_true((status == CLOCK_CONTROL_STATUS_ON),
+		     "[Zephyr] ADC1 gating clock should be on");
+
+	if (DT_NUM_CLOCKS(DT_NODELABEL(adc1)) > 1) {
+		/* Test clock_on(domain_clk) */
+		r = clock_control_configure(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					    (clock_control_subsys_t) &pclken[1],
+					    NULL);
+		zassert_true((r == 0), "Could not enable ADC1 domain clock");
+
+		/* Test clock source */
+		dev_actual_clk_src = __HAL_RCC_GET_ADC_SOURCE();
+
+		switch (pclken[1].bus) {
+		case STM32_SRC_HCLK1:
+			zassert_equal(dev_actual_clk_src, RCC_ADCCLKSOURCE_HCLK,
+					"Expected ADC1 src: HCLK1 (0x%lx). Actual ADC1 src: 0x%x",
+					RCC_ADCCLKSOURCE_HCLK, dev_actual_clk_src);
+			break;
+		case STM32_SRC_CKPER:
+			zassert_equal(dev_actual_clk_src, RCC_ADCCLKSOURCE_CLKP,
+					"Expected ADC1 src: CKPER (0x%lx). Actual ADC1 src: 0x%x",
+					RCC_ADCCLKSOURCE_CLKP, dev_actual_clk_src);
+			break;
+		case STM32_SRC_IC7:
+			zassert_equal(dev_actual_clk_src, RCC_ADCCLKSOURCE_IC7,
+					"Expected ADC1 src: IC7 (0x%lx). Actual ADC1 src: 0x%x",
+					RCC_ADCCLKSOURCE_IC7, dev_actual_clk_src);
+			break;
+		case STM32_SRC_IC8:
+			zassert_equal(dev_actual_clk_src, RCC_ADCCLKSOURCE_IC8,
+					"Expected ADC1 src: IC8 (0x%lx). Actual ADC1 src: 0x%x",
+					RCC_ADCCLKSOURCE_IC8, dev_actual_clk_src);
+			break;
+		case STM32_SRC_MSI:
+			zassert_equal(dev_actual_clk_src, RCC_ADCCLKSOURCE_MSI,
+					"Expected ADC1 src: MSI (0x%lx). Actual ADC1 src: 0x%x",
+					RCC_ADCCLKSOURCE_MSI, dev_actual_clk_src);
+			break;
+		case STM32_SRC_HSI_DIV:
+			zassert_equal(dev_actual_clk_src, RCC_ADCCLKSOURCE_HSI,
+					"Expected ADC1 src: HSI_DIV (0x%lx). Actual ADC1 src: 0x%x",
+					RCC_ADCCLKSOURCE_HSI, dev_actual_clk_src);
+			break;
+		case STM32_SRC_TIMG:
+			zassert_equal(dev_actual_clk_src, RCC_ADCCLKSOURCE_TIMG,
+					"Expected ADC1 src: TIMG (0x%lx). Actual ADC1 src: 0x%x",
+					RCC_ADCCLKSOURCE_TIMG, dev_actual_clk_src);
+			break;
+		default:
+			zassert_true(0, "Unexpected src clk (%d)", dev_actual_clk_src);
+		}
+
+		/* Test status of the used clk source */
+		status = clock_control_get_status(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					     (clock_control_subsys_t)&pclken[1]);
+		zassert_true((status == CLOCK_CONTROL_STATUS_ON), "ADC1 clk src must to be on");
+
+		/* Test get_rate(srce clk) */
+		r = clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					(clock_control_subsys_t) &pclken[1],
+					&dev_dt_clk_freq);
+		zassert_true((r == 0), "Could not get ADC1 clk srce freq");
+
+		dev_actual_clk_freq = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_ADC);
+		zassert_equal(dev_dt_clk_freq, dev_actual_clk_freq,
+				"Expected DT freq: %d Hz. Actual freq: %d Hz",
+				dev_dt_clk_freq, dev_actual_clk_freq);
+
+	} else {
+		zassert_true((DT_NUM_CLOCKS(DT_NODELABEL(adc1)) == 1), "test config issue");
+		/* No domain clock available, don't check gating clock as for adc there is no
+		 * uniform way to verify via hal.
+		 */
+	}
+
+	/* Test clock_off(reg_clk) */
+	r = clock_control_off(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+				(clock_control_subsys_t) &pclken[0]);
+	zassert_true((r == 0), "Could not disable ADC1 gating clk");
+
+	zassert_true(!__HAL_RCC_ADC12_IS_CLK_ENABLED(), "ADC1 gating clk should be off");
+
+	/* Test clock_off(domain clk) */
+	/* Not supported today */
+}
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_i2c.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_i2c.c
new file mode 100644
index 0000000000000..e706605e5b460
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_i2c.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/ztest.h>
+
+static void i2c_set_clock(const struct stm32_pclken *clk)
+{
+	uint32_t dev_actual_clk_src, dev_dt_clk_freq, dev_actual_clk_freq;
+	enum clock_control_status status;
+
+	/* Test clock_on(domain_clk) */
+	int r = clock_control_configure(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					(clock_control_subsys_t) clk, NULL);
+	zassert_true((r == 0), "Could not enable I2C domain clock");
+
+	/* Test clock source */
+	dev_actual_clk_src = __HAL_RCC_GET_I2C1_SOURCE();
+
+	switch (clk->bus) {
+	case STM32_SRC_HSI_DIV:
+		zassert_equal(dev_actual_clk_src, RCC_I2C1CLKSOURCE_HSI,
+				"Expected I2C src: HSI_DIV (0x%lx). Actual I2C src: 0x%x",
+				RCC_I2C1CLKSOURCE_HSI, dev_actual_clk_src);
+		break;
+	case STM32_SRC_MSI:
+		zassert_equal(dev_actual_clk_src, RCC_I2C1CLKSOURCE_MSI,
+				"Expected I2C src: MSI (0x%lx). Actual I2C src: 0x%x",
+				RCC_I2C1CLKSOURCE_MSI, dev_actual_clk_src);
+		break;
+	case STM32_SRC_CKPER:
+		zassert_equal(dev_actual_clk_src, RCC_I2C1CLKSOURCE_CLKP,
+				"Expected I2C src: CKPER (0x%lx). Actual I2C src: 0x%x",
+				RCC_I2C1CLKSOURCE_CLKP, dev_actual_clk_src);
+		break;
+	case STM32_SRC_IC10:
+		zassert_equal(dev_actual_clk_src, RCC_I2C1CLKSOURCE_IC10,
+				"Expected I2C src: IC10 (0x%lx). Actual I2C src: 0x%x",
+				RCC_I2C1CLKSOURCE_IC10, dev_actual_clk_src);
+		break;
+	case STM32_SRC_IC15:
+		zassert_equal(dev_actual_clk_src, RCC_I2C1CLKSOURCE_IC15,
+				"Expected I2C src: IC15 (0x%lx). Actual I2C src: 0x%x",
+				RCC_I2C1CLKSOURCE_IC15, dev_actual_clk_src);
+		break;
+	default:
+		zassert_true(0, "Unexpected domain clk (0x%x)", dev_actual_clk_src);
+		break;
+	}
+
+	/* Test status of the used clk source */
+	status = clock_control_get_status(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					  (clock_control_subsys_t)clk);
+	zassert_true((status == CLOCK_CONTROL_STATUS_ON), "I2C1 clk src must to be on");
+
+	/* Test get_rate(srce clk) */
+	r = clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+				   (clock_control_subsys_t) clk,
+				   &dev_dt_clk_freq);
+	zassert_true((r == 0), "Could not get I2C clk srce freq");
+
+	dev_actual_clk_freq = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_I2C1);
+	zassert_equal(dev_dt_clk_freq, dev_actual_clk_freq,
+			"Expected freq: %d Hz. Actual clk: %d Hz",
+			dev_dt_clk_freq, dev_actual_clk_freq);
+}
+
+ZTEST(stm32n6_devices_clocks, test_i2c_clk_config)
+{
+	static const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(DT_NODELABEL(i2c1));
+
+	uint32_t dev_dt_clk_freq, dev_actual_clk_freq;
+	enum clock_control_status status;
+	int r;
+
+	status = clock_control_get_status(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					  (clock_control_subsys_t)&pclken[0]);
+
+	zassert_true((status == CLOCK_CONTROL_STATUS_OFF),
+		     "I2C Gating clock should be off initially");
+
+	/* Test clock_on(gating clock) */
+	r = clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+			     (clock_control_subsys_t) &pclken[0]);
+	zassert_true((r == 0), "Could not enable I2C gating clock");
+
+	/* Check via HAL as well as via get_status API */
+	zassert_true(__HAL_RCC_I2C1_IS_CLK_ENABLED(), "[HAL] I2C1 gating clock should be on");
+	status = clock_control_get_status(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					  (clock_control_subsys_t)&pclken[0]);
+	zassert_true((status == CLOCK_CONTROL_STATUS_ON),
+		     "[Zephyr] I2C1 gating clock should be on");
+
+	if (DT_NUM_CLOCKS(DT_NODELABEL(i2c1)) > 1) {
+		if (DT_NUM_CLOCKS(DT_NODELABEL(i2c1)) > 2) {
+			/* set a dummy clock first, to check if the register is set correctly even
+			 * if not in reset state
+			 */
+			i2c_set_clock(&pclken[2]);
+		}
+		i2c_set_clock(&pclken[1]);
+	} else {
+		zassert_true((DT_NUM_CLOCKS(DT_NODELABEL(i2c1)) == 1), "test config issue");
+		/* No domain clock available, get rate from gating clock */
+
+		/* Test get_rate */
+		r = clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+					   (clock_control_subsys_t) &pclken[0],
+					   &dev_dt_clk_freq);
+		zassert_true((r == 0), "Could not get I2C clk freq");
+
+		dev_actual_clk_freq = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_I2C1);
+		zassert_equal(dev_dt_clk_freq, dev_actual_clk_freq,
+				"Expected freq: %d Hz. Actual freq: %d Hz",
+				dev_dt_clk_freq, dev_actual_clk_freq);
+	}
+
+	/* Test clock_off(gating clk) */
+	r = clock_control_off(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+			      (clock_control_subsys_t) &pclken[0]);
+	zassert_true((r == 0), "Could not disable I2C gating clk");
+
+	zassert_true(!__HAL_RCC_I2C1_IS_CLK_ENABLED(), "I2C1 gating clk should be off");
+
+	/* Test clock_off(srce) */
+	/* Not supported today */
+}
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_spi.c b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_spi.c
new file mode 100644
index 0000000000000..122af4c0c7c07
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/src/test_stm32_clock_configuration_spi.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <soc.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/ztest.h>
+
+#if (DT_NUM_CLOCKS(DT_NODELABEL(spi5)) != 2)
+#error "SPI node requires 2 clocks: bus clock and kernel clock"
+#endif
+
+ZTEST(stm32n6_devices_clocks, test_spi_clk_config)
+{
+	const struct stm32_pclken pclken[] = STM32_DT_CLOCKS(DT_NODELABEL(spi5));
+	uint32_t spi_actual_domain_clk;
+	uint32_t spi_dt_clk_freq, spi_actual_clk_freq;
+	int r;
+
+	/* Test clock_on(reg_clk) */
+	r = clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+			     (clock_control_subsys_t) &pclken[0]);
+	zassert_true((r == 0), "Could not enable SPI gating clock");
+
+	zassert_true(__HAL_RCC_SPI5_IS_CLK_ENABLED(), "SPI5 gating clock should be on");
+
+	/* Test clock_on(domain source) */
+	r = clock_control_configure(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+				    (clock_control_subsys_t) &pclken[1],
+				    NULL);
+	zassert_true((r == 0), "Could not configure SPI domain clk");
+
+	/* Test clk source */
+	spi_actual_domain_clk = __HAL_RCC_GET_SPI5_SOURCE();
+
+	switch (pclken[1].bus) {
+	case STM32_SRC_PCLK2:
+		zassert_equal(spi_actual_domain_clk, RCC_SPI5CLKSOURCE_PCLK2,
+			      "Expected SPI src: PCLK2 (0x%x). Actual: 0x%x",
+			      RCC_SPI5CLKSOURCE_PCLK2, spi_actual_domain_clk);
+		break;
+	case STM32_SRC_CKPER:
+		zassert_equal(spi_actual_domain_clk, RCC_SPI5CLKSOURCE_CLKP,
+			      "Expected SPI src: PERCLK (0x%x). Actual: 0x%x",
+			      RCC_SPI5CLKSOURCE_CLKP, spi_actual_domain_clk);
+		break;
+	case STM32_SRC_IC9:
+		zassert_equal(spi_actual_domain_clk, RCC_SPI5CLKSOURCE_IC9,
+			      "Expected SPI src: IC9 (0x%x). Actual: 0x%x",
+			      RCC_SPI5CLKSOURCE_IC9, spi_actual_domain_clk);
+		break;
+	case STM32_SRC_IC14:
+		zassert_equal(spi_actual_domain_clk, RCC_SPI5CLKSOURCE_IC14,
+			      "Expected SPI src: IC14 (0x%x). Actual: 0x%x",
+			      RCC_SPI5CLKSOURCE_IC14, spi_actual_domain_clk);
+		break;
+	case STM32_SRC_MSI:
+		zassert_equal(spi_actual_domain_clk, RCC_SPI5CLKSOURCE_MSI,
+			      "Expected SPI src: MSI (0x%x). Actual: 0x%x",
+			      RCC_SPI5CLKSOURCE_MSI, spi_actual_domain_clk);
+		break;
+	case STM32_SRC_HSI_DIV:
+		zassert_equal(spi_actual_domain_clk, RCC_SPI5CLKSOURCE_HSI,
+			      "Expected SPI src: HSI_DIV (0x%x). Actual: 0x%x",
+			      RCC_SPI5CLKSOURCE_HSI, spi_actual_domain_clk);
+		break;
+	case STM32_SRC_HSE:
+		zassert_equal(spi_actual_domain_clk, RCC_SPI5CLKSOURCE_HSE,
+			      "Expected SPI src: HSE (0x%x). Actual: 0x%x",
+			      RCC_SPI5CLKSOURCE_HSE, spi_actual_domain_clk);
+		break;
+	default:
+		zassert_true(1, "Unexpected clk src (0x%x)", spi_actual_domain_clk);
+		break;
+	}
+
+	/* Test get_rate(source clk) */
+	r = clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+				   (clock_control_subsys_t) &pclken[1],
+				   &spi_dt_clk_freq);
+	zassert_true((r == 0), "Could not get SPI clk freq");
+
+	spi_actual_clk_freq = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI5);
+	zassert_equal(spi_dt_clk_freq, spi_actual_clk_freq,
+			"Expected SPI clk: %d. Actual: %d",
+			spi_dt_clk_freq, spi_actual_clk_freq);
+
+	/* Test clock_off(gating clock) */
+	r = clock_control_off(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
+			      (clock_control_subsys_t) &pclken[0]);
+	zassert_true((r == 0), "Could not disable SPI5 reg_clk");
+
+	zassert_true(!__HAL_RCC_SPI5_IS_CLK_ENABLED(), "SPI5 gating clock should be off");
+
+	/* Test clock_off(domain clk) */
+	/* Not supported today */
+}
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/testcase.yaml b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/testcase.yaml
new file mode 100644
index 0000000000000..79b51c3d3e129
--- /dev/null
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32n6_devices/testcase.yaml
@@ -0,0 +1,16 @@
+common:
+  timeout: 5
+  platform_allow:
+    - stm32n6570_dk/stm32n657xx/sb
+    - nucleo_n657x0_q/stm32n657xx/sb
+  integration_platforms:
+    - stm32n6570_dk/stm32n657xx/sb
+tests:
+  drivers.clock.stm32_clock_configuration.n6_device.hsi:
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/devices_on_hsi.overlay"
+  drivers.clock.stm32_clock_configuration.n6_device.perclk:
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/devices_on_perclk.overlay"
+  drivers.clock.stm32_clock_configuration.n6_device.icx:
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/devices_on_icx.overlay"
+  drivers.clock.stm32_clock_configuration.n6_device.timg:
+    extra_args: DTC_OVERLAY_FILE="boards/clear_clocks.overlay;boards/devices_on_timg.overlay"
diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32wba_core/testcase.yaml b/tests/drivers/clock_control/stm32_clock_configuration/stm32wba_core/testcase.yaml
index 6aa2075a594d4..2a80c2c4a3390 100644
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32wba_core/testcase.yaml
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32wba_core/testcase.yaml
@@ -1,7 +1,6 @@
 common:
   timeout: 5
   platform_allow:
-    - nucleo_wba52cg
     - nucleo_wba55cg
 tests:
   drivers.clock.stm32_clock_configuration.wba.sysclksrc_hsi_16:
diff --git a/tests/drivers/comparator/gpio_loopback/boards/ek_ra8d1.overlay b/tests/drivers/comparator/gpio_loopback/boards/ek_ra8d1.overlay
new file mode 100644
index 0000000000000..dfae394d3d1f9
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/ek_ra8d1.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	aliases {
+		test-comp = &acmphs0;
+	};
+
+	zephyr,user {
+		test-gpios = <&ioport6 0 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&acmphs_global {
+	status = "okay";
+
+	acmphs0 {
+		pinctrl-0 = <&acmphs_ivref0 &acmphs0_ivcmp0>;
+		pinctrl-names = "default";
+		interrupts = <90 12>;
+		interrupt-names = "hs";
+		reference-input-source = "ivref0";
+		compare-input-source = "ivcmp0";
+		noise-filter = <1>;
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/ek_ra8m1.overlay b/tests/drivers/comparator/gpio_loopback/boards/ek_ra8m1.overlay
new file mode 100644
index 0000000000000..dfae394d3d1f9
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/ek_ra8m1.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	aliases {
+		test-comp = &acmphs0;
+	};
+
+	zephyr,user {
+		test-gpios = <&ioport6 0 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&acmphs_global {
+	status = "okay";
+
+	acmphs0 {
+		pinctrl-0 = <&acmphs_ivref0 &acmphs0_ivcmp0>;
+		pinctrl-names = "default";
+		interrupts = <90 12>;
+		interrupt-names = "hs";
+		reference-input-source = "ivref0";
+		compare-input-source = "ivcmp0";
+		noise-filter = <1>;
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/mck_ra8t1.overlay b/tests/drivers/comparator/gpio_loopback/boards/mck_ra8t1.overlay
new file mode 100644
index 0000000000000..e933c71f364b6
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/mck_ra8t1.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	aliases {
+		test-comp = &acmphs0;
+	};
+
+	zephyr,user {
+		test-gpios = <&ioport6 6 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&acmphs_global {
+	status = "okay";
+
+	acmphs0 {
+		pinctrl-0 = <&acmphs_ivref0 &acmphs0_ivcmp0>;
+		pinctrl-names = "default";
+		interrupts = <90 12>;
+		interrupt-names = "hs";
+		reference-input-source = "ivref0";
+		compare-input-source = "ivcmp0";
+		noise-filter = <1>;
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..0761a369b9665
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/*
+ * P1.10 looped back to P1.11
+ */
+
+/ {
+	aliases {
+		test-comp = &comp;
+	};
+
+	zephyr,user {
+		test-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/comparator/gpio_loopback/boards/xg24_rb4187c.overlay b/tests/drivers/comparator/gpio_loopback/boards/xg24_rb4187c.overlay
new file mode 100644
index 0000000000000..d4759d66a20a5
--- /dev/null
+++ b/tests/drivers/comparator/gpio_loopback/boards/xg24_rb4187c.overlay
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/comparator/silabs-acmp.h>
+#include <zephyr/dt-bindings/pinctrl/silabs/xg24-pinctrl.h>
+
+/ {
+	aliases {
+		test-comp = &acmp0;
+	};
+
+	zephyr,user {
+		test-gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>;
+	};
+
+};
+
+&pinctrl {
+	acmp0_default: acmp0_default {
+		group0 {
+			silabs,analog-bus = <ABUS_CDODD0_ACMP0>;
+		};
+	};
+};
+
+&acmp0 {
+	pinctrl-0 = <&acmp0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	hysteresis-mode = "disabled";
+	accuracy-mode = "high";
+	input-range = "full";
+	input-positive = <ACMP_INPUT_PC3>;
+	input-negative = <ACMP_INPUT_VREFDIV1V25>;
+	vref-divider = <63>;
+};
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
index e030c0e554394..79fffefe7f4c7 100644
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/snippet.yml
@@ -10,6 +10,9 @@ boards:
   nrf54l15dk/nrf54l15/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+  ophelia4ev/nrf54l15/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
   nrf5340dk/nrf5340/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
index 70ff2a7e31475..82a32cb517ef6 100644
--- a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
+++ b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/snippet.yml
@@ -10,6 +10,9 @@ boards:
   nrf54l15dk/nrf54l15/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+  ophelia4ev/nrf54l15/cpuapp:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay
   nrf5340dk/nrf5340/cpuapp:
     append:
       EXTRA_DTC_OVERLAY_FILE: boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/tests/drivers/comparator/gpio_loopback/testcase.yaml b/tests/drivers/comparator/gpio_loopback/testcase.yaml
index ac3e43cb04808..cfeeabe3a691c 100644
--- a/tests/drivers/comparator/gpio_loopback/testcase.yaml
+++ b/tests/drivers/comparator/gpio_loopback/testcase.yaml
@@ -11,6 +11,7 @@ tests:
   drivers.comparator.gpio_loopback.silabs_acmp:
     platform_allow:
       - xg24_dk2601b
+      - xg24_rb4187c
       - xg29_rb4412a
   drivers.comparator.gpio_loopback.mcux_acmp:
     platform_allow:
@@ -22,6 +23,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf5340dk/nrf5340/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
   drivers.comparator.gpio_loopback.nrf_lpcomp:
     extra_args:
       - SNIPPET="gpio_loopback_nrf_lpcomp"
@@ -29,3 +31,4 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf5340dk/nrf5340/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/tests/drivers/console/line_splitting/line_splitting.robot b/tests/drivers/console/line_splitting/line_splitting.robot
index 6947d6d0bf4f0..17f95063e7426 100644
--- a/tests/drivers/console/line_splitting/line_splitting.robot
+++ b/tests/drivers/console/line_splitting/line_splitting.robot
@@ -6,7 +6,6 @@ Resource                      ${KEYWORDS}
 *** Test Cases ***
 Should Split Lines
     Prepare Machine
-    Start Emulation
     Wait For Next Line On Uart
     Write Line To Uart          \rabc\nd\n               waitForEcho=false
     Wait For Line On Uart       getline: abc;
diff --git a/tests/drivers/counter/counter_basic_api/boards/it82xx2_evb.overlay b/tests/drivers/counter/counter_basic_api/boards/it82xx2_evb.overlay
new file mode 100644
index 0000000000000..53d7711c6b135
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/it82xx2_evb.overlay
@@ -0,0 +1,9 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 ITE Corporation.
+ */
+
+&counter0 {
+	status = "okay";
+};
diff --git a/tests/drivers/counter/counter_basic_api/boards/it8xxx2_evb.overlay b/tests/drivers/counter/counter_basic_api/boards/it8xxx2_evb.overlay
new file mode 100644
index 0000000000000..53d7711c6b135
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/it8xxx2_evb.overlay
@@ -0,0 +1,9 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 ITE Corporation.
+ */
+
+&counter0 {
+	status = "okay";
+};
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_common.dtsi b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_common.dtsi
new file mode 100644
index 0000000000000..729416752870c
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_common.dtsi
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&timer00 {
+	prescaler = <6>;
+	status = "okay";
+};
+
+&timer10 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer20 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer21 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer22 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer23 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer24 {
+	prescaler = <4>;
+	status = "okay";
+};
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 54b47926164d0..6683b77837a99 100644
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -1,34 +1,3 @@
-&timer00 {
-	prescaler = <6>;
-	status = "okay";
-};
+/* SPDX-License-Identifier: Apache-2.0 */
 
-&timer10 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer20 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer21 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer22 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer23 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer24 {
-	prescaler = <4>;
-	status = "okay";
-};
+#include "nrf54l15dk_nrf54l15_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
new file mode 100644
index 0000000000000..6683b77837a99
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l15dk_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l15dk_nrf54l15_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_common.dtsi b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_common.dtsi
new file mode 100644
index 0000000000000..729416752870c
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_common.dtsi
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&timer00 {
+	prescaler = <6>;
+	status = "okay";
+};
+
+&timer10 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer20 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer21 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer22 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer23 {
+	prescaler = <4>;
+	status = "okay";
+};
+
+&timer24 {
+	prescaler = <4>;
+	status = "okay";
+};
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index 54b47926164d0..42b2852a09f88 100644
--- a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -1,34 +1,3 @@
-&timer00 {
-	prescaler = <6>;
-	status = "okay";
-};
+/* SPDX-License-Identifier: Apache-2.0 */
 
-&timer10 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer20 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer21 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer22 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer23 {
-	prescaler = <4>;
-	status = "okay";
-};
-
-&timer24 {
-	prescaler = <4>;
-	status = "okay";
-};
+#include "nrf54l20pdk_nrf54l20_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 0000000000000..42b2852a09f88
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l20pdk_nrf54l20_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/boards/nucleo_wba52cg.overlay b/tests/drivers/counter/counter_basic_api/boards/nucleo_wba55cg.overlay
similarity index 100%
rename from tests/drivers/counter/counter_basic_api/boards/nucleo_wba52cg.overlay
rename to tests/drivers/counter/counter_basic_api/boards/nucleo_wba55cg.overlay
diff --git a/tests/drivers/counter/counter_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..6683b77837a99
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l15dk_nrf54l15_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay b/tests/drivers/counter/counter_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
new file mode 100644
index 0000000000000..6683b77837a99
--- /dev/null
+++ b/tests/drivers/counter/counter_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+#include "nrf54l15dk_nrf54l15_common.dtsi"
diff --git a/tests/drivers/counter/counter_basic_api/socs/esp32c6.overlay b/tests/drivers/counter/counter_basic_api/socs/esp32c6_hpcore.overlay
similarity index 100%
rename from tests/drivers/counter/counter_basic_api/socs/esp32c6.overlay
rename to tests/drivers/counter/counter_basic_api/socs/esp32c6_hpcore.overlay
diff --git a/tests/drivers/counter/counter_basic_api/src/test_counter.c b/tests/drivers/counter/counter_basic_api/src/test_counter.c
index a225ec034701c..62bf7602e2d55 100644
--- a/tests/drivers/counter/counter_basic_api/src/test_counter.c
+++ b/tests/drivers/counter/counter_basic_api/src/test_counter.c
@@ -51,7 +51,7 @@ static const struct device *const devices[] = {
 #undef DT_DRV_COMPAT
 #undef STM32_COUNTER_DEV
 #endif
-#ifdef CONFIG_COUNTER_NATIVE_POSIX
+#ifdef CONFIG_COUNTER_NATIVE_SIM
 	DEVICE_DT_GET(DT_NODELABEL(counter0)),
 #endif
 #ifdef CONFIG_COUNTER_INFINEON_CAT1
@@ -129,6 +129,9 @@ static const struct device *const devices[] = {
 #ifdef CONFIG_COUNTER_RENESAS_RZ_GTM
 	DEVS_FOR_DT_COMPAT(renesas_rz_gtm_counter)
 #endif
+#ifdef CONFIG_COUNTER_ITE_IT8XXX2
+	DEVS_FOR_DT_COMPAT(ite_it8xxx2_counter)
+#endif
 };
 
 static const struct device *const period_devs[] = {
@@ -882,7 +885,7 @@ static bool late_detection_capable(const struct device *dev)
 	int err = counter_set_guard_period(dev, guard,
 					COUNTER_GUARD_PERIOD_LATE_TO_SET);
 
-	if (err == -ENOTSUP) {
+	if (err == -ENOSYS) {
 		return false;
 	}
 
@@ -1086,7 +1089,7 @@ static bool reliable_cancel_capable(const struct device *dev)
 		return true;
 	}
 #endif
-#ifdef CONFIG_COUNTER_NATIVE_POSIX
+#ifdef CONFIG_COUNTER_NATIVE_SIM
 	if (dev == DEVICE_DT_GET(DT_NODELABEL(counter0))) {
 		return true;
 	}
diff --git a/tests/drivers/counter/counter_basic_api/testcase.yaml b/tests/drivers/counter/counter_basic_api/testcase.yaml
index 053f53a4924a3..b6e3d69453d56 100644
--- a/tests/drivers/counter/counter_basic_api/testcase.yaml
+++ b/tests/drivers/counter/counter_basic_api/testcase.yaml
@@ -14,7 +14,6 @@ tests:
     depends_on: counter
     platform_allow:
       - nrf52840dk/nrf52840
-      - nrf52_bsim
     timeout: 400
     extra_configs:
       - CONFIG_ZERO_LATENCY_IRQS=y
@@ -27,7 +26,7 @@ tests:
     depends_on: counter
     platform_allow:
       - nucleo_f429zi
-      - nucleo_wba52cg
+      - nucleo_wba55cg
       - google_dragonclaw
     timeout: 600
     extra_configs:
diff --git a/tests/drivers/dac/dac_api/Kconfig b/tests/drivers/dac/dac_api/Kconfig
new file mode 100644
index 0000000000000..c0bff06f70f43
--- /dev/null
+++ b/tests/drivers/dac/dac_api/Kconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "DAC API test"
+
+source "Kconfig.zephyr"
+
+config DAC_BUFFER_NOT_SUPPORT
+	bool "DAC on board/SoC does not support output buffer mode"
+	help
+	  If this config is turned on, the test will run with no output buffer enabled
diff --git a/tests/drivers/dac/dac_api/boards/ek_ra4l1.conf b/tests/drivers/dac/dac_api/boards/ek_ra4l1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/tests/drivers/dac/dac_api/boards/ek_ra4l1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/tests/drivers/dac/dac_api/boards/ek_ra4m1.conf b/tests/drivers/dac/dac_api/boards/ek_ra4m1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/tests/drivers/dac/dac_api/boards/ek_ra4m1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/tests/drivers/dac/dac_api/boards/ek_ra4w1.conf b/tests/drivers/dac/dac_api/boards/ek_ra4w1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/tests/drivers/dac/dac_api/boards/ek_ra4w1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/tests/drivers/dac/dac_api/src/test_dac.c b/tests/drivers/dac/dac_api/src/test_dac.c
index ebd6475436a7c..3d5fb6e2101e1 100644
--- a/tests/drivers/dac/dac_api/src/test_dac.c
+++ b/tests/drivers/dac/dac_api/src/test_dac.c
@@ -13,6 +13,7 @@
 	defined(CONFIG_BOARD_NUCLEO_F207ZG) || \
 	defined(CONFIG_BOARD_STM32F3_DISCO) || \
 	defined(CONFIG_BOARD_NUCLEO_F429ZI) || \
+	defined(CONFIG_BOARD_NUCLEO_F439ZI) || \
 	defined(CONFIG_BOARD_NUCLEO_F746ZG) || \
 	defined(CONFIG_BOARD_NUCLEO_F767ZI) || \
 	defined(CONFIG_BOARD_NUCLEO_F722ZE) || \
@@ -110,9 +111,13 @@
 #endif
 
 static const struct dac_channel_cfg dac_ch_cfg = {
-	.channel_id  = DAC_CHANNEL_ID,
-	.resolution  = DAC_RESOLUTION,
-	.buffered = true
+	.channel_id = DAC_CHANNEL_ID,
+	.resolution = DAC_RESOLUTION,
+#if defined(CONFIG_DAC_BUFFER_NOT_SUPPORT)
+	.buffered = false,
+#else
+	.buffered = true,
+#endif /* CONFIG_DAC_BUFFER_NOT_SUPPORT */
 };
 
 const struct device *get_dac_device(void)
diff --git a/tests/drivers/dac/dac_loopback/Kconfig b/tests/drivers/dac/dac_loopback/Kconfig
new file mode 100644
index 0000000000000..531b0f123eefe
--- /dev/null
+++ b/tests/drivers/dac/dac_loopback/Kconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "DAC Loopback test"
+
+source "Kconfig.zephyr"
+
+config DAC_BUFFER_NOT_SUPPORT
+	bool "DAC on board/SoC does not support output buffer mode"
+	help
+	  If this config is turned on, the test will run with no output buffer enabled
diff --git a/tests/drivers/dac/dac_loopback/boards/ek_ra4l1.conf b/tests/drivers/dac/dac_loopback/boards/ek_ra4l1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/tests/drivers/dac/dac_loopback/boards/ek_ra4l1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/tests/drivers/dac/dac_loopback/boards/ek_ra4m1.conf b/tests/drivers/dac/dac_loopback/boards/ek_ra4m1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/tests/drivers/dac/dac_loopback/boards/ek_ra4m1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/tests/drivers/dac/dac_loopback/boards/ek_ra4w1.conf b/tests/drivers/dac/dac_loopback/boards/ek_ra4w1.conf
new file mode 100644
index 0000000000000..3f37d94739fd4
--- /dev/null
+++ b/tests/drivers/dac/dac_loopback/boards/ek_ra4w1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DAC_BUFFER_NOT_SUPPORT=y
diff --git a/tests/drivers/dac/dac_loopback/src/test_dac.c b/tests/drivers/dac/dac_loopback/src/test_dac.c
index 736343e09e61f..57190003a708d 100644
--- a/tests/drivers/dac/dac_loopback/src/test_dac.c
+++ b/tests/drivers/dac/dac_loopback/src/test_dac.c
@@ -176,7 +176,13 @@
 #define ADC_GAIN             ADC_GAIN_1
 #define ADC_REFERENCE        ADC_REF_INTERNAL
 #define ADC_ACQUISITION_TIME ADC_ACQ_TIME_DEFAULT
-#define ADC_CHANNEL_ID       0
+#if defined(CONFIG_BOARD_EK_RA4L1)
+#define ADC_CHANNEL_ID 1
+#elif defined(CONFIG_BOARD_EK_RA4W1)
+#define ADC_CHANNEL_ID 4
+#else
+#define ADC_CHANNEL_ID 0
+#endif
 
 #else
 #error "Unsupported board."
@@ -185,7 +191,11 @@
 static const struct dac_channel_cfg dac_ch_cfg = {
 	.channel_id = DAC_CHANNEL_ID,
 	.resolution = DAC_RESOLUTION,
-	.buffered = true
+#if defined(CONFIG_DAC_BUFFER_NOT_SUPPORT)
+	.buffered = false,
+#else
+	.buffered = true,
+#endif /* CONFIG_DAC_BUFFER_NOT_SUPPORT */
 };
 
 static const struct adc_channel_cfg adc_ch_cfg = {
diff --git a/tests/drivers/disk/disk_performance/boards/max32666fthr_max32666_cpu0.conf b/tests/drivers/disk/disk_performance/boards/max32666fthr_max32666_cpu0.conf
new file mode 100644
index 0000000000000..ecf4f8f9d4b36
--- /dev/null
+++ b/tests/drivers/disk/disk_performance/boards/max32666fthr_max32666_cpu0.conf
@@ -0,0 +1,2 @@
+CONFIG_SDMMC_SUBSYS=y
+CONFIG_SDHC=y
diff --git a/tests/drivers/display/display_read_write/src/main.c b/tests/drivers/display/display_read_write/src/main.c
index e44b49a4beb8c..cbb64bb967588 100644
--- a/tests/drivers/display/display_read_write/src/main.c
+++ b/tests/drivers/display/display_read_write/src/main.c
@@ -22,7 +22,8 @@ static uint8_t disp_buffer[DT_PROP(DT_CHOSEN(zephyr_display), width) *
 	__aligned(CONFIG_DISPLAY_BUFFER_ALIGNMENT);
 static struct display_capabilities cfg;
 static uint8_t bpp;
-static bool is_tiled;
+static bool is_vtiled;
+static bool is_htiled;
 
 static inline uint8_t bytes_per_pixel(enum display_pixel_format pixel_format)
 {
@@ -34,6 +35,7 @@ static inline uint8_t bytes_per_pixel(enum display_pixel_format pixel_format)
 	case PIXEL_FORMAT_RGB_565:
 	case PIXEL_FORMAT_BGR_565:
 		return 2;
+	case PIXEL_FORMAT_L_8:
 	case PIXEL_FORMAT_MONO01:
 	case PIXEL_FORMAT_MONO10:
 	default:
@@ -56,7 +58,7 @@ static void verify_bytes_of_area(uint8_t *data, int cmp_x, int cmp_y, size_t wid
 
 	zassert_ok(err, "display_read failed");
 
-	if (is_tiled) {
+	if (is_vtiled || is_htiled) {
 		zassert_mem_equal(data, disp_buffer, width * height / 8, NULL);
 	} else {
 		zassert_mem_equal(data, disp_buffer, width * height * bpp, NULL);
@@ -65,7 +67,7 @@ static void verify_bytes_of_area(uint8_t *data, int cmp_x, int cmp_y, size_t wid
 
 static void verify_background_color(int x, int y, size_t width, size_t height, uint32_t color)
 {
-	size_t buf_size = is_tiled ? (height * width / 8) : (height * width * bpp);
+	size_t buf_size = height * width * bpp / ((is_vtiled || is_htiled) ? 8 : 1);
 	struct display_buffer_descriptor desc = {
 		.height = height,
 		.pitch = width,
@@ -89,7 +91,7 @@ static void verify_background_color(int x, int y, size_t width, size_t height, u
 			zassert_equal(buf16[i], (uint16_t)color, "@%d", i);
 			break;
 		case 1:
-			if (is_tiled) {
+			if (is_vtiled) {
 				uint16_t x = i % (width);
 				uint16_t line = (i - x) / width;
 				uint16_t tile = line / 8;
@@ -98,6 +100,10 @@ static void verify_background_color(int x, int y, size_t width, size_t height, u
 				uint8_t *tptr = disp_buffer + (tile * width + x);
 
 				zassert_equal(!!(*tptr & BIT(y)), !!(color), "@%d", i);
+			} else if (is_htiled) {
+				uint8_t *tptr = disp_buffer + i / 8;
+
+				zassert_equal(!!(*tptr & BIT(i % 8)), !!(color), "@%d", i);
 			} else {
 				zassert_equal(buf8[i], (uint8_t)color, "@%d", i);
 			}
@@ -113,7 +119,8 @@ static void display_before(void *text_fixture)
 {
 	display_get_capabilities(dev, &cfg);
 	bpp = bytes_per_pixel(cfg.current_pixel_format);
-	is_tiled = ((bpp == 1) && (cfg.screen_info & SCREEN_INFO_MONO_VTILED));
+	is_vtiled = (bpp == 1 && (cfg.screen_info & SCREEN_INFO_MONO_VTILED));
+	is_htiled = (bpp == 1 && !(cfg.screen_info & SCREEN_INFO_MONO_VTILED));
 
 	struct display_buffer_descriptor desc = {
 		.height = display_height,
@@ -142,8 +149,8 @@ ZTEST(display_read_write, test_clear)
 ZTEST(display_read_write, test_write_to_buffer_head)
 {
 	uint8_t data[4] = {0xFA, 0xAF, 0x9F, 0xFA};
-	uint8_t height = (is_tiled ? 8 : 1);
-	uint16_t width = sizeof(data) / bpp;
+	uint8_t height = (is_vtiled ? 8 : 1);
+	uint16_t width = sizeof(data) / bpp * (is_htiled ? 8 : 1);
 	uint16_t buf_size = width * bpp;
 	struct display_buffer_descriptor desc = {
 		.height = height,
@@ -170,8 +177,8 @@ ZTEST(display_read_write, test_write_to_buffer_head)
 ZTEST(display_read_write, test_write_to_buffer_tail)
 {
 	uint8_t data[4] = {0xFA, 0xAF, 0x9F, 0xFA};
-	uint16_t height = (is_tiled ? 8 : 1);
-	uint16_t width = sizeof(data) / bpp;
+	uint16_t height = (is_vtiled ? 8 : 1);
+	uint16_t width = sizeof(data) / bpp * (is_htiled ? 8 : 1);
 	uint16_t buf_size = width * bpp;
 	struct display_buffer_descriptor desc = {
 		.height = height,
@@ -195,7 +202,7 @@ ZTEST(display_read_write, test_write_to_buffer_tail)
 	zassert_ok(err, "display_read failed");
 
 	/* check write data and read data are same */
-	if (is_tiled) {
+	if (is_vtiled || is_htiled) {
 		zassert_mem_equal(data,
 				  disp_buffer + (display_width * display_height / 8 - buf_size),
 				  buf_size, NULL);
@@ -216,8 +223,8 @@ ZTEST(display_read_write, test_write_to_buffer_tail)
 ZTEST(display_read_write, test_read_does_not_clear_existing_buffer)
 {
 	uint8_t data[4] = {0xFA, 0xAF, 0x9F, 0xFA};
-	uint8_t height = (is_tiled ? 8 : 1);
-	uint16_t width = sizeof(data) / bpp;
+	uint8_t height = (is_vtiled ? 8 : 1);
+	uint16_t width = sizeof(data) / bpp * (is_htiled ? 8 : 1);
 	uint16_t buf_size = width * bpp;
 	struct display_buffer_descriptor desc = {
 		.height = height,
@@ -251,7 +258,7 @@ ZTEST(display_read_write, test_read_does_not_clear_existing_buffer)
 	zassert_ok(err, "display_read failed");
 
 	/* checking correctly write to the tail of buffer */
-	if (is_tiled) {
+	if (is_vtiled || is_htiled) {
 		zassert_mem_equal(data,
 				  disp_buffer + (display_width * display_height / 8 - buf_size),
 				  buf_size, NULL);
diff --git a/tests/drivers/display/display_read_write/testcase.yaml b/tests/drivers/display/display_read_write/testcase.yaml
index 4383c7d44efcb..ec0b89f8f7402 100644
--- a/tests/drivers/display/display_read_write/testcase.yaml
+++ b/tests/drivers/display/display_read_write/testcase.yaml
@@ -19,32 +19,62 @@ tests:
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_RGB_888=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
-  drivers.display.read_write.sdl.mono01:
+  drivers.display.read_write.sdl.mono01.vtiled.msbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
-  drivers.display.read_write.sdl.mono10:
+  drivers.display.read_write.sdl.mono10.vtiled.msbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
-  drivers.display.read_write.sdl.mono01.lsbfirst:
+  drivers.display.read_write.sdl.mono01.htiled.msbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
+  drivers.display.read_write.sdl.mono10.htiled.msbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
+  drivers.display.read_write.sdl.mono01.vtiled.lsbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
       - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
-  drivers.display.read_write.sdl.mono10.lsbfirst:
+  drivers.display.read_write.sdl.mono10.vtiled.lsbfirst:
     platform_allow:
       - native_sim
     extra_configs:
       - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
       - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
       - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
+  drivers.display.read_write.sdl.mono01.htiled.lsbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO01=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
+      - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
+  drivers.display.read_write.sdl.mono10.htiled.lsbfirst:
+    platform_allow:
+      - native_sim
+    extra_configs:
+      - CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10=y
+      - CONFIG_SDL_DISPLAY_USE_HARDWARE_ACCELERATOR=n
+      - CONFIG_SDL_DISPLAY_MONO_VTILED=n
+      - CONFIG_SDL_DISPLAY_MONO_MSB_FIRST=n
   drivers.display.read_write.sdl.rgb565:
     platform_allow:
       - native_sim
@@ -69,10 +99,10 @@ tests:
     # presence of the arduino_spi DT nodelabel
     platform_allow:
       - mimxrt685_evk/mimxrt685s/cm33
-  drivers.display.read_write.rtkmipilcdb00000be:
+  drivers.display.read_write.renesas_ra_glcdc:
     tags:
       - shield
+    filter: dt_compat_enabled("renesas,ra-glcdc")
     extra_args:
-      - SHIELD=rtkmipilcdb00000be
-    platform_allow:
-      - ek_ra8d1
+      - platform:ek_ra8d1/r7fa8d1bhecbd:SHIELD=rtkmipilcdb00000be
+      - platform:ek_ra8d1/r7fa8d1bhecbd:SHIELD=rtk7eka6m3b00001bu
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/max32662evkit.conf b/tests/drivers/dma/chan_blen_transfer/boards/max32662evkit.conf
new file mode 100644
index 0000000000000..a093a1aa63735
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/max32662evkit.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CODE_DATA_RELOCATION=y
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/max32662evkit.overlay b/tests/drivers/dma/chan_blen_transfer/boards/max32662evkit.overlay
new file mode 100644
index 0000000000000..0e412606f7a07
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/max32662evkit.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/max32666evkit_max32666_cpu0.conf b/tests/drivers/dma/chan_blen_transfer/boards/max32666evkit_max32666_cpu0.conf
new file mode 100644
index 0000000000000..a093a1aa63735
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/max32666evkit_max32666_cpu0.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CODE_DATA_RELOCATION=y
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/max32666evkit_max32666_cpu0.overlay b/tests/drivers/dma/chan_blen_transfer/boards/max32666evkit_max32666_cpu0.overlay
new file mode 100644
index 0000000000000..0e412606f7a07
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/max32666evkit_max32666_cpu0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/max32666fthr_max32666_cpu0.conf b/tests/drivers/dma/chan_blen_transfer/boards/max32666fthr_max32666_cpu0.conf
new file mode 100644
index 0000000000000..a093a1aa63735
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/max32666fthr_max32666_cpu0.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Analog Devices, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CODE_DATA_RELOCATION=y
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/max32666fthr_max32666_cpu0.overlay b/tests/drivers/dma/chan_blen_transfer/boards/max32666fthr_max32666_cpu0.overlay
new file mode 100644
index 0000000000000..0e412606f7a07
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/max32666fthr_max32666_cpu0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
similarity index 100%
rename from tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk.conf
rename to tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/tests/drivers/dma/chan_blen_transfer/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..c921a4af96ac8
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&dma0 {
+	status = "okay";
+};
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.conf b/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.conf
deleted file mode 100644
index 542bad664d3e1..0000000000000
--- a/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_DMA_TRANSFER_CHANNEL_NR_0=1
-CONFIG_DMA_TRANSFER_CHANNEL_NR_1=2
-CONFIG_DMA_LOOP_TRANSFER_NUMBER_OF_DMAS=2
-CONFIG_DMA_TRANSFER_BURST16=n
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.overlay b/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.overlay
deleted file mode 100644
index d3ac62d2a2019..0000000000000
--- a/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2024 Silicon Laboratories Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-tst_dma0: &dma0 {
-	status = "okay";
-};
-
-tst_dma1: &ulpdma {
-	status = "okay";
-};
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/xg29_rb4412a.overlay b/tests/drivers/dma/chan_blen_transfer/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..73a4023ee35b1
--- /dev/null
+++ b/tests/drivers/dma/chan_blen_transfer/boards/xg29_rb4412a.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&dma0 {
+	status = "okay";
+};
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
similarity index 100%
rename from tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
rename to tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.conf b/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.conf
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.conf
rename to tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.conf
diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.overlay b/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.overlay
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.overlay
rename to tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.overlay
diff --git a/tests/drivers/dma/loop_transfer/boards/max32662evkit.overlay b/tests/drivers/dma/loop_transfer/boards/max32662evkit.overlay
new file mode 100644
index 0000000000000..8c711035a3153
--- /dev/null
+++ b/tests/drivers/dma/loop_transfer/boards/max32662evkit.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&sram0 {
+	compatible = "mmio-sram";
+	reg = <0x20000000 DT_SIZE_K(64)>;
+};
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+	};
+};
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/loop_transfer/boards/max32666evkit_max32666_cpu0.overlay b/tests/drivers/dma/loop_transfer/boards/max32666evkit_max32666_cpu0.overlay
new file mode 100644
index 0000000000000..0e412606f7a07
--- /dev/null
+++ b/tests/drivers/dma/loop_transfer/boards/max32666evkit_max32666_cpu0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/loop_transfer/boards/max32666fthr_max32666_cpu0.overlay b/tests/drivers/dma/loop_transfer/boards/max32666fthr_max32666_cpu0.overlay
new file mode 100644
index 0000000000000..0e412606f7a07
--- /dev/null
+++ b/tests/drivers/dma/loop_transfer/boards/max32666fthr_max32666_cpu0.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk.conf
rename to tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.conf
diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf
deleted file mode 100644
index cdc6eb7c7f19b..0000000000000
--- a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_CODE_DATA_RELOCATION=y
-CONFIG_MEM_ATTR_HEAP=y
-CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1"
diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
deleted file mode 100644
index 5e8bafa1d9b1b..0000000000000
--- a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2022 Kumar Gala <galak@kernel.org>
- * Copyright (c) 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
-
-&sram1 {
-	zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>;
-};
-
-tst_dma0: &edma_lpsr0 { };
diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
rename to tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
deleted file mode 100644
index 8aa11602c69fd..0000000000000
--- a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_CODE_DATA_RELOCATION=y
-CONFIG_MEM_ATTR_HEAP=y
-CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="ITCM"
diff --git a/tests/drivers/dma/loop_transfer/boards/pico_plus2_rp2350b_m33.overlay b/tests/drivers/dma/loop_transfer/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..35ee84e3c4ea8
--- /dev/null
+++ b/tests/drivers/dma/loop_transfer/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2023 Tokita, Hiroshi <tokita.hiroshi@fujitsu.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+tst_dma0: &dma {
+	status = "okay";
+};
diff --git a/tests/drivers/dma/loop_transfer/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/tests/drivers/dma/loop_transfer/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..c921a4af96ac8
--- /dev/null
+++ b/tests/drivers/dma/loop_transfer/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&dma0 {
+	status = "okay";
+};
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/loop_transfer/boards/xg29_rb4412a.conf b/tests/drivers/dma/loop_transfer/boards/xg29_rb4412a.conf
new file mode 100644
index 0000000000000..c757696378213
--- /dev/null
+++ b/tests/drivers/dma/loop_transfer/boards/xg29_rb4412a.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Silicon Laboratories, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_DMA_LOOP_TRANSFER_SIZE=2048
diff --git a/tests/drivers/dma/loop_transfer/boards/xg29_rb4412a.overlay b/tests/drivers/dma/loop_transfer/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..73a4023ee35b1
--- /dev/null
+++ b/tests/drivers/dma/loop_transfer/boards/xg29_rb4412a.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&dma0 {
+	status = "okay";
+};
+
+tst_dma0: &dma0 { };
diff --git a/tests/drivers/dma/scatter_gather/boards/siwx917_rb4338a.conf b/tests/drivers/dma/scatter_gather/boards/siwx917_rb4338a.conf
new file mode 100644
index 0000000000000..2bd1c2c8dba8d
--- /dev/null
+++ b/tests/drivers/dma/scatter_gather/boards/siwx917_rb4338a.conf
@@ -0,0 +1,2 @@
+CONFIG_DMA_SG_CHANNEL_NR=7
+CONFIG_DMA_SG_XFER_SIZE=4096
diff --git a/tests/drivers/dma/scatter_gather/boards/siwx917_rb4338a.overlay b/tests/drivers/dma/scatter_gather/boards/siwx917_rb4338a.overlay
new file mode 100644
index 0000000000000..b5bf935a9c322
--- /dev/null
+++ b/tests/drivers/dma/scatter_gather/boards/siwx917_rb4338a.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/ {
+	aliases {
+		dma0 = &dma0;
+	};
+};
+&dma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/dma/scatter_gather/boards/xg29_rb4412a.overlay b/tests/drivers/dma/scatter_gather/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..a6fb1d7e0945b
--- /dev/null
+++ b/tests/drivers/dma/scatter_gather/boards/xg29_rb4412a.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		dma0 = &dma0;
+	};
+};
+
+&dma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/dma/scatter_gather/testcase.yaml b/tests/drivers/dma/scatter_gather/testcase.yaml
index 43f7876fdb159..f5f69cdebfa4e 100644
--- a/tests/drivers/dma/scatter_gather/testcase.yaml
+++ b/tests/drivers/dma/scatter_gather/testcase.yaml
@@ -8,6 +8,7 @@ tests:
       - intel_adsp/cavs25
       - frdm_k64f
       - mimxrt1010_evk
+      - mimxrt685_evk/mimxrt685s/cm33
       - mimxrt1060_evk/mimxrt1062/qspi
       - lpcxpresso55s36
       - native_sim
diff --git a/tests/drivers/entropy/api/boards/neorv32.overlay b/tests/drivers/entropy/api/boards/neorv32.overlay
deleted file mode 100644
index 5c11a7671d84e..0000000000000
--- a/tests/drivers/entropy/api/boards/neorv32.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2021 Henrik Brix Andersen <henrik@brixandersen.dk>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&trng {
-	status = "okay";
-};
diff --git a/tests/drivers/flash/common/boards/mx25r64_non_quad.overlay b/tests/drivers/flash/common/boards/mx25r64_non_quad.overlay
new file mode 100644
index 0000000000000..5ddb41fb1d0fa
--- /dev/null
+++ b/tests/drivers/flash/common/boards/mx25r64_non_quad.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25r64 {
+	writeoc = "pp";
+	readoc = "fastread";
+};
diff --git a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..b8f138ad2b2e2
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf b/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
new file mode 100644
index 0000000000000..821a5e77e5b54
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
@@ -0,0 +1,4 @@
+CONFIG_FCB=y
+CONFIG_FLASH_MAP=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_FCB=y
diff --git a/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
new file mode 100644
index 0000000000000..821a5e77e5b54
--- /dev/null
+++ b/tests/drivers/flash/common/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
@@ -0,0 +1,4 @@
+CONFIG_FCB=y
+CONFIG_FLASH_MAP=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_FCB=y
diff --git a/tests/drivers/flash/common/boards/silabs_s2_lpwrite.overlay b/tests/drivers/flash/common/boards/silabs_s2_lpwrite.overlay
new file mode 100644
index 0000000000000..a28312e6e5053
--- /dev/null
+++ b/tests/drivers/flash/common/boards/silabs_s2_lpwrite.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&dma0 {
+	status = "okay";
+};
+
+&msc {
+	dmas = <&dma0 DMA_REQSEL_MSCWDATA>;
+	low-power-write;
+};
diff --git a/tests/drivers/flash/common/boards/xg24_rb4187c.overlay b/tests/drivers/flash/common/boards/xg24_rb4187c.overlay
new file mode 100644
index 0000000000000..659beb7dfb012
--- /dev/null
+++ b/tests/drivers/flash/common/boards/xg24_rb4187c.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&dma0 {
+	status = "okay";
+};
+
+&msc {
+	dmas = <&dma0 DMA_REQSEL_MSCWDATA>;
+};
diff --git a/tests/drivers/flash/common/boards/xg29_rb4412a.overlay b/tests/drivers/flash/common/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..c5d1c35f027a7
--- /dev/null
+++ b/tests/drivers/flash/common/boards/xg29_rb4412a.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&dma0 {
+	status = "okay";
+};
+
+&msc {
+	dmas = <&dma0 DMA_REQSEL_MSCWDATA>;
+};
+
+
+/* Disable jedec spi nor flash to test internal flash */
+
+/ {
+
+	aliases {
+		/delete-property/ spi-flash0;
+	};
+};
+
+/delete-node/ &mx25r80;
diff --git a/tests/drivers/flash/common/src/main.c b/tests/drivers/flash/common/src/main.c
index e7552aaf177b2..54b868a923413 100644
--- a/tests/drivers/flash/common/src/main.c
+++ b/tests/drivers/flash/common/src/main.c
@@ -14,6 +14,8 @@
 #define TEST_AREA_DEV_NODE	DT_INST(0, nordic_qspi_nor)
 #elif defined(CONFIG_SPI_NOR)
 #define TEST_AREA_DEV_NODE	DT_INST(0, jedec_spi_nor)
+#elif defined(CONFIG_FLASH_MSPI_NOR)
+#define TEST_AREA_DEV_NODE	DT_INST(0, jedec_mspi_nor)
 #else
 #define TEST_AREA	storage_partition
 #endif
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index 3eec21e19c885..4010b82b931fa 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -46,7 +46,9 @@ tests:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
   drivers.flash.common.tfm_ns:
     build_only: true
     filter: (CONFIG_FLASH_HAS_DRIVER_ENABLED and CONFIG_TRUSTED_EXECUTION_NONSECURE
@@ -94,3 +96,33 @@ tests:
       - gd32vf103v_eval
       - gd32a503v_eval
       - gd32f470i_eval
+  drivers.flash.common.silabs.dma:
+    platform_allow:
+      - xg24_rb4187c
+      - xg29_rb4412a
+    extra_configs:
+      - CONFIG_DMA=y
+  drivers.flash.common.silabs.dma.lpwrite:
+    platform_allow:
+      - xg24_rb4187c
+      - xg29_rb4412a
+    extra_configs:
+      - CONFIG_DMA=y
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE=boards/silabs_s2_lpwrite.overlay
+  drivers.flash.common.silabs.dma_read:
+    platform_allow:
+      - xg24_rb4187c
+      - xg29_rb4412a
+    extra_configs:
+      - CONFIG_DMA=y
+      - CONFIG_SOC_FLASH_SILABS_S2_DMA_READ=y
+  drivers.flash.common.non_quad_mode:
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE=boards/mx25r64_non_quad.overlay
+    integration_platforms:
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf5340dk/nrf5340/cpuapp
diff --git a/tests/drivers/flash/negative_tests/src/main.c b/tests/drivers/flash/negative_tests/src/main.c
index bd6a6557c26de..38f38f4ccf40d 100644
--- a/tests/drivers/flash/negative_tests/src/main.c
+++ b/tests/drivers/flash/negative_tests/src/main.c
@@ -26,10 +26,7 @@
 #define TEST_AREA_SIZE   FIXED_PARTITION_SIZE(TEST_AREA)
 #define TEST_AREA_DEVICE FIXED_PARTITION_DEVICE(TEST_AREA)
 
-#if defined(CONFIG_SOC_NRF54L05) || \
-	defined(CONFIG_SOC_NRF54L09) || \
-	defined(CONFIG_SOC_NRF54L10) || \
-	defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_SERIES_NRF54LX)
 #define TEST_FLASH_START (DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #define TEST_FLASH_SIZE  (DT_REG_SIZE(DT_MEM_FROM_FIXED_PARTITION(DT_NODELABEL(TEST_AREA))))
 #elif defined(CONFIG_SOC_NRF54H20)
diff --git a/tests/drivers/flash/negative_tests/testcase.yaml b/tests/drivers/flash/negative_tests/testcase.yaml
index 3a795e4a2da67..5d2441f002ee3 100644
--- a/tests/drivers/flash/negative_tests/testcase.yaml
+++ b/tests/drivers/flash/negative_tests/testcase.yaml
@@ -7,4 +7,6 @@ tests:
     platform_allow:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/tests/drivers/flash_simulator/flash_sim_impl/boards/native_posix.overlay b/tests/drivers/flash_simulator/flash_sim_impl/boards/native_posix.overlay
deleted file mode 100644
index 59b29bd85126d..0000000000000
--- a/tests/drivers/flash_simulator/flash_sim_impl/boards/native_posix.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "native_sim.overlay"
diff --git a/tests/drivers/flash_simulator/flash_sim_impl/boards/native_posix_native_64.overlay b/tests/drivers/flash_simulator/flash_sim_impl/boards/native_posix_native_64.overlay
deleted file mode 100644
index 9fe8b9c21604e..0000000000000
--- a/tests/drivers/flash_simulator/flash_sim_impl/boards/native_posix_native_64.overlay
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "native_posix.overlay"
diff --git a/tests/drivers/flash_simulator/flash_sim_impl/testcase.yaml b/tests/drivers/flash_simulator/flash_sim_impl/testcase.yaml
index 8acbd3373db20..c5794c735ba16 100644
--- a/tests/drivers/flash_simulator/flash_sim_impl/testcase.yaml
+++ b/tests/drivers/flash_simulator/flash_sim_impl/testcase.yaml
@@ -6,8 +6,6 @@ tests:
   drivers.flash.flash_simulator:
     platform_allow:
       - qemu_x86
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
       - nucleo_f411re
@@ -17,8 +15,6 @@ tests:
     extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
     platform_allow:
       - qemu_x86
-      - native_posix
-      - native_posix/native/64
       - native_sim
       - native_sim/native/64
       - nucleo_f411re
@@ -32,14 +28,12 @@ tests:
   drivers.flash.flash_simulator.native_erase_value_0x00:
     extra_args: DTC_OVERLAY_FILE=boards/native_ev_0x00.overlay
     platform_allow:
-      - native_posix
       - native_sim
     integration_platforms:
       - native_sim
   drivers.flash.flash_simulator.native_64_erase_value_0x00:
     extra_args: DTC_OVERLAY_FILE=boards/native_64_ev_0x00.overlay
     platform_allow:
-      - native_posix/native/64
       - native_sim/native/64
     integration_platforms:
       - native_sim/native/64
diff --git a/tests/drivers/flash_simulator/flash_sim_reboot/testcase.yaml b/tests/drivers/flash_simulator/flash_sim_reboot/testcase.yaml
index 069bbac09c936..804c26e14b6c7 100644
--- a/tests/drivers/flash_simulator/flash_sim_reboot/testcase.yaml
+++ b/tests/drivers/flash_simulator/flash_sim_reboot/testcase.yaml
@@ -5,6 +5,7 @@ common:
 tests:
   drivers.flash.flash_simulator.boot_no_erase:
     timeout: 5
+    expect_reboot: true
     platform_allow: mps2/an385
     integration_platforms:
       - mps2/an385
diff --git a/tests/drivers/gpio/gpio_api_1pin/boards/pico_plus2_rp2350b_m33.overlay b/tests/drivers/gpio/gpio_api_1pin/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..fa6f5cb4a441b
--- /dev/null
+++ b/tests/drivers/gpio/gpio_api_1pin/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2024 TOKITA Hiroshi
+ */
+
+/* Pico Plus2 is pin-compatible with the Raspberry Pi Pico 2, so reuse. */
+#include "rpi_pico2_rp2350a_m33.overlay"
diff --git a/tests/drivers/gpio/gpio_api_1pin/boards/rza3ul_smarc.overlay b/tests/drivers/gpio/gpio_api_1pin/boards/rza3ul_smarc.overlay
new file mode 100644
index 0000000000000..1d0abc94c6989
--- /dev/null
+++ b/tests/drivers/gpio/gpio_api_1pin/boards/rza3ul_smarc.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		led0 = &led_0;
+	};
+
+	gpio-led {
+		compatible = "gpio-leds";
+		led_0: led_0 {
+			gpios = <&gpio1 3 0>;
+		};
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio1 {
+	irqs = <3 15>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_api_1pin/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.overlay b/tests/drivers/gpio/gpio_api_1pin/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.overlay
new file mode 100644
index 0000000000000..f5aae70d3889a
--- /dev/null
+++ b/tests/drivers/gpio/gpio_api_1pin/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		led0 = &led_0;
+	};
+
+	gpio-led {
+		compatible = "gpio-leds";
+
+		led_0: led_0 {
+			gpios = <&gpio43 1 0>;
+		};
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio43 {
+	irqs = <1 1>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_api_1pin/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.overlay b/tests/drivers/gpio/gpio_api_1pin/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.overlay
new file mode 100644
index 0000000000000..f5aae70d3889a
--- /dev/null
+++ b/tests/drivers/gpio/gpio_api_1pin/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		led0 = &led_0;
+	};
+
+	gpio-led {
+		compatible = "gpio-leds";
+
+		led_0: led_0 {
+			gpios = <&gpio43 1 0>;
+		};
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio43 {
+	irqs = <1 1>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_api_1pin/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.overlay b/tests/drivers/gpio/gpio_api_1pin/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.overlay
new file mode 100644
index 0000000000000..48f0d452d098f
--- /dev/null
+++ b/tests/drivers/gpio/gpio_api_1pin/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		led0 = &led_0;
+	};
+
+	gpio-led {
+		compatible = "gpio-leds";
+		led_0: led_0 {
+			gpios = <&gpio43 1 0>;
+		};
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio43 {
+	irqs = <1 1>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_api_1pin/testcase.yaml b/tests/drivers/gpio/gpio_api_1pin/testcase.yaml
index 5449002219869..95cbb8645616f 100644
--- a/tests/drivers/gpio/gpio_api_1pin/testcase.yaml
+++ b/tests/drivers/gpio/gpio_api_1pin/testcase.yaml
@@ -16,7 +16,8 @@ tests:
       - mps2/an383
       - mps2/an386
       - mps2/an500
-      - neorv32
+      - neorv32/neorv32/minimalboot
+      - neorv32/neorv32/up5kdemo
   drivers.gpio.1pin.aw9523b:
     tags:
       - drivers
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/it515xx_evb.overlay b/tests/drivers/gpio/gpio_basic_api/boards/it515xx_evb.overlay
new file mode 100644
index 0000000000000..002e52a8d3e4c
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/it515xx_evb.overlay
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 ITE Corporation. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpioa 3 0>; /* GPIOA.3 */
+		in-gpios = <&gpioe 4 0>;  /* GPIOE.4 */
+	};
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/kv260_r5.overlay b/tests/drivers/gpio/gpio_basic_api/boards/kv260_r5.overlay
new file mode 100644
index 0000000000000..02ec261b51295
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/kv260_r5.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025 Advanced Micro Devices, Inc. (AMD)
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	loop {
+		compatible = "test-gpio-basic-api";
+
+		out-gpios = <&psgpio_bank3 0 0>; /* GPIOPS BANK 3 PIN 0 */
+		in-gpios = <&psgpio_bank3 1 0>; /* GPIOPS BANK 3 PIN 1 */
+	};
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/neorv32.overlay b/tests/drivers/gpio/gpio_basic_api/boards/neorv32_neorv32_up5kdemo.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_basic_api/boards/neorv32.overlay
rename to tests/drivers/gpio/gpio_basic_api/boards/neorv32_neorv32_up5kdemo.overlay
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_common.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_common.overlay
new file mode 100644
index 0000000000000..8eb1b3c9f9ff7
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_common.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
index 8eb1b3c9f9ff7..7eee797278b63 100644
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -4,18 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
-	resources {
-		compatible = "test-gpio-basic-api";
-		out-gpios = <&gpio1 10 0>;
-		in-gpios = <&gpio1 11 0>;
-	};
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
+#include "nrf54l09pdk_nrf54l09_common.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
new file mode 100644
index 0000000000000..b0c42fd3d2ac2
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l09pdk_nrf54l09_common.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_common.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_common.overlay
new file mode 100644
index 0000000000000..8eb1b3c9f9ff7
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_common.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index 8eb1b3c9f9ff7..3ed56c4a6c817 100644
--- a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -4,18 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
-	resources {
-		compatible = "test-gpio-basic-api";
-		out-gpios = <&gpio1 10 0>;
-		in-gpios = <&gpio1 11 0>;
-	};
-};
-
-&gpiote20 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
+#include "nrf54l20pdk_nrf54l20_common.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 0000000000000..91c033f0f9411
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54l20pdk_nrf54l20_common.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..db939435dd1d8
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 10 0>;
+		in-gpios = <&gpio1 11 0>;
+	};
+};
+
+&gpiote20 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay b/tests/drivers/gpio/gpio_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
new file mode 100644
index 0000000000000..945d543e753f4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
@@ -0,0 +1 @@
+#include "ophelia4ev_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/pico_plus2_rp2350b_m33.conf b/tests/drivers/gpio/gpio_basic_api/boards/pico_plus2_rp2350b_m33.conf
new file mode 100644
index 0000000000000..b9d02cf11d5d4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/pico_plus2_rp2350b_m33.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/pico_plus2_rp2350b_m33.overlay b/tests/drivers/gpio/gpio_basic_api/boards/pico_plus2_rp2350b_m33.overlay
new file mode 100644
index 0000000000000..3566e32fc34b6
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/pico_plus2_rp2350b_m33.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2024 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Pico Plus2 is pin-compatible with the Raspberry Pi Pico, so reuse. */
+#include "rpi_pico.overlay"
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rza3ul_smarc.conf b/tests/drivers/gpio/gpio_basic_api/boards/rza3ul_smarc.conf
new file mode 100644
index 0000000000000..b9d02cf11d5d4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rza3ul_smarc.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rza3ul_smarc.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rza3ul_smarc.overlay
new file mode 100644
index 0000000000000..d0821d8c8421e
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rza3ul_smarc.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+		in-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio1 {
+	irqs = <4 20>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.conf b/tests/drivers/gpio/gpio_basic_api/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.conf
new file mode 100644
index 0000000000000..b9d02cf11d5d4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.overlay
new file mode 100644
index 0000000000000..fba1f4baee3a7
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzg2l_smarc_r9a07g044l23gbg_cm33.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio43 1 GPIO_ACTIVE_HIGH>;
+		in-gpios = <&gpio43 2 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio43 {
+	irqs = <2 20>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.conf b/tests/drivers/gpio/gpio_basic_api/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.conf
new file mode 100644
index 0000000000000..b9d02cf11d5d4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.overlay
new file mode 100644
index 0000000000000..3b2766f7b33f9
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzg2lc_smarc_r9a07g044c22gbg_cm33.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;
+		in-gpios = <&gpio43 0 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio4 {
+	irqs = <2 20>;
+	status = "okay";
+};
+
+&gpio43 {
+	irqs = <2 20>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzn2l_rsk.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rzn2l_rsk.overlay
new file mode 100644
index 0000000000000..85624d2667de7
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzn2l_rsk.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+		in-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&pinctrl {
+	input_test: input_test {
+		group1 {
+			pinmux = <RZN_PINMUX(PORT_02, 0, 0)>;
+			input-enable;
+		};
+	};
+};
+
+&irq4 {
+	trigger-type = "falling";
+	pinctrl-0 = <&input_test>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&gpio2 {
+	irqs = <0 4>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzt2l_rsk.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rzt2l_rsk.overlay
new file mode 100644
index 0000000000000..baf12cf326390
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzt2l_rsk.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio15 5 GPIO_ACTIVE_HIGH>;
+		in-gpios = <&gpio15 4 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&pinctrl {
+	input_test: input_test{
+		group1 {
+			pinmux = <RZT_PINMUX(PORT_15, 4, 4)>;
+			input-enable;
+		};
+	};
+};
+
+&irq3 {
+	trigger-type = "falling";
+	pinctrl-0 = <&input_test>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&gpio15 {
+	irqs = <4 3>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzt2m_rsk_r9a07g075m24gbg_cr520.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rzt2m_rsk_r9a07g075m24gbg_cr520.overlay
new file mode 100644
index 0000000000000..106f582dd8da2
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzt2m_rsk_r9a07g075m24gbg_cr520.overlay
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+		in-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&pinctrl {
+	input_test: input_test {
+		group1 {
+			pinmux = <RZT_PINMUX(PORT_02, 0, 0)>;
+			input-enable;
+		};
+	};
+};
+
+&irq4 {
+	trigger-type = "falling";
+	pinctrl-0 = <&input_test>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&gpio2 {
+	irqs = <0 4>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.conf b/tests/drivers/gpio/gpio_basic_api/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.conf
new file mode 100644
index 0000000000000..b9d02cf11d5d4
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_PULL_TEST=y
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.overlay
new file mode 100644
index 0000000000000..fba1f4baee3a7
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/rzv2l_smarc_r9a07g054l23gbg_cm33.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpio43 1 GPIO_ACTIVE_HIGH>;
+		in-gpios = <&gpio43 2 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&gpio43 {
+	irqs = <2 20>;
+	status = "okay";
+};
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/xg29_rb4412a.overlay b/tests/drivers/gpio/gpio_basic_api/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..8ea9208203ad2
--- /dev/null
+++ b/tests/drivers/gpio/gpio_basic_api/boards/xg29_rb4412a.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Connect EXP4 (PC0) and EXP6 (PC1) of the Expansion Pin header
+ */
+
+/ {
+	resources {
+		compatible = "test-gpio-basic-api";
+		out-gpios = <&gpioc 0 0>; /* WPK EXP4 (PC0) */
+		in-gpios = <&gpioc 1 0>; /* WPK EXP6 (PC1) */
+	};
+};
diff --git a/tests/drivers/gpio/gpio_get_direction/testcase.yaml b/tests/drivers/gpio/gpio_get_direction/testcase.yaml
index b66145fc9af4a..e25f75edffa93 100644
--- a/tests/drivers/gpio/gpio_get_direction/testcase.yaml
+++ b/tests/drivers/gpio/gpio_get_direction/testcase.yaml
@@ -8,6 +8,6 @@ tests:
     # Fix exclude when we can exclude just sim run
     platform_exclude:
       - mps2/an385
-      - mps2/an521/cpu0
-      - neorv32
+      - neorv32/neorv32/minimalboot
+      - neorv32/neorv32/up5kdemo
     filter: dt_enabled_alias_with_parent_compat("led0", "gpio-leds")
diff --git a/tests/drivers/gpio/gpio_hogs/boards/xg29_rb4412a.overlay b/tests/drivers/gpio/gpio_hogs/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..48f0c5771dabc
--- /dev/null
+++ b/tests/drivers/gpio/gpio_hogs/boards/xg29_rb4412a.overlay
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		output-high-gpios = <&gpioc 1 GPIO_ACTIVE_LOW>;
+		output-low-gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>;
+		input-gpios = <&gpioc 2 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpioc {
+	hog1 {
+		gpio-hog;
+		gpios = <1 GPIO_ACTIVE_LOW>;
+		output-high;
+	};
+
+	hog2 {
+		gpio-hog;
+		gpios = <2 GPIO_ACTIVE_HIGH>;
+		input;
+	};
+	hog3 {
+		gpio-hog;
+		gpios = <3 GPIO_ACTIVE_HIGH>;
+		output-low;
+	};
+};
diff --git a/tests/drivers/gpio/gpio_hogs/testcase.yaml b/tests/drivers/gpio/gpio_hogs/testcase.yaml
index fa3108e21e622..5c4878f565614 100644
--- a/tests/drivers/gpio/gpio_hogs/testcase.yaml
+++ b/tests/drivers/gpio/gpio_hogs/testcase.yaml
@@ -19,6 +19,7 @@ tests:
       - s32z2xxdc2/s32z270/rtu1
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
+      - xg29_rb4412a
     integration_platforms:
       - native_sim
       - native_sim/native/64
diff --git a/tests/drivers/gpio/gpio_ite_it8xxx2_v2/include/chip_chipregs.h b/tests/drivers/gpio/gpio_ite_it8xxx2_v2/include/chip_chipregs.h
index 67c86ccdc4052..f7c3b91f0345a 100644
--- a/tests/drivers/gpio/gpio_ite_it8xxx2_v2/include/chip_chipregs.h
+++ b/tests/drivers/gpio/gpio_ite_it8xxx2_v2/include/chip_chipregs.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <../soc/ite/ec/common/chip_chipregs.h>
+#include <../soc/ite/ec/it8xxx2/chip_chipregs.h>
 
 /*
  * Macros for emulated hardware registers access.
diff --git a/tests/drivers/gpio/gpio_reserved_ranges/boards/native_posix.overlay b/tests/drivers/gpio/gpio_reserved_ranges/boards/native_sim.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_reserved_ranges/boards/native_posix.overlay
rename to tests/drivers/gpio/gpio_reserved_ranges/boards/native_sim.overlay
diff --git a/tests/drivers/gpio/gpio_reserved_ranges/boards/native_posix_native_64.overlay b/tests/drivers/gpio/gpio_reserved_ranges/boards/native_sim_native_64.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_reserved_ranges/boards/native_posix_native_64.overlay
rename to tests/drivers/gpio/gpio_reserved_ranges/boards/native_sim_native_64.overlay
diff --git a/tests/drivers/gpio/gpio_reserved_ranges/src/main.c b/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
index ec2e795f0febd..351a525d2eab1 100644
--- a/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
+++ b/tests/drivers/gpio/gpio_reserved_ranges/src/main.c
@@ -9,6 +9,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_utils.h>
 
 #define TEST_GPIO_1 DT_NODELABEL(test_gpio_1)
 #define TEST_GPIO_2 DT_NODELABEL(test_gpio_2)
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra4l1.conf b/tests/drivers/i2c/i2c_api/boards/ek_ra4l1.conf
new file mode 100644
index 0000000000000..3b626dd7fad28
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra4l1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SENSOR_GY271_QMC=y
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra4l1.overlay b/tests/drivers/i2c/i2c_api/boards/ek_ra4l1.overlay
new file mode 100644
index 0000000000000..c629e87a6e272
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra4l1.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		i2c-0 = &iic0;
+		gy271 = &iic0;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra4m1.conf b/tests/drivers/i2c/i2c_api/boards/ek_ra4m1.conf
new file mode 100644
index 0000000000000..3b626dd7fad28
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra4m1.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SENSOR_GY271_QMC=y
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra4m1.overlay b/tests/drivers/i2c/i2c_api/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..0dfb29aaae618
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra4m1.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		i2c-0 = &iic1;
+		gy271 = &iic1;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra8d1_sci_b_i2c.conf b/tests/drivers/i2c/i2c_api/boards/ek_ra8d1_sci_b_i2c.conf
new file mode 100644
index 0000000000000..fc3333d47c76e
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra8d1_sci_b_i2c.conf
@@ -0,0 +1,3 @@
+CONFIG_I2C=y
+CONFIG_ZTEST=y
+CONFIG_SENSOR_GY271_QMC=y
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra8d1_sci_b_i2c.overlay b/tests/drivers/i2c/i2c_api/boards/ek_ra8d1_sci_b_i2c.overlay
new file mode 100644
index 0000000000000..90f34e554402f
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra8d1_sci_b_i2c.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		i2c-0 = &i2c4;
+		gy271 = &i2c4;
+	};
+};
+
+&sci4 {
+	status = "okay";
+
+	i2c4: i2c {
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra8m1_sci_b_i2c.conf b/tests/drivers/i2c/i2c_api/boards/ek_ra8m1_sci_b_i2c.conf
new file mode 100644
index 0000000000000..fc3333d47c76e
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra8m1_sci_b_i2c.conf
@@ -0,0 +1,3 @@
+CONFIG_I2C=y
+CONFIG_ZTEST=y
+CONFIG_SENSOR_GY271_QMC=y
diff --git a/tests/drivers/i2c/i2c_api/boards/ek_ra8m1_sci_b_i2c.overlay b/tests/drivers/i2c/i2c_api/boards/ek_ra8m1_sci_b_i2c.overlay
new file mode 100644
index 0000000000000..7aa8d7f0b0abd
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/ek_ra8m1_sci_b_i2c.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		i2c-0 = &i2c1;
+		gy271 = &i2c1;
+	};
+};
+
+&sci1 {
+	status = "okay";
+
+	i2c1: i2c {
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/i2c/i2c_api/boards/mck_ra8t1_sci_b_i2c.conf b/tests/drivers/i2c/i2c_api/boards/mck_ra8t1_sci_b_i2c.conf
new file mode 100644
index 0000000000000..fc3333d47c76e
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/mck_ra8t1_sci_b_i2c.conf
@@ -0,0 +1,3 @@
+CONFIG_I2C=y
+CONFIG_ZTEST=y
+CONFIG_SENSOR_GY271_QMC=y
diff --git a/tests/drivers/i2c/i2c_api/boards/mck_ra8t1_sci_b_i2c.overlay b/tests/drivers/i2c/i2c_api/boards/mck_ra8t1_sci_b_i2c.overlay
new file mode 100644
index 0000000000000..2ce8ae69e5e86
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/mck_ra8t1_sci_b_i2c.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		i2c-0 = &i2c9;
+		gy271 = &i2c9;
+
+	};
+};
+
+&sci9 {
+	status = "okay";
+
+	i2c9: i2c {
+		status = "okay";
+		sda-output-delay = <250>;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.conf b/tests/drivers/i2c/i2c_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.conf
new file mode 100644
index 0000000000000..83547b4fe7250
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.conf
@@ -0,0 +1 @@
+CONFIG_SENSOR_GY271_QMC=y
diff --git a/tests/drivers/i2c/i2c_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/tests/drivers/i2c/i2c_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..65163d4b5283c
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,9 @@
+/ {
+	aliases {
+		i2c-0 = &i2c0;
+	};
+};
+
+&i2c0 {
+	status = "okay";
+};
diff --git a/tests/drivers/i2c/i2c_api/testcase.yaml b/tests/drivers/i2c/i2c_api/testcase.yaml
index 039e77ad77e09..c4aa0dbee754a 100644
--- a/tests/drivers/i2c/i2c_api/testcase.yaml
+++ b/tests/drivers/i2c/i2c_api/testcase.yaml
@@ -5,3 +5,16 @@ tests:
       - drivers
       - i2c
     filter: dt_alias_exists("gy271")
+  drivers.i2c.renesas_sci_b_i2c.api:
+    depends_on: i2c
+    tags:
+      - drivers
+      - i2c
+    filter: dt_alias_exists("gy271") and CONFIG_I2C_RENESAS_RA_SCI_B
+    platform_allow:
+      - ek_ra8m1
+      - ek_ra8d1
+      - mck_ra8t1
+    extra_args:
+      - DTC_OVERLAY_FILE="./boards/${BOARD}_sci_b_i2c.overlay"
+      - CONF_FILE="./prj.conf ./boards/${BOARD}_sci_b_i2c.conf"
diff --git a/tests/drivers/i2c/i2c_emul/src/test_forwarding_buf.cpp b/tests/drivers/i2c/i2c_emul/src/test_forwarding_buf.cpp
index 1bcf7942d4502..7bf687a3a479e 100644
--- a/tests/drivers/i2c/i2c_emul/src/test_forwarding_buf.cpp
+++ b/tests/drivers/i2c/i2c_emul/src/test_forwarding_buf.cpp
@@ -15,8 +15,6 @@ namespace
 
 /* Get the devicetree constants */
 constexpr const struct device *controller = DEVICE_DT_GET(CONTROLLER_LABEL);
-constexpr const struct device *targets[FORWARD_COUNT] = {
-	DT_FOREACH_PROP_ELEM_SEP(CONTROLLER_LABEL, forwards, DEVICE_DT_GET_BY_IDX, (,))};
 
 ZTEST(i2c_emul_forwarding, test_write_is_forwarded)
 {
diff --git a/tests/drivers/i2c/i2c_emul/src/test_forwarding_pio.cpp b/tests/drivers/i2c/i2c_emul/src/test_forwarding_pio.cpp
index 1d570af0a7b5d..9c3039efee1ec 100644
--- a/tests/drivers/i2c/i2c_emul/src/test_forwarding_pio.cpp
+++ b/tests/drivers/i2c/i2c_emul/src/test_forwarding_pio.cpp
@@ -14,8 +14,6 @@ namespace
 
 /* Get the devicetree constants */
 constexpr const struct device *controller = DEVICE_DT_GET(CONTROLLER_LABEL);
-constexpr const struct device *targets[FORWARD_COUNT] = {
-	DT_FOREACH_PROP_ELEM_SEP(CONTROLLER_LABEL, forwards, DEVICE_DT_GET_BY_IDX, (,))};
 
 ZTEST(i2c_emul_forwarding, test_write_is_forwarded)
 {
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/CMakeLists.txt b/tests/drivers/i2c/i2c_nrfx_twim/CMakeLists.txt
new file mode 100644
index 0000000000000..65eaa7adcb1fa
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(i2c_api)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 0000000000000..99a22ba075f3f
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P0.26 and P1.2
+ * SCL = P0.25 and P1.3
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c1;
+		i2c-controller-target = &i2c2;
+	};
+};
+
+&pinctrl {
+	i2c2_default: i2c2_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 0, 26)>,
+				<NRF_PSEL(TWIS_SCL, 0, 25)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c2_sleep: i2c2_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 0, 26)>,
+				<NRF_PSEL(TWIS_SCL, 0, 25)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c2 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c2_default>;
+	pinctrl-1 = <&i2c2_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+};
+
+&i2c1 {
+	compatible = "nordic,nrf-twim";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+};
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..cbe5db6298315
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P2.8 and P2.9
+ * SCL = P1.2 and P1.3
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c130;
+		i2c-controller-target = &i2c131;
+	};
+};
+
+&pinctrl {
+	i2c130_default: i2c130_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c130_sleep: i2c130_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 8)>,
+				<NRF_PSEL(TWIM_SCL, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	i2c131_default: i2c131_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c131_sleep: i2c131_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 9)>,
+				<NRF_PSEL(TWIM_SCL, 1, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	compatible = "nordic,nrf-twim";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c130_default>;
+	pinctrl-1 = <&i2c130_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
+
+&i2c131 {
+	compatible = "nordic,nrf-twis";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c131_default>;
+	pinctrl-1 = <&i2c131_sleep>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..f24477f410257
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.10 and P1.11
+ */
+
+/ {
+	aliases {
+		i2c-controller = &i2c21;
+		i2c-controller-target = &i2c22;
+	};
+};
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	compatible = "nordic,nrf-twim";
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+};
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/prj.conf b/tests/drivers/i2c/i2c_nrfx_twim/prj.conf
new file mode 100644
index 0000000000000..f14696bf38b7b
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/prj.conf
@@ -0,0 +1,11 @@
+CONFIG_ZTEST=y
+CONFIG_BOOT_BANNER=n
+
+CONFIG_LOG=y
+CONFIG_I2C_LOG_LEVEL_INF=y
+CONFIG_I2C=y
+CONFIG_I2C_TARGET=y
+CONFIG_I2C_TARGET_BUFFER_MODE=y
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
+
+CONFIG_ZERO_LATENCY_IRQS=y
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/src/test_i2c_nrfx_twim.c b/tests/drivers/i2c/i2c_nrfx_twim/src/test_i2c_nrfx_twim.c
new file mode 100644
index 0000000000000..f6256609fc0b7
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/src/test_i2c_nrfx_twim.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c/i2c_nrfx_twim.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+#define I2C_CONTROLLER_NODE              DT_ALIAS(i2c_controller)
+#define I2C_CONTROLLER_TARGET_NODE       DT_ALIAS(i2c_controller_target)
+#define I2C_CONTROLLER_DEVICE_GET        DEVICE_DT_GET(I2C_CONTROLLER_NODE)
+#define I2C_CONTROLLER_TARGET_DEVICE_GET DEVICE_DT_GET(I2C_CONTROLLER_TARGET_NODE)
+#define I2C_TARGET_ADDR                  0x0A
+
+static const struct device *sample_i2c_controller = I2C_CONTROLLER_DEVICE_GET;
+static const struct device *sample_i2c_controller_target = I2C_CONTROLLER_TARGET_DEVICE_GET;
+
+#define TEST_TRANSFER_BUF_SIZE           16
+#define TARGET_RECEIVED_BUFFERS_CAPACITY 4
+
+typedef struct {
+	uint32_t len;
+	uint8_t buf[TEST_TRANSFER_BUF_SIZE];
+} test_transfer_buf_t;
+
+static uint32_t target_received_buffers_count;
+static test_transfer_buf_t target_received_buffers[TARGET_RECEIVED_BUFFERS_CAPACITY];
+
+static void test_target_received_buffers_reset(void)
+{
+	target_received_buffers_count = 0;
+	memset(target_received_buffers, 0, sizeof(target_received_buffers));
+}
+
+BUILD_ASSERT(IS_ENABLED(CONFIG_I2C_TARGET_BUFFER_MODE),
+	     "CONFIG_I2C_TARGET_BUFFER_MODE must be enabled");
+
+#ifdef CONFIG_I2C_TARGET_BUFFER_MODE
+static void sample_i2c_controller_target_buf_write_received_cb(struct i2c_target_config *config,
+							       uint8_t *ptr, uint32_t len)
+{
+	if (target_received_buffers_count >= TARGET_RECEIVED_BUFFERS_CAPACITY) {
+		return;
+	}
+
+	test_transfer_buf_t *transfer_buf = &target_received_buffers[target_received_buffers_count];
+
+	transfer_buf->len = len;
+	memcpy(transfer_buf->buf, ptr, MIN(len, TEST_TRANSFER_BUF_SIZE));
+	target_received_buffers_count++;
+}
+
+static int sample_i2c_controller_target_buf_read_requested_cb(struct i2c_target_config *config,
+							      uint8_t **ptr, uint32_t *len)
+{
+	zassert_true(false, "Call to target_buf_read_requested_cb was unexpected");
+	return -EIO;
+}
+#endif /* CONFIG_I2C_TARGET_BUFFER_MODE */
+
+static const struct i2c_target_callbacks sample_i2c_controller_target_callbacks = {
+#ifdef CONFIG_I2C_TARGET_BUFFER_MODE
+	.buf_write_received = sample_i2c_controller_target_buf_write_received_cb,
+	.buf_read_requested = sample_i2c_controller_target_buf_read_requested_cb,
+#endif
+};
+
+static struct i2c_target_config sample_i2c_controller_target_config = {
+	.address = I2C_TARGET_ADDR, .callbacks = &sample_i2c_controller_target_callbacks};
+
+static void test_prepare(void)
+{
+	int ret;
+	bool ret_bool;
+
+	ret_bool = device_is_ready(sample_i2c_controller_target);
+	zassert_true(ret_bool, "sample_i2c_controller_target device is not ready");
+
+	ret = i2c_target_register(sample_i2c_controller_target,
+				  &sample_i2c_controller_target_config);
+	zassert_equal(ret, 0, "sample_i2c_controller_target can't register target");
+
+	ret_bool = device_is_ready(sample_i2c_controller);
+	zassert_true(ret_bool, "sample_i2c_controller device is not ready");
+
+	test_target_received_buffers_reset();
+}
+
+#define SOME_OTHER_I2C_ACCESSING_THREAD_STACK_SIZE 1024
+static K_THREAD_STACK_DEFINE(some_other_i2c_accessing_thread_stack,
+			     SOME_OTHER_I2C_ACCESSING_THREAD_STACK_SIZE);
+static struct k_thread some_other_i2c_accessing_thread_data;
+static K_SEM_DEFINE(some_other_i2c_accessing_thread_execute_sem, 0, 1);
+
+static void some_other_i2c_accessing_thread(void *param1, void *dummy2, void *dummy3)
+{
+	ARG_UNUSED(dummy2);
+	ARG_UNUSED(dummy3);
+
+	while (true) {
+		if (k_sem_take(&some_other_i2c_accessing_thread_execute_sem, K_FOREVER) == 0) {
+			int ret;
+			test_transfer_buf_t *tx_buf = (test_transfer_buf_t *)param1;
+
+			ret = i2c_write(sample_i2c_controller, tx_buf->buf, tx_buf->len,
+					I2C_TARGET_ADDR);
+			zassert_equal(ret, 0, "i2c_write failed");
+		}
+	}
+}
+
+static void some_other_i2c_accessing_thread_start(test_transfer_buf_t *tx_buf)
+{
+	(void)k_thread_create(&some_other_i2c_accessing_thread_data,
+			      some_other_i2c_accessing_thread_stack,
+			      K_THREAD_STACK_SIZEOF(some_other_i2c_accessing_thread_stack),
+			      some_other_i2c_accessing_thread, tx_buf, NULL, NULL,
+			      CONFIG_ZTEST_THREAD_PRIORITY, 0, K_NO_WAIT);
+}
+
+ZTEST(i2c_nrfx_twim_async, test_01_i2c_nrfx_twim_exclusive_access)
+{
+	int ret;
+
+	test_prepare();
+
+	static test_transfer_buf_t some_other_thread_tx_buf = {
+		.len = 3,
+		.buf = {0xE1, 0xE2, 0xE3},
+	};
+
+	some_other_i2c_accessing_thread_start(&some_other_thread_tx_buf);
+
+	ret = i2c_nrfx_twim_exclusive_access_acquire(sample_i2c_controller, K_FOREVER);
+	zassert_equal(ret, 0, "i2c_nrfx_twim_exclusive_access_acquire failed");
+
+	/* While we are holding exclusive access to the sample_i2c_controller,
+	 * let the some_other_i2c_accessing_thread attempt to perform an i2c_write.
+	 */
+
+	k_sem_give(&some_other_i2c_accessing_thread_execute_sem);
+
+	/* Let the some_other_i2c_accessing_thread run for a while. */
+	k_sleep(K_MSEC(100));
+
+	/* We are still holding the exclusive access so the some_other_i2c_accessing_thread
+	 * waits on semaphore. No i2c transfer should occur.
+	 */
+	zassert_equal(target_received_buffers_count, 0);
+
+	i2c_nrfx_twim_exclusive_access_release(sample_i2c_controller);
+
+	/* Let the some_other_i2c_accessing_thread finally perform the i2c_write. */
+	k_sleep(K_MSEC(100));
+
+	zassert_equal(target_received_buffers_count, 1);
+	zassert_equal(target_received_buffers[0].len, some_other_thread_tx_buf.len);
+	zassert_mem_equal(some_other_thread_tx_buf.buf, target_received_buffers[0].buf,
+			  some_other_thread_tx_buf.len);
+}
+
+ZTEST_SUITE(i2c_nrfx_twim_async, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml b/tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml
new file mode 100644
index 0000000000000..e35dd49dbb768
--- /dev/null
+++ b/tests/drivers/i2c/i2c_nrfx_twim/testcase.yaml
@@ -0,0 +1,18 @@
+common:
+  depends_on: i2c
+  tags:
+    - drivers
+    - i2c
+  harness: ztest
+  harness_config:
+    fixture: i2c_bus_short
+
+tests:
+  drivers.i2c.nrfx_twim_async_api:
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
diff --git a/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c b/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
index 8fb39de25173c..415a9dd675352 100644
--- a/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
+++ b/tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c
@@ -219,6 +219,55 @@ ZTEST(i2c_ram, test_ram_rtio)
 		      "Written and Read data should match");
 }
 
+ZTEST(i2c_ram, test_ram_rtio_write_with_transaction)
+{
+	/** Many drivers and API rely on two write OPs in a single transaction
+	 * to write register addr + register data in a single go.
+	 * Hence why is validated in a separate test-case.
+	 */
+	struct rtio_sqe *wraddr_sqe, *wrdata_sqe, *wr_sqe, *rd_sqe;
+	struct rtio_cqe *wr_cqe, *rd_cqe;
+
+	uint8_t reg_data[] = {'h', 'e', 'l', 'l', 'o'};
+
+	TC_PRINT("submitting write from thread %p addr %x\n", k_current_get(), addr);
+	wraddr_sqe = rtio_sqe_acquire(&i2c_rtio);
+	rtio_sqe_prep_write(wraddr_sqe, &i2c_iodev, 0, (uint8_t *)&addr, sizeof(addr), NULL);
+	wraddr_sqe->flags |= RTIO_SQE_TRANSACTION;
+
+	wrdata_sqe = rtio_sqe_acquire(&i2c_rtio);
+	rtio_sqe_prep_write(wrdata_sqe, &i2c_iodev, 0, reg_data, ARRAY_SIZE(reg_data), NULL);
+	wrdata_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP;
+
+	zassert_ok(rtio_submit(&i2c_rtio, 2), "submit should succeed");
+
+	wr_cqe = rtio_cqe_consume(&i2c_rtio);
+	zassert_ok(wr_cqe->result, "i2c write should succeed");
+	rtio_cqe_release(&i2c_rtio, wr_cqe);
+	wr_cqe = rtio_cqe_consume(&i2c_rtio);
+	zassert_ok(wr_cqe->result, "i2c write should succeed");
+	rtio_cqe_release(&i2c_rtio, wr_cqe);
+
+	/** Now read the register address to confirm the write was performed */
+	wr_sqe = rtio_sqe_acquire(&i2c_rtio);
+	rd_sqe = rtio_sqe_acquire(&i2c_rtio);
+	rtio_sqe_prep_write(wr_sqe, &i2c_iodev, 0, (uint8_t *)&addr, sizeof(addr), NULL);
+	rtio_sqe_prep_read(rd_sqe, &i2c_iodev, 0, rx_data, ARRAY_SIZE(reg_data), NULL);
+	wr_sqe->flags |= RTIO_SQE_TRANSACTION;
+	rd_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
+	zassert_ok(rtio_submit(&i2c_rtio, 2), "submit should succeed");
+
+	wr_cqe = rtio_cqe_consume(&i2c_rtio);
+	rd_cqe = rtio_cqe_consume(&i2c_rtio);
+	zassert_ok(wr_cqe->result, "i2c write should succeed");
+	zassert_ok(rd_cqe->result, "i2c read should succeed");
+	rtio_cqe_release(&i2c_rtio, wr_cqe);
+	rtio_cqe_release(&i2c_rtio, rd_cqe);
+
+	zassert_equal(memcmp(&reg_data[0], &rx_data[0], ARRAY_SIZE(reg_data)), 0,
+		      "Written and Read data should match");
+}
+
 static enum isr_rtio_state {
 	INIT,
 	WRITE_WAIT,
diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
new file mode 100644
index 0000000000000..2510d6673c1bd
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..f04022cf8f354
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,68 @@
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.14 and P1.15
+ */
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 14)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 14)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 15)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 15)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+
+	eeprom1: eeprom@56 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x56>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+
+	eeprom0: eeprom@54 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x54>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_target_api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf b/tests/drivers/i2c/i2c_target_api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..34b2571d12516
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
@@ -0,0 +1,2 @@
+CONFIG_I2C_STM32_INTERRUPT=y
+CONFIG_I2C_VIRTUAL=n
diff --git a/tests/drivers/i2c/i2c_target_api/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay b/tests/drivers/i2c/i2c_target_api/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay
new file mode 100644
index 0000000000000..cbf9f516799e0
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* I2C bus pins are exposed on the ST Arduino header.
+ *
+ *  Bus        SDA                    SCL
+ *          Pin   Hdr              Pin   Hdr
+ *  i2c1    PC1   CN15:5           PH9   CN15:3
+ *  i2c4    PE14  CN15:26          PE13  CN15:28
+ *
+ * Short Pin PC1 to PE14, and PH9 to PE13, for the test to pass.
+ */
+
+&i2c1 {
+	eeprom0: eeprom@54 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x54>;
+		size = <256>;
+	};
+};
+
+&i2c4 {
+	eeprom1: eeprom@56 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x56>;
+		size = <256>;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_target_api/boards/ophelia4ev_nrf54l15_cpuapp.conf b/tests/drivers/i2c/i2c_target_api/boards/ophelia4ev_nrf54l15_cpuapp.conf
new file mode 100644
index 0000000000000..c8ffd42673e4b
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/ophelia4ev_nrf54l15_cpuapp.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_I2C_NRFX_TWIS_BUF_SIZE=256
diff --git a/tests/drivers/i2c/i2c_target_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/i2c/i2c_target_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..8e70cb694e449
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * SDA = P1.8 and P1.9
+ * SCL = P1.10 and P1.11
+ */
+
+&pinctrl {
+	i2c21_default: i2c21_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c21_sleep: i2c21_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 8)>,
+				<NRF_PSEL(TWIS_SCL, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	i2c22_default: i2c22_default {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			bias-pull-up;
+		};
+	};
+
+	i2c22_sleep: i2c22_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIS_SDA, 1, 9)>,
+				<NRF_PSEL(TWIS_SCL, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c21 {
+	pinctrl-0 = <&i2c21_default>;
+	pinctrl-1 = <&i2c21_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	status = "okay";
+
+	eeprom1: eeprom@56 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x56>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
+
+&i2c22 {
+	compatible = "nordic,nrf-twis";
+	pinctrl-0 = <&i2c22_default>;
+	pinctrl-1 = <&i2c22_sleep>;
+	pinctrl-names = "default", "sleep";
+	status = "okay";
+
+	eeprom0: eeprom@54 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x54>;
+		address-width = <8>;
+		size = <256>;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_target_api/boards/stm32n6570_dk_stm32n657xx_sb.conf b/tests/drivers/i2c/i2c_target_api/boards/stm32n6570_dk_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..34b2571d12516
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/stm32n6570_dk_stm32n657xx_sb.conf
@@ -0,0 +1,2 @@
+CONFIG_I2C_STM32_INTERRUPT=y
+CONFIG_I2C_VIRTUAL=n
diff --git a/tests/drivers/i2c/i2c_target_api/boards/stm32n6570_dk_stm32n657xx_sb.overlay b/tests/drivers/i2c/i2c_target_api/boards/stm32n6570_dk_stm32n657xx_sb.overlay
new file mode 100644
index 0000000000000..8c0215c406bd7
--- /dev/null
+++ b/tests/drivers/i2c/i2c_target_api/boards/stm32n6570_dk_stm32n657xx_sb.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* I2C bus pins are exposed on the ST Arduino header.
+ *
+ *  Bus        SDA                    SCL
+ *          Pin   Hdr              Pin   Hdr
+ *  i2c1    PC1   CN12:10 (D15)    PH9   CN12:9 (D14)
+ *  i2c4    PE14  CN12:2  (D9)     PE13  CN11:7 (D6)
+ *
+ * Short Pin PC1 to PE14, and PH9 to PE13, for the test to pass.
+ */
+
+&i2c1 {
+	eeprom0: eeprom@54 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x54>;
+		size = <256>;
+	};
+};
+
+&i2c4 {
+	eeprom1: eeprom@56 {
+		compatible = "zephyr,i2c-target-eeprom";
+		reg = <0x56>;
+		size = <256>;
+	};
+};
diff --git a/tests/drivers/i2c/i2c_target_api/testcase.yaml b/tests/drivers/i2c/i2c_target_api/testcase.yaml
index 02d99377401da..1a0991f77cadb 100644
--- a/tests/drivers/i2c/i2c_target_api/testcase.yaml
+++ b/tests/drivers/i2c/i2c_target_api/testcase.yaml
@@ -59,5 +59,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - max32690evkit/max32690/m4
diff --git a/tests/drivers/i2s/i2s_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..5637a121224ec
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &i2s20;
+	};
+};
+
+&pinctrl {
+	i2s20_default_alt: i2s20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
+				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
+				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
+				<NRF_PSEL(I2S_SDIN, 1, 9)>;
+		};
+	};
+};
+
+&i2s20 {
+	status = "okay";
+	pinctrl-0 = <&i2s20_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/i2s/i2s_speed/Kconfig b/tests/drivers/i2s/i2s_speed/Kconfig
index 7f9e54efacc1e..165fc6279b275 100644
--- a/tests/drivers/i2s/i2s_speed/Kconfig
+++ b/tests/drivers/i2s/i2s_speed/Kconfig
@@ -37,3 +37,45 @@ config I2S_TEST_ALLOWED_DATA_OFFSET
 	help
 	  Maximum allowed offset between sent and received samples. Non-zero
 	  value of this option may be needed when GPIO loopback is used.
+
+config I2S_TEST_SKIP_SAMPLERATE_8000
+	bool "Skip short transfer tests at 8000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 8000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_16000
+	bool "Skip short transfer tests at 16000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 16000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_32000
+	bool "Skip short transfer tests at 32000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 32000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_44100
+	bool "Skip short transfer tests at 44100 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 44100 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_48000
+	bool "Skip short transfer tests at 48000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 48000 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_88200
+	bool "Skip short transfer tests at 88200 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 88200 samples per second
+	  will be skipped.
+
+config I2S_TEST_SKIP_SAMPLERATE_96000
+	bool "Skip short transfer tests at 96000 samples per socond"
+	help
+	  When set to 'y', short transfer tests at 96000 samples per second
+	  will be skipped.
diff --git a/tests/drivers/i2s/i2s_speed/boards/frdm_mcxn947_mcxn947_cpu0.overlay b/tests/drivers/i2s/i2s_speed/boards/frdm_mcxn947_mcxn947_cpu0.overlay
index d6f34fc2e5f14..3dad7edb263c7 100644
--- a/tests/drivers/i2s/i2s_speed/boards/frdm_mcxn947_mcxn947_cpu0.overlay
+++ b/tests/drivers/i2s/i2s_speed/boards/frdm_mcxn947_mcxn947_cpu0.overlay
@@ -9,3 +9,7 @@
 		i2s-node1 = &sai0;
 	};
 };
+
+&sai0 {
+	mclk-output;
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/frdm_rw612.conf b/tests/drivers/i2s/i2s_speed/boards/frdm_rw612.conf
new file mode 100644
index 0000000000000..4a0c379e26a10
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/frdm_rw612.conf
@@ -0,0 +1 @@
+CONFIG_I2S_TEST_SEPARATE_DEVICES=y
diff --git a/tests/drivers/i2s/i2s_speed/boards/frdm_rw612.overlay b/tests/drivers/i2s/i2s_speed/boards/frdm_rw612.overlay
new file mode 100644
index 0000000000000..7cf5ffa4b5f16
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/frdm_rw612.overlay
@@ -0,0 +1,39 @@
+/* Overlay for RDRW61X I2S tests */
+
+/ {
+	aliases {
+		i2s-node0 = &flexcomm0;
+		i2s-node1 = &flexcomm1;
+	};
+};
+
+/* Redefine as i2s node */
+&flexcomm0 {
+	compatible = "nxp,lpc-i2s";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-0 = <&pinmux_flexcomm0_i2s>;
+	pinctrl-names = "default";
+	dma-names = "rx", "tx";
+	/delete-property/ current-speed;
+	status = "okay";
+};
+
+&flexcomm1 {
+	compatible = "nxp,lpc-i2s";
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-0 = <&pinmux_flexcomm1_i2s>;
+	pinctrl-names = "default";
+};
+
+/* Redefine pinctrl for flexcomm0 */
+&pinctrl {
+	pinmux_flexcomm0_i2s: pinmux_flexcomm0_i2s {
+		group0 {
+			pinmux = <IO_MUX_FC0_I2S>;
+			slew-rate = "normal";
+		};
+	};
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
deleted file mode 100644
index 8a1e1c2c47a87..0000000000000
--- a/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# SAI peripheral does not have loopback mode but we can connect CLK, SYNC,
-# RXD and TXD of one SAI for test purpose.
-CONFIG_I2S_TEST_SEPARATE_DEVICES=n
-
-# CONFIG_DMA_TCD_QUEUE_SIZE sets size of queue used to chain DMA blocks (TCDs)
-# together, and should be sized as needed by the application.  If not large
-# enough, the DMA may starve.  Symptoms of this issue include transmit blocks
-# repeated, or RX blocks skipped. For I2S driver, queue size must be at least 3.
-CONFIG_DMA_TCD_QUEUE_SIZE=4
-
-# Repeat test continually to help find intermittent issues
-CONFIG_ZTEST_RETEST_IF_PASSED=y
-
-# I2S and DMA logging can occur in interrupt context, and interfere with I2S
-# stream timing.  If using either logging, set logging to deferred
-# CONFIG_LOG_MODE_DEFERRED=y
-
-CONFIG_DMA_LOG_LEVEL_OFF=y
-CONFIG_I2S_LOG_LEVEL_OFF=y
diff --git a/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
deleted file mode 100644
index 59583a680ce35..0000000000000
--- a/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
+++ /dev/null
@@ -1,15 +0,0 @@
-/* i2s_speed with CONFIG_I2S_TEST_SEPARATE_DEVICES=n uses only one I2S peripheral:
- * i2s-node0 is both the transitter and receiver.
- * uses SAI1 peripheral on RT1170
- */
-/ {
-	aliases {
-		i2s-node0 = &sai1;
-	};
-};
-
-/* Default DMA channel 0 and 1 maybe used by other peripherals like UART. */
-&sai1 {
-	nxp,tx-dma-channel = <8>;
-	nxp,rx-dma-channel = <9>;
-};
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay
new file mode 100644
index 0000000000000..e262ca8d8a87d
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay
@@ -0,0 +1,9 @@
+/* Drive i2s peripheral from ACLK. */
+
+&clock {
+	hfclkaudio-frequency = <11289600>;
+};
+
+&i2s0 {
+	clock-source = "ACLK";
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..5637a121224ec
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &i2s20;
+	};
+};
+
+&pinctrl {
+	i2s20_default_alt: i2s20_default_alt {
+		group1 {
+			psels = <NRF_PSEL(I2S_SCK_M, 1, 11)>,
+				<NRF_PSEL(I2S_LRCK_M, 1, 12)>,
+				<NRF_PSEL(I2S_SDOUT, 1, 8)>,
+				<NRF_PSEL(I2S_SDIN, 1, 9)>;
+		};
+	};
+};
+
+&i2s20 {
+	status = "okay";
+	pinctrl-0 = <&i2s20_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/rd_rw612_bga.conf b/tests/drivers/i2s/i2s_speed/boards/rd_rw612_bga.conf
new file mode 100644
index 0000000000000..4a0c379e26a10
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/rd_rw612_bga.conf
@@ -0,0 +1 @@
+CONFIG_I2S_TEST_SEPARATE_DEVICES=y
diff --git a/tests/drivers/i2s/i2s_speed/boards/rd_rw612_bga.overlay b/tests/drivers/i2s/i2s_speed/boards/rd_rw612_bga.overlay
new file mode 100644
index 0000000000000..7cf5ffa4b5f16
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/rd_rw612_bga.overlay
@@ -0,0 +1,39 @@
+/* Overlay for RDRW61X I2S tests */
+
+/ {
+	aliases {
+		i2s-node0 = &flexcomm0;
+		i2s-node1 = &flexcomm1;
+	};
+};
+
+/* Redefine as i2s node */
+&flexcomm0 {
+	compatible = "nxp,lpc-i2s";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-0 = <&pinmux_flexcomm0_i2s>;
+	pinctrl-names = "default";
+	dma-names = "rx", "tx";
+	/delete-property/ current-speed;
+	status = "okay";
+};
+
+&flexcomm1 {
+	compatible = "nxp,lpc-i2s";
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-0 = <&pinmux_flexcomm1_i2s>;
+	pinctrl-names = "default";
+};
+
+/* Redefine pinctrl for flexcomm0 */
+&pinctrl {
+	pinmux_flexcomm0_i2s: pinmux_flexcomm0_i2s {
+		group0 {
+			pinmux = <IO_MUX_FC0_I2S>;
+			slew-rate = "normal";
+		};
+	};
+};
diff --git a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
index 9851f480b23ab..a27a8465d1f56 100644
--- a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
+++ b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
@@ -125,9 +125,8 @@ static int verify_buf(int16_t *rx_block, int att)
 }
 
 #define TIMEOUT          2000
-#define FRAME_CLK_FREQ   44000
 
-static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir)
+static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir, uint32_t frame_clk_freq)
 {
 	int ret;
 	struct i2s_config i2s_cfg;
@@ -135,7 +134,7 @@ static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir)
 	i2s_cfg.word_size = 16U;
 	i2s_cfg.channels = 2U;
 	i2s_cfg.format = I2S_FMT_DATA_FORMAT_I2S;
-	i2s_cfg.frame_clk_freq = FRAME_CLK_FREQ;
+	i2s_cfg.frame_clk_freq = frame_clk_freq;
 	i2s_cfg.block_size = BLOCK_SIZE;
 	i2s_cfg.timeout = TIMEOUT;
 
@@ -179,16 +178,7 @@ static int configure_stream(const struct device *dev_i2s, enum i2s_dir dir)
 	return TC_PASS;
 }
 
-
-/** @brief Short I2S transfer.
- *
- * - TX stream START trigger starts transmission.
- * - RX stream START trigger starts reception.
- * - sending / receiving a short sequence of data returns success.
- * - TX stream DRAIN trigger empties the transmit queue.
- * - RX stream STOP trigger stops reception.
- */
-ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
+static void i2s_transfer_short(uint32_t frame_clk_freq)
 {
 	if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
 		TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -201,6 +191,12 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
 	size_t rx_size;
 	int ret;
 
+	/* Configure I2S TX and I2S RX transfer. */
+	ret = configure_stream(dev_i2s_tx, I2S_DIR_TX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+	ret = configure_stream(dev_i2s_rx, I2S_DIR_RX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+
 	/* Prefill TX queue */
 	for (int i = 0; i < 3; i++) {
 		ret = k_mem_slab_alloc(&tx_0_mem_slab, &tx_block, K_FOREVER);
@@ -258,6 +254,111 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
 	TC_PRINT("%d<-OK\n", 3);
 }
 
+/** @brief Short I2S transfer at 8000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_08000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_8000);
+
+	i2s_transfer_short(8000);
+}
+
+/** @brief Short I2S transfer at 16000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_16000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_16000);
+
+	i2s_transfer_short(16000);
+}
+
+/** @brief Short I2S transfer at 32000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_32000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_32000);
+
+	i2s_transfer_short(32000);
+}
+
+/** @brief Short I2S transfer at 44100 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_44100)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_44100);
+
+	i2s_transfer_short(44100);
+}
+
+/** @brief Short I2S transfer at 48000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_48000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_48000);
+
+	i2s_transfer_short(48000);
+}
+
+/** @brief Short I2S transfer at 88200 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_88200)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_88200);
+
+	i2s_transfer_short(88200);
+}
+
+/** @brief Short I2S transfer at 96000 samples per second.
+ *
+ * - TX stream START trigger starts transmission.
+ * - RX stream START trigger starts reception.
+ * - sending / receiving a short sequence of data returns success.
+ * - TX stream DRAIN trigger empties the transmit queue.
+ * - RX stream STOP trigger stops reception.
+ */
+ZTEST(drivers_i2s_speed, test_i2s_transfer_short_96000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_96000);
+
+	i2s_transfer_short(96000);
+}
+
 /** @brief Long I2S transfer.
  *
  * - TX stream START trigger starts transmission.
@@ -266,7 +367,7 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_short)
  * - TX stream DRAIN trigger empties the transmit queue.
  * - RX stream STOP trigger stops reception.
  */
-ZTEST(drivers_i2s_speed, test_i2s_transfer_long)
+ZTEST(drivers_i2s_speed, test_i2s_transfer_long_44100)
 {
 	if (IS_ENABLED(CONFIG_I2S_TEST_USE_I2S_DIR_BOTH)) {
 		TC_PRINT("RX/TX transfer requires use of I2S_DIR_BOTH.\n");
@@ -281,6 +382,13 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_long)
 	int rx_idx = 0;
 	int num_verified;
 	int ret;
+	uint32_t frame_clk_freq = 44100;
+
+	/* Configure I2S TX and I2S RX transfer. */
+	ret = configure_stream(dev_i2s_tx, I2S_DIR_TX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+	ret = configure_stream(dev_i2s_rx, I2S_DIR_RX, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
 
 	/* Prepare TX data blocks */
 	for (tx_idx = 0; tx_idx < NUM_BLOCKS; tx_idx++) {
@@ -349,14 +457,7 @@ ZTEST(drivers_i2s_speed, test_i2s_transfer_long)
 	zassert_equal(num_verified, NUM_BLOCKS, "Invalid RX blocks received");
 }
 
-
-/** @brief Short I2S transfer using I2S_DIR_BOTH.
- *
- * - START trigger starts both the transmission and reception.
- * - Sending / receiving a short sequence of data returns success.
- * - DRAIN trigger empties the transmit queue and stops both streams.
- */
-ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short)
+static void i2s_dir_both_transfer_short(uint32_t frame_clk_freq)
 {
 	if (!dir_both_supported) {
 		TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -369,6 +470,10 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short)
 	size_t rx_size;
 	int ret;
 
+	/* Configure I2S Dir Both transfer. */
+	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
+
 	/* Prefill TX queue */
 	for (int i = 0; i < 3; i++) {
 		ret = k_mem_slab_alloc(&tx_0_mem_slab, &tx_block, K_FOREVER);
@@ -417,13 +522,104 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short)
 	TC_PRINT("%d<-OK\n", 3);
 }
 
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 8000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_08000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_8000);
+
+	i2s_dir_both_transfer_short(8000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 16000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_16000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_16000);
+
+	i2s_dir_both_transfer_short(16000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 32000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_32000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_32000);
+
+	i2s_dir_both_transfer_short(32000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 44100.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_44100)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_44100);
+
+	i2s_dir_both_transfer_short(44100);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 48000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_48000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_48000);
+
+	i2s_dir_both_transfer_short(48000);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 88200.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_88200)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_88200);
+
+	i2s_dir_both_transfer_short(88200);
+}
+
+/** @brief Short I2S transfer using I2S_DIR_BOTH and sample rate of 96000.
+ *
+ * - START trigger starts both the transmission and reception.
+ * - Sending / receiving a short sequence of data returns success.
+ * - DRAIN trigger empties the transmit queue and stops both streams.
+ */
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_short_96000)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_I2S_TEST_SKIP_SAMPLERATE_96000);
+
+	i2s_dir_both_transfer_short(96000);
+}
+
 /** @brief Long I2S transfer using I2S_DIR_BOTH.
  *
  * - START trigger starts both the transmission and reception.
  * - Sending / receiving a long sequence of data returns success.
  * - DRAIN trigger empties the transmit queue and stops both streams.
  */
-ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long)
+ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long_44100)
 {
 	if (!dir_both_supported) {
 		TC_PRINT("I2S_DIR_BOTH value is not supported.\n");
@@ -438,6 +634,11 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long)
 	int rx_idx = 0;
 	int num_verified;
 	int ret;
+	uint32_t frame_clk_freq = 44100;
+
+	/* Configure I2S Dir Both transfer. */
+	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH, frame_clk_freq);
+	zassert_equal(ret, TC_PASS);
 
 	/* Prepare TX data blocks */
 	for (tx_idx = 0; tx_idx < NUM_BLOCKS; tx_idx++) {
@@ -499,24 +700,15 @@ ZTEST(drivers_i2s_speed_both_rxtx, test_i2s_dir_both_transfer_long)
 
 static void *test_i2s_speed_configure(void)
 {
-	/* Configure I2S TX transfer. */
-	int ret;
-
+	/* Check if I2S TX and I2S RX devices are ready. */
 	dev_i2s_tx = DEVICE_DT_GET_OR_NULL(I2S_DEV_NODE_TX);
 	zassert_not_null(dev_i2s_tx, "transfer device not found");
 	zassert(device_is_ready(dev_i2s_tx), "transfer device not ready");
 
-	ret = configure_stream(dev_i2s_tx, I2S_DIR_TX);
-	zassert_equal(ret, TC_PASS);
-
-	/* Configure I2S RX transfer. */
 	dev_i2s_rx = DEVICE_DT_GET_OR_NULL(I2S_DEV_NODE_RX);
 	zassert_not_null(dev_i2s_rx, "receive device not found");
 	zassert(device_is_ready(dev_i2s_rx), "receive device not ready");
 
-	ret = configure_stream(dev_i2s_rx, I2S_DIR_RX);
-	zassert_equal(ret, TC_PASS);
-
 	return 0;
 }
 
@@ -529,7 +721,7 @@ static void *test_i2s_speed_rxtx_configure(void)
 	zassert_not_null(dev_i2s_rxtx, "receive device not found");
 	zassert(device_is_ready(dev_i2s_rxtx), "receive device not ready");
 
-	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH);
+	ret = configure_stream(dev_i2s_rxtx, I2S_DIR_BOTH, 44100);
 	zassert_equal(ret, TC_PASS);
 
 	/* Check if the tested driver supports the I2S_DIR_BOTH value.
diff --git a/tests/drivers/i2s/i2s_speed/testcase.yaml b/tests/drivers/i2s/i2s_speed/testcase.yaml
index 9f8601d21c075..6bc15a4136452 100644
--- a/tests/drivers/i2s/i2s_speed/testcase.yaml
+++ b/tests/drivers/i2s/i2s_speed/testcase.yaml
@@ -16,3 +16,16 @@ tests:
     harness: ztest
     harness_config:
       fixture: gpio_loopback
+  drivers.i2s.speed.gpio_loopback.aclk:
+    depends_on:
+      - i2s
+      - gpio
+    tags:
+      - drivers
+      - i2s
+    filter: CONFIG_I2S_TEST_USE_GPIO_LOOPBACK
+    harness: ztest
+    harness_config:
+      fixture: gpio_loopback
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf5340dk_nrf5340_cpuapp_aclk.overlay"
+    platform_allow: nrf5340dk/nrf5340/cpuapp
diff --git a/tests/drivers/input/tsc_keys/CMakeLists.txt b/tests/drivers/input/tsc_keys/CMakeLists.txt
new file mode 100644
index 0000000000000..5746edeb2e07f
--- /dev/null
+++ b/tests/drivers/input/tsc_keys/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(stm32_tsc)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/input/tsc_keys/boards/stm32u083c_dk.overlay b/tests/drivers/input/tsc_keys/boards/stm32u083c_dk.overlay
new file mode 100644
index 0000000000000..1ef9dc0534106
--- /dev/null
+++ b/tests/drivers/input/tsc_keys/boards/stm32u083c_dk.overlay
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	zephyr,user {
+		/* This will be used to trigger the SYNC pin high and low programmatically.
+		 * They have to be connected.
+		 */
+		signal-gpios = <&gpioa 10 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&tsc {
+	status = "okay";
+
+	pinctrl-0 = <&tsc_g1_io1_pb12 &tsc_g1_io2_pb13 &tsc_g6_io1_pd10
+					&tsc_g6_io2_pd11 &tsc_sync_pd2>;
+	pinctrl-names = "default";
+
+	st,pulse-generator-prescaler = <128>;
+
+	st,spread-spectrum;
+	st,spread-spectrum-prescaler = <2>;
+	st,spread-spectrum-deviation = <10>;
+
+	st,max-count-value = <16383>;
+
+	st,synced-acquisition;
+	st,syncpol-rising;
+};
diff --git a/tests/drivers/input/tsc_keys/prj.conf b/tests/drivers/input/tsc_keys/prj.conf
new file mode 100644
index 0000000000000..5b12463c96039
--- /dev/null
+++ b/tests/drivers/input/tsc_keys/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_ZTEST=y
+CONFIG_INPUT=y
diff --git a/tests/drivers/input/tsc_keys/src/main.c b/tests/drivers/input/tsc_keys/src/main.c
new file mode 100644
index 0000000000000..e70bb05025f9c
--- /dev/null
+++ b/tests/drivers/input/tsc_keys/src/main.c
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+extern const struct gpio_dt_spec signal_mock;
+
+static void *stm32_tsc_setup(void)
+{
+	zexpect_ok(gpio_pin_configure_dt(&signal_mock, GPIO_OUTPUT_INACTIVE),
+		   "Failed to configure signal_mock pin");
+
+	return NULL;
+}
+
+ZTEST_SUITE(stm32_tsc, NULL, stm32_tsc_setup, NULL, NULL, NULL);
diff --git a/tests/drivers/input/tsc_keys/src/test_stm32_tsc.c b/tests/drivers/input/tsc_keys/src/test_stm32_tsc.c
new file mode 100644
index 0000000000000..3ca3d2c462cf6
--- /dev/null
+++ b/tests/drivers/input/tsc_keys/src/test_stm32_tsc.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2024 Arif Balik <arifbalik@outlook.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Verify STM32 TSC peripheral is configured properly and can be started
+ *
+ * @details
+ * This test requires an external connection on the stm32u083c_dk board. The
+ * pin GPIOA 10 should be connected to GPIOD 2 manually so that sync signal can
+ * be generated. Also make sure to press TS1 pad on the board in order to
+ * generate touch signal on test 5.
+ * - Test Steps
+ *   -# Get a TSC device
+ *   -# Verify the device is ready
+ *   -# Verify MIMO region with device tree values
+ *   -# Test the acquisition in polling mode
+ *   -# Test the acquisition in interrupt mode
+ * - Expected Results
+ *   -# The device is ready
+ *   -# The device tree values are correctly mapped to the TSC registers
+ *   -# The acquisition is successful in polling mode
+ *   -# The acquisition is successful in interrupt mode
+ *
+ */
+
+#include <soc.h>
+#include <autoconf.h>
+#include <inttypes.h>
+#include <zephyr/ztest.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/input/input.h>
+#include <zephyr/drivers/gpio.h>
+
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_tsc)
+#define TSC_NODE DT_INST(0, st_stm32_tsc)
+#else
+#error "Could not find an st,stm32-tsc compatible device in DT"
+#endif
+
+#define ZEPHYR_USER_NODE DT_PATH(zephyr_user)
+
+const struct gpio_dt_spec signal_mock = GPIO_DT_SPEC_GET(ZEPHYR_USER_NODE, signal_gpios);
+
+ZTEST(stm32_tsc, test_1_device_ready)
+{
+	const struct device *dev = DEVICE_DT_GET(TSC_NODE);
+
+	zassert_true(device_is_ready(dev), "STM32 TSC device is not ready");
+}
+
+ZTEST(stm32_tsc, test_2_cr_reg)
+{
+	TSC_TypeDef *tsc = (TSC_TypeDef *)DT_REG_ADDR(TSC_NODE);
+
+	volatile const uint32_t *tsc_cr = &tsc->CR;
+	const uint32_t pgpsc = LOG2CEIL(DT_PROP(TSC_NODE, st_pulse_generator_prescaler));
+	const uint8_t ctph = DT_PROP(TSC_NODE, st_charge_transfer_pulse_high);
+	const uint8_t ctpl = DT_PROP(TSC_NODE, st_charge_transfer_pulse_low);
+	const uint8_t ssd = DT_PROP(TSC_NODE, st_spread_spectrum_deviation);
+	const bool spread_spectrum = DT_PROP(TSC_NODE, st_spread_spectrum);
+	const uint8_t sscpsc = DT_PROP(TSC_NODE, st_spread_spectrum_prescaler);
+	const uint16_t max_count = LOG2CEIL(DT_PROP(TSC_NODE, st_max_count_value) + 1) - 8;
+	const bool iodef = DT_PROP(TSC_NODE, st_iodef_float);
+	const bool sync_pol = DT_PROP(TSC_NODE, st_syncpol_rising);
+	const bool sync_acq = DT_PROP(TSC_NODE, st_synced_acquisition);
+
+	/* check charge transfer pulse high value (bits 31:28) */
+	zassert_equal((*tsc_cr & TSC_CR_CTPL_Msk) >> TSC_CR_CTPL_Pos, ctph - 1,
+		      "CTPH value is not correct, expected %d, got %d", ctph - 1,
+		      (*tsc_cr & TSC_CR_CTPL_Msk) >> TSC_CR_CTPL_Pos);
+
+	/* check charge transfer pulse low value (bits 27:24) */
+	zassert_equal((*tsc_cr & TSC_CR_CTPL_Msk) >> TSC_CR_CTPL_Pos, ctpl - 1,
+		      "CTPL value is not correct, expected %d, got %d", ctpl - 1,
+		      (*tsc_cr & TSC_CR_CTPL_Msk) >> TSC_CR_CTPL_Pos);
+
+	/* check spread spectrum deviation value (bits 23:17) */
+	zassert_equal((*tsc_cr & TSC_CR_SSD_Msk) >> TSC_CR_SSD_Pos, ssd,
+		      "SSD value is not correct, expected %d, got %d", ssd,
+		      (*tsc_cr & TSC_CR_SSD_Msk) >> TSC_CR_SSD_Pos);
+
+	/* check spread spectrum enable bit (bit 16) */
+	if (spread_spectrum) {
+		zexpect_true(*tsc_cr & TSC_CR_SSE_Msk);
+	} else {
+		zexpect_false(*tsc_cr & TSC_CR_SSE_Msk);
+	}
+
+	/* check spread spectrum prescaler value (bits 15) */
+	if (sscpsc == 2) {
+		zexpect_true(*tsc_cr & TSC_CR_SSPSC_Msk);
+	} else {
+		zexpect_false(*tsc_cr & TSC_CR_SSPSC_Msk);
+	}
+
+	/* check pulse generator prescaler value (bits 14:12) */
+	zassert_equal((*tsc_cr & TSC_CR_PGPSC_Msk), pgpsc << TSC_CR_PGPSC_Pos,
+		      "PGPSC value is not correct, expected %d, got %d", pgpsc,
+		      (*tsc_cr & TSC_CR_PGPSC_Msk));
+
+	/* check max count value (bits 7:5) */
+	zassert_equal((*tsc_cr & TSC_CR_MCV_Msk), max_count << TSC_CR_MCV_Pos,
+		      "MCV value is not correct, expected %d, got %d", max_count,
+		      (*tsc_cr & TSC_CR_MCV_Msk));
+
+	/* check I/O default mode bit (bit 4) */
+	if (iodef) {
+		zexpect_true(*tsc_cr & TSC_CR_IODEF_Msk);
+	} else {
+		zexpect_false(*tsc_cr & TSC_CR_IODEF_Msk);
+	}
+
+	/* check sync polarity bit (bit 3) */
+	if (sync_pol) {
+		zexpect_true(*tsc_cr & TSC_CR_SYNCPOL_Msk);
+	} else {
+		zexpect_false(*tsc_cr & TSC_CR_SYNCPOL_Msk);
+	}
+
+	/* check sync acquisition bit (bit 2) */
+	if (sync_acq) {
+		zexpect_true(*tsc_cr & TSC_CR_AM_Msk);
+	} else {
+		zexpect_false(*tsc_cr & TSC_CR_AM_Msk);
+	}
+
+	/* check TSC enable bit (bit 0) */
+	zexpect_true(*tsc_cr & TSC_CR_TSCE_Msk);
+}
+
+ZTEST(stm32_tsc, test_3_group_registers)
+{
+	TSC_TypeDef *tsc = (TSC_TypeDef *)DT_REG_ADDR(TSC_NODE);
+	volatile const uint32_t *tsc_iohcr = &tsc->IOHCR;
+	volatile const uint32_t *tsc_ioscr = &tsc->IOSCR;
+	volatile const uint32_t *tsc_ioccr = &tsc->IOCCR;
+	volatile const uint32_t *tsc_iogcsr = &tsc->IOGCSR;
+
+#define GET_GROUP_BITS(val) (uint32_t)(((val) & 0x0f) << ((group - 1) * 4))
+
+#define STM32_TSC_GROUP_TEST(node)                                                                 \
+	do {                                                                                       \
+		const uint8_t group = DT_PROP(node, group);                                        \
+		const uint8_t channel_ios = DT_PROP(node, channel_ios);                            \
+		const uint8_t sampling_io = DT_PROP(node, sampling_io);                            \
+		const bool use_as_shield = DT_PROP(node, st_use_as_shield);                        \
+                                                                                                   \
+		/* check schmitt trigger hysteresis for enabled I/Os */                            \
+		zassert_equal((*tsc_iohcr & GET_GROUP_BITS(channel_ios | sampling_io)), 0,         \
+			      "Schmitt trigger hysteresis not disabled, expected %d, got %d", 0,   \
+			      (*tsc_iohcr & GET_GROUP_BITS(channel_ios | sampling_io)));           \
+                                                                                                   \
+		/* check channel I/Os */                                                           \
+		zassert_equal(                                                                     \
+			(*tsc_ioccr & GET_GROUP_BITS(channel_ios)), GET_GROUP_BITS(channel_ios),   \
+			"Channel I/Os value is not correct, expected %d, got %d",                  \
+			GET_GROUP_BITS(channel_ios), (*tsc_ioccr & GET_GROUP_BITS(channel_ios)));  \
+                                                                                                   \
+		/* check sampling I/O */                                                           \
+		zassert_equal(                                                                     \
+			(*tsc_ioscr & GET_GROUP_BITS(sampling_io)), GET_GROUP_BITS(sampling_io),   \
+			"Sampling I/O value is not correct, expected %d, got %d",                  \
+			GET_GROUP_BITS(sampling_io), (*tsc_ioscr & GET_GROUP_BITS(sampling_io)));  \
+                                                                                                   \
+		/* check enabled groups */                                                         \
+		if (use_as_shield) {                                                               \
+			zassert_not_equal((*tsc_iogcsr & BIT(group - 1)), BIT(group - 1),          \
+					  "Group %d is a shield group and should not be enabled",  \
+					  group);                                                  \
+		} else {                                                                           \
+			zassert_equal((*tsc_iogcsr & BIT(group - 1)), BIT(group - 1),              \
+				      "Group %d is not enabled", group);                           \
+		}                                                                                  \
+	} while (0)
+
+#define GROUP_TEST_RUN(node) STM32_TSC_GROUP_TEST(node);
+
+	DT_FOREACH_CHILD_STATUS_OKAY(TSC_NODE, GROUP_TEST_RUN);
+}
+
+static volatile bool tsc_input_received;
+
+static void tsc_input_callback(struct input_event *evt, void *user_data)
+{
+	ARG_UNUSED(evt);
+	ARG_UNUSED(user_data);
+
+	tsc_input_received = true;
+}
+INPUT_CALLBACK_DEFINE(NULL, tsc_input_callback, NULL);
+
+ZTEST(stm32_tsc, test_5_acquisition_interrupt)
+{
+	TSC_TypeDef *tsc = (TSC_TypeDef *)DT_REG_ADDR(TSC_NODE);
+	volatile const uint32_t *tsc_isr = &tsc->ISR;
+
+	k_sleep(K_MSEC(100));
+
+	/* test ISR register max count error flag */
+	zexpect_false((*tsc_isr & TSC_ISR_MCEF_Msk) >> TSC_ISR_MCEF_Pos);
+
+	/* this should fail because of the sync pin */
+	zexpect_false(tsc_input_received);
+
+	zexpect_ok(gpio_pin_toggle_dt(&signal_mock));
+
+	/* press the TS1 pad */
+
+	k_sleep(K_MSEC(3000));
+
+	zexpect_true(tsc_input_received);
+}
diff --git a/tests/drivers/input/tsc_keys/testcase.yaml b/tests/drivers/input/tsc_keys/testcase.yaml
new file mode 100644
index 0000000000000..4122f550ad88c
--- /dev/null
+++ b/tests/drivers/input/tsc_keys/testcase.yaml
@@ -0,0 +1,6 @@
+tests:
+  drivers.input.stm32_tsc:
+    tags: drivers input stm32 tsc
+    filter: dt_compat_enabled("st,stm32-tsc")
+    depends_on: tsc
+    integration_platforms: [stm32u083c_dk]
diff --git a/tests/drivers/kscan/kscan_api/CMakeLists.txt b/tests/drivers/kscan/kscan_api/CMakeLists.txt
deleted file mode 100644
index 385203698cfcd..0000000000000
--- a/tests/drivers/kscan/kscan_api/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(kscan_api)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/kscan/kscan_api/mec15xxevb_assy6853.conf b/tests/drivers/kscan/kscan_api/mec15xxevb_assy6853.conf
deleted file mode 100644
index ded66973827c1..0000000000000
--- a/tests/drivers/kscan/kscan_api/mec15xxevb_assy6853.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_KSCAN=y
-CONFIG_ZTEST=y
diff --git a/tests/drivers/kscan/kscan_api/prj.conf b/tests/drivers/kscan/kscan_api/prj.conf
deleted file mode 100644
index f291b8d5b757d..0000000000000
--- a/tests/drivers/kscan/kscan_api/prj.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_KSCAN=y
-CONFIG_TEST_USERSPACE=y
-CONFIG_ZTEST=y
diff --git a/tests/drivers/kscan/kscan_api/src/main.c b/tests/drivers/kscan/kscan_api/src/main.c
deleted file mode 100644
index 5dc79c6f05bb6..0000000000000
--- a/tests/drivers/kscan/kscan_api/src/main.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2019 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-#include <zephyr/ztest.h>
-
-ZTEST_SUITE(kscan_basic, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/kscan/kscan_api/src/test_kscan.c b/tests/drivers/kscan/kscan_api/src/test_kscan.c
deleted file mode 100644
index 624255789e76a..0000000000000
--- a/tests/drivers/kscan/kscan_api/src/test_kscan.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2019 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/device.h>
-#include <stdlib.h>
-#include <zephyr/drivers/kscan.h>
-#include <zephyr/kernel.h>
-#include <zephyr/ztest.h>
-
-static void kb_callback(const struct device *dev, uint32_t row, uint32_t col,
-			bool pressed)
-{
-	ARG_UNUSED(dev);
-	ARG_UNUSED(row);
-	ARG_UNUSED(col);
-	ARG_UNUSED(pressed);
-}
-
-static int test_kb_callback(void)
-{
-	const struct device *const kscan_dev = DEVICE_DT_GET(DT_ALIAS(kscan0));
-
-	if (!device_is_ready(kscan_dev)) {
-		TC_PRINT("KBSCAN device is not ready\n");
-		return TC_FAIL;
-	}
-
-	if (kscan_config(kscan_dev, kb_callback) != 0) {
-		TC_PRINT("Unexpected error code received\n");
-		return TC_FAIL;
-	}
-
-	return TC_PASS;
-}
-
-static int test_null_callback(void)
-{
-	const struct device *const kscan_dev = DEVICE_DT_GET(DT_ALIAS(kscan0));
-
-	if (!device_is_ready(kscan_dev)) {
-		TC_PRINT("KBSCAN device is not ready\n");
-		return TC_FAIL;
-	}
-
-	if (kscan_config(kscan_dev, NULL) != -EINVAL) {
-		TC_PRINT("Unexpected error code received\n");
-		return TC_FAIL;
-	}
-
-	return TC_PASS;
-}
-
-static int test_disable_enable_callback(void)
-{
-	const struct device *const kscan_dev = DEVICE_DT_GET(DT_ALIAS(kscan0));
-
-	if (!device_is_ready(kscan_dev)) {
-		TC_PRINT("KBSCAN device is not ready\n");
-		return TC_FAIL;
-	}
-
-	if (kscan_config(kscan_dev, kb_callback) != 0) {
-		TC_PRINT("Unexpected error code received\n");
-		return TC_FAIL;
-	}
-
-	if (kscan_disable_callback(kscan_dev) != 0) {
-		TC_PRINT("Error while disabling callback\n");
-		return TC_FAIL;
-	}
-
-	if (kscan_enable_callback(kscan_dev) != 0) {
-		TC_PRINT("Error while enabling callback\n");
-		return TC_FAIL;
-	}
-
-	return TC_PASS;
-}
-
-ZTEST(kscan_basic, test_init_callback)
-{
-	/* Configure kscan matrix with an appropriate callback */
-	zassert_true(test_kb_callback() == TC_PASS);
-	k_sleep(K_MSEC(1000));
-
-	/* Configure kscan with a null callback */
-	zassert_true(test_null_callback() == TC_PASS);
-}
-
-ZTEST(kscan_basic, test_control_callback)
-{
-	/* Disable/enable notifications to user */
-	zassert_true(test_disable_enable_callback() == TC_PASS);
-	k_sleep(K_MSEC(1000));
-}
diff --git a/tests/drivers/kscan/kscan_api/testcase.yaml b/tests/drivers/kscan/kscan_api/testcase.yaml
deleted file mode 100644
index 2f37671d4c26a..0000000000000
--- a/tests/drivers/kscan/kscan_api/testcase.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-tests:
-  drivers.kscan:
-    tags:
-      - drivers
-      - kscan
-      - userspace
-    depends_on: kscan
-    platform_exclude: mec15xxevb_assy6853
-    filter: dt_alias_exists("kscan0")
-  drivers.kscan.mec15xxevb_assy6853:
-    depends_on: kscan
-    tags:
-      - drivers
-      - kscan
-    extra_args: CONF_FILE="mec15xxevb_assy6853.conf"
-    platform_allow: mec15xxevb_assy6853
diff --git a/tests/drivers/kscan/kscan_input/CMakeLists.txt b/tests/drivers/kscan/kscan_input/CMakeLists.txt
deleted file mode 100644
index d67acd5a2f46e..0000000000000
--- a/tests/drivers/kscan/kscan_input/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-project(kscan_input)
-
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/drivers/kscan/kscan_input/boards/native_sim.overlay b/tests/drivers/kscan/kscan_input/boards/native_sim.overlay
deleted file mode 100644
index 4e36164ab6349..0000000000000
--- a/tests/drivers/kscan/kscan_input/boards/native_sim.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	/delete-node/ input_sdl_touch;
-
-	fake_input_device: fake-device {
-		compatible = "vnd,input-device";
-		kscan_input: kscan-input {
-			compatible = "zephyr,kscan-input";
-		};
-	};
-};
diff --git a/tests/drivers/kscan/kscan_input/boards/native_sim_native_64.overlay b/tests/drivers/kscan/kscan_input/boards/native_sim_native_64.overlay
deleted file mode 100644
index 91647f82e208d..0000000000000
--- a/tests/drivers/kscan/kscan_input/boards/native_sim_native_64.overlay
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright (c) 2024 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include "native_sim.overlay"
diff --git a/tests/drivers/kscan/kscan_input/prj.conf b/tests/drivers/kscan/kscan_input/prj.conf
deleted file mode 100644
index 7910417311925..0000000000000
--- a/tests/drivers/kscan/kscan_input/prj.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_ZTEST=y
-CONFIG_KSCAN=y
-CONFIG_INPUT=y
-CONFIG_INPUT_MODE_SYNCHRONOUS=y
diff --git a/tests/drivers/kscan/kscan_input/src/main.c b/tests/drivers/kscan/kscan_input/src/main.c
deleted file mode 100644
index b7c8c404bfea5..0000000000000
--- a/tests/drivers/kscan/kscan_input/src/main.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/device.h>
-#include <zephyr/drivers/kscan.h>
-#include <zephyr/input/input.h>
-#include <zephyr/kernel.h>
-#include <zephyr/ztest.h>
-
-static const struct device *kscan_dev = DEVICE_DT_GET(
-		DT_NODELABEL(kscan_input));
-static const struct device *input_dev = DEVICE_DT_GET(
-		DT_NODELABEL(fake_input_device));
-
-DEVICE_DT_DEFINE(DT_INST(0, vnd_input_device), NULL, NULL, NULL, NULL,
-		 PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, NULL);
-
-static struct {
-	uint32_t row;
-	uint32_t col;
-	bool pressed;
-} last_cb_val;
-static int callback_calls_count;
-
-static void kscan_callback(const struct device *dev, uint32_t row, uint32_t col,
-			   bool pressed)
-{
-	TC_PRINT("row = %u col = %u %d\n", row, col, pressed);
-
-	callback_calls_count++;
-	last_cb_val.row = row;
-	last_cb_val.col = col;
-	last_cb_val.pressed = pressed;
-}
-
-ZTEST(kscan_input, test_kscan_input)
-{
-	kscan_config(kscan_dev, kscan_callback);
-	kscan_enable_callback(kscan_dev);
-
-	input_report_abs(input_dev, INPUT_ABS_X, 101, false, K_FOREVER);
-	zassert_equal(callback_calls_count, 0);
-
-	input_report_abs(input_dev, INPUT_ABS_Y, 102, false, K_FOREVER);
-	zassert_equal(callback_calls_count, 0);
-
-	input_report_key(input_dev, INPUT_BTN_TOUCH, 1, true, K_FOREVER);
-	zassert_equal(callback_calls_count, 1);
-	zassert_equal(last_cb_val.col, 101);
-	zassert_equal(last_cb_val.row, 102);
-	zassert_equal(last_cb_val.pressed, true);
-
-	input_report_abs(input_dev, INPUT_ABS_X, 103, true, K_FOREVER);
-	zassert_equal(callback_calls_count, 2);
-	zassert_equal(last_cb_val.col, 103);
-	zassert_equal(last_cb_val.row, 102);
-	zassert_equal(last_cb_val.pressed, true);
-
-	input_report_key(input_dev, INPUT_BTN_TOUCH, 0, true, K_FOREVER);
-	zassert_equal(callback_calls_count, 3);
-	zassert_equal(last_cb_val.col, 103);
-	zassert_equal(last_cb_val.row, 102);
-	zassert_equal(last_cb_val.pressed, false);
-}
-
-ZTEST_SUITE(kscan_input, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/kscan/kscan_input/testcase.yaml b/tests/drivers/kscan/kscan_input/testcase.yaml
deleted file mode 100644
index 82f2c1df2d967..0000000000000
--- a/tests/drivers/kscan/kscan_input/testcase.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-tests:
-  drivers.input.kscan_input:
-    platform_allow:
-      - native_sim
-      - native_sim/native/64
-    tags:
-      - drivers
-      - kscan
-      - input
-    integration_platforms:
-      - native_sim
diff --git a/tests/drivers/mbox/mbox_data/CMakeLists.txt b/tests/drivers/mbox/mbox_data/CMakeLists.txt
index e816cf7426f24..b339c57068b8b 100644
--- a/tests/drivers/mbox/mbox_data/CMakeLists.txt
+++ b/tests/drivers/mbox/mbox_data/CMakeLists.txt
@@ -11,7 +11,8 @@ set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
 
 if(CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
    CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
-   CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0)
+   CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
+   CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM33)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample")
 else()
   message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample")
diff --git a/tests/drivers/mbox/mbox_data/Kconfig.sysbuild b/tests/drivers/mbox/mbox_data/Kconfig.sysbuild
index 66a4e929ae2f9..9e1d0a00384cb 100644
--- a/tests/drivers/mbox/mbox_data/Kconfig.sysbuild
+++ b/tests/drivers/mbox/mbox_data/Kconfig.sysbuild
@@ -10,3 +10,4 @@ string
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
 	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"
+	default "mimxrt1180_evk/mimxrt1189/cm7" if $(BOARD) = "mimxrt1180_evk"
diff --git a/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay b/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
index b178929819b10..0369a05f253c9 100644
--- a/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
+++ b/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
index ecec226423a83..8c4ac95144fbe 100644
--- a/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
+++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
similarity index 100%
rename from samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
rename to tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
new file mode 100644
index 0000000000000..8c4ac95144fbe
--- /dev/null
+++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		/* Delete ipc chosen property where old IPM mailbox driver below is
+		 * configured.
+		 */
+		/delete-property/ zephyr,ipc;
+	};
+
+	soc {
+		/* Delete IPM Driver node nxp,imx-mu */
+		/delete-node/ mailbox@40c48000;
+
+		/* Attach MBOX driver to MU Unit */
+		mbox:mbox@40c48000 {
+			compatible = "nxp,mbox-imx-mu";
+			reg = <0x40c48000 0x4000>;
+			interrupts = <118 0>;
+			rx-channels = <4>;
+			#mbox-cells = <1>;
+			status = "okay";
+		};
+	};
+
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox 3>, <&mbox 2>, <&mbox 1>, <&mbox 0>, <&mbox 2>,
+			 <&mbox 3>, <&mbox 0>, <&mbox 1>;
+		mbox-names = "tx0", "rx0", "tx1", "rx1", "tx2", "rx2", "tx3",
+			     "rx3";
+	};
+};
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
deleted file mode 100644
index 583b495036082..0000000000000
--- a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_MBOX_NXP_IMX_MU=y
-CONFIG_INCLUDE_REMOTE_DIR=y
-CONFIG_SECOND_CORE_MCUX=y
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
deleted file mode 100644
index ecec226423a83..0000000000000
--- a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
-		 * configured.
-		 */
-		/delete-property/ zephyr,ipc;
-	};
-
-	soc {
-		/* Delete IPM Driver node nxp,imx-mu */
-		/delete-node/ mailbox@40c48000;
-
-		/* Attach MBOX driver to MU Unit */
-		mbox:mbox@40c48000 {
-			compatible = "nxp,mbox-imx-mu";
-			reg = <0x40c48000 0x4000>;
-			interrupts = <118 0>;
-			rx-channels = <4>;
-			#mbox-cells = <1>;
-			status = "okay";
-		};
-	};
-
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&mbox 3>, <&mbox 2>, <&mbox 1>, <&mbox 0>, <&mbox 2>,
-			 <&mbox 3>, <&mbox 0>, <&mbox 1>;
-		mbox-names = "tx0", "rx0", "tx1", "rx1", "tx2", "rx2", "tx3",
-			     "rx3";
-	};
-};
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
deleted file mode 100644
index 0dfb100ed7047..0000000000000
--- a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_MBOX_NXP_IMX_MU=y
-CONFIG_SECOND_CORE_MCUX=y
-CONFIG_INCLUDE_REMOTE_DIR=y
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
deleted file mode 100644
index ecec226423a83..0000000000000
--- a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2024 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
-		 * configured.
-		 */
-		/delete-property/ zephyr,ipc;
-	};
-
-	soc {
-		/* Delete IPM Driver node nxp,imx-mu */
-		/delete-node/ mailbox@40c48000;
-
-		/* Attach MBOX driver to MU Unit */
-		mbox:mbox@40c48000 {
-			compatible = "nxp,mbox-imx-mu";
-			reg = <0x40c48000 0x4000>;
-			interrupts = <118 0>;
-			rx-channels = <4>;
-			#mbox-cells = <1>;
-			status = "okay";
-		};
-	};
-
-	mbox-consumer {
-		compatible = "vnd,mbox-consumer";
-		mboxes = <&mbox 3>, <&mbox 2>, <&mbox 1>, <&mbox 0>, <&mbox 2>,
-			 <&mbox 3>, <&mbox 0>, <&mbox 1>;
-		mbox-names = "tx0", "rx0", "tx1", "rx1", "tx2", "rx2", "tx3",
-			     "rx3";
-	};
-};
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.conf b/tests/drivers/mbox/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
new file mode 100644
index 0000000000000..91e03e2e83ad3
--- /dev/null
+++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
@@ -0,0 +1,3 @@
+CONFIG_SECOND_CORE_MCUX=y
+CONFIG_INCLUDE_REMOTE_DIR=y
+CONFIG_MBOX_NXP_IMX_MU=y
diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
new file mode 100644
index 0000000000000..81461aa9857de
--- /dev/null
+++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1_a 3>, <&mbox1_a 2>, <&mbox1_a 1>, <&mbox1_a 0>,
+			<&mbox1_a 2>, <&mbox1_a 3>, <&mbox1_a 0>, <&mbox1_a 1>;
+		mbox-names = "tx0", "rx0", "tx1", "rx1", "tx2", "rx2", "tx3",
+			"rx3";
+	};
+};
diff --git a/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt b/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt
index d3d0991a65ca3..67c3064edbcdf 100644
--- a/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt
+++ b/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt
@@ -9,7 +9,8 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 if(CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM4 OR
    CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 OR
-   CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1)
+   CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1 OR
+   CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM7)
   message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample")
 else()
   message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample")
diff --git a/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay b/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
index a4ced8e5ec628..c38e2728d17b1 100644
--- a/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
+++ b/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay
@@ -6,7 +6,7 @@
 
 / {
 	chosen {
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
index ccf8543fa6722..49185a9b365fd 100644
--- a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
+++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
index ccf8543fa6722..49185a9b365fd 100644
--- a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
+++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
index ccf8543fa6722..49185a9b365fd 100644
--- a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
+++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay
@@ -10,7 +10,7 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 
-		/* Delete ipc chosen property where old IPM mailbox driver bellow is
+		/* Delete ipc chosen property where old IPM mailbox driver below is
 		 * configured.
 		 */
 		/delete-property/ zephyr,ipc;
diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
new file mode 100644
index 0000000000000..77adcfa24f4e2
--- /dev/null
+++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
@@ -0,0 +1,2 @@
+CONFIG_BUILD_OUTPUT_HEX=y
+CONFIG_SECOND_CORE_MCUX=y
diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
new file mode 100644
index 0000000000000..e7453ca6ea131
--- /dev/null
+++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1180_evk_mimxrt1189_cm7.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1_b 2>, <&mbox1_b 3>, <&mbox1_b 0>, <&mbox1_b 1>, <&mbox1_b 3>,
+			 <&mbox1_b 2>, <&mbox1_b 1>, <&mbox1_b 0>;
+		mbox-names = "tx0", "rx0", "tx1", "rx1", "tx2", "rx2", "tx3",
+			     "rx3";
+	};
+};
diff --git a/tests/drivers/mbox/mbox_data/sysbuild.cmake b/tests/drivers/mbox/mbox_data/sysbuild.cmake
index 0fb83fbadd3e2..4b68b671ccbb2 100644
--- a/tests/drivers/mbox/mbox_data/sysbuild.cmake
+++ b/tests/drivers/mbox/mbox_data/sysbuild.cmake
@@ -18,7 +18,8 @@ ExternalZephyrProject_Add(
 
 if(SB_CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
    SB_CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
-   SB_CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0)
+   SB_CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
+   SB_CONFIG_BOARD_MIMXRT1180_EVK_MIMXRT1189_CM33)
   # For these NXP boards the main core application is dependent on
   # 'zephyr_image_info.h' generated by remote application.
 
diff --git a/tests/drivers/mbox/mbox_data/testcase.yaml b/tests/drivers/mbox/mbox_data/testcase.yaml
index 0044581cdb8e9..f369a5dae61cd 100644
--- a/tests/drivers/mbox/mbox_data/testcase.yaml
+++ b/tests/drivers/mbox/mbox_data/testcase.yaml
@@ -4,11 +4,7 @@ tests:
       - drivers
       - mbox
     sysbuild: true
-    platform_allow:
-      - mimxrt1170_evk@B/mimxrt1176/cm7
-      - mimxrt1170_evk/mimxrt1176/cm7
-      - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69/lpc55s69/cpu0
+    filter: dt_compat_enabled("vnd,mbox-consumer")
     integration_platforms:
-      - mimxrt1170_evk@B/mimxrt1176/cm7
+      - mimxrt1170_evk/mimxrt1176/cm7
       - lpcxpresso55s69/lpc55s69/cpu0
diff --git a/tests/drivers/mbox/mbox_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/mbox/mbox_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..e9203a635a6a0
--- /dev/null
+++ b/tests/drivers/mbox/mbox_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+
+		mboxes = <&cpuapp_vevif_tx 21>, <&cpuapp_vevif_tx 32>,
+				 <&cpuapp_vevif_rx 20>, <&cpuapp_vevif_rx 32>;
+
+		mbox-names = "remote_valid", "remote_incorrect",
+					 "local_valid", "local_incorrect";
+
+	};
+};
+
+&cpuapp_vevif_rx {
+	status = "okay";
+};
+
+&cpuapp_vevif_tx {
+	status = "okay";
+};
diff --git a/tests/drivers/mbox/mbox_error_cases/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay b/tests/drivers/mbox/mbox_error_cases/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
new file mode 100644
index 0000000000000..d812e3a396717
--- /dev/null
+++ b/tests/drivers/mbox/mbox_error_cases/boards/rzg3s_smarc_r9a08g045s33gbg_cm33.overlay
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2024 Epam Systems
+ * Copyright (c) 2024-2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	/*
+	 * Allocating whole openamp region as reserved memory
+	 * to save MPU entries
+	 */
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		openamp_shm: memory-region@62F00000 {
+			compatible = "zephyr,memory-region";
+			reg = <0x62F00000 0x600000>;
+			zephyr,memory-region = "openamp_memory";
+			zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>;
+		};
+	};
+
+	mhu1_shm: memory@62F01008 {
+		compatible = "mmio-sram";
+		reg = <0x62F01008 0x8>;
+	};
+
+	mhu3_shm: memory@62F01018 {
+		compatible = "mmio-sram";
+		reg = <0x62F01018 0x8>;
+	};
+
+	mhu4_shm: memory@62F01020 {
+		compatible = "mmio-sram";
+		reg = <0x62F01020 0x8>;
+	};
+
+	mhu5_shm: memory@62F01028 {
+		compatible = "mmio-sram";
+		reg = <0x62F01028 0x8>;
+	};
+
+	mbox-consumer {
+		compatible = "vnd,mbox-consumer";
+		mboxes = <&mbox1 1>, <&mbox1 4>, <&mbox3 0>, <&mbox3 3>;
+		mbox-names = "remote_valid", "remote_incorrect", "local_valid", "local_incorrect";
+	};
+
+};
+
+&mbox1 {
+	shared-memory = <&mhu1_shm>;
+	status = "okay";
+};
+
+&mbox3 {
+	shared-memory = <&mhu3_shm>;
+	status = "okay";
+};
diff --git a/tests/drivers/mbox/mbox_error_cases/sample.yaml b/tests/drivers/mbox/mbox_error_cases/sample.yaml
index f8d9937d0cff7..2746a1c290447 100644
--- a/tests/drivers/mbox/mbox_error_cases/sample.yaml
+++ b/tests/drivers/mbox/mbox_error_cases/sample.yaml
@@ -17,6 +17,8 @@ tests:
   tests.drivers.mbox_error_cases.nrf54l:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_args: SNIPPET=nordic-flpr
diff --git a/tests/drivers/modem/modem_socket/testcase.yaml b/tests/drivers/modem/modem_socket/testcase.yaml
index 2224b2cabb874..be62cfd0152ab 100644
--- a/tests/drivers/modem/modem_socket/testcase.yaml
+++ b/tests/drivers/modem/modem_socket/testcase.yaml
@@ -4,7 +4,6 @@ tests:
       - drivers
       - modem
     platform_allow:
-      - native_posix
       - native_sim
     integration_platforms:
       - native_sim
diff --git a/tests/drivers/pinctrl/nrf/testcase.yaml b/tests/drivers/pinctrl/nrf/testcase.yaml
index 252fdd2475862..d6e32d4a6b176 100644
--- a/tests/drivers/pinctrl/nrf/testcase.yaml
+++ b/tests/drivers/pinctrl/nrf/testcase.yaml
@@ -3,6 +3,9 @@ tests:
     tags:
       - drivers
       - pinctrl
-    depends_on:
-      - pinctrl
-      - nrf
+    vendor_allow:
+      - nordic
+    platform_exclude:
+      - thingy53/nrf5340/cpunet
+    integration_platforms:
+      - qemu_cortex_m0/nrf51822
diff --git a/tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc.overlay b/tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc_hpcore.overlay
similarity index 100%
rename from tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc.overlay
rename to tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc_hpcore.overlay
diff --git a/tests/drivers/pwm/pwm_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/pwm/pwm_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
deleted file mode 100644
index 6d9ec96d77d0b..0000000000000
--- a/tests/drivers/pwm/pwm_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ /dev/null
@@ -1,20 +0,0 @@
-&pinctrl {
-	pwm_default: pwm_default {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 0)>;
-		};
-	};
-	pwm_sleep: pwm_sleep {
-		group1 {
-			psels = <NRF_PSEL(PWM_OUT0, 1, 0)>;
-			low-power-enable;
-		};
-	};
-};
-
-&pwm20 {
-	status = "okay";
-	pinctrl-0 = <&pwm_default>;
-	pinctrl-1 = <&pwm_sleep>;
-	pinctrl-names = "default", "sleep";
-};
diff --git a/tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay b/tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay
new file mode 100644
index 0000000000000..e2bf3f35472f1
--- /dev/null
+++ b/tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+
+/ {
+	aliases {
+		pwm-0 = &pwm;
+	};
+};
+
+&pinctrl0 {
+	pwm_ch: pwm_ch {
+		group1 {
+			pinmux = <PWM_0H_PA7>; /* GPIO_7 P20 */
+		};
+	};
+};
+
+&pwm {
+	pinctrl-0 = <&pwm_ch>;
+	pinctrl-names = "default";
+	pwm_channel1: pwm_channel1 {
+		pwms = <&pwm 0 1000000>;
+	};
+	silabs,pwm_polarity = <PWM_POLARITY_NORMAL>;
+	status = "okay";
+};
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
new file mode 100644
index 0000000000000..795414a504ab4
--- /dev/null
+++ b/tests/drivers/pwm/pwm_gpio_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_EDGE_NUM=4
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.conf b/tests/drivers/pwm/pwm_gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.conf
new file mode 100644
index 0000000000000..795414a504ab4
--- /dev/null
+++ b/tests/drivers/pwm/pwm_gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_SKIP_EDGE_NUM=4
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/pwm/pwm_gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..4d4e96aeacbf7
--- /dev/null
+++ b/tests/drivers/pwm/pwm_gpio_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Test requires jumper between:
+ *  - PWM20 OUT[0] at P1.10 <-> GPIO input at P1.11
+ */
+
+/ {
+	zephyr,user {
+		pwms = <&pwm20 0 160000 PWM_POLARITY_NORMAL>;
+		gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+	};
+};
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6.overlay b/tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6_hpcore.overlay
similarity index 100%
rename from tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6.overlay
rename to tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6_hpcore.overlay
diff --git a/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml b/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml
index 1cc0dd5b7971e..52a98cb14b0b1 100644
--- a/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml
+++ b/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml
@@ -12,7 +12,7 @@ tests:
       - esp32_devkitc_wrover/esp32/procpu
       - esp8684_devkitm
       - esp32c3_devkitm
-      - esp32c6_devkitc
+      - esp32c6_devkitc/esp32c6/hpcore
       - esp32s2_saola
       - esp32s3_devkitm/esp32s3/procpu
 
@@ -20,3 +20,4 @@ tests:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/tests/drivers/pwm/pwm_loopback/boards/arduino_uno_r4.overlay b/tests/drivers/pwm/pwm_loopback/boards/arduino_uno_r4.overlay
new file mode 100644
index 0000000000000..23b8bea7e5c0e
--- /dev/null
+++ b/tests/drivers/pwm/pwm_loopback/boards/arduino_uno_r4.overlay
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	pwm_loopback_0 {
+		compatible = "test-pwm-loopback";
+		/* first index must be a 32-Bit timer */
+		pwms = <&pwm0 0 0 PWM_POLARITY_NORMAL>,
+			<&pwm7 0 0 PWM_POLARITY_NORMAL>;
+	};
+};
+
+&pinctrl {
+	pwm0_default: pwm0_default {
+		group1 {
+			/* GTIOC0A */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 7)>;
+		};
+	};
+};
+
+&pwm0 {
+	pinctrl-0 = <&pwm0_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+};
diff --git a/tests/drivers/pwm/pwm_loopback/boards/ek_ra4l1.overlay b/tests/drivers/pwm/pwm_loopback/boards/ek_ra4l1.overlay
new file mode 100644
index 0000000000000..4c16fb9739065
--- /dev/null
+++ b/tests/drivers/pwm/pwm_loopback/boards/ek_ra4l1.overlay
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	pwm_loopback_0 {
+		compatible = "test-pwm-loopback";
+		/* first index must be a 32-Bit timer */
+		pwms = <&pwm1 0 0 PWM_POLARITY_NORMAL>,
+			<&pwm4 0 0 PWM_POLARITY_NORMAL>;
+	};
+};
+
+&pinctrl {
+	pwm4_default: pwm4_default {
+		group1 {
+			/* GTIOC4A*/
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 15)>;
+		};
+	};
+};
+
+&pwm4 {
+	pinctrl-0 = <&pwm4_default>;
+	pinctrl-names = "default";
+	interrupts = <63 1>, <62 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+};
diff --git a/tests/drivers/pwm/pwm_loopback/boards/ek_ra4m1.overlay b/tests/drivers/pwm/pwm_loopback/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..556410c2aef6a
--- /dev/null
+++ b/tests/drivers/pwm/pwm_loopback/boards/ek_ra4m1.overlay
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/pwm/ra_pwm.h>
+
+/ {
+	pwm_loopback_0 {
+		compatible = "test-pwm-loopback";
+		/* first index must be a 32-Bit timer */
+		pwms = <&pwm1 0 0 PWM_POLARITY_NORMAL>,
+			<&pwm3 0 0 PWM_POLARITY_NORMAL>;
+	};
+};
+
+&pinctrl {
+	pwm3_default: pwm3_default {
+		group1 {
+			/* GTIOC3A */
+			psels = <RA_PSEL(RA_PSEL_GPT1, 1, 11)>;
+		};
+	};
+};
+
+&pwm3 {
+	pinctrl-0 = <&pwm3_default>;
+	pinctrl-names = "default";
+	interrupts = <30 1>, <31 1>;
+	interrupt-names = "gtioca", "overflow";
+	status = "okay";
+};
diff --git a/tests/drivers/pwm/pwm_loopback/boards/ek_ra6m3.overlay b/tests/drivers/pwm/pwm_loopback/boards/ek_ra6m3.overlay
index 077b7bdd4062f..bb7ed90c9e071 100644
--- a/tests/drivers/pwm/pwm_loopback/boards/ek_ra6m3.overlay
+++ b/tests/drivers/pwm/pwm_loopback/boards/ek_ra6m3.overlay
@@ -11,7 +11,7 @@
 	pwm_loopback_0 {
 		compatible = "test-pwm-loopback";
 		/* first index must be a 32-Bit timer */
-		pwms = <&pwm1 0 0 PWM_POLARITY_NORMAL>,
+		pwms = <&pwm0 0 0 PWM_POLARITY_NORMAL>,
 			<&pwm4 0 0 PWM_POLARITY_NORMAL>;
 	};
 };
diff --git a/tests/drivers/pwm/pwm_loopback/boards/nucleo_wba52cg.overlay b/tests/drivers/pwm/pwm_loopback/boards/nucleo_wba55cg.overlay
similarity index 100%
rename from tests/drivers/pwm/pwm_loopback/boards/nucleo_wba52cg.overlay
rename to tests/drivers/pwm/pwm_loopback/boards/nucleo_wba55cg.overlay
diff --git a/tests/drivers/pwm/pwm_loopback/socs/esp32c6.overlay b/tests/drivers/pwm/pwm_loopback/socs/esp32c6_hpcore.overlay
similarity index 100%
rename from tests/drivers/pwm/pwm_loopback/socs/esp32c6.overlay
rename to tests/drivers/pwm/pwm_loopback/socs/esp32c6_hpcore.overlay
diff --git a/tests/drivers/regulator/api/src/main.c b/tests/drivers/regulator/api/src/main.c
index 3dbc0bd77ae2e..c5a552907ea1b 100644
--- a/tests/drivers/regulator/api/src/main.c
+++ b/tests/drivers/regulator/api/src/main.c
@@ -420,6 +420,81 @@ ZTEST(regulator_api, test_get_voltage_error)
 	zassert_equal(regulator_fake_get_voltage_fake.arg1_val, NULL);
 }
 
+ZTEST(regulator_api, test_count_current_limits_not_implemented)
+{
+	unsigned int ret = regulator_count_current_limits(dummy_reg);
+
+	zassert_equal(ret, 0);
+}
+
+ZTEST(regulator_api, test_count_current_limits_ok)
+{
+	RESET_FAKE(regulator_fake_count_current_limits);
+
+	regulator_fake_count_current_limits_fake.return_val = 10;
+
+	zassert_equal(regulator_count_current_limits(reg0), 10U);
+	zassert_equal(regulator_fake_count_current_limits_fake.arg0_val, reg0);
+	zassert_equal(regulator_fake_count_current_limits_fake.call_count, 1U);
+}
+
+ZTEST(regulator_api, test_count_current_limits_fail)
+{
+	RESET_FAKE(regulator_fake_count_current_limits);
+
+	regulator_fake_count_current_limits_fake.return_val = -EINVAL;
+
+	zassert_equal(regulator_count_current_limits(reg0), -EINVAL);
+	zassert_equal(regulator_fake_count_current_limits_fake.arg0_val, reg0);
+	zassert_equal(regulator_fake_count_current_limits_fake.call_count, 1U);
+}
+
+ZTEST(regulator_api, test_list_current_limit_not_implemented)
+{
+	zassert_equal(regulator_list_current_limit(dummy_reg, 0, NULL), -EINVAL);
+}
+
+static int list_current_limit_ok(const struct device *dev, unsigned int idx, int32_t *curr_ua)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(idx);
+
+	*curr_ua = 100;
+
+	return 0;
+}
+
+ZTEST(regulator_api, test_list_current_limit_ok)
+{
+	RESET_FAKE(regulator_fake_list_current_limit);
+
+	int32_t curr_ua;
+
+	regulator_fake_list_current_limit_fake.custom_fake = list_current_limit_ok;
+
+	zassert_equal(regulator_list_current_limit(reg0, 1, &curr_ua), 0);
+	zassert_equal(curr_ua, 100);
+	zassert_equal(regulator_fake_list_current_limit_fake.arg0_val, reg0);
+	zassert_equal(regulator_fake_list_current_limit_fake.arg1_val, 1U);
+	zassert_equal(regulator_fake_list_current_limit_fake.arg2_val, &curr_ua);
+	zassert_equal(regulator_fake_list_current_limit_fake.call_count, 1U);
+}
+
+ZTEST(regulator_api, test_list_current_limit_fail)
+{
+	RESET_FAKE(regulator_fake_list_current_limit);
+
+	int32_t curr_ua;
+
+	regulator_fake_list_current_limit_fake.return_val = -EIO;
+
+	zassert_equal(regulator_list_current_limit(reg0, 1, &curr_ua), -EIO);
+	zassert_equal(regulator_fake_list_current_limit_fake.arg0_val, reg0);
+	zassert_equal(regulator_fake_list_current_limit_fake.arg1_val, 1U);
+	zassert_equal(regulator_fake_list_current_limit_fake.arg2_val, &curr_ua);
+	zassert_equal(regulator_fake_list_current_limit_fake.call_count, 1U);
+}
+
 ZTEST(regulator_api, test_set_current_limit_not_implemented)
 {
 	int ret = regulator_set_current_limit(dummy_reg, 0, 0);
diff --git a/tests/drivers/reset/mmio/CMakeLists.txt b/tests/drivers/reset/mmio/CMakeLists.txt
new file mode 100644
index 0000000000000..b012e9582d315
--- /dev/null
+++ b/tests/drivers/reset/mmio/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Google LLC
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(reset_mmio)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/drivers/reset/mmio/boards/qemu_cortex_m3.overlay b/tests/drivers/reset/mmio/boards/qemu_cortex_m3.overlay
new file mode 100644
index 0000000000000..04be3315bd2d4
--- /dev/null
+++ b/tests/drivers/reset/mmio/boards/qemu_cortex_m3.overlay
@@ -0,0 +1,14 @@
+/ {
+	reset0: reset@20000004 {
+		compatible = "reset-mmio";
+		reg = <0x20000004 0x4>;
+		num-resets = <16>;
+	};
+
+	reset1: reset@20000008 {
+		compatible = "reset-mmio";
+		reg = <0x20000008 0x4>;
+		num-resets = <16>;
+		active-low;
+	};
+};
diff --git a/tests/drivers/reset/mmio/prj.conf b/tests/drivers/reset/mmio/prj.conf
new file mode 100644
index 0000000000000..4a544c4c66225
--- /dev/null
+++ b/tests/drivers/reset/mmio/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_ZTEST=y
+CONFIG_RESET=y
+CONFIG_RESET_MMIO=y
diff --git a/tests/drivers/reset/mmio/src/main.c b/tests/drivers/reset/mmio/src/main.c
new file mode 100644
index 0000000000000..29df00f0abf64
--- /dev/null
+++ b/tests/drivers/reset/mmio/src/main.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2025 Google LLC.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/reset.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+ZTEST_SUITE(reset_mmio_tests, NULL, NULL, NULL, NULL, NULL);
+
+#define RESET_MAX_NUM 16
+
+void check_status(const struct device *dev, uint32_t base, uint32_t id, bool expected_state,
+		  bool active_low)
+{
+	uint8_t actual_state;
+
+	zassert_ok(reset_status(dev, id, &actual_state), "Failed getting reset state");
+	zassert_equal(actual_state, expected_state,
+		      "reset state %u doesn't match expected state %u", actual_state,
+		      expected_state);
+	zassert_equal(FIELD_GET(BIT(id), sys_read32(base)), active_low ^ expected_state);
+}
+
+/* Tests that the reset driver assert functionality is correct for active
+ * low devices.
+ */
+ZTEST(reset_mmio_tests, test_reset_mmio_assert_active_low)
+{
+	const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(reset1));
+	uint32_t base = DT_REG_ADDR(DT_NODELABEL(reset1));
+	bool active_low = true;
+	uint8_t i;
+
+	for (i = 0; i < RESET_MAX_NUM; i++) {
+		reset_line_deassert(dev, i);
+		check_status(dev, base, i, false, active_low);
+		/* Check idempotency */
+		reset_line_deassert(dev, i);
+		check_status(dev, base, i, false, active_low);
+
+		/* Check ressserting resets */
+		reset_line_assert(dev, i);
+		check_status(dev, base, i, true, active_low);
+		/* Check idempotency */
+		reset_line_assert(dev, i);
+		check_status(dev, base, i, true, active_low);
+	}
+}
+
+/* Tests that the reset driver assert functionality is correct for active
+ * high devices.
+ */
+ZTEST(reset_mmio_tests, test_reset_mmio_assert_active_high)
+{
+	const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(reset0));
+	uint32_t base = DT_REG_ADDR(DT_NODELABEL(reset0));
+	bool active_low = false;
+	uint8_t i;
+
+	for (i = 0; i < RESET_MAX_NUM; i++) {
+		reset_line_deassert(dev, i);
+		check_status(dev, base, i, false, active_low);
+		/* Check idempotency */
+		reset_line_deassert(dev, i);
+		check_status(dev, base, i, false, active_low);
+
+		/* Check ressserting resets */
+		reset_line_assert(dev, i);
+		check_status(dev, base, i, true, active_low);
+		/* Check idempotency */
+		reset_line_assert(dev, i);
+		check_status(dev, base, i, true, active_low);
+	}
+}
+
+/* Tests that the reset driver toggle functionality is correct for active
+ * low devices
+ */
+ZTEST(reset_mmio_tests, test_reset_mmio_toggle_active_low)
+{
+	const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(reset1));
+	uint32_t base = DT_REG_ADDR(DT_NODELABEL(reset1));
+	bool active_low = true;
+	uint8_t i;
+
+	for (i = 0; i < RESET_MAX_NUM; i++) {
+		/* Begin by making sure the reset is asserted */
+		reset_line_assert(dev, i);
+		check_status(dev, base, i, true, active_low);
+		reset_line_toggle(dev, i);
+		check_status(dev, base, i, false, active_low);
+		reset_line_toggle(dev, i);
+		check_status(dev, base, i, true, active_low);
+	}
+}
+
+/* Tests that the reset driver toggle functionality is correct for active
+ * high devices
+ */
+ZTEST(reset_mmio_tests, test_reset_mmio_toggle_active_high)
+{
+	const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(reset0));
+	uint32_t base = DT_REG_ADDR(DT_NODELABEL(reset0));
+	bool active_low = false;
+	uint8_t i;
+
+	for (i = 0; i < RESET_MAX_NUM; i++) {
+		/* Begin by making sure the reset is asserted */
+		reset_line_assert(dev, i);
+		check_status(dev, base, i, true, active_low);
+		reset_line_toggle(dev, i);
+		check_status(dev, base, i, false, active_low);
+		reset_line_toggle(dev, i);
+		check_status(dev, base, i, true, active_low);
+	}
+}
+
+/* Tests that the reset driver rejects out of bounds bits */
+ZTEST(reset_mmio_tests, test_reset_mmio_oob)
+{
+	const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(reset0));
+	uint8_t i, status;
+
+	for (i = RESET_MAX_NUM; i < 32; i++) {
+		zassert_not_ok(reset_line_assert(dev, i));
+		zassert_not_ok(reset_line_deassert(dev, i));
+		zassert_not_ok(reset_status(dev, i, &status));
+		zassert_not_ok(reset_line_toggle(dev, i));
+	}
+}
diff --git a/tests/drivers/reset/mmio/testcase.yaml b/tests/drivers/reset/mmio/testcase.yaml
new file mode 100644
index 0000000000000..6dbc4de530aa6
--- /dev/null
+++ b/tests/drivers/reset/mmio/testcase.yaml
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Google LLC
+# SPDX-License-Identifier: Apache-2.0
+
+tests:
+  drivers.reset.mmio:
+    platform_allow:
+      - qemu_cortex_m3
diff --git a/tests/drivers/retained_mem/api/boards/ophelia4ev_nrf54l15_cpuapp.conf b/tests/drivers/retained_mem/api/boards/ophelia4ev_nrf54l15_cpuapp.conf
new file mode 100644
index 0000000000000..c15ba3ed96daf
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/ophelia4ev_nrf54l15_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_POWEROFF=y
diff --git a/tests/drivers/retained_mem/api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/retained_mem/api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..e304ecbbfb13b
--- /dev/null
+++ b/tests/drivers/retained_mem/api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,22 @@
+/ {
+	cpuapp_sram@2002e000 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x2002e000 DT_SIZE_K(4)>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem0: retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+		};
+	};
+
+	aliases {
+		retainedmemtestdevice = &retainedmem0;
+	};
+};
+
+&cpuapp_sram {
+	reg = <0x20000000 DT_SIZE_K(184)>;
+	ranges = <0x0 0x20000000 0x2e000>;
+};
diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml
index 2ad60f6e3b4b1..7852742241b48 100644
--- a/tests/drivers/retained_mem/api/testcase.yaml
+++ b/tests/drivers/retained_mem/api/testcase.yaml
@@ -15,6 +15,7 @@ tests:
       - nrf54l15dk/nrf54l10/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - qemu_cortex_m3
     tags:
diff --git a/tests/drivers/rtc/rtc_api/boards/nucleo_wba52cg.conf b/tests/drivers/rtc/rtc_api/boards/nucleo_wba52cg.conf
deleted file mode 100644
index 8c6c114ee41fa..0000000000000
--- a/tests/drivers/rtc/rtc_api/boards/nucleo_wba52cg.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_RTC_CALIBRATION=y
-CONFIG_RTC_ALARM=y
diff --git a/tests/drivers/rtc/rtc_api/boards/nucleo_wba52cg.overlay b/tests/drivers/rtc/rtc_api/boards/nucleo_wba52cg.overlay
deleted file mode 100644
index bd861fccf4292..0000000000000
--- a/tests/drivers/rtc/rtc_api/boards/nucleo_wba52cg.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2024 STMicroelectronics
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	aliases {
-		rtc = &rtc;
-	};
-};
diff --git a/tests/drivers/rtc/rtc_api/boards/rts5912_evb.overlay b/tests/drivers/rtc/rtc_api/boards/rts5912_evb.overlay
new file mode 100644
index 0000000000000..bc5619eddec10
--- /dev/null
+++ b/tests/drivers/rtc/rtc_api/boards/rts5912_evb.overlay
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2025 Realtek Semiconductor Corporation, SIBG-SD7
+ *
+ */
+
+/ {
+	aliases {
+		rtc = &rtc;
+	};
+};
+
+&rtc {
+	status = "okay";
+};
diff --git a/tests/drivers/sensor/temp_sensor/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/sensor/temp_sensor/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..435e4f4a6ccf8
--- /dev/null
+++ b/tests/drivers/sensor/temp_sensor/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,3 @@
+temp_sensor: &temp {
+	status = "okay";
+};
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
index 8ce5342be23dd..18531a8faf6b7 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay
@@ -65,4 +65,5 @@ dut_spis: &spi1 {
 	pinctrl-0 = <&spi1_default_alt>;
 	pinctrl-1 = <&spi1_sleep_alt>;
 	pinctrl-names = "default", "sleep";
+	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
index d431933ab5a75..46680e31bf0b1 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi
@@ -77,4 +77,5 @@ dut_spis: &spi131 {
 	pinctrl-names = "default", "sleep";
 	/delete-property/rx-delay-supported;
 	/delete-property/rx-delay;
+	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index 798d28b8ab9cb..f145a10bb67af 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -77,4 +77,5 @@ dut_spis: &spi131 {
 	memory-regions = <&cpuapp_dma_region>;
 	/delete-property/rx-delay-supported;
 	/delete-property/rx-delay;
+	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
new file mode 100644
index 0000000000000..8a5728e291eb6
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spis120_default_alt: spis120_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 6, 0)>,
+				<NRF_PSEL(SPIS_MISO, 6, 3)>,
+				<NRF_PSEL(SPIS_MOSI, 6, 4)>,
+				<NRF_PSEL(SPIS_CSN, 6, 9)>;
+		};
+	};
+
+	spis120_sleep_alt: spis120_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 6, 0)>,
+				<NRF_PSEL(SPIS_MISO, 6, 3)>,
+				<NRF_PSEL(SPIS_MOSI, 6, 4)>,
+				<NRF_PSEL(SPIS_CSN, 6, 9)>;
+			low-power-enable;
+		};
+	};
+
+	spi120_default_alt: spi120_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 3)>,
+				<NRF_PSEL(SPIM_MISO, 7, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 7)>;
+		};
+	};
+
+	spi120_sleep_alt: spi120_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 3)>,
+				<NRF_PSEL(SPIM_MISO, 7, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 7)>;
+			low-power-enable;
+		};
+	};
+
+	spi121_default_alt: spi121_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 2)>,
+				<NRF_PSEL(SPIM_MISO, 7, 0)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 1)>;
+		};
+	};
+
+	spi121_sleep_alt: spi121_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 7, 2)>,
+				<NRF_PSEL(SPIM_MISO, 7, 0)>,
+				<NRF_PSEL(SPIM_MOSI, 7, 1)>;
+			low-power-enable;
+		};
+	};
+
+	spis131_default_alt: spis131_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 0)>,
+				<NRF_PSEL(SPIS_MISO, 1, 9)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 5)>,
+				<NRF_PSEL(SPIS_CSN, 0, 11)>;
+		};
+	};
+
+	spis131_sleep_alt: spis131_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 0)>,
+				<NRF_PSEL(SPIS_MISO, 1, 9)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 5)>,
+				<NRF_PSEL(SPIS_CSN, 0, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+&exmif{
+	status = "disabled";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&dma_fast_region {
+	status = "okay";
+};
+
+&spis120 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spis120_default_alt>;
+	pinctrl-1 = <&spis120_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&dma_fast_region>;
+};
+
+&spi120 {
+	compatible = "nordic,nrf-spim";
+	status = "okay";
+	pinctrl-0 = <&spi120_default_alt>;
+	pinctrl-1 = <&spi120_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	memory-regions = <&dma_fast_region>;
+	cs-gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
+	dut_spi_dt: test-spi-dev@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+	};
+};
+
+&spi121 {
+	compatible = "nordic,nrf-spim";
+	status = "okay";
+	pinctrl-0 = <&spi121_default_alt>;
+	pinctrl-1 = <&spi121_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	memory-regions = <&dma_fast_region>;
+	cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
+};
+
+dut_spis: &spi131 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spis131_default_alt>;
+	pinctrl-1 = <&spis131_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	memory-regions = <&cpuapp_dma_region>;
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+};
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 0188a2c4e24dc..e1b2683293260 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -71,4 +71,5 @@ dut_spis: &spi21 {
 	pinctrl-names = "default", "sleep";
 	/delete-property/rx-delay-supported;
 	/delete-property/rx-delay;
+	zephyr,pm-device-runtime-auto;
 };
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..fe004aa769599
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi22_default_alt: spi22_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
+		};
+	};
+
+	spi22_sleep_alt: spi22_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
+			low-power-enable;
+		};
+	};
+
+	spi21_default_alt: spi21_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
+		};
+	};
+
+	spi21_sleep_alt: spi21_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
+			low-power-enable;
+		};
+	};
+
+};
+
+
+&gpio1 {
+	status = "okay";
+};
+
+&spi22 {
+	status = "okay";
+	pinctrl-0 = <&spi22_default_alt>;
+	pinctrl-1 = <&spi22_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	cs-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
+	dut_spi_dt: test-spi-dev@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(16)>;
+	};
+};
+
+dut_spis: &spi21 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spi21_default_alt>;
+	pinctrl-1 = <&spi21_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+};
+
+&uicr {
+	nfct-pins-as-gpios;
+};
diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..5b3a64e7fbc47
--- /dev/null
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi22_default_alt: spi22_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+				<NRF_PSEL(SPIM_MISO, 1, 11)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+		};
+	};
+
+	spi22_sleep_alt: spi22_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+				<NRF_PSEL(SPIM_MISO, 1, 11)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+			low-power-enable;
+		};
+	};
+
+	spi21_default_alt: spi21_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
+				<NRF_PSEL(SPIS_MISO, 1, 10)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
+				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+		};
+	};
+
+	spi21_sleep_alt: spi21_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
+				<NRF_PSEL(SPIS_MISO, 1, 10)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
+				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+			low-power-enable;
+		};
+	};
+
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&spi22 {
+	status = "okay";
+	pinctrl-0 = <&spi22_default_alt>;
+	pinctrl-1 = <&spi22_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
+	zephyr,pm-device-runtime-auto;
+
+	dut_spi_dt: test-spi-dev@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(16)>;
+	};
+};
+
+dut_spis: &spi21 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spi21_default_alt>;
+	pinctrl-1 = <&spi21_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+	zephyr,pm-device-runtime-auto;
+};
diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
index e592664daceec..c06c1c077fe98 100644
--- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
+++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml
@@ -9,9 +9,11 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54l20pdk/nrf54l20/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad
     - nrf54h20dk/nrf54h20/cpuppr
+    - ophelia4ev/nrf54l15/cpuapp
 
 tests:
   drivers.spi.spi_mode0:
@@ -63,6 +65,21 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54h20dk/nrf54h20/cpuppr
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+
+  drivers.spi.spis_fast:
+    # SPIS120 instance occupies P6 which is not available on nRF54H20 DK pin headers
+    # It is added only to check the compilation.
+    build_only: true
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay"
+    platform_exclude:
+      - nrf52840dk/nrf52840
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
+      - nrf54h20dk/nrf54h20/cpuppr
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
 
   drivers.spi.pm_runtime:
     extra_configs:
diff --git a/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index c53893fd30f88..c723ff2cbd27d 100644
--- a/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_error_cases/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -7,43 +7,44 @@
 &pinctrl {
 	spi22_default_alt: spi22_default_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
-				<NRF_PSEL(SPIM_MISO, 1, 11)>,
-				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
 		};
 	};
 
 	spi22_sleep_alt: spi22_sleep_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
-				<NRF_PSEL(SPIM_MISO, 1, 11)>,
-				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+			psels = <NRF_PSEL(SPIM_SCK, 1, 9)>,
+				<NRF_PSEL(SPIM_MISO, 1, 10)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 2)>;
 			low-power-enable;
 		};
 	};
 
 	spi21_default_alt: spi21_default_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
-				<NRF_PSEL(SPIS_MISO, 1, 10)>,
-				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
-				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
 		};
 	};
 
 	spi21_sleep_alt: spi21_sleep_alt {
 		group1 {
-			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
-				<NRF_PSEL(SPIS_MISO, 1, 10)>,
-				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
-				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+			psels = <NRF_PSEL(SPIS_SCK, 1, 8)>,
+				<NRF_PSEL(SPIS_MISO, 1, 11)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 3)>,
+				<NRF_PSEL(SPIS_CSN, 1, 1)>;
 			low-power-enable;
 		};
 	};
 
 };
 
-&gpio2 {
+
+&gpio1 {
 	status = "okay";
 };
 
@@ -53,7 +54,7 @@
 	pinctrl-1 = <&spi22_sleep_alt>;
 	pinctrl-names = "default", "sleep";
 	overrun-character = <0x00>;
-	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
+	cs-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
@@ -71,3 +72,7 @@ dut_spis: &spi21 {
 	/delete-property/rx-delay-supported;
 	/delete-property/rx-delay;
 };
+
+&uicr {
+	nfct-pins-as-gpios;
+};
diff --git a/tests/drivers/spi/spi_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..6e272f3f2db2d
--- /dev/null
+++ b/tests/drivers/spi/spi_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi22_default_alt: spi22_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+				<NRF_PSEL(SPIM_MISO, 1, 11)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+		};
+	};
+
+	spi22_sleep_alt: spi22_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+				<NRF_PSEL(SPIM_MISO, 1, 11)>,
+				<NRF_PSEL(SPIM_MOSI, 1, 9)>;
+			low-power-enable;
+		};
+	};
+
+	spi21_default_alt: spi21_default_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
+				<NRF_PSEL(SPIS_MISO, 1, 10)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
+				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+		};
+	};
+
+	spi21_sleep_alt: spi21_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(SPIS_SCK, 1, 12)>,
+				<NRF_PSEL(SPIS_MISO, 1, 10)>,
+				<NRF_PSEL(SPIS_MOSI, 1, 8)>,
+				<NRF_PSEL(SPIS_CSN, 1, 14)>;
+			low-power-enable;
+		};
+	};
+
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&spi22 {
+	status = "okay";
+	pinctrl-0 = <&spi22_default_alt>;
+	pinctrl-1 = <&spi22_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	overrun-character = <0x00>;
+	cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
+
+	dut_spi_dt: test-spi-dev@0 {
+		compatible = "vnd,spi-device";
+		reg = <0>;
+		spi-max-frequency = <4000000>;
+	};
+};
+
+dut_spis: &spi21 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+	pinctrl-0 = <&spi21_default_alt>;
+	pinctrl-1 = <&spi21_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	/delete-property/rx-delay-supported;
+	/delete-property/rx-delay;
+};
diff --git a/tests/drivers/spi/spi_error_cases/testcase.yaml b/tests/drivers/spi/spi_error_cases/testcase.yaml
index 366b736d8fb10..2f097fb072c80 100644
--- a/tests/drivers/spi/spi_error_cases/testcase.yaml
+++ b/tests/drivers/spi/spi_error_cases/testcase.yaml
@@ -13,6 +13,7 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf52840dk/nrf52840
   drivers.spi.spi_error_cases.fast:
diff --git a/tests/drivers/spi/spi_loopback/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay b/tests/drivers/spi/spi_loopback/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
new file mode 100644
index 0000000000000..a33d92098d781
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/arduino_uno_r4_r7fa4m1ab3cfm_minima.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&spi1 {
+	rx-dtc;
+	tx-dtc;
+
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <2000000>;
+	};
+
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <3000000>;
+	};
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay b/tests/drivers/spi/spi_loopback/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
new file mode 100644
index 0000000000000..5d71279712644
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/arduino_uno_r4_r7fa4m1ab3cfm_wifi.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&spi0 {
+	rx-dtc;
+	tx-dtc;
+
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <2000000>;
+	};
+
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <3000000>;
+	};
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/ek_ra4l1.conf b/tests/drivers/spi/spi_loopback/boards/ek_ra4l1.conf
new file mode 100644
index 0000000000000..a231e084368be
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/ek_ra4l1.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI_LOOPBACK_MODE_LOOP=y
+CONFIG_SPI_INTERRUPT=y
+CONFIG_SPI_RA_DTC=y
diff --git a/tests/drivers/spi/spi_loopback/boards/ek_ra4l1.overlay b/tests/drivers/spi/spi_loopback/boards/ek_ra4l1.overlay
new file mode 100644
index 0000000000000..59314554dc355
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/ek_ra4l1.overlay
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&spi0 {
+	rx-dtc;
+	tx-dtc;
+
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <2000000>;
+	};
+
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <3000000>;
+	};
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/ek_ra4m1.conf b/tests/drivers/spi/spi_loopback/boards/ek_ra4m1.conf
new file mode 100644
index 0000000000000..a231e084368be
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/ek_ra4m1.conf
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Renesas Electronics Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI_LOOPBACK_MODE_LOOP=y
+CONFIG_SPI_INTERRUPT=y
+CONFIG_SPI_RA_DTC=y
diff --git a/tests/drivers/spi/spi_loopback/boards/ek_ra4m1.overlay b/tests/drivers/spi/spi_loopback/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..0ae7478a32701
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/ek_ra4m1.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&spi1 {
+	rx-dtc;
+	tx-dtc;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <2000000>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <3000000>;
+	};
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z.conf b/tests/drivers/spi/spi_loopback/boards/frdm_ke17z.conf
deleted file mode 100644
index 5014becf5b01d..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z.overlay b/tests/drivers/spi/spi_loopback/boards/frdm_ke17z.overlay
index a28ed492be7da..bbeaec85d6ec7 100644
--- a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/frdm_ke17z.overlay
@@ -9,14 +9,14 @@
  */
 
 &lpspi0 {
-	slow@0 {
+	slow@1 {
 		compatible = "test-spi-loopback-slow";
-		reg = <0>;
+		reg = <1>;
 		spi-max-frequency = <500000>;
 	};
-	fast@0 {
+	fast@1 {
 		compatible = "test-spi-loopback-fast";
-		reg = <0>;
+		reg = <1>;
 		spi-max-frequency = <16000000>;
 	};
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z512.conf b/tests/drivers/spi/spi_loopback/boards/frdm_ke17z512.conf
deleted file mode 100644
index 5014becf5b01d..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z512.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z512.overlay b/tests/drivers/spi/spi_loopback/boards/frdm_ke17z512.overlay
index a28ed492be7da..62bdac8b3bc19 100644
--- a/tests/drivers/spi/spi_loopback/boards/frdm_ke17z512.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/frdm_ke17z512.overlay
@@ -9,14 +9,14 @@
  */
 
 &lpspi0 {
-	slow@0 {
+	slow@2 {
 		compatible = "test-spi-loopback-slow";
-		reg = <0>;
+		reg = <2>;
 		spi-max-frequency = <500000>;
 	};
-	fast@0 {
+	fast@2 {
 		compatible = "test-spi-loopback-fast";
-		reg = <0>;
+		reg = <2>;
 		spi-max-frequency = <16000000>;
 	};
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn236.conf b/tests/drivers/spi/spi_loopback/boards/frdm_mcxn236.conf
deleted file mode 100644
index a325815e8cf8c..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn236.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=n
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn236.overlay b/tests/drivers/spi/spi_loopback/boards/frdm_mcxn236.overlay
index 0e47064ccca7e..c9777aa7e1eb1 100644
--- a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn236.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/frdm_mcxn236.overlay
@@ -5,7 +5,7 @@
  */
 
 /* To test this sample, connect
- * LPSPI3 MOSI(J2-8, P1_0/FC3_P0)     -->        LPSPI5 MISO(J2-10, P1_2/FC3_P2)
+ * LPSPI3 MOSI(J2-8, P1_0/FC3_P0)     -->        LPSPI3 MISO(J2-10, P1_2/FC3_P2)
  */
 &flexcomm3_lpspi3 {
 	slow@0 {
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn947_mcxn947_cpu0.conf b/tests/drivers/spi/spi_loopback/boards/frdm_mcxn947_mcxn947_cpu0.conf
deleted file mode 100644
index 5014becf5b01d..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn947_mcxn947_cpu0.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn947_mcxn947_cpu0_qspi.conf b/tests/drivers/spi/spi_loopback/boards/frdm_mcxn947_mcxn947_cpu0_qspi.conf
deleted file mode 100644
index 5014becf5b01d..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/frdm_mcxn947_mcxn947_cpu0_qspi.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_mcxw72_mcxw727c_cpu0.conf b/tests/drivers/spi/spi_loopback/boards/frdm_mcxw72_mcxw727c_cpu0.conf
deleted file mode 100644
index e5dfa5b3fc947..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/frdm_mcxw72_mcxw727c_cpu0.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2025 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/frdm_rw612.overlay b/tests/drivers/spi/spi_loopback/boards/frdm_rw612.overlay
index d6c22f1e15ee8..a37180ba10663 100644
--- a/tests/drivers/spi/spi_loopback/boards/frdm_rw612.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/frdm_rw612.overlay
@@ -1,9 +1,10 @@
 /*
- * Copyright 2024 NXP
+ * Copyright 2024-2025 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/* Short MOSI and MISO externally using header J1 pins 2 and 4 */
 &flexcomm1 {
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
diff --git a/tests/drivers/spi/spi_loopback/boards/mcxw72_evk_mcxw727c_cpu0.conf b/tests/drivers/spi/spi_loopback/boards/mcxw72_evk_mcxw727c_cpu0.conf
deleted file mode 100644
index 5014becf5b01d..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mcxw72_evk_mcxw727c_cpu0.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2024 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1010_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1010_evk.conf
deleted file mode 100644
index bf53e8cb950ec..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1010_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1015_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1015_evk.conf
deleted file mode 100644
index bf53e8cb950ec..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1015_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1020_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1020_evk.conf
deleted file mode 100644
index bf53e8cb950ec..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1020_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1024_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1024_evk.conf
deleted file mode 100644
index bf53e8cb950ec..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1024_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1040_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1040_evk.conf
deleted file mode 100644
index 7652fe0f65f56..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1040_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2023 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1040_evk_flexio_spi.overlay b/tests/drivers/spi/spi_loopback/boards/mimxrt1040_evk_flexio_spi.overlay
new file mode 100644
index 0000000000000..154a56c46b87b
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/mimxrt1040_evk_flexio_spi.overlay
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, STRIM, ALC
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Connect J16-7 to J16-8
+ * Connect J17-9 to J17-10
+ */
+&pinctrl {
+	pinmux_flexio3spi0: pinmux_flexio3spi0 {
+		group0 {
+			pinmux =
+				<&iomuxc_gpio_ad_b0_15_gpio1_io15>, /* cs */
+				<&iomuxc_gpio_ad_b1_04_flexio3_flexio04>, /* sck */
+				<&iomuxc_gpio_ad_b1_01_flexio3_flexio01>, /* sdo */
+				<&iomuxc_gpio_ad_b1_00_flexio3_flexio00>; /* sdi */
+			drive-strength = "r0-6";
+			slew-rate = "slow";
+			nxp,speed = "150-mhz";
+		};
+	};
+	pinmux_flexio3spi1: pinmux_flexio3spi1 {
+		group0 {
+			pinmux =
+				<&iomuxc_gpio_ad_b0_14_gpio1_io14>, /* cs */
+				<&iomuxc_gpio_ad_b1_05_flexio3_flexio05>, /* sck */
+				<&iomuxc_gpio_ad_b1_03_flexio3_flexio03>, /* sdo */
+				<&iomuxc_gpio_ad_b1_02_flexio3_flexio02>; /* sdi */
+			drive-strength = "r0-6";
+			slew-rate = "slow";
+			nxp,speed = "150-mhz";
+		};
+	};
+};
+
+&flexio3 {
+	status = "okay";
+	flexio3_spi0: flexio3_spi0 {
+		compatible = "nxp,flexio-spi";
+		status = "okay";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cs-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+		sdo-pin = <1>;
+		sdi-pin = <0>;
+		sck-pin = <4>;
+		pinctrl-0 = <&pinmux_flexio3spi0>;
+		pinctrl-names = "default";
+		slow@0 {
+			status = "okay";
+			compatible = "test-spi-loopback-slow";
+			reg = <0>;
+			spi-max-frequency = <500000>;
+		};
+	};
+	flexio3_spi1: flexio3_spi1 {
+		compatible = "nxp,flexio-spi";
+		status = "okay";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cs-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+		sdo-pin = <3>;
+		sdi-pin = <2>;
+		sck-pin = <5>;
+		pinctrl-0 = <&pinmux_flexio3spi1>;
+		pinctrl-names = "default";
+		fast@0 {
+			status = "okay";
+			compatible = "test-spi-loopback-fast";
+			reg = <0>;
+			spi-max-frequency = <4000000>;
+		};
+	};
+};
+
+/* pinmux_lpspi3 overlaps pinmux_flexio3spi1 */
+&lpspi3 {
+	status = "disabled";
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk.conf
deleted file mode 100644
index 5181a16951d23..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2018, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1060_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1060_evk.conf
deleted file mode 100644
index bf53e8cb950ec..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1060_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1060_evk_C.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1060_evk_C.conf
deleted file mode 100644
index bf53e8cb950ec..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1060_evk_C.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1064_evk.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1064_evk.conf
deleted file mode 100644
index bf53e8cb950ec..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1064_evk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
deleted file mode 100644
index 7652fe0f65f56..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2023 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm33.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
index 9b2a9986e38eb..cf4dcd316a924 100644
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
+++ b/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm33.conf
@@ -3,6 +3,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
 CONFIG_DMA_MCUX_USE_DTCM_FOR_DMA_DESCRIPTORS=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm7.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
index 9b2a9986e38eb..cf4dcd316a924 100644
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
+++ b/tests/drivers/spi/spi_loopback/boards/mimxrt1180_evk_mimxrt1189_cm7.conf
@@ -3,6 +3,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
 CONFIG_DMA_MCUX_USE_DTCM_FOR_DMA_DESCRIPTORS=n
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt700_evk_mimxrt798s_cm33_cpu0.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt700_evk_mimxrt798s_cm33_cpu0.conf
deleted file mode 100644
index e5dfa5b3fc947..0000000000000
--- a/tests/drivers/spi/spi_loopback/boards/mimxrt700_evk_mimxrt798s_cm33_cpu0.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright 2025 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_SPI_MCUX_LPSPI_DMA=y
-CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
index de624ab3c6611..0c7b1a7313330 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay
@@ -7,9 +7,12 @@
 &pinctrl {
 	spi120_default: spi120_default {
 		group1 {
+			psels = <NRF_PSEL(SPIM_MISO, 7, 6)>;
+		};
+		group2 {
 			psels = <NRF_PSEL(SPIM_SCK, 7, 3)>,
-				<NRF_PSEL(SPIM_MISO, 7, 6)>,
 				<NRF_PSEL(SPIM_MOSI, 7, 7)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 		};
 	};
 
@@ -40,7 +43,7 @@
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(4)>;
 	};
-	fast@0 {
+	dut_fast: fast@0 {
 		compatible = "test-spi-loopback-fast";
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(8)>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index 8dcf6fd190d8f..de3eaf4514dae 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -7,9 +7,12 @@
 &pinctrl {
 	spi00_default: spi00_default {
 		group1 {
+			psels = <NRF_PSEL(SPIM_MISO, 2, 9)>;
+		};
+		group2 {
 			psels = <NRF_PSEL(SPIM_SCK, 2, 6)>,
-				<NRF_PSEL(SPIM_MISO, 2, 9)>,
 				<NRF_PSEL(SPIM_MOSI, 2, 8)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 		};
 	};
 
@@ -23,6 +26,8 @@
 	};
 };
 
+/delete-node/ &mx25r64;
+
 &spi00 {
 	status = "okay";
 	pinctrl-0 = <&spi00_default>;
@@ -35,7 +40,7 @@
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(2)>;
 	};
-	fast@0 {
+	dut_fast: fast@0 {
 		compatible = "test-spi-loopback-fast";
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(4)>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
index 9dc27d1af0576..48840969d8e65 100644
--- a/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -35,7 +35,7 @@
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(2)>;
 	};
-	fast@0 {
+	dut_fast: fast@0 {
 		compatible = "test-spi-loopback-fast";
 		reg = <0>;
 		spi-max-frequency = <DT_FREQ_M(4)>;
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf_at_16mhz.overlay b/tests/drivers/spi/spi_loopback/boards/nrf_at_16mhz.overlay
new file mode 100644
index 0000000000000..b2cec530184ee
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf_at_16mhz.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+&dut_fast {
+	spi-max-frequency = <DT_FREQ_M(16)>;
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf_at_32mhz.overlay b/tests/drivers/spi/spi_loopback/boards/nrf_at_32mhz.overlay
new file mode 100644
index 0000000000000..37d93f21a2476
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf_at_32mhz.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+&dut_fast {
+	spi-max-frequency = <DT_FREQ_M(32)>;
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/nrf_at_8mhz.overlay b/tests/drivers/spi/spi_loopback/boards/nrf_at_8mhz.overlay
new file mode 100644
index 0000000000000..d01d89dc6ec73
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nrf_at_8mhz.overlay
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+&dut_fast {
+	spi-max-frequency = <DT_FREQ_M(8)>;
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/nucleo_n657x0_q_stm32n657xx_sb.conf b/tests/drivers/spi/spi_loopback/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..c448e14811f7b
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
@@ -0,0 +1 @@
+CONFIG_NOCACHE_MEMORY=y
diff --git a/tests/drivers/spi/spi_loopback/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay b/tests/drivers/spi/spi_loopback/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay
new file mode 100644
index 0000000000000..24238c4b7bc20
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&spi5 {
+	dmas = <&gpdma1 0 88 STM32_DMA_PERIPH_TX
+		&gpdma1 1 87 STM32_DMA_PERIPH_RX>;
+	dma-names = "tx", "rx";
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <500000>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <16000000>;
+	};
+};
+
+&gpdma1 {
+	status = "okay";
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/numaker_m55m1.conf b/tests/drivers/spi/spi_loopback/boards/numaker_m55m1.conf
new file mode 100644
index 0000000000000..3d2da209abc92
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/numaker_m55m1.conf
@@ -0,0 +1 @@
+CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/spi/spi_loopback/boards/numaker_m55m1.overlay b/tests/drivers/spi/spi_loopback/boards/numaker_m55m1.overlay
new file mode 100644
index 0000000000000..409396e208169
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/numaker_m55m1.overlay
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+/* EVB's NU5: SS/CLK/MISO/MOSI */
+	spi2_default: spi2_default {
+		group0 {
+			pinmux = <PA11MFP_SPI2_SS>,
+				 <PA10MFP_SPI2_CLK>,
+				 <PA9MFP_SPI2_MISO>,
+				 <PA8MFP_SPI2_MOSI>;
+		};
+	};
+};
+
+&spi2 {
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_K(500)>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(16)>;
+	};
+	status = "okay";
+	pinctrl-0 = <&spi2_default>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..4471d299ac196
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KGs
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	spi00_default: spi00_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MISO, 2, 9)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 6)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 8)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
+		};
+	};
+
+	spi00_sleep: spi00_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 2, 6)>,
+				<NRF_PSEL(SPIM_MISO, 2, 9)>,
+				<NRF_PSEL(SPIM_MOSI, 2, 8)>;
+			low-power-enable;
+		};
+	};
+};
+
+/delete-node/ &mx25r64;
+
+&spi00 {
+	status = "okay";
+
+	pinctrl-0 = <&spi00_default>;
+	pinctrl-1 = <&spi00_sleep>;
+	pinctrl-names = "default", "sleep";
+
+	overrun-character = <0x00>;
+	zephyr,pm-device-runtime-auto;
+
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(2)>;
+	};
+
+	dut_fast: fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(4)>;
+	};
+};
+
+&gpio2 {
+	status = "okay";
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/pico_plus2_rp2350b_m33.conf b/tests/drivers/spi/spi_loopback/boards/pico_plus2_rp2350b_m33.conf
new file mode 100644
index 0000000000000..53e8607eb619f
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/pico_plus2_rp2350b_m33.conf
@@ -0,0 +1 @@
+CONFIG_SPI_PL022_DMA=y
diff --git a/tests/drivers/spi/spi_loopback/boards/stm32n6570_dk_stm32n657xx_sb.conf b/tests/drivers/spi/spi_loopback/boards/stm32n6570_dk_stm32n657xx_sb.conf
new file mode 100644
index 0000000000000..c448e14811f7b
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/stm32n6570_dk_stm32n657xx_sb.conf
@@ -0,0 +1 @@
+CONFIG_NOCACHE_MEMORY=y
diff --git a/tests/drivers/spi/spi_loopback/boards/stm32n6570_dk_stm32n657xx_sb.overlay b/tests/drivers/spi/spi_loopback/boards/stm32n6570_dk_stm32n657xx_sb.overlay
new file mode 100644
index 0000000000000..24238c4b7bc20
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/stm32n6570_dk_stm32n657xx_sb.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&spi5 {
+	dmas = <&gpdma1 0 88 STM32_DMA_PERIPH_TX
+		&gpdma1 1 87 STM32_DMA_PERIPH_RX>;
+	dma-names = "tx", "rx";
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <500000>;
+	};
+	fast@0 {
+		compatible = "test-spi-loopback-fast";
+		reg = <0>;
+		spi-max-frequency = <16000000>;
+	};
+};
+
+&gpdma1 {
+	status = "okay";
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/xg24_rb4187c.conf b/tests/drivers/spi/spi_loopback/boards/xg24_rb4187c.conf
new file mode 100644
index 0000000000000..1e3c5f17bfc3a
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/xg24_rb4187c.conf
@@ -0,0 +1,2 @@
+CONFIG_DMA_MAX_DESCRIPTOR=16
+CONFIG_SPI_SILABS_EUSART_DMA_MAX_BLOCKS=10
diff --git a/tests/drivers/spi/spi_loopback/boards/xg24_rb4187c.overlay b/tests/drivers/spi/spi_loopback/boards/xg24_rb4187c.overlay
new file mode 100644
index 0000000000000..fc5042f846e94
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/xg24_rb4187c.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dt-bindings/pinctrl/silabs/xg24-pinctrl.h>
+
+&pinctrl {
+	eusart1_default: eusart1_default {
+		group0 {
+			pins = <EUSART1_TX_PC1>, <EUSART1_SCLK_PC3>;
+			drive-push-pull;
+			output-high;
+		};
+		group1 {
+			pins = <EUSART1_RX_PC2>;
+			input-enable;
+		};
+	};
+};
+
+&eusart1 {
+	dmas = <&dma0 DMA_REQSEL_EUSART1TXFL>,
+	       <&dma0 DMA_REQSEL_EUSART1RXFL>;
+	dma-names = "tx", "rx";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-0 = <&eusart1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+	cs-gpios = <&gpioc 0 GPIO_ACTIVE_LOW>;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <500000>;
+	};
+	fast@1 {
+		compatible = "test-spi-loopback-fast";
+		reg = <1>;
+		spi-max-frequency = <10000000>;
+	};
+};
+
+&dma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/spi/spi_loopback/boards/xg29_rb4412a.conf b/tests/drivers/spi/spi_loopback/boards/xg29_rb4412a.conf
new file mode 100644
index 0000000000000..1e3c5f17bfc3a
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/xg29_rb4412a.conf
@@ -0,0 +1,2 @@
+CONFIG_DMA_MAX_DESCRIPTOR=16
+CONFIG_SPI_SILABS_EUSART_DMA_MAX_BLOCKS=10
diff --git a/tests/drivers/spi/spi_loopback/boards/xg29_rb4412a.overlay b/tests/drivers/spi/spi_loopback/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..58abc4e878e00
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/boards/xg29_rb4412a.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dt-bindings/pinctrl/silabs/xg29-pinctrl.h>
+
+/*
+ * Connect EXP4 (PC0) and EXP6 (PC1) of the Expansion Pin header
+ */
+
+&eusart1 {
+	dmas = <&dma0 DMA_REQSEL_EUSART1TXFL>,
+	       <&dma0 DMA_REQSEL_EUSART1RXFL>;
+	dma-names = "tx", "rx";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-0 = <&eusart1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+	cs-gpios = <&gpioc 0 GPIO_ACTIVE_LOW>;
+	slow@0 {
+		compatible = "test-spi-loopback-slow";
+		reg = <0>;
+		spi-max-frequency = <500000>;
+	};
+	fast@1 {
+		compatible = "test-spi-loopback-fast";
+		reg = <1>;
+		spi-max-frequency = <10000000>;
+	};
+};
+
+&dma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/spi/spi_loopback/socs/esp32c6.conf b/tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/socs/esp32c6.conf
rename to tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.conf
diff --git a/tests/drivers/spi/spi_loopback/socs/esp32c6.overlay b/tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/socs/esp32c6.overlay
rename to tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.overlay
diff --git a/tests/drivers/spi/spi_loopback/socs/rp2040.overlay b/tests/drivers/spi/spi_loopback/socs/rp2040.overlay
new file mode 100644
index 0000000000000..99b39fca98a25
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/socs/rp2040.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2022 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/dma/rpi-pico-dma-rp2040.h>
diff --git a/tests/drivers/spi/spi_loopback/socs/rp2350b_m33.overlay b/tests/drivers/spi/spi_loopback/socs/rp2350b_m33.overlay
new file mode 100644
index 0000000000000..1d38b504b4272
--- /dev/null
+++ b/tests/drivers/spi/spi_loopback/socs/rp2350b_m33.overlay
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2025 TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/dma/rpi-pico-dma-rp2350.h>
diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c
index 98c122238ea9f..1bfcfe4ca82c4 100644
--- a/tests/drivers/spi/spi_loopback/src/spi.c
+++ b/tests/drivers/spi/spi_loopback/src/spi.c
@@ -1,65 +1,52 @@
 /*
+ * Copyright 2025 NXP
  * Copyright (c) 2017 Intel Corporation.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(spi_loopback);
+/* To run this loopback test, connect MOSI pin to the MISO of the SPI */
 
-#include <zephyr/kernel.h>
-#include <zephyr/sys/printk.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <zephyr/ztest.h>
+/*
+ ************************
+ * Include dependencies *
+ ************************
+ */
 
+#include <zephyr/ztest.h>
 #include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <stdio.h>
+#include <stdarg.h>
 
-#define SPI_FAST_DEV	DT_COMPAT_GET_ANY_STATUS_OKAY(test_spi_loopback_fast)
-#define SPI_SLOW_DEV	DT_COMPAT_GET_ANY_STATUS_OKAY(test_spi_loopback_slow)
-
-#if CONFIG_SPI_LOOPBACK_MODE_LOOP
-#define MODE_LOOP SPI_MODE_LOOP
-#else
-#define MODE_LOOP 0
-#endif
-
-#ifdef CONFIG_SPI_LOOPBACK_16BITS_FRAMES
-#define FRAME_SIZE (16)
-#define FRAME_SIZE_STR ", frame size = 16"
-#else
-#define FRAME_SIZE (8)
-#define FRAME_SIZE_STR ", frame size = 8"
-#endif /* CONFIG_SPI_LOOPBACK_16BITS_FRAMES */
-
-#ifdef CONFIG_DMA
-
-#ifdef CONFIG_NOCACHE_MEMORY
-#define DMA_ENABLED_STR ", DMA enabled"
-#else /* CONFIG_NOCACHE_MEMORY */
-#define DMA_ENABLED_STR ", DMA enabled (without CONFIG_NOCACHE_MEMORY)"
-#endif
-
-#else /* CONFIG_DMA */
+/*
+ **********************
+ * SPI configurations *
+ **********************
+ */
 
-#define DMA_ENABLED_STR
-#endif /* CONFIG_DMA */
+#define FRAME_SIZE COND_CODE_1(CONFIG_SPI_LOOPBACK_16BITS_FRAMES, (16), (8))
+#define MODE_LOOP  COND_CODE_1(CONFIG_SPI_LOOPBACK_MODE_LOOP, (SPI_MODE_LOOP), (0))
 
-#define SPI_OP(frame_size) SPI_OP_MODE_MASTER | SPI_MODE_CPOL | MODE_LOOP | \
-	       SPI_MODE_CPHA | SPI_WORD_SET(frame_size) | SPI_LINES_SINGLE
+#define SPI_OP(frame_size)                                                                         \
+	SPI_OP_MODE_MASTER | SPI_MODE_CPOL | MODE_LOOP | SPI_MODE_CPHA |                           \
+		SPI_WORD_SET(frame_size) | SPI_LINES_SINGLE
 
+#define SPI_FAST_DEV DT_COMPAT_GET_ANY_STATUS_OKAY(test_spi_loopback_fast)
 static struct spi_dt_spec spi_fast = SPI_DT_SPEC_GET(SPI_FAST_DEV, SPI_OP(FRAME_SIZE), 0);
-static struct spi_dt_spec spi_slow = SPI_DT_SPEC_GET(SPI_SLOW_DEV, SPI_OP(FRAME_SIZE), 0);
 
-/* to run this test, connect MOSI pin to the MISO of the SPI */
+#define SPI_SLOW_DEV DT_COMPAT_GET_ANY_STATUS_OKAY(test_spi_loopback_slow)
+static struct spi_dt_spec spi_slow = SPI_DT_SPEC_GET(SPI_SLOW_DEV, SPI_OP(FRAME_SIZE), 0);
 
-#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
-#define BUF_SIZE 18
-#define BUF2_SIZE 36
-#define BUF3_SIZE CONFIG_SPI_LARGE_BUFFER_SIZE
+static struct spi_dt_spec *loopback_specs[2] = {&spi_slow, &spi_fast};
+static char *spec_names[2] = {"SLOW", "FAST"};
+static int spec_idx;
 
+/*
+ ********************
+ * SPI test buffers *
+ ********************
+ */
 
 #if CONFIG_NOCACHE_MEMORY
 #define __NOCACHE	__attribute__((__section__(".nocache")))
@@ -69,26 +56,40 @@ static struct spi_dt_spec spi_slow = SPI_DT_SPEC_GET(SPI_SLOW_DEV, SPI_OP(FRAME_
 #define __NOCACHE
 #endif /* CONFIG_NOCACHE_MEMORY */
 
+#define BUF_SIZE 18
 static const char tx_data[BUF_SIZE] = "0123456789abcdef-\0";
-static __aligned(32) char buffer_tx[BUF_SIZE] __used __NOCACHE;
-static __aligned(32) char buffer_rx[BUF_SIZE] __used __NOCACHE;
+static __aligned(32) char buffer_tx[BUF_SIZE] __NOCACHE;
+static __aligned(32) char buffer_rx[BUF_SIZE] __NOCACHE;
+
+#define BUF2_SIZE 36
 static const char tx2_data[BUF2_SIZE] = "Thequickbrownfoxjumpsoverthelazydog\0";
-static __aligned(32) char buffer2_tx[BUF2_SIZE] __used __NOCACHE;
-static __aligned(32) char buffer2_rx[BUF2_SIZE] __used __NOCACHE;
+static __aligned(32) char buffer2_tx[BUF2_SIZE] __NOCACHE;
+static __aligned(32) char buffer2_rx[BUF2_SIZE] __NOCACHE;
+
+#define BUF3_SIZE CONFIG_SPI_LARGE_BUFFER_SIZE
 static const char large_tx_data[BUF3_SIZE] = "Thequickbrownfoxjumpsoverthelazydog\0";
-static __aligned(32) char large_buffer_tx[BUF3_SIZE] __used __NOCACHE;
-static __aligned(32) char large_buffer_rx[BUF3_SIZE] __used __NOCACHE;
+static __aligned(32) char large_buffer_tx[BUF3_SIZE] __NOCACHE;
+static __aligned(32) char large_buffer_rx[BUF3_SIZE] __NOCACHE;
+
+/*
+ ********************
+ * Helper functions *
+ ********************
+ */
 
 /*
  * We need 5x(buffer size) + 1 to print a comma-separated list of each
  * byte in hex, plus a null.
  */
-static uint8_t buffer_print_tx[BUF_SIZE * 5 + 1];
-static uint8_t buffer_print_rx[BUF_SIZE * 5 + 1];
+#define PRINT_BUF_SIZE(size) ((size * 5) + 1)
+
+static uint8_t buffer_print_tx[PRINT_BUF_SIZE(BUF_SIZE)];
+static uint8_t buffer_print_rx[PRINT_BUF_SIZE(BUF_SIZE)];
 
-static uint8_t buffer_print_tx2[BUF2_SIZE * 5 + 1];
-static uint8_t buffer_print_rx2[BUF2_SIZE * 5 + 1];
+static uint8_t buffer_print_tx2[PRINT_BUF_SIZE(BUF2_SIZE)];
+static uint8_t buffer_print_rx2[PRINT_BUF_SIZE(BUF2_SIZE)];
 
+/* function for displaying the data in the buffers */
 static void to_display_format(const uint8_t *src, size_t size, char *dst)
 {
 	size_t i;
@@ -98,477 +99,263 @@ static void to_display_format(const uint8_t *src, size_t size, char *dst)
 	}
 }
 
-/* test transferring different buffers on the same dma channels */
-static int spi_complete_multiple(struct spi_dt_spec *spec)
+/* just a wrapper of the driver transceive call with ztest error assert */
+static void spi_loopback_transceive(struct spi_dt_spec *const spec,
+				    const struct spi_buf_set *const tx,
+				    const struct spi_buf_set *const rx)
 {
-	struct spi_buf tx_bufs[2];
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-
-	tx_bufs[0].buf = buffer_tx;
-	tx_bufs[0].len = BUF_SIZE;
-
-	tx_bufs[1].buf = buffer2_tx;
-	tx_bufs[1].len = BUF2_SIZE;
+	int ret = spi_transceive_dt(spec, tx, rx);
 
+	zassert_false(ret, "SPI transceive failed, code %d", ret);
+}
 
-	struct spi_buf rx_bufs[2];
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
-	};
+/* The most spi buf currently used by any test case is 4, change if needed */
+#define MAX_SPI_BUF_COUNT 4
+struct spi_buf tx_bufs_pool[MAX_SPI_BUF_COUNT];
+struct spi_buf rx_bufs_pool[MAX_SPI_BUF_COUNT];
 
-	rx_bufs[0].buf = buffer_rx;
-	rx_bufs[0].len = BUF_SIZE;
+/* A function for creating a spi_buf_set. Simply provide the spi_buf pool (either rx or tx),
+ * the number of bufs that will be in the set, and then an ordered list of pairs of buf
+ * pointer (void *) and buf size (size_t).
+ */
+static const struct spi_buf_set spi_loopback_setup_xfer(struct spi_buf *pool, size_t num_bufs, ...)
+{
+	struct spi_buf_set buf_set;
 
-	rx_bufs[1].buf = buffer2_rx;
-	rx_bufs[1].len = BUF2_SIZE;
+	zassert_true(num_bufs <= MAX_SPI_BUF_COUNT, "SPI xfer need more buf in test");
+	zassert_true(pool == tx_bufs_pool || pool == rx_bufs_pool, "Invalid spi buf pool");
 
-	int ret;
+	va_list args;
 
-	LOG_INF("Start complete multiple");
+	va_start(args, num_bufs);
 
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return ret;
+	for (int i = 0; i < num_bufs; i++) {
+		pool[i].buf = va_arg(args, void *);
+		pool[i].len = va_arg(args, size_t);
 	}
 
-	if (memcmp(buffer_tx, buffer_rx, BUF_SIZE)) {
-		to_display_format(buffer_tx, BUF_SIZE, buffer_print_tx);
-		to_display_format(buffer_rx, BUF_SIZE, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	}
+	va_end(args);
 
-	if (memcmp(buffer2_tx, buffer2_rx, BUF2_SIZE)) {
-		to_display_format(buffer2_tx, BUF2_SIZE, buffer_print_tx2);
-		to_display_format(buffer2_rx, BUF2_SIZE, buffer_print_rx2);
-		LOG_ERR("Buffer 2 contents are different: %s", buffer_print_tx2);
-		LOG_ERR("                             vs: %s", buffer_print_rx2);
-		zassert_false(1, "Buffer 2 contents are different");
-		return -1;
-	}
+	buf_set.buffers = pool;
+	buf_set.count = num_bufs;
 
-	LOG_INF("Passed");
-
-	return 0;
+	return buf_set;
 }
 
-static int spi_complete_loop(struct spi_dt_spec *spec)
+/* compare two buffers and print fail if they are not the same */
+static void spi_loopback_compare_bufs(const uint8_t *buf1, const uint8_t *buf2, size_t size,
+				      uint8_t *printbuf1, uint8_t *printbuf2)
 {
-	const struct spi_buf tx_bufs[] = {
-		{
-			.buf = buffer_tx,
-			.len = BUF_SIZE,
-		},
-	};
-	const struct spi_buf rx_bufs[] = {
-		{
-			.buf = buffer_rx,
-			.len = BUF_SIZE,
-		},
-	};
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
-	};
-
-	int ret;
-
-	LOG_INF("Start complete loop");
-
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return ret;
-	}
-
-	if (memcmp(buffer_tx, buffer_rx, BUF_SIZE)) {
-		to_display_format(buffer_tx, BUF_SIZE, buffer_print_tx);
-		to_display_format(buffer_rx, BUF_SIZE, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
+	if (memcmp(buf1, buf2, size)) {
+		to_display_format(buf1, size, printbuf1);
+		to_display_format(buf2, size, printbuf2);
+		TC_PRINT("Buffer contents are different:\n %s\nvs:\n %s\n",
+				buffer_print_tx, buffer_print_rx);
+		ztest_test_fail();
 	}
+}
 
-	LOG_INF("Passed");
+/*
+ **************
+ * Test cases *
+ **************
+ */
 
-	return 0;
+/* test transferring different buffers on the same dma channels */
+ZTEST(spi_loopback, test_spi_complete_multiple)
+{
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 2,
+							      buffer_tx, BUF_SIZE,
+							      buffer2_tx, BUF2_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 2,
+							      buffer_rx, BUF_SIZE,
+							      buffer2_rx, BUF2_SIZE);
+
+	spi_loopback_transceive(spec, &tx, &rx);
+
+	spi_loopback_compare_bufs(buffer_tx, buffer_rx, BUF_SIZE,
+				  buffer_print_tx, buffer_print_rx);
+	spi_loopback_compare_bufs(buffer2_tx, buffer2_rx, BUF2_SIZE,
+				  buffer_print_tx2, buffer_print_rx2);
 }
 
-static int spi_null_tx_buf(struct spi_dt_spec *spec)
+ZTEST(spi_loopback, test_spi_complete_loop)
 {
-	static const uint8_t EXPECTED_NOP_RETURN_BUF[BUF_SIZE] = { 0 };
-
-	(void)memset(buffer_rx, 0x77, BUF_SIZE);
-
-	const struct spi_buf tx_bufs[] = {
-		/* According to documentation, when sending NULL tx buf -
-		 *  NOP frames should be sent on MOSI line
-		 */
-		{
-			.buf = NULL,
-			.len = BUF_SIZE,
-		},
-	};
-	const struct spi_buf rx_bufs[] = {
-		{
-			.buf = buffer_rx,
-			.len = BUF_SIZE,
-		},
-	};
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
-	};
-
-	int ret;
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      buffer_tx, BUF_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1,
+							      buffer_rx, BUF_SIZE);
 
-	LOG_INF("Start null tx");
+	spi_loopback_transceive(spec, &tx, &rx);
 
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return ret;
-	}
+	spi_loopback_compare_bufs(buffer_tx, buffer_rx, BUF_SIZE,
+				  buffer_print_tx, buffer_print_rx);
+}
 
+ZTEST(spi_loopback, test_spi_null_tx_buf)
+{
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	static const uint8_t expected_nop_return_buf[BUF_SIZE] = { 0 };
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      NULL, BUF_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1,
+							      buffer_rx, BUF_SIZE);
 
-	if (memcmp(buffer_rx, EXPECTED_NOP_RETURN_BUF, BUF_SIZE)) {
-		to_display_format(buffer_rx, BUF_SIZE, buffer_print_rx);
-		LOG_ERR("Rx Buffer should contain NOP frames but got: %s",
-			buffer_print_rx);
-		zassert_false(1, "Buffer not as expected");
-		return -1;
-	}
+	(void)memset(buffer_rx, 0x77, BUF_SIZE);
 
-	LOG_INF("Passed");
+	spi_loopback_transceive(spec, &tx, &rx);
 
-	return 0;
+	spi_loopback_compare_bufs(expected_nop_return_buf, buffer_rx, BUF_SIZE,
+				  buffer_print_rx, buffer_print_rx);
 }
 
-static int spi_rx_half_start(struct spi_dt_spec *spec)
+ZTEST(spi_loopback, test_spi_rx_half_start)
 {
-	const struct spi_buf tx_bufs[] = {
-		{
-			.buf = buffer_tx,
-			.len = BUF_SIZE,
-		},
-	};
-	const struct spi_buf rx_bufs[] = {
-		{
-			.buf = buffer_rx,
-			.len = 8,
-		},
-	};
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
-	};
-	int ret;
-
-	LOG_INF("Start half start");
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      buffer_tx, BUF_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1,
+							      buffer_rx, 8);
 
 	(void)memset(buffer_rx, 0, BUF_SIZE);
 
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return -1;
-	}
-
-	if (memcmp(buffer_tx, buffer_rx, 8)) {
-		to_display_format(buffer_tx, 8, buffer_print_tx);
-		to_display_format(buffer_rx, 8, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	}
+	spi_loopback_transceive(spec, &tx, &rx);
 
-	LOG_INF("Passed");
-
-	return 0;
+	spi_loopback_compare_bufs(buffer_tx, buffer_rx, 8,
+				  buffer_print_tx, buffer_print_rx);
 }
 
-static int spi_rx_half_end(struct spi_dt_spec *spec)
+ZTEST(spi_loopback, test_spi_rx_half_end)
 {
-	const struct spi_buf tx_bufs[] = {
-		{
-			.buf = buffer_tx,
-			.len = BUF_SIZE,
-		},
-	};
-	const struct spi_buf rx_bufs[] = {
-		{
-			.buf = NULL,
-			.len = 8,
-		},
-		{
-			.buf = buffer_rx,
-			.len = 8,
-		},
-	};
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
-	};
-	int ret;
-
 	if (IS_ENABLED(CONFIG_SPI_STM32_DMA)) {
-		LOG_INF("Skip half end");
-		return 0;
+		TC_PRINT("Skipped spi_rx_hald_end");
+		return;
 	}
 
-	LOG_INF("Start half end");
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      buffer_tx, BUF_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 2,
+							      NULL, 8,
+							      buffer_rx, 8);
 
 	(void)memset(buffer_rx, 0, BUF_SIZE);
 
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return -1;
-	}
-
-	if (memcmp(buffer_tx + 8, buffer_rx, 8)) {
-		to_display_format(buffer_tx + 8, 8, buffer_print_tx);
-		to_display_format(buffer_rx, 8, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	}
-
-	LOG_INF("Passed");
+	spi_loopback_transceive(spec, &tx, &rx);
 
-	return 0;
+	spi_loopback_compare_bufs(buffer_tx+8, buffer_rx, 8,
+				  buffer_print_tx, buffer_print_rx);
 }
 
-static int spi_rx_every_4(struct spi_dt_spec *spec)
+ZTEST(spi_loopback, test_spi_rx_every_4)
 {
-	const struct spi_buf tx_bufs[] = {
-		{
-			.buf = buffer_tx,
-			.len = BUF_SIZE,
-		},
-	};
-	const struct spi_buf rx_bufs[] = {
-		{
-			.buf = NULL,
-			.len = 4,
-		},
-		{
-			.buf = buffer_rx,
-			.len = 4,
-		},
-		{
-			.buf = NULL,
-			.len = 4,
-		},
-		{
-			.buf = buffer_rx + 4,
-			.len = 4,
-		},
-	};
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
+	if (IS_ENABLED(CONFIG_SPI_STM32_DMA) || IS_ENABLED(CONFIG_DSPI_MCUX_EDMA)) {
+		TC_PRINT("Skipped spi_rx_every_4");
+		return;
 	};
-	int ret;
 
-	if (IS_ENABLED(CONFIG_SPI_STM32_DMA)) {
-		LOG_INF("Skip every 4");
-		return 0;
-	}
-
-	if (IS_ENABLED(CONFIG_DSPI_MCUX_EDMA)) {
-		LOG_INF("Skip every 4");
-		return 0;
-	}
-
-	LOG_INF("Start every 4");
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      buffer_tx, BUF_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 4,
+							      NULL, 4,
+							      buffer_rx, 4,
+							      NULL, 4,
+							      buffer_rx+4, 4);
 
 	(void)memset(buffer_rx, 0, BUF_SIZE);
 
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return -1;
-	}
-
-	if (memcmp(buffer_tx + 4, buffer_rx, 4)) {
-		to_display_format(buffer_tx + 4, 4, buffer_print_tx);
-		to_display_format(buffer_rx, 4, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	} else if (memcmp(buffer_tx + 12, buffer_rx + 4, 4)) {
-		to_display_format(buffer_tx + 12, 4, buffer_print_tx);
-		to_display_format(buffer_rx + 4, 4, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	}
-
-	LOG_INF("Passed");
+	spi_loopback_transceive(spec, &tx, &rx);
 
-	return 0;
+	spi_loopback_compare_bufs(buffer_tx+4, buffer_rx, 4,
+				  buffer_print_tx, buffer_print_rx);
+	spi_loopback_compare_bufs(buffer_tx+12, buffer_rx+4, 4,
+				  buffer_print_tx, buffer_print_rx);
 }
 
-static int spi_rx_bigger_than_tx(struct spi_dt_spec *spec)
+ZTEST(spi_loopback, test_spi_rx_bigger_than_tx)
 {
+	if (IS_ENABLED(CONFIG_SPI_STM32_DMA) || IS_ENABLED(CONFIG_DSPI_MCUX_EDMA)) {
+		TC_PRINT("Skipped spi_rx_bigger_than_tx");
+		return;
+	}
+
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
 	const uint32_t tx_buf_size = 8;
 
 	BUILD_ASSERT(tx_buf_size < BUF_SIZE,
 		"Transmit buffer is expected to be smaller than the receive buffer");
 
-	const struct spi_buf tx_bufs[] = {
-		{
-			.buf = buffer_tx,
-			.len = tx_buf_size,
-		},
-	};
-	const struct spi_buf rx_bufs[] = {
-		{
-			.buf = buffer_rx,
-			.len = BUF_SIZE,
-		}
-	};
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
-	};
-	int ret;
-
-	if (IS_ENABLED(CONFIG_SPI_STM32_DMA)) {
-		LOG_INF("Skip rx bigger than tx");
-		return 0;
-	}
-
-	if (IS_ENABLED(CONFIG_DSPI_MCUX_EDMA)) {
-		LOG_INF("Skip rx bigger than tx");
-		return 0;
-	}
-
-	LOG_INF("Start rx bigger than tx");
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      buffer_tx, tx_buf_size);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1,
+							      buffer_rx, BUF_SIZE);
 
 	(void)memset(buffer_rx, 0xff, BUF_SIZE);
 
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return -1;
-	}
+	spi_loopback_transceive(spec, &tx, &rx);
 
-	if (memcmp(buffer_tx, buffer_rx, tx_buf_size)) {
-		to_display_format(buffer_tx, tx_buf_size, buffer_print_tx);
-		to_display_format(buffer_rx, tx_buf_size, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	}
+	spi_loopback_compare_bufs(buffer_tx, buffer_rx, tx_buf_size,
+				  buffer_print_tx, buffer_print_rx);
 
-	const uint8_t all_zeroes_buf[BUF_SIZE] = {0};
+	static const uint8_t all_zeroes_buf[BUF_SIZE] = {0};
 
-	if (memcmp(all_zeroes_buf, buffer_rx + tx_buf_size, BUF_SIZE - tx_buf_size)) {
-		to_display_format(
-			buffer_rx + tx_buf_size,  BUF_SIZE - tx_buf_size, buffer_print_tx);
-
-		to_display_format(
-			all_zeroes_buf, BUF_SIZE - tx_buf_size, buffer_print_rx);
-
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	}
-
-	LOG_INF("Passed");
-
-	return 0;
+	spi_loopback_compare_bufs(all_zeroes_buf, buffer_rx + tx_buf_size, BUF_SIZE - tx_buf_size,
+				  buffer_print_tx, buffer_print_rx);
 }
 
 /* test transferring different buffers on the same dma channels */
-static int spi_complete_large_transfers(struct spi_dt_spec *spec)
+ZTEST(spi_loopback, test_spi_complete_large_transfers)
 {
-	struct spi_buf tx_bufs;
-	const struct spi_buf_set tx = {
-		.buffers = &tx_bufs,
-		.count = 1
-	};
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      large_buffer_tx, BUF3_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1,
+							      large_buffer_rx, BUF3_SIZE);
 
-	tx_bufs.buf = large_buffer_tx;
-	tx_bufs.len = BUF3_SIZE;
+	spi_loopback_transceive(spec, &tx, &rx);
 
+	zassert_false(memcmp(large_buffer_tx, large_buffer_rx, BUF3_SIZE),
+			"Large Buffer contents are different");
+}
 
-	struct spi_buf rx_bufs;
-	const struct spi_buf_set rx = {
-		.buffers = &rx_bufs,
-		.count = 1
-	};
+ZTEST(spi_loopback, test_spi_null_tx_buf_set)
+{
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	static const uint8_t expected_nop_return_buf[BUF_SIZE] = { 0 };
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1,
+							      buffer_rx, BUF_SIZE);
 
-	rx_bufs.buf = large_buffer_rx;
-	rx_bufs.len = BUF3_SIZE;
+	(void)memset(buffer_rx, 0x77, BUF_SIZE);
 
-	int ret;
+	spi_loopback_transceive(spec, NULL, &rx);
 
-	LOG_INF("Start complete large transfers");
+	spi_loopback_compare_bufs(expected_nop_return_buf, buffer_rx, BUF_SIZE,
+				  buffer_print_rx, buffer_print_rx);
+}
 
-	ret = spi_transceive_dt(spec, &tx, &rx);
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return ret;
-	}
+ZTEST(spi_loopback, test_spi_null_rx_buf_set)
+{
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      NULL, BUF_SIZE);
 
-	if (memcmp(large_buffer_tx, large_buffer_rx, BUF3_SIZE)) {
-		zassert_false(1, "Large Buffer contents are different");
-		return -1;
-	}
+	spi_loopback_transceive(spec, &tx, NULL);
+}
+
+ZTEST(spi_loopback, test_nop_nil_bufs)
+{
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1, NULL, 0);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1, NULL, 0);
 
-	LOG_INF("Passed");
+	spi_loopback_transceive(spec, &tx, &rx);
 
-	return 0;
+	/* nothing really to check here, check is done in spi_loopback_transceive */
 }
+
 #if (CONFIG_SPI_ASYNC)
 static struct k_poll_signal async_sig = K_POLL_SIGNAL_INITIALIZER(async_sig);
 static struct k_poll_event async_evt =
@@ -576,26 +363,24 @@ static struct k_poll_event async_evt =
 				 K_POLL_MODE_NOTIFY_ONLY,
 				 &async_sig);
 static K_SEM_DEFINE(caller, 0, 1);
-K_THREAD_STACK_DEFINE(spi_async_stack, STACK_SIZE);
+static K_SEM_DEFINE(start_async, 0, 1);
 static int result = 1;
 
 static void spi_async_call_cb(void *p1,
 			      void *p2,
 			      void *p3)
 {
-	ARG_UNUSED(p1);
-	ARG_UNUSED(p2);
 	ARG_UNUSED(p3);
 
 	struct k_poll_event *evt = p1;
 	struct k_sem *caller_sem = p2;
-	int ret;
 
-	LOG_DBG("Polling...");
+	TC_PRINT("Polling...");
 
 	while (1) {
-		ret = k_poll(evt, 1, K_MSEC(2000));
-		zassert_false(ret, "one or more events are not ready");
+		k_sem_take(&start_async, K_FOREVER);
+
+		zassert_false(k_poll(evt, 1, K_MSEC(2000)), "one or more events are not ready");
 
 		result = evt->signal->result;
 		k_sem_give(caller_sem);
@@ -606,132 +391,125 @@ static void spi_async_call_cb(void *p1,
 	}
 }
 
-static int spi_async_call(struct spi_dt_spec *spec)
+ZTEST(spi_loopback, test_spi_async_call)
 {
-	const struct spi_buf tx_bufs[] = {
-		{
-			.buf = buffer_tx,
-			.len = BUF_SIZE,
-		},
-		{
-			.buf = buffer2_tx,
-			.len = BUF2_SIZE,
-		},
-		{
-			.buf = large_buffer_tx,
-			.len = BUF3_SIZE,
-		},
-	};
-	const struct spi_buf rx_bufs[] = {
-		{
-			.buf = buffer_rx,
-			.len = BUF_SIZE,
-		},
-		{
-			.buf = buffer2_rx,
-			.len = BUF2_SIZE,
-		},
-		{
-			.buf = large_buffer_rx,
-			.len = BUF3_SIZE,
-		},
-	};
-	const struct spi_buf_set tx = {
-		.buffers = tx_bufs,
-		.count = ARRAY_SIZE(tx_bufs)
-	};
-	const struct spi_buf_set rx = {
-		.buffers = rx_bufs,
-		.count = ARRAY_SIZE(rx_bufs)
-	};
-	int ret;
+	struct spi_dt_spec *spec = loopback_specs[spec_idx];
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 3,
+							      buffer_tx, BUF_SIZE,
+							      buffer2_tx, BUF2_SIZE,
+							      large_buffer_tx, BUF3_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 3,
+							      buffer_rx, BUF_SIZE,
+							      buffer2_rx, BUF2_SIZE,
+							      large_buffer_rx, BUF3_SIZE);
 
-	LOG_INF("Start async call");
 	memset(buffer_rx, 0, sizeof(buffer_rx));
 	memset(buffer2_rx, 0, sizeof(buffer2_rx));
 	memset(large_buffer_rx, 0, sizeof(large_buffer_rx));
 
-	ret = spi_transceive_signal(spec->bus, &spec->config, &tx, &rx, &async_sig);
-	if (ret == -ENOTSUP) {
-		LOG_DBG("Not supported");
-		return 0;
-	}
-
-	if (ret) {
-		LOG_ERR("Code %d", ret);
-		zassert_false(ret, "SPI transceive failed");
-		return -1;
-	}
+	k_sem_give(&start_async);
 
-	k_sem_take(&caller, K_FOREVER);
+	int ret = spi_transceive_signal(spec->bus, &spec->config, &tx, &rx, &async_sig);
 
-	if (result) {
-		LOG_ERR("Call code %d", ret);
-		zassert_false(result, "SPI transceive failed");
-		return -1;
+	if (ret == -ENOTSUP) {
+		TC_PRINT("Skipping ASYNC test");
+		return;
 	}
 
-	if (memcmp(buffer_tx, buffer_rx, BUF_SIZE)) {
-		to_display_format(buffer_tx, BUF_SIZE, buffer_print_tx);
-		to_display_format(buffer_rx, BUF_SIZE, buffer_print_rx);
-		LOG_ERR("Buffer contents are different: %s", buffer_print_tx);
-		LOG_ERR("                           vs: %s", buffer_print_rx);
-		zassert_false(1, "Buffer contents are different");
-		return -1;
-	}
+	zassert_false(ret, "SPI transceive failed, code %d", ret);
 
-	if (memcmp(buffer2_tx, buffer2_rx, BUF2_SIZE)) {
-		to_display_format(buffer2_tx, BUF2_SIZE, buffer_print_tx2);
-		to_display_format(buffer2_rx, BUF2_SIZE, buffer_print_rx2);
-		LOG_ERR("Buffer 2 contents are different: %s", buffer_print_tx2);
-		LOG_ERR("                             vs: %s", buffer_print_rx2);
-		zassert_false(1, "Buffer 2 contents are different");
-		return -1;
-	}
+	k_sem_take(&caller, K_FOREVER);
 
-	if (memcmp(large_buffer_tx, large_buffer_rx, BUF3_SIZE)) {
-		zassert_false(1, "Buffer 3 contents are different");
-		return -1;
-	}
+	zassert_false(result, "SPI async transceive failed, result %d", result);
 
-	LOG_INF("Passed");
+	spi_loopback_compare_bufs(buffer_tx, buffer_rx, BUF_SIZE,
+				  buffer_print_tx, buffer_print_rx);
+	spi_loopback_compare_bufs(buffer2_tx, buffer2_rx, BUF2_SIZE,
+				  buffer_print_tx2, buffer_print_rx2);
 
-	return 0;
+	zassert_false(memcmp(large_buffer_tx, large_buffer_rx, BUF3_SIZE),
+			"Large Buffer contents are different");
 }
 #endif
 
-static int spi_resource_lock_test(struct spi_dt_spec *lock_spec,
-				  struct spi_dt_spec *try_spec)
+ZTEST(spi_extra_api_features, test_spi_lock_release)
 {
+	const struct spi_buf_set tx = spi_loopback_setup_xfer(tx_bufs_pool, 1,
+							      buffer_tx, BUF_SIZE);
+	const struct spi_buf_set rx = spi_loopback_setup_xfer(rx_bufs_pool, 1,
+							      NULL, BUF_SIZE);
+	struct spi_dt_spec *lock_spec = &spi_slow;
+	struct spi_dt_spec *try_spec = &spi_fast;
+
 	lock_spec->config.operation |= SPI_LOCK_ON;
 
-	if (spi_complete_loop(lock_spec)) {
-		return -1;
-	}
+	spi_loopback_transceive(lock_spec, &tx, &rx);
 
-	if (spi_release_dt(lock_spec)) {
-		LOG_ERR("Deadlock now?");
-		zassert_false(1, "SPI release failed");
-		return -1;
-	}
+	zassert_false(spi_release_dt(lock_spec), "SPI release failed");
 
-	if (spi_complete_loop(try_spec)) {
-		return -1;
-	}
+	spi_loopback_transceive(try_spec, &tx, &rx);
 
-	return 0;
+	lock_spec->config.operation &= ~SPI_LOCK_ON;
 }
 
-ZTEST(spi_loopback, test_spi_loopback)
+/*
+ *************************
+ * Test suite definition *
+ *************************
+ */
+
+static void *spi_loopback_common_setup(void)
 {
-#if (CONFIG_SPI_ASYNC)
-	struct k_thread async_thread;
-	k_tid_t async_thread_id;
-#endif
+	memset(buffer_tx, 0, sizeof(buffer_tx));
+	memcpy(buffer_tx, tx_data, sizeof(tx_data));
+	memset(buffer2_tx, 0, sizeof(buffer2_tx));
+	memcpy(buffer2_tx, tx2_data, sizeof(tx2_data));
+	memset(large_buffer_tx, 0, sizeof(large_buffer_tx));
+	memcpy(large_buffer_tx, large_tx_data, sizeof(large_tx_data));
+	return NULL;
+}
+
+static void *spi_loopback_setup(void)
+{
+	printf("Testing loopback spec: %s\n", spec_names[spec_idx]);
+	spi_loopback_common_setup();
+	return NULL;
+}
+
+static void run_after_suite(void *unused)
+{
+	spec_idx++;
+}
+
+static void run_after_lock(void *unused)
+{
+	spi_release_dt(&spi_fast);
+	spi_release_dt(&spi_slow);
+	spi_slow.config.operation &= ~SPI_LOCK_ON;
+	spi_fast.config.operation &= ~SPI_LOCK_ON;
+}
+
+ZTEST_SUITE(spi_loopback, NULL, spi_loopback_setup, NULL, NULL, run_after_suite);
+ZTEST_SUITE(spi_extra_api_features, NULL, spi_loopback_common_setup, NULL, NULL, run_after_lock);
+
+struct k_thread async_thread;
+k_tid_t async_thread_id;
+#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
+K_THREAD_STACK_DEFINE(spi_async_stack, STACK_SIZE);
 
-	LOG_INF("SPI test on buffers TX/RX %p/%p" FRAME_SIZE_STR DMA_ENABLED_STR,
+void test_main(void)
+{
+	printf("SPI test on buffers TX/RX %p/%p, frame size = %d"
+#ifdef CONFIG_DMA
+		", DMA enabled"
+#ifndef CONFIG_NOCACHE_MEMORY
+		" (without CONFIG_NOCACHE_MEMORY)"
+#endif
+#endif /* CONFIG_DMA */
+			"\n",
 			buffer_tx,
-			buffer_rx);
+			buffer_rx,
+			FRAME_SIZE);
 
 #if (CONFIG_SPI_ASYNC)
 	async_thread_id = k_thread_create(&async_thread,
@@ -740,66 +518,12 @@ ZTEST(spi_loopback, test_spi_loopback)
 					  &async_evt, &caller, NULL,
 					  K_PRIO_COOP(7), 0, K_NO_WAIT);
 #endif
-	zassert_true(spi_is_ready_dt(&spi_slow), "Slow spi lookback device is not ready");
-
-	LOG_INF("SPI test slow config");
-
-	if (spi_complete_multiple(&spi_slow) ||
-	    spi_complete_loop(&spi_slow) ||
-	    spi_null_tx_buf(&spi_slow) ||
-	    spi_rx_half_start(&spi_slow) ||
-	    spi_rx_half_end(&spi_slow) ||
-	    spi_rx_every_4(&spi_slow) ||
-	    spi_rx_bigger_than_tx(&spi_slow) ||
-	    spi_complete_large_transfers(&spi_slow)
-#if (CONFIG_SPI_ASYNC)
-	    || spi_async_call(&spi_slow)
-#endif
-	    ) {
-		goto end;
-	}
-
-	zassert_true(spi_is_ready_dt(&spi_fast), "Fast spi lookback device is not ready");
-
-	LOG_INF("SPI test fast config");
-
-	if (spi_complete_multiple(&spi_fast) ||
-	    spi_complete_loop(&spi_fast) ||
-	    spi_null_tx_buf(&spi_fast) ||
-	    spi_rx_half_start(&spi_fast) ||
-	    spi_rx_half_end(&spi_fast) ||
-	    spi_rx_every_4(&spi_fast) ||
-	    spi_rx_bigger_than_tx(&spi_fast) ||
-	    spi_complete_large_transfers(&spi_fast)
-#if (CONFIG_SPI_ASYNC)
-	    || spi_async_call(&spi_fast)
-#endif
-	    ) {
-		goto end;
-	}
 
-	if (spi_resource_lock_test(&spi_slow, &spi_fast)) {
-		goto end;
-	}
+	ztest_run_all(NULL, false, ARRAY_SIZE(loopback_specs), 1);
 
-	LOG_INF("All tx/rx passed");
-end:
 #if (CONFIG_SPI_ASYNC)
 	k_thread_abort(async_thread_id);
-#else
-	;
 #endif
-}
 
-static void *spi_loopback_setup(void)
-{
-	memset(buffer_tx, 0, sizeof(buffer_tx));
-	memcpy(buffer_tx, tx_data, sizeof(tx_data));
-	memset(buffer2_tx, 0, sizeof(buffer2_tx));
-	memcpy(buffer2_tx, tx2_data, sizeof(tx2_data));
-	memset(large_buffer_tx, 0, sizeof(large_buffer_tx));
-	memcpy(large_buffer_tx, large_tx_data, sizeof(large_tx_data));
-	return NULL;
+	ztest_verify_all_test_suites_ran();
 }
-
-ZTEST_SUITE(spi_loopback, NULL, spi_loopback_setup, NULL, NULL, NULL);
diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml
index 08448366e52e5..bf65221f61d48 100644
--- a/tests/drivers/spi/spi_loopback/testcase.yaml
+++ b/tests/drivers/spi/spi_loopback/testcase.yaml
@@ -30,6 +30,7 @@ tests:
   drivers.spi.loopback.rtio:
     extra_configs:
       - CONFIG_SPI_RTIO=y
+      - CONFIG_SPI_RTIO_FALLBACK_MSGS=5
     platform_allow:
       - robokit1
       - mimxrt1170_evk/mimxrt1176/cm7
@@ -173,35 +174,45 @@ tests:
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=y
       - CONFIG_SPI_PL022_DMA=n
-    platform_allow: rpi_pico
+    platform_allow:
+      - rpi_pico
+      - pico_plus2/rp2350b/m33
   drivers.spi.pl022_spi_dma.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/rpi_pico_pl022_dma.overlay"
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=n
       - CONFIG_SPI_PL022_DMA=y
       - CONFIG_DMA=y
-    platform_allow: rpi_pico
+    platform_allow:
+      - rpi_pico
+      - pico_plus2/rp2350b/m33
   drivers.spi.pl022_spi_dma_and_interrupt.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/rpi_pico_pl022_dma.overlay"
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=y
       - CONFIG_SPI_PL022_DMA=y
       - CONFIG_DMA=y
-    platform_allow: rpi_pico
+    platform_allow:
+      - rpi_pico
+      - pico_plus2/rp2350b/m33
   drivers.spi.pl022_spi_dma_no_dma_props.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/rpi_pico_pl022.overlay"
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=n
       - CONFIG_SPI_PL022_DMA=y
       - CONFIG_DMA=y
-    platform_allow: rpi_pico
+    platform_allow:
+      - rpi_pico
+      - pico_plus2/rp2350b/m33
   drivers.spi.pl022_spi_dma_and_interrupt_no_dma_props.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/rpi_pico_pl022.overlay"
     extra_configs:
       - CONFIG_SPI_PL022_INTERRUPT=y
       - CONFIG_SPI_PL022_DMA=y
       - CONFIG_DMA=y
-    platform_allow: rpi_pico
+    platform_allow:
+      - rpi_pico
+      - pico_plus2/rp2350b/m33
   drivers.spi.pio_spi.loopback:
     extra_args:
       - DTC_OVERLAY_FILE="boards/rpi_pico_pio.overlay"
@@ -212,10 +223,45 @@ tests:
     filter: CONFIG_DT_HAS_NXP_FLEXIO_ENABLED and
             CONFIG_DT_HAS_NXP_FLEXIO_SPI_ENABLED
     platform_allow: mimxrt1064_evk
-  drivers.spi.nrf_fast:
+  drivers.spi.mimxrt1040evk_flexio_spi.loopback:
+    extra_args: DTC_OVERLAY_FILE="boards/mimxrt1040_evk_flexio_spi.overlay"
+    filter: CONFIG_DT_HAS_NXP_FLEXIO_ENABLED and
+            CONFIG_DT_HAS_NXP_FLEXIO_SPI_ENABLED
+    platform_allow: mimxrt1040_evk
+  drivers.spi.nrf54h_fast_8mhz:
     extra_args: DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
+  drivers.spi.nrf54h_fast_16mhz:
+    extra_args:
+      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_16mhz.overlay"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+  drivers.spi.nrf54h_fast_32mhz:
+    extra_args:
+      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
+      - EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_32mhz.overlay"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+  drivers.spi.nrf54l_8mhz:
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_8mhz.overlay"
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+  drivers.spi.nrf54l_16mhz:
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_16mhz.overlay"
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+  drivers.spi.nrf54l_32mhz:
+    extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf_at_32mhz.overlay"
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
   drivers.spi.ke1xz_flexio_spi.loopback:
     extra_args: DTC_OVERLAY_FILE="boards/frdm_ke1xz_flexio_spi.overlay"
     filter: CONFIG_DT_HAS_NXP_FLEXIO_ENABLED and
@@ -234,7 +280,7 @@ tests:
       - s32z2xxdc2/s32z270/rtu1
   drivers.spi.max32_spi_rtio.loopback:
     extra_args:
-      - OVERLAY_CONFIG="overlay-max32-spi-rtio.conf"
+      - EXTRA_CONF_FILE="overlay-max32-spi-rtio.conf"
     filter: CONFIG_SOC_FAMILY_MAX32
     platform_allow:
       - apard32690/max32690/m4
@@ -243,3 +289,19 @@ tests:
       - CONFIG_PM_DEVICE=y
       - CONFIG_PM_DEVICE_RUNTIME=y
     filter: CONFIG_SOC_FAMILY_NORDIC_NRF
+  drivers.spi.silabs_s2.loopback.no_async:
+    filter: CONFIG_SOC_FAMILY_SILABS_S2
+    platform_allow:
+      - xg24_rb4187c
+      - xg29_rb4412a
+    extra_configs:
+      - CONFIG_SPI_SILABS_EUSART_DMA=n
+      - CONFIG_SPI_ASYNC=n
+  drivers.spi.silabs_s2.loopback.dma.no_async:
+    filter: CONFIG_SOC_FAMILY_SILABS_S2
+    platform_allow:
+      - xg24_rb4187c
+      - xg29_rb4412a
+    extra_configs:
+      - CONFIG_SPI_SILABS_EUSART_DMA=y
+      - CONFIG_SPI_ASYNC=n
diff --git a/tests/drivers/stepper/drv8424/api/CMakeLists.txt b/tests/drivers/stepper/drv8424/api/CMakeLists.txt
deleted file mode 100644
index 81e4018657b0f..0000000000000
--- a/tests/drivers/stepper/drv8424/api/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2024 Navimatix GmbH
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(stepper_drv8424_api)
-target_sources(app PRIVATE
-	src/main.c
-)
diff --git a/tests/drivers/stepper/drv8424/api/boards/mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/tests/drivers/stepper/drv8424/api/boards/mimxrt1060_evk_mimxrt1062_qspi_B.overlay
deleted file mode 100644
index cb4082a32dd76..0000000000000
--- a/tests/drivers/stepper/drv8424/api/boards/mimxrt1060_evk_mimxrt1062_qspi_B.overlay
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2024 Navimatix GmbH
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	zephyr,user {
-		stepper-motors = <&drv8424 0>;
-	};
-};
-
-&lpi2c1 {
-	status = "okay";
-
-	mikroe_stepper_gpios: mikroe_stepper_ctrl_tca9538a@70 {
-		status = "okay";
-		compatible = "ti,tca9538";
-
-		reg = <0x70>;
-
-		gpio-controller;
-		ngpios = <8>;
-		#gpio-cells = <2>;
-
-		gpio-reserved-ranges = <7 1>;
-
-		gpio-line-names =
-			"M0",
-			"M1",
-			"DEC0",
-			"DEC1",
-			"TOFF",
-			"STP",
-			"DIR";
-	};
-};
-
-/ {
-	drv8424: drv8424 {
-		status = "okay";
-		compatible = "ti,drv8424";
-
-		dir-gpios = <&arduino_header 9 0>; /* D3 */
-		step-gpios = <&arduino_header 10 0>; /* D4 */
-		sleep-gpios = <&arduino_header 8 GPIO_ACTIVE_LOW>; /* D2 */
-		en-gpios  = <&arduino_header 11 0>; /* D5 */
-		m0-gpios = <&mikroe_stepper_gpios 0 0>;
-		m1-gpios = <&mikroe_stepper_gpios 1 0>;
-		counter = <&pit0_channel0>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-		#stepper-motor-cells = <0>;
-	};
-};
-
-&pit0_channel0 {
-	status = "okay";
-};
diff --git a/tests/drivers/stepper/drv8424/api/boards/mimxrt1060_evk_mimxrt1062_qspi_C.overlay b/tests/drivers/stepper/drv8424/api/boards/mimxrt1060_evk_mimxrt1062_qspi_C.overlay
deleted file mode 100644
index cb4082a32dd76..0000000000000
--- a/tests/drivers/stepper/drv8424/api/boards/mimxrt1060_evk_mimxrt1062_qspi_C.overlay
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2024 Navimatix GmbH
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	zephyr,user {
-		stepper-motors = <&drv8424 0>;
-	};
-};
-
-&lpi2c1 {
-	status = "okay";
-
-	mikroe_stepper_gpios: mikroe_stepper_ctrl_tca9538a@70 {
-		status = "okay";
-		compatible = "ti,tca9538";
-
-		reg = <0x70>;
-
-		gpio-controller;
-		ngpios = <8>;
-		#gpio-cells = <2>;
-
-		gpio-reserved-ranges = <7 1>;
-
-		gpio-line-names =
-			"M0",
-			"M1",
-			"DEC0",
-			"DEC1",
-			"TOFF",
-			"STP",
-			"DIR";
-	};
-};
-
-/ {
-	drv8424: drv8424 {
-		status = "okay";
-		compatible = "ti,drv8424";
-
-		dir-gpios = <&arduino_header 9 0>; /* D3 */
-		step-gpios = <&arduino_header 10 0>; /* D4 */
-		sleep-gpios = <&arduino_header 8 GPIO_ACTIVE_LOW>; /* D2 */
-		en-gpios  = <&arduino_header 11 0>; /* D5 */
-		m0-gpios = <&mikroe_stepper_gpios 0 0>;
-		m1-gpios = <&mikroe_stepper_gpios 1 0>;
-		counter = <&pit0_channel0>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-		#stepper-motor-cells = <0>;
-	};
-};
-
-&pit0_channel0 {
-	status = "okay";
-};
diff --git a/tests/drivers/stepper/drv8424/api/boards/native_sim.overlay b/tests/drivers/stepper/drv8424/api/boards/native_sim.overlay
deleted file mode 100644
index 39352f817f17a..0000000000000
--- a/tests/drivers/stepper/drv8424/api/boards/native_sim.overlay
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2024 Navimatix GmbH
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	drv8424: drv8424 {
-		status = "okay";
-		compatible = "ti,drv8424";
-
-
-		dir-gpios = <&gpio1 0 0>; /* D3 */
-		step-gpios = <&gpio1 1 0>; /* D4 */
-		sleep-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* D2 */
-		en-gpios = <&gpio2 1 0>; /* 5 */
-		m0-gpios = <&gpio3 0 0>;
-		m1-gpios = <&gpio3 1 0>;
-		counter = <&counter0>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-		#stepper-motor-cells = <0>;
-	};
-
-	gpio1: gpio1 {
-		compatible = "zephyr,gpio-emul";
-		#gpio-cells = <0x2>;
-		status = "okay";
-		gpio-controller;
-	};
-
-	gpio2: gpio2 {
-		compatible = "zephyr,gpio-emul";
-		#gpio-cells = <0x2>;
-		status = "okay";
-		gpio-controller;
-	};
-
-	gpio3: gpio3 {
-		compatible = "zephyr,gpio-emul";
-		#gpio-cells = <0x2>;
-		status = "okay";
-		gpio-controller;
-	};
-};
diff --git a/tests/drivers/stepper/drv8424/api/boards/nucleo_f767zi.overlay b/tests/drivers/stepper/drv8424/api/boards/nucleo_f767zi.overlay
deleted file mode 100644
index ad13d43bead71..0000000000000
--- a/tests/drivers/stepper/drv8424/api/boards/nucleo_f767zi.overlay
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2024 Navimatix GmbH
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	zephyr,user {
-		stepper-motors = <&drv8424 0>;
-	};
-};
-
-&i2c1 {
-	status = "okay";
-
-	mikroe_stepper_gpios: mikroe_stepper_ctrl_tca9538a@70 {
-		status = "okay";
-		compatible = "ti,tca9538";
-
-		reg = <0x70>;
-
-		gpio-controller;
-		ngpios = <8>;
-		#gpio-cells = <2>;
-
-		gpio-reserved-ranges = <7 1>;
-
-		gpio-line-names =
-			"M0",
-			"M1",
-			"DEC0",
-			"DEC1",
-			"TOFF",
-			"STP",
-			"DIR";
-	};
-};
-
-/ {
-	 drv8424: drv8424 {
-		status = "okay";
-		compatible = "ti,drv8424";
-
-		dir-gpios = <&arduino_header 18 0>; /* D12 */
-		step-gpios = <&arduino_header 19 0>; /* D13 */
-		sleep-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>; /* D9 */
-		en-gpios  = <&arduino_header 14 0>; /* D8 */
-		m0-gpios = <&mikroe_stepper_gpios 0 0>;
-		m1-gpios = <&mikroe_stepper_gpios 1 0>;
-		counter = <&counter2>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-		#stepper-motor-cells = <0>;
-	};
-};
-
-&timers2 {
-	status = "okay";
-	counter2: counter {
-		status = "okay";
-	};
-};
diff --git a/tests/drivers/stepper/drv8424/api/src/main.c b/tests/drivers/stepper/drv8424/api/src/main.c
deleted file mode 100644
index ca0674ad5afaf..0000000000000
--- a/tests/drivers/stepper/drv8424/api/src/main.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Copyright 2024 Navimatix GmbH
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/kernel.h>
-#include <zephyr/ztest_assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <zephyr/ztest.h>
-#include <zephyr/drivers/stepper.h>
-
-struct drv8424_api_fixture {
-	const struct device *dev;
-	stepper_event_callback_t callback;
-};
-
-struct k_poll_signal stepper_signal;
-struct k_poll_event stepper_event;
-
-static void drv8424_api_print_event_callback(const struct device *dev, enum stepper_event event,
-					     void *dummy)
-{
-	switch (event) {
-	case STEPPER_EVENT_STEPS_COMPLETED:
-		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_STEPS_COMPLETED);
-		break;
-	case STEPPER_EVENT_LEFT_END_STOP_DETECTED:
-		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_LEFT_END_STOP_DETECTED);
-		break;
-	case STEPPER_EVENT_RIGHT_END_STOP_DETECTED:
-		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_RIGHT_END_STOP_DETECTED);
-		break;
-	case STEPPER_EVENT_STALL_DETECTED:
-		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_STALL_DETECTED);
-		break;
-	default:
-		break;
-	}
-}
-
-static void *drv8424_api_setup(void)
-{
-	static struct drv8424_api_fixture fixture = {
-		.dev = DEVICE_DT_GET(DT_NODELABEL(drv8424)),
-		.callback = drv8424_api_print_event_callback,
-	};
-
-	k_poll_signal_init(&stepper_signal);
-	k_poll_event_init(&stepper_event, K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY,
-			  &stepper_signal);
-
-	zassert_not_null(fixture.dev);
-	return &fixture;
-}
-
-static void drv8424_api_before(void *f)
-{
-	struct drv8424_api_fixture *fixture = f;
-	(void)stepper_set_reference_position(fixture->dev, 0);
-	(void)stepper_set_micro_step_res(fixture->dev, 1);
-	k_poll_signal_reset(&stepper_signal);
-}
-
-static void drv8424_api_after(void *f)
-{
-	struct drv8424_api_fixture *fixture = f;
-	(void)stepper_enable(fixture->dev, false);
-}
-
-ZTEST_F(drv8424_api, test_micro_step_res_set)
-{
-	(void)stepper_set_micro_step_res(fixture->dev, 4);
-	enum stepper_micro_step_resolution res;
-	(void)stepper_get_micro_step_res(fixture->dev, &res);
-	zassert_equal(res, 4, "Micro step resolution not set correctly, should be %d but is %d", 4,
-		      res);
-}
-
-ZTEST_F(drv8424_api, test_micro_step_res_set_incorrect_value_detection)
-{
-	int ret = 0;
-
-	ret = stepper_set_micro_step_res(fixture->dev, 3);
-	zassert_equal(ret, -EINVAL, "Command should fail with error %d but returned %d", -EINVAL,
-		      ret);
-}
-
-ZTEST_F(drv8424_api, test_actual_position_set)
-{
-	int32_t pos = 100u;
-	(void)stepper_set_reference_position(fixture->dev, pos);
-	(void)stepper_get_actual_position(fixture->dev, &pos);
-	zassert_equal(pos, 100u, "Actual position should be %u but is %u", 100u, pos);
-}
-
-ZTEST_F(drv8424_api, test_is_not_moving_when_disabled)
-{
-	int32_t steps = 100;
-	bool moving = true;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)stepper_enable(fixture->dev, false);
-	(void)stepper_is_moving(fixture->dev, &moving);
-	zassert_false(moving, "Driver should not be in state is_moving after being disabled");
-}
-
-ZTEST_F(drv8424_api, test_position_not_updating_when_disabled)
-{
-	int32_t steps = 1000;
-	int32_t position_1 = 0;
-	int32_t position_2 = 0;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)stepper_enable(fixture->dev, false);
-	(void)stepper_get_actual_position(fixture->dev, &position_1);
-	k_msleep(100);
-	(void)stepper_get_actual_position(fixture->dev, &position_2);
-	zassert_equal(position_2, position_1,
-		      "Actual position should not have changed from %d but is %d", position_1,
-		      position_2);
-}
-
-ZTEST_F(drv8424_api, test_is_not_moving_when_reenabled_after_movement)
-{
-	int32_t steps = 1000;
-	bool moving = true;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)stepper_enable(fixture->dev, false);
-	(void)k_msleep(100);
-	(void)stepper_enable(fixture->dev, true);
-	(void)k_msleep(100);
-	(void)stepper_is_moving(fixture->dev, &moving);
-	zassert_false(moving, "Driver should not be in state is_moving after being reenabled");
-}
-ZTEST_F(drv8424_api, test_position_not_updating_when_reenabled_after_movement)
-{
-	int32_t steps = 1000;
-	int32_t position_1 = 0;
-	int32_t position_2 = 0;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)stepper_enable(fixture->dev, false);
-	(void)stepper_get_actual_position(fixture->dev, &position_1);
-	(void)k_msleep(100);
-	(void)stepper_enable(fixture->dev, true);
-	(void)k_msleep(100);
-	(void)stepper_get_actual_position(fixture->dev, &position_2);
-	zassert_equal(position_2, position_1,
-		      "Actual position should not have changed from %d but is %d", position_1,
-		      position_2);
-}
-
-ZTEST_F(drv8424_api, test_move_to_positive_direction_movement)
-{
-	int32_t pos = 50;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_to(fixture->dev, pos);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_get_actual_position(fixture->dev, &pos);
-	zassert_equal(pos, 50u, "Target position should be %d but is %d", 50u, pos);
-}
-
-ZTEST_F(drv8424_api, test_move_to_negative_direction_movement)
-{
-	int32_t pos = -50;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_to(fixture->dev, pos);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_get_actual_position(fixture->dev, &pos);
-	zassert_equal(pos, -50, "Target position should be %d but is %d", -50, pos);
-}
-
-ZTEST_F(drv8424_api, test_move_to_identical_current_and_target_position)
-{
-	int32_t pos = 0;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_to(fixture->dev, pos);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_get_actual_position(fixture->dev, &pos);
-	zassert_equal(pos, 0, "Target position should not have changed from %d but is %d", 0, pos);
-}
-
-ZTEST_F(drv8424_api, test_move_to_is_moving_true_while_moving)
-{
-	int32_t pos = 50;
-	bool moving = false;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_to(fixture->dev, pos);
-	(void)stepper_is_moving(fixture->dev, &moving);
-	zassert_true(moving, "Driver should be in state is_moving while moving");
-}
-
-ZTEST_F(drv8424_api, test_move_to_is_moving_false_when_completed)
-{
-	int32_t pos = 50;
-	bool moving = false;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_to(fixture->dev, pos);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_is_moving(fixture->dev, &moving);
-	zassert_false(moving, "Driver should not be in state is_moving after finishing");
-}
-
-ZTEST_F(drv8424_api, test_move_to_no_movement_when_disabled)
-{
-	int32_t pos = 50;
-	int32_t curr_pos = 50;
-	int32_t ret = 0;
-
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_enable(fixture->dev, false);
-
-	ret = stepper_move_to(fixture->dev, pos);
-	zassert_equal(ret, -ECANCELED, "Move_to should fail with error code %d but returned %d",
-		      -ECANCELED, ret);
-	(void)stepper_get_actual_position(fixture->dev, &curr_pos);
-	zassert_equal(curr_pos, 0, "Current position should not have changed from %d but is %d", 0,
-		      curr_pos);
-}
-
-ZTEST_F(drv8424_api, test_move_by_positive_step_count)
-{
-	int32_t steps = 50;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_get_actual_position(fixture->dev, &steps);
-	zassert_equal(steps, 50u, "Target position should be %d but is %d", 50u, steps);
-}
-
-ZTEST_F(drv8424_api, test_move_by_negative_step_count)
-{
-	int32_t steps = -50;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_get_actual_position(fixture->dev, &steps);
-	zassert_equal(steps, -50, "Target position should be %d but is %d", -50, steps);
-}
-
-ZTEST_F(drv8424_api, test_move_by_zero_steps_no_movement)
-{
-	int32_t steps = 0;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_get_actual_position(fixture->dev, &steps);
-	zassert_equal(steps, 0, "Target position should be %d but is %d", 0, steps);
-}
-
-ZTEST_F(drv8424_api, test_move_by_zero_step_interval)
-{
-	int32_t steps = 100;
-	int32_t ret = 0;
-	int32_t pos = 100;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_enable(fixture->dev, false);
-	ret = stepper_move_by(fixture->dev, steps);
-
-	zassert_not_equal(ret, 0, "Command should fail with an error code, but returned 0");
-	k_msleep(100);
-	(void)stepper_get_actual_position(fixture->dev, &pos);
-	zassert_equal(pos, 0, "Target position should not have changed from %d but is %d", 0, pos);
-}
-
-ZTEST_F(drv8424_api, test_move_by_is_moving_true_while_moving)
-{
-	int32_t steps = 50;
-	bool moving = false;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)stepper_is_moving(fixture->dev, &moving);
-	zassert_true(moving, "Driver should be in state is_moving");
-}
-
-ZTEST_F(drv8424_api, test_move_by_is_moving_false_when_completed)
-{
-	int32_t steps = 50;
-	bool moving = true;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
-	(void)stepper_move_by(fixture->dev, steps);
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
-
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "No event detected");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
-		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
-	(void)stepper_is_moving(fixture->dev, &moving);
-	zassert_false(moving, "Driver should not be in state is_moving after completion");
-}
-
-ZTEST_F(drv8424_api, test_move_by_no_movement_when_disabled)
-{
-	int32_t steps = 100;
-	int32_t curr_pos = 100;
-	int32_t ret = 0;
-
-	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
-	(void)stepper_enable(fixture->dev, false);
-
-	ret = stepper_move_by(fixture->dev, steps);
-	zassert_equal(ret, -ECANCELED, "Move_by should fail with error code %d but returned %d",
-		      -ECANCELED, ret);
-	(void)stepper_get_actual_position(fixture->dev, &curr_pos);
-	zassert_equal(curr_pos, 0, "Current position should not have changed from %d but is %d", 0,
-		      curr_pos);
-}
-
-ZTEST_F(drv8424_api, test_run_positive_direction_correct_position)
-{
-	uint64_t step_interval = 20000000;
-	int32_t steps = 0;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
-	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
-	k_busy_wait(110000);
-
-	(void)stepper_get_actual_position(fixture->dev, &steps);
-	zassert_true(IN_RANGE(steps, 4, 6), "Current position should be between 4 and 6 but is %d",
-		     steps);
-}
-
-ZTEST_F(drv8424_api, test_run_negative_direction_correct_position)
-{
-	uint64_t step_interval = 20000000;
-	int32_t steps = 0;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
-	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_NEGATIVE);
-	k_busy_wait(110000);
-
-	(void)stepper_get_actual_position(fixture->dev, &steps);
-	zassert_true(IN_RANGE(steps, -6, 4),
-		     "Current position should be between -6 and -4 but is %d", steps);
-}
-
-ZTEST_F(drv8424_api, test_run_zero_step_interval_correct_position)
-{
-	uint64_t step_interval = 0;
-	int32_t steps = 0;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
-	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
-	k_msleep(100);
-
-	zassert_equal(steps, 0, "Current position should not have changed from %d but is %d", 0,
-		      steps);
-}
-
-ZTEST_F(drv8424_api, test_run_is_moving_true_when_step_interval_greater_zero)
-{
-	uint64_t step_interval = 20000000;
-	bool moving = false;
-
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
-	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
-	(void)stepper_is_moving(fixture->dev, &moving);
-	zassert_true(moving, "Driver should be in state is_moving");
-	(void)stepper_enable(fixture->dev, false);
-}
-
-ZTEST_F(drv8424_api, test_run_no_movement_when_disabled)
-{
-	uint64_t step_interval = 20000000;
-	int32_t steps = 50;
-	int32_t ret = 0;
-
-	(void)stepper_enable(fixture->dev, false);
-	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
-
-	ret = stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
-	zassert_equal(ret, -ECANCELED, "Run should fail with error code %d but returned %d",
-		      -ECANCELED, ret);
-	(void)stepper_get_actual_position(fixture->dev, &steps);
-	zassert_equal(steps, 0, "Current position should not have changed from %d but is %d", 0,
-		      steps);
-}
-
-ZTEST_SUITE(drv8424_api, NULL, drv8424_api_setup, drv8424_api_before, drv8424_api_after, NULL);
diff --git a/tests/drivers/stepper/drv8424/api/testcase.yaml b/tests/drivers/stepper/drv8424/api/testcase.yaml
deleted file mode 100644
index 21b5ba05a2433..0000000000000
--- a/tests/drivers/stepper/drv8424/api/testcase.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Navimatix GmbH
-# SPDX-License-Identifier: Apache-2.0
-
-tests:
-  drivers.stepper.drv8424.api:
-    tags:
-      - drivers
-      - stepper
-      - api
-      - drv8424
-    platform_allow:
-      - nucleo_f767zi
-      - mimxrt1060_evk/mimxrt1062/qspi
-      - native_sim
diff --git a/tests/drivers/stepper/drv8424/emul/CMakeLists.txt b/tests/drivers/stepper/drv8424/emul/CMakeLists.txt
deleted file mode 100644
index 638254b96e335..0000000000000
--- a/tests/drivers/stepper/drv8424/emul/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2024 Navimatix GmbH
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(stepper_drv8424_emul)
-target_sources(app PRIVATE
-	src/main.c
-)
diff --git a/tests/drivers/stepper/drv8424/emul/boards/native_sim.overlay b/tests/drivers/stepper/drv8424/emul/boards/native_sim.overlay
deleted file mode 100644
index 2798c72ab1658..0000000000000
--- a/tests/drivers/stepper/drv8424/emul/boards/native_sim.overlay
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2024 Navimatix GmbH
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-
-	drv8424: drv8424 {
-		status = "okay";
-		compatible = "ti,drv8424";
-
-		dir-gpios = <&gpio1 0 0>; /* D3 */
-		step-gpios = <&gpio1 1 0>; /* D4 */
-		sleep-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* D2 */
-		en-gpios = <&gpio2 1 0>; /* 5 */
-		m0-gpios = <&gpio3 0 0>;
-		m1-gpios = <&gpio3 1 0>;
-		counter = <&counter0>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-		#stepper-motor-cells = <0>;
-	};
-
-	gpio1: gpio1 {
-		compatible = "zephyr,gpio-emul";
-		#gpio-cells = <0x2>;
-		status = "okay";
-		gpio-controller;
-	};
-
-	gpio2: gpio2 {
-		compatible = "zephyr,gpio-emul";
-		#gpio-cells = <0x2>;
-		status = "okay";
-		gpio-controller;
-	};
-
-	gpio3: gpio3 {
-		compatible = "zephyr,gpio-emul";
-		#gpio-cells = <0x2>;
-		status = "okay";
-		gpio-controller;
-	};
-};
diff --git a/tests/drivers/stepper/drv8424/emul/src/main.c b/tests/drivers/stepper/drv8424/emul/src/main.c
deleted file mode 100644
index 79615a20d0c5c..0000000000000
--- a/tests/drivers/stepper/drv8424/emul/src/main.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2024 Navimatix GmbH
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/kernel.h>
-#include <zephyr/ztest_assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <zephyr/ztest.h>
-#include <zephyr/drivers/stepper.h>
-#include <zephyr/drivers/gpio/gpio_emul.h>
-
-struct drv8424_emul_fixture {
-	const struct device *dev;
-};
-
-struct gpio_dt_spec en_pin = GPIO_DT_SPEC_GET_OR(DT_NODELABEL(drv8424), en_gpios, {0});
-struct gpio_dt_spec slp_pin = GPIO_DT_SPEC_GET_OR(DT_NODELABEL(drv8424), sleep_gpios, {0});
-
-static void *drv8424_emul_setup(void)
-{
-	static struct drv8424_emul_fixture fixture = {
-		.dev = DEVICE_DT_GET(DT_NODELABEL(drv8424)),
-	};
-
-	zassert_not_null(fixture.dev);
-	return &fixture;
-}
-
-static void drv8424_emul_before(void *f)
-{
-	struct drv8424_emul_fixture *fixture = f;
-	(void)stepper_set_reference_position(fixture->dev, 0);
-	(void)stepper_set_micro_step_res(fixture->dev, 1);
-}
-
-static void drv8424_emul_after(void *f)
-{
-	struct drv8424_emul_fixture *fixture = f;
-	(void)stepper_enable(fixture->dev, false);
-}
-
-ZTEST_F(drv8424_emul, test_enable_on_gpio_pins)
-{
-	int value = 0;
-	(void)stepper_enable(fixture->dev, true);
-	/* As sleep and enable pins are optional, check if they exist*/
-	if (en_pin.port != NULL) {
-		value = gpio_emul_output_get(en_pin.port, en_pin.pin);
-		zassert_equal(value, 1, "Enable pin should be set");
-	}
-	if (slp_pin.port != NULL) {
-		value = !gpio_emul_output_get(slp_pin.port, slp_pin.pin);
-		zassert_equal(value, 0, "Sleep pin should not be set");
-	}
-}
-
-ZTEST_F(drv8424_emul, test_enable_off_gpio_pins)
-{
-	int value = 0;
-	/* Enable first to ensure that disable works correctly and the check is not against values
-	 * from initialisation or from previous tests
-	 */
-	(void)stepper_enable(fixture->dev, true);
-	(void)stepper_enable(fixture->dev, false);
-	/* As sleep and enable pins are optional, check if they exist*/
-	if (en_pin.port != NULL) {
-		value = gpio_emul_output_get(en_pin.port, en_pin.pin);
-		zassert_equal(value, 0, "Enable pin should not be set");
-	}
-	if (slp_pin.port != NULL) {
-		value = !gpio_emul_output_get(slp_pin.port, slp_pin.pin);
-		zassert_equal(value, 1, "Sleep pin should be set");
-	}
-}
-
-ZTEST_SUITE(drv8424_emul, NULL, drv8424_emul_setup, drv8424_emul_before, drv8424_emul_after, NULL);
diff --git a/tests/drivers/stepper/drv8424/emul/testcase.yaml b/tests/drivers/stepper/drv8424/emul/testcase.yaml
deleted file mode 100644
index ed1dabbf06110..0000000000000
--- a/tests/drivers/stepper/drv8424/emul/testcase.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2024 Navimatix GmbH
-# SPDX-License-Identifier: Apache-2.0
-
-tests:
-  drivers.stepper.drv8424.emul:
-    tags:
-      - drivers
-      - stepper
-      - drv8424
-    platform_allow:
-      - native_sim
diff --git a/tests/drivers/stepper/drv84xx/api/CMakeLists.txt b/tests/drivers/stepper/drv84xx/api/CMakeLists.txt
new file mode 100644
index 0000000000000..531850812a920
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/api/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Navimatix GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(stepper_drv84xx_api)
+target_sources(app PRIVATE
+	src/main.c
+)
diff --git a/tests/drivers/stepper/drv8424/api/Kconfig b/tests/drivers/stepper/drv84xx/api/Kconfig
similarity index 100%
rename from tests/drivers/stepper/drv8424/api/Kconfig
rename to tests/drivers/stepper/drv84xx/api/Kconfig
diff --git a/tests/drivers/stepper/drv84xx/api/boards/native_sim.overlay b/tests/drivers/stepper/drv84xx/api/boards/native_sim.overlay
new file mode 100644
index 0000000000000..ed869356721fa
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/api/boards/native_sim.overlay
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2024 Navimatix GmbH
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	aliases {
+		stepper = &drv8424;
+	};
+};
+
+/ {
+	drv8424: drv8424 {
+		status = "okay";
+		compatible = "ti,drv84xx";
+
+		dir-gpios = <&gpio1 0 0>; /* D3 */
+		step-gpios = <&gpio1 1 0>; /* D4 */
+		sleep-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* D2 */
+		en-gpios = <&gpio2 1 0>; /* 5 */
+		m0-gpios = <&gpio3 0 0>;
+		m1-gpios = <&gpio3 1 0>;
+		counter = <&counter0>;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+		#stepper-motor-cells = <0>;
+	};
+
+	gpio1: gpio1 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio2: gpio2 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio3: gpio3 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+};
diff --git a/tests/drivers/stepper/drv8424/api/prj.conf b/tests/drivers/stepper/drv84xx/api/prj.conf
similarity index 100%
rename from tests/drivers/stepper/drv8424/api/prj.conf
rename to tests/drivers/stepper/drv84xx/api/prj.conf
diff --git a/tests/drivers/stepper/drv84xx/api/src/main.c b/tests/drivers/stepper/drv84xx/api/src/main.c
new file mode 100644
index 0000000000000..1eb8eaf3ed414
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/api/src/main.c
@@ -0,0 +1,468 @@
+/*
+ * Copyright 2024 Navimatix GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest_assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/stepper.h>
+
+struct drv84xx_api_fixture {
+	const struct device *dev;
+	stepper_event_callback_t callback;
+};
+
+struct k_poll_signal stepper_signal;
+struct k_poll_event stepper_event;
+
+static void drv84xx_api_print_event_callback(const struct device *dev, enum stepper_event event,
+					     void *dummy)
+{
+	switch (event) {
+	case STEPPER_EVENT_STEPS_COMPLETED:
+		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_STEPS_COMPLETED);
+		break;
+	case STEPPER_EVENT_LEFT_END_STOP_DETECTED:
+		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_LEFT_END_STOP_DETECTED);
+		break;
+	case STEPPER_EVENT_RIGHT_END_STOP_DETECTED:
+		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_RIGHT_END_STOP_DETECTED);
+		break;
+	case STEPPER_EVENT_STALL_DETECTED:
+		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_STALL_DETECTED);
+		break;
+	default:
+		break;
+	}
+}
+
+static void *drv84xx_api_setup(void)
+{
+	static struct drv84xx_api_fixture fixture = {
+		.dev = DEVICE_DT_GET(DT_ALIAS(stepper)),
+		.callback = drv84xx_api_print_event_callback,
+	};
+
+	k_poll_signal_init(&stepper_signal);
+	k_poll_event_init(&stepper_event, K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY,
+			  &stepper_signal);
+
+	zassert_not_null(fixture.dev);
+	return &fixture;
+}
+
+static void drv84xx_api_before(void *f)
+{
+	struct drv84xx_api_fixture *fixture = f;
+	(void)stepper_set_reference_position(fixture->dev, 0);
+	(void)stepper_set_micro_step_res(fixture->dev, 1);
+	k_poll_signal_reset(&stepper_signal);
+}
+
+static void drv84xx_api_after(void *f)
+{
+	struct drv84xx_api_fixture *fixture = f;
+	(void)stepper_disable(fixture->dev);
+}
+
+ZTEST_F(drv84xx_api, test_micro_step_res_set)
+{
+	(void)stepper_set_micro_step_res(fixture->dev, 4);
+	enum stepper_micro_step_resolution res;
+	(void)stepper_get_micro_step_res(fixture->dev, &res);
+	zassert_equal(res, 4, "Micro step resolution not set correctly, should be %d but is %d", 4,
+		      res);
+}
+
+ZTEST_F(drv84xx_api, test_actual_position_set)
+{
+	int32_t pos = 100u;
+	(void)stepper_set_reference_position(fixture->dev, pos);
+	(void)stepper_get_actual_position(fixture->dev, &pos);
+	zassert_equal(pos, 100u, "Actual position should be %u but is %u", 100u, pos);
+}
+
+ZTEST_F(drv84xx_api, test_is_not_moving_when_disabled)
+{
+	int32_t steps = 100;
+	bool moving = true;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)stepper_disable(fixture->dev);
+	(void)stepper_is_moving(fixture->dev, &moving);
+	zassert_false(moving, "Driver should not be in state is_moving after being disabled");
+}
+
+ZTEST_F(drv84xx_api, test_position_not_updating_when_disabled)
+{
+	int32_t steps = 1000;
+	int32_t position_1 = 0;
+	int32_t position_2 = 0;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)stepper_disable(fixture->dev);
+	(void)stepper_get_actual_position(fixture->dev, &position_1);
+	k_msleep(100);
+	(void)stepper_get_actual_position(fixture->dev, &position_2);
+	zassert_equal(position_2, position_1,
+		      "Actual position should not have changed from %d but is %d", position_1,
+		      position_2);
+}
+
+ZTEST_F(drv84xx_api, test_is_not_moving_when_reenabled_after_movement)
+{
+	int32_t steps = 1000;
+	bool moving = true;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)stepper_disable(fixture->dev);
+	(void)k_msleep(100);
+	(void)stepper_enable(fixture->dev);
+	(void)k_msleep(100);
+	(void)stepper_is_moving(fixture->dev, &moving);
+	zassert_false(moving, "Driver should not be in state is_moving after being reenabled");
+}
+ZTEST_F(drv84xx_api, test_position_not_updating_when_reenabled_after_movement)
+{
+	int32_t steps = 1000;
+	int32_t position_1 = 0;
+	int32_t position_2 = 0;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)stepper_disable(fixture->dev);
+	(void)stepper_get_actual_position(fixture->dev, &position_1);
+	(void)k_msleep(100);
+	(void)stepper_enable(fixture->dev);
+	(void)k_msleep(100);
+	(void)stepper_get_actual_position(fixture->dev, &position_2);
+	zassert_equal(position_2, position_1,
+		      "Actual position should not have changed from %d but is %d", position_1,
+		      position_2);
+}
+
+ZTEST_F(drv84xx_api, test_move_to_positive_direction_movement)
+{
+	int32_t pos = 50;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_to(fixture->dev, pos);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_get_actual_position(fixture->dev, &pos);
+	zassert_equal(pos, 50u, "Target position should be %d but is %d", 50u, pos);
+}
+
+ZTEST_F(drv84xx_api, test_move_to_negative_direction_movement)
+{
+	int32_t pos = -50;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_to(fixture->dev, pos);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_get_actual_position(fixture->dev, &pos);
+	zassert_equal(pos, -50, "Target position should be %d but is %d", -50, pos);
+}
+
+ZTEST_F(drv84xx_api, test_move_to_identical_current_and_target_position)
+{
+	int32_t pos = 0;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_to(fixture->dev, pos);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_get_actual_position(fixture->dev, &pos);
+	zassert_equal(pos, 0, "Target position should not have changed from %d but is %d", 0, pos);
+}
+
+ZTEST_F(drv84xx_api, test_move_to_is_moving_true_while_moving)
+{
+	int32_t pos = 50;
+	bool moving = false;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_to(fixture->dev, pos);
+	(void)stepper_is_moving(fixture->dev, &moving);
+	zassert_true(moving, "Driver should be in state is_moving while moving");
+}
+
+ZTEST_F(drv84xx_api, test_move_to_is_moving_false_when_completed)
+{
+	int32_t pos = 50;
+	bool moving = false;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_to(fixture->dev, pos);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_is_moving(fixture->dev, &moving);
+	zassert_false(moving, "Driver should not be in state is_moving after finishing");
+}
+
+ZTEST_F(drv84xx_api, test_move_to_no_movement_when_disabled)
+{
+	int32_t pos = 50;
+	int32_t curr_pos = 50;
+	int32_t ret = 0;
+
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_disable(fixture->dev);
+
+	ret = stepper_move_to(fixture->dev, pos);
+	zassert_equal(ret, -ECANCELED, "Move_to should fail with error code %d but returned %d",
+		      -ECANCELED, ret);
+	(void)stepper_get_actual_position(fixture->dev, &curr_pos);
+	zassert_equal(curr_pos, 0, "Current position should not have changed from %d but is %d", 0,
+		      curr_pos);
+}
+
+ZTEST_F(drv84xx_api, test_move_by_positive_step_count)
+{
+	int32_t steps = 50;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_get_actual_position(fixture->dev, &steps);
+	zassert_equal(steps, 50u, "Target position should be %d but is %d", 50u, steps);
+}
+
+ZTEST_F(drv84xx_api, test_move_by_negative_step_count)
+{
+	int32_t steps = -50;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_get_actual_position(fixture->dev, &steps);
+	zassert_equal(steps, -50, "Target position should be %d but is %d", -50, steps);
+}
+
+ZTEST_F(drv84xx_api, test_move_by_zero_steps_no_movement)
+{
+	int32_t steps = 0;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_get_actual_position(fixture->dev, &steps);
+	zassert_equal(steps, 0, "Target position should be %d but is %d", 0, steps);
+}
+
+ZTEST_F(drv84xx_api, test_move_by_zero_step_interval)
+{
+	int32_t steps = 100;
+	int32_t ret = 0;
+	int32_t pos = 100;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_disable(fixture->dev);
+	ret = stepper_move_by(fixture->dev, steps);
+
+	zassert_not_equal(ret, 0, "Command should fail with an error code, but returned 0");
+	k_msleep(100);
+	(void)stepper_get_actual_position(fixture->dev, &pos);
+	zassert_equal(pos, 0, "Target position should not have changed from %d but is %d", 0, pos);
+}
+
+ZTEST_F(drv84xx_api, test_move_by_is_moving_true_while_moving)
+{
+	int32_t steps = 50;
+	bool moving = false;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)stepper_is_moving(fixture->dev, &moving);
+	zassert_true(moving, "Driver should be in state is_moving");
+}
+
+ZTEST_F(drv84xx_api, test_move_by_is_moving_false_when_completed)
+{
+	int32_t steps = 50;
+	bool moving = true;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, NULL);
+	(void)stepper_move_by(fixture->dev, steps);
+	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
+	unsigned int signaled;
+	int result;
+
+	k_poll_signal_check(&stepper_signal, &signaled, &result);
+	zassert_equal(signaled, 1, "No event detected");
+	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED,
+		      "Event was not STEPPER_EVENT_STEPS_COMPLETED event");
+	(void)stepper_is_moving(fixture->dev, &moving);
+	zassert_false(moving, "Driver should not be in state is_moving after completion");
+}
+
+ZTEST_F(drv84xx_api, test_move_by_no_movement_when_disabled)
+{
+	int32_t steps = 100;
+	int32_t curr_pos = 100;
+	int32_t ret = 0;
+
+	(void)stepper_set_microstep_interval(fixture->dev, 20000000);
+	(void)stepper_disable(fixture->dev);
+
+	ret = stepper_move_by(fixture->dev, steps);
+	zassert_equal(ret, -ECANCELED, "Move_by should fail with error code %d but returned %d",
+		      -ECANCELED, ret);
+	(void)stepper_get_actual_position(fixture->dev, &curr_pos);
+	zassert_equal(curr_pos, 0, "Current position should not have changed from %d but is %d", 0,
+		      curr_pos);
+}
+
+ZTEST_F(drv84xx_api, test_run_positive_direction_correct_position)
+{
+	uint64_t step_interval = 20000000;
+	int32_t steps = 0;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
+	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
+	k_busy_wait(110000);
+
+	(void)stepper_get_actual_position(fixture->dev, &steps);
+	zassert_true(IN_RANGE(steps, 4, 6), "Current position should be between 4 and 6 but is %d",
+		     steps);
+}
+
+ZTEST_F(drv84xx_api, test_run_negative_direction_correct_position)
+{
+	uint64_t step_interval = 20000000;
+	int32_t steps = 0;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
+	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_NEGATIVE);
+	k_busy_wait(110000);
+
+	(void)stepper_get_actual_position(fixture->dev, &steps);
+	zassert_true(IN_RANGE(steps, -6, 4),
+		     "Current position should be between -6 and -4 but is %d", steps);
+}
+
+ZTEST_F(drv84xx_api, test_run_zero_step_interval_correct_position)
+{
+	uint64_t step_interval = 0;
+	int32_t steps = 0;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
+	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
+	k_msleep(100);
+
+	zassert_equal(steps, 0, "Current position should not have changed from %d but is %d", 0,
+		      steps);
+}
+
+ZTEST_F(drv84xx_api, test_run_is_moving_true_when_step_interval_greater_zero)
+{
+	uint64_t step_interval = 20000000;
+	bool moving = false;
+
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
+	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
+	(void)stepper_is_moving(fixture->dev, &moving);
+	zassert_true(moving, "Driver should be in state is_moving");
+	(void)stepper_disable(fixture->dev);
+}
+
+ZTEST_F(drv84xx_api, test_run_no_movement_when_disabled)
+{
+	uint64_t step_interval = 20000000;
+	int32_t steps = 50;
+	int32_t ret = 0;
+
+	(void)stepper_disable(fixture->dev);
+	(void)stepper_set_microstep_interval(fixture->dev, step_interval);
+
+	ret = stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
+	zassert_equal(ret, -ECANCELED, "Run should fail with error code %d but returned %d",
+		      -ECANCELED, ret);
+	(void)stepper_get_actual_position(fixture->dev, &steps);
+	zassert_equal(steps, 0, "Current position should not have changed from %d but is %d", 0,
+		      steps);
+}
+
+ZTEST_SUITE(drv84xx_api, NULL, drv84xx_api_setup, drv84xx_api_before, drv84xx_api_after, NULL);
diff --git a/tests/drivers/stepper/drv84xx/api/testcase.yaml b/tests/drivers/stepper/drv84xx/api/testcase.yaml
new file mode 100644
index 0000000000000..ef3e866c983f4
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/api/testcase.yaml
@@ -0,0 +1,12 @@
+# Copyright (c) 2024 Navimatix GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+tests:
+  drivers.stepper.drv84xx.api:
+    tags:
+      - drivers
+      - stepper
+      - api
+      - drv84xx
+    platform_allow:
+      - native_sim
diff --git a/tests/drivers/stepper/drv84xx/emul/CMakeLists.txt b/tests/drivers/stepper/drv84xx/emul/CMakeLists.txt
new file mode 100644
index 0000000000000..8d3c47f47ccd3
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/emul/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Navimatix GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(stepper_drv84xx_emul)
+target_sources(app PRIVATE
+	src/main.c
+)
diff --git a/tests/drivers/stepper/drv8424/emul/Kconfig b/tests/drivers/stepper/drv84xx/emul/Kconfig
similarity index 100%
rename from tests/drivers/stepper/drv8424/emul/Kconfig
rename to tests/drivers/stepper/drv84xx/emul/Kconfig
diff --git a/tests/drivers/stepper/drv84xx/emul/boards/native_sim.overlay b/tests/drivers/stepper/drv84xx/emul/boards/native_sim.overlay
new file mode 100644
index 0000000000000..0ad7728928969
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/emul/boards/native_sim.overlay
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2024 Navimatix GmbH
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+
+	drv84xx: drv84xx {
+		status = "okay";
+		compatible = "ti,drv84xx";
+
+		dir-gpios = <&gpio1 0 0>; /* D3 */
+		step-gpios = <&gpio1 1 0>; /* D4 */
+		sleep-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* D2 */
+		en-gpios = <&gpio2 1 0>; /* 5 */
+		m0-gpios = <&gpio3 0 0>;
+		m1-gpios = <&gpio3 1 0>;
+		counter = <&counter0>;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+		#stepper-motor-cells = <0>;
+	};
+
+	gpio1: gpio1 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio2: gpio2 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio3: gpio3 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+};
diff --git a/tests/drivers/stepper/drv8424/emul/prj.conf b/tests/drivers/stepper/drv84xx/emul/prj.conf
similarity index 100%
rename from tests/drivers/stepper/drv8424/emul/prj.conf
rename to tests/drivers/stepper/drv84xx/emul/prj.conf
diff --git a/tests/drivers/stepper/drv84xx/emul/src/main.c b/tests/drivers/stepper/drv84xx/emul/src/main.c
new file mode 100644
index 0000000000000..c730bc457ce96
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/emul/src/main.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2024 Navimatix GmbH
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest_assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/stepper.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+
+struct drv84xx_emul_fixture {
+	const struct device *dev;
+};
+
+struct gpio_dt_spec en_pin = GPIO_DT_SPEC_GET_OR(DT_NODELABEL(drv84xx), en_gpios, {0});
+struct gpio_dt_spec slp_pin = GPIO_DT_SPEC_GET_OR(DT_NODELABEL(drv84xx), sleep_gpios, {0});
+
+static void *drv84xx_emul_setup(void)
+{
+	static struct drv84xx_emul_fixture fixture = {
+		.dev = DEVICE_DT_GET(DT_NODELABEL(drv84xx)),
+	};
+
+	zassert_not_null(fixture.dev);
+	return &fixture;
+}
+
+static void drv84xx_emul_before(void *f)
+{
+	struct drv84xx_emul_fixture *fixture = f;
+	(void)stepper_set_reference_position(fixture->dev, 0);
+	(void)stepper_set_micro_step_res(fixture->dev, 1);
+}
+
+static void drv84xx_emul_after(void *f)
+{
+	struct drv84xx_emul_fixture *fixture = f;
+	(void)stepper_disable(fixture->dev);
+}
+
+ZTEST_F(drv84xx_emul, test_enable_on_gpio_pins)
+{
+	int value = 0;
+	(void)stepper_enable(fixture->dev);
+	/* As sleep and enable pins are optional, check if they exist*/
+	if (en_pin.port != NULL) {
+		value = gpio_emul_output_get(en_pin.port, en_pin.pin);
+		zassert_equal(value, 1, "Enable pin should be set");
+	}
+	if (slp_pin.port != NULL) {
+		value = !gpio_emul_output_get(slp_pin.port, slp_pin.pin);
+		zassert_equal(value, 0, "Sleep pin should not be set");
+	}
+}
+
+ZTEST_F(drv84xx_emul, test_enable_off_gpio_pins)
+{
+	int value = 0;
+	/* Enable first to ensure that disable works correctly and the check is not against values
+	 * from initialisation or from previous tests
+	 */
+	(void)stepper_enable(fixture->dev);
+	(void)stepper_disable(fixture->dev);
+	/* As sleep and enable pins are optional, check if they exist*/
+	if (en_pin.port != NULL) {
+		value = gpio_emul_output_get(en_pin.port, en_pin.pin);
+		zassert_equal(value, 0, "Enable pin should not be set");
+	}
+	if (slp_pin.port != NULL) {
+		value = !gpio_emul_output_get(slp_pin.port, slp_pin.pin);
+		zassert_equal(value, 1, "Sleep pin should be set");
+	}
+}
+
+ZTEST_SUITE(drv84xx_emul, NULL, drv84xx_emul_setup, drv84xx_emul_before, drv84xx_emul_after, NULL);
diff --git a/tests/drivers/stepper/drv84xx/emul/testcase.yaml b/tests/drivers/stepper/drv84xx/emul/testcase.yaml
new file mode 100644
index 0000000000000..5ea422718caa4
--- /dev/null
+++ b/tests/drivers/stepper/drv84xx/emul/testcase.yaml
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Navimatix GmbH
+# SPDX-License-Identifier: Apache-2.0
+
+tests:
+  drivers.stepper.drv84xx.emul:
+    tags:
+      - drivers
+      - stepper
+      - drv84xx
+    platform_allow:
+      - native_sim
diff --git a/tests/drivers/stepper/shell/src/main.c b/tests/drivers/stepper/shell/src/main.c
index 33ff4f8b0da35..c4c9c5796272e 100644
--- a/tests/drivers/stepper/shell/src/main.c
+++ b/tests/drivers/stepper/shell/src/main.c
@@ -43,16 +43,19 @@ ZTEST_SUITE(stepper_shell, NULL, stepper_shell_setup, NULL, NULL, NULL);
 ZTEST(stepper_shell, test_stepper_enable)
 {
 	const struct shell *sh = shell_backend_dummy_get_ptr();
-	int err = shell_execute_cmd(sh, "stepper enable " FAKE_STEPPER_NAME " on");
+	int err = shell_execute_cmd(sh, "stepper enable " FAKE_STEPPER_NAME);
 
 	ASSERT_STEPPER_FUNC_CALLED(fake_stepper_enable_fake, err);
-	zassert_equal(fake_stepper_enable_fake.arg1_val, true, "wrong enable value");
+	zassert_equal(err, 0, "stepper enable could not be executed");
+}
 
-	RESET_FAKE(fake_stepper_enable);
+ZTEST(stepper_shell, test_stepper_disable)
+{
+	const struct shell *sh = shell_backend_dummy_get_ptr();
+	int err = shell_execute_cmd(sh, "stepper disable " FAKE_STEPPER_NAME);
 
-	err = shell_execute_cmd(sh, "stepper enable " FAKE_STEPPER_NAME " off");
-	ASSERT_STEPPER_FUNC_CALLED(fake_stepper_enable_fake, err);
-	zassert_equal(fake_stepper_enable_fake.arg1_val, false, "wrong enable value");
+	ASSERT_STEPPER_FUNC_CALLED(fake_stepper_disable_fake, err);
+	zassert_equal(err, 0, "stepper disable could not be executed");
 }
 
 ZTEST(stepper_shell, test_stepper_move_by)
@@ -145,6 +148,15 @@ ZTEST(stepper_shell, test_stepper_run_invalid_direction)
 	zassert_not_equal(err, 0, " executed run with invalid direction value");
 }
 
+ZTEST(stepper_shell, test_stepper_stop)
+{
+	const struct shell *sh = shell_backend_dummy_get_ptr();
+	int err = shell_execute_cmd(sh, "stepper stop " FAKE_STEPPER_NAME);
+
+	ASSERT_STEPPER_FUNC_CALLED(fake_stepper_stop_fake, err);
+	zassert_equal(err, 0, "stepper stop could not be executed");
+}
+
 ZTEST(stepper_shell, test_stepper_info)
 {
 	const struct shell *sh = shell_backend_dummy_get_ptr();
diff --git a/tests/drivers/stepper/stepper_api/boards/native_sim.overlay b/tests/drivers/stepper/stepper_api/boards/native_sim.overlay
new file mode 100644
index 0000000000000..4cba3f5b33d1b
--- /dev/null
+++ b/tests/drivers/stepper/stepper_api/boards/native_sim.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Jilay Sandeep Pandya
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	gpio1: gpio1 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio2: gpio2 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio3: gpio3 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio4: gpio4 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+};
diff --git a/tests/drivers/stepper/stepper_api/boards/native_sim_adi_tmc2209.overlay b/tests/drivers/stepper/stepper_api/boards/native_sim_adi_tmc2209.overlay
new file mode 100644
index 0000000000000..caf4f3c5b3a78
--- /dev/null
+++ b/tests/drivers/stepper/stepper_api/boards/native_sim_adi_tmc2209.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Jilay Sandeep Pandya
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "native_sim.overlay"
+
+/ {
+	aliases {
+		stepper =  &adi_tmc2209;
+	};
+};
+
+/ {
+	adi_tmc2209: adi_tmc2209 {
+		status = "okay";
+		compatible = "adi,tmc2209";
+		micro-step-res = <32>;
+		dir-gpios = <&gpio1 0 0>;
+		step-gpios = <&gpio1 1 0>;
+		en-gpios = <&gpio2 1 0>;
+		msx-gpios = <&gpio3 0 0>, <&gpio4 1 0>;
+		counter = <&counter0>;
+	};
+};
diff --git a/tests/drivers/stepper/stepper_api/boards/native_sim_allegro_a4979.overlay b/tests/drivers/stepper/stepper_api/boards/native_sim_allegro_a4979.overlay
new file mode 100644
index 0000000000000..3d1c69339dfa5
--- /dev/null
+++ b/tests/drivers/stepper/stepper_api/boards/native_sim_allegro_a4979.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Jilay Sandeep Pandya
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "native_sim.overlay"
+
+/ {
+	aliases {
+		stepper =  &allegro_a4979;
+	};
+};
+
+/ {
+	allegro_a4979: allegro_a4979 {
+		status = "okay";
+		compatible = "allegro,a4979";
+		micro-step-res = <1>;
+		reset-gpios = <&gpio4 0 0>;
+		dir-gpios = <&gpio1 0 0>;
+		step-gpios = <&gpio1 1 0>;
+		en-gpios = <&gpio2 1 0>;
+		m0-gpios = <&gpio3 0 0>;
+		m1-gpios = <&gpio3 1 0>;
+		counter = <&counter0>;
+	};
+};
diff --git a/tests/drivers/stepper/stepper_api/boards/native_sim_ti_drv84xx.overlay b/tests/drivers/stepper/stepper_api/boards/native_sim_ti_drv84xx.overlay
new file mode 100644
index 0000000000000..0763a19e393b7
--- /dev/null
+++ b/tests/drivers/stepper/stepper_api/boards/native_sim_ti_drv84xx.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Jilay Sandeep Pandya
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "native_sim.overlay"
+
+/ {
+	aliases {
+		stepper =  &ti_drv84xx;
+	};
+};
+
+/ {
+	ti_drv84xx: ti_drv84xx {
+		status = "okay";
+		compatible = "ti,drv84xx";
+		micro-step-res = <8>;
+		dir-gpios = <&gpio1 0 0>;
+		step-gpios = <&gpio1 1 0>;
+		sleep-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
+		en-gpios = <&gpio2 1 0>;
+		m0-gpios = <&gpio3 0 0>;
+		m1-gpios = <&gpio3 1 0>;
+		counter = <&counter0>;
+	};
+};
diff --git a/tests/drivers/stepper/stepper_api/boards/native_sim_zephyr_gpio_stepper.overlay b/tests/drivers/stepper/stepper_api/boards/native_sim_zephyr_gpio_stepper.overlay
new file mode 100644
index 0000000000000..3df8e647466eb
--- /dev/null
+++ b/tests/drivers/stepper/stepper_api/boards/native_sim_zephyr_gpio_stepper.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Jilay Sandeep Pandya
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "native_sim.overlay"
+
+/ {
+	aliases {
+		stepper =  &zephyr_gpio_stepper;
+	};
+};
+
+/ {
+	zephyr_gpio_stepper: zephyr_gpio_stepper {
+		compatible = "zephyr,gpio-stepper";
+		status = "okay";
+		micro-step-res = <1>;
+		gpios = <&gpio1 0 0>,
+				<&gpio2 0 0>,
+				<&gpio3 0 0>,
+				<&gpio4 0 0>;
+	};
+};
diff --git a/tests/drivers/stepper/stepper_api/boards/nucleo_f767zi.conf b/tests/drivers/stepper/stepper_api/boards/nucleo_f767zi.conf
deleted file mode 100644
index aa7ae8a686913..0000000000000
--- a/tests/drivers/stepper/stepper_api/boards/nucleo_f767zi.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2024 Navimatix GmbH
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_GPIO=y
diff --git a/tests/drivers/stepper/stepper_api/boards/nucleo_f767zi.overlay b/tests/drivers/stepper/stepper_api/boards/nucleo_f767zi.overlay
deleted file mode 100644
index deb50e29eb638..0000000000000
--- a/tests/drivers/stepper/stepper_api/boards/nucleo_f767zi.overlay
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2024 Navimatix GmbH
- * SPDX-License-Identifier: Apache-2.0
- */
-
- #include <zephyr/dt-bindings/gpio/gpio.h>
-
-/ {
-	 zephyr,user {
-		 stepper-motors = <&motor_1 0>;
-	 };
-};
-
-/ {
-
-	 motor_1: motor_1 {
-		 status = "okay";
-		 compatible = "ti,drv8424";
-
-
-		 dir-gpios = <&arduino_header 18 0>; /* D12 */
-		 step-gpios = <&arduino_header 19 0>; /* D13 */
-		 sleep-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>; /* D9 */
-		 en-gpios  = <&arduino_header 14 0>; /* D8 */
-		 m0-gpios = <&arduino_header 16 0>;
-		 m1-gpios = <&arduino_header 17 0>;
-		 counter = <&counter2>;
-
-		 #address-cells = <1>;
-		 #size-cells = <0>;
-		 #stepper-motor-cells = <0>;
-
-	 };
-};
-
-&timers2 {
-	 status = "okay";
-	 counter2: counter {
-		 status = "okay";
-	 };
-};
diff --git a/tests/drivers/stepper/stepper_api/boards/nucleo_g071rb.conf b/tests/drivers/stepper/stepper_api/boards/nucleo_g071rb.conf
deleted file mode 100644
index ed533e324c74a..0000000000000
--- a/tests/drivers/stepper/stepper_api/boards/nucleo_g071rb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_GPIO=y
-CONFIG_GPIO_STEPPER=y
diff --git a/tests/drivers/stepper/stepper_api/boards/nucleo_g071rb.overlay b/tests/drivers/stepper/stepper_api/boards/nucleo_g071rb.overlay
deleted file mode 100644
index afd285e9262d8..0000000000000
--- a/tests/drivers/stepper/stepper_api/boards/nucleo_g071rb.overlay
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	motor_1: motor_1 {
-		compatible = "zephyr,gpio-stepper";
-		status = "okay";
-		micro-step-res = <1>;
-		gpios = <&gpioa 9 GPIO_ACTIVE_HIGH>,
-			<&gpioc 7 GPIO_ACTIVE_HIGH>,
-			<&gpiob 0 GPIO_ACTIVE_HIGH>,
-			<&gpioa 7 GPIO_ACTIVE_HIGH>;
-	};
-};
diff --git a/tests/drivers/stepper/stepper_api/boards/qemu_x86_64.conf b/tests/drivers/stepper/stepper_api/boards/qemu_x86_64.conf
deleted file mode 100644
index ed533e324c74a..0000000000000
--- a/tests/drivers/stepper/stepper_api/boards/qemu_x86_64.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_GPIO=y
-CONFIG_GPIO_STEPPER=y
diff --git a/tests/drivers/stepper/stepper_api/boards/qemu_x86_64.overlay b/tests/drivers/stepper/stepper_api/boards/qemu_x86_64.overlay
deleted file mode 100644
index c38d1128bed83..0000000000000
--- a/tests/drivers/stepper/stepper_api/boards/qemu_x86_64.overlay
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/ {
-	test {
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		test_gpio: gpio@deadbeef {
-			compatible = "vnd,gpio";
-			gpio-controller;
-			reg = <0xdeadbeef 0x1000>;
-			#gpio-cells = <0x2>;
-			status = "okay";
-		};
-	};
-};
-
-/ {
-	motor_1: motor_1 {
-		compatible = "zephyr,gpio-stepper";
-		status = "okay";
-		micro-step-res = <1>;
-		gpios = <&test_gpio 0 0>,
-			<&test_gpio 0 0>,
-			<&test_gpio 0 0>,
-			<&test_gpio 0 0>;
-	};
-};
diff --git a/tests/drivers/stepper/stepper_api/boards/qemu_x86_64_zephyr_gpio_stepper.overlay b/tests/drivers/stepper/stepper_api/boards/qemu_x86_64_zephyr_gpio_stepper.overlay
new file mode 100644
index 0000000000000..bfc3161e3b177
--- /dev/null
+++ b/tests/drivers/stepper/stepper_api/boards/qemu_x86_64_zephyr_gpio_stepper.overlay
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/gpio/gpio.h>
+
+/ {
+	aliases {
+		stepper =  &zephyr_gpio_stepper;
+	};
+};
+
+/ {
+	gpio1: gpio1 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio2: gpio2 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio3: gpio3 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+
+	gpio4: gpio4 {
+		compatible = "zephyr,gpio-emul";
+		#gpio-cells = <0x2>;
+		status = "okay";
+		gpio-controller;
+	};
+};
+
+/ {
+	zephyr_gpio_stepper: zephyr_gpio_stepper {
+		compatible = "zephyr,gpio-stepper";
+		status = "okay";
+		micro-step-res = <2>;
+		gpios = <&gpio1 0 0>,
+				<&gpio2 0 0>,
+				<&gpio3 0 0>,
+				<&gpio4 0 0>;
+	};
+};
diff --git a/tests/drivers/stepper/stepper_api/src/main.c b/tests/drivers/stepper/stepper_api/src/main.c
index 024f2bfdfa178..6d264712cfcd2 100644
--- a/tests/drivers/stepper/stepper_api/src/main.c
+++ b/tests/drivers/stepper/stepper_api/src/main.c
@@ -1,12 +1,14 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2025 Jilay Sandeep Pandya
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/stepper.h>
 
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(stepper_api, CONFIG_STEPPER_LOG_LEVEL);
+
 struct stepper_fixture {
 	const struct device *dev;
 	stepper_event_callback_t callback;
@@ -16,10 +18,24 @@ struct k_poll_signal stepper_signal;
 struct k_poll_event stepper_event;
 void *user_data_received;
 
+#define POLL_AND_CHECK_SIGNAL(signal, event, expected_event, timeout)                              \
+	({                                                                                         \
+		do {                                                                               \
+			(void)k_poll(&(event), 1, timeout);                                        \
+			unsigned int signaled;                                                     \
+			int result;                                                                \
+			k_poll_signal_check(&(signal), &signaled, &result);                        \
+			zassert_equal(signaled, 1, "Signal not set");                              \
+			zassert_equal(result, (expected_event), "Signal not set");                 \
+		} while (0);                                                                       \
+	})
+
 static void stepper_print_event_callback(const struct device *dev, enum stepper_event event,
 					 void *user_data)
 {
+	const struct device *dev_callback = user_data;
 	user_data_received = user_data;
+
 	switch (event) {
 	case STEPPER_EVENT_STEPS_COMPLETED:
 		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_STEPS_COMPLETED);
@@ -33,24 +49,30 @@ static void stepper_print_event_callback(const struct device *dev, enum stepper_
 	case STEPPER_EVENT_STALL_DETECTED:
 		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_STALL_DETECTED);
 		break;
+	case STEPPER_EVENT_STOPPED:
+		k_poll_signal_raise(&stepper_signal, STEPPER_EVENT_STOPPED);
+		break;
 	default:
 		break;
 	}
+
+	LOG_DBG("Event %d, %s called for %s, expected for %s\n", event, __func__,
+		dev_callback->name, dev->name);
 }
 
 static void *stepper_setup(void)
 {
 	static struct stepper_fixture fixture = {
-		.dev = DEVICE_DT_GET(DT_NODELABEL(motor_1)),
+		.dev = DEVICE_DT_GET(DT_ALIAS(stepper)),
 		.callback = stepper_print_event_callback,
 	};
 
 	k_poll_signal_init(&stepper_signal);
 	k_poll_event_init(&stepper_event, K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY,
 			  &stepper_signal);
-	user_data_received = NULL;
+
 	zassert_not_null(fixture.dev);
-	(void)stepper_enable(fixture.dev, true);
+	(void)stepper_enable(fixture.dev);
 	return &fixture;
 }
 
@@ -58,46 +80,99 @@ static void stepper_before(void *f)
 {
 	struct stepper_fixture *fixture = f;
 	(void)stepper_set_reference_position(fixture->dev, 0);
+
 	k_poll_signal_reset(&stepper_signal);
+
+	user_data_received = NULL;
 }
 
 ZTEST_SUITE(stepper, NULL, stepper_setup, stepper_before, NULL, NULL);
 
-ZTEST_F(stepper, test_micro_step_res)
+ZTEST_F(stepper, test_set_micro_step_res_incorrect)
+{
+	int ret = stepper_set_micro_step_res(fixture->dev, 127);
+
+	zassert_equal(ret, -ENOTSUP, "Incorrect micro step resolution should return -ENOTSUP");
+}
+
+ZTEST_F(stepper, test_get_micro_step_res)
 {
-	(void)stepper_set_micro_step_res(fixture->dev, 2);
 	enum stepper_micro_step_resolution res;
 	(void)stepper_get_micro_step_res(fixture->dev, &res);
-	zassert_equal(res, 2, "Micro step resolution not set correctly");
+	zassert_equal(res, DT_PROP(DT_ALIAS(stepper), micro_step_res),
+		      "Micro step resolution not set correctly");
+}
+
+ZTEST_F(stepper, test_set_micro_step_interval_invalid_zero)
+{
+	int err = stepper_set_microstep_interval(fixture->dev, 0);
+	if (err == -ENOSYS) {
+		ztest_test_skip();
+	}
+	zassert_equal(err, -EINVAL, "ustep interval cannot be zero");
 }
 
 ZTEST_F(stepper, test_actual_position)
 {
 	int32_t pos = 100u;
-	(void)stepper_set_reference_position(fixture->dev, pos);
-	(void)stepper_get_actual_position(fixture->dev, &pos);
+	int ret;
+
+	ret = stepper_set_reference_position(fixture->dev, pos);
+	zassert_equal(ret, 0, "Failed to set reference position");
+
+	ret = stepper_get_actual_position(fixture->dev, &pos);
+	zassert_equal(ret, 0, "Failed to get actual position");
 	zassert_equal(pos, 100u, "Actual position not set correctly");
 }
 
-ZTEST_F(stepper, test_target_position)
+ZTEST_F(stepper, test_target_position_w_fixed_step_interval)
 {
-	int32_t pos = 100u;
+	int32_t pos = 10u;
+	int ret;
 
-	(void)stepper_set_microstep_interval(fixture->dev, 10000);
+	ret = stepper_set_microstep_interval(fixture->dev, 100 * USEC_PER_SEC);
 
+	if (ret == -ENOSYS) {
+		ztest_test_skip();
+	}
 	/* Pass the function name as user data */
-	(void)stepper_set_event_callback(fixture->dev, fixture->callback, &fixture);
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, (void *)fixture->dev);
 
 	(void)stepper_move_to(fixture->dev, pos);
 
-	(void)k_poll(&stepper_event, 1, K_SECONDS(5));
-	unsigned int signaled;
-	int result;
+	/* timeout is set with 20% tolerance */
+	POLL_AND_CHECK_SIGNAL(stepper_signal, stepper_event, STEPPER_EVENT_STEPS_COMPLETED,
+			      K_MSEC(pos * 120));
 
-	k_poll_signal_check(&stepper_signal, &signaled, &result);
-	zassert_equal(signaled, 1, "Signal not set");
-	zassert_equal(result, STEPPER_EVENT_STEPS_COMPLETED, "Signal not set");
 	(void)stepper_get_actual_position(fixture->dev, &pos);
-	zassert_equal(pos, 100u, "Target position should be %d but is %d", 100u, pos);
-	zassert_equal(user_data_received, &fixture, "User data not received");
+	zassert_equal(pos, 10u, "Target position should be %d but is %d", 10u, pos);
+	zassert_equal(user_data_received, fixture->dev, "User data not received");
+}
+
+ZTEST_F(stepper, test_stop)
+{
+	(void)stepper_set_event_callback(fixture->dev, fixture->callback, (void *)fixture->dev);
+
+	/* Run the stepper in positive direction */
+	(void)stepper_run(fixture->dev, STEPPER_DIRECTION_POSITIVE);
+
+	/* Stop the stepper */
+	int ret = stepper_stop(fixture->dev);
+	bool is_moving;
+
+	if (ret == 0) {
+		POLL_AND_CHECK_SIGNAL(stepper_signal, stepper_event, STEPPER_EVENT_STOPPED,
+				      K_NO_WAIT);
+		zassert_equal(user_data_received, fixture->dev, "User data not received");
+
+		/* Check if the stepper is stopped */
+		stepper_is_moving(fixture->dev, &is_moving);
+		zassert_equal(is_moving, false, "Stepper is still moving");
+	} else if (ret == -ENOSYS) {
+		stepper_is_moving(fixture->dev, &is_moving);
+		zassert_equal(is_moving, true,
+			      "Stepper should be moving since stop is not implemented");
+	} else {
+		zassert_unreachable("Stepper stop failed");
+	}
 }
diff --git a/tests/drivers/stepper/stepper_api/testcase.yaml b/tests/drivers/stepper/stepper_api/testcase.yaml
index 6936bea7c5be9..424e258fcaf86 100644
--- a/tests/drivers/stepper/stepper_api/testcase.yaml
+++ b/tests/drivers/stepper/stepper_api/testcase.yaml
@@ -1,13 +1,45 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
 # SPDX-License-Identifier: Apache-2.0
 
+common:
+  tags:
+    - drivers
+    - stepper
+    - api
 tests:
-  drivers.stepper.stepper_api:
-    tags:
-      - drivers
-      - stepper
-      - api
-    platform_allow:
-      - nucleo_g071rb
-      - nucleo_f767zi
-      - qemu_x86_64
+  drivers.stepper.stepper_api.adi_tmc2209:
+    extra_args:
+      - platform:native_sim/native/64:DTC_OVERLAY_FILE="boards/native_sim_adi_tmc2209.overlay"
+    extra_configs:
+      - CONFIG_GPIO=y
+      - CONFIG_COUNTER=y
+      - CONFIG_STEPPER_STEP_DIR_GENERATE_ISR_SAFE_EVENTS=y
+    platform_allow:
+      - native_sim/native/64
+  drivers.stepper.stepper_api.allegro_a4979:
+    extra_args:
+      - platform:native_sim/native/64:DTC_OVERLAY_FILE="boards/native_sim_allegro_a4979.overlay"
+    extra_configs:
+      - CONFIG_GPIO=y
+      - CONFIG_COUNTER=y
+      - CONFIG_STEPPER_STEP_DIR_GENERATE_ISR_SAFE_EVENTS=y
+    platform_allow:
+      - native_sim/native/64
+  drivers.stepper.stepper_api.ti_drv84xx:
+    extra_args:
+      - platform:native_sim/native/64:DTC_OVERLAY_FILE="boards/native_sim_ti_drv84xx.overlay"
+    extra_configs:
+      - CONFIG_GPIO=y
+      - CONFIG_COUNTER=y
+      - CONFIG_STEPPER_STEP_DIR_GENERATE_ISR_SAFE_EVENTS=y
+    platform_allow:
+      - native_sim/native/64
+  drivers.stepper.stepper_api.zephyr_gpio_stepper:
+    extra_args:
+      - platform:native_sim/native/64:DTC_OVERLAY_FILE="boards/native_sim_zephyr_gpio_stepper.overlay"
+      - platform:qemu_x86_64/atom:DTC_OVERLAY_FILE="boards/qemu_x86_64_zephyr_gpio_stepper.overlay"
+    extra_configs:
+      - CONFIG_GPIO=y
+    platform_allow:
+      - native_sim/native/64
+      - qemu_x86_64/atom
diff --git a/tests/drivers/syscon/prj.conf b/tests/drivers/syscon/prj.conf
index 9970e77ce57b3..220246c132785 100644
--- a/tests/drivers/syscon/prj.conf
+++ b/tests/drivers/syscon/prj.conf
@@ -3,6 +3,5 @@
 
 CONFIG_ZTEST=y
 CONFIG_SYSCON=y
-CONFIG_MMU=y
 CONFIG_HAVE_CUSTOM_LINKER_SCRIPT=y
 CONFIG_CUSTOM_LINKER_SCRIPT="linker_arm64_reserved.ld"
diff --git a/tests/drivers/timer/nrf_grtc_timer/src/main.c b/tests/drivers/timer/nrf_grtc_timer/src/main.c
index 2fff9802d4936..f53188841bdb0 100644
--- a/tests/drivers/timer/nrf_grtc_timer/src/main.c
+++ b/tests/drivers/timer/nrf_grtc_timer/src/main.c
@@ -40,18 +40,37 @@ ZTEST(nrf_grtc_timer, test_get_ticks)
 
 	for (uint32_t i = 0; i < NUMBER_OF_TRIES; i++) {
 		/* Absolute timeout 1ms in the past */
-		t = Z_TIMEOUT_TICKS(Z_TICK_ABS(sys_clock_tick_get() - K_MSEC(1).ticks));
+		uint64_t curr_tick;
+		uint64_t curr_grtc_tick;
+		uint64_t curr_tick2;
 
-		exp_ticks = z_nrf_grtc_timer_read() - K_MSEC(1).ticks * CYC_PER_TICK;
+		do {
+			/* GRTC and system tick must be read during single system tick. */
+			curr_tick = sys_clock_tick_get();
+			curr_grtc_tick = z_nrf_grtc_timer_read();
+			curr_tick2 = sys_clock_tick_get();
+		} while (curr_tick != curr_tick2);
+
+		t = Z_TIMEOUT_TICKS(Z_TICK_ABS(curr_tick - K_MSEC(1).ticks));
+
+		exp_ticks = curr_grtc_tick - K_MSEC(1).ticks * CYC_PER_TICK;
 		ticks = z_nrf_grtc_timer_get_ticks(t);
+
 		zassert_true((ticks >= (exp_ticks - CYC_PER_TICK + 1)) &&
 				     (ticks <= (exp_ticks + GRTC_SLEW_TICKS)),
 			     "Unexpected result %" PRId64 " (expected: %" PRId64 ")", ticks,
 			     exp_ticks);
 
 		/* Absolute timeout 10ms in the future */
-		t = Z_TIMEOUT_TICKS(Z_TICK_ABS(sys_clock_tick_get() + K_MSEC(10).ticks));
-		exp_ticks = z_nrf_grtc_timer_read() + K_MSEC(10).ticks * CYC_PER_TICK;
+		do {
+			/* GRTC and system tick must be read during single system tick. */
+			curr_tick = sys_clock_tick_get();
+			curr_grtc_tick = z_nrf_grtc_timer_read();
+			curr_tick2 = sys_clock_tick_get();
+		} while (curr_tick != curr_tick2);
+
+		t = Z_TIMEOUT_TICKS(Z_TICK_ABS(curr_tick + K_MSEC(10).ticks));
+		exp_ticks = curr_grtc_tick + K_MSEC(10).ticks * CYC_PER_TICK;
 		ticks = z_nrf_grtc_timer_get_ticks(t);
 		zassert_true((ticks >= (exp_ticks - CYC_PER_TICK + 1)) &&
 				     (ticks <= (exp_ticks + GRTC_SLEW_TICKS)),
diff --git a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
index 73dc8cc617015..ece1358741ab0 100644
--- a/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
+++ b/tests/drivers/timer/nrf_grtc_timer/testcase.yaml
@@ -3,6 +3,7 @@ tests:
     tags: drivers
     platform_allow:
       - nrf54l09pdk/nrf54l09/cpuapp
+      - nrf54l09pdk/nrf54l09/cpuflpr
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l15/cpuflpr
       - nrf54l15bsim/nrf54l15/cpuapp
@@ -10,5 +11,8 @@ tests:
       - nrf54h20dk/nrf54h20/cpurad
       - nrf54h20dk/nrf54h20/cpuppr
       - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuflpr
+      - ophelia4ev/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuflpr
     integration_platforms:
       - nrf54l20pdk/nrf54l20/cpuapp
diff --git a/tests/drivers/uart/uart_async_api/boards/cy8cproto_063_ble.overlay b/tests/drivers/uart/uart_async_api/boards/cy8cproto_063_ble.overlay
new file mode 100644
index 0000000000000..41d9e39187c70
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/cy8cproto_063_ble.overlay
@@ -0,0 +1,11 @@
+&dma0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	compatible = "infineon,cat1-dma";
+	status = "okay";
+};
+
+dut: &scb5 {
+	dmas = <&dma0 22>, <&dma0 23>;
+	dma-names = "tx", "rx";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/ek_ra2a1.overlay b/tests/drivers/uart/uart_async_api/boards/ek_ra2a1.overlay
new file mode 100644
index 0000000000000..50cafd978b6ed
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/ek_ra2a1.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci1_default: sci1_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_1, 4, 10)>,
+			<RA_PSEL(RA_PSEL_SCI_1, 4, 11)>;
+		};
+	};
+};
+
+&sci1 {
+	pinctrl-0 = <&sci1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	dut: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/ek_ra2l1.overlay b/tests/drivers/uart/uart_async_api/boards/ek_ra2l1.overlay
new file mode 100644
index 0000000000000..c12f59bbeee93
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/ek_ra2l1.overlay
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci9_default: sci9_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_9, 2, 3)>,
+			<RA_PSEL(RA_PSEL_SCI_9, 2, 2)>;
+		};
+	};
+};
+
+&sci9 {
+	pinctrl-0 = <&sci9_default>;
+	pinctrl-names = "default";
+	interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+
+	dut: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/ek_ra4l1.overlay b/tests/drivers/uart/uart_async_api/boards/ek_ra4l1.overlay
new file mode 100644
index 0000000000000..e8343b61c6c74
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/ek_ra4l1.overlay
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci9_default: sci9_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_9, 5, 10)>,
+			<RA_PSEL(RA_PSEL_SCI_9, 5, 11)>;
+		};
+	};
+};
+
+&sci9 {
+	pinctrl-0 = <&sci9_default>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	dut: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/ek_ra4m1.overlay b/tests/drivers/uart/uart_async_api/boards/ek_ra4m1.overlay
new file mode 100644
index 0000000000000..6bf3f9ce967d9
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/ek_ra4m1.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Renesas Electronics Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	sci9_default: sci9_default {
+		group1 {
+			/* tx rx */
+			psels = <RA_PSEL(RA_PSEL_SCI_9, 6, 2)>,
+			<RA_PSEL(RA_PSEL_SCI_9, 6, 1)>;
+		};
+	};
+};
+
+&sci9 {
+	pinctrl-0 = <&sci9_default>;
+	pinctrl-names = "default";
+	interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
+	interrupt-names = "rxi", "txi", "tei", "eri";
+	status = "okay";
+	dut: uart {
+		current-speed = <115200>;
+		status = "okay";
+	};
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.conf b/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.conf
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.conf
rename to tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.conf
diff --git a/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.overlay b/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.overlay
rename to tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/frdm_mcxa153.overlay b/tests/drivers/uart/uart_async_api/boards/frdm_mcxa153.overlay
new file mode 100644
index 0000000000000..063593ce5af25
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/frdm_mcxa153.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Short J5.3(P3_14) and J5.4(P3_15) to loopback LPUART2 RX/TX for this test
+ * or test lpuart2 with "nxp,loopback"
+ */
+dut: &lpuart2 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart2>;
+	pinctrl-names = "default";
+};
+
+&edma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/frdm_mcxa166.overlay b/tests/drivers/uart/uart_async_api/boards/frdm_mcxa166.overlay
new file mode 100644
index 0000000000000..401284b77b987
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/frdm_mcxa166.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Short J5.3 and J5.4 to loopback LPUART3 RX/TX for this test
+ * or test lpuart3 with "nxp,loopback"
+ */
+dut: &lpuart3 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart3>;
+	pinctrl-names = "default";
+};
+
+&edma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/frdm_mcxa276.overlay b/tests/drivers/uart/uart_async_api/boards/frdm_mcxa276.overlay
new file mode 100644
index 0000000000000..401284b77b987
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/frdm_mcxa276.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Short J5.3 and J5.4 to loopback LPUART3 RX/TX for this test
+ * or test lpuart3 with "nxp,loopback"
+ */
+dut: &lpuart3 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&pinmux_lpuart3>;
+	pinctrl-names = "default";
+};
+
+&edma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/intel_rpl_s_crb.conf b/tests/drivers/uart/uart_async_api/boards/intel_rpl_s_crb.conf
index 86df0aff3e624..1104c4d739194 100644
--- a/tests/drivers/uart/uart_async_api/boards/intel_rpl_s_crb.conf
+++ b/tests/drivers/uart/uart_async_api/boards/intel_rpl_s_crb.conf
@@ -1 +1,2 @@
 CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_TEST_USERSPACE=n
diff --git a/tests/drivers/uart/uart_async_api/boards/max78002evkit_max78002_m4.overlay b/tests/drivers/uart/uart_async_api/boards/max78002evkit_max78002_m4.overlay
new file mode 100644
index 0000000000000..e5f154d43e1ff
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/max78002evkit_max78002_m4.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Analog Devices, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+dut: &uart1 {
+	status = "okay";
+	pinctrl-0 = <&uart1_tx_p0_13 &uart1_rx_p0_12>;
+	pinctrl-names = "default";
+
+	dmas = <&dma0 1 MAX78_DMA_SLOT_UART1_TX>, <&dma0 2 MAX78_DMA_SLOT_UART1_RX>;
+	dma-names = "tx", "rx";
+
+	current-speed = <115200>;
+	data-bits = <8>;
+	parity = "none";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
index ed4a2de1891c0..a1e29cbf0ffcc 100644
--- a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
+++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
+&spi00 {
+	status = "disabled";
+};
+
 &pinctrl {
 	uart21_default_alt: uart21_default_alt {
 		group1 {
@@ -15,6 +19,21 @@
 			low-power-enable;
 		};
 	};
+
+	uart00_default_alt: uart00_default_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RX, 2, 7)>;
+		};
+	};
+
+	uart00_sleep_alt: uart00_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RX, 2, 7)>;
+			low-power-enable;
+		};
+	};
 };
 
 dut: &uart21 {
@@ -24,3 +43,11 @@ dut: &uart21 {
 	pinctrl-names = "default", "sleep";
 	current-speed = <115200>;
 };
+
+dut2: &uart00 {
+	status = "okay";
+	pinctrl-0 = <&uart00_default_alt>;
+	pinctrl-1 = <&uart00_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <4000000>;
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf b/tests/drivers/uart/uart_async_api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
index 24be02d577c41..3d5e58683e737 100644
--- a/tests/drivers/uart/uart_async_api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
+++ b/tests/drivers/uart/uart_async_api/boards/nucleo_n657x0_q_stm32n657xx_sb.conf
@@ -1 +1,2 @@
-CONFIG_DCACHE=n
+CONFIG_NOCACHE_MEMORY=y
+CONFIG_TEST_USERSPACE=n
diff --git a/tests/drivers/uart/uart_async_api/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay b/tests/drivers/uart/uart_async_api/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay
new file mode 100644
index 0000000000000..603ecebccb9b6
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/nucleo_n657x0_q_stm32n657xx_sb.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+dut: &usart3 {
+	dmas = <&gpdma1 0 112 STM32_DMA_PERIPH_TX
+		&gpdma1 1 111 STM32_DMA_PERIPH_RX>;
+	dma-names = "tx", "rx";
+};
+
+&gpdma1 {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/nucleo_wba52cg.overlay b/tests/drivers/uart/uart_async_api/boards/nucleo_wba55cg.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/nucleo_wba52cg.overlay
rename to tests/drivers/uart/uart_async_api/boards/nucleo_wba55cg.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..a1e29cbf0ffcc
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&spi00 {
+	status = "disabled";
+};
+
+&pinctrl {
+	uart21_default_alt: uart21_default_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+		};
+	};
+
+	uart21_sleep_alt: uart21_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+			low-power-enable;
+		};
+	};
+
+	uart00_default_alt: uart00_default_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RX, 2, 7)>;
+		};
+	};
+
+	uart00_sleep_alt: uart00_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 2, 8)>,
+				<NRF_PSEL(UART_RX, 2, 7)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	pinctrl-0 = <&uart21_default_alt>;
+	pinctrl-1 = <&uart21_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <115200>;
+};
+
+dut2: &uart00 {
+	status = "okay";
+	pinctrl-0 = <&uart00_default_alt>;
+	pinctrl-1 = <&uart00_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	current-speed = <4000000>;
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_async_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
new file mode 100644
index 0000000000000..945d543e753f4
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
@@ -0,0 +1 @@
+#include "ophelia4ev_nrf54l15_cpuapp.overlay"
diff --git a/tests/drivers/uart/uart_async_api/boards/stm32n6570_dk_stm32n657xx_sb.conf b/tests/drivers/uart/uart_async_api/boards/stm32n6570_dk_stm32n657xx_sb.conf
index 24be02d577c41..3d5e58683e737 100644
--- a/tests/drivers/uart/uart_async_api/boards/stm32n6570_dk_stm32n657xx_sb.conf
+++ b/tests/drivers/uart/uart_async_api/boards/stm32n6570_dk_stm32n657xx_sb.conf
@@ -1 +1,2 @@
-CONFIG_DCACHE=n
+CONFIG_NOCACHE_MEMORY=y
+CONFIG_TEST_USERSPACE=n
diff --git a/tests/drivers/uart/uart_async_api/boards/stm32n6570_dk_stm32n657xx_sb.overlay b/tests/drivers/uart/uart_async_api/boards/stm32n6570_dk_stm32n657xx_sb.overlay
new file mode 100644
index 0000000000000..7127f08c42c4a
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/stm32n6570_dk_stm32n657xx_sb.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+dut: &usart2 {
+	dmas = <&gpdma1 0 110 STM32_DMA_PERIPH_TX
+		&gpdma1 1 109 STM32_DMA_PERIPH_RX>;
+	dma-names = "tx", "rx";
+};
+
+&gpdma1 {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/xg23_rb4210a.overlay b/tests/drivers/uart/uart_async_api/boards/xg23_rb4210a.overlay
new file mode 100644
index 0000000000000..e275da0aa61cd
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/xg23_rb4210a.overlay
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2025, Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+ /*
+  * Connect EXP4 (PC0) and EXP6 (PC1) of the Expansion Pin header
+  */
+/ {
+	chosen {
+		zephyr,console = &usart0;
+		zephyr,shell-uart = &usart0;
+		zephyr,uart-pipe = &usart0;
+		/delete-property/ zephyr,display;
+	};
+};
+
+&pinctrl{
+	eusart1_default: eusart1_default {
+		group0 {
+			pins = <EUSART1_TX_PC1>; /* WPK EXP4 (PC1) */
+			drive-push-pull;
+			output-high;
+		};
+		group1 {
+			pins = <EUSART1_RX_PC2>; /* WPK EXP6 (PC2) */
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+
+	usart0_default: usart0_default {
+		group0 {
+			pins = <USART0_TX_PA8>;
+			drive-push-pull;
+			output-high;
+		};
+		group1 {
+			pins = <USART0_RX_PA9>;
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+};
+
+dut: &eusart1 {
+	compatible = "silabs,eusart-uart";
+	dmas = <&dma0 DMA_REQSEL_EUSART1TXFL>,
+		<&dma0 DMA_REQSEL_EUSART1RXFL>;
+	dma-names = "tx", "rx";
+	current-speed = <115200>;
+	pinctrl-0 = <&eusart1_default>;
+	pinctrl-names = "default";
+	status = "okay";
+	/delete-property/ cs-gpios;
+};
+
+/delete-node/ &ls0xx_ls013b7dh03;
+/delete-node/ &mx25r80;
+
+&eusart0 {
+	status = "disabled";
+};
+
+&usart0 {
+	compatible = "silabs,usart-uart";
+	current-speed = <115200>;
+	pinctrl-0 = <&usart0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&dma0 {
+	status = "okay";
+};
diff --git a/tests/drivers/uart/uart_async_api/boards/xg24_rb4187c.overlay b/tests/drivers/uart/uart_async_api/boards/xg24_rb4187c.overlay
index c770099a74b63..1e9c88c10330f 100644
--- a/tests/drivers/uart/uart_async_api/boards/xg24_rb4187c.overlay
+++ b/tests/drivers/uart/uart_async_api/boards/xg24_rb4187c.overlay
@@ -9,9 +9,9 @@
  */
 / {
 	chosen {
-		zephyr,console = &eusart1;
-		zephyr,shell-uart = &eusart1;
-		zephyr,uart-pipe = &eusart1;
+		zephyr,console = &eusart0;
+		zephyr,shell-uart = &eusart0;
+		zephyr,uart-pipe = &eusart0;
 	};
 };
 
@@ -28,14 +28,14 @@
 			silabs,input-filter;
 		};
 	};
-	eusart1_default: eusart1_default {
+	eusart0_default: eusart0_default {
 		group0 {
-			pins = <EUSART1_TX_PA8>;
+			pins = <EUSART0_TX_PA8>;
 			drive-push-pull;
 			output-high;
 		};
 		group1 {
-			pins = <EUSART1_RX_PA9>;
+			pins = <EUSART0_RX_PA9>;
 			input-enable;
 			silabs,input-filter;
 		};
@@ -50,10 +50,10 @@ dut: &usart0 {
 	pinctrl-names = "default";
 };
 
-&eusart1 {
+&eusart0 {
 	compatible = "silabs,eusart-uart";
 	current-speed = <115200>;
-	pinctrl-0 = <&eusart1_default>;
+	pinctrl-0 = <&eusart0_default>;
 	pinctrl-names = "default";
 	status = "okay";
 };
diff --git a/tests/drivers/uart/uart_async_api/boards/xg29_rb4412a.overlay b/tests/drivers/uart/uart_async_api/boards/xg29_rb4412a.overlay
new file mode 100644
index 0000000000000..9f599003dbc09
--- /dev/null
+++ b/tests/drivers/uart/uart_async_api/boards/xg29_rb4412a.overlay
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025, Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Connect EXP4 (PC0) and EXP6 (PC1) of the Expansion Pin header
+ */
+/ {
+	chosen {
+		zephyr,console = &eusart0;
+		zephyr,shell-uart = &eusart0;
+		zephyr,uart-pipe = &eusart0;
+	};
+};
+
+&pinctrl{
+	usart0_default: usart0_default {
+		group0 {
+			pins = <USART0_TX_PC0>; /* WPK EXP4 (PC0) */
+			drive-push-pull;
+			output-high;
+		};
+		group1 {
+			pins = <USART0_RX_PC1>; /* WPK EXP6 (PC1) */
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+	eusart0_default: eusart0_default {
+		group0 {
+			pins = <EUSART0_TX_PA5>;
+			drive-push-pull;
+			output-high;
+		};
+		group1 {
+			pins = <EUSART0_RX_PA6>;
+			input-enable;
+			silabs,input-filter;
+		};
+	};
+};
+
+dut: &usart0 {
+	dmas = <&dma0 DMA_REQSEL_USART0TXBL>,
+	       <&dma0 DMA_REQSEL_USART0RXDATAV>;
+	dma-names = "tx", "rx";
+	pinctrl-0 = <&usart0_default>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&eusart0 {
+	compatible = "silabs,eusart-uart";
+	current-speed = <115200>;
+	pinctrl-0 = <&eusart0_default>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&dma0 {
+	status = "okay";
+};
+
+&eusart1 {
+	status = "disabled";
+};
+
+&usart1 {
+	status = "disabled";
+};
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index 4d1d2c19daf1b..d0b1ac779c668 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -82,16 +82,23 @@ static void uart_async_test_init(int idx)
 	k_sem_reset(&rx_buf_released);
 	k_sem_reset(&rx_disabled);
 
-#ifdef CONFIG_UART_WIDE_DATA
-	const struct uart_config uart_cfg = {
-		.baudrate = 115200,
-		.parity = UART_CFG_PARITY_NONE,
-		.stop_bits = UART_CFG_STOP_BITS_1,
-		.data_bits = UART_CFG_DATA_BITS_9,
-		.flow_ctrl = UART_CFG_FLOW_CTRL_NONE
+	struct uart_config uart_cfg;
+
+	zassert_equal(uart_config_get(uart_dev, &uart_cfg), 0);
+
+	if (IS_ENABLED(CONFIG_COVERAGE)) {
+		/* When coverage is used then performance is degraded - avoid using
+		 * higher baudrates.
+		 */
+		uart_cfg.baudrate = MIN(uart_cfg.baudrate, 115200);
+	} else if (IS_ENABLED(CONFIG_UART_WIDE_DATA)) {
+		uart_cfg.baudrate = 115200;
+		uart_cfg.parity = UART_CFG_PARITY_NONE;
+		uart_cfg.stop_bits = UART_CFG_STOP_BITS_1;
+		uart_cfg.data_bits = UART_CFG_DATA_BITS_9;
+		uart_cfg.flow_ctrl = UART_CFG_FLOW_CTRL_NONE;
 	};
-	__ASSERT_NO_MSG(uart_configure(uart_dev, &uart_cfg) == 0);
-#endif
+	zassert_equal(uart_configure(uart_dev, &uart_cfg), 0);
 
 	if (!initialized) {
 		initialized = true;
@@ -407,7 +414,7 @@ ZTEST_USER(uart_async_chain_read, test_chained_read)
 #if NOCACHE_MEM
 	static __aligned(32) uint8_t tx_buf[10] __used __NOCACHE;
 #else
-	uint8_t tx_buf[10];
+	 __aligned(32) uint8_t tx_buf[10];
 #endif /* NOCACHE_MEM */
 	int iter = 6;
 	uint32_t rx_timeout_ms = 50;
@@ -489,7 +496,7 @@ ZTEST_USER(uart_async_double_buf, test_double_buffer)
 #if NOCACHE_MEM
 	static __aligned(32) uint8_t tx_buf[4] __used __NOCACHE;
 #else
-	uint8_t tx_buf[4];
+	 __aligned(32) uint8_t tx_buf[4];
 #endif /* NOCACHE_MEM */
 
 	zassert_equal(uart_rx_enable(uart_dev, double_buffer[0], sizeof(double_buffer[0]),
@@ -596,8 +603,8 @@ ZTEST_USER(uart_async_read_abort, test_read_abort)
 	static __aligned(32) uint8_t rx_buf[100] __used __NOCACHE;
 	static __aligned(32) uint8_t tx_buf[100] __used __NOCACHE;
 #else
-	uint8_t rx_buf[100];
-	uint8_t tx_buf[100];
+	 __aligned(32) uint8_t rx_buf[100];
+	 __aligned(32) uint8_t tx_buf[100];
 #endif /* NOCACHE_MEM */
 
 	memset(rx_buf, 0, sizeof(rx_buf));
@@ -701,7 +708,7 @@ ZTEST_USER(uart_async_write_abort, test_write_abort)
 #if NOCACHE_MEM
 	static __aligned(32) uint8_t tx_buf[100] __used __NOCACHE;
 #else
-	uint8_t tx_buf[100];
+	 __aligned(32) uint8_t tx_buf[100];
 #endif /* NOCACHE_MEM */
 
 	memset(test_rx_buf, 0, sizeof(test_rx_buf));
@@ -778,8 +785,8 @@ ZTEST_USER(uart_async_timeout, test_forever_timeout)
 	static __aligned(32) uint8_t rx_buf[100] __used __NOCACHE;
 	static __aligned(32) uint8_t tx_buf[100] __used __NOCACHE;
 #else
-	uint8_t rx_buf[100];
-	uint8_t tx_buf[100];
+	 __aligned(32) uint8_t rx_buf[100];
+	 __aligned(32) uint8_t tx_buf[100];
 #endif /* NOCACHE_MEM */
 
 	memset(rx_buf, 0, sizeof(rx_buf));
@@ -870,7 +877,7 @@ ZTEST_USER(uart_async_chain_write, test_chained_write)
 #if NOCACHE_MEM
 	static __aligned(32) uint8_t rx_buf[20] __used __NOCACHE;
 #else
-	uint8_t rx_buf[20];
+	 __aligned(32) uint8_t rx_buf[20];
 #endif /* NOCACHE_MEM */
 
 	memset(rx_buf, 0, sizeof(rx_buf));
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index c6ff52a515f9f..96747dd1bacfa 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -52,6 +52,9 @@ tests:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC and CONFIG_UART_MCUX_LPUART and not CONFIG_CPU_HAS_DCACHE
     harness: ztest
     depends_on: dma
+    extra_configs:
+      - CONFIG_USERSPACE=n
+      - CONFIG_TEST_USERSPACE=n
   drivers.uart.async_api.lpuart.rt_nocache:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC and CONFIG_UART_MCUX_LPUART and CONFIG_CPU_HAS_DCACHE
     harness: ztest
@@ -60,6 +63,7 @@ tests:
       - CONFIG_DCACHE=y
       - CONFIG_NOCACHE_MEMORY=y
       - CONFIG_USERSPACE=n
+      - CONFIG_TEST_USERSPACE=n
   drivers.uart.async_api.sam0:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC and CONFIG_SOC_FAMILY_ATMEL_SAM0
     platform_allow:
diff --git a/tests/drivers/uart/uart_basic_api/prj.conf b/tests/drivers/uart/uart_basic_api/prj.conf
index 4234fa733981d..ef35bc38b70fb 100644
--- a/tests/drivers/uart/uart_basic_api/prj.conf
+++ b/tests/drivers/uart/uart_basic_api/prj.conf
@@ -2,4 +2,4 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_USE_RUNTIME_CONFIGURE=y
 CONFIG_ZTEST=y
-CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
diff --git a/tests/drivers/uart/uart_basic_api/prj_poll.conf b/tests/drivers/uart/uart_basic_api/prj_poll.conf
index 7b1c92736652d..3f5f4803f1895 100644
--- a/tests/drivers/uart/uart_basic_api/prj_poll.conf
+++ b/tests/drivers/uart/uart_basic_api/prj_poll.conf
@@ -1,4 +1,4 @@
 CONFIG_SERIAL=y
 CONFIG_UART_USE_RUNTIME_CONFIGURE=y
 CONFIG_ZTEST=y
-CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
diff --git a/tests/drivers/uart/uart_basic_api/prj_shell.conf b/tests/drivers/uart/uart_basic_api/prj_shell.conf
index f4ce1d0334cf0..7be384d301e24 100644
--- a/tests/drivers/uart/uart_basic_api/prj_shell.conf
+++ b/tests/drivers/uart/uart_basic_api/prj_shell.conf
@@ -4,4 +4,4 @@ CONFIG_UART_USE_RUNTIME_CONFIGURE=y
 CONFIG_ZTEST=y
 CONFIG_SHELL_CMD_BUFF_SIZE=90
 CONFIG_SHELL=y
-CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
new file mode 100644
index 0000000000000..cf481b7a16144
--- /dev/null
+++ b/tests/drivers/uart/uart_elementary/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+	hw-flow-control;
+};
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l09pdk_nrf54l09_dual_uart.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l09pdk_nrf54l09_dual_uart.overlay
new file mode 100644
index 0000000000000..505993a73087c
--- /dev/null
+++ b/tests/drivers/uart/uart_elementary/boards/nrf54l09pdk_nrf54l09_dual_uart.overlay
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+/ {
+	chosen {
+		zephyr,console = &uart30;
+		zephyr,shell-uart = &uart30;
+	};
+};
+
+&pinctrl {
+	uart20_default: uart20_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 15)>,
+				<NRF_PSEL(UART_RX, 1, 8)>;
+				bias-pull-up;
+		};
+	};
+
+	uart20_sleep: uart20_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 15)>,
+				<NRF_PSEL(UART_RX, 1, 8)>;
+			low-power-enable;
+		};
+	};
+
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>,
+				<NRF_PSEL(UART_RX, 1, 14)>;
+				bias-pull-up;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>,
+				<NRF_PSEL(UART_RX, 1, 14)>;
+			low-power-enable;
+		};
+	};
+
+	uart30_default: uart30_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>;
+		};
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>;
+			bias-pull-up;
+		};
+	};
+
+	uart30_sleep: uart30_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>;
+			low-power-enable;
+		};
+	};
+};
+
+
+&uart30 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart30_default>;
+	pinctrl-1 = <&uart30_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+dut: &uart20 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart20_default>;
+	pinctrl-1 = <&uart20_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+dut_aux: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/drivers/uart/uart_elementary/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/tests/drivers/uart/uart_elementary/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 0000000000000..cf481b7a16144
--- /dev/null
+++ b/tests/drivers/uart/uart_elementary/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+	hw-flow-control;
+};
diff --git a/tests/drivers/uart/uart_elementary/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_elementary/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..cf481b7a16144
--- /dev/null
+++ b/tests/drivers/uart/uart_elementary/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+	hw-flow-control;
+};
diff --git a/tests/drivers/uart/uart_elementary/boards/ophelia4ev_nrf54l15_cpuflpr.overlay b/tests/drivers/uart/uart_elementary/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
new file mode 100644
index 0000000000000..cf481b7a16144
--- /dev/null
+++ b/tests/drivers/uart/uart_elementary/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+	hw-flow-control;
+};
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32c6.overlay b/tests/drivers/uart/uart_elementary/socs/esp32c6_hpcore.overlay
similarity index 100%
rename from tests/drivers/uart/uart_elementary/socs/esp32c6.overlay
rename to tests/drivers/uart/uart_elementary/socs/esp32c6_hpcore.overlay
diff --git a/tests/drivers/uart/uart_elementary/testcase.yaml b/tests/drivers/uart/uart_elementary/testcase.yaml
index cbf0327e48ff0..fe90ed6781270 100644
--- a/tests/drivers/uart/uart_elementary/testcase.yaml
+++ b/tests/drivers/uart/uart_elementary/testcase.yaml
@@ -12,14 +12,18 @@ tests:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l09pdk/nrf54l09/cpuapp
+      - nrf54l09pdk/nrf54l09/cpuflpr
       - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuflpr
       - nrf5340dk/nrf5340/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuflpr
       - esp32_devkitc_wrover/esp32/procpu
       - esp8684_devkitm
       - esp32c3_devkitm
-      - esp32c6_devkitc
+      - esp32c6_devkitc/esp32c6/hpcore
       - esp32s2_saola
       - esp32s3_devkitm/esp32s3/procpu
     integration_platforms:
@@ -53,6 +57,7 @@ tests:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
@@ -61,6 +66,7 @@ tests:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
@@ -69,6 +75,8 @@ tests:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54l20pdk/nrf54l20/cpuflpr
+      - ophelia4ev/nrf54l15/cpuflpr
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
@@ -76,7 +84,26 @@ tests:
     filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuflpr
+      - nrf54l20pdk/nrf54l20/cpuflpr
+      - ophelia4ev/nrf54l15/cpuflpr
     extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuflpr_dual_uart.overlay"
     extra_configs:
       - CONFIG_DUAL_UART_TEST=y
       - CONFIG_SETUP_MISMATCH_TEST=y
+  drivers.uart.uart_elementary_dual_nrf54l09:
+    filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
+    platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
+      - nrf54l09pdk/nrf54l09/cpuflpr
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l09pdk_nrf54l09_dual_uart.overlay"
+    extra_configs:
+      - CONFIG_DUAL_UART_TEST=y
+  drivers.uart.uart_elementary_dual_setup_mismatch_nrf54l09:
+    filter: CONFIG_SERIAL_SUPPORT_INTERRUPT
+    platform_allow:
+      - nrf54l09pdk/nrf54l09/cpuapp
+      - nrf54l09pdk/nrf54l09/cpuflpr
+    extra_args: DTC_OVERLAY_FILE="boards/nrf54l09pdk_nrf54l09_dual_uart.overlay"
+    extra_configs:
+      - CONFIG_DUAL_UART_TEST=y
+      - CONFIG_SETUP_MISMATCH_TEST=y
diff --git a/tests/drivers/uart/uart_errors/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_errors/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..a1748b3784b97
--- /dev/null
+++ b/tests/drivers/uart/uart_errors/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_RX, 1, 8)>,
+				<NRF_PSEL(UART_RTS, 1, 10)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_RX, 1, 8)>,
+				<NRF_PSEL(UART_RTS, 1, 10)>;
+			low-power-enable;
+		};
+	};
+
+	uart22_default: uart22_default {
+		group1 {
+			psels =
+				<NRF_PSEL(UART_CTS, 1, 11)>;
+				bias-pull-up;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>;
+		};
+	};
+
+	uart22_sleep: uart22_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 9)>,
+				<NRF_PSEL(UART_CTS, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+dut_aux: &uart22 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart22_default>;
+	pinctrl-1 = <&uart22_sleep>;
+	pinctrl-names = "default", "sleep";
+	disable-rx;
+};
diff --git a/tests/drivers/uart/uart_errors/testcase.yaml b/tests/drivers/uart/uart_errors/testcase.yaml
index 9df414075b0a5..d303c73b60041 100644
--- a/tests/drivers/uart/uart_errors/testcase.yaml
+++ b/tests/drivers/uart/uart_errors/testcase.yaml
@@ -14,6 +14,7 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf5340dk/nrf5340/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
   drivers.uart.uart_errors.async:
     filter: CONFIG_SERIAL_SUPPORT_ASYNC
     platform_allow:
@@ -21,6 +22,7 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf5340dk/nrf5340/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_configs:
       - CONFIG_UART_ASYNC_API=y
       - CONFIG_UART_INTERRUPT_DRIVEN=n
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..35378db25850a
--- /dev/null
+++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>,
+				<NRF_PSEL(UART_RTS, 1, 8)>,
+				<NRF_PSEL(UART_CTS, 1, 9)>;
+			low-power-enable;
+		};
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+	hw-flow-control;
+};
+
+counter_dev: &timer00 {
+	status = "okay";
+};
+
+&grtc {
+	interrupts = <228 2>;
+};
diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
index a5bee9fa9ecfe..0ff023748d22a 100644
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@@ -15,6 +15,7 @@ common:
     - nrf54l15bsim/nrf54l15/cpuapp
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf54h20dk/nrf54h20/cpurad
+    - ophelia4ev/nrf54l15/cpuapp
     - nrf52_bsim
   integration_platforms:
     - nrf52840dk/nrf52840
diff --git a/tests/drivers/uart/uart_pm/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..fec91b746a2d8
--- /dev/null
+++ b/tests/drivers/uart/uart_pm/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart21_default: uart21_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+		};
+	};
+
+	uart21_sleep: uart21_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 1, 10)>,
+				<NRF_PSEL(UART_RX, 1, 11)>;
+			low-power-enable;
+		};
+	};
+};
+
+/ {
+	chosen {
+		zephyr,console = &uart20;
+	};
+};
+
+dut: &uart21 {
+	status = "okay";
+	current-speed = <115200>;
+	pinctrl-0 = <&uart21_default>;
+	pinctrl-1 = <&uart21_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/tests/drivers/uart/uart_pm/prj.conf b/tests/drivers/uart/uart_pm/prj.conf
index 949c1497802cb..a01ea2777b6fa 100644
--- a/tests/drivers/uart/uart_pm/prj.conf
+++ b/tests/drivers/uart/uart_pm/prj.conf
@@ -2,3 +2,4 @@ CONFIG_ZTEST=y
 CONFIG_SERIAL=y
 CONFIG_PM=y
 CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=n
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index 95cfd4a0ff673..329b5546b8b73 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -12,6 +12,7 @@ common:
     - nrf54h20dk/nrf54h20/cpuapp
     - nrf52_bsim
     - nrf5340bsim/nrf5340/cpuapp
+    - ophelia4ev/nrf54l15/cpuapp
   harness_config:
     fixture: gpio_loopback
   depends_on: gpio
@@ -38,6 +39,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf52_bsim
       - nrf5340bsim/nrf5340/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
 
   drivers.uart.pm.enhanced_poll:
     extra_configs:
@@ -49,6 +51,7 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
 
   drivers.uart.pm.int_driven:
     extra_configs:
@@ -68,6 +71,7 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
 
   drivers.uart.pm.async:
     extra_configs:
@@ -87,3 +91,4 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54h20dk/nrf54h20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/tests/drivers/udc/src/main.c b/tests/drivers/udc/src/main.c
index 66bf469cd7941..e08a8f615a15b 100644
--- a/tests/drivers/udc/src/main.c
+++ b/tests/drivers/udc/src/main.c
@@ -18,6 +18,8 @@ LOG_MODULE_REGISTER(udc_test, LOG_LEVEL_INF);
  * connected to the host as this state is not covered by this test.
  */
 
+#define BULK_OUT_EP_ADDR	0x01U
+#define BULK_IN_EP_ADDR		0x81U
 #define FALSE_EP_ADDR		0x0FU
 
 K_MSGQ_DEFINE(test_msgq, sizeof(struct udc_event), 8, sizeof(uint32_t));
@@ -127,7 +129,7 @@ static void test_udc_ep_enable(const struct device *dev,
 	uint8_t ctrl_ep = USB_EP_DIR_IS_IN(ed->bEndpointAddress) ?
 			  USB_CONTROL_EP_IN : USB_CONTROL_EP_OUT;
 	/* Possible return values 0, -EINVAL, -ENODEV, -EALREADY, -EPERM. */
-	int err1, err2, err3, err4;
+	int err1, err2, err3;
 
 	err1 = udc_ep_enable(dev, ed->bEndpointAddress, ed->bmAttributes,
 			     sys_le16_to_cpu(ed->wMaxPacketSize),
@@ -135,28 +137,22 @@ static void test_udc_ep_enable(const struct device *dev,
 	err2 = udc_ep_enable(dev, ed->bEndpointAddress, ed->bmAttributes,
 			     sys_le16_to_cpu(ed->wMaxPacketSize),
 			     ed->bInterval);
-	err3 = udc_ep_enable(dev, FALSE_EP_ADDR, ed->bmAttributes,
-			     sys_le16_to_cpu(ed->wMaxPacketSize),
-			     ed->bInterval);
-	err4 = udc_ep_enable(dev, ctrl_ep, ed->bmAttributes,
+	err3 = udc_ep_enable(dev, ctrl_ep, ed->bmAttributes,
 			     sys_le16_to_cpu(ed->wMaxPacketSize),
 			     ed->bInterval);
 
 	if (!udc_is_initialized(dev) && !udc_is_enabled(dev)) {
 		zassert_equal(err1, -EPERM, "Not failed to enable endpoint");
 		zassert_equal(err2, -EPERM, "Not failed to enable endpoint");
-		zassert_equal(err3, -EPERM, "Not failed to enable endpoint");
-		zassert_equal(err4, -EINVAL, "Not failed to enable endpoint");
+		zassert_equal(err3, -EINVAL, "Not failed to enable endpoint");
 	} else if (udc_is_initialized(dev) && !udc_is_enabled(dev)) {
 		zassert_equal(err1, -EPERM, "Not failed to enable endpoint");
 		zassert_equal(err2, -EPERM, "Not failed to enable endpoint");
-		zassert_equal(err3, -EPERM, "Not failed to enable endpoint");
-		zassert_equal(err4, -EINVAL, "Not failed to enable endpoint");
+		zassert_equal(err3, -EINVAL, "Not failed to enable endpoint");
 	} else {
 		zassert_equal(err1, 0, "Failed to enable endpoint");
 		zassert_equal(err2, -EALREADY, "Not failed to enable endpoint");
-		zassert_equal(err3, -ENODEV, "Not failed to enable endpoint");
-		zassert_equal(err4, -EINVAL, "Not failed to enable endpoint");
+		zassert_equal(err3, -EINVAL, "Not failed to enable endpoint");
 	}
 }
 
@@ -166,28 +162,24 @@ static void test_udc_ep_disable(const struct device *dev,
 	uint8_t ctrl_ep = USB_EP_DIR_IS_IN(ed->bEndpointAddress) ?
 			  USB_CONTROL_EP_IN : USB_CONTROL_EP_OUT;
 	/* Possible return values 0, -EINVAL, -ENODEV, -EALREADY, -EPERM. */
-	int err1, err2, err3, err4;
+	int err1, err2, err3;
 
 	err1 = udc_ep_disable(dev, ed->bEndpointAddress);
 	err2 = udc_ep_disable(dev, ed->bEndpointAddress);
-	err3 = udc_ep_disable(dev, FALSE_EP_ADDR);
-	err4 = udc_ep_disable(dev, ctrl_ep);
+	err3 = udc_ep_disable(dev, ctrl_ep);
 
 	if (!udc_is_initialized(dev) && !udc_is_enabled(dev)) {
 		zassert_equal(err1, -EPERM, "Not failed to disable endpoint");
 		zassert_equal(err2, -EPERM, "Not failed to disable endpoint");
-		zassert_equal(err3, -EPERM, "Not failed to disable endpoint");
-		zassert_equal(err4, -EINVAL, "Not failed to disable endpoint");
+		zassert_equal(err3, -EINVAL, "Not failed to disable endpoint");
 	} else if (udc_is_initialized(dev) && !udc_is_enabled(dev)) {
 		zassert_equal(err1, -EALREADY, "Failed to disable endpoint");
 		zassert_equal(err2, -EALREADY, "Not failed to disable endpoint");
-		zassert_equal(err3, -ENODEV, "Not failed to disable endpoint");
-		zassert_equal(err4, -EINVAL, "Not failed to disable endpoint");
+		zassert_equal(err3, -EINVAL, "Not failed to disable endpoint");
 	} else {
 		zassert_equal(err1, 0, "Failed to disable endpoint");
 		zassert_equal(err2, -EALREADY, "Not failed to disable endpoint");
-		zassert_equal(err3, -ENODEV, "Not failed to disable endpoint");
-		zassert_equal(err4, -EINVAL, "Not failed to disable endpoint");
+		zassert_equal(err3, -EINVAL, "Not failed to disable endpoint");
 	}
 }
 
@@ -284,17 +276,14 @@ static void test_udc_ep_dequeue(const struct device *dev,
 				struct usb_ep_descriptor *ed)
 {
 	/* Possible return values 0, -EPERM, -ENODEV, -EACCES(TBD) */
-	int err1, err2;
+	int err;
 
-	err1 = udc_ep_dequeue(dev, ed->bEndpointAddress);
-	err2 = udc_ep_dequeue(dev, FALSE_EP_ADDR);
+	err = udc_ep_dequeue(dev, ed->bEndpointAddress);
 
 	if (!udc_is_initialized(dev)) {
-		zassert_equal(err1, -EPERM, "Not failed to dequeue");
-		zassert_equal(err2, -EPERM, "Not failed to dequeue");
+		zassert_equal(err, -EPERM, "Not failed to dequeue");
 	} else {
-		zassert_equal(err1, 0, "Failed to dequeue");
-		zassert_equal(err2, -ENODEV, "Not failed to dequeue");
+		zassert_equal(err, 0, "Failed to dequeue");
 	}
 }
 
@@ -462,7 +451,7 @@ static struct usb_ep_descriptor ed_ctrl_in = {
 static struct usb_ep_descriptor ed_bulk_out = {
 	.bLength = sizeof(struct usb_ep_descriptor),
 	.bDescriptorType = USB_DESC_ENDPOINT,
-	.bEndpointAddress = 0x01,
+	.bEndpointAddress = BULK_OUT_EP_ADDR,
 	.bmAttributes = USB_EP_TYPE_BULK,
 	.wMaxPacketSize = sys_cpu_to_le16(64),
 	.bInterval = 0,
@@ -471,7 +460,7 @@ static struct usb_ep_descriptor ed_bulk_out = {
 static struct usb_ep_descriptor ed_bulk_in = {
 	.bLength = sizeof(struct usb_ep_descriptor),
 	.bDescriptorType = USB_DESC_ENDPOINT,
-	.bEndpointAddress = 0x81,
+	.bEndpointAddress = BULK_IN_EP_ADDR,
 	.bmAttributes = USB_EP_TYPE_BULK,
 	.wMaxPacketSize = sys_cpu_to_le16(64),
 	.bInterval = 0,
diff --git a/tests/drivers/udc/testcase.yaml b/tests/drivers/udc/testcase.yaml
index 9427a1a97c971..2ba45d77488d0 100644
--- a/tests/drivers/udc/testcase.yaml
+++ b/tests/drivers/udc/testcase.yaml
@@ -7,6 +7,10 @@ tests:
     depends_on: usbd
     integration_platforms:
       - nrf52840dk/nrf52840
+      - frdm_k64f
+      - nucleo_f413zh
+      - mimxrt1050_evk/mimxrt1052/hyperflash
+      - rpi_pico
     platform_exclude:
       - nrf54h20dk/nrf54h20/cpuapp
   drivers.usb.udc.build_only:
diff --git a/tests/drivers/video/api/prj.conf b/tests/drivers/video/api/prj.conf
index 5e2cc7c828bf2..8a6c2151c273e 100644
--- a/tests/drivers/video/api/prj.conf
+++ b/tests/drivers/video/api/prj.conf
@@ -1,5 +1,11 @@
 CONFIG_ZTEST=y
 CONFIG_VIDEO=y
-CONFIG_VIDEO_BUFFER_POOL_SZ_MAX=16384
+
+# Just enough for a single frame in RGB565 format: 320 * 420 * 2 + some margin
+CONFIG_VIDEO_BUFFER_POOL_SZ_MAX=300000
 CONFIG_VIDEO_BUFFER_POOL_NUM_MAX=1
+
+# Required to support larger buffers on native_sim
+CONFIG_SYS_HEAP_BIG_ONLY=y
+
 CONFIG_VIDEO_LOG_LEVEL_DBG=y
diff --git a/tests/drivers/video/api/src/video_emul.c b/tests/drivers/video/api/src/video_emul.c
index 5ce07350f857c..141627dd414c8 100644
--- a/tests/drivers/video/api/src/video_emul.c
+++ b/tests/drivers/video/api/src/video_emul.c
@@ -130,13 +130,8 @@ ZTEST(video_common, test_video_ctrl)
 	int value;
 
 	/* Exposure control, expected to be supported by all imagers */
-	zexpect_ok(video_set_ctrl(imager_dev, VIDEO_CID_EXPOSURE, (void *)30));
-	zexpect_ok(video_get_ctrl(imager_dev, VIDEO_CID_EXPOSURE, &value));
-	zexpect_equal(value, 30);
-
-	/* Gain control, expected to be supported by all imagers */
-	zexpect_ok(video_set_ctrl(imager_dev, VIDEO_CID_GAIN, (void *)30));
-	zexpect_ok(video_get_ctrl(imager_dev, VIDEO_CID_GAIN, &value));
+	zexpect_ok(video_set_ctrl(imager_dev, VIDEO_CID_PRIVATE_BASE + 0x01, (void *)30));
+	zexpect_ok(video_get_ctrl(imager_dev, VIDEO_CID_PRIVATE_BASE + 0x01, &value));
 	zexpect_equal(value, 30);
 }
 
@@ -157,7 +152,7 @@ ZTEST(video_common, test_video_vbuf)
 	zexpect_ok(video_set_format(rx_dev, VIDEO_EP_OUT, &fmt));
 
 	/* Allocate a buffer, assuming prj.conf gives enough memory for it */
-	vbuf = video_buffer_alloc(fmt.pitch * fmt.height, K_FOREVER);
+	vbuf = video_buffer_alloc(fmt.pitch * fmt.height, K_NO_WAIT);
 	zexpect_not_null(vbuf);
 
 	/* Start the virtual hardware */
@@ -184,6 +179,9 @@ ZTEST(video_common, test_video_vbuf)
 
 	/* Nothing left in the queue, possible to stop */
 	zexpect_ok(video_stream_stop(rx_dev));
+
+	/* Nothing tested, but this should not crash */
+	video_buffer_release(vbuf);
 }
 
 ZTEST_SUITE(video_emul, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/video/api/testcase.yaml b/tests/drivers/video/api/testcase.yaml
index c6005d99760c9..888e0f722f847 100644
--- a/tests/drivers/video/api/testcase.yaml
+++ b/tests/drivers/video/api/testcase.yaml
@@ -1,8 +1,9 @@
-# Copyright (c) 2024 tinyVision.ai Inc.
+# Copyright (c) 2024-2025 tinyVision.ai Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 tests:
   drivers.video.api:
+    min_ram: 32
     tags:
       - drivers
       - video
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
new file mode 100644
index 0000000000000..45e31e2fae422
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
@@ -0,0 +1,2 @@
+# Disable dcache
+CONFIG_DCACHE=n
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
new file mode 100644
index 0000000000000..102abfc8ef27b
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
new file mode 100644
index 0000000000000..dc1ea1a9ddc9d
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l09pdk_nrf54l09_cpuflpr.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
new file mode 100644
index 0000000000000..dc1ea1a9ddc9d
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/nrf54l20pdk_nrf54l20_cpuflpr.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..cb831fea279b8
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
new file mode 100644
index 0000000000000..025e0b8aedb68
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/ophelia4ev_nrf54l15_cpuflpr.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/siwx917_rb4338a.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/siwx917_rb4338a.overlay
new file mode 100644
index 0000000000000..25e5763dc59e6
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_basic_api/boards/siwx917_rb4338a.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Silicon Laboratories Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&watchdog {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
index 6f4fd727d3bb1..38cfeb58902ce 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
@@ -98,6 +98,8 @@
 #define WDT_NODE DT_INST(0, gd_gd32_fwdgt)
 #elif DT_HAS_COMPAT_STATUS_OKAY(zephyr_counter_watchdog)
 #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(zephyr_counter_watchdog)
+#elif DT_HAS_COMPAT_STATUS_OKAY(silabs_siwx91x_wdt)
+#define WDT_NODE DT_INST(0, silabs_siwx91x_wdt)
 #elif DT_HAS_COMPAT_STATUS_OKAY(nuvoton_numaker_wwdt)
 #define WDT_NODE DT_INST(0, nuvoton_numaker_wwdt)
 #define TIMEOUTS 1
diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
index b1d05417cea67..262f4ae4f29f4 100644
--- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
@@ -1,5 +1,6 @@
 common:
   depends_on: watchdog
+  expect_reboot: true
   tags:
     - drivers
     - watchdog
@@ -20,6 +21,12 @@ tests:
       - mps2/an383
       - mps2/an386
       - mps2/an500
+      - panb511evb/nrf54l15/cpuapp
+      - panb511evb/nrf54l15/cpuflpr
+      - panb511evb/nrf54l15/cpuflpr/xip
+      - mimxrt700_evk/mimxrt798s/cm33_cpu1
+      - nrf54l15dk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l10/cpuapp/ns
   drivers.watchdog.stm32wwdg:
     filter: dt_compat_enabled("st,stm32-window-watchdog") or dt_compat_enabled("st,stm32-watchdog")
     extra_args: DTC_OVERLAY_FILE="boards/stm32_wwdg.overlay"
@@ -42,7 +49,7 @@ tests:
       - nucleo_u575zi_q
       - nucleo_c031c6
       - stm32h573i_dk
-      - nucleo_wba52cg
+      - nucleo_wba55cg
     integration_platforms:
       - nucleo_f091rc
   drivers.watchdog.stm32wwdg_h7:
@@ -79,7 +86,7 @@ tests:
       - nucleo_h753zi
       - nucleo_h7s3l8
       - stm32h7s78_dk
-      - nucleo_wba52cg
+      - nucleo_wba55cg
     integration_platforms:
       - nucleo_f091rc
   drivers.watchdog.mec15xxevb_assy6853:
diff --git a/tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml b/tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml
index 3609d92116920..75a140b9685d9 100644
--- a/tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml
@@ -3,12 +3,7 @@
 
 tests:
   drivers.watchdog.reset_none:
-    platform_allow:
-      - s32z2xxdc2/s32z270/rtu0
-      - s32z2xxdc2/s32z270/rtu1
-      - s32z2xxdc2@D/s32z270/rtu0
-      - s32z2xxdc2@D/s32z270/rtu1
-      - mr_canhubk3
+    filter: dt_compat_enabled("nxp,s32-swt") or dt_compat_enabled("renesas,ra-wdt")
     integration_platforms:
       - s32z2xxdc2/s32z270/rtu0
     tags:
diff --git a/tests/drivers/watchdog/wdt_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..cb831fea279b8
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_error_cases/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_error_cases/src/main.c b/tests/drivers/watchdog/wdt_error_cases/src/main.c
index 990b2b52c9821..935d8dd95a0fb 100644
--- a/tests/drivers/watchdog/wdt_error_cases/src/main.c
+++ b/tests/drivers/watchdog/wdt_error_cases/src/main.c
@@ -42,8 +42,8 @@
 #define DEFAULT_WINDOW_MIN (0U)
 
 /* Align tests to the specific target: */
-#if defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF54H20) || \
-	defined(CONFIG_SOC_NRF9280)
+#if defined(CONFIG_SOC_SERIES_NRF53X) || defined(CONFIG_SOC_SERIES_NRF54LX) || \
+	defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
 #define WDT_TEST_FLAGS                                                                             \
 	(WDT_DISABLE_SUPPORTED | WDT_FLAG_RESET_SOC_SUPPORTED |                                    \
 	 WDT_FLAG_ONLY_ONE_TIMEOUT_VALUE_SUPPORTED | WDT_OPT_PAUSE_IN_SLEEP_SUPPORTED |            \
diff --git a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
index b585713265442..78bafd3672982 100644
--- a/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_error_cases/testcase.yaml
@@ -8,6 +8,7 @@ common:
 tests:
   drivers.watchdog.wdt_error_cases:
     platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
@@ -15,5 +16,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpurad
       - nrf9280pdk/nrf9280/cpuapp
       - nrf9280pdk/nrf9280/cpurad
+      - ophelia4ev/nrf54l15/cpuapp
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
diff --git a/tests/drivers/watchdog/wdt_variables/CMakeLists.txt b/tests/drivers/watchdog/wdt_variables/CMakeLists.txt
new file mode 100644
index 0000000000000..3b4655e9b0023
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/CMakeLists.txt
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(wdt_variables)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..917b7c228fd96
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt010 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuflpr.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuflpr.overlay
new file mode 100644
index 0000000000000..721769461b8eb
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuflpr.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt132;
+	};
+};
+
+&wdt132 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 0000000000000..5daf343a59fca
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	aliases {
+		watchdog0 = &wdt131;
+	};
+};
+
+&wdt131 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
new file mode 100644
index 0000000000000..dc1ea1a9ddc9d
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54l09pdk_nrf54l09_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..dc1ea1a9ddc9d
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 0000000000000..dc1ea1a9ddc9d
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..cb831fea279b8
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt31 {
+	status = "okay";
+};
diff --git a/tests/drivers/watchdog/wdt_variables/prj.conf b/tests/drivers/watchdog/wdt_variables/prj.conf
new file mode 100644
index 0000000000000..9caba55af52e0
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_LOG=y
+CONFIG_LOG_MODE_IMMEDIATE=y
+CONFIG_WATCHDOG=y
diff --git a/tests/drivers/watchdog/wdt_variables/src/main.c b/tests/drivers/watchdog/wdt_variables/src/main.c
new file mode 100644
index 0000000000000..e81780ea8d969
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/src/main.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(wdt_vars, LOG_LEVEL_INF);
+
+#include <zephyr/kernel.h>
+#include <zephyr/cache.h>
+#include <zephyr/drivers/watchdog.h>
+
+#define WDT_WINDOW_MAX	(500)
+
+/* Watchdog related variables */
+static const struct device *const my_wdt_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
+static struct wdt_timeout_cfg m_cfg_wdt0;
+
+/* No init section will contain WDT_HAS_FIRED if watchdog has fired */
+#define WDT_HAS_FIRED	(12345678U)
+#define TEST_VALUE		(2U)
+
+#define NOINIT_SECTION ".noinit.test_wdt"
+static volatile uint32_t wdt_status __attribute__((section(NOINIT_SECTION)));
+
+/* Global variables to verify */
+static int global_tmp_0;
+static int global_tmp_1 = TEST_VALUE;
+
+
+static void wdt_int_cb(const struct device *wdt_dev, int channel_id)
+{
+	ARG_UNUSED(wdt_dev);
+	ARG_UNUSED(channel_id);
+	wdt_status = WDT_HAS_FIRED;
+
+	/* Flush cache as reboot may invalidate all lines. */
+	sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+}
+
+int main(void)
+{
+	int ret;
+	static int tmp_0;
+	static int tmp_1 = TEST_VALUE;
+
+	LOG_INF("wdt_variables test on %s", CONFIG_BOARD_TARGET);
+
+	global_tmp_0++;
+	global_tmp_1++;
+	tmp_0++;
+	tmp_1++;
+
+	LOG_DBG("global_tmp_0 = %d", global_tmp_0);
+	LOG_DBG("global_tmp_1 = %d", global_tmp_1);
+	LOG_DBG("tmp_0 = %d", tmp_0);
+	LOG_DBG("tmp_1 = %d", tmp_1);
+
+	/* When watchdog fires, variable wdt_status is set to the value of WDT_HAS_FIRED
+	 * in WDT callback wdt_int_cb(). Then, target is reset.
+	 * Check value of wdt_status to prevent reset loop.
+	 */
+	if (wdt_status != WDT_HAS_FIRED) {
+
+		LOG_INF("Reset wasn't due to watchdog.");
+
+		if (!device_is_ready(my_wdt_device)) {
+			LOG_ERR("WDT device %s is not ready", my_wdt_device->name);
+			return 1;
+		}
+
+		/* Configure Watchdog */
+		m_cfg_wdt0.callback = wdt_int_cb;
+		m_cfg_wdt0.flags = WDT_FLAG_RESET_SOC;
+		m_cfg_wdt0.window.min = 0U;
+		m_cfg_wdt0.window.max = WDT_WINDOW_MAX;
+		ret = wdt_install_timeout(my_wdt_device, &m_cfg_wdt0);
+		if (ret < 0) {
+			LOG_ERR("wdt_install_timeout() returned %d", ret);
+			return 1;
+		}
+
+		/* Start Watchdog */
+		ret = wdt_setup(my_wdt_device, WDT_OPT_PAUSE_HALTED_BY_DBG);
+		if (ret < 0) {
+			LOG_ERR("wdt_setup() returned %d", ret);
+			return 1;
+		}
+
+		LOG_INF("Watchdog shall fire in ~%u miliseconds", WDT_WINDOW_MAX);
+		k_sleep(K_FOREVER);
+	} else {
+		bool test_passing = true;
+
+		LOG_INF("Watchod has fired");
+
+		if (global_tmp_0 != 1) {
+			LOG_ERR("global_tmp_0 is %d instead of 1", global_tmp_0);
+			test_passing = false;
+		}
+
+		if (global_tmp_1 != (TEST_VALUE + 1)) {
+			LOG_ERR("global_tmp_1 is %d instead of %d", global_tmp_1, TEST_VALUE + 1);
+			test_passing = false;
+		}
+
+		if (tmp_0 != 1) {
+			LOG_ERR("tmp_0 is %d instead of 1", tmp_0);
+			test_passing = false;
+		}
+
+		if (tmp_1 != (TEST_VALUE + 1)) {
+			LOG_ERR("tmp_1 is %d instead of %d", tmp_1, TEST_VALUE + 1);
+			test_passing = false;
+		}
+
+		/* Cleanup */
+		wdt_status = 0;
+		sys_cache_data_flush_range((void *) &wdt_status, sizeof(wdt_status));
+
+		if (test_passing) {
+			LOG_INF("Test completed successfully");
+		} else {
+			LOG_INF("Test failed");
+		}
+	}
+
+	return 0;
+}
diff --git a/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..2416f23cf71f6
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&wdt131 {
+	status = "reserved";
+	interrupt-parent = <&cpuppr_clic>;
+};
+
+&wdt132 {
+	status = "reserved";
+	interrupt-parent = <&cpuflpr_clic>;
+};
diff --git a/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/prj.conf b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/prj.conf
new file mode 100644
index 0000000000000..b2a4ba591044e
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/sysbuild/vpr_launcher/prj.conf
@@ -0,0 +1 @@
+# nothing here
diff --git a/tests/drivers/watchdog/wdt_variables/testcase.yaml b/tests/drivers/watchdog/wdt_variables/testcase.yaml
new file mode 100644
index 0000000000000..3ed2ad90b1105
--- /dev/null
+++ b/tests/drivers/watchdog/wdt_variables/testcase.yaml
@@ -0,0 +1,31 @@
+common:
+  timeout: 10
+  tags:
+    - drivers
+    - watchdog
+  harness: console
+  harness_config:
+    type: one_line
+    regex:
+      - "Test completed successfully"
+
+tests:
+  drivers.watchdog.wdt_variables.default:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuppr
+      - nrf54l09pdk/nrf54l09/cpuapp
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+
+  drivers.watchdog.wdt_variables.54h_flpr:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuflpr
+    extra_args:
+      - vpr_launcher_SNIPPET=nordic-log-stm
+      - vpr_launcher_CONFIG_BOOT_BANNER=n
+      - SNIPPET=nordic-log-stm
diff --git a/tests/drivers/wifi/nrf_wifi/prj.conf b/tests/drivers/wifi/nrf_wifi/prj.conf
index 5074dded01eb5..b13d4ca6591d1 100644
--- a/tests/drivers/wifi/nrf_wifi/prj.conf
+++ b/tests/drivers/wifi/nrf_wifi/prj.conf
@@ -71,7 +71,7 @@ CONFIG_PRINTK=y
 CONFIG_SHELL=y
 CONFIG_SHELL_GETOPT=y
 CONFIG_DEVICE_SHELL=y
-CONFIG_POSIX_CLOCK=y
+CONFIG_POSIX_TIMERS=y
 CONFIG_DATE_SHELL=y
 CONFIG_NET_CONFIG_AUTO_INIT=n
 CONFIG_POSIX_API=y
diff --git a/tests/drivers/wifi/nrf_wifi/testcase.yaml b/tests/drivers/wifi/nrf_wifi/testcase.yaml
index f1888fcefc35b..db8aeaad37daf 100644
--- a/tests/drivers/wifi/nrf_wifi/testcase.yaml
+++ b/tests/drivers/wifi/nrf_wifi/testcase.yaml
@@ -4,17 +4,18 @@ common:
     - drivers
     - wifi
     - net
+    - nrf_wifi
   platform_allow:
     - nrf7002dk/nrf5340/cpuapp
 tests:
-  nrf70.build.sta:
+  drivers.wifi.build.sta:
     extra_configs: []
-  nrf70.build.radio_test:
+  drivers.wifi.build.radio_test:
     extra_configs:
       - CONFIG_NRF70_RADIO_TEST=y
       - CONFIG_NETWORKING=n
       - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-  nrf70.build.scan_only:
+  drivers.wifi.build.scan_only:
     extra_configs:
       - CONFIG_NRF70_SCAN_ONLY=y
       - CONFIG_NETWORKING=y
@@ -22,7 +23,7 @@ tests:
       - CONFIG_NET_NATIVE=n
       - CONFIG_NET_OFFLOAD=y
       - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-  nrf70.build.raw_scan_results:
+  drivers.wifi.build.raw_scan_results:
     extra_configs:
       - CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
       - CONFIG_NRF70_SCAN_ONLY=y
@@ -31,24 +32,24 @@ tests:
       - CONFIG_NET_NATIVE=n
       - CONFIG_NET_OFFLOAD=y
       - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-  nrf70.build.raw_tx:
+  drivers.wifi.build.raw_tx:
     extra_configs:
       - CONFIG_NRF70_RAW_DATA_TX=y
-  nrf70.build.raw_rx:
+  drivers.wifi.build.raw_rx:
     extra_configs:
       - CONFIG_NRF70_RAW_DATA_RX=y
-  nrf70.build.promiscuous:
+  drivers.wifi.build.promiscuous:
     extra_configs:
       - CONFIG_NRF70_PROMISC_DATA_RX=y
-  nrf70.build.offloaded_raw_tx:
+  drivers.wifi.build.offloaded_raw_tx:
     extra_configs:
       - CONFIG_NRF70_OFFLOADED_RAW_TX=y
       - CONFIG_NETWORKING=n
       - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
       - CONFIG_NET_L2_WIFI_MGMT=n
-  nrf70.build.softap:
+  drivers.wifi.build.softap:
     extra_configs:
       - CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y
-  nrf70.build.p2p:
+  drivers.wifi.build.p2p:
     extra_configs:
       - CONFIG_NRF70_P2P_MODE=y
diff --git a/tests/kernel/common/src/constructor.c b/tests/kernel/common/src/constructor.c
index 75f866df0f0bd..6aca7f7cbe34d 100644
--- a/tests/kernel/common/src/constructor.c
+++ b/tests/kernel/common/src/constructor.c
@@ -18,21 +18,37 @@
  *
  */
 
-static int constructor_value;
+static int constructor_number;
+static int constructor_values[3];
 
-#define CONSTRUCTOR_VALUE	1
+void __attribute__((__constructor__)) __constructor_init(void)
+{
+	constructor_values[constructor_number++] = 31415;
+}
+
+void __attribute__((__constructor__(101))) __constructor_init_priority_101(void)
+{
+	constructor_values[constructor_number++] = 101;
+}
 
-void
-__attribute__((__constructor__))
-__constructor_init(void)
+void __attribute__((__constructor__(1000))) __constructor_init_priority_1000(void)
 {
-	constructor_value = CONSTRUCTOR_VALUE;
+	constructor_values[constructor_number++] = 1000;
 }
 
 ZTEST(constructor, test_constructor)
 {
-	zassert_equal(constructor_value, CONSTRUCTOR_VALUE,
-		      "constructor test failed: constructor not called");
+	zassert_equal(constructor_number, 3,
+		      "constructor test failed: constructor missing");
+	zassert_equal(constructor_values[0], 101,
+		      "constructor priority test failed:"
+		      "constructor 101 not called first");
+	zassert_equal(constructor_values[1], 1000,
+		      "constructor priority test failed:"
+		      "constructor 1000 not called second");
+	zassert_equal(constructor_values[2], 31415,
+		      "constructor priority test failed:"
+		      "constructor without priority not called last");
 }
 
 extern void *common_setup(void);
diff --git a/tests/kernel/context/src/main.c b/tests/kernel/context/src/main.c
index 699c7bdc642bb..32e176d45e6ea 100644
--- a/tests/kernel/context/src/main.c
+++ b/tests/kernel/context/src/main.c
@@ -57,7 +57,7 @@
 #elif defined(CONFIG_SPARC)
 #elif defined(CONFIG_MIPS)
 #elif defined(CONFIG_ARCH_POSIX)
-#if defined(CONFIG_BOARD_NATIVE_POSIX) || defined(CONFIG_BOARD_NATIVE_SIM)
+#if defined(CONFIG_BOARD_NATIVE_SIM)
 #define TICK_IRQ TIMER_TICK_IRQ
 #else
 /*
diff --git a/tests/kernel/device/src/main.c b/tests/kernel/device/src/main.c
index 4e998120d01d7..2479a366ec9e5 100644
--- a/tests/kernel/device/src/main.c
+++ b/tests/kernel/device/src/main.c
@@ -270,10 +270,12 @@ SYS_INIT(init_fn, APPLICATION, 0);
 SYS_INIT_NAMED(init1, init_fn, APPLICATION, 1);
 SYS_INIT_NAMED(init2, init_fn, APPLICATION, 2);
 SYS_INIT_NAMED(init3, init_fn, APPLICATION, 2);
+SYS_INIT_NAMED(init4, init_fn, APPLICATION, 99);
+SYS_INIT_NAMED(init5, init_fn, APPLICATION, 999);
 
 ZTEST(device, test_sys_init_multiple)
 {
-	zassert_equal(sys_init_counter, 4, "");
+	zassert_equal(sys_init_counter, 6, "");
 }
 
 /* this is for storing sequence during initialization */
diff --git a/tests/kernel/fatal/exception/src/main.c b/tests/kernel/fatal/exception/src/main.c
index 6eb97068b6ce1..1033473a21ca4 100644
--- a/tests/kernel/fatal/exception/src/main.c
+++ b/tests/kernel/fatal/exception/src/main.c
@@ -7,6 +7,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
+#include <zephyr/test_toolchain.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/irq_offload.h>
 #include <kswap.h>
@@ -192,20 +193,16 @@ __no_optimization void blow_up_stack(void)
 /* stack sentinel doesn't catch it in time before it trashes the entire kernel
  */
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Winfinite-recursion"
-#endif
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_PRAGMAS)
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_INFINITE_RECURSION)
 
 __no_optimization int stack_smasher(int val)
 {
 	return stack_smasher(val * 2) + stack_smasher(val * 3);
 }
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_PRAGMAS)
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_INFINITE_RECURSION)
 
 void blow_up_stack(void)
 {
diff --git a/tests/kernel/fatal/exception/testcase.yaml b/tests/kernel/fatal/exception/testcase.yaml
index e10be671b071c..1319b4f06b955 100644
--- a/tests/kernel/fatal/exception/testcase.yaml
+++ b/tests/kernel/fatal/exception/testcase.yaml
@@ -43,8 +43,6 @@ tests:
       - mps2/an385
   kernel.common.stack_sentinel:
     extra_args: CONF_FILE=sentinel.conf
-    platform_exclude:
-      - qemu_cortex_a9 # FIXME: See issue #39948
     tags: kernel
     integration_platforms:
       - qemu_x86
diff --git a/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c b/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c
index c6b4acff46d7f..35da6e605374d 100644
--- a/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c
+++ b/tests/kernel/fpu_sharing/float_disable/src/k_float_disable.c
@@ -207,6 +207,16 @@ static void sup_fp_thread_entry(void *p1, void *p2, void *p3)
 			break;
 		}
 	}
+#elif defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
+	for (i = CONFIG_NUM_IRQS - 1; i >= 0; i--) {
+		if (z_soc_irq_is_enabled(i) == 0) {
+			/*
+			 * Similar to NVIC, get an IRQ line that is not enabled
+			 * with the custom ARM controller
+			 */
+			break;
+		}
+	}
 #else
 	/*
 	 * SGIs are always enabled by default, so choose the last one
diff --git a/tests/kernel/fpu_sharing/generic/src/load_store.c b/tests/kernel/fpu_sharing/generic/src/load_store.c
index 1193297eb4152..67e6cb54129c4 100644
--- a/tests/kernel/fpu_sharing/generic/src/load_store.c
+++ b/tests/kernel/fpu_sharing/generic/src/load_store.c
@@ -46,7 +46,7 @@
 #endif /* __GNUC__ */
 #elif defined(CONFIG_ARM)
 #if defined(CONFIG_ARMV7_M_ARMV8_M_FP) || defined(CONFIG_ARMV7_R_FP) || defined(CONFIG_CPU_HAS_VFP)
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__ICCARM__)
 #include "float_regs_arm_gcc.h"
 #else
 #include "float_regs_arm_other.h"
diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index a7d76b4eafedb..d6b92731fc537 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -12,7 +12,7 @@
 #include <zephyr/interrupt_util.h>
 #include <zephyr/sys/barrier.h>
 
-extern uint32_t _irq_vector_table[];
+extern uintptr_t _irq_vector_table[];
 
 #if defined(ARCH_IRQ_DIRECT_CONNECT) && defined(CONFIG_GEN_IRQ_VECTOR_TABLE)
 #define HAS_DIRECT_IRQS
@@ -26,7 +26,7 @@ extern uint32_t _irq_vector_table[];
 #define ISR3_OFFSET	17
 #define ISR5_OFFSET	18
 #define TRIG_CHECK_SIZE	19
-#elif defined(CONFIG_SOC_NRF54H20_CPUPPR)
+#elif defined(CONFIG_SOC_NRF54H20_CPUPPR) || defined(CONFIG_SOC_NRF54H20_CPUFLPR)
 #define ISR1_OFFSET	14
 #define ISR3_OFFSET	15
 #define ISR5_OFFSET	16
@@ -76,8 +76,8 @@ extern uint32_t _irq_vector_table[];
  * with isr used here, so add a workaround
  */
 #define TEST_NUM_IRQS	105
-#elif defined(CONFIG_SOC_NRF5340_CPUAPP) || defined(CONFIG_SOC_NRF9160)
-/* In nRF9160 and application core in nRF5340, not all interrupts with highest
+#elif defined(CONFIG_SOC_NRF5340_CPUAPP) || defined(CONFIG_SOC_SERIES_NRF91X)
+/* In the application core of nRF5340 and nRF9 series, not all interrupts with highest
  * numbers are implemented. Thus, limit the number of interrupts reported to
  * the test, so that it does not try to use some unavailable ones.
  */
@@ -226,7 +226,7 @@ static int check_vector(void *isr, int offset)
 	TC_PRINT("Checking _irq_vector_table entry %d for irq %d\n",
 		 TABLE_INDEX(offset), IRQ_LINE(offset));
 
-	if (_irq_vector_table[TABLE_INDEX(offset)] != (uint32_t)isr) {
+	if (_irq_vector_table[TABLE_INDEX(offset)] != (uintptr_t)isr) {
 		TC_PRINT("bad entry %d in vector table\n", TABLE_INDEX(offset));
 		return -1;
 	}
diff --git a/tests/kernel/gen_isr_table/src/multilevel_irq.c b/tests/kernel/gen_isr_table/src/multilevel_irq.c
index 873b3d0a35938..29bead13a6538 100644
--- a/tests/kernel/gen_isr_table/src/multilevel_irq.c
+++ b/tests/kernel/gen_isr_table/src/multilevel_irq.c
@@ -14,17 +14,21 @@ static void test_multi_level_bit_masks_fn(uint32_t irq1, uint32_t irq2, uint32_t
 	const uint32_t l3_shift = CONFIG_1ST_LEVEL_INTERRUPT_BITS + CONFIG_2ND_LEVEL_INTERRUPT_BITS;
 	const uint32_t hwirq1 = irq1;
 	const uint32_t hwirq2 = irq2 - 1;
-	const uint32_t hwirq3 = irq3 - 1;
-	const bool has_l3 = irq3 > 0;
-	const bool has_l2 = irq2 > 0;
-	const uint32_t level = has_l3 ? 3 : has_l2 ? 2 : 1;
 	const uint32_t irqn_l1 = irq1;
 	const uint32_t irqn_l2 = (irq2 << l2_shift) | irqn_l1;
 	const uint32_t irqn = (irq3 << l3_shift) | irqn_l2;
+	int level;
 
+	if (IS_ENABLED(CONFIG_3RD_LEVEL_INTERRUPTS) && (irq3 > 0)) {
+		level = 3;
+	} else if (IS_ENABLED(CONFIG_2ND_LEVEL_INTERRUPTS) && (irq2 > 0)) {
+		level = 2;
+	} else {
+		level = 1;
+	}
 	zassert_equal(level, irq_get_level(irqn));
 
-	if (has_l2) {
+	if (irq2 > 0) {
 		zassert_equal(hwirq2, irq_from_level_2(irqn));
 		zassert_equal(hwirq2, irq_from_level(irqn, 2));
 		zassert_equal((hwirq2 + 1) << l2_shift, irq_to_level_2(hwirq2));
@@ -33,7 +37,10 @@ static void test_multi_level_bit_masks_fn(uint32_t irq1, uint32_t irq2, uint32_t
 		zassert_equal(hwirq1, irq_parent_level(irqn, 2));
 	}
 
-	if (has_l3) {
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+	if (irq3 > 0) {
+		const uint32_t hwirq3 = irq3 - 1;
+
 		zassert_equal(hwirq3, irq_from_level_3(irqn));
 		zassert_equal(hwirq3, irq_from_level(irqn, 3));
 		zassert_equal((hwirq3 + 1) << l3_shift, irq_to_level_3(hwirq3));
@@ -41,10 +48,15 @@ static void test_multi_level_bit_masks_fn(uint32_t irq1, uint32_t irq2, uint32_t
 		zassert_equal(hwirq2, irq_parent_level_3(irqn));
 		zassert_equal(hwirq2, irq_parent_level(irqn, 3));
 	}
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
-	if (has_l3) {
+	if (false) {
+		/* always skipped */
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+	} else if (irq3 > 0) {
 		zassert_equal(irqn_l2, irq_get_intc_irq(irqn));
-	} else if (has_l2) {
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
+	} else if (irq2 > 0) {
 		zassert_equal(irqn_l1, irq_get_intc_irq(irqn));
 	} else {
 		/* degenerate cases */
diff --git a/tests/kernel/gen_isr_table/testcase.yaml b/tests/kernel/gen_isr_table/testcase.yaml
index a45771919b10f..60662b11d9c13 100644
--- a/tests/kernel/gen_isr_table/testcase.yaml
+++ b/tests/kernel/gen_isr_table/testcase.yaml
@@ -56,7 +56,7 @@ tests:
       - CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
   arch.interrupt.gen_isr_table_local.arm_mainline:
     <<: *arm-mainline
-    filter: CONFIG_GEN_ISR_TABLES and CONFIG_ARMV6_M_ARMV8_M_BASELINE and not CONFIG_USERSPACE
+    filter: CONFIG_GEN_ISR_TABLES and CONFIG_ARMV7_M_ARMV8_M_MAINLINE and not CONFIG_USERSPACE
     extra_configs:
       - CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
       - CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
@@ -72,6 +72,8 @@ tests:
     platform_exclude:
       - m2gl025_miv
       - adp_xc7k/ae350
+      - nrf9280pdk/nrf9280/cpuppr
+      - nrf9280pdk/nrf9280/cpuppr/xip
     filter: CONFIG_RISCV_PRIVILEGED
     extra_configs:
       - CONFIG_GEN_IRQ_VECTOR_TABLE=y
diff --git a/tests/kernel/interrupt/src/multilevel_irq.c b/tests/kernel/interrupt/src/multilevel_irq.c
index 76dbd29b4543a..b73626bc1aa73 100644
--- a/tests/kernel/interrupt/src/multilevel_irq.c
+++ b/tests/kernel/interrupt/src/multilevel_irq.c
@@ -12,18 +12,15 @@
 ZTEST(interrupt_feature, test_multi_level_api)
 {
 	/* Zephyr multilevel-encoded IRQ */
-	const uint32_t irqn_l3 = DT_IRQN(DT_NODELABEL(test_l3_irq));
 	const uint32_t irqn_l2 = DT_IRQN(DT_NODELABEL(test_l2_irq));
 	const uint32_t irqn_l1 = DT_IRQN(DT_NODELABEL(test_l1_irq));
 	/* Raw IRQ specified in the devicetree */
-	const uint32_t raw_l3 = DT_IRQ(DT_NODELABEL(test_l3_irq), irq);
 	const uint32_t raw_l2 = DT_IRQ(DT_NODELABEL(test_l2_irq), irq);
 	const uint32_t raw_l1 = DT_IRQ(DT_NODELABEL(test_l1_irq), irq);
 
 	/**
 	 *  - irq_get_level()
 	 */
-	zassert_equal(3, irq_get_level(irqn_l3));
 	zassert_equal(2, irq_get_level(irqn_l2));
 	zassert_equal(1, irq_get_level(irqn_l1));
 
@@ -32,13 +29,59 @@ ZTEST(interrupt_feature, test_multi_level_api)
 	 *  - irq_to_level_2()
 	 *  - irq_parent_level_2()
 	 */
-	zassert_equal(irq_from_level_2(irqn_l3), raw_l2);
 	zassert_equal(irq_from_level_2(irqn_l2), raw_l2);
 
 	zassert_equal(irq_to_level_2(raw_l2) & irqn_l2, irq_to_level_2(raw_l2));
 
 	zassert_equal(irq_parent_level_2(irqn_l2), raw_l1);
 
+	/**
+	 *  - irq_from_level()
+	 *  - irq_to_level()
+	 *  - irq_parent_level()
+	 */
+	zassert_equal(irq_from_level(irqn_l2, 2), raw_l2);
+
+	zassert_equal(irq_to_level(raw_l2, 2) & irqn_l2, irq_to_level(raw_l2, 2));
+
+	zassert_equal(irq_parent_level(irqn_l2, 2), raw_l1);
+
+	/**
+	 *  - irq_get_intc_irq()
+	 */
+	zassert_equal(irq_get_intc_irq(irqn_l2), irqn_l1);
+	zassert_equal(irq_get_intc_irq(irqn_l1), irqn_l1);
+
+	const uint32_t irqn_l2_inc = DT_IRQN(DT_NODELABEL(test_l2_irq_inc));
+	const uint32_t irqn_l1_inc = DT_IRQN(DT_NODELABEL(test_l1_irq_inc));
+
+	/**
+	 * - irq_increment()
+	 */
+	zassert_equal(irq_increment(irqn_l1, 1), irqn_l1_inc);
+	zassert_equal(irq_increment(irqn_l2, 2), irqn_l2_inc);
+}
+
+#ifdef CONFIG_3RD_LEVEL_INTERRUPTS
+ZTEST(interrupt_feature, test_multi_level_api_l3)
+{
+	/* Zephyr multilevel-encoded IRQ */
+	const uint32_t irqn_l2 = DT_IRQN(DT_NODELABEL(test_l2_irq));
+	const uint32_t irqn_l3 = DT_IRQN(DT_NODELABEL(test_l3_irq));
+	/* Raw IRQ specified in the devicetree */
+	const uint32_t raw_l2 = DT_IRQ(DT_NODELABEL(test_l2_irq), irq);
+	const uint32_t raw_l3 = DT_IRQ(DT_NODELABEL(test_l3_irq), irq);
+
+	/**
+	 *  - irq_get_level()
+	 */
+	zassert_equal(3, irq_get_level(irqn_l3));
+
+	/**
+	 *  - irq_from_level_2()
+	 */
+	zassert_equal(irq_from_level_2(irqn_l3), raw_l2);
+
 	/**
 	 *  - irq_from_level_3()
 	 *  - irq_to_level_3()
@@ -56,32 +99,24 @@ ZTEST(interrupt_feature, test_multi_level_api)
 	 *  - irq_parent_level()
 	 */
 	zassert_equal(irq_from_level(irqn_l3, 2), raw_l2);
-	zassert_equal(irq_from_level(irqn_l2, 2), raw_l2);
 	zassert_equal(irq_from_level(irqn_l3, 3), raw_l3);
 
-	zassert_equal(irq_to_level(raw_l2, 2) & irqn_l2, irq_to_level(raw_l2, 2));
 	zassert_equal(irq_to_level(raw_l3, 3) & irqn_l3, irq_to_level(raw_l3, 3));
 
-	zassert_equal(irq_parent_level(irqn_l2, 2), raw_l1);
 	zassert_equal(irq_parent_level(irqn_l3, 3), raw_l2);
 
 	/**
 	 *  - irq_get_intc_irq()
 	 */
 	zassert_equal(irq_get_intc_irq(irqn_l3), irqn_l2);
-	zassert_equal(irq_get_intc_irq(irqn_l2), irqn_l1);
-	zassert_equal(irq_get_intc_irq(irqn_l1), irqn_l1);
 
 	const uint32_t irqn_l3_inc = DT_IRQN(DT_NODELABEL(test_l3_irq_inc));
-	const uint32_t irqn_l2_inc = DT_IRQN(DT_NODELABEL(test_l2_irq_inc));
-	const uint32_t irqn_l1_inc = DT_IRQN(DT_NODELABEL(test_l1_irq_inc));
 
 	/**
 	 * - irq_increment()
 	 */
-	zassert_equal(irq_increment(irqn_l1, 1), irqn_l1_inc);
-	zassert_equal(irq_increment(irqn_l2, 2), irqn_l2_inc);
 	zassert_equal(irq_increment(irqn_l3, 3), irqn_l3_inc);
 }
+#endif /* CONFIG_3RD_LEVEL_INTERRUPTS */
 
 ZTEST_SUITE(gen_isr_table_multilevel, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index d488be5b42684..3e6a798e60429 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -112,7 +112,7 @@ void isr0(const void *param)
 	trigger_irq(irq_line_1);
 
 	/* Wait for interrupt */
-	k_busy_wait(MS_TO_US(DURATION));
+	k_busy_wait(DURATION * USEC_PER_MSEC);
 
 	/* Validate nested ISR result token */
 	zassert_equal(isr1_result, ISR1_TOKEN, "isr1 did not execute");
@@ -160,7 +160,7 @@ ZTEST(interrupt_feature, test_nested_isr)
 	trigger_irq(irq_line_0);
 
 	/* Wait for interrupt */
-	k_busy_wait(MS_TO_US(DURATION));
+	k_busy_wait(DURATION * USEC_PER_MSEC);
 
 	/* Validate ISR result token */
 	zassert_equal(isr0_result, ISR0_TOKEN, "isr0 did not execute");
diff --git a/tests/kernel/interrupt/testcase.yaml b/tests/kernel/interrupt/testcase.yaml
index 2fedbd6291859..4c1ae0714d3d1 100644
--- a/tests/kernel/interrupt/testcase.yaml
+++ b/tests/kernel/interrupt/testcase.yaml
@@ -93,3 +93,11 @@ tests:
       - EXTRA_DTC_OVERLAY_FILE="multilevel_irq.overlay"
     extra_configs:
       - CONFIG_TEST_MULTILEVEL_IRQ=y
+  arch.interrupt.multilevel_l3:
+    filter: CONFIG_MULTI_LEVEL_INTERRUPTS
+    extra_args:
+      - EXTRA_DTC_OVERLAY_FILE="multilevel_irq.overlay"
+    extra_configs:
+      - CONFIG_TEST_MULTILEVEL_IRQ=y
+      - CONFIG_3RD_LEVEL_INTERRUPTS=y
+      - CONFIG_3RD_LEVEL_INTERRUPT_BITS=11
diff --git a/tests/kernel/ipi_optimize/boards/qemu_x86_64.conf b/tests/kernel/ipi_optimize/boards/qemu_x86_64.conf
new file mode 100644
index 0000000000000..f0ee34b467edd
--- /dev/null
+++ b/tests/kernel/ipi_optimize/boards/qemu_x86_64.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2022 Carlo Caione <ccaione@baylibre.com>
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MP_MAX_NUM_CPUS=4
diff --git a/tests/kernel/ipi_optimize/boards/qemu_x86_64.overlay b/tests/kernel/ipi_optimize/boards/qemu_x86_64.overlay
new file mode 100644
index 0000000000000..ba32c964f4989
--- /dev/null
+++ b/tests/kernel/ipi_optimize/boards/qemu_x86_64.overlay
@@ -0,0 +1,19 @@
+/* Copyright 2022 Carlo Caione <ccaione@baylibre.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	cpus {
+		cpu@2 {
+			device_type = "cpu";
+			compatible = "intel,x86_64";
+			reg = <2>;
+		};
+
+		cpu@3 {
+			device_type = "cpu";
+			compatible = "intel,x86_64";
+			reg = <3>;
+		};
+	};
+};
diff --git a/tests/kernel/mem_protect/mem_protect/testcase.yaml b/tests/kernel/mem_protect/mem_protect/testcase.yaml
index 76e27a22e1163..e061729e302f7 100644
--- a/tests/kernel/mem_protect/mem_protect/testcase.yaml
+++ b/tests/kernel/mem_protect/mem_protect/testcase.yaml
@@ -26,6 +26,7 @@ tests:
       - slwrb4180a
       - mps3/corstone300/an547
       - nrf9160dk/nrf9160
+      - xg29_rb4412a
     integration_platforms:
       - mps3/corstone300/an547
     extra_args: CONFIG_MPU_GAP_FILLING=y
diff --git a/tests/kernel/mem_protect/stack_random/src/main.c b/tests/kernel/mem_protect/stack_random/src/main.c
index 12caf4a333d04..b2419f79e26e4 100644
--- a/tests/kernel/mem_protect/stack_random/src/main.c
+++ b/tests/kernel/mem_protect/stack_random/src/main.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
+#include <zephyr/test_toolchain.h>
 
 #define STACKSIZE       2048
 #define THREAD_COUNT	64
@@ -18,11 +19,7 @@ volatile unsigned int changed;
  * The `alternate_thread` function deliberately makes use of a dangling pointer
  * in order to test stack randomisation.
  */
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wdangling-pointer"
-#endif
+TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_DANGLING_POINTER)
 
 void alternate_thread(void *p1, void *p2, void *p3)
 {
@@ -46,9 +43,7 @@ void alternate_thread(void *p1, void *p2, void *p3)
 	last_sp = sp_val;
 }
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_DANGLING_POINTER)
 
 K_THREAD_STACK_DEFINE(alt_thread_stack_area, STACKSIZE);
 static struct k_thread alt_thread_data;
diff --git a/tests/kernel/mem_slab/mslab/src/main.c b/tests/kernel/mem_slab/mslab/src/main.c
index 0a9b111c39a5a..7327358880497 100644
--- a/tests/kernel/mem_slab/mslab/src/main.c
+++ b/tests/kernel/mem_slab/mslab/src/main.c
@@ -247,7 +247,7 @@ ZTEST(memory_slab_1cpu, test_mslab)
 
 	TC_PRINT("%s: start to wait for block\n", __func__);
 	k_sem_give(&SEM_REGRESSDONE);    /* Allow helper thread to run part 4 */
-	ret_value = k_mem_slab_alloc(&map_lgblks, &b, K_MSEC(50));
+	ret_value = k_mem_slab_alloc(&map_lgblks, &b, K_MSEC(180));
 	zassert_equal(0, ret_value,
 		      "Failed k_mem_slab_alloc, ret_value %d\n", ret_value);
 
diff --git a/tests/kernel/mutex/mutex_api/src/complex_inversion.c b/tests/kernel/mutex/mutex_api/src/complex_inversion.c
new file mode 100644
index 0000000000000..ae12f6c87b526
--- /dev/null
+++ b/tests/kernel/mutex/mutex_api/src/complex_inversion.c
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2024 by Garmin Ltd. or its subsidiaries.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Test complex mutex priority inversion
+ *
+ * This module demonstrates the kernel's priority inheritance algorithm
+ * with two mutexes and four threads, ensuring that boosting priority of
+ * a thread waiting on another mutex does not break assumptions of the
+ * mutex's waitq, causing the incorrect thread to run or a crash.
+ *
+ * Sequence for priority inheritance testing:
+ *  - thread_08 takes mutex_1
+ *  - thread_07 takes mutex_0 then waits on mutex_1
+ *  - thread_06 waits on mutex_1
+ *  - thread_05 waits on mutex_0, boosting priority of thread_07
+ *  - thread_08 gives mutex_1, thread_07 takes mutex_1
+ *  - thread_07 gives mutex_1, thread_06 takes mutex_1
+ *  - thread_07 gives mutex_0, thread_05 takes mutex_0
+ *  - thread_06 gives mutex_1
+ *  - thread_05 gives mutex_0
+ */
+
+#include <zephyr/tc_util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+#include <zephyr/sys/mutex.h>
+
+#define STACKSIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
+
+static ZTEST_DMEM int tc_rc = TC_PASS; /* test case return code */
+
+static K_MUTEX_DEFINE(mutex_0);
+static K_MUTEX_DEFINE(mutex_1);
+
+#define PARTICIPANT_THREAD_OPTIONS (K_INHERIT_PERMS)
+
+#define DEFINE_PARTICIPANT_THREAD(id)                                                              \
+	static K_THREAD_STACK_DEFINE(thread_##id##_stack_area, STACKSIZE);                         \
+	static struct k_thread thread_##id##_thread_data;                                          \
+	static k_tid_t thread_##id##_tid;                                                          \
+	static K_SEM_DEFINE(thread_##id##_wait, 0, 1);                                             \
+	static K_SEM_DEFINE(thread_##id##_done, 0, 1);
+
+#define CREATE_PARTICIPANT_THREAD(id, pri)                                                         \
+	thread_##id##_tid = k_thread_create(&thread_##id##_thread_data, thread_##id##_stack_area,  \
+					    K_THREAD_STACK_SIZEOF(thread_##id##_stack_area),       \
+					    (k_thread_entry_t)thread_##id, &thread_##id##_wait,    \
+					    &thread_##id##_done, NULL, pri,                        \
+					    PARTICIPANT_THREAD_OPTIONS, K_FOREVER);                \
+	k_thread_name_set(thread_##id##_tid, "thread_" STRINGIFY(id));
+#define START_PARTICIPANT_THREAD(id) k_thread_start(&(thread_##id##_thread_data));
+#define JOIN_PARTICIPANT_THREAD(id)  k_thread_join(&(thread_##id##_thread_data), K_FOREVER);
+
+#define WAIT_FOR_MAIN()                                                                            \
+	k_sem_give(done);                                                                          \
+	k_sem_take(wait, K_FOREVER);
+
+#define ADVANCE_THREAD(id)                                                                         \
+	SIGNAL_THREAD(id);                                                                         \
+	WAIT_FOR_THREAD(id);
+
+#define SIGNAL_THREAD(id) k_sem_give(&thread_##id##_wait);
+
+#define WAIT_FOR_THREAD(id) zassert_ok(k_sem_take(&thread_##id##_done, K_MSEC(100)));
+
+/**
+ *
+ * thread_05 -
+ *
+ */
+
+static void thread_05(struct k_sem *wait, struct k_sem *done)
+{
+	int rv;
+
+	/*
+	 * Wait for mutex_0, boosting the priority of thread_07 so it will lock mutex_1 first.
+	 */
+
+	WAIT_FOR_MAIN();
+
+	rv = k_mutex_lock(&mutex_0, K_FOREVER);
+	if (rv != 0) {
+		tc_rc = TC_FAIL;
+		TC_ERROR("Failed to take mutex %p\n", &mutex_0);
+		return;
+	}
+
+	WAIT_FOR_MAIN();
+
+	k_mutex_unlock(&mutex_0);
+}
+
+/**
+ *
+ * thread_06 -
+ *
+ */
+
+static void thread_06(struct k_sem *wait, struct k_sem *done)
+{
+	int rv;
+
+	/*
+	 * Wait for mutex_1. Initially it will be the highest priority waiter, but
+	 * thread_07 will be boosted above thread_06 so thread_07 will lock it first.
+	 */
+
+	WAIT_FOR_MAIN();
+
+	rv = k_mutex_lock(&mutex_1, K_FOREVER);
+	if (rv != 0) {
+		tc_rc = TC_FAIL;
+		TC_ERROR("Failed to take mutex %p\n", &mutex_1);
+		return;
+	}
+
+	WAIT_FOR_MAIN();
+
+	k_mutex_unlock(&mutex_1);
+}
+
+/**
+ *
+ * thread_07 -
+ *
+ */
+
+static void thread_07(struct k_sem *wait, struct k_sem *done)
+{
+	int rv;
+
+	/*
+	 * Lock mutex_0 and wait for mutex_1. After thread_06 is also waiting for
+	 * mutex_1, thread_05 will wait for mutex_0, boosting the priority for
+	 * thread_07 so it should lock mutex_1 first when it is unlocked by thread_08.
+	 */
+
+	WAIT_FOR_MAIN();
+
+	rv = k_mutex_lock(&mutex_0, K_NO_WAIT);
+	if (rv != 0) {
+		tc_rc = TC_FAIL;
+		TC_ERROR("Failed to take mutex %p\n", &mutex_0);
+		return;
+	}
+
+	WAIT_FOR_MAIN();
+
+	rv = k_mutex_lock(&mutex_1, K_FOREVER);
+	if (rv != 0) {
+		tc_rc = TC_FAIL;
+		TC_ERROR("Failed to take mutex %p\n", &mutex_1);
+		k_mutex_unlock(&mutex_0);
+		return;
+	}
+
+	WAIT_FOR_MAIN();
+
+	k_mutex_unlock(&mutex_1);
+	k_mutex_unlock(&mutex_0);
+}
+
+/**
+ *
+ * thread_08 -
+ *
+ */
+
+static void thread_08(struct k_sem *wait, struct k_sem *done)
+{
+	int rv;
+
+	/*
+	 * Lock mutex_1 and hold until priority has been boosted on thread_07
+	 * to ensure that thread_07 is the first to lock mutex_1 when thread_08
+	 * unlocks it.
+	 */
+
+	WAIT_FOR_MAIN();
+
+	rv = k_mutex_lock(&mutex_1, K_NO_WAIT);
+	if (rv != 0) {
+		tc_rc = TC_FAIL;
+		TC_ERROR("Failed to take mutex %p\n", &mutex_1);
+		return;
+	}
+
+	WAIT_FOR_MAIN();
+
+	k_mutex_unlock(&mutex_1);
+}
+
+DEFINE_PARTICIPANT_THREAD(05);
+DEFINE_PARTICIPANT_THREAD(06);
+DEFINE_PARTICIPANT_THREAD(07);
+DEFINE_PARTICIPANT_THREAD(08);
+
+static void create_participant_threads(void)
+{
+	CREATE_PARTICIPANT_THREAD(05, 5);
+	CREATE_PARTICIPANT_THREAD(06, 6);
+	CREATE_PARTICIPANT_THREAD(07, 7);
+	CREATE_PARTICIPANT_THREAD(08, 8);
+}
+
+static void start_participant_threads(void)
+{
+	START_PARTICIPANT_THREAD(05);
+	START_PARTICIPANT_THREAD(06);
+	START_PARTICIPANT_THREAD(07);
+	START_PARTICIPANT_THREAD(08);
+}
+
+static void join_participant_threads(void)
+{
+	JOIN_PARTICIPANT_THREAD(05);
+	JOIN_PARTICIPANT_THREAD(06);
+	JOIN_PARTICIPANT_THREAD(07);
+	JOIN_PARTICIPANT_THREAD(08);
+}
+
+/**
+ *
+ * @brief Main thread to test mutex locking
+ *
+ * This thread orchestrates mutex locking on other threads and verifies that
+ * the correct thread is holding mutexes at any given step.
+ *
+ */
+
+ZTEST(mutex_api, test_complex_inversion)
+{
+	create_participant_threads();
+	start_participant_threads();
+
+	/* Wait for all the threads to start up */
+	WAIT_FOR_THREAD(08);
+	WAIT_FOR_THREAD(07);
+	WAIT_FOR_THREAD(06);
+	WAIT_FOR_THREAD(05);
+
+	ADVANCE_THREAD(08); /* thread_08 takes mutex_1 */
+	zassert_equal(thread_08_tid, mutex_1.owner, "expected owner %s, not %s\n",
+		      thread_08_tid->name, mutex_1.owner->name);
+
+	ADVANCE_THREAD(07); /* thread_07 takes mutex_0 */
+	zassert_equal(thread_07_tid, mutex_0.owner, "expected owner %s, not %s\n",
+		      thread_07_tid->name, mutex_0.owner->name);
+
+	SIGNAL_THREAD(07);    /* thread_07 waits on mutex_1 */
+	k_sleep(K_MSEC(100)); /* Give thread_07 some time to wait on mutex_1 */
+
+	SIGNAL_THREAD(06);    /* thread_06 waits on mutex_1 */
+	k_sleep(K_MSEC(100)); /* Give thread_06 some time to wait on mutex_1 */
+
+	SIGNAL_THREAD(05); /* thread_05 waits on mutex_0, boosting priority of thread_07 */
+
+	SIGNAL_THREAD(08); /* thread_08 gives mutex_1 */
+
+	/* If thread_06 erroneously took mutex_1, giving it could cause a crash
+	 * when CONFIG_WAITQ_SCALABLE is set. Give it a chance to run to make sure
+	 * this crash isn't hit.
+	 */
+	SIGNAL_THREAD(06);
+
+	WAIT_FOR_THREAD(07); /* thread_07 takes mutex_1 */
+	zassert_equal(thread_07_tid, mutex_1.owner, "expected owner %s, not %s\n",
+		      thread_07_tid->name, mutex_1.owner->name);
+
+	SIGNAL_THREAD(07);   /* thread_07 gives mutex_1 then gives mutex_0 */
+	WAIT_FOR_THREAD(06); /* thread_06 takes mutex_1 */
+	WAIT_FOR_THREAD(05); /* thread_05 takes mutex_0 */
+	zassert_equal(thread_06_tid, mutex_1.owner, "expected owner %s, not %s\n",
+		      thread_06_tid->name, mutex_1.owner->name);
+	zassert_equal(thread_05_tid, mutex_0.owner, "expected owner %s, not %s\n",
+		      thread_05_tid->name, mutex_0.owner->name);
+
+	SIGNAL_THREAD(06); /* thread_06 gives mutex_1 */
+	SIGNAL_THREAD(05); /* thread_05 gives mutex_0 */
+
+	zassert_equal(tc_rc, TC_PASS);
+
+	join_participant_threads();
+}
diff --git a/tests/kernel/mutex/mutex_api/testcase.yaml b/tests/kernel/mutex/mutex_api/testcase.yaml
index a623ec4df06bc..76bf3ec4bb340 100644
--- a/tests/kernel/mutex/mutex_api/testcase.yaml
+++ b/tests/kernel/mutex/mutex_api/testcase.yaml
@@ -3,3 +3,9 @@ tests:
     tags:
       - kernel
       - userspace
+
+  kernel.mutex.scalable:
+    tags:
+      - kernel
+    extra_configs:
+      - CONFIG_WAITQ_SCALABLE=y
diff --git a/tests/kernel/pending/testcase.yaml b/tests/kernel/pending/testcase.yaml
index b3e66a57ce850..20a5dde8fc38e 100644
--- a/tests/kernel/pending/testcase.yaml
+++ b/tests/kernel/pending/testcase.yaml
@@ -1,7 +1,7 @@
 tests:
-  kernel.objects:
+  kernel.pending:
     tags: kernel
-  kernel.objects.minimallibc:
+  kernel.pending.minimallibc:
     filter: CONFIG_MINIMAL_LIBC_SUPPORTED
     tags:
       - kernel
diff --git a/tests/kernel/pipe/deprecated/pipe/CMakeLists.txt b/tests/kernel/pipe/deprecated/pipe/CMakeLists.txt
index 6fc89d2497a74..2624f4be400f0 100644
--- a/tests/kernel/pipe/deprecated/pipe/CMakeLists.txt
+++ b/tests/kernel/pipe/deprecated/pipe/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.20.0)
-set(CMAKE_C_FLAGS "-D__deprecated='' -D__DEPRECATED_MACRO=''")
+set(CMAKE_C_FLAGS "-D__deprecated=\"/* deprecated */\" -D__DEPRECATED_MACRO=\"/* deprecated_macro*/\"")
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(pipe)
 
diff --git a/tests/kernel/pipe/deprecated/pipe_api/CMakeLists.txt b/tests/kernel/pipe/deprecated/pipe_api/CMakeLists.txt
index b132b179c9c64..44f65534e3f81 100644
--- a/tests/kernel/pipe/deprecated/pipe_api/CMakeLists.txt
+++ b/tests/kernel/pipe/deprecated/pipe_api/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.20.0)
-set(CMAKE_C_FLAGS "-D__deprecated='' -D__DEPRECATED_MACRO=''")
+set(CMAKE_C_FLAGS "-D__deprecated=\"/* deprecated */\" -D__DEPRECATED_MACRO=\"/* deprecated_macro*/\"")
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(pipe_api)
 
diff --git a/tests/kernel/pipe/pipe_api/src/basic.c b/tests/kernel/pipe/pipe_api/src/basic.c
index f1eb114c21050..baaf5a48b93a6 100644
--- a/tests/kernel/pipe/pipe_api/src/basic.c
+++ b/tests/kernel/pipe/pipe_api/src/basic.c
@@ -17,9 +17,10 @@ static void mkrandom(uint8_t *buffer, size_t size)
 
 K_PIPE_DEFINE(test_define, 256, 4);
 
+static struct k_pipe pipe;
+
 ZTEST(k_pipe_basic, test_init)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[10];
 
 	k_pipe_init(&pipe, buffer, sizeof(buffer));
@@ -28,7 +29,6 @@ ZTEST(k_pipe_basic, test_init)
 
 ZTEST(k_pipe_basic, test_write_read_one)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[10];
 	uint8_t data = 0x55;
 	uint8_t read_data;
@@ -43,7 +43,6 @@ ZTEST(k_pipe_basic, test_write_read_one)
 
 ZTEST(k_pipe_basic, test_write_read_multiple)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[10];
 	uint8_t data = 0x55;
 	uint8_t read_data;
@@ -59,7 +58,6 @@ ZTEST(k_pipe_basic, test_write_read_multiple)
 
 ZTEST(k_pipe_basic, test_write_full)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[10];
 	uint8_t data[10];
 
@@ -72,7 +70,6 @@ ZTEST(k_pipe_basic, test_write_full)
 
 ZTEST(k_pipe_basic, test_read_empty)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[10];
 	uint8_t read_data;
 
@@ -83,7 +80,6 @@ ZTEST(k_pipe_basic, test_read_empty)
 
 ZTEST(k_pipe_basic, test_read_write_full)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[10];
 	uint8_t input[10];
 	uint8_t res[10];
@@ -100,7 +96,6 @@ ZTEST(k_pipe_basic, test_read_write_full)
 
 ZTEST(k_pipe_basic, test_read_write_wrapp_around)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[12];
 	uint8_t input[8];
 	uint8_t res[16];
@@ -126,7 +121,6 @@ ZTEST(k_pipe_basic, test_read_write_wrapp_around)
 
 ZTEST(k_pipe_basic, test_reset)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[10];
 	uint8_t data = 0x55;
 	uint8_t read_data;
@@ -144,7 +138,6 @@ ZTEST(k_pipe_basic, test_reset)
 
 ZTEST(k_pipe_basic, test_close)
 {
-	struct k_pipe pipe;
 	uint8_t buffer[12];
 	uint8_t input[8];
 	uint8_t res[16];
diff --git a/tests/kernel/pipe/pipe_api/src/concurrency.c b/tests/kernel/pipe/pipe_api/src/concurrency.c
index d19e4408162d5..601a4bdd5d75b 100644
--- a/tests/kernel/pipe/pipe_api/src/concurrency.c
+++ b/tests/kernel/pipe/pipe_api/src/concurrency.c
@@ -16,6 +16,7 @@ static const int partial_wait_time = 2000;
 #define DUMMY_DATA_SIZE 16
 static struct k_thread thread;
 static K_THREAD_STACK_DEFINE(stack, 1024);
+static struct k_pipe pipe;
 
 static void thread_close(void *arg1, void *arg2, void *arg3)
 {
@@ -46,7 +47,6 @@ static void thread_read(void *arg1, void *arg2, void *arg3)
 ZTEST(k_pipe_concurrency, test_close_on_read)
 {
 	k_tid_t tid;
-	struct k_pipe pipe;
 	uint8_t buffer[DUMMY_DATA_SIZE];
 	uint8_t res;
 
@@ -64,7 +64,6 @@ ZTEST(k_pipe_concurrency, test_close_on_read)
 ZTEST(k_pipe_concurrency, test_close_on_write)
 {
 	k_tid_t tid;
-	struct k_pipe pipe;
 	uint8_t buffer[DUMMY_DATA_SIZE];
 	uint8_t garbage[DUMMY_DATA_SIZE];
 
@@ -85,7 +84,6 @@ ZTEST(k_pipe_concurrency, test_close_on_write)
 ZTEST(k_pipe_concurrency, test_reset_on_read)
 {
 	k_tid_t tid;
-	struct k_pipe pipe;
 	uint8_t buffer[DUMMY_DATA_SIZE];
 	uint8_t res;
 
@@ -106,7 +104,6 @@ ZTEST(k_pipe_concurrency, test_reset_on_read)
 ZTEST(k_pipe_concurrency, test_reset_on_write)
 {
 	k_tid_t tid;
-	struct k_pipe pipe;
 	uint8_t buffer[DUMMY_DATA_SIZE];
 	uint8_t garbage[DUMMY_DATA_SIZE];
 
@@ -129,7 +126,6 @@ ZTEST(k_pipe_concurrency, test_reset_on_write)
 ZTEST(k_pipe_concurrency, test_partial_read)
 {
 	k_tid_t tid;
-	struct k_pipe pipe;
 	uint8_t buffer[DUMMY_DATA_SIZE];
 	uint8_t garbage[DUMMY_DATA_SIZE];
 	size_t write_size = sizeof(garbage)/2;
@@ -149,7 +145,6 @@ ZTEST(k_pipe_concurrency, test_partial_read)
 ZTEST(k_pipe_concurrency, test_partial_write)
 {
 	k_tid_t tid;
-	struct k_pipe pipe;
 	uint8_t buffer[DUMMY_DATA_SIZE];
 	uint8_t garbage[DUMMY_DATA_SIZE];
 	size_t read_size = sizeof(garbage)/2;
diff --git a/tests/kernel/pipe/pipe_api/src/stress.c b/tests/kernel/pipe/pipe_api/src/stress.c
index 54fe767c68c9b..907458276b375 100644
--- a/tests/kernel/pipe/pipe_api/src/stress.c
+++ b/tests/kernel/pipe/pipe_api/src/stress.c
@@ -18,10 +18,11 @@ LOG_MODULE_REGISTER(k_k_pipe_stress, LOG_LEVEL_INF);
 
 ZTEST_SUITE(k_pipe_stress, NULL, NULL, NULL, NULL, NULL);
 
+static struct k_pipe pipe;
+
 ZTEST(k_pipe_stress, test_write)
 {
 	int rc;
-	struct k_pipe pipe;
 	const size_t len = WRITE_LEN;
 	uint8_t buffer[WRITE_LEN];
 	uint8_t buf[WRITE_LEN];
@@ -43,7 +44,6 @@ ZTEST(k_pipe_stress, test_write)
 ZTEST(k_pipe_stress, test_read)
 {
 	int rc;
-	struct k_pipe pipe;
 	const size_t len = READ_LEN;
 	uint8_t buffer[READ_LEN];
 	uint8_t buf[READ_LEN];
diff --git a/tests/kernel/poll/testcase.yaml b/tests/kernel/poll/testcase.yaml
index fdf503e361515..8985672ad98c8 100644
--- a/tests/kernel/poll/testcase.yaml
+++ b/tests/kernel/poll/testcase.yaml
@@ -4,10 +4,8 @@ tests:
     tags:
       - kernel
       - userspace
-    # FIXME: qemu_arc/qemu_arc_hs6x is excluded due to a run-time failure, see #49492
     platform_exclude:
       - nrf52dk/nrf52810
-      - qemu_arc/qemu_arc_hs6x
   kernel.poll.minimallibc:
     filter: CONFIG_MINIMAL_LIBC_SUPPORTED
     ignore_faults: true
@@ -15,9 +13,7 @@ tests:
       - kernel
       - userspace
       - libc
-    # FIXME: qemu_arc/qemu_arc_hs6x is excluded due to a run-time failure, see #49492
     platform_exclude:
       - nrf52dk/nrf52810
-      - qemu_arc/qemu_arc_hs6x
     extra_configs:
       - CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/deadline/prj.conf b/tests/kernel/sched/deadline/prj.conf
index dce7876cc10ca..17af1be2489b8 100644
--- a/tests/kernel/sched/deadline/prj.conf
+++ b/tests/kernel/sched/deadline/prj.conf
@@ -6,7 +6,7 @@ CONFIG_BT=n
 
 # Deadline is not compatible with MULTIQ, so we have to pick something
 # specific instead of using the board-level default.
-CONFIG_SCHED_DUMB=y
+CONFIG_SCHED_SIMPLE=y
 
 CONFIG_IRQ_OFFLOAD=y
 CONFIG_IRQ_OFFLOAD_NESTED=n
diff --git a/tests/kernel/sched/schedule_api/prj_dumb.conf b/tests/kernel/sched/schedule_api/prj_dumb.conf
deleted file mode 100644
index 6814aca6c2ee4..0000000000000
--- a/tests/kernel/sched/schedule_api/prj_dumb.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_IRQ_OFFLOAD=y
-CONFIG_TEST_USERSPACE=y
-CONFIG_SCHED_DUMB=y
-CONFIG_MAX_THREAD_BYTES=6
-CONFIG_MP_MAX_NUM_CPUS=1
-CONFIG_ZTEST_FATAL_HOOK=y
diff --git a/tests/kernel/sched/schedule_api/prj_simple.conf b/tests/kernel/sched/schedule_api/prj_simple.conf
new file mode 100644
index 0000000000000..4b931c32afcb8
--- /dev/null
+++ b/tests/kernel/sched/schedule_api/prj_simple.conf
@@ -0,0 +1,7 @@
+CONFIG_ZTEST=y
+CONFIG_IRQ_OFFLOAD=y
+CONFIG_TEST_USERSPACE=y
+CONFIG_SCHED_SIMPLE=y
+CONFIG_MAX_THREAD_BYTES=6
+CONFIG_MP_MAX_NUM_CPUS=1
+CONFIG_ZTEST_FATAL_HOOK=y
diff --git a/tests/kernel/sched/schedule_api/testcase.yaml b/tests/kernel/sched/schedule_api/testcase.yaml
index b5a7a2ae7c688..20542849f100a 100644
--- a/tests/kernel/sched/schedule_api/testcase.yaml
+++ b/tests/kernel/sched/schedule_api/testcase.yaml
@@ -29,11 +29,11 @@ tests:
     extra_args: CONF_FILE=prj_multiq.conf
     extra_configs:
       - CONFIG_TIMESLICING=n
-  kernel.scheduler.dumb_timeslicing:
-    extra_args: CONF_FILE=prj_dumb.conf
+  kernel.scheduler.simple_timeslicing:
+    extra_args: CONF_FILE=prj_simple.conf
     extra_configs:
       - CONFIG_TIMESLICING=y
-  kernel.scheduler.dumb_no_timeslicing:
-    extra_args: CONF_FILE=prj_dumb.conf
+  kernel.scheduler.simple_no_timeslicing:
+    extra_args: CONF_FILE=prj_simple.conf
     extra_configs:
       - CONFIG_TIMESLICING=n
diff --git a/tests/kernel/sleep/src/usleep.c b/tests/kernel/sleep/src/usleep.c
index b7c1144505a22..8a234a27a1996 100644
--- a/tests/kernel/sleep/src/usleep.c
+++ b/tests/kernel/sleep/src/usleep.c
@@ -36,6 +36,12 @@
 #elif defined(CONFIG_CC13XX_CC26XX_RTC_TIMER) && \
 	(CONFIG_SYS_CLOCK_TICKS_PER_SEC > 16384)
 #define MAXIMUM_SHORTEST_TICKS 3
+#elif defined(CONFIG_SILABS_SLEEPTIMER_TIMER) && (CONFIG_SYS_CLOCK_TICKS_PER_SEC > 16384)
+/* Similar situation for Silabs devices using sleeptimer due to the
+ * limitation that a value too close to the current time cannot be
+ * loaded to its comparator.
+ */
+#define MAXIMUM_SHORTEST_TICKS 2
 #else
 #define MAXIMUM_SHORTEST_TICKS 1
 #endif
diff --git a/tests/kernel/sleep/testcase.yaml b/tests/kernel/sleep/testcase.yaml
index eceb053d08236..21d7846941f75 100644
--- a/tests/kernel/sleep/testcase.yaml
+++ b/tests/kernel/sleep/testcase.yaml
@@ -3,6 +3,10 @@ tests:
     tags:
       - kernel
       - sleep
+    platform_exclude:
+      - npcx4m8f_evb
+      - npcx7m6fb_evb
+      - npcx9m6f_evb
   kernel.common.timing.minimallibc:
     filter: CONFIG_MINIMAL_LIBC_SUPPORTED
     tags:
diff --git a/tests/kernel/threads/no-multithreading/testcase.yaml b/tests/kernel/threads/no-multithreading/testcase.yaml
index ae0556c54c633..93f7757c86152 100644
--- a/tests/kernel/threads/no-multithreading/testcase.yaml
+++ b/tests/kernel/threads/no-multithreading/testcase.yaml
@@ -10,6 +10,7 @@ tests:
       - nrf52840dk/nrf52840
       - nrf9160dk/nrf9160
       - nrf51dk/nrf51822
+      - xg29_rb4412a
       - nsim/nsim_em
       - nsim/nsim_em7d_v22
       - nsim/nsim_hs
diff --git a/tests/kernel/threads/thread_apis/src/test_essential_thread.c b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
index 2be59a46c921c..1803c56758f7f 100644
--- a/tests/kernel/threads/thread_apis/src/test_essential_thread.c
+++ b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
@@ -112,6 +112,22 @@ ZTEST(threads_lifecycle, test_essential_thread_abort)
 	k_msleep(100);
 	k_thread_abort(&kthread_thread1);
 	zassert_true(fatal_error_signaled, "fatal error was not signaled");
+}
+
+ZTEST(threads_lifecycle, test_essential_thread_abort_self)
+{
+	/* This test case needs to be able to handle a k_panic() call
+	 * that aborts the current thread inside of the panic handler
+	 * itself.  That's putting a lot of strain on the arch layer
+	 * to handle things that haven't traditionally been required.
+	 * These ones aren't there yet.
+	 *
+	 * But run it for everyone else to catch regressions in the
+	 * code we are actually trying to test.
+	 */
+	if (IS_ENABLED(CONFIG_RISCV) || IS_ENABLED(CONFIG_X86) || IS_ENABLED(CONFIG_SPARC)) {
+		ztest_test_skip();
+	}
 
 	fatal_error_signaled = false;
 	k_thread_create(&kthread_thread1, kthread_stack, STACKSIZE,
diff --git a/tests/kernel/tickless/tickless_concept/Kconfig b/tests/kernel/tickless/tickless_concept/Kconfig
new file mode 100644
index 0000000000000..9b62fa9209fa5
--- /dev/null
+++ b/tests/kernel/tickless/tickless_concept/Kconfig
@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 32768 if NRF_RTC_TIMER
+	default 100
+
+source "Kconfig.zephyr"
diff --git a/tests/kernel/tickless/tickless_concept/prj.conf b/tests/kernel/tickless/tickless_concept/prj.conf
index 289dda3092c58..f8d48f84037ba 100644
--- a/tests/kernel/tickless/tickless_concept/prj.conf
+++ b/tests/kernel/tickless/tickless_concept/prj.conf
@@ -1,3 +1,2 @@
 CONFIG_ZTEST=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_MP_MAX_NUM_CPUS=1
diff --git a/tests/kernel/tickless/tickless_concept/src/main.c b/tests/kernel/tickless/tickless_concept/src/main.c
index ce6f1c71f7099..b48d78ede0354 100644
--- a/tests/kernel/tickless/tickless_concept/src/main.c
+++ b/tests/kernel/tickless/tickless_concept/src/main.c
@@ -12,7 +12,7 @@
 static K_THREAD_STACK_ARRAY_DEFINE(tstack, NUM_THREAD, STACK_SIZE);
 static struct k_thread tdata[NUM_THREAD];
 
-#define IDLE_THRESH 20
+#define IDLE_THRESH k_ms_to_ticks_floor64(200)
 
 /*sleep duration tickless*/
 #define SLEEP_TICKLESS	 k_ticks_to_ms_floor64(IDLE_THRESH)
diff --git a/tests/kernel/tickless/tickless_concept/testcase.yaml b/tests/kernel/tickless/tickless_concept/testcase.yaml
index 186f76d539d5a..8b41e1f276f50 100644
--- a/tests/kernel/tickless/tickless_concept/testcase.yaml
+++ b/tests/kernel/tickless/tickless_concept/testcase.yaml
@@ -1,8 +1,6 @@
 tests:
   kernel.tickless.concept:
     arch_exclude: nios2
-    # FIXME: This test fails sporadically on all QEMU platforms, but fails
-    # consistently when coverage is enabled. Disable until 14173 is fixed.
     platform_exclude:
       - litex_vexriscv
       - rv32m1_vega/openisa_rv32m1/zero_riscy
diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
index 899d2c92583c4..dc37239ff4b35 100644
--- a/tests/kernel/timer/timer_api/src/main.c
+++ b/tests/kernel/timer/timer_api/src/main.c
@@ -749,16 +749,22 @@ ZTEST_USER(timer_api, test_timeout_abs)
 	k_timeout_t t = K_TIMEOUT_ABS_TICKS(exp_ticks), t2;
 	uint64_t t0, t1;
 
+	/* Ensure second alignment for K_TIMEOUT_ABS_SEC */
+	zassert_true(exp_ms % MSEC_PER_SEC == 0);
+
 	/* Check the other generator macros to make sure they produce
 	 * the same (whiteboxed) converted values
 	 */
+	t2 = K_TIMEOUT_ABS_SEC(exp_ms / MSEC_PER_SEC);
+	zassert_true(t2.ticks == t.ticks);
+
 	t2 = K_TIMEOUT_ABS_MS(exp_ms);
 	zassert_true(t2.ticks == t.ticks);
 
-	t2 = K_TIMEOUT_ABS_US(1000 * exp_ms);
+	t2 = K_TIMEOUT_ABS_US(USEC_PER_MSEC * exp_ms);
 	zassert_true(t2.ticks == t.ticks);
 
-	t2 = K_TIMEOUT_ABS_NS(1000 * 1000 * exp_ms);
+	t2 = K_TIMEOUT_ABS_NS(NSEC_PER_MSEC * exp_ms);
 	zassert_true(t2.ticks == t.ticks);
 
 	t2 = K_TIMEOUT_ABS_CYC(k_ms_to_cyc_ceil64(exp_ms));
diff --git a/tests/kernel/timer/timer_behavior/pytest/requirements-saleae.txt b/tests/kernel/timer/timer_behavior/pytest/requirements-saleae.txt
index 040349b7ec8df..eefdd3a16b998 100644
--- a/tests/kernel/timer/timer_behavior/pytest/requirements-saleae.txt
+++ b/tests/kernel/timer/timer_behavior/pytest/requirements-saleae.txt
@@ -1,4 +1,4 @@
-numpy
+numpy>=2.2.3
 protobuf>=5.27.2
 grpcio-tools>=1.66.0
 logic2-automation>=1.0.7
diff --git a/tests/kernel/timer/timer_behavior/src/jitter_drift.c b/tests/kernel/timer/timer_behavior/src/jitter_drift.c
index b958883b6e420..82e178fb60203 100644
--- a/tests/kernel/timer/timer_behavior/src/jitter_drift.c
+++ b/tests/kernel/timer/timer_behavior/src/jitter_drift.c
@@ -240,7 +240,7 @@ static void do_test_using(void (*sample_collection_fn)(void), const char *mechan
 	/* If max stddev is lower than a single clock cycle then round it up. */
 	uint32_t max_stddev = MAX(k_cyc_to_us_ceil32(1), CONFIG_TIMER_TEST_MAX_STDDEV);
 
-	TC_PRINT("timer clock rate %d, kernel tick rate %d\n",
+	TC_PRINT("timer clock rate %u, kernel tick rate %d\n",
 		 sys_clock_hw_cycles_per_sec(), CONFIG_SYS_CLOCK_TICKS_PER_SEC);
 	if ((USEC_PER_SEC / CONFIG_TIMER_TEST_PERIOD) > CONFIG_SYS_CLOCK_TICKS_PER_SEC) {
 		TC_PRINT("test timer period (%u us) is smaller than "
@@ -282,8 +282,8 @@ static void do_test_using(void (*sample_collection_fn)(void), const char *mechan
 		 ", \"total_drift_us\":%.6f"
 		 ", \"expected_period_cycles\":%.0f"
 		 ", \"expected_period_drift_us\":%.6f"
-		 ", \"sys_clock_hw_cycles_per_sec\":%d"
-		 ", \"CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC\":%d"
+		 ", \"sys_clock_hw_cycles_per_sec\":%u"
+		 ", \"CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC\":%u"
 		 ", \"CONFIG_SYS_CLOCK_TICKS_PER_SEC\":%d"
 		 ", \"CONFIG_TIMER_TEST_PERIOD\":%d"
 		 ", \"CONFIG_TIMER_TEST_SAMPLES\":%d"
@@ -304,7 +304,7 @@ static void do_test_using(void (*sample_collection_fn)(void), const char *mechan
 		 expected_period,
 		 expected_period_drift,
 		 sys_clock_hw_cycles_per_sec(),
-		 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC,
+		 (uint32_t)CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC,
 		 CONFIG_SYS_CLOCK_TICKS_PER_SEC,
 		 CONFIG_TIMER_TEST_PERIOD,
 		 CONFIG_TIMER_TEST_SAMPLES,
diff --git a/tests/kernel/timer/timer_error_case/src/main.c b/tests/kernel/timer/timer_error_case/src/main.c
index e6ffe75330c62..c0916fb4f41d1 100644
--- a/tests/kernel/timer/timer_error_case/src/main.c
+++ b/tests/kernel/timer/timer_error_case/src/main.c
@@ -325,8 +325,8 @@ ZTEST_USER(timer_api_error, test_timer_user_data_set_null)
 	k_thread_join(tid, K_FOREVER);
 }
 
-extern void z_add_timeout(struct _timeout *to, _timeout_func_t fn,
-			  k_timeout_t timeout);
+extern k_ticks_t z_add_timeout(struct _timeout *to, _timeout_func_t fn, k_timeout_t timeout);
+
 static void test_timer_handle(struct _timeout *t)
 {
 	/**do nothing here**/
diff --git a/tests/kernel/timer/timer_monotonic/src/main.c b/tests/kernel/timer/timer_monotonic/src/main.c
index baa4c762a6ac0..a1316ce2b79cf 100644
--- a/tests/kernel/timer/timer_monotonic/src/main.c
+++ b/tests/kernel/timer/timer_monotonic/src/main.c
@@ -58,7 +58,7 @@ ZTEST(timer_fn, test_timer)
 
 	TC_PRINT("k_ticks_to_cyc_floor32(1) = %d\n",
 		 k_ticks_to_cyc_floor32(1));
-	TC_PRINT("sys_clock_hw_cycles_per_sec() = %d\n",
+	TC_PRINT("sys_clock_hw_cycles_per_sec() = %u\n",
 		 sys_clock_hw_cycles_per_sec());
 
 	t_last = k_cycle_get_32();
diff --git a/tests/kernel/timer/timer_monotonic/testcase.yaml b/tests/kernel/timer/timer_monotonic/testcase.yaml
index 075f3009e8fab..5780a5c8d1919 100644
--- a/tests/kernel/timer/timer_monotonic/testcase.yaml
+++ b/tests/kernel/timer/timer_monotonic/testcase.yaml
@@ -3,9 +3,6 @@ tests:
     tags:
       - kernel
       - timer
-    # FIXME: This test may fail for qemu_arc/qemu_arc_hs on certain host systems.
-    #        See foss-for-synopsys-dwc-arc-processors/qemu#67.
-    platform_exclude: qemu_arc/qemu_arc_hs
   kernel.timer.monotonic.apic.tsc:
     tags:
       - kernel
diff --git a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
index ff0ceeac7c844..be5a1fc997449 100644
--- a/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
+++ b/tests/kernel/usage/thread_runtime_stats/src/test_thread_runtime_stats.c
@@ -100,16 +100,16 @@ ZTEST(usage_api, test_all_stats_usage)
 
 	/*
 	 * Verify that before the system idles for 2 ticks that
-	 * [execution_cycles] is increasing, [total_cycles] matches
+	 * [execution_cycles] is increasing, [total_cycles + idle_cycles] matches
 	 * [execution_cycles] and [idle_cycles] is not changing (as the
-	 * system has been idle yet.
+	 * system is not going to idle during that test).
 	 */
 
 	zassert_true(stats2.execution_cycles > stats1.execution_cycles);
 	zassert_true(stats3.execution_cycles > stats2.execution_cycles);
-	zassert_true(stats1.execution_cycles == stats1.total_cycles);
-	zassert_true(stats2.execution_cycles == stats2.total_cycles);
-	zassert_true(stats3.execution_cycles == stats3.total_cycles);
+	zassert_true(stats1.execution_cycles == (stats1.total_cycles + stats1.idle_cycles));
+	zassert_true(stats2.execution_cycles == (stats2.total_cycles + stats2.idle_cycles));
+	zassert_true(stats3.execution_cycles == (stats3.total_cycles + stats3.idle_cycles));
 #ifdef CONFIG_SCHED_THREAD_USAGE_ALL
 	zassert_true(stats1.idle_cycles == stats2.idle_cycles);
 	zassert_true(stats1.idle_cycles == stats3.idle_cycles);
@@ -122,8 +122,8 @@ ZTEST(usage_api, test_all_stats_usage)
 	 * going idle.
 	 * 1. [current_cycles] increases.
 	 * 2. [peak_cycles] matches [current_cycles].
-	 * 3. [average_cycles] is 0 (because system has not gone idle yet)
-	 * 4. [current_cycles] matches [execution_cycles].
+	 * 3. [average_cycles] is 0 if system has not gone idle yet
+	 * 4. [current_cycles] matches [execution_cycles] if system has not gone idle yet
 	 */
 
 	zassert_true(stats2.current_cycles > stats1.current_cycles);
@@ -133,13 +133,19 @@ ZTEST(usage_api, test_all_stats_usage)
 	zassert_true(stats2.peak_cycles == stats2.current_cycles);
 	zassert_true(stats3.peak_cycles == stats3.current_cycles);
 
-	zassert_true(stats1.average_cycles == 0);
-	zassert_true(stats2.average_cycles == 0);
-	zassert_true(stats3.average_cycles == 0);
-
-	zassert_true(stats1.current_cycles == stats1.execution_cycles);
-	zassert_true(stats2.current_cycles == stats2.execution_cycles);
-	zassert_true(stats3.current_cycles == stats3.execution_cycles);
+	if (stats1.idle_cycles == 0) {
+		zassert_true(stats1.average_cycles == 0);
+		zassert_true(stats2.average_cycles == 0);
+		zassert_true(stats3.average_cycles == 0);
+
+		zassert_true(stats1.current_cycles == stats1.execution_cycles);
+		zassert_true(stats2.current_cycles == stats2.execution_cycles);
+		zassert_true(stats3.current_cycles == stats3.execution_cycles);
+	} else {
+		zassert_true(stats1.current_cycles < stats1.execution_cycles);
+		zassert_true(stats2.current_cycles < stats2.execution_cycles);
+		zassert_true(stats3.current_cycles < stats3.execution_cycles);
+	}
 #endif
 
 	/*
@@ -172,7 +178,7 @@ ZTEST(usage_api, test_all_stats_usage)
 					   stats3.peak_cycles, IDLE_EVENT_STATS_PRECISION), NULL);
 	zassert_true(stats4.peak_cycles == stats5.peak_cycles);
 
-	zassert_true(stats4.average_cycles > stats3.average_cycles);
+	zassert_true(stats4.average_cycles > 0);
 	zassert_true(stats5.average_cycles > stats4.average_cycles);
 #endif
 
diff --git a/tests/lib/c_lib/common/src/main.c b/tests/lib/c_lib/common/src/main.c
index 7a0e0dbd6b2e8..693e0cfd73ec7 100644
--- a/tests/lib/c_lib/common/src/main.c
+++ b/tests/lib/c_lib/common/src/main.c
@@ -22,6 +22,7 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/ztest.h>
+#include <zephyr/test_toolchain.h>
 
 #include <limits.h>
 #include <sys/types.h>
@@ -51,9 +52,7 @@
  * destination array).  That's exactly the case we're testing, so turn
  * it off.
  */
-#if defined(__GNUC__) && __GNUC__ >= 8
-#pragma GCC diagnostic ignored "-Wstringop-truncation"
-#endif
+TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_STRINGOP_TRUNCATION)
 
 ZTEST_SUITE(libc_common, NULL, NULL, NULL, NULL, NULL);
 
@@ -650,14 +649,9 @@ ZTEST(libc_common, test_str_operate)
 
 	zassert_true(strncat(ncat, str1, 2), "strncat failed");
 	zassert_not_null(strncat(str1, str3, 2), "strncat failed");
-#if defined(__GNUC__) && __GNUC__ >= 7
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-overflow"
-#endif
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_STRINGOP_OVERFLOW);
 	zassert_not_null(strncat(str1, str3, 1), "strncat failed");
-#if defined(__GNUC__) && __GNUC__ >= 7
-#pragma GCC diagnostic pop
-#endif
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_STRINGOP_OVERFLOW);
 	zassert_str_equal(ncat, "ddeeaa", "strncat failed");
 
 	zassert_is_null(strrchr(ncat, 'z'),
diff --git a/tests/lib/cmsis_dsp/common/test_common.h b/tests/lib/cmsis_dsp/common/test_common.h
index f65637ac93b8e..164fce7dd09a2 100644
--- a/tests/lib/cmsis_dsp/common/test_common.h
+++ b/tests/lib/cmsis_dsp/common/test_common.h
@@ -10,6 +10,7 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
+#include <zephyr/test_toolchain.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #ifdef CONFIG_CMSIS_DSP_FLOAT16
@@ -68,8 +69,7 @@
 		test_##name(a1, a2, a3, a4, a5, a6, a7);                                           \
 	}
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_UNUSED_FUNCTION)
 
 static inline bool test_equal_f64(
 	size_t length, const float64_t *a, const float64_t *b)
@@ -463,6 +463,6 @@ static inline bool test_snr_error_q7(
 	return (snr >= threshold);
 }
 
-#pragma GCC diagnostic pop
+TOOLCHAIN_ENABLE_WARNING(TOOLCHAIN_WARNING_UNUSED_FUNCTION)
 
 #endif /* ZEPHYR_TESTS_LIB_CMSIS_DSP_COMMON_TEST_COMMON_H_ */
diff --git a/tests/lib/cmsis_dsp/distance/src/f32.c b/tests/lib/cmsis_dsp/distance/src/f32.c
index 4b071f71bea53..3311e77a81502 100644
--- a/tests/lib/cmsis_dsp/distance/src/f32.c
+++ b/tests/lib/cmsis_dsp/distance/src/f32.c
@@ -54,7 +54,7 @@ static void test_arm_distance_f32(int op, bool scratchy, const uint16_t *dims,
 
 	/* Enumerate input */
 	for (index = 0; index < length; index++) {
-		float32_t val;
+		float32_t val = 0.0f;
 
 		/* Load input values into the scratch buffers */
 		if (scratchy) {
diff --git a/tests/lib/cmsis_dsp/distance/src/u32.c b/tests/lib/cmsis_dsp/distance/src/u32.c
index 921d35f53ba87..de7bb417f3710 100644
--- a/tests/lib/cmsis_dsp/distance/src/u32.c
+++ b/tests/lib/cmsis_dsp/distance/src/u32.c
@@ -44,7 +44,7 @@ static void test_arm_distance(int op, const uint16_t *dims,
 
 	/* Enumerate input */
 	for (index = 0; index < length; index++) {
-		float32_t val;
+		float32_t val = 0.0f;
 
 		/* Run test function */
 		switch (op) {
diff --git a/tests/lib/cmsis_dsp/filtering/testcase.yaml b/tests/lib/cmsis_dsp/filtering/testcase.yaml
index ad12446b9911c..6e82e863cca91 100644
--- a/tests/lib/cmsis_dsp/filtering/testcase.yaml
+++ b/tests/lib/cmsis_dsp/filtering/testcase.yaml
@@ -8,7 +8,13 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_FULL_LIBC_SUPPORTED
       ) or CONFIG_ARCH_POSIX
     tags: cmsis-dsp
-    skip: true
+    platform_allow:
+      - native_sim/native
+      - mps2/an385
+      - mps2/an521/cpu0
+      - qemu_cortex_r5/zynqmp_rpu
+    integration_platforms:
+      - mps2/an385
   libraries.cmsis_dsp.filtering.biquad:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_FULL_LIBC_SUPPORTED
       ) or CONFIG_ARCH_POSIX
diff --git a/tests/lib/cmsis_dsp/matrix/testcase.yaml b/tests/lib/cmsis_dsp/matrix/testcase.yaml
index 63965b0797434..380525a27cfbb 100644
--- a/tests/lib/cmsis_dsp/matrix/testcase.yaml
+++ b/tests/lib/cmsis_dsp/matrix/testcase.yaml
@@ -7,7 +7,13 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_FULL_LIBC_SUPPORTED
       ) or CONFIG_ARCH_POSIX
     tags: cmsis-dsp
-    skip: true
+    platform_allow:
+      - mps2/an521/cpu0
+      - native_sim/native
+      - mps2/an385
+      - qemu_cortex_r5/zynqmp_rpu
+    integration_platforms:
+      - native_sim/native
   libraries.cmsis_dsp.matrix.unary_q7:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_FULL_LIBC_SUPPORTED
       ) or CONFIG_ARCH_POSIX
diff --git a/tests/lib/cmsis_dsp/transform/src/cq15.c b/tests/lib/cmsis_dsp/transform/src/cq15.c
index 2b4d0292d585f..57275961229f8 100644
--- a/tests/lib/cmsis_dsp/transform/src/cq15.c
+++ b/tests/lib/cmsis_dsp/transform/src/cq15.c
@@ -7,6 +7,7 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
+#include <zephyr/test_toolchain.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/testcase.yaml b/tests/lib/cmsis_dsp/transform/testcase.yaml
index ecd4a67f8dd44..9642509b31ee7 100644
--- a/tests/lib/cmsis_dsp/transform/testcase.yaml
+++ b/tests/lib/cmsis_dsp/transform/testcase.yaml
@@ -7,7 +7,13 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_FULL_LIBC_SUPPORTED
       ) or CONFIG_ARCH_POSIX
     tags: cmsis-dsp
-    skip: true
+    platform_allow:
+      - mps2/an521/cpu0
+      - native_sim/native
+      - mps2/an385
+      - qemu_cortex_r5/zynqmp_rpu
+    integration_platforms:
+      - native_sim/native
   libraries.cmsis_dsp.transform.cq15:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_FULL_LIBC_SUPPORTED
       ) or CONFIG_ARCH_POSIX
diff --git a/tests/lib/cmsis_nn/src/main.c b/tests/lib/cmsis_nn/src/main.c
index c7dbe3bc58ed4..efe113b7ac733 100644
--- a/tests/lib/cmsis_nn/src/main.c
+++ b/tests/lib/cmsis_nn/src/main.c
@@ -203,6 +203,7 @@ ZTEST(cmsis_nn, test_convolve)
 					    kernel_data,
 					    &bias_dims,
 					    bias_data,
+					    NULL,
 					    &output_dims,
 					    output);
 
diff --git a/tests/lib/cobs/CMakeLists.txt b/tests/lib/cobs/CMakeLists.txt
new file mode 100644
index 0000000000000..211ef76d5ee6c
--- /dev/null
+++ b/tests/lib/cobs/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(cobs)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/lib/cobs/prj.conf b/tests/lib/cobs/prj.conf
new file mode 100644
index 0000000000000..3f2a19bc89b79
--- /dev/null
+++ b/tests/lib/cobs/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_COBS=y
+CONFIG_ZTEST=y
diff --git a/tests/lib/cobs/src/main.c b/tests/lib/cobs/src/main.c
new file mode 100644
index 0000000000000..eda89c0454a59
--- /dev/null
+++ b/tests/lib/cobs/src/main.c
@@ -0,0 +1,514 @@
+/*
+ * Copyright (c) 2024 Kelly Helmut Lord
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "zephyr/ztest_assert.h"
+#include <stdlib.h>
+#include <zephyr/ztest.h>
+#include <zephyr/data/cobs.h>
+
+#define TEST_BUF_SIZE  1024
+#define TEST_BUF_COUNT 3
+
+NET_BUF_POOL_DEFINE(test_pool, TEST_BUF_COUNT, TEST_BUF_SIZE, 0, NULL);
+
+struct cobs_tests_fixture {
+	struct net_buf *test_data;
+	struct net_buf *encoded;
+	struct net_buf *decoded;
+};
+
+static void *cobs_test_setup(void)
+{
+	struct cobs_tests_fixture *fixture = malloc(sizeof(struct cobs_tests_fixture));
+
+	zassume_not_null(fixture, NULL);
+
+	fixture->test_data = net_buf_alloc(&test_pool, K_NO_WAIT);
+	fixture->encoded = net_buf_alloc(&test_pool, K_NO_WAIT);
+	fixture->decoded = net_buf_alloc(&test_pool, K_NO_WAIT);
+
+	zassert_not_null(fixture->test_data, "Failed to allocate test_data buffer");
+	zassert_not_null(fixture->encoded, "Failed to allocate encoded buffer");
+	zassert_not_null(fixture->decoded, "Failed to allocate decoded buffer");
+
+	net_buf_reset(fixture->test_data);
+	net_buf_reset(fixture->encoded);
+	net_buf_reset(fixture->decoded);
+
+	return fixture;
+}
+
+static void cobs_test_before(void *f)
+{
+	struct cobs_tests_fixture *fixture = (struct cobs_tests_fixture *)f;
+
+	net_buf_reset(fixture->test_data);
+	net_buf_reset(fixture->encoded);
+	net_buf_reset(fixture->decoded);
+}
+
+static void cobs_test_teardown(void *f)
+{
+	struct cobs_tests_fixture *fixture = (struct cobs_tests_fixture *)f;
+
+	if (fixture->test_data) {
+		net_buf_unref(fixture->test_data);
+	}
+	if (fixture->encoded) {
+		net_buf_unref(fixture->encoded);
+	}
+	if (fixture->decoded) {
+		net_buf_unref(fixture->decoded);
+	}
+
+	free(fixture);
+}
+
+struct cobs_test_item {
+	const char *name;
+	const uint8_t *decoded;
+	size_t decoded_len;
+	const uint8_t *encoded;
+	size_t encoded_len;
+	uint8_t delimiter;
+};
+
+#define U8(...) (uint8_t[]) __VA_ARGS__
+
+#define COBS_ITEM(d, e, del, n)                                                                    \
+	{.name = n,                                                                                \
+	 .decoded = d,                                                                             \
+	 .decoded_len = sizeof(d),                                                                 \
+	 .encoded = e,                                                                             \
+	 .encoded_len = sizeof(e),                                                                 \
+	 .delimiter = del}
+
+static const struct cobs_test_item cobs_dataset[] = {
+	COBS_ITEM(U8({}), U8({0x01}), COBS_DEFAULT_DELIMITER, "Empty"),
+	COBS_ITEM(U8({'1'}), U8({0x02, '1'}), COBS_DEFAULT_DELIMITER, "One char"),
+	COBS_ITEM(U8({0x00}), U8({0x01, 0x01}), COBS_DEFAULT_DELIMITER, "One zero"),
+	COBS_ITEM(U8({0x00, 0x00}), U8({0x01, 0x01, 0x01}), COBS_DEFAULT_DELIMITER, "Two zeroes"),
+	COBS_ITEM(U8({0x00, 0x00, 0x00}), U8({0x01, 0x01, 0x01, 0x01}), COBS_DEFAULT_DELIMITER,
+		  "Three zeroes"),
+	COBS_ITEM(U8({'1', '2', '3', '4', '5'}), U8({0x06, '1', '2', '3', '4', '5'}),
+		  COBS_DEFAULT_DELIMITER, "Five chars"),
+	COBS_ITEM(U8({'1', '2', '3', '4', '5', 0x00, '6', '7', '8', '9'}),
+		  U8({0x06, '1', '2', '3', '4', '5', 0x05, '6', '7', '8', '9'}),
+		  COBS_DEFAULT_DELIMITER, "Embedded zero"),
+	COBS_ITEM(U8({0x00, '1', '2', '3', '4', '5', 0x00, '6', '7', '8', '9'}),
+		  U8({0x01, 0x06, '1', '2', '3', '4', '5', 0x05, '6', '7', '8', '9'}),
+		  COBS_DEFAULT_DELIMITER, "Starting zero"),
+	COBS_ITEM(U8({'1', '2', '3', '4', '5', 0x00, '6', '7', '8', '9', 0x00}),
+		  U8({0x06, '1', '2', '3', '4', '5', 0x05, '6', '7', '8', '9', 0x01}),
+		  COBS_DEFAULT_DELIMITER, "Trailing zero"),
+	COBS_ITEM(U8({}), U8({0x01}), 0x7F, "Empty with custom delimiter 0x7F"),
+	COBS_ITEM(U8({'1'}), U8({0x02, '1'}), 0x7F, "One char with custom delimiter 0x7F"),
+	COBS_ITEM(U8({0x7F}), U8({0x01, 0x01}), 0x7F, "One 0x7F delimiter"),
+	COBS_ITEM(U8({0x7F, 0x7F}), U8({0x01, 0x01, 0x01}), 0x7F, "Two 0x7F delimiters"),
+	COBS_ITEM(U8({0x7F, 0x7F, 0x7F}), U8({0x01, 0x01, 0x01, 0x01}), 0x7F,
+		  "Three 0x7F delimiters"),
+	COBS_ITEM(
+		U8({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+		    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b',
+		    'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
+		    's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+		    'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+		    'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+		    'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+		    'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+		    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7',
+		    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		    'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3'}),
+		U8({0xfe, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
+		    'F',  'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a',
+		    'b',  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+		    'r',  's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
+		    'D',  'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		    'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+		    'p',  'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A',
+		    'B',  'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q',
+		    'R',  'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+		    'n',  'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		    '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+		    'P',  'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
+		    'l',  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6',
+		    '7',  '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+		    'N',  'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		    'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3'}),
+		COBS_DEFAULT_DELIMITER, "253 Chars"),
+	COBS_ITEM(
+		U8({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+		    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b',
+		    'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
+		    's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+		    'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+		    'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+		    'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+		    'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+		    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7',
+		    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		    'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4'}),
+		U8({0xff, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
+		    'F',  'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a',
+		    'b',  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+		    'r',  's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
+		    'D',  'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		    'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+		    'p',  'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A',
+		    'B',  'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q',
+		    'R',  'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+		    'n',  'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		    '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+		    'P',  'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
+		    'l',  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6',
+		    '7',  '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+		    'N',  'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		    'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4'}),
+		COBS_DEFAULT_DELIMITER, "254 Chars"),
+	COBS_ITEM(
+		U8({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+		    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b',
+		    'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
+		    's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+		    'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+		    'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+		    'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+		    'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+		    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7',
+		    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		    'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4', '5'}),
+		U8({0xff, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		    'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		    '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		    'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3',
+		    '4',  '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+		    'J',  'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd',
+		    'e',  'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+		    't',  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		    'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		    '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		    'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4',
+		    0x02, '5'}),
+		COBS_DEFAULT_DELIMITER, "255 Chars"),
+	COBS_ITEM(U8({0x00, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		      'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		      'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		      'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		      '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		      'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		      'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3',
+		      '4',  '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+		      'J',  'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd',
+		      'e',  'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+		      't',  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		      'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		      'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		      'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		      '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		      'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		      'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4',
+		      '5'}),
+		  U8({0x01, 0xff, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
+		      'D',  'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+		      'S',  'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+		      'n',  'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7',
+		      '8',  '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+		      'N',  'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+		      'i',  'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2',
+		      '3',  '4',  '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+		      'I',  'J',  'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c',
+		      'd',  'e',  'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
+		      's',  't',  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
+		      'D',  'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+		      'S',  'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+		      'n',  'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7',
+		      '8',  '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+		      'N',  'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+		      'i',  'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3',
+		      '4',  0x02, '5'}),
+		  COBS_DEFAULT_DELIMITER, "Leading zero 255 chars"),
+	COBS_ITEM(
+		U8({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+		    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b',
+		    'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
+		    's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+		    'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+		    'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+		    'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+		    'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+		    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7',
+		    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		    'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', 0x00}),
+		U8({0xfe, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
+		    'F',  'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a',
+		    'b',  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+		    'r',  's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
+		    'D',  'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		    'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+		    'p',  'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A',
+		    'B',  'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q',
+		    'R',  'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+		    'n',  'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		    '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+		    'P',  'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
+		    'l',  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6',
+		    '7',  '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+		    'N',  'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		    'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', 0x01}),
+		COBS_DEFAULT_DELIMITER, "Ending zero 253 chars"),
+	COBS_ITEM(
+		U8({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+		    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b',
+		    'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
+		    's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+		    'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+		    'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+		    'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+		    'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+		    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7',
+		    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		    'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4', 0x00}),
+		U8({0xff, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		    'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		    '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		    'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3',
+		    '4',  '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+		    'J',  'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd',
+		    'e',  'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+		    't',  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		    'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		    'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		    'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		    '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		    'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		    'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4',
+		    0x01, 0x01}),
+		COBS_DEFAULT_DELIMITER, "Ending zero 254 chars"),
+	COBS_ITEM(U8({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
+		      'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+		      'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+		      'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		      'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4',
+		      '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+		      'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e',
+		      'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
+		      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
+		      'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+		      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+		      'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+		      'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		      'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4', '5',
+		      0x00}),
+		  U8({0xff, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		      'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		      'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		      'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		      '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		      'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		      'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '0', '1', '2', '3',
+		      '4',  '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+		      'J',  'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd',
+		      'e',  'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+		      't',  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+		      'E',  'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		      'T',  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		      'o',  'p', 'q', 'r', 's', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		      '9',  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		      'O',  'P', 'Q', 'R', 'S', 'T', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+		      'j',  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', '1', '2', '3', '4',
+		      0x02, '5', 0x01}),
+		  COBS_DEFAULT_DELIMITER, "Ending zero 255 chars"),
+};
+
+ZTEST_SUITE(cobs_tests, NULL, cobs_test_setup, cobs_test_before, NULL, cobs_test_teardown);
+
+ZTEST_F(cobs_tests, test_encode)
+{
+	int ret;
+
+	ARRAY_FOR_EACH(cobs_dataset, idx) {
+		uint8_t delimiter = cobs_dataset[idx].delimiter;
+
+		net_buf_add_mem(fixture->test_data, cobs_dataset[idx].decoded,
+				cobs_dataset[idx].decoded_len);
+
+		ret = cobs_encode(fixture->test_data, fixture->encoded,
+				  COBS_FLAG_CUSTOM_DELIMITER(delimiter));
+		zassert_ok(ret, "COBS encoding failed for %s", cobs_dataset[idx].name);
+		zassert_equal(cobs_dataset[idx].encoded_len, fixture->encoded->len,
+			      "Encoded length does not match expected for %s",
+			      cobs_dataset[idx].name);
+		zassert_mem_equal(cobs_dataset[idx].encoded, fixture->encoded->data,
+				  cobs_dataset[idx].encoded_len,
+				  "Encoded data does not match expected for %s",
+				  cobs_dataset[idx].name);
+
+		zassert_equal(fixture->test_data->len, 0, "Encode input not empty for %s",
+			      cobs_dataset[idx].name);
+		net_buf_reset(fixture->test_data);
+		net_buf_reset(fixture->encoded);
+		net_buf_reset(fixture->decoded);
+	}
+}
+
+ZTEST_F(cobs_tests, test_decode)
+{
+	int ret;
+
+	ARRAY_FOR_EACH(cobs_dataset, idx) {
+		uint8_t delimiter = cobs_dataset[idx].delimiter;
+
+		net_buf_add_mem(fixture->test_data, cobs_dataset[idx].decoded,
+				cobs_dataset[idx].decoded_len);
+
+		ret = cobs_decode(fixture->encoded, fixture->test_data,
+				  COBS_FLAG_CUSTOM_DELIMITER(delimiter));
+		zassert_ok(ret, "COBS decoding failed for %s", cobs_dataset[idx].name);
+		zassert_equal(cobs_dataset[idx].decoded_len, fixture->test_data->len,
+			      "Decoded length does not match expected for %s",
+			      cobs_dataset[idx].name);
+		zassert_mem_equal(cobs_dataset[idx].decoded, fixture->test_data->data,
+				  cobs_dataset[idx].decoded_len,
+				  "Decoded data does not match expected for %s",
+				  cobs_dataset[idx].name);
+
+		zassert_equal(fixture->encoded->len, 0, "Decode input not empty for %s",
+			      cobs_dataset[idx].name);
+		net_buf_reset(fixture->test_data);
+		net_buf_reset(fixture->encoded);
+		net_buf_reset(fixture->decoded);
+	}
+}
+
+ZTEST_F(cobs_tests, test_encode_trailing_delimiter)
+{
+	int ret;
+
+	ARRAY_FOR_EACH(cobs_dataset, idx) {
+		uint8_t delimiter = cobs_dataset[idx].delimiter;
+
+		net_buf_add_mem(fixture->test_data, cobs_dataset[idx].decoded,
+				cobs_dataset[idx].decoded_len);
+
+		ret = cobs_encode(fixture->test_data, fixture->encoded,
+				  COBS_FLAG_TRAILING_DELIMITER |
+					  COBS_FLAG_CUSTOM_DELIMITER(delimiter));
+		zassert_ok(ret, "COBS encoding failed for %s", cobs_dataset[idx].name);
+		zassert_equal(cobs_dataset[idx].encoded_len + 1, fixture->encoded->len,
+			      "Encoded length does not match expected for %s",
+			      cobs_dataset[idx].name);
+		zassert_mem_equal(cobs_dataset[idx].encoded, fixture->encoded->data,
+				  cobs_dataset[idx].encoded_len,
+				  "Encoded data does not match expected for %s",
+				  cobs_dataset[idx].name);
+
+		zassert_equal(fixture->encoded->data[cobs_dataset[idx].encoded_len], delimiter,
+			      "Encoded data does not have proper trailing delimiter");
+
+		zassert_equal(fixture->test_data->len, 0, "Encode input not empty for %s",
+			      cobs_dataset[idx].name);
+		net_buf_reset(fixture->test_data);
+		net_buf_reset(fixture->encoded);
+		net_buf_reset(fixture->decoded);
+	}
+}
+
+ZTEST_F(cobs_tests, test_decode_trailing_delimiter)
+{
+	int ret;
+
+	ARRAY_FOR_EACH(cobs_dataset, idx) {
+		uint8_t delimiter = cobs_dataset[idx].delimiter;
+
+		net_buf_add_mem(fixture->test_data, cobs_dataset[idx].decoded,
+				cobs_dataset[idx].decoded_len);
+
+		net_buf_add_u8(fixture->encoded, delimiter);
+
+		ret = cobs_decode(fixture->encoded, fixture->test_data,
+				  COBS_FLAG_TRAILING_DELIMITER |
+					  COBS_FLAG_CUSTOM_DELIMITER(delimiter));
+		zassert_ok(ret, "COBS decoding failed for %s", cobs_dataset[idx].name);
+		zassert_equal(cobs_dataset[idx].decoded_len, fixture->test_data->len,
+			      "Decoded length does not match expected for %s",
+			      cobs_dataset[idx].name);
+		zassert_mem_equal(cobs_dataset[idx].decoded, fixture->test_data->data,
+				  cobs_dataset[idx].decoded_len,
+				  "Decoded data does not match expected for %s",
+				  cobs_dataset[idx].name);
+
+		zassert_equal(fixture->encoded->len, 0, "Decode input not empty for %s",
+			      cobs_dataset[idx].name);
+		net_buf_reset(fixture->test_data);
+		net_buf_reset(fixture->encoded);
+		net_buf_reset(fixture->decoded);
+	}
+}
+
+ZTEST_F(cobs_tests, test_cobs_invalid_delim_pos)
+{
+	int ret;
+	const char data_enc[] = {0x02, 0x00, 0x01};
+
+	net_buf_add_mem(fixture->encoded, data_enc, sizeof(data_enc));
+	ret = cobs_decode(fixture->encoded, fixture->decoded, 0);
+	zassert_true(ret == -EINVAL, "Decoding invalid delimiter caught");
+}
+
+ZTEST_F(cobs_tests, test_cobs_consecutive_delims)
+{
+	int ret;
+	const char data_enc[] = {0x01, 0x00, 0x00, 0x01};
+
+	net_buf_add_mem(fixture->encoded, data_enc, sizeof(data_enc));
+	ret = cobs_decode(fixture->encoded, fixture->decoded, 0);
+	zassert_true(ret == -EINVAL, "Decoding consecutive delimiters not caught");
+}
+
+ZTEST_F(cobs_tests, test_cobs_invalid_overrun)
+{
+	int ret;
+	const char data_enc[] = {0x03, 0x01};
+
+	net_buf_add_mem(fixture->encoded, data_enc, sizeof(data_enc));
+	ret = cobs_decode(fixture->encoded, fixture->decoded, 0);
+	zassert_true(ret == -EINVAL, "Decoding insufficient data not caught");
+}
diff --git a/tests/lib/cobs/testcase.yaml b/tests/lib/cobs/testcase.yaml
new file mode 100644
index 0000000000000..71b07601d1093
--- /dev/null
+++ b/tests/lib/cobs/testcase.yaml
@@ -0,0 +1,6 @@
+tests:
+  libraries.encoding.cobs:
+    min_flash: 32
+    tags: cobs
+    integration_platforms:
+      - native_sim
diff --git a/tests/lib/cpp/cxx/src/main.cpp b/tests/lib/cpp/cxx/src/main.cpp
index d2704e0d992fe..71e1c1e3ab794 100644
--- a/tests/lib/cpp/cxx/src/main.cpp
+++ b/tests/lib/cpp/cxx/src/main.cpp
@@ -50,7 +50,6 @@
 #include <zephyr/drivers/i2s.h>
 #include <zephyr/drivers/i3c.h>
 #include <zephyr/drivers/ipm.h>
-#include <zephyr/drivers/kscan.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/drivers/led_strip.h>
 #include <zephyr/drivers/lora.h>
diff --git a/tests/lib/devicetree/devices/src/main.c b/tests/lib/devicetree/devices/src/main.c
index 0c9cf699406fe..291a4a4785055 100644
--- a/tests/lib/devicetree/devices/src/main.c
+++ b/tests/lib/devicetree/devices/src/main.c
@@ -86,16 +86,16 @@ ZTEST(devicetree_devices, test_init_get)
 		      DEVICE_DT_GET(TEST_NOLABEL), NULL);
 
 	/* Check init functions */
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_I2C)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVA)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVB)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIOX)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVC)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO_INJECTED)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_GET(manual_dev)->init_fn.dev, dev_init);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_NOLABEL)->init_fn.dev, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_GPIO)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_I2C)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_DEVA)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_DEVB)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_GPIOX)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_DEVC)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_PARTITION)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_GPIO_INJECTED)->ops.init, dev_init);
+	zassert_equal(DEVICE_GET(manual_dev)->ops.init, dev_init);
+	zassert_equal(DEVICE_DT_GET(TEST_NOLABEL)->ops.init, dev_init);
 }
 
 ZTEST(devicetree_devices, test_init_order)
diff --git a/tests/lib/gui/lvgl/src/main.c b/tests/lib/gui/lvgl/src/main.c
index 22aafbc7eba72..18b9f22c68c8d 100644
--- a/tests/lib/gui/lvgl/src/main.c
+++ b/tests/lib/gui/lvgl/src/main.c
@@ -104,8 +104,9 @@ void *setup_lvgl(void)
 
 #if CONFIG_LV_COLOR_DEPTH_1 == 1
 	display_set_pixel_format(display_dev, PIXEL_FORMAT_MONO10);
-#elif CONFIG_LV_COLOR_DEPTH_8 == 1 || CONFIG_LV_COLOR_DEPTH_24 == 1
-	/* No 8bit display pixel format not supported */
+#elif CONFIG_LV_COLOR_DEPTH_8 == 1
+	display_set_pixel_format(display_dev, PIXEL_FORMAT_L_8);
+#elif CONFIG_LV_COLOR_DEPTH_24 == 1
 	display_set_pixel_format(display_dev, PIXEL_FORMAT_RGB_888);
 #elif CONFIG_LV_COLOR_DEPTH_16 == 1
 	display_set_pixel_format(display_dev, PIXEL_FORMAT_RGB_565);
diff --git a/tests/lib/gui/lvgl/testcase.yaml b/tests/lib/gui/lvgl/testcase.yaml
index ab4b6be5315da..270f355c9311f 100644
--- a/tests/lib/gui/lvgl/testcase.yaml
+++ b/tests/lib/gui/lvgl/testcase.yaml
@@ -87,7 +87,6 @@ tests:
       - CONFIG_DYNAMIC_THREAD_POOL_SIZE=4
       - CONFIG_DYNAMIC_THREAD_ALLOC=y
     platform_allow:
-      - native_posix/native/64
       - native_sim/native/64
       - native_sim
     integration_platforms:
diff --git a/tests/lib/heap_align/src/main.c b/tests/lib/heap_align/src/main.c
index 0061d1c4ad6d4..330e8a3635b1b 100644
--- a/tests/lib/heap_align/src/main.c
+++ b/tests/lib/heap_align/src/main.c
@@ -7,12 +7,37 @@
 #include <zephyr/ztest.h>
 #include <zephyr/sys/sys_heap.h>
 
+/* need to peek into some heap internals */
+#include "../../../../lib/heap/heap.h"
+
 #define HEAP_SZ 0x1000
 
-uint8_t __aligned(8) heapmem[HEAP_SZ];
+uint8_t __aligned(CHUNK_UNIT) heapmem[HEAP_SZ];
 
 /* Heap metadata sizes */
 uint8_t *heap_start, *heap_end;
+size_t heap_chunk_header_size;
+
+/*
+ * The align argument may contain a "rewind" bit.
+ * See comment in sys_heap_aligned_alloc().
+ */
+static bool alignment_ok(void *ptr, size_t align)
+{
+	uintptr_t addr = (uintptr_t)ptr;
+	size_t rew;
+
+	/* split rewind bit from alignment */
+	rew = LSB_GET(align);
+	rew = (rew == align) ? 0 : rew;
+	align -= rew;
+
+	/* undo the pointer rewind */
+	addr += rew;
+
+	/* validate pointer alignment */
+	return (addr & (align - 1)) == 0;
+}
 
 /* Note that this test is making whitebox assumptions about the
  * behavior of the heap in order to exercise coverage of the
@@ -24,24 +49,28 @@ static void check_heap_align(struct sys_heap *h,
 			     size_t prefix, size_t align, size_t size)
 {
 	void *p, *q, *r, *s;
+	size_t suffix;
 
 	p = sys_heap_alloc(h, prefix);
 	zassert_true(prefix == 0 || p != NULL, "prefix allocation failed");
 
 	q = sys_heap_aligned_alloc(h, align, size);
 	zassert_true(q != NULL, "first aligned allocation failed");
-	zassert_true((((uintptr_t)q) & (align - 1)) == 0, "block not aligned");
+	zassert_true(alignment_ok(q, align), "block not aligned");
 
 	r = sys_heap_aligned_alloc(h, align, size);
 	zassert_true(r != NULL, "second aligned allocation failed");
-	zassert_true((((uintptr_t)r) & (align - 1)) == 0, "block not aligned");
+	zassert_true(alignment_ok(r, align), "block not aligned");
 
 	/* Make sure ALL the split memory goes back into the heap and
 	 * we can allocate the full remaining suffix
 	 */
-	s = sys_heap_alloc(h, (heap_end - (uint8_t *)r) - size - 8);
+	suffix = (heap_end - (uint8_t *)ROUND_UP((uintptr_t)r + size, CHUNK_UNIT))
+		- heap_chunk_header_size;
+	s = sys_heap_alloc(h, suffix);
 	zassert_true(s != NULL, "suffix allocation failed (%zd/%zd/%zd)",
 				prefix, align, size);
+	zassert_true(sys_heap_validate(h), "heap invalid");
 
 	sys_heap_free(h, p);
 	sys_heap_free(h, q);
@@ -72,12 +101,17 @@ ZTEST(lib_heap_align, test_aligned_alloc)
 	 * chunk header before the end of its memory
 	 */
 	heap_start = p;
-	heap_end = heapmem + HEAP_SZ - 8;
+	heap_end = heapmem + heap.heap->end_chunk * CHUNK_UNIT;
+	heap_chunk_header_size = chunk_header_bytes(heap.heap);
 
 	for (size_t align = 8; align < HEAP_SZ / 4; align *= 2) {
 		for (size_t prefix = 0; prefix <= align; prefix += 8) {
-			for (size_t size = 8; size <= align; size += 8) {
+			for (size_t size = 4; size <= align; size += 12) {
 				check_heap_align(&heap, prefix, align, size);
+				for (size_t rew = 4; rew < MIN(align, 32); rew *= 2) {
+					check_heap_align(&heap, prefix,
+							 align | rew, size);
+				}
 			}
 		}
 	}
diff --git a/tests/lib/json/prj.conf b/tests/lib/json/prj.conf
index 4a6c8522abd68..85d02432005bb 100644
--- a/tests/lib/json/prj.conf
+++ b/tests/lib/json/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_JSON_LIBRARY=y
+CONFIG_JSON_LIBRARY_FP_SUPPORT=y
 CONFIG_ZTEST=y
-CONFIG_ZTEST_STACK_SIZE=3072
+CONFIG_ZTEST_STACK_SIZE=4096
diff --git a/tests/lib/json/src/main.c b/tests/lib/json/src/main.c
index baf2e0edd8403..86503885defb0 100644
--- a/tests/lib/json/src/main.c
+++ b/tests/lib/json/src/main.c
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <string.h>
+#include <float.h>
+#include <math.h>
 #include <zephyr/types.h>
 #include <stdbool.h>
 #include <zephyr/ztest.h>
@@ -13,14 +15,19 @@ struct test_nested {
 	int nested_int;
 	bool nested_bool;
 	const char *nested_string;
+	char nested_string_buf[10];
+	int8_t nested_int8;
+	uint8_t nested_uint8;
 	int64_t nested_int64;
 	uint64_t nested_uint64;
 };
 
 struct test_struct {
 	const char *some_string;
+	char some_string_buf[10];
 	int some_int;
 	bool some_bool;
+	int16_t some_int16;
 	int64_t some_int64;
 	int64_t another_int64;
 	int64_t some_uint64;
@@ -39,6 +46,7 @@ struct test_struct {
 
 struct elt {
 	const char *name;
+	const char name_buf[10];
 	int height;
 };
 
@@ -57,6 +65,47 @@ struct test_int_limits {
 	uint64_t uint64_max;
 	uint64_t uint64_cero;
 	uint64_t uint64_min;
+	uint32_t uint32_max;
+	uint32_t uint32_cero;
+	uint32_t uint32_min;
+	int16_t int16_max;
+	int16_t int16_cero;
+	int16_t int16_min;
+	uint16_t uint16_max;
+	uint16_t uint16_cero;
+	uint16_t uint16_min;
+	int8_t int8_max;
+	int8_t int8_cero;
+	int8_t int8_min;
+	uint8_t uint8_max;
+	uint8_t uint8_cero;
+	uint8_t uint8_min;
+};
+
+struct test_float {
+	float some_float;
+	float another_float;
+	float some_array[16];
+	size_t some_array_len;
+};
+
+struct test_float_limits {
+	float float_max;
+	float float_cero;
+	float float_min;
+};
+
+struct test_double {
+	double some_double;
+	double another_double;
+	double some_array[16];
+	size_t some_array_len;
+};
+
+struct test_double_limits {
+	double double_max;
+	double double_cero;
+	double double_min;
 };
 
 static const struct json_obj_descr nested_descr[] = {
@@ -64,6 +113,10 @@ static const struct json_obj_descr nested_descr[] = {
 	JSON_OBJ_DESCR_PRIM(struct test_nested, nested_bool, JSON_TOK_TRUE),
 	JSON_OBJ_DESCR_PRIM(struct test_nested, nested_string,
 			    JSON_TOK_STRING),
+	JSON_OBJ_DESCR_PRIM(struct test_nested, nested_string_buf,
+			    JSON_TOK_STRING_BUF),
+	JSON_OBJ_DESCR_PRIM(struct test_nested, nested_int8, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_nested, nested_uint8, JSON_TOK_UINT),
 	JSON_OBJ_DESCR_PRIM(struct test_nested, nested_int64,
 			    JSON_TOK_INT64),
 	JSON_OBJ_DESCR_PRIM(struct test_nested, nested_uint64,
@@ -72,8 +125,10 @@ static const struct json_obj_descr nested_descr[] = {
 
 static const struct json_obj_descr test_descr[] = {
 	JSON_OBJ_DESCR_PRIM(struct test_struct, some_string, JSON_TOK_STRING),
+	JSON_OBJ_DESCR_PRIM(struct test_struct, some_string_buf, JSON_TOK_STRING_BUF),
 	JSON_OBJ_DESCR_PRIM(struct test_struct, some_int, JSON_TOK_NUMBER),
 	JSON_OBJ_DESCR_PRIM(struct test_struct, some_bool, JSON_TOK_TRUE),
+	JSON_OBJ_DESCR_PRIM(struct test_struct, some_int16, JSON_TOK_INT),
 	JSON_OBJ_DESCR_PRIM(struct test_struct, some_int64,
 			    JSON_TOK_INT64),
 	JSON_OBJ_DESCR_PRIM(struct test_struct, another_int64,
@@ -101,6 +156,7 @@ static const struct json_obj_descr test_descr[] = {
 
 static const struct json_obj_descr elt_descr[] = {
 	JSON_OBJ_DESCR_PRIM(struct elt, name, JSON_TOK_STRING),
+	JSON_OBJ_DESCR_PRIM(struct elt, name_buf, JSON_TOK_STRING_BUF),
 	JSON_OBJ_DESCR_PRIM(struct elt, height, JSON_TOK_NUMBER),
 };
 
@@ -119,6 +175,47 @@ static const struct json_obj_descr obj_limits_descr[] = {
 	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint64_max, JSON_TOK_UINT64),
 	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint64_cero, JSON_TOK_UINT64),
 	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint64_min, JSON_TOK_UINT64),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint32_max, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint32_cero, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint32_min, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, int16_max, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, int16_cero, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, int16_min, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint16_max, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint16_cero, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint16_min, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, int8_max, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, int8_cero, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, int8_min, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint8_max, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint8_cero, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_int_limits, uint8_min, JSON_TOK_UINT),
+};
+
+static const struct json_obj_descr obj_float_descr[] = {
+	JSON_OBJ_DESCR_PRIM(struct test_float, some_float, JSON_TOK_FLOAT_FP),
+	JSON_OBJ_DESCR_PRIM(struct test_float, another_float, JSON_TOK_FLOAT_FP),
+	JSON_OBJ_DESCR_ARRAY(struct test_float, some_array,
+			     16, some_array_len, JSON_TOK_FLOAT_FP),
+};
+
+static const struct json_obj_descr obj_float_limits_descr[] = {
+	JSON_OBJ_DESCR_PRIM(struct test_float_limits, float_max, JSON_TOK_FLOAT_FP),
+	JSON_OBJ_DESCR_PRIM(struct test_float_limits, float_cero, JSON_TOK_FLOAT_FP),
+	JSON_OBJ_DESCR_PRIM(struct test_float_limits, float_min, JSON_TOK_FLOAT_FP),
+};
+
+static const struct json_obj_descr obj_double_descr[] = {
+	JSON_OBJ_DESCR_PRIM(struct test_double, some_double, JSON_TOK_DOUBLE_FP),
+	JSON_OBJ_DESCR_PRIM(struct test_double, another_double, JSON_TOK_DOUBLE_FP),
+	JSON_OBJ_DESCR_ARRAY(struct test_double, some_array,
+			     16, some_array_len, JSON_TOK_DOUBLE_FP),
+};
+
+static const struct json_obj_descr obj_double_limits_descr[] = {
+	JSON_OBJ_DESCR_PRIM(struct test_double_limits, double_max, JSON_TOK_DOUBLE_FP),
+	JSON_OBJ_DESCR_PRIM(struct test_double_limits, double_cero, JSON_TOK_DOUBLE_FP),
+	JSON_OBJ_DESCR_PRIM(struct test_double_limits, double_min, JSON_TOK_DOUBLE_FP),
 };
 
 struct array {
@@ -205,11 +302,60 @@ static const struct json_obj_descr outer_descr[] = {
 				num_elements, element_descr, ARRAY_SIZE(element_descr))
 };
 
+struct test_alignment_nested {
+	bool bool1;
+	int int1;
+	bool bool2;
+};
+
+struct test_alignment_bool {
+	struct test_alignment_nested array[3];
+	size_t num_elements;
+};
+
+static const struct json_obj_descr alignment_nested_descr[] = {
+	JSON_OBJ_DESCR_PRIM(struct test_alignment_nested, bool1, JSON_TOK_TRUE),
+	JSON_OBJ_DESCR_PRIM(struct test_alignment_nested, int1, JSON_TOK_NUMBER),
+	JSON_OBJ_DESCR_PRIM(struct test_alignment_nested, bool2, JSON_TOK_TRUE),
+};
+
+static const struct json_obj_descr alignment_bool_descr[] = {
+	JSON_OBJ_DESCR_OBJ_ARRAY(struct test_alignment_bool, array, 3, num_elements,
+				 alignment_nested_descr, ARRAY_SIZE(alignment_nested_descr)) };
+
+enum int8_enum { I8_MIN = INT8_MIN, I8_MAX = INT8_MAX };
+enum uint8_enum { U8_MIN = 0, U8_MAX = UINT8_MAX };
+enum int16_enum { I16_MIN = INT16_MIN, I16_MAX = INT16_MAX };
+enum uint16_enum { U16_MIN = 0, U16_MAX = UINT16_MAX };
+enum int32_enum { I32_MIN = INT32_MIN, I32_MAX = INT32_MAX };
+enum uint32_enum { U32_MIN = 0, U32_MAX = UINT32_MAX };
+
+struct test_enums {
+	enum int8_enum i8;
+	enum uint8_enum u8;
+	enum int16_enum i16;
+	enum uint16_enum u16;
+	enum int32_enum i32;
+	enum uint32_enum u32;
+};
+
+static const struct json_obj_descr enums_descr[] = {
+	JSON_OBJ_DESCR_PRIM(struct test_enums, i8, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_enums, u8, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_enums, i16, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_enums, u16, JSON_TOK_UINT),
+	JSON_OBJ_DESCR_PRIM(struct test_enums, i32, JSON_TOK_INT),
+	JSON_OBJ_DESCR_PRIM(struct test_enums, u32, JSON_TOK_UINT),
+};
+
+
 ZTEST(lib_json_test, test_json_encoding)
 {
 	struct test_struct ts = {
 		.some_string = "zephyr 123\uABCD",
+		.some_string_buf = "z 123\uABCD",
 		.some_int = 42,
+		.some_int16 = 16,
 		.some_int64 = 1152921504606846977,
 		.another_int64 = -2305843009213693937,
 		.some_uint64 = 18446744073709551615U,
@@ -219,6 +365,9 @@ ZTEST(lib_json_test, test_json_encoding)
 			.nested_int = -1234,
 			.nested_bool = false,
 			.nested_string = "this should be escaped: \t",
+			.nested_string_buf = "esc: \t",
+			.nested_int8 = -123,
+			.nested_uint8 = 231,
 			.nested_int64 = 4503599627370496,
 			.nested_uint64 = 18446744073709551610U,
 		},
@@ -239,17 +388,21 @@ ZTEST(lib_json_test, test_json_encoding)
 			.nested_int = 1234,
 			.nested_bool = true,
 			.nested_string = "no escape necessary",
+			.nested_string_buf = "no escape",
+			.nested_int8 = 123,
+			.nested_uint8 = 231,
 			.nested_int64 = 4503599627370496,
 			.nested_uint64 = 18446744073709551610U,
 		},
 		.nested_obj_array = {
-			{1, true, "true"},
-			{0, false, "false"}
+			{1, true, "true", "true"},
+			{0, false, "false", "false"}
 		},
 		.obj_array_len = 2
 	};
 	char encoded[] = "{\"some_string\":\"zephyr 123\uABCD\","
-		"\"some_int\":42,\"some_bool\":true,"
+		"\"some_string_buf\":\"z 123\uABCD\","
+		"\"some_int\":42,\"some_bool\":true,\"some_int16\":16,"
 		"\"some_int64\":1152921504606846977,"
 		"\"another_int64\":-2305843009213693937,"
 		"\"some_uint64\":18446744073709551615,"
@@ -257,6 +410,9 @@ ZTEST(lib_json_test, test_json_encoding)
 		"\"some_nested_struct\":{\"nested_int\":-1234,"
 		"\"nested_bool\":false,\"nested_string\":"
 		"\"this should be escaped: \\t\","
+		"\"nested_string_buf\":\"esc: \\t\","
+		"\"nested_int8\":-123,"
+		"\"nested_uint8\":231,"
 		"\"nested_int64\":4503599627370496,"
 		"\"nested_uint64\":18446744073709551610},"
 		"\"some_array\":[1,4,8,16,32],"
@@ -266,11 +422,14 @@ ZTEST(lib_json_test, test_json_encoding)
 		"\"4nother_ne$+\":{\"nested_int\":1234,"
 		"\"nested_bool\":true,"
 		"\"nested_string\":\"no escape necessary\","
+		"\"nested_string_buf\":\"no escape\","
+		"\"nested_int8\":123,"
+		"\"nested_uint8\":231,"
 		"\"nested_int64\":4503599627370496,"
 		"\"nested_uint64\":18446744073709551610},"
 		"\"nested_obj_array\":["
-		"{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_int64\":0,\"nested_uint64\":0},"
-		"{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_int64\":0,\"nested_uint64\":0}]"
+		"{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_string_buf\":\"true\",\"nested_int8\":0,\"nested_uint8\":0,\"nested_int64\":0,\"nested_uint64\":0},"
+		"{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_string_buf\":\"false\",\"nested_int8\":0,\"nested_uint8\":0,\"nested_int64\":0,\"nested_uint64\":0}]"
 		"}";
 	char buffer[sizeof(encoded)];
 	int ret;
@@ -291,7 +450,9 @@ ZTEST(lib_json_test, test_json_decoding)
 {
 	struct test_struct ts;
 	char encoded[] = "{\"some_string\":\"zephyr 123\\uABCD456\","
+		"\"some_string_buf\":\"z\\uABCD\","
 		"\"some_int\":\t42\n,"
+		"\"some_int16\":\t16\n,"
 		"\"some_bool\":true    \t  "
 		"\n"
 		"\r   ,"
@@ -303,6 +464,8 @@ ZTEST(lib_json_test, test_json_decoding)
 		"\"nested_int\":-1234,\n\n"
 		"\"nested_bool\":false,\t"
 		"\"nested_string\":\"this should be escaped: \\t\","
+		"\"nested_string_buf\":\"esc: \\t\","
+		"\"nested_int8\":123,"
 		"\"nested_int64\":9223372036854775807,"
 		"\"extra_nested_array\":[0,-1]},"
 		"\"extra_struct\":{\"nested_bool\":false},"
@@ -314,10 +477,12 @@ ZTEST(lib_json_test, test_json_decoding)
 		"\"4nother_ne$+\":{\"nested_int\":1234,"
 		"\"nested_bool\":true,"
 		"\"nested_string\":\"no escape necessary\","
+		"\"nested_string_buf\":\"no escape\","
+		"\"nested_int8\":-123,"
 		"\"nested_int64\":-9223372036854775806},"
 		"\"nested_obj_array\":["
-		"{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\"},"
-		"{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\"}]"
+		"{\"nested_int\":1,\"nested_bool\":true,\"nested_string\":\"true\",\"nested_string_buf\":\"true\"},"
+		"{\"nested_int\":0,\"nested_bool\":false,\"nested_string\":\"false\",\"nested_string_buf\":\"false\"}]"
 		"}\n";
 	const int expected_array[] = { 11, 22, 33, 45, 299 };
 	const int expected_other_array[] = { 2, 3, 5, 7 };
@@ -331,7 +496,10 @@ ZTEST(lib_json_test, test_json_decoding)
 
 	zassert_str_equal(ts.some_string, "zephyr 123\\uABCD456",
 			  "String not decoded correctly");
+	zassert_str_equal(ts.some_string_buf, "z\\uABCD",
+			  "String (array) not decoded correctly");
 	zassert_equal(ts.some_int, 42, "Positive integer not decoded correctly");
+	zassert_equal(ts.some_int16, 16, "Positive integer not decoded correctly");
 	zassert_equal(ts.some_bool, true, "Boolean not decoded correctly");
 	zassert_equal(ts.some_int64, -4611686018427387904,
 		      "int64 not decoded correctly");
@@ -339,6 +507,8 @@ ZTEST(lib_json_test, test_json_decoding)
 		      "int64 not decoded correctly");
 	zassert_equal(ts.some_nested_struct.nested_int, -1234,
 		      "Nested negative integer not decoded correctly");
+	zassert_equal(ts.some_nested_struct.nested_int8, 123,
+		      "Nested int8 not decoded correctly");
 	zassert_equal(ts.some_nested_struct.nested_int64, 9223372036854775807,
 		      "Nested int64 not decoded correctly");
 	zassert_equal(ts.some_nested_struct.nested_bool, false,
@@ -346,6 +516,9 @@ ZTEST(lib_json_test, test_json_decoding)
 	zassert_str_equal(ts.some_nested_struct.nested_string,
 			  "this should be escaped: \\t",
 			  "Nested string not decoded correctly");
+	zassert_str_equal(ts.some_nested_struct.nested_string_buf,
+			  "esc: \\t",
+			  "Nested string-array not decoded correctly");
 	zassert_equal(ts.some_array_len, 5,
 		      "Array doesn't have correct number of items");
 	zassert_true(!memcmp(ts.some_array, expected_array,
@@ -362,6 +535,8 @@ ZTEST(lib_json_test, test_json_decoding)
 		     "Decoded named array not with expected values");
 	zassert_equal(ts.xnother_nexx.nested_int, 1234,
 		      "Named nested integer not decoded correctly");
+	zassert_equal(ts.xnother_nexx.nested_int8, -123,
+		      "Named nested int8 not decoded correctly");
 	zassert_equal(ts.xnother_nexx.nested_int64, -9223372036854775806,
 		      "Named nested int64 not decoded correctly");
 	zassert_equal(ts.xnother_nexx.nested_bool, true,
@@ -369,6 +544,9 @@ ZTEST(lib_json_test, test_json_decoding)
 	zassert_str_equal(ts.xnother_nexx.nested_string,
 			  "no escape necessary",
 			  "Named nested string not decoded correctly");
+	zassert_str_equal(ts.xnother_nexx.nested_string_buf,
+			  "no escape",
+			  "Named nested string-array not decoded correctly");
 	zassert_equal(ts.obj_array_len, 2,
 		      "Array of objects does not have correct number of items");
 	zassert_equal(ts.nested_obj_array[0].nested_int, 1,
@@ -377,12 +555,16 @@ ZTEST(lib_json_test, test_json_decoding)
 		      "Boolean value in first object array element not decoded correctly");
 	zassert_str_equal(ts.nested_obj_array[0].nested_string, "true",
 			  "String in first object array element not decoded correctly");
+	zassert_str_equal(ts.nested_obj_array[0].nested_string_buf, "true",
+			  "String buffer in first object array element not decoded correctly");
 	zassert_equal(ts.nested_obj_array[1].nested_int, 0,
 		      "Integer in second object array element not decoded correctly");
 	zassert_equal(ts.nested_obj_array[1].nested_bool, false,
 		      "Boolean value in second object array element not decoded correctly");
 	zassert_str_equal(ts.nested_obj_array[1].nested_string, "false",
 			  "String in second object array element not decoded correctly");
+	zassert_str_equal(ts.nested_obj_array[1].nested_string_buf, "false",
+			  "String buffer in second object array element not decoded correctly");
 }
 
 ZTEST(lib_json_test, test_json_limits)
@@ -396,7 +578,22 @@ ZTEST(lib_json_test, test_json_limits)
 			 "\"int64_min\":-9223372036854775808,"
 			 "\"uint64_max\":18446744073709551615,"
 			 "\"uint64_cero\":0,"
-			 "\"uint64_min\":0"
+			 "\"uint64_min\":0,"
+			 "\"uint32_max\":4294967295,"
+			 "\"uint32_cero\":0,"
+			 "\"uint32_min\":0,"
+			 "\"int16_max\":32767,"
+			 "\"int16_cero\":0,"
+			 "\"int16_min\":-32768,"
+			 "\"uint16_max\":65535,"
+			 "\"uint16_cero\":0,"
+			 "\"uint16_min\":0,"
+			 "\"int8_max\":127,"
+			 "\"int8_cero\":0,"
+			 "\"int8_min\":-128,"
+			 "\"uint8_max\":255,"
+			 "\"uint8_cero\":0,"
+			 "\"uint8_min\":0"
 			 "}";
 
 	struct test_int_limits limits = {
@@ -409,6 +606,21 @@ ZTEST(lib_json_test, test_json_limits)
 		.uint64_max = UINT64_MAX,
 		.uint64_cero = 0,
 		.uint64_min = 0,
+		.uint32_max = UINT32_MAX,
+		.uint32_cero = 0,
+		.uint32_min = 0,
+		.int16_max = INT16_MAX,
+		.int16_cero = 0,
+		.int16_min = INT16_MIN,
+		.uint16_max = UINT16_MAX,
+		.uint16_cero = 0,
+		.uint16_min = 0,
+		.int8_max = INT8_MAX,
+		.int8_cero = 0,
+		.int8_min = INT8_MIN,
+		.uint8_max = UINT8_MAX,
+		.uint8_cero = 0,
+		.uint8_min = 0,
 	};
 
 	char buffer[sizeof(encoded)];
@@ -425,21 +637,353 @@ ZTEST(lib_json_test, test_json_limits)
 		     "Integer limits not decoded correctly");
 }
 
+ZTEST(lib_json_test, test_json_float)
+{
+	char encoded[] = "{\"some_float\":-0.000244140625,"
+			 "\"another_float\":12345600,"
+			 "\"some_array\":[1.5,2.25]"
+			 "}";
+
+	struct test_float floats = {
+		.some_float = -0.000244140625,
+		.another_float = 12345600.0,
+		.some_array[0] = 1.5,
+		.some_array[1] = 2.25,
+		.some_array_len = 2,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_float floats_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_float_descr, ARRAY_SIZE(obj_float_descr),
+				&floats, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of float returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_float_descr,
+			     ARRAY_SIZE(obj_float_descr), &floats_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Float not encoded correctly");
+	zassert_true(!memcmp(&floats, &floats_decoded, sizeof(floats)),
+		     "Float not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_float_format)
+{
+	struct sub_test {
+		float num;
+		char *str;
+	};
+	struct sub_test encoded[] = {
+		{ .num = 0, .str = "0" },
+		{ .num = 0, .str = "0.0" },
+		{ .num = 0, .str = "0e0" },
+		{ .num = 0, .str = "0e+0" },
+		{ .num = 0, .str = "0e-0" },
+
+		{ .num = 12345, .str = "12345" },
+		{ .num = 12345, .str = "1.2345e+4" },
+		{ .num = 12345, .str = "1.2345e+04" },
+
+		{ .num = -12345, .str = "-12345" },
+		{ .num = -12345, .str = "-1.2345e+4" },
+		{ .num = -12345, .str = "-1.2345e+04" },
+
+		{ .num = 0.03125, .str = "0.03125" },
+		{ .num = 0.03125, .str = "3.125e-2" },
+		{ .num = 0.03125, .str = "3.125e-02" },
+
+		{ .num = -0.03125, .str = "-0.03125" },
+		{ .num = -0.03125, .str = "-3.125e-2" },
+		{ .num = -0.03125, .str = "-3.125e-02" },
+	};
+
+	struct test_float ts;
+	char str_encoded[32];
+
+	for (int i = 0; i < ARRAY_SIZE(encoded); i++) {
+		snprintf(str_encoded, sizeof(str_encoded), "{\"some_float\":%s}", encoded[i].str);
+		int ret = json_obj_parse(str_encoded, strlen(str_encoded),
+			       obj_float_descr, ARRAY_SIZE(obj_float_descr), &ts);
+		zassert_equal(ret, 1, "Decoding failed: %s result: %d", str_encoded, ret);
+		zassert_equal(ts.some_float, encoded[i].num,
+			      "Decoding failed '%s' float: %g exepcted: %g",
+			      str_encoded, (double)ts.some_float, (double)encoded[i].num);
+	}
+}
+
+ZTEST(lib_json_test, test_json_float_nan)
+{
+	char encoded[] = "{\"some_float\":NaN,"
+			 "\"another_float\":NaN,"
+			 "\"some_array\":[NaN,NaN]"
+			 "}";
+
+	struct test_float floats = {
+		.some_float = NAN,
+		.another_float = NAN,
+		.some_array[0] = NAN,
+		.some_array[1] = NAN,
+		.some_array_len = 2,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_float floats_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_float_descr, ARRAY_SIZE(obj_float_descr),
+				&floats, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of float nan returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_float_descr,
+			     ARRAY_SIZE(obj_float_descr), &floats_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Float not encoded correctly");
+	zassert_true(!memcmp(&floats, &floats_decoded, sizeof(floats)),
+		     "Float not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_float_infinity)
+{
+	char encoded[] = "{\"some_float\":Infinity,"
+			 "\"another_float\":-Infinity,"
+			 "\"some_array\":[Infinity,-Infinity]"
+			 "}";
+
+	struct test_float floats = {
+		.some_float = INFINITY,
+		.another_float = -INFINITY,
+		.some_array[0] = INFINITY,
+		.some_array[1] = -INFINITY,
+		.some_array_len = 2,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_float floats_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_float_descr, ARRAY_SIZE(obj_float_descr),
+				&floats, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of float inf returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_float_descr,
+			     ARRAY_SIZE(obj_float_descr), &floats_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Float not encoded correctly");
+	zassert_true(!memcmp(&floats, &floats_decoded, sizeof(floats)),
+		     "Float not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_float_limits)
+{
+	char encoded[] = "{\"float_max\":3.40282347e+38,"
+			 "\"float_cero\":0,"
+			 "\"float_min\":-3.40282347e+38"
+			 "}";
+
+	struct test_float_limits limits = {
+		.float_max = 3.40282347e+38,
+		.float_cero = 0,
+		.float_min = -3.40282347e+38,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_float_limits limits_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_float_limits_descr, ARRAY_SIZE(obj_float_limits_descr),
+				&limits, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of float limits returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_float_limits_descr,
+			     ARRAY_SIZE(obj_float_limits_descr), &limits_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Float limits not encoded correctly");
+	zassert_true(!memcmp(&limits, &limits_decoded, sizeof(limits)),
+		     "Float limits not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_double)
+{
+	char encoded[] = "{\"some_double\":-0.000244140625,"
+			 "\"another_double\":1234567890000000,"
+			 "\"some_array\":[1.5,2.25]"
+			 "}";
+
+	struct test_double doubles = {
+		.some_double = -0.000244140625,
+		.another_double = 1234567890000000.0,
+		.some_array[0] = 1.5,
+		.some_array[1] = 2.25,
+		.some_array_len = 2,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_double doubles_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_double_descr, ARRAY_SIZE(obj_double_descr),
+				&doubles, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of double returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_double_descr,
+			     ARRAY_SIZE(obj_double_descr), &doubles_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Double not encoded correctly");
+	zassert_true(!memcmp(&doubles, &doubles_decoded, sizeof(doubles)),
+		     "Double not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_double_format)
+{
+	struct sub_test {
+		double num;
+		char *str;
+	};
+	struct sub_test encoded[] = {
+		{ .num = 0, .str = "0" },
+		{ .num = 0, .str = "0.0" },
+		{ .num = 0, .str = "0e0" },
+		{ .num = 0, .str = "0e+0" },
+		{ .num = 0, .str = "0e-0" },
+
+		{ .num = 12345, .str = "12345" },
+		{ .num = 12345, .str = "1.2345e+4" },
+		{ .num = 12345, .str = "1.2345e+04" },
+
+		{ .num = -12345, .str = "-12345" },
+		{ .num = -12345, .str = "-1.2345e+4" },
+		{ .num = -12345, .str = "-1.2345e+04" },
+
+		{ .num = 0.03125, .str = "0.03125" },
+		{ .num = 0.03125, .str = "3.125e-2" },
+		{ .num = 0.03125, .str = "3.125e-02" },
+
+		{ .num = -0.03125, .str = "-0.03125" },
+		{ .num = -0.03125, .str = "-3.125e-2" },
+		{ .num = -0.03125, .str = "-3.125e-02" },
+	};
+
+	struct test_double ts;
+	char str_encoded[32];
+
+	for (int i = 0; i < ARRAY_SIZE(encoded); i++) {
+		snprintf(str_encoded, sizeof(str_encoded), "{\"some_double\":%s}", encoded[i].str);
+		int ret = json_obj_parse(str_encoded, strlen(str_encoded),
+					 obj_double_descr, ARRAY_SIZE(obj_double_descr), &ts);
+		zassert_equal(ret, 1, "Decoding failed: %s result: %d", str_encoded, ret);
+		zassert_equal(ts.some_double, encoded[i].num,
+			      "Decoding failed '%s' double: %g exepcted: %g",
+			      str_encoded, ts.some_double, encoded[i].num);
+	}
+}
+
+
+ZTEST(lib_json_test, test_json_double_nan)
+{
+	char encoded[] = "{\"some_double\":NaN,"
+			 "\"another_double\":NaN,"
+			 "\"some_array\":[NaN,NaN]"
+			 "}";
+
+	struct test_double doubles = {
+		.some_double = (double)NAN,
+		.another_double = (double)NAN,
+		.some_array[0] = (double)NAN,
+		.some_array[1] = (double)NAN,
+		.some_array_len = 2,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_double doubles_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_double_descr, ARRAY_SIZE(obj_double_descr),
+				&doubles, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of double nan returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_double_descr,
+			     ARRAY_SIZE(obj_double_descr), &doubles_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Double not encoded correctly");
+	zassert_true(!memcmp(&doubles, &doubles_decoded, sizeof(doubles)),
+		     "Double not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_double_infinity)
+{
+	char encoded[] = "{\"some_double\":Infinity,"
+			 "\"another_double\":-Infinity,"
+			 "\"some_array\":[Infinity,-Infinity]"
+			 "}";
+
+	struct test_double doubles = {
+		.some_double = (double)INFINITY,
+		.another_double = (double)-INFINITY,
+		.some_array[0] = (double)INFINITY,
+		.some_array[1] = (double)-INFINITY,
+		.some_array_len = 2,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_double doubles_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_double_descr, ARRAY_SIZE(obj_double_descr),
+				&doubles, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of double inf returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_double_descr,
+			     ARRAY_SIZE(obj_double_descr), &doubles_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Double not encoded correctly");
+	zassert_true(!memcmp(&doubles, &doubles_decoded, sizeof(doubles)),
+		     "Double not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_doubles_limits)
+{
+	char encoded[] = "{\"double_max\":1.797693134862315e+308,"
+			 "\"double_cero\":0,"
+			 "\"double_min\":-1.797693134862315e+308"
+			 "}";
+
+	struct test_double_limits limits = {
+		.double_max = 1.797693134862315e+308,
+		.double_cero = 0,
+		.double_min = -1.797693134862315e+308,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_double_limits limits_decoded = {0};
+	int ret;
+
+	ret = json_obj_encode_buf(obj_double_limits_descr, ARRAY_SIZE(obj_double_limits_descr),
+				&limits, buffer, sizeof(buffer));
+	zassert_equal(ret, 0, "Encoding of double limits returned error");
+	ret = json_obj_parse(encoded, sizeof(encoded), obj_double_limits_descr,
+			     ARRAY_SIZE(obj_double_limits_descr), &limits_decoded);
+	zassert_str_equal(encoded, buffer,
+			  "Double limits not encoded correctly");
+	zassert_true(!memcmp(&limits, &limits_decoded, sizeof(limits)),
+		     "Double limits not decoded correctly");
+}
+
 ZTEST(lib_json_test, test_json_encoding_array_array)
 {
 	struct obj_array_array obj_array_array_ts = {
 		.objects_array = {
-			[0] = { { .name = "Sim\303\263n Bol\303\255var", .height = 168 } },
-			[1] = { { .name = "Pel\303\251",                 .height = 173 } },
-			[2] = { { .name = "Usain Bolt",                  .height = 195 } },
+			[0] = {{.name = "Sim\303\263n Bol\303\255var",
+				.name_buf = "Sim\303\263n",
+				.height = 168}},
+			[1] = {{.name = "Pel\303\251",
+				.name_buf = "Pel\303\251",
+				.height = 173}},
+			[2] = {{.name = "Usain Bolt",
+				.name_buf = "Usain",
+				.height = 195}},
 		},
 		.objects_array_len = 3,
 	};
 	char encoded[] = "{\"objects_array\":["
-		"{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		"{\"name\":\"Pel\303\251\",\"height\":173},"
-		"{\"name\":\"Usain Bolt\",\"height\":195}"
-		"]}";
+			 "{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+			 "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+			 "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}"
+			 "]}";
+
 	char buffer[sizeof(encoded)];
 	int ret;
 
@@ -455,9 +999,9 @@ ZTEST(lib_json_test, test_json_decoding_array_array)
 	int ret;
 	struct obj_array_array obj_array_array_ts;
 	char encoded[] = "{\"objects_array\":["
-			  "{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\"},"
-			  "{\"height\":173,\"name\":\"Pel\303\251\"},"
-			  "{\"height\":195,\"name\":\"Usain Bolt\"}]"
+			  "{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\"},"
+			  "{\"height\":173,\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\"},"
+			  "{\"height\":195,\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\"}]"
 			  "}";
 
 	ret = json_obj_parse(encoded, sizeof(encoded),
@@ -472,16 +1016,23 @@ ZTEST(lib_json_test, test_json_decoding_array_array)
 	zassert_str_equal(obj_array_array_ts.objects_array[0].objects.name,
 			  "Sim\303\263n Bol\303\255var",
 			  "String not decoded correctly");
+	zassert_str_equal(obj_array_array_ts.objects_array[0].objects.name_buf,
+			  "Sim\303\263n",
+			  "String buffer not decoded correctly");
 	zassert_equal(obj_array_array_ts.objects_array[0].objects.height, 168,
 		      "Sim\303\263n Bol\303\255var height not decoded correctly");
 
 	zassert_str_equal(obj_array_array_ts.objects_array[1].objects.name,
 			  "Pel\303\251", "String not decoded correctly");
+	zassert_str_equal(obj_array_array_ts.objects_array[1].objects.name_buf,
+			  "Pel\303\251", "String buffer not decoded correctly");
 	zassert_equal(obj_array_array_ts.objects_array[1].objects.height, 173,
 		      "Pel\303\251 height not decoded correctly");
 
 	zassert_str_equal(obj_array_array_ts.objects_array[2].objects.name,
 			  "Usain Bolt", "String not decoded correctly");
+	zassert_str_equal(obj_array_array_ts.objects_array[2].objects.name_buf,
+			  "Usain", "String buffer not decoded correctly");
 	zassert_equal(obj_array_array_ts.objects_array[2].objects.height, 195,
 		      "Usain Bolt height not decoded correctly");
 }
@@ -490,30 +1041,60 @@ ZTEST(lib_json_test, test_json_obj_arr_encoding)
 {
 	struct obj_array oa = {
 		.elements = {
-			[0] = { .name = "Sim\303\263n Bol\303\255var", .height = 168 },
-			[1] = { .name = "Muggsy Bogues",               .height = 160 },
-			[2] = { .name = "Pel\303\251",                 .height = 173 },
-			[3] = { .name = "Hakeem Olajuwon",             .height = 213 },
-			[4] = { .name = "Alex Honnold",                .height = 180 },
-			[5] = { .name = "Hazel Findlay",               .height = 157 },
-			[6] = { .name = "Daila Ojeda",                 .height = 158 },
-			[7] = { .name = "Albert Einstein",             .height = 172 },
-			[8] = { .name = "Usain Bolt",                  .height = 195 },
-			[9] = { .name = "Paavo Nurmi",                 .height = 174 },
+			[0] = {
+				.name = "Sim\303\263n Bol\303\255var",
+				.name_buf = "Sim\303\263n",
+				.height = 168 },
+			[1] = {
+				.name = "Muggsy Bogues",
+				.name_buf = "Muggsy",
+				.height = 160 },
+			[2] = {
+				.name = "Pel\303\251",
+				.name_buf = "Pel\303\251",
+				.height = 173 },
+			[3] = {
+				.name = "Hakeem Olajuwon",
+				.name_buf = "Hakeem",
+				.height = 213 },
+			[4] = {
+				.name = "Alex Honnold",
+				.name_buf = "Alex",
+				.height = 180 },
+			[5] = {
+				.name = "Hazel Findlay",
+				.name_buf = "Hazel",
+				.height = 157 },
+			[6] = {
+				.name = "Daila Ojeda",
+				.name_buf = "Daila",
+				.height = 158 },
+			[7] = {
+				.name = "Albert Einstein",
+				.name_buf = "Albert",
+				.height = 172 },
+			[8] = {
+				.name = "Usain Bolt",
+				.name_buf = "Usain",
+				.height = 195 },
+			[9] = {
+				.name = "Paavo Nurmi",
+				.name_buf = "Paavo",
+				.height = 174 },
 		},
 		.num_elements = 10,
 	};
 	char encoded[] = "{\"elements\":["
-		"{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		"{\"name\":\"Muggsy Bogues\",\"height\":160},"
-		"{\"name\":\"Pel\303\251\",\"height\":173},"
-		"{\"name\":\"Hakeem Olajuwon\",\"height\":213},"
-		"{\"name\":\"Alex Honnold\",\"height\":180},"
-		"{\"name\":\"Hazel Findlay\",\"height\":157},"
-		"{\"name\":\"Daila Ojeda\",\"height\":158},"
-		"{\"name\":\"Albert Einstein\",\"height\":172},"
-		"{\"name\":\"Usain Bolt\",\"height\":195},"
-		"{\"name\":\"Paavo Nurmi\",\"height\":174}"
+		"{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+		"{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160},"
+		"{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+		"{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213},"
+		"{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180},"
+		"{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157},"
+		"{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158},"
+		"{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172},"
+		"{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195},"
+		"{\"name\":\"Paavo Nurmi\",\"name_buf\":\"Paavo\",\"height\":174}"
 		"]}";
 	char buffer[sizeof(encoded)];
 	int ret;
@@ -529,10 +1110,11 @@ ZTEST(lib_json_test, test_json_arr_obj_decoding)
 {
 	int ret;
 	struct obj_array obj_array_array_ts;
-	char encoded[] = "[{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\"},"
-					"{\"height\":173,\"name\":\"Pel\303\251\"},"
-					"{\"height\":195,\"name\":\"Usain Bolt\"}"
-					"]";
+	char encoded[] = "[{\"height\":168,\"name\":\"Sim\303\263n Bol\303\255var\","
+			 "\"name_buf\":\"Sim\303\263n\"},"
+			 "{\"height\":173,\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\"},"
+			 "{\"height\":195,\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\"}"
+			 "]";
 
 	ret = json_arr_parse(encoded, sizeof(encoded),
 			     obj_array_descr,
@@ -545,16 +1127,23 @@ ZTEST(lib_json_test, test_json_arr_obj_decoding)
 	zassert_str_equal(obj_array_array_ts.elements[0].name,
 			  "Sim\303\263n Bol\303\255var",
 			  "String not decoded correctly");
+	zassert_str_equal(obj_array_array_ts.elements[0].name_buf,
+			  "Sim\303\263n",
+			  "String buffer not decoded correctly");
 	zassert_equal(obj_array_array_ts.elements[0].height, 168,
 		      "Sim\303\263n Bol\303\255var height not decoded correctly");
 
 	zassert_str_equal(obj_array_array_ts.elements[1].name, "Pel\303\251",
 			  "String not decoded correctly");
+	zassert_str_equal(obj_array_array_ts.elements[1].name_buf, "Pel\303\251",
+			  "String buffer not decoded correctly");
 	zassert_equal(obj_array_array_ts.elements[1].height, 173,
 		      "Pel\303\251 height not decoded correctly");
 
 	zassert_str_equal(obj_array_array_ts.elements[2].name, "Usain Bolt",
 			  "String not decoded correctly");
+	zassert_str_equal(obj_array_array_ts.elements[2].name_buf, "Usain",
+			  "String buffer not decoded correctly");
 	zassert_equal(obj_array_array_ts.elements[2].height, 195,
 		      "Usain Bolt height not decoded correctly");
 }
@@ -563,30 +1152,60 @@ ZTEST(lib_json_test, test_json_arr_obj_encoding)
 {
 	struct obj_array oa = {
 		.elements = {
-			[0] = { .name = "Sim\303\263n Bol\303\255var", .height = 168 },
-			[1] = { .name = "Muggsy Bogues",               .height = 160 },
-			[2] = { .name = "Pel\303\251",                 .height = 173 },
-			[3] = { .name = "Hakeem Olajuwon",             .height = 213 },
-			[4] = { .name = "Alex Honnold",                .height = 180 },
-			[5] = { .name = "Hazel Findlay",               .height = 157 },
-			[6] = { .name = "Daila Ojeda",                 .height = 158 },
-			[7] = { .name = "Albert Einstein",             .height = 172 },
-			[8] = { .name = "Usain Bolt",                  .height = 195 },
-			[9] = { .name = "Paavo Nurmi",                 .height = 174 },
+			[0] = {
+				.name = "Sim\303\263n Bol\303\255var",
+				.name_buf = "Sim\303\263n",
+				.height = 168 },
+			[1] = {
+				.name = "Muggsy Bogues",
+				.name_buf = "Muggsy",
+				.height = 160 },
+			[2] = {
+				.name = "Pel\303\251",
+				.name_buf = "Pel\303\251",
+				.height = 173 },
+			[3] = {
+				.name = "Hakeem Olajuwon",
+				.name_buf = "Hakeem",
+				.height = 213 },
+			[4] = {
+				.name = "Alex Honnold",
+				.name_buf = "Alex",
+				.height = 180 },
+			[5] = {
+				.name = "Hazel Findlay",
+				.name_buf = "Hazel",
+				.height = 157 },
+			[6] = {
+				.name = "Daila Ojeda",
+				.name_buf = "Daila",
+				.height = 158 },
+			[7] = {
+				.name = "Albert Einstein",
+				.name_buf = "Albert",
+				.height = 172 },
+			[8] = {
+				.name = "Usain Bolt",
+				.name_buf = "Usain",
+				.height = 195 },
+			[9] = {
+				.name = "Paavo Nurmi",
+				.name_buf = "Paavo",
+				.height = 174 },
 		},
 		.num_elements = 10,
 	};
 	char encoded[] = "["
-		"{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		"{\"name\":\"Muggsy Bogues\",\"height\":160},"
-		"{\"name\":\"Pel\303\251\",\"height\":173},"
-		"{\"name\":\"Hakeem Olajuwon\",\"height\":213},"
-		"{\"name\":\"Alex Honnold\",\"height\":180},"
-		"{\"name\":\"Hazel Findlay\",\"height\":157},"
-		"{\"name\":\"Daila Ojeda\",\"height\":158},"
-		"{\"name\":\"Albert Einstein\",\"height\":172},"
-		"{\"name\":\"Usain Bolt\",\"height\":195},"
-		"{\"name\":\"Paavo Nurmi\",\"height\":174}"
+		"{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+		"{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160},"
+		"{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+		"{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213},"
+		"{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180},"
+		"{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157},"
+		"{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158},"
+		"{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172},"
+		"{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195},"
+		"{\"name\":\"Paavo Nurmi\",\"name_buf\":\"Paavo\",\"height\":174}"
 		"]";
 	char buffer[sizeof(encoded)];
 	int ret;
@@ -605,29 +1224,59 @@ ZTEST(lib_json_test, test_json_obj_arr_decoding)
 {
 	struct obj_array oa;
 	char encoded[] = "{\"elements\":["
-		"{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		"{\"name\":\"Muggsy Bogues\",\"height\":160},"
-		"{\"name\":\"Pel\303\251\",\"height\":173},"
-		"{\"name\":\"Hakeem Olajuwon\",\"height\":213},"
-		"{\"name\":\"Alex Honnold\",\"height\":180},"
-		"{\"name\":\"Hazel Findlay\",\"height\":157},"
-		"{\"name\":\"Daila Ojeda\",\"height\":158},"
-		"{\"name\":\"Albert Einstein\",\"height\":172},"
-		"{\"name\":\"Usain Bolt\",\"height\":195},"
-		"{\"name\":\"Paavo Nurmi\",\"height\":174}"
+		"{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+		"{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160},"
+		"{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+		"{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213},"
+		"{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180},"
+		"{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157},"
+		"{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158},"
+		"{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172},"
+		"{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195},"
+		"{\"name\":\"Paavo Nurmi\",\"name_buf\":\"Paavo\",\"height\":174}"
 		"]}";
 	const struct obj_array expected = {
 		.elements = {
-			[0] = { .name = "Sim\303\263n Bol\303\255var", .height = 168 },
-			[1] = { .name = "Muggsy Bogues",               .height = 160 },
-			[2] = { .name = "Pel\303\251",                 .height = 173 },
-			[3] = { .name = "Hakeem Olajuwon",             .height = 213 },
-			[4] = { .name = "Alex Honnold",                .height = 180 },
-			[5] = { .name = "Hazel Findlay",               .height = 157 },
-			[6] = { .name = "Daila Ojeda",                 .height = 158 },
-			[7] = { .name = "Albert Einstein",             .height = 172 },
-			[8] = { .name = "Usain Bolt",                  .height = 195 },
-			[9] = { .name = "Paavo Nurmi",                 .height = 174 },
+			[0] = {
+				.name = "Sim\303\263n Bol\303\255var",
+				.name_buf = "Sim\303\263n",
+				.height = 168 },
+			[1] = {
+				.name = "Muggsy Bogues",
+				.name_buf = "Muggsy",
+				.height = 160 },
+			[2] = {
+				.name = "Pel\303\251",
+				.name_buf = "Pel\303\251",
+				.height = 173 },
+			[3] = {
+				.name = "Hakeem Olajuwon",
+				.name_buf = "Hakeem",
+				.height = 213 },
+			[4] = {
+				.name = "Alex Honnold",
+				.name_buf = "Alex",
+				.height = 180 },
+			[5] = {
+				.name = "Hazel Findlay",
+				.name_buf = "Hazel",
+				.height = 157 },
+			[6] = {
+				.name = "Daila Ojeda",
+				.name_buf = "Daila",
+				.height = 158 },
+			[7] = {
+				.name = "Albert Einstein",
+				.name_buf = "Albert",
+				.height = 172 },
+			[8] = {
+				.name = "Usain Bolt",
+				.name_buf = "Usain",
+				.height = 195 },
+			[9] = {
+				.name = "Paavo Nurmi",
+				.name_buf = "Paavo",
+				.height = 174 },
 		},
 		.num_elements = 10,
 	};
@@ -659,14 +1308,17 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Sim\303\263n Bol\303\255var",
+						.name_buf = "Sim\303\263n",
 						.height = 168
 					},
 					[1] = {
 						.name = "Pel\303\251",
+						.name_buf = "Pel\303\251",
 						.height = 173
 					},
 					[2] = {
 						.name = "Usain Bolt",
+						.name_buf = "Usain",
 						.height = 195
 					},
 				},
@@ -676,10 +1328,12 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Muggsy Bogues",
+						.name_buf = "Muggsy",
 						.height = 160
 					},
 					[1] = {
 						.name = "Hakeem Olajuwon",
+						.name_buf = "Hakeem",
 						.height = 213
 					},
 				},
@@ -689,18 +1343,22 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Alex Honnold",
+						.name_buf = "Alex",
 						.height = 180
 					},
 					[1] = {
 						.name = "Hazel Findlay",
+						.name_buf = "Hazel",
 						.height = 157
 					},
 					[2] = {
 						.name = "Daila Ojeda",
+						.name_buf = "Daila",
 						.height = 158
 					},
 					[3] = {
 						.name = "Albert Einstein",
+						.name_buf = "Albert",
 						.height = 172
 					},
 				},
@@ -710,15 +1368,15 @@ ZTEST(lib_json_test, test_json_2dim_arr_obj_encoding)
 		.objects_array_array_len = 3,
 	};
 	char encoded[] = "{\"objects_array_array\":["
-		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		 "{\"name\":\"Pel\303\251\",\"height\":173},"
-		 "{\"name\":\"Usain Bolt\",\"height\":195}],"
-		"[{\"name\":\"Muggsy Bogues\",\"height\":160},"
-		 "{\"name\":\"Hakeem Olajuwon\",\"height\":213}],"
-		"[{\"name\":\"Alex Honnold\",\"height\":180},"
-		 "{\"name\":\"Hazel Findlay\",\"height\":157},"
-		 "{\"name\":\"Daila Ojeda\",\"height\":158},"
-		 "{\"name\":\"Albert Einstein\",\"height\":172}]"
+		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+		 "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+		 "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}],"
+		"[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160},"
+		 "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}],"
+		"[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180},"
+		 "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157},"
+		 "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158},"
+		 "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]"
 		"]}";
 	char buffer[sizeof(encoded)];
 	int ret;
@@ -740,14 +1398,17 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Sim\303\263n Bol\303\255var",
+						.name_buf = "Sim\303\263n",
 						.height = 168
 					},
 					[1] = {
 						.name = "Pel\303\251",
+						.name_buf = "Pel\303\251",
 						.height = 173
 					},
 					[2] = {
 						.name = "Usain Bolt",
+						.name_buf = "Usain",
 						.height = 195
 					},
 				},
@@ -757,10 +1418,12 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Muggsy Bogues",
+						.name_buf = "Muggsy",
 						.height = 160
 					},
 					[1] = {
 						.name = "Hakeem Olajuwon",
+						.name_buf = "Hakeem",
 						.height = 213
 					},
 				},
@@ -770,18 +1433,22 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Alex Honnold",
+						.name_buf = "Alex",
 						.height = 180
 					},
 					[1] = {
 						.name = "Hazel Findlay",
+						.name_buf = "Hazel",
 						.height = 157
 					},
 					[2] = {
 						.name = "Daila Ojeda",
+						.name_buf = "Daila",
 						.height = 158
 					},
 					[3] = {
 						.name = "Albert Einstein",
+						.name_buf = "Albert",
 						.height = 172
 					},
 				},
@@ -793,15 +1460,15 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_obj_encoding)
 
 	char encoded[] = "{\"name\":\"Paavo Nurmi\",\"val\":123,"
 		"\"obj_array_2dim\":["
-		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		 "{\"name\":\"Pel\303\251\",\"height\":173},"
-		 "{\"name\":\"Usain Bolt\",\"height\":195}],"
-		"[{\"name\":\"Muggsy Bogues\",\"height\":160},"
-		 "{\"name\":\"Hakeem Olajuwon\",\"height\":213}],"
-		"[{\"name\":\"Alex Honnold\",\"height\":180},"
-		 "{\"name\":\"Hazel Findlay\",\"height\":157},"
-		 "{\"name\":\"Daila Ojeda\",\"height\":158},"
-		 "{\"name\":\"Albert Einstein\",\"height\":172}]"
+		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+		 "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+		 "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}],"
+		"[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160},"
+		 "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}],"
+		"[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180},"
+		 "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157},"
+		 "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158},"
+		 "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]"
 		"]}";
 	char buffer[sizeof(encoded)];
 	int ret;
@@ -823,14 +1490,17 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Sim\303\263n Bol\303\255var",
+						.name_buf = "Sim\303\263n",
 						.height = 168
 					},
 					[1] = {
 						.name = "Pel\303\251",
+						.name_buf = "Pel\303\251",
 						.height = 173
 					},
 					[2] = {
 						.name = "Usain Bolt",
+						.name_buf = "Usain",
 						.height = 195
 					},
 				},
@@ -840,10 +1510,12 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Muggsy Bogues",
+						.name_buf = "Muggsy",
 						.height = 160
 					},
 					[1] = {
 						.name = "Hakeem Olajuwon",
+						.name_buf = "Hakeem",
 						.height = 213
 					},
 				},
@@ -853,18 +1525,22 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding)
 				.elements = {
 					[0] = {
 						.name = "Alex Honnold",
+						.name_buf = "Alex",
 						.height = 180
 					},
 					[1] = {
 						.name = "Hazel Findlay",
+						.name_buf = "Hazel",
 						.height = 157
 					},
 					[2] = {
 						.name = "Daila Ojeda",
+						.name_buf = "Daila",
 						.height = 158
 					},
 					[3] = {
 						.name = "Albert Einstein",
+						.name_buf = "Albert",
 						.height = 172
 					},
 				},
@@ -876,15 +1552,15 @@ ZTEST(lib_json_test, test_json_2dim_arr_extra_named_obj_encoding)
 
 	char encoded[] = "{\"name\":\"Paavo Nurmi\",\"val\":123,"
 		"\"data\":["
-		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		 "{\"name\":\"Pel\303\251\",\"height\":173},"
-		 "{\"name\":\"Usain Bolt\",\"height\":195}],"
-		"[{\"name\":\"Muggsy Bogues\",\"height\":160},"
-		 "{\"name\":\"Hakeem Olajuwon\",\"height\":213}],"
-		"[{\"name\":\"Alex Honnold\",\"height\":180},"
-		 "{\"name\":\"Hazel Findlay\",\"height\":157},"
-		 "{\"name\":\"Daila Ojeda\",\"height\":158},"
-		 "{\"name\":\"Albert Einstein\",\"height\":172}]"
+		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+		 "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+		 "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}],"
+		"[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160},"
+		 "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}],"
+		"[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180},"
+		 "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157},"
+		 "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158},"
+		 "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]"
 		"]}";
 	char buffer[sizeof(encoded)];
 	int ret;
@@ -901,15 +1577,15 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding)
 {
 	struct obj_array_2dim oaa;
 	char encoded[] = "{\"objects_array_array\":["
-		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"height\":168},"
-		 "{\"name\":\"Pel\303\251\",\"height\":173},"
-		 "{\"name\":\"Usain Bolt\",\"height\":195}],"
-		"[{\"name\":\"Muggsy Bogues\",\"height\":160},"
-		 "{\"name\":\"Hakeem Olajuwon\",\"height\":213}],"
-		"[{\"name\":\"Alex Honnold\",\"height\":180},"
-		 "{\"name\":\"Hazel Findlay\",\"height\":157},"
-		 "{\"name\":\"Daila Ojeda\",\"height\":158},"
-		 "{\"name\":\"Albert Einstein\",\"height\":172}]"
+		"[{\"name\":\"Sim\303\263n Bol\303\255var\",\"name_buf\":\"Sim\303\263n\",\"height\":168},"
+		 "{\"name\":\"Pel\303\251\",\"name_buf\":\"Pel\303\251\",\"height\":173},"
+		 "{\"name\":\"Usain Bolt\",\"name_buf\":\"Usain\",\"height\":195}],"
+		"[{\"name\":\"Muggsy Bogues\",\"name_buf\":\"Muggsy\",\"height\":160},"
+		 "{\"name\":\"Hakeem Olajuwon\",\"name_buf\":\"Hakeem\",\"height\":213}],"
+		"[{\"name\":\"Alex Honnold\",\"name_buf\":\"Alex\",\"height\":180},"
+		 "{\"name\":\"Hazel Findlay\",\"name_buf\":\"Hazel\",\"height\":157},"
+		 "{\"name\":\"Daila Ojeda\",\"name_buf\":\"Daila\",\"height\":158},"
+		 "{\"name\":\"Albert Einstein\",\"name_buf\":\"Albert\",\"height\":172}]"
 		"]}";
 	const struct obj_array_2dim expected = {
 		.objects_array_array = {
@@ -917,14 +1593,17 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding)
 				.elements = {
 					[0] = {
 						.name = "Sim\303\263n Bol\303\255var",
+						.name_buf = "Sim\303\263n",
 						.height = 168
 					},
 					[1] = {
 						.name = "Pel\303\251",
+						.name_buf = "Pel\303\251",
 						.height = 173
 					},
 					[2] = {
 						.name = "Usain Bolt",
+						.name_buf = "Usain",
 						.height = 195
 					},
 				},
@@ -934,10 +1613,12 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding)
 				.elements = {
 					[0] = {
 						.name = "Muggsy Bogues",
+						.name_buf = "Muggsy",
 						.height = 160
 					},
 					[1] = {
 						.name = "Hakeem Olajuwon",
+						.name_buf = "Hakeem",
 						.height = 213
 					},
 				},
@@ -947,18 +1628,22 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding)
 				.elements = {
 					[0] = {
 						.name = "Alex Honnold",
+						.name_buf = "Alex",
 						.height = 180
 					},
 					[1] = {
 						.name = "Hazel Findlay",
+						.name_buf = "Hazel",
 						.height = 157
 					},
 					[2] = {
 						.name = "Daila Ojeda",
+						.name_buf = "Daila",
 						.height = 158
 					},
 					[3] = {
 						.name = "Albert Einstein",
+						.name_buf = "Albert",
 						.height = 172
 					},
 				},
@@ -989,6 +1674,9 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding)
 			zassert_true(!strcmp(oaa.objects_array_array[i].elements[j].name,
 					     expected.objects_array_array[i].elements[j].name),
 				     "Element [%d][%d] name not decoded correctly", i, j);
+			zassert_true(!strcmp(oaa.objects_array_array[i].elements[j].name_buf,
+					     expected.objects_array_array[i].elements[j].name_buf),
+				     "Element [%d][%d] name array not decoded correctly", i, j);
 			zassert_equal(oaa.objects_array_array[i].elements[j].height,
 				      expected.objects_array_array[i].elements[j].height,
 				      "Element [%d][%d] height not decoded correctly", i, j);
@@ -996,6 +1684,52 @@ ZTEST(lib_json_test, test_json_2dim_obj_arr_decoding)
 	}
 }
 
+ZTEST(lib_json_test, test_json_string_array_size)
+{
+	int ret;
+	struct elt elt_ts;
+	char encoded[] = "{\"name_buf\":\"a12345678\"}";
+
+	ret = json_obj_parse(encoded, sizeof(encoded),
+			     elt_descr,
+			     ARRAY_SIZE(elt_descr),
+			     &elt_ts);
+
+	/* size of name_buf is 10 */
+	zassert_str_equal(elt_ts.name_buf,
+			  "a12345678", "String not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_string_array_empty)
+{
+	int ret;
+	struct elt elt_ts;
+	char encoded[] = "{\"name_buf\":\"\"}";
+
+	ret = json_obj_parse(encoded, sizeof(encoded),
+			     elt_descr,
+			     ARRAY_SIZE(elt_descr),
+			     &elt_ts);
+
+	/* size of name_buf is 10 */
+	zassert_str_equal(elt_ts.name_buf, "", "String not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_string_array_max)
+{
+	int ret;
+	struct elt elt_ts;
+	char encoded[] = "{\"name_buf\":\"a123456789\"}";
+
+	ret = json_obj_parse(encoded, sizeof(encoded),
+			     elt_descr,
+			     ARRAY_SIZE(elt_descr),
+			     &elt_ts);
+
+	/* string does not fit into name_buf */
+	zassert_equal(ret, -EINVAL, "Decoding has to fail");
+}
+
 struct encoding_test {
 	char *str;
 	int result;
@@ -1362,4 +2096,88 @@ ZTEST(lib_json_test, test_json_array_alignment)
 	zassert_equal(o.array[1].int3, 6, "Element 1 int3 not decoded correctly");
 }
 
+ZTEST(lib_json_test, test_json_array_alignment_bool)
+{
+	char encoded[] = "{\"array\":["
+			 "{\"bool1\":true,\"int1\":1,\"bool2\":false},"
+			 "{\"bool1\":true,\"int1\":2,\"bool2\":false}"
+			 "]}";
+
+	struct test_alignment_bool o = { 0 };
+	int64_t ret = json_obj_parse(encoded, sizeof(encoded) - 1, alignment_bool_descr,
+				     ARRAY_SIZE(alignment_bool_descr), &o);
+
+	zassert_false(ret < 0, "json_obj_parse returned error %d", ret);
+	zassert_equal(o.num_elements, 2, "Number of elements not decoded correctly");
+
+	zassert_equal(o.array[0].bool1, true, "Element 0 bool1 not decoded correctly");
+	zassert_equal(o.array[0].int1, 1, "Element 0 int1 not decoded correctly");
+	zassert_equal(o.array[0].bool2, false, "Element 0 bool2 not decoded correctly");
+
+	zassert_equal(o.array[1].bool1, true, "Element 1 bool1 not decoded correctly");
+	zassert_equal(o.array[1].int1, 2, "Element 1 int1 not decoded correctly");
+	zassert_equal(o.array[1].bool2, false, "Element 1 bool2 not decoded correctly");
+}
+
+ZTEST(lib_json_test, test_json_invalid_int)
+{
+	struct sub_test {
+		char str[30];
+		int result;
+	};
+	struct sub_test encoded[] = {
+		{ "{\"int8_cero\":128}", -EINVAL },
+		{ "{\"int8_cero\":-129}", -EINVAL },
+		{ "{\"uint8_cero\":257}", -EINVAL },
+		{ "{\"int16_cero\":32768}", -EINVAL },
+		{ "{\"int16_cero\":-32769}", -EINVAL },
+		{ "{\"uint16_cero\":65536}", -EINVAL },
+	};
+
+	struct test_int_limits ts;
+	int ret;
+
+	for (int i = 0; i < ARRAY_SIZE(encoded); i++) {
+		ret = json_obj_parse(encoded[i].str, strlen(encoded[i].str),
+				     obj_limits_descr, ARRAY_SIZE(obj_limits_descr), &ts);
+		zassert_equal(ret, encoded[i].result,
+			      "Decoding '%s' result %d, expected %d",
+			      encoded[i].str, ret, encoded[i].result);
+	}
+}
+
+ZTEST(lib_json_test, test_json_enums)
+{
+	int ret = 0;
+	char encoded[] = "{\"i8\":-128,"
+			 "\"u8\":255,"
+			 "\"i16\":-32768,"
+			 "\"u16\":65535,"
+			 "\"i32\":-2147483648,"
+			 "\"u32\":4294967295"
+			 "}";
+
+	struct test_enums enums = {
+		.i8 = I8_MIN,
+		.u8 = U8_MAX,
+		.i16 = I16_MIN,
+		.u16 = U16_MAX,
+		.i32 = I32_MIN,
+		.u32 = U32_MAX,
+	};
+
+	char buffer[sizeof(encoded)];
+	struct test_enums enums_decoded = {0};
+
+	ret = json_obj_encode_buf(enums_descr, ARRAY_SIZE(enums_descr),
+				&enums, buffer, sizeof(buffer));
+	ret = json_obj_parse(encoded, sizeof(encoded) - 1, enums_descr,
+			     ARRAY_SIZE(enums_descr), &enums_decoded);
+
+	zassert_str_equal(encoded, buffer,
+			  "Enums not encoded correctly");
+	zassert_true(!memcmp(&enums, &enums_decoded, sizeof(enums)),
+		     "Enums not decoded correctly");
+}
+
 ZTEST_SUITE(lib_json_test, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/lib/math/interpolation/testcase.yaml b/tests/lib/math/interpolation/testcase.yaml
index fd3eafb51dfa2..94eff1a469dce 100644
--- a/tests/lib/math/interpolation/testcase.yaml
+++ b/tests/lib/math/interpolation/testcase.yaml
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 tests:
-  math.interpolation:
+  utilities.math.interpolation:
     integration_platforms:
       - native_sim
diff --git a/tests/lib/mem_alloc/src/main.c b/tests/lib/mem_alloc/src/main.c
index d71835f7b6469..9cabe4367334f 100644
--- a/tests/lib/mem_alloc/src/main.c
+++ b/tests/lib/mem_alloc/src/main.c
@@ -16,22 +16,20 @@
  * it guarantee that ALL functionality provided is working correctly.
  */
 
-#if defined(__GNUC__)
-/*
- * Don't complain about ridiculous alloc size requests
- */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Walloc-size-larger-than="
-#endif
-
 #define _BSD_SOURCE
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
+#include <zephyr/test_toolchain.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <time.h>
 #include <stdint.h>
 
+/*
+ * Don't complain about ridiculous alloc size requests
+ */
+TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_ALLOC_SIZE_LARGER_THAN)
+
 #define TOO_BIG PTRDIFF_MAX
 
 /**
diff --git a/tests/lib/mpsc_pbuf/testcase.yaml b/tests/lib/mpsc_pbuf/testcase.yaml
index 50d9722e42642..98b18f64d3a3b 100644
--- a/tests/lib/mpsc_pbuf/testcase.yaml
+++ b/tests/lib/mpsc_pbuf/testcase.yaml
@@ -15,7 +15,6 @@ tests:
       - qemu_x86
       - qemu_x86_64
       - qemu_xtensa/dc233c
-      - native_posix
       - native_sim
     integration_platforms:
       - native_sim
diff --git a/tests/lib/multi_heap/src/test_mheap.h b/tests/lib/multi_heap/src/test_mheap.h
index 99749e5b9146b..a8b238cf591ac 100644
--- a/tests/lib/multi_heap/src/test_mheap.h
+++ b/tests/lib/multi_heap/src/test_mheap.h
@@ -7,5 +7,5 @@
 #define TIMEOUT 2000
 #define BLK_SIZE_MIN 64
 #define BLK_SIZE_MAX (BLK_SIZE_MIN << 2)
-#define BLK_NUM_MAX (CONFIG_HEAP_MEM_POOL_SIZE / BLK_SIZE_MIN)
-#define BLK_NUM_MIN (CONFIG_HEAP_MEM_POOL_SIZE / (BLK_SIZE_MIN << 2))
+#define BLK_NUM_MAX (K_HEAP_MEM_POOL_SIZE / BLK_SIZE_MIN)
+#define BLK_NUM_MIN (K_HEAP_MEM_POOL_SIZE / (BLK_SIZE_MIN << 2))
diff --git a/tests/lib/multi_heap/src/test_mheap_api.c b/tests/lib/multi_heap/src/test_mheap_api.c
index 9c1a4210ed6b0..1fba3b1b7e754 100644
--- a/tests/lib/multi_heap/src/test_mheap_api.c
+++ b/tests/lib/multi_heap/src/test_mheap_api.c
@@ -10,11 +10,13 @@
 #include <zephyr/sys/multi_heap.h>
 #include "test_mheap.h"
 
-#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
+#define MALLOC_IN_THREAD_STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
+#define INCREMENTAL_FILL_STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE + \
+				     (BLK_NUM_MAX * sizeof(void *) * 2))
 #define OVERFLOW_SIZE    SIZE_MAX
 
 #define NMEMB   8
-#define SIZE    16
+#define SIZE    (K_HEAP_MEM_POOL_SIZE / NMEMB / 2)
 #define BOUNDS  (NMEMB * SIZE)
 
 #define N_MULTI_HEAPS 4
@@ -24,48 +26,17 @@ static struct sys_multi_heap multi_heap;
 static char heap_mem[N_MULTI_HEAPS][MHEAP_BYTES];
 static struct sys_heap mheaps[N_MULTI_HEAPS];
 
-K_SEM_DEFINE(thread_sem, 0, 1);
-K_THREAD_STACK_DEFINE(tstack, STACK_SIZE);
-struct k_thread tdata;
+K_SEM_DEFINE(malloc_in_thread_sem, 0, 1);
+K_THREAD_STACK_DEFINE(malloc_in_thread_tstack, MALLOC_IN_THREAD_STACK_SIZE);
+struct k_thread malloc_in_thread_tdata;
 
-static void tIsr_malloc_and_free(void *data)
-{
-	ARG_UNUSED(data);
-	void *ptr;
+K_THREAD_STACK_DEFINE(malloc_free_tstack, INCREMENTAL_FILL_STACK_SIZE);
+struct k_thread malloc_free_tdata;
 
-	ptr = (char *)z_thread_malloc(BLK_SIZE_MIN);
-	zassert_not_null(ptr, "bytes allocation failed from system pool");
-	k_free(ptr);
-}
-
-static void thread_entry(void *p1, void *p2, void *p3)
-{
-	void *ptr;
-
-	k_current_get()->resource_pool = NULL;
+K_THREAD_STACK_DEFINE(realloc_tstack, INCREMENTAL_FILL_STACK_SIZE);
+struct k_thread realloc_tdata;
 
-	ptr = (char *)z_thread_malloc(BLK_SIZE_MIN);
-	zassert_is_null(ptr, "bytes allocation failed from system pool");
-
-	k_sem_give(&thread_sem);
-}
-
-/*test cases*/
-
-/**
- * @brief Test to demonstrate k_malloc() and k_free() API usage
- *
- * @ingroup kernel_heap_tests
- *
- * @details The test allocates 4 blocks from heap memory pool
- * using k_malloc() API. It also tries to allocate a block of size
- * 64 bytes which fails as all the memory is allocated up. It then
- * validates k_free() API by freeing up all the blocks which were
- * allocated from the heap memory.
- *
- * @see k_malloc()
- */
-ZTEST(mheap_api, test_mheap_malloc_free)
+static void malloc_free_handler(void *p1, void *p2, void *p3)
 {
 	void *block[2 * BLK_NUM_MAX], *block_fail;
 	int nb;
@@ -101,7 +72,29 @@ ZTEST(mheap_api, test_mheap_malloc_free)
 	zassert_is_null(block_fail, NULL);
 }
 
-ZTEST(mheap_api, test_mheap_realloc)
+static void tIsr_malloc_and_free(void *data)
+{
+	ARG_UNUSED(data);
+	void *ptr;
+
+	ptr = (char *)z_thread_malloc(BLK_SIZE_MIN);
+	zassert_not_null(ptr, "bytes allocation failed from system pool");
+	k_free(ptr);
+}
+
+static void malloc_in_thread_handler(void *p1, void *p2, void *p3)
+{
+	void *ptr;
+
+	k_current_get()->resource_pool = NULL;
+
+	ptr = (char *)z_thread_malloc(BLK_SIZE_MIN);
+	zassert_is_null(ptr, "bytes allocation failed from system pool");
+
+	k_sem_give(&malloc_in_thread_sem);
+}
+
+static void realloc_handler(void *p1, void *p2, void *p3)
 {
 	void *block1, *block2;
 	size_t nb;
@@ -126,6 +119,18 @@ ZTEST(mheap_api, test_mheap_realloc)
 		}
 	}
 
+	/* For boards whose subsystems use the heap and leave holes, deplete
+	 * remaining memory using k_malloc
+	 */
+	void *holes[BLK_NUM_MAX * 2];
+
+	for (int i = 0; i < (BLK_NUM_MAX * 2); i++) {
+		holes[i] = k_malloc(BLK_SIZE_MIN);
+		if (holes[i] == NULL) {
+			break;
+		}
+	}
+
 	/* Allocate buffer2 when the heap has been depleted */
 	block2 = k_realloc(NULL, BLK_SIZE_MIN);
 	/* Should fail and return NULL */
@@ -160,6 +165,61 @@ ZTEST(mheap_api, test_mheap_realloc)
 	/* Free block1 with k_realloc() this time */
 	block1 = k_realloc(block1, 0);
 	zassert_is_null(block1);
+
+	/* Free holes */
+	for (int i = 0; i < (BLK_NUM_MAX * 2); i++) {
+		if (holes[i] == NULL) {
+			break;
+		}
+		k_free(holes[i]);
+	}
+}
+
+/*test cases*/
+
+/**
+ * @brief Test to demonstrate k_malloc() and k_free() API usage
+ *
+ * @ingroup kernel_heap_tests
+ *
+ * @details The test allocates 4 blocks from heap memory pool
+ * using k_malloc() API. It also tries to allocate a block of size
+ * 64 bytes which fails as all the memory is allocated up. It then
+ * validates k_free() API by freeing up all the blocks which were
+ * allocated from the heap memory.
+ *
+ * @see k_malloc()
+ */
+ZTEST(mheap_api, test_mheap_malloc_free)
+{
+	if (!IS_ENABLED(CONFIG_MULTITHREADING)) {
+		return;
+	}
+
+	k_tid_t tid = k_thread_create(&malloc_free_tdata, malloc_free_tstack,
+				 INCREMENTAL_FILL_STACK_SIZE,
+				 malloc_free_handler,
+				 NULL, NULL, NULL,
+				 K_PRIO_PREEMPT(1), 0, K_NO_WAIT);
+
+	k_thread_join(tid, K_FOREVER);
+}
+
+
+
+ZTEST(mheap_api, test_mheap_realloc)
+{
+	if (!IS_ENABLED(CONFIG_MULTITHREADING)) {
+		return;
+	}
+
+	k_tid_t tid = k_thread_create(&realloc_tdata, realloc_tstack,
+				 INCREMENTAL_FILL_STACK_SIZE,
+				 realloc_handler,
+				 NULL, NULL, NULL,
+				 K_PRIO_PREEMPT(1), 0, K_NO_WAIT);
+
+	k_thread_join(tid, K_FOREVER);
 }
 
 /**
@@ -256,7 +316,7 @@ ZTEST(mheap_api, test_sys_heap_mem_pool_assign)
 	zassert_not_null(ptr, "bytes allocation failed from system pool");
 	k_free(ptr);
 
-	zassert_is_null((char *)z_thread_malloc(BLK_SIZE_MAX * 2),
+	zassert_is_null((char *)z_thread_malloc(K_HEAP_MEM_POOL_SIZE * 2),
 						"overflow check failed");
 }
 
@@ -297,11 +357,12 @@ ZTEST(mheap_api, test_malloc_in_thread)
 		return;
 	}
 
-	k_tid_t tid = k_thread_create(&tdata, tstack, STACK_SIZE,
-			      thread_entry, NULL, NULL, NULL,
-			      0, 0, K_NO_WAIT);
+	k_tid_t tid = k_thread_create(&malloc_in_thread_tdata, malloc_in_thread_tstack,
+				 MALLOC_IN_THREAD_STACK_SIZE, malloc_in_thread_handler,
+				 NULL, NULL, NULL,
+				 0, 0, K_NO_WAIT);
 
-	k_sem_take(&thread_sem, K_FOREVER);
+	k_sem_take(&malloc_in_thread_sem, K_FOREVER);
 
 	k_thread_abort(tid);
 }
diff --git a/tests/lib/multi_heap/src/test_mheap_concept.c b/tests/lib/multi_heap/src/test_mheap_concept.c
index 6dd7bca956c08..8821f4d3587a7 100644
--- a/tests/lib/multi_heap/src/test_mheap_concept.c
+++ b/tests/lib/multi_heap/src/test_mheap_concept.c
@@ -7,17 +7,45 @@
 #include <zephyr/ztest.h>
 #include "test_mheap.h"
 
-#define THREAD_NUM 3
-#define BLOCK_SIZE 16
-#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
+#define THREADSAFE_THREAD_NUM 3
+#define THREADSAFE_BLOCK_SIZE 16
+#define THREADSAFE_STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)
+#define MALLOC_ALIGN4_STACK_SIZE (512 + (BLK_NUM_MAX * sizeof(void *)))
 
-struct k_sem sync_sema;
-static K_THREAD_STACK_ARRAY_DEFINE(tstack, THREAD_NUM, STACK_SIZE);
-static struct k_thread tdata[THREAD_NUM];
-static void *pool_blocks[BLK_NUM_MAX];
+struct k_sem threadsafe_sema;
+static K_THREAD_STACK_ARRAY_DEFINE(threadsafe_tstack, THREADSAFE_THREAD_NUM, THREADSAFE_STACK_SIZE);
+static struct k_thread threadsafe_tdata[THREADSAFE_THREAD_NUM];
+
+static void *threadsafe_pool_blocks[BLK_NUM_MAX];
+
+static K_THREAD_STACK_DEFINE(malloc_align4_tstack, MALLOC_ALIGN4_STACK_SIZE);
+static struct k_thread malloc_align4_tdata;
 
 /*test cases*/
 
+static void tmheap_malloc_align4_handler(void *p1, void *p2, void *p3)
+{
+	void *block[BLK_NUM_MAX];
+	int i;
+
+	/**
+	 * TESTPOINT: The address of the allocated chunk is guaranteed to be
+	 * aligned on a word boundary (4 or 8 bytes).
+	 */
+	for (i = 0; i < BLK_NUM_MAX; i++) {
+		block[i] = k_malloc(i);
+		if (block[i] == NULL) {
+			break;
+		}
+		zassert_false((uintptr_t)block[i] % sizeof(void *));
+	}
+
+	/* test case tear down*/
+	for (int j = 0; j < i; j++) {
+		k_free(block[j]);
+	}
+}
+
 /**
  * @brief The test validates k_calloc() API.
  *
@@ -33,33 +61,28 @@ static void *pool_blocks[BLK_NUM_MAX];
  */
 ZTEST(mheap_api, test_mheap_malloc_align4)
 {
-	void *block[BLK_NUM_MAX];
-
-	/**
-	 * TESTPOINT: The address of the allocated chunk is guaranteed to be
-	 * aligned on a word boundary (4 or 8 bytes).
-	 */
-	for (int i = 0; i < BLK_NUM_MAX; i++) {
-		block[i] = k_malloc(i);
-		zassert_not_null(block[i], NULL);
-		zassert_false((uintptr_t)block[i] % sizeof(void *));
+	if (!IS_ENABLED(CONFIG_MULTITHREADING)) {
+		return;
 	}
 
-	/* test case tear down*/
-	for (int i = 0; i < BLK_NUM_MAX; i++) {
-		k_free(block[i]);
-	}
+	k_tid_t tid = k_thread_create(&malloc_align4_tdata, malloc_align4_tstack,
+				 MALLOC_ALIGN4_STACK_SIZE,
+				 tmheap_malloc_align4_handler,
+				 NULL, NULL, NULL,
+				 K_PRIO_PREEMPT(1), 0, K_NO_WAIT);
+
+	k_thread_join(tid, K_FOREVER);
 }
 
-static void tmheap_handler(void *p1, void *p2, void *p3)
+static void tmheap_threadsafe_handler(void *p1, void *p2, void *p3)
 {
 	int thread_id = POINTER_TO_INT(p1);
 
-	pool_blocks[thread_id] = k_malloc(BLOCK_SIZE);
+	threadsafe_pool_blocks[thread_id] = k_malloc(THREADSAFE_BLOCK_SIZE);
 
-	zassert_not_null(pool_blocks[thread_id], "memory is not allocated");
+	zassert_not_null(threadsafe_pool_blocks[thread_id], "memory is not allocated");
 
-	k_sem_give(&sync_sema);
+	k_sem_give(&threadsafe_sema);
 }
 
 /**
@@ -78,24 +101,25 @@ ZTEST(mheap_api, test_mheap_threadsafe)
 		return;
 	}
 
-	k_tid_t tid[THREAD_NUM];
+	k_tid_t tid[THREADSAFE_THREAD_NUM];
 
-	k_sem_init(&sync_sema, 0, THREAD_NUM);
+	k_sem_init(&threadsafe_sema, 0, THREADSAFE_THREAD_NUM);
 
 	/* create multiple threads to invoke same memory heap APIs*/
-	for (int i = 0; i < THREAD_NUM; i++) {
-		tid[i] = k_thread_create(&tdata[i], tstack[i], STACK_SIZE,
-					 tmheap_handler, INT_TO_POINTER(i), NULL, NULL,
+	for (int i = 0; i < THREADSAFE_THREAD_NUM; i++) {
+		tid[i] = k_thread_create(&threadsafe_tdata[i], threadsafe_tstack[i],
+					 THREADSAFE_STACK_SIZE, tmheap_threadsafe_handler,
+					 INT_TO_POINTER(i), NULL, NULL,
 					 K_PRIO_PREEMPT(1), 0, K_NO_WAIT);
 	}
 
-	for (int i = 0; i < THREAD_NUM; i++) {
-		k_sem_take(&sync_sema, K_FOREVER);
+	for (int i = 0; i < THREADSAFE_THREAD_NUM; i++) {
+		k_sem_take(&threadsafe_sema, K_FOREVER);
 	}
 
-	for (int i = 0; i < THREAD_NUM; i++) {
+	for (int i = 0; i < THREADSAFE_THREAD_NUM; i++) {
 		/* verify free mheap in main thread */
-		k_free(pool_blocks[i]);
+		k_free(threadsafe_pool_blocks[i]);
 		k_thread_abort(tid[i]);
 	}
 }
diff --git a/tests/lib/p4workq/prj.conf b/tests/lib/p4workq/prj.conf
index 3e0283ee44674..43f8cf322ded3 100644
--- a/tests/lib/p4workq/prj.conf
+++ b/tests/lib/p4workq/prj.conf
@@ -4,4 +4,4 @@ CONFIG_SCHED_DEADLINE=y
 CONFIG_LOG_DEFAULT_LEVEL=1
 # Test whiteboxes the wait_q and expects it to be a dlist
 CONFIG_WAITQ_SCALABLE=n
-CONFIG_WAITQ_DUMB=y
+CONFIG_WAITQ_SIMPLE=y
diff --git a/tests/lib/ringbuffer/src/concurrent.c b/tests/lib/ringbuffer/src/concurrent.c
index 60e9aa1c263b6..913109aa60ff6 100644
--- a/tests/lib/ringbuffer/src/concurrent.c
+++ b/tests/lib/ringbuffer/src/concurrent.c
@@ -262,7 +262,7 @@ static void test_ztress(ztress_handler high_handler,
 		uint32_t buf32[32];
 	} buf;
 	k_timeout_t timeout;
-	int32_t offset;
+	uint32_t offset;
 
 	if (item_mode) {
 		ring_buf_item_init(&ringbuf, ARRAY_SIZE(buf.buf32), buf.buf32);
@@ -270,8 +270,8 @@ static void test_ztress(ztress_handler high_handler,
 		ring_buf_init(&ringbuf, ARRAY_SIZE(buf.buf8), buf.buf8);
 	}
 
-	/* force internal 32-bit index roll-over */
-	offset = INT32_MAX - ring_buf_capacity_get(&ringbuf)/2;
+	/* force internal index roll-over */
+	offset = (ring_buf_idx_t)-1 - ring_buf_capacity_get(&ringbuf)/2;
 	ring_buf_internal_reset(&ringbuf, offset);
 
 	/* Timeout after 5 seconds. */
diff --git a/tests/lib/sprintf/src/main.c b/tests/lib/sprintf/src/main.c
index 8395be690ffb7..d91c2d891f394 100644
--- a/tests/lib/sprintf/src/main.c
+++ b/tests/lib/sprintf/src/main.c
@@ -12,6 +12,7 @@
  */
 
 #include <zephyr/ztest.h>
+#include <zephyr/test_toolchain.h>
 #include <stdio.h>
 #include <stdarg.h>
 
@@ -499,7 +500,6 @@ ZTEST(sprintf, test_vsprintf)
 
 ZTEST(sprintf, test_snprintf)
 {
-#if defined(__GNUC__) && __GNUC__ >= 7
 	/*
 	 * GCC 7 and newer are smart enough to realize that in the statements
 	 * below, the output will not fit in 0 or 4 bytes, but that it requires
@@ -508,9 +508,7 @@ ZTEST(sprintf, test_snprintf)
 	 * actually testing that snprintf's return value is what it should be
 	 * while truncating the output. So let's suppress this warning here.
 	 */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-truncation"
-#endif
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_FORMAT_TRUNCATION);
 
 	int len;
 	char buffer[100];
@@ -535,9 +533,7 @@ ZTEST(sprintf, test_snprintf)
 		     "snprintf(%%x).  Expected '%s', got '%s'\n",
 		     "dea", buffer);
 
-#if defined(__GNUC__) && __GNUC__ >= 7
-#pragma GCC diagnostic pop
-#endif
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_FORMAT_TRUNCATION);
 }
 
 /**
diff --git a/tests/lib/time/testcase.yaml b/tests/lib/time/testcase.yaml
index bf949559f03cb..89e04c825f0a7 100644
--- a/tests/lib/time/testcase.yaml
+++ b/tests/lib/time/testcase.yaml
@@ -4,6 +4,3 @@ tests:
     timeout: 180
     integration_platforms:
       - mps2/an385
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
diff --git a/tests/lib/uuid/CMakeLists.txt b/tests/lib/uuid/CMakeLists.txt
new file mode 100644
index 0000000000000..e08cac8aab082
--- /dev/null
+++ b/tests/lib/uuid/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(uuid)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/lib/uuid/prj.conf b/tests/lib/uuid/prj.conf
new file mode 100644
index 0000000000000..0f507ccdffa5c
--- /dev/null
+++ b/tests/lib/uuid/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_ZTEST=y
+CONFIG_UUID=y
diff --git a/tests/lib/uuid/src/main.c b/tests/lib/uuid/src/main.c
new file mode 100644
index 0000000000000..b8607767e40a6
--- /dev/null
+++ b/tests/lib/uuid/src/main.c
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2025, SECO Mind Srl
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/ztest.h>
+#include <zephyr/sys/uuid.h>
+
+#ifdef CONFIG_UUID_V4
+ZTEST(uuid, test_uuid_v4)
+{
+	struct uuid gen_uuid = {0};
+
+	int result = uuid_generate_v4(&gen_uuid);
+	/* Check version and variant fields */
+	zassert_true(result == 0, "uuid_generate_v4 returned an error");
+	zassert_equal(gen_uuid.val[6U] >> 4U, 4U,
+		      "Generated UUID v4 contains an incorrect 'ver' field");
+	zassert_equal(gen_uuid.val[8U] >> 6U, 2U,
+		      "Generated UUID v4 contains an incorrect 'var' field");
+}
+#else
+ZTEST(uuid, test_uuid_v4)
+{
+	ztest_test_skip();
+}
+#endif
+
+#ifdef CONFIG_UUID_V5
+ZTEST(uuid, test_uuid_v5)
+{
+	struct uuid namespace;
+	int result;
+	struct uuid gen_uuid;
+	char uuid_str[UUID_STR_LEN];
+
+	result = uuid_from_string("6ba7b810-9dad-11d1-80b4-00c04fd430c8", &namespace);
+	zassert_true(result == 0, "uuid_from_string returned an error");
+	result = uuid_generate_v5(&namespace, "www.example.com", 15, &gen_uuid);
+	zassert_true(result == 0, "uuid_generate_v5 returned an error");
+	result = uuid_to_string(&gen_uuid, uuid_str);
+	zassert_true(result == 0, "uuid_to_string returned an error");
+	zassert_str_equal("2ed6657d-e927-568b-95e1-2665a8aea6a2", uuid_str,
+			  "uuid_str != 2ed6657d-e927-568b-95e1-2665a8aea6a2");
+}
+#else
+ZTEST(uuid, test_uuid_v5)
+{
+	ztest_test_skip();
+}
+#endif
+
+ZTEST(uuid, test_uuid_copy)
+{
+	int result;
+	const char *data_str = "6ba7b810-9dad-11d1-80b4-00c04fd430c8";
+	struct uuid data;
+	struct uuid out;
+	char out_str[UUID_STR_LEN] = {0};
+
+	result = uuid_from_string(data_str, &data);
+	zassert_true(result == 0, "uuid_from_string returned an error");
+	result = uuid_copy(&data, &out);
+	zassert_true(result == 0, "uuid_copy returned an error");
+	result = uuid_to_string(&out, out_str);
+	zassert_true(result == 0, "uuid_to_string returned an error");
+	zassert_str_equal(out_str, data_str, "Expected %s, gotten: %s", data_str, out_str);
+}
+
+ZTEST(uuid, test_uuid_from_buffer)
+{
+	uint8_t uuid_buffer[UUID_SIZE] = {0x44, 0xb3, 0x5f, 0x73, 0xcf, 0xbd, 0x43, 0xb4,
+					  0x8f, 0xef, 0xca, 0x7b, 0xae, 0xa1, 0x37, 0x5f};
+	struct uuid gen_uuid;
+	char uuid_string[UUID_STR_LEN] = {0};
+	const char *expected_uuid_string = "44b35f73-cfbd-43b4-8fef-ca7baea1375f";
+	int res;
+
+	res = uuid_from_buffer(uuid_buffer, &gen_uuid);
+	zassert_equal(0, res, "uuid_from_buffer returned an error");
+	res = uuid_to_string(&gen_uuid, uuid_string);
+	zassert_equal(0, res, "uuid_to_string returned an error");
+	zassert_str_equal(expected_uuid_string, uuid_string, "expected %s", expected_uuid_string);
+}
+
+ZTEST(uuid, test_uuid_from_string)
+{
+	const char *first_uuid_v4_string = "44b35f73-cfbd-43b4-8fef-ca7baea1375f";
+	const char *second_uuid_v4_string = "6f2fd4cb-94a0-41c7-8d27-864c6b13b8c0";
+	const char *third_uuid_v4_string = "8f65dbbc-5868-4015-8523-891cc0bffa58";
+	const char *first_uuid_v5_string = "0575a569-51eb-575c-afe4-ce7fc03bcdc5";
+
+	struct uuid first_uuid_v4;
+	struct uuid second_uuid_v4;
+	struct uuid third_uuid_v4;
+	struct uuid first_uuid_v5;
+
+	uint8_t expected_first_uuid_v4_byte_array[UUID_SIZE] = {0x44, 0xb3, 0x5f, 0x73, 0xcf, 0xbd,
+								0x43, 0xb4, 0x8f, 0xef, 0xca, 0x7b,
+								0xae, 0xa1, 0x37, 0x5f};
+	uint8_t expected_second_uuid_v4_byte_array[UUID_SIZE] = {0x6f, 0x2f, 0xd4, 0xcb, 0x94, 0xa0,
+								 0x41, 0xc7, 0x8d, 0x27, 0x86, 0x4c,
+								 0x6b, 0x13, 0xb8, 0xc0};
+	uint8_t expected_third_uuid_v4_byte_array[UUID_SIZE] = {0x8f, 0x65, 0xdb, 0xbc, 0x58, 0x68,
+								0x40, 0x15, 0x85, 0x23, 0x89, 0x1c,
+								0xc0, 0xbf, 0xfa, 0x58};
+	uint8_t expected_first_uuid_v5_byte_array[UUID_SIZE] = {0x05, 0x75, 0xa5, 0x69, 0x51, 0xeb,
+								0x57, 0x5c, 0xaf, 0xe4, 0xce, 0x7f,
+								0xc0, 0x3b, 0xcd, 0xc5};
+
+	int res;
+
+	res = uuid_from_string(first_uuid_v4_string, &first_uuid_v4);
+	zassert_equal(0, res, "uuid_from_string returned an error");
+	zassert_mem_equal(first_uuid_v4.val, expected_first_uuid_v4_byte_array, UUID_SIZE,
+			  "first_uuid != from expected value");
+
+	res = uuid_from_string(second_uuid_v4_string, &second_uuid_v4);
+	zassert_equal(0, res, "uuid_from_string returned an error");
+	zassert_mem_equal(second_uuid_v4.val, expected_second_uuid_v4_byte_array, UUID_SIZE,
+			  "second_uuid != from expected value");
+
+	res = uuid_from_string(third_uuid_v4_string, &third_uuid_v4);
+	zassert_equal(0, res, "uuid_from_string returned an error");
+	zassert_mem_equal(third_uuid_v4.val, expected_third_uuid_v4_byte_array, UUID_SIZE,
+			  "third_uuid != from expected value");
+
+	res = uuid_from_string(first_uuid_v5_string, &first_uuid_v5);
+	zassert_equal(0, res, "uuid_from_string returned an error");
+	zassert_mem_equal(first_uuid_v5.val, expected_first_uuid_v5_byte_array, UUID_SIZE,
+			  "uuid_v5 != from expected value");
+}
+
+ZTEST(uuid, test_uuid_from_string_errors)
+{
+	const char *uuid_string_missing_hyphen = "44b35f73-cfbd-43b4-8fef0ca7baea1375f";
+	const char *uuid_string_non_hex_digit = "44b35f73-cfLd-43b4-8fef-ca7baea1375f";
+
+	int res;
+	struct uuid gen_uuid;
+
+	res = uuid_from_string(NULL, &gen_uuid);
+	zassert_equal(-EINVAL, res, "uuid_from_string returned incorrect error");
+
+	res = uuid_from_string(uuid_string_missing_hyphen, &gen_uuid);
+	zassert_equal(-EINVAL, res, "uuid_from_string returned incorrect error");
+
+	res = uuid_from_string(uuid_string_non_hex_digit, &gen_uuid);
+	zassert_equal(-EINVAL, res, "uuid_from_string returned incorrect error");
+}
+
+ZTEST(uuid, test_uuid_to_buffer)
+{
+	int result;
+	const char *input_str = "44b35f73-cfbd-43b4-8fef-ca7baea1375f";
+	struct uuid input;
+	uint8_t buffer[UUID_SIZE] = {0};
+	uint8_t expected_buffer[UUID_SIZE] = {0x44, 0xb3, 0x5f, 0x73, 0xcf, 0xbd, 0x43, 0xb4,
+					      0x8f, 0xef, 0xca, 0x7b, 0xae, 0xa1, 0x37, 0x5f};
+
+	result = uuid_from_string(input_str, &input);
+	zassert_true(result == 0, "uuid_from_string returned an error");
+	result = uuid_to_buffer(&input, buffer);
+	zassert_true(result == 0, "uuid_to_buffer returned an error");
+	zassert_mem_equal(buffer, expected_buffer, UUID_SIZE,
+			  "Incorrect buffer converted to buffer");
+}
+
+ZTEST(uuid, test_uuid_to_string)
+{
+	struct uuid first_uuid_v4 = {.val = {0x44, 0xb3, 0x5f, 0x73, 0xcf, 0xbd, 0x43, 0xb4, 0x8f,
+					     0xef, 0xca, 0x7b, 0xae, 0xa1, 0x37, 0x5f}};
+	struct uuid second_uuid_v4 = {.val = {0x6f, 0x2f, 0xd4, 0xcb, 0x94, 0xa0, 0x41, 0xc7, 0x8d,
+					      0x27, 0x86, 0x4c, 0x6b, 0x13, 0xb8, 0xc0}};
+	struct uuid first_uuid_v5 = {.val = {0x05, 0x75, 0xa5, 0x69, 0x51, 0xeb, 0x57, 0x5c, 0xaf,
+					     0xe4, 0xce, 0x7f, 0xc0, 0x3b, 0xcd, 0xc5}};
+
+	char first_uuid_v4_string[UUID_STR_LEN];
+	char second_uuid_v4_string[UUID_STR_LEN];
+	char first_uuid_v5_string[UUID_STR_LEN];
+
+	const char *expected_first_uuid_v4_string = "44b35f73-cfbd-43b4-8fef-ca7baea1375f";
+	const char *expected_second_uuid_v4_string = "6f2fd4cb-94a0-41c7-8d27-864c6b13b8c0";
+	const char *expected_first_uuid_v5_string = "0575a569-51eb-575c-afe4-ce7fc03bcdc5";
+
+	int err;
+
+	err = uuid_to_string(&first_uuid_v4, first_uuid_v4_string);
+	zassert_equal(0, err, "uuid_to_string returned an error");
+	zassert_str_equal(expected_first_uuid_v4_string, first_uuid_v4_string, "expected %s",
+			  expected_first_uuid_v4_string);
+
+	err = uuid_to_string(&second_uuid_v4, second_uuid_v4_string);
+	zassert_equal(0, err, "uuid_to_string returned an error");
+	zassert_str_equal(expected_second_uuid_v4_string, second_uuid_v4_string, "expected %s",
+			  expected_second_uuid_v4_string);
+
+	err = uuid_to_string(&first_uuid_v5, first_uuid_v5_string);
+	zassert_equal(0, err, "uuid_to_string returned an error");
+	zassert_str_equal(expected_first_uuid_v5_string, first_uuid_v5_string, "expected %s",
+			  expected_first_uuid_v5_string);
+}
+
+#ifdef CONFIG_UUID_BASE64
+ZTEST(uuid, test_uuid_to_base64)
+{
+	char first_uuid_v4_base64[UUID_BASE64_LEN] = {0};
+	char second_uuid_v4_base64[UUID_BASE64_LEN] = {0};
+	char first_uuid_v5_base64[UUID_BASE64_LEN] = {0};
+
+	struct uuid first_uuid_v4 = {.val = {0x44, 0xb3, 0x5f, 0x73, 0xcf, 0xbd, 0x43, 0xb4, 0x8f,
+					     0xef, 0xca, 0x7b, 0xae, 0xa1, 0x37, 0x5f}};
+	struct uuid second_uuid_v4 = {.val = {0x6f, 0x2f, 0xd4, 0xcb, 0x94, 0xa0, 0x41, 0xc7, 0x8d,
+					      0x27, 0x86, 0x4c, 0x6b, 0x13, 0xb8, 0xc0}};
+	struct uuid first_uuid_v5 = {.val = {0x05, 0x75, 0xa5, 0x69, 0x51, 0xeb, 0x57, 0x5c, 0xaf,
+					     0xe4, 0xce, 0x7f, 0xc0, 0x3b, 0xcd, 0xc5}};
+
+	char expected_first_uuid_v4_base64[] = "RLNfc8+9Q7SP78p7rqE3Xw==";
+	char expected_second_uuid_v4_base64[] = "by/Uy5SgQceNJ4ZMaxO4wA==";
+	char expected_first_uuid_v5_base64[] = "BXWlaVHrV1yv5M5/wDvNxQ==";
+
+	int err;
+
+	err = uuid_to_base64(&first_uuid_v4, first_uuid_v4_base64);
+	zassert_equal(0, err, "uuid_to_base64 returned an error");
+	zassert_str_equal(expected_first_uuid_v4_base64, first_uuid_v4_base64,
+			  "expected: '%s', gotten: '%s'", expected_first_uuid_v4_base64,
+			  first_uuid_v4_base64);
+
+	err = uuid_to_base64(&second_uuid_v4, second_uuid_v4_base64);
+	zassert_equal(0, err, "uuid_to_base64 returned an error");
+	zassert_str_equal(expected_second_uuid_v4_base64, second_uuid_v4_base64,
+			  "expected: '%s', gotten: '%s'", expected_second_uuid_v4_base64,
+			  second_uuid_v4_base64);
+
+	err = uuid_to_base64(&first_uuid_v5, first_uuid_v5_base64);
+	zassert_equal(0, err, "uuid_to_base64 returned an error");
+	zassert_str_equal(expected_first_uuid_v5_base64, first_uuid_v5_base64,
+			  "expected: '%s', gotten: '%s'", expected_first_uuid_v5_base64,
+			  first_uuid_v5_base64);
+}
+#else
+ZTEST(uuid, test_uuid_to_base64)
+{
+	ztest_test_skip();
+}
+#endif
+
+#ifdef CONFIG_UUID_BASE64
+ZTEST(uuid, test_uuid_to_base64url)
+{
+	char first_uuid_v4_base64url[UUID_BASE64URL_LEN] = {0};
+	char second_uuid_v4_base64url[UUID_BASE64URL_LEN] = {0};
+	char first_uuid_v5_base64url[UUID_BASE64URL_LEN] = {0};
+
+	struct uuid first_uuid_v4 = {.val = {0x44, 0xb3, 0x5f, 0x73, 0xcf, 0xbd, 0x43, 0xb4, 0x8f,
+					     0xef, 0xca, 0x7b, 0xae, 0xa1, 0x37, 0x5f}};
+	struct uuid second_uuid_v4 = {.val = {0x6f, 0x2f, 0xd4, 0xcb, 0x94, 0xa0, 0x41, 0xc7, 0x8d,
+					      0x27, 0x86, 0x4c, 0x6b, 0x13, 0xb8, 0xc0}};
+	struct uuid first_uuid_v5 = {.val = {0x05, 0x75, 0xa5, 0x69, 0x51, 0xeb, 0x57, 0x5c, 0xaf,
+					     0xe4, 0xce, 0x7f, 0xc0, 0x3b, 0xcd, 0xc5}};
+
+	char expected_first_uuid_v4_base64url[] = "RLNfc8-9Q7SP78p7rqE3Xw";
+	char expected_second_uuid_v4_base64url[] = "by_Uy5SgQceNJ4ZMaxO4wA";
+	char expected_first_uuid_v5_base64url[] = "BXWlaVHrV1yv5M5_wDvNxQ";
+
+	int err;
+
+	err = uuid_to_base64url(&first_uuid_v4, first_uuid_v4_base64url);
+	zassert_equal(0, err, "uuid_to_base64url returned an error");
+	zassert_str_equal(expected_first_uuid_v4_base64url, first_uuid_v4_base64url,
+			  "expected: '%s', gotten: '%s'", expected_first_uuid_v4_base64url,
+			  first_uuid_v4_base64url);
+
+	err = uuid_to_base64url(&second_uuid_v4, second_uuid_v4_base64url);
+	zassert_equal(0, err, "uuid_to_base64url returned an error");
+	zassert_str_equal(expected_second_uuid_v4_base64url, second_uuid_v4_base64url,
+			  "expected: '%s', gotten: '%s'", expected_second_uuid_v4_base64url,
+			  second_uuid_v4_base64url);
+
+	err = uuid_to_base64url(&first_uuid_v5, first_uuid_v5_base64url);
+	zassert_equal(0, err, "uuid_to_base64url returned an error");
+	zassert_str_equal(expected_first_uuid_v5_base64url, first_uuid_v5_base64url,
+			  "expected: '%s', gotten: '%s'", expected_first_uuid_v5_base64url,
+			  first_uuid_v5_base64url);
+}
+#else
+ZTEST(uuid, test_uuid_to_base64url)
+{
+	ztest_test_skip();
+}
+#endif
+
+ZTEST_SUITE(uuid, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/lib/uuid/testcase.yaml b/tests/lib/uuid/testcase.yaml
new file mode 100644
index 0000000000000..ebeda9b7eb0a3
--- /dev/null
+++ b/tests/lib/uuid/testcase.yaml
@@ -0,0 +1,19 @@
+common:
+  tags: uuid
+  integration_platforms:
+    - native_sim
+
+tests:
+  libraries.uuid.base:
+    extra_configs:
+      - CONFIG_UUID_V5=y
+      - CONFIG_MBEDTLS=y
+      - CONFIG_MBEDTLS_MD=y
+      - CONFIG_MBEDTLS_SHA1=y
+      - CONFIG_UUID_BASE64=y
+      - CONFIG_BASE64=y
+  libraries.uuid.v4:
+    extra_configs:
+      - CONFIG_UUID_V4=y
+      - CONFIG_ENTROPY_GENERATOR=y
+    filter: CONFIG_ENTROPY_HAS_DRIVER
diff --git a/tests/net/6lo/prj.conf b/tests/net/6lo/prj.conf
index ed070a9ce85eb..3e072737289dc 100644
--- a/tests/net/6lo/prj.conf
+++ b/tests/net/6lo/prj.conf
@@ -21,3 +21,5 @@ CONFIG_NET_6LO_CONTEXT=y
 #Before modifying this value, add respective code in src/main.c
 CONFIG_NET_MAX_6LO_CONTEXTS=2
 CONFIG_ZTEST=y
+
+CONFIG_NET_L2_IEEE802154=y
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index 17fbe090ab799..d911cda65c89e 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -474,11 +474,11 @@ static struct net_pkt *create_pkt(struct net_6lo_data *data)
 
 	net_pkt_set_ip_hdr_len(pkt, NET_IPV6H_LEN);
 
-	net_pkt_lladdr_src(pkt)->addr = src_mac;
-	net_pkt_lladdr_src(pkt)->len = 8U;
+	(void)net_linkaddr_create(net_pkt_lladdr_src(pkt), src_mac,
+				  sizeof(src_mac), NET_LINK_IEEE802154);
 
-	net_pkt_lladdr_dst(pkt)->addr = dst_mac;
-	net_pkt_lladdr_dst(pkt)->len = 8U;
+	(void)net_linkaddr_create(net_pkt_lladdr_dst(pkt), dst_mac,
+				  sizeof(dst_mac), NET_LINK_IEEE802154);
 
 	frag = net_pkt_get_frag(pkt, NET_IPV6UDPH_LEN, K_FOREVER);
 	if (!frag) {
diff --git a/tests/net/6lo/testcase.yaml b/tests/net/6lo/testcase.yaml
index a6a1294f6d990..7db3a818a8f87 100644
--- a/tests/net/6lo/testcase.yaml
+++ b/tests/net/6lo/testcase.yaml
@@ -3,7 +3,11 @@ common:
     - net
     - 6loWPAN
   min_ram: 32
-  depends_on: netif
+  platform_allow:
+    - native_sim
+    - native_sim/native/64
+  integration_platforms:
+    - native_sim
 tests:
   net.6lo:
     extra_configs:
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index 095b835aa3ba7..953fc61d43250 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -313,6 +313,7 @@ ZTEST(arp_fn_tests, test_arp)
 	}
 
 	struct net_eth_hdr *eth_hdr = NULL;
+	struct net_eth_addr dst_lladdr;
 	struct net_pkt *pkt;
 	struct net_pkt *pkt2;
 	struct net_if *iface;
@@ -330,6 +331,8 @@ ZTEST(arp_fn_tests, test_arp)
 
 	net_arp_init();
 
+	(void)memset(&dst_lladdr, 0xff, sizeof(struct net_eth_addr));
+
 	iface = net_if_lookup_by_dev(DEVICE_GET(net_arp_test));
 
 	net_if_ipv4_set_gw(iface, &gw);
@@ -351,8 +354,9 @@ ZTEST(arp_fn_tests, test_arp)
 		len, AF_INET, 0, K_SECONDS(1));
 	zassert_not_null(pkt, "out of mem");
 
-	net_pkt_lladdr_src(pkt)->addr = (uint8_t *)net_if_get_link_addr(iface);
-	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
+	(void)net_linkaddr_set(net_pkt_lladdr_src(pkt),
+			       net_if_get_link_addr(iface)->addr,
+			       sizeof(struct net_eth_addr));
 
 	ipv4 = (struct net_ipv4_hdr *)net_buf_add(pkt->buffer,
 						  sizeof(struct net_ipv4_hdr));
@@ -528,7 +532,9 @@ ZTEST(arp_fn_tests, test_arp)
 	zassert_not_null(pkt2, "ARP reply generation failed.");
 
 	/* The pending packet should now be sent */
-	switch (net_arp_input(pkt2, eth_hdr)) {
+	switch (net_arp_input(pkt2,
+			      (struct net_eth_addr *)net_pkt_lladdr_src(pkt2)->addr,
+			      &dst_lladdr)) {
 	case NET_OK:
 	case NET_CONTINUE:
 		break;
@@ -573,7 +579,9 @@ ZTEST(arp_fn_tests, test_arp)
 
 	req_test = true;
 
-	switch (net_arp_input(pkt2, eth_hdr)) {
+	switch (net_arp_input(pkt2,
+			      (struct net_eth_addr *)net_pkt_lladdr_src(pkt2)->addr,
+			      &dst_lladdr)) {
 	case NET_OK:
 	case NET_CONTINUE:
 		break;
@@ -630,7 +638,10 @@ ZTEST(arp_fn_tests, test_arp)
 
 		net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_ARP);
 
-		verdict = net_arp_input(pkt, eth_hdr);
+		verdict = net_arp_input(pkt,
+					(struct net_eth_addr *)net_pkt_lladdr_src(pkt)->addr,
+					&dst_lladdr);
+
 		zassert_not_equal(verdict, NET_DROP, "Gratuitous ARP failed");
 
 		/* Then check that the HW address is changed for an existing
diff --git a/tests/net/checksum_offload/prj.conf b/tests/net/checksum_offload/prj.conf
index fb86bf9dfac06..5711754814db6 100644
--- a/tests/net/checksum_offload/prj.conf
+++ b/tests/net/checksum_offload/prj.conf
@@ -23,6 +23,7 @@ CONFIG_NET_IF_MAX_IPV4_COUNT=2
 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6
 CONFIG_NET_IPV6_ND=n
 CONFIG_ZTEST=y
+CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_NET_CONFIG_SETTINGS=n
 CONFIG_NET_SHELL=n
 
diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c
index cb86c98681edb..74e6f735c58e7 100644
--- a/tests/net/checksum_offload/src/main.c
+++ b/tests/net/checksum_offload/src/main.c
@@ -74,9 +74,9 @@ static struct in_addr in4addr_dst2 = { { { 192, 0, 42, 2 } } };
 
 /* Keep track of all ethernet interfaces. For native_sim board, we need
  * to increase the count as it has one extra network interface defined in
- * eth_native_posix driver.
+ * eth_native_tap driver.
  */
-static struct net_if *eth_interfaces[2 + IS_ENABLED(CONFIG_ETH_NATIVE_POSIX)];
+static struct net_if *eth_interfaces[2 + IS_ENABLED(CONFIG_ETH_NATIVE_TAP)];
 
 static bool test_failed;
 static bool test_started;
@@ -608,19 +608,17 @@ static void test_address_setup(void)
 
 static void add_neighbor(struct net_if *iface, struct in6_addr *addr)
 {
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 	struct net_nbr *nbr;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x06;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x06;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	nbr = net_ipv6_nbr_add(iface, addr, &lladdr, false,
diff --git a/tests/net/conn_mgr_conn/src/test_ifaces.c b/tests/net/conn_mgr_conn/src/test_ifaces.c
index 535eee07de80c..bd21197160a50 100644
--- a/tests/net/conn_mgr_conn/src/test_ifaces.c
+++ b/tests/net/conn_mgr_conn/src/test_ifaces.c
@@ -16,7 +16,7 @@
 static void test_iface_init(struct net_if *iface)
 {
 	/* Fake link layer address is needed to silence assertions inside the net core */
-	static uint8_t fake_lladdr[] = { 0x01 };
+	static uint8_t fake_lladdr[] = { 0x00, 0x00, 0x5E, 0x00, 0x53, 0x01 };
 
 	net_if_set_link_addr(iface, fake_lladdr, sizeof(fake_lladdr), NET_LINK_DUMMY);
 
diff --git a/tests/net/conn_mgr_monitor/src/test_ifaces.c b/tests/net/conn_mgr_monitor/src/test_ifaces.c
index 1b7a5080ec1f4..05eda78dfcf77 100644
--- a/tests/net/conn_mgr_monitor/src/test_ifaces.c
+++ b/tests/net/conn_mgr_monitor/src/test_ifaces.c
@@ -15,7 +15,7 @@
 static void test_iface_init(struct net_if *iface)
 {
 	/* Fake link layer address is needed to silence assertions inside the net core */
-	static uint8_t fake_lladdr[] = { 0x01 };
+	static uint8_t fake_lladdr[] = { 0x00, 0x00, 0x5E, 0x00, 0x53, 0x01 };
 
 	net_if_set_link_addr(iface, fake_lladdr, sizeof(fake_lladdr), NET_LINK_DUMMY);
 
diff --git a/tests/net/dhcpv4/client/src/main.c b/tests/net/dhcpv4/client/src/main.c
index ceddbbe9e6982..68ca1ee323f7f 100644
--- a/tests/net/dhcpv4/client/src/main.c
+++ b/tests/net/dhcpv4/client/src/main.c
@@ -680,6 +680,8 @@ ZTEST(dhcpv4_tests, test_dhcp)
 	while (event_count < 16) {
 #elif defined(CONFIG_NET_DHCPV4_OPTION_CALLBACKS)
 	while (event_count < 10) {
+#elif defined(CONFIG_NET_DHCPV4_OPTION_PRINT_IGNORED)
+	while (event_count < 2) {
 #else
 	while (event_count < 5) {
 #endif
diff --git a/tests/net/dhcpv4/client/testcase.yaml b/tests/net/dhcpv4/client/testcase.yaml
index 68d6c54271bcc..a7892b3b4aecd 100644
--- a/tests/net/dhcpv4/client/testcase.yaml
+++ b/tests/net/dhcpv4/client/testcase.yaml
@@ -3,9 +3,6 @@ common:
   tags:
     - net
     - dhcpv4
-  platform_exclude:
-    - native_posix/native/64
-    - native_posix
 tests:
   net.dhcpv4_client:
     extra_configs:
@@ -20,3 +17,6 @@ tests:
     extra_configs:
       - CONFIG_NET_DHCPV4_OPTION_CALLBACKS=y
       - CONFIG_NET_DHCPV4_OPTION_CALLBACKS_VENDOR_SPECIFIC=y
+  net.dhcpv4_client.ignored_options:
+    extra_configs:
+      - CONFIG_NET_DHCPV4_OPTION_PRINT_IGNORED=y
diff --git a/tests/net/dhcpv4/server/testcase.yaml b/tests/net/dhcpv4/server/testcase.yaml
index eb7b500f15731..797bba61a7359 100644
--- a/tests/net/dhcpv4/server/testcase.yaml
+++ b/tests/net/dhcpv4/server/testcase.yaml
@@ -1,12 +1,8 @@
 common:
   depends_on: netif
   tags:
-    # eventfd API does not work with native_posix so exclude it here
     - net
     - dhcpv4
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.dhcpv4_server:
     extra_configs:
diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c
index 762bc0efbb18a..bfc2fd926f8ed 100644
--- a/tests/net/hostname/src/main.c
+++ b/tests/net/hostname/src/main.c
@@ -85,7 +85,7 @@ static uint8_t *net_iface_get_mac(const struct device *dev)
 		data->mac_addr[5] = sys_rand8_get();
 	}
 
-	data->ll_addr.addr = data->mac_addr;
+	memcpy(data->ll_addr.addr, data->mac_addr, sizeof(data->mac_addr));
 	data->ll_addr.len = 6U;
 
 	return data->mac_addr;
diff --git a/tests/net/ieee802154/6lo_fragment/src/main.c b/tests/net/ieee802154/6lo_fragment/src/main.c
index 650abbed11433..83ba534f4cd55 100644
--- a/tests/net/ieee802154/6lo_fragment/src/main.c
+++ b/tests/net/ieee802154/6lo_fragment/src/main.c
@@ -290,9 +290,9 @@ static struct net_pkt *create_pkt(struct net_fragment_data *data)
 	}
 
 	/* Setup link layer addresses. */
-	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&dummy_short_addr;
-	net_pkt_lladdr_dst(pkt)->len = sizeof(dummy_short_addr);
-	net_pkt_lladdr_dst(pkt)->type = NET_LINK_IEEE802154;
+	(void)net_linkaddr_create(net_pkt_lladdr_dst(pkt),
+				  (const uint8_t *)&dummy_short_addr, sizeof(dummy_short_addr),
+				  NET_LINK_IEEE802154);
 
 	memcpy(net_pkt_lladdr_src(pkt),
 	       net_if_get_link_addr(
diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c
index f984e529db562..f1c16fbb14f2d 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_test.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_test.c
@@ -397,7 +397,7 @@ static int set_up_recv_socket(enum net_sock_type socket_type)
 	struct sockaddr_ll socket_sll = {
 		.sll_ifindex = net_if_get_by_iface(net_iface),
 		.sll_family = AF_PACKET,
-		.sll_protocol = ETH_P_IEEE802154,
+		.sll_protocol = htons(ETH_P_IEEE802154),
 	};
 	struct timeval timeo_optval = {
 		.tv_sec = 1,
@@ -682,7 +682,7 @@ static bool test_dgram_packet_sending(void *dst_sll, uint8_t dst_sll_halen, uint
 	struct ieee802154_context *ctx = net_if_l2_data(net_iface);
 	struct sockaddr_ll socket_sll = {.sll_ifindex = net_if_get_by_iface(net_iface),
 					 .sll_family = AF_PACKET,
-					 .sll_protocol = ETH_P_IEEE802154};
+					 .sll_protocol = htons(ETH_P_IEEE802154)};
 	struct sockaddr_ll pkt_dst_sll = {
 		.sll_halen = dst_sll_halen,
 		.sll_protocol = htons(ETH_P_IEEE802154),
@@ -742,8 +742,8 @@ static bool test_dgram_packet_sending(void *dst_sll, uint8_t dst_sll_halen, uint
 		goto release_frag;
 	}
 
-	net_pkt_lladdr_src(current_pkt)->addr = net_if_get_link_addr(net_iface)->addr;
-	net_pkt_lladdr_src(current_pkt)->len = net_if_get_link_addr(net_iface)->len;
+	(void)net_linkaddr_copy(net_pkt_lladdr_src(current_pkt),
+				net_if_get_link_addr(net_iface));
 
 	if (!ieee802154_decipher_data_frame(net_iface, current_pkt, &mpdu)) {
 		NET_ERR("*** Cannot decipher/authenticate packet");
@@ -810,17 +810,23 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l
 	}
 
 	pkt->lladdr_dst.type = NET_LINK_IEEE802154;
-	pkt->lladdr_dst.addr = is_broadcast ? NULL : our_ext_addr;
-	pkt->lladdr_dst.len = is_broadcast ? 0 : sizeof(ctx->ext_addr);
+	if (is_broadcast) {
+		memset(pkt->lladdr_dst.addr, 0, sizeof(pkt->lladdr_dst.addr));
+		pkt->lladdr_dst.len = 0;
+	} else {
+		memcpy(pkt->lladdr_dst.addr, our_ext_addr, sizeof(our_ext_addr));
+		pkt->lladdr_dst.len = sizeof(ctx->ext_addr);
+	}
 
 	if (src_ll_addr_len == IEEE802154_SHORT_ADDR_LENGTH ||
 	    src_ll_addr_len == IEEE802154_EXT_ADDR_LENGTH) {
-		pkt->lladdr_src.addr = src_ll_addr;
+		memcpy(pkt->lladdr_src.addr, src_ll_addr, src_ll_addr_len);
 	} else {
 		NET_ERR("*** Illegal L2 source address length.");
 		goto release_pkt;
 	}
 	pkt->lladdr_src.len = src_ll_addr_len;
+	pkt->lladdr_src.type = NET_LINK_IEEE802154;
 
 	frame_buf = net_pkt_get_frag(pkt, IEEE802154_MTU, K_FOREVER);
 	if (!frame_buf) {
@@ -854,7 +860,8 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l
 	if (src_ll_addr_len == IEEE802154_SHORT_ADDR_LENGTH) {
 		ctx->short_addr = our_short_addr;
 	} else {
-		sys_memcpy_swap(ctx->ext_addr, our_ext_addr, sizeof(ctx->ext_addr));
+		sys_memcpy_swap(ctx->ext_addr, pkt->lladdr_dst.addr,
+				sizeof(ctx->ext_addr));
 	}
 
 	if (!frame_result) {
@@ -892,7 +899,8 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l
 	}
 
 	if (recv_src_sll_len != sizeof(struct sockaddr_ll) ||
-	    recv_src_sll.sll_family != AF_PACKET || recv_src_sll.sll_protocol != ETH_P_IEEE802154 ||
+	    recv_src_sll.sll_family != AF_PACKET ||
+	    recv_src_sll.sll_protocol != htons(ETH_P_IEEE802154) ||
 	    recv_src_sll.sll_ifindex != net_if_get_by_iface(net_iface) ||
 	    recv_src_sll.sll_halen != src_ll_addr_len ||
 	    memcmp(recv_src_sll.sll_addr, src_ll_addr, src_ll_addr_len)) {
@@ -932,7 +940,7 @@ static bool test_raw_packet_sending(void)
 
 	socket_sll.sll_ifindex = net_if_get_by_iface(net_iface);
 	socket_sll.sll_family = AF_PACKET;
-	socket_sll.sll_protocol = ETH_P_IEEE802154;
+	socket_sll.sll_protocol = htons(ETH_P_IEEE802154);
 
 	if (zsock_bind(fd, (const struct sockaddr *)&socket_sll, sizeof(struct sockaddr_ll))) {
 		NET_ERR("*** Failed to bind packet socket : %d", errno);
@@ -1091,7 +1099,7 @@ static bool test_recv_and_send_ack_reply(struct ieee802154_pkt_test *t)
 	struct sockaddr_ll socket_sll = {
 		.sll_ifindex = net_if_get_by_iface(net_iface),
 		.sll_family = AF_PACKET,
-		.sll_protocol = ETH_P_IEEE802154,
+		.sll_protocol = htons(ETH_P_IEEE802154),
 	};
 	uint8_t received_payload[80] = {0};
 	struct timeval timeo_optval = {
@@ -1149,7 +1157,8 @@ static bool test_recv_and_send_ack_reply(struct ieee802154_pkt_test *t)
 	sys_memcpy_swap(mac_be, ctx->ext_addr, IEEE802154_EXT_ADDR_LENGTH);
 	if (recv_src_sll_len != sizeof(struct sockaddr_ll) ||
 	    recv_src_sll.sll_ifindex != net_if_get_by_iface(net_iface) ||
-	    recv_src_sll.sll_family != AF_PACKET || recv_src_sll.sll_protocol != ETH_P_IEEE802154 ||
+	    recv_src_sll.sll_family != AF_PACKET ||
+	    recv_src_sll.sll_protocol != htons(ETH_P_IEEE802154) ||
 	    recv_src_sll.sll_halen != IEEE802154_EXT_ADDR_LENGTH ||
 	    memcmp(recv_src_sll.sll_addr, mac_be, IEEE802154_EXT_ADDR_LENGTH)) {
 		NET_ERR("*** Received socket address does not compare (%d)", -errno);
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
index e47318288646b..df830fa32a377 100644
--- a/tests/net/iface/src/main.c
+++ b/tests/net/iface/src/main.c
@@ -92,7 +92,7 @@ static uint8_t *net_iface_get_mac(const struct device *dev)
 		data->mac_addr[5] = sys_rand8_get();
 	}
 
-	data->ll_addr.addr = data->mac_addr;
+	memcpy(data->ll_addr.addr, data->mac_addr, sizeof(data->mac_addr));
 	data->ll_addr.len = 6U;
 
 	return data->mac_addr;
diff --git a/tests/net/ipv4_fragment/src/main.c b/tests/net/ipv4_fragment/src/main.c
index 8e496e8097d1e..c61ff40addc63 100644
--- a/tests/net/ipv4_fragment/src/main.c
+++ b/tests/net/ipv4_fragment/src/main.c
@@ -558,8 +558,9 @@ static void setup_tcp_handler(const struct in_addr *raddr, const struct in_addr
 	net_ipaddr_copy(&net_sin(&remote_addr)->sin_addr, raddr);
 	remote_addr.sa_family = AF_INET;
 
-	ret = net_conn_register(IPPROTO_TCP, AF_INET, &local_addr, &remote_addr, local_port,
-				remote_port, NULL, tcp_data_received, NULL, &handle);
+	ret = net_conn_register(IPPROTO_TCP, SOCK_STREAM, AF_INET, &local_addr,
+				&remote_addr, local_port, remote_port, NULL,
+				tcp_data_received, NULL, &handle);
 
 	zassert_equal(ret, 0, "Cannot register TCP connection");
 }
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index 1dd40afcde8c4..a9b2a92d4d272 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -449,18 +449,16 @@ NET_DEVICE_INIT(eth_ipv6_net_dummy, "eth_ipv6_net_dummy",
 static void add_neighbor(void)
 {
 	struct net_nbr *nbr;
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x06;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x06;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	nbr = net_ipv6_nbr_add(TEST_NET_IF, &peer_addr, &lladdr,
@@ -471,18 +469,16 @@ static void add_neighbor(void)
 
 static void rm_neighbor(void)
 {
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x06;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x06;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	net_ipv6_nbr_rm(TEST_NET_IF, &peer_addr);
@@ -496,23 +492,21 @@ static void add_max_neighbors(void)
 	struct in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0,
 					 0, 0, 0, 0, 0, 0, 0, 0x3 } } };
 	struct net_nbr *nbr;
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 	uint8_t i;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x07;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x07;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	for (i = 0U; i < CONFIG_NET_IPV6_MAX_NEIGHBORS + 1; i++) {
-		llstorage.addr[5] += i;
+		lladdr.addr[5] += i;
 		dst_addr.s6_addr[15] += i;
 		nbr = net_ipv6_nbr_add(TEST_NET_IF, &dst_addr,
 				       &lladdr, false,
@@ -526,23 +520,21 @@ static void rm_max_neighbors(void)
 {
 	struct in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0,
 					 0, 0, 0, 0, 0, 0, 0, 0x3 } } };
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 	uint8_t i;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x07;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x07;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	for (i = 0U; i < CONFIG_NET_IPV6_MAX_NEIGHBORS + 1; i++) {
-		llstorage.addr[5] += i;
+		lladdr.addr[5] += i;
 		dst_addr.s6_addr[15] += i;
 		net_ipv6_nbr_rm(TEST_NET_IF, &dst_addr);
 	}
@@ -1400,7 +1392,7 @@ ZTEST(net_ipv6, test_address_lifetime)
 ZTEST(net_ipv6, test_change_ll_addr)
 {
 	static uint8_t new_mac[] = { 00, 01, 02, 03, 04, 05 };
-	struct net_linkaddr_storage *ll;
+	struct net_linkaddr *ll;
 	struct net_linkaddr *ll_iface;
 	struct net_if *iface;
 	struct net_nbr *nbr;
@@ -1429,7 +1421,7 @@ ZTEST(net_ipv6, test_change_ll_addr)
 	/* As the net_ipv6_send_na() uses interface link address to
 	 * greate tllao, change the interface ll address here.
 	 */
-	ll_iface->addr = new_mac;
+	memcpy(ll_iface->addr, new_mac, sizeof(new_mac));
 
 	ret = net_ipv6_send_na(iface, &peer_addr, &all_nodes_mcast,
 			       &peer_addr, flags);
@@ -1443,7 +1435,8 @@ ZTEST(net_ipv6, test_change_ll_addr)
 	zassert_true(memcmp(ll->addr, ll_iface->addr, ll->len) != 0,
 		     "Wrong link address 2");
 
-	ll_iface->addr = net_test_data.mac_addr;
+	memcpy(ll_iface->addr, net_test_data.mac_addr,
+	       sizeof(net_test_data.mac_addr));
 }
 
 ZTEST(net_ipv6, test_dad_timeout)
diff --git a/tests/net/ipv6/testcase.yaml b/tests/net/ipv6/testcase.yaml
index be728650eca18..f33c86df67ac0 100644
--- a/tests/net/ipv6/testcase.yaml
+++ b/tests/net/ipv6/testcase.yaml
@@ -4,9 +4,6 @@ common:
     - ipv6
     - ipv6_pe
   depends_on: netif
-  platform_exclude:
-    - native_posix/native/64
-    - native_posix
 tests:
   net.ipv6:
     extra_configs:
diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c
index 572d70d94d05b..49d9622cea7ca 100644
--- a/tests/net/ipv6_fragment/src/main.c
+++ b/tests/net/ipv6_fragment/src/main.c
@@ -45,9 +45,8 @@ static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0,
 				       0, 0, 0, 0xf2, 0xaa, 0x29, 0x02,
 				       0x04 } } };
 
-static uint8_t mac2_addr[] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x02 };
 static struct net_linkaddr ll_addr2 = {
-	.addr = mac2_addr,
+	.addr = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x02 },
 	.len = 6,
 };
 
@@ -941,7 +940,7 @@ static uint8_t *net_iface_get_mac(const struct device *dev)
 		data->mac_addr[5] = sys_rand8_get();
 	}
 
-	data->ll_addr.addr = data->mac_addr;
+	memcpy(data->ll_addr.addr, data->mac_addr, sizeof(data->mac_addr));
 	data->ll_addr.len = 6U;
 
 	return data->mac_addr;
@@ -2091,6 +2090,7 @@ ZTEST(net_ipv6_fragment, test_send_ipv6_fragment_without_hbho)
 					AF_UNSPEC, 0, ALLOC_TIMEOUT);
 	zassert_not_null(pkt, "packet");
 
+	net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IPV6);
 	net_pkt_set_family(pkt, AF_INET6);
 	net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr));
 	net_pkt_set_ipv6_ext_len(pkt, NET_IPV6_FRAGH_LEN); /* without hbho*/
diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c
index 02d7693a7a06f..5e3ea4bf8978e 100644
--- a/tests/net/lib/coap_client/src/main.c
+++ b/tests/net/lib/coap_client/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/misc/lorem_ipsum.h>
 #include <zephyr/ztest.h>
 #if defined(CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)
-#include "timer_model.h"
+#include "nsi_timer_model.h"
 #endif
 #include "stubs.h"
 
diff --git a/tests/net/lib/dns_addremove/testcase.yaml b/tests/net/lib/dns_addremove/testcase.yaml
index 21b33cba4caad..5551a41cfbaae 100644
--- a/tests/net/lib/dns_addremove/testcase.yaml
+++ b/tests/net/lib/dns_addremove/testcase.yaml
@@ -5,9 +5,6 @@ common:
   depends_on: netif
   min_ram: 16
   timeout: 600
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.dns.addremove:
     min_ram: 21
diff --git a/tests/net/lib/dns_cache/testcase.yaml b/tests/net/lib/dns_cache/testcase.yaml
index b86087552b53a..a14a8f6fe7de4 100644
--- a/tests/net/lib/dns_cache/testcase.yaml
+++ b/tests/net/lib/dns_cache/testcase.yaml
@@ -6,9 +6,6 @@ common:
   depends_on: netif
   integration_platforms:
     - native_sim
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.dns.cache:
     build_only: false
diff --git a/tests/net/lib/dns_dispatcher/testcase.yaml b/tests/net/lib/dns_dispatcher/testcase.yaml
index 45337949f8fbb..314097ece6613 100644
--- a/tests/net/lib/dns_dispatcher/testcase.yaml
+++ b/tests/net/lib/dns_dispatcher/testcase.yaml
@@ -5,9 +5,6 @@ common:
   depends_on: netif
   min_ram: 21
   timeout: 600
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.dns.dispatch:
     min_ram: 21
diff --git a/tests/net/lib/dns_packet/src/main.c b/tests/net/lib/dns_packet/src/main.c
index 363bdf3d3b51b..0cb7c4aa09ee3 100644
--- a/tests/net/lib/dns_packet/src/main.c
+++ b/tests/net/lib/dns_packet/src/main.c
@@ -1287,6 +1287,253 @@ ZTEST(dns_packet, test_dns_invalid_answer)
 	zassert_equal(ret, -EINVAL, "DNS message answer check succeed (%d)", ret);
 }
 
+static uint8_t recursive_query_resp_ipv4[] = {
+	/* DNS msg header (12 bytes) */
+	0x74, 0xe1, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
+	0x00, 0x00, 0x00, 0x00,
+
+	/* Query string (westus2-prod-2.notifications.teams.microsoft.com)
+	 * (length 50)
+	 */
+	0x0e, 0x77, 0x65, 0x73,	0x74, 0x75, 0x73, 0x32,
+	0x2d, 0x70, 0x72, 0x6f, 0x64, 0x2d, 0x32, 0x0d,
+	0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x05, 0x74, 0x65,
+	0x61, 0x6d, 0x73, 0x09, 0x6d, 0x69, 0x63, 0x72,
+	0x6f, 0x73, 0x6f, 0x66, 0x74, 0x03, 0x63, 0x6f,
+	0x6d, 0x00,
+
+	/* Type (2 bytes) */
+	0x00, 0x01,
+
+	/* Class (2 bytes) */
+	0x00, 0x01,
+
+	/* Answer 1 */
+	0xc0, 0x0c,
+
+	/* Answer type (cname) */
+	0x00, 0x05,
+
+	/* Class */
+	0x00, 0x01,
+
+	/* TTL */
+	0x00, 0x00, 0x00, 0x04,
+
+	/* RR data length */
+	0x00, 0x02,
+
+	/* Data */
+	0xc0, 0x4e, /* <--- recursive pointer */
+};
+
+NET_BUF_POOL_DEFINE(dns_qname_pool_for_test, 2, 128, 0, NULL);
+
+ZTEST(dns_packet, test_dns_recursive_query)
+{
+	static const uint8_t query[] = {
+		/* Query string */
+		0x0e, 0x77, 0x65, 0x73,	0x74, 0x75, 0x73, 0x32,
+		0x2d, 0x70, 0x72, 0x6f, 0x64, 0x2d, 0x32, 0x0d,
+		0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+		0x74, 0x69, 0x6f, 0x6e, 0x73, 0x05, 0x74, 0x65,
+		0x61, 0x6d, 0x73, 0x09, 0x6d, 0x69, 0x63, 0x72,
+		0x6f, 0x73, 0x6f, 0x66, 0x74, 0x03, 0x63, 0x6f,
+		0x6d, 0x00,
+
+		/* Type */
+		0x00, 0x01,
+	};
+	struct dns_msg_t dns_msg = { 0 };
+	uint16_t dns_id = 0;
+	int query_idx = -1;
+	uint16_t query_hash = 0;
+	struct net_buf *dns_cname;
+	int ret;
+
+	dns_cname = net_buf_alloc(&dns_qname_pool_for_test, dns_ctx.buf_timeout);
+	zassert_not_null(dns_cname, "Out of mem");
+
+	dns_msg.msg = recursive_query_resp_ipv4;
+	dns_msg.msg_size = sizeof(recursive_query_resp_ipv4);
+
+	dns_id = dns_unpack_header_id(dns_msg.msg);
+
+	setup_dns_context(&dns_ctx, 0, dns_id, query, sizeof(query),
+			  DNS_QUERY_TYPE_A);
+
+	ret = dns_validate_msg(&dns_ctx, &dns_msg, &dns_id, &query_idx,
+			       dns_cname, &query_hash);
+	zassert_true(ret == DNS_EAI_SYSTEM && errno == ELOOP,
+		     "[%s] DNS message was valid (%d / %d)",
+		     "recursive rsp", ret, errno);
+
+	net_buf_unref(dns_cname);
+}
+
+static uint8_t invalid_compression_response_ipv4[] = {
+	/* DNS msg header (12 bytes) */
+	0x74, 0xe1, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
+	0x00, 0x00, 0x00, 0x00,
+
+	/* Query string */
+	0x0e, 0x77, 0x65, 0x73,	0x74, 0x75, 0x73, 0x32,
+	0x2d, 0x70, 0x72, 0x6f, 0x64, 0x2d, 0x32, 0x0d,
+	0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x05, 0x74, 0x65,
+	0x61, 0x6d, 0x73, 0x09, 0x6d, 0x69, 0x63, 0x72,
+	0x6f, 0x73, 0x6f, 0x66, 0x74, 0x03, 0x63, 0x6f,
+	0x6d, 0x00,
+
+	/* Type */
+	0x00, 0x01,
+
+	/* Class */
+	0x00, 0x01,
+
+	/* Answer 1 */
+	0xb0, 0x0c, /* <--- invalid compression pointer */
+
+	/* Answer type (cname) */
+	0x00, 0x05,
+
+	/* Class */
+	0x00, 0x01,
+
+	/* TTL */
+	0x00, 0x00, 0x00, 0x04,
+
+	/* RR data length */
+	0x00, 0x02,
+
+	/* Data */
+	0xc0, 0x0c,
+};
+
+ZTEST(dns_packet, test_dns_invalid_compress_bits)
+{
+	static const uint8_t query[] = {
+		/* Query string */
+		0x0e, 0x77, 0x65, 0x73,	0x74, 0x75, 0x73, 0x32,
+		0x2d, 0x70, 0x72, 0x6f, 0x64, 0x2d, 0x32, 0x0d,
+		0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+		0x74, 0x69, 0x6f, 0x6e, 0x73, 0x05, 0x74, 0x65,
+		0x61, 0x6d, 0x73, 0x09, 0x6d, 0x69, 0x63, 0x72,
+		0x6f, 0x73, 0x6f, 0x66, 0x74, 0x03, 0x63, 0x6f,
+		0x6d, 0x00,
+
+		/* Type */
+		0x00, 0x01,
+	};
+	struct dns_msg_t dns_msg = { 0 };
+	uint16_t dns_id = 0;
+	int query_idx = -1;
+	uint16_t query_hash = 0;
+	struct net_buf *dns_cname;
+	int ret;
+
+	dns_cname = net_buf_alloc(&dns_qname_pool_for_test, dns_ctx.buf_timeout);
+	zassert_not_null(dns_cname, "Out of mem");
+
+	dns_msg.msg = invalid_compression_response_ipv4;
+	dns_msg.msg_size = sizeof(invalid_compression_response_ipv4);
+
+	dns_id = dns_unpack_header_id(dns_msg.msg);
+
+	setup_dns_context(&dns_ctx, 0, dns_id, query, sizeof(query),
+			  DNS_QUERY_TYPE_A);
+
+	ret = dns_validate_msg(&dns_ctx, &dns_msg, &dns_id, &query_idx,
+			       dns_cname, &query_hash);
+	zassert_true(ret == DNS_EAI_SYSTEM && errno == EINVAL,
+		     "[%s] DNS message was valid (%d / %d)",
+		     "invalid compression rsp", ret, errno);
+
+	net_buf_unref(dns_cname);
+}
+
+static uint8_t invalid_compression_response_cname_ipv4[] = {
+	/* DNS msg header (12 bytes) */
+	0x74, 0xe1, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
+	0x00, 0x00, 0x00, 0x00,
+
+	/* Query string */
+	0x0e, 0x77, 0x65, 0x73,	0x74, 0x75, 0x73, 0x32,
+	0x2d, 0x70, 0x72, 0x6f, 0x64, 0x2d, 0x32, 0x0d,
+	0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x05, 0x74, 0x65,
+	0x61, 0x6d, 0x73, 0x09, 0x6d, 0x69, 0x63, 0x72,
+	0x6f, 0x73, 0x6f, 0x66, 0x74, 0x03, 0x63, 0x6f,
+	0x6d, 0x00,
+
+	/* Type */
+	0x00, 0x01,
+
+	/* Class */
+	0x00, 0x01,
+
+	/* Answer 1 */
+	0xc0, 0x0c,
+
+	/* Answer type (cname) */
+	0x00, 0x05,
+
+	/* Class */
+	0x00, 0x01,
+
+	/* TTL */
+	0x00, 0x00, 0x00, 0x04,
+
+	/* RR data length */
+	0x00, 0x02,
+
+	/* Data */
+	0xb0, 0x0c, /* <--- invalid compression pointer */
+};
+
+ZTEST(dns_packet, test_dns_invalid_compress_bits_cname)
+{
+	static const uint8_t query[] = {
+		/* Query string */
+		0x0e, 0x77, 0x65, 0x73,	0x74, 0x75, 0x73, 0x32,
+		0x2d, 0x70, 0x72, 0x6f, 0x64, 0x2d, 0x32, 0x0d,
+		0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+		0x74, 0x69, 0x6f, 0x6e, 0x73, 0x05, 0x74, 0x65,
+		0x61, 0x6d, 0x73, 0x09, 0x6d, 0x69, 0x63, 0x72,
+		0x6f, 0x73, 0x6f, 0x66, 0x74, 0x03, 0x63, 0x6f,
+		0x6d, 0x00,
+
+		/* Type */
+		0x00, 0x01,
+	};
+	struct dns_msg_t dns_msg = { 0 };
+	uint16_t dns_id = 0;
+	int query_idx = -1;
+	uint16_t query_hash = 0;
+	struct net_buf *dns_cname;
+	int ret;
+
+	dns_cname = net_buf_alloc(&dns_qname_pool_for_test, dns_ctx.buf_timeout);
+	zassert_not_null(dns_cname, "Out of mem");
+
+	dns_msg.msg = invalid_compression_response_cname_ipv4;
+	dns_msg.msg_size = sizeof(invalid_compression_response_cname_ipv4);
+
+	dns_id = dns_unpack_header_id(dns_msg.msg);
+
+	setup_dns_context(&dns_ctx, 0, dns_id, query, sizeof(query),
+			  DNS_QUERY_TYPE_A);
+
+	ret = dns_validate_msg(&dns_ctx, &dns_msg, &dns_id, &query_idx,
+			       dns_cname, &query_hash);
+	zassert_true(ret == DNS_EAI_SYSTEM && errno == EINVAL,
+		     "[%s] DNS message was valid (%d / %d)",
+		     "invalid compression rsp", ret, errno);
+
+	net_buf_unref(dns_cname);
+}
+
 ZTEST_SUITE(dns_packet, NULL, NULL, NULL, NULL, NULL);
 /* TODO:
  *	1) add malformed DNS data (mostly done)
diff --git a/tests/net/lib/dns_packet/testcase.yaml b/tests/net/lib/dns_packet/testcase.yaml
index d1129ca8b424b..a69ee4ccb73bb 100644
--- a/tests/net/lib/dns_packet/testcase.yaml
+++ b/tests/net/lib/dns_packet/testcase.yaml
@@ -1,8 +1,5 @@
 tests:
   net.dns:
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     min_ram: 16
     tags:
       - dns
diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c
index c5d17941087b2..0be84cb00c645 100644
--- a/tests/net/lib/dns_resolve/src/main.c
+++ b/tests/net/lib/dns_resolve/src/main.c
@@ -98,7 +98,7 @@ static uint8_t *net_iface_get_mac(const struct device *dev)
 		data->mac_addr[5] = sys_rand8_get();
 	}
 
-	data->ll_addr.addr = data->mac_addr;
+	memcpy(data->ll_addr.addr, data->mac_addr, sizeof(data->mac_addr));
 	data->ll_addr.len = 6U;
 
 	return data->mac_addr;
@@ -762,4 +762,55 @@ ZTEST(dns_resolve, test_dns_query_ipv6_numeric)
 	}
 }
 
+#define MDNS_IPV4_ADDR "224.0.0.251:5353"
+#define MDNS_IPV6_ADDR "[ff02::fb]:5353"
+
+ZTEST(dns_resolve, test_mdns_ipv4_igmp_group)
+{
+	struct net_if_mcast_addr *maddr;
+	struct sockaddr_in addr4;
+	bool st;
+
+	/* Skip this test if mDNS responder is enabled because it will join
+	 * multicast group automatically.
+	 */
+	Z_TEST_SKIP_IFDEF(CONFIG_MDNS_RESPONDER);
+	Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV4);
+	Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV4_IGMP);
+
+	st = net_ipaddr_parse(MDNS_IPV4_ADDR, sizeof(MDNS_IPV4_ADDR) - 1,
+			      (struct sockaddr *)&addr4);
+	zassert_true(st, "Cannot parse IPv4 address");
+
+	maddr = net_if_ipv4_maddr_lookup(&addr4.sin_addr, NULL);
+	zassert_not_null(maddr, "IPv4 mDNS address not found");
+
+	st = net_if_ipv4_maddr_is_joined(maddr);
+	zassert_true(st, "IPv4 mDNS group not joined");
+}
+
+ZTEST(dns_resolve, test_mdns_ipv6_mld_group)
+{
+	struct net_if_mcast_addr *maddr;
+	struct sockaddr_in6 addr6;
+	bool st;
+
+	/* Skip this test if mDNS responder is enabled because it will join
+	 * multicast group automatically.
+	 */
+	Z_TEST_SKIP_IFDEF(CONFIG_MDNS_RESPONDER);
+	Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV6);
+	Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV6_MLD);
+
+	st = net_ipaddr_parse(MDNS_IPV6_ADDR, sizeof(MDNS_IPV6_ADDR) - 1,
+			      (struct sockaddr *)&addr6);
+	zassert_true(st, "Cannot parse IPv6 address");
+
+	maddr = net_if_ipv6_maddr_lookup(&addr6.sin6_addr, NULL);
+	zassert_not_null(maddr, "IPv6 mDNS address not found");
+
+	st = net_if_ipv6_maddr_is_joined(maddr);
+	zassert_true(st, "IPv6 mDNS group not joined");
+}
+
 ZTEST_SUITE(dns_resolve, NULL, test_init, NULL, NULL, NULL);
diff --git a/tests/net/lib/dns_resolve/testcase.yaml b/tests/net/lib/dns_resolve/testcase.yaml
index b0734b4d17591..9e34738e71e9a 100644
--- a/tests/net/lib/dns_resolve/testcase.yaml
+++ b/tests/net/lib/dns_resolve/testcase.yaml
@@ -5,9 +5,6 @@ common:
   depends_on: netif
   timeout: 600
   min_ram: 21
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.dns.resolve:
     extra_configs:
@@ -18,3 +15,9 @@ tests:
   net.dns.resolve.no_ipv6:
     extra_args: CONF_FILE=prj-no-ipv6.conf
     min_ram: 16
+  net.mdns.resolve:
+    extra_configs:
+      - CONFIG_MDNS_RESOLVER=y
+      - CONFIG_MDNS_RESPONDER=n
+      - CONFIG_NET_IPV6_MLD=y
+      - CONFIG_NET_IPV4_IGMP=y
diff --git a/tests/net/lib/dns_sd/src/main.c b/tests/net/lib/dns_sd/src/main.c
index e70482c027c0e..c408fe91f45a3 100644
--- a/tests/net/lib/dns_sd/src/main.c
+++ b/tests/net/lib/dns_sd/src/main.c
@@ -53,6 +53,7 @@ extern int add_srv_record(const struct dns_sd_rec *inst, uint32_t ttl,
 extern size_t service_proto_size(const struct dns_sd_rec *ref);
 extern bool rec_is_valid(const struct dns_sd_rec *ref);
 extern int setup_dst_addr(int sock, sa_family_t family,
+			  struct sockaddr *src, socklen_t src_len,
 			  struct sockaddr *dst, socklen_t *dst_len);
 
 
@@ -685,7 +686,7 @@ ZTEST(dns_sd, test_setup_dst_addr)
 	v4 = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	zassert_true(v4 >= 0, "Create IPv4 UDP context failed (%d)", -errno);
 
-	zassert_equal(0, setup_dst_addr(v4, AF_INET, &dst, &dst_len), "");
+	zassert_equal(0, setup_dst_addr(v4, AF_INET, NULL, 0, &dst, &dst_len), "");
 
 	optlen = sizeof(int);
 	(void)zsock_getsockopt(v4, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, &optlen);
@@ -708,7 +709,7 @@ ZTEST(dns_sd, test_setup_dst_addr)
 	v6 = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	zassert_true(v6 >= 0, "Create IPv6 UDP context failed (%d)", -errno);
 
-	zassert_equal(0, setup_dst_addr(v6, AF_INET6, &dst, &dst_len), "");
+	zassert_equal(0, setup_dst_addr(v6, AF_INET6, NULL, 0, &dst, &dst_len), "");
 
 	optlen = sizeof(int);
 	(void)zsock_getsockopt(v6, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, &optlen);
@@ -729,7 +730,7 @@ ZTEST(dns_sd, test_setup_dst_addr)
 	zassert_true(xx >= 0, "Create IPV4 udp socket failed");
 
 	zassert_equal(-EPFNOSUPPORT,
-		      setup_dst_addr(xx, AF_PACKET, &dst, &dst_len), "");
+		      setup_dst_addr(xx, AF_PACKET, NULL, 0, &dst, &dst_len), "");
 }
 
 /** test for @ref dns_sd_is_service_type_enumeration */
diff --git a/tests/net/lib/dns_sd/testcase.yaml b/tests/net/lib/dns_sd/testcase.yaml
index bfdc751ed7c17..22a6d33255802 100644
--- a/tests/net/lib/dns_sd/testcase.yaml
+++ b/tests/net/lib/dns_sd/testcase.yaml
@@ -3,9 +3,6 @@ common:
     - dns
     - net
   depends_on: netif
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.dns.sd:
     min_ram: 21
diff --git a/tests/net/lib/http_server/common/prj.conf b/tests/net/lib/http_server/common/prj.conf
index 67f0801284ee4..2e812387e38d4 100644
--- a/tests/net/lib/http_server/common/prj.conf
+++ b/tests/net/lib/http_server/common/prj.conf
@@ -14,3 +14,4 @@ CONFIG_POSIX_API=y
 CONFIG_NET_SOCKETS=y
 
 CONFIG_HTTP_SERVER_RESOURCE_WILDCARD=y
+CONFIG_HTTP_SERVER_MAX_CLIENTS=7
diff --git a/tests/net/lib/http_server/common/src/main.c b/tests/net/lib/http_server/common/src/main.c
index f0342e34fca83..4b532af44afa6 100644
--- a/tests/net/lib/http_server/common/src/main.c
+++ b/tests/net/lib/http_server/common/src/main.c
@@ -77,10 +77,12 @@ HTTP_RESOURCE_DEFINE(resource_6, service_D, "/fo*", RES(1));
 HTTP_RESOURCE_DEFINE(resource_7, service_D, "/f[ob]o3.html", RES(1));
 HTTP_RESOURCE_DEFINE(resource_8, service_D, "/fb?3.htm", RES(0));
 HTTP_RESOURCE_DEFINE(resource_9, service_D, "/f*4.html", RES(3));
+HTTP_RESOURCE_DEFINE(resource_11, service_D, "/foo/*", RES(3));
+HTTP_RESOURCE_DEFINE(resource_12, service_D, "/foo/b?r", RES(3));
 
 /* Default resource in case of no match */
 static uint16_t service_E_port = 8080;
-HTTP_SERVICE_DEFINE(service_E, "192.0.2.1", &service_E_port, 0, 0, NULL, DETAIL(0));
+HTTP_SERVICE_DEFINE(service_E, "192.0.2.1", &service_E_port, 1, 1, NULL, DETAIL(0));
 HTTP_RESOURCE_DEFINE(resource_10, service_E, "/index.html", RES(4));
 
 ZTEST(http_service, test_HTTP_SERVICE_DEFINE)
@@ -373,6 +375,25 @@ ZTEST(http_service, test_HTTP_RESOURCE_WILDCARD)
 	res = CHECK_PATH(service_A, "/fbo3.htm", &len);
 	zassert_is_null(res, "Resource found");
 	zassert_equal(len, 0, "Length set");
+
+	res = CHECK_PATH(service_D, "/foo/bar", &len);
+	zassert_not_null(res, "Resource not found");
+	zassert_true(len == (sizeof("/foo/bar") - 1), "Length not set correctly");
+	zassert_equal(res, RES(3), "Resource mismatch");
+
+	res = CHECK_PATH(service_D, "/foo/bar?param=value", &len);
+	zassert_not_null(res, "Resource not found");
+	zassert_true(len == (sizeof("/foo/bar") - 1), "Length not set correctly");
+	zassert_equal(res, RES(3), "Resource mismatch");
+
+	res = CHECK_PATH(service_D, "/bar?foo=value", &len);
+	zassert_is_null(res, "Resource found");
+	zassert_equal(len, 0, "Length set");
+
+	res = CHECK_PATH(service_D, "/foo/bar?param=value", &len);
+	zassert_not_null(res, "Resource not found");
+	zassert_true(len == (sizeof("/foo/bar") - 1), "Length not set correctly");
+	zassert_equal(res, RES(3), "Resource mismatch");
 }
 
 ZTEST(http_service, test_HTTP_RESOURCE_DEFAULT)
diff --git a/tests/net/lib/http_server/common/testcase.yaml b/tests/net/lib/http_server/common/testcase.yaml
index 530fab321bf35..1c5132557cc9b 100644
--- a/tests/net/lib/http_server/common/testcase.yaml
+++ b/tests/net/lib/http_server/common/testcase.yaml
@@ -7,8 +7,5 @@ common:
     - server
   integration_platforms:
     - native_sim
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.http.server.common: {}
diff --git a/tests/net/lib/http_server/core/prj.conf b/tests/net/lib/http_server/core/prj.conf
index f3196f656cf2b..0668f13070269 100644
--- a/tests/net/lib/http_server/core/prj.conf
+++ b/tests/net/lib/http_server/core/prj.conf
@@ -49,6 +49,7 @@ CONFIG_HTTP_SERVER_REPORT_FAILURE_REASON=y
 CONFIG_HTTP_SERVER_MAX_CLIENTS=5
 CONFIG_HTTP_SERVER_MAX_STREAMS=5
 CONFIG_HTTP_SERVER_RESTART_DELAY=10
+CONFIG_HTTP_SERVER_COMPRESSION=y
 
 # Network address config
 CONFIG_NET_CONFIG_SETTINGS=n
diff --git a/tests/net/lib/http_server/core/src/main.c b/tests/net/lib/http_server/core/src/main.c
index 648f8c270bc0c..0ace8f23c9dbe 100644
--- a/tests/net/lib/http_server/core/src/main.c
+++ b/tests/net/lib/http_server/core/src/main.c
@@ -1431,6 +1431,8 @@ static void test_http1_header_capture_common(const char *request)
 	zassert_not_equal(ret, -1, "send() failed (%d)", errno);
 
 	test_read_data(&offset, sizeof(http1_header_capture_common_response) - 1);
+	zassert_mem_equal(buf, http1_header_capture_common_response,
+			  sizeof(http1_header_capture_common_response) - 1);
 }
 
 ZTEST(server_function_tests, test_http1_header_capture)
@@ -2548,6 +2550,19 @@ static int test_mount(void)
 	return TC_PASS;
 }
 
+static int test_unmount(void)
+{
+	int ret;
+
+	ret = fs_unmount(&littlefs_mnt);
+	if (ret < 0 && ret != -EINVAL) {
+		TC_PRINT("Error unmounting fs [%d]\n", ret);
+		return TC_FAIL;
+	}
+
+	return TC_PASS;
+}
+
 #ifndef PATH_MAX
 #define PATH_MAX 64
 #endif
@@ -2647,13 +2662,17 @@ int test_mkdir(const char *dir_path, const char *file)
 	return res;
 }
 
-static int setup_fs(void)
+static int setup_fs(const char *file_ending)
 {
+	char filename_buf[sizeof(TEST_FILE)+5] = TEST_FILE;
+
+	strcat(filename_buf, file_ending);
 	test_clear_flash();
 
+	zassert_equal(test_unmount(), TC_PASS, "Failed to unmount fs");
 	zassert_equal(test_mount(), TC_PASS, "Failed to mount fs");
 
-	return test_mkdir(TEST_DIR_PATH, TEST_FILE);
+	return test_mkdir(TEST_DIR_PATH, filename_buf);
 }
 
 ZTEST(server_function_tests, test_http1_static_fs)
@@ -2673,7 +2692,7 @@ ZTEST(server_function_tests, test_http1_static_fs)
 	size_t offset = 0;
 	int ret;
 
-	ret = setup_fs();
+	ret = setup_fs("");
 	zassert_equal(ret, TC_PASS, "Failed to mount fs");
 
 	ret = zsock_send(client_fd, http1_request, strlen(http1_request), 0);
@@ -2685,6 +2704,81 @@ ZTEST(server_function_tests, test_http1_static_fs)
 	zassert_mem_equal(buf, expected_response, sizeof(expected_response) - 1,
 			  "Received data doesn't match expected response");
 }
+
+ZTEST(server_function_tests, test_http1_static_fs_compression)
+{
+#define HTTP1_COMPRESSION_REQUEST                                                                  \
+	"GET /static_file.html HTTP/1.1\r\n"                                                       \
+	"Host: 127.0.0.1:8080\r\n"                                                                 \
+	"User-Agent: curl/7.68.0\r\n"                                                              \
+	"Accept: */*\r\n"                                                                          \
+	"Accept-Encoding: %s\r\n"                                                                  \
+	"\r\n"
+#define HTTP1_COMPRESSION_RESPONSE                                                                 \
+	"HTTP/1.1 200 OK\r\n"                                                                      \
+	"Content-Length: 30\r\n"                                                                   \
+	"Content-Type: text/html\r\n"                                                              \
+	"Content-Encoding: %s\r\n"                                                                 \
+	"\r\n" TEST_STATIC_FS_PAYLOAD
+
+	static const char mixed_compression_str[] = "gzip, deflate, br";
+	static char http1_request[sizeof(HTTP1_COMPRESSION_REQUEST) +
+				  ARRAY_SIZE(mixed_compression_str)] = {0};
+	static char expected_response[sizeof(HTTP1_COMPRESSION_RESPONSE) +
+				      HTTP_COMPRESSION_MAX_STRING_LEN] = {0};
+	static const char *const file_ending_map[] = {[HTTP_GZIP] = ".gz",
+						      [HTTP_COMPRESS] = ".lzw",
+						      [HTTP_DEFLATE] = ".zz",
+						      [HTTP_BR] = ".br",
+						      [HTTP_ZSTD] = ".zst"};
+	size_t offset;
+	int ret;
+	int expected_response_size;
+
+	for (enum http_compression i = 0; compression_value_is_valid(i); ++i) {
+		offset = 0;
+
+		if (i == HTTP_NONE) {
+			continue;
+		}
+		TC_PRINT("Testing %s compression...\n", http_compression_text(i));
+		zassert(i < ARRAY_SIZE(file_ending_map) && &file_ending_map[i] != NULL,
+			"No file ending defined for compression");
+
+		sprintf(http1_request, HTTP1_COMPRESSION_REQUEST, http_compression_text(i));
+		expected_response_size = sprintf(expected_response, HTTP1_COMPRESSION_RESPONSE,
+						 http_compression_text(i));
+
+		ret = setup_fs(file_ending_map[i]);
+		zassert_equal(ret, TC_PASS, "Failed to mount fs");
+
+		ret = zsock_send(client_fd, http1_request, strlen(http1_request), 0);
+		zassert_not_equal(ret, -1, "send() failed (%d)", errno);
+
+		memset(buf, 0, sizeof(buf));
+
+		test_read_data(&offset, expected_response_size);
+		zassert_mem_equal(buf, expected_response, expected_response_size,
+				  "Received data doesn't match expected response");
+	}
+
+	offset = 0;
+	TC_PRINT("Testing mixed compression...\n");
+	sprintf(http1_request, HTTP1_COMPRESSION_REQUEST, mixed_compression_str);
+	expected_response_size = sprintf(expected_response, HTTP1_COMPRESSION_RESPONSE,
+					 http_compression_text(HTTP_BR));
+	ret = setup_fs(file_ending_map[HTTP_BR]);
+	zassert_equal(ret, TC_PASS, "Failed to mount fs");
+
+	ret = zsock_send(client_fd, http1_request, strlen(http1_request), 0);
+	zassert_not_equal(ret, -1, "send() failed (%d)", errno);
+
+	memset(buf, 0, sizeof(buf));
+
+	test_read_data(&offset, expected_response_size);
+	zassert_mem_equal(buf, expected_response, expected_response_size,
+			  "Received data doesn't match expected response");
+}
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(zephyr_ram_disk) */
 
 static void http_server_tests_before(void *fixture)
diff --git a/tests/net/lib/http_server/core/testcase.yaml b/tests/net/lib/http_server/core/testcase.yaml
index 2441fc225421e..6627ff86b3e5f 100644
--- a/tests/net/lib/http_server/core/testcase.yaml
+++ b/tests/net/lib/http_server/core/testcase.yaml
@@ -10,9 +10,6 @@ common:
   integration_platforms:
     - native_sim
     - qemu_x86
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.http.server.core: {}
   net.http.server.static.fs:
diff --git a/tests/net/lib/http_server/crime/testcase.yaml b/tests/net/lib/http_server/crime/testcase.yaml
index 5fbcfe5ea272a..392e0d30067c1 100644
--- a/tests/net/lib/http_server/crime/testcase.yaml
+++ b/tests/net/lib/http_server/crime/testcase.yaml
@@ -9,8 +9,5 @@ common:
   integration_platforms:
     - native_sim
     - qemu_x86
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.http.server.crime: {}
diff --git a/tests/net/lib/http_server/hpack/testcase.yaml b/tests/net/lib/http_server/hpack/testcase.yaml
index e477628aabf31..97cae48854c4d 100644
--- a/tests/net/lib/http_server/hpack/testcase.yaml
+++ b/tests/net/lib/http_server/hpack/testcase.yaml
@@ -8,8 +8,5 @@ common:
   integration_platforms:
     - native_sim
     - qemu_x86
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.http.server.http2_hpack: {}
diff --git a/tests/net/lib/http_server/tls/src/main.c b/tests/net/lib/http_server/tls/src/main.c
index c14844eacea69..9361fb1770de9 100644
--- a/tests/net/lib/http_server/tls/src/main.c
+++ b/tests/net/lib/http_server/tls/src/main.c
@@ -239,7 +239,7 @@ static void *setup(void)
 		zassert_equal(ret, 0, "failed to add CA Certificate (%d)", ret);
 
 		ret = tls_credential_add(SERVER_CERTIFICATE_TAG,
-					 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+					 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 					 server, sizeof(server));
 		zassert_equal(ret, 0, "failed to add Server Certificate (%d)", ret);
 
@@ -249,7 +249,7 @@ static void *setup(void)
 		zassert_equal(ret, 0, "failed to add Server Private Key (%d)", ret);
 
 		ret = tls_credential_add(CLIENT_CERTIFICATE_TAG,
-					 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+					 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 					 client, sizeof(client));
 		zassert_equal(ret, 0, "failed to add Client Certificate (%d)", ret);
 
diff --git a/tests/net/lib/http_server/tls/testcase.yaml b/tests/net/lib/http_server/tls/testcase.yaml
index c163efb252659..a02b5e72cca4a 100644
--- a/tests/net/lib/http_server/tls/testcase.yaml
+++ b/tests/net/lib/http_server/tls/testcase.yaml
@@ -9,9 +9,6 @@ common:
   integration_platforms:
     - native_sim
     - qemu_x86
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
   platform_allow:
     - native_sim
     - qemu_x86
diff --git a/tests/net/lib/lwm2m/block_transfer/prj.conf b/tests/net/lib/lwm2m/block_transfer/prj.conf
index 2b036cf0c8e24..8ba1ef71a8bb0 100644
--- a/tests/net/lib/lwm2m/block_transfer/prj.conf
+++ b/tests/net/lib/lwm2m/block_transfer/prj.conf
@@ -14,3 +14,4 @@ CONFIG_LWM2M=y
 CONFIG_LWM2M_COAP_BLOCK_TRANSFER=y
 CONFIG_LWM2M_COAP_BLOCK_SIZE=64
 CONFIG_LWM2M_COAP_ENCODE_BUFFER_SIZE=256
+CONFIG_LWM2M_COAP_MAX_MSG_SIZE=96
diff --git a/tests/net/lib/lwm2m/interop/boards/native_sim.conf b/tests/net/lib/lwm2m/interop/boards/native_sim.conf
index adc3b9907ae50..3ca97938bd992 100644
--- a/tests/net/lib/lwm2m/interop/boards/native_sim.conf
+++ b/tests/net/lib/lwm2m/interop/boards/native_sim.conf
@@ -4,7 +4,7 @@ CONFIG_DNS_SERVER1="192.0.2.2"
 CONFIG_LWM2M_DNS_SUPPORT=y
 CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
-CONFIG_NATIVE_UART_0_ON_STDINOUT=y
+CONFIG_UART_NATIVE_PTY_0_ON_STDINOUT=y
 CONFIG_ASAN=y
 CONFIG_NATIVE_EXTRA_CMDLINE_ARGS="--seed-random"
 CONFIG_HEAP_MEM_POOL_SIZE=32768
diff --git a/tests/net/lib/lwm2m/interop/osv-scanner.toml b/tests/net/lib/lwm2m/interop/osv-scanner.toml
new file mode 100644
index 0000000000000..dfbd321ca9b61
--- /dev/null
+++ b/tests/net/lib/lwm2m/interop/osv-scanner.toml
@@ -0,0 +1,3 @@
+[[IgnoredVulns]]
+id = "PYSEC-2019-166"
+reason = "CoAPthon3 is only used for testing purposes."
diff --git a/tests/net/lib/lwm2m/interop/requirements.txt b/tests/net/lib/lwm2m/interop/requirements.txt
index 38c501218eea0..893e4b19cb9f5 100644
--- a/tests/net/lib/lwm2m/interop/requirements.txt
+++ b/tests/net/lib/lwm2m/interop/requirements.txt
@@ -1 +1 @@
-CoAPthon3
+CoAPthon3>=1.0.2
diff --git a/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt b/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt
index 2538d32a4cd5d..42887cdd49c63 100644
--- a/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt
+++ b/tests/net/lib/lwm2m/lwm2m_engine/CMakeLists.txt
@@ -21,7 +21,6 @@ target_include_directories(app PRIVATE ${ZEPHYR_BASE}/../modules/crypto/mbedtls/
 add_compile_definitions(CONFIG_LWM2M_ENGINE_MAX_PENDING=2)
 add_compile_definitions(CONFIG_LWM2M_ENGINE_MAX_REPLIES=2)
 add_compile_definitions(CONFIG_LWM2M_ENGINE_VALIDATION_BUFFER_SIZE=512)
-add_compile_definitions(CONFIG_LWM2M_ENGINE_MESSAGE_HEADER_SIZE=512)
 add_compile_definitions(CONFIG_LWM2M_ENGINE_MAX_OBSERVER=10)
 add_compile_definitions(CONFIG_LWM2M_ENGINE_STACK_SIZE=2048)
 add_compile_definitions(CONFIG_LWM2M_NUM_BLOCK1_CONTEXT=3)
diff --git a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
index fc1f8dea2de76..e72d12896bec3 100644
--- a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
+++ b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c
@@ -14,7 +14,7 @@
 
 #include "stubs.h"
 #if defined(CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME)
-#include "timer_model.h"
+#include "nsi_timer_model.h"
 #endif
 
 #define LOG_LEVEL	LOG_LEVEL_DBG
@@ -467,7 +467,7 @@ ZTEST(lwm2m_engine, test_security)
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_PEER_VERIFY);
 	zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], TLS_CIPHERSUITE_LIST);
 	zassert_true(tls_credential_add_fake.call_count == 3);
-	zassert_equal(tls_credential_add_fake.arg1_history[0], TLS_CREDENTIAL_SERVER_CERTIFICATE);
+	zassert_equal(tls_credential_add_fake.arg1_history[0], TLS_CREDENTIAL_PUBLIC_CERTIFICATE);
 	zassert_equal(tls_credential_add_fake.arg1_history[1], TLS_CREDENTIAL_PRIVATE_KEY);
 	zassert_equal(tls_credential_add_fake.arg1_history[2], TLS_CREDENTIAL_CA_CERTIFICATE);
 	zassert_equal(lwm2m_engine_stop(&ctx), 0);
diff --git a/tests/net/lib/lwm2m/lwm2m_rd_client/CMakeLists.txt b/tests/net/lib/lwm2m/lwm2m_rd_client/CMakeLists.txt
index 2a8e8959c25a7..a3f70cd7198a3 100644
--- a/tests/net/lib/lwm2m/lwm2m_rd_client/CMakeLists.txt
+++ b/tests/net/lib/lwm2m/lwm2m_rd_client/CMakeLists.txt
@@ -18,7 +18,6 @@ target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/net/lib/lwm2m/)
 add_compile_definitions(CONFIG_LWM2M_ENGINE_MAX_PENDING=2)
 add_compile_definitions(CONFIG_LWM2M_ENGINE_MAX_REPLIES=2)
 add_compile_definitions(CONFIG_LWM2M_ENGINE_VALIDATION_BUFFER_SIZE=512)
-add_compile_definitions(CONFIG_LWM2M_ENGINE_MESSAGE_HEADER_SIZE=512)
 add_compile_definitions(CONFIG_LWM2M_RD_CLIENT_ENDPOINT_NAME_MAX_LENGTH=32)
 add_compile_definitions(CONFIG_LWM2M_RD_CLIENT_MAX_RETRIES=2)
 add_compile_definitions(CONFIG_LWM2M_COAP_BLOCK_SIZE=256)
diff --git a/tests/net/lib/mdns_responder/src/main.c b/tests/net/lib/mdns_responder/src/main.c
index 25a50ffe5cfbe..3d741803e31a8 100644
--- a/tests/net/lib/mdns_responder/src/main.c
+++ b/tests/net/lib/mdns_responder/src/main.c
@@ -124,7 +124,7 @@ static uint8_t *net_iface_get_mac(const struct device *dev)
 		data->mac_addr[5] = 0x01;
 	}
 
-	data->ll_addr.addr = data->mac_addr;
+	memcpy(data->ll_addr.addr, data->mac_addr, sizeof(data->mac_addr));
 	data->ll_addr.len = 6U;
 
 	return data->mac_addr;
diff --git a/tests/net/lib/mdns_responder/testcase.yaml b/tests/net/lib/mdns_responder/testcase.yaml
index aabe426bdd059..ae9f6d9dbf2ca 100644
--- a/tests/net/lib/mdns_responder/testcase.yaml
+++ b/tests/net/lib/mdns_responder/testcase.yaml
@@ -3,9 +3,6 @@ common:
     - dns
     - net
   depends_on: netif
-  platform_exclude:
-    - native_posix/native/64
-    - native_posix
 tests:
   net.mdns:
     min_ram: 21
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf
index 3a5f7c771cc0d..7060b3c22459a 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_client/prj.conf
@@ -16,6 +16,7 @@ CONFIG_NET_PKT_RX_COUNT=16
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_TIME_WAIT_DELAY=0
 CONFIG_MQTT_LIB=y
+CONFIG_MQTT_VERSION_3_1_1=y
 
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_ZTEST_STACK_SIZE=2048
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c b/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c
index 12c9eb3174096..164546161c700 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c
@@ -693,7 +693,7 @@ static void test_disconnect(void)
 {
 	int ret;
 
-	ret = mqtt_disconnect(&client_ctx);
+	ret = mqtt_disconnect(&client_ctx, NULL);
 	zassert_ok(ret, "MQTT client failed to disconnect (%d)", ret);
 	broker_process(MQTT_PKT_TYPE_DISCONNECT);
 
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml
index d96ed8fda59b7..eb371eddfbd3a 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_client/testcase.yaml
@@ -11,3 +11,6 @@ tests:
   net.mqtt.client.preempt:
     extra_configs:
       - CONFIG_NET_TC_THREAD_PREEMPTIVE=y
+  net.mqtt.client.mqtt_5_0:
+    extra_configs:
+      - CONFIG_MQTT_VERSION_5_0=y
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
index 1c4a907a1558e..44ec7a64aaa02 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
@@ -8,6 +8,7 @@ CONFIG_TEST_RANDOM_GENERATOR=y
 
 # enable the MQTT lib
 CONFIG_MQTT_LIB=y
+CONFIG_MQTT_VERSION_3_1_1=y
 CONFIG_ZTEST=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_MAIN_STACK_SIZE=1280
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
index b6cf7390d7fc8..6a47b4c3a8108 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
@@ -746,7 +746,7 @@ static int eval_msg_disconnect(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = disconnect_encode(&buf);
+	rc = disconnect_encode(&client, NULL, &buf);
 
 	/**TESTPOINTS: Check disconnect_encode functions*/
 	zassert_false(rc, "disconnect_encode failed");
@@ -773,7 +773,7 @@ static int eval_msg_publish(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_encode(param, &buf);
+	rc = publish_encode(&client, param, &buf);
 
 	/* Payload is not copied, copy it manually just after the header.*/
 	memcpy(buf.end, param->message.payload.data,
@@ -791,7 +791,7 @@ static int eval_msg_publish(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_decode(type_and_flags, length, &buf, &dec_param);
+	rc = publish_decode(&client, type_and_flags, length, &buf, &dec_param);
 
 	/**TESTPOINT: Check publish_decode function*/
 	zassert_false(rc, "publish_decode failed");
@@ -830,7 +830,7 @@ static int eval_msg_corrupted_publish(struct mqtt_test *mqtt_test)
 	rc = fixed_header_decode(buf, &type_and_flags, &length);
 	zassert_equal(rc, 0, "fixed_header_decode failed");
 
-	rc = publish_decode(type_and_flags, length, buf, &dec_param);
+	rc = publish_decode(&client, type_and_flags, length, buf, &dec_param);
 	zassert_equal(rc, -EINVAL, "publish_decode should fail");
 
 	return TC_PASS;
@@ -846,7 +846,7 @@ static int eval_msg_subscribe(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = subscribe_encode(param, &buf);
+	rc = subscribe_encode(&client, param, &buf);
 
 	/**TESTPOINT: Check subscribe_encode function*/
 	zassert_false(rc, "subscribe_encode failed");
@@ -874,7 +874,7 @@ static int eval_msg_suback(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = subscribe_ack_decode(&buf, &dec_param);
+	rc = subscribe_ack_decode(&client, &buf, &dec_param);
 
 	/**TESTPOINT: Check subscribe_ack_decode function*/
 	zassert_false(rc, "subscribe_ack_decode failed");
@@ -927,7 +927,7 @@ static int eval_msg_puback(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_ack_encode(param, &buf);
+	rc = publish_ack_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_ack_encode functions*/
 	zassert_false(rc, "publish_ack_encode failed");
@@ -940,7 +940,7 @@ static int eval_msg_puback(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_ack_decode(&buf, &dec_param);
+	rc = publish_ack_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_ack_decode failed");
 
@@ -965,7 +965,7 @@ static int eval_msg_pubcomp(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_complete_encode(param, &buf);
+	rc = publish_complete_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_complete_encode functions*/
 	zassert_false(rc, "publish_complete_encode failed");
@@ -978,7 +978,7 @@ static int eval_msg_pubcomp(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_complete_decode(&buf, &dec_param);
+	rc = publish_complete_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_complete_decode failed");
 
@@ -1003,7 +1003,7 @@ static int eval_msg_pubrec(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_receive_encode(param, &buf);
+	rc = publish_receive_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_receive_encode functions*/
 	zassert_false(rc, "publish_receive_encode failed");
@@ -1016,7 +1016,7 @@ static int eval_msg_pubrec(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_receive_decode(&buf, &dec_param);
+	rc = publish_receive_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_receive_decode failed");
 
@@ -1041,7 +1041,7 @@ static int eval_msg_pubrel(struct mqtt_test *mqtt_test)
 	buf.cur = client.tx_buf;
 	buf.end = client.tx_buf + client.tx_buf_size;
 
-	rc = publish_release_encode(param, &buf);
+	rc = publish_release_encode(&client, param, &buf);
 
 	/**TESTPOINTS: Check publish_release_encode functions*/
 	zassert_false(rc, "publish_release_encode failed");
@@ -1054,7 +1054,7 @@ static int eval_msg_pubrel(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = publish_release_decode(&buf, &dec_param);
+	rc = publish_release_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "publish_release_decode failed");
 
@@ -1083,7 +1083,7 @@ static int eval_msg_unsuback(struct mqtt_test *mqtt_test)
 
 	zassert_false(rc, "fixed_header_decode failed");
 
-	rc = unsubscribe_ack_decode(&buf, &dec_param);
+	rc = unsubscribe_ack_decode(&client, &buf, &dec_param);
 
 	zassert_false(rc, "unsubscribe_ack_decode failed");
 
diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
index af39e89499aaa..fdb05ed97adb4 100644
--- a/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
+++ b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
@@ -1,9 +1,12 @@
 common:
+  tags:
+    - mqtt
+    - net
+    - userspace
+  min_ram: 16
   depends_on: netif
 tests:
-  net.mqtt.packet:
-    min_ram: 16
-    tags:
-      - mqtt
-      - net
-      - userspace
+  net.mqtt.packet: {}
+  net.mqtt.packet.mqtt_5_0:
+    extra_configs:
+      - CONFIG_MQTT_VERSION_5_0=y
diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt b/tests/net/lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt
new file mode 100644
index 0000000000000..7d7d86b29a95c
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(mqtt_5_packet)
+
+target_include_directories(app PRIVATE
+  ${ZEPHYR_BASE}/subsys/net/lib/mqtt
+)
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf b/tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf
new file mode 100644
index 0000000000000..60552beb0b2cd
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/prj.conf
@@ -0,0 +1,7 @@
+CONFIG_ZTEST=y
+CONFIG_NET_TEST=y
+CONFIG_NETWORKING=y
+CONFIG_ENTROPY_GENERATOR=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_MQTT_LIB=y
+CONFIG_MQTT_VERSION_5_0=y
diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v5_0/mqtt_packet/src/mqtt_packet.c
new file mode 100644
index 0000000000000..80eb96738d631
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/src/mqtt_packet.c
@@ -0,0 +1,2068 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/ztest.h>
+
+#include "mqtt_internal.h"
+
+static uint8_t auth_data[] = { 0x01, 0x02, 0x03, 0x04 };
+static uint8_t correlation_data[] = { 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 };
+static uint8_t test_payload[] = { 't', 'e', 's', 't', '_', 'p', 'a', 'y', 'l',
+				  'o', 'a', 'd' };
+
+#define BUFFER_SIZE 256
+#define CLIENTID MQTT_UTF8_LITERAL("test_id")
+#define WILL_TOPIC MQTT_UTF8_LITERAL("test_will")
+#define WILL_MSG MQTT_UTF8_LITERAL("test_will_msg")
+#define USER_PROP_NAME MQTT_UTF8_LITERAL("test_name")
+#define USER_PROP_VALUE MQTT_UTF8_LITERAL("test_value")
+#define AUTH_METHOD MQTT_UTF8_LITERAL("test_authentication")
+#define AUTH_DATA (struct mqtt_binstr) { auth_data, sizeof(auth_data) }
+#define CONTENT_TYPE MQTT_UTF8_LITERAL("test_content_type")
+#define RESPONSE_TOPIC MQTT_UTF8_LITERAL("test_response_topic")
+#define CORRELATION_DATA (struct mqtt_binstr) { correlation_data, sizeof(correlation_data) }
+#define TEST_TOPIC MQTT_UTF8_LITERAL("test_topic")
+#define TEST_PAYLOAD (struct mqtt_binstr) { test_payload, sizeof(test_payload) }
+#define TEST_MSG_ID 0x1234
+
+static uint8_t rx_buffer[BUFFER_SIZE];
+static uint8_t tx_buffer[BUFFER_SIZE];
+static struct mqtt_client client;
+
+struct mqtt_test {
+	/* Test name */
+	const char *test_name;
+
+	/* Test context, for example `struct mqtt_publish_param *` */
+	void *ctx;
+
+	/* Test function */
+	void (*test_fcn)(struct mqtt_test *tests);
+
+	/* Expected encoded packet */
+	uint8_t *expected;
+
+	/* Length packet length */
+	uint16_t expected_len;
+};
+
+static void run_packet_tests(struct mqtt_test *tests, size_t count)
+{
+	for (size_t i = 0; i < count; i++) {
+		struct mqtt_test *test = &tests[i];
+
+		TC_PRINT("Test #%u - %s\n", i + 1, test->test_name != NULL ?
+			test->test_name : "");
+
+		test->test_fcn(test);
+	};
+}
+
+static void print_buffer(const uint8_t *buf, uint16_t size)
+{
+	TC_PRINT("\n");
+	for (uint16_t i = 0U; i < size; i++) {
+		TC_PRINT("%02x ", buf[i]);
+		if ((i + 1) % 8 == 0U) {
+			TC_PRINT("\n");
+		}
+	}
+	TC_PRINT("\n");
+}
+
+static int validate_buffers(const struct buf_ctx *buf, const uint8_t *expected,
+			     uint16_t len)
+{
+	if (buf->end - buf->cur != len) {
+		goto fail;
+	}
+
+	if (memcmp(expected, buf->cur, buf->end - buf->cur) != 0) {
+		goto fail;
+	}
+
+	return 0;
+
+fail:
+	TC_PRINT("Computed:");
+	print_buffer(buf->cur, buf->end - buf->cur);
+	TC_PRINT("Expected:");
+	print_buffer(expected, len);
+
+	return -EBADMSG;
+}
+
+static int validate_structs(const void *computed, const void *expected,
+			    size_t struct_size)
+{
+	if (memcmp(expected, computed, struct_size) != 0) {
+		goto fail;
+	}
+
+	return 0;
+
+fail:
+	TC_PRINT("Computed:");
+	print_buffer(computed, struct_size);
+	TC_PRINT("Expected:");
+	print_buffer(expected, struct_size);
+
+	return -EBADMSG;
+}
+
+static void test_msg_connect(struct mqtt_test *test)
+{
+	struct mqtt_client *test_client;
+	struct buf_ctx buf;
+	int ret;
+
+	test_client = (struct mqtt_client *)test->ctx;
+
+	client.client_id = test_client->client_id;
+	client.will_topic = test_client->will_topic;
+	client.prop = test_client->prop;
+	client.will_retain = test_client->will_retain;
+	client.will_message = test_client->will_message;
+	client.will_prop = test_client->will_prop;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = connect_request_encode(&client, &buf);
+	zassert_ok(ret, "connect_request_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+}
+
+#define ENCODED_MID 0x12, 0x34
+#define ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM 0x22, 0x00, 0x05
+#define ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION 0x17, 0x00
+#define ENCODED_PROP_USER_PROPERTY \
+	0x26, 0x00, 0x09, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65
+#define ENCODED_PROP_REASON_STRING \
+	0x1f, 0x00, 0x12, 0x74, 0x65, 0x73, 0x74, 0x5F, 0x72, 0x65, 0x61, 0x73, \
+	0x6F, 0x6E, 0x5F, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67
+#define ENCODED_PROP_SESSION_EXPIRY_INTERVAL 0x11, 0x00, 0x00, 0x03, 0xe8
+#define ENCODED_PROP_RECEIVE_MAXIMUM 0x21, 0x00, 0x0a
+#define ENCODED_PROP_MAXIMUM_PACKET_SIZE 0x27, 0x00, 0x00, 0x03, 0xe8
+#define ENCODED_PROP_REQUEST_RESPONSE_INFORMATION 0x19, 0x01
+#define ENCODED_PROP_AUTHENTICATION_METHOD \
+	0x15, 0x00, 0x13, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x75, 0x74, 0x68, \
+	0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e
+#define ENCODED_PROP_AUTHENTICATION_DATA \
+	0x16, 0x00, 0x04, 0x01, 0x02, 0x03, 0x04
+#define ENCODED_PROP_WILL_DELAY_INTERVAL 0x18, 0x00, 0x00, 0x00, 0x64
+#define ENCODED_PROP_PAYLOAD_FORMAT_INDICATOR 0x01, 0x01
+#define ENCODED_PROP_MESSAGE_EXPIRY_INTERVAL 0x02, 0x00, 0x00, 0x03, 0xe8
+#define ENCODED_PROP_CONTENT_TYPE \
+	0x03, 0x00, 0x11, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, \
+	0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65
+#define ENCODED_PROP_RESPONSE_TOPIC \
+	0x08, 0x00, 0x13, 0x74, 0x65, 0x73, 0x74, 0x5F, 0x72, 0x65, 0x73, 0x70, \
+	0x6F, 0x6E, 0x73, 0x65, 0x5F, 0x74, 0x6F, 0x70, 0x69, 0x63
+#define ENCODED_PROP_CORRELATION_DATA \
+	0x09, 0x00, 0x06, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16
+#define ENCODED_PROP_MAXIMUM_QOS 0x24, 0x01
+#define ENCODED_PROP_RETAIN_AVAILABLE 0x25, 0x01
+#define ENCODED_PROP_ASSIGNED_CLIENT_ID \
+	0x12, 0x00, 0x07, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64
+#define ENCODED_PROP_TOPIC_ALIAS_MAXIMUM 0x22, 0x00, 0x0a
+#define ENCODED_PROP_WILDCARD_SUB_AVAILABLE 0x28, 0x01
+#define ENCODED_PROP_SUBSCRIPTION_IDS_AVAILABLE 0x29, 0x01
+#define ENCODED_PROP_SHARED_SUB_AVAILABLE 0x2a, 0x01
+#define ENCODED_PROP_SERVER_KEEP_ALIVE 0x13, 0x00, 0x64
+#define ENCODED_PROP_RESPONSE_INFORMATION \
+	0x1a, 0x00, 0x09, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f
+#define ENCODED_PROP_SERVER_REFERENCE \
+	0x1c, 0x00, 0x0e, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x65, \
+	0x72, 0x65, 0x6e, 0x63, 0x65
+#define ENCODED_PROP_TOPIC_ALIAS 0x23, 0x00, 0x04
+#define ENCODED_PROP_CORRELATION_DATA \
+	0x09, 0x00, 0x06, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16
+#define ENCODED_PROP_SUBSCRIPTION_IDENTIFIER 0x0b, 0xe8, 0x07
+
+#define TEST_PROP_SESSION_EXPIRY_INTERVAL 1000
+#define TEST_PROP_RECEIVE_MAXIMUM 10
+#define TEST_PROP_MAXIMUM_PACKET_SIZE 1000
+#define TEST_PROP_WILL_DELAY_INTERVAL 100
+#define TEST_PROP_PAYLOAD_FORMAT_INDICATOR 1
+#define TEST_PROP_MESSAGE_EXPIRY_INTERVAL 1000
+#define TEST_PROP_MAXIMUM_QOS 1
+#define TEST_PROP_RETAIN_AVAILABLE 1
+#define TEST_PROP_TOPIC_ALIAS_MAXIMUM 10
+#define TEST_PROP_WILDCARD_SUB_AVAILABLE 1
+#define TEST_PROP_SUBSCRIPTION_IDS_AVAILABLE 1
+#define TEST_PROP_SHARED_SUB_AVAILABLE 1
+#define TEST_PROP_SERVER_KEEP_ALIVE 100
+#define TEST_PROP_SUBSCRIPTION_IDENTIFIER 1000
+
+#define ENCODED_CONNECT_VAR_HEADER_COMMON \
+	0x00, 0x04, 0x4d, 0x51, 0x54, 0x54, 0x05, 0x00, 0x00, 0x3c
+#define ENCODED_CONNECT_PROPERTIES_DEFAULT \
+	0x05, 0x22, 0x00, 0x05, 0x17, 0x00
+#define ENCODED_CONNECT_CLIENT_ID \
+	0x00, 0x07, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64
+
+static uint8_t expect_connect_default[] = {
+	0x10, 0x19, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_default = {
+	.client_id = CLIENTID,
+};
+
+static uint8_t expect_connect_prop_sei[] = {
+	0x10, 0x1e, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x0a, ENCODED_PROP_SESSION_EXPIRY_INTERVAL,
+	ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_sei = {
+	.client_id = CLIENTID,
+	.prop.session_expiry_interval = TEST_PROP_SESSION_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_connect_prop_rm[] = {
+	0x10, 0x1c, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x08, ENCODED_PROP_RECEIVE_MAXIMUM,
+	ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_rm = {
+	.client_id = CLIENTID,
+	.prop.receive_maximum = TEST_PROP_RECEIVE_MAXIMUM,
+};
+
+static uint8_t expect_connect_prop_mps[] = {
+	0x10, 0x1e, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x0a, ENCODED_PROP_MAXIMUM_PACKET_SIZE,
+	ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+
+};
+static struct mqtt_client client_connect_prop_mps = {
+	.client_id = CLIENTID,
+	.prop.maximum_packet_size = TEST_PROP_MAXIMUM_PACKET_SIZE,
+};
+
+static uint8_t expect_connect_prop_rri[] = {
+	0x10, 0x1b, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x07, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_REQUEST_RESPONSE_INFORMATION,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_rri = {
+	.client_id = CLIENTID,
+	.prop.request_response_info = true,
+};
+
+static uint8_t expect_connect_prop_rpi[] = {
+	0x10, 0x17, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x03, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_rpi = {
+	.client_id = CLIENTID,
+	/* True is MQTT default so property should be omitted. */
+	.prop.request_problem_info = true,
+};
+
+static uint8_t expect_connect_prop_up[] = {
+	0x10, 0x31, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x1d, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_up = {
+	.client_id = CLIENTID,
+	.prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static uint8_t expect_connect_prop_am_ad[] = {
+	0x10, 0x36, ENCODED_CONNECT_VAR_HEADER_COMMON,
+	/* Properties */
+	0x22, ENCODED_PROP_DEFAULT_TOPIC_ALIAS_MAXIMUM,
+	ENCODED_PROP_DEFAULT_REQUEST_PROBLEM_INFORMATION,
+	ENCODED_PROP_AUTHENTICATION_METHOD,
+	ENCODED_PROP_AUTHENTICATION_DATA,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+};
+static struct mqtt_client client_connect_prop_am_ad = {
+	.client_id = CLIENTID,
+	.prop.auth_method = AUTH_METHOD,
+	.prop.auth_data = AUTH_DATA,
+};
+
+static struct mqtt_utf8 will_msg = WILL_MSG;
+static struct mqtt_topic will_topic = {
+	.qos = 0,
+	.topic = WILL_TOPIC,
+};
+
+#define CONNECT_WILL_COMMON \
+	.client_id = CLIENTID, \
+	.will_topic = &will_topic, \
+	.will_message = &will_msg \
+
+#define ENCODED_CONNECT_WILL_VAR_HEADER_COMMON \
+	0x00, 0x04, 0x4d, 0x51, 0x54, 0x54, 0x05, 0x04, 0x00, 0x3c
+#define ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD \
+	0x00, 0x09, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x69, 0x6c, 0x6c, \
+	0x00, 0x0d, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x69, 0x6c, 0x6c, 0x5f, \
+	0x6d, 0x73, 0x67
+
+static uint8_t expect_connect_will_default[] = {
+	0x10, 0x34, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x00,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_default = {
+	CONNECT_WILL_COMMON,
+};
+
+static uint8_t expect_connect_will_prop_di[] = {
+	0x10, 0x39, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x05, ENCODED_PROP_WILL_DELAY_INTERVAL,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_di = {
+	CONNECT_WILL_COMMON,
+	.will_prop.will_delay_interval = TEST_PROP_WILL_DELAY_INTERVAL,
+};
+
+static uint8_t expect_connect_will_prop_pfi[] = {
+	0x10, 0x36, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x02, ENCODED_PROP_PAYLOAD_FORMAT_INDICATOR,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_pfi = {
+	CONNECT_WILL_COMMON,
+	.will_prop.payload_format_indicator = TEST_PROP_PAYLOAD_FORMAT_INDICATOR,
+};
+
+static uint8_t expect_connect_will_prop_mei[] = {
+	0x10, 0x39, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x05, ENCODED_PROP_MESSAGE_EXPIRY_INTERVAL,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_mei = {
+	CONNECT_WILL_COMMON,
+	.will_prop.message_expiry_interval = TEST_PROP_MESSAGE_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_connect_will_prop_ct[] = {
+	0x10, 0x48, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x14, ENCODED_PROP_CONTENT_TYPE,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_ct = {
+	CONNECT_WILL_COMMON,
+	.will_prop.content_type = CONTENT_TYPE,
+};
+
+static uint8_t expect_connect_will_prop_rt[] = {
+	0x10, 0x4a, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x16, ENCODED_PROP_RESPONSE_TOPIC,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_rt = {
+	CONNECT_WILL_COMMON,
+	.will_prop.response_topic = RESPONSE_TOPIC,
+};
+
+static uint8_t expect_connect_will_prop_cd[] = {
+	0x10, 0x3d, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x09, ENCODED_PROP_CORRELATION_DATA,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_cd = {
+	CONNECT_WILL_COMMON,
+	.will_prop.correlation_data = CORRELATION_DATA,
+};
+
+static uint8_t expect_connect_will_prop_up[] = {
+	0x10, 0x4c, ENCODED_CONNECT_WILL_VAR_HEADER_COMMON,
+	/* Properties */
+	ENCODED_CONNECT_PROPERTIES_DEFAULT,
+	/* Payload */
+	ENCODED_CONNECT_CLIENT_ID,
+	/* Will properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	ENCODED_CONNECT_WILL_TOPIC_AND_PAYLOAD,
+};
+static struct mqtt_client client_connect_will_prop_up = {
+	CONNECT_WILL_COMMON,
+	.will_prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static struct mqtt_test connect_tests[] = {
+	{ .test_name = "CONNECT, default",
+	  .ctx = &client_connect_default, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_default,
+	  .expected_len = sizeof(expect_connect_default) },
+	{ .test_name = "CONNECT, property Session Expiry Interval",
+	  .ctx = &client_connect_prop_sei, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_sei,
+	  .expected_len = sizeof(expect_connect_prop_sei) },
+	{ .test_name = "CONNECT, property Receive Maximum",
+	  .ctx = &client_connect_prop_rm, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_rm,
+	  .expected_len = sizeof(expect_connect_prop_rm) },
+	{ .test_name = "CONNECT, property Maximum Packet Size",
+	  .ctx = &client_connect_prop_mps, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_mps,
+	  .expected_len = sizeof(expect_connect_prop_mps) },
+	{ .test_name = "CONNECT, property Request Response Information",
+	  .ctx = &client_connect_prop_rri, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_rri,
+	  .expected_len = sizeof(expect_connect_prop_rri) },
+	{ .test_name = "CONNECT, property Request Problem Information",
+	  .ctx = &client_connect_prop_rpi, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_rpi,
+	  .expected_len = sizeof(expect_connect_prop_rpi) },
+	{ .test_name = "CONNECT, property User Property",
+	  .ctx = &client_connect_prop_up, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_up,
+	  .expected_len = sizeof(expect_connect_prop_up) },
+	{ .test_name = "CONNECT, property Authentication Method and Data",
+	  .ctx = &client_connect_prop_am_ad, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_prop_am_ad,
+	  .expected_len = sizeof(expect_connect_prop_am_ad) },
+	{ .test_name = "CONNECT, WILL default",
+	  .ctx = &client_connect_will_default, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_default,
+	  .expected_len = sizeof(expect_connect_will_default) },
+	{ .test_name = "CONNECT, WILL property Will Delay Interval",
+	  .ctx = &client_connect_will_prop_di, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_di,
+	  .expected_len = sizeof(expect_connect_will_prop_di) },
+	{ .test_name = "CONNECT, WILL property Payload Format Indicator",
+	  .ctx = &client_connect_will_prop_pfi, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_pfi,
+	  .expected_len = sizeof(expect_connect_will_prop_pfi) },
+	{ .test_name = "CONNECT, WILL property Message Expiry Interval",
+	  .ctx = &client_connect_will_prop_mei, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_mei,
+	  .expected_len = sizeof(expect_connect_will_prop_mei) },
+	{ .test_name = "CONNECT, WILL property Content Type",
+	  .ctx = &client_connect_will_prop_ct, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_ct,
+	  .expected_len = sizeof(expect_connect_will_prop_ct) },
+	{ .test_name = "CONNECT, WILL property Response Topic",
+	  .ctx = &client_connect_will_prop_rt, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_rt,
+	  .expected_len = sizeof(expect_connect_will_prop_rt) },
+	{ .test_name = "CONNECT, WILL property Correlation Data",
+	  .ctx = &client_connect_will_prop_cd, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_cd,
+	  .expected_len = sizeof(expect_connect_will_prop_cd) },
+	{ .test_name = "CONNECT, WILL property User Property",
+	  .ctx = &client_connect_will_prop_up, .test_fcn = test_msg_connect,
+	  .expected = expect_connect_will_prop_up,
+	  .expected_len = sizeof(expect_connect_will_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_connect)
+{
+	run_packet_tests(connect_tests, ARRAY_SIZE(connect_tests));
+}
+
+static void test_msg_connack(struct mqtt_test *test)
+{
+	struct mqtt_connack_param *exp_param =
+			(struct mqtt_connack_param *)test->ctx;
+	struct mqtt_connack_param dec_param = { 0 };
+	int ret;
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_CONNACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = connect_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "connect_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect CONNACK params decoded");
+}
+
+static uint8_t expect_connack_default[] = {
+	0x20, 0x03, 0x01, 0x00, 0x00,
+};
+static struct mqtt_connack_param connack_default = {
+	.session_present_flag = true,
+	.return_code = MQTT_CONNACK_SUCCESS,
+};
+
+static uint8_t expect_connack_error[] = {
+	0x20, 0x03, 0x00, 0x80, 0x00,
+};
+static struct mqtt_connack_param connack_error = {
+	.return_code = MQTT_CONNACK_UNSPECIFIED_ERROR,
+};
+
+static uint8_t expect_connack_prop_sei[] = {
+	0x20, 0x08, 0x00, 0x00,
+	/* Properties */
+	0x05, ENCODED_PROP_SESSION_EXPIRY_INTERVAL,
+};
+static struct mqtt_connack_param connack_prop_sei = {
+	.prop.rx.has_session_expiry_interval = true,
+	.prop.session_expiry_interval = TEST_PROP_SESSION_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_connack_prop_rm[] = {
+	0x20, 0x06, 0x00, 0x00,
+	/* Properties */
+	0x03, ENCODED_PROP_RECEIVE_MAXIMUM,
+};
+static struct mqtt_connack_param connack_prop_rm = {
+	.prop.rx.has_receive_maximum = true,
+	.prop.receive_maximum = TEST_PROP_RECEIVE_MAXIMUM,
+};
+
+static uint8_t expect_connack_prop_mqos[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_MAXIMUM_QOS,
+};
+static struct mqtt_connack_param connack_prop_mqos = {
+	.prop.rx.has_maximum_qos = true,
+	.prop.maximum_qos = TEST_PROP_MAXIMUM_QOS,
+};
+
+static uint8_t expect_connack_prop_ra[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_RETAIN_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_ra = {
+	.prop.rx.has_retain_available = true,
+	.prop.retain_available = TEST_PROP_RETAIN_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_mps[] = {
+	0x20, 0x08, 0x00, 0x00,
+	/* Properties */
+	0x05, ENCODED_PROP_MAXIMUM_PACKET_SIZE,
+};
+static struct mqtt_connack_param connack_prop_mps = {
+	.prop.rx.has_maximum_packet_size = true,
+	.prop.maximum_packet_size = TEST_PROP_MAXIMUM_PACKET_SIZE,
+};
+
+static uint8_t expect_connack_prop_aci[] = {
+	0x20, 0x0d, 0x00, 0x00,
+	/* Properties */
+	0x0a, ENCODED_PROP_ASSIGNED_CLIENT_ID,
+};
+static struct mqtt_connack_param connack_prop_aci = {
+	.prop.rx.has_assigned_client_id = true,
+	.prop.assigned_client_id.utf8 = expect_connack_prop_aci + 8,
+	.prop.assigned_client_id.size = 7,
+};
+
+static uint8_t expect_connack_prop_tam[] = {
+	0x20, 0x06, 0x00, 0x00,
+	/* Properties */
+	0x03, ENCODED_PROP_TOPIC_ALIAS_MAXIMUM,
+};
+static struct mqtt_connack_param connack_prop_tam = {
+	.prop.rx.has_topic_alias_maximum = true,
+	.prop.topic_alias_maximum = TEST_PROP_TOPIC_ALIAS_MAXIMUM,
+};
+
+static uint8_t expect_connack_prop_rs[] = {
+	0x20, 0x18, 0x00, 0x00,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+};
+static struct mqtt_connack_param connack_prop_rs = {
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_connack_prop_rs + 8,
+	.prop.reason_string.size = 18,
+};
+
+static uint8_t expect_connack_prop_up[] = {
+	0x20, 0x1b, 0x00, 0x00,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+};
+static struct mqtt_connack_param connack_prop_up = {
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_connack_prop_up + 8,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_connack_prop_up + 19,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static uint8_t expect_connack_prop_wsa[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_WILDCARD_SUB_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_wsa = {
+	.prop.rx.has_wildcard_sub_available = true,
+	.prop.wildcard_sub_available = TEST_PROP_WILDCARD_SUB_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_sia[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_SUBSCRIPTION_IDS_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_sia = {
+	.prop.rx.has_subscription_ids_available = true,
+	.prop.subscription_ids_available = TEST_PROP_SUBSCRIPTION_IDS_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_ssa[] = {
+	0x20, 0x05, 0x00, 0x00,
+	/* Properties */
+	0x02, ENCODED_PROP_SHARED_SUB_AVAILABLE,
+};
+static struct mqtt_connack_param connack_prop_ssa = {
+	.prop.rx.has_shared_sub_available = true,
+	.prop.shared_sub_available = TEST_PROP_SHARED_SUB_AVAILABLE,
+};
+
+static uint8_t expect_connack_prop_ska[] = {
+	0x20, 0x06, 0x00, 0x00,
+	/* Properties */
+	0x03, ENCODED_PROP_SERVER_KEEP_ALIVE,
+};
+static struct mqtt_connack_param connack_prop_ska = {
+	.prop.rx.has_server_keep_alive = true,
+	.prop.server_keep_alive = TEST_PROP_SERVER_KEEP_ALIVE,
+};
+
+static uint8_t expect_connack_prop_ri[] = {
+	0x20, 0x0f, 0x00, 0x00,
+	/* Properties */
+	0x0c, ENCODED_PROP_RESPONSE_INFORMATION,
+};
+static struct mqtt_connack_param connack_prop_ri = {
+	.prop.rx.has_response_information = true,
+	.prop.response_information.utf8 = expect_connack_prop_ri + 8,
+	.prop.response_information.size = 9,
+};
+
+static uint8_t expect_connack_prop_sr[] = {
+	0x20, 0x14, 0x00, 0x00,
+	/* Properties */
+	0x11, ENCODED_PROP_SERVER_REFERENCE,
+};
+static struct mqtt_connack_param connack_prop_sr = {
+	.prop.rx.has_server_reference = true,
+	.prop.server_reference.utf8 = expect_connack_prop_sr + 8,
+	.prop.server_reference.size = 14,
+};
+
+static uint8_t expect_connack_prop_am_ad[] = {
+	0x20, 0x20, 0x00, 0x00,
+	/* Properties */
+	0x1d, ENCODED_PROP_AUTHENTICATION_METHOD,
+	ENCODED_PROP_AUTHENTICATION_DATA
+};
+static struct mqtt_connack_param connack_prop_am_ad = {
+	.prop.rx.has_auth_method = true,
+	.prop.auth_method.utf8 = expect_connack_prop_am_ad + 8,
+	.prop.auth_method.size = 19,
+	.prop.rx.has_auth_data = true,
+	.prop.auth_data.data = expect_connack_prop_am_ad + 30,
+	.prop.auth_data.len = 4,
+};
+
+static struct mqtt_test connack_tests[] = {
+	{ .test_name = "CONNACK, default",
+	  .ctx = &connack_default, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_default,
+	  .expected_len = sizeof(expect_connack_default) },
+	{ .test_name = "CONNACK, error",
+	  .ctx = &connack_error, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_error,
+	  .expected_len = sizeof(expect_connack_error) },
+	{ .test_name = "CONNACK, property Session Expiry Interval",
+	  .ctx = &connack_prop_sei, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_sei,
+	  .expected_len = sizeof(expect_connack_prop_sei) },
+	{ .test_name = "CONNACK, property Receive Maximum",
+	  .ctx = &connack_prop_rm, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_rm,
+	  .expected_len = sizeof(expect_connack_prop_rm) },
+	{ .test_name = "CONNACK, property Maximum QoS",
+	  .ctx = &connack_prop_mqos, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_mqos,
+	  .expected_len = sizeof(expect_connack_prop_mqos) },
+	{ .test_name = "CONNACK, property Retain Available",
+	  .ctx = &connack_prop_ra, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ra,
+	  .expected_len = sizeof(expect_connack_prop_ra) },
+	{ .test_name = "CONNACK, property Maximum Packet Size",
+	  .ctx = &connack_prop_mps, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_mps,
+	  .expected_len = sizeof(expect_connack_prop_mps) },
+	{ .test_name = "CONNACK, property Assigned Client Identifier",
+	  .ctx = &connack_prop_aci, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_aci,
+	  .expected_len = sizeof(expect_connack_prop_aci) },
+	{ .test_name = "CONNACK, property Topic Alias Maximum",
+	  .ctx = &connack_prop_tam, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_tam,
+	  .expected_len = sizeof(expect_connack_prop_tam) },
+	{ .test_name = "CONNACK, property Reason String",
+	  .ctx = &connack_prop_rs, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_rs,
+	  .expected_len = sizeof(expect_connack_prop_rs) },
+	{ .test_name = "CONNACK, property User Property",
+	  .ctx = &connack_prop_up, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_up,
+	  .expected_len = sizeof(expect_connack_prop_up) },
+	{ .test_name = "CONNACK, property Wildcard Subscription Available",
+	  .ctx = &connack_prop_wsa, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_wsa,
+	  .expected_len = sizeof(expect_connack_prop_wsa) },
+	{ .test_name = "CONNACK, property Subscription Identifiers Available",
+	  .ctx = &connack_prop_sia, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_sia,
+	  .expected_len = sizeof(expect_connack_prop_sia) },
+	{ .test_name = "CONNACK, property Shared Subscription Available",
+	  .ctx = &connack_prop_ssa, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ssa,
+	  .expected_len = sizeof(expect_connack_prop_ssa) },
+	{ .test_name = "CONNACK, property Server Keep Alive",
+	  .ctx = &connack_prop_ska, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ska,
+	  .expected_len = sizeof(expect_connack_prop_ska) },
+	{ .test_name = "CONNACK, property Response Information",
+	  .ctx = &connack_prop_ri, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_ri,
+	  .expected_len = sizeof(expect_connack_prop_ri) },
+	{ .test_name = "CONNACK, property Server Reference",
+	  .ctx = &connack_prop_sr, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_sr,
+	  .expected_len = sizeof(expect_connack_prop_sr) },
+	{ .test_name = "CONNACK, property Authentication Method and Data",
+	  .ctx = &connack_prop_am_ad, .test_fcn = test_msg_connack,
+	  .expected = expect_connack_prop_am_ad,
+	  .expected_len = sizeof(expect_connack_prop_am_ad) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_connack)
+{
+	run_packet_tests(connack_tests, ARRAY_SIZE(connack_tests));
+}
+
+static void test_msg_publish_dec_only(struct mqtt_test *test)
+{
+	struct mqtt_publish_param *exp_param =
+			(struct mqtt_publish_param *)test->ctx;
+	struct mqtt_publish_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBLISH,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_decode(&client, type_and_flags, length, &buf, &dec_param);
+	zassert_ok(ret, "publish_decode failed");
+
+	zassert_equal(dec_param.message_id, exp_param->message_id,
+		      "Incorrect message_id");
+	zassert_equal(dec_param.dup_flag, exp_param->dup_flag,
+		      "Incorrect dup flag");
+	zassert_equal(dec_param.retain_flag, exp_param->retain_flag,
+		      "Incorrect retain flag");
+	zassert_equal(dec_param.message.topic.qos, exp_param->message.topic.qos,
+		      "Incorrect topic qos");
+	zassert_equal(dec_param.message.topic.topic.size,
+		      exp_param->message.topic.topic.size,
+		      "Incorrect topic len");
+	zassert_mem_equal(dec_param.message.topic.topic.utf8,
+			  exp_param->message.topic.topic.utf8,
+			  dec_param.message.topic.topic.size,
+			  "Incorrect topic content");
+	zassert_equal(dec_param.message.payload.len,
+		      exp_param->message.payload.len,
+		      "Incorrect payload len");
+	zassert_ok(validate_structs(&dec_param.prop, &(exp_param->prop),
+		   sizeof(dec_param.prop)),
+		   "Incorrect PUBLISH properties decoded");
+}
+
+static void test_msg_publish(struct mqtt_test *test)
+{
+	struct mqtt_publish_param *exp_param =
+			(struct mqtt_publish_param *)test->ctx;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_encode failed");
+
+	/* Payload is not copied, copy it manually just after the header.*/
+	memcpy(buf.end, exp_param->message.payload.data,
+		exp_param->message.payload.len);
+	buf.end += exp_param->message.payload.len;
+
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	test_msg_publish_dec_only(test);
+}
+
+#define PUBLISH_COMMON \
+	.message.topic.qos = MQTT_QOS_1_AT_LEAST_ONCE, \
+	.message.topic.topic = TEST_TOPIC, \
+	.message.payload = TEST_PAYLOAD, \
+	.message_id = TEST_MSG_ID
+
+#define ENCODED_PUBLISH_TOPIC \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63
+#define ENCODED_PUBLISH_PAYLOAD \
+	0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64
+
+static uint8_t expect_publish_default[] = {
+	0x32, 0x1b, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_default = {
+	PUBLISH_COMMON,
+};
+
+static uint8_t expect_publish_prop_pfi[] = {
+	0x32, 0x1d, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x02, ENCODED_PROP_PAYLOAD_FORMAT_INDICATOR,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_pfi = {
+	PUBLISH_COMMON,
+	.prop.rx.has_payload_format_indicator = true,
+	.prop.payload_format_indicator = TEST_PROP_PAYLOAD_FORMAT_INDICATOR,
+};
+
+static uint8_t expect_publish_prop_mei[] = {
+	0x32, 0x20, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x05, ENCODED_PROP_MESSAGE_EXPIRY_INTERVAL,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_mei = {
+	PUBLISH_COMMON,
+	.prop.rx.has_message_expiry_interval = true,
+	.prop.message_expiry_interval = TEST_PROP_MESSAGE_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_publish_prop_ta[] = {
+	0x32, 0x1e, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x03, ENCODED_PROP_TOPIC_ALIAS,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_ta = {
+	PUBLISH_COMMON,
+	.prop.rx.has_topic_alias = true,
+	.prop.topic_alias = 4,
+};
+
+static uint8_t expect_publish_prop_rt[] = {
+	0x32, 0x31, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x16, ENCODED_PROP_RESPONSE_TOPIC,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_rt = {
+	PUBLISH_COMMON,
+	.prop.rx.has_response_topic = true,
+	.prop.response_topic.utf8 = expect_publish_prop_rt + 20,
+	.prop.response_topic.size = 19,
+};
+
+static uint8_t expect_publish_prop_cd[] = {
+	0x32, 0x24, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x09, ENCODED_PROP_CORRELATION_DATA,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_cd = {
+	PUBLISH_COMMON,
+	.prop.rx.has_correlation_data = true,
+	.prop.correlation_data.data = expect_publish_prop_cd + 20,
+	.prop.correlation_data.len = 6,
+};
+
+static uint8_t expect_publish_prop_up[] = {
+	0x32, 0x33, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_up = {
+	PUBLISH_COMMON,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_publish_prop_up + 20,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_publish_prop_up + 31,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static uint8_t expect_publish_prop_si[] = {
+	0x32, 0x1e, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x03, ENCODED_PROP_SUBSCRIPTION_IDENTIFIER,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_si = {
+	PUBLISH_COMMON,
+	.prop.rx.has_subscription_identifier = true,
+	.prop.subscription_identifier[0] = TEST_PROP_SUBSCRIPTION_IDENTIFIER,
+};
+
+static uint8_t expect_publish_prop_ct[] = {
+	0x32, 0x2f, ENCODED_PUBLISH_TOPIC, ENCODED_MID,
+	/* Properties */
+	0x14, ENCODED_PROP_CONTENT_TYPE,
+	/* Payload */
+	ENCODED_PUBLISH_PAYLOAD,
+};
+static struct mqtt_publish_param publish_prop_ct = {
+	PUBLISH_COMMON,
+	.prop.rx.has_content_type = true,
+	.prop.content_type.utf8 = expect_publish_prop_ct + 20,
+	.prop.content_type.size = 17,
+};
+
+static struct mqtt_test publish_tests[] = {
+	{ .test_name = "PUBLISH, default",
+	  .ctx = &publish_default, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_default,
+	  .expected_len = sizeof(expect_publish_default) },
+	{ .test_name = "PUBLISH, property Payload Format Indicator",
+	  .ctx = &publish_prop_pfi, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_pfi,
+	  .expected_len = sizeof(expect_publish_prop_pfi) },
+	{ .test_name = "PUBLISH, property Message Expiry Interval",
+	  .ctx = &publish_prop_mei, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_mei,
+	  .expected_len = sizeof(expect_publish_prop_mei) },
+	{ .test_name = "PUBLISH, property Topic Alias",
+	  .ctx = &publish_prop_ta, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_ta,
+	  .expected_len = sizeof(expect_publish_prop_ta) },
+	{ .test_name = "PUBLISH, property Response Topic",
+	  .ctx = &publish_prop_rt, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_rt,
+	  .expected_len = sizeof(expect_publish_prop_rt) },
+	{ .test_name = "PUBLISH, property Correlation Data",
+	  .ctx = &publish_prop_cd, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_cd,
+	  .expected_len = sizeof(expect_publish_prop_cd) },
+	{ .test_name = "PUBLISH, property User Property",
+	  .ctx = &publish_prop_up, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_up,
+	  .expected_len = sizeof(expect_publish_prop_up) },
+	{ .test_name = "PUBLISH, property Subscription Identifier",
+	  .ctx = &publish_prop_si, .test_fcn = test_msg_publish_dec_only,
+	  .expected = expect_publish_prop_si,
+	  .expected_len = sizeof(expect_publish_prop_si) },
+	{ .test_name = "PUBLISH, property Content Type",
+	  .ctx = &publish_prop_ct, .test_fcn = test_msg_publish,
+	  .expected = expect_publish_prop_ct,
+	  .expected_len = sizeof(expect_publish_prop_ct) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_publish)
+{
+	run_packet_tests(publish_tests, ARRAY_SIZE(publish_tests));
+}
+
+static void test_msg_puback(struct mqtt_test *test)
+{
+	struct mqtt_puback_param *exp_param =
+			(struct mqtt_puback_param *)test->ctx;
+	struct mqtt_puback_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_ack_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_ack_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBACK params decoded");
+}
+
+#define ENCODED_COMMON_ACK_DEFAULT 0x02, ENCODED_MID
+#define COMMON_ACK_DEFAULT \
+	.message_id = TEST_MSG_ID
+
+static uint8_t expect_puback_default[] = {
+	0x40, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_puback_param puback_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+#define ENCODED_COMMON_ACK_ERROR 0x03, ENCODED_MID, 0x80
+#define COMMON_ACK_ERROR \
+	.message_id = TEST_MSG_ID, \
+	.reason_code = 0x80
+
+static uint8_t expect_puback_error[] = {
+	0x40, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_puback_param puback_error = {
+	COMMON_ACK_ERROR,
+};
+
+#define ENCODED_COMMON_ACK_REASON_STRING \
+	0x19, ENCODED_MID, 0x80, \
+	0x15, ENCODED_PROP_REASON_STRING
+
+#define COMMON_ACK_REASON_STRING(exp_payload) \
+	.message_id = TEST_MSG_ID, \
+	.reason_code = 0x80, \
+	.prop.rx.has_reason_string = true, \
+	.prop.reason_string.utf8 = exp_payload + 9, \
+	.prop.reason_string.size = 18
+
+static uint8_t expect_puback_prop_rs[] = {
+	0x40, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_puback_param puback_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_puback_prop_rs),
+};
+
+#define ENCODED_COMMON_ACK_USER_PROP \
+	0x1c, ENCODED_MID, 0x00, \
+	0x18, ENCODED_PROP_USER_PROPERTY
+
+#define COMMON_ACK_USER_PROP(exp_payload) \
+	.message_id = TEST_MSG_ID, \
+	.prop.rx.has_user_prop = true, \
+	.prop.user_prop[0].name.utf8 = exp_payload + 9, \
+	.prop.user_prop[0].name.size = 9, \
+	.prop.user_prop[0].value.utf8 = exp_payload + 20, \
+	.prop.user_prop[0].value.size = 10
+
+static uint8_t expect_puback_prop_up[] = {
+	0x40, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_puback_param puback_prop_up = {
+	COMMON_ACK_USER_PROP(expect_puback_prop_up),
+};
+
+static struct mqtt_test puback_tests[] = {
+	{ .test_name = "PUBACK, default",
+	  .ctx = &puback_default, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_default,
+	  .expected_len = sizeof(expect_puback_default) },
+	{ .test_name = "PUBACK, error",
+	  .ctx = &puback_error, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_error,
+	  .expected_len = sizeof(expect_puback_error) },
+	{ .test_name = "PUBACK, property Reason String",
+	  .ctx = &puback_prop_rs, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_prop_rs,
+	  .expected_len = sizeof(expect_puback_prop_rs) },
+	{ .test_name = "PUBACK, property User Property",
+	  .ctx = &puback_prop_up, .test_fcn = test_msg_puback,
+	  .expected = expect_puback_prop_up,
+	  .expected_len = sizeof(expect_puback_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_puback)
+{
+	run_packet_tests(puback_tests, ARRAY_SIZE(puback_tests));
+}
+
+static void test_msg_pubrec(struct mqtt_test *test)
+{
+	struct mqtt_pubrec_param *exp_param =
+			(struct mqtt_pubrec_param *)test->ctx;
+	struct mqtt_pubrec_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_receive_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_receive_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBREC,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_receive_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_receive_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBREC params decoded");
+}
+
+static uint8_t expect_pubrec_default[] = {
+	0x50, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_pubrec_param pubrec_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+static uint8_t expect_pubrec_error[] = {
+	0x50, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_pubrec_param pubrec_error = {
+	COMMON_ACK_ERROR,
+};
+
+static uint8_t expect_pubrec_prop_rs[] = {
+	0x50, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_pubrec_param pubrec_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_pubrec_prop_rs),
+};
+
+static uint8_t expect_pubrec_prop_up[] = {
+	0x50, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_pubrec_param pubrec_prop_up = {
+	COMMON_ACK_USER_PROP(expect_pubrec_prop_up),
+};
+
+static struct mqtt_test pubrec_tests[] = {
+	{ .test_name = "PUBREC, default",
+	  .ctx = &pubrec_default, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_default,
+	  .expected_len = sizeof(expect_pubrec_default) },
+	{ .test_name = "PUBREC, error",
+	  .ctx = &pubrec_error, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_error,
+	  .expected_len = sizeof(expect_pubrec_error) },
+	{ .test_name = "PUBREC, property Reason String",
+	  .ctx = &pubrec_prop_rs, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_prop_rs,
+	  .expected_len = sizeof(expect_pubrec_prop_rs) },
+	{ .test_name = "PUBREC, property User Property",
+	  .ctx = &pubrec_prop_up, .test_fcn = test_msg_pubrec,
+	  .expected = expect_pubrec_prop_up,
+	  .expected_len = sizeof(expect_pubrec_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_pubrec)
+{
+	run_packet_tests(pubrec_tests, ARRAY_SIZE(pubrec_tests));
+}
+
+static void test_msg_pubrel(struct mqtt_test *test)
+{
+	struct mqtt_pubrel_param *exp_param =
+			(struct mqtt_pubrel_param *)test->ctx;
+	struct mqtt_pubrel_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_release_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_release_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBREL,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_release_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_release_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBREL params decoded");
+}
+
+static uint8_t expect_pubrel_default[] = {
+	0x62, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_pubrel_param pubrel_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+static uint8_t expect_pubrel_error[] = {
+	0x62, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_pubrel_param pubrel_error = {
+	COMMON_ACK_ERROR,
+};
+
+static uint8_t expect_pubrel_prop_rs[] = {
+	0x62, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_pubrel_param pubrel_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_pubrel_prop_rs),
+};
+
+static uint8_t expect_pubrel_prop_up[] = {
+	0x62, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_pubrel_param pubrel_prop_up = {
+	COMMON_ACK_USER_PROP(expect_pubrel_prop_up),
+};
+
+static struct mqtt_test pubrel_tests[] = {
+	{ .test_name = "PUBREL, default",
+	  .ctx = &pubrel_default, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_default,
+	  .expected_len = sizeof(expect_pubrel_default) },
+	{ .test_name = "PUBREL, error",
+	  .ctx = &pubrel_error, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_error,
+	  .expected_len = sizeof(expect_pubrel_error) },
+	{ .test_name = "PUBREL, property Reason String",
+	  .ctx = &pubrel_prop_rs, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_prop_rs,
+	  .expected_len = sizeof(expect_pubrel_prop_rs) },
+	{ .test_name = "PUBREL, property User Property",
+	  .ctx = &pubrel_prop_up, .test_fcn = test_msg_pubrel,
+	  .expected = expect_pubrel_prop_up,
+	  .expected_len = sizeof(expect_pubrel_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_pubrel)
+{
+	run_packet_tests(pubrel_tests, ARRAY_SIZE(pubrel_tests));
+}
+
+static void test_msg_pubcomp(struct mqtt_test *test)
+{
+	struct mqtt_pubcomp_param *exp_param =
+			(struct mqtt_pubcomp_param *)test->ctx;
+	struct mqtt_pubcomp_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = publish_complete_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "publish_complete_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_PUBCOMP,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = publish_complete_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "publish_complete_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect PUBCOMP params decoded");
+}
+
+static uint8_t expect_pubcomp_default[] = {
+	0x70, ENCODED_COMMON_ACK_DEFAULT,
+};
+static struct mqtt_pubcomp_param pubcomp_default = {
+	COMMON_ACK_DEFAULT,
+};
+
+static uint8_t expect_pubcomp_error[] = {
+	0x70, ENCODED_COMMON_ACK_ERROR,
+};
+static struct mqtt_pubcomp_param pubcomp_error = {
+	COMMON_ACK_ERROR,
+};
+
+static uint8_t expect_pubcomp_prop_rs[] = {
+	0x70, ENCODED_COMMON_ACK_REASON_STRING,
+};
+static struct mqtt_pubcomp_param pubcomp_prop_rs = {
+	COMMON_ACK_REASON_STRING(expect_pubcomp_prop_rs),
+};
+
+static uint8_t expect_pubcomp_prop_up[] = {
+	0x70, ENCODED_COMMON_ACK_USER_PROP,
+};
+static struct mqtt_pubcomp_param pubcomp_prop_up = {
+	COMMON_ACK_USER_PROP(expect_pubcomp_prop_up),
+};
+
+static struct mqtt_test pubcomp_tests[] = {
+	{ .test_name = "PUBCOMP, default",
+	  .ctx = &pubcomp_default, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_default,
+	  .expected_len = sizeof(expect_pubcomp_default) },
+	{ .test_name = "PUBCOMP, error",
+	  .ctx = &pubcomp_error, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_error,
+	  .expected_len = sizeof(expect_pubcomp_error) },
+	{ .test_name = "PUBCOMP, property Reason String",
+	  .ctx = &pubcomp_prop_rs, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_prop_rs,
+	  .expected_len = sizeof(expect_pubcomp_prop_rs) },
+	{ .test_name = "PUBCOMP, property User Property",
+	  .ctx = &pubcomp_prop_up, .test_fcn = test_msg_pubcomp,
+	  .expected = expect_pubcomp_prop_up,
+	  .expected_len = sizeof(expect_pubcomp_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_pubcomp)
+{
+	run_packet_tests(pubcomp_tests, ARRAY_SIZE(pubcomp_tests));
+}
+
+static void test_msg_subscribe(struct mqtt_test *test)
+{
+	struct mqtt_subscription_list *exp_param =
+		(struct mqtt_subscription_list *)test->ctx;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = subscribe_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "subscribe_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+}
+
+static struct mqtt_topic test_sub_topic = {
+	.qos = MQTT_QOS_1_AT_LEAST_ONCE,
+	.topic = TEST_TOPIC,
+};
+
+#define SUBSCRIBE_COMMON \
+	.list = &test_sub_topic, \
+	.list_count = 1, \
+	.message_id = TEST_MSG_ID
+
+#define ENCODED_SUBSCRIBE_TOPIC \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63, \
+	0x01
+
+static uint8_t expect_subscribe_default[] = {
+	0x82, 0x10, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	ENCODED_SUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list subscribe_default = {
+	SUBSCRIBE_COMMON,
+};
+
+static uint8_t expect_subscribe_prop_si[] = {
+	0x82, 0x13, ENCODED_MID,
+	/* Properties */
+	0x03, ENCODED_PROP_SUBSCRIPTION_IDENTIFIER,
+	/* Payload */
+	ENCODED_SUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list subscribe_prop_si = {
+	SUBSCRIBE_COMMON,
+	.prop.subscription_identifier = 1000,
+};
+
+static uint8_t expect_subscribe_prop_up[] = {
+	0x82, 0x28, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_SUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list subscribe_prop_up = {
+	SUBSCRIBE_COMMON,
+	.prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static struct mqtt_test subscribe_tests[] = {
+	{ .test_name = "SUBSCRIBE, default",
+	  .ctx = &subscribe_default, .test_fcn = test_msg_subscribe,
+	  .expected = expect_subscribe_default,
+	  .expected_len = sizeof(expect_subscribe_default) },
+	{ .test_name = "SUBSCRIBE, property Subscription Identifier",
+	  .ctx = &subscribe_prop_si, .test_fcn = test_msg_subscribe,
+	  .expected = expect_subscribe_prop_si,
+	  .expected_len = sizeof(expect_subscribe_prop_si) },
+	{ .test_name = "SUBSCRIBE, property User Property",
+	  .ctx = &subscribe_prop_up, .test_fcn = test_msg_subscribe,
+	  .expected = expect_subscribe_prop_up,
+	  .expected_len = sizeof(expect_subscribe_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_subscribe)
+{
+	run_packet_tests(subscribe_tests, ARRAY_SIZE(subscribe_tests));
+}
+
+static void test_msg_suback(struct mqtt_test *test)
+{
+	struct mqtt_suback_param *exp_param =
+			(struct mqtt_suback_param *)test->ctx;
+	struct mqtt_suback_param dec_param = { 0 };
+	int ret;
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_SUBACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = subscribe_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "subscribe_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect SUBACK params decoded");
+}
+
+static uint8_t expect_suback_default[] = {
+	0x90, 0x05, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	0x01, 0x02,
+};
+static struct mqtt_suback_param suback_default = {
+	.message_id = TEST_MSG_ID,
+	.return_codes.data = expect_suback_default + 5,
+	.return_codes.len = 2,
+};
+
+static uint8_t expect_suback_prop_rs[] = {
+	0x90, 0x1a, ENCODED_MID,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+	/* Payload */
+	0x01, 0x02,
+};
+static struct mqtt_suback_param suback_prop_rs = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_suback_prop_rs + 8,
+	.prop.reason_string.size = 18,
+	.return_codes.data = expect_suback_prop_rs + 26,
+	.return_codes.len = 2,
+};
+
+static uint8_t expect_suback_prop_up[] = {
+	0x90, 0x1d, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	0x01, 0x02,
+};
+static struct mqtt_suback_param suback_prop_up = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_suback_prop_up + 8,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_suback_prop_up + 19,
+	.prop.user_prop[0].value.size = 10,
+	.return_codes.data = expect_suback_prop_up + 29,
+	.return_codes.len = 2,
+};
+
+static struct mqtt_test suback_tests[] = {
+	{ .test_name = "SUBACK, default",
+	  .ctx = &suback_default, .test_fcn = test_msg_suback,
+	  .expected = expect_suback_default,
+	  .expected_len = sizeof(expect_suback_default) },
+	{ .test_name = "SUBACK, property Reason String",
+	  .ctx = &suback_prop_rs, .test_fcn = test_msg_suback,
+	  .expected = expect_suback_prop_rs,
+	  .expected_len = sizeof(expect_suback_prop_rs) },
+	{ .test_name = "SUBACK, property User Property",
+	  .ctx = &suback_prop_up, .test_fcn = test_msg_suback,
+	  .expected = expect_suback_prop_up,
+	  .expected_len = sizeof(expect_suback_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_suback)
+{
+	run_packet_tests(suback_tests, ARRAY_SIZE(suback_tests));
+}
+
+static void test_msg_unsubscribe(struct mqtt_test *test)
+{
+	struct mqtt_subscription_list *exp_param =
+		(struct mqtt_subscription_list *)test->ctx;
+	struct buf_ctx buf;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = unsubscribe_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "unsubscribe_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+}
+
+static struct mqtt_topic test_unsub_topic = {
+	.qos = MQTT_QOS_1_AT_LEAST_ONCE,
+	.topic = TEST_TOPIC,
+};
+
+#define UNSUBSCRIBE_COMMON \
+	.list = &test_unsub_topic, \
+	.list_count = 1, \
+	.message_id = TEST_MSG_ID
+
+#define ENCODED_UNSUBSCRIBE_TOPIC \
+	0x00, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63
+
+static uint8_t expect_unsubscribe_default[] = {
+	0xa2, 0x0f, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	ENCODED_UNSUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list unsubscribe_default = {
+	UNSUBSCRIBE_COMMON,
+};
+
+static uint8_t expect_unsubscribe_prop_up[] = {
+	0xa2, 0x27, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	ENCODED_UNSUBSCRIBE_TOPIC,
+};
+static struct mqtt_subscription_list unsubscribe_prop_up = {
+	UNSUBSCRIBE_COMMON,
+	.prop.user_prop[0] = {
+		.name = USER_PROP_NAME,
+		.value = USER_PROP_VALUE,
+	},
+};
+
+static struct mqtt_test unsubscribe_tests[] = {
+	{ .test_name = "UNSUBSCRIBE, default",
+	  .ctx = &unsubscribe_default, .test_fcn = test_msg_unsubscribe,
+	  .expected = expect_unsubscribe_default,
+	  .expected_len = sizeof(expect_unsubscribe_default) },
+	{ .test_name = "UNSUBSCRIBE, property User Property",
+	  .ctx = &unsubscribe_prop_up, .test_fcn = test_msg_unsubscribe,
+	  .expected = expect_unsubscribe_prop_up,
+	  .expected_len = sizeof(expect_unsubscribe_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_unsubscribe)
+{
+	run_packet_tests(unsubscribe_tests, ARRAY_SIZE(unsubscribe_tests));
+}
+
+static void test_msg_unsuback(struct mqtt_test *test)
+{
+	struct mqtt_unsuback_param *exp_param =
+			(struct mqtt_unsuback_param *)test->ctx;
+	struct mqtt_unsuback_param dec_param = { 0 };
+	int ret;
+	uint8_t type_and_flags;
+	uint32_t length;
+	struct buf_ctx buf;
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_UNSUBACK,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = unsubscribe_ack_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "unsubscribe_ack_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect UNSUBACK params decoded");
+}
+
+static uint8_t expect_unsuback_default[] = {
+	0xb0, 0x05, ENCODED_MID,
+	/* No properties */
+	0x00,
+	/* Payload */
+	0x00, 0x00,
+};
+static struct mqtt_unsuback_param unsuback_default = {
+	.message_id = TEST_MSG_ID,
+	.reason_codes.data = expect_unsuback_default + 5,
+	.reason_codes.len = 2,
+};
+
+static uint8_t expect_unsuback_prop_rs[] = {
+	0xb0, 0x19, ENCODED_MID,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+	/* Payload */
+	0x00,
+};
+static struct mqtt_unsuback_param unsuback_prop_rs = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_unsuback_prop_rs + 8,
+	.prop.reason_string.size = 18,
+	.reason_codes.data = expect_unsuback_prop_rs + 26,
+	.reason_codes.len = 1,
+};
+
+static uint8_t expect_unsuback_prop_up[] = {
+	0xb0, 0x1c, ENCODED_MID,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+	/* Payload */
+	0x00,
+};
+static struct mqtt_unsuback_param unsuback_prop_up = {
+	.message_id = TEST_MSG_ID,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_unsuback_prop_up + 8,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_unsuback_prop_up + 19,
+	.prop.user_prop[0].value.size = 10,
+	.reason_codes.data = expect_unsuback_prop_up + 29,
+	.reason_codes.len = 1,
+};
+
+static struct mqtt_test unsuback_tests[] = {
+	{ .test_name = "UNSUBACK, default",
+	  .ctx = &unsuback_default, .test_fcn = test_msg_unsuback,
+	  .expected = expect_unsuback_default,
+	  .expected_len = sizeof(expect_unsuback_default) },
+	{ .test_name = "UNSUBACK, property Reason String",
+	  .ctx = &unsuback_prop_rs, .test_fcn = test_msg_unsuback,
+	  .expected = expect_unsuback_prop_rs,
+	  .expected_len = sizeof(expect_unsuback_prop_rs) },
+	{ .test_name = "UNSUBACK, property User Property",
+	  .ctx = &unsuback_prop_up, .test_fcn = test_msg_unsuback,
+	  .expected = expect_unsuback_prop_up,
+	  .expected_len = sizeof(expect_unsuback_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_unsuback)
+{
+	run_packet_tests(unsuback_tests, ARRAY_SIZE(unsuback_tests));
+}
+
+static void test_msg_disconnect(struct mqtt_test *test)
+{
+	struct mqtt_disconnect_param *exp_param =
+			(struct mqtt_disconnect_param *)test->ctx;
+	struct mqtt_disconnect_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	struct buf_ctx buf;
+	uint32_t length;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = disconnect_encode(&client, exp_param, &buf);
+	zassert_ok(ret, "disconnect_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_DISCONNECT,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = disconnect_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "disconnect_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect DISCONNECT params decoded");
+}
+
+static uint8_t expect_disconnect_default[] = {
+	0xe0, 0x00,
+};
+static struct mqtt_disconnect_param disconnect_default = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+};
+
+static uint8_t expect_disconnect_error[] = {
+	0xe0, 0x01, 0x82,
+};
+static struct mqtt_disconnect_param disconnect_error = {
+	.reason_code = MQTT_DISCONNECT_PROTOCOL_ERROR,
+};
+
+static uint8_t expect_disconnect_prop_sei[] = {
+	0xe0, 0x07, 0x00,
+	/* Properties */
+	0x05, ENCODED_PROP_SESSION_EXPIRY_INTERVAL,
+};
+static struct mqtt_disconnect_param disconnect_prop_sei = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+	.prop.rx.has_session_expiry_interval = true,
+	.prop.session_expiry_interval = TEST_PROP_SESSION_EXPIRY_INTERVAL,
+};
+
+static uint8_t expect_disconnect_prop_rs[] = {
+	0xe0, 0x17, 0x82,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+};
+static struct mqtt_disconnect_param disconnect_prop_rs = {
+	.reason_code = MQTT_DISCONNECT_PROTOCOL_ERROR,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_disconnect_prop_rs + 7,
+	.prop.reason_string.size = 18,
+};
+
+static uint8_t expect_disconnect_prop_up[] = {
+	0xe0, 0x1a, 0x00,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+};
+static struct mqtt_disconnect_param disconnect_prop_up = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_disconnect_prop_up + 7,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_disconnect_prop_up + 18,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static uint8_t expect_disconnect_prop_sr[] = {
+	0xe0, 0x13, 0x00,
+	/* Properties */
+	0x11, ENCODED_PROP_SERVER_REFERENCE,
+};
+static struct mqtt_disconnect_param disconnect_prop_sr = {
+	.reason_code = MQTT_DISCONNECT_NORMAL,
+	.prop.rx.has_server_reference = true,
+	.prop.server_reference.utf8 = expect_disconnect_prop_sr + 7,
+	.prop.server_reference.size = 14,
+};
+
+static struct mqtt_test disconnect_tests[] = {
+	{ .test_name = "DISCONNECT, default",
+	  .ctx = &disconnect_default, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_default,
+	  .expected_len = sizeof(expect_disconnect_default) },
+	{ .test_name = "DISCONNECT, error",
+	  .ctx = &disconnect_error, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_error,
+	  .expected_len = sizeof(expect_disconnect_error) },
+	{ .test_name = "DISCONNECT, property Session Expiry Interval",
+	  .ctx = &disconnect_prop_sei, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_sei,
+	  .expected_len = sizeof(expect_disconnect_prop_sei) },
+	{ .test_name = "DISCONNECT, property Reason String",
+	  .ctx = &disconnect_prop_rs, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_rs,
+	  .expected_len = sizeof(expect_disconnect_prop_rs) },
+	{ .test_name = "DISCONNECT, property User Property",
+	  .ctx = &disconnect_prop_up, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_up,
+	  .expected_len = sizeof(expect_disconnect_prop_up) },
+	{ .test_name = "DISCONNECT, property Server Reference",
+	  .ctx = &disconnect_prop_sr, .test_fcn = test_msg_disconnect,
+	  .expected = expect_disconnect_prop_sr,
+	  .expected_len = sizeof(expect_disconnect_prop_sr) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_disconnect)
+{
+	run_packet_tests(disconnect_tests, ARRAY_SIZE(disconnect_tests));
+}
+
+static void test_msg_auth(struct mqtt_test *test)
+{
+	struct mqtt_auth_param *exp_param =
+			(struct mqtt_auth_param *)test->ctx;
+	struct mqtt_auth_param dec_param = { 0 };
+	uint8_t type_and_flags;
+	struct buf_ctx buf;
+	uint32_t length;
+	int ret;
+
+	buf.cur = client.tx_buf;
+	buf.end = client.tx_buf + client.tx_buf_size;
+
+	ret = auth_encode(exp_param, &buf);
+	zassert_ok(ret, "auth_encode failed");
+	zassert_ok(validate_buffers(&buf, test->expected,
+				    test->expected_len),
+		   "Invalid packet content");
+
+	buf.cur = test->expected;
+	buf.end = test->expected + test->expected_len;
+
+	ret = fixed_header_decode(&buf, &type_and_flags, &length);
+	zassert_ok(ret, "fixed_header_decode failed");
+	zassert_equal(type_and_flags & 0xF0, MQTT_PKT_TYPE_AUTH,
+		      "Invalid packet type");
+	zassert_equal(length, test->expected_len - 2,
+		      "Invalid packet length");
+
+	ret = auth_decode(&client, &buf, &dec_param);
+	zassert_ok(ret, "auth_decode failed");
+	zassert_ok(validate_structs(&dec_param, exp_param, sizeof(dec_param)),
+		   "Incorrect AUTH params decoded");
+}
+
+static uint8_t expect_auth_default[] = {
+	0xf0, 0x00,
+};
+static struct mqtt_auth_param auth_default = {
+	.reason_code = MQTT_AUTH_SUCCESS,
+};
+
+static uint8_t expect_auth_reason[] = {
+	0xf0, 0x01, 0x18,
+};
+static struct mqtt_auth_param auth_reason = {
+	.reason_code = MQTT_AUTH_CONTINUE_AUTHENTICATION,
+};
+
+static uint8_t expect_auth_prop_am_ad[] = {
+	0xf0, 0x1f, 0x00,
+	/* Properties */
+	0x1d, ENCODED_PROP_AUTHENTICATION_METHOD,
+	ENCODED_PROP_AUTHENTICATION_DATA,
+};
+static struct mqtt_auth_param auth_prop_am_ad = {
+	.reason_code = MQTT_AUTH_SUCCESS,
+	.prop.rx.has_auth_method = true,
+	.prop.auth_method.utf8 = expect_auth_prop_am_ad + 7,
+	.prop.auth_method.size = 19,
+	.prop.rx.has_auth_data = true,
+	.prop.auth_data.data = expect_auth_prop_am_ad + 29,
+	.prop.auth_data.len = 4,
+};
+
+static uint8_t expect_auth_prop_rs[] = {
+	0xf0, 0x17, 0x18,
+	/* Properties */
+	0x15, ENCODED_PROP_REASON_STRING,
+};
+static struct mqtt_auth_param auth_prop_rs = {
+	.reason_code = MQTT_AUTH_CONTINUE_AUTHENTICATION,
+	.prop.rx.has_reason_string = true,
+	.prop.reason_string.utf8 = expect_auth_prop_rs + 7,
+	.prop.reason_string.size = 18,
+};
+
+static uint8_t expect_auth_prop_up[] = {
+	0xf0, 0x1a, 0x00,
+	/* Properties */
+	0x18, ENCODED_PROP_USER_PROPERTY,
+};
+static struct mqtt_auth_param auth_prop_up = {
+	.reason_code = MQTT_AUTH_SUCCESS,
+	.prop.rx.has_user_prop = true,
+	.prop.user_prop[0].name.utf8 = expect_auth_prop_up + 7,
+	.prop.user_prop[0].name.size = 9,
+	.prop.user_prop[0].value.utf8 = expect_auth_prop_up + 18,
+	.prop.user_prop[0].value.size = 10,
+};
+
+static struct mqtt_test auth_tests[] = {
+	{ .test_name = "AUTH, default",
+	  .ctx = &auth_default, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_default,
+	  .expected_len = sizeof(expect_auth_default) },
+	{ .test_name = "AUTH, reason code",
+	  .ctx = &auth_reason, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_reason,
+	  .expected_len = sizeof(expect_auth_reason) },
+	{ .test_name = "AUTH, property Authentication Method and Data",
+	  .ctx = &auth_prop_am_ad, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_prop_am_ad,
+	  .expected_len = sizeof(expect_auth_prop_am_ad) },
+	{ .test_name = "AUTH, property Reason String",
+	  .ctx = &auth_prop_rs, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_prop_rs,
+	  .expected_len = sizeof(expect_auth_prop_rs) },
+	{ .test_name = "AUTH, property User Property",
+	  .ctx = &auth_prop_up, .test_fcn = test_msg_auth,
+	  .expected = expect_auth_prop_up,
+	  .expected_len = sizeof(expect_auth_prop_up) },
+};
+
+ZTEST(mqtt_5_packet, test_mqtt_5_auth)
+{
+	run_packet_tests(auth_tests, ARRAY_SIZE(auth_tests));
+}
+
+static void packet_tests_before(void *fixture)
+{
+	ARG_UNUSED(fixture);
+
+	mqtt_client_init(&client);
+	client.protocol_version = MQTT_VERSION_5_0;
+	client.rx_buf = rx_buffer;
+	client.rx_buf_size = sizeof(rx_buffer);
+	client.tx_buf = tx_buffer;
+	client.tx_buf_size = sizeof(tx_buffer);
+}
+
+static void packet_tests_after(void *fixture)
+{
+	ARG_UNUSED(fixture);
+
+	memset(&client, 0, sizeof(client));
+}
+
+ZTEST_SUITE(mqtt_5_packet, NULL, NULL, packet_tests_before, packet_tests_after, NULL);
diff --git a/tests/net/lib/mqtt/v5_0/mqtt_packet/testcase.yaml b/tests/net/lib/mqtt/v5_0/mqtt_packet/testcase.yaml
new file mode 100644
index 0000000000000..8c639e76cefea
--- /dev/null
+++ b/tests/net/lib/mqtt/v5_0/mqtt_packet/testcase.yaml
@@ -0,0 +1,9 @@
+common:
+  tags:
+    - mqtt
+    - net
+    - userspace
+  min_ram: 16
+  depends_on: netif
+tests:
+  net.mqtt_5.packet: {}
diff --git a/tests/net/lib/prometheus/collector/testcase.yaml b/tests/net/lib/prometheus/collector/testcase.yaml
index 978c8e601de76..8c16ec03a0b59 100644
--- a/tests/net/lib/prometheus/collector/testcase.yaml
+++ b/tests/net/lib/prometheus/collector/testcase.yaml
@@ -5,7 +5,4 @@ tests:
     integration_platforms:
       - native_sim
       - qemu_x86
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     tags: prometheus
diff --git a/tests/net/lib/prometheus/counter/testcase.yaml b/tests/net/lib/prometheus/counter/testcase.yaml
index 596b3a6e922dc..97a8431a4406a 100644
--- a/tests/net/lib/prometheus/counter/testcase.yaml
+++ b/tests/net/lib/prometheus/counter/testcase.yaml
@@ -5,7 +5,4 @@ tests:
     integration_platforms:
       - native_sim
       - qemu_x86
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     tags: prometheus
diff --git a/tests/net/lib/prometheus/formatter/testcase.yaml b/tests/net/lib/prometheus/formatter/testcase.yaml
index 16ca0103bdeb5..b80fecbf77520 100644
--- a/tests/net/lib/prometheus/formatter/testcase.yaml
+++ b/tests/net/lib/prometheus/formatter/testcase.yaml
@@ -5,7 +5,4 @@ tests:
     integration_platforms:
       - native_sim
       - qemu_x86
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     tags: prometheus
diff --git a/tests/net/lib/prometheus/gauge/testcase.yaml b/tests/net/lib/prometheus/gauge/testcase.yaml
index c4e59abbe05a9..e7e83f40f7794 100644
--- a/tests/net/lib/prometheus/gauge/testcase.yaml
+++ b/tests/net/lib/prometheus/gauge/testcase.yaml
@@ -5,7 +5,4 @@ tests:
     integration_platforms:
       - native_sim
       - qemu_x86
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     tags: prometheus
diff --git a/tests/net/lib/prometheus/histogram/testcase.yaml b/tests/net/lib/prometheus/histogram/testcase.yaml
index 36eec9aafc000..8f9a0aa3d2407 100644
--- a/tests/net/lib/prometheus/histogram/testcase.yaml
+++ b/tests/net/lib/prometheus/histogram/testcase.yaml
@@ -5,7 +5,4 @@ tests:
     integration_platforms:
       - native_sim
       - qemu_x86
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     tags: prometheus
diff --git a/tests/net/lib/prometheus/summary/testcase.yaml b/tests/net/lib/prometheus/summary/testcase.yaml
index beea2a5b502f6..02a9db7ceef9b 100644
--- a/tests/net/lib/prometheus/summary/testcase.yaml
+++ b/tests/net/lib/prometheus/summary/testcase.yaml
@@ -5,7 +5,4 @@ tests:
     integration_platforms:
       - native_sim
       - qemu_x86
-    platform_exclude:
-      - native_posix
-      - native_posix/native/64
     tags: prometheus
diff --git a/tests/net/lib/tls_credentials/src/main.c b/tests/net/lib/tls_credentials/src/main.c
index e45704d08ce6a..d620aaa0909b7 100644
--- a/tests/net/lib/tls_credentials/src/main.c
+++ b/tests/net/lib/tls_credentials/src/main.c
@@ -34,10 +34,10 @@ static void test_credential_add(void)
 	/* Function should allow to add credentials of different types
 	 * with the same tag
 	 */
-	ret = tls_credential_add(common_tag, TLS_CREDENTIAL_SERVER_CERTIFICATE,
+	ret = tls_credential_add(common_tag, TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				 test_server_cert, sizeof(test_server_cert));
 	zassert_equal(ret, 0, "Failed to add credential %d %d",
-		      common_tag, TLS_CREDENTIAL_SERVER_CERTIFICATE);
+		      common_tag, TLS_CREDENTIAL_PUBLIC_CERTIFICATE);
 
 	ret = tls_credential_add(common_tag, TLS_CREDENTIAL_PRIVATE_KEY,
 				 test_server_key, sizeof(test_server_key));
@@ -87,7 +87,7 @@ static void test_credential_get(void)
 
 	/* Try to read with too small buffer */
 	credlen = sizeof(test_server_cert) - 1;
-	ret = tls_credential_get(common_tag, TLS_CREDENTIAL_SERVER_CERTIFICATE,
+	ret = tls_credential_get(common_tag, TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				 cred, &credlen);
 	zassert_equal(ret, -EFBIG, "Should have failed with EFBIG");
 }
@@ -121,7 +121,7 @@ static void test_credential_internal_iterate(void)
 		cert = temp;
 	}
 
-	zassert_equal(cert->type, TLS_CREDENTIAL_SERVER_CERTIFICATE,
+	zassert_equal(cert->type, TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 		      "Invalid type for cert");
 	zassert_equal(cert->tag, common_tag, "Invalid tag for cert");
 	zassert_equal(cert->len, sizeof(test_server_cert),
diff --git a/tests/net/lib/wifi_credentials/prj.conf b/tests/net/lib/wifi_credentials/prj.conf
index 6c474ef277725..5ab70cd012644 100644
--- a/tests/net/lib/wifi_credentials/prj.conf
+++ b/tests/net/lib/wifi_credentials/prj.conf
@@ -1,7 +1,7 @@
 #
 # Copyright (c) 2024 Nordic Semiconductor ASA
 #
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+# SPDX-License-Identifier: Apache-2.0
 #
 
 CONFIG_ZTEST=y
diff --git a/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt b/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt
index 6ff95328fff17..15bd547a82d74 100644
--- a/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt
+++ b/tests/net/lib/wifi_credentials_backend_psa/CMakeLists.txt
@@ -27,7 +27,6 @@ target_compile_options(app
   -DCONFIG_WIFI_CREDENTIALS_MAX_ENTRIES=2
   -DCONFIG_WIFI_CREDENTIALS_SAE_PASSWORD_LENGTH=128
   -DCONFIG_WIFI_CREDENTIALS_LOG_LEVEL=4
-  -DCONFIG_WIFI_CREDENTIALS_BACKEND_PSA_OFFSET=5
 )
 
 set_property(
diff --git a/tests/net/lib/wifi_credentials_backend_psa/src/main.c b/tests/net/lib/wifi_credentials_backend_psa/src/main.c
index f0b2b6804ab06..5e89079e116da 100644
--- a/tests/net/lib/wifi_credentials_backend_psa/src/main.c
+++ b/tests/net/lib/wifi_credentials_backend_psa/src/main.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
+#include <zephyr/psa/key_ids.h>
 
 #include <zephyr/fff.h>
 
@@ -31,9 +32,6 @@
 #define BSSID2    NULL
 #define FLAGS2    0
 
-#define WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN                                               \
-	(PSA_KEY_ID_USER_MIN + CONFIG_WIFI_CREDENTIALS_BACKEND_PSA_OFFSET)
-
 DEFINE_FFF_GLOBALS;
 
 K_MUTEX_DEFINE(wifi_credentials_mutex);
@@ -83,7 +81,7 @@ psa_status_t custom_psa_export_key(mbedtls_svc_key_id_t key, uint8_t *data, size
 
 static void custom_psa_set_key_id(psa_key_attributes_t *attributes, mbedtls_svc_key_id_t key)
 {
-	zassert_equal(idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN, key, "Key ID mismatch");
+	zassert_equal(idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN, key, "Key ID mismatch");
 }
 
 void custom_psa_set_key_bits(psa_key_attributes_t *attributes, size_t bits)
@@ -175,7 +173,7 @@ ZTEST(wifi_credentials_backend_psa, test_add)
 ZTEST(wifi_credentials_backend_psa, test_get)
 {
 	int ret;
-	psa_key_id_t key_id = idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+	psa_key_id_t key_id = idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 	uint8_t buf[ENTRY_MAX_LEN];
 
 	ret = wifi_credentials_load_entry(idx, buf, ARRAY_SIZE(buf));
@@ -186,7 +184,7 @@ ZTEST(wifi_credentials_backend_psa, test_get)
 	zassert_equal(psa_export_key_fake.arg2_val, ARRAY_SIZE(buf), "Export key arg2 mismatch");
 
 	idx++;
-	key_id = idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN;
+	key_id = idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN;
 
 	ret = wifi_credentials_load_entry(idx, buf, ARRAY_SIZE(buf));
 
@@ -205,7 +203,7 @@ ZTEST(wifi_credentials_backend_psa, test_delete)
 	ret = wifi_credentials_delete_entry(idx);
 
 	zassert_equal(0, ret, "Delete entry failed");
-	zassert_equal(psa_destroy_key_fake.arg0_val, WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN,
+	zassert_equal(psa_destroy_key_fake.arg0_val, ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN,
 		      "Destroy key arg0 mismatch");
 
 	idx++;
@@ -214,7 +212,7 @@ ZTEST(wifi_credentials_backend_psa, test_delete)
 
 	zassert_equal(0, ret, "Delete entry failed");
 	zassert_equal(psa_destroy_key_fake.arg0_val,
-		      idx + WIFI_CREDENTIALS_BACKEND_PSA_KEY_ID_USER_MIN,
+		      idx + ZEPHYR_PSA_WIFI_CREDENTIALS_KEY_ID_RANGE_BEGIN,
 		      "Destroy key arg0 mismatch");
 
 	zassert_equal(psa_destroy_key_fake.call_count, 2, "Destroy key call count mismatch");
diff --git a/tests/net/neighbor/src/main.c b/tests/net/neighbor/src/main.c
index b598bd1ce5c34..09b9cc08f2477 100644
--- a/tests/net/neighbor/src/main.c
+++ b/tests/net/neighbor/src/main.c
@@ -72,7 +72,7 @@ ZTEST(neighbor_test_suite, test_neighbor)
 
 	struct net_nbr *nbr;
 	struct net_linkaddr lladdr;
-	struct net_linkaddr_storage *lladdr_ptr;
+	struct net_linkaddr *lladdr_ptr;
 	struct net_if *iface1 = INT_TO_POINTER(1);
 	struct net_if *iface2 = INT_TO_POINTER(2);
 	int ret, i;
@@ -95,7 +95,7 @@ ZTEST(neighbor_test_suite, test_neighbor)
 	for (i = 0; i < 2; i++) {
 		eth_addr = addrs[i];
 
-		lladdr.addr = eth_addr->addr;
+		memcpy(lladdr.addr, eth_addr->addr, sizeof(struct net_eth_addr));
 
 		ret = net_nbr_link(nbr, iface1, &lladdr);
 
@@ -111,14 +111,15 @@ ZTEST(neighbor_test_suite, test_neighbor)
 		}
 	}
 
-	lladdr.addr = addrs[0]->addr;
+	memcpy(lladdr.addr, addrs[0]->addr, sizeof(struct net_eth_addr));
+
 	nbr = net_nbr_lookup(&net_test_neighbor.table, iface1, &lladdr);
 	zassert_true(nbr->idx == 0, "Wrong index %d should be %d\n", nbr->idx, 0);
 
 	for (i = 0; i < 2; i++) {
 		eth_addr = addrs[i];
 
-		lladdr.addr = eth_addr->addr;
+		memcpy(lladdr.addr, eth_addr->addr, sizeof(struct net_eth_addr));
 
 		ret = net_nbr_unlink(nbr, &lladdr);
 		zassert_false(i == 0 && ret < 0, "Cannot add %s to nbr cache (%d)\n",
@@ -155,7 +156,7 @@ ZTEST(neighbor_test_suite, test_neighbor)
 
 		eth_addr = addrs[i];
 
-		lladdr.addr = eth_addr->addr;
+		memcpy(lladdr.addr, eth_addr->addr, sizeof(struct net_eth_addr));
 
 		ret = net_nbr_link(nbr, iface1, &lladdr);
 		zassert_false(ret < 0, "Cannot add %s to nbr cache (%d)\n",
@@ -166,7 +167,7 @@ ZTEST(neighbor_test_suite, test_neighbor)
 	}
 
 	for (i = 0; i < ARRAY_SIZE(addrs) - 2; i++) {
-		lladdr.addr = addrs[i]->addr;
+		memcpy(lladdr.addr, addrs[i]->addr, sizeof(struct net_eth_addr));
 		nbr = net_nbr_lookup(&net_test_neighbor.table, iface1, &lladdr);
 		zassert_false(nbr->idx != i, "Wrong index %d should be %d\n", nbr->idx, i);
 	}
@@ -174,7 +175,7 @@ ZTEST(neighbor_test_suite, test_neighbor)
 	for (i = 0; i < ARRAY_SIZE(addrs); i++) {
 		eth_addr = addrs[i];
 		nbr = nbrs[i];
-		lladdr.addr = eth_addr->addr;
+		memcpy(lladdr.addr, eth_addr->addr, sizeof(struct net_eth_addr));
 
 		if (!nbr || i >= CONFIG_NET_IPV6_MAX_NEIGHBORS) {
 			break;
@@ -214,7 +215,7 @@ ZTEST(neighbor_test_suite, test_neighbor)
 
 		eth_addr = addrs[i];
 
-		lladdr.addr = eth_addr->addr;
+		memcpy(lladdr.addr, eth_addr->addr, sizeof(struct net_eth_addr));
 
 		if (i % 2) {
 			ret = net_nbr_link(nbr, iface1, &lladdr);
@@ -232,7 +233,8 @@ ZTEST(neighbor_test_suite, test_neighbor)
 	}
 
 	for (i = 0; i < ARRAY_SIZE(addrs) - 2; i++) {
-		lladdr.addr = addrs[i]->addr;
+		memcpy(lladdr.addr, addrs[i]->addr, sizeof(struct net_eth_addr));
+
 		if (i % 2) {
 			nbr = net_nbr_lookup(&net_test_neighbor.table, iface1,
 					     &lladdr);
@@ -257,7 +259,7 @@ ZTEST(neighbor_test_suite, test_neighbor)
 
 		eth_addr = addrs[i];
 		nbr = nbrs[i];
-		lladdr.addr = eth_addr->addr;
+		memcpy(lladdr.addr, eth_addr->addr, sizeof(struct net_eth_addr));
 
 		if (!nbr || i >= CONFIG_NET_IPV6_MAX_NEIGHBORS) {
 			break;
@@ -285,7 +287,8 @@ ZTEST(neighbor_test_suite, test_neighbor)
 	zassert_true(clear_called, "Table clear check failed");
 
 	/* The table should be empty now */
-	lladdr.addr = addrs[0]->addr;
+	memcpy(lladdr.addr, addrs[0]->addr, sizeof(struct net_eth_addr));
+
 	nbr = net_nbr_lookup(&net_test_neighbor.table, iface1, &lladdr);
 
 	zassert_is_null(nbr, "Some entries still found in nbr cache");
diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c
index ca50aafc98e85..1eaf068136d1d 100644
--- a/tests/net/net_pkt/src/main.c
+++ b/tests/net/net_pkt/src/main.c
@@ -805,11 +805,15 @@ ZTEST(net_pkt_test_suite, test_net_pkt_clone)
 	zassert_true(sizeof(buf) - 6 == net_pkt_remaining_data(pkt),
 		     "Pkt remaining data mismatch");
 
-	net_pkt_lladdr_src(pkt)->addr = pkt->buffer->data;
+	memcpy(net_pkt_lladdr_src(pkt)->addr,
+	       pkt->buffer->data,
+	       NET_LINK_ADDR_MAX_LENGTH);
 	net_pkt_lladdr_src(pkt)->len = NET_LINK_ADDR_MAX_LENGTH;
 	net_pkt_lladdr_src(pkt)->type = NET_LINK_ETHERNET;
 	zassert_mem_equal(net_pkt_lladdr_src(pkt)->addr, buf, NET_LINK_ADDR_MAX_LENGTH);
-	net_pkt_lladdr_dst(pkt)->addr = net_pkt_cursor_get_pos(pkt);
+	memcpy(net_pkt_lladdr_dst(pkt)->addr,
+	       net_pkt_cursor_get_pos(pkt),
+	       NET_LINK_ADDR_MAX_LENGTH);
 	net_pkt_lladdr_dst(pkt)->len = NET_LINK_ADDR_MAX_LENGTH;
 	net_pkt_lladdr_dst(pkt)->type = NET_LINK_ETHERNET;
 	zassert_mem_equal(net_pkt_lladdr_dst(pkt)->addr, &buf[6], NET_LINK_ADDR_MAX_LENGTH);
@@ -875,11 +879,15 @@ ZTEST(net_pkt_test_suite, test_net_pkt_clone)
 		     "Cloned pkt l2_processed flag mismatch");
 
 	zassert_mem_equal(net_pkt_lladdr_src(cloned_pkt)->addr, buf, NET_LINK_ADDR_MAX_LENGTH);
-	zassert_true(net_pkt_lladdr_src(cloned_pkt)->addr == cloned_pkt->buffer->data,
+	zassert_true(memcmp(net_pkt_lladdr_src(cloned_pkt)->addr,
+			    cloned_pkt->buffer->data,
+			    NET_LINK_ADDR_MAX_LENGTH) == 0,
 		     "Cloned pkt ll src addr mismatch");
 
 	zassert_mem_equal(net_pkt_lladdr_dst(cloned_pkt)->addr, &buf[6], NET_LINK_ADDR_MAX_LENGTH);
-	zassert_true(net_pkt_lladdr_dst(cloned_pkt)->addr == net_pkt_cursor_get_pos(cloned_pkt),
+	zassert_true(memcmp(net_pkt_lladdr_dst(cloned_pkt)->addr,
+			    net_pkt_cursor_get_pos(cloned_pkt),
+			    NET_LINK_ADDR_MAX_LENGTH) == 0,
 		     "Cloned pkt ll dst addr mismatch");
 
 	zassert_equal(net_pkt_ll_proto_type(cloned_pkt), ETH_P_IEEE802154,
diff --git a/tests/net/npf/src/main.c b/tests/net/npf/src/main.c
index 39aa63daac201..d85b78539f37f 100644
--- a/tests/net/npf/src/main.c
+++ b/tests/net/npf/src/main.c
@@ -75,6 +75,32 @@ static struct net_pkt *build_test_pkt(int type, int size, struct net_if *iface)
 	return pkt;
 }
 
+static struct net_pkt *build_vlan_test_pkt(int type, int size, struct net_if *iface)
+{
+	struct net_pkt *pkt;
+	struct net_eth_vlan_hdr eth_hdr;
+	int ret;
+
+	pkt = net_pkt_rx_alloc_with_buffer(iface, size, AF_UNSPEC, 0, K_NO_WAIT);
+	zassert_not_null(pkt, "");
+
+	eth_hdr.src = ETH_SRC_ADDR;
+	eth_hdr.dst = ETH_DST_ADDR;
+	eth_hdr.type = htons(type);
+	eth_hdr.vlan.tpid = htons(NET_ETH_PTYPE_VLAN);
+
+	ret = net_pkt_write(pkt, &eth_hdr, sizeof(eth_hdr));
+	zassert_equal(ret, 0, "");
+
+	zassert_true(size >= sizeof(eth_hdr), "");
+	zassert_true((size - sizeof(eth_hdr)) <= sizeof(dummy_data), "");
+	ret = net_pkt_write(pkt, dummy_data, size - sizeof(eth_hdr));
+	zassert_equal(ret, 0, "");
+
+	DBG("pkt %p: iface %p size %d type 0x%04x\n", pkt, iface, size, type);
+	return pkt;
+}
+
 static struct net_pkt *build_test_ip_pkt(void *src, void *dst,
 	   sa_family_t family, struct net_if *iface)
 {
@@ -483,4 +509,45 @@ ZTEST(net_pkt_filter_test_suite, test_npf_ipv6_address_filtering)
 	net_pkt_unref(pkt_v4);
 }
 
+static NPF_ETH_VLAN_TYPE_MATCH(vlan_ip_packet, NET_ETH_PTYPE_IP);
+static NPF_RULE(vlan_small_ip_pkt, NET_OK, vlan_ip_packet, maxsize_200);
+
+static void test_npf_example_vlan_common(void)
+{
+	struct net_pkt *pkt;
+
+	/* test small IP packet */
+	pkt = build_vlan_test_pkt(NET_ETH_PTYPE_IP, 100, NULL);
+	zassert_true(net_pkt_filter_recv_ok(pkt), "");
+	net_pkt_unref(pkt);
+
+	/* test "big" IP packet */
+	pkt = build_vlan_test_pkt(NET_ETH_PTYPE_IP, 300, NULL);
+	zassert_false(net_pkt_filter_recv_ok(pkt), "");
+	net_pkt_unref(pkt);
+
+	/* test "small" non-IP packet */
+	pkt = build_vlan_test_pkt(NET_ETH_PTYPE_ARP, 100, NULL);
+	zassert_false(net_pkt_filter_recv_ok(pkt), "");
+	net_pkt_unref(pkt);
+
+	/* test "big" non-IP packet */
+	pkt = build_vlan_test_pkt(NET_ETH_PTYPE_ARP, 300, NULL);
+	zassert_false(net_pkt_filter_recv_ok(pkt), "");
+	net_pkt_unref(pkt);
+}
+
+ZTEST(net_pkt_filter_test_suite, test_npf_vlan_filtering)
+{
+	/* install filter rules */
+	npf_insert_recv_rule(&npf_default_drop);
+	npf_insert_recv_rule(&vlan_small_ip_pkt);
+
+	test_npf_example_vlan_common();
+
+	/* remove filter rules */
+	zassert_true(npf_remove_recv_rule(&npf_default_drop), "");
+	zassert_true(npf_remove_recv_rule(&vlan_small_ip_pkt), "");
+}
+
 ZTEST_SUITE(net_pkt_filter_test_suite, NULL, test_npf_iface, NULL, NULL, NULL);
diff --git a/tests/net/ptp/clock/prj.conf b/tests/net/ptp/clock/prj.conf
index 71efa260d7c52..d65b3ad1bb430 100644
--- a/tests/net/ptp/clock/prj.conf
+++ b/tests/net/ptp/clock/prj.conf
@@ -22,7 +22,7 @@ CONFIG_ZTEST=y
 CONFIG_NET_CONFIG_SETTINGS=n
 CONFIG_NET_SHELL=n
 CONFIG_PTP_CLOCK=y
-CONFIG_ETH_NATIVE_POSIX=n
+CONFIG_ETH_NATIVE_TAP=n
 CONFIG_COVERAGE=n
 CONFIG_TEST_USERSPACE=y
 CONFIG_HEAP_MEM_POOL_SIZE=128
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index dcdf48cb12e80..644c07564aee8 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -116,8 +116,8 @@ static uint8_t *net_route_get_mac(const struct device *dev)
 		route->mac_addr[5] = sys_rand8_get();
 	}
 
-	route->ll_addr.addr = route->mac_addr;
-	route->ll_addr.len = 6U;
+	memcpy(route->ll_addr.addr, route->mac_addr, sizeof(route->mac_addr));
+	route->ll_addr.len = sizeof(route->mac_addr);
 
 	return route->mac_addr;
 }
diff --git a/tests/net/route_mcast/src/main.c b/tests/net/route_mcast/src/main.c
index be30a79462d8e..3dd3637bbf881 100644
--- a/tests/net/route_mcast/src/main.c
+++ b/tests/net/route_mcast/src/main.c
@@ -157,7 +157,7 @@ static uint8_t *net_route_mcast_get_mac(const struct device *dev)
 		cfg->mac_addr[5] = sys_rand8_get();
 	}
 
-	cfg->ll_addr.addr = cfg->mac_addr;
+	memcpy(cfg->ll_addr.addr, cfg->mac_addr, 6);
 	cfg->ll_addr.len = 6U;
 
 	return cfg->mac_addr;
diff --git a/tests/net/socket/af_inet_raw/CMakeLists.txt b/tests/net/socket/af_inet_raw/CMakeLists.txt
new file mode 100644
index 0000000000000..071665894e121
--- /dev/null
+++ b/tests/net/socket/af_inet_raw/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(socket_af_inet_raw)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/net/socket/af_inet_raw/prj.conf b/tests/net/socket/af_inet_raw/prj.conf
new file mode 100644
index 0000000000000..013fbd3d73d2f
--- /dev/null
+++ b/tests/net/socket/af_inet_raw/prj.conf
@@ -0,0 +1,19 @@
+CONFIG_ZTEST=y
+CONFIG_NET_TEST=y
+CONFIG_NETWORKING=y
+CONFIG_NET_DRIVERS=y
+CONFIG_NET_LOOPBACK=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_IPV6=y
+CONFIG_NET_IPV6_NBR_CACHE=n
+CONFIG_NET_UDP=y
+CONFIG_NET_UDP_MISSING_CHECKSUM=n
+CONFIG_NET_TCP=y
+CONFIG_NET_CONTEXT_RCVTIMEO=y
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_SOCKETS_INET_RAW=y
+CONFIG_ENTROPY_GENERATOR=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4
+CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
diff --git a/tests/net/socket/af_inet_raw/src/main.c b/tests/net/socket/af_inet_raw/src/main.c
new file mode 100644
index 0000000000000..90ca11370fc8d
--- /dev/null
+++ b/tests/net/socket/af_inet_raw/src/main.c
@@ -0,0 +1,952 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/random/random.h>
+#include <zephyr/ztest.h>
+
+/* This test suite verify that RAW IP sockets behave according to well known behaviors.
+ * Note, that this is not well standardized and rely on behaviors known from Linux or FreeBSD.
+ *
+ * Sending data (TX):
+ *
+ *   * (AF_INET/6, SOCK_RAW, 0) - The IP header needs to be supplied by the user in the data:
+ *     - test_raw_v4_sock_send_proto_wildcard
+ *     - test_raw_v6_sock_send_proto_wildcard
+ *     - test_raw_v4_sock_sendto
+ *     - test_raw_v6_sock_sendto
+ *     - test_raw_v4_sock_sendmsg
+ *     - test_raw_v6_sock_sendmsg
+ *
+ *   * (AF_INET/6, SOCK_RAW, <protocol>) - Construct IP header according to the protocol number if
+ *     `IP_HDRINCL` socket option is not set. Otherwise, IP header should be provided by the user.
+ *     Currently `IP_HDRINCL` is always considered set:
+ *     - test_raw_v4_sock_send_proto_match
+ *     - test_raw_v4_sock_send_proto_mismatch
+ *     - test_raw_v6_sock_send_proto_match
+ *     - test_raw_v6_sock_send_proto_mismatch
+ *
+ *   * (AF_INET/6, SOCK_RAW, IPPROTO_RAW) - The IP header needs to be supplied by the user in the
+ *     data:
+ *     - test_raw_v4_sock_send_proto_ipproto_raw
+ *     - test_raw_v6_sock_send_proto_ipproto_raw
+ *
+ * Receiving data (RX)
+ *
+ *   *  (AF_INET/6, SOCK_RAW, 0) - 0 value is also `IPPROTO_IP` which is "wildcard" value. The
+ *      packet is received for any IP protocol. It works in similar way as in FreeBSD:
+ *     - test_raw_v4_sock_recv_proto_wildcard
+ *     - test_raw_v6_sock_recv_proto_wildcard
+ *     - test_raw_v4_sock_recvfrom
+ *     - test_raw_v6_sock_recvfrom
+ *     - test_raw_v4_sock_recvmsg
+ *     - test_raw_v6_sock_recvmsg
+ *
+ *   *  (AF_INET/6, SOCK_RAW, <protocol>) - All packets matching the protocol number specified for
+ *      the raw socket are passed to this socket. http://www.iana.org/assignments/protocol-numbers:
+ *     - test_raw_v4_sock_recv_proto_match
+ *     - test_raw_v6_sock_recv_proto_match
+ *
+ *   *  (AF_INET/6, SOCK_RAW, IPPROTO_RAW) - Receiving of all IP protocols via IPPROTO_RAW is not
+ *      possible using raw sockets. https://man7.org/linux/man-pages/man7/raw.7.html:
+ *     - test_raw_v4_sock_recv_proto_ipproto_raw
+ *     - test_raw_v6_sock_recv_proto_ipproto_raw
+ *
+ * See https://sock-raw.org/papers/sock_raw
+ */
+
+static int test_iface_send(const struct device *dev, struct net_pkt *pkt)
+{
+	ARG_UNUSED(dev);
+
+	struct net_pkt *recv_pkt;
+	int ret;
+
+	recv_pkt = net_pkt_rx_clone(pkt, K_NO_WAIT);
+	if (recv_pkt == NULL) {
+		printk("Failed to clone the packet\n");
+		return -ENOMEM;
+	}
+
+	ret = net_recv_data(net_pkt_iface(recv_pkt), recv_pkt);
+	if (ret < 0) {
+		net_pkt_unref(recv_pkt);
+		return ret;
+	}
+
+	return 0;
+}
+
+static void test_iface_init(struct net_if *iface)
+{
+	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
+	uint8_t mac_addr[sizeof(struct net_eth_addr)] = {
+		0x00, 0x00, 0x5e, 0x00, 0x53, 0x00
+	};
+
+	mac_addr[5] = sys_rand8_get();
+
+	net_if_set_link_addr(iface, mac_addr, sizeof(mac_addr),
+			     NET_LINK_ETHERNET);
+}
+
+static struct dummy_api test_iface_if_api = {
+	.iface_api.init = test_iface_init,
+	.send = test_iface_send,
+};
+
+NET_DEVICE_INIT(test_iface_1, "test_iface_1", NULL, NULL, NULL, NULL,
+		CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &test_iface_if_api,
+		DUMMY_L2, NET_L2_GET_CTX_TYPE(DUMMY_L2), 127);
+
+#define TEST_PORT_OWN 4242
+#define TEST_PORT_DST 4243
+
+static struct net_if *test_iface = NET_IF_GET(test_iface_1, 0);
+static struct in_addr test_ipv4_1 = { { { 192, 0, 2, 1 } } };
+static struct in_addr test_ipv4_2 = { { { 192, 0, 2, 2 } } };
+static struct in6_addr test_ipv6_1 = { { {
+	0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1
+} } };
+static struct in6_addr test_ipv6_2 = { { {
+	0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2
+} } };
+
+static int raw_sock = -1;
+static int raw_sock_2 = -1;
+static int udp_sock = -1;
+static int udp_sock_2 = -1;
+static int packet_sock = -1;
+static struct sockaddr src_addr;
+static struct sockaddr dst_addr;
+static socklen_t addrlen;
+
+static uint8_t test_payload[] = "test_payload";
+static uint8_t rx_buf[128];
+static uint8_t tx_buf[128];
+
+static void prepare_raw_sock_common(int *sock, sa_family_t family,
+				    enum net_ip_protocol proto)
+{
+	struct timeval optval = {
+		.tv_usec = 100000,
+	};
+	int ret;
+
+	*sock = zsock_socket(family, SOCK_RAW, proto);
+	zassert_true(*sock >= 0, "Failed to create RAW socket(%d)", errno);
+
+	ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
+			       sizeof(optval));
+	zassert_ok(ret, "setsockopt failed (%d)", errno);
+}
+
+static void prepare_raw_sock(sa_family_t family, enum net_ip_protocol proto)
+{
+	prepare_raw_sock_common(&raw_sock, family, proto);
+}
+
+static void prepare_raw_sock_2(sa_family_t family, enum net_ip_protocol proto)
+{
+	prepare_raw_sock_common(&raw_sock_2, family, proto);
+}
+
+static void prepare_udp_sock_common(int *sock, sa_family_t family,
+				    struct sockaddr *bind_addr)
+{
+	struct timeval optval = {
+		.tv_usec = 100000,
+	};
+	int ret;
+
+	*sock = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP);
+	zassert_true(*sock >= 0, "Failed to create UDP socket (%d)", errno);
+
+	ret = zsock_bind(*sock, bind_addr, addrlen);
+	zassert_ok(ret, "Binding UDP socket failed (%d)", errno);
+
+	ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
+			       sizeof(optval));
+	zassert_ok(ret, "setsockopt failed (%d)", errno);
+}
+
+static void prepare_udp_sock(sa_family_t family)
+{
+	prepare_udp_sock_common(&udp_sock, family, &src_addr);
+}
+
+static void prepare_udp_sock_2(sa_family_t family)
+{
+	prepare_udp_sock_common(&udp_sock_2, family, &dst_addr);
+}
+
+static void prepare_packet_sock(uint16_t proto)
+{
+	struct sockaddr_ll addr = { 0 };
+	struct timeval optval = {
+		.tv_usec = 100000,
+	};
+	int ret;
+
+	memset(&addr, 0, sizeof(addr));
+
+	addr.sll_ifindex = net_if_get_by_iface(test_iface);
+	addr.sll_family = AF_PACKET;
+
+	packet_sock = zsock_socket(AF_PACKET, SOCK_DGRAM, htons(proto));
+	zassert_true(packet_sock >= 0, "Failed to create packet socket (%d)", errno);
+
+	ret = zsock_bind(packet_sock, (struct sockaddr *)&addr, sizeof(addr));
+	zassert_ok(ret, "Binding packet socket failed (%d)", errno);
+
+	ret = zsock_setsockopt(packet_sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
+			       sizeof(optval));
+	zassert_ok(ret, "setsockopt failed (%d)", errno);
+}
+
+static void prepare_addr(sa_family_t family)
+{
+	src_addr.sa_family = family;
+	dst_addr.sa_family = family;
+
+	if (family == AF_INET) {
+		net_sin(&src_addr)->sin_addr = test_ipv4_1;
+		net_sin(&src_addr)->sin_port = htons(TEST_PORT_OWN);
+		net_sin(&dst_addr)->sin_addr = test_ipv4_2;
+		net_sin(&dst_addr)->sin_port = htons(TEST_PORT_DST);
+		addrlen = sizeof(struct sockaddr_in);
+	} else {
+		net_sin6(&src_addr)->sin6_addr = test_ipv6_1;
+		net_sin6(&src_addr)->sin6_port = htons(TEST_PORT_OWN);
+		net_sin6(&dst_addr)->sin6_addr = test_ipv6_2;
+		net_sin6(&dst_addr)->sin6_port = htons(TEST_PORT_DST);
+		addrlen = sizeof(struct sockaddr_in6);
+	}
+}
+
+static void prepare_raw_and_udp_sock_and_addr(sa_family_t family,
+					      enum net_ip_protocol proto)
+{
+	prepare_addr(family);
+	prepare_raw_sock(family, proto);
+	prepare_udp_sock(family);
+}
+
+static void sock_bind_any(int sock, sa_family_t family)
+{
+	struct sockaddr anyaddr = { .sa_family = family };
+	socklen_t bindaddr_len = (family == AF_INET) ?
+		sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
+
+	zassert_ok(zsock_bind(sock, &anyaddr, bindaddr_len),
+		   "Binding RAW socket failed (%d)", errno);
+}
+
+static void test_sockets_close(void)
+{
+	if (raw_sock >= 0) {
+		(void)zsock_close(raw_sock);
+		raw_sock = -1;
+	}
+
+	if (raw_sock_2 >= 0) {
+		(void)zsock_close(raw_sock_2);
+		raw_sock_2 = -1;
+	}
+
+	if (udp_sock >= 0) {
+		(void)zsock_close(udp_sock);
+		udp_sock = -1;
+	}
+
+	if (udp_sock_2 >= 0) {
+		(void)zsock_close(udp_sock_2);
+		udp_sock_2 = -1;
+	}
+
+	if (packet_sock >= 0) {
+		(void)zsock_close(packet_sock);
+		packet_sock = -1;
+	}
+}
+
+static void validate_ip_udp_hdr(sa_family_t family, struct sockaddr *src,
+				struct sockaddr *dst, uint8_t *data,
+				size_t datalen)
+{
+	if (family == AF_INET) {
+		struct net_ipv4_hdr *ipv4 = (struct net_ipv4_hdr *)data;
+		struct net_udp_hdr *udp = (struct net_udp_hdr *)(data + NET_IPV4H_LEN);
+
+		zassert_true(datalen >= NET_IPV4UDPH_LEN, "Packet too short");
+		zassert_equal(ipv4->vhl & 0xF0, 0x40, "Not an IPv4 packet");
+		zassert_mem_equal(ipv4->src, &net_sin(src)->sin_addr, sizeof(ipv4->src),
+				  "Invalid source address");
+		zassert_mem_equal(ipv4->dst, &net_sin(dst)->sin_addr, sizeof(ipv4->dst),
+				  "Invalid destination address");
+		zassert_equal(ipv4->proto, IPPROTO_UDP, "Invalid protocol");
+		zassert_equal(udp->src_port, net_sin(src)->sin_port,
+			      "Invalid source port");
+		zassert_equal(udp->dst_port, net_sin(dst)->sin_port,
+			      "Invalid destination port");
+		zassert_equal(udp->len, htons(datalen - NET_IPV4H_LEN),
+			      "Invalid UDP length");
+	} else {
+		struct net_ipv6_hdr *ipv6 = (struct net_ipv6_hdr *)data;
+		struct net_udp_hdr *udp = (struct net_udp_hdr *)(data + NET_IPV6H_LEN);
+
+		zassert_true(datalen >= NET_IPV6UDPH_LEN, "Packet too short");
+		zassert_equal(ipv6->vtc & 0xF0, 0x60, "Not an IPv6 packet");
+		zassert_mem_equal(ipv6->src, &net_sin6(src)->sin6_addr, sizeof(ipv6->src),
+				  "Invalid source address");
+		zassert_mem_equal(ipv6->dst, &net_sin6(dst)->sin6_addr, sizeof(ipv6->dst),
+				  "Invalid destination address");
+		zassert_equal(ipv6->nexthdr, IPPROTO_UDP, "Invalid protocol");
+		zassert_equal(udp->src_port, net_sin6(src)->sin6_port,
+			      "Invalid source port");
+		zassert_equal(udp->dst_port, net_sin6(dst)->sin6_port,
+			      "Invalid destination port");
+		zassert_equal(udp->len, htons(datalen - NET_IPV6H_LEN),
+			      "Invalid UDP length");
+	}
+}
+
+static void verify_raw_recv_success(int sock, sa_family_t family)
+{
+	size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN;
+	size_t expected_len = headers_len + sizeof(test_payload);
+	int ret;
+
+	ret = zsock_recv(sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive RAW packet (%d)", errno);
+	zassert_equal(ret, expected_len, "Invalid data size received (%d, expected %d)",
+		      ret, expected_len);
+
+	validate_ip_udp_hdr(family, &src_addr, &dst_addr, rx_buf, ret);
+	zassert_mem_equal(rx_buf + headers_len, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+}
+
+static void verify_raw_recv_failure(void)
+{
+	int ret;
+
+	ret = zsock_recv(raw_sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_equal(ret, -1, "RAW receive should fail (%d)", ret);
+	zassert_equal(errno, EAGAIN, "Wrong errno (%d)", errno);
+}
+
+#define TEST_UDP_IVP4_CHKSUM 0x03e4
+#define TEST_UDP_IVP6_CHKSUM 0x930c
+
+static void prepare_raw_ip_packet(sa_family_t family, uint8_t *buf, uint16_t *buflen)
+{
+	uint16_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN;
+	uint16_t packet_len = headers_len + sizeof(test_payload);
+
+	zassert_true(packet_len <= *buflen, "Packet too long");
+	*buflen = packet_len;
+
+	if (family == AF_INET) {
+		struct net_ipv4_hdr *ipv4 = (struct net_ipv4_hdr *)tx_buf;
+		struct net_udp_hdr *udp = (struct net_udp_hdr *)(tx_buf + NET_IPV4H_LEN);
+
+		/* Prepare IPv4 header */
+		ipv4->vhl = 0x45;
+		ipv4->len = htons(packet_len);
+		ipv4->ttl = 64;
+		ipv4->proto = IPPROTO_UDP;
+		/* UDP socket binds to src_addr, so for this test we swap src/dst */
+		memcpy(ipv4->src, &net_sin(&dst_addr)->sin_addr, sizeof(ipv4->src));
+		memcpy(ipv4->dst, &net_sin(&src_addr)->sin_addr, sizeof(ipv4->dst));
+
+		/* Prepare UDP header */
+		udp->src_port = net_sin(&dst_addr)->sin_port;
+		udp->dst_port = net_sin(&src_addr)->sin_port;
+		udp->len = htons(sizeof(test_payload) + NET_UDPH_LEN);
+		udp->chksum = TEST_UDP_IVP4_CHKSUM;
+
+		memcpy(tx_buf + NET_IPV4UDPH_LEN, test_payload, sizeof(test_payload));
+	} else {
+		struct net_ipv6_hdr *ipv6 = (struct net_ipv6_hdr *)tx_buf;
+		struct net_udp_hdr *udp = (struct net_udp_hdr *)(tx_buf + NET_IPV6H_LEN);
+
+		/* Prepare IPv6 header */
+		ipv6->vtc = 0x60;
+		ipv6->len = htons(sizeof(test_payload) + NET_UDPH_LEN);
+		ipv6->nexthdr = IPPROTO_UDP;
+		ipv6->hop_limit = 64;
+		/* UDP socket binds to src_addr, so for this test we swap src/dst */
+		memcpy(ipv6->src, &net_sin6(&dst_addr)->sin6_addr, sizeof(ipv6->src));
+		memcpy(ipv6->dst, &net_sin6(&src_addr)->sin6_addr, sizeof(ipv6->dst));
+
+		/* Prepare UDP header */
+		udp->src_port = net_sin6(&dst_addr)->sin6_port;
+		udp->dst_port = net_sin6(&src_addr)->sin6_port;
+		udp->len = htons(sizeof(test_payload) + NET_UDPH_LEN);
+		udp->chksum = TEST_UDP_IVP6_CHKSUM;
+
+		memcpy(tx_buf + NET_IPV6UDPH_LEN, test_payload, sizeof(test_payload));
+	}
+}
+
+static void test_raw_sock_send(sa_family_t family, enum net_ip_protocol proto)
+{
+	uint16_t len = sizeof(tx_buf);
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, proto);
+	prepare_raw_ip_packet(family, tx_buf, &len);
+
+	ret = zsock_send(raw_sock, tx_buf, len, 0);
+	zassert_equal(ret, len, "Failed to send RAW packet (%d)", errno);
+
+	ret = zsock_recv(udp_sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive UDP packet (%d)", errno);
+	zassert_equal(ret, sizeof(test_payload),
+		     "Invalid data size received (%d, expected %d)",
+		      ret, sizeof(test_payload));
+	zassert_mem_equal(rx_buf, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_send_proto_wildcard)
+{
+	test_raw_sock_send(AF_INET, IPPROTO_IP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_send_proto_wildcard)
+{
+	test_raw_sock_send(AF_INET6, IPPROTO_IP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_send_proto_match)
+{
+	test_raw_sock_send(AF_INET, IPPROTO_UDP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_send_proto_match)
+{
+	test_raw_sock_send(AF_INET6, IPPROTO_UDP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_send_proto_ipproto_raw)
+{
+	test_raw_sock_send(AF_INET, IPPROTO_RAW);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_send_proto_ipproto_raw)
+{
+	test_raw_sock_send(AF_INET6, IPPROTO_RAW);
+}
+
+static void test_raw_sock_sendto(sa_family_t family)
+{
+	uint16_t len = sizeof(tx_buf);
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP);
+	prepare_raw_ip_packet(family, tx_buf, &len);
+
+	ret = zsock_sendto(raw_sock, tx_buf, len, 0, &src_addr, addrlen);
+	zassert_equal(ret, len, "Failed to send RAW packet (%d)", errno);
+
+	ret = zsock_recv(udp_sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive UDP packet (%d)", errno);
+	zassert_equal(ret, sizeof(test_payload),
+		     "Invalid data size received (%d, expected %d)",
+		      ret, sizeof(test_payload));
+	zassert_mem_equal(rx_buf, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_sendto)
+{
+	test_raw_sock_sendto(AF_INET);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_sendto)
+{
+	test_raw_sock_sendto(AF_INET6);
+}
+
+static void test_raw_sock_sendmsg(sa_family_t family)
+{
+	uint16_t len = sizeof(tx_buf);
+	struct iovec io_vector;
+	struct msghdr msg = { 0 };
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP);
+	prepare_raw_ip_packet(family, tx_buf, &len);
+
+	io_vector.iov_base = tx_buf;
+	io_vector.iov_len = len;
+	msg.msg_iov = &io_vector;
+	msg.msg_iovlen = 1;
+	msg.msg_name = &src_addr;
+	msg.msg_namelen = addrlen;
+
+	ret = zsock_sendmsg(raw_sock, &msg, 0);
+	zassert_equal(ret, len, "Failed to send RAW packet (%d)", errno);
+
+	ret = zsock_recv(udp_sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive UDP packet (%d)", errno);
+	zassert_equal(ret, sizeof(test_payload),
+		     "Invalid data size received (%d, expected %d)",
+		      ret, sizeof(test_payload));
+	zassert_mem_equal(rx_buf, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_sendmsg)
+{
+	test_raw_sock_sendmsg(AF_INET);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_sendmsg)
+{
+	test_raw_sock_sendmsg(AF_INET6);
+}
+
+static void test_raw_sock_recv(sa_family_t family, enum net_ip_protocol proto)
+{
+
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, proto);
+	sock_bind_any(raw_sock, family);
+
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	if (proto == IPPROTO_IP || proto == IPPROTO_UDP) {
+		verify_raw_recv_success(raw_sock, family);
+	} else {
+		verify_raw_recv_failure();
+	}
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_wildcard)
+{
+	test_raw_sock_recv(AF_INET, IPPROTO_IP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_wildcard)
+{
+	test_raw_sock_recv(AF_INET6, IPPROTO_IP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_match)
+{
+	test_raw_sock_recv(AF_INET, IPPROTO_UDP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_match)
+{
+	test_raw_sock_recv(AF_INET6, IPPROTO_UDP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_mismatch)
+{
+	test_raw_sock_recv(AF_INET, IPPROTO_TCP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_mismatch)
+{
+	test_raw_sock_recv(AF_INET6, IPPROTO_TCP);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_ipproto_raw)
+{
+	test_raw_sock_recv(AF_INET, IPPROTO_RAW);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_ipproto_raw)
+{
+	test_raw_sock_recv(AF_INET6, IPPROTO_RAW);
+}
+
+static void test_raw_sock_recvfrom(sa_family_t family)
+{
+	size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN;
+	size_t expected_len = headers_len + sizeof(test_payload);
+	struct sockaddr recv_addr = { 0 };
+	socklen_t recv_addrlen = sizeof(recv_addr);
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP);
+	sock_bind_any(raw_sock, family);
+
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	ret = zsock_recvfrom(raw_sock, rx_buf, sizeof(rx_buf), 0,
+			     &recv_addr, &recv_addrlen);
+	zassert_not_equal(ret, -1, "Failed to receive RAW packet (%d)", errno);
+	zassert_equal(ret, expected_len, "Invalid data size received (%d, expected %d)",
+		      ret, expected_len);
+	validate_ip_udp_hdr(family, &src_addr, &dst_addr, rx_buf, ret);
+	zassert_mem_equal(rx_buf + headers_len, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+
+	zassert_equal(recv_addrlen, addrlen, "Invalid sender address length");
+	zassert_equal(recv_addr.sa_family, family, "Invalid sender address family");
+	if (family == AF_INET) {
+		zassert_mem_equal(&net_sin(&recv_addr)->sin_addr,
+				  &net_sin(&src_addr)->sin_addr,
+				  sizeof(struct in_addr), "Invalid sender address");
+	} else {
+		zassert_mem_equal(&net_sin6(&recv_addr)->sin6_addr,
+				  &net_sin6(&src_addr)->sin6_addr,
+				  sizeof(struct in6_addr), "Invalid sender address");
+	}
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_recvfrom)
+{
+	test_raw_sock_recvfrom(AF_INET);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_recvfrom)
+{
+	test_raw_sock_recvfrom(AF_INET6);
+}
+
+static void test_raw_sock_recvmsg(sa_family_t family)
+{
+	size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN;
+	size_t expected_len = headers_len + sizeof(test_payload);
+	struct sockaddr recv_addr = { 0 };
+	struct iovec io_vector;
+	struct msghdr msg = { 0 };
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP);
+	sock_bind_any(raw_sock, family);
+
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	io_vector.iov_base = rx_buf;
+	io_vector.iov_len = sizeof(rx_buf);
+	msg.msg_iov = &io_vector;
+	msg.msg_iovlen = 1;
+	msg.msg_name = &recv_addr;
+	msg.msg_namelen = sizeof(recv_addr);
+
+	ret = zsock_recvmsg(raw_sock, &msg, 0);
+	zassert_not_equal(ret, -1, "Failed to receive RAW packet (%d)", errno);
+	zassert_equal(ret, expected_len, "Invalid data size received (%d, expected %d)",
+		      ret, expected_len);
+	validate_ip_udp_hdr(family, &src_addr, &dst_addr, rx_buf, ret);
+	zassert_mem_equal(rx_buf + headers_len, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+
+	zassert_equal(msg.msg_namelen, addrlen, "Invalid sender address length");
+	zassert_equal(recv_addr.sa_family, family, "Invalid sender address family");
+	if (family == AF_INET) {
+		zassert_mem_equal(&net_sin(&recv_addr)->sin_addr,
+				  &net_sin(&src_addr)->sin_addr,
+				  sizeof(struct in_addr), "Invalid sender address");
+	} else {
+		zassert_mem_equal(&net_sin6(&recv_addr)->sin6_addr,
+				  &net_sin6(&src_addr)->sin6_addr,
+				  sizeof(struct in6_addr), "Invalid sender address");
+	}
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_recvmsg)
+{
+	test_raw_sock_recvmsg(AF_INET);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_recvmsg)
+{
+	test_raw_sock_recvmsg(AF_INET6);
+}
+
+static void test_raw_sock_bind(sa_family_t family, struct sockaddr *bind_addr,
+			       bool shall_receive)
+{
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP);
+
+	ret = zsock_bind(raw_sock, bind_addr, addrlen);
+	zassert_ok(ret, "Binding RAW socket failed (%d)", errno);
+
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	if (shall_receive) {
+		verify_raw_recv_success(raw_sock, family);
+	} else {
+		verify_raw_recv_failure();
+	}
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_bind)
+{
+	struct sockaddr_in bind_addr = {
+		.sin_family = AF_INET,
+		.sin_addr = test_ipv4_2
+	};
+
+	test_raw_sock_bind(AF_INET, (struct sockaddr *)&bind_addr, true);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_bind)
+{
+	struct sockaddr_in6 bind_addr = {
+		.sin6_family = AF_INET6,
+		.sin6_addr = test_ipv6_2
+	};
+
+	test_raw_sock_bind(AF_INET6, (struct sockaddr *)&bind_addr, true);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_bind_other_addr)
+{
+	struct sockaddr_in bind_addr = {
+		.sin_family = AF_INET,
+		.sin_addr = test_ipv4_1
+	};
+
+	test_raw_sock_bind(AF_INET, (struct sockaddr *)&bind_addr, false);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_bind_other_addr)
+{
+	struct sockaddr_in6 bind_addr = {
+		.sin6_family = AF_INET6,
+		.sin6_addr = test_ipv6_1
+	};
+
+	test_raw_sock_bind(AF_INET6, (struct sockaddr *)&bind_addr, false);
+}
+
+static void test_raw_sock_recv_no_cross_family(sa_family_t family_raw)
+{
+	sa_family_t family_udp = family_raw == AF_INET ? AF_INET6 : AF_INET;
+	int ret;
+
+	prepare_addr(family_udp);
+	prepare_raw_sock(family_raw, IPPROTO_UDP);
+	prepare_udp_sock(family_udp);
+	sock_bind_any(raw_sock, family_raw);
+
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	/* RAW socket should not get the packet from a different family (i.e.
+	 * no IPv4 packet on IPv6 socket and vice versa).
+	 */
+	verify_raw_recv_failure();
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_no_ipv6)
+{
+	test_raw_sock_recv_no_cross_family(AF_INET);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_no_ipv4)
+{
+	test_raw_sock_recv_no_cross_family(AF_INET6);
+}
+
+static void test_two_raw_socks_recv(sa_family_t family)
+{
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP);
+	prepare_raw_sock_2(family, IPPROTO_IP);
+	sock_bind_any(raw_sock, family);
+	sock_bind_any(raw_sock_2, family);
+
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	/* Both RAW sockets should get the packet. */
+	verify_raw_recv_success(raw_sock, family);
+	verify_raw_recv_success(raw_sock_2, family);
+}
+
+ZTEST(socket_af_inet_raw, test_two_raw_v4_socks_recv)
+{
+	test_two_raw_socks_recv(AF_INET);
+}
+
+ZTEST(socket_af_inet_raw, test_two_raw_v6_socks_recv)
+{
+	test_two_raw_socks_recv(AF_INET6);
+}
+
+static void test_raw_and_udp_socks_recv(sa_family_t family)
+{
+	size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN;
+	size_t expected_len = headers_len + sizeof(test_payload);
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP);
+	prepare_udp_sock_2(family);
+	sock_bind_any(raw_sock, family);
+
+	/* Send to bound UDP endpoint this time */
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	/* Both RAW and UDP sockets should receive the packet. */
+	ret = zsock_recv(raw_sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive RAW packet (%d)", errno);
+	zassert_equal(ret, expected_len,
+		      "Invalid data size received (%d, expected %d)",
+		      ret, expected_len);
+
+	validate_ip_udp_hdr(family, &src_addr, &dst_addr, rx_buf, ret);
+	zassert_mem_equal(rx_buf + headers_len, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+
+	ret = zsock_recv(udp_sock_2, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive UDP packet (%d)", errno);
+	zassert_equal(ret, sizeof(test_payload),
+		     "Invalid data size received (%d, expected %d)",
+		      ret, sizeof(test_payload));
+	zassert_mem_equal(rx_buf, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+}
+
+ZTEST(socket_af_inet_raw, test_raw_and_udp_v4_socks_recv)
+{
+	test_raw_and_udp_socks_recv(AF_INET);
+}
+
+ZTEST(socket_af_inet_raw, test_raw_and_udp_v6_socks_recv)
+{
+	test_raw_and_udp_socks_recv(AF_INET6);
+}
+
+static void test_packet_and_raw_socks_recv(sa_family_t family, uint16_t packet_proto)
+{
+	size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN;
+	size_t expected_len = headers_len + sizeof(test_payload);
+	int ret;
+
+	prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP);
+	prepare_packet_sock(packet_proto);
+	sock_bind_any(raw_sock, family);
+
+	/* Send to bound UDP endpoint this time */
+	ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0,
+			   &dst_addr, addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)",
+		      errno);
+
+	/* Both packet and RAW IP sockets should receive the packet. */
+	ret = zsock_recv(packet_sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive packet (%d)", errno);
+	zassert_equal(ret, expected_len,
+		      "Invalid data size received (%d, expected %d)",
+		      ret, expected_len);
+
+	validate_ip_udp_hdr(family, &src_addr, &dst_addr, rx_buf, ret);
+	zassert_mem_equal(rx_buf + headers_len, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+
+	memset(rx_buf, 0, sizeof(rx_buf));
+
+	ret = zsock_recv(raw_sock, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive RAW packet (%d)", errno);
+	zassert_equal(ret, expected_len,
+		      "Invalid data size received (%d, expected %d)",
+		      ret, expected_len);
+
+	validate_ip_udp_hdr(family, &src_addr, &dst_addr, rx_buf, ret);
+	zassert_mem_equal(rx_buf + headers_len, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+
+
+}
+
+ZTEST(socket_af_inet_raw, test_packet_and_raw_v4_socks_recv_wildcard)
+{
+	if (!IS_ENABLED(CONFIG_NET_SOCKETS_PACKET)) {
+		ztest_test_skip();
+	}
+
+	test_packet_and_raw_socks_recv(AF_INET, ETH_P_ALL);
+}
+
+ZTEST(socket_af_inet_raw, test_packet_and_raw_v6_socks_recv_wildcard)
+{
+	if (!IS_ENABLED(CONFIG_NET_SOCKETS_PACKET)) {
+		ztest_test_skip();
+	}
+
+	test_packet_and_raw_socks_recv(AF_INET6, ETH_P_ALL);
+}
+
+ZTEST(socket_af_inet_raw, test_packet_and_raw_v4_socks_recv_proto_match)
+{
+	if (!IS_ENABLED(CONFIG_NET_SOCKETS_PACKET)) {
+		ztest_test_skip();
+	}
+
+	test_packet_and_raw_socks_recv(AF_INET, ETH_P_IP);
+}
+
+ZTEST(socket_af_inet_raw, test_packet_and_raw_v6_socks_recv_proto_match)
+{
+	if (!IS_ENABLED(CONFIG_NET_SOCKETS_PACKET)) {
+		ztest_test_skip();
+	}
+
+	test_packet_and_raw_socks_recv(AF_INET6, ETH_P_IPV6);
+}
+
+static void test_after(void *arg)
+{
+	ARG_UNUSED(arg);
+
+	memset(&rx_buf, 0, sizeof(rx_buf));
+	memset(&tx_buf, 0, sizeof(tx_buf));
+	memset(&src_addr, 0, sizeof(src_addr));
+	memset(&dst_addr, 0, sizeof(dst_addr));
+	addrlen = 0;
+
+	test_sockets_close();
+}
+
+static void *test_setup(void)
+{
+	(void)net_if_ipv4_addr_add(test_iface, &test_ipv4_1, NET_ADDR_MANUAL, 0);
+	(void)net_if_ipv4_addr_add(test_iface, &test_ipv4_2, NET_ADDR_MANUAL, 0);
+	(void)net_if_ipv6_addr_add(test_iface, &test_ipv6_1, NET_ADDR_MANUAL, 0);
+	(void)net_if_ipv6_addr_add(test_iface, &test_ipv6_2, NET_ADDR_MANUAL, 0);
+	(void)net_if_up(test_iface);
+
+	return NULL;
+}
+
+ZTEST_SUITE(socket_af_inet_raw, NULL, test_setup, NULL, test_after, NULL);
diff --git a/tests/net/socket/af_inet_raw/testcase.yaml b/tests/net/socket/af_inet_raw/testcase.yaml
new file mode 100644
index 0000000000000..7e11bd04a06e9
--- /dev/null
+++ b/tests/net/socket/af_inet_raw/testcase.yaml
@@ -0,0 +1,11 @@
+common:
+  depends_on: netif
+  tags:
+    - net
+    - socket
+tests:
+  net.socket.af_inet_raw: {}
+  net.socket.af_inet_raw.af_packet:
+    extra_configs:
+      - CONFIG_NET_SOCKETS_PACKET=y
+      - CONFIG_NET_SOCKETS_PACKET_DGRAM=y
diff --git a/tests/net/socket/af_packet/prj.conf b/tests/net/socket/af_packet/prj.conf
index 2eeb220abdb50..342442f9cfc98 100644
--- a/tests/net/socket/af_packet/prj.conf
+++ b/tests/net/socket/af_packet/prj.conf
@@ -21,5 +21,7 @@ CONFIG_NET_LOG=y
 CONFIG_TEST_USERSPACE=y
 CONFIG_NET_MAX_CONTEXTS=8
 CONFIG_NET_MAX_CONN=8
+CONFIG_NET_IF_MAX_IPV4_COUNT=2
+CONFIG_NET_CONTEXT_RCVTIMEO=y
 
 CONFIG_MAIN_STACK_SIZE=1024
diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c
index df0cb8de5334f..68b5c58e79ffc 100644
--- a/tests/net/socket/af_packet/src/main.c
+++ b/tests/net/socket/af_packet/src/main.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 Intel Corporation
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,6 +15,70 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <zephyr/posix/fcntl.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_ip.h>
+
+/* This test suite verifies that AF_PACKET sockets behave according to well known behaviors.
+ * Note, that this is not well standardized and relies on behaviors known from Linux or FreeBSD.
+ *
+ * Sending data (TX)
+ *
+ *   * (AF_PACKET, SOCK_RAW, 0) - The packet contains already a valid L2 header:
+ *     - test_raw_sock_sendto_no_proto_bound
+ *     - test_raw_sock_sendto_no_proto_unbound
+ *     - test_raw_sock_sendto_no_proto_unbound_no_iface
+ *     - test_raw_sock_sendto_no_proto_unbound_no_addr
+ *     - test_raw_sock_sendmsg_no_proto
+ *
+ *   * (AF_PACKET, SOCK_DGRAM, 0) - User needs to supply `struct sockaddr_ll` with
+ *     all the relevant fields filled so that L2 header can be constructed:
+ *     - test_dgram_sock_sendto_no_proto_bound
+ *     - test_dgram_sock_sendto_no_proto_unbound
+ *     - test_dgram_sock_sendto_no_proto_unbound_no_iface
+ *     - test_dgram_sock_sendto_no_proto_unbound_no_addr
+ *     - test_dgram_sock_sendmsg_no_proto
+ *
+ *   * (AF_PACKET, SOCK_RAW, <protocol>) - The packet contains already a valid
+ *     L2 header. Not mentioned in packet(7) but as the L2 header needs to be
+ *     supplied by the user, the protocol value is ignored:
+ *     - test_raw_sock_sendto_proto_wildcard
+ *     - test_raw_sock_sendmsg_proto_wildcard
+ *
+ *   * (AF_PACKET, SOCK_DGRAM, <protocol>) -  L2 header is constructed according
+ *     to protocol and `struct sockaddr_ll`:
+ *     - test_dgram_sock_sendto_proto_wildcard
+ *     - test_dgram_sock_sendto_proto_match
+ *     - test_dgram_sock_sendmsg_proto_wildcard
+ *     - test_dgram_sock_sendmsg_proto_match
+ *
+ * Receiving data (RX)
+ *
+ *   * (AF_PACKET, SOCK_RAW, 0) - The packet is dropped when received by this socket.
+ *     See https://man7.org/linux/man-pages/man7/packet.7.html:
+ *     - test_raw_sock_recv_no_proto
+ *
+ *   * (AF_PACKET, SOCK_DGRAM, 0) - The packet is dropped when received by this socket.
+ *     See https://man7.org/linux/man-pages/man7/packet.7.html
+ *     - test_dgram_sock_recv_no_proto
+ *
+ *   * (AF_PACKET, SOCK_RAW, <protocol>) - The packet is received for a given protocol
+ *     only. The L2 header is not removed from the data:
+ *     - NOT SUPPORTED
+ *
+ *   * (AF_PACKET, SOCK_DGRAM, <protocol>) - The packet is received for a given protocol
+ *     only. The L2 header is removed from the data:
+ *     - test_dgram_sock_recv_proto_match
+ *     - test_dgram_sock_recv_proto_mismatch
+ *
+ *   * (AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)) - The packet is received for all protocols.
+ *     The L2 header is not removed from the data:
+ *     - test_raw_sock_recv_proto_wildcard
+ *     - test_raw_sock_recvfrom_proto_wildcard
+ *
+ *   * (AF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) - The packet is received for all protocols.
+ *     The L2 header is removed from the data:
+ *     - test_dgram_sock_recv_proto_wildcard
+ *     - test_dgram_sock_recvfrom_proto_wildcard
+ */
 
 #if defined(CONFIG_NET_SOCKETS_LOG_LEVEL_DBG)
 #define DBG(fmt, ...) NET_DBG(fmt, ##__VA_ARGS__)
@@ -21,7 +86,18 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #define DBG(fmt, ...)
 #endif
 
-#define IPV4_ADDR "127.0.0.1"
+#define IPV4_ADDR "192.0.2.1"
+
+static int packet_sock_1 = -1;
+static int packet_sock_2 = -1;
+static int packet_sock_3 = -1;
+static int udp_sock_1 = -1;
+static int udp_sock_2 = -1;
+
+static const uint8_t test_payload[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+static uint8_t rx_buf[64];
+static uint8_t tx_buf[64];
+static struct in_addr fake_src = { { { 192, 0, 2, 2 } } };
 
 static uint8_t lladdr1[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 };
 static uint8_t lladdr2[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 };
@@ -103,36 +179,51 @@ ETH_NET_DEVICE_INIT(eth_fake2, "eth_fake2", NULL, NULL, &eth_fake_data2, NULL,
 		    CONFIG_ETH_INIT_PRIORITY, &eth_fake_api_funcs,
 		    NET_ETH_MTU);
 
-static int setup_socket(struct net_if *iface, int type, int proto)
+static void setup_packet_socket(int *sock, struct net_if *iface, int type,
+				int proto)
 {
-	int sock;
+	struct timeval optval = {
+		.tv_usec = 100000,
+	};
+	int ret;
 
-	sock = zsock_socket(AF_PACKET, type, proto);
-	zassert_true(sock >= 0, "Cannot create packet socket (%d)", -errno);
+	*sock = zsock_socket(AF_PACKET, type, proto);
+	zassert_true(*sock >= 0, "Cannot create packet socket (%d)", -errno);
 
-	return sock;
+	ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
+			       sizeof(optval));
+	zassert_ok(ret, "setsockopt failed (%d)", errno);
 }
 
-static int bind_socket(int sock, struct net_if *iface)
+static void bind_packet_socket(int sock, struct net_if *iface)
 {
 	struct sockaddr_ll addr;
+	int ret;
 
 	memset(&addr, 0, sizeof(addr));
 
 	addr.sll_ifindex = net_if_get_by_iface(iface);
 	addr.sll_family = AF_PACKET;
 
-	return zsock_bind(sock, (struct sockaddr *)&addr, sizeof(addr));
+	ret = zsock_bind(sock, (struct sockaddr *)&addr, sizeof(addr));
+	zassert_ok(ret, "Cannot bind packet socket (%d)", -errno);
+}
+
+static void prepare_packet_socket(int *sock, struct net_if *iface, int type,
+				  int proto)
+{
+	setup_packet_socket(sock, iface, type, proto);
+	bind_packet_socket(*sock, iface);
 }
 
 struct user_data {
 	struct net_if *first;
 	struct net_if *second;
-};
+} ud;
 
 static void iface_cb(struct net_if *iface, void *user_data)
 {
-	struct user_data *ud = user_data;
+	struct user_data *test_data = user_data;
 	struct net_linkaddr *link_addr;
 
 	if (net_if_l2(iface) != &NET_L2_GET_NAME(ETHERNET)) {
@@ -145,39 +236,25 @@ static void iface_cb(struct net_if *iface, void *user_data)
 		return;
 	}
 
-	if (ud->first == NULL) {
-		ud->first = iface;
+	if (test_data->first == NULL) {
+		test_data->first = iface;
 		return;
 	}
 
-	ud->second = iface;
-}
-
-static void setblocking(int fd, bool val)
-{
-	int fl, res;
-
-	fl = zsock_fcntl(fd, F_GETFL, 0);
-	zassert_not_equal(fl, -1, "Fail to set fcntl");
-
-	if (val) {
-		fl &= ~O_NONBLOCK;
-	} else {
-		fl |= O_NONBLOCK;
-	}
-
-	res = zsock_fcntl(fd, F_SETFL, fl);
-	zassert_not_equal(res, -1, "Fail to set fcntl");
+	test_data->second = iface;
 }
 
 #define SRC_PORT 4240
 #define DST_PORT 4242
-static int prepare_udp_socket(struct sockaddr_in *sockaddr, uint16_t local_port)
+static void prepare_udp_socket(int *sock, struct sockaddr_in *sockaddr, uint16_t local_port)
 {
-	int sock, ret;
+	struct timeval optval = {
+		.tv_usec = 100000,
+	};
+	int ret;
 
-	sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-	zassert_true(sock >= 0, "Cannot create DGRAM (UDP) socket (%d)", sock);
+	*sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	zassert_true(*sock >= 0, "Cannot create DGRAM (UDP) socket (%d)", sock);
 
 	sockaddr->sin_family = AF_INET;
 	sockaddr->sin_port = htons(local_port);
@@ -185,55 +262,35 @@ static int prepare_udp_socket(struct sockaddr_in *sockaddr, uint16_t local_port)
 	zassert_equal(ret, 1, "inet_pton failed");
 
 	/* Bind UDP socket to local port */
-	ret = zsock_bind(sock, (struct sockaddr *) sockaddr, sizeof(*sockaddr));
+	ret = zsock_bind(*sock, (struct sockaddr *) sockaddr, sizeof(*sockaddr));
 	zassert_equal(ret, 0, "Cannot bind DGRAM (UDP) socket (%d)", -errno);
 
-	return sock;
-}
-
-static void __test_packet_sockets(int *sock1, int *sock2)
-{
-	struct user_data ud = { 0 };
-	int ret;
-
-	net_if_foreach(iface_cb, &ud);
-
-	zassert_not_null(ud.first, "1st Ethernet interface not found");
-	zassert_not_null(ud.second, "2nd Ethernet interface not found");
-
-	*sock1 = setup_socket(ud.first, SOCK_RAW, htons(ETH_P_ALL));
-	zassert_true(*sock1 >= 0, "Cannot create 1st socket (%d)", *sock1);
-
-	*sock2 = setup_socket(ud.second, SOCK_RAW, htons(ETH_P_ALL));
-	zassert_true(*sock2 >= 0, "Cannot create 2nd socket (%d)", *sock2);
-
-	ret = bind_socket(*sock1, ud.first);
-	zassert_equal(ret, 0, "Cannot bind 1st socket (%d)", -errno);
-
-	ret = bind_socket(*sock2, ud.second);
-	zassert_equal(ret, 0, "Cannot bind 2nd socket (%d)", -errno);
+	ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
+			       sizeof(optval));
+	zassert_ok(ret, "setsockopt failed (%d)", errno);
 }
 
 #define IP_HDR_SIZE 20
 #define UDP_HDR_SIZE 8
 #define HDR_SIZE (IP_HDR_SIZE + UDP_HDR_SIZE)
-ZTEST(socket_packet, test_raw_packet_sockets)
+ZTEST(socket_packet, test_raw_packet_sockets_udp_send)
 {
 	uint8_t data_to_send[] = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
 	uint8_t data_to_receive[sizeof(data_to_send) + HDR_SIZE];
 	struct sockaddr_ll src;
 	struct sockaddr_in sockaddr;
-	int ret, sock1, sock2, sock3, sock4;
+	int ret;
 	socklen_t addrlen;
 	ssize_t sent = 0;
 
-	__test_packet_sockets(&sock1, &sock2);
+	prepare_packet_socket(&packet_sock_1, ud.first, SOCK_RAW, htons(ETH_P_ALL));
+	prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL));
 
 	/* Prepare UDP socket which will read data */
-	sock3 = prepare_udp_socket(&sockaddr, DST_PORT);
+	prepare_udp_socket(&udp_sock_1, &sockaddr, DST_PORT);
 
 	/* Prepare UDP socket from which data are going to be sent */
-	sock4 = prepare_udp_socket(&sockaddr, SRC_PORT);
+	prepare_udp_socket(&udp_sock_2, &sockaddr, SRC_PORT);
 	/* Properly set destination port for UDP packet */
 	sockaddr.sin_port = htons(DST_PORT);
 
@@ -241,19 +298,16 @@ ZTEST(socket_packet, test_raw_packet_sockets)
 	 * Send UDP datagram to us - as check_ip_addr() in net_send_data()
 	 * returns 1 - the packet is processed immediately in the net stack
 	 */
-	sent = zsock_sendto(sock4, data_to_send, sizeof(data_to_send),
+	sent = zsock_sendto(udp_sock_2, data_to_send, sizeof(data_to_send),
 			    0, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
 	zassert_equal(sent, sizeof(data_to_send), "sendto failed");
 
-	k_msleep(10); /* Let the packet enter the system */
-
-	setblocking(sock3, false);
 	memset(&data_to_receive, 0, sizeof(data_to_receive));
 	errno = 0;
 
 	/* Check if UDP packets can be read after being sent */
 	addrlen = sizeof(sockaddr);
-	ret = zsock_recvfrom(sock3, data_to_receive, sizeof(data_to_receive),
+	ret = zsock_recvfrom(udp_sock_1, data_to_receive, sizeof(data_to_receive),
 			     0, (struct sockaddr *)&sockaddr, &addrlen);
 	zassert_equal(ret, sizeof(data_to_send), "Cannot receive all data (%d)",
 		      -errno);
@@ -261,7 +315,6 @@ ZTEST(socket_packet, test_raw_packet_sockets)
 			  "Sent and received buffers do not match");
 
 	/* And if the packet has been also passed to RAW socket */
-	setblocking(sock1, false);
 	memset(&data_to_receive, 0, sizeof(data_to_receive));
 	memset(&src, 0, sizeof(src));
 	addrlen = sizeof(src);
@@ -271,7 +324,7 @@ ZTEST(socket_packet, test_raw_packet_sockets)
 	 * IP (20B) and UDP (8) headers. After those we can expect payload,
 	 * which have been sent.
 	 */
-	ret = zsock_recvfrom(sock1, data_to_receive, sizeof(data_to_receive), 0,
+	ret = zsock_recvfrom(packet_sock_1, data_to_receive, sizeof(data_to_receive), 0,
 			     (struct sockaddr *)&src, &addrlen);
 	zassert_equal(ret, sizeof(data_to_send) + HDR_SIZE,
 		      "Cannot receive all data (%d vs %zd) (%d)",
@@ -279,80 +332,62 @@ ZTEST(socket_packet, test_raw_packet_sockets)
 	zassert_mem_equal(&data_to_receive[HDR_SIZE], data_to_send,
 			  sizeof(data_to_send),
 			  "Sent and received buffers do not match");
-
-	zsock_close(sock1);
-	zsock_close(sock2);
-	zsock_close(sock3);
-	zsock_close(sock4);
 }
 
 ZTEST(socket_packet, test_packet_sockets)
 {
-	int sock1, sock2;
-
-	__test_packet_sockets(&sock1, &sock2);
-
-	zsock_close(sock1);
-	zsock_close(sock2);
+	prepare_packet_socket(&packet_sock_1, ud.first, SOCK_RAW, htons(ETH_P_ALL));
+	prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL));
 }
 
 ZTEST(socket_packet, test_packet_sockets_dgram)
 {
-	uint8_t data_to_send[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-	uint8_t data_to_receive[32];
 	socklen_t addrlen = sizeof(struct sockaddr_ll);
-	struct user_data ud = { 0 };
 	struct sockaddr_ll dst, src;
-	int ret, sock1, sock2;
-	int iter, max_iter = 10;
-
-	net_if_foreach(iface_cb, &ud);
-
-	zassert_not_null(ud.first, "1st Ethernet interface not found");
-	zassert_not_null(ud.second, "2nd Ethernet interface not found");
-
-	sock1 = setup_socket(ud.first, SOCK_DGRAM, htons(ETH_P_TSN));
-	zassert_true(sock1 >= 0, "Cannot create 1st socket (%d)", sock1);
-
-	sock2 = setup_socket(ud.second, SOCK_DGRAM, htons(ETH_P_TSN));
-	zassert_true(sock2 >= 0, "Cannot create 2nd socket (%d)", sock2);
-
-	ret = bind_socket(sock1, ud.first);
-	zassert_equal(ret, 0, "Cannot bind 1st socket (%d)", -errno);
-
-	ret = bind_socket(sock2, ud.second);
-	zassert_equal(ret, 0, "Cannot bind 2nd socket (%d)", -errno);
+	int ret;
 
-	setblocking(sock1, false);
-	setblocking(sock2, false);
+	prepare_packet_socket(&packet_sock_1, ud.first, SOCK_DGRAM, htons(ETH_P_TSN));
+	prepare_packet_socket(&packet_sock_2, ud.second, SOCK_DGRAM, htons(ETH_P_TSN));
 
 	memset(&dst, 0, sizeof(dst));
 	dst.sll_family = AF_PACKET;
 	dst.sll_protocol = htons(ETH_P_TSN);
 	memcpy(dst.sll_addr, lladdr1, sizeof(lladdr1));
 
-	ret = zsock_sendto(sock2, data_to_send, sizeof(data_to_send), 0,
+	ret = zsock_sendto(packet_sock_2, test_payload, sizeof(test_payload), 0,
 			   (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
-	zassert_equal(ret, sizeof(data_to_send), "Cannot send all data (%d)",
+	zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)",
 		      -errno);
 
-	k_msleep(10); /* Let the packet enter the system */
-	memset(&src, 0, sizeof(src));
+	ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), 0,
+	(struct sockaddr *)&src, &addrlen);
+	zassert_equal(ret, -1, "Received something (%d)", ret);
+	zassert_equal(errno, EAGAIN, "Wrong errno (%d)", errno);
 
+	memset(&src, 0, sizeof(src));
 	errno = 0;
-	iter = 0;
-	do {
-		ret = zsock_recvfrom(sock1, data_to_receive, sizeof(data_to_receive),
-				     0, (struct sockaddr *)&src, &addrlen);
-		k_msleep(10);
-		iter++;
-	} while (ret < 0 && errno == EAGAIN && iter < max_iter);
-
-	zassert_equal(ret, sizeof(data_to_send),
+	ret = zsock_recvfrom(packet_sock_1, rx_buf, sizeof(rx_buf),
+			     0, (struct sockaddr *)&src, &addrlen);
+	zassert_equal(ret, sizeof(test_payload),
 		      "Cannot receive all data (%d vs %zd) (%d)",
-		      ret, sizeof(data_to_send), -errno);
+		      ret, sizeof(test_payload), -errno);
+
+	zassert_equal(addrlen, sizeof(struct sockaddr_ll),
+		      "Invalid address length (%d)", addrlen);
+
+	struct sockaddr_ll src_expected = {
+		.sll_family = AF_PACKET,
+		.sll_protocol = dst.sll_protocol,
+		.sll_ifindex = net_if_get_by_iface(ud.first),
+		.sll_pkttype = PACKET_OTHERHOST,
+		.sll_hatype = ARPHRD_ETHER,
+		.sll_halen = sizeof(lladdr2),
+		.sll_addr = {0},
+	};
+	memcpy(&src_expected.sll_addr, lladdr2, ARRAY_SIZE(lladdr2));
+	zassert_mem_equal(&src, &src_expected, addrlen, "Invalid source address");
 
-	zassert_mem_equal(data_to_send, data_to_receive, sizeof(data_to_send),
+	zassert_mem_equal(test_payload, rx_buf, sizeof(test_payload),
 			  "Data mismatch");
 
 	memcpy(dst.sll_addr, lladdr2, sizeof(lladdr2));
@@ -360,15 +395,14 @@ ZTEST(socket_packet, test_packet_sockets_dgram)
 	/* Send to socket 2 but read from socket 1. There should not be any
 	 * data in socket 1
 	 */
-	ret = zsock_sendto(sock2, data_to_send, sizeof(data_to_send), 0,
+	ret = zsock_sendto(packet_sock_2, test_payload, sizeof(test_payload), 0,
 			   (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
-	zassert_equal(ret, sizeof(data_to_send), "Cannot send all data (%d)",
+	zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)",
 		      -errno);
 
-	k_msleep(10);
 	memset(&src, 0, sizeof(src));
 
-	ret = zsock_recvfrom(sock1, data_to_receive, sizeof(data_to_receive), 0,
+	ret = zsock_recvfrom(packet_sock_1, rx_buf, sizeof(rx_buf), 0,
 			     (struct sockaddr *)&src, &addrlen);
 	zassert_equal(ret, -1, "Received something (%d)", ret);
 	zassert_equal(errno, EAGAIN, "Wrong errno (%d)", errno);
@@ -376,32 +410,59 @@ ZTEST(socket_packet, test_packet_sockets_dgram)
 	memset(&src, 0, sizeof(src));
 
 	errno = 0;
-	iter = 0;
-	do {
-		ret = zsock_recvfrom(sock2, data_to_receive, sizeof(data_to_receive),
-				     0, (struct sockaddr *)&src, &addrlen);
-		k_msleep(10);
-		iter++;
-	} while (ret < 0 && errno == EAGAIN && iter < max_iter);
-
-	zassert_equal(ret, sizeof(data_to_send), "Cannot receive all data (%d)",
+	ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf),
+			     0, (struct sockaddr *)&src, &addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Cannot receive all data (%d)",
 		      -errno);
-	zassert_mem_equal(data_to_send, data_to_receive, sizeof(data_to_send),
+	zassert_equal(addrlen, sizeof(struct sockaddr_ll),
+		      "Invalid address length (%d)", addrlen);
+
+	src_expected = (struct sockaddr_ll){
+		.sll_family = AF_PACKET,
+		.sll_protocol = dst.sll_protocol,
+		.sll_ifindex = net_if_get_by_iface(ud.second),
+		.sll_pkttype = PACKET_OTHERHOST,
+		.sll_hatype = ARPHRD_ETHER,
+		.sll_halen = ARRAY_SIZE(lladdr2),
+		.sll_addr = {0},
+	};
+	memcpy(&src_expected.sll_addr, lladdr2, ARRAY_SIZE(lladdr2));
+	zassert_mem_equal(&src, &src_expected, addrlen, "Invalid source address");
+
+	zassert_mem_equal(test_payload, rx_buf, sizeof(test_payload),
 			  "Data mismatch");
 
-	zsock_close(sock1);
-	zsock_close(sock2);
+	/* Send specially crafted payload to mimic IPv4 and IPv6 length field,
+	 * to ckeck correct length returned.
+	 */
+	uint8_t payload_ip_length[64], receive_ip_length[64];
+
+	memset(payload_ip_length, 0, sizeof(payload_ip_length));
+	/* Set ipv4 and ipv6 length fields to represent IP payload with the
+	 * length of 1 byte.
+	 */
+	payload_ip_length[3] = 21;
+	payload_ip_length[5] = 1;
+
+	ret = zsock_sendto(packet_sock_2, payload_ip_length, sizeof(payload_ip_length), 0,
+			   (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
+	zassert_equal(ret, sizeof(payload_ip_length), "Cannot send all data (%d)", -errno);
+
+	memset(&src, 0, sizeof(src));
+	errno = 0;
+	ret = zsock_recvfrom(packet_sock_2, receive_ip_length, sizeof(receive_ip_length), 0,
+			     (struct sockaddr *)&src, &addrlen);
+
+	zassert_equal(ret, ARRAY_SIZE(payload_ip_length), "Cannot receive all data (%d)", -errno);
+	zassert_mem_equal(payload_ip_length, receive_ip_length, sizeof(payload_ip_length),
+			  "Data mismatch");
 }
 
 ZTEST(socket_packet, test_raw_and_dgram_socket_exchange)
 {
-	uint8_t data_to_send[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-	uint8_t data_to_receive[32];
 	socklen_t addrlen = sizeof(struct sockaddr_ll);
-	struct user_data ud = { 0 };
 	struct sockaddr_ll dst, src;
-	int ret, sock1, sock2;
-	int iter, max_iter = 10;
+	int ret;
 	const uint8_t expected_payload_raw[] = {
 		0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* Dst ll addr */
 		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, /* Src ll addr */
@@ -415,26 +476,8 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange)
 		0, 1, 2, 3, 4, 5, 6, 7, 8, 9 /* Payload */
 	};
 
-
-	net_if_foreach(iface_cb, &ud);
-
-	zassert_not_null(ud.first, "1st Ethernet interface not found");
-	zassert_not_null(ud.second, "2nd Ethernet interface not found");
-
-	sock1 = setup_socket(ud.first, SOCK_DGRAM, htons(ETH_P_ALL));
-	zassert_true(sock1 >= 0, "Cannot create 1st socket (%d)", sock1);
-
-	sock2 = setup_socket(ud.second, SOCK_RAW, htons(ETH_P_ALL));
-	zassert_true(sock2 >= 0, "Cannot create 2nd socket (%d)", sock2);
-
-	ret = bind_socket(sock1, ud.first);
-	zassert_equal(ret, 0, "Cannot bind 1st socket (%d)", -errno);
-
-	ret = bind_socket(sock2, ud.second);
-	zassert_equal(ret, 0, "Cannot bind 2nd socket (%d)", -errno);
-
-	setblocking(sock1, false);
-	setblocking(sock2, false);
+	prepare_packet_socket(&packet_sock_1, ud.first, SOCK_DGRAM, htons(ETH_P_ALL));
+	prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL));
 
 	memset(&dst, 0, sizeof(dst));
 	dst.sll_family = AF_PACKET;
@@ -443,28 +486,21 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange)
 
 	/* SOCK_DGRAM to SOCK_RAW */
 
-	ret = zsock_sendto(sock1, data_to_send, sizeof(data_to_send), 0,
+	ret = zsock_sendto(packet_sock_1, test_payload, sizeof(test_payload), 0,
 			   (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
-	zassert_equal(ret, sizeof(data_to_send), "Cannot send all data (%d)",
+	zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)",
 		      -errno);
 
 	k_msleep(10); /* Let the packet enter the system */
 	memset(&src, 0, sizeof(src));
 
 	errno = 0;
-	iter = 0;
-	do {
-		ret = zsock_recvfrom(sock2, data_to_receive, sizeof(data_to_receive),
-				     0, (struct sockaddr *)&src, &addrlen);
-		k_msleep(10);
-		iter++;
-	} while (ret < 0 && errno == EAGAIN && iter < max_iter);
-
+	ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf),
+			     0, (struct sockaddr *)&src, &addrlen);
 	zassert_equal(ret, sizeof(expected_payload_raw),
 		      "Cannot receive all data (%d vs %zd) (%d)",
 		      ret, sizeof(expected_payload_raw), -errno);
-
-	zassert_mem_equal(expected_payload_raw, data_to_receive,
+	zassert_mem_equal(expected_payload_raw, rx_buf,
 			  sizeof(expected_payload_raw), "Data mismatch");
 
 	memset(&dst, 0, sizeof(dst));
@@ -473,41 +509,27 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange)
 
 	/* SOCK_RAW to SOCK_DGRAM */
 
-	ret = zsock_sendto(sock2, send_payload_raw, sizeof(send_payload_raw), 0,
+	ret = zsock_sendto(packet_sock_2, send_payload_raw, sizeof(send_payload_raw), 0,
 			   (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
 	zassert_equal(ret, sizeof(send_payload_raw), "Cannot send all data (%d)",
 		      -errno);
 
-	k_msleep(10);
 	memset(&src, 0, sizeof(src));
 
 	errno = 0;
-	iter = 0;
-	do {
-		ret = zsock_recvfrom(sock1, data_to_receive, sizeof(data_to_receive),
-				     0, (struct sockaddr *)&src, &addrlen);
-		k_msleep(10);
-		iter++;
-	} while (ret < 0 && errno == EAGAIN && iter < max_iter);
-
-	zassert_equal(ret, sizeof(data_to_send), "Cannot receive all data (%d)",
+	ret = zsock_recvfrom(packet_sock_1, rx_buf, sizeof(rx_buf),
+			     0, (struct sockaddr *)&src, &addrlen);
+	zassert_equal(ret, sizeof(test_payload), "Cannot receive all data (%d)",
 		      -errno);
-	zassert_mem_equal(data_to_send, data_to_receive, sizeof(data_to_send),
+	zassert_mem_equal(test_payload, rx_buf, sizeof(test_payload),
 			  "Data mismatch");
-
-	zsock_close(sock1);
-	zsock_close(sock2);
 }
 
 ZTEST(socket_packet, test_raw_and_dgram_socket_recv)
 {
-	uint8_t data_to_send[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-	uint8_t data_to_receive[32];
 	socklen_t addrlen = sizeof(struct sockaddr_ll);
-	struct user_data ud = { 0 };
 	struct sockaddr_ll dst, src;
-	int ret, sock1, sock2, sock3;
-	int iter, max_iter = 10;
+	int ret;
 	const uint8_t expected_payload_raw[] = {
 		0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* Dst ll addr */
 		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, /* Src ll addr */
@@ -515,83 +537,497 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_recv)
 		0, 1, 2, 3, 4, 5, 6, 7, 8, 9 /* Payload */
 	};
 
-	net_if_foreach(iface_cb, &ud);
-
-	zassert_not_null(ud.first, "1st Ethernet interface not found");
-	zassert_not_null(ud.second, "2nd Ethernet interface not found");
-
-	sock1 = setup_socket(ud.first, SOCK_DGRAM, htons(ETH_P_ALL));
-	zassert_true(sock1 >= 0, "Cannot create 1st socket (%d)", sock1);
-
-	sock2 = setup_socket(ud.second, SOCK_RAW, htons(ETH_P_ALL));
-	zassert_true(sock2 >= 0, "Cannot create 2nd socket (%d)", sock2);
-
-	sock3 = setup_socket(ud.second, SOCK_RAW, htons(ETH_P_ALL));
-	zassert_true(sock3 >= 0, "Cannot create 2nd socket (%d)", sock3);
-
-	ret = bind_socket(sock1, ud.first);
-	zassert_equal(ret, 0, "Cannot bind 1st socket (%d)", -errno);
-
-	ret = bind_socket(sock2, ud.second);
-	zassert_equal(ret, 0, "Cannot bind 2nd socket (%d)", -errno);
-
-	ret = bind_socket(sock3, ud.second);
-	zassert_equal(ret, 0, "Cannot bind 2nd socket (%d)", -errno);
-
-	setblocking(sock1, false);
-	setblocking(sock2, false);
-	setblocking(sock3, false);
+	prepare_packet_socket(&packet_sock_1, ud.first, SOCK_DGRAM, htons(ETH_P_ALL));
+	prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL));
+	prepare_packet_socket(&packet_sock_3, ud.second, SOCK_DGRAM, htons(ETH_P_ALL));
 
 	memset(&dst, 0, sizeof(dst));
 	dst.sll_family = AF_PACKET;
 	dst.sll_protocol = htons(ETH_P_IP);
 	memcpy(dst.sll_addr, lladdr2, sizeof(lladdr1));
 
-	ret = zsock_sendto(sock1, data_to_send, sizeof(data_to_send), 0,
+	ret = zsock_sendto(packet_sock_1, test_payload, sizeof(test_payload), 0,
 			   (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
-	zassert_equal(ret, sizeof(data_to_send), "Cannot send all data (%d)",
+	zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)",
 		      -errno);
 
-	k_msleep(10); /* Let the packet enter the system */
 	memset(&src, 0, sizeof(src));
 
 	/* Both SOCK_DGRAM to SOCK_RAW sockets should receive packet. */
 
 	errno = 0;
-	iter = 0;
-	do {
-		ret = zsock_recvfrom(sock2, data_to_receive, sizeof(data_to_receive),
-				     0, (struct sockaddr *)&src, &addrlen);
-		k_msleep(10);
-		iter++;
-	} while (ret < 0 && errno == EAGAIN && iter < max_iter);
-
+	ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf),
+			     0, (struct sockaddr *)&src, &addrlen);
 	zassert_equal(ret, sizeof(expected_payload_raw),
 		      "Cannot receive all data (%d vs %zd) (%d)",
 		      ret, sizeof(expected_payload_raw), -errno);
 
-	zassert_mem_equal(expected_payload_raw, data_to_receive,
+	zassert_mem_equal(expected_payload_raw, rx_buf,
 			  sizeof(expected_payload_raw), "Data mismatch");
 
 	memset(&src, 0, sizeof(src));
 
 	errno = 0;
-	iter = 0;
-	do {
-		ret = zsock_recvfrom(sock3, data_to_receive, sizeof(data_to_receive),
-				     0, (struct sockaddr *)&src, &addrlen);
-		k_msleep(10);
-		iter++;
-	} while (ret < 0 && errno == EAGAIN && iter < max_iter);
-
-	zassert_equal(ret, sizeof(expected_payload_raw),
+	ret = zsock_recvfrom(packet_sock_3, rx_buf, sizeof(rx_buf),
+			     0, (struct sockaddr *)&src, &addrlen);
+	zassert_equal(ret, sizeof(test_payload),
 		      "Cannot receive all data (%d)", -errno);
-	zassert_mem_equal(expected_payload_raw, data_to_receive,
-			  sizeof(expected_payload_raw), "Data mismatch");
+	zassert_mem_equal(test_payload, rx_buf, sizeof(test_payload),
+			  "Data mismatch");
+}
+
+#define TEST_IPV4_CHKSUM 0xc3f6
+#define TEST_UDP_CHKSUM 0x8b46
+
+/* Prepare packet with optional IP/UDP headers and optional ethernet header.  */
+static void prepare_test_packet(int sock_type, uint16_t proto,
+				uint8_t *ll_src, uint8_t *ll_dst,
+				uint16_t *pkt_len)
+{
+	uint16_t offset = 0;
+
+	if (sock_type == SOCK_RAW) {
+		struct net_eth_hdr *eth = (struct net_eth_hdr *)tx_buf;
+
+		offset += sizeof(struct net_eth_hdr);
+		zassert_not_null(ll_src, "NULL LL src");
+		zassert_not_null(ll_dst, "NULL LL dst");
+		zassert_true(offset <= sizeof(tx_buf), "Packet too long");
+
+		memcpy(&eth->dst, ll_dst, sizeof(eth->dst));
+		memcpy(&eth->src, ll_src, sizeof(eth->src));
+		eth->type = htons(proto);
+	}
+
+	if (proto == ETH_P_IP) {
+		struct in_addr addr;
+		struct net_ipv4_hdr *ipv4 =
+			(struct net_ipv4_hdr *)(tx_buf + offset);
+		struct net_udp_hdr *udp =
+			(struct net_udp_hdr *)(tx_buf + offset + NET_IPV4H_LEN);
+
+		offset += NET_IPV4UDPH_LEN;
+		zassert_true(offset <= sizeof(tx_buf), "Packet too long");
+		zassert_ok(net_addr_pton(AF_INET, IPV4_ADDR, &addr),
+			   "Addres parse failed");
+
+		/* Prepare IPv4 header */
+		ipv4->vhl = 0x45;
+		ipv4->len = htons(sizeof(test_payload) + NET_IPV4UDPH_LEN);
+		ipv4->ttl = 64;
+		ipv4->proto = IPPROTO_UDP;
+		ipv4->chksum = TEST_IPV4_CHKSUM;
+		memcpy(ipv4->src, &fake_src, sizeof(ipv4->src));
+		memcpy(ipv4->dst, &addr, sizeof(ipv4->dst));
+
+		/* Prepare UDP header */
+		udp->src_port = htons(SRC_PORT);
+		udp->dst_port = htons(DST_PORT);
+		udp->len = htons(sizeof(test_payload) + NET_UDPH_LEN);
+		udp->chksum = TEST_UDP_CHKSUM;
+	}
+
+	zassert_true(offset + sizeof(test_payload) <= sizeof(tx_buf), "Packet too long");
+	memcpy(tx_buf + offset, test_payload, sizeof(test_payload));
+
+	offset += sizeof(test_payload);
+	*pkt_len = offset;
+}
+
+static void prepare_test_dst_lladdr(struct sockaddr_ll *ll_dst, uint16_t proto,
+				    uint8_t *ll_addr, struct net_if *iface)
+{
+	memset(ll_dst, 0, sizeof(struct sockaddr_ll));
+
+	ll_dst->sll_family = AF_PACKET;
+	ll_dst->sll_protocol = htons(proto);
+	memcpy(ll_dst->sll_addr, ll_addr, NET_ETH_ADDR_LEN);
+
+	if (iface != NULL) {
+		ll_dst->sll_ifindex = net_if_get_by_iface(iface);
+	}
+}
+
+static void test_sendto_common(int sock_type, int proto, bool do_bind,
+			       int custom_dst_iface, bool set_dst_addr,
+			       bool success)
+{
+	struct sockaddr_in ip_src;
+	struct sockaddr_ll ll_dst;
+	uint16_t pkt_len;
+	int ret;
+
+	setup_packet_socket(&packet_sock_1, ud.second, sock_type, htons(proto));
+	if (do_bind) {
+		bind_packet_socket(packet_sock_1, ud.second);
+	}
+	prepare_udp_socket(&udp_sock_1, &ip_src, DST_PORT);
+	prepare_test_packet(sock_type, ETH_P_IP, lladdr2, lladdr1, &pkt_len);
+	prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second);
+	if (custom_dst_iface != 0) {
+		ll_dst.sll_ifindex = custom_dst_iface;
+	}
+
+	ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0,
+			   set_dst_addr ? (struct sockaddr *)&ll_dst : NULL,
+			   set_dst_addr ? sizeof(struct sockaddr_ll) : 0);
+	if (success) {
+		zassert_not_equal(ret, -1, "Failed to send (%d)", errno);
+		zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len);
+
+		ret = zsock_recv(udp_sock_1, rx_buf, sizeof(rx_buf), 0);
+		zassert_not_equal(ret, -1, "Failed to receive UDP packet (%d)", errno);
+		zassert_equal(ret, sizeof(test_payload),
+			     "Invalid data size received (%d, expected %d)",
+			      ret, sizeof(test_payload));
+		zassert_mem_equal(rx_buf, test_payload, sizeof(test_payload),
+				  "Invalid payload received");
+	} else {
+		zassert_equal(ret, -1, "Send should fail");
+		zassert_equal(errno, EDESTADDRREQ, "Wrong errno");
+	}
+}
+
+ZTEST(socket_packet, test_raw_sock_sendto_no_proto_bound)
+{
+	test_sendto_common(SOCK_RAW, 0, true, 0, true, true);
+}
+
+ZTEST(socket_packet, test_raw_sock_sendto_no_proto_unbound)
+{
+	test_sendto_common(SOCK_RAW, 0, false, 0, true, true);
+}
+
+ZTEST(socket_packet, test_raw_sock_sendto_no_proto_unbound_no_iface)
+{
+	test_sendto_common(SOCK_RAW, 0, false, 10, true, false);
+}
+
+ZTEST(socket_packet, test_raw_sock_sendto_no_proto_unbound_no_addr)
+{
+	test_sendto_common(SOCK_RAW, 0, false, 0, false, false);
+}
+
+static void test_sendmsg_common(int sock_type, int proto)
+{
+	struct sockaddr_in ip_src;
+	struct sockaddr_ll ll_dst;
+	struct iovec io_vector;
+	struct msghdr msg = { 0 };
+	uint16_t pkt_len;
+	int ret;
+
+	setup_packet_socket(&packet_sock_1, ud.second, sock_type, htons(proto));
+	prepare_udp_socket(&udp_sock_1, &ip_src, DST_PORT);
+	prepare_test_packet(sock_type, ETH_P_IP, lladdr2, lladdr1, &pkt_len);
+	prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second);
+
+	io_vector.iov_base = tx_buf;
+	io_vector.iov_len = pkt_len;
+	msg.msg_iov = &io_vector;
+	msg.msg_iovlen = 1;
+	msg.msg_name = &ll_dst;
+	msg.msg_namelen = sizeof(ll_dst);
+
+	ret = zsock_sendmsg(packet_sock_1, &msg, 0);
+	zassert_not_equal(ret, -1, "Failed to send (%d)", errno);
+	zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len);
+
+	ret = zsock_recv(udp_sock_1, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive UDP packet (%d)", errno);
+	zassert_equal(ret, sizeof(test_payload),
+		      "Invalid data size received (%d, expected %d)",
+		      ret, sizeof(test_payload));
+	zassert_mem_equal(rx_buf, test_payload, sizeof(test_payload),
+			  "Invalid payload received");
+}
+
+ZTEST(socket_packet, test_raw_sock_sendmsg_no_proto)
+{
+	test_sendmsg_common(SOCK_RAW, 0);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_bound)
+{
+	test_sendto_common(SOCK_DGRAM, 0, true, 0, true, true);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_unbound)
+{
+	test_sendto_common(SOCK_DGRAM, 0, false, 0, true, true);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_unbound_no_iface)
+{
+	test_sendto_common(SOCK_DGRAM, 0, false, 10, true, false);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_unbound_no_addr)
+{
+	test_sendto_common(SOCK_DGRAM, 0, false, 0, false, false);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendmsg_no_proto)
+{
+	test_sendmsg_common(SOCK_DGRAM, 0);
+}
+
+ZTEST(socket_packet, test_raw_sock_sendto_proto_wildcard)
+{
+	test_sendto_common(SOCK_RAW, ETH_P_ALL, true, 0, true, true);
+}
+
+ZTEST(socket_packet, test_raw_sock_sendmsg_proto_wildcard)
+{
+	test_sendmsg_common(SOCK_RAW, ETH_P_ALL);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendto_proto_wildcard)
+{
+	test_sendto_common(SOCK_DGRAM, ETH_P_ALL, true, 0, true, true);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendto_proto_match)
+{
+	test_sendto_common(SOCK_DGRAM, ETH_P_IP, true, 0, true, true);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendmsg_proto_wildcard)
+{
+	test_sendmsg_common(SOCK_DGRAM, ETH_P_ALL);
+}
+
+ZTEST(socket_packet, test_dgram_sock_sendmsg_proto_match)
+{
+	test_sendmsg_common(SOCK_DGRAM, ETH_P_IP);
+}
+
+static void test_recv_common(int sock_type, int proto, bool success)
+{
+	struct sockaddr_ll ll_dst;
+	uint16_t offset = 0;
+	uint16_t pkt_len;
+	int ret;
+
+	/* Transmitting sock */
+	setup_packet_socket(&packet_sock_1, ud.second, SOCK_RAW, 0);
+	prepare_test_packet(SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len);
+	prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second);
+	/* Receiving sock */
+	setup_packet_socket(&packet_sock_2, ud.first, sock_type, htons(proto));
+	bind_packet_socket(packet_sock_2, ud.first);
+
+	ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0,
+			   (struct sockaddr *)&ll_dst,
+			   sizeof(struct sockaddr_ll));
+	zassert_not_equal(ret, -1, "Failed to send (%d)", errno);
+	zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len);
+
+	if (sock_type == SOCK_DGRAM) {
+		offset = sizeof(struct net_eth_hdr);
+		pkt_len -= sizeof(struct net_eth_hdr);
+	}
+
+	ret = zsock_recv(packet_sock_2, rx_buf, sizeof(rx_buf), 0);
+	if (success) {
+		zassert_not_equal(ret, -1, "Failed to receive packet (%d)", errno);
+		zassert_equal(ret, pkt_len,
+			     "Invalid data size received (%d, expected %d)",
+			      ret, pkt_len);
+		zassert_mem_equal(rx_buf, tx_buf + offset, pkt_len,
+				  "Invalid payload received");
+	} else {
+		zassert_equal(ret, -1, "Recv should fail");
+		zassert_equal(errno, EAGAIN, "Wrong errno");
+	}
+}
+
+ZTEST(socket_packet, test_raw_sock_recv_no_proto)
+{
+	test_recv_common(SOCK_RAW, 0, false);
+}
+
+ZTEST(socket_packet, test_dgram_sock_recv_no_proto)
+{
+	test_recv_common(SOCK_DGRAM, 0, false);
+}
+
+ZTEST(socket_packet, test_dgram_sock_recv_proto_match)
+{
+	test_recv_common(SOCK_DGRAM, ETH_P_IP, true);
+}
+
+ZTEST(socket_packet, test_dgram_sock_recv_proto_mismatch)
+{
+	test_recv_common(SOCK_DGRAM, ETH_P_IPV6, false);
+}
+
+ZTEST(socket_packet, test_raw_sock_recv_proto_wildcard)
+{
+	test_recv_common(SOCK_RAW, ETH_P_ALL, true);
+}
+
+static void test_recvfrom_common(int sock_type, int proto)
+{
+	struct sockaddr_ll ll_dst;
+	struct sockaddr_ll ll_rx = { 0 };
+	socklen_t addrlen = sizeof(ll_rx);
+	uint16_t pkt_len;
+	uint16_t offset = 0;
+	int ret;
+
+	/* Transmitting sock */
+	setup_packet_socket(&packet_sock_1, ud.second, SOCK_RAW, 0);
+	prepare_test_packet(SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len);
+	prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second);
+	/* Receiving sock */
+	setup_packet_socket(&packet_sock_2, ud.first, sock_type, htons(proto));
+	bind_packet_socket(packet_sock_2, ud.first);
+
+	ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0,
+			   (struct sockaddr *)&ll_dst,
+			   sizeof(struct sockaddr_ll));
+	zassert_not_equal(ret, -1, "Failed to send (%d)", errno);
+	zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len);
+
+	if (sock_type == SOCK_DGRAM) {
+		offset = sizeof(struct net_eth_hdr);
+	}
+
+	ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), 0,
+			     (struct sockaddr *)&ll_rx, &addrlen);
+	zassert_not_equal(ret, -1, "Failed to receive packet (%d)", errno);
+	zassert_equal(ret, pkt_len,
+		      "Invalid data size received (%d, expected %d)",
+		      ret, pkt_len);
+	zassert_mem_equal(rx_buf, tx_buf + offset, pkt_len,
+			  "Invalid payload received");
+	zassert_equal(addrlen, sizeof(struct sockaddr_ll),
+		      "Invalid address length (%u)", addrlen);
+	zassert_equal(ll_rx.sll_family, AF_PACKET, "Invalid family");
+	zassert_equal(ll_rx.sll_protocol, htons(ETH_P_IP), "Invalid protocol");
+	zassert_equal(ll_rx.sll_ifindex, net_if_get_by_iface(ud.first),
+		      "Invalid interface");
+	zassert_equal(ll_rx.sll_hatype, ARPHRD_ETHER, "Invalid hardware type");
+	zassert_equal(ll_rx.sll_pkttype, PACKET_OTHERHOST, "Invalid packet type");
+	zassert_equal(ll_rx.sll_halen, NET_ETH_ADDR_LEN, "Invalid address length");
+	zassert_mem_equal(ll_rx.sll_addr, &lladdr2, NET_ETH_ADDR_LEN,
+			  "Invalid address");
+}
+
+ZTEST(socket_packet, test_raw_sock_recvfrom_proto_wildcard)
+{
+	test_recvfrom_common(SOCK_RAW, ETH_P_ALL);
+}
+
+ZTEST(socket_packet, test_dgram_sock_recv_proto_wildcard)
+{
+	test_recv_common(SOCK_DGRAM, ETH_P_ALL, true);
+}
+
+ZTEST(socket_packet, test_dgram_sock_recvfrom_proto_wildcard)
+{
+	test_recvfrom_common(SOCK_RAW, ETH_P_ALL);
+}
+
+ZTEST(socket_packet, test_raw_dgram_udp_socks_recv)
+{
+	struct sockaddr_in ip_src;
+	struct sockaddr_ll ll_dst;
+	uint8_t offset = 0;
+	uint16_t pkt_len;
+	int ret;
+
+	/* Transmitting sock */
+	setup_packet_socket(&packet_sock_1, ud.second, SOCK_RAW, 0);
+	prepare_test_packet(SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len);
+	prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second);
+	/* Receiving sockets */
+	setup_packet_socket(&packet_sock_2, ud.first, SOCK_RAW, htons(ETH_P_ALL));
+	bind_packet_socket(packet_sock_2, ud.first);
+	setup_packet_socket(&packet_sock_3, ud.first, SOCK_DGRAM, htons(ETH_P_ALL));
+	bind_packet_socket(packet_sock_3, ud.first);
+	prepare_udp_socket(&udp_sock_1, &ip_src, DST_PORT);
+
+	ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0,
+			   (struct sockaddr *)&ll_dst,
+			   sizeof(struct sockaddr_ll));
+	zassert_not_equal(ret, -1, "Failed to send (%d)", errno);
+	zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len);
+
+	/* All 3 sockets should get their packets */
+	ret = zsock_recv(packet_sock_2, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive RAW packet (%d)", errno);
+	zassert_equal(ret, pkt_len, "Invalid data size received (%d, expected %d)",
+		      ret, pkt_len);
+	zassert_mem_equal(rx_buf, tx_buf, pkt_len, "Invalid payload received");
+
+	offset += sizeof(struct net_eth_hdr);
+	pkt_len -= sizeof(struct net_eth_hdr);
+
+	ret = zsock_recv(packet_sock_3, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive DGRAM packet (%d)", errno);
+	zassert_equal(ret, pkt_len, "Invalid data size received (%d, expected %d)",
+		      ret, pkt_len);
+	zassert_mem_equal(rx_buf, tx_buf + offset, pkt_len, "Invalid payload received");
+
+	offset += NET_IPV4UDPH_LEN;
+	pkt_len -= NET_IPV4UDPH_LEN;
+
+	ret = zsock_recv(udp_sock_1, rx_buf, sizeof(rx_buf), 0);
+	zassert_not_equal(ret, -1, "Failed to receive UDP packet (%d)", errno);
+	zassert_equal(ret, pkt_len,
+		      "Invalid data size received (%d, expected %d)",
+		      ret, pkt_len);
+	zassert_mem_equal(rx_buf, tx_buf + offset, pkt_len, "Invalid payload received");
+}
+
+static void test_sockets_close(void)
+{
+	if (packet_sock_1 >= 0) {
+		(void)zsock_close(packet_sock_1);
+		packet_sock_1 = -1;
+	}
+
+	if (packet_sock_2 >= 0) {
+		(void)zsock_close(packet_sock_2);
+		packet_sock_2 = -1;
+	}
+
+	if (packet_sock_3 >= 0) {
+		(void)zsock_close(packet_sock_3);
+		packet_sock_3 = -1;
+	}
+
+	if (udp_sock_1 >= 0) {
+		(void)zsock_close(udp_sock_1);
+		udp_sock_1 = -1;
+	}
+
+	if (udp_sock_2 >= 0) {
+		(void)zsock_close(udp_sock_2);
+		udp_sock_2 = -1;
+	}
+}
+
+static void test_after(void *arg)
+{
+	ARG_UNUSED(arg);
+
+	memset(&rx_buf, 0, sizeof(rx_buf));
+	memset(&tx_buf, 0, sizeof(tx_buf));
+
+	test_sockets_close();
+}
+
+static void *test_setup(void)
+{
+	net_if_foreach(iface_cb, &ud);
+
+	zassert_not_null(ud.first, "1st Ethernet interface not found");
+	zassert_not_null(ud.second, "2nd Ethernet interface not found");
 
-	zsock_close(sock1);
-	zsock_close(sock2);
-	zsock_close(sock3);
+	return NULL;
 }
 
-ZTEST_SUITE(socket_packet, NULL, NULL, NULL, NULL, NULL);
+ZTEST_SUITE(socket_packet, NULL, test_setup, NULL, test_after, NULL);
diff --git a/tests/net/socket/af_packet/testcase.yaml b/tests/net/socket/af_packet/testcase.yaml
index 963047cf32263..04efce5160f4e 100644
--- a/tests/net/socket/af_packet/testcase.yaml
+++ b/tests/net/socket/af_packet/testcase.yaml
@@ -4,11 +4,6 @@ common:
     - net
     - socket
     - af_packet
-  # The test do not work in native_posix as the zeth interface creation
-  # needs root permission.
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.socket.af_packet:
     min_ram: 21
diff --git a/tests/net/socket/af_packet_ipproto_raw/CMakeLists.txt b/tests/net/socket/af_packet_ipproto_raw/CMakeLists.txt
deleted file mode 100644
index 6eefd55dd7585..0000000000000
--- a/tests/net/socket/af_packet_ipproto_raw/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(socket_packet_ipproto_raw)
-
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/net/ip)
-FILE(GLOB app_sources src/*.c)
-target_sources(app PRIVATE ${app_sources})
diff --git a/tests/net/socket/af_packet_ipproto_raw/prj.conf b/tests/net/socket/af_packet_ipproto_raw/prj.conf
deleted file mode 100644
index 227851d398f2e..0000000000000
--- a/tests/net/socket/af_packet_ipproto_raw/prj.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Networking config
-CONFIG_NETWORKING=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=n
-CONFIG_NET_UDP=n
-CONFIG_NET_TCP=n
-CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_PACKET=y
-CONFIG_ZVFS_OPEN_MAX=8
-CONFIG_NET_SOCKETS_LOG_LEVEL_DBG=y
-CONFIG_NET_CORE_LOG_LEVEL_DBG=y
-
-# Network driver config
-CONFIG_NET_L2_ETHERNET=y
-CONFIG_TEST_RANDOM_GENERATOR=y
-
-CONFIG_NET_L2_DUMMY=y
-CONFIG_NET_IF_MAX_IPV4_COUNT=4
-
-CONFIG_ZTEST=y
-CONFIG_NET_TEST=y
-CONFIG_NET_LOG=y
-CONFIG_TEST_USERSPACE=y
-CONFIG_NET_MAX_CONTEXTS=8
-CONFIG_NET_MAX_CONN=8
diff --git a/tests/net/socket/af_packet_ipproto_raw/src/main.c b/tests/net/socket/af_packet_ipproto_raw/src/main.c
deleted file mode 100644
index 4eb28edb70ffc..0000000000000
--- a/tests/net/socket/af_packet_ipproto_raw/src/main.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2021 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
-
-#include <zephyr/kernel.h>
-#include <zephyr/linker/sections.h>
-#include <zephyr/ztest.h>
-#include <zephyr/random/random.h>
-
-#include <zephyr/posix/fcntl.h>
-
-#include <zephyr/net/ethernet.h>
-#include <zephyr/net/dummy.h>
-#include <zephyr/net/net_if.h>
-#include <zephyr/net/socket.h>
-
-struct fake_dev_context {
-	uint8_t mac_addr[sizeof(struct net_eth_addr)];
-	struct net_if *iface;
-};
-
-static const char testing_data[] = "Tappara";
-
-static int fake_dev_send(const struct device *dev, struct net_pkt *pkt)
-{
-	struct net_pkt *recv_pkt;
-	int ret;
-
-	ARG_UNUSED(dev);
-	ARG_UNUSED(pkt);
-
-	/* Loopback the data back to stack: */
-	NET_DBG("Dummy device: Loopbacking data (%zd bytes) to iface %d\n", net_pkt_get_len(pkt),
-	    net_if_get_by_iface(net_pkt_iface(pkt)));
-
-	recv_pkt = net_pkt_clone(pkt, K_NO_WAIT);
-
-	k_sleep(K_MSEC(10)); /* Let the receiver run */
-
-	ret = net_recv_data(net_pkt_iface(recv_pkt), recv_pkt);
-	zassert_equal(ret, 0, "Cannot receive data (%d)", ret);
-	return 0;
-}
-
-static uint8_t *fake_dev_get_mac(struct fake_dev_context *ctx)
-{
-	if (ctx->mac_addr[2] == 0x00) {
-		/* 00-00-5E-00-53-xx Documentation RFC 7042 */
-		ctx->mac_addr[0] = 0x00;
-		ctx->mac_addr[1] = 0x00;
-		ctx->mac_addr[2] = 0x5E;
-		ctx->mac_addr[3] = 0x00;
-		ctx->mac_addr[4] = 0x53;
-		ctx->mac_addr[5] = sys_rand8_get();
-	}
-
-	return ctx->mac_addr;
-}
-
-static void fake_dev_iface_init(struct net_if *iface)
-{
-	const struct device *dev = net_if_get_device(iface);
-	struct fake_dev_context *ctx = dev->data;
-	uint8_t *mac = fake_dev_get_mac(ctx);
-
-	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
-
-	ctx->iface = iface;
-}
-
-int fake_dev_init(const struct device *dev)
-{
-	ARG_UNUSED(dev);
-
-	return 0;
-}
-
-struct fake_dev_context fake_dev_context_data;
-
-static struct dummy_api fake_dev_if_api = {
-	.iface_api.init = fake_dev_iface_init,
-	.send = fake_dev_send,
-};
-
-#define _ETH_L2_LAYER DUMMY_L2
-#define _ETH_L2_CTX_TYPE NET_L2_GET_CTX_TYPE(DUMMY_L2)
-
-NET_DEVICE_INIT(fake_dev, "fake_dev", fake_dev_init, NULL, &fake_dev_context_data, NULL,
-		CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &fake_dev_if_api, _ETH_L2_LAYER,
-		_ETH_L2_CTX_TYPE, 127);
-
-static void *test_setup(void)
-{
-	struct net_if *iface;
-	struct in_addr in4addr_my = { { { 192, 168, 0, 2 } } };
-	struct net_if_addr *ifaddr;
-
-	iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY));
-	zassert_not_null(iface, "Could not get dummy iface");
-
-	net_if_up(iface);
-
-	ifaddr = net_if_ipv4_addr_add(iface, &in4addr_my, NET_ADDR_MANUAL, 0);
-	zassert_not_null(ifaddr, "Could not add iface address");
-
-	return NULL;
-}
-
-ZTEST(net_sckt_packet_raw_ip, test_sckt_raw_packet_raw_ip)
-{
-	/* A test case for testing socket combo: AF_PACKET & SOCK_RAW & IPPROTO_RAW: */
-	struct net_if *iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY));
-	int recv_data_len, ret;
-	struct sockaddr_ll dst = { 0 };
-	char receive_buffer[128];
-	int sock;
-
-	sock = zsock_socket(AF_PACKET, SOCK_RAW, htons(IPPROTO_RAW));
-	zassert_true(sock >= 0, "Could not create a socket");
-
-	dst.sll_ifindex = net_if_get_by_iface(iface);
-	dst.sll_family = AF_PACKET;
-
-	ret = zsock_bind(sock, (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
-	zassert_true(ret >= 0, "Could not bind the socket");
-
-	/* Let's send some data: */
-	ret = zsock_sendto(sock, testing_data, ARRAY_SIZE(testing_data), 0,
-			   (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll));
-	zassert_true(ret > 0, "Could not send data");
-
-	/* Receive the same data back: */
-	recv_data_len = zsock_recv(sock, receive_buffer, sizeof(receive_buffer), 0);
-	zassert_true(recv_data_len == ARRAY_SIZE(testing_data), "Expected data not received");
-
-	NET_DBG("Received successfully data %s", receive_buffer);
-
-	zsock_close(sock);
-}
-
-ZTEST_SUITE(net_sckt_packet_raw_ip, NULL, test_setup, NULL, NULL, NULL);
diff --git a/tests/net/socket/af_packet_ipproto_raw/testcase.yaml b/tests/net/socket/af_packet_ipproto_raw/testcase.yaml
deleted file mode 100644
index 503f52deadcc9..0000000000000
--- a/tests/net/socket/af_packet_ipproto_raw/testcase.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-common:
-  depends_on: netif
-  tags:
-    - net
-    - socket
-    - af_packet
-  # The test do not work in native_posix as the zeth interface creation
-  # needs root permission.
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
-tests:
-  net.socket.af_packet.ipproto_raw:
-    min_ram: 21
diff --git a/tests/net/socket/getaddrinfo/testcase.yaml b/tests/net/socket/getaddrinfo/testcase.yaml
index 14822401179c2..3d7bb63370356 100644
--- a/tests/net/socket/getaddrinfo/testcase.yaml
+++ b/tests/net/socket/getaddrinfo/testcase.yaml
@@ -6,9 +6,6 @@ common:
     - socket
     - getaddrinfo
     - userspace
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.socket.get_addr_info:
     min_ram: 21
diff --git a/tests/net/socket/getnameinfo/testcase.yaml b/tests/net/socket/getnameinfo/testcase.yaml
index 2e60ca44fe006..9edc6b2502e96 100644
--- a/tests/net/socket/getnameinfo/testcase.yaml
+++ b/tests/net/socket/getnameinfo/testcase.yaml
@@ -1,9 +1,6 @@
 common:
   depends_on: netif
   filter: CONFIG_FULL_LIBC_SUPPORTED
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
 tests:
   net.socket.get_name_info:
     min_ram: 21
diff --git a/tests/net/socket/poll/testcase.yaml b/tests/net/socket/poll/testcase.yaml
index 9d08909605e97..e86c5bcca51a3 100644
--- a/tests/net/socket/poll/testcase.yaml
+++ b/tests/net/socket/poll/testcase.yaml
@@ -1,12 +1,5 @@
 common:
   depends_on: netif
-  # FIXME: This test fails very frequently on mps2/an385 due to the system
-  #        timer stability issues, so keep it disabled until the root cause
-  #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude:
-    - mps2/an385
-    - native_posix/native/64
-    - native_posix
 tests:
   net.socket.poll:
     min_ram: 21
diff --git a/tests/net/socket/reuseaddr_reuseport/testcase.yaml b/tests/net/socket/reuseaddr_reuseport/testcase.yaml
index fcfce0b1e490d..60219826fc126 100644
--- a/tests/net/socket/reuseaddr_reuseport/testcase.yaml
+++ b/tests/net/socket/reuseaddr_reuseport/testcase.yaml
@@ -5,10 +5,6 @@ common:
   tags:
     - net
     - socket
-  # FIXME: This test fails very frequently on mps2/an385 due to the system
-  #        timer stability issues, so keep it disabled until the root cause
-  #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude: mps2/an385
 tests:
   net.socket.reuseaddr_reuseport:
     extra_configs:
diff --git a/tests/net/socket/select/testcase.yaml b/tests/net/socket/select/testcase.yaml
index 320cfbaa3eccf..716c578b40a81 100644
--- a/tests/net/socket/select/testcase.yaml
+++ b/tests/net/socket/select/testcase.yaml
@@ -6,10 +6,6 @@ common:
     - socket
     - userspace
   filter: CONFIG_FULL_LIBC_SUPPORTED
-  # FIXME: This test fails very frequently on mps2/an385 due to the system
-  #        timer stability issues, so keep it disabled until the root cause
-  #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude: mps2/an385
 tests:
   net.socket.select:
     extra_configs:
diff --git a/tests/net/socket/service/testcase.yaml b/tests/net/socket/service/testcase.yaml
index 0db82aea218d2..15d5706b68b67 100644
--- a/tests/net/socket/service/testcase.yaml
+++ b/tests/net/socket/service/testcase.yaml
@@ -1,13 +1,5 @@
 common:
   depends_on: netif
-  # FIXME: This test fails very frequently on mps2/an385 due to the system
-  #        timer stability issues, so keep it disabled until the root cause
-  #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  # eventfd API does not work with native_posix so exclude it here
-  platform_exclude:
-    - mps2/an385
-    - native_posix
-    - native_posix/native/64
 tests:
   net.socket.service:
     min_ram: 21
diff --git a/tests/net/socket/socketpair/testcase.yaml b/tests/net/socket/socketpair/testcase.yaml
index 133f2801b9594..c7525a82f368f 100644
--- a/tests/net/socket/socketpair/testcase.yaml
+++ b/tests/net/socket/socketpair/testcase.yaml
@@ -6,8 +6,6 @@ common:
   depends_on: netif
   min_ram: 21
   platform_exclude:
-    - native_posix/native/64
-    - native_posix
     # See #61246 for info about these next two excludes
     - vmu_rt1170/mimxrt1176/cm7
     - mimxrt1160_evk/mimxrt1166/cm7
diff --git a/tests/net/socket/tcp/testcase.yaml b/tests/net/socket/tcp/testcase.yaml
index aa7fc4cbee544..be0cd94ba784f 100644
--- a/tests/net/socket/tcp/testcase.yaml
+++ b/tests/net/socket/tcp/testcase.yaml
@@ -8,12 +8,6 @@ common:
     - userspace
   filter: CONFIG_FULL_LIBC_SUPPORTED
   timeout: 180
-  # FIXME: This test fails very frequently on mps2/an385 due to the system
-  #        timer stability issues, so keep it disabled until the root cause
-  #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude:
-    - mps2/an385
-    - mps2/an383
 tests:
   net.socket.tcp:
     extra_configs:
diff --git a/tests/net/socket/tls/src/main.c b/tests/net/socket/tls/src/main.c
index f532060f8f555..d9a11037eea4e 100644
--- a/tests/net/socket/tls/src/main.c
+++ b/tests/net/socket/tls/src/main.c
@@ -916,7 +916,7 @@ ZTEST(net_socket_tls, test_connect_closed_port)
 	zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr,
 				    sizeof(s_saddr)),
 		      -1, "connect succeed");
-	zassert_equal(errno, ETIMEDOUT,
+	zassert_equal(errno, ECONNREFUSED,
 		      "connect should fail, got %d", errno);
 
 	test_sockets_close();
diff --git a/tests/net/socket/tls_configurations/prj.conf b/tests/net/socket/tls_configurations/prj.conf
index 23842f6a64149..29c317ca3e7ca 100644
--- a/tests/net/socket/tls_configurations/prj.conf
+++ b/tests/net/socket/tls_configurations/prj.conf
@@ -11,7 +11,7 @@ CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 
 # Disable native ethernet driver (using native sockets instead)
-CONFIG_ETH_NATIVE_POSIX=n
+CONFIG_ETH_NATIVE_TAP=n
 
 # Use native sockets
 CONFIG_NET_SOCKETS=y
diff --git a/tests/net/socket/tls_ext/src/main.c b/tests/net/socket/tls_ext/src/main.c
index b122d05d38ea1..cc55c2b368455 100644
--- a/tests/net/socket/tls_ext/src/main.c
+++ b/tests/net/socket/tls_ext/src/main.c
@@ -449,7 +449,7 @@ static void *setup(void)
 		zassert_equal(r, 0, "failed to add CA Certificate (%d)", r);
 
 		r = tls_credential_add(SERVER_CERTIFICATE_TAG,
-				       TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				       TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				       server, sizeof(server));
 		zassert_equal(r, 0, "failed to add Server Certificate (%d)", r);
 
@@ -459,7 +459,7 @@ static void *setup(void)
 		zassert_equal(r, 0, "failed to add Server Private Key (%d)", r);
 
 		r = tls_credential_add(CLIENT_CERTIFICATE_TAG,
-				       TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				       TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				       client, sizeof(client));
 		zassert_equal(r, 0, "failed to add Client Certificate (%d)", r);
 
diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c
index 6328854cd3dc1..91e57747c52d8 100644
--- a/tests/net/socket/udp/src/main.c
+++ b/tests/net/socket/udp/src/main.c
@@ -950,11 +950,9 @@ static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0,
 static struct in6_addr my_mcast_addr1 = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0,
 					0, 0, 0, 0, 0, 0, 0, 0x1 } } };
 static struct in_addr my_mcast_addr2 = { { { 224, 0, 0, 2 } } };
-static uint8_t server_lladdr[] = { 0x01, 0x02, 0x03, 0xff, 0xfe,
-				0x04, 0x05, 0x06 };
 static struct net_linkaddr server_link_addr = {
-	.addr = server_lladdr,
-	.len = sizeof(server_lladdr),
+	.addr = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 },
+	.len = NET_ETH_ADDR_LEN,
 };
 #define MY_IPV6_ADDR_ETH   "2001:db8:100::1"
 #define PEER_IPV6_ADDR_ETH "2001:db8:100::2"
diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c
index 3ef933e8e23f2..7cb75e0ccec61 100644
--- a/tests/net/traffic_class/src/main.c
+++ b/tests/net/traffic_class/src/main.c
@@ -345,19 +345,17 @@ static void priority_setup(void)
 #if defined(CONFIG_NET_IPV6_NBR_CACHE)
 static bool add_neighbor(struct net_if *iface, struct in6_addr *addr)
 {
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 	struct net_nbr *nbr;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x06;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x06;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	nbr = net_ipv6_nbr_add(iface, addr, &lladdr, false,
diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c
index 05e670ec4ced7..91a6556b41ecc 100644
--- a/tests/net/tx_timestamp/src/main.c
+++ b/tests/net/tx_timestamp/src/main.c
@@ -399,19 +399,17 @@ void test_address_setup(void)
 
 static bool add_neighbor(struct net_if *iface, struct in6_addr *addr)
 {
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 	struct net_nbr *nbr;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x06;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x06;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	nbr = net_ipv6_nbr_add(iface, addr, &lladdr, false,
diff --git a/tests/net/utils/prj.conf b/tests/net/utils/prj.conf
index f63c6c8f05d5b..429ecc79499fe 100644
--- a/tests/net/utils/prj.conf
+++ b/tests/net/utils/prj.conf
@@ -17,3 +17,5 @@ CONFIG_NET_UDP=y
 CONFIG_ZTEST=y
 CONFIG_MAIN_STACK_SIZE=1280
 CONFIG_TEST_USERSPACE=y
+CONFIG_NET_LOOPBACK=y
+CONFIG_NET_DRIVERS=y
diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c
index 15a51e8ca73ca..a5db67bd0b4c7 100644
--- a/tests/net/utils/src/main.c
+++ b/tests/net/utils/src/main.c
@@ -863,6 +863,435 @@ ZTEST(test_utils_fn, test_addr_parse)
 #endif
 }
 
+#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_IPV6)
+static const char *check_ipaddr(const char *addresses)
+{
+	do {
+		char addr_str[NET_IPV6_ADDR_LEN + 4 + 1];
+		char expecting[NET_IPV6_ADDR_LEN + 4 + 1];
+		const char *orig = addresses;
+		struct sockaddr_storage addr;
+		struct sockaddr_storage mask;
+		uint8_t mask_len;
+		int ret;
+
+		memset(&addr, 0, sizeof(addr));
+		mask_len = 0;
+
+		memset(addr_str, 0, sizeof(addr_str));
+		memset(expecting, 0, sizeof(expecting));
+
+		addresses = net_ipaddr_parse_mask(addresses, strlen(addresses),
+						  (struct sockaddr *)&addr, &mask_len);
+		zassert_not_null(addresses, "Invalid parse, expecting \"%s\"", orig);
+
+		strncpy(expecting, orig,
+			*addresses == '\0' ? strlen(orig) : addresses - orig - 1);
+
+		(void)net_addr_ntop(addr.ss_family,
+				    &net_sin((struct sockaddr *)&addr)->sin_addr,
+				    addr_str, sizeof(addr_str));
+
+		ret = net_mask_len_to_netmask(addr.ss_family, mask_len,
+					      (struct sockaddr *)&mask);
+		zassert_equal(ret, 0, "Failed to convert mask %d", mask_len);
+
+		ret = net_netmask_to_mask_len(addr.ss_family,
+					      (struct sockaddr *)&mask,
+					      &mask_len);
+		zassert_equal(ret, 0, "Failed to convert mask %s",
+			      net_sprint_addr(addr.ss_family,
+					      (const void *)&net_sin(
+						      ((struct sockaddr *)&mask))->sin_addr));
+
+		if (net_sin((struct sockaddr *)&mask)->sin_addr.s_addr != 0) {
+			int addr_len = strlen(addr_str);
+
+			snprintk(addr_str + addr_len,
+				 sizeof(addr_str) - addr_len,
+				 "/%d", mask_len);
+		}
+
+		zassert_mem_equal(addr_str, expecting,
+				  *addresses == '\0' ? strlen(orig) : addresses - orig - 1,
+				  "Address mismatch, expecing %s, got %s (len %d)\n",
+				  expecting, addr_str, addresses - orig - 1);
+	} while (addresses != NULL && *addresses != '\0');
+
+	return addresses;
+}
+#endif /* CONFIG_NET_IPV4 && CONFIG_NET_IPV6 */
+
+ZTEST(test_utils_fn, test_addr_parse_mask)
+{
+	struct sockaddr addr;
+	uint8_t mask_len;
+	const char *next;
+	int i;
+#if defined(CONFIG_NET_IPV4)
+	static const struct {
+		const char *address;
+		int len;
+		struct sockaddr_in result;
+		uint8_t mask_len;
+		const char *verdict;
+	} parse_ipv4_entries[] = {
+		{
+			.address = "192.0.2.1:80",
+			.len = sizeof("192.0.2.1:80") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "192.0.2.2",
+			.len = sizeof("192.0.2.2") - 1,
+			.result = {
+				.sin_family = AF_INET,
+				.sin_addr = {
+					.s4_addr[0] = 192,
+					.s4_addr[1] = 0,
+					.s4_addr[2] = 2,
+					.s4_addr[3] = 2
+				}
+			},
+			.verdict = "",
+		},
+		{
+			.address = "192.0.2.3/foobar",
+			.len = sizeof("192.0.2.3/foobar") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "127.0.0.42,1.2.3.4",
+			.len = sizeof("127.0.0.42,1.2.3.4") - 1,
+			.result = {
+				.sin_family = AF_INET,
+				.sin_addr = {
+					.s4_addr[0] = 127,
+					.s4_addr[1] = 0,
+					.s4_addr[2] = 0,
+					.s4_addr[3] = 42
+				}
+			},
+			.mask_len = 32,
+			.verdict = &"127.0.0.42,1.2.3.4"[11],
+		},
+		{
+			.address = "127.0.0.42/8,1.2.3.4",
+			.len = sizeof("127.0.0.42/8,1.2.3.4") - 1,
+			.result = {
+				.sin_family = AF_INET,
+				.sin_addr = {
+					.s4_addr[0] = 127,
+					.s4_addr[1] = 0,
+					.s4_addr[2] = 0,
+					.s4_addr[3] = 42
+				}
+			},
+			.mask_len = 8,
+			.verdict = &"127.0.0.42/8,1.2.3.4"[13],
+		},
+		{
+			.address = "192.0.2.3:80/foobar",
+			.len = sizeof("192.0.2.3:80/foobar") - 1,
+			.verdict = false
+		},
+		{
+			.address = "192.168.1.1:65536/foobar",
+			.len = sizeof("192.168.1.1:65536") - 1,
+			.verdict = false
+		},
+		{
+			.address = "192.0.2.3:80/foobar",
+			.len = sizeof("192.0.2.3") - 1,
+			.result = {
+				.sin_family = AF_INET,
+				.sin_port = 0,
+				.sin_addr = {
+					.s4_addr[0] = 192,
+					.s4_addr[1] = 0,
+					.s4_addr[2] = 2,
+					.s4_addr[3] = 3
+				}
+			},
+			.verdict = "",
+		},
+		{
+			.address = "192.0.2.3:80/foobar",
+			.len = sizeof("192.0.2.3:80") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "a.b.c.d",
+			.verdict = false
+		},
+	};
+#endif
+#if defined(CONFIG_NET_IPV6)
+	static const struct {
+		const char *address;
+		int len;
+		struct sockaddr_in6 result;
+		uint8_t mask_len;
+		const char *verdict;
+	} parse_ipv6_entries[] = {
+		{
+			.address = "2001:db8::2",
+			.len = sizeof("2001:db8::2") - 1,
+			.result = {
+				.sin6_family = AF_INET6,
+				.sin6_addr = {
+					.s6_addr16[0] = ntohs(0x2001),
+					.s6_addr16[1] = ntohs(0xdb8),
+					.s6_addr16[3] = 0,
+					.s6_addr16[4] = 0,
+					.s6_addr16[5] = 0,
+					.s6_addr16[6] = 0,
+					.s6_addr16[7] = ntohs(2)
+				}
+			},
+			.verdict = "",
+		},
+		{
+			.address = "2001:db8::a/barfoo",
+			.len = sizeof("2001:db8::a/barfoo") - 8,
+			.result = {
+				.sin6_family = AF_INET6,
+				.sin6_port = 0,
+				.sin6_addr = {
+					.s6_addr16[0] = ntohs(0x2001),
+					.s6_addr16[1] = ntohs(0xdb8),
+					.s6_addr16[3] = 0,
+					.s6_addr16[4] = 0,
+					.s6_addr16[5] = 0,
+					.s6_addr16[6] = 0,
+					.s6_addr16[7] = ntohs(0xa)
+				}
+			},
+			.verdict = "",
+		},
+		{
+			.address = "2001:db8::a",
+			.len = sizeof("2001:db8::a") - 1,
+			.result = {
+				.sin6_family = AF_INET6,
+				.sin6_port = 0,
+				.sin6_addr = {
+					.s6_addr16[0] = ntohs(0x2001),
+					.s6_addr16[1] = ntohs(0xdb8),
+					.s6_addr16[3] = 0,
+					.s6_addr16[4] = 0,
+					.s6_addr16[5] = 0,
+					.s6_addr16[6] = 0,
+					.s6_addr16[7] = ntohs(0xa)
+				}
+			},
+			.verdict = "",
+		},
+		{
+			.address = "[2001:db8:3:4:5:6:7:8]:65535",
+			.len = sizeof("[2001:db8:3:4:5:6:7:8]:65535") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[::]:0",
+			.len = sizeof("[::]:0") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "2001:db8::42",
+			.len = sizeof("2001:db8::42") - 1,
+			.result = {
+				.sin6_family = AF_INET6,
+				.sin6_port = 0,
+				.sin6_addr = {
+					.s6_addr16[0] = ntohs(0x2001),
+					.s6_addr16[1] = ntohs(0xdb8),
+					.s6_addr16[3] = 0,
+					.s6_addr16[4] = 0,
+					.s6_addr16[5] = 0,
+					.s6_addr16[6] = 0,
+					.s6_addr16[7] = ntohs(0x42)
+				}
+			},
+			.verdict = "",
+		},
+		{
+			.address = "[2001:db8::192.0.2.1]:80000",
+			.len = sizeof("[2001:db8::192.0.2.1]:80000") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::1]:80",
+			.len = sizeof("[2001:db8::1") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::1]:65536",
+			.len = sizeof("[2001:db8::1]:65536") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::1]:80",
+			.len = sizeof("2001:db8::1") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::1]:a",
+			.len = sizeof("[2001:db8::1]:a") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::1]:10-12",
+			.len = sizeof("[2001:db8::1]:10-12") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::]:80/url/continues",
+			.len = sizeof("[2001:db8::]") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::200]:080",
+			.len = sizeof("[2001:db8:433:2]:80000") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::]:8080/another/url",
+			.len = sizeof("[2001:db8::]:8080/another/url") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::1",
+			.len = sizeof("[2001:db8::1") - 1,
+			.verdict = NULL,
+		},
+		{
+			.address = "[2001:db8::1]:-1",
+			.len = sizeof("[2001:db8::1]:-1") - 1,
+			.verdict = NULL,
+		},
+		{
+			/* Valid although user probably did not mean this */
+			.address = "2001:db8::1:80",
+			.len = sizeof("2001:db8::1:80") - 1,
+			.result = {
+				.sin6_family = AF_INET6,
+				.sin6_addr = {
+					.s6_addr16[0] = ntohs(0x2001),
+					.s6_addr16[1] = ntohs(0xdb8),
+					.s6_addr16[3] = 0,
+					.s6_addr16[4] = 0,
+					.s6_addr16[5] = 0,
+					.s6_addr16[6] = ntohs(0x01),
+					.s6_addr16[7] = ntohs(0x80)
+				}
+			},
+			.verdict = "",
+		},
+		{
+			.address = "2001:db8::1/64,2001:db8::2",
+			.len = sizeof("2001:db8::1/64,2001:db8::2") - 1,
+			.result = {
+				.sin6_family = AF_INET6,
+				.sin6_addr = {
+					.s6_addr16[0] = ntohs(0x2001),
+					.s6_addr16[1] = ntohs(0xdb8),
+					.s6_addr16[2] = 0,
+					.s6_addr16[3] = 0,
+					.s6_addr16[4] = 0,
+					.s6_addr16[5] = 0,
+					.s6_addr16[6] = 0,
+					.s6_addr16[7] = ntohs(0x01)
+				}
+			},
+			.mask_len = 64,
+			.verdict = &"2001:db8::1/64,2001:db8::2"[14],
+		},
+	};
+#endif
+
+#if defined(CONFIG_NET_IPV4)
+	for (i = 0; i < ARRAY_SIZE(parse_ipv4_entries) - 1; i++) {
+		(void)memset(&addr, 0, sizeof(addr));
+		mask_len = 0;
+
+		next = net_ipaddr_parse_mask(
+			parse_ipv4_entries[i].address,
+			parse_ipv4_entries[i].len,
+			&addr, &mask_len);
+		if (next != parse_ipv4_entries[i].verdict) {
+			printk("IPv4 entry [%d] \"%s\" failed\n", i,
+				parse_ipv4_entries[i].address);
+			printk("Points to \"%s\" but should point to \"%s\"\n",
+			       next == NULL ? "NULL" : next,
+			       parse_ipv4_entries[i].verdict == NULL ?
+			       "NULL" : parse_ipv4_entries[i].verdict);
+			zassert_true(false, "failure");
+		}
+
+		if (next != NULL && *next == '\0') {
+			zassert_true(
+				net_ipv4_addr_cmp(
+				      &net_sin(&addr)->sin_addr,
+				      &parse_ipv4_entries[i].result.sin_addr),
+				parse_ipv4_entries[i].address);
+			zassert_true(net_sin(&addr)->sin_port == 0,
+				     "IPv4 port");
+			zassert_true(net_sin(&addr)->sin_family ==
+				     parse_ipv4_entries[i].result.sin_family,
+				     "IPv4 family");
+		}
+	}
+#endif
+#if defined(CONFIG_NET_IPV6)
+	for (i = 0; i < ARRAY_SIZE(parse_ipv6_entries) - 1; i++) {
+		(void)memset(&addr, 0, sizeof(addr));
+		mask_len = 0;
+
+		next = net_ipaddr_parse_mask(
+			parse_ipv6_entries[i].address,
+			parse_ipv6_entries[i].len,
+			&addr, &mask_len);
+		if (next != parse_ipv6_entries[i].verdict) {
+			printk("IPv6 entry [%d] \"%s\" failed\n", i,
+			       parse_ipv6_entries[i].address);
+			zassert_true(false, "failure");
+		}
+
+		if (next != NULL && *next == '\0') {
+			zassert_true(
+				net_ipv6_addr_cmp(
+				      &net_sin6(&addr)->sin6_addr,
+				      &parse_ipv6_entries[i].result.sin6_addr),
+				parse_ipv6_entries[i].address);
+			zassert_true(net_sin6(&addr)->sin6_port == 0,
+				     "IPv6 port");
+			zassert_true(net_sin6(&addr)->sin6_family ==
+				     parse_ipv6_entries[i].result.sin6_family,
+				     "IPv6 family");
+		}
+	}
+#endif
+
+#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_IPV6)
+	static const char * const addresses[] = {
+		"2001:db8::1/64,192.0.2.1,2001:db8::2,192.0.2.2/24",
+		"2001:db8::1/64 192.0.2.1 2001:db8::2 192.0.2.2/24",
+		"2001:db8::1/64 192.0.2.1,2001:db8::2 192.0.2.2/24",
+		NULL
+	};
+
+	i = 0;
+
+	while (addresses[i] != NULL) {
+		next = check_ipaddr(addresses[i]);
+		zassert_true(next != NULL && *next == '\0',
+			     "Invalid parse, expecting \"\", got %p\n", next);
+		i++;
+	}
+#endif /* CONFIG_NET_IPV4 && CONFIG_NET_IPV6 */
+}
+
 static uint16_t calc_chksum_ref(uint16_t sum, const uint8_t *data, size_t len)
 {
 	const uint8_t *end;
@@ -938,4 +1367,107 @@ ZTEST(test_utils_fn, test_ip_checksum)
 	}
 }
 
+/* Verify that the net_pkt pointer to the received link layer address
+ * is correct.
+ */
+ZTEST(test_utils_fn, test_linkaddr_handling)
+{
+	/* A simple Ethernet frame with IPv4 and UDP headers */
+	static const uint8_t udp[] = {
+		0x18, 0xfd, 0x74, 0x09, 0xcb, 0x62, 0xac, 0x91,  /* 0000 */
+		0xa1, 0x8f, 0x9d, 0xf8, 0x08, 0x00, 0x45, 0x00,  /* 0008 */
+		0x00, 0x4c, 0x48, 0x8e, 0x00, 0x00, 0x40, 0x11,  /* 0010 */
+		0x57, 0x34, 0xc0, 0xa8, 0x58, 0x29, 0xc1, 0xe5,  /* 0018 */
+		0x00, 0x28, 0xba, 0xf0, 0x00, 0x35, 0x00, 0x38,  /* 0020 */
+		0xdb, 0x28,
+	};
+
+	/* Create net_pkt from the above data, then check the link layer
+	 * addresses are properly set even if we pull the data like how
+	 * the network stack would do in ethernet.c
+	 */
+	const uint8_t *dst = &udp[0];
+	const uint8_t *src = &udp[NET_ETH_ADDR_LEN];
+	uint8_t hdr_len = sizeof(struct net_eth_hdr);
+	struct net_linkaddr *lladdr;
+	struct net_eth_hdr *hdr;
+	struct net_pkt *pkt, *pkt2;
+	int ret;
+
+	pkt = net_pkt_rx_alloc_with_buffer(net_if_get_default(),
+					   sizeof(udp), AF_UNSPEC,
+					   0, K_NO_WAIT);
+	zassert_not_null(pkt, "Cannot allocate pkt");
+
+	ret = net_pkt_write(pkt, udp, sizeof(udp));
+	zassert_equal(ret, 0, "Cannot write data to pkt");
+
+	hdr = NET_ETH_HDR(pkt);
+
+	/* Set the pointers to ll src and dst addresses */
+	lladdr = net_pkt_lladdr_src(pkt);
+	memcpy(lladdr->addr, hdr->src.addr, sizeof(struct net_eth_addr));
+	lladdr->len = sizeof(struct net_eth_addr);
+	lladdr->type = NET_LINK_ETHERNET;
+
+	lladdr = net_pkt_lladdr_dst(pkt);
+	memcpy(lladdr->addr, hdr->dst.addr, sizeof(struct net_eth_addr));
+	lladdr->len = sizeof(struct net_eth_addr);
+	lladdr->type = NET_LINK_ETHERNET;
+
+	zassert_mem_equal(net_pkt_lladdr_src(pkt)->addr,
+			  src, NET_ETH_ADDR_LEN,
+			  "Source address mismatch");
+	zassert_mem_equal(net_pkt_lladdr_dst(pkt)->addr,
+			  dst, NET_ETH_ADDR_LEN,
+			  "Destination address mismatch");
+
+	pkt2 = net_pkt_clone(pkt, K_NO_WAIT);
+	zassert_not_null(pkt2, "Cannot clone pkt");
+
+	/* Make sure we still point to the correct addresses after cloning */
+	zassert_mem_equal(net_pkt_lladdr_src(pkt2)->addr,
+			  src, NET_ETH_ADDR_LEN,
+			  "Source address mismatch");
+	zassert_mem_equal(net_pkt_lladdr_dst(pkt2)->addr,
+			  dst, NET_ETH_ADDR_LEN,
+			  "Destination address mismatch");
+
+	net_pkt_unref(pkt2);
+
+	/* Get rid of the Ethernet header. */
+	net_buf_pull(pkt->frags, hdr_len);
+
+	/* Make sure we still point to the correct addresses after pulling
+	 * the Ethernet header.
+	 */
+	zassert_mem_equal(net_pkt_lladdr_src(pkt)->addr,
+			  src, NET_ETH_ADDR_LEN,
+			  "Source address mismatch");
+	zassert_mem_equal(net_pkt_lladdr_dst(pkt)->addr,
+			  dst, NET_ETH_ADDR_LEN,
+			  "Destination address mismatch");
+
+	/* Clone the packet and check that the link layer addresses are
+	 * still correct.
+	 */
+
+	pkt2 = net_pkt_clone(pkt, K_NO_WAIT);
+	zassert_not_null(pkt2, "Cannot clone pkt");
+
+	zassert_not_equal(net_pkt_lladdr_src(pkt2)->addr,
+			  net_pkt_lladdr_src(pkt)->addr,
+			  "Source address should not be the same");
+
+	zassert_mem_equal(net_pkt_lladdr_src(pkt2)->addr,
+			  src, NET_ETH_ADDR_LEN,
+			  "Source address mismatch");
+	zassert_mem_equal(net_pkt_lladdr_dst(pkt2)->addr,
+			  dst, NET_ETH_ADDR_LEN,
+			  "Destination address mismatch");
+
+	net_pkt_unref(pkt);
+	net_pkt_unref(pkt2);
+}
+
 ZTEST_SUITE(test_utils_fn, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/net/virtual/src/main.c b/tests/net/virtual/src/main.c
index 12dacdaea063c..94d14442a0008 100644
--- a/tests/net/virtual/src/main.c
+++ b/tests/net/virtual/src/main.c
@@ -212,7 +212,7 @@ static uint8_t *net_iface_get_mac(const struct device *dev)
 		data->mac_addr[5] = sys_rand8_get();
 	}
 
-	data->ll_addr.addr = data->mac_addr;
+	memcpy(data->ll_addr.addr, data->mac_addr, sizeof(data->mac_addr));
 	data->ll_addr.len = 6U;
 
 	return data->mac_addr;
@@ -503,19 +503,17 @@ static void test_address_setup(void)
 
 static bool add_neighbor(struct net_if *iface, struct in6_addr *addr)
 {
-	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
 	struct net_nbr *nbr;
 
-	llstorage.addr[0] = 0x01;
-	llstorage.addr[1] = 0x02;
-	llstorage.addr[2] = 0x33;
-	llstorage.addr[3] = 0x44;
-	llstorage.addr[4] = 0x05;
-	llstorage.addr[5] = 0x06;
+	lladdr.addr[0] = 0x01;
+	lladdr.addr[1] = 0x02;
+	lladdr.addr[2] = 0x33;
+	lladdr.addr[3] = 0x44;
+	lladdr.addr[4] = 0x05;
+	lladdr.addr[5] = 0x06;
 
 	lladdr.len = 6U;
-	lladdr.addr = llstorage.addr;
 	lladdr.type = NET_LINK_ETHERNET;
 
 	nbr = net_ipv6_nbr_add(iface, addr, &lladdr, false,
diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c
index eb78ee07a7212..a1b6fd97d6904 100644
--- a/tests/net/vlan/src/main.c
+++ b/tests/net/vlan/src/main.c
@@ -334,7 +334,7 @@ static uint8_t *net_iface_get_mac(const struct device *dev)
 	data->mac_addr[4] = 0x53;
 	data->mac_addr[5] = sys_rand8_get();
 
-	data->ll_addr.addr = data->mac_addr;
+	memcpy(data->ll_addr.addr, data->mac_addr, 6);
 	data->ll_addr.len = 6U;
 
 	return data->mac_addr;
@@ -1079,12 +1079,13 @@ static bool add_peer_neighbor(struct net_if *iface, struct in6_addr *addr,
 			      uint8_t *lladdr)
 {
 	struct net_linkaddr ll_addr = {
-		.addr = lladdr,
 		.len = 6,
 		.type = NET_LINK_ETHERNET
 	};
 	struct net_nbr *nbr;
 
+	memcpy(ll_addr.addr, lladdr, 6);
+
 	nbr = net_ipv6_nbr_add(iface, addr, &ll_addr, false,
 			       NET_IPV6_NBR_STATE_REACHABLE);
 	if (!nbr) {
diff --git a/tests/net/wifi/configs/prj.conf b/tests/net/wifi/configs/prj.conf
index 2a2f4d2cf6b85..b9660aba0d952 100644
--- a/tests/net/wifi/configs/prj.conf
+++ b/tests/net/wifi/configs/prj.conf
@@ -28,6 +28,5 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=0
 CONFIG_WIFI_NM_WPA_SUPPLICANT_WEP=y
 CONFIG_WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y
 CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
 CONFIG_WPA_CLI=y
diff --git a/tests/net/wifi/configs/testcase.yaml b/tests/net/wifi/configs/testcase.yaml
index a4f11c2b04913..17c2d5603f7cb 100644
--- a/tests/net/wifi/configs/testcase.yaml
+++ b/tests/net/wifi/configs/testcase.yaml
@@ -4,6 +4,7 @@ common:
     - drivers
     - wifi
     - net
+    - hostap
   platform_allow:
     - native_sim
 tests:
@@ -39,6 +40,9 @@ tests:
     extra_configs:
       - CONFIG_WIFI_NM_WPA_SUPPLICANT_WPA3=y
       - CONFIG_MBEDTLS_TLS_VERSION_1_2=y
+  wifi.build.ap:
+    extra_configs:
+      - CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y
   wifi.build.wps:
     extra_configs:
       - CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
@@ -56,3 +60,8 @@ tests:
   wifi.build.disable_advanced_feat:
     extra_configs:
       - CONFIG_WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES=y
+  wifi.build.enterprise_runtime:
+    extra_configs:
+      - CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES=y
+    extra_args:
+      - SNIPPET="wifi-enterprise"
diff --git a/tests/posix/barriers/testcase.yaml b/tests/posix/barriers/testcase.yaml
index a00bd02322f0d..1636c2b640c60 100644
--- a/tests/posix/barriers/testcase.yaml
+++ b/tests/posix/barriers/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_cortex_a53
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/posix/c_lib_ext/testcase.yaml b/tests/posix/c_lib_ext/testcase.yaml
index 8c6859289e8cc..639caf5520de7 100644
--- a/tests/posix/c_lib_ext/testcase.yaml
+++ b/tests/posix/c_lib_ext/testcase.yaml
@@ -8,8 +8,8 @@ common:
   platform_key:
     - arch
     - simulation
-  min_flash: 64
-  min_ram: 32
+  integration_platforms:
+    - qemu_cortex_m0
 tests:
   portability.posix.c_lib_ext:
     extra_configs:
diff --git a/tests/posix/common/boards/qemu_x86_tiny.overlay b/tests/posix/common/boards/qemu_x86_tiny.overlay
index f717f3ff7edc7..4e23cf84e32ee 100644
--- a/tests/posix/common/boards/qemu_x86_tiny.overlay
+++ b/tests/posix/common/boards/qemu_x86_tiny.overlay
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
-	dram0: memory@0 {
-		reg = <0x100000 0x80000>;
-	};
+&dram0 {
+	reg = <0x100000 0x80000>;
 };
diff --git a/tests/posix/common/testcase.yaml b/tests/posix/common/testcase.yaml
index 0b3ab9db41981..2d6443139ac7e 100644
--- a/tests/posix/common/testcase.yaml
+++ b/tests/posix/common/testcase.yaml
@@ -7,8 +7,6 @@ common:
     - arch
     - simulation
   platform_exclude:
-    - native_posix
-    - native_posix/native/64
     # consistently overflows flash
     - qemu_nios2
   filter: not CONFIG_NATIVE_LIBC
diff --git a/tests/posix/eventfd/testcase.yaml b/tests/posix/eventfd/testcase.yaml
index b21c02bb907c0..6646036067c4c 100644
--- a/tests/posix/eventfd/testcase.yaml
+++ b/tests/posix/eventfd/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_riscv64
 tests:
   portability.posix.eventfd: {}
   portability.posix.eventfd.minimal:
diff --git a/tests/posix/fs/testcase.yaml b/tests/posix/fs/testcase.yaml
index 359ff70dae17a..f93540655053b 100644
--- a/tests/posix/fs/testcase.yaml
+++ b/tests/posix/fs/testcase.yaml
@@ -2,9 +2,6 @@ common:
   filter: not CONFIG_NATIVE_LIBC
   arch_exclude:
     - nios2
-  platform_exclude:
-    - native_posix
-    - native_posix/native/64
   tags:
     - posix
     - filesystem
@@ -16,6 +13,9 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_x86
+    - qemu_riscv64
 tests:
   portability.posix.fs: {}
   portability.posix.fs.minimal:
diff --git a/tests/posix/headers/testcase.yaml b/tests/posix/headers/testcase.yaml
index 7a15e49ea90cc..746ca007ca22c 100644
--- a/tests/posix/headers/testcase.yaml
+++ b/tests/posix/headers/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_x86_64
 tests:
   portability.posix.headers.with_posix_api:
     extra_configs:
diff --git a/tests/posix/net/testcase.yaml b/tests/posix/net/testcase.yaml
index 24cd19f01f102..2075c84e1020d 100644
--- a/tests/posix/net/testcase.yaml
+++ b/tests/posix/net/testcase.yaml
@@ -5,11 +5,11 @@ common:
     - iface
     - net
     - posix
-  # 1 tier0 platform per supported architecture (dependent on netif support)
+  # dependent on netif support
   integration_platforms:
     - mps2/an385
     - qemu_x86
-  # native_posix and native_sim link to if_*() from the host libc which causes the test to crash
+  # Building with the host libC links to if_*() from the host libc which causes the test to crash
   # immediately.
   filter: not CONFIG_NATIVE_LIBC
 tests:
diff --git a/tests/posix/rwlocks/testcase.yaml b/tests/posix/rwlocks/testcase.yaml
index 84a151e60b5d4..9e31cbc07d07b 100644
--- a/tests/posix/rwlocks/testcase.yaml
+++ b/tests/posix/rwlocks/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_riscv64
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/posix/semaphores/testcase.yaml b/tests/posix/semaphores/testcase.yaml
index 92fdebbd9922e..5201ad902839c 100644
--- a/tests/posix/semaphores/testcase.yaml
+++ b/tests/posix/semaphores/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_x86_64
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/posix/signals/testcase.yaml b/tests/posix/signals/testcase.yaml
index 7d475ee19cf9d..de3d7166e223b 100644
--- a/tests/posix/signals/testcase.yaml
+++ b/tests/posix/signals/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_riscv64
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/posix/single_process/testcase.yaml b/tests/posix/single_process/testcase.yaml
index 70abb822269e6..e4d31eaa3e3c1 100644
--- a/tests/posix/single_process/testcase.yaml
+++ b/tests/posix/single_process/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_riscv64
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/posix/spinlocks/testcase.yaml b/tests/posix/spinlocks/testcase.yaml
index c11e0092efce1..4729a0c7a6e8e 100644
--- a/tests/posix/spinlocks/testcase.yaml
+++ b/tests/posix/spinlocks/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_x86_64
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/posix/timers/prj.conf b/tests/posix/timers/prj.conf
index e6119b6df54f9..8567a0bbf46a1 100644
--- a/tests/posix/timers/prj.conf
+++ b/tests/posix/timers/prj.conf
@@ -3,3 +3,8 @@ CONFIG_ZTEST=y
 
 CONFIG_POSIX_AEP_CHOICE_BASE=y
 CONFIG_POSIX_TIMERS=y
+
+# Needed for timer_create() when using SIGEV_THREAD
+CONFIG_DYNAMIC_THREAD=y
+CONFIG_DYNAMIC_THREAD_POOL_SIZE=1
+CONFIG_THREAD_STACK_INFO=y
diff --git a/tests/posix/timers/src/clock.c b/tests/posix/timers/src/clock.c
index 4b9665fc7973e..0b34e87db06f4 100644
--- a/tests/posix/timers/src/clock.c
+++ b/tests/posix/timers/src/clock.c
@@ -34,16 +34,10 @@ static inline int64_t ts_to_ns(const struct timespec *ts)
 	return ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec;
 }
 
-static inline void tv_to_ts(const struct timeval *tv, struct timespec *ts)
-{
-	ts->tv_sec = tv->tv_sec;
-	ts->tv_nsec = tv->tv_usec * NSEC_PER_USEC;
-}
-
 #define _tp_op(_a, _b, _op) (ts_to_ns(_a) _op ts_to_ns(_b))
 
 #define _decl_op(_type, _name, _op)                                                                \
-	static inline _type _name(const struct timespec *_a, const struct timespec *_b)            \
+	__used static inline _type _name(const struct timespec *_a, const struct timespec *_b)     \
 	{                                                                                          \
 		return _tp_op(_a, _b, _op);                                                        \
 	}
@@ -56,8 +50,8 @@ _decl_op(bool, tp_ge, >=);     /* a >= b */
 _decl_op(int64_t, tp_diff, -); /* a - b */
 
 /* lo <= (a - b) < hi */
-static inline bool tp_diff_in_range_ns(const struct timespec *a, const struct timespec *b,
-				       int64_t lo, int64_t hi)
+__used static inline bool tp_diff_in_range_ns(const struct timespec *a, const struct timespec *b,
+					      int64_t lo, int64_t hi)
 {
 	int64_t diff = tp_diff(a, b);
 
diff --git a/tests/posix/timers/src/timer.c b/tests/posix/timers/src/timer.c
index faad7f659fcb2..1d4936d6a4be6 100644
--- a/tests/posix/timers/src/timer.c
+++ b/tests/posix/timers/src/timer.c
@@ -154,14 +154,4 @@ static void after(void *arg)
 	}
 }
 
-static void before(void *arg)
-{
-	ARG_UNUSED(arg);
-
-	if (!IS_ENABLED(CONFIG_DYNAMIC_THREAD)) {
-		/* skip redundant testing if there is no thread pool / heap allocation */
-		ztest_test_skip();
-	}
-}
-
-ZTEST_SUITE(posix_timers, NULL, NULL, before, after, NULL);
+ZTEST_SUITE(posix_timers, NULL, NULL, NULL, after, NULL);
diff --git a/tests/posix/xsi_realtime/src/mqueue.c b/tests/posix/xsi_realtime/src/mqueue.c
index d7e9ba75d4b2b..ae1f7c3d3f866 100644
--- a/tests/posix/xsi_realtime/src/mqueue.c
+++ b/tests/posix/xsi_realtime/src/mqueue.c
@@ -271,3 +271,29 @@ ZTEST(xsi_realtime, test_mqueue_notify_errors)
 	zassert_ok(mq_close(mqd), "Unable to close message queue descriptor.");
 	zassert_ok(mq_unlink(queue), "Unable to unlink queue");
 }
+
+ZTEST(xsi_realtime, test_mqueue_open_and_unlink_multiple)
+{
+	const char *q1 = "q1";
+	const char *q2 = "q2";
+
+	mqd_t mqd1, mqd2;
+	struct mq_attr attrs = {
+		.mq_msgsize = MESSAGE_SIZE,
+		.mq_maxmsg = MESG_COUNT_PERMQ,
+	};
+
+	int32_t mode = 0600;
+	int flags = O_RDWR | O_CREAT;
+
+	mqd1 = mq_open(q1, flags, mode, &attrs);
+
+	zassert_ok(mq_unlink(q1), "Unable to unlink q1");
+
+	mqd2 = mq_open(q2, flags, mode, &attrs);
+
+	zassert_ok(mq_unlink(q2), "Unable to unlink q2");
+
+	zassert_ok(mq_close(mqd1), "Unable to close message queue 1 descriptor.");
+	zassert_ok(mq_close(mqd2), "Unable to close message queue 2 descriptor.");
+}
diff --git a/tests/posix/xsi_realtime/testcase.yaml b/tests/posix/xsi_realtime/testcase.yaml
index d3b98962cf2d8..f084983c38b31 100644
--- a/tests/posix/xsi_realtime/testcase.yaml
+++ b/tests/posix/xsi_realtime/testcase.yaml
@@ -13,10 +13,6 @@ common:
   platform_exclude:
     # linker_zephyr_pre0.cmd:140: syntax error (??)
     - qemu_xtensa/dc233c
-    # CONFIG_MMU=y but no arch_mem_map() or arch_mem_unmap()
-    - intel_ish_5_4_1
-    - intel_ish_5_6_0
-    - intel_ish_5_8_0
     - native_sim
     - native_sim/native/64
 tests:
diff --git a/tests/posix/xsi_streams/testcase.yaml b/tests/posix/xsi_streams/testcase.yaml
index c039596082709..06b40f1c2e8d0 100644
--- a/tests/posix/xsi_streams/testcase.yaml
+++ b/tests/posix/xsi_streams/testcase.yaml
@@ -7,6 +7,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_riscv64
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/posix/xsi_system_logging/testcase.yaml b/tests/posix/xsi_system_logging/testcase.yaml
index 352cfffce42c2..54d6790ae75b0 100644
--- a/tests/posix/xsi_system_logging/testcase.yaml
+++ b/tests/posix/xsi_system_logging/testcase.yaml
@@ -6,6 +6,8 @@ common:
   platform_key:
     - arch
     - simulation
+  integration_platforms:
+    - qemu_riscv64
   min_flash: 64
   min_ram: 32
 tests:
diff --git a/tests/robot/common.robot b/tests/robot/common.robot
index 2bebe95579747..b8099de25da66 100644
--- a/tests/robot/common.robot
+++ b/tests/robot/common.robot
@@ -4,4 +4,5 @@
 Prepare Machine
     Execute Command           $elf = ${ELF}
     Execute Command           include ${RESC}
-    Create Terminal Tester    ${UART}
+    Create Terminal Tester    ${UART}  defaultPauseEmulation=True
+    Write Char Delay          0.01
diff --git a/tests/subsys/bindesc/reading/testcase.yaml b/tests/subsys/bindesc/reading/testcase.yaml
index 76fdaa78e8016..94a00642d2fd7 100644
--- a/tests/subsys/bindesc/reading/testcase.yaml
+++ b/tests/subsys/bindesc/reading/testcase.yaml
@@ -7,7 +7,6 @@ common:
 tests:
   bindesc.read:
     platform_allow:
-      - native_posix
       - native_sim
   bindesc.read.c99:
     extra_configs:
diff --git a/tests/subsys/debug/coredump/src/main.c b/tests/subsys/debug/coredump/src/main.c
index 0deda7e032ff6..0d891df331d3c 100644
--- a/tests/subsys/debug/coredump/src/main.c
+++ b/tests/subsys/debug/coredump/src/main.c
@@ -40,7 +40,8 @@ __no_optimization void func_3(uint32_t *addr)
 	defined(CONFIG_BOARD_QEMU_XTENSA) || \
 	defined(CONFIG_BOARD_RISCV32_VIRTUAL) || \
 	defined(CONFIG_SOC_FAMILY_INTEL_ISH) || \
-	defined(CONFIG_SOC_FAMILY_INTEL_ADSP)
+	defined(CONFIG_SOC_FAMILY_INTEL_ADSP) || \
+	defined(CONFIG_SOC_FAMILY_OPENHWGROUP_CVA6)
 	ARG_UNUSED(addr);
 	/* Call k_panic() directly so Renode doesn't pause execution.
 	 * Needed on ADSP as well, since null pointer derefence doesn't
diff --git a/tests/subsys/debug/coredump_backends/prj_in_memory.conf b/tests/subsys/debug/coredump_backends/prj_in_memory.conf
new file mode 100644
index 0000000000000..6ed3d0fb7809c
--- /dev/null
+++ b/tests/subsys/debug/coredump_backends/prj_in_memory.conf
@@ -0,0 +1,7 @@
+CONFIG_ZTEST=y
+CONFIG_LOG=y
+CONFIG_LOG_MODE_MINIMAL=y
+CONFIG_DEBUG_COREDUMP=y
+CONFIG_DEBUG_COREDUMP_BACKEND_IN_MEMORY=y
+CONFIG_DEBUG_COREDUMP_BACKEND_IN_MEMORY_SIZE=2048
+CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
diff --git a/tests/subsys/debug/coredump_backends/testcase.yaml b/tests/subsys/debug/coredump_backends/testcase.yaml
index ff4109f9d50c3..f97fa8173987f 100644
--- a/tests/subsys/debug/coredump_backends/testcase.yaml
+++ b/tests/subsys/debug/coredump_backends/testcase.yaml
@@ -24,6 +24,11 @@ tests:
       - esp32s2_saola
       - esp32s3_devkitm/esp32s3/procpu
       - esp32c3_devkitm
+  debug.coredump.backends.in_memory:
+    filter: CONFIG_ARCH_SUPPORTS_COREDUMP
+    extra_args: CONF_FILE=prj_in_memory.conf
+    extra_configs:
+      - CONFIG_TEST_STORED_COREDUMP=y
   debug.coredump.backends.other:
     filter: CONFIG_ARCH_SUPPORTS_COREDUMP
     extra_args: CONF_FILE=prj_backend_other.conf
diff --git a/tests/subsys/debug/cpu_load/CMakeLists.txt b/tests/subsys/debug/cpu_load/CMakeLists.txt
new file mode 100644
index 0000000000000..8c9bd0d2e755a
--- /dev/null
+++ b/tests/subsys/debug/cpu_load/CMakeLists.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(debug_cpu_load)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/debug/cpu_load/boards/nrf52840dk_nrf52840.overlay b/tests/subsys/debug/cpu_load/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 0000000000000..1f631ba158798
--- /dev/null
+++ b/tests/subsys/debug/cpu_load/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,10 @@
+/ {
+	chosen {
+		zephyr,cpu-load-counter = &timer0;
+	};
+};
+
+&timer0 {
+	status = "okay";
+	prescaler = <0>;
+};
diff --git a/tests/subsys/debug/cpu_load/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/subsys/debug/cpu_load/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..c60ec9ea5aa40
--- /dev/null
+++ b/tests/subsys/debug/cpu_load/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,10 @@
+/ {
+	chosen {
+		zephyr,cpu-load-counter = &timer130;
+	};
+};
+
+&timer130 {
+	status = "okay";
+	prescaler = <0>;
+};
diff --git a/tests/subsys/debug/cpu_load/prj.conf b/tests/subsys/debug/cpu_load/prj.conf
new file mode 100644
index 0000000000000..a194a84c710b4
--- /dev/null
+++ b/tests/subsys/debug/cpu_load/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_ZTEST=y
+CONFIG_CPU_LOAD=y
+CONFIG_CPU_LOAD_USE_COUNTER=n
diff --git a/tests/subsys/debug/cpu_load/src/main.c b/tests/subsys/debug/cpu_load/src/main.c
new file mode 100644
index 0000000000000..ab8efc86b957b
--- /dev/null
+++ b/tests/subsys/debug/cpu_load/src/main.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/debug/cpu_load.h>
+#include <zephyr/ztest.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log_backend.h>
+
+#include <zephyr/drivers/counter.h>
+
+#define DELTA 30
+
+ZTEST(cpu_load, test_load)
+{
+	int load;
+	uint32_t t_ms = 100;
+
+	if (CONFIG_CPU_LOAD_LOG_PERIODICALLY > 0) {
+		cpu_load_log_control(false);
+	}
+
+	/* Reset the measurement */
+	(void)cpu_load_get(true);
+	k_busy_wait(t_ms * USEC_PER_MSEC);
+
+	/* Measurement is not reset. */
+	load = cpu_load_get(false);
+	/* Result in per mille */
+	zassert_within(load, 1000, DELTA);
+
+	k_msleep(t_ms);
+	load = cpu_load_get(false);
+	zassert_within(load, 500, DELTA);
+
+	/* Reset the measurement */
+	(void)cpu_load_get(true);
+	k_msleep(t_ms);
+	load = cpu_load_get(false);
+	zassert_within(load, 0, DELTA);
+}
+
+#if CONFIG_CPU_LOAD_LOG_PERIODICALLY > 0
+static int cpu_load_src_id;
+static atomic_t log_cnt;
+
+static void process(const struct log_backend *const backend,
+		union log_msg_generic *msg)
+{
+	ARG_UNUSED(backend);
+	const void *source = msg->log.hdr.source;
+	int source_id = log_const_source_id((const struct log_source_const_data *)source);
+
+	if (source_id == cpu_load_src_id) {
+		atomic_inc(&log_cnt);
+	}
+}
+
+static void init(const struct log_backend *const backend)
+{
+	ARG_UNUSED(backend);
+}
+
+const struct log_backend_api mock_log_backend_api = {
+	.process = process,
+	.init = init
+};
+
+LOG_BACKEND_DEFINE(dummy, mock_log_backend_api, false, NULL);
+
+ZTEST(cpu_load, test_periodic_report)
+{
+	log_backend_enable(&dummy, NULL, LOG_LEVEL_INF);
+	cpu_load_log_control(true);
+
+	cpu_load_src_id = log_source_id_get(STRINGIFY(cpu_load));
+	atomic_set(&log_cnt, 0);
+	k_msleep(3 * CONFIG_CPU_LOAD_LOG_PERIODICALLY);
+	zassert_within(log_cnt, 3, 1);
+
+	cpu_load_log_control(false);
+	k_msleep(1);
+	atomic_set(&log_cnt, 0);
+	k_msleep(3 * CONFIG_CPU_LOAD_LOG_PERIODICALLY);
+	zassert_equal(log_cnt, 0);
+
+	cpu_load_log_control(true);
+	k_msleep(3 * CONFIG_CPU_LOAD_LOG_PERIODICALLY);
+	zassert_within(log_cnt, 3, 1);
+
+	cpu_load_log_control(false);
+	log_backend_disable(&dummy);
+}
+#endif /* CONFIG_CPU_LOAD_LOG_PERIODICALLY > 0 */
+
+ZTEST_SUITE(cpu_load, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/debug/cpu_load/testcase.yaml b/tests/subsys/debug/cpu_load/testcase.yaml
new file mode 100644
index 0000000000000..a3e310230b6b5
--- /dev/null
+++ b/tests/subsys/debug/cpu_load/testcase.yaml
@@ -0,0 +1,28 @@
+common:
+  tags: cpu_load
+  arch_allow:
+    - arm
+    - riscv
+  filter: CONFIG_CPU_LOAD
+tests:
+  debug.cpu_load:
+    integration_platforms:
+      - mps2/an385
+  debug.cpu_load.counter:
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf52840dk/nrf52840
+    extra_configs:
+      - CONFIG_CPU_LOAD_USE_COUNTER=y
+  debug.cpu_load.periodic_report:
+    integration_platforms:
+      - mps2/an385
+    extra_configs:
+      - CONFIG_CPU_LOAD_LOG_PERIODICALLY=50
+      - CONFIG_LOG=y
+      - CONFIG_TEST_LOGGING_DEFAULTS=n
+      - CONFIG_LOG_PRINTK=n
+      - CONFIG_LOG_BACKEND_UART=n
+      - CONFIG_LOG_MODE_IMMEDIATE=y
diff --git a/tests/subsys/dfu/img_util/testcase.yaml b/tests/subsys/dfu/img_util/testcase.yaml
index 0c280a29ae727..7924f447c59e1 100644
--- a/tests/subsys/dfu/img_util/testcase.yaml
+++ b/tests/subsys/dfu/img_util/testcase.yaml
@@ -4,7 +4,7 @@ common:
     - native_sim
     - native_sim/native/64
   integration_platforms:
-    - nrf52840dk/nrf52840
+    - native_sim
 tests:
   dfu.image_util:
     tags: dfu_image_util
diff --git a/tests/subsys/dfu/mcuboot/testcase.yaml b/tests/subsys/dfu/mcuboot/testcase.yaml
index b8d05692a27bb..5e95f708bbad7 100644
--- a/tests/subsys/dfu/mcuboot/testcase.yaml
+++ b/tests/subsys/dfu/mcuboot/testcase.yaml
@@ -6,4 +6,4 @@ tests:
       - native_sim/native/64
     tags: dfu_mcuboot
     integration_platforms:
-      - nrf52840dk/nrf52840
+      - native_sim
diff --git a/tests/subsys/dfu/mcuboot_multi/testcase.yaml b/tests/subsys/dfu/mcuboot_multi/testcase.yaml
index 5ded74912ab6a..30a144424c0c0 100644
--- a/tests/subsys/dfu/mcuboot_multi/testcase.yaml
+++ b/tests/subsys/dfu/mcuboot_multi/testcase.yaml
@@ -6,4 +6,4 @@ tests:
       - native_sim/native/64
     tags: dfu_mcuboot
     integration_platforms:
-      - nrf52840dk/nrf52840
+      - native_sim
diff --git a/tests/subsys/fs/ext2/ramdisk_small.overlay b/tests/subsys/fs/ext2/ramdisk_small.overlay
index 8a4d7708a80f0..dba1a41c8f2fa 100644
--- a/tests/subsys/fs/ext2/ramdisk_small.overlay
+++ b/tests/subsys/fs/ext2/ramdisk_small.overlay
@@ -9,6 +9,6 @@
 		compatible = "zephyr,ram-disk";
 		disk-name = "RAM";
 		sector-size = <512>;
-		sector-count = <400>;
+		sector-count = <220>;
 	};
 };
diff --git a/tests/subsys/fs/fat_fs_api/prj_native_ram.conf b/tests/subsys/fs/fat_fs_api/prj_native_ram.conf
index 4403579767fd5..223c34dde5af2 100644
--- a/tests/subsys/fs/fat_fs_api/prj_native_ram.conf
+++ b/tests/subsys/fs/fat_fs_api/prj_native_ram.conf
@@ -6,3 +6,4 @@ CONFIG_ZTEST=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_DISK_DRIVER_FLASH=n
+CONFIG_MAIN_STACK_SIZE=3072
diff --git a/tests/subsys/fs/fcb/testcase.yaml b/tests/subsys/fs/fcb/testcase.yaml
index 53a61c3651e54..c8351b8dcf217 100644
--- a/tests/subsys/fs/fcb/testcase.yaml
+++ b/tests/subsys/fs/fcb/testcase.yaml
@@ -9,12 +9,17 @@ tests:
       - mr_canhubk3
     tags: flash_circural_buffer
     integration_platforms:
-      - nrf52840dk/nrf52840
+      - native_sim
   filesystem.fcb.no_erase:
     platform_allow:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l20pdk/nrf54l20/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+      - native_sim
+    integration_platforms:
+      - nrf54l09pdk/nrf54l09/cpuapp
+      - native_sim
   filesystem.fcb.native_sim.no_erase:
     extra_args: CONFIG_FLASH_SIMULATOR_EXPLICIT_ERASE=n
     platform_allow: native_sim
@@ -28,7 +33,7 @@ tests:
       - mr_canhubk3
     tags: flash_circural_buffer
     integration_platforms:
-      - nrf52840dk/nrf52840
+      - native_sim
     extra_args: CONFIG_FCB_ALLOW_FIXED_ENDMARKER=y
   filesystem.fcb.native_sim.fcb_0x00:
     extra_args: DTC_OVERLAY_FILE=boards/native_sim_ev_0x00.overlay
diff --git a/tests/subsys/fs/littlefs/boards/frdm_mcxa156.conf b/tests/subsys/fs/littlefs/boards/frdm_mcxa156.conf
new file mode 100644
index 0000000000000..ace2fd7382b51
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/frdm_mcxa156.conf
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_FS_LITTLEFS_PROG_SIZE=128
+CONFIG_FS_LITTLEFS_CACHE_SIZE=256
diff --git a/tests/subsys/fs/littlefs/boards/frdm_mcxa156.overlay b/tests/subsys/fs/littlefs/boards/frdm_mcxa156.overlay
new file mode 100644
index 0000000000000..c5d1289e80587
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/frdm_mcxa156.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash {
+	partitions {
+		small_partition: partition@E0000 {
+			label = "small";
+			reg = <0x000E0000 DT_SIZE_K(128)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/frdm_mcxn236.conf b/tests/subsys/fs/littlefs/boards/frdm_mcxn236.conf
new file mode 100644
index 0000000000000..a2c4bf5521ab9
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/frdm_mcxn236.conf
@@ -0,0 +1,5 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_FS_LITTLEFS_PROG_SIZE=128
+CONFIG_FS_LITTLEFS_CACHE_SIZE=128
diff --git a/tests/subsys/fs/littlefs/boards/frdm_mcxn236.overlay b/tests/subsys/fs/littlefs/boards/frdm_mcxn236.overlay
new file mode 100644
index 0000000000000..c5d1289e80587
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/frdm_mcxn236.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash {
+	partitions {
+		small_partition: partition@E0000 {
+			label = "small";
+			reg = <0x000E0000 DT_SIZE_K(128)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/frdm_mcxn947_mcxn947_cpu0.overlay b/tests/subsys/fs/littlefs/boards/frdm_mcxn947_mcxn947_cpu0.overlay
new file mode 100644
index 0000000000000..06de359339861
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/frdm_mcxn947_mcxn947_cpu0.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&w25q64jvssiq {
+	partitions {
+		large_partition: partition@400000 {
+			label = "large";
+			reg = <0x00400000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@700000 {
+			label = "medium";
+			reg = <0x00700000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@7F0000 {
+			label = "small";
+			reg = <0x007F0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/frdm_mcxw71.overlay b/tests/subsys/fs/littlefs/boards/frdm_mcxw71.overlay
new file mode 100644
index 0000000000000..c5d1289e80587
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/frdm_mcxw71.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash {
+	partitions {
+		small_partition: partition@E0000 {
+			label = "small";
+			reg = <0x000E0000 DT_SIZE_K(128)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/frdm_rw612.overlay b/tests/subsys/fs/littlefs/boards/frdm_rw612.overlay
new file mode 100644
index 0000000000000..df18bc7ad7061
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/frdm_rw612.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&w25q512jvfiq {
+	partitions {
+		large_partition: partition@3C00000 {
+			label = "large";
+			reg = <0x03C00000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@3F00000 {
+			label = "medium";
+			reg = <0x03F00000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@3FF0000 {
+			label = "small";
+			reg = <0x03FF0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s06.conf b/tests/subsys/fs/littlefs/boards/lpcxpresso55s06.conf
new file mode 100644
index 0000000000000..d420a2072a4df
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s06.conf
@@ -0,0 +1,5 @@
+# Copyright 2023 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_FS_LITTLEFS_PROG_SIZE=512
+CONFIG_FS_LITTLEFS_CACHE_SIZE=512
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s06.overlay b/tests/subsys/fs/littlefs/boards/lpcxpresso55s06.overlay
new file mode 100644
index 0000000000000..000a49903c5c7
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s06.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	 partitions {
+		 small_partition: partition@1D000 {
+			 label = "small";
+			 reg = <0x0001D000 DT_SIZE_K(128)>;
+		 };
+	 };
+};
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s16.conf b/tests/subsys/fs/littlefs/boards/lpcxpresso55s16.conf
new file mode 100644
index 0000000000000..d420a2072a4df
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s16.conf
@@ -0,0 +1,5 @@
+# Copyright 2023 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_FS_LITTLEFS_PROG_SIZE=512
+CONFIG_FS_LITTLEFS_CACHE_SIZE=512
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s16.overlay b/tests/subsys/fs/littlefs/boards/lpcxpresso55s16.overlay
new file mode 100644
index 0000000000000..000a49903c5c7
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s16.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	 partitions {
+		 small_partition: partition@1D000 {
+			 label = "small";
+			 reg = <0x0001D000 DT_SIZE_K(128)>;
+		 };
+	 };
+};
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s28.conf b/tests/subsys/fs/littlefs/boards/lpcxpresso55s28.conf
new file mode 100644
index 0000000000000..d420a2072a4df
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s28.conf
@@ -0,0 +1,5 @@
+# Copyright 2023 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_FS_LITTLEFS_PROG_SIZE=512
+CONFIG_FS_LITTLEFS_CACHE_SIZE=512
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s28.overlay b/tests/subsys/fs/littlefs/boards/lpcxpresso55s28.overlay
new file mode 100644
index 0000000000000..56e240a5f429f
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s28.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	partitions {
+		small_partition: partition@5D000 {
+			label = "small";
+			reg = <0x0005D000 DT_SIZE_K(128)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s36.conf b/tests/subsys/fs/littlefs/boards/lpcxpresso55s36.conf
new file mode 100644
index 0000000000000..d420a2072a4df
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s36.conf
@@ -0,0 +1,5 @@
+# Copyright 2023 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_FS_LITTLEFS_PROG_SIZE=512
+CONFIG_FS_LITTLEFS_CACHE_SIZE=512
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s36.overlay b/tests/subsys/fs/littlefs/boards/lpcxpresso55s36.overlay
new file mode 100644
index 0000000000000..d78949bf3ddc2
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s36.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	 partitions {
+		 small_partition: partition@1D800 {
+			 label = "small";
+			 reg = <0x0001D800 DT_SIZE_K(128)>;
+		 };
+	 };
+};
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.conf b/tests/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.conf
new file mode 100644
index 0000000000000..d420a2072a4df
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.conf
@@ -0,0 +1,5 @@
+# Copyright 2023 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_FS_LITTLEFS_PROG_SIZE=512
+CONFIG_FS_LITTLEFS_CACHE_SIZE=512
diff --git a/tests/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay b/tests/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
new file mode 100644
index 0000000000000..7fb3d1ecbbe0b
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	partitions {
+		small_partition: partition@75800 {
+			label = "small";
+			reg = <0x00075800 DT_SIZE_K(128)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt1010_evk.overlay b/tests/subsys/fs/littlefs/boards/mimxrt1010_evk.overlay
new file mode 100644
index 0000000000000..658e9bd3194c8
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt1010_evk.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&at25sf128a {
+	partitions {
+		large_partition: partition@C00000 {
+			label = "large";
+			reg = <0x00C00000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@F00000 {
+			label = "medium";
+			reg = <0x00F00000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@FF0000 {
+			label = "small";
+			reg = <0x00FF0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt1015_evk.overlay b/tests/subsys/fs/littlefs/boards/mimxrt1015_evk.overlay
new file mode 100644
index 0000000000000..658e9bd3194c8
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt1015_evk.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&at25sf128a {
+	partitions {
+		large_partition: partition@C00000 {
+			label = "large";
+			reg = <0x00C00000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@F00000 {
+			label = "medium";
+			reg = <0x00F00000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@FF0000 {
+			label = "small";
+			reg = <0x00FF0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt1040_evk.overlay b/tests/subsys/fs/littlefs/boards/mimxrt1040_evk.overlay
new file mode 100644
index 0000000000000..06de359339861
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt1040_evk.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&w25q64jvssiq {
+	partitions {
+		large_partition: partition@400000 {
+			label = "large";
+			reg = <0x00400000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@700000 {
+			label = "medium";
+			reg = <0x00700000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@7F0000 {
+			label = "small";
+			reg = <0x007F0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay b/tests/subsys/fs/littlefs/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
new file mode 100644
index 0000000000000..db2ee713fc6c9
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&s26ks512s0 {
+	partitions {
+		large_partition: partition@3400000 {
+			label = "large";
+			reg = <0x03400000 DT_SIZE_M(4)>;
+		};
+		medium_partition: partition@3800000 {
+			label = "medium";
+			reg = <0x03800000 DT_SIZE_M(4)>;
+		};
+		small_partition: partition@3C00000 {
+			label = "small";
+			reg = <0x03C00000 DT_SIZE_M(4)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay b/tests/subsys/fs/littlefs/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
new file mode 100644
index 0000000000000..80e28b4573527
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&w25q512nw {
+	partitions {
+		large_partition: partition@3C00000 {
+			label = "large";
+			reg = <0x03C00000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@3F00000 {
+			label = "medium";
+			reg = <0x03F00000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@3FF0000 {
+			label = "small";
+			reg = <0x03FF0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay b/tests/subsys/fs/littlefs/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
new file mode 100644
index 0000000000000..7201d45e52b67
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt1180_evk_mimxrt1189_cm33.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&w25q128jw {
+	partitions {
+		large_partition: partition@C00000 {
+			label = "large";
+			reg = <0x00C00000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@F00000 {
+			label = "medium";
+			reg = <0x00F00000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@FF0000 {
+			label = "small";
+			reg = <0x00FF0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt595_evk_mimxrt595s_cm33.overlay b/tests/subsys/fs/littlefs/boards/mimxrt595_evk_mimxrt595s_cm33.overlay
new file mode 100644
index 0000000000000..2ac6dd7f4f9cf
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt595_evk_mimxrt595s_cm33.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&mx25um51345g {
+	partitions {
+		large_partition: partition@3C00000 {
+			label = "large";
+			reg = <0x03C00000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@3F00000 {
+			label = "medium";
+			reg = <0x03F00000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@3FF0000 {
+			label = "small";
+			reg = <0x03FF0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/mimxrt685_evk_mimxrt685s_cm33.overlay b/tests/subsys/fs/littlefs/boards/mimxrt685_evk_mimxrt685s_cm33.overlay
new file mode 100644
index 0000000000000..2ac6dd7f4f9cf
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/mimxrt685_evk_mimxrt685s_cm33.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&mx25um51345g {
+	partitions {
+		large_partition: partition@3C00000 {
+			label = "large";
+			reg = <0x03C00000 DT_SIZE_M(3)>;
+		};
+		medium_partition: partition@3F00000 {
+			label = "medium";
+			reg = <0x03F00000 DT_SIZE_K(960)>;
+		};
+		small_partition: partition@3FF0000 {
+			label = "small";
+			reg = <0x03FF0000 DT_SIZE_K(64)>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/tests/subsys/fs/littlefs/boards/ophelia4ev_nrf54l15_cpuapp.overlay
new file mode 100644
index 0000000000000..64bfe273c9d7f
--- /dev/null
+++ b/tests/subsys/fs/littlefs/boards/ophelia4ev_nrf54l15_cpuapp.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_partition;
+/delete-node/ &slot1_ns_partition;
+
+&cpuapp_rram {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		small_partition: partition@67000 {
+			label = "small";
+			reg = <0x00067000 0x00010000>;
+		};
+	};
+};
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_basic.c b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
index 9c4e05449677a..05a5de2a40af7 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_basic.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
@@ -57,12 +57,8 @@ static int clean_statvfs(const struct fs_mount_t *mp)
 	TC_PRINT("%s: bsize %lu ; frsize %lu ; blocks %lu ; bfree %lu\n",
 		 mp->mnt_point,
 		 stat.f_bsize, stat.f_frsize, stat.f_blocks, stat.f_bfree);
-	zassert_equal(stat.f_bsize, 16,
+	zassert_equal(stat.f_bsize, CONFIG_FS_LITTLEFS_PROG_SIZE,
 		      "bsize fail");
-	zassert_equal(stat.f_frsize, 4096,
-		      "frsize fail");
-	zassert_equal(stat.f_blocks, 16,
-		      "blocks fail");
 	zassert_equal(stat.f_bfree, stat.f_blocks - 2U,
 		      "bfree fail");
 
@@ -88,10 +84,6 @@ static int check_medium(void)
 		 stat.f_bsize, stat.f_frsize, stat.f_blocks, stat.f_bfree);
 	zassert_equal(stat.f_bsize, MEDIUM_IO_SIZE,
 		      "bsize fail");
-	zassert_equal(stat.f_frsize, 4096,
-		      "frsize fail");
-	zassert_equal(stat.f_blocks, 240,
-		      "blocks fail");
 	zassert_equal(stat.f_bfree, stat.f_blocks - 2U,
 		      "bfree fail");
 
@@ -120,10 +112,6 @@ static int check_large(void)
 		 stat.f_bsize, stat.f_frsize, stat.f_blocks, stat.f_bfree);
 	zassert_equal(stat.f_bsize, LARGE_IO_SIZE,
 		      "bsize fail");
-	zassert_equal(stat.f_frsize, 32768,
-		      "frsize fail");
-	zassert_equal(stat.f_blocks, 96,
-		      "blocks fail");
 	zassert_equal(stat.f_bfree, stat.f_blocks - 2U,
 		      "bfree fail");
 
diff --git a/tests/subsys/fs/littlefs/src/testfs_lfs.c b/tests/subsys/fs/littlefs/src/testfs_lfs.c
index 01737749ec181..bde73b87caa1b 100644
--- a/tests/subsys/fs/littlefs/src/testfs_lfs.c
+++ b/tests/subsys/fs/littlefs/src/testfs_lfs.c
@@ -45,7 +45,6 @@ static struct fs_littlefs large = {
 		.prog_size = LARGE_IO_SIZE,
 		.cache_size = LARGE_CACHE_SIZE,
 		.lookahead_size = LARGE_LOOKAHEAD_SIZE,
-		.block_size = 32768, /* increase erase size */
 		.read_buffer = large_read_buffer,
 		.prog_buffer = large_prog_buffer,
 		.lookahead_buffer = large_lookahead_buffer,
diff --git a/tests/subsys/fs/littlefs/src/testfs_mkfs.c b/tests/subsys/fs/littlefs/src/testfs_mkfs.c
index acfcb805853e6..978bc7463d6a1 100644
--- a/tests/subsys/fs/littlefs/src/testfs_mkfs.c
+++ b/tests/subsys/fs/littlefs/src/testfs_mkfs.c
@@ -49,7 +49,7 @@ ZTEST(littlefs, test_fs_mkfs_ops_lfs)
 FS_LITTLEFS_DECLARE_CUSTOM_CONFIG(custom_cfg,
 		4,
 		CONFIG_FS_LITTLEFS_READ_SIZE,
-		CONFIG_FS_LITTLEFS_PROG_SIZE * 2,
+		CONFIG_FS_LITTLEFS_PROG_SIZE,
 		CONFIG_FS_LITTLEFS_CACHE_SIZE,
 		CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE);
 
@@ -74,7 +74,7 @@ ZTEST(littlefs, test_fs_mkfs_custom)
 
 	TC_PRINT("f_bsize= %lu", sbuf.f_bsize);
 	/* Prog size is returned in f_bsize field. */
-	zassert_equal(sbuf.f_bsize, 2 * CONFIG_FS_LITTLEFS_PROG_SIZE);
+	zassert_equal(sbuf.f_bsize, CONFIG_FS_LITTLEFS_PROG_SIZE);
 
 	ret = fs_unmount(&mnt);
 	zassert_equal(ret, 0, "Expected success (ret=%d)", ret);
diff --git a/tests/subsys/fs/littlefs/testcase.yaml b/tests/subsys/fs/littlefs/testcase.yaml
index 56972d1a26082..5fd2ec5b76558 100644
--- a/tests/subsys/fs/littlefs/testcase.yaml
+++ b/tests/subsys/fs/littlefs/testcase.yaml
@@ -9,7 +9,7 @@ common:
     - mimxrt1060_evk/mimxrt1062/qspi
     - mr_canhubk3
   integration_platforms:
-    - nrf52840dk/nrf52840
+    - native_sim
   modules:
     - littlefs
 tests:
@@ -17,6 +17,7 @@ tests:
     timeout: 60
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
       - s32z2xxdc2/s32z270/rtu0
       - s32z2xxdc2/s32z270/rtu1
       - s32z2xxdc2@D/s32z270/rtu0
diff --git a/tests/subsys/fs/nvs/Kconfig b/tests/subsys/fs/nvs/Kconfig
new file mode 100644
index 0000000000000..b1c5ddcb1738e
--- /dev/null
+++ b/tests/subsys/fs/nvs/Kconfig
@@ -0,0 +1,16 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "NVS test configuration"
+
+config TEST_NVS_SIMULATOR
+	bool "Enable NVS tests designed to be run using a flash-simulator"
+	default y if BOARD_QEMU_X86 || ARCH_POSIX || BOARD_MPS2_AN385
+	help
+	  If y, enables NVS tests designed to be run using a flash-simulator,
+	  which provide functionality for flash property customization
+	  and emulating errors in flash operation in parallel to
+	  the regular flash API.
+	  The tests must be run only on qemu_x86, mps2_an385, or native_sim target.
+
+source "Kconfig.zephyr"
diff --git a/tests/subsys/fs/nvs/src/main.c b/tests/subsys/fs/nvs/src/main.c
index dcd264422b741..1747a7ba4aafb 100644
--- a/tests/subsys/fs/nvs/src/main.c
+++ b/tests/subsys/fs/nvs/src/main.c
@@ -4,18 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * This test is designed to be run using flash-simulator which provide
- * functionality for flash property customization and emulating errors in
- * flash operation in parallel to regular flash API.
- * Test should be run on qemu_x86, mps2_an385 or native_sim target.
- */
-
-#if !defined(CONFIG_BOARD_QEMU_X86) && !defined(CONFIG_ARCH_POSIX) &&                              \
-	!defined(CONFIG_BOARD_MPS2_AN385)
-#error "Run only on qemu_x86, mps2_an385, or a posix architecture based target (for ex. native_sim)"
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/ztest.h>
@@ -39,8 +27,10 @@ static const struct device *const flash_dev = TEST_NVS_FLASH_AREA_DEV;
 
 struct nvs_fixture {
 	struct nvs_fs fs;
+#ifdef CONFIG_TEST_NVS_SIMULATOR
 	struct stats_hdr *sim_stats;
 	struct stats_hdr *sim_thresholds;
+#endif /* CONFIG_TEST_NVS_SIMULATOR */
 };
 
 static void *setup(void)
@@ -69,22 +59,26 @@ static void *setup(void)
 
 static void before(void *data)
 {
+#ifdef CONFIG_TEST_NVS_SIMULATOR
 	struct nvs_fixture *fixture = (struct nvs_fixture *)data;
 
 	fixture->sim_stats = stats_group_find("flash_sim_stats");
 	fixture->sim_thresholds = stats_group_find("flash_sim_thresholds");
+#endif /* CONFIG_TEST_NVS_SIMULATOR */
 }
 
 static void after(void *data)
 {
 	struct nvs_fixture *fixture = (struct nvs_fixture *)data;
 
+#ifdef CONFIG_TEST_NVS_SIMULATOR
 	if (fixture->sim_stats) {
 		stats_reset(fixture->sim_stats);
 	}
 	if (fixture->sim_thresholds) {
 		stats_reset(fixture->sim_thresholds);
 	}
+#endif /* CONFIG_TEST_NVS_SIMULATOR */
 
 	/* Clear NVS */
 	if (fixture->fs.ready) {
@@ -142,6 +136,7 @@ ZTEST_F(nvs, test_nvs_write)
 	execute_long_pattern_write(TEST_DATA_ID, &fixture->fs);
 }
 
+#ifdef CONFIG_TEST_NVS_SIMULATOR
 static int flash_sim_write_calls_find(struct stats_hdr *hdr, void *arg,
 				      const char *name, uint16_t off)
 {
@@ -525,6 +520,7 @@ ZTEST_F(nvs, test_nvs_corrupted_sector_close_operation)
 	/* Ensure that the NVS is able to store new content. */
 	execute_long_pattern_write(max_id, &fixture->fs);
 }
+#endif /* CONFIG_TEST_NVS_SIMULATOR */
 
 /**
  * @brief Test case when storage become full, so only deletion is possible.
@@ -639,6 +635,7 @@ ZTEST_F(nvs, test_delete)
 		     " any footprint in the storage");
 }
 
+#ifdef CONFIG_TEST_NVS_SIMULATOR
 /*
  * Test that garbage-collection can recover all ate's even when the last ate,
  * ie close_ate, is corrupt. In this test the close_ate is set to point to the
@@ -659,6 +656,7 @@ ZTEST_F(nvs, test_nvs_gc_corrupt_close_ate)
 	close_ate.id = 0xffff;
 	close_ate.offset = fixture->fs.sector_size - sizeof(struct nvs_ate) * 5;
 	close_ate.len = 0;
+	close_ate.part = 0xff;
 	close_ate.crc8 = 0xff; /* Incorrect crc8 */
 
 	ate.id = 0x1;
@@ -667,6 +665,7 @@ ZTEST_F(nvs, test_nvs_gc_corrupt_close_ate)
 #ifdef CONFIG_NVS_DATA_CRC
 	ate.len += sizeof(data_crc);
 #endif
+	ate.part = 0xff;
 	ate.crc8 = crc8_ccitt(0xff, &ate,
 			      offsetof(struct nvs_ate, crc8));
 
@@ -722,12 +721,14 @@ ZTEST_F(nvs, test_nvs_gc_corrupt_ate)
 	close_ate.id = 0xffff;
 	close_ate.offset = fixture->fs.sector_size / 2;
 	close_ate.len = 0;
+	close_ate.part = 0xff;
 	close_ate.crc8 = crc8_ccitt(0xff, &close_ate,
 				    offsetof(struct nvs_ate, crc8));
 
 	corrupt_ate.id = 0xdead;
 	corrupt_ate.offset = 0;
 	corrupt_ate.len = 20;
+	corrupt_ate.part = 0xff;
 	corrupt_ate.crc8 = 0xff; /* Incorrect crc8 */
 
 	/* Mark sector 0 as closed */
@@ -754,6 +755,7 @@ ZTEST_F(nvs, test_nvs_gc_corrupt_ate)
 	err = nvs_mount(&fixture->fs);
 	zassert_true(err == 0,  "nvs_mount call failure: %d", err);
 }
+#endif /* CONFIG_TEST_NVS_SIMULATOR */
 
 #ifdef CONFIG_NVS_LOOKUP_CACHE
 static size_t num_matching_cache_entries(uint32_t addr, bool compare_sector_only, struct nvs_fs *fs)
@@ -960,6 +962,7 @@ ZTEST_F(nvs, test_nvs_cache_hash_quality)
 #endif
 }
 
+#ifdef CONFIG_TEST_NVS_SIMULATOR
 /*
  * Test NVS bad region initialization recovery.
  */
@@ -996,3 +999,4 @@ ZTEST_F(nvs, test_nvs_init_bad_memory_region)
 	zassert_true(err == -EDEADLK, "nvs_mount call ok, expect fail: %d", err);
 #endif
 }
+#endif /* CONFIG_TEST_NVS_SIMULATOR */
diff --git a/tests/subsys/fs/zms/Kconfig b/tests/subsys/fs/zms/Kconfig
new file mode 100644
index 0000000000000..9c8f49ff59b17
--- /dev/null
+++ b/tests/subsys/fs/zms/Kconfig
@@ -0,0 +1,16 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+mainmenu "ZMS test configuration"
+
+config TEST_ZMS_SIMULATOR
+	bool "Enable ZMS tests designed to be run using a flash-simulator"
+	default y if BOARD_QEMU_X86 || ARCH_POSIX
+	help
+	  If y, enables ZMS tests designed to be run using a flash-simulator,
+	  which provide functionality for flash property customization
+	  and emulating errors in flash operation in parallel to
+	  the regular flash API.
+	  The tests must be run only on qemu_x86 or native_sim target.
+
+source "Kconfig.zephyr"
diff --git a/tests/subsys/fs/zms/boards/native_sim.overlay b/tests/subsys/fs/zms/boards/native_sim.overlay
index 0f330fd7b176e..4579d10f93283 100644
--- a/tests/subsys/fs/zms/boards/native_sim.overlay
+++ b/tests/subsys/fs/zms/boards/native_sim.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor ASA
+ * Copyright (c) 2022 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay b/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
index ffc3bc97aacac..0f122e3400752 100644
--- a/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
+++ b/tests/subsys/fs/zms/boards/qemu_x86_ev_0x00.overlay
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor ASA
+ * Copyright (c) 2020 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/tests/subsys/fs/zms/prj.conf b/tests/subsys/fs/zms/prj.conf
index 5d84f6e17fde4..a3461bd526f32 100644
--- a/tests/subsys/fs/zms/prj.conf
+++ b/tests/subsys/fs/zms/prj.conf
@@ -6,4 +6,6 @@ CONFIG_FLASH_MAP=y
 
 CONFIG_ZMS=y
 CONFIG_LOG=y
-CONFIG_ZMS_LOG_LEVEL_DBG=y
+
+#Uncomment below line to see more debug logs
+#CONFIG_ZMS_LOG_LEVEL_DBG=y
diff --git a/tests/subsys/fs/zms/src/main.c b/tests/subsys/fs/zms/src/main.c
index 500ad758d68c4..14d6291970ca9 100644
--- a/tests/subsys/fs/zms/src/main.c
+++ b/tests/subsys/fs/zms/src/main.c
@@ -1,20 +1,10 @@
 /*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
  * Copyright (c) 2024 BayLibre SAS
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * This test is designed to be run using flash-simulator which provide
- * functionality for flash property customization and emulating errors in
- * flash operation in parallel to regular flash API.
- * Test should be run on qemu_x86 or native_sim target.
- */
-
-#if !defined(CONFIG_BOARD_QEMU_X86) && !defined(CONFIG_ARCH_POSIX)
-#error "Run only on qemu_x86 or a posix architecture based target (for ex. native_sim)"
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/ztest.h>
@@ -37,8 +27,10 @@ static const struct device *const flash_dev = TEST_ZMS_AREA_DEV;
 
 struct zms_fixture {
 	struct zms_fs fs;
+#ifdef CONFIG_TEST_ZMS_SIMULATOR
 	struct stats_hdr *sim_stats;
 	struct stats_hdr *sim_thresholds;
+#endif /* CONFIG_TEST_ZMS_SIMULATOR */
 };
 
 static void *setup(void)
@@ -66,22 +58,26 @@ static void *setup(void)
 
 static void before(void *data)
 {
+#ifdef CONFIG_TEST_ZMS_SIMULATOR
 	struct zms_fixture *fixture = (struct zms_fixture *)data;
 
 	fixture->sim_stats = stats_group_find("flash_sim_stats");
 	fixture->sim_thresholds = stats_group_find("flash_sim_thresholds");
+#endif /* CONFIG_TEST_ZMS_SIMULATOR */
 }
 
 static void after(void *data)
 {
 	struct zms_fixture *fixture = (struct zms_fixture *)data;
 
+#ifdef CONFIG_TEST_ZMS_SIMULATOR
 	if (fixture->sim_stats) {
 		stats_reset(fixture->sim_stats);
 	}
 	if (fixture->sim_thresholds) {
 		stats_reset(fixture->sim_thresholds);
 	}
+#endif /* CONFIG_TEST_ZMS_SIMULATOR */
 
 	/* Clear ZMS */
 	if (fixture->fs.ready) {
@@ -137,6 +133,7 @@ ZTEST_F(zms, test_zms_write)
 	execute_long_pattern_write(TEST_DATA_ID, &fixture->fs);
 }
 
+#ifdef CONFIG_TEST_ZMS_SIMULATOR
 static int flash_sim_write_calls_find(struct stats_hdr *hdr, void *arg, const char *name,
 				      uint16_t off)
 {
@@ -453,6 +450,7 @@ ZTEST_F(zms, test_zms_corrupted_sector_close_operation)
 	/* Ensure that the ZMS is able to store new content. */
 	execute_long_pattern_write(max_id, &fixture->fs);
 }
+#endif /* CONFIG_TEST_ZMS_SIMULATOR */
 
 /**
  * @brief Test case when storage become full, so only deletion is possible.
@@ -562,6 +560,7 @@ ZTEST_F(zms, test_delete)
 #endif
 }
 
+#ifdef CONFIG_TEST_ZMS_SIMULATOR
 /*
  * Test that garbage-collection can recover all ate's even when the last ate,
  * ie close_ate, is corrupt. In this test the close_ate is set to point to the
@@ -639,6 +638,7 @@ ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
 	zassert_true(len == sizeof(data), "zms_read should have read %d bytes", sizeof(data));
 	zassert_true(data == 0xaa55aa55, "unexpected value %d", data);
 }
+#endif /* CONFIG_TEST_ZMS_SIMULATOR */
 
 /*
  * Test that garbage-collection correctly handles corrupt ate's.
diff --git a/tests/subsys/ipc/ipc_service/prj.conf b/tests/subsys/ipc/ipc_service/prj.conf
index 01e20c4e9b911..d244f5d0e5038 100644
--- a/tests/subsys/ipc/ipc_service/prj.conf
+++ b/tests/subsys/ipc/ipc_service/prj.conf
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_ZTEST=y
-CONFIG_MMU=y
 CONFIG_IPC_SERVICE=y
diff --git a/tests/subsys/ipc/ipc_sessions/CMakeLists.txt b/tests/subsys/ipc/ipc_sessions/CMakeLists.txt
new file mode 100644
index 0000000000000..79b2b9c49c36f
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Copyright 2021 Google LLC
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(ipc_service)
+
+zephyr_include_directories(./common)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
+
+zephyr_sources_ifdef(CONFIG_IPC_SERVICE_ICMSG_V1		interoperability/icmsg_v1.c)
+zephyr_sources_ifdef(CONFIG_PBUF_V1				interoperability/pbuf_v1.c)
+zephyr_sources_ifdef(CONFIG_IPC_SERVICE_BACKEND_ICMSG_V1	interoperability/ipc_icmsg_v1.c)
diff --git a/tests/subsys/ipc/ipc_sessions/Kconfig b/tests/subsys/ipc/ipc_sessions/Kconfig
new file mode 100644
index 0000000000000..1c1ec5f3725cc
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/Kconfig
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+rsource "interoperability/Kconfig"
+
+menu "Zephyr"
+source "Kconfig.zephyr"
+endmenu
+
+config IPC_TEST_MSG_HEAP_SIZE
+	int "The heap to copy processed messages"
+	default 512
+	help
+		Internal heap where all the message data would be copied to be processed
+		linearry in tests.
+
+config IPC_TEST_SKIP_CORE_RESET
+	bool "Skip the tests that includes core resetting"
+	help
+		Some of the cores cannot be safely restarted.
+		Skip the tests that require it in such a cases.
+
+config IPC_TEST_BLOCK_SIZE
+	int "Block size for multiple transfers test"
+	default 32
+
+config IPC_TEST_BLOCK_CNT
+	int "Number of blocks for multiple transfers test"
+	default 8000
+
+config IPC_TEST_SKIP_UNBOUND
+	bool "Skip unbound tests"
+	help
+		Whether to skip tests that requires unbound callback functionality.
diff --git a/tests/subsys/ipc/ipc_sessions/Kconfig.sysbuild b/tests/subsys/ipc/ipc_sessions/Kconfig.sysbuild
new file mode 100644
index 0000000000000..3c064f59d5250
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+
+config REMOTE_BOARD
+	string "The board used for remote target"
+	default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP
+	default "nrf5340dk/nrf5340/cpunet" if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default "nrf54h20dk/nrf54h20/cpurad" if BOARD_NRF54H20DK_NRF54H20_CPUAPP
diff --git a/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.conf
new file mode 100644
index 0000000000000..4946c417b1612
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_SOC_NRF53_CPUNET_ENABLE=y
diff --git a/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 0000000000000..d87bb33b3b314
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &ipc0;
+
+/ {
+	chosen {
+		/delete-property/ zephyr,ipc_shm;
+		/delete-property/ zephyr,bt-hci;
+	};
+
+	reserved-memory {
+		/delete-node/ memory@20070000;
+
+		sram_tx: memory@20070000 {
+			reg = <0x20070000 0x8000>;
+		};
+
+		sram_rx: memory@20078000 {
+			reg = <0x20078000 0x8000>;
+		};
+	};
+
+	ipc0: ipc0 {
+		compatible = "zephyr,ipc-icmsg";
+		tx-region = <&sram_tx>;
+		rx-region = <&sram_rx>;
+		mboxes = <&mbox 0>, <&mbox 1>;
+		mbox-names = "tx", "rx";
+		dcache-alignment = <8>;
+		unbound = "detect";
+		status = "okay";
+	};
+};
diff --git a/tests/subsys/ipc/ipc_sessions/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/subsys/ipc/ipc_sessions/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 0000000000000..68efc08002249
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Replace default ipc0 instance */
+&ipc0 {
+	compatible = "zephyr,ipc-icmsg";
+	/delete-property/ tx-blocks;
+	/delete-property/ rx-blocks;
+	unbound = "enable";
+};
diff --git a/tests/subsys/ipc/ipc_sessions/boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.overlay b/tests/subsys/ipc/ipc_sessions/boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.overlay
new file mode 100644
index 0000000000000..90ef82327e9fa
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/boards/nrf54h20dk_nrf54h20_cpuapp_cpuppr.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Replace default ipc0 instance */
+/delete-node/ &ipc0;
+
+ipc0: &cpuapp_cpuppr_ipc {
+	status = "okay";
+	unbound = "detect";
+};
+
+&cpuppr_vevif {
+	status = "okay";
+};
+
+&cpuapp_bellboard {
+	status = "okay";
+};
+
+/ {
+	chosen {
+		/delete-property/ zephyr,bt-hci;
+	};
+};
diff --git a/tests/subsys/ipc/ipc_sessions/common/test_commands.h b/tests/subsys/ipc/ipc_sessions/common/test_commands.h
new file mode 100644
index 0000000000000..f992d34d52ea9
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/common/test_commands.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef TEST_COMMANDS_H
+#include <stdint.h>
+
+/**
+ * @brief Test commands executable by remote
+ */
+enum ipc_test_commands {
+	IPC_TEST_CMD_NONE,     /**< Command to be ingored */
+	IPC_TEST_CMD_PING,     /**< Respond with the @ref IPC_TEST_CMD_PONG message */
+	IPC_TEST_CMD_PONG,     /**< Expected response to IPC_TEST_CMD_PING */
+	IPC_TEST_CMD_ECHO,     /**< Respond with the same data */
+	IPC_TEST_CMD_ECHO_RSP, /**< Echo respond */
+	IPC_TEST_CMD_REBOND,   /**< Unbond and rebond back whole interface */
+	IPC_TEST_CMD_REBOOT,   /**< Restart remote CPU after a given delay */
+	/* Commands used for data transfer test */
+	IPC_TEST_CMD_RXSTART,  /**< Start receiving data */
+	IPC_TEST_CMD_TXSTART,  /**< Start sending data */
+	IPC_TEST_CMD_RXGET,    /**< Get rx status */
+	IPC_TEST_CMD_TXGET,    /**< Get tx status */
+	IPC_TEST_CMD_XSTAT,    /**< rx/tx status response */
+	IPC_TEST_CMD_XDATA,    /**< Transfer data block */
+	/* End of commands used for data transfer test */
+};
+
+/**
+ * @brief Base command structure
+ */
+struct ipc_test_cmd {
+	uint32_t cmd;   /**< The command of @ref ipc_test_command type */
+	uint8_t data[]; /**< Command data depending on the command itself */
+};
+
+/**
+ * @brief Rebond command structure
+ */
+struct ipc_test_cmd_rebond {
+	struct ipc_test_cmd base;
+	uint32_t timeout_ms;
+};
+
+/**
+ * @brief Reboot command structure
+ */
+struct ipc_test_cmd_reboot {
+	struct ipc_test_cmd base;
+	uint32_t timeout_ms;
+};
+
+/**
+ * @brief Start the rx or tx transfer
+ */
+struct ipc_test_cmd_xstart {
+	struct ipc_test_cmd base;
+	uint32_t blk_size;
+	uint32_t blk_cnt;
+	uint32_t seed;
+};
+
+/**
+ * @brief Get the status of rx or tx transfer
+ */
+struct ipc_test_cmd_xstat {
+	struct ipc_test_cmd base;
+	uint32_t blk_cnt; /**< Transfers left */
+	int32_t  result;  /**< Current result */
+};
+
+/**
+ * @brief The result of rx or tx transfer
+ */
+struct ipc_test_cmd_xrsp {
+	struct ipc_test_cmd base;
+	int32_t result;
+};
+
+#endif /* TEST_COMMANDS_H */
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/Kconfig b/tests/subsys/ipc/ipc_sessions/interoperability/Kconfig
new file mode 100644
index 0000000000000..e50f208b15348
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/Kconfig
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config IPC_SERVICE_BACKEND_ICMSG
+	default n if IPC_SERVICE_BACKEND_ICMSG_V1
+
+config IPC_SERVICE_ICMSG
+	default n if IPC_SERVICE_ICMSG_V1
+
+config IPC_SERVICE_BACKEND_ICMSG_V1
+	bool "ICMSG backend with SPSC packet buffer (old implementation)"
+	depends on MBOX
+	select IPC_SERVICE_ICMSG_V1
+	help
+	  Chosing this backend results in single endpoint implementation based
+	  on circular packet buffer.
+
+menuconfig IPC_SERVICE_ICMSG_V1
+	bool "icmsg IPC library (old implementation)"
+	select PBUF_V1
+	help
+	  Icmsg library
+
+if IPC_SERVICE_ICMSG_V1
+	rsource "Kconfig.icmsg_v1"
+endif
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/Kconfig.icmsg_v1 b/tests/subsys/ipc/ipc_sessions/interoperability/Kconfig.icmsg_v1
new file mode 100644
index 0000000000000..463a1a0ad3cea
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/Kconfig.icmsg_v1
@@ -0,0 +1,90 @@
+# Copyright (c) 2022 Nordic Semiconductor (ASA)
+# SPDX-License-Identifier: Apache-2.0
+
+config IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC_V1
+	bool "Synchronize access to shared memory"
+	depends on MULTITHREADING
+	default y
+	help
+	  Provide synchronization access to shared memory at a library level.
+	  This option is enabled by default to allow to use sending API from
+	  multiple contexts. Mutex is used to guard access to the memory.
+	  This option can be safely disabled if an application ensures data
+	  are sent from single context.
+
+config IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS_V1
+	int "Mutex lock timeout in milliseconds"
+	depends on IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC_V1
+	range 1 5
+	default 1
+	help
+	  Maximum time to wait, in milliseconds, for access to send data with
+	  backends basing on icmsg library. This time should be relatively low.
+
+config IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS_V1
+	int "Bond notification timeout in miliseconds"
+	range 1 100
+	default 1
+	help
+	  Time to wait for remote bonding notification before the
+	  notification is repeated.
+
+config IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE_V1
+	bool "Use dedicated workqueue"
+	depends on MULTITHREADING
+	default y
+	help
+	  Enable dedicated workqueue thread for the ICMsg backend.
+	  Disabling this configuration will cause the ICMsg backend to
+	  process incoming data through the system workqueue context, and
+	  therefore reduces the RAM footprint of the backend.
+	  Disabling this config may result in deadlocks in certain usage
+	  scenarios, such as when synchronous IPC is executed from the system
+	  workqueue context.
+	  The callbacks coming from the backend are executed from the workqueue
+	  context.
+	  When the option is disabled, the user must obey the restrictions
+	  imposed by the system workqueue, such as never performing blocking
+	  operations from within the callback.
+
+if IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE_V1
+
+config IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE_V1
+	int "Size of RX work queue stack"
+	default 1280
+	help
+	  Size of stack used by work queue RX thread. This work queue is
+	  created to prevent notifying service users about received data
+	  from the system work queue. The queue is shared among instances.
+
+config IPC_SERVICE_BACKEND_ICMSG_WQ_PRIORITY_V1
+	int "Priority of RX work queue thread"
+	default -1
+	range -256 -1
+	help
+	  Priority of the ICMSG RX work queue thread.
+	  The ICMSG library in its simplicity requires the workqueue to execute
+	  at a cooperative priority.
+
+endif
+
+# The Icmsg library in its simplicity requires the system workqueue to execute
+# at a cooperative priority.
+config SYSTEM_WORKQUEUE_PRIORITY
+	range -256 -1 if !IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE_V1
+
+config PBUF_V1
+	bool "Packed buffer support library (old implementation)"
+	help
+	  The packet buffer implements lightweight unidirectional packet buffer
+	  with read/write semantics on top of a memory region shared by the
+	  reader and writer. It optionally embeds cache and memory barrier
+	  management to ensure correct data access.
+
+if PBUF_V1
+
+config PBUF_RX_READ_BUF_SIZE_V1
+	int "Size of PBUF read buffer in bytes"
+	default 128
+
+endif # PBUF
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/icmsg_v1.c b/tests/subsys/ipc/ipc_sessions/interoperability/icmsg_v1.c
new file mode 100644
index 0000000000000..ae83dd30beb94
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/icmsg_v1.c
@@ -0,0 +1,392 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "icmsg_v1.h"
+
+#include <string.h>
+#include <zephyr/drivers/mbox.h>
+#include <zephyr/sys/atomic.h>
+#include "pbuf_v1.h"
+#include <zephyr/init.h>
+
+#define BOND_NOTIFY_REPEAT_TO	K_MSEC(CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS)
+#define SHMEM_ACCESS_TO		K_MSEC(CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS)
+
+static const uint8_t magic[] = {0x45, 0x6d, 0x31, 0x6c, 0x31, 0x4b,
+				0x30, 0x72, 0x6e, 0x33, 0x6c, 0x69, 0x34};
+
+#ifdef CONFIG_MULTITHREADING
+#if defined(CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE)
+static K_THREAD_STACK_DEFINE(icmsg_stack, CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE);
+static struct k_work_q icmsg_workq;
+static struct k_work_q *const workq = &icmsg_workq;
+#else
+static struct k_work_q *const workq = &k_sys_work_q;
+#endif
+static void mbox_callback_process(struct k_work *item);
+#else
+static void mbox_callback_process(struct icmsg_data_t *dev_data);
+#endif
+
+static int mbox_deinit(const struct icmsg_config_t *conf,
+		       struct icmsg_data_t *dev_data)
+{
+	int err;
+
+	err = mbox_set_enabled_dt(&conf->mbox_rx, 0);
+	if (err != 0) {
+		return err;
+	}
+
+	err = mbox_register_callback_dt(&conf->mbox_rx, NULL, NULL);
+	if (err != 0) {
+		return err;
+	}
+
+#ifdef CONFIG_MULTITHREADING
+	(void)k_work_cancel(&dev_data->mbox_work);
+	(void)k_work_cancel_delayable(&dev_data->notify_work);
+#endif
+
+	return 0;
+}
+
+static bool is_endpoint_ready(struct icmsg_data_t *dev_data)
+{
+	return atomic_get(&dev_data->state) == ICMSG_STATE_READY;
+}
+
+#ifdef CONFIG_MULTITHREADING
+static void notify_process(struct k_work *item)
+{
+	struct k_work_delayable *dwork = k_work_delayable_from_work(item);
+	struct icmsg_data_t *dev_data =
+		CONTAINER_OF(dwork, struct icmsg_data_t, notify_work);
+
+	(void)mbox_send_dt(&dev_data->cfg->mbox_tx, NULL);
+
+	atomic_t state = atomic_get(&dev_data->state);
+
+	if (state != ICMSG_STATE_READY) {
+		int ret;
+
+		ret = k_work_reschedule_for_queue(workq, dwork, BOND_NOTIFY_REPEAT_TO);
+		__ASSERT_NO_MSG(ret >= 0);
+		(void)ret;
+	}
+}
+#else
+static void notify_process(struct icmsg_data_t *dev_data)
+{
+	(void)mbox_send_dt(&dev_data->cfg->mbox_tx, NULL);
+#if defined(CONFIG_SYS_CLOCK_EXISTS)
+	int64_t start = k_uptime_get();
+#endif
+
+	while (false == is_endpoint_ready(dev_data)) {
+		mbox_callback_process(dev_data);
+
+#if defined(CONFIG_SYS_CLOCK_EXISTS)
+		if ((k_uptime_get() - start) > CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS) {
+#endif
+			(void)mbox_send_dt(&dev_data->cfg->mbox_tx, NULL);
+#if defined(CONFIG_SYS_CLOCK_EXISTS)
+			start = k_uptime_get();
+		};
+#endif
+	}
+}
+#endif
+
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
+static int reserve_tx_buffer_if_unused(struct icmsg_data_t *dev_data)
+{
+	int ret = k_mutex_lock(&dev_data->tx_lock, SHMEM_ACCESS_TO);
+
+	if (ret < 0) {
+		return ret;
+	}
+
+	return 0;
+}
+
+static int release_tx_buffer(struct icmsg_data_t *dev_data)
+{
+	return k_mutex_unlock(&dev_data->tx_lock);
+}
+#endif
+
+static uint32_t data_available(struct icmsg_data_t *dev_data)
+{
+	return pbuf_read(dev_data->rx_pb, NULL, 0);
+}
+
+#ifdef CONFIG_MULTITHREADING
+static void submit_mbox_work(struct icmsg_data_t *dev_data)
+{
+	if (k_work_submit_to_queue(workq, &dev_data->mbox_work) < 0) {
+		/* The mbox processing work is never canceled.
+		 * The negative error code should never be seen.
+		 */
+		__ASSERT_NO_MSG(false);
+	}
+}
+
+static void submit_work_if_buffer_free(struct icmsg_data_t *dev_data)
+{
+	submit_mbox_work(dev_data);
+}
+
+static void submit_work_if_buffer_free_and_data_available(
+		struct icmsg_data_t *dev_data)
+{
+	if (!data_available(dev_data)) {
+		return;
+	}
+
+	submit_mbox_work(dev_data);
+}
+#else
+static void submit_if_buffer_free(struct icmsg_data_t *dev_data)
+{
+	mbox_callback_process(dev_data);
+}
+
+static void submit_if_buffer_free_and_data_available(
+		struct icmsg_data_t *dev_data)
+{
+
+	if (!data_available(dev_data)) {
+		return;
+	}
+
+	mbox_callback_process(dev_data);
+}
+#endif
+
+#ifdef CONFIG_MULTITHREADING
+static void mbox_callback_process(struct k_work *item)
+#else
+static void mbox_callback_process(struct icmsg_data_t *dev_data)
+#endif
+{
+#ifdef CONFIG_MULTITHREADING
+	struct icmsg_data_t *dev_data = CONTAINER_OF(item, struct icmsg_data_t, mbox_work);
+#endif
+	uint8_t rx_buffer[CONFIG_PBUF_RX_READ_BUF_SIZE] __aligned(4);
+
+	atomic_t state = atomic_get(&dev_data->state);
+
+	uint32_t len = data_available(dev_data);
+
+	if (len == 0) {
+		/* Unlikely, no data in buffer. */
+		return;
+	}
+
+	__ASSERT_NO_MSG(len <= sizeof(rx_buffer));
+
+	if (sizeof(rx_buffer) < len) {
+		return;
+	}
+
+	len = pbuf_read(dev_data->rx_pb, rx_buffer, sizeof(rx_buffer));
+
+	if (state == ICMSG_STATE_READY) {
+		if (dev_data->cb->received) {
+			dev_data->cb->received(rx_buffer, len, dev_data->ctx);
+		}
+	} else {
+		__ASSERT_NO_MSG(state == ICMSG_STATE_BUSY);
+
+		/* Allow magic number longer than sizeof(magic) for future protocol version. */
+		bool endpoint_invalid = (len < sizeof(magic) ||
+					memcmp(magic, rx_buffer, sizeof(magic)));
+
+		if (endpoint_invalid) {
+			__ASSERT_NO_MSG(false);
+			return;
+		}
+
+		if (dev_data->cb->bound) {
+			dev_data->cb->bound(dev_data->ctx);
+		}
+
+		atomic_set(&dev_data->state, ICMSG_STATE_READY);
+	}
+#ifdef CONFIG_MULTITHREADING
+	submit_work_if_buffer_free_and_data_available(dev_data);
+#else
+	submit_if_buffer_free_and_data_available(dev_data);
+#endif
+}
+
+static void mbox_callback(const struct device *instance, uint32_t channel,
+			  void *user_data, struct mbox_msg *msg_data)
+{
+	struct icmsg_data_t *dev_data = user_data;
+#ifdef CONFIG_MULTITHREADING
+	submit_work_if_buffer_free(dev_data);
+#else
+	submit_if_buffer_free(dev_data);
+#endif
+}
+
+static int mbox_init(const struct icmsg_config_t *conf,
+		     struct icmsg_data_t *dev_data)
+{
+	int err;
+
+#ifdef CONFIG_MULTITHREADING
+	k_work_init(&dev_data->mbox_work, mbox_callback_process);
+	k_work_init_delayable(&dev_data->notify_work, notify_process);
+#endif
+
+	err = mbox_register_callback_dt(&conf->mbox_rx, mbox_callback, dev_data);
+	if (err != 0) {
+		return err;
+	}
+
+	return mbox_set_enabled_dt(&conf->mbox_rx, 1);
+}
+
+int icmsg_open(const struct icmsg_config_t *conf,
+	       struct icmsg_data_t *dev_data,
+	       const struct ipc_service_cb *cb, void *ctx)
+{
+	if (!atomic_cas(&dev_data->state, ICMSG_STATE_OFF, ICMSG_STATE_BUSY)) {
+		/* Already opened. */
+		return -EALREADY;
+	}
+
+	dev_data->cb = cb;
+	dev_data->ctx = ctx;
+	dev_data->cfg = conf;
+
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
+	k_mutex_init(&dev_data->tx_lock);
+#endif
+
+	int ret = pbuf_tx_init(dev_data->tx_pb);
+
+	if (ret < 0) {
+		__ASSERT(false, "Incorrect configuration");
+		return ret;
+	}
+
+	(void)pbuf_rx_init(dev_data->rx_pb);
+
+	ret = pbuf_write(dev_data->tx_pb, magic, sizeof(magic));
+
+	if (ret < 0) {
+		__ASSERT_NO_MSG(false);
+		return ret;
+	}
+
+	if (ret < (int)sizeof(magic)) {
+		__ASSERT_NO_MSG(ret == sizeof(magic));
+		return ret;
+	}
+
+	ret = mbox_init(conf, dev_data);
+	if (ret) {
+		return ret;
+	}
+#ifdef CONFIG_MULTITHREADING
+	ret = k_work_schedule_for_queue(workq, &dev_data->notify_work, K_NO_WAIT);
+	if (ret < 0) {
+		return ret;
+	}
+#else
+	notify_process(dev_data);
+#endif
+	return 0;
+}
+
+int icmsg_close(const struct icmsg_config_t *conf,
+		struct icmsg_data_t *dev_data)
+{
+	int ret;
+
+	ret = mbox_deinit(conf, dev_data);
+	if (ret) {
+		return ret;
+	}
+
+	atomic_set(&dev_data->state, ICMSG_STATE_OFF);
+
+	return 0;
+}
+
+int icmsg_send(const struct icmsg_config_t *conf,
+	       struct icmsg_data_t *dev_data,
+	       const void *msg, size_t len)
+{
+	int ret;
+	int write_ret;
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
+	int release_ret;
+#endif
+	int sent_bytes;
+
+	if (!is_endpoint_ready(dev_data)) {
+		return -EBUSY;
+	}
+
+	/* Empty message is not allowed */
+	if (len == 0) {
+		return -ENODATA;
+	}
+
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
+	ret = reserve_tx_buffer_if_unused(dev_data);
+	if (ret < 0) {
+		return -ENOBUFS;
+	}
+#endif
+
+	write_ret = pbuf_write(dev_data->tx_pb, msg, len);
+
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
+	release_ret = release_tx_buffer(dev_data);
+	__ASSERT_NO_MSG(!release_ret);
+#endif
+
+	if (write_ret < 0) {
+		return write_ret;
+	} else if (write_ret < len) {
+		return -EBADMSG;
+	}
+	sent_bytes = write_ret;
+
+	__ASSERT_NO_MSG(conf->mbox_tx.dev != NULL);
+
+	ret = mbox_send_dt(&conf->mbox_tx, NULL);
+	if (ret) {
+		return ret;
+	}
+
+	return sent_bytes;
+}
+
+#if defined(CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE)
+
+static int work_q_init(void)
+{
+	struct k_work_queue_config cfg = {
+		.name = "icmsg_workq",
+	};
+
+	k_work_queue_start(&icmsg_workq,
+			    icmsg_stack,
+			    K_KERNEL_STACK_SIZEOF(icmsg_stack),
+			    CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_PRIORITY, &cfg);
+	return 0;
+}
+
+SYS_INIT(work_q_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+
+#endif
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/icmsg_v1.h b/tests/subsys/ipc/ipc_sessions/interoperability/icmsg_v1.h
new file mode 100644
index 0000000000000..b0f2849765d2a
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/icmsg_v1.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_IPC_ICMSG_H_
+#define ZEPHYR_INCLUDE_IPC_ICMSG_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/mbox.h>
+#include <zephyr/ipc/ipc_service.h>
+#include "pbuf_v1.h"
+#include <zephyr/sys/atomic.h>
+
+/* Config aliases that prevenets from config collisions: */
+#undef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC_V1
+#define CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC_V1
+#endif
+#undef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS_V1
+#define CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_TO_MS_V1
+#endif
+#undef CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS
+#ifdef CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS_V1
+#define CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS \
+	CONFIG_IPC_SERVICE_ICMSG_BOND_NOTIFY_REPEAT_TO_MS_V1
+#endif
+#undef CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE
+#ifdef CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE_V1
+#define CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_ENABLE_V1
+#endif
+#undef CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE
+#ifdef CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE_V1
+#define CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE \
+	CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE_V1
+#endif
+#undef CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_PRIORITY
+#ifdef CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_PRIORITY_V1
+#define CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_PRIORITY CONFIG_IPC_SERVICE_BACKEND_ICMSG_WQ_PRIORITY_V1
+#endif
+#undef CONFIG_PBUF_RX_READ_BUF_SIZE
+#ifdef CONFIG_PBUF_RX_READ_BUF_SIZE_V1
+#define CONFIG_PBUF_RX_READ_BUF_SIZE CONFIG_PBUF_RX_READ_BUF_SIZE_V1
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Icmsg IPC library API
+ * @defgroup ipc_icmsg_api Icmsg IPC library API
+ * @ingroup ipc
+ * @{
+ */
+
+enum icmsg_state {
+	ICMSG_STATE_OFF,
+	ICMSG_STATE_BUSY,
+	ICMSG_STATE_READY,
+};
+
+struct icmsg_config_t {
+	struct mbox_dt_spec mbox_tx;
+	struct mbox_dt_spec mbox_rx;
+};
+
+struct icmsg_data_t {
+	/* Tx/Rx buffers. */
+	struct pbuf *tx_pb;
+	struct pbuf *rx_pb;
+#ifdef CONFIG_IPC_SERVICE_ICMSG_SHMEM_ACCESS_SYNC
+	struct k_mutex tx_lock;
+#endif
+
+	/* Callbacks for an endpoint. */
+	const struct ipc_service_cb *cb;
+	void *ctx;
+
+	/* General */
+	const struct icmsg_config_t *cfg;
+#ifdef CONFIG_MULTITHREADING
+	struct k_work_delayable notify_work;
+	struct k_work mbox_work;
+#endif
+	atomic_t state;
+};
+
+/** @brief Open an icmsg instance
+ *
+ *  Open an icmsg instance to be able to send and receive messages to a remote
+ *  instance.
+ *  This function is blocking until the handshake with the remote instance is
+ *  completed.
+ *  This function is intended to be called late in the initialization process,
+ *  possibly from a thread which can be safely blocked while handshake with the
+ *  remote instance is being pefromed.
+ *
+ *  @param[in] conf Structure containing configuration parameters for the icmsg
+ *                  instance.
+ *  @param[inout] dev_data Structure containing run-time data used by the icmsg
+ *                         instance.
+ *  @param[in] cb Structure containing callback functions to be called on
+ *                events generated by this icmsg instance. The pointed memory
+ *                must be preserved while the icmsg instance is active.
+ *  @param[in] ctx Pointer to context passed as an argument to callbacks.
+ *
+ *
+ *  @retval 0 on success.
+ *  @retval -EALREADY when the instance is already opened.
+ *  @retval other errno codes from dependent modules.
+ */
+int icmsg_open(const struct icmsg_config_t *conf,
+	       struct icmsg_data_t *dev_data,
+	       const struct ipc_service_cb *cb, void *ctx);
+
+/** @brief Close an icmsg instance
+ *
+ *  Closing an icmsg instance results in releasing all resources used by given
+ *  instance including the shared memory regions and mbox devices.
+ *
+ *  @param[in] conf Structure containing configuration parameters for the icmsg
+ *                  instance being closed. Its content must be the same as used
+ *                  for creating this instance with @ref icmsg_open.
+ *  @param[inout] dev_data Structure containing run-time data used by the icmsg
+ *                         instance.
+ *
+ *  @retval 0 on success.
+ *  @retval other errno codes from dependent modules.
+ */
+int icmsg_close(const struct icmsg_config_t *conf,
+		struct icmsg_data_t *dev_data);
+
+/** @brief Send a message to the remote icmsg instance.
+ *
+ *  @param[in] conf Structure containing configuration parameters for the icmsg
+ *                  instance.
+ *  @param[inout] dev_data Structure containing run-time data used by the icmsg
+ *                         instance.
+ *  @param[in] msg Pointer to a buffer containing data to send.
+ *  @param[in] len Size of data in the @p msg buffer.
+ *
+ *
+ *  @retval Number of sent bytes.
+ *  @retval -EBUSY when the instance has not finished handshake with the remote
+ *                 instance.
+ *  @retval -ENODATA when the requested data to send is empty.
+ *  @retval -EBADMSG when the requested data to send is too big.
+ *  @retval -ENOBUFS when there are no TX buffers available.
+ *  @retval other errno codes from dependent modules.
+ */
+int icmsg_send(const struct icmsg_config_t *conf,
+	       struct icmsg_data_t *dev_data,
+	       const void *msg, size_t len);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_IPC_ICMSG_H_ */
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/ipc_icmsg_v1.c b/tests/subsys/ipc/ipc_sessions/interoperability/ipc_icmsg_v1.c
new file mode 100644
index 0000000000000..4ce003667b052
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/ipc_icmsg_v1.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "ipc_icmsg_v1.h"
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include "icmsg_v1.h"
+
+#include <zephyr/ipc/ipc_service_backend.h>
+
+#define DT_DRV_COMPAT	zephyr_ipc_icmsg
+
+static int register_ept(const struct device *instance, void **token,
+			const struct ipc_ept_cfg *cfg)
+{
+	const struct icmsg_config_t *conf = instance->config;
+	struct icmsg_data_t *dev_data = instance->data;
+
+	/* Only one endpoint is supported. No need for a token. */
+	*token = NULL;
+
+	return icmsg_open(conf, dev_data, &cfg->cb, cfg->priv);
+}
+
+static int deregister_ept(const struct device *instance, void *token)
+{
+	const struct icmsg_config_t *conf = instance->config;
+	struct icmsg_data_t *dev_data = instance->data;
+
+	return icmsg_close(conf, dev_data);
+}
+
+static int send(const struct device *instance, void *token,
+		const void *msg, size_t len)
+{
+	const struct icmsg_config_t *conf = instance->config;
+	struct icmsg_data_t *dev_data = instance->data;
+
+	return icmsg_send(conf, dev_data, msg, len);
+}
+
+const static struct ipc_service_backend backend_ops = {
+	.register_endpoint = register_ept,
+	.deregister_endpoint = deregister_ept,
+	.send = send,
+};
+
+static int backend_init(const struct device *instance)
+{
+	return 0;
+}
+
+#define DEFINE_BACKEND_DEVICE(i)					\
+	static const struct icmsg_config_t backend_config_##i = {	\
+		.mbox_tx = MBOX_DT_SPEC_INST_GET(i, tx),		\
+		.mbox_rx = MBOX_DT_SPEC_INST_GET(i, rx),		\
+	};								\
+									\
+	PBUF_DEFINE(tx_pb_##i,						\
+			DT_REG_ADDR(DT_INST_PHANDLE(i, tx_region)),	\
+			DT_REG_SIZE(DT_INST_PHANDLE(i, tx_region)),	\
+			DT_INST_PROP_OR(i, dcache_alignment, 0));	\
+	PBUF_DEFINE(rx_pb_##i,						\
+			DT_REG_ADDR(DT_INST_PHANDLE(i, rx_region)),	\
+			DT_REG_SIZE(DT_INST_PHANDLE(i, rx_region)),	\
+			DT_INST_PROP_OR(i, dcache_alignment, 0));	\
+									\
+	static struct icmsg_data_t backend_data_##i = {			\
+		.tx_pb = &tx_pb_##i,					\
+		.rx_pb = &rx_pb_##i,					\
+	};								\
+									\
+	DEVICE_DT_INST_DEFINE(i,					\
+			 &backend_init,					\
+			 NULL,						\
+			 &backend_data_##i,				\
+			 &backend_config_##i,				\
+			 POST_KERNEL,					\
+			 CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,	\
+			 &backend_ops);
+
+DT_INST_FOREACH_STATUS_OKAY(DEFINE_BACKEND_DEVICE)
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/ipc_icmsg_v1.h b/tests/subsys/ipc/ipc_sessions/interoperability/ipc_icmsg_v1.h
new file mode 100644
index 0000000000000..5407ea3e2e8c4
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/ipc_icmsg_v1.h
@@ -0,0 +1,5 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/pbuf_v1.c b/tests/subsys/ipc/ipc_sessions/interoperability/pbuf_v1.c
new file mode 100644
index 0000000000000..7c72098af1d7d
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/pbuf_v1.c
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <string.h>
+#include <errno.h>
+#include <zephyr/cache.h>
+#include "pbuf_v1.h"
+#include <zephyr/sys/byteorder.h>
+
+#if defined(CONFIG_ARCH_POSIX)
+#include <soc.h>
+#endif
+
+/* Helper funciton for getting number of bytes being written to the buffer. */
+static uint32_t idx_occupied(uint32_t len, uint32_t wr_idx, uint32_t rd_idx)
+{
+	/* It is implicitly assumed wr_idx and rd_idx cannot differ by more then len. */
+	return (rd_idx > wr_idx) ? (len - (rd_idx - wr_idx)) : (wr_idx - rd_idx);
+}
+
+/* Helper function for wrapping the index from the begging if above buffer len. */
+static uint32_t idx_wrap(uint32_t len, uint32_t idx)
+{
+	return (idx >= len) ? (idx % len) : (idx);
+}
+
+static int validate_cfg(const struct pbuf_cfg *cfg)
+{
+	/* Validate pointers. */
+	if (!cfg || !cfg->rd_idx_loc || !cfg->wr_idx_loc || !cfg->data_loc) {
+		return -EINVAL;
+	}
+
+	/* Validate pointer alignment. */
+	if (!IS_PTR_ALIGNED_BYTES(cfg->rd_idx_loc, MAX(cfg->dcache_alignment, _PBUF_IDX_SIZE)) ||
+	    !IS_PTR_ALIGNED_BYTES(cfg->wr_idx_loc, MAX(cfg->dcache_alignment, _PBUF_IDX_SIZE)) ||
+	    !IS_PTR_ALIGNED_BYTES(cfg->data_loc, _PBUF_IDX_SIZE)) {
+		return -EINVAL;
+	}
+
+	/* Validate len. */
+	if (cfg->len < _PBUF_MIN_DATA_LEN || !IS_PTR_ALIGNED_BYTES(cfg->len, _PBUF_IDX_SIZE)) {
+		return -EINVAL;
+	}
+
+	/* Validate pointer values. */
+	if (!(cfg->rd_idx_loc < cfg->wr_idx_loc) ||
+	    !((uint8_t *)cfg->wr_idx_loc < cfg->data_loc) ||
+	    !(((uint8_t *)cfg->rd_idx_loc + MAX(_PBUF_IDX_SIZE, cfg->dcache_alignment)) ==
+	    (uint8_t *)cfg->wr_idx_loc)) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+#if defined(CONFIG_ARCH_POSIX)
+void pbuf_native_addr_remap(struct pbuf *pb)
+{
+	native_emb_addr_remap((void **)&pb->cfg->rd_idx_loc);
+	native_emb_addr_remap((void **)&pb->cfg->wr_idx_loc);
+	native_emb_addr_remap((void **)&pb->cfg->data_loc);
+}
+#endif
+
+int pbuf_tx_init(struct pbuf *pb)
+{
+	if (validate_cfg(pb->cfg) != 0) {
+		return -EINVAL;
+	}
+#if defined(CONFIG_ARCH_POSIX)
+	pbuf_native_addr_remap(pb);
+#endif
+
+	/* Initialize local copy of indexes. */
+	pb->data.wr_idx = 0;
+	pb->data.rd_idx = 0;
+
+	/* Clear shared memory. */
+	*(pb->cfg->wr_idx_loc) = pb->data.wr_idx;
+	*(pb->cfg->rd_idx_loc) = pb->data.rd_idx;
+
+	__sync_synchronize();
+
+	/* Take care cache. */
+	sys_cache_data_flush_range((void *)(pb->cfg->wr_idx_loc), sizeof(*(pb->cfg->wr_idx_loc)));
+	sys_cache_data_flush_range((void *)(pb->cfg->rd_idx_loc), sizeof(*(pb->cfg->rd_idx_loc)));
+
+	return 0;
+}
+
+int pbuf_rx_init(struct pbuf *pb)
+{
+	if (validate_cfg(pb->cfg) != 0) {
+		return -EINVAL;
+	}
+#if defined(CONFIG_ARCH_POSIX)
+	pbuf_native_addr_remap(pb);
+#endif
+
+	/* Initialize local copy of indexes. */
+	pb->data.wr_idx = 0;
+	pb->data.rd_idx = 0;
+
+	return 0;
+}
+
+int pbuf_write(struct pbuf *pb, const char *data, uint16_t len)
+{
+	if (pb == NULL || len == 0 || data == NULL) {
+		/* Incorrect call. */
+		return -EINVAL;
+	}
+
+	/* Invalidate rd_idx only, local wr_idx is used to increase buffer security. */
+	sys_cache_data_invd_range((void *)(pb->cfg->rd_idx_loc), sizeof(*(pb->cfg->rd_idx_loc)));
+	__sync_synchronize();
+
+	uint8_t *const data_loc = pb->cfg->data_loc;
+	const uint32_t blen = pb->cfg->len;
+	uint32_t rd_idx = *(pb->cfg->rd_idx_loc);
+	uint32_t wr_idx = pb->data.wr_idx;
+
+	/* wr_idx must always be aligned. */
+	__ASSERT_NO_MSG(IS_PTR_ALIGNED_BYTES(wr_idx, _PBUF_IDX_SIZE));
+	/* rd_idx shall always be aligned, but its value is received from the reader.
+	 * Can not assert.
+	 */
+	if (!IS_PTR_ALIGNED_BYTES(rd_idx, _PBUF_IDX_SIZE)) {
+		return -EINVAL;
+	}
+
+	uint32_t free_space = blen - idx_occupied(blen, wr_idx, rd_idx) - _PBUF_IDX_SIZE;
+
+	/* Packet length, data + packet length size. */
+	uint32_t plen = len + PBUF_PACKET_LEN_SZ;
+
+	/* Check if packet will fit into the buffer. */
+	if (free_space < plen) {
+		return -ENOMEM;
+	}
+
+	/* Clear packet len with zeros and update. Clearing is done for possible versioning in the
+	 * future. Writing is allowed now, because shared wr_idx value is updated at the very end.
+	 */
+	*((uint32_t *)(&data_loc[wr_idx])) = 0;
+	sys_put_be16(len, &data_loc[wr_idx]);
+	__sync_synchronize();
+	sys_cache_data_flush_range(&data_loc[wr_idx], PBUF_PACKET_LEN_SZ);
+
+	wr_idx = idx_wrap(blen, wr_idx + PBUF_PACKET_LEN_SZ);
+
+	/* Write until end of the buffer, if data will be wrapped. */
+	uint32_t tail = MIN(len, blen - wr_idx);
+
+	memcpy(&data_loc[wr_idx], data, tail);
+	sys_cache_data_flush_range(&data_loc[wr_idx], tail);
+
+	if (len > tail) {
+		/* Copy remaining data to buffer front. */
+		memcpy(&data_loc[0], data + tail, len - tail);
+		sys_cache_data_flush_range(&data_loc[0], len - tail);
+	}
+
+	wr_idx = idx_wrap(blen, ROUND_UP(wr_idx + len, _PBUF_IDX_SIZE));
+	/* Update wr_idx. */
+	pb->data.wr_idx = wr_idx;
+	*(pb->cfg->wr_idx_loc) = wr_idx;
+	__sync_synchronize();
+	sys_cache_data_flush_range((void *)pb->cfg->wr_idx_loc, sizeof(*(pb->cfg->wr_idx_loc)));
+
+	return len;
+}
+
+int pbuf_read(struct pbuf *pb, char *buf, uint16_t len)
+{
+	if (pb == NULL) {
+		/* Incorrect call. */
+		return -EINVAL;
+	}
+
+	/* Invalidate wr_idx only, local rd_idx is used to increase buffer security. */
+	sys_cache_data_invd_range((void *)(pb->cfg->wr_idx_loc), sizeof(*(pb->cfg->wr_idx_loc)));
+	__sync_synchronize();
+
+	uint8_t *const data_loc = pb->cfg->data_loc;
+	const uint32_t blen = pb->cfg->len;
+	uint32_t wr_idx = *(pb->cfg->wr_idx_loc);
+	uint32_t rd_idx = pb->data.rd_idx;
+
+	/* rd_idx must always be aligned. */
+	__ASSERT_NO_MSG(IS_PTR_ALIGNED_BYTES(rd_idx, _PBUF_IDX_SIZE));
+	/* wr_idx shall always be aligned, but its value is received from the
+	 * writer. Can not assert.
+	 */
+	if (!IS_PTR_ALIGNED_BYTES(wr_idx, _PBUF_IDX_SIZE)) {
+		return -EINVAL;
+	}
+
+	if (rd_idx == wr_idx) {
+		/* Buffer is empty. */
+		return 0;
+	}
+
+	/* Get packet len.*/
+	sys_cache_data_invd_range(&data_loc[rd_idx], PBUF_PACKET_LEN_SZ);
+	uint16_t plen = sys_get_be16(&data_loc[rd_idx]);
+
+	if (!buf) {
+		return (int)plen;
+	}
+
+	if (plen > len) {
+		return -ENOMEM;
+	}
+
+	uint32_t occupied_space = idx_occupied(blen, wr_idx, rd_idx);
+
+	if (occupied_space < plen + PBUF_PACKET_LEN_SZ) {
+		/* This should never happen. */
+		return -EAGAIN;
+	}
+
+	rd_idx = idx_wrap(blen, rd_idx + PBUF_PACKET_LEN_SZ);
+
+	/* Packet will fit into provided buffer, truncate len if provided len
+	 * is bigger than necessary.
+	 */
+	len = MIN(plen, len);
+
+	/* Read until end of the buffer, if data are wrapped. */
+	uint32_t tail = MIN(blen - rd_idx, len);
+
+	sys_cache_data_invd_range(&data_loc[rd_idx], tail);
+	memcpy(buf, &data_loc[rd_idx], tail);
+
+	if (len > tail) {
+		sys_cache_data_invd_range(&data_loc[0], len - tail);
+		memcpy(&buf[tail], &pb->cfg->data_loc[0], len - tail);
+	}
+
+	/* Update rd_idx. */
+	rd_idx = idx_wrap(blen, ROUND_UP(rd_idx + len, _PBUF_IDX_SIZE));
+
+	pb->data.rd_idx = rd_idx;
+	*(pb->cfg->rd_idx_loc) = rd_idx;
+	__sync_synchronize();
+	sys_cache_data_flush_range((void *)pb->cfg->rd_idx_loc, sizeof(*(pb->cfg->rd_idx_loc)));
+
+	return len;
+}
diff --git a/tests/subsys/ipc/ipc_sessions/interoperability/pbuf_v1.h b/tests/subsys/ipc/ipc_sessions/interoperability/pbuf_v1.h
new file mode 100644
index 0000000000000..8783cdbbf1465
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/interoperability/pbuf_v1.h
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_IPC_PBUF_H_
+#define ZEPHYR_INCLUDE_IPC_PBUF_H_
+
+#include <zephyr/cache.h>
+#include <zephyr/devicetree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Packed buffer API
+ * @defgroup pbuf Packed Buffer API
+ * @ingroup ipc
+ * @{
+ */
+
+/** @brief Size of packet length field. */
+#define PBUF_PACKET_LEN_SZ sizeof(uint32_t)
+
+/* Amount of data that is left unused to distinguish between empty and full. */
+#define _PBUF_IDX_SIZE sizeof(uint32_t)
+
+/* Minimal length of the data field in the buffer to store the smalest packet
+ * possible.
+ * (+1) for at least one byte of data.
+ * (+_PBUF_IDX_SIZE) to distinguish buffer full and buffer empty.
+ * Rounded up to keep wr/rd indexes pointing to aligned address.
+ */
+#define _PBUF_MIN_DATA_LEN ROUND_UP(PBUF_PACKET_LEN_SZ + 1 + _PBUF_IDX_SIZE, _PBUF_IDX_SIZE)
+
+#if defined(CONFIG_ARCH_POSIX)
+/* For the native simulated boards we need to modify some pointers at init */
+#define PBUF_MAYBE_CONST
+#else
+#define PBUF_MAYBE_CONST const
+#endif
+
+/** @brief Control block of packet buffer.
+ *
+ * The structure contains configuration data.
+ */
+struct pbuf_cfg {
+	volatile uint32_t *rd_idx_loc;	/* Address of the variable holding
+					 * index value of the first valid byte
+					 * in data[].
+					 */
+	volatile uint32_t *wr_idx_loc;	/* Address of the variable holding
+					 * index value of the first free byte
+					 * in data[].
+					 */
+	uint32_t dcache_alignment;	/* CPU data cache line size in bytes.
+					 * Used for validation - TODO: To be
+					 * replaced by flags.
+					 */
+	uint32_t len;			/* Length of data[] in bytes. */
+	uint8_t *data_loc;		/* Location of the data[]. */
+};
+
+/**
+ * @brief Data block of the packed buffer.
+ *
+ * The structure contains local copies of wr and rd indexes used by writer and
+ * reader respectively.
+ */
+struct pbuf_data {
+	volatile uint32_t wr_idx;	/* Index of the first holding first
+					 * free byte in data[]. Used for
+					 * writing.
+					 */
+	volatile uint32_t rd_idx;	/* Index of the first holding first
+					 * valid byte in data[]. Used for
+					 * reading.
+					 */
+};
+
+
+/**
+ * @brief Scure packed buffer.
+ *
+ * The packet buffer implements lightweight unidirectional packet
+ * buffer with read/write semantics on top of a memory region shared
+ * by the reader and writer. It embeds cache and memory barrier management to
+ * ensure correct data access.
+ *
+ * This structure supports single writer and reader. Data stored in the buffer
+ * is encapsulated to a message (with length header). The read/write API is
+ * written in a way to protect the data from being corrupted.
+ */
+struct pbuf {
+	PBUF_MAYBE_CONST struct pbuf_cfg *const cfg; /* Configuration of the
+						      * buffer.
+						      */
+	struct pbuf_data data;			/* Data used to read and write
+						 * to the buffer
+						 */
+};
+
+/**
+ * @brief Macro for configuration initialization.
+ *
+ * It is recommended to use this macro to initialize packed buffer
+ * configuration.
+ *
+ * @param mem_addr	Memory address for pbuf.
+ * @param size		Size of the memory.
+ * @param dcache_align	Data cache alignment.
+ */
+#define PBUF_CFG_INIT(mem_addr, size, dcache_align)					\
+{											\
+	.rd_idx_loc = (uint32_t *)(mem_addr),						\
+	.wr_idx_loc = (uint32_t *)((uint8_t *)(mem_addr) +				\
+				MAX(dcache_align, _PBUF_IDX_SIZE)),			\
+	.data_loc = (uint8_t *)((uint8_t *)(mem_addr) +					\
+				MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE),	\
+	.len = (uint32_t)((uint32_t)(size) - MAX(dcache_align, _PBUF_IDX_SIZE) -	\
+				_PBUF_IDX_SIZE),					\
+	.dcache_alignment = (dcache_align),						\
+}
+
+/**
+ * @brief Macro calculates memory overhead taken by the header in shared memory.
+ *
+ * It contains the read index, write index and padding.
+ *
+ * @param dcache_align	Data cache alignment.
+ */
+#define PBUF_HEADER_OVERHEAD(dcache_align) \
+	(MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE)
+
+/**
+ * @brief Statically define and initialize pbuf.
+ *
+ * @param name			Name of the pbuf.
+ * @param mem_addr		Memory address for pbuf.
+ * @param size			Size of the memory.
+ * @param dcache_align	Data cache line size.
+ */
+#define PBUF_DEFINE(name, mem_addr, size, dcache_align)					\
+	BUILD_ASSERT(dcache_align >= 0,							\
+			"Cache line size must be non negative.");			\
+	BUILD_ASSERT((size) > 0 && IS_PTR_ALIGNED_BYTES(size, _PBUF_IDX_SIZE),		\
+			"Incorrect size.");						\
+	BUILD_ASSERT(IS_PTR_ALIGNED_BYTES(mem_addr, MAX(dcache_align, _PBUF_IDX_SIZE)),	\
+			"Misaligned memory.");						\
+	BUILD_ASSERT(size >= (MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE +	\
+			_PBUF_MIN_DATA_LEN), "Insufficient size.");			\
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg_##name =				\
+			PBUF_CFG_INIT(mem_addr, size, dcache_align);			\
+	static struct pbuf name = {							\
+		.cfg = &cfg_##name,							\
+	}
+
+/**
+ * @brief Initialize the Tx packet buffer.
+ *
+ * This function initializes the Tx packet buffer based on provided configuration.
+ * If the configuration is incorrect, the function will return error.
+ *
+ * It is recommended to use PBUF_DEFINE macro for build time initialization.
+ *
+ * @param pb	Pointer to the packed buffer containing
+ *		configuration and data. Configuration has to be
+ *		fixed before the initialization.
+ * @retval 0 on success.
+ * @retval -EINVAL when the input parameter is incorrect.
+ */
+int pbuf_tx_init(struct pbuf *pb);
+
+/**
+ * @brief Initialize the Rx packet buffer.
+ *
+ * This function initializes the Rx packet buffer.
+ * If the configuration is incorrect, the function will return error.
+ *
+ * It is recommended to use PBUF_DEFINE macro for build time initialization.
+ *
+ * @param pb	Pointer to the packed buffer containing
+ *		configuration and data. Configuration has to be
+ *		fixed before the initialization.
+ * @retval 0 on success.
+ * @retval -EINVAL when the input parameter is incorrect.
+ */
+int pbuf_rx_init(struct pbuf *pb);
+
+/**
+ * @brief Write specified amount of data to the packet buffer.
+ *
+ * This function call writes specified amount of data to the packet buffer if
+ * the buffer will fit the data.
+ *
+ * @param pb	A buffer to which to write.
+ * @param buf	Pointer to the data to be written to the buffer.
+ * @param len	Number of bytes to be written to the buffer. Must be positive.
+ * @retval int	Number of bytes written, negative error code on fail.
+ *		-EINVAL, if any of input parameter is incorrect.
+ *		-ENOMEM, if len is bigger than the buffer can fit.
+ */
+
+int pbuf_write(struct pbuf *pb, const char *buf, uint16_t len);
+
+/**
+ * @brief Read specified amount of data from the packet buffer.
+ *
+ * Single read allows to read the message send by the single write.
+ * The provided %p buf must be big enough to store the whole message.
+ *
+ * @param pb	A buffer from which data will be read.
+ * @param buf	Data pointer to which read data will be written.
+ *		If NULL, len of stored message is returned.
+ * @param len	Number of bytes to be read from the buffer.
+ * @retval int	Bytes read, negative error code on fail.
+ *		Bytes to be read, if buf == NULL.
+ *		-EINVAL, if any of input parameter is incorrect.
+ *		-ENOMEM, if message can not fit in provided buf.
+ *		-EAGAIN, if not whole message is ready yet.
+ */
+int pbuf_read(struct pbuf *pb, char *buf, uint16_t len);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_IPC_PBUF_H_ */
diff --git a/tests/subsys/ipc/ipc_sessions/prj.conf b/tests/subsys/ipc/ipc_sessions/prj.conf
new file mode 100644
index 0000000000000..7c1cdabe0ec37
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/prj.conf
@@ -0,0 +1,9 @@
+# Copyright 2021 Carlo Caione <ccaione@baylibre.com>
+# SPDX-License-Identifier: Apache-2.0
+
+# We need rand_r function
+CONFIG_GNU_C_EXTENSIONS=y
+
+CONFIG_ZTEST=y
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
diff --git a/tests/subsys/ipc/ipc_sessions/remote/CMakeLists.txt b/tests/subsys/ipc/ipc_sessions/remote/CMakeLists.txt
new file mode 100644
index 0000000000000..1fa2d9c278be0
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(remote_icmsg)
+
+zephyr_include_directories(../common)
+
+FILE(GLOB remote_sources src/*.c)
+target_sources(app PRIVATE ${remote_sources})
+
+zephyr_sources_ifdef(CONFIG_IPC_SERVICE_ICMSG_V1		../interoperability/icmsg_v1.c)
+zephyr_sources_ifdef(CONFIG_PBUF_V1				../interoperability/pbuf_v1.c)
+zephyr_sources_ifdef(CONFIG_IPC_SERVICE_BACKEND_ICMSG_V1	../interoperability/ipc_icmsg_v1.c)
diff --git a/tests/subsys/ipc/ipc_sessions/remote/Kconfig b/tests/subsys/ipc/ipc_sessions/remote/Kconfig
new file mode 100644
index 0000000000000..169ab615a2066
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/Kconfig
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+rsource "../interoperability/Kconfig"
+
+menu "Zephyr"
+source "Kconfig.zephyr"
+endmenu
diff --git a/tests/subsys/ipc/ipc_sessions/remote/boards/nrf5340dk_nrf5340_cpunet.overlay b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf5340dk_nrf5340_cpunet.overlay
new file mode 100644
index 0000000000000..95dffe367e4d5
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf5340dk_nrf5340_cpunet.overlay
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &ipc0;
+
+/ {
+	 chosen {
+		 /delete-property/ zephyr,ipc_shm;
+	 };
+
+	 reserved-memory {
+		 /delete-node/ memory@20070000;
+
+		 sram_rx: memory@20070000 {
+			 reg = <0x20070000 0x8000>;
+		 };
+
+		 sram_tx: memory@20078000 {
+			 reg = <0x20078000 0x8000>;
+		 };
+	 };
+
+	 ipc0: ipc0 {
+		 compatible = "zephyr,ipc-icmsg";
+		 tx-region = <&sram_tx>;
+		 rx-region = <&sram_rx>;
+		 mboxes = <&mbox 0>, <&mbox 1>;
+		 mbox-names = "rx", "tx";
+		 dcache-alignment = <8>;
+		 unbound = "detect";
+		 status = "okay";
+	 };
+};
diff --git a/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpuppr.conf b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpuppr.conf
new file mode 100644
index 0000000000000..80e211dcedd2e
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpuppr.conf
@@ -0,0 +1 @@
+CONFIG_WATCHDOG=y
diff --git a/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
new file mode 100644
index 0000000000000..5728b0a1f32a7
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpuppr.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+ipc0: &cpuapp_cpuppr_ipc {
+	status = "okay";
+	unbound = "detect";
+};
+
+&cpuppr_vevif {
+	status = "okay";
+};
+
+&cpuapp_bellboard {
+	status = "okay";
+};
+
+&wdt131 {
+	status = "okay";
+};
+
+/ {
+	chosen {
+		/delete-property/ zephyr,bt-hci;
+	};
+
+	aliases {
+		watchdog0 = &wdt131;
+	};
+};
diff --git a/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 0000000000000..00e376b5df862
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&uart135 {
+	/delete-property/ hw-flow-control;
+};
+
+&ipc0 {
+	compatible = "zephyr,ipc-icmsg";
+	/delete-property/ tx-blocks;
+	/delete-property/ rx-blocks;
+	unbound = "enable";
+};
diff --git a/tests/subsys/ipc/ipc_sessions/remote/prj.conf b/tests/subsys/ipc/ipc_sessions/remote/prj.conf
new file mode 100644
index 0000000000000..78730ee7dd593
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/prj.conf
@@ -0,0 +1,23 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# We need rand_r function
+CONFIG_GNU_C_EXTENSIONS=y
+CONFIG_PRINTK=y
+CONFIG_EVENTS=y
+
+CONFIG_LOG=y
+CONFIG_LOG_ALWAYS_RUNTIME=y
+CONFIG_LOG_MODE_MINIMAL=y
+#CONFIG_LOG_PROCESS_THREAD_PRIORITY=-15
+#CONFIG_LOG_PROCESS_THREAD_CUSTOM_PRIORITY=y
+
+CONFIG_HEAP_MEM_POOL_SIZE=2048
+
+CONFIG_IPC_SERVICE=y
+CONFIG_IPC_SERVICE_LOG_LEVEL_INF=y
+
+CONFIG_MBOX=y
+CONFIG_WATCHDOG=y
+
+CONFIG_REBOOT=y
diff --git a/tests/subsys/ipc/ipc_sessions/remote/src/remote.c b/tests/subsys/ipc/ipc_sessions/remote/src/remote.c
new file mode 100644
index 0000000000000..dd2b845587aef
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/remote/src/remote.c
@@ -0,0 +1,452 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdlib.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/ipc/ipc_service.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/sys/reboot.h>
+
+#include <test_commands.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(remote, LOG_LEVEL_INF);
+
+#define IPC_TEST_EV_REBOND 0x01
+#define IPC_TEST_EV_BOND   0x02
+#define IPC_TEST_EV_TXTEST 0x04
+
+static const struct device *ipc0_instance = DEVICE_DT_GET(DT_NODELABEL(ipc0));
+static volatile bool ipc0_bounded;
+K_SEM_DEFINE(bound_sem, 0, 1);
+K_EVENT_DEFINE(ipc_ev_req);
+
+struct ipc_xfer_params {
+	uint32_t blk_size;
+	uint32_t blk_cnt;
+	unsigned int seed;
+	int result;
+};
+
+static struct ipc_xfer_params ipc_rx_params;
+static struct ipc_xfer_params ipc_tx_params;
+
+static struct k_timer timer_reboot;
+static struct k_timer timer_rebond;
+
+static void ep_bound(void *priv);
+static void ep_unbound(void *priv);
+static void ep_recv(const void *data, size_t len, void *priv);
+static void ep_error(const char *message, void *priv);
+
+static struct ipc_ept_cfg ep_cfg = {
+	.cb = {
+		.bound = ep_bound,
+		.unbound = ep_unbound,
+		.received = ep_recv,
+		.error = ep_error
+	},
+};
+
+/**
+ * @brief Trying to reset by WDT
+ *
+ * @note If this function return, it means it fails
+ */
+static int reboot_by_wdt(void)
+{
+	int err;
+	static const struct device *const wdt =
+		COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(DT_ALIAS(watchdog0)),
+			    (DEVICE_DT_GET(DT_ALIAS(watchdog0))), (NULL));
+	static const struct wdt_timeout_cfg m_cfg_wdt = {
+		.callback = NULL,
+		.flags = WDT_FLAG_RESET_SOC,
+		.window.max = 10,
+	};
+	static const uint8_t wdt_options[] = {
+		WDT_OPT_PAUSE_HALTED_BY_DBG | WDT_OPT_PAUSE_IN_SLEEP,
+		WDT_OPT_PAUSE_IN_SLEEP,
+		0
+	};
+
+	if (!wdt) {
+		return -ENOTSUP;
+	}
+
+	if (!device_is_ready(wdt)) {
+		LOG_ERR("WDT device is not ready");
+		return -EIO;
+	}
+
+	err = wdt_install_timeout(wdt, &m_cfg_wdt);
+	if (err < 0) {
+		LOG_ERR("WDT install error");
+		return -EIO;
+	}
+
+	for (size_t i = 0; i < ARRAY_SIZE(wdt_options); ++i) {
+		err = wdt_setup(wdt, wdt_options[i]);
+		if (err < 0) {
+			LOG_ERR("Failed WDT setup with options = %u", wdt_options[i]);
+		} else {
+			/* We are ok with the configuration:
+			 * just wait for the WDT to trigger
+			 */
+			for (;;) {
+				k_cpu_idle();
+			}
+		}
+	}
+
+	return -EIO;
+}
+
+/**
+ * @brief Just force to reboot, anyway you find possible
+ */
+FUNC_NORETURN static void reboot_anyway(void)
+{
+	reboot_by_wdt();
+	/* If WDT restart fails - try another way */
+	sys_reboot(SYS_REBOOT_COLD);
+}
+
+static void ep_bound(void *priv)
+{
+	ipc0_bounded = true;
+	k_sem_give(&bound_sem);
+
+	LOG_INF("Endpoint bounded");
+}
+
+static void ep_unbound(void *priv)
+{
+	ipc0_bounded = false;
+	k_sem_give(&bound_sem);
+
+	LOG_INF("Endpoint unbounded");
+
+	/* Try to restore the connection */
+	k_event_set(&ipc_ev_req, IPC_TEST_EV_BOND);
+}
+
+static void ep_recv(const void *data, size_t len, void *priv)
+{
+	int ret;
+	const struct ipc_test_cmd *cmd = data;
+	struct ipc_ept *ep = priv;
+
+	if (len < sizeof(struct ipc_test_cmd)) {
+		LOG_ERR("The unexpected size of received data: %u < %u", len,
+			sizeof(struct ipc_test_cmd));
+		/* Dropping further processing */
+		return;
+	}
+
+	switch (cmd->cmd) {
+	case IPC_TEST_CMD_NONE:
+		LOG_INF("Command processing: NONE");
+		/* Ignore */
+		break;
+	case IPC_TEST_CMD_PING: {
+		LOG_INF("Command processing: PING");
+
+		static const struct ipc_test_cmd cmd_pong = {IPC_TEST_CMD_PONG};
+
+		ret = ipc_service_send(ep, &cmd_pong, sizeof(cmd_pong));
+		if (ret < 0) {
+			LOG_ERR("PONG response failed: %d", ret);
+		}
+		break;
+	}
+	case IPC_TEST_CMD_ECHO: {
+		LOG_INF("Command processing: ECHO");
+
+		struct ipc_test_cmd *cmd_rsp = k_malloc(len);
+
+		if (!cmd_rsp) {
+			LOG_ERR("ECHO response failed: memory allocation");
+			break;
+		}
+
+		cmd_rsp->cmd = IPC_TEST_CMD_ECHO_RSP;
+		memcpy(cmd_rsp->data, cmd->data, len - sizeof(struct ipc_test_cmd));
+		ret = ipc_service_send(ep, cmd_rsp, len);
+		k_free(cmd_rsp);
+		if (ret < 0) {
+			LOG_ERR("ECHO response failed: %d", ret);
+		}
+		break;
+	}
+	case IPC_TEST_CMD_REBOND: {
+		LOG_INF("Command processing: REBOOT");
+
+		struct ipc_test_cmd_rebond *cmd_rebond = (struct ipc_test_cmd_rebond *)cmd;
+
+		k_timer_start(&timer_rebond, K_MSEC(cmd_rebond->timeout_ms), K_FOREVER);
+		break;
+	}
+	case IPC_TEST_CMD_REBOOT: {
+		LOG_INF("Command processing: REBOOT");
+
+		struct ipc_test_cmd_reboot *cmd_reboot = (struct ipc_test_cmd_reboot *)cmd;
+
+		k_timer_start(&timer_reboot, K_MSEC(cmd_reboot->timeout_ms), K_FOREVER);
+		break;
+	}
+	case IPC_TEST_CMD_RXSTART: {
+		LOG_INF("Command processing: RXSTART");
+
+		struct ipc_test_cmd_xstart *cmd_rxstart = (struct ipc_test_cmd_xstart *)cmd;
+
+		ipc_rx_params.blk_size = cmd_rxstart->blk_size;
+		ipc_rx_params.blk_cnt = cmd_rxstart->blk_cnt;
+		ipc_rx_params.seed = cmd_rxstart->seed;
+		ipc_rx_params.result = 0;
+		break;
+	}
+	case IPC_TEST_CMD_TXSTART: {
+		LOG_INF("Command processing: TXSTART");
+
+		struct ipc_test_cmd_xstart *cmd_txstart = (struct ipc_test_cmd_xstart *)cmd;
+
+		ipc_tx_params.blk_size = cmd_txstart->blk_size;
+		ipc_tx_params.blk_cnt = cmd_txstart->blk_cnt;
+		ipc_tx_params.seed = cmd_txstart->seed;
+		ipc_tx_params.result = 0;
+		k_event_set(&ipc_ev_req, IPC_TEST_EV_TXTEST);
+		break;
+	}
+	case IPC_TEST_CMD_RXGET: {
+		LOG_INF("Command processing: RXGET");
+
+		int ret;
+		struct ipc_test_cmd_xstat cmd_stat = {
+			.base.cmd = IPC_TEST_CMD_XSTAT,
+			.blk_cnt = ipc_rx_params.blk_cnt,
+			.result = ipc_rx_params.result
+		};
+
+		ret = ipc_service_send(ep, &cmd_stat, sizeof(cmd_stat));
+		if (ret < 0) {
+			LOG_ERR("RXGET response send failed");
+		}
+		break;
+	}
+	case IPC_TEST_CMD_TXGET: {
+		LOG_INF("Command processing: TXGET");
+
+		int ret;
+		struct ipc_test_cmd_xstat cmd_stat = {
+			.base.cmd = IPC_TEST_CMD_XSTAT,
+			.blk_cnt = ipc_tx_params.blk_cnt,
+			.result = ipc_tx_params.result
+		};
+
+		ret = ipc_service_send(ep, &cmd_stat, sizeof(cmd_stat));
+		if (ret < 0) {
+			LOG_ERR("TXGET response send failed");
+		}
+		break;
+	}
+	case IPC_TEST_CMD_XDATA: {
+		if ((ipc_rx_params.blk_cnt % 1000) == 0) {
+			/* Logging only every N-th command not to slowdown the transfer too much */
+			LOG_INF("Command processing: XDATA (left: %u)", ipc_rx_params.blk_cnt);
+		}
+
+		/* Ignore if there is an error */
+		if (ipc_rx_params.result) {
+			LOG_ERR("There is error in Rx transfer already");
+			break;
+		}
+
+		if (len != ipc_rx_params.blk_size + offsetof(struct ipc_test_cmd, data)) {
+			LOG_ERR("Size mismatch");
+			ipc_rx_params.result = -EMSGSIZE;
+			break;
+		}
+
+		if (ipc_rx_params.blk_cnt <= 0) {
+			LOG_ERR("Data not expected");
+			ipc_rx_params.result = -EFAULT;
+			break;
+		}
+
+		/* Check the data */
+		for (size_t n = 0; n < ipc_rx_params.blk_size; ++n) {
+			uint8_t expected = (uint8_t)rand_r(&ipc_rx_params.seed);
+
+			if (cmd->data[n] != expected) {
+				LOG_ERR("Data value error at %u", n);
+				ipc_rx_params.result = -EINVAL;
+				break;
+			}
+		}
+
+		ipc_rx_params.blk_cnt -= 1;
+		break;
+	}
+	default:
+		LOG_ERR("Unhandled command: %u", cmd->cmd);
+		break;
+	}
+}
+
+static void ep_error(const char *message, void *priv)
+{
+	LOG_ERR("EP error: \"%s\"", message);
+}
+
+static int init_ipc(void)
+{
+	int ret;
+	static struct ipc_ept ep;
+
+	/* Store the pointer to the endpoint */
+	ep_cfg.priv = &ep;
+
+	LOG_INF("IPC-sessions test remote started");
+
+	ret = ipc_service_open_instance(ipc0_instance);
+	if ((ret < 0) && (ret != -EALREADY)) {
+		LOG_ERR("ipc_service_open_instance() failure: %d", ret);
+		return ret;
+	}
+
+	ret = ipc_service_register_endpoint(ipc0_instance, &ep, &ep_cfg);
+	if (ret < 0) {
+		LOG_ERR("ipc_service_register_endpoint() failure: %d", ret);
+		return ret;
+	}
+
+	do {
+		k_sem_take(&bound_sem, K_FOREVER);
+	} while (!ipc0_bounded);
+
+	LOG_INF("IPC connection estabilished");
+
+	return 0;
+}
+
+static void timer_rebond_cb(struct k_timer *timer)
+{
+	(void)timer;
+	LOG_INF("Setting rebond request");
+	k_event_set(&ipc_ev_req, IPC_TEST_EV_REBOND);
+}
+
+static void timer_reboot_cb(struct k_timer *timer)
+{
+	(void)timer;
+	LOG_INF("Resetting CPU");
+	reboot_anyway();
+	__ASSERT(0, "Still working after reboot request");
+}
+
+
+int main(void)
+{
+	int ret;
+
+	k_timer_init(&timer_rebond, timer_rebond_cb, NULL);
+	k_timer_init(&timer_reboot, timer_reboot_cb, NULL);
+	ret = init_ipc();
+	if (ret) {
+		return ret;
+	}
+
+	while (1) {
+		uint32_t ev;
+
+		ev = k_event_wait(&ipc_ev_req, ~0U, false, K_FOREVER);
+		k_event_clear(&ipc_ev_req, ev);
+
+		if (ev & IPC_TEST_EV_REBOND) {
+			/* Rebond now */
+			ret = ipc_service_deregister_endpoint(ep_cfg.priv);
+			if (ret) {
+				LOG_ERR("ipc_service_deregister_endpoint() failure: %d", ret);
+				continue;
+			}
+			ipc0_bounded = false;
+
+			ret = ipc_service_register_endpoint(ipc0_instance, ep_cfg.priv, &ep_cfg);
+			if (ret < 0) {
+				LOG_ERR("ipc_service_register_endpoint() failure: %d", ret);
+				return ret;
+			}
+
+			do {
+				k_sem_take(&bound_sem, K_FOREVER);
+			} while (!ipc0_bounded);
+		}
+		if (ev & IPC_TEST_EV_BOND) {
+			LOG_INF("Bonding endpoint");
+			/* Bond missing endpoint */
+			if (!ipc0_bounded) {
+				ret = ipc_service_register_endpoint(ipc0_instance, ep_cfg.priv,
+								    &ep_cfg);
+				if (ret < 0) {
+					LOG_ERR("ipc_service_register_endpoint() failure: %d", ret);
+					return ret;
+				}
+
+				do {
+					k_sem_take(&bound_sem, K_FOREVER);
+				} while (!ipc0_bounded);
+			}
+			LOG_INF("Bonding done");
+		}
+		if (ev & IPC_TEST_EV_TXTEST) {
+			LOG_INF("Transfer TX test started");
+
+			size_t cmd_size = ipc_tx_params.blk_size + offsetof(struct ipc_test_cmd,
+									    data);
+			struct ipc_test_cmd *cmd_data = k_malloc(cmd_size);
+
+			if (!cmd_data) {
+				LOG_ERR("Cannot create TX test buffer");
+				ipc_tx_params.result = -ENOMEM;
+				continue;
+			}
+
+			LOG_INF("Initial seed: %u", ipc_tx_params.seed);
+
+			cmd_data->cmd = IPC_TEST_CMD_XDATA;
+			for (/* No init */; ipc_tx_params.blk_cnt > 0; --ipc_tx_params.blk_cnt) {
+				int ret;
+
+				if (ipc_tx_params.blk_cnt % 1000 == 0) {
+					LOG_INF("Sending: %u blocks left", ipc_tx_params.blk_cnt);
+				}
+				/* Generate the block data */
+				for (size_t n = 0; n < ipc_tx_params.blk_size; ++n) {
+					cmd_data->data[n] = (uint8_t)rand_r(&ipc_tx_params.seed);
+				}
+				do {
+					ret = ipc_service_send(ep_cfg.priv, cmd_data, cmd_size);
+				} while (ret == -ENOMEM);
+				if (ret < 0) {
+					LOG_ERR("Cannot send TX test buffer: %d", ret);
+					ipc_tx_params.result = -EIO;
+					continue;
+				}
+			}
+
+			k_free(cmd_data);
+
+			LOG_INF("Transfer TX test finished");
+		}
+
+
+	}
+
+	return 0;
+}
diff --git a/tests/subsys/ipc/ipc_sessions/src/data_queue.c b/tests/subsys/ipc/ipc_sessions/src/data_queue.c
new file mode 100644
index 0000000000000..03dc93257a38e
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/src/data_queue.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "data_queue.h"
+
+#define DATA_QUEUE_MEMORY_ALIGN sizeof(uint32_t)
+
+struct data_queue_format {
+	uint32_t header; /* Required by kernel k_queue_append */
+	size_t size;
+	uint32_t data[];
+};
+
+
+void data_queue_init(struct data_queue *q, void *mem, size_t bytes)
+{
+	k_heap_init(&q->h, mem, bytes);
+	k_queue_init(&q->q);
+}
+
+int data_queue_put(struct data_queue *q, const void *data, size_t bytes, k_timeout_t timeout)
+{
+	struct data_queue_format *buffer = k_heap_aligned_alloc(
+		&q->h,
+		DATA_QUEUE_MEMORY_ALIGN,
+		bytes + sizeof(struct data_queue_format),
+		timeout);
+
+	if (!buffer) {
+		return -ENOMEM;
+	}
+	buffer->size = bytes;
+	memcpy(buffer->data, data, bytes);
+
+	k_queue_append(&q->q, buffer);
+	return 0;
+}
+
+void *data_queue_get(struct data_queue *q, size_t *size, k_timeout_t timeout)
+{
+	struct data_queue_format *buffer = k_queue_get(&q->q, timeout);
+
+	if (!buffer) {
+		return NULL;
+	}
+
+	if (size) {
+		*size = buffer->size;
+	}
+	return buffer->data;
+}
+
+void data_queue_release(struct data_queue *q, void *data)
+{
+	struct data_queue_format *buffer = CONTAINER_OF(data, struct data_queue_format, data);
+
+	k_heap_free(&q->h, buffer);
+}
+
+int data_queue_is_empty(struct data_queue *q)
+{
+	return k_queue_is_empty(&q->q);
+}
diff --git a/tests/subsys/ipc/ipc_sessions/src/data_queue.h b/tests/subsys/ipc/ipc_sessions/src/data_queue.h
new file mode 100644
index 0000000000000..5e5eef14c3e22
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/src/data_queue.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef DATA_QUEUE_H
+#include <zephyr/kernel.h>
+
+
+struct data_queue {
+	struct k_queue q;
+	struct k_heap h;
+};
+
+void data_queue_init(struct data_queue *q, void *mem, size_t bytes);
+
+int data_queue_put(struct data_queue *q, const void *data, size_t bytes, k_timeout_t timeout);
+
+void *data_queue_get(struct data_queue *q, size_t *size, k_timeout_t timeout);
+
+void data_queue_release(struct data_queue *q, void *data);
+
+int data_queue_is_empty(struct data_queue *q);
+
+#endif /* DATA_QUEUE_H */
diff --git a/tests/subsys/ipc/ipc_sessions/src/main.c b/tests/subsys/ipc/ipc_sessions/src/main.c
new file mode 100644
index 0000000000000..1215530e09f87
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/src/main.c
@@ -0,0 +1,469 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdlib.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/ztest.h>
+#include <zephyr/ipc/ipc_service.h>
+
+#include <test_commands.h>
+#include "data_queue.h"
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(ipc_sessions, LOG_LEVEL_INF);
+
+enum test_ipc_events {
+	TEST_IPC_EVENT_BOUNDED,
+	TEST_IPC_EVENT_UNBOUNDED,
+	TEST_IPC_EVENT_ERROR
+};
+
+struct test_ipc_event_state {
+	enum test_ipc_events ev;
+	struct ipc_ep *ep;
+};
+
+static const struct device *ipc0_instance = DEVICE_DT_GET(DT_NODELABEL(ipc0));
+static volatile bool ipc0_bounded;
+K_MSGQ_DEFINE(ipc_events, sizeof(struct test_ipc_event_state), 16, 4);
+
+static uint32_t data_queue_memory[ROUND_UP(CONFIG_IPC_TEST_MSG_HEAP_SIZE, sizeof(uint32_t))];
+static struct data_queue ipc_data_queue;
+
+struct test_cmd_xdata {
+	struct ipc_test_cmd base;
+	uint8_t data[CONFIG_IPC_TEST_BLOCK_SIZE];
+};
+
+static void (*ep_received_override_cb)(const void *data, size_t len, void *priv);
+
+static void ep_bound(void *priv)
+{
+	int ret;
+	struct test_ipc_event_state ev = {
+		.ev = TEST_IPC_EVENT_BOUNDED,
+		.ep = priv
+	};
+
+	ipc0_bounded = true;
+	ret = k_msgq_put(&ipc_events, &ev, K_NO_WAIT);
+	if (ret) {
+		LOG_ERR("Cannot put event in queue: %d", ret);
+	}
+}
+
+static void ep_unbound(void *priv)
+{
+	int ret;
+	struct test_ipc_event_state ev = {
+		.ev = TEST_IPC_EVENT_UNBOUNDED,
+		.ep = priv
+	};
+
+	ipc0_bounded = false;
+	ret = k_msgq_put(&ipc_events, &ev, K_NO_WAIT);
+	if (ret) {
+		LOG_ERR("Cannot put event in queue: %d", ret);
+	}
+}
+
+static void ep_recv(const void *data, size_t len, void *priv)
+{
+	int ret;
+
+	if (ep_received_override_cb) {
+		ep_received_override_cb(data, len, priv);
+	} else {
+		ret = data_queue_put(&ipc_data_queue, data, len, K_NO_WAIT);
+		__ASSERT(ret >= 0, "Cannot put data into queue: %d", ret);
+		(void)ret;
+	}
+}
+
+static void ep_error(const char *message, void *priv)
+{
+	int ret;
+	struct test_ipc_event_state ev = {
+		.ev = TEST_IPC_EVENT_ERROR,
+		.ep = priv
+	};
+
+	ret = k_msgq_put(&ipc_events, &ev, K_NO_WAIT);
+	if (ret) {
+		LOG_ERR("Cannot put event in queue: %d", ret);
+	}
+}
+
+static struct ipc_ept_cfg ep_cfg = {
+	.cb = {
+		.bound = ep_bound,
+		.unbound = ep_unbound,
+		.received = ep_recv,
+		.error = ep_error
+	},
+};
+
+static struct ipc_ept ep;
+
+
+
+/**
+ * @brief Estabilish connection before any test run
+ */
+void *test_suite_setup(void)
+{
+	int ret;
+	struct test_ipc_event_state ev;
+
+	data_queue_init(&ipc_data_queue, data_queue_memory, sizeof(data_queue_memory));
+
+	ret = ipc_service_open_instance(ipc0_instance);
+	zassert_true((ret >= 0) || ret == -EALREADY, "ipc_service_open_instance() failure: %d",
+		     ret);
+
+	/* Store the pointer to the endpoint */
+	ep_cfg.priv = &ep;
+	ret = ipc_service_register_endpoint(ipc0_instance, &ep, &ep_cfg);
+	zassert_true((ret >= 0), "ipc_service_register_endpoint() failure: %d", ret);
+
+	do {
+		ret = k_msgq_get(&ipc_events, &ev, K_MSEC(1000));
+		zassert_ok(ret, "Cannot bound to the remote interface");
+	} while (!ipc0_bounded);
+
+	return NULL;
+}
+
+/**
+ * @brief Prepare the test structures
+ */
+void test_suite_before(void *fixture)
+{
+	ep_received_override_cb = NULL;
+	k_msgq_purge(&ipc_events);
+}
+
+static void execute_test_ping_pong(void)
+{
+	int ret;
+	static const struct ipc_test_cmd cmd_ping = { IPC_TEST_CMD_PING };
+	struct ipc_test_cmd *cmd_rsp;
+	size_t cmd_rsp_size;
+
+	zassert_not_ok(data_queue_is_empty(&ipc_data_queue),
+		       "IPC data queue contains unexpected data");
+	/* Sending data */
+	ret = ipc_service_send(&ep, &cmd_ping, sizeof(cmd_ping));
+	zassert_equal(ret, sizeof(cmd_ping), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_ping));
+	/* Waiting for response */
+	cmd_rsp = data_queue_get(&ipc_data_queue, &cmd_rsp_size, K_MSEC(1000));
+	zassert_not_null(cmd_rsp, "No command response on time");
+	zassert_equal(cmd_rsp_size, sizeof(struct ipc_test_cmd),
+		      "Unexpected response size: %u, expected: %u", cmd_rsp_size,
+		      sizeof(struct ipc_test_cmd));
+	zassert_equal(cmd_rsp->cmd, IPC_TEST_CMD_PONG,
+		      "Unexpected response cmd value: %u, expected: %u", cmd_rsp->cmd,
+		      IPC_TEST_CMD_PONG);
+	data_queue_release(&ipc_data_queue, cmd_rsp);
+}
+
+ZTEST(ipc_sessions, test_ping_pong)
+{
+	execute_test_ping_pong();
+}
+
+ZTEST(ipc_sessions, test_echo)
+{
+	int ret;
+	static const struct ipc_test_cmd cmd_echo = {
+		IPC_TEST_CMD_ECHO, {'H', 'e', 'l', 'l', 'o', '!'}
+	};
+	struct ipc_test_cmd *cmd_rsp;
+	size_t cmd_rsp_size;
+
+	zassert_not_ok(data_queue_is_empty(&ipc_data_queue),
+		       "IPC data queue contains unexpected data");
+	/* Sending data */
+	ret = ipc_service_send(&ep, &cmd_echo, sizeof(cmd_echo));
+	zassert_equal(ret, sizeof(cmd_echo), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_echo));
+	/* Waiting for response */
+	cmd_rsp = data_queue_get(&ipc_data_queue, &cmd_rsp_size, K_MSEC(1000));
+	zassert_not_null(cmd_rsp, "No command response on time");
+	/* Checking response */
+	zassert_equal(cmd_rsp_size, sizeof(cmd_echo), "Unexpected response size: %u, expected: %u",
+		      cmd_rsp_size, sizeof(cmd_echo));
+	zassert_equal(cmd_rsp->cmd, IPC_TEST_CMD_ECHO_RSP,
+		      "Unexpected response cmd value: %u, expected: %u", cmd_rsp->cmd,
+		      IPC_TEST_CMD_ECHO_RSP);
+	zassert_mem_equal(cmd_rsp->data, cmd_echo.data,
+			  sizeof(cmd_echo) - sizeof(struct ipc_test_cmd),
+			  "Unexpected response content");
+	data_queue_release(&ipc_data_queue, cmd_rsp);
+}
+
+ZTEST(ipc_sessions, test_reboot)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_IPC_TEST_SKIP_UNBOUND);
+	Z_TEST_SKIP_IFDEF(CONFIG_IPC_TEST_SKIP_CORE_RESET);
+
+	int ret;
+	struct test_ipc_event_state ev;
+	static const struct ipc_test_cmd_reboot cmd_rebond = { { IPC_TEST_CMD_REBOOT }, 10 };
+
+	zassert_not_ok(data_queue_is_empty(&ipc_data_queue),
+		       "IPC data queue contains unexpected data");
+	/* Sending data */
+	ret = ipc_service_send(&ep, &cmd_rebond, sizeof(cmd_rebond));
+	zassert_equal(ret, sizeof(cmd_rebond), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_rebond));
+	/* Waiting for IPC to unbound */
+	ret = k_msgq_get(&ipc_events, &ev, K_MSEC(1000));
+	zassert_ok(ret, "No IPC unbound event on time");
+	zassert_equal(ev.ev, TEST_IPC_EVENT_UNBOUNDED, "Unexpected IPC event: %u, expected: %u",
+		      ev.ev, TEST_IPC_EVENT_UNBOUNDED);
+	zassert_equal_ptr(ev.ep, &ep, "Unexpected endpoint (unbound)");
+	/* Reconnecting */
+	ret = ipc_service_register_endpoint(ipc0_instance, &ep, &ep_cfg);
+	zassert_true((ret >= 0), "ipc_service_register_endpoint() failure: %d", ret);
+	/* Waiting for bound */
+	ret = k_msgq_get(&ipc_events, &ev, K_MSEC(1000));
+	zassert_ok(ret, "No IPC bound event on time");
+	zassert_equal(ev.ev, TEST_IPC_EVENT_BOUNDED, "Unexpected IPC event: %u, expected: %u",
+		      ev.ev, TEST_IPC_EVENT_UNBOUNDED);
+	zassert_equal_ptr(ev.ep, &ep, "Unexpected endpoint (bound)");
+
+	/* After reconnection - test communication */
+	execute_test_ping_pong();
+}
+
+ZTEST(ipc_sessions, test_rebond)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_IPC_TEST_SKIP_UNBOUND);
+
+	int ret;
+	struct test_ipc_event_state ev;
+	static const struct ipc_test_cmd_reboot cmd_rebond = { { IPC_TEST_CMD_REBOND }, 10 };
+
+	zassert_not_ok(data_queue_is_empty(&ipc_data_queue),
+		       "IPC data queue contains unexpected data");
+	/* Sending data */
+	ret = ipc_service_send(&ep, &cmd_rebond, sizeof(cmd_rebond));
+	zassert_equal(ret, sizeof(cmd_rebond), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_rebond));
+	/* Waiting for IPC to unbound */
+	ret = k_msgq_get(&ipc_events, &ev, K_MSEC(1000));
+	zassert_ok(ret, "No IPC unbound event on time");
+	zassert_equal(ev.ev, TEST_IPC_EVENT_UNBOUNDED, "Unexpected IPC event: %u, expected: %u",
+		      ev.ev, TEST_IPC_EVENT_UNBOUNDED);
+	zassert_equal_ptr(ev.ep, &ep, "Unexpected endpoint (unbound)");
+	/* Reconnecting */
+	ret = ipc_service_register_endpoint(ipc0_instance, &ep, &ep_cfg);
+	zassert_true((ret >= 0), "ipc_service_register_endpoint() failure: %d", ret);
+	/* Waiting for bound */
+	ret = k_msgq_get(&ipc_events, &ev, K_MSEC(1000));
+	zassert_ok(ret, "No IPC bound event on time");
+	zassert_equal(ev.ev, TEST_IPC_EVENT_BOUNDED, "Unexpected IPC event: %u, expected: %u",
+		      ev.ev, TEST_IPC_EVENT_UNBOUNDED);
+	zassert_equal_ptr(ev.ep, &ep, "Unexpected endpoint (bound)");
+
+	/* After reconnection - test communication */
+	execute_test_ping_pong();
+}
+
+ZTEST(ipc_sessions, test_local_rebond)
+{
+	Z_TEST_SKIP_IFDEF(CONFIG_IPC_TEST_SKIP_UNBOUND);
+
+	int ret;
+	struct test_ipc_event_state ev;
+
+	zassert_not_ok(data_queue_is_empty(&ipc_data_queue),
+		       "IPC data queue contains unexpected data");
+	/* Rebond locally */
+	ret = ipc_service_deregister_endpoint(ep_cfg.priv);
+	zassert_ok(ret, "ipc_service_deregister_endpoint() failure: %d", ret);
+	ipc0_bounded = false;
+
+	ret = ipc_service_register_endpoint(ipc0_instance, &ep, &ep_cfg);
+	zassert_true((ret >= 0), "ipc_service_register_endpoint() failure: %d", ret);
+	do {
+		ret = k_msgq_get(&ipc_events, &ev, K_MSEC(1000));
+		zassert_ok(ret, "Cannot bound to the remote interface");
+	} while (!ipc0_bounded);
+
+	/* After reconnection - test communication */
+	execute_test_ping_pong();
+}
+
+ZTEST(ipc_sessions, test_tx_long)
+{
+	#define SEED_TXSTART_VALUE 1
+	int ret;
+	static const struct ipc_test_cmd_xstart cmd_rxstart = {
+		.base = { .cmd = IPC_TEST_CMD_RXSTART },
+		.blk_size = CONFIG_IPC_TEST_BLOCK_SIZE,
+		.blk_cnt = CONFIG_IPC_TEST_BLOCK_CNT,
+		.seed = SEED_TXSTART_VALUE };
+	static const struct ipc_test_cmd cmd_rxget = { IPC_TEST_CMD_RXGET };
+	struct test_cmd_xdata cmd_txdata = { .base = { .cmd = IPC_TEST_CMD_XDATA } };
+	unsigned int seed = SEED_TXSTART_VALUE;
+
+	struct ipc_test_cmd_xstat *cmd_rxstat;
+	size_t cmd_rsp_size;
+
+	zassert_not_ok(data_queue_is_empty(&ipc_data_queue),
+		       "IPC data queue contains unexpected data");
+
+	/* Sending command for the remote to start receiving the data */
+	ret = ipc_service_send(&ep, &cmd_rxstart, sizeof(cmd_rxstart));
+	zassert_equal(ret, sizeof(cmd_rxstart), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_rxstart));
+	/* Check current status */
+	ret = ipc_service_send(&ep, &cmd_rxget, sizeof(cmd_rxget));
+	zassert_equal(ret, sizeof(cmd_rxget), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_rxget));
+	cmd_rxstat = data_queue_get(&ipc_data_queue, &cmd_rsp_size, K_MSEC(1000));
+	zassert_not_null(cmd_rxstat, "No command response on time");
+	zassert_equal(cmd_rsp_size, sizeof(*cmd_rxstat),
+		      "Unexpected response size: %u, expected: %u", cmd_rsp_size,
+		      sizeof(cmd_rxstat));
+	zassert_equal(cmd_rxstat->base.cmd, IPC_TEST_CMD_XSTAT,
+		      "Unexpected command in response: %u", cmd_rxstat->base.cmd);
+	zassert_ok(cmd_rxstat->result, "RX result not ok: %d", cmd_rxstat->result);
+	zassert_equal(cmd_rxstat->blk_cnt, cmd_rxstart.blk_cnt,
+		      "RX blk_cnt in status does not match start command: %u vs %u",
+		      cmd_rxstat->blk_cnt, cmd_rxstart.blk_cnt);
+	data_queue_release(&ipc_data_queue, cmd_rxstat);
+
+	/* Sending data */
+	for (size_t blk = 0; blk < cmd_rxstart.blk_cnt; ++blk) {
+		for (size_t n = 0; n < cmd_rxstart.blk_size; ++n) {
+			cmd_txdata.data[n] = (uint8_t)rand_r(&seed);
+		}
+		do {
+			ret = ipc_service_send(&ep, &cmd_txdata, sizeof(cmd_txdata));
+		} while (ret == -ENOMEM);
+		if ((blk % 1000) == 0) {
+			LOG_INF("Transfer number: %u of %u", blk, cmd_rxstart.blk_cnt);
+		}
+		zassert_equal(ret, sizeof(cmd_txdata), "ipc_service_send failed: %d, expected: %u",
+			      ret, sizeof(cmd_txdata));
+	}
+
+	/* Check current status */
+	ret = ipc_service_send(&ep, &cmd_rxget, sizeof(cmd_rxget));
+	zassert_equal(ret, sizeof(cmd_rxget), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_rxget));
+	cmd_rxstat = data_queue_get(&ipc_data_queue, &cmd_rsp_size, K_MSEC(1000));
+	zassert_not_null(cmd_rxstat, "No command response on time");
+	zassert_equal(cmd_rsp_size, sizeof(*cmd_rxstat),
+		      "Unexpected response size: %u, expected: %u", cmd_rsp_size,
+		      sizeof(cmd_rxstat));
+	zassert_equal(cmd_rxstat->base.cmd, IPC_TEST_CMD_XSTAT,
+		      "Unexpected command in response: %u", cmd_rxstat->base.cmd);
+	zassert_ok(cmd_rxstat->result, "RX result not ok: %d", cmd_rxstat->result);
+	zassert_equal(cmd_rxstat->blk_cnt, 0,
+		      "RX blk_cnt in status does not match start command: %u vs %u",
+		      cmd_rxstat->blk_cnt, 0);
+	data_queue_release(&ipc_data_queue, cmd_rxstat);
+}
+
+static struct {
+	unsigned int seed;
+	size_t blk_left;
+} test_rx_long_data;
+K_SEM_DEFINE(test_rx_long_sem, 0, 1);
+
+static void test_rx_long_rec_cb(const void *data, size_t len, void *priv)
+{
+	const struct test_cmd_xdata *cmd_rxdata = data;
+
+	zassert_true(test_rx_long_data.blk_left > 0, "No data left to interpret");
+	zassert_equal(len, sizeof(*cmd_rxdata),
+		      "Unexpected response size: %u, expected: %u", len, sizeof(*cmd_rxdata));
+	zassert_equal(cmd_rxdata->base.cmd, IPC_TEST_CMD_XDATA,
+		      "Unexpected command in response: %u", cmd_rxdata->base.cmd);
+	for (size_t n = 0; n < CONFIG_IPC_TEST_BLOCK_SIZE; ++n) {
+		uint8_t expected = (uint8_t)rand_r(&test_rx_long_data.seed);
+
+		zassert_equal(cmd_rxdata->data[n], expected,
+			      "Data mismatch at %u while %u blocks left", n,
+			      test_rx_long_data.blk_left);
+	}
+
+	if (test_rx_long_data.blk_left % 1000 == 0) {
+		LOG_INF("Receivng left: %u", test_rx_long_data.blk_left);
+	}
+	test_rx_long_data.blk_left -= 1;
+	if (test_rx_long_data.blk_left <= 0) {
+		LOG_INF("Interpretation marked finished");
+		ep_received_override_cb = NULL;
+		k_sem_give(&test_rx_long_sem);
+	}
+}
+
+ZTEST(ipc_sessions, test_rx_long)
+{
+	#define SEED_RXSTART_VALUE 1
+	int ret;
+	static const struct ipc_test_cmd_xstart cmd_txstart = {
+		.base = { .cmd = IPC_TEST_CMD_TXSTART },
+		.blk_size = CONFIG_IPC_TEST_BLOCK_SIZE,
+		.blk_cnt = CONFIG_IPC_TEST_BLOCK_CNT,
+		.seed = SEED_RXSTART_VALUE };
+	static const struct ipc_test_cmd cmd_txget = { IPC_TEST_CMD_TXGET };
+	struct ipc_test_cmd_xstat *cmd_txstat;
+	size_t cmd_rsp_size;
+
+	zassert_not_ok(data_queue_is_empty(&ipc_data_queue),
+		       "IPC data queue contains unexpected data");
+
+	/* Configuring the callback to interpret the incoming data */
+	test_rx_long_data.seed = SEED_RXSTART_VALUE;
+	test_rx_long_data.blk_left = cmd_txstart.blk_cnt;
+	ep_received_override_cb = test_rx_long_rec_cb;
+
+	/* Sending command for the remote to start sending the data */
+	ret = ipc_service_send(&ep, &cmd_txstart, sizeof(cmd_txstart));
+	zassert_equal(ret, sizeof(cmd_txstart), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_txstart));
+
+	/* Waiting for all the data */
+	ret = k_sem_take(&test_rx_long_sem, K_SECONDS(30));
+	LOG_INF("Interpretation finished");
+	zassert_ok(ret, "Incoming packet interpretation timeout");
+	zassert_is_null(ep_received_override_cb, "Seems like interpretation callback failed");
+
+	/* Check current status */
+	ret = ipc_service_send(&ep, &cmd_txget, sizeof(cmd_txget));
+	zassert_equal(ret, sizeof(cmd_txget), "ipc_service_send failed: %d, expected: %u", ret,
+		      sizeof(cmd_txget));
+	cmd_txstat = data_queue_get(&ipc_data_queue, &cmd_rsp_size, K_MSEC(1000));
+	zassert_not_null(cmd_txstat, "No command response on time");
+	zassert_equal(cmd_rsp_size, sizeof(*cmd_txstat),
+		      "Unexpected response size: %u, expected: %u", cmd_rsp_size,
+		      sizeof(cmd_txstat));
+	zassert_equal(cmd_txstat->base.cmd, IPC_TEST_CMD_XSTAT,
+		      "Unexpected command in response: %u", cmd_txstat->base.cmd);
+	zassert_ok(cmd_txstat->result, "RX result not ok: %d", cmd_txstat->result);
+	zassert_equal(cmd_txstat->blk_cnt, 0,
+		      "RX blk_cnt in status does not match start command: %u vs %u",
+		      cmd_txstat->blk_cnt, 0);
+	data_queue_release(&ipc_data_queue, cmd_txstat);
+}
+
+
+ZTEST_SUITE(
+	/* suite_name */              ipc_sessions,
+	/* ztest_suite_predicate_t */ NULL,
+	/* ztest_suite_setup_t */     test_suite_setup,
+	/* ztest_suite_before_t */    test_suite_before,
+	/* ztest_suite_after_t */     NULL,
+	/* ztest_suite_teardown_t */  NULL
+);
diff --git a/tests/subsys/ipc/ipc_sessions/sysbuild.cmake b/tests/subsys/ipc/ipc_sessions/sysbuild.cmake
new file mode 100644
index 0000000000000..9aa0b80096b17
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/sysbuild.cmake
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
+  message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name")
+endif()
+
+# Add remote project
+ExternalZephyrProject_Add(
+  APPLICATION remote
+  SOURCE_DIR ${APP_DIR}/remote
+  BOARD ${SB_CONFIG_REMOTE_BOARD}
+  BOARD_REVISION ${BOARD_REVISION}
+)
+set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
+set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
+set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
+set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+
+# Add a dependency so that the remote sample will be built and flashed first
+sysbuild_add_dependencies(CONFIGURE ${DEFAULT_IMAGE} remote)
+# Add dependency so that the remote image is flashed first.
+sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote)
diff --git a/tests/subsys/ipc/ipc_sessions/sysbuild_cpuppr.conf b/tests/subsys/ipc/ipc_sessions/sysbuild_cpuppr.conf
new file mode 100644
index 0000000000000..3b3ca1ea91f39
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/sysbuild_cpuppr.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpuppr"
diff --git a/tests/subsys/ipc/ipc_sessions/testcase.yaml b/tests/subsys/ipc/ipc_sessions/testcase.yaml
new file mode 100644
index 0000000000000..f76a61b8d68e4
--- /dev/null
+++ b/tests/subsys/ipc/ipc_sessions/testcase.yaml
@@ -0,0 +1,50 @@
+sample:
+  name: IPC Service integration test
+  description: IPC Service integration and efficiency test
+
+common:
+  sysbuild: true
+  tags: ipc ipc_sessions
+  harness: ztest
+
+tests:
+  sample.ipc.ipc_sessions.nrf5340dk:
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+  sample.ipc.ipc_sessions.nrf54h20dk_cpuapp_cpurad:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - CONFIG_IPC_TEST_SKIP_CORE_RESET=y
+  sample.ipc.ipc_sessions.nrf54h20dk_cpuapp_cpuppr:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - FILE_SUFFIX=cpuppr
+      - ipc_sessions_SNIPPET=nordic-ppr
+  sample.ipc.ipc_sessions.nrf54h20dk_cpuapp_no_unbound_cpuppr:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - FILE_SUFFIX=cpuppr
+      - ipc_sessions_SNIPPET=nordic-ppr
+      - CONFIG_IPC_TEST_SKIP_UNBOUND=y
+      - CONFIG_IPC_SERVICE_BACKEND_ICMSG_V1=y
+  sample.ipc.ipc_sessions.nrf54h20dk_cpuapp_cpuppr_no_unbound:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - FILE_SUFFIX=cpuppr
+      - ipc_sessions_SNIPPET=nordic-ppr
+      - CONFIG_IPC_TEST_SKIP_UNBOUND=y
+      - remote_CONFIG_IPC_SERVICE_BACKEND_ICMSG_V1=y
diff --git a/tests/subsys/ipc/pbuf/src/main.c b/tests/subsys/ipc/pbuf/src/main.c
index 4af9da68c4731..4d563204cb08d 100644
--- a/tests/subsys/ipc/pbuf/src/main.c
+++ b/tests/subsys/ipc/pbuf/src/main.c
@@ -48,7 +48,7 @@ ZTEST(test_pbuf, test_rw)
 	 * order to avoid clang complains about memory_area not being constant
 	 * expression.
 	 */
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0, 0);
 
 	static struct pbuf pb = {
 		.cfg = &cfg,
@@ -115,9 +115,11 @@ ZTEST(test_pbuf, test_retcodes)
 	 * order to avoid clang complains about memory_area not being constant
 	 * expression.
 	 */
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg0 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 32);
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg1 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ, 0);
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg2 = PBUF_CFG_INIT(memory_area, 20, 4);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg0 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ,
+								     32, 0);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg1 = PBUF_CFG_INIT(memory_area, MEM_AREA_SZ,
+								     0, 0);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg2 = PBUF_CFG_INIT(memory_area, 20, 4, 0);
 
 	static struct pbuf pb0 = {
 		.cfg = &cfg0,
@@ -268,7 +270,7 @@ ZTEST(test_pbuf, test_stress)
 	 * order to avoid clang complains about buffer not being constant
 	 * expression.
 	 */
-	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(buffer, MEM_AREA_SZ, 4);
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg = PBUF_CFG_INIT(buffer, MEM_AREA_SZ, 4, 0);
 
 	static struct pbuf pb = {
 		.cfg = &cfg,
diff --git a/tests/subsys/jwt/testcase.yaml b/tests/subsys/jwt/testcase.yaml
index 8744d51bbd03b..95ac8929baada 100644
--- a/tests/subsys/jwt/testcase.yaml
+++ b/tests/subsys/jwt/testcase.yaml
@@ -5,7 +5,7 @@ common:
   timeout: 120
   tags: jwt
   integration_platforms:
-    - frdm_k64f
+    - qemu_x86
   extra_configs:
     - CONFIG_TEST_RANDOM_GENERATOR=y
 tests:
diff --git a/tests/subsys/llext/CMakeLists.txt b/tests/subsys/llext/CMakeLists.txt
index 0c121b2852d67..941d85d3af090 100644
--- a/tests/subsys/llext/CMakeLists.txt
+++ b/tests/subsys/llext/CMakeLists.txt
@@ -21,9 +21,11 @@ set(ext_names
 	relative_jump
 	object
 	syscalls
+	inspect
 	threads_kernel_objects
 	export_dependent
 	export_dependency
+	align
 )
 
 if(CONFIG_ARM)
@@ -90,3 +92,13 @@ if(NOT CONFIG_LLEXT_TYPE_ELF_OBJECT AND CONFIG_RISCV AND CONFIG_RISCV_ISA_EXT_C)
     ${ZEPHYR_BINARY_DIR}/include/generated/riscv_edge_case_cb_type.inc
   )
 endif()
+
+if(NOT CONFIG_LLEXT_TYPE_ELF_OBJECT AND CONFIG_RISCV)
+  add_llext_target(riscv_edge_case_non_paired_hi20_lo12_ext
+    OUTPUT  ${PROJECT_BINARY_DIR}/llext/riscv_edge_case_non_paired_hi20_lo12_ext.llext
+    SOURCES ${PROJECT_SOURCE_DIR}/src/riscv_edge_case_non_paired_hi20_lo12.c ${PROJECT_SOURCE_DIR}/src/riscv_edge_case_non_paired_hi20_lo12_trigger.S
+  )
+  generate_inc_file_for_target(app ${PROJECT_BINARY_DIR}/llext/riscv_edge_case_non_paired_hi20_lo12_ext.llext
+    ${ZEPHYR_BINARY_DIR}/include/generated/riscv_edge_case_non_paired_hi20_lo12.inc
+  )
+endif()
diff --git a/tests/subsys/llext/src/align_ext.c b/tests/subsys/llext/src/align_ext.c
new file mode 100644
index 0000000000000..52bd36fe49375
--- /dev/null
+++ b/tests/subsys/llext/src/align_ext.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Define symbols with different alignment requirements and verify that LLEXT
+ * correctly handles them by testing the runtime address and the contents of
+ * each defined symbol.
+ */
+
+#include <stdint.h>
+#include <zephyr/kernel.h>
+#include <zephyr/llext/symbol.h>
+#include <zephyr/ztest_assert.h>
+
+/*
+ * Create constants requesting a specific alignment in memory and with a value
+ * that is related but not equal to their alignment requirement.
+ */
+#define ALIGNED_ENTRY(name, n) \
+	 const int name ## _ ## n __aligned(n) = n / 2 + 1
+
+ALIGNED_ENTRY(common, 8);
+ALIGNED_ENTRY(common, 16);
+ALIGNED_ENTRY(common, 32);
+ALIGNED_ENTRY(common, 64);
+ALIGNED_ENTRY(common, 128);
+ALIGNED_ENTRY(common, 256);
+ALIGNED_ENTRY(common, 512);
+
+/*
+ * Create similar constants in a set of independent sections to test merging.
+ */
+#define ALIGNED_SECT_ENTRY(name, n) \
+	Z_GENERIC_SECTION(name ## _sect_ ## n) ALIGNED_ENTRY(name, n)
+
+ALIGNED_SECT_ENTRY(independent, 8);
+ALIGNED_SECT_ENTRY(independent, 16);
+ALIGNED_SECT_ENTRY(independent, 32);
+ALIGNED_SECT_ENTRY(independent, 64);
+ALIGNED_SECT_ENTRY(independent, 128);
+ALIGNED_SECT_ENTRY(independent, 256);
+ALIGNED_SECT_ENTRY(independent, 512);
+
+/*
+ * Test that each symbol matches its expected value and alignment.
+ */
+#define ASSERT_ENTRY(name, n) \
+	zassert_equal(name ## _ ## n, n / 2 + 1); \
+	zassert_true(IS_ALIGNED(&name ## _ ## n, n))
+
+void test_entry(void)
+{
+	ASSERT_ENTRY(common, 8);
+	ASSERT_ENTRY(common, 16);
+	ASSERT_ENTRY(common, 32);
+	ASSERT_ENTRY(common, 64);
+	ASSERT_ENTRY(common, 128);
+	ASSERT_ENTRY(common, 256);
+	ASSERT_ENTRY(common, 512);
+
+	ASSERT_ENTRY(independent, 8);
+	ASSERT_ENTRY(independent, 16);
+	ASSERT_ENTRY(independent, 32);
+	ASSERT_ENTRY(independent, 64);
+	ASSERT_ENTRY(independent, 128);
+	ASSERT_ENTRY(independent, 256);
+	ASSERT_ENTRY(independent, 512);
+}
+EXPORT_SYMBOL(test_entry);
diff --git a/tests/subsys/llext/src/detached_fn_ext.c b/tests/subsys/llext/src/detached_fn_ext.c
index a1cbaa62d8053..a112046e8cd43 100644
--- a/tests/subsys/llext/src/detached_fn_ext.c
+++ b/tests/subsys/llext/src/detached_fn_ext.c
@@ -9,7 +9,7 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/ztest_assert.h>
 
-__section(".detach") void detached_entry(void)
+Z_GENERIC_SECTION(.detach) void detached_entry(void)
 {
 	static int data_cnt = -3;
 	static unsigned int bss_cnt;
diff --git a/tests/subsys/llext/src/inspect_ext.c b/tests/subsys/llext/src/inspect_ext.c
new file mode 100644
index 0000000000000..97d09f99932b0
--- /dev/null
+++ b/tests/subsys/llext/src/inspect_ext.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* This extension exports a number of symbols to be used by the LLEXT
+ * inspection APIs. Each symbol is exported within a different section
+ * and only the addresses are checked in this test.
+ */
+
+#include <zephyr/llext/symbol.h>
+
+int number_in_bss;
+int number_in_data = 1;
+const int number_in_rodata = 2;
+const int number_in_my_rodata Z_GENERIC_SECTION(.my_rodata) = 3;
+
+void function_in_text(void)
+{
+	/* only used for address check */
+}
+
+EXPORT_SYMBOL(number_in_bss);
+EXPORT_SYMBOL(number_in_data);
+EXPORT_SYMBOL(number_in_rodata);
+EXPORT_SYMBOL(number_in_my_rodata);
+EXPORT_SYMBOL(function_in_text);
diff --git a/tests/subsys/llext/src/riscv_edge_case_non_paired_hi20_lo12.c b/tests/subsys/llext/src/riscv_edge_case_non_paired_hi20_lo12.c
new file mode 100644
index 0000000000000..990955b574b1f
--- /dev/null
+++ b/tests/subsys/llext/src/riscv_edge_case_non_paired_hi20_lo12.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 CISPA Helmholtz Center for Information Security
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This extension tests a relocation edge case in RISC-V:
+ * U-type instructions in conjunction with I-type/S-type instructions can be used to
+ * relocate symbols within a 32-bit range from the PC (medany code model) or 0
+ * (medlow code model).
+ * The compiler usually emits the U-type instructions and I-type/S-type instructions in sequence.
+ * However, this is not guaranteed.
+ * The accompanying assembly listing generates a scenario in which this assumption does NOT hold
+ * and tests that the llext loader can handle it.
+ */
+
+#include <stdbool.h>
+#include <zephyr/llext/symbol.h>
+#include <zephyr/ztest_assert.h>
+
+extern int _riscv_edge_case_non_paired_hi20_lo12(void);
+
+
+#define DATA_SEGMENT_SYMBOL_INITIAL 21
+#define DATA_SEGMENT_SYMBOL_EXPECTED (DATA_SEGMENT_SYMBOL_INITIAL+42)
+
+/* changed from the assembly script */
+volatile int _data_segment_symbol = DATA_SEGMENT_SYMBOL_INITIAL;
+
+
+void test_entry(void)
+{
+	int ret_value;
+
+	ret_value = _riscv_edge_case_non_paired_hi20_lo12();
+
+	zassert_equal(ret_value, DATA_SEGMENT_SYMBOL_INITIAL);
+
+	zassert_equal(_data_segment_symbol, DATA_SEGMENT_SYMBOL_EXPECTED);
+}
+EXPORT_SYMBOL(test_entry);
diff --git a/tests/subsys/llext/src/riscv_edge_case_non_paired_hi20_lo12_trigger.S b/tests/subsys/llext/src/riscv_edge_case_non_paired_hi20_lo12_trigger.S
new file mode 100644
index 0000000000000..e6e059abdfe16
--- /dev/null
+++ b/tests/subsys/llext/src/riscv_edge_case_non_paired_hi20_lo12_trigger.S
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025 CISPA Helmholtz Center for Information Security
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/toolchain.h>
+
+/* 32-bit global defined in C */
+GDATA(_data_segment_symbol)
+
+GTEXT(_riscv_edge_case_non_paired_hi20_lo12)
+
+/*
+ * Tests an edge case in the RISC-V PSABI: In the medany and the medlow code models,
+ * the compiler emits auipc/lui (U-type) and ld/sw (I-type/S-type) instruction pairs
+ * for accessing a non-local symbol.
+ * The U-type instruction sets the upper 20 bits, the I/S-type the lower 12.
+ * Thus, any address in a 32-bit range from 0 (medlow) / the PC (medany) can be reached.
+ * Often, the U-type and I-type/S-type instruction pairs are adjacent in code.
+ * However, this need not be the case - compilers can re-use the upper 20 bits set by
+ * the U-type instruction with multiple I/S-type instructions, which is a useful optimization
+ * for multiple loads/stores of or within the same symbol.
+ * The U-type instruction can also appear after the I-type in code, e.g., due to control flow.
+ * When the U-type and I/S-type instructions are not in sequence, this triggers an edge case
+ * in the llext loader.
+ * This test triggers this edge case by loading a global, modifying it and storing it back.
+ */
+SECTION_FUNC(TEXT, _riscv_edge_case_non_paired_hi20_lo12)
+	/* jump beyond the I-type/load instruction initially to break sequence assumption */
+	j _do_utype
+
+_do_load:
+	/* re-use the upper-bit value set by the U-type below for a load */
+        lw    a0, %pcrel_lo(.LUtype)(a1)
+
+	addi t1, a0, 42
+
+	j _do_store
+
+_do_utype:
+	/* this u-type sets the higher 20 bits of the global */
+	.LUtype:  auipc a1, %pcrel_hi(_data_segment_symbol)
+
+	/* backwards jump to test loading */
+	j _do_load
+
+_do_store:
+
+	/* write the modified value back for the C code to check */
+	sw t1, %pcrel_lo(.LUtype)(a1)
+
+	/* return a0, i.e., the value we read, for the C code to check */
+	ret
diff --git a/tests/subsys/llext/src/test_llext.c b/tests/subsys/llext/src/test_llext.c
index 9ac695311f030..90c9bfa02c924 100644
--- a/tests/subsys/llext/src/test_llext.c
+++ b/tests/subsys/llext/src/test_llext.c
@@ -13,6 +13,7 @@
 #endif
 #include <zephyr/llext/elf.h>
 #include <zephyr/llext/llext.h>
+#include <zephyr/llext/inspect.h>
 #include <zephyr/llext/symbol.h>
 #include <zephyr/llext/buf_loader.h>
 #include <zephyr/llext/fs_loader.h>
@@ -316,6 +317,77 @@ LLEXT_LOAD_UNLOAD(threads_kernel_objects,
 	.test_setup = threads_objects_test_setup,
 )
 
+static LLEXT_CONST uint8_t align_ext[] ELF_ALIGN = {
+	#include "align.inc"
+};
+LLEXT_LOAD_UNLOAD(align)
+
+static LLEXT_CONST uint8_t inspect_ext[] ELF_ALIGN = {
+	#include "inspect.inc"
+};
+
+void do_inspect_checks(struct llext_loader *ldr, struct llext *ext, enum llext_mem reg_idx,
+		       const char *sect_name, const char *sym_name)
+{
+	const elf_shdr_t *sect_hdr = NULL, *reg_hdr = NULL;
+	enum llext_mem sect_region = LLEXT_MEM_COUNT;
+	uintptr_t reg_addr = 0, sym_addr = 0;
+	size_t reg_size = 0, sect_offset = 0;
+	int sect_shndx, res;
+
+	res = llext_get_region_info(ldr, ext, reg_idx,
+				    &reg_hdr, (const void **)&reg_addr, &reg_size);
+	zassert_ok(res, "get_region_info() should succeed");
+	sect_shndx = llext_section_shndx(ldr, ext, sect_name);
+	zassert_true(sect_shndx > 0, "section %s should be found", sect_name);
+	res = llext_get_section_info(ldr, ext, sect_shndx,
+				     &sect_hdr, &sect_region, &sect_offset);
+	zassert_ok(res, "get_section_info() should succeed");
+	sym_addr = (uintptr_t)llext_find_sym(&ext->exp_tab, sym_name);
+	zassert_true(sym_addr, "symbol %s must be exported", sym_name);
+
+	zassert_equal(reg_idx, sect_region, "region mismatch (expected %d, got %d)",
+		      reg_idx, sect_region);
+	zassert_true(sect_hdr->sh_offset >= reg_hdr->sh_offset &&
+		     (sect_hdr->sh_offset + sect_hdr->sh_size <=
+		      reg_hdr->sh_offset + reg_hdr->sh_size),
+		     "section %s overflows its region %d", sect_name, reg_idx);
+	zassert_true(sect_offset < reg_size, "section offset outside region");
+	zassert_true(sym_addr >= reg_addr && sym_addr < reg_addr + reg_size,
+		     "symbol %s mapped outside region %d", sym_name, reg_idx);
+	zassert_true(sym_addr >= reg_addr + sect_offset &&
+		     sym_addr < reg_addr + sect_offset + sect_hdr->sh_size,
+		     "symbol %s mapped outside section %s", sym_name, sect_name);
+}
+
+ZTEST(llext, test_inspect)
+{
+	int res;
+
+	struct llext_buf_loader buf_loader =
+		LLEXT_BUF_LOADER(inspect_ext, sizeof(inspect_ext));
+	struct llext_loader *ldr = &buf_loader.loader;
+	struct llext_load_param ldr_parm = LLEXT_LOAD_PARAM_DEFAULT;
+	struct llext *ext = NULL;
+	size_t max_alloc_bytes;
+
+	ldr_parm.keep_section_info = true;
+	res = llext_load(ldr, "inspect", &ext, &ldr_parm);
+	zassert_ok(res, "load should succeed");
+
+	do_inspect_checks(ldr, ext, LLEXT_MEM_BSS, ".bss", "number_in_bss");
+	do_inspect_checks(ldr, ext, LLEXT_MEM_DATA, ".data", "number_in_data");
+	do_inspect_checks(ldr, ext, LLEXT_MEM_RODATA, ".rodata", "number_in_rodata");
+	do_inspect_checks(ldr, ext, LLEXT_MEM_RODATA, ".my_rodata", "number_in_my_rodata");
+	do_inspect_checks(ldr, ext, LLEXT_MEM_TEXT, ".text", "function_in_text");
+
+	max_alloc_bytes = ext->alloc_size;
+	llext_free_inspection_data(ldr, ext);
+	zassert_true(ext->alloc_size < max_alloc_bytes, "inspection data should be freed");
+
+	llext_unload(&ext);
+}
+
 #ifndef CONFIG_LLEXT_TYPE_ELF_OBJECT
 static LLEXT_CONST uint8_t multi_file_ext[] ELF_ALIGN = {
 	#include "multi_file.inc"
@@ -329,6 +401,13 @@ static LLEXT_CONST uint8_t riscv_edge_case_cb_type_ext[] ELF_ALIGN = {
 LLEXT_LOAD_UNLOAD(riscv_edge_case_cb_type)
 #endif /* CONFIG_RISCV && CONFIG_RISCV_ISA_EXT_C */
 
+#if defined(CONFIG_RISCV)
+static LLEXT_CONST uint8_t riscv_edge_case_non_paired_hi20_lo12_ext[] ELF_ALIGN = {
+	#include "riscv_edge_case_non_paired_hi20_lo12.inc"
+};
+LLEXT_LOAD_UNLOAD(riscv_edge_case_non_paired_hi20_lo12)
+#endif /* CONFIG_RISCV */
+
 #endif /* !CONFIG_LLEXT_TYPE_ELF_OBJECT */
 
 #ifndef CONFIG_USERSPACE
diff --git a/tests/subsys/logging/log_core_additional/src/log_test.c b/tests/subsys/logging/log_core_additional/src/log_test.c
index 1af13cb562264..2479cbe59f626 100644
--- a/tests/subsys/logging/log_core_additional/src/log_test.c
+++ b/tests/subsys/logging/log_core_additional/src/log_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Intel Corporation
+ * Copyright (c) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -95,13 +95,6 @@ static void process(const struct log_backend *const backend,
 			      "Unexpected log severity");
 	}
 
-	cb->counter++;
-	if (IS_ENABLED(CONFIG_LOG_PROCESS_THREAD)) {
-		if (cb->counter == cb->total_logs) {
-			k_sem_give(&log_sem);
-		}
-	}
-
 	if (k_is_user_context()) {
 		zassert_equal(log_msg_get_domain(&(msg->log)), domain,
 				"Unexpected domain id");
@@ -112,6 +105,13 @@ static void process(const struct log_backend *const backend,
 
 	flags = log_backend_std_get_flags();
 	log_output_msg_process(&log_output, &msg->log, flags);
+
+	cb->counter++;
+	if (IS_ENABLED(CONFIG_LOG_PROCESS_THREAD)) {
+		if (cb->counter == cb->total_logs) {
+			k_sem_give(&log_sem);
+		}
+	}
 }
 
 static void panic(const struct log_backend *const backend)
@@ -171,6 +171,7 @@ static void log_setup(bool backend2_enable)
 static bool log_test_process(void)
 {
 	if (IS_ENABLED(CONFIG_LOG_PROCESS_THREAD)) {
+		log_flush();
 		/* waiting for all logs have been handled */
 		k_sem_take(&log_sem, K_FOREVER);
 		return false;
@@ -277,7 +278,7 @@ ZTEST(test_log_core_additional, test_log_early_logging)
 		LOG_WRN("log warn before backend active");
 		LOG_ERR("log error before backend active");
 
-		TC_PRINT("Activate backend with context");
+		TC_PRINT("Activate backend with context\n");
 		memset(&backend1_cb, 0, sizeof(backend1_cb));
 		backend1_cb.total_logs = 3;
 		log_backend_enable(&backend1, &backend1_cb, LOG_LEVEL_DBG);
@@ -381,7 +382,7 @@ ZTEST(test_log_core_additional, test_multiple_backends)
 {
 	int cnt;
 
-	TC_PRINT("Test multiple backends");
+	TC_PRINT("Test multiple backends\n");
 	/* enable both backend1 and backend2 */
 	log_setup(true);
 	STRUCT_SECTION_COUNT(log_backend, &cnt);
diff --git a/tests/subsys/logging/log_stack/CMakeLists.txt b/tests/subsys/logging/log_stack/CMakeLists.txt
deleted file mode 100644
index 02a65e67cd884..0000000000000
--- a/tests/subsys/logging/log_stack/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(log_stack)
-
-target_sources(app PRIVATE src/main.c)
-if(CONFIG_CPP)
-  # When testing for C++ force test file C++ compilation
-  set_source_files_properties(src/main.c PROPERTIES LANGUAGE CXX)
-endif()
diff --git a/tests/subsys/logging/log_stack/prj.conf b/tests/subsys/logging/log_stack/prj.conf
deleted file mode 100644
index c323d2513c3df..0000000000000
--- a/tests/subsys/logging/log_stack/prj.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_ZTEST=y
-CONFIG_ASSERT=y
-
-CONFIG_TEST_LOGGING_DEFAULTS=n
-CONFIG_LOG=y
-CONFIG_INIT_STACKS=y
-CONFIG_THREAD_STACK_INFO=y
-
-CONFIG_TEST_EXTRA_STACK_SIZE=4096
-CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_ZTEST_STACK_SIZE=2048
diff --git a/tests/subsys/logging/log_stack/src/main.c b/tests/subsys/logging/log_stack/src/main.c
deleted file mode 100644
index 385dd865b2bc0..0000000000000
--- a/tests/subsys/logging/log_stack/src/main.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2022 Nordic Semiconductor
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <zephyr/ztest.h>
-#include <zephyr/logging/log.h>
-
-/* The idea of this test is to estimate stack usage of logging messages. Each
- * test checks stack usage before and after logging a message. Increase of stack
- * usage is interpreted as stack used by the logging. Test has been used to
- * characterize some common architectures and it will fail if significantly more
- * stack is used.
- *
- * This will help to detect when changes in logging, toolchain or modules used
- * by logging increase stack usage. Failure of the test should lead to investigation
- * to determine if stack usage change is justified. If it is justified, thresholds
- * may be updated.
- */
-
-LOG_MODULE_REGISTER(test);
-
-static size_t simple_usage;
-static size_t hexdump_usage;
-static size_t more_args_usage;
-
-/* Stack increase margin. */
-#ifdef CONFIG_PICOLIBC
-#define STACK_USAGE_MARGIN 128
-#else
-#define STACK_USAGE_MARGIN 16
-#endif
-
-static void after(void *data)
-{
-	PRINT("#elif %sdefined(CONFIG_LOG_MODE_IMMEDIATE) && %sdefined(CONFIG_NO_OPTIMIZATIONS)\n",
-		IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE) ? "" : "!",
-		IS_ENABLED(CONFIG_NO_OPTIMIZATIONS) ? "" : "!");
-	PRINT("#define SIMPLE_USAGE %zu\n", simple_usage);
-	PRINT("#define HEXDUMP_USAGE %zu\n", hexdump_usage);
-	PRINT("#define MORE_ARGS_USAGE %zu\n", more_args_usage);
-}
-
-ZTEST_SUITE(test_log_stack, NULL, NULL, NULL, NULL, after);
-
-#define TEST_LOG_STACK(usage, log_msg) do { \
-	size_t unused, unused2; \
-	int err; \
-	\
-	k_msleep(100); \
-	err = k_thread_stack_space_get(k_current_get(), &unused); \
-	zassert_equal(err, 0); \
-	__DEBRACKET log_msg; \
-	\
-	k_msleep(100); \
-	\
-	err = k_thread_stack_space_get(k_current_get(), &unused2); \
-	zassert_equal(err, 0); \
-	\
-	usage = unused - unused2; \
-	PRINT("Stack increase due to log usage: %zu\n", usage); \
-} while (0)
-
-#if defined(CONFIG_CPU_CORTEX_M0)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 120
-#define HEXDUMP_USAGE 120
-#define MORE_ARGS_USAGE 136
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 436
-#define HEXDUMP_USAGE 436
-#define MORE_ARGS_USAGE 452
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 168
-#define HEXDUMP_USAGE 168
-#define MORE_ARGS_USAGE 171
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 911
-#define HEXDUMP_USAGE 911
-#define MORE_ARGS_USAGE 927
-#endif
-
-#elif defined(CONFIG_CPU_CORTEX_M3)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 160
-#define HEXDUMP_USAGE 160
-#define MORE_ARGS_USAGE 176
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 388
-#define HEXDUMP_USAGE 388
-#define MORE_ARGS_USAGE 404
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 144
-#define HEXDUMP_USAGE 88
-#define MORE_ARGS_USAGE 144
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 640
-#define HEXDUMP_USAGE 640
-#define MORE_ARGS_USAGE 656
-#endif
-
-#elif defined(CONFIG_X86) && !defined(CONFIG_X86_64)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 72
-#define HEXDUMP_USAGE 68
-#define MORE_ARGS_USAGE 88
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 448
-#define HEXDUMP_USAGE 444
-#define MORE_ARGS_USAGE 484
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 288
-#define HEXDUMP_USAGE 272
-#define MORE_ARGS_USAGE 304
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 988
-#define HEXDUMP_USAGE 972
-#define MORE_ARGS_USAGE 1020
-#endif
-
-#elif defined(CONFIG_X86_64)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 168
-#define HEXDUMP_USAGE 136
-#define MORE_ARGS_USAGE 200
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 1120
-#define HEXDUMP_USAGE 1104
-#define MORE_ARGS_USAGE 1184
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 576
-#define HEXDUMP_USAGE 576
-#define MORE_ARGS_USAGE 608
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 1680
-#define HEXDUMP_USAGE 1680
-#define MORE_ARGS_USAGE 1744
-#endif
-
-#elif defined(CONFIG_RISCV) && !defined(CONFIG_64BIT) && !defined(CONFIG_SMP)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 136
-#define HEXDUMP_USAGE 136
-#define MORE_ARGS_USAGE 152
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 504
-#define HEXDUMP_USAGE 504
-#define MORE_ARGS_USAGE 520
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 240
-#define HEXDUMP_USAGE 240
-#define MORE_ARGS_USAGE 240
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 992
-#define HEXDUMP_USAGE 992
-#define MORE_ARGS_USAGE 1008
-#endif
-
-#elif defined(CONFIG_RISCV) && !defined(CONFIG_64BIT) && defined(CONFIG_SMP)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 96
-#define HEXDUMP_USAGE 96
-#define MORE_ARGS_USAGE 112
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 456
-#define HEXDUMP_USAGE 456
-#define MORE_ARGS_USAGE 472
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 304
-#define HEXDUMP_USAGE 240
-#define MORE_ARGS_USAGE 240
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 1008
-#define HEXDUMP_USAGE 1008
-#define MORE_ARGS_USAGE 1024
-#endif
-
-#elif defined(CONFIG_RISCV) && defined(CONFIG_64BIT) && defined(CONFIG_SMP)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 200
-#define HEXDUMP_USAGE 168
-#define MORE_ARGS_USAGE 232
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 736
-#define HEXDUMP_USAGE 768
-#define MORE_ARGS_USAGE 768
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 320
-#define HEXDUMP_USAGE 320
-#define MORE_ARGS_USAGE 320
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 1248
-#define HEXDUMP_USAGE 1248
-#define MORE_ARGS_USAGE 1280
-#endif
-
-#elif defined(CONFIG_RISCV) && defined(CONFIG_64BIT)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 240
-#define HEXDUMP_USAGE 240
-#define MORE_ARGS_USAGE 272
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 704
-#define HEXDUMP_USAGE 704
-#define MORE_ARGS_USAGE 736
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 320
-#define HEXDUMP_USAGE 320
-#define MORE_ARGS_USAGE 320
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 1128
-#define HEXDUMP_USAGE 1128
-#define MORE_ARGS_USAGE 1160
-#endif
-
-#elif defined(CONFIG_SPARC)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 0
-#define HEXDUMP_USAGE 28
-#define MORE_ARGS_USAGE 0
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 849
-#define HEXDUMP_USAGE 849
-#define MORE_ARGS_USAGE 865
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 416
-#define HEXDUMP_USAGE 232
-#define MORE_ARGS_USAGE 416
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 1544
-#define HEXDUMP_USAGE 1544
-#define MORE_ARGS_USAGE 1560
-#endif
-
-#elif defined(CONFIG_XTENSA)
-
-#if !defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 72
-#define HEXDUMP_USAGE 168
-#define MORE_ARGS_USAGE 88
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && !defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 584
-#define HEXDUMP_USAGE 584
-#define MORE_ARGS_USAGE 600
-#elif !defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 336
-#define HEXDUMP_USAGE 336
-#define MORE_ARGS_USAGE 336
-#elif defined(CONFIG_LOG_MODE_IMMEDIATE) && defined(CONFIG_NO_OPTIMIZATIONS)
-#define SIMPLE_USAGE 1040
-#define HEXDUMP_USAGE 1040
-#define MORE_ARGS_USAGE 1056
-#endif
-
-#else
-/* For other platforms which were not characterized use something big. */
-#define SIMPLE_USAGE 2000
-#define HEXDUMP_USAGE 2000
-#define MORE_ARGS_USAGE 2000
-#endif
-
-#define SIMPLE_USAGE_LIMIT (SIMPLE_USAGE + STACK_USAGE_MARGIN)
-#define HEXDUMP_USAGE_LIMIT (HEXDUMP_USAGE + STACK_USAGE_MARGIN)
-#define MORE_ARGS_USAGE_LIMIT (MORE_ARGS_USAGE + STACK_USAGE_MARGIN)
-
-ZTEST(test_log_stack, test_log_simple)
-{
-	uint32_t test_u = 1;
-	int test_i = 1;
-
-	TEST_LOG_STACK(simple_usage, (LOG_INF("test %u %d", test_u, test_i)));
-
-	zassert_true(simple_usage <= SIMPLE_USAGE_LIMIT, "Usage:%zu, expected:%zu",
-			simple_usage, SIMPLE_USAGE_LIMIT);
-}
-
-ZTEST(test_log_stack, test_log_hexdump)
-{
-	uint8_t data[] = {1, 2, 3, 4};
-
-	TEST_LOG_STACK(hexdump_usage, (LOG_HEXDUMP_INF(data, sizeof(data), "description")));
-
-	zassert_true(hexdump_usage <= HEXDUMP_USAGE_LIMIT, "Usage:%zu, expected:%zu",
-			hexdump_usage, HEXDUMP_USAGE_LIMIT);
-}
-
-ZTEST(test_log_stack, test_log_more_args)
-{
-	TEST_LOG_STACK(more_args_usage, (LOG_INF("test %d %d %d %d %d %d",
-				k_uptime_get_32(), k_uptime_get_32(),
-				k_uptime_get_32(), k_uptime_get_32(),
-				k_uptime_get_32(), k_uptime_get_32())));
-
-	zassert_true(more_args_usage <= MORE_ARGS_USAGE_LIMIT, "Usage:%zu, expected:%zu",
-			more_args_usage, MORE_ARGS_USAGE_LIMIT);
-}
diff --git a/tests/subsys/logging/log_stack/testcase.yaml b/tests/subsys/logging/log_stack/testcase.yaml
deleted file mode 100644
index 92534b65ab0c2..0000000000000
--- a/tests/subsys/logging/log_stack/testcase.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-common:
-  platform_type:
-    - qemu
-  tags:
-    - log_api
-    - logging
-  skip: true
-  integration_platforms:
-    - qemu_x86
-tests:
-  logging.stack.deferred:
-    extra_configs:
-      - CONFIG_LOG_MODE_DEFERRED=y
-  logging.stack.deferred_no_opt:
-    filter: not CONFIG_MIPS
-    extra_configs:
-      - CONFIG_LOG_MODE_DEFERRED=y
-      - CONFIG_NO_OPTIMIZATIONS=y
-      - CONFIG_ZTEST_WARN_NO_OPTIMIZATIONS=n
-      - CONFIG_IDLE_STACK_SIZE=2048
-  logging.stack.immediate:
-    extra_configs:
-      - CONFIG_LOG_MODE_IMMEDIATE=y
-  logging.stack.immediate_no_opt:
-    filter: not CONFIG_MIPS
-    extra_configs:
-      - CONFIG_LOG_MODE_IMMEDIATE=y
-      - CONFIG_NO_OPTIMIZATIONS=y
-      - CONFIG_ZTEST_WARN_NO_OPTIMIZATIONS=n
-      - CONFIG_IDLE_STACK_SIZE=2048
-  logging.stack.deferred_cpp:
-    extra_configs:
-      - CONFIG_LOG_MODE_DEFERRED=y
-      - CONFIG_CPP=y
-  logging.stack.deferred_cpp_no_opt:
-    filter: not CONFIG_MIPS
-    extra_configs:
-      - CONFIG_LOG_MODE_DEFERRED=y
-      - CONFIG_NO_OPTIMIZATIONS=y
-      - CONFIG_ZTEST_WARN_NO_OPTIMIZATIONS=n
-      - CONFIG_CPP=y
-  logging.stack.immediate_cpp:
-    extra_configs:
-      - CONFIG_LOG_MODE_IMMEDIATE=y
-      - CONFIG_CPP=y
-  logging.stack.immediate_cpp_no_opt:
-    filter: not CONFIG_MIPS
-    extra_configs:
-      - CONFIG_LOG_MODE_IMMEDIATE=y
-      - CONFIG_NO_OPTIMIZATIONS=y
-      - CONFIG_ZTEST_WARN_NO_OPTIMIZATIONS=n
-      - CONFIG_CPP=y
diff --git a/tests/subsys/mgmt/mcumgr/enum_mgmt/testcase.yaml b/tests/subsys/mgmt/mcumgr/enum_mgmt/testcase.yaml
index ebfd3014e8170..7173df38f862a 100644
--- a/tests/subsys/mgmt/mcumgr/enum_mgmt/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/enum_mgmt/testcase.yaml
@@ -13,17 +13,17 @@ common:
     - mcumgr
     - enum_mgmt
 tests:
-  enum.mgmt:
+  mgmt.mcumgr.enum.mgmt:
     build_only: false
-  enum.mgmt.shell:
+  mgmt.mcumgr.enum.mgmt.shell:
     extra_configs:
       - CONFIG_SHELL=y
       - CONFIG_SHELL_BACKEND_DUMMY=y
       - CONFIG_MCUMGR_GRP_SHELL=y
-  enum.mgmt.os:
+  mgmt.mcumgr.enum.mgmt.os:
     extra_configs:
       - CONFIG_MCUMGR_GRP_OS=y
-  enum.mgmt.shell.os:
+  mgmt.mcumgr.enum.mgmt.shell.os:
     extra_configs:
       - CONFIG_SHELL=y
       - CONFIG_SHELL_BACKEND_DUMMY=y
diff --git a/tests/subsys/mgmt/mcumgr/img_mgmt_slot_info/testcase.yaml b/tests/subsys/mgmt/mcumgr/img_mgmt_slot_info/testcase.yaml
index dc795e49fb97d..55f52209f7d69 100644
--- a/tests/subsys/mgmt/mcumgr/img_mgmt_slot_info/testcase.yaml
+++ b/tests/subsys/mgmt/mcumgr/img_mgmt_slot_info/testcase.yaml
@@ -13,10 +13,10 @@ common:
     - img_mgmt
   build_only: false
 tests:
-  img.mgmt.slot.info: {}
-  img.mgmt.slot.info.too.large:
+  mgmt.mcumgr.img.mgmt.slot.info: {}
+  mgmt.mcumgr.img.mgmt.slot.info.too.large:
     extra_args:
       - FILE_SUFFIX=too_large
-  img.mgmt.slot.info.dual.slot:
+  mgmt.mcumgr.slot.info.dual.slot:
     extra_args:
       - FILE_SUFFIX=dual_slot
diff --git a/tests/subsys/mgmt/mcumgr/settings_mgmt/src/main.c b/tests/subsys/mgmt/mcumgr/settings_mgmt/src/main.c
index e5da57b400969..21b4b90e77b1c 100644
--- a/tests/subsys/mgmt/mcumgr/settings_mgmt/src/main.c
+++ b/tests/subsys/mgmt/mcumgr/settings_mgmt/src/main.c
@@ -66,6 +66,12 @@ static const uint8_t test_response_error_data[8] = {
 	0xbf, 0x62, 0x72, 0x63, 0x19, 0x01, 0x00, 0xff
 };
 
+/*
+ * TODO: The contents of these structs are not used, which is why clang complains.
+ * The test should be updated to use these values. See discussion in
+ * https://github.com/zephyrproject-rtos/zephyr/pull/87592.
+ */
+TOOLCHAIN_DISABLE_CLANG_WARNING(TOOLCHAIN_WARNING_UNNEEDED_INTERNAL_DECLARATION)
 static const uint8_t test_response_read_data_start[5] = {
 	0xbf, 0x63, 0x76, 0x61, 0x6c
 };
@@ -73,6 +79,7 @@ static const uint8_t test_response_read_data_start[5] = {
 static const uint8_t test_response_read_data_end[1] = {
 	0xff
 };
+TOOLCHAIN_ENABLE_CLANG_WARNING(TOOLCHAIN_WARNING_UNNEEDED_INTERNAL_DECLARATION)
 
 static void cleanup_test(void *p)
 {
diff --git a/tests/subsys/modem/modem_cmux/prj.conf b/tests/subsys/modem/modem_cmux/prj.conf
index 905fe8235d62f..55e5ef14f852b 100644
--- a/tests/subsys/modem/modem_cmux/prj.conf
+++ b/tests/subsys/modem/modem_cmux/prj.conf
@@ -5,5 +5,6 @@ CONFIG_NO_OPTIMIZATIONS=y
 
 CONFIG_MODEM_MODULES=y
 CONFIG_MODEM_CMUX=y
+CONFIG_MODEM_CMUX_MTU=64
 
 CONFIG_ZTEST=y
diff --git a/tests/subsys/modem/modem_cmux/src/main.c b/tests/subsys/modem/modem_cmux/src/main.c
index 579dbb8635ed0..b1adce37cc46a 100644
--- a/tests/subsys/modem/modem_cmux/src/main.c
+++ b/tests/subsys/modem/modem_cmux/src/main.c
@@ -27,6 +27,8 @@
 #define EVENT_CMUX_DLCI1_CLOSED		BIT(7)
 #define EVENT_CMUX_DLCI2_CLOSED		BIT(8)
 #define EVENT_CMUX_DISCONNECTED		BIT(9)
+#define CMUX_BASIC_HRD_SMALL_SIZE	6
+#define CMUX_BASIC_HRD_LARGE_SIZE	7
 
 /*************************************************************************************************/
 /*                                          Instances                                            */
@@ -195,6 +197,8 @@ static uint8_t cmux_frame_data_dlci2_ppp_18[] = {0x7E, 0xFF, 0x7D, 0x23, 0xC0, 0
 						 0x7D, 0x22, 0x7D, 0x21, 0x7D, 0x20,
 						 0x7D, 0x24, 0x7D, 0x3C, 0x90, 0x7E};
 
+static uint8_t cmux_frame_data_large[127] = { [0 ... 126] = 0xAA };
+
 const static struct modem_backend_mock_transaction transaction_control_cld = {
 	.get = cmux_frame_control_cld_cmd,
 	.get_size = sizeof(cmux_frame_control_cld_cmd),
@@ -864,4 +868,22 @@ ZTEST(modem_cmux, test_modem_drop_frames_with_invalid_length)
 		     "Incorrect data received");
 }
 
+ZTEST(modem_cmux, test_modem_cmux_split_large_data)
+{
+	int ret;
+	uint32_t events;
+
+	ret = modem_pipe_transmit(dlci2_pipe, cmux_frame_data_large,
+				  sizeof(cmux_frame_data_large));
+	zassert_true(ret == CONFIG_MODEM_CMUX_MTU, "Failed to split large data %d", ret);
+
+	events = k_event_wait(&cmux_event, EVENT_CMUX_DLCI2_TRANSMIT_IDLE, false, K_MSEC(200));
+	zassert_equal(events, EVENT_CMUX_DLCI2_TRANSMIT_IDLE,
+		      "Transmit idle event not received for DLCI2 pipe");
+
+	ret = modem_backend_mock_get(&bus_mock, buffer2, sizeof(buffer2));
+	zassert_true(ret == CONFIG_MODEM_CMUX_MTU + CMUX_BASIC_HRD_SMALL_SIZE,
+		     "Incorrect number of bytes transmitted %d", ret);
+}
+
 ZTEST_SUITE(modem_cmux, NULL, test_modem_cmux_setup, test_modem_cmux_before, NULL, NULL);
diff --git a/tests/subsys/modem/modem_cmux_pair/prj.conf b/tests/subsys/modem/modem_cmux_pair/prj.conf
index bf21fcb42ac77..57838ca67e394 100644
--- a/tests/subsys/modem/modem_cmux_pair/prj.conf
+++ b/tests/subsys/modem/modem_cmux_pair/prj.conf
@@ -5,5 +5,6 @@ CONFIG_NO_OPTIMIZATIONS=y
 
 CONFIG_MODEM_MODULES=y
 CONFIG_MODEM_CMUX=y
+CONFIG_MODEM_CMUX_MTU=64
 
 CONFIG_ZTEST=y
diff --git a/tests/subsys/modem/modem_ppp/prj.conf b/tests/subsys/modem/modem_ppp/prj.conf
index ac0366608ddb5..5eef452240b82 100644
--- a/tests/subsys/modem/modem_ppp/prj.conf
+++ b/tests/subsys/modem/modem_ppp/prj.conf
@@ -7,7 +7,7 @@ CONFIG_NETWORKING=y
 CONFIG_MODEM_MODULES=y
 CONFIG_MODEM_PPP=y
 CONFIG_NET_L2_PPP=y
-CONFIG_ETH_NATIVE_POSIX=n
+CONFIG_ETH_NATIVE_TAP=n
 
 CONFIG_ZTEST=y
 
diff --git a/tests/subsys/modem/modem_ppp/src/main.c b/tests/subsys/modem/modem_ppp/src/main.c
index 5816a65ffa0dc..0948eb2c4b5ab 100644
--- a/tests/subsys/modem/modem_ppp/src/main.c
+++ b/tests/subsys/modem/modem_ppp/src/main.c
@@ -12,6 +12,7 @@
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_l2.h>
+#include <zephyr/net/ethernet.h>
 #include <zephyr/net/ppp.h>
 #include <zephyr/sys/crc.h>
 #include <string.h>
@@ -77,8 +78,6 @@ static uint8_t wrapped_buffer[4096];
 /*************************************************************************************************/
 /*                                  Mock network interface                                       */
 /*************************************************************************************************/
-static uint8_t test_net_link_addr[] = {0x00, 0x00, 0x5E, 0x00, 0x53, 0x01};
-
 static enum net_verdict test_net_l2_recv(struct net_if *iface, struct net_pkt *pkt)
 {
 	/* Validate buffer not overflowing */
@@ -99,8 +98,8 @@ static struct net_l2 test_net_l2 = {
 /* This emulates the network interface device which will receive unwrapped network packets */
 static struct net_if_dev test_net_if_dev = {
 	.l2 = &test_net_l2,
-	.link_addr.addr = test_net_link_addr,
-	.link_addr.len = sizeof(test_net_link_addr),
+	.link_addr.addr = {0x00, 0x00, 0x5E, 0x00, 0x53, 0x01},
+	.link_addr.len = NET_ETH_ADDR_LEN,
 	.link_addr.type = NET_LINK_DUMMY,
 	.mtu = 1500,
 	.oper_state = NET_IF_OPER_UP,
diff --git a/tests/subsys/nrfs/testcase.yaml b/tests/subsys/nrfs/testcase.yaml
deleted file mode 100644
index 527ff477cd004..0000000000000
--- a/tests/subsys/nrfs/testcase.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-common:
-  platform_allow:
-    - nrf54h20dk/nrf54h20/cpuapp
-    - nrf54h20dk/nrf54h20/cpurad
-  integration_platforms:
-    - nrf54h20dk/nrf54h20/cpuapp
-    - nrf54h20dk/nrf54h20/cpurad
-  tags:
-    - nrfs
-  harness: ztest
-  sysbuild: true
-
-tests:
-  subsys.nrfs.stress_test: {}
diff --git a/tests/subsys/openthread/testcase.yaml b/tests/subsys/openthread/testcase.yaml
index 163024d86b72b..4b791d70c495a 100644
--- a/tests/subsys/openthread/testcase.yaml
+++ b/tests/subsys/openthread/testcase.yaml
@@ -2,9 +2,6 @@ common:
   platform_allow:
     - native_sim
     - native_sim/native/64
-  platform_exclude:
-    - native_posix/native/64
-    - native_posix
   integration_platforms:
     - native_sim
   tags:
diff --git a/tests/subsys/pm/device_driver_init/src/main.c b/tests/subsys/pm/device_driver_init/src/main.c
index 014e02a59409b..d38d6ed1429b3 100644
--- a/tests/subsys/pm/device_driver_init/src/main.c
+++ b/tests/subsys/pm/device_driver_init/src/main.c
@@ -70,4 +70,59 @@ ZTEST(device_driver_init, test_device_driver_init)
 #endif
 }
 
+struct pm_transition_test_dev_data {
+	enum pm_device_state state_turn_on;
+	enum pm_device_state state_resume;
+	bool state_other;
+};
+
+static int pm_transition_test_dev_pm_action(const struct device *dev, enum pm_device_action action)
+{
+	struct pm_transition_test_dev_data *data = dev->data;
+
+	/* Preserve the observed internal state when actions ran */
+	switch (action) {
+	case PM_DEVICE_ACTION_TURN_ON:
+		pm_device_state_get(dev, &data->state_turn_on);
+		break;
+	case PM_DEVICE_ACTION_RESUME:
+		pm_device_state_get(dev, &data->state_resume);
+		break;
+	default:
+		data->state_other = true;
+	}
+	return 0;
+}
+
+static int pm_transition_test_dev_init(const struct device *dev)
+{
+	struct pm_transition_test_dev_data *data = dev->data;
+
+	data->state_turn_on = UINT8_MAX;
+	data->state_resume = UINT8_MAX;
+	data->state_other = false;
+
+	return pm_device_driver_init(dev, pm_transition_test_dev_pm_action);
+}
+
+static struct pm_transition_test_dev_data dev_data;
+PM_DEVICE_DEFINE(pm_transition_test_dev_pm, pm_transition_test_dev_pm_action);
+DEVICE_DEFINE(pm_transition_test_dev, "test_dev", pm_transition_test_dev_init,
+	PM_DEVICE_GET(pm_transition_test_dev_pm), &dev_data, NULL,
+	POST_KERNEL, 0, NULL);
+
+ZTEST(device_driver_init, test_device_driver_init_pm_state)
+{
+#ifdef CONFIG_PM_DEVICE
+	zassert_equal(PM_DEVICE_STATE_OFF, dev_data.state_turn_on);
+	zassert_equal(PM_DEVICE_STATE_SUSPENDED, dev_data.state_resume);
+	zassert_false(dev_data.state_other);
+#else
+	/* pm_device_state_get always returns PM_DEVICE_STATE_ACTIVE */
+	zassert_equal(PM_DEVICE_STATE_ACTIVE, dev_data.state_turn_on);
+	zassert_equal(PM_DEVICE_STATE_ACTIVE, dev_data.state_resume);
+	zassert_false(dev_data.state_other);
+#endif /* CONFIG_PM */
+}
+
 ZTEST_SUITE(device_driver_init, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/pm/policy_api/app.overlay b/tests/subsys/pm/policy_api/app.overlay
index 5f1324b528535..54b02e0b28ec9 100644
--- a/tests/subsys/pm/policy_api/app.overlay
+++ b/tests/subsys/pm/policy_api/app.overlay
@@ -6,7 +6,7 @@
 / {
 	cpus {
 		cpu1: cpu@1 {
-			compatible = "zephyr,native-posix-cpu";
+			compatible = "zephyr,native-sim-cpu";
 			reg = <1>;
 			cpu-power-states = <&state2>;
 		};
diff --git a/tests/subsys/pm/power_domain_soc_state_change/CMakeLists.txt b/tests/subsys/pm/power_domain_soc_state_change/CMakeLists.txt
new file mode 100644
index 0000000000000..538cf3f561214
--- /dev/null
+++ b/tests/subsys/pm/power_domain_soc_state_change/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(power_domain_soc_state_change)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/tests/subsys/pm/power_domain_soc_state_change/Kconfig b/tests/subsys/pm/power_domain_soc_state_change/Kconfig
new file mode 100644
index 0000000000000..6a021dcd9449c
--- /dev/null
+++ b/tests/subsys/pm/power_domain_soc_state_change/Kconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+menu "Zephyr"
+source "Kconfig.zephyr"
+endmenu
+
+config TEST_PROVIDE_PM_HOOKS
+	bool "Provide PM hooks for test purposes"
+	default y
+	select HAS_PM
diff --git a/tests/subsys/pm/power_domain_soc_state_change/app.overlay b/tests/subsys/pm/power_domain_soc_state_change/app.overlay
new file mode 100644
index 0000000000000..330d60daf9d2a
--- /dev/null
+++ b/tests/subsys/pm/power_domain_soc_state_change/app.overlay
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 NXP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	power-states {
+		state0: state0 {
+			compatible = "zephyr,power-state";
+			power-state-name = "runtime-idle";
+			min-residency-us = <10000>;
+			exit-latency-us = <100>;
+		};
+
+		state1: state1 {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-idle";
+			min-residency-us = <50000>;
+			exit-latency-us = <500>;
+		};
+
+		state2: state2 {
+			compatible = "zephyr,power-state";
+			power-state-name = "standby";
+			min-residency-us = <100000>;
+			exit-latency-us = <1000>;
+		};
+	};
+
+	test_soc_state_domain: test_soc_state_domain {
+		compatible = "power-domain-soc-state-change";
+		status = "okay";
+		onoff-power-states = <&state1 &state2>;
+		#power-domain-cells = <0>;
+	};
+
+	test_dev_soc_state_change: test_dev_soc_state_change {
+		compatible = "test-device-pm";
+		status = "okay";
+		power-domains = <&test_soc_state_domain>;
+	};
+};
+
+&cpu0 {
+	cpu-power-states = <&state0 &state1 &state2>;
+};
diff --git a/tests/subsys/pm/power_domain_soc_state_change/dts/bindings/test-device-pm.yaml b/tests/subsys/pm/power_domain_soc_state_change/dts/bindings/test-device-pm.yaml
new file mode 100644
index 0000000000000..2d6c79353e086
--- /dev/null
+++ b/tests/subsys/pm/power_domain_soc_state_change/dts/bindings/test-device-pm.yaml
@@ -0,0 +1,10 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+include: [base.yaml, pm.yaml]
+
+description: |
+    This binding provides resources required to build and run the
+    tests/subsys/pm/power_domain_soc_state_change test in Zephyr.
+
+compatible: "test-device-pm"
diff --git a/tests/subsys/pm/power_domain_soc_state_change/prj.conf b/tests/subsys/pm/power_domain_soc_state_change/prj.conf
new file mode 100644
index 0000000000000..b523d1a9fdf48
--- /dev/null
+++ b/tests/subsys/pm/power_domain_soc_state_change/prj.conf
@@ -0,0 +1,7 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_ZTEST=y
+CONFIG_PM=y
+CONFIG_PM_DEVICE=y
+CONFIG_POWER_DOMAIN=y
diff --git a/tests/subsys/pm/power_domain_soc_state_change/src/main.c b/tests/subsys/pm/power_domain_soc_state_change/src/main.c
new file mode 100644
index 0000000000000..0017b2b2a41c0
--- /dev/null
+++ b/tests/subsys/pm/power_domain_soc_state_change/src/main.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/ztest.h>
+#include <zephyr/pm/device.h>
+
+#define TEST_DEV DT_NODELABEL(test_dev_soc_state_change)
+
+static int testing_domain_on_notitication;
+static int testing_domain_off_notitication;
+
+void pm_state_set(enum pm_state state, uint8_t substate_id)
+{
+	ARG_UNUSED(substate_id);
+
+	switch (testing_domain_off_notitication) {
+	case 1:
+		zassert_equal(state, PM_STATE_STANDBY, "Wrong system state %d", state);
+		break;
+	case 2:
+		zassert_true(
+			((state == PM_STATE_SUSPEND_TO_IDLE) || (state == PM_STATE_RUNTIME_IDLE)),
+			"Wrong system state %d", state);
+		break;
+	default:
+		break;
+	}
+
+	k_cpu_idle();
+}
+
+void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
+{
+	ARG_UNUSED(state);
+	ARG_UNUSED(substate_id);
+
+	irq_unlock(0);
+}
+
+static int dev_pm_action(const struct device *dev, enum pm_device_action pm_action)
+{
+	ARG_UNUSED(dev);
+
+	if (pm_action == PM_DEVICE_ACTION_TURN_ON) {
+		testing_domain_on_notitication++;
+	}
+
+	if (pm_action == PM_DEVICE_ACTION_TURN_OFF) {
+		testing_domain_off_notitication++;
+	}
+
+	return 0;
+}
+
+PM_DEVICE_DT_DEFINE(TEST_DEV, dev_pm_action);
+DEVICE_DT_DEFINE(TEST_DEV, NULL, PM_DEVICE_DT_GET(TEST_DEV), NULL, NULL, POST_KERNEL, 20, NULL);
+
+ZTEST(power_domain_soc_state_change_1cpu, test_power_domain_soc_state_change)
+{
+	const struct pm_state_info *cpu_states, *state;
+
+	pm_state_cpu_get_all(_current_cpu->id, &cpu_states);
+
+	state = &cpu_states[2];
+	/* Sleep to transition to STATE: STANDBY */
+	k_usleep(state->min_residency_us + state->exit_latency_us);
+
+	zassert_equal(testing_domain_on_notitication, 1);
+	zassert_equal(testing_domain_off_notitication, 1);
+
+	state = &cpu_states[1];
+	/* Sleep to transition to STATE: SUSPEND-TO-IDLE */
+	k_usleep(state->min_residency_us + state->exit_latency_us);
+
+	zassert_equal(testing_domain_on_notitication, 2);
+	zassert_equal(testing_domain_off_notitication, 2);
+
+	state = &cpu_states[0];
+	/* Sleep to transition to STATE: RUNTIME-IDLE */
+	k_usleep(state->min_residency_us + state->exit_latency_us);
+
+	/* The domain notification flags should remain the same as RUNTIME-IDLE
+	 * is not listed as an ON/OFF power state in device-tree.
+	 */
+	zassert_equal(testing_domain_on_notitication, 2);
+	zassert_equal(testing_domain_off_notitication, 2);
+}
+
+ZTEST_SUITE(power_domain_soc_state_change_1cpu, NULL, NULL, ztest_simple_1cpu_before,
+	    ztest_simple_1cpu_after, NULL);
diff --git a/tests/subsys/pm/power_domain_soc_state_change/testcase.yaml b/tests/subsys/pm/power_domain_soc_state_change/testcase.yaml
new file mode 100644
index 0000000000000..5923ecdae5936
--- /dev/null
+++ b/tests/subsys/pm/power_domain_soc_state_change/testcase.yaml
@@ -0,0 +1,10 @@
+# Copyright 2025 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+tests:
+  pm.power_domain_soc_state_change:
+    platform_allow:
+      - native_sim
+    integration_platforms:
+      - native_sim
+    tags: pm
diff --git a/tests/subsys/pm/power_mgmt_multicore/src/main.c b/tests/subsys/pm/power_mgmt_multicore/src/main.c
index 6915694a6d82a..e87c38ea74640 100644
--- a/tests/subsys/pm/power_mgmt_multicore/src/main.c
+++ b/tests/subsys/pm/power_mgmt_multicore/src/main.c
@@ -63,26 +63,40 @@ void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)
 
 const struct pm_state_info *pm_policy_next_state(uint8_t cpu, int ticks)
 {
-	static struct pm_state_info info = {};
+	static const struct pm_state_info states[] = {
+		{
+			.state = PM_STATE_ACTIVE
+		},
+		{
+			.state = PM_STATE_RUNTIME_IDLE
+		},
+		{
+			.state = PM_STATE_SUSPEND_TO_IDLE
+		},
+		{
+			.state = PM_STATE_STANDBY
+		},
+	};
+	static const struct pm_state_info *info;
 	int32_t msecs = k_ticks_to_ms_floor64(ticks);
 
 	if (msecs < ACTIVE_MSEC) {
-		info.state = PM_STATE_ACTIVE;
+		info = NULL;
 	} else if (msecs <= IDLE_MSEC) {
-		info.state = PM_STATE_RUNTIME_IDLE;
+		info = &states[1];
 	} else if (msecs <= SUSPEND_TO_IDLE_MSEC) {
-		info.state = PM_STATE_SUSPEND_TO_IDLE;
+		info = &states[2];
 	} else {
 		if (cpu == 0U) {
-			info.state = PM_STATE_SUSPEND_TO_IDLE;
+			info = &states[2];
 		} else {
-			info.state = PM_STATE_STANDBY;
+			info = &states[3];
 		}
 	}
 
-	state_testing[cpu] = info.state;
+	state_testing[cpu] = info ? info->state : PM_STATE_ACTIVE;
 
-	return &info;
+	return info;
 }
 
 /*
diff --git a/tests/subsys/pm/power_mgmt_soc/boards/frdm_rw612.overlay b/tests/subsys/pm/power_mgmt_soc/boards/frdm_rw612.overlay
new file mode 100644
index 0000000000000..986cdef3ff7e1
--- /dev/null
+++ b/tests/subsys/pm/power_mgmt_soc/boards/frdm_rw612.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&standby {
+	status = "okay";
+};
diff --git a/tests/subsys/pm/power_mgmt_soc/boards/rd_rw612_bga.overlay b/tests/subsys/pm/power_mgmt_soc/boards/rd_rw612_bga.overlay
new file mode 100644
index 0000000000000..986cdef3ff7e1
--- /dev/null
+++ b/tests/subsys/pm/power_mgmt_soc/boards/rd_rw612_bga.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2024 NXP
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&standby {
+	status = "okay";
+};
diff --git a/tests/subsys/pm/power_mgmt_soc/testcase.yaml b/tests/subsys/pm/power_mgmt_soc/testcase.yaml
index 63ef2f2e824d7..380cff7ab7622 100644
--- a/tests/subsys/pm/power_mgmt_soc/testcase.yaml
+++ b/tests/subsys/pm/power_mgmt_soc/testcase.yaml
@@ -13,6 +13,7 @@ tests:
       - rd_rw612_bga
       - frdm_ke17z
       - frdm_ke17z512
+      - xg29_rb4412a
     tags: pm
     integration_platforms:
       - mec15xxevb_assy6853
diff --git a/tests/subsys/pm/power_residency_time/CMakeLists.txt b/tests/subsys/pm/power_residency_time/CMakeLists.txt
new file mode 100644
index 0000000000000..5c6f384a1092f
--- /dev/null
+++ b/tests/subsys/pm/power_residency_time/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(power_residency_time)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/subsys/pm/power_residency_time/boards/stm32l562e_dk.overlay b/tests/subsys/pm/power_residency_time/boards/stm32l562e_dk.overlay
new file mode 100644
index 0000000000000..ee4d80f9e903d
--- /dev/null
+++ b/tests/subsys/pm/power_residency_time/boards/stm32l562e_dk.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&stop0{
+	compatible = "zephyr,power-state";
+	power-state-name = "suspend-to-idle";
+	substate-id = <1>;
+	min-residency-us = <500000>;
+};
+&stop1{
+	compatible = "zephyr,power-state";
+	power-state-name = "suspend-to-idle";
+	substate-id = <2>;
+	min-residency-us = <1000000>;
+};
+&stop2{
+	compatible = "zephyr,power-state";
+	power-state-name = "suspend-to-idle";
+	substate-id = <3>;
+	min-residency-us = <1500000>;
+};
diff --git a/tests/subsys/pm/power_residency_time/prj.conf b/tests/subsys/pm/power_residency_time/prj.conf
new file mode 100644
index 0000000000000..76be0e2b55436
--- /dev/null
+++ b/tests/subsys/pm/power_residency_time/prj.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_PM=y
diff --git a/tests/subsys/pm/power_residency_time/src/main.c b/tests/subsys/pm/power_residency_time/src/main.c
new file mode 100644
index 0000000000000..043b06e4135a3
--- /dev/null
+++ b/tests/subsys/pm/power_residency_time/src/main.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/devicetree.h>
+
+#define DIFF_RESIDENCY_TIME_STATE_0 600
+#define DIFF_RESIDENCY_TIME_STATE_1 600
+#define DIFF_RESIDENCY_TIME_STATE_2 600
+
+int main(void)
+{
+
+	int stop0_min_residency_time = DT_PROP(DT_NODELABEL(stop0), min_residency_us);
+	int stop1_min_residency_time = DT_PROP(DT_NODELABEL(stop1), min_residency_us);
+	int stop2_min_residency_time = DT_PROP(DT_NODELABEL(stop2), min_residency_us);
+
+	while (1) {
+		printk("\nSleep time < min_residency_time of state 0\n");
+		k_usleep(stop0_min_residency_time - DIFF_RESIDENCY_TIME_STATE_0);
+		printk("\nSleep time = min_residency_time of state 0\n");
+		k_usleep(stop0_min_residency_time);
+		printk("\nSleep time < min_residency_time of state 1\n");
+		k_usleep(stop1_min_residency_time - DIFF_RESIDENCY_TIME_STATE_1);
+		printk("\nSleep time = min_residency_time of state 1\n");
+		k_usleep(stop1_min_residency_time);
+		printk("\nSleep time < min_residency_time of state 2\n");
+		k_usleep(stop2_min_residency_time - DIFF_RESIDENCY_TIME_STATE_2);
+		printk("\nSleep time = min_residency_time of state 2\n");
+		k_usleep(stop2_min_residency_time);
+		printk("\nWakeup.\n");
+
+		/**
+		 * Keeping alive loop
+		 */
+		while (1) {
+			arch_nop();
+		}
+	}
+	return 0;
+}
diff --git a/tests/subsys/pm/power_residency_time/testcase.yaml b/tests/subsys/pm/power_residency_time/testcase.yaml
new file mode 100644
index 0000000000000..2f1e12af46441
--- /dev/null
+++ b/tests/subsys/pm/power_residency_time/testcase.yaml
@@ -0,0 +1,50 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+common:
+  harness: power
+  harness_config:
+    fixture: pm_probe
+    pytest_dut_scope: session
+    power_measurements:
+      elements_to_trim: 100
+      min_peak_distance: 40
+      min_peak_height: 0.008
+      peak_padding: 40
+      measurement_duration: 8
+      num_of_transitions: 6
+      expected_rms_values: [56.0, 4.0, 4.0, 1.4, 1.4, 0.26, 91]
+      tolerance_percentage: 10
+
+tests:
+  pm.power_residency_time:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+
+  pm.power_residency_time.pm_device:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+    extra_args:
+      - CONFIG_PM_DEVICE=y
+
+  pm.power_residency_time.pm_device_runtime:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+    extra_args:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y
+
+  pm.power_residency_time.pm_device_system_managed:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+    extra_args:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
diff --git a/tests/subsys/pm/power_states/CMakeLists.txt b/tests/subsys/pm/power_states/CMakeLists.txt
new file mode 100644
index 0000000000000..83e018923b666
--- /dev/null
+++ b/tests/subsys/pm/power_states/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(power_states)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/subsys/pm/power_states/boards/stm32l562e_dk.overlay b/tests/subsys/pm/power_states/boards/stm32l562e_dk.overlay
new file mode 100644
index 0000000000000..d128ff520ca50
--- /dev/null
+++ b/tests/subsys/pm/power_states/boards/stm32l562e_dk.overlay
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/ {
+	zephyr,user {
+		k_idle_state_min_residency_time = <400000>;
+	};
+};
+
+&stop0{
+	compatible = "zephyr,power-state";
+	power-state-name = "suspend-to-idle";
+	substate-id = <1>;
+	min-residency-us = <500000>;
+};
+&stop1{
+	compatible = "zephyr,power-state";
+	power-state-name = "suspend-to-idle";
+	substate-id = <2>;
+	min-residency-us = <1000000>;
+};
+&stop2{
+	compatible = "zephyr,power-state";
+	power-state-name = "suspend-to-idle";
+	substate-id = <3>;
+	min-residency-us = <1500000>;
+};
diff --git a/tests/subsys/pm/power_states/prj.conf b/tests/subsys/pm/power_states/prj.conf
new file mode 100644
index 0000000000000..76be0e2b55436
--- /dev/null
+++ b/tests/subsys/pm/power_states/prj.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_PM=y
diff --git a/tests/subsys/pm/power_states/src/main.c b/tests/subsys/pm/power_states/src/main.c
new file mode 100644
index 0000000000000..fb043b36d780b
--- /dev/null
+++ b/tests/subsys/pm/power_states/src/main.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <zephyr/kernel.h>
+
+int main(void)
+{
+	int k_idle_min_residency_time =
+		DT_PROP(DT_PATH(zephyr_user), k_idle_state_min_residency_time);
+	int stop0_min_residency_time = DT_PROP(DT_NODELABEL(stop0), min_residency_us);
+	int stop1_min_residency_time = DT_PROP(DT_NODELABEL(stop1), min_residency_us);
+	int stop2_min_residency_time = DT_PROP(DT_NODELABEL(stop2), min_residency_us);
+
+	while (1) {
+		printk("\nGoing to k_cpu_idle.\n");
+		k_usleep(k_idle_min_residency_time);
+		printk("\nWake Up.\n");
+		printk("\nGoing to state 0.\n");
+		k_usleep(stop0_min_residency_time);
+		printk("\nWake Up.\n");
+		printk("\nGoing to state 1.\n");
+		k_usleep(stop1_min_residency_time);
+		printk("\nWake Up.\n");
+		printk("\nGoing to state 2.\n");
+		k_usleep(stop2_min_residency_time);
+		printk("\nWake Up.\n");
+
+		/* Anti-sleeping loop */
+		while (1) {
+			arch_nop();
+		}
+	}
+	return 0;
+}
diff --git a/tests/subsys/pm/power_states/testcase.yaml b/tests/subsys/pm/power_states/testcase.yaml
new file mode 100644
index 0000000000000..3441552005932
--- /dev/null
+++ b/tests/subsys/pm/power_states/testcase.yaml
@@ -0,0 +1,50 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+common:
+  harness: power
+  harness_config:
+    fixture: pm_probe
+    pytest_dut_scope: session
+    power_measurements:
+      elements_to_trim: 100
+      min_peak_distance: 40
+      min_peak_height: 0.008
+      peak_padding: 40
+      measurement_duration: 6
+      num_of_transitions: 4
+      expected_rms_values: [56.0, 4.0, 1.4, 0.26, 140]
+      tolerance_percentage: 10
+
+tests:
+  pm.power_states:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+
+  pm.power_states.pm_device:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+    extra_args:
+      - CONFIG_PM_DEVICE=y
+
+  pm.power_states.pm_device_runtime:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+    extra_args:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_RUNTIME=y
+
+  pm.power_states.pm_device_system_managed:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+    extra_args:
+      - CONFIG_PM_DEVICE=y
+      - CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
diff --git a/tests/subsys/pm/power_wakeup_timer/CMakeLists.txt b/tests/subsys/pm/power_wakeup_timer/CMakeLists.txt
new file mode 100644
index 0000000000000..1af597083c556
--- /dev/null
+++ b/tests/subsys/pm/power_wakeup_timer/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(power_wakeup_timer)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/subsys/pm/power_wakeup_timer/boards/stm32l562e_dk.overlay b/tests/subsys/pm/power_wakeup_timer/boards/stm32l562e_dk.overlay
new file mode 100644
index 0000000000000..5a7550b22e072
--- /dev/null
+++ b/tests/subsys/pm/power_wakeup_timer/boards/stm32l562e_dk.overlay
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&rtc {
+	compatible = "st,stm32-rtc";
+	reg = < 0x40002800 0xc00 >;
+	interrupts = < 0x2 0x0 >;
+	clocks = < &rcc 0x58 0x400 >, < &rcc 0x2 0x16890 >;
+	prescaler = < 0x8000 >;
+	status = "okay";
+	wakeup-source;
+};
diff --git a/tests/subsys/pm/power_wakeup_timer/prj.conf b/tests/subsys/pm/power_wakeup_timer/prj.conf
new file mode 100644
index 0000000000000..2cb955a58771e
--- /dev/null
+++ b/tests/subsys/pm/power_wakeup_timer/prj.conf
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_RTC=y
+CONFIG_RTC_ALARM=y
+CONFIG_RTC_STM32=y
+CONFIG_PM=y
diff --git a/tests/subsys/pm/power_wakeup_timer/src/main.c b/tests/subsys/pm/power_wakeup_timer/src/main.c
new file mode 100644
index 0000000000000..14599ef253b04
--- /dev/null
+++ b/tests/subsys/pm/power_wakeup_timer/src/main.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/rtc.h>
+
+#define RTC_ALARM_FIELDS                                                                           \
+	(RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR)
+
+static const struct device *rtc = DEVICE_DT_GET(DT_NODELABEL(rtc));
+
+static k_tid_t my_tid;
+
+#define MY_STACK_SIZE 500
+#define MY_PRIORITY   5
+
+struct k_thread my_thread_data;
+K_THREAD_STACK_DEFINE(my_stack_area, MY_STACK_SIZE);
+
+void my_entry_point(void *, void *, void *)
+{
+	printk("Going sleep.\n");
+	k_msleep(3000);
+}
+
+/* Fri Jan 01 2021 13:29:50 GMT+0000 */
+static const struct rtc_time rtc_time = {
+	.tm_sec = 50,
+	.tm_min = 29,
+	.tm_hour = 13,
+	.tm_mday = 1,
+	.tm_mon = 0,
+	.tm_year = 121,
+	.tm_wday = 5,
+	.tm_yday = 1,
+	.tm_isdst = -1,
+	.tm_nsec = 0,
+};
+
+/* Fri Jan 01 2021 13:29:51 GMT+0000 */
+static const struct rtc_time alarm_time = {
+	.tm_sec = 51,
+	.tm_min = 29,
+	.tm_hour = 13,
+	.tm_mday = 1,
+	.tm_mon = 0,
+	.tm_year = 121,
+	.tm_wday = 5,
+	.tm_yday = 1,
+	.tm_isdst = -1,
+	.tm_nsec = 0,
+};
+
+static void wakeup_cb(const struct device *dev, uint16_t id, void *user_data)
+{
+	printk("Wake up by alarm.\n");
+	k_thread_abort(my_tid);
+}
+
+int main(void)
+{
+	int ret;
+	uint16_t mask = RTC_ALARM_FIELDS;
+
+	ret = rtc_set_time(rtc, &rtc_time);
+	if (ret < 0) {
+		return 0;
+	}
+
+	ret = rtc_alarm_set_time(rtc, 0, mask, &alarm_time);
+	if (ret < 0) {
+		return 0;
+	}
+
+	ret = rtc_alarm_set_callback(rtc, 0, wakeup_cb, NULL);
+	if (ret < 0) {
+		return 0;
+	}
+
+	printk("Created the thread.\n");
+	my_tid = k_thread_create(&my_thread_data, my_stack_area,
+				 K_THREAD_STACK_SIZEOF(my_stack_area), my_entry_point, NULL, NULL,
+				 NULL, MY_PRIORITY, 0, K_NO_WAIT);
+
+	k_thread_join(my_tid, K_FOREVER);
+
+	while (1) {
+		arch_nop();
+	}
+	return 0;
+}
diff --git a/tests/subsys/pm/power_wakeup_timer/testcase.yaml b/tests/subsys/pm/power_wakeup_timer/testcase.yaml
new file mode 100644
index 0000000000000..454f7908a0da2
--- /dev/null
+++ b/tests/subsys/pm/power_wakeup_timer/testcase.yaml
@@ -0,0 +1,32 @@
+# Copyright (c) 2025 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+common:
+  harness: power
+  harness_config:
+    fixture: pm_probe
+    pytest_dut_scope: session
+    power_measurements:
+      elements_to_trim: 100
+      min_peak_distance: 40
+      min_peak_height: 0.008
+      peak_padding: 40
+      measurement_duration: 2
+      num_of_transitions: 1
+      expected_rms_values: [0.26, 140]
+      tolerance_percentage: 10
+
+tests:
+  pm.power_wakeup_timer:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+
+  pm.power_wakeup_timer.pm_device:
+    platform_allow:
+      - stm32l562e_dk
+    tags:
+      - pm
+    extra_args:
+      - CONFIG_PM_DEVICE=y
diff --git a/tests/subsys/portability/cmsis_rtos_v2/prj.conf b/tests/subsys/portability/cmsis_rtos_v2/prj.conf
index d8e93b747852a..4f8f887adb333 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/prj.conf
+++ b/tests/subsys/portability/cmsis_rtos_v2/prj.conf
@@ -11,7 +11,7 @@ CONFIG_INIT_STACKS=y
 CONFIG_MAX_THREAD_BYTES=4
 CONFIG_SCHED_SCALABLE=y
 CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE=128
-CONFIG_CMSIS_V2_THREAD_MAX_COUNT=23
+CONFIG_CMSIS_V2_THREAD_MAX_COUNT=25
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT=10
 CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE=1024
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE=1024
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c b/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
index c4906eb5e9686..9d84d6b9d4ef1 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/event_flags.c
@@ -6,17 +6,18 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
 #include <zephyr/irq_offload.h>
 #include <zephyr/kernel_structs.h>
 
-#define TIMEOUT_TICKS   (100)
-#define FLAG1           (0x00000020)
-#define FLAG2           (0x00000004)
-#define FLAG            (FLAG1 | FLAG2)
-#define ISR_FLAG        0x50
-#define STACKSZ         CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
+#define TIMEOUT_TICKS (100)
+#define FLAG1         (0x00000020)
+#define FLAG2         (0x00000004)
+#define FLAG          (FLAG1 | FLAG2)
+#define ISR_FLAG      0x50
+#define STACKSZ       CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 osEventFlagsId_t evt_id;
 
@@ -77,12 +78,10 @@ void test_event_flags_no_wait_timeout(void)
 	zassert_true(evt_id != NULL, "Failed creating event flags");
 
 	name = osEventFlagsGetName(dummy_id);
-	zassert_true(name == NULL,
-		     "Invalid event Flags ID is unexpectedly working!");
+	zassert_true(name == NULL, "Invalid event Flags ID is unexpectedly working!");
 
 	name = osEventFlagsGetName(evt_id);
-	zassert_str_equal(event_flags_attrs.name, name,
-			  "Error getting event_flags object name");
+	zassert_str_equal(event_flags_attrs.name, name, "Error getting event_flags object name");
 
 	id1 = osThreadNew(thread1, evt_id, &thread1_attr);
 	zassert_true(id1 != NULL, "Failed creating thread1");
@@ -93,8 +92,7 @@ void test_event_flags_no_wait_timeout(void)
 	/* wait for FLAG1. It should return immediately as it is
 	 * already triggered.
 	 */
-	flags = osEventFlagsWait(evt_id, FLAG1,
-				 osFlagsWaitAny | osFlagsNoClear, 0);
+	flags = osEventFlagsWait(evt_id, FLAG1, osFlagsWaitAny | osFlagsNoClear, 0);
 	zassert_equal(flags & FLAG1, FLAG1, "");
 
 	/* Since the flags are not cleared automatically in the previous step,
@@ -104,8 +102,7 @@ void test_event_flags_no_wait_timeout(void)
 	zassert_equal(flags & FLAG1, FLAG1, "");
 
 	flags = osEventFlagsGet(dummy_id);
-	zassert_true(flags == 0U,
-		     "Invalid event Flags ID is unexpectedly working!");
+	zassert_true(flags == 0U, "Invalid event Flags ID is unexpectedly working!");
 	/* Clear the Flag explicitly */
 	flags = osEventFlagsClear(evt_id, FLAG1);
 	zassert_not_equal(flags, osFlagsErrorParameter, "Event clear failed");
@@ -135,34 +132,29 @@ void test_event_flags_signalled(void)
 	 * upon being set since "osFlagsNoClear" is not opted for.
 	 */
 	flags = osEventFlagsWait(evt_id, FLAG, osFlagsWaitAll, TIMEOUT_TICKS);
-	zassert_equal(flags & FLAG, FLAG,
-		      "osEventFlagsWait failed unexpectedly");
+	zassert_equal(flags & FLAG, FLAG, "osEventFlagsWait failed unexpectedly");
 
 	/* set any single flag */
 	flags = osEventFlagsSet(evt_id, FLAG1);
 	zassert_equal(flags & FLAG1, FLAG1, "set any flag failed");
 
 	flags = osEventFlagsWait(evt_id, FLAG1, osFlagsWaitAny, TIMEOUT_TICKS);
-	zassert_equal(flags & FLAG1, FLAG1,
-		      "osEventFlagsWait failed unexpectedly");
+	zassert_equal(flags & FLAG1, FLAG1, "osEventFlagsWait failed unexpectedly");
 
 	/* validate by passing invalid parameters */
 	zassert_equal(osEventFlagsSet(NULL, 0), osFlagsErrorParameter,
 		      "Invalid event Flags ID is unexpectedly working!");
-	zassert_equal(osEventFlagsSet(evt_id, 0x80010000),
-		      osFlagsErrorParameter,
+	zassert_equal(osEventFlagsSet(evt_id, 0x80010000), osFlagsErrorParameter,
 		      "Event with MSB set is set unexpectedly");
 
 	zassert_equal(osEventFlagsClear(NULL, 0), osFlagsErrorParameter,
 		      "Invalid event Flags ID is unexpectedly working!");
-	zassert_equal(osEventFlagsClear(evt_id, 0x80010000),
-		      osFlagsErrorParameter,
+	zassert_equal(osEventFlagsClear(evt_id, 0x80010000), osFlagsErrorParameter,
 		      "Event with MSB set is cleared unexpectedly");
 
 	/* cannot wait for Flag mask with MSB set */
 	zassert_equal(osEventFlagsWait(evt_id, 0x80010000, osFlagsWaitAny, 0),
-		      osFlagsErrorParameter,
-		      "EventFlagsWait passed unexpectedly");
+		      osFlagsErrorParameter, "EventFlagsWait passed unexpectedly");
 }
 
 /* IRQ offload function handler to set event flag */
@@ -174,8 +166,7 @@ static void offload_function(const void *param)
 	zassert_true(k_is_in_isr(), "Not in IRQ context!");
 
 	flags = osEventFlagsSet((osEventFlagsId_t)param, ISR_FLAG);
-	zassert_equal(flags & ISR_FLAG, ISR_FLAG,
-		      "EventFlagsSet failed in ISR");
+	zassert_equal(flags & ISR_FLAG, ISR_FLAG, "EventFlagsSet failed in ISR");
 }
 
 void test_event_from_isr(void *event_id)
@@ -201,21 +192,17 @@ void test_event_flags_isr(void)
 	id = osThreadNew(test_event_from_isr, evt_id, &thread3_attr);
 	zassert_true(id != NULL, "Failed creating thread");
 
-	flags = osEventFlagsWait(dummy_id, ISR_FLAG,
-				 osFlagsWaitAll, TIMEOUT_TICKS);
+	flags = osEventFlagsWait(dummy_id, ISR_FLAG, osFlagsWaitAll, TIMEOUT_TICKS);
 	zassert_true(flags == osFlagsErrorParameter,
 		     "Invalid event Flags ID is unexpectedly working!");
 
-	flags = osEventFlagsWait(evt_id, ISR_FLAG,
-				 osFlagsWaitAll, TIMEOUT_TICKS);
-	zassert_equal((flags & ISR_FLAG),
-		      ISR_FLAG, "unexpected event flags value");
+	flags = osEventFlagsWait(evt_id, ISR_FLAG, osFlagsWaitAll, TIMEOUT_TICKS);
+	zassert_equal((flags & ISR_FLAG), ISR_FLAG, "unexpected event flags value");
 
 	zassert_true(osEventFlagsDelete(dummy_id) == osErrorResource,
 		     "Invalid event Flags ID is unexpectedly working!");
 
-	zassert_true(osEventFlagsDelete(evt_id) == osOK,
-		     "EventFlagsDelete failed");
+	zassert_true(osEventFlagsDelete(evt_id) == osOK, "EventFlagsDelete failed");
 }
 ZTEST(cmsis_event_flags, test_event_flags)
 {
@@ -228,4 +215,21 @@ ZTEST(cmsis_event_flags, test_event_flags)
 	test_event_flags_signalled();
 	test_event_flags_isr();
 }
+
+static struct cmsis_rtos_event_cb event_cb2;
+static const osEventFlagsAttr_t event_flags_attrs2 = {
+	.name = "Event2",
+	.attr_bits = 0,
+	.cb_mem = &event_cb2,
+	.cb_size = sizeof(event_cb2),
+};
+ZTEST(cmsis_event_flags, test_event_flags_static_allocation)
+{
+	osEventFlagsId_t id;
+
+	id = osEventFlagsNew(&event_flags_attrs2);
+	zassert_not_null(id, "Failed creating event flags using static cb");
+
+	zassert_true(osEventFlagsDelete(evt_id) == osOK, "EventFlagsDelete failed");
+}
 ZTEST_SUITE(cmsis_event_flags, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c b/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
index 96071d0f1fc90..a8cf5a8af6336 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/kernel.c
@@ -60,18 +60,12 @@ void lock_unlock_check(const void *arg)
 ZTEST(cmsis_kernel, test_kernel_apis)
 {
 	versionInfo version = {
-		.os_info = {
-			.api = 0xfefefefe,
-			.kernel = 0xfdfdfdfd,
-		},
-		.info = "local function call info is uninitialized"
+		.os_info = {.api = 0xfefefefe, .kernel = 0xfdfdfdfd},
+		.info = "local function call info is uninitialized",
 	};
 	versionInfo version_irq = {
-		.os_info = {
-			.api = 0xfcfcfcfc,
-			.kernel = 0xfbfbfbfb,
-		},
-		.info = "irq_offload function call info is uninitialized"
+		.os_info = {.api = 0xfcfcfcfc, .kernel = 0xfbfbfbfb},
+		.info = "irq_offload function call info is uninitialized",
 	};
 
 	get_version_check(&version);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c b/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
index c0e4530f8648d..26cccb56f2a76 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/mempool.c
@@ -6,10 +6,11 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
-#define MAX_BLOCKS      10
-#define TIMEOUT_TICKS   10
+#define MAX_BLOCKS    10
+#define TIMEOUT_TICKS 10
 
 struct mem_block {
 	int member1;
@@ -26,8 +27,7 @@ static const osMemoryPoolAttr_t mp_attrs = {
 	.mp_size = sizeof(struct mem_block) * MAX_BLOCKS,
 };
 
-static void mempool_common_tests(osMemoryPoolId_t mp_id,
-				 const char *expected_name)
+static void mempool_common_tests(osMemoryPoolId_t mp_id, const char *expected_name)
 {
 	int i;
 	osMemoryPoolId_t dummy_id = NULL;
@@ -50,8 +50,7 @@ static void mempool_common_tests(osMemoryPoolId_t mp_id,
 	zassert_equal(osMemoryPoolGetBlockSize(dummy_id), 0,
 		      "Something's wrong with osMemoryPoolGetBlockSize!");
 
-	zassert_equal(osMemoryPoolGetBlockSize(mp_id),
-		      sizeof(struct mem_block),
+	zassert_equal(osMemoryPoolGetBlockSize(mp_id), sizeof(struct mem_block),
 		      "Something's wrong with osMemoryPoolGetBlockSize!");
 
 	/* The memory pool should be completely available at this point */
@@ -61,8 +60,7 @@ static void mempool_common_tests(osMemoryPoolId_t mp_id,
 		      "Something's wrong with osMemoryPoolGetSpace!");
 
 	for (i = 0; i < MAX_BLOCKS; i++) {
-		addr_list[i] = (struct mem_block *)osMemoryPoolAlloc(mp_id,
-								     osWaitForever);
+		addr_list[i] = (struct mem_block *)osMemoryPoolAlloc(mp_id, osWaitForever);
 		zassert_true(addr_list[i] != NULL, "mempool allocation failed");
 	}
 
@@ -75,13 +73,12 @@ static void mempool_common_tests(osMemoryPoolId_t mp_id,
 	/* All blocks in mempool are allocated, any more allocation
 	 * without free should fail
 	 */
-	addr_list[i] = (struct mem_block *)osMemoryPoolAlloc(mp_id,
-							     TIMEOUT_TICKS);
+	addr_list[i] = (struct mem_block *)osMemoryPoolAlloc(mp_id, TIMEOUT_TICKS);
 	zassert_true(addr_list[i] == NULL, "allocation happened."
-		     " Something's wrong!");
+					   " Something's wrong!");
 
-	zassert_equal(osMemoryPoolFree(dummy_id, addr_list[0]),
-		      osErrorParameter, "mempool free worked unexpectedly!");
+	zassert_equal(osMemoryPoolFree(dummy_id, addr_list[0]), osErrorParameter,
+		      "mempool free worked unexpectedly!");
 
 	for (i = 0; i < MAX_BLOCKS; i++) {
 		status = osMemoryPoolFree(mp_id, addr_list[i]);
@@ -104,8 +101,7 @@ ZTEST(cmsis_mempool, test_mempool_dynamic)
 {
 	osMemoryPoolId_t mp_id;
 
-	mp_id = osMemoryPoolNew(MAX_BLOCKS, sizeof(struct mem_block),
-				NULL);
+	mp_id = osMemoryPoolNew(MAX_BLOCKS, sizeof(struct mem_block), NULL);
 	zassert_true(mp_id != NULL, "mempool creation failed");
 
 	mempool_common_tests(mp_id, "ZephyrMemPool");
@@ -121,14 +117,36 @@ ZTEST(cmsis_mempool, test_mempool)
 	osMemoryPoolId_t mp_id;
 
 	/* Create memory pool with invalid block size */
-	mp_id = osMemoryPoolNew(MAX_BLOCKS + 1, sizeof(struct mem_block),
-				&mp_attrs);
+	mp_id = osMemoryPoolNew(MAX_BLOCKS + 1, sizeof(struct mem_block), &mp_attrs);
 	zassert_true(mp_id == NULL, "osMemoryPoolNew worked unexpectedly!");
 
-	mp_id = osMemoryPoolNew(MAX_BLOCKS, sizeof(struct mem_block),
-				&mp_attrs);
+	mp_id = osMemoryPoolNew(MAX_BLOCKS, sizeof(struct mem_block), &mp_attrs);
 	zassert_true(mp_id != NULL, "mempool creation failed");
 
 	mempool_common_tests(mp_id, mp_attrs.name);
 }
+
+static struct cmsis_rtos_mempool_cb mempool_cb2;
+static const osMemoryPoolAttr_t mp_attrs2 = {
+	.name = "TestMempool2",
+	.attr_bits = 0,
+	.cb_mem = &mempool_cb2,
+	.cb_size = sizeof(mempool_cb2),
+	.mp_mem = sample_mem,
+	.mp_size = sizeof(struct mem_block) * MAX_BLOCKS,
+};
+/**
+ * @brief Test memory pool allocation and free
+ *
+ * @see osMemoryPoolNew(), osMemoryPoolAlloc(), osMemoryPoolFree(),
+ */
+ZTEST(cmsis_mempool, test_mempool_static_allocation)
+{
+	osMemoryPoolId_t mp_id;
+
+	mp_id = osMemoryPoolNew(MAX_BLOCKS, sizeof(struct mem_block), &mp_attrs2);
+	zassert_true(mp_id != NULL, "mempool creation failed");
+
+	mempool_common_tests(mp_id, mp_attrs2.name);
+}
 ZTEST_SUITE(cmsis_mempool, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c b/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
index 0ec116e88e217..ae0a2e7df8590 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/msgq.c
@@ -6,7 +6,8 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
 struct sample_data {
 	int data1;
@@ -14,11 +15,11 @@ struct sample_data {
 	unsigned int data3;
 };
 
-#define MESSAGE1        512
-#define MESSAGE2        123456
-#define TIMEOUT_TICKS   50
-#define Q_LEN           5
-#define STACKSZ         CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
+#define MESSAGE1      512
+#define MESSAGE2      123456
+#define TIMEOUT_TICKS 50
+#define Q_LEN         5
+#define STACKSZ       CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 osMessageQueueId_t message_id;
 
@@ -27,7 +28,7 @@ void send_msg_thread(void *argument)
 	int i;
 	osStatus_t status;
 	struct sample_data sample;
-	struct sample_data data[Q_LEN] = { { 0 } };
+	struct sample_data data[Q_LEN] = {{0}};
 
 	/* Wait for message_recv to complete initial checks */
 	osDelay(TIMEOUT_TICKS);
@@ -48,10 +49,8 @@ void send_msg_thread(void *argument)
 		data[i].data1 = i * 3;
 		data[i].data2 = i * 3 + 1;
 		data[i].data3 = i * 3 + 2;
-		status = osMessageQueuePut(message_id, data + i,
-					   0, osWaitForever);
-		zassert_true(status == osOK,
-			     "osMessageQueuePut failure for message!");
+		status = osMessageQueuePut(message_id, data + i, 0, osWaitForever);
+		zassert_true(status == osOK, "osMessageQueuePut failure for message!");
 	}
 
 	/* The Queue should be full at this point */
@@ -65,22 +64,19 @@ void send_msg_thread(void *argument)
 	 */
 	sample.data1 = MESSAGE2;
 	status = osMessageQueuePut(message_id, &sample, 0, 0);
-	zassert_true(status == osErrorResource,
-		     "Something's wrong with osMessageQueuePut!");
+	zassert_true(status == osErrorResource, "Something's wrong with osMessageQueuePut!");
 
 	/* Try putting message to a full queue within a duration
 	 * less than TIMEOUT_TICKS, before the queue is emptied out
 	 */
 	sample.data1 = MESSAGE2;
 	status = osMessageQueuePut(message_id, &sample, 0, TIMEOUT_TICKS / 2);
-	zassert_true(status == osErrorTimeout,
-		     "Something's wrong with osMessageQueuePut!");
+	zassert_true(status == osErrorTimeout, "Something's wrong with osMessageQueuePut!");
 
 	/* Send another message after the queue is emptied */
 	sample.data1 = MESSAGE2;
 	status = osMessageQueuePut(message_id, &sample, 0, TIMEOUT_TICKS * 2);
-	zassert_true(status == osOK,
-		     "osMessageQueuePut failure for message!");
+	zassert_true(status == osOK, "osMessageQueuePut failure for message!");
 }
 
 void message_recv(void)
@@ -91,25 +87,20 @@ void message_recv(void)
 
 	/* Try getting message immediately before the queue is populated */
 	status = osMessageQueueGet(message_id, (void *)&recv_data, NULL, 0);
-	zassert_true(status == osErrorResource,
-		     "Something's wrong with osMessageQueueGet!");
+	zassert_true(status == osErrorResource, "Something's wrong with osMessageQueueGet!");
 
 	/* Try receiving message within a duration of TIMEOUT */
-	status = osMessageQueueGet(message_id, (void *)&recv_data,
-				   NULL, TIMEOUT_TICKS);
-	zassert_true(status == osErrorTimeout,
-		     "Something's wrong with osMessageQueueGet!");
+	status = osMessageQueueGet(message_id, (void *)&recv_data, NULL, TIMEOUT_TICKS);
+	zassert_true(status == osErrorTimeout, "Something's wrong with osMessageQueueGet!");
 
 	zassert_equal(osMessageQueueGetCapacity(message_id), Q_LEN,
 		      "Something's wrong with osMessageQueueGetCapacity!");
 
-	zassert_equal(osMessageQueueGetMsgSize(message_id),
-		      sizeof(struct sample_data),
+	zassert_equal(osMessageQueueGetMsgSize(message_id), sizeof(struct sample_data),
 		      "Something's wrong with osMessageQueueGetMsgSize!");
 
 	/* Receive 1st message */
-	status = osMessageQueueGet(message_id, (void *)&recv_data,
-				   NULL, osWaitForever);
+	status = osMessageQueueGet(message_id, (void *)&recv_data, NULL, osWaitForever);
 	zassert_true(status == osOK, "osMessageQueueGet failure");
 	zassert_equal(recv_data.data1, MESSAGE1);
 
@@ -118,8 +109,7 @@ void message_recv(void)
 
 	/* Empty the queue */
 	for (i = 0; i < Q_LEN; i++) {
-		status = osMessageQueueGet(message_id, (void *)&recv_data, NULL,
-					   osWaitForever);
+		status = osMessageQueueGet(message_id, (void *)&recv_data, NULL, osWaitForever);
 		zassert_true(status == osOK, "osMessageQueueGet failure");
 
 		zassert_equal(recv_data.data1, i * 3);
@@ -128,8 +118,7 @@ void message_recv(void)
 	}
 
 	/* Receive the next message */
-	status = osMessageQueueGet(message_id, (void *)&recv_data,
-				   NULL, osWaitForever);
+	status = osMessageQueueGet(message_id, (void *)&recv_data, NULL, osWaitForever);
 	zassert_true(status == osOK, "osMessageQueueGet failure");
 	zassert_equal(recv_data.data1, MESSAGE2);
 }
@@ -158,9 +147,8 @@ ZTEST(cmsis_msgq, test_messageq)
 	struct sample_data sample;
 	osThreadId_t tid;
 
-	message_id = osMessageQueueNew(Q_LEN, sizeof(struct sample_data),
-				       &init_mem_attrs);
-	zassert_true(message_id != NULL, "Message creation failed");
+	message_id = osMessageQueueNew(Q_LEN, sizeof(struct sample_data), &init_mem_attrs);
+	zassert_true(message_id != NULL, "Message Queue creation failed");
 
 	tid = osThreadNew(send_msg_thread, NULL, &thread_attr);
 	zassert_true(tid != NULL, "Thread creation failed");
@@ -193,4 +181,25 @@ ZTEST(cmsis_msgq, test_messageq)
 	status = osMessageQueueDelete(message_id);
 	zassert_true(status == osOK, "osMessageQueueDelete failure");
 }
+
+static struct cmsis_rtos_msgq_cb msgq_cb2;
+static const osMessageQueueAttr_t msgq_attrs2 = {
+	.name = "TestMsgQ2",
+	.attr_bits = 0,
+	.cb_mem = &msgq_cb2,
+	.cb_size = sizeof(msgq_cb2),
+	.mq_mem = sample_mem,
+	.mq_size = sizeof(struct sample_data) * Q_LEN,
+};
+ZTEST(cmsis_msgq, test_messageq_static_allocation)
+{
+	osMessageQueueId_t message_id;
+	osStatus_t status;
+
+	message_id = osMessageQueueNew(Q_LEN, sizeof(struct sample_data), &msgq_attrs2);
+	zassert_true(message_id != NULL, "Message Queue creation failed with static cb");
+
+	status = osMessageQueueDelete(message_id);
+	zassert_true(status == osOK, "osMessageQueueDelete failure");
+}
 ZTEST_SUITE(cmsis_msgq, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c b/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
index bfb1b0735d5e9..df9d862435004 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/mutex.c
@@ -6,19 +6,15 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
-#define WAIT_TICKS      5
-#define TIMEOUT_TICKS   (10 + WAIT_TICKS)
-#define STACKSZ         CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
+#define WAIT_TICKS    5
+#define TIMEOUT_TICKS (10 + WAIT_TICKS)
+#define STACKSZ       CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 int max_mtx_cnt = CONFIG_CMSIS_V2_MUTEX_MAX_COUNT;
-const osMutexAttr_t mutex_attr = {
-	"myMutex",
-	osMutexRecursive | osMutexPrioInherit,
-	NULL,
-	0U
-};
+const osMutexAttr_t mutex_attr = {"myMutex", osMutexRecursive | osMutexPrioInherit, NULL, 0U};
 
 void cleanup_max_mutex(osMutexId_t *mutex_ids)
 {
@@ -59,8 +55,7 @@ ZTEST(cmsis_mutex, test_mutex)
 
 	/* Try deleting invalid mutex object */
 	status = osMutexDelete(mutex_id);
-	zassert_true(status == osErrorParameter,
-		     "Invalid Mutex deleted unexpectedly!");
+	zassert_true(status == osErrorParameter, "Invalid Mutex deleted unexpectedly!");
 
 	mutex_id = osMutexNew(&mutex_attr);
 	zassert_true(mutex_id != NULL, "Mutex1 creation failed");
@@ -124,8 +119,7 @@ void tThread_entry_lock_timeout(void *arg)
 	zassert_true(status == osErrorResource, "Mutex unexpectedly released");
 
 	id = osMutexGetOwner((osMutexId_t)arg);
-	zassert_not_equal(id, osThreadGetId(),
-			  "Unexpectedly, current thread is the mutex owner!");
+	zassert_not_equal(id, osThreadGetId(), "Unexpectedly, current thread is the mutex owner!");
 
 	/* This delay ensures that the mutex gets released by the other
 	 * thread in the meantime
@@ -141,17 +135,15 @@ void tThread_entry_lock_timeout(void *arg)
 }
 
 static K_THREAD_STACK_DEFINE(test_stack, STACKSZ);
-static osThreadAttr_t thread_attr = {
-	.name = "Mutex_check",
-	.attr_bits = osThreadDetached,
-	.cb_mem = NULL,
-	.cb_size = 0,
-	.stack_mem = &test_stack,
-	.stack_size = STACKSZ,
-	.priority = osPriorityNormal,
-	.tz_module = 0,
-	.reserved = 0
-};
+static osThreadAttr_t thread_attr = {.name = "Mutex_check",
+				     .attr_bits = osThreadDetached,
+				     .cb_mem = NULL,
+				     .cb_size = 0,
+				     .stack_mem = &test_stack,
+				     .stack_size = STACKSZ,
+				     .priority = osPriorityNormal,
+				     .tz_module = 0,
+				     .reserved = 0};
 
 ZTEST(cmsis_mutex, test_mutex_lock_timeout)
 {
@@ -177,4 +169,33 @@ ZTEST(cmsis_mutex, test_mutex_lock_timeout)
 
 	osMutexDelete(mutex_id);
 }
+
+static struct cmsis_rtos_mutex_cb mutex_cb2;
+static const osMutexAttr_t mutex_attrs2 = {
+	.name = "Mutex2",
+	.attr_bits = osMutexPrioInherit,
+	.cb_mem = &mutex_cb2,
+	.cb_size = sizeof(mutex_cb2),
+};
+ZTEST(cmsis_mutex, test_mutex_static_allocation)
+{
+	osMutexId_t id;
+
+	id = osMutexNew(&mutex_attrs2);
+	zassert_not_null(id, "Failed creating mutex using static cb");
+
+	zassert_true(osMutexDelete(id) == osOK, "osMutexDelete failed");
+}
+
+ZTEST(cmsis_mutex, test_mutex_static_multiple_new)
+{
+	osMutexId_t id;
+
+	for (int i = 0; i < 100; ++i) {
+		id = osMutexNew(&mutex_attrs2);
+		zassert_not_null(id, "Failed creating mutex using static cb");
+
+		zassert_true(osMutexDelete(id) == osOK, "osMutexDelete failed");
+	}
+}
 ZTEST_SUITE(cmsis_mutex, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c b/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
index 9259cf69b47de..9258b62588827 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/semaphore.c
@@ -6,11 +6,12 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
-#define WAIT_TICKS      5
-#define TIMEOUT_TICKS   (10 + WAIT_TICKS)
-#define STACKSZ         CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
+#define WAIT_TICKS    5
+#define TIMEOUT_TICKS (10 + WAIT_TICKS)
+#define STACKSZ       CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 void thread_sema(void *arg)
 {
@@ -18,13 +19,11 @@ void thread_sema(void *arg)
 
 	/* Try taking semaphore immediately when it is not available */
 	status = osSemaphoreAcquire((osSemaphoreId_t)arg, 0);
-	zassert_true(status == osErrorResource,
-		     "Semaphore acquired unexpectedly!");
+	zassert_true(status == osErrorResource, "Semaphore acquired unexpectedly!");
 
 	/* Try taking semaphore after a TIMEOUT, but before release */
 	status = osSemaphoreAcquire((osSemaphoreId_t)arg, WAIT_TICKS);
-	zassert_true(status == osErrorTimeout,
-		     "Semaphore acquired unexpectedly!");
+	zassert_true(status == osErrorTimeout, "Semaphore acquired unexpectedly!");
 
 	/* This delay ensures that the semaphore gets released by the other
 	 * thread in the meantime
@@ -37,34 +36,25 @@ void thread_sema(void *arg)
 	status = osSemaphoreAcquire((osSemaphoreId_t)arg, 0);
 	zassert_true(status == osOK, "Semaphore could not be acquired");
 
-	zassert_true(osSemaphoreRelease((osSemaphoreId_t)arg) == osOK,
-		     "Semaphore release failure");
+	zassert_true(osSemaphoreRelease((osSemaphoreId_t)arg) == osOK, "Semaphore release failure");
 
 	/* Try releasing when no semaphore is obtained */
-	zassert_true(
-		osSemaphoreRelease((osSemaphoreId_t)arg) == osErrorResource,
-		"Semaphore released unexpectedly!");
+	zassert_true(osSemaphoreRelease((osSemaphoreId_t)arg) == osErrorResource,
+		     "Semaphore released unexpectedly!");
 }
 
 static K_THREAD_STACK_DEFINE(test_stack, STACKSZ);
-static osThreadAttr_t thread_attr = {
-	.name = "Sema_check",
-	.attr_bits = osThreadDetached,
-	.cb_mem = NULL,
-	.cb_size = 0,
-	.stack_mem = &test_stack,
-	.stack_size = STACKSZ,
-	.priority = osPriorityNormal,
-	.tz_module = 0,
-	.reserved = 0
-};
-
-const osSemaphoreAttr_t sema_attr = {
-	"mySemaphore",
-	0,
-	NULL,
-	0U
-};
+static osThreadAttr_t thread_attr = {.name = "Sema_check",
+				     .attr_bits = osThreadDetached,
+				     .cb_mem = NULL,
+				     .cb_size = 0,
+				     .stack_mem = &test_stack,
+				     .stack_size = STACKSZ,
+				     .priority = osPriorityNormal,
+				     .tz_module = 0,
+				     .reserved = 0};
+
+const osSemaphoreAttr_t sema_attr = {"mySemaphore", 0, NULL, 0U};
 
 ZTEST(cmsis_semaphore, test_semaphore)
 {
@@ -78,8 +68,7 @@ ZTEST(cmsis_semaphore, test_semaphore)
 	zassert_true(semaphore_id != NULL, "semaphore creation failed");
 
 	name = osSemaphoreGetName(semaphore_id);
-	zassert_str_equal(sema_attr.name, name,
-			  "Error getting Semaphore name");
+	zassert_str_equal(sema_attr.name, name, "Error getting Semaphore name");
 
 	id = osThreadNew(thread_sema, semaphore_id, &thread_attr);
 	zassert_true(id != NULL, "Thread creation failed");
@@ -87,8 +76,8 @@ ZTEST(cmsis_semaphore, test_semaphore)
 	zassert_true(osSemaphoreGetCount(semaphore_id) == 1);
 
 	/* Acquire invalid semaphore */
-	zassert_equal(osSemaphoreAcquire(dummy_sem_id, osWaitForever),
-		      osErrorParameter, "Semaphore wait worked unexpectedly");
+	zassert_equal(osSemaphoreAcquire(dummy_sem_id, osWaitForever), osErrorParameter,
+		      "Semaphore wait worked unexpectedly");
 
 	status = osSemaphoreAcquire(semaphore_id, osWaitForever);
 	zassert_true(status == osOK, "Semaphore wait failure");
@@ -115,4 +104,21 @@ ZTEST(cmsis_semaphore, test_semaphore)
 	status = osSemaphoreDelete(semaphore_id);
 	zassert_true(status == osOK, "semaphore delete failure");
 }
+
+static struct cmsis_rtos_semaphore_cb semaphore_cb2;
+static const osSemaphoreAttr_t semaphore_attrs2 = {
+	.name = "Semaphore2",
+	.attr_bits = 0,
+	.cb_mem = &semaphore_cb2,
+	.cb_size = sizeof(semaphore_cb2),
+};
+ZTEST(cmsis_semaphore, test_semaphore_static_allocation)
+{
+	osSemaphoreId_t id;
+
+	id = osSemaphoreNew(1, 1, &semaphore_attrs2);
+	zassert_not_null(id, "Failed creating semaphores using static cb");
+
+	zassert_true(osSemaphoreDelete(id) == osOK, "semaphore delete failure");
+}
 ZTEST_SUITE(cmsis_semaphore, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c b/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
index ea73756a6631d..2edd435513b7d 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/thread_apis.c
@@ -6,9 +6,10 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
-#define STACKSZ         CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
+#define STACKSZ CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 /* This is used to check the thread yield functionality between 2 threads */
 static int thread_yield_check;
@@ -78,15 +79,13 @@ static void thread2(void *argument)
 
 	thread_array = k_calloc(max_num_threads, sizeof(osThreadId_t));
 	num_threads = osThreadEnumerate(thread_array, max_num_threads);
-	zassert_equal(num_threads, 2,
-		      "Incorrect number of cmsis rtos v2 threads");
+	zassert_equal(num_threads, 2, "Incorrect number of cmsis rtos v2 threads");
 
 	for (i = 0U; i < num_threads; i++) {
 		uint32_t size = osThreadGetStackSize(thread_array[i]);
 		uint32_t space = osThreadGetStackSpace(thread_array[i]);
 
-		zassert_true(space < size,
-			     "stack size remaining is not what is expected");
+		zassert_true(space < size, "stack size remaining is not what is expected");
 	}
 
 	zassert_equal(osThreadGetState(thread_array[1]), osThreadReady,
@@ -108,18 +107,13 @@ static void thread2(void *argument)
 	osThreadYield();
 }
 
-static void thread_apis_common(int *yield_check,
-			       const char *thread1_name,
-			       osThreadAttr_t *thread1_attr,
-			       osThreadAttr_t *thread2_attr)
+static void thread_apis_common(int *yield_check, const char *thread1_name,
+			       osThreadAttr_t *thread1_attr, osThreadAttr_t *thread2_attr)
 {
 	osThreadId_t id1;
 	osThreadId_t id2;
 
-	struct thread1_args args = {
-		.yield_check = yield_check,
-		.name = thread1_name
-	};
+	struct thread1_args args = {.yield_check = yield_check, .name = thread1_name};
 
 	id1 = osThreadNew(thread1, &args, thread1_attr);
 	zassert_true(id1 != NULL, "Failed creating thread1");
@@ -127,8 +121,7 @@ static void thread_apis_common(int *yield_check,
 	id2 = osThreadNew(thread2, yield_check, thread2_attr);
 	zassert_true(id2 != NULL, "Failed creating thread2");
 
-	zassert_equal(osThreadGetCount(), 2,
-		      "Incorrect number of cmsis rtos v2 threads");
+	zassert_equal(osThreadGetCount(), 2, "Incorrect number of cmsis rtos v2 threads");
 
 	do {
 		osDelay(100);
@@ -137,14 +130,13 @@ static void thread_apis_common(int *yield_check,
 
 ZTEST(cmsis_thread_apis, test_thread_apis_dynamic)
 {
-	thread_apis_common(&thread_yield_check_dynamic, "ZephyrThread",
-			   NULL, NULL);
+	thread_apis_common(&thread_yield_check_dynamic, "ZephyrThread", NULL, NULL);
 }
 
 ZTEST(cmsis_thread_apis, test_thread_apis)
 {
-	thread_apis_common(&thread_yield_check, os_thread1_attr.name,
-			   &os_thread1_attr, &os_thread2_attr);
+	thread_apis_common(&thread_yield_check, os_thread1_attr.name, &os_thread1_attr,
+			   &os_thread2_attr);
 }
 
 static osPriority_t OsPriorityInvalid = 60;
@@ -172,28 +164,24 @@ static void thread3(void *argument)
 	/* Lower the priority of the current thread */
 	osThreadSetPriority(id, osPriorityBelowNormal);
 	rv = osThreadGetPriority(id);
-	zassert_equal(rv, osPriorityBelowNormal,
-		      "Expected priority to be changed to %d, not %d",
+	zassert_equal(rv, osPriorityBelowNormal, "Expected priority to be changed to %d, not %d",
 		      (int)osPriorityBelowNormal, (int)rv);
 
 	/* Increase the priority of the current thread */
 	osThreadSetPriority(id, osPriorityAboveNormal);
 	rv = osThreadGetPriority(id);
-	zassert_equal(rv, osPriorityAboveNormal,
-		      "Expected priority to be changed to %d, not %d",
+	zassert_equal(rv, osPriorityAboveNormal, "Expected priority to be changed to %d, not %d",
 		      (int)osPriorityAboveNormal, (int)rv);
 
 	/* Restore the priority of the current thread */
 	osThreadSetPriority(id, prio);
 	rv = osThreadGetPriority(id);
-	zassert_equal(rv, prio,
-		      "Expected priority to be changed to %d, not %d",
-		      (int)prio, (int)rv);
+	zassert_equal(rv, prio, "Expected priority to be changed to %d, not %d", (int)prio,
+		      (int)rv);
 
 	/* Try to set unsupported priority and assert failure */
 	status = osThreadSetPriority(id, OsPriorityInvalid);
-	zassert_true(status == osErrorParameter,
-		     "Something's wrong with osThreadSetPriority!");
+	zassert_true(status == osErrorParameter, "Something's wrong with osThreadSetPriority!");
 
 	/* Indication that thread3 is done with its processing */
 	*state = 1;
@@ -224,13 +212,11 @@ static void thread_prior_common(int *state, osThreadAttr_t *attr)
 
 	/* Try to set priority to inactive thread and assert failure */
 	status = osThreadSetPriority(id3, osPriorityNormal);
-	zassert_true(status == osErrorResource,
-		     "Something's wrong with osThreadSetPriority!");
+	zassert_true(status == osErrorResource, "Something's wrong with osThreadSetPriority!");
 
 	/* Try to terminate inactive thread and assert failure */
 	status = osThreadTerminate(id3);
-	zassert_true(status == osErrorResource,
-		     "Something's wrong with osThreadTerminate!");
+	zassert_true(status == osErrorResource, "Something's wrong with osThreadTerminate!");
 
 	*state = 0;
 }
@@ -268,7 +254,7 @@ static void thread4(void *argument)
 
 ZTEST(cmsis_thread_apis, test_thread_join)
 {
-	osThreadAttr_t attr = { 0 };
+	osThreadAttr_t attr = {0};
 	int64_t time_stamp;
 	int64_t milliseconds_spent;
 	osThreadId_t tA, tB;
@@ -297,7 +283,7 @@ ZTEST(cmsis_thread_apis, test_thread_join)
 
 	milliseconds_spent = k_uptime_delta(&time_stamp);
 	zassert_true((milliseconds_spent >= DELAY_MS - DELTA_MS) &&
-		     (milliseconds_spent <= DELAY_MS + DELTA_MS),
+			     (milliseconds_spent <= DELAY_MS + DELTA_MS),
 		     "Join completed but was too fast or too slow.");
 
 	printk(" - Waiting for thread A to join...\n");
@@ -320,8 +306,7 @@ ZTEST(cmsis_thread_apis, test_thread_detached)
 	osDelay(k_ms_to_ticks_ceil32(DELAY_MS - DELTA_MS));
 
 	status = osThreadJoin(thread);
-	zassert_equal(status, osErrorResource,
-		      "Incorrect status returned from osThreadJoin!");
+	zassert_equal(status, osErrorResource, "Incorrect status returned from osThreadJoin!");
 
 	osDelay(k_ms_to_ticks_ceil32(DELTA_MS));
 }
@@ -331,14 +316,16 @@ void thread6(void *argument)
 	osThreadId_t thread = argument;
 	osStatus_t status;
 
+	/* Thread passed as argument may or may not have already terminated, but is expected to be
+	 * joinable for this test as it was created with osThreadJoinable attr_bits.
+	 */
 	status = osThreadJoin(thread);
-	zassert_equal(status, osErrorResource,
-		      "Incorrect status returned from osThreadJoin!");
+	zassert_equal(status, osOK, "Incorrect status returned from osThreadJoin!");
 }
 
 ZTEST(cmsis_thread_apis, test_thread_joinable_detach)
 {
-	osThreadAttr_t attr = { 0 };
+	osThreadAttr_t attr = {0};
 	osThreadId_t tA, tB;
 	osStatus_t status;
 
@@ -360,7 +347,7 @@ ZTEST(cmsis_thread_apis, test_thread_joinable_detach)
 
 ZTEST(cmsis_thread_apis, test_thread_joinable_terminate)
 {
-	osThreadAttr_t attr = { 0 };
+	osThreadAttr_t attr = {0};
 	osThreadId_t tA, tB;
 	osStatus_t status;
 
@@ -379,4 +366,85 @@ ZTEST(cmsis_thread_apis, test_thread_joinable_terminate)
 
 	osDelay(k_ms_to_ticks_ceil32(DELTA_MS));
 }
+
+static K_THREAD_STACK_DEFINE(test_stack7, STACKSZ);
+static struct cmsis_rtos_thread_cb test_cb7;
+static const osThreadAttr_t os_thread7_attr = {
+	.name = "Thread7",
+	.cb_mem = &test_cb7,
+	.cb_size = sizeof(test_cb7),
+	.stack_mem = &test_stack7,
+	.stack_size = STACKSZ,
+	.priority = osPriorityNormal,
+};
+static void thread7(void *argument)
+{
+	printf("Thread 7 ran\n");
+}
+ZTEST(cmsis_thread_apis, test_thread_apis_static_allocation)
+{
+	osThreadId_t id;
+
+	id = osThreadNew(thread7, NULL, &os_thread7_attr);
+	zassert_not_null(id, "Failed to create thread with osThreadNew using static cb/stack");
+}
+
+static K_THREAD_STACK_DEFINE(test_stack8, STACKSZ);
+static struct cmsis_rtos_thread_cb test_cb8;
+static const osThreadAttr_t os_thread8_attr = {
+	.name = "Thread8",
+	.attr_bits = osThreadJoinable,
+	.cb_mem = &test_cb8,
+	.cb_size = sizeof(test_cb8),
+	.stack_mem = &test_stack8,
+	.stack_size = STACKSZ,
+	.priority = osPriorityNormal,
+};
+static void thread8(void *argument)
+{
+	printf("Thread 8 ran\n");
+	osDelay(k_ms_to_ticks_ceil32(DELAY_MS));
+	osThreadExit();
+}
+ZTEST(cmsis_thread_apis, test_thread_apis_join_after_exit)
+{
+	osThreadId_t id;
+	osStatus_t status;
+
+	id = osThreadNew(thread8, NULL, &os_thread8_attr);
+	zassert_not_null(id, "Failed to create thread with osThreadNew using static cb/stack");
+
+	status = osThreadJoin(id);
+	zassert_equal(status, osOK, "osThreadJoin failed with status=%d!", status);
+}
+
+static K_THREAD_STACK_DEFINE(test_stack9, STACKSZ);
+static struct cmsis_rtos_thread_cb test_cb9;
+static const osThreadAttr_t os_thread9_attr = {
+	.name = "Thread9",
+	.attr_bits = osThreadJoinable,
+	.cb_mem = &test_cb9,
+	.cb_size = sizeof(test_cb9),
+	.stack_mem = &test_stack9,
+	.stack_size = STACKSZ,
+	.priority = osPriorityNormal,
+};
+static void thread9(void *argument)
+{
+	osThreadExit();
+}
+ZTEST(cmsis_thread_apis, test_thread_apis_multiple_new_static)
+{
+	osThreadId_t id;
+	osStatus_t status;
+
+	for (int i = 0; i < 100; i++) {
+		id = osThreadNew(thread9, NULL, &os_thread9_attr);
+		zassert_not_null(id,
+				 "Failed to create thread with osThreadNew using static cb/stack");
+
+		status = osThreadJoin(id);
+		zassert_equal(status, osOK, "osThreadJoin failed with status=%d!", status);
+	}
+}
 ZTEST_SUITE(cmsis_thread_apis, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c b/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
index 8b84cd2e8eae9..efa70dd1a7197 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/thread_flags.c
@@ -6,17 +6,19 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
 #include <zephyr/irq_offload.h>
 #include <zephyr/kernel_structs.h>
 
-#define TIMEOUT_TICKS   (10)
-#define FLAG1           (0x00000020)
-#define FLAG2           (0x00000004)
-#define FLAG            (FLAG1 | FLAG2)
-#define ISR_FLAG        (0x50)
-#define STACKSZ         CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
+#define TIMEOUT_TICKS (1000)
+#define FLAG1         (0x00000020)
+#define FLAG2         (0x00000004)
+#define FLAG3         (0x00000100)
+#define FLAG          (FLAG1 | FLAG2)
+#define ISR_FLAG      (0x50)
+#define STACKSZ       CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 static void thread1(void *arg)
 {
@@ -34,10 +36,13 @@ static void thread1(void *arg)
 	flags = osThreadFlagsGet();
 	zassert_equal(flags & FLAG1, FLAG1, "");
 
+	/* We should be able to get the exact same flags again as they were not cleared */
+	flags = osThreadFlagsWait(FLAG1, osFlagsWaitAny | osFlagsNoClear, 0);
+	zassert_equal(flags & FLAG1, FLAG1, "");
+
 	/* Clear the Flag explicitly */
 	flags = osThreadFlagsClear(FLAG1);
-	zassert_not_equal(flags, osFlagsErrorParameter,
-			  "ThreadFlagsClear failed");
+	zassert_not_equal(flags, osFlagsErrorParameter, "ThreadFlagsClear failed");
 
 	/* wait for FLAG1. It should timeout here as the flag
 	 * though triggered, gets cleared in the previous step.
@@ -51,22 +56,19 @@ static void thread2(void *arg)
 	uint32_t flags;
 
 	flags = osThreadFlagsWait(FLAG, osFlagsWaitAll, TIMEOUT_TICKS);
-	zassert_equal(flags & FLAG, FLAG,
-		      "osThreadFlagsWait failed unexpectedly");
+	zassert_equal(flags & FLAG, FLAG, "osThreadFlagsWait failed unexpectedly");
 
 	/* validate by passing invalid parameters */
 	zassert_equal(osThreadFlagsSet(NULL, 0), osFlagsErrorParameter,
 		      "Invalid Thread Flags ID is unexpectedly working!");
-	zassert_equal(osThreadFlagsSet(osThreadGetId(), 0x80010000),
-		      osFlagsErrorParameter,
+	zassert_equal(osThreadFlagsSet(osThreadGetId(), 0x80010000), osFlagsErrorParameter,
 		      "Thread with MSB set is set unexpectedly");
 
 	zassert_equal(osThreadFlagsClear(0x80010000), osFlagsErrorParameter,
 		      "Thread with MSB set is cleared unexpectedly");
 
 	/* cannot wait for Flag mask with MSB set */
-	zassert_equal(osThreadFlagsWait(0x80010000, osFlagsWaitAny, 0),
-		      osFlagsErrorParameter,
+	zassert_equal(osThreadFlagsWait(0x80010000, osFlagsWaitAny, 0), osFlagsErrorParameter,
 		      "ThreadFlagsWait passed unexpectedly");
 }
 
@@ -134,8 +136,7 @@ static void offload_function(const void *param)
 	zassert_true(k_is_in_isr(), "Not in IRQ context!");
 
 	flags = osThreadFlagsSet((osThreadId_t)param, ISR_FLAG);
-	zassert_equal(flags & ISR_FLAG, ISR_FLAG,
-		      "ThreadFlagsSet failed in ISR");
+	zassert_equal(flags & ISR_FLAG, ISR_FLAG, "ThreadFlagsSet failed in ISR");
 }
 
 void test_thread_flags_from_isr(void *thread_id)
@@ -146,8 +147,7 @@ void test_thread_flags_from_isr(void *thread_id)
 	irq_offload(offload_function, (const void *)osThreadGetId());
 
 	flags = osThreadFlagsWait(ISR_FLAG, osFlagsWaitAll, TIMEOUT_TICKS);
-	zassert_equal((flags & ISR_FLAG),
-		      ISR_FLAG, "unexpected Thread flags value");
+	zassert_equal((flags & ISR_FLAG), ISR_FLAG, "unexpected Thread flags value");
 }
 
 static K_THREAD_STACK_DEFINE(test_stack3, STACKSZ);
@@ -162,10 +162,69 @@ ZTEST(cmsis_thread_flags, test_thread_flags_isr)
 {
 	osThreadId_t id;
 
-	id = osThreadNew(test_thread_flags_from_isr, osThreadGetId(),
-			 &thread3_attr);
+	id = osThreadNew(test_thread_flags_from_isr, osThreadGetId(), &thread3_attr);
 	zassert_true(id != NULL, "Failed creating thread");
 
 	osDelay(TIMEOUT_TICKS);
 }
+
+static K_THREAD_STACK_DEFINE(test_stack4, STACKSZ);
+static struct cmsis_rtos_thread_cb test_cb4;
+static osThreadAttr_t thread4_attr = {
+	.name = "Thread4",
+	.cb_mem = &test_cb4,
+	.cb_size = sizeof(test_cb4),
+	.stack_mem = &test_stack4,
+	.stack_size = STACKSZ,
+	.priority = osPriorityHigh,
+};
+static bool m_thread_4_is_blocked;
+
+static void thread4(void *arg)
+{
+	uint32_t flags;
+
+	/* Nothing will trigger FLAG1 to this thread, so the following should timeout */
+	flags = osThreadFlagsWait(FLAG1, osFlagsWaitAny, 0);
+	zassert_equal(flags, osFlagsErrorTimeout,
+		      "ThreadFlagsWait unexpected found 0x%x flags were set");
+
+	flags = osThreadFlagsWait(FLAG1, osFlagsWaitAll, TIMEOUT_TICKS / 10);
+	zassert_equal(flags, osFlagsErrorTimeout,
+		      "ThreadFlagsWait unexpected found 0x%x flags were set");
+
+	flags = osThreadFlagsWait(FLAG1, osFlagsWaitAny | osFlagsNoClear, 0);
+	zassert_equal(flags, osFlagsErrorTimeout,
+		      "ThreadFlagsWait unexpected found 0x%x flags were set");
+
+	/* Nothing will trigger FLAG1 to this thread, so it should remain blocked here */
+	m_thread_4_is_blocked = true;
+	flags = osThreadFlagsWait(FLAG1, osFlagsWaitAny, osWaitForever);
+	zassert_unreachable();
+}
+
+ZTEST(cmsis_thread_flags, test_thread_flags_set_flags_not_waited_upon)
+{
+	osThreadId_t id;
+	uint32_t flags;
+
+	m_thread_4_is_blocked = false;
+
+	id = osThreadNew(thread4, NULL, &thread4_attr);
+	zassert_true(id != NULL, "Failed creating thread3");
+
+	/* The thread will wait on any of FLAG1. Signal something it is not waiting for. */
+	flags = osThreadFlagsSet(id, FLAG3);
+	zassert_equal(flags & FLAG3, FLAG3, "");
+	osThreadYield();
+
+	/* Wait a bit, but thread4 should remain blocked */
+	osDelay(TIMEOUT_TICKS);
+
+	zassert_true(m_thread_4_is_blocked, "Thread 4 did run till expected point");
+
+	/* Kill the thread */
+	osThreadTerminate(id);
+}
+
 ZTEST_SUITE(cmsis_thread_flags, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/portability/cmsis_rtos_v2/src/timer.c b/tests/subsys/portability/cmsis_rtos_v2/src/timer.c
index 35ab88ed17417..831c76bf32a59 100644
--- a/tests/subsys/portability/cmsis_rtos_v2/src/timer.c
+++ b/tests/subsys/portability/cmsis_rtos_v2/src/timer.c
@@ -5,38 +5,32 @@
  */
 
 #include <zephyr/ztest.h>
-#include <cmsis_os2.h>
+#include <zephyr/portability/cmsis_os2.h>
+#include <zephyr/portability/cmsis_types.h>
 
-#define ONESHOT_TIME_TICKS      100
-#define PERIOD_TICKS            MAX(50, k_ms_to_ticks_ceil32(10))
-#define NUM_PERIODS             5
+#define ONESHOT_TIME_TICKS 100
+#define PERIOD_TICKS       MAX(50, k_ms_to_ticks_ceil32(10))
+#define NUM_PERIODS        5
 
 uint32_t num_oneshots_executed;
 uint32_t num_periods_executed;
 
-const osTimerAttr_t timer_attr = {
-	"myTimer",
-	0,
-	NULL,
-	0U
-};
+const osTimerAttr_t timer_attr = {"myTimer", 0, NULL, 0U};
 
-void Timer1_Callback(void *arg)
+static void Timer1_Callback(void *arg)
 {
 	uint32_t Tmr = *(uint32_t *)arg;
 
 	num_oneshots_executed++;
-	TC_PRINT("oneshot_callback (Timer %d) = %d\n",
-		 Tmr, num_oneshots_executed);
+	TC_PRINT("oneshot_callback (Timer %d) = %d\n", Tmr, num_oneshots_executed);
 }
 
-void Timer2_Callback(void *arg)
+static void Timer2_Callback(void *arg)
 {
 	uint32_t Tmr = *(uint32_t *)arg;
 
 	num_periods_executed++;
-	TC_PRINT("periodic_callback (Timer %d) = %d\n",
-		 Tmr, num_periods_executed);
+	TC_PRINT("periodic_callback (Timer %d) = %d\n", Tmr, num_periods_executed);
 }
 
 ZTEST(cmsis_timer, test_timer)
@@ -59,8 +53,7 @@ ZTEST(cmsis_timer, test_timer)
 
 	/* Stop the timer before start */
 	status = osTimerStop(id1);
-	zassert_true(status == osErrorResource,
-		     "error while stopping non-active timer");
+	zassert_true(status == osErrorResource, "error while stopping non-active timer");
 
 	timerDelay = ONESHOT_TIME_TICKS;
 	status = osTimerStart(id1, timerDelay);
@@ -73,8 +66,7 @@ ZTEST(cmsis_timer, test_timer)
 	 * if it fires more than once.
 	 */
 	osDelay(timerDelay * 3U + 10);
-	zassert_true(num_oneshots_executed == 1U,
-		     "error setting up one-shot timer");
+	zassert_true(num_oneshots_executed == 1U, "error setting up one-shot timer");
 
 	status = osTimerStop(id1);
 	zassert_true(status == osOK, "error stopping one-shot timer");
@@ -99,11 +91,31 @@ ZTEST(cmsis_timer, test_timer)
 	 */
 	osDelay(timerDelay * NUM_PERIODS + 10);
 
-	zassert_true(num_periods_executed == NUM_PERIODS,
-		     "error setting up periodic timer");
+	zassert_true(num_periods_executed == NUM_PERIODS, "error setting up periodic timer");
 
 	/* Delete the timer before stop */
 	status = osTimerDelete(id2);
 	zassert_true(status == osOK, "error deleting periodic timer");
 }
+
+static struct cmsis_rtos_timer_cb timer_cb3;
+static const osTimerAttr_t timer_attr3 = {
+	.name = "Timer3",
+	.cb_mem = &timer_cb3,
+	.cb_size = sizeof(timer_cb3),
+};
+static void Timer3_Callback(void *arg)
+{
+	printf("Timer3 callback ran\n");
+}
+ZTEST(cmsis_timer, test_timer_static_allocation)
+{
+	osTimerId_t id;
+	osStatus_t status;
+
+	id = osTimerNew(Timer3_Callback, osTimerOnce, NULL, &timer_attr3);
+	zassert_true(id != NULL, "error creating timer with static cb");
+	status = osTimerDelete(id);
+	zassert_true(status == osOK, "error timer with static cb");
+}
 ZTEST_SUITE(cmsis_timer, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
index ed84c30432880..6df091015bed2 100644
--- a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
@@ -2,13 +2,20 @@ CONFIG_ZTEST_STACK_SIZE=3072
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_MBEDTLS=y
+CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG=y
-# PSA Crypto needs some heap, but MINIMAL_LIBC has none by default.
-CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=2048
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=1024
 
 CONFIG_SECURE_STORAGE=y
 # For testing isolation between the different callers of the ITS.
 CONFIG_SECURE_STORAGE_PS_IMPLEMENTATION_ITS=y
+CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
new file mode 100644
index 0000000000000..bb6403a96c23d
--- /dev/null
+++ b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
@@ -0,0 +1,3 @@
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/subsys/secure_storage/psa/crypto/src/main.c b/tests/subsys/secure_storage/psa/crypto/src/main.c
index 1a59f0027964a..974a931583b31 100644
--- a/tests/subsys/secure_storage/psa/crypto/src/main.c
+++ b/tests/subsys/secure_storage/psa/crypto/src/main.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/ztest.h>
+#include <zephyr/psa/key_ids.h>
 #include <zephyr/sys/util.h>
 #include <psa/crypto.h>
 #include <psa/internal_trusted_storage.h>
@@ -9,7 +10,7 @@
 
 ZTEST_SUITE(secure_storage_psa_crypto, NULL, NULL, NULL, NULL, NULL);
 
-#define ID       PSA_KEY_ID_USER_MIN
+#define ID       ZEPHYR_PSA_APPLICATION_KEY_ID_RANGE_BEGIN
 #define KEY_TYPE PSA_KEY_TYPE_AES
 #define ALG      PSA_ALG_CBC_NO_PADDING
 #define KEY_BITS 256
@@ -25,6 +26,16 @@ static void fill_key_attributes(psa_key_attributes_t *key_attributes)
 	psa_set_key_bits(key_attributes, KEY_BITS);
 }
 
+static void compare_key_attributes(const psa_key_attributes_t *l, const psa_key_attributes_t *r)
+{
+	zassert_equal(psa_get_key_lifetime(l), psa_get_key_lifetime(r));
+	zassert_equal(psa_get_key_usage_flags(l), psa_get_key_usage_flags(r));
+	zassert_equal(psa_get_key_id(l), psa_get_key_id(r));
+	zassert_equal(psa_get_key_type(l), psa_get_key_type(r));
+	zassert_equal(psa_get_key_algorithm(l), psa_get_key_algorithm(r));
+	zassert_equal(psa_get_key_bits(l), psa_get_key_bits(r));
+}
+
 static void fill_data(uint8_t *data, size_t size)
 {
 	zassert_equal(psa_generate_random(data, size), PSA_SUCCESS);
@@ -76,7 +87,7 @@ ZTEST(secure_storage_psa_crypto, test_its_caller_isolation)
 
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
 	zassert_equal(ret, PSA_SUCCESS);
-	zassert_mem_equal(&retrieved_key_attributes, &key_attributes, sizeof(key_attributes));
+	compare_key_attributes(&retrieved_key_attributes, &key_attributes);
 	ret = psa_destroy_key(ID);
 	zassert_equal(ret, PSA_SUCCESS);
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
diff --git a/tests/subsys/secure_storage/psa/crypto/testcase.yaml b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
index 06606fae02a8b..8755a5a193523 100644
--- a/tests/subsys/secure_storage/psa/crypto/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
@@ -8,7 +8,9 @@ tests:
     integration_platforms:
       - native_sim
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
   secure_storage.psa.crypto.tfm:
-    filter: CONFIG_BUILD_WITH_TFM and not CONFIG_TFM_PROFILE_TYPE_SMALL
+    filter: CONFIG_BUILD_WITH_TFM
+    extra_args: EXTRA_CONF_FILE=overlay-tfm.conf
     integration_platforms:
       - nrf9151dk/nrf9151/ns
diff --git a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
index 3ca9fdabcf25e..3810764eb95a9 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
@@ -1,4 +1,4 @@
-CONFIG_ZTEST_STACK_SIZE=3072
-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZTEST_STACK_SIZE=4096
+CONFIG_MAIN_STACK_SIZE=3072
 
 CONFIG_SECURE_STORAGE=y
diff --git a/tests/subsys/secure_storage/psa/its/overlay-store_default.conf b/tests/subsys/secure_storage/psa/its/overlay-store_default.conf
deleted file mode 100644
index e6604bc94b011..0000000000000
--- a/tests/subsys/secure_storage/psa/its/overlay-store_default.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y
-
-# 256 - flags (1) - CONFIG_SECURE_STORAGE_ITS_TRANSFORM_OUTPUT_OVERHEAD (28)
-CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=227
-
-# Limit the space available for the maximum entry test to not take too long with NVS.
-CONFIG_SETTINGS_NVS_SECTOR_COUNT=2
diff --git a/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf b/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf
new file mode 100644
index 0000000000000..b0a2cd493f9d1
--- /dev/null
+++ b/tests/subsys/secure_storage/psa/its/overlay-store_settings.conf
@@ -0,0 +1,12 @@
+CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+
+# 256 - flags (1) - CONFIG_SECURE_STORAGE_ITS_TRANSFORM_OUTPUT_OVERHEAD (28)
+CONFIG_SECURE_STORAGE_ITS_MAX_DATA_SIZE=227
+
+# Limit the space available for the maximum entry test to not take too long with NVS.
+CONFIG_SETTINGS_NVS_SECTOR_COUNT=2
diff --git a/tests/subsys/secure_storage/psa/its/overlay-store_zms.conf b/tests/subsys/secure_storage/psa/its/overlay-store_zms.conf
new file mode 100644
index 0000000000000..7efe611bc0a4b
--- /dev/null
+++ b/tests/subsys/secure_storage/psa/its/overlay-store_zms.conf
@@ -0,0 +1,3 @@
+CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_ZMS=y
+CONFIG_ZMS=y
+CONFIG_FLASH=y
diff --git a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
index 78762d8afa3ad..e908573fb3980 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
@@ -1,2 +1,4 @@
+CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
+
 CONFIG_TFM_ITS_MAX_ASSET_SIZE_OVERRIDE=y
 CONFIG_TFM_ITS_MAX_ASSET_SIZE=256
diff --git a/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf b/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf
index 7ed936966baa6..945da7e9f8bab 100644
--- a/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf
+++ b/tests/subsys/secure_storage/psa/its/overlay-transform_default.conf
@@ -1,4 +1,5 @@
 CONFIG_MBEDTLS=y
+CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG=y
diff --git a/tests/subsys/secure_storage/psa/its/testcase.yaml b/tests/subsys/secure_storage/psa/its/testcase.yaml
index bf72516e4b246..05f1c1b9a6acf 100644
--- a/tests/subsys/secure_storage/psa/its/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/its/testcase.yaml
@@ -2,6 +2,7 @@ common:
   integration_platforms:
     - native_sim
     - nrf54l15dk/nrf54l15/cpuapp
+    - ophelia4ev/nrf54l15/cpuapp
   platform_exclude:
     - qemu_cortex_m0 # settings subsystem initialization fails
   timeout: 600
@@ -23,19 +24,20 @@ tests:
       - nrf9151dk/nrf9151
       - nrf9160dk/nrf9160
       - nrf9161dk/nrf9161
+      - ophelia4ev/nrf54l15/cpuapp
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE=zms.overlay
-      - EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-transform_default.conf
+      - EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-store_zms.conf;overlay-transform_default.conf
 
   secure_storage.psa.its.secure_storage.store.settings:
     filter: CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
     extra_args: "EXTRA_CONF_FILE=\
-      overlay-secure_storage.conf;overlay-transform_default.conf;overlay-store_default.conf"
+      overlay-secure_storage.conf;overlay-transform_default.conf;overlay-store_settings.conf"
 
   secure_storage.psa.its.secure_storage.custom.transform:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
     extra_args: "EXTRA_CONF_FILE=\
-      overlay-secure_storage.conf;overlay-transform_custom.conf;overlay-store_default.conf"
+      overlay-secure_storage.conf;overlay-transform_custom.conf;overlay-store_settings.conf"
 
   secure_storage.psa.its.secure_storage.custom.store:
     filter: CONFIG_SECURE_STORAGE
diff --git a/tests/subsys/settings/file/testcase.yaml b/tests/subsys/settings/file/testcase.yaml
index 8dad4da37bdb8..5d4adfab4deb1 100644
--- a/tests/subsys/settings/file/testcase.yaml
+++ b/tests/subsys/settings/file/testcase.yaml
@@ -13,7 +13,7 @@ tests:
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
     integration_platforms:
-      - nrf52840dk/nrf52840
+      - native_sim
     tags:
       - settings
       - file
diff --git a/tests/subsys/settings/functional/fcb/native_posix.overlay b/tests/subsys/settings/functional/fcb/native_posix.overlay
deleted file mode 100644
index f7f0961513832..0000000000000
--- a/tests/subsys/settings/functional/fcb/native_posix.overlay
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/delete-node/ &storage_partition;
-/delete-node/ &scratch_partition;
-
-&flash0 {
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		storage_partition: partition@70000 {
-			label = "storage";
-			reg = <0x00070000 0x10000>;
-		};
-	};
-};
diff --git a/tests/subsys/settings/functional/fcb/testcase.yaml b/tests/subsys/settings/functional/fcb/testcase.yaml
index 4da37b412871e..46ee35f49c4cb 100644
--- a/tests/subsys/settings/functional/fcb/testcase.yaml
+++ b/tests/subsys/settings/functional/fcb/testcase.yaml
@@ -11,7 +11,7 @@ tests:
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
     integration_platforms:
-      - nrf52840dk/nrf52840
+      - native_sim
     tags:
       - settings
       - fcb
diff --git a/tests/subsys/settings/functional/nvs/testcase.yaml b/tests/subsys/settings/functional/nvs/testcase.yaml
index 9dcf2b19d4d67..41ed4992b1fe5 100644
--- a/tests/subsys/settings/functional/nvs/testcase.yaml
+++ b/tests/subsys/settings/functional/nvs/testcase.yaml
@@ -2,24 +2,30 @@ tests:
   settings.functional.nvs:
     platform_allow:
       - qemu_x86
+      - mps2/an385
       - native_sim
       - native_sim/native/64
       - s32z2xxdc2/s32z270/rtu0
       - s32z2xxdc2/s32z270/rtu1
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
+    integration_platforms:
+      - mps2/an385
     tags:
       - settings
       - nvs
   settings.functional.nvs.chosen:
     extra_args: DTC_OVERLAY_FILE=./chosen.overlay
     platform_allow:
+      - mps2/an385
       - native_sim
       - native_sim/native/64
       - s32z2xxdc2/s32z270/rtu0
       - s32z2xxdc2/s32z270/rtu1
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
+    integration_platforms:
+      - mps2/an385
     tags:
       - settings
       - nvs
@@ -32,8 +38,9 @@ tests:
       - s32z2xxdc2/s32z270/rtu1
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
+      - mps2/an385
     integration_platforms:
-      - nrf52840dk/nrf52840
+      - mps2/an385
     tags:
       - settings
       - nvs
diff --git a/tests/subsys/settings/nvs/testcase.yaml b/tests/subsys/settings/nvs/testcase.yaml
index c78bd7128268e..b3ff3175ca61f 100644
--- a/tests/subsys/settings/nvs/testcase.yaml
+++ b/tests/subsys/settings/nvs/testcase.yaml
@@ -1,6 +1,6 @@
 tests:
   settings.nvs:
-    depends_on: nvs
+    filter: dt_label_with_parent_compat_enabled("storage_partition", "fixed-partitions")
     min_ram: 32
     tags:
       - settings
diff --git a/tests/subsys/settings/performance/CMakeLists.txt b/tests/subsys/settings/performance/CMakeLists.txt
new file mode 100644
index 0000000000000..b3e4780d3aa59
--- /dev/null
+++ b/tests/subsys/settings/performance/CMakeLists.txt
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(test_settings_perf)
+
+zephyr_include_directories(
+	${ZEPHYR_BASE}/subsys/settings/include
+	${ZEPHYR_BASE}/subsys/settings/src
+	)
+
+target_sources(app PRIVATE
+	settings_test_perf.c)
diff --git a/tests/subsys/settings/performance/prj.conf b/tests/subsys/settings/performance/prj.conf
new file mode 100644
index 0000000000000..27c208baa0bee
--- /dev/null
+++ b/tests/subsys/settings/performance/prj.conf
@@ -0,0 +1,7 @@
+CONFIG_ZTEST=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_RUNTIME=y
diff --git a/tests/subsys/settings/performance/settings_test_perf.c b/tests/subsys/settings/performance/settings_test_perf.c
new file mode 100644
index 0000000000000..a5de17e347503
--- /dev/null
+++ b/tests/subsys/settings/performance/settings_test_perf.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdlib.h>
+
+#include "settings_priv.h"
+#include <zephyr/ztest.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/bluetooth/bluetooth.h>
+
+/* This is a test suite for performance testing of settings subsystem by writing
+ * many small setting values repeatedly. Ideally, this should consume as small
+ * amount of time as possible for best possible UX.
+ */
+
+static struct k_work_q settings_work_q;
+static K_THREAD_STACK_DEFINE(settings_work_stack, 2024);
+static struct k_work_delayable pending_store;
+
+#define TEST_SETTINGS_COUNT (128)
+#define TEST_STORE_ITR (5)
+#define TEST_TIMEOUT_SEC (60)
+#define TEST_SETTINGS_WORKQ_PRIO (1)
+
+static void bt_scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_type,
+		struct net_buf_simple *buf)
+{
+	printk("len %u\n", buf->len);
+}
+
+struct test_setting {
+	uint32_t val;
+} test_settings[TEST_SETTINGS_COUNT];
+
+K_SEM_DEFINE(waitfor_work, 0, 1);
+
+static void store_pending(struct k_work *work)
+{
+	int err;
+	char path[20];
+	struct test_stats {
+		uint32_t total_calculated;
+		uint32_t total_measured;
+		uint32_t single_entry_max;
+		uint32_t single_entry_min;
+	} stats = {0, 0, 0, UINT32_MAX};
+
+	int64_t ts1 = k_uptime_get();
+
+	/* benchmark storage performance */
+	for (int j = 0; j < TEST_STORE_ITR; j++) {
+		for (int i = 0; i < TEST_SETTINGS_COUNT; i++) {
+			test_settings[i].val = TEST_SETTINGS_COUNT*j + i;
+
+			int64_t ts2 = k_uptime_get();
+
+			snprintk(path, sizeof(path), "ab/cdef/ghi/%04x", i);
+			err = settings_save_one(path, &test_settings[i],
+						sizeof(struct test_setting));
+			zassert_equal(err, 0, "settings_save_one failed %d", err);
+
+			int64_t delta2 = k_uptime_delta(&ts2);
+
+			if (stats.single_entry_max < delta2) {
+				stats.single_entry_max = delta2;
+			}
+			if (stats.single_entry_min > delta2) {
+				stats.single_entry_min = delta2;
+			}
+			stats.total_calculated += delta2;
+		}
+	}
+
+	int64_t delta1 = k_uptime_delta(&ts1);
+
+	stats.total_measured = delta1;
+
+	printk("*** storing of %u entries completed ***\n", ARRAY_SIZE(test_settings));
+	printk("total calculated: %u, total measured: %u\n", stats.total_calculated,
+	       stats.total_measured);
+	printk("entry max: %u, entry min: %u\n", stats.single_entry_max,
+	       stats.single_entry_min);
+
+	k_sem_give(&waitfor_work);
+}
+
+ZTEST_SUITE(settings_perf, NULL, NULL, NULL, NULL, NULL);
+
+ZTEST(settings_perf, test_performance)
+{
+	int err;
+
+	if (IS_ENABLED(CONFIG_NVS)) {
+		printk("Testing with NVS\n");
+	} else if (IS_ENABLED(CONFIG_ZMS)) {
+		printk("Testing with ZMS\n");
+	}
+
+	k_work_queue_start(&settings_work_q, settings_work_stack,
+		K_THREAD_STACK_SIZEOF(settings_work_stack),
+		K_PRIO_COOP(TEST_SETTINGS_WORKQ_PRIO), NULL);
+	k_thread_name_set(&settings_work_q.thread, "Settings workq");
+	k_work_init_delayable(&pending_store, store_pending);
+
+	if (IS_ENABLED(CONFIG_BT)) {
+		/* enable one of the major subsystems, and start scanning. */
+		err = bt_enable(NULL);
+		zassert_equal(err, 0, "Bluetooth init failed (err %d)\n", err);
+
+		err = bt_le_scan_start(BT_LE_SCAN_ACTIVE, bt_scan_cb);
+		zassert_equal(err, 0, "Scanning failed to start (err %d)\n", err);
+	}
+
+	err = settings_subsys_init();
+	zassert_equal(err, 0, "settings_backend_init failed %d", err);
+
+	/* fill with values */
+	for (int i = 0; i < TEST_SETTINGS_COUNT; i++) {
+		test_settings[i].val = i;
+	}
+
+	k_work_reschedule_for_queue(&settings_work_q, &pending_store, K_NO_WAIT);
+
+	err = k_sem_take(&waitfor_work, K_SECONDS(TEST_TIMEOUT_SEC));
+	zassert_equal(err, 0, "k_sem_take failed %d", err);
+
+	if (IS_ENABLED(CONFIG_BT)) {
+		err = bt_le_scan_stop();
+		zassert_equal(err, 0, "Scanning failed to stop (err %d)\n", err);
+	}
+}
diff --git a/tests/subsys/settings/performance/testcase.yaml b/tests/subsys/settings/performance/testcase.yaml
new file mode 100644
index 0000000000000..efbd2115234cb
--- /dev/null
+++ b/tests/subsys/settings/performance/testcase.yaml
@@ -0,0 +1,70 @@
+tests:
+  settings.performance.zms:
+    extra_configs:
+      - CONFIG_SETTINGS_ZMS=y
+      - CONFIG_ZMS_LOOKUP_CACHE=y
+      - CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+      - mps2/an385
+    integration_platforms:
+      - mps2/an385
+    min_ram: 32
+    tags:
+      - settings
+      - zms
+
+  settings.performance.nvs:
+    extra_configs:
+      - CONFIG_ZMS=n
+      - CONFIG_NVS=y
+      - CONFIG_NVS_LOOKUP_CACHE=y
+      - CONFIG_NVS_LOOKUP_CACHE_SIZE=512
+      - CONFIG_SETTINGS_NVS_NAME_CACHE=y
+      - CONFIG_SETTINGS_NVS_NAME_CACHE_SIZE=512
+    platform_allow:
+      - nrf52840dk/nrf52840
+      - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
+      - mps2/an385
+    integration_platforms:
+      - mps2/an385
+    min_ram: 32
+    tags:
+      - settings
+      - nvs
+
+  settings.performance.zms_bt:
+    extra_configs:
+      - CONFIG_BT=y
+      - CONFIG_BT_OBSERVER=y
+      - CONFIG_BT_PERIPHERAL=y
+      - CONFIG_SETTINGS_ZMS=y
+      - CONFIG_ZMS_LOOKUP_CACHE=y
+      - CONFIG_ZMS_LOOKUP_CACHE_SIZE=512
+    platform_allow:
+      - nrf52840dk/nrf52840
+    min_ram: 32
+    tags:
+      - settings
+      - zms
+
+  settings.performance.nvs_bt:
+    extra_configs:
+      - CONFIG_BT=y
+      - CONFIG_BT_OBSERVER=y
+      - CONFIG_BT_PERIPHERAL=y
+      - CONFIG_ZMS=n
+      - CONFIG_NVS=y
+      - CONFIG_NVS_LOOKUP_CACHE=y
+      - CONFIG_NVS_LOOKUP_CACHE_SIZE=512
+      - CONFIG_SETTINGS_NVS_NAME_CACHE=y
+      - CONFIG_SETTINGS_NVS_NAME_CACHE_SIZE=512
+    platform_allow:
+      - nrf52840dk/nrf52840
+    min_ram: 32
+    tags:
+      - settings
+      - nvs
diff --git a/tests/subsys/settings/zms/CMakeLists.txt b/tests/subsys/settings/zms/CMakeLists.txt
new file mode 100644
index 0000000000000..218451c840edf
--- /dev/null
+++ b/tests/subsys/settings/zms/CMakeLists.txt
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(test_settings_zms_raw)
+
+add_subdirectory(./src zms_test_bindir)
diff --git a/tests/subsys/settings/zms/prj.conf b/tests/subsys/settings/zms/prj.conf
new file mode 100644
index 0000000000000..3de961c7c7211
--- /dev/null
+++ b/tests/subsys/settings/zms/prj.conf
@@ -0,0 +1,8 @@
+CONFIG_ZTEST=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_RUNTIME=y
+CONFIG_SETTINGS_ZMS=y
diff --git a/tests/subsys/settings/zms/src/CMakeLists.txt b/tests/subsys/settings/zms/src/CMakeLists.txt
new file mode 100644
index 0000000000000..220a42849a83d
--- /dev/null
+++ b/tests/subsys/settings/zms/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2024 BayLibre SAS
+
+zephyr_include_directories(
+	${ZEPHYR_BASE}/subsys/settings/include
+	${ZEPHYR_BASE}/subsys/settings/src
+	${ZEPHYR_BASE}/tests/subsys/settings/zms/src
+	)
+
+target_sources(app PRIVATE settings_test_zms.c)
+
+add_subdirectory(../../src settings_test_bindir)
diff --git a/tests/subsys/settings/zms/src/settings_test.h b/tests/subsys/settings/zms/src/settings_test.h
new file mode 100644
index 0000000000000..472ff71f59b60
--- /dev/null
+++ b/tests/subsys/settings/zms/src/settings_test.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _SETTINGS_TEST_ZMS_H
+#define _SETTINGS_TEST_ZMS_H
+
+#include <stdio.h>
+#include <string.h>
+#include <zephyr/ztest.h>
+
+#include <zephyr/settings/settings.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint8_t val8;
+extern uint8_t val8_un;
+extern uint32_t val32;
+extern uint64_t val64;
+
+extern int test_get_called;
+extern int test_set_called;
+extern int test_commit_called;
+extern int test_export_block;
+
+extern struct settings_handler c_test_handlers[];
+
+void ctest_clear_call_state(void);
+int ctest_get_call_state(void);
+
+void config_wipe_srcs(void);
+void *settings_config_setup(void);
+void settings_config_teardown(void *fixture);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _SETTINGS_TEST_ZMS_H */
diff --git a/tests/subsys/settings/zms/src/settings_test_zms.c b/tests/subsys/settings/zms/src/settings_test_zms.c
new file mode 100644
index 0000000000000..17a5ccd56fef3
--- /dev/null
+++ b/tests/subsys/settings/zms/src/settings_test_zms.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdlib.h>
+#include <string.h>
+
+#include "settings_priv.h"
+#include "settings_test.h"
+
+uint8_t val8;
+uint8_t val8_un;
+uint32_t val32;
+uint64_t val64;
+
+int test_get_called;
+int test_set_called;
+int test_commit_called;
+int test_export_block;
+
+int c1_handle_get(const char *name, char *val, int val_len_max);
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg);
+int c1_handle_commit(void);
+int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len));
+
+struct settings_handler c_test_handlers[] = {
+	{.name = "myfoo",
+	 .h_get = c1_handle_get,
+	 .h_set = c1_handle_set,
+	 .h_commit = c1_handle_commit,
+	 .h_export = c1_handle_export},
+};
+
+int c1_handle_get(const char *name, char *val, int val_len_max)
+{
+	const char *next;
+
+	test_get_called = 1;
+
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val8));
+		memcpy(val, &val8, MIN(val_len_max, sizeof(val8)));
+		return val_len_max;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		val_len_max = MIN(val_len_max, sizeof(val64));
+		memcpy(val, &val64, MIN(val_len_max, sizeof(val64)));
+		return val_len_max;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_set(const char *name, size_t len, settings_read_cb read_cb, void *cb_arg)
+{
+	size_t val_len;
+	int rc;
+	const char *next;
+
+	test_set_called = 1;
+	if (settings_name_steq(name, "mybar", &next) && !next) {
+		rc = read_cb(cb_arg, &val8, sizeof(val8));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "mybar64", &next) && !next) {
+		rc = read_cb(cb_arg, &val64, sizeof(val64));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	if (settings_name_steq(name, "unaligned", &next) && !next) {
+		val_len = len;
+		zassert_equal(val_len, sizeof(val8_un), "value length: %d, ought equal 1", val_len);
+		rc = read_cb(cb_arg, &val8_un, sizeof(val8_un));
+		zassert_true(rc >= 0, "SETTINGS_VALUE_SET callback");
+		return 0;
+	}
+
+	return -ENOENT;
+}
+
+int c1_handle_commit(void)
+{
+	test_commit_called = 1;
+	return 0;
+}
+
+int c1_handle_export(int (*cb)(const char *name, const void *value, size_t val_len))
+{
+	if (test_export_block) {
+		return 0;
+	}
+
+	(void)cb("myfoo/mybar", &val8, sizeof(val8));
+
+	(void)cb("myfoo/mybar64", &val64, sizeof(val64));
+
+	(void)cb("myfoo/unaligned", &val8_un, sizeof(val8_un));
+
+	return 0;
+}
+
+void ctest_clear_call_state(void)
+{
+	test_get_called = 0;
+	test_set_called = 0;
+	test_commit_called = 0;
+}
+
+int ctest_get_call_state(void)
+{
+	return test_get_called + test_set_called + test_commit_called;
+}
+
+void config_wipe_srcs(void)
+{
+	sys_slist_init(&settings_load_srcs);
+	settings_save_dst = NULL;
+}
+
+ZTEST_SUITE(settings_config, NULL, settings_config_setup, NULL, NULL, settings_config_teardown);
diff --git a/tests/subsys/settings/zms/testcase.yaml b/tests/subsys/settings/zms/testcase.yaml
new file mode 100644
index 0000000000000..2a1b12d1c0e9e
--- /dev/null
+++ b/tests/subsys/settings/zms/testcase.yaml
@@ -0,0 +1,7 @@
+tests:
+  settings.zms:
+    filter: dt_label_with_parent_compat_enabled("storage_partition", "fixed-partitions")
+    min_ram: 32
+    tags:
+      - settings
+      - zms
diff --git a/tests/subsys/shell/shell_backend_uart/testcase.yaml b/tests/subsys/shell/shell_backend_uart/testcase.yaml
index e4a72a1bd6ac0..64a9323ce4d45 100644
--- a/tests/subsys/shell/shell_backend_uart/testcase.yaml
+++ b/tests/subsys/shell/shell_backend_uart/testcase.yaml
@@ -6,7 +6,6 @@ tests:
       - shell
       - backend
       - uart
-    filter: ( CONFIG_SHELL )
     platform_allow:
       - qemu_x86
       - qemu_riscv32
diff --git a/tests/subsys/storage/flash_map/src/main.c b/tests/subsys/storage/flash_map/src/main.c
index 255c537a48b62..d892bfe289249 100644
--- a/tests/subsys/storage/flash_map/src/main.c
+++ b/tests/subsys/storage/flash_map/src/main.c
@@ -16,6 +16,9 @@
 #define SLOT1_PARTITION_DEV	FIXED_PARTITION_DEVICE(SLOT1_PARTITION)
 #define SLOT1_PARTITION_NODE	DT_NODELABEL(SLOT1_PARTITION)
 #define SLOT1_PARTITION_OFFSET	FIXED_PARTITION_OFFSET(SLOT1_PARTITION)
+#define SLOT1_PARTITION_SIZE	FIXED_PARTITION_SIZE(SLOT1_PARTITION)
+
+#define FLASH_AREA_COPY_SIZE	MIN((SLOT1_PARTITION_SIZE / 2), 128)
 
 extern int flash_map_entries;
 struct flash_sector fs_sectors[2048];
@@ -223,4 +226,34 @@ ZTEST(flash_map, test_flash_area_erase_and_flatten)
 		     i + fa->fa_off);
 }
 
+ZTEST(flash_map, test_flash_area_copy)
+{
+	const struct flash_area *fa;
+	uint8_t src_buf[FLASH_AREA_COPY_SIZE], dst_buf[FLASH_AREA_COPY_SIZE],
+		copy_buf[32];
+	int rc;
+
+	/* Get source and destination flash areas */
+	fa = FIXED_PARTITION(SLOT1_PARTITION);
+
+	/* First erase the area so it's ready for use. */
+	rc = flash_area_erase(fa, 0, fa->fa_size);
+	zassert_true(rc == 0, "flash area erase fail");
+
+	/* Fill source area with test data */
+	memset(src_buf, 0xAB, sizeof(src_buf));
+	rc = flash_area_write(fa, 0, src_buf, sizeof(src_buf));
+	zassert_true(rc == 0, "Failed to write to source flash area");
+
+	/* Perform the copy operation */
+	rc = flash_area_copy(fa, 0, fa, FLASH_AREA_COPY_SIZE, sizeof(src_buf), copy_buf,
+			     sizeof(copy_buf));
+	zassert_true(rc == 0, "flash_area_copy failed");
+
+	/* Verify the copied data */
+	rc = flash_area_read(fa, FLASH_AREA_COPY_SIZE, dst_buf, sizeof(dst_buf));
+	zassert_true(rc == 0, "Failed to read from destination flash area");
+	zassert_mem_equal(src_buf, dst_buf, sizeof(src_buf), "Data mismatch after copy");
+}
+
 ZTEST_SUITE(flash_map, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/storage/stream/stream_flash/testcase.yaml b/tests/subsys/storage/stream/stream_flash/testcase.yaml
index 02833dc633692..3dc0a660f2f95 100644
--- a/tests/subsys/storage/stream/stream_flash/testcase.yaml
+++ b/tests/subsys/storage/stream/stream_flash/testcase.yaml
@@ -24,6 +24,7 @@ tests:
     platform_allow:
       - nrf54l09pdk/nrf54l09/cpuapp
       - nrf54l15dk/nrf54l15/cpuapp
+      - ophelia4ev/nrf54l15/cpuapp
     extra_configs:
       # Tests, currently, can only support single device testing
       # and platform enabling SPI NOR automatically brings in a device with
diff --git a/tests/subsys/usb/bos/src/test_bos.c b/tests/subsys/usb/bos/src/test_bos.c
index e9452d86fc301..77bcbbd14c37a 100644
--- a/tests/subsys/usb/bos/src/test_bos.c
+++ b/tests/subsys/usb/bos/src/test_bos.c
@@ -21,10 +21,6 @@ LOG_MODULE_REGISTER(test_main, LOG_LEVEL_DBG);
  * Compare old style USB BOS definition with section aligned
  */
 
-static const uint8_t dummy_descriptor[] = {
-	0x00, 0x01, 0x02
-};
-
 static struct webusb_bos_desc {
 	struct usb_bos_descriptor bos;
 	struct usb_bos_platform_descriptor platform_webusb;
@@ -91,8 +87,8 @@ static struct webusb_bos_desc {
 	.capability_data_msos = {
 		/* Windows version (8.1) (0x06030000) */
 		.dwWindowsVersion = sys_cpu_to_le32(0x06030000),
-		.wMSOSDescriptorSetTotalLength =
-			sys_cpu_to_le16(sizeof(dummy_descriptor)),
+		/* The MSOS2.0 descriptor is not relevant here. */
+		.wMSOSDescriptorSetTotalLength = 0,
 		.bMS_VendorCode = 0x02,
 		.bAltEnumCode = 0x00
 	}
@@ -160,8 +156,8 @@ USB_DEVICE_BOS_DESC_DEFINE_CAP struct usb_bos_msosv2 {
 	.cap = {
 		/* Windows version (8.1) (0x06030000) */
 		.dwWindowsVersion = sys_cpu_to_le32(0x06030000),
-		.wMSOSDescriptorSetTotalLength =
-			sys_cpu_to_le16(sizeof(dummy_descriptor)),
+		/* The MSOS2.0 descriptor is not relevant here. */
+		.wMSOSDescriptorSetTotalLength = 0,
 		.bMS_VendorCode = 0x02,
 		.bAltEnumCode = 0x00,
 	},
diff --git a/tests/subsys/usb/device_next/src/main.c b/tests/subsys/usb/device_next/src/main.c
index 68dce57dfda46..0534a56141fad 100644
--- a/tests/subsys/usb/device_next/src/main.c
+++ b/tests/subsys/usb/device_next/src/main.c
@@ -136,7 +136,8 @@ static void *usb_test_enable(void)
 	err = usbd_add_descriptor(&test_usbd, &test_sn);
 	zassert_equal(err, 0, "Failed to initialize descriptor (%d)", err);
 
-	if (usbd_caps_speed(&test_usbd) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_caps_speed(&test_usbd) == USBD_SPEED_HS) {
 		err = usbd_add_configuration(&test_usbd, USBD_SPEED_HS, &test_hs_config);
 		zassert_equal(err, 0, "Failed to add configuration (%d)");
 	}
@@ -144,7 +145,8 @@ static void *usb_test_enable(void)
 	err = usbd_add_configuration(&test_usbd, USBD_SPEED_FS, &test_fs_config);
 	zassert_equal(err, 0, "Failed to add configuration (%d)");
 
-	if (usbd_caps_speed(&test_usbd) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED &&
+	    usbd_caps_speed(&test_usbd) == USBD_SPEED_HS) {
 		err = usbd_register_all_classes(&test_usbd, USBD_SPEED_HS, 1, NULL);
 		zassert_equal(err, 0, "Failed to unregister all instances(%d)");
 
diff --git a/tests/subsys/zbus/hlp_priority_boost/src/main.c b/tests/subsys/zbus/hlp_priority_boost/src/main.c
index b7391b43512a8..dd5e6a863c1cc 100644
--- a/tests/subsys/zbus/hlp_priority_boost/src/main.c
+++ b/tests/subsys/zbus/hlp_priority_boost/src/main.c
@@ -177,4 +177,5 @@ ZTEST(hlp_priority_boost, test_priority_elevation)
 	zassert_true(prio == 8, "The priority must be 8, but it is %d", prio);
 }
 
-ZTEST_SUITE(hlp_priority_boost, NULL, NULL, NULL, NULL, NULL);
+ZTEST_SUITE(hlp_priority_boost, NULL, NULL,
+	    ztest_simple_1cpu_before, ztest_simple_1cpu_after, NULL);
diff --git a/tests/subsys/zbus/runtime_observers_registration/src/main.c b/tests/subsys/zbus/runtime_observers_registration/src/main.c
index e5aee7c4c007d..b72586aff27f3 100644
--- a/tests/subsys/zbus/runtime_observers_registration/src/main.c
+++ b/tests/subsys/zbus/runtime_observers_registration/src/main.c
@@ -69,15 +69,16 @@ ZTEST(basic, test_specification_based__zbus_obs_add_rm_obs)
 {
 	count_callback1 = 0;
 	struct sensor_data_msg sd = {.a = 10, .b = 100};
+	static struct zbus_observer_node n1, n2, n3, n4, n5, n6;
 
 	/* Tyring to add same static observer as one dynamic */
-	zassert_equal(-EEXIST, zbus_chan_add_obs(&chan2, &lis2, K_MSEC(200)), NULL);
+	zassert_equal(-EEXIST, zbus_chan_add_obs(&chan2, &lis2, &n2, K_MSEC(200)), NULL);
 
 	zassert_equal(0, zbus_chan_pub(&chan1, &sd, K_MSEC(500)), NULL);
 	zassert_equal(count_callback1, 0, "The counter could not be more than zero, no obs");
 
-	zassert_equal(0, zbus_chan_add_obs(&chan1, &lis1, K_MSEC(200)), NULL);
-	zassert_equal(-EALREADY, zbus_chan_add_obs(&chan1, &lis1, K_MSEC(200)),
+	zassert_equal(0, zbus_chan_add_obs(&chan1, &lis1, &n1, K_MSEC(200)), NULL);
+	zassert_equal(-EALREADY, zbus_chan_add_obs(&chan1, &lis1, &n1, K_MSEC(200)),
 		      "It cannot be added twice");
 
 	zassert_equal(0, zbus_chan_pub(&chan1, &sd, K_MSEC(500)), NULL);
@@ -98,30 +99,21 @@ ZTEST(basic, test_specification_based__zbus_obs_add_rm_obs)
 	zassert_equal(0, zbus_chan_pub(&chan2, &sd, K_MSEC(500)), NULL);
 	zassert_equal(count_callback2, 1, "The counter could not be more than zero, no obs");
 
-	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis3, K_MSEC(200)), NULL);
+	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis3, &n3, K_MSEC(200)), NULL);
 
-	zassert_equal(-EALREADY, zbus_chan_add_obs(&chan2, &lis3, K_MSEC(200)),
+	zassert_equal(-EALREADY, zbus_chan_add_obs(&chan2, &lis3, &n3, K_MSEC(200)),
 		      "It cannot be added twice");
 
 	zassert_equal(0, zbus_chan_pub(&chan2, &sd, K_MSEC(500)), NULL);
 	zassert_equal(count_callback2, 3, "The counter could not be more than zero, no obs, %d",
 		      count_callback2);
 	count_callback2 = 0;
-	zassert_equal(0, zbus_chan_add_obs(&chan2, &sub1, K_MSEC(200)), NULL);
-	zassert_equal(0, zbus_chan_add_obs(&chan2, &sub2, K_MSEC(200)), NULL);
-	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis4, K_MSEC(200)), "It must add the obs");
-	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis5, K_MSEC(200)), "It must add the obs");
-	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis6, K_MSEC(200)), "It must add the obs");
+	zassert_equal(0, zbus_chan_add_obs(&chan2, &sub1, &n1, K_MSEC(200)), NULL);
+	zassert_equal(0, zbus_chan_add_obs(&chan2, &sub2, &n2, K_MSEC(200)), NULL);
+	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis4, &n4, K_MSEC(200)), "It must add the obs");
+	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis5, &n5, K_MSEC(200)), "It must add the obs");
+	zassert_equal(0, zbus_chan_add_obs(&chan2, &lis6, &n6, K_MSEC(200)), "It must add the obs");
 
-	/* Make the heap full */
-	void *mem;
-
-	do {
-		mem = k_malloc(1);
-	} while (mem != NULL);
-
-	/* With the heap full it will not be possible to add another obs */
-	zassert_equal(-ENOMEM, zbus_chan_add_obs(&chan2, &lis7, K_MSEC(200)), NULL);
 	zassert_equal(0, zbus_chan_pub(&chan2, &sd, K_MSEC(500)), NULL);
 	zassert_equal(count_callback2, 5, NULL);
 
@@ -142,7 +134,9 @@ static struct aux2_wq_data wq_handler;
 
 static void wq_dh_cb(struct k_work *item)
 {
-	zassert_equal(-EAGAIN, zbus_chan_add_obs(&chan2, &sub1, K_MSEC(200)), NULL);
+	static struct zbus_observer_node node;
+
+	zassert_equal(-EAGAIN, zbus_chan_add_obs(&chan2, &sub1, &node, K_MSEC(200)), NULL);
 	zassert_equal(-EAGAIN, zbus_chan_rm_obs(&chan2, &sub2, K_MSEC(200)), NULL);
 }
 
@@ -192,11 +186,12 @@ ZBUS_CHAN_ADD_OBS(chan4, prio_lis4, 2);
 ZTEST(basic, test_specification_based__zbus_obs_priority)
 {
 	struct sensor_data_msg sd = {.a = 70, .b = 116};
+	static struct zbus_observer_node n1, n2;
 
 	execution_sequence_idx = 0;
 
-	zassert_equal(0, zbus_chan_add_obs(&chan4, &prio_lis2, K_MSEC(200)), NULL);
-	zassert_equal(0, zbus_chan_add_obs(&chan4, &prio_lis1, K_MSEC(200)), NULL);
+	zassert_equal(0, zbus_chan_add_obs(&chan4, &prio_lis2, &n1, K_MSEC(200)), NULL);
+	zassert_equal(0, zbus_chan_add_obs(&chan4, &prio_lis1, &n2, K_MSEC(200)), NULL);
 
 	zassert_equal(0, zbus_chan_pub(&chan4, &sd, K_MSEC(500)), NULL);
 
diff --git a/tests/subsys/zbus/unittests/src/main.c b/tests/subsys/zbus/unittests/src/main.c
index c94d0c28b0e82..a40a70082f1f0 100644
--- a/tests/subsys/zbus/unittests/src/main.c
+++ b/tests/subsys/zbus/unittests/src/main.c
@@ -137,6 +137,7 @@ static struct action_msg ga;
 
 static void isr_handler(const void *operation)
 {
+	static struct zbus_observer_node fast_node, aux_node;
 	enum operation *op = (enum operation *)operation;
 
 	switch (*op) {
@@ -156,7 +157,7 @@ static void isr_handler(const void *operation)
 		isr_return = zbus_chan_finish(NULL);
 		break;
 	case ADD_OBS_ISR_INVAL:
-		isr_return = zbus_chan_add_obs(&aux2_chan, &fast_lis, K_MSEC(200));
+		isr_return = zbus_chan_add_obs(&aux2_chan, &fast_lis, &fast_node, K_MSEC(200));
 		break;
 	case RM_OBS_ISR_INVAL:
 		isr_return = zbus_chan_rm_obs(&aux2_chan, &fast_lis, K_MSEC(200));
@@ -177,7 +178,7 @@ static void isr_handler(const void *operation)
 		isr_return = zbus_chan_finish(&aux2_chan);
 		break;
 	case ADD_OBS_ISR:
-		isr_return = zbus_chan_add_obs(&aux2_chan, NULL, K_MSEC(200));
+		isr_return = zbus_chan_add_obs(&aux2_chan, NULL, &aux_node, K_MSEC(200));
 		break;
 	case RM_OBS_ISR:
 		isr_return = zbus_chan_rm_obs(&aux2_chan, NULL, K_MSEC(200));
@@ -244,6 +245,7 @@ const STRUCT_SECTION_ITERABLE(zbus_observer, invalid_obs) = {
 
 ZTEST(basic, test_specification_based__zbus_chan)
 {
+	static struct zbus_observer_node node;
 	struct action_msg a = {0};
 
 	/* Trying invalid parameters */
@@ -269,9 +271,11 @@ ZTEST(basic, test_specification_based__zbus_chan)
 
 	zassert_equal(-EFAULT, zbus_chan_finish(NULL), "It must be -EFAULT");
 
-	zassert_equal(-EFAULT, zbus_chan_add_obs(NULL, &sub1, K_MSEC(200)), NULL);
+	zassert_equal(-EFAULT, zbus_chan_add_obs(NULL, &sub1, &node, K_MSEC(200)), NULL);
 
-	zassert_equal(-EFAULT, zbus_chan_add_obs(&aux2_chan, NULL, K_MSEC(200)), NULL);
+	zassert_equal(-EFAULT, zbus_chan_add_obs(&aux2_chan, NULL, &node, K_MSEC(200)), NULL);
+
+	zassert_equal(-EFAULT, zbus_chan_add_obs(&aux2_chan, &sub1, NULL, K_MSEC(200)), NULL);
 
 	zassert_equal(-EFAULT, zbus_chan_rm_obs(NULL, &sub1, K_MSEC(200)), NULL);
 
@@ -326,7 +330,7 @@ ZTEST(basic, test_specification_based__zbus_chan)
 
 	k_msleep(100);
 
-	zassert_equal(0, zbus_chan_add_obs(&stuck_chan, &sub1, K_MSEC(200)), NULL);
+	zassert_equal(0, zbus_chan_add_obs(&stuck_chan, &sub1, &node, K_MSEC(200)), NULL);
 
 	zassert_equal(0, zbus_chan_notify(&stuck_chan, K_MSEC(200)), "It must finish correctly");
 
@@ -599,6 +603,7 @@ ZTEST(basic, test_hard_channel)
 
 ZTEST(basic, test_specification_based__zbus_obs_set_enable)
 {
+	struct zbus_observer_node node;
 	bool enable;
 
 	count_fast = 0;
@@ -617,7 +622,7 @@ ZTEST(basic, test_specification_based__zbus_obs_set_enable)
 	zbus_obs_is_enabled(&rt_fast_lis, &enable);
 	zassert_equal(false, enable);
 
-	zassert_equal(0, zbus_chan_add_obs(&aux1_chan, &rt_fast_lis, K_MSEC(200)), NULL);
+	zassert_equal(0, zbus_chan_add_obs(&aux1_chan, &rt_fast_lis, &node, K_MSEC(200)), NULL);
 
 	zassert_equal(0, zbus_obs_set_enable(&fast_lis, false),
 		      "Must be zero. The observer must be disabled");
diff --git a/tests/test_config_ci.yaml b/tests/test_config_ci.yaml
new file mode 100644
index 0000000000000..5f09c5bb08db9
--- /dev/null
+++ b/tests/test_config_ci.yaml
@@ -0,0 +1,25 @@
+options:
+  integration_mode:
+    - sample.
+platforms:
+  override_default_platforms: false
+  increased_platform_scope: true
+levels:
+  - name: smoke
+    description: >
+      A plan to be used verifying basic zephyr features on hardware.
+    adds:
+      - kernel.threads.*
+      - kernel.timer.behavior
+      - arch.interrupt
+      - boards.*
+      - drivers.gpio.1pin
+      - drivers.console.uart
+      - drivers.entropy
+  - name: acceptance
+    description: >
+      More coverage
+    inherits:
+      - smoke
+    adds:
+      - kernel.*
diff --git a/tests/unit/cbprintf/main.c b/tests/unit/cbprintf/main.c
index 1fabf19bfa066..b5ce91ddb8d7b 100644
--- a/tests/unit/cbprintf/main.c
+++ b/tests/unit/cbprintf/main.c
@@ -1365,8 +1365,7 @@ ZTEST(prf, test_is_none_char_ptr)
 	float f = 0.1;
 	double d = 0.1;
 
-	_Pragma("GCC diagnostic push")
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"")
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 	zassert_equal(Z_CBPRINTF_IS_NONE_CHAR_PTR(c), 0);
 	zassert_equal(Z_CBPRINTF_IS_NONE_CHAR_PTR(cc), 0);
 	zassert_equal(Z_CBPRINTF_IS_NONE_CHAR_PTR(vc), 0);
@@ -1414,7 +1413,7 @@ ZTEST(prf, test_is_none_char_ptr)
 
 	zassert_equal(Z_CBPRINTF_IS_NONE_CHAR_PTR((void *)&c), 1);
 
-	_Pragma("GCC diagnostic pop")
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 }
 
 ZTEST(prf, test_p_count)
@@ -1428,13 +1427,12 @@ ZTEST(prf, test_p_count)
 
 ZTEST(prf, test_pointers_validate)
 {
-	_Pragma("GCC diagnostic push")
-	_Pragma("GCC diagnostic ignored \"-Wpointer-arith\"")
+	TOOLCHAIN_DISABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 	zassert_equal(Z_CBPRINTF_POINTERS_VALIDATE("no arguments"), true);
 	/* const char fails validation */
 	zassert_equal(Z_CBPRINTF_POINTERS_VALIDATE("%p", "string"), false);
 	zassert_equal(Z_CBPRINTF_POINTERS_VALIDATE("%p", (void *)"string"), true);
-	_Pragma("GCC diagnostic pop")
+	TOOLCHAIN_ENABLE_GCC_WARNING(TOOLCHAIN_WARNING_POINTER_ARITH);
 }
 
 static void *cbprintf_setup(void)
diff --git a/tests/unit/crc/main.c b/tests/unit/crc/main.c
index ed5483d63899f..6c3b8340f417a 100644
--- a/tests/unit/crc/main.c
+++ b/tests/unit/crc/main.c
@@ -12,6 +12,28 @@
 #include "../../../lib/crc/crc32c_sw.c"
 #include "../../../lib/crc/crc7_sw.c"
 #include "../../../lib/crc/crc24_sw.c"
+#include "../../../lib/crc/crc32k_4_2_sw.c"
+
+ZTEST(crc, test_crc32_k_4_2)
+{
+	uint8_t test1[] = "A";
+	uint8_t test2[] = "123456789";
+	uint8_t test3[] = "Zephyr";
+
+	const uint32_t TEST2_CRC = 0x3ee83603;
+
+	zassert_equal(crc32_k_4_2_update(0xFFFFFFFF, test1, sizeof(test1) - 1), 0x2d098604);
+	zassert_equal(crc32_k_4_2_update(0xFFFFFFFF, test2, sizeof(test2) - 1), TEST2_CRC);
+	zassert_equal(crc32_k_4_2_update(0xFFFFFFFF, test3, sizeof(test3) - 1), 0xacf334b2);
+
+	/* test iteration */
+	uint32_t crc = 0xFFFFFFFF;
+
+	for (size_t i = 0; i < sizeof(test2) - 1; i++) {
+		crc = crc32_k_4_2_update(crc, &test2[i], 1);
+	}
+	zassert_equal(crc, TEST2_CRC);
+}
 
 ZTEST(crc, test_crc32c)
 {
diff --git a/tests/unit/crc/testcase.yaml b/tests/unit/crc/testcase.yaml
index 747bbc63fcb24..9e4626fe31369 100644
--- a/tests/unit/crc/testcase.yaml
+++ b/tests/unit/crc/testcase.yaml
@@ -3,3 +3,9 @@ tests:
     tags:
       - crc
     type: unit
+  utilities.crc.table256:
+    tags:
+      - crc
+    type: unit
+    extra_configs:
+      - CONFIG_CRC32_K_4_2_TABLE_256=y
diff --git a/tests/unit/intmath/main.c b/tests/unit/intmath/main.c
index 3c4693637fd30..47d7781e2e66b 100644
--- a/tests/unit/intmath/main.c
+++ b/tests/unit/intmath/main.c
@@ -6,6 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
+#include <zephyr/test_toolchain.h>
 
 /* Built-time math test.  Zephyr code depends on a standard C ABI with
  * 2's complement signed math.  As this isn't technically guaranteed
@@ -16,9 +17,7 @@
  * will warn about it helpfully.  But obviously integer overflow is
  * the whole point here, so turn that warning off.
  */
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Woverflow"
-#endif
+TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_OVERFLOW)
 
 /* Two's complement negation check: "-N" must equal "(~N)+1" */
 #define NEG_CHECK(T, N) BUILD_ASSERT((-((T)N)) == (~((T)N)) + 1)
@@ -26,10 +25,7 @@
 /* Checks that MAX+1==MIN in the given type */
 #define ROLLOVER_CHECK(T, MAX, MIN) BUILD_ASSERT((T)((T)1 + (T)MAX) == (T)MIN)
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winteger-overflow"
-#endif
+TOOLCHAIN_DISABLE_CLANG_WARNING(TOOLCHAIN_WARNING_INTEGER_OVERFLOW)
 
 ROLLOVER_CHECK(unsigned int, 0xffffffff, 0);
 ROLLOVER_CHECK(unsigned short, 0xffff, 0);
@@ -56,9 +52,7 @@ NEG_CHECK(int, 0x80000000);
 NEG_CHECK(int, 0x7fffffff);
 ROLLOVER_CHECK(int, 2147483647, -2147483648);
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+TOOLCHAIN_ENABLE_CLANG_WARNING(TOOLCHAIN_WARNING_INTEGER_OVERFLOW)
 
 /**
  * @addtogroup kernel_common_tests
diff --git a/tests/unit/util/main.c b/tests/unit/util/main.c
index e01c7dce28657..5d99dde3d1b68 100644
--- a/tests/unit/util/main.c
+++ b/tests/unit/util/main.c
@@ -918,4 +918,55 @@ ZTEST(util, test_utf8_lcpy_null_termination)
 	zassert_str_equal(dest_str, expected_result, "Failed to truncate");
 }
 
+ZTEST(util, test_util_eq)
+{
+	uint8_t src1[16];
+	uint8_t src2[16];
+
+	bool mem_area_matching_1;
+	bool mem_area_matching_2;
+
+	memset(src1, 0, sizeof(src1));
+	memset(src2, 0, sizeof(src2));
+
+	for (size_t i = 0U; i < 16; i++) {
+		src1[i] = 0xAB;
+		src2[i] = 0xAB;
+	}
+
+	src1[15] = 0xCD;
+	src2[15] = 0xEF;
+
+	mem_area_matching_1 = util_eq(src1, sizeof(src1), src2, sizeof(src2));
+	mem_area_matching_2 = util_eq(src1, sizeof(src1) - 1, src2, sizeof(src2) - 1);
+
+	zassert_false(mem_area_matching_1);
+	zassert_true(mem_area_matching_2);
+}
+
+ZTEST(util, test_util_memeq)
+{
+	uint8_t src1[16];
+	uint8_t src2[16];
+	uint8_t src3[16];
+
+	bool mem_area_matching_1;
+	bool mem_area_matching_2;
+
+	memset(src1, 0, sizeof(src1));
+	memset(src2, 0, sizeof(src2));
+
+	for (size_t i = 0U; i < 16; i++) {
+		src1[i] = 0xAB;
+		src2[i] = 0xAB;
+		src3[i] = 0xCD;
+	}
+
+	mem_area_matching_1 = util_memeq(src1, src2, sizeof(src1));
+	mem_area_matching_2 = util_memeq(src1, src3, sizeof(src1));
+
+	zassert_true(mem_area_matching_1);
+	zassert_false(mem_area_matching_2);
+}
+
 ZTEST_SUITE(util, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/ztest/fail/CMakeLists.txt b/tests/ztest/fail/CMakeLists.txt
index 6a37c8efd7225..9338b4fbde2b6 100644
--- a/tests/ztest/fail/CMakeLists.txt
+++ b/tests/ztest/fail/CMakeLists.txt
@@ -30,7 +30,9 @@ string(REGEX MATCHALL "(^|;)CONFIG_ZTEST_FAIL_TEST_[A-Za-z0-9_]+" fail_test_conf
 list(FILTER fail_test_config EXCLUDE REGEX "^$")
 list(TRANSFORM fail_test_config PREPEND "-D")
 list(TRANSFORM fail_test_config APPEND "=y")
-string(REPLACE ";" " " fail_test_config "${fail_test_config}")
+if(CONFIG_ZTEST_FAIL_ON_ASSUME)
+  list(APPEND fail_test_config "-DCONFIG_ZTEST_FAIL_ON_ASSUME=y")
+endif()
 
 # Add the 'core' external project which will mirror the configs of this project.
 ExternalProject_Add(core
diff --git a/tests/ztest/fail/Kconfig b/tests/ztest/fail/Kconfig
index c1ca3535ea744..f5d29047d5d22 100644
--- a/tests/ztest/fail/Kconfig
+++ b/tests/ztest/fail/Kconfig
@@ -31,8 +31,10 @@ config TEST_ERROR_STRING
 	string
 	default "ERROR: cannot fail in test phase 'after()', bailing" if ZTEST_FAIL_TEST_ASSERT_AFTER
 	default "ERROR: cannot fail in test phase 'teardown()', bailing" if ZTEST_FAIL_TEST_ASSERT_TEARDOWN
-	default "ERROR: cannot skip in test phase 'after()', bailing" if ZTEST_FAIL_TEST_ASSUME_AFTER
-	default "ERROR: cannot skip in test phase 'teardown()', bailing" if ZTEST_FAIL_TEST_ASSUME_TEARDOWN
+	default "ERROR: cannot skip in test phase 'after()', bailing" if ZTEST_FAIL_TEST_ASSUME_AFTER && !ZTEST_FAIL_ON_ASSUME
+	default "ERROR: cannot skip in test phase 'teardown()', bailing" if ZTEST_FAIL_TEST_ASSUME_TEARDOWN && !ZTEST_FAIL_ON_ASSUME
+	default "ERROR: cannot fail in test phase 'after()', bailing" if ZTEST_FAIL_TEST_ASSUME_AFTER && ZTEST_FAIL_ON_ASSUME
+	default "ERROR: cannot fail in test phase 'teardown()', bailing" if ZTEST_FAIL_TEST_ASSUME_TEARDOWN && ZTEST_FAIL_ON_ASSUME
 	default "ERROR: cannot pass in test phase 'after()', bailing" if ZTEST_FAIL_TEST_PASS_AFTER
 	default "ERROR: cannot pass in test phase 'teardown()', bailing" if ZTEST_FAIL_TEST_PASS_TEARDOWN
 	default "Assumption failed at " if ZTEST_FAIL_TEST_UNEXPECTED_ASSUME
diff --git a/tests/ztest/fail/core/CMakeLists.txt b/tests/ztest/fail/core/CMakeLists.txt
index 9b39501a3b321..0b0907ddf5ffe 100644
--- a/tests/ztest/fail/core/CMakeLists.txt
+++ b/tests/ztest/fail/core/CMakeLists.txt
@@ -23,6 +23,10 @@ elseif(CONFIG_ZTEST_FAIL_TEST_UNEXPECTED_ASSUME)
   list(APPEND test_sources src/unexpected_assume.cpp)
 endif()
 
+if(CONFIG_ZTEST_FAIL_ON_ASSUME)
+  add_definitions(-DCONFIG_ZTEST_FAIL_ON_ASSUME=1)
+endif()
+
 if(BOARD STREQUAL "unit_testing" OR BOARD STREQUAL "unit_testing/unit_testing")
   find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
   project(base)
diff --git a/tests/ztest/fail/testcase.yaml b/tests/ztest/fail/testcase.yaml
index c6054c75f449c..3cd36c741f145 100644
--- a/tests/ztest/fail/testcase.yaml
+++ b/tests/ztest/fail/testcase.yaml
@@ -42,12 +42,22 @@ tests:
   testing.fail.zephyr.assert_teardown:
     extra_configs:
       - CONFIG_ZTEST_FAIL_TEST_ASSERT_TEARDOWN=y
-  testing.fail.zephyr.assume_after:
+  testing.fail.zephyr.assume_after.fail:
     extra_configs:
       - CONFIG_ZTEST_FAIL_TEST_ASSUME_AFTER=y
-  testing.fail.zephyr.assume_teardown:
+      - CONFIG_ZTEST_FAIL_ON_ASSUME=y
+  testing.fail.zephyr.assume_teardown.fail:
     extra_configs:
       - CONFIG_ZTEST_FAIL_TEST_ASSUME_TEARDOWN=y
+      - CONFIG_ZTEST_FAIL_ON_ASSUME=y
+  testing.fail.zephyr.assume_after.skip:
+    extra_configs:
+      - CONFIG_ZTEST_FAIL_TEST_ASSUME_AFTER=y
+      - CONFIG_ZTEST_FAIL_ON_ASSUME=n
+  testing.fail.zephyr.assume_teardown.skip:
+    extra_configs:
+      - CONFIG_ZTEST_FAIL_TEST_ASSUME_TEARDOWN=y
+      - CONFIG_ZTEST_FAIL_ON_ASSUME=n
   testing.fail.zephyr.pass_after:
     extra_configs:
       - CONFIG_ZTEST_FAIL_TEST_PASS_AFTER=y
@@ -58,6 +68,8 @@ tests:
     type: unit
     extra_configs:
       - CONFIG_ZTEST_FAIL_TEST_UNEXPECTED_ASSUME=y
+      - CONFIG_ZTEST_FAIL_ON_ASSUME=y
   testing.fail.zephyr.fail_on_bad_assumption:
     extra_configs:
       - CONFIG_ZTEST_FAIL_TEST_UNEXPECTED_ASSUME=y
+      - CONFIG_ZTEST_FAIL_ON_ASSUME=y
diff --git a/tests/ztest/ztress/testcase.yaml b/tests/ztest/ztress/testcase.yaml
index 3b1e504df1723..a0358e75d8aa0 100644
--- a/tests/ztest/ztress/testcase.yaml
+++ b/tests/ztest/ztress/testcase.yaml
@@ -5,7 +5,5 @@ common:
     - qemu
 tests:
   testing.ztest.ztress:
-    # FIXME: qemu_cortex_r5 is excluded due to a run-time failure, see #49494
-    platform_exclude: qemu_cortex_r5
     integration_platforms:
       - qemu_x86
diff --git a/west.yml b/west.yml
index 1f7aec693bf22..06ca285bee9b4 100644
--- a/west.yml
+++ b/west.yml
@@ -125,7 +125,7 @@ manifest:
       revision: d80a49b2bb186317dc1db4ac88da49c0ab77e6e7
       path: modules/lib/cmsis-dsp
     - name: cmsis-nn
-      revision: ea987c1ca661be723de83bd159aed815d6cbd430
+      revision: e9328d612ea3ea7d0d210d3ac16ea8667c01abdd
       path: modules/lib/cmsis-nn
     - name: cmsis_6
       repo-path: CMSIS_6
@@ -137,12 +137,12 @@ manifest:
       groups:
         - tools
     - name: fatfs
-      revision: 427159bf95ea49b7680facffaa29ad506b42709b
+      revision: 16245c7c41d2b79e74984f49b5202551786b8a9b
       path: modules/fs/fatfs
       groups:
         - fs
     - name: hal_adi
-      revision: a5b528b49f4291aba34afefd5543889690536684
+      revision: 67b88309c327d207e87bb7af6e37c704cd9d5b9d
       path: modules/hal/adi
       groups:
         - hal
@@ -152,17 +152,17 @@ manifest:
       groups:
         - hal
     - name: hal_ambiq
-      revision: 87a188b91aca22ce3ce7deb4a1cbf7780d784673
+      revision: a6dff0a5f49e898f29bc428e01538a8911364460
       path: modules/hal/ambiq
       groups:
         - hal
     - name: hal_atmel
-      revision: da767444cce3c1d9ccd6b8a35fd7c67dc82d489c
+      revision: ca7e4c6920f44b9d677ed5995ffa169f18a54cdf
       path: modules/hal/atmel
       groups:
         - hal
     - name: hal_espressif
-      revision: 970156407d42c968c50d4b2e3c85c0c548bd9a9e
+      revision: dbc28ad4c1bdcdb25e79ca225cb5528a75d8dc91
       path: modules/hal/espressif
       west-commands: west/west-commands.yml
       groups:
@@ -178,32 +178,32 @@ manifest:
       groups:
         - hal
     - name: hal_infineon
-      revision: 468e955eb49b8a731474ff194ca17b6e6a08c2d9
+      revision: 9df9d40571b25171cb752459c6dd96bd83ec8570
       path: modules/hal/infineon
       groups:
         - hal
     - name: hal_intel
-      revision: 0355bb816263c54eed23c7781034447af5d8200c
+      revision: 0447cd22e74d7ca243653f21cfd6e38c016630c6
       path: modules/hal/intel
       groups:
         - hal
     - name: hal_microchip
-      revision: fa2431a906ffb560160d40739d7cf04169551103
+      revision: 15ca19705e4bff2d147a2a13d0198fcf8e4c8b4a
       path: modules/hal/microchip
       groups:
         - hal
     - name: hal_nordic
-      revision: a1db06a2f6a1d069994d595cef563f58e44c4344
+      revision: 119ff5b5ec7a413ca2f64ae1928c79eee1e7b7b2
       path: modules/hal/nordic
       groups:
         - hal
     - name: hal_nuvoton
-      revision: 466c3eed9c98453fb23953bf0e0427fea01924be
+      revision: be1042dc8a96ebe9ea4c5d714f07c617539106d6
       path: modules/hal/nuvoton
       groups:
         - hal
     - name: hal_nxp
-      revision: 4afb0ec88a4b0ab65729f308e9c6d910bf9d8698
+      revision: 6b11d190e0092aafec81489d0e7045a3bcf80c60
       path: modules/hal/nxp
       groups:
         - hal
@@ -219,7 +219,7 @@ manifest:
         - hal
     - name: hal_renesas
       path: modules/hal/renesas
-      revision: abca7ee376c86fe4f0032d083c1af39e2600cbe5
+      revision: 15c3f057d5715b78b0a2201314b07ad6d2dbd1b1
       groups:
         - hal
     - name: hal_rpi_pico
@@ -228,7 +228,7 @@ manifest:
       groups:
         - hal
     - name: hal_silabs
-      revision: 1e60d972b2d05de620ece65cfa48ec33c5f38bac
+      revision: 40a0237e4812241de677441e02131d6c75830636
       path: modules/hal/silabs
       groups:
         - hal
@@ -238,7 +238,7 @@ manifest:
       groups:
         - hal
     - name: hal_stm32
-      revision: 55043bcc35fffa3b4a8c75a696d932b5020aad09
+      revision: f467d8e039216b4f5f9b55dd8a1ffa8582fc516d
       path: modules/hal/stm32
       groups:
         - hal
@@ -268,21 +268,21 @@ manifest:
       groups:
         - hal
     - name: hal_xtensa
-      revision: baa56aa3e119b5aae43d16f9b2d2c8112e052871
+      revision: b38620c7cc61e349e192ed86a54940a5cd0636b7
       path: modules/hal/xtensa
       groups:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: 4957416a01c86579aebb333b43f1c23da0375835
+      revision: fb6452c246b441434172235b2070259945ca9d44
     - name: liblc3
-      revision: bb85f7dde4195bfc0fca9e9c7c2eed0f8694203c
+      revision: 48bbd3eacd36e99a57317a0a4867002e0b09e183
       path: modules/lib/liblc3
     - name: libmctp
       revision: b97860e78998551af99931ece149eeffc538bdb1
       path: modules/lib/libmctp
     - name: libmetal
-      revision: 3e8781aae9d7285203118c05bc01d4eb0ca565a7
+      revision: 14f519529a1e4a46aaea6826f5a41d99a3347276
       path: modules/hal/libmetal
       groups:
         - hal
@@ -298,12 +298,12 @@ manifest:
       revision: 1ed1ddd881c3784049a92bb9fe37c38c6c74d998
       path: modules/lib/gui/lvgl
     - name: mbedtls
-      revision: 4952e1328529ee549d412b498ea71c54f30aa3b1
+      revision: 5f889934359deccf421554c7045a8381ef75298f
       path: modules/crypto/mbedtls
       groups:
         - crypto
     - name: mcuboot
-      revision: 9a02794a14fa2e539ffe039a986360590d9e025f
+      revision: 20f98e0a975c24864872e0df5701eb1082e9c957
       path: bootloader/mcuboot
       groups:
         - bootloader
@@ -311,20 +311,20 @@ manifest:
       path: modules/debug/mipi-sys-t
       groups:
         - debug
-      revision: 71ace1f5caa03e56c8740a09863e685efb4b2360
+      revision: 33e5c23cbedda5ba12dbe50c4baefb362a791001
     - name: net-tools
-      revision: 93acc8bac4661e74e695eb1aea94c7c5262db2e2
+      revision: 986bfeb040df3d9029366de8aea4ce1f84e93780
       path: tools/net-tools
       groups:
         - tools
     - name: nrf_hw_models
-      revision: 2570f4a697ce2da860ff39ec34afd91749bd66d3
+      revision: d5b95fdd0260e8189e788d40d2863d1e2d4be159
       path: modules/bsim_hw_models/nrf_hw_models
     - name: nrf_wifi
-      revision: e35f707a782b7c4c0eb83a3b06ca4e6eb693f29f
+      revision: eeceee739252cf2d56a5ad9356553d87aae8c57d
       path: modules/lib/nrf_wifi
     - name: open-amp
-      revision: 52bb1783521c62c019451cee9b05b8eda9d7425f
+      revision: f7f4d083c7909a39d86e217376c69b416ec4faf3
       path: modules/lib/open-amp
     - name: openthread
       revision: 3ae741f95e7dfb391dec35c48742862049eb62e8
@@ -353,12 +353,12 @@ manifest:
       groups:
         - tee
     - name: trusted-firmware-m
-      revision: 2f138475047d566f1446f62657aa546b0e0b52c2
+      revision: 857f3697ece6f44a663f007de71205a7b34974ef
       path: modules/tee/tf-m/trusted-firmware-m
       groups:
         - tee
     - name: uoscore-uedhoc
-      revision: 84ef879a46d7bfd9a423fbfb502b04289861f9ea
+      revision: 54abc109c9c0adfd53c70077744c14e454f04f4a
       path: modules/lib/uoscore-uedhoc
     - name: zcbor
       revision: 9b07780aca6fb21f82a241ba386ad9b379809337